Packman Build Service PMBS

Changes of Revision 55

audacious-plugins.changes Changed

@@ -1,4 +1,281 @@
 -------------------------------------------------------------------
+Sat Oct 12 08:21:00 UTC 2024 - Christoph G <foss@grueninger.de>
+
+- Update to 4.4.1
+ * Improve controls responsiveness with the Sndio output plugin
+ * Add Qt 6 support for the Qt Multimedia output plugin
+ * Lower GTK 3 version requirement from 3.22 to 3.18
+
+-------------------------------------------------------------------
+Sun Aug 4 20:19:26 UTC 2024 - Martin Schreiner <martin.schreiner@suse.com>
+
+- Re-enable QT6 for Leap/SLE 15.X.
+ Requires C++17 support.
+
+-------------------------------------------------------------------
+Tue Jul 16 03:34:30 UTC 2024 - Martin Schreiner <martin.schreiner@suse.com>
+
+- Remove patch, as it's no longer required as of version 4.4:
+ * audacious-plugins-fix-qt6-qthotkey.patch
+- Add new build-time dependency: json-glib-1.0.
+- Re-enable QT5 for codestreams where QT6 isn't available: basically
+ anything that's not based on Tumbleweed.
+
+-------------------------------------------------------------------
+Mon Jul 15 08:31:28 UTC 2024 - Petr Vorel <pvorel@suse.cz>
+
+- Update to version 4.4:
+ * See https://audacious-media-player.org/news/59-audacious-4-4-released
+- Remove gtk3 and qt6 config options (upstream make them compiled as default
+ and remove these options)
+
+-------------------------------------------------------------------
+Thu Mar 7 20:06:08 UTC 2023 - Alexei Sorokin <sor.alexei@meowr.ru>
+
+- Update to version 4.3:
+ * See https://audacious-media-player.org/news/56-audacious-4-3-released
+- Add PipeWire, ModPlug and Opus build requirements.
+- Add audacious-plugins-fix-qt6-qthotkey.patch: Fix Qt6 support in
+ qthotkey.
+- Switch to Qt 6 on openSUSE newer than 15.x
+- Switch to GTK 3.
+
+-------------------------------------------------------------------
+Wed Jul 13 20:21:08 UTC 2022 - Bjørn Lie <bjorn.lie@gmail.com>
+
+- Update to version 4.2:
+ * New and improved features:
+ - Add a built-in dark theme using Qt's Fusion style (default on
+ Windows)
+ - Add a dark theme-friendly variant of the built-in fallback
+ icons, and make both built-in icon sets user-selectable
+ - Add partial support for Ogg FLAC streams
+ - Preselect the filename of an imported playlist when exporting
+ it again
+ - Automatically set the title of an imported playlist based on
+ the filename
+ - Add a Search and Select dialog to the Winamp interface in Qt
+ mode
+ - Add a Jump to Song dialog to the Winamp interface in Qt mode
+ - Add formatter syntax to allow truncating title strings
+ * Bugs fixed since 4.1:
+ - Fix some fluidsynth settings not working
+ - Add checks to prevent Open Containing Folder from being
+ abused to open other types of file
+ - Fix a crash in the bundled Game_Music_Emu library's SNES
+ emulation
+ - Fix the Winamp interface not minimizing from the Windows
+ taskbar
+ - Fix .mkv files being skipped when opening a folder
+ - Prevent the Qt interface from popping up multiple error
+ dialogs
+ * Bugs fixed since 4.2-beta1:
+ - Don't switch to FileWriter output when no other outputs are
+ available
+ - Update for compatibility with FFmpeg 5.0
+ - Fix hang when reaching the end of some files using FFmpeg
+ - Fix playlist unexpectedly scrolling in Winamp interface
+ - Prevent crash in 3rd-party QtPBFImagePlugin when using Winamp
+ interface
+
+-------------------------------------------------------------------
+Tue Feb 22 08:57:04 UTC 2022 - Wolfgang Bauer <wbauer@tmo.at>
+
+- Fix build with faad again
+
+-------------------------------------------------------------------
+Wed Jan 12 10:22:06 UTC 2022 - Guillaume GARDET <guillaume.gardet@opensuse.org>
+
+- Disable gl-spectrum on %arm and aarch64 to fix build
+- Rename non-existent faad option to aac (actual name)
+
+-------------------------------------------------------------------
+Thu Jun 24 08:57:36 UTC 2021 - Ferdinand Thiessen <rpm@fthiessen.de>
+
+- Add fix-linking-mpg123.patch, required on Leap 15.2 and 15.3,
+ fixes boo#1187525
+
+-------------------------------------------------------------------
+Mon Apr 26 11:38:45 UTC 2021 - Ferdinand Thiessen <rpm@fthiessen.de>
+
+- Update to version 4.1:
+ * New Global Hotkeys plugin for Qt
+- Dropped upstream merged 0001-Implement-qthotkey-plugin.patch
+
+-------------------------------------------------------------------
+Thu Jul 23 07:29:27 UTC 2020 - Petr Vorel <pvorel@suse.cz>
+
+- Use %autosetup -p1
+
+-------------------------------------------------------------------
+Wed Jul 15 18:41:09 UTC 2020 - Alexei Sorokin <sor.alexei@meowr.ru>
+
+- Update to version 4.0.5:
+ * See https://audacious-media-player.org/news/50-audacious-4-0-5-released
+
+-------------------------------------------------------------------
+Fri Jul 10 13:50:33 UTC 2020 - Petr Vorel <pvorel@suse.cz>
+
+- Fix Winamp Default skin by removing wrong skin file
+ * See https://github.com/audacious-media-player/audacious-plugins/pull/93
+
+-------------------------------------------------------------------
+Tue Jun 9 06:39:50 UTC 2020 - Petr Vorel <pvorel@suse.cz>
+
+- Add missing Qt5X11Extras dependency for qthotkey plugin.
+
+-------------------------------------------------------------------
+Wed Jun 3 17:24:18 UTC 2020 - Alexei Sorokin <sor.alexei@meowr.ru>
+
+- Update to version 4.0.4:
+ * See https://audacious-media-player.org/news/49-audacious-4-0-4-released
+
+-------------------------------------------------------------------
+Sat May 23 04:41:57 UTC 2020 - aloisio@gmx.com
+
+- Fix build with faad
+
+-------------------------------------------------------------------
+Thu Apr 30 11:23:47 UTC 2020 - Alexei Sorokin <sor.alexei@meowr.ru>
+
+- Update to version 4.0.3:
+ * See https://audacious-media-player.org/news/48-audacious-4-0-3-released
+- Rebase 0001-Implement-qthotkey-plugin.patch.
+
+-------------------------------------------------------------------
+Sat Apr 25 18:53:28 UTC 2020 - Petr Vorel <petr.vorel@gmail.com>
+
+- 0001-Implement-qthotkey-plugin.patch: Backport qthotkey from
+ commit 9904ac5dfaae18ee1200cfcf64693ee3f33f739a to bring back
+ functionality lost in update to version 4.0.
+
+-------------------------------------------------------------------
+Wed Apr 15 15:23:03 UTC 2020 - Alexei Sorokin <sor.alexei@meowr.ru>
+
+- Update to version 4.0.2:
+ * No changelog available.
+- Remove
+ audacious-plugins-qtglspectrum-qt-opengles-workaround.patch:
+ fixed upstream.
+
+-------------------------------------------------------------------
+Mon Apr 6 12:01:59 UTC 2020 - Alexei Sorokin <sor.alexei@meowr.ru>
+
+- Update to version 4.0.1:
+ * Seeking in audio files when using the SoX resampler plugin will
+ no longer crash the player.
+
+-------------------------------------------------------------------
+Sun Mar 22 19:26:07 UTC 2020 - Alexei Sorokin <sor.alexei@meowr.ru>
+
+- Update to version 4.0:
+ * See https://audacious-media-player.org/news/45-audacious-4-0-released
+- Add audacious-plugins-qtglspectrum-qt-opengles-workaround.patch:
+ Workaround Qt including OpenGLES headers in qtglspectrum
+ (commit a51aa5fc).
+- Disable building the deprecated GTK UI.
+- Build with Meson.
+
+-------------------------------------------------------------------
+Wed Dec 26 20:08:39 UTC 2018 - sor.alexei@meowr.ru
+
+- Update to version 3.10.1:
+ * Bug fixes.
+- Add a licence to the package.
+- Remove the now-useless "resticted" conditional.
+
+-------------------------------------------------------------------
+Tue Oct 30 15:46:44 UTC 2018 - guillaume.gardet@opensuse.org
+
+- Disable glspectrum and qtglspectrum on %arm and aarch64 as openGL
+ is unsupported
+
+-------------------------------------------------------------------
+Thu Aug 9 12:01:37 UTC 2018 - sor.alexei@meowr.ru
+
+- Update to version 3.10:
+ * See the audacious package's changelog.
+- Remove audacious-plugins-qt-5.10.patch: fixed upstream.
+- Switch back to Gtk2 from Gtk3 for the Gtk3 version is gone.
+
+-------------------------------------------------------------------
+Sat Jan 6 12:00:54 UTC 2018 - sor.alexei@meowr.ru
+
+- Add audacious-plugins-qt-5.10.patch: Fix building with Qt 5.10+.
+
+-------------------------------------------------------------------
+Sun Oct 29 11:49:17 UTC 2017 - olaf@aepfle.de
+
+- Remove GTK conditional, it is always enabled and the name is too generic
+- Remove stale Qt conditional
+
+-------------------------------------------------------------------
+Fri Aug 25 06:19:49 UTC 2017 - olaf@aepfle.de
+
+- Remove conditionals for lame, qt and mpg123
+
+-------------------------------------------------------------------
+Wed Aug 23 10:55:30 UTC 2017 - aloisio@gmx.com
+
+- Update to version 3.9 (no changelog available)
+
+- Changed source URL
+
+-------------------------------------------------------------------
+Mon Jun 5 19:09:00 UTC 2017 - sor.alexei@meowr.ru
+
+- Don't build with libmodplug as openmpt is only partially
+ compatible..
+
+-------------------------------------------------------------------
+Thu May 11 09:27:18 UTC 2017 - sor.alexei@meowr.ru
+
+- Enable building with libmpg123 for newer openSUSE releases even
+ outside of Packman.
+
+-------------------------------------------------------------------
+Thu Jan 26 15:09:56 UTC 2017 - sor.alexei@meowr.ru
+
+- Update to version 3.8.2:
+ * No changelog available.
+
+-------------------------------------------------------------------
+Wed Dec 7 15:05:09 UTC 2016 - sor.alexei@meowr.ru
+
+- Update to version 3.8.1:
+ * No changelog available.
+
+-------------------------------------------------------------------
+Fri Sep 23 13:32:17 UTC 2016 - sor.alexei@meowr.ru
+
+- Update to version 3.8:
+ * No changelog available.
+- Place /usr/lib64/audacious/Output/filewriter.so in
+ audacious-plugins-extra because it can be built with MP3 support.
+
+-------------------------------------------------------------------
+Tue Mar 29 18:41:47 UTC 2016 - sor.alexei@meowr.ru
+
+- Update to 3.7.2.
+
+-------------------------------------------------------------------
+Tue Dec 29 05:32:40 UTC 2015 - sor.alexei@meowr.ru
+
+- Update to 3.7.1.
+
+-------------------------------------------------------------------
+Sun Nov 8 15:43:23 UTC 2015 - sor.alexei@meowr.ru
+
+- Update to 3.7.
+- Enable Qt UI.
+
+-------------------------------------------------------------------
+Fri Aug 21 10:01:49 UTC 2015 - sor.alexei@meowr.ru
+
+- Work with Audacious package version instead of ABI version to
+ simplify things a lot.
+
+-------------------------------------------------------------------
 Mon Jun 1 13:19:32 UTC 2015 - sor.alexei@meowr.ru
 
 - Update to 3.6.2.
@@ -165,7 +442,8 @@
 Sun Jul 20 00:00:00 UTC 2008 - detlef@links2linux.de
 
 - resplit subpackages:
- audacious-plugins contains the core-plugins because package managers are stupid ;)
+ audacious-plugins contains the core-plugins because package
+ managers are stupid ;)
 
 -------------------------------------------------------------------
 Wed Jul 9 00:00:00 UTC 2008 - guru@unixtech.be
@@ -282,4 +560,3 @@
 Mon Jul 23 00:00:00 UTC 2007 - detlef@links2linux.de
 
 - initial build <1.4.0-dr1>
-

audacious-plugins.spec Changed

@@ -1,7 +1,7 @@
 #
 # spec file for package audacious-plugins
 #
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2024 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -12,42 +12,56 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
 
-%define aud_plugin_api %(sed -e '/^#define _AUD_PLUGIN_VERSION /!d;s|^^0-9* \$0-9\\+\$ .*$|\\1|g' %{_includedir}/libaudcore/plugin.h)
 %define __provides_exclude_from ^%{_libdir}/audacious/*/.*.so$
-%bcond_without faad
-%bcond_without lame
-%bcond_without ffmpeg
-%bcond_without mpg123
+%define aud_ver_min 4.4
+%define aud_ver_max 4.4.99
+%bcond_with faad
+
+%if 0%{?suse_version} < 1600
+# on Leap/SLE 15 force gcc-13 as QT6 requires C++17 compatibility
+%define force_gcc_version 13
+%endif
+
 Name: audacious-plugins
-Version: 3.6.2
+Version: 4.4.1
 Release: 0
 Summary: Plugins for Audacious
-License: GPL-2.0+ and LGPL-2.1+ and GPL-3.0 and MIT and BSD-2-Clause
-Group: Productivity/Multimedia/Sound/Players
-Url: http://audacious-media-player.org/
-Source: http://distfiles.audacious-media-player.org/%{name}-%{version}-gtk3.tar.bz2
-BuildRequires: autoconf
-BuildRequires: automake
+License: BSD-2-Clause AND GPL-2.0-or-later AND LGPL-2.1-or-later AND GPL-3.0-only AND MIT
+URL: https://audacious-media-player.org/
+Source: https://distfiles.audacious-media-player.org/%{name}-%{version}.tar.bz2
+# PATCH-FIX-OPENSUSE fix-linking-mpg123.patch boo#1187525
+Patch0: fix-linking-mpg123.patch
 BuildRequires: fdupes
-BuildRequires: gcc-c++ >= 4.5
+BuildRequires: gcc%{?force_gcc_version}-c++
+BuildRequires: libmp3lame-devel
 BuildRequires: lirc-devel
+BuildRequires: meson
+BuildRequires: pkgconfig
+BuildRequires: qt6-gui-private-devel
+BuildRequires: sndio-devel
+BuildRequires: cmake(Qt6Core)
+BuildRequires: cmake(Qt6Gui)
+BuildRequires: cmake(Qt6Multimedia)
+BuildRequires: cmake(Qt6Network)
+BuildRequires: cmake(Qt6OpenGL)
+BuildRequires: cmake(Qt6OpenGLWidgets)
+BuildRequires: cmake(Qt6Widgets)
 BuildRequires: pkgconfig(alsa) >= 1.0.16
-BuildRequires: pkgconfig(audacious) >= 3.6
-BuildRequires: pkgconfig(cairo) >= 1.6
-BuildRequires: pkgconfig(dbus-1) >= 0.60
-BuildRequires: pkgconfig(dbus-glib-1) >= 0.60
+BuildRequires: pkgconfig(audacious) >= %{aud_ver_min}
 BuildRequires: pkgconfig(flac) >= 1.2.1
 BuildRequires: pkgconfig(fluidsynth) >= 1.0.6
-BuildRequires: pkgconfig(gio-unix-2.0) >= 2.32
-BuildRequires: pkgconfig(glib-2.0) >= 2.32
-BuildRequires: pkgconfig(gmodule-2.0) >= 2.32
-BuildRequires: pkgconfig(gtk+-3.0) >= 3.4
+BuildRequires: pkgconfig(gl)
+BuildRequires: pkgconfig(glib-2.0)
+BuildRequires: pkgconfig(gtk+-3.0)
 BuildRequires: pkgconfig(jack) >= 1.9.7
-BuildRequires: pkgconfig(libbinio) >= 1.4
+BuildRequires: pkgconfig(json-glib-1.0)
+BuildRequires: pkgconfig(libavcodec) >= 53.40.0
+BuildRequires: pkgconfig(libavformat) >= 53.25.0
+BuildRequires: pkgconfig(libavutil) >= 51.27.0
 BuildRequires: pkgconfig(libbs2b) >= 3.0.0
 BuildRequires: pkgconfig(libcddb) >= 1.2.1
 BuildRequires: pkgconfig(libcdio) >= 0.70
@@ -56,105 +70,94 @@
 BuildRequires: pkgconfig(libcurl) >= 7.9.7
 BuildRequires: pkgconfig(libmms) >= 0.3
 BuildRequires: pkgconfig(libmodplug)
+BuildRequires: pkgconfig(libmpg123) >= 1.12
 BuildRequires: pkgconfig(libnotify) >= 0.7
+BuildRequires: pkgconfig(libopenmpt)
+BuildRequires: pkgconfig(libpipewire-0.3)
 BuildRequires: pkgconfig(libpulse) >= 0.9.5
-BuildRequires: pkgconfig(libsidplayfp) >= 1.0
+BuildRequires: pkgconfig(libsidplayfp) >= 2.0
 BuildRequires: pkgconfig(libxml-2.0)
 BuildRequires: pkgconfig(neon) >= 0.27
 BuildRequires: pkgconfig(ogg) >= 1.0
-BuildRequires: pkgconfig(pango) >= 1.22
+BuildRequires: pkgconfig(opus) >= 1.0.1
+BuildRequires: pkgconfig(opusfile) >= 0.4
 BuildRequires: pkgconfig(samplerate)
 BuildRequires: pkgconfig(sdl2) >= 2.0
 BuildRequires: pkgconfig(sndfile) >= 0.19
 BuildRequires: pkgconfig(soxr)
-BuildRequires: pkgconfig(vorbis) >= 1.0
-BuildRequires: pkgconfig(vorbisenc) >= 1.0
+BuildRequires: pkgconfig(vorbis)
+BuildRequires: pkgconfig(vorbisenc)
 BuildRequires: pkgconfig(vorbisfile) >= 1.0
 BuildRequires: pkgconfig(wavpack) >= 4.31
+BuildRequires: pkgconfig(xcomposite)
+BuildRequires: pkgconfig(xrender)
 BuildRequires: pkgconfig(zlib)
-Recommends: %{name}-lang = %{version}
-Supplements: audacious(plugin-api)%{?_isa} = %{aud_plugin_api}
-Provides: audacious-plugin(Input)%{?_isa} = %{aud_plugin_api}
-Provides: audacious-plugin(Interface)%{?_isa} = %{aud_plugin_api}
-Provides: audacious-plugin(Output)%{?_isa} = %{aud_plugin_api}
+Requires: libaudcore%{?_isa} <= %{aud_ver_max}
+Requires: libaudcore%{?_isa} >= %{aud_ver_min}
+Recommends: %{name}-extra
 %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.21.0
-BuildRequires: pkgconfig(libavutil) >= 51.27.0
-%endif
-%if %{with mpg123}
-BuildRequires: pkgconfig(libmpg123) >= 1.12
-%endif
 
 %description
-Plugins for Audacious audio player.
+Plugins for the Audacious audio player.
 
 %lang_package
 
-%if %{with faad} || %{with ffmpeg} || %{with mpg123}
 %package extra
 Summary: Extra plugins for Audacious
-License: GPL-2.0+ and MIT and BSD-2-Clause
-Group: Productivity/Multimedia/Sound/Players
-Supplements: audacious(plugin-api)%{?_isa} = %{aud_plugin_api}
-Provides: audacious-plugin(Input)%{?_isa} = %{aud_plugin_api}
+License: BSD-2-Clause AND GPL-2.0-or-later AND MIT
+Requires: %{name} = %{version}
 
 %description extra
-Extra plugins for Audacious audio player.
-%endif
+Extra plugins for the Audacious audio player.
 
 %prep
-%setup -q -n %{name}-%{version}-gtk3
+%autosetup -p1
 
 %build
-autoreconf -fi
-%if 0%{?suse_version} <= 1320
-%configure --enable-statusicon
+%if 0%{?force_gcc_version}
+export CC="gcc-%{?force_gcc_version}"
+export CXX="g++-%{?force_gcc_version}"
+%endif
+
+# append this to $PATH as Leap/SLE 15 have the QT6 binaries there
+export PATH="%{_libdir}/qt6/libexec:$PATH"
+
+%meson \
+ -Dqt=true \
+ -Dgtk=true \
+%ifarch %{arm} aarch64
+ -Dgl-spectrum=false \
+%endif
+%if %{with faad}
+ -Daac=true \
 %else
-%configure
+ -Daac=false \
 %endif
-make %{?_smp_mflags}
+ -Dmpg123=true
+%meson_build
 
 %install
-%make_install
+%meson_install
 %find_lang %{name}
-%fdupes %{buildroot}%{_datadir}/%{name}/
+%fdupes %{buildroot}%{_datadir}/
 
 %files
-%defattr(-,root,root)
+%license COPYING
 %{_libdir}/audacious/
 %if %{with faad}
 %exclude %{_libdir}/audacious/Input/aac-raw.so
 %endif
-%if %{with ffmpeg}
-%exclude %{_libdir}/audacious/Input/ffaudio.so
-%endif
-%if %{with mpg123}
-%exclude %{_libdir}/audacious/Input/madplug.so
-%endif
+%exclude %{_libdir}/audacious/Output/filewriter.so
 %{_datadir}/audacious/
 
 %files lang -f %{name}.lang
-%defattr(-,root,root)
 
-%if %{with faad} || %{with ffmpeg} || %{with mpg123}
 %files extra
-%defattr(-,root,root)
 %if %{with faad}
 %{_libdir}/audacious/Input/aac-raw.so
 %endif
-%if %{with ffmpeg}
-%{_libdir}/audacious/Input/ffaudio.so
-%endif
-%if %{with mpg123}
-%{_libdir}/audacious/Input/madplug.so
-%endif
-%endif
+%{_libdir}/audacious/Output/filewriter.so
 
 %changelog

fix-linking-mpg123.patch Added

audacious-plugins-3.6.2-gtk3.tar.bz2/po/ky.po Deleted

@@ -1,3985 +0,0 @@
-# Kirgyz translation for Audacious Plugins
-# Copyright (C) Audacious translators
-# This file is distributed under the same license as the Audacious Plugins package.
-#
-# Translators:
-# chingis, 2013
-# chingis, 2012
-msgid ""
-msgstr ""
-"Project-Id-Version: Audacious Plugins\n"
-"Report-Msgid-Bugs-To: http://redmine.audacious-media-player.org/\n"
-"POT-Creation-Date: 2015-02-28 19:18+0100\n"
-"PO-Revision-Date: 2015-02-04 21:21+0000\n"
-"Last-Translator: Thomas Lange <thomas-lange2@gmx.de>\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"
-"Plural-Forms: nplurals=1; plural=0;\n"
-
-#: src/aac-raw/aac.cc:18
-msgid "AAC (Raw) Decoder"
-msgstr ""
-
-#: src/adplug/adplug-xmms.cc:42
-msgid "AdPlug (AdLib Player)"
-msgstr "AdPlug (AdLib ойноткучу)"
-
-#: src/adplug/adplug-xmms.cc:156 src/modplug/modplugbmp.cc:335
-#: src/psf/plugin.cc:138 src/vtx/vtx.cc:87 src/xsf/plugin.cc:113
-msgid "sequenced"
-msgstr ""
-
-#: src/alarm/alarm.cc:55 src/alarm/interface.cc:82
-msgid "Alarm"
-msgstr "Ойготкуч саат"
-
-#: src/alarm/alarm.cc:782
-msgid "Set Alarm ..."
-msgstr ""
-
-#: src/alarm/alarm.cc:810
-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/interface.cc: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.cc: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.cc: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.cc:81
-msgid "This is your wakeup call."
-msgstr ""
-
-#: src/alarm/interface.cc:99
-msgid "Your reminder for today is..."
-msgstr ""
-
-#: src/alarm/interface.cc:101 src/alarm/interface.cc:386
-msgid "Reminder"
-msgstr "Эске салуу"
-
-#: src/alarm/interface.cc:132
-msgid "Monday"
-msgstr "Дүйшөмбү"
-
-#: src/alarm/interface.cc:132
-msgid "Tuesday"
-msgstr "Шейшемби"
-
-#: src/alarm/interface.cc:132
-msgid "Wednesday"
-msgstr "Шаршемби"
-
-#: src/alarm/interface.cc:133
-msgid "Thursday"
-msgstr "Бейшемби"
-
-#: src/alarm/interface.cc:133
-msgid "Friday"
-msgstr "Жума"
-
-#: src/alarm/interface.cc:133
-msgid "Saturday"
-msgstr "Ишемби"
-
-#: src/alarm/interface.cc:133
-msgid "Sunday"
-msgstr "Жекшемби"
-
-#: src/alarm/interface.cc:171 src/alarm/interface.cc:230
-#: src/alarm/interface.cc:245
-msgid "Time"
-msgstr "Убакыт"
-
-#: src/alarm/interface.cc:178
-msgid "Alarm at (default):"
-msgstr ""
-
-#: src/alarm/interface.cc:200
-msgid "h"
-msgstr "с"
-
-#: src/alarm/interface.cc:203
-msgid "Quiet after:"
-msgstr ""
-
-#: src/alarm/interface.cc:215
-msgid "hours"
-msgstr "саат"
-
-#: src/alarm/interface.cc:226
-msgid "minutes"
-msgstr "мүнөт"
-
-#: src/alarm/interface.cc:235
-msgid "Choose the days for the alarm to come on"
-msgstr ""
-
-#: src/alarm/interface.cc:242
-msgid "Day"
-msgstr "Күн"
-
-#: src/alarm/interface.cc:259 src/bs2b/plugin.cc:130
-#: src/skins/preset-list.cc:434 src/skins/preset-list.cc:440
-msgid "Default"
-msgstr "Жарыяланбас"
-
-#: src/alarm/interface.cc:288
-msgid "Days"
-msgstr "Күндөр"
-
-#: src/alarm/interface.cc:297
-msgid "Fading"
-msgstr "Басаңчалоо"
-
-#: src/alarm/interface.cc:305 src/console/plugin.cc:41
-#: src/crossfade/crossfade.cc:53 src/crossfade/crossfade.cc:59
-#: src/gtkui/settings.cc:49 src/lirc/lirc.cc:397 src/sid/xs_config.cc:85
-#: src/sid/xs_config.cc:94 src/sid/xs_config.cc:103
-msgid "seconds"
-msgstr "секунда"
-
-#: src/alarm/interface.cc:312 src/alarm/interface.cc:353
-msgid "Volume"
-msgstr "Катуулук"
-
-#: src/alarm/interface.cc:317
-msgid "Start at"
-msgstr ""
-
-#: src/alarm/interface.cc:333
-msgid "Final"
-msgstr "Аяктоо"
-
-#: src/alarm/interface.cc:346
-msgid "Current"
-msgstr "Кезектеги"
-
-#: src/alarm/interface.cc:359
-msgid "Additional Command"
-msgstr "Кошумча команда"
-
-#: src/alarm/interface.cc:365 src/alarm/interface.cc:391
-msgid "enable"
-msgstr "күйгүзүү"
-
-#: src/alarm/interface.cc:372
-msgid "Playlist (optional)"
-msgstr ""
-
-#: src/alarm/interface.cc:379
-msgid "Select a playlist"
-msgstr "Ойнотуу тизмесин тандаңыз"
-
-#: src/alarm/interface.cc:399
-msgid "Options"
-msgstr "Опциялар"
-
-#: src/alarm/interface.cc:404
-msgid "What do these options mean?"
-msgstr ""
-
-#: src/alarm/interface.cc:420
-msgid "Help"
-msgstr "Жардам"
-
-#: src/albumart/albumart.cc:31
-msgid "Album Art"
-msgstr "Альбом тышы"
-
-#: src/albumart-qt/albumart.cc:33
-msgid "Album Art (Qt)"
-msgstr ""
-
-#: src/alsa/alsa.h:70
-msgid "ALSA Output"
-msgstr "ALSA чыгышы"
-
-#: src/alsa/config.cc:28
-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/config.cc:61
-msgid "(no description)"
-msgstr ""
-
-#: src/alsa/config.cc:166
-msgid "Default PCM device"
-msgstr "Жарыяланбас PCM орнотмосу"
-
-#: src/alsa/config.cc:188
-msgid "Default mixer device"
-msgstr "Жарыяланбас микшер орнотмосу"
-
-#: src/alsa/config.cc:296
-msgid "PCM device:"
-msgstr "PCM орнотмосу:"
-
-#: src/alsa/config.cc:299
-msgid "Mixer device:"
-msgstr "Микшер орнотмосу:"
-
-#: src/alsa/config.cc:302
-msgid "Mixer element:"
-msgstr "Микшер элементи:"
-
-#: src/amidi-plug/amidi-plug.cc:41
-msgid "AMIDI-Plug (MIDI Player)"
-msgstr ""
-
-#: src/amidi-plug/amidi-plug.cc:437
-msgid ""
-"AMIDI-Plug\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/amidi-plug/i_configure.cc:94
-msgid "Override default gain:"
-msgstr ""
-
-#: src/amidi-plug/i_configure.cc:102
-msgid "Override default polyphony:"
-msgstr ""
-
-#: src/amidi-plug/i_configure.cc:110
-msgid "Override default reverb:"
-msgstr ""
-
-#: src/amidi-plug/i_configure.cc:112 src/amidi-plug/i_configure.cc:120
-msgid "On"
-msgstr ""
-
-#: src/amidi-plug/i_configure.cc:118
-msgid "Override default chorus:"
-msgstr ""
-
-#: src/amidi-plug/i_configure.cc:128 src/console/plugin.cc:29
-msgid "Playback"
-msgstr ""
-
-#: src/amidi-plug/i_configure.cc:129
-msgid "Transpose:"
-msgstr ""
-
-#: src/amidi-plug/i_configure.cc:131
-msgid "semitones"
-msgstr ""
-
-#: src/amidi-plug/i_configure.cc:132
-msgid "Drum shift:"
-msgstr ""
-
-#: src/amidi-plug/i_configure.cc:134
-msgid "note numbers"
-msgstr ""
-
-#: src/amidi-plug/i_configure.cc:135
-msgid "Skip leading silence"
-msgstr ""
-
-#: src/amidi-plug/i_configure.cc:137
-msgid "Skip trailing silence"
-msgstr ""
-
-#: src/amidi-plug/i_configure.cc:141
-msgid "SoundFont"
-msgstr ""
-
-#: src/amidi-plug/i_configure.cc:143
-msgid "Synthesizer"
-msgstr ""
-
-#: src/amidi-plug/i_configure.cc:148 src/console/plugin.cc:45
-#: src/sid/xs_config.cc:65
-msgid "Sample rate:"
-msgstr ""
-
-#: src/amidi-plug/i_configure.cc:150 src/bs2b/plugin.cc:141
-#: src/console/plugin.cc:47 src/modplug/plugin_main.cc:78
-#: src/resample/resample.cc:201 src/resample/resample.cc:207
-#: src/resample/resample.cc:211 src/resample/resample.cc:215
-#: src/resample/resample.cc:219 src/resample/resample.cc:223
-#: src/resample/resample.cc:227 src/resample/resample.cc:231
-#: src/resample/resample.cc:235 src/resample/resample.cc:239
-#: src/resample/resample.cc:243 src/sid/xs_config.cc:67
-#: src/sox-resampler/sox-resampler.cc:163
-msgid "Hz"
-msgstr "Гц"
-
-#: src/amidi-plug/i_configure-fluidsynth.cc:52
-msgid "AMIDI-Plug - select SoundFont file"
-msgstr ""
-
-#: src/amidi-plug/i_configure-fluidsynth.cc:55 src/filewriter/mp3.cc:658
-msgid "_Cancel"
-msgstr ""
-
-#: src/amidi-plug/i_configure-fluidsynth.cc:56
-msgid "_Open"
-msgstr ""
-
-#: src/amidi-plug/i_configure-fluidsynth.cc:225 src/gtkui/columns.cc:46
-msgid "File name"
-msgstr "Файл аты"
-
-#: src/amidi-plug/i_configure-fluidsynth.cc:229
-msgid "Size (bytes)"
-msgstr "Өлчөм (байт)"
-
-#: src/amidi-plug/i_fileinfo.cc:163
-msgid "Name:"
-msgstr "Аты:"
-
-#: src/amidi-plug/i_fileinfo.cc:181
-msgid " MIDI Info "
-msgstr " MIDI маалыматы "
-
-#: src/amidi-plug/i_fileinfo.cc:195
-msgid "Format:"
-msgstr "Формат:"
-
-#: src/amidi-plug/i_fileinfo.cc:198
-msgid "Length (msec):"
-msgstr "Узундук (мс):"
-
-#: src/amidi-plug/i_fileinfo.cc:201
-msgid "No. of Tracks:"
-msgstr ""
-
-#: src/amidi-plug/i_fileinfo.cc:207
-msgid "variable"
-msgstr "өзгөрмө"
-
-#: src/amidi-plug/i_fileinfo.cc:209
-msgid "BPM:"
-msgstr "BPM:"
-
-#: src/amidi-plug/i_fileinfo.cc:217
-msgid "BPM (wavg):"
-msgstr "BPM (wavg):"
-
-#: src/amidi-plug/i_fileinfo.cc:220
-msgid "Time Div:"
-msgstr "Time Div:"
-
-#: src/amidi-plug/i_fileinfo.cc:231
-msgid " MIDI Comments and Lyrics "
-msgstr " MIDI комментарийлер жана сөздөрү "
-
-#: src/amidi-plug/i_fileinfo.cc:278
-msgid "* no comments available in this MIDI file *"
-msgstr ""
-
-#: src/amidi-plug/i_fileinfo.cc:290
-msgid "* no lyrics available in this MIDI file *"
-msgstr ""
-
-#: src/amidi-plug/i_fileinfo.cc:300 src/filewriter/vorbis.cc:197
-#: src/ladspa/plugin.cc:416
-msgid "_Close"
-msgstr "_Жабуу"
-
-#: src/amidi-plug/i_fileinfo.cc:325
-msgid " (invalid UTF-8)"
-msgstr " (туура эмес UTF-8)"
-
-#: src/aosd/aosd.cc:32
-msgid ""
-"Audacious OSD\n"
-"http://www.develia.org/projects.php?p=audacious#aosd\n"
-"\n"
-"Written by Giacomo Lozito <james@develia.org>\n"
-"\n"
-"Based in part on Evan Martin's Ghosd library:\n"
-"http://neugierig.org/software/ghosd/"
-msgstr ""
-
-#: src/aosd/aosd.h:37
-msgid "AOSD (On-Screen Display)"
-msgstr ""
-
-#: src/aosd/aosd_style.cc:54
-msgid "Rectangle"
-msgstr "Тик бурчтук"
-
-#: src/aosd/aosd_style.cc:59
-msgid "Rounded Rectangle"
-msgstr "Тоголоктолгон тик бурчтук"
-
-#: src/aosd/aosd_style.cc:64
-msgid "Concave Rectangle"
-msgstr "Чуңкурайган тик бурчтук"
-
-#: src/aosd/aosd_style.cc:69
-msgid "None"
-msgstr "Жок"
-
-#: src/aosd/aosd_trigger.cc:50
-msgid "Playback Start"
-msgstr "Ойнотуунун башы"
-
-#: src/aosd/aosd_trigger.cc:51
-msgid "Triggers OSD when a playlist entry is played."
-msgstr ""
-
-#: src/aosd/aosd_trigger.cc:56
-msgid "Title Change"
-msgstr "Атын өзгөртүү"
-
-#: src/aosd/aosd_trigger.cc:57
-msgid "Triggers OSD when the song title changes (for internet streams)."
-msgstr ""
-
-#: src/aosd/aosd_trigger.cc:62
-msgid "Pause On"
-msgstr ""
-
-#: src/aosd/aosd_trigger.cc:63
-msgid "Triggers OSD when playback is paused."
-msgstr ""
-
-#: src/aosd/aosd_trigger.cc:68
-msgid "Pause Off"
-msgstr ""
-
-#: src/aosd/aosd_trigger.cc:69
-msgid "Triggers OSD when playback is unpaused."
-msgstr ""
-
-#: src/aosd/aosd_ui.cc:163
-msgid "Placement"
-msgstr "Турган жери"
-
-#: src/aosd/aosd_ui.cc:196
-msgid "Relative X offset:"
-msgstr ""
-
-#: src/aosd/aosd_ui.cc:203
-msgid "Relative Y offset:"
-msgstr ""
-
-#: src/aosd/aosd_ui.cc:210
-msgid "Max OSD width:"
-msgstr ""
-
-#: src/aosd/aosd_ui.cc:221
-msgid "Multi-Monitor options"
-msgstr ""
-
-#: src/aosd/aosd_ui.cc:225
-msgid "Display OSD using:"
-msgstr ""
-
-#: src/aosd/aosd_ui.cc:227
-msgid "all monitors"
-msgstr ""
-
-#: src/aosd/aosd_ui.cc:230
-#, c-format
-msgid "monitor %i"
-msgstr ""
-
-#: src/aosd/aosd_ui.cc:282
-msgid "Timing (ms)"
-msgstr ""
-
-#: src/aosd/aosd_ui.cc:287
-msgid "Display:"
-msgstr ""
-
-#: src/aosd/aosd_ui.cc:292
-msgid "Fade in:"
-msgstr ""
-
-#: src/aosd/aosd_ui.cc:297
-msgid "Fade out:"
-msgstr ""
-
-#: src/aosd/aosd_ui.cc:361
-msgid "Fonts"
-msgstr "Шрифттер"
-
-#: src/aosd/aosd_ui.cc:368
-#, c-format
-msgid "Font %i:"
-msgstr ""
-
-#: src/aosd/aosd_ui.cc:382
-msgid "Shadow"
-msgstr "Көлөкө"
-
-#: src/aosd/aosd_ui.cc:486
-msgid "Render Style"
-msgstr ""
-
-#: src/aosd/aosd_ui.cc:502
-msgid "Colors"
-msgstr "Түстөр"
-
-#: src/aosd/aosd_ui.cc:513
-#, c-format
-msgid "Color %i:"
-msgstr ""
-
-#: src/aosd/aosd_ui.cc:600
-msgid "Enable trigger"
-msgstr ""
-
-#: src/aosd/aosd_ui.cc:627
-msgid "Event"
-msgstr "Окуя"
-
-#: src/aosd/aosd_ui.cc:655
-msgid "Composite manager detected"
-msgstr ""
-
-#: src/aosd/aosd_ui.cc:662
-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.cc:670
-msgid "Composite manager not required for fake transparency"
-msgstr ""
-
-#: src/aosd/aosd_ui.cc:706
-msgid "Transparency"
-msgstr "Тунуктук"
-
-#: src/aosd/aosd_ui.cc:712
-msgid "Fake transparency"
-msgstr ""
-
-#: src/aosd/aosd_ui.cc:714
-msgid "Real transparency (requires X Composite Ext.)"
-msgstr ""
-
-#: src/aosd/aosd_ui.cc:756
-msgid "Composite extension not loaded"
-msgstr ""
-
-#: src/aosd/aosd_ui.cc:764
-msgid "Composite extension not available"
-msgstr ""
-
-#: src/aosd/aosd_ui.cc:781
-#, c-format
-msgid "Audacious OSD"
-msgstr "Audacious OSD"
-
-#: src/aosd/aosd_ui.cc:844
-msgid "Position"
-msgstr "Орун"
-
-#: src/aosd/aosd_ui.cc:849
-msgid "Animation"
-msgstr "Анимация"
-
-#: src/aosd/aosd_ui.cc:854
-msgid "Text"
-msgstr "Текст"
-
-#: src/aosd/aosd_ui.cc:859
-msgid "Decoration"
-msgstr "Стиль"
-
-#: src/aosd/aosd_ui.cc:864
-msgid "Trigger"
-msgstr ""
-
-#: src/aosd/aosd_ui.cc:869
-msgid "Misc"
-msgstr ""
-
-#: src/aosd/aosd_ui.cc:878
-msgid "Test"
-msgstr ""
-
-#: src/asx3/asx3.cc:35
-msgid "ASXv3 Playlists"
-msgstr ""
-
-#: src/asx/asx.cc:33
-msgid "ASXv1/ASXv2 Playlists"
-msgstr "ASXv1/ASXv2 ойнотуу тизмелери"
-
-#: src/audpl/audpl.cc:33
-msgid "Audacious Playlists (audpl)"
-msgstr "Audacious ойнотуу тизмелери (audpl)"
-
-#: src/blur_scope/blur_scope.cc:42
-msgid "Color"
-msgstr "Түс"
-
-#: src/blur_scope/blur_scope.cc:58
-msgid "Blur Scope"
-msgstr "Күңүрт диапазон"
-
-#: src/bs2b/plugin.cc:38
-msgid "Bauer Stereophonic-to-Binaural (BS2B)"
-msgstr ""
-
-#: src/bs2b/plugin.cc:129
-msgid "Presets:"
-msgstr "Пресеттер:"
-
-#: src/bs2b/plugin.cc:136
-msgid "Feed level:"
-msgstr ""
-
-#: src/bs2b/plugin.cc:138
-msgid "x1/10 dB"
-msgstr ""
-
-#: src/bs2b/plugin.cc:139
-msgid "Cut frequency:"
-msgstr ""
-
-#: src/cairo-spectrum/cairo-spectrum.cc:41
-msgid "Spectrum Analyzer"
-msgstr "Спектр талдагычы"
-
-#: src/cdaudio-ng/cdaudio-ng.cc:72
-msgid "Audio CD Plugin"
-msgstr "Аудио CD плагини"
-
-#: src/cdaudio-ng/cdaudio-ng.cc:121
-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.cc:137
-msgid "Device"
-msgstr "Орнотмо"
-
-#: src/cdaudio-ng/cdaudio-ng.cc:138
-msgid "Read speed:"
-msgstr "Окуу ылдамдыгы:"
-
-#: src/cdaudio-ng/cdaudio-ng.cc:141
-msgid "Override device:"
-msgstr ""
-
-#: src/cdaudio-ng/cdaudio-ng.cc:143
-msgid "Metadata"
-msgstr "Метамаалымат"
-
-#: src/cdaudio-ng/cdaudio-ng.cc:144
-msgid "Use CD-Text"
-msgstr "CD-Text колдонуу"
-
-#: src/cdaudio-ng/cdaudio-ng.cc:146
-msgid "Use CDDB"
-msgstr "CDDB колдонуу"
-
-#: src/cdaudio-ng/cdaudio-ng.cc:148
-msgid "Use HTTP instead of CDDBP"
-msgstr ""
-
-#: src/cdaudio-ng/cdaudio-ng.cc:151
-msgid "Server:"
-msgstr "Сервер:"
-
-#: src/cdaudio-ng/cdaudio-ng.cc:155
-msgid "Path:"
-msgstr "Жол:"
-
-#: src/cdaudio-ng/cdaudio-ng.cc:159
-msgid "Port:"
-msgstr "Порт:"
-
-#: src/cdaudio-ng/cdaudio-ng.cc:246
-msgid "Failed to initialize cdio subsystem."
-msgstr ""
-
-#: src/cdaudio-ng/cdaudio-ng.cc:281
-#, c-format
-msgid "Invalid URI %s."
-msgstr ""
-
-#: src/cdaudio-ng/cdaudio-ng.cc:283
-#, c-format
-msgid "Track %d not found."
-msgstr ""
-
-#: src/cdaudio-ng/cdaudio-ng.cc:285
-#, c-format
-msgid "Track %d is a data track."
-msgstr ""
-
-#: src/cdaudio-ng/cdaudio-ng.cc:360
-msgid "Error reading audio CD."
-msgstr ""
-
-#: src/cdaudio-ng/cdaudio-ng.cc:429
-msgid "Audio CD"
-msgstr "Аудио CD"
-
-#: src/cdaudio-ng/cdaudio-ng.cc:460 src/cdaudio-ng/cdaudio-ng.cc:469
-#, c-format
-msgid "Failed to open CD device %s."
-msgstr "%s CD орнотмосун ачуу оңунан чыккан жок."
-
-#: src/cdaudio-ng/cdaudio-ng.cc:472
-msgid "No audio capable CD drive found."
-msgstr ""
-
-#: src/cdaudio-ng/cdaudio-ng.cc:497
-msgid "Failed to finish initializing opened CD drive."
-msgstr ""
-
-#: src/cdaudio-ng/cdaudio-ng.cc:510
-msgid "Failed to retrieve first/last track number."
-msgstr ""
-
-#: src/cdaudio-ng/cdaudio-ng.cc:531
-#, c-format
-msgid "Cannot read start/end LSN for track %d."
-msgstr ""
-
-#: src/cdaudio-ng/cdaudio-ng.cc:613
-msgid "Failed to create the cddb connection."
-msgstr ""
-
-#: src/cdaudio-ng/cdaudio-ng.cc:679
-msgid "Failed to query the CDDB server"
-msgstr ""
-
-#: src/cdaudio-ng/cdaudio-ng.cc:681
-#, c-format
-msgid "Failed to query the CDDB server: %s"
-msgstr ""
-
-#: src/cdaudio-ng/cdaudio-ng.cc:705
-#, c-format
-msgid "Failed to read the cddb info: %s"
-msgstr ""
-
-#: src/cdaudio-ng/cdaudio-ng.cc:765
-msgid "Drive is empty."
-msgstr ""
-
-#: src/cdaudio-ng/cdaudio-ng.cc:767
-msgid "Unsupported disk type."
-msgstr ""
-
-#: src/cd-menu-items/cd-menu-items.cc:35
-msgid "Audio CD Menu Items"
-msgstr ""
-
-#: src/cd-menu-items/cd-menu-items.cc:47
-msgid "Play CD"
-msgstr "CD ойнотуу"
-
-#: src/cd-menu-items/cd-menu-items.cc:47
-msgid "Add CD"
-msgstr "CD кошуу"
-
-#: src/compressor/compressor.cc:45
-msgid "Compression"
-msgstr "Кысылыш"
-
-#: src/compressor/compressor.cc:46
-msgid "Center volume:"
-msgstr "Борбор катуулугу:"
-
-#: src/compressor/compressor.cc:49
-msgid "Dynamic range:"
-msgstr "Динамикалык диапазон:"
-
-#: src/compressor/compressor.cc:57
-msgid ""
-"Dynamic Range Compression Plugin for Audacious\n"
-"Copyright 2010-2014 John Lindgren"
-msgstr ""
-
-#: src/compressor/compressor.cc:64
-msgid "Dynamic Range Compressor"
-msgstr ""
-
-#: src/console/plugin.cc:15
-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/console/plugin.cc:30
-msgid "Bass:"
-msgstr "Бас:"
-
-#: src/console/plugin.cc:33
-msgid "Treble:"
-msgstr ""
-
-#: src/console/plugin.cc:36
-msgid "Echo:"
-msgstr ""
-
-#: src/console/plugin.cc:39
-msgid "Default song length:"
-msgstr "Жарыяланбас ыр узундугу:"
-
-#: src/console/plugin.cc:42 src/modplug/plugin_main.cc:59
-msgid "Resampling"
-msgstr ""
-
-#: src/console/plugin.cc:43
-msgid "Enable audio resampling"
-msgstr ""
-
-#: src/console/plugin.cc:49
-msgid "SPC"
-msgstr ""
-
-#: src/console/plugin.cc:50
-msgid "Ignore length from SPC tags"
-msgstr ""
-
-#: src/console/plugin.cc:52
-msgid "Increase reverb"
-msgstr ""
-
-#: src/console/plugin.h:26
-msgid "Game Console Music Decoder"
-msgstr ""
-
-#: src/coreaudio/coreaudio.cc:50
-msgid "CoreAudio output"
-msgstr ""
-
-#: src/coreaudio/coreaudio.cc:131
-msgid ""
-"CoreAudio Output Plugin for Audacious\n"
-"Copyright 2014 William Pitcock\n"
-"\n"
-"Based on SDL Output Plugin for Audacious\n"
-"Copyright 2010 John Lindgren"
-msgstr ""
-
-#: src/coreaudio/coreaudio.cc:143
-msgid "Use exclusive mode"
-msgstr ""
-
-#: src/crossfade/crossfade.cc:44
-msgid ""
-"Crossfade Plugin for Audacious\n"
-"Copyright 2010-2014 John Lindgren"
-msgstr ""
-
-#: src/crossfade/crossfade.cc:48
-msgid "Crossfade"
-msgstr ""
-
-#: src/crossfade/crossfade.cc:49
-msgid "On automatic song change"
-msgstr ""
-
-#: src/crossfade/crossfade.cc:51 src/crossfade/crossfade.cc:57
-msgid "Overlap:"
-msgstr ""
-
-#: src/crossfade/crossfade.cc:55
-msgid "On seek or manual song change"
-msgstr ""
-
-#: src/crossfade/crossfade.cc:61
-msgid "Tip"
-msgstr ""
-
-#: src/crossfade/crossfade.cc:62
-msgid ""
-"For better crossfading, enable\n"
-"the Silence Removal effect."
-msgstr ""
-
-#: src/crossfade/crossfade.cc:72
-msgid "Crossfade"
-msgstr ""
-
-#: src/crossfade/crossfade.cc:161
-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.cc:168
-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/crystalizer/crystalizer.cc:31
-msgid "Crystalizer"
-msgstr "Кристализатор"
-
-#: src/crystalizer/crystalizer.cc:32 src/stereo_plugin/stereo.cc:45
-msgid "Intensity:"
-msgstr "Интенсивдүүлүк:"
-
-#: src/crystalizer/crystalizer.cc:43
-msgid "Crystalizer"
-msgstr "Кристализатор"
-
-#: src/cue/cue.cc:37
-msgid "Cue Sheet Plugin"
-msgstr ""
-
-#: src/delete-files/delete-files.cc:46 src/delete-files/delete-files.cc:146
-msgid "Delete Files"
-msgstr ""
-
-#: src/delete-files/delete-files.cc:75
-#, c-format
-msgid "Error moving %s to trash: %s."
-msgstr ""
-
-#: src/delete-files/delete-files.cc:86
-#, c-format
-msgid "Error deleting %s: %s."
-msgstr ""
-
-#: src/delete-files/delete-files.cc:117
-#, c-format
-msgid "Error deleting %s: not a local file."
-msgstr ""
-
-#: src/delete-files/delete-files.cc:134
-msgid "Do you want to move the selected files to the trash?"
-msgstr ""
-
-#: src/delete-files/delete-files.cc:135
-msgid "Move to Trash"
-msgstr ""
-
-#: src/delete-files/delete-files.cc:140
-msgid "Do you want to permanently delete the selected files?"
-msgstr ""
-
-#: src/delete-files/delete-files.cc:141 src/skins/preset-list.cc:411
-#: src/skins/preset-list.cc:427
-msgid "Delete"
-msgstr "Өчүрүү"
-
-#: src/delete-files/delete-files.cc:145 src/skins/preset-browser.cc:56
-#: src/skins/preset-list.cc:307 src/skins/ui_playlist.cc:221
-msgid "Cancel"
-msgstr "Айнуу"
-
-#: src/delete-files/delete-files.cc:166
-msgid "Delete Selected Files"
-msgstr ""
-
-#: src/delete-files/delete-files.cc:181
-msgid "Delete Method"
-msgstr ""
-
-#: src/delete-files/delete-files.cc:182
-msgid "Move to trash instead of deleting immediately"
-msgstr ""
-
-#: src/echo_plugin/echo.cc:9
-msgid ""
-"Echo Plugin\n"
-"By Johan Levin, 1999\n"
-"Surround echo by Carl van Schaik, 1999\n"
-"Updated for Audacious by William Pitcock and John Lindgren, 2010-2014"
-msgstr ""
-
-#: src/echo_plugin/echo.cc:21
-msgid "Echo"
-msgstr "Жаңырык"
-
-#: src/echo_plugin/echo.cc:22 src/modplug/plugin_main.cc:73
-#: src/modplug/plugin_main.cc:83
-msgid "Delay:"
-msgstr "Кечигүү:"
-
-#: src/echo_plugin/echo.cc:24 src/modplug/plugin_main.cc:73
-#: src/modplug/plugin_main.cc:83
-msgid "ms"
-msgstr "мс"
-
-#: src/echo_plugin/echo.cc:25
-msgid "Feedback:"
-msgstr "Кербайланыш:"
-
-#: src/echo_plugin/echo.cc:28 src/modplug/plugin_main.cc:87
-msgid "Volume:"
-msgstr "Катуулук:"
-
-#: src/echo_plugin/echo.cc:39
-msgid "Echo"
-msgstr "Эхо"
-
-#: src/ffaudio/ffaudio-core.cc:41
-msgid "FFmpeg Plugin"
-msgstr "FFmpeg плагини"
-
-#: src/ffaudio/ffaudio-core.cc:571
-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/filewriter/filewriter.cc:45
-msgid "FileWriter Plugin"
-msgstr ""
-
-#: src/filewriter/filewriter.cc:386
-msgid "Output file format:"
-msgstr "Чыгыш файл форматы:"
-
-#: src/filewriter/filewriter.cc:403
-msgid "Configure"
-msgstr "Ырастоо"
-
-#: src/filewriter/filewriter.cc:413
-msgid "Save into original directory"
-msgstr ""
-
-#: src/filewriter/filewriter.cc:417
-msgid "Save into custom directory"
-msgstr "Тапшырылма каталогго сактоо"
-
-#: src/filewriter/filewriter.cc:427
-msgid "Output file folder:"
-msgstr "Чыгыш файл каталогу:"
-
-#: src/filewriter/filewriter.cc:431
-msgid "Pick a folder"
-msgstr "Каталогду тандоо"
-
-#: src/filewriter/filewriter.cc:444
-msgid "Generate file name from:"
-msgstr ""
-
-#: src/filewriter/filewriter.cc:448
-msgid "Original file tag"
-msgstr ""
-
-#: src/filewriter/filewriter.cc:453
-msgid "Original file name"
-msgstr ""
-
-#: src/filewriter/filewriter.cc:459
-msgid "Include original file name extension"
-msgstr ""
-
-#: src/filewriter/filewriter.cc:468
-msgid "Prepend track number to file name"
-msgstr ""
-
-#: src/filewriter/filewriter.cc:484
-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/mp3.cc:40 src/filewriter/mp3.cc:717
-msgid "Auto"
-msgstr "Автоматтуу"
-
-#: src/filewriter/mp3.cc:40
-msgid "Joint Stereo"
-msgstr ""
-
-#: src/filewriter/mp3.cc:41 src/modplug/plugin_main.cc:58
-#: src/mpg123/mpg123.cc:248
-msgid "Stereo"
-msgstr "Стерео"
-
-#: src/filewriter/mp3.cc:41 src/modplug/plugin_main.cc:57
-#: src/mpg123/mpg123.cc:248
-msgid "Mono"
-msgstr "Моно"
-
-#: src/filewriter/mp3.cc:657
-msgid "MP3 Configuration"
-msgstr ""
-
-#: src/filewriter/mp3.cc:658
-msgid "_OK"
-msgstr ""
-
-#: src/filewriter/mp3.cc:681
-msgid "Algorithm Quality:"
-msgstr "Алгоритм сапаты:"
-
-#: src/filewriter/mp3.cc:706
-msgid "Output Sample Rate:"
-msgstr ""
-
-#: src/filewriter/mp3.cc:733
-msgid "(Hz)"
-msgstr "(Гц)"
-
-#: src/filewriter/mp3.cc:740
-msgid "Bitrate / Compression Ratio:"
-msgstr ""
-
-#: src/filewriter/mp3.cc:764
-msgid "Bitrate (kbps):"
-msgstr "Битрейт (кбит/с):"
-
-#: src/filewriter/mp3.cc:796
-msgid "Compression ratio:"
-msgstr ""
-
-#: src/filewriter/mp3.cc:820
-msgid "Audio Mode:"
-msgstr "Аудио режими:"
-
-#: src/filewriter/mp3.cc:845
-msgid "Miscellaneous:"
-msgstr ""
-
-#: src/filewriter/mp3.cc:856
-msgid "Enforce strict ISO compliance"
-msgstr ""
-
-#: src/filewriter/mp3.cc:867
-msgid "Error protection"
-msgstr "Каталардан коргоо"
-
-#: src/filewriter/mp3.cc:879 src/filewriter/vorbis.cc:206
-msgid "Quality"
-msgstr "Сапат"
-
-#: src/filewriter/mp3.cc:888
-msgid "Enable VBR/ABR"
-msgstr "VBR/ABR күйгүзүү"
-
-#: src/filewriter/mp3.cc:898
-msgid "Type:"
-msgstr "Түр:"
-
-#: src/filewriter/mp3.cc:931
-msgid "VBR Options:"
-msgstr "VBR параметрлери:"
-
-#: src/filewriter/mp3.cc:947
-msgid "Minimum bitrate (kbps):"
-msgstr "Төмөнчек битрейти (кбит/с):"
-
-#: src/filewriter/mp3.cc:973
-msgid "Maximum bitrate (kbps):"
-msgstr "Жогорчек битрейти (кбит/с):"
-
-#: src/filewriter/mp3.cc:995
-msgid "Strictly enforce minimum bitrate"
-msgstr ""
-
-#: src/filewriter/mp3.cc:1007
-msgid "ABR Options:"
-msgstr "ABR параметрлери:"
-
-#: src/filewriter/mp3.cc:1017
-msgid "Average bitrate (kbps):"
-msgstr "Орточо битрейт (кбит/с):"
-
-#: src/filewriter/mp3.cc:1044
-msgid "VBR quality level:"
-msgstr "VBR сапат деңгээли:"
-
-#: src/filewriter/mp3.cc:1063
-msgid "Omit Xing VBR header"
-msgstr ""
-
-#: src/filewriter/mp3.cc:1076
-msgid "VBR/ABR"
-msgstr "VBR/ABR"
-
-#: src/filewriter/mp3.cc:1085
-msgid "Frame Parameters:"
-msgstr ""
-
-#: src/filewriter/mp3.cc:1097
-msgid "Mark as copyright"
-msgstr "Автордук укук менен корголгон деп белгилөө"
-
-#: src/filewriter/mp3.cc:1108
-msgid "Mark as original"
-msgstr "Оригинал деп белгилөө"
-
-#: src/filewriter/mp3.cc:1120
-msgid "ID3 Parameters:"
-msgstr ""
-
-#: src/filewriter/mp3.cc:1131
-msgid "Force addition of version 2 tag"
-msgstr ""
-
-#: src/filewriter/mp3.cc:1141
-msgid "Only add v1 tag"
-msgstr ""
-
-#: src/filewriter/mp3.cc:1148
-msgid "Only add v2 tag"
-msgstr ""
-
-#: src/filewriter/mp3.cc:1169
-msgid "Tags"
-msgstr "Тегдер"
-
-#: src/filewriter/vorbis.cc:196
-msgid "Vorbis Encoder Configuration"
-msgstr "Vorbis кодегин ырастоо"
-
-#: src/filewriter/vorbis.cc:219
-msgid "Quality level (0 - 10):"
-msgstr "Сапат деңгээли (0 - 10):"
-
-#: src/flacng/flacng.h:35
-msgid "FLAC Decoder"
-msgstr "FLAC декодери"
-
-#: src/flacng/metadata.cc:351 src/wavpack/wavpack.cc:209
-msgid "lossless"
-msgstr ""
-
-#: src/flacng/plugin.cc:169
-msgid ""
-"Original code by\n"
-"Ralf Ertzinger <ralf@skytale.net>\n"
-"\n"
-"http://www.skytale.net/projects/bmp-flac2/"
-msgstr ""
-
-#: src/gio/gio.cc:34
-msgid ""
-"GIO Plugin for Audacious\n"
-"Copyright 2009-2012 John Lindgren"
-msgstr ""
-
-#: src/gio/gio.cc:42
-msgid "GIO Plugin"
-msgstr "GIO плагини"
-
-#: src/gio/gio.cc:153
-msgid "Read-and-append mode not supported"
-msgstr ""
-
-#: src/gio/gio.cc:166
-msgid "Invalid open mode"
-msgstr ""
-
-#: src/gl-spectrum/gl-spectrum.cc:51
-msgid ""
-"OpenGL Spectrum Analyzer for Audacious\n"
-"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\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.cc:62
-msgid "OpenGL Spectrum Analyzer"
-msgstr ""
-
-#: src/gl-spectrum-qt/gl-spectrum.cc:41
-msgid ""
-"OpenGL Spectrum Analyzer for Audacious\n"
-"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
-"Copyright 2014 William Pitcock\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-qt/gl-spectrum.cc:53
-msgid "OpenGL Spectrum Analyzer (Qt)"
-msgstr ""
-
-#: src/gnomeshortcuts/gnomeshortcuts.cc:38
-msgid "GNOME Shortcuts"
-msgstr ""
-
-#: src/gnomeshortcuts/gnomeshortcuts.cc:54
-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/gtkui/columns.cc:35
-msgid "Entry number"
-msgstr "Жазуунун номери"
-
-#: src/gtkui/columns.cc:36 src/playlist-manager/playlist-manager.cc:225
-#: src/qtui/playlist_model.cc:123
-msgid "Title"
-msgstr "Ат"
-
-#: src/gtkui/columns.cc:37 src/qtui/playlist_model.cc:125
-msgid "Artist"
-msgstr "Аткаруучу"
-
-#: src/gtkui/columns.cc:38
-msgid "Year"
-msgstr "Жыл"
-
-#: src/gtkui/columns.cc:39 src/qtui/playlist_model.cc:127
-msgid "Album"
-msgstr "Альбом"
-
-#: src/gtkui/columns.cc:40
-msgid "Album artist"
-msgstr ""
-
-#: src/gtkui/columns.cc:41
-msgid "Track"
-msgstr "Жол"
-
-#: src/gtkui/columns.cc:42
-msgid "Genre"
-msgstr "Жанр"
-
-#: src/gtkui/columns.cc:43
-msgid "Queue position"
-msgstr "Кезектеги орду"
-
-#: src/gtkui/columns.cc:44
-msgid "Length"
-msgstr "Узундук"
-
-#: src/gtkui/columns.cc:45
-msgid "File path"
-msgstr "Файлга жол"
-
-#: src/gtkui/columns.cc:47
-msgid "Custom title"
-msgstr "Тапшырылма ат"
-
-#: src/gtkui/columns.cc:48
-msgid "Bitrate"
-msgstr "Битрейт"
-
-#: src/gtkui/columns.cc:308
-msgid "Available columns"
-msgstr ""
-
-#: src/gtkui/columns.cc:334
-msgid "Displayed columns"
-msgstr ""
-
-#: src/gtkui/layout.cc:72 src/search-tool/search-tool.cc:40
-msgid "Search Tool"
-msgstr "Издөө аспабы"
-
-#: src/gtkui/layout.cc:167
-msgid "Dock at Left"
-msgstr ""
-
-#: src/gtkui/layout.cc:167
-msgid "Dock at Right"
-msgstr ""
-
-#: src/gtkui/layout.cc:168
-msgid "Dock at Top"
-msgstr ""
-
-#: src/gtkui/layout.cc:168
-msgid "Dock at Bottom"
-msgstr ""
-
-#: src/gtkui/layout.cc:168
-msgid "Undock"
-msgstr ""
-
-#: src/gtkui/layout.cc:168 src/ladspa/plugin.cc:531
-msgid "Disable"
-msgstr "Өчүрүү"
-
-#: src/gtkui/menus.cc:126 src/qtui/main_window_actions.cc:93
-#: src/statusicon/statusicon.cc:276
-msgid "_Open Files ..."
-msgstr "Файлдарды _ачуу ..."
-
-#: src/gtkui/menus.cc:127
-msgid "Open _URL ..."
-msgstr "_URL ачуу ..."
-
-#: src/gtkui/menus.cc:128 src/qtui/main_window_actions.cc:95
-msgid "_Add Files ..."
-msgstr "Файлдарды _кошуу ..."
-
-#: src/gtkui/menus.cc:129
-msgid "Add U_RL ..."
-msgstr "U_RL кошуу ..."
-
-#: src/gtkui/menus.cc:131
-msgid "Search _Library"
-msgstr ""
-
-#: src/gtkui/menus.cc:133 src/qtui/main_window_actions.cc:98
-msgid "A_bout ..."
-msgstr "Программа _жөнүндө ..."
-
-#: src/gtkui/menus.cc:134 src/qtui/main_window_actions.cc:99
-msgid "_Settings ..."
-msgstr ""
-
-#: src/gtkui/menus.cc:135 src/qtui/main_window_actions.cc:103
-#: src/statusicon/statusicon.cc:284
-msgid "_Quit"
-msgstr "_Чыгуу"
-
-#: src/gtkui/menus.cc:139 src/gtkui/menus.cc:262
-#: src/qtui/main_window_actions.cc:107 src/search-tool/search-tool.cc:641
-#: src/statusicon/statusicon.cc:278
-msgid "_Play"
-msgstr "_Ойнотуу"
-
-#: src/gtkui/menus.cc:140 src/qtui/main_window_actions.cc:108
-#: src/statusicon/statusicon.cc:279
-msgid "Paus_e"
-msgstr "_Пауза"
-
-#: src/gtkui/menus.cc:141 src/qtui/main_window_actions.cc:109
-#: src/statusicon/statusicon.cc:280
-msgid "_Stop"
-msgstr "_Токтотуу"
-
-#: src/gtkui/menus.cc:142 src/qtui/main_window_actions.cc:110
-#: src/statusicon/statusicon.cc:277
-msgid "Pre_vious"
-msgstr "_Мурунку"
-
-#: src/gtkui/menus.cc:143 src/qtui/main_window_actions.cc:111
-#: src/statusicon/statusicon.cc:281
-msgid "_Next"
-msgstr "_Кийинки"
-
-#: src/gtkui/menus.cc:145 src/qtui/main_window_actions.cc:113
-msgid "_Repeat"
-msgstr "_Кайталоо"
-
-#: src/gtkui/menus.cc:146 src/qtui/main_window_actions.cc:114
-msgid "S_huffle"
-msgstr "_Иретсиз"
-
-#: src/gtkui/menus.cc:147 src/qtui/main_window_actions.cc:115
-msgid "N_o Playlist Advance"
-msgstr "Тизмеден жылдырбоо"
-
-#: src/gtkui/menus.cc:148 src/qtui/main_window_actions.cc:116
-msgid "Stop A_fter This Song"
-msgstr ""
-
-#: src/gtkui/menus.cc:150 src/gtkui/menus.cc:247
-#: src/qtui/main_window_actions.cc:118
-msgid "Song _Info ..."
-msgstr "Ыр _маалыматы ..."
-
-#: src/gtkui/menus.cc:151
-msgid "Jump to _Time ..."
-msgstr "_Убакытка өтүү ..."
-
-#: src/gtkui/menus.cc:152
-msgid "_Jump to Song ..."
-msgstr "_Ырга өтүү ..."
-
-#: src/gtkui/menus.cc:154
-msgid "Set Repeat Point _A"
-msgstr ""
-
-#: src/gtkui/menus.cc:155
-msgid "Set Repeat Point _B"
-msgstr ""
-
-#: src/gtkui/menus.cc:156
-msgid "_Clear Repeat Points"
-msgstr ""
-
-#: src/gtkui/menus.cc:160 src/gtkui/menus.cc:167 src/gtkui/menus.cc:183
-#: src/qtui/main_window_actions.cc:122 src/qtui/main_window_actions.cc:129
-#: src/qtui/main_window_actions.cc:145
-msgid "By _Title"
-msgstr "_Ат боюнча"
-
-#: src/gtkui/menus.cc:161 src/qtui/main_window_actions.cc:123
-msgid "By _File Name"
-msgstr ""
-
-#: src/gtkui/menus.cc:162 src/qtui/main_window_actions.cc:124
-msgid "By File _Path"
-msgstr ""
-
-#: src/gtkui/menus.cc:166 src/gtkui/menus.cc:182
-#: src/qtui/main_window_actions.cc:128 src/qtui/main_window_actions.cc:144
-msgid "By Track _Number"
-msgstr "Трек _номери боюнча"
-
-#: src/gtkui/menus.cc:168 src/gtkui/menus.cc:184
-#: src/qtui/main_window_actions.cc:130 src/qtui/main_window_actions.cc:146
-msgid "By _Artist"
-msgstr "_Аткаруучу боюнча"
-
-#: src/gtkui/menus.cc:169 src/gtkui/menus.cc:185
-#: src/qtui/main_window_actions.cc:131 src/qtui/main_window_actions.cc:147
-msgid "By Al_bum"
-msgstr ""
-
-#: src/gtkui/menus.cc:170 src/gtkui/menus.cc:186
-#: src/qtui/main_window_actions.cc:132 src/qtui/main_window_actions.cc:148
-msgid "By Albu_m Artist"
-msgstr ""
-
-#: src/gtkui/menus.cc:171 src/gtkui/menus.cc:187
-#: src/qtui/main_window_actions.cc:133 src/qtui/main_window_actions.cc:149
-msgid "By Release _Date"
-msgstr "Чыгаруу _күнү боюнча"
-
-#: src/gtkui/menus.cc:172 src/gtkui/menus.cc:188
-#: src/qtui/main_window_actions.cc:134 src/qtui/main_window_actions.cc:150
-msgid "By _Genre"
-msgstr ""
-
-#: src/gtkui/menus.cc:173 src/gtkui/menus.cc:189
-#: src/qtui/main_window_actions.cc:135 src/qtui/main_window_actions.cc:151
-msgid "By _Length"
-msgstr ""
-
-#: src/gtkui/menus.cc:174 src/gtkui/menus.cc:190
-#: src/qtui/main_window_actions.cc:136 src/qtui/main_window_actions.cc:152
-msgid "By _File Path"
-msgstr "_Файлдын турган жери боюнча"
-
-#: src/gtkui/menus.cc:175 src/gtkui/menus.cc:191
-#: src/qtui/main_window_actions.cc:137 src/qtui/main_window_actions.cc:153
-msgid "By _Custom Title"
-msgstr "_Тапшырылма ат боюнча"
-
-#: src/gtkui/menus.cc:177 src/gtkui/menus.cc:193
-#: src/qtui/main_window_actions.cc:139 src/qtui/main_window_actions.cc:155
-msgid "R_everse Order"
-msgstr "_Тескери тартип менен"
-
-#: src/gtkui/menus.cc:178 src/gtkui/menus.cc:194
-#: src/qtui/main_window_actions.cc:140 src/qtui/main_window_actions.cc:156
-msgid "_Random Order"
-msgstr "_Аралаш тартип менен"
-
-#: src/gtkui/menus.cc:198 src/qtui/main_window_actions.cc:160
-msgid "_Play/Resume"
-msgstr ""
-
-#: src/gtkui/menus.cc:199 src/gtkui/menus.cc:251
-#: src/qtui/main_window_actions.cc:161
-msgid "_Refresh"
-msgstr "_Жаңылоо"
-
-#: src/gtkui/menus.cc:201 src/qtui/main_window_actions.cc:163
-msgid "_Sort"
-msgstr "_Сорттоо"
-
-#: src/gtkui/menus.cc:202 src/qtui/main_window_actions.cc:164
-msgid "Sort Se_lected"
-msgstr ""
-
-#: src/gtkui/menus.cc:203 src/qtui/main_window_actions.cc:165
-msgid "Remove _Duplicates"
-msgstr ""
-
-#: src/gtkui/menus.cc:204 src/qtui/main_window_actions.cc:166
-msgid "Remove _Unavailable Files"
-msgstr "_Кол жеткис файлдарды өчүрүү"
-
-#: src/gtkui/menus.cc:206 src/playlist-manager/playlist-manager.cc:244
-#: src/qtui/main_window_actions.cc:168
-msgid "_New"
-msgstr "_Жаңы"
-
-#: src/gtkui/menus.cc:207
-msgid "Ren_ame ..."
-msgstr "Атын _өзгөртүү..."
-
-#: src/gtkui/menus.cc:208 src/gtkui/menus.cc:264
-#: src/qtui/main_window_actions.cc:170
-msgid "Remo_ve"
-msgstr ""
-
-#: src/gtkui/menus.cc:210
-msgid "_Import ..."
-msgstr "_Импорт ..."
-
-#: src/gtkui/menus.cc:211
-msgid "_Export ..."
-msgstr "_Экспорт ..."
-
-#: src/gtkui/menus.cc:213
-msgid "Playlist _Manager ..."
-msgstr "Ойнотуу тизмесинин _менеджери..."
-
-#: src/gtkui/menus.cc:214 src/qtui/main_window_actions.cc:176
-msgid "_Queue Manager ..."
-msgstr "_Кезек менеджери ..."
-
-#: src/gtkui/menus.cc:218 src/qtui/main_window_actions.cc:180
-msgid "Volume _Up"
-msgstr "Катуулукту _көбөйтүү"
-
-#: src/gtkui/menus.cc:219 src/qtui/main_window_actions.cc:181
-msgid "Volume _Down"
-msgstr "Катуулукту _азайтуу"
-
-#: src/gtkui/menus.cc:221 src/qtui/main_window_actions.cc:183
-msgid "_Equalizer"
-msgstr "_Эквалайзер"
-
-#: src/gtkui/menus.cc:223 src/qtui/main_window_actions.cc:185
-msgid "E_ffects ..."
-msgstr ""
-
-#: src/gtkui/menus.cc:227
-msgid "Show _Menu Bar"
-msgstr "_Меню панелин көрсөтүү"
-
-#: src/gtkui/menus.cc:228
-msgid "Show I_nfo Bar"
-msgstr "М_аалымат панелин көрсөтүү"
-
-#: src/gtkui/menus.cc:229
-msgid "Show Info Bar Vis_ualization"
-msgstr ""
-
-#: src/gtkui/menus.cc:230
-msgid "Show _Status Bar"
-msgstr "_Абал панелин көрсөтүү"
-
-#: src/gtkui/menus.cc:232
-msgid "Show _Remaining Time"
-msgstr ""
-
-#: src/gtkui/menus.cc:234
-msgid "_Visualizations ..."
-msgstr ""
-
-#: src/gtkui/menus.cc:238 src/qtui/main_window_actions.cc:189
-msgid "_File"
-msgstr "_Файл"
-
-#: src/gtkui/menus.cc:239 src/qtui/main_window_actions.cc:190
-msgid "_Playback"
-msgstr "_Ойнотуу"
-
-#: src/gtkui/menus.cc:240 src/qtui/main_window_actions.cc:191
-msgid "P_laylist"
-msgstr "_Тизме"
-
-#: src/gtkui/menus.cc:241 src/gtkui/menus.cc:258
-#: src/qtui/main_window_actions.cc:192
-msgid "_Services"
-msgstr "_Кызматтар"
-
-#: src/gtkui/menus.cc:242 src/qtui/main_window_actions.cc:193
-msgid "_Output"
-msgstr "_Чыгыш"
-
-#: src/gtkui/menus.cc:243
-msgid "_View"
-msgstr "Кө_рүнүш"
-
-#: src/gtkui/menus.cc:248
-msgid "_Queue/Unqueue"
-msgstr "_Кезекке коюу/койбоо"
-
-#: src/gtkui/menus.cc:250
-msgid "_Open Containing Folder"
-msgstr ""
-
-#: src/gtkui/menus.cc:253
-msgid "Cu_t"
-msgstr "Ке_сүү"
-
-#: src/gtkui/menus.cc:254
-msgid "_Copy"
-msgstr "_Көчүрүү"
-
-#: src/gtkui/menus.cc:255
-msgid "_Paste"
-msgstr "К_оюу"
-
-#: src/gtkui/menus.cc:256
-msgid "Select _All"
-msgstr "_Баарын тандоо"
-
-#: src/gtkui/menus.cc:263
-msgid "_Rename ..."
-msgstr "_Атын өзгөртүү ..."
-
-#: src/gtkui/settings.cc:35
-msgid "Playlist Tabs"
-msgstr ""
-
-#: src/gtkui/settings.cc:36
-msgid "Always show tabs"
-msgstr ""
-
-#: src/gtkui/settings.cc:38
-msgid "Show entry counts"
-msgstr ""
-
-#: src/gtkui/settings.cc:40
-msgid "Show close buttons"
-msgstr ""
-
-#: src/gtkui/settings.cc:42
-msgid "Playlist Columns"
-msgstr ""
-
-#: src/gtkui/settings.cc:44
-msgid "Show column headers"
-msgstr ""
-
-#: src/gtkui/settings.cc:46 src/modplug/plugin_main.cc:106
-#: src/skins/skins_cfg.cc:263
-msgid "Miscellaneous"
-msgstr ""
-
-#: src/gtkui/settings.cc:47
-msgid "Arrow keys seek by:"
-msgstr ""
-
-#: src/gtkui/settings.cc:50
-msgid "Scroll on song change"
-msgstr ""
-
-#: src/gtkui/ui_gtk.cc:71
-msgid "GTK Interface"
-msgstr "GTK интерфейс"
-
-#: src/gtkui/ui_gtk.cc:222 src/skins/ui_main.cc:232
-#, c-format
-msgid "%s - Audacious"
-msgstr "%s - Audacious"
-
-#: src/gtkui/ui_gtk.cc:225 src/qtui/main_window.cc:186
-msgid "Buffering ..."
-msgstr "Буферизация ..."
-
-#: src/gtkui/ui_gtk.cc:228 src/skins/ui_main.cc:234 src/skins/ui_main.cc:1164
-msgid "Audacious"
-msgstr "Audacious"
-
-#: src/gtkui/ui_statusbar.cc:63 src/qtui/status_bar.cc:67
-msgid "mono"
-msgstr "моно"
-
-#: src/gtkui/ui_statusbar.cc:65 src/qtui/status_bar.cc:69
-msgid "stereo"
-msgstr "стерео"
-
-#: src/gtkui/ui_statusbar.cc:67 src/qtui/status_bar.cc:71
-#, c-format
-msgid "%d channel"
-msgid_plural "%d channels"
-msgstr0 "%d канал"
-
-#: src/gtkui/ui_statusbar.cc:81 src/qtui/status_bar.cc:85
-#, c-format
-msgid "%d kbps"
-msgstr "%d кбит/с"
-
-#: src/gtkui/ui_statusbar.cc:107 src/skins/ui_main_evlisteners.cc:103
-msgid "Single mode."
-msgstr "Бириндеген режим."
-
-#: src/gtkui/ui_statusbar.cc:109 src/skins/ui_main_evlisteners.cc:105
-msgid "Playlist mode."
-msgstr "Ойнотуу тизмеси режими."
-
-#: src/gtkui/ui_statusbar.cc:117 src/skins/ui_main_evlisteners.cc:111
-msgid "Stopping after song."
-msgstr "Ырдан кийин токтотуу."
-
-#: src/hotkey/gui.cc:71
-msgid "Previous track"
-msgstr "Мурунку жолчо"
-
-#: src/hotkey/gui.cc:72 src/notify/osd.cc:69 src/qtui/main_window.cc:69
-#: src/qtui/main_window.cc:172 src/qtui/main_window.cc:173
-#: src/skins/menus.cc:87
-msgid "Play"
-msgstr "Ойнотуу"
-
-#: src/hotkey/gui.cc:73
-msgid "Pause/Resume"
-msgstr "Пауза/Улантуу"
-
-#: src/hotkey/gui.cc:74 src/qtui/main_window.cc:70 src/skins/menus.cc:89
-msgid "Stop"
-msgstr "Токтотуу"
-
-#: src/hotkey/gui.cc:75
-msgid "Next track"
-msgstr "Кийинки жолчо"
-
-#: src/hotkey/gui.cc:76
-msgid "Forward 5 seconds"
-msgstr ""
-
-#: src/hotkey/gui.cc:77
-msgid "Rewind 5 seconds"
-msgstr ""
-
-#: src/hotkey/gui.cc:78
-msgid "Mute"
-msgstr "Үнүн басуу"
-
-#: src/hotkey/gui.cc:79
-msgid "Volume up"
-msgstr ""
-
-#: src/hotkey/gui.cc:80
-msgid "Volume down"
-msgstr ""
-
-#: src/hotkey/gui.cc:81
-msgid "Jump to file"
-msgstr "Файлга өтүү"
-
-#: src/hotkey/gui.cc:82
-msgid "Toggle player window(s)"
-msgstr ""
-
-#: src/hotkey/gui.cc:83
-msgid "Show On-Screen-Display"
-msgstr ""
-
-#: src/hotkey/gui.cc:84
-msgid "Toggle repeat"
-msgstr ""
-
-#: src/hotkey/gui.cc:85
-msgid "Toggle shuffle"
-msgstr ""
-
-#: src/hotkey/gui.cc:86
-msgid "Toggle stop after current"
-msgstr ""
-
-#: src/hotkey/gui.cc:87
-msgid "Raise player window(s)"
-msgstr ""
-
-#: src/hotkey/gui.cc:97
-msgid "(none)"
-msgstr "(жок)"
-
-#: src/hotkey/gui.cc:234
-msgid ""
-"It is not recommended to bind the primary mouse buttons without "
-"modificators.\n"
-"\n"
-"Do you want to continue?"
-msgstr ""
-
-#: src/hotkey/gui.cc:236
-msgid "Binding mouse buttons"
-msgstr ""
-
-#: src/hotkey/gui.cc:391
-msgid ""
-"Press a key combination inside a text field.\n"
-"You can also bind mouse buttons."
-msgstr ""
-
-#: src/hotkey/gui.cc:396
-msgid "Hotkeys:"
-msgstr "Ысык клавишалар:"
-
-#: src/hotkey/gui.cc:413
-msgid "Action:"
-msgstr "Аракет:"
-
-#: src/hotkey/gui.cc:420
-msgid "Key Binding:"
-msgstr "Клавиштик айкалыш:"
-
-#: src/hotkey/gui.cc:468
-msgid "_Add"
-msgstr ""
-
-#: src/hotkey/plugin.cc:61
-msgid "Global Hotkeys"
-msgstr ""
-
-#: src/hotkey/plugin.cc:79
-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/jack-ng/jack-ng.cc:49
-msgid "JACK Output"
-msgstr "JACK чыгышы"
-
-#: src/jack-ng/jack-ng.cc:114
-msgid "Automatically connect to output ports"
-msgstr ""
-
-#: src/jack-ng/jack-ng.cc:155
-#, c-format
-msgid "Only %d JACK output ports were found but %d are required."
-msgstr ""
-
-#: src/jack-ng/jack-ng.cc:164
-#, c-format
-msgid "Failed to connect to JACK port %s."
-msgstr ""
-
-#: src/jack-ng/jack-ng.cc:184
-msgid ""
-"JACK supports only floating-point audio. You must change the output bit "
-"depth to floating-point in Audacious settings."
-msgstr ""
-
-#: src/jack-ng/jack-ng.cc:197
-msgid "Failed to connect to the JACK server; is it running?"
-msgstr ""
-
-#: src/jack-ng/jack-ng.cc:273
-#, c-format
-msgid ""
-"The JACK server requires a sample rate of %d Hz, but Audacious is playing at "
-"%d Hz. Please use the Sample Rate Converter effect to correct the mismatch."
-msgstr ""
-
-#: src/ladspa/plugin.cc:414
-#, c-format
-msgid "%s Settings"
-msgstr "%s Ырастоолор"
-
-#: src/ladspa/plugin.cc:478
-msgid "Module paths:"
-msgstr ""
-
-#: src/ladspa/plugin.cc:483
-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.cc:499
-msgid "Available plugins:"
-msgstr "Кол жетердик плагиндер:"
-
-#: src/ladspa/plugin.cc:512 src/modplug/plugin_main.cc:92
-#: src/modplug/plugin_main.cc:95 src/modplug/plugin_main.cc:98
-#: src/modplug/plugin_main.cc:101
-msgid "Enable"
-msgstr "Күйгүзүү"
-
-#: src/ladspa/plugin.cc:518
-msgid "Enabled plugins:"
-msgstr "Күйгүзүлгөн плагиндер:"
-
-#: src/ladspa/plugin.cc:534
-msgid "Settings"
-msgstr "Ырастоолор"
-
-#: src/ladspa/plugin.cc:551
-msgid ""
-"LADSPA Host for Audacious\n"
-"Copyright 2011 John Lindgren"
-msgstr ""
-
-#: src/ladspa/plugin.h:78
-msgid "LADSPA Host"
-msgstr "LADSPA түйүнү"
-
-#: src/lirc/lirc.cc:55
-msgid "LIRC Plugin"
-msgstr "LIRC плагини"
-
-#: src/lirc/lirc.cc: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.cc:392
-msgid "Connection"
-msgstr "Туташтыруу"
-
-#: src/lirc/lirc.cc:393
-msgid "Reconnect to LIRC server"
-msgstr ""
-
-#: src/lirc/lirc.cc:395
-msgid "Wait before reconnecting:"
-msgstr ""
-
-#: src/lyricwiki/lyricwiki.cc:41
-msgid "LyricWiki Plugin"
-msgstr "LyricWiki плагини"
-
-#: src/lyricwiki/lyricwiki.cc:131 src/lyricwiki-qt/lyricwiki.cc:136
-msgid "No lyrics available"
-msgstr "Ыр тексти кол жеткис"
-
-#: src/lyricwiki/lyricwiki.cc:217 src/lyricwiki/lyricwiki.cc:226
-#: src/lyricwiki/lyricwiki.cc:243 src/lyricwiki/lyricwiki.cc:252
-#: src/lyricwiki/lyricwiki.cc:267 src/lyricwiki-qt/lyricwiki.cc:222
-#: src/lyricwiki-qt/lyricwiki.cc:231 src/lyricwiki-qt/lyricwiki.cc:248
-#: src/lyricwiki-qt/lyricwiki.cc:257 src/lyricwiki-qt/lyricwiki.cc:272
-msgid "Error"
-msgstr "Ката"
-
-#: src/lyricwiki/lyricwiki.cc:218 src/lyricwiki/lyricwiki.cc:244
-#: src/lyricwiki-qt/lyricwiki.cc:223 src/lyricwiki-qt/lyricwiki.cc:249
-#, c-format
-msgid "Unable to fetch %s"
-msgstr ""
-
-#: src/lyricwiki/lyricwiki.cc:227 src/lyricwiki/lyricwiki.cc:253
-#: src/lyricwiki-qt/lyricwiki.cc:232 src/lyricwiki-qt/lyricwiki.cc:258
-#, c-format
-msgid "Unable to parse %s"
-msgstr ""
-
-#: src/lyricwiki/lyricwiki.cc:259 src/lyricwiki-qt/lyricwiki.cc:264
-msgid "Looking for lyrics ..."
-msgstr "Ыр текстин издөө ..."
-
-#: src/lyricwiki/lyricwiki.cc:267 src/lyricwiki-qt/lyricwiki.cc:272
-msgid "Missing song metadata"
-msgstr "Ыр метамаалыматтары жок болуу"
-
-#: src/lyricwiki/lyricwiki.cc:278 src/lyricwiki-qt/lyricwiki.cc:283
-msgid "Connecting to lyrics.wikia.com ..."
-msgstr ""
-
-#: src/lyricwiki-qt/lyricwiki.cc:55
-msgid "LyricWiki Plugin (Qt)"
-msgstr ""
-
-#: src/m3u/m3u.cc:32
-msgid "M3U Playlists"
-msgstr "M3U ойнотуу тизмелери"
-
-#: src/metronom/metronom.cc:44
-msgid "Tact Generator"
-msgstr "Такт генератору"
-
-#: src/metronom/metronom.cc:147
-#, c-format
-msgid "Tact generator: %d bpm"
-msgstr ""
-
-#: src/metronom/metronom.cc:149
-#, c-format
-msgid "Tact generator: %d bpm %d/%d"
-msgstr ""
-
-#: src/metronom/metronom.cc:237
-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/mixer/mixer.cc:38
-msgid "Channel Mixer"
-msgstr "Канал микшери"
-
-#: src/mixer/mixer.cc:202
-msgid ""
-"Channel Mixer Plugin for Audacious\n"
-"Copyright 2011-2012 John Lindgren and Michał Lipski"
-msgstr ""
-
-#: src/mixer/mixer.cc:206
-msgid "Channel Mixer"
-msgstr "Канал микшери"
-
-#: src/mixer/mixer.cc:207
-msgid "Output channels:"
-msgstr "Чыгыш каналдары:"
-
-#: src/mms/mms.cc:35
-msgid "MMS Plugin"
-msgstr "MMS плагини"
-
-#: src/mms/mms.cc:82
-msgid "Error connecting to MMS server"
-msgstr ""
-
-#: src/modplug/modplugbmp.h:53
-msgid "ModPlug (Module Player)"
-msgstr "ModPlug (модуль ойноткучу)"
-
-#: src/modplug/plugin_main.cc:53
-msgid "Resolution"
-msgstr "Чечим"
-
-#: src/modplug/plugin_main.cc:54
-msgid "8-bit"
-msgstr "8-бит"
-
-#: src/modplug/plugin_main.cc:55
-msgid "16-bit"
-msgstr "16-бит"
-
-#: src/modplug/plugin_main.cc:56
-msgid "Channels"
-msgstr "Каналдар"
-
-#: src/modplug/plugin_main.cc:60
-msgid "Nearest (fastest)"
-msgstr ""
-
-#: src/modplug/plugin_main.cc:61
-msgid "Linear (fast)"
-msgstr ""
-
-#: src/modplug/plugin_main.cc:62
-msgid "Spline (good)"
-msgstr ""
-
-#: src/modplug/plugin_main.cc:63
-msgid "Polyphase (best)"
-msgstr ""
-
-#: src/modplug/plugin_main.cc:64
-msgid "Sample rate"
-msgstr ""
-
-#: src/modplug/plugin_main.cc:65
-msgid "22 kHz"
-msgstr "22 кГц"
-
-#: src/modplug/plugin_main.cc:66
-msgid "44 kHz"
-msgstr "44 кГц"
-
-#: src/modplug/plugin_main.cc:67
-msgid "48 kHz"
-msgstr "48 кГц"
-
-#: src/modplug/plugin_main.cc:68
-msgid "96 kHz"
-msgstr "96 кГц"
-
-#: src/modplug/plugin_main.cc:72 src/modplug/plugin_main.cc:77
-#: src/modplug/plugin_main.cc:82
-msgid "Level:"
-msgstr "Деңгээли:"
-
-#: src/modplug/plugin_main.cc:78
-msgid "Cutoff:"
-msgstr ""
-
-#: src/modplug/plugin_main.cc:91
-msgid "Reverb"
-msgstr ""
-
-#: src/modplug/plugin_main.cc:94
-msgid "Bass Boost"
-msgstr ""
-
-#: src/modplug/plugin_main.cc:97
-msgid "Surround"
-msgstr ""
-
-#: src/modplug/plugin_main.cc:100
-msgid "Preamp"
-msgstr ""
-
-#: src/modplug/plugin_main.cc:107
-msgid "Oversample"
-msgstr ""
-
-#: src/modplug/plugin_main.cc:108
-msgid "Noise reduction"
-msgstr ""
-
-#: src/modplug/plugin_main.cc:109
-msgid "Play Amiga MODs"
-msgstr ""
-
-#: src/modplug/plugin_main.cc:110
-msgid "Repeat"
-msgstr "Кайталоо"
-
-#: src/modplug/plugin_main.cc:111
-msgid "Repeat count:"
-msgstr "Кайталоо саны:"
-
-#: src/modplug/plugin_main.cc:112
-msgid "To repeat forever, set the repeat count to -1."
-msgstr ""
-
-#: src/modplug/plugin_main.cc:125 src/sid/xs_config.cc:106
-msgid "These settings will take effect when Audacious is restarted."
-msgstr ""
-
-#: src/mpg123/mpg123.cc:54
-msgid "MPG123 Plugin"
-msgstr "MPG123 плагини"
-
-#: src/mpg123/mpg123.cc:83
-msgid "Advanced"
-msgstr ""
-
-#: src/mpg123/mpg123.cc:84
-msgid "Use accurate length calculation (slow)"
-msgstr ""
-
-#: src/mpg123/mpg123.cc:248
-msgid "Surround"
-msgstr "Көлөмдүү тыбыш"
-
-#: src/mpris2/plugin.cc:39
-msgid "MPRIS 2 Server"
-msgstr "MPRIS 2 сервери"
-
-#: src/neon/neon.cc:97
-msgid "Neon HTTP/HTTPS Plugin"
-msgstr "Neon HTTP/HTTPS плагини"
-
-#: src/neon/neon.cc:521
-msgid "Error parsing redirect"
-msgstr ""
-
-#: src/neon/neon.cc:535
-msgid "Unknown HTTP error"
-msgstr ""
-
-#: src/neon/neon.cc:569
-msgid "Error parsing URL"
-msgstr ""
-
-#: src/neon/neon.cc:632
-msgid "Too many redirects"
-msgstr ""
-
-#: src/notify/event.cc:64
-msgid "Stopped"
-msgstr "Токтолгон"
-
-#: src/notify/event.cc:64
-msgid "Audacious is not playing."
-msgstr "Audacious ойнотуп жаткан жок."
-
-#: src/notify/notify.cc:42
-msgid "Desktop Notifications"
-msgstr ""
-
-#: src/notify/notify.cc:60
-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.cc:110
-msgid "Show playback controls"
-msgstr ""
-
-#: src/notify/notify.cc:112
-msgid "Always show notification"
-msgstr ""
-
-#: src/notify/notify.cc:114
-msgid "Include album name in notification"
-msgstr ""
-
-#: src/notify/osd.cc:58
-msgid "Show"
-msgstr ""
-
-#: src/notify/osd.cc:66 src/qtui/main_window.cc:178
-#: src/qtui/main_window.cc:179 src/skins/menus.cc:88
-msgid "Pause"
-msgstr "Пауза"
-
-#: src/notify/osd.cc:73 src/qtui/main_window.cc:72 src/skins/menus.cc:91
-msgid "Next"
-msgstr "Кийинки"
-
-#: src/oss4/oss.h:93
-msgid "OSS4 Output"
-msgstr "OSS4 чыгышы"
-
-#: src/oss4/oss.h:95
-msgid "OSS3 Output"
-msgstr ""
-
-#: src/oss4/plugin.cc:35
-msgid "Default device"
-msgstr ""
-
-#: src/oss4/plugin.cc:77
-msgid "Audio device:"
-msgstr "Үн орнотмосу:"
-
-#: src/oss4/plugin.cc:80
-msgid "Use alternate device:"
-msgstr ""
-
-#: src/oss4/plugin.cc:84
-msgid "Save volume between sessions."
-msgstr ""
-
-#: src/oss4/plugin.cc:86
-msgid "Enable format conversions made by the OSS software."
-msgstr ""
-
-#: src/oss4/plugin.cc:88
-msgid "Enable exclusive mode to prevent virtual mixing."
-msgstr ""
-
-#: src/oss4/plugin.cc:100
-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/playlist-manager/playlist-manager.cc:37
-msgid "Playlist Manager"
-msgstr ""
-
-#: src/playlist-manager/playlist-manager.cc:226
-msgid "Entries"
-msgstr ""
-
-#: src/playlist-manager/playlist-manager.cc:245
-msgid "_Remove"
-msgstr ""
-
-#: src/playlist-manager/playlist-manager.cc:246
-msgid "Ren_ame"
-msgstr ""
-
-#: src/pls/pls.cc:35
-msgid "PLS Playlists"
-msgstr "PLS ойнотуу тизмелери"
-
-#: src/psf/plugin.cc:45
-msgid "OpenPSF PSF1/PSF2 Decoder"
-msgstr "OpenPSF PSF1/PSF2 чыгышы"
-
-#: src/pulse_audio/pulse_audio.cc:38
-msgid "PulseAudio Output"
-msgstr "PulseAudio чыгышы"
-
-#: src/pulse_audio/pulse_audio.cc:611
-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/qtaudio/qtaudio.cc:49
-msgid "QtMultimedia Output"
-msgstr ""
-
-#: src/qtaudio/qtaudio.cc:77
-msgid ""
-"QtMultimedia Audio Output Plugin for Audacious\n"
-"Copyright 2014 William Pitcock\n"
-"\n"
-"Based on SDL Output Plugin for Audacious\n"
-"Copyright 2010 John Lindgren"
-msgstr ""
-
-#: src/qtui/dialog_windows.cc:31
-msgid "Working ..."
-msgstr ""
-
-#: src/qtui/filter_input.cc:44 src/skins/ui_playlist.cc:221
-msgid "Search"
-msgstr ""
-
-#: src/qtui/main_window_actions.cc:94
-msgid "_Open Folder ..."
-msgstr ""
-
-#: src/qtui/main_window_actions.cc:96
-msgid "_Add Folder ..."
-msgstr ""
-
-#: src/qtui/main_window_actions.cc:101
-msgid "_Log Inspector ..."
-msgstr ""
-
-#: src/qtui/main_window.cc:64
-msgid "Open Files"
-msgstr ""
-
-#: src/qtui/main_window.cc:66
-msgid "Add Files"
-msgstr ""
-
-#: src/qtui/main_window.cc:71 src/skins/menus.cc:90
-msgid "Previous"
-msgstr "Мурунку"
-
-#: src/qtui/main_window.cc:77 src/skins/menus.cc:82
-msgid "Repeat"
-msgstr "Кайталоо"
-
-#: src/qtui/main_window.cc:79 src/skins/menus.cc:83
-msgid "Shuffle"
-msgstr "Иретсиз"
-
-#: src/qtui/qtui.cc:42
-msgid "Qt Interface"
-msgstr ""
-
-#: src/resample/resample.cc:43
-msgid "Sample Rate Converter"
-msgstr ""
-
-#: src/resample/resample.cc:183
-msgid ""
-"Sample Rate Converter Plugin for Audacious\n"
-"Copyright 2010-2012 John Lindgren"
-msgstr ""
-
-#: src/resample/resample.cc:187
-msgid "Skip/repeat samples"
-msgstr ""
-
-#: src/resample/resample.cc:188
-msgid "Linear interpolation"
-msgstr "Сызыктык интерполяция"
-
-#: src/resample/resample.cc:189
-msgid "Fast sinc interpolation"
-msgstr ""
-
-#: src/resample/resample.cc:190
-msgid "Medium sinc interpolation"
-msgstr ""
-
-#: src/resample/resample.cc:191
-msgid "Best sinc interpolation"
-msgstr ""
-
-#: src/resample/resample.cc:195
-msgid "Conversion"
-msgstr "Конверсия"
-
-#: src/resample/resample.cc:196
-msgid "Method:"
-msgstr "Ыкма:"
-
-#: src/resample/resample.cc:199 src/sox-resampler/sox-resampler.cc:161
-msgid "Rate:"
-msgstr "Жыштык:"
-
-#: src/resample/resample.cc:202
-msgid "Rate Mappings"
-msgstr "Жыштыктар картасы"
-
-#: src/resample/resample.cc:203
-msgid "Use rate mappings"
-msgstr "Жыштык картасын колдонуу"
-
-#: src/resample/resample.cc:205
-msgid "8 kHz:"
-msgstr "8 кГц:"
-
-#: src/resample/resample.cc:209
-msgid "16 kHz:"
-msgstr "16 кГц:"
-
-#: src/resample/resample.cc:213
-msgid "22.05 kHz:"
-msgstr "22.05 кГц:"
-
-#: src/resample/resample.cc:217
-msgid "32.0 kHz:"
-msgstr ""
-
-#: src/resample/resample.cc:221
-msgid "44.1 kHz:"
-msgstr "44.1 кГц:"
-
-#: src/resample/resample.cc:225
-msgid "48 kHz:"
-msgstr "48 кГц:"
-
-#: src/resample/resample.cc:229
-msgid "88.2 kHz:"
-msgstr ""
-
-#: src/resample/resample.cc:233
-msgid "96 kHz:"
-msgstr "96 кГц:"
-
-#: src/resample/resample.cc:237
-msgid "176.4 kHz:"
-msgstr ""
-
-#: src/resample/resample.cc:241
-msgid "192 kHz:"
-msgstr "192 кГц:"
-
-#: src/scrobbler2/config_window.cc:41
-#, c-format
-msgid "OK. Scrobbling for user: %s"
-msgstr ""
-
-#: src/scrobbler2/config_window.cc:54
-msgid "Permission Denied"
-msgstr ""
-
-#: src/scrobbler2/config_window.cc:56
-msgid "Access the following link to allow Audacious to scrobble your plays:"
-msgstr ""
-
-#: src/scrobbler2/config_window.cc:66
-msgid "Keep this window open and click 'Check Permission' again.\n"
-msgstr ""
-
-#: src/scrobbler2/config_window.cc:69 src/scrobbler2/config_window.cc:80
-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.cc:77
-msgid "Network Problem."
-msgstr "Тармак көйгөйү."
-
-#: src/scrobbler2/config_window.cc:78
-msgid "There was a problem contacting Last.fm. Please try again later."
-msgstr ""
-
-#: src/scrobbler2/config_window.cc:110
-msgid "Checking..."
-msgstr "Текшерилүүдө..."
-
-#: src/scrobbler2/config_window.cc:176
-msgid "C_heck Permission"
-msgstr ""
-
-#: src/scrobbler2/config_window.cc:177
-msgid "_Revoke Permission"
-msgstr ""
-
-#: src/scrobbler2/config_window.cc:220
-msgid ""
-"You need to allow Audacious to scrobble tracks to your Last.fm account.\n"
-msgstr ""
-
-#: src/scrobbler2/scrobbler.cc:29
-msgid "Scrobbler 2.0"
-msgstr ""
-
-#: src/scrobbler2/scrobbler.cc:224
-msgid ""
-"The Scrobbler plugin could not be started.\n"
-"There might be a problem with your installation."
-msgstr ""
-
-#: src/scrobbler2/scrobbler.cc:289
-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_communication.cc:642
-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/sdlout.cc:48
-msgid "SDL Output"
-msgstr "SDL чыгышы"
-
-#: src/sdlout/sdlout.cc:77
-msgid ""
-"SDL Output Plugin for Audacious\n"
-"Copyright 2010 John Lindgren"
-msgstr ""
-
-#: src/search-tool/search-tool.cc:116 src/search-tool/search-tool.cc:124
-msgid "Library"
-msgstr "Абазкана"
-
-#: src/search-tool/search-tool.cc:394
-#, c-format
-msgid "%d result"
-msgid_plural "%d results"
-msgstr0 ""
-
-#: src/search-tool/search-tool.cc:400
-#, c-format
-msgid "(%d hidden)"
-msgid_plural "(%d hidden)"
-msgstr0 ""
-
-#: src/search-tool/search-tool.cc:594
-#, c-format
-msgid "%d song"
-msgid_plural "%d songs"
-msgstr0 ""
-
-#: src/search-tool/search-tool.cc:601
-msgid "of this genre"
-msgstr ""
-
-#: src/search-tool/search-tool.cc:607
-msgid "on"
-msgstr ""
-
-#: src/search-tool/search-tool.cc:607
-msgid "by"
-msgstr ""
-
-#: src/search-tool/search-tool.cc:643
-msgid "_Create Playlist"
-msgstr "Ойнотуу тизмесин _жаратуу"
-
-#: src/search-tool/search-tool.cc:645
-msgid "_Add to Playlist"
-msgstr "Ойнотуу тизмесине _кошуу"
-
-#: src/search-tool/search-tool.cc:684
-msgid "Search library"
-msgstr "Издөө абазканасы"
-
-#: src/search-tool/search-tool.cc:688
-msgid ""
-"To import your music library into Audacious, choose a folder and then click "
-"the \"refresh\" icon."
-msgstr ""
-"Audacious абазканасына музыкаңызды импорт кылыш үчүн, биринчи каталогду "
-"тандаңыз, анан \"жаңыртуу\" деген иконканы басыңыз."
-
-#: src/search-tool/search-tool.cc:696
-msgid "Please wait ..."
-msgstr ""
-
-#: src/search-tool/search-tool.cc:723
-msgid "Choose Folder"
-msgstr "Каталогду тандаңыз"
-
-#: src/sid/xmms-sid.cc:43
-msgid "SID Player"
-msgstr ""
-
-#: src/sid/xs_config.cc:61
-msgid "Output"
-msgstr ""
-
-#: src/sid/xs_config.cc:62
-msgid "Channels:"
-msgstr ""
-
-#: src/sid/xs_config.cc:68
-msgid "Emulation"
-msgstr ""
-
-#: src/sid/xs_config.cc:69
-msgid "Emulate MOS 8580 (default: MOS 6581)"
-msgstr ""
-
-#: src/sid/xs_config.cc:71
-msgid "Do not automatically select chip model"
-msgstr ""
-
-#: src/sid/xs_config.cc:73
-msgid "Emulate filter"
-msgstr ""
-
-#: src/sid/xs_config.cc:75
-msgid "Clock speed:"
-msgstr ""
-
-#: src/sid/xs_config.cc:78
-msgid "Do not automatically select clock speed"
-msgstr ""
-
-#: src/sid/xs_config.cc:80
-msgid "Playback time"
-msgstr ""
-
-#: src/sid/xs_config.cc:81
-msgid "Set maximum playback time:"
-msgstr ""
-
-#: src/sid/xs_config.cc:87
-msgid "Use only when song length is unknown"
-msgstr ""
-
-#: src/sid/xs_config.cc:90
-msgid "Set minimum playback time:"
-msgstr ""
-
-#: src/sid/xs_config.cc:96
-msgid "Subtunes"
-msgstr ""
-
-#: src/sid/xs_config.cc:97
-msgid "Enable subtunes"
-msgstr ""
-
-#: src/sid/xs_config.cc:99
-msgid "Ignore subtunes shorter than:"
-msgstr ""
-
-#: src/sid/xs_config.cc:105
-msgid "Note"
-msgstr ""
-
-#: src/silence-removal/silence-removal.cc:39
-msgid "Silence Removal"
-msgstr ""
-
-#: src/silence-removal/silence-removal.cc:58
-msgid ""
-"Silence Removal Plugin for Audacious\n"
-"Copyright 2014 John Lindgren"
-msgstr ""
-
-#: src/silence-removal/silence-removal.cc:67
-msgid "Silence Removal"
-msgstr ""
-
-#: src/silence-removal/silence-removal.cc:68
-msgid "Threshold:"
-msgstr ""
-
-#: src/silence-removal/silence-removal.cc:70
-msgid "dB"
-msgstr ""
-
-#: src/skins/menus.cc:64
-msgid "Open Files ..."
-msgstr ""
-
-#: src/skins/menus.cc:65
-msgid "Open URL ..."
-msgstr ""
-
-#: src/skins/menus.cc:66
-msgid "Search Library"
-msgstr ""
-
-#: src/skins/menus.cc:68
-msgid "Playback"
-msgstr "Ойнотуу"
-
-#: src/skins/menus.cc:69
-msgid "Playlist"
-msgstr "Ойнотуу тизмеси"
-
-#: src/skins/menus.cc:70
-msgid "View"
-msgstr "Көрүнүш"
-
-#: src/skins/menus.cc:72 src/skins/menus.cc:136 src/skins/menus.cc:149
-#: src/skins/menus.cc:214
-msgid "Services"
-msgstr ""
-
-#: src/skins/menus.cc:74
-msgid "About ..."
-msgstr ""
-
-#: src/skins/menus.cc:75
-msgid "Settings ..."
-msgstr ""
-
-#: src/skins/menus.cc:76
-msgid "Quit"
-msgstr ""
-
-#: src/skins/menus.cc:80 src/skins/menus.cc:206
-msgid "Song Info ..."
-msgstr ""
-
-#: src/skins/menus.cc:84
-msgid "No Playlist Advance"
-msgstr ""
-
-#: src/skins/menus.cc:85
-msgid "Stop After This Song"
-msgstr ""
-
-#: src/skins/menus.cc:93
-msgid "Set A-B Repeat"
-msgstr ""
-
-#: src/skins/menus.cc:94
-msgid "Clear A-B Repeat"
-msgstr ""
-
-#: src/skins/menus.cc:96
-msgid "Jump to Song ..."
-msgstr ""
-
-#: src/skins/menus.cc:97
-msgid "Jump to Time ..."
-msgstr ""
-
-#: src/skins/menus.cc:101
-msgid "Play/Resume"
-msgstr ""
-
-#: src/skins/menus.cc:103
-msgid "New Playlist"
-msgstr "Жаңы ойнотуу тизмеси"
-
-#: src/skins/menus.cc:104
-msgid "Rename Playlist ..."
-msgstr ""
-
-#: src/skins/menus.cc:105
-msgid "Remove Playlist"
-msgstr ""
-
-#: src/skins/menus.cc:107
-msgid "Previous Playlist"
-msgstr ""
-
-#: src/skins/menus.cc:108
-msgid "Next Playlist"
-msgstr ""
-
-#: src/skins/menus.cc:110
-msgid "Import Playlist ..."
-msgstr ""
-
-#: src/skins/menus.cc:111
-msgid "Export Playlist ..."
-msgstr ""
-
-#: src/skins/menus.cc:113
-msgid "Playlist Manager ..."
-msgstr ""
-
-#: src/skins/menus.cc:114
-msgid "Queue Manager ..."
-msgstr ""
-
-#: src/skins/menus.cc:116
-msgid "Refresh Playlist"
-msgstr ""
-
-#: src/skins/menus.cc:120
-msgid "Show Playlist Editor"
-msgstr "Ойнотуу тизмесинин редакторун көрсөтүү"
-
-#: src/skins/menus.cc:121
-msgid "Show Equalizer"
-msgstr "_Эквалайзерди көрсөтүү"
-
-#: src/skins/menus.cc:123
-msgid "Show Remaining Time"
-msgstr ""
-
-#: src/skins/menus.cc:125
-msgid "Always on Top"
-msgstr "Дайыма үстүндө"
-
-#: src/skins/menus.cc:126
-msgid "On All Workspaces"
-msgstr ""
-
-#: src/skins/menus.cc:128
-msgid "Roll Up Player"
-msgstr ""
-
-#: src/skins/menus.cc:129
-msgid "Roll Up Playlist Editor"
-msgstr ""
-
-#: src/skins/menus.cc:130
-msgid "Roll Up Equalizer"
-msgstr ""
-
-#: src/skins/menus.cc:132 src/skins/ui_main.cc:854
-msgid "Double Size"
-msgstr ""
-
-#: src/skins/menus.cc:138
-msgid "Add URL ..."
-msgstr ""
-
-#: src/skins/menus.cc:139
-msgid "Add Files ..."
-msgstr ""
-
-#: src/skins/menus.cc:143 src/skins/menus.cc:171 src/skins/menus.cc:185
-msgid "By Title"
-msgstr "Ат боюнча"
-
-#: src/skins/menus.cc:144 src/skins/menus.cc:178 src/skins/menus.cc:192
-msgid "By File Name"
-msgstr ""
-
-#: src/skins/menus.cc:145 src/skins/menus.cc:179 src/skins/menus.cc:193
-msgid "By File Path"
-msgstr ""
-
-#: src/skins/menus.cc:151
-msgid "Remove All"
-msgstr "Баарын өчүрүү"
-
-#: src/skins/menus.cc:152
-msgid "Clear Queue"
-msgstr "Кезекти тазалоо"
-
-#: src/skins/menus.cc:154
-msgid "Remove Unavailable Files"
-msgstr "Кол жеткис файлдарды өчүрүү"
-
-#: src/skins/menus.cc:155
-msgid "Remove Duplicates"
-msgstr "Дубликаттарды өчүрүү"
-
-#: src/skins/menus.cc:157
-msgid "Remove Unselected"
-msgstr "Тандалбагандарды өчүрүү"
-
-#: src/skins/menus.cc:158
-msgid "Remove Selected"
-msgstr "Тандалгандарды өчүрүү"
-
-#: src/skins/menus.cc:162
-msgid "Search and Select"
-msgstr "Издеп анан тандоо"
-
-#: src/skins/menus.cc:164
-msgid "Invert Selection"
-msgstr "Тандалганды тескерилетүү"
-
-#: src/skins/menus.cc:165
-msgid "Select None"
-msgstr "Тандоону алуу"
-
-#: src/skins/menus.cc:166
-msgid "Select All"
-msgstr "Баарын тандоо"
-
-#: src/skins/menus.cc:170 src/skins/menus.cc:184
-msgid "By Track Number"
-msgstr "Жолчо номерлери боюнча"
-
-#: src/skins/menus.cc:172 src/skins/menus.cc:186
-msgid "By Artist"
-msgstr "Аткаруучу боюнча"
-
-#: src/skins/menus.cc:173 src/skins/menus.cc:187
-msgid "By Album"
-msgstr "Альбом боюнча"
-
-#: src/skins/menus.cc:174 src/skins/menus.cc:188
-msgid "By Album Artist"
-msgstr ""
-
-#: src/skins/menus.cc:175 src/skins/menus.cc:190
-msgid "By Release Date"
-msgstr ""
-
-#: src/skins/menus.cc:176 src/skins/menus.cc:189
-msgid "By Genre"
-msgstr ""
-
-#: src/skins/menus.cc:177 src/skins/menus.cc:191
-msgid "By Length"
-msgstr ""
-
-#: src/skins/menus.cc:180 src/skins/menus.cc:194
-msgid "By Custom Title"
-msgstr ""
-
-#: src/skins/menus.cc:198
-msgid "Randomize List"
-msgstr "Тизмени аралаштыруу"
-
-#: src/skins/menus.cc:199
-msgid "Reverse List"
-msgstr "Тизмени тескерилетүү"
-
-#: src/skins/menus.cc:201
-msgid "Sort Selected"
-msgstr "Тандалгандарды сорттоо"
-
-#: src/skins/menus.cc:202
-msgid "Sort List"
-msgstr "Тизмени сорттоо"
-
-#: src/skins/menus.cc:208
-msgid "Cut"
-msgstr "Кесүү"
-
-#: src/skins/menus.cc:209
-msgid "Copy"
-msgstr "Көчүрүү"
-
-#: src/skins/menus.cc:210
-msgid "Paste"
-msgstr "Коюу"
-
-#: src/skins/menus.cc:212
-msgid "Queue/Unqueue"
-msgstr ""
-
-#: src/skins/menus.cc:218
-msgid "Load Preset ..."
-msgstr ""
-
-#: src/skins/menus.cc:219
-msgid "Load Auto Preset ..."
-msgstr ""
-
-#: src/skins/menus.cc:220
-msgid "Load Default"
-msgstr ""
-
-#: src/skins/menus.cc:221
-msgid "Load Preset File ..."
-msgstr ""
-
-#: src/skins/menus.cc:222
-msgid "Load EQF File ..."
-msgstr ""
-
-#: src/skins/menus.cc:224
-msgid "Save Preset ..."
-msgstr ""
-
-#: src/skins/menus.cc:225
-msgid "Save Auto Preset ..."
-msgstr ""
-
-#: src/skins/menus.cc:226
-msgid "Save Default"
-msgstr ""
-
-#: src/skins/menus.cc:227
-msgid "Save Preset File ..."
-msgstr ""
-
-#: src/skins/menus.cc:228
-msgid "Save EQF File ..."
-msgstr ""
-
-#: src/skins/menus.cc:230
-msgid "Delete Preset ..."
-msgstr ""
-
-#: src/skins/menus.cc:231
-msgid "Delete Auto Preset ..."
-msgstr ""
-
-#: src/skins/menus.cc:233
-msgid "Import Winamp Presets ..."
-msgstr ""
-
-#: src/skins/menus.cc:235
-msgid "Reset to Zero"
-msgstr ""
-
-#: src/skins/plugin.cc:48
-msgid "Winamp Classic Interface"
-msgstr "Winamp классикалык интерфейси"
-
-#: src/skins/preset-browser.cc:57 src/skins/preset-list.cc:371
-#: src/skins/preset-list.cc:386
-msgid "Save"
-msgstr "Сактоо"
-
-#: src/skins/preset-browser.cc:57 src/skins/preset-list.cc:338
-#: src/skins/preset-list.cc:354
-msgid "Load"
-msgstr "Жүктөө"
-
-#: src/skins/preset-browser.cc:83
-msgid "Load Preset File"
-msgstr ""
-
-#: src/skins/preset-browser.cc:100
-msgid "Load EQF File"
-msgstr ""
-
-#: src/skins/preset-browser.cc:119
-msgid "Save Preset File"
-msgstr ""
-
-#: src/skins/preset-browser.cc:137
-msgid "Save EQF File"
-msgstr ""
-
-#: src/skins/preset-browser.cc:151
-msgid "Import Winamp Presets"
-msgstr ""
-
-#: src/skins/preset-list.cc:285
-msgid "Presets"
-msgstr ""
-
-#: src/skins/preset-list.cc:335
-msgid "Load preset"
-msgstr "Пресетти жүктөө"
-
-#: src/skins/preset-list.cc:351
-msgid "Load auto-preset"
-msgstr "Авто-пресетти жүктөө"
-
-#: src/skins/preset-list.cc:367
-msgid "Save preset"
-msgstr "Пресетти сактоо"
-
-#: src/skins/preset-list.cc:382
-msgid "Save auto-preset"
-msgstr "Авто-пресетти сактоо"
-
-#: src/skins/preset-list.cc:408
-msgid "Delete preset"
-msgstr "Пресетти өчүрүү"
-
-#: src/skins/preset-list.cc:424
-msgid "Delete auto-preset"
-msgstr "Авто-пресетти өчүрүү"
-
-#: src/skins/skins_cfg.cc:176
-msgid "Player:"
-msgstr ""
-
-#: src/skins/skins_cfg.cc:178
-msgid "Select main player window font:"
-msgstr "Ойноткучтун негизги терезесинин шрифтин тандаңыз:"
-
-#: src/skins/skins_cfg.cc:179
-msgid "Playlist:"
-msgstr ""
-
-#: src/skins/skins_cfg.cc:181
-msgid "Select playlist font:"
-msgstr "Ойнотуу тизмесинин шрифтин тандоо:"
-
-#: src/skins/skins_cfg.cc:187
-msgid "Skin"
-msgstr ""
-
-#: src/skins/skins_cfg.cc:189
-msgid "Fonts"
-msgstr ""
-
-#: src/skins/skins_cfg.cc:192
-msgid "Use bitmap fonts (supports ASCII only)"
-msgstr ""
-
-#: src/skins/skins_cfg.cc:194
-msgid "Scroll song title"
-msgstr ""
-
-#: src/skins/skins_cfg.cc:196
-msgid "Scroll song title in both directions"
-msgstr "Ыр атын эки багытты карата айлантуу"
-
-#: src/skins/skins_cfg.cc:201
-msgid "Analyzer"
-msgstr "Анализатор"
-
-#: src/skins/skins_cfg.cc:202
-msgid "Scope"
-msgstr "Осциллограмма"
-
-#: src/skins/skins_cfg.cc:203
-msgid "Voiceprint / VU meter"
-msgstr ""
-
-#: src/skins/skins_cfg.cc:204
-msgid "Off"
-msgstr "Өч."
-
-#: src/skins/skins_cfg.cc:208 src/skins/skins_cfg.cc:233
-#: src/skins/skins_cfg.cc:239
-msgid "Normal"
-msgstr "Жөнөкөй"
-
-#: src/skins/skins_cfg.cc:209 src/skins/skins_cfg.cc:234
-msgid "Fire"
-msgstr "От"
-
-#: src/skins/skins_cfg.cc:210
-msgid "Vertical lines"
-msgstr ""
-
-#: src/skins/skins_cfg.cc:214
-msgid "Lines"
-msgstr "Сызыктар"
-
-#: src/skins/skins_cfg.cc:215
-msgid "Bars"
-msgstr "Тилкелер"
-
-#: src/skins/skins_cfg.cc:219
-msgid "Slowest"
-msgstr "Жайыраак"
-
-#: src/skins/skins_cfg.cc:220
-msgid "Slow"
-msgstr "Жай"
-
-#: src/skins/skins_cfg.cc:221 src/sox-resampler/sox-resampler.cc:152
-msgid "Medium"
-msgstr "Орточо"
-
-#: src/skins/skins_cfg.cc:222
-msgid "Fast"
-msgstr "Бат"
-
-#: src/skins/skins_cfg.cc:223
-msgid "Fastest"
-msgstr "Батыраак"
-
-#: src/skins/skins_cfg.cc:227
-msgid "Dots"
-msgstr ""
-
-#: src/skins/skins_cfg.cc:228
-msgid "Line"
-msgstr ""
-
-#: src/skins/skins_cfg.cc:229
-msgid "Solid"
-msgstr ""
-
-#: src/skins/skins_cfg.cc:235
-msgid "Ice"
-msgstr "Муз"
-
-#: src/skins/skins_cfg.cc:240
-msgid "Smooth"
-msgstr "Тегиз"
-
-#: src/skins/skins_cfg.cc:244
-msgid "Type"
-msgstr ""
-
-#: src/skins/skins_cfg.cc:245
-msgid "Visualization type:"
-msgstr ""
-
-#: src/skins/skins_cfg.cc:248
-msgid "Analyzer"
-msgstr ""
-
-#: src/skins/skins_cfg.cc:249
-msgid "Show peaks"
-msgstr ""
-
-#: src/skins/skins_cfg.cc:251
-msgid "Coloring:"
-msgstr ""
-
-#: src/skins/skins_cfg.cc:254
-msgid "Style:"
-msgstr ""
-
-#: src/skins/skins_cfg.cc:257
-msgid "Falloff:"
-msgstr ""
-
-#: src/skins/skins_cfg.cc:260
-msgid "Peak falloff:"
-msgstr ""
-
-#: src/skins/skins_cfg.cc:264
-msgid "Scope Style:"
-msgstr ""
-
-#: src/skins/skins_cfg.cc:267
-msgid "Voiceprint Coloring:"
-msgstr ""
-
-#: src/skins/skins_cfg.cc:270
-msgid "VU Meter Style:"
-msgstr ""
-
-#: src/skins/skins_cfg.cc:276
-msgid "General"
-msgstr "Негизги"
-
-#: src/skins/skins_cfg.cc:277
-msgid "Visualization"
-msgstr "Визуалдаштыруу"
-
-#: src/skins/ui_equalizer.cc:282
-msgid "Preamp"
-msgstr "Күчөтүү"
-
-#: src/skins/ui_equalizer.cc:286
-msgid "31 Hz"
-msgstr "31 Гц"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "63 Hz"
-msgstr "63 Гц"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "125 Hz"
-msgstr "125 Гц"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "250 Hz"
-msgstr "250 Гц"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "500 Hz"
-msgstr "500 Гц"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "1 kHz"
-msgstr "1 кГц"
-
-#: src/skins/ui_equalizer.cc:288
-msgid "2 kHz"
-msgstr "2 кГц"
-
-#: src/skins/ui_equalizer.cc:288
-msgid "4 kHz"
-msgstr "4 кГц"
-
-#: src/skins/ui_equalizer.cc:288
-msgid "8 kHz"
-msgstr "8 кГц"
-
-#: src/skins/ui_equalizer.cc:288
-msgid "16 kHz"
-msgstr "16 кГц"
-
-#: src/skins/ui_equalizer.cc:330
-msgid "Audacious Equalizer"
-msgstr "Audacious эквалайзери"
-
-#: src/skins/ui_main.cc:688
-#, c-format
-msgid "Seek to %d:%-2.2d / %d:%-2.2d"
-msgstr ""
-
-#: src/skins/ui_main.cc:709
-#, c-format
-msgid "Volume: %d%%"
-msgstr "Катуулук: %d%%"
-
-#: src/skins/ui_main.cc:732
-#, c-format
-msgid "Balance: %d%% left"
-msgstr "Балансы: %d%% сол"
-
-#: src/skins/ui_main.cc:734
-msgid "Balance: center"
-msgstr ""
-
-#: src/skins/ui_main.cc:736
-#, c-format
-msgid "Balance: %d%% right"
-msgstr "Балансы: %d%% оң"
-
-#: src/skins/ui_main.cc:842
-msgid "Options Menu"
-msgstr "Параметрлер менюсу"
-
-#: src/skins/ui_main.cc:846
-msgid "Disable 'Always On Top'"
-msgstr "\"Дайыма үстүндө\"нү өчүрүү"
-
-#: src/skins/ui_main.cc:848
-msgid "Enable 'Always On Top'"
-msgstr "\"Дайыма үстүндө\"нү күйгүзүү"
-
-#: src/skins/ui_main.cc:851
-msgid "File Info Box"
-msgstr "Файл жөнүндө маалымат"
-
-#: src/skins/ui_main.cc:857
-msgid "Visualizations"
-msgstr ""
-
-#: src/skins/ui_main.cc:1336
-msgid "Repeat point A set."
-msgstr ""
-
-#: src/skins/ui_main.cc:1341
-msgid "Repeat point B set."
-msgstr ""
-
-#: src/skins/ui_main.cc:1350
-msgid "Repeat points cleared."
-msgstr ""
-
-#: src/skins/ui_playlist.cc:219
-msgid "Search entries in active playlist"
-msgstr "Активдүү ойнотуу тизмесинен жазууларды издөө"
-
-#: src/skins/ui_playlist.cc:226
-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.cc:234
-msgid "Title:"
-msgstr ""
-
-#: src/skins/ui_playlist.cc:241
-msgid "Album:"
-msgstr ""
-
-#: src/skins/ui_playlist.cc:248
-msgid "Artist:"
-msgstr ""
-
-#: src/skins/ui_playlist.cc:255
-msgid "File Name:"
-msgstr ""
-
-#: src/skins/ui_playlist.cc:263
-msgid "Clear previous selection before searching"
-msgstr ""
-
-#: src/skins/ui_playlist.cc:266
-msgid "Automatically toggle queue for matching entries"
-msgstr ""
-
-#: src/skins/ui_playlist.cc:269
-msgid "Create a new playlist with matching entries"
-msgstr ""
-
-#: src/skins/ui_playlist.cc:717
-msgid "Audacious Playlist Editor"
-msgstr "Audacious ойнотуу тизмесинин редактору"
-
-#: src/skins/ui_playlist.cc:752
-#, c-format
-msgid "%s (%d of %d)"
-msgstr "%s (%d / %d)"
-
-#: src/skins/ui_skinselector.cc:167
-msgid "Archived Winamp 2.x skin"
-msgstr "Архивделген Winamp 2.x темасы"
-
-#: src/skins/ui_skinselector.cc:172
-msgid "Unarchived Winamp 2.x skin"
-msgstr "Архивделбеген Winamp 2.x темасы"
-
-#: src/skins/util.cc:430
-#, c-format
-msgid "Could not create directory (%s): %s\n"
-msgstr ""
-
-#: src/sndfile/plugin.cc:39
-msgid "Sndfile Plugin"
-msgstr "Sndfile плагини"
-
-#: src/sndfile/plugin.cc:336
-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/sndio-ng/sndio.cc:44
-msgid "Sndio Output"
-msgstr ""
-
-#: src/sndio-ng/sndio.cc:98
-msgid "Device (blank for default):"
-msgstr ""
-
-#: src/sndio-ng/sndio.cc:100
-msgid "Save and restore volume:"
-msgstr ""
-
-#: src/sndio-ng/sndio.cc:181
-#, c-format
-msgid "Sndio error: Unsupported audio format (%d)"
-msgstr ""
-
-#: src/sndio-ng/sndio.cc:192
-msgid "Sndio error: sio_open() failed"
-msgstr ""
-
-#: src/sndio-ng/sndio.cc:222
-msgid "Sndio error: sio_setpar() failed"
-msgstr ""
-
-#: src/sndio-ng/sndio.cc:234
-msgid "Sndio error: sio_start() failed"
-msgstr ""
-
-#: src/song_change/song_change.cc:33
-msgid "Song Change"
-msgstr "Ыр которуу"
-
-#: src/song_change/song_change.cc:342
-msgid ""
-"Parameters passed to the shell should be encapsulated in "
-"quotes. Doing otherwise is a security risk."
-msgstr ""
-
-#: src/song_change/song_change.cc:358
-msgid "Commands"
-msgstr ""
-
-#: src/song_change/song_change.cc:360
-msgid "Command to run when starting a new song:"
-msgstr ""
-
-#: src/song_change/song_change.cc:364
-msgid "Command to run at the end of a song:"
-msgstr ""
-
-#: src/song_change/song_change.cc:368
-msgid "Command to run at the end of the playlist:"
-msgstr ""
-
-#: src/song_change/song_change.cc:372
-msgid "Command to run when song title changes (for network streams):"
-msgstr ""
-
-#: src/song_change/song_change.cc:376
-msgid ""
-"You can use the following format strings which will be substituted before "
-"calling the command (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-info-qt/song-info.cc:32
-msgid "Song Info (Qt)"
-msgstr ""
-
-#: src/sox-resampler/sox-resampler.cc:44
-msgid "SoX Resampler"
-msgstr ""
-
-#: src/sox-resampler/sox-resampler.cc:144
-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.cc:150
-msgid "Quick"
-msgstr ""
-
-#: src/sox-resampler/sox-resampler.cc:151
-msgid "Low"
-msgstr ""
-
-#: src/sox-resampler/sox-resampler.cc:153
-msgid "High"
-msgstr ""
-
-#: src/sox-resampler/sox-resampler.cc:154
-msgid "Very High"
-msgstr ""
-
-#: src/sox-resampler/sox-resampler.cc:158
-msgid "Quality:"
-msgstr "Сапаты:"
-
-#: src/speed-pitch/speed-pitch.cc:51
-msgid "Speed and Pitch"
-msgstr "Ылдамдык жана бийиктик"
-
-#: src/speed-pitch/speed-pitch.cc:210
-msgid "Speed and Pitch"
-msgstr "Ылдамдык жана бийиктик"
-
-#: src/speed-pitch/speed-pitch.cc:211
-msgid "Speed:"
-msgstr "Ылдамдык:"
-
-#: src/speed-pitch/speed-pitch.cc:214
-msgid "Pitch:"
-msgstr "Бийиктик:"
-
-#: src/statusicon/statusicon.cc:47
-msgid "Status Icon"
-msgstr "Статус иконкасы"
-
-#: src/statusicon/statusicon.cc:283
-msgid "Se_ttings ..."
-msgstr ""
-
-#: src/statusicon/statusicon.cc:372
-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.cc:379
-msgid "Mouse Scroll Action"
-msgstr "Чычканды айлантуу аракети"
-
-#: src/statusicon/statusicon.cc:380
-msgid "Change volume"
-msgstr "Катуулукту өзгөртүү"
-
-#: src/statusicon/statusicon.cc:383
-msgid "Change playing song"
-msgstr "Ойнотулуп жаткан ырды алмаштыруу"
-
-#: src/statusicon/statusicon.cc:386
-msgid "Other Settings"
-msgstr "Башка ырастоолор"
-
-#: src/statusicon/statusicon.cc:387
-msgid "Disable the popup window"
-msgstr "Калкыма терезени өчүрүү"
-
-#: src/statusicon/statusicon.cc:389
-msgid "Close to the system tray"
-msgstr "Системалык трейге жабуу"
-
-#: src/statusicon/statusicon.cc:391
-msgid "Advance in playlist when scrolling upward"
-msgstr ""
-
-#: src/stereo_plugin/stereo.cc:19
-msgid "Extra Stereo"
-msgstr "Экстра стерео"
-
-#: src/stereo_plugin/stereo.cc:36
-msgid ""
-"Extra Stereo Plugin\n"
-"\n"
-"By Johan Levin, 1999"
-msgstr ""
-
-#: src/stereo_plugin/stereo.cc:44
-msgid "Extra Stereo"
-msgstr "Экстра стерео"
-
-#: src/tonegen/tonegen.cc:45
-msgid "Tone Generator"
-msgstr "Тон генератору"
-
-#: src/tonegen/tonegen.cc:94
-#, c-format
-msgid "%s %.1f Hz"
-msgstr "%s %.1f Гц"
-
-#: src/tonegen/tonegen.cc:94
-msgid "Tone Generator: "
-msgstr "Тон генератору: "
-
-#: src/tonegen/tonegen.cc:160
-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/voice_removal/voice_removal.cc:28
-msgid "Voice Removal"
-msgstr ""
-
-#: src/vorbis/vorbis.cc:465
-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.h:18
-msgid "Ogg Vorbis Decoder"
-msgstr "Ogg Vorbis декодери"
-
-#: src/vtx/info.cc:22
-#, c-format
-msgid "Details about %s"
-msgstr ""
-
-#: src/vtx/info.cc:24
-msgid ""
-"Title: %t\n"
-"Author: %a\n"
-"From: %f\n"
-"Tracker: %T\n"
-"Comment: %C\n"
-"Chip type: %c\n"
-"Stereo: %s\n"
-"Loop: %l\n"
-"Chip freq: %F\n"
-"Player Freq: %P\n"
-"Year: %y"
-msgstr ""
-
-#: src/vtx/vtx.cc:38
-msgid "VTX Decoder"
-msgstr "VTX декодери"
-
-#: src/vtx/vtx.cc:184
-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/wavpack/wavpack.cc:24
-msgid "WavPack Decoder"
-msgstr "WavPack декодери"
-
-#: src/wavpack/wavpack.cc:211
-msgid "lossy (hybrid)"
-msgstr ""
-
-#: src/wavpack/wavpack.cc:213
-msgid "lossy"
-msgstr ""
-
-#: src/wavpack/wavpack.cc:255
-msgid ""
-"Copyright 2006 William Pitcock <nenolod@nenolod.net>\n"
-"\n"
-"Some of the plugin code was by Miles Egan."
-msgstr ""
-
-#: src/xsf/plugin.cc:50
-msgid "2SF Decoder"
-msgstr "2SF декодери"
-
-#: src/xsf/plugin.cc:238
-msgid "XSF Configuration"
-msgstr ""
-
-#: src/xsf/plugin.cc:239
-msgid "Ignore length from file"
-msgstr ""
-
-#: src/xspf/xspf.cc:89
-msgid "XML Shareable Playlists (XSPF)"
-msgstr ""

audacious-plugins-3.6.2-gtk3.tar.bz2/src/aac-raw Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/aac-raw/Makefile Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/aac-raw/aac.cc Deleted

@@ -1,477 +0,0 @@
-#include <stdint.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include <neaacdec.h>
-
-#include <audacious/audtag.h>
-#include <libaudcore/i18n.h>
-#include <libaudcore/plugin.h>
-#include <libaudcore/runtime.h>
-
-class AACDecoder : public InputPlugin
-{
-public:
- static const char * const exts;
-
- static constexpr PluginInfo info = {
- N_("AAC (Raw) Decoder"),
- PACKAGE
- };
-
- static constexpr auto iinfo = InputInfo ()
- .with_exts (exts);
-
- constexpr AACDecoder () : InputPlugin (info, iinfo) {}
-
- bool is_our_file (const char * filename, VFSFile & file);
- Tuple read_tuple (const char * filename, VFSFile & file);
- bool play (const char * filename, VFSFile & file);
-};
-
-EXPORT AACDecoder aud_plugin_instance;
-
-const char * const AACDecoder::exts = {"aac", nullptr};
-
-/*
- * BUFFER_SIZE is the highest amount of memory that can be pulled.
- * We use this for sanity checks, among other things, as mp4ff needs
- * a labotomy sometimes.
- */
-#define BUFFER_SIZE (FAAD_MIN_STREAMSIZE * 16)
-
-/*
- * These routines are derived from MPlayer.
- */
-
-/// \param srate (out) sample rate
-/// \param num (out) number of audio frames in this ADTS frame
-/// \return size of the ADTS frame in bytes
-/// aac_parse_frames needs a buffer at least 8 bytes long
-int aac_parse_frame (unsigned char * buf, int *srate, int *num)
-{
- int i = 0, sr, fl = 0;
- static int srates =
- { 96000, 88200, 64000, 48000, 44100, 32000, 24000, 22050, 16000, 12000,
- 11025, 8000, 0, 0, 0 };
-
- if ((bufi != 0xFF) || ((bufi + 1 & 0xF6) != 0xF0))
- return 0;
-
-/* We currently have no use for the id below.
- id = (bufi+1 >> 3) & 0x01; //id=1 mpeg2, 0: mpeg4
-*/
- sr = (bufi + 2 >> 2) & 0x0F;
- if (sr > 11)
- return 0;
- *srate = sratessr;
-
- fl =
- ((bufi + 3 & 0x03) << 11) | (bufi + 4 << 3) | ((bufi +
- 5 >> 5) & 0x07);
- *num = (bufi + 6 & 0x02) + 1;
-
- return fl;
-}
-
-#define PROBE_DEBUG(...)
-
-/* Searches <length> bytes of data for an ADTS header. Returns the offset of
- * the first header or -1 if none is found. Sets <size> to the length of the
- * frame. */
-static int find_aac_header (unsigned char * data, int length, int * size)
-{
- int offset, a, b;
-
- for (offset = 0; offset <= length - 8; offset++)
- {
- if (dataoffset != 255)
- continue;
-
- *size = aac_parse_frame (data + offset, &a, &b);
-
- if (*size < 8)
- continue;
-
- return offset;
- }
-
- return -1;
-}
-
-bool AACDecoder::is_our_file (const char * filename, VFSFile & stream)
-{
- unsigned char data8192;
- int offset, found, inner, size;
-
- size = 0; /* avoid bogus uninitialized variable warning */
-
- if (stream.fread (data, 1, sizeof data) != sizeof data)
- {
- PROBE_DEBUG ("Read failed.\n");
- return false;
- }
-
- offset = 0;
-
- for (found = 0; found < 3; found++)
- {
- inner = find_aac_header (data + offset, sizeof data - offset, &size);
-
- if (!(inner == 0 || (found == 0 && inner > 0)))
- {
- PROBE_DEBUG ("Only %d ADTS headers.\n", found);
- return false;
- }
-
- offset += inner + size;
- }
-
- PROBE_DEBUG ("Accepted.\n");
- return true;
-}
-
-/* Quick search for an ADTS or ADIF header in the first <len> bytes of <buf>.
- * Returns the byte offset of the header or <len> if none is found. */
-
-static int aac_probe (unsigned char * buf, int len)
-{
- for (int i = 0; i <= len - 4; i ++)
- {
- if ((bufi == 0xff && (bufi + 1 & 0xf6) == 0xf0) || ! strncmp
- ((char *) buf + i, "ADIF", 4))
- return i;
- }
-
- return len;
-}
-
-/* Gets info (some approximated) from an AAC/ADTS file. <length> is
- * milliseconds, <bitrate> is kilobits per second. Any parameters that cannot
- * be read are set to -1. */
-static void calc_aac_info (VFSFile & handle, int * length, int * bitrate,
- int * samplerate, int * channels)
-{
- NeAACDecHandle decoder;
- NeAACDecFrameInfo frame;
- bool initted = false;
- int size = handle.fsize ();
- unsigned char bufferBUFFER_SIZE;
- int offset = 0, filled = 0;
- int found, bytes_used = 0, time_used = 0;
-
- decoder = nullptr; /* avoid bogus uninitialized variable warning */
-
- *length = -1;
- *bitrate = -1;
- *samplerate = -1;
- *channels = -1;
-
- /* look for a representative bitrate in the middle of the file */
- if (size < 0 || handle.fseek (size / 2, VFS_SEEK_SET) < 0)
- goto DONE;
-
- for (found = 0; found < 32; found++)
- {
- if (filled < BUFFER_SIZE / 2)
- {
- memmove (buffer, buffer + offset, filled);
- offset = 0;
-
- if (handle.fread (buffer + filled, 1, BUFFER_SIZE - filled)
- != BUFFER_SIZE - filled)
- {
- PROBE_DEBUG ("Read failed.\n");
- goto DONE;
- }
-
- filled = BUFFER_SIZE;
- }
-
- if (!initted)
- {
- int inner, a;
- unsigned long r;
- unsigned char ch;
-
- inner = find_aac_header (buffer + offset, filled, &a);
-
- if (inner < 0)
- {
- PROBE_DEBUG ("No ADTS header.\n");
- goto DONE;
- }
-
- offset += inner;
- filled -= inner;
-
- decoder = NeAACDecOpen ();
- inner = NeAACDecInit (decoder, buffer + offset, filled, &r, &ch);
-
- if (inner < 0)
- {
- PROBE_DEBUG ("Decoder init failed.\n");
- NeAACDecClose (decoder);
- goto DONE;
- }
-
- offset += inner;
- filled -= inner;
- bytes_used += inner;
-
- *samplerate = r;
- *channels = ch;
- initted = true;
- }
-
- if (NeAACDecDecode (decoder, &frame, buffer + offset, filled) == nullptr)
- {
- PROBE_DEBUG ("Decode failed.\n");
- goto DONE;
- }
-
- if ((int)frame.samplerate != *samplerate || (int)frame.channels != *channels)
- {
- PROBE_DEBUG ("Parameter mismatch.\n");
- goto DONE;
- }
-
- offset += frame.bytesconsumed;
- filled -= frame.bytesconsumed;
- bytes_used += frame.bytesconsumed;
- time_used += frame.samples / frame.channels * (int64_t) 1000 /
- frame.samplerate;
- }
-
- /* bits per millisecond = kilobits per second */
- *bitrate = bytes_used * 8 / time_used;
-
- if (size > 0)
- *length = size * (int64_t) time_used / bytes_used;
-
- DONE:
- if (initted)
- NeAACDecClose (decoder);
-}
-
-Tuple AACDecoder::read_tuple (const char * filename, VFSFile & handle)
-{
- Tuple tuple;
- int length, bitrate, samplerate, channels;
-
- tuple.set_filename (filename);
- tuple.set_str (Tuple::Codec, "MPEG-2/4 AAC");
-
- calc_aac_info (handle, &length, &bitrate, &samplerate, &channels);
-
- if (length > 0)
- tuple.set_int (Tuple::Length, length);
- if (bitrate > 0)
- tuple.set_int (Tuple::Bitrate, bitrate);
-
- tuple.fetch_stream_info (handle);
-
- return tuple;
-}
-
-static void aac_seek (VFSFile & file, NeAACDecHandle dec, int time, int len,
- void * buf, int size, int * buflen)
-{
- /* == ESTIMATE BYTE OFFSET == */
-
- int64_t total = file.fsize ();
- if (total < 0)
- {
- AUDERR ("File is not seekable.\n");
- return;
- }
-
- /* == SEEK == */
-
- if (file.fseek (total * time / len, VFS_SEEK_SET))
- return;
-
- * buflen = file.fread (buf, 1, size);
-
- /* == FIND FRAME HEADER == */
-
- int used = aac_probe ((unsigned char *) buf, * buflen);
-
- if (used == * buflen)
- {
- AUDERR ("No valid frame header found.\n");
- * buflen = 0;
- return;
- }
-
- if (used)
- {
- * buflen -= used;
- memmove (buf, (char *) buf + used, * buflen);
- * buflen += file.fread ((char *) buf + * buflen, 1, size - * buflen);
- }
-
- /* == START DECODING == */
-
- unsigned char chan;
- unsigned long rate;
-
- if ((used = NeAACDecInit (dec, (unsigned char *) buf, * buflen, & rate, & chan)))
- {
- * buflen -= used;
- memmove (buf, (char *) buf + used, * buflen);
- * buflen += file.fread ((char *) buf + * buflen, 1, size - * buflen);
- }
-}
-
-bool AACDecoder::play (const char * filename, VFSFile & file)
-{
- NeAACDecHandle decoder = 0;
- NeAACDecConfigurationPtr decoder_config;
- unsigned long samplerate = 0;
- unsigned char channels = 0;
- int bitrate = 0;
-
- Tuple tuple = get_playback_tuple ();
-
- if (tuple)
- {
- bitrate = tuple.get_int (Tuple::Bitrate);
- bitrate = 1000 * aud::max (0, bitrate);
- }
-
- if ((decoder = NeAACDecOpen ()) == nullptr)
- {
- AUDERR ("Open Decoder Error\n");
- return false;
- }
-
- decoder_config = NeAACDecGetCurrentConfiguration (decoder);
- decoder_config->outputFormat = FAAD_FMT_FLOAT;
- NeAACDecSetConfiguration (decoder, decoder_config);
-
- /* == FILL BUFFER == */
-
- unsigned char bufBUFFER_SIZE;
- int buflen;
- buflen = file.fread (buf, 1, sizeof buf);
-
- /* == SKIP ID3 TAG == */
-
- if (buflen >= 10 && ! strncmp ((char *) buf, "ID3", 3))
- {
- int tagsize = 10 + (buf6 << 21) + (buf7 << 14) + (buf8 << 7) + buf9;
-
- if (file.fseek (tagsize, VFS_SEEK_SET))
- {
- AUDERR ("Failed to seek past ID3v2 tag.\n");
- goto ERR_CLOSE_DECODER;
- }
-
- buflen = file.fread (buf, 1, sizeof buf);
- }
-
- /* == FIND FRAME HEADER == */
-
- int used;
- used = aac_probe (buf, buflen);
-
- if (used == buflen)
- {
- AUDERR ("No valid frame header found.\n");
- goto ERR_CLOSE_DECODER;
- }
-
- if (used)
- {
- buflen -= used;
- memmove (buf, buf + used, buflen);
- buflen += file.fread (buf + buflen, 1, sizeof buf - buflen);
- }
-
- /* == START DECODING == */
-
- if ((used = NeAACDecInit (decoder, buf, buflen, & samplerate, & channels)))
- {
- buflen -= used;
- memmove (buf, buf + used, buflen);
- buflen += file.fread (buf + buflen, 1, sizeof buf - buflen);
- }
-
- /* == CHECK FOR METADATA == */
-
- if (tuple && tuple.fetch_stream_info (file))
- set_playback_tuple (tuple.ref ());
-
- set_stream_bitrate (bitrate);
-
- /* == START PLAYBACK == */
-
- open_audio (FMT_FLOAT, samplerate, channels);
-
- /* == MAIN LOOP == */
-
- while (! check_stop ())
- {
- /* == HANDLE SEEK REQUESTS == */
-
- int seek_value = check_seek ();
-
- if (seek_value >= 0)
- {
- int length = tuple ? tuple.get_int (Tuple::Length) : 0;
-
- if (length > 0)
- aac_seek (file, decoder, seek_value, length, buf, sizeof buf, & buflen);
- }
-
- /* == CHECK FOR END OF FILE == */
-
- if (! buflen)
- break;
-
- /* == CHECK FOR METADATA == */
-
- if (tuple && tuple.fetch_stream_info (file))
- set_playback_tuple (tuple.ref ());
-
- /* == DECODE A FRAME == */
-
- NeAACDecFrameInfo info;
- void * audio = NeAACDecDecode (decoder, & info, buf, buflen);
-
- if (info.error)
- {
- AUDERR ("%s.\n", NeAACDecGetErrorMessage (info.error));
-
- if (buflen)
- {
- used = 1 + aac_probe (buf + 1, buflen - 1);
- buflen -= used;
- memmove (buf, buf + used, buflen);
- buflen += file.fread (buf + buflen, 1, sizeof buf - buflen);
- }
-
- continue;
- }
-
- if ((used = info.bytesconsumed))
- {
- buflen -= used;
- memmove (buf, buf + used, buflen);
- buflen += file.fread (buf + buflen, 1, sizeof buf - buflen);
- }
-
- /* == PLAY THE SOUND == */
-
- if (audio && info.samples)
- write_audio (audio, sizeof (float) * info.samples);
- }
-
- NeAACDecClose (decoder);
- return true;
-
-ERR_CLOSE_DECODER:
- NeAACDecClose (decoder);
- return false;
-}

audacious-plugins-3.6.2-gtk3.tar.bz2/src/adplug/core Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/adplug/core/README.audacious Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/adplug/core/a2m.cc Deleted

@@ -1,597 +0,0 @@
-/*
- * 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
- *
- * a2m.cpp - A2M Loader by Simon Peter <dn.tlp@gmx.net>
- *
- * NOTES:
- * This loader detects and loads version 1, 4, 5 & 8 files.
- *
- * version 1-4 files:
- * Following commands are ignored: FF1 - FF9, FAx - FEx
- *
- * version 5-8 files:
- * Instrument panning is ignored. Flags byte is ignored.
- * Following commands are ignored: Gxy, Hxy, Kxy - &xy
- */
-
-#include <string.h>
-
-#include "a2m.h"
-
-const unsigned int
- Ca2mLoader::MAXFREQ = 2000,
- Ca2mLoader::MINCOPY = ADPLUG_A2M_MINCOPY,
- Ca2mLoader::MAXCOPY = ADPLUG_A2M_MAXCOPY,
- Ca2mLoader::COPYRANGES = ADPLUG_A2M_COPYRANGES,
- Ca2mLoader::CODESPERRANGE = ADPLUG_A2M_CODESPERRANGE,
- Ca2mLoader::TERMINATE = 256,
- Ca2mLoader::FIRSTCODE = ADPLUG_A2M_FIRSTCODE,
- Ca2mLoader::MAXCODE = FIRSTCODE + COPYRANGES * CODESPERRANGE - 1,
- Ca2mLoader::SUCCMAX = MAXCODE + 1,
- Ca2mLoader::TWICEMAX = ADPLUG_A2M_TWICEMAX,
- Ca2mLoader::ROOT = 1, Ca2mLoader::MAXBUF = 42 * 1024,
- Ca2mLoader::MAXDISTANCE = 21389, Ca2mLoader::MAXSIZE = 21389 + MAXCOPY;
-
-const unsigned short
-Ca2mLoader::bitvalue14 =
- { 1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 2048, 4096, 8192 };
-
-const signed short
-Ca2mLoader::copybitsCOPYRANGES = { 4, 6, 8, 10, 12, 14 };
-
-const signed short
-Ca2mLoader::copyminCOPYRANGES = { 0, 16, 80, 336, 1360, 5456 };
-
-CPlayer *
-Ca2mLoader::factory (Copl * newopl)
-{
- return new Ca2mLoader (newopl);
-}
-
-bool
-Ca2mLoader::load (VFSFile & fd, const CFileProvider & fp)
-{
- binistream *f = fp.open (fd);
- if (!f)
- return false;
- char id10;
- int i, j, k, t;
- unsigned int l;
- unsigned char *org = nullptr, *orgptr, flags = 0, numpats, version;
- unsigned long alength;
- unsigned short len9, *secdata, *secptr;
- const unsigned char convfx16 =
- { 0, 1, 2, 23, 24, 3, 5, 4, 6, 9, 17, 13, 11, 19, 7, 14 };
- const unsigned char convinf116 =
- { 0, 1, 2, 6, 7, 8, 9, 4, 5, 3, 10, 11, 12, 13, 14, 15 };
- const unsigned char newconvfx =
- { 0, 1, 2, 3, 4, 5, 6, 23, 24, 21, 10, 11, 17, 13, 7, 19,
- 255, 255, 22, 25, 255, 15, 255, 255, 255, 255, 255,
- 255, 255, 255, 255, 255, 255, 255, 255, 14, 255
- };
-
- // read header
- f->readString (id, 10);
- f->readInt (4);
- version = f->readInt (1);
- numpats = f->readInt (1);
-
- // file validation section
- if (strncmp (id, "_A2module_", 10) || (version != 1 && version != 5 &&
- version != 4 && version != 8))
- {
- fp.close (f);
- return false;
- }
-
- // load, depack & convert section
- nop = numpats;
- length = 128;
- restartpos = 0;
- if (version < 5)
- {
- for (i = 0; i < 5; i++)
- leni = f->readInt (2);
- t = 9;
- }
- else
- { // version >= 5
- for (i = 0; i < 9; i++)
- leni = f->readInt (2);
- t = 18;
- }
-
- // block 0
- secdata = new unsigned shortlen0 / 2;
- if (version == 1 || version == 5)
- {
- for (i = 0; i < len0 / 2; i++)
- secdatai = f->readInt (2);
- org = new unsigned charMAXBUF;
- orgptr = org;
- sixdepak (secdata, org, len0);
- }
- else
- {
- orgptr = (unsigned char *) secdata;
- for (i = 0; i < len0; i++)
- orgptri = f->readInt (1);
- }
- memcpy (songname, orgptr, 43);
- orgptr += 43;
- memcpy (author, orgptr, 43);
- orgptr += 43;
- memcpy (instname, orgptr, 250 * 33);
- orgptr += 250 * 33;
-
- for (i = 0; i < 250; i++)
- { // instruments
- insti.data0 = *(orgptr + i * 13 + 10);
- insti.data1 = *(orgptr + i * 13);
- insti.data2 = *(orgptr + i * 13 + 1);
- insti.data3 = *(orgptr + i * 13 + 4);
- insti.data4 = *(orgptr + i * 13 + 5);
- insti.data5 = *(orgptr + i * 13 + 6);
- insti.data6 = *(orgptr + i * 13 + 7);
- insti.data7 = *(orgptr + i * 13 + 8);
- insti.data8 = *(orgptr + i * 13 + 9);
- insti.data9 = *(orgptr + i * 13 + 2);
- insti.data10 = *(orgptr + i * 13 + 3);
- if (version < 5)
- insti.misc = *(orgptr + i * 13 + 11);
- else
- { // version >= 5 -> OPL3 format
- int pan = *(orgptr + i * 13 + 11);
-
- if (pan)
- insti.data0 |= (pan & 3) << 4; // set pan
- else
- insti.data0 |= 48; // enable both speakers
- }
-
- insti.slide = *(orgptr + i * 13 + 12);
- }
-
- orgptr += 250 * 13;
- memcpy (order, orgptr, 128);
- orgptr += 128;
- bpm = *orgptr;
- orgptr++;
- initspeed = *orgptr;
- orgptr++;
- if (version >= 5)
- flags = *orgptr;
- if (version == 1 || version == 5)
- deleteorg;
- deletesecdata;
-
- // blocks 1-4 or 1-8
- alength = len1;
- for (i = 0; i < (version < 5 ? numpats / 16 : numpats / 8); i++)
- alength += leni + 2;
-
- secdata = new unsigned shortalength / 2;
- if (version == 1 || version == 5)
- {
- for (l = 0; l < alength / 2; l++)
- secdatal = f->readInt (2);
- org = new unsigned charMAXBUF * (numpats / (version == 1 ? 16 : 8) + 1);
- orgptr = org;
- secptr = secdata;
- orgptr += sixdepak (secptr, orgptr, len1);
- secptr += len1 / 2;
- if (version == 1)
- {
- if (numpats > 16)
- orgptr += sixdepak (secptr, orgptr, len2);
- secptr += len2 / 2;
- if (numpats > 32)
- orgptr += sixdepak (secptr, orgptr, len3);
- secptr += len3 / 2;
- if (numpats > 48)
- sixdepak (secptr, orgptr, len4);
- }
- else
- {
- if (numpats > 8)
- orgptr += sixdepak (secptr, orgptr, len2);
- secptr += len2 / 2;
- if (numpats > 16)
- orgptr += sixdepak (secptr, orgptr, len3);
- secptr += len3 / 2;
- if (numpats > 24)
- orgptr += sixdepak (secptr, orgptr, len4);
- secptr += len4 / 2;
- if (numpats > 32)
- orgptr += sixdepak (secptr, orgptr, len5);
- secptr += len5 / 2;
- if (numpats > 40)
- orgptr += sixdepak (secptr, orgptr, len6);
- secptr += len6 / 2;
- if (numpats > 48)
- orgptr += sixdepak (secptr, orgptr, len7);
- secptr += len7 / 2;
- if (numpats > 56)
- sixdepak (secptr, orgptr, len8);
- }
- deletesecdata;
- secdata = 0;
- }
- else
- {
- org = (unsigned char *) secdata;
- for (l = 0; l < alength; l++)
- orgl = f->readInt (1);
- }
-
- if (version < 5)
- {
- for (i = 0; i < numpats; i++)
- for (j = 0; j < 64; j++)
- for (k = 0; k < 9; k++)
- {
- struct Tracks *track = &tracksi * 9 + kj;
- unsigned char *o = &orgi * 64 * t * 4 + j * t * 4 + k * 4;
-
- track->note = o0 == 255 ? 127 : o0;
- track->inst = o1;
- track->command = convfxo2;
- track->param2 = o3 & 0x0f;
- if (track->command != 14)
- track->param1 = o3 >> 4;
- else
- {
- track->param1 = convinf1o3 >> 4;
- if (track->param1 == 15 && !track->param2)
- { // convert key-off
- track->command = 8;
- track->param1 = 0;
- track->param2 = 0;
- }
- }
- if (track->command == 14)
- {
- switch (track->param1)
- {
- case 2: // convert define waveform
- track->command = 25;
- track->param1 = track->param2;
- track->param2 = 0xf;
- break;
- case 8: // convert volume slide up
- track->command = 26;
- track->param1 = track->param2;
- track->param2 = 0;
- break;
- case 9: // convert volume slide down
- track->command = 26;
- track->param1 = 0;
- break;
- }
- }
- }
- }
- else
- { // version >= 5
- realloc_patterns (64, 64, 18);
-
- for (i = 0; i < numpats; i++)
- for (j = 0; j < 18; j++)
- for (k = 0; k < 64; k++)
- {
- struct Tracks *track = &tracksi * 18 + jk;
- unsigned char *o = &orgi * 64 * t * 4 + j * 64 * 4 + k * 4;
-
- track->note = o0 == 255 ? 127 : o0;
- track->inst = o1;
- track->command = newconvfxo2;
- track->param1 = o3 >> 4;
- track->param2 = o3 & 0x0f;
-
- // Convert '&' command
- if (o2 == 36)
- switch (track->param1)
- {
- case 0: // pattern delay (frames)
- track->command = 29;
- track->param1 = 0;
- // param2 already set correctly
- break;
-
- case 1: // pattern delay (rows)
- track->command = 14;
- track->param1 = 8;
- // param2 already set correctly
- break;
- }
- }
- }
-
- init_trackord ();
-
- if (version == 1 || version == 5)
- {
- deleteorg;
- }
- else
- {
- deletesecdata;
- }
-
- // Process flags
- if (version >= 5)
- {
- CmodPlayer::flags |= Opl3; // All versions >= 5 are OPL3
- if (flags & 8)
- CmodPlayer::flags |= Tremolo; // Tremolo depth
- if (flags & 16)
- CmodPlayer::flags |= Vibrato; // Vibrato depth
- }
-
- fp.close (f);
- rewind (0);
- return true;
-}
-
-float
-Ca2mLoader::getrefresh ()
-{
- if (tempo != 18)
- return (float) (tempo);
- else
- return 18.2f;
-}
-
-/*** private methods *************************************/
-
-void
-Ca2mLoader::inittree ()
-{
- unsigned short i;
-
- for (i = 2; i <= TWICEMAX; i++)
- {
- dadi = i / 2;
- freqi = 1;
- }
-
- for (i = 1; i <= MAXCODE; i++)
- {
- leftci = 2 * i;
- rghtci = 2 * i + 1;
- }
-}
-
-void
-Ca2mLoader::updatefreq (unsigned short a, unsigned short b)
-{
- do
- {
- freqdada = freqa + freqb;
- a = dada;
- if (a != ROOT)
- {
- if (leftcdada == a)
- b = rghtcdada;
- else
- b = leftcdada;
- }
- } while (a != ROOT);
-
- if (freqROOT == MAXFREQ)
- for (a = 1; a <= TWICEMAX; a++)
- freqa >>= 1;
-}
-
-void
-Ca2mLoader::updatemodel (unsigned short code)
-{
- unsigned short a = code + SUCCMAX, b, c, code1, code2;
-
- freqa++;
- if (dada != ROOT)
- {
- code1 = dada;
- if (leftccode1 == a)
- updatefreq (a, rghtccode1);
- else
- updatefreq (a, leftccode1);
-
- do
- {
- code2 = dadcode1;
- if (leftccode2 == code1)
- b = rghtccode2;
- else
- b = leftccode2;
-
- if (freqa > freqb)
- {
- if (leftccode2 == code1)
- rghtccode2 = a;
- else
- leftccode2 = a;
-
- if (leftccode1 == a)
- {
- leftccode1 = b;
- c = rghtccode1;
- }
- else
- {
- rghtccode1 = b;
- c = leftccode1;
- }
-
- dadb = code1;
- dada = code2;
- updatefreq (b, c);
- a = b;
- }
-
- a = dada;
- code1 = dada;
- } while (code1 != ROOT);
- }
-}
-
-unsigned short
-Ca2mLoader::inputcode (unsigned short bits)
-{
- unsigned short i, code = 0;
-
- for (i = 1; i <= bits; i++)
- {
- if (!ibitcount)
- {
- if (ibitcount == MAXBUF)
- ibufcount = 0;
- ibitbuffer = wdbufibufcount;
- ibufcount++;
- ibitcount = 15;
- }
- else
- ibitcount--;
-
- if (ibitbuffer > 0x7fff)
- code |= bitvaluei - 1;
- ibitbuffer <<= 1;
- }
-
- return code;
-}
-
-unsigned short
-Ca2mLoader::uncompress ()
-{
- unsigned short a = 1;
-
- do
- {
- if (!ibitcount)
- {
- if (ibufcount == MAXBUF)
- ibufcount = 0;
- ibitbuffer = wdbufibufcount;
- ibufcount++;
- ibitcount = 15;
- }
- else
- ibitcount--;
-
- if (ibitbuffer > 0x7fff)
- a = rghtca;
- else
- a = leftca;
- ibitbuffer <<= 1;
- } while (a <= MAXCODE);
-
- a -= SUCCMAX;
- updatemodel (a);
- return a;
-}
-
-void
-Ca2mLoader::decode ()
-{
- unsigned short i, j, k, t, c, count = 0, dist, len, index;
-
- inittree ();
- c = uncompress ();
-
- while (c != TERMINATE)
- {
- if (c < 256)
- {
- obufobufcount = (unsigned char) c;
- obufcount++;
- if (obufcount == MAXBUF)
- {
- output_size = MAXBUF;
- obufcount = 0;
- }
-
- bufcount = (unsigned char) c;
- count++;
- if (count == MAXSIZE)
- count = 0;
- }
- else
- {
- t = c - FIRSTCODE;
- index = t / CODESPERRANGE;
- len = t + MINCOPY - index * CODESPERRANGE;
- dist = inputcode (copybitsindex) + len + copyminindex;
-
- j = count;
- k = count - dist;
- if (count < dist)
- k += MAXSIZE;
-
- for (i = 0; i <= len - 1; i++)
- {
- obufobufcount = bufk;
- obufcount++;
- if (obufcount == MAXBUF)
- {
- output_size = MAXBUF;
- obufcount = 0;
- }
-
- bufj = bufk;
- j++;
- k++;
- if (j == MAXSIZE)
- j = 0;
- if (k == MAXSIZE)
- k = 0;
- }
-
- count += len;
- if (count >= MAXSIZE)
- count -= MAXSIZE;
- }
- c = uncompress ();
- }
- output_size = obufcount;
-}
-
-unsigned short
-Ca2mLoader::sixdepak (unsigned short *source, unsigned char *dest,
- unsigned short size)
-{
- if ((unsigned int) size + 4096 > MAXBUF)
- return 0;
-
- buf = new unsigned charMAXSIZE;
- input_size = size;
- ibitcount = 0;
- ibitbuffer = 0;
- obufcount = 0;
- ibufcount = 0;
- wdbuf = source;
- obuf = dest;
-
- decode ();
- if (buf)
- {
- deletebuf;
- buf = 0;
- }
- return output_size;
-}

audacious-plugins-3.6.2-gtk3.tar.bz2/src/adplug/core/a2m.h Deleted

@@ -1,84 +0,0 @@
-/*
- * 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
- *
- * a2m.h - A2M Loader by Simon Peter <dn.tlp@gmx.net>
- */
-
-#ifndef H_ADPLUG_A2MLOADER
-#define H_ADPLUG_A2MLOADER
-
-#include "protrack.h"
-
-class Ca2mLoader: public CmodPlayer
-{
-public:
- static CPlayer *factory(Copl *newopl);
-
-	Ca2mLoader(Copl *newopl)
-		: CmodPlayer(newopl)
-	{ };
-
-	bool load(VFSFile &fd, const CFileProvider &fp);
-	float getrefresh();
-
-	std::string gettype()
-	{ return std::string("AdLib Tracker 2"); };
-	std::string gettitle()
-	{ if(*songname) return std::string(songname,1,*songname); else return std::string(); };
-	std::string getauthor()
-	{ if(*author) return std::string(author,1,*author); else return std::string(); };
-	unsigned int getinstruments()
-	{ return 250; };
-	std::string getinstrument(unsigned int n)
-	{ return std::string(instnamen,1,*instnamen); };
-
-private:
-
-#define ADPLUG_A2M_COPYRANGES		6
-#define ADPLUG_A2M_FIRSTCODE		257
-#define ADPLUG_A2M_MINCOPY			3
-#define ADPLUG_A2M_MAXCOPY			255
-#define ADPLUG_A2M_CODESPERRANGE	(ADPLUG_A2M_MAXCOPY - ADPLUG_A2M_MINCOPY + 1)
-#define ADPLUG_A2M_MAXCHAR			(ADPLUG_A2M_FIRSTCODE + \
-	ADPLUG_A2M_COPYRANGES * ADPLUG_A2M_CODESPERRANGE - 1)
-#define ADPLUG_A2M_TWICEMAX			(2 * ADPLUG_A2M_MAXCHAR + 1)
-
-	static const unsigned int MAXFREQ, MINCOPY, MAXCOPY, COPYRANGES,
-		CODESPERRANGE, TERMINATE, FIRSTCODE, MAXCODE, SUCCMAX, TWICEMAX, ROOT,
-		MAXBUF, MAXDISTANCE, MAXSIZE;
-
-	static const unsigned short bitvalue14;
-	static const signed short copybitsADPLUG_A2M_COPYRANGES,
-		copyminADPLUG_A2M_COPYRANGES;
-
-	void inittree();
-	void updatefreq(unsigned short a,unsigned short b);
-	void updatemodel(unsigned short code);
-	unsigned short inputcode(unsigned short bits);
-	unsigned short uncompress();
-	void decode();
-	unsigned short sixdepak(unsigned short *source,unsigned char *dest,unsigned short size);
-
-	char songname43, author43, instname25033;
-
-	unsigned short ibitcount, ibitbuffer, ibufcount, obufcount, input_size,
-		output_size, leftcADPLUG_A2M_MAXCHAR+1, rghtcADPLUG_A2M_MAXCHAR+1,
-		dadADPLUG_A2M_TWICEMAX+1, freqADPLUG_A2M_TWICEMAX+1, *wdbuf;
-	unsigned char *obuf, *buf;
-};
-#endif

audacious-plugins-3.6.2-gtk3.tar.bz2/src/adplug/core/adl.cc Deleted

@@ -1,2874 +0,0 @@
-/*
- * adl.cpp - ADL player adaption by Simon Peter <dn.tlp@gmx.net>
- *
- * Original ADL player by Torbjorn Andersson and Johannes Schickel
- * 'lordhoto' <lordhoto at scummvm dot org> of the ScummVM project.
- */
-
-/* ScummVM - Scumm Interpreter
- *
- * This file is licensed under both GPL and LGPL
- * Copyright (C) 2006 The ScummVM project
- * Copyright (C) 2006 Torbjorn Andersson and Johannes Schickel
- *
- * GPL License
- *
- * 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.
- *
- * LPGL License
- *
- * 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
- *
- */
-
-#include <assert.h>
-#include <inttypes.h>
-#include <stdarg.h>
-#include <string.h>
-
-#include "adl.h"
-#include "debug.h"
-
-#ifdef ADL_DEBUG
-#	define warning(...)		AdPlug_LogWrite(__VA_ARGS__); \
-AdPlug_LogWrite("\n")
-
-#	define debugC(i1, i2, ...)	AdPlug_LogWrite(__VA_ARGS__); \
-AdPlug_LogWrite("\n")
-#else
-#	define kDebugLevelSound	1
-
-static inline void
-warning (const char *str, ...)
-{
-}
-
-static inline void
-debugC (int i1, int i2, const char *str, ...)
-{
-}
-#endif
-
-// #define warning(...)
-// #define debugC(i1, i2, ...)
-
-#define ARRAYSIZE(x) ((int)(sizeof(x) / sizeof(x0)))
-
-// Basic Adlib Programming:
-// http://www.gamedev.net/reference/articles/article446.asp
-
-#define CALLBACKS_PER_SECOND 72
-
-typedef uint8_t uint8;
-typedef int8_t int8;
-typedef uint16_t uint16;
-typedef int16_t int16;
-typedef uint32_t uint32;
-typedef int32_t int32;
-typedef uint8_t byte;
-
-static inline uint16
-READ_LE_UINT16 (const void *ptr)
-{
- const byte *b = (const byte *) ptr;
- return (b1 << 8) + b0;
-}
-
-static inline uint16
-READ_BE_UINT16 (const void *ptr)
-{
- const byte *b = (const byte *) ptr;
- return (b0 << 8) + b1;
-}
-
-class AdlibDriver
-{
-public:
- AdlibDriver (Copl * opl);
- ~AdlibDriver ();
-
- int callback (int opcode, ...);
- void callback ();
-
- // AudioStream API
- // int readBuffer(int16 *buffer, const int numSamples) {
- // int32 samplesLeft = numSamples;
- // memset(buffer, 0, sizeof(int16) * numSamples);
- // while (samplesLeft) {
- // if (!_samplesTillCallback) {
- // callback();
- // _samplesTillCallback = _samplesPerCallback;
- // _samplesTillCallbackRemainder += _samplesPerCallbackRemainder;
- // if (_samplesTillCallbackRemainder >= CALLBACKS_PER_SECOND) {
- // _samplesTillCallback++;
- // _samplesTillCallbackRemainder -= CALLBACKS_PER_SECOND;
- // }
- // }
-
- // int32 render = MIN(samplesLeft, _samplesTillCallback);
- // samplesLeft -= render;
- // _samplesTillCallback -= render;
- // YM3812UpdateOne(_adlib, buffer, render);
- // buffer += render;
- // }
- // return numSamples;
- // }
-
- bool isStereo () const
- {
- return false;
- }
- bool endOfData () const
- {
- return false;
- }
- // int getRate() const { return _mixer->getOutputRate(); }
-
- struct OpcodeEntry
- {
- typedef int (AdlibDriver::*DriverOpcode) (va_list & list);
- DriverOpcode function;
- const char *name;
- };
-
- void setupOpcodeList ();
- const OpcodeEntry *_opcodeList;
- int _opcodesEntries;
-
- int snd_ret0x100 (va_list & list);
- int snd_ret0x1983 (va_list & list);
- int snd_initDriver (va_list & list);
- int snd_deinitDriver (va_list & list);
- int snd_setSoundData (va_list & list);
- int snd_unkOpcode1 (va_list & list);
- int snd_startSong (va_list & list);
- int snd_unkOpcode2 (va_list & list);
- int snd_unkOpcode3 (va_list & list);
- int snd_readByte (va_list & list);
- int snd_writeByte (va_list & list);
- int snd_getSoundTrigger (va_list & list);
- int snd_unkOpcode4 (va_list & list);
- int snd_dummy (va_list & list);
- int snd_getNullvar4 (va_list & list);
- int snd_setNullvar3 (va_list & list);
- int snd_setFlag (va_list & list);
- int snd_clearFlag (va_list & list);
-
- // These variables have not yet been named, but some of them are partly
- // known nevertheless:
- //
- // unk16 - Sound-related. Possibly some sort of pitch bend.
- // unk18 - Sound-effect. Used for secondaryEffect1()
- // unk19 - Sound-effect. Used for secondaryEffect1()
- // unk20 - Sound-effect. Used for secondaryEffect1()
- // unk21 - Sound-effect. Used for secondaryEffect1()
- // unk22 - Sound-effect. Used for secondaryEffect1()
- // unk29 - Sound-effect. Used for primaryEffect1()
- // unk30 - Sound-effect. Used for primaryEffect1()
- // unk31 - Sound-effect. Used for primaryEffect1()
- // unk32 - Sound-effect. Used for primaryEffect2()
- // unk33 - Sound-effect. Used for primaryEffect2()
- // unk34 - Sound-effect. Used for primaryEffect2()
- // unk35 - Sound-effect. Used for primaryEffect2()
- // unk36 - Sound-effect. Used for primaryEffect2()
- // unk37 - Sound-effect. Used for primaryEffect2()
- // unk38 - Sound-effect. Used for primaryEffect2()
- // unk39 - Currently unused, except for updateCallback56()
- // unk40 - Currently unused, except for updateCallback56()
- // unk41 - Sound-effect. Used for primaryEffect2()
-
- struct Channel
- {
- uint8 opExtraLevel2;
- uint8 *dataptr;
- uint8 duration;
- uint8 repeatCounter;
- int8 baseOctave;
- uint8 priority;
- uint8 dataptrStackPos;
- uint8 *dataptrStack4;
- int8 baseNote;
- uint8 unk29;
- uint8 unk31;
- uint16 unk30;
- uint16 unk37;
- uint8 unk33;
- uint8 unk34;
- uint8 unk35;
- uint8 unk36;
- uint8 unk32;
- uint8 unk41;
- uint8 unk38;
- uint8 opExtraLevel1;
- uint8 spacing2;
- uint8 baseFreq;
- uint8 tempo;
- uint8 position;
- uint8 regAx;
- uint8 regBx;
- typedef void (AdlibDriver::*Callback) (Channel &);
- Callback primaryEffect;
- Callback secondaryEffect;
- uint8 fractionalSpacing;
- uint8 opLevel1;
- uint8 opLevel2;
- uint8 opExtraLevel3;
- uint8 twoChan;
- uint8 unk39;
- uint8 unk40;
- uint8 spacing1;
- uint8 durationRandomness;
- uint8 unk19;
- uint8 unk18;
- int8 unk20;
- int8 unk21;
- uint8 unk22;
- uint16 offset;
- uint8 tempoReset;
- uint8 rawNote;
- int8 unk16;
- };
-
- void primaryEffect1 (Channel & channel);
- void primaryEffect2 (Channel & channel);
- void secondaryEffect1 (Channel & channel);
-
- void resetAdlibState ();
- void writeOPL (byte reg, byte val);
- void initChannel (Channel & channel);
- void noteOff (Channel & channel);
- void unkOutput2 (uint8 num);
-
- uint16 getRandomNr ();
- void setupDuration (uint8 duration, Channel & channel);
-
- void setupNote (uint8 rawNote, Channel & channel, bool flag = false);
- void setupInstrument (uint8 regOffset, uint8 * dataptr, Channel & channel);
- void noteOn (Channel & channel);
-
- void adjustVolume (Channel & channel);
-
- uint8 calculateOpLevel1 (Channel & channel);
- uint8 calculateOpLevel2 (Channel & channel);
-
- uint16 checkValue (int16 val)
- {
- if (val < 0)
- val = 0;
- else if (val > 0x3F)
- val = 0x3F;
- return val;
- }
-
- // The sound data has at least two lookup tables:
- //
- // * One for programs, starting at offset 0.
- // * One for instruments, starting at offset 500.
-
- uint8 *getProgram (int progId)
- {
- return _soundData + READ_LE_UINT16 (_soundData + 2 * progId);
- }
-
- uint8 *getInstrument (int instrumentId)
- {
- return _soundData + READ_LE_UINT16 (_soundData + 500 + 2 * instrumentId);
- }
-
- void setupPrograms ();
- void executePrograms ();
-
- struct ParserOpcode
- {
- typedef int (AdlibDriver::*POpcode) (uint8 * &dataptr, Channel & channel,
- uint8 value);
- POpcode function;
- const char *name;
- };
-
- void setupParserOpcodeTable ();
- const ParserOpcode *_parserOpcodeTable;
- int _parserOpcodeTableSize;
-
- int update_setRepeat (uint8 * &dataptr, Channel & channel, uint8 value);
- int update_checkRepeat (uint8 * &dataptr, Channel & channel, uint8 value);
- int update_setupProgram (uint8 * &dataptr, Channel & channel, uint8 value);
- int update_setNoteSpacing (uint8 * &dataptr, Channel & channel,
- uint8 value);
- int update_jump (uint8 * &dataptr, Channel & channel, uint8 value);
- int update_jumpToSubroutine (uint8 * &dataptr, Channel & channel,
- uint8 value);
- int update_returnFromSubroutine (uint8 * &dataptr, Channel & channel,
- uint8 value);
- int update_setBaseOctave (uint8 * &dataptr, Channel & channel, uint8 value);
- int update_stopChannel (uint8 * &dataptr, Channel & channel, uint8 value);
- int update_playRest (uint8 * &dataptr, Channel & channel, uint8 value);
- int update_writeAdlib (uint8 * &dataptr, Channel & channel, uint8 value);
- int update_setupNoteAndDuration (uint8 * &dataptr, Channel & channel,
- uint8 value);
- int update_setBaseNote (uint8 * &dataptr, Channel & channel, uint8 value);
- int update_setupSecondaryEffect1 (uint8 * &dataptr, Channel & channel,
- uint8 value);
- int update_stopOtherChannel (uint8 * &dataptr, Channel & channel,
- uint8 value);
- int update_waitForEndOfProgram (uint8 * &dataptr, Channel & channel,
- uint8 value);
- int update_setupInstrument (uint8 * &dataptr, Channel & channel,
- uint8 value);
- int update_setupPrimaryEffect1 (uint8 * &dataptr, Channel & channel,
- uint8 value);
- int update_removePrimaryEffect1 (uint8 * &dataptr, Channel & channel,
- uint8 value);
- int update_setBaseFreq (uint8 * &dataptr, Channel & channel, uint8 value);
- int update_setupPrimaryEffect2 (uint8 * &dataptr, Channel & channel,
- uint8 value);
- int update_setPriority (uint8 * &dataptr, Channel & channel, uint8 value);
- int updateCallback23 (uint8 * &dataptr, Channel & channel, uint8 value);
- int updateCallback24 (uint8 * &dataptr, Channel & channel, uint8 value);
- int update_setExtraLevel1 (uint8 * &dataptr, Channel & channel,
- uint8 value);
- int update_setupDuration (uint8 * &dataptr, Channel & channel, uint8 value);
- int update_playNote (uint8 * &dataptr, Channel & channel, uint8 value);
- int update_setFractionalNoteSpacing (uint8 * &dataptr, Channel & channel,
- uint8 value);
- int update_setTempo (uint8 * &dataptr, Channel & channel, uint8 value);
- int update_removeSecondaryEffect1 (uint8 * &dataptr, Channel & channel,
- uint8 value);
- int update_setChannelTempo (uint8 * &dataptr, Channel & channel,
- uint8 value);
- int update_setExtraLevel3 (uint8 * &dataptr, Channel & channel,
- uint8 value);
- int update_setExtraLevel2 (uint8 * &dataptr, Channel & channel,
- uint8 value);
- int update_changeExtraLevel2 (uint8 * &dataptr, Channel & channel,
- uint8 value);
- int update_setAMDepth (uint8 * &dataptr, Channel & channel, uint8 value);
- int update_setVibratoDepth (uint8 * &dataptr, Channel & channel,
- uint8 value);
- int update_changeExtraLevel1 (uint8 * &dataptr, Channel & channel,
- uint8 value);
- int updateCallback38 (uint8 * &dataptr, Channel & channel, uint8 value);
- int updateCallback39 (uint8 * &dataptr, Channel & channel, uint8 value);
- int update_removePrimaryEffect2 (uint8 * &dataptr, Channel & channel,
- uint8 value);
- int updateCallback41 (uint8 * &dataptr, Channel & channel, uint8 value);
- int update_resetToGlobalTempo (uint8 * &dataptr, Channel & channel,
- uint8 value);
- int update_nop1 (uint8 * &dataptr, Channel & channel, uint8 value);
- int update_setDurationRandomness (uint8 * &dataptr, Channel & channel,
- uint8 value);
- int update_changeChannelTempo (uint8 * &dataptr, Channel & channel,
- uint8 value);
- int updateCallback46 (uint8 * &dataptr, Channel & channel, uint8 value);
- int update_nop2 (uint8 * &dataptr, Channel & channel, uint8 value);
- int update_setupRhythmSection (uint8 * &dataptr, Channel & channel,
- uint8 value);
- int update_playRhythmSection (uint8 * &dataptr, Channel & channel,
- uint8 value);
- int update_removeRhythmSection (uint8 * &dataptr, Channel & channel,
- uint8 value);
- int updateCallback51 (uint8 * &dataptr, Channel & channel, uint8 value);
- int updateCallback52 (uint8 * &dataptr, Channel & channel, uint8 value);
- int updateCallback53 (uint8 * &dataptr, Channel & channel, uint8 value);
- int update_setSoundTrigger (uint8 * &dataptr, Channel & channel,
- uint8 value);
- int update_setTempoReset (uint8 * &dataptr, Channel & channel, uint8 value);
- int updateCallback56 (uint8 * &dataptr, Channel & channel, uint8 value);
-
- // These variables have not yet been named, but some of them are partly
- // known nevertheless:
- //
- // _unkValue1 - Unknown. Used for updating _unkValue2
- // _unkValue2 - Unknown. Used for updating _unkValue4
- // _unkValue3 - Unknown. Used for updating _unkValue2
- // _unkValue4 - Unknown. Used for updating _unkValue5
- // _unkValue5 - Unknown. Used for controlling updateCallback24().
- // _unkValue6 - Unknown. Rhythm section volume?
- // _unkValue7 - Unknown. Rhythm section volume?
- // _unkValue8 - Unknown. Rhythm section volume?
- // _unkValue9 - Unknown. Rhythm section volume?
- // _unkValue10 - Unknown. Rhythm section volume?
- // _unkValue11 - Unknown. Rhythm section volume?
- // _unkValue12 - Unknown. Rhythm section volume?
- // _unkValue13 - Unknown. Rhythm section volume?
- // _unkValue14 - Unknown. Rhythm section volume?
- // _unkValue15 - Unknown. Rhythm section volume?
- // _unkValue16 - Unknown. Rhythm section volume?
- // _unkValue17 - Unknown. Rhythm section volume?
- // _unkValue18 - Unknown. Rhythm section volume?
- // _unkValue19 - Unknown. Rhythm section volume?
- // _unkValue20 - Unknown. Rhythm section volume?
- // _unkTable - Probably frequences for the 12-tone scale.
- // _unkTable2 - Unknown. Currently only used by updateCallback46()
- // _unkTable2_1 - One of the tables in _unkTable2
- // _unkTable2_2 - One of the tables in _unkTable2
- // _unkTable2_3 - One of the tables in _unkTable2
-
- int32 _samplesPerCallback;
- int32 _samplesPerCallbackRemainder;
- int32 _samplesTillCallback;
- int32 _samplesTillCallbackRemainder;
-
- int _lastProcessed;
- int8 _flagTrigger;
- int _curChannel;
- uint8 _soundTrigger;
- int _soundsPlaying;
-
- uint16 _rnd;
-
- uint8 _unkValue1;
- uint8 _unkValue2;
- uint8 _unkValue3;
- uint8 _unkValue4;
- uint8 _unkValue5;
- uint8 _unkValue6;
- uint8 _unkValue7;
- uint8 _unkValue8;
- uint8 _unkValue9;
- uint8 _unkValue10;
- uint8 _unkValue11;
- uint8 _unkValue12;
- uint8 _unkValue13;
- uint8 _unkValue14;
- uint8 _unkValue15;
- uint8 _unkValue16;
- uint8 _unkValue17;
- uint8 _unkValue18;
- uint8 _unkValue19;
- uint8 _unkValue20;
-
- int _flags;
-
- uint8 *_soundData;
-
- uint8 _soundIdTable0x10;
- Channel _channels10;
-
- uint8 _vibratoAndAMDepthBits;
- uint8 _rhythmSectionBits;
-
- uint8 _curRegOffset;
- uint8 _tempo;
-
- const uint8 *_tablePtr1;
- const uint8 *_tablePtr2;
-
- static const uint8 _regOffset;
- static const uint16 _unkTable;
- static const uint8 *_unkTable2;
- static const uint8 _unkTable2_1;
- static const uint8 _unkTable2_2;
- static const uint8 _unkTable2_3;
- static const uint8 _unkTables32;
-
- Copl *opl;
-};
-
-AdlibDriver::AdlibDriver (Copl * newopl):opl (newopl)
-{
- setupOpcodeList ();
- setupParserOpcodeTable ();
-
- // _mixer = mixer;
-
- _flags = 0;
- // _adlib = makeAdlibOPL(getRate());
- // assert(_adlib);
-
- memset (_channels, 0, sizeof (_channels));
- _soundData = 0;
-
- _vibratoAndAMDepthBits = _curRegOffset = 0;
-
- _lastProcessed = _flagTrigger = _curChannel = _rhythmSectionBits = 0;
- _soundsPlaying = 0;
- _rnd = 0x1234;
-
- _tempo = 0;
- _soundTrigger = 0;
-
- _unkValue3 = 0xFF;
- _unkValue1 = _unkValue2 = _unkValue4 = _unkValue5 = 0;
- _unkValue6 = _unkValue7 = _unkValue8 = _unkValue9 = _unkValue10 = 0;
- _unkValue11 = _unkValue12 = _unkValue13 = _unkValue14 = _unkValue15 =
- _unkValue16 = _unkValue17 = _unkValue18 = _unkValue19 = _unkValue20 = 0;
-
- _tablePtr1 = _tablePtr2 = 0;
-
- // _mixer->setupPremix(this);
-
- // _samplesPerCallback = getRate() / CALLBACKS_PER_SECOND;
- // _samplesPerCallbackRemainder = getRate() % CALLBACKS_PER_SECOND;
- _samplesTillCallback = 0;
- _samplesTillCallbackRemainder = 0;
-}
-
-AdlibDriver::~AdlibDriver ()
-{
- // _mixer->setupPremix(0);
- // OPLDestroy(_adlib);
- // _adlib = 0;
-}
-
-int
-AdlibDriver::callback (int opcode, ...)
-{
- // lock();
- if (opcode >= _opcodesEntries || opcode < 0)
- {
- warning ("AdlibDriver: calling unknown opcode '%d'", opcode);
- return 0;
- }
-
- debugC (9, kDebugLevelSound, "Calling opcode '%s' (%d)",
- _opcodeListopcode.name, opcode);
-
- va_list args;
- va_start (args, opcode);
- int returnValue = (this->*(_opcodeListopcode.function)) (args);
- va_end (args);
- // unlock();
- return returnValue;
-}
-
-// Opcodes
-
-int
-AdlibDriver::snd_ret0x100 (va_list & list)
-{
- return 0x100;
-}
-
-int
-AdlibDriver::snd_ret0x1983 (va_list & list)
-{
- return 0x1983;
-}
-
-int
-AdlibDriver::snd_initDriver (va_list & list)
-{
- _lastProcessed = _soundsPlaying = 0;
- resetAdlibState ();
- return 0;
-}
-
-int
-AdlibDriver::snd_deinitDriver (va_list & list)
-{
- resetAdlibState ();
- return 0;
-}
-
-int
-AdlibDriver::snd_setSoundData (va_list & list)
-{
- if (_soundData)
- {
- delete_soundData;
- _soundData = 0;
- }
- _soundData = va_arg (list, uint8 *);
- return 0;
-}
-
-int
-AdlibDriver::snd_unkOpcode1 (va_list & list)
-{
- warning ("unimplemented snd_unkOpcode1");
- return 0;
-}
-
-int
-AdlibDriver::snd_startSong (va_list & list)
-{
- int songId = va_arg (list, int);
- _flags |= 8;
- _flagTrigger = 1;
-
- uint8 *ptr = getProgram (songId);
- uint8 chan = *ptr;
-
- if ((songId << 1) != 0)
- {
- if (chan == 9)
- {
- if (_flags & 2)
- return 0;
- }
- else
- {
- if (_flags & 1)
- return 0;
- }
- }
-
- _soundIdTable_soundsPlaying++ = songId;
- _soundsPlaying &= 0x0F;
-
- return 0;
-}
-
-int
-AdlibDriver::snd_unkOpcode2 (va_list & list)
-{
- warning ("unimplemented snd_unkOpcode2");
- return 0;
-}
-
-int
-AdlibDriver::snd_unkOpcode3 (va_list & list)
-{
- int value = va_arg (list, int);
- int loop = value;
- if (value < 0)
- {
- value = 0;
- loop = 9;
- }
- loop -= value;
- ++loop;
-
- while (loop--)
- {
- _curChannel = value;
- Channel & channel = _channels_curChannel;
- channel.priority = 0;
- channel.dataptr = 0;
- if (value != 9)
- {
- noteOff (channel);
- }
- ++value;
- }
-
- return 0;
-}
-
-int
-AdlibDriver::snd_readByte (va_list & list)
-{
- int a = va_arg (list, int);
- int b = va_arg (list, int);
- uint8 *ptr = getProgram (a) + b;
- return *ptr;
-}
-
-int
-AdlibDriver::snd_writeByte (va_list & list)
-{
- int a = va_arg (list, int);
- int b = va_arg (list, int);
- int c = va_arg (list, int);
- uint8 *ptr = getProgram (a) + b;
- uint8 oldValue = *ptr;
- *ptr = (uint8) c;
- return oldValue;
-}
-
-int
-AdlibDriver::snd_getSoundTrigger (va_list & list)
-{
- return _soundTrigger;
-}
-
-int
-AdlibDriver::snd_unkOpcode4 (va_list & list)
-{
- warning ("unimplemented snd_unkOpcode4");
- return 0;
-}
-
-int
-AdlibDriver::snd_dummy (va_list & list)
-{
- return 0;
-}
-
-int
-AdlibDriver::snd_getNullvar4 (va_list & list)
-{
- warning ("unimplemented snd_getNullvar4");
- return 0;
-}
-
-int
-AdlibDriver::snd_setNullvar3 (va_list & list)
-{
- warning ("unimplemented snd_setNullvar3");
- return 0;
-}
-
-int
-AdlibDriver::snd_setFlag (va_list & list)
-{
- int oldFlags = _flags;
- _flags |= va_arg (list, int);
- return oldFlags;
-}
-
-int
-AdlibDriver::snd_clearFlag (va_list & list)
-{
- int oldFlags = _flags;
- _flags &= ~(va_arg (list, int));
- return oldFlags;
-}
-
-// timer callback
-
-void
-AdlibDriver::callback ()
-{
- // lock();
- --_flagTrigger;
- if (_flagTrigger < 0)
- _flags &= ~8;
- setupPrograms ();
- executePrograms ();
-
- uint8 temp = _unkValue3;
- _unkValue3 += _tempo;
- if (_unkValue3 < temp)
- {
- if (!(--_unkValue2))
- {
- _unkValue2 = _unkValue1;
- ++_unkValue4;
- }
- }
- // unlock();
-}
-
-void
-AdlibDriver::setupPrograms ()
-{
- while (_lastProcessed != _soundsPlaying)
- {
- uint8 *ptr = getProgram (_soundIdTable_lastProcessed);
- uint8 chan = *ptr++;
- uint8 priority = *ptr++;
-
- // Only start this sound if its priority is higher than the one
- // already playing.
-
- Channel & channel = _channelschan;
-
- if (priority >= channel.priority)
- {
- initChannel (channel);
- channel.priority = priority;
- channel.dataptr = ptr;
- channel.tempo = 0xFF;
- channel.position = 0xFF;
- channel.duration = 1;
- unkOutput2 (chan);
- }
-
- ++_lastProcessed;
- _lastProcessed &= 0x0F;
- }
-}
-
-// A few words on opcode parsing and timing:
-//
-// First of all, We simulate a timer callback 72 times per second. Each timeout
-// we update each channel that has something to play.
-//
-// Each channel has its own individual tempo, which is added to its position.
-// This will frequently cause the position to "wrap around" but that is
-// intentional. In fact, it's the signal to go ahead and do more stuff with
-// that channel.
-//
-// Each channel also has a duration, indicating how much time is left on the
-// its current task. This duration is decreased by one. As long as it still has
-// not reached zero, the only thing that can happen is that the note is turned
-// off depending on manual or automatic note spacing. Once the duration reaches
-// zero, a new set of musical opcodes are executed.
-//
-// An opcode is one byte, followed by a variable number of parameters. Since
-// most opcodes have at least one one-byte parameter, we read that as well. Any
-// opcode that doesn't have that one parameter is responsible for moving the
-// data pointer back again.
-//
-// If the most significant bit of the opcode is 1, it's a function; call it.
-// The opcode functions return either 0 (continue), 1 (stop) or 2 (stop, and do
-// not run the effects callbacks).
-//
-// If the most significant bit of the opcode is 0, it's a note, and the first
-// parameter is its duration. (There are cases where the duration is modified
-// but that's an exception.) The note opcode is assumed to return 1, and is the
-// last opcode unless its duration is zero.
-//
-// Finally, most of the times that the callback is called, it will invoke the
-// effects callbacks. The final opcode in a set can prevent this, if it's a
-// function and it returns anything other than 1.
-
-void
-AdlibDriver::executePrograms ()
-{
- // Each channel runs its own program. There are ten channels: One for
- // each Adlib channel (0-8), plus one "control channel" (9) which is
- // the one that tells the other channels what to do.
-
- for (_curChannel = 9; _curChannel >= 0; --_curChannel)
- {
- int result = 1;
-
- if (!_channels_curChannel.dataptr)
- {
- continue;
- }
-
- Channel & channel = _channels_curChannel;
- _curRegOffset = _regOffset_curChannel;
-
- if (channel.tempoReset)
- {
- channel.tempo = _tempo;
- }
-
- uint8 backup = channel.position;
- channel.position += channel.tempo;
- if (channel.position < backup)
- {
- if (--channel.duration)
- {
- if (channel.duration == channel.spacing2)
- noteOff (channel);
- if (channel.duration == channel.spacing1 && _curChannel != 9)
- noteOff (channel);
- }
- else
- {
- // An opcode is not allowed to modify its own
- // data pointer except through the 'dataptr'
- // parameter. To enforce that, we have to work
- // on a copy of the data pointer.
- //
- // This fixes a subtle music bug where the
- // wrong music would play when getting the
- // quill in Kyra 1.
- uint8 *dataptr = channel.dataptr;
- while (dataptr)
- {
- uint8 opcode = *dataptr++;
- uint8 param = *dataptr++;
-
- if (opcode & 0x80)
- {
- opcode &= 0x7F;
- if (opcode >= _parserOpcodeTableSize)
- opcode = _parserOpcodeTableSize - 1;
- debugC (9, kDebugLevelSound,
- "Calling opcode '%s' (%d) (channel: %d)",
- _parserOpcodeTableopcode.name, opcode, _curChannel);
- result =
- (this->*(_parserOpcodeTableopcode.function)) (dataptr,
- channel, param);
- channel.dataptr = dataptr;
- if (result)
- break;
- }
- else
- {
- debugC (9, kDebugLevelSound,
- "Note on opcode 0x%02X (duration: %d) (channel: %d)",
- opcode, param, _curChannel);
- setupNote (opcode, channel);
- noteOn (channel);
- setupDuration (param, channel);
- if (param)
- {
- channel.dataptr = dataptr;
- break;
- }
- }
- }
- }
- }
-
- if (result == 1)
- {
- if (channel.primaryEffect)
- (this->*(channel.primaryEffect)) (channel);
- if (channel.secondaryEffect)
- (this->*(channel.secondaryEffect)) (channel);
- }
- }
-}
-
-//
-
-void
-AdlibDriver::resetAdlibState ()
-{
- debugC (9, kDebugLevelSound, "resetAdlibState()");
- _rnd = 0x1234;
-
- // Authorize the control of the waveforms
- writeOPL (0x01, 0x20);
-
- // Select FM music mode
- writeOPL (0x08, 0x00);
-
- // I would guess the main purpose of this is to turn off the rhythm,
- // thus allowing us to use 9 melodic voices instead of 6.
- writeOPL (0xBD, 0x00);
-
- int loop = 10;
- while (loop--)
- {
- if (loop != 9)
- {
- // Silence the channel
- writeOPL (0x40 + _regOffsetloop, 0x3F);
- writeOPL (0x43 + _regOffsetloop, 0x3F);
- }
- initChannel (_channelsloop);
- }
-}
-
-// Old calling style: output0x388(0xABCD)
-// New calling style: writeOPL(0xAB, 0xCD)
-
-void
-AdlibDriver::writeOPL (byte reg, byte val)
-{
- opl->write (reg, val);
-}
-
-void
-AdlibDriver::initChannel (Channel & channel)
-{
- debugC (9, kDebugLevelSound, "initChannel(%lu)",
- (long) (&channel - _channels));
- memset (&channel.dataptr, 0,
- sizeof (Channel) - ((char *) &channel.dataptr - (char *) &channel));
-
- channel.tempo = 0xFF;
- channel.priority = 0;
- // normally here are nullfuncs but we set 0 for now
- channel.primaryEffect = 0;
- channel.secondaryEffect = 0;
- channel.spacing1 = 1;
-}
-
-void
-AdlibDriver::noteOff (Channel & channel)
-{
- debugC (9, kDebugLevelSound, "noteOff(%lu)", (long) (&channel - _channels));
-
- // The control channel has no corresponding Adlib channel
-
- if (_curChannel >= 9)
- return;
-
- // When the rhythm section is enabled, channels 6, 7 and 8 are special.
-
- if (_rhythmSectionBits && _curChannel >= 6)
- return;
-
- // This means the "Key On" bit will always be 0
- channel.regBx &= 0xDF;
-
- // Octave / F-Number / Key-On
- writeOPL (0xB0 + _curChannel, channel.regBx);
-}
-
-void
-AdlibDriver::unkOutput2 (uint8 chan)
-{
- debugC (9, kDebugLevelSound, "unkOutput2(%d)", chan);
-
- // The control channel has no corresponding Adlib channel
-
- if (chan >= 9)
- return;
-
- // I believe this has to do with channels 6, 7, and 8 being special
- // when Adlib's rhythm section is enabled.
-
- if (_rhythmSectionBits && chan >= 6)
- return;
-
- uint8 offset = _regOffsetchan;
-
- // The channel is cleared: First the attack/delay rate, then the
- // sustain level/release rate, and finally the note is turned off.
-
- writeOPL (0x60 + offset, 0xFF);
- writeOPL (0x63 + offset, 0xFF);
-
- writeOPL (0x80 + offset, 0xFF);
- writeOPL (0x83 + offset, 0xFF);
-
- writeOPL (0xB0 + chan, 0x00);
-
- // ...and then the note is turned on again, with whatever value is
- // still lurking in the A0 + chan register, but everything else -
- // including the two most significant frequency bit, and the octave -
- // set to zero.
- //
- // This is very strange behaviour, and causes problems with the ancient
- // FMOPL code we borrowed from AdPlug. I've added a workaround. See
- // fmopl.cpp for more details.
- //
- // More recent versions of the MAME FMOPL don't seem to have this
- // problem, but cannot currently be used because of licensing and
- // performance issues.
- //
- // Ken Silverman's Adlib emulator (which can be found on his Web page -
- // http://www.advsys.net/ken - and as part of AdPlug) also seems to be
- // immune, but is apparently not as feature complete as MAME's.
-
- writeOPL (0xB0 + chan, 0x20);
-}
-
-// I believe this is a random number generator. It actually does seem to
-// generate an even distribution of almost all numbers from 0 through 65535,
-// though in my tests some numbers were never generated.
-
-uint16
-AdlibDriver::getRandomNr ()
-{
- _rnd += 0x9248;
- uint16 lowBits = _rnd & 7;
- _rnd >>= 3;
- _rnd |= (lowBits << 13);
- return _rnd;
-}
-
-void
-AdlibDriver::setupDuration (uint8 duration, Channel & channel)
-{
- debugC (9, kDebugLevelSound, "setupDuration(%d, %lu)", duration,
- (long) (&channel - _channels));
- if (channel.durationRandomness)
- {
- channel.duration =
- duration + (getRandomNr () & channel.durationRandomness);
- return;
- }
- if (channel.fractionalSpacing)
- {
- channel.spacing2 = (duration >> 3) * channel.fractionalSpacing;
- }
- channel.duration = duration;
-}
-
-// This function may or may not play the note. It's usually followed by a call
-// to noteOn(), which will always play the current note.
-
-void
-AdlibDriver::setupNote (uint8 rawNote, Channel & channel, bool flag)
-{
- debugC (9, kDebugLevelSound, "setupNote(%d, %lu)", rawNote,
- (long) (&channel - _channels));
-
- channel.rawNote = rawNote;
-
- int8 note = (rawNote & 0x0F) + channel.baseNote;
- int8 octave = ((rawNote + channel.baseOctave) >> 4) & 0x0F;
-
- // There are only twelve notes. If we go outside that, we have to
- // adjust the note and octave.
-
- if (note >= 12)
- {
- note -= 12;
- octave++;
- }
- else if (note < 0)
- {
- note += 12;
- octave--;
- }
-
- // The calculation of frequency looks quite different from the original
- // disassembly at a first glance, but when you consider that the
- // largest possible value would be 0x0246 + 0xFF + 0x47 (and that's if
- // baseFreq is unsigned), freq is still a 10-bit value, just as it
- // should be to fit in the Ax and Bx registers.
- //
- // If it were larger than that, it could have overflowed into the
- // octave bits, and that could possibly have been used in some sound.
- // But as it is now, I can't see any way it would happen.
-
- uint16 freq = _unkTablenote + channel.baseFreq;
-
- // When called from callback 41, the behaviour is slightly different:
- // We adjust the frequency, even when channel.unk16 is 0.
-
- if (channel.unk16 || flag)
- {
- const uint8 *table;
-
- if (channel.unk16 >= 0)
- {
- table = _unkTables(channel.rawNote & 0x0F) + 2;
- freq += tablechannel.unk16;
- }
- else
- {
- table = _unkTableschannel.rawNote & 0x0F;
- freq -= table-channel.unk16;
- }
- }
-
- channel.regAx = freq & 0xFF;
- channel.regBx =
- (channel.regBx & 0x20) | (octave << 2) | ((freq >> 8) & 0x03);
-
- // Keep the note on or off
- writeOPL (0xA0 + _curChannel, channel.regAx);
- writeOPL (0xB0 + _curChannel, channel.regBx);
-}
-
-void
-AdlibDriver::setupInstrument (uint8 regOffset, uint8 * dataptr,
- Channel & channel)
-{
- debugC (9, kDebugLevelSound, "setupInstrument(%d, %p, %lu)", regOffset,
- (const void *) dataptr, (long) (&channel - _channels));
- // Amplitude Modulation / Vibrato / Envelope Generator Type /
- // Keyboard Scaling Rate / Modulator Frequency Multiple
- writeOPL (0x20 + regOffset, *dataptr++);
- writeOPL (0x23 + regOffset, *dataptr++);
-
- uint8 temp = *dataptr++;
-
- // Feedback / Algorithm
-
- // It is very likely that _curChannel really does refer to the same
- // channel as regOffset, but there's only one Cx register per channel.
-
- writeOPL (0xC0 + _curChannel, temp);
-
- // The algorithm bit. I don't pretend to understand this fully, but
- // "If set to 0, operator 1 modulates operator 2. In this case,
- // operator 2 is the only one producing sound. If set to 1, both
- // operators produce sound directly. Complex sounds are more easily
- // created if the algorithm is set to 0."
-
- channel.twoChan = temp & 1;
-
- // Waveform Select
- writeOPL (0xE0 + regOffset, *dataptr++);
- writeOPL (0xE3 + regOffset, *dataptr++);
-
- channel.opLevel1 = *dataptr++;
- channel.opLevel2 = *dataptr++;
-
- // Level Key Scaling / Total Level
- writeOPL (0x40 + regOffset, calculateOpLevel1 (channel));
- writeOPL (0x43 + regOffset, calculateOpLevel2 (channel));
-
- // Attack Rate / Decay Rate
- writeOPL (0x60 + regOffset, *dataptr++);
- writeOPL (0x63 + regOffset, *dataptr++);
-
- // Sustain Level / Release Rate
- writeOPL (0x80 + regOffset, *dataptr++);
- writeOPL (0x83 + regOffset, *dataptr++);
-}
-
-// Apart from playing the note, this function also updates the variables for
-// primary effect 2.
-
-void
-AdlibDriver::noteOn (Channel & channel)
-{
- debugC (9, kDebugLevelSound, "noteOn(%lu)", (long) (&channel - _channels));
-
- // The "note on" bit is set, and the current note is played.
-
- channel.regBx |= 0x20;
- writeOPL (0xB0 + _curChannel, channel.regBx);
-
- int8 shift = 9 - channel.unk33;
- uint16 temp = channel.regAx | (channel.regBx << 8);
- channel.unk37 = ((temp & 0x3FF) >> shift) & 0xFF;
- channel.unk38 = channel.unk36;
-}
-
-void
-AdlibDriver::adjustVolume (Channel & channel)
-{
- debugC (9, kDebugLevelSound, "adjustVolume(%lu)",
- (long) (&channel - _channels));
- // Level Key Scaling / Total Level
-
- writeOPL (0x43 + _regOffset_curChannel, calculateOpLevel2 (channel));
- if (channel.twoChan)
- writeOPL (0x40 + _regOffset_curChannel, calculateOpLevel1 (channel));
-}
-
-// This is presumably only used for some sound effects, e.g. Malcolm blowing up
-// the trees in the intro (but not the effect where he "booby-traps" the big
-// tree) and turning Kallak to stone. Related functions and variables:
-//
-// update_setupPrimaryEffect1()
-// - Initialises unk29, unk30 and unk31
-// - unk29 is not further modified
-// - unk30 is not further modified, except by update_removePrimaryEffect1()
-//
-// update_removePrimaryEffect1()
-// - Deinitialises unk30
-//
-// unk29 - determines how often the notes are played
-// unk30 - modifies the frequency
-// unk31 - determines how often the notes are played
-
-void
-AdlibDriver::primaryEffect1 (Channel & channel)
-{
- debugC (9, kDebugLevelSound, "Calling primaryEffect1 (channel: %d)",
- _curChannel);
- uint8 temp = channel.unk31;
- channel.unk31 += channel.unk29;
- if (channel.unk31 >= temp)
- return;
-
- // Initialise unk1 to the current frequency
- uint16 unk1 = ((channel.regBx & 3) << 8) | channel.regAx;
-
- // This is presumably to shift the "note on" bit so far to the left
- // that it won't be affected by any of the calculations below.
- uint16 unk2 = ((channel.regBx & 0x20) << 8) | (channel.regBx & 0x1C);
-
- int16 unk3 = (int16) channel.unk30;
-
- if (unk3 >= 0)
- {
- unk1 += unk3;
- if (unk1 >= 734)
- {
- // The new frequency is too high. Shift it down and go
- // up one octave.
- unk1 >>= 1;
- if (!(unk1 & 0x3FF))
- ++unk1;
- unk2 = (unk2 & 0xFF00) | ((unk2 + 4) & 0xFF);
- unk2 &= 0xFF1C;
- }
- }
- else
- {
- unk1 += unk3;
- if (unk1 < 388)
- {
- // The new frequency is too low. Shift it up and go
- // down one octave.
- unk1 <<= 1;
- if (!(unk1 & 0x3FF))
- --unk1;
- unk2 = (unk2 & 0xFF00) | ((unk2 - 4) & 0xFF);
- unk2 &= 0xFF1C;
- }
- }
-
- // Make sure that the new frequency is still a 10-bit value.
- unk1 &= 0x3FF;
-
- writeOPL (0xA0 + _curChannel, unk1 & 0xFF);
- channel.regAx = unk1 & 0xFF;
-
- // Shift down the "note on" bit again.
- uint8 value = unk1 >> 8;
- value |= (unk2 >> 8) & 0xFF;
- value |= unk2 & 0xFF;
-
- writeOPL (0xB0 + _curChannel, value);
- channel.regBx = value;
-}
-
-// This is presumably only used for some sound effects, e.g. Malcolm entering
-// and leaving Kallak's hut. Related functions and variables:
-//
-// update_setupPrimaryEffect2()
-// - Initialises unk32, unk33, unk34, unk35 and unk36
-// - unk32 is not further modified
-// - unk33 is not further modified
-// - unk34 is a countdown that gets reinitialised to unk35 on zero
-// - unk35 is based on unk34 and not further modified
-// - unk36 is not further modified
-//
-// noteOn()
-// - Plays the current note
-// - Updates unk37 with a new (lower?) frequency
-// - Copies unk36 to unk38. The unk38 variable is a countdown.
-//
-// unk32 - determines how often the notes are played
-// unk33 - modifies the frequency
-// unk34 - countdown, updates frequency on zero
-// unk35 - initialiser for unk34 countdown
-// unk36 - initialiser for unk38 countdown
-// unk37 - frequency
-// unk38 - countdown, begins playing on zero
-// unk41 - determines how often the notes are played
-//
-// Note that unk41 is never initialised. Not that it should matter much, but it
-// is a bit sloppy.
-
-void
-AdlibDriver::primaryEffect2 (Channel & channel)
-{
- debugC (9, kDebugLevelSound, "Calling primaryEffect2 (channel: %d)",
- _curChannel);
- if (channel.unk38)
- {
- --channel.unk38;
- return;
- }
-
- uint8 temp = channel.unk41;
- channel.unk41 += channel.unk32;
- if (channel.unk41 < temp)
- {
- uint16 unk1 = channel.unk37;
- if (!(--channel.unk34))
- {
- unk1 ^= 0xFFFF;
- ++unk1;
- channel.unk37 = unk1;
- channel.unk34 = channel.unk35;
- }
-
- uint16 unk2 = (channel.regAx | (channel.regBx << 8)) & 0x3FF;
- unk2 += unk1;
-
- channel.regAx = unk2 & 0xFF;
- channel.regBx = (channel.regBx & 0xFC) | (unk2 >> 8);
-
- // Octave / F-Number / Key-On
- writeOPL (0xA0 + _curChannel, channel.regAx);
- writeOPL (0xB0 + _curChannel, channel.regBx);
- }
-}
-
-// I don't know where this is used. The same operation is performed several
-// times on the current channel, using a chunk of the _soundData buffer for
-// parameters. The parameters are used starting at the end of the chunk.
-//
-// Since we use _curRegOffset to specify the final register, it's quite
-// unlikely that this function is ever used to play notes. It's probably only
-// used to modify the sound. Another thing that supports this idea is that it
-// can be combined with any of the effects callbacks above.
-//
-// Related functions and variables:
-//
-// update_setupSecondaryEffect1()
-// - Initialies unk18, unk19, unk20, unk21, unk22 and offset
-// - unk19 is not further modified
-// - unk20 is not further modified
-// - unk22 is not further modified
-// - offset is not further modified
-//
-// unk18 - determines how often the operation is performed
-// unk19 - determines how often the operation is performed
-// unk20 - the start index into the data chunk
-// unk21 - the current index into the data chunk
-// unk22 - the operation to perform
-// offset - the offset to the data chunk
-
-void
-AdlibDriver::secondaryEffect1 (Channel & channel)
-{
- debugC (9, kDebugLevelSound, "Calling secondaryEffect1 (channel: %d)",
- _curChannel);
- uint8 temp = channel.unk18;
- channel.unk18 += channel.unk19;
- if (channel.unk18 < temp)
- {
- if (--channel.unk21 < 0)
- {
- channel.unk21 = channel.unk20;
- }
- writeOPL (channel.unk22 + _curRegOffset,
- _soundDatachannel.offset + channel.unk21);
- }
-}
-
-uint8
-AdlibDriver::calculateOpLevel1 (Channel & channel)
-{
- int8 value = channel.opLevel1 & 0x3F;
-
- if (channel.twoChan)
- {
- value += channel.opExtraLevel1;
- value += channel.opExtraLevel2;
- value += channel.opExtraLevel3;
- }
-
- // Preserve the scaling level bits from opLevel1
-
- return checkValue (value) | (channel.opLevel1 & 0xC0);
-}
-
-uint8
-AdlibDriver::calculateOpLevel2 (Channel & channel)
-{
- int8 value = channel.opLevel2 & 0x3F;
-
- value += channel.opExtraLevel1;
- value += channel.opExtraLevel2;
- value += channel.opExtraLevel3;
-
- // Preserve the scaling level bits from opLevel2
-
- return checkValue (value) | (channel.opLevel2 & 0xC0);
-}
-
-// parser opcodes
-
-int
-AdlibDriver::update_setRepeat (uint8 * &dataptr, Channel & channel,
- uint8 value)
-{
- channel.repeatCounter = value;
- return 0;
-}
-
-int
-AdlibDriver::update_checkRepeat (uint8 * &dataptr, Channel & channel,
- uint8 value)
-{
- ++dataptr;
- if (--channel.repeatCounter)
- {
- int16 add = READ_LE_UINT16 (dataptr - 2);
- dataptr += add;
- }
- return 0;
-}
-
-int
-AdlibDriver::update_setupProgram (uint8 * &dataptr, Channel & channel,
- uint8 value)
-{
- if (value == 0xFF)
- return 0;
-
- uint8 *ptr = getProgram (value);
- uint8 chan = *ptr++;
- uint8 priority = *ptr++;
-
- Channel & channel2 = _channelschan;
-
- if (priority >= channel2.priority)
- {
- _flagTrigger = 1;
- _flags |= 8;
- initChannel (channel2);
- channel2.priority = priority;
- channel2.dataptr = ptr;
- channel2.tempo = 0xFF;
- channel2.position = 0xFF;
- channel2.duration = 1;
- unkOutput2 (chan);
- }
-
- return 0;
-}
-
-int
-AdlibDriver::update_setNoteSpacing (uint8 * &dataptr, Channel & channel,
- uint8 value)
-{
- channel.spacing1 = value;
- return 0;
-}
-
-int
-AdlibDriver::update_jump (uint8 * &dataptr, Channel & channel, uint8 value)
-{
- --dataptr;
- int16 add = READ_LE_UINT16 (dataptr);
- dataptr += 2;
- dataptr += add;
- return 0;
-}
-
-int
-AdlibDriver::update_jumpToSubroutine (uint8 * &dataptr, Channel & channel,
- uint8 value)
-{
- --dataptr;
- int16 add = READ_LE_UINT16 (dataptr);
- dataptr += 2;
- channel.dataptrStackchannel.dataptrStackPos++ = dataptr;
- dataptr += add;
- return 0;
-}
-
-int
-AdlibDriver::update_returnFromSubroutine (uint8 * &dataptr, Channel & channel,
- uint8 value)
-{
- dataptr = channel.dataptrStack--channel.dataptrStackPos;
- return 0;
-}
-
-int
-AdlibDriver::update_setBaseOctave (uint8 * &dataptr, Channel & channel,
- uint8 value)
-{
- channel.baseOctave = value;
- return 0;
-}
-
-int
-AdlibDriver::update_stopChannel (uint8 * &dataptr, Channel & channel,
- uint8 value)
-{
- channel.priority = 0;
- if (_curChannel != 9)
- {
- noteOff (channel);
- }
- dataptr = 0;
- return 2;
-}
-
-int
-AdlibDriver::update_playRest (uint8 * &dataptr, Channel & channel,
- uint8 value)
-{
- setupDuration (value, channel);
- noteOff (channel);
- return (value != 0);
-}
-
-int
-AdlibDriver::update_writeAdlib (uint8 * &dataptr, Channel & channel,
- uint8 value)
-{
- writeOPL (value, *dataptr++);
- return 0;
-}
-
-int
-AdlibDriver::update_setupNoteAndDuration (uint8 * &dataptr, Channel & channel,
- uint8 value)
-{
- setupNote (value, channel);
- value = *dataptr++;
- setupDuration (value, channel);
- return (value != 0);
-}
-
-int
-AdlibDriver::update_setBaseNote (uint8 * &dataptr, Channel & channel,
- uint8 value)
-{
- channel.baseNote = value;
- return 0;
-}
-
-int
-AdlibDriver::update_setupSecondaryEffect1 (uint8 * &dataptr,
- Channel & channel, uint8 value)
-{
- channel.unk18 = value;
- channel.unk19 = value;
- channel.unk20 = channel.unk21 = *dataptr++;
- channel.unk22 = *dataptr++;
- channel.offset = READ_LE_UINT16 (dataptr);
- dataptr += 2;
- channel.secondaryEffect = &AdlibDriver::secondaryEffect1;
- return 0;
-}
-
-int
-AdlibDriver::update_stopOtherChannel (uint8 * &dataptr, Channel & channel,
- uint8 value)
-{
- Channel & channel2 = _channelsvalue;
- channel2.duration = 0;
- channel2.priority = 0;
- channel2.dataptr = 0;
- return 0;
-}
-
-int
-AdlibDriver::update_waitForEndOfProgram (uint8 * &dataptr, Channel & channel,
- uint8 value)
-{
- uint8 *ptr = getProgram (value);
- uint8 chan = *ptr;
-
- if (!_channelschan.dataptr)
- {
- return 0;
- }
-
- dataptr -= 2;
- return 2;
-}
-
-int
-AdlibDriver::update_setupInstrument (uint8 * &dataptr, Channel & channel,
- uint8 value)
-{
- setupInstrument (_curRegOffset, getInstrument (value), channel);
- return 0;
-}
-
-int
-AdlibDriver::update_setupPrimaryEffect1 (uint8 * &dataptr, Channel & channel,
- uint8 value)
-{
- channel.unk29 = value;
- channel.unk30 = READ_BE_UINT16 (dataptr);
- dataptr += 2;
- channel.primaryEffect = &AdlibDriver::primaryEffect1;
- channel.unk31 = 0xFF;
- return 0;
-}
-
-int
-AdlibDriver::update_removePrimaryEffect1 (uint8 * &dataptr, Channel & channel,
- uint8 value)
-{
- --dataptr;
- channel.primaryEffect = 0;
- channel.unk30 = 0;
- return 0;
-}
-
-int
-AdlibDriver::update_setBaseFreq (uint8 * &dataptr, Channel & channel,
- uint8 value)
-{
- channel.baseFreq = value;
- return 0;
-}
-
-int
-AdlibDriver::update_setupPrimaryEffect2 (uint8 * &dataptr, Channel & channel,
- uint8 value)
-{
- channel.unk32 = value;
- channel.unk33 = *dataptr++;
- uint8 temp = *dataptr++;
- channel.unk34 = temp + 1;
- channel.unk35 = temp << 1;
- channel.unk36 = *dataptr++;
- channel.primaryEffect = &AdlibDriver::primaryEffect2;
- return 0;
-}
-
-int
-AdlibDriver::update_setPriority (uint8 * &dataptr, Channel & channel,
- uint8 value)
-{
- channel.priority = value;
- return 0;
-}
-
-int
-AdlibDriver::updateCallback23 (uint8 * &dataptr, Channel & channel,
- uint8 value)
-{
- value >>= 1;
- _unkValue1 = _unkValue2 = value;
- _unkValue3 = 0xFF;
- _unkValue4 = _unkValue5 = 0;
- return 0;
-}
-
-int
-AdlibDriver::updateCallback24 (uint8 * &dataptr, Channel & channel,
- uint8 value)
-{
- if (_unkValue5)
- {
- if (_unkValue4 & value)
- {
- _unkValue5 = 0;
- return 0;
- }
- }
-
- if (!(value & _unkValue4))
- {
- ++_unkValue5;
- }
-
- dataptr -= 2;
- channel.duration = 1;
- return 2;
-}
-
-int
-AdlibDriver::update_setExtraLevel1 (uint8 * &dataptr, Channel & channel,
- uint8 value)
-{
- channel.opExtraLevel1 = value;
- adjustVolume (channel);
- return 0;
-}
-
-int
-AdlibDriver::update_setupDuration (uint8 * &dataptr, Channel & channel,
- uint8 value)
-{
- setupDuration (value, channel);
- return (value != 0);
-}
-
-int
-AdlibDriver::update_playNote (uint8 * &dataptr, Channel & channel,
- uint8 value)
-{
- setupDuration (value, channel);
- noteOn (channel);
- return (value != 0);
-}
-
-int
-AdlibDriver::update_setFractionalNoteSpacing (uint8 * &dataptr,
- Channel & channel, uint8 value)
-{
- channel.fractionalSpacing = value & 7;
- return 0;
-}
-
-int
-AdlibDriver::update_setTempo (uint8 * &dataptr, Channel & channel,
- uint8 value)
-{
- _tempo = value;
- return 0;
-}
-
-int
-AdlibDriver::update_removeSecondaryEffect1 (uint8 * &dataptr,
- Channel & channel, uint8 value)
-{
- --dataptr;
- channel.secondaryEffect = 0;
- return 0;
-}
-
-int
-AdlibDriver::update_setChannelTempo (uint8 * &dataptr, Channel & channel,
- uint8 value)
-{
- channel.tempo = value;
- return 0;
-}
-
-int
-AdlibDriver::update_setExtraLevel3 (uint8 * &dataptr, Channel & channel,
- uint8 value)
-{
- channel.opExtraLevel3 = value;
- return 0;
-}
-
-int
-AdlibDriver::update_setExtraLevel2 (uint8 * &dataptr, Channel & channel,
- uint8 value)
-{
- int channelBackUp = _curChannel;
-
- _curChannel = value;
- Channel & channel2 = _channelsvalue;
- channel2.opExtraLevel2 = *dataptr++;
- adjustVolume (channel2);
-
- _curChannel = channelBackUp;
- return 0;
-}
-
-int
-AdlibDriver::update_changeExtraLevel2 (uint8 * &dataptr, Channel & channel,
- uint8 value)
-{
- int channelBackUp = _curChannel;
-
- _curChannel = value;
- Channel & channel2 = _channelsvalue;
- channel2.opExtraLevel2 += *dataptr++;
- adjustVolume (channel2);
-
- _curChannel = channelBackUp;
- return 0;
-}
-
-// Apart from initialising to zero, these two functions are the only ones that
-// modify _vibratoAndAMDepthBits.
-
-int
-AdlibDriver::update_setAMDepth (uint8 * &dataptr, Channel & channel,
- uint8 value)
-{
- if (value & 1)
- _vibratoAndAMDepthBits |= 0x80;
- else
- _vibratoAndAMDepthBits &= 0x7F;
-
- writeOPL (0xBD, _vibratoAndAMDepthBits);
- return 0;
-}
-
-int
-AdlibDriver::update_setVibratoDepth (uint8 * &dataptr, Channel & channel,
- uint8 value)
-{
- if (value & 1)
- _vibratoAndAMDepthBits |= 0x40;
- else
- _vibratoAndAMDepthBits &= 0xBF;
-
- writeOPL (0xBD, _vibratoAndAMDepthBits);
- return 0;
-}
-
-int
-AdlibDriver::update_changeExtraLevel1 (uint8 * &dataptr, Channel & channel,
- uint8 value)
-{
- channel.opExtraLevel1 += value;
- adjustVolume (channel);
- return 0;
-}
-
-int
-AdlibDriver::updateCallback38 (uint8 * &dataptr, Channel & channel,
- uint8 value)
-{
- int channelBackUp = _curChannel;
-
- _curChannel = value;
- Channel & channel2 = _channelsvalue;
- channel2.duration = channel2.priority = 0;
- channel2.dataptr = 0;
- channel2.opExtraLevel2 = 0;
-
- if (value != 9)
- {
- uint8 outValue = _regOffsetvalue;
-
- // Feedback strength / Connection type
- writeOPL (0xC0 + _curChannel, 0x00);
-
- // Key scaling level / Operator output level
- writeOPL (0x43 + outValue, 0x3F);
-
- // Sustain Level / Release Rate
- writeOPL (0x83 + outValue, 0xFF);
-
- // Key On / Octave / Frequency
- writeOPL (0xB0 + _curChannel, 0x00);
- }
-
- _curChannel = channelBackUp;
- return 0;
-}
-
-int
-AdlibDriver::updateCallback39 (uint8 * &dataptr, Channel & channel,
- uint8 value)
-{
- uint16 unk = *dataptr++;
- unk |= value << 8;
- unk &= getRandomNr ();
-
- uint16 unk2 = ((channel.regBx & 0x1F) << 8) | channel.regAx;
- unk2 += unk;
- unk2 |= ((channel.regBx & 0x20) << 8);
-
- // Frequency
- writeOPL (0xA0 + _curChannel, unk2 & 0xFF);
-
- // Key On / Octave / Frequency
- writeOPL (0xB0 + _curChannel, (unk2 & 0xFF00) >> 8);
-
- return 0;
-}
-
-int
-AdlibDriver::update_removePrimaryEffect2 (uint8 * &dataptr, Channel & channel,
- uint8 value)
-{
- --dataptr;
- channel.primaryEffect = 0;
- return 0;
-}
-
-int
-AdlibDriver::updateCallback41 (uint8 * &dataptr, Channel & channel,
- uint8 value)
-{
- channel.unk16 = value;
- setupNote (channel.rawNote, channel, true);
- return 0;
-}
-
-int
-AdlibDriver::update_resetToGlobalTempo (uint8 * &dataptr, Channel & channel,
- uint8 value)
-{
- --dataptr;
- channel.tempo = _tempo;
- return 0;
-}
-
-int
-AdlibDriver::update_nop1 (uint8 * &dataptr, Channel & channel, uint8 value)
-{
- --dataptr;
- return 0;
-}
-
-int
-AdlibDriver::update_setDurationRandomness (uint8 * &dataptr,
- Channel & channel, uint8 value)
-{
- channel.durationRandomness = value;
- return 0;
-}
-
-int
-AdlibDriver::update_changeChannelTempo (uint8 * &dataptr, Channel & channel,
- uint8 value)
-{
- int tempo = channel.tempo + (int8) value;
-
- if (tempo <= 0)
- tempo = 1;
- else if (tempo > 255)
- tempo = 255;
-
- channel.tempo = tempo;
- return 0;
-}
-
-int
-AdlibDriver::updateCallback46 (uint8 * &dataptr, Channel & channel,
- uint8 value)
-{
- uint8 entry = *dataptr++;
- _tablePtr1 = _unkTable2entry++;
- _tablePtr2 = _unkTable2entry;
- if (value == 2)
- {
- // Frequency
- writeOPL (0xA0, _tablePtr20);
- }
- return 0;
-}
-
-// TODO: This is really the same as update_nop1(), so they should be combined
-// into one single update_nop().
-
-int
-AdlibDriver::update_nop2 (uint8 * &dataptr, Channel & channel, uint8 value)
-{
- --dataptr;
- return 0;
-}
-
-int
-AdlibDriver::update_setupRhythmSection (uint8 * &dataptr, Channel & channel,
- uint8 value)
-{
- int channelBackUp = _curChannel;
- int regOffsetBackUp = _curRegOffset;
-
- _curChannel = 6;
- _curRegOffset = _regOffset6;
-
- setupInstrument (_curRegOffset, getInstrument (value), channel);
- _unkValue6 = channel.opLevel2;
-
- _curChannel = 7;
- _curRegOffset = _regOffset7;
-
- setupInstrument (_curRegOffset, getInstrument (*dataptr++), channel);
- _unkValue7 = channel.opLevel1;
- _unkValue8 = channel.opLevel2;
-
- _curChannel = 8;
- _curRegOffset = _regOffset8;
-
- setupInstrument (_curRegOffset, getInstrument (*dataptr++), channel);
- _unkValue9 = channel.opLevel1;
- _unkValue10 = channel.opLevel2;
-
- // Octave / F-Number / Key-On for channels 6, 7 and 8
-
- _channels6.regBx = *dataptr++ & 0x2F;
- writeOPL (0xB6, _channels6.regBx);
- writeOPL (0xA6, *dataptr++);
-
- _channels7.regBx = *dataptr++ & 0x2F;
- writeOPL (0xB7, _channels7.regBx);
- writeOPL (0xA7, *dataptr++);
-
- _channels8.regBx = *dataptr++ & 0x2F;
- writeOPL (0xB8, _channels8.regBx);
- writeOPL (0xA8, *dataptr++);
-
- _rhythmSectionBits = 0x20;
-
- _curRegOffset = regOffsetBackUp;
- _curChannel = channelBackUp;
- return 0;
-}
-
-int
-AdlibDriver::update_playRhythmSection (uint8 * &dataptr, Channel & channel,
- uint8 value)
-{
- // Any instrument that we want to play, and which was already playing,
- // is temporarily keyed off. Instruments that were off already, or
- // which we don't want to play, retain their old on/off status. This is
- // probably so that the instrument's envelope is played from its
- // beginning again...
-
- writeOPL (0xBD, (_rhythmSectionBits & ~(value & 0x1F)) | 0x20);
-
- // ...but since we only set the rhythm instrument bits, and never clear
- // them (until the entire rhythm section is disabled), I'm not sure how
- // useful the cleverness above is. We could perhaps simply turn off all
- // the rhythm instruments instead.
-
- _rhythmSectionBits |= value;
-
- writeOPL (0xBD, _vibratoAndAMDepthBits | 0x20 | _rhythmSectionBits);
- return 0;
-}
-
-int
-AdlibDriver::update_removeRhythmSection (uint8 * &dataptr, Channel & channel,
- uint8 value)
-{
- --dataptr;
- _rhythmSectionBits = 0;
-
- // All the rhythm bits are cleared. The AM and Vibrato depth bits
- // remain unchanged.
-
- writeOPL (0xBD, _vibratoAndAMDepthBits);
- return 0;
-}
-
-int
-AdlibDriver::updateCallback51 (uint8 * &dataptr, Channel & channel,
- uint8 value)
-{
- uint8 value2 = *dataptr++;
-
- if (value & 1)
- {
- _unkValue12 = value2;
-
- // Channel 7, op1: Level Key Scaling / Total Level
- writeOPL (0x51,
- checkValue (value2 + _unkValue7 + _unkValue11 + _unkValue12));
- }
-
- if (value & 2)
- {
- _unkValue14 = value2;
-
- // Channel 8, op2: Level Key Scaling / Total Level
- writeOPL (0x55,
- checkValue (value2 + _unkValue10 + _unkValue13 + _unkValue14));
- }
-
- if (value & 4)
- {
- _unkValue15 = value2;
-
- // Channel 8, op1: Level Key Scaling / Total Level
- writeOPL (0x52,
- checkValue (value2 + _unkValue9 + _unkValue16 + _unkValue15));
- }
-
- if (value & 8)
- {
- _unkValue18 = value2;
-
- // Channel 7, op2: Level Key Scaling / Total Level
- writeOPL (0x54,
- checkValue (value2 + _unkValue8 + _unkValue17 + _unkValue18));
- }
-
- if (value & 16)
- {
- _unkValue20 = value2;
-
- // Channel 6, op2: Level Key Scaling / Total Level
- writeOPL (0x53,
- checkValue (value2 + _unkValue6 + _unkValue19 + _unkValue20));
- }
-
- return 0;
-}
-
-int
-AdlibDriver::updateCallback52 (uint8 * &dataptr, Channel & channel,
- uint8 value)
-{
- uint8 value2 = *dataptr++;
-
- if (value & 1)
- {
- _unkValue11 =
- checkValue (value2 + _unkValue7 + _unkValue11 + _unkValue12);
-
- // Channel 7, op1: Level Key Scaling / Total Level
- writeOPL (0x51, _unkValue11);
- }
-
- if (value & 2)
- {
- _unkValue13 =
- checkValue (value2 + _unkValue10 + _unkValue13 + _unkValue14);
-
- // Channel 8, op2: Level Key Scaling / Total Level
- writeOPL (0x55, _unkValue13);
- }
-
- if (value & 4)
- {
- _unkValue16 =
- checkValue (value2 + _unkValue9 + _unkValue16 + _unkValue15);
-
- // Channel 8, op1: Level Key Scaling / Total Level
- writeOPL (0x52, _unkValue16);
- }
-
- if (value & 8)
- {
- _unkValue17 =
- checkValue (value2 + _unkValue8 + _unkValue17 + _unkValue18);
-
- // Channel 7, op2: Level Key Scaling / Total Level
- writeOPL (0x54, _unkValue17);
- }
-
- if (value & 16)
- {
- _unkValue19 =
- checkValue (value2 + _unkValue6 + _unkValue19 + _unkValue20);
-
- // Channel 6, op2: Level Key Scaling / Total Level
- writeOPL (0x53, _unkValue19);
- }
-
- return 0;
-}
-
-int
-AdlibDriver::updateCallback53 (uint8 * &dataptr, Channel & channel,
- uint8 value)
-{
- uint8 value2 = *dataptr++;
-
- if (value & 1)
- {
- _unkValue11 = value2;
-
- // Channel 7, op1: Level Key Scaling / Total Level
- writeOPL (0x51, checkValue (value2 + _unkValue7 + _unkValue12));
- }
-
- if (value & 2)
- {
- _unkValue13 = value2;
-
- // Channel 8, op2: Level Key Scaling / Total Level
- writeOPL (0x55, checkValue (value2 + _unkValue10 + _unkValue14));
- }
-
- if (value & 4)
- {
- _unkValue16 = value2;
-
- // Channel 8, op1: Level Key Scaling / Total Level
- writeOPL (0x52, checkValue (value2 + _unkValue9 + _unkValue15));
- }
-
- if (value & 8)
- {
- _unkValue17 = value2;
-
- // Channel 7, op2: Level Key Scaling / Total Level
- writeOPL (0x54, checkValue (value2 + _unkValue8 + _unkValue18));
- }
-
- if (value & 16)
- {
- _unkValue19 = value2;
-
- // Channel 6, op2: Level Key Scaling / Total Level
- writeOPL (0x53, checkValue (value2 + _unkValue6 + _unkValue20));
- }
-
- return 0;
-}
-
-int
-AdlibDriver::update_setSoundTrigger (uint8 * &dataptr, Channel & channel,
- uint8 value)
-{
- _soundTrigger = value;
- return 0;
-}
-
-int
-AdlibDriver::update_setTempoReset (uint8 * &dataptr, Channel & channel,
- uint8 value)
-{
- channel.tempoReset = value;
- return 0;
-}
-
-int
-AdlibDriver::updateCallback56 (uint8 * &dataptr, Channel & channel,
- uint8 value)
-{
- channel.unk39 = value;
- channel.unk40 = *dataptr++;
- return 0;
-}
-
-// static res
-
-#define COMMAND(x) { &AdlibDriver::x, #x }
-
-void
-AdlibDriver::setupOpcodeList ()
-{
- static const OpcodeEntry opcodeList = {
- COMMAND (snd_ret0x100),
- COMMAND (snd_ret0x1983),
- COMMAND (snd_initDriver),
- COMMAND (snd_deinitDriver),
- COMMAND (snd_setSoundData),
- COMMAND (snd_unkOpcode1),
- COMMAND (snd_startSong),
- COMMAND (snd_unkOpcode2),
- COMMAND (snd_unkOpcode3),
- COMMAND (snd_readByte),
- COMMAND (snd_writeByte),
- COMMAND (snd_getSoundTrigger),
- COMMAND (snd_unkOpcode4),
- COMMAND (snd_dummy),
- COMMAND (snd_getNullvar4),
- COMMAND (snd_setNullvar3),
- COMMAND (snd_setFlag),
- COMMAND (snd_clearFlag)
- };
-
- _opcodeList = opcodeList;
- _opcodesEntries = ARRAYSIZE (opcodeList);
-}
-
-void
-AdlibDriver::setupParserOpcodeTable ()
-{
- static const ParserOpcode parserOpcodeTable = {
- // 0
- COMMAND (update_setRepeat),
- COMMAND (update_checkRepeat),
- COMMAND (update_setupProgram),
- COMMAND (update_setNoteSpacing),
-
- // 4
- COMMAND (update_jump),
- COMMAND (update_jumpToSubroutine),
- COMMAND (update_returnFromSubroutine),
- COMMAND (update_setBaseOctave),
-
- // 8
- COMMAND (update_stopChannel),
- COMMAND (update_playRest),
- COMMAND (update_writeAdlib),
- COMMAND (update_setupNoteAndDuration),
-
- // 12
- COMMAND (update_setBaseNote),
- COMMAND (update_setupSecondaryEffect1),
- COMMAND (update_stopOtherChannel),
- COMMAND (update_waitForEndOfProgram),
-
- // 16
- COMMAND (update_setupInstrument),
- COMMAND (update_setupPrimaryEffect1),
- COMMAND (update_removePrimaryEffect1),
- COMMAND (update_setBaseFreq),
-
- // 20
- COMMAND (update_stopChannel),
- COMMAND (update_setupPrimaryEffect2),
- COMMAND (update_stopChannel),
- COMMAND (update_stopChannel),
-
- // 24
- COMMAND (update_stopChannel),
- COMMAND (update_stopChannel),
- COMMAND (update_setPriority),
- COMMAND (update_stopChannel),
-
- // 28
- COMMAND (updateCallback23),
- COMMAND (updateCallback24),
- COMMAND (update_setExtraLevel1),
- COMMAND (update_stopChannel),
-
- // 32
- COMMAND (update_setupDuration),
- COMMAND (update_playNote),
- COMMAND (update_stopChannel),
- COMMAND (update_stopChannel),
-
- // 36
- COMMAND (update_setFractionalNoteSpacing),
- COMMAND (update_stopChannel),
- COMMAND (update_setTempo),
- COMMAND (update_removeSecondaryEffect1),
-
- // 40
- COMMAND (update_stopChannel),
- COMMAND (update_setChannelTempo),
- COMMAND (update_stopChannel),
- COMMAND (update_setExtraLevel3),
-
- // 44
- COMMAND (update_setExtraLevel2),
- COMMAND (update_changeExtraLevel2),
- COMMAND (update_setAMDepth),
- COMMAND (update_setVibratoDepth),
-
- // 48
- COMMAND (update_changeExtraLevel1),
- COMMAND (update_stopChannel),
- COMMAND (update_stopChannel),
- COMMAND (updateCallback38),
-
- // 52
- COMMAND (update_stopChannel),
- COMMAND (updateCallback39),
- COMMAND (update_removePrimaryEffect2),
- COMMAND (update_stopChannel),
-
- // 56
- COMMAND (update_stopChannel),
- COMMAND (updateCallback41),
- COMMAND (update_resetToGlobalTempo),
- COMMAND (update_nop1),
-
- // 60
- COMMAND (update_setDurationRandomness),
- COMMAND (update_changeChannelTempo),
- COMMAND (update_stopChannel),
- COMMAND (updateCallback46),
-
- // 64
- COMMAND (update_nop2),
- COMMAND (update_setupRhythmSection),
- COMMAND (update_playRhythmSection),
- COMMAND (update_removeRhythmSection),
-
- // 68
- COMMAND (updateCallback51),
- COMMAND (updateCallback52),
- COMMAND (updateCallback53),
- COMMAND (update_setSoundTrigger),
-
- // 72
- COMMAND (update_setTempoReset),
- COMMAND (updateCallback56),
- COMMAND (update_stopChannel)
- };
-
- _parserOpcodeTable = parserOpcodeTable;
- _parserOpcodeTableSize = ARRAYSIZE (parserOpcodeTable);
-}
-
-#undef COMMAND
-
-// This table holds the register offset for operator 1 for each of the nine
-// channels. To get the register offset for operator 2, simply add 3.
-
-const uint8
- AdlibDriver::_regOffset = {
- 0x00, 0x01, 0x02, 0x08, 0x09, 0x0A, 0x10, 0x11,
- 0x12
-};
-
-// Given the size of this table, and the range of its values, it's probably the
-// F-Numbers (10 bits) for the notes of the 12-tone scale. However, it does not
-// match the table in the Adlib documentation I've seen.
-
-const uint16
- AdlibDriver::_unkTable = {
- 0x0134, 0x0147, 0x015A, 0x016F, 0x0184, 0x019C, 0x01B4, 0x01CE, 0x01E9,
- 0x0207, 0x0225, 0x0246
-};
-
-// These tables are currently only used by updateCallback46(), which only ever
-// uses the first element of one of the sub-tables.
-
-const uint8 *
- AdlibDriver::_unkTable2 = {
- AdlibDriver::_unkTable2_1,
- AdlibDriver::_unkTable2_2,
- AdlibDriver::_unkTable2_1,
- AdlibDriver::_unkTable2_2,
- AdlibDriver::_unkTable2_3,
- AdlibDriver::_unkTable2_2
-};
-
-const uint8
- AdlibDriver::_unkTable2_1 = {
- 0x50, 0x50, 0x4F, 0x4F, 0x4E, 0x4E, 0x4D, 0x4D,
- 0x4C, 0x4C, 0x4B, 0x4B, 0x4A, 0x4A, 0x49, 0x49,
- 0x48, 0x48, 0x47, 0x47, 0x46, 0x46, 0x45, 0x45,
- 0x44, 0x44, 0x43, 0x43, 0x42, 0x42, 0x41, 0x41,
- 0x40, 0x40, 0x3F, 0x3F, 0x3E, 0x3E, 0x3D, 0x3D,
- 0x3C, 0x3C, 0x3B, 0x3B, 0x3A, 0x3A, 0x39, 0x39,
- 0x38, 0x38, 0x37, 0x37, 0x36, 0x36, 0x35, 0x35,
- 0x34, 0x34, 0x33, 0x33, 0x32, 0x32, 0x31, 0x31,
- 0x30, 0x30, 0x2F, 0x2F, 0x2E, 0x2E, 0x2D, 0x2D,
- 0x2C, 0x2C, 0x2B, 0x2B, 0x2A, 0x2A, 0x29, 0x29,
- 0x28, 0x28, 0x27, 0x27, 0x26, 0x26, 0x25, 0x25,
- 0x24, 0x24, 0x23, 0x23, 0x22, 0x22, 0x21, 0x21,
- 0x20, 0x20, 0x1F, 0x1F, 0x1E, 0x1E, 0x1D, 0x1D,
- 0x1C, 0x1C, 0x1B, 0x1B, 0x1A, 0x1A, 0x19, 0x19,
- 0x18, 0x18, 0x17, 0x17, 0x16, 0x16, 0x15, 0x15,
- 0x14, 0x14, 0x13, 0x13, 0x12, 0x12, 0x11, 0x11,
- 0x10, 0x10
-};
-
-// no don't ask me WHY this table exsits!
-const uint8
- AdlibDriver::_unkTable2_2 = {
- 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
- 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F,
- 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17,
- 0x18, 0x19, 0x1A, 0x1B, 0x1C, 0x1D, 0x1E, 0x1F,
- 0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27,
- 0x28, 0x29, 0x2A, 0x2B, 0x2C, 0x2D, 0x2E, 0x2F,
- 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37,
- 0x38, 0x39, 0x3A, 0x3B, 0x3C, 0x3D, 0x3E, 0x3F,
- 0x40, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47,
- 0x48, 0x49, 0x4A, 0x4B, 0x4C, 0x4D, 0x4E, 0x4F,
- 0x50, 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57,
- 0x58, 0x59, 0x5A, 0x5B, 0x5C, 0x5D, 0x5E, 0x6F,
- 0x60, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67,
- 0x68, 0x69, 0x6A, 0x6B, 0x6C, 0x6D, 0x6E, 0x6F,
- 0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77,
- 0x78, 0x79, 0x7A, 0x7B, 0x7C, 0x7D, 0x7E, 0x7F
-};
-
-const uint8
- AdlibDriver::_unkTable2_3 = {
- 0x40, 0x40, 0x40, 0x3F, 0x3F, 0x3F, 0x3E, 0x3E,
- 0x3E, 0x3D, 0x3D, 0x3D, 0x3C, 0x3C, 0x3C, 0x3B,
- 0x3B, 0x3B, 0x3A, 0x3A, 0x3A, 0x39, 0x39, 0x39,
- 0x38, 0x38, 0x38, 0x37, 0x37, 0x37, 0x36, 0x36,
- 0x36, 0x35, 0x35, 0x35, 0x34, 0x34, 0x34, 0x33,
- 0x33, 0x33, 0x32, 0x32, 0x32, 0x31, 0x31, 0x31,
- 0x30, 0x30, 0x30, 0x2F, 0x2F, 0x2F, 0x2E, 0x2E,
- 0x2E, 0x2D, 0x2D, 0x2D, 0x2C, 0x2C, 0x2C, 0x2B,
- 0x2B, 0x2B, 0x2A, 0x2A, 0x2A, 0x29, 0x29, 0x29,
- 0x28, 0x28, 0x28, 0x27, 0x27, 0x27, 0x26, 0x26,
- 0x26, 0x25, 0x25, 0x25, 0x24, 0x24, 0x24, 0x23,
- 0x23, 0x23, 0x22, 0x22, 0x22, 0x21, 0x21, 0x21,
- 0x20, 0x20, 0x20, 0x1F, 0x1F, 0x1F, 0x1E, 0x1E,
- 0x1E, 0x1D, 0x1D, 0x1D, 0x1C, 0x1C, 0x1C, 0x1B,
- 0x1B, 0x1B, 0x1A, 0x1A, 0x1A, 0x19, 0x19, 0x19,
- 0x18, 0x18, 0x18, 0x17, 0x17, 0x17, 0x16, 0x16,
- 0x16, 0x15
-};
-
-// This table is used to modify the frequency of the notes, depending on the
-// note value and unk16. In theory, we could very well try to access memory
-// outside this table, but in reality that probably won't happen.
-//
-// This could be some sort of pitch bend, but I have yet to see it used for
-// anything so it's hard to say.
-
-const uint8
- AdlibDriver::_unkTables32 = {
- // 0
- {0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x08,
- 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F, 0x10,
- 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x19,
- 0x1A, 0x1B, 0x1C, 0x1D, 0x1E, 0x1F, 0x20, 0x21},
- // 1
- {0x00, 0x01, 0x02, 0x03, 0x04, 0x06, 0x07, 0x09,
- 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F, 0x10, 0x11,
- 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x1A,
- 0x1B, 0x1C, 0x1D, 0x1E, 0x1F, 0x20, 0x22, 0x24},
- // 2
- {0x00, 0x01, 0x02, 0x03, 0x04, 0x06, 0x08, 0x09,
- 0x0A, 0x0C, 0x0D, 0x0E, 0x0F, 0x11, 0x12, 0x13,
- 0x14, 0x15, 0x16, 0x17, 0x19, 0x1A, 0x1C, 0x1D,
- 0x1E, 0x1F, 0x20, 0x21, 0x22, 0x24, 0x25, 0x26},
- // 3
- {0x00, 0x01, 0x02, 0x03, 0x04, 0x06, 0x08, 0x0A,
- 0x0B, 0x0C, 0x0D, 0x0E, 0x0F, 0x11, 0x12, 0x13,
- 0x14, 0x15, 0x16, 0x17, 0x18, 0x1A, 0x1C, 0x1D,
- 0x1E, 0x1F, 0x20, 0x21, 0x23, 0x25, 0x27, 0x28},
- // 4
- {0x00, 0x01, 0x02, 0x03, 0x04, 0x06, 0x08, 0x0A,
- 0x0B, 0x0C, 0x0D, 0x0E, 0x0F, 0x11, 0x13, 0x15,
- 0x16, 0x17, 0x18, 0x19, 0x1B, 0x1D, 0x1F, 0x20,
- 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x28, 0x2A},
- // 5
- {0x00, 0x01, 0x02, 0x03, 0x05, 0x07, 0x09, 0x0B,
- 0x0C, 0x0D, 0x0E, 0x0F, 0x10, 0x11, 0x13, 0x15,
- 0x16, 0x17, 0x18, 0x19, 0x1B, 0x1D, 0x1F, 0x20,
- 0x21, 0x22, 0x23, 0x25, 0x27, 0x29, 0x2B, 0x2D},
- // 6
- {0x00, 0x01, 0x02, 0x03, 0x05, 0x07, 0x09, 0x0B,
- 0x0C, 0x0D, 0x0E, 0x0F, 0x10, 0x11, 0x13, 0x15,
- 0x16, 0x17, 0x18, 0x1A, 0x1C, 0x1E, 0x21, 0x24,
- 0x25, 0x26, 0x27, 0x29, 0x2B, 0x2D, 0x2F, 0x30},
- // 7
- {0x00, 0x01, 0x02, 0x04, 0x06, 0x08, 0x0A, 0x0C,
- 0x0D, 0x0E, 0x0F, 0x10, 0x11, 0x13, 0x15, 0x18,
- 0x19, 0x1A, 0x1C, 0x1D, 0x1F, 0x21, 0x23, 0x25,
- 0x26, 0x27, 0x29, 0x2B, 0x2D, 0x2F, 0x30, 0x32},
- // 8
- {0x00, 0x01, 0x02, 0x04, 0x06, 0x08, 0x0A, 0x0D,
- 0x0E, 0x0F, 0x10, 0x11, 0x12, 0x14, 0x17, 0x1A,
- 0x19, 0x1A, 0x1C, 0x1E, 0x20, 0x22, 0x25, 0x28,
- 0x29, 0x2A, 0x2B, 0x2D, 0x2F, 0x31, 0x33, 0x35},
- // 9
- {0x00, 0x01, 0x03, 0x05, 0x07, 0x09, 0x0B, 0x0E,
- 0x0F, 0x10, 0x12, 0x14, 0x16, 0x18, 0x1A, 0x1B,
- 0x1C, 0x1D, 0x1E, 0x20, 0x22, 0x24, 0x26, 0x29,
- 0x2A, 0x2C, 0x2E, 0x30, 0x32, 0x34, 0x36, 0x39},
- // 10
- {0x00, 0x01, 0x03, 0x05, 0x07, 0x09, 0x0B, 0x0E,
- 0x0F, 0x10, 0x12, 0x14, 0x16, 0x19, 0x1B, 0x1E,
- 0x1F, 0x21, 0x23, 0x25, 0x27, 0x29, 0x2B, 0x2D,
- 0x2E, 0x2F, 0x31, 0x32, 0x34, 0x36, 0x39, 0x3C},
- // 11
- {0x00, 0x01, 0x03, 0x05, 0x07, 0x0A, 0x0C, 0x0F,
- 0x10, 0x11, 0x13, 0x15, 0x17, 0x19, 0x1B, 0x1E,
- 0x1F, 0x20, 0x22, 0x24, 0x26, 0x28, 0x2B, 0x2E,
- 0x2F, 0x30, 0x32, 0x34, 0x36, 0x39, 0x3C, 0x3F},
- // 12
- {0x00, 0x02, 0x04, 0x06, 0x08, 0x0B, 0x0D, 0x10,
- 0x11, 0x12, 0x14, 0x16, 0x18, 0x1B, 0x1E, 0x21,
- 0x22, 0x23, 0x25, 0x27, 0x29, 0x2C, 0x2F, 0x32,
- 0x33, 0x34, 0x36, 0x38, 0x3B, 0x34, 0x41, 0x44},
- // 13
- {0x00, 0x02, 0x04, 0x06, 0x08, 0x0B, 0x0D, 0x11,
- 0x12, 0x13, 0x15, 0x17, 0x1A, 0x1D, 0x20, 0x23,
- 0x24, 0x25, 0x27, 0x29, 0x2C, 0x2F, 0x32, 0x35,
- 0x36, 0x37, 0x39, 0x3B, 0x3E, 0x41, 0x44, 0x47}
-};
-
-// #pragma mark -
-
-// At the time of writing, the only known case where Kyra 1 uses sound triggers
-// is in the castle, to cycle between three different songs.
-
-const int
- CadlPlayer::_kyra1SoundTriggers = {
- 0, 4, 5, 3
-};
-
-const int
- CadlPlayer::_kyra1NumSoundTriggers =
-ARRAYSIZE (CadlPlayer::_kyra1SoundTriggers);
-
-CadlPlayer::CadlPlayer (Copl * newopl):CPlayer (newopl), numsubsongs (0), _trackEntries (),
-_soundDataPtr (0)
-{
- memset (_trackEntries, 0, sizeof (_trackEntries));
- _driver = new AdlibDriver (newopl);
- assert (_driver);
-
- _sfxPlayingSound = -1;
- // _soundFileLoaded = "";
-
- _soundTriggers = _kyra1SoundTriggers;
- _numSoundTriggers = _kyra1NumSoundTriggers;
-
- init ();
-}
-
-CadlPlayer::~CadlPlayer ()
-{
- delete_soundDataPtr;
- _soundDataPtr = 0;
- delete _driver;
- _driver = 0;
-}
-
-bool
-CadlPlayer::init ()
-{
- _driver->callback (2);
- _driver->callback (16, int (4));
- return true;
-}
-
-void
-CadlPlayer::process ()
-{
- uint8 trigger = _driver->callback (11);
-
- if (trigger < _numSoundTriggers)
- {
- int soundId = _soundTriggerstrigger;
-
- if (soundId)
- {
- playTrack (soundId);
- }
- }
- else
- {
- warning ("Unknown sound trigger %d", trigger);
- // TODO: At this point, we really want to clear the trigger...
- }
-}
-
-// void CadlPlayer::setVolume(int volume) {
-// }
-
-// int CadlPlayer::getVolume() {
-// return 0;
-// }
-
-// void CadlPlayer::loadMusicFile(const char *file) {
-// loadSoundFile(file);
-// }
-
-void
-CadlPlayer::playTrack (uint8 track)
-{
- play (track);
-}
-
-// void CadlPlayer::haltTrack() {
-// unk1();
-// unk2();
-// //_engine->_system->delayMillis(3 * 60);
-// }
-
-void
-CadlPlayer::playSoundEffect (uint8_t track)
-{
- play (track);
-}
-
-void
-CadlPlayer::play (uint8_t track)
-{
- uint8 soundId = _trackEntriestrack;
- if ((int8) soundId == -1 || !_soundDataPtr)
- return;
- soundId &= 0xFF;
- _driver->callback (16, 0);
- // while ((_driver->callback(16, 0) & 8)) {
- // We call the system delay and not the game delay to avoid concurrency issues.
- // _engine->_system->delayMillis(10);
- // }
- if (_sfxPlayingSound != -1)
- {
- // Restore the sounds's normal values.
- _driver->callback (10, _sfxPlayingSound, int (1), int (_sfxPriority));
- _driver->callback (10, _sfxPlayingSound, int (3),
- int (_sfxFourthByteOfSong));
- _sfxPlayingSound = -1;
- }
-
- int chan = _driver->callback (9, soundId, int (0));
-
- if (chan != 9)
- {
- _sfxPlayingSound = soundId;
- _sfxPriority = _driver->callback (9, soundId, int (1));
- _sfxFourthByteOfSong = _driver->callback (9, soundId, int (3));
-
- // In the cases I've seen, the mysterious fourth byte has been
- // the parameter for the update_setExtraLevel3() callback.
- //
- // The extra level is part of the channels "total level", which
- // is a six-bit value where larger values means softer volume.
- //
- // So what seems to be happening here is that sounds which are
- // started by this function are given a slightly lower priority
- // and a slightly higher (i.e. softer) extra level 3 than they
- // would have if they were started from anywhere else. Strange.
-
- int newVal = ((((-_sfxFourthByteOfSong) + 63) * 0xFF) >> 8) & 0xFF;
- newVal = -newVal + 63;
- _driver->callback (10, soundId, int (3), newVal);
- newVal = ((_sfxPriority * 0xFF) >> 8) & 0xFF;
- _driver->callback (10, soundId, int (1), newVal);
- }
-
- _driver->callback (6, soundId);
-}
-
-// void CadlPlayer::beginFadeOut() {
-// playSoundEffect(1);
-// }
-
-bool
-CadlPlayer::load (VFSFile & fd, const CFileProvider & fp)
-{
- binistream *f = fp.open (fd);
- std::string filename (fd.filename ());
-
- // file validation section
- if (!f || !fp.extension (filename, ".adl"))
- {
- fp.close (f);
- return false;
- }
-
- // if (_soundFileLoaded == file)
- // return;
-
- // if (_soundDataPtr) {
- // haltTrack();
- // }
-
- uint8 *file_data = 0;
- uint32 file_size = 0;
-
- // char filename25;
- // sprintf(filename, "%s.ADL", file);
-
- // file_data = _engine->resource()->fileData(filename, &file_size);
- // if (!file_data) {
- // warning("Couldn't find music file: '%s'", filename);
- // return;
- // }
-
- unk2 ();
- unk1 ();
-
- file_size = fp.filesize (f);
- file_data = new uint8file_size;
- f->readString ((char *) file_data, file_size);
-
- _driver->callback (8, int (-1));
- _soundDataPtr = 0;
-
- uint8 *p = file_data;
- memcpy (_trackEntries, p, 120 * sizeof (uint8));
- p += 120;
-
- int soundDataSize = file_size - 120;
-
- _soundDataPtr = new uint8soundDataSize;
- assert (_soundDataPtr);
-
- memcpy (_soundDataPtr, p, soundDataSize * sizeof (uint8));
-
- deletefile_data;
- file_data = p = 0;
- file_size = 0;
-
- _driver->callback (4, _soundDataPtr);
-
- // _soundFileLoaded = file;
-
- // find last subsong
- for(int i = 119; i >= 0; i--)
- if(_trackEntriesi != 0xff) {
- numsubsongs = i + 1;
- break;
- }
- fp.close (f);
- cursubsong = 2;
- rewind();
- return true;
-}
-
-void
-CadlPlayer::rewind (int subsong)
-{
- if(subsong == -1) subsong = cursubsong;
- opl->init ();
- opl->write (1, 32);
- playSoundEffect (subsong);
- cursubsong = subsong;
- update ();
-}
-
-unsigned int
-CadlPlayer::getsubsongs ()
-{
- return numsubsongs;
-}
-
-bool
-CadlPlayer::update ()
-{
- bool songend = true;
-
-// if(_trackEntriescursubsong == 0xff)
-// return false;
-
- _driver->callback ();
-
- for (int i = 0; i < 10; i++)
- if (_driver->_channelsi.dataptr != nullptr)
- songend = false;
-
- return !songend;
-}
-
-void
-CadlPlayer::unk1 ()
-{
- playSoundEffect (0);
- //_engine->_system->delayMillis(5 * 60);
-}
-
-void
-CadlPlayer::unk2 ()
-{
- playSoundEffect (0);
-}
-
-CPlayer *
-CadlPlayer::factory (Copl * newopl)
-{
- return new CadlPlayer (newopl);
-}

audacious-plugins-3.6.2-gtk3.tar.bz2/src/adplug/core/adl.h Deleted

@@ -1,80 +0,0 @@
-/*
- * 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.
- *
- * adl.h - ADL player adaption by Simon Peter <dn.tlp@gmx.net>
- */
-
-#ifndef H_ADPLUG_ADLPLAYER
-#define H_ADPLUG_ADLPLAYER
-
-#include <inttypes.h>
-
-#include "player.h"
-
-class AdlibDriver;
-
-class CadlPlayer: public CPlayer
-{
- public:
- static CPlayer *factory(Copl *newopl);
-
- CadlPlayer(Copl *newopl);
- ~CadlPlayer();
-
- bool load(VFSFile &fd, const CFileProvider &fp);
- bool update();
- void rewind(int subsong = -1);
-
- // refresh rate is fixed at 72Hz
- float getrefresh()
- {
- return 72.0f;
- }
-
- unsigned int getsubsongs();
- unsigned int getsubsong() { return cursubsong; }
- std::string gettype() { return std::string("Westwood ADL"); }
-
- private:
- int numsubsongs, cursubsong;
-
- AdlibDriver *_driver;
-
- uint8_t _trackEntries120;
- uint8_t *_soundDataPtr;
- int _sfxPlayingSound;
-
- uint8_t _sfxPriority;
- uint8_t _sfxFourthByteOfSong;
-
- int _numSoundTriggers;
- const int *_soundTriggers;
-
- static const int _kyra1NumSoundTriggers;
- static const int _kyra1SoundTriggers;
-
- bool init();
- void process();
- void playTrack(uint8_t track);
- void playSoundEffect(uint8_t track);
- void play(uint8_t track);
- void unk1();
- void unk2();
-};
-
-#endif

audacious-plugins-3.6.2-gtk3.tar.bz2/src/adplug/core/adlibemu.cc Deleted

@@ -1,594 +0,0 @@
-/*
- * ADLIBEMU.C
- * Copyright (C) 1998-2001 Ken Silverman
- * Ken Silverman's official web site: "http://www.advsys.net/ken"
- *
- * 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
- */
-
-/*
-This file is a digital Adlib emulator for OPL2 and possibly OPL3
-
-Features that could be added in a future version:
-- Amplitude and Frequency Vibrato Bits (not hard, but a big speed hit)
-- Global Keyboard Split Number Bit (need to research this one some more)
-- 2nd Adlib chip for OPL3 (simply need to make my cell array bigger)
-- Advanced connection modes of OPL3 (Just need to add more "docell" cases)
-- L/R Stereo bits of OPL3 (Need adlibgetsample to return stereo)
-
-Features that aren't worth supporting:
-- Anything related to adlib timers&interrupts (Sorry - I always used IRQ0)
-- Composite sine wave mode (CSM) (Supported only on ancient cards)
-
-I'm not sure about a few things in my code:
-- Attack curve. What function is this anyway? I chose to use an order-3
- polynomial to approximate but this doesn't seem right.
-- Attack/Decay/Release constants - my constants may not be exact
-- What should ADJUSTSPEED be?
-- Haven't verified that Global Keyboard Split Number Bit works yet
-- Some of the drums don't always sound right. It's pretty hard to guess
- the exact waveform of drums when you look at random data which is
- slightly randomized due to digital ADC recording.
-- Adlib seems to have a lot more treble than my emulator does. I'm not
- sure if this is simply unfixable due to the sound blaster's different
- filtering on FM and digital playback or if it's a serious bug in my
- code.
-*/
-
-#include <math.h>
-#include <string.h>
-#include <algorithm>
-
-#define PI 3.141592653589793
-#define MAXCELLS 18
-#define WAVPREC 2048
-
-static float AMPSCALE=(8192.0);
-#define FRQSCALE (49716/512.0)
-
-//Constants for Ken's Awe32, on a PII-266 (Ken says: Use these for KSM's!)
-#define MODFACTOR 4.0 //How much of modulator cell goes into carrier
-#define MFBFACTOR 1.0 //How much feedback goes back into modulator
-#define ADJUSTSPEED 0.75 //0<=x<=1 Simulate finite rate of change of state
-
-//Constants for Ken's Awe64G, on a P-133
-//#define MODFACTOR 4.25 //How much of modulator cell goes into carrier
-//#define MFBFACTOR 0.5 //How much feedback goes back into modulator
-//#define ADJUSTSPEED 0.85 //0<=x<=1 Simulate finite rate of change of state
-
-typedef struct
-{
- float val, t, tinc, vol, sustain, amp, mfb;
- float a0, a1, a2, a3, decaymul, releasemul;
- short *waveform;
- long wavemask;
- void (*cellfunc)(void *, float);
- unsigned char flags, dum0, dum1, dum2;
-} celltype;
-
-static long numspeakers, bytespersample;
-static float recipsamp;
-static celltype cellMAXCELLS;
-static signed short wavtableWAVPREC*3;
-static float kslmul4 = {0.0,0.5,0.25,1.0};
-static float frqmul16 = {.5,1,2,3,4,5,6,7,8,9,10,10,12,12,15,15}, nfrqmul16;
-static unsigned char adlibreg256, ksl816;
-static unsigned char modulatorbase9 = {0,1,2,8,9,10,16,17,18};
-static unsigned char odrumstat = 0;
-static unsigned char base2cell22 = {0,1,2,0,1,2,0,0,3,4,5,3,4,5,0,0,6,7,8,6,7,8};
-
-float lvol9 = {1,1,1,1,1,1,1,1,1}; //Volume multiplier on left speaker
-float rvol9 = {1,1,1,1,1,1,1,1,1}; //Volume multiplier on right speaker
-long lplc9 = {0,0,0,0,0,0,0,0,0}; //Samples to delay on left speaker
-long rplc9 = {0,0,0,0,0,0,0,0,0}; //Samples to delay on right speaker
-
-long nlvol9, nrvol9;
-long nlplc9, nrplc9;
-long rend = 0;
-#define FIFOSIZ 256
-static float *rptr9, *nrptr9;
-static float rbuf9FIFOSIZ*2;
-static float sndFIFOSIZ*2;
-
-#ifndef USING_ASM
-#define _inline
-#endif
-
-#ifdef USING_ASM
-static _inline void ftol (float f, long *a)
-{
- _asm
-	{
-	 mov eax, a
-		fld f
-		fistp dword ptr eax
-		}
-}
-#else
-static void ftol(float f, long *a) {
- *a=f;
-}
-#endif
-
-#define ctc ((celltype *)c) //A rare attempt to make code easier to read!
-void docell4 (void *c, float modulator) { }
-void docell3 (void *c, float modulator)
-{
- long i;
-
- ftol(ctc->t+modulator,&i);
- ctc->t += ctc->tinc;
- ctc->val += (ctc->amp*ctc->vol*((float)ctc->waveformi&ctc->wavemask)-ctc->val)*ADJUSTSPEED;
-}
-void docell2 (void *c, float modulator)
-{
- long i;
-
- ftol(ctc->t+modulator,&i);
-
- if ((long)ctc->amp <= 0x37800000)
- {
-	ctc->amp = 0;
-	ctc->cellfunc = docell4;
- }
- ctc->amp *= ctc->releasemul;
-
- ctc->t += ctc->tinc;
- ctc->val += (ctc->amp*ctc->vol*((float)ctc->waveformi&ctc->wavemask)-ctc->val)*ADJUSTSPEED;
-}
-void docell1 (void *c, float modulator)
-{
- long i;
-
- ftol(ctc->t+modulator,&i);
-
- if ((long)ctc->amp <= (long)ctc->sustain)
- {
-	if (ctc->flags&32)
-	{
-	 ctc->amp = ctc->sustain;
-	 ctc->cellfunc = docell3;
-	}
-	else
-	 ctc->cellfunc = docell2;
- }
- else
-	ctc->amp *= ctc->decaymul;
-
- ctc->t += ctc->tinc;
- ctc->val += (ctc->amp*ctc->vol*((float)ctc->waveformi&ctc->wavemask)-ctc->val)*ADJUSTSPEED;
-}
-void docell0 (void *c, float modulator)
-{
- long i;
-
- ftol(ctc->t+modulator,&i);
-
- ctc->amp = ((ctc->a3*ctc->amp + ctc->a2)*ctc->amp + ctc->a1)*ctc->amp + ctc->a0;
- if ((long)ctc->amp > 0x3f800000)
- {
-	ctc->amp = 1;
-	ctc->cellfunc = docell1;
- }
-
- ctc->t += ctc->tinc;
- ctc->val += (ctc->amp*ctc->vol*((float)ctc->waveformi&ctc->wavemask)-ctc->val)*ADJUSTSPEED;
-}
-
-
-static long waveform8 = {WAVPREC,WAVPREC>>1,WAVPREC,(WAVPREC*3)>>2,0,0,(WAVPREC*5)>>2,WAVPREC<<1};
-static long wavemask8 = {WAVPREC-1,WAVPREC-1,(WAVPREC>>1)-1,(WAVPREC>>1)-1,WAVPREC-1,((WAVPREC*3)>>2)-1,WAVPREC>>1,WAVPREC-1};
-static long wavestart8 = {0,WAVPREC>>1,0,WAVPREC>>2,0,0,0,WAVPREC>>3};
-static float attackconst4 = {1/2.82624,1/2.25280,1/1.88416,1/1.59744};
-static float decrelconst4 = {1/39.28064,1/31.41608,1/26.17344,1/22.44608};
-void cellon (long i, long j, celltype *c, unsigned char iscarrier)
-{
- long frn, oct, toff;
- float f;
-
- frn = ((((long)adlibregi+0xb0)&3)<<8) + (long)adlibregi+0xa0;
- oct = ((((long)adlibregi+0xb0)>>2)&7);
- toff = (oct<<1) + ((frn>>9)&((frn>>8)|(((adlibreg8>>6)&1)^1)));
- if (!(adlibregj+0x20&16)) toff >>= 2;
-
- f = pow(2.0,(adlibregj+0x60>>4)+(toff>>2)-1)*attackconsttoff&3*recipsamp;
- c->a0 = .0377*f; c->a1 = 10.73*f+1; c->a2 = -17.57*f; c->a3 = 7.42*f;
- f = -7.4493*decrelconsttoff&3*recipsamp;
- c->decaymul = pow(2.0,f*pow(2.0,(adlibregj+0x60&15)+(toff>>2)));
- c->releasemul = pow(2.0,f*pow(2.0,(adlibregj+0x80&15)+(toff>>2)));
- c->wavemask = wavemaskadlibregj+0xe0&7;
- c->waveform = &wavtablewaveformadlibregj+0xe0&7;
- if (!(adlibreg1&0x20)) c->waveform = &wavtableWAVPREC;
- c->t = wavestartadlibregj+0xe0&7;
- c->flags = adlibregj+0x20;
- c->cellfunc = docell0;
- c->tinc = (float)(frn<<oct)*nfrqmuladlibregj+0x20&15;
- c->vol = pow(2.0,((float)(adlibregj+0x40&63) +
-		 (float)kslmuladlibregj+0x40>>6*ksloctfrn>>6) * -.125 - 14);
- c->sustain = pow(2.0,(float)(adlibregj+0x80>>4) * -.5);
- if (!iscarrier) c->amp = 0;
- c->mfb = pow(2.0,((adlibregi+0xc0>>1)&7)+5)*(WAVPREC/2048.0)*MFBFACTOR;
- if (!(adlibregi+0xc0&14)) c->mfb = 0;
- c->val = 0;
-}
-
-//This function (and bug fix) written by Chris Moeller
-void cellfreq (signed long i, signed long j, celltype *c)
-{
- long frn, oct;
-
- frn = ((((long)adlibregi+0xb0)&3)<<8) + (long)adlibregi+0xa0;
- oct = ((((long)adlibregi+0xb0)>>2)&7);
-
- c->tinc = (float)(frn<<oct)*nfrqmuladlibregj+0x20&15;
- c->vol = pow(2.0,((float)(adlibregj+0x40&63) +
-		 (float)kslmuladlibregj+0x40>>6*ksloctfrn>>6) * -.125 - 14);
-}
-
-static long initfirstime = 0;
-void adlibinit (long dasamplerate, long danumspeakers, long dabytespersample)
-{
- long i, j, frn, oct;
-
- memset((void *)adlibreg,0,sizeof(adlibreg));
- memset((void *)cell,0,sizeof(celltype)*MAXCELLS);
- memset((void *)rbuf,0,sizeof(rbuf));
- rend = 0; odrumstat = 0;
-
- for(i=0;i<MAXCELLS;i++)
- {
-	celli.cellfunc = docell4;
-	celli.amp = 0;
-	celli.vol = 0;
-	celli.t = 0;
-	celli.tinc = 0;
-	celli.wavemask = 0;
-	celli.waveform = &wavtableWAVPREC;
- }
-
- numspeakers = danumspeakers;
- bytespersample = dabytespersample;
-
- recipsamp = 1.0 / (float)dasamplerate;
- for(i=15;i>=0;i--) nfrqmuli = frqmuli*recipsamp*FRQSCALE*(WAVPREC/2048.0);
-
- if (!initfirstime)
- {
-	initfirstime = 1;
-
-	for(i=0;i<(WAVPREC>>1);i++)
-	{
-	 wavtablei =
-		wavtable(i<<1) +WAVPREC = (signed short)(16384*sin((float)((i<<1) )*PI*2/WAVPREC));
-	 wavtable(i<<1)+1+WAVPREC = (signed short)(16384*sin((float)((i<<1)+1)*PI*2/WAVPREC));
-	}
-	for(i=0;i<(WAVPREC>>3);i++)
-	{
-	 wavtablei+(WAVPREC<<1) = wavtablei+(WAVPREC>>3)-16384;
-	 wavtablei+((WAVPREC*17)>>3) = wavtablei+(WAVPREC>>2)+16384;
-	}
-
-	//table in book*8/3
-	ksl70 = 0; ksl71 = 24; ksl72 = 32; ksl73 = 37;
-	ksl74 = 40; ksl75 = 43; ksl76 = 45; ksl77 = 47;
-	ksl78 = 48; for(i=9;i<16;i++) ksl7i = i+41;
-	for(j=6;j>=0;j--)
-	 for(i=0;i<16;i++)
-	 {
-		oct = (long)kslj+1i-8; if (oct < 0) oct = 0;
-		kslji = (unsigned char)oct;
-	 }
- }
- else
- {
-	for(i=0;i<9;i++)
-	{
-	 frn = ((((long)adlibregi+0xb0)&3)<<8) + (long)adlibregi+0xa0;
-	 oct = ((((long)adlibregi+0xb0)>>2)&7);
-	 celli.tinc = (float)(frn<<oct)*nfrqmuladlibregmodulatorbasei+0x20&15;
-	}
- }
-}
-
-void adlib0 (long i, long v)
-{
- unsigned char tmp = adlibregi;
- adlibregi = v;
-
- if (i == 0xbd)
- {
-	if ((v&16) > (odrumstat&16)) //BassDrum
-	{
-	 cellon(6,16,&cell6,0);
-	 cellon(6,19,&cell15,1);
-	 cell15.vol *= 2;
-	}
-	if ((v&8) > (odrumstat&8)) //Snare
-	{
-	 cellon(16,20,&cell16,0);
-	 cell16.tinc *= 2*(nfrqmuladlibreg17+0x20&15 / nfrqmuladlibreg20+0x20&15);
-	 if (((adlibreg20+0xe0&7) >= 3) && ((adlibreg20+0xe0&7) <= 5)) cell16.vol = 0;
-	 cell16.vol *= 2;
-	}
-	if ((v&4) > (odrumstat&4)) //TomTom
-	{
-	 cellon(8,18,&cell8,0);
-	 cell8.vol *= 2;
-	}
-	if ((v&2) > (odrumstat&2)) //Cymbal
-	{
-	 cellon(17,21,&cell17,0);
-
-	 cell17.wavemask = wavemask5;
-	 cell17.waveform = &wavtablewaveform5;
-	 cell17.tinc *= 16; cell17.vol *= 2;
-
-	 //cell17.waveform = &wavtableWAVPREC; cell17.wavemask = 0;
-	 //if (((adlibreg21+0xe0&7) == 0) || ((adlibreg21+0xe0&7) == 6))
-	 // cell17.waveform = &wavtable(WAVPREC*7)>>2;
-	 //if (((adlibreg21+0xe0&7) == 2) || ((adlibreg21+0xe0&7) == 3))
-	 // cell17.waveform = &wavtable(WAVPREC*5)>>2;
-	}
-	if ((v&1) > (odrumstat&1)) //Hihat
-	{
-	 cellon(7,17,&cell7,0);
-	 if (((adlibreg17+0xe0&7) == 1) || ((adlibreg17+0xe0&7) == 4) ||
-		((adlibreg17+0xe0&7) == 5) || ((adlibreg17+0xe0&7) == 7)) cell7.vol = 0;
-	 if ((adlibreg17+0xe0&7) == 6) { cell7.wavemask = 0; cell7.waveform = &wavtable(WAVPREC*7)>>2; }
-	}
-
-	odrumstat = v;
- }
- else if (((unsigned)(i-0x40) < (unsigned)22) && ((i&7) < 6))
- {
-	if ((i&7) < 3) // Modulator
-	 cellfreq(base2celli-0x40,i-0x40,&cellbase2celli-0x40);
-	else // Carrier
-	 cellfreq(base2celli-0x40,i-0x40,&cellbase2celli-0x40+9);
- }
- else if ((unsigned)(i-0xa0) < (unsigned)9)
- {
-	cellfreq(i-0xa0,modulatorbasei-0xa0,&celli-0xa0);
-	cellfreq(i-0xa0,modulatorbasei-0xa0+3,&celli-0xa0+9);
- }
- else if ((unsigned)(i-0xb0) < (unsigned)9)
- {
-	if ((v&32) > (tmp&32))
-	{
-	 cellon(i-0xb0,modulatorbasei-0xb0,&celli-0xb0,0);
-	 cellon(i-0xb0,modulatorbasei-0xb0+3,&celli-0xb0+9,1);
-	}
-	else if ((v&32) < (tmp&32))
-	 celli-0xb0.cellfunc = celli-0xb0+9.cellfunc = docell2;
-	cellfreq(i-0xb0,modulatorbasei-0xb0,&celli-0xb0);
-	cellfreq(i-0xb0,modulatorbasei-0xb0+3,&celli-0xb0+9);
- }
-
- //outdata(i,v);
-}
-
-#ifdef USING_ASM
-static long fpuasm;
-static float fakeadd = 8388608.0+128.0;
-static _inline void clipit8 (float f, long a)
-{
- _asm
-	{
-	 mov edi, a
-		fld dword ptr f
-		fadd dword ptr fakeadd
-		fstp dword ptr fpuasm
-		mov eax, fpuasm
-		test eax, 0x007fff00
-		jz short skipit
-		shr eax, 16
-		xor eax, -1
-		skipit: mov byte ptr edi, al
-		}
-}
-
-static _inline void clipit16 (float f, long a)
-{
- _asm
-	{
-	 mov eax, a
-		fld dword ptr f
-		fist word ptr eax
-		cmp word ptr eax, 0x8000
-		jne short skipit2
-		fst dword ptr fpuasm
-		cmp fpuasm, 0x80000000
-		sbb word ptr eax, 0
-		skipit2: fstp st
-		}
-}
-#else
-static void clipit8(float f,unsigned char *a) {
- f/=256.0;
- f+=128.0;
- if (f>254.5) *a=255;
- else if (f<0.5) *a=0;
- else *a=f;
-}
-
-static void clipit16(float f,short *a) {
- if (f>32766.5) *a=32767;
- else if (f<-32767.5) *a=-32768;
- else *a=f;
-}
-#endif
-
-void adlibsetvolume(int i) {
- AMPSCALE=i;
-}
-
-void adlibgetsample (unsigned char *sndptr, long numbytes)
-{
- long i, j, k=0, ns, endsamples, rptrs, numsamples;
- celltype *cptr;
- float f;
- short *sndptr2=(short *)sndptr;
-
- numsamples = (numbytes>>(numspeakers+bytespersample-2));
-
- if (bytespersample == 1) f = AMPSCALE/256.0; else f = AMPSCALE;
- if (numspeakers == 1)
- {
-	nlvol0 = lvol0*f;
-	for(i=0;i<9;i++) rptri = &rbuf00;
-	rptrs = 1;
- }
- else
- {
-	rptrs = 0;
-	for(i=0;i<9;i++)
-	{
-	 if ((!i) || (lvoli != lvoli-1) || (rvoli != rvoli-1) ||
-		(lplci != lplci-1) || (rplci != rplci-1))
-	 {
-		nlvolrptrs = lvoli*f;
-		nrvolrptrs = rvoli*f;
-		nlplcrptrs = rend-std::min(std::max(lplci,0L),(long)FIFOSIZ);
-		nrplcrptrs = rend-std::min(std::max(rplci,0L),(long)FIFOSIZ);
-		rptrs++;
-	 }
-	 rptri = &rbufrptrs-10;
-	}
- }
-
-
- //CPU time used to be somewhat less when emulator was only mono!
- // Because of no delay fifos!
-
- for(ns=0;ns<numsamples;ns+=endsamples)
- {
-	endsamples = std::min(FIFOSIZ*2-rend,(long)FIFOSIZ);
-	endsamples = std::min(endsamples,numsamples-ns);
-
-	for(i=0;i<9;i++)
-	 nrptri = &rptrirend;
-	for(i=0;i<rptrs;i++)
-	 memset((void *)&rbufirend,0,endsamples*sizeof(float));
-
-	if (adlibreg0xbd&0x20)
-	{
-				//BassDrum (j=6)
-	 if (cell15.cellfunc != docell4)
-	 {
-		if (adlibreg0xc6&1)
-		{
-		 for(i=0;i<endsamples;i++)
-		 {
-			(cell15.cellfunc)((void *)&cell15,0.0);
-			nrptr6i += cell15.val;
-		 }
-		}
-		else
-		{
-		 for(i=0;i<endsamples;i++)
-		 {
-			(cell6.cellfunc)((void *)&cell6,cell6.val*cell6.mfb);
-			(cell15.cellfunc)((void *)&cell15,cell6.val*WAVPREC*MODFACTOR);
-			nrptr6i += cell15.val;
-		 }
-		}
-	 }
-
-				//Snare/Hihat (j=7), Cymbal/TomTom (j=8)
-	 if ((cell7.cellfunc != docell4) || (cell8.cellfunc != docell4) || (cell16.cellfunc != docell4) || (cell17.cellfunc != docell4))
-	 {
-		for(i=0;i<endsamples;i++)
-		{
-		 k = k*1664525+1013904223;
-		 (cell16.cellfunc)((void *)&cell16,k&((WAVPREC>>1)-1)); //Snare
-		 (cell7.cellfunc)((void *)&cell7,k&(WAVPREC-1)); //Hihat
-		 (cell17.cellfunc)((void *)&cell17,k&((WAVPREC>>3)-1)); //Cymbal
-		 (cell8.cellfunc)((void *)&cell8,0.0); //TomTom
-		 nrptr7i += cell7.val + cell16.val;
-		 nrptr8i += cell8.val + cell17.val;
-		}
-	 }
-	}
-	for(j=9-1;j>=0;j--)
-	{
-	 if ((adlibreg0xbd&0x20) && (j >= 6) && (j < 9)) continue;
-
-	 cptr = &cellj; k = j;
-	 if (adlibreg0xc0+k&1)
-	 {
-		if ((cptr9.cellfunc == docell4) && (cptr->cellfunc == docell4)) continue;
-		for(i=0;i<endsamples;i++)
-		{
-		 (cptr->cellfunc)((void *)cptr,cptr->val*cptr->mfb);
-		 (cptr->cellfunc)((void *)&cptr9,0);
-		 nrptrji += cptr9.val + cptr->val;
-		}
-	 }
-	 else
-	 {
-		if (cptr9.cellfunc == docell4) continue;
-		for(i=0;i<endsamples;i++)
-		{
-		 (cptr->cellfunc)((void *)cptr,cptr->val*cptr->mfb);
-		 (cptr9.cellfunc)((void *)&cptr9,cptr->val*WAVPREC*MODFACTOR);
-		 nrptrji += cptr9.val;
-		}
-	 }
-	}
-
-	if (numspeakers == 1)
-	{
-	 if (bytespersample == 1)
-	 {
-		for(i=endsamples-1;i>=0;i--)
-		 clipit8(nrptr0i*nlvol0,sndptr+1);
-	 }
-	 else
-	 {
-		for(i=endsamples-1;i>=0;i--)
-		 clipit16(nrptr0i*nlvol0,sndptr2+i);
-	 }
-	}
-	else
-	{
-	 memset((void *)snd,0,endsamples*sizeof(float)*2);
-	 for(j=0;j<rptrs;j++)
-	 {
-		for(i=0;i<endsamples;i++)
-		{
-		 snd(i<<1) += rbufj(nlplcj+i)&(FIFOSIZ*2-1)*nlvolj;
-		 snd(i<<1)+1 += rbufj(nrplcj+i)&(FIFOSIZ*2-1)*nrvolj;
-		}
-		nlplcj += endsamples;
-		nrplcj += endsamples;
-	 }
-
-	 if (bytespersample == 1)
-	 {
-		for(i=(endsamples<<1)-1;i>=0;i--)
-		 clipit8(sndi,sndptr+i);
-	 }
-	 else
-	 {
-		for(i=(endsamples<<1)-1;i>=0;i--)
-		 clipit16(sndi,sndptr2+i);
-	 }
-	}
-
-	sndptr = sndptr+(numspeakers*endsamples);
-	sndptr2 = sndptr2+(numspeakers*endsamples);
-	rend = ((rend+endsamples)&(FIFOSIZ*2-1));
- }
-}

audacious-plugins-3.6.2-gtk3.tar.bz2/src/adplug/core/adlibemu.h Deleted

@@ -1,26 +0,0 @@
-/*
- * ADLIBEMU.H
- * Copyright (C) 1998-2001 Ken Silverman
- * Ken Silverman's official web site: "http://www.advsys.net/ken"
- * 
- * 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
- */
-
-void adlibinit(long dasamplerate,long danumspeakers,long dabytespersample);
-void adlib0(long i,long v);
-void adlibgetsample(void *sndptr,long numbytes);
-void adlibsetvolume(int i);
-void randoinsts();
-extern float lvol9,rvol9,lplc9,rplc9;

audacious-plugins-3.6.2-gtk3.tar.bz2/src/adplug/core/adplug.cc Deleted

@@ -1,266 +0,0 @@
-/*
- * Adplug - Replayer for many OPL2/OPL3 audio file formats.
- * Copyright (C) 1999 - 2008 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
- *
- * adplug.cpp - CAdPlug utility class, by Simon Peter <dn.tlp@gmx.net>
- */
-
-#include <cstring>
-#include <string>
-#include <binfile.h>
-
-#include "adplug.h"
-#include "debug.h"
-
-/***** Replayer includes *****/
-
-#include "hsc.h"
-#include "amd.h"
-#include "a2m.h"
-#include "imf.h"
-#include "sng.h"
-#include "adtrack.h"
-#include "bam.h"
-#include "cmf.h"
-#include "d00.h"
-#include "dfm.h"
-#include "hsp.h"
-#include "ksm.h"
-#include "mad.h"
-#include "mid.h"
-#include "mkj.h"
-#include "cff.h"
-#include "dmo.h"
-#include "s3m.h"
-#include "dtm.h"
-#include "fmc.h"
-#include "mtk.h"
-#include "rad.h"
-#include "raw.h"
-#include "sa2.h"
-#include "bmf.h"
-#include "flash.h"
-#include "hybrid.h"
-#include "hyp.h"
-#include "psi.h"
-#include "rat.h"
-#include "lds.h"
-#include "u6m.h"
-#include "rol.h"
-#include "xsm.h"
-#include "dro.h"
-#include "dro2.h"
-#include "msc.h"
-#include "rix.h"
-#include "adl.h"
-#include "jbm.h"
-
-/***** Defines *****/
-
-#define ADPLUG_VERSION "1.6"
-
-/***** CAdPlug *****/
-
-// List of all players that come with the standard AdPlug distribution
-/*const CPlayerDesc
- CAdPlug::allplayers = {
- CPlayerDesc (ChscPlayer::factory, "HSC-Tracker", ".hsc\0"),
- CPlayerDesc (CsngPlayer::factory, "SNGPlay", ".sng\0"),
- CPlayerDesc (CimfPlayer::factory, "Apogee IMF", ".imf\0.wlf\0.adlib\0"),
- CPlayerDesc (Ca2mLoader::factory, "Adlib Tracker 2", ".a2m\0"),
- CPlayerDesc (CadtrackLoader::factory, "Adlib Tracker", ".sng\0"),
- CPlayerDesc (CamdLoader::factory, "AMUSIC", ".amd\0"),
- CPlayerDesc (CbamPlayer::factory, "Bob's Adlib Music", ".bam\0"),
- CPlayerDesc (CcmfPlayer::factory, "Creative Music File", ".cmf\0"),
- CPlayerDesc (Cd00Player::factory, "Packed EdLib", ".d00\0"),
- CPlayerDesc (CdfmLoader::factory, "Digital-FM", ".dfm\0"),
- CPlayerDesc (ChspLoader::factory, "HSC Packed", ".hsp\0"),
- CPlayerDesc (CksmPlayer::factory, "Ken Silverman Music", ".ksm\0"),
- CPlayerDesc (CmadLoader::factory, "Mlat Adlib Tracker", ".mad\0"),
- CPlayerDesc (CmidPlayer::factory, "MIDI", ".sci\0.laa\0"),
- CPlayerDesc (CmkjPlayer::factory, "MKJamz", ".mkj\0"),
- CPlayerDesc (CcffLoader::factory, "Boomtracker", ".cff\0"),
- CPlayerDesc (CdmoLoader::factory, "TwinTeam", ".dmo\0"),
- CPlayerDesc (Cs3mPlayer::factory, "Scream Tracker 3", ".s3m\0"),
- CPlayerDesc (CdtmLoader::factory, "DeFy Adlib Tracker", ".dtm\0"),
- CPlayerDesc (CfmcLoader::factory, "Faust Music Creator", ".sng\0"),
- CPlayerDesc (CmtkLoader::factory, "MPU-401 Trakker", ".mtk\0"),
- CPlayerDesc (CradLoader::factory, "Reality Adlib Tracker", ".rad\0"),
- CPlayerDesc (CrawPlayer::factory, "RdosPlay RAW", ".raw\0"),
- CPlayerDesc (Csa2Loader::factory, "Surprise! Adlib Tracker",
- ".sat\0.sa2\0"),
- CPlayerDesc (CxadbmfPlayer::factory, "BMF Adlib Tracker", ".xad\0"),
- CPlayerDesc (CxadflashPlayer::factory, "Flash", ".xad\0"),
- CPlayerDesc (CxadhybridPlayer::factory, "Hybrid", ".xad\0"),
- CPlayerDesc (CxadhypPlayer::factory, "Hypnosis", ".xad\0"),
- CPlayerDesc (CxadpsiPlayer::factory, "PSI", ".xad\0"),
- CPlayerDesc (CxadratPlayer::factory, "rat", ".xad\0"),
- CPlayerDesc (CldsPlayer::factory, "LOUDNESS Sound System", ".lds\0"),
- CPlayerDesc (Cu6mPlayer::factory, "Ultima 6 Music", ".m\0"),
- CPlayerDesc (CrolPlayer::factory, "Adlib Visual Composer", ".rol\0"),
- CPlayerDesc (CxsmPlayer::factory, "eXtra Simple Music", ".xsm\0"),
- CPlayerDesc (CdroPlayer::factory, "DOSBox Raw OPL v0.1", ".dro\0"),
- CPlayerDesc (Cdro2Player::factory, "DOSBox Raw OPL v2.0", ".dro\0"),
- CPlayerDesc (CmscPlayer::factory, "Adlib MSC Player", ".msc\0"),
- CPlayerDesc (CrixPlayer::factory, "Softstar RIX OPL Music", ".rix\0"),
- CPlayerDesc (CadlPlayer::factory, "Westwood ADL", ".adl\0"),
- CPlayerDesc (CjbmPlayer::factory, "Johannes Bjerregaard", ".jbm\0"),
- CPlayerDesc ()
-};
-*/
-const
- CPlayers &
-CAdPlug::init_players (const CPlayerDesc pd)
-{
- static CPlayers initplayers;
- unsigned int i;
-
- for (i = 0; pdi.factory; i++)
- initplayers.push_back (&pdi);
-
- return initplayers;
-}
-
-const CPlayers& CAdPlug::getPlayers() {
- static const CPlayerDesc
- _allplayers = {
- CPlayerDesc (ChscPlayer::factory, "HSC-Tracker", ".hsc\0"),
- CPlayerDesc (CsngPlayer::factory, "SNGPlay", ".sng\0"),
- CPlayerDesc (CimfPlayer::factory, "Apogee IMF", ".imf\0.wlf\0.adlib\0"),
- CPlayerDesc (Ca2mLoader::factory, "Adlib Tracker 2", ".a2m\0"),
- CPlayerDesc (CadtrackLoader::factory, "Adlib Tracker", ".sng\0"),
- CPlayerDesc (CamdLoader::factory, "AMUSIC", ".amd\0"),
- CPlayerDesc (CbamPlayer::factory, "Bob's Adlib Music", ".bam\0"),
- CPlayerDesc (CcmfPlayer::factory, "Creative Music File", ".cmf\0"),
- CPlayerDesc (Cd00Player::factory, "Packed EdLib", ".d00\0"),
- CPlayerDesc (CdfmLoader::factory, "Digital-FM", ".dfm\0"),
- CPlayerDesc (ChspLoader::factory, "HSC Packed", ".hsp\0"),
- CPlayerDesc (CksmPlayer::factory, "Ken Silverman Music", ".ksm\0"),
- CPlayerDesc (CmadLoader::factory, "Mlat Adlib Tracker", ".mad\0"),
- CPlayerDesc (CmidPlayer::factory, "MIDI", ".sci\0.laa\0"),
- CPlayerDesc (CmkjPlayer::factory, "MKJamz", ".mkj\0"),
- CPlayerDesc (CcffLoader::factory, "Boomtracker", ".cff\0"),
- CPlayerDesc (CdmoLoader::factory, "TwinTeam", ".dmo\0"),
- CPlayerDesc (Cs3mPlayer::factory, "Scream Tracker 3", ".s3m\0"),
- CPlayerDesc (CdtmLoader::factory, "DeFy Adlib Tracker", ".dtm\0"),
- CPlayerDesc (CfmcLoader::factory, "Faust Music Creator", ".sng\0"),
- CPlayerDesc (CmtkLoader::factory, "MPU-401 Trakker", ".mtk\0"),
- CPlayerDesc (CradLoader::factory, "Reality Adlib Tracker", ".rad\0"),
- CPlayerDesc (CrawPlayer::factory, "RdosPlay RAW", ".raw\0"),
- CPlayerDesc (Csa2Loader::factory, "Surprise! Adlib Tracker",
- ".sat\0.sa2\0"),
- CPlayerDesc (CxadbmfPlayer::factory, "BMF Adlib Tracker", ".xad\0"),
- CPlayerDesc (CxadflashPlayer::factory, "Flash", ".xad\0"),
- CPlayerDesc (CxadhybridPlayer::factory, "Hybrid", ".xad\0"),
- CPlayerDesc (CxadhypPlayer::factory, "Hypnosis", ".xad\0"),
- CPlayerDesc (CxadpsiPlayer::factory, "PSI", ".xad\0"),
- CPlayerDesc (CxadratPlayer::factory, "rat", ".xad\0"),
- CPlayerDesc (CldsPlayer::factory, "LOUDNESS Sound System", ".lds\0"),
- CPlayerDesc (Cu6mPlayer::factory, "Ultima 6 Music", ".m\0"),
- CPlayerDesc (CrolPlayer::factory, "Adlib Visual Composer", ".rol\0"),
- CPlayerDesc (CxsmPlayer::factory, "eXtra Simple Music", ".xsm\0"),
- CPlayerDesc (CdroPlayer::factory, "DOSBox Raw OPL v0.1", ".dro\0"),
- CPlayerDesc (Cdro2Player::factory, "DOSBox Raw OPL v2.0", ".dro\0"),
- CPlayerDesc (CmscPlayer::factory, "Adlib MSC Player", ".msc\0"),
- CPlayerDesc (CrixPlayer::factory, "Softstar RIX OPL Music", ".rix\0"),
- CPlayerDesc (CadlPlayer::factory, "Westwood ADL", ".adl\0"),
- CPlayerDesc (CjbmPlayer::factory, "Johannes Bjerregaard", ".jbm\0"),
- CPlayerDesc ()
- };
- static CPlayers players = CAdPlug::init_players(_allplayers);
- return players;
-}
-
-CAdPlugDatabase *
- CAdPlug::database = 0;
-
-CPlayer *
-CAdPlug::factory (VFSFile & fd, Copl * opl, const CPlayers & pl,
- const CFileProvider & fp)
-{
- CPlayer *p;
- CPlayers::const_iterator i;
- unsigned int j;
-
- // Try a direct hit by file extension
- for (i = pl.begin (); i != pl.end (); i++)
- {
- for (j = 0; (*i)->get_extension (j); j++)
- {
- if (fp.extension (fd.filename (), (*i)->get_extension (j)))
- {
- AdPlug_LogWrite ("Trying direct hit: %s\n", (*i)->filetype.c_str ());
-
- if ((p = (*i)->factory (opl)))
- {
- if (p->load (fd, fp))
- {
- AdPlug_LogWrite ("got it!\n");
- AdPlug_LogWrite ("--- CAdPlug::factory ---\n");
- return p;
- }
-
- delete p;
-
- if (fd.fseek (0, VFS_SEEK_SET) < 0)
- return 0;
- }
- }
- }
- }
-
-#if 0
- // Try all players, one by one
- for (i = pl.begin (); i != pl.end (); i++)
- {
- AdPlug_LogWrite ("Trying: %s\n", (*i)->filetype.c_str ());
- if ((p = (*i)->factory (opl)))
- if (p->load (fd, fp))
- {
- AdPlug_LogWrite ("got it!\n");
- AdPlug_LogWrite ("--- CAdPlug::factory ---\n");
- return p;
- }
- else
- delete p;
- }
-#endif
-
- // Unknown file
- AdPlug_LogWrite ("End of list!\n");
- AdPlug_LogWrite ("--- CAdPlug::factory ---\n");
- return 0;
-}
-
-void
-CAdPlug::set_database (CAdPlugDatabase * db)
-{
- database = db;
-}
-
-std::string CAdPlug::get_version ()
-{
- return std::string (ADPLUG_VERSION);
-}
-
-void
-CAdPlug::debug_output (const std::string & filename)
-{
- AdPlug_LogFile (filename.c_str ());
- AdPlug_LogWrite ("CAdPlug::debug_output(\"%s\"): Redirected.\n",
- filename.c_str ());
-}

audacious-plugins-3.6.2-gtk3.tar.bz2/src/adplug/core/adplug.h Deleted

@@ -1,54 +0,0 @@
-/*
- * AdPlug - Replayer for many OPL2/OPL3 audio file formats.
- * Copyright (C) 1999 - 2003 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
- *
- * adplug.h - AdPlug main header file, by Simon Peter <dn.tlp@gmx.net>
- */
-
-#ifndef H_ADPLUG_ADPLUG
-#define H_ADPLUG_ADPLUG
-
-#include <string>
-
-#include "player.h"
-#include "opl.h"
-#include "fprovide.h"
-#include "players.h"
-#include "database.h"
-
-class CAdPlug
-{
- friend CPlayer::CPlayer(Copl *newopl);
-
-public:
- static const CPlayers& getPlayers();
-
- static CPlayer *factory(VFSFile &fd, Copl *opl,
- const CPlayers &pl = getPlayers(),
-			 const CFileProvider &fp = CProvider_Filesystem());
-
- static void set_database(CAdPlugDatabase *db);
- static std::string get_version();
- static void debug_output(const std::string &filename);
-
-private:
- static CAdPlugDatabase *database;
-
- static const CPlayers &init_players(const CPlayerDesc pd);
-};
-
-#endif

audacious-plugins-3.6.2-gtk3.tar.bz2/src/adplug/core/adtrack.cc Deleted

@@ -1,238 +0,0 @@
-/*
- * Adplug - Replayer for many OPL2/OPL3 audio file formats.
- * Copyright (C) 1999 - 2003 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
- *
- * adtrack.cpp - Adlib Tracker 1.0 Loader by Simon Peter <dn.tlp@gmx.net>
- *
- * NOTES:
- * The original Adlib Tracker 1.0 is behaving a little different from the
- * official spec: The 'octave' integer from the instrument file is stored
- * "minus 1" from the actual value, underflowing from 0 to 0xffff.
- *
- * I also noticed that my player is playing everything transposed a few tones
- * higher than the original tracker. As far as i can see, my player perfectly
- * follows the official spec, so it "must" be the tracker that does something
- * wrong here...
- */
-
-#include <stdlib.h>
-#include <string.h>
-
-#include "adtrack.h"
-#include "debug.h"
-
-/*** Public methods ***/
-
-CPlayer *
-CadtrackLoader::factory (Copl * newopl)
-{
- return new CadtrackLoader (newopl);
-}
-
-bool
-CadtrackLoader::load (VFSFile & fd, const CFileProvider & fp)
-{
- binistream *f = fp.open (fd);
- if (!f)
- return false;
- binistream *instf;
- char note2;
- unsigned short rwp;
- unsigned char chp, octave, pnote = 0;
- int i, j;
- AdTrackInst myinst;
- std::string filename (fd.filename ());
-
- // file validation
- if (!fp.extension (filename, ".sng") || fp.filesize (f) != 36000)
- {
- fp.close (f);
- return false;
- }
-
- // check for instruments file
- std::string instfilename (filename, 0, filename.find_last_of ('.'));
- instfilename += ".ins";
- AdPlug_LogWrite ("CadtrackLoader::load(,\"%s\"): Checking for \"%s\"...\n",
- filename.c_str (), instfilename.c_str ());
-
- VFSFile instfd (instfilename.c_str (), "rb");
- instf = fp.open (instfd);
- if (!instf || fp.filesize (instf) != 468)
- {
- fp.close (f);
- return false;
- }
-
- // give CmodPlayer a hint on what we're up to
- realloc_patterns (1, 1000, 9);
- realloc_instruments (9);
- realloc_order (1);
- init_trackord ();
- flags = NoKeyOn;
- (*order) = 0;
- length = 1;
- restartpos = 0;
- bpm = 120;
- initspeed = 3;
-
- // load instruments from instruments file
- for (i = 0; i < 9; i++)
- {
- for (j = 0; j < 2; j++)
- {
- myinst.opj.appampmod = instf->readInt (2);
- myinst.opj.appvib = instf->readInt (2);
- myinst.opj.maintsuslvl = instf->readInt (2);
- myinst.opj.keybscale = instf->readInt (2);
- myinst.opj.octave = instf->readInt (2);
- myinst.opj.freqrisevollvldn = instf->readInt (2);
- myinst.opj.softness = instf->readInt (2);
- myinst.opj.attack = instf->readInt (2);
- myinst.opj.decay = instf->readInt (2);
- myinst.opj.release = instf->readInt (2);
- myinst.opj.sustain = instf->readInt (2);
- myinst.opj.feedback = instf->readInt (2);
- myinst.opj.waveform = instf->readInt (2);
- }
- convert_instrument (i, &myinst);
- }
- fp.close (instf);
-
- // load file
- for (rwp = 0; rwp < 1000; rwp++)
- for (chp = 0; chp < 9; chp++)
- {
- // read next record
- f->readString (note, 2);
- octave = f->readInt (1);
- f->ignore ();
- switch (*note)
- {
- case 'C':
- if (note1 == '#')
- pnote = 2;
- else
- pnote = 1;
- break;
- case 'D':
- if (note1 == '#')
- pnote = 4;
- else
- pnote = 3;
- break;
- case 'E':
- pnote = 5;
- break;
- case 'F':
- if (note1 == '#')
- pnote = 7;
- else
- pnote = 6;
- break;
- case 'G':
- if (note1 == '#')
- pnote = 9;
- else
- pnote = 8;
- break;
- case 'A':
- if (note1 == '#')
- pnote = 11;
- else
- pnote = 10;
- break;
- case 'B':
- pnote = 12;
- break;
- case '\0':
- if (note1 == '\0')
- trackschprwp.note = 127;
- else
- {
- fp.close (f);
- return false;
- }
- break;
- default:
- fp.close (f);
- return false;
- }
- if ((*note) != '\0')
- {
- trackschprwp.note = pnote + (octave * 12);
- trackschprwp.inst = chp + 1;
- }
- }
-
- fp.close (f);
- rewind (0);
- return true;
-}
-
-float
-CadtrackLoader::getrefresh ()
-{
- return 18.2f;
-}
-
-/*** Private methods ***/
-
-void
-CadtrackLoader::convert_instrument (unsigned int n, AdTrackInst * i)
-{
- // Carrier "Amp Mod / Vib / Env Type / KSR / Multiple" register
- instn.data2 = i->opCarrier.appampmod ? 1 << 7 : 0;
- instn.data2 += i->opCarrier.appvib ? 1 << 6 : 0;
- instn.data2 += i->opCarrier.maintsuslvl ? 1 << 5 : 0;
- instn.data2 += i->opCarrier.keybscale ? 1 << 4 : 0;
- instn.data2 += (i->opCarrier.octave + 1) & 0xffff; // Bug in original tracker
- // Modulator...
- instn.data1 = i->opModulator.appampmod ? 1 << 7 : 0;
- instn.data1 += i->opModulator.appvib ? 1 << 6 : 0;
- instn.data1 += i->opModulator.maintsuslvl ? 1 << 5 : 0;
- instn.data1 += i->opModulator.keybscale ? 1 << 4 : 0;
- instn.data1 += (i->opModulator.octave + 1) & 0xffff; // Bug in original tracker
-
- // Carrier "Key Scaling / Level" register
- instn.data10 = (i->opCarrier.freqrisevollvldn & 3) << 6;
- instn.data10 += i->opCarrier.softness & 63;
- // Modulator...
- instn.data9 = (i->opModulator.freqrisevollvldn & 3) << 6;
- instn.data9 += i->opModulator.softness & 63;
-
- // Carrier "Attack / Decay" register
- instn.data4 = (i->opCarrier.attack & 0x0f) << 4;
- instn.data4 += i->opCarrier.decay & 0x0f;
- // Modulator...
- instn.data3 = (i->opModulator.attack & 0x0f) << 4;
- instn.data3 += i->opModulator.decay & 0x0f;
-
- // Carrier "Release / Sustain" register
- instn.data6 = (i->opCarrier.release & 0x0f) << 4;
- instn.data6 += i->opCarrier.sustain & 0x0f;
- // Modulator...
- instn.data5 = (i->opModulator.release & 0x0f) << 4;
- instn.data5 += i->opModulator.sustain & 0x0f;
-
- // Channel "Feedback / Connection" register
- instn.data0 = (i->opCarrier.feedback & 7) << 1;
-
- // Carrier/Modulator "Wave Select" registers
- instn.data8 = i->opCarrier.waveform & 3;
- instn.data7 = i->opModulator.waveform & 3;
-}

audacious-plugins-3.6.2-gtk3.tar.bz2/src/adplug/core/adtrack.h Deleted

@@ -1,53 +0,0 @@
-/*
- * Adplug - Replayer for many OPL2/OPL3 audio file formats.
- * Copyright (C) 1999 - 2003 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
- *
- * adtrack.h - Adlib Tracker 1.0 Loader by Simon Peter <dn.tlp@gmx.net>
- */
-
-#include "protrack.h"
-
-class CadtrackLoader: public CmodPlayer
-{
-public:
- static CPlayer *factory(Copl *newopl);
-
-	CadtrackLoader(Copl *newopl)
-		: CmodPlayer(newopl)
-	{ };
-
-	bool load(VFSFile &fd, const CFileProvider &fp);
-	float getrefresh();
-
-	std::string gettype()
-	{ return std::string("Adlib Tracker 1.0"); };
-	unsigned int getinstruments()
-	{ return 9; };
-
-private:
- enum Operators {Carrier = 1, Modulator = 0};
-
-	typedef struct {
-	 struct {
-	 unsigned short appampmod, appvib, maintsuslvl, keybscale, octave,
-	 freqrisevollvldn, softness, attack, decay, release, sustain,
-	 feedback, waveform;
-	 } op2;
-	} AdTrackInst;
-
-	void convert_instrument(unsigned int n, AdTrackInst *i);
-};

audacious-plugins-3.6.2-gtk3.tar.bz2/src/adplug/core/amd.cc Deleted

@@ -1,231 +0,0 @@
-/*
- * 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
- *
- * amd.cpp - AMD Loader by Simon Peter <dn.tlp@gmx.net>
- */
-
-#include <string.h>
-
-#include "amd.h"
-#include "debug.h"
-
-CPlayer *
-CamdLoader::factory (Copl * newopl)
-{
- return new CamdLoader (newopl);
-}
-
-bool
-CamdLoader::load (VFSFile & fd, const CFileProvider & fp)
-{
- binistream *f = fp.open (fd);
- if (!f)
- return false;
- struct
- {
- char id9;
- unsigned char version;
- } header;
- int i, j, k, t, numtrax, maxi = 0;
- unsigned char buf, buf2, buf3;
- const unsigned char convfx10 = { 0, 1, 2, 9, 17, 11, 13, 18, 3, 14 };
- const unsigned char convvol64 = {
- 0, 0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7, 8, 9, 9, 0xa, 0xa, 0xb,
- 0xc, 0xc, 0xd, 0xe, 0xe, 0xf, 0x10, 0x10, 0x11, 0x12, 0x13, 0x14, 0x14,
- 0x15, 0x16, 0x17, 0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f, 0x21,
- 0x22, 0x23, 0x25, 0x26, 0x28, 0x29, 0x2b, 0x2d, 0x2e, 0x30, 0x32, 0x35,
- 0x37, 0x3a, 0x3c, 0x3f
- };
-
- // file validation section
- if (fp.filesize (f) < 1072)
- {
- fp.close (f);
- return false;
- }
- f->seek (1062);
- f->readString (header.id, 9);
- header.version = f->readInt (1);
- if (strncmp (header.id, "<o\xefQU\xeeRoR", 9) &&
- strncmp (header.id, "MaDoKaN96", 9))
- {
- fp.close (f);
- return false;
- }
-
- // load section
- memset (inst, 0, 26 * sizeof (inst0)); // memset (inst, 0, sizeof (inst));
- f->seek (0);
- f->readString (songname, sizeof (songname));
- f->readString (author, sizeof (author));
- for (i = 0; i < 26; i++)
- {
- f->readString (instnamei, 23);
- for (j = 0; j < 11; j++)
- insti.dataj = f->readInt (1);
- }
- length = f->readInt (1);
- nop = f->readInt (1) + 1;
- for (i = 0; i < 128; i++)
- orderi = f->readInt (1);
- f->seek (10, binio::Add);
- if (header.version == 0x10)
- { // unpacked module
- maxi = nop * 9;
- for (i = 0; i < 64 * 9; i++)
- trackordi / 9i % 9 = i + 1;
- t = 0;
- while (!f->ateof ())
- {
- for (j = 0; j < 64; j++)
- for (i = t; i < t + 9; i++)
- {
- buf = f->readInt (1);
- tracksij.param2 = (buf & 127) % 10;
- tracksij.param1 = (buf & 127) / 10;
- buf = f->readInt (1);
- tracksij.inst = buf >> 4;
- tracksij.command = buf & 0x0f;
- buf = f->readInt (1);
- if (buf >> 4) // fix bug in AMD save routine
- tracksij.note = ((buf & 14) >> 1) * 12 + (buf >> 4);
- else
- tracksij.note = 0;
- tracksij.inst += (buf & 1) << 4;
- }
- t += 9;
- }
- }
- else
- { // packed module
- for (i = 0; i < nop; i++)
- for (j = 0; j < 9; j++)
- trackordij = f->readInt (2) + 1;
- numtrax = f->readInt (2);
- for (k = 0; k < numtrax; k++)
- {
- i = f->readInt (2);
- if (i > 575)
- i = 575; // fix corrupted modules
- maxi = (i + 1 > maxi ? i + 1 : maxi);
- j = 0;
- do
- {
- buf = f->readInt (1);
- if (buf & 128)
- {
- for (t = j; t < j + (buf & 127) && t < 64; t++)
- {
- tracksit.command = 0;
- tracksit.inst = 0;
- tracksit.note = 0;
- tracksit.param1 = 0;
- tracksit.param2 = 0;
- }
- j += buf & 127;
- continue;
- }
- tracksij.param2 = buf % 10;
- tracksij.param1 = buf / 10;
- buf = f->readInt (1);
- tracksij.inst = buf >> 4;
- tracksij.command = buf & 0x0f;
- buf = f->readInt (1);
- if (buf >> 4) // fix bug in AMD save routine
- tracksij.note = ((buf & 14) >> 1) * 12 + (buf >> 4);
- else
- tracksij.note = 0;
- tracksij.inst += (buf & 1) << 4;
- j++;
- } while (j < 64);
- }
- }
- fp.close (f);
-
- // convert to protracker replay data
- bpm = 50;
- restartpos = 0;
- flags = Decimal;
- for (i = 0; i < 26; i++)
- { // convert instruments
- buf = insti.data0;
- buf2 = insti.data1;
- insti.data0 = insti.data10;
- insti.data1 = buf;
- buf = insti.data2;
- insti.data2 = insti.data5;
- buf3 = insti.data3;
- insti.data3 = buf;
- buf = insti.data4;
- insti.data4 = insti.data7;
- insti.data5 = buf3;
- buf3 = insti.data6;
- insti.data6 = insti.data8;
- insti.data7 = buf;
- insti.data8 = insti.data9;
- insti.data9 = buf2;
- insti.data10 = buf3;
- for (j = 0; j < 23; j++) // convert names
- if (instnameij == '\xff')
- instnameij = '\x20';
- }
- for (i = 0; i < maxi; i++) // convert patterns
- for (j = 0; j < 64; j++)
- {
- tracksij.command = convfxtracksij.command;
- // extended command
- if (tracksij.command == 14)
- {
- if (tracksij.param1 == 2)
- {
- tracksij.command = 10;
- tracksij.param1 = tracksij.param2;
- tracksij.param2 = 0;
- }
-
- if (tracksij.param1 == 3)
- {
- tracksij.command = 10;
- tracksij.param1 = 0;
- }
- }
-
- // fix volume
- if (tracksij.command == 17)
- {
- int vol = convvoltracksij.param1 * 10 + tracksij.param2;
-
- if (vol > 63)
- vol = 63;
- tracksij.param1 = vol / 10;
- tracksij.param2 = vol % 10;
- }
- }
-
- rewind (0);
- return true;
-}
-
-float
-CamdLoader::getrefresh ()
-{
- if (tempo)
- return (float) (tempo);
- else
- return 18.2f;
-}

audacious-plugins-3.6.2-gtk3.tar.bz2/src/adplug/core/amd.h Deleted

@@ -1,49 +0,0 @@
-/*
- * Adplug - Replayer for many OPL2/OPL3 audio file formats.
- * Copyright (C) 1999 - 2003 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
- *
- * amd.h - AMD Loader by Simon Peter <dn.tlp@gmx.net>
- */
-
-#include "protrack.h"
-
-class CamdLoader: public CmodPlayer
-{
-public:
- static CPlayer *factory(Copl *newopl);
-
-	CamdLoader(Copl *newopl)
-		: CmodPlayer(newopl)
-	{ };
-
-	bool load(VFSFile &fd, const CFileProvider &fp);
-	float getrefresh();
-
-	std::string gettype()
-	{ return std::string("AMUSIC Adlib Tracker"); };
-	std::string gettitle()
-	{ return std::string(songname,0,24); };
-	std::string getauthor()
-	{ return std::string(author,0,24); };
-	unsigned int getinstruments()
-	{ return 26; };
-	std::string getinstrument(unsigned int n)
-	{ return std::string(instnamen,0,23); };
-
-private:
-	char songname24,author24,instname2623;
-};

audacious-plugins-3.6.2-gtk3.tar.bz2/src/adplug/core/bam.cc Deleted

@@ -1,244 +0,0 @@
-/*
- * Adplug - Replayer for many OPL2/OPL3 audio file formats.
- * Copyright (C) 1999 - 2003 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
- *
- * bam.cpp - Bob's Adlib Music Player, by Simon Peter <dn.tlp@gmx.net>
- *
- * NOTES:
- * In my player, the loop counter is stored with the label. This can be
- * dangerous for some situations (see below), but there shouldn't be any BAM
- * files triggering this situation.
- *
- * From SourceForge Bug #476088:
- * -----------------------------
- * Using just one loop counter for each label, my player can't
- * handle files that loop twice to the same label (if that's at
- * all possible with BAM). Imagine the following situation:
- * 
- * ... * ---- <- * ---- <- * ...
- * ^ ^ ^ ^ ^ ^ ^
- * | | | | | | |
- * +---|----+-----|-----+-----|----+--- normal song data
- * +----------|-----------|-------- label 1
- * +-----------+-------- loop points to label 1
- * 
- * both loop points loop to the same label. Storing the loop 
- * count with the label would cause chaos with the counter, 
- * when the player executes the inner jump.
- * ------------------
- * Not to worry. my reference implementation of BAM does not
- * support the multiple loop situation you describe, and
- * neither do any BAM-creation programs. Then both loops point
- * to the same label, the inner loop's counter is just allowed
- * to clobber the outer loop's counter. No stack is neccisary.
- */
-
-#include <string.h>
-#include "bam.h"
-
-const unsigned short
- CbamPlayer::freq = { 172, 182, 193, 205, 217, 230, 243, 258, 274,
- 290, 307, 326, 345, 365, 387, 410, 435, 460, 489, 517, 547, 580, 614, 651,
- 1369, 1389, 1411,
- 1434, 1459, 1484, 1513, 1541, 1571, 1604, 1638, 1675, 2393, 2413, 2435,
- 2458, 2483, 2508,
- 2537, 2565, 2595, 2628, 2662, 2699, 3417, 3437, 3459, 3482, 3507, 3532,
- 3561, 3589, 3619,
- 3652, 3686, 3723, 4441, 4461, 4483, 4506, 4531, 4556, 4585, 4613, 4643,
- 4676, 4710, 4747,
- 5465, 5485, 5507, 5530, 5555, 5580, 5609, 5637, 5667, 5700, 5734, 5771,
- 6489, 6509, 6531,
- 6554, 6579, 6604, 6633, 6661, 6691, 6724, 6758, 6795, 7513, 7533, 7555,
- 7578, 7603, 7628,
- 7657, 7685, 7715, 7748, 7782, 7819, 7858, 7898, 7942, 7988, 8037, 8089,
- 8143, 8191, 8191,
- 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191, 8191
-};
-
-CPlayer *
-CbamPlayer::factory (Copl * newopl)
-{
- return new CbamPlayer (newopl);
-}
-
-bool
-CbamPlayer::load (VFSFile & fd, const CFileProvider & fp)
-{
- binistream *f = fp.open (fd);
- if (!f)
- return false;
- char id4;
- unsigned int i;
-
- size = fp.filesize (f) - 4; // filesize minus header
- f->readString (id, 4);
- if (strncmp (id, "CBMF", 4))
- {
- fp.close (f);
- return false;
- }
-
- song = new unsigned charsize;
- for (i = 0; i < size; i++)
- songi = f->readInt (1);
-
- fp.close (f);
- rewind (0);
- return true;
-}
-
-bool
-CbamPlayer::update ()
-{
- unsigned char cmd, c;
-
- if (del)
- {
- del--;
- return !songend;
- }
-
- if (pos >= size)
- { // EOF detection
- pos = 0;
- songend = true;
- }
-
- while (songpos < 128)
- {
- cmd = songpos & 240;
- c = songpos & 15;
- switch (cmd)
- {
- case 0: // stop song
- pos = 0;
- songend = true;
- break;
- case 16: // start note
- if (c < 9)
- {
- opl->write (0xa0 + c, freqsong++pos & 255);
- opl->write (0xb0 + c, (freqsongpos >> 8) + 32);
- }
- else
- pos++;
- pos++;
- break;
- case 32: // stop note
- if (c < 9)
- opl->write (0xb0 + c, 0);
- pos++;
- break;
- case 48: // define instrument
- if (c < 9)
- {
- opl->write (0x20 + op_tablec, songpos + 1);
- opl->write (0x23 + op_tablec, songpos + 2);
- opl->write (0x40 + op_tablec, songpos + 3);
- opl->write (0x43 + op_tablec, songpos + 4);
- opl->write (0x60 + op_tablec, songpos + 5);
- opl->write (0x63 + op_tablec, songpos + 6);
- opl->write (0x80 + op_tablec, songpos + 7);
- opl->write (0x83 + op_tablec, songpos + 8);
- opl->write (0xe0 + op_tablec, songpos + 9);
- opl->write (0xe3 + op_tablec, songpos + 10);
- opl->write (0xc0 + c, songpos + 11);
- }
- pos += 12;
- break;
- case 80: // set label
- labelc.target = ++pos;
- labelc.defined = true;
- break;
- case 96: // jump
- if (labelc.defined)
- switch (songpos + 1)
- {
- case 254: // infinite loop
- if (labelc.defined)
- {
- pos = labelc.target;
- songend = true;
- break;
- }
- // fall through...
- case 255: // chorus
- if (!chorus && labelc.defined)
- {
- chorus = true;
- gosub = pos + 2;
- pos = labelc.target;
- break;
- }
- // fall through...
- case 0: // end of loop
- pos += 2;
- break;
- default: // finite loop
- if (!labelc.count)
- { // loop elapsed
- labelc.count = 255;
- pos += 2;
- break;
- }
- if (labelc.count < 255) // loop defined
- labelc.count--;
- else // loop undefined
- labelc.count = songpos + 1 - 1;
- pos = labelc.target;
- break;
- }
- break;
- case 112: // end of chorus
- if (chorus)
- {
- pos = gosub;
- chorus = false;
- }
- else
- pos++;
- break;
- default: // reserved command (skip)
- pos++;
- break;
- }
- }
- if (songpos >= 128)
- { // wait
- del = songpos - 127;
- pos++;
- }
- return !songend;
-}
-
-void
-CbamPlayer::rewind (int subsong)
-{
- int i;
-
- pos = 0;
- songend = false;
- del = 0;
- gosub = 0;
- chorus = false;
- memset (label, 0, sizeof (label));
- label0.defined = true;
- for (i = 0; i < 16; i++)
- labeli.count = 255; // 255 = undefined
- opl->init ();
- opl->write (1, 32);
-}

audacious-plugins-3.6.2-gtk3.tar.bz2/src/adplug/core/bam.h Deleted

@@ -1,56 +0,0 @@
-/*
- * Adplug - Replayer for many OPL2/OPL3 audio file formats.
- * Copyright (C) 1999 - 2003 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
- *
- * bam.h - Bob's Adlib Music Player, by Simon Peter <dn.tlp@gmx.net>
- */
-
-#include "player.h"
-
-class CbamPlayer: public CPlayer
-{
-public:
- static CPlayer *factory(Copl *newopl);
-
-	CbamPlayer(Copl *newopl)
-		: CPlayer(newopl), song(0)
-	{ };
-	~CbamPlayer()
-	{ if(song) delete song; };
-
-	bool load(VFSFile &fd, const CFileProvider &fp);
-	bool update();
-	void rewind(int subsong);
-	float getrefresh()
-	{ return 25.0f; };
-
-	std::string gettype()
-	{ return std::string("Bob's Adlib Music"); };
-
-private:
-	static const unsigned short freq;
-
-	unsigned char	*song, del;
-	unsigned long	pos, size, gosub;
-	bool		songend, chorus;
-
-	struct {
-		unsigned long	target;
-		bool		defined;
-		unsigned char	count;
-	} label16;
-};

audacious-plugins-3.6.2-gtk3.tar.bz2/src/adplug/core/binio_virtual.h Deleted

@@ -1,90 +0,0 @@
-/*
- * Copyright (c) 2006 William Pitcock <nenolod -at- atheme.org>
- * This code is in the public domain.
- */
-
-#ifndef __BINIO_VIRTUAL__
-#define __BINIO_VIRTUAL__
-
-#include <binio.h>
-#include <stdio.h>
-
-#include <libaudcore/vfs.h>
-
-class vfsistream : public binistream {
-private:
-	VFSFile *fd = nullptr;
-	VFSFile own;
-
-public:
-	vfsistream(VFSFile *fd = nullptr) :
-		fd(fd) {}
-
-	void open(const char *file) {
-		if ((own = VFSFile(file, "r")))
-			fd = &own;
-		else
-			err |= NotFound;
-	}
-
-	void open(std::string &file) { open(file.c_str()); }
-
-	vfsistream(const char *file) { open(file); }
-	vfsistream(std::string &file) {	open(file); }
-
-	Byte getByte() {
-		Byte b = (Byte)-1;
-		if (fd->fread(&b, 1, 1) != 1)
-			err |= Eof;
-		return b;
-	}
-
-	void seek(long pos, Offset offs = Set) {
-		VFSSeekType wh = (offs == Add) ? VFS_SEEK_CUR : (offs == End) ? VFS_SEEK_END : VFS_SEEK_SET;
-		if (fd->fseek (pos, wh))
-			err |= Eof;
-	}
-
-	long pos() {
-		return fd->ftell ();
-	}
-};
-
-class vfsostream : public binostream {
-private:
-	VFSFile *fd = nullptr;
-	VFSFile own;
-
-public:
-	vfsostream(VFSFile *fd = nullptr) :
-		fd(fd) {}
-
-	void open(const char *file) {
-		if ((own = VFSFile(file, "w")))
-			fd = &own;
-		else
-			err |= Denied;
-	}
-
-	void open(std::string &file) { open(file.c_str()); }
-
-	vfsostream(const char *file) { open(file); }
-	vfsostream(std::string &file) {	open(file); }
-
-	void putByte(Byte b) {
-		if (fd->fwrite (&b, 1, 1) != 1)
-			err |= Fatal;
-	}
-
-	void seek(long pos, Offset offs = Set) {
-		VFSSeekType wh = (offs == Add) ? VFS_SEEK_CUR : (offs == End) ? VFS_SEEK_END : VFS_SEEK_SET;
-		if (fd->fseek (pos, wh))
-			err |= Fatal;
-	}
-
-	long pos(void) {
-		return fd->ftell ();
-	}
-};
-
-#endif

audacious-plugins-3.6.2-gtk3.tar.bz2/src/adplug/core/bmf.cc Deleted

@@ -1,636 +0,0 @@
-/*
- * Adplug - Replayer for many OPL2/OPL3 audio file formats.
- * Copyright (C) 1999 - 2003, 2006 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
- *
- * xad BMF player, by Riven the Mage <riven@ok.ru>
- */
-
-/*
- - discovery -
-
- file(s) : GAMESNET.COM
- type : GamesNet advertising intro
- tune : by (?)The Brain Razor 1911
- player : ver.0.9b by Hammer
-
- file(s) : 2FAST4U.COM
- type : Ford Knox BBStro
- tune : by The Brain Razor 1911
- player : ver.1.1 by ?
- comment : in original player at 9th channel the feedback adlib register is not C8 but C6.
-
- file(s) : DATURA.COM
- type : Datura BBStro
- tune : by The Brain Razor 1911
- player : ver.1.2 by ?
- comment : inaccurate replaying, because constant outport; in original player it can be 380 or 382.
-*/
-
-#include <string.h>
-
-#include "bmf.h"
-#include "debug.h"
-
-const unsigned char
- CxadbmfPlayer::bmf_adlib_registers117 = {
- 0x20, 0x23, 0x40, 0x43, 0x60, 0x63, 0x80, 0x83, 0xA0, 0xB0, 0xC0, 0xE0,
- 0xE3,
- 0x21, 0x24, 0x41, 0x44, 0x61, 0x64, 0x81, 0x84, 0xA1, 0xB1, 0xC1, 0xE1,
- 0xE4,
- 0x22, 0x25, 0x42, 0x45, 0x62, 0x65, 0x82, 0x85, 0xA2, 0xB2, 0xC2, 0xE2,
- 0xE5,
- 0x28, 0x2B, 0x48, 0x4B, 0x68, 0x6B, 0x88, 0x8B, 0xA3, 0xB3, 0xC3, 0xE8,
- 0xEB,
- 0x29, 0x2C, 0x49, 0x4C, 0x69, 0x6C, 0x89, 0x8C, 0xA4, 0xB4, 0xC4, 0xE9,
- 0xEC,
- 0x2A, 0x2D, 0x4A, 0x4D, 0x6A, 0x6D, 0x8A, 0x8D, 0xA5, 0xB5, 0xC5, 0xEA,
- 0xED,
- 0x30, 0x33, 0x50, 0x53, 0x70, 0x73, 0x90, 0x93, 0xA6, 0xB6, 0xC6, 0xF0,
- 0xF3,
- 0x31, 0x34, 0x51, 0x54, 0x71, 0x74, 0x91, 0x94, 0xA7, 0xB7, 0xC7, 0xF1,
- 0xF4,
- 0x32, 0x35, 0x52, 0x55, 0x72, 0x75, 0x92, 0x95, 0xA8, 0xB8, 0xC8, 0xF2, 0xF5
-};
-
-const unsigned short
- CxadbmfPlayer::bmf_notes12 = {
- 0x157, 0x16B, 0x181, 0x198, 0x1B0, 0x1CA, 0x1E5, 0x202, 0x220, 0x241, 0x263,
- 0x287
-};
-
-/* for 1.1 */
-const unsigned short
- CxadbmfPlayer::bmf_notes_212 = {
- 0x159, 0x16D, 0x183, 0x19A, 0x1B2, 0x1CC, 0x1E8, 0x205, 0x223, 0x244, 0x267,
- 0x28B
-};
-
-const unsigned char
- CxadbmfPlayer::bmf_default_instrument13 = {
- 0x01, 0x01, 0x3F, 0x3F, 0x00, 0x00, 0xF0, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x00
-};
-
-CPlayer *
-CxadbmfPlayer::factory (Copl * newopl)
-{
- return new CxadbmfPlayer (newopl);
-}
-
-bool
-CxadbmfPlayer::xadplayer_load ()
-{
- unsigned short ptr = 0;
- int i;
-
- if (xad.fmt != BMF)
- return false;
-
-#ifdef DEBUG
- AdPlug_LogWrite ("\nbmf_load():\n\n");
-#endif
- if (!strncmp ((char *) &tune0, "BMF1.2", 6))
- {
- bmf.version = BMF1_2;
- bmf.timer = 70.0f;
- }
- else if (!strncmp ((char *) &tune0, "BMF1.1", 6))
- {
- bmf.version = BMF1_1;
- bmf.timer = 60.0f;
- }
- else
- {
- bmf.version = BMF0_9B;
- bmf.timer = 18.2f;
- }
-
- // copy title & author
- if (bmf.version > BMF0_9B)
- {
- ptr = 6;
-
- strncpy (bmf.title, (char *) &tuneptr, 36);
-
- while (tuneptr)
- {
- ptr++;
- }
- ptr++;
-
- strncpy (bmf.author, (char *) &tuneptr, 36);
-
- while (tuneptr)
- {
- ptr++;
- }
- ptr++;
- }
- else
- {
- strncpy (bmf.title, xad.title, 36);
- strncpy (bmf.author, xad.author, 36);
- }
-
- // speed
- if (bmf.version > BMF0_9B)
- bmf.speed = tuneptr++;
- else
- bmf.speed = ((tuneptr++ << 8) / 3) >> 8; // strange, yeh ?
-
- // load instruments
- if (bmf.version > BMF0_9B)
- {
- unsigned long iflags =
- (tuneptr << 24) | (tuneptr + 1 << 16) | (tuneptr + 2 << 8) |
- tuneptr + 3;
- ptr += 4;
-
- for (i = 0; i < 32; i++)
- if (iflags & (1 << (31 - i)))
- {
- strcpy (bmf.instrumentsi.name, (char *) &tuneptr);
- memcpy (bmf.instrumentsi.data, &tuneptr + 11, 13);
- ptr += 24;
- }
- else
- {
- bmf.instrumentsi.name0 = 0;
-
- if (bmf.version == BMF1_1)
- for (int j = 0; j < 13; j++)
- bmf.instrumentsi.dataj = bmf_default_instrumentj;
- else
- for (int j = 0; j < 13; j++)
- bmf.instrumentsi.dataj = 0;
- }
- }
- else
- {
- ptr = 6;
-
- for (i = 0; i < 32; i++)
- {
- bmf.instrumentsi.name0 = 0;
- memcpy (bmf.instrumentstuneptr.data, &tuneptr + 2, 13); // bug no.1 (no instrument-table-end detection)
- ptr += 15;
- }
- }
-
- // load streams
- if (bmf.version > BMF0_9B)
- {
- unsigned long sflags =
- (tuneptr << 24) | (tuneptr + 1 << 16) | (tuneptr + 2 << 8) |
- tuneptr + 3;
- ptr += 4;
-
- for (i = 0; i < 9; i++)
- if (sflags & (1 << (31 - i)))
- ptr += __bmf_convert_stream (&tuneptr, i);
- else
- bmf.streamsi0.cmd = 0xFF;
- }
- else
- {
- for (i = 0; i < tune5; i++)
- ptr += __bmf_convert_stream (&tuneptr, i);
-
- for (i = tune5; i < 9; i++)
- bmf.streamsi0.cmd = 0xFF;
- }
-
- return true;
-}
-
-void
-CxadbmfPlayer::xadplayer_rewind (int subsong)
-{
- int i, j;
-
- for (i = 0; i < 9; i++)
- {
- bmf.channeli.stream_position = 0;
- bmf.channeli.delay = 0;
- bmf.channeli.loop_position = 0;
- bmf.channeli.loop_counter = 0;
- }
-
- plr.speed = bmf.speed;
-#ifdef DEBUG
- AdPlug_LogWrite ("speed: %x\n", plr.speed);
-#endif
-
- bmf.active_streams = 9;
-
- // OPL initialization
- if (bmf.version > BMF0_9B)
- {
- opl_write (0x01, 0x20);
-
- /* 1.1 */
- if (bmf.version == BMF1_1)
- for (i = 0; i < 9; i++)
- for (j = 0; j < 13; j++)
- opl_write (bmf_adlib_registers13 * i + j,
- bmf_default_instrumentj);
- /* 1.2 */
- else if (bmf.version == BMF1_2)
- for (i = 0x20; i < 0x100; i++)
- opl_write (i, 0xFF); // very interesting, really!
- }
-
- /* ALL */
-
- opl_write (0x08, 0x00);
- opl_write (0xBD, 0xC0);
-}
-
-void
-CxadbmfPlayer::xadplayer_update ()
-{
- for (int i = 0; i < 9; i++)
- if (bmf.channeli.stream_position != 0xFFFF)
- {
- if (bmf.channeli.delay)
- bmf.channeli.delay--;
- else
- {
-#ifdef DEBUG
- AdPlug_LogWrite ("channel %02X:\n", i);
-#endif
- bmf_event event;
-
- // process so-called cross-events
- while (true)
- {
- memcpy (&event, &bmf.streamsibmf.channeli.stream_position,
- sizeof (bmf_event));
-#ifdef DEBUG
- AdPlug_LogWrite ("%02X %02X %02X %02X %02X %02X\n",
- event.note, event.delay, event.volume,
- event.instrument, event.cmd, event.cmd_data);
-#endif
-
- if (event.cmd == 0xFF)
- {
- bmf.channeli.stream_position = 0xFFFF;
- bmf.active_streams--;
- break;
- }
- else if (event.cmd == 0xFE)
- {
- bmf.channeli.loop_position = bmf.channeli.stream_position + 1;
- bmf.channeli.loop_counter = event.cmd_data;
- }
- else if (event.cmd == 0xFD)
- {
- if (bmf.channeli.loop_counter)
- {
- bmf.channeli.stream_position =
- bmf.channeli.loop_position - 1;
- bmf.channeli.loop_counter--;
- }
- }
- else
- break;
-
- bmf.channeli.stream_position++;
- } // while (true)
-
- // process normal event
- unsigned short pos = bmf.channeli.stream_position;
-
- if (pos != 0xFFFF)
- {
- bmf.channeli.delay = bmf.streamsipos.delay;
-
- // command ?
- if (bmf.streamsipos.cmd)
- {
- unsigned char cmd = bmf.streamsipos.cmd;
-
- // 0x01: Set Modulator Volume
- if (cmd == 0x01)
- {
- unsigned char reg = bmf_adlib_registers13 * i + 2;
-
- opl_write (reg,
- (adlibreg | 0x3F) - bmf.streamsipos.cmd_data);
- }
- // 0x10: Set Speed
- else if (cmd == 0x10)
- {
- plr.speed = bmf.streamsipos.cmd_data;
- plr.speed_counter = plr.speed;
- }
- } // if (bmf.streamsipos.cmd)
-
- // instrument ?
- if (bmf.streamsipos.instrument)
- {
- unsigned char ins = bmf.streamsipos.instrument - 1;
-
- if (bmf.version != BMF1_1)
- opl_write (0xB0 + i, adlib0xB0 + i & 0xDF);
-
- for (int j = 0; j < 13; j++)
- opl_write (bmf_adlib_registersi * 13 + j,
- bmf.instrumentsins.dataj);
- } // if (bmf.streamsipos.instrument)
-
- // volume ?
- if (bmf.streamsipos.volume)
- {
- unsigned char vol = bmf.streamsipos.volume - 1;
- unsigned char reg = bmf_adlib_registers13 * i + 3;
-
- opl_write (reg, (adlibreg | 0x3F) - vol);
- } // if (bmf.streamsipos.volume)
-
- // note ?
- if (bmf.streamsipos.note)
- {
- unsigned short note = bmf.streamsipos.note;
- unsigned short freq = 0;
-
- // mute channel
- opl_write (0xB0 + i, adlib0xB0 + i & 0xDF);
-
- // get frequency
- if (bmf.version == BMF1_1)
- {
- if (note <= 0x60)
- freq = bmf_notes_2--note % 12;
- }
- else
- {
- if (note != 0x7F)
- freq = bmf_notes--note % 12;
- }
-
- // play note
- if (freq)
- {
- opl_write (0xB0 + i, (freq >> 8) | ((note / 12) << 2) | 0x20);
- opl_write (0xA0 + i, freq & 0xFF);
- }
- } // if (bmf.streamsipos.note)
-
- bmf.channeli.stream_position++;
- } // if (pos != 0xFFFF)
-
- } // if (!bmf.channeli.delay)
- } // if (bmf.channeli.stream_position != 0xFFFF)
-
- // is module loop ?
- if (!bmf.active_streams)
- {
- for (int j = 0; j < 9; j++)
- bmf.channelj.stream_position = 0;
-
- bmf.active_streams = 9;
-
- plr.looping = 1;
- }
-}
-
-float
-CxadbmfPlayer::xadplayer_getrefresh ()
-{
- return bmf.timer;
-}
-
-std::string CxadbmfPlayer::xadplayer_gettype ()
-{
- return std::string ("xad: BMF Adlib Tracker");
-}
-
-std::string CxadbmfPlayer::xadplayer_gettitle ()
-{
- return std::string (bmf.title);
-}
-
-std::string CxadbmfPlayer::xadplayer_getauthor ()
-{
- return std::string (bmf.author);
-}
-
-unsigned int
-CxadbmfPlayer::xadplayer_getinstruments ()
-{
- return 32;
-}
-
-std::string CxadbmfPlayer::xadplayer_getinstrument (unsigned int i)
-{
- return std::string (bmf.instrumentsi.name);
-}
-
-/* -------- Internal Functions ---------------------------- */
-
-int
-CxadbmfPlayer::__bmf_convert_stream (unsigned char *stream, int channel)
-{
-#ifdef DEBUG
- AdPlug_LogWrite
- ("channel %02X (note,delay,volume,instrument,command,command_data):\n",
- channel);
- unsigned char *last = stream;
-#endif
- unsigned char *stream_start = stream;
-
- int pos = 0;
-
- while (true)
- {
- memset (&bmf.streamschannelpos, 0, sizeof (bmf_event));
-
- bool is_cmd = false;
-
- if (*stream == 0xFE)
- {
- // 0xFE -> 0xFF: End of Stream
- bmf.streamschannelpos.cmd = 0xFF;
-
- stream++;
-
- break;
- }
- else if (*stream == 0xFC)
- {
- // 0xFC -> 0xFE xx: Save Loop Position
- bmf.streamschannelpos.cmd = 0xFE;
- bmf.streamschannelpos.cmd_data =
- (*(stream + 1) & ((bmf.version == BMF0_9B) ? 0x7F : 0x3F)) - 1;
-
- stream += 2;
- }
- else if (*stream == 0x7D)
- {
- // 0x7D -> 0xFD: Loop Saved Position
- bmf.streamschannelpos.cmd = 0xFD;
-
- stream++;
- }
- else
- {
- if (*stream & 0x80)
- {
- if (*(stream + 1) & 0x80)
- {
- if (*(stream + 1) & 0x40)
- {
- // byte0: 1aaaaaaa = NOTE
- bmf.streamschannelpos.note = *stream & 0x7F;
- // byte1: 11bbbbbb = DELAY
- bmf.streamschannelpos.delay = *(stream + 1) & 0x3F;
- // byte2: cccccccc = COMMAND
-
- stream += 2;
-
- is_cmd = true;
- }
- else
- {
- // byte0: 1aaaaaaa = NOTE
- bmf.streamschannelpos.note = *stream & 0x7F;
- // byte1: 11bbbbbb = DELAY
- bmf.streamschannelpos.delay = *(stream + 1) & 0x3F;
-
- stream += 2;
- } // if (*(stream+1) & 0x40)
- }
- else
- {
- // byte0: 1aaaaaaa = NOTE
- bmf.streamschannelpos.note = *stream & 0x7F;
- // byte1: 0bbbbbbb = COMMAND
-
- stream++;
-
- is_cmd = true;
- } // if (*(stream+1) & 0x80)
- }
- else
- {
- // byte0: 0aaaaaaa = NOTE
- bmf.streamschannelpos.note = *stream & 0x7F;
-
- stream++;
- } // if (*stream & 0x80)
- } // if (*stream == 0xFE)
-
- // is command ?
- if (is_cmd)
- {
-
- /* ALL */
-
- if ((0x20 <= *stream) && (*stream <= 0x3F))
- {
- // 0x20 or higher; 0x3F or lower: Set Instrument
- bmf.streamschannelpos.instrument = *stream - 0x20 + 1;
-
- stream++;
- }
- else if (0x40 <= *stream)
- {
- // 0x40 or higher: Set Volume
- bmf.streamschannelpos.volume = *stream - 0x40 + 1;
-
- stream++;
- }
- else
- {
-
- /* 0.9b */
-
- if (bmf.version == BMF0_9B)
- if (*stream < 0x20)
- {
- // 0x1F or lower: ?
- stream++;
- }
-
- /* 1.2 */
-
- if (bmf.version == BMF1_2)
-	{
- if (*stream == 0x01)
- {
- // 0x01: Set Modulator Volume -> 0x01
- bmf.streamschannelpos.cmd = 0x01;
- bmf.streamschannelpos.cmd_data = *(stream + 1);
-
- stream += 2;
- }
- else if (*stream == 0x02)
- {
- // 0x02: ?
- stream += 2;
- }
- else if (*stream == 0x03)
- {
- // 0x03: ?
- stream += 2;
- }
- else if (*stream == 0x04)
- {
- // 0x04: Set Speed -> 0x10
- bmf.streamschannelpos.cmd = 0x10;
- bmf.streamschannelpos.cmd_data = *(stream + 1);
-
- stream += 2;
- }
- else if (*stream == 0x05)
- {
- // 0x05: Set Carrier Volume (port 380)
- bmf.streamschannelpos.volume = *(stream + 1) + 1;
-
- stream += 2;
- }
- else if (*stream == 0x06)
- {
- // 0x06: Set Carrier Volume (port 382)
- bmf.streamschannelpos.volume = *(stream + 1) + 1;
-
- stream += 2;
- }
- } // if (bmf.version == BMF1_2)
-
- } // if ((0x20 <= *stream) && (*stream <= 0x3F))
-
- } // if (is_cmd)
-
-#ifdef DEBUG
- AdPlug_LogWrite ("%02X %02X %02X %02X %02X %02X <---- ",
- bmf.streamschannelpos.note,
- bmf.streamschannelpos.delay,
- bmf.streamschannelpos.volume,
- bmf.streamschannelpos.instrument,
- bmf.streamschannelpos.cmd,
- bmf.streamschannelpos.cmd_data);
- for (int zz = 0; zz < (stream - last); zz++)
- AdPlug_LogWrite ("%02X ", lastzz);
- AdPlug_LogWrite ("\n");
- last = stream;
-#endif
- pos++;
- } // while (true)
-
- return (stream - stream_start);
-}

audacious-plugins-3.6.2-gtk3.tar.bz2/src/adplug/core/bmf.h Deleted

@@ -1,91 +0,0 @@
-/*
- * Adplug - Replayer for many OPL2/OPL3 audio file formats.
- * Copyright (C) 1999 - 2003 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
- *
- * xad BMF player, by Riven the Mage <riven@ok.ru>
- */
-
-#include "xad.h"
-
-class CxadbmfPlayer: public CxadPlayer
-{
-public:
- static CPlayer *factory(Copl *newopl);
-
- CxadbmfPlayer(Copl *newopl): CxadPlayer(newopl)
- { };
- ~CxadbmfPlayer()
- { };
-
-protected:
- enum { BMF0_9B, BMF1_1, BMF1_2 };
- //
- struct bmf_event
- {
- unsigned char note;
- unsigned char delay;
- unsigned char volume;
- unsigned char instrument;
- unsigned char cmd;
- unsigned char cmd_data;
- };
-
- struct
- {
- unsigned char version;
- char title36;
- char author36;
- float timer;
- unsigned char speed;
- 
- struct
- {
- char name11;
- unsigned char data13;
- } instruments32;
-
- bmf_event streams91024;
-
- int active_streams;
-
- struct
- {
- unsigned short stream_position;
- unsigned char delay;
- unsigned short loop_position;
- unsigned char loop_counter;
- } channel9;
- } bmf;
- //
- bool xadplayer_load();
- void xadplayer_rewind(int subsong);
- void xadplayer_update();
- float xadplayer_getrefresh();
- std::string xadplayer_gettype();
- std::string xadplayer_gettitle();
- std::string xadplayer_getauthor();
- std::string xadplayer_getinstrument(unsigned int i);
- unsigned int xadplayer_getinstruments();
- //
-private:
- static const unsigned char bmf_adlib_registers117;
- static const unsigned short bmf_notes12;
- static const unsigned short bmf_notes_212;
- static const unsigned char bmf_default_instrument13;
-
- int __bmf_convert_stream(unsigned char *stream, int channel);
-};

audacious-plugins-3.6.2-gtk3.tar.bz2/src/adplug/core/cff.cc Deleted

@@ -1,531 +0,0 @@
-/*
- AdPlug - Replayer for many OPL2/OPL3 audio file formats.
- Copyright (C) 1999 - 2006 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
-
- cff.cpp - BoomTracker loader by Riven the Mage <riven@ok.ru>
-*/
-/*
- NOTE: Conversion of slides is not 100% accurate. Original volume slides
- have effect on carrier volume only. Also, original arpeggio, frequency & volume
- slides use previous effect data instead of current.
-*/
-
-#include <stdlib.h>
-#include <string.h>
-
-#include "cff.h"
-
-/* -------- Public Methods -------------------------------- */
-
-CPlayer *
-CcffLoader::factory (Copl * newopl)
-{
- return new CcffLoader (newopl);
-}
-
-bool
-CcffLoader::load (VFSFile & fd, const CFileProvider & fp)
-{
- binistream *f = fp.open (fd);
- if (!f)
- return false;
- const unsigned char conv_inst11 = { 2, 1, 10, 9, 4, 3, 6, 5, 0, 8, 7 };
- const unsigned short conv_note12 =
- { 0x16B, 0x181, 0x198, 0x1B0, 0x1CA, 0x1E5, 0x202, 0x220, 0x241, 0x263,
-0x287, 0x2AE };
-
- int i, j, k, t = 0;
-
- // '<CUD-FM-File>' - signed ?
- f->readString (header.id, 16);
- header.version = f->readInt (1);
- header.size = f->readInt (2);
- header.packed = f->readInt (1);
- f->readString ((char *) header.reserved, 12);
- if (memcmp (header.id, "<CUD-FM-File>" "\x1A\xDE\xE0", 16))
- {
- fp.close (f);
- return false;
- }
-
- unsigned char *module = new unsigned char0x10000;
-
- // packed ?
- if (header.packed)
- {
- cff_unpacker *unpacker = new cff_unpacker;
-
- unsigned char *packed_module = new unsigned charheader.size + 4;
-
- memset (packed_module, 0, header.size + 4);
-
- f->readString ((char *) packed_module, header.size);
- fp.close (f);
-
- if (!unpacker->unpack (packed_module, module))
- {
- delete unpacker;
- delete packed_module;
- delete module;
- return false;
- }
-
- delete unpacker;
- delete packed_module;
-
- if (memcmp (&module0x5E1, "CUD-FM-File - SEND A POSTCARD -", 31))
- {
- delete module;
- return false;
- }
- }
- else
- {
- f->readString ((char *) module, header.size);
- fp.close (f);
- }
-
- // init CmodPlayer
- realloc_instruments (47);
- realloc_order (64);
- realloc_patterns (36, 64, 9);
- init_notetable (conv_note);
- init_trackord ();
-
- // load instruments
- for (i = 0; i < 47; i++)
- {
- memcpy (&instrumentsi, &modulei * 32, sizeof (cff_instrument));
-
- for (j = 0; j < 11; j++)
- insti.dataconv_instj = instrumentsi.dataj;
-
- instrumentsi.name20 = 0;
- }
-
- // number of patterns
- nop = module0x5E0;
-
- // load title & author
- memcpy (song_title, &module0x614, 20);
- memcpy (song_author, &module0x600, 20);
-
- // load order
- memcpy (order, &module0x628, 64);
-
- // load tracks
- for (i = 0; i < nop; i++)
- {
- unsigned char old_event_byte29;
-
- memset (old_event_byte2, 0, 9);
-
- for (j = 0; j < 9; j++)
- {
- for (k = 0; k < 64; k++)
- {
- cff_event *event =
- (cff_event *) & module0x669 + ((i * 64 + k) * 9 + j) * 3;
-
- // convert note
- if (event->byte0 == 0x6D)
- trackstk.note = 127;
- else if (event->byte0)
- trackstk.note = event->byte0;
-
- if (event->byte2)
- old_event_byte2j = event->byte2;
-
- // convert effect
- switch (event->byte1)
- {
- case 'I': // set instrument
- trackstk.inst = event->byte2 + 1;
- trackstk.param1 = trackstk.param2 = 0;
- break;
-
- case 'H': // set tempo
- trackstk.command = 7;
- if (event->byte2 < 16)
- {
- trackstk.param1 = 0x07;
- trackstk.param2 = 0x0D;
- }
- break;
-
- case 'A': // set speed
- trackstk.command = 19;
- trackstk.param1 = event->byte2 >> 4;
- trackstk.param2 = event->byte2 & 15;
- break;
-
- case 'L': // pattern break
- trackstk.command = 13;
- trackstk.param1 = event->byte2 >> 4;
- trackstk.param2 = event->byte2 & 15;
- break;
-
- case 'K': // order jump
- trackstk.command = 11;
- trackstk.param1 = event->byte2 >> 4;
- trackstk.param2 = event->byte2 & 15;
- break;
-
- case 'M': // set vibrato/tremolo
- trackstk.command = 27;
- trackstk.param1 = event->byte2 >> 4;
- trackstk.param2 = event->byte2 & 15;
- break;
-
- case 'C': // set modulator volume
- trackstk.command = 21;
- trackstk.param1 = (0x3F - event->byte2) >> 4;
- trackstk.param2 = (0x3F - event->byte2) & 15;
- break;
-
- case 'G': // set carrier volume
- trackstk.command = 22;
- trackstk.param1 = (0x3F - event->byte2) >> 4;
- trackstk.param2 = (0x3F - event->byte2) & 15;
- break;
-
- case 'B': // set carrier waveform
- trackstk.command = 25;
- trackstk.param1 = event->byte2;
- trackstk.param2 = 0x0F;
- break;
-
- case 'E': // fine frequency slide down
- trackstk.command = 24;
- trackstk.param1 = old_event_byte2j >> 4;
- trackstk.param2 = old_event_byte2j & 15;
- break;
-
- case 'F': // fine frequency slide up
- trackstk.command = 23;
- trackstk.param1 = old_event_byte2j >> 4;
- trackstk.param2 = old_event_byte2j & 15;
- break;
-
- case 'D': // fine volume slide
- trackstk.command = 14;
- if (old_event_byte2j & 15)
- {
- // slide down
- trackstk.param1 = 5;
- trackstk.param2 = old_event_byte2j & 15;
- }
- else
- {
- // slide up
- trackstk.param1 = 4;
- trackstk.param2 = old_event_byte2j >> 4;
- }
- break;
-
- case 'J': // arpeggio
- trackstk.param1 = old_event_byte2j >> 4;
- trackstk.param2 = old_event_byte2j & 15;
- break;
- }
- }
-
- t++;
- }
- }
-
- deletemodule;
-
- // order loop
- restartpos = 0;
-
- // order length
- for (i = 0; i < 64; i++)
- {
- if (orderi >= 0x80)
- {
- length = i;
- break;
- }
- }
-
- // default tempo
- bpm = 0x7D;
-
- rewind (0);
-
- return true;
-}
-
-void
-CcffLoader::rewind (int subsong)
-{
- CmodPlayer::rewind (subsong);
-
- // default instruments
- for (int i = 0; i < 9; i++)
- {
- channeli.inst = i;
-
- channeli.vol1 = 63 - (insti.data10 & 63);
- channeli.vol2 = 63 - (insti.data9 & 63);
- }
-}
-
-std::string CcffLoader::gettype ()
-{
- if (header.packed)
- return std::string ("BoomTracker 4, packed");
- else
- return std::string ("BoomTracker 4");
-}
-
-std::string CcffLoader::gettitle ()
-{
- return std::string (song_title, 20);
-}
-
-std::string CcffLoader::getauthor ()
-{
- return std::string (song_author, 20);
-}
-
-std::string CcffLoader::getinstrument (unsigned int n)
-{
- return std::string (instrumentsn.name);
-}
-
-unsigned int
-CcffLoader::getinstruments ()
-{
- return 47;
-}
-
-/* -------- Private Methods ------------------------------- */
-
-/*
- Lempel-Ziv-Tyr ;-)
-*/
-long
-CcffLoader::cff_unpacker::unpack (unsigned char *ibuf, unsigned char *obuf)
-{
- if (memcmp (ibuf, "YsComp" "\x07" "CUD1997" "\x1A\x04", 16))
- return 0;
-
- input = ibuf + 16;
- output = obuf;
-
- output_length = 0;
-
- heap = (unsigned char *) malloc (0x10000);
- dictionary = (unsigned char **) malloc (sizeof (unsigned char *) * 0x8000);
-
- memset (heap, 0, 0x10000);
- memset (dictionary, 0, 0x8000);
-
- cleanup ();
- if (!startup ())
- goto out;
-
- // LZW
- while (1)
- {
- new_code = get_code ();
-
- // 0x00: end of data
- if (new_code == 0)
- break;
-
- // 0x01: end of block
- if (new_code == 1)
- {
- cleanup ();
- if (!startup ())
- goto out;
-
- continue;
- }
-
- // 0x02: expand code length
- if (new_code == 2)
- {
- code_length++;
-
- continue;
- }
-
- // 0x03: RLE
- if (new_code == 3)
- {
- unsigned char
- old_code_length = code_length;
-
- code_length = 2;
-
- unsigned char
- repeat_length = get_code () + 1;
-
- code_length = 4 << get_code ();
-
- unsigned long
- repeat_counter = get_code ();
-
- if (output_length + repeat_counter * repeat_length > 0x10000)
- {
- output_length = 0;
- goto out;
- }
-
- for (unsigned int i = 0; i < repeat_counter * repeat_length; i++)
- {
- outputoutput_length = outputoutput_length - repeat_length;
- output_length++;
- }
-
- code_length = old_code_length;
-
- if (!startup ())
- goto out;
-
- continue;
- }
-
- if (new_code >= (0x104 + dictionary_length))
- {
- // dictionary <- old.code.string + old.code.char
- the_string++the_string0 = the_string1;
- }
- else
- {
- // dictionary <- old.code.string + new.code.char
- unsigned char
- temp_string256;
-
- translate_code (new_code, temp_string);
-
- the_string++the_string0 = temp_string1;
- }
-
- expand_dictionary (the_string);
-
- // output <- new.code.string
- translate_code (new_code, the_string);
-
- if (output_length + the_string0 > 0x10000)
- {
- output_length = 0;
- goto out;
- }
-
- for (int i = 0; i < the_string0; i++)
- outputoutput_length++ = the_stringi + 1;
-
- old_code = new_code;
- }
-
-out:
- free (heap);
- free (dictionary);
- return output_length;
-}
-
-unsigned long
-CcffLoader::cff_unpacker::get_code ()
-{
- unsigned long
- code;
-
- while (bits_left < code_length)
- {
- bits_buffer |= ((*input++) << bits_left);
- bits_left += 8;
- }
-
- code = bits_buffer & ((1 << code_length) - 1);
-
- bits_buffer >>= code_length;
- bits_left -= code_length;
-
- return code;
-}
-
-void
-CcffLoader::cff_unpacker::translate_code (unsigned long code,
- unsigned char *string)
-{
- unsigned char
- translated_string256;
-
- if (code >= 0x104)
- {
- memcpy (translated_string, dictionarycode - 0x104,
- (*(dictionarycode - 0x104)) + 1);
- }
- else
- {
- translated_string0 = 1;
- translated_string1 = (code - 4) & 0xFF;
- }
-
- memcpy (string, translated_string, 256);
-}
-
-void
-CcffLoader::cff_unpacker::cleanup ()
-{
- code_length = 9;
-
- bits_buffer = 0;
- bits_left = 0;
-
- heap_length = 0;
- dictionary_length = 0;
-}
-
-int
-CcffLoader::cff_unpacker::startup ()
-{
- old_code = get_code ();
-
- translate_code (old_code, the_string);
-
- if (output_length + the_string0 > 0x10000)
- {
- output_length = 0;
- return 0;
- }
-
- for (int i = 0; i < the_string0; i++)
- outputoutput_length++ = the_stringi + 1;
-
- return 1;
-}
-
-void
-CcffLoader::cff_unpacker::expand_dictionary (unsigned char *string)
-{
- if (string0 >= 0xF0)
- return;
-
- memcpy (&heapheap_length, string, string0 + 1);
-
- dictionarydictionary_length = &heapheap_length;
-
- dictionary_length++;
-
- heap_length += (string0 + 1);
-}

audacious-plugins-3.6.2-gtk3.tar.bz2/src/adplug/core/cff.h Deleted

@@ -1,103 +0,0 @@
-/*
- AdPlug - Replayer for many OPL2/OPL3 audio file formats.
- Copyright (C) 1999 - 2006 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
-
- cff.h - BoomTracker loader by Riven the Mage <riven@ok.ru>
-*/
-
-#include "protrack.h"
-
-class CcffLoader: public CmodPlayer
-{
-	public:
-		static CPlayer *factory(Copl *newopl);
-
-		CcffLoader(Copl *newopl) : CmodPlayer(newopl) { };
-
-		bool	load(VFSFile &fd, const CFileProvider &fp);
-		void	rewind(int subsong);
-
-		std::string		gettype();
-		std::string		gettitle();
-		std::string		getauthor();
-		std::string		getinstrument(unsigned int n);
-		unsigned int	getinstruments();
-
-	private:
-
-		class cff_unpacker
-		{
-			public:
-
-				long unpack(unsigned char *ibuf, unsigned char *obuf);
-
-			private:
-
-				unsigned long get_code();
-				void translate_code(unsigned long code, unsigned char *string);
-
-				void cleanup();
-				int startup();
-
-				void expand_dictionary(unsigned char *string);
-
-				unsigned char *input;
-				unsigned char *output;
-
-				long output_length;
-
-				unsigned char code_length;
-
-				unsigned long bits_buffer;
-				unsigned int bits_left;
-
-				unsigned char *heap;
-				unsigned char **dictionary;
-
-				unsigned int heap_length;
-				unsigned int dictionary_length;
-
-				unsigned long old_code,new_code;
-
-				unsigned char the_string256;
-		};
-
-		struct cff_header
-		{
-			char	id16;
-			unsigned char	version;
-			unsigned short	size;
-			unsigned char	packed;
-			unsigned char	reserved12;
-		} header;
-
-		struct cff_instrument
-		{
-			unsigned char	data12;
-			char name21;
-		} instruments47;
-
-		char song_title20;
-		char	song_author20;
-
-		struct cff_event
-		{
-			unsigned char	byte0;
-			unsigned char	byte1;
-			unsigned char	byte2;
-		};
-};

audacious-plugins-3.6.2-gtk3.tar.bz2/src/adplug/core/cmf.cc Deleted

@@ -1,788 +0,0 @@
-/*
- * Adplug - Replayer for many OPL2/OPL3 audio file formats.
- * Copyright (C) 1999 - 2009 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
- *
- * cmf.cpp - CMF player by Adam Nielsen <malvineous@shikadi.net>
- * Subset of CMF reader in MOPL code (Malvineous' OPL player), no seeking etc.
- */
-
-#include <stdint.h> // for uintxx_t
-#include <cassert>
-#include <math.h> // for pow() etc.
-#include <string.h> // for memset
-#include "debug.h"
-#include "cmf.h"
-
-// ------------------------------
-// OPTIONS
-// ------------------------------
-
-// The official Creative Labs CMF player seems to ignore the note velocity
-// (playing every note at the same volume), but you can uncomment this to
-// allow the note velocity to affect the volume (as presumably the composer
-// originally intended.)
-//
-//#define USE_VELOCITY
-//
-// The Xargon demo song is a good example of a song that uses note velocity.
-
-// OPL register offsets
-#define BASE_CHAR_MULT 0x20
-#define BASE_SCAL_LEVL 0x40
-#define BASE_ATCK_DCAY 0x60
-#define BASE_SUST_RLSE 0x80
-#define BASE_FNUM_L 0xA0
-#define BASE_KEYON_FREQ 0xB0
-#define BASE_RHYTHM 0xBD
-#define BASE_WAVE 0xE0
-#define BASE_FEED_CONN 0xC0
-
-#define OPLBIT_KEYON 0x20 // Bit in BASE_KEYON_FREQ register for turning a note on
-
-// Supplied with a channel, return the offset from a base OPL register for the
-// Modulator cell (e.g. channel 4's modulator is at offset 0x09. Since 0x60 is
-// the attack/decay function, register 0x69 will thus set the attack/decay for
-// channel 4's modulator.) (channels go from 0 to 8 inclusive)
-#define OPLOFFSET(channel) (((channel) / 3) * 8 + ((channel) % 3))
-
-// These 16 instruments are repeated to fill up the 128 available slots. A CMF
-// file can override none/some/all of the 128 slots with custom instruments,
-// so any that aren't overridden are still available for use with these default
-// patches. The Word Rescue CMFs are good examples of songs that rely on these
-// default patches.
-uint8_t cDefaultPatches =
-"\x01\x11\x4F\x00\xF1\xD2\x53\x74\x00\x00\x06"
-"\x07\x12\x4F\x00\xF2\xF2\x60\x72\x00\x00\x08"
-"\x31\xA1\x1C\x80\x51\x54\x03\x67\x00\x00\x0E"
-"\x31\xA1\x1C\x80\x41\x92\x0B\x3B\x00\x00\x0E"
-"\x31\x16\x87\x80\xA1\x7D\x11\x43\x00\x00\x08"
-"\x30\xB1\xC8\x80\xD5\x61\x19\x1B\x00\x00\x0C"
-"\xF1\x21\x01\x00\x97\xF1\x17\x18\x00\x00\x08"
-"\x32\x16\x87\x80\xA1\x7D\x10\x33\x00\x00\x08"
-"\x01\x12\x4F\x00\x71\x52\x53\x7C\x00\x00\x0A"
-"\x02\x03\x8D\x00\xD7\xF5\x37\x18\x00\x00\x04"
-"\x21\x21\xD1\x00\xA3\xA4\x46\x25\x00\x00\x0A"
-"\x22\x22\x0F\x00\xF6\xF6\x95\x36\x00\x00\x0A"
-"\xE1\xE1\x00\x00\x44\x54\x24\x34\x02\x02\x07"
-"\xA5\xB1\xD2\x80\x81\xF1\x03\x05\x00\x00\x02"
-"\x71\x22\xC5\x00\x6E\x8B\x17\x0E\x00\x00\x02"
-"\x32\x21\x16\x80\x73\x75\x24\x57\x00\x00\x0E";
-
-
-CPlayer *CcmfPlayer::factory(Copl *newopl)
-{
- return new CcmfPlayer(newopl);
-}
-
-CcmfPlayer::CcmfPlayer(Copl *newopl) :
-	CPlayer(newopl),
-	data(nullptr),
-	pInstruments(nullptr),
-	bPercussive(false),
-	iTranspose(0),
-	iPrevCommand(0)
-{
-	assert(OPLOFFSET(1-1) == 0x00);
-	assert(OPLOFFSET(5-1) == 0x09);
-	assert(OPLOFFSET(9-1) == 0x12);
-}
-
-CcmfPlayer::~CcmfPlayer()
-{
-	if (this->data) delete data;
-	if (this->pInstruments) delete pInstruments;
-}
-
-bool CcmfPlayer::load(VFSFile & fd, const CFileProvider &fp)
-{
-	binistream *f = fp.open(fd);
-	if(!f) return false;
-
-	char cSig4;
-	f->readString(cSig, 4);
-	if (
-		(cSig0 != 'C') ||
-		(cSig1 != 'T') ||
-		(cSig2 != 'M') ||
-		(cSig3 != 'F')
-	) {
-		// Not a CMF file
-		fp.close(f);
-		return false;
-	}
-	uint16_t iVer = f->readInt(2);
-	if ((iVer != 0x0101) && (iVer != 0x0100)) {
-		AdPlug_LogWrite("CMF file is not v1.0 or v1.1 (reports %d.%d)\n", iVer >> 8 , iVer & 0xFF);
-		fp.close(f);
-		return false;
-	}
-
-	this->cmfHeader.iInstrumentBlockOffset = f->readInt(2);
-	this->cmfHeader.iMusicOffset = f->readInt(2);
-	this->cmfHeader.iTicksPerQuarterNote = f->readInt(2);
-	this->cmfHeader.iTicksPerSecond = f->readInt(2);
-	this->cmfHeader.iTagOffsetTitle = f->readInt(2);
-	this->cmfHeader.iTagOffsetComposer = f->readInt(2);
-	this->cmfHeader.iTagOffsetRemarks = f->readInt(2);
-	f->readString((char *)this->cmfHeader.iChannelsInUse, 16);
-	if (iVer == 0x0100) {
-		this->cmfHeader.iNumInstruments = f->readInt(1);
-		this->cmfHeader.iTempo = 0;
-	} else { // 0x0101
-		this->cmfHeader.iNumInstruments = f->readInt(2);
-		this->cmfHeader.iTempo = f->readInt(2);
-	}
-
-	// Load the instruments
-
-	f->seek(this->cmfHeader.iInstrumentBlockOffset);
-	this->pInstruments = new SBI
-		(this->cmfHeader.iNumInstruments < 128) ? 128 : this->cmfHeader.iNumInstruments
-	; // Always at least 128 available for use
-
-	for (int i = 0; i < this->cmfHeader.iNumInstruments; i++) {
-		this->pInstrumentsi.op0.iCharMult = f->readInt(1);
-		this->pInstrumentsi.op1.iCharMult = f->readInt(1);
-		this->pInstrumentsi.op0.iScalingOutput = f->readInt(1);
-		this->pInstrumentsi.op1.iScalingOutput = f->readInt(1);
-		this->pInstrumentsi.op0.iAttackDecay = f->readInt(1);
-		this->pInstrumentsi.op1.iAttackDecay = f->readInt(1);
-		this->pInstrumentsi.op0.iSustainRelease = f->readInt(1);
-		this->pInstrumentsi.op1.iSustainRelease = f->readInt(1);
-		this->pInstrumentsi.op0.iWaveSel = f->readInt(1);
-		this->pInstrumentsi.op1.iWaveSel = f->readInt(1);
-		this->pInstrumentsi.iConnection = f->readInt(1);
-		f->seek(5, binio::Add); // skip over the padding bytes
-	}
-
-	// Set the rest of the instruments to the CMF defaults
-	for (int i = this->cmfHeader.iNumInstruments; i < 128; i++) {
-		this->pInstrumentsi.op0.iCharMult = cDefaultPatches(i % 16) * 11 + 0;
-		this->pInstrumentsi.op1.iCharMult = cDefaultPatches(i % 16) * 11 + 1;
-		this->pInstrumentsi.op0.iScalingOutput = cDefaultPatches(i % 16) * 11 + 2;
-		this->pInstrumentsi.op1.iScalingOutput = cDefaultPatches(i % 16) * 11 + 3;
-		this->pInstrumentsi.op0.iAttackDecay = cDefaultPatches(i % 16) * 11 + 4;
-		this->pInstrumentsi.op1.iAttackDecay = cDefaultPatches(i % 16) * 11 + 5;
-		this->pInstrumentsi.op0.iSustainRelease = cDefaultPatches(i % 16) * 11 + 6;
-		this->pInstrumentsi.op1.iSustainRelease = cDefaultPatches(i % 16) * 11 + 7;
-		this->pInstrumentsi.op0.iWaveSel = cDefaultPatches(i % 16) * 11 + 8;
-		this->pInstrumentsi.op1.iWaveSel = cDefaultPatches(i % 16) * 11 + 9;
-		this->pInstrumentsi.iConnection = cDefaultPatches(i % 16) * 11 + 10;
-	}
-
-	if (this->cmfHeader.iTagOffsetTitle) {
-		f->seek(this->cmfHeader.iTagOffsetTitle);
-		this->strTitle = f->readString('\0');
-	}
-	if (this->cmfHeader.iTagOffsetComposer) {
-		f->seek(this->cmfHeader.iTagOffsetComposer);
-		this->strComposer = f->readString('\0');
-	}
-	if (this->cmfHeader.iTagOffsetRemarks) {
-		f->seek(this->cmfHeader.iTagOffsetRemarks);
-		this->strRemarks = f->readString('\0');
-	}
-
-	// Load the MIDI data into memory
- f->seek(this->cmfHeader.iMusicOffset);
- this->iSongLen = fp.filesize(f) - this->cmfHeader.iMusicOffset;
- this->data = new unsigned charthis->iSongLen;
- f->readString((char *)data, this->iSongLen);
-
- fp.close(f);
-	rewind(0);
-
- return true;
-}
-
-bool CcmfPlayer::update()
-{
-	// This has to be here and not in getrefresh() for some reason.
-	this->iDelayRemaining = 0;
-
-	// Read in the next event
-	while (!this->iDelayRemaining) {
-		uint8_t iCommand = this->datathis->iPlayPointer++;
-		if ((iCommand & 0x80) == 0) {
-			// Running status, use previous command
-			this->iPlayPointer--;
-			iCommand = this->iPrevCommand;
-		} else {
-			this->iPrevCommand = iCommand;
-		}
-		uint8_t iChannel = iCommand & 0x0F;
-		switch (iCommand & 0xF0) {
-			case 0x80: { // Note off (two data bytes)
-				uint8_t iNote = this->datathis->iPlayPointer++;
-				uint8_t iVelocity = this->datathis->iPlayPointer++; // release velocity
-				this->cmfNoteOff(iChannel, iNote, iVelocity);
-				break;
-			}
-			case 0x90: { // Note on (two data bytes)
-				uint8_t iNote = this->datathis->iPlayPointer++;
-				uint8_t iVelocity = this->datathis->iPlayPointer++; // attack velocity
-				if (iVelocity) {
-					this->cmfNoteOn(iChannel, iNote, iVelocity);
-				} else {
-					// This is a note-off instead (velocity == 0)
-					this->cmfNoteOff(iChannel, iNote, iVelocity); // 64 is the MIDI default note-off velocity
-					break;
-				}
-				break;
-			}
-			case 0xA0: { // Polyphonic key pressure (two data bytes)
-				uint8_t iNote = this->datathis->iPlayPointer++;
-				uint8_t iPressure = this->datathis->iPlayPointer++;
-				AdPlug_LogWrite("CMF: Key pressure not yet implemented! (wanted ch%d/note %d set to %d)\n", iChannel, iNote, iPressure);
-				break;
-			}
-			case 0xB0: { // Controller (two data bytes)
-				uint8_t iController = this->datathis->iPlayPointer++;
-				uint8_t iValue = this->datathis->iPlayPointer++;
-				this->MIDIcontroller(iChannel, iController, iValue);
-				break;
-			}
-			case 0xC0: { // Instrument change (one data byte)
-				uint8_t iNewInstrument = this->datathis->iPlayPointer++;
-				this->chMIDIiChannel.iPatch = iNewInstrument;
-				AdPlug_LogWrite("CMF: Remembering MIDI channel %d now uses patch %d\n", iChannel, iNewInstrument);
-				break;
-			}
-			case 0xD0: { // Channel pressure (one data byte)
-				uint8_t iPressure = this->datathis->iPlayPointer++;
-				AdPlug_LogWrite("CMF: Channel pressure not yet implemented! (wanted ch%d set to %d)\n", iChannel, iPressure);
-				break;
-			}
-			case 0xE0: { // Pitch bend (two data bytes)
-				uint8_t iLSB = this->datathis->iPlayPointer++;
-				uint8_t iMSB = this->datathis->iPlayPointer++;
-				uint16_t iValue = (iMSB << 7) | iLSB;
-				// 8192 is middle/off, 0 is -2 semitones, 16384 is +2 semitones
-				this->chMIDIiChannel.iPitchbend = iValue;
-				AdPlug_LogWrite("CMF: Channel %d pitchbent to %d (%+.2f)\n", iChannel + 1, iValue, (float)(iValue - 8192) / 8192);
-				break;
-			}
-			case 0xF0: // System message (arbitrary data bytes)
-				switch (iCommand) {
-					case 0xF0: { // Sysex
-						uint8_t iNextByte;
-						AdPlug_LogWrite("Sysex message: ");
-						do {
-							iNextByte = this->datathis->iPlayPointer++;
-							AdPlug_LogWrite("%02X", iNextByte);
-						} while ((iNextByte & 0x80) == 0);
-						AdPlug_LogWrite("\n");
-						// This will have read in the terminating EOX (0xF7) message too
-						break;
-					}
-					case 0xF1: // MIDI Time Code Quarter Frame
-						this->iPlayPointer++; // message data (ignored)
-						break;
-					case 0xF2: // Song position pointer
-						this->iPlayPointer++; // message data (ignored)
-						this->iPlayPointer++;
-						break;
-					case 0xF3: // Song select
-						this->iPlayPointer++; // message data (ignored)
-						AdPlug_LogWrite("CMF: MIDI Song Select is not implemented.\n");
-						break;
-					case 0xF6: // Tune request
-						break;
-					case 0xF7: // End of System Exclusive (EOX) - should never be read, should be absorbed by Sysex handling code
-						break;
-
-					// These messages are "real time", meaning they can be sent between
-					// the bytes of other messages - but we're lazy and don't handle these
-					// here (hopefully they're not necessary in a MIDI file, and even less
-					// likely to occur in a CMF.)
-					case 0xF8: // Timing clock (sent 24 times per quarter note, only when playing)
-					case 0xFA: // Start
-					case 0xFB: // Continue
-					case 0xFE: // Active sensing (sent every 300ms or MIDI connection assumed lost)
-						break;
-					case 0xFC: // Stop
-						AdPlug_LogWrite("CMF: Received Real Time Stop message (0xFC)\n");
-						this->bSongEnd = true;
-						this->iPlayPointer = 0; // for repeat in endless-play mode
-						break;
-					case 0xFF: { // System reset, used as meta-events in a MIDI file
-						uint8_t iEvent = this->datathis->iPlayPointer++;
-						switch (iEvent) {
-							case 0x2F: // end of track
-								AdPlug_LogWrite("CMF: End-of-track, stopping playback\n");
-								this->bSongEnd = true;
-								this->iPlayPointer = 0; // for repeat in endless-play mode
-								break;
-							default:
-								AdPlug_LogWrite("CMF: Unknown MIDI meta-event 0xFF 0x%02X\n", iEvent);
-								break;
-						}
-						break;
-					}
-					default:
-						AdPlug_LogWrite("CMF: Unknown MIDI system command 0x%02X\n", iCommand);
-						break;
-				}
-				break;
-			default:
-				AdPlug_LogWrite("CMF: Unknown MIDI command 0x%02X\n", iCommand);
-				break;
-		}
-
-		if (this->iPlayPointer >= this->iSongLen) {
-			this->bSongEnd = true;
-			this->iPlayPointer = 0; // for repeat in endless-play mode
-		}
-
-		// Read in the number of ticks until the next event
-		this->iDelayRemaining = this->readMIDINumber();
-	}
-
-	return !this->bSongEnd;
-}
-
-void CcmfPlayer::rewind(int subsong)
-{
- this->opl->init();
-
-	// Initialise
-
- // Enable use of WaveSel register on OPL3 (even though we're only an OPL2!)
- // Apparently this enables nine-channel mode?
-	this->writeOPL(0x01, 0x20);
-
-	// Disable OPL3 mode (can be left enabled by a previous non-CMF song)
-	this->writeOPL(0x05, 0x00);
-
-	// Really make sure CSM+SEL are off (again, Creative's player...)
-	this->writeOPL(0x08, 0x00);
-
-	// This freq setting is required for the hihat to sound correct at the start
-	// of funky.cmf, even though it's for an unrelated channel.
-	// If it's here however, it makes the hihat in Word Rescue's theme.cmf
-	// sound really bad.
-	// TODO: How do we figure out whether we need it or not???
-	this->writeOPL(BASE_FNUM_L + 8, 514 & 0xFF);
-	this->writeOPL(BASE_KEYON_FREQ + 8, (1 << 2) | (514 >> 8));
-
-	// default freqs?
-	this->writeOPL(BASE_FNUM_L + 7, 509 & 0xFF);
-	this->writeOPL(BASE_KEYON_FREQ + 7, (2 << 2) | (509 >> 8));
-	this->writeOPL(BASE_FNUM_L + 6, 432 & 0xFF);
-	this->writeOPL(BASE_KEYON_FREQ + 6, (2 << 2) | (432 >> 8));
-
-	// Amplify AM + VIB depth. Creative's CMF player does this, and there
-	// doesn't seem to be any way to stop it from doing so - except for the
-	// non-standard controller 0x63 I added :-)
-	this->writeOPL(0xBD, 0xC0);
-
-	this->bSongEnd = false;
-	this->iPlayPointer = 0;
-	this->iPrevCommand = 0; // just in case
-
-	// Read in the number of ticks until the first event
-	this->iDelayRemaining = this->readMIDINumber();
-
- // Reset song state. This used to be in the constructor, but the XMMS2
- // plugin sets the song length before starting playback. AdPlug plays the
- // song in its entirety (with no synth) to determine the song length, which
- // results in the state variables below matching the end of the song. When
- // the real OPL synth is activated for playback, it no longer matches the
- // state variables and the instruments are not set correctly!
-	for (int i = 0; i < 9; i++) {
-		this->chOPLi.iNoteStart = 0; // no note playing atm
-		this->chOPLi.iMIDINote = -1;
-		this->chOPLi.iMIDIChannel = -1;
-		this->chOPLi.iMIDIPatch = -1;
-
-		this->chMIDIi.iPatch = -2;
-		this->chMIDIi.iPitchbend = 8192;
-	}
-	for (int i = 9; i < 16; i++) {
-		this->chMIDIi.iPatch = -2;
-		this->chMIDIi.iPitchbend = 8192;
-	}
-
-	memset(this->iCurrentRegs, 0, 256);
-
-	return;
-}
-
-// Return value: 1 == 1 second, 2 == 0.5 seconds
-float CcmfPlayer::getrefresh()
-{
-	if (this->iDelayRemaining) {
-		return (float)this->cmfHeader.iTicksPerSecond / (float)this->iDelayRemaining;
-	} else {
-		// Delay-remaining is zero (e.g. start of song) so use a tiny delay
-		return this->cmfHeader.iTicksPerSecond; // wait for one tick
-	}
-}
-
-std::string CcmfPlayer::gettitle()
-{
-	return this->strTitle;
-}
-std::string CcmfPlayer::getauthor()
-{
-	return this->strComposer;
-}
-std::string CcmfPlayer::getdesc()
-{
-	return this->strRemarks;
-}
-
-
-//
-// PROTECTED
-//
-
-// Read a variable-length integer from MIDI data
-uint32_t CcmfPlayer::readMIDINumber()
-{
-	uint32_t iValue = 0;
-	for (int i = 0; i < 4; i++) {
-		uint8_t iNext = this->datathis->iPlayPointer++;
-		iValue <<= 7;
-		iValue |= (iNext & 0x7F); // ignore the MSB
-		if ((iNext & 0x80) == 0) break; // last byte has the MSB unset
-	}
-	return iValue;
-}
-
-// iChannel: OPL channel (0-8)
-// iOperator: 0 == Modulator, 1 == Carrier
-// Source - source operator to read from instrument definition
-// Dest - destination operator on OPL chip
-// iInstrument: Index into this->pInstruments array of CMF instruments
-void CcmfPlayer::writeInstrumentSettings(uint8_t iChannel, uint8_t iOperatorSource, uint8_t iOperatorDest, uint8_t iInstrument)
-{
-	assert(iChannel <= 8);
-
-	uint8_t iOPLOffset = OPLOFFSET(iChannel);
-	if (iOperatorDest) iOPLOffset += 3; // Carrier if iOperator == 1 (else Modulator)
-
-	this->writeOPL(BASE_CHAR_MULT + iOPLOffset, this->pInstrumentsiInstrument.opiOperatorSource.iCharMult);
-	this->writeOPL(BASE_SCAL_LEVL + iOPLOffset, this->pInstrumentsiInstrument.opiOperatorSource.iScalingOutput);
-	this->writeOPL(BASE_ATCK_DCAY + iOPLOffset, this->pInstrumentsiInstrument.opiOperatorSource.iAttackDecay);
-	this->writeOPL(BASE_SUST_RLSE + iOPLOffset, this->pInstrumentsiInstrument.opiOperatorSource.iSustainRelease);
-	this->writeOPL(BASE_WAVE + iOPLOffset, this->pInstrumentsiInstrument.opiOperatorSource.iWaveSel);
-
-	// TODO: Check to see whether we should only be loading this for one or both operators
-	this->writeOPL(BASE_FEED_CONN + iChannel, this->pInstrumentsiInstrument.iConnection);
-	return;
-}
-
-// Write a byte to the OPL "chip" and update the current record of register states
-void CcmfPlayer::writeOPL(uint8_t iRegister, uint8_t iValue)
-{
-	this->opl->write(iRegister, iValue);
-	this->iCurrentRegsiRegister = iValue;
-	return;
-}
-
-void CcmfPlayer::cmfNoteOn(uint8_t iChannel, uint8_t iNote, uint8_t iVelocity)
-{
-	uint8_t iBlock = iNote / 12;
-	if (iBlock > 1) iBlock--; // keep in the same range as the Creative player
-	//if (iBlock > 7) iBlock = 7; // don't want to go out of range
-
-	double d = pow(2, (
-		(double)iNote + (
-			(this->chMIDIiChannel.iPitchbend - 8192) / 8192.0
-		) + (
-			this->iTranspose / 128
-		) - 9) / 12.0 - (iBlock - 20))
-		* 440.0 / 32.0 / 50000.0;
-	uint16_t iOPLFNum = (uint16_t)(d+0.5);
-	if (iOPLFNum > 1023) AdPlug_LogWrite("CMF: This note is out of range! (send this song to malvineous@shikadi.net!)\n");
-
-	// See if we're playing a rhythm mode percussive instrument
-	if ((iChannel > 10) && (this->bPercussive)) {
-		uint8_t iPercChannel = this->getPercChannel(iChannel);
-
-		// Will have to set every time (easier) than figuring out whether the mod
-		// or car needs to be changed.
-		//if (this->chOPLiPercChannel.iMIDIPatch != this->chMIDIiChannel.iPatch) {
-			this->MIDIchangeInstrument(iPercChannel, iChannel, this->chMIDIiChannel.iPatch);
-		//}
-
-		/* Velocity calculations - TODO: Work out the proper formula
-
-		iVelocity -> iLevel (values generated by Creative's player)
-		7f -> 00
-		7c -> 00
-
-		7b -> 09
-		73 -> 0a
-		6b -> 0b
-		63 -> 0c
-		5b -> 0d
-		53 -> 0e
-		4b -> 0f
-		43 -> 10
-		3b -> 11
-		33 -> 13
-		2b -> 15
-		23 -> 19
-		1b -> 1b
-		13 -> 1d
-		0b -> 1f
-		03 -> 21
-
-		02 -> 21
-		00 -> N/A (note off)
-		*/
-		// Approximate formula, need to figure out more accurate one (my maths isn't so good...)
-		int iLevel = 0x25 - (int) sqrt(iVelocity * 16 /* 6 */); // (127 - iVelocity) * 0x20 / 127;
-		if (iVelocity > 0x7b) iLevel = 0; // full volume
-		if (iLevel < 0) iLevel = 0;
-		if (iLevel > 0x3F) iLevel = 0x3F;
-		//if (iVelocity < 0x40) iLevel = 0x10;
-
-		int iOPLOffset = BASE_SCAL_LEVL + OPLOFFSET(iPercChannel);
-		//if ((iChannel == 11) || (iChannel == 12) || (iChannel == 14)) {
-		if (iChannel == 11) iOPLOffset += 3; // only do bassdrum carrier for volume control
-		//iOPLOffset += 3; // carrier
-		this->writeOPL(iOPLOffset, (this->iCurrentRegsiOPLOffset & ~0x3F) | iLevel);//(iVelocity * 0x3F / 127));
-		//}
-		// Bass drum (ch11) uses both operators
-		//if (iChannel == 11) this->writeOPL(iOPLOffset + 3, (this->iCurrentRegsiOPLOffset + 3 & ~0x3F) | iLevel);
-
-/*		#ifdef USE_VELOCITY // Official CMF player seems to ignore velocity levels
-			uint16_t iLevel = 0x2F - (iVelocity * 0x2F / 127); // 0x2F should be 0x3F but it's too quiet then
-			AdPlug_LogWrite("%02X + vel %d (lev %02X) == %02X\n", this->iCurrentRegsiOPLOffset, iVelocity, iLevel, (this->iCurrentRegsiOPLOffset & ~0x3F) | iLevel);
-			//this->writeOPL(iOPLOffset, (this->iCurrentRegsiOPLOffset & ~0x3F) | (0x3F - (iVelocity >> 1)));//(iVelocity * 0x3F / 127));
-			this->writeOPL(iOPLOffset, (this->iCurrentRegsiOPLOffset & ~0x3F) | iLevel);//(iVelocity * 0x3F / 127));
-		#endif*/
-
-		// Apparently you can't set the frequency for the cymbal or hihat?
-		// Vinyl requires you don't set it, Kiloblaster requires you do!
-		this->writeOPL(BASE_FNUM_L + iPercChannel, iOPLFNum & 0xFF);
-		this->writeOPL(BASE_KEYON_FREQ + iPercChannel, (iBlock << 2) | ((iOPLFNum >> 8) & 0x03));
-
-		uint8_t iBit = 1 << (15 - iChannel);
-
-		// Turn the perc instrument off if it's already playing (OPL can't do
-		// polyphonic notes w/ percussion)
-		if (this->iCurrentRegsBASE_RHYTHM & iBit) this->writeOPL(BASE_RHYTHM, this->iCurrentRegsBASE_RHYTHM & ~iBit);
-
-		// I wonder whether we need to delay or anything here?
-
-		// Turn the note on
-		//if (iChannel == 15) {
-		this->writeOPL(BASE_RHYTHM, this->iCurrentRegsBASE_RHYTHM | iBit);
-		//AdPlug_LogWrite("CMF: Note %d on MIDI channel %d (mapped to OPL channel %d-1) - vel %02X, fnum %d/%d\n", iNote, iChannel, iPercChannel+1, iVelocity, iOPLFNum, iBlock);
-		//}
-
-		this->chOPLiPercChannel.iNoteStart = ++this->iNoteCount;
-		this->chOPLiPercChannel.iMIDIChannel = iChannel;
-		this->chOPLiPercChannel.iMIDINote = iNote;
-
-	} else { // Non rhythm-mode or a normal instrument channel
-
-		// Figure out which OPL channel to play this note on
-		int iOPLChannel = -1;
-		int iNumChannels = this->bPercussive ? 6 : 9;
-		for (int i = iNumChannels - 1; i >= 0; i--) {
-			// If there's no note playing on this OPL channel, use that
-			if (this->chOPLi.iNoteStart == 0) {
-				iOPLChannel = i;
-				// See if this channel is already set to the instrument we want.
-				if (this->chOPLi.iMIDIPatch == this->chMIDIiChannel.iPatch) {
-					// It is, so stop searching
-					break;
-				} // else keep searching just in case there's a better match
-			}
-		}
-		if (iOPLChannel == -1) {
-			// All channels were in use, find the one with the longest note
-			iOPLChannel = 0;
-			int iEarliest = this->chOPL0.iNoteStart;
-			for (int i = 1; i < iNumChannels; i++) {
-				if (this->chOPLi.iNoteStart < iEarliest) {
-					// Found a channel with a note being played for longer
-					iOPLChannel = i;
-					iEarliest = this->chOPLi.iNoteStart;
-				}
-			}
-			AdPlug_LogWrite("CMF: Too many polyphonic notes, cutting note on channel %d\n", iOPLChannel);
-		}
-
-		// Run through all the channels with negative notestart values - these
-		// channels have had notes recently stop - and increment the counter
-		// to slowly move the channel closer to being reused for a future note.
-		//for (int i = 0; i < iNumChannels; i++) {
-		//	if (this->chOPLi.iNoteStart < 0) this->chOPLi.iNoteStart++;
-		//}
-
-		// Now the new note should be played on iOPLChannel, but see if the instrument
-		// is right first.
-		if (this->chOPLiOPLChannel.iMIDIPatch != this->chMIDIiChannel.iPatch) {
-			this->MIDIchangeInstrument(iOPLChannel, iChannel, this->chMIDIiChannel.iPatch);
-		}
-
-		this->chOPLiOPLChannel.iNoteStart = ++this->iNoteCount;
-		this->chOPLiOPLChannel.iMIDIChannel = iChannel;
-		this->chOPLiOPLChannel.iMIDINote = iNote;
-
-		#ifdef USE_VELOCITY // Official CMF player seems to ignore velocity levels
-			// Adjust the channel volume to match the note velocity
-			uint8_t iOPLOffset = BASE_SCAL_LEVL + OPLOFFSET(iChannel) + 3; // +3 == Carrier
-			uint16_t iLevel = 0x2F - (iVelocity * 0x2F / 127); // 0x2F should be 0x3F but it's too quiet then
-			this->writeOPL(iOPLOffset, (this->iCurrentRegsiOPLOffset & ~0x3F) | iLevel);
-		#endif
-
-		// Set the frequency and play the note
-		this->writeOPL(BASE_FNUM_L + iOPLChannel, iOPLFNum & 0xFF);
-		this->writeOPL(BASE_KEYON_FREQ + iOPLChannel, OPLBIT_KEYON | (iBlock << 2) | ((iOPLFNum & 0x300) >> 8));
-	}
-	return;
-}
-
-void CcmfPlayer::cmfNoteOff(uint8_t iChannel, uint8_t iNote, uint8_t iVelocity)
-{
-	if ((iChannel > 10) && (this->bPercussive)) {
-		int iOPLChannel = this->getPercChannel(iChannel);
-		if (this->chOPLiOPLChannel.iMIDINote != iNote) return; // there's a different note playing now
-		this->writeOPL(BASE_RHYTHM, this->iCurrentRegsBASE_RHYTHM & ~(1 << (15 - iChannel)));
-		this->chOPLiOPLChannel.iNoteStart = 0; // channel free
-	} else { // Non rhythm-mode or a normal instrument channel
-		int iOPLChannel = -1;
-		int iNumChannels = this->bPercussive ? 6 : 9;
-		for (int i = 0; i < iNumChannels; i++) {
-			if (
-				(this->chOPLi.iMIDIChannel == iChannel) &&
-				(this->chOPLi.iMIDINote == iNote) &&
-				(this->chOPLi.iNoteStart != 0)
-			) {
-				// Found the note, switch it off
-				this->chOPLi.iNoteStart = 0;
-				iOPLChannel = i;
-				break;
-			}
-		}
-		if (iOPLChannel == -1) return;
-
-		this->writeOPL(BASE_KEYON_FREQ + iOPLChannel, this->iCurrentRegsBASE_KEYON_FREQ + iOPLChannel & ~OPLBIT_KEYON);
-	}
-	return;
-}
-
-uint8_t CcmfPlayer::getPercChannel(uint8_t iChannel)
-{
-	switch (iChannel) {
-		case 11: return 7-1; // Bass drum
-		case 12: return 8-1; // Snare drum
-		case 13: return 9-1; // Tom tom
-		case 14: return 9-1; // Top cymbal
-		case 15: return 8-1; // Hihat
-	}
-	AdPlug_LogWrite("CMF ERR: Tried to get the percussion channel from MIDI channel %d - this shouldn't happen!\n", iChannel);
-	return 0;
-}
-
-
-void CcmfPlayer::MIDIchangeInstrument(uint8_t iOPLChannel, uint8_t iMIDIChannel, uint8_t iNewInstrument)
-{
-	if ((iMIDIChannel > 10) && (this->bPercussive)) {
-		switch (iMIDIChannel) {
-			case 11: // Bass drum (operator 13+16 == channel 7 modulator+carrier)
-				this->writeInstrumentSettings(7-1, 0, 0, iNewInstrument);
-				this->writeInstrumentSettings(7-1, 1, 1, iNewInstrument);
-				break;
-			case 12: // Snare drum (operator 17 == channel 8 carrier)
-			//case 15:
-				this->writeInstrumentSettings(8-1, 0, 1, iNewInstrument);
-
-				//
-				//this->writeInstrumentSettings(8-1, 0, 0, iNewInstrument);
-				break;
-			case 13: // Tom tom (operator 15 == channel 9 modulator)
-			//case 14:
-				this->writeInstrumentSettings(9-1, 0, 0, iNewInstrument);
-
-				//
-				//this->writeInstrumentSettings(9-1, 0, 1, iNewInstrument);
-				break;
-			case 14: // Top cymbal (operator 18 == channel 9 carrier)
-				this->writeInstrumentSettings(9-1, 0, 1, iNewInstrument);
-				break;
-			case 15: // Hi-hat (operator 14 == channel 8 modulator)
-				this->writeInstrumentSettings(8-1, 0, 0, iNewInstrument);
-				break;
-			default:
-				AdPlug_LogWrite("CMF: Invalid MIDI channel %d (not melodic and not percussive!)\n", iMIDIChannel + 1);
-				break;
-		}
-		this->chOPLiOPLChannel.iMIDIPatch = iNewInstrument;
-	} else {
-		// Standard nine OPL channels
-		this->writeInstrumentSettings(iOPLChannel, 0, 0, iNewInstrument);
-		this->writeInstrumentSettings(iOPLChannel, 1, 1, iNewInstrument);
-		this->chOPLiOPLChannel.iMIDIPatch = iNewInstrument;
-	}
-	return;
-}
-
-void CcmfPlayer::MIDIcontroller(uint8_t iChannel, uint8_t iController, uint8_t iValue)
-{
-	switch (iController) {
-		case 0x63:
-			// Custom extension to allow CMF files to switch the AM+VIB depth on and
-			// off (officially both are on, and there's no way to switch them off.)
-			// Controller values:
-			// 0 == AM+VIB off
-			// 1 == VIB on
-			// 2 == AM on
-			// 3 == AM+VIB on
-			if (iValue) {
-				this->writeOPL(BASE_RHYTHM, (this->iCurrentRegsBASE_RHYTHM & ~0xC0) | (iValue << 6)); // switch AM+VIB extension on
-			} else {
-				this->writeOPL(BASE_RHYTHM, this->iCurrentRegsBASE_RHYTHM & ~0xC0); // switch AM+VIB extension off
-			}
-			AdPlug_LogWrite("CMF: AM+VIB depth change - AM %s, VIB %s\n",
-				(this->iCurrentRegsBASE_RHYTHM & 0x80) ? "on" : "off",
-				(this->iCurrentRegsBASE_RHYTHM & 0x40) ? "on" : "off");
-			break;
-		case 0x66:
-			AdPlug_LogWrite("CMF: Song set marker to 0x%02X\n", iValue);
-			break;
-		case 0x67:
-			this->bPercussive = (iValue != 0);
-			if (this->bPercussive) {
-				this->writeOPL(BASE_RHYTHM, this->iCurrentRegsBASE_RHYTHM | 0x20); // switch rhythm-mode on
-			} else {
-				this->writeOPL(BASE_RHYTHM, this->iCurrentRegsBASE_RHYTHM & ~0x20); // switch rhythm-mode off
-			}
-			AdPlug_LogWrite("CMF: Percussive/rhythm mode %s\n", this->bPercussive ? "enabled" : "disabled");
-			break;
-		case 0x68:
-			// TODO: Shouldn't this just affect the one channel, not the whole song? -- have pitchbends for that
-			this->iTranspose = iValue;
-			AdPlug_LogWrite("CMF: Transposing all notes up by %d * 1/128ths of a semitone.\n", iValue);
-			break;
-		case 0x69:
-			this->iTranspose = -iValue;
-			AdPlug_LogWrite("CMF: Transposing all notes down by %d * 1/128ths of a semitone.\n", iValue);
-			break;
-		default:
-			AdPlug_LogWrite("CMF: Unsupported MIDI controller 0x%02X, ignoring.\n", iController);
-			break;
-	}
-	return;
-}

audacious-plugins-3.6.2-gtk3.tar.bz2/src/adplug/core/cmf.h Deleted

@@ -1,112 +0,0 @@
-/*
- * Adplug - Replayer for many OPL2/OPL3 audio file formats.
- * Copyright (C) 1999 - 2009 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
- *
- * cmf.h - CMF player by Adam Nielsen <malvineous@shikadi.net>
- */
-
-#include <stdint.h> // for uintxx_t
-#include "player.h"
-
-typedef struct {
-	uint16_t iInstrumentBlockOffset;
-	uint16_t iMusicOffset;
-	uint16_t iTicksPerQuarterNote;
-	uint16_t iTicksPerSecond;
-	uint16_t iTagOffsetTitle;
-	uint16_t iTagOffsetComposer;
-	uint16_t iTagOffsetRemarks;
-	uint8_t iChannelsInUse16;
-	uint16_t iNumInstruments;
-	uint16_t iTempo;
-} CMFHEADER;
-
-typedef struct {
-	uint8_t iCharMult;
-	uint8_t iScalingOutput;
-	uint8_t iAttackDecay;
-	uint8_t iSustainRelease;
-	uint8_t iWaveSel;
-} OPERATOR;
-
-typedef struct {
-	OPERATOR op2; // 0 == modulator, 1 == carrier
-	uint8_t iConnection;
-} SBI;
-
-typedef struct {
-	int iPatch; // MIDI patch for this channel
-	int iPitchbend; // Current pitchbend amount for this channel
-} MIDICHANNEL;
-
-typedef struct {
-	int iNoteStart; // When the note started playing (longest notes get cut first, 0 == channel free)
-	int iMIDINote; // MIDI note number currently being played on this OPL channel
-	int iMIDIChannel; // Source MIDI channel where this note came from
-	int iMIDIPatch; // Current MIDI patch set on this OPL channel
-} OPLCHANNEL;
-
-class CcmfPlayer: public CPlayer
-{
-	private:
-		uint8_t *data; // song data (CMF music block)
-		int iPlayPointer;		// Current location of playback pointer
-		int iSongLen; // Max value for iPlayPointer
-		CMFHEADER cmfHeader;
-		SBI *pInstruments;
-		bool bPercussive; // are rhythm-mode instruments enabled?
-		uint8_t iCurrentRegs256; // Current values in the OPL chip
-		int iTranspose; // Transpose amount for entire song (between -128 and +128)
-		uint8_t iPrevCommand; // Previous command (used for repeated MIDI commands, as the seek and playback code need to share this)
-
-		int iNoteCount; // Used to count how long notes have been playing for
-		MIDICHANNEL chMIDI16;
-		OPLCHANNEL chOPL9;
-
-		// Additions for AdPlug's design
-		int iDelayRemaining;
-		bool bSongEnd;
-		std::string strTitle, strComposer, strRemarks;
-
-	public:
-		static CPlayer *factory(Copl *newopl);
-
-		CcmfPlayer(Copl *newopl);
-		~CcmfPlayer();
-
-		bool load(VFSFile &fd, const CFileProvider &fp);
-		bool update();
-		void rewind(int subsong);
-		float getrefresh();
-
-		std::string gettype()
-			{ return std::string("Creative Music File (CMF)"); };
-		std::string gettitle();
-		std::string getauthor();
-		std::string getdesc();
-
-	protected:
-		uint32_t readMIDINumber();
-		void writeInstrumentSettings(uint8_t iChannel, uint8_t iOperatorSource, uint8_t iOperatorDest, uint8_t iInstrument);
-		void writeOPL(uint8_t iRegister, uint8_t iValue);
-		void cmfNoteOn(uint8_t iChannel, uint8_t iNote, uint8_t iVelocity);
-		void cmfNoteOff(uint8_t iChannel, uint8_t iNote, uint8_t iVelocity);
-		uint8_t getPercChannel(uint8_t iChannel);
-		void MIDIchangeInstrument(uint8_t iOPLChannel, uint8_t iMIDIChannel, uint8_t iNewInstrument);
-		void MIDIcontroller(uint8_t iChannel, uint8_t iController, uint8_t iValue);
-
-};

audacious-plugins-3.6.2-gtk3.tar.bz2/src/adplug/core/d00.cc Deleted

@@ -1,653 +0,0 @@
-/*
- * 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
- *
- * d00.c - D00 Player by Simon Peter <dn.tlp@gmx.net>
- *
- * NOTES:
- * Sorry for the goto's, but the code looks so much nicer now.
- * I tried it with while loops but it was just a mess. If you
- * can come up with a nicer solution, just tell me.
- *
- * BUGS:
- * Hard restart SR is sometimes wrong
- */
-
-#include <string.h>
-#include <stdio.h>
-#include <inttypes.h>
-
-#include "debug.h"
-#include "d00.h"
-
-#define HIBYTE(val)	(val >> 8)
-#define LOBYTE(val)	(val & 0xff)
-
-static const unsigned short notetable12 = // D00 note table
-{ 340, 363, 385, 408, 432, 458, 485, 514, 544, 577, 611, 647 };
-
-static inline uint16_t
-LE_WORD (const uint16_t * val)
-{
- const uint8_t *b = (const uint8_t *) val;
- return (b1 << 8) + b0;
-}
-
-/*** public methods *************************************/
-
-CPlayer *
-Cd00Player::factory (Copl * newopl)
-{
- return new Cd00Player (newopl);
-}
-
-bool
-Cd00Player::load (VFSFile & fd, const CFileProvider & fp)
-{
- binistream *f = fp.open (fd);
- if (!f)
- return false;
- d00header *checkhead;
- d00header1 *ch;
- unsigned long filesize;
- int i, ver1 = 0;
- char *str;
- std::string filename (fd.filename ());
-
- // file validation section
- checkhead = new d00header;
- f->readString ((char *) checkhead, sizeof (d00header));
-
- // Check for version 2-4 header
- if (strncmp (checkhead->id, "JCH\x26\x02\x66", 6) || checkhead->type ||
- !checkhead->subsongs || checkhead->soundcard)
- {
- // Check for version 0 or 1 header (and .d00 file extension)
- delete checkhead;
- if (!fp.extension (filename, ".d00"))
- {
- fp.close (f);
- return false;
- }
- ch = new d00header1;
- f->seek (0);
- f->readString ((char *) ch, sizeof (d00header1));
- if (ch->version > 1 || !ch->subsongs)
- {
- delete ch;
- fp.close (f);
- return false;
- }
- delete ch;
- ver1 = 1;
- }
- else
- delete checkhead;
-
- AdPlug_LogWrite
- ("Cd00Player::load(f,\"%s\"): %s format D00 file detected!\n",
- filename.c_str (), ver1 ? "Old" : "New");
-
- // load section
- filesize = fp.filesize (f);
- f->seek (0);
- filedata = new charfilesize + 1; // 1 byte is needed for old-style DataInfo block
- f->readString ((char *) filedata, filesize);
- fp.close (f);
- if (!ver1)
- { // version 2 and above
- header = (struct d00header *) filedata;
- version = header->version;
- datainfo = (char *) filedata + LE_WORD (&header->infoptr);
- inst = (struct Sinsts *) ((char *) filedata + LE_WORD (&header->instptr));
- seqptr =
- (unsigned short *) ((char *) filedata + LE_WORD (&header->seqptr));
- for (i = 31; i >= 0; i--) // erase whitespace
- if (header->songnamei == ' ')
- header->songnamei = '\0';
- else
- break;
- for (i = 31; i >= 0; i--)
- if (header->authori == ' ')
- header->authori = '\0';
- else
- break;
- }
- else
- { // version 1
- header1 = (struct d00header1 *) filedata;
- version = header1->version;
- datainfo = (char *) filedata + LE_WORD (&header1->infoptr);
- inst =
- (struct Sinsts *) ((char *) filedata + LE_WORD (&header1->instptr));
- seqptr =
- (unsigned short *) ((char *) filedata + LE_WORD (&header1->seqptr));
- }
- switch (version)
- {
- case 0:
- levpuls = 0;
- spfx = 0;
- header1->speed = 70; // v0 files default to 70Hz
- break;
- case 1:
- levpuls =
- (struct Slevpuls *) ((char *) filedata + LE_WORD (&header1->lpulptr));
- spfx = 0;
- break;
- case 2:
- levpuls =
- (struct Slevpuls *) ((char *) filedata + LE_WORD (&header->spfxptr));
- spfx = 0;
- break;
- case 3:
- spfx = 0;
- levpuls = 0;
- break;
- case 4:
- spfx = (struct Sspfx *) ((char *) filedata + LE_WORD (&header->spfxptr));
- levpuls = 0;
- break;
- }
- if ((str = strstr (datainfo, "\xff\xff")))
- while ((*str == '\xff' || *str == ' ') && str >= datainfo)
- {
- *str = '\0';
- str--;
- }
- else // old-style block
- memset ((char *) filedata + filesize, 0, 1);
-
- rewind (0);
- return true;
-}
-
-bool
-Cd00Player::update ()
-{
- unsigned char c, cnt, trackend = 0, fx, note;
- unsigned short ord, *patt, buf, fxop, pattpos;
-
- // effect handling (timer dependant)
- for (c = 0; c < 9; c++)
- {
- channelc.slideval += channelc.slide;
- setfreq (c); // sliding
- vibrato (c); // vibrato
-
- if (channelc.spfx != 0xffff)
- { // SpFX
- if (channelc.fxdel)
- channelc.fxdel--;
- else
- {
- channelc.spfx = LE_WORD (&spfxchannelc.spfx.ptr);
- channelc.fxdel = spfxchannelc.spfx.duration;
- channelc.inst = LE_WORD (&spfxchannelc.spfx.instnr) & 0xfff;
- if (spfxchannelc.spfx.modlev != 0xff)
- channelc.modvol = spfxchannelc.spfx.modlev;
- setinst (c);
- if (LE_WORD (&spfxchannelc.spfx.instnr) & 0x8000) // locked frequency
- note = spfxchannelc.spfx.halfnote;
- else // unlocked frequency
- note = spfxchannelc.spfx.halfnote + channelc.note;
- channelc.freq = notetablenote % 12 + ((note / 12) << 10);
- setfreq (c);
- }
- channelc.modvol += spfxchannelc.spfx.modlevadd;
- channelc.modvol &= 63;
- setvolume (c);
- }
-
- if (channelc.levpuls != 0xff) // Levelpuls
- {
- if (channelc.frameskip)
- channelc.frameskip--;
- else
- {
- channelc.frameskip = instchannelc.inst.timer;
- if (channelc.fxdel)
- channelc.fxdel--;
- else
- {
- channelc.levpuls = levpulschannelc.levpuls.ptr - 1;
- channelc.fxdel = levpulschannelc.levpuls.duration;
- if (levpulschannelc.levpuls.level != 0xff)
- channelc.modvol = levpulschannelc.levpuls.level;
- }
- channelc.modvol += levpulschannelc.levpuls.voladd;
- channelc.modvol &= 63;
- setvolume (c);
- }
- }
- }
-
- // song handling
- for (c = 0; c < 9; c++)
- if (version < 3 ? channelc.del : channelc.del <= 0x7f)
- {
- if (version == 4) // v4: hard restart SR
- if (channelc.del == instchannelc.inst.timer)
- if (channelc.nextnote)
- opl->write (0x83 + op_tablec, instchannelc.inst.sr);
- if (version < 3)
- channelc.del--;
- else if (channelc.speed)
- channelc.del += channelc.speed;
- else
- {
- channelc.seqend = 1;
- continue;
- }
- }
- else
- {
- if (channelc.speed)
- {
- if (version < 3)
- channelc.del = channelc.speed;
- else
- {
- channelc.del &= 0x7f;
- channelc.del += channelc.speed;
- }
- }
- else
- {
- channelc.seqend = 1;
- continue;
- }
- if (channelc.rhcnt)
- { // process pending REST/HOLD events
- channelc.rhcnt--;
- continue;
- }
- readorder: // process arrangement (orderlist)
- ord = LE_WORD (&channelc.orderchannelc.ordpos);
- switch (ord)
- {
- case 0xfffe:
- channelc.seqend = 1;
- continue; // end of arrangement stream
- case 0xffff: // jump to order
- channelc.ordpos =
- LE_WORD (&channelc.orderchannelc.ordpos + 1);
- channelc.seqend = 1;
- goto readorder;
- default:
- if (ord >= 0x9000)
- { // set speed
- channelc.speed = ord & 0xff;
- ord = LE_WORD (&channelc.orderchannelc.ordpos - 1);
- channelc.ordpos++;
- }
- else if (ord >= 0x8000)
- { // transpose track
- channelc.transpose = ord & 0xff;
- if (ord & 0x100)
- channelc.transpose = -channelc.transpose;
- ord = LE_WORD (&channelc.order++channelc.ordpos);
- }
- patt =
- (unsigned short *) ((char *) filedata + LE_WORD (&seqptrord));
- break;
- }
- channelc.fxflag = 0;
- readseq: // process sequence (pattern)
- if (!version) // v0: always initialize rhcnt
- channelc.rhcnt = channelc.irhcnt;
- pattpos = LE_WORD (&pattchannelc.pattpos);
- if (pattpos == 0xffff)
- { // pattern ended?
- channelc.pattpos = 0;
- channelc.ordpos++;
- goto readorder;
- }
- cnt = HIBYTE (pattpos);
- note = LOBYTE (pattpos);
- fx = pattpos >> 12;
- fxop = pattpos & 0x0fff;
- channelc.pattpos++;
- pattpos = LE_WORD (&pattchannelc.pattpos);
- channelc.nextnote = LOBYTE (pattpos) & 0x7f;
- if (version ? cnt < 0x40 : !fx)
- { // note event
- switch (note)
- {
- case 0: // REST event
- case 0x80:
- if (!note || version)
- {
- channelc.key = 0;
- setfreq (c);
- }
- // fall through...
- case 0x7e: // HOLD event
- if (version)
- channelc.rhcnt = cnt;
- channelc.nextnote = 0;
- break;
- default: // play note
- // restart fx
- if (!(channelc.fxflag & 1))
- channelc.vibdepth = 0;
- if (!(channelc.fxflag & 2))
- channelc.slideval = channelc.slide = 0;
-
- if (version)
- { // note handling for v1 and above
- if (note > 0x80) // locked note (no channel transpose)
- note -= 0x80;
- else // unlocked note
- note += channelc.transpose;
- channelc.note = note; // remember note for SpFX
-
- if (channelc.ispfx != 0xffff && cnt < 0x20)
- { // reset SpFX
- channelc.spfx = channelc.ispfx;
- if (LE_WORD (&spfxchannelc.spfx.instnr) & 0x8000) // locked frequency
- note = spfxchannelc.spfx.halfnote;
- else // unlocked frequency
- note += spfxchannelc.spfx.halfnote;
- channelc.inst =
- LE_WORD (&spfxchannelc.spfx.instnr) & 0xfff;
- channelc.fxdel = spfxchannelc.spfx.duration;
- if (spfxchannelc.spfx.modlev != 0xff)
- channelc.modvol = spfxchannelc.spfx.modlev;
- else
- channelc.modvol = instchannelc.inst.data7 & 63;
- }
-
- if (channelc.ilevpuls != 0xff && cnt < 0x20)
- { // reset LevelPuls
- channelc.levpuls = channelc.ilevpuls;
- channelc.fxdel = levpulschannelc.levpuls.duration;
- channelc.frameskip = instchannelc.inst.timer;
- if (levpulschannelc.levpuls.level != 0xff)
- channelc.modvol = levpulschannelc.levpuls.level;
- else
- channelc.modvol = instchannelc.inst.data7 & 63;
- }
-
- channelc.freq = notetablenote % 12 + ((note / 12) << 10);
- if (cnt < 0x20) // normal note
- playnote (c);
- else
- { // tienote
- setfreq (c);
- cnt -= 0x20; // make count proper
- }
- channelc.rhcnt = cnt;
- }
- else
- { // note handling for v0
- if (cnt < 2) // unlocked note
- note += channelc.transpose;
- channelc.note = note;
-
- channelc.freq = notetablenote % 12 + ((note / 12) << 10);
- if (cnt == 1) // tienote
- setfreq (c);
- else // normal note
- playnote (c);
- }
- break;
- }
- continue; // event is complete
- }
- else
- { // effect event
- switch (fx)
- {
- case 6: // Cut/Stop Voice
- buf = channelc.inst;
- channelc.inst = 0;
- playnote (c);
- channelc.inst = buf;
- channelc.rhcnt = fxop;
- continue; // no note follows this event
- case 7: // Vibrato
- channelc.vibspeed = fxop & 0xff;
- channelc.vibdepth = fxop >> 8;
- channelc.trigger = fxop >> 9;
- channelc.fxflag |= 1;
- break;
- case 8: // v0: Duration
- if (!version)
- channelc.irhcnt = fxop;
- break;
- case 9: // New Level
- channelc.vol = fxop & 63;
- if (channelc.vol + channelc.cvol < 63) // apply channel volume
- channelc.vol += channelc.cvol;
- else
- channelc.vol = 63;
- setvolume (c);
- break;
- case 0xb: // v4: Set SpFX
- if (version == 4)
- channelc.ispfx = fxop;
- break;
- case 0xc: // Set Instrument
- channelc.ispfx = 0xffff;
- channelc.spfx = 0xffff;
- channelc.inst = fxop;
- channelc.modvol = instfxop.data7 & 63;
- if (version < 3 && version && instfxop.tunelev) // Set LevelPuls
- channelc.ilevpuls = instfxop.tunelev - 1;
- else
- {
- channelc.ilevpuls = 0xff;
- channelc.levpuls = 0xff;
- }
- break;
- case 0xd: // Slide up
- channelc.slide = fxop;
- channelc.fxflag |= 2;
- break;
- case 0xe: // Slide down
- channelc.slide = -fxop;
- channelc.fxflag |= 2;
- break;
- }
- goto readseq; // event is incomplete, note follows
- }
- }
-
- for (c = 0; c < 9; c++)
- if (channelc.seqend)
- trackend++;
- if (trackend == 9)
- songend = 1;
-
- return !songend;
-}
-
-void
-Cd00Player::rewind (int subsong)
-{
- struct Stpoin
- {
- unsigned short ptr9;
- unsigned char volume9, dummy5;
- } *tpoin;
- int i;
-
- if(subsong == -1) subsong = cursubsong;
-
- if (version > 1)
- { // do nothing if subsong > number of subsongs
- if (subsong >= header->subsongs)
- return;
- }
- else if (subsong >= header1->subsongs)
- return;
-
- memset (channel, 0, sizeof (channel));
- if (version > 1)
- tpoin = (struct Stpoin *) ((char *) filedata + LE_WORD (&header->tpoin));
- else
- tpoin = (struct Stpoin *) ((char *) filedata + LE_WORD (&header1->tpoin));
- for (i = 0; i < 9; i++)
- {
- if (LE_WORD (&tpoinsubsong.ptri))
- { // track enabled
- channeli.speed = LE_WORD ((unsigned short *)
- ((char *) filedata +
- LE_WORD (&tpoinsubsong.ptri)));
- channeli.order =
- (unsigned short *) ((char *) filedata +
- LE_WORD (&tpoinsubsong.ptri) + 2);
- }
- else
- { // track disabled
- channeli.speed = 0;
- channeli.order = 0;
- }
- channeli.ispfx = 0xffff;
- channeli.spfx = 0xffff; // no SpFX
- channeli.ilevpuls = 0xff;
- channeli.levpuls = 0xff; // no LevelPuls
- channeli.cvol = tpoinsubsong.volumei & 0x7f; // our player may savely ignore bit 7
- channeli.vol = channeli.cvol; // initialize volume
- }
- songend = 0;
- opl->init ();
- opl->write (1, 32); // reset OPL chip
- cursubsong = subsong;
-}
-
-std::string Cd00Player::gettype ()
-{
- char
- tmpstr40;
-
- sprintf (tmpstr, "EdLib packed (version %d)",
- version > 1 ? header->version : header1->version);
- return std::string (tmpstr);
-}
-
-float
-Cd00Player::getrefresh ()
-{
- if (version > 1)
- return header->speed;
- else
- return header1->speed;
-}
-
-unsigned int
-Cd00Player::getsubsongs ()
-{
- if (version <= 1) // return number of subsongs
- return header1->subsongs;
- else
- return header->subsongs;
-}
-
-/*** private methods *************************************/
-
-void
-Cd00Player::setvolume (unsigned char chan)
-{
- unsigned char op = op_tablechan;
- unsigned short insnr = channelchan.inst;
-
- opl->write (0x43 + op,
- (int) (63 -
- ((63 - (instinsnr.data2 & 63)) / 63.0) * (63 -
- channel
- chan.
- vol)) +
- (instinsnr.data2 & 192));
- if (instinsnr.data10 & 1)
- opl->write (0x40 + op,
- (int) (63 -
- ((63 - channelchan.modvol) / 63.0) * (63 -
- channelchan.
- vol)) +
- (instinsnr.data7 & 192));
- else
- opl->write (0x40 + op,
- channelchan.modvol + (instinsnr.data7 & 192));
-}
-
-void
-Cd00Player::setfreq (unsigned char chan)
-{
- unsigned short freq = channelchan.freq;
-
- if (version == 4) // v4: apply instrument finetune
- freq += instchannelchan.inst.tunelev;
-
- freq += channelchan.slideval;
- opl->write (0xa0 + chan, freq & 255);
- if (channelchan.key)
- opl->write (0xb0 + chan, ((freq >> 8) & 31) | 32);
- else
- opl->write (0xb0 + chan, (freq >> 8) & 31);
-}
-
-void
-Cd00Player::setinst (unsigned char chan)
-{
- unsigned char op = op_tablechan;
- unsigned short insnr = channelchan.inst;
-
- // set instrument data
- opl->write (0x63 + op, instinsnr.data0);
- opl->write (0x83 + op, instinsnr.data1);
- opl->write (0x23 + op, instinsnr.data3);
- opl->write (0xe3 + op, instinsnr.data4);
- opl->write (0x60 + op, instinsnr.data5);
- opl->write (0x80 + op, instinsnr.data6);
- opl->write (0x20 + op, instinsnr.data8);
- opl->write (0xe0 + op, instinsnr.data9);
- if (version)
- opl->write (0xc0 + chan, instinsnr.data10);
- else
- opl->write (0xc0 + chan,
- (instinsnr.data10 << 1) + (instinsnr.tunelev & 1));
-}
-
-void
-Cd00Player::playnote (unsigned char chan)
-{
- // set misc vars & play
- opl->write (0xb0 + chan, 0); // stop old note
- setinst (chan);
- channelchan.key = 1;
- setfreq (chan);
- setvolume (chan);
-}
-
-void
-Cd00Player::vibrato (unsigned char chan)
-{
- if (!channelchan.vibdepth)
- return;
-
- if (channelchan.trigger)
- channelchan.trigger--;
- else
- {
- channelchan.trigger = channelchan.vibdepth;
- channelchan.vibspeed = -channelchan.vibspeed;
- }
- channelchan.freq += channelchan.vibspeed;
- setfreq (chan);
-}

audacious-plugins-3.6.2-gtk3.tar.bz2/src/adplug/core/d00.h Deleted

@@ -1,107 +0,0 @@
-/*
- * 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
- *
- * d00.h - D00 Player by Simon Peter <dn.tlp@gmx.net>
- */
-
-#ifndef H_D00
-#define H_D00
-
-#include "player.h"
-
-class Cd00Player: public CPlayer
-{
- public:
- static CPlayer *factory(Copl *newopl);
-
-	Cd00Player(Copl *newopl)
-		: CPlayer(newopl), filedata(0)
-	{ };
-	~Cd00Player()
-	{ if(filedata) delete filedata; };
-
-	bool load(VFSFile &fd, const CFileProvider &fp);
-	bool update();
-	void rewind(int subsong);
-	float getrefresh();
-
-	std::string gettype();
-	std::string gettitle()
-	{ if(version > 1) return std::string(header->songname); else return std::string(); };
-	std::string getauthor()
-	{ if(version > 1) return std::string(header->author); else return std::string(); };
-	std::string getdesc()
-	{ if(*datainfo) return std::string(datainfo); else return std::string(); };
-	unsigned int getsubsongs();
-
- protected:
-#pragma pack(1)
-	struct d00header {
-		char id6;
-		unsigned char type,version,speed,subsongs,soundcard;
-		char songname32,author32,dummy32;
-		unsigned short tpoin,seqptr,instptr,infoptr,spfxptr,endmark;
-	};
-
-	struct d00header1 {
-		unsigned char version,speed,subsongs;
-		unsigned short tpoin,seqptr,instptr,infoptr,lpulptr,endmark;
-	};
-#pragma pack()
-
-	struct {
-		unsigned short	*order,ordpos,pattpos,del,speed,rhcnt,key,freq,inst,spfx,ispfx,irhcnt;
-		signed short	transpose,slide,slideval,vibspeed;
-		unsigned char	seqend,vol,vibdepth,fxdel,modvol,cvol,levpuls,frameskip,nextnote,note,ilevpuls,trigger,fxflag;
-	} channel9;
-
-	struct Sinsts {
-		unsigned char data11,tunelev,timer,sr,dummy2;
-	} *inst;
-
-	struct Sspfx {
-		unsigned short instnr;
-		signed char halfnote;
-		unsigned char modlev;
-		signed char modlevadd;
-		unsigned char duration;
-		unsigned short ptr;
-	} *spfx;
-
-	struct Slevpuls {
-		unsigned char level;
-		signed char voladd;
-		unsigned char duration,ptr;
-	} *levpuls;
-
-	unsigned char songend,version,cursubsong;
-	char *datainfo;
-	unsigned short *seqptr;
-	d00header *header;
-	d00header1 *header1;
-	char *filedata;
-
- private:
-	void setvolume(unsigned char chan);
-	void setfreq(unsigned char chan);
-	void setinst(unsigned char chan);
-	void playnote(unsigned char chan);
-	void vibrato(unsigned char chan);
-};
-
-#endif

audacious-plugins-3.6.2-gtk3.tar.bz2/src/adplug/core/database.cc Deleted

@@ -1,520 +0,0 @@
-/*
- * AdPlug - Replayer for many OPL2/OPL3 audio file formats.
- * Copyright (c) 1999 - 2006 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
- *
- * database.cpp - AdPlug database class
- * Copyright (c) 2002 Riven the Mage <riven@ok.ru>
- * Copyright (c) 2002, 2003, 2006 Simon Peter <dn.tlp@gmx.net>
- */
-
-#include "binio_virtual.h"
-#include <string.h>
-
-#include "database.h"
-
-#define DB_FILEID_V10	"AdPlug Module Information Database 1.0\x10"
-
-/***** CAdPlugDatabase *****/
-
-const unsigned short
- CAdPlugDatabase::hash_radix = 0xfff1; // should be prime
-
-CAdPlugDatabase::CAdPlugDatabase ():linear_index (0), linear_logic_length (0),
-linear_length (0)
-{
- db_linear = new DB_Bucket *hash_radix;
- db_hashed = new DB_Bucket *hash_radix;
- memset (db_linear, 0, sizeof (DB_Bucket *) * hash_radix);
- memset (db_hashed, 0, sizeof (DB_Bucket *) * hash_radix);
-}
-
-CAdPlugDatabase::~CAdPlugDatabase ()
-{
- unsigned long i;
-
- for (i = 0; i < linear_length; i++)
- delete db_lineari;
-
- deletedb_linear;
- deletedb_hashed;
-}
-
-bool
-CAdPlugDatabase::load (std::string db_name)
-{
- vfsistream f (db_name);
- if (f.error ())
- return false;
- return load (f);
-}
-
-bool
-CAdPlugDatabase::load (binistream & f)
-{
- unsigned int idlen = strlen (DB_FILEID_V10);
- char *id = new charidlen;
- unsigned long length;
-
- // Open database as little endian with IEEE floats
- f.setFlag (binio::BigEndian, false);
- f.setFlag (binio::FloatIEEE);
-
- f.readString (id, idlen);
- if (memcmp (id, DB_FILEID_V10, idlen))
- {
- deleteid;
- return false;
- }
- deleteid;
- length = f.readInt (4);
-
- // read records
- for (unsigned long i = 0; i < length; i++)
- insert (CRecord::factory (f));
-
- return true;
-}
-
-bool
-CAdPlugDatabase::save (std::string db_name)
-{
- vfsostream f (db_name);
- if (f.error ())
- return false;
- return save (f);
-}
-
-bool
-CAdPlugDatabase::save (binostream & f)
-{
- unsigned long i;
-
- // Save database as little endian with IEEE floats
- f.setFlag (binio::BigEndian, false);
- f.setFlag (binio::FloatIEEE);
-
- f.writeString (DB_FILEID_V10);
- f.writeInt (linear_logic_length, 4);
-
- // write records
- for (i = 0; i < linear_length; i++)
- if (!db_lineari->deleted)
- db_lineari->record->write (f);
-
- return true;
-}
-
-CAdPlugDatabase::CRecord * CAdPlugDatabase::search (CKey const &key)
-{
- if (lookup (key))
- return get_record ();
- else
- return 0;
-}
-
-bool
-CAdPlugDatabase::lookup (CKey const &key)
-{
- unsigned long index = make_hash (key);
- if (!db_hashedindex)
- return false;
-
- // immediate hit ?
- DB_Bucket *bucket = db_hashedindex;
-
- if (!bucket->deleted && bucket->record->key == key)
- {
- linear_index = bucket->index;
- return true;
- }
-
- // in-chain hit ?
- bucket = db_hashedindex->chain;
-
- while (bucket)
- {
- if (!bucket->deleted && bucket->record->key == key)
- {
- linear_index = bucket->index;
- return true;
- }
-
- bucket = bucket->chain;
- }
-
- return false;
-}
-
-bool
-CAdPlugDatabase::insert (CRecord * record)
-{
- long index;
-
- // sanity checks
- if (!record)
- return false; // null-pointer given
- if (linear_length == hash_radix)
- return false; // max. db size exceeded
- if (lookup (record->key))
- return false; // record already in db
-
- // make bucket
- DB_Bucket *bucket = new DB_Bucket (linear_length, record);
- if (!bucket)
- return false;
-
- // add to linear list
- db_linearlinear_length = bucket;
- linear_logic_length++;
- linear_length++;
-
- // add to hashed list
- index = make_hash (record->key);
-
- if (!db_hashedindex) // First entry in hashtable
- db_hashedindex = bucket;
- else
- { // Add entry in chained list
- DB_Bucket *chain = db_hashedindex;
-
- while (chain->chain)
- chain = chain->chain;
- chain->chain = bucket;
- }
-
- return true;
-}
-
-void
-CAdPlugDatabase::wipe (CRecord * record)
-{
- if (!lookup (record->key))
- return;
- wipe ();
-}
-
-void
-CAdPlugDatabase::wipe ()
-{
- if (!linear_length)
- return;
-
- DB_Bucket *bucket = db_linearlinear_index;
-
- if (!bucket->deleted)
- {
- delete bucket->record;
- linear_logic_length--;
- bucket->deleted = true;
- }
-}
-
-CAdPlugDatabase::CRecord * CAdPlugDatabase::get_record ()
-{
- if (!linear_length)
- return 0;
- return db_linearlinear_index->record;
-}
-
-bool
-CAdPlugDatabase::go_forward ()
-{
- if (linear_index + 1 < linear_length)
- {
- linear_index++;
- return true;
- }
- else
- return false;
-}
-
-bool
-CAdPlugDatabase::go_backward ()
-{
- if (!linear_index)
- return false;
- linear_index--;
- return true;
-}
-
-void
-CAdPlugDatabase::goto_begin ()
-{
- if (linear_length)
- linear_index = 0;
-}
-
-void
-CAdPlugDatabase::goto_end ()
-{
- if (linear_length)
- linear_index = linear_length - 1;
-}
-
-inline unsigned long
-CAdPlugDatabase::make_hash (CKey const &key)
-{
- return (key.crc32 + key.crc16) % hash_radix;
-}
-
-/***** CAdPlugDatabase::DB_Bucket *****/
-
-CAdPlugDatabase::DB_Bucket::DB_Bucket (unsigned long nindex, CRecord * newrecord, DB_Bucket * newchain):index (nindex), deleted (false), chain (newchain),
-record
-(newrecord)
-{
-}
-
-CAdPlugDatabase::DB_Bucket::~DB_Bucket ()
-{
- if (!deleted)
- delete
- record;
-}
-
-/***** CAdPlugDatabase::CRecord *****/
-
-CAdPlugDatabase::CRecord * CAdPlugDatabase::CRecord::factory (RecordType type)
-{
- switch (type)
- {
- case Plain:
- return new CPlainRecord;
- case SongInfo:
- return new CInfoRecord;
- case ClockSpeed:
- return new CClockRecord;
- default:
- return 0;
- }
-}
-
-CAdPlugDatabase::CRecord * CAdPlugDatabase::CRecord::factory (binistream & in)
-{
- RecordType
- type;
- unsigned long
- size;
- CRecord *
- rec;
-
- type = (RecordType) in.readInt (1);
- size = in.readInt (4);
- rec = factory (type);
-
- if (rec)
- {
- rec->key.crc16 = in.readInt (2);
- rec->key.crc32 = in.readInt (4);
- rec->filetype = in.readString ('\0');
- rec->comment = in.readString ('\0');
- rec->read_own (in);
- return rec;
- }
- else
- {
- // skip this record, cause we don't know about it
- in.seek (size, binio::Add);
- return 0;
- }
-}
-
-void
-CAdPlugDatabase::CRecord::write (binostream & out)
-{
- out.writeInt (type, 1);
- out.writeInt (get_size () + filetype.length () + comment.length () + 8, 4);
- out.writeInt (key.crc16, 2);
- out.writeInt (key.crc32, 4);
- out.writeString (filetype);
- out.writeInt ('\0', 1);
- out.writeString (comment);
- out.writeInt ('\0', 1);
-
- write_own (out);
-}
-
-bool
-CAdPlugDatabase::CRecord::user_read (std::istream & in, std::ostream & out)
-{
- return user_read_own (in, out);
-}
-
-bool
-CAdPlugDatabase::CRecord::user_write (std::ostream & out)
-{
- out << "Record type: ";
- switch (type)
- {
- case Plain:
- out << "Plain";
- break;
- case SongInfo:
- out << "SongInfo";
- break;
- case ClockSpeed:
- out << "ClockSpeed";
- break;
- default:
- out << "*** Unknown ***";
- break;
- }
- out << std::endl;
- out << "Key: " << std::hex << key.crc16 << ":" << key.
- crc32 << std::dec << std::endl;
- out << "File type: " << filetype << std::endl;
- out << "Comment: " << comment << std::endl;
-
- return user_write_own (out);
-}
-
-/***** CAdPlugDatabase::CRecord::CKey *****/
-
-CAdPlugDatabase::CKey::CKey (binistream & buf)
-{
- make (buf);
-}
-
-bool
-CAdPlugDatabase::CKey::operator== (const CKey & key)
-{
- return ((crc16 == key.crc16) && (crc32 == key.crc32));
-}
-
-void
-CAdPlugDatabase::CKey::make (binistream & buf)
-// Key is CRC16:CRC32 pair. CRC16 and CRC32 calculation routines (c) Zhengxi
-{
- static const unsigned short
- magic16 = 0xa001;
- static const unsigned long
- magic32 = 0xedb88320;
-
- crc16 = 0;
- crc32 = ~0;
-
- while (!buf.eof ())
- {
- unsigned char
- byte = buf.readInt (1);
-
- for (int j = 0; j < 8; j++)
- {
- if ((crc16 ^ byte) & 1)
- crc16 = (crc16 >> 1) ^ magic16;
- else
- crc16 >>= 1;
-
- if ((crc32 ^ byte) & 1)
- crc32 = (crc32 >> 1) ^ magic32;
- else
- crc32 >>= 1;
-
- byte >>= 1;
- }
- }
-
- crc16 &= 0xffff;
- crc32 = ~crc32;
-}
-
-/***** CInfoRecord *****/
-
-CInfoRecord::CInfoRecord ()
-{
- type = SongInfo;
-}
-
-void
-CInfoRecord::read_own (binistream & in)
-{
- title = in.readString ('\0');
- author = in.readString ('\0');
-}
-
-void
-CInfoRecord::write_own (binostream & out)
-{
- out.writeString (title);
- out.writeInt ('\0', 1);
- out.writeString (author);
- out.writeInt ('\0', 1);
-}
-
-unsigned long
-CInfoRecord::get_size ()
-{
- return title.length () + author.length () + 2;
-}
-
-bool
-CInfoRecord::user_read_own (std::istream & in, std::ostream & out)
-{
- out << "Title: ";
- in >> title;
- out << "Author: ";
- in >> author;
- return true;
-}
-
-bool
-CInfoRecord::user_write_own (std::ostream & out)
-{
- out << "Title: " << title << std::endl;
- out << "Author: " << author << std::endl;
- return true;
-}
-
-/***** CClockRecord *****/
-
-CClockRecord::CClockRecord ():clock (0.0f)
-{
- type = ClockSpeed;
-}
-
-void
-CClockRecord::read_own (binistream & in)
-{
- clock = in.readFloat (binio::Single);
-}
-
-void
-CClockRecord::write_own (binostream & out)
-{
- out.writeFloat (clock, binio::Single);
-}
-
-unsigned long
-CClockRecord::get_size ()
-{
- return 4;
-}
-
-bool
-CClockRecord::user_read_own (std::istream & in, std::ostream & out)
-{
- out << "Clockspeed: ";
- in >> clock;
- return true;
-}
-
-bool
-CClockRecord::user_write_own (std::ostream & out)
-{
- out << "Clock speed: " << clock << " Hz" << std::endl;
- return true;
-}

audacious-plugins-3.6.2-gtk3.tar.bz2/src/adplug/core/database.h Deleted

@@ -1,170 +0,0 @@
-/*
- * AdPlug - Replayer for many OPL2/OPL3 audio file formats.
- * Copyright (c) 1999 - 2003 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
- *
- * database.h - AdPlug database class
- * Copyright (c) 2002 Riven the Mage <riven@ok.ru>
- * Copyright (c) 2002, 2003 Simon Peter <dn.tlp@gmx.net>
- */
-
-#ifndef H_ADPLUG_DATABASE
-#define H_ADPLUG_DATABASE
-
-#include <iostream>
-#include <string>
-
-#include "binio_virtual.h"
-
-class CAdPlugDatabase
-{
-public:
- class CKey
- {
- public:
- unsigned short	crc16;
- unsigned long	crc32;
-
- CKey() {};
- CKey(binistream &in);
-
- bool operator==(const CKey &key);
-
- private:
- void make(binistream &in);
- };
-
- class CRecord
- {
- public:
- typedef enum { Plain, SongInfo, ClockSpeed } RecordType;
-
- RecordType	type;
- CKey	key;
- std::string	filetype, comment;
-
- static CRecord *factory(RecordType type);
- static CRecord *factory(binistream &in);
-
- CRecord() {}
- virtual ~CRecord() {}
-
- void write(binostream &out);
-
- bool user_read(std::istream &in, std::ostream &out);
- bool user_write(std::ostream &out);
-
- protected:
- virtual void read_own(binistream &in) = 0;
- virtual void write_own(binostream &out) = 0;
- virtual unsigned long get_size() = 0;
- virtual bool user_read_own(std::istream &in, std::ostream &out) = 0;
- virtual bool user_write_own(std::ostream &out) = 0;
- };
-
- CAdPlugDatabase();
- ~CAdPlugDatabase();
-
- bool	load(std::string db_name);
- bool	load(binistream &f);
- bool	save(std::string db_name);
- bool	save(binostream &f);
-
- bool	insert(CRecord *record);
-
- void	wipe(CRecord *record);
- void	wipe();
-
- CRecord *search(CKey const &key);
- bool lookup(CKey const &key);
-
- CRecord *get_record();
-
- bool	go_forward();
- bool	go_backward();
-
- void	goto_begin();
- void	goto_end();
-
-private:
- static const unsigned short hash_radix;
-
- class DB_Bucket
- {
- public:
- unsigned long	index;
- bool		deleted;
- DB_Bucket		*chain;
-
- CRecord		*record;
-
- DB_Bucket(unsigned long nindex, CRecord *newrecord, DB_Bucket *newchain = 0);
- ~DB_Bucket();
- };
-
- DB_Bucket	**db_linear;
- DB_Bucket	**db_hashed;
-
- unsigned long	linear_index, linear_logic_length, linear_length;
-
- unsigned long make_hash(CKey const &key);
-};
-
-class CPlainRecord: public CAdPlugDatabase::CRecord
-{
-public:
- CPlainRecord() { type = Plain; }
-
-protected:
- virtual void read_own(binistream &in) {}
- virtual void write_own(binostream &out) {}
- virtual unsigned long get_size() { return 0; }
- virtual bool user_read_own(std::istream &in, std::ostream &out) { return true; }
- virtual bool user_write_own(std::ostream &out) { return true; }
-};
-
-class CInfoRecord: public CAdPlugDatabase::CRecord
-{
-public:
- std::string	title;
- std::string	author;
-
- CInfoRecord();
-
-protected:
- virtual void read_own(binistream &in);
- virtual void write_own(binostream &out);
- virtual unsigned long get_size();
- virtual bool user_read_own(std::istream &in, std::ostream &out);
- virtual bool user_write_own(std::ostream &out);
-};
-
-class CClockRecord: public CAdPlugDatabase::CRecord
-{
-public:
- float	clock;
-
- CClockRecord();
-
-protected:
- virtual void read_own(binistream &in);
- virtual void write_own(binostream &out);
- virtual unsigned long get_size();
- virtual bool user_read_own(std::istream &in, std::ostream &out);
- virtual bool user_write_own(std::ostream &out);
-};
-
-#endif

audacious-plugins-3.6.2-gtk3.tar.bz2/src/adplug/core/debug.cc Deleted

@@ -1,57 +0,0 @@
-/*
- * Adplug - Replayer for many OPL2/OPL3 audio file formats.
- * Copyright (C) 1999 - 2002 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
- *
- * debug.h - AdPlug Debug Logger
- * Copyright (c) 2002 Riven the Mage <riven@ok.ru>
- * Copyright (c) 2002 Simon Peter <dn.tlp@gmx.net>
- */
-
-#ifdef DEBUG
-
-#include <stdio.h>
-#include <stdarg.h>
-
-static FILE *log = nullptr;
-
-void AdPlug_LogFile(const char *filename)
-{
- if(log) fclose(log);
- log = fopen(filename,"wt");
-}
-
-void AdPlug_LogWrite(const char *fmt, ...)
-{
- va_list argptr;
-
- va_start(argptr, fmt);
-
- if(log) {
- vfprintf(log, fmt, argptr);
- fflush(log);
- } else
- vfprintf(stderr, fmt, argptr);
-
- va_end(argptr);
-}
-
-#else
-
-void AdPlug_LogFile(const char *filename) { }
-void AdPlug_LogWrite(const char *fmt, ...) { }
-
-#endif

audacious-plugins-3.6.2-gtk3.tar.bz2/src/adplug/core/debug.h Deleted

@@ -1,40 +0,0 @@
-/*
- * Adplug - Replayer for many OPL2/OPL3 audio file formats.
- * Copyright (C) 1999 - 2002 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
- *
- * debug.h - AdPlug Debug Logger
- * Copyright (c) 2002 Riven the Mage <riven@ok.ru>
- * Copyright (c) 2002 Simon Peter <dn.tlp@gmx.net>
- *
- * NOTES:
- * This debug logger is used throughout AdPlug to log debug output to stderr
- * (the default) or to a user-specified logfile.
- *
- * To use it, AdPlug has to be compiled with debug logging support enabled.
- * This is done by defining the DEBUG macro with every source-file. The
- * LogFile() function can be used to specify a logfile to write to.
- */
-
-#ifndef H_DEBUG
-#define H_DEBUG
-
-#define ADL_DEBUG
-
-void AdPlug_LogFile(const char *filename);
-void AdPlug_LogWrite(const char *fmt, ...);
-
-#endif

audacious-plugins-3.6.2-gtk3.tar.bz2/src/adplug/core/dfm.cc Deleted

@@ -1,137 +0,0 @@
-/*
- * Adplug - Replayer for many OPL2/OPL3 audio file formats.
- * Copyright (C) 1999 - 2003 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
- *
- * dfm.cpp - Digital-FM Loader by Simon Peter <dn.tlp@gmx.net>
- */
-
-#include <stdio.h>
-#include <string.h>
-
-#include "dfm.h"
-#include "debug.h"
-
-CPlayer *
-CdfmLoader::factory (Copl * newopl)
-{
- return new CdfmLoader (newopl);
-}
-
-bool
-CdfmLoader::load (VFSFile & fd, const CFileProvider & fp)
-{
- binistream *f = fp.open (fd);
- if (!f)
- return false;
- unsigned char npats, n, note, fx, c, r, param;
- unsigned int i;
- const unsigned char convfx8 = { 255, 255, 17, 19, 23, 24, 255, 13 };
-
- // file validation
- f->readString (header.id, 4);
- header.hiver = f->readInt (1);
- header.lover = f->readInt (1);
- if (strncmp (header.id, "DFM\x1a", 4) || header.hiver > 1)
- {
- fp.close (f);
- return false;
- }
-
- // load
- restartpos = 0;
- flags = Standard;
- bpm = 0;
- init_trackord ();
- f->readString (songinfo, 33);
- initspeed = f->readInt (1);
- for (i = 0; i < 32; i++)
- f->readString (instnamei, 12);
- for (i = 0; i < 32; i++)
- {
- insti.data1 = f->readInt (1);
- insti.data2 = f->readInt (1);
- insti.data9 = f->readInt (1);
- insti.data10 = f->readInt (1);
- insti.data3 = f->readInt (1);
- insti.data4 = f->readInt (1);
- insti.data5 = f->readInt (1);
- insti.data6 = f->readInt (1);
- insti.data7 = f->readInt (1);
- insti.data8 = f->readInt (1);
- insti.data0 = f->readInt (1);
- }
- for (i = 0; i < 128; i++)
- orderi = f->readInt (1);
- for (i = 0; i < 128 && orderi != 128; i++);
- length = i;
- npats = f->readInt (1);
- for (i = 0; i < npats; i++)
- {
- n = f->readInt (1);
- for (r = 0; r < 64; r++)
- for (c = 0; c < 9; c++)
- {
- note = f->readInt (1);
- if ((note & 15) == 15)
- tracksn * 9 + cr.note = 127; // key off
- else
- tracksn * 9 + cr.note = ((note & 127) >> 4) * 12 + (note & 15);
- if (note & 128)
- { // additional effect byte
- fx = f->readInt (1);
- if (fx >> 5 == 1)
- tracksn * 9 + cr.inst = (fx & 31) + 1;
- else
- {
- tracksn * 9 + cr.command = convfxfx >> 5;
- if (tracksn * 9 + cr.command == 17)
- { // set volume
- param = fx & 31;
- param = 63 - param * 2;
- tracksn * 9 + cr.param1 = param >> 4;
- tracksn * 9 + cr.param2 = param & 15;
- }
- else
- {
- tracksn * 9 + cr.param1 = (fx & 31) >> 4;
- tracksn * 9 + cr.param2 = fx & 15;
- }
- }
- }
-
- }
- }
-
- fp.close (f);
- rewind (0);
- return true;
-}
-
-std::string CdfmLoader::gettype ()
-{
- char
- tmpstr20;
-
- sprintf (tmpstr, "Digital-FM %d.%d", header.hiver, header.lover);
- return std::string (tmpstr);
-}
-
-float
-CdfmLoader::getrefresh ()
-{
- return 125.0f;
-}

audacious-plugins-3.6.2-gtk3.tar.bz2/src/adplug/core/dfm.h Deleted

@@ -1,52 +0,0 @@
-/*
- * Adplug - Replayer for many OPL2/OPL3 audio file formats.
- * Copyright (C) 1999 - 2003 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
- *
- * dfm.h - Digital-FM Loader by Simon Peter <dn.tlp@gmx.net>
- */
-
-#include "protrack.h"
-
-class CdfmLoader: public CmodPlayer
-{
-public:
- static CPlayer *factory(Copl *newopl);
-
-	CdfmLoader(Copl *newopl)
-		: CmodPlayer(newopl)
-	{ };
-
-	bool load(VFSFile &fd, const CFileProvider &fp);
-	float getrefresh();
-
-	std::string gettype();
-	unsigned int getinstruments()
-	{ return 32; };
-	std::string getinstrument(unsigned int n)
-	{ if(*instnamen) return std::string(instnamen,1,*instnamen); else return std::string(); };
-	std::string getdesc()
-	{ return std::string(songinfo,1,*songinfo); };
-
-private:
-	struct {
-		char id4;
-		unsigned char hiver,lover;
-	} header;
-
-	char songinfo33;
-	char instname3212;
-};

audacious-plugins-3.6.2-gtk3.tar.bz2/src/adplug/core/diskopl.h Deleted

@@ -1,52 +0,0 @@
-/*
- * Adplug - Replayer for many OPL2/OPL3 audio file formats.
- * Copyright (C) 1999 - 2005 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
- *
- * diskopl.h - Disk Writer OPL, by Simon Peter <dn.tlp@gmx.net>
- */
-
-#include <string>
-#include <stdio.h>
-#include "opl.h"
-#include "player.h"
-
-class CDiskopl: public Copl
-{
- public:
- CDiskopl(std::string filename);
- virtual ~CDiskopl();
-
- void update(CPlayer *p);			// write to file
- void setnowrite(bool nw = true)		// set file write status
- { nowrite = nw; };
-
- void setchip(int n);
-
- // template methods
- void write(int reg, int val);
- void init();
-
- private:
- static const unsigned char	op_table9;
-
- FILE		*f;
- float		old_freq;
- unsigned char	del;
- bool		nowrite;			// don't write to file, if true
-
- void diskwrite(int reg, int val);
-};

audacious-plugins-3.6.2-gtk3.tar.bz2/src/adplug/core/dmo.cc Deleted

@@ -1,456 +0,0 @@
-/*
- Adplug - Replayer for many OPL2/OPL3 audio file formats.
- Copyright (C) 1999 - 2004, 2006 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
-
- dmo.cpp - TwinTeam loader by Riven the Mage <riven@ok.ru>
-*/
-/*
- NOTES:
- Panning is ignored.
-
- A WORD ist 16 bits, a DWORD is 32 bits and a BYTE is 8 bits in this context.
-*/
-
-#include <string.h>
-#include <binstr.h>
-
-#include "dmo.h"
-#include "debug.h"
-
-#define LOWORD(l) ((l) & 0xffff)
-#define HIWORD(l) ((l) >> 16)
-#define LOBYTE(w) ((w) & 0xff)
-#define HIBYTE(w) ((w) >> 8)
-
-#define ARRAY_AS_DWORD(a, i) \
-((ai + 3 << 24) + (ai + 2 << 16) + (ai + 1 << 8) + ai)
-#define ARRAY_AS_WORD(a, i)	((ai + 1 << 8) + ai)
-
-#define CHARP_AS_WORD(p)	(((*(p + 1)) << 8) + (*p))
-
-/* -------- Public Methods -------------------------------- */
-
-CPlayer *
-CdmoLoader::factory (Copl * newopl)
-{
- return new CdmoLoader (newopl);
-}
-
-bool
-CdmoLoader::load (VFSFile & fd, const CFileProvider & fp)
-{
- int i, j;
- binistream *f;
- std::string filename (fd.filename ());
-
- // check header
- dmo_unpacker *unpacker = new dmo_unpacker;
- unsigned char chkhdr16;
-
- f = fp.open (fd);
- if (!f)
- {
- delete unpacker;
- return false;
- }
- if (!fp.extension (filename, ".dmo"))
- {
- delete unpacker;
- return false;
- }
-
- f->readString ((char *) chkhdr, 16);
-
- if (!unpacker->decrypt (chkhdr, 16))
- {
- delete unpacker;
- fp.close (f);
- return false;
- }
-
- // get file size
- long packed_length = fp.filesize (f);
- f->seek (0);
-
- unsigned char *packed_module = new unsigned charpacked_length;
-
- // load file
- f->readString ((char *) packed_module, packed_length);
- fp.close (f);
-
- // decrypt
- unpacker->decrypt (packed_module, packed_length);
-
- long unpacked_length = 0x2000 * ARRAY_AS_WORD (packed_module, 12);
- unsigned char *module = new unsigned charunpacked_length;
-
- // unpack
- if (!unpacker->unpack (packed_module + 12, module, unpacked_length))
- {
- delete unpacker;
- deletepacked_module;
- deletemodule;
- return false;
- }
-
- delete unpacker;
- deletepacked_module;
-
- // "TwinTeam" - signed ?
- if (memcmp (module, "TwinTeam Module File" "\x0D\x0A", 22))
- {
- delete module;
- return false;
- }
-
- // load header
- binisstream uf (module, unpacked_length);
- uf.setFlag (binio::BigEndian, false);
- uf.setFlag (binio::FloatIEEE);
-
- memset (&header, 0, sizeof (s3mheader));
-
- uf.ignore (22); // ignore DMO header ID string
- uf.readString (header.name, 28);
-
- uf.ignore (2); // _unk_1
- header.ordnum = uf.readInt (2);
- header.insnum = uf.readInt (2);
- header.patnum = uf.readInt (2);
- uf.ignore (2); // _unk_2
- header.is = uf.readInt (2);
- header.it = uf.readInt (2);
-
- memset (header.chanset, 0xFF, 32);
-
- for (i = 0; i < 9; i++)
- header.chanseti = 0x10 + i;
-
- uf.ignore (32); // ignore panning settings for all 32 channels
-
- // load orders
- for (i = 0; i < 256; i++)
- ordersi = uf.readInt (1);
-
- ordersheader.ordnum = 0xFF;
-
- // load pattern lengths
- unsigned short my_patlen100;
- for (i = 0; i < 100; i++)
- my_patleni = uf.readInt (2);
-
- // load instruments
- for (i = 0; i < header.insnum; i++)
- {
- memset (&insti, 0, sizeof (s3minst));
-
- uf.readString (insti.name, 28);
-
- insti.volume = uf.readInt (1);
- insti.dsk = uf.readInt (1);
- insti.c2spd = uf.readInt (4);
- insti.type = uf.readInt (1);
- insti.d00 = uf.readInt (1);
- insti.d01 = uf.readInt (1);
- insti.d02 = uf.readInt (1);
- insti.d03 = uf.readInt (1);
- insti.d04 = uf.readInt (1);
- insti.d05 = uf.readInt (1);
- insti.d06 = uf.readInt (1);
- insti.d07 = uf.readInt (1);
- insti.d08 = uf.readInt (1);
- insti.d09 = uf.readInt (1);
- insti.d0a = uf.readInt (1);
- /*
- * Originally, riven sets d0b = d0a and ignores 1 byte in the
- * stream, but i guess this was a typo, so i read it here.
- */
- insti.d0b = uf.readInt (1);
- }
-
- // load patterns
- for (i = 0; i < header.patnum; i++)
- {
- long cur_pos = uf.pos ();
-
- for (j = 0; j < 64; j++)
- {
- while (1)
- {
- unsigned char token = uf.readInt (1);
-
- if (!token)
- break;
-
- unsigned char chan = token & 31;
-
- // note + instrument ?
- if (token & 32)
- {
- unsigned char bufbyte = uf.readInt (1);
-
- patternijchan.note = bufbyte & 15;
- patternijchan.oct = bufbyte >> 4;
- patternijchan.instrument = uf.readInt (1);
- }
-
- // volume ?
- if (token & 64)
- patternijchan.volume = uf.readInt (1);
-
- // command ?
- if (token & 128)
- {
- patternijchan.command = uf.readInt (1);
- patternijchan.info = uf.readInt (1);
- }
- }
- }
-
- uf.seek (cur_pos + my_patleni);
- }
-
- deletemodule;
- rewind (0);
- return true;
-}
-
-std::string CdmoLoader::gettype ()
-{
- return std::string ("TwinTeam (packed S3M)");
-}
-
-std::string CdmoLoader::getauthor ()
-{
- /*
- All available .DMO modules written by one composer. And because all .DMO
- stuff was lost due to hd crash (TwinTeam guys said this), there are
- never(?) be another.
- */
- return std::string ("Benjamin GERARDIN");
-}
-
-/* -------- Private Methods ------------------------------- */
-
-unsigned short
-CdmoLoader::dmo_unpacker::brand (unsigned short range)
-{
- unsigned short
- ax,
- bx,
- cx,
- dx;
-
- ax = LOWORD (bseed);
- bx = HIWORD (bseed);
- cx = ax;
- ax = LOWORD (cx * 0x8405);
- dx = HIWORD (cx * 0x8405);
- cx <<= 3;
- cx = (((HIBYTE (cx) + LOBYTE (cx)) & 0xFF) << 8) + LOBYTE (cx);
- dx += cx;
- dx += bx;
- bx <<= 2;
- dx += bx;
- dx = (((HIBYTE (dx) + LOBYTE (bx)) & 0xFF) << 8) + LOBYTE (dx);
- bx <<= 5;
- dx = (((HIBYTE (dx) + LOBYTE (bx)) & 0xFF) << 8) + LOBYTE (dx);
- ax += 1;
- if (!ax)
- dx += 1;
-
- // leave it that way or amd64 might get it wrong
- bseed = dx;
- bseed <<= 16;
- bseed += ax;
-
- return HIWORD (HIWORD (LOWORD (bseed) * range) + HIWORD (bseed) * range);
-}
-
-bool
-CdmoLoader::dmo_unpacker::decrypt (unsigned char *buf, long len)
-{
- unsigned long
- seed = 0;
- int
- i;
-
- bseed = ARRAY_AS_DWORD (buf, 0);
-
- for (i = 0; i < ARRAY_AS_WORD (buf, 4) + 1; i++)
- seed += brand (0xffff);
-
- bseed = seed ^ ARRAY_AS_DWORD (buf, 6);
-
- if (ARRAY_AS_WORD (buf, 10) != brand (0xffff))
- return false;
-
- for (i = 0; i < (len - 12); i++)
- buf12 + i ^= brand (0x100);
-
- buflen - 2 = buflen - 1 = 0;
-
- return true;
-}
-
-short
-CdmoLoader::dmo_unpacker::unpack_block (unsigned char *ibuf, long ilen,
- unsigned char *obuf)
-{
- unsigned char
- code,
- par1,
- par2;
- unsigned short
- ax,
- bx,
- cx;
-
- unsigned char *
- ipos = ibuf;
- unsigned char *
- opos = obuf;
-
- // LZ77 child
- while (ipos - ibuf < ilen)
- {
- code = *ipos++;
-
- // 00xxxxxx: copy (xxxxxx + 1) bytes
- if ((code >> 6) == 0)
- {
- cx = (code & 0x3F) + 1;
-
- if (opos + cx >= oend)
- return -1;
-
- for (int i = 0; i < cx; i++)
- *opos++ = *ipos++;
-
- continue;
- }
-
- // 01xxxxxx xxxyyyyy: copy (Y + 3) bytes from (X + 1)
- if ((code >> 6) == 1)
- {
- par1 = *ipos++;
-
- ax = ((code & 0x3F) << 3) + ((par1 & 0xE0) >> 5) + 1;
- cx = (par1 & 0x1F) + 3;
-
- if (opos + cx >= oend)
- return -1;
-
- for (int i = 0; i < cx; i++) {
- *opos = *(opos - ax);
- opos++;
- }
-
- continue;
- }
-
- // 10xxxxxx xyyyzzzz: copy (Y + 3) bytes from (X + 1); copy Z bytes
- if ((code >> 6) == 2)
- {
- int
- i;
-
- par1 = *ipos++;
-
- ax = ((code & 0x3F) << 1) + (par1 >> 7) + 1;
- cx = ((par1 & 0x70) >> 4) + 3;
- bx = par1 & 0x0F;
-
- if (opos + bx + cx >= oend)
- return -1;
-
- for (i = 0; i < cx; i++) {
- *opos = *(opos - ax);
- opos++;
- }
-
- for (i = 0; i < bx; i++)
- *opos++ = *ipos++;
-
- continue;
- }
-
- // 11xxxxxx xxxxxxxy yyyyzzzz: copy (Y + 4) from X; copy Z bytes
- if ((code >> 6) == 3)
- {
- int
- i;
-
- par1 = *ipos++;
- par2 = *ipos++;
-
- bx = ((code & 0x3F) << 7) + (par1 >> 1);
- cx = ((par1 & 0x01) << 4) + (par2 >> 4) + 4;
- ax = par2 & 0x0F;
-
- if (opos + ax + cx >= oend)
- return -1;
-
- for (i = 0; i < cx; i++) {
- *opos = *(opos - bx);
- opos++;
- }
-
- for (i = 0; i < ax; i++)
- *opos++ = *ipos++;
-
- continue;
- }
- }
-
- return opos - obuf;
-}
-
-long
-CdmoLoader::dmo_unpacker::unpack (unsigned char *ibuf, unsigned char *obuf,
- unsigned long outputsize)
-{
- long
- olen = 0;
- unsigned short
- block_count = CHARP_AS_WORD (ibuf);
-
- ibuf += 2;
- unsigned char *
- block_length = ibuf;
- ibuf += 2 * block_count;
-
- oend = obuf + outputsize;
-
- for (int i = 0; i < block_count; i++)
- {
- unsigned short
- bul = CHARP_AS_WORD (ibuf);
-
- if (unpack_block (ibuf + 2, CHARP_AS_WORD (block_length) - 2, obuf) !=
- bul)
- return 0;
-
- obuf += bul;
- olen += bul;
-
- ibuf += CHARP_AS_WORD (block_length);
- block_length += 2;
- }
-
- return olen;
-}

audacious-plugins-3.6.2-gtk3.tar.bz2/src/adplug/core/dmo.h Deleted

@@ -1,51 +0,0 @@
-/*
- Adplug - Replayer for many OPL2/OPL3 audio file formats.
- Copyright (C) 1999 - 2006 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
-
- dmo.cpp - TwinTeam loader by Riven the Mage <riven@ok.ru>
-*/
-
-#include "s3m.h"
-
-class CdmoLoader: public Cs3mPlayer
-{
- public:
- static CPlayer *factory(Copl *newopl);
-
- CdmoLoader(Copl *newopl) : Cs3mPlayer(newopl) { };
-
- bool	load(VFSFile &fd, const CFileProvider &fp);
-
- std::string	gettype();
- std::string	getauthor();
-
- private:
-
- class dmo_unpacker {
- public:
- bool decrypt(unsigned char *buf, long len);
- long unpack(unsigned char *ibuf, unsigned char *obuf,
-		unsigned long outputsize);
-
- private:
- unsigned short brand(unsigned short range);
- short unpack_block(unsigned char *ibuf, long ilen, unsigned char *obuf);
-
- unsigned long bseed;
- unsigned char *oend;
- };
-};

audacious-plugins-3.6.2-gtk3.tar.bz2/src/adplug/core/dro.cc Deleted

@@ -1,151 +0,0 @@
-/*
- * 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
- *
- * dro.c - DOSBox Raw OPL Player by Sjoerd van der Berg <harekiet@zophar.net>
- *
- * upgraded by matthew gambrell <zeromus@zeromus.org>
- *
- * NOTES: 3-oct-04: the DRO format is not yet finalized. beware.
- */
-
-#include <stdio.h>
-#include <string.h>
-
-#include "dro.h"
-
-/*** public methods *************************************/
-
-CPlayer *
-CdroPlayer::factory (Copl * newopl)
-{
- return new CdroPlayer (newopl);
-}
-
-CdroPlayer::CdroPlayer (Copl * newopl):CPlayer (newopl), data (0)
-{
- if (opl->gettype () == Copl::TYPE_OPL2)
- opl3_mode = 0;
- else
- opl3_mode = 1;
-}
-
-bool
-CdroPlayer::load (VFSFile & fd, const CFileProvider & fp)
-{
- binistream *f = fp.open (fd);
- if (!f)
- return false;
- char id8;
- unsigned long i;
-
- // file validation section
- f->readString (id, 8);
- if (strncmp (id, "DBRAWOPL", 8))
- {
- fp.close (f);
- return false;
- }
- int version = f->readInt (4); // not very useful just yet
- if (version != 0x10000)
- {
- fp.close (f);
- return false;
- }
-
- // load section
- mstotal = f->readInt (4); // Total milliseconds in file
- length = f->readInt (4); // Total data bytes in file
- f->ignore (4); // Type of opl data this can contain - ignored
- data = new unsigned charlength;
- for (i = 0; i < length; i++)
- datai = f->readInt (1);
- fp.close (f);
- rewind (0);
- return true;
-}
-
-bool
-CdroPlayer::update ()
-{
- if (delay > 500)
- {
- delay -= 500;
- return true;
- }
- else
- delay = 0;
-
- while (pos < length)
- {
- unsigned char cmd = datapos++;
- switch (cmd)
- {
- case 0:
- delay = 1 + datapos++;
- return true;
- case 1:
- delay = 1 + datapos + (datapos + 1 << 8);
- pos += 2;
- return true;
- case 2:
- index = 0;
- opl->setchip (0);
- break;
- case 3:
- index = 1;
- opl->setchip (1);
- break;
- default:
- if (cmd == 4)
- cmd = datapos++; //data override
- if (index == 0 || opl3_mode)
- opl->write (cmd, datapos++);
- break;
- }
- }
-
- return pos < length;
-}
-
-void
-CdroPlayer::rewind (int subsong)
-{
- delay = 1;
- pos = index = 0;
- opl->init ();
-
- //dro assumes all registers are initialized to 0
- //registers not initialized to 0 will be corrected
- //in the data stream
- for (int i = 0; i < 256; i++)
- opl->write (i, 0);
-
- opl->setchip (1);
- for (int i = 0; i < 256; i++)
- opl->write (i, 0);
- opl->setchip (0);
-}
-
-float
-CdroPlayer::getrefresh ()
-{
- if (delay > 500)
- return 1000 / 500;
- else
- return 1000 / (double) delay;
-}

audacious-plugins-3.6.2-gtk3.tar.bz2/src/adplug/core/dro.h Deleted

@@ -1,52 +0,0 @@
-/*
- * Adplug - Replayer for many OPL2/OPL3 audio file formats.
- * Copyright (C) 1999 - 2005 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
- *
- * dro.h - DOSBox Raw OPL Player by Sjoerd van der Berg <harekiet@zophar.net>
- */
-
-#include "player.h"
-
-class CdroPlayer: public CPlayer
-{
- public:
- static CPlayer *factory(Copl *newopl);
-
- CdroPlayer(Copl *newopl);
- ~CdroPlayer()
- {
- if(data)
-	delete data;
- }
-
- bool load(VFSFile &fd, const CFileProvider &fp);
- bool update();
- void rewind(int subsong);
- float getrefresh();
-
- std::string gettype()
- {
- return std::string("DOSBox Raw OPL v0.1");
- }
-
- protected:
- unsigned char *data;
- unsigned long pos,length;
- unsigned long msdone,mstotal;
- unsigned short delay;
- unsigned char index, opl3_mode;
-};

audacious-plugins-3.6.2-gtk3.tar.bz2/src/adplug/core/dro2.cc Deleted

@@ -1,142 +0,0 @@
-/*
- * 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
- *
- * dro2.cpp - DOSBox Raw OPL v2.0 player by Adam Nielsen <malvineous@shikadi.net>
- */
-
-#include <cstring>
-#include <stdio.h>
-
-#include "dro2.h"
-
-CPlayer *Cdro2Player::factory(Copl *newopl)
-{
- return new Cdro2Player(newopl);
-}
-
-Cdro2Player::Cdro2Player(Copl *newopl) :
-	CPlayer(newopl),
-	piConvTable(nullptr),
-	data(0)
-{
-}
-
-Cdro2Player::~Cdro2Player()
-{
-	if (this->data) delete this->data;
-	if (this->piConvTable) delete this->piConvTable;
-}
-
-bool Cdro2Player::load(VFSFile & fd, const CFileProvider & fp)
-{
-	binistream *f = fp.open(fd);
-	if (!f) return false;
-
-	char id8;
-	f->readString(id, 8);
-	if (strncmp(id, "DBRAWOPL", 8)) {
-		fp.close(f);
-		return false;
-	}
-	int version = f->readInt(4);
-	if (version != 0x2) {
-		fp.close(f);
-		return false;
-	}
-
-	this->iLength = f->readInt(4) * 2; // stored in file as number of byte pairs
-	f->ignore(4);	// Length in milliseconds
-	f->ignore(1);	/// OPL type (0 == OPL2, 1 == Dual OPL2, 2 == OPL3)
-	int iFormat = f->readInt(1);
-	if (iFormat != 0) {
-		fp.close(f);
-		return false;
-	}
-	int iCompression = f->readInt(1);
-	if (iCompression != 0) {
-		fp.close(f);
-		return false;
-	}
-	this->iCmdDelayS = f->readInt(1);
-	this->iCmdDelayL = f->readInt(1);
-	this->iConvTableLen = f->readInt(1);
-
-	this->piConvTable = new uint8_tthis->iConvTableLen;
-	f->readString((char *)this->piConvTable, this->iConvTableLen);
-
-	this->data = new uint8_tthis->iLength;
-	f->readString((char *)this->data, this->iLength);
-
-	fp.close(f);
-	rewind(0);
-
-	return true;
-}
-
-bool Cdro2Player::update()
-{
-	while (this->iPos < this->iLength) {
-		int iIndex = this->datathis->iPos++;
-		int iValue = this->datathis->iPos++;
-
-		// Short delay
-		if (iIndex == this->iCmdDelayS) {
-			this->iDelay = iValue + 1;
-			return true;
-
-		// Long delay
-		} else if (iIndex == this->iCmdDelayL) {
-			this->iDelay = (iValue + 1) << 8;
-			return true;
-
-		// Normal write
-		} else {
-			if (iIndex & 0x80) {
-				// High bit means use second chip in dual-OPL2 config
-				this->opl->setchip(1);
-			 iIndex &= 0x7F;
-			} else {
-			 this->opl->setchip(0);
-			}
-			if (iIndex > this->iConvTableLen) {
-				printf("DRO2: Error - index beyond end of codemap table! Corrupted .dro?\n");
-				return false; // EOF
-			}
-			int iReg = this->piConvTableiIndex;
-			this->opl->write(iReg, iValue);
-		}
-
-	}
-
-	// This won't result in endless-play using Adplay, but IMHO that code belongs
-	// in Adplay itself, not here.
- return this->iPos < this->iLength;
-}
-
-void Cdro2Player::rewind(int subsong)
-{
-	this->iDelay = 0;
-	this->iPos = 0;
- opl->init();
-}
-
-float Cdro2Player::getrefresh()
-{
-	if (this->iDelay > 0) return 1000.0 / this->iDelay;
-	else return 1000.0;
-}

audacious-plugins-3.6.2-gtk3.tar.bz2/src/adplug/core/dro2.h Deleted

@@ -1,60 +0,0 @@
-/*
- * Adplug - Replayer for many OPL2/OPL3 audio file formats.
- * Copyright (C) 1999 - 2005 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
- *
- * dro2.h - DOSBox Raw OPL v2.0 player by Adam Nielsen <malvineous@shikadi.net>
- */
-
-#include <stdint.h> // for uintxx_t
-#include "player.h"
-
-class Cdro2Player: public CPlayer
-{
-	protected:
-		uint8_t iCmdDelayS, iCmdDelayL;
-		int iConvTableLen;
-		uint8_t *piConvTable;
-
-		uint8_t *data;
-		int iLength;
-		int iPos;
-		int iDelay;
-
-
-	public:
-		static CPlayer *factory(Copl *newopl);
-
-		Cdro2Player(Copl *newopl);
-		~Cdro2Player();
-
-		bool load(VFSFile &fd, const CFileProvider &fp);
-		bool update();
-		void rewind(int subsong);
-		float getrefresh();
-
-		std::string gettype()
-		{
-			return std::string("DOSBox Raw OPL v2.0");
-		}
-
-	protected:
-		//unsigned char *data;
-		//unsigned long pos,length;
-		//unsigned long msdone,mstotal;
-		//unsigned short delay;
-		//unsigned char index, opl3_mode;
-};

audacious-plugins-3.6.2-gtk3.tar.bz2/src/adplug/core/dtm.cc Deleted

@@ -1,338 +0,0 @@
-/*
- Adplug - Replayer for many OPL2/OPL3 audio file formats.
- Copyright (C) 1999 - 2006 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
-
- dtm.cpp - DTM loader by Riven the Mage <riven@ok.ru>
-*/
-/*
- NOTE: Panning (Ex) effect is ignored.
-*/
-
-#include <string.h>
-
-#include "dtm.h"
-
-/* -------- Public Methods -------------------------------- */
-
-CPlayer *
-CdtmLoader::factory (Copl * newopl)
-{
- return new CdtmLoader (newopl);
-}
-
-bool
-CdtmLoader::load (VFSFile & fd, const CFileProvider & fp)
-{
- binistream *f = fp.open (fd);
- if (!f)
- return false;
- const unsigned char conv_inst11 = { 2, 1, 10, 9, 4, 3, 6, 5, 0, 8, 7 };
- const unsigned short conv_note12 =
- { 0x16B, 0x181, 0x198, 0x1B0, 0x1CA, 0x1E5, 0x202, 0x220, 0x241, 0x263,
-0x287, 0x2AE };
-
- int i, j, k, t = 0;
-
- // read header
- f->readString (header.id, 12);
- header.version = f->readInt (1);
- f->readString (header.title, 20);
- f->readString (header.author, 20);
- header.numpat = f->readInt (1);
- header.numinst = f->readInt (1);
-
- // signature exists ? good version ?
- if (memcmp (header.id, "DeFy DTM ", 9) || header.version != 0x10)
- {
- fp.close (f);
- return false;
- }
-
- header.numinst++;
-
- // load description
- memset (desc, 0, 80 * 16);
-
- char bufstr80;
-
- for (i = 0; i < 16; i++)
- {
- // get line length
- unsigned char bufstr_length = f->readInt (1);
-
- if (bufstr_length > 80)
- {
- fp.close (f);
- return false;
- }
-
- // read line
- if (bufstr_length)
- {
- f->readString (bufstr, bufstr_length);
-
- for (j = 0; j < bufstr_length; j++)
- if (!bufstrj)
- bufstrj = 0x20;
-
- bufstrbufstr_length = 0;
-
- strcat (desc, bufstr);
- }
-
- strcat (desc, "\n");
- }
-
- // init CmodPlayer
- realloc_instruments (header.numinst);
- realloc_order (100);
- realloc_patterns (header.numpat, 64, 9);
- init_notetable (conv_note);
- init_trackord ();
-
- // load instruments
- for (i = 0; i < header.numinst; i++)
- {
- unsigned char name_length = f->readInt (1);
-
- if (name_length)
- f->readString (instrumentsi.name, name_length);
-
- instrumentsi.namename_length = 0;
-
- for (j = 0; j < 12; j++)
- instrumentsi.dataj = f->readInt (1);
-
- for (j = 0; j < 11; j++)
- insti.dataconv_instj = instrumentsi.dataj;
- }
-
- // load order
- for (i = 0; i < 100; i++)
- orderi = f->readInt (1);
-
- nop = header.numpat;
-
- unsigned char *pattern = new unsigned char0x480;
-
- // load tracks
- for (i = 0; i < nop; i++)
- {
- unsigned short packed_length;
-
- packed_length = f->readInt (2);
-
- unsigned char *packed_pattern = new unsigned charpacked_length;
-
- for (j = 0; j < packed_length; j++)
- packed_patternj = f->readInt (1);
-
- long unpacked_length =
- unpack_pattern (packed_pattern, packed_length, pattern, 0x480);
-
- deletepacked_pattern;
-
- if (!unpacked_length)
- {
- delete pattern;
- fp.close (f);
- return false;
- }
-
- // convert pattern
- for (j = 0; j < 9; j++)
- {
- for (k = 0; k < 64; k++)
- {
- dtm_event *event = (dtm_event *) & pattern(k * 9 + j) * 2;
-
- // instrument
- if (event->byte0 == 0x80)
- {
- if (event->byte1 <= 0x80)
- trackstk.inst = event->byte1 + 1;
- }
-
- // note + effect
- else
- {
- trackstk.note = event->byte0;
-
- if ((event->byte0 != 0) && (event->byte0 != 127))
- trackstk.note++;
-
- // convert effects
- switch (event->byte1 >> 4)
- {
- case 0x0: // pattern break
- if ((event->byte1 & 15) == 1)
- trackstk.command = 13;
- break;
-
- case 0x1: // freq. slide up
- trackstk.command = 28;
- trackstk.param1 = event->byte1 & 15;
- break;
-
- case 0x2: // freq. slide down
- trackstk.command = 28;
- trackstk.param2 = event->byte1 & 15;
- break;
-
- case 0xA: // set carrier volume
- case 0xC: // set instrument volume
- trackstk.command = 22;
- trackstk.param1 = (0x3F - (event->byte1 & 15)) >> 4;
- trackstk.param2 = (0x3F - (event->byte1 & 15)) & 15;
- break;
-
- case 0xB: // set modulator volume
- trackstk.command = 21;
- trackstk.param1 = (0x3F - (event->byte1 & 15)) >> 4;
- trackstk.param2 = (0x3F - (event->byte1 & 15)) & 15;
- break;
-
- case 0xE: // set panning
- break;
-
- case 0xF: // set speed
- trackstk.command = 13;
- trackstk.param2 = event->byte1 & 15;
- break;
- }
- }
- }
-
- t++;
- }
- }
-
- deletepattern;
- fp.close (f);
-
- // order length
- for (i = 0; i < 100; i++)
- {
- if (orderi >= 0x80)
- {
- length = i;
-
- if (orderi == 0xFF)
- restartpos = 0;
- else
- restartpos = orderi - 0x80;
-
- break;
- }
- }
-
- // initial speed
- initspeed = 2;
-
- rewind (0);
-
- return true;
-}
-
-void
-CdtmLoader::rewind (int subsong)
-{
- CmodPlayer::rewind (subsong);
-
- // default instruments
- for (int i = 0; i < 9; i++)
- {
- channeli.inst = i;
-
- channeli.vol1 = 63 - (insti.data10 & 63);
- channeli.vol2 = 63 - (insti.data9 & 63);
- }
-}
-
-float
-CdtmLoader::getrefresh ()
-{
- return 18.2f;
-}
-
-std::string CdtmLoader::gettype ()
-{
- return std::string ("DeFy Adlib Tracker");
-}
-
-std::string CdtmLoader::gettitle ()
-{
- return std::string (header.title);
-}
-
-std::string CdtmLoader::getauthor ()
-{
- return std::string (header.author);
-}
-
-std::string CdtmLoader::getdesc ()
-{
- return std::string (desc);
-}
-
-std::string CdtmLoader::getinstrument (unsigned int n)
-{
- return std::string (instrumentsn.name);
-}
-
-unsigned int
-CdtmLoader::getinstruments ()
-{
- return header.numinst;
-}
-
-/* -------- Private Methods ------------------------------- */
-
-long
-CdtmLoader::unpack_pattern (unsigned char *ibuf, long ilen,
- unsigned char *obuf, long olen)
-{
- unsigned char *input = ibuf;
- unsigned char *output = obuf;
-
- long input_length = 0;
- long output_length = 0;
-
- unsigned char repeat_byte, repeat_counter;
-
- // RLE
- while (input_length < ilen)
- {
- repeat_byte = inputinput_length++;
-
- if ((repeat_byte & 0xF0) == 0xD0)
- {
- repeat_counter = repeat_byte & 15;
- repeat_byte = inputinput_length++;
- }
- else
- repeat_counter = 1;
-
- for (int i = 0; i < repeat_counter; i++)
- {
- if (output_length < olen)
- outputoutput_length++ = repeat_byte;
- }
- }
-
- return output_length;
-}

audacious-plugins-3.6.2-gtk3.tar.bz2/src/adplug/core/dtm.h Deleted

@@ -1,69 +0,0 @@
-/*
- Adplug - Replayer for many OPL2/OPL3 audio file formats.
- Copyright (C) 1999 - 2006 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
-
- dtm.h - DTM loader by Riven the Mage <riven@ok.ru>
-*/
-
-#include "protrack.h"
-
-class CdtmLoader: public CmodPlayer
-{
-	public:
-		static CPlayer *factory(Copl *newopl);
-
-		CdtmLoader(Copl *newopl) : CmodPlayer(newopl) { };
-
-		bool	load(VFSFile &fd, const CFileProvider &fp);
-		void	rewind(int subsong);
-		float	getrefresh();
-
-		std::string gettype();
-		std::string gettitle();
-		std::string getauthor();
-		std::string getdesc();
-		std::string getinstrument(unsigned int n);
-		unsigned int getinstruments();
-
-	private:
-
-		struct dtm_header
-		{
-			char id12;
-			unsigned char version;
-			char title20;
-			char author20;
-			unsigned char numpat;
-			unsigned char numinst;
-		} header;
-
-		char desc80*16;
-
-		struct dtm_instrument
-		{
-			char name13;
-			unsigned char data12;
-		} instruments128;
-
-		struct dtm_event
-		{
-			unsigned char	byte0;
-			unsigned char	byte1;
-		};
-
-		long unpack_pattern(unsigned char *ibuf, long ilen, unsigned char *obuf, long olen);
-};

audacious-plugins-3.6.2-gtk3.tar.bz2/src/adplug/core/emuopl.cc Deleted

@@ -1,166 +0,0 @@
-/*
- * AdPlug - Replayer for many OPL2/OPL3 audio file formats.
- * Copyright (C) 1999 - 2005 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
- *
- * emuopl.cpp - Emulated OPL, by Simon Peter <dn.tlp@gmx.net>
- */
-
-#include "emuopl.h"
-
-CEmuopl::CEmuopl (int rate, bool bit16, bool usestereo):use16bit (bit16), stereo (usestereo),
-mixbufSamples (0)
-{
- opl0 = OPLCreate (OPL_TYPE_YM3812, 3579545, rate);
- opl1 = OPLCreate (OPL_TYPE_YM3812, 3579545, rate);
-
- currType = TYPE_DUAL_OPL2;
-
- init ();
-}
-
-CEmuopl::~CEmuopl ()
-{
- OPLDestroy (opl0);
- OPLDestroy (opl1);
-
- if (mixbufSamples)
- {
- deletemixbuf0;
- deletemixbuf1;
- }
-}
-
-void
-CEmuopl::update (short *buf, int samples)
-{
- int i;
-
- //ensure that our mix buffers are adequately sized
- if (mixbufSamples < samples)
- {
- if (mixbufSamples)
- {
- deletemixbuf0;
- deletemixbuf1;
- }
- mixbufSamples = samples;
-
- //*2 = make room for stereo, if we need it
- mixbuf0 = new shortsamples * 2;
- mixbuf1 = new shortsamples * 2;
- }
-
- //data should be rendered to outbuf
- //tempbuf should be used as a temporary buffer
- //if we are supposed to generate 16bit output,
- //then outbuf may point directly to the actual waveform output "buf"
- //if we are supposed to generate 8bit output,
- //then outbuf cannot point to "buf" (because there will not be enough room)
- //and so it must point to a mixbuf instead--
- //it will be reduced to 8bit and put in "buf" later
- short *outbuf;
- short *tempbuf = mixbuf0;
- short *tempbuf2 = mixbuf1;
- if (use16bit)
- outbuf = buf;
- else
- outbuf = mixbuf1;
- //...there is a potentially confusing situation where mixbuf1 can be aliased.
- //beware. it is a little loony.
-
- //all of the following rendering code produces 16bit output
-
- switch (currType)
- {
- case TYPE_OPL2:
- //for opl2 mode:
- //render chip0 to the output buffer
- YM3812UpdateOne (opl0, outbuf, samples);
-
- //if we are supposed to output stereo,
- //then we need to dup the mono channel
- if (stereo)
- for (i = samples - 1; i >= 0; i--)
- {
- outbufi * 2 = outbufi;
- outbufi * 2 + 1 = outbufi;
- }
- break;
-
- case TYPE_OPL3: // unsupported
- break;
-
- case TYPE_DUAL_OPL2:
- //for dual opl2 mode:
- //render each chip to a different tempbuffer
- YM3812UpdateOne (opl0, tempbuf2, samples);
- YM3812UpdateOne (opl1, tempbuf, samples);
-
- //output stereo:
- //then we need to interleave the two buffers
- if (stereo)
- {
- //first, spread tempbuf's samples across left channel
- //left channel
- for (i = 0; i < samples; i++)
- outbufi * 2 = tempbuf2i;
- //next, insert the samples from tempbuf2 into right channel
- for (i = 0; i < samples; i++)
- outbufi * 2 + 1 = tempbufi;
- }
- else
- //output mono:
- //then we need to mix the two buffers into buf
- for (i = 0; i < samples; i++)
- outbufi = (tempbufi >> 1) + (tempbuf2i >> 1);
- break;
- }
-
- //now reduce to 8bit if we need to
- if (!use16bit)
- for (i = 0; i < (stereo ? samples * 2 : samples); i++)
- ((char *) buf)i = (outbufi >> 8) ^ 0x80;
-}
-
-void
-CEmuopl::write (int reg, int val)
-{
- switch (currType)
- {
- case TYPE_OPL2:
- case TYPE_DUAL_OPL2:
- OPLWrite (oplcurrChip, 0, reg);
- OPLWrite (oplcurrChip, 1, val);
- break;
- case TYPE_OPL3: // unsupported
- break;
- }
-}
-
-void
-CEmuopl::init ()
-{
- OPLResetChip (opl0);
- OPLResetChip (opl1);
- currChip = 0;
-}
-
-void
-CEmuopl::settype (ChipType type)
-{
- currType = type;
-}

audacious-plugins-3.6.2-gtk3.tar.bz2/src/adplug/core/emuopl.h Deleted

@@ -1,47 +0,0 @@
-/*
- * Adplug - Replayer for many OPL2/OPL3 audio file formats.
- * Copyright (C) 1999 - 2005 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
- *
- * emuopl.h - Emulated OPL, by Simon Peter <dn.tlp@gmx.net>
- */
-
-#ifndef H_ADPLUG_EMUOPL
-#define H_ADPLUG_EMUOPL
-
-#include "opl.h"
-#include "fmopl.h"
-
-class CEmuopl: public Copl
-{
- public:
- CEmuopl(int rate, bool bit16, bool usestereo);	// rate = sample rate
- virtual ~CEmuopl();
-
- void update(short *buf, int samples);			// fill buffer
- void write(int reg, int val);
-
- void init();
- void settype(ChipType type);
-
- private:
- bool		use16bit, stereo;
- FM_OPL	*opl2;				// OPL2 emulator data
- short		*mixbuf0, *mixbuf1;
- int		mixbufSamples;
-};
-
-#endif

audacious-plugins-3.6.2-gtk3.tar.bz2/src/adplug/core/flash.cc Deleted

@@ -1,259 +0,0 @@
-/*
- * Adplug - Replayer for many OPL2/OPL3 audio file formats.
- * Copyright (C) 1999 - 2003 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
- *
- * xad FLASH player, by Riven the Mage <riven@ok.ru>
- */
-
-/*
- - discovery -
-
- file(s) : LA-INTRO.EXE
- type : Lunatic Asylum BBStro
- tune : by Rogue Logic Design
- player : by Flash Logic Design
-*/
-
-#include "flash.h"
-#include "debug.h"
-
-const unsigned char
- CxadflashPlayer::flash_adlib_registers99 = {
- 0x23, 0x20, 0x43, 0x40, 0x63, 0x60, 0x83, 0x80, 0xC0, 0xE3, 0xE0,
- 0x24, 0x21, 0x44, 0x41, 0x64, 0x61, 0x84, 0x81, 0xC1, 0xE4, 0xE1,
- 0x25, 0x22, 0x45, 0x42, 0x65, 0x62, 0x85, 0x82, 0xC2, 0xE5, 0xE2,
- 0x2B, 0x28, 0x4B, 0x48, 0x6B, 0x68, 0x8B, 0x88, 0xC3, 0xEB, 0xE8,
- 0x2C, 0x29, 0x4C, 0x49, 0x6C, 0x69, 0x8C, 0x89, 0xC4, 0xEC, 0xE9,
- 0x2D, 0x2A, 0x4D, 0x4A, 0x6D, 0x6A, 0x8D, 0x8A, 0xC5, 0xED, 0xEA,
- 0x33, 0x30, 0x53, 0x50, 0x73, 0x70, 0x93, 0x90, 0xC6, 0xF3, 0xF0,
- 0x34, 0x31, 0x54, 0x51, 0x74, 0x71, 0x94, 0x91, 0xC7, 0xF4, 0xF1,
- 0x35, 0x32, 0x55, 0x52, 0x75, 0x72, 0x95, 0x92, 0xC8, 0xF5, 0xF2
-};
-
-const unsigned short
- CxadflashPlayer::flash_notes_encoded268 = {
- 0x000,
- 0x100, 0x200, 0x300, 0x400, 0x500, 0x600, 0x700, 0x800, 0x900, 0xA00, 0xB00,
- 0xC00,
- 0x101, 0x201, 0x301, 0x401, 0x501, 0x601, 0x701, 0x801, 0x901, 0xA01, 0xB01,
- 0xC01,
- 0x102, 0x202, 0x302, 0x402, 0x502, 0x602, 0x702, 0x802, 0x902, 0xA02, 0xB02,
- 0xC02,
- 0x103, 0x203, 0x303, 0x403, 0x503, 0x603, 0x703, 0x803, 0x903, 0xA03, 0xB03,
- 0xC03,
- 0x104, 0x204, 0x304, 0x404, 0x504, 0x604, 0x704, 0x804, 0x904, 0xA04, 0xB04,
- 0xC04,
- 0x105, 0x205, 0x305, 0x405, 0x505, 0x605, 0x705, 0x805, 0x905, 0xA05, 0xB05,
- 0xC05,
- 0x106, 0x206, 0x306, 0x406, 0x506, 0x606, 0x706, 0x806, 0x906, 0xA06, 0xB06,
- 0xC06,
- 0x107, 0x207, 0x307, 0x407, 0x507, 0x607, 0x707, 0x807, 0x907, 0xA07, 0xB07,
- 0xC07,
- 0x108, 0x208, 0x308, 0x408, 0x508, 0x608, 0x708, 0x808, 0x908, 0xA08, 0xB08,
- 0xC08,
- 0x109, 0x209, 0x309, 0x409, 0x509, 0x609, 0x709, 0x809, 0x909, 0xA09, 0xB09,
- 0xC09,
- 0x10A, 0x20A, 0x30A, 0x40A, 0x50A, 0x60A, 0x70A, 0x80A, 0x90A, 0xA0A, 0xB0A,
- 0xC0A,
- 0x10B, 0x20B, 0x30B, 0x40B, 0x50B, 0x60B, 0x70B, 0x80B, 0x90B, 0xA0B, 0xB0B,
- 0xC0B,
- 0x10C, 0x20C, 0x30C, 0x40C, 0x50C, 0x60C, 0x70C, 0x80C, 0x90C, 0xA0C, 0xB0C,
- 0xC0C,
- 0x10D, 0x20D, 0x30D, 0x40D, 0x50D, 0x60D, 0x70D, 0x80D, 0x90D, 0xA0D, 0xB0D,
- 0xC0D,
- 0x10E, 0x20E, 0x30E, 0x40E, 0x50E, 0x60E, 0x70E, 0x80E, 0x90E, 0xA0E, 0xB0E,
- 0xC0E,
- 0x10F, 0x20F, 0x30F, 0x40F, 0x50F, 0x60F, 0x70F, 0x80F, 0x90F, 0xA0F, 0xB0F,
- 0xC0F,
- 0x110, 0x210, 0x310, 0x410, 0x510, 0x610, 0x710, 0x810, 0x910, 0xA10, 0xB10,
- 0xC10,
- 0x111, 0x211, 0x311, 0x411, 0x511, 0x611, 0x711, 0x811, 0x911, 0xA11, 0xB11,
- 0xC11,
- 0x112, 0x212, 0x312, 0x412, 0x512, 0x612, 0x712, 0x812, 0x912, 0xA12, 0xB12,
- 0xC12,
- 0x113, 0x213, 0x313, 0x413, 0x513, 0x613, 0x713, 0x813, 0x913, 0xA13, 0xB13,
- 0xC13,
- 0x114, 0x214, 0x314, 0x414, 0x514, 0x614, 0x714, 0x814, 0x914, 0xA14, 0xB14,
- 0xC14,
- 0x115, 0x215, 0x315
-};
-
-const unsigned short
- CxadflashPlayer::flash_notes12 = {
- 0x157, 0x16B, 0x181, 0x198, 0x1B0, 0x1CA, 0x1E5, 0x202, 0x220, 0x241, 0x263,
- 0x287
-};
-
-const unsigned char
- CxadflashPlayer::flash_default_instrument8 = {
- 0x00, 0x00, 0x3F, 0x3F, 0xFF, 0xFF, 0xFF, 0xFF
-};
-
-CPlayer *
-CxadflashPlayer::factory (Copl * newopl)
-{
- return new CxadflashPlayer (newopl);
-}
-
-void
-CxadflashPlayer::xadplayer_rewind (int subsong)
-{
- int i;
-
- plr.speed = xad.speed;
-
- flash.order_pos = 0;
- flash.pattern_pos = 0;
-
- opl_write (0x08, 0x00);
- opl_write (0xBD, 0x00);
-
- // assign default instrument
- for (i = 0; i < 9; i++)
- {
- opl_write (0xA0 + i, 0x00);
- opl_write (0xB0 + i, 0x00);
- }
-
- // assign instruments
- for (i = 0; i < 9; i++)
- for (int j = 0; j < 11; j++)
- opl_write (flash_adlib_registersi * 11 + j, tunei * 12 + j);
-}
-
-void
-CxadflashPlayer::xadplayer_update ()
-{
- unsigned short event_pos = (tune0x600 + flash.order_pos * 1152) +
- (flash.pattern_pos * 18) + 0x633;
-
- for (int i = 0; i < 9; i++)
- {
- unsigned short flash_channel_freq =
- (adlib0xB0 + i << 8) + adlib0xA0 + i;
-
- unsigned char event_b0 = tuneevent_pos++;
- unsigned char event_b1 = tuneevent_pos++;
-#ifdef DEBUG
- AdPlug_LogWrite ("channel %02X, event %02X %02X:\n", i + 1, event_b0,
- event_b1);
-#endif
-
- if (event_b0 == 0x80) // 0.0x80: Set Instrument
- {
- for (int j = 0; j < 11; j++)
- opl_write (flash_adlib_registersi * 11 + j,
- tuneevent_b1 * 12 + j);
- }
- else
- {
- if (event_b1 == 0x01)
- flash.pattern_pos = 0x3F; // 1.0x01: Pattern Break
-
- unsigned char fx = (event_b1 >> 4);
- unsigned char fx_p = (event_b1 & 0x0F);
-
- switch (fx)
- {
- case 0x0A: // 1.0xAy: Set Carrier volume
- opl_write (flash_adlib_registers11 * i + 2, fx_p << 2);
- break;
- case 0x0B: // 1.0xBy: Set Modulator volume
- opl_write (flash_adlib_registers11 * i + 3, fx_p << 2);
- break;
- case 0x0C: // 1.0xCy: Set both operators volume
- opl_write (flash_adlib_registers11 * i + 2, fx_p << 2);
- opl_write (flash_adlib_registers11 * i + 3, fx_p << 2);
- break;
-// case 0x0E: // 1.0xEy: ? (increase some value)
- case 0x0F: // 1.0xFy: Set Speed
- plr.speed = (fx_p + 1);
- break;
- }
-
- if (event_b0)
- {
- // mute channel
- opl_write (0xA0 + i, adlib0xA0 + i);
- opl_write (0xB0 + i, adlib0xB0 + i & 0xDF);
-
- // is note ?
- if (event_b0 != 0x7F)
- {
- unsigned short note_encoded = flash_notes_encodedevent_b0;
- unsigned short freq = flash_notes(note_encoded >> 8) - 1;
-
- flash_channel_freq = freq | ((note_encoded & 0xFF) << 10) | 0x2000;
-
- opl_write (0xA0 + i, flash_channel_freq & 0xFF);
- opl_write (0xB0 + i, flash_channel_freq >> 8);
- }
- }
-
- if (fx == 0x01) // 1.0x1y: Fine Frequency Slide Up
- {
- flash_channel_freq += (fx_p << 1);
-
- opl_write (0xA0 + i, flash_channel_freq & 0xFF);
- opl_write (0xB0 + i, flash_channel_freq >> 8);
- }
- else if (fx == 0x02) // 1.0x2y: Fine Frequency Slide Down
- {
- flash_channel_freq -= (fx_p << 1);
-
- opl_write (0xA0 + i, flash_channel_freq & 0xFF);
- opl_write (0xB0 + i, flash_channel_freq >> 8);
- }
- }
- }
-
- // next row
- flash.pattern_pos++;
-
- // end of pattern ?
- if (flash.pattern_pos >= 0x40)
- {
- flash.pattern_pos = 0;
-
- flash.order_pos++;
-
- // end of module ?
- if (tune0x600 + flash.order_pos == 0xFF)
- {
- flash.order_pos = 0;
-
- plr.looping = 1;
- }
- }
-}
-
-float
-CxadflashPlayer::xadplayer_getrefresh ()
-{
- return 17.5f;
-}
-
-std::string CxadflashPlayer::xadplayer_gettype ()
-{
- return std::string ("xad: flash player");
-}
-
-unsigned int
-CxadflashPlayer::xadplayer_getinstruments ()
-{
- return 32;
-}

audacious-plugins-3.6.2-gtk3.tar.bz2/src/adplug/core/flash.h Deleted

@@ -1,57 +0,0 @@
-/*
- * Adplug - Replayer for many OPL2/OPL3 audio file formats.
- * Copyright (C) 1999 - 2003 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
- *
- * xad FLASH player, by Riven the Mage <riven@ok.ru>
- */
-
-#include "xad.h"
-
-class CxadflashPlayer: public CxadPlayer
-{
-public:
- static CPlayer *factory(Copl *newopl);
-
- CxadflashPlayer(Copl *newopl): CxadPlayer(newopl)
- { };
-
-protected:
- struct
- {
- unsigned char order_pos;
- unsigned char pattern_pos;
- } flash;
- //
- bool		 xadplayer_load()
- {
- if(xad.fmt == FLASH)
-	return true;
- else
-	return false;
- }
- void xadplayer_rewind(int subsong);
- void xadplayer_update();
- float xadplayer_getrefresh();
- std::string xadplayer_gettype();
- unsigned int xadplayer_getinstruments();
-
-private:
- static const unsigned char flash_adlib_registers99;
- static const unsigned short flash_notes_encoded268;
- static const unsigned short flash_notes12;
- static const unsigned char flash_default_instrument8;
-};

audacious-plugins-3.6.2-gtk3.tar.bz2/src/adplug/core/fmc.cc Deleted

@@ -1,243 +0,0 @@
-/*
- 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
-
- fmc.cpp - FMC Loader by Riven the Mage <riven@ok.ru>
-*/
-
-#include <string.h>
-
-#include "fmc.h"
-
-/* -------- Public Methods -------------------------------- */
-
-CPlayer *
-CfmcLoader::factory (Copl * newopl)
-{
- return new CfmcLoader (newopl);
-}
-
-bool
-CfmcLoader::load (VFSFile & fd, const CFileProvider & fp)
-{
- binistream *f = fp.open (fd);
- if (!f)
- return false;
- const unsigned char conv_fx16 =
- { 0, 1, 2, 3, 4, 8, 255, 255, 255, 255, 26, 11, 12, 13, 14, 15 };
-
- int i, j, k, t = 0;
-
- // read header
- f->readString (header.id, 4);
- f->readString (header.title, 21);
- header.numchan = f->readInt (1);
-
- // 'FMC!' - signed ?
- if (strncmp (header.id, "FMC!", 4))
- {
- fp.close (f);
- return false;
- }
-
- // init CmodPlayer
- realloc_instruments (32);
- realloc_order (256);
- realloc_patterns (64, 64, header.numchan);
- init_trackord ();
-
- // load order
- for (i = 0; i < 256; i++)
- orderi = f->readInt (1);
-
- f->ignore (2);
-
- // load instruments
- for (i = 0; i < 32; i++)
- {
- instrumentsi.synthesis = f->readInt (1);
- instrumentsi.feedback = f->readInt (1);
-
- instrumentsi.mod_attack = f->readInt (1);
- instrumentsi.mod_decay = f->readInt (1);
- instrumentsi.mod_sustain = f->readInt (1);
- instrumentsi.mod_release = f->readInt (1);
- instrumentsi.mod_volume = f->readInt (1);
- instrumentsi.mod_ksl = f->readInt (1);
- instrumentsi.mod_freq_multi = f->readInt (1);
- instrumentsi.mod_waveform = f->readInt (1);
- instrumentsi.mod_sustain_sound = f->readInt (1);
- instrumentsi.mod_ksr = f->readInt (1);
- instrumentsi.mod_vibrato = f->readInt (1);
- instrumentsi.mod_tremolo = f->readInt (1);
-
- instrumentsi.car_attack = f->readInt (1);
- instrumentsi.car_decay = f->readInt (1);
- instrumentsi.car_sustain = f->readInt (1);
- instrumentsi.car_release = f->readInt (1);
- instrumentsi.car_volume = f->readInt (1);
- instrumentsi.car_ksl = f->readInt (1);
- instrumentsi.car_freq_multi = f->readInt (1);
- instrumentsi.car_waveform = f->readInt (1);
- instrumentsi.car_sustain_sound = f->readInt (1);
- instrumentsi.car_ksr = f->readInt (1);
- instrumentsi.car_vibrato = f->readInt (1);
- instrumentsi.car_tremolo = f->readInt (1);
-
- instrumentsi.pitch_shift = f->readInt (1);
-
- f->readString (instrumentsi.name, 21);
- }
-
- // load tracks
- for (i = 0; i < 64; i++)
- {
- if (f->ateof ())
- break;
-
- for (j = 0; j < header.numchan; j++)
- {
- for (k = 0; k < 64; k++)
- {
- fmc_event event;
-
- // read event
- event.byte0 = f->readInt (1);
- event.byte1 = f->readInt (1);
- event.byte2 = f->readInt (1);
-
- // convert event
- trackstk.note = event.byte0 & 0x7F;
- trackstk.inst =
- ((event.byte0 & 0x80) >> 3) + (event.byte1 >> 4) + 1;
- trackstk.command = conv_fxevent.byte1 & 0x0F;
- trackstk.param1 = event.byte2 >> 4;
- trackstk.param2 = event.byte2 & 0x0F;
-
- // fix effects
- if (trackstk.command == 0x0E) // 0x0E (14): Retrig
- trackstk.param1 = 3;
- if (trackstk.command == 0x1A) // 0x1A (26): Volume Slide
- {
- if (trackstk.param1 > trackstk.param2)
- {
- trackstk.param1 -= trackstk.param2;
- trackstk.param2 = 0;
- }
- else
- {
- trackstk.param2 -= trackstk.param1;
- trackstk.param1 = 0;
- }
- }
- }
-
- t++;
- }
- }
- fp.close (f);
-
- // convert instruments
- for (i = 0; i < 31; i++)
- buildinst (i);
-
- // order length
- for (i = 0; i < 256; i++)
- {
- if (orderi >= 0xFE)
- {
- length = i;
- break;
- }
- }
-
- // data for Protracker
- activechan = (0xffffffff >> (32 - header.numchan)) << (32 - header.numchan);
- nop = t / header.numchan;
- restartpos = 0;
-
- // flags
- flags = Faust;
-
- rewind (0);
-
- return true;
-}
-
-float
-CfmcLoader::getrefresh ()
-{
- return 50.0f;
-}
-
-std::string CfmcLoader::gettype ()
-{
- return std::string ("Faust Music Creator");
-}
-
-std::string CfmcLoader::gettitle ()
-{
- return std::string (header.title);
-}
-
-std::string CfmcLoader::getinstrument (unsigned int n)
-{
- return std::string (instrumentsn.name);
-}
-
-unsigned int
-CfmcLoader::getinstruments ()
-{
- return 32;
-}
-
-/* -------- Private Methods ------------------------------- */
-
-void
-CfmcLoader::buildinst (unsigned char i)
-{
- insti.data0 = ((instrumentsi.synthesis & 1) ^ 1);
- insti.data0 |= ((instrumentsi.feedback & 7) << 1);
-
- insti.data3 = ((instrumentsi.mod_attack & 15) << 4);
- insti.data3 |= (instrumentsi.mod_decay & 15);
- insti.data5 = ((15 - (instrumentsi.mod_sustain & 15)) << 4);
- insti.data5 |= (instrumentsi.mod_release & 15);
- insti.data9 = (63 - (instrumentsi.mod_volume & 63));
- insti.data9 |= ((instrumentsi.mod_ksl & 3) << 6);
- insti.data1 = (instrumentsi.mod_freq_multi & 15);
- insti.data7 = (instrumentsi.mod_waveform & 3);
- insti.data1 |= ((instrumentsi.mod_sustain_sound & 1) << 5);
- insti.data1 |= ((instrumentsi.mod_ksr & 1) << 4);
- insti.data1 |= ((instrumentsi.mod_vibrato & 1) << 6);
- insti.data1 |= ((instrumentsi.mod_tremolo & 1) << 7);
-
- insti.data4 = ((instrumentsi.car_attack & 15) << 4);
- insti.data4 |= (instrumentsi.car_decay & 15);
- insti.data6 = ((15 - (instrumentsi.car_sustain & 15)) << 4);
- insti.data6 |= (instrumentsi.car_release & 15);
- insti.data10 = (63 - (instrumentsi.car_volume & 63));
- insti.data10 |= ((instrumentsi.car_ksl & 3) << 6);
- insti.data2 = (instrumentsi.car_freq_multi & 15);
- insti.data8 = (instrumentsi.car_waveform & 3);
- insti.data2 |= ((instrumentsi.car_sustain_sound & 1) << 5);
- insti.data2 |= ((instrumentsi.car_ksr & 1) << 4);
- insti.data2 |= ((instrumentsi.car_vibrato & 1) << 6);
- insti.data2 |= ((instrumentsi.car_tremolo & 1) << 7);
-
- insti.slide = instrumentsi.pitch_shift;
-}

audacious-plugins-3.6.2-gtk3.tar.bz2/src/adplug/core/fmc.h Deleted

@@ -1,91 +0,0 @@
-/*
- Adplug - Replayer for many OPL2/OPL3 audio file formats.
- Copyright (C) 1999 - 2003 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
-
- fmc.h - FMC loader by Riven the Mage <riven@ok.ru>
-*/
-
-#include "protrack.h"
-
-class CfmcLoader: public CmodPlayer
-{
-	public:
-		static CPlayer *factory(Copl *newopl);
-
-		CfmcLoader(Copl *newopl) : CmodPlayer(newopl) { };
-
-		bool	load(VFSFile &fd, const CFileProvider &fp);
-		float	getrefresh();
-
-		std::string	gettype();
-		std::string	gettitle();
-		std::string	getinstrument(unsigned int n);
-		unsigned int	getinstruments();
-
-	private:
-
-		struct fmc_event
-		{
-			unsigned char byte0;
-			unsigned char byte1;
-			unsigned char byte2;
-		};
-
-		struct fmc_header
-		{
-			char id4;
-			char title21;
-			unsigned char numchan;
-		} header;
-
-		struct fmc_instrument
-		{
-			unsigned char synthesis;
-			unsigned char feedback;
-
-			unsigned char mod_attack;
-			unsigned char mod_decay;
-			unsigned char mod_sustain;
-			unsigned char mod_release;
-			unsigned char mod_volume;
-			unsigned char mod_ksl;
-			unsigned char mod_freq_multi;
-			unsigned char mod_waveform;
-			unsigned char mod_sustain_sound;
-			unsigned char mod_ksr;
-			unsigned char mod_vibrato;
-			unsigned char mod_tremolo;
-			unsigned char car_attack;
-			unsigned char car_decay;
-			unsigned char car_sustain;
-			unsigned char car_release;
-			unsigned char car_volume;
-			unsigned char car_ksl;
-			unsigned char car_freq_multi;
-			unsigned char car_waveform;
-			unsigned char car_sustain_sound;
-			unsigned char car_ksr;
-			unsigned char car_vibrato;
-			unsigned char car_tremolo;
-
-			signed char pitch_shift;
-
-			char name21;
-		} instruments32;
-
-		void buildinst(unsigned char i);
-};

audacious-plugins-3.6.2-gtk3.tar.bz2/src/adplug/core/fmopl.cc Deleted

@@ -1,1393 +0,0 @@
-/*
-**
-** File: fmopl.c -- software implementation of FM sound generator
-**
-** Copyright (C) 1999,2000 Tatsuyuki Satoh , MultiArcadeMachineEmurator development
-**
-** Version 0.37a
-**
-*/
-
-/*
-	preliminary :
-	Problem :
-	note:
-*/
-
-/* This version of fmopl.c is a fork of the MAME one, relicensed under the LGPL.
- *
- * 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
- */
-
-#define HAS_YM3812	1
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stdarg.h>
-#include <math.h>
-//#include "driver.h"		/* use M.A.M.E. */
-#include "fmopl.h"
-
-#ifndef PI
-#define PI 3.14159265358979323846
-#endif
-
-/* -------------------- for debug --------------------- */
-/* #define OPL_OUTPUT_LOG */
-#ifdef OPL_OUTPUT_LOG
-static FILE *opl_dbg_fp = nullptr;
-static FM_OPL *opl_dbg_opl16;
-static int opl_dbg_maxchip,opl_dbg_chip;
-#endif
-
-/* -------------------- preliminary define section --------------------- */
-/* attack/decay rate time rate */
-#define OPL_ARRATE 141280 /* RATE 4 = 2826.24ms @ 3.6MHz */
-#define OPL_DRRATE 1956000 /* RATE 4 = 39280.64ms @ 3.6MHz */
-
-#define DELTAT_MIXING_LEVEL (1) /* DELTA-T ADPCM MIXING LEVEL */
-
-#define FREQ_BITS 24			/* frequency turn */
-
-/* counter bits = 20 , octerve 7 */
-#define FREQ_RATE (1<<(FREQ_BITS-20))
-#define TL_BITS (FREQ_BITS+2)
-
-/* final output shift , limit minimum and maximum */
-#define OPL_OUTSB (TL_BITS+3-16)		/* OPL output final shift 16bit */
-#define OPL_MAXOUT (0x7fff<<OPL_OUTSB)
-#define OPL_MINOUT (-0x8000<<OPL_OUTSB)
-
-/* -------------------- quality selection --------------------- */
-
-/* sinwave entries */
-/* used static memory = SIN_ENT * 4 (byte) */
-#define SIN_ENT 2048
-
-/* output level entries (envelope,sinwave) */
-/* envelope counter lower bits */
-#define ENV_BITS 16
-/* envelope output entries */
-#define EG_ENT 4096
-/* used dynamic memory = EG_ENT*4*4(byte)or EG_ENT*6*4(byte) */
-/* used static memory = EG_ENT*4 (byte) */
-
-#define EG_OFF ((2*EG_ENT)<<ENV_BITS) /* OFF */
-#define EG_DED EG_OFF
-#define EG_DST (EG_ENT<<ENV_BITS) /* DECAY START */
-#define EG_AED EG_DST
-#define EG_AST 0 /* ATTACK START */
-
-#define EG_STEP (96.0/EG_ENT) /* OPL is 0.1875 dB step */
-
-/* LFO table entries */
-#define VIB_ENT 512
-#define VIB_SHIFT (32-9)
-#define AMS_ENT 512
-#define AMS_SHIFT (32-9)
-
-#define VIB_RATE 256
-
-/* -------------------- local defines , macros --------------------- */
-
-/* register number to channel number , slot offset */
-#define SLOT1 0
-#define SLOT2 1
-
-/* envelope phase */
-#define ENV_MOD_RR 0x00
-#define ENV_MOD_DR 0x01
-#define ENV_MOD_AR 0x02
-
-/* -------------------- tables --------------------- */
-static const int slot_array32=
-{
-	 0, 2, 4, 1, 3, 5,-1,-1,
-	 6, 8,10, 7, 9,11,-1,-1,
-	12,14,16,13,15,17,-1,-1,
-	-1,-1,-1,-1,-1,-1,-1,-1
-};
-
-/* key scale level */
-/* table is 3dB/OCT , DV converts this in TL step at 6dB/OCT */
-#define DV (EG_STEP/2)
-#define U(x) ((UINT32)(x))
-static const UINT32 KSL_TABLE8*16=
-{
-	/* OCT 0 */
-	U( 0.000/DV),U( 0.000/DV),U( 0.000/DV),U( 0.000/DV),
-	U( 0.000/DV),U( 0.000/DV),U( 0.000/DV),U( 0.000/DV),
-	U( 0.000/DV),U( 0.000/DV),U( 0.000/DV),U( 0.000/DV),
-	U( 0.000/DV),U( 0.000/DV),U( 0.000/DV),U( 0.000/DV),
-	/* OCT 1 */
-	U( 0.000/DV),U( 0.000/DV),U( 0.000/DV),U( 0.000/DV),
-	U( 0.000/DV),U( 0.000/DV),U( 0.000/DV),U( 0.000/DV),
-	U( 0.000/DV),U( 0.750/DV),U( 1.125/DV),U( 1.500/DV),
-	U( 1.875/DV),U( 2.250/DV),U( 2.625/DV),U( 3.000/DV),
-	/* OCT 2 */
-	U( 0.000/DV),U( 0.000/DV),U( 0.000/DV),U( 0.000/DV),
-	U( 0.000/DV),U( 1.125/DV),U( 1.875/DV),U( 2.625/DV),
-	U( 3.000/DV),U( 3.750/DV),U( 4.125/DV),U( 4.500/DV),
-	U( 4.875/DV),U( 5.250/DV),U( 5.625/DV),U( 6.000/DV),
-	/* OCT 3 */
-	U( 0.000/DV),U( 0.000/DV),U( 0.000/DV),U( 1.875/DV),
-	U( 3.000/DV),U( 4.125/DV),U( 4.875/DV),U( 5.625/DV),
-	U( 6.000/DV),U( 6.750/DV),U( 7.125/DV),U( 7.500/DV),
-	U( 7.875/DV),U( 8.250/DV),U( 8.625/DV),U( 9.000/DV),
-	/* OCT 4 */
-	U( 0.000/DV),U( 0.000/DV),U( 3.000/DV),U( 4.875/DV),
-	U( 6.000/DV),U( 7.125/DV),U( 7.875/DV),U( 8.625/DV),
-	U( 9.000/DV),U( 9.750/DV),U(10.125/DV),U(10.500/DV),
-	U(10.875/DV),U(11.250/DV),U(11.625/DV),U(12.000/DV),
-	/* OCT 5 */
-	U( 0.000/DV),U( 3.000/DV),U( 6.000/DV),U( 7.875/DV),
-	U( 9.000/DV),U(10.125/DV),U(10.875/DV),U(11.625/DV),
-	U(12.000/DV),U(12.750/DV),U(13.125/DV),U(13.500/DV),
-	U(13.875/DV),U(14.250/DV),U(14.625/DV),U(15.000/DV),
-	/* OCT 6 */
-	U( 0.000/DV),U( 6.000/DV),U( 9.000/DV),U(10.875/DV),
-	U(12.000/DV),U(13.125/DV),U(13.875/DV),U(14.625/DV),
-	U(15.000/DV),U(15.750/DV),U(16.125/DV),U(16.500/DV),
-	U(16.875/DV),U(17.250/DV),U(17.625/DV),U(18.000/DV),
-	/* OCT 7 */
-	U( 0.000/DV),U( 9.000/DV),U(12.000/DV),U(13.875/DV),
-	U(15.000/DV),U(16.125/DV),U(16.875/DV),U(17.625/DV),
-	U(18.000/DV),U(18.750/DV),U(19.125/DV),U(19.500/DV),
- U(19.875/DV),U(20.250/DV),U(20.625/DV),U(21.000/DV)
-};
-#undef U
-#undef DV
-
-/* sustain lebel table (3db per step) */
-/* 0 - 15: 0, 3, 6, 9,12,15,18,21,24,27,30,33,36,39,42,93 (dB)*/
-#define SC(db) (INT32)((db*((3/EG_STEP)*(1<<ENV_BITS)))+EG_DST)
-static const INT32 SL_TABLE16={
- SC( 0),SC( 1),SC( 2),SC(3 ),SC(4 ),SC(5 ),SC(6 ),SC( 7),
- SC( 8),SC( 9),SC(10),SC(11),SC(12),SC(13),SC(14),SC(31)
-};
-#undef SC
-
-#define TL_MAX (EG_ENT*2) /* limit(tl + ksr + envelope) + sinwave */
-/* TotalLevel : 48 24 12 6 3 1.5 0.75 (dB) */
-/* TL_TABLE 0 to TL_MAX : plus section */
-/* TL_TABLE TL_MAX to TL_MAX+TL_MAX-1 : minus section */
-static INT32 *TL_TABLE;
-
-/* pointers to TL_TABLE with sinwave output offset */
-static INT32 **SIN_TABLE;
-
-/* LFO table */
-static INT32 *AMS_TABLE;
-static INT32 *VIB_TABLE;
-
-/* envelope output curve table */
-/* attack + decay + OFF */
-static INT32 ENV_CURVE2*EG_ENT+1;
-
-/* multiple table */
-#define ML 2
-static const UINT32 MUL_TABLE16= {
-/* 1/2, 1, 2, 3, 4, 5, 6, 7, 8, 9,10,11,12,13,14,15 */
- ML/2, 1*ML, 2*ML, 3*ML, 4*ML, 5*ML, 6*ML, 7*ML,
- 8*ML, 9*ML,10*ML,10*ML,12*ML,12*ML,15*ML,15*ML
-};
-#undef ML
-
-/* dummy attack / decay rate ( when rate == 0 ) */
-static INT32 RATE_016=
-{0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
-
-/* -------------------- static state --------------------- */
-
-/* lock level of common table */
-static int num_lock = 0;
-
-/* work table */
-static void *cur_chip = nullptr;	/* current chip point */
-/* currenct chip state */
-/* static OPLSAMPLE *bufL,*bufR; */
-static OPL_CH *S_CH;
-static OPL_CH *E_CH;
-OPL_SLOT *SLOT7_1,*SLOT7_2,*SLOT8_1,*SLOT8_2;
-
-static INT32 outd1;
-static INT32 ams;
-static INT32 vib;
-INT32 *ams_table;
-INT32 *vib_table;
-static INT32 amsIncr;
-static INT32 vibIncr;
-static INT32 feedback2;		/* connect for SLOT 2 */
-
-/* log output level */
-#define LOG_ERR 3 /* ERROR */
-#define LOG_WAR 2 /* WARNING */
-#define LOG_INF 1 /* INFORMATION */
-
-//#define LOG_LEVEL LOG_INF
-#define LOG_LEVEL	LOG_ERR
-
-//#define LOG(n,x) if( (n)>=LOG_LEVEL ) logerror x
-#define LOG(n,x)
-
-/* --------------------- subroutines --------------------- */
-
-static inline int Limit( int val, int max, int min ) {
-	if ( val > max )
-		val = max;
-	else if ( val < min )
-		val = min;
-
-	return val;
-}
-
-/* status set and IRQ handling */
-static inline void OPL_STATUS_SET(FM_OPL *OPL,int flag)
-{
-	/* set status flag */
-	OPL->status |= flag;
-	if(!(OPL->status & 0x80))
-	{
-		if(OPL->status & OPL->statusmask)
-		{	/* IRQ on */
-			OPL->status |= 0x80;
-			/* callback user interrupt handler (IRQ is OFF to ON) */
-			if(OPL->IRQHandler) (OPL->IRQHandler)(OPL->IRQParam,1);
-		}
-	}
-}
-
-/* status reset and IRQ handling */
-static inline void OPL_STATUS_RESET(FM_OPL *OPL,int flag)
-{
-	/* reset status flag */
-	OPL->status &=~flag;
-	if((OPL->status & 0x80))
-	{
-		if (!(OPL->status & OPL->statusmask) )
-		{
-			OPL->status &= 0x7f;
-			/* callback user interrupt handler (IRQ is ON to OFF) */
-			if(OPL->IRQHandler) (OPL->IRQHandler)(OPL->IRQParam,0);
-		}
-	}
-}
-
-/* IRQ mask set */
-static inline void OPL_STATUSMASK_SET(FM_OPL *OPL,int flag)
-{
-	OPL->statusmask = flag;
-	/* IRQ handling check */
-	OPL_STATUS_SET(OPL,0);
-	OPL_STATUS_RESET(OPL,0);
-}
-
-/* ----- key on ----- */
-static inline void OPL_KEYON(OPL_SLOT *SLOT)
-{
-	/* sin wave restart */
-	SLOT->Cnt = 0;
-	/* set attack */
-	SLOT->evm = ENV_MOD_AR;
-	SLOT->evs = SLOT->evsa;
-	SLOT->evc = EG_AST;
-	SLOT->eve = EG_AED;
-}
-/* ----- key off ----- */
-static inline void OPL_KEYOFF(OPL_SLOT *SLOT)
-{
-	if( SLOT->evm > ENV_MOD_RR)
-	{
-		/* set envelope counter from envleope output */
-		SLOT->evm = ENV_MOD_RR;
-		if( !(SLOT->evc&EG_DST) )
-			//SLOT->evc = (ENV_CURVESLOT->evc>>ENV_BITS<<ENV_BITS) + EG_DST;
-			SLOT->evc = EG_DST;
-		SLOT->eve = EG_DED;
-		SLOT->evs = SLOT->evsr;
-	}
-}
-
-/* ---------- calcrate Envelope Generator & Phase Generator ---------- */
-/* return : envelope output */
-static inline UINT32 OPL_CALC_SLOT( OPL_SLOT *SLOT )
-{
-	/* calcrate envelope generator */
-	if( (SLOT->evc+=SLOT->evs) >= SLOT->eve )
-	{
-		switch( SLOT->evm ){
-		case ENV_MOD_AR: /* ATTACK -> DECAY1 */
-			/* next DR */
-			SLOT->evm = ENV_MOD_DR;
-			SLOT->evc = EG_DST;
-			SLOT->eve = SLOT->SL;
-			SLOT->evs = SLOT->evsd;
-			break;
-		case ENV_MOD_DR: /* DECAY -> SL or RR */
-			SLOT->evc = SLOT->SL;
-			SLOT->eve = EG_DED;
-			if(SLOT->eg_typ)
-			{
-				SLOT->evs = 0;
-			}
-			else
-			{
-				SLOT->evm = ENV_MOD_RR;
-				SLOT->evs = SLOT->evsr;
-			}
-			break;
-		case ENV_MOD_RR: /* RR -> OFF */
-			SLOT->evc = EG_OFF;
-			SLOT->eve = EG_OFF+1;
-			SLOT->evs = 0;
-			break;
-		}
-	}
-	/* calcrate envelope */
-	return SLOT->TLL+ENV_CURVESLOT->evc>>ENV_BITS+(SLOT->ams ? ams : 0);
-}
-
-/* set algorythm connection */
-static void set_algorythm( OPL_CH *CH)
-{
-	INT32 *carrier = &outd0;
-	CH->connect1 = CH->CON ? carrier : &feedback2;
-	CH->connect2 = carrier;
-}
-
-/* ---------- frequency counter for operater update ---------- */
-static inline void CALC_FCSLOT(OPL_CH *CH,OPL_SLOT *SLOT)
-{
-	int ksr;
-
-	/* frequency step counter */
-	SLOT->Incr = CH->fc * SLOT->mul;
-	ksr = CH->kcode >> SLOT->KSR;
-
-	if( SLOT->ksr != ksr )
-	{
-		SLOT->ksr = ksr;
-		/* attack , decay rate recalcration */
-		SLOT->evsa = SLOT->ARksr;
-		SLOT->evsd = SLOT->DRksr;
-		SLOT->evsr = SLOT->RRksr;
-	}
-	SLOT->TLL = SLOT->TL + (CH->ksl_base>>SLOT->ksl);
-}
-
-/* set multi,am,vib,EG-TYP,KSR,mul */
-static inline void set_mul(FM_OPL *OPL,int slot,int v)
-{
-	OPL_CH *CH = &OPL->P_CHslot/2;
-	OPL_SLOT *SLOT = &CH->SLOTslot&1;
-
-	SLOT->mul = MUL_TABLEv&0x0f;
-	SLOT->KSR = (v&0x10) ? 0 : 2;
-	SLOT->eg_typ = (v&0x20)>>5;
-	SLOT->vib = (v&0x40);
-	SLOT->ams = (v&0x80);
-	CALC_FCSLOT(CH,SLOT);
-}
-
-/* set ksl & tl */
-static inline void set_ksl_tl(FM_OPL *OPL,int slot,int v)
-{
-	OPL_CH *CH = &OPL->P_CHslot/2;
-	OPL_SLOT *SLOT = &CH->SLOTslot&1;
-	int ksl = v>>6; /* 0 / 1.5 / 3 / 6 db/OCT */
-
-	SLOT->ksl = ksl ? 3-ksl : 31;
-	SLOT->TL = (v&0x3f)*(0.75/EG_STEP); /* 0.75db step */
-
-	if( !(OPL->mode&0x80) )
-	{	/* not CSM latch total level */
-		SLOT->TLL = SLOT->TL + (CH->ksl_base>>SLOT->ksl);
-	}
-}
-
-/* set attack rate & decay rate */
-static inline void set_ar_dr(FM_OPL *OPL,int slot,int v)
-{
-	OPL_CH *CH = &OPL->P_CHslot/2;
-	OPL_SLOT *SLOT = &CH->SLOTslot&1;
-	int ar = v>>4;
-	int dr = v&0x0f;
-
-	SLOT->AR = ar ? &OPL->AR_TABLEar<<2 : RATE_0;
-	SLOT->evsa = SLOT->ARSLOT->ksr;
-	if( SLOT->evm == ENV_MOD_AR ) SLOT->evs = SLOT->evsa;
-
-	SLOT->DR = dr ? &OPL->DR_TABLEdr<<2 : RATE_0;
-	SLOT->evsd = SLOT->DRSLOT->ksr;
-	if( SLOT->evm == ENV_MOD_DR ) SLOT->evs = SLOT->evsd;
-}
-
-/* set sustain level & release rate */
-static inline void set_sl_rr(FM_OPL *OPL,int slot,int v)
-{
-	OPL_CH *CH = &OPL->P_CHslot/2;
-	OPL_SLOT *SLOT = &CH->SLOTslot&1;
-	int sl = v>>4;
-	int rr = v & 0x0f;
-
-	SLOT->SL = SL_TABLEsl;
-	if( SLOT->evm == ENV_MOD_DR ) SLOT->eve = SLOT->SL;
-	SLOT->RR = &OPL->DR_TABLErr<<2;
-	SLOT->evsr = SLOT->RRSLOT->ksr;
-	if( SLOT->evm == ENV_MOD_RR ) SLOT->evs = SLOT->evsr;
-}
-
-/* operator output calcrator */
-#define OP_OUT(slot,env,con) slot->wavetable((slot->Cnt+con)/(0x1000000/SIN_ENT))&(SIN_ENT-1)env
-/* ---------- calcrate one of channel ---------- */
-static inline void OPL_CALC_CH( OPL_CH *CH )
-{
-	UINT32 env_out;
-	OPL_SLOT *SLOT;
-
-	feedback2 = 0;
-	/* SLOT 1 */
-	SLOT = &CH->SLOTSLOT1;
-	env_out=OPL_CALC_SLOT(SLOT);
-	if( env_out < EG_ENT-1 )
-	{
-		/* PG */
-		if(SLOT->vib) SLOT->Cnt += (SLOT->Incr*vib/VIB_RATE);
-		else SLOT->Cnt += SLOT->Incr;
-		/* connectoion */
-		if(CH->FB)
-		{
-			int feedback1 = (CH->op1_out0+CH->op1_out1)>>CH->FB;
-			CH->op1_out1 = CH->op1_out0;
-			*CH->connect1 += CH->op1_out0 = OP_OUT(SLOT,env_out,feedback1);
-		}
-		else
-		{
-			*CH->connect1 += OP_OUT(SLOT,env_out,0);
-		}
-	}else
-	{
-		CH->op1_out1 = CH->op1_out0;
-		CH->op1_out0 = 0;
-	}
-	/* SLOT 2 */
-	SLOT = &CH->SLOTSLOT2;
-	env_out=OPL_CALC_SLOT(SLOT);
-	if( env_out < EG_ENT-1 )
-	{
-		/* PG */
-		if(SLOT->vib) SLOT->Cnt += (SLOT->Incr*vib/VIB_RATE);
-		else SLOT->Cnt += SLOT->Incr;
-		/* connectoion */
-		outd0 += OP_OUT(SLOT,env_out, feedback2);
-	}
-}
-
-/* ---------- calcrate rythm block ---------- */
-#define WHITE_NOISE_db 6.0
-static inline void OPL_CALC_RH( OPL_CH *CH )
-{
-	UINT32 env_tam,env_sd,env_top,env_hh;
-	int whitenoise = (rand()&1)*(WHITE_NOISE_db/EG_STEP);
-	INT32 tone8;
-
-	OPL_SLOT *SLOT;
-	int env_out;
-
-	/* BD : same as FM serial mode and output level is large */
-	feedback2 = 0;
-	/* SLOT 1 */
-	SLOT = &CH6.SLOTSLOT1;
-	env_out=OPL_CALC_SLOT(SLOT);
-	if( env_out < EG_ENT-1 )
-	{
-		/* PG */
-		if(SLOT->vib) SLOT->Cnt += (SLOT->Incr*vib/VIB_RATE);
-		else SLOT->Cnt += SLOT->Incr;
-		/* connectoion */
-		if(CH6.FB)
-		{
-			int feedback1 = (CH6.op1_out0+CH6.op1_out1)>>CH6.FB;
-			CH6.op1_out1 = CH6.op1_out0;
-			feedback2 = CH6.op1_out0 = OP_OUT(SLOT,env_out,feedback1);
-		}
-		else
-		{
-			feedback2 = OP_OUT(SLOT,env_out,0);
-		}
-	}else
-	{
-		feedback2 = 0;
-		CH6.op1_out1 = CH6.op1_out0;
-		CH6.op1_out0 = 0;
-	}
-	/* SLOT 2 */
-	SLOT = &CH6.SLOTSLOT2;
-	env_out=OPL_CALC_SLOT(SLOT);
-	if( env_out < EG_ENT-1 )
-	{
-		/* PG */
-		if(SLOT->vib) SLOT->Cnt += (SLOT->Incr*vib/VIB_RATE);
-		else SLOT->Cnt += SLOT->Incr;
-		/* connectoion */
-		outd0 += OP_OUT(SLOT,env_out, feedback2)*2;
-	}
-
-	// SD (17) = mul14fnum7 + white noise
-	// TAM (15) = mul15fnum8
-	// TOP (18) = fnum6(mul18fnum8+whitenoise)
-	// HH (14) = fnum7(mul18fnum8+whitenoise) + white noise
-	env_sd =OPL_CALC_SLOT(SLOT7_2) + whitenoise;
-	env_tam=OPL_CALC_SLOT(SLOT8_1);
-	env_top=OPL_CALC_SLOT(SLOT8_2);
-	env_hh =OPL_CALC_SLOT(SLOT7_1) + whitenoise;
-
-	/* PG */
-	if(SLOT7_1->vib) SLOT7_1->Cnt += (2*SLOT7_1->Incr*vib/VIB_RATE);
-	else SLOT7_1->Cnt += 2*SLOT7_1->Incr;
-	if(SLOT7_2->vib) SLOT7_2->Cnt += ((CH7.fc*8)*vib/VIB_RATE);
-	else SLOT7_2->Cnt += (CH7.fc*8);
-	if(SLOT8_1->vib) SLOT8_1->Cnt += (SLOT8_1->Incr*vib/VIB_RATE);
-	else SLOT8_1->Cnt += SLOT8_1->Incr;
-	if(SLOT8_2->vib) SLOT8_2->Cnt += ((CH8.fc*48)*vib/VIB_RATE);
-	else SLOT8_2->Cnt += (CH8.fc*48);
-
-	tone8 = OP_OUT(SLOT8_2,whitenoise,0 );
-
-	/* SD */
-	if( env_sd < EG_ENT-1 )
-		outd0 += OP_OUT(SLOT7_1,env_sd, 0)*8;
-	/* TAM */
-	if( env_tam < EG_ENT-1 )
-		outd0 += OP_OUT(SLOT8_1,env_tam, 0)*2;
-	/* TOP-CY */
-	if( env_top < EG_ENT-1 )
-		outd0 += OP_OUT(SLOT7_2,env_top,tone8)*2;
-	/* HH */
-	if( env_hh < EG_ENT-1 )
-		outd0 += OP_OUT(SLOT7_2,env_hh,tone8)*2;
-}
-
-/* ----------- initialize time tabls ----------- */
-static void init_timetables( FM_OPL *OPL , int ARRATE , int DRRATE )
-{
-	int i;
-	double rate;
-
-	/* make attack rate & decay rate tables */
-	for (i = 0;i < 4;i++) OPL->AR_TABLEi = OPL->DR_TABLEi = 0;
-	for (i = 4;i <= 60;i++){
-		rate = OPL->freqbase;						/* frequency rate */
-		if( i < 60 ) rate *= 1.0+(i&3)*0.25;		/* b0-1 : x1 , x1.25 , x1.5 , x1.75 */
-		rate *= 1<<((i>>2)-1);						/* b2-5 : shift bit */
-		rate *= (double)(EG_ENT<<ENV_BITS);
-		OPL->AR_TABLEi = rate / ARRATE;
-		OPL->DR_TABLEi = rate / DRRATE;
-	}
-	// FIXME: warning: iteration 15u invokes undefined behavior
-	// for (i = 60; i < 76; i++)
-	for (i = 60; i < 75; i++)
-	{
-		OPL->AR_TABLEi = EG_AED-1;
-		OPL->DR_TABLEi = OPL->DR_TABLE60;
-	}
-#if 0
-	for (i = 0;i < 64 ;i++){	/* make for overflow area */
-		LOG(LOG_WAR,("rate %2d , ar %f ms , dr %f ms \n",i,
-			((double)(EG_ENT<<ENV_BITS) / OPL->AR_TABLEi) * (1000.0 / OPL->rate),
-			((double)(EG_ENT<<ENV_BITS) / OPL->DR_TABLEi) * (1000.0 / OPL->rate) ));
-	}
-#endif
-}
-
-/* ---------- generic table initialize ---------- */
-static int OPLOpenTable( void )
-{
-	int s,t;
-	double rate;
-	int i,j;
-	double pom;
-
-	/* allocate dynamic tables */
-	if( (TL_TABLE = (INT32*)malloc(TL_MAX*2*sizeof(INT32))) == nullptr)
-		return 0;
-	if( (SIN_TABLE = (INT32**)malloc(SIN_ENT*4 *sizeof(INT32 *))) == nullptr)
-	{
-		free(TL_TABLE);
-		return 0;
-	}
-	if( (AMS_TABLE = (INT32*)malloc(AMS_ENT*2 *sizeof(INT32))) == nullptr)
-	{
-		free(TL_TABLE);
-		free(SIN_TABLE);
-		return 0;
-	}
-	if( (VIB_TABLE = (INT32*)malloc(VIB_ENT*2 *sizeof(INT32))) == nullptr)
-	{
-		free(TL_TABLE);
-		free(SIN_TABLE);
-		free(AMS_TABLE);
-		return 0;
-	}
-	/* make total level table */
-	for (t = 0;t < EG_ENT-1 ;t++){
-		rate = ((1<<TL_BITS)-1)/pow(10,EG_STEP*t/20);	/* dB -> voltage */
-		TL_TABLE t = (int)rate;
-		TL_TABLETL_MAX+t = -TL_TABLEt;
-/*		LOG(LOG_INF,("TotalLevel(%3d) = %x\n",t,TL_TABLEt));*/
-	}
-	/* fill volume off area */
-	for ( t = EG_ENT-1; t < TL_MAX ;t++){
-		TL_TABLEt = TL_TABLETL_MAX+t = 0;
-	}
-
-	/* make sinwave table (total level offet) */
-	/* degree 0 = degree 180 = off */
-	SIN_TABLE0 = SIN_TABLESIN_ENT/2 = &TL_TABLEEG_ENT-1;
-	for (s = 1;s <= SIN_ENT/4;s++){
-		pom = sin(2*PI*s/SIN_ENT); /* sin */
-		pom = 20*log10(1/pom);	 /* decibel */
-		j = pom / EG_STEP; /* TL_TABLE steps */
-
- /* degree 0 - 90 , degree 180 - 90 : plus section */
-		SIN_TABLE s = SIN_TABLESIN_ENT/2-s = &TL_TABLEj;
- /* degree 180 - 270 , degree 360 - 270 : minus section */
-		SIN_TABLESIN_ENT/2+s = SIN_TABLESIN_ENT -s = &TL_TABLETL_MAX+j;
-/*		LOG(LOG_INF,("sin(%3d) = %f:%f db\n",s,pom,(double)j * EG_STEP));*/
-	}
-	for (s = 0;s < SIN_ENT;s++)
-	{
-		SIN_TABLESIN_ENT*1+s = s<(SIN_ENT/2) ? SIN_TABLEs : &TL_TABLEEG_ENT;
-		SIN_TABLESIN_ENT*2+s = SIN_TABLEs % (SIN_ENT/2);
-		SIN_TABLESIN_ENT*3+s = (s/(SIN_ENT/4))&1 ? &TL_TABLEEG_ENT : SIN_TABLESIN_ENT*2+s;
-	}
-
-	/* envelope counter -> envelope output table */
-	for (i=0; i<EG_ENT; i++)
-	{
-		/* ATTACK curve */
-		pom = pow( ((double)(EG_ENT-1-i)/EG_ENT) , 8 ) * EG_ENT;
-		/* if( pom >= EG_ENT ) pom = EG_ENT-1; */
-		ENV_CURVEi = (int)pom;
-		/* DECAY ,RELEASE curve */
-		ENV_CURVE(EG_DST>>ENV_BITS)+i= i;
-	}
-	/* off */
-	ENV_CURVEEG_OFF>>ENV_BITS= EG_ENT-1;
-	/* make LFO ams table */
-	for (i=0; i<AMS_ENT; i++)
-	{
-		pom = (1.0+sin(2*PI*i/AMS_ENT))/2; /* sin */
-		AMS_TABLEi = (1.0/EG_STEP)*pom; /* 1dB */
-		AMS_TABLEAMS_ENT+i = (4.8/EG_STEP)*pom; /* 4.8dB */
-	}
-	/* make LFO vibrate table */
-	for (i=0; i<VIB_ENT; i++)
-	{
-		/* 100cent = 1seminote = 6% ?? */
-		pom = (double)VIB_RATE*0.06*sin(2*PI*i/VIB_ENT); /* +-100sect step */
-		VIB_TABLEi = VIB_RATE + (pom*0.07); /* +- 7cent */
-		VIB_TABLEVIB_ENT+i = VIB_RATE + (pom*0.14); /* +-14cent */
-		/* LOG(LOG_INF,("vib %d=%d\n",i,VIB_TABLEVIB_ENT+i)); */
-	}
-	return 1;
-}
-
-
-static void OPLCloseTable( void )
-{
-	free(TL_TABLE);
-	free(SIN_TABLE);
-	free(AMS_TABLE);
-	free(VIB_TABLE);
-}
-
-/* CSM Key Controll */
-static inline void CSMKeyControll(OPL_CH *CH)
-{
-	OPL_SLOT *slot1 = &CH->SLOTSLOT1;
-	OPL_SLOT *slot2 = &CH->SLOTSLOT2;
-	/* all key off */
-	OPL_KEYOFF(slot1);
-	OPL_KEYOFF(slot2);
-	/* total level latch */
-	slot1->TLL = slot1->TL + (CH->ksl_base>>slot1->ksl);
-	slot1->TLL = slot1->TL + (CH->ksl_base>>slot1->ksl);
-	/* key on */
-	CH->op1_out0 = CH->op1_out1 = 0;
-	OPL_KEYON(slot1);
-	OPL_KEYON(slot2);
-}
-
-/* ---------- opl initialize ---------- */
-static void OPL_initalize(FM_OPL *OPL)
-{
-	int fn;
-
-	/* frequency base */
-	OPL->freqbase = (OPL->rate) ? ((double)OPL->clock / OPL->rate) / 72 : 0;
-	/* Timer base time */
-	OPL->TimerBase = 1.0/((double)OPL->clock / 72.0 );
-	/* make time tables */
-	init_timetables( OPL , OPL_ARRATE , OPL_DRRATE );
-	/* make fnumber -> increment counter table */
-	for( fn=0 ; fn < 1024 ; fn++ )
-	{
-		OPL->FN_TABLEfn = OPL->freqbase * fn * FREQ_RATE * (1<<7) / 2;
-	}
-	/* LFO freq.table */
-	OPL->amsIncr = OPL->rate ? (double)AMS_ENT*(1<<AMS_SHIFT) / OPL->rate * 3.7 * ((double)OPL->clock/3600000) : 0;
-	OPL->vibIncr = OPL->rate ? (double)VIB_ENT*(1<<VIB_SHIFT) / OPL->rate * 6.4 * ((double)OPL->clock/3600000) : 0;
-}
-
-/* ---------- write a OPL registers ---------- */
-static void OPLWriteReg(FM_OPL *OPL, int r, int v)
-{
-	OPL_CH *CH;
-	int slot;
-	int block_fnum;
-
-	switch(r&0xe0)
-	{
-	case 0x00: /* 00-1f:controll */
-		switch(r&0x1f)
-		{
-		case 0x01:
-			/* wave selector enable */
-			if(OPL->type&OPL_TYPE_WAVESEL)
-			{
-				OPL->wavesel = v&0x20;
-				if(!OPL->wavesel)
-				{
-					/* preset compatible mode */
-					int c;
-					for(c=0;c<OPL->max_ch;c++)
-					{
-						OPL->P_CHc.SLOTSLOT1.wavetable = &SIN_TABLE0;
-						OPL->P_CHc.SLOTSLOT2.wavetable = &SIN_TABLE0;
-					}
-				}
-			}
-			return;
-		case 0x02:	/* Timer 1 */
-			OPL->T0 = (256-v)*4;
-			break;
-		case 0x03:	/* Timer 2 */
-			OPL->T1 = (256-v)*16;
-			return;
-		case 0x04:	/* IRQ clear / mask and Timer enable */
-			if(v&0x80)
-			{	/* IRQ flag clear */
-				OPL_STATUS_RESET(OPL,0x7f);
-			}
-			else
-			{	/* set IRQ mask ,timer enable*/
-				UINT8 st1 = v&1;
-				UINT8 st2 = (v>>1)&1;
-				/* IRQRST,T1MSK,t2MSK,EOSMSK,BRMSK,x,ST2,ST1 */
-				OPL_STATUS_RESET(OPL,v&0x78);
-				OPL_STATUSMASK_SET(OPL,((~v)&0x78)|0x01);
-				/* timer 2 */
-				if(OPL->st1 != st2)
-				{
-					double interval = st2 ? (double)OPL->T1*OPL->TimerBase : 0.0;
-					OPL->st1 = st2;
-					if (OPL->TimerHandler) (OPL->TimerHandler)(OPL->TimerParam+1,interval);
-				}
-				/* timer 1 */
-				if(OPL->st0 != st1)
-				{
-					double interval = st1 ? (double)OPL->T0*OPL->TimerBase : 0.0;
-					OPL->st0 = st1;
-					if (OPL->TimerHandler) (OPL->TimerHandler)(OPL->TimerParam+0,interval);
-				}
-			}
-			return;
-#if BUILD_Y8950
-		case 0x06:		/* Key Board OUT */
-			if(OPL->type&OPL_TYPE_KEYBOARD)
-			{
-				if(OPL->keyboardhandler_w)
-					OPL->keyboardhandler_w(OPL->keyboard_param,v);
-				else
-					LOG(LOG_WAR,("OPL:write unmapped KEYBOARD port\n"));
-			}
-			return;
-		case 0x07:	/* DELTA-T controll : START,REC,MEMDATA,REPT,SPOFF,x,x,RST */
-			if(OPL->type&OPL_TYPE_ADPCM)
-				YM_DELTAT_ADPCM_Write(OPL->deltat,r-0x07,v);
-			return;
-		case 0x08:	/* MODE,DELTA-T : CSM,NOTESEL,x,x,smpl,da/ad,64k,rom */
-			OPL->mode = v;
-			v&=0x1f;	/* for DELTA-T unit */
-		case 0x09:		/* START ADD */
-		case 0x0a:
-		case 0x0b:		/* STOP ADD */
-		case 0x0c:
-		case 0x0d:		/* PRESCALE */
-		case 0x0e:
-		case 0x0f:		/* ADPCM data */
-		case 0x10: 		/* DELTA-N */
-		case 0x11: 		/* DELTA-N */
-		case 0x12: 		/* EG-CTRL */
-			if(OPL->type&OPL_TYPE_ADPCM)
-				YM_DELTAT_ADPCM_Write(OPL->deltat,r-0x07,v);
-			return;
-#if 0
-		case 0x15:		/* DAC data */
-		case 0x16:
-		case 0x17:		/* SHIFT */
-			return;
-		case 0x18:		/* I/O CTRL (Direction) */
-			if(OPL->type&OPL_TYPE_IO)
-				OPL->portDirection = v&0x0f;
-			return;
-		case 0x19:		/* I/O DATA */
-			if(OPL->type&OPL_TYPE_IO)
-			{
-				OPL->portLatch = v;
-				if(OPL->porthandler_w)
-					OPL->porthandler_w(OPL->port_param,v&OPL->portDirection);
-			}
-			return;
-		case 0x1a:		/* PCM data */
-			return;
-#endif
-#endif
-		}
-		break;
-	case 0x20:	/* am,vib,ksr,eg type,mul */
-		slot = slot_arrayr&0x1f;
-		if(slot == -1) return;
-		set_mul(OPL,slot,v);
-		return;
-	case 0x40:
-		slot = slot_arrayr&0x1f;
-		if(slot == -1) return;
-		set_ksl_tl(OPL,slot,v);
-		return;
-	case 0x60:
-		slot = slot_arrayr&0x1f;
-		if(slot == -1) return;
-		set_ar_dr(OPL,slot,v);
-		return;
-	case 0x80:
-		slot = slot_arrayr&0x1f;
-		if(slot == -1) return;
-		set_sl_rr(OPL,slot,v);
-		return;
-	case 0xa0:
-		switch(r)
-		{
-		case 0xbd:
-			/* amsep,vibdep,r,bd,sd,tom,tc,hh */
-			{
-			UINT8 rkey = OPL->rythm^v;
-			OPL->ams_table = &AMS_TABLEv&0x80 ? AMS_ENT : 0;
-			OPL->vib_table = &VIB_TABLEv&0x40 ? VIB_ENT : 0;
-			OPL->rythm = v&0x3f;
-			if(OPL->rythm&0x20)
-			{
-#if 0
-				usrintf_showmessage("OPL Rythm mode select");
-#endif
-				/* BD key on/off */
-				if(rkey&0x10)
-				{
-					if(v&0x10)
-					{
-						OPL->P_CH6.op1_out0 = OPL->P_CH6.op1_out1 = 0;
-						OPL_KEYON(&OPL->P_CH6.SLOTSLOT1);
-						OPL_KEYON(&OPL->P_CH6.SLOTSLOT2);
-					}
-					else
-					{
-						OPL_KEYOFF(&OPL->P_CH6.SLOTSLOT1);
-						OPL_KEYOFF(&OPL->P_CH6.SLOTSLOT2);
-					}
-				}
-				/* SD key on/off */
-				if(rkey&0x08)
-				{
-					if(v&0x08) OPL_KEYON(&OPL->P_CH7.SLOTSLOT2);
-					else OPL_KEYOFF(&OPL->P_CH7.SLOTSLOT2);
-				}/* TAM key on/off */
-				if(rkey&0x04)
-				{
-					if(v&0x04) OPL_KEYON(&OPL->P_CH8.SLOTSLOT1);
-					else OPL_KEYOFF(&OPL->P_CH8.SLOTSLOT1);
-				}
-				/* TOP-CY key on/off */
-				if(rkey&0x02)
-				{
-					if(v&0x02) OPL_KEYON(&OPL->P_CH8.SLOTSLOT2);
-					else OPL_KEYOFF(&OPL->P_CH8.SLOTSLOT2);
-				}
-				/* HH key on/off */
-				if(rkey&0x01)
-				{
-					if(v&0x01) OPL_KEYON(&OPL->P_CH7.SLOTSLOT1);
-					else OPL_KEYOFF(&OPL->P_CH7.SLOTSLOT1);
-				}
-			}
-			}
-			return;
-		}
-		/* keyon,block,fnum */
-		if( (r&0x0f) > 8) return;
-		CH = &OPL->P_CHr&0x0f;
-		if(!(r&0x10))
-		{	/* a0-a8 */
-			block_fnum = (CH->block_fnum&0x1f00) | v;
-		}
-		else
-		{	/* b0-b8 */
-			int keyon = (v>>5)&1;
-			block_fnum = ((v&0x1f)<<8) | (CH->block_fnum&0xff);
-			if(CH->keyon != keyon)
-			{
-				if( (CH->keyon=keyon) )
-				{
-					CH->op1_out0 = CH->op1_out1 = 0;
-					OPL_KEYON(&CH->SLOTSLOT1);
-					OPL_KEYON(&CH->SLOTSLOT2);
-				}
-				else
-				{
-					OPL_KEYOFF(&CH->SLOTSLOT1);
-					OPL_KEYOFF(&CH->SLOTSLOT2);
-				}
-			}
-		}
-		/* update */
-		if(CH->block_fnum != block_fnum)
-		{
-			int blockRv = 7-(block_fnum>>10);
-			int fnum = block_fnum&0x3ff;
-			CH->block_fnum = block_fnum;
-
-			CH->ksl_base = KSL_TABLEblock_fnum>>6;
-			CH->fc = OPL->FN_TABLEfnum>>blockRv;
-			CH->kcode = CH->block_fnum>>9;
-			if( (OPL->mode&0x40) && CH->block_fnum&0x100) CH->kcode |=1;
-			CALC_FCSLOT(CH,&CH->SLOTSLOT1);
-			CALC_FCSLOT(CH,&CH->SLOTSLOT2);
-		}
-		return;
-	case 0xc0:
-		/* FB,C */
-		if( (r&0x0f) > 8) return;
-		CH = &OPL->P_CHr&0x0f;
-		{
-		int feedback = (v>>1)&7;
-		CH->FB = feedback ? (8+1) - feedback : 0;
-		CH->CON = v&1;
-		set_algorythm(CH);
-		}
-		return;
-	case 0xe0: /* wave type */
-		slot = slot_arrayr&0x1f;
-		if(slot == -1) return;
-		CH = &OPL->P_CHslot/2;
-		if(OPL->wavesel)
-		{
-			/* LOG(LOG_INF,("OPL SLOT %d wave select %d\n",slot,v&3)); */
-			CH->SLOTslot&1.wavetable = &SIN_TABLE(v&0x03)*SIN_ENT;
-		}
-		return;
-	}
-}
-
-/* lock/unlock for common table */
-static int OPL_LockTable(void)
-{
-	num_lock++;
-	if(num_lock>1) return 0;
-	/* first time */
-	cur_chip = nullptr;
-	/* allocate total level table (128kb space) */
-	if( !OPLOpenTable() )
-	{
-		num_lock--;
-		return -1;
-	}
-	return 0;
-}
-
-static void OPL_UnLockTable(void)
-{
-	if(num_lock) num_lock--;
-	if(num_lock) return;
-	/* last time */
-	cur_chip = nullptr;
-	OPLCloseTable();
-}
-
-#if (BUILD_YM3812 || BUILD_YM3526)
-/*******************************************************************************/
-/*		YM3812 local section */
-/*******************************************************************************/
-
-/* ---------- update one of chip ----------- */
-void YM3812UpdateOne(FM_OPL *OPL, INT16 *buffer, int length)
-{
- int i;
-	int data;
-	OPLSAMPLE *buf = buffer;
-	UINT32 amsCnt = OPL->amsCnt;
-	UINT32 vibCnt = OPL->vibCnt;
-	UINT8 rythm = OPL->rythm&0x20;
-	OPL_CH *CH,*R_CH;
-
-	if( (void *)OPL != cur_chip ){
-		cur_chip = (void *)OPL;
-		/* channel pointers */
-		S_CH = OPL->P_CH;
-		E_CH = &S_CH9;
-		/* rythm slot */
-		SLOT7_1 = &S_CH7.SLOTSLOT1;
-		SLOT7_2 = &S_CH7.SLOTSLOT2;
-		SLOT8_1 = &S_CH8.SLOTSLOT1;
-		SLOT8_2 = &S_CH8.SLOTSLOT2;
-		/* LFO state */
-		amsIncr = OPL->amsIncr;
-		vibIncr = OPL->vibIncr;
-		ams_table = OPL->ams_table;
-		vib_table = OPL->vib_table;
-	}
-	R_CH = rythm ? &S_CH6 : E_CH;
- for( i=0; i < length ; i++ )
-	{
-		/* channel A channel B channel C */
-		/* LFO */
-		ams = ams_table(amsCnt+=amsIncr)>>AMS_SHIFT;
-		vib = vib_table(vibCnt+=vibIncr)>>VIB_SHIFT;
-		outd0 = 0;
-		/* FM part */
-		for(CH=S_CH ; CH < R_CH ; CH++)
-			OPL_CALC_CH(CH);
-		/* Rythn part */
-		if(rythm)
-			OPL_CALC_RH(S_CH);
-		/* limit check */
-		data = Limit( outd0 , OPL_MAXOUT, OPL_MINOUT );
-		/* store to sound buffer */
-		bufi = data >> OPL_OUTSB;
-	}
-
-	OPL->amsCnt = amsCnt;
-	OPL->vibCnt = vibCnt;
-#ifdef OPL_OUTPUT_LOG
-	if(opl_dbg_fp)
-	{
-		for(opl_dbg_chip=0;opl_dbg_chip<opl_dbg_maxchip;opl_dbg_chip++)
-			if( opl_dbg_oplopl_dbg_chip == OPL) break;
-		fprintf(opl_dbg_fp,"%c%c%c",0x20+opl_dbg_chip,length&0xff,length/256);
-	}
-#endif
-}
-#endif /* (BUILD_YM3812 || BUILD_YM3526) */
-
-#if BUILD_Y8950
-
-void Y8950UpdateOne(FM_OPL *OPL, INT16 *buffer, int length)
-{
- int i;
-	int data;
-	OPLSAMPLE *buf = buffer;
-	UINT32 amsCnt = OPL->amsCnt;
-	UINT32 vibCnt = OPL->vibCnt;
-	UINT8 rythm = OPL->rythm&0x20;
-	OPL_CH *CH,*R_CH;
-	YM_DELTAT *DELTAT = OPL->deltat;
-
-	/* setup DELTA-T unit */
-	YM_DELTAT_DECODE_PRESET(DELTAT);
-
-	if( (void *)OPL != cur_chip ){
-		cur_chip = (void *)OPL;
-		/* channel pointers */
-		S_CH = OPL->P_CH;
-		E_CH = &S_CH9;
-		/* rythm slot */
-		SLOT7_1 = &S_CH7.SLOTSLOT1;
-		SLOT7_2 = &S_CH7.SLOTSLOT2;
-		SLOT8_1 = &S_CH8.SLOTSLOT1;
-		SLOT8_2 = &S_CH8.SLOTSLOT2;
-		/* LFO state */
-		amsIncr = OPL->amsIncr;
-		vibIncr = OPL->vibIncr;
-		ams_table = OPL->ams_table;
-		vib_table = OPL->vib_table;
-	}
-	R_CH = rythm ? &S_CH6 : E_CH;
- for( i=0; i < length ; i++ )
-	{
-		/* channel A channel B channel C */
-		/* LFO */
-		ams = ams_table(amsCnt+=amsIncr)>>AMS_SHIFT;
-		vib = vib_table(vibCnt+=vibIncr)>>VIB_SHIFT;
-		outd0 = 0;
-		/* deltaT ADPCM */
-		if( DELTAT->portstate )
-			YM_DELTAT_ADPCM_CALC(DELTAT);
-		/* FM part */
-		for(CH=S_CH ; CH < R_CH ; CH++)
-			OPL_CALC_CH(CH);
-		/* Rythn part */
-		if(rythm)
-			OPL_CALC_RH(S_CH);
-		/* limit check */
-		data = Limit( outd0 , OPL_MAXOUT, OPL_MINOUT );
-		/* store to sound buffer */
-		bufi = data >> OPL_OUTSB;
-	}
-	OPL->amsCnt = amsCnt;
-	OPL->vibCnt = vibCnt;
-	/* deltaT START flag */
-	if( !DELTAT->portstate )
-		OPL->status &= 0xfe;
-}
-#endif
-
-/* ---------- reset one of chip ---------- */
-void OPLResetChip(FM_OPL *OPL)
-{
-	int c,s;
-	int i;
-
-	/* reset chip */
-	OPL->mode = 0;	/* normal mode */
-	OPL_STATUS_RESET(OPL,0x7f);
-	/* reset with register write */
-	OPLWriteReg(OPL,0x01,0); /* wabesel disable */
-	OPLWriteReg(OPL,0x02,0); /* Timer1 */
-	OPLWriteReg(OPL,0x03,0); /* Timer2 */
-	OPLWriteReg(OPL,0x04,0); /* IRQ mask clear */
-	for(i = 0xff ; i >= 0x20 ; i-- ) OPLWriteReg(OPL,i,0);
-	/* reset OPerator paramater */
-	for( c = 0 ; c < OPL->max_ch ; c++ )
-	{
-		OPL_CH *CH = &OPL->P_CHc;
-		/* OPL->P_CHc.PAN = OPN_CENTER; */
-		for(s = 0 ; s < 2 ; s++ )
-		{
-			/* wave table */
-			CH->SLOTs.wavetable = &SIN_TABLE0;
-			/* CH->SLOTs.evm = ENV_MOD_RR; */
-			CH->SLOTs.evc = EG_OFF;
-			CH->SLOTs.eve = EG_OFF+1;
-			CH->SLOTs.evs = 0;
-		}
-	}
-#if BUILD_Y8950
-	if(OPL->type&OPL_TYPE_ADPCM)
-	{
-		YM_DELTAT *DELTAT = OPL->deltat;
-
-		DELTAT->freqbase = OPL->freqbase;
-		DELTAT->output_pointer = outd;
-		DELTAT->portshift = 5;
-		DELTAT->output_range = DELTAT_MIXING_LEVEL<<TL_BITS;
-		YM_DELTAT_ADPCM_Reset(DELTAT,0);
-	}
-#endif
-}
-
-/* ---------- Create one of vietual YM3812 ---------- */
-/* 'rate' is sampling rate and 'bufsiz' is the size of the */
-FM_OPL *OPLCreate(int type, int clock, int rate)
-{
-	char *ptr;
-	FM_OPL *OPL;
-	int state_size;
-	int max_ch = 9; /* normaly 9 channels */
-
-	if( OPL_LockTable() ==-1) return nullptr;
-	/* allocate OPL state space */
-	state_size = sizeof(FM_OPL);
-	state_size += sizeof(OPL_CH)*max_ch;
-#if BUILD_Y8950
-	if(type&OPL_TYPE_ADPCM) state_size+= sizeof(YM_DELTAT);
-#endif
-	/* allocate memory block */
-	ptr = (char*)malloc(state_size);
-	if(ptr==nullptr) return nullptr;
-	/* clear */
-	memset(ptr,0,state_size);
-	OPL = (FM_OPL *)ptr; ptr+=sizeof(FM_OPL);
-	OPL->P_CH = (OPL_CH *)ptr; ptr+=sizeof(OPL_CH)*max_ch;
-#if BUILD_Y8950
-	if(type&OPL_TYPE_ADPCM) OPL->deltat = (YM_DELTAT *)ptr; ptr+=sizeof(YM_DELTAT);
-#endif
-	/* set channel state pointer */
-	OPL->type = type;
-	OPL->clock = clock;
-	OPL->rate = rate;
-	OPL->max_ch = max_ch;
-	/* init grobal tables */
-	OPL_initalize(OPL);
-	/* reset chip */
-	OPLResetChip(OPL);
-#ifdef OPL_OUTPUT_LOG
-	if(!opl_dbg_fp)
-	{
-		opl_dbg_fp = fopen("opllog.opl","wb");
-		opl_dbg_maxchip = 0;
-	}
-	if(opl_dbg_fp)
-	{
-		opl_dbg_oplopl_dbg_maxchip = OPL;
-		fprintf(opl_dbg_fp,"%c%c%c%c%c%c",0x00+opl_dbg_maxchip,
-			type,
-			clock&0xff,
-			(clock/0x100)&0xff,
-			(clock/0x10000)&0xff,
-			(clock/0x1000000)&0xff);
-		opl_dbg_maxchip++;
-	}
-#endif
-	return OPL;
-}
-
-/* ---------- Destroy one of vietual YM3812 ---------- */
-void OPLDestroy(FM_OPL *OPL)
-{
-#ifdef OPL_OUTPUT_LOG
-	if(opl_dbg_fp)
-	{
-		fclose(opl_dbg_fp);
-		opl_dbg_fp = nullptr;
-	}
-#endif
-	OPL_UnLockTable();
-	free(OPL);
-}
-
-/* ---------- Option handlers ---------- */
-
-void OPLSetTimerHandler(FM_OPL *OPL,OPL_TIMERHANDLER TimerHandler,int channelOffset)
-{
-	OPL->TimerHandler = TimerHandler;
-	OPL->TimerParam = channelOffset;
-}
-void OPLSetIRQHandler(FM_OPL *OPL,OPL_IRQHANDLER IRQHandler,int param)
-{
-	OPL->IRQHandler = IRQHandler;
-	OPL->IRQParam = param;
-}
-void OPLSetUpdateHandler(FM_OPL *OPL,OPL_UPDATEHANDLER UpdateHandler,int param)
-{
-	OPL->UpdateHandler = UpdateHandler;
-	OPL->UpdateParam = param;
-}
-#if BUILD_Y8950
-void OPLSetPortHandler(FM_OPL *OPL,OPL_PORTHANDLER_W PortHandler_w,OPL_PORTHANDLER_R PortHandler_r,int param)
-{
-	OPL->porthandler_w = PortHandler_w;
-	OPL->porthandler_r = PortHandler_r;
-	OPL->port_param = param;
-}
-
-void OPLSetKeyboardHandler(FM_OPL *OPL,OPL_PORTHANDLER_W KeyboardHandler_w,OPL_PORTHANDLER_R KeyboardHandler_r,int param)
-{
-	OPL->keyboardhandler_w = KeyboardHandler_w;
-	OPL->keyboardhandler_r = KeyboardHandler_r;
-	OPL->keyboard_param = param;
-}
-#endif
-/* ---------- YM3812 I/O interface ---------- */
-int OPLWrite(FM_OPL *OPL,int a,int v)
-{
-	if( !(a&1) )
-	{	/* address port */
-		OPL->address = v & 0xff;
-	}
-	else
-	{	/* data port */
-		if(OPL->UpdateHandler) OPL->UpdateHandler(OPL->UpdateParam,0);
-#ifdef OPL_OUTPUT_LOG
-	if(opl_dbg_fp)
-	{
-		for(opl_dbg_chip=0;opl_dbg_chip<opl_dbg_maxchip;opl_dbg_chip++)
-			if( opl_dbg_oplopl_dbg_chip == OPL) break;
-		fprintf(opl_dbg_fp,"%c%c%c",0x10+opl_dbg_chip,OPL->address,v);
-	}
-#endif
-		OPLWriteReg(OPL,OPL->address,v);
-	}
-	return OPL->status>>7;
-}
-
-unsigned char OPLRead(FM_OPL *OPL,int a)
-{
-	if( !(a&1) )
-	{	/* status port */
-		return OPL->status & (OPL->statusmask|0x80);
-	}
-	/* data port */
-	switch(OPL->address)
-	{
-	case 0x05: /* KeyBoard IN */
-		if(OPL->type&OPL_TYPE_KEYBOARD)
-		{
-			if(OPL->keyboardhandler_r)
-				return OPL->keyboardhandler_r(OPL->keyboard_param);
-			else
-				LOG(LOG_WAR,("OPL:read unmapped KEYBOARD port\n"));
-		}
-		return 0;
-#if 0
-	case 0x0f: /* ADPCM-DATA */
-		return 0;
-#endif
-	case 0x19: /* I/O DATA */
-		if(OPL->type&OPL_TYPE_IO)
-		{
-			if(OPL->porthandler_r)
-				return OPL->porthandler_r(OPL->port_param);
-			else
-				LOG(LOG_WAR,("OPL:read unmapped I/O port\n"));
-		}
-		return 0;
-	case 0x1a: /* PCM-DATA */
-		return 0;
-	}
-	return 0;
-}
-
-int OPLTimerOver(FM_OPL *OPL,int c)
-{
-	if( c )
-	{	/* Timer B */
-		OPL_STATUS_SET(OPL,0x20);
-	}
-	else
-	{	/* Timer A */
-		OPL_STATUS_SET(OPL,0x40);
-		/* CSM mode key,TL controll */
-		if( OPL->mode & 0x80 )
-		{	/* CSM mode total level latch and auto key on */
-			int ch;
-			if(OPL->UpdateHandler) OPL->UpdateHandler(OPL->UpdateParam,0);
-			for(ch=0;ch<9;ch++)
-				CSMKeyControll( &OPL->P_CHch );
-		}
-	}
-	/* reload timer */
-	if (OPL->TimerHandler) (OPL->TimerHandler)(OPL->TimerParam+c,(double)OPL->Tc*OPL->TimerBase);
-	return OPL->status>>7;
-}

audacious-plugins-3.6.2-gtk3.tar.bz2/src/adplug/core/fmopl.h Deleted

@@ -1,174 +0,0 @@
-#ifndef __FMOPL_H_
-#define __FMOPL_H_
-
-/* --- select emulation chips --- */
-#define BUILD_YM3812 (HAS_YM3812)
-//#define BUILD_YM3526 (HAS_YM3526)
-//#define BUILD_Y8950 (HAS_Y8950)
-
-/* --- system optimize --- */
-/* select bit size of output : 8 or 16 */
-#define OPL_OUTPUT_BIT 16
-
-/* compiler dependence */
-#ifndef OSD_CPU_H
-#define OSD_CPU_H
-typedef unsigned char	UINT8; /* unsigned 8bit */
-typedef unsigned short	UINT16; /* unsigned 16bit */
-typedef unsigned int	UINT32; /* unsigned 32bit */
-typedef signed char		INT8; /* signed 8bit */
-typedef signed short	INT16; /* signed 16bit */
-typedef signed int		INT32; /* signed 32bit */
-#endif
-
-#if (OPL_OUTPUT_BIT==16)
-typedef INT16 OPLSAMPLE;
-#endif
-#if (OPL_OUTPUT_BIT==8)
-typedef unsigned char OPLSAMPLE;
-#endif
-
-
-#if BUILD_Y8950
-#include "ymdeltat.h"
-#endif
-
-typedef void (*OPL_TIMERHANDLER)(int channel,double interval_Sec);
-typedef void (*OPL_IRQHANDLER)(int param,int irq);
-typedef void (*OPL_UPDATEHANDLER)(int param,int min_interval_us);
-typedef void (*OPL_PORTHANDLER_W)(int param,unsigned char data);
-typedef unsigned char (*OPL_PORTHANDLER_R)(int param);
-
-/* !!!!! here is private section , do not access there member direct !!!!! */
-
-#define OPL_TYPE_WAVESEL 0x01 /* waveform select */
-#define OPL_TYPE_ADPCM 0x02 /* DELTA-T ADPCM unit */
-#define OPL_TYPE_KEYBOARD 0x04 /* keyboard interface */
-#define OPL_TYPE_IO 0x08 /* I/O port */
-
-/* Saving is necessary for member of the 'R' mark for suspend/resume */
-/* ---------- OPL one of slot ---------- */
-typedef struct fm_opl_slot {
-	INT32 TL;		/* total level :TL << 8 */
-	INT32 TLL;		/* adjusted now TL */
-	UINT8 KSR;		/* key scale rate :(shift down bit) */
-	INT32 *AR;		/* attack rate :&AR_TABLEAR<<2 */
-	INT32 *DR;		/* decay rate :&DR_TALBEDR<<2 */
-	INT32 SL;		/* sustin level :SL_TALBESL */
-	INT32 *RR;		/* release rate :&DR_TABLERR<<2 */
-	UINT8 ksl;		/* keyscale level :(shift down bits) */
-	UINT8 ksr;		/* key scale rate :kcode>>KSR */
-	UINT32 mul;		/* multiple :ML_TABLEML */
-	UINT32 Cnt;		/* frequency count : */
-	UINT32 Incr;	/* frequency step : */
-	/* envelope generator state */
-	UINT8 eg_typ;	/* envelope type flag */
-	UINT8 evm;		/* envelope phase */
-	INT32 evc;		/* envelope counter */
-	INT32 eve;		/* envelope counter end point */
-	INT32 evs;		/* envelope counter step */
-	INT32 evsa;	/* envelope step for AR :ARksr */
-	INT32 evsd;	/* envelope step for DR :DRksr */
-	INT32 evsr;	/* envelope step for RR :RRksr */
-	/* LFO */
-	UINT8 ams;		/* ams flag */
-	UINT8 vib;		/* vibrate flag */
-	/* wave selector */
-	INT32 **wavetable;
-}OPL_SLOT;
-
-/* ---------- OPL one of channel ---------- */
-typedef struct fm_opl_channel {
-	OPL_SLOT SLOT2;
-	UINT8 CON;			/* connection type */
-	UINT8 FB;			/* feed back :(shift down bit) */
-	INT32 *connect1;	/* slot1 output pointer */
-	INT32 *connect2;	/* slot2 output pointer */
-	INT32 op1_out2;	/* slot1 output for selfeedback */
-	/* phase generator state */
-	UINT32 block_fnum;	/* block+fnum : */
-	UINT8 kcode;		/* key code : KeyScaleCode */
-	UINT32 fc;			/* Freq. Increment base */
-	UINT32 ksl_base;	/* KeyScaleLevel Base step */
-	UINT8 keyon;		/* key on/off flag */
-} OPL_CH;
-
-/* OPL state */
-typedef struct fm_opl_f {
-	UINT8 type;			/* chip type */
-	int clock;			/* master clock (Hz) */
-	int rate;			/* sampling rate (Hz) */
-	double freqbase;	/* frequency base */
-	double TimerBase;	/* Timer base time (==sampling time) */
-	UINT8 address;		/* address register */
-	UINT8 status;		/* status flag */
-	UINT8 statusmask;	/* status mask */
-	UINT32 mode;		/* Reg.08 : CSM , notesel,etc. */
-	/* Timer */
-	int T2;			/* timer counter */
-	UINT8 st2;		/* timer enable */
-	/* FM channel slots */
-	OPL_CH *P_CH;		/* pointer of CH */
-	int	max_ch;			/* maximum channel */
-	/* Rythm sention */
-	UINT8 rythm;		/* Rythm mode , key flag */
-#if BUILD_Y8950
-	/* Delta-T ADPCM unit (Y8950) */
-	YM_DELTAT *deltat;			/* DELTA-T ADPCM */
-#endif
-	/* Keyboard / I/O interface unit (Y8950) */
-	UINT8 portDirection;
-	UINT8 portLatch;
-	OPL_PORTHANDLER_R porthandler_r;
-	OPL_PORTHANDLER_W porthandler_w;
-	int port_param;
-	OPL_PORTHANDLER_R keyboardhandler_r;
-	OPL_PORTHANDLER_W keyboardhandler_w;
-	int keyboard_param;
-	/* time tables */
-	INT32 AR_TABLE75;	/* atttack rate tables */
-	INT32 DR_TABLE75;	/* decay rate tables */
-	UINT32 FN_TABLE1024; /* fnumber -> increment counter */
-	/* LFO */
-	INT32 *ams_table;
-	INT32 *vib_table;
-	INT32 amsCnt;
-	INT32 amsIncr;
-	INT32 vibCnt;
-	INT32 vibIncr;
-	/* wave selector enable flag */
-	UINT8 wavesel;
-	/* external event callback handler */
-	OPL_TIMERHANDLER TimerHandler;		/* TIMER handler */
-	int TimerParam;						/* TIMER parameter */
-	OPL_IRQHANDLER IRQHandler;		/* IRQ handler */
-	int IRQParam;						/* IRQ parameter */
-	OPL_UPDATEHANDLER UpdateHandler;	/* stream update handler */
-	int UpdateParam;					/* stream update parameter */
-} FM_OPL;
-
-/* ---------- Generic interface section ---------- */
-#define OPL_TYPE_YM3526 (0)
-#define OPL_TYPE_YM3812 (OPL_TYPE_WAVESEL)
-#define OPL_TYPE_Y8950 (OPL_TYPE_ADPCM|OPL_TYPE_KEYBOARD|OPL_TYPE_IO)
-
-FM_OPL *OPLCreate(int type, int clock, int rate);
-void OPLDestroy(FM_OPL *OPL);
-void OPLSetTimerHandler(FM_OPL *OPL,OPL_TIMERHANDLER TimerHandler,int channelOffset);
-void OPLSetIRQHandler(FM_OPL *OPL,OPL_IRQHANDLER IRQHandler,int param);
-void OPLSetUpdateHandler(FM_OPL *OPL,OPL_UPDATEHANDLER UpdateHandler,int param);
-/* Y8950 port handlers */
-void OPLSetPortHandler(FM_OPL *OPL,OPL_PORTHANDLER_W PortHandler_w,OPL_PORTHANDLER_R PortHandler_r,int param);
-void OPLSetKeyboardHandler(FM_OPL *OPL,OPL_PORTHANDLER_W KeyboardHandler_w,OPL_PORTHANDLER_R KeyboardHandler_r,int param);
-
-void OPLResetChip(FM_OPL *OPL);
-int OPLWrite(FM_OPL *OPL,int a,int v);
-unsigned char OPLRead(FM_OPL *OPL,int a);
-int OPLTimerOver(FM_OPL *OPL,int c);
-
-/* YM3626/YM3812 local section */
-void YM3812UpdateOne(FM_OPL *OPL, INT16 *buffer, int length);
-
-void Y8950UpdateOne(FM_OPL *OPL, INT16 *buffer, int length);
-
-#endif

audacious-plugins-3.6.2-gtk3.tar.bz2/src/adplug/core/fprovide.cc Deleted

@@ -1,73 +0,0 @@
-/*
- * Adplug - Replayer for many OPL2/OPL3 audio file formats.
- * Copyright (C) 1999 - 2002 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
- *
- * fprovide.cpp - File provider class framework, by Simon Peter <dn.tlp@gmx.net>
- */
-
-#include <string.h>
-#include <binio.h>
-#include <binfile.h>
-
-#include "fprovide.h"
-
-#include <libaudcore/audstrings.h>
-
-/***** CFileProvider *****/
-
-bool CFileProvider::extension(const std::string &filename,
-			 const std::string &extension)
-{
- return str_has_suffix_nocase(filename.c_str(), extension.c_str());
-}
-
-unsigned long CFileProvider::filesize(binistream *f)
-{
- unsigned long oldpos = f->pos(), size;
-
- f->seek(0, binio::End);
- size = f->pos();
- f->seek(oldpos, binio::Set);
-
- return size;
-}
-
-/***** CProvider_Filesystem *****/
-
-binistream *CProvider_Filesystem::open(VFSFile &fd) const
-{
- if(!fd) return 0;
-
- vfsistream *f = new vfsistream(&fd);
-
- if(!f) return 0;
- if(f->error()) { delete f; return 0; }
-
- // Open all files as little endian with IEEE floats by default
- f->setFlag(binio::BigEndian, false); f->setFlag(binio::FloatIEEE);
-
- return f;
-}
-
-void CProvider_Filesystem::close(binistream *f) const
-{
- vfsistream *ff = (vfsistream *)f;
-
- if(f) {
- delete ff;
- }
-}

audacious-plugins-3.6.2-gtk3.tar.bz2/src/adplug/core/fprovide.h Deleted

@@ -1,50 +0,0 @@
-/*
- * Adplug - Replayer for many OPL2/OPL3 audio file formats.
- * Copyright (C) 1999 - 2006 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
- *
- * fprovide.h - File provider class framework, by Simon Peter <dn.tlp@gmx.net>
- */
-
-#ifndef H_ADPLUG_FILEPROVIDER
-#define H_ADPLUG_FILEPROVIDER
-
-#include <string>
-#include "binio_virtual.h"
-
-class CFileProvider
-{
-public:
- virtual ~CFileProvider()
- {
- }
-
- virtual binistream *open(VFSFile &) const = 0;
- virtual void close(binistream *) const = 0;
-
- static bool extension(const std::string &filename,
-			const std::string &extension);
- static unsigned long filesize(binistream *f);
-};
-
-class CProvider_Filesystem: public CFileProvider
-{
-public:
- virtual binistream *open(VFSFile &) const;
- virtual void close(binistream *f) const;
-};
-
-#endif

audacious-plugins-3.6.2-gtk3.tar.bz2/src/adplug/core/hsc.cc Deleted

@@ -1,389 +0,0 @@
-/*
- * Adplug - Replayer for many OPL2/OPL3 audio file formats.
- * Copyright (C) 1999 - 2004 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
- *
- * hsc.cpp - HSC Player by Simon Peter <dn.tlp@gmx.net>
- */
-
-#include <string.h>
-
-#include "hsc.h"
-#include "debug.h"
-
-/*** public methods **************************************/
-
-CPlayer *
-ChscPlayer::factory (Copl * newopl)
-{
- return new ChscPlayer (newopl);
-}
-
-bool
-ChscPlayer::load (VFSFile & fd, const CFileProvider & fp)
-{
- binistream *f = fp.open (fd);
- int i;
-
- // file validation section
- if (!f || !fp.extension (fd.filename (), ".hsc") || fp.filesize (f) > 59187)
- {
- AdPlug_LogWrite ("ChscPlayer::load(\"%s\"): Not a HSC file!\n",
- fd.filename ());
- fp.close (f);
- return false;
- }
-
- // load section
- for (i = 0; i < 128 * 12; i++) // load instruments
- *((unsigned char *) instr + i) = f->readInt (1);
- for (i = 0; i < 128; i++)
- { // correct instruments
- instri2 ^= (instri2 & 0x40) << 1;
- instri3 ^= (instri3 & 0x40) << 1;
- instri11 >>= 4; // slide
- }
- for (i = 0; i < 51; i++)
- songi = f->readInt (1); // load tracklist
- for (i = 0; i < 50 * 64 * 9; i++) // load patterns
- *((char *) patterns + i) = f->readInt (1);
-
- fp.close (f);
- rewind (0); // rewind module
- return true;
-}
-
-bool
-ChscPlayer::update ()
-{
- // general vars
- unsigned char chan, pattnr, note, effect, eff_op, inst, vol, Okt, db;
- unsigned short Fnr;
- unsigned long pattoff;
-
- del--; // player speed handling
- if (del)
- return !songend; // nothing done
-
- if (fadein) // fade-in handling
- fadein--;
-
- pattnr = songsongpos;
- if (pattnr == 0xff)
- { // arrangement handling
- songend = 1; // set end-flag
- songpos = 0;
- pattnr = songsongpos;
- }
- else if ((pattnr & 128) && (pattnr <= 0xb1))
- { // goto pattern "nr"
- songpos = songsongpos & 127;
- pattpos = 0;
- pattnr = songsongpos;
- songend = 1;
- }
-
- if (pattnr >= 50 || pattpos >= 64)
- {
- fprintf (stderr, "hsc: Invalid pattnr (%d) or pattpos (%d)!\n", (int) pattnr, (int) pattpos);
- return false;
- }
-
- pattoff = pattpos * 9;
- for (chan = 0; chan < 9; chan++)
- { // handle all channels
- note = patternspattnrpattoff.note;
- effect = patternspattnrpattoff.effect;
- pattoff++;
-
- if (note & 128)
- { // set instrument
- setinstr (chan, effect);
- continue;
- }
- eff_op = effect & 0x0f;
- inst = channelchan.inst;
- if (note)
- channelchan.slide = 0;
-
- switch (effect & 0xf0)
- { // effect handling
- case 0: // global effect
- /* The following fx are unimplemented on purpose:
- * 02 - Slide Mainvolume up
- * 03 - Slide Mainvolume down (here: fade in)
- * 04 - Set Mainvolume to 0
- *
- * This is because i've never seen any HSC modules using the fx this way.
- * All modules use the fx the way, i've implemented it.
- */
- switch (eff_op)
- {
- case 1:
- pattbreak++;
- break; // jump to next pattern
- case 3:
- fadein = 31;
- break; // fade in (divided by 2)
- case 5:
- mode6 = 1;
- break; // 6 voice mode on
- case 6:
- mode6 = 0;
- break; // 6 voice mode off
- }
- break;
- case 0x20:
- case 0x10: // manual slides
- if (effect & 0x10)
- {
- channelchan.freq += eff_op;
- channelchan.slide += eff_op;
- }
- else
- {
- channelchan.freq -= eff_op;
- channelchan.slide -= eff_op;
- }
- if (!note)
- setfreq (chan, channelchan.freq);
- break;
- case 0x50: // set percussion instrument (unimplemented)
- break;
- case 0x60: // set feedback
- opl->write (0xc0 + chan,
- (instrchannelchan.inst8 & 1) + (eff_op << 1));
- break;
- case 0xa0: // set carrier volume
- vol = eff_op << 2;
- opl->write (0x43 + op_tablechan,
- vol | (instrchannelchan.inst2 & ~63));
- break;
- case 0xb0: // set modulator volume
- vol = eff_op << 2;
- if (instrinst8 & 1)
- opl->write (0x40 + op_tablechan,
- vol | (instrchannelchan.inst3 & ~63));
- else
- opl->write (0x40 + op_tablechan, vol | (instrinst3 & ~63));
- break;
- case 0xc0: // set instrument volume
- db = eff_op << 2;
- opl->write (0x43 + op_tablechan,
- db | (instrchannelchan.inst2 & ~63));
- if (instrinst8 & 1)
- opl->write (0x40 + op_tablechan,
- db | (instrchannelchan.inst3 & ~63));
- break;
- case 0xd0:
- pattbreak++;
- songpos = eff_op;
- songend = 1;
- break; // position jump
- case 0xf0: // set speed
- speed = eff_op;
- del = ++speed;
- break;
- }
-
- if (fadein) // fade-in volume setting
- setvolume (chan, fadein * 2, fadein * 2);
-
- if (!note) // note handling
- continue;
- note--;
-
- if ((note == 0x7f - 1) || ((note / 12) & ~7))
- { // pause (7fh)
- adl_freqchan &= ~32;
- opl->write (0xb0 + chan, adl_freqchan);
- continue;
- }
-
- // play the note
- if (mtkmode) // imitate MPU-401 Trakker bug
- note--;
- Okt = ((note / 12) & 7) << 2;
- Fnr = note_table(note % 12) + instrinst11 + channelchan.slide;
- channelchan.freq = Fnr;
- if (!mode6 || chan < 6)
- adl_freqchan = Okt | 32;
- else
- adl_freqchan = Okt; // never set key for drums
- opl->write (0xb0 + chan, 0);
- setfreq (chan, Fnr);
- if (mode6)
- {
- switch (chan)
- { // play drums
- case 6:
- opl->write (0xbd, bd & ~16);
- bd |= 48;
- break; // bass drum
- case 7:
- opl->write (0xbd, bd & ~1);
- bd |= 33;
- break; // hihat
- case 8:
- opl->write (0xbd, bd & ~2);
- bd |= 34;
- break; // cymbal
- }
- opl->write (0xbd, bd);
- }
- }
-
- del = speed; // player speed-timing
- if (pattbreak)
- { // do post-effect handling
- pattpos = 0; // pattern break!
- pattbreak = 0;
- songpos++;
- songpos %= 50;
- if (!songpos)
- songend = 1;
- }
- else
- {
- pattpos++;
- pattpos &= 63; // advance in pattern data
- if (!pattpos)
- {
- songpos++;
- songpos %= 50;
- if (!songpos)
- songend = 1;
- }
- }
- return !songend; // still playing
-}
-
-void
-ChscPlayer::rewind (int subsong)
-{
- int i; // counter
-
- // rewind HSC player
- pattpos = 0;
- songpos = 0;
- pattbreak = 0;
- speed = 2;
- del = 1;
- songend = 0;
- mode6 = 0;
- bd = 0;
- fadein = 0;
-
- opl->init (); // reset OPL chip
- opl->write (1, 32);
- opl->write (8, 128);
- opl->write (0xbd, 0);
-
- for (i = 0; i < 9; i++)
- setinstr ((char) i, (char) i); // init channels
-}
-
-unsigned int
-ChscPlayer::getpatterns ()
-{
- unsigned char poscnt, pattcnt = 0;
-
- // count patterns
- for (poscnt = 0; poscnt < 51 && songposcnt != 0xff; poscnt++)
- if (songposcnt > pattcnt)
- pattcnt = songposcnt;
-
- return (pattcnt + 1);
-}
-
-unsigned int
-ChscPlayer::getorders ()
-{
- unsigned char poscnt;
-
- // count positions
- for (poscnt = 0; poscnt < 51; poscnt++)
- if (songposcnt == 0xff)
- break;
-
- return poscnt;
-}
-
-unsigned int
-ChscPlayer::getinstruments ()
-{
- unsigned char instcnt, instnum = 0, i;
- bool isinst;
-
- // count instruments
- for (instcnt = 0; instcnt < 128; instcnt++)
- {
- isinst = false;
- for (i = 0; i < 12; i++)
- if (instrinstcnti)
- isinst = true;
- if (isinst)
- instnum++;
- }
-
- return instnum;
-}
-
-/*** private methods *************************************/
-
-void
-ChscPlayer::setfreq (unsigned char chan, unsigned short freq)
-{
- adl_freqchan = (adl_freqchan & ~3) | (freq >> 8);
-
- opl->write (0xa0 + chan, freq & 0xff);
- opl->write (0xb0 + chan, adl_freqchan);
-}
-
-void
-ChscPlayer::setvolume (unsigned char chan, int volc, int volm)
-{
- unsigned char *ins = instrchannelchan.inst;
- char op = op_tablechan;
-
- opl->write (0x43 + op, volc | (ins2 & ~63));
- if (ins8 & 1) // carrier
- opl->write (0x40 + op, volm | (ins3 & ~63));
- else
- opl->write (0x40 + op, ins3); // modulator
-}
-
-void
-ChscPlayer::setinstr (unsigned char chan, unsigned char insnr)
-{
- unsigned char *ins = instrinsnr;
- char op = op_tablechan;
-
- channelchan.inst = insnr; // set internal instrument
- opl->write (0xb0 + chan, 0); // stop old note
-
- // set instrument
- opl->write (0xc0 + chan, ins8);
- opl->write (0x23 + op, ins0); // carrier
- opl->write (0x20 + op, ins1); // modulator
- opl->write (0x63 + op, ins4); // bits 0..3 = decay; 4..7 = attack
- opl->write (0x60 + op, ins5);
- opl->write (0x83 + op, ins6); // 0..3 = release; 4..7 = sustain
- opl->write (0x80 + op, ins7);
- opl->write (0xe3 + op, ins9); // bits 0..1 = Wellenform
- opl->write (0xe0 + op, ins10);
- setvolume (chan, ins2 & 63, ins3 & 63);
-}

audacious-plugins-3.6.2-gtk3.tar.bz2/src/adplug/core/hsc.h Deleted

@@ -1,75 +0,0 @@
-/*
- * Adplug - Replayer for many OPL2/OPL3 audio file formats.
- * Copyright (C) 1999 - 2002 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
- *
- * hsc.h - HSC Player by Simon Peter <dn.tlp@gmx.net>
- */
-
-#ifndef H_ADPLUG_HSCPLAYER
-#define H_ADPLUG_HSCPLAYER
-
-#include "player.h"
-
-class ChscPlayer: public CPlayer
-{
- public:
- static CPlayer *factory(Copl *newopl);
-
- ChscPlayer(Copl *newopl): CPlayer(newopl), mtkmode(0) {}
-
- bool load(VFSFile &fd, const CFileProvider &fp);
- bool update();
- void rewind(int subsong);
- float getrefresh() { return 18.2f; };	// refresh rate is fixed at 18.2Hz
-
- std::string gettype() { return std::string("HSC Adlib Composer / HSC-Tracker"); }
- unsigned int getpatterns();
- unsigned int getpattern() { return songsongpos; }
- unsigned int getorders();
- unsigned int getorder() { return songpos; }
- unsigned int getrow() { return pattpos; }
- unsigned int getspeed() { return speed; }
- unsigned int getinstruments();
-
- protected:
- struct hscnote {
- unsigned char note, effect;
- };			// note type in HSC pattern
-
- struct hscchan {
- unsigned char inst;			// current instrument
- signed char slide;			// used for manual slide-effects
- unsigned short freq;		// actual replaying frequency
- };			// HSC channel data
-
- hscchan channel9;				// player channel-info
- unsigned char instr12812;	// instrument data
- unsigned char song0x80;		// song-arrangement (MPU-401 Trakker enhanced)
- hscnote patterns5064*9;		// pattern data
- unsigned char pattpos,songpos,	// various bytes & flags
- pattbreak,songend,mode6,bd,fadein;
- unsigned int speed,del;
- unsigned char adl_freq9;		// adlib frequency registers
- int mtkmode;				// flag: MPU-401 Trakker mode on/off
-
- private:
- void setfreq(unsigned char chan, unsigned short freq);
- void setvolume(unsigned char chan, int volc, int volm);
- void setinstr(unsigned char chan, unsigned char insnr);
-};
-
-#endif

audacious-plugins-3.6.2-gtk3.tar.bz2/src/adplug/core/hsp.cc Deleted

@@ -1,86 +0,0 @@
-/*
- * Adplug - Replayer for many OPL2/OPL3 audio file formats.
- * Copyright (C) 1999 - 2004 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
- *
- * hsp.cpp - HSP Loader by Simon Peter <dn.tlp@gmx.net>
- */
-
-#include <string.h>
-
-#include "hsp.h"
-
-CPlayer *
-ChspLoader::factory (Copl * newopl)
-{
- return new ChspLoader (newopl);
-}
-
-bool
-ChspLoader::load (VFSFile & fd, const CFileProvider & fp)
-{
- binistream *f = fp.open (fd);
- if (!f)
- return false;
- unsigned long i, j, orgsize, filesize;
- unsigned char *cmp, *org;
- std::string filename (fd.filename ());
-
- // file validation section
- if (!fp.extension (filename, ".hsp"))
- {
- fp.close (f);
- return false;
- }
-
- filesize = fp.filesize (f);
- orgsize = f->readInt (2);
- if (orgsize > 59187)
- {
- fp.close (f);
- return false;
- }
-
- // load section
- cmp = new unsigned charfilesize;
- for (i = 0; i < filesize; i++)
- cmpi = f->readInt (1);
- fp.close (f);
-
- org = new unsigned charorgsize;
- for (i = 0, j = 0; i < filesize; j += cmpi, i += 2)
- { // RLE decompress
- if (j >= orgsize)
- break; // memory boundary check
- memset (org + j, cmpi + 1,
- j + cmpi < orgsize ? cmpi : orgsize - j - 1);
- }
- deletecmp;
-
- memcpy (instr, org, 128 * 12); // instruments
- for (i = 0; i < 128; i++)
- { // correct instruments
- instri2 ^= (instri2 & 0x40) << 1;
- instri3 ^= (instri3 & 0x40) << 1;
- instri11 >>= 4; // slide
- }
- memcpy (song, org + 128 * 12, 51); // tracklist
- memcpy (patterns, org + 128 * 12 + 51, orgsize - 128 * 12 - 51); // patterns
- deleteorg;
-
- rewind (0);
- return true;
-}

audacious-plugins-3.6.2-gtk3.tar.bz2/src/adplug/core/hsp.h Deleted

@@ -1,39 +0,0 @@
-/*
- * Adplug - Replayer for many OPL2/OPL3 audio file formats.
- * Copyright (C) 1999 - 2004 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
- *
- * hsp.h: HSC Packed Loader by Simon Peter <dn.tlp@gmx.net>
- */
-
-#ifndef H_ADPLUG_HSPLOADER
-#define H_ADPLUG_HSPLOADER
-
-#include "hsc.h"
-
-class ChspLoader: public ChscPlayer
-{
-public:
- static CPlayer *factory(Copl *newopl);
-
-	ChspLoader(Copl *newopl)
-		: ChscPlayer(newopl)
-	{};
-
-	bool load(VFSFile &fd, const CFileProvider &fp);
-};
-
-#endif

audacious-plugins-3.6.2-gtk3.tar.bz2/src/adplug/core/hybrid.cc Deleted

@@ -1,268 +0,0 @@
-/*
- * Adplug - Replayer for many OPL2/OPL3 audio file formats.
- * Copyright (C) 1999 - 2003 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
- *
- * xad HYBRID player, by Riven the Mage <riven@ok.ru>
- */
-
-/*
- - discovery -
-
- file(s) : HYBRID.EXE
- type : Hybrid cracktro for Apache Longbow CD-RIP
- tune : from 'Mig-29 Super Fulcrum' game by Domark
- player : from 'Mig-29 Super Fulcrum' game by Domark
-*/
-
-#include "hybrid.h"
-#include "debug.h"
-
-const unsigned char
- CxadhybridPlayer::hyb_adlib_registers99 = {
- 0xE0, 0x60, 0x80, 0x20, 0x40, 0xE3, 0x63, 0x83, 0x23, 0x43, 0xC0,
- 0xE1, 0x61, 0x81, 0x21, 0x41, 0xE4, 0x64, 0x84, 0x24, 0x44, 0xC1,
- 0xE2, 0x62, 0x82, 0x22, 0x42, 0xE5, 0x65, 0x85, 0x25, 0x45, 0xC2,
- 0xE8, 0x68, 0x88, 0x28, 0x48, 0xEB, 0x6B, 0x8B, 0x2B, 0x4B, 0xC3,
- 0xE9, 0x69, 0x89, 0x29, 0x49, 0xEC, 0x6C, 0x8C, 0x2C, 0x4C, 0xC4,
- 0xEA, 0x6A, 0x8A, 0x2A, 0x4A, 0xED, 0x6D, 0x8D, 0x2D, 0x4D, 0xC5,
- 0xF0, 0x70, 0x90, 0x30, 0x50, 0xF3, 0x73, 0x93, 0x33, 0x53, 0xC6,
- 0xF1, 0x71, 0x91, 0x31, 0x51, 0xF4, 0x74, 0x94, 0x34, 0x54, 0xC7,
- 0xF2, 0x72, 0x92, 0x32, 0x52, 0xF5, 0x75, 0x95, 0x35, 0x55, 0xC8
-};
-
-const unsigned short
- CxadhybridPlayer::hyb_notes98 = {
- 0x0000, 0x0000,
- 0x016B, 0x0181, 0x0198, 0x01B0, 0x01CA, 0x01E5, 0x0202, 0x0220, 0x0241,
- 0x0263, 0x0287, 0x02AE,
- 0x056B, 0x0581, 0x0598, 0x05B0, 0x05CA, 0x05E5, 0x0602, 0x0620, 0x0641,
- 0x0663, 0x0687, 0x06AE,
- 0x096B, 0x0981, 0x0998, 0x09B0, 0x09CA, 0x09E5, 0x0A02, 0x0A20, 0x0A41,
- 0x0A63, 0x0A87, 0x0AAE,
- 0x0D6B, 0x0D81, 0x0D98, 0x0DB0, 0x0DCA, 0x0DE5, 0x0E02, 0x0E20, 0x0E41,
- 0x0E63, 0x0E87, 0x0EAE,
- 0x116B, 0x1181, 0x1198, 0x11B0, 0x11CA, 0x11E5, 0x1202, 0x1220, 0x1241,
- 0x1263, 0x1287, 0x12AE,
- 0x156B, 0x1581, 0x1598, 0x15B0, 0x15CA, 0x15E5, 0x1602, 0x1620, 0x1641,
- 0x1663, 0x1687, 0x16AE,
- 0x196B, 0x1981, 0x1998, 0x19B0, 0x19CA, 0x19E5, 0x1A02, 0x1A20, 0x1A41,
- 0x1A63, 0x1A87, 0x1AAE,
- 0x1D6B, 0x1D81, 0x1D98, 0x1DB0, 0x1DCA, 0x1DE5, 0x1E02, 0x1E20, 0x1E41,
- 0x1E63, 0x1E87, 0x1EAE
-};
-
-const unsigned char
- CxadhybridPlayer::hyb_default_instrument11 = {
- 0x00, 0xFF, 0xFF, 0x00, 0xFF, 0x00, 0xFF, 0xFF, 0x00, 0xFF, 0x00
-};
-
-CPlayer *
-CxadhybridPlayer::factory (Copl * newopl)
-{
- return new CxadhybridPlayer (newopl);
-}
-
-bool
-CxadhybridPlayer::xadplayer_load ()
-{
- if (xad.fmt != HYBRID)
- return false;
-
- // load instruments
- hyb.inst = (hyb_instrument *) & tune0;
-
- // load order
- hyb.order = &tune0x1D4;
-
- return true;
-}
-
-void
-CxadhybridPlayer::xadplayer_rewind (int subsong)
-{
- int i;
-
- hyb.order_pos = 0;
- hyb.pattern_pos = 0;
-
- hyb.speed = 6;
- hyb.speed_counter = 1;
-
- plr.speed = 1;
-
- // init channel data
- for (i = 0; i < 9; i++)
- {
- hyb.channeli.freq = 0x2000;
- hyb.channeli.freq_slide = 0x0000;
- }
-
- // basic OPL init
- opl_write (0x01, 0x20);
- opl_write (0xBD, 0x40);
- opl_write (0x08, 0x00);
-
- // init OPL channels
- for (i = 0; i < 9; i++)
- {
- for (int j = 0; j < 11; j++)
- opl_write (hyb_adlib_registersi * 11 + j,
- 0x00 /* hyb_default_instrumentj */ );
-
- opl_write (0xA0 + i, 0x00);
- opl_write (0xB0 + i, 0x20);
- }
-}
-
-void
-CxadhybridPlayer::xadplayer_update ()
-{
- int i, j;
- unsigned char patpos, ordpos;
-
- if (--hyb.speed_counter)
- goto update_slides;
-
- hyb.speed_counter = hyb.speed;
-
- patpos = hyb.pattern_pos;
- ordpos = hyb.order_pos;
-
- // process channels
- for (i = 0; i < 9; i++)
- {
- unsigned char *pos =
- &tune0xADE + (hyb.orderhyb.order_pos * 9 + i * 64 * 2) +
- (patpos * 2);
- // read event
- unsigned short event = (pos1 << 8) + pos0;
-
-#ifdef DEBUG
- AdPlug_LogWrite ("track %02X, channel %02X, event %04X:\n",
- hyb.orderhyb.order_pos * 9 + i, i, event);
-#endif
-
- // calculate variables
- unsigned char note = event >> 9;
- unsigned char ins = ((event & 0x01F0) >> 4);
- unsigned char slide = event & 0x000F;
-
- // play event
- switch (note)
- {
- case 0x7D: // 0x7D: Set Speed
- hyb.speed = event & 0xFF;
- break;
- case 0x7E: // 0x7E: Jump Position
- hyb.order_pos = event & 0xFF;
- hyb.pattern_pos = 0x3F;
-
- // jumpback ?
- if (hyb.order_pos <= ordpos)
- plr.looping = 1;
-
- break;
- case 0x7F: // 0x7F: Pattern Break
- hyb.pattern_pos = 0x3F;
- break;
- default:
-
- // is instrument ?
- if (ins)
- for (j = 0; j < 11; j++)
- opl_write (hyb_adlib_registersi * 11 + j, *((unsigned char *) &hyb.instins - 1 + 7 + j)); // +7 = skip name...
-
- // is note ?
- if (note)
- {
- hyb.channeli.freq = hyb_notesnote;
- hyb.channeli.freq_slide = 0;
- }
-
- // is slide ?
- if (slide)
- {
- hyb.channeli.freq_slide = (((slide >> 3) * -1) * (slide & 7)) << 1;
-
- if (slide & 0x80)
- slide = -(slide & 7);
- }
-
- // set frequency
- if (!(hyb.channeli.freq & 0x2000))
- {
- opl_write (0xA0 + i, hyb.channeli.freq & 0xFF);
- opl_write (0xB0 + i, hyb.channeli.freq >> 8);
-
- hyb.channeli.freq |= 0x2000;
-
- opl_write (0xA0 + i, hyb.channeli.freq & 0xFF);
- opl_write (0xB0 + i, hyb.channeli.freq >> 8);
- }
-
- break;
- }
- }
-
- hyb.pattern_pos++;
-
- // end of pattern ?
- if (hyb.pattern_pos >= 0x40)
- {
- hyb.pattern_pos = 0;
-
- hyb.order_pos++;
- }
-
-update_slides:
-#ifdef DEBUG
- AdPlug_LogWrite ("slides:\n");
-#endif
- // update fine frequency slides
- for (i = 0; i < 9; i++)
- if (hyb.channeli.freq_slide)
- {
- hyb.channeli.freq =
- (((hyb.channeli.freq & 0x1FFF) +
- hyb.channeli.freq_slide) & 0x1FFF) | 0x2000;
-
- opl_write (0xA0 + i, hyb.channeli.freq & 0xFF);
- opl_write (0xB0 + i, hyb.channeli.freq >> 8);
- }
-}
-
-float
-CxadhybridPlayer::xadplayer_getrefresh ()
-{
- return 50.0f;
-}
-
-std::string CxadhybridPlayer::xadplayer_gettype ()
-{
- return (std::string ("xad: hybrid player"));
-}
-
-std::string CxadhybridPlayer::xadplayer_getinstrument (unsigned int i)
-{
- return (std::string (hyb.insti.name, 7));
-}
-
-unsigned int
-CxadhybridPlayer::xadplayer_getinstruments ()
-{
- return 26;
-}

audacious-plugins-3.6.2-gtk3.tar.bz2/src/adplug/core/hybrid.h Deleted

@@ -1,80 +0,0 @@
-/*
- * Adplug - Replayer for many OPL2/OPL3 audio file formats.
- * Copyright (C) 1999 - 2003 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
- *
- * xad HYBRID player, by Riven the Mage <riven@ok.ru>
- */
-
-#include "xad.h"
-
-class CxadhybridPlayer: public CxadPlayer
-{
-public:
- static CPlayer *factory(Copl *newopl);
-
- CxadhybridPlayer(Copl *newopl): CxadPlayer(newopl)
- { }
-
-protected:
- struct hyb_instrument
- {
- char name7;
- unsigned char mod_wave;
- unsigned char mod_AD;
- unsigned char mod_SR;
- unsigned char mod_crtl;
- unsigned char mod_volume;
- unsigned char car_wave;
- unsigned char car_AD;
- unsigned char car_SR;
- unsigned char car_crtl;
- unsigned char car_volume;
- unsigned char connect;
- };
-
- struct
- {
- unsigned char order_pos;
- unsigned char pattern_pos;
-
- unsigned char *order;
-
- hyb_instrument *inst;
-
- struct
- {
- unsigned short freq;
- unsigned short freq_slide;
- } channel9;
-
- unsigned char speed;
- unsigned char speed_counter;
- } hyb;
- //
- bool xadplayer_load();
- void xadplayer_rewind(int subsong);
- void xadplayer_update();
- float xadplayer_getrefresh();
- std::string xadplayer_gettype();
- std::string xadplayer_getinstrument(unsigned int i);
- unsigned int xadplayer_getinstruments();
-
-private:
- static const unsigned char hyb_adlib_registers99;
- static const unsigned short hyb_notes98;
- static const unsigned char hyb_default_instrument11;
-};

audacious-plugins-3.6.2-gtk3.tar.bz2/src/adplug/core/hyp.cc Deleted

@@ -1,129 +0,0 @@
-/*
- * Adplug - Replayer for many OPL2/OPL3 audio file formats.
- * Copyright (C) 1999 - 2003 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
- *
- * xad HYP player, by Riven the Mage <riven@ok.ru>
- */
-
-/*
- - discovery -
-
- file(s) : HT-EF2.COM, HT-EF3.COM
- type : Eiserne Front BBStro
- tune : by Shadowdancer Hypnosis
- player : by (?)Hetero LKCC/SAC
-*/
-
-#include "hyp.h"
-#include "debug.h"
-
-const unsigned char
- CxadhypPlayer::hyp_adlib_registers99 = {
- 0x20, 0x23, 0x40, 0x43, 0x60, 0x63, 0x80, 0x83, 0xA0, 0xB0, 0xC0,
- 0x21, 0x24, 0x41, 0x44, 0x61, 0x64, 0x81, 0x84, 0xA1, 0xB1, 0xC1,
- 0x22, 0x25, 0x42, 0x45, 0x62, 0x65, 0x82, 0x85, 0xA2, 0xB2, 0xC2,
- 0x28, 0x2B, 0x48, 0x4B, 0x68, 0x6B, 0x88, 0x8B, 0xA3, 0xB3, 0xC3,
- 0x29, 0x2C, 0x49, 0x4C, 0x69, 0x6C, 0x89, 0x8C, 0xA4, 0xB4, 0xC4,
- 0x2A, 0x2D, 0x4A, 0x4D, 0x6A, 0x6D, 0x8A, 0x8D, 0xA5, 0xB5, 0xC5,
- 0x30, 0x33, 0x50, 0x53, 0x70, 0x73, 0x90, 0x93, 0xA6, 0xB6, 0xC6,
- 0x31, 0x34, 0x51, 0x54, 0x71, 0x74, 0x91, 0x94, 0xA7, 0xB7, 0xC7,
- 0x32, 0x35, 0x52, 0x55, 0x72, 0x75, 0x92, 0x95, 0xA8, 0xB8, 0xC8
-};
-
-const unsigned short
- CxadhypPlayer::hyp_notes73 = {
- 0x0000, // by riven
- 0x0956, 0x096B, 0x0980, 0x0998, 0x09B1, 0x09C9, 0x09E5, 0x0A03, 0x0A21,
- 0x0A41, 0x0A63, 0x0A86, 0x0D56, 0x0D6B, 0x0D80, 0x0D98, 0x0DB1, 0x0DC9,
- 0x0DE5, 0x0E03, 0x0E21, 0x0E41, 0x0E63, 0x0E86, 0x1156, 0x116B, 0x1180,
- 0x1198, 0x11B1, 0x11C9, 0x11E5, 0x1203, 0x1221, 0x1241, 0x1263, 0x1286,
- 0x1556, 0x156B, 0x1580, 0x1598, 0x15B1, 0x15C9, 0x15E5, 0x1603, 0x1621,
- 0x1641, 0x1663, 0x1686, 0x1956, 0x196B, 0x1980, 0x1998, 0x19B1, 0x19C9,
- 0x19E5, 0x1A03, 0x1A21, 0x1A41, 0x1A63, 0x1A86, 0x1D56, 0x1D6B, 0x1D80,
- 0x1D98, 0x1DB1, 0x1DC9, 0x1DE5, 0x1E03, 0x1E21, 0x1E41, 0x1E63, 0x1E86
-};
-
-CPlayer *
-CxadhypPlayer::factory (Copl * newopl)
-{
- return new CxadhypPlayer (newopl);
-}
-
-void
-CxadhypPlayer::xadplayer_rewind (int subsong)
-{
- int i;
-
- plr.speed = tune5;
-
- opl_write (0xBD, 0xC0);
-
- for (i = 0; i < 9; i++)
- adlib0xB0 + i = 0;
-
- // define instruments
- for (i = 0; i < 99; i++)
- opl_write (hyp_adlib_registersi, tune6 + i);
-
- hyp.pointer = 0x69;
-}
-
-void
-CxadhypPlayer::xadplayer_update ()
-{
- for (int i = 0; i < 9; i++)
- {
- unsigned char event = tunehyp.pointer++;
-
- if (event)
- {
- unsigned short freq = hyp_notesevent & 0x3F;
-
- unsigned char lofreq = (freq & 0xFF);
- unsigned char hifreq = (freq >> 8);
-
- opl_write (0xB0 + i, adlib0xB0 + i);
-
- if (!(event & 0x40))
- {
- opl_write (0xA0 + i, lofreq);
- opl_write (0xB0 + i, hifreq | 0x20);
- }
-
- adlib0xB0 + i &= 0xDF;
- }
- }
-
- hyp.pointer += 3;
-
- if (hyp.pointer >= tune_size)
- {
- hyp.pointer = 0x69;
- plr.looping = 1;
- }
-}
-
-float
-CxadhypPlayer::xadplayer_getrefresh ()
-{
- return 60.0f;
-}
-
-std::string CxadhypPlayer::xadplayer_gettype ()
-{
- return std::string ("xad: hypnosis player");
-}

audacious-plugins-3.6.2-gtk3.tar.bz2/src/adplug/core/hyp.h Deleted

@@ -1,53 +0,0 @@
-/*
- * Adplug - Replayer for many OPL2/OPL3 audio file formats.
- * Copyright (C) 1999 - 2003 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
- *
- * xad HYP player, by Riven the Mage <riven@ok.ru>
- */
-
-#include "xad.h"
-
-class CxadhypPlayer: public CxadPlayer
-{
-public:
- static CPlayer *factory(Copl *newopl);
-
- CxadhypPlayer(Copl *newopl): CxadPlayer(newopl)
- { }
-
-protected:
- struct
- {
- unsigned short pointer;
- } hyp;
- //
- bool		 xadplayer_load()
- {
- if(xad.fmt == HYP)
-	return true;
- else
-	return false;
- }
- void 		 xadplayer_rewind(int subsong);
- void 		 xadplayer_update();
- float 	 xadplayer_getrefresh();
- std::string	 xadplayer_gettype();
-
-private:
- static const unsigned char hyp_adlib_registers99;
- static const unsigned short hyp_notes73;
-};

audacious-plugins-3.6.2-gtk3.tar.bz2/src/adplug/core/imf.cc Deleted

@@ -1,229 +0,0 @@
-/*
- * Adplug - Replayer for many OPL2/OPL3 audio file formats.
- * Copyright (C) 1999 - 2006 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
- *
- * imf.cpp - IMF Player by Simon Peter <dn.tlp@gmx.net>
- *
- * FILE FORMAT:
- * There seem to be 2 different flavors of IMF formats out there. One version
- * contains just the raw IMF music data. In this case, the first word of the
- * file is always 0 (because the music data starts this way). This is already
- * the music data! So read in the entire file and play it.
- *
- * If this word is greater than 0, it specifies the size of the following
- * song data in bytes. In this case, the file has a footer that contains
- * arbitrary infos about it. Mostly, this is plain ASCII text with some words
- * of the author. Read and play the specified amount of song data and display
- * the remaining data as ASCII text.
- *
- * NOTES:
- * This player handles the two above mentioned formats, as well as a third
- * type, invented by Martin Fernandez <mfernan@cnba.uba.ar>, that's got a
- * proper header to add title/game name information. After the header starts
- * the normal IMF file in one of the two above mentioned formats.
- *
- * This player also handles a special footer format by Adam Nielsen,
- * which has defined fields of information about the song, the author
- * and more.
- */
-
-#include <string.h>
-
-#include "imf.h"
-#include "database.h"
-
-/*** public methods *************************************/
-
-CPlayer *
-CimfPlayer::factory (Copl * newopl)
-{
- return new CimfPlayer (newopl);
-}
-
-bool
-CimfPlayer::load (VFSFile & fd, const CFileProvider & fp)
-{
- binistream *f = fp.open (fd);
- if (!f)
- return false;
- unsigned long fsize, flsize, mfsize = 0;
- unsigned int i;
-
- // file validation section
- {
- char header5;
- int version;
-
- f->readString (header, 5);
- version = f->readInt (1);
-
- if (strncmp (header, "ADLIB", 5) || version != 1)
- {
- if (!fp.extension (fd.filename (), ".imf") && !fp.extension (fd.filename (), ".wlf"))
- {
- // It's no IMF file at all
- fp.close (f);
- return false;
- }
- else
- f->seek (0); // It's a normal IMF file
- }
- else
- {
- // It's a IMF file with header
- track_name = f->readString ('\0');
- game_name = f->readString ('\0');
- f->ignore (1);
- mfsize = f->pos () + 2;
- }
- }
-
- // load section
- if (mfsize)
- fsize = f->readInt (4);
- else
- fsize = f->readInt (2);
- flsize = fp.filesize (f);
- if (!fsize)
- { // footerless file (raw music data)
- if (mfsize)
- f->seek (-4, binio::Add);
- else
- f->seek (-2, binio::Add);
- size = (flsize - mfsize) / 4;
- }
- else // file has got a footer
- size = fsize / 4;
-
- data = new Sdatasize;
- for (i = 0; i < size; i++)
- {
- datai.reg = f->readInt (1);
- datai.val = f->readInt (1);
- datai.time = f->readInt (2);
- }
-
- // read footer, if any
- if (fsize && (fsize < flsize - 2 - mfsize))
- {
- if (f->readInt (1) == 0x1a)
- {
- // Adam Nielsen's footer format
- track_name = f->readString ();
- author_name = f->readString ();
- remarks = f->readString ();
- }
- else
- {
- // Generic footer
- unsigned long footerlen = flsize - fsize - 2 - mfsize;
-
- footer = new charfooterlen + 1;
- f->readString (footer, footerlen);
- footerfooterlen = '\0'; // Make ASCIIZ string
- }
- }
-
- rate = getrate (fd.filename (), fp, f);
- fp.close (f);
- rewind (0);
- return true;
-}
-
-bool
-CimfPlayer::update ()
-{
- do
- {
- opl->write (datapos.reg, datapos.val);
- del = datapos.time;
- pos++;
- } while (!del && pos < size);
-
- if (pos >= size)
- {
- pos = 0;
- songend = true;
- }
- else
- timer = rate / (float) del;
-
- return !songend;
-}
-
-void
-CimfPlayer::rewind (int subsong)
-{
- pos = 0;
- del = 0;
- timer = rate;
- songend = false;
- opl->init ();
- opl->write (1, 32); // go to OPL2 mode
-}
-
-std::string CimfPlayer::gettitle ()
-{
- std::string title;
-
- title = track_name;
-
- if (!track_name.empty () && !game_name.empty ())
- title += " - ";
-
- title += game_name;
-
- return title;
-}
-
-std::string CimfPlayer::getdesc ()
-{
- std::string desc;
-
- if (footer)
- desc = std::string (footer);
-
- if (!remarks.empty () && footer)
- desc += "\n\n";
-
- desc += remarks;
-
- return desc;
-}
-
-/*** private methods *************************************/
-
-float
-CimfPlayer::getrate (const std::string & filename, const CFileProvider & fp,
- binistream * f)
-{
- if (db)
- { // Database available
- f->seek (0, binio::Set);
- CClockRecord *record =
- (CClockRecord *) db->search (CAdPlugDatabase::CKey (*f));
- if (record && record->type == CAdPlugDatabase::CRecord::ClockSpeed)
- return record->clock;
- }
-
- // Otherwise the database is either unavailable, or there's no entry for this file
- if (fp.extension (filename, ".imf"))
- return 560.0f;
- if (fp.extension (filename, ".wlf"))
- return 700.0f;
- return 700.0f; // default speed for unknown files that aren't .IMF or .WLF
-}

audacious-plugins-3.6.2-gtk3.tar.bz2/src/adplug/core/imf.h Deleted

@@ -1,68 +0,0 @@
-/*
- * Adplug - Replayer for many OPL2/OPL3 audio file formats.
- * Copyright (C) 1999 - 2005 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
- *
- * imf.h - IMF Player by Simon Peter <dn.tlp@gmx.net>
- */
-
-#ifndef H_ADPLUG_IMFPLAYER
-#define H_ADPLUG_IMFPLAYER
-
-#include "player.h"
-
-class CimfPlayer: public CPlayer
-{
-public:
- static CPlayer *factory(Copl *newopl);
-
-	CimfPlayer(Copl *newopl)
-	 : CPlayer(newopl), footer(0), data(0)
-	 { }
-	~CimfPlayer()
-	 { if(data) delete data; if(footer) delete footer; };
-
-	bool load(VFSFile &fd, const CFileProvider &fp);
-	bool update();
-	void rewind(int subsong);
-	float getrefresh()
-	 { return timer; };
-
-	std::string gettype()
-	 { return std::string("IMF File Format"); }
-	std::string gettitle();
-	std::string getauthor()
-	 { return author_name; }
-	std::string getdesc();
-
-protected:
-	unsigned long	pos, size;
-	unsigned short	del;
-	bool		songend;
-	float		rate, timer;
-	char		*footer;
-	std::string	track_name, game_name, author_name, remarks;
-
-	struct Sdata {
-		unsigned char	reg, val;
-		unsigned short	time;
-	} *data;
-
-private:
-	float getrate(const std::string &filename, const CFileProvider &fp, binistream *f);
-};
-
-#endif

audacious-plugins-3.6.2-gtk3.tar.bz2/src/adplug/core/jbm.cc Deleted

@@ -1,294 +0,0 @@
-/*
- * 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.
- *
- * Johannes Bjerregaard's JBM Adlib Music Format player for AdPlug
- * Written by Dennis Lindroos <lindroos@nls.fi>, February-March 2007
- * - Designed and coded from scratch (only frequency-table taken from MUSIC.BIN)
- * - The percussion mode is buggy (?) but i'm not good enough to find them
- * and honestly i think the melodic-mode tunes are much better ;)
- *
- * This version doesn't use the binstr.h functions (coded with custom func.)
- * This is my first attempt on writing a musicplayer for AdPlug, and i'm not
- * coding C++ very often..
- *
- * Released under the terms of the GNU General Public License.
- */
-
-#include "jbm.h"
-
-static const unsigned short notetable96 = {
- 0x0158, 0x016d, 0x0183, 0x019a, 0x01b2, 0x01cc, 0x01e7, 0x0204,
- 0x0223, 0x0244, 0x0266, 0x028b, 0x0558, 0x056d, 0x0583, 0x059a,
- 0x05b2, 0x05cc, 0x05e7, 0x0604, 0x0623, 0x0644, 0x0666, 0x068b,
- 0x0958, 0x096d, 0x0983, 0x099a, 0x09b2, 0x09cc, 0x09e7, 0x0a04,
- 0x0a23, 0x0a44, 0x0a66, 0x0a8b, 0x0d58, 0x0d6d, 0x0d83, 0x0d9a,
- 0x0db2, 0x0dcc, 0x0de7, 0x0e04, 0x0e23, 0x0e44, 0x0e66, 0x0e8b,
- 0x1158, 0x116d, 0x1183, 0x119a, 0x11b2, 0x11cc, 0x11e7, 0x1204,
- 0x1223, 0x1244, 0x1266, 0x128b, 0x1558, 0x156d, 0x1583, 0x159a,
- 0x15b2, 0x15cc, 0x15e7, 0x1604, 0x1623, 0x1644, 0x1666, 0x168b,
- 0x1958, 0x196d, 0x1983, 0x199a, 0x19b2, 0x19cc, 0x19e7, 0x1a04,
- 0x1a23, 0x1a44, 0x1a66, 0x1a8b, 0x1d58, 0x1d6d, 0x1d83, 0x1d9a,
- 0x1db2, 0x1dcc, 0x1de7, 0x1e04, 0x1e23, 0x1e44, 0x1e66, 0x1e8b
-};
-
-static const unsigned char percmx_tab4 = { 0x14, 0x12, 0x15, 0x11 };
-static const unsigned char perchn_tab5 = { 6, 7, 8, 8, 7 };
-static unsigned char percmaskoff5 = { 0xef, 0xf7, 0xfb, 0xfd, 0xfe };
-static unsigned char percmaskon5 = { 0x10, 0x08, 0x04, 0x02, 0x01 };
-
-static inline unsigned short GET_WORD(unsigned char *b, int x)
-{
- return ((unsigned short)(bx+1 << 8) | bx);
-}
-
-/*** public methods *************************************/
-
-CPlayer *CjbmPlayer::factory(Copl *newopl)
-{
- return new CjbmPlayer(newopl);
-}
-
-bool CjbmPlayer::load(VFSFile & fd, const CFileProvider & fp)
-{
- binistream *f = fp.open (fd);
- std::string filename (fd.filename ());
- int		filelen = fp.filesize(f);
- int		i;
-
- if (!filelen || !fp.extension(filename, ".jbm")) goto loaderr;
-
- // Allocate memory buffer m and read entire file into it
-
- m = new unsigned charfilelen;
- if (f->readString((char *)m, filelen) != (unsigned int)filelen) goto loaderr;
-
- fp.close(f);
-
- // The known .jbm files always seem to start with the number 0x0002
-
- if (GET_WORD(m, 0) != 0x0002)
- return false;
-
- // Song tempo
-
- i = GET_WORD(m, 2);
- timer = 1193810.0 / (i ? i : 0xffff);
-
- seqtable = GET_WORD(m, 4);
- instable = GET_WORD(m, 6);
-
- // The flags word has atleast 1 bit, the Adlib's rhythm mode, but
- // currently we don't support that :(
-
- flags = GET_WORD(m, 8);
-
- // Instrument datas are directly addressed with m
-
- inscount = (filelen - instable) >> 4;
-
- // Voice' and sequence pointers
-
- seqcount = 0xffff;
- for (i = 0; i < 11; i++) {
- voicei.trkpos = voicei.trkstart = GET_WORD(m, 10 + (i<<1));
- if (voicei.trkpos && voicei.trkpos < seqcount)
- seqcount = voicei.trkpos;
- }
- seqcount = (seqcount - seqtable) >> 1;
- sequences = new unsigned shortseqcount;
- for (i = 0; i < seqcount; i++)
- sequencesi = GET_WORD(m, seqtable + (i<<1));
-
- rewind(0);
- return true;
- loaderr:
- fp.close(f);
- return false;
-}
-
-bool CjbmPlayer::update()
-{
- short c, spos, frq;
-
- for (c = 0; c < 11; c++) {
- if (!voicec.trkpos)		// Unused channel
- continue;
-
- if (--voicec.delay)
- continue;
-
- // Turn current note/percussion off
-
- if (voicec.note&0x7f)
- opl_noteonoff(c, &voicec, 0);
-
- // Process events until we have a note
-
- spos = voicec.seqpos;
- while(!voicec.delay) {
- switch(mspos) {
- case 0xFD:	// Set Instrument
-	voicec.instr = mspos+1;
-	set_opl_instrument(c, &voicec);
-	spos+=2;
-	break;
- case 0xFF:	// End of Sequence
-	voicec.seqno = m++voicec.trkpos;
-	if (voicec.seqno == 0xff) {
-	 voicec.trkpos = voicec.trkstart;
-	 voicec.seqno = mvoicec.trkpos;
-	 //voicemask &= 0x7ff-(1<<c);
-	 voicemask &= ~(1<<c);
-	}
-	spos = voicec.seqpos = sequencesvoicec.seqno;
-	break;
- default:	// Note Event
-	if ((mspos & 127) > 95)
-	 return 0;
-
-	voicec.note = mspos;
-	voicec.vol = mspos+1;
-	voicec.delay =
-	 (mspos+2 + (mspos+3<<8)) + 1;
-
-	frq = notetablevoicec.note&127;
-	voicec.frq0 = (unsigned char)frq;
-	voicec.frq1 = frq >> 8;
-	spos+=4;
- }
- }
- voicec.seqpos = spos;
-
- // Write new volume to the carrier operator, or percussion
-
- if (flags&1 && c > 6)
- opl->write(0x40 + percmx_tabc-7, voicec.vol ^ 0x3f);
- else
- opl->write(0x43 + op_tablec, voicec.vol ^ 0x3f);
-
- // Write new frequencies and Gate bit
-
- opl_noteonoff(c, &voicec, !(voicec.note & 0x80));
- }
- return (voicemask);
-}
-
-void CjbmPlayer::rewind(int subsong)
-{
- int c;
-
- voicemask = 0;
-
- for (c = 0; c < 11; c++) {
- voicec.trkpos = voicec.trkstart;
-
- if (!voicec.trkpos) continue;
-
- voicemask |= (1<<c);
-
- voicec.seqno = mvoicec.trkpos;
- voicec.seqpos = sequencesvoicec.seqno;
-
- voicec.note = 0;
- voicec.delay = 1;
- }
-
- opl->init();
- opl->write(0x01, 32);
-
- // Set rhythm mode if flags bit #0 is set
- // AM and Vibrato are full depths (taken from DosBox RAW output)
- bdreg = 0xC0 | (flags&1)<<5;
-
- opl->write(0xbd, bdreg);
-
-#if 0
- if (flags&1) {
- voice7.frq0 = 0x58; voice7.frq1 = 0x09; // XXX
- voice8.frq0 = 0x04; voice8.frq1 = 0x0a; // XXX
- opl_noteonoff(7, &voice7, 0);
- opl_noteonoff(8, &voice8, 0);
- }
-#endif
-
- return;
-}
-
-/*** private methods ************************************/
-
-void CjbmPlayer::opl_noteonoff(int channel, JBMVoice *v, bool state)
-{
- if (flags&1 && channel > 5) {
- // Percussion
- opl->write(0xa0 + perchn_tabchannel-6, voicechannel.frq0);
- opl->write(0xb0 + perchn_tabchannel-6, voicechannel.frq1);
- opl->write(0xbd,
-	 state ? bdreg | percmaskonchannel-6 :
-	 bdreg & percmaskoffchannel-6);
- } else {
- // Melodic mode or Rhythm mode melodic channels
- opl->write(0xa0 + channel, voicechannel.frq0);
- opl->write(0xb0 + channel,
-	 state ? voicechannel.frq1 | 0x20 :
-	 voicechannel.frq1 & 0x1f);
- }
- return;
-}
-
-
-void CjbmPlayer::set_opl_instrument(int channel, JBMVoice *v)
-{
- short i = instable + (v->instr << 4);
-
- // Sanity check on instr number - or we'll be reading outside m !
-
- if (v->instr >= inscount)
- return;
-
- // For rhythm mode, multiplexed drums. I don't care about waveforms!
- if ((flags&1) & (channel > 6)) {
- opl->write(0x20 + percmx_tabchannel-7, mi+0);
- opl->write(0x40 + percmx_tabchannel-7, mi+1 ^ 0x3f);
- opl->write(0x60 + percmx_tabchannel-7, mi+2);
- opl->write(0x80 + percmx_tabchannel-7, mi+3);
-
- opl->write(0xc0 + perchn_tabchannel-6, mi+8&15);
- return;
- }
-
- // AM/VIB/EG/KSR/FRQMUL, KSL/OUTPUT, ADSR for 1st operator
- opl->write(0x20 + op_tablechannel, mi+0);
- opl->write(0x40 + op_tablechannel, mi+1 ^ 0x3f);
- opl->write(0x60 + op_tablechannel, mi+2);
- opl->write(0x80 + op_tablechannel, mi+3);
-
- // AM/VIB/EG/KSR/FRQMUL, KSL/OUTPUT, ADSR for 2nd operator
- opl->write(0x23 + op_tablechannel, mi+4);
- opl->write(0x43 + op_tablechannel, mi+5 ^ 0x3f);
- opl->write(0x63 + op_tablechannel, mi+6);
- opl->write(0x83 + op_tablechannel, mi+7);
-
- // WAVEFORM for operators
- opl->write(0xe0 + op_tablechannel, (mi+8>>4)&3);
- opl->write(0xe3 + op_tablechannel, (mi+8>>6)&3);
-
- // FEEDBACK/FM mode
- opl->write(0xc0 + channel, mi+8&15);
-
- return;
-}

audacious-plugins-3.6.2-gtk3.tar.bz2/src/adplug/core/jbm.h Deleted

@@ -1,80 +0,0 @@
-/*
- * 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.
- *
- * jbm.h - JBM Player by Dennis Lindroos <lindroos@nls.fi>
- */
-
-#ifndef H_ADPLUG_JBMPLAYER
-#define H_ADPLUG_JBMPLAYER
-
-#include "player.h"
-
-class CjbmPlayer: public CPlayer
-{
- public:
- static CPlayer *factory(Copl *newopl);
-
- CjbmPlayer(Copl *newopl) : CPlayer(newopl), m(0)
- { }
- ~CjbmPlayer()
- { if(m != nullptr) delete m; }
-
- bool load(VFSFile &fd, const CFileProvider &fp);
- bool update();
- void rewind(int subsong);
-
- float getrefresh()
- { return timer; }
-
- std::string gettype()
- {
- return std::string(flags&1 ? "JBM Adlib Music rhythm mode" :
-			 "JBM Adlib Music");
- }
- std::string getauthor()
- { return std::string("Johannes Bjerregaard"); }
-
- protected:
-
- unsigned char *m;
- float timer;
- unsigned short flags, voicemask;
- unsigned short seqtable, seqcount;
- unsigned short instable, inscount;
- unsigned short *sequences;
- unsigned char bdreg;
-
- typedef struct {
- unsigned short trkpos, trkstart, seqpos;
- unsigned char seqno, note;
- short vol;
- short delay;
- short instr;
- unsigned char frq2;
- unsigned char ivol, dummy;
- } JBMVoice;
-
- JBMVoice voice11;
-
- private:
- //void calc_opl_frequency(JBMVoice *);
- void set_opl_instrument(int, JBMVoice *);
- void opl_noteonoff(int, JBMVoice *, bool);
-};
-
-#endif

audacious-plugins-3.6.2-gtk3.tar.bz2/src/adplug/core/kemuopl.h Deleted

@@ -1,59 +0,0 @@
-/*
- * Adplug - Replayer for many OPL2/OPL3 audio file formats.
- * Copyright (C) 1999 - 2005 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
- *
- * kemuopl.h - Emulated OPL using Ken Silverman's emulator, by Simon Peter
- * <dn.tlp@gmx.net>
- */
-
-#ifndef H_ADPLUG_KEMUOPL
-#define H_ADPLUG_KEMUOPL
-
-#include "opl.h"
-#include "adlibemu.h"
-
-class CKemuopl: public Copl
-{
-public:
- CKemuopl(int rate, bool bit16, bool usestereo)
- : use16bit(bit16), stereo(usestereo)
- {
- adlibinit(rate, usestereo ? 2 : 1, bit16 ? 2 : 1);
- currType = TYPE_OPL2;
- };
-
- void update(short *buf, int samples)
- {
- if(use16bit) samples *= 2;
- if(stereo) samples *= 2;
- adlibgetsample(buf, samples);
- }
-
- // template methods
- void write(int reg, int val)
- {
- if(currChip == 0)
-	adlib0(reg, val);
- };
-
- void init() {};
-
-private:
- bool	use16bit,stereo;
-};
-
-#endif

audacious-plugins-3.6.2-gtk3.tar.bz2/src/adplug/core/ksm.cc Deleted

@@ -1,419 +0,0 @@
-/*
- * Adplug - Replayer for many OPL2/OPL3 audio file formats.
- * Copyright (C) 1999 - 2006 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
- *
- * ksm.cpp - KSM Player for AdPlug by Simon Peter <dn.tlp@gmx.net>
- */
-
-#include <string.h>
-
-#include "ksm.h"
-#include "debug.h"
-
-const unsigned int
- CksmPlayer::adlibfreq63 = {
- 0,
- 2390, 2411, 2434, 2456, 2480, 2506, 2533, 2562, 2592, 2625, 2659, 2695,
- 3414, 3435, 3458, 3480, 3504, 3530, 3557, 3586, 3616, 3649, 3683, 3719,
- 4438, 4459, 4482, 4504, 4528, 4554, 4581, 4610, 4640, 4673, 4707, 4743,
- 5462, 5483, 5506, 5528, 5552, 5578, 5605, 5634, 5664, 5697, 5731, 5767,
- 6486, 6507, 6530, 6552, 6576, 6602, 6629, 6658, 6688, 6721, 6755, 6791,
- 7510
-};
-
-/*** public methods **************************************/
-
-CPlayer *
-CksmPlayer::factory (Copl * newopl)
-{
- return new CksmPlayer (newopl);
-}
-
-bool
-CksmPlayer::load (VFSFile & fd, const CFileProvider & fp)
-{
- binistream *f;
- int i;
- std::string filename (fd.filename ());
- char *fn = new charfilename.length () + 9;
-
- // file validation section
- if (!fp.extension (filename, ".ksm"))
- {
- AdPlug_LogWrite ("CksmPlayer::load(,\"%s\"): File doesn't have '.ksm' "
- "extension! Rejected!\n", filename.c_str ());
- deletefn;
- return false;
- }
- AdPlug_LogWrite ("*** CksmPlayer::load(,\"%s\") ***\n", filename.c_str ());
-
- // Load instruments from 'insts.dat'
- strcpy (fn, filename.c_str ());
- for (i = strlen (fn) - 1; i >= 0; i--)
- if (fni == '/' || fni == '\\')
- break;
- strcpy (fn + i + 1, "insts.dat");
- AdPlug_LogWrite ("Instruments file: \"%s\"\n", fn);
- VFSFile instfd (fn, "rb");
- f = fp.open (instfd);
- deletefn;
- if (!f)
- {
- AdPlug_LogWrite ("Couldn't open instruments file! Aborting!\n");
- AdPlug_LogWrite ("--- CksmPlayer::load ---\n");
- return false;
- }
- loadinsts (f);
- fp.close (f);
-
- f = fp.open (fd);
- if (!f)
- return false;
- for (i = 0; i < 16; i++)
- trinsti = f->readInt (1);
- for (i = 0; i < 16; i++)
- trquanti = f->readInt (1);
- for (i = 0; i < 16; i++)
- trchani = f->readInt (1);
- f->ignore (16);
- for (i = 0; i < 16; i++)
- trvoli = f->readInt (1);
- numnotes = f->readInt (2);
- note = new unsigned longnumnotes;
- for (i = 0; i < numnotes; i++)
- notei = f->readInt (4);
- fp.close (f);
-
- if (!trchan11)
- {
- drumstat = 0;
- numchans = 9;
- }
- else
- {
- drumstat = 32;
- numchans = 6;
- }
-
- rewind (0);
- AdPlug_LogWrite ("--- CksmPlayer::load ---\n");
- return true;
-}
-
-bool
-CksmPlayer::update ()
-{
- int quanter, chan = 0, drumnum = 0, freq, track, volevel, volval;
- unsigned int i, j, bufnum;
- unsigned long temp, templong;
-
- count++;
- if (count >= countstop)
- {
- bufnum = 0;
- while (count >= countstop)
- {
- templong = notenownote;
- track = (int) ((templong >> 8) & 15);
- if ((templong & 192) == 0)
- {
- i = 0;
-
- while ((i < numchans) &&
- ((chanfreqi != (templong & 63)) ||
- (chantracki != ((templong >> 8) & 15))))
- i++;
- if (i < numchans)
- {
- databufbufnum = (char) 0;
- bufnum++;
- databufbufnum = (unsigned char) (0xb0 + i);
- bufnum++;
- databufbufnum =
- (unsigned char) ((adlibfreqtemplong & 63 >> 8) & 223);
- bufnum++;
- chanfreqi = 0;
- chanagei = 0;
- }
- }
- else
- {
- volevel = trvoltrack;
- if ((templong & 192) == 128)
- {
- volevel -= 4;
- if (volevel < 0)
- volevel = 0;
- }
- if ((templong & 192) == 192)
- {
- volevel += 4;
- if (volevel > 63)
- volevel = 63;
- }
- if (track < 11)
- {
- temp = 0;
- i = numchans;
- for (j = 0; j < numchans; j++)
- if ((countstop - chanagej >= temp) && (chantrackj == track))
- {
- temp = countstop - chanagej;
- i = j;
- }
- if (i < numchans)
- {
- databufbufnum = (char) 0, bufnum++;
- databufbufnum = (unsigned char) (0xb0 + i);
- bufnum++;
- databufbufnum = (unsigned char) 0;
- bufnum++;
- volval = (insttrinsttrack1 & 192) + (volevel ^ 63);
- databufbufnum = (char) 0, bufnum++;
- databufbufnum = (unsigned char) (0x40 + op_tablei + 3);
- bufnum++;
- databufbufnum = (unsigned char) volval;
- bufnum++;
- databufbufnum = (char) 0, bufnum++;
- databufbufnum = (unsigned char) (0xa0 + i);
- bufnum++;
- databufbufnum =
- (unsigned char) (adlibfreqtemplong & 63 & 255);
- bufnum++;
- databufbufnum = (char) 0, bufnum++;
- databufbufnum = (unsigned char) (0xb0 + i);
- bufnum++;
- databufbufnum =
- (unsigned char) ((adlibfreqtemplong & 63 >> 8) | 32);
- bufnum++;
- chanfreqi = templong & 63;
- chanagei = countstop;
- }
- }
- else if ((drumstat & 32) > 0)
- {
- freq = adlibfreqtemplong & 63;
- switch (track)
- {
- case 11:
- drumnum = 16;
- chan = 6;
- freq -= 2048;
- break;
- case 12:
- drumnum = 8;
- chan = 7;
- freq -= 2048;
- break;
- case 13:
- drumnum = 4;
- chan = 8;
- break;
- case 14:
- drumnum = 2;
- chan = 8;
- break;
- case 15:
- drumnum = 1;
- chan = 7;
- freq -= 2048;
- break;
- }
- databufbufnum = (char) 0, bufnum++;
- databufbufnum = (unsigned char) (0xa0 + chan);
- bufnum++;
- databufbufnum = (unsigned char) (freq & 255);
- bufnum++;
- databufbufnum = (char) 0, bufnum++;
- databufbufnum = (unsigned char) (0xb0 + chan);
- bufnum++;
- databufbufnum = (unsigned char) ((freq >> 8) & 223);
- bufnum++;
- databufbufnum = (char) 0, bufnum++;
- databufbufnum = (unsigned char) (0xbd);
- bufnum++;
- databufbufnum = (unsigned char) (drumstat & (255 - drumnum));
- bufnum++;
- drumstat |= drumnum;
- if ((track == 11) || (track == 12) || (track == 14))
- {
- volval = (insttrinsttrack1 & 192) + (volevel ^ 63);
- databufbufnum = (char) 0, bufnum++;
- databufbufnum = (unsigned char) (0x40 + op_tablechan + 3);
- bufnum++;
- databufbufnum = (unsigned char) (volval);
- bufnum++;
- }
- else
- {
- volval = (insttrinsttrack6 & 192) + (volevel ^ 63);
- databufbufnum = (char) 0, bufnum++;
- databufbufnum = (unsigned char) (0x40 + op_tablechan);
- bufnum++;
- databufbufnum = (unsigned char) (volval);
- bufnum++;
- }
- databufbufnum = (char) 0, bufnum++;
- databufbufnum = (unsigned char) (0xbd);
- bufnum++;
- databufbufnum = (unsigned char) (drumstat);
- bufnum++;
- }
- }
- nownote++;
- if (nownote >= numnotes)
- {
- nownote = 0;
- songend = true;
- }
- templong = notenownote;
- if (nownote == 0)
- count = (templong >> 12) - 1;
- quanter = (240 / trquant(templong >> 8) & 15);
- countstop = (((templong >> 12) + (quanter >> 1)) / quanter) * quanter;
- }
- for (i = 0; i < bufnum; i += 3)
- opl->write (databufi + 1, databufi + 2);
- }
- return !songend;
-}
-
-void
-CksmPlayer::rewind (int subsong)
-{
- unsigned int i, j, k;
- unsigned char instbuf11;
- unsigned long templong;
-
- songend = false;
- opl->init ();
- opl->write (1, 32);
- opl->write (4, 0);
- opl->write (8, 0);
- opl->write (0xbd, drumstat);
-
- if (trchan11 == 1)
- {
- for (i = 0; i < 11; i++)
- instbufi = insttrinst11i;
- instbuf1 = ((instbuf1 & 192) | ((trvol11) ^ 63));
- setinst (6, instbuf0, instbuf1, instbuf2, instbuf3, instbuf4,
- instbuf5, instbuf6, instbuf7, instbuf8, instbuf9,
- instbuf10);
- for (i = 0; i < 5; i++)
- instbufi = insttrinst12i;
- for (i = 5; i < 11; i++)
- instbufi = insttrinst15i;
- instbuf1 = ((instbuf1 & 192) | ((trvol12) ^ 63));
- instbuf6 = ((instbuf6 & 192) | ((trvol15) ^ 63));
- setinst (7, instbuf0, instbuf1, instbuf2, instbuf3, instbuf4,
- instbuf5, instbuf6, instbuf7, instbuf8, instbuf9,
- instbuf10);
- for (i = 0; i < 5; i++)
- instbufi = insttrinst14i;
- for (i = 5; i < 11; i++)
- instbufi = insttrinst13i;
- instbuf1 = ((instbuf1 & 192) | ((trvol14) ^ 63));
- instbuf6 = ((instbuf6 & 192) | ((trvol13) ^ 63));
- setinst (8, instbuf0, instbuf1, instbuf2, instbuf3, instbuf4,
- instbuf5, instbuf6, instbuf7, instbuf8, instbuf9,
- instbuf10);
- }
-
- for (i = 0; i < numchans; i++)
- {
- chantracki = 0;
- chanagei = 0;
- }
- j = 0;
- for (i = 0; i < 16; i++)
- if ((trchani > 0) && (j < numchans))
- {
- k = trchani;
- while ((j < numchans) && (k > 0))
- {
- chantrackj = i;
- k--;
- j++;
- }
- }
- for (i = 0; i < numchans; i++)
- {
- for (j = 0; j < 11; j++)
- instbufj = insttrinstchantrackij;
- instbuf1 = ((instbuf1 & 192) | (63 - trvolchantracki));
- setinst (i, instbuf0, instbuf1, instbuf2, instbuf3, instbuf4,
- instbuf5, instbuf6, instbuf7, instbuf8, instbuf9,
- instbuf10);
- chanfreqi = 0;
- }
- k = 0;
- templong = *note;
- count = (templong >> 12) - 1;
- countstop = (templong >> 12) - 1;
- nownote = 0;
-}
-
-std::string CksmPlayer::getinstrument (unsigned int n)
-{
- if (trchann)
- return std::string (instnametrinstn);
- else
- return std::string ();
-}
-
-/*** private methods *************************************/
-
-void
-CksmPlayer::loadinsts (binistream * f)
-{
- int i, j;
-
- for (i = 0; i < 256; i++)
- {
- f->readString (instnamei, 20);
- for (j = 0; j < 11; j++)
- instij = f->readInt (1);
- f->ignore (2);
- }
-}
-
-void
-CksmPlayer::setinst (int chan,
- unsigned char v0, unsigned char v1, unsigned char v2,
- unsigned char v3, unsigned char v4, unsigned char v5,
- unsigned char v6, unsigned char v7, unsigned char v8,
- unsigned char v9, unsigned char v10)
-{
- int offs;
-
- opl->write (0xa0 + chan, 0);
- opl->write (0xb0 + chan, 0);
- opl->write (0xc0 + chan, v10);
- offs = op_tablechan;
- opl->write (0x20 + offs, v5);
- opl->write (0x40 + offs, v6);
- opl->write (0x60 + offs, v7);
- opl->write (0x80 + offs, v8);
- opl->write (0xe0 + offs, v9);
- offs += 3;
- opl->write (0x20 + offs, v0);
- opl->write (0x40 + offs, v1);
- opl->write (0x60 + offs, v2);
- opl->write (0x80 + offs, v3);
- opl->write (0xe0 + offs, v4);
-}

audacious-plugins-3.6.2-gtk3.tar.bz2/src/adplug/core/ksm.h Deleted

@@ -1,62 +0,0 @@
-/*
- * Adplug - Replayer for many OPL2/OPL3 audio file formats.
- * Copyright (C) 1999 - 2003 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
- *
- * ksm.h - KSM Player for AdPlug by Simon Peter <dn.tlp@gmx.net>
- */
-
-#include "player.h"
-
-class CksmPlayer: public CPlayer
-{
-public:
- static CPlayer *factory(Copl *newopl);
-
-	CksmPlayer(Copl *newopl)
-		: CPlayer(newopl), note(0)
-	{ };
-	~CksmPlayer()
-	{ if(note) delete note; };
-
-	bool load(VFSFile &fd, const CFileProvider &fp);
-	bool update();
-	void rewind(int subsong);
-	float getrefresh()
-	{ return 240.0f; };
-
-	std::string gettype()
-	{ return std::string("Ken Silverman's Music Format"); };
-	unsigned int getinstruments()
-	{ return 16; };
-	std::string getinstrument(unsigned int n);
-
-private:
-	static const unsigned int adlibfreq63;
-
-	unsigned long count,countstop,chanage18,*note;
-	unsigned short numnotes;
-	unsigned int nownote,numchans,drumstat;
-	unsigned char trinst16,trquant16,trchan16,trvol16,inst25611,databuf2048,chanfreq18,chantrack18;
-	char instname25620;
-
-	bool songend;
-
-	void loadinsts(binistream *f);
-	void setinst(int chan,unsigned char v0,unsigned char v1,unsigned char v2,unsigned char v3,
-				 unsigned char v4,unsigned char v5,unsigned char v6,unsigned char v7,
-				 unsigned char v8,unsigned char v9,unsigned char v10);
-};

audacious-plugins-3.6.2-gtk3.tar.bz2/src/adplug/core/lds.cc Deleted

@@ -1,817 +0,0 @@
-/*
- * Adplug - Replayer for many OPL2/OPL3 audio file formats.
- * Copyright (C) 1999 - 2004 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
- *
- * lds.cpp - LOUDNESS Player by Simon Peter <dn.tlp@gmx.net>
- */
-
-#include <string.h>
-
-#include "lds.h"
-#include "debug.h"
-
-// Note frequency table (16 notes / octave)
-const unsigned short
- CldsPlayer::frequency = {
- 343, 344, 345, 347, 348, 349, 350, 352, 353, 354, 356, 357, 358,
- 359, 361, 362, 363, 365, 366, 367, 369, 370, 371, 373, 374, 375,
- 377, 378, 379, 381, 382, 384, 385, 386, 388, 389, 391, 392, 393,
- 395, 396, 398, 399, 401, 402, 403, 405, 406, 408, 409, 411, 412,
- 414, 415, 417, 418, 420, 421, 423, 424, 426, 427, 429, 430, 432,
- 434, 435, 437, 438, 440, 442, 443, 445, 446, 448, 450, 451, 453,
- 454, 456, 458, 459, 461, 463, 464, 466, 468, 469, 471, 473, 475,
- 476, 478, 480, 481, 483, 485, 487, 488, 490, 492, 494, 496, 497,
- 499, 501, 503, 505, 506, 508, 510, 512, 514, 516, 518, 519, 521,
- 523, 525, 527, 529, 531, 533, 535, 537, 538, 540, 542, 544, 546,
- 548, 550, 552, 554, 556, 558, 560, 562, 564, 566, 568, 571, 573,
- 575, 577, 579, 581, 583, 585, 587, 589, 591, 594, 596, 598, 600,
- 602, 604, 607, 609, 611, 613, 615, 618, 620, 622, 624, 627, 629,
- 631, 633, 636, 638, 640, 643, 645, 647, 650, 652, 654, 657, 659,
- 662, 664, 666, 669, 671, 674, 676, 678, 681, 683
-};
-
-// Vibrato (sine) table
-const unsigned char
- CldsPlayer::vibtab = {
- 0, 13, 25, 37, 50, 62, 74, 86, 98, 109, 120, 131, 142, 152, 162,
- 171, 180, 189, 197, 205, 212, 219, 225, 231, 236, 240, 244, 247,
- 250, 252, 254, 255, 255, 255, 254, 252, 250, 247, 244, 240, 236,
- 231, 225, 219, 212, 205, 197, 189, 180, 171, 162, 152, 142, 131,
- 120, 109, 98, 86, 74, 62, 50, 37, 25, 13
-};
-
-// Tremolo (sine * sine) table
-const unsigned char
- CldsPlayer::tremtab = {
- 0, 0, 1, 1, 2, 4, 5, 7, 10, 12, 15, 18, 21, 25, 29, 33, 37, 42, 47,
- 52, 57, 62, 67, 73, 79, 85, 90, 97, 103, 109, 115, 121, 128, 134,
- 140, 146, 152, 158, 165, 170, 176, 182, 188, 193, 198, 203, 208,
- 213, 218, 222, 226, 230, 234, 237, 240, 243, 245, 248, 250, 251,
- 253, 254, 254, 255, 255, 255, 254, 254, 253, 251, 250, 248, 245,
- 243, 240, 237, 234, 230, 226, 222, 218, 213, 208, 203, 198, 193,
- 188, 182, 176, 170, 165, 158, 152, 146, 140, 134, 127, 121, 115,
- 109, 103, 97, 90, 85, 79, 73, 67, 62, 57, 52, 47, 42, 37, 33, 29,
- 25, 21, 18, 15, 12, 10, 7, 5, 4, 2, 1, 1, 0
-};
-
-// 'maxsound' is maximum number of patches (instruments)
-// 'maxpos' is maximum number of entries in position list (orderlist)
-const unsigned short
- CldsPlayer::maxsound = 0x3f, CldsPlayer::maxpos = 0xff;
-
-/*** public methods *************************************/
-
-CldsPlayer::CldsPlayer (Copl * newopl):CPlayer (newopl), soundbank (0), positions (0),
-patterns (0)
-{
-}
-
-CldsPlayer::~CldsPlayer ()
-{
- if (soundbank)
- deletesoundbank;
- if (positions)
- deletepositions;
- if (patterns)
- deletepatterns;
-}
-
-bool
-CldsPlayer::load (VFSFile & fd, const CFileProvider & fp)
-{
- binistream *f;
- unsigned int i, j;
- SoundBank *sb;
- std::string filename (fd.filename ());
-
- // file validation section (actually just an extension check)
- f = fp.open (fd);
- if (!f)
- return false;
- if (!fp.extension (filename, ".lds"))
- return false;
-
- // file load section (header)
- mode = f->readInt (1);
- if (mode > 2)
- {
- fp.close (f);
- return false;
- }
- speed = f->readInt (2);
- tempo = f->readInt (1);
- pattlen = f->readInt (1);
- for (i = 0; i < 9; i++)
- chandelayi = f->readInt (1);
- regbd = f->readInt (1);
-
- // load patches
- numpatch = f->readInt (2);
- soundbank = new SoundBanknumpatch;
- for (i = 0; i < numpatch; i++)
- {
- sb = &soundbanki;
- sb->mod_misc = f->readInt (1);
- sb->mod_vol = f->readInt (1);
- sb->mod_ad = f->readInt (1);
- sb->mod_sr = f->readInt (1);
- sb->mod_wave = f->readInt (1);
- sb->car_misc = f->readInt (1);
- sb->car_vol = f->readInt (1);
- sb->car_ad = f->readInt (1);
- sb->car_sr = f->readInt (1);
- sb->car_wave = f->readInt (1);
- sb->feedback = f->readInt (1);
- sb->keyoff = f->readInt (1);
- sb->portamento = f->readInt (1);
- sb->glide = f->readInt (1);
- sb->finetune = f->readInt (1);
- sb->vibrato = f->readInt (1);
- sb->vibdelay = f->readInt (1);
- sb->mod_trem = f->readInt (1);
- sb->car_trem = f->readInt (1);
- sb->tremwait = f->readInt (1);
- sb->arpeggio = f->readInt (1);
- for (j = 0; j < 12; j++)
- sb->arp_tabj = f->readInt (1);
- sb->start = f->readInt (2);
- sb->size = f->readInt (2);
- sb->fms = f->readInt (1);
- sb->transp = f->readInt (2);
- sb->midinst = f->readInt (1);
- sb->midvelo = f->readInt (1);
- sb->midkey = f->readInt (1);
- sb->midtrans = f->readInt (1);
- sb->middum1 = f->readInt (1);
- sb->middum2 = f->readInt (1);
- }
-
- // load positions
- numposi = f->readInt (2);
- positions = new Position9 * numposi;
- for (i = 0; i < numposi; i++)
- for (j = 0; j < 9; j++)
- {
- /*
- * patnum is a pointer inside the pattern space, but patterns are 16bit
- * word fields anyway, so it ought to be an even number (hopefully) and
- * we can just divide it by 2 to get our array index of 16bit words.
- */
- positionsi * 9 + j.patnum = f->readInt (2) / 2;
- positionsi * 9 + j.transpose = f->readInt (1);
- }
-
- AdPlug_LogWrite
- ("CldsPlayer::load(\"%s\",fp): loading LOUDNESS file: mode = "
- "%d, pattlen = %d, numpatch = %d, numposi = %d\n", filename.c_str (),
- mode, pattlen, numpatch, numposi);
-
- // load patterns
- f->ignore (2); // ignore # of digital sounds (not played by this player)
- patterns = new unsigned short(fp.filesize (f) - f->pos ()) / 2 + 1;
- for (i = 0; !f->eof (); i++)
- patternsi = f->readInt (2);
-
- fp.close (f);
- rewind (0);
- return true;
-}
-
-bool
-CldsPlayer::update ()
-{
- unsigned short comword, freq, octave, chan, tune, wibc, tremc, arpreg;
- bool vbreak;
- unsigned char level, regnum, comhi, comlo;
- int i;
- Channel *c;
-
- if (!playing)
- return false;
-
- // handle fading
- if (fadeonoff)
- {
- if (fadeonoff <= 128)
- {
- if (allvolume > fadeonoff || allvolume == 0)
- allvolume -= fadeonoff;
- else
- {
- allvolume = 1;
- fadeonoff = 0;
- if (hardfade != 0)
- {
- playing = false;
- hardfade = 0;
- for (i = 0; i < 9; i++)
- channeli.keycount = 1;
- }
- }
- }
- else
- if ((unsigned int) ((allvolume + (0x100 - fadeonoff)) & 0xff) <=
- mainvolume)
- allvolume += 0x100 - fadeonoff;
- else
- {
- allvolume = mainvolume;
- fadeonoff = 0;
- }
- }
-
- // handle channel delay
- for (chan = 0; chan < 9; chan++)
- {
- c = &channelchan;
- if (c->chancheat.chandelay)
- if (!(--c->chancheat.chandelay))
- playsound (c->chancheat.sound, chan, c->chancheat.high);
- }
-
- // handle notes
- if (!tempo_now)
- {
- vbreak = false;
- for (chan = 0; chan < 9; chan++)
- {
- c = &channelchan;
- if (!c->packwait)
- {
- unsigned short patnum = positionsposplay * 9 + chan.patnum;
- unsigned char transpose = positionsposplay * 9 + chan.transpose;
-
- comword = patternspatnum + c->packpos;
- comhi = comword >> 8;
- comlo = comword & 0xff;
- if (comword)
- {
- if (comhi == 0x80)
- {
- c->packwait = comlo;
- }
- else if (comhi >= 0x80)
- {
- switch (comhi)
- {
- case 0xff:
- c->volcar = (((c->volcar & 0x3f) * comlo) >> 6) & 0x3f;
- if (fmchip0xc0 + chan & 1)
- c->volmod = (((c->volmod & 0x3f) * comlo) >> 6) & 0x3f;
- break;
- case 0xfe:
- tempo = comword & 0x3f;
- break;
- case 0xfd:
- c->nextvol = comlo;
- break;
- case 0xfc:
- playing = false;
- // in real player there's also full keyoff here, but we don't need it
- break;
- case 0xfb:
- c->keycount = 1;
- break;
- case 0xfa:
- vbreak = true;
- jumppos = (posplay + 1) & maxpos;
- break;
- case 0xf9:
- vbreak = true;
- jumppos = comlo & maxpos;
- jumping = 1;
- if (jumppos < posplay)
- songlooped = true;
- break;
- case 0xf8:
- c->lasttune = 0;
- break;
- case 0xf7:
- c->vibwait = 0;
- // PASCAL: c->vibspeed = ((comlo >> 4) & 15) + 2;
- c->vibspeed = (comlo >> 4) + 2;
- c->vibrate = (comlo & 15) + 1;
- break;
- case 0xf6:
- c->glideto = comlo;
- break;
- case 0xf5:
- c->finetune = comlo;
- break;
- case 0xf4:
- if (!hardfade)
- {
- allvolume = mainvolume = comlo;
- fadeonoff = 0;
- }
- break;
- case 0xf3:
- if (!hardfade)
- fadeonoff = comlo;
- break;
- case 0xf2:
- c->trmstay = comlo;
- break;
- case 0xf1: // panorama
- case 0xf0: // progch
- // MIDI commands (unhandled)
- AdPlug_LogWrite
- ("CldsPlayer(): not handling MIDI command 0x%x, "
- "value = 0x%x\n", comhi);
- break;
- default:
- if (comhi < 0xa0)
- c->glideto = comhi & 0x1f;
- else
- AdPlug_LogWrite
- ("CldsPlayer(): unknown command 0x%x encountered!"
- " value = 0x%x\n", comhi, comlo);
- break;
- }
- }
- else
- {
- unsigned char sound;
- unsigned short high;
- signed char transp = transpose & 127;
-
- /*
- * Originally, in assembler code, the player first shifted
- * logically left the transpose byte by 1 and then shifted
- * arithmetically right the same byte to achieve the final,
- * signed transpose value. Since we can't do arithmetic shifts
- * in C, we just duplicate the 7th bit into the 8th one and
- * discard the 8th one completely.
- */
-
- if (transpose & 64)
- transp |= 128;
-
- if (transpose & 128)
- {
- sound = (comlo + transp) & maxsound;
- high = comhi << 4;
- }
- else
- {
- sound = comlo & maxsound;
- high = (comhi + transp) << 4;
- }
-
- /*
- PASCAL:
- sound = comlo & maxsound;
- high = (comhi + (((transpose + 0x24) & 0xff) - 0x24)) << 4;
- */
-
- if (!chandelaychan)
- playsound (sound, chan, high);
- else
- {
- c->chancheat.chandelay = chandelaychan;
- c->chancheat.sound = sound;
- c->chancheat.high = high;
- }
- }
- }
-
- c->packpos++;
- }
- else
- c->packwait--;
- }
-
- tempo_now = tempo;
- /*
- The continue table is updated here, but this is only used in the
- original player, which can be paused in the middle of a song and then
- unpaused. Since AdPlug does all this for us automatically, we don't
- have a continue table here. The continue table update code is noted
- here for reference only.
-
- if(!pattplay) {
- conttabspeed & maxcont.position = posplay & 0xff;
- conttabspeed & maxcont.tempo = tempo;
- }
- */
- pattplay++;
- if (vbreak)
- {
- pattplay = 0;
- for (i = 0; i < 9; i++)
- channeli.packpos = channeli.packwait = 0;
- posplay = jumppos;
- }
- else if (pattplay >= pattlen)
- {
- pattplay = 0;
- for (i = 0; i < 9; i++)
- channeli.packpos = channeli.packwait = 0;
- posplay = (posplay + 1) & maxpos;
- }
- }
- else
- tempo_now--;
-
- // make effects
- for (chan = 0; chan < 9; chan++)
- {
- c = &channelchan;
- regnum = op_tablechan;
- if (c->keycount > 0)
- {
- if (c->keycount == 1)
- setregs_adv (0xb0 + chan, 0xdf, 0);
- c->keycount--;
- }
-
- // arpeggio
- if (c->arp_size == 0)
- arpreg = 0;
- else
- {
- arpreg = c->arp_tabc->arp_pos << 4;
- if (arpreg == 0x800)
- {
- if (c->arp_pos > 0)
- c->arp_tab0 = c->arp_tabc->arp_pos - 1;
- c->arp_size = 1;
- c->arp_pos = 0;
- arpreg = c->arp_tab0 << 4;
- }
-
- if (c->arp_count == c->arp_speed)
- {
- c->arp_pos++;
- if (c->arp_pos >= c->arp_size)
- c->arp_pos = 0;
- c->arp_count = 0;
- }
- else
- c->arp_count++;
- }
-
- // glide & portamento
- if (c->lasttune && (c->lasttune != c->gototune))
- {
- if (c->lasttune > c->gototune)
- {
- if (c->lasttune - c->gototune < c->portspeed)
- c->lasttune = c->gototune;
- else
- c->lasttune -= c->portspeed;
- }
- else
- {
- if (c->gototune - c->lasttune < c->portspeed)
- c->lasttune = c->gototune;
- else
- c->lasttune += c->portspeed;
- }
-
- if (arpreg >= 0x800)
- arpreg = c->lasttune - (arpreg ^ 0xff0) - 16;
- else
- arpreg += c->lasttune;
-
- freq = frequencyarpreg % (12 * 16);
- octave = arpreg / (12 * 16) - 1;
- setregs (0xa0 + chan, freq & 0xff);
- setregs_adv (0xb0 + chan, 0x20, ((octave << 2) + (freq >> 8)) & 0xdf);
- }
- else
- {
- // vibrato
- if (!c->vibwait)
- {
- if (c->vibrate)
- {
- wibc = vibtabc->vibcount & 0x3f * c->vibrate;
-
- if ((c->vibcount & 0x40) == 0)
- tune = c->lasttune + (wibc >> 8);
- else
- tune = c->lasttune - (wibc >> 8);
-
- if (arpreg >= 0x800)
- tune = tune - (arpreg ^ 0xff0) - 16;
- else
- tune += arpreg;
-
- freq = frequencytune % (12 * 16);
- octave = tune / (12 * 16) - 1;
- setregs (0xa0 + chan, freq & 0xff);
- setregs_adv (0xb0 + chan, 0x20,
- ((octave << 2) + (freq >> 8)) & 0xdf);
- c->vibcount += c->vibspeed;
- }
- else if (c->arp_size != 0)
- { // no vibrato, just arpeggio
- if (arpreg >= 0x800)
- tune = c->lasttune - (arpreg ^ 0xff0) - 16;
- else
- tune = c->lasttune + arpreg;
-
- freq = frequencytune % (12 * 16);
- octave = tune / (12 * 16) - 1;
- setregs (0xa0 + chan, freq & 0xff);
- setregs_adv (0xb0 + chan, 0x20,
- ((octave << 2) + (freq >> 8)) & 0xdf);
- }
- }
- else
- { // no vibrato, just arpeggio
- c->vibwait--;
-
- if (c->arp_size != 0)
- {
- if (arpreg >= 0x800)
- tune = c->lasttune - (arpreg ^ 0xff0) - 16;
- else
- tune = c->lasttune + arpreg;
-
- freq = frequencytune % (12 * 16);
- octave = tune / (12 * 16) - 1;
- setregs (0xa0 + chan, freq & 0xff);
- setregs_adv (0xb0 + chan, 0x20,
- ((octave << 2) + (freq >> 8)) & 0xdf);
- }
- }
- }
-
- // tremolo (modulator)
- if (!c->trmwait)
- {
- if (c->trmrate)
- {
- tremc = tremtabc->trmcount & 0x7f * c->trmrate;
- if ((tremc >> 8) <= (c->volmod & 0x3f))
- level = (c->volmod & 0x3f) - (tremc >> 8);
- else
- level = 0;
-
- if (allvolume != 0 && (fmchip0xc0 + chan & 1))
- setregs_adv (0x40 + regnum, 0xc0,
- ((level * allvolume) >> 8) ^ 0x3f);
- else
- setregs_adv (0x40 + regnum, 0xc0, level ^ 0x3f);
-
- c->trmcount += c->trmspeed;
- }
- else if (allvolume != 0 && (fmchip0xc0 + chan & 1))
- setregs_adv (0x40 + regnum, 0xc0,
- ((((c->volmod & 0x3f) * allvolume) >> 8) ^ 0x3f) & 0x3f);
- else
- setregs_adv (0x40 + regnum, 0xc0, (c->volmod ^ 0x3f) & 0x3f);
- }
- else
- {
- c->trmwait--;
- if (allvolume != 0 && (fmchip0xc0 + chan & 1))
- setregs_adv (0x40 + regnum, 0xc0,
- ((((c->volmod & 0x3f) * allvolume) >> 8) ^ 0x3f) & 0x3f);
- }
-
- // tremolo (carrier)
- if (!c->trcwait)
- {
- if (c->trcrate)
- {
- tremc = tremtabc->trccount & 0x7f * c->trcrate;
- if ((tremc >> 8) <= (c->volcar & 0x3f))
- level = (c->volcar & 0x3f) - (tremc >> 8);
- else
- level = 0;
-
- if (allvolume != 0)
- setregs_adv (0x43 + regnum, 0xc0,
- ((level * allvolume) >> 8) ^ 0x3f);
- else
- setregs_adv (0x43 + regnum, 0xc0, level ^ 0x3f);
- c->trccount += c->trcspeed;
- }
- else if (allvolume != 0)
- setregs_adv (0x43 + regnum, 0xc0,
- ((((c->volcar & 0x3f) * allvolume) >> 8) ^ 0x3f) & 0x3f);
- else
- setregs_adv (0x43 + regnum, 0xc0, (c->volcar ^ 0x3f) & 0x3f);
- }
- else
- {
- c->trcwait--;
- if (allvolume != 0)
- setregs_adv (0x43 + regnum, 0xc0,
- ((((c->volcar & 0x3f) * allvolume) >> 8) ^ 0x3f) & 0x3f);
- }
- }
-
- return (!playing || songlooped) ? false : true;
-}
-
-void
-CldsPlayer::rewind (int subsong)
-{
- int i;
-
- // init all with 0
- tempo_now = 3;
- playing = true;
- songlooped = false;
- jumping = fadeonoff = allvolume = hardfade = pattplay = posplay = jumppos =
- mainvolume = 0;
- memset (channel, 0, sizeof (channel));
- memset (fmchip, 0, sizeof (fmchip));
-
- // OPL2 init
- opl->init (); // Reset OPL chip
- opl->write (1, 0x20);
- opl->write (8, 0);
- opl->write (0xbd, regbd);
-
- for (i = 0; i < 9; i++)
- {
- opl->write (0x20 + op_tablei, 0);
- opl->write (0x23 + op_tablei, 0);
- opl->write (0x40 + op_tablei, 0x3f);
- opl->write (0x43 + op_tablei, 0x3f);
- opl->write (0x60 + op_tablei, 0xff);
- opl->write (0x63 + op_tablei, 0xff);
- opl->write (0x80 + op_tablei, 0xff);
- opl->write (0x83 + op_tablei, 0xff);
- opl->write (0xe0 + op_tablei, 0);
- opl->write (0xe3 + op_tablei, 0);
- opl->write (0xa0 + i, 0);
- opl->write (0xb0 + i, 0);
- opl->write (0xc0 + i, 0);
- }
-}
-
-/*** private methods *************************************/
-
-void
-CldsPlayer::playsound (int inst_number, int channel_number, int tunehigh)
-{
- if ((unsigned int)inst_number > numpatch-1) {
- return;
- }
- Channel *c = &channelchannel_number; // current channel
- SoundBank *i = &soundbankinst_number; // current instrument
- unsigned int regnum = op_tablechannel_number; // channel's OPL2 register
- unsigned char volcalc, octave;
- unsigned short freq;
-
- // set fine tune
- tunehigh += ((i->finetune + c->finetune + 0x80) & 0xff) - 0x80;
-
- // arpeggio handling
- if (!i->arpeggio)
- {
- unsigned short arpcalc = i->arp_tab0 << 4;
-
- if (arpcalc > 0x800)
- tunehigh = tunehigh - (arpcalc ^ 0xff0) - 16;
- else
- tunehigh += arpcalc;
- }
-
- // glide handling
- if (c->glideto != 0)
- {
- c->gototune = tunehigh;
- c->portspeed = c->glideto;
- c->glideto = c->finetune = 0;
- return;
- }
-
- // set modulator registers
- setregs (0x20 + regnum, i->mod_misc);
- volcalc = i->mod_vol;
- if (!c->nextvol || !(i->feedback & 1))
- c->volmod = volcalc;
- else
- c->volmod = (volcalc & 0xc0) | ((((volcalc & 0x3f) * c->nextvol) >> 6));
-
- if ((i->feedback & 1) == 1 && allvolume != 0)
- setregs (0x40 + regnum,
- ((c->
- volmod & 0xc0) | (((c->volmod & 0x3f) *
- allvolume) >> 8)) ^ 0x3f);
- else
- setregs (0x40 + regnum, c->volmod ^ 0x3f);
- setregs (0x60 + regnum, i->mod_ad);
- setregs (0x80 + regnum, i->mod_sr);
- setregs (0xe0 + regnum, i->mod_wave);
-
- // Set carrier registers
- setregs (0x23 + regnum, i->car_misc);
- volcalc = i->car_vol;
- if (!c->nextvol)
- c->volcar = volcalc;
- else
- c->volcar = (volcalc & 0xc0) | ((((volcalc & 0x3f) * c->nextvol) >> 6));
-
- if (allvolume)
- setregs (0x43 + regnum,
- ((c->
- volcar & 0xc0) | (((c->volcar & 0x3f) *
- allvolume) >> 8)) ^ 0x3f);
- else
- setregs (0x43 + regnum, c->volcar ^ 0x3f);
- setregs (0x63 + regnum, i->car_ad);
- setregs (0x83 + regnum, i->car_sr);
- setregs (0xe3 + regnum, i->car_wave);
- setregs (0xc0 + channel_number, i->feedback);
- setregs_adv (0xb0 + channel_number, 0xdf, 0); // key off
-
- freq = frequencytunehigh % (12 * 16);
- octave = tunehigh / (12 * 16) - 1;
- if (!i->glide)
- {
- if (!i->portamento || !c->lasttune)
- {
- setregs (0xa0 + channel_number, freq & 0xff);
- setregs (0xb0 + channel_number, (octave << 2) + 0x20 + (freq >> 8));
- c->lasttune = c->gototune = tunehigh;
- }
- else
- {
- c->gototune = tunehigh;
- c->portspeed = i->portamento;
- setregs_adv (0xb0 + channel_number, 0xdf, 0x20); // key on
- }
- }
- else
- {
- setregs (0xa0 + channel_number, freq & 0xff);
- setregs (0xb0 + channel_number, (octave << 2) + 0x20 + (freq >> 8));
- c->lasttune = tunehigh;
- c->gototune = tunehigh + ((i->glide + 0x80) & 0xff) - 0x80; // set destination
- c->portspeed = i->portamento;
- }
-
- if (!i->vibrato)
- c->vibwait = c->vibspeed = c->vibrate = 0;
- else
- {
- c->vibwait = i->vibdelay;
- // PASCAL: c->vibspeed = ((i->vibrato >> 4) & 15) + 1;
- c->vibspeed = (i->vibrato >> 4) + 2;
- c->vibrate = (i->vibrato & 15) + 1;
- }
-
- if (!(c->trmstay & 0xf0))
- {
- c->trmwait = (i->tremwait & 0xf0) >> 3;
- // PASCAL: c->trmspeed = (i->mod_trem >> 4) & 15;
- c->trmspeed = i->mod_trem >> 4;
- c->trmrate = i->mod_trem & 15;
- c->trmcount = 0;
- }
-
- if (!(c->trmstay & 0x0f))
- {
- c->trcwait = (i->tremwait & 15) << 1;
- // PASCAL: c->trcspeed = (i->car_trem >> 4) & 15;
- c->trcspeed = i->car_trem >> 4;
- c->trcrate = i->car_trem & 15;
- c->trccount = 0;
- }
-
- c->arp_size = i->arpeggio & 15;
- c->arp_speed = i->arpeggio >> 4;
- memcpy (c->arp_tab, i->arp_tab, 12);
- c->keycount = i->keyoff;
- c->nextvol = c->glideto = c->finetune = c->vibcount = c->arp_pos =
- c->arp_count = 0;
-}
-
-inline void
-CldsPlayer::setregs (unsigned char reg, unsigned char val)
-{
- if (fmchipreg == val)
- return;
-
- fmchipreg = val;
- opl->write (reg, val);
-}
-
-inline void
-CldsPlayer::setregs_adv (unsigned char reg, unsigned char mask,
- unsigned char val)
-{
- setregs (reg, (fmchipreg & mask) | val);
-}

audacious-plugins-3.6.2-gtk3.tar.bz2/src/adplug/core/lds.h Deleted

@@ -1,91 +0,0 @@
-/*
- * Adplug - Replayer for many OPL2/OPL3 audio file formats.
- * Copyright (C) 1999 - 2004 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
- *
- * lds.h - LOUDNESS Player by Simon Peter <dn.tlp@gmx.net>
- */
-
-#include "player.h"
-
-class CldsPlayer: public CPlayer
-{
- public:
- static CPlayer *factory(Copl *newopl) { return new CldsPlayer(newopl); }
-
- CldsPlayer(Copl *newopl);
- virtual ~CldsPlayer();
-
- bool load(VFSFile &fd, const CFileProvider &fp);
- virtual bool update();
- virtual void rewind(int subsong = -1);
- float getrefresh() { return 70.0f; }
-
- std::string gettype() { return std::string("LOUDNESS Sound System"); }
- unsigned int getorders() { return numposi; }
- unsigned int getorder() { return posplay; }
- unsigned int getrow() { return pattplay; }
- unsigned int getspeed() { return speed; }
- unsigned int getinstruments() { return numpatch; }
-
- private:
- typedef struct {
- unsigned char	mod_misc, mod_vol, mod_ad, mod_sr, mod_wave,
- car_misc, car_vol, car_ad, car_sr, car_wave, feedback, keyoff,
- portamento, glide, finetune, vibrato, vibdelay, mod_trem, car_trem,
- tremwait, arpeggio, arp_tab12;
- unsigned short	start, size;
- unsigned char	fms;
- unsigned short	transp;
- unsigned char	midinst, midvelo, midkey, midtrans, middum1, middum2;
- } SoundBank;
-
- typedef struct {
- unsigned short	gototune, lasttune, packpos;
- unsigned char	finetune, glideto, portspeed, nextvol, volmod, volcar,
- vibwait, vibspeed, vibrate, trmstay, trmwait, trmspeed, trmrate, trmcount,
- trcwait, trcspeed, trcrate, trccount, arp_size, arp_speed, keycount,
- vibcount, arp_pos, arp_count, packwait, arp_tab12;
-
- struct {
- unsigned char	chandelay, sound;
- unsigned short	high;
- } chancheat;
- } Channel;
-
- typedef struct {
- unsigned short	patnum;
- unsigned char	transpose;
- } Position;
-
- static const unsigned short	frequency;
- static const unsigned char	vibtab, tremtab;
- static const unsigned short	maxsound, maxpos;
-
- SoundBank		*soundbank;
- Channel		channel9;
- Position		*positions;
- unsigned char		fmchip0xff, jumping, fadeonoff, allvolume, hardfade,
- tempo_now, pattplay, tempo, regbd, chandelay9, mode, pattlen;
- unsigned short	posplay, jumppos, *patterns, speed;
- bool			playing, songlooped;
- unsigned int		numpatch, numposi, mainvolume;
-
- void		playsound(int inst_number, int channel_number, int tunehigh);
- inline void	setregs(unsigned char reg, unsigned char val);
- inline void	setregs_adv(unsigned char reg, unsigned char mask,
-			 unsigned char val);
-};

audacious-plugins-3.6.2-gtk3.tar.bz2/src/adplug/core/mad.cc Deleted

@@ -1,146 +0,0 @@
-/*
- Adplug - Replayer for many OPL2/OPL3 audio file formats.
- Copyright (C) 1999 - 2003 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
-
- mad.cpp - MAD loader by Riven the Mage <riven@ok.ru>
-*/
-
-#include <string.h>
-
-#include "mad.h"
-
-/* -------- Public Methods -------------------------------- */
-
-CPlayer *
-CmadLoader::factory (Copl * newopl)
-{
- return new CmadLoader (newopl);
-}
-
-bool
-CmadLoader::load (VFSFile & fd, const CFileProvider & fp)
-{
- binistream *f = fp.open (fd);
- if (!f)
- return false;
- const unsigned char conv_inst10 = { 2, 1, 10, 9, 4, 3, 6, 5, 8, 7 };
- unsigned int i, j, k, t = 0;
-
- // 'MAD+' - signed ?
- char id4;
- f->readString (id, 4);
- if (strncmp (id, "MAD+", 4))
- {
- fp.close (f);
- return false;
- }
-
- // load instruments
- for (i = 0; i < 9; i++)
- {
- f->readString (instrumentsi.name, 8);
- for (j = 0; j < 12; j++)
- instrumentsi.dataj = f->readInt (1);
- }
-
- f->ignore (1);
-
- // data for Protracker
- length = f->readInt (1);
- nop = f->readInt (1);
- timer = f->readInt (1);
-
- // init CmodPlayer
- realloc_instruments (9);
- realloc_order (length);
- realloc_patterns (nop, 32, 9);
- init_trackord ();
-
- // load tracks
- for (i = 0; i < nop; i++)
- for (k = 0; k < 32; k++)
- for (j = 0; j < 9; j++)
- {
- t = i * 9 + j;
-
- // read event
- unsigned char event = f->readInt (1);
-
- // convert event
- if (event < 0x61)
- trackstk.note = event;
- if (event == 0xFF) // 0xFF: Release note
- trackstk.command = 8;
- if (event == 0xFE) // 0xFE: Pattern Break
- trackstk.command = 13;
- }
-
- // load order
- for (i = 0; i < length; i++)
- orderi = f->readInt (1) - 1;
-
- fp.close (f);
-
- // convert instruments
- for (i = 0; i < 9; i++)
- for (j = 0; j < 10; j++)
- insti.dataconv_instj = instrumentsi.dataj;
-
- // data for Protracker
- restartpos = 0;
- initspeed = 1;
-
- rewind (0);
- return true;
-}
-
-void
-CmadLoader::rewind (int subsong)
-{
- CmodPlayer::rewind (subsong);
-
- // default instruments
- for (int i = 0; i < 9; i++)
- {
- channeli.inst = i;
-
- channeli.vol1 = 63 - (insti.data10 & 63);
- channeli.vol2 = 63 - (insti.data9 & 63);
- }
-}
-
-float
-CmadLoader::getrefresh ()
-{
- return (float) timer;
-}
-
-std::string CmadLoader::gettype ()
-{
- return std::string ("Mlat Adlib Tracker");
-}
-
-std::string CmadLoader::getinstrument (unsigned int n)
-{
- return std::string (instrumentsn.name, 8);
-}
-
-unsigned int
-CmadLoader::getinstruments ()
-{
- return 9;
-}

audacious-plugins-3.6.2-gtk3.tar.bz2/src/adplug/core/mad.h Deleted

@@ -1,48 +0,0 @@
-/*
- Adplug - Replayer for many OPL2/OPL3 audio file formats.
- Copyright (C) 1999 - 2003 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
-
- mad.h - MAD loader by Riven the Mage <riven@ok.ru>
-*/
-
-#include "protrack.h"
-
-class CmadLoader: public CmodPlayer
-{
-public:
-	static CPlayer *factory(Copl *newopl);
-
-	CmadLoader(Copl *newopl) : CmodPlayer(newopl) { };
-
-	bool	load(VFSFile &fd, const CFileProvider &fp);
-	void	rewind(int subsong);
-	float	getrefresh();
-
-	std::string	gettype();
-	std::string	getinstrument(unsigned int n);
-	unsigned int	getinstruments();
-
-private:
-
-	struct mad_instrument
-	{
-	 char name8;
-	 unsigned char data12; // last two unused
-	} instruments9;
-
-	unsigned char timer;
-};

audacious-plugins-3.6.2-gtk3.tar.bz2/src/adplug/core/mid.cc Deleted

@@ -1,1101 +0,0 @@
-/*
- * Adplug - Replayer for many OPL2/OPL3 audio file formats.
- * Copyright (C) 1999 - 2005 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
- *
- *
- * MIDI & MIDI-like file player - Last Update: 10/15/2005
- * by Phil Hassey - www.imitationpickles.org
- * philhassey@hotmail.com
- *
- * Can play the following
- * .LAA - a raw save of a Lucas Arts Adlib music
- * or
- * a raw save of a LucasFilm Adlib music
- * .SCI - the sierra "midi" format.
- * Files must be in the form
- * xxxNAME.sci
- * So that the loader can load the right patch file:
- * xxxPATCH.003 (patch.003 must be saved from the
- * sierra resource from each game.)
- *
- * Other acknowledgements:
- * Allegro - for the midi instruments and the midi volume table
- * SCUMM Revisited - for getting the .LAA / .MIDs out of those
- * LucasArts files.
- * FreeSCI - for some information on the sci music files
- * SD - the SCI Decoder (to get all .sci out of the Sierra files)
- */
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <math.h>
-#include <string.h>
-#include "mid.h"
-#include "mididata.h"
-
-/*#define TESTING*/
-#ifdef TESTING
-#define midiprintf printf
-#else
-void
-CmidPlayer::midiprintf (const char *format, ...)
-{
-}
-#endif
-
-#define LUCAS_STYLE 1
-#define CMF_STYLE 2
-#define MIDI_STYLE 4
-#define SIERRA_STYLE 8
-
-// AdLib melodic and rhythm mode defines
-#define ADLIB_MELODIC	0
-#define ADLIB_RYTHM	1
-
-// File types
-#define FILE_LUCAS 1
-#define FILE_MIDI 2
-#define FILE_CMF 3
-#define FILE_SIERRA 4
-#define FILE_ADVSIERRA 5
-#define FILE_OLDLUCAS 6
-
-// AdLib standard operator table
-const unsigned char
-CmidPlayer::adlib_opadd =
- { 0x00, 0x01, 0x02, 0x08, 0x09, 0x0A, 0x10, 0x11, 0x12 };
-
-// dunno
-const int
-CmidPlayer::ops =
- { 0x20, 0x20, 0x40, 0x40, 0x60, 0x60, 0x80, 0x80, 0xe0, 0xe0, 0xc0 };
-
-// map CMF drum channels 12 - 15 to corresponding AdLib drum operators
-// bass drum (channel 11) not mapped, cause it's handled like a normal instrument
-const int
-CmidPlayer::map_chan = { 0x14, 0x12, 0x15, 0x11 };
-
-// Standard AdLib frequency table
-const int
-CmidPlayer::fnums =
- { 0x16b, 0x181, 0x198, 0x1b0, 0x1ca, 0x1e5, 0x202, 0x220, 0x241, 0x263,
-0x287, 0x2ae };
-
-// Map CMF drum channels 11 - 15 to corresponding AdLib drum channels
-const int
-CmidPlayer::percussion_map = { 6, 7, 8, 8, 7 };
-
-CPlayer *
-CmidPlayer::factory (Copl * newopl)
-{
- return new CmidPlayer (newopl);
-}
-
-CmidPlayer::CmidPlayer (Copl * newopl):CPlayer (newopl), author (&emptystr), title (&emptystr), remarks (&emptystr),
-emptystr ('\0'), flen (0), data (0)
-{
-}
-
-unsigned char
-CmidPlayer::datalook (long pos)
-{
- if (pos < 0 || pos >= flen)
- return (0);
- return (datapos);
-}
-
-unsigned long
-CmidPlayer::getnexti (unsigned long num)
-{
- unsigned long v = 0;
- unsigned long i;
-
- for (i = 0; i < num; i++)
- {
- v += (datalook (pos) << (8 * i));
- pos++;
- }
- return (v);
-}
-
-unsigned long
-CmidPlayer::getnext (unsigned long num)
-{
- unsigned long v = 0;
- unsigned long i;
-
- for (i = 0; i < num; i++)
- {
- v <<= 8;
- v += datalook (pos);
- pos++;
- }
- return (v);
-}
-
-unsigned long
-CmidPlayer::getval ()
-{
- int v = 0;
- unsigned char b;
-
- b = (unsigned char) getnext (1);
- v = b & 0x7f;
- while ((b & 0x80) != 0)
- {
- b = (unsigned char) getnext (1);
- v = (v << 7) + (b & 0x7F);
- }
- return (v);
-}
-
-bool
-CmidPlayer::load_sierra_ins (const std::string & fname,
- const CFileProvider & fp)
-{
- long i, j, k, l;
- unsigned char ins28;
- char *pfilename;
- binistream *f;
-
- pfilename = (char *) malloc (fname.length () + 9);
- strcpy (pfilename, fname.c_str ());
- j = 0;
- for (i = strlen (pfilename) - 1; i >= 0; i--)
- if (pfilenamei == '/' || pfilenamei == '\\')
- {
- j = i + 1;
- break;
- }
- sprintf (pfilename + j + 3, "patch.003");
-
- VFSFile instfd (pfilename, "rb");
- f = fp.open (instfd);
- free (pfilename);
- if (!f)
- return false;
-
- f->ignore (2);
- stins = 0;
- for (i = 0; i < 2; i++)
- {
- for (k = 0; k < 48; k++)
- {
- l = i * 48 + k;
- midiprintf ("\n%2ld: ", l);
- for (j = 0; j < 28; j++)
- insj = f->readInt (1);
-
- myinsbankl0 = (ins9 * 0x80) + (ins10 * 0x40) + (ins5 * 0x20) + (ins11 * 0x10) + ins1; //1=ins5
- myinsbankl1 = (ins22 * 0x80) + (ins23 * 0x40) + (ins18 * 0x20) + (ins24 * 0x10) + ins14; //1=ins18
-
- myinsbankl2 = (ins0 << 6) + ins8;
- myinsbankl3 = (ins13 << 6) + ins21;
-
- myinsbankl4 = (ins3 << 4) + ins6;
- myinsbankl5 = (ins16 << 4) + ins19;
- myinsbankl6 = (ins4 << 4) + ins7;
- myinsbankl7 = (ins17 << 4) + ins20;
-
- myinsbankl8 = ins26;
- myinsbankl9 = ins27;
-
- myinsbankl10 = ((ins2 << 1)) + (1 - (ins12 & 1));
- //(ins12 ? 0:1)+((ins2<<1));
-
- for (j = 0; j < 11; j++)
- midiprintf ("%02X ", myinsbanklj);
- stins++;
- }
- f->ignore (2);
- }
-
- fp.close (f);
- memcpy (smyinsbank, myinsbank, 128 * 16);
- return true;
-}
-
-void
-CmidPlayer::sierra_next_section ()
-{
- int i, j;
-
- for (i = 0; i < 16; i++)
- tracki.on = 0;
-
- midiprintf ("\n\nnext adv sierra section:\n");
-
- pos = sierra_pos;
- i = 0;
- j = 0;
- while (i != 0xff)
- {
- getnext (1);
- curtrack = j;
- j++;
- trackcurtrack.on = 1;
- trackcurtrack.spos = getnext (1);
- trackcurtrack.spos += (getnext (1) << 8) + 4; //4 best usually +3? not 0,1,2 or 5
-// trackcurtrack.spos=getnext(1)+(getnext(1)<<8)+4; // dynamite!: doesn't optimize correctly!!
- trackcurtrack.tend = flen; //0xFC will kill it
- trackcurtrack.iwait = 0;
- trackcurtrack.pv = 0;
- midiprintf ("track %u starts at %lx\n", curtrack, trackcurtrack.spos);
-
- getnext (2);
- i = getnext (1);
- }
- getnext (2);
- deltas = 0x20;
- sierra_pos = pos;
- //getch();
-
- fwait = 0;
- doing = 1;
-}
-
-bool
-CmidPlayer::load (VFSFile & fd, const CFileProvider & fp)
-{
- binistream *f = fp.open (fd);
- if (!f)
- return false;
- int good;
- unsigned char s6;
- std::string filename (fd.filename ());
-
- f->readString ((char *) s, 6);
- good = 0;
- subsongs = 0;
- switch (s0)
- {
- case 'A':
- if (s1 == 'D' && s2 == 'L')
- good = FILE_LUCAS;
- break;
- case 0x84:
- if (s1 == 0x00 && load_sierra_ins (filename, fp))
- {
- if (s2 == 0xf0)
- good = FILE_ADVSIERRA;
- else
- good = FILE_SIERRA;
- break;
- }
- default:
- if (s4 == 'A' && s5 == 'D')
- good = FILE_OLDLUCAS;
- break;
- }
-
- if (good != 0)
- subsongs = 1;
- else
- {
- fp.close (f);
- return false;
- }
-
- type = good;
- f->seek (0);
- flen = fp.filesize (f);
- data = new unsigned charflen;
- f->readString ((char *) data, flen);
-
- fp.close (f);
- rewind (0);
- return true;
-}
-
-void
-CmidPlayer::midi_write_adlib (unsigned int r, unsigned char v)
-{
- opl->write (r, v);
- adlib_datar = v;
-}
-
-void
-CmidPlayer::midi_fm_instrument (int voice, unsigned char *inst)
-{
- if ((adlib_style & SIERRA_STYLE) != 0)
- midi_write_adlib (0xbd, 0); //just gotta make sure this happens..
- //'cause who knows when it'll be
- //reset otherwise.
-
-
- midi_write_adlib (0x20 + adlib_opaddvoice, inst0);
- midi_write_adlib (0x23 + adlib_opaddvoice, inst1);
-
- if ((adlib_style & LUCAS_STYLE) != 0)
- {
- midi_write_adlib (0x43 + adlib_opaddvoice, 0x3f);
- if ((inst10 & 1) == 0)
- midi_write_adlib (0x40 + adlib_opaddvoice, inst2);
- else
- midi_write_adlib (0x40 + adlib_opaddvoice, 0x3f);
- }
- else
- {
- if ((adlib_style & SIERRA_STYLE) != 0)
- {
- midi_write_adlib (0x40 + adlib_opaddvoice, inst2);
- midi_write_adlib (0x43 + adlib_opaddvoice, inst3);
- }
- else
- {
- midi_write_adlib (0x40 + adlib_opaddvoice, inst2);
- if ((inst10 & 1) == 0)
- midi_write_adlib (0x43 + adlib_opaddvoice, inst3);
- else
- midi_write_adlib (0x43 + adlib_opaddvoice, 0);
- }
- }
-
- midi_write_adlib (0x60 + adlib_opaddvoice, inst4);
- midi_write_adlib (0x63 + adlib_opaddvoice, inst5);
- midi_write_adlib (0x80 + adlib_opaddvoice, inst6);
- midi_write_adlib (0x83 + adlib_opaddvoice, inst7);
- midi_write_adlib (0xe0 + adlib_opaddvoice, inst8);
- midi_write_adlib (0xe3 + adlib_opaddvoice, inst9);
-
- midi_write_adlib (0xc0 + voice, inst10);
-}
-
-void
-CmidPlayer::midi_fm_percussion (int ch, unsigned char *inst)
-{
- int opadd = map_chanch - 12;
-
- midi_write_adlib (0x20 + opadd, inst0);
- midi_write_adlib (0x40 + opadd, inst2);
- midi_write_adlib (0x60 + opadd, inst4);
- midi_write_adlib (0x80 + opadd, inst6);
- midi_write_adlib (0xe0 + opadd, inst8);
- midi_write_adlib (0xc0 + opadd, inst10);
-}
-
-void
-CmidPlayer::midi_fm_volume (int voice, int volume)
-{
- int vol;
-
- if ((adlib_style & SIERRA_STYLE) == 0) //sierra likes it loud!
- {
- vol = volume >> 2;
-
- if ((adlib_style & LUCAS_STYLE) != 0)
- {
- if ((adlib_data0xc0 + voice & 1) == 1)
- midi_write_adlib (0x40 + adlib_opaddvoice,
- (unsigned char) ((63 - vol) |
- (adlib_data
- 0x40 +
- adlib_opaddvoice & 0xc0)));
- midi_write_adlib (0x43 + adlib_opaddvoice,
- (unsigned char) ((63 - vol) |
- (adlib_data
- 0x43 +
- adlib_opaddvoice & 0xc0)));
- }
- else
- {
- if ((adlib_data0xc0 + voice & 1) == 1)
- midi_write_adlib (0x40 + adlib_opaddvoice,
- (unsigned char) ((63 - vol) |
- (adlib_data
- 0x40 +
- adlib_opaddvoice & 0xc0)));
- midi_write_adlib (0x43 + adlib_opaddvoice,
- (unsigned char) ((63 - vol) |
- (adlib_data
- 0x43 +
- adlib_opaddvoice & 0xc0)));
- }
- }
-}
-
-void
-CmidPlayer::midi_fm_playnote (int voice, int note, int volume)
-{
- int freq = fnumsnote % 12;
- int oct = note / 12;
- int c;
-
- midi_fm_volume (voice, volume);
- midi_write_adlib (0xa0 + voice, (unsigned char) (freq & 0xff));
-
- c = ((freq & 0x300) >> 8) + (oct << 2) + (adlib_mode == ADLIB_MELODIC
- || voice < 6 ? (1 << 5) : 0);
- midi_write_adlib (0xb0 + voice, (unsigned char) c);
-}
-
-void
-CmidPlayer::midi_fm_endnote (int voice)
-{
- //midi_fm_volume(voice,0);
- //midi_write_adlib(0xb0+voice,0);
-
- midi_write_adlib (0xb0 + voice,
- (unsigned char) (adlib_data0xb0 + voice & (255 - 32)));
-}
-
-void
-CmidPlayer::midi_fm_reset ()
-{
- int i;
-
- opl->init ();
-
- for (i = 0; i < 256; i++)
- midi_write_adlib (i, 0);
-
- midi_write_adlib (0x01, 0x20);
- midi_write_adlib (0xBD, 0xc0);
-}
-
-bool
-CmidPlayer::update ()
-{
- long w, v, note, vel, ctrl, nv, x, l, lnum;
- int i = 0, j, c;
- int on, onl, numchan;
- int ret;
-
- if (doing == 1)
- {
- // just get the first wait and ignore it :>
- for (curtrack = 0; curtrack < 16; curtrack++)
- if (trackcurtrack.on)
- {
- pos = trackcurtrack.pos;
- if (type != FILE_SIERRA && type != FILE_ADVSIERRA)
- trackcurtrack.iwait += getval ();
- else
- trackcurtrack.iwait += getnext (1);
- trackcurtrack.pos = pos;
- }
- doing = 0;
- }
-
- iwait = 0;
- ret = 1;
-
- while (iwait == 0 && ret == 1)
- {
- for (curtrack = 0; curtrack < 16; curtrack++)
- if (trackcurtrack.on && trackcurtrack.iwait == 0 &&
- trackcurtrack.pos < trackcurtrack.tend)
- {
- pos = trackcurtrack.pos;
-
- v = getnext (1);
-
- // This is to do implied MIDI events.
- if (v < 0x80)
- {
- v = trackcurtrack.pv;
- pos--;
- }
- trackcurtrack.pv = (unsigned char) v;
-
- c = v & 0x0f;
- midiprintf ("%2lX", v);
- switch (v & 0xf0)
- {
- case 0x80: /*note off */
- note = getnext (1);
- vel = getnext (1);
- for (i = 0; i < 9; i++)
- if (chpi0 == c && chpi1 == note)
- {
- midi_fm_endnote (i);
- chpi0 = -1;
- }
- break;
- case 0x90: /*note on */
- // doing=0;
- note = getnext (1);
- vel = getnext (1);
-
- if (adlib_mode == ADLIB_RYTHM)
- numchan = 6;
- else
- numchan = 9;
-
- if (chc.on != 0)
- {
- for (i = 0; i < 18; i++)
- chpi2++;
-
- if (c < 11 || adlib_mode == ADLIB_MELODIC)
- {
- j = 0;
- on = -1;
- onl = 0;
- for (i = 0; i < numchan; i++)
- if (chpi0 == -1 && chpi2 > onl)
- {
- onl = chpi2;
- on = i;
- j = 1;
- }
-
- if (on == -1)
- {
- onl = 0;
- for (i = 0; i < numchan; i++)
- if (chpi2 > onl)
- {
- onl = chpi2;
- on = i;
- }
- }
-
- if (j == 0)
- midi_fm_endnote (on);
- }
- else
- on = percussion_mapc - 11;
-
- if (vel != 0 && chc.inum >= 0 && chc.inum < 128)
- {
- if (adlib_mode == ADLIB_MELODIC || c < 12)
- midi_fm_instrument (on, chc.ins);
- else
- midi_fm_percussion (c, chc.ins);
-
- if ((adlib_style & MIDI_STYLE) != 0)
- {
- nv = ((chc.vol * vel) / 128);
- if ((adlib_style & LUCAS_STYLE) != 0)
- nv *= 2;
- if (nv > 127)
- nv = 127;
- nv = my_midi_fm_vol_tablenv;
- if ((adlib_style & LUCAS_STYLE) != 0)
- nv = (int) ((float) sqrt ((float) nv) * 11);
- }
- else
- {
- nv = vel;
- }
-
- midi_fm_playnote (on, note + chc.nshift, nv * 2);
- chpon0 = c;
- chpon1 = note;
- chpon2 = 0;
-
- if (adlib_mode == ADLIB_RYTHM && c >= 11)
- {
- midi_write_adlib (0xbd,
- adlib_data0xbd & ~(0x10 >> (c - 11)));
- midi_write_adlib (0xbd,
- adlib_data0xbd | (0x10 >> (c - 11)));
- }
-
- }
- else
- {
- if (vel == 0) //same code as end note
- {
- for (i = 0; i < 9; i++)
- if (chpi0 == c && chpi1 == note)
- {
- // midi_fm_volume(i,0); // really end the note
- midi_fm_endnote (i);
- chpi0 = -1;
- }
- }
- else
- { // i forget what this is for.
- chpon0 = -1;
- chpon2 = 0;
- }
- }
- midiprintf (" %d:%d:%ld:%ld\n", c, chc.inum, note, vel);
- }
- else
- midiprintf ("off");
- break;
- case 0xa0: /*key after touch */
- note = getnext (1);
- vel = getnext (1);
- /* //this might all be good
- for (i=0; i<9; i++)
- if (chpi0==c & chpi1==note)
-
- midi_fm_playnote(i,note+cnotec,my_midi_fm_vol_table(cvolsc*vel)/128*2);
- */
- break;
- case 0xb0: /*control change .. pitch bend? */
- ctrl = getnext (1);
- vel = getnext (1);
-
- switch (ctrl)
- {
- case 0x07:
- midiprintf ("(pb:%d: %ld %ld)", c, ctrl, vel);
- chc.vol = vel;
- midiprintf ("vol");
- break;
- case 0x67:
- midiprintf ("\n\nhere:%ld\n\n", vel);
- if ((adlib_style & CMF_STYLE) != 0)
- {
- adlib_mode = vel;
- if (adlib_mode == ADLIB_RYTHM)
- midi_write_adlib (0xbd, adlib_data0xbd | (1 << 5));
- else
- midi_write_adlib (0xbd, adlib_data0xbd & ~(1 << 5));
- }
- break;
- }
- break;
- case 0xc0: /*patch change */
- x = getnext (1);
- chc.inum = x;
- for (j = 0; j < 11; j++)
- chc.insj = myinsbankchc.inumj;
- break;
- case 0xd0: /*chanel touch */
- x = getnext (1);
- break;
- case 0xe0: /*pitch wheel */
- x = getnext (1);
- x = getnext (1);
- break;
- case 0xf0:
- switch (v)
- {
- case 0xf0:
- case 0xf7: /*sysex */
- l = getval ();
- if (datalook (pos + l) == 0xf7)
- i = 1;
- midiprintf ("{%ld}", l);
- midiprintf ("\n");
-
- if (datalook (pos) == 0x7d &&
- datalook (pos + 1) == 0x10 && datalook (pos + 2) < 16)
- {
- adlib_style = LUCAS_STYLE | MIDI_STYLE;
- for (i = 0; i < l; i++)
- {
- midiprintf ("%x ", datalook (pos + i));
- if ((i - 3) % 10 == 0)
- midiprintf ("\n");
- }
- midiprintf ("\n");
- getnext (1);
- getnext (1);
- c = getnext (1);
- getnext (1);
-
- // getnext(22); //temp
- chc.ins0 =
- (unsigned char) ((getnext (1) << 4) + getnext (1));
- chc.ins2 =
- (unsigned char) (0xff -
- (((getnext (1) << 4) + getnext (1)) & 0x3f));
- chc.ins4 =
- (unsigned char) (0xff - ((getnext (1) << 4) + getnext (1)));
- chc.ins6 =
- (unsigned char) (0xff - ((getnext (1) << 4) + getnext (1)));
- chc.ins8 =
- (unsigned char) ((getnext (1) << 4) + getnext (1));
-
- chc.ins1 =
- (unsigned char) ((getnext (1) << 4) + getnext (1));
- chc.ins3 =
- (unsigned char) (0xff -
- (((getnext (1) << 4) + getnext (1)) & 0x3f));
- chc.ins5 =
- (unsigned char) (0xff - ((getnext (1) << 4) + getnext (1)));
- chc.ins7 =
- (unsigned char) (0xff - ((getnext (1) << 4) + getnext (1)));
- chc.ins9 =
- (unsigned char) ((getnext (1) << 4) + getnext (1));
-
- i = (getnext (1) << 4) + getnext (1);
- chc.ins10 = i;
-
- //if ((i&1)==1) chc.ins10=1;
-
- midiprintf ("\n%d: ", c);
- for (i = 0; i < 11; i++)
- midiprintf ("%2X ", chc.insi);
- getnext (l - 26);
- }
- else
- {
- midiprintf ("\n");
- for (j = 0; j < l; j++)
- midiprintf ("%2lX ", getnext (1));
- }
-
- midiprintf ("\n");
- if (i == 1)
- getnext (1);
- break;
- case 0xf1:
- break;
- case 0xf2:
- getnext (2);
- break;
- case 0xf3:
- getnext (1);
- break;
- case 0xf4:
- break;
- case 0xf5:
- break;
- case 0xf6: /*something */
- case 0xf8:
- case 0xfa:
- case 0xfb:
- case 0xfc:
- //this ends the track for sierra.
- if (type == FILE_SIERRA || type == FILE_ADVSIERRA)
- {
- trackcurtrack.tend = pos;
- midiprintf ("endmark: %lu -- %lx\n", pos, pos);
- }
- break;
- case 0xfe:
- break;
- case 0xfd:
- break;
- case 0xff:
- v = getnext (1);
- l = getval ();
- midiprintf ("\n");
- midiprintf ("{%lX_%lX}", v, l);
- if (v == 0x51)
- {
- lnum = getnext (l);
- msqtr = lnum; /*set tempo */
- midiprintf ("(qtr=%ld)", msqtr);
- }
- else
- {
- for (i = 0; i < l; i++)
- midiprintf ("%2lX ", getnext (1));
- }
- break;
- }
- break;
- default:
- midiprintf ("%lX!", v); /* if we get down here, a error occurred */
- break;
- }
-
- if (pos < trackcurtrack.tend)
- {
- if (type != FILE_SIERRA && type != FILE_ADVSIERRA)
- w = getval ();
- else
- w = getnext (1);
- trackcurtrack.iwait = w;
- /*
- if (w!=0)
- {
- midiprintf("\n<%d>",w);
- f =
- ((float)w/(float)deltas)*((float)msqtr/(float)1000000);
- if (doing==1) f=0; //not playing yet. don't wait yet
- }
- */
- }
- else
- trackcurtrack.iwait = 0;
-
- trackcurtrack.pos = pos;
- }
-
-
- ret = 0; //end of song.
- iwait = 0;
- for (curtrack = 0; curtrack < 16; curtrack++)
- if (trackcurtrack.on == 1 &&
- trackcurtrack.pos < trackcurtrack.tend)
- ret = 1; //not yet..
-
- if (ret == 1)
- {
- iwait = 0xffffff; // bigger than any wait can be!
- for (curtrack = 0; curtrack < 16; curtrack++)
- if (trackcurtrack.on == 1 &&
- trackcurtrack.pos < trackcurtrack.tend &&
- trackcurtrack.iwait < iwait)
- iwait = trackcurtrack.iwait;
- }
- }
-
-
- if (iwait != 0 && ret == 1)
- {
- for (curtrack = 0; curtrack < 16; curtrack++)
- if (trackcurtrack.on)
- trackcurtrack.iwait -= iwait;
-
-
- fwait =
- 1.0f / (((float) iwait / (float) deltas) *
- ((float) msqtr / (float) 1000000));
- }
- else
- fwait = 50; // 1/50th of a second
-
- midiprintf ("\n");
- for (i = 0; i < 16; i++)
- if (tracki.on)
- {
- if (tracki.pos < tracki.tend)
- midiprintf ("<%lu>", tracki.iwait);
- else
- midiprintf ("stop");
- }
-
- /*
- if (ret==0 && type==FILE_ADVSIERRA)
- if (datalook(sierra_pos-2)!=0xff)
- {
- midiprintf ("next sectoin!");
- sierra_next_section(p);
- fwait=50;
- ret=1;
- }
- */
-
- if (ret)
- return true;
- else
- return false;
-}
-
-float
-CmidPlayer::getrefresh ()
-{
- return (fwait > 0.01f ? fwait : 0.01f);
-}
-
-void
-CmidPlayer::rewind (int subsong)
-{
- long i, j, l;
- long o_sierra_pos;
- unsigned char ins16;
-
- pos = 0;
- tins = 0;
- adlib_style = MIDI_STYLE | CMF_STYLE;
- adlib_mode = ADLIB_MELODIC;
- for (i = 0; i < 128; i++)
- for (j = 0; j < 14; j++) // for (j = 0; j < 16; j++)
- myinsbankij = midi_fm_instrumentsij;
- for (i = 0; i < 16; i++)
- {
- chi.inum = 0;
- for (j = 0; j < 11; j++)
- chi.insj = myinsbankchi.inumj;
- chi.vol = 127;
- chi.nshift = -25;
- chi.on = 1;
- }
-
- /* General init */
- for (i = 0; i < 9; i++)
- {
- chpi0 = -1;
- chpi2 = 0;
- }
-
- deltas = 250; // just a number, not a standard
- msqtr = 500000;
- fwait = 123; // gotta be a small thing.. sorta like nothing
- iwait = 0;
-
- subsongs = 1;
-
- for (i = 0; i < 16; i++)
- {
- tracki.tend = 0;
- tracki.spos = 0;
- tracki.pos = 0;
- tracki.iwait = 0;
- tracki.on = 0;
- tracki.pv = 0;
- }
- curtrack = 0;
-
- /* specific to file-type init */
-
- pos = 0;
- i = getnext (1);
- switch (type)
- {
- case FILE_LUCAS:
- getnext (24); //skip junk and get to the midi.
- adlib_style = LUCAS_STYLE | MIDI_STYLE;
- //note: no break, we go right into midi headers...
- case FILE_MIDI:
- if (type != FILE_LUCAS)
- tins = 128;
- getnext (11); /*skip header */
- deltas = getnext (2);
- midiprintf ("deltas:%ld\n", deltas);
- getnext (4);
-
- curtrack = 0;
- trackcurtrack.on = 1;
- trackcurtrack.tend = getnext (4);
- trackcurtrack.spos = pos;
- midiprintf ("tracklen:%lu\n", trackcurtrack.tend);
- break;
- case FILE_OLDLUCAS:
- msqtr = 250000;
- pos = 9;
- deltas = getnext (1);
-
- i = 8;
- pos = 0x19; // jump to instruments
- tins = i;
- for (j = 0; j < i; j++)
- {
- midiprintf ("\n%ld: ", j);
- for (l = 0; l < 16; l++)
- insl = (unsigned char) getnext (1);
-
- myinsbankj10 = ins2;
- myinsbankj0 = ins3;
- myinsbankj2 = ins4;
- myinsbankj4 = ins5;
- myinsbankj6 = ins6;
- myinsbankj8 = ins7;
- myinsbankj1 = ins8;
- myinsbankj3 = ins9;
- myinsbankj5 = ins10;
- myinsbankj7 = ins11;
- myinsbankj9 = ins12;
-
- for (l = 0; l < 11; l++)
- midiprintf ("%2X ", myinsbankjl);
- }
-
- for (i = 0; i < 16; i++)
- {
- if (i < tins)
- {
- chi.inum = i;
- for (j = 0; j < 11; j++)
- chi.insj = myinsbankchi.inumj;
- }
- }
-
- adlib_style = LUCAS_STYLE | MIDI_STYLE;
-
- curtrack = 0;
- trackcurtrack.on = 1;
- trackcurtrack.tend = flen; // music until the end of the file
- trackcurtrack.spos = 0x98; //jump to midi music
- break;
- case FILE_ADVSIERRA:
- memcpy (myinsbank, smyinsbank, 128 * 16);
- tins = stins;
- deltas = 0x20;
- getnext (11); //worthless empty space and "stuff" :)
-
- o_sierra_pos = sierra_pos = pos;
- sierra_next_section ();
- while (datalook (sierra_pos - 2) != 0xff)
- {
- sierra_next_section ();
- subsongs++;
- }
-
- if (subsong < 0 || subsong >= subsongs)
- subsong = 0;
-
- sierra_pos = o_sierra_pos;
- sierra_next_section ();
- i = 0;
- while (i != subsong)
- {
- sierra_next_section ();
- i++;
- }
-
- adlib_style = SIERRA_STYLE | MIDI_STYLE; //advanced sierra tunes use volume
- break;
- case FILE_SIERRA:
- memcpy (myinsbank, smyinsbank, 128 * 16);
- tins = stins;
- getnext (2);
- deltas = 0x20;
-
- curtrack = 0;
- trackcurtrack.on = 1;
- trackcurtrack.tend = flen; // music until the end of the file
-
- for (i = 0; i < 16; i++)
- {
- chi.nshift = -13;
- chi.on = getnext (1);
- chi.inum = getnext (1);
- for (j = 0; j < 11; j++)
- chi.insj = myinsbankchi.inumj;
- }
-
- trackcurtrack.spos = pos;
- adlib_style = SIERRA_STYLE | MIDI_STYLE;
- break;
- }
-
-
-/* sprintf(info,"%s\r\nTicks/Quarter Note: %ld\r\n",info,deltas);
- sprintf(info,"%sms/Quarter Note: %ld",info,msqtr); */
-
- for (i = 0; i < 16; i++)
- if (tracki.on)
- {
- tracki.pos = tracki.spos;
- tracki.pv = 0;
- tracki.iwait = 0;
- }
-
- doing = 1;
- midi_fm_reset ();
-}
-
-std::string CmidPlayer::gettype ()
-{
- switch (type)
- {
- case FILE_LUCAS:
- return std::string ("LucasArts AdLib MIDI");
- case FILE_MIDI:
- return std::string ("General MIDI");
- case FILE_OLDLUCAS:
- return std::string ("Lucasfilm Adlib MIDI");
- case FILE_ADVSIERRA:
- return std::string ("Sierra On-Line VGA MIDI");
- case FILE_SIERRA:
- return std::string ("Sierra On-Line EGA MIDI");
- default:
- return std::string ("MIDI unknown");
- }
-}

audacious-plugins-3.6.2-gtk3.tar.bz2/src/adplug/core/mid.h Deleted

@@ -1,112 +0,0 @@
-/*
- * Adplug - Replayer for many OPL2/OPL3 audio file formats.
- * Copyright (C) 1999 - 2005 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
- *
- * mid.h - LAA, SCI, MID & CMF Player by Philip Hassey <philhassey@hotmail.com>
- */
-
-#include "player.h"
-
-class CmidPlayer: public CPlayer
-{
-public:
- static CPlayer *factory(Copl *newopl);
-
- CmidPlayer(Copl *newopl);
- ~CmidPlayer()
- { if(data) delete data; }
-
- bool load(VFSFile &fd, const CFileProvider &fp);
- bool update();
- void rewind(int subsong);
- float getrefresh();
-
- std::string gettype();
- std::string gettitle()
- { return std::string(title); }
- std::string getauthor()
- { return std::string(author); }
- std::string getdesc()
- { return std::string(remarks); }
- unsigned int getinstruments()
- { return tins; }
- unsigned int getsubsongs()
- { return subsongs; }
-
- protected:
- static const unsigned char adlib_opadd;
- static const int ops, map_chan, fnums, percussion_map;
-
- struct midi_channel {
- int inum;
- unsigned char ins11;
- int vol;
- int nshift;
- int on;
- };
-
- struct midi_track {
- unsigned long tend;
- unsigned long spos;
- unsigned long pos;
- unsigned long iwait;
- int on;
- unsigned char pv;
- };
-
- char *author,*title,*remarks,emptystr;
- long flen;
- unsigned long pos;
- unsigned long sierra_pos; //sierras gotta be special.. :>
- int subsongs;
- unsigned char *data;
-
- unsigned char adlib_data256;
- int adlib_style;
- int adlib_mode;
- unsigned char myinsbank12816, smyinsbank12816;
- midi_channel ch16;
- int chp183;
-
- long deltas;
- long msqtr;
-
- midi_track track16;
- unsigned int curtrack;
-
- float fwait;
- unsigned long iwait;
- int doing;
-
- int type,tins,stins;
-
- private:
- bool load_sierra_ins(const std::string &fname, const CFileProvider &fp);
- void midiprintf(const char *format, ...);
- unsigned char datalook(long pos);
- unsigned long getnexti(unsigned long num);
- unsigned long getnext(unsigned long num);
- unsigned long getval();
- void sierra_next_section();
- void midi_write_adlib(unsigned int r, unsigned char v);
- void midi_fm_instrument(int voice, unsigned char *inst);
- void midi_fm_percussion(int ch, unsigned char *inst);
- void midi_fm_volume(int voice, int volume);
- void midi_fm_playnote(int voice, int note, int volume);
- void midi_fm_endnote(int voice);
- void midi_fm_reset();
-};

audacious-plugins-3.6.2-gtk3.tar.bz2/src/adplug/core/mididata.h Deleted

@@ -1,174 +0,0 @@
-/*
- * Adplug - Replayer for many OPL2/OPL3 audio file formats.
- * Copyright (C) 1999, 2000, 2001 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
- *
- *
- * FM instrument definitions below borrowed from the Allegro library by
- * Phil Hassey, <philhassey@hotmail.com> - see "adplug/players/mid.cpp"
- * for further acknowledgements.
- */
- 
-unsigned char midi_fm_instruments12814 =
-{
-
- /* This set of GM instrument patches was provided by Jorrit Rouwe...
- */
-
- { 0x21, 0x21, 0x8f, 0x0c, 0xf2, 0xf2, 0x45, 0x76, 0x00, 0x00, 0x08, 0, 0, 0 }, /* Acoustic Grand */
- { 0x31, 0x21, 0x4b, 0x09, 0xf2, 0xf2, 0x54, 0x56, 0x00, 0x00, 0x08, 0, 0, 0 }, /* Bright Acoustic */
- { 0x31, 0x21, 0x49, 0x09, 0xf2, 0xf2, 0x55, 0x76, 0x00, 0x00, 0x08, 0, 0, 0 }, /* Electric Grand */
- { 0xb1, 0x61, 0x0e, 0x09, 0xf2, 0xf3, 0x3b, 0x0b, 0x00, 0x00, 0x06, 0, 0, 0 }, /* Honky-Tonk */
- { 0x01, 0x21, 0x57, 0x09, 0xf1, 0xf1, 0x38, 0x28, 0x00, 0x00, 0x00, 0, 0, 0 }, /* Electric Piano 1 */
- { 0x01, 0x21, 0x93, 0x09, 0xf1, 0xf1, 0x38, 0x28, 0x00, 0x00, 0x00, 0, 0, 0 }, /* Electric Piano 2 */
- { 0x21, 0x36, 0x80, 0x17, 0xa2, 0xf1, 0x01, 0xd5, 0x00, 0x00, 0x08, 0, 0, 0 }, /* Harpsichord */
- { 0x01, 0x01, 0x92, 0x09, 0xc2, 0xc2, 0xa8, 0x58, 0x00, 0x00, 0x0a, 0, 0, 0 }, /* Clav */
- { 0x0c, 0x81, 0x5c, 0x09, 0xf6, 0xf3, 0x54, 0xb5, 0x00, 0x00, 0x00, 0, 0, 0 }, /* Celesta */
- { 0x07, 0x11, 0x97, 0x89, 0xf6, 0xf5, 0x32, 0x11, 0x00, 0x00, 0x02, 0, 0, 0 }, /* Glockenspiel */
- { 0x17, 0x01, 0x21, 0x09, 0x56, 0xf6, 0x04, 0x04, 0x00, 0x00, 0x02, 0, 0, 0 }, /* Music Box */
- { 0x18, 0x81, 0x62, 0x09, 0xf3, 0xf2, 0xe6, 0xf6, 0x00, 0x00, 0x00, 0, 0, 0 }, /* Vibraphone */
- { 0x18, 0x21, 0x23, 0x09, 0xf7, 0xe5, 0x55, 0xd8, 0x00, 0x00, 0x00, 0, 0, 0 }, /* Marimba */
- { 0x15, 0x01, 0x91, 0x09, 0xf6, 0xf6, 0xa6, 0xe6, 0x00, 0x00, 0x04, 0, 0, 0 }, /* Xylophone */
- { 0x45, 0x81, 0x59, 0x89, 0xd3, 0xa3, 0x82, 0xe3, 0x00, 0x00, 0x0c, 0, 0, 0 }, /* Tubular Bells */
- { 0x03, 0x81, 0x49, 0x89, 0x74, 0xb3, 0x55, 0x05, 0x01, 0x00, 0x04, 0, 0, 0 }, /* Dulcimer */
- { 0x71, 0x31, 0x92, 0x09, 0xf6, 0xf1, 0x14, 0x07, 0x00, 0x00, 0x02, 0, 0, 0 }, /* Drawbar Organ */
- { 0x72, 0x30, 0x14, 0x09, 0xc7, 0xc7, 0x58, 0x08, 0x00, 0x00, 0x02, 0, 0, 0 }, /* Percussive Organ */
- { 0x70, 0xb1, 0x44, 0x09, 0xaa, 0x8a, 0x18, 0x08, 0x00, 0x00, 0x04, 0, 0, 0 }, /* Rock Organ */
- { 0x23, 0xb1, 0x93, 0x09, 0x97, 0x55, 0x23, 0x14, 0x01, 0x00, 0x04, 0, 0, 0 }, /* Church Organ */
- { 0x61, 0xb1, 0x13, 0x89, 0x97, 0x55, 0x04, 0x04, 0x01, 0x00, 0x00, 0, 0, 0 }, /* Reed Organ */
- { 0x24, 0xb1, 0x48, 0x09, 0x98, 0x46, 0x2a, 0x1a, 0x01, 0x00, 0x0c, 0, 0, 0 }, /* Accoridan */
- { 0x61, 0x21, 0x13, 0x09, 0x91, 0x61, 0x06, 0x07, 0x01, 0x00, 0x0a, 0, 0, 0 }, /* Harmonica */
- { 0x21, 0xa1, 0x13, 0x92, 0x71, 0x61, 0x06, 0x07, 0x00, 0x00, 0x06, 0, 0, 0 }, /* Tango Accordian */
- { 0x02, 0x41, 0x9c, 0x89, 0xf3, 0xf3, 0x94, 0xc8, 0x01, 0x00, 0x0c, 0, 0, 0 }, /* Acoustic Guitar(nylon) */
- { 0x03, 0x11, 0x54, 0x09, 0xf3, 0xf1, 0x9a, 0xe7, 0x01, 0x00, 0x0c, 0, 0, 0 }, /* Acoustic Guitar(steel) */
- { 0x23, 0x21, 0x5f, 0x09, 0xf1, 0xf2, 0x3a, 0xf8, 0x00, 0x00, 0x00, 0, 0, 0 }, /* Electric Guitar(jazz) */
- { 0x03, 0x21, 0x87, 0x89, 0xf6, 0xf3, 0x22, 0xf8, 0x01, 0x00, 0x06, 0, 0, 0 }, /* Electric Guitar(clean) */
- { 0x03, 0x21, 0x47, 0x09, 0xf9, 0xf6, 0x54, 0x3a, 0x00, 0x00, 0x00, 0, 0, 0 }, /* Electric Guitar(muted) */
- { 0x23, 0x21, 0x4a, 0x0e, 0x91, 0x84, 0x41, 0x19, 0x01, 0x00, 0x08, 0, 0, 0 }, /* Overdriven Guitar */
- { 0x23, 0x21, 0x4a, 0x09, 0x95, 0x94, 0x19, 0x19, 0x01, 0x00, 0x08, 0, 0, 0 }, /* Distortion Guitar */
- { 0x09, 0x84, 0xa1, 0x89, 0x20, 0xd1, 0x4f, 0xf8, 0x00, 0x00, 0x08, 0, 0, 0 }, /* Guitar Harmonics */
- { 0x21, 0xa2, 0x1e, 0x09, 0x94, 0xc3, 0x06, 0xa6, 0x00, 0x00, 0x02, 0, 0, 0 }, /* Acoustic Bass */
- { 0x31, 0x31, 0x12, 0x09, 0xf1, 0xf1, 0x28, 0x18, 0x00, 0x00, 0x0a, 0, 0, 0 }, /* Electric Bass(finger) */
- { 0x31, 0x31, 0x8d, 0x09, 0xf1, 0xf1, 0xe8, 0x78, 0x00, 0x00, 0x0a, 0, 0, 0 }, /* Electric Bass(pick) */
- { 0x31, 0x32, 0x5b, 0x09, 0x51, 0x71, 0x28, 0x48, 0x00, 0x00, 0x0c, 0, 0, 0 }, /* Fretless Bass */
- { 0x01, 0x21, 0x8b, 0x49, 0xa1, 0xf2, 0x9a, 0xdf, 0x00, 0x00, 0x08, 0, 0, 0 }, /* Slap Bass 1 */
- { 0x21, 0x21, 0x8b, 0x11, 0xa2, 0xa1, 0x16, 0xdf, 0x00, 0x00, 0x08, 0, 0, 0 }, /* Slap Bass 2 */
- { 0x31, 0x31, 0x8b, 0x09, 0xf4, 0xf1, 0xe8, 0x78, 0x00, 0x00, 0x0a, 0, 0, 0 }, /* Synth Bass 1 */
- { 0x31, 0x31, 0x12, 0x09, 0xf1, 0xf1, 0x28, 0x18, 0x00, 0x00, 0x0a, 0, 0, 0 }, /* Synth Bass 2 */
- { 0x31, 0x21, 0x15, 0x09, 0xdd, 0x56, 0x13, 0x26, 0x01, 0x00, 0x08, 0, 0, 0 }, /* Violin */
- { 0x31, 0x21, 0x16, 0x09, 0xdd, 0x66, 0x13, 0x06, 0x01, 0x00, 0x08, 0, 0, 0 }, /* Viola */
- { 0x71, 0x31, 0x49, 0x09, 0xd1, 0x61, 0x1c, 0x0c, 0x01, 0x00, 0x08, 0, 0, 0 }, /* Cello */
- { 0x21, 0x23, 0x4d, 0x89, 0x71, 0x72, 0x12, 0x06, 0x01, 0x00, 0x02, 0, 0, 0 }, /* Contrabass */
- { 0xf1, 0xe1, 0x40, 0x09, 0xf1, 0x6f, 0x21, 0x16, 0x01, 0x00, 0x02, 0, 0, 0 }, /* Tremolo Strings */
- { 0x02, 0x01, 0x1a, 0x89, 0xf5, 0x85, 0x75, 0x35, 0x01, 0x00, 0x00, 0, 0, 0 }, /* Pizzicato Strings */
- { 0x02, 0x01, 0x1d, 0x89, 0xf5, 0xf3, 0x75, 0xf4, 0x01, 0x00, 0x00, 0, 0, 0 }, /* Orchestral Strings */
- { 0x10, 0x11, 0x41, 0x09, 0xf5, 0xf2, 0x05, 0xc3, 0x01, 0x00, 0x02, 0, 0, 0 }, /* Timpani */
- { 0x21, 0xa2, 0x9b, 0x0a, 0xb1, 0x72, 0x25, 0x08, 0x01, 0x00, 0x0e, 0, 0, 0 }, /* String Ensemble 1 */
- { 0xa1, 0x21, 0x98, 0x09, 0x7f, 0x3f, 0x03, 0x07, 0x01, 0x01, 0x00, 0, 0, 0 }, /* String Ensemble 2 */
- { 0xa1, 0x61, 0x93, 0x09, 0xc1, 0x4f, 0x12, 0x05, 0x00, 0x00, 0x0a, 0, 0, 0 }, /* SynthStrings 1 */
- { 0x21, 0x61, 0x18, 0x09, 0xc1, 0x4f, 0x22, 0x05, 0x00, 0x00, 0x0c, 0, 0, 0 }, /* SynthStrings 2 */
- { 0x31, 0x72, 0x5b, 0x8c, 0xf4, 0x8a, 0x15, 0x05, 0x00, 0x00, 0x00, 0, 0, 0 }, /* Choir Aahs */
- { 0xa1, 0x61, 0x90, 0x09, 0x74, 0x71, 0x39, 0x67, 0x00, 0x00, 0x00, 0, 0, 0 }, /* Voice Oohs */
- { 0x71, 0x72, 0x57, 0x09, 0x54, 0x7a, 0x05, 0x05, 0x00, 0x00, 0x0c, 0, 0, 0 }, /* Synth Voice */
- { 0x90, 0x41, 0x00, 0x09, 0x54, 0xa5, 0x63, 0x45, 0x00, 0x00, 0x08, 0, 0, 0 }, /* Orchestra Hit */
- { 0x21, 0x21, 0x92, 0x0a, 0x85, 0x8f, 0x17, 0x09, 0x00, 0x00, 0x0c, 0, 0, 0 }, /* Trumpet */
- { 0x21, 0x21, 0x94, 0x0e, 0x75, 0x8f, 0x17, 0x09, 0x00, 0x00, 0x0c, 0, 0, 0 }, /* Trombone */
- { 0x21, 0x61, 0x94, 0x09, 0x76, 0x82, 0x15, 0x37, 0x00, 0x00, 0x0c, 0, 0, 0 }, /* Tuba */
- { 0x31, 0x21, 0x43, 0x09, 0x9e, 0x62, 0x17, 0x2c, 0x01, 0x01, 0x02, 0, 0, 0 }, /* Muted Trumpet */
- { 0x21, 0x21, 0x9b, 0x09, 0x61, 0x7f, 0x6a, 0x0a, 0x00, 0x00, 0x02, 0, 0, 0 }, /* French Horn */
- { 0x61, 0x22, 0x8a, 0x0f, 0x75, 0x74, 0x1f, 0x0f, 0x00, 0x00, 0x08, 0, 0, 0 }, /* Brass Section */
- { 0xa1, 0x21, 0x86, 0x8c, 0x72, 0x71, 0x55, 0x18, 0x01, 0x00, 0x00, 0, 0, 0 }, /* SynthBrass 1 */
- { 0x21, 0x21, 0x4d, 0x09, 0x54, 0xa6, 0x3c, 0x1c, 0x00, 0x00, 0x08, 0, 0, 0 }, /* SynthBrass 2 */
- { 0x31, 0x61, 0x8f, 0x09, 0x93, 0x72, 0x02, 0x0b, 0x01, 0x00, 0x08, 0, 0, 0 }, /* Soprano Sax */
- { 0x31, 0x61, 0x8e, 0x09, 0x93, 0x72, 0x03, 0x09, 0x01, 0x00, 0x08, 0, 0, 0 }, /* Alto Sax */
- { 0x31, 0x61, 0x91, 0x09, 0x93, 0x82, 0x03, 0x09, 0x01, 0x00, 0x0a, 0, 0, 0 }, /* Tenor Sax */
- { 0x31, 0x61, 0x8e, 0x09, 0x93, 0x72, 0x0f, 0x0f, 0x01, 0x00, 0x0a, 0, 0, 0 }, /* Baritone Sax */
- { 0x21, 0x21, 0x4b, 0x09, 0xaa, 0x8f, 0x16, 0x0a, 0x01, 0x00, 0x08, 0, 0, 0 }, /* Oboe */
- { 0x31, 0x21, 0x90, 0x09, 0x7e, 0x8b, 0x17, 0x0c, 0x01, 0x01, 0x06, 0, 0, 0 }, /* English Horn */
- { 0x31, 0x32, 0x81, 0x09, 0x75, 0x61, 0x19, 0x19, 0x01, 0x00, 0x00, 0, 0, 0 }, /* Bassoon */
- { 0x32, 0x21, 0x90, 0x09, 0x9b, 0x72, 0x21, 0x17, 0x00, 0x00, 0x04, 0, 0, 0 }, /* Clarinet */
- { 0xe1, 0xe1, 0x1f, 0x09, 0x85, 0x65, 0x5f, 0x1a, 0x00, 0x00, 0x00, 0, 0, 0 }, /* Piccolo */
- { 0xe1, 0xe1, 0x46, 0x09, 0x88, 0x65, 0x5f, 0x1a, 0x00, 0x00, 0x00, 0, 0, 0 }, /* Flute */
- { 0xa1, 0x21, 0x9c, 0x09, 0x75, 0x75, 0x1f, 0x0a, 0x00, 0x00, 0x02, 0, 0, 0 }, /* Recorder */
- { 0x31, 0x21, 0x8b, 0x09, 0x84, 0x65, 0x58, 0x1a, 0x00, 0x00, 0x00, 0, 0, 0 }, /* Pan Flute */
- { 0xe1, 0xa1, 0x4c, 0x09, 0x66, 0x65, 0x56, 0x26, 0x00, 0x00, 0x00, 0, 0, 0 }, /* Blown Bottle */
- { 0x62, 0xa1, 0xcb, 0x09, 0x76, 0x55, 0x46, 0x36, 0x00, 0x00, 0x00, 0, 0, 0 }, /* Skakuhachi */
- { 0x62, 0xa1, 0xa2, 0x09, 0x57, 0x56, 0x07, 0x07, 0x00, 0x00, 0x0b, 0, 0, 0 }, /* Whistle */
- { 0x62, 0xa1, 0x9c, 0x09, 0x77, 0x76, 0x07, 0x07, 0x00, 0x00, 0x0b, 0, 0, 0 }, /* Ocarina */
- { 0x22, 0x21, 0x59, 0x09, 0xff, 0xff, 0x03, 0x0f, 0x02, 0x00, 0x00, 0, 0, 0 }, /* Lead 1 (square) */
- { 0x21, 0x21, 0x0e, 0x09, 0xff, 0xff, 0x0f, 0x0f, 0x01, 0x01, 0x00, 0, 0, 0 }, /* Lead 2 (sawtooth) */
- { 0x22, 0x21, 0x46, 0x89, 0x86, 0x64, 0x55, 0x18, 0x00, 0x00, 0x00, 0, 0, 0 }, /* Lead 3 (calliope) */
- { 0x21, 0xa1, 0x45, 0x09, 0x66, 0x96, 0x12, 0x0a, 0x00, 0x00, 0x00, 0, 0, 0 }, /* Lead 4 (chiff) */
- { 0x21, 0x22, 0x8b, 0x09, 0x92, 0x91, 0x2a, 0x2a, 0x01, 0x00, 0x00, 0, 0, 0 }, /* Lead 5 (charang) */
- { 0xa2, 0x61, 0x9e, 0x49, 0xdf, 0x6f, 0x05, 0x07, 0x00, 0x00, 0x02, 0, 0, 0 }, /* Lead 6 (voice) */
- { 0x20, 0x60, 0x1a, 0x09, 0xef, 0x8f, 0x01, 0x06, 0x00, 0x02, 0x00, 0, 0, 0 }, /* Lead 7 (fifths) */
- { 0x21, 0x21, 0x8f, 0x86, 0xf1, 0xf4, 0x29, 0x09, 0x00, 0x00, 0x0a, 0, 0, 0 }, /* Lead 8 (bass+lead) */
- { 0x77, 0xa1, 0xa5, 0x09, 0x53, 0xa0, 0x94, 0x05, 0x00, 0x00, 0x02, 0, 0, 0 }, /* Pad 1 (new age) */
- { 0x61, 0xb1, 0x1f, 0x89, 0xa8, 0x25, 0x11, 0x03, 0x00, 0x00, 0x0a, 0, 0, 0 }, /* Pad 2 (warm) */
- { 0x61, 0x61, 0x17, 0x09, 0x91, 0x55, 0x34, 0x16, 0x00, 0x00, 0x0c, 0, 0, 0 }, /* Pad 3 (polysynth) */
- { 0x71, 0x72, 0x5d, 0x09, 0x54, 0x6a, 0x01, 0x03, 0x00, 0x00, 0x00, 0, 0, 0 }, /* Pad 4 (choir) */
- { 0x21, 0xa2, 0x97, 0x09, 0x21, 0x42, 0x43, 0x35, 0x00, 0x00, 0x08, 0, 0, 0 }, /* Pad 5 (bowed) */
- { 0xa1, 0x21, 0x1c, 0x09, 0xa1, 0x31, 0x77, 0x47, 0x01, 0x01, 0x00, 0, 0, 0 }, /* Pad 6 (metallic) */
- { 0x21, 0x61, 0x89, 0x0c, 0x11, 0x42, 0x33, 0x25, 0x00, 0x00, 0x0a, 0, 0, 0 }, /* Pad 7 (halo) */
- { 0xa1, 0x21, 0x15, 0x09, 0x11, 0xcf, 0x47, 0x07, 0x01, 0x00, 0x00, 0, 0, 0 }, /* Pad 8 (sweep) */
- { 0x3a, 0x51, 0xce, 0x09, 0xf8, 0x86, 0xf6, 0x02, 0x00, 0x00, 0x02, 0, 0, 0 }, /* FX 1 (rain) */
- { 0x21, 0x21, 0x15, 0x09, 0x21, 0x41, 0x23, 0x13, 0x01, 0x00, 0x00, 0, 0, 0 }, /* FX 2 (soundtrack) */
- { 0x06, 0x01, 0x5b, 0x09, 0x74, 0xa5, 0x95, 0x72, 0x00, 0x00, 0x00, 0, 0, 0 }, /* FX 3 (crystal) */
- { 0x22, 0x61, 0x92, 0x8c, 0xb1, 0xf2, 0x81, 0x26, 0x00, 0x00, 0x0c, 0, 0, 0 }, /* FX 4 (atmosphere) */
- { 0x41, 0x42, 0x4d, 0x09, 0xf1, 0xf2, 0x51, 0xf5, 0x01, 0x00, 0x00, 0, 0, 0 }, /* FX 5 (brightness) */
- { 0x61, 0xa3, 0x94, 0x89, 0x11, 0x11, 0x51, 0x13, 0x01, 0x00, 0x06, 0, 0, 0 }, /* FX 6 (goblins) */
- { 0x61, 0xa1, 0x8c, 0x89, 0x11, 0x1d, 0x31, 0x03, 0x00, 0x00, 0x06, 0, 0, 0 }, /* FX 7 (echoes) */
- { 0xa4, 0x61, 0x4c, 0x09, 0xf3, 0x81, 0x73, 0x23, 0x01, 0x00, 0x04, 0, 0, 0 }, /* FX 8 (sci-fi) */
- { 0x02, 0x07, 0x85, 0x0c, 0xd2, 0xf2, 0x53, 0xf6, 0x00, 0x01, 0x00, 0, 0, 0 }, /* Sitar */
- { 0x11, 0x13, 0x0c, 0x89, 0xa3, 0xa2, 0x11, 0xe5, 0x01, 0x00, 0x00, 0, 0, 0 }, /* Banjo */
- { 0x11, 0x11, 0x06, 0x09, 0xf6, 0xf2, 0x41, 0xe6, 0x01, 0x02, 0x04, 0, 0, 0 }, /* Shamisen */
- { 0x93, 0x91, 0x91, 0x09, 0xd4, 0xeb, 0x32, 0x11, 0x00, 0x01, 0x08, 0, 0, 0 }, /* Koto */
- { 0x04, 0x01, 0x4f, 0x09, 0xfa, 0xc2, 0x56, 0x05, 0x00, 0x00, 0x0c, 0, 0, 0 }, /* Kalimba */
- { 0x21, 0x22, 0x49, 0x09, 0x7c, 0x6f, 0x20, 0x0c, 0x00, 0x01, 0x06, 0, 0, 0 }, /* Bagpipe */
- { 0x31, 0x21, 0x85, 0x09, 0xdd, 0x56, 0x33, 0x16, 0x01, 0x00, 0x0a, 0, 0, 0 }, /* Fiddle */
- { 0x20, 0x21, 0x04, 0x8a, 0xda, 0x8f, 0x05, 0x0b, 0x02, 0x00, 0x06, 0, 0, 0 }, /* Shanai */
- { 0x05, 0x03, 0x6a, 0x89, 0xf1, 0xc3, 0xe5, 0xe5, 0x00, 0x00, 0x06, 0, 0, 0 }, /* Tinkle Bell */
- { 0x07, 0x02, 0x15, 0x09, 0xec, 0xf8, 0x26, 0x16, 0x00, 0x00, 0x0a, 0, 0, 0 }, /* Agogo */
- { 0x05, 0x01, 0x9d, 0x09, 0x67, 0xdf, 0x35, 0x05, 0x00, 0x00, 0x08, 0, 0, 0 }, /* Steel Drums */
- { 0x18, 0x12, 0x96, 0x09, 0xfa, 0xf8, 0x28, 0xe5, 0x00, 0x00, 0x0a, 0, 0, 0 }, /* Woodblock */
- { 0x10, 0x00, 0x86, 0x0c, 0xa8, 0xfa, 0x07, 0x03, 0x00, 0x00, 0x06, 0, 0, 0 }, /* Taiko Drum */
- { 0x11, 0x10, 0x41, 0x0c, 0xf8, 0xf3, 0x47, 0x03, 0x02, 0x00, 0x04, 0, 0, 0 }, /* Melodic Tom */
- { 0x01, 0x10, 0x8e, 0x09, 0xf1, 0xf3, 0x06, 0x02, 0x02, 0x00, 0x0e, 0, 0, 0 }, /* Synth Drum */
- { 0x0e, 0xc0, 0x00, 0x09, 0x1f, 0x1f, 0x00, 0xff, 0x00, 0x03, 0x0e, 0, 0, 0 }, /* Reverse Cymbal */
- { 0x06, 0x03, 0x80, 0x91, 0xf8, 0x56, 0x24, 0x84, 0x00, 0x02, 0x0e, 0, 0, 0 }, /* Guitar Fret Noise */
- { 0x0e, 0xd0, 0x00, 0x0e, 0xf8, 0x34, 0x00, 0x04, 0x00, 0x03, 0x0e, 0, 0, 0 }, /* Breath Noise */
- { 0x0e, 0xc0, 0x00, 0x09, 0xf6, 0x1f, 0x00, 0x02, 0x00, 0x03, 0x0e, 0, 0, 0 }, /* Seashore */
- { 0xd5, 0xda, 0x95, 0x49, 0x37, 0x56, 0xa3, 0x37, 0x00, 0x00, 0x00, 0, 0, 0 }, /* Bird Tweet */
- { 0x35, 0x14, 0x5c, 0x11, 0xb2, 0xf4, 0x61, 0x15, 0x02, 0x00, 0x0a, 0, 0, 0 }, /* Telephone ring */
- { 0x0e, 0xd0, 0x00, 0x09, 0xf6, 0x4f, 0x00, 0xf5, 0x00, 0x03, 0x0e, 0, 0, 0 }, /* Helicopter */
- { 0x26, 0xe4, 0x00, 0x09, 0xff, 0x12, 0x01, 0x16, 0x00, 0x01, 0x0e, 0, 0, 0 }, /* Applause */
- { 0x00, 0x00, 0x00, 0x09, 0xf3, 0xf6, 0xf0, 0xc9, 0x00, 0x02, 0x0e, 0, 0, 0 } /* Gunshot */
-
-};
-
-/* logarithmic relationship between midi and FM volumes */
-static int my_midi_fm_vol_table128 = {
- 0, 11, 16, 19, 22, 25, 27, 29, 32, 33, 35, 37, 39, 40, 42, 43,
- 45, 46, 48, 49, 50, 51, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62,
- 64, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 75, 76, 77,
- 78, 79, 80, 80, 81, 82, 83, 83, 84, 85, 86, 86, 87, 88, 89, 89,
- 90, 91, 91, 92, 93, 93, 94, 95, 96, 96, 97, 97, 98, 99, 99, 100,
- 101, 101, 102, 103, 103, 104, 104, 105, 106, 106, 107, 107, 108,
- 109, 109, 110, 110, 111, 112, 112, 113, 113, 114, 114, 115, 115,
- 116, 117, 117, 118, 118, 119, 119, 120, 120, 121, 121, 122, 122,
- 123, 123, 124, 124, 125, 125, 126, 126, 127
-};
-

audacious-plugins-3.6.2-gtk3.tar.bz2/src/adplug/core/mkj.cc Deleted

@@ -1,225 +0,0 @@
-/*
- * Adplug - Replayer for many OPL2/OPL3 audio file formats.
- * Copyright (C) 1999 - 2004 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
- *
- * mkj.cpp - MKJamz Player, by Simon Peter <dn.tlp@gmx.net>
- */
-
-#include <assert.h>
-#include <string.h>
-
-#include "mkj.h"
-#include "debug.h"
-
-CPlayer *
-CmkjPlayer::factory (Copl * newopl)
-{
- return new CmkjPlayer (newopl);
-}
-
-bool
-CmkjPlayer::load (VFSFile & fd, const CFileProvider & fp)
-{
- binistream *f = fp.open (fd);
- if (!f)
- return false;
- char id6;
- float ver;
- int i, j;
- short inst8;
-
- // file validation
- f->readString (id, 6);
- if (strncmp (id, "MKJamz", 6))
- {
- fp.close (f);
- return false;
- }
- ver = f->readFloat (binio::Single);
- if (ver > 1.12)
- {
- fp.close (f);
- return false;
- }
-
- // load
- maxchannel = f->readInt (2);
- opl->init ();
- opl->write (1, 32);
- for (i = 0; i < maxchannel; i++)
- {
- for (j = 0; j < 8; j++)
- instj = f->readInt (2);
- opl->write (0x20 + op_tablei, inst4);
- opl->write (0x23 + op_tablei, inst0);
- opl->write (0x40 + op_tablei, inst5);
- opl->write (0x43 + op_tablei, inst1);
- opl->write (0x60 + op_tablei, inst6);
- opl->write (0x63 + op_tablei, inst2);
- opl->write (0x80 + op_tablei, inst7);
- opl->write (0x83 + op_tablei, inst3);
- }
- maxnotes = f->readInt (2);
- songbuf = new short(maxchannel + 1) * maxnotes;
- for (i = 0; i < maxchannel; i++)
- channeli.defined = f->readInt (2);
- for (i = 0; i < (maxchannel + 1) * maxnotes; i++)
- songbufi = f->readInt (2);
-
- AdPlug_LogWrite
- ("CmkjPlayer::load(\"%s\"): loaded file ver %.2f, %d channels,"
- " %d notes/channel.\n", fd.filename (), ver, maxchannel, maxnotes);
- fp.close (f);
- rewind (0);
- return true;
-}
-
-bool
-CmkjPlayer::update ()
-{
- int c, i;
- short note;
-
- for (c = 0; c < maxchannel; c++)
- {
- if (!channelc.defined) // skip if channel is disabled
- continue;
-
- if (channelc.pstat)
- {
- channelc.pstat--;
- continue;
- }
-
- opl->write (0xb0 + c, 0); // key off
- do
- {
- assert (channelc.songptr < (maxchannel + 1) * maxnotes);
- note = songbufchannelc.songptr;
- if (channelc.songptr - c > maxchannel)
- if (note && note < 250)
- channelc.pstat = channelc.speed;
- switch (note)
- {
- // normal notes
- case 68:
- opl->write (0xa0 + c, 0x81);
- opl->write (0xb0 + c, 0x21 + 4 * channelc.octave);
- break;
- case 69:
- opl->write (0xa0 + c, 0xb0);
- opl->write (0xb0 + c, 0x21 + 4 * channelc.octave);
- break;
- case 70:
- opl->write (0xa0 + c, 0xca);
- opl->write (0xb0 + c, 0x21 + 4 * channelc.octave);
- break;
- case 71:
- opl->write (0xa0 + c, 0x2);
- opl->write (0xb0 + c, 0x22 + 4 * channelc.octave);
- break;
- case 65:
- opl->write (0xa0 + c, 0x41);
- opl->write (0xb0 + c, 0x22 + 4 * channelc.octave);
- break;
- case 66:
- opl->write (0xa0 + c, 0x87);
- opl->write (0xb0 + c, 0x22 + 4 * channelc.octave);
- break;
- case 67:
- opl->write (0xa0 + c, 0xae);
- opl->write (0xb0 + c, 0x22 + 4 * channelc.octave);
- break;
- case 17:
- opl->write (0xa0 + c, 0x6b);
- opl->write (0xb0 + c, 0x21 + 4 * channelc.octave);
- break;
- case 18:
- opl->write (0xa0 + c, 0x98);
- opl->write (0xb0 + c, 0x21 + 4 * channelc.octave);
- break;
- case 20:
- opl->write (0xa0 + c, 0xe5);
- opl->write (0xb0 + c, 0x21 + 4 * channelc.octave);
- break;
- case 21:
- opl->write (0xa0 + c, 0x20);
- opl->write (0xb0 + c, 0x22 + 4 * channelc.octave);
- break;
- case 15:
- opl->write (0xa0 + c, 0x63);
- opl->write (0xb0 + c, 0x22 + 4 * channelc.octave);
- break;
- case 255: // delay
- channelc.songptr += maxchannel;
- channelc.pstat = songbufchannelc.songptr;
- break;
- case 254: // set octave
- channelc.songptr += maxchannel;
- channelc.octave = songbufchannelc.songptr;
- break;
- case 253: // set speed
- channelc.songptr += maxchannel;
- channelc.speed = songbufchannelc.songptr;
- break;
- case 252: // set waveform
- channelc.songptr += maxchannel;
- channelc.waveform = songbufchannelc.songptr - 300;
- if (c > 2)
- opl->write (0xe0 + c + (c + 6), channelc.waveform);
- else
- opl->write (0xe0 + c, channelc.waveform);
- break;
- case 251: // song end
- for (i = 0; i < maxchannel; i++)
- channeli.songptr = i;
- songend = true;
- return false;
- }
-
- if (channelc.songptr - c < maxnotes)
- channelc.songptr += maxchannel;
- else
- channelc.songptr = c;
- } while (!channelc.pstat);
- }
-
- return !songend;
-}
-
-void
-CmkjPlayer::rewind (int subsong)
-{
- int i;
-
- for (i = 0; i < maxchannel; i++)
- {
- channeli.pstat = 0;
- channeli.speed = 0;
- channeli.waveform = 0;
- channeli.songptr = i;
- channeli.octave = 4;
- }
-
- songend = false;
-}
-
-float
-CmkjPlayer::getrefresh ()
-{
- return 100.0f;
-}

audacious-plugins-3.6.2-gtk3.tar.bz2/src/adplug/core/mkj.h Deleted

@@ -1,50 +0,0 @@
-/*
- * Adplug - Replayer for many OPL2/OPL3 audio file formats.
- * Copyright (C) 1999 - 2003 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
- *
- * mkj.h - MKJamz Player, by Simon Peter <dn.tlp@gmx.net>
- */
-
-#include "player.h"
-
-class CmkjPlayer: public CPlayer
-{
-public:
- static CPlayer *factory(Copl *newopl);
-
-	CmkjPlayer(Copl *newopl)
-		: CPlayer(newopl), songbuf(0)
-	{ }
-	~CmkjPlayer()
-	{ if(songbuf) delete songbuf; }
-
-	bool load(VFSFile &fd, const CFileProvider &fp);
-	bool update();
-	void rewind(int subsong);
-	float getrefresh();
-
-	std::string gettype()
-	{ return std::string("MKJamz Audio File"); }
-
-private:
-	short maxchannel,maxnotes,*songbuf;
-	bool songend;
-
-	struct {
-		short defined,songptr,octave,waveform,pstat,speed,delay;
-	} channel9;
-};

audacious-plugins-3.6.2-gtk3.tar.bz2/src/adplug/core/msc.cc Deleted

@@ -1,338 +0,0 @@
-/*
- * Adplug - Replayer for many OPL2/OPL3 audio file formats.
- * Copyright (C) 1999 - 2006 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
- *
- * msc.c - MSC Player by Lubomir Bulej (pallas@kadan.cz)
- */
-
-#include <stdio.h>
-#include <string.h>
-
-#include "msc.h"
-#include "debug.h"
-
-const unsigned char
- CmscPlayer::msc_signatureMSC_SIGN_LEN = {
- 'C', 'e', 'r', 'e', 's', ' ', '\x13', ' ',
- 'M', 'S', 'C', 'p', 'l', 'a', 'y', ' '
-};
-
-/*** public methods *************************************/
-
-CPlayer *
-CmscPlayer::factory (Copl * newopl)
-{
- return new CmscPlayer (newopl);
-}
-
-CmscPlayer::CmscPlayer (Copl * newopl):CPlayer (newopl)
-{
- desc = nullptr;
- msc_data = nullptr;
- raw_data = nullptr;
- nr_blocks = 0;
-}
-
-CmscPlayer::~CmscPlayer ()
-{
- if (raw_data != nullptr)
- deleteraw_data;
-
- if (msc_data != nullptr)
- {
- // free compressed blocks
- for (int blk_num = 0; blk_num < nr_blocks; blk_num++)
- {
- if (msc_datablk_num.mb_data != nullptr)
- deletemsc_datablk_num.mb_data;
- }
-
- deletemsc_data;
- }
-
- if (desc != nullptr)
- deletedesc;
-}
-
-bool
-CmscPlayer::load (VFSFile & fd, const CFileProvider & fp)
-{
- binistream *bf;
- msc_header hdr;
-
- // open and validate the file
- bf = fp.open (fd);
- if (!bf)
- return false;
-
- if (!load_header (bf, &hdr))
- {
- fp.close (bf);
- return false;
- }
-
- // get stuff from the header
- version = hdr.mh_ver;
- timer_div = hdr.mh_timer;
- nr_blocks = hdr.mh_nr_blocks;
- block_len = hdr.mh_block_len;
-
- if (!nr_blocks)
- {
- fp.close (bf);
- return false;
- }
-
- // load compressed data blocks
- msc_data = new msc_blocknr_blocks;
- raw_data = new u8block_len;
-
- for (int blk_num = 0; blk_num < nr_blocks; blk_num++)
- {
- msc_block blk;
-
- blk.mb_length = bf->readInt (2);
- blk.mb_data = new u8blk.mb_length;
- for (int oct_num = 0; oct_num < blk.mb_length; oct_num++)
- {
- blk.mb_dataoct_num = bf->readInt (1);
- }
-
- msc_datablk_num = blk;
- }
-
- // clean up & initialize
- fp.close (bf);
- rewind (0);
-
- return true;
-}
-
-bool
-CmscPlayer::update ()
-{
- // output data
- while (!delay)
- {
- u8 cmnd;
- u8 data;
-
- // decode data
- if (!decode_octet (&cmnd))
- return false;
-
- if (!decode_octet (&data))
- return false;
-
- // check for special commands
- switch (cmnd)
- {
-
- // delay
- case 0xff:
- delay = 1 + (u8) (data - 1);
- break;
-
- // play command & data
- default:
- opl->write (cmnd, data);
-
- } // command switch
- } // play pass
-
-
- // count delays
- if (delay)
- delay--;
-
- // advance player position
- play_pos++;
- return true;
-}
-
-void
-CmscPlayer::rewind (int subsong)
-{
- // reset state
- dec_prefix = 0;
- block_num = 0;
- block_pos = 0;
- play_pos = 0;
- raw_pos = 0;
- delay = 0;
-
- // init the OPL chip and go to OPL2 mode
- opl->init ();
- opl->write (1, 32);
-}
-
-float
-CmscPlayer::getrefresh ()
-{
- // PC timer oscillator frequency / wait register
- return 1193180 / (float) (timer_div ? timer_div : 0xffff);
-}
-
-std::string CmscPlayer::gettype ()
-{
- char
- vstr40;
-
- sprintf (vstr, "AdLib MSCplay (version %d)", version);
- return std::string (vstr);
-}
-
-/*** private methods *************************************/
-
-bool
-CmscPlayer::load_header (binistream * bf, msc_header * hdr)
-{
- // check signature
- bf->readString ((char *) hdr->mh_sign, sizeof (hdr->mh_sign));
- if (memcmp (msc_signature, hdr->mh_sign, MSC_SIGN_LEN) != 0)
- return false;
-
- // check version
- hdr->mh_ver = bf->readInt (2);
- if (hdr->mh_ver != 0)
- return false;
-
- bf->readString ((char *) hdr->mh_desc, sizeof (hdr->mh_desc));
- hdr->mh_timer = bf->readInt (2);
- hdr->mh_nr_blocks = bf->readInt (2);
- hdr->mh_block_len = bf->readInt (2);
- return true;
-}
-
-bool
-CmscPlayer::decode_octet (u8 * output)
-{
- msc_block blk; // compressed data block
-
- if (block_num >= nr_blocks)
- return false;
-
- blk = msc_datablock_num;
- while (1)
- {
- u8 octet; // decoded octet
- u8 len_corr = 0; // length correction
-
- // advance to next block if necessary
- if (block_pos >= blk.mb_length && dec_len == 0)
- {
- block_num++;
- if (block_num >= nr_blocks)
- return false;
-
- blk = msc_datablock_num;
- block_pos = 0;
- raw_pos = 0;
- }
-
- // decode the compressed music data
- switch (dec_prefix)
- {
-
- // decode prefix
- case 155:
- case 175:
- octet = blk.mb_datablock_pos++;
- if (octet == 0)
- {
- // invalid prefix, output original
- octet = dec_prefix;
- dec_prefix = 0;
- break;
- }
-
- // isolate length and distance
- dec_len = (octet & 0x0F);
- len_corr = 2;
-
- dec_dist = (octet & 0xF0) >> 4;
- if (dec_prefix == 155)
- dec_dist++;
-
- // next decode step for respective prefix type
- dec_prefix++;
- continue;
-
-
- // check for extended length
- case 156:
- if (dec_len == 15)
- dec_len += blk.mb_datablock_pos++;
-
- // add length correction and go for copy mode
- dec_len += len_corr;
- dec_prefix = 255;
- continue;
-
-
- // get extended distance
- case 176:
- dec_dist += 17 + 16 * blk.mb_datablock_pos++;
- len_corr = 3;
-
- // check for extended length
- dec_prefix = 156;
- continue;
-
-
- // prefix copy mode
- case 255:
- if ((int) raw_pos >= dec_dist)
- octet = raw_dataraw_pos - dec_dist;
- else
- {
- AdPlug_LogWrite ("error! read before raw_data buffer.\n");
- octet = 0;
- }
-
- dec_len--;
- if (dec_len == 0)
- {
- // back to normal mode
- dec_prefix = 0;
- }
-
- break;
-
-
- // normal mode
- default:
- octet = blk.mb_datablock_pos++;
- if (octet == 155 || octet == 175)
- {
- // it's a prefix, restart
- dec_prefix = octet;
- continue;
- }
- } // prefix switch
-
-
- // output the octet
- if (output != nullptr)
- *output = octet;
-
- raw_dataraw_pos++ = octet;
- break;
- }; // decode pass
-
- return true;
-}

audacious-plugins-3.6.2-gtk3.tar.bz2/src/adplug/core/msc.h Deleted

@@ -1,90 +0,0 @@
-/*
- * Adplug - Replayer for many OPL2/OPL3 audio file formats.
- * Copyright (C) 1999 - 2005 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
- *
- * msc.h - MSC Player by Lubomir Bulej (pallas@kadan.cz)
- */
-
-#include "player.h"
-
-#define MSC_SIGN_LEN	16
-#define MSC_DESC_LEN	64
-
-class CmscPlayer: public CPlayer
-{
-public:
-	static CPlayer * factory (Copl * newopl);
-
-	CmscPlayer (Copl * newopl);
-	~CmscPlayer ();
-	
-	bool load (VFSFile &fd, const CFileProvider &fp);
-	bool update ();
-	void rewind (int subsong);
-	float getrefresh ();
-
-	std::string gettype ();
-
-
-protected:
-	typedef unsigned char	u8;
-	typedef	unsigned short	u16;
-
-	struct msc_header {
-		u8 	mh_sign MSC_SIGN_LEN;
-		u16	mh_ver;
-		u8	mh_desc MSC_DESC_LEN;
-		u16	mh_timer;
-		u16	mh_nr_blocks;
-		u16	mh_block_len;
-	};
-
-	struct msc_block {
-		u16	mb_length;
-		u8 *	mb_data;
-	};
-	
-	
-	// file data
-	char *		desc;		// song desctiption
-	unsigned short	version;	// file version
-	unsigned short	nr_blocks;	// number of music blocks
-	unsigned short	block_len;	// maximal block length
-	unsigned short	timer_div;	// timer divisor
-	msc_block *	msc_data;	// compressed music data
-	
-	// decoder state
-	unsigned long	block_num;	// active block
-	unsigned long	block_pos;	// position in block
-	unsigned long	raw_pos;	// position in data buffer
-	u8 *		raw_data;	// decompression buffer
-
-	u8 		dec_prefix;	// prefix / state
-	int		dec_dist;	// prefix distance
-	unsigned int	dec_len;	// prefix length
-	
-	// player state
-	unsigned char 	delay;		// active delay
-	unsigned long	play_pos;	// player position
-	
-
-private:
-	static const u8 msc_signature MSC_SIGN_LEN;
-
-	bool load_header (binistream * bf, msc_header * hdr);
-	bool decode_octet (u8 * output);
-};

audacious-plugins-3.6.2-gtk3.tar.bz2/src/adplug/core/mtk.cc Deleted

@@ -1,168 +0,0 @@
-/*
- * Adplug - Replayer for many OPL2/OPL3 audio file formats.
- * Copyright (C) 1999 - 2006 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
- *
- * mtk.cpp - MPU-401 Trakker Loader by Simon Peter (dn.tlp@gmx.net)
- */
-
-#include <string.h>
-
-#include "mtk.h"
-
-/*** public methods **************************************/
-
-CPlayer *
-CmtkLoader::factory (Copl * newopl)
-{
- return new CmtkLoader (newopl);
-}
-
-bool
-CmtkLoader::load (VFSFile & fd, const CFileProvider & fp)
-{
- binistream *f = fp.open (fd);
- if (!f)
- return false;
- struct
- {
- char id18;
- unsigned short crc, size;
- } header;
- struct mtkdata
- {
- char songname34, composername34, instname0x8034;
- unsigned char insts0x8012, order0x80, dummy,
- patterns0x320x409;
- } *data;
- unsigned char *cmp, *org;
- unsigned int i;
- unsigned long cmpsize, cmpptr = 0, orgptr = 0;
- unsigned short ctrlbits = 0, ctrlmask = 0, cmd, cnt, offs;
-
- // read header
- f->readString (header.id, 18);
- header.crc = f->readInt (2);
- header.size = f->readInt (2);
-
- // file validation section
- if (strncmp (header.id, "mpu401tr\x92kk\xeer@data", 18))
- {
- fp.close (f);
- return false;
- }
-
- // load section
- cmpsize = fp.filesize (f) - 22;
- cmp = new unsigned charcmpsize;
- org = new unsigned charheader.size;
- for (i = 0; i < cmpsize; i++)
- cmpi = f->readInt (1);
- fp.close (f);
-
- while (cmpptr < cmpsize)
- { // decompress
- ctrlmask >>= 1;
- if (!ctrlmask)
- {
- ctrlbits = cmpcmpptr + (cmpcmpptr + 1 << 8);
- cmpptr += 2;
- ctrlmask = 0x8000;
- }
- if (!(ctrlbits & ctrlmask))
- { // uncompressed data
- if (orgptr >= header.size)
- goto err;
-
- orgorgptr = cmpcmpptr;
- orgptr++;
- cmpptr++;
- continue;
- }
-
- // compressed data
- cmd = (cmpcmpptr >> 4) & 0x0f;
- cnt = cmpcmpptr & 0x0f;
- cmpptr++;
- switch (cmd)
- {
- case 0:
- if (orgptr + cnt > header.size)
- goto err;
- cnt += 3;
- memset (&orgorgptr, cmpcmpptr, cnt);
- cmpptr++;
- orgptr += cnt;
- break;
-
- case 1:
- if (orgptr + cnt > header.size)
- goto err;
- cnt += (cmpcmpptr << 4) + 19;
- memset (&orgorgptr, cmp++cmpptr, cnt);
- cmpptr++;
- orgptr += cnt;
- break;
-
- case 2:
- if (orgptr + cnt > header.size)
- goto err;
- offs = (cnt + 3) + (cmpcmpptr << 4);
- cnt = cmp++cmpptr + 16;
- cmpptr++;
- memcpy (&orgorgptr, &orgorgptr - offs, cnt);
- orgptr += cnt;
- break;
-
- default:
- if (orgptr + cmd > header.size)
- goto err;
- offs = (cnt + 3) + (cmpcmpptr++ << 4);
- memcpy (&orgorgptr, &orgorgptr - offs, cmd);
- orgptr += cmd;
- break;
- }
- }
- deletecmp;
- data = (struct mtkdata *) org;
-
- // convert to HSC replay data
- memset (title, 0, 34);
- strncpy (title, data->songname + 1, 33);
- memset (composer, 0, 34);
- strncpy (composer, data->composername + 1, 33);
- memset (instname, 0, 0x80 * 34);
- for (i = 0; i < 0x80; i++)
- strncpy (instnamei, data->instnamei + 1, 33);
- memcpy (instr, data->insts, 0x80 * 12);
- memcpy (song, data->order, 0x80);
- memcpy (patterns, data->patterns, header.size - 6084);
- for (i = 0; i < 128; i++)
- { // correct instruments
- instri2 ^= (instri2 & 0x40) << 1;
- instri3 ^= (instri3 & 0x40) << 1;
- instri11 >>= 4; // make unsigned
- }
-
- deleteorg;
- rewind (0);
- return true;
-
-err:
- deletecmp;
- deleteorg;
- return false;
-}

audacious-plugins-3.6.2-gtk3.tar.bz2/src/adplug/core/mtk.h Deleted

@@ -1,50 +0,0 @@
-/*
- * Adplug - Replayer for many OPL2/OPL3 audio file formats.
- * Copyright (C) 1999 - 2006 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
- *
- * mtk.h - MPU-401 Trakker Loader by Simon Peter <dn.tlp@gmx.net>
- */
-
-#include "hsc.h"
-
-class CmtkLoader: public ChscPlayer
-{
- public:
- static CPlayer *factory(Copl *newopl);
-
-	CmtkLoader(Copl *newopl)
-		: ChscPlayer(newopl)
-	{
-		mtkmode = 1;
-	};
-
-	bool load(VFSFile &fd, const CFileProvider &fp);
-
-	std::string gettype()
-	{ return std::string("MPU-401 Trakker"); };
-	std::string gettitle()
-	{ return std::string(title); };
-	std::string getauthor()
-	{ return std::string(composer); };
-	unsigned int getinstruments()
-	{ return 128; };
-	std::string getinstrument(unsigned int n)
-	{ return std::string(instnamen); };
-
- private:
-	char title34,composer34,instname0x8034;
-};

audacious-plugins-3.6.2-gtk3.tar.bz2/src/adplug/core/opl.h Deleted

@@ -1,69 +0,0 @@
-/*
- * 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
- *
- * opl.h - OPL base class, by Simon Peter <dn.tlp@gmx.net>
- */
-
-#ifndef H_ADPLUG_OPL
-#define H_ADPLUG_OPL
-
-class Copl
-{
- public:
- typedef enum {
- TYPE_OPL2, TYPE_OPL3, TYPE_DUAL_OPL2
- } ChipType;
-
- Copl()
- : currChip(0), currType(TYPE_OPL2)
- {
- }
-
- virtual ~Copl()
- {
- }
-
- virtual void write(int reg, int val) = 0;	// combined register select + data write
- virtual void setchip(int n)			// select OPL chip
- {
- if(n < 2)
-	currChip = n;
- }
-
- virtual int getchip() // returns current OPL chip
- {
- return currChip;
- }
-
- virtual void init(void) = 0;			// reinitialize OPL chip(s)
-
- // return this OPL chip's type
- ChipType gettype()
- {
- return currType;
- }
-
- // Emulation only: fill buffer
- virtual void update(short *buf, int samples) {}
-
- protected:
- int		currChip;		// currently selected OPL chip number
- ChipType	currType;		// this OPL chip's type
-};
-
-#endif

audacious-plugins-3.6.2-gtk3.tar.bz2/src/adplug/core/player.cc Deleted

@@ -1,73 +0,0 @@
-/*
- * 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
- *
- * player.cpp - Replayer base class, by Simon Peter <dn.tlp@gmx.net>
- */
-
-#include "player.h"
-#include "adplug.h"
-#include "silentopl.h"
-
-/***** CPlayer *****/
-
-const unsigned short
-CPlayer::note_table12 =
- { 363, 385, 408, 432, 458, 485, 514, 544, 577, 611, 647, 686 };
-
-const unsigned char
-CPlayer::op_table9 =
- { 0x00, 0x01, 0x02, 0x08, 0x09, 0x0a, 0x10, 0x11, 0x12 };
-
-CPlayer::CPlayer (Copl * newopl):opl (newopl), db (CAdPlug::database)
-{
-}
-
-CPlayer::~CPlayer ()
-{
-}
-
-unsigned long
-CPlayer::songlength (int subsong)
-{
- CSilentopl tempopl;
- Copl *saveopl = opl;
- float slength = 0.0f;
-
- // save original OPL from being overwritten
- opl = &tempopl;
-
- // get song length
- rewind (subsong);
- while (update () && slength < 600000) // song length limit: 10 minutes
- slength += 1000.0f / getrefresh ();
- rewind (subsong);
-
- // restore original OPL and return
- opl = saveopl;
- return (unsigned long) slength;
-}
-
-void
-CPlayer::seek (unsigned long ms)
-{
- float pos = 0.0f;
-
- rewind ();
- while (pos < ms && update ()) // seek to new position
- pos += 1000 / getrefresh ();
-}

audacious-plugins-3.6.2-gtk3.tar.bz2/src/adplug/core/player.h Deleted

@@ -1,85 +0,0 @@
-/*
- * 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
- *
- * player.h - Replayer base class, by Simon Peter <dn.tlp@gmx.net>
- */
-
-#ifndef H_ADPLUG_PLAYER
-#define H_ADPLUG_PLAYER
-
-#include <string>
-
-#include "fprovide.h"
-#include "opl.h"
-#include "database.h"
-
-class CPlayer
-{
-public:
- CPlayer(Copl *newopl);
-	virtual ~CPlayer();
-
-/***** Operational methods *****/
-	void seek(unsigned long ms);
-
-	virtual bool load(VFSFile &fd,	// loads file
-			 const CFileProvider &fp = CProvider_Filesystem()) = 0;
-	virtual bool update() = 0;			// executes replay code for 1 tick
-	virtual void rewind(int subsong = -1) = 0;	// rewinds to specified subsong
-	virtual float getrefresh() = 0;			// returns needed timer refresh rate
-
-/***** Informational methods *****/
-	unsigned long songlength(int subsong = -1);
-
-	virtual std::string gettype() = 0;	// returns file type
-	virtual std::string gettitle()		// returns song title
-	{ return std::string(); }
-	virtual std::string getauthor()		// returns song author name
-	{ return std::string(); }
-	virtual std::string getdesc()		// returns song description
-	{ return std::string(); }
-	virtual unsigned int getpatterns()	// returns number of patterns
-	{ return 0; }
-	virtual unsigned int getpattern()	// returns currently playing pattern
-	{ return 0; }
-	virtual unsigned int getorders()	// returns size of orderlist
-	{ return 0; }
-	virtual unsigned int getorder()		// returns currently playing song position
-	{ return 0; }
-	virtual unsigned int getrow()		// returns currently playing row
-	{ return 0; }
-	virtual unsigned int getspeed()		// returns current song speed
-	{ return 0; }
-	virtual unsigned int getsubsongs()	// returns number of subsongs
-	{ return 1; }
-	virtual unsigned int getsubsong() // returns current subsong
-	{ return 0; }
-	virtual unsigned int getinstruments()	// returns number of instruments
-	{ return 0; }
-	virtual std::string getinstrument(unsigned int n)	// returns n-th instrument name
-	{ return std::string(); }
-
-protected:
-	Copl		*opl;	// our OPL chip
-	CAdPlugDatabase	*db;	// AdPlug Database
-
-	static const unsigned short	note_table12;	// standard adlib note table
-	static const unsigned char	op_table9;	// the 9 operators as expected by the OPL
-};
-
-#endif

audacious-plugins-3.6.2-gtk3.tar.bz2/src/adplug/core/players.cc Deleted

@@ -1,107 +0,0 @@
-/*
- * AdPlug - Replayer for many OPL2/OPL3 audio file formats.
- * Copyright (C) 1999 - 2003 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
- *
- * players.h - Players enumeration, by Simon Peter <dn.tlp@gmx.net>
- */
-
-#include <stdlib.h>
-#include <string.h>
-
-#include "players.h"
-
-#include <libaudcore/audstrings.h>
-
-/***** CPlayerDesc *****/
-
-CPlayerDesc::CPlayerDesc()
- : factory(0), extensions(0), extlength(0)
-{
-}
-
-CPlayerDesc::CPlayerDesc(const CPlayerDesc &pd)
- : factory(pd.factory), filetype(pd.filetype), extlength(pd.extlength)
-{
- if(pd.extensions) {
- extensions = (char *)malloc(extlength);
- memcpy(extensions, pd.extensions, extlength);
- } else
- extensions = 0;
-}
-
-CPlayerDesc::CPlayerDesc(Factory f, const std::string &type, const char *ext)
- : factory(f), filetype(type), extensions(0)
-{
- const char *i = ext;
-
- // Determine length of passed extensions list
- while(*i) i += strlen(i) + 1;
- extlength = i - ext + 1;	// length = difference between last and first char + 1
-
- extensions = (char *)malloc(extlength);
- memcpy(extensions, ext, extlength);
-}
-
-CPlayerDesc::~CPlayerDesc()
-{
- if(extensions) free(extensions);
-}
-
-void CPlayerDesc::add_extension(const char *ext)
-{
- unsigned long newlength = extlength + strlen(ext) + 1;
-
- extensions = (char *)realloc(extensions, newlength);
- strcpy(extensions + extlength - 1, ext);
- extensionsnewlength - 1 = '\0';
- extlength = newlength;
-}
-
-const char *CPlayerDesc::get_extension(unsigned int n) const
-{
- const char	*i = extensions;
- unsigned int	j;
-
- for(j = 0; j < n && (*i); j++, i += strlen(i) + 1) ;
- return (*i != '\0' ? i : 0);
-}
-
-/***** CPlayers *****/
-
-const CPlayerDesc *CPlayers::lookup_filetype(const std::string &ftype) const
-{
- const_iterator	i;
-
- for(i = begin(); i != end(); i++)
- if((*i)->filetype == ftype)
- return *i;
-
- return 0;
-}
-
-const CPlayerDesc *CPlayers::lookup_extension(const std::string &extension) const
-{
- const_iterator	i;
- unsigned int		j;
-
- for(i = begin(); i != end(); i++)
- for(j = 0; (*i)->get_extension(j); j++)
- if(!strcmp_nocase(extension.c_str(), (*i)->get_extension(j)))
-	return *i;
-
- return 0;
-}

audacious-plugins-3.6.2-gtk3.tar.bz2/src/adplug/core/players.h Deleted

@@ -1,60 +0,0 @@
-/*
- * AdPlug - Replayer for many OPL2/OPL3 audio file formats.
- * Copyright (C) 1999 - 2003 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
- *
- * players.h - Players enumeration, by Simon Peter <dn.tlp@gmx.net>
- */
-
-#ifndef H_ADPLUG_PLAYERS
-#define H_ADPLUG_PLAYERS
-
-#include <string>
-#include <list>
-
-#include "opl.h"
-#include "player.h"
-
-class CPlayerDesc
-{
-public:
- typedef CPlayer *(*Factory)(Copl *);
-
- Factory	factory;
- std::string	filetype;
-
- CPlayerDesc();
- CPlayerDesc(const CPlayerDesc &pd);
- CPlayerDesc(Factory f, const std::string &type, const char *ext);
-
- ~CPlayerDesc();
-
- void add_extension(const char *ext);
- const char *get_extension(unsigned int n) const;
-
-private:
- char		*extensions;
- unsigned long	extlength;
-};
-
-class CPlayers: public std::list<const CPlayerDesc *>
-{
-public:
- const CPlayerDesc *lookup_filetype(const std::string &ftype) const;
- const CPlayerDesc *lookup_extension(const std::string &extension) const;
-};
-
-#endif

audacious-plugins-3.6.2-gtk3.tar.bz2/src/adplug/core/protrack.cc Deleted

@@ -1,996 +0,0 @@
-/*
- * 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
- *
- * protrack.cpp - Generic Protracker Player
- *
- * NOTES:
- * This is a generic Protracker-based formats player. It offers all Protracker
- * features, plus a good set of extensions to be compatible to other Protracker
- * derivatives. It is derived from the former SA2 player. If you got a
- * Protracker-like format, this is most certainly the player you want to use.
- */
-
-#include <string.h>
-
-#include "protrack.h"
-#include "debug.h"
-
-#define SPECIALARPLEN	256 // Standard length of special arpeggio lists
-#define JUMPMARKER	0x80 // Orderlist jump marker
-
-// SA2 compatible adlib note table
-const unsigned short
-CmodPlayer::sa2_notetable12 =
- { 340, 363, 385, 408, 432, 458, 485, 514, 544, 577, 611, 647 };
-
-// SA2 compatible vibrato rate table
-const unsigned char
-CmodPlayer::vibratotab32 =
- { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 16, 15, 14, 13,
-12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1 };
-
-/*** public methods *************************************/
-
-CmodPlayer::CmodPlayer (Copl * newopl):CPlayer (newopl), inst (0), order (0), arplist (0), arpcmd (0), initspeed (6),
-nop (0), activechan (0xffffffff), flags (Standard), curchip (opl->getchip ()),
-nrows (0), npats (0), nchans (0)
-{
- realloc_order (128);
- realloc_patterns (64, 64, 9);
- realloc_instruments (250);
- init_notetable (sa2_notetable);
-}
-
-CmodPlayer::~CmodPlayer ()
-{
- dealloc ();
-}
-
-bool
-CmodPlayer::update ()
-{
- unsigned char pattbreak = 0, donote, pattnr, chan, oplchan, info1,
- info2, info, pattern_delay;
- unsigned short track;
- unsigned long row;
-
- if (!speed) // song full stop
- return !songend;
-
- // effect handling (timer dependant)
- for (chan = 0; chan < nchans; chan++)
- {
- oplchan = set_opl_chip (chan);
-
- if (arplist && arpcmd && instchannelchan.inst.arpstart) // special arpeggio
- {
- if (channelchan.arpspdcnt)
- channelchan.arpspdcnt--;
- else if (arpcmdchannelchan.arppos != 255)
- {
- switch (arpcmdchannelchan.arppos)
- {
- case 252:
- channelchan.vol1 = arplistchannelchan.arppos; // set volume
- if (channelchan.vol1 > 63) // ?????
- channelchan.vol1 = 63;
- channelchan.vol2 = channelchan.vol1;
- setvolume (chan);
- break;
- case 253:
- channelchan.key = 0;
- setfreq (chan);
- break; // release sustaining note
- case 254:
- channelchan.arppos = arplistchannelchan.arppos;
- break; // arpeggio loop
- default:
- if (arpcmdchannelchan.arppos)
- {
- if (arpcmdchannelchan.arppos / 10)
- opl->write (0xe3 + op_tableoplchan,
- arpcmdchannelchan.arppos / 10 - 1);
- if (arpcmdchannelchan.arppos % 10)
- opl->write (0xe0 + op_tableoplchan,
- (arpcmdchannelchan.arppos % 10) - 1);
- if (arpcmdchannelchan.arppos < 10) // ?????
- opl->write (0xe0 + op_tableoplchan,
- arpcmdchannelchan.arppos - 1);
- }
- }
- if (arpcmdchannelchan.arppos != 252)
- {
- if (arplistchannelchan.arppos <= 96)
- setnote (chan,
- channelchan.note + arplistchannelchan.arppos);
- if (arplistchannelchan.arppos >= 100)
- setnote (chan, arplistchannelchan.arppos - 100);
- }
- else
- setnote (chan, channelchan.note);
- setfreq (chan);
- if (arpcmdchannelchan.arppos != 255)
- channelchan.arppos++;
- channelchan.arpspdcnt = instchannelchan.inst.arpspeed - 1;
- }
- }
-
- info1 = channelchan.info1;
- info2 = channelchan.info2;
- if (flags & Decimal)
- info = channelchan.info1 * 10 + channelchan.info2;
- else
- info = (channelchan.info1 << 4) + channelchan.info2;
- switch (channelchan.fx)
- {
- case 0:
- if (info)
- { // arpeggio
- if (channelchan.trigger < 2)
- channelchan.trigger++;
- else
- channelchan.trigger = 0;
- switch (channelchan.trigger)
- {
- case 0:
- setnote (chan, channelchan.note);
- break;
- case 1:
- setnote (chan, channelchan.note + info1);
- break;
- case 2:
- setnote (chan, channelchan.note + info2);
- }
- setfreq (chan);
- }
- break;
- case 1:
- slide_up (chan, info);
- setfreq (chan);
- break; // slide up
- case 2:
- slide_down (chan, info);
- setfreq (chan);
- break; // slide down
- case 3:
- tone_portamento (chan, channelchan.portainfo);
- break; // tone portamento
- case 4:
- vibrato (chan, channelchan.vibinfo1, channelchan.vibinfo2);
- break; // vibrato
- case 5: // tone portamento & volume slide
- case 6:
- if (channelchan.fx == 5) // vibrato & volume slide
- tone_portamento (chan, channelchan.portainfo);
- else
- vibrato (chan, channelchan.vibinfo1, channelchan.vibinfo2);
- case 10:
- if (del % 4) // SA2 volume slide
- break;
- if (info1)
- vol_up (chan, info1);
- else
- vol_down (chan, info2);
- setvolume (chan);
- break;
- case 14:
- if (info1 == 3) // retrig note
- if (!(del % (info2 + 1)))
- playnote (chan);
- break;
- case 16:
- if (del % 4) // AMD volume slide
- break;
- if (info1)
- vol_up_alt (chan, info1);
- else
- vol_down_alt (chan, info2);
- setvolume (chan);
- break;
- case 20: // RAD volume slide
- if (info < 50)
- vol_down_alt (chan, info);
- else
- vol_up_alt (chan, info - 50);
- setvolume (chan);
- break;
- case 26: // volume slide
- if (info1)
- vol_up (chan, info1);
- else
- vol_down (chan, info2);
- setvolume (chan);
- break;
- case 28:
- if (info1)
- {
- slide_up (chan, 1);
- channelchan.info1--;
- }
- if (info2)
- {
- slide_down (chan, 1);
- channelchan.info2--;
- }
- setfreq (chan);
- break;
- }
- }
-
- if (del)
- { // speed compensation
- del--;
- return !songend;
- }
-
- // arrangement handling
- if (!resolve_order ())
- return !songend;
- pattnr = orderord;
-
- if (!rw)
- AdPlug_LogWrite ("\nCmodPlayer::update(): Pattern: %d, Order: %d\n",
- pattnr, ord);
- AdPlug_LogWrite ("CmodPlayer::update():%3d|", rw);
-
- // play row
- pattern_delay = 0;
- row = rw;
- for (chan = 0; chan < nchans; chan++)
- {
- oplchan = set_opl_chip (chan);
-
- if (!(activechan >> (31 - chan)) & 1)
- { // channel active?
- AdPlug_LogWrite ("N/A|");
- continue;
- }
- if (!(track = trackordpattnrchan))
- { // resolve track
- AdPlug_LogWrite ("------------|");
- continue;
- }
- else
- track--;
-
- if (track >= npats*nchans) { // prevent overflow
- songend = 1;
- return !songend;
- }
- AdPlug_LogWrite ("%3d%3d%2X%2X%2X|", trackstrackrow.note,
- trackstrackrow.inst, trackstrackrow.command,
- trackstrackrow.param1, trackstrackrow.param2);
-
- donote = 0;
- if (trackstrackrow.inst)
- {
- channelchan.inst = trackstrackrow.inst - 1;
- if (!(flags & Faust))
- {
- channelchan.vol1 = 63 - (instchannelchan.inst.data10 & 63);
- channelchan.vol2 = 63 - (instchannelchan.inst.data9 & 63);
- setvolume (chan);
- }
- }
-
- if (trackstrackrow.note && trackstrackrow.command != 3)
- { // no tone portamento
- channelchan.note = trackstrackrow.note;
- setnote (chan, trackstrackrow.note);
- channelchan.nextfreq = channelchan.freq;
- channelchan.nextoct = channelchan.oct;
- channelchan.arppos = instchannelchan.inst.arpstart;
- channelchan.arpspdcnt = 0;
- if (trackstrackrow.note != 127) // handle key off
- donote = 1;
- }
- channelchan.fx = trackstrackrow.command;
- channelchan.info1 = trackstrackrow.param1;
- channelchan.info2 = trackstrackrow.param2;
-
- if (donote)
- playnote (chan);
-
- // command handling (row dependant)
- info1 = channelchan.info1;
- info2 = channelchan.info2;
- if (flags & Decimal)
- info = channelchan.info1 * 10 + channelchan.info2;
- else
- info = (channelchan.info1 << 4) + channelchan.info2;
- switch (channelchan.fx)
- {
- case 3: // tone portamento
- if (trackstrackrow.note)
- {
- if (trackstrackrow.note < 13)
- channelchan.nextfreq = notetabletrackstrackrow.note - 1;
- else if (trackstrackrow.note % 12 > 0)
- channelchan.nextfreq =
- notetable(trackstrackrow.note % 12) - 1;
- else
- channelchan.nextfreq = notetable11;
- channelchan.nextoct = (trackstrackrow.note - 1) / 12;
- if (trackstrackrow.note == 127)
- { // handle key off
- channelchan.nextfreq = channelchan.freq;
- channelchan.nextoct = channelchan.oct;
- }
- }
- if (info) // remember vars
- channelchan.portainfo = info;
- break;
-
- case 4: // vibrato (remember vars)
- if (info)
- {
- channelchan.vibinfo1 = info1;
- channelchan.vibinfo2 = info2;
- }
- break;
-
- case 7:
- tempo = info;
- break; // set tempo
-
- case 8:
- channelchan.key = 0;
- setfreq (chan);
- break; // release sustaining note
-
- case 9: // set carrier/modulator volume
- if (info1)
- channelchan.vol1 = info1 * 7;
- else
- channelchan.vol2 = info2 * 7;
- setvolume (chan);
- break;
-
- case 11: // position jump
- pattbreak = 1;
- rw = 0;
- if (info < ord)
- songend = 1;
- ord = info;
- break;
-
- case 12: // set volume
- channelchan.vol1 = info;
- channelchan.vol2 = info;
- if (channelchan.vol1 > 63)
- channelchan.vol1 = 63;
- if (channelchan.vol2 > 63)
- channelchan.vol2 = 63;
- setvolume (chan);
- break;
-
- case 13: // pattern break
- if (!pattbreak)
- {
- pattbreak = 1;
- rw = info;
- ord++;
- }
- break;
-
- case 14: // extended command
- switch (info1)
- {
- case 0: // define cell-tremolo
- if (info2)
- regbd |= 128;
- else
- regbd &= 127;
- opl->write (0xbd, regbd);
- break;
-
- case 1: // define cell-vibrato
- if (info2)
- regbd |= 64;
- else
- regbd &= 191;
- opl->write (0xbd, regbd);
- break;
-
- case 4: // increase volume fine
- vol_up_alt (chan, info2);
- setvolume (chan);
- break;
-
- case 5: // decrease volume fine
- vol_down_alt (chan, info2);
- setvolume (chan);
- break;
-
- case 6: // manual slide up
- slide_up (chan, info2);
- setfreq (chan);
- break;
-
- case 7: // manual slide down
- slide_down (chan, info2);
- setfreq (chan);
- break;
-
- case 8: // pattern delay (rows)
- pattern_delay = info2 * speed;
- break;
- }
- break;
-
- case 15: // SA2 set speed
- if (info <= 0x1f)
- speed = info;
- if (info >= 0x32)
- tempo = info;
- if (!info)
- songend = 1;
- break;
-
- case 17: // alternate set volume
- channelchan.vol1 = info;
- if (channelchan.vol1 > 63)
- channelchan.vol1 = 63;
- if (instchannelchan.inst.data0 & 1)
- {
- channelchan.vol2 = info;
- if (channelchan.vol2 > 63)
- channelchan.vol2 = 63;
- }
-
- setvolume (chan);
- break;
-
- case 18: // AMD set speed
- if (info <= 31 && info > 0)
- speed = info;
- if (info > 31 || !info)
- tempo = info;
- break;
-
- case 19: // RAD/A2M set speed
- speed = (info ? info : info + 1);
- break;
-
- case 21: // set modulator volume
- if (info <= 63)
- channelchan.vol2 = info;
- else
- channelchan.vol2 = 63;
- setvolume (chan);
- break;
-
- case 22: // set carrier volume
- if (info <= 63)
- channelchan.vol1 = info;
- else
- channelchan.vol1 = 63;
- setvolume (chan);
- break;
-
- case 23: // fine frequency slide up
- slide_up (chan, info);
- setfreq (chan);
- break;
-
- case 24: // fine frequency slide down
- slide_down (chan, info);
- setfreq (chan);
- break;
-
- case 25: // set carrier/modulator waveform
- if (info1 != 0x0f)
- opl->write (0xe3 + op_tableoplchan, info1);
- if (info2 != 0x0f)
- opl->write (0xe0 + op_tableoplchan, info2);
- break;
-
- case 27: // set chip tremolo/vibrato
- if (info1)
- regbd |= 128;
- else
- regbd &= 127;
- if (info2)
- regbd |= 64;
- else
- regbd &= 191;
- opl->write (0xbd, regbd);
- break;
-
- case 29: // pattern delay (frames)
- pattern_delay = info;
- break;
- }
- }
-
- // speed compensation
- del = speed - 1 + pattern_delay;
-
- if (!pattbreak)
- { // next row (only if no manual advance)
- rw++;
- if (rw >= nrows)
- {
- rw = 0;
- ord++;
- }
- }
-
- resolve_order (); // so we can report songend right away
- AdPlug_LogWrite ("\n");
- return !songend;
-}
-
-unsigned char
-CmodPlayer::set_opl_chip (unsigned char chan)
- /*
- * Sets OPL chip according to channel number. Channels 0-8 are on first chip,
- * channels 9-17 are on second chip. Returns corresponding OPL channel
- * number.
- */
-{
- int newchip = chan < 9 ? 0 : 1;
-
- if (newchip != curchip)
- {
- opl->setchip (newchip);
- curchip = newchip;
- }
-
- return chan % 9;
-}
-
-bool
-CmodPlayer::resolve_order ()
- /*
- * Resolves current orderlist entry, checking for jumps and loops.
- *
- * Returns true on correct processing, false if immediate recursive loop
- * has been detected.
- */
-{
- if (ord < length)
- {
- while (orderord >= JUMPMARKER)
- { // jump to order
- unsigned long neword = orderord - JUMPMARKER;
-
- if (neword <= ord)
- songend = 1;
- if (neword == ord)
- return false;
- ord = neword;
- }
- }
- else
- {
- songend = 1;
- ord = restartpos;
- }
-
- return true;
-}
-
-void
-CmodPlayer::rewind (int subsong)
-{
- unsigned long i;
-
- // Reset playing variables
- songend = del = ord = rw = regbd = 0;
- tempo = bpm;
- speed = initspeed;
-
- // Reset channel data
- memset (channel, 0, sizeof (Channel) * nchans);
-
- // Compute number of patterns, if needed
- if (!nop)
- for (i = 0; i < length; i++)
- nop = (orderi > nop ? orderi : nop);
-
- opl->init (); // Reset OPL chip
- opl->write (1, 32); // Go to ym3812 mode
-
- // Enable OPL3 extensions if flagged
- if (flags & Opl3)
- {
- opl->setchip (1);
- opl->write (1, 32);
- opl->write (5, 1);
- opl->setchip (0);
- }
-
- // Enable tremolo/vibrato depth if flagged
- if (flags & Tremolo)
- regbd |= 128;
- if (flags & Vibrato)
- regbd |= 64;
- if (regbd)
- opl->write (0xbd, regbd);
-}
-
-float
-CmodPlayer::getrefresh ()
-{
- return (float) (tempo / 2.5);
-}
-
-void
-CmodPlayer::init_trackord ()
-{
- unsigned long i;
-
- for (i = 0; i < npats * nchans; i++)
- trackordi / nchansi % nchans = i + 1;
-}
-
-bool
-CmodPlayer::init_specialarp ()
-{
- arplist = new unsigned charSPECIALARPLEN;
- arpcmd = new unsigned charSPECIALARPLEN;
-
- return true;
-}
-
-void
-CmodPlayer::init_notetable (const unsigned short *newnotetable)
-{
- memcpy (notetable, newnotetable, 12 * 2);
-}
-
-bool
-CmodPlayer::realloc_order (unsigned long len)
-{
- if (order)
- deleteorder;
- order = new unsigned charlen;
- return true;
-}
-
-bool
-CmodPlayer::realloc_patterns (unsigned long pats, unsigned long rows,
- unsigned long chans)
-{
- unsigned long i;
-
- dealloc_patterns ();
-
- // set new number of tracks, rows and channels
- npats = pats;
- nrows = rows;
- nchans = chans;
-
- // alloc new patterns
- tracks = new Tracks *pats * chans;
- for (i = 0; i < pats * chans; i++)
- tracksi = new Tracksrows;
- trackord = new unsigned short *pats;
- for (i = 0; i < pats; i++)
- trackordi = new unsigned shortchans;
- channel = new Channelchans;
-
- // initialize new patterns
- for (i = 0; i < pats * chans; i++)
- memset (tracksi, 0, sizeof (Tracks) * rows);
- for (i = 0; i < pats; i++)
- memset (trackordi, 0, chans * 2);
-
- return true;
-}
-
-void
-CmodPlayer::dealloc_patterns ()
-{
- unsigned long i;
-
- // dealloc everything previously allocated
- if (npats && nrows && nchans)
- {
- for (i = 0; i < npats * nchans; i++)
- deletetracksi;
- deletetracks;
- for (i = 0; i < npats; i++)
- deletetrackordi;
- deletetrackord;
- deletechannel;
- }
-}
-
-bool
-CmodPlayer::realloc_instruments (unsigned long len)
-{
- // dealloc previous instance, if any
- if (inst)
- deleteinst;
-
- inst = new Instrumentlen;
- memset (inst, 0, sizeof (Instrument) * len); // reset instruments
- return true;
-}
-
-void
-CmodPlayer::dealloc ()
-{
- if (inst)
- deleteinst;
- if (order)
- deleteorder;
- if (arplist)
- deletearplist;
- if (arpcmd)
- deletearpcmd;
- dealloc_patterns ();
-}
-
-/*** private methods *************************************/
-
-void
-CmodPlayer::setvolume (unsigned char chan)
-{
- unsigned char oplchan = set_opl_chip (chan);
-
- if (flags & Faust)
- setvolume_alt (chan);
- else
- {
- opl->write (0x40 + op_tableoplchan,
- 63 - channelchan.vol2 +
- (instchannelchan.inst.data9 & 192));
- opl->write (0x43 + op_tableoplchan,
- 63 - channelchan.vol1 +
- (instchannelchan.inst.data10 & 192));
- }
-}
-
-void
-CmodPlayer::setvolume_alt (unsigned char chan)
-{
- unsigned char oplchan = set_opl_chip (chan);
- unsigned char ivol2 = instchannelchan.inst.data9 & 63;
- unsigned char ivol1 = instchannelchan.inst.data10 & 63;
-
- opl->write (0x40 + op_tableoplchan,
- (((63 - (channelchan.vol2 & 63)) + ivol2) >> 1) +
- (instchannelchan.inst.data9 & 192));
- opl->write (0x43 + op_tableoplchan,
- (((63 - (channelchan.vol1 & 63)) + ivol1) >> 1) +
- (instchannelchan.inst.data10 & 192));
-}
-
-void
-CmodPlayer::setfreq (unsigned char chan)
-{
- unsigned char oplchan = set_opl_chip (chan);
-
- opl->write (0xa0 + oplchan, channelchan.freq & 255);
- if (channelchan.key)
- opl->write (0xb0 + oplchan,
- ((channelchan.freq & 768) >> 8) +
- ((channelchan.oct << 2) | 32));
- else
- opl->write (0xb0 + oplchan,
- ((channelchan.freq & 768) >> 8) + (channelchan.oct << 2));
-}
-
-void
-CmodPlayer::playnote (unsigned char chan)
-{
- unsigned char oplchan = set_opl_chip (chan);
- unsigned char op = op_tableoplchan, insnr = channelchan.inst;
-
- if (!(flags & NoKeyOn))
- opl->write (0xb0 + oplchan, 0); // stop old note
-
- // set instrument data
- opl->write (0x20 + op, instinsnr.data1);
- opl->write (0x23 + op, instinsnr.data2);
- opl->write (0x60 + op, instinsnr.data3);
- opl->write (0x63 + op, instinsnr.data4);
- opl->write (0x80 + op, instinsnr.data5);
- opl->write (0x83 + op, instinsnr.data6);
- opl->write (0xe0 + op, instinsnr.data7);
- opl->write (0xe3 + op, instinsnr.data8);
- opl->write (0xc0 + oplchan, instinsnr.data0);
- opl->write (0xbd, instinsnr.misc); // set misc. register
-
- // set frequency, volume & play
- channelchan.key = 1;
- setfreq (chan);
-
- if (flags & Faust)
- {
- channelchan.vol2 = 63;
- channelchan.vol1 = 63;
- }
- setvolume (chan);
-}
-
-void
-CmodPlayer::setnote (unsigned char chan, int note)
-{
- if (note > 96)
- {
- if (note == 127)
- { // key off
- channelchan.key = 0;
- setfreq (chan);
- return;
- }
- else
- note = 96;
- }
-
- if (note < 13)
- channelchan.freq = notetablenote - 1;
- else if (note % 12 > 0)
- channelchan.freq = notetable(note % 12) - 1;
- else
- channelchan.freq = notetable11;
- channelchan.oct = (note - 1) / 12;
- channelchan.freq += instchannelchan.inst.slide; // apply pre-slide
-}
-
-void
-CmodPlayer::slide_down (unsigned char chan, int amount)
-{
- channelchan.freq -= amount;
- if (channelchan.freq <= 342)
- {
- if (channelchan.oct)
- {
- channelchan.oct--;
- channelchan.freq <<= 1;
- }
- else
- channelchan.freq = 342;
- }
-}
-
-void
-CmodPlayer::slide_up (unsigned char chan, int amount)
-{
- channelchan.freq += amount;
- if (channelchan.freq >= 686)
- {
- if (channelchan.oct < 7)
- {
- channelchan.oct++;
- channelchan.freq >>= 1;
- }
- else
- channelchan.freq = 686;
- }
-}
-
-void
-CmodPlayer::tone_portamento (unsigned char chan, unsigned char info)
-{
- if (channelchan.freq + (channelchan.oct << 10) <
- channelchan.nextfreq + (channelchan.nextoct << 10))
- {
- slide_up (chan, info);
- if (channelchan.freq + (channelchan.oct << 10) >
- channelchan.nextfreq + (channelchan.nextoct << 10))
- {
- channelchan.freq = channelchan.nextfreq;
- channelchan.oct = channelchan.nextoct;
- }
- }
- if (channelchan.freq + (channelchan.oct << 10) >
- channelchan.nextfreq + (channelchan.nextoct << 10))
- {
- slide_down (chan, info);
- if (channelchan.freq + (channelchan.oct << 10) <
- channelchan.nextfreq + (channelchan.nextoct << 10))
- {
- channelchan.freq = channelchan.nextfreq;
- channelchan.oct = channelchan.nextoct;
- }
- }
- setfreq (chan);
-}
-
-void
-CmodPlayer::vibrato (unsigned char chan, unsigned char speed,
- unsigned char depth)
-{
- int i;
-
- if (!speed || !depth)
- return;
-
- if (depth > 14)
- depth = 14;
-
- for (i = 0; i < speed; i++)
- {
- channelchan.trigger++;
- while (channelchan.trigger >= 64)
- channelchan.trigger -= 64;
- if (channelchan.trigger >= 16 && channelchan.trigger < 48)
- slide_down (chan,
- vibratotabchannelchan.trigger - 16 / (16 - depth));
- if (channelchan.trigger < 16)
- slide_up (chan, vibratotabchannelchan.trigger + 16 / (16 - depth));
- if (channelchan.trigger >= 48)
- slide_up (chan, vibratotabchannelchan.trigger - 48 / (16 - depth));
- }
- setfreq (chan);
-}
-
-void
-CmodPlayer::vol_up (unsigned char chan, int amount)
-{
- if (channelchan.vol1 + amount < 63)
- channelchan.vol1 += amount;
- else
- channelchan.vol1 = 63;
-
- if (channelchan.vol2 + amount < 63)
- channelchan.vol2 += amount;
- else
- channelchan.vol2 = 63;
-}
-
-void
-CmodPlayer::vol_down (unsigned char chan, int amount)
-{
- if (channelchan.vol1 - amount > 0)
- channelchan.vol1 -= amount;
- else
- channelchan.vol1 = 0;
-
- if (channelchan.vol2 - amount > 0)
- channelchan.vol2 -= amount;
- else
- channelchan.vol2 = 0;
-}
-
-void
-CmodPlayer::vol_up_alt (unsigned char chan, int amount)
-{
- if (channelchan.vol1 + amount < 63)
- channelchan.vol1 += amount;
- else
- channelchan.vol1 = 63;
- if (instchannelchan.inst.data0 & 1)
- {
- if (channelchan.vol2 + amount < 63)
- channelchan.vol2 += amount;
- else
- channelchan.vol2 = 63;
- }
-}
-
-void
-CmodPlayer::vol_down_alt (unsigned char chan, int amount)
-{
- if (channelchan.vol1 - amount > 0)
- channelchan.vol1 -= amount;
- else
- channelchan.vol1 = 0;
- if (instchannelchan.inst.data0 & 1)
- {
- if (channelchan.vol2 - amount > 0)
- channelchan.vol2 -= amount;
- else
- channelchan.vol2 = 0;
- }
-}

audacious-plugins-3.6.2-gtk3.tar.bz2/src/adplug/core/protrack.h Deleted

@@ -1,119 +0,0 @@
-/*
- * 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
- *
- * protrack.h - Generic Protracker Player by Simon Peter <dn.tlp@gmx.net>
- */
-
-#ifndef H_PROTRACK
-#define H_PROTRACK
-
-#include "player.h"
-
-class CmodPlayer: public CPlayer
-{
-public:
- CmodPlayer(Copl *newopl);
- virtual ~CmodPlayer();
-
- bool update();
- void rewind(int subsong);
- float getrefresh();
-
- unsigned int getpatterns()
- { return nop; }
- unsigned int getpattern()
- { return orderord; }
- unsigned int getorders()
- { return length; }
- unsigned int getorder()
- { return ord; }
- unsigned int getrow()
- { return rw; }
- unsigned int getspeed()
- { return speed; }
-
- protected:
- enum Flags {
- Standard = 0,
- Decimal = 1 << 0,
- Faust = 1 << 1,
- NoKeyOn = 1 << 2,
- Opl3 = 1 << 3,
- Tremolo = 1 << 4,
- Vibrato = 1 << 5,
- Percussion = 1 << 6
- };
-
- struct Instrument {
- unsigned char data11,arpstart,arpspeed,arppos,arpspdcnt,misc;
- signed char slide;
- } *inst;
-
- struct Tracks {
- unsigned char note,command,inst,param2,param1;
- } **tracks;
-
- unsigned char *order, *arplist, *arpcmd, initspeed;
- unsigned short tempo, **trackord, bpm, nop;
- unsigned long length, restartpos, activechan;
- int flags, curchip;
-
- struct Channel {
- unsigned short freq,nextfreq;
- unsigned char oct,vol1,vol2,inst,fx,info1,info2,key,nextoct,
- note,portainfo,vibinfo1,vibinfo2,arppos,arpspdcnt;
- signed char trigger;
- } *channel;
-
- void init_trackord();
- bool init_specialarp();
- void init_notetable(const unsigned short *newnotetable);
- bool realloc_order(unsigned long len);
- bool realloc_patterns(unsigned long pats, unsigned long rows, unsigned long chans);
- bool realloc_instruments(unsigned long len);
-
- void dealloc();
-
- private:
- static const unsigned short sa2_notetable12;
- static const unsigned char vibratotab32;
-
- unsigned char speed, del, songend, regbd;
- unsigned short notetable12;
- unsigned long rw, ord, nrows, npats, nchans;
-
- void setvolume(unsigned char chan);
- void setvolume_alt(unsigned char chan);
- void setfreq(unsigned char chan);
- void playnote(unsigned char chan);
- void setnote(unsigned char chan, int note);
- void slide_down(unsigned char chan, int amount);
- void slide_up(unsigned char chan, int amount);
- void tone_portamento(unsigned char chan, unsigned char info);
- void vibrato(unsigned char chan, unsigned char speed, unsigned char depth);
- void vol_up(unsigned char chan, int amount);
- void vol_down(unsigned char chan, int amount);
- void vol_up_alt(unsigned char chan, int amount);
- void vol_down_alt(unsigned char chan, int amount);
-
- void dealloc_patterns();
- bool resolve_order();
- unsigned char set_opl_chip(unsigned char chan);
-};
-
-#endif

audacious-plugins-3.6.2-gtk3.tar.bz2/src/adplug/core/psi.cc Deleted

@@ -1,187 +0,0 @@
-/*
- * Adplug - Replayer for many OPL2/OPL3 audio file formats.
- * Copyright (C) 1999 - 2003 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
- *
- * xad PSI player, by Riven the Mage <riven@ok.ru>
- */
-
-/*
- - discovery -
-
- file(s) : 4BIDDEN.COM, PGRID.EXE
- type : Forbidden Dreams BBStro
- Power Grid BBStro
- tune : by Friar Tuck Shadow Faction/ICE
- player : by Psi Future Crew
- comment : seems to me what 4bidden tune & player was ripped from pgrid
-
- file(s) : MYSTRUNE.COM
- type : Mystical Runes BBStro
- tune : by ?
- player : by Psi Future Crew
-*/
-
-#include "psi.h"
-#include "debug.h"
-
-const unsigned char
- CxadpsiPlayer::psi_adlib_registers99 = {
- 0x20, 0x23, 0x40, 0x43, 0x60, 0x63, 0x80, 0x83, 0xE0, 0xE3, 0xC0,
- 0x21, 0x24, 0x41, 0x44, 0x61, 0x64, 0x81, 0x84, 0xE1, 0xE4, 0xC1,
- 0x22, 0x25, 0x42, 0x45, 0x62, 0x65, 0x82, 0x85, 0xE2, 0xE5, 0xC2,
- 0x28, 0x2B, 0x48, 0x4B, 0x68, 0x6B, 0x88, 0x8B, 0xE8, 0xEB, 0xC3,
- 0x29, 0x2C, 0x49, 0x4C, 0x69, 0x6C, 0x89, 0x8C, 0xE9, 0xEC, 0xC4,
- 0x2A, 0x2D, 0x4A, 0x4D, 0x6A, 0x6D, 0x8A, 0x8D, 0xEA, 0xED, 0xC5,
- 0x30, 0x33, 0x50, 0x53, 0x70, 0x73, 0x90, 0x93, 0xF0, 0xF3, 0xC6,
- 0x31, 0x34, 0x51, 0x54, 0x71, 0x74, 0x91, 0x94, 0xF1, 0xF4, 0xC7,
- 0x32, 0x35, 0x52, 0x55, 0x72, 0x75, 0x92, 0x95, 0xF2, 0xF5, 0xC8
-};
-
-const unsigned short
- CxadpsiPlayer::psi_notes16 = {
- 0x216B, 0x2181, 0x2198, 0x21B0, 0x21CA, 0x21E5, 0x2202, 0x2220,
- 0x2241, 0x2263, 0x2287, 0x2364,
- 0x0000, 0x0000, 0x0000, 0x0000 // by riven
-};
-
-CPlayer *
-CxadpsiPlayer::factory (Copl * newopl)
-{
- return new CxadpsiPlayer (newopl);
-}
-
-void
-CxadpsiPlayer::xadplayer_rewind (int subsong)
-{
- opl_write (0x01, 0x20);
- opl_write (0x08, 0x00);
- opl_write (0xBD, 0x00);
-
- // get header
- header.instr_ptr = (tune1 << 8) + tune0;
- header.seq_ptr = (tune3 << 8) + tune2;
-
- // define instruments
- psi.instr_table = &tuneheader.instr_ptr;
-
- for (int i = 0; i < 8; i++)
- {
- for (int j = 0; j < 11; j++)
- {
- unsigned short inspos =
- (psi.instr_tablei * 2 + 1 << 8) + psi.instr_tablei * 2;
-
- opl_write (psi_adlib_registersi * 11 + j, tuneinspos + j);
- }
-
- opl_write (0xA0 + i, 0x00);
- opl_write (0xB0 + i, 0x00);
-
- psi.note_delayi = 1;
- psi.note_curdelayi = 1;
- psi.loopingi = 0;
- }
-
- // calculate sequence pointer
- psi.seq_table = &tuneheader.seq_ptr;
-}
-
-void
-CxadpsiPlayer::xadplayer_update ()
-{
- unsigned short ptr;
-
- for (int i = 0; i < 8; i++)
- {
- ptr =
- (psi.seq_table(i << 1) * 2 + 1 << 8) + psi.seq_table(i << 1) * 2;
-
- psi.note_curdelayi--;
-
- if (!psi.note_curdelayi)
- {
- opl_write (0xA0 + i, 0x00);
- opl_write (0xB0 + i, 0x00);
-
- unsigned char event = tuneptr++;
-#ifdef DEBUG
- AdPlug_LogWrite ("channel %02X, event %02X:\n", i + 1, event);
-#endif
-
- // end of sequence ?
- if (!event)
- {
- ptr =
- (psi.seq_table(i << 1) * 2 + 3 << 8) +
- psi.seq_table(i << 1) * 2 + 2;
-
- event = tuneptr++;
-#ifdef DEBUG
- AdPlug_LogWrite (" channel %02X, event %02X:\n", i + 1, event);
-#endif
-
- // set sequence loop flag
- psi.loopingi = 1;
-
- // module loop ?
- plr.looping = 1;
- for (int j = 0; j < 8; j++)
- plr.looping &= psi.loopingj;
- }
-
- // new note delay ?
- if (event & 0x80)
- {
- psi.note_delayi = (event & 0x7F);
-
- event = tuneptr++;
-#ifdef DEBUG
- AdPlug_LogWrite (" channel %02X, event %02X:\n", i + 1, event);
-#endif
- }
-
- psi.note_curdelayi = psi.note_delayi;
-
- // play note
- unsigned short note = psi_notesevent & 0x0F;
-
- opl_write (0xA0 + i, note & 0xFF);
- opl_write (0xB0 + i, (note >> 8) + ((event >> 2) & 0xFC));
-
- // save position
- psi.seq_table(i << 1) * 2 = ptr & 0xff;
- psi.seq_table(i << 1) * 2 + 1 = ptr >> 8;
- }
- }
-}
-
-float
-CxadpsiPlayer::xadplayer_getrefresh ()
-{
- return 70.0f;
-}
-
-std::string CxadpsiPlayer::xadplayer_gettype ()
-{
- return std::string ("xad: psi player");
-}
-
-unsigned int
-CxadpsiPlayer::xadplayer_getinstruments ()
-{
- return 8;
-}

audacious-plugins-3.6.2-gtk3.tar.bz2/src/adplug/core/psi.h Deleted

@@ -1,64 +0,0 @@
-/*
- * Adplug - Replayer for many OPL2/OPL3 audio file formats.
- * Copyright (C) 1999 - 2003 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
- *
- * xad PSI player, by Riven the Mage <riven@ok.ru>
- */
-
-#include "xad.h"
-
-class CxadpsiPlayer: public CxadPlayer
-{
-public:
- static CPlayer *factory(Copl *newopl);
-
- CxadpsiPlayer(Copl *newopl): CxadPlayer(newopl)
- { }
-
-protected:
- struct psi_header
- {
- unsigned short instr_ptr;
- unsigned short seq_ptr;
- } header;
-
- struct
- {
- unsigned char *instr_table;
- unsigned char *seq_table;
- unsigned char note_delay9;
- unsigned char note_curdelay9;
- unsigned char looping9;
- } psi;
- //
- bool		 xadplayer_load()
- {
- if(xad.fmt == PSI)
-	return true;
- else
-	return false;
- }
- void xadplayer_rewind(int subsong);
- void xadplayer_update();
- float xadplayer_getrefresh();
- std::string xadplayer_gettype();
- unsigned int xadplayer_getinstruments();
-
-private:
- static const unsigned char psi_adlib_registers99;
- static const unsigned short psi_notes16;
-};

audacious-plugins-3.6.2-gtk3.tar.bz2/src/adplug/core/rad.cc Deleted

@@ -1,155 +0,0 @@
-/*
- * 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
- *
- * rad.cpp - RAD Loader by Simon Peter <dn.tlp@gmx.net>
- *
- * BUGS:
- * some volumes are dropped out
- */
-
-#include <string.h>
-
-#include "rad.h"
-
-CPlayer *
-CradLoader::factory (Copl * newopl)
-{
- return new CradLoader (newopl);
-}
-
-bool
-CradLoader::load (VFSFile & fd, const CFileProvider & fp)
-{
- binistream *f = fp.open (fd);
- if (!f)
- return false;
- char id16;
- unsigned char buf, ch, c, b, inp;
- char bufstr2 = "\0";
- unsigned int i, j;
- unsigned short patofs32;
- const unsigned char convfx16 =
- { 255, 1, 2, 3, 255, 5, 255, 255, 255, 255, 20, 255, 17, 0xd, 255, 19 };
-
- // file validation section
- f->readString (id, 16);
- version = f->readInt (1);
- if (strncmp (id, "RAD by REALiTY!!", 16) || version != 0x10)
- {
- fp.close (f);
- return false;
- }
-
- // load section
- radflags = f->readInt (1);
- if (radflags & 128)
- { // description
- memset (desc, 0, 80 * 22);
- while ((buf = f->readInt (1)))
- if (buf == 1)
- strcat (desc, "\n");
- else if (buf >= 2 && buf <= 0x1f)
- for (i = 0; i < buf; i++)
- strcat (desc, " ");
- else
- {
- *bufstr = buf;
- strcat (desc, bufstr);
- }
- }
- while ((buf = f->readInt (1)))
- { // instruments
- buf--;
- instbuf.data2 = f->readInt (1);
- instbuf.data1 = f->readInt (1);
- instbuf.data10 = f->readInt (1);
- instbuf.data9 = f->readInt (1);
- instbuf.data4 = f->readInt (1);
- instbuf.data3 = f->readInt (1);
- instbuf.data6 = f->readInt (1);
- instbuf.data5 = f->readInt (1);
- instbuf.data0 = f->readInt (1);
- instbuf.data8 = f->readInt (1);
- instbuf.data7 = f->readInt (1);
- }
- length = f->readInt (1);
- for (i = 0; i < length; i++)
- orderi = f->readInt (1); // orderlist
- for (i = 0; i < 32; i++)
- patofsi = f->readInt (2); // pattern offset table
- init_trackord (); // patterns
- for (i = 0; i < 32; i++)
- if (patofsi)
- {
- f->seek (patofsi);
- do
- {
- buf = f->readInt (1);
- b = buf & 127;
- do
- {
- ch = f->readInt (1);
- c = ch & 127;
- inp = f->readInt (1);
- tracksi * 9 + cb.note = inp & 127;
- tracksi * 9 + cb.inst = (inp & 128) >> 3;
- inp = f->readInt (1);
- tracksi * 9 + cb.inst += inp >> 4;
- tracksi * 9 + cb.command = inp & 15;
- if (inp & 15)
- {
- inp = f->readInt (1);
- tracksi * 9 + cb.param1 = inp / 10;
- tracksi * 9 + cb.param2 = inp % 10;
- }
- } while (!(ch & 128));
- } while (!(buf & 128));
- }
- else
- memset (trackordi, 0, 9 * 2);
- fp.close (f);
-
- // convert replay data
- for (i = 0; i < 32 * 9; i++) // convert patterns
- for (j = 0; j < 64; j++)
- {
- if (tracksij.note == 15)
- tracksij.note = 127;
- if (tracksij.note > 16 && tracksij.note < 127)
- tracksij.note -= 4 * (tracksij.note >> 4);
- if (tracksij.note && tracksij.note < 126)
- tracksij.note++;
- tracksij.command = convfxtracksij.command;
- }
- restartpos = 0;
- initspeed = radflags & 31;
- bpm = radflags & 64 ? 0 : 50;
- flags = Decimal;
-
- rewind (0);
- return true;
-}
-
-float
-CradLoader::getrefresh ()
-{
- if (tempo)
- return (float) (tempo);
- else
- return 18.2f;
-}

audacious-plugins-3.6.2-gtk3.tar.bz2/src/adplug/core/rad.h Deleted

@@ -1,44 +0,0 @@
-/*
- * Adplug - Replayer for many OPL2/OPL3 audio file formats.
- * Copyright (C) 1999 - 2003 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
- *
- * rad.h - RAD Loader by Simon Peter <dn.tlp@gmx.net>
- */
-
-#include "protrack.h"
-
-class CradLoader: public CmodPlayer
-{
-public:
- static CPlayer *factory(Copl *newopl);
-
-	CradLoader(Copl *newopl)
-		: CmodPlayer(newopl)
-	{ *desc = '\0'; };
-
-	bool load(VFSFile &fd, const CFileProvider &fp);
-	float getrefresh();
-
-	std::string gettype()
-	{ return std::string("Reality ADlib Tracker"); };
-	std::string getdesc()
-	{ return std::string(desc); };
-
-private:
-	unsigned char version,radflags;
-	char desc80*22;
-};

audacious-plugins-3.6.2-gtk3.tar.bz2/src/adplug/core/rat.cc Deleted

@@ -1,311 +0,0 @@
-/*
- * Adplug - Replayer for many OPL2/OPL3 audio file formats.
- * Copyright (C) 1999 - 2003 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
- *
- * xad RAT player, by Riven the Mage <riven@ok.ru>
- */
-
-/*
- - discovery -
-
- file(s) : PINA.EXE
- type : Experimental Connection BBStro tune
- tune : by (?)Ratt/GRIF
- player : by (?)Ratt/GRIF
- comment : there are bug in original replayer's adlib_init(): wrong frequency registers.
-*/
-
-#include <string.h>
-
-#include "rat.h"
-#include "debug.h"
-
-const unsigned char
- CxadratPlayer::rat_adlib_bases18 = {
- 0x00, 0x01, 0x02, 0x08, 0x09, 0x0A, 0x10, 0x11, 0x12,
- 0x03, 0x04, 0x05, 0x0B, 0x0C, 0x0D, 0x13, 0x14, 0x15
-};
-
-const unsigned short
- CxadratPlayer::rat_notes16 = {
- 0x157, 0x16B, 0x181, 0x198, 0x1B0, 0x1CA, 0x1E5, 0x202, 0x220, 0x241, 0x263,
- 0x287,
- 0x000, 0x000, 0x000, 0x000 // by riven
-};
-
-CPlayer *
-CxadratPlayer::factory (Copl * newopl)
-{
- return new CxadratPlayer (newopl);
-}
-
-bool
-CxadratPlayer::xadplayer_load ()
-{
- if (xad.fmt != RAT)
- return false;
-
- // load header
- memcpy (&rat.hdr, &tune0, sizeof (rat_header));
-
- // is 'RAT'-signed ?
- if (strncmp (rat.hdr.id, "RAT", 3))
- return false;
-
- // is version 1.0 ?
- if (rat.hdr.version != 0x10)
- return false;
-
- // load order
- rat.order = &tune0x40;
-
- // load instruments
- rat.inst = (rat_instrument *) & tune0x140;
-
- // load pattern data
- unsigned short patseg = (rat.hdr.patseg1 << 8) + rat.hdr.patseg0;
- unsigned char *event_ptr = &tunepatseg << 4;
-
- for (int i = 0; i < rat.hdr.numpat; i++)
- for (int j = 0; j < 64; j++)
- for (int k = 0; k < rat.hdr.numchan; k++)
- {
- memcpy (&rat.tracksijk, event_ptr, sizeof (rat_event));
-
- event_ptr += sizeof (rat_event);
- }
-
- return true;
-}
-
-void
-CxadratPlayer::xadplayer_rewind (int subsong)
-{
- int i;
-
- rat.order_pos = rat.hdr.order_start;
- rat.pattern_pos = 0;
- rat.volume = rat.hdr.volume;
-
- plr.speed = rat.hdr.speed;
-
- // clear channel data
- memset (&rat.channel, 0, sizeof (rat.channel0) * 9);
-
- // init OPL
- opl_write (0x01, 0x20);
- opl_write (0x08, 0x00);
- opl_write (0xBD, 0x00);
-
- // set default frequencies
- for (i = 0; i < 9; i++)
- {
- opl_write (0xA0 + i, 0x00);
- opl_write (0xA3 + i, 0x00);
- opl_write (0xB0 + i, 0x00);
- opl_write (0xB3 + i, 0x00);
- }
-
- // set default volumes
- for (i = 0; i < 0x1F; i++)
- opl_write (0x40 + i, 0x3F);
-}
-
-void
-CxadratPlayer::xadplayer_update ()
-{
- int i;
-
- rat_event event;
-
- // process events
- for (i = 0; i < rat.hdr.numchan; i++)
- {
- memcpy (&event, &rat.tracksrat.orderrat.order_posrat.pattern_posi,
- sizeof (rat_event));
-#ifdef DEBUG
- AdPlug_LogWrite
- ("order %02X, pattern %02X, row %02X, channel %02X, event %02X %02X %02X %02X %02X:\n",
- rat.order_pos, rat.orderrat.order_pos, rat.pattern_pos, i,
- event.note, event.instrument, event.volume, event.fx, event.fxp);
-#endif
-
- // is instrument ?
- if (event.instrument != 0xFF)
- {
- rat.channeli.instrument = event.instrument - 1;
- rat.channeli.volume = rat.instevent.instrument - 1.volume;
- }
-
- // is volume ?
- if (event.volume != 0xFF)
- rat.channeli.volume = event.volume;
-
- // is note ?
- if (event.note != 0xFF)
- {
- // mute channel
- opl_write (0xB0 + i, 0x00);
- opl_write (0xA0 + i, 0x00);
-
- // if note != 0xFE then play
- if (event.note != 0xFE)
- {
- unsigned char ins = rat.channeli.instrument;
-
- // synthesis/feedback
- opl_write (0xC0 + i, rat.instins.connect);
-
- // controls
- opl_write (0x20 + rat_adlib_basesi, rat.instins.mod_ctrl);
- opl_write (0x20 + rat_adlib_basesi + 9, rat.instins.car_ctrl);
-
- // volumes
- opl_write (0x40 + rat_adlib_basesi,
- __rat_calc_volume (rat.instins.mod_volume,
- rat.channeli.volume, rat.volume));
- opl_write (0x40 + rat_adlib_basesi + 9,
- __rat_calc_volume (rat.instins.car_volume,
- rat.channeli.volume, rat.volume));
-
- // attack/decay
- opl_write (0x60 + rat_adlib_basesi, rat.instins.mod_AD);
- opl_write (0x60 + rat_adlib_basesi + 9, rat.instins.car_AD);
-
- // sustain/release
- opl_write (0x80 + rat_adlib_basesi, rat.instins.mod_SR);
- opl_write (0x80 + rat_adlib_basesi + 9, rat.instins.car_SR);
-
- // waveforms
- opl_write (0xE0 + rat_adlib_basesi, rat.instins.mod_wave);
- opl_write (0xE0 + rat_adlib_basesi + 9, rat.instins.car_wave);
-
- // octave/frequency
- unsigned short insfreq =
- (rat.instins.freq1 << 8) + rat.instins.freq0;
- unsigned short freq = insfreq * rat_notesevent.note & 0x0F / 0x20AB;
-
- opl_write (0xA0 + i, freq & 0xFF);
- opl_write (0xB0 + i, (freq >> 8) | ((event.note & 0xF0) >> 2) | 0x20);
- }
- }
-
- // is effect ?
- if (event.fx != 0xFF)
- {
- rat.channeli.fx = event.fx;
- rat.channeli.fxp = event.fxp;
- }
- }
-
- // next row
- rat.pattern_pos++;
-
- // process effects
- for (i = 0; i < rat.hdr.numchan; i++)
- {
- unsigned char old_order_pos = rat.order_pos;
-
- switch (rat.channeli.fx)
- {
- case 0x01: // 0x01: Set Speed
- plr.speed = rat.channeli.fxp;
- break;
- case 0x02: // 0x02: Position Jump
- if (rat.channeli.fxp < rat.hdr.order_end)
- rat.order_pos = rat.channeli.fxp;
- else
- rat.order_pos = 0;
-
- // jumpback ?
- if (rat.order_pos <= old_order_pos)
- plr.looping = 1;
-
- rat.pattern_pos = 0;
- break;
- case 0x03: // 0x03: Pattern Break (?)
- rat.pattern_pos = 0x40;
- break;
- }
-
- rat.channeli.fx = 0;
- }
-
- // end of pattern ?
- if (rat.pattern_pos >= 0x40)
- {
- rat.pattern_pos = 0;
-
- rat.order_pos++;
-
- // end of module ?
- if (rat.order_pos == rat.hdr.order_end)
- {
- rat.order_pos = rat.hdr.order_loop;
-
- plr.looping = 1;
- }
- }
-}
-
-float
-CxadratPlayer::xadplayer_getrefresh ()
-{
- return 60.0f;
-}
-
-std::string CxadratPlayer::xadplayer_gettype ()
-{
- return (std::string ("xad: rat player"));
-}
-
-std::string CxadratPlayer::xadplayer_gettitle ()
-{
- return (std::string (rat.hdr.title, 32));
-}
-
-unsigned int
-CxadratPlayer::xadplayer_getinstruments ()
-{
- return rat.hdr.numinst;
-}
-
-/* -------- Internal Functions ---------------------------- */
-
-unsigned char
-CxadratPlayer::__rat_calc_volume (unsigned char ivol, unsigned char cvol,
- unsigned char gvol)
-{
-#ifdef DEBUG
- AdPlug_LogWrite ("volumes: instrument %02X, channel %02X, global %02X:\n",
- ivol, cvol, gvol);
-#endif
- unsigned short vol;
-
- vol = ivol;
- vol &= 0x3F;
- vol ^= 0x3F;
- vol *= cvol;
- vol >>= 6;
- vol *= gvol;
- vol >>= 6;
- vol ^= 0x3F;
-
- vol |= ivol & 0xC0;
-
- return vol;
-}

audacious-plugins-3.6.2-gtk3.tar.bz2/src/adplug/core/rat.h Deleted

@@ -1,121 +0,0 @@
-/*
- * Adplug - Replayer for many OPL2/OPL3 audio file formats.
- * Copyright (C) 1999 - 2003 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
- *
- * xad RAT player, by Riven the Mage <riven@ok.ru>
- */
-
-#include "xad.h"
-
-class CxadratPlayer: public CxadPlayer
-{
-public:
- static CPlayer *factory(Copl *newopl);
-
- CxadratPlayer(Copl *newopl): CxadPlayer(newopl)
- { }
-
-protected:
- struct rat_header
- {
- char id3;
- unsigned char version;
- char title32;
- unsigned char numchan;
- unsigned char reserved_25;
- unsigned char order_end;
- unsigned char reserved_27;
- unsigned char numinst; // ?: Number of Instruments
- unsigned char reserved_29;
- unsigned char numpat; // ?: Number of Patterns
- unsigned char reserved_2B;
- unsigned char order_start;
- unsigned char reserved_2D;
- unsigned char order_loop;
- unsigned char reserved_2F;
- unsigned char volume;
- unsigned char speed;
- unsigned char reserved_3212;
- unsigned char patseg2;
- };
-
- struct rat_event
- {
- unsigned char note;
- unsigned char instrument;
- unsigned char volume;
- unsigned char fx;
- unsigned char fxp;
- };
-
- struct rat_instrument
- {
- unsigned char freq2;
- unsigned char reserved_22;
- unsigned char mod_ctrl;
- unsigned char car_ctrl;
- unsigned char mod_volume; 
- unsigned char car_volume; 
- unsigned char mod_AD; 
- unsigned char car_AD; 
- unsigned char mod_SR; 
- unsigned char car_SR; 
- unsigned char mod_wave;
- unsigned char car_wave;
- unsigned char connect;
- unsigned char reserved_F;
- unsigned char volume;
- unsigned char reserved_113;
- };
-
- struct
- {
- rat_header hdr;
-
- unsigned char volume;
- unsigned char order_pos;
- unsigned char pattern_pos;
-
- unsigned char *order;
-
- rat_instrument *inst;
-
- rat_event tracks256649;
-
- struct
- {
- unsigned char instrument;
- unsigned char volume;
- unsigned char fx;
- unsigned char fxp;
- } channel9;
- } rat;
- //
- bool xadplayer_load();
- void xadplayer_rewind(int subsong);
- void xadplayer_update();
- float xadplayer_getrefresh();
- std::string	 xadplayer_gettype();
- std::string xadplayer_gettitle();
- unsigned int xadplayer_getinstruments();
- //
-private:
- static const unsigned char rat_adlib_bases18;
- static const unsigned short rat_notes16;
-
- unsigned char __rat_calc_volume(unsigned char ivol, unsigned char cvol, unsigned char gvol);
-};

audacious-plugins-3.6.2-gtk3.tar.bz2/src/adplug/core/raw.cc Deleted

@@ -1,129 +0,0 @@
-/*
- * Adplug - Replayer for many OPL2/OPL3 audio file formats.
- * Copyright (C) 1999 - 2005 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
- *
- * raw.c - RAW Player by Simon Peter <dn.tlp@gmx.net>
- */
-
-#include <string.h>
-
-#include "raw.h"
-
-/*** public methods *************************************/
-
-CPlayer *
-CrawPlayer::factory (Copl * newopl)
-{
- return new CrawPlayer (newopl);
-}
-
-bool
-CrawPlayer::load (VFSFile & fd, const CFileProvider & fp)
-{
- binistream *f = fp.open (fd);
- if (!f)
- return false;
- char id8;
- unsigned long i;
-
- // file validation section
- f->readString (id, 8);
- if (strncmp (id, "RAWADATA", 8))
- {
- fp.close (f);
- return false;
- }
-
- // load section
- clock = f->readInt (2); // clock speed
- length = (fp.filesize (f) - 10) / 2;
- data = new Tdatalength;
- for (i = 0; i < length; i++)
- {
- datai.param = f->readInt (1);
- datai.command = f->readInt (1);
- }
-
- fp.close (f);
- rewind (0);
- return true;
-}
-
-bool
-CrawPlayer::update ()
-{
- bool setspeed;
-
- if (pos >= length)
- return false;
-
- if (del)
- {
- del--;
- return !songend;
- }
-
- do
- {
- setspeed = false;
- switch (datapos.command)
- {
- case 0:
- del = datapos.param - 1;
- break;
- case 2:
- if (!datapos.param)
- {
- pos++;
- speed = datapos.param + (datapos.command << 8);
- setspeed = true;
- }
- else
- opl->setchip (datapos.param - 1);
- break;
- case 0xff:
- if (datapos.param == 0xff)
- {
- rewind (0); // auto-rewind song
- songend = true;
- return !songend;
- }
- break;
- default:
- opl->write (datapos.command, datapos.param);
- break;
- }
- } while (datapos++.command || setspeed);
-
- return !songend;
-}
-
-void
-CrawPlayer::rewind (int subsong)
-{
- pos = del = 0;
- speed = clock;
- songend = false;
- opl->init ();
- opl->write (1, 32); // go to 9 channel mode
-}
-
-float
-CrawPlayer::getrefresh ()
-{
- return 1193180.0 / (speed ? speed : 0xffff); // timer oscillator speed / wait register = clock frequency
-}

audacious-plugins-3.6.2-gtk3.tar.bz2/src/adplug/core/raw.h Deleted

@@ -1,52 +0,0 @@
-/*
- * Adplug - Replayer for many OPL2/OPL3 audio file formats.
- * Copyright (C) 1999 - 2005 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
- *
- * raw.h - RAW Player by Simon Peter <dn.tlp@gmx.net>
- */
-
-#include "player.h"
-
-class CrawPlayer: public CPlayer
-{
-public:
- static CPlayer *factory(Copl *newopl);
-
-	CrawPlayer(Copl *newopl)
-		: CPlayer(newopl), data(0)
-	{ };
-	~CrawPlayer()
-	{ if(data) delete data; };
-
-	bool load(VFSFile &fd, const CFileProvider &fp);
-	bool update();
-	void rewind(int subsong);
-	float getrefresh();
-
-	std::string gettype()
-	{ return std::string("RdosPlay RAW"); };
-
-protected:
-	struct Tdata {
-		unsigned char param, command;
-	} *data;
-
-	unsigned long pos, length;
-	unsigned short clock, speed;
-	unsigned char del;
-	bool songend;
-};

audacious-plugins-3.6.2-gtk3.tar.bz2/src/adplug/core/rix.cc Deleted

@@ -1,611 +0,0 @@
-/*
- * 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
- *
- * rix.cpp - Softstar RIX OPL Format Player by palxex <palxex.ys168.com>
- * BSPAL <BSPAL.ys168.com>
- */
-
-#include <cstdlib>
-#include <string.h>
-
-#include "rix.h"
-#include "debug.h"
-
-#include <libaudcore/audstrings.h>
-
-const unsigned char
-CrixPlayer::adflag =
- { 0, 0, 0, 1, 1, 1, 0, 0, 0, 1, 1, 1, 0, 0, 0, 1, 1, 1 };
-const unsigned char
-CrixPlayer::reg_data =
- { 0, 1, 2, 3, 4, 5, 8, 9, 10, 11, 12, 13, 16, 17, 18, 19, 20, 21 };
-const unsigned char
-CrixPlayer::ad_C0_offs =
- { 0, 1, 2, 0, 1, 2, 3, 4, 5, 3, 4, 5, 6, 7, 8, 6, 7, 8 };
-const unsigned char
- CrixPlayer::modify =
- { 0, 3, 1, 4, 2, 5, 6, 9, 7, 10, 8, 11, 12, 15, 13, 16, 14, 17, 12,
- 15, 16, 0, 14, 0, 17, 0, 13, 0
-};
-const unsigned char
- CrixPlayer::bd_reg_data = {
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x08, 0x04, 0x02, 0x01,
- 0x00, 0x01, 0x01, 0x03, 0x0F, 0x05, 0x00, 0x01, 0x03, 0x0F, 0x00,
- 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x01, 0x0F, 0x07, 0x00, 0x02,
- 0x04, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0A,
- 0x04, 0x00, 0x08, 0x0C, 0x0B, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00,
- 0x00, 0x00, 0x0D, 0x04, 0x00, 0x06, 0x0F, 0x00, 0x00, 0x00, 0x00,
- 0x01, 0x00, 0x00, 0x0C, 0x00, 0x0F, 0x0B, 0x00, 0x08, 0x05, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x0F, 0x0B, 0x00,
- 0x07, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00,
- 0x0F, 0x0B, 0x00, 0x05, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x01, 0x00, 0x0F, 0x0B, 0x00, 0x07, 0x05, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00
-};
-unsigned char
- CrixPlayer::for40reg =
- { 0x7F, 0x7F, 0x7F, 0x7F, 0x7F, 0x7F, 0x7F, 0x7F, 0x7F,
- 0x7F, 0x7F, 0x7F, 0x7F, 0x7F, 0x7F, 0x7F, 0x7F, 0x7F
-};
-unsigned short
- CrixPlayer::mus_time = 0x4268;
-
-/*** public methods *************************************/
-
-CPlayer *
-CrixPlayer::factory (Copl * newopl)
-{
- return new CrixPlayer (newopl);
-}
-
-CrixPlayer::CrixPlayer (Copl * newopl):CPlayer (newopl), flag_mkf (0), file_buffer (0),
-buf_addr (0)
-{
-}
-
-CrixPlayer::~CrixPlayer ()
-{
- if (file_buffer)
- deletefile_buffer;
-}
-
-bool
-CrixPlayer::load (VFSFile & fd, const CFileProvider & fp)
-{
- binistream *f = fp.open (fd);
- if (!f)
- return false;
- unsigned long i = 0;
- std::string filename (fd.filename ());
-
- if (str_has_suffix_nocase (filename.c_str (), ".mkf"))
- {
- flag_mkf = 1;
- f->seek (0);
- int offset = f->readInt (4);
- f->seek (offset);
- }
- if (f->readInt (2) != 0x55aa)
- {
- fp.close (f);
- return false;
- }
- file_buffer = new unsigned charfp.filesize (f) + 1;
- f->seek (0);
- while (!f->eof ())
- file_bufferi++ = f->readInt (1);
- length = i;
- fp.close (f);
- if (!flag_mkf)
- buf_addr = file_buffer;
- rewind (0);
- return true;
-}
-
-bool
-CrixPlayer::update ()
-{
- int_08h_entry ();
- return !play_end;
-}
-
-void
-CrixPlayer::rewind (int subsong)
-{
- I = 0;
- T = 0;
- mus_block = 0;
- ins_block = 0;
- rhythm = 0;
- music_on = 0;
- pause_flag = 0;
- band = 0;
- band_low = 0;
- e0_reg_flag = 0;
- bd_modify = 0;
- sustain = 0;
- play_end = 0;
- pos = index = 0;
-
- memset (f_buffer, 0, sizeof (unsigned short) * 300);
- memset (a0b0_data2, 0, sizeof (unsigned short) * 11);
- memset (a0b0_data3, 0, 18);
- memset (a0b0_data4, 0, 18);
- memset (a0b0_data5, 0, 96);
- memset (addrs_head, 0, 96);
- memset (insbuf, 0, 28 * sizeof (unsigned short));
- memset (displace, 0, 11 * sizeof (unsigned short));
- memset (reg_bufs, 0, 18 * sizeof (ADDT));
-
- if (flag_mkf)
- {
- unsigned int *buf_index = (unsigned int *) file_buffer;
- int offset1 = buf_indexsubsong, offset2;
- while ((offset2 = buf_index++subsong) == offset1);
- length = offset2 - offset1 + 1;
- buf_addr = file_buffer + offset1;
- }
- opl->init ();
- opl->write (1, 32); // go to OPL2 mode
- set_new_int ();
- data_initial ();
-}
-
-unsigned int
-CrixPlayer::getsubsongs ()
-{
- if (flag_mkf)
- {
- unsigned int *buf_index = (unsigned int *) file_buffer;
- int songs = buf_index0 / 4, i = 0;
- for (i = 0; i < songs; i++)
- if (buf_indexi + 1 == buf_indexi)
- songs--;
- return songs;
- }
- else
- return 1;
-}
-
-float
-CrixPlayer::getrefresh ()
-{
- return 70.0f;
-}
-
-/*------------------Implemention----------------------------*/
-inline void
-CrixPlayer::set_new_int ()
-{
-// if(!ad_initial()) exit(1);
- ad_initial ();
-}
-
-/*----------------------------------------------------------*/
-inline void
-CrixPlayer::Pause ()
-{
- unsigned short i;
- pause_flag = 1;
- for (i = 0; i < 11; i++)
- switch_ad_bd (i);
-}
-
-/*----------------------------------------------------------*/
-inline void
-CrixPlayer::ad_a0b0l_reg_ (unsigned short index, unsigned short p2,
- unsigned short p3)
-{
-// unsigned short i = p2+a0b0_data2index;
- a0b0_data4index = p3;
- a0b0_data3index = p2;
-}
-inline void
-CrixPlayer::data_initial ()
-{
- rhythm = buf_addr2;
- mus_block = (buf_addr0x0D << 8) + buf_addr0x0C;
- ins_block = (buf_addr0x09 << 8) + buf_addr0x08;
- I = mus_block + 1;
- if (rhythm != 0)
- {
- // ad_a0b0_reg(6);
- // ad_a0b0_reg(7);
- // ad_a0b0_reg(8);
- ad_a0b0l_reg_ (8, 0x18, 0);
- ad_a0b0l_reg_ (7, 0x1F, 0);
- }
- bd_modify = 0;
- // ad_bd_reg();
- band = 0;
- music_on = 1;
-}
-
-/*----------------------------------------------------------*/
-inline unsigned short
-CrixPlayer::ad_initial ()
-{
- unsigned short i, j, k = 0;
- for (i = 0; i < 25; i++)
- {
- f_bufferi * 12 =
- (unsigned int) ((i * 24 + 10000) * 0.27461678223 + 4) >> 3;
- for (int t = 1; t < 12; t++)
- f_bufferi * 12 + t =
- (unsigned int) ((double) f_bufferi * 12 + t - 1 * 1.06);
- }
- for (i = 0; i < 8; i++)
- for (j = 0; j < 12; j++)
- {
- a0b0_data5k = i;
- addrs_headk = j;
- k++;
- }
- //ad_bd_reg();
- //ad_08_reg();
- //for(i=0;i<9;i++) ad_a0b0_reg(i);
- e0_reg_flag = 0x20;
- //for(i=0;i<18;i++) ad_bop(0xE0+reg_datai,0);
- //ad_bop(1,e0_reg_flag);
- return 1; //ad_test();
-}
-
-/*----------------------------------------------------------*/
-inline void
-CrixPlayer::ad_bop (unsigned short reg, unsigned short value)
-{
- if (reg == 2 || reg == 3)
- AdPlug_LogWrite ("switch OPL2/3 mode!\n");
- opl->write (reg & 0xff, value & 0xff);
-}
-
-/*--------------------------------------------------------------*/
-inline void
-CrixPlayer::int_08h_entry ()
-{
- unsigned short band_sus = 1;
- while (band_sus)
- {
- if (sustain <= 0)
- {
- band_sus = rix_proc ();
- if (band_sus)
- sustain += band_sus;
- else
- {
- play_end = 1;
- break;
- }
- }
- else
- {
- if (band_sus)
- sustain -= 14; /* aging */
- break;
- }
- }
-}
-
-/*--------------------------------------------------------------*/
-inline unsigned short
-CrixPlayer::rix_proc ()
-{
- unsigned char ctrl = 0;
- if (music_on == 0 || pause_flag == 1)
- return 0;
- band = 0;
- while (buf_addrI != 0x80 && I < length - 1)
- {
- band_low = buf_addrI - 1;
- ctrl = buf_addrI;
- I += 2;
- switch (ctrl & 0xF0)
- {
- case 0x90:
- rix_get_ins ();
- rix_90_pro (ctrl & 0x0F);
- break;
- case 0xA0:
- rix_A0_pro (ctrl & 0x0F, ((unsigned short) band_low) << 6);
- break;
- case 0xB0:
- rix_B0_pro (ctrl & 0x0F, band_low);
- break;
- case 0xC0:
- switch_ad_bd (ctrl & 0x0F);
- if (band_low != 0)
- rix_C0_pro (ctrl & 0x0F, band_low);
- break;
- default:
- band = (ctrl << 8) + band_low;
- break;
- }
- if (band != 0)
- return band;
- }
- music_ctrl ();
- I = mus_block + 1;
- band = 0;
- music_on = 1;
- return 0;
-}
-
-/*--------------------------------------------------------------*/
-inline void
-CrixPlayer::rix_get_ins ()
-{
- int i;
- unsigned char *baddr = (&buf_addrins_block) + (band_low << 6);
-
- for (i = 0; i < 28; i++)
- insbufi = (baddri * 2 + 1 << 8) + baddri * 2;
-}
-
-/*--------------------------------------------------------------*/
-inline void
-CrixPlayer::rix_90_pro (unsigned short ctrl_l)
-{
- if (rhythm == 0 || ctrl_l < 6)
- {
- ins_to_reg (modifyctrl_l * 2, insbuf, insbuf26);
- ins_to_reg (modifyctrl_l * 2 + 1, insbuf + 13, insbuf27);
- return;
- }
- else if (ctrl_l > 6)
- {
- ins_to_reg (modifyctrl_l * 2 + 6, insbuf, insbuf26);
- return;
- }
- else
- {
- ins_to_reg (12, insbuf, insbuf26);
- ins_to_reg (15, insbuf + 13, insbuf27);
- return;
- }
-}
-
-/*--------------------------------------------------------------*/
-inline void
-CrixPlayer::rix_A0_pro (unsigned short ctrl_l, unsigned short index)
-{
- if (rhythm == 0 || ctrl_l <= 6)
- {
- prepare_a0b0 (ctrl_l, index > 0x3FFF ? 0x3FFF : index);
- ad_a0b0l_reg (ctrl_l, a0b0_data3ctrl_l, a0b0_data4ctrl_l);
- }
- else
- return;
-}
-
-/*--------------------------------------------------------------*/
-inline void
-CrixPlayer::prepare_a0b0 (unsigned short index, unsigned short v) /* important ! */
-{
- short high = 0, low = 0;
- unsigned int res;
- int res1 = (v - 0x2000) * 0x19;
- if (res1 == (int) 0xff)
- return;
- low = res1 / 0x2000;
- if (low < 0)
- {
- low = 0x18 - low;
- high = (signed short) low < 0 ? 0xFFFF : 0;
- res = high;
- res <<= 16;
- res += low;
- low = ((signed short) res) / (signed short) 0xFFE7;
- a0b0_data2index = low;
- low = res;
- res = low - 0x18;
- high = (signed short) res % 0x19;
- low = (signed short) res / 0x19;
- if (high != 0)
- {
- low = 0x19;
- low = low - high;
- }
- }
- else
- {
- res = high = low;
- low = (signed short) res / (signed short) 0x19;
- a0b0_data2index = low;
- res = high;
- low = (signed short) res % (signed short) 0x19;
- }
- low = (signed short) low *(signed short) 0x18;
- displaceindex = low;
-}
-
-/*--------------------------------------------------------------*/
-inline void
-CrixPlayer::ad_a0b0l_reg (unsigned short index, unsigned short p2,
- unsigned short p3)
-{
- unsigned short data;
- unsigned short i = p2 + a0b0_data2index;
- a0b0_data4index = p3;
- a0b0_data3index = p2;
- i = ((signed short) i <= 0x5F ? i : 0x5F);
- i = ((signed short) i >= 0 ? i : 0);
- data = f_bufferaddrs_headi + displaceindex / 2;
- ad_bop (0xA0 + index, data);
- data = a0b0_data5i * 4 + (p3 < 1 ? 0 : 0x20) + ((data >> 8) & 3);
- ad_bop (0xB0 + index, data);
-}
-
-/*--------------------------------------------------------------*/
-inline void
-CrixPlayer::rix_B0_pro (unsigned short ctrl_l, unsigned short index)
-{
- int temp = 0;
- if (rhythm == 0 || ctrl_l < 6)
- temp = modifyctrl_l * 2 + 1;
- else
- {
- temp = ctrl_l > 6 ? ctrl_l * 2 : ctrl_l * 2 + 1;
- temp = modifytemp + 6;
- }
- for40regtemp = index > 0x7F ? 0x7F : index;
- ad_40_reg (temp);
-}
-
-/*--------------------------------------------------------------*/
-inline void
-CrixPlayer::rix_C0_pro (unsigned short ctrl_l, unsigned short index)
-{
- unsigned short i = index >= 12 ? index - 12 : 0;
- if (ctrl_l < 6 || rhythm == 0)
- {
- ad_a0b0l_reg (ctrl_l, i, 1);
- return;
- }
- else
- {
- if (ctrl_l != 6)
- {
- if (ctrl_l == 8)
- {
- ad_a0b0l_reg (ctrl_l, i, 0);
- ad_a0b0l_reg (7, i + 7, 0);
- }
- }
- else
- ad_a0b0l_reg (ctrl_l, i, 0);
- bd_modify |= bd_reg_datactrl_l;
- ad_bd_reg ();
- return;
- }
-}
-
-/*--------------------------------------------------------------*/
-inline void
-CrixPlayer::switch_ad_bd (unsigned short index)
-{
-
- if (rhythm == 0 || index < 6)
- ad_a0b0l_reg (index, a0b0_data3index, 0);
- else
- {
- bd_modify &= (~bd_reg_dataindex), ad_bd_reg ();
- }
-}
-
-/*--------------------------------------------------------------*/
-inline void
-CrixPlayer::ins_to_reg (unsigned short index, unsigned short *insb,
- unsigned short value)
-{
- unsigned short i;
- for (i = 0; i < 13; i++)
- reg_bufsindex.vi = insbi;
- reg_bufsindex.v13 = value & 3;
- ad_bd_reg (), ad_08_reg (),
- ad_40_reg (index), ad_C0_reg (index), ad_60_reg (index),
- ad_80_reg (index), ad_20_reg (index), ad_E0_reg (index);
-}
-
-/*--------------------------------------------------------------*/
-inline void
-CrixPlayer::ad_E0_reg (unsigned short index)
-{
- unsigned short data = e0_reg_flag == 0 ? 0 : (reg_bufsindex.v13 & 3);
- ad_bop (0xE0 + reg_dataindex, data);
-}
-
-/*--------------------------------------------------------------*/
-inline void
-CrixPlayer::ad_20_reg (unsigned short index)
-{
- unsigned short data = (reg_bufsindex.v9 < 1 ? 0 : 0x80);
- data += (reg_bufsindex.v10 < 1 ? 0 : 0x40);
- data += (reg_bufsindex.v5 < 1 ? 0 : 0x20);
- data += (reg_bufsindex.v11 < 1 ? 0 : 0x10);
- data += (reg_bufsindex.v1 & 0x0F);
- ad_bop (0x20 + reg_dataindex, data);
-}
-
-/*--------------------------------------------------------------*/
-inline void
-CrixPlayer::ad_80_reg (unsigned short index)
-{
- unsigned short data = (reg_bufsindex.v7 & 0x0F), temp =
- reg_bufsindex.v4;
- data |= (temp << 4);
- ad_bop (0x80 + reg_dataindex, data);
-}
-
-/*--------------------------------------------------------------*/
-inline void
-CrixPlayer::ad_60_reg (unsigned short index)
-{
- unsigned short data = reg_bufsindex.v6 & 0x0F, temp =
- reg_bufsindex.v3;
- data |= (temp << 4);
- ad_bop (0x60 + reg_dataindex, data);
-}
-
-/*--------------------------------------------------------------*/
-inline void
-CrixPlayer::ad_C0_reg (unsigned short index)
-{
- unsigned short data = reg_bufsindex.v2;
- if (adflagindex == 1)
- return;
- data *= 2, data |= (reg_bufsindex.v12 < 1 ? 1 : 0);
- ad_bop (0xC0 + ad_C0_offsindex, data);
-}
-
-/*--------------------------------------------------------------*/
-inline void
-CrixPlayer::ad_40_reg (unsigned short index)
-{
- unsigned int res = 0;
- unsigned short data = 0, temp = reg_bufsindex.v0;
- data = 0x3F - (0x3F & reg_bufsindex.v8),
- data *= for40regindex, data *= 2, data += 0x7F, res = data;
- data = res / 0xFE, data -= 0x3F, data = -data, data |= temp << 6;
- ad_bop (0x40 + reg_dataindex, data);
-}
-
-/*--------------------------------------------------------------*/
-inline void
-CrixPlayer::ad_bd_reg ()
-{
- unsigned short data = rhythm < 1 ? 0 : 0x20;
- data |= bd_modify;
- ad_bop (0xBD, data);
-}
-
-/*--------------------------------------------------------------*/
-inline void
-CrixPlayer::ad_a0b0_reg (unsigned short index)
-{
- ad_bop (0xA0 + index, 0);
- ad_bop (0xB0 + index, 0);
-}
-
-/*--------------------------------------------------------------*/
-inline void
-CrixPlayer::music_ctrl ()
-{
- int i;
- for (i = 0; i < 11; i++)
- switch_ad_bd (i);
-}

audacious-plugins-3.6.2-gtk3.tar.bz2/src/adplug/core/rix.h Deleted

@@ -1,112 +0,0 @@
-/*
- * Adplug - Replayer for many OPL2/OPL3 audio file formats.
- * Copyright (C) 1999 - 2006 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
- *
- * rix.h - Softstar RIX OPL Format Player by palxex <palxex.ys168.com>
- * BSPAL <BSPAL.ys168.com>
- */
-
-#include "player.h"
-
-class CrixPlayer: public CPlayer
-{
- public:
- static CPlayer *factory(Copl *newopl);
-
- CrixPlayer(Copl *newopl);
- ~CrixPlayer();
-
- bool load(VFSFile &fd, const CFileProvider &fp);
- bool update();
- void rewind(int subsong);
- float getrefresh();
- unsigned int getsubsongs();
-
- std::string gettype()
- { return std::string("Softstar RIX OPL Music Format"); };
-
- protected:	
- typedef struct {
- unsigned char v14;
- } ADDT;
-
- int flag_mkf;
- unsigned char *file_buffer;
- unsigned char *buf_addr; /* rix files' f_buffer */
- unsigned short f_buffer300;//9C0h-C18h
- unsigned short a0b0_data211;
- unsigned char a0b0_data318;
- unsigned char a0b0_data418;
- unsigned char a0b0_data596;
- unsigned char addrs_head96;
- unsigned short insbuf28;
- unsigned short displace11;
- ADDT reg_bufs18;
- unsigned long pos,length;
- unsigned char index;
-
- static const unsigned char adflag18;
- static const unsigned char reg_data18;
- static const unsigned char ad_C0_offs18;
- static const unsigned char modify28;
- static const unsigned char bd_reg_data124;
- static unsigned char for40reg18;
- static unsigned short mus_time;
- unsigned int I,T;
- unsigned short mus_block;
- unsigned short ins_block;
- unsigned char rhythm;
- unsigned char music_on;
- unsigned char pause_flag;
- unsigned short band;
- unsigned char band_low;
- unsigned short e0_reg_flag;
- unsigned char bd_modify;
- int sustain;
- int play_end;
-
-#define ad_08_reg() ad_bop(8,0) /**/
- inline void ad_20_reg(unsigned short); /**/
- inline void ad_40_reg(unsigned short); /**/
- inline void ad_60_reg(unsigned short); /**/
- inline void ad_80_reg(unsigned short); /**/
- inline void ad_a0b0_reg(unsigned short); /**/
- inline void ad_a0b0l_reg(unsigned short,unsigned short,unsigned short); /**/
- inline void ad_a0b0l_reg_(unsigned short,unsigned short,unsigned short); /**/
- inline void ad_bd_reg(); /**/
- inline void ad_bop(unsigned short,unsigned short); /**/
- inline void ad_C0_reg(unsigned short); /**/
- inline void ad_E0_reg(unsigned short); /**/
- inline unsigned short ad_initial(); /**/
- inline unsigned short ad_test(); /**/
- inline void crc_trans(unsigned short,unsigned short); /**/
- inline void data_initial(); /* done */
- inline void init(); /**/
- inline void ins_to_reg(unsigned short,unsigned short*,unsigned short); /**/
- inline void int_08h_entry(); /**/
- inline void music_ctrl(); /**/
- inline void Pause(); /**/
- inline void prepare_a0b0(unsigned short,unsigned short); /**/
- inline void rix_90_pro(unsigned short); /**/
- inline void rix_A0_pro(unsigned short,unsigned short); /**/
- inline void rix_B0_pro(unsigned short,unsigned short); /**/
- inline void rix_C0_pro(unsigned short,unsigned short); /**/
- inline void rix_get_ins(); /**/
- inline unsigned short rix_proc(); /**/
- inline void set_new_int();
- inline void switch_ad_bd(unsigned short); /**/
-};

audacious-plugins-3.6.2-gtk3.tar.bz2/src/adplug/core/rol.cc Deleted

@@ -1,747 +0,0 @@
-/*
- * Adplug - Replayer for many OPL2/OPL3 audio file formats.
- * Copyright (C) 1999 - 2006 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
- *
- * rol.h - ROL Player by OPLx <oplx@yahoo.com>
- *
- * Visit: http://tenacity.hispeed.com/aomit/oplx/
- */
-#include <algorithm>
-#include <string.h>
-
-#include "rol.h"
-#include "debug.h"
-
-int const CrolPlayer::kSizeofDataRecord = 30;
-int const CrolPlayer::kMaxTickBeat = 60;
-int const CrolPlayer::kSilenceNote = -12;
-int const CrolPlayer::kNumMelodicVoices = 9;
-int const CrolPlayer::kNumPercussiveVoices = 11;
-int const CrolPlayer::kBassDrumChannel = 6;
-int const CrolPlayer::kSnareDrumChannel = 7;
-int const CrolPlayer::kTomtomChannel = 8;
-int const CrolPlayer::kTomtomFreq = 2;//4;
-int const CrolPlayer::kSnareDrumFreq = 2;//kTomtomFreq + 7;
-float const CrolPlayer::kDefaultUpdateTme = 18.2f;
-float const CrolPlayer::kPitchFactor = 400.0f;
-
-static const unsigned char drum_table4 = {0x14, 0x12, 0x15, 0x11};
-
-CrolPlayer::uint16 const CrolPlayer::kNoteTable12 =
-{
- 340, // C
- 363, // C#
- 385, // D
- 408, // D#
- 432, // E
- 458, // F
- 485, // F#
- 514, // G
- 544, // G#
- 577, // A
- 611, // A#
- 647 // B
-};
-
-/*** public methods **************************************/
-
-CPlayer *CrolPlayer::factory(Copl *newopl)
-{
- return new CrolPlayer(newopl);
-}
-//---------------------------------------------------------
-CrolPlayer::CrolPlayer(Copl *newopl)
-: CPlayer ( newopl )
- ,rol_header ( nullptr )
- ,mNextTempoEvent ( 0 )
- ,mCurrTick ( 0 )
- ,mTimeOfLastNote ( 0 )
- ,mRefresh ( kDefaultUpdateTme )
- ,bdRegister ( 0 )
-{
- int n;
-
- memset(bxRegister, 0, sizeof(bxRegister) );
- memset(volumeCache, 0, sizeof(volumeCache) );
- memset(freqCache, 0, sizeof(freqCache) );
-
- for(n=0; n<11; n++)
- pitchCachen=1.0f;
-}
-//---------------------------------------------------------
-CrolPlayer::~CrolPlayer()
-{
- if(rol_header)
- {
- delete rol_header;
- rol_header = 0;
- }
-}
-//---------------------------------------------------------
-bool CrolPlayer::load(VFSFile &fd, const CFileProvider &fp)
-{
- binistream *f = fp.open(fd); if(!f) return false;
- std::string filename(fd.filename ());
-
- char *fn = new charfilename.length()+12;
- int i;
- std::string bnk_filename;
-
- AdPlug_LogWrite("*** CrolPlayer::load(f, \"%s\") ***\n", filename.c_str());
- strcpy(fn,filename.data());
- for (i=strlen(fn)-1; i>=0; i--)
- if (fni == '/' || fni == '\\')
-	break;
- strcpy(fn+i+1,"standard.bnk");
- bnk_filename = fn;
- delete fn; fn = 0;
- AdPlug_LogWrite("bnk_filename = \"%s\"\n",bnk_filename.c_str());
-
- rol_header = new SRolHeader;
- memset( rol_header, 0, sizeof(SRolHeader) );
-
- rol_header->version_major = f->readInt( 2 );
- rol_header->version_minor = f->readInt( 2 );
-
- // Version check
- if(rol_header->version_major != 0 || rol_header->version_minor != 4) {
- AdPlug_LogWrite("Unsupported file version %d.%d or not a ROL file!\n",
-	 rol_header->version_major, rol_header->version_minor);
- AdPlug_LogWrite("--- CrolPlayer::load ---\n");
- fp.close(f);
- return false;
- }
-
- f->seek( 40, binio::Add );
-
- rol_header->ticks_per_beat = f->readInt( 2 );
- rol_header->beats_per_measure = f->readInt( 2 );
- rol_header->edit_scale_y = f->readInt( 2 );
- rol_header->edit_scale_x = f->readInt( 2 );
-
- f->seek( 1, binio::Add );
-
- rol_header->mode = f->readInt(1);
-
- f->seek( 90+38+15, binio::Add );
-
- rol_header->basic_tempo = f->readFloat( binio::Single );
-
- load_tempo_events( f );
-
- mTimeOfLastNote = 0;
-
- if( load_voice_data( f, bnk_filename, fp ) != true )
- {
- AdPlug_LogWrite("CrolPlayer::load_voice_data(f) failed!\n");
- AdPlug_LogWrite("--- CrolPlayer::load ---\n");
-
- fp.close( f );
- return false;
- }
-
- fp.close( f );
-
- rewind( 0 );
- AdPlug_LogWrite("--- CrolPlayer::load ---\n");
- return true;
-}
-//---------------------------------------------------------
-bool CrolPlayer::update()
-{
- if( mNextTempoEvent < mTempoEvents.size() &&
- mTempoEventsmNextTempoEvent.time == mCurrTick )
- {
- SetRefresh( mTempoEventsmNextTempoEvent.multiplier );
- ++mNextTempoEvent;
- }
-
- TVoiceData::iterator curr = voice_data.begin();
- TVoiceData::iterator end = voice_data.end();
- int voice = 0;
-
- while( curr != end )
- {
- UpdateVoice( voice, *curr );
- ++curr;
- ++voice;
- }
-
- ++mCurrTick;
-
- if( mCurrTick > mTimeOfLastNote )
- {
- return false;
- }
-
- return true;
- //return ( mCurrTick > mTimeOfLastNote ) ? false : true;
-}
-//---------------------------------------------------------
-void CrolPlayer::rewind( int subsong )
-{
- TVoiceData::iterator curr = voice_data.begin();
- TVoiceData::iterator end = voice_data.end();
-
- while( curr != end )
- {
- CVoiceData &voice = *curr;
-
- voice.Reset();
- ++curr;
- }
-
- memset(bxRegister, 0, sizeof(bxRegister) );
- memset(volumeCache, 0, sizeof(volumeCache) );
-
- bdRegister = 0;
-
- opl->init(); // initialize to melodic by default
- opl->write(1,0x20); // Enable waveform select (bit 5)
-
- if( rol_header->mode == 0 )
- {
- opl->write( 0xbd, 0x20 ); // select rhythm mode (bit 5)
- bdRegister = 0x20;
-
- SetFreq( kTomtomChannel, 24 );
- SetFreq( kSnareDrumChannel, 31 );
- }
-
- mNextTempoEvent = 0;
- mCurrTick = 0;
-
- SetRefresh(1.0f);
-}
-//---------------------------------------------------------
-inline float fmin( int const a, int const b )
-{
- return static_cast<float>( a ticks_per_beat);
-
- mRefresh = (tickBeat*rol_header->basic_tempo*multiplier) / 60.0f;
-}
-//---------------------------------------------------------
-float CrolPlayer::getrefresh()
-{
- return mRefresh;
-}
-//---------------------------------------------------------
-void CrolPlayer::UpdateVoice( int const voice, CVoiceData &voiceData )
-{
- TNoteEvents const &nEvents = voiceData.note_events;
-
- if( nEvents.empty() || voiceData.mEventStatus & CVoiceData::kES_NoteEnd )
- {
- return; // no note data to process, don't bother doing anything.
- }
-
- TInstrumentEvents &iEvents = voiceData.instrument_events;
- TVolumeEvents &vEvents = voiceData.volume_events;
- TPitchEvents &pEvents = voiceData.pitch_events;
-
- if (iEvents.empty()) {
- return; // prevent out-of-bounds access
- }
- if( !(voiceData.mEventStatus & CVoiceData::kES_InstrEnd ) &&
- iEventsvoiceData.next_instrument_event.time == mCurrTick )
- {
- if( voiceData.next_instrument_event < iEvents.size() )
- {
- send_ins_data_to_chip( voice, iEventsvoiceData.next_instrument_event.ins_index );
- ++voiceData.next_instrument_event;
- }
- else
- {
- voiceData.mEventStatus |= CVoiceData::kES_InstrEnd;
- }
- }
-
- if (vEvents.empty()) {
- return; // prevent out-of-bounds access
- }
- if( !(voiceData.mEventStatus & CVoiceData::kES_VolumeEnd ) &&
- vEventsvoiceData.next_volume_event.time == mCurrTick )
- {
- SVolumeEvent const &volumeEvent = vEventsvoiceData.next_volume_event;
-
- if( voiceData.next_volume_event < vEvents.size() )
- {
- int const volume = (int)(63.0f*(1.0f - volumeEvent.multiplier));
-
- SetVolume( voice, volume );
-
- ++voiceData.next_volume_event; // move to next volume event
- }
- else
- {
- voiceData.mEventStatus |= CVoiceData::kES_VolumeEnd;
- }
- }
-
- if( voiceData.mForceNote || voiceData.current_note_duration > voiceData.mNoteDuration-1 )
- {
- if( mCurrTick != 0 )
- {
- ++voiceData.current_note;
- }
-
- if( voiceData.current_note < nEvents.size() )
- {
- SNoteEvent const &noteEvent = nEventsvoiceData.current_note;
-
- SetNote( voice, noteEvent.number );
- voiceData.current_note_duration = 0;
- voiceData.mNoteDuration = noteEvent.duration;
- voiceData.mForceNote = false;
- }
- else
- {
- SetNote( voice, kSilenceNote );
- voiceData.mEventStatus |= CVoiceData::kES_NoteEnd;
- return;
- }
- }
-
- if (pEvents.empty()) {
- return; // prevent out-of-bounds access
- }
- if( !(voiceData.mEventStatus & CVoiceData::kES_PitchEnd ) &&
- pEventsvoiceData.next_pitch_event.time == mCurrTick )
- {
- if( voiceData.next_pitch_event < pEvents.size() )
- {
- SetPitch(voice,pEventsvoiceData.next_pitch_event.variation);
- ++voiceData.next_pitch_event;
- }
- else
- {
- voiceData.mEventStatus |= CVoiceData::kES_PitchEnd;
- }
- }
-
- ++voiceData.current_note_duration;
-}
-//---------------------------------------------------------
-void CrolPlayer::SetNote( int const voice, int const note )
-{
- if( voice < kBassDrumChannel || rol_header->mode )
- {
- SetNoteMelodic( voice, note );
- }
- else
- {
- SetNotePercussive( voice, note );
- }
-}
-//---------------------------------------------------------
-void CrolPlayer::SetNotePercussive( int const voice, int const note )
-{
- int const bit_pos = 4-voice+kBassDrumChannel;
-
- bdRegister &= ~( 1<<bit_pos );
- opl->write( 0xbd, bdRegister );
-
- if( note != kSilenceNote )
- {
- switch( voice )
- {
- case kTomtomChannel:
- SetFreq( kSnareDrumChannel, note+7 );
- case kBassDrumChannel:
- SetFreq( voice, note );
- break;
- }
-
- bdRegister |= 1<<bit_pos;
- opl->write( 0xbd, bdRegister );
- }
-}
-//---------------------------------------------------------
-void CrolPlayer::SetNoteMelodic( int const voice, int const note )
-{
- opl->write( 0xb0+voice, bxRegistervoice & ~0x20 );
-
- if( note != kSilenceNote )
- {
- SetFreq( voice, note, true );
- }
-}
-//---------------------------------------------------------
-void CrolPlayer::SetPitch(int const voice, real32 const variation)
-{
- pitchCachevoice = variation;
- freqCachevoice += (uint16)((((float)freqCachevoice)*(variation-1.0f)) / kPitchFactor);
-
- opl->write(0xa0+voice,freqCachevoice & 0xff);
-}
-//---------------------------------------------------------
-void CrolPlayer::SetFreq( int const voice, int const note, bool const keyOn )
-{
- uint16 freq = kNoteTablenote%12 + ((note/12) << 10);
- freq += (uint16)((((float)freq)*(pitchCachevoice-1.0f))/kPitchFactor);
-
- freqCachevoice = freq;
- bxRegistervoice = ((freq >> 8) & 0x1f);
-
- opl->write( 0xa0+voice, freq & 0xff );
- opl->write( 0xb0+voice, bxRegistervoice | (keyOn ? 0x20 : 0x0) );
-}
-//---------------------------------------------------------
-void CrolPlayer::SetVolume( int const voice, int const volume )
-{
- volumeCachevoice = (volumeCachevoice &0xc0) | volume;
-
- int const op_offset = ( voice < kSnareDrumChannel || rol_header->mode ) ?
- op_tablevoice+3 : drum_tablevoice-kSnareDrumChannel;
-
- opl->write( 0x40+op_offset, volumeCachevoice );
-}
-//---------------------------------------------------------
-void CrolPlayer::send_ins_data_to_chip( int const voice, int const ins_index )
-{
- SRolInstrument &instrument = ins_listins_index.instrument;
-
- send_operator( voice, instrument.modulator, instrument.carrier );
-}
-//---------------------------------------------------------
-void CrolPlayer::send_operator( int const voice, SOPL2Op const &modulator, SOPL2Op const &carrier )
-{
- if( voice < kSnareDrumChannel || rol_header->mode )
- {
- int const op_offset = op_tablevoice;
-
- opl->write( 0x20+op_offset, modulator.ammulti );
- opl->write( 0x40+op_offset, modulator.ksltl );
- opl->write( 0x60+op_offset, modulator.ardr );
- opl->write( 0x80+op_offset, modulator.slrr );
- opl->write( 0xc0+voice , modulator.fbc );
- opl->write( 0xe0+op_offset, modulator.waveform );
-
- volumeCachevoice = (carrier.ksltl & 0xc0) | (volumeCachevoice & 0x3f);
-
- opl->write( 0x23+op_offset, carrier.ammulti );
- opl->write( 0x43+op_offset, volumeCachevoice );
- opl->write( 0x63+op_offset, carrier.ardr );
- opl->write( 0x83+op_offset, carrier.slrr );
-// opl->write( 0xc3+voice , carrier.fbc ); <- don't bother writing this.
- opl->write( 0xe3+op_offset, carrier.waveform );
- }
- else
- {
- int const op_offset = drum_tablevoice-kSnareDrumChannel;
-
- volumeCachevoice = (modulator.ksltl & 0xc0) | (volumeCachevoice & 0x3f);
-
- opl->write( 0x20+op_offset, modulator.ammulti );
- opl->write( 0x40+op_offset, volumeCachevoice );
- opl->write( 0x60+op_offset, modulator.ardr );
- opl->write( 0x80+op_offset, modulator.slrr );
- opl->write( 0xc0+voice , modulator.fbc );
- opl->write( 0xe0+op_offset, modulator.waveform );
- }
-}
-//---------------------------------------------------------
-void CrolPlayer::load_tempo_events( binistream *f )
-{
- int16 const num_tempo_events = f->readInt( 2 );
-
- if (num_tempo_events<0) {
- return;
- }
- mTempoEvents.reserve( num_tempo_events );
-
- for(int i=0; i<num_tempo_events; ++i)
- {
- STempoEvent event;
-
- event.time = f->readInt( 2 );
- event.multiplier = f->readFloat( binio::Single );
- mTempoEvents.push_back( event );
- }
-}
-//---------------------------------------------------------
-bool CrolPlayer::load_voice_data( binistream *f, std::string const &bnk_filename, const CFileProvider &fp )
-{
- SBnkHeader bnk_header;
- VFSFile fd(bnk_filename.c_str(), "rb");
- binistream *bnk_file = fp.open(fd);
-
- if( bnk_file )
- {
- load_bnk_info( bnk_file, bnk_header );
-
- int const numVoices = rol_header->mode ? kNumMelodicVoices : kNumPercussiveVoices;
-
- voice_data.reserve( numVoices );
- for(int i=0; i<numVoices; ++i)
- {
- CVoiceData voice;
-
- load_note_events( f, voice );
- load_instrument_events( f, voice, bnk_file, bnk_header );
- load_volume_events( f, voice );
- load_pitch_events( f, voice );
-
- voice_data.push_back( voice );
- }
-
- fp.close(bnk_file);
-
- return true;
- }
-
- return false;
-}
-//---------------------------------------------------------
-void CrolPlayer::load_note_events( binistream *f, CVoiceData &voice )
-{
- f->seek( 15, binio::Add );
-
- int16 const time_of_last_note = f->readInt( 2 );
-
- if( time_of_last_note != 0 )
- {
- TNoteEvents &note_events = voice.note_events;
- int16 total_duration = 0;
-
- do
- {
- SNoteEvent event;
-
- event.number = f->readInt( 2 );
- event.duration = f->readInt( 2 );
-
- event.number += kSilenceNote; // adding -12
-
- note_events.push_back( event );
-
- total_duration += event.duration;
- } while( total_duration < time_of_last_note );
-
- if( time_of_last_note > mTimeOfLastNote )
- {
- mTimeOfLastNote = time_of_last_note;
- }
- }
-
- f->seek( 15, binio::Add );
-}
-//---------------------------------------------------------
-void CrolPlayer::load_instrument_events( binistream *f, CVoiceData &voice,
- binistream *bnk_file, SBnkHeader const &bnk_header )
-{
- int16 const number_of_instrument_events = f->readInt( 2 );
- if (number_of_instrument_events<0) {
- return;
- }
-
- TInstrumentEvents &instrument_events = voice.instrument_events;
-
- instrument_events.reserve( number_of_instrument_events );
-
- for(int i=0; i<number_of_instrument_events; ++i)
- {
- SInstrumentEvent event;
- event.time = f->readInt( 2 );
- f->readString( event.name, 9 );
-
-	 std::string event_name = event.name;
- event.ins_index = load_rol_instrument( bnk_file, bnk_header, event_name );
-
- instrument_events.push_back( event );
-
- f->seek( 1+2, binio::Add );
- }
-
- f->seek( 15, binio::Add );
-}
-//---------------------------------------------------------
-void CrolPlayer::load_volume_events( binistream *f, CVoiceData &voice )
-{
- int16 const number_of_volume_events = f->readInt( 2 );
- if (number_of_volume_events<0) {
- return;
- }
-
- TVolumeEvents &volume_events = voice.volume_events;
-
- volume_events.reserve( number_of_volume_events );
-
- for(int i=0; i<number_of_volume_events; ++i)
- {
- SVolumeEvent event;
- event.time = f->readInt( 2 );
- event.multiplier = f->readFloat( binio::Single );
-
- volume_events.push_back( event );
- }
-
- f->seek( 15, binio::Add );
-}
-//---------------------------------------------------------
-void CrolPlayer::load_pitch_events( binistream *f, CVoiceData &voice )
-{
- int16 const number_of_pitch_events = f->readInt( 2 );
- if (number_of_pitch_events<0) {
- return;
- }
-
- TPitchEvents &pitch_events = voice.pitch_events;
-
- pitch_events.reserve( number_of_pitch_events );
-
- for(int i=0; i<number_of_pitch_events; ++i)
- {
- SPitchEvent event;
- event.time = f->readInt( 2 );
- event.variation = f->readFloat( binio::Single );
-
- pitch_events.push_back( event );
- }
-}
-//---------------------------------------------------------
-bool CrolPlayer::load_bnk_info( binistream *f, SBnkHeader &header )
-{
- header.version_major = f->readInt(1);
- header.version_minor = f->readInt(1);
- f->readString( header.signature, 6 );
-
- header.number_of_list_entries_used = f->readInt( 2 );
- header.total_number_of_list_entries = f->readInt( 2 );
-
- header.abs_offset_of_name_list = f->readInt( 4 );
- header.abs_offset_of_data = f->readInt( 4 );
-
- f->seek( header.abs_offset_of_name_list, binio::Set );
-
- TInstrumentNames &ins_name_list = header.ins_name_list;
- ins_name_list.reserve( header.number_of_list_entries_used );
-
- for(int i=0; i<header.number_of_list_entries_used; ++i)
- {
- SInstrumentName instrument;
-
- instrument.index = f->readInt( 2 );
- instrument.record_used = f->readInt(1);
- f->readString( instrument.name, 9 );
-
- // printf("%s = #%d\n", instrument.name, i );
-
- ins_name_list.push_back( instrument );
- }
-
- //std::sort( ins_name_list.begin(), ins_name_list.end(), StringCompare() );
-
- return true;
-}
-//---------------------------------------------------------
-int CrolPlayer::load_rol_instrument( binistream *f, SBnkHeader const &header, std::string &name )
-{
- TInstrumentNames const &ins_name_list = header.ins_name_list;
-
- int const ins_index = get_ins_index( name );
-
- if( ins_index != -1 )
- {
- return ins_index;
- }
-
- typedef TInstrumentNames::const_iterator TInsIter;
- typedef std::pair<TInsIter, TInsIter> TInsIterPair;
-
- TInsIterPair range = std::equal_range( ins_name_list.begin(),
- ins_name_list.end(),
- name,
- StringCompare() );
-
- if( range.first != range.second )
- {
- int const seekOffs = header.abs_offset_of_data + (range.first->index*kSizeofDataRecord);
- f->seek( seekOffs, binio::Set );
- }
-
- SUsedList usedIns;
- usedIns.name = name;
-
- if( range.first != range.second )
- {
- read_rol_instrument( f, usedIns.instrument );
- }
- else
- {
- // set up default instrument data here
- memset( &usedIns.instrument, 0, sizeof(usedIns.instrument) );
- }
- ins_list.push_back( usedIns );
-
- return ins_list.size()-1;
-}
-//---------------------------------------------------------
-int CrolPlayer::get_ins_index( std::string const &name ) const
-{
- for(unsigned int i=0; i<ins_list.size(); ++i)
- {
- if( strcmp_nocase(ins_listi.name.c_str(), name.c_str()) == 0 )
- {
- return i;
- }
- }
-
- return -1;
-}
-//---------------------------------------------------------
-void CrolPlayer::read_rol_instrument( binistream *f, SRolInstrument &ins )
-{
- ins.mode = f->readInt(1);
- ins.voice_number = f->readInt(1);
-
- read_fm_operator( f, ins.modulator );
- read_fm_operator( f, ins.carrier );
-
- ins.modulator.waveform = f->readInt(1);
- ins.carrier.waveform = f->readInt(1);
-}
-//---------------------------------------------------------
-void CrolPlayer::read_fm_operator( binistream *f, SOPL2Op &opl2_op )
-{
- SFMOperator fm_op;
-
- fm_op.key_scale_level = f->readInt(1);
- fm_op.freq_multiplier = f->readInt(1);
- fm_op.feed_back = f->readInt(1);
- fm_op.attack_rate = f->readInt(1);
- fm_op.sustain_level = f->readInt(1);
- fm_op.sustaining_sound = f->readInt(1);
- fm_op.decay_rate = f->readInt(1);
- fm_op.release_rate = f->readInt(1);
- fm_op.output_level = f->readInt(1);
- fm_op.amplitude_vibrato = f->readInt(1);
- fm_op.frequency_vibrato = f->readInt(1);
- fm_op.envelope_scaling = f->readInt(1);
- fm_op.fm_type = f->readInt(1);
-
- opl2_op.ammulti = fm_op.amplitude_vibrato << 7 | fm_op.frequency_vibrato << 6 | fm_op.sustaining_sound << 5 | fm_op.envelope_scaling << 4 | fm_op.freq_multiplier;
- opl2_op.ksltl = fm_op.key_scale_level << 6 | fm_op.output_level;
- opl2_op.ardr = fm_op.attack_rate << 4 | fm_op.decay_rate;
- opl2_op.slrr = fm_op.sustain_level << 4 | fm_op.release_rate;
- opl2_op.fbc = fm_op.feed_back << 1 | (fm_op.fm_type ^ 1);
-}

audacious-plugins-3.6.2-gtk3.tar.bz2/src/adplug/core/rol.h Deleted

@@ -1,310 +0,0 @@
-/*
- * Adplug - Replayer for many OPL2/OPL3 audio file formats.
- * Copyright (C) 1999 - 2004 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
- *
- * rol.h - ROL Player by OPLx <oplx@yahoo.com>
- *
- * Visit: http://tenacity.hispeed.com/aomit/oplx/
- */
-#ifndef H_ROLPLAYER
-#define H_ROLPLAYER
-
-#include <vector>
-#include <string>
-
-#include "player.h"
-
-#include <libaudcore/audstrings.h>
-
-class CrolPlayer: public CPlayer
-{
-public:
- static CPlayer *factory(Copl *newopl);
-
- CrolPlayer(Copl *newopl);
-
- ~CrolPlayer();
-
- bool load (VFSFile &fd, const CFileProvider &fp);
- bool update ();
- void rewind (int subsong);	// rewinds to specified subsong
- float getrefresh();			// returns needed timer refresh rate
-
- std::string gettype() { return std::string("Adlib Visual Composer"); }
-
-private:
- typedef unsigned short uint16;
- typedef signed short int16;
-#ifdef __x86_64__
- typedef signed int int32;
-#else
- typedef signed long int int32;
-#endif
- typedef float real32;
-
- typedef struct
- {
- uint16 version_major;
- uint16 version_minor;
- char unused040;
- uint16 ticks_per_beat;
- uint16 beats_per_measure;
- uint16 edit_scale_y;
- uint16 edit_scale_x;
- char unused1;
- char mode;
- char unused290;
- char filler038;
- char filler115;
- real32 basic_tempo;
- } SRolHeader;
-
- typedef struct
- {
- int16 time;
- real32 multiplier;
- } STempoEvent;
-
- typedef struct
- {
- int16 number;
- int16 duration;
- } SNoteEvent;
-
- typedef struct
- {
- int16 time;
- char name9;
- int16 ins_index;
- } SInstrumentEvent;
-
- typedef struct
- {
- int16 time;
- real32 multiplier;
- } SVolumeEvent;
-
- typedef struct
- {
- int16 time;
- real32 variation;
- } SPitchEvent;
-
- typedef std::vector<SNoteEvent> TNoteEvents;
- typedef std::vector<SInstrumentEvent> TInstrumentEvents;
- typedef std::vector<SVolumeEvent> TVolumeEvents;
- typedef std::vector<SPitchEvent> TPitchEvents;
-
-#define bit_pos( pos ) (1<<pos)
-
- class CVoiceData
- {
- public:
- enum EEventStatus
- {
- kES_NoteEnd = bit_pos( 0 ),
- kES_PitchEnd = bit_pos( 1 ),
- kES_InstrEnd = bit_pos( 2 ),
- kES_VolumeEnd = bit_pos( 3 ),
-
- kES_None = 0
- };
-
- explicit CVoiceData()
- : mForceNote ( true )
- ,mEventStatus ( kES_None )
- ,current_note ( 0 )
- ,current_note_duration( 0 )
- ,mNoteDuration ( 0 )
- ,next_instrument_event( 0 )
- ,next_volume_event ( 0 )
- ,next_pitch_event ( 0 )
- {
- }
-
- void Reset()
- {
- mForceNote = true;
- mEventStatus = kES_None;
- current_note = 0;
- current_note_duration = 0;
- mNoteDuration = 0;
- next_instrument_event = 0;
- next_volume_event = 0;
- next_pitch_event = 0;
- }
-
- TNoteEvents note_events;
- TInstrumentEvents instrument_events;
- TVolumeEvents volume_events;
- TPitchEvents pitch_events;
-
- bool mForceNote : 1;
- int mEventStatus;
- unsigned int current_note;
- int current_note_duration;
- int mNoteDuration;
- unsigned int next_instrument_event;
- unsigned int next_volume_event;
- unsigned int next_pitch_event;
- };
-
- typedef struct
- {
- uint16 index;
- char record_used;
- char name9;
- } SInstrumentName;
-
- typedef std::vector<SInstrumentName> TInstrumentNames;
-
- typedef struct
- {
- char version_major;
- char version_minor;
- char signature6;
- uint16 number_of_list_entries_used;
- uint16 total_number_of_list_entries;
- int32 abs_offset_of_name_list;
- int32 abs_offset_of_data;
-
- TInstrumentNames ins_name_list;
- } SBnkHeader;
-
- typedef struct
- {
- unsigned char key_scale_level;
- unsigned char freq_multiplier;
- unsigned char feed_back;
- unsigned char attack_rate;
- unsigned char sustain_level;
- unsigned char sustaining_sound;
- unsigned char decay_rate;
- unsigned char release_rate;
- unsigned char output_level;
- unsigned char amplitude_vibrato;
- unsigned char frequency_vibrato;
- unsigned char envelope_scaling;
- unsigned char fm_type;
- } SFMOperator;
-
- typedef struct
- {
- unsigned char ammulti;
- unsigned char ksltl;
- unsigned char ardr;
- unsigned char slrr;
- unsigned char fbc;
- unsigned char waveform;
- } SOPL2Op;
-
- typedef struct
- {
- char mode;
- char voice_number;
- SOPL2Op modulator;
- SOPL2Op carrier;
- } SRolInstrument;
-
- typedef struct
- {
- std::string name;
- SRolInstrument instrument;
- } SUsedList;
-
- void load_tempo_events ( binistream *f );
- bool load_voice_data ( binistream *f, std::string const &bnk_filename, const CFileProvider &fp );
- void load_note_events ( binistream *f, CVoiceData &voice );
- void load_instrument_events( binistream *f, CVoiceData &voice,
- binistream *bnk_file, SBnkHeader const &bnk_header );
- void load_volume_events ( binistream *f, CVoiceData &voice );
- void load_pitch_events ( binistream *f, CVoiceData &voice );
-
- bool load_bnk_info ( binistream *f, SBnkHeader &header );
- int load_rol_instrument ( binistream *f, SBnkHeader const &header, std::string &name );
- void read_rol_instrument ( binistream *f, SRolInstrument &ins );
- void read_fm_operator ( binistream *f, SOPL2Op &opl2_op );
- int get_ins_index( std::string const &name ) const;
-
- void UpdateVoice( int const voice, CVoiceData &voiceData );
- void SetNote( int const voice, int const note );
- void SetNoteMelodic( int const voice, int const note );
- void SetNotePercussive( int const voice, int const note );
- void SetFreq ( int const voice, int const note, bool const keyOn=false );
- void SetPitch ( int const voice, real32 const variation );
- void SetVolume ( int const voice, int const volume );
- void SetRefresh( float const multiplier );
- void send_ins_data_to_chip( int const voice, int const ins_index );
- void send_operator( int const voice, SOPL2Op const &modulator, SOPL2Op const &carrier );
-
- class StringCompare
- {
- public:
- bool operator()( SInstrumentName const &lhs, SInstrumentName const &rhs ) const
- {
- return keyLess(lhs.name, rhs.name);
- }
-
- bool operator()( SInstrumentName const &lhs, std::string const &rhs ) const
- {
- return keyLess(lhs.name, rhs.c_str());
- }
-
- bool operator()( std::string const &lhs, SInstrumentName const &rhs ) const
- {
- return keyLess(lhs.c_str(), rhs.name);
- }
- private:
- bool keyLess( const char *const lhs, const char *const rhs ) const
- {
- return strcmp_nocase(lhs, rhs) < 0;
- }
- };
-
- typedef std::vector<CVoiceData> TVoiceData;
-
- SRolHeader *rol_header;
- std::vector<STempoEvent> mTempoEvents;
- TVoiceData voice_data;
- std::vector<SUsedList> ins_list;
-
- unsigned int mNextTempoEvent;
- int mCurrTick;
- int mTimeOfLastNote;
- float mRefresh;
- unsigned char bdRegister;
- unsigned char bxRegister9;
- unsigned char volumeCache11;
- uint16			freqCache11;
- real32 pitchCache11;
-
- static int const kSizeofDataRecord;
- static int const kMaxTickBeat;
- static int const kSilenceNote;
- static int const kNumMelodicVoices;
- static int const kNumPercussiveVoices;
- static int const kBassDrumChannel;
- static int const kSnareDrumChannel;
- static int const kTomtomChannel;
- static int const kTomtomFreq;
- static int const kSnareDrumFreq;
- static float const kDefaultUpdateTme;
- static float const kPitchFactor;
- static uint16 const kNoteTable12;
-};
-
-#endif

audacious-plugins-3.6.2-gtk3.tar.bz2/src/adplug/core/s3m.cc Deleted

@@ -1,728 +0,0 @@
-/*
- * Adplug - Replayer for many OPL2/OPL3 audio file formats.
- * Copyright (C) 1999 - 2006 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
- *
- * s3m.c - S3M Player by Simon Peter <dn.tlp@gmx.net>
- *
- * BUGS:
- * Extra Fine Slides (EEx, FEx) & Fine Vibrato (Uxy) are inaccurate
- */
-
-#include <string.h>
-
-#include "s3m.h"
-
-const signed char
- Cs3mPlayer::chnresolv = // S3M -> adlib channel conversion
-{ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 0, 1, 2, 3,
- 4, 5, 6, 7, 8, -1, -1, -1, -1, -1, -1, -1 };
-
-const unsigned short
- Cs3mPlayer::notetable12 = // S3M adlib note table
-{ 340, 363, 385, 408, 432, 458, 485, 514, 544, 577, 611, 647 };
-
-const unsigned char
- Cs3mPlayer::vibratotab32 = // vibrato rate table
-{ 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 16, 15, 14, 13, 12,
- 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1 };
-
-/*** public methods *************************************/
-
-CPlayer *
-Cs3mPlayer::factory (Copl * newopl)
-{
- return new Cs3mPlayer (newopl);
-}
-
-Cs3mPlayer::Cs3mPlayer (Copl * newopl):CPlayer (newopl)
-{
- int
- i,
- j,
- k;
-
- memset (pattern, 255, sizeof (pattern));
- memset (orders, 255, sizeof (orders));
-
- for (i = 0; i < 99; i++) // setup pattern
- for (j = 0; j < 64; j++)
- for (k = 0; k < 32; k++)
- {
- patternijk.instrument = 0;
- patternijk.info = 0;
- }
-}
-
-bool
-Cs3mPlayer::load (VFSFile & fd, const CFileProvider & fp)
-{
- binistream *f = fp.open (fd);
- if (!f)
- return false;
- unsigned short insptr99, pattptr99;
- int i, row;
- unsigned char bufval, bufval2;
- unsigned short ppatlen;
- s3mheader *checkhead;
- bool adlibins = false;
-
- // file validation section
- checkhead = new s3mheader;
- load_header (f, checkhead);
- if (checkhead->kennung != 0x1a || checkhead->typ != 16
- || checkhead->insnum > 99)
- {
- delete checkhead;
- fp.close (f);
- return false;
- }
- else if (strncmp (checkhead->scrm, "SCRM", 4))
- {
- delete checkhead;
- fp.close (f);
- return false;
- }
- else
- { // is an adlib module?
- f->seek (checkhead->ordnum, binio::Add);
- for (i = 0; i < checkhead->insnum; i++)
- insptri = f->readInt (2);
- for (i = 0; i < checkhead->insnum; i++)
- {
- f->seek (insptri * 16);
- if (f->readInt (1) >= 2)
- {
- adlibins = true;
- break;
- }
- }
- delete checkhead;
- if (!adlibins)
- {
- fp.close (f);
- return false;
- }
- }
-
- // load section
- f->seek (0); // rewind for load
- load_header (f, &header); // read header
-
- // security check
- if (header.ordnum > 256 || header.insnum > 99 || header.patnum > 99)
- {
- fp.close (f);
- return false;
- }
-
- for (i = 0; i < header.ordnum; i++)
- ordersi = f->readInt (1); // read orders
- for (i = 0; i < header.insnum; i++)
- insptri = f->readInt (2); // instrument parapointers
- for (i = 0; i < header.patnum; i++)
- pattptri = f->readInt (2); // pattern parapointers
-
- for (i = 0; i < header.insnum; i++)
- { // load instruments
- f->seek (insptri * 16);
- insti.type = f->readInt (1);
- f->readString (insti.filename, 15);
- insti.d00 = f->readInt (1);
- insti.d01 = f->readInt (1);
- insti.d02 = f->readInt (1);
- insti.d03 = f->readInt (1);
- insti.d04 = f->readInt (1);
- insti.d05 = f->readInt (1);
- insti.d06 = f->readInt (1);
- insti.d07 = f->readInt (1);
- insti.d08 = f->readInt (1);
- insti.d09 = f->readInt (1);
- insti.d0a = f->readInt (1);
- insti.d0b = f->readInt (1);
- insti.volume = f->readInt (1);
- insti.dsk = f->readInt (1);
- f->ignore (2);
- insti.c2spd = f->readInt (4);
- f->ignore (12);
- f->readString (insti.name, 28);
- f->readString (insti.scri, 4);
- }
-
- for (i = 0; i < header.patnum; i++)
- { // depack patterns
- f->seek (pattptri * 16);
- ppatlen = f->readInt (2);
- unsigned long pattpos = f->pos ();
- for (row = 0; (row < 64) && (pattpos - pattptri * 16 <= ppatlen); row++)
- do
- {
- bufval = f->readInt (1);
- if (bufval & 32)
- {
- bufval2 = f->readInt (1);
- patternirowbufval & 31.note = bufval2 & 15;
- patternirowbufval & 31.oct = (bufval2 & 240) >> 4;
- patternirowbufval & 31.instrument = f->readInt (1);
- }
- if (bufval & 64)
- patternirowbufval & 31.volume = f->readInt (1);
- if (bufval & 128)
- {
- patternirowbufval & 31.command = f->readInt (1);
- patternirowbufval & 31.info = f->readInt (1);
- }
- } while (bufval);
- }
-
- fp.close (f);
- rewind (0);
- return true; // done
-}
-
-bool
-Cs3mPlayer::update ()
-{
- unsigned char pattbreak = 0, donote; // remember vars
- unsigned char pattnr, chan, row, info; // cache vars
- signed char realchan;
-
- // effect handling (timer dependant)
- for (realchan = 0; realchan < 9; realchan++)
- {
- info = channelrealchan.info; // fill infobyte cache
- switch (channelrealchan.fx)
- {
- case 11:
- case 12:
- if (channelrealchan.fx == 11) // dual command: H00 and Dxy
- vibrato (realchan, channelrealchan.dualinfo);
- else // dual command: G00 and Dxy
- tone_portamento (realchan, channelrealchan.dualinfo);
- case 4:
- if (info <= 0x0f) // volume slide down
- {
- if (channelrealchan.vol - info >= 0)
- channelrealchan.vol -= info;
- else
- channelrealchan.vol = 0;
- }
- if ((info & 0x0f) == 0) // volume slide up
- {
- if (channelrealchan.vol + (info >> 4) <= 63)
- channelrealchan.vol += info >> 4;
- else
- channelrealchan.vol = 63;
- }
- setvolume (realchan);
- break;
- case 5:
- if (info == 0xf0 || info <= 0xe0)
- { // slide down
- slide_down (realchan, info);
- setfreq (realchan);
- }
- break;
- case 6:
- if (info == 0xf0 || info <= 0xe0)
- { // slide up
- slide_up (realchan, info);
- setfreq (realchan);
- }
- break;
- case 7:
- tone_portamento (realchan, channelrealchan.dualinfo);
- break; // tone portamento
- case 8:
- vibrato (realchan, channelrealchan.dualinfo);
- break; // vibrato
- case 10:
- channelrealchan.nextfreq = channelrealchan.freq; // arpeggio
- channelrealchan.nextoct = channelrealchan.oct;
- switch (channelrealchan.trigger)
- {
- case 0:
- channelrealchan.freq = notetablechannelrealchan.note;
- break;
- case 1:
- if (channelrealchan.note + ((info & 0xf0) >> 4) < 12)
- channelrealchan.freq =
- notetablechannelrealchan.note + ((info & 0xf0) >> 4);
- else
- {
- channelrealchan.freq =
- notetablechannelrealchan.note + ((info & 0xf0) >> 4) - 12;
- channelrealchan.oct++;
- }
- break;
- case 2:
- if (channelrealchan.note + (info & 0x0f) < 12)
- channelrealchan.freq =
- notetablechannelrealchan.note + (info & 0x0f);
- else
- {
- channelrealchan.freq =
- notetablechannelrealchan.note + (info & 0x0f) - 12;
- channelrealchan.oct++;
- }
- break;
- }
- if (channelrealchan.trigger < 2)
- channelrealchan.trigger++;
- else
- channelrealchan.trigger = 0;
- setfreq (realchan);
- channelrealchan.freq = channelrealchan.nextfreq;
- channelrealchan.oct = channelrealchan.nextoct;
- break;
- case 21:
- vibrato (realchan, (unsigned char) (info / 4));
- break; // fine vibrato
- }
- }
-
- if (del)
- { // speed compensation
- del--;
- return !songend;
- }
-
- // arrangement handling
- pattnr = ordersord;
- if (pattnr == 0xff || ord > header.ordnum)
- { // "--" end of song
- songend = 1; // set end-flag
- ord = 0;
- pattnr = ordersord;
- if (pattnr == 0xff)
- return !songend;
- }
- if (pattnr == 0xfe)
- { // "++" skip marker
- ord++;
- pattnr = ordersord;
- }
-
- // play row
- row = crow; // fill row cache
- for (chan = 0; chan < 32; chan++)
- {
- if (!(header.chansetchan & 128)) // resolve S3M -> AdLib channels
- realchan = chnresolvheader.chansetchan & 127;
- else
- realchan = -1; // channel disabled
- if (realchan != -1)
- { // channel playable?
- // set channel values
- donote = 0;
- if (patternpattnrrowchan.note < 14)
- {
- // tone portamento
- if (patternpattnrrowchan.command == 7
- || patternpattnrrowchan.command == 12)
- {
- channelrealchan.nextfreq =
- notetablepatternpattnrrowchan.note;
- channelrealchan.nextoct = patternpattnrrowchan.oct;
- }
- else
- { // normal note
- channelrealchan.note = patternpattnrrowchan.note;
- channelrealchan.freq = notetablepatternpattnrrowchan.note;
- channelrealchan.oct = patternpattnrrowchan.oct;
- channelrealchan.key = 1;
- donote = 1;
- }
- }
- if (patternpattnrrowchan.note == 14)
- { // key off (is 14 here, cause note is only first 4 bits)
- channelrealchan.key = 0;
- setfreq (realchan);
- }
- if ((channelrealchan.fx != 8 && channelrealchan.fx != 11) && // vibrato begins
- (patternpattnrrowchan.command == 8
- || patternpattnrrowchan.command == 11))
- {
- channelrealchan.nextfreq = channelrealchan.freq;
- channelrealchan.nextoct = channelrealchan.oct;
- }
- if (patternpattnrrowchan.note >= 14)
- if ((channelrealchan.fx == 8 || channelrealchan.fx == 11) && // vibrato ends
- (patternpattnrrowchan.command != 8
- && patternpattnrrowchan.command != 11))
- {
- channelrealchan.freq = channelrealchan.nextfreq;
- channelrealchan.oct = channelrealchan.nextoct;
- setfreq (realchan);
- }
- if (patternpattnrrowchan.instrument)
- { // set instrument
- channelrealchan.inst = patternpattnrrowchan.instrument - 1;
- if (instchannelrealchan.inst.volume < 64)
- channelrealchan.vol = instchannelrealchan.inst.volume;
- else
- channelrealchan.vol = 63;
- if (patternpattnrrowchan.command != 7)
- donote = 1;
- }
- if (patternpattnrrowchan.volume != 255)
- {
- if (patternpattnrrowchan.volume < 64) // set volume
- channelrealchan.vol = patternpattnrrowchan.volume;
- else
- channelrealchan.vol = 63;
- }
- channelrealchan.fx = patternpattnrrowchan.command; // set command
- if (patternpattnrrowchan.info) // set infobyte
- channelrealchan.info = patternpattnrrowchan.info;
-
- // some commands reset the infobyte memory
- switch (channelrealchan.fx)
- {
- case 1:
- case 2:
- case 3:
- case 20:
- channelrealchan.info = patternpattnrrowchan.info;
- break;
- }
-
- // play note
- if (donote)
- playnote (realchan);
- if (patternpattnrrowchan.volume != 255) // set volume
- setvolume (realchan);
-
- // command handling (row dependant)
- info = channelrealchan.info; // fill infobyte cache
- switch (channelrealchan.fx)
- {
- case 1:
- speed = info;
- break; // set speed
- case 2:
- if (info <= ord)
- songend = 1;
- ord = info;
- crow = 0;
- pattbreak = 1;
- break; // jump to order
- case 3:
- if (!pattbreak)
- {
- crow = info;
- ord++;
- pattbreak = 1;
- }
- break; // pattern break
- case 4:
- if (info > 0xf0) // fine volume down
- {
- if (channelrealchan.vol - (info & 0x0f) >= 0)
- channelrealchan.vol -= info & 0x0f;
- else
- channelrealchan.vol = 0;
- }
- if ((info & 0x0f) == 0x0f && info >= 0x1f) // fine volume up
- {
- if (channelrealchan.vol + ((info & 0xf0) >> 4) <= 63)
- channelrealchan.vol += (info & 0xf0) >> 4;
- else
- channelrealchan.vol = 63;
- }
- setvolume (realchan);
- break;
- case 5:
- if (info > 0xf0)
- { // fine slide down
- slide_down (realchan, (unsigned char) (info & 0x0f));
- setfreq (realchan);
- }
- if (info > 0xe0 && info < 0xf0)
- { // extra fine slide down
- slide_down (realchan, (unsigned char) ((info & 0x0f) / 4));
- setfreq (realchan);
- }
- break;
- case 6:
- if (info > 0xf0)
- { // fine slide up
- slide_up (realchan, (unsigned char) (info & 0x0f));
- setfreq (realchan);
- }
- if (info > 0xe0 && info < 0xf0)
- { // extra fine slide up
- slide_up (realchan, (unsigned char) ((info & 0x0f) / 4));
- setfreq (realchan);
- }
- break;
- case 7: // tone portamento
- case 8:
- if ((channelrealchan.fx == 7 || // vibrato (remember info for dual commands)
- channelrealchan.fx == 8) && patternpattnrrowchan.info)
- channelrealchan.dualinfo = info;
- break;
- case 10:
- channelrealchan.trigger = 0;
- break; // arpeggio (set trigger)
- case 19:
- if (info == 0xb0) // set loop start
- loopstart = row;
- if (info > 0xb0 && info <= 0xbf) // pattern loop
- {
- if (!loopcnt)
- {
- loopcnt = info & 0x0f;
- crow = loopstart;
- pattbreak = 1;
- }
- else if (--loopcnt > 0)
- {
- crow = loopstart;
- pattbreak = 1;
- }
- }
- if ((info & 0xf0) == 0xe0) // patterndelay
- del = speed * (info & 0x0f) - 1;
- break;
- case 20:
- tempo = info;
- break; // set tempo
- }
- }
- }
-
- if (!del)
- del = speed - 1; // speed compensation
- if (!pattbreak)
- { // next row (only if no manual advance)
- crow++;
- if (crow > 63)
- {
- crow = 0;
- ord++;
- loopstart = 0;
- }
- }
-
- return !songend; // still playing
-}
-
-void
-Cs3mPlayer::rewind (int subsong)
-{
- // set basic variables
- songend = 0;
- ord = 0;
- crow = 0;
- tempo = header.it;
- speed = header.is;
- del = 0;
- loopstart = 0;
- loopcnt = 0;
-
- memset (channel, 0, sizeof (channel));
-
- opl->init (); // reset OPL chip
- opl->write (1, 32); // Go to ym3812 mode
-}
-
-std::string Cs3mPlayer::gettype ()
-{
- char
- filever5;
-
- switch (header.cwtv)
- { // determine version number
- case 0x1300:
- strcpy (filever, "3.00");
- break;
- case 0x1301:
- strcpy (filever, "3.01");
- break;
- case 0x1303:
- strcpy (filever, "3.03");
- break;
- case 0x1320:
- strcpy (filever, "3.20");
- break;
- default:
- strcpy (filever, "3.??");
- }
-
- return (std::string ("Scream Tracker ") + filever);
-}
-
-float
-Cs3mPlayer::getrefresh ()
-{
- return (float) (tempo / 2.5);
-}
-
-/*** private methods *************************************/
-
-void
-Cs3mPlayer::load_header (binistream * f, s3mheader * h)
-{
- int i;
-
- f->readString (h->name, 28);
- h->kennung = f->readInt (1);
- h->typ = f->readInt (1);
- f->ignore (2);
- h->ordnum = f->readInt (2);
- h->insnum = f->readInt (2);
- h->patnum = f->readInt (2);
- h->flags = f->readInt (2);
- h->cwtv = f->readInt (2);
- h->ffi = f->readInt (2);
- f->readString (h->scrm, 4);
- h->gv = f->readInt (1);
- h->is = f->readInt (1);
- h->it = f->readInt (1);
- h->mv = f->readInt (1);
- h->uc = f->readInt (1);
- h->dp = f->readInt (1);
- f->ignore (8);
- h->special = f->readInt (2);
- for (i = 0; i < 32; i++)
- h->chanseti = f->readInt (1);
-}
-
-void
-Cs3mPlayer::setvolume (unsigned char chan)
-{
- unsigned char op = op_tablechan, insnr = channelchan.inst;
-
- opl->write (0x43 + op,
- (int) (63 -
- ((63 -
- (instinsnr.d03 & 63)) / 63.0) * channelchan.vol) +
- (instinsnr.d03 & 192));
- if (instinsnr.d0a & 1)
- opl->write (0x40 + op,
- (int) (63 -
- ((63 -
- (instinsnr.d02 & 63)) / 63.0) *
- channelchan.vol) + (instinsnr.d02 & 192));
-}
-
-void
-Cs3mPlayer::setfreq (unsigned char chan)
-{
- opl->write (0xa0 + chan, channelchan.freq & 255);
- if (channelchan.key)
- opl->write (0xb0 + chan,
- (((channelchan.freq & 768) >> 8) +
- (channelchan.oct << 2)) | 32);
- else
- opl->write (0xb0 + chan,
- ((channelchan.freq & 768) >> 8) + (channelchan.oct << 2));
-}
-
-void
-Cs3mPlayer::playnote (unsigned char chan)
-{
- unsigned char op = op_tablechan, insnr = channelchan.inst;
-
- opl->write (0xb0 + chan, 0); // stop old note
-
- // set instrument data
- opl->write (0x20 + op, instinsnr.d00);
- opl->write (0x23 + op, instinsnr.d01);
- opl->write (0x40 + op, instinsnr.d02);
- opl->write (0x43 + op, instinsnr.d03);
- opl->write (0x60 + op, instinsnr.d04);
- opl->write (0x63 + op, instinsnr.d05);
- opl->write (0x80 + op, instinsnr.d06);
- opl->write (0x83 + op, instinsnr.d07);
- opl->write (0xe0 + op, instinsnr.d08);
- opl->write (0xe3 + op, instinsnr.d09);
- opl->write (0xc0 + chan, instinsnr.d0a);
-
- // set frequency & play
- channelchan.key = 1;
- setfreq (chan);
-}
-
-void
-Cs3mPlayer::slide_down (unsigned char chan, unsigned char amount)
-{
- if (channelchan.freq - amount > 340)
- channelchan.freq -= amount;
- else if (channelchan.oct > 0)
- {
- channelchan.oct--;
- channelchan.freq = 684;
- }
- else
- channelchan.freq = 340;
-}
-
-void
-Cs3mPlayer::slide_up (unsigned char chan, unsigned char amount)
-{
- if (channelchan.freq + amount < 686)
- channelchan.freq += amount;
- else if (channelchan.oct < 7)
- {
- channelchan.oct++;
- channelchan.freq = 341;
- }
- else
- channelchan.freq = 686;
-}
-
-void
-Cs3mPlayer::vibrato (unsigned char chan, unsigned char info)
-{
- unsigned char i, speed, depth;
-
- speed = info >> 4;
- depth = (info & 0x0f) / 2;
-
- for (i = 0; i < speed; i++)
- {
- channelchan.trigger++;
- while (channelchan.trigger >= 64)
- channelchan.trigger -= 64;
- if (channelchan.trigger >= 16 && channelchan.trigger < 48)
- slide_down (chan,
- (unsigned char) (vibratotabchannelchan.trigger - 16 /
- (16 - depth)));
- if (channelchan.trigger < 16)
- slide_up (chan,
- (unsigned char) (vibratotabchannelchan.trigger + 16 /
- (16 - depth)));
- if (channelchan.trigger >= 48)
- slide_up (chan,
- (unsigned char) (vibratotabchannelchan.trigger - 48 /
- (16 - depth)));
- }
- setfreq (chan);
-}
-
-void
-Cs3mPlayer::tone_portamento (unsigned char chan, unsigned char info)
-{
- if (channelchan.freq + (channelchan.oct << 10) <
- channelchan.nextfreq + (channelchan.nextoct << 10))
- slide_up (chan, info);
- if (channelchan.freq + (channelchan.oct << 10) >
- channelchan.nextfreq + (channelchan.nextoct << 10))
- slide_down (chan, info);
- setfreq (chan);
-}

audacious-plugins-3.6.2-gtk3.tar.bz2/src/adplug/core/s3m.h Deleted

@@ -1,107 +0,0 @@
-/*
- * Adplug - Replayer for many OPL2/OPL3 audio file formats.
- * Copyright (C) 1999 - 2003 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
- *
- * s3m.h - AdLib S3M Player by Simon Peter <dn.tlp@gmx.net>
- */
-
-#ifndef H_ADPLUG_S3M
-#define H_ADPLUG_S3M
-
-#include "player.h"
-
-class Cs3mPlayer: public CPlayer
-{
-public:
- static CPlayer *factory(Copl *newopl);
-
-	Cs3mPlayer(Copl *newopl);
-
-	bool load(VFSFile &fd, const CFileProvider &fp);
-	bool update();
-	void rewind(int subsong);
-	float getrefresh();
-
-	std::string gettype();
-	std::string gettitle()
-	{ return std::string(header.name); };
-
-	unsigned int getpatterns()
-	{ return header.patnum; };
-	unsigned int getpattern()
-	{ return ordersord; };
-	unsigned int getorders()
-	{ return (header.ordnum-1); };
-	unsigned int getorder()
-	{ return ord; };
-	unsigned int getrow()
-	{ return crow; };
-	unsigned int getspeed()
-	{ return speed; };
-	unsigned int getinstruments()
-	{ return header.insnum; };
-	std::string getinstrument(unsigned int n)
-	{ return std::string(instn.name); };
-
-protected:
-	struct s3mheader {
-		char name28;				// song name
-		unsigned char kennung,typ,dummy2;
-		unsigned short ordnum,insnum,patnum,flags,cwtv,ffi;
-		char scrm4;
-		unsigned char gv,is,it,mv,uc,dp,dummy28;
-		unsigned short special;
-		unsigned char chanset32;
-	};
-
-	struct s3minst {
-		unsigned char type;
-		char filename15;
-		unsigned char d00,d01,d02,d03,d04,d05,d06,d07,d08,d09,d0a,d0b,volume,dsk,dummy2;
-		unsigned long c2spd;
-		char dummy212, name28,scri4;
-	} inst99;
-
-	struct {
-		unsigned char note,oct,instrument,volume,command,info;
-	} pattern996432;
-
-	struct {
-		unsigned short freq,nextfreq;
-		unsigned char oct,vol,inst,fx,info,dualinfo,key,nextoct,trigger,note;
-	} channel9;
-
-	s3mheader header;
-	unsigned char orders256;
-	unsigned char crow,ord,speed,tempo,del,songend,loopstart,loopcnt;
-
-private:
-	static const signed char chnresolv;
-	static const unsigned short notetable12;
-	static const unsigned char vibratotab32;
-
-	void load_header(binistream *f, s3mheader *h);
-	void setvolume(unsigned char chan);
-	void setfreq(unsigned char chan);
-	void playnote(unsigned char chan);
-	void slide_down(unsigned char chan, unsigned char amount);
-	void slide_up(unsigned char chan, unsigned char amount);
-	void vibrato(unsigned char chan, unsigned char info);
-	void tone_portamento(unsigned char chan, unsigned char info);
-};
-
-#endif

audacious-plugins-3.6.2-gtk3.tar.bz2/src/adplug/core/sa2.cc Deleted

@@ -1,314 +0,0 @@
-/*
- * 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
- *
- * sa2.cpp - SAdT2 Loader by Simon Peter <dn.tlp@gmx.net>
- * SAdT Loader by Mamiya <mamiya@users.sourceforge.net>
- */
-
-#include <stdio.h>
-#include <string.h>
-
-#include "sa2.h"
-#include "debug.h"
-
-CPlayer *
-Csa2Loader::factory (Copl * newopl)
-{
- return new Csa2Loader (newopl);
-}
-
-bool
-Csa2Loader::load (VFSFile & fd, const CFileProvider & fp)
-{
- binistream *f = fp.open (fd);
- if (!f)
- return false;
- struct
- {
- unsigned char data11, arpstart, arpspeed, arppos, arpspdcnt;
- } insts;
- unsigned char buf;
- int i, j, k, notedis = 0;
- const unsigned char convfx16 =
- { 0, 1, 2, 3, 4, 5, 6, 255, 8, 255, 10, 11, 12, 13, 255, 15 };
- unsigned char sat_type;
- enum SAT_TYPE
- {
- HAS_ARPEGIOLIST = (1 << 7),
- HAS_V7PATTERNS = (1 << 6),
- HAS_ACTIVECHANNELS = (1 << 5),
- HAS_TRACKORDER = (1 << 4),
- HAS_ARPEGIO = (1 << 3),
- HAS_OLDBPM = (1 << 2),
- HAS_OLDPATTERNS = (1 << 1),
- HAS_UNKNOWN127 = (1 << 0)
- };
-
- // read header
- f->readString (header.sadt, 4);
- header.version = f->readInt (1);
-
- // file validation section
- if (strncmp (header.sadt, "SAdT", 4))
- {
- fp.close (f);
- return false;
- }
- switch (header.version)
- {
- case 1:
- notedis = +0x18;
- sat_type = HAS_UNKNOWN127 | HAS_OLDPATTERNS | HAS_OLDBPM;
- break;
- case 2:
- notedis = +0x18;
- sat_type = HAS_OLDPATTERNS | HAS_OLDBPM;
- break;
- case 3:
- notedis = +0x0c;
- sat_type = HAS_OLDPATTERNS | HAS_OLDBPM;
- break;
- case 4:
- notedis = +0x0c;
- sat_type = HAS_ARPEGIO | HAS_OLDPATTERNS | HAS_OLDBPM;
- break;
- case 5:
- notedis = +0x0c;
- sat_type = HAS_ARPEGIO | HAS_ARPEGIOLIST | HAS_OLDPATTERNS | HAS_OLDBPM;
- break;
- case 6:
- sat_type = HAS_ARPEGIO | HAS_ARPEGIOLIST | HAS_OLDPATTERNS | HAS_OLDBPM;
- break;
- case 7:
- sat_type = HAS_ARPEGIO | HAS_ARPEGIOLIST | HAS_V7PATTERNS;
- break;
- case 8:
- sat_type = HAS_ARPEGIO | HAS_ARPEGIOLIST | HAS_TRACKORDER;
- break;
- case 9:
- sat_type =
- HAS_ARPEGIO | HAS_ARPEGIOLIST | HAS_TRACKORDER | HAS_ACTIVECHANNELS;
- break;
- default: /* unknown */
- fp.close (f);
- return false;
- }
-
- // load section
- // instruments
- for (i = 0; i < 31; i++)
- {
- if (sat_type & HAS_ARPEGIO)
- {
- for (j = 0; j < 11; j++)
- insts.dataj = f->readInt (1);
- insts.arpstart = f->readInt (1);
- insts.arpspeed = f->readInt (1);
- insts.arppos = f->readInt (1);
- insts.arpspdcnt = f->readInt (1);
- insti.arpstart = insts.arpstart;
- insti.arpspeed = insts.arpspeed;
- insti.arppos = insts.arppos;
- insti.arpspdcnt = insts.arpspdcnt;
- }
- else
- {
- for (j = 0; j < 11; j++)
- insts.dataj = f->readInt (1);
- insti.arpstart = 0;
- insti.arpspeed = 0;
- insti.arppos = 0;
- insti.arpspdcnt = 0;
- }
- for (j = 0; j < 11; j++)
- insti.dataj = insts.dataj;
- insti.misc = 0;
- insti.slide = 0;
- }
-
- // instrument names
- for (i = 0; i < 29; i++)
- f->readString (instnamei, 17);
-
- f->ignore (3); // dummy bytes
- for (i = 0; i < 128; i++)
- orderi = f->readInt (1); // pattern orders
- if (sat_type & HAS_UNKNOWN127)
- f->ignore (127);
-
- // infos
- nop = f->readInt (2);
- length = f->readInt (1);
- restartpos = f->readInt (1);
-
- // bpm
- bpm = f->readInt (2);
- if (sat_type & HAS_OLDBPM)
- {
- bpm = bpm * 125 / 50; // cps -> bpm
- }
-
- if (sat_type & HAS_ARPEGIOLIST)
- {
- init_specialarp ();
- for (i = 0; i < 256; i++)
- arplisti = f->readInt (1); // arpeggio list
- for (i = 0; i < 256; i++)
- arpcmdi = f->readInt (1); // arpeggio commands
- }
-
- for (i = 0; i < 64; i++)
- { // track orders
- for (j = 0; j < 9; j++)
- {
- if (sat_type & HAS_TRACKORDER)
- trackordij = f->readInt (1);
- else
- {
- trackordij = i * 9 + j;
- }
- }
- }
-
- if (sat_type & HAS_ACTIVECHANNELS)
- activechan = f->readInt (2) << 16; // active channels
-
- AdPlug_LogWrite ("Csa2Loader::load(\"%s\"): sat_type = %x, nop = %d, "
- "length = %d, restartpos = %d, activechan = %x, bpm = %d\n",
- fd.filename (), sat_type, nop, length, restartpos, activechan,
- bpm);
-
- // track data
- if (sat_type & HAS_OLDPATTERNS)
- {
- i = 0;
- while (!f->ateof ())
- {
- for (j = 0; j < 64; j++)
- {
- for (k = 0; k < 9; k++)
- {
- buf = f->readInt (1);
- tracksi + kj.note = buf ? (buf + notedis) : 0;
- tracksi + kj.inst = f->readInt (1);
- tracksi + kj.command = convfxf->readInt (1) & 0xf;
- tracksi + kj.param1 = f->readInt (1);
- tracksi + kj.param2 = f->readInt (1);
- }
- }
- i += 9;
- }
- }
- else if (sat_type & HAS_V7PATTERNS)
- {
- i = 0;
- while (!f->ateof ())
- {
- for (j = 0; j < 64; j++)
- {
- for (k = 0; k < 9; k++)
- {
- buf = f->readInt (1);
- tracksi + kj.note = buf >> 1;
- tracksi + kj.inst = (buf & 1) << 4;
- buf = f->readInt (1);
- tracksi + kj.inst += buf >> 4;
- tracksi + kj.command = convfxbuf & 0x0f;
- buf = f->readInt (1);
- tracksi + kj.param1 = buf >> 4;
- tracksi + kj.param2 = buf & 0x0f;
- }
- }
- i += 9;
- }
- }
- else
- {
- i = 0;
- while (!f->ateof ())
- {
- for (j = 0; j < 64; j++)
- {
- buf = f->readInt (1);
- tracksij.note = buf >> 1;
- tracksij.inst = (buf & 1) << 4;
- buf = f->readInt (1);
- tracksij.inst += buf >> 4;
- tracksij.command = convfxbuf & 0x0f;
- buf = f->readInt (1);
- tracksij.param1 = buf >> 4;
- tracksij.param2 = buf & 0x0f;
- }
- i++;
- }
- }
- fp.close (f);
-
- // fix instrument names
- for (i = 0; i < 29; i++)
- for (j = 0; j < 17; j++)
- if (!instnameij)
- instnameij = ' ';
-
- rewind (0); // rewind module
- return true;
-}
-
-std::string Csa2Loader::gettype ()
-{
- char
- tmpstr40;
-
- sprintf (tmpstr, "Surprise! Adlib Tracker 2 (version %d)", header.version);
- return std::string (tmpstr);
-}
-
-std::string Csa2Loader::gettitle ()
-{
- char
- bufinst29 * 17,
- buf18;
- int
- i,
- ptr;
-
- // parse instrument names for song name
- memset (bufinst, '\0', 29 * 17);
- for (i = 0; i < 29; i++)
- {
- buf16 = ' ';
- buf17 = '\0';
- memcpy (buf, instnamei + 1, 16);
- for (ptr = 16; ptr > 0; ptr--)
- if (bufptr == ' ')
- bufptr = '\0';
- else
- {
- if (ptr < 16)
- bufptr + 1 = ' ';
- break;
- }
- strcat (bufinst, buf);
- }
-
- if (strchr (bufinst, '"'))
- return std::string (bufinst, strchr (bufinst, '"') - bufinst + 1,
- strrchr (bufinst, '"') - strchr (bufinst, '"') - 1);
- else
- return std::string ();
-}

audacious-plugins-3.6.2-gtk3.tar.bz2/src/adplug/core/sa2.h Deleted

@@ -1,55 +0,0 @@
-/*
- * Adplug - Replayer for many OPL2/OPL3 audio file formats.
- * Copyright (C) 1999 - 2003 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
- *
- * sa2.h - SAdT2 Loader by Simon Peter <dn.tlp@gmx.net>
- * SAdT Loader by Mamiya <mamiya@users.sourceforge.net>
- */
-
-#include "protrack.h"
-
-class Csa2Loader: public CmodPlayer
-{
-public:
- static CPlayer *factory(Copl *newopl);
-
-	Csa2Loader(Copl *newopl)
-		: CmodPlayer(newopl)
-	{ }
-
-	bool load(VFSFile &fd, const CFileProvider &fp);
-
-	std::string gettype();
-	std::string gettitle();
-	unsigned int getinstruments()
-	{ return 31; }
-	std::string getinstrument(unsigned int n)
-	{
-	 if(n < 29)
-	 return std::string(instnamen,1,16);
-	 else
-	 return std::string("-broken-");
-	}
-
-private:
-	struct sa2header {
-		char sadt4;
-		unsigned char version;
-	} header;
-
-	char instname2917;
-};

audacious-plugins-3.6.2-gtk3.tar.bz2/src/adplug/core/silentopl.h Deleted

@@ -1,29 +0,0 @@
-/*
- * Adplug - Replayer for many OPL2/OPL3 audio file formats.
- * Copyright (C) 1999 - 2005 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
- *
- * silentopl.h - Silent OPL device, by Simon Peter (dn.tlp@gmx.net)
- */
-
-#include "opl.h"
-
-class CSilentopl: public Copl
-{
-public:
-	void write(int reg, int val) {}
-	void init() {}
-};

audacious-plugins-3.6.2-gtk3.tar.bz2/src/adplug/core/sng.cc Deleted

@@ -1,113 +0,0 @@
-/*
- * Adplug - Replayer for many OPL2/OPL3 audio file formats.
- * Copyright (C) 1999 - 2002 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
- *
- * sng.cpp - SNG Player by Simon Peter <dn.tlp@gmx.net>
- */
-
-#include <string.h>
-
-#include "sng.h"
-
-CPlayer *
-CsngPlayer::factory (Copl * newopl)
-{
- return new CsngPlayer (newopl);
-}
-
-bool
-CsngPlayer::load (VFSFile & fd, const CFileProvider & fp)
-{
- binistream *f = fp.open (fd);
- if (!f)
- return false;
- int i;
-
- // load header
- f->readString (header.id, 4);
- header.length = f->readInt (2);
- header.start = f->readInt (2);
- header.loop = f->readInt (2);
- header.delay = f->readInt (1);
- header.compressed = f->readInt (1) ? true : false;
-
- // file validation section
- if (strncmp (header.id, "ObsM", 4))
- {
- fp.close (f);
- return false;
- }
-
- // load section
- header.length /= 2;
- header.start /= 2;
- header.loop /= 2;
- data = new Sdataheader.length;
- for (i = 0; i < header.length; i++)
- {
- datai.val = f->readInt (1);
- datai.reg = f->readInt (1);
- }
-
- rewind (0);
- fp.close (f);
- return true;
-}
-
-bool
-CsngPlayer::update ()
-{
- if (header.compressed && del)
- {
- del--;
- return !songend;
- }
-
- while (datapos.reg)
- {
- opl->write (datapos.reg, datapos.val);
- pos++;
- if (pos >= header.length)
- {
- songend = true;
- pos = header.loop;
- }
- }
-
- if (!header.compressed)
- opl->write (datapos.reg, datapos.val);
-
- if (datapos.val)
- del = datapos.val - 1;
- pos++;
- if (pos >= header.length)
- {
- songend = true;
- pos = header.loop;
- }
- return !songend;
-}
-
-void
-CsngPlayer::rewind (int subsong)
-{
- pos = header.start;
- del = header.delay;
- songend = false;
- opl->init ();
- opl->write (1, 32); // go to OPL2 mode
-}

audacious-plugins-3.6.2-gtk3.tar.bz2/src/adplug/core/sng.h Deleted

@@ -1,64 +0,0 @@
-/*
- * Adplug - Replayer for many OPL2/OPL3 audio file formats.
- * Copyright (C) 1999 - 2002 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
- *
- * sng.h - SNG Player by Simon Peter <dn.tlp@gmx.net>
- */
-
-#ifndef H_ADPLUG_SNGPLAYER
-#define H_ADPLUG_SNGPLAYER
-
-#include "player.h"
-
-class CsngPlayer: public CPlayer
-{
-public:
- static CPlayer *factory(Copl *newopl);
-
-	CsngPlayer(Copl *newopl)
-		: CPlayer(newopl), data(0)
-	{ };
-
-	~CsngPlayer() { if(data) delete data; data = 0; };
-
-	bool load(VFSFile &fd, const CFileProvider &fp);
-	bool update();
-	void rewind(int subsong);
-	float getrefresh()
-	{ return 70.0f; };
-
-	std::string gettype()
-	{ return std::string("SNG File Format"); };
-
-protected:
-	struct {
-		char id4;
-		unsigned short length,start,loop;
-		unsigned char delay;
-		bool compressed;
-	} header;
-
-	struct Sdata {
-		unsigned char val,reg;
-	} *data;
-
-	unsigned char del;
-	unsigned short pos;
-	bool songend;
-};
-
-#endif

audacious-plugins-3.6.2-gtk3.tar.bz2/src/adplug/core/temuopl.cc Deleted

@@ -1,85 +0,0 @@
-/*
- * AdPlug - Replayer for many OPL2/OPL3 audio file formats.
- * Copyright (C) 1999 - 2004 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
- *
- * temuopl.cpp - Tatsuyuki Satoh's OPL2 emulator, by Simon Peter <dn.tlp@gmx.net>
- */
-
-#include "temuopl.h"
-
-CTemuopl::CTemuopl (int rate, bool bit16, bool usestereo):
-use16bit (bit16),
-stereo (usestereo)
-{
- opl = OPLCreate (OPL_TYPE_YM3812, 3579545, rate);
-}
-
-CTemuopl::~CTemuopl ()
-{
- OPLDestroy (opl);
-}
-
-void
-CTemuopl::update (short *buf, int samples)
-{
- int i;
-
- if (use16bit)
- {
- YM3812UpdateOne (opl, buf, samples);
-
- if (stereo)
- for (i = samples - 1; i >= 0; i--)
- {
- bufi * 2 = bufi;
- bufi * 2 + 1 = bufi;
- }
- }
- else
- {
- short *tempbuf = new shortstereo ? samples * 2 : samples;
- int i;
-
- YM3812UpdateOne (opl, tempbuf, samples);
-
- if (stereo)
- for (i = samples - 1; i >= 0; i--)
- {
- tempbufi * 2 = tempbufi;
- tempbufi * 2 + 1 = tempbufi;
- }
-
- for (i = 0; i < (stereo ? samples * 2 : samples); i++)
- ((char *) buf)i = (tempbufi >> 8) ^ 0x80;
-
- deletetempbuf;
- tempbuf = 0;
- }
-}
-
-void
-CTemuopl::write (int reg, int val)
-{
- OPLWrite (opl, 0, reg);
- OPLWrite (opl, 1, val);
-}
-
-void
-CTemuopl::init ()
-{
- OPLResetChip (opl);
-}

audacious-plugins-3.6.2-gtk3.tar.bz2/src/adplug/core/temuopl.h Deleted

@@ -1,45 +0,0 @@
-/*
- * Adplug - Replayer for many OPL2/OPL3 audio file formats.
- * Copyright (C) 1999 - 2004 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
- *
- * temuopl.h - Tatsuyuki Satoh's OPL2 emulator, by Simon Peter <dn.tlp@gmx.net>
- */
-
-#ifndef H_ADPLUG_TEMUOPL
-#define H_ADPLUG_TEMUOPL
-
-#include "opl.h"
-#include "fmopl.h"
-
-class CTemuopl: public Copl
-{
- public:
- CTemuopl(int rate, bool bit16, bool usestereo);	// rate = sample rate
- virtual ~CTemuopl();
-
- void update(short *buf, int samples);	// fill buffer
-
- // template methods
- void write(int reg, int val);
- void init();
-
- private:
- bool		use16bit,stereo;
- FM_OPL	*opl;			// holds emulator data
-};
-
-#endif

audacious-plugins-3.6.2-gtk3.tar.bz2/src/adplug/core/u6m.cc Deleted

@@ -1,1064 +0,0 @@
-/*
- * Adplug - Replayer for many OPL2/OPL3 audio file formats.
- * Copyright (C) 1999 - 2006 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
- *
- * u6m.cpp - Ultima 6 Music Player by Marc Winterrowd.
- * This code extends the Adlib Winamp plug-in by Simon Peter <dn.tlp@gmx.net>
- */
-
-#include "u6m.h"
-
-// Makes security checks on output buffer before writing
-#define SAVE_OUTPUT_ROOT(c, d, p) \
-if(p < d.size) \
- output_root(c, d.data, p); \
-else \
- return false;
-
-CPlayer *
-Cu6mPlayer::factory (Copl * newopl)
-{
- return new Cu6mPlayer (newopl);
-}
-
-bool
-Cu6mPlayer::load (VFSFile & fd, const CFileProvider & fp)
-{
- // file validation section
- // this section only checks a few *necessary* conditions
- unsigned long filesize, decompressed_filesize;
- binistream *f;
-
- f = fp.open (fd);
- if (!f)
- return false;
- filesize = fp.filesize (f);
-
- if (filesize >= 6)
- {
- // check if the file has a valid pseudo-header
- unsigned char pseudo_header6;
- f->readString ((char *) pseudo_header, 6);
- decompressed_filesize = pseudo_header0 + (pseudo_header1 << 8);
-
- if (!((pseudo_header2 == 0) && (pseudo_header3 == 0) &&
- (pseudo_header4 + ((pseudo_header5 & 0x1) << 8) == 0x100) &&
- (decompressed_filesize > (filesize - 4))))
- {
- fp.close (f);
- return (false);
- }
- }
- else
- {
- fp.close (f);
- return (false);
- }
-
- // load section
- song_data = new unsigned chardecompressed_filesize;
- unsigned char *compressed_song_data = new unsigned charfilesize - 3;
-
- f->seek (4);
- f->readString ((char *) compressed_song_data, filesize - 4);
- fp.close (f);
-
- // attempt to decompress the song data
- // if unsuccessful, deallocate song_data on the spot, and return(false)
- data_block source, destination;
- source.size = filesize - 4;
- source.data = compressed_song_data;
- destination.size = decompressed_filesize;
- destination.data = song_data;
-
- if (!lzw_decompress (source, destination))
- {
- deletecompressed_song_data;
- compressed_song_data = 0;
- deletesong_data;
- song_data = 0;
- return (false);
- }
-
- // deallocation section
- deletecompressed_song_data;
- compressed_song_data = 0;
-
- rewind (0);
- return (true);
-}
-
-
-bool
-Cu6mPlayer::update ()
-{
- if (!driver_active)
- {
- driver_active = true;
- dec_clip (read_delay);
- if (read_delay == 0)
- {
- command_loop ();
- }
-
- // on all Adlib channels: freq slide/vibrato, mute factor slide
- for (int i = 0; i < 9; i++)
- {
- if (channel_freq_signed_deltai != 0)
- // frequency slide + mute factor slide
- {
- // freq slide
- freq_slide (i);
-
- // mute factor slide
- if (carrier_mf_signed_deltai != 0)
- {
- mf_slide (i);
- }
- }
- else
- // vibrato + mute factor slide
- {
- // vibrato
- if ((vb_multiplieri != 0) && ((channel_freqi.hi & 0x20) == 0x20))
- {
- vibrato (i);
- }
-
- // mute factor slide
- if (carrier_mf_signed_deltai != 0)
- {
- mf_slide (i);
- }
- }
- }
-
- driver_active = false;
- }
-
- return !songend;
-}
-
-
-void
-Cu6mPlayer::rewind (int subsong)
-{
- played_ticks = 0;
- songend = false;
-
- // set the driver's internal variables
- byte_pair freq_word = { 0, 0 };
-
- driver_active = false;
- song_pos = 0;
- loop_position = 0; // position of the loop point
- read_delay = 0; // delay (in timer ticks) before further song data is read
-
- for (int i = 0; i < 9; i++)
- {
- // frequency
- channel_freq_signed_deltai = 0;
- channel_freqi = freq_word; // Adlib freq settings for each channel
-
- // vibrato ("vb")
- vb_current_valuei = 0;
- vb_double_amplitudei = 0;
- vb_multiplieri = 0;
- vb_direction_flagi = 0;
-
- // mute factor ("mf") == ~(volume)
- carrier_mfi = 0;
- carrier_mf_signed_deltai = 0;
- carrier_mf_mod_delay_backupi = 0;
- carrier_mf_mod_delayi = 0;
- }
-
- while (!subsong_stack.empty ()) // empty subsong stack
- subsong_stack.pop ();
-
- opl->init ();
- out_adlib (1, 32); // go to OPL2 mode
-}
-
-
-float
-Cu6mPlayer::getrefresh ()
-{
- return ((float) 60); // the Ultima 6 music driver expects to be called at 60 Hz
-}
-
-
-// ============================================================================================
-//
-//
-// Functions called by load()
-//
-//
-// ============================================================================================
-
-
-// decompress from memory to memory
-bool
-Cu6mPlayer::lzw_decompress (Cu6mPlayer::data_block source,
- Cu6mPlayer::data_block dest)
-{
- bool end_marker_reached = false;
- int codeword_size = 9;
- long bits_read = 0;
- int next_free_codeword = 0x102;
- int dictionary_size = 0x200;
- MyDict dictionary = MyDict ();
- std::stack < unsigned char >root_stack;
-
- long bytes_written = 0;
-
- int cW, pW = 0;
- unsigned char C;
-
- while (!end_marker_reached)
- {
- cW = get_next_codeword (bits_read, source.data, codeword_size);
- switch (cW)
- {
- // re-init the dictionary
- case 0x100:
- codeword_size = 9;
- next_free_codeword = 0x102;
- dictionary_size = 0x200;
- dictionary.reset ();
- cW = get_next_codeword (bits_read, source.data, codeword_size);
- SAVE_OUTPUT_ROOT ((unsigned char) cW, dest, bytes_written);
- break;
- // end of compressed file has been reached
- case 0x101:
- end_marker_reached = true;
- break;
- // (cW <> 0x100) && (cW <> 0x101)
- default:
- if (cW < next_free_codeword) // codeword is already in the dictionary
- {
- // create the string associated with cW (on the stack)
- get_string (cW, dictionary, root_stack);
- C = root_stack.top ();
- // output the string represented by cW
- while (!root_stack.empty ())
- {
- SAVE_OUTPUT_ROOT (root_stack.top (), dest, bytes_written);
- root_stack.pop ();
- }
- // add pW+C to the dictionary
- dictionary.add (C, pW);
-
- next_free_codeword++;
- if (next_free_codeword >= dictionary_size)
- {
- if (codeword_size < max_codeword_length)
- {
- codeword_size += 1;
- dictionary_size *= 2;
- }
- }
- }
- else // codeword is not yet defined
- {
- // create the string associated with pW (on the stack)
- get_string (pW, dictionary, root_stack);
- C = root_stack.top ();
- // output the string represented by pW
- while (!root_stack.empty ())
- {
- SAVE_OUTPUT_ROOT (root_stack.top (), dest, bytes_written);
- root_stack.pop ();
- }
- // output the char C
- SAVE_OUTPUT_ROOT (C, dest, bytes_written);
-
- // the new dictionary entry must correspond to cW
- // if it doesn't, something is wrong with the lzw-compressed data.
- if (cW != next_free_codeword)
- {
- /* printf("cW != next_free_codeword!\n");
- exit(-1); */
- return false;
- }
- // add pW+C to the dictionary
- dictionary.add (C, pW);
-
- next_free_codeword++;
- if (next_free_codeword >= dictionary_size)
- {
- if (codeword_size < max_codeword_length)
- {
- codeword_size += 1;
- dictionary_size *= 2;
- }
- }
- };
- break;
- }
- // shift roles - the current cW becomes the new pW
- pW = cW;
- }
-
- return (true); // indicate successful decompression
-}
-
-
-// --------------------
-// Additional functions
-// --------------------
-
-
-// Read the next code word from the source buffer
-int
-Cu6mPlayer::get_next_codeword (long &bits_read, unsigned char *source,
- int codeword_size)
-{
- unsigned char b0, b1, b2;
- int codeword;
-
- b0 = sourcebits_read / 8;
- b1 = sourcebits_read / 8 + 1;
- b2 = sourcebits_read / 8 + 2;
-
- codeword = ((b2 << 16) + (b1 << 8) + b0);
- codeword = codeword >> (bits_read % 8);
- switch (codeword_size)
- {
- case 0x9:
- codeword = codeword & 0x1ff;
- break;
- case 0xa:
- codeword = codeword & 0x3ff;
- break;
- case 0xb:
- codeword = codeword & 0x7ff;
- break;
- case 0xc:
- codeword = codeword & 0xfff;
- break;
- default:
- codeword = -1; // indicates that an error has occurred
- break;
- }
-
- bits_read += codeword_size;
- return (codeword);
-}
-
-
-// output a root to memory
-void
-Cu6mPlayer::output_root (unsigned char root, unsigned char *destination,
- long &position)
-{
- destinationposition = root;
- position++;
-}
-
-
-// output the string represented by a codeword
-void
-Cu6mPlayer::get_string (int codeword, Cu6mPlayer::MyDict & dictionary,
- std::stack < unsigned char >&root_stack)
-{
- unsigned char root;
- int current_codeword;
-
- current_codeword = codeword;
-
- while (current_codeword > 0xff)
- {
- root = dictionary.get_root (current_codeword);
- current_codeword = dictionary.get_codeword (current_codeword);
- root_stack.push (root);
- }
-
- // push the root at the leaf
- root_stack.push ((unsigned char) current_codeword);
-}
-
-
-// ============================================================================================
-//
-//
-// Functions called by update()
-//
-//
-// ============================================================================================
-
-
-// This function reads the song data and executes the embedded commands.
-void
-Cu6mPlayer::command_loop ()
-{
- unsigned char command_byte; // current command byte
- int command_nibble_hi; // command byte, bits 4-7
- int command_nibble_lo; // command byte, bite 0-3
- bool repeat_loop = true; //
-
- do
- {
- // extract low and high command nibbles
- command_byte = read_song_byte (); // implicitly increments song_pos
- command_nibble_hi = command_byte >> 4;
- command_nibble_lo = command_byte & 0xf;
-
- switch (command_nibble_hi)
- {
- case 0x0:
- command_0 (command_nibble_lo);
- break;
- case 0x1:
- command_1 (command_nibble_lo);
- break;
- case 0x2:
- command_2 (command_nibble_lo);
- break;
- case 0x3:
- command_3 (command_nibble_lo);
- break;
- case 0x4:
- command_4 (command_nibble_lo);
- break;
- case 0x5:
- command_5 (command_nibble_lo);
- break;
- case 0x6:
- command_6 (command_nibble_lo);
- break;
- case 0x7:
- command_7 (command_nibble_lo);
- break;
- case 0x8:
- switch (command_nibble_lo)
- {
- case 1:
- command_81 ();
- break;
- case 2:
- command_82 ();
- repeat_loop = false;
- break;
- case 3:
- command_83 ();
- break;
- case 5:
- command_85 ();
- break;
- case 6:
- command_86 ();
- break;
- default:
- break; // maybe generate an error?
- }
- break;
- case 0xE:
- command_E ();
- break;
- case 0xF:
- command_F ();
- break;
- default:
- break; // maybe generate an error?
- }
-
- } while (repeat_loop);
-}
-
-
-// --------------------------------------------------------
-// The commands supported by the U6 music file format
-// --------------------------------------------------------
-
-// ----------------------------------------
-// Set octave and frequency, note off
-// Format: 0c nn
-// c = channel, nn = packed Adlib frequency
-// ----------------------------------------
-void
-Cu6mPlayer::command_0 (int channel)
-{
- unsigned char freq_byte;
- byte_pair freq_word;
-
- freq_byte = read_song_byte ();
- freq_word = expand_freq_byte (freq_byte);
- set_adlib_freq (channel, freq_word);
-}
-
-
-// ---------------------------------------------------
-// Set octave and frequency, old note off, new note on
-// Format: 1c nn
-// c = channel, nn = packed Adlib frequency
-// ---------------------------------------------------
-void
-Cu6mPlayer::command_1 (int channel)
-{
- unsigned char freq_byte;
- byte_pair freq_word;
-
- vb_direction_flagchannel = 0;
- vb_current_valuechannel = 0;
-
- freq_byte = read_song_byte ();
- freq_word = expand_freq_byte (freq_byte);
- set_adlib_freq (channel, freq_word);
-
- freq_word.hi = freq_word.hi | 0x20; // note on
- set_adlib_freq (channel, freq_word);
-}
-
-
-// ----------------------------------------
-// Set octave and frequency, note on
-// Format: 2c nn
-// c = channel, nn = packed Adlib frequency
-// ----------------------------------------
-void
-Cu6mPlayer::command_2 (int channel)
-{
- unsigned char freq_byte;
- byte_pair freq_word;
-
- freq_byte = read_song_byte ();
- freq_word = expand_freq_byte (freq_byte);
- freq_word.hi = freq_word.hi | 0x20; // note on
- set_adlib_freq (channel, freq_word);
-}
-
-
-// --------------------------------------
-// Set "carrier mute factor"==not(volume)
-// Format: 3c nn
-// c = channel, nn = mute factor
-// --------------------------------------
-void
-Cu6mPlayer::command_3 (int channel)
-{
- unsigned char mf_byte;
-
- carrier_mf_signed_deltachannel = 0;
- mf_byte = read_song_byte ();
- set_carrier_mf (channel, mf_byte);
-}
-
-
-// ----------------------------------------
-// set "modulator mute factor"==not(volume)
-// Format: 4c nn
-// c = channel, nn = mute factor
-// ----------------------------------------
-void
-Cu6mPlayer::command_4 (int channel)
-{
- unsigned char mf_byte;
-
- mf_byte = read_song_byte ();
- set_modulator_mf (channel, mf_byte);
-}
-
-
-// --------------------------------------------
-// Set portamento (pitch slide)
-// Format: 5c nn
-// c = channel, nn = signed channel pitch delta
-// --------------------------------------------
-void
-Cu6mPlayer::command_5 (int channel)
-{
- channel_freq_signed_deltachannel = read_signed_song_byte ();
-}
-
-
-// --------------------------------------------
-// Set vibrato paramters
-// Format: 6c mn
-// c = channel
-// m = vibrato double amplitude
-// n = vibrato multiplier
-// --------------------------------------------
-void
-Cu6mPlayer::command_6 (int channel)
-{
- unsigned char vb_parameters;
-
- vb_parameters = read_song_byte ();
- vb_double_amplitudechannel = vb_parameters >> 4; // high nibble
- vb_multiplierchannel = vb_parameters & 0xF; // low nibble
-}
-
-
-// ----------------------------------------
-// Assign Adlib instrument to Adlib channel
-// Format: 7c nn
-// c = channel, nn = instrument number
-// ----------------------------------------
-void
-Cu6mPlayer::command_7 (int channel)
-{
- int instrument_offset = instrument_offsetsread_song_byte ();
- out_adlib_opcell (channel, false, 0x20,
- *(song_data + instrument_offset + 0));
- out_adlib_opcell (channel, false, 0x40,
- *(song_data + instrument_offset + 1));
- out_adlib_opcell (channel, false, 0x60,
- *(song_data + instrument_offset + 2));
- out_adlib_opcell (channel, false, 0x80,
- *(song_data + instrument_offset + 3));
- out_adlib_opcell (channel, false, 0xE0,
- *(song_data + instrument_offset + 4));
- out_adlib_opcell (channel, true, 0x20,
- *(song_data + instrument_offset + 5));
- out_adlib_opcell (channel, true, 0x40,
- *(song_data + instrument_offset + 6));
- out_adlib_opcell (channel, true, 0x60,
- *(song_data + instrument_offset + 7));
- out_adlib_opcell (channel, true, 0x80,
- *(song_data + instrument_offset + 8));
- out_adlib_opcell (channel, true, 0xE0,
- *(song_data + instrument_offset + 9));
- out_adlib (0xC0 + channel, *(song_data + instrument_offset + 10));
-}
-
-
-// -------------------------------------------
-// Branch to a new subsong
-// Format: 81 nn aa bb
-// nn == number of times to repeat the subsong
-// aa == subsong offset (low byte)
-// bb == subsong offset (high byte)
-// -------------------------------------------
-void
-Cu6mPlayer::command_81 ()
-{
- subsong_info new_ss_info;
-
- new_ss_info.subsong_repetitions = read_song_byte ();
- new_ss_info.subsong_start = read_song_byte ();
- new_ss_info.subsong_start += read_song_byte () << 8;
- new_ss_info.continue_pos = song_pos;
-
- subsong_stack.push (new_ss_info);
- song_pos = new_ss_info.subsong_start;
-}
-
-
-// ------------------------------------------------------------
-// Stop interpreting commands for this timer tick
-// Format: 82 nn
-// nn == delay (in timer ticks) until further data will be read
-// ------------------------------------------------------------
-void
-Cu6mPlayer::command_82 ()
-{
- read_delay = read_song_byte ();
-}
-
-
-// -----------------------------
-// Adlib instrument data follows
-// Format: 83 nn <11 bytes>
-// nn == instrument number
-// -----------------------------
-void
-Cu6mPlayer::command_83 ()
-{
- unsigned char instrument_number = read_song_byte ();
- instrument_offsetsinstrument_number = song_pos;
- song_pos += 11;
-}
-
-
-// ----------------------------------------------
-// Set -1 mute factor slide (upward volume slide)
-// Format: 85 cn
-// c == channel
-// n == slide delay
-// ----------------------------------------------
-void
-Cu6mPlayer::command_85 ()
-{
- unsigned char data_byte = read_song_byte ();
- int channel = data_byte >> 4; // high nibble
- unsigned char slide_delay = data_byte & 0xF; // low nibble
- carrier_mf_signed_deltachannel = +1;
- carrier_mf_mod_delaychannel = slide_delay + 1;
- carrier_mf_mod_delay_backupchannel = slide_delay + 1;
-}
-
-
-// ------------------------------------------------
-// Set +1 mute factor slide (downward volume slide)
-// Format: 86 cn
-// c == channel
-// n == slide speed
-// ------------------------------------------------
-void
-Cu6mPlayer::command_86 ()
-{
- unsigned char data_byte = read_song_byte ();
- int channel = data_byte >> 4; // high nibble
- unsigned char slide_delay = data_byte & 0xF; // low nibble
- carrier_mf_signed_deltachannel = -1;
- carrier_mf_mod_delaychannel = slide_delay + 1;
- carrier_mf_mod_delay_backupchannel = slide_delay + 1;
-}
-
-
-// --------------
-// Set loop point
-// Format: E?
-// --------------
-void
-Cu6mPlayer::command_E ()
-{
- loop_position = song_pos;
-}
-
-
-// ---------------------------
-// Return from current subsong
-// Format: F?
-// ---------------------------
-void
-Cu6mPlayer::command_F ()
-{
- if (!subsong_stack.empty ())
- {
- subsong_info temp = subsong_stack.top ();
- subsong_stack.pop ();
- temp.subsong_repetitions--;
- if (temp.subsong_repetitions == 0)
- {
- song_pos = temp.continue_pos;
- }
- else
- {
- song_pos = temp.subsong_start;
- subsong_stack.push (temp);
- }
- }
- else
- {
- song_pos = loop_position;
- songend = true;
- }
-}
-
-
-// --------------------
-// Additional functions
-// --------------------
-
-// This function decrements its argument, without allowing it to become negative.
-void
-Cu6mPlayer::dec_clip (int &param)
-{
- param--;
- if (param < 0)
- {
- param = 0;
- }
-}
-
-
-// Returns the byte at the current song position.
-// Side effect: increments song_pos.
-unsigned char
-Cu6mPlayer::read_song_byte ()
-{
- unsigned char song_byte;
- song_byte = song_datasong_pos;
- song_pos++;
- return (song_byte);
-}
-
-
-// Same as read_song_byte(), except that it returns a signed byte
-signed char
-Cu6mPlayer::read_signed_song_byte ()
-{
- unsigned char song_byte;
- int signed_value;
- song_byte = *(song_data + song_pos);
- song_pos++;
- if (song_byte <= 127)
- {
- signed_value = song_byte;
- }
- else
- {
- signed_value = (int) song_byte - 0x100;
- }
- return ((signed char) signed_value);
-}
-
-
-Cu6mPlayer::byte_pair Cu6mPlayer::expand_freq_byte (unsigned char freq_byte)
-{
- const byte_pair
- freq_table24 = {
- {0x00, 0x00}, {0x58, 0x01}, {0x82, 0x01}, {0xB0, 0x01},
- {0xCC, 0x01}, {0x03, 0x02}, {0x41, 0x02}, {0x86, 0x02},
- {0x00, 0x00}, {0x6A, 0x01}, {0x96, 0x01}, {0xC7, 0x01},
- {0xE4, 0x01}, {0x1E, 0x02}, {0x5F, 0x02}, {0xA8, 0x02},
- {0x00, 0x00}, {0x47, 0x01}, {0x6E, 0x01}, {0x9A, 0x01},
- {0xB5, 0x01}, {0xE9, 0x01}, {0x24, 0x02}, {0x66, 0x02}
- };
-
- int
- packed_freq;
- int
- octave;
- byte_pair
- freq_word;
-
- packed_freq = freq_byte & 0x1F;
- octave = freq_byte >> 5;
-
- // range check (not present in the original U6 music driver)
- if (packed_freq >= 24)
- {
- packed_freq = 0;
- }
-
- freq_word.hi = freq_tablepacked_freq.hi + (octave << 2);
- freq_word.lo = freq_tablepacked_freq.lo;
-
- return (freq_word);
-}
-
-
-void
-Cu6mPlayer::set_adlib_freq (int channel, Cu6mPlayer::byte_pair freq_word)
-{
- out_adlib (0xA0 + channel, freq_word.lo);
- out_adlib (0xB0 + channel, freq_word.hi);
- // update the Adlib register backups
- channel_freqchannel = freq_word;
-}
-
-
-// this function sets the Adlib frequency, but does not update the register backups
-void
-Cu6mPlayer::set_adlib_freq_no_update (int channel,
- Cu6mPlayer::byte_pair freq_word)
-{
- out_adlib (0xA0 + channel, freq_word.lo);
- out_adlib (0xB0 + channel, freq_word.hi);
-}
-
-
-void
-Cu6mPlayer::set_carrier_mf (int channel, unsigned char mute_factor)
-{
- out_adlib_opcell (channel, true, 0x40, mute_factor);
- carrier_mfchannel = mute_factor;
-}
-
-
-void
-Cu6mPlayer::set_modulator_mf (int channel, unsigned char mute_factor)
-{
- out_adlib_opcell (channel, false, 0x40, mute_factor);
-}
-
-
-void
-Cu6mPlayer::freq_slide (int channel)
-{
- byte_pair freq = channel_freqchannel;
-
- long freq_word =
- freq.lo + (freq.hi << 8) + channel_freq_signed_deltachannel;
- if (freq_word < 0)
- {
- freq_word += 0x10000;
- }
- if (freq_word > 0xFFFF)
- {
- freq_word -= 0x10000;
- }
-
- freq.lo = freq_word & 0xFF;
- freq.hi = (freq_word >> 8) & 0xFF;
- set_adlib_freq (channel, freq);
-}
-
-
-void
-Cu6mPlayer::vibrato (int channel)
-{
- byte_pair freq;
-
- if (vb_current_valuechannel >= vb_double_amplitudechannel)
- {
- vb_direction_flagchannel = 1;
- }
- else if (vb_current_valuechannel <= 0)
- {
- vb_direction_flagchannel = 0;
- }
-
- if (vb_direction_flagchannel == 0)
- {
- vb_current_valuechannel++;
- }
- else
- {
- vb_current_valuechannel--;
- }
-
- long freq_word = channel_freqchannel.lo + (channel_freqchannel.hi << 8);
- freq_word +=
- (vb_current_valuechannel -
- (vb_double_amplitudechannel >> 1)) * vb_multiplierchannel;
- if (freq_word < 0)
- {
- freq_word += 0x10000;
- }
- if (freq_word > 0xFFFF)
- {
- freq_word -= 0x10000;
- }
-
- freq.lo = freq_word & 0xFF;
- freq.hi = (freq_word >> 8) & 0xFF;
- set_adlib_freq_no_update (channel, freq);
-}
-
-
-void
-Cu6mPlayer::mf_slide (int channel)
-{
- carrier_mf_mod_delaychannel--;
- if (carrier_mf_mod_delaychannel == 0)
- {
- carrier_mf_mod_delaychannel = carrier_mf_mod_delay_backupchannel;
- int current_mf = carrier_mfchannel + carrier_mf_signed_deltachannel;
- if (current_mf > 0x3F)
- {
- current_mf = 0x3F;
- carrier_mf_signed_deltachannel = 0;
- }
- else if (current_mf < 0)
- {
- current_mf = 0;
- carrier_mf_signed_deltachannel = 0;
- }
-
- set_carrier_mf (channel, (unsigned char) current_mf);
- }
-}
-
-
-void
-Cu6mPlayer::out_adlib (unsigned char adlib_register, unsigned char adlib_data)
-{
- opl->write (adlib_register, adlib_data);
-}
-
-
-void
-Cu6mPlayer::out_adlib_opcell (int channel, bool carrier,
- unsigned char adlib_register,
- unsigned char out_byte)
-{
- const unsigned char adlib_channel_to_carrier_offset9 =
- { 0x03, 0x04, 0x05, 0x0B, 0x0C, 0x0D, 0x13, 0x14, 0x15 };
- const unsigned char adlib_channel_to_modulator_offset9 =
- { 0x00, 0x01, 0x02, 0x08, 0x09, 0x0A, 0x10, 0x11, 0x12 };
-
- if (carrier)
- {
- out_adlib (adlib_register + adlib_channel_to_carrier_offsetchannel,
- out_byte);
- }
- else
- {
- out_adlib (adlib_register + adlib_channel_to_modulator_offsetchannel,
- out_byte);
- }
-}
-
-
-// ============================================================================================
-//
-//
-// The Dictionary
-//
-//
-// ============================================================================================
-
-
-Cu6mPlayer::MyDict::MyDict ()
-{
- dict_size = default_dict_size;
- dictionary = new dict_entrydict_size - 0x100; // don't allocate space for the roots
- contains = 0x102;
-}
-
-
-Cu6mPlayer::MyDict::MyDict (int max_size)
-{
- dict_size = max_size;
- dictionary = new dict_entrydict_size - 0x100; // don't allocate space for the roots
- contains = 0x102;
-}
-
-
-Cu6mPlayer::MyDict::~MyDict ()
-{
- deletedictionary;
- dictionary = 0;
-}
-
-// re-initializes the dictionary
-void
-Cu6mPlayer::MyDict::reset ()
-{
- contains = 0x102;
-}
-
-
-// Note: If the dictionary is already full, this function does nothing.
-void
-Cu6mPlayer::MyDict::add (unsigned char root, int codeword)
-{
- if (contains < dict_size)
- {
- dictionarycontains - 0x100.root = root;
- dictionarycontains - 0x100.codeword = codeword;
- contains++;
- }
-}
-
-
-unsigned char
-Cu6mPlayer::MyDict::get_root (int codeword)
-{
- return (dictionarycodeword - 0x100.root);
-}
-
-
-int
-Cu6mPlayer::MyDict::get_codeword (int codeword)
-{
- return (dictionarycodeword - 0x100.codeword);
-}

audacious-plugins-3.6.2-gtk3.tar.bz2/src/adplug/core/u6m.h Deleted

@@ -1,167 +0,0 @@
-/*
- * Adplug - Replayer for many OPL2/OPL3 audio file formats.
- * Copyright (C) 1999 - 2006 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
- *
- * u6m.h - Ultima 6 Music Player by Marc Winterrowd.
- * This code extends the Adlib Winamp plug-in by Simon Peter <dn.tlp@gmx.net>
- */
-
-#include <stack>
-
-#include "player.h"
-
-#define default_dict_size 4096 // because maximum codeword size == 12 bits
-#define max_codeword_length 12 // maximum codeword length in bits
-
-class Cu6mPlayer: public CPlayer
-{
- public:
- static CPlayer *factory(Copl *newopl);
-
- Cu6mPlayer(Copl *newopl) : CPlayer(newopl), song_data(0)
- {
- };
-
-
-	~Cu6mPlayer()
- {
- if(song_data) { delete song_data; song_data = 0; }
- };
-
-	bool load(VFSFile &fd, const CFileProvider &fp);
-	bool update();
-	void rewind(int subsong);
-	float getrefresh();
-
-	std::string gettype()
- {
- return std::string("Ultima 6 Music");
- };
-
- protected:
-
- struct byte_pair
-	{
- unsigned char lo;
- unsigned char hi;
-	};
-
-	struct subsong_info // information about a subsong
-	{
-	 int continue_pos;
-		int subsong_repetitions;
-	 int subsong_start;
-	};
-
-	struct dict_entry // dictionary entry
-	{
-	 unsigned char root;
-		int codeword;
-	};
-
-	struct data_block // 
-	{
-	 long size;
-	 unsigned char *data;
-	};
-
- class MyDict
- {
- private:
- // The actual number of dictionary entries allocated
-	 // is (dictionary_size-256), because there are 256 roots
-		// that do not need to be stored.
- int contains; // number of entries currently in the dictionary
- int dict_size; // max number of entries that will fit into the dictionary
-		dict_entry* dictionary;
-
- public:
- MyDict(); // use dictionary size of 4096
- MyDict(int); // let the caller specify a dictionary size
- ~MyDict();
- void reset(); // re-initializes the dictionary
- void add(unsigned char, int);
- unsigned char get_root(int);
- int get_codeword(int);
- };
-
-
- // class variables
- long played_ticks;
-
- unsigned char* song_data; // the uncompressed .m file (the "song")
- bool driver_active; // flag to prevent reentrancy
-	bool songend;				// indicates song end
- int song_pos; // current offset within the song
- int loop_position; // position of the loop point
- int read_delay; // delay (in timer ticks) before further song data is read
-	std::stack<subsong_info> subsong_stack;
-
- int instrument_offsets9; // offsets of the adlib instrument data
- // vibrato ("vb")
- unsigned char vb_current_value9;
- unsigned char vb_double_amplitude9;
- unsigned char vb_multiplier9;
- unsigned char vb_direction_flag9;
- // mute factor ("mf") = not(volume)
- unsigned char carrier_mf9;
- signed char carrier_mf_signed_delta9;
- unsigned char carrier_mf_mod_delay_backup9;
- unsigned char carrier_mf_mod_delay9;
- // frequency
-	byte_pair channel_freq9; // adlib freq settings for each channel
- signed char channel_freq_signed_delta9;
-
- // protected functions used by update()
- void command_loop();
- unsigned char read_song_byte();
- signed char read_signed_song_byte();
- void dec_clip(int&);
- byte_pair expand_freq_byte(unsigned char);
- void set_adlib_freq(int channel,byte_pair freq_word);
- void set_adlib_freq_no_update(int channel,byte_pair freq_word);
- void set_carrier_mf(int channel,unsigned char mute_factor);
- void set_modulator_mf(int channel,unsigned char mute_factor);
- void freq_slide(int channel);
- void vibrato(int channel);
- void mf_slide(int channel);
-
- void command_0(int channel);
- void command_1(int channel);
- void command_2(int channel);
- void command_3(int channel);
- void command_4(int channel);
- void command_5(int channel);
- void command_6(int channel);
- void command_7(int channel);
- void command_81();
- void command_82();
- void command_83();
- void command_85();
- void command_86();
- void command_E();
- void command_F();
-
- void out_adlib(unsigned char adlib_register, unsigned char adlib_data);
- void out_adlib_opcell(int channel, bool carrier, unsigned char adlib_register, unsigned char out_byte);
-
- // protected functions used by load()
- bool lzw_decompress(data_block source, data_block dest);
- int get_next_codeword (long& bits_read, unsigned char *source, int codeword_size);
- void output_root(unsigned char root, unsigned char *destination, long& position);
- void get_string(int codeword, MyDict& dictionary, std::stack<unsigned char>& root_stack);
-};

audacious-plugins-3.6.2-gtk3.tar.bz2/src/adplug/core/xad.cc Deleted

@@ -1,155 +0,0 @@
-/*
- Adplug - Replayer for many OPL2/OPL3 audio file formats.
- Copyright (C) 1999 - 2003 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
-
- xad.cpp - XAD shell player by Riven the Mage <riven@ok.ru>
-*/
-
-#include "xad.h"
-#include "debug.h"
-
-/* -------- Public Methods -------------------------------- */
-
-CxadPlayer::CxadPlayer (Copl * newopl):CPlayer (newopl)
-{
- tune = 0;
-}
-
-CxadPlayer::~CxadPlayer ()
-{
- if (tune)
- {
- deletetune;
- tune = 0;
- }
-}
-
-bool
-CxadPlayer::load (VFSFile & fd, const CFileProvider & fp)
-{
- binistream *f = fp.open (fd);
- if (!f)
- return false;
- bool ret = false;
-
- // load header
- xad.id = f->readInt (4);
- f->readString (xad.title, 36);
- f->readString (xad.author, 36);
- xad.fmt = f->readInt (2);
- xad.speed = f->readInt (1);
- xad.reserved_a = f->readInt (1);
-
- // 'XAD!' - signed ?
- if (xad.id != 0x21444158)
- {
- fp.close (f);
- return false;
- }
-
- // get file size
- tune_size = fp.filesize (f) - 80;
-
- // load()
- tune = new unsigned chartune_size;
- f->readString ((char *) tune, tune_size);
- fp.close (f);
-
- ret = xadplayer_load ();
-
- if (ret)
- rewind (0);
-
- return ret;
-}
-
-void
-CxadPlayer::rewind (int subsong)
-{
- opl->init ();
-
- plr.speed = xad.speed;
- plr.speed_counter = 1;
- plr.playing = 1;
- plr.looping = 0;
-
- // rewind()
- xadplayer_rewind (subsong);
-
-#ifdef DEBUG
- AdPlug_LogWrite ("-----------\n");
-#endif
-}
-
-bool
-CxadPlayer::update ()
-{
- if (--plr.speed_counter)
- goto update_end;
-
- plr.speed_counter = plr.speed;
-
- // update()
- xadplayer_update ();
-
-update_end:
- return (plr.playing && (!plr.looping));
-}
-
-float
-CxadPlayer::getrefresh ()
-{
- return xadplayer_getrefresh ();
-}
-
-std::string CxadPlayer::gettype ()
-{
- return xadplayer_gettype ();
-}
-
-std::string CxadPlayer::gettitle ()
-{
- return xadplayer_gettitle ();
-}
-
-std::string CxadPlayer::getauthor ()
-{
- return xadplayer_getauthor ();
-}
-
-std::string CxadPlayer::getinstrument (unsigned int i)
-{
- return xadplayer_getinstrument (i);
-}
-
-unsigned int
-CxadPlayer::getinstruments ()
-{
- return xadplayer_getinstruments ();
-}
-
-/* -------- Protected Methods ------------------------------- */
-
-void
-CxadPlayer::opl_write (int reg, int val)
-{
- adlibreg = val;
-#ifdef DEBUG
- AdPlug_LogWrite (" %02X = %02X\n", reg, val);
-#endif
- opl->write (reg, val);
-}

audacious-plugins-3.6.2-gtk3.tar.bz2/src/adplug/core/xad.h Deleted

@@ -1,97 +0,0 @@
-/*
- AdPlug - Replayer for many OPL2/OPL3 audio file formats.
- Copyright (C) 1999 - 2003 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
-
- xad.h - XAD shell player by Riven the Mage <riven@ok.ru>
-*/
-
-#ifndef H_ADPLUG_XAD
-#define H_ADPLUG_XAD
-
-#include "player.h"
-
-class CxadPlayer: public CPlayer
-{
-public:
- static CPlayer *factory(Copl *newopl);
-
- CxadPlayer(Copl * newopl);
- ~CxadPlayer();
-
- bool	load(VFSFile &fd, const CFileProvider &fp);
- bool	update();
- void	rewind(int subsong);
- float	getrefresh();
-
- std::string gettype();
- std::string gettitle();
- std::string getauthor();
- std::string getinstrument(unsigned int i);
- unsigned int getinstruments();
-
-protected:
-	virtual void xadplayer_rewind(int subsong) = 0;
-	virtual bool xadplayer_load() = 0;
-	virtual void xadplayer_update() = 0;
-	virtual float xadplayer_getrefresh() = 0;
-	virtual std::string xadplayer_gettype() = 0;
-	virtual std::string xadplayer_gettitle()
-	 {
-	 return std::string(xad.title);
-	 }
-	virtual std::string xadplayer_getauthor()
-	 {
-	 return std::string(xad.author);
-	 }
-	virtual std::string xadplayer_getinstrument(unsigned int i)
-	 {
-	 return std::string("");
-	 }
-	virtual unsigned int xadplayer_getinstruments()
-	 {
-	 return 0;
-	 }
-
-	enum { HYP=1, PSI, FLASH, BMF, RAT, HYBRID };
-
- struct xad_header
- {
-	 unsigned long id;
- char title36;
- char author36;
- unsigned short fmt;
- unsigned char speed;
- unsigned char reserved_a;
- } xad;
-
- unsigned char * tune;
- unsigned long tune_size;
-
- struct
- {
- int playing;
- int looping;
- unsigned char speed;
- unsigned char speed_counter;
- } plr;
-
- unsigned char adlib256;
-
- void opl_write(int reg, int val);
-};
-
-#endif

audacious-plugins-3.6.2-gtk3.tar.bz2/src/adplug/core/xsm.cc Deleted

@@ -1,136 +0,0 @@
-/*
- * Adplug - Replayer for many OPL2/OPL3 audio file formats.
- * Copyright (C) 1999 - 2003 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
- *
- * xsm.cpp - eXtra Simple Music Player, by Simon Peter <dn.tlp@gmx.net>
- */
-
-#include <string.h>
-
-#include "xsm.h"
-
-CxsmPlayer::CxsmPlayer (Copl * newopl):CPlayer (newopl), music (0)
-{
-}
-
-CxsmPlayer::~CxsmPlayer ()
-{
- if (music)
- {
- deletemusic;
- music = 0;
- }
-}
-
-bool
-CxsmPlayer::load (VFSFile & fd, const CFileProvider & fp)
-{
- binistream *f = fp.open (fd);
- if (!f)
- return false;
- char id6;
- int i, j;
-
- // check if header matches
- f->readString (id, 6);
- songlen = f->readInt (2);
- if (strncmp (id, "ofTAZ!", 6) || songlen > 3200)
- {
- fp.close (f);
- return false;
- }
-
- // read and set instruments
- for (i = 0; i < 9; i++)
- {
- opl->write (0x20 + op_tablei, f->readInt (1));
- opl->write (0x23 + op_tablei, f->readInt (1));
- opl->write (0x40 + op_tablei, f->readInt (1));
- opl->write (0x43 + op_tablei, f->readInt (1));
- opl->write (0x60 + op_tablei, f->readInt (1));
- opl->write (0x63 + op_tablei, f->readInt (1));
- opl->write (0x80 + op_tablei, f->readInt (1));
- opl->write (0x83 + op_tablei, f->readInt (1));
- opl->write (0xe0 + op_tablei, f->readInt (1));
- opl->write (0xe3 + op_tablei, f->readInt (1));
- opl->write (0xc0 + op_tablei, f->readInt (1));
- f->ignore (5);
- }
-
- // read song data
- music = new charsonglen * 9;
- for (i = 0; i < 9; i++)
- for (j = 0; j < songlen; j++)
- musicj * 9 + i = f->readInt (1);
-
- // success
- fp.close (f);
- rewind (0);
- return true;
-}
-
-bool
-CxsmPlayer::update ()
-{
- int c;
-
- if (notenum >= songlen)
- {
- songend = true;
- notenum = last = 0;
- }
-
- for (c = 0; c < 9; c++)
- if (musicnotenum * 9 + c != musiclast * 9 + c)
- opl->write (0xb0 + c, 0);
-
- for (c = 0; c < 9; c++)
- {
- if (musicnotenum * 9 + c)
- play_note (c, musicnotenum * 9 + c % 12, musicnotenum * 9 + c / 12);
- else
- play_note (c, 0, 0);
- }
-
- last = notenum;
- notenum++;
- return !songend;
-}
-
-void
-CxsmPlayer::rewind (int subsong)
-{
- notenum = last = 0;
- songend = false;
-}
-
-float
-CxsmPlayer::getrefresh ()
-{
- return 5.0f;
-}
-
-void
-CxsmPlayer::play_note (int c, int note, int octv)
-{
- int freq = note_tablenote;
-
- if (!note && !octv)
- freq = 0;
- opl->write (0xa0 + c, freq & 0xff);
- opl->write (0xb0 + c, (freq / 0xff) | 32 | (octv * 4));
-}

audacious-plugins-3.6.2-gtk3.tar.bz2/src/adplug/core/xsm.h Deleted

@@ -1,46 +0,0 @@
-/*
- * Adplug - Replayer for many OPL2/OPL3 audio file formats.
- * Copyright (C) 1999 - 2003 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
- *
- * xsm.h - eXtra Simple Music Player, by Simon Peter <dn.tlp@gmx.net>
- */
-
-#include "player.h"
-
-class CxsmPlayer: public CPlayer
-{
-public:
- static CPlayer *factory(Copl *newopl) { return new CxsmPlayer(newopl); }
-
- CxsmPlayer(Copl *newopl);
- ~CxsmPlayer();
-
- bool load(VFSFile &fd, const CFileProvider &fp);
- bool update();
- void rewind(int subsong);
- float getrefresh();
-
- std::string gettype() { return std::string("eXtra Simple Music"); }
-
-private:
- unsigned short	songlen;
- char			*music;
- unsigned int		last, notenum;
- bool			songend;
-
- void play_note(int c, int note, int octv);
-};

audacious-plugins-3.6.2-gtk3.tar.bz2/src/alarm Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/alarm/Makefile Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/alarm/alarm.cc Deleted

@@ -1,822 +0,0 @@
-/*
- * Copyright (C) Adam Feakin <adamf@snika.uklinux.net>
- *
- * modified by Daniel Stodden <stodden@in.tum.de>
- *
- * 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 <stdlib.h>
-#include <time.h>
-#include <string.h>
-
-#include <gdk/gdk.h>
-#include <gtk/gtk.h>
-#include <pthread.h>
-#include <assert.h>
-#include <math.h>
-
-#include <libaudcore/drct.h>
-#include <libaudcore/i18n.h>
-#include <libaudcore/interface.h>
-#include <libaudcore/plugin.h>
-#include <libaudcore/plugins.h>
-#include <libaudcore/preferences.h>
-#include <libaudcore/runtime.h>
-
-#include <libaudgui/libaudgui.h>
-#include <libaudgui/libaudgui-gtk.h>
-
-#include "alarm.h"
-#include "interface.h"
-#include "callbacks.h"
-
-class AlarmPlugin : public GeneralPlugin
-{
-public:
- static const char about;
- static const char * const defaults;
- static const PreferencesWidget widgets;
- static const PluginPreferences prefs;
-
- static constexpr PluginInfo info = {
- N_("Alarm"),
- PACKAGE,
- about,
- & prefs
- };
-
- constexpr AlarmPlugin () : GeneralPlugin (info, false) {}
-
- bool init ();
- void cleanup ();
-};
-
-EXPORT AlarmPlugin aud_plugin_instance;
-
-const char * const AlarmPlugin::defaults = {
- /* general */
- "alarm_h", "6",
- "alarm_m", "30",
- "cmd_on", "FALSE",
- "fading", "60",
- "quietvol", "25",
- "reminder_on", "FALSE",
- "stop_h", "1",
- "stop_m", "0",
- "stop_on", "TRUE",
- "volume", "80",
-
- /* days */
- "sun_flags", "3",
- "sun_h", "6",
- "sun_m", "30",
- "mon_flags", "2",
- "mon_h", "6",
- "mon_m", "30",
- "tue_flags", "2",
- "tue_h", "6",
- "tue_m", "30",
- "wed_flags", "2",
- "wed_h", "6",
- "wed_m", "30",
- "thu_flags", "2",
- "thu_h", "6",
- "thu_m", "30",
- "fri_flags", "2",
- "fri_h", "6",
- "fri_m", "30",
- "sat_flags", "2",
- "sat_h", "6",
- "sat_m", "30",
- nullptr};
-
-typedef struct
-{
- pthread_t tid;
- volatile gboolean is_valid;
-} alarm_thread_t;
-
-static int timeout_source;
-static time_t play_start;
-
-static alarm_thread_t stop; /* thread id of stop loop */
-static pthread_mutex_t fader_lock = PTHREAD_MUTEX_INITIALIZER;
-
-/* string tokens to allow loops and shorten code */
-static char day_cb77 = {"sun_cb", "mon_cb", "tue_cb",
- "wed_cb", "thu_cb", "fri_cb", "sat_cb"};
-
-static char day_flags710 = {"sun_flags", "mon_flags", "tue_flags",
- "wed_flags", "thu_flags", "fri_flags", "sat_flags"};
-
-static char day_h76 = {"sun_h", "mon_h", "tue_h",
- "wed_h", "thu_h", "fri_h", "sat_h"};
-
-static char day_m76 = {"sun_m", "mon_m", "tue_m",
- "wed_m", "thu_m", "fri_m", "sat_m"};
-
-static char day_def78 = {"sun_def", "mon_def", "tue_def",
- "wed_def", "thu_def", "fri_def", "sat_def"};
-
-static struct
-{
- GtkSpinButton *alarm_h;
- GtkSpinButton *alarm_m;
-
- GtkToggleButton *stop_on;
- GtkSpinButton *stop_h;
- GtkSpinButton *stop_m;
-
- GtkRange *volume;
- GtkRange *quietvol;
-
- GtkSpinButton *fading;
-
- GtkEntry *cmdstr;
- GtkToggleButton *cmd_on;
-
- GtkEntry *playlist;
-
- int default_hour;
- int default_min;
-
- // array allows looping of days
- alarmday day7;
-
-
- GtkEntry *reminder;
- GtkToggleButton *reminder_cb;
- gboolean reminder_on;
-}
-alarm_conf;
-
-static int alarm_h, alarm_m;
-
-static gboolean stop_on;
-static int stop_h, stop_m;
-
-static int volume, quietvol;
-
-static int fading;
-
-static gboolean cmd_on;
-
-static GtkWidget *config_notebook = nullptr;
-static GtkWidget *alarm_dialog = nullptr;
-
-static GtkWidget *lookup_widget(GtkWidget *w, const char *name)
-{
- GtkWidget * widget = (GtkWidget *) g_object_get_data ((GObject *) w, name);
- g_return_val_if_fail(widget != nullptr, nullptr);
-
- return widget;
-}
-
-/*
- * the callback function that is called when the save button is
- * pressed saves configuration to ~/.bmp/alarmconfig
- */
-static 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.daydaynum.cb)))
- alarm_conf.daydaynum.flags = 0;
- else
- alarm_conf.daydaynum.flags = ALARM_OFF;
-
- if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(alarm_conf.daydaynum.cb_def)))
- alarm_conf.daydaynum.flags |= ALARM_DEFAULT;
-
- alarm_conf.daydaynum.hour =
- gtk_spin_button_get_value_as_int(alarm_conf.daydaynum.spin_hr);
- alarm_conf.daydaynum.min =
- gtk_spin_button_get_value_as_int(alarm_conf.daydaynum.spin_min);
-
- aud_set_int ("alarm", day_flagsdaynum, alarm_conf.daydaynum.flags);
- aud_set_int ("alarm", day_hdaynum, alarm_conf.daydaynum.hour);
- aud_set_int ("alarm", day_mdaynum, alarm_conf.daydaynum.min);
- }
-
- /* END: days of week */
-
- volume = gtk_range_get_value (alarm_conf.volume);
- aud_set_int ("alarm", "volume", volume);
-
- quietvol = gtk_range_get_value (alarm_conf.quietvol);
- aud_set_int ("alarm", "quietvol", quietvol);
-
- fading = gtk_spin_button_get_value_as_int (alarm_conf.fading);
-
- /* 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);
-
- char * cmdstr = gtk_editable_get_chars ((GtkEditable *) alarm_conf.cmdstr, 0, -1);
- aud_set_str ("alarm", "cmdstr", cmdstr);
- g_free (cmdstr);
-
- cmd_on = gtk_toggle_button_get_active (alarm_conf.cmd_on);
- aud_set_bool ("alarm", "cmd_on", cmd_on);
-
- char * playlist = gtk_editable_get_chars ((GtkEditable *) alarm_conf.playlist, 0, -1);
- aud_set_str ("alarm", "playlist", playlist);
- g_free (playlist);
-
- /* reminder */
- char * reminder_msg = gtk_editable_get_chars ((GtkEditable *) alarm_conf.reminder, 0, -1);
- aud_set_str ("alarm", "reminder_msg", reminder_msg);
- g_free (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);
-}
-
-/*
- * read the current configuration from the file
- */
-static void alarm_read_config(void)
-{
- int daynum = 0; // used for day number
-
- 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;
-
- 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");
-
- fading = aud_get_int ("alarm", "fading");
-
- cmd_on = aud_get_bool ("alarm", "cmd_on");
-
- alarm_conf.reminder_on = aud_get_bool ("alarm", "reminder_on");
-
- /* day flags and times */
- for(; daynum < 7; daynum++)
- {
- /* read the flags */
- alarm_conf.daydaynum.flags = aud_get_int ("alarm", day_flagsdaynum);
-
- /* read the times */
- alarm_conf.daydaynum.hour = aud_get_int ("alarm", day_hdaynum);
- alarm_conf.daydaynum.min = aud_get_int ("alarm", day_mdaynum);
- }
-}
-
-/*
- * displays the configuration window and opens the config file.
- */
-static void *alarm_make_config_widget(void)
-{
- int daynum = 0; // used to loop days
- GtkWidget *w;
-
- alarm_read_config();
-
- /*
- * Create the widgets
- */
- config_notebook = create_config_notebook();
-
- w = lookup_widget(config_notebook, "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_notebook, "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_notebook, "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_notebook, "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_notebook, "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_notebook, "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_notebook, "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_notebook, day_cbdaynum);
- alarm_conf.daydaynum.cb = GTK_CHECK_BUTTON(w);
- gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(alarm_conf.daydaynum.cb),
- !(alarm_conf.daydaynum.flags & ALARM_OFF));
-
- w = lookup_widget(config_notebook, day_defdaynum);
- alarm_conf.daydaynum.cb_def = GTK_CHECK_BUTTON(w);
- gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(alarm_conf.daydaynum.cb_def),
- alarm_conf.daydaynum.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_hdaynum);
- alarm_conf.daydaynum.spin_hr = GTK_SPIN_BUTTON(w);
- gtk_spin_button_set_value(alarm_conf.daydaynum.spin_hr, alarm_conf.daydaynum.hour);
-
- w = lookup_widget(config_dialog, day_mdaynum);
- alarm_conf.daydaynum.spin_min = GTK_SPIN_BUTTON(w);
- gtk_spin_button_set_value(alarm_conf.daydaynum.spin_min, alarm_conf.daydaynum.min);
-*/
- if(alarm_conf.daydaynum.flags & ALARM_DEFAULT)
- {
- w = lookup_widget(config_notebook, day_hdaynum);
- alarm_conf.daydaynum.spin_hr = GTK_SPIN_BUTTON(w);
- gtk_spin_button_set_value(alarm_conf.daydaynum.spin_hr, alarm_conf.default_hour);
-
- w = lookup_widget(config_notebook, day_mdaynum);
- alarm_conf.daydaynum.spin_min = GTK_SPIN_BUTTON(w);
- gtk_spin_button_set_value(alarm_conf.daydaynum.spin_min, alarm_conf.default_min);
-
- gtk_widget_set_sensitive((GtkWidget *)alarm_conf.daydaynum.spin_hr, FALSE);
- gtk_widget_set_sensitive((GtkWidget *)alarm_conf.daydaynum.spin_min, FALSE);
- }
- else
- {
- w = lookup_widget(config_notebook, day_hdaynum);
- alarm_conf.daydaynum.spin_hr = GTK_SPIN_BUTTON(w);
- gtk_spin_button_set_value(alarm_conf.daydaynum.spin_hr, alarm_conf.daydaynum.hour);
-
- w = lookup_widget(config_notebook, day_mdaynum);
- alarm_conf.daydaynum.spin_min = GTK_SPIN_BUTTON(w);
- gtk_spin_button_set_value(alarm_conf.daydaynum.spin_min, alarm_conf.daydaynum.min);
-
- gtk_widget_set_sensitive((GtkWidget *)alarm_conf.daydaynum.spin_hr, TRUE);
- gtk_widget_set_sensitive((GtkWidget *)alarm_conf.daydaynum.spin_min, TRUE);
- }
- }
-
- /* END: days of week */
-
- w = lookup_widget(config_notebook,"fading_spin");
- alarm_conf.fading = GTK_SPIN_BUTTON(w);
- gtk_spin_button_set_value(alarm_conf.fading, fading);
-
- String cmdstr = aud_get_str ("alarm", "cmdstr");
- w = lookup_widget(config_notebook, "cmd_entry");
- alarm_conf.cmdstr = GTK_ENTRY(w);
- gtk_entry_set_text(alarm_conf.cmdstr, cmdstr);
-
- w = lookup_widget(config_notebook, "cmd_checkb");
- alarm_conf.cmd_on = GTK_TOGGLE_BUTTON(w);
- gtk_toggle_button_set_active(alarm_conf.cmd_on, cmd_on);
-
- String playlist = aud_get_str ("alarm", "playlist");
- w = lookup_widget(config_notebook, "playlist");
- alarm_conf.playlist = GTK_ENTRY(w);
- gtk_entry_set_text(alarm_conf.playlist, playlist);
-
- String reminder_msg = aud_get_str ("alarm", "reminder_msg");
- w = lookup_widget(config_notebook, "reminder_text");
- alarm_conf.reminder = GTK_ENTRY(w);
- gtk_entry_set_text(alarm_conf.reminder, reminder_msg);
-
- w = lookup_widget(config_notebook, "reminder_cb");
- alarm_conf.reminder_cb = GTK_TOGGLE_BUTTON(w);
- gtk_toggle_button_set_active(alarm_conf.reminder_cb, alarm_conf.reminder_on);
-
- AUDDBG("END alarm_configure\n");
-
- return config_notebook;
-}
-
-/* functions for greying out the time for days */
-static void on_day_def_toggled(GtkToggleButton *togglebutton, void * user_data, int daynum)
-{
- GtkWidget *w;
-
- /* change the time shown too */
- w = lookup_widget(config_notebook, day_hdaynum);
- if(w == nullptr)
- 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.daydaynum.hour);
- gtk_widget_set_sensitive(w, TRUE);
- }
-
- w = lookup_widget(config_notebook, day_mdaynum);
- 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.daydaynum.min);
- gtk_widget_set_sensitive(w, TRUE);
- }
-}
-
-void on_sun_def_toggled(GtkToggleButton *togglebutton, void * user_data)
-{
- on_day_def_toggled(togglebutton, user_data, 0);
-}
-
-void on_mon_def_toggled(GtkToggleButton *togglebutton, void * user_data)
-{
- on_day_def_toggled(togglebutton, user_data, 1);
-}
-
-void on_tue_def_toggled(GtkToggleButton *togglebutton, void * user_data)
-{
- on_day_def_toggled(togglebutton, user_data, 2);
-}
-
-void on_wed_def_toggled(GtkToggleButton *togglebutton, void * user_data)
-{
- on_day_def_toggled(togglebutton, user_data, 3);
-}
-
-void on_thu_def_toggled(GtkToggleButton *togglebutton, void * user_data)
-{
- on_day_def_toggled(togglebutton, user_data, 4);
-}
-
-void on_fri_def_toggled(GtkToggleButton *togglebutton, void * user_data)
-{
- on_day_def_toggled(togglebutton, user_data, 5);
-}
-
-void on_sat_def_toggled(GtkToggleButton *togglebutton, void * user_data)
-{
- on_day_def_toggled(togglebutton, user_data, 6);
-}
-
-/* END: greying things */
-
-void alarm_current_volume(GtkButton *button, void * data)
-{
- GtkAdjustment *adj;
-
- AUDDBG("on_current_button_clicked\n");
-
- adj = gtk_range_get_adjustment(alarm_conf.volume);
- gtk_adjustment_set_value(adj, aud_drct_get_volume_main());
-}
-
-/*
- * a thread safe sleeping function -
- * and it even works in solaris (I think)
- */
-static void threadsleep(float x)
-{
- AUDDBG("threadsleep: waiting %f seconds\n", x);
-
- g_usleep((int) ((float) x * (float) 1000000.0));
-
- 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;
-
- pthread_attr_init(&attr);
-
- 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);
-
- thrd.is_valid = (pthread_create(&thrd.tid, &attr, start_routine, args) == 0);
-
- return thrd;
-}
-
-static void *alarm_fade(void *arg)
-{
- fader *vols = (fader *)arg;
- int 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((int)vols->start);
-
- for (int i = 0; i < adiff; i ++)
- {
- threadsleep((float)fading / (float)adiff);
- aud_drct_set_volume_main(aud_drct_get_volume_main() + 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((int)vols->end);
-
- /* and */
- pthread_mutex_unlock(&fader_lock);
-
- AUDDBG("volume = %f%%\n", (double)vols->end);
- return 0;
-}
-
-static void *alarm_stop_thread(void *args)
-{
- int currvol;
- fader fade_vols;
- alarm_thread_t f;
-
- 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);
-
- AUDDBG("alarm_stop triggered\n");
-
- if (alarm_dialog)
- gtk_widget_destroy(alarm_dialog);
-
- currvol = aud_drct_get_volume_main(),
-
- /* 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);
-
- pthread_join(f.tid, nullptr);
- 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);
-
- AUDDBG("alarm_stop done\n");
- return(nullptr);
-}
-
-void alarm_stop_cancel(GtkWidget *w, void * data)
-{
- 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;
- unsigned today;
-
- AUDDBG("Getting time\n");
- timenow = time(nullptr);
- 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.daytoday.flags & ALARM_OFF)
- return TRUE;
- else
- {
- /* set the alarm_h and alarm_m for today, if not default */
- if(!(alarm_conf.daytoday.flags & ALARM_DEFAULT))
- {
- alarm_h = alarm_conf.daytoday.hour;
- alarm_m = alarm_conf.daytoday.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)
- {
- String cmdstr = aud_get_str ("alarm", "cmdstr");
- AUDDBG("Executing %s, cmd_on is true\n", (const char *) cmdstr);
- if(system(cmdstr) == -1)
- AUDDBG("Executing %s failed\n", (const char *) cmdstr);
- }
-
- gboolean started = FALSE;
-
- String playlist = aud_get_str ("alarm", "playlist");
- if (playlist0)
- {
- 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(nullptr);
-
- 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(nullptr);
- aud_drct_play();
- }
-
- if(alarm_conf.reminder_on == TRUE)
- {
- String reminder_msg = aud_get_str ("alarm", "reminder_msg");
- GtkWidget *reminder_dialog;
- AUDDBG("Showing reminder '%s'\n", (const char *) reminder_msg);
-
- reminder_dialog = (GtkWidget*) create_reminder_dialog(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, nullptr, 0);
- AUDDBG("Created wakeup dialog and started stop thread\n");
- }
-
- return TRUE;
-}
-
-static void alarm_configure ()
-{
- audgui_show_plugin_prefs (aud_plugin_by_header (& aud_plugin_instance));
-}
-
-/*
- * initialization
- * opens the config file and reads the value, creates a new
- * config in memory if the file doesnt exist and sets default vals
- */
-bool AlarmPlugin::init ()
-{
- AUDDBG("alarm_init\n");
-
- aud_config_set_defaults ("alarm", defaults);
-
- alarm_read_config();
-
- timeout_source = g_timeout_add_seconds (10, alarm_timeout, nullptr);
-
- aud_plugin_menu_add (AudMenuID::Main, alarm_configure, _("Set Alarm ..."), "appointment-new");
-
- return true;
-}
-
-/*
- * kill the main thread
- */
-void AlarmPlugin::cleanup ()
-{
- AUDDBG("alarm_cleanup\n");
-
- aud_plugin_menu_remove (AudMenuID::Main, alarm_configure);
-
- if (timeout_source)
- {
- g_source_remove (timeout_source);
- timeout_source = 0;
- }
-
- if (stop.is_valid)
- {
- pthread_cancel(stop.tid);
- stop.is_valid = FALSE;
- }
-}
-
-const char AlarmPlugin::about =
- N_("A plugin that can be used to start playing at a certain time.\n\n"
- "Originally written by Adam Feakin and Daniel Stodden.");
-
-const PreferencesWidget AlarmPlugin::widgets = {
- WidgetCustomGTK (alarm_make_config_widget)
-};
-
-const PluginPreferences AlarmPlugin::prefs = {
- {widgets},
- nullptr, // init
- alarm_save,
- nullptr // cleanup
-};

audacious-plugins-3.6.2-gtk3.tar.bz2/src/alarm/alarm.h Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/alarm/callbacks.h Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/alarm/interface.cc Deleted

@@ -1,442 +0,0 @@
-/*
- * 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 <gtk/gtk.h>
-#include <libaudcore/i18n.h>
-#include <libaudgui/libaudgui.h>
-
-#include "callbacks.h"
-
-#if GTK_CHECK_VERSION (3, 12, 0)
- #define gtk_widget_set_margin_right(w, m) gtk_widget_set_margin_end(w, m)
-#endif
-
-const char *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."),
-
- nullptr
-};
-
-GtkWidget *create_alarm_dialog (void)
-{
- GtkWidget *alarm_dialog;
-
- alarm_dialog = gtk_message_dialog_new (nullptr, 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), nullptr);
- g_signal_connect_swapped (alarm_dialog, "response",
- G_CALLBACK (gtk_widget_destroy), alarm_dialog);
-
- gtk_widget_show_all (alarm_dialog);
-
- return alarm_dialog;
-}
-
-GtkWidget *create_reminder_dialog (const char *reminder_msg)
-{
- GtkWidget *reminder_dialog;
-
- reminder_dialog = gtk_message_dialog_new (nullptr, 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, void * entry)
-{
- char *uri = gtk_file_chooser_get_uri (GTK_FILE_CHOOSER (button));
- gtk_entry_set_text (GTK_ENTRY (entry), uri);
- g_free (uri);
-}
-
-GtkWidget *create_config_notebook (void)
-{
- /* General */
- GtkWidget *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 */
- int i, j;
- GtkWidget *checkbutton;
- GtkWidget *widget21;
-
- const char *weekdays = { _("Monday"), _("Tuesday"), _("Wednesday"),
- _("Thursday"), _("Friday"), _("Saturday"), _("Sunday") };
-
- const char *day_cb = { "mon_cb", "tue_cb", "wed_cb", "thu_cb",
- "fri_cb", "sat_cb", "sun_cb" };
-
- const char *day_def = { "mon_def", "tue_def", "wed_def", "thu_def",
- "fri_def", "sat_def", "sun_def", };
-
- const char *day_h = { "mon_h", "tue_h", "wed_h", "thu_h",
- "fri_h", "sat_h", "sun_h" };
-
- const char *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;
- char *help_text;
-
-
- /* General */
- notebook = gtk_notebook_new ();
-
-
- /* 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 (notebook), "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 (notebook), "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 (notebook), "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 (notebook), "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 (notebook), "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 ++)
- {
- widgeti = gtk_check_button_new_with_label (weekdaysi);
- g_object_set_data (G_OBJECT (notebook), day_cbi, widgeti);
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widgeti), TRUE);
- gtk_widget_set_valign (widgeti, GTK_ALIGN_CENTER);
- gtk_grid_attach (GTK_GRID (grid), widgeti, 0, i + 1, 1, 1);
- }
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget6), FALSE);
-
- for (i = 0; i < 7; i ++)
- {
- checkbutton = gtk_check_button_new_with_label (_("Default"));
- g_object_set_data (G_OBJECT (notebook), day_defi, 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_defi), nullptr);
- 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);
- widgeti = gtk_spin_button_new (adjustment, 1, 0);
- g_object_set_data (G_OBJECT (notebook), day_hj, widgeti);
- gtk_grid_attach (GTK_GRID (grid), widgeti, 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);
- widgeti = gtk_spin_button_new (adjustment, 1, 0);
- g_object_set_data (G_OBJECT (notebook), day_mj, widgeti);
- gtk_grid_attach (GTK_GRID (grid), widgeti, 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 (notebook), "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 (notebook), "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 (notebook), "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), nullptr);
- 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 (notebook), "cmd_entry", cmd_entry);
- cmd_checkb = gtk_check_button_new_with_label (_("enable"));
- g_object_set_data (G_OBJECT (notebook), "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 (notebook), "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_text = gtk_entry_new ();
- reminder_checkb = gtk_check_button_new_with_label (_("enable"));
- g_object_set_data (G_OBJECT (notebook), "reminder_text", reminder_text);
- g_object_set_data (G_OBJECT (notebook), "reminder_cb", reminder_checkb);
- gtk_box_pack_start (GTK_BOX (hbox), reminder_text, TRUE, TRUE, 0);
- gtk_container_add (GTK_CONTAINER (hbox), reminder_checkb);
- 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 (_(help0), _(help1), _(help2), nullptr);
- gtk_text_buffer_set_text (text_buffer, help_text, -1);
- g_free (help_text);
- scrolled_window = gtk_scrolled_window_new (nullptr, nullptr);
- gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window),
- GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
- gtk_container_set_border_width (GTK_CONTAINER (scrolled_window), 6);
- 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);
-
- return notebook;
-}

audacious-plugins-3.6.2-gtk3.tar.bz2/src/alarm/interface.h Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/amidi-plug Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/amidi-plug/Makefile Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/amidi-plug/amidi-plug.cc Deleted

@@ -1,450 +0,0 @@
-/*
-*
-* Author: Giacomo Lozito <james@develia.org>, (C) 2005-2007
-*
-* 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 <stdlib.h>
-#include <string.h>
-
-#include <libaudcore/runtime.h>
-#include <libaudcore/i18n.h>
-#include <libaudcore/plugin.h>
-
-#include "i_backend.h"
-#include "i_configure.h"
-#include "i_fileinfo.h"
-#include "i_midi.h"
-
-class AMIDIPlug : public InputPlugin
-{
-public:
- static const char about;
- static const char * const exts;
-
- static constexpr PluginInfo info = {
- N_("AMIDI-Plug (MIDI Player)"),
- PACKAGE,
- about,
- & amidiplug_prefs
- };
-
- static constexpr auto iinfo = InputInfo ()
- .with_exts (exts);
-
- constexpr AMIDIPlug () : InputPlugin (info, iinfo) {}
-
- bool init ();
- void cleanup ();
-
- bool is_our_file (const char * filename, VFSFile & file);
- Tuple read_tuple (const char * filename, VFSFile & file);
- bool play (const char * filename, VFSFile & file);
-
- bool file_info_box (const char * filename, VFSFile & file)
- { i_fileinfo_gui (filename, file); return true; }
-
-protected:
- bool m_backend_initialized = false;
-
- static bool audio_init ();
- static void audio_generate (double seconds);
- static void audio_cleanup ();
-
- static void generate_ticks (midifile_t & midifile, int num_ticks);
- static void play_loop (midifile_t & midifile);
- static int skip_to (midifile_t & midifile, int seektime);
-};
-
-EXPORT AMIDIPlug aud_plugin_instance;
-
-const char * const AMIDIPlug::exts = {"mid", "midi", "rmi", "rmid", nullptr};
-
-void AMIDIPlug::cleanup ()
-{
- if (m_backend_initialized)
- {
- backend_cleanup ();
- m_backend_initialized = false;
- }
-}
-
-bool AMIDIPlug::init ()
-{
- static const char * const defaults =
- {
- "ap_opts_transpose_value", "0",
- "ap_opts_drumshift_value", "0",
- "fsyn_synth_samplerate", "44100",
- "fsyn_synth_gain", "-1",
- "fsyn_synth_polyphony", "-1",
- "fsyn_synth_reverb", "-1",
- "fsyn_synth_chorus", "-1",
- "skip_leading", "FALSE",
- "skip_trailing", "FALSE",
- nullptr
- };
-
- aud_config_set_defaults ("amidiplug", defaults);
-
- return true;
-}
-
-bool AMIDIPlug::is_our_file (const char * filename, VFSFile & file)
-{
- char magic_bytes4;
-
- if (file.fread (magic_bytes, 1, 4) != 4)
- return false;
-
- if (!strncmp (magic_bytes, "MThd", 4))
- {
- AUDDBG ("MIDI found, %s is a standard midi file\n", filename);
- return true;
- }
-
- if (!strncmp (magic_bytes, "RIFF", 4))
- {
- /* skip the four bytes after RIFF,
- then read the next four */
- if (file.fseek (4, VFS_SEEK_CUR) != 0)
- return false;
-
- if (file.fread (magic_bytes, 1, 4) != 4)
- return false;
-
- if (!strncmp (magic_bytes, "RMID", 4))
- {
- AUDDBG ("MIDI found, %s is a riff midi file\n", filename);
- return true;
- }
- }
-
- return false;
-}
-
-Tuple AMIDIPlug::read_tuple (const char * filename, VFSFile & file)
-{
- /* song title, get it from the filename */
- Tuple tuple;
- tuple.set_filename (filename);
- tuple.set_str (Tuple::Codec, "MIDI");
-
- midifile_t mf;
-
- if (mf.parse_from_file (filename, file))
- tuple.set_int (Tuple::Length, mf.length / 1000);
-
- return tuple;
-}
-
-
-static int s_samplerate, s_channels;
-static int s_bufsize;
-static int16_t * s_buf;
-
-bool AMIDIPlug::audio_init ()
-{
- int bitdepth;
-
- backend_audio_info (& s_channels, & bitdepth, & s_samplerate);
-
- if (bitdepth != 16)
- return false;
-
- open_audio (FMT_S16_NE, s_samplerate, s_channels);
-
- s_bufsize = 2 * s_channels * (s_samplerate / 4);
- s_buf = new int16_ts_bufsize / 2;
-
- return true;
-}
-
-void AMIDIPlug::audio_generate (double seconds)
-{
- int total = 2 * s_channels * (int) round (seconds * s_samplerate);
-
- while (total)
- {
- int chunk = (total < s_bufsize) ? total : s_bufsize;
-
- backend_generate_audio (s_buf, chunk);
- write_audio (s_buf, chunk);
-
- total -= chunk;
- }
-}
-
-void AMIDIPlug::audio_cleanup ()
-{
- delete s_buf;
-}
-
-bool AMIDIPlug::play (const char * filename, VFSFile & file)
-{
- if (__sync_bool_compare_and_swap (& backend_settings_changed, true, false)
- && m_backend_initialized)
- {
- AUDDBG ("Settings changed, reinitializing backend\n");
- backend_cleanup ();
- m_backend_initialized = false;
- }
-
- if (! m_backend_initialized)
- {
- backend_init ();
- m_backend_initialized = true;
- }
-
- if (! audio_init ())
- return false;
-
- AUDDBG ("PLAY requested, midifile init\n");
- /* midifile init */
- midifile_t midifile;
-
- if (! midifile.parse_from_file (filename, file))
- {
- audio_cleanup ();
- return false;
- }
-
- AUDDBG ("PLAY requested, starting play thread\n");
- play_loop (midifile);
-
- audio_cleanup ();
- return true;
-}
-
-void AMIDIPlug::generate_ticks (midifile_t & midifile, int num_ticks)
-{
- double ticksecs = (double) midifile.current_tempo / midifile.ppq / 1000000;
- audio_generate (ticksecs * num_ticks);
-}
-
-void AMIDIPlug::play_loop (midifile_t & midifile)
-{
- int tick = midifile.start_tick;
- bool stopped = false;
-
- /* initialize current position in each track */
- for (midifile_track_t & track : midifile.tracks)
- track.current_event = track.events.head ();
-
- while (! (stopped = check_stop ()))
- {
- int seektime = check_seek ();
- if (seektime >= 0)
- tick = skip_to (midifile, seektime);
-
- midievent_t * event = nullptr;
- midifile_track_t * event_track = nullptr;
- int min_tick = midifile.max_tick + 1;
-
- /* search next event */
- for (midifile_track_t & track : midifile.tracks)
- {
- 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_track->events.next (event);
-
- if (event->tick > tick)
- {
- generate_ticks (midifile, event->tick - tick);
- tick = event->tick;
- }
-
- switch (event->type)
- {
- case SND_SEQ_EVENT_NOTEON:
- seq_event_noteon (event);
- break;
-
- case SND_SEQ_EVENT_NOTEOFF:
- seq_event_noteoff (event);
- break;
-
- case SND_SEQ_EVENT_KEYPRESS:
- seq_event_keypress (event);
- break;
-
- case SND_SEQ_EVENT_CONTROLLER:
- seq_event_controller (event);
- break;
-
- case SND_SEQ_EVENT_PGMCHANGE:
- seq_event_pgmchange (event);
- break;
-
- case SND_SEQ_EVENT_CHANPRESS:
- seq_event_chanpress (event);
- break;
-
- case SND_SEQ_EVENT_PITCHBEND:
- seq_event_pitchbend (event);
- break;
-
- case SND_SEQ_EVENT_SYSEX:
- seq_event_sysex (event);
- break;
-
- case SND_SEQ_EVENT_TEMPO:
- seq_event_tempo (event);
- AUDDBG ("PLAY thread, processing tempo event with value %i on tick %i\n",
- event->tempo, event->tick);
- midifile.current_tempo = event->tempo;
- break;
-
- case SND_SEQ_EVENT_META_TEXT:
- /* do nothing */
- break;
-
- case SND_SEQ_EVENT_META_LYRIC:
- /* do nothing */
- break;
-
- default:
- AUDDBG ("PLAY thread, encountered invalid event type %i\n", event->type);
- break;
- }
- }
-
- if (! stopped)
- generate_ticks (midifile, midifile.max_tick - tick);
-
- backend_reset ();
-}
-
-
-/* amidigplug_skipto: re-do all events that influence the playing of our
- 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 */
-int AMIDIPlug::skip_to (midifile_t & midifile, int seektime)
-{
- backend_reset ();
-
- int tick = midifile.start_tick;
- if (midifile.avg_microsec_per_tick > 0)
- tick += (int64_t) seektime * 1000 / midifile.avg_microsec_per_tick;
-
- /* initialize current position in each track */
- for (midifile_track_t & track : midifile.tracks)
- track.current_event = track.events.head ();
-
- for (;;)
- {
- midievent_t * event = nullptr;
- midifile_track_t * event_track = nullptr;
- int min_tick = midifile.max_tick + 1;
-
- /* search next event */
- for (midifile_track_t & track : midifile.tracks)
- {
- midievent_t * e2 = track.current_event;
-
- if ((e2) && (e2->tick < min_tick))
- {
- min_tick = e2->tick;
- event = e2;
- event_track = & track;
- }
- }
-
- /* unlikely here... unless very strange MIDI files are played :) */
- if (!event)
- {
- AUDDBG ("SKIPTO request, reached the last event but not the requested tick (!)\n");
- break; /* end of song reached */
- }
-
- /* reached the requested tick, job done */
- if (event->tick >= tick)
- {
- AUDDBG ("SKIPTO request, reached the requested tick, exiting from skipto loop\n");
- break;
- }
-
- /* advance pointer to next event */
- event_track->current_event = event_track->events.next (event);
-
- 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:
- seq_event_controller (event);
- break;
-
- case SND_SEQ_EVENT_PGMCHANGE:
- seq_event_pgmchange (event);
- break;
-
- case SND_SEQ_EVENT_CHANPRESS:
- seq_event_chanpress (event);
- break;
-
- case SND_SEQ_EVENT_PITCHBEND:
- seq_event_pitchbend (event);
- break;
-
- case SND_SEQ_EVENT_SYSEX:
- seq_event_sysex (event);
- break;
-
- case SND_SEQ_EVENT_TEMPO:
- seq_event_tempo (event);
- midifile.current_tempo = event->tempo;
- break;
- }
- }
-
- return tick;
-}
-
-const char AMIDIPlug::about =
- N_("AMIDI-Plug\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");

audacious-plugins-3.6.2-gtk3.tar.bz2/src/amidi-plug/backend-fluidsynth Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/amidi-plug/backend-fluidsynth/b-fluidsynth.cc Deleted

@@ -1,233 +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 <stdlib.h>
-#include <string.h>
-
-#include <fluidsynth.h>
-
-#include <libaudcore/audstrings.h>
-#include <libaudcore/i18n.h>
-#include <libaudcore/index.h>
-#include <libaudcore/runtime.h>
-
-#include "../i_backend.h"
-#include "../i_configure.h"
-#include "../i_midievent.h"
-
-typedef struct
-{
- fluid_settings_t * settings;
- fluid_synth_t * synth;
-
- Index<int> soundfont_ids;
-}
-sequencer_client_t;
-
-/* sequencer instance */
-static sequencer_client_t sc;
-/* options */
-
-static void i_soundfont_load (void);
-
-void backend_init (void)
-{
- sc.settings = new_fluid_settings();
-
- fluid_settings_setnum (sc.settings, "synth.sample-rate",
- aud_get_int ("amidiplug", "fsyn_synth_samplerate"));
-
- int gain = aud_get_int ("amidiplug", "fsyn_synth_gain");
- int polyphony = aud_get_int ("amidiplug", "fsyn_synth_polyphony");
- int reverb = aud_get_int ("amidiplug", "fsyn_synth_reverb");
- int chorus = aud_get_int ("amidiplug", "fsyn_synth_chorus");
-
- if (gain != -1)
- fluid_settings_setnum (sc.settings, "synth.gain", gain / 10.0);
-
- if (polyphony != -1)
- fluid_settings_setint (sc.settings, "synth.polyphony", polyphony);
-
- if (reverb == 1)
- fluid_settings_setstr (sc.settings, "synth.reverb.active", "yes");
- else if (reverb == 0)
- fluid_settings_setstr (sc.settings, "synth.reverb.active", "no");
-
- if (chorus == 1)
- fluid_settings_setstr (sc.settings, "synth.chorus.active", "yes");
- else if (chorus == 0)
- fluid_settings_setstr (sc.settings, "synth.chorus.active", "no");
-
- sc.synth = new_fluid_synth (sc.settings);
-
- /* load soundfonts */
- i_soundfont_load();
-}
-
-
-void backend_cleanup (void)
-{
- /* unload soundfonts */
- for (int id : sc.soundfont_ids)
- fluid_synth_sfunload (sc.synth, id, 0);
-
- sc.soundfont_ids.clear ();
- delete_fluid_synth (sc.synth);
- delete_fluid_settings (sc.settings);
-}
-
-
-void backend_reset (void)
-{
- fluid_synth_system_reset (sc.synth); /* all notes off and channels reset */
-}
-
-
-void seq_event_noteon (midievent_t * event)
-{
- fluid_synth_noteon (sc.synth,
- event->d0,
- event->d1,
- event->d2);
-}
-
-
-void seq_event_noteoff (midievent_t * event)
-{
- fluid_synth_noteoff (sc.synth,
- event->d0,
- event->d1);
-}
-
-
-void seq_event_keypress (midievent_t * event)
-{
- /* KEY PRESSURE events are not handled by FluidSynth sequencer? */
- AUDDBG ("KEYPRESS EVENT with FluidSynth backend (unhandled)\n");
-}
-
-
-void seq_event_controller (midievent_t * event)
-{
- fluid_synth_cc (sc.synth,
- event->d0,
- event->d1,
- event->d2);
-}
-
-
-void seq_event_pgmchange (midievent_t * event)
-{
- fluid_synth_program_change (sc.synth,
- event->d0,
- event->d1);
-}
-
-
-void seq_event_chanpress (midievent_t * event)
-{
- /* CHANNEL PRESSURE events are not handled by FluidSynth sequencer? */
- AUDDBG ("CHANPRESS EVENT with FluidSynth backend (unhandled)\n");
-}
-
-
-void seq_event_pitchbend (midievent_t * event)
-{
- int pb_value = (( (event->d2) & 0x7f) << 7) | ((event->d1) & 0x7f);
- fluid_synth_pitch_bend (sc.synth,
- event->d0,
- pb_value);
-}
-
-
-void seq_event_sysex (midievent_t * event)
-{
- AUDDBG ("SYSEX EVENT with FluidSynth backend (unhandled)\n");
-}
-
-
-void seq_event_tempo (midievent_t * event)
-{
- /* unhandled */
-}
-
-
-void seq_event_other (midievent_t * event)
-{
- /* unhandled */
-}
-
-
-void seq_event_allnoteoff (int unused)
-{
- int c = 0;
-
- for (c = 0 ; c < 16 ; c++)
- {
- fluid_synth_cc (sc.synth, c, 123 /* all notes off */, 0);
- }
-}
-
-
-void backend_generate_audio (void * buf, int bufsize)
-{
- fluid_synth_write_s16 (sc.synth, bufsize / 4, buf, 0, 2, buf, 1, 2);
-}
-
-
-void backend_audio_info (int * channels, int * bitdepth, int * samplerate)
-{
- *channels = 2;
- *bitdepth = 16; /* always 16 bit, we use fluid_synth_write_s16() */
- *samplerate = aud_get_int ("amidiplug", "fsyn_synth_samplerate");
-}
-
-
-/* ******************************************************************
- *** INTERNALS ****************************************************
- ****************************************************************** */
-
-static void i_soundfont_load (void)
-{
- String soundfont_file = aud_get_str ("amidiplug", "fsyn_soundfont_file");
-
- if (soundfont_file0)
- {
- Index<String> sffiles = str_list_to_index (soundfont_file, ";");
-
- for (const char * sffile : sffiles)
- {
- AUDDBG ("loading soundfont %s\n", sffile);
- int sf_id = fluid_synth_sfload (sc.synth, sffile, 0);
-
- if (sf_id == -1)
- AUDWARN ("unable to load SoundFont file %s\n", sffile);
- else
- {
- AUDDBG ("soundfont %s successfully loaded\n", sffile);
- sc.soundfont_ids.append (sf_id);
- }
- }
-
- fluid_synth_system_reset (sc.synth);
- }
- else
- AUDWARN ("FluidSynth backend was selected, but no SoundFont has been specified\n");
-}

audacious-plugins-3.6.2-gtk3.tar.bz2/src/amidi-plug/i_backend.h Deleted

@@ -1,45 +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_BACKEND_H
-#define _I_BACKEND_H 1
-
-struct midievent_t;
-
-void backend_init (void);
-void backend_cleanup (void);
-void backend_reset (void);
-
-void backend_audio_info (int *, int *, int *);
-void backend_generate_audio (void * buf, int bufsize);
-
-void seq_event_noteon (midievent_t *);
-void seq_event_noteoff (midievent_t *);
-void seq_event_allnoteoff (int);
-void seq_event_keypress (midievent_t *);
-void seq_event_controller (midievent_t *);
-void seq_event_pgmchange (midievent_t *);
-void seq_event_chanpress (midievent_t *);
-void seq_event_pitchbend (midievent_t *);
-void seq_event_sysex (midievent_t *);
-void seq_event_tempo (midievent_t *);
-void seq_event_other (midievent_t *);
-
-#endif /* !_I_BACKEND_H */

audacious-plugins-3.6.2-gtk3.tar.bz2/src/amidi-plug/i_configure-fluidsynth.cc Deleted

@@ -1,274 +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_configure-fluidsynth.h"
-
-#include <stdlib.h>
-#include <string.h>
-#include <sys/stat.h>
-
-#include <glib/gstdio.h>
-#include <gtk/gtk.h>
-
-#include <libaudcore/i18n.h>
-#include <libaudcore/runtime.h>
-
-#include "i_configure.h"
-
-enum
-{
- LISTSFONT_FILENAME_COLUMN = 0,
- LISTSFONT_FILESIZE_COLUMN,
- LISTSFONT_N_COLUMNS
-};
-
-static void i_configure_ev_sflist_commit (void * sfont_lv);
-
-void i_configure_ev_sflist_add (void * sfont_lv)
-{
- GtkWidget * parent_window = gtk_widget_get_toplevel ((GtkWidget *) 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,
- _("_Cancel"), GTK_RESPONSE_CANCEL,
- _("_Open"), GTK_RESPONSE_ACCEPT, nullptr);
-
- if (gtk_tree_selection_get_selected (listsel, nullptr, &itersel))
- {
- char * selfilename = nullptr, *selfiledir = nullptr;
- 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)
- {
- GStatBuf 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 (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);
-
- g_free (filename);
- }
-
- gtk_widget_destroy (browse_dialog);
- }
-
- i_configure_ev_sflist_commit (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);
-
- i_configure_ev_sflist_commit (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))
- {
- 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);
- }
- }
-
- i_configure_ev_sflist_commit (sfont_lv);
-}
-
-
-void i_configure_ev_sflist_commit (void * sfont_lv)
-{
- 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
- {
- 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);
- g_free (fname);
- iter_is_valid = gtk_tree_model_iter_next (GTK_TREE_MODEL (store), &iter);
- }
- while (iter_is_valid == TRUE);
- }
-
- if (sflist_string->len > 0)
- g_string_truncate (sflist_string, sflist_string->len - 1);
-
- aud_set_str ("amidiplug", "fsyn_soundfont_file", sflist_string->str);
-
- g_string_free (sflist_string, TRUE);
-
- /* reset backend at beginning of next song to apply changes */
- __sync_bool_compare_and_swap (& backend_settings_changed, false, true);
-}
-
-
-void * create_soundfont_list (void)
-{
- 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;
-
- /* soundfont settings - soundfont files - listview */
- soundfont_file_store = gtk_list_store_new (LISTSFONT_N_COLUMNS, G_TYPE_STRING, G_TYPE_INT);
-
- String soundfont_file = aud_get_str ("amidiplug", "fsyn_soundfont_file");
-
- if (soundfont_file0)
- {
- /* fill soundfont list with fsyn_soundfont_file information */
- char ** sffiles = g_strsplit (soundfont_file, ";", 0);
- GtkTreeIter iter;
- int i = 0;
-
- while (sffilesi != nullptr)
- {
- int filesize = -1;
- GStatBuf finfo;
-
- if (g_stat (sffilesi, &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, sffilesi,
- 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));
- 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 (
- _("File name"), soundfont_file_lv_text_rndr, "text",
- LISTSFONT_FILENAME_COLUMN, nullptr);
- 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, nullptr);
- 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 (nullptr, nullptr);
- 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_icon_name ("list-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_icon_name ("list-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_icon_name ("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_icon_name ("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);
-
- return soundfont_file_hbox;
-}

audacious-plugins-3.6.2-gtk3.tar.bz2/src/amidi-plug/i_configure-fluidsynth.h Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/amidi-plug/i_configure.cc Deleted

@@ -1,156 +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_configure.h"
-
-#include <libaudcore/i18n.h>
-#include <libaudcore/runtime.h>
-#include <libaudcore/preferences.h>
-
-#include "i_configure-fluidsynth.h"
-
-bool backend_settings_changed = false; /* atomic */
-
-static bool override_gain = false;
-static double gain_setting = 0.2;
-static bool override_polyphony = false;
-static int polyphony_setting = 256;
-static bool override_reverb = false;
-static bool reverb_setting = true;
-static bool override_chorus = false;
-static bool chorus_setting = true;
-
-static void get_values (void)
-{
- int gain = aud_get_int ("amidiplug", "fsyn_synth_gain");
- int polyphony = aud_get_int ("amidiplug", "fsyn_synth_polyphony");
- int reverb = aud_get_int ("amidiplug", "fsyn_synth_reverb");
- int chorus = aud_get_int ("amidiplug", "fsyn_synth_chorus");
-
- if (gain != -1)
- {
- override_gain = true;
- gain_setting = gain / 10.0;
- }
-
- if (polyphony != -1)
- {
- override_polyphony = true;
- polyphony_setting = polyphony;
- }
-
- if (reverb != -1)
- {
- override_reverb = true;
- reverb_setting = reverb;
- }
-
- if (chorus != -1)
- {
- override_chorus = true;
- chorus_setting = chorus;
- }
-}
-
-static void set_values (void)
-{
- int gain = override_gain ? (int) (gain_setting * 10 + 0.5) : -1;
- int polyphony = override_polyphony ? polyphony_setting : -1;
- int reverb = override_reverb ? reverb_setting : -1;
- int chorus = override_chorus ? chorus_setting : -1;
-
- aud_set_int ("amidiplug", "fsyn_synth_gain", gain);
- aud_set_int ("amidiplug", "fsyn_synth_polyphony", polyphony);
- aud_set_int ("amidiplug", "fsyn_synth_reverb", reverb);
- aud_set_int ("amidiplug", "fsyn_synth_chorus", chorus);
-}
-
-static void backend_change (void)
-{
- set_values ();
-
- /* reset backend at beginning of next song to apply changes */
- __sync_bool_compare_and_swap (& backend_settings_changed, false, true);
-}
-
-static const PreferencesWidget gain_widgets = {
- WidgetCheck (N_("Override default gain:"),
- WidgetBool (override_gain, backend_change)),
- WidgetSpin (0, WidgetFloat (gain_setting, backend_change),
- {0, 10, 0.1},
- WIDGET_CHILD)
-};
-
-static const PreferencesWidget polyphony_widgets = {
- WidgetCheck (N_("Override default polyphony:"),
- WidgetBool (override_polyphony, backend_change)),
- WidgetSpin (0, WidgetInt (polyphony_setting, backend_change),
- {16, 4096, 1},
- WIDGET_CHILD)
-};
-
-static const PreferencesWidget reverb_widgets = {
- WidgetCheck (N_("Override default reverb:"),
- WidgetBool (override_reverb, backend_change)),
- WidgetCheck (N_("On"),
- WidgetBool (reverb_setting, backend_change),
- WIDGET_CHILD)
-};
-
-static const PreferencesWidget chorus_widgets = {
- WidgetCheck (N_("Override default chorus:"),
- WidgetBool (override_chorus, backend_change)),
- WidgetCheck (N_("On"),
- WidgetBool (chorus_setting, backend_change),
- WIDGET_CHILD)
-};
-
-static const PreferencesWidget amidiplug_widgets = {
-
- /* global settings */
- WidgetLabel (N_("Playback")),
- WidgetSpin (N_("Transpose:"),
- WidgetInt ("amidiplug", "ap_opts_transpose_value"),
- {-20, 20, 1, N_("semitones")}),
- WidgetSpin (N_("Drum shift:"),
- WidgetInt ("amidiplug", "ap_opts_drumshift_value"),
- {0, 127, 1, N_("note numbers")}),
- WidgetCheck (N_("Skip leading silence"),
- WidgetBool ("amidiplug", "skip_leading")),
- WidgetCheck (N_("Skip trailing silence"),
- WidgetBool ("amidiplug", "skip_trailing")),
-
- /* backend settings */
- WidgetLabel (N_("SoundFont")),
- WidgetCustomGTK (create_soundfont_list),
- WidgetLabel (N_("Synthesizer")),
- WidgetBox ({{gain_widgets}, true}),
- WidgetBox ({{polyphony_widgets}, true}),
- WidgetBox ({{reverb_widgets}, true}),
- WidgetBox ({{chorus_widgets}, true}),
- WidgetSpin (N_("Sample rate:"),
- WidgetInt ("amidiplug", "fsyn_synth_samplerate", backend_change),
- {22050, 96000, 1, N_("Hz")})
-};
-
-const PluginPreferences amidiplug_prefs = {
- {amidiplug_widgets},
- get_values
-};

audacious-plugins-3.6.2-gtk3.tar.bz2/src/amidi-plug/i_fileinfo.cc Deleted

@@ -1,342 +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_fileinfo.h"
-
-#include <limits.h>
-#include <stdlib.h>
-#include <string.h>
-#include <gtk/gtk.h>
-
-#include <libaudcore/i18n.h>
-#include <libaudcore/runtime.h>
-
-#include "i_configure.h"
-/* this is needed to retrieve information */
-#include "i_midi.h"
-/* icon from gnome-mime-audio-midi.png of the GNOME ICON SET */
-#include "amidi-plug.midiicon.xpm"
-
-
-void i_fileinfo_ev_close (GtkWidget * button, void * fileinfowin)
-{
- gtk_widget_destroy (GTK_WIDGET (fileinfowin));
-}
-
-
-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_widget_set_halign (field, GTK_ALIGN_START);
- 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_widget_set_halign (value, GTK_ALIGN_START);
- 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)
-{
- /* initialize current position in each track */
- for (midifile_track_t & track : mf->tracks)
- track.current_event = track.events.head ();
-
- for (;;)
- {
- midievent_t * event = nullptr;
- midifile_track_t * event_track = nullptr;
- int min_tick = INT_MAX; /* meta-events may go past max_tick */
-
- /* search next event */
- for (midifile_track_t & track : mf->tracks)
- {
- 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_track->events.next (event);
-
- switch (event->type)
- {
- case SND_SEQ_EVENT_META_TEXT:
- gtk_text_buffer_insert_at_cursor (text_tb, event->metat, -1);
- break;
-
- case SND_SEQ_EVENT_META_LYRIC:
- gtk_text_buffer_insert_at_cursor (lyrics_tb, event->metat, -1);
- break;
- }
- }
-}
-
-
-void i_fileinfo_gui (const char * filename_uri, VFSFile & file)
-{
- static GtkWidget * fileinfowin = nullptr;
- 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;
-
- if (fileinfowin)
- return;
-
- midifile_t mf;
-
- /****************** midifile parser ******************/
- if (! mf.parse_from_file (filename_uri, file))
- return;
-
- /* midifile is filled with information at this point,
- bpm information is needed too */
- mf.get_bpm (& bpm, & wavg_bpm);
- /*****************************************************/
-
- fileinfowin = gtk_window_new (GTK_WINDOW_TOPLEVEL);
- gtk_window_set_default_size (GTK_WINDOW (fileinfowin), 500, 400);
- gtk_window_set_type_hint (GTK_WINDOW (fileinfowin), GDK_WINDOW_TYPE_HINT_DIALOG);
- 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_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);
- 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 (nullptr);
- 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.tracks.len ());
- 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 (nullptr);
- 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 (nullptr, nullptr);
- gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (text_tv_sw),
- GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
- 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 (nullptr);
- 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 (nullptr, nullptr);
- gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (lyrics_tv_sw),
- GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
- 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));
-
- i_fileinfo_text_fill (& mf, text_tb, lyrics_tb);
-
- if (! gtk_text_buffer_get_char_count (text_tb))
- {
- GtkTextIter start, end;
- GtkTextTag * tag = gtk_text_buffer_create_tag (text_tb, "italicstyle",
- "style", PANGO_STYLE_ITALIC, nullptr);
- /*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 (! gtk_text_buffer_get_char_count (lyrics_tb))
- {
- GtkTextIter start, end;
- GtkTextTag * tag = gtk_text_buffer_create_tag (lyrics_tb, "italicstyle",
- "style", PANGO_STYLE_ITALIC, nullptr);
- /*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);
- }
-
- /**************
- *** 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_with_mnemonic (_("_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, nullptr, nullptr);
-
- if (!filename)
- filename = g_strdup (filename_uri);
-
- filename_utf8 = g_strdup (g_filename_to_utf8 (filename, -1, nullptr, nullptr, nullptr));
-
- if (!filename_utf8)
- {
- /* 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)"), nullptr);
- 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);
-}

audacious-plugins-3.6.2-gtk3.tar.bz2/src/amidi-plug/i_fileinfo.h Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/amidi-plug/i_midi.cc Deleted

@@ -1,803 +0,0 @@
-/*
-*
-* Author: Giacomo Lozito <james@develia.org>, (C) 2005-2006
-*
-* MIDI (SMF) parser based on aplaymidi.c from ALSA-utils
-* aplaymidi.c is Copyright (c) 2004 Clemens Ladisch <clemens@ladisch.de>
-*
-* 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_midi.h"
-
-#include <stdlib.h>
-#include <string.h>
-
-#include <libaudcore/audstrings.h>
-#include <libaudcore/runtime.h>
-#include <libaudcore/vfs.h>
-
-#include "i_configure.h"
-
-#define MAKE_ID(c1, c2, c3, c4) ((c1) | ((c2) << 8) | ((c3) << 16) | ((c4) << 24))
-
-#define WARNANDBREAK(...) { AUDERR (__VA_ARGS__); break; }
-
-#define ERRMSG_MIDITRACK() { AUDERR ("%s: invalid MIDI data (offset %#x)", \
- (const char *) file_name, file_offset); return false; }
-
-
-/* skip a certain number of bytes */
-void midifile_t::skip_bytes (int bytes)
-{
- while (bytes > 0)
- {
- read_byte ();
- --bytes;
- }
-}
-
-
-/* reads a single byte */
-int midifile_t::read_byte ()
-{
- if (file_offset >= file_data.len ())
- {
- file_eof = true;
- return -1;
- }
-
- return (unsigned char) file_datafile_offset ++;
-}
-
-
-/* reads a little-endian 32-bit integer */
-int midifile_t::read_32_le ()
-{
- int value;
- value = read_byte ();
- value |= read_byte () << 8;
- value |= read_byte () << 16;
- value |= read_byte () << 24;
- return !file_eof ? value : -1;
-}
-
-
-/* reads a 4-character identifier */
-int midifile_t::read_id ()
-{
- return read_32_le ();
-}
-
-
-/* reads a fixed-size big-endian number */
-int midifile_t::read_int (int bytes)
-{
- int c, value = 0;
-
- do
- {
- c = read_byte ();
-
- if (c < 0) return -1;
-
- value = (value << 8) | c;
- }
- while (--bytes);
-
- return value;
-}
-
-
-/* reads a variable-length number */
-int midifile_t::read_var ()
-{
- int value, c;
-
- c = read_byte ();
- value = c & 0x7f;
-
- if (c & 0x80)
- {
- c = read_byte ();
- value = (value << 7) | (c & 0x7f);
-
- if (c & 0x80)
- {
- c = read_byte ();
- value = (value << 7) | (c & 0x7f);
-
- if (c & 0x80)
- {
- c = read_byte ();
- value = (value << 7) | c;
-
- if (c & 0x80)
- return -1;
- }
- }
- }
-
- return value;
-}
-
-
-/* reads one complete track from the file */
-bool midifile_t::read_track (midifile_track_t & track, int track_end, int port_count)
-{
- int tick = 0;
- unsigned char last_cmd = 0;
- unsigned char port = 0;
-
- track.start_tick = -1;
- track.end_tick = -1;
-
- /* the current file position is after the track ID and length */
- while (file_offset < track_end)
- {
- unsigned char cmd;
- midievent_t * event;
- int delta_ticks, len, c;
-
- delta_ticks = read_var ();
-
- if (delta_ticks < 0)
- break;
-
- tick += delta_ticks;
-
- c = read_byte ();
-
- if (c < 0)
- break;
-
- if (c & 0x80)
- {
- /* have command */
- cmd = c;
-
- if (cmd < 0xf0)
- last_cmd = cmd;
- }
- else
- {
- /* running status */
- file_offset--;
- cmd = last_cmd;
-
- if (!cmd)
- ERRMSG_MIDITRACK();
- }
-
- switch (cmd >> 4)
- {
- /* maps SMF events to ALSA sequencer events */
- static unsigned char cmd_type16 =
- {
- 0, 0, 0, 0, 0, 0, 0, 0,
- SND_SEQ_EVENT_NOTEOFF, // 08h
- SND_SEQ_EVENT_NOTEON, // 09h
- SND_SEQ_EVENT_KEYPRESS, // 0ah
- SND_SEQ_EVENT_CONTROLLER, // 0bh
- SND_SEQ_EVENT_PGMCHANGE, // 0ch
- SND_SEQ_EVENT_CHANPRESS, // 0dh
- SND_SEQ_EVENT_PITCHBEND // 0eh
- };
-
- case 0x8: /* channel msg with 2 parameter bytes */
- case 0x9:
- case 0xa:
- {
- event = track.add_event ();
- event->type = cmd_typecmd >> 4;
- event->port = port;
- event->tick = tick;
- event->d0 = cmd & 0x0f;
-
- /* if this note is not in standard drum channel (10), apply transpose */
- if (event->d0 != 9)
- {
- int transpose = aud_get_int ("amidiplug", "ap_opts_transpose_value");
- int data_tr = (read_byte () & 0x7f) + transpose;
-
- if (data_tr > 127) data_tr = 127;
- else if (data_tr < 0) data_tr = 0;
-
- event->d1 = (unsigned char) data_tr;
- }
- else /* this note is in standard drum channel (10), apply drum shift */
- {
- int drumshift = aud_get_int ("amidiplug", "ap_opts_drumshift_value");
- int data_ds = (read_byte () & 0x7f) + drumshift; /* always > 0 */
-
- if (data_ds > 127) data_ds -= 127;
-
- event->d1 = (unsigned char) data_ds;
- }
-
- event->d2 = read_byte () & 0x7f;
-
- if (event->type == SND_SEQ_EVENT_NOTEON && track.start_tick < 0)
- track.start_tick = tick;
- if (track.start_tick >= 0 && tick >= track.start_tick)
- track.end_tick = tick;
- }
- break;
-
- case 0xb: /* channel msg with 2 parameter bytes */
- case 0xe:
- {
- event = track.add_event ();
- event->type = cmd_typecmd >> 4;
- event->port = port;
- event->tick = tick;
- event->d0 = cmd & 0x0f;
- event->d1 = read_byte () & 0x7f;
- event->d2 = read_byte () & 0x7f;
-
- if (track.start_tick >= 0 && tick >= track.start_tick)
- track.end_tick = tick;
- }
- break;
-
- case 0xc: /* channel msg with 1 parameter byte */
- case 0xd:
- {
- event = track.add_event ();
- event->type = cmd_typecmd >> 4;
- event->port = port;
- event->tick = tick;
- event->d0 = cmd & 0x0f;
- event->d1 = read_byte () & 0x7f;
-
- if (track.start_tick >= 0 && tick >= track.start_tick)
- track.end_tick = tick;
- }
- break;
-
- case 0xf:
- {
- switch (cmd)
- {
- case 0xf0: /* sysex */
- case 0xf7: /* continued sysex, or escaped commands */
- {
- len = read_var ();
-
- if (len < 0)
- ERRMSG_MIDITRACK();
-
- /* skip sysex */
- skip_bytes (len);
- }
- break;
-
- case 0xff: /* meta event */
- {
- c = read_byte ();
- len = read_var ();
-
- if (len < 0)
- ERRMSG_MIDITRACK();
-
- switch (c)
- {
- case 0x21: /* port number */
- {
- if (len < 1)
- ERRMSG_MIDITRACK();
-
- port = read_byte () % port_count;
- skip_bytes (len - 1);
- }
- break;
-
- case 0x2f: /* end of track */
- {
- if (! aud_get_bool ("amidiplug", "skip_leading"))
- track.start_tick = 0;
- if (! aud_get_bool ("amidiplug", "skip_trailing"))
- track.end_tick = tick;
-
- skip_bytes (track_end - file_offset);
- return true;
- }
-
- case 0x51: /* tempo */
- {
- if (len < 3)
- ERRMSG_MIDITRACK();
-
- if (smpte_timing)
- {
- /* SMPTE timing doesn't change */
- skip_bytes (len);
- }
- else
- {
- event = track.add_event ();
- event->type = SND_SEQ_EVENT_TEMPO;
- event->port = port;
- event->tick = tick;
- event->tempo = read_byte () << 16;
- event->tempo |= read_byte () << 8;
- event->tempo |= read_byte ();
- skip_bytes (len - 3);
- }
- }
- break;
-
- case 0x01: /* text comments */
- {
- if (len < 0)
- ERRMSG_MIDITRACK();
-
- event = track.add_event ();
- event->type = SND_SEQ_EVENT_META_TEXT;
- event->tick = tick;
-
- StringBuf buf (len);
- for (int i = 0; i < len; i ++)
- bufi = read_byte ();
-
- event->metat = String (str_to_utf8 (std::move (buf)));
- }
- break;
-
- case 0x05: /* lyrics */
- {
- if (len < 0)
- ERRMSG_MIDITRACK();
-
- event = track.add_event ();
- event->type = SND_SEQ_EVENT_META_LYRIC;
- event->tick = tick;
-
- StringBuf buf (len);
- for (int i = 0; i < len; i ++)
- bufi = read_byte ();
-
- event->metat = String (str_to_utf8 (std::move (buf)));
- }
- break;
-
- default: /* ignore all other meta events */
- {
- skip_bytes (len);
- }
- break;
- }
- }
- break;
-
- default: /* invalid Fx command */
- ERRMSG_MIDITRACK();
- }
- }
- break;
-
- default: /* cannot happen */
- ERRMSG_MIDITRACK();
- }
- }
-
- ERRMSG_MIDITRACK();
-}
-
-
-/* read a MIDI file in Standard MIDI Format */
-/* return values: 0 = error, 1 = ok */
-bool midifile_t::parse_smf (int port_count)
-{
- int header_len;
-
- /* the curren position is immediately after the "MThd" id */
- header_len = read_int (4);
-
- if (header_len < 6)
- {
- AUDERR ("%s: invalid file format\n", (const char *) file_name);
- return false;
- }
-
- format = read_int (2);
-
- if (format != 0 && format != 1)
- {
- AUDERR ("%s: type %d format is not supported\n", (const char *) file_name, format);
- return false;
- }
-
- int num_tracks = read_int (2);
-
- if (num_tracks < 1 || num_tracks > 1000)
- {
- AUDERR ("%s: invalid number of tracks (%d)\n", (const char *) file_name, num_tracks);
- num_tracks = 0;
- return false;
- }
-
- tracks.insert (0, num_tracks);
-
- time_division = read_int (2);
-
- if (time_division < 0)
- {
- AUDERR ("%s: invalid file format\n", (const char *) file_name);
- return false;
- }
-
- smpte_timing = !! (time_division & 0x8000);
-
- /* read tracks */
- for (midifile_track_t & track : tracks)
- {
- int len;
-
- /* search for MTrk chunk */
- for (;;)
- {
- int id = read_id ();
- len = read_int (4);
-
- if (file_eof)
- {
- AUDERR ("%s: unexpected end of file\n", (const char *) file_name);
- return false;
- }
-
- if (len < 0 || len >= 0x10000000)
- {
- AUDERR ("%s: invalid chunk length %d\n", (const char *) file_name, len);
- return false;
- }
-
- if (id == MAKE_ID ('M', 'T', 'r', 'k'))
- break;
-
- skip_bytes (len);
- }
-
- if (! read_track (track, file_offset + len, port_count))
- return false;
- }
-
- /* calculate the max_tick for the entire file */
- start_tick = -1;
- max_tick = 0;
-
- for (midifile_track_t & track : tracks)
- {
- if (track.start_tick >= 0 && (start_tick < 0 || track.start_tick < start_tick))
- start_tick = track.start_tick;
- if (track.end_tick > max_tick)
- max_tick = track.end_tick;
- }
-
- if (start_tick < 0)
- start_tick = 0;
-
- /* ok, success */
- return true;
-}
-
-
-/* read a MIDI file enclosed in RIFF format */
-/* return values: 0 = error, 1 = ok */
-bool midifile_t::parse_riff ()
-{
- /* skip file length (4 bytes) */
- skip_bytes (4);
-
- /* check file type ("RMID" = RIFF MIDI) */
- if (read_id () != MAKE_ID ('R', 'M', 'I', 'D'))
- return false;
-
- /* search for "data" chunk */
- for (;;)
- {
- int id = read_id ();
- int len = read_32_le ();
-
- if (file_eof)
- return false;
-
- if (id == MAKE_ID ('d', 'a', 't', 'a'))
- break;
-
- if (len < 0)
- return false;
-
- skip_bytes ((len + 1) & ~1);
- }
-
- /* the "data" chunk must contain data in SMF format */
- if (read_id () != MAKE_ID ('M', 'T', 'h', 'd'))
- return false;
-
- /* ok, success */
- return true;
-}
-
-
-/* queue set tempo */
-bool midifile_t::setget_tempo ()
-{
- /* interpret and set tempo */
- bool smpte_timing = !! (time_division & 0x8000);
-
- if (!smpte_timing)
- {
- /* time_division is ticks per quarter */
- current_tempo = 500000;
- ppq = time_division;
- }
- else
- {
- /* upper byte is negative frames per second */
- int fps = 0x80 - ((time_division >> 8) & 0x7f);
- /* lower byte is ticks per frame */
- int tpf = time_division & 0xff;
-
- /* now pretend that we have quarter-note based timing */
- switch (fps)
- {
- case 24:
- current_tempo = 500000;
- ppq = 12 * tpf;
- break;
-
- case 25:
- current_tempo = 400000;
- ppq = 10 * tpf;
- break;
-
- case 29: /* 30 drop-frame */
- current_tempo = 100000000;
- ppq = 2997 * tpf;
- break;
-
- case 30:
- current_tempo = 500000;
- ppq = 15 * tpf;
- break;
-
- default:
- AUDERR ("Invalid number of SMPTE frames per second (%d)\n", fps);
- return false;
- }
- }
-
- AUDDBG ("MIDI tempo set -> time division: %i\n", time_division);
- AUDDBG ("MIDI tempo set -> tempo: %i\n", current_tempo);
- AUDDBG ("MIDI tempo set -> ppq: %i\n", ppq);
- return true;
-}
-
-
-/* this will set the midi length in microseconds
- COMMENT: this will also reset current position in each track! */
-void midifile_t::setget_length ()
-{
- int64_t length_microsec = 0;
- int last_tick = start_tick;
- /* get the first microsec_per_tick ratio */
- int microsec_per_tick = (int) (current_tempo / ppq);
-
- /* initialize current position in each track */
- for (midifile_track_t & track : tracks)
- track.current_event = track.events.head ();
-
- /* 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 */
- AUDDBG ("LENGTH calc: starting calc loop\n");
-
- for (;;)
- {
- midievent_t * event = nullptr;
- midifile_track_t * event_track = nullptr;
- int min_tick = max_tick + 1;
-
- /* search next event */
- for (midifile_track_t & track : tracks)
- {
- 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 * (max_tick - last_tick));
- break; /* end of song reached */
- }
-
- /* advance pointer to next event */
- event_track->current_event = event_track->events.next (event);
-
- /* check if this is a tempo event */
- if (event->type == SND_SEQ_EVENT_TEMPO)
- {
- int tick = aud::max (event->tick, start_tick);
- AUDDBG ("LENGTH calc: tempo event (%i) on tick %i\n", event->tempo, tick);
-
- /* increment length_microsec with the amount of microsec before tempo change */
- length_microsec += (microsec_per_tick * (tick - last_tick));
- /* now update last_tick and the microsec_per_tick ratio */
- last_tick = tick;
- microsec_per_tick = (int) (event->tempo / ppq);
- }
- }
-
- /* IMPORTANT
- this couple of important values is set by midifile_t::set_length */
- length = length_microsec;
-
- if (max_tick > start_tick)
- avg_microsec_per_tick = (int) (length_microsec / (max_tick - start_tick));
- else
- avg_microsec_per_tick = 0;
-
- 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 midifile_t::get_bpm (int * bpm, int * wavg_bpm)
-{
- int last_tick = start_tick;
- unsigned weighted_avg_tempo = 0;
- bool is_monotempo = true;
- int last_tempo = current_tempo;
-
- /* initialize current position in each track */
- for (midifile_track_t & track : tracks)
- track.current_event = track.events.head ();
-
- /* 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 */
- AUDDBG ("BPM calc: starting calc loop\n");
-
- for (;;)
- {
- midievent_t * event = nullptr;
- midifile_track_t * event_track = nullptr;
- int min_tick = max_tick + 1;
-
- /* search next event */
- for (midifile_track_t & track : tracks)
- {
- 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 */
- if (max_tick > start_tick)
- weighted_avg_tempo += (unsigned) (last_tempo *
- ((float) (max_tick - last_tick) / (float) (max_tick - start_tick)));
-
- break; /* end of song reached */
- }
-
- /* advance pointer to next event */
- event_track->current_event = event_track->events.next (event);
-
- /* check if this is a tempo event */
- if (event->type == SND_SEQ_EVENT_TEMPO)
- {
- int tick = aud::max (event->tick, start_tick);
- AUDDBG ("BPM calc: tempo event (%i) on tick %i\n", event->tempo, tick);
-
- /* 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 && tick > start_tick && event->tempo != last_tempo)
- is_monotempo = false;
-
- /* add the previous tempo change multiplied for its weight (the tick interval for the tempo ) */
- if (max_tick > start_tick)
- weighted_avg_tempo += (unsigned) (last_tempo *
- ((float) (tick - last_tick) / (float) (max_tick - start_tick)));
-
- /* now update last_tick and the microsec_per_tick ratio */
- last_tick = tick;
- last_tempo = event->tempo;
- }
- }
-
- AUDDBG ("BPM calc: weighted average tempo: %i\n", weighted_avg_tempo);
-
- if (weighted_avg_tempo > 0)
- *wavg_bpm = (int) (60000000 / weighted_avg_tempo);
- else
- *wavg_bpm = 0;
-
- AUDDBG ("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 */
-}
-
-
-/* helper function that parses a midi file; returns 1 on success, 0 otherwise */
-bool midifile_t::parse_from_file (const char * filename, VFSFile & file)
-{
- bool success = false;
-
- file_name = String (filename);
- file_data = file.read_all ();
-
- switch (read_id ())
- {
- case MAKE_ID ('R', 'I', 'F', 'F') :
- AUDDBG ("PARSE_FROM_FILENAME requested, RIFF chunk found, processing...\n");
-
- /* read riff chunk */
- if (!parse_riff ())
- 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') :
- AUDDBG ("PARSE_FROM_FILENAME requested, MThd chunk found, processing...\n");
-
- /* we don't care about port count here, pass 1 */
- if (!parse_smf (1))
- WARNANDBREAK ("%s: invalid file format (smf parser)\n", filename);
-
- if (time_division < 1)
- WARNANDBREAK ("%s: invalid time division (%i)\n", filename, time_division);
-
- /* fill ppq and tempo using time_division */
- if (!setget_tempo ())
- WARNANDBREAK ("%s: invalid values while setting ppq and tempo\n", filename);
-
- /* fill length, keeping in count tempo-changes */
- setget_length ();
-
- /* ok, mf has been filled with information; successfully return */
- success = true;
- break;
-
- default:
- AUDERR ("%s is not a Standard MIDI File\n", filename);
- break;
- }
-
- file_name = String ();
- file_data.clear ();
-
- return success;
-}

audacious-plugins-3.6.2-gtk3.tar.bz2/src/cdaudio-ng Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/cdaudio-ng/Makefile Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/cdaudio-ng/cdaudio-ng.cc Deleted

@@ -1,815 +0,0 @@
-/*
- * Audacious CD Digital Audio plugin
- *
- * Copyright (c) 2007 Calin Crisan <ccrisan@gmail.com>
- * Copyright (c) 2009-2012 John Lindgren <john.lindgren@aol.com>
- * Copyright (c) 2009 Tomasz Moń <desowin@gmail.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; under version 3 of the License.
- *
- * 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>.
- */
-
-#include <assert.h>
-#include <errno.h>
-#include <pthread.h>
-#include <stdlib.h>
-#include <string.h>
-
-/* prevent libcdio from redefining PACKAGE, VERSION, etc. */
-#define EXTERNAL_LIBCDIO_CONFIG_H
-
-#include <cdio/cdio.h>
-#include <cdio/cdtext.h>
-#include <cdio/track.h>
-#include <cdio/audio.h>
-#include <cdio/sector.h>
-#include <cdio/cd_types.h>
-
-#if LIBCDIO_VERSION_NUM >= 90
-#include <cdio/paranoia/cdda.h>
-#else
-#include <cdio/cdda.h>
-#endif
-
-#include <cddb/cddb.h>
-
-#include <libaudcore/audstrings.h>
-#include <libaudcore/hook.h>
-#include <libaudcore/i18n.h>
-#include <libaudcore/interface.h>
-#include <libaudcore/mainloop.h>
-#include <libaudcore/playlist.h>
-#include <libaudcore/plugin.h>
-#include <libaudcore/preferences.h>
-#include <libaudcore/runtime.h>
-
-#define MIN_DISC_SPEED 2
-#define MAX_DISC_SPEED 24
-
-#define MAX_RETRIES 10
-#define MAX_SKIPS 10
-
-static const char * const cdaudio_schemes = {"cdda", nullptr};
-
-class CDAudio : public InputPlugin
-{
-public:
- static const char about;
- static const char * const defaults;
- static const PreferencesWidget widgets;
- static const PluginPreferences prefs;
-
- static constexpr PluginInfo info = {
- N_("Audio CD Plugin"),
- PACKAGE,
- about,
- & prefs
- };
-
- static constexpr auto iinfo = InputInfo (FlagSubtunes)
- .with_schemes (cdaudio_schemes);
-
- constexpr CDAudio () : InputPlugin (info, iinfo) {}
-
- bool init ();
- void cleanup ();
-
- bool is_our_file (const char * filename, VFSFile & file);
- Tuple read_tuple (const char * filename, VFSFile & file);
- bool play (const char * filename, VFSFile & file);
-};
-
-EXPORT CDAudio aud_plugin_instance;
-
-typedef struct
-{
- String performer;
- String name;
- String genre;
- int startlsn;
- int endlsn;
-}
-trackinfo_t;
-
-static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
-static bool playing;
-
-/* lock mutex to read / set these variables */
-static int firsttrackno = -1;
-static int lasttrackno = -1;
-static int n_audio_tracks;
-static cdrom_drive_t *pcdrom_drive = nullptr;
-static Index<trackinfo_t> trackinfo;
-static QueuedFunc monitor_source;
-
-static bool scan_cd ();
-static void refresh_trackinfo (bool warning);
-static void reset_trackinfo ();
-static int calculate_track_length (int startlsn, int endlsn);
-static int find_trackno_from_filename (const char * filename);
-
-const char CDAudio::about =
- N_("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.");
-
-const char * const CDAudio::defaults = {
- "disc_speed", "2",
- "use_cdtext", "TRUE",
- "use_cddb", "TRUE",
- "cddbhttp", "FALSE",
- "cddbserver", "freedb.org",
- "cddbport", "8880",
- nullptr};
-
-const PreferencesWidget CDAudio::widgets = {
- WidgetLabel (N_("Device")),
- WidgetSpin (N_("Read speed:"),
- WidgetInt ("CDDA", "disc_speed"),
- {MIN_DISC_SPEED, MAX_DISC_SPEED, 1}),
- WidgetEntry (N_("Override device:"),
- WidgetString ("CDDA", "device")),
- WidgetLabel (N_("Metadata")),
- WidgetCheck (N_("Use CD-Text"),
- WidgetBool ("CDDA", "use_cdtext")),
- WidgetCheck (N_("Use CDDB"),
- WidgetBool ("CDDA", "use_cddb")),
- WidgetCheck (N_("Use HTTP instead of CDDBP"),
- WidgetBool ("CDDA", "cddbhttp"),
- WIDGET_CHILD),
- WidgetEntry (N_("Server:"),
- WidgetString ("CDDA", "cddbserver"),
- {false},
- WIDGET_CHILD),
- WidgetEntry (N_("Path:"),
- WidgetString ("CDDA", "cddbpath"),
- {false},
- WIDGET_CHILD),
- WidgetSpin (N_("Port:"),
- WidgetInt ("CDDA", "cddbport"),
- {0, 65535, 1},
- WIDGET_CHILD)
-};
-
-const PluginPreferences CDAudio::prefs = {{widgets}};
-
-static void cdaudio_error (const char * message_format, ...)
-{
- va_list args;
- va_start (args, message_format);
- StringBuf msg = str_vprintf (message_format, args);
- va_end (args);
-
- aud_ui_show_error (msg);
-}
-
-/* main thread only */
-static void purge_playlist (int playlist)
-{
- int length = aud_playlist_entry_count (playlist);
-
- for (int count = 0; count < length; count ++)
- {
- String filename = aud_playlist_entry_get_filename (playlist, count);
-
- if (! strncmp (filename, "cdda://", 7))
- {
- aud_playlist_entry_delete (playlist, count, 1);
- count--;
- length--;
- }
- }
-}
-
-/* main thread only */
-static void purge_all_playlists ()
-{
- int playlists = aud_playlist_count ();
- int count;
-
- for (count = 0; count < playlists; count++)
- purge_playlist (count);
-}
-
-/* main thread only */
-static void monitor (void *)
-{
- pthread_mutex_lock (& mutex);
-
- /* make sure not to close drive handle while playing */
- if (playing)
- {
- pthread_mutex_unlock (& mutex);
- return;
- }
-
- if (trackinfo.len ())
- refresh_trackinfo (false);
-
- if (trackinfo.len ())
- {
- pthread_mutex_unlock (& mutex);
- return;
- }
-
- monitor_source.stop ();
- pthread_mutex_unlock (& mutex);
-
- purge_all_playlists ();
-}
-
-/* mutex must be locked */
-static void trigger_monitor ()
-{
- if (! monitor_source.running ())
- monitor_source.start (1000, monitor, nullptr);
-}
-
-/* main thread only */
-bool CDAudio::init ()
-{
- aud_config_set_defaults ("CDDA", defaults);
-
- if (!cdio_init ())
- {
- cdaudio_error (_("Failed to initialize cdio subsystem."));
- return false;
- }
-
- libcddb_init ();
-
- return true;
-}
-
-/* thread safe (mutex may be locked) */
-bool CDAudio::is_our_file (const char * filename, VFSFile & file)
-{
- return !strncmp (filename, "cdda://", 7);
-}
-
-/* play thread only */
-bool CDAudio::play (const char * name, VFSFile & file)
-{
- pthread_mutex_lock (& mutex);
-
- if (! trackinfo.len ())
- {
- refresh_trackinfo (true);
-
- if (! trackinfo.len ())
- {
- pthread_mutex_unlock (& mutex);
- return false;
- }
- }
-
- bool okay = false;
- int trackno = find_trackno_from_filename (name);
-
- if (trackno < 0)
- cdaudio_error (_("Invalid URI %s."), name);
- else if (trackno < firsttrackno || trackno > lasttrackno)
- cdaudio_error (_("Track %d not found."), trackno);
- else if (! cdda_track_audiop (pcdrom_drive, trackno))
- cdaudio_error (_("Track %d is a data track."), trackno);
- else
- okay = true;
-
- if (! okay)
- {
- pthread_mutex_unlock (& mutex);
- return false;
- }
-
- set_stream_bitrate (1411200);
- open_audio (FMT_S16_LE, 44100, 2);
-
- int startlsn = trackinfotrackno.startlsn;
- int endlsn = trackinfotrackno.endlsn;
-
- playing = true;
-
- int buffer_size = aud_get_int (nullptr, "output_buffer_size");
- int speed = aud_get_int ("CDDA", "disc_speed");
- speed = aud::clamp (speed, MIN_DISC_SPEED, MAX_DISC_SPEED);
- int sectors = aud::clamp (buffer_size / 2, 50, 250) * speed * 75 / 1000;
- int currlsn = startlsn;
- int retry_count = 0, skip_count = 0;
-
- Index<unsigned char> buffer;
- buffer.insert (0, 2352 * sectors);
-
- while (! check_stop ())
- {
- int seek_time = check_seek ();
- if (seek_time >= 0)
- currlsn = startlsn + (seek_time * 75 / 1000);
-
- sectors = aud::min (sectors, endlsn + 1 - currlsn);
- if (sectors < 1)
- break;
-
- /* unlock mutex here to avoid blocking
- * other threads must be careful not to close drive handle */
- pthread_mutex_unlock (& mutex);
-
- int ret = cdio_read_audio_sectors (pcdrom_drive->p_cdio,
- buffer.begin (), currlsn, sectors);
-
- if (ret == DRIVER_OP_SUCCESS)
- write_audio (buffer.begin (), 2352 * sectors);
-
- pthread_mutex_lock (& mutex);
-
- if (ret == DRIVER_OP_SUCCESS)
- {
- currlsn += sectors;
- retry_count = 0;
- skip_count = 0;
- }
- else if (sectors > 16)
- {
- /* maybe a smaller read size will help */
- sectors /= 2;
- }
- else if (retry_count < MAX_RETRIES)
- {
- /* still failed; retry a few times */
- retry_count ++;
- }
- else if (skip_count < MAX_SKIPS)
- {
- /* maybe the disk is scratched; try skipping ahead */
- currlsn = aud::min (currlsn + 75, endlsn + 1);
- skip_count ++;
- }
- else
- {
- /* still failed; give it up */
- cdaudio_error (_("Error reading audio CD."));
- break;
- }
- }
-
- playing = false;
-
- pthread_mutex_unlock (& mutex);
- return true;
-}
-
-/* main thread only */
-void CDAudio::cleanup ()
-{
- pthread_mutex_lock (& mutex);
-
- reset_trackinfo ();
- libcddb_shutdown ();
-
- pthread_mutex_unlock (& mutex);
-}
-
-/* thread safe */
-Tuple CDAudio::read_tuple (const char * filename, VFSFile & file)
-{
- bool whole_disk = ! strcmp (filename, "cdda://");
- Tuple tuple;
-
- pthread_mutex_lock (& mutex);
-
- /* reset cached info when adding CD to the playlist */
- if (whole_disk && ! playing)
- reset_trackinfo ();
-
- if (! trackinfo.len ())
- refresh_trackinfo (true);
- if (! trackinfo.len ())
- goto DONE;
-
- if (whole_disk)
- {
- tuple.set_filename (filename);
-
- Index<int> subtunes;
-
- /* only add the audio tracks to the playlist */
- for (int trackno = firsttrackno; trackno <= lasttrackno; trackno++)
- if (cdda_track_audiop (pcdrom_drive, trackno))
- subtunes.append (trackno);
-
- tuple.set_subtunes (subtunes.len (), subtunes.begin ());
- }
- else
- {
- int trackno = find_trackno_from_filename (filename);
-
- if (trackno < firsttrackno || trackno > lasttrackno)
- {
- AUDERR ("Track %d not found.\n", trackno);
- goto DONE;
- }
-
- if (!cdda_track_audiop (pcdrom_drive, trackno))
- {
- AUDERR ("Track %d is a data track.\n", trackno);
- goto DONE;
- }
-
- tuple.set_filename (filename);
- tuple.set_format (_("Audio CD"), 2, 44100, 1411);
- tuple.set_int (Tuple::Track, trackno);
- tuple.set_int (Tuple::Length, calculate_track_length
- (trackinfotrackno.startlsn, trackinfotrackno.endlsn));
-
- if (trackinfotrackno.name)
- tuple.set_str (Tuple::Title, trackinfotrackno.name);
- if (trackinfotrackno.performer)
- tuple.set_str (Tuple::Artist, trackinfotrackno.performer);
- if (trackinfo0.name)
- tuple.set_str (Tuple::Album, trackinfo0.name);
- if (trackinfotrackno.genre)
- tuple.set_str (Tuple::Genre, trackinfotrackno.genre);
- }
-
- DONE:
- pthread_mutex_unlock (& mutex);
- return tuple;
-}
-
-/* mutex must be locked */
-static void open_cd ()
-{
- AUDDBG ("Opening CD drive.\n");
- assert (pcdrom_drive == nullptr);
-
- String device = aud_get_str ("CDDA", "device");
-
- if (device0)
- {
- if (! (pcdrom_drive = cdda_identify (device, 1, nullptr)))
- cdaudio_error (_("Failed to open CD device %s."), (const char *) device);
- }
- else
- {
- char * * ppcd_drives = cdio_get_devices_with_cap (nullptr, CDIO_FS_AUDIO, false);
-
- if (ppcd_drives && ppcd_drives0)
- {
- if (! (pcdrom_drive = cdda_identify (ppcd_drives0, 1, nullptr)))
- cdaudio_error (_("Failed to open CD device %s."), ppcd_drives0);
- }
- else
- cdaudio_error (_("No audio capable CD drive found."));
-
- if (ppcd_drives)
- cdio_free_device_list (ppcd_drives);
- }
-}
-
-/* mutex must be locked */
-static bool scan_cd ()
-{
- AUDDBG ("Scanning CD drive.\n");
- assert (pcdrom_drive);
- assert (! trackinfo.len ());
-
- int trackno;
-
- /* general track initialization */
-
- /* skip endianness detection (because it only affects cdda_read, and we use
- * cdio_read_audio_sectors instead) */
- pcdrom_drive->bigendianp = 0;
-
- /* finish initialization of drive/disc (performs disc TOC sanitization) */
- if (cdda_open (pcdrom_drive) != 0)
- {
- cdaudio_error (_("Failed to finish initializing opened CD drive."));
- return false;
- }
-
- int speed = aud_get_int ("CDDA", "disc_speed");
- speed = aud::clamp (speed, MIN_DISC_SPEED, MAX_DISC_SPEED);
- if (cdda_speed_set (pcdrom_drive, speed) != DRIVER_OP_SUCCESS)
- AUDERR ("Cannot set drive speed.\n");
-
- firsttrackno = cdio_get_first_track_num (pcdrom_drive->p_cdio);
- lasttrackno = cdio_get_last_track_num (pcdrom_drive->p_cdio);
- if (firsttrackno == CDIO_INVALID_TRACK || lasttrackno == CDIO_INVALID_TRACK)
- {
- cdaudio_error (_("Failed to retrieve first/last track number."));
- return false;
- }
- AUDDBG ("first track is %d and last track is %d\n", firsttrackno,
- lasttrackno);
-
- trackinfo.insert (0, lasttrackno + 1);
-
- trackinfo0.startlsn = cdda_track_firstsector (pcdrom_drive, 0);
- trackinfo0.endlsn = cdda_track_lastsector (pcdrom_drive, lasttrackno);
-
- n_audio_tracks = 0;
-
- for (trackno = firsttrackno; trackno <= lasttrackno; trackno++)
- {
- trackinfotrackno.startlsn = cdda_track_firstsector (pcdrom_drive, trackno);
- trackinfotrackno.endlsn = cdda_track_lastsector (pcdrom_drive, trackno);
-
- if (trackinfotrackno.startlsn == CDIO_INVALID_LSN
- || trackinfotrackno.endlsn == CDIO_INVALID_LSN)
- {
- cdaudio_error (_("Cannot read start/end LSN for track %d."), trackno);
- return false;
- }
-
- /* count how many tracks are audio tracks */
- if (cdda_track_audiop (pcdrom_drive, trackno))
- n_audio_tracks++;
- }
-
- /* get trackinfo0 cdtext information (the disc) */
- cdtext_t *pcdtext = nullptr;
- if (aud_get_bool ("CDDA", "use_cdtext"))
- {
- AUDDBG ("getting cd-text information for disc\n");
-#if LIBCDIO_VERSION_NUM >= 90
- pcdtext = cdio_get_cdtext (pcdrom_drive->p_cdio);
- if (pcdtext == nullptr)
-#else
- pcdtext = cdio_get_cdtext (pcdrom_drive->p_cdio, 0);
- if (pcdtext == nullptr || pcdtext->fieldCDTEXT_TITLE == nullptr)
-#endif
- {
- AUDDBG ("no cd-text available for disc\n");
- }
- else
- {
-#if LIBCDIO_VERSION_NUM >= 90
- trackinfo0.performer = String (cdtext_get_const (pcdtext, CDTEXT_FIELD_PERFORMER, 0));
- trackinfo0.name = String (cdtext_get_const (pcdtext, CDTEXT_FIELD_TITLE, 0));
- trackinfo0.genre = String (cdtext_get_const (pcdtext, CDTEXT_FIELD_GENRE, 0));
-#else
- trackinfo0.performer = String (pcdtext->fieldCDTEXT_PERFORMER);
- trackinfo0.name = String (pcdtext->fieldCDTEXT_TITLE);
- trackinfo0.genre = String (pcdtext->fieldCDTEXT_GENRE);
-#endif
- }
- }
-
- /* get track information from cdtext */
- bool cdtext_was_available = false;
- for (trackno = firsttrackno; trackno <= lasttrackno; trackno++)
- {
-#if LIBCDIO_VERSION_NUM < 90
- if (aud_get_bool ("CDDA", "use_cdtext"))
- {
- AUDDBG ("getting cd-text information for track %d\n", trackno);
- pcdtext = cdio_get_cdtext (pcdrom_drive->p_cdio, trackno);
- if (pcdtext == nullptr || pcdtext->fieldCDTEXT_PERFORMER == nullptr)
- {
- AUDDBG ("no cd-text available for track %d\n", trackno);
- pcdtext = nullptr;
- }
- }
-#endif
-
- if (pcdtext != nullptr)
- {
-#if LIBCDIO_VERSION_NUM >= 90
- trackinfotrackno.performer = String (cdtext_get_const (pcdtext, CDTEXT_FIELD_PERFORMER, trackno));
- trackinfotrackno.name = String (cdtext_get_const (pcdtext, CDTEXT_FIELD_TITLE, trackno));
- trackinfotrackno.genre = String (cdtext_get_const (pcdtext, CDTEXT_FIELD_GENRE, trackno));
-#else
- trackinfotrackno.performer = String (pcdtext->fieldCDTEXT_PERFORMER);
- trackinfotrackno.name = String (pcdtext->fieldCDTEXT_TITLE);
- trackinfotrackno.genre = String (pcdtext->fieldCDTEXT_GENRE);
-#endif
- cdtext_was_available = true;
- }
- }
-
- if (!cdtext_was_available)
- {
- /* initialize de cddb subsystem */
- cddb_conn_t *pcddb_conn = nullptr;
- cddb_disc_t *pcddb_disc = nullptr;
- cddb_track_t *pcddb_track = nullptr;
- lba_t lba; /* Logical Block Address */
-
- if (aud_get_bool ("CDDA", "use_cddb"))
- {
- pcddb_conn = cddb_new ();
- if (pcddb_conn == nullptr)
- cdaudio_error (_("Failed to create the cddb connection."));
- else
- {
- AUDDBG ("getting CDDB info\n");
-
- cddb_cache_enable (pcddb_conn);
- // cddb_cache_set_dir(pcddb_conn, "~/.cddbslave");
-
- String server = aud_get_str ("CDDA", "cddbserver");
- String path = aud_get_str ("CDDA", "cddbpath");
- int port = aud_get_int ("CDDA", "cddbport");
-
- if (aud_get_bool (nullptr, "use_proxy"))
- {
- String prhost = aud_get_str (nullptr, "proxy_host");
- int prport = aud_get_int (nullptr, "proxy_port");
- String pruser = aud_get_str (nullptr, "proxy_user");
- String prpass = aud_get_str (nullptr, "proxy_pass");
-
- cddb_http_proxy_enable (pcddb_conn);
- cddb_set_http_proxy_server_name (pcddb_conn, prhost);
- cddb_set_http_proxy_server_port (pcddb_conn, prport);
- cddb_set_http_proxy_username (pcddb_conn, pruser);
- cddb_set_http_proxy_password (pcddb_conn, prpass);
-
- cddb_set_server_name (pcddb_conn, server);
- cddb_set_server_port (pcddb_conn, port);
- }
- else if (aud_get_bool ("CDDA", "cddbhttp"))
- {
- cddb_http_enable (pcddb_conn);
- cddb_set_server_name (pcddb_conn, server);
- cddb_set_server_port (pcddb_conn, port);
- cddb_set_http_path_query (pcddb_conn, path);
- }
- else
- {
- cddb_set_server_name (pcddb_conn, server);
- cddb_set_server_port (pcddb_conn, port);
- }
-
- pcddb_disc = cddb_disc_new ();
-
- lba = cdio_get_track_lba (pcdrom_drive->p_cdio,
- CDIO_CDROM_LEADOUT_TRACK);
- cddb_disc_set_length (pcddb_disc, FRAMES_TO_SECONDS (lba));
-
- for (trackno = firsttrackno; trackno <= lasttrackno; trackno++)
- {
- pcddb_track = cddb_track_new ();
- cddb_track_set_frame_offset (pcddb_track,
- cdio_get_track_lba (
- pcdrom_drive->p_cdio,
- trackno));
- cddb_disc_add_track (pcddb_disc, pcddb_track);
- }
-
- cddb_disc_calc_discid (pcddb_disc);
-
- unsigned discid = cddb_disc_get_discid (pcddb_disc);
- AUDDBG ("CDDB disc id = %x\n", discid);
-
- int matches;
- if ((matches = cddb_query (pcddb_conn, pcddb_disc)) == -1)
- {
- if (cddb_errno (pcddb_conn) == CDDB_ERR_OK)
- cdaudio_error (_("Failed to query the CDDB server"));
- else
- cdaudio_error (_("Failed to query the CDDB server: %s"),
- cddb_error_str (cddb_errno
- (pcddb_conn)));
-
- cddb_disc_destroy (pcddb_disc);
- pcddb_disc = nullptr;
- }
- else
- {
- if (matches == 0)
- {
- AUDDBG ("no cddb info available for this disc\n");
-
- cddb_disc_destroy (pcddb_disc);
- pcddb_disc = nullptr;
- }
- else
- {
- AUDDBG ("CDDB disc category = \"%s\"\n",
- cddb_disc_get_category_str (pcddb_disc));
-
- cddb_read (pcddb_conn, pcddb_disc);
- if (cddb_errno (pcddb_conn) != CDDB_ERR_OK)
- {
- cdaudio_error (_("Failed to read the cddb info: %s"),
- cddb_error_str (cddb_errno
- (pcddb_conn)));
- cddb_disc_destroy (pcddb_disc);
- pcddb_disc = nullptr;
- }
- else
- {
- trackinfo0.performer = String (cddb_disc_get_artist (pcddb_disc));
- trackinfo0.name = String (cddb_disc_get_title (pcddb_disc));
- trackinfo0.genre = String (cddb_disc_get_genre (pcddb_disc));
-
- int trackno;
- for (trackno = firsttrackno; trackno <= lasttrackno;
- trackno++)
- {
- cddb_track_t *pcddb_track =
- cddb_disc_get_track (pcddb_disc,
- trackno - 1);
-
- trackinfotrackno.performer = String (cddb_track_get_artist (pcddb_track));
- trackinfotrackno.name = String (cddb_track_get_title (pcddb_track));
- trackinfotrackno.genre = String (cddb_disc_get_genre (pcddb_disc));
- }
- }
- }
- }
- }
- }
-
- if (pcddb_disc != nullptr)
- cddb_disc_destroy (pcddb_disc);
-
- if (pcddb_conn != nullptr)
- cddb_destroy (pcddb_conn);
- }
-
- return true;
-}
-
-/* mutex must be locked */
-static void refresh_trackinfo (bool warning)
-{
- if (pcdrom_drive == nullptr)
- {
- open_cd ();
- if (pcdrom_drive == nullptr)
- return;
- }
-
- int mode = cdio_get_discmode (pcdrom_drive->p_cdio);
-#ifdef _WIN32 /* cdio_get_discmode reports the wrong disk type sometimes */
- if (mode == CDIO_DISC_MODE_NO_INFO || mode == CDIO_DISC_MODE_ERROR)
-#else
- if (mode != CDIO_DISC_MODE_CD_DA && mode != CDIO_DISC_MODE_CD_MIXED)
-#endif
- {
- if (warning)
- {
- if (mode == CDIO_DISC_MODE_NO_INFO)
- cdaudio_error (_("Drive is empty."));
- else
- cdaudio_error (_("Unsupported disk type."));
- }
-
- reset_trackinfo ();
- return;
- }
-
- if (! trackinfo.len () || cdio_get_media_changed (pcdrom_drive->p_cdio))
- {
- trackinfo.clear ();
-
- if (scan_cd ())
- trigger_monitor ();
- else
- reset_trackinfo ();
- }
-}
-
-/* mutex must be locked */
-static void reset_trackinfo ()
-{
- monitor_source.stop ();
-
- if (pcdrom_drive != nullptr)
- {
- cdda_close (pcdrom_drive);
- pcdrom_drive = nullptr;
- }
-
- trackinfo.clear ();
-}
-
-/* thread safe (mutex may be locked) */
-static int calculate_track_length (int startlsn, int endlsn)
-{
- return ((endlsn - startlsn + 1) * 1000) / 75;
-}
-
-/* thread safe (mutex may be locked) */
-static int find_trackno_from_filename (const char * filename)
-{
- int track;
-
- if (strncmp (filename, "cdda://?", 8) || sscanf (filename + 8, "%d",
- &track) != 1)
- return -1;
-
- return track;
-}

audacious-plugins-3.6.2-gtk3.tar.bz2/src/ffaudio/itunes-cover.cc Deleted

@@ -1,91 +0,0 @@
-/*
- * itunes-cover.c
- * John Lindgren, 2010
- *
- * The author hereby releases this code into the public domain.
- *
- * Reference:
- * http://atomicparsley.sourceforge.net/mpeg-4files.html
- */
-
-#define __STDC_LIMIT_MACROS
-#include "ffaudio-stdinc.h"
-
-#include <stdint.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-static const struct {
- const char * id;
- int skip;
-} hierarchy = {
- {"moov", 0},
- {"udta", 0},
- {"meta", 4},
- {"ilst", 0},
- {"covr", 0},
- {"data", 8}
-};
-
-Index<char> read_itunes_cover(const char * filename, VFSFile & file)
-{
- unsigned char b8;
- int bsize;
-
- Index<char> data;
-
- /* Check for ftyp frame. */
-
- if (file.fread (b, 1, 8) != 8)
- return data;
- if ((bsize = (b0 << 24) | (b1 << 16) | (b2 << 8) | b3) < 8)
- return data;
- if (strncmp ((char *) b + 4, "ftyp", 4))
- return data;
- if (file.fseek (bsize - 8, VFS_SEEK_CUR))
- return data;
-
- int64_t stop = INT64_MAX;
- int64_t at = bsize;
-
- /* Descend into frame hierarchy. */
-
- for (auto & frame : hierarchy)
- {
- while (1)
- {
- if (file.fread (b, 1, 8) != 8)
- return data;
- if ((bsize = (b0 << 24) | (b1 << 16) | (b2 << 8) | b3) < 8 || at + bsize > stop)
- return data;
- if (! strncmp ((char *) b + 4, frame.id, 4))
- break;
- if (file.fseek (bsize - 8, VFS_SEEK_CUR))
- return data;
-
- at += bsize;
- }
-
- stop = at + bsize;
- at += 8;
-
- /* Skip leading bytes in some frames. */
-
- if (frame.skip)
- {
- if (file.fseek (frame.skip, VFS_SEEK_CUR))
- return data;
- at += frame.skip;
- }
- }
-
- /* We're there. */
-
- data.insert (0, stop - at);
-
- if (file.fread (data.begin (), 1, stop - at) != stop - at)
- data.clear ();
-
- return data;
-}

audacious-plugins-3.6.2-gtk3.tar.bz2/src/filewriter/plugins.h Deleted

@@ -1,39 +0,0 @@
-/* FileWriter-Plugin
- * (C) copyright 2007 merging of Disk Writer and Out-Lame by Michael Färber
- *
- * Original Out-Lame-Plugin:
- * (C) copyright 2002 Lars Siebold <khandha5@gmx.net>
- * (C) copyright 2006-2007 porting to audacious by Yoshiki Yazawa <yaz@cc.rim.or.jp>
- *
- * 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 PLUGINS_H
-#define PLUGINS_H
-
-#include "filewriter.h"
-
-extern FileWriterImpl wav_plugin;
-#ifdef FILEWRITER_MP3
-extern FileWriterImpl mp3_plugin;
-#endif
-#ifdef FILEWRITER_VORBIS
-extern FileWriterImpl vorbis_plugin;
-#endif
-#ifdef FILEWRITER_FLAC
-extern FileWriterImpl flac_plugin;
-#endif
-
-#endif

audacious-plugins-3.6.2-gtk3.tar.bz2/src/flacng Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/flacng/flacng.h Deleted

@@ -1,105 +0,0 @@
-/*
- * A FLAC decoder plugin for the Audacious Media Player
- * Copyright (C) 2005 Ralf Ertzinger
- *
- * 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 FLACNG_H
-#define FLACNG_H
-
-#include <FLAC/all.h>
-
-#include <libaudcore/i18n.h>
-#include <libaudcore/plugin.h>
-
-class FLACng : public InputPlugin
-{
-public:
- static const char about;
- static const char *const exts;
-
- static constexpr PluginInfo info = {
- N_("FLAC Decoder"),
- PACKAGE,
- about
- };
-
- static constexpr auto iinfo = InputInfo(FlagWritesTag)
- .with_priority(1)
- .with_exts(exts);
-
- constexpr FLACng() : InputPlugin(info, iinfo) {}
-
- bool init();
- void cleanup();
-
- bool is_our_file(const char *filename, VFSFile &file);
- Tuple read_tuple(const char *filename, VFSFile &file);
- Index<char> read_image(const char *filename, VFSFile &file);
- bool write_tuple(const char *filename, VFSFile &file, const Tuple &tuple);
- bool play(const char *filename, VFSFile &file);
-};
-
-#define BUFFER_SIZE_SAMP (FLAC__MAX_BLOCK_SIZE * FLAC__MAX_CHANNELS)
-#define BUFFER_SIZE_BYTE (BUFFER_SIZE_SAMP * (FLAC__MAX_BITS_PER_SAMPLE/8))
-
-#define SAMPLE_SIZE(a) (a == 8 ? 1 : (a == 16 ? 2 : 4))
-#define SAMPLE_FMT(a) (a == 8 ? FMT_S8 : (a == 16 ? FMT_S16_NE : (a == 24 ? FMT_S24_NE : FMT_S32_NE)))
-
-struct callback_info
-{
- unsigned bits_per_sample = 0;
- unsigned sample_rate = 0;
- unsigned channels = 0;
- unsigned long total_samples = 0;
- Index<int32_t> output_buffer;
- int32_t *write_pointer = nullptr;
- unsigned buffer_used = 0;
- VFSFile *fd = nullptr;
- int bitrate = 0;
-
- void alloc()
- {
- output_buffer.resize(BUFFER_SIZE_SAMP);
- reset();
- }
-
- void reset()
- {
- buffer_used = 0;
- write_pointer = output_buffer.begin();
- }
-};
-
-/* metadata.c */
-bool flac_update_song_tuple(const char *filename, VFSFile &fd, const Tuple &tuple);
-Index<char> flac_get_image(const char *filename, VFSFile &fd);
-Tuple flac_probe_for_tuple(const char *filename, VFSFile &fd);
-
-/* seekable_stream_callbacks.c */
-FLAC__StreamDecoderReadStatus read_callback(const FLAC__StreamDecoder *decoder, FLAC__byte buffer, size_t *bytes, void *client_data);
-FLAC__StreamDecoderSeekStatus seek_callback(const FLAC__StreamDecoder *decoder, FLAC__uint64 absolute_byte_offset, void *client_data);
-FLAC__StreamDecoderTellStatus tell_callback(const FLAC__StreamDecoder *decoder, FLAC__uint64 *absolute_byte_offset, void *client_data);
-FLAC__bool eof_callback(const FLAC__StreamDecoder *decoder, void *client_data);
-FLAC__StreamDecoderLengthStatus length_callback(const FLAC__StreamDecoder *decoder, FLAC__uint64 *stream_length, void *client_data);
-FLAC__StreamDecoderWriteStatus write_callback(const FLAC__StreamDecoder *decoder, const FLAC__Frame *frame, const FLAC__int32 * const buffer, void *client_data);
-void error_callback(const FLAC__StreamDecoder *decoder, FLAC__StreamDecoderErrorStatus status, void *client_data);
-void metadata_callback(const FLAC__StreamDecoder *decoder, const FLAC__StreamMetadata *metadata, void *client_data);
-
-/* tools.c */
-bool read_metadata(FLAC__StreamDecoder* decoder, callback_info* info);
-
-#endif

audacious-plugins-3.6.2-gtk3.tar.bz2/src/flacng/metadata.cc Deleted

@@ -1,438 +0,0 @@
-/*
- * A FLAC decoder plugin for the Audacious Media Player
- * Copyright (C) 2005 Ralf Ertzinger
- * Copyright (C) 2010 John Lindgren
- * Copyright (C) 2010 Michał Lipski <tallica@o2.pl>
- *
- * 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/>.
- *
- */
-
-#include <limits.h>
-#include <stdlib.h>
-#include <string.h>
-
-#define WANT_VFS_STDIO_COMPAT
-#include <libaudcore/runtime.h>
-#include <libaudcore/i18n.h>
-#include <libaudcore/audstrings.h>
-
-#include "flacng.h"
-
-static size_t read_cb(void *ptr, size_t size, size_t nmemb, FLAC__IOHandle handle)
-{
- int64_t read;
-
- if (handle == nullptr)
- {
- AUDERR("Trying to read data from an uninitialized file!\n");
- return -1;
- }
-
- read = ((VFSFile *) handle)->fread (ptr, size, nmemb);
-
- switch (read)
- {
- case -1:
- AUDERR("Error while reading from stream!\n");
- return -1;
-
- case 0:
- AUDDBG("Stream reached EOF\n");
- return 0;
-
- default:
- return read;
- }
-}
-
-static size_t write_cb(const void *ptr, size_t size, size_t nmemb, FLAC__IOHandle handle)
-{
- return ((VFSFile *) handle)->fwrite (ptr, size, nmemb);
-}
-
-static int seek_cb(FLAC__IOHandle handle, FLAC__int64 offset, int whence)
-{
- if (((VFSFile *) handle)->fseek (offset, to_vfs_seek_type (whence)) != 0)
- {
- AUDERR("Could not seek to %ld!\n", (long)offset);
- return -1;
- }
-
- return 0;
-}
-
-static FLAC__int64 tell_cb(FLAC__IOHandle handle)
-{
- int64_t offset;
-
- if ((offset = ((VFSFile *) handle)->ftell ()) < 0)
- {
- AUDERR("Could not tell current position!\n");
- return -1;
- }
-
- AUDDBG ("Current position: %d\n", (int) offset);
- return offset;
-}
-
-static int eof_cb(FLAC__IOHandle handle)
-{
- return ((VFSFile *) handle)->feof ();
-}
-
-static FLAC__IOCallbacks io_callbacks = {
- read_cb,
- write_cb,
- seek_cb,
- tell_cb,
- eof_cb,
- nullptr
-};
-
-static void insert_str_tuple_to_vc (FLAC__StreamMetadata * vc_block,
- const Tuple & tuple, Tuple::Field field, const char * field_name)
-{
- FLAC__StreamMetadata_VorbisComment_Entry entry;
- String val = tuple.get_str (field);
-
- if (! val)
- return;
-
- StringBuf str = str_printf ("%s=%s", field_name, (const char *) val);
- entry.entry = (FLAC__byte *) (char *) str;
- entry.length = strlen(str);
- FLAC__metadata_object_vorbiscomment_insert_comment(vc_block,
- vc_block->data.vorbis_comment.num_comments, entry, true);
-}
-
-static void insert_int_tuple_to_vc (FLAC__StreamMetadata * vc_block,
- const Tuple & tuple, Tuple::Field field, const char * field_name)
-{
- FLAC__StreamMetadata_VorbisComment_Entry entry;
- int val = tuple.get_int (field);
-
- if (val <= 0)
- return;
-
- StringBuf str = str_printf ("%s=%d", field_name, val);
- entry.entry = (FLAC__byte *) (char *) str;
- entry.length = strlen(str);
- FLAC__metadata_object_vorbiscomment_insert_comment(vc_block,
- vc_block->data.vorbis_comment.num_comments, entry, true);
-}
-
-bool FLACng::write_tuple(const char *filename, VFSFile &file, const Tuple &tuple)
-{
- AUDDBG("Update song tuple.\n");
-
- FLAC__Metadata_Iterator *iter;
- FLAC__Metadata_Chain *chain;
- FLAC__StreamMetadata *vc_block;
- FLAC__Metadata_ChainStatus status;
-
- chain = FLAC__metadata_chain_new();
-
- if (!FLAC__metadata_chain_read_with_callbacks(chain, &file, io_callbacks))
- goto ERR;
-
- iter = FLAC__metadata_iterator_new();
-
- FLAC__metadata_iterator_init(iter, chain);
-
- while (FLAC__metadata_iterator_next(iter))
- if (FLAC__metadata_iterator_get_block_type(iter) == FLAC__METADATA_TYPE_VORBIS_COMMENT)
- {
- FLAC__metadata_iterator_delete_block(iter, true);
- break;
- }
-
- vc_block = FLAC__metadata_object_new(FLAC__METADATA_TYPE_VORBIS_COMMENT);
-
- insert_str_tuple_to_vc(vc_block, tuple, Tuple::Title, "TITLE");
- insert_str_tuple_to_vc(vc_block, tuple, Tuple::Artist, "ARTIST");
- insert_str_tuple_to_vc(vc_block, tuple, Tuple::Album, "ALBUM");
- insert_str_tuple_to_vc(vc_block, tuple, Tuple::Genre, "GENRE");
- insert_str_tuple_to_vc(vc_block, tuple, Tuple::Comment, "COMMENT");
-
- insert_int_tuple_to_vc(vc_block, tuple, Tuple::Year, "DATE");
- insert_int_tuple_to_vc(vc_block, tuple, Tuple::Track, "TRACKNUMBER");
-
- FLAC__metadata_iterator_insert_block_after(iter, vc_block);
-
- FLAC__metadata_iterator_delete(iter);
- FLAC__metadata_chain_sort_padding(chain);
-
- if (!FLAC__metadata_chain_write_with_callbacks(chain, true, &file, io_callbacks))
- goto ERR;
-
- FLAC__metadata_chain_delete(chain);
- return true;
-
-ERR:
- status = FLAC__metadata_chain_status(chain);
- FLAC__metadata_chain_delete(chain);
-
- AUDERR("An error occured: %s\n", FLAC__Metadata_ChainStatusStringstatus);
- return false;
-}
-
-Index<char> FLACng::read_image(const char *filename, VFSFile &file)
-{
- AUDDBG("Probe for song image.\n");
-
- FLAC__Metadata_Iterator *iter;
- FLAC__Metadata_Chain *chain;
- FLAC__StreamMetadata *metadata = nullptr;
- FLAC__Metadata_ChainStatus status;
-
- Index<char> data;
-
- chain = FLAC__metadata_chain_new();
-
- if (!FLAC__metadata_chain_read_with_callbacks(chain, &file, io_callbacks))
- goto ERR;
-
- iter = FLAC__metadata_iterator_new();
-
- FLAC__metadata_iterator_init(iter, chain);
-
- while (FLAC__metadata_iterator_next(iter))
- if (FLAC__metadata_iterator_get_block_type(iter) == FLAC__METADATA_TYPE_PICTURE)
- break;
-
- if (FLAC__metadata_iterator_get_block_type(iter) == FLAC__METADATA_TYPE_PICTURE)
- {
- metadata = FLAC__metadata_iterator_get_block(iter);
-
- if (metadata->data.picture.type == FLAC__STREAM_METADATA_PICTURE_TYPE_FRONT_COVER)
- {
- AUDDBG("FLAC__STREAM_METADATA_PICTURE_TYPE_FRONT_COVER found.");
- data.insert ((const char *) metadata->data.picture.data, 0,
- metadata->data.picture.data_length);
- }
- }
-
- FLAC__metadata_iterator_delete(iter);
- FLAC__metadata_chain_delete(chain);
-
- return data;
-
-ERR:
- status = FLAC__metadata_chain_status(chain);
- FLAC__metadata_chain_delete(chain);
-
- AUDERR("An error occured: %s\n", FLAC__Metadata_ChainStatusStringstatus);
- return data;
-}
-
-static void parse_gain_text(const char *text, int *value, int *unit)
-{
- int sign = 1;
-
- *value = 0;
- *unit = 1;
-
- if (*text == '-')
- {
- sign = -1;
- text++;
- }
-
- while (*text >= '0' && *text <= '9')
- {
- *value = *value * 10 + (*text - '0');
- text++;
- }
-
- if (*text == '.')
- {
- text++;
-
- while (*text >= '0' && *text <= '9' && *value < INT_MAX / 10)
- {
- *value = *value * 10 + (*text - '0');
- *unit = *unit * 10;
- text++;
- }
- }
-
- *value = *value * sign;
-}
-
-static void set_gain_info(Tuple &tuple, Tuple::Field field, Tuple::Field unit_field, const char *text)
-{
- int value, unit;
-
- parse_gain_text(text, &value, &unit);
-
- if (tuple.get_value_type (unit_field) == Tuple::Int)
- value = value * (int64_t) tuple.get_int (unit_field) / unit;
- else
- tuple.set_int (unit_field, unit);
-
- tuple.set_int (field, value);
-}
-
-static void add_text (Tuple & tuple, Tuple::Field field, const char * value)
-{
- String cur = tuple.get_str (field);
- if (cur)
- tuple.set_str (field, str_concat ({cur, ", ", value}));
- else
- tuple.set_str (field, value);
-}
-
-static void parse_comment (Tuple & tuple, const char * key, const char * value)
-{
- AUDDBG ("Found key %s <%s>\n", key, value);
-
- static const struct {
- const char * key;
- Tuple::Field field;
- } tfields = {
- {"ARTIST", Tuple::Artist},
- {"ALBUM", Tuple::Album},
- {"TITLE", Tuple::Title},
- {"COMMENT", Tuple::Comment},
- {"GENRE", Tuple::Genre}
- };
-
- for (auto & tfield : tfields)
- {
- if (!strcmp_nocase(key, tfield.key))
- {
- add_text (tuple, tfield.field, value);
- return;
- }
- }
-
- if (!strcmp_nocase(key, "TRACKNUMBER"))
- tuple.set_int(Tuple::Track, atoi(value));
- else if (!strcmp_nocase(key, "DATE"))
- tuple.set_int(Tuple::Year, atoi(value));
- else if (!strcmp_nocase(key, "REPLAYGAIN_TRACK_GAIN"))
- set_gain_info(tuple, Tuple::TrackGain, Tuple::GainDivisor, value);
- else if (!strcmp_nocase(key, "REPLAYGAIN_TRACK_PEAK"))
- set_gain_info(tuple, Tuple::TrackPeak, Tuple::PeakDivisor, value);
- else if (!strcmp_nocase(key, "REPLAYGAIN_ALBUM_GAIN"))
- set_gain_info(tuple, Tuple::AlbumGain, Tuple::GainDivisor, value);
- else if (!strcmp_nocase(key, "REPLAYGAIN_ALBUM_PEAK"))
- set_gain_info(tuple, Tuple::AlbumPeak, Tuple::PeakDivisor, value);
-}
-
-Tuple FLACng::read_tuple(const char *filename, VFSFile &file)
-{
- AUDDBG("Probe for tuple.\n");
-
- Tuple tuple;
- FLAC__Metadata_Iterator *iter;
- FLAC__Metadata_Chain *chain;
- FLAC__StreamMetadata *metadata = nullptr;
- FLAC__Metadata_ChainStatus status;
- FLAC__StreamMetadata_VorbisComment_Entry *entry;
- char *key;
- char *value;
-
- tuple.set_filename (filename);
-
- tuple.set_str (Tuple::Codec, "Free Lossless Audio Codec (FLAC)");
- tuple.set_str (Tuple::Quality, _("lossless"));
-
- chain = FLAC__metadata_chain_new();
-
- if (!FLAC__metadata_chain_read_with_callbacks(chain, &file, io_callbacks))
- goto ERR;
-
- iter = FLAC__metadata_iterator_new();
-
- FLAC__metadata_iterator_init(iter, chain);
-
- do
- {
- switch (FLAC__metadata_iterator_get_block_type(iter))
- {
- case FLAC__METADATA_TYPE_VORBIS_COMMENT:
-
- if (FLAC__metadata_iterator_get_block_type(iter) == FLAC__METADATA_TYPE_VORBIS_COMMENT)
- {
- metadata = FLAC__metadata_iterator_get_block(iter);
-
- AUDDBG("Vorbis comment contains %d fields\n", metadata->data.vorbis_comment.num_comments);
- AUDDBG("Vendor string: %s\n", metadata->data.vorbis_comment.vendor_string.entry);
-
- entry = metadata->data.vorbis_comment.comments;
-
- for (unsigned i = 0; i < metadata->data.vorbis_comment.num_comments; i++, entry++)
- {
- if (FLAC__metadata_object_vorbiscomment_entry_to_name_value_pair(*entry, &key, &value) == false)
- AUDDBG("Could not parse comment\n");
- else
- {
- parse_comment(tuple, key, value);
- free(key);
- free(value);
- }
- }
- }
- break;
-
- case FLAC__METADATA_TYPE_STREAMINFO:
- {
- metadata = FLAC__metadata_iterator_get_block(iter);
-
- /* Calculate the stream length (milliseconds) */
- if (metadata->data.stream_info.sample_rate == 0)
- {
- AUDERR("Invalid sample rate for stream!\n");
- tuple.set_int (Tuple::Length, -1);
- }
- else
- {
- tuple.set_int (Tuple::Length,
- (metadata->data.stream_info.total_samples / metadata->data.stream_info.sample_rate) * 1000);
- AUDDBG("Stream length: %d seconds\n", tuple.get_int (Tuple::Length));
- }
-
- int64_t size = file.fsize ();
-
- if (size < 0 || metadata->data.stream_info.total_samples == 0)
- tuple.set_int (Tuple::Bitrate, 0);
- else
- {
- int bitrate = 8 * size *
- (int64_t) metadata->data.stream_info.sample_rate / metadata->data.stream_info.total_samples;
-
- tuple.set_int (Tuple::Bitrate, (bitrate + 500) / 1000);
- }
- break;
- }
-
- default:
- ;
- }
- } while (FLAC__metadata_iterator_next(iter));
-
- FLAC__metadata_iterator_delete(iter);
- FLAC__metadata_chain_delete(chain);
-
- return tuple;
-
-ERR:
- status = FLAC__metadata_chain_status(chain);
- FLAC__metadata_chain_delete(chain);
-
- AUDERR("An error occured: %s\n", FLAC__Metadata_ChainStatusStringstatus);
- return tuple;
-}

audacious-plugins-3.6.2-gtk3.tar.bz2/src/flacng/plugin.cc Deleted

@@ -1,173 +0,0 @@
-/*
- * A FLAC decoder plugin for the Audacious Media Player
- * Copyright (C) 2005 Ralf Ertzinger
- * Copyright (C) 2010-2012 Michał Lipski
- *
- * 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 <string.h>
-
-#include <libaudcore/runtime.h>
-
-#include "flacng.h"
-
-EXPORT FLACng aud_plugin_instance;
-
-static FLAC__StreamDecoder *decoder;
-static callback_info *cinfo;
-
-bool FLACng::init()
-{
- FLAC__StreamDecoderInitStatus ret;
-
- /* Callback structure and decoder for main decoding loop */
-
- cinfo = new callback_info;
-
- if ((decoder = FLAC__stream_decoder_new()) == nullptr)
- {
- AUDERR("Could not create the main FLAC decoder instance!\n");
- return false;
- }
-
- if (FLAC__STREAM_DECODER_INIT_STATUS_OK != (ret = FLAC__stream_decoder_init_stream(
- decoder,
- read_callback,
- seek_callback,
- tell_callback,
- length_callback,
- eof_callback,
- write_callback,
- metadata_callback,
- error_callback,
- cinfo)))
- {
- AUDERR("Could not initialize the main FLAC decoder: %s(%d)\n",
- FLAC__StreamDecoderInitStatusStringret, ret);
- return false;
- }
-
- AUDDBG("Plugin initialized.\n");
- return true;
-}
-
-void FLACng::cleanup()
-{
- FLAC__stream_decoder_delete(decoder);
- delete cinfo;
-}
-
-bool FLACng::is_our_file(const char *filename, VFSFile &file)
-{
- AUDDBG("Probe for FLAC.\n");
-
- char buf4;
- if (file.fread (buf, 1, sizeof buf) != sizeof buf)
- return false;
-
- return ! strncmp (buf, "fLaC", sizeof buf);
-}
-
-static void squeeze_audio(int32_t* src, void* dst, unsigned count, unsigned res)
-{
- int32_t* rp = src;
- int8_t* wp = (int8_t*) dst;
- int16_t* wp2 = (int16_t*) dst;
- int32_t* wp4 = (int32_t*) dst;
-
- switch (res)
- {
- case 8:
- for (unsigned i = 0; i < count; i++, wp++, rp++)
- *wp = *rp & 0xff;
- break;
-
- case 16:
- for (unsigned i = 0; i < count; i++, wp2++, rp++)
- *wp2 = *rp & 0xffff;
- break;
-
- case 24:
- case 32:
- for (unsigned i = 0; i < count; i++, wp4++, rp++)
- *wp4 = *rp;
- break;
-
- default:
- AUDERR("Can not convert to %u bps\n", res);
- }
-}
-
-bool FLACng::play(const char *filename, VFSFile &file)
-{
- Index<char> play_buffer;
- bool error = false;
-
- cinfo->fd = &file;
-
- if (read_metadata(decoder, cinfo) == false)
- {
- AUDERR("Could not prepare file for playing!\n");
- error = true;
- goto ERR_NO_CLOSE;
- }
-
- play_buffer.resize(BUFFER_SIZE_BYTE);
-
- set_stream_bitrate(cinfo->bitrate);
- open_audio(SAMPLE_FMT(cinfo->bits_per_sample), cinfo->sample_rate, cinfo->channels);
-
- while (FLAC__stream_decoder_get_state(decoder) != FLAC__STREAM_DECODER_END_OF_STREAM)
- {
- if (check_stop ())
- break;
-
- int seek_value = check_seek ();
- if (seek_value >= 0)
- FLAC__stream_decoder_seek_absolute (decoder, (int64_t)
- seek_value * cinfo->sample_rate / 1000);
-
- /* Try to decode a single frame of audio */
- if (FLAC__stream_decoder_process_single(decoder) == false)
- {
- AUDERR("Error while decoding!\n");
- error = true;
- break;
- }
-
- squeeze_audio(cinfo->output_buffer.begin(), play_buffer.begin(),
- cinfo->buffer_used, cinfo->bits_per_sample);
- write_audio(play_buffer.begin(), cinfo->buffer_used *
- SAMPLE_SIZE(cinfo->bits_per_sample));
-
- cinfo->reset();
- }
-
-ERR_NO_CLOSE:
- cinfo->reset();
-
- if (FLAC__stream_decoder_flush(decoder) == false)
- AUDERR("Could not flush decoder state!\n");
-
- return ! error;
-}
-
-const char FLACng::about =
- N_("Original code by\n"
- "Ralf Ertzinger <ralf@skytale.net>\n\n"
- "http://www.skytale.net/projects/bmp-flac2/");
-
-const char *const FLACng::exts = { "flac", "fla", nullptr };

audacious-plugins-3.6.2-gtk3.tar.bz2/src/flacng/seekable_stream_callbacks.cc Deleted

@@ -1,173 +0,0 @@
-/*
- * A FLAC decoder plugin for the Audacious Media Player
- * Copyright (C) 2005 Ralf Ertzinger
- * Copyright (C) 2010-2012 Michał Lipski
- *
- * 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 <string.h>
-#include <FLAC/all.h>
-
-#include <libaudcore/runtime.h>
-
-#include "flacng.h"
-
-FLAC__StreamDecoderReadStatus read_callback(const FLAC__StreamDecoder *decoder, FLAC__byte buffer, size_t *bytes, void *client_data)
-{
- callback_info* info = (callback_info*) client_data;
- int64_t read;
-
- if (*bytes == 0)
- return FLAC__STREAM_DECODER_READ_STATUS_END_OF_STREAM;
-
- read = info->fd->fread (buffer, 1, *bytes);
- *bytes = read;
-
- switch (read)
- {
- case -1:
- AUDERR("Error while reading from stream!\n");
- return FLAC__STREAM_DECODER_READ_STATUS_ABORT;
-
- case 0:
- AUDDBG("Stream reached EOF\n");
- return FLAC__STREAM_DECODER_READ_STATUS_END_OF_STREAM;
-
- default:
- return FLAC__STREAM_DECODER_READ_STATUS_CONTINUE;
- }
-}
-
-FLAC__StreamDecoderSeekStatus seek_callback(const FLAC__StreamDecoder *decoder, FLAC__uint64 offset, void *client_data)
-{
- callback_info *info = (callback_info*) client_data;
-
- if (info->fd->fseek (offset, VFS_SEEK_SET) != 0)
- {
- AUDERR("Could not seek to %ld!\n", (long)offset);
- return FLAC__STREAM_DECODER_SEEK_STATUS_ERROR;
- }
-
- return FLAC__STREAM_DECODER_SEEK_STATUS_OK;
-}
-
-FLAC__StreamDecoderTellStatus tell_callback(const FLAC__StreamDecoder *decoder, FLAC__uint64 *offset, void *client_data)
-{
- callback_info *info = (callback_info*) client_data;
-
- int64_t result = info->fd->ftell ();
- if (result < 0)
- {
- AUDERR("Could not tell current position!\n");
- return FLAC__STREAM_DECODER_TELL_STATUS_ERROR;
- }
-
- *offset = result;
-
- AUDDBG ("Current position: %d\n", (int) * offset);
-
- return FLAC__STREAM_DECODER_TELL_STATUS_OK;
-}
-
-FLAC__bool eof_callback(const FLAC__StreamDecoder *decoder, void *client_data)
-{
- callback_info *info = (callback_info*) client_data;
- return info->fd->feof ();
-}
-
-FLAC__StreamDecoderLengthStatus length_callback(const FLAC__StreamDecoder *decoder, FLAC__uint64 *length, void *client_data)
-{
- callback_info *info = (callback_info*) client_data;
-
- int64_t result = info->fd->fsize ();
- if (result < 0)
- {
- /*
- * Could not get the stream size. This is not necessarily an
- * error, maybe the stream has no fixed size (think streaming
- * audio)
- */
- AUDDBG("Stream length is unknown.\n");
- *length = 0;
- return FLAC__STREAM_DECODER_LENGTH_STATUS_UNSUPPORTED;
- }
-
- *length = result;
-
- AUDDBG ("Stream length is %d bytes\n", (int) * length);
-
- return FLAC__STREAM_DECODER_LENGTH_STATUS_OK;
-}
-
-FLAC__StreamDecoderWriteStatus write_callback(const FLAC__StreamDecoder *decoder, const FLAC__Frame *frame, const FLAC__int32 *const buffer, void *client_data)
-{
- callback_info *info = (callback_info*) client_data;
-
- if (info->channels != frame->header.channels ||
- info->sample_rate != frame->header.sample_rate)
- {
- return FLAC__STREAM_DECODER_WRITE_STATUS_ABORT;
- }
-
- if (!info->output_buffer.len())
- info->alloc();
-
- for (unsigned sample = 0; sample < frame->header.blocksize; sample++)
- {
- for (unsigned channel = 0; channel < frame->header.channels; channel++)
- {
- *(info->write_pointer++) = bufferchannelsample;
- info->buffer_used += 1;
- }
- }
-
- return FLAC__STREAM_DECODER_WRITE_STATUS_CONTINUE;
-}
-
-void error_callback(const FLAC__StreamDecoder *decoder, FLAC__StreamDecoderErrorStatus status, void *client_data)
-{
- AUDERR("FLAC decoder error callback was called: %d\n", status);
-}
-
-void metadata_callback(const FLAC__StreamDecoder *decoder, const FLAC__StreamMetadata *metadata, void *client_data)
-{
- callback_info *info = (callback_info*) client_data;
- int64_t size;
-
- if (metadata->type == FLAC__METADATA_TYPE_STREAMINFO)
- {
- info->total_samples = metadata->data.stream_info.total_samples;
- AUDDBG("total_total_samples=%ld\n", (long) metadata->data.stream_info.total_samples);
-
- info->bits_per_sample = metadata->data.stream_info.bits_per_sample;
- AUDDBG("bits_per_sample=%d\n", metadata->data.stream_info.bits_per_sample);
-
- info->channels = metadata->data.stream_info.channels;
- AUDDBG("channels=%d\n", metadata->data.stream_info.channels);
-
- info->sample_rate = metadata->data.stream_info.sample_rate;
- AUDDBG("sample_rate=%d\n", metadata->data.stream_info.sample_rate);
-
- size = info->fd->fsize ();
-
- if (size == -1 || info->total_samples == 0)
- info->bitrate = 0;
- else
- info->bitrate = 8 * size * (int64_t) info->sample_rate / info->total_samples;
-
- AUDDBG("bitrate=%d\n", info->bitrate);
- }
-}

audacious-plugins-3.6.2-gtk3.tar.bz2/src/flacng/tools.cc Deleted

@@ -1,52 +0,0 @@
-/*
- * A FLAC decoder plugin for the Audacious Media Player
- * Copyright (C) 2005 Ralf Ertzinger
- * Copyright (C) 2010 John Lindgren
- * Copyright (C) 2010-2012 Michał Lipski
- *
- * 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 <string.h>
-
-#include <libaudcore/runtime.h>
-
-#include "flacng.h"
-
-bool read_metadata(FLAC__StreamDecoder *decoder, callback_info *info)
-{
- FLAC__StreamDecoderState ret;
-
- info->reset();
-
- /* Reset the decoder */
- if (FLAC__stream_decoder_reset(decoder) == false)
- {
- AUDERR("Could not reset the decoder!\n");
- return false;
- }
-
- /* Try to decode the metadata */
- if (FLAC__stream_decoder_process_until_end_of_metadata(decoder) == false)
- {
- ret = FLAC__stream_decoder_get_state(decoder);
- AUDDBG("Could not read the metadata: %s(%d)!\n",
- FLAC__StreamDecoderStateStringret, ret);
- info->reset();
- return false;
- }
-
- return true;
-}

audacious-plugins-3.6.2-gtk3.tar.bz2/src/gl-spectrum Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/gl-spectrum-qt Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/gl-spectrum-qt/Makefile Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/gl-spectrum-qt/gl-spectrum.cc Deleted

@@ -1,292 +0,0 @@
-/*
- * OpenGL Spectrum Analyzer for Audacious
- * Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini
- * Copyright 2014 William Pitcock
- *
- * 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 <libaudcore/i18n.h>
-#include <libaudcore/plugin.h>
-
-#include <QGLWidget>
-#include <QGLFunctions>
-
-#define NUM_BANDS 32
-#define DB_RANGE 40
-
-#define BAR_SPACING (3.2f / NUM_BANDS)
-#define BAR_WIDTH (0.8f * BAR_SPACING)
-
-static const char gl_about =
- N_("OpenGL Spectrum Analyzer for Audacious\n"
- "Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
- "Copyright 2014 William Pitcock\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+");
-
-class GLSpectrumQt : public VisPlugin
-{
-public:
- static constexpr PluginInfo info = {
- N_("OpenGL Spectrum Analyzer (Qt)"),
- PACKAGE,
- gl_about
- };
-
- constexpr GLSpectrumQt () : VisPlugin (info, Visualizer::Freq) {}
-
- bool init ();
-
- void * get_qt_widget ();
-
- void clear ();
- void render_freq (const float * freq);
-};
-
-EXPORT GLSpectrumQt aud_plugin_instance;
-
-static float logscaleNUM_BANDS + 1;
-static float colorsNUM_BANDSNUM_BANDS3;
-
-static int s_pos = 0;
-static float s_angle = 25, s_anglespeed = 0.05f;
-static float s_barsNUM_BANDSNUM_BANDS;
-
-class GLSpectrumWidget : public QGLWidget, protected QGLFunctions
-{
-public:
- GLSpectrumWidget (QWidget *parent = nullptr);
- ~GLSpectrumWidget ();
-
-private:
- void paintGL ();
- void resizeGL (int w, int h);
-};
-
-GLSpectrumWidget * s_widget = nullptr;
-
-bool GLSpectrumQt::init ()
-{
- for (int i = 0; i <= NUM_BANDS; i ++)
- logscalei = 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);
-
- colorsxy0 = (1 - xf) * (1 - yf);
- colorsxy1 = xf;
- colorsxy2 = 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 logscalei and logscalei + 1,
- including fractional parts */
- int a = ceilf (logscalei);
- int b = floorf (logscalei + 1);
- float sum = 0;
-
- if (b < a)
- sum += freqb * (logscalei + 1 - logscalei);
- else
- {
- if (a > 0)
- sum += freqa - 1 * (a - logscalei);
- for (; a < b; a ++)
- sum += freqa;
- if (b < 256)
- sum += freqb * (logscalei + 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;
-
- graphi = aud::clamp (val, 0.0f, 1.0f);
- }
-}
-
-void GLSpectrumQt::render_freq (const float * freq)
-{
- make_log_graph (freq, s_barss_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)
- s_widget->updateGL ();
-}
-
-void GLSpectrumQt::clear ()
-{
-#ifdef XXX_NOTYET
- memset (s_bars, 0, sizeof s_bars);
-
- if (s_widget)
- s_widget->updateGL ();
-#endif
-}
-
-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 ()
-{
- 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_BANDSj * 1.6,
- colorsij0, colorsij1, colorsij2);
- }
- }
-
- glPolygonMode (GL_FRONT_AND_BACK, GL_FILL);
- glPopMatrix ();
-}
-
-GLSpectrumWidget::GLSpectrumWidget (QWidget * parent) : QGLWidget (parent)
-{
- setObjectName ("GLSpectrumWidget");
-}
-
-GLSpectrumWidget::~GLSpectrumWidget ()
-{
- s_widget = nullptr;
-}
-
-void GLSpectrumWidget::paintGL ()
-{
- 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);
-}
-
-void GLSpectrumWidget::resizeGL (int w, int h)
-{
- glViewport (0, 0, w, h);
-}
-
-void * GLSpectrumQt::get_qt_widget ()
-{
- if (s_widget)
- return s_widget;
-
- s_widget = new GLSpectrumWidget;
- return s_widget;
-}

audacious-plugins-3.6.2-gtk3.tar.bz2/src/gl-spectrum/gl-spectrum.cc Deleted

@@ -1,427 +0,0 @@
-/*
- * OpenGL Spectrum Analyzer for Audacious
- * Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini
- *
- * 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 <libaudcore/i18n.h>
-#include <libaudcore/plugin.h>
-
-#include <gdk/gdk.h>
-#include <gtk/gtk.h>
-
-#include <GL/gl.h>
-
-#ifdef GDK_WINDOWING_X11
-#include <GL/glx.h>
-#include <gdk/gdkx.h>
-#endif
-
-#ifdef GDK_WINDOWING_WIN32
-#include <gdk/gdkwin32.h>
-#endif
-
-#define NUM_BANDS 32
-#define DB_RANGE 40
-
-#define BAR_SPACING (3.2f / NUM_BANDS)
-#define BAR_WIDTH (0.8f * BAR_SPACING)
-
-static const char gl_about =
- N_("OpenGL Spectrum Analyzer for Audacious\n"
- "Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\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+");
-
-class GLSpectrum : public VisPlugin
-{
-public:
- static constexpr PluginInfo info = {
- N_("OpenGL Spectrum Analyzer"),
- PACKAGE,
- gl_about
- };
-
- constexpr GLSpectrum () : VisPlugin (info, Visualizer::Freq) {}
-
- bool init ();
-
- void * get_gtk_widget ();
-
- void clear ();
- void render_freq (const float * freq);
-};
-
-EXPORT GLSpectrum aud_plugin_instance;
-
-static float logscaleNUM_BANDS + 1;
-static float colorsNUM_BANDSNUM_BANDS3;
-
-#ifdef GDK_WINDOWING_X11
-static Display * s_display;
-static Window s_xwindow;
-static GLXContext s_context;
-#endif
-
-#ifdef GDK_WINDOWING_WIN32
-static HWND s_hwnd;
-static HDC s_hdc;
-static HGLRC s_glrc;
-#endif
-
-static GtkWidget * s_widget = nullptr;
-
-static int s_pos = 0;
-static float s_angle = 25, s_anglespeed = 0.05f;
-static float s_barsNUM_BANDSNUM_BANDS;
-
-bool GLSpectrum::init ()
-{
- for (int i = 0; i <= NUM_BANDS; i ++)
- logscalei = 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);
-
- colorsxy0 = (1 - xf) * (1 - yf);
- colorsxy1 = xf;
- colorsxy2 = 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 logscalei and logscalei + 1,
- including fractional parts */
- int a = ceilf (logscalei);
- int b = floorf (logscalei + 1);
- float sum = 0;
-
- if (b < a)
- sum += freqb * (logscalei + 1 - logscalei);
- else
- {
- if (a > 0)
- sum += freqa - 1 * (a - logscalei);
- for (; a < b; a ++)
- sum += freqa;
- if (b < 256)
- sum += freqb * (logscalei + 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;
-
- graphi = aud::clamp (val, 0.0f, 1.0f);
- }
-}
-
-void GLSpectrum::render_freq (const float * freq)
-{
- make_log_graph (freq, s_barss_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);
-}
-
-void GLSpectrum::clear ()
-{
- 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 ()
-{
- 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_BANDSj * 1.6,
- colorsij0, colorsij1, colorsij2);
- }
- }
-
- glPolygonMode (GL_FRONT_AND_BACK, GL_FILL);
- glPopMatrix ();
-}
-
-static gboolean draw_cb (GtkWidget * widget, cairo_t * cr)
-{
-#ifdef GDK_WINDOWING_X11
- if (! s_context)
- return false;
-#endif
-
-#ifdef GDK_WINDOWING_WIN32
- if (! s_glrc)
- return false;
-#endif
-
- 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);
-
-#ifdef GDK_WINDOWING_X11
- glXSwapBuffers (s_display, s_xwindow);
-#endif
-
-#ifdef GDK_WINDOWING_WIN32
- SwapBuffers (s_hdc);
-#endif
-
- return true;
-}
-
-static void widget_realized ()
-{
- GdkWindow * window = gtk_widget_get_window (s_widget);
-
-#ifdef GDK_WINDOWING_X11
- GdkScreen * screen = gdk_window_get_screen (window);
- int nscreen = GDK_SCREEN_XNUMBER (screen);
-
- s_display = GDK_SCREEN_XDISPLAY (screen);
- s_xwindow = GDK_WINDOW_XID (window);
-
- /* 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 (s_display, nscreen, attribs);
- g_return_if_fail (xvinfo);
-
- /* Fix up visual/colormap */
- GdkVisual * visual = gdk_x11_screen_lookup_visual (screen, xvinfo->visualid);
- g_return_if_fail (visual);
-
- gtk_widget_set_visual (s_widget, visual);
-
- s_context = glXCreateContext (s_display, xvinfo, 0, true);
- g_return_if_fail (s_context);
-
- XFree (xvinfo);
-
- glXMakeCurrent (s_display, s_xwindow, s_context);
-#endif
-
-#ifdef GDK_WINDOWING_WIN32
- s_hwnd = (HWND) GDK_WINDOW_HWND (window);
- s_hdc = GetDC (s_hwnd);
-
- PIXELFORMATDESCRIPTOR desc = {
- sizeof (PIXELFORMATDESCRIPTOR),
- 1, // version number (?)
- PFD_DRAW_TO_WINDOW | // format must support window
- PFD_SUPPORT_OPENGL | // format must support OpenGL
- PFD_DOUBLEBUFFER, // must support double buffering
- PFD_TYPE_RGBA, // request an RGBA format
- 24, // select a 8:8:8 bit color depth
- 0, 0, 0, 0, 0, 0, // color bits ignored (?)
- 0, // no alpha buffer
- 0, // shift bit ignored (?)
- 0, // no accumulation buffer
- 0, 0, 0, 0, // accumulation bits ignored (?)
- 16, // 16-bit z-buffer (depth buffer)
- 0, // no stencil buffer
- 0, // no auxiliary buffer (?)
- PFD_MAIN_PLANE, // main drawing layer
- 0, // reserved (?)
- 0, 0, 0 // layer masks ignored (?)
- };
-
- int format = ChoosePixelFormat (s_hdc, & desc);
- g_return_if_fail (format != 0);
-
- SetPixelFormat (s_hdc, format, & desc);
-
- s_glrc = wglCreateContext (s_hdc);
- g_return_if_fail (s_glrc);
-
- wglMakeCurrent (s_hdc, s_glrc);
-#endif
-}
-
-static void widget_destroyed ()
-{
- s_widget = nullptr;
-
-#ifdef GDK_WINDOWING_X11
- if (s_context)
- {
- glXMakeCurrent (s_display, None, nullptr);
- glXDestroyContext (s_display, s_context);
- s_context = nullptr;
- }
-
- s_display = nullptr;
-#endif
-
-#ifdef GDK_WINDOWING_WIN32
- if (s_glrc)
- {
- wglMakeCurrent (s_hdc, nullptr);
- wglDeleteContext (s_glrc);
- s_glrc = nullptr;
- }
-
- if (s_hdc)
- {
- ReleaseDC (s_hwnd, s_hdc);
- s_hdc = nullptr;
- }
-
- s_hwnd = nullptr;
-#endif
-}
-
-void * GLSpectrum::get_gtk_widget ()
-{
- if (s_widget)
- return s_widget;
-
- s_widget = gtk_drawing_area_new ();
-
- g_signal_connect (s_widget, "draw", (GCallback) draw_cb, nullptr);
- g_signal_connect (s_widget, "realize", (GCallback) widget_realized, nullptr);
- g_signal_connect (s_widget, "destroy", (GCallback) widget_destroyed, nullptr);
-
- /* Disable GTK double buffering */
- gtk_widget_set_double_buffered (s_widget, false);
-
- return s_widget;
-}

audacious-plugins-3.6.2-gtk3.tar.bz2/src/gnomeshortcuts Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/gnomeshortcuts/Makefile Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/gnomeshortcuts/gnomeshortcuts.cc Deleted

@@ -1,289 +0,0 @@
-/*
- * This file is part of audacious-gnome-shortcut plugin for audacious
- *
- * Copyright (c) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>
- * Name: plugin.c
- * Description: plugin.c
- *
- * audacious-gnome-shortcut 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.
- *
- * audacious-gnome-shortcut 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 audacious-gnome-shortcut; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-
-#include <string.h>
-#include <dbus/dbus.h>
-#include <dbus/dbus-glib-bindings.h>
-#include <glib-object.h>
-
-#include <libaudcore/drct.h>
-#include <libaudcore/plugin.h>
-#include <libaudcore/i18n.h>
-
-class GNOMEShortcuts : public GeneralPlugin
-{
-public:
- static const char about;
-
- static constexpr PluginInfo info = {
- N_("GNOME Shortcuts"),
- PACKAGE,
- about
- };
-
- constexpr GNOMEShortcuts () : GeneralPlugin (info, false) {}
-
- bool init ();
- void cleanup ();
-};
-
-EXPORT GNOMEShortcuts aud_plugin_instance;
-
-static DBusGProxy *media_player_keys_proxy = nullptr;
-
-const char GNOMEShortcuts::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>");
-
-#define g_marshal_value_peek_string(v) (char*) g_value_get_string (v)
-
-
-static void
-hotkey_marshal_VOID__STRING_STRING (GClosure *closure,
- GValue *return_value,
- unsigned n_param_values,
- const GValue *param_values,
- void * invocation_hint,
- void * marshal_data)
-{
- typedef void (*GMarshalFunc_VOID__STRING_STRING) (void * data1,
- void * arg_1,
- void * arg_2);
- GMarshalFunc_VOID__STRING_STRING callback;
- GCClosure *cc = (GCClosure*) closure;
- void * 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 char *application, const char *key)
-{
- if (strcmp ("Audacious", application) == 0) {
- int current_volume /* , old_volume */ ;
- static int volume_static = 0;
- bool mute;
-
- /* get current volume */
- current_volume = aud_drct_get_volume_main ();
- /* 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 GNOMEShortcuts::cleanup ()
-{
- GError *error = nullptr;
- if (media_player_keys_proxy == nullptr) return;
-
- dbus_g_proxy_disconnect_signal (media_player_keys_proxy, "MediaPlayerKeyPressed",
- G_CALLBACK (on_media_player_key_pressed), nullptr);
-
- dbus_g_proxy_call (media_player_keys_proxy,
- "ReleaseMediaPlayerKeys", &error,
- G_TYPE_STRING, "Audacious",
- G_TYPE_INVALID, G_TYPE_INVALID);
- if (error != nullptr) {
- 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 = nullptr;
-}
-
-bool GNOMEShortcuts::init ()
-{
- DBusGConnection *bus;
- GError *error = nullptr;
- dbus_g_thread_init();
-
- bus = dbus_g_bus_get (DBUS_BUS_SESSION, &error);
- if ((bus == nullptr) && error) {
- g_warning ("Error connecting to DBus: %s", error->message);
- g_error_free (error);
- return false;
- } 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 == nullptr)
- return false;
-
- 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 != nullptr) {
- g_error_free (error);
- error = nullptr;
- g_object_unref(media_player_keys_proxy);
- media_player_keys_proxy = nullptr;
- 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 == nullptr)
- return false;
-
- 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 != nullptr) {
- 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 = nullptr;
- return false;
- }
- }
-
- 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), nullptr, nullptr);
-
- return true;
- }
-}

audacious-plugins-3.6.2-gtk3.tar.bz2/src/gtkui/playlist_util.cc Deleted

@@ -1,150 +0,0 @@
-/*
- * playlist_util.c
- * Copyright 2010-2011 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:
- *
- * 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 <libaudcore/audstrings.h>
-#include <libaudcore/playlist.h>
-#include <libaudgui/libaudgui.h>
-#include <libaudgui/list.h>
-
-#include "playlist_util.h"
-#include "ui_playlist_notebook.h"
-
-GtkWidget * playlist_get_treeview (int playlist)
-{
- GtkWidget * page = gtk_notebook_get_nth_page (UI_PLAYLIST_NOTEBOOK, playlist);
-
- if (!page)
- return nullptr;
-
- return (GtkWidget *) g_object_get_data ((GObject *) page, "treeview");
-}
-
-int playlist_count_selected_in_range (int list, int top, int length)
-{
- int selected = 0;
-
- for (int count = 0; count < length; count ++)
- {
- if (aud_playlist_entry_get_selected (list, top + count))
- selected ++;
- }
-
- return selected;
-}
-
-void playlist_song_info ()
-{
- int list = aud_playlist_get_active ();
- int focus = aud_playlist_get_focus (list);
-
- if (focus < 0)
- return;
-
- audgui_infowin_show (list, focus);
-}
-
-void playlist_open_folder ()
-{
- int list = aud_playlist_get_active ();
- int focus = aud_playlist_get_focus (list);
-
- if (focus < 0)
- return;
-
- StringBuf filename = uri_to_filename (aud_playlist_entry_get_filename (list, focus));
- if (! filename)
- return;
-
- char * dirname = g_path_get_dirname (filename);
- StringBuf uri = filename_to_uri (dirname);
- g_free (dirname);
-
- GdkScreen * screen = gdk_screen_get_default ();
- gtk_show_uri (screen, uri, GDK_CURRENT_TIME, nullptr);
-}
-
-void playlist_queue_toggle ()
-{
- int list = aud_playlist_get_active ();
- int focus = aud_playlist_get_focus (list);
-
- if (focus < 0)
- return;
-
- /* make sure focused row is selected */
- if (! aud_playlist_entry_get_selected (list, focus))
- {
- aud_playlist_select_all (list, false);
- aud_playlist_entry_set_selected (list, focus, true);
- }
-
- int at = aud_playlist_queue_find_entry (list, focus);
-
- if (at < 0)
- aud_playlist_queue_insert_selected (list, -1);
- else
- aud_playlist_queue_delete_selected (list);
-}
-
-void playlist_delete_selected ()
-{
- int list = aud_playlist_get_active ();
- aud_playlist_delete_selected (list);
- aud_playlist_entry_set_selected (list, aud_playlist_get_focus (list), true);
-}
-
-void playlist_copy ()
-{
- Index<char> text = audgui_urilist_create_from_selected (aud_playlist_get_active ());
- if (! text.len ())
- return;
-
- gtk_clipboard_set_text (gtk_clipboard_get (GDK_SELECTION_CLIPBOARD), text.begin (), text.len ());
-}
-
-void playlist_cut ()
-{
- playlist_copy ();
- playlist_delete_selected ();
-}
-
-void playlist_paste ()
-{
- char * text = gtk_clipboard_wait_for_text (gtk_clipboard_get
- (GDK_SELECTION_CLIPBOARD));
- if (! text)
- return;
-
- int list = aud_playlist_get_active ();
- audgui_urilist_insert (list, aud_playlist_get_focus (list), text);
- g_free (text);
-}
-
-void playlist_shift (int offset)
-{
- int list = aud_playlist_get_active ();
- int focus = aud_playlist_get_focus (list);
-
- if (focus < 0 || ! aud_playlist_entry_get_selected (list, focus))
- return;
-
- aud_playlist_shift (list, focus, offset);
-}

audacious-plugins-3.6.2-gtk3.tar.bz2/src/gtkui/playlist_util.h Deleted

@@ -1,35 +0,0 @@
-/*
- * playlist_util.h
- * Copyright 2010-2011 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:
- *
- * 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.
- */
-
-#ifndef __PLAYLISTUTIL_H__
-#define __PLAYLISTUTIL_H__
-
-GtkWidget * playlist_get_treeview (int playlist);
-
-int playlist_count_selected_in_range (int list, int top, int length);
-void playlist_song_info ();
-void playlist_open_folder ();
-void playlist_queue_toggle ();
-void playlist_delete_selected ();
-void playlist_copy ();
-void playlist_cut ();
-void playlist_paste ();
-void playlist_shift (int offset);
-
-#endif

audacious-plugins-3.6.2-gtk3.tar.bz2/src/jack-ng Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/jack-ng/jack-ng.cc Deleted

@@ -1,402 +0,0 @@
-/*
- * JACK Output Plugin for Audacious
- * Copyright 2014 John Lindgren
- *
- * Based on the SDL Output Plugin and the previous JACK Output Plugin.
- *
- * 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 <libaudcore/audstrings.h>
-#include <libaudcore/i18n.h>
-#include <libaudcore/interface.h>
-#include <libaudcore/plugin.h>
-#include <libaudcore/preferences.h>
-#include <libaudcore/ringbuf.h>
-#include <libaudcore/runtime.h>
-
-#include <algorithm>
-
-#include <assert.h>
-#include <pthread.h>
-#include <sys/time.h>
-
-#include <jack/jack.h>
-
-static_assert(std::is_same<jack_default_audio_sample_t, float>::value,
- "JACK must be compiled to use float samples");
-
-class JACKOutput : public OutputPlugin
-{
-public:
- static const char * const defaults;
- static const PreferencesWidget widgets;
- static const PluginPreferences prefs;
-
- static constexpr PluginInfo info = {
- N_("JACK Output"),
- PACKAGE,
- nullptr,
- & prefs
- };
-
- constexpr JACKOutput (RingBuf<float> & buffer) :
- OutputPlugin (info, 0),
- m_buffer (buffer) {}
-
- bool init ();
-
- StereoVolume get_volume ();
- void set_volume (StereoVolume v);
-
- bool open_audio (int format, int rate, int channels);
- void close_audio ();
-
- void period_wait ();
- int write_audio (const void * data, int size);
- void drain ();
-
- int get_delay ();
-
- void pause (bool pause);
- void flush ();
-
-private:
- bool connect_ports (int channels);
- void generate (jack_nframes_t frames);
-
- static void error_cb (const char * error)
- { AUDWARN ("%s\n", error); }
- static int generate_cb (jack_nframes_t frames, void * obj)
- { ((JACKOutput *) obj)->generate (frames); return 0; }
-
- int m_rate = 0, m_channels = 0;
- bool m_paused = false, m_prebuffer = false;
-
- int m_last_write_frames = 0;
- timeval m_last_write_time = timeval ();
- bool m_rate_mismatch = false;
-
- RingBuf<float> & m_buffer;
-
- jack_client_t * m_client = nullptr;
- jack_port_t * m_portsAUD_MAX_CHANNELS = {};
-
- pthread_mutex_t m_mutex = PTHREAD_MUTEX_INITIALIZER;
- pthread_cond_t m_cond = PTHREAD_COND_INITIALIZER;
-};
-
-// must be separate in order for JACKOutput() to be constexpr
-static RingBuf<float> s_buffer;
-
-EXPORT JACKOutput aud_plugin_instance (s_buffer);
-
-const char * const JACKOutput::defaults = {
- "auto_connect", "TRUE",
- "volume_left", "100",
- "volume_right", "100",
- nullptr
-};
-
-const PreferencesWidget JACKOutput::widgets = {
- WidgetCheck (N_("Automatically connect to output ports"),
- WidgetBool ("jack", "auto_connect"))
-};
-
-const PluginPreferences JACKOutput::prefs = {{widgets}};
-
-bool JACKOutput::init ()
-{
- aud_config_set_defaults ("jack", defaults);
- return true;
-}
-
-void JACKOutput::set_volume (StereoVolume v)
-{
- aud_set_int ("jack", "volume_left", v.left);
- aud_set_int ("jack", "volume_right", v.right);
-}
-
-StereoVolume JACKOutput::get_volume ()
-{
- return {aud_get_int ("jack", "volume_left"), aud_get_int ("jack", "volume_right")};
-}
-
-bool JACKOutput::connect_ports (int channels)
-{
- bool success = false;
- const char * * ports = nullptr;
- int count = 0;
-
- if (! (ports = jack_get_ports (m_client, nullptr, nullptr,
- JackPortIsPhysical | JackPortIsInput)))
- {
- AUDERR ("jack_get_ports() failed\n");
- goto fail;
- }
-
- while (portscount)
- count ++;
-
- if (count < channels)
- {
- aud_ui_show_error (str_printf (_("Only %d JACK output ports were "
- "found but %d are required."), count, channels));
- goto fail;
- }
-
- for (int i = 0; i < channels; i ++)
- {
- if (jack_connect (m_client, jack_port_name (m_portsi), portsi) != 0)
- {
- aud_ui_show_error (str_printf (_("Failed to connect to JACK port %s."), portsi));
- goto fail;
- }
- }
-
- success = true;
-
-fail:
- if (ports)
- jack_free (ports);
-
- return success;
-}
-
-bool JACKOutput::open_audio (int format, int rate, int channels)
-{
- int buffer_time;
-
- if (format != FMT_FLOAT)
- {
- aud_ui_show_error (_("JACK supports only floating-point audio. You "
- "must change the output bit depth to floating-point in Audacious "
- "settings."));
- return false;
- }
-
- assert (rate > 0 && channels > 0 && channels < AUD_MAX_CHANNELS);
- assert (! m_client);
-
- jack_set_error_function (error_cb);
-
- if (! (m_client = jack_client_open ("audacious", JackNoStartServer, nullptr)))
- {
- aud_ui_show_error (_("Failed to connect to the JACK server; is it running?"));
- goto fail;
- }
-
- for (int i = 0; i < channels; i ++)
- {
- StringBuf name = str_printf ("out_%d", i);
- if (! (m_portsi = jack_port_register (m_client, name,
- JACK_DEFAULT_AUDIO_TYPE, JackPortIsOutput, 0)))
- {
- AUDERR ("jack_port_register() failed\n");
- goto fail;
- }
- }
-
- buffer_time = aud_get_int (nullptr, "output_buffer_size");
- m_buffer.alloc (aud::rescale (buffer_time, 1000, rate) * channels);
-
- m_rate = rate;
- m_channels = channels;
- m_paused = false;
- m_prebuffer = true;
-
- m_last_write_frames = 0;
- m_last_write_time = timeval ();
- m_rate_mismatch = false;
-
- jack_set_process_callback (m_client, generate_cb, this);
-
- if (jack_activate (m_client) != 0)
- {
- AUDERR ("jack_activate() failed\n");
- goto fail;
- }
-
- if (aud_get_bool ("jack", "auto_connect"))
- {
- if (! connect_ports (channels))
- goto fail;
- }
-
- return true;
-
-fail:
- close_audio ();
- return false;
-}
-
-void JACKOutput::close_audio ()
-{
- if (m_client)
- jack_client_close (m_client);
-
- m_buffer.destroy ();
-
- std::fill (m_ports, std::end (m_ports), nullptr);
- m_client = nullptr;
-}
-
-void JACKOutput::generate (jack_nframes_t frames)
-{
- pthread_mutex_lock (& m_mutex);
-
- m_last_write_frames = 0;
- gettimeofday (& m_last_write_time, nullptr);
-
- float * outAUD_MAX_CHANNELS;
- for (int i = 0; i < m_channels; i ++)
- outi = (float *) jack_port_get_buffer (m_portsi, frames);
-
- int jack_rate = jack_get_sample_rate (m_client);
-
- if (jack_rate != m_rate)
- {
- if (! m_rate_mismatch)
- {
- aud_ui_show_error (str_printf (_("The JACK server requires a "
- "sample rate of %d Hz, but Audacious is playing at %d Hz. Please "
- "use the Sample Rate Converter effect to correct the mismatch."),
- jack_rate, m_rate));
- m_rate_mismatch = true;
- }
-
- goto silence;
- }
-
- m_rate_mismatch = false;
-
- if (m_paused || m_prebuffer)
- goto silence;
-
- while (frames && m_buffer.len ())
- {
- int linear_samples = m_buffer.linear ();
- assert (linear_samples % m_channels == 0);
-
- int frames_to_copy = aud::min (frames, (jack_nframes_t) linear_samples / m_channels);
-
- audio_amplify (& m_buffer0, m_channels, frames_to_copy, get_volume ());
- audio_deinterlace (& m_buffer0, FMT_FLOAT, m_channels,
- (void * const *) out, frames_to_copy);
-
- m_last_write_frames += frames_to_copy;
- m_buffer.discard (frames_to_copy * m_channels);
-
- for (int i = 0; i < m_channels; i ++)
- outi += frames_to_copy;
-
- frames -= frames_to_copy;
- }
-
-silence:
- for (int i = 0; i < m_channels; i ++)
- std::fill (outi, outi + frames, 0.0);
-
- pthread_cond_broadcast (& m_cond);
- pthread_mutex_unlock (& m_mutex);
-}
-
-void JACKOutput::period_wait ()
-{
- pthread_mutex_lock (& m_mutex);
-
- while (! m_buffer.space ())
- {
- m_prebuffer = false;
- pthread_cond_wait (& m_cond, & m_mutex);
- }
-
- pthread_mutex_unlock (& m_mutex);
-}
-
-int JACKOutput::write_audio (const void * data, int size)
-{
- pthread_mutex_lock (& m_mutex);
-
- int samples = size / sizeof (float);
- assert (samples % m_channels == 0);
-
- samples = aud::min (samples, m_buffer.space ());
-
- m_buffer.copy_in ((const float *) data, samples);
-
- if (m_buffer.len () >= m_buffer.size () / 4)
- m_prebuffer = false;
-
- pthread_mutex_unlock (& m_mutex);
- return samples * sizeof (float);
-}
-
-void JACKOutput::drain ()
-{
- pthread_mutex_lock (& m_mutex);
-
- m_prebuffer = false;
-
- while (m_buffer.len () || m_last_write_frames)
- pthread_cond_wait (& m_cond, & m_mutex);
-
- pthread_mutex_unlock (& m_mutex);
-}
-
-int JACKOutput::get_delay ()
-{
- auto timediff = (const timeval & a, const timeval & b) -> int64_t
- { return 1000 * (int64_t) (b.tv_sec - a.tv_sec) + (b.tv_usec - a.tv_usec) / 1000; };
-
- pthread_mutex_lock (& m_mutex);
-
- int delay = aud::rescale (m_buffer.len (), m_channels * m_rate, 1000);
-
- if (m_last_write_frames)
- {
- timeval now;
- gettimeofday (& now, nullptr);
-
- int written = aud::rescale (m_last_write_frames, m_rate, 1000);
- delay += aud::max (written - timediff (m_last_write_time, now), (int64_t) 0);
- }
-
- pthread_mutex_unlock (& m_mutex);
- return delay;
-}
-
-void JACKOutput::pause (bool pause)
-{
- pthread_mutex_lock (& m_mutex);
- m_paused = pause;
- pthread_cond_broadcast (& m_cond);
- pthread_mutex_unlock (& m_mutex);
-}
-
-void JACKOutput::flush ()
-{
- pthread_mutex_lock (& m_mutex);
-
- m_buffer.discard ();
-
- m_prebuffer = true;
-
- m_last_write_frames = 0;
- m_last_write_time = timeval ();
-
- pthread_cond_broadcast (& m_cond);
- pthread_mutex_unlock (& m_mutex);
-}

audacious-plugins-3.6.2-gtk3.tar.bz2/src/lyricwiki Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/lyricwiki-qt Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/lyricwiki-qt/Makefile Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/lyricwiki-qt/lyricwiki.cc Deleted

@@ -1,354 +0,0 @@
-/*
- * Copyright (c) 2010, 2014 William Pitcock <nenolod@dereferenced.org>
- *
- * 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.
- *
- * 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.
- */
-
-#include <glib.h>
-#include <string.h>
-
-#include <QTextCursor>
-#include <QTextDocument>
-#include <QTextEdit>
-
-#include <libxml/parser.h>
-#include <libxml/tree.h>
-#include <libxml/HTMLparser.h>
-#include <libxml/xpath.h>
-
-#include <libaudcore/drct.h>
-#include <libaudcore/i18n.h>
-#include <libaudcore/plugin.h>
-#include <libaudcore/plugins.h>
-#include <libaudcore/audstrings.h>
-#include <libaudcore/hook.h>
-#include <libaudcore/vfs_async.h>
-#include <libaudcore/runtime.h>
-
-#include <libaudqt/libaudqt.h>
-
-typedef struct {
- String filename; /* of song file */
- String title, artist;
- String uri; /* URI we are trying to retrieve */
-} LyricsState;
-
-static LyricsState state;
-
-class LyricWikiQt : public GeneralPlugin {
-public:
- static constexpr PluginInfo info = {
- N_("LyricWiki Plugin (Qt)"),
- PACKAGE
- };
-
- constexpr LyricWikiQt() : GeneralPlugin (info, false) {}
- void * get_qt_widget ();
-};
-
-EXPORT LyricWikiQt aud_plugin_instance;
-
-/*
- * Suppress libxml warnings, because lyricwiki does not generate anything near
- * valid HTML.
- */
-static void libxml_error_handler(void *ctx, const char *msg, ...)
-{
-}
-
-/* g_free() returned text */
-static char *scrape_lyrics_from_lyricwiki_edit_page(const char *buf, int64_t len)
-{
- xmlDocPtr doc;
- char *ret = nullptr;
-
- /*
- * 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.
- *
- * unfortunately, libxml is anti-social and provides us with no way to get
- * the previous error functor, so we just have to set it back to default after
- * parsing and hope for the best.
- */
- xmlSetGenericErrorFunc(nullptr, libxml_error_handler);
- doc = htmlReadMemory(buf, (int) len, nullptr, "utf-8", (HTML_PARSE_RECOVER | HTML_PARSE_NONET));
- xmlSetGenericErrorFunc(nullptr, nullptr);
-
- if (doc != nullptr)
- {
- xmlXPathContextPtr xpath_ctx = nullptr;
- xmlXPathObjectPtr xpath_obj = nullptr;
- xmlNodePtr node = nullptr;
-
- xpath_ctx = xmlXPathNewContext(doc);
- if (xpath_ctx == nullptr)
- goto give_up;
-
- xpath_obj = xmlXPathEvalExpression((xmlChar *) "//*@id=\"wpTextbox1\"", xpath_ctx);
- if (xpath_obj == nullptr)
- goto give_up;
-
- if (!xpath_obj->nodesetval->nodeMax)
- goto give_up;
-
- node = xpath_obj->nodesetval->nodeTab0;
-give_up:
- if (xpath_obj != nullptr)
- xmlXPathFreeObject(xpath_obj);
-
- if (xpath_ctx != nullptr)
- xmlXPathFreeContext(xpath_ctx);
-
- if (node != nullptr)
- {
- xmlChar *lyric = xmlNodeGetContent(node);
-
- if (lyric != nullptr)
- {
- GMatchInfo *match_info;
- GRegex *reg;
-
- reg = g_regex_new
- ("<(lyrics?)>:space:*(.*?):space:*</\\1>",
- (GRegexCompileFlags) (G_REGEX_MULTILINE | G_REGEX_DOTALL),
- (GRegexMatchFlags) 0, nullptr);
- g_regex_match(reg, (char *) lyric, G_REGEX_MATCH_NEWLINE_ANY, &match_info);
-
- ret = g_match_info_fetch(match_info, 2);
- if (!g_utf8_collate(ret, ""))
- {
- g_free(ret);
- ret = g_strdup(_("No lyrics available"));
- }
-
- g_regex_unref(reg);
- }
-
- xmlFree(lyric);
- }
-
- xmlFreeDoc(doc);
- }
-
- return ret;
-}
-
-static String scrape_uri_from_lyricwiki_search_result(const char *buf, int64_t len)
-{
- xmlDocPtr doc;
- String uri;
-
- /*
- * 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>", (GRegexCompileFlags)
- (G_REGEX_MULTILINE | G_REGEX_DOTALL | G_REGEX_UNGREEDY),
- (GRegexMatchFlags) 0, nullptr);
- char *newbuf = g_regex_replace_literal(reg, buf, len, 0, "", G_REGEX_MATCH_NEWLINE_ANY, nullptr);
- 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.
- *
- * unfortunately, libxml is anti-social and provides us with no way to get
- * the previous error functor, so we just have to set it back to default after
- * parsing and hope for the best.
- */
- xmlSetGenericErrorFunc(nullptr, libxml_error_handler);
- doc = xmlParseMemory(newbuf, strlen(newbuf));
- xmlSetGenericErrorFunc(nullptr, nullptr);
-
- if (doc != nullptr)
- {
- xmlNodePtr root, cur;
-
- root = xmlDocGetRootElement(doc);
-
- for (cur = root->xmlChildrenNode; cur; cur = cur->next)
- {
- if (xmlStrEqual(cur->name, (xmlChar *) "url"))
- {
- xmlChar *lyric;
- char *basename;
-
- lyric = xmlNodeGetContent(cur);
- basename = g_path_get_basename((char *) lyric);
-
- uri = String (str_printf ("http://lyrics.wikia.com/index.php?"
- "action=edit&title=%s", basename));
-
- g_free(basename);
- xmlFree(lyric);
- }
- }
-
- xmlFreeDoc(doc);
- }
-
- g_free(newbuf);
-
- return uri;
-}
-
-static void update_lyrics_window(const char *title, const char *artist, const char *lyrics);
-
-static void get_lyrics_step_3(const char *uri, const Index<char> &buf, void*)
-{
- if (!state.uri || strcmp(state.uri, uri))
- return;
-
- if (!buf.len())
- {
- update_lyrics_window (_("Error"), nullptr,
- str_printf (_("Unable to fetch %s"), uri));
- return;
- }
-
- char *lyrics = scrape_lyrics_from_lyricwiki_edit_page(buf.begin(), buf.len());
-
- if (!lyrics)
- {
- update_lyrics_window (_("Error"), nullptr,
- str_printf (_("Unable to parse %s"), uri));
- return;
- }
-
- update_lyrics_window(state.title, state.artist, lyrics);
-
- g_free(lyrics);
-}
-
-static void get_lyrics_step_2(const char *uri1, const Index<char> &buf, void*)
-{
- if (!state.uri || strcmp(state.uri, uri1))
- return;
-
- if (!buf.len())
- {
- update_lyrics_window (_("Error"), nullptr,
- str_printf (_("Unable to fetch %s"), uri1));
- return;
- }
-
- String uri = scrape_uri_from_lyricwiki_search_result(buf.begin(), buf.len());
-
- if (!uri)
- {
- update_lyrics_window (_("Error"), nullptr,
- str_printf (_("Unable to parse %s"), uri1));
- return;
- }
-
- state.uri = uri;
-
- update_lyrics_window(state.title, state.artist, _("Looking for lyrics ..."));
- vfs_async_file_get_contents(uri, get_lyrics_step_3, nullptr);
-}
-
-static void get_lyrics_step_1(void)
-{
- if(!state.artist || !state.title)
- {
- update_lyrics_window(_("Error"), nullptr, _("Missing song metadata"));
- return;
- }
-
- StringBuf title_buf = str_encode_percent (state.title);
- StringBuf artist_buf = str_encode_percent (state.artist);
-
- state.uri = String (str_printf ("http://lyrics.wikia.com/api.php?"
- "action=lyrics&artist=%s&song=%s&fmt=xml", (const char *) artist_buf,
- (const char *) 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, nullptr);
-}
-
-static QTextEdit * textedit;
-
-static void update_lyrics_window(const char *title, const char *artist, const char *lyrics)
-{
- QTextDocument doc;
- QTextCursor cursor (& doc);
-
- if (! textedit)
- return;
-
- cursor.insertHtml (QString ("<big>") + QString (title) + QString ("</big>"));
-
- if (artist != nullptr)
- {
- cursor.insertHtml (QString (" ") + QString (artist) + QString (""));
- }
-
- cursor.insertHtml (" ");
- cursor.insertText (lyrics);
-
- AUDDBG ("update document <%p>\n", textedit);
-
- textedit->setDocument (doc.clone ());
-}
-
-static void lyricwiki_playback_began(void)
-{
- /* FIXME: cancel previous VFS requests (not possible with current API) */
-
- state.filename = aud_drct_get_filename();
-
- Tuple tuple = aud_drct_get_tuple();
- state.title = tuple.get_str(Tuple::Title);
- state.artist = tuple.get_str(Tuple::Artist);
-
- state.uri = String ();
-
- get_lyrics_step_1();
-}
-
-static void lw_cleanup (QObject * object = nullptr)
-{
- state.filename = String ();
- state.title = String ();
- state.artist = String ();
- state.uri = String ();
-
- hook_dissociate ("tuple change", (HookFunction) lyricwiki_playback_began);
- hook_dissociate ("playback ready", (HookFunction) lyricwiki_playback_began);
-
- textedit = nullptr;
-}
-
-void * LyricWikiQt::get_qt_widget ()
-{
- textedit = new QTextEdit;
- textedit->setReadOnly (true);
-
- hook_associate ("tuple change", (HookFunction) lyricwiki_playback_began, nullptr);
- hook_associate ("playback ready", (HookFunction) lyricwiki_playback_began, nullptr);
-
- if (aud_drct_get_ready ())
- lyricwiki_playback_began ();
-
- QObject::connect (textedit, &QObject::destroyed, lw_cleanup);
-
- return textedit;
-}

audacious-plugins-3.6.2-gtk3.tar.bz2/src/lyricwiki/Makefile Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/lyricwiki/lyricwiki.cc Deleted

@@ -1,386 +0,0 @@
-/*
- * Copyright (c) 2010 William Pitcock <nenolod@dereferenced.org>
- *
- * 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.
- *
- * 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.
- */
-
-#include <glib.h>
-#include <string.h>
-#include <gtk/gtk.h>
-#include <libxml/parser.h>
-#include <libxml/tree.h>
-#include <libxml/HTMLparser.h>
-#include <libxml/xpath.h>
-
-#include <libaudcore/drct.h>
-#include <libaudcore/i18n.h>
-#include <libaudcore/plugin.h>
-#include <libaudcore/plugins.h>
-#include <libaudcore/audstrings.h>
-#include <libaudcore/hook.h>
-#include <libaudcore/vfs_async.h>
-
-class LyricWiki : public GeneralPlugin
-{
-public:
- static constexpr PluginInfo info = {
- N_("LyricWiki Plugin"),
- PACKAGE
- };
-
- constexpr LyricWiki () : GeneralPlugin (info, false) {}
-
- void * get_gtk_widget ();
-};
-
-EXPORT LyricWiki aud_plugin_instance;
-
-typedef struct {
- String filename; /* of song file */
- String title, artist;
- String uri; /* URI we are trying to retrieve */
-} LyricsState;
-
-static LyricsState state;
-
-/*
- * Suppress libxml warnings, because lyricwiki does not generate anything near
- * valid HTML.
- */
-static void libxml_error_handler(void *ctx, const char *msg, ...)
-{
-}
-
-/* g_free() returned text */
-static char *scrape_lyrics_from_lyricwiki_edit_page(const char *buf, int64_t len)
-{
- xmlDocPtr doc;
- char *ret = nullptr;
-
- /*
- * 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.
- *
- * unfortunately, libxml is anti-social and provides us with no way to get
- * the previous error functor, so we just have to set it back to default after
- * parsing and hope for the best.
- */
- xmlSetGenericErrorFunc(nullptr, libxml_error_handler);
- doc = htmlReadMemory(buf, (int) len, nullptr, "utf-8", (HTML_PARSE_RECOVER | HTML_PARSE_NONET));
- xmlSetGenericErrorFunc(nullptr, nullptr);
-
- if (doc != nullptr)
- {
- xmlXPathContextPtr xpath_ctx = nullptr;
- xmlXPathObjectPtr xpath_obj = nullptr;
- xmlNodePtr node = nullptr;
-
- xpath_ctx = xmlXPathNewContext(doc);
- if (xpath_ctx == nullptr)
- goto give_up;
-
- xpath_obj = xmlXPathEvalExpression((xmlChar *) "//*@id=\"wpTextbox1\"", xpath_ctx);
- if (xpath_obj == nullptr)
- goto give_up;
-
- if (!xpath_obj->nodesetval->nodeMax)
- goto give_up;
-
- node = xpath_obj->nodesetval->nodeTab0;
-give_up:
- if (xpath_obj != nullptr)
- xmlXPathFreeObject(xpath_obj);
-
- if (xpath_ctx != nullptr)
- xmlXPathFreeContext(xpath_ctx);
-
- if (node != nullptr)
- {
- xmlChar *lyric = xmlNodeGetContent(node);
-
- if (lyric != nullptr)
- {
- GMatchInfo *match_info;
- GRegex *reg;
-
- reg = g_regex_new
- ("<(lyrics?)>:space:*(.*?):space:*</\\1>",
- (GRegexCompileFlags) (G_REGEX_MULTILINE | G_REGEX_DOTALL),
- (GRegexMatchFlags) 0, nullptr);
- g_regex_match(reg, (char *) lyric, G_REGEX_MATCH_NEWLINE_ANY, &match_info);
-
- ret = g_match_info_fetch(match_info, 2);
- if (!g_utf8_collate(ret, ""))
- {
- g_free(ret);
- ret = g_strdup(_("No lyrics available"));
- }
-
- g_regex_unref(reg);
- }
-
- xmlFree(lyric);
- }
-
- xmlFreeDoc(doc);
- }
-
- return ret;
-}
-
-static String scrape_uri_from_lyricwiki_search_result(const char *buf, int64_t len)
-{
- xmlDocPtr doc;
- String uri;
-
- /*
- * 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>", (GRegexCompileFlags)
- (G_REGEX_MULTILINE | G_REGEX_DOTALL | G_REGEX_UNGREEDY),
- (GRegexMatchFlags) 0, nullptr);
- char *newbuf = g_regex_replace_literal(reg, buf, len, 0, "", G_REGEX_MATCH_NEWLINE_ANY, nullptr);
- 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.
- *
- * unfortunately, libxml is anti-social and provides us with no way to get
- * the previous error functor, so we just have to set it back to default after
- * parsing and hope for the best.
- */
- xmlSetGenericErrorFunc(nullptr, libxml_error_handler);
- doc = xmlParseMemory(newbuf, strlen(newbuf));
- xmlSetGenericErrorFunc(nullptr, nullptr);
-
- if (doc != nullptr)
- {
- xmlNodePtr root, cur;
-
- root = xmlDocGetRootElement(doc);
-
- for (cur = root->xmlChildrenNode; cur; cur = cur->next)
- {
- if (xmlStrEqual(cur->name, (xmlChar *) "url"))
- {
- xmlChar *lyric;
- char *basename;
-
- lyric = xmlNodeGetContent(cur);
- basename = g_path_get_basename((char *) lyric);
-
- uri = String (str_printf ("http://lyrics.wikia.com/index.php?"
- "action=edit&title=%s", basename));
-
- g_free(basename);
- xmlFree(lyric);
- }
- }
-
- xmlFreeDoc(doc);
- }
-
- g_free(newbuf);
-
- return uri;
-}
-
-static void update_lyrics_window(const char *title, const char *artist, const char *lyrics);
-
-static void get_lyrics_step_3(const char *uri, const Index<char> &buf, void*)
-{
- if (!state.uri || strcmp(state.uri, uri))
- return;
-
- if (!buf.len())
- {
- update_lyrics_window (_("Error"), nullptr,
- str_printf (_("Unable to fetch %s"), uri));
- return;
- }
-
- char *lyrics = scrape_lyrics_from_lyricwiki_edit_page(buf.begin(), buf.len());
-
- if (!lyrics)
- {
- update_lyrics_window (_("Error"), nullptr,
- str_printf (_("Unable to parse %s"), uri));
- return;
- }
-
- update_lyrics_window(state.title, state.artist, lyrics);
-
- g_free(lyrics);
-}
-
-static void get_lyrics_step_2(const char *uri1, const Index<char> &buf, void*)
-{
- if (!state.uri || strcmp(state.uri, uri1))
- return;
-
- if (!buf.len())
- {
- update_lyrics_window (_("Error"), nullptr,
- str_printf (_("Unable to fetch %s"), uri1));
- return;
- }
-
- String uri = scrape_uri_from_lyricwiki_search_result(buf.begin(), buf.len());
-
- if (!uri)
- {
- update_lyrics_window (_("Error"), nullptr,
- str_printf (_("Unable to parse %s"), uri1));
- return;
- }
-
- state.uri = uri;
-
- update_lyrics_window(state.title, state.artist, _("Looking for lyrics ..."));
- vfs_async_file_get_contents(uri, get_lyrics_step_3, nullptr);
-}
-
-static void get_lyrics_step_1(void)
-{
- if(!state.artist || !state.title)
- {
- update_lyrics_window(_("Error"), nullptr, _("Missing song metadata"));
- return;
- }
-
- StringBuf title_buf = str_encode_percent (state.title);
- StringBuf artist_buf = str_encode_percent (state.artist);
-
- state.uri = String (str_printf ("http://lyrics.wikia.com/api.php?"
- "action=lyrics&artist=%s&song=%s&fmt=xml", (const char *) artist_buf,
- (const char *) 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, nullptr);
-}
-
-static GtkWidget *scrollview, *vbox;
-static GtkWidget *textview;
-static GtkTextBuffer *textbuffer;
-
-static GtkWidget *build_widget(void)
-{
- textview = gtk_text_view_new();
- gtk_text_view_set_editable(GTK_TEXT_VIEW(textview), FALSE);
- gtk_text_view_set_cursor_visible(GTK_TEXT_VIEW(textview), FALSE);
- gtk_text_view_set_left_margin(GTK_TEXT_VIEW(textview), 4);
- gtk_text_view_set_right_margin(GTK_TEXT_VIEW(textview), 4);
- gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW(textview), GTK_WRAP_WORD);
- textbuffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(textview));
-
- scrollview = gtk_scrolled_window_new(nullptr, nullptr);
- gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrollview), GTK_SHADOW_IN);
- gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrollview), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
- vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 10);
-
- gtk_container_add(GTK_CONTAINER(scrollview), textview);
-
- gtk_box_pack_start(GTK_BOX(vbox), scrollview, TRUE, TRUE, 0);
-
- gtk_widget_show(textview);
- gtk_widget_show(scrollview);
- gtk_widget_show(vbox);
-
- gtk_text_buffer_create_tag(GTK_TEXT_BUFFER(textbuffer), "weight_bold", "weight", PANGO_WEIGHT_BOLD, nullptr);
- gtk_text_buffer_create_tag(GTK_TEXT_BUFFER(textbuffer), "size_x_large", "scale", PANGO_SCALE_X_LARGE, nullptr);
- gtk_text_buffer_create_tag(GTK_TEXT_BUFFER(textbuffer), "style_italic", "style", PANGO_STYLE_ITALIC, nullptr);
-
- g_signal_connect (vbox, "destroy", (GCallback) gtk_widget_destroyed, & vbox);
- return vbox;
-}
-
-static void update_lyrics_window(const char *title, const char *artist, const char *lyrics)
-{
- GtkTextIter iter;
-
- if (textbuffer == nullptr)
- return;
-
- gtk_text_buffer_set_text(GTK_TEXT_BUFFER(textbuffer), "", -1);
-
- 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, -1, "weight_bold", "size_x_large", nullptr);
-
- if (artist != nullptr)
- {
- 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, -1, "style_italic", nullptr);
- }
-
- 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);
-}
-
-static void lyricwiki_playback_began(void)
-{
- /* FIXME: cancel previous VFS requests (not possible with current API) */
-
- state.filename = aud_drct_get_filename();
-
- Tuple tuple = aud_drct_get_tuple();
- state.title = tuple.get_str(Tuple::Title);
- state.artist = tuple.get_str(Tuple::Artist);
-
- state.uri = String ();
-
- get_lyrics_step_1();
-}
-
-static void destroy_cb ()
-{
- state.filename = String ();
- state.title = String ();
- state.artist = String ();
- state.uri = String ();
-
- hook_dissociate ("tuple change", (HookFunction) lyricwiki_playback_began);
- hook_dissociate ("playback ready", (HookFunction) lyricwiki_playback_began);
-
- textbuffer = nullptr;
-}
-
-void * LyricWiki::get_gtk_widget ()
-{
- build_widget ();
-
- hook_associate ("tuple change", (HookFunction) lyricwiki_playback_began, nullptr);
- hook_associate ("playback ready", (HookFunction) lyricwiki_playback_began, nullptr);
-
- if (aud_drct_get_ready ())
- lyricwiki_playback_began ();
-
- g_signal_connect (vbox, "destroy", destroy_cb, nullptr);
-
- return vbox;
-}

audacious-plugins-3.6.2-gtk3.tar.bz2/src/psf/eng_protos.h Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/psf/peops/regs.h Deleted

@@ -1,28 +0,0 @@
-/***************************************************************************
-                           regs.h  -  description
-                             -------------------
-    begin                : Wed May 15 2002
-    copyright            : (C) 2002 by Pete Bernert
-    email                : BlackDove@addcom.de
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   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. See also the license.txt file for *
- *   additional informations.                                              *
- *                                                                         *
- ***************************************************************************/
-
-//*************************************************************************//
-// History of changes:
-//
-// 2002/05/15 - Pete
-// - generic cleanup for the Peops release
-//
-//*************************************************************************//
-
-
-void SPUwriteRegister(u32 reg, u16 val);

audacious-plugins-3.6.2-gtk3.tar.bz2/src/pulse_audio Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/pulse_audio/pulse_audio.cc Deleted

@@ -1,625 +0,0 @@
-/***
- This file is part of xmms-pulse.
-
- xmms-pulse 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.
-
- xmms-pulse 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 xmms-pulse; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
- USA.
-***/
-
-#include <assert.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <string.h>
-#include <limits.h>
-
-#include <pulse/pulseaudio.h>
-
-#include <libaudcore/runtime.h>
-#include <libaudcore/plugin.h>
-#include <libaudcore/i18n.h>
-
-class PulseOutput : public OutputPlugin
-{
-public:
- static const char about;
-
- static constexpr PluginInfo info = {
- N_("PulseAudio Output"),
- PACKAGE,
- about
- };
-
- constexpr PulseOutput () : OutputPlugin (info, 8) {}
-
- bool init ();
-
- StereoVolume get_volume ();
- void set_volume (StereoVolume v);
-
- bool open_audio (int fmt, int rate, int nch);
- void close_audio ();
-
- void period_wait ();
- int write_audio (const void * ptr, int length);
- void drain ();
-
- int get_delay ();
-
- void pause (bool pause);
- void flush ();
-};
-
-EXPORT PulseOutput aud_plugin_instance;
-
-static pa_context *context = nullptr;
-static pa_stream *stream = nullptr;
-static pa_threaded_mainloop *mainloop = nullptr;
-
-static pa_cvolume volume;
-static bool volume_valid = false;
-
-static bool connected = false;
-
-#define CHECK_DEAD_GOTO(label, warn) do { \
-if (!mainloop || \
- !context || pa_context_get_state(context) != PA_CONTEXT_READY || \
- !stream || pa_stream_get_state(stream) != PA_STREAM_READY) { \
- if (warn) \
- AUDDBG("Connection died: %s\n", context ? pa_strerror(pa_context_errno(context)) : "nullptr"); \
- goto label; \
- } \
-} while(0);
-
-#define CHECK_CONNECTED(retval) \
-do { \
- if (!connected) return retval; \
-} while (0);
-
-static void info_cb(struct pa_context *c, const struct pa_sink_input_info *i, int is_last, void *userdata) {
- assert(c);
-
- if (!i)
- return;
-
- volume = i->volume;
- volume_valid = true;
-}
-
-static void subscribe_cb(struct pa_context *c, enum pa_subscription_event_type t, uint32_t index, void *userdata) {
- pa_operation *o;
-
- assert(c);
-
- if (!stream ||
- index != pa_stream_get_index(stream) ||
- (t != (PA_SUBSCRIPTION_EVENT_SINK_INPUT|PA_SUBSCRIPTION_EVENT_CHANGE) &&
- t != (PA_SUBSCRIPTION_EVENT_SINK_INPUT|PA_SUBSCRIPTION_EVENT_NEW)))
- return;
-
- if (!(o = pa_context_get_sink_input_info(c, index, info_cb, nullptr))) {
- AUDDBG("pa_context_get_sink_input_info() failed: %s\n", pa_strerror(pa_context_errno(c)));
- return;
- }
-
- pa_operation_unref(o);
-}
-
-static void context_state_cb(pa_context *c, void *userdata) {
- assert(c);
-
- switch (pa_context_get_state(c)) {
- case PA_CONTEXT_READY:
- case PA_CONTEXT_TERMINATED:
- case PA_CONTEXT_FAILED:
- pa_threaded_mainloop_signal(mainloop, 0);
- break;
-
- case PA_CONTEXT_UNCONNECTED:
- case PA_CONTEXT_CONNECTING:
- case PA_CONTEXT_AUTHORIZING:
- case PA_CONTEXT_SETTING_NAME:
- break;
- }
-}
-
-static void stream_state_cb(pa_stream *s, void * userdata) {
- assert(s);
-
- switch (pa_stream_get_state(s)) {
-
- case PA_STREAM_READY:
- case PA_STREAM_FAILED:
- case PA_STREAM_TERMINATED:
- pa_threaded_mainloop_signal(mainloop, 0);
- break;
-
- case PA_STREAM_UNCONNECTED:
- case PA_STREAM_CREATING:
- break;
- }
-}
-
-static void stream_success_cb(pa_stream *s, int success, void *userdata) {
- assert(s);
-
- if (userdata)
- *(int*) userdata = success;
-
- pa_threaded_mainloop_signal(mainloop, 0);
-}
-
-static void context_success_cb(pa_context *c, int success, void *userdata) {
- assert(c);
-
- if (userdata)
- *(int*) userdata = success;
-
- pa_threaded_mainloop_signal(mainloop, 0);
-}
-
-static void stream_request_cb(pa_stream *s, size_t length, void *userdata) {
- assert(s);
-
- pa_threaded_mainloop_signal(mainloop, 0);
-}
-
-static void stream_latency_update_cb(pa_stream *s, void *userdata) {
- assert(s);
-
- pa_threaded_mainloop_signal(mainloop, 0);
-}
-
-StereoVolume PulseOutput::get_volume ()
-{
- StereoVolume v = {0, 0};
-
- if (! connected || ! volume_valid)
- return v;
-
- pa_threaded_mainloop_lock (mainloop);
- CHECK_DEAD_GOTO (fail, 1);
-
- if (volume.channels == 2)
- {
- v.left = aud::rescale<int> (volume.values0, PA_VOLUME_NORM, 100);
- v.right = aud::rescale<int> (volume.values1, PA_VOLUME_NORM, 100);
- }
- else
- v.left = v.right = aud::rescale<int> (pa_cvolume_avg (& volume), PA_VOLUME_NORM, 100);
-
-fail:
- pa_threaded_mainloop_unlock (mainloop);
- return v;
-}
-
-void PulseOutput::set_volume (StereoVolume v)
-{
- pa_operation * o;
-
- if (! connected)
- return;
-
- pa_threaded_mainloop_lock (mainloop);
- CHECK_DEAD_GOTO (fail, 1);
-
- if (! volume_valid || volume.channels != 1)
- {
- volume.values0 = aud::rescale<int> (v.left, 100, PA_VOLUME_NORM);
- volume.values1 = aud::rescale<int> (v.right, 100, PA_VOLUME_NORM);
- volume.channels = 2;
- }
- else
- {
- volume.values0 = aud::rescale<int> (aud::max (v.left, v.right), 100, PA_VOLUME_NORM);
- volume.channels = 1;
- }
-
- volume_valid = true;
-
- if (! (o = pa_context_set_sink_input_volume (context, pa_stream_get_index
- (stream), & volume, nullptr, nullptr)))
- AUDDBG ("pa_context_set_sink_input_volume() failed: %s\n", pa_strerror
- (pa_context_errno (context)));
- else
- pa_operation_unref(o);
-
-fail:
- pa_threaded_mainloop_unlock (mainloop);
-}
-
-void PulseOutput::pause (bool pause)
-{
- pa_operation *o = nullptr;
- int success = 0;
-
- CHECK_CONNECTED();
-
- pa_threaded_mainloop_lock(mainloop);
- CHECK_DEAD_GOTO(fail, 1);
-
- if (!(o = pa_stream_cork(stream, pause, stream_success_cb, &success))) {
- AUDDBG("pa_stream_cork() failed: %s\n", pa_strerror(pa_context_errno(context)));
- goto fail;
- }
-
- while (pa_operation_get_state(o) != PA_OPERATION_DONE) {
- CHECK_DEAD_GOTO(fail, 1);
- pa_threaded_mainloop_wait(mainloop);
- }
-
- if (!success)
- AUDDBG("pa_stream_cork() failed: %s\n", pa_strerror(pa_context_errno(context)));
-
-fail:
-
- if (o)
- pa_operation_unref(o);
-
- pa_threaded_mainloop_unlock(mainloop);
-}
-
-int PulseOutput::get_delay ()
-{
- int delay = 0;
-
- CHECK_CONNECTED(0);
-
- pa_threaded_mainloop_lock(mainloop);
-
- pa_usec_t usec;
- int neg;
- if (pa_stream_get_latency (stream, & usec, & neg) == PA_OK)
- delay = usec / 1000;
-
- pa_threaded_mainloop_unlock(mainloop);
-
- return delay;
-}
-
-void PulseOutput::drain ()
-{
- pa_operation *o = nullptr;
- int success = 0;
-
- CHECK_CONNECTED();
-
- pa_threaded_mainloop_lock(mainloop);
- CHECK_DEAD_GOTO(fail, 0);
-
- if (!(o = pa_stream_drain(stream, stream_success_cb, &success))) {
- AUDDBG("pa_stream_drain() failed: %s\n", pa_strerror(pa_context_errno(context)));
- goto fail;
- }
-
- while (pa_operation_get_state(o) != PA_OPERATION_DONE) {
- CHECK_DEAD_GOTO(fail, 1);
- pa_threaded_mainloop_wait(mainloop);
- }
-
- if (!success)
- AUDDBG("pa_stream_drain() failed: %s\n", pa_strerror(pa_context_errno(context)));
-
-fail:
- if (o)
- pa_operation_unref(o);
-
- pa_threaded_mainloop_unlock(mainloop);
-}
-
-void PulseOutput::flush ()
-{
- pa_operation *o = nullptr;
- int success = 0;
-
- CHECK_CONNECTED();
-
- pa_threaded_mainloop_lock(mainloop);
- CHECK_DEAD_GOTO(fail, 1);
-
- if (!(o = pa_stream_flush(stream, stream_success_cb, &success))) {
- AUDDBG("pa_stream_flush() failed: %s\n", pa_strerror(pa_context_errno(context)));
- goto fail;
- }
-
- while (pa_operation_get_state(o) != PA_OPERATION_DONE) {
- CHECK_DEAD_GOTO(fail, 1);
- pa_threaded_mainloop_wait(mainloop);
- }
-
- if (!success)
- AUDDBG("pa_stream_flush() failed: %s\n", pa_strerror(pa_context_errno(context)));
-
-fail:
- if (o)
- pa_operation_unref(o);
-
- pa_threaded_mainloop_unlock(mainloop);
-}
-
-void PulseOutput::period_wait ()
-{
- pa_operation * o = nullptr;
- int success = 0;
-
- CHECK_CONNECTED ();
-
- pa_threaded_mainloop_lock (mainloop);
- CHECK_DEAD_GOTO (fail, 1);
-
- if (! (o = pa_stream_trigger (stream, stream_success_cb, & success)))
- {
- AUDDBG ("pa_stream_trigger() failed: %s\n", pa_strerror (pa_context_errno (context)));
- goto fail;
- }
-
- while (pa_operation_get_state (o) != PA_OPERATION_DONE)
- {
- CHECK_DEAD_GOTO (fail, 1);
- pa_threaded_mainloop_wait (mainloop);
- }
-
- if (! success)
- AUDDBG ("pa_stream_trigger() failed: %s\n", pa_strerror (pa_context_errno (context)));
-
- while (! pa_stream_writable_size (stream))
- {
- CHECK_DEAD_GOTO (fail, 1);
- pa_threaded_mainloop_wait (mainloop);
- }
-
-fail:
- if (o)
- pa_operation_unref(o);
-
- pa_threaded_mainloop_unlock (mainloop);
-}
-
-int PulseOutput::write_audio (const void * ptr, int length)
-{
- CHECK_CONNECTED(0);
-
- int ret = 0;
- pa_threaded_mainloop_lock(mainloop);
- CHECK_DEAD_GOTO(fail, 1);
-
- length = aud::min ((size_t) length, pa_stream_writable_size (stream));
-
- if (pa_stream_write (stream, ptr, length, nullptr, 0, PA_SEEK_RELATIVE) < 0)
- {
- AUDDBG ("pa_stream_write() failed: %s\n", pa_strerror (pa_context_errno (context)));
- goto fail;
- }
-
- ret = length;
-
-fail:
- pa_threaded_mainloop_unlock(mainloop);
- return ret;
-}
-
-void PulseOutput::close_audio ()
-{
- connected = false;
-
- if (mainloop)
- pa_threaded_mainloop_stop(mainloop);
-
- if (stream) {
- pa_stream_disconnect(stream);
- pa_stream_unref(stream);
- stream = nullptr;
- }
-
- if (context) {
- pa_context_disconnect(context);
- pa_context_unref(context);
- context = nullptr;
- }
-
- if (mainloop) {
- pa_threaded_mainloop_free(mainloop);
- mainloop = nullptr;
- }
-
- volume_valid = false;
-}
-
-static pa_sample_format_t to_pulse_format (int aformat)
-{
- switch (aformat)
- {
- case FMT_U8: return PA_SAMPLE_U8;
- case FMT_S16_LE: return PA_SAMPLE_S16LE;
- case FMT_S16_BE: return PA_SAMPLE_S16BE;
-#ifdef PA_SAMPLE_S24_32LE
- case FMT_S24_LE: return PA_SAMPLE_S24_32LE;
- case FMT_S24_BE: return PA_SAMPLE_S24_32BE;
-#endif
-#ifdef PA_SAMPLE_S32LE
- case FMT_S32_LE: return PA_SAMPLE_S32LE;
- case FMT_S32_BE: return PA_SAMPLE_S32BE;
-#endif
-	case FMT_FLOAT: return PA_SAMPLE_FLOAT32NE;
- default: return PA_SAMPLE_INVALID;
- }
-}
-
-bool PulseOutput::open_audio (int fmt, int rate, int nch)
-{
- pa_sample_spec ss;
-
- assert(!mainloop);
- assert(!context);
- assert(!stream);
- assert(!connected);
-
- ss.format = to_pulse_format (fmt);
- if (ss.format == PA_SAMPLE_INVALID)
- return false;
-
- ss.rate = rate;
- ss.channels = nch;
-
- if (!pa_sample_spec_valid(&ss))
- return false;
-
- if (!(mainloop = pa_threaded_mainloop_new())) {
- AUDERR ("Failed to allocate main loop\n");
- return false;
- }
-
- pa_threaded_mainloop_lock(mainloop);
-
- if (!(context = pa_context_new(pa_threaded_mainloop_get_api(mainloop), "Audacious"))) {
- AUDERR ("Failed to allocate context\n");
- goto FAIL1;
- }
-
- pa_context_set_state_callback(context, context_state_cb, nullptr);
- pa_context_set_subscribe_callback(context, subscribe_cb, nullptr);
-
- if (pa_context_connect(context, nullptr, (pa_context_flags_t) 0, nullptr) < 0) {
- AUDERR ("Failed to connect to server: %s\n", pa_strerror(pa_context_errno(context)));
- goto FAIL1;
- }
-
- if (pa_threaded_mainloop_start(mainloop) < 0) {
- AUDERR ("Failed to start main loop\n");
- goto FAIL1;
- }
-
- /* Wait until the context is ready */
- pa_threaded_mainloop_wait(mainloop);
-
- if (pa_context_get_state(context) != PA_CONTEXT_READY) {
- AUDERR ("Failed to connect to server: %s\n", pa_strerror(pa_context_errno(context)));
- goto FAIL1;
- }
-
- if (!(stream = pa_stream_new(context, "Audacious", &ss, nullptr))) {
- AUDERR ("Failed to create stream: %s\n", pa_strerror(pa_context_errno(context)));
-
-FAIL1:
- pa_threaded_mainloop_unlock (mainloop);
- close_audio ();
- return false;
- }
-
- pa_stream_set_state_callback(stream, stream_state_cb, nullptr);
- pa_stream_set_write_callback(stream, stream_request_cb, nullptr);
- pa_stream_set_latency_update_callback(stream, stream_latency_update_cb, nullptr);
-
- /* Connect stream with sink and default volume */
- /* Buffer struct */
-
- int aud_buffer = aud_get_int(nullptr, "output_buffer_size");
- size_t buffer_size = pa_usec_to_bytes(aud_buffer, &ss) * 1000;
- pa_buffer_attr buffer = {(uint32_t) -1, (uint32_t) buffer_size,
- (uint32_t) -1, (uint32_t) -1, (uint32_t) buffer_size};
-
- pa_operation *o = nullptr;
- int success;
-
- if (pa_stream_connect_playback (stream, nullptr, & buffer, (pa_stream_flags_t)
- (PA_STREAM_INTERPOLATE_TIMING | PA_STREAM_AUTO_TIMING_UPDATE), nullptr, nullptr) < 0)
- {
- AUDERR ("Failed to connect stream: %s\n", pa_strerror(pa_context_errno(context)));
- goto FAIL2;
- }
-
-
- /* Wait until the stream is ready */
- pa_threaded_mainloop_wait(mainloop);
-
- if (pa_stream_get_state(stream) != PA_STREAM_READY) {
- AUDERR ("Failed to connect stream: %s\n", pa_strerror(pa_context_errno(context)));
- goto FAIL2;
- }
-
- /* Now subscribe to events */
- if (!(o = pa_context_subscribe(context, PA_SUBSCRIPTION_MASK_SINK_INPUT, context_success_cb, &success))) {
- AUDERR ("pa_context_subscribe() failed: %s\n", pa_strerror(pa_context_errno(context)));
- goto FAIL2;
- }
-
- success = 0;
- while (pa_operation_get_state(o) != PA_OPERATION_DONE) {
- CHECK_DEAD_GOTO(FAIL2, 1);
- pa_threaded_mainloop_wait(mainloop);
- }
-
- if (!success) {
- AUDERR ("pa_context_subscribe() failed: %s\n", pa_strerror(pa_context_errno(context)));
- goto FAIL2;
- }
-
- pa_operation_unref(o);
-
- /* Now request the initial stream info */
- if (!(o = pa_context_get_sink_input_info(context, pa_stream_get_index(stream), info_cb, nullptr))) {
- AUDERR ("pa_context_get_sink_input_info() failed: %s\n", pa_strerror(pa_context_errno(context)));
- goto FAIL2;
- }
-
- while (pa_operation_get_state(o) != PA_OPERATION_DONE) {
- CHECK_DEAD_GOTO(FAIL2, 1);
- pa_threaded_mainloop_wait(mainloop);
- }
-
- if (!volume_valid) {
- AUDERR ("pa_context_get_sink_input_info() failed: %s\n", pa_strerror(pa_context_errno(context)));
- goto FAIL2;
- }
- pa_operation_unref(o);
-
- connected = true;
-
- pa_threaded_mainloop_unlock(mainloop);
-
- return true;
-
-FAIL2:
- if (o)
- pa_operation_unref(o);
-
- pa_threaded_mainloop_unlock(mainloop);
- close_audio ();
- return false;
-}
-
-bool PulseOutput::init ()
-{
- if (! open_audio (FMT_S16_NE, 44100, 2))
- return false;
-
- close_audio ();
- return true;
-}
-
-const char PulseOutput::about =
- N_("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.");

audacious-plugins-3.6.2-gtk3.tar.bz2/src/qtui/QtUi Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/qtui/QtUi/16 Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/qtui/QtUi/16/audio-volume-high.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/qtui/QtUi/16/audio-volume-low.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/qtui/QtUi/16/audio-volume-medium.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/qtui/QtUi/16/audio-volume-muted.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/qtui/QtUi/16/audio-volume-off.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/qtui/QtUi/16/document-open.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/qtui/QtUi/16/edit-find.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/qtui/QtUi/16/list-add.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/qtui/QtUi/16/media-playback-pause.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/qtui/QtUi/16/media-playback-start.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/qtui/QtUi/16/media-playback-stop.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/qtui/QtUi/16/media-playlist-repeat.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/qtui/QtUi/16/media-playlist-shuffle.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/qtui/QtUi/16/media-skip-backward.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/qtui/QtUi/16/media-skip-forward.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/qtui/QtUi/22 Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/qtui/QtUi/22/audio-volume-high.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/qtui/QtUi/22/audio-volume-low.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/qtui/QtUi/22/audio-volume-medium.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/qtui/QtUi/22/audio-volume-muted.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/qtui/QtUi/22/audio-volume-off.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/qtui/QtUi/22/document-open.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/qtui/QtUi/22/edit-find.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/qtui/QtUi/22/list-add.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/qtui/QtUi/22/media-playback-pause.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/qtui/QtUi/22/media-playback-start.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/qtui/QtUi/22/media-playback-stop.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/qtui/QtUi/22/media-playlist-repeat.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/qtui/QtUi/22/media-playlist-shuffle.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/qtui/QtUi/22/media-skip-backward.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/qtui/QtUi/22/media-skip-forward.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/qtui/QtUi/32 Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/qtui/QtUi/32/audio-volume-high.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/qtui/QtUi/32/audio-volume-low.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/qtui/QtUi/32/audio-volume-medium.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/qtui/QtUi/32/audio-volume-muted.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/qtui/QtUi/32/audio-volume-off.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/qtui/QtUi/32/document-open.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/qtui/QtUi/32/edit-find.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/qtui/QtUi/32/list-add.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/qtui/QtUi/32/media-playback-pause.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/qtui/QtUi/32/media-playback-start.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/qtui/QtUi/32/media-playback-stop.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/qtui/QtUi/32/media-playlist-repeat.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/qtui/QtUi/32/media-playlist-shuffle.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/qtui/QtUi/32/media-skip-backward.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/qtui/QtUi/32/media-skip-forward.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/qtui/QtUi/44 Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/qtui/QtUi/44/audio-volume-high.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/qtui/QtUi/44/audio-volume-low.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/qtui/QtUi/44/audio-volume-medium.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/qtui/QtUi/44/audio-volume-muted.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/qtui/QtUi/44/audio-volume-off.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/qtui/QtUi/44/document-open.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/qtui/QtUi/44/edit-find.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/qtui/QtUi/44/list-add.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/qtui/QtUi/44/media-playback-pause.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/qtui/QtUi/44/media-playback-start.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/qtui/QtUi/44/media-playback-stop.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/qtui/QtUi/44/media-playlist-repeat.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/qtui/QtUi/44/media-playlist-shuffle.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/qtui/QtUi/44/media-skip-backward.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/qtui/QtUi/44/media-skip-forward.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/qtui/QtUi/AUTHORS Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/qtui/QtUi/index.theme Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/qtui/dialog_windows.cc Deleted

@@ -1,68 +0,0 @@
-/*
- * dialog_windows.cc
- * Copyright 2014 John Lindgren and Michał Lipski
- *
- * 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 "dialog_windows.h"
-
-#include <QMessageBox>
-#include <libaudcore/i18n.h>
-
-void DialogWindows::create_progress ()
-{
- if (! m_progress)
- {
- m_progress = new QMessageBox (m_parent);
- m_progress->setIcon (QMessageBox::Information);
- m_progress->setText (_("Working ..."));
- m_progress->setStandardButtons (QMessageBox::NoButton);
- m_progress->setWindowModality (Qt::WindowModal);
- }
-}
-
-void DialogWindows::show_error (const char * message)
-{
- if (! m_error)
- {
- m_error = new QMessageBox (m_parent);
- m_error->setIcon (QMessageBox::Warning);
- m_error->setWindowModality (Qt::WindowModal);
- }
-
- m_error->setText (message);
- m_error->show ();
-}
-
-void DialogWindows::show_progress (const char * message)
-{
- create_progress ();
- m_progress->setInformativeText (message);
- m_progress->show ();
-}
-
-void DialogWindows::show_progress_2 (const char * message)
-{
- create_progress ();
- m_progress->setText (message);
- m_progress->show ();
-}
-
-void DialogWindows::hide_progress ()
-{
- if (m_progress)
- m_progress->hide ();
-}

audacious-plugins-3.6.2-gtk3.tar.bz2/src/qtui/dialog_windows.h Deleted

@@ -1,53 +0,0 @@
-/*
- * dialog_windows.h
- * Copyright 2014 John Lindgren and Michał Lipski
- *
- * 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.
- */
-
-#ifndef DIALOG_WINDOWS_H
-#define DIALOG_WINDOWS_H
-
-#include <libaudcore/hook.h>
-
-class QMessageBox;
-class QWidget;
-
-class DialogWindows
-{
-public:
- DialogWindows (QWidget * parent) :
- m_parent (parent) {}
-
-private:
- QWidget * m_parent;
- QMessageBox * m_progress = nullptr;
- QMessageBox * m_error = nullptr;
-
- void create_progress ();
- void show_error (const char * message);
- void show_progress (const char * message);
- void show_progress_2 (const char * message);
- void hide_progress ();
-
- const HookReceiver<DialogWindows, const char *>
- show_hook1 {"ui show progress", this, & DialogWindows::show_progress},
- show_hook2 {"ui show progress 2", this, & DialogWindows::show_progress_2},
- show_hook3 {"ui show error", this, & DialogWindows::show_error};
- const HookReceiver<DialogWindows>
- hide_hook {"ui hide progress", this, & DialogWindows::hide_progress};
-};
-
-#endif // DIALOG_WINDOWS_H

audacious-plugins-3.6.2-gtk3.tar.bz2/src/qtui/filter_input.cc Deleted

@@ -1,56 +0,0 @@
-/*
- * filter_input.cc
- * Copyright 2014 Daniel (dmilith) Dettlaff
- *
- * 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 <libaudcore/i18n.h>
-
-#include "filter_input.h"
-
-#include <QKeyEvent>
-
-FilterInput::FilterInput (QWidget * parent) : QLineEdit (parent)
-{
-#ifdef Q_OS_MAC
- setStyleSheet (
- "QLineEdit {"
- " padding: 2px 4px;"
- " border: 1px solid silver;"
- " border-radius: 10px;"
- " margin-right: 5px;"
- "}"
- "QLineEdit:focus {"
- " border: 1px solid gray;"
- "}"
- );
-#endif
-
- setAttribute (Qt::WA_MacShowFocusRect, false);
- setClearButtonEnabled (true);
- setPlaceholderText (_("Search"));
-}
-
-void FilterInput::keyPressEvent (QKeyEvent * e)
-{
- if (e->key () == Qt::Key_Enter or e->key () == Qt::Key_Return)
- {
- e->ignore ();
- focusNextChild ();
- }
- else
- QLineEdit::keyPressEvent (e);
-}

audacious-plugins-3.6.2-gtk3.tar.bz2/src/qtui/filter_input.h Deleted

@@ -1,34 +0,0 @@
-/*
- * filter_input.h
- * Copyright 2014 Daniel (dmilith) Dettlaff
- *
- * 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.
- */
-
-#ifndef FILTER_INPUT_WIDGET_H
-#define FILTER_INPUT_WIDGET_H
-
-#include <QLineEdit>
-
-class FilterInput : public QLineEdit
-{
-public:
- FilterInput (QWidget * parent = nullptr);
-
-protected:
- virtual void keyPressEvent (QKeyEvent * e); /* override default handler */
-};
-
-#endif

audacious-plugins-3.6.2-gtk3.tar.bz2/src/qtui/main_window_actions.cc Deleted

@@ -1,197 +0,0 @@
-/*
- * main_window_actions.cc
- * Copyright 2014 Michał Lipski and William Pitcock
- *
- * 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 "main_window.h"
-
-#include <QMenuBar>
-
-#include <libaudcore/drct.h>
-#include <libaudcore/hook.h>
-#include <libaudcore/i18n.h>
-#include <libaudcore/runtime.h>
-#include <libaudcore/plugin.h>
-#include <libaudcore/plugins.h>
-#include <libaudcore/drct.h>
-#include <libaudcore/interface.h>
-#include <libaudcore/playlist.h>
-
-#include <libaudqt/libaudqt.h>
-#include <libaudqt/menu.h>
-
-static QMenu * services_menu () { return audqt::menu_get_by_id (AudMenuID::Main); }
-
-static void open_files () { audqt::fileopener_show (audqt::FileMode::Open); }
-static void add_files () { audqt::fileopener_show (audqt::FileMode::Add); }
-static void open_folder () { audqt::fileopener_show (audqt::FileMode::OpenFolder); }
-static void add_folder () { audqt::fileopener_show (audqt::FileMode::AddFolder); }
-
-static void rm_dupes_title () { aud_playlist_remove_duplicates_by_scheme (aud_playlist_get_active (), Playlist::Title); }
-static void rm_dupes_filename () { aud_playlist_remove_duplicates_by_scheme (aud_playlist_get_active (), Playlist::Filename); }
-static void rm_dupes_path () { aud_playlist_remove_duplicates_by_scheme (aud_playlist_get_active (), Playlist::Path); }
-
-static void sort_track () { aud_playlist_sort_by_scheme (aud_playlist_get_active (), Playlist::Track); }
-static void sort_title () { aud_playlist_sort_by_scheme (aud_playlist_get_active (), Playlist::Title); }
-static void sort_artist () { aud_playlist_sort_by_scheme (aud_playlist_get_active (), Playlist::Artist); }
-static void sort_album () { aud_playlist_sort_by_scheme (aud_playlist_get_active (), Playlist::Album); }
-static void sort_album_artist () { aud_playlist_sort_by_scheme (aud_playlist_get_active (), Playlist::AlbumArtist); }
-static void sort_date () { aud_playlist_sort_by_scheme (aud_playlist_get_active (), Playlist::Date); }
-static void sort_genre () { aud_playlist_sort_by_scheme (aud_playlist_get_active (), Playlist::Genre); }
-static void sort_length () { aud_playlist_sort_by_scheme (aud_playlist_get_active (), Playlist::Length); }
-static void sort_path () { aud_playlist_sort_by_scheme (aud_playlist_get_active (), Playlist::Path); }
-static void sort_custom_title () { aud_playlist_sort_by_scheme (aud_playlist_get_active (), Playlist::FormattedTitle); }
-static void sort_reverse () { aud_playlist_reverse (aud_playlist_get_active ()); }
-static void sort_random () { aud_playlist_randomize (aud_playlist_get_active ()); }
-
-static void sort_sel_track () { aud_playlist_sort_by_scheme (aud_playlist_get_active (), Playlist::Track); }
-static void sort_sel_title () { aud_playlist_sort_by_scheme (aud_playlist_get_active (), Playlist::Title); }
-static void sort_sel_artist () { aud_playlist_sort_by_scheme (aud_playlist_get_active (), Playlist::Artist); }
-static void sort_sel_album () { aud_playlist_sort_by_scheme (aud_playlist_get_active (), Playlist::Album); }
-static void sort_sel_album_artist () { aud_playlist_sort_by_scheme (aud_playlist_get_active (), Playlist::AlbumArtist); }
-static void sort_sel_date () { aud_playlist_sort_by_scheme (aud_playlist_get_active (), Playlist::Date); }
-static void sort_sel_genre () { aud_playlist_sort_by_scheme (aud_playlist_get_active (), Playlist::Genre); }
-static void sort_sel_length () { aud_playlist_sort_by_scheme (aud_playlist_get_active (), Playlist::Length); }
-static void sort_sel_path () { aud_playlist_sort_by_scheme (aud_playlist_get_active (), Playlist::Path); }
-static void sort_sel_custom_title () { aud_playlist_sort_by_scheme (aud_playlist_get_active (), Playlist::FormattedTitle); }
-static void sort_sel_reverse () { aud_playlist_reverse (aud_playlist_get_active ()); }
-static void sort_sel_random () { aud_playlist_randomize (aud_playlist_get_active ()); }
-
-static void pl_new ()
-{
- aud_playlist_insert (-1);
- aud_playlist_set_active (aud_playlist_count () - 1);
-}
-
-static void pl_play () { aud_playlist_play (aud_playlist_get_active ()); }
-static void pl_refresh () { aud_playlist_rescan (aud_playlist_get_active ()); }
-static void pl_remove_failed () { aud_playlist_remove_failed (aud_playlist_get_active ()); }
-static void pl_close () { audqt::playlist_confirm_delete (aud_playlist_get_active ()); }
-
-static void volume_up () { aud_drct_set_volume_main (aud_drct_get_volume_main () + 5); }
-static void volume_down () { aud_drct_set_volume_main (aud_drct_get_volume_main () - 5); }
-
-static void configure_effects () { audqt::prefswin_show_plugin_page (PluginType::Effect); }
-
-void MainWindow::setupActions ()
-{
- static constexpr audqt::MenuItem file_items = {
- audqt::MenuCommand ({N_("_Open Files ..."), "document-open", "Ctrl+O"}, open_files),
- audqt::MenuCommand ({N_("_Open Folder ..."), "document-open"}, open_folder),
- audqt::MenuCommand ({N_("_Add Files ..."), "list-add", "Ctrl+Shift+O"}, add_files),
- audqt::MenuCommand ({N_("_Add Folder ..."), "list-add"}, add_folder),
- audqt::MenuSep (),
- audqt::MenuCommand ({N_("A_bout ..."), "help-about"}, aud_ui_show_about_window),
- audqt::MenuCommand ({N_("_Settings ..."), "preferences-system"}, aud_ui_show_prefs_window),
- audqt::MenuSep (),
- audqt::MenuCommand ({N_("_Log Inspector ...")}, audqt::log_inspector_show),
- audqt::MenuSep (),
- audqt::MenuCommand ({N_("_Quit"), "application-exit", "Ctrl+Q"}, aud_quit)
- };
-
- static constexpr audqt::MenuItem playback_items = {
- audqt::MenuCommand ({N_("_Play"), "media-playback-start", "Ctrl+Return"}, aud_drct_play),
- audqt::MenuCommand ({N_("Paus_e"), "media-playback-pause", "Ctrl+,"}, aud_drct_pause),
- audqt::MenuCommand ({N_("_Stop"), "media-playback-stop", "Ctrl+."}, aud_drct_stop),
- audqt::MenuCommand ({N_("Pre_vious"), "media-skip-backward", "Alt+Up"}, aud_drct_pl_prev),
- audqt::MenuCommand ({N_("_Next"), "media-skip-forward", "Alt+Down"}, aud_drct_pl_next),
- audqt::MenuSep (),
- audqt::MenuToggle ({N_("_Repeat"), nullptr, "Ctrl+R"}, {nullptr, "repeat", "set repeat"}),
- audqt::MenuToggle ({N_("S_huffle"), nullptr, "Ctrl+S"}, {nullptr, "shuffle", "set shuffle"}),
- audqt::MenuToggle ({N_("N_o Playlist Advance"), nullptr, "Ctrl+N"}, {nullptr, "no_playlist_advance", "set no_playlist_advance"}),
- audqt::MenuToggle ({N_("Stop A_fter This Song"), nullptr, "Ctrl+M"}, {nullptr, "stop_after_current_song", "set stop_after_current_song"}),
- audqt::MenuSep (),
- audqt::MenuCommand ({N_("Song _Info ..."), "dialog-information", "Ctrl+I"}, audqt::infowin_show_current)
- };
-
- static constexpr audqt::MenuItem dupe_items = {
- audqt::MenuCommand ({N_("By _Title")}, rm_dupes_title),
- audqt::MenuCommand ({N_("By _File Name")}, rm_dupes_filename),
- audqt::MenuCommand ({N_("By File _Path")}, rm_dupes_path),
- };
-
- static constexpr audqt::MenuItem sort_items = {
- audqt::MenuCommand ({N_("By Track _Number")}, sort_track),
- audqt::MenuCommand ({N_("By _Title")}, sort_title),
- audqt::MenuCommand ({N_("By _Artist")}, sort_artist),
- audqt::MenuCommand ({N_("By Al_bum")}, sort_album),
- audqt::MenuCommand ({N_("By Albu_m Artist")}, sort_album_artist),
- audqt::MenuCommand ({N_("By Release _Date")}, sort_date),
- audqt::MenuCommand ({N_("By _Genre")}, sort_genre),
- audqt::MenuCommand ({N_("By _Length")}, sort_length),
- audqt::MenuCommand ({N_("By _File Path")}, sort_path),
- audqt::MenuCommand ({N_("By _Custom Title")}, sort_custom_title),
- audqt::MenuSep (),
- audqt::MenuCommand ({N_("R_everse Order"), "view-sort-descending"}, sort_reverse),
- audqt::MenuCommand ({N_("_Random Order")}, sort_random)
- };
-
- static constexpr audqt::MenuItem sort_selected_items = {
- audqt::MenuCommand ({N_("By Track _Number")}, sort_sel_track),
- audqt::MenuCommand ({N_("By _Title")}, sort_sel_title),
- audqt::MenuCommand ({N_("By _Artist")}, sort_sel_artist),
- audqt::MenuCommand ({N_("By Al_bum")}, sort_sel_album),
- audqt::MenuCommand ({N_("By Albu_m Artist")}, sort_sel_album_artist),
- audqt::MenuCommand ({N_("By Release _Date")}, sort_sel_date),
- audqt::MenuCommand ({N_("By _Genre")}, sort_sel_genre),
- audqt::MenuCommand ({N_("By _Length")}, sort_sel_length),
- audqt::MenuCommand ({N_("By _File Path")}, sort_sel_path),
- audqt::MenuCommand ({N_("By _Custom Title")}, sort_sel_custom_title),
- audqt::MenuSep (),
- audqt::MenuCommand ({N_("R_everse Order"), "view-sort-descending"}, sort_sel_reverse),
- audqt::MenuCommand ({N_("_Random Order")}, sort_sel_random)
- };
-
- static constexpr audqt::MenuItem playlist_items = {
- audqt::MenuCommand ({N_("_Play/Resume"), "media-playback-start", "Shift+Return"}, pl_play),
- audqt::MenuCommand ({N_("_Refresh"), "view-refresh", "F5"}, pl_refresh),
- audqt::MenuSep (),
- audqt::MenuSub ({N_("_Sort"), "view-sort-ascending"}, sort_items),
- audqt::MenuSub ({N_("Sort Se_lected"), "view-sort-ascending"}, sort_selected_items),
- audqt::MenuSub ({N_("Remove _Duplicates"), "edit-copy"}, dupe_items),
- audqt::MenuCommand ({N_("Remove _Unavailable Files"), "dialog-warning"}, pl_remove_failed),
- audqt::MenuSep (),
- audqt::MenuCommand ({N_("_New"), "document-new", "Ctrl+T"}, pl_new),
- //audqt::MenuCommand ({N_("Ren_ame ..."), "insert-text", "F2"}, TODO),
- audqt::MenuCommand ({N_("Remo_ve"), "edit-delete", "Ctrl+W"}, pl_close),
- audqt::MenuSep (),
- //audqt::MenuCommand ({N_("_Import ..."), "document-open"}, TODO),
- //audqt::MenuCommand ({N_("_Export ..."), "document-save"}, TODO),
- audqt::MenuSep (),
- //audqt::MenuCommand ({N_("Playlist _Manager ..."), "audio-x-generic", "Ctrl+P"}, TODO),
- audqt::MenuCommand ({N_("_Queue Manager ..."), nullptr, "Ctrl+U"}, audqt::queue_manager_show)
- };
-
- static constexpr audqt::MenuItem output_items = {
- audqt::MenuCommand ({N_("Volume _Up"), "audio-volume-high", "Ctrl++"}, volume_up),
- audqt::MenuCommand ({N_("Volume _Down"), "audio-volume-low", "Ctrl+-"}, volume_down),
- audqt::MenuSep (),
- audqt::MenuCommand ({N_("_Equalizer"), "multimedia-volume-control", "Ctrl+E"}, audqt::equalizer_show),
- audqt::MenuSep (),
- audqt::MenuCommand ({N_("E_ffects ...")}, configure_effects)
- };
-
- static constexpr audqt::MenuItem main_items = {
- audqt::MenuSub ({N_("_File")}, file_items),
- audqt::MenuSub ({N_("_Playback")}, playback_items),
- audqt::MenuSub ({N_("P_laylist")}, playlist_items),
- audqt::MenuSub ({N_("_Services")}, services_menu),
- audqt::MenuSub ({N_("_Output")}, output_items),
- };
-
- setMenuBar (audqt::menubar_build (main_items, this));
-}

audacious-plugins-3.6.2-gtk3.tar.bz2/src/qtui/playlist.cc Deleted

@@ -1,287 +0,0 @@
-/*
- * playlist.cc
- * Copyright 2014 Michał Lipski
- *
- * 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 <QKeyEvent>
-#include <QSortFilterProxyModel>
-
-#include <libaudcore/audstrings.h>
-#include <libaudcore/drct.h>
-#include <libaudcore/hook.h>
-#include <libaudcore/playlist.h>
-
-#include "playlist.h"
-#include "playlist_model.h"
-
-PlaylistWidget::PlaylistWidget (QTreeView * parent, int uniqueId) : QTreeView (parent)
-{
- model = new PlaylistModel (nullptr, uniqueId);
-
- /* setting up filtering model */
- proxyModel = new QSortFilterProxyModel (this);
- proxyModel->setSourceModel (model);
- proxyModel->setFilterKeyColumn (-1); /* filter by all columns */
-
- setModel (proxyModel);
- setAlternatingRowColors (true);
- setAttribute (Qt::WA_MacShowFocusRect, false);
- setIndentation (0);
- setUniformRowHeights (true);
- setFrameShape (QFrame::NoFrame);
- setSelectionMode (ExtendedSelection);
- setColumnWidth (PL_COL_NOW_PLAYING, 25);
- setColumnWidth (PL_COL_TITLE, 300);
- setColumnWidth (PL_COL_ARTIST, 150);
- setColumnWidth (PL_COL_ALBUM, 200);
- resizeColumnToContents (PL_COL_QUEUED);
- resizeColumnToContents (PL_COL_LENGTH);
- scrollToCurrent ();
-}
-
-void PlaylistWidget::setFilter (const QString & text)
-{
- proxyModel->setFilterRegExp (QRegExp (text, Qt::CaseInsensitive, QRegExp::FixedString));
-}
-
-PlaylistWidget::~PlaylistWidget ()
-{
- delete model;
- delete proxyModel;
-}
-
-QModelIndex PlaylistWidget::rowToIndex (int row)
-{
- if (row < 0)
- return QModelIndex ();
-
- return proxyModel->mapFromSource (model->index (row));
-}
-
-int PlaylistWidget::indexToRow (const QModelIndex & index)
-{
- if (! index.isValid ())
- return -1;
-
- return proxyModel->mapToSource (index).row ();
-}
-
-void PlaylistWidget::keyPressEvent (QKeyEvent * e)
-{
- switch (e->modifiers ())
- {
- case Qt::NoModifier:
- switch (e->key ())
- {
- case Qt::Key_Escape:
- scrollToCurrent ();
- break;
- case Qt::Key_Enter:
- case Qt::Key_Return:
- playCurrentIndex ();
- break;
- case Qt::Key_Right:
- aud_drct_seek (aud_drct_get_time () + 5000);
- break;
- case Qt::Key_Left:
- aud_drct_seek (aud_drct_get_time () - 5000);
- break;
- case Qt::Key_Space:
- aud_drct_play_pause ();
- break;
- case Qt::Key_Delete:
- deleteCurrentSelection ();
- break;
- case Qt::Key_Z:
- aud_drct_pl_prev ();
- return;
- case Qt::Key_X:
- aud_drct_play ();
- return;
- case Qt::Key_C:
- aud_drct_pause ();
- return;
- case Qt::Key_V:
- aud_drct_stop ();
- return;
- case Qt::Key_B:
- aud_drct_pl_next ();
- return;
- case Qt::Key_Q:
- toggleQueue ();
- return;
- }
- break;
- }
-
- QTreeView::keyPressEvent (e);
-}
-
-void PlaylistWidget::mouseDoubleClickEvent (QMouseEvent * event)
-{
- if (event->button () == Qt::LeftButton)
- playCurrentIndex ();
-}
-
-void PlaylistWidget::currentChanged (const QModelIndex & current, const QModelIndex & previous)
-{
- QTreeView::currentChanged (current, previous);
-
- if (! inUpdate)
- aud_playlist_set_focus (playlist (), indexToRow (current));
-}
-
-void PlaylistWidget::selectionChanged (const QItemSelection & selected,
- const QItemSelection & deselected)
-{
- QTreeView::selectionChanged (selected, deselected);
-
- if (! inUpdate)
- {
- int list = playlist ();
-
- for (const QModelIndex & idx : selected.indexes ())
- aud_playlist_entry_set_selected (list, indexToRow (idx), true);
- for (const QModelIndex & idx : deselected.indexes ())
- aud_playlist_entry_set_selected (list, indexToRow (idx), false);
- }
-}
-
-int PlaylistWidget::playlist () const
-{
- return model->playlist ();
-}
-
-int PlaylistWidget::uniqueId () const
-{
- return model->uniqueId ();
-}
-
-void PlaylistWidget::scrollToCurrent ()
-{
- int list = playlist ();
- int entry = aud_playlist_get_position (list);
-
- aud_playlist_select_all (list, false);
- aud_playlist_entry_set_selected (list, entry, true);
- aud_playlist_set_focus (list, entry);
-
- // a playlist update should have been queued, unless the playlist is empty
- if (aud_playlist_update_pending (list))
- scrollQueued = true;
-}
-
-void PlaylistWidget::updatePlaybackIndicator ()
-{
- int list = playlist ();
-
- if (aud_playlist_update_pending (list))
- needIndicatorUpdate = true;
- else if (currentPos >= 0)
- model->updateRows (currentPos, 1);
-}
-
-void PlaylistWidget::update (const Playlist::Update & update)
-{
- inUpdate = true;
-
- int list = playlist ();
- int entries = aud_playlist_entry_count (list);
- int changed = entries - update.before - update.after;
-
- if (update.level == Playlist::Structure)
- {
- int old_entries = model->rowCount ();
- int removed = old_entries - update.before - update.after;
-
- if (currentPos >= old_entries - update.after)
- currentPos += entries - old_entries;
- else if (currentPos >= update.before)
- currentPos = -1;
-
- model->removeRows (update.before, removed);
- model->insertRows (update.before, changed);
- }
- else if (update.level == Playlist::Metadata || update.queue_changed)
- model->updateRows (update.before, changed);
-
- if (update.queue_changed)
- {
- for (int i = aud_playlist_queue_count (list); i --; )
- {
- int entry = aud_playlist_queue_get_entry (list, i);
- if (entry < update.before || entry >= entries - update.after)
- model->updateRows (entry, 1);
- }
- }
-
- int pos = aud_playlist_get_position (list);
-
- if (needIndicatorUpdate || pos != currentPos)
- {
- if (currentPos >= 0)
- model->updateRows (currentPos, 1);
- if (pos >= 0 && pos != currentPos)
- model->updateRows (pos, 1);
-
- currentPos = pos;
- needIndicatorUpdate = false;
- }
-
- auto sel = selectionModel ();
-
- for (int row = update.before; row < entries - update.after; row ++)
- {
- if (aud_playlist_entry_get_selected (list, row))
- sel->select (rowToIndex (row), sel->Select | sel->Rows);
- else
- sel->select (rowToIndex (row), sel->Deselect | sel->Rows);
- }
-
- auto current = rowToIndex (aud_playlist_get_focus (list));
- sel->setCurrentIndex (current, sel->NoUpdate);
-
- if (scrollQueued)
- {
- scrollTo (current);
- scrollQueued = false;
- }
-
- inUpdate = false;
-}
-
-void PlaylistWidget::playCurrentIndex ()
-{
- aud_playlist_set_position (playlist (), indexToRow (currentIndex ()));
- aud_playlist_play (playlist ());
-}
-
-void PlaylistWidget::deleteCurrentSelection ()
-{
- aud_playlist_delete_selected (playlist ());
-}
-
-void PlaylistWidget::toggleQueue ()
-{
- int row = indexToRow (currentIndex ());
- int at = aud_playlist_queue_find_entry (playlist (), row);
-
- if (at < 0)
- aud_playlist_queue_insert (playlist (), -1, row);
- else
- aud_playlist_queue_delete (playlist (), at, 1);
-}

audacious-plugins-3.6.2-gtk3.tar.bz2/src/qtui/playlist.h Deleted

@@ -1,63 +0,0 @@
-/*
- * playlist.h
- * Copyright 2014 Michał Lipski
- *
- * 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.
- */
-
-#ifndef PLAYLIST_H
-#define PLAYLIST_H
-
-#include <QTreeView>
-#include <libaudcore/playlist.h>
-
-#include "playlist_model.h"
-#include "filter_input.h"
-
-class QSortFilterProxyModel;
-
-class PlaylistWidget : public QTreeView
-{
-public:
- PlaylistWidget (QTreeView * parent = nullptr, int uniqueId = -1);
- ~PlaylistWidget ();
- void scrollToCurrent ();
- void updatePlaybackIndicator ();
- void update (const Playlist::Update & update);
- void playCurrentIndex ();
- void deleteCurrentSelection ();
- void setFilter (const QString &text);
- void toggleQueue ();
- int playlist () const;
- int uniqueId () const;
-
-private:
- PlaylistModel * model;
- QSortFilterProxyModel * proxyModel;
- int currentPos = -1;
- bool inUpdate = false;
- bool needIndicatorUpdate = false;
- bool scrollQueued = false;
-
- QModelIndex rowToIndex (int row);
- int indexToRow (const QModelIndex & index);
-
- void keyPressEvent (QKeyEvent * e); /* override default handler */
- void mouseDoubleClickEvent (QMouseEvent * event);
- void currentChanged (const QModelIndex & current, const QModelIndex & previous);
- void selectionChanged (const QItemSelection & selected, const QItemSelection & deselected);
-};
-
-#endif

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Classic Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Classic/balance.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Classic/cbuttons.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Classic/eq_ex.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Classic/eqmain.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Classic/main.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Classic/monoster.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Classic/nums_ex.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Classic/playpaus.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Classic/pledit.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Classic/pledit.txt Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Classic/posbar.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Classic/shufrep.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Classic/skin-classic.hints Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Classic/text.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Classic/titlebar.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Classic/viscolor.txt Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Classic/volume.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Classic1.3 Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Classic1.3/balance.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Classic1.3/cbuttons.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Classic1.3/eq_ex.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Classic1.3/eqmain.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Classic1.3/main.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Classic1.3/monoster.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Classic1.3/nums_ex.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Classic1.3/playpaus.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Classic1.3/pledit.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Classic1.3/pledit.txt Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Classic1.3/posbar.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Classic1.3/shufrep.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Classic1.3/skin-classic.hints Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Classic1.3/text.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Classic1.3/titlebar.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Classic1.3/volume.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Default Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Default/balance.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Default/cbuttons.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Default/eq_ex.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Default/eqmain.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Default/gtk-2.0 Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Default/gtk-2.0/Arrows Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Default/gtk-2.0/Arrows/arrow-down.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Default/gtk-2.0/Arrows/arrow-insens.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Default/gtk-2.0/Arrows/arrow-left.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Default/gtk-2.0/Arrows/arrow-right.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Default/gtk-2.0/Arrows/arrow-up.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Default/gtk-2.0/Buttons Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Default/gtk-2.0/Buttons/button-insensitive.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Default/gtk-2.0/Buttons/button-normal.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Default/gtk-2.0/Buttons/button-prelight.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Default/gtk-2.0/Check-Radio Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Default/gtk-2.0/Check-Radio/check1.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Default/gtk-2.0/Check-Radio/check2.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Default/gtk-2.0/Check-Radio/check3.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Default/gtk-2.0/Check-Radio/check4.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Default/gtk-2.0/Check-Radio/check5.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Default/gtk-2.0/Check-Radio/check6.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Default/gtk-2.0/Check-Radio/option1.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Default/gtk-2.0/Check-Radio/option2.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Default/gtk-2.0/Check-Radio/option3.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Default/gtk-2.0/Check-Radio/option4.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Default/gtk-2.0/Check-Radio/option5.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Default/gtk-2.0/Check-Radio/option6.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Default/gtk-2.0/Frame-Gap Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Default/gtk-2.0/Frame-Gap/frame-gap-end.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Default/gtk-2.0/Frame-Gap/frame-gap-start.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Default/gtk-2.0/Frame-Gap/frame.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Default/gtk-2.0/Handles Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Default/gtk-2.0/Handles/handle-h.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Default/gtk-2.0/Handles/handle-v.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Default/gtk-2.0/Lines Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Default/gtk-2.0/Lines/line-h.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Default/gtk-2.0/Lines/line-v.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Default/gtk-2.0/ListHeaders Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Default/gtk-2.0/ListHeaders/list_header-insens.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Default/gtk-2.0/ListHeaders/list_header-prelight.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Default/gtk-2.0/ListHeaders/list_header-pressed.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Default/gtk-2.0/ListHeaders/list_header.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Default/gtk-2.0/Menu-Menubar Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Default/gtk-2.0/Menu-Menubar/menu.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Default/gtk-2.0/Menu-Menubar/menubar-item-active.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Default/gtk-2.0/Menu-Menubar/menubar-item.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Default/gtk-2.0/Menu-Menubar/menubar.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Default/gtk-2.0/Others Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Default/gtk-2.0/Others/null.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Default/gtk-2.0/Others/ruler.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Default/gtk-2.0/Panel Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Default/gtk-2.0/Panel/panel-bg.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Default/gtk-2.0/ProgressBar Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Default/gtk-2.0/ProgressBar/progressbar-horiz.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Default/gtk-2.0/ProgressBar/trough-progressbar-horiz.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Default/gtk-2.0/Range Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Default/gtk-2.0/Range/slider-horiz-prelight.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Default/gtk-2.0/Range/slider-horiz.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Default/gtk-2.0/Range/slider-vert-prelight.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Default/gtk-2.0/Range/slider-vert.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Default/gtk-2.0/Range/trough-horizontal.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Default/gtk-2.0/Range/trough-vertical.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Default/gtk-2.0/Scrollbars Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Default/gtk-2.0/Scrollbars/scroll-thumb-horiz-pre.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Default/gtk-2.0/Scrollbars/scroll-thumb-horiz.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Default/gtk-2.0/Scrollbars/scroll-thumb-vert-pre.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Default/gtk-2.0/Scrollbars/scroll-thumb-vert.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Default/gtk-2.0/Scrollbars/slider-horiz-pre.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Default/gtk-2.0/Scrollbars/slider-horiz.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Default/gtk-2.0/Scrollbars/slider-vert-pre.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Default/gtk-2.0/Scrollbars/slider-vert.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Default/gtk-2.0/Scrollbars/stepper-down-prelight.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Default/gtk-2.0/Scrollbars/stepper-down.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Default/gtk-2.0/Scrollbars/stepper-left-prelight.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Default/gtk-2.0/Scrollbars/stepper-left.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Default/gtk-2.0/Scrollbars/stepper-right-prelight.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Default/gtk-2.0/Scrollbars/stepper-right.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Default/gtk-2.0/Scrollbars/stepper-up-prelight.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Default/gtk-2.0/Scrollbars/stepper-up.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Default/gtk-2.0/Scrollbars/trough-scrollbar-horiz.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Default/gtk-2.0/Scrollbars/trough-scrollbar-vert.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Default/gtk-2.0/Shadows Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Default/gtk-2.0/Shadows/shadow-in.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Default/gtk-2.0/Shadows/shadow-out.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Default/gtk-2.0/Shadows/text-.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Default/gtk-2.0/Shadows/text-entry.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Default/gtk-2.0/Spin Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Default/gtk-2.0/Spin/spin-down-disable.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Default/gtk-2.0/Spin/spin-down-prelight.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Default/gtk-2.0/Spin/spin-down.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Default/gtk-2.0/Spin/spin-up-disable.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Default/gtk-2.0/Spin/spin-up-prelight.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Default/gtk-2.0/Spin/spin-up.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Default/gtk-2.0/Tabs Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Default/gtk-2.0/Tabs/gap-bottom-left.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Default/gtk-2.0/Tabs/gap-bottom-right.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Default/gtk-2.0/Tabs/gap-left-bottom.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Default/gtk-2.0/Tabs/gap-left-top.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Default/gtk-2.0/Tabs/gap-right-bottom.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Default/gtk-2.0/Tabs/gap-right-top.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Default/gtk-2.0/Tabs/gap-top-current.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Default/gtk-2.0/Tabs/gap-top-left.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Default/gtk-2.0/Tabs/gap-top-right.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Default/gtk-2.0/Tabs/notebook.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Default/gtk-2.0/Tabs/tab-bottom-active.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Default/gtk-2.0/Tabs/tab-bottom.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Default/gtk-2.0/Tabs/tab-left-active.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Default/gtk-2.0/Tabs/tab-left.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Default/gtk-2.0/Tabs/tab-right-active.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Default/gtk-2.0/Tabs/tab-right.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Default/gtk-2.0/Tabs/tab-top-active.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Default/gtk-2.0/Tabs/tab-top.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Default/gtk-2.0/Toolbar Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Default/gtk-2.0/Toolbar/toolbar.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Default/gtk-2.0/gtkrc Deleted

@@ -1,1534 +0,0 @@
-include "panel.rc"
-
-gtk-menu-drop-shadow = 0
-gtk-menu-shadow-delay = 0
-
-style "default"
-{
-GtkWidget::interior_focus			= 7
-GtkWidget::focus_padding			= 1
-GtkButton::default_border			= {0,0,0,0}
-GtkButton::default_outside_border	= {0,0,0,0}
-
-GtkRange::trough_border			= 1
-GtkRange::slider_width			= 14
-GtkRange::stepper_size			= 14
-
-GtkVScale::slider_length 			= 29
-GtkVScale::slider_width 			= 15
-GtkHScale::slider_length 			= 29
-GtkHScale::slider_width 			= 15
-
-GtkPaned::handle_size			= 6
-GtkScrollbar::min_slider_length		= 50
-GtkCheckButton::indicator_size		= 12
-GtkCheckButton::indicator_spacing	= 3
-GtkMenuBar::internal_padding		= 1
-#GtkOptionMenu::indicator_size		= {15,8}
-#GtkOptionMenu::indicator_spacing	= {8,2,0,0}
-GtkStatusbar::shadow_type 		= GTK_SHADOW_NONE
-GtkSpinButton::shadow_type 		= GTK_SHADOW_NONE
-
-xthickness	= 2
-ythickness	= 2
-
-GtkEntry::cursor_color			= "#ffffff"
-GtkTextView::cursor_color			= "#ffffff"
-GtkTextView::secondary_cursor_color	= "#ffffff"
-GtkWidget::cursor_color			= "#ffffff"
-GtkWidget::secondary_cursor_color	= "#ffffff"
-
-fgNORMAL		= "#ffffff"
-fgPRELIGHT		= "#ffffff"
-fgACTIVE		= "#ffffff"
-fgSELECTED		= "#909090"
-fgINSENSITIVE		= "#909090"
-
-bgNORMAL		= "#080808"
-bgPRELIGHT		= "#000000"
-bgACTIVE		= "#000000"
-bgSELECTED		= "#080808"
-bgINSENSITIVE 	= "#3f3f3f"
-
-baseNORMAL		= "#000000"
-basePRELIGHT	= "#313131"
-baseACTIVE		= "#071f46"
-baseSELECTED	= "#0d377c"
-baseINSENSITIVE	= "#000000"
-
-textNORMAL		= "#ffffff"
-textPRELIGHT		= "#ffffff"
-textACTIVE		= "#ffffff"
-textSELECTED		= "#ffffff"
-textINSENSITIVE	= "#606060"
-
-engine "pixmap"
-{
-image
-{
-function		= HANDLE
-overlay_file	= "Handles/handle-h.png"
-overlay_stretch	= FALSE
-orientation	= HORIZONTAL
-}
-image
-{
-function		= HANDLE
-overlay_file	= "Handles/handle-v.png"
-overlay_stretch	= FALSE
-orientation	= VERTICAL
-}
-
-image
-{
-function	= SHADOW
-shadow	= IN
-file		= "Shadows/shadow-in.png"
-border	= {2,2,2,2}
-stretch	= TRUE
-}
-image
-{
-function	= SHADOW
-shadow	= OUT
-file		= "Shadows/shadow-out.png"
-stretch	= TRUE
-}
-
-image
-{
-function	= SHADOW
-shadow	= ETCHED_IN
-file		= "Frame-Gap/frame.png"
-border	= {2,2,2,2}
-stretch	= TRUE
-}
-image
-{
-function	= SHADOW
-shadow	= ETCHED_OUT
-file		= "Others/null.png"
-border	= {0,0,0,0}
-stretch	= TRUE
-}
-image
-{
-function			= SHADOW_GAP
-file				= "Frame-Gap/frame.png"
-border			= {2,2,2,2}
-stretch			= TRUE
-gap_start_file		= "Frame-Gap/frame-gap-start.png"
-gap_start_border	= {2,0,2,0}
-gap_end_file		= "Frame-Gap/frame-gap-end.png"
-gap_end_border	= {0,2,2,0}
-gap_side			= TOP
-}
-image
-{
-function	= VLINE
-file		= "Lines/line-v.png"
-border	= {0,0,0,0}
-stretch	= TRUE
-}
-image
-{
-function	= HLINE
-file		= "Lines/line-h.png"
-border	= {0,0,0,0}
-stretch	= TRUE
-}
-
-image
-{
-function		= ARROW
-overlay_file	= "Arrows/arrow-up.png"
-overlay_border	= {0,0,0,0}
-overlay_stretch	= FALSE
-arrow_direction	= UP
-}
-image
-{
-function		= ARROW
-overlay_file	= "Arrows/arrow-down.png"
-overlay_border	= {0,0,0,0}
-overlay_stretch	= FALSE
-arrow_direction	= DOWN
-}
-image
-{
-function		= ARROW
-overlay_file	= "Arrows/arrow-left.png"
-overlay_border	= {0,0,0,0}
-overlay_stretch	= FALSE
-arrow_direction	= LEFT
-}
-image
-{
-function		= ARROW
-overlay_file	= "Arrows/arrow-right.png"
-overlay_border	= {0,0,0,0}
-overlay_stretch	= FALSE
-arrow_direction	= RIGHT
-}
-image
-{
-function	= BOX
-file		= "Toolbar/toolbar.png"
-border	= {2,2,2,2}
-stretch	= TRUE
-}
-}
-
-}
-
-gtk-font-name = "Sans 8"
-
-class "GtkWidget" style "default"
-
-style "button" = "default"
-{
-engine "pixmap"
-{
-image
-{
-function	= BOX
-detail	= "buttondefault"
-file		= "Buttons/button-normal.png"
-border	= {2,2,2,2}
-stretch	= TRUE
-}
-image
-{
-function	= BOX
-state		= PRELIGHT
-file		= "Buttons/button-prelight.png"
-border	= {2,2,2,2}
-stretch	= TRUE
-}
-image
-{
-function	= BOX
-state		= ACTIVE
-file		= "Buttons/button-prelight.png"
-border	= {2,2,2,2}
-stretch	= TRUE
-}
-image
-{
-function	= BOX
-state		= INSENSITIVE
-file		= "Buttons/button-insensitive.png"
-border	= {2,2,2,2}
-stretch	= TRUE
-}
-image
-{
-function	= BOX
-file		= "Buttons/button-normal.png"
-border	= {2,2,2,2}
-stretch	= TRUE
-}
-}
-}
-
-style "checkradiobutton" {
-engine "pixmap" {
-image
-{
-function	= FLAT_BOX
-file		= "Others/null.png"
-border	= {0,0,0,0}
-stretch	= TRUE
-}
-}
-}
-
-class "GtkRadioButton" style "checkradiobutton"
-class "GtkCheckButton" style "checkradiobutton"
-
-style "optionmenu" = "default"
-{
-engine "pixmap"
-{
-image
-{
-function	= BOX
-state		= PRELIGHT
-file		= "Buttons/button-prelight.png"
-border	= {2,2,2,2}
-stretch	= TRUE
-}
-image
-{
-function	= BOX
-detail	= "buttondefault"
-state		= NORMAL
-file		= "Buttons/button-normal.png"
-border	= {2,2,2,2}
-stretch	= TRUE
-}
-
-image
-{
-function	= BOX
-state		= ACTIVE
-file		= "Buttons/button-prelight.png"
-border	= {2,2,2,2}
-stretch	= TRUE
-}
-image
-{
-function	= BOX
-state		= INSENSITIVE
-file		= "Buttons/button-insensitive.png"
-border	= {2,2,2,2}
-stretch	= TRUE
-}
-image
-{
-function		= TAB
-state			= INSENSITIVE
-overlay_file	= "Arrows/arrow-insens.png"
-overlay_stretch	= FALSE
-}
-image
-{
-function		= TAB
-state			= NORMAL
-overlay_file	= "Arrows/arrow-down.png"
-overlay_border	= {0,0,0,0}
-overlay_stretch	= FALSE
-}
-image
-{
-function		= TAB
-state			= PRELIGHT
-overlay_file	= "Arrows/arrow-down.png"
-overlay_border	= {0,0,0,0}
-overlay_stretch	= FALSE
-}
-}
-}
-
-widget_class "*Combo*" style "optionmenu"
-
-style "radiobutton"	= "default"
-{
-engine "pixmap"
-{
-image
-{
-function 		= OPTION
-state 		= NORMAL
-shadow 		= OUT
-overlay_file 	= "Check-Radio/option1.png"
-overlay_stretch 	= FALSE
-}
-image
-{
-function 		= OPTION
-state			= PRELIGHT
-shadow 		= OUT
-overlay_file 	= "Check-Radio/option3.png"
-overlay_stretch 	= FALSE
-}
-image
-{
-function 		= OPTION
-state 		= ACTIVE
-shadow 		= OUT
-overlay_file 	= "Check-Radio/option1.png"
-overlay_stretch 	= FALSE
-}
-image
-{
-function 		= OPTION
-state 		= INSENSITIVE
-shadow 		= OUT
-overlay_file 	= "Check-Radio/option5.png"
-overlay_stretch 	= FALSE
-}
-
-image
-{
-function 		= OPTION
-state 		= NORMAL
-shadow 		= IN
-overlay_file 	= "Check-Radio/option2.png"
-overlay_stretch 	= FALSE
-}
-image
-{
-function 		= OPTION
-state 		= PRELIGHT
-shadow 		= IN
-overlay_file 	= "Check-Radio/option4.png"
-overlay_stretch 	= FALSE
-}
-image
-{
-function 		= OPTION
-state 		= ACTIVE
-shadow 		= IN
-overlay_file 	= "Check-Radio/option2.png"
-overlay_stretch 	= FALSE
-}
-image
-{
-function 		= OPTION
-state 		= INSENSITIVE
-shadow 		= IN
-overlay_file 	= "Check-Radio/option6.png"
-overlay_stretch 	= FALSE
-}
-
-image
-{
-function 	= FLAT_BOX
-stretch	= TRUE
-file 		= "Others/null.png"
-border 	= {0,0,0,0}
-}
-}
-}
-
-style "checkbutton"	= "default"
-{
-engine "pixmap"
-{
-image
-{
-function 		= CHECK
-state 		= NORMAL
-shadow 		= OUT
-overlay_file 	= "Check-Radio/check1.png"
-overlay_stretch 	= FALSE
-}
-image
-{
-function 		= CHECK
-state 		= PRELIGHT
-shadow 		= OUT
-overlay_file 	= "Check-Radio/check3.png"
-overlay_stretch 	= FALSE
-}
-image
-{
-function 		= CHECK
-state 		= ACTIVE
-shadow 		= OUT
-overlay_file 	= "Check-Radio/check1.png"
-overlay_stretch 	= FALSE
-}
-image
-{
-function 		= CHECK
-state 		= INSENSITIVE
-shadow 		= OUT
-overlay_file 	= "Check-Radio/check5.png"
-overlay_stretch 	= FALSE
-}
-
-image
-{
-function 		= CHECK
-state 		= NORMAL
-shadow 		= IN
-overlay_file 	= "Check-Radio/check2.png"
-overlay_stretch 	= FALSE
-}
-image
-{
-function 		= CHECK
-state 		= PRELIGHT
-shadow 		= IN
-overlay_file 	= "Check-Radio/check4.png"
-overlay_stretch 	= FALSE
-}
-image
-{
-function 		= CHECK
-state 		= ACTIVE
-shadow 		= IN
-overlay_file 	= "Check-Radio/check4.png"
-overlay_stretch 	= FALSE
-}
-image
-{
-function 		= CHECK
-state 		= INSENSITIVE
-shadow 		= IN
-overlay_file 	= "Check-Radio/check6.png"
-overlay_stretch 	= FALSE
-}
-
-image
-{
-function 	= FLAT_BOX
-stretch	= TRUE
-file 		= "Others/null.png"
-border 	= {2,2,2,2}
-}
-}
-}
-
-style "entry" = "default"
-{
-
-xthickness = 3
-ythickness = 1
-
-GtkWidget::interior_focus = 0
-
-engine "pixmap"
-{
-image
-{
-function	= FOCUS
-file		= "Shadows/text-entry.png"
-border	= {1,1,1,1}
-stretch	= TRUE
-}
-image
-{
-function	= BOX
-shadow	= IN
-state		= NORMAL
-file		= "Shadows/text-entry.png"
-border	= {1,1,1,1}
-stretch	= TRUE
-}
-image
-{
-function	= BOX
-shadow	= OUT
-state		= NORMAL
-file		= "Shadows/text-entry.png"
-border	= {1,1,1,1}
-stretch	= TRUE
-}
-image
-{
-function	= SHADOW
-detail	= "entry"
-shadow	= IN
-file		= "Shadows/text-entry.png"
-border	= {1,1,1,1}
-stretch	= TRUE
-}
-}
-}
-
-
-style "spinbutton" = "entry"
-{
-
-
-engine "pixmap"
-{
-image
-{
-function = ARROW
-}
-
-image
-{
-function		= BOX
-state 		= NORMAL
-detail		= "spinbutton_up"
-file			= "Others/null.png"
-border		= {0,0,0,0}
-stretch		= TRUE
-overlay_file	= "Spin/spin-up.png"
-overlay_stretch	= FALSE
-}
-image
-{
-function		= BOX
-state 		= PRELIGHT
-detail		= "spinbutton_up"
-file			= "Others/null.png"
-border		= {0,0,0,0}
-stretch		= TRUE
-overlay_file	= "Spin/spin-up-prelight.png"
-overlay_stretch	= FALSE
-}
-image
-{
-function		= BOX
-state 		= INSENSITIVE
-detail		= "spinbutton_up"
-file			= "Others/null.png"
-border		= {0,0,0,0}
-stretch		= TRUE
-overlay_file	= "Spin/spin-up-disable.png"
-overlay_stretch	= FALSE
-}
-image
-{
-function		= BOX
-state 		= ACTIVE
-detail		= "spinbutton_up"
-file			= "Others/null.png"
-border		= {0,0,0,0}
-stretch		= TRUE
-overlay_file	= "Spin/spin-up-prelight.png"
-overlay_stretch	= FALSE
-}
-
-image
-{
-function		= BOX
-state 		= NORMAL
-detail		= "spinbutton_down"
-file			= "Others/null.png"
-border		= {0,0,0,0}
-stretch		= TRUE
-overlay_file	= "Spin/spin-down.png"
-overlay_stretch	= FALSE
-}
-image
-{
-function		= BOX
-state 		= PRELIGHT
-detail		= "spinbutton_down"
-file			= "Others/null.png"
-border		= {0,0,0,0}
-stretch		= TRUE
-overlay_file	= "Spin/spin-down-prelight.png"
-overlay_stretch	= FALSE
-}
-image
-{
-function		= BOX
-state 		= INSENSITIVE
-detail		= "spinbutton_down"
-file			= "Others/null.png"
-border		= {0,0,0,0}
-stretch		= TRUE
-overlay_file	= "Spin/spin-down-disable.png"
-overlay_stretch	= FALSE
-}
-
-image
-{
-function		= BOX
-state 		= ACTIVE
-detail		= "spinbutton_down"
-file			= "Others/null.png"
-border		= {0,0,0,0}
-stretch		= TRUE
-overlay_file	= "Spin/spin-down-prelight.png"
-overlay_stretch	= FALSE
-}
-}
-}
-
-style "scrollbar" = "default"
-{
-engine "pixmap"
-{
-
-image
-{
-function	= BOX
-detail	= "trough"
-file		= "Scrollbars/trough-scrollbar-horiz.png"
-border	= {16,16,2,2}
-stretch	= TRUE
-orientation = HORIZONTAL
-}
-image
-{
-function	= BOX
-detail	= "trough"
-file		= "Scrollbars/trough-scrollbar-vert.png"
-border	= {2,2,16,16}
-stretch	= TRUE
-orientation = VERTICAL
-}
-
-
-image
-{
-function		= SLIDER
-state 		= NORMAL
-file			= "Scrollbars/slider-horiz.png"
-border		= {2,2,2,2}
-stretch		= TRUE
-orientation	= HORIZONTAL
-}
-image
-{
-function		= SLIDER
-state 		= ACTIVE
-shadow		= IN
-file			= "Scrollbars/slider-horiz-pre.png"
-border		= {2,2,2,2}
-stretch		= TRUE
-orientation	= HORIZONTAL
-}
-
-image
-{
-function		= SLIDER
-state 		= PRELIGHT
-file			= "Scrollbars/slider-horiz-pre.png"
-border		= {2,2,2,2}
-stretch		= TRUE
-orientation	= HORIZONTAL
-}
-image
-{
-function		= SLIDER
-state 		= INSENSITIVE
-file			= "Scrollbars/slider-horiz.png"
-border		= {2,2,2,2}
-stretch		= TRUE
-orientation	= HORIZONTAL
-}
-
-
-image
-{
-function		= SLIDER
-state 		= NORMAL
-file			= "Scrollbars/slider-vert.png"
-border		= {2,2,2,2}
-stretch		= TRUE
-orientation	= VERTICAL
-}
-image
-{
-function		= SLIDER
-state 		= ACTIVE
-shadow		= IN
-file			= "Scrollbars/slider-vert-pre.png"
-border		= {2,2,2,2}
-stretch		= TRUE
-orientation	= VERTICAL
-}
-image
-{
-function		= SLIDER
-state 		= PRELIGHT
-file			= "Scrollbars/slider-vert-pre.png"
-border		= {2,2,2,2}
-stretch		= TRUE
-orientation	= VERTICAL
-}
-image
-{
-function		= SLIDER
-state 		= INSENSITIVE
-file			= "Scrollbars/slider-vert.png"
-border		= {2,2,2,2}
-stretch		= TRUE
-orientation	= VERTICAL
-}
-
-image
-{
-function		= STEPPER
-state			= NORMAL
-file			= "Scrollbars/stepper-up.png"
-stretch		= TRUE
-arrow_direction	= UP
-}
-image
-{
-function		= STEPPER
-state			= PRELIGHT
-file			= "Scrollbars/stepper-up-prelight.png"
-stretch		= TRUE
-arrow_direction	= UP
-}
-image
-{
-function		= STEPPER
-state			= ACTIVE
-file			= "Scrollbars/stepper-up-prelight.png"
-stretch		= TRUE
-arrow_direction	= UP
-}
-image
-{
-function		= STEPPER
-state			= INSENSITIVE
-file			= "Scrollbars/stepper-up.png"
-stretch		= TRUE
-arrow_direction	= UP
-}
-
-
-image
-{
-function		= STEPPER
-state			= NORMAL
-file			= "Scrollbars/stepper-down.png"
-stretch		= TRUE
-arrow_direction	= DOWN
-}
-image
-{
-function		= STEPPER
-state			= PRELIGHT
-file			= "Scrollbars/stepper-down-prelight.png"
-stretch		= TRUE
-arrow_direction	= DOWN
-}
-image
-{
-function		= STEPPER
-state			= ACTIVE
-file			= "Scrollbars/stepper-down-prelight.png"
-stretch		= TRUE
-arrow_direction	= DOWN
-}
-image
-{
-function		= STEPPER
-state			= INSENSITIVE
-file			= "Scrollbars/stepper-down.png"
-stretch		= TRUE
-arrow_direction	= DOWN
-}
-
-image
-{
-function		= STEPPER
-state			= NORMAL
-file			= "Scrollbars/stepper-right.png"
-stretch		= TRUE
-arrow_direction	= RIGHT
-}
-image
-{
-function		= STEPPER
-state			= PRELIGHT
-file			= "Scrollbars/stepper-right-prelight.png"
-stretch		= TRUE
-arrow_direction	= RIGHT
-}
-image
-{
-function		= STEPPER
-state			= ACTIVE
-file			= "Scrollbars/stepper-right-prelight.png"
-stretch		= TRUE
-arrow_direction	= RIGHT
-}
-image
-{
-function		= STEPPER
-state			= INSENSITIVE
-file			= "Scrollbars/stepper-right.png"
-stretch		= TRUE
-arrow_direction	= RIGHT
-}
-
-image
-{
-function		= STEPPER
-state			= NORMAL
-file			= "Scrollbars/stepper-left.png"
-stretch		= TRUE
-arrow_direction	= LEFT
-}
-image
-{
-function		= STEPPER
-state			= PRELIGHT
-file			= "Scrollbars/stepper-left-prelight.png"
-stretch		= TRUE
-arrow_direction	= LEFT
-}
-image
-{
-function		= STEPPER
-state			= ACTIVE
-file			= "Scrollbars/stepper-left-prelight.png"
-stretch		= TRUE
-arrow_direction	= LEFT
-}
-image
-{
-function		= STEPPER
-state			= INSENSITIVE
-file			= "Scrollbars/stepper-left.png"
-stretch		= TRUE
-arrow_direction	= LEFT
-}
-}
-}
-
-style "progressbar" {
-fgPRELIGHT 	= "#ffffff"
-textPRELIGHT = "#ffffff"
-xthickness 	= 2
-ythickness 	= 2
-
-engine "pixmap"
-{
-image
-{
-function		= BOX
-detail		= "trough"
-file			= "ProgressBar/trough-progressbar-horiz.png"
-border		= {1,1,1,1}
-stretch		= TRUE
-}
-image
-{
-function		= BOX
-detail		= "bar"
-file			= "ProgressBar/progressbar-horiz.png"
-border		= {1,1,1,1}
-stretch		= TRUE
-}
-}
-}
-
-style "range" = "default"
-{
-engine "pixmap"
-{
-image
-{
-function		= BOX
-detail		= "trough"
-file			= "Range/trough-horizontal.png"
-border		= {2,2,8,7}
-stretch		= TRUE
-orientation	= HORIZONTAL
-}
-image
-{
-function		= BOX
-detail		= "trough"
-file			= "Range/trough-vertical.png"
-border		= {7,8,2,2}
-stretch		= TRUE
-orientation	= VERTICAL
-}
-
-image
-{
-function		= SLIDER
-state 		= NORMAL
-file			= "Others/null.png"
-border		= {0,0,0,0}
-stretch		= TRUE
-overlay_file	= "Range/slider-horiz.png"
-overlay_stretch	= FALSE
-orientation	= HORIZONTAL
-}
-image
-{
-function		= SLIDER
-state 		= PRELIGHT
-file			= "Others/null.png"
-border		= {0,0,0,0}
-stretch		= TRUE
-overlay_file	= "Range/slider-horiz-prelight.png"
-overlay_stretch	= FALSE
-orientation	= HORIZONTAL
-}
-image
-{
-function		= SLIDER
-state 		= INSENSITIVE
-file			= "Others/null.png"
-border		= {0,0,0,0}
-stretch		= TRUE
-overlay_file	= "Range/slider-horiz.png"
-overlay_stretch	= FALSE
-orientation	= HORIZONTAL
-}
-
-image
-{
-function		= SLIDER
-state 		= NORMAL
-file			= "Others/null.png"
-border		= {0,0,0,0}
-stretch		= TRUE
-overlay_file	= "Range/slider-vert.png"
-overlay_stretch	= FALSE
-orientation	= VERTICAL
-}
-image
-{
-function		= SLIDER
-state 		= PRELIGHT
-file			= "Others/null.png"
-border		= {0,0,0,0}
-stretch		= TRUE
-overlay_file	= "Range/slider-vert-prelight.png"
-overlay_stretch	= FALSE
-orientation	= VERTICAL
-}
-image
-{
-function		= SLIDER
-state 		= INSENSITIVE
-file			= "Others/null.png"
-border		= {0,0,0,0}
-stretch		= TRUE
-overlay_file	= "Range/slider-vert.png"
-overlay_stretch	= FALSE
-orientation	= VERTICAL
-}
-}
-}
-
-style "toolbar"
-{
-
-engine "pixmap"
-{
-image
-{
-function	= BOX
-file		= "Toolbar/toolbar.png"
-border	= {2,2,2,2}
-stretch	= TRUE
-}
-}
-}
-#widget_class "*BonoboDockItem" style "toolbar"
-#class "*BonoboDockItem" style "toolbar"
-
-widget_class "*HandleBox" style "toolbar"
-class "*HandleBox" style "toolbar"
-
-widget_class "*Toolbar" style "toolbar"
-class "*Toolbar" style "toolbar"
-
-style "toolbuttons" = "default"
-{
-xthickness = 1
-ythickness = 1
-
-GtkWidget::focus_padding = 2
-
-engine "pixmap" {
-
-image
-{
-function 	= BOX
-state		= NORMAL
-file		= "Buttons/button-normal.png"
-border	= {2,2,2,2}
-stretch 	= TRUE
-}
-image
-{
-function 	= BOX
-state		= PRELIGHT
-file 		= "Buttons/button-prelight.png"
-border	= {2,2,2,2}
-stretch 	= TRUE
-}
-image
-{
-function 	= BOX
-state		= ACTIVE
-file 		= "Buttons/button-prelight.png"
-border	= {2,2,2,2}
-stretch 	= TRUE
-}
-image
-{
-function 	= BOX
-state		= INSENSITIVE
-file 		= "Buttons/button-normal.png"
-border	= {2,2,2,2}
-stretch 	= TRUE
-}
-}
-}
-widget_class "*Tool*GtkToggleButton" style "toolbuttons"
-widget_class "*Tool*GtkButton" style "toolbuttons"
-
-style "menu" = "default"
-{
-#bg_pixmapNORMAL = "Menu-Menubar/menu-overlay.png"
-xthickness	= 1
-ythickness	= 1
-
-engine "pixmap"
-{
-image
-{
-function	= BOX
-detail	= "menu"
-file		= "Menu-Menubar/menu.png"
-border	= {2,2,14,2}
-stretch	= TRUE
-}
-}
-}
-
-style "menuitem" = "default"
-{
-xthickness		= 1
-fgPRELIGHT 	= "#ffffff"
-textPRELIGHT	= "#949494"
-
-engine "pixmap"
-{
-image
-{
-function		= BOX
-file			= "Menu-Menubar/menubar-item-active.png"
-border		= {2,2,2,2}
-stretch		= TRUE
-}
-image
-{
-function		= ARROW
-state			= NORMAL
-overlay_file	= "Arrows/arrow-right.png"
-overlay_stretch	= FALSE
-arrow_direction	= RIGHT
-}
-image
-{
-function		= ARROW
-state			= PRELIGHT
-overlay_file	= "Arrows/arrow-right.png"
-overlay_stretch	= FALSE
-arrow_direction	= RIGHT
-}
-}
-}
-
-style "tearoffmenuitem" = "menuitem"
-{
-engine "pixmap"
-{
-image
-{
-function		= ARROW
-file			= "Arrows/arrow-left.png"
-stretch		= TRUE
-arrow_direction	= LEFT
-}
-}
-}
-
-style "menubar"
-{
-fgNORMAL		= "#ffffff"
-textNORMAL		= "#ffffff"
-fgPRELIGHT		= "#ffffff"
-fgACTIVE		= "#ffffff"
-fgINSENSITIVE		= "#909090"
-bgINSENSITIVE	= "#3f3f3f"
-textPRELIGHT		= "#ffffff"
-
-xthickness	= 1
-ythickness	= 1
-engine "pixmap"
-{
-image
-{
-function	= BOX
-state 	= NORMAL
-file		= "Menu-Menubar/menubar.png"
-border	= {2,2,2,2}
-stretch	= TRUE
-}
-
-image
-{
-function	= BOX
-state 	= ACTIVE
-file		= "Menu-Menubar/menubar.png"
-border	= {2,2,2,2}
-stretch	= TRUE
-}
-
-image
-{
-function	= BOX
-state 	= INSENSITIVE
-file		= "Menu-Menubar/menubar.png"
-border	= {2,2,2,2}
-stretch	= TRUE
-}
-
-image
-{
-function	= BOX
-state 	= PRELIGHT
-file		= "Menu-Menubar/menubar-item.png"
-border	= {2,2,14,1}
-stretch	= TRUE
-}
-}
-}
-
-style "notebook" = "default"
-{
-
-xthickness = 2
-ythickness = 2
-engine "pixmap"
-{
-image
-{
-function	= EXTENSION
-state		= ACTIVE
-file		= "Tabs/tab-bottom.png"
-border	= {3,3,1,4}
-stretch	= TRUE
-gap_side	= TOP
-}
-image
-{
-function	= EXTENSION
-state		= ACTIVE
-file		= "Tabs/tab-top.png"
-border	= {3,3,4,1}
-stretch	= TRUE
-gap_side	= BOTTOM
-}
-image
-{
-function	= EXTENSION
-state		= ACTIVE
-file		= "Tabs/tab-left.png"
-border	= {4,1,3,3}
-stretch	= TRUE
-gap_side	= RIGHT
-}
-image
-{
-function	= EXTENSION
-state		= ACTIVE
-file		= "Tabs/tab-right.png"
-border	= {1,4,3,3}
-stretch	= TRUE
-gap_side	= LEFT
-}
-image
-{
-function	= EXTENSION
-file		= "Tabs/tab-top-active.png"
-border	= {3,3,3,1}
-stretch	= TRUE
-gap_side	= BOTTOM
-}
-image
-{
-function	= EXTENSION
-file		= "Tabs/tab-bottom-active.png"
-border	= {3,3,1,3}
-stretch	= TRUE
-gap_side	= TOP
-}
-image
-{
-function	= EXTENSION
-file		= "Tabs/tab-left-active.png"
-border	= {3,1,3,3}
-stretch	= TRUE
-gap_side	= RIGHT
-}
-image
-{
-function	= EXTENSION
-file		= "Tabs/tab-right-active.png"
-border	= {1,3,3,3}
-stretch	= TRUE
-gap_side	= LEFT
-}
-
-image
-{
-function		= BOX_GAP
-file			= "Tabs/notebook.png"
-border			= {1,1,1,1}
-stretch			= TRUE
-gap_file		= "Tabs/gap-top-current.png"
-gap_border		= {2,2,2,2}
-gap_start_file		= "Tabs/gap-top-left.png"
-gap_start_border	= {1,0,1,0}
-gap_end_file		= "Tabs/gap-top-right.png"
-gap_end_border		= {0,1,1,0}
-gap_side			= TOP
-}
-image
-{
-function			= BOX_GAP
-file				= "Tabs/notebook.png"
-border			= {1,1,1,1}
-stretch			= TRUE
-gap_file		= "Tabs/gap-top-current.png"
-gap_border		= {2,2,2,2}
-gap_start_file		= "Tabs/gap-bottom-left.png"
-gap_start_border	= {1,0,1,0}
-gap_end_file		= "Tabs/gap-bottom-right.png"
-gap_end_border		= {0,1,1,0}
-gap_side			= BOTTOM
-}
-image
-{
-function			= BOX_GAP
-file				= "Tabs/notebook.png"
-border			= {1,1,1,1}
-stretch			= TRUE
-gap_file		= "Tabs/gap-top-current.png"
-gap_border		= {2,2,2,2}
-gap_start_file		= "Tabs/gap-left-top.png"
-gap_start_border	= {1,0,1,0}
-gap_end_file		= "Tabs/gap-left-bottom.png"
-gap_end_border		= {1,0,0,1}
-gap_side			= LEFT
-}
-image
-{
-function			= BOX_GAP
-file				= "Tabs/notebook.png"
-border			= {1,1,1,1}
-stretch			= TRUE
-gap_file		= "Tabs/gap-top-current.png"
-gap_border		= {2,2,2,2}
-gap_start_file		= "Tabs/gap-right-top.png"
-gap_start_border	= {0,1,1,0}
-gap_end_file		= "Tabs/gap-right-bottom.png"
-gap_end_border		= {0,1,0,1}
-gap_side			= RIGHT
-}
-
-# Notebook with no tabs
-image
-{
-function			= BOX
-file				= "Tabs/notebook.png"
-border			= {1,1,1,1}
-stretch			= TRUE
-}
-}
-}
-
-style "tooltips"	= "default"
-{
-bgNORMAL	= "#070707"
-}
-
-style "ruler" = "default"
-{
-engine "pixmap" {
-image
-{
-function	= BOX
-detail	= "vruler"
-file		= "Others/ruler.png"
-border	= {1,1,1,1}
-stretch	= TRUE
-}
-image
-{
-function	= BOX
-detail	= "hruler"
-file		= "Others/ruler.png"
-border	= {1,1,1,1}
-stretch	= TRUE
-}
-}
-}
-
-style "handlebox" = "default"
-{
-engine "pixmap"
-{
-image
-{
-}
-image
-{
-function		= HANDLE
-overlay_file	= "Handles/handle-v.png"
-overlay_stretch	= FALSE
-orientation	= VERTICAL
-}
-image
-{
-function		= HANDLE
-overlay_file	= "Handles/handle-h.png"
-overlay_stretch 	= FALSE
-orientation	= HORIZONTAL
-}
-}
-}
-
-style "flat" = "default"
-{
-engine "pixmap"
-{
-image
-{
-function = SHADOW
-}
-}
-}
-
-style "layout" = "default"
-{
-engine "pixmap"
-{
-image
-{
-function	= SHADOW
-detail	= "entry"
-shadow	= IN
-file		= "Shadows/text-.png"
-border	= {1,1,1,1}
-stretch	= TRUE
-}
-image
-{
-function	= BOX
-detail	= "button"
-state		= NORMAL
-file		= "Buttons/button-normal.png"
-border	= {2,2,2,2}
-stretch	= TRUE
-}
-}
-}
-
-style "list-header"
-{
-ythickness = 3
-GtkTreeView::odd_row_color = "#171717"
-GtkTreeView::even_row_color = "#000000"
-
-engine "pixmap"
-{
-image
-{
-function 	= BOX
-state		= NORMAL
-file 		= "ListHeaders/list_header.png"
-border 	= {1,2,1,2}
-stretch 	= TRUE
-}
-
-image
-{
-function 	= BOX
-state		= PRELIGHT
-file 		= "ListHeaders/list_header-prelight.png"
-border 	= {1,2,5,2}
-stretch 	= TRUE
-}
-
-image
-{
-function 	= BOX
-state		= ACTIVE
-file		= "ListHeaders/list_header-pressed.png"
-border 	= {0,0,0,0}
-stretch 	= TRUE
-}
-image
-{
-function 	= BOX
-state		= SELECTED
-file		= "ListHeaders/list_header-prelight.png"
-border 	= {4,5,2,2}
-stretch 	= TRUE
-}
-image
-{
-function 	= BOX
-state		= INSENSITIVE
-file		= "ListHeaders/list_header-insens.png"
-border 	= {1,2,1,2}
-stretch 	= TRUE
-}
-}
-}
-
-widget_class "*List" style "list-header"
-widget_class "*GtkTree*" style "list-header"
-widget_class "*GtkCList*" style "list-header"
-#widget_class "*Tree*" style "list-header"
-
-# Sodipodi bug
-style "unstyle"
-{
-engine ""
-{
-}
-}
-class "SPColorSlider" 			style "unstyle"
-
-style "SPbutton"
-{
-engine "pixmap"
-{
-image
-{
-function	= BOX
-shadow	= IN
-file		= "Shadows/shadow-out.png"
-border	= {2,2,2,2}
-stretch	= TRUE
-}
-image
-{
-function	= BOX
-}
-}
-}
-
-style "treecol"
-{
-bgNORMAL = "#000000"
-}
-
-class "GtkButton" 			style "button"
-class "GtkRadioButton" 		style "radiobutton"
-class "GtkRadioMenuItem" 	style "radiobutton"
-class "GtkCheckButton" 		style "checkbutton"
-class "GtkCheckMenuItem" 	style "checkbutton"
-class "GtkOptionMenu" 		style "optionmenu"
-class "GtkCombo*" 			style "optionmenu"
-class "*Font*" 				style "optionmenu"
-class "GtkEntry" 			style "entry"
-class "GtkOldEditable" 		style "entry"
-class "GtkSpinButton" 	 	style "spinbutton"
-class "GtkRuler" 			style "ruler"
-class "GtkScrollbar" 			style "scrollbar"
-class "GtkProgressBar" 		style "progressbar"
-class "GtkRange" 			style "range"
-class "GtkMenu" 			style "menu"
-class "GtkMenuBar*" 		 	style "menubar"
-widget_class "*MenuBar.*" 	style "menubar"
-class "GtkMenuItem"			style "menuitem"
-class "GtkTearoffMenuItem"	style "menuitem"
-class "GtkNotebook"	 		style "notebook"
-class "GtkToolbar" 			style "flat"
-class "GtkHandleBox" 		style "handlebox"
-class "GtkEventBox" 			style "flat"
-class "GtkPaned" 			style "handlebox"
-class "GtkLayout" 			style "layout"
-class "SPButton" 			style "SPbutton"
-widget "gtk-tooltips" 		style "tooltips"
-
-# colorize ugly white line at the top of the vertical scrollbar in Nautilus
-style "searchbar" {
-bgNORMAL = "#080808"
-}
-widget "*.nautilus-extra-view-widget" style:highest "searchbar"
-
-# separator in Nautilus sidebar
-style "separator" {
-bgNORMAL = "#191919"
-}
-widget "*nautilus*side*" 		style:highest "separator"

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Default/gtk-2.0/panel.rc Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Default/main.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Default/monoster.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Default/nums_ex.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Default/playpaus.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Default/pledit.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Default/posbar.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Default/shufrep.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Default/text.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Default/titlebar.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Default/volume.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Ivory Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Ivory/balance.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Ivory/cbuttons.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Ivory/eq_ex.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Ivory/eqmain.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Ivory/main.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Ivory/monoster.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Ivory/nums_ex.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Ivory/playpaus.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Ivory/pledit.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Ivory/posbar.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Ivory/shufrep.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Ivory/text.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Ivory/titlebar.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Ivory/volume.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Osmosis Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Osmosis/balance.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Osmosis/cbuttons.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Osmosis/eq_ex.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Osmosis/eqmain.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Osmosis/main.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Osmosis/monoster.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Osmosis/nums_ex.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Osmosis/playpaus.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Osmosis/pledit.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Osmosis/pledit.txt Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Osmosis/posbar.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Osmosis/shufrep.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Osmosis/text.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Osmosis/titlebar.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Osmosis/viscolor.txt Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Osmosis/volume.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Refugee Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Refugee/cbuttons.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Refugee/eq_ex.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Refugee/eqmain.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Refugee/main.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Refugee/monoster.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Refugee/numbers.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Refugee/nums_ex.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Refugee/playpaus.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Refugee/pledit.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Refugee/posbar.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Refugee/shufrep.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Refugee/text.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Refugee/titlebar.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/Refugee/volume.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/TinyPlayer Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/TinyPlayer/balance.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/TinyPlayer/cbuttons.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/TinyPlayer/eq_ex.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/TinyPlayer/eqmain.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/TinyPlayer/main.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/TinyPlayer/monoster.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/TinyPlayer/nums_ex.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/TinyPlayer/playpaus.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/TinyPlayer/pledit.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/TinyPlayer/posbar.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/TinyPlayer/shufrep.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/TinyPlayer/text.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/TinyPlayer/titlebar.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Skins/TinyPlayer/volume.png Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/draw-compat.h Deleted

@@ -1,43 +0,0 @@
-/*
- * draw-compat.h
- * Copyright 2011 John Lindgren
- *
- * This file is part of Audacious.
- *
- * Audacious 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, version 2 or version 3 of the License.
- *
- * Audacious 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
- * Audacious. If not, see <http://www.gnu.org/licenses/>.
- *
- * The Audacious team does not consider modular code linking to Audacious or
- * using our public API to be a derived work.
- */
-
-#ifndef SKINS_DRAW_COMPAT_H
-#define SKINS_DRAW_COMPAT_H
-
-#include <gtk/gtk.h>
-
-static void widget_realized (GtkWidget * w)
-{
- GdkWindow * window = gtk_widget_get_window (w);
- gdk_window_set_background_pattern (window, nullptr);
-}
-
-#define DRAW_SIGNAL "draw"
-#define DRAW_FUNC_BEGIN(n) static gboolean n (GtkWidget * wid, cairo_t * cr) { \
- g_return_val_if_fail (wid && cr, FALSE);
-#define DRAW_FUNC_END return FALSE; }
-
-#define DRAW_CONNECT(w,f) do { \
- g_signal_connect (w, "realize", (GCallback) widget_realized, nullptr); \
- g_signal_connect (w, DRAW_SIGNAL, (GCallback) f, nullptr); \
- } while (0);
-
-#endif

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/preset-browser.cc Deleted

@@ -1,158 +0,0 @@
-/*
- * preset-browser.c
- * Copyright 2014 John Lindgren
- *
- * This file is part of Audacious.
- *
- * Audacious 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, version 2 or version 3 of the License.
- *
- * Audacious 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
- * Audacious. If not, see <http://www.gnu.org/licenses/>.
- *
- * The Audacious team does not consider modular code linking to Audacious or
- * using our public API to be a derived work.
- */
-
-#include "preset-browser.h"
-
-#include <gtk/gtk.h>
-
-#include <libaudcore/audstrings.h>
-#include <libaudcore/drct.h>
-#include <libaudcore/i18n.h>
-#include <libaudcore/vfs.h>
-
-#include "ui_equalizer.h"
-
-typedef void (* FilebrowserCallback) (const char * filename);
-
-static GtkWidget * preset_browser;
-
-static void browser_response (GtkWidget * dialog, int response, void * data)
-{
- if (response == GTK_RESPONSE_ACCEPT)
- {
- char * filename = gtk_file_chooser_get_uri ((GtkFileChooser *) dialog);
- ((FilebrowserCallback) data) (filename);
- g_free (filename);
- }
-
- gtk_widget_destroy (dialog);
-}
-
-static void show_preset_browser (const char * title, gboolean save,
- const char * default_filename, FilebrowserCallback callback)
-{
- if (preset_browser)
- gtk_widget_destroy (preset_browser);
-
- preset_browser = gtk_file_chooser_dialog_new (title, nullptr, save ?
- GTK_FILE_CHOOSER_ACTION_SAVE : GTK_FILE_CHOOSER_ACTION_OPEN, _("Cancel"),
- GTK_RESPONSE_CANCEL, save ? _("Save") : _("Load"), GTK_RESPONSE_ACCEPT,
- nullptr);
-
- if (default_filename)
- gtk_file_chooser_set_current_name ((GtkFileChooser *) preset_browser, default_filename);
-
- g_signal_connect (preset_browser, "response", (GCallback) browser_response, (void *) callback);
- g_signal_connect (preset_browser, "destroy", (GCallback)
- gtk_widget_destroyed, & preset_browser);
-
- gtk_window_present ((GtkWindow *) preset_browser);
-}
-
-static void do_load_file (const char * filename)
-{
- EqualizerPreset preset;
-
- VFSFile file (filename, "r");
- if (! file || ! aud_load_preset_file (preset, file))
- return;
-
- equalizerwin_apply_preset (preset);
-}
-
-void eq_preset_load_file (void)
-{
- show_preset_browser (_("Load Preset File"), FALSE, nullptr, do_load_file);
-}
-
-static void do_load_eqf (const char * filename)
-{
- VFSFile file (filename, "r");
- if (! file)
- return;
-
- Index<EqualizerPreset> presets = aud_import_winamp_presets (file);
-
- if (presets.len ())
- equalizerwin_apply_preset (presets0);
-}
-
-void eq_preset_load_eqf (void)
-{
- show_preset_browser (_("Load EQF File"), FALSE, nullptr, do_load_eqf);
-}
-
-static void do_save_file (const char * filename)
-{
- EqualizerPreset preset;
- equalizerwin_update_preset (preset);
-
- VFSFile file (filename, "w");
- if (file)
- aud_save_preset_file (preset, file);
-}
-
-void eq_preset_save_file (void)
-{
- String title = aud_drct_get_title ();
- StringBuf name = title ? str_printf ("%s.%s", (const char *) title,
- EQUALIZER_DEFAULT_PRESET_EXT) : StringBuf ();
-
- show_preset_browser (_("Save Preset File"), TRUE, name, do_save_file);
-}
-
-static void do_save_eqf (const char * filename)
-{
- VFSFile file (filename, "w");
- if (! file)
- return;
-
- EqualizerPreset preset = EqualizerPreset ();
- preset.name = String ("Preset1");
-
- equalizerwin_update_preset (preset);
- aud_export_winamp_preset (preset, file);
-}
-
-void eq_preset_save_eqf (void)
-{
- show_preset_browser (_("Save EQF File"), TRUE, nullptr, do_save_eqf);
-}
-
-static void do_import_winamp (const char * filename)
-{
- VFSFile file (filename, "r");
- if (! file)
- return;
-
- equalizerwin_import_presets (aud_import_winamp_presets (file));
-}
-
-void eq_preset_import_winamp (void)
-{
- show_preset_browser (_("Import Winamp Presets"), FALSE, nullptr, do_import_winamp);
-}
-
-void eq_preset_browser_cleanup (void)
-{
- if (preset_browser)
- gtk_widget_destroy (preset_browser);
-}

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/preset-browser.h Deleted

@@ -1,33 +0,0 @@
-/*
- * preset-browser.h
- * Copyright 2014 John Lindgren
- *
- * This file is part of Audacious.
- *
- * Audacious 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, version 2 or version 3 of the License.
- *
- * Audacious 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
- * Audacious. If not, see <http://www.gnu.org/licenses/>.
- *
- * The Audacious team does not consider modular code linking to Audacious or
- * using our public API to be a derived work.
- */
-
-#ifndef SKINS_PRESET_BROWSER_H
-#define SKINS_PRESET_BROWSER_H
-
-void eq_preset_load_file (void);
-void eq_preset_load_eqf (void);
-void eq_preset_save_file (void);
-void eq_preset_save_eqf (void);
-void eq_preset_import_winamp (void);
-
-void eq_preset_browser_cleanup (void);
-
-#endif /* SKINS_PRESET_BROWSER_H */

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/preset-list.cc Deleted

@@ -1,462 +0,0 @@
-/* Audacious - Cross-platform multimedia player
- * Copyright (C) 2005-2014 Audacious development team.
- *
- * Based on BMP:
- * Copyright (C) 2003-2004 BMP development team.
- *
- * Based on XMMS:
- * Copyright (C) 1998-2003 XMMS development team.
- *
- * 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; under version 3 of the License.
- *
- * 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>.
- *
- * The Audacious team does not consider modular code linking to
- * Audacious or using our public API to be a derived work.
- */
-
-#include "preset-list.h"
-
-#include <string.h>
-#include <gtk/gtk.h>
-
-#include <libaudcore/drct.h>
-#include <libaudcore/i18n.h>
-#include <libaudgui/libaudgui-gtk.h>
-
-#include "ui_equalizer.h"
-
-static GtkWidget *equalizerwin_load_window = nullptr;
-static GtkWidget *equalizerwin_load_auto_window = nullptr;
-static GtkWidget *equalizerwin_save_window = nullptr;
-static GtkWidget *equalizerwin_save_entry = nullptr;
-static GtkWidget *equalizerwin_save_auto_window = nullptr;
-static GtkWidget *equalizerwin_save_auto_entry = nullptr;
-static GtkWidget *equalizerwin_delete_window = nullptr;
-static GtkWidget *equalizerwin_delete_auto_window = nullptr;
-
-static void
-equalizerwin_delete_selected_presets(GtkTreeView *view, const char *filename)
-{
- char *text;
-
- GtkTreeSelection *selection = gtk_tree_view_get_selection(view);
- GtkTreeModel *model = gtk_tree_view_get_model(view);
-
- /*
- * first we are making a list of the selected rows, then we convert this
- * list into a list of GtkTreeRowReferences, so that when you delete an
- * item you can still access the other items
- * finally we iterate through all GtkTreeRowReferences, convert them to
- * GtkTreeIters and delete those one after the other
- */
-
- GList *list = gtk_tree_selection_get_selected_rows(selection, &model);
- GList *rrefs = nullptr;
- GList *litr;
-
- for (litr = list; litr; litr = litr->next)
- {
- GtkTreePath *path = (GtkTreePath *) litr->data;
- rrefs = g_list_append(rrefs, gtk_tree_row_reference_new(model, path));
- }
-
- for (litr = rrefs; litr; litr = litr->next)
- {
- GtkTreeRowReference *ref = (GtkTreeRowReference *) litr->data;
- GtkTreePath *path = gtk_tree_row_reference_get_path(ref);
- GtkTreeIter iter;
- gtk_tree_model_get_iter(model, &iter, path);
- gtk_tree_path_free(path);
-
- gtk_tree_model_get(model, &iter, 0, &text, -1);
-
- if (!strcmp(filename, "eq.preset"))
- equalizerwin_delete_preset (equalizer_presets, text, filename);
- else if (!strcmp(filename, "eq.auto_preset"))
- equalizerwin_delete_preset (equalizer_auto_presets, text, filename);
-
- gtk_list_store_remove(GTK_LIST_STORE(model), &iter);
- }
-}
-
-static void
-equalizerwin_save_ok(GtkWidget * widget, void * data)
-{
- const char *text;
-
- text = gtk_entry_get_text(GTK_ENTRY(equalizerwin_save_entry));
-
- if (text0)
- equalizerwin_save_preset (equalizer_presets, text, "eq.preset");
-
- gtk_widget_destroy(equalizerwin_save_window);
-}
-
-static void
-equalizerwin_save_select(GtkTreeView *treeview, GtkTreePath *path,
- GtkTreeViewColumn *col, void * data)
-{
- char *text;
-
- GtkTreeSelection *selection = gtk_tree_view_get_selection(treeview);
- GtkTreeModel *model;
- GtkTreeIter iter;
-
- if (selection)
- {
- if (gtk_tree_selection_get_selected(selection, &model, &iter))
- {
- gtk_tree_model_get(model, &iter, 0, &text, -1);
- gtk_entry_set_text(GTK_ENTRY(equalizerwin_save_entry), text);
- equalizerwin_save_ok(nullptr, nullptr);
-
- g_free(text);
- }
- }
-}
-
-static void
-equalizerwin_load_ok(GtkWidget *widget, void * data)
-{
- char *text;
-
- GtkTreeView* view = GTK_TREE_VIEW(data);
- GtkTreeSelection *selection = gtk_tree_view_get_selection(view);
- GtkTreeModel *model;
- GtkTreeIter iter;
-
- if (selection)
- {
- if (gtk_tree_selection_get_selected(selection, &model, &iter))
- {
- gtk_tree_model_get(model, &iter, 0, &text, -1);
- equalizerwin_load_preset(equalizer_presets, text);
-
- g_free(text);
- }
- }
- gtk_widget_destroy(equalizerwin_load_window);
-}
-
-static void
-equalizerwin_load_select(GtkTreeView *treeview, GtkTreePath *path,
- GtkTreeViewColumn *col, void * data)
-{
- equalizerwin_load_ok(nullptr, treeview);
-}
-
-static void
-equalizerwin_delete_delete(GtkWidget *widget, void * data)
-{
- equalizerwin_delete_selected_presets(GTK_TREE_VIEW(data), "eq.preset");
-}
-
-static void
-equalizerwin_save_auto_ok(GtkWidget *widget, void * data)
-{
- const char *text;
-
- text = gtk_entry_get_text(GTK_ENTRY(equalizerwin_save_auto_entry));
-
- if (text0)
- equalizerwin_save_preset (equalizer_auto_presets, text, "eq.auto_preset");
-
- gtk_widget_destroy(equalizerwin_save_auto_window);
-}
-
-static void
-equalizerwin_save_auto_select(GtkTreeView *treeview, GtkTreePath *path,
- GtkTreeViewColumn *col, void * data)
-{
- char *text;
-
- GtkTreeSelection *selection = gtk_tree_view_get_selection(treeview);
- GtkTreeModel *model;
- GtkTreeIter iter;
-
- if (selection)
- {
- if (gtk_tree_selection_get_selected(selection, &model, &iter))
- {
- gtk_tree_model_get(model, &iter, 0, &text, -1);
- gtk_entry_set_text(GTK_ENTRY(equalizerwin_save_auto_entry), text);
- equalizerwin_save_auto_ok(nullptr, nullptr);
-
- g_free(text);
- }
- }
-}
-
-static void
-equalizerwin_load_auto_ok(GtkWidget *widget, void * data)
-{
- char *text;
-
- GtkTreeView *view = GTK_TREE_VIEW(data);
- GtkTreeSelection *selection = gtk_tree_view_get_selection(view);
- GtkTreeModel *model;
- GtkTreeIter iter;
-
- if (selection)
- {
- if (gtk_tree_selection_get_selected(selection, &model, &iter))
- {
- gtk_tree_model_get(model, &iter, 0, &text, -1);
- equalizerwin_load_preset(equalizer_auto_presets, text);
-
- g_free(text);
- }
- }
- gtk_widget_destroy(equalizerwin_load_auto_window);
-}
-
-static void
-equalizerwin_load_auto_select(GtkTreeView *treeview, GtkTreePath *path,
- GtkTreeViewColumn *col, void * data)
-{
- equalizerwin_load_auto_ok(nullptr, treeview);
-}
-
-static void
-equalizerwin_delete_auto_delete(GtkWidget *widget, void * data)
-{
- equalizerwin_delete_selected_presets(GTK_TREE_VIEW(data), "eq.auto_preset");
-}
-
-static GtkWidget * equalizerwin_create_list_window
- (const Index<EqualizerPreset> & preset_list, const char * title,
- GtkWidget * * window, GtkSelectionMode sel_mode, GtkWidget * * entry,
- GtkWidget * button_action, GCallback action_func, GCallback select_row_func)
-{
- GtkWidget *vbox, *scrolled_window, *bbox, *view;
- GtkWidget *button_cancel;
-
- GtkListStore *store;
- GtkTreeIter iter;
- GtkTreeModel *model;
- GtkCellRenderer *renderer;
- GtkTreeSelection *selection;
- GtkTreeSortable *sortable;
-
- *window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
- gtk_window_set_title(GTK_WINDOW(*window), title);
- gtk_window_set_type_hint(GTK_WINDOW(*window), GDK_WINDOW_TYPE_HINT_DIALOG);
- gtk_window_set_default_size(GTK_WINDOW(*window), 350, 300);
- gtk_container_set_border_width(GTK_CONTAINER(*window), 10);
- gtk_window_set_transient_for(GTK_WINDOW(*window),
- GTK_WINDOW(equalizerwin));
- g_signal_connect(*window, "destroy",
- G_CALLBACK(gtk_widget_destroyed), window);
-
- audgui_destroy_on_escape (* window);
-
- vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 10);
- gtk_container_add(GTK_CONTAINER(*window), vbox);
-
- scrolled_window = gtk_scrolled_window_new(nullptr, nullptr);
- gtk_scrolled_window_set_shadow_type ((GtkScrolledWindow *) scrolled_window, GTK_SHADOW_IN);
- gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolled_window),
- GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS);
-
- /* fill the store with the names of all available presets */
- store = gtk_list_store_new(1, G_TYPE_STRING);
- for (const EqualizerPreset & preset : preset_list)
- {
- gtk_list_store_append (store, & iter);
- gtk_list_store_set (store, & iter, 0, (const char *) preset.name, -1);
- }
- model = GTK_TREE_MODEL(store);
-
- sortable = GTK_TREE_SORTABLE(store);
- gtk_tree_sortable_set_sort_column_id(sortable, 0, GTK_SORT_ASCENDING);
-
- view = gtk_tree_view_new();
- renderer = gtk_cell_renderer_text_new();
- gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(view), -1,
- _("Presets"), renderer,
- "text", 0, nullptr);
- gtk_tree_view_set_model(GTK_TREE_VIEW(view), model);
- g_object_unref(model);
-
- selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(view));
- gtk_tree_selection_set_mode(selection, sel_mode);
-
- gtk_container_add(GTK_CONTAINER(scrolled_window), view);
- gtk_box_pack_start(GTK_BOX(vbox), scrolled_window, TRUE, TRUE, 0);
-
- if (entry) {
- *entry = gtk_entry_new();
- g_signal_connect(*entry, "activate", action_func, nullptr);
- gtk_box_pack_start(GTK_BOX(vbox), *entry, FALSE, FALSE, 0);
- }
-
- bbox = gtk_button_box_new(GTK_ORIENTATION_HORIZONTAL);
- gtk_button_box_set_layout(GTK_BUTTON_BOX(bbox), GTK_BUTTONBOX_END);
- gtk_box_set_spacing(GTK_BOX(bbox), 5);
- gtk_box_pack_start(GTK_BOX(vbox), bbox, FALSE, FALSE, 0);
-
- button_cancel = audgui_button_new (_("Cancel"), "process-stop", nullptr, nullptr);
- g_signal_connect_swapped (button_cancel, "clicked", (GCallback)
- gtk_widget_destroy, * window);
- gtk_box_pack_start(GTK_BOX(bbox), button_cancel, TRUE, TRUE, 0);
-
- g_signal_connect(button_action, "clicked", G_CALLBACK(action_func), view);
- gtk_widget_set_can_default (button_action, TRUE);
-
- if (select_row_func)
- g_signal_connect(view, "row-activated", G_CALLBACK(select_row_func), nullptr);
-
- gtk_box_pack_start(GTK_BOX(bbox), button_action, TRUE, TRUE, 0);
-
- gtk_widget_grab_default(button_action);
-
- gtk_widget_show_all(*window);
-
- return *window;
-}
-
-void eq_preset_load (void)
-{
- if (equalizerwin_load_window) {
- gtk_window_present(GTK_WINDOW(equalizerwin_load_window));
- return;
- }
-
- equalizerwin_create_list_window(equalizer_presets,
- _("Load preset"),
- &equalizerwin_load_window,
- GTK_SELECTION_SINGLE, nullptr,
- audgui_button_new (_("Load"), "document-open", nullptr, nullptr),
- G_CALLBACK(equalizerwin_load_ok),
- G_CALLBACK(equalizerwin_load_select));
-}
-
-void eq_preset_load_auto (void)
-{
- if (equalizerwin_load_auto_window) {
- gtk_window_present(GTK_WINDOW(equalizerwin_load_auto_window));
- return;
- }
-
- equalizerwin_create_list_window(equalizer_auto_presets,
- _("Load auto-preset"),
- &equalizerwin_load_auto_window,
- GTK_SELECTION_SINGLE, nullptr,
- audgui_button_new (_("Load"), "document-open", nullptr, nullptr),
- G_CALLBACK(equalizerwin_load_auto_ok),
- G_CALLBACK(equalizerwin_load_auto_select));
-}
-
-void eq_preset_save (void)
-{
- if (equalizerwin_save_window) {
- gtk_window_present(GTK_WINDOW(equalizerwin_save_window));
- return;
- }
-
- equalizerwin_create_list_window(equalizer_presets,
- _("Save preset"),
- &equalizerwin_save_window,
- GTK_SELECTION_SINGLE,
- &equalizerwin_save_entry,
- audgui_button_new (_("Save"), "document-save", nullptr, nullptr),
- G_CALLBACK(equalizerwin_save_ok),
- G_CALLBACK(equalizerwin_save_select));
-}
-
-void eq_preset_save_auto (void)
-{
- if (equalizerwin_save_auto_window)
- gtk_window_present(GTK_WINDOW(equalizerwin_save_auto_window));
- else
- equalizerwin_create_list_window(equalizer_auto_presets,
- _("Save auto-preset"),
- &equalizerwin_save_auto_window,
- GTK_SELECTION_SINGLE,
- &equalizerwin_save_auto_entry,
- audgui_button_new (_("Save"), "document-save", nullptr, nullptr),
- G_CALLBACK(equalizerwin_save_auto_ok),
- G_CALLBACK(equalizerwin_save_auto_select));
-
- String name = aud_drct_get_filename ();
-
- if (name != nullptr)
- {
- char * base = g_path_get_basename (name);
- gtk_entry_set_text ((GtkEntry *) equalizerwin_save_auto_entry, base);
- g_free (base);
- }
-}
-
-void eq_preset_delete (void)
-{
- if (equalizerwin_delete_window) {
- gtk_window_present(GTK_WINDOW(equalizerwin_delete_window));
- return;
- }
-
- equalizerwin_create_list_window(equalizer_presets,
- _("Delete preset"),
- &equalizerwin_delete_window,
- GTK_SELECTION_MULTIPLE, nullptr,
- audgui_button_new (_("Delete"), "edit-delete", nullptr, nullptr),
- G_CALLBACK(equalizerwin_delete_delete),
- nullptr);
-}
-
-void eq_preset_delete_auto (void)
-{
- if (equalizerwin_delete_auto_window) {
- gtk_window_present(GTK_WINDOW(equalizerwin_delete_auto_window));
- return;
- }
-
- equalizerwin_create_list_window(equalizer_auto_presets,
- _("Delete auto-preset"),
- &equalizerwin_delete_auto_window,
- GTK_SELECTION_MULTIPLE, nullptr,
- audgui_button_new (_("Delete"), "edit-delete", nullptr, nullptr),
- G_CALLBACK(equalizerwin_delete_auto_delete),
- nullptr);
-}
-
-void eq_preset_load_default (void)
-{
- if (! equalizerwin_load_preset (equalizer_presets, _("Default")))
- eq_preset_set_zero ();
-}
-
-void eq_preset_save_default (void)
-{
- equalizerwin_save_preset (equalizer_presets, _("Default"), "eq.preset");
-}
-
-void eq_preset_set_zero (void)
-{
- equalizerwin_apply_preset (EqualizerPreset ());
-}
-
-void eq_preset_list_cleanup (void)
-{
- if (equalizerwin_load_window)
- gtk_widget_destroy (equalizerwin_load_window);
- if (equalizerwin_load_auto_window)
- gtk_widget_destroy (equalizerwin_load_auto_window);
- if (equalizerwin_save_window)
- gtk_widget_destroy (equalizerwin_save_window);
- if (equalizerwin_save_auto_window)
- gtk_widget_destroy (equalizerwin_save_auto_window);
- if (equalizerwin_delete_window)
- gtk_widget_destroy (equalizerwin_delete_window);
- if (equalizerwin_delete_auto_window)
- gtk_widget_destroy (equalizerwin_delete_auto_window);
-}

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/preset-list.h Deleted

@@ -1,38 +0,0 @@
-/*
- * preset-list.h
- * Copyright 2014 John Lindgren
- *
- * This file is part of Audacious.
- *
- * Audacious 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, version 2 or version 3 of the License.
- *
- * Audacious 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
- * Audacious. If not, see <http://www.gnu.org/licenses/>.
- *
- * The Audacious team does not consider modular code linking to Audacious or
- * using our public API to be a derived work.
- */
-
-#ifndef SKINS_PRESET_LIST_H
-#define SKINS_PRESET_LIST_H
-
-void eq_preset_load (void);
-void eq_preset_load_auto (void);
-void eq_preset_save (void);
-void eq_preset_save_auto (void);
-void eq_preset_delete (void);
-void eq_preset_delete_auto (void);
-
-void eq_preset_load_default (void);
-void eq_preset_save_default (void);
-void eq_preset_set_zero (void);
-
-void eq_preset_list_cleanup (void);
-
-#endif /* SKINS_PRESET_LIST_H */

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/ui_dock.cc Deleted

@@ -1,384 +0,0 @@
-/*
- * ui_dock.c
- * Copyright 2011 John Lindgren
- *
- * This file is part of Audacious.
- *
- * Audacious 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, version 2 or version 3 of the License.
- *
- * Audacious 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
- * Audacious. If not, see <http://www.gnu.org/licenses/>.
- *
- * The Audacious team does not consider modular code linking to Audacious or
- * using our public API to be a derived work.
- */
-
-/*
- * Rough outline
- * =============
- *
- * When moving a window:
- * 1. If this is the main window, find (recursively) the windows docked to it.
- * 2. Adjust the offsets to snap to another window (not docked) or a screen edge.
- * 3. Move the docked windows by the same offsets.
- *
- * When resizing a window:
- * 1. Find (recursively) the windows docked to the bottom edge of this one.
- * If we are making the window shorter, exclude windows that are docked to
- * the bottom of another window (not docked) to avoid overlap.
- * 2. Move the docked windows by the difference in window height.
- * 3. Repeat the process for windows docked to the right edge of this one.
- */
-
-#include <stdlib.h>
-
-#include "ui_dock.h"
-
-#define SNAP_DISTANCE 10
-
-enum {
- DOCK_TYPE_LEFT = 1 << 0,
- DOCK_TYPE_RIGHT = 1 << 1,
- DOCK_TYPE_TOP = 1 << 2,
- DOCK_TYPE_BOTTOM = 1 << 3
-};
-
-#define DOCK_TYPE_ANY (DOCK_TYPE_LEFT | DOCK_TYPE_RIGHT | DOCK_TYPE_TOP | DOCK_TYPE_BOTTOM)
-
-typedef struct {
- GtkWidget * window;
- int * x, * y;
- int w, h;
- gboolean main;
- gboolean docked;
-} DockWindow;
-
-static GSList * windows;
-static int last_x, last_y;
-
-static inline int least_abs (int a, int b)
-{
- return (abs (a) < abs (b)) ? a : b;
-}
-
-static DockWindow * find_window (GSList * list, GtkWidget * window)
-{
- for (GSList * node = list; node; node = node->next)
- {
- DockWindow * dw = (DockWindow *) node->data;
- if (dw->window == window)
- return dw;
- }
-
- return nullptr;
-}
-
-void dock_add_window (GtkWidget * window, int * x, int * y, int w, int h,
- gboolean main)
-{
- DockWindow * dw = g_slice_new0 (DockWindow);
- dw->window = window;
- dw->x = x;
- dw->y = y;
- dw->w = w;
- dw->h = h;
- dw->main = main;
-
- windows = g_slist_prepend (windows, dw);
-}
-
-void dock_remove_window (GtkWidget * window)
-{
- DockWindow * dw = find_window (windows, window);
- g_return_if_fail (dw);
-
- windows = g_slist_remove (windows, dw);
- g_slice_free (DockWindow, dw);
-}
-
-static void dock_sync (void)
-{
- for (GSList * node = windows; node; node = node->next)
- {
- DockWindow * dw = (DockWindow *) node->data;
- gtk_window_get_position ((GtkWindow *) dw->window, dw->x, dw->y);
- }
-}
-
-static void clear_docked (void)
-{
- for (GSList * node = windows; node; node = node->next)
- {
- DockWindow * dw = (DockWindow *) node->data;
- dw->docked = FALSE;
- }
-}
-
-static gboolean is_docked (DockWindow * dw, DockWindow * base, int type)
-{
- if ((type & DOCK_TYPE_LEFT) && * dw->x + dw->w == * base->x)
- return TRUE;
- if ((type & DOCK_TYPE_RIGHT) && * dw->x == * base->x + base->w)
- return TRUE;
- if ((type & DOCK_TYPE_TOP) && * dw->y + dw->h == * base->y)
- return TRUE;
- if ((type & DOCK_TYPE_BOTTOM) && * dw->y == * base->y + base->h)
- return TRUE;
-
- return FALSE;
-}
-
-static void find_docked (DockWindow * base, int type)
-{
- for (GSList * node = windows; node; node = node->next)
- {
- DockWindow * dw = (DockWindow *) node->data;
- if (dw->docked || dw == base)
- continue;
-
- dw->docked = is_docked (dw, base, type);
- if (dw->docked)
- find_docked (dw, type);
- }
-}
-
-static void invert_docked (void)
-{
- for (GSList * node = windows; node; node = node->next)
- {
- DockWindow * dw = (DockWindow *) node->data;
- dw->docked = ! dw->docked;
- }
-}
-
-void dock_set_size (GtkWidget * window, int w, int h)
-{
- DockWindow * base = find_window (windows, window);
- g_return_if_fail (base);
-
- dock_sync ();
-
- if (h != base->h)
- {
- /* 1. Find the windows docked below this one. */
-
- clear_docked ();
- find_docked (base, DOCK_TYPE_BOTTOM);
-
- if (h < base->h)
- {
- /* 2. This part is tricky. By flipping the docked flag on all the
- windows, we consider the windows not docked to this one as a
- docked group. We then add (recursively) any other windows
- docked to these ones (i.e. the windows docked to these *and*
- to the one being shortened). The one being shortened must be
- excluded from the search. Since at this point it is marked as
- docked, it is excluded automatically. Finally, flipping the
- docked flag back again leaves us with only the windows docked
- to the one being shortened and not to any others. */
-
- invert_docked ();
-
- for (GSList * node = windows; node; node = node->next)
- {
- DockWindow * dw = (DockWindow *) node->data;
- if (! dw->docked || dw == base)
- continue;
-
- find_docked (dw, DOCK_TYPE_BOTTOM);
- }
-
- invert_docked ();
- }
-
- /* 3. Move the docked windows by the difference in height. */
-
- for (GSList * node = windows; node; node = node->next)
- {
- DockWindow * dw = (DockWindow *) node->data;
- if (! dw->docked)
- continue;
-
- * dw->y += h - base->h;
- gtk_window_move ((GtkWindow *) dw->window, * dw->x, * dw->y);
- }
- }
-
- if (w != base->w)
- {
- /* 4. Repeat the process for the windows docked to the right. */
-
- clear_docked ();
- find_docked (base, DOCK_TYPE_RIGHT);
-
- if (w < base->w)
- {
- invert_docked ();
-
- for (GSList * node = windows; node; node = node->next)
- {
- DockWindow * dw = (DockWindow *) node->data;
- if (! dw->docked || dw == base)
- continue;
-
- find_docked (dw, DOCK_TYPE_RIGHT);
- }
-
- invert_docked ();
- }
-
- for (GSList * node = windows; node; node = node->next)
- {
- DockWindow * dw = (DockWindow *) node->data;
- if (! dw->docked)
- continue;
-
- * dw->x += w - base->w;
- gtk_window_move ((GtkWindow *) dw->window, * dw->x, * dw->y);
- }
- }
-
- /* 5. Set the window size. (The actual resize is done by the caller.) */
-
- base->w = w;
- base->h = h;
-}
-
-void dock_move_start (GtkWidget * window, int x, int y)
-{
- DockWindow * dw = find_window (windows, window);
- g_return_if_fail (dw);
-
- dock_sync ();
-
- last_x = x;
- last_y = y;
-
- /* 1. If this is the main window, find the windows docked to it. */
-
- clear_docked ();
- dw->docked = TRUE;
- if (dw->main)
- find_docked (dw, DOCK_TYPE_ANY);
-}
-
-void dock_move (int x, int y)
-{
- int hori, vert;
-
- if (x == last_x && y == last_y)
- return;
-
- /* 2. Nominally move all the windows in the group the requested distance,
- and update the reference point. */
-
- hori = x - last_x;
- vert = y - last_y;
-
- for (GSList * node = windows; node; node = node->next)
- {
- DockWindow * dw = (DockWindow *) node->data;
- if (! dw->docked)
- continue;
-
- * dw->x += hori;
- * dw->y += vert;
- }
-
- last_x = x;
- last_y = y;
-
-
- /* 3. Find the least snap distance we must move so that
- (a) a window in the group is touching a screen edge or
- (b) a window in the group is touching a window not in the group. */
-
- hori = SNAP_DISTANCE + 1;
- vert = SNAP_DISTANCE + 1;
-
- GdkScreen * screen = gdk_screen_get_default ();
- int monitors = gdk_screen_get_n_monitors (screen);
-
- for (int m = 0; m < monitors; m ++)
- {
- GdkRectangle rect;
- gdk_screen_get_monitor_geometry (screen, m, & rect);
-
- for (GSList * node = windows; node; node = node->next)
- {
- DockWindow * dw = (DockWindow *) node->data;
- if (! dw->docked)
- continue;
-
- /* We only test half the combinations here, as it is not very
- helpful to have e.g. the right edge of a window touching the left
- edge of a monitor (think about it). */
-
- hori = least_abs (hori, rect.x - * dw->x);
- hori = least_abs (hori, (rect.x + rect.width) - (* dw->x + dw->w));
- vert = least_abs (vert, rect.y - * dw->y);
- vert = least_abs (vert, (rect.y + rect.height) - (* dw->y + dw->h));
- }
- }
-
- for (GSList * node = windows; node; node = node->next)
- {
- DockWindow * dw = (DockWindow *) node->data;
- if (! dw->docked)
- continue;
-
- for (GSList * node2 = windows; node2; node2 = node2->next)
- {
- DockWindow * dw2 = (DockWindow *) node2->data;
- if (dw2->docked)
- continue;
-
- hori = least_abs (hori, * dw2->x - * dw->x);
- hori = least_abs (hori, * dw2->x - (* dw->x + dw->w));
- hori = least_abs (hori, (* dw2->x + dw2->w) - * dw->x);
- hori = least_abs (hori, (* dw2->x + dw2->w) - (* dw->x + dw->w));
- vert = least_abs (vert, * dw2->y - * dw->y);
- vert = least_abs (vert, * dw2->y - (* dw->y + dw->h));
- vert = least_abs (vert, (* dw2->y + dw2->h) - * dw->y);
- vert = least_abs (vert, (* dw2->y + dw2->h) - (* dw->y + dw->h));
- }
- }
-
- /* 4. If the snap distances are within range, nominally move all the windows
- in the group, and update the reference point again. */
-
- if (abs (hori) > SNAP_DISTANCE)
- hori = 0;
- if (abs (vert) > SNAP_DISTANCE)
- vert = 0;
-
- for (GSList * node = windows; node; node = node->next)
- {
- DockWindow * dw = (DockWindow *) node->data;
- if (! dw->docked)
- continue;
-
- * dw->x += hori;
- * dw->y += vert;
- }
-
- last_x += hori;
- last_y += vert;
-
- /* 5. Really move the windows. */
-
- for (GSList * node = windows; node; node = node->next)
- {
- DockWindow * dw = (DockWindow *) node->data;
- if (! dw->docked)
- continue;
-
- gtk_window_move ((GtkWindow *) dw->window, * dw->x, * dw->y);
- }
-}

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/ui_dock.h Deleted

@@ -1,36 +0,0 @@
-/*
- * ui_dock.h
- * Copyright 2011 John Lindgren
- *
- * This file is part of Audacious.
- *
- * Audacious 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, version 2 or version 3 of the License.
- *
- * Audacious 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
- * Audacious. If not, see <http://www.gnu.org/licenses/>.
- *
- * The Audacious team does not consider modular code linking to Audacious or
- * using our public API to be a derived work.
- */
-
-#ifndef SKINS_UI_DOCK_H
-#define SKINS_UI_DOCK_H
-
-#include <gtk/gtk.h>
-
-void dock_add_window (GtkWidget * window, int * x, int * y, int w, int h,
- gboolean main);
-void dock_remove_window (GtkWidget * window);
-
-void dock_set_size (GtkWidget * window, int w, int h);
-
-void dock_move_start (GtkWidget * window, int x, int y);
-void dock_move (int x, int y);
-
-#endif

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/ui_equalizer.cc Deleted

@@ -1,498 +0,0 @@
-/* Audacious - Cross-platform multimedia player
- * Copyright (C) 2005-2014 Audacious development team.
- *
- * Based on BMP:
- * Copyright (C) 2003-2004 BMP development team.
- *
- * Based on XMMS:
- * Copyright (C) 1998-2003 XMMS development team.
- *
- * 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; under version 3 of the License.
- *
- * 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>.
- *
- * The Audacious team does not consider modular code linking to
- * Audacious or using our public API to be a derived work.
- */
-
-#include <string.h>
-#include <gtk/gtk.h>
-
-#include <libaudcore/audstrings.h>
-#include <libaudcore/drct.h>
-#include <libaudcore/hook.h>
-#include <libaudcore/i18n.h>
-#include <libaudcore/runtime.h>
-#include <libaudgui/libaudgui-gtk.h>
-
-#include "menus.h"
-#include "plugin.h"
-#include "preset-list.h"
-#include "skins_cfg.h"
-#include "ui_equalizer.h"
-#include "ui_main.h"
-#include "ui_skinned_button.h"
-#include "ui_skinned_equalizer_graph.h"
-#include "ui_skinned_equalizer_slider.h"
-#include "ui_skinned_horizontal_slider.h"
-#include "ui_skinned_window.h"
-#include "util.h"
-#include "view.h"
-
-static float equalizerwin_get_preamp (void);
-static float equalizerwin_get_band (int band);
-static void equalizerwin_set_preamp (float preamp);
-static void equalizerwin_set_band (int band, float value);
-
-static void playback_begin_cb (void *, void *);
-
-GtkWidget *equalizerwin;
-GtkWidget *equalizerwin_graph;
-
-static GtkWidget *equalizerwin_on, *equalizerwin_auto;
-
-static GtkWidget *equalizerwin_close, *equalizerwin_shade;
-static GtkWidget *equalizerwin_shaded_close, *equalizerwin_shaded_shade;
-static GtkWidget *equalizerwin_presets;
-static GtkWidget *equalizerwin_preamp,*equalizerwin_bands10;
-static GtkWidget *equalizerwin_volume, *equalizerwin_balance;
-
-Index<EqualizerPreset> equalizer_presets, equalizer_auto_presets;
-
-static void
-equalizerwin_shade_toggle(void)
-{
- view_set_equalizer_shaded (! aud_get_bool ("skins", "equalizer_shaded"));
-}
-
-void
-equalizerwin_eq_changed(void)
-{
- aud_set_double (nullptr, "equalizer_preamp", equalizerwin_get_preamp ());
-
- double bandsAUD_EQ_NBANDS;
- for (int i = 0; i < AUD_EQ_NBANDS; i ++)
- bandsi = equalizerwin_get_band (i);
-
- aud_eq_set_bands (bands);
-}
-
-void equalizerwin_apply_preset (const EqualizerPreset & preset)
-{
- equalizerwin_set_preamp (preset.preamp);
- for (int i = 0; i < AUD_EQ_NBANDS; i ++)
- equalizerwin_set_band (i, preset.bandsi);
-}
-
-void equalizerwin_update_preset (EqualizerPreset & preset)
-{
- preset.preamp = equalizerwin_get_preamp ();
- for (int i = 0; i < AUD_EQ_NBANDS; i ++)
- preset.bandsi = equalizerwin_get_band (i);
-}
-
-void equalizerwin_import_presets (Index<EqualizerPreset> && presets)
-{
- equalizer_presets.move_from (presets, 0, -1, -1, true, true);
- aud_eq_write_presets (equalizer_presets, "eq.preset");
-}
-
-static void eq_on_cb (GtkWidget * button, GdkEventButton * event)
- {aud_set_bool (nullptr, "equalizer_active", button_get_active (button)); }
-static void eq_auto_cb (GtkWidget * button, GdkEventButton * event)
- {aud_set_bool (nullptr, "equalizer_autoload", button_get_active (equalizerwin_auto)); }
-
-static void update_from_config (void * unused1, void * unused2)
-{
- button_set_active (equalizerwin_on, aud_get_bool (nullptr, "equalizer_active"));
- eq_slider_set_val (equalizerwin_preamp, aud_get_double (nullptr, "equalizer_preamp"));
-
- double bandsAUD_EQ_NBANDS;
- aud_eq_get_bands (bands);
-
- for (int i = 0; i < AUD_EQ_NBANDS; i ++)
- eq_slider_set_val (equalizerwin_bandsi, bandsi);
-
- eq_graph_update (equalizerwin_graph);
-}
-
-static void eq_presets_cb (GtkWidget * button, GdkEventButton * event)
-{
- menu_popup (UI_MENU_EQUALIZER_PRESET, event->x_root, event->y_root, FALSE,
- FALSE, event->button, event->time);
-}
-
-static gboolean
-equalizerwin_press(GtkWidget * widget, GdkEventButton * event,
- void * callback_data)
-{
- if (event->button == 1 && event->type == GDK_2BUTTON_PRESS &&
- event->window == gtk_widget_get_window (widget) &&
- event->y < 14 * config.scale)
- {
- equalizerwin_shade_toggle ();
- return TRUE;
- }
-
- if (event->button == 3)
- {
- menu_popup (UI_MENU_MAIN, event->x_root, event->y_root, FALSE, FALSE,
- event->button, event->time);
- return TRUE;
- }
-
- return FALSE;
-}
-
-static void
-equalizerwin_close_cb(void)
-{
- view_set_show_equalizer (FALSE);
-}
-
-static void eqwin_volume_set_knob (void)
-{
- int pos = hslider_get_pos (equalizerwin_volume);
-
- int x;
- if (pos < 32)
- x = 1;
- else if (pos < 63)
- x = 4;
- else
- x = 7;
-
- hslider_set_knob (equalizerwin_volume, x, 30, x, 30);
-}
-
-void equalizerwin_set_volume_slider (int percent)
-{
- hslider_set_pos (equalizerwin_volume, (percent * 94 + 50) / 100);
- eqwin_volume_set_knob ();
-}
-
-static void eqwin_volume_motion_cb (void)
-{
- eqwin_volume_set_knob ();
- int pos = hslider_get_pos (equalizerwin_volume);
- int v = (pos * 100 + 47) / 94;
-
- mainwin_adjust_volume_motion(v);
- mainwin_set_volume_slider(v);
-}
-
-static void eqwin_volume_release_cb (void)
-{
- eqwin_volume_set_knob ();
- mainwin_adjust_volume_release();
-}
-
-static void eqwin_balance_set_knob (void)
-{
- int pos = hslider_get_pos (equalizerwin_balance);
-
- int x;
- if (pos < 13)
- x = 11;
- else if (pos < 26)
- x = 14;
- else
- x = 17;
-
- hslider_set_knob (equalizerwin_balance, x, 30, x, 30);
-}
-
-void equalizerwin_set_balance_slider (int percent)
-{
- if (percent > 0)
- hslider_set_pos (equalizerwin_balance, 19 + (percent * 19 + 50) / 100);
- else
- hslider_set_pos (equalizerwin_balance, 19 + (percent * 19 - 50) / 100);
-
- eqwin_balance_set_knob ();
-}
-
-static void eqwin_balance_motion_cb (void)
-{
- eqwin_balance_set_knob ();
- int pos = hslider_get_pos (equalizerwin_balance);
- pos = aud::min(pos, 38); /* The skin uses a even number of pixels
- for the balance-slider *sigh* */
- int b;
- if (pos > 19)
- b = ((pos - 19) * 100 + 9) / 19;
- else
- b = ((pos - 19) * 100 - 9) / 19;
-
- mainwin_adjust_balance_motion(b);
- mainwin_set_balance_slider(b);
-}
-
-static void eqwin_balance_release_cb (void)
-{
- eqwin_balance_set_knob ();
- mainwin_adjust_balance_release();
-}
-
-static void
-equalizerwin_create_widgets(void)
-{
- equalizerwin_on = button_new_toggle (25, 12, 10, 119, 128, 119, 69, 119, 187, 119, SKIN_EQMAIN, SKIN_EQMAIN);
- window_put_widget (equalizerwin, FALSE, equalizerwin_on, 14, 18);
- button_set_active (equalizerwin_on, aud_get_bool (nullptr, "equalizer_active"));
- button_on_release (equalizerwin_on, eq_on_cb);
-
- equalizerwin_auto = button_new_toggle (33, 12, 35, 119, 153, 119, 94, 119, 212, 119, SKIN_EQMAIN, SKIN_EQMAIN);
- window_put_widget (equalizerwin, FALSE, equalizerwin_auto, 39, 18);
- button_set_active (equalizerwin_auto, aud_get_bool (nullptr, "equalizer_autoload"));
- button_on_release (equalizerwin_auto, eq_auto_cb);
-
- equalizerwin_presets = button_new (44, 12, 224, 164, 224, 176, SKIN_EQMAIN, SKIN_EQMAIN);
- window_put_widget (equalizerwin, FALSE, equalizerwin_presets, 217, 18);
- button_on_release (equalizerwin_presets, eq_presets_cb);
-
- equalizerwin_close = button_new (9, 9, 0, 116, 0, 125, SKIN_EQMAIN, SKIN_EQMAIN);
- window_put_widget (equalizerwin, FALSE, equalizerwin_close, 264, 3);
- button_on_release (equalizerwin_close, (ButtonCB) equalizerwin_close_cb);
-
- equalizerwin_shade = button_new (9, 9, 254, 137, 1, 38, SKIN_EQMAIN, SKIN_EQ_EX);
- window_put_widget (equalizerwin, FALSE, equalizerwin_shade, 254, 3);
- button_on_release (equalizerwin_shade, (ButtonCB) equalizerwin_shade_toggle);
-
- equalizerwin_shaded_close = button_new (9, 9, 11, 38, 11, 47, SKIN_EQ_EX, SKIN_EQ_EX);
- window_put_widget (equalizerwin, TRUE, equalizerwin_shaded_close, 264, 3);
- button_on_release (equalizerwin_shaded_close, (ButtonCB) equalizerwin_close_cb);
-
- equalizerwin_shaded_shade = button_new (9, 9, 254, 3, 1, 47, SKIN_EQ_EX, SKIN_EQ_EX);
- window_put_widget (equalizerwin, TRUE, equalizerwin_shaded_shade, 254, 3);
- button_on_release (equalizerwin_shaded_shade, (ButtonCB) equalizerwin_shade_toggle);
-
- equalizerwin_graph = eq_graph_new ();
- gtk_widget_set_no_show_all (equalizerwin_graph, TRUE); // shown or hidden in skin_load()
- window_put_widget (equalizerwin, FALSE, equalizerwin_graph, 86, 17);
-
- equalizerwin_preamp = eq_slider_new (_("Preamp"));
- window_put_widget (equalizerwin, FALSE, equalizerwin_preamp, 21, 38);
- eq_slider_set_val (equalizerwin_preamp, aud_get_double (nullptr, "equalizer_preamp"));
-
- const char * const bandnamesAUD_EQ_NBANDS = {N_("31 Hz"),
- N_("63 Hz"), N_("125 Hz"), N_("250 Hz"), N_("500 Hz"), N_("1 kHz"),
- N_("2 kHz"), N_("4 kHz"), N_("8 kHz"), N_("16 kHz")};
- double bandsAUD_EQ_NBANDS;
- aud_eq_get_bands (bands);
-
- for (int i = 0; i < AUD_EQ_NBANDS; i ++)
- {
- equalizerwin_bandsi = eq_slider_new (_(bandnamesi));
- window_put_widget (equalizerwin, FALSE, equalizerwin_bandsi, 78 + 18 * i, 38);
- eq_slider_set_val (equalizerwin_bandsi, bandsi);
- }
-
- equalizerwin_volume = hslider_new (0, 94, SKIN_EQ_EX, 97, 8, 61, 4, 3, 7, 1, 30, 1, 30);
- window_put_widget (equalizerwin, TRUE, equalizerwin_volume, 61, 4);
- hslider_on_motion (equalizerwin_volume, eqwin_volume_motion_cb);
- hslider_on_release (equalizerwin_volume, eqwin_volume_release_cb);
-
- equalizerwin_balance = hslider_new (0, 39, SKIN_EQ_EX, 42, 8, 164, 4, 3, 7, 11, 30, 11, 30);
- window_put_widget (equalizerwin, TRUE, equalizerwin_balance, 164, 4);
- hslider_on_motion (equalizerwin_balance, eqwin_balance_motion_cb);
- hslider_on_release (equalizerwin_balance, eqwin_balance_release_cb);
-}
-
-static void eq_win_draw (GtkWidget * window, cairo_t * cr)
-{
- gboolean shaded = aud_get_bool ("skins", "equalizer_shaded");
-
- skin_draw_pixbuf (cr, SKIN_EQMAIN, 0, 0, 0, 0, 275, shaded ? 14 : 116);
-
- if (shaded)
- skin_draw_pixbuf (cr, SKIN_EQ_EX, 0, 0, 0, 0, 275, 14);
- else
- skin_draw_pixbuf (cr, SKIN_EQMAIN, 0, 134, 0, 0, 275, 14);
-}
-
-static void
-equalizerwin_create_window(void)
-{
- gboolean shaded = aud_get_bool ("skins", "equalizer_shaded");
-
- equalizerwin = window_new (& config.equalizer_x, & config.equalizer_y, 275,
- shaded ? 14 : 116, FALSE, shaded, eq_win_draw);
-
- gtk_window_set_title(GTK_WINDOW(equalizerwin), _("Audacious Equalizer"));
-
- /* this will hide only mainwin. it's annoying! yaz */
- gtk_window_set_transient_for(GTK_WINDOW(equalizerwin),
- GTK_WINDOW(mainwin));
- gtk_window_set_skip_pager_hint(GTK_WINDOW(equalizerwin), TRUE);
- gtk_window_set_skip_taskbar_hint(GTK_WINDOW(equalizerwin), TRUE);
-
- gtk_widget_set_app_paintable(equalizerwin, TRUE);
-
- g_signal_connect (equalizerwin, "delete-event", (GCallback) handle_window_close, nullptr);
- g_signal_connect (equalizerwin, "button-press-event", (GCallback) equalizerwin_press, nullptr);
- g_signal_connect (equalizerwin, "key-press-event", (GCallback) mainwin_keypress, nullptr);
-}
-
-static void equalizerwin_destroyed (void)
-{
- hook_dissociate ("set equalizer_active", (HookFunction) update_from_config);
- hook_dissociate ("set equalizer_bands", (HookFunction) update_from_config);
- hook_dissociate ("set equalizer_preamp", (HookFunction) update_from_config);
-
- hook_dissociate ("playback begin", playback_begin_cb);
-
- equalizer_presets.clear ();
- equalizer_auto_presets.clear ();
-}
-
-void
-equalizerwin_create(void)
-{
- equalizer_presets = aud_eq_read_presets("eq.preset");
- equalizer_auto_presets = aud_eq_read_presets("eq.auto_preset");
-
- equalizerwin_create_window();
-
- gtk_window_add_accel_group ((GtkWindow *) equalizerwin, menu_get_accel_group ());
-
- equalizerwin_create_widgets();
- window_show_all (equalizerwin);
-
- g_signal_connect (equalizerwin, "destroy", (GCallback) equalizerwin_destroyed, nullptr);
-
- hook_associate ("set equalizer_active", (HookFunction) update_from_config, nullptr);
- hook_associate ("set equalizer_bands", (HookFunction) update_from_config, nullptr);
- hook_associate ("set equalizer_preamp", (HookFunction) update_from_config, nullptr);
-
- /* Load preset for the first song. FIXME: Doing this at interface load is
- really too late as the song may already be started. Really, this stuff
- shouldn't be in the interface plugin at all but in core. -jlindgren */
- if (aud_drct_get_playing ())
- playback_begin_cb (nullptr, nullptr);
-
- hook_associate ("playback begin", playback_begin_cb, nullptr);
-}
-
-static int equalizerwin_find_preset (Index<EqualizerPreset> & list, const char * name)
-{
- for (int p = 0; p < list.len (); p ++)
- {
- if (! g_ascii_strcasecmp (listp.name, name))
- return p;
- }
-
- return -1;
-}
-
-gboolean equalizerwin_load_preset (Index<EqualizerPreset> & list, const char * name)
-{
- int p = equalizerwin_find_preset (list, name);
- if (p < 0)
- return FALSE;
-
- equalizerwin_apply_preset (listp);
- return TRUE;
-}
-
-void equalizerwin_save_preset (Index<EqualizerPreset> & list, const char * name, const char * filename)
-{
- int p = equalizerwin_find_preset (list, name);
-
- if (p < 0)
- {
- list.append (String (name));
- p = list.len () - 1;
- }
-
- equalizerwin_update_preset (listp);
-
- aud_eq_write_presets (list, filename);
-}
-
-void equalizerwin_delete_preset (Index<EqualizerPreset> & list, const char * name, const char * filename)
-{
- int p = equalizerwin_find_preset (list, name);
- if (p < 0)
- return;
-
- list.remove (p, 1);
- aud_eq_write_presets (list, filename);
-}
-
-static gboolean equalizerwin_read_aud_preset (const char * filename)
-{
- EqualizerPreset preset;
-
- VFSFile file (filename, "r");
- if (! file || ! aud_load_preset_file (preset, file))
- return FALSE;
-
- equalizerwin_apply_preset (preset);
- return TRUE;
-}
-
-static void equalizerwin_set_preamp (float preamp)
-{
- eq_slider_set_val (equalizerwin_preamp, preamp);
- equalizerwin_eq_changed();
-}
-
-static void equalizerwin_set_band (int band, float value)
-{
- g_return_if_fail(band >= 0 && band < AUD_EQ_NBANDS);
- eq_slider_set_val (equalizerwin_bandsband, value);
- equalizerwin_eq_changed();
-}
-
-static float equalizerwin_get_preamp (void)
-{
- return eq_slider_get_val (equalizerwin_preamp);
-}
-
-static float equalizerwin_get_band (int band)
-{
- g_return_val_if_fail(band >= 0 && band < AUD_EQ_NBANDS, 0.0);
- return eq_slider_get_val (equalizerwin_bandsband);
-}
-
-static void load_auto_preset (const char * filename)
-{
- char * eq_file = g_strconcat (filename, ".", EQUALIZER_DEFAULT_PRESET_EXT, nullptr);
- gboolean success = equalizerwin_read_aud_preset (eq_file);
- g_free (eq_file);
-
- if (success)
- return;
-
- char * folder = g_path_get_dirname (filename);
- eq_file = g_build_filename (folder, EQUALIZER_DEFAULT_DIR_PRESET, nullptr);
- success = equalizerwin_read_aud_preset (eq_file);
-
- g_free (folder);
- g_free (eq_file);
-
- if (success)
- return;
-
- char * base = g_path_get_basename (filename);
-
- if (! equalizerwin_load_preset (equalizer_auto_presets, base))
- eq_preset_load_default ();
-
- g_free (base);
-}
-
-static void playback_begin_cb (void *, void *)
-{
- if (aud_get_bool (nullptr, "equalizer_autoload"))
- load_auto_preset (aud_drct_get_filename ());
-}

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/ui_equalizer.h Deleted

@@ -1,54 +0,0 @@
-/* Audacious - Cross-platform multimedia player
- * Copyright (C) 2005-2007 Audacious development team.
- *
- * Based on BMP:
- * Copyright (C) 2003-2004 BMP development team.
- *
- * Based on XMMS:
- * Copyright (C) 1998-2003 XMMS development team.
- *
- * 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; under version 3 of the License.
- *
- * 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>.
- *
- * The Audacious team does not consider modular code linking to
- * Audacious or using our public API to be a derived work.
- */
-
-#ifndef SKINS_UI_EQUALIZER_H
-#define SKINS_UI_EQUALIZER_H
-
-#include <gtk/gtk.h>
-
-#include <libaudcore/equalizer.h>
-
-#define EQUALIZER_DEFAULT_DIR_PRESET "dir_default.preset"
-#define EQUALIZER_DEFAULT_PRESET_EXT "preset"
-
-void equalizerwin_create(void);
-void equalizerwin_set_volume_slider(int percent);
-void equalizerwin_set_balance_slider(int percent);
-void equalizerwin_eq_changed(void);
-
-void equalizerwin_apply_preset (const EqualizerPreset & preset);
-void equalizerwin_update_preset (EqualizerPreset & preset);
-void equalizerwin_import_presets (Index<EqualizerPreset> && presets);
-
-extern GtkWidget *equalizerwin;
-extern GtkWidget *equalizerwin_graph;
-
-extern Index<EqualizerPreset> equalizer_presets, equalizer_auto_presets;
-
-gboolean equalizerwin_load_preset (Index<EqualizerPreset> & list, const char * name);
-void equalizerwin_save_preset (Index<EqualizerPreset> & list, const char * name, const char * filename);
-void equalizerwin_delete_preset (Index<EqualizerPreset> & list, const char * name, const char * filename);
-
-#endif /* SKINS_UI_EQUALIZER_H */

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/ui_main.cc Deleted

@@ -1,1352 +0,0 @@
-/* Audacious - Cross-platform multimedia player
- * Copyright (C) 2005-2011 Audacious development team.
- *
- * BMP - Cross-platform multimedia player
- * Copyright (C) 2003-2004 BMP development team.
- *
- * Based on XMMS:
- * Copyright (C) 1998-2003 XMMS development team.
- *
- * 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; under version 3 of the License.
- *
- * 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>.
- *
- * The Audacious team does not consider modular code linking to
- * Audacious or using our public API to be a derived work.
- */
-
-#include <math.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/time.h>
-
-#include <gdk/gdkkeysyms.h>
-#include <gtk/gtk.h>
-
-#include <libaudcore/audstrings.h>
-#include <libaudcore/drct.h>
-#include <libaudcore/i18n.h>
-#include <libaudcore/plugins.h>
-#include <libaudcore/runtime.h>
-#include <libaudgui/libaudgui.h>
-
-#include "actions-mainwin.h"
-#include "actions-playlist.h"
-#include "dnd.h"
-#include "menus.h"
-#include "plugin.h"
-#include "plugin-window.h"
-#include "skins_cfg.h"
-#include "ui_equalizer.h"
-#include "ui_main.h"
-#include "ui_main_evlisteners.h"
-#include "ui_playlist.h"
-#include "ui_skinned_button.h"
-#include "ui_skinned_horizontal_slider.h"
-#include "ui_skinned_menurow.h"
-#include "ui_skinned_monostereo.h"
-#include "ui_skinned_number.h"
-#include "ui_skinned_playlist.h"
-#include "ui_skinned_playstatus.h"
-#include "ui_skinned_textbox.h"
-#include "ui_skinned_window.h"
-#include "ui_vis.h"
-#include "util.h"
-#include "view.h"
-
-#define SEEK_THRESHOLD 200 /* milliseconds */
-#define SEEK_TIMEOUT 100 /* milliseconds */
-#define SEEK_SPEED 50 /* milliseconds per pixel */
-
-GtkWidget *mainwin = nullptr;
-
-static int balance;
-static int seek_source = 0, seek_start, seek_time;
-
-static bool mainwin_info_text_locked = false;
-static String mainwin_tb_old_text;
-
-static int status_message_source = 0;
-static int mainwin_volume_release_timeout = 0;
-
-static GtkWidget *mainwin_menubtn, *mainwin_minimize, *mainwin_shade, *mainwin_close;
-static GtkWidget *mainwin_shaded_menubtn, *mainwin_shaded_minimize, *mainwin_shaded_shade, *mainwin_shaded_close;
-
-static GtkWidget *mainwin_rew, *mainwin_fwd;
-static GtkWidget *mainwin_eject;
-static GtkWidget *mainwin_play, *mainwin_pause, *mainwin_stop;
-
-GtkWidget *mainwin_shuffle, *mainwin_repeat;
-GtkWidget *mainwin_eq, *mainwin_pl;
-
-GtkWidget *mainwin_info;
-GtkWidget *mainwin_stime_min, *mainwin_stime_sec;
-
-static GtkWidget *mainwin_rate_text, *mainwin_freq_text, *mainwin_othertext;
-
-GtkWidget *mainwin_playstatus;
-
-GtkWidget *mainwin_minus_num, *mainwin_10min_num, *mainwin_min_num;
-GtkWidget *mainwin_10sec_num, *mainwin_sec_num;
-
-GtkWidget *mainwin_vis;
-GtkWidget *mainwin_svis;
-
-GtkWidget *mainwin_sposition = nullptr;
-
-GtkWidget *mainwin_menurow;
-static GtkWidget *mainwin_volume, *mainwin_balance;
-GtkWidget *mainwin_position;
-
-static GtkWidget *mainwin_monostereo;
-static GtkWidget *mainwin_srew, *mainwin_splay, *mainwin_spause;
-static GtkWidget *mainwin_sstop, *mainwin_sfwd, *mainwin_seject, *mainwin_about;
-
-static void mainwin_position_motion_cb (void);
-static void mainwin_position_release_cb (void);
-static void mainwin_set_volume_diff (int diff);
-
-static void format_time (char buf7, int time, int length)
-{
- gboolean zero = aud_get_bool (nullptr, "leading_zero");
- gboolean remaining = aud_get_bool ("skins", "show_remaining_time");
-
- if (remaining && length > 0)
- {
- time = (length - time) / 1000;
-
- if (time < 60)
- snprintf (buf, 7, zero ? "-00:%02d" : " -0:%02d", time);
- else if (time < 6000)
- snprintf (buf, 7, zero ? "%03d:%02d" : "%3d:%02d", -time / 60, time % 60);
- else
- snprintf (buf, 7, "%3d:%02d", -time / 3600, time / 60 % 60);
- }
- else
- {
- time /= 1000;
-
- if (time < 6000)
- snprintf (buf, 7, zero ? " %02d:%02d" : " %2d:%02d", time / 60, time % 60);
- else if (time < 60000)
- snprintf (buf, 7, "%3d:%02d", time / 60, time % 60);
- else
- snprintf (buf, 7, "%3d:%02d", time / 3600, time / 60 % 60);
- }
-}
-
-static void
-mainwin_menubtn_cb(void)
-{
- int x, y;
- gtk_window_get_position(GTK_WINDOW(mainwin), &x, &y);
- menu_popup (UI_MENU_MAIN, x + 6 * config.scale,
- y + MAINWIN_SHADED_HEIGHT * config.scale, FALSE, FALSE, 1, GDK_CURRENT_TIME);
-}
-
-static void mainwin_minimize_cb (void)
-{
- if (!mainwin)
- return;
-
- gtk_window_iconify(GTK_WINDOW(mainwin));
-}
-
-static void
-mainwin_shade_toggle(void)
-{
- view_set_player_shaded (! aud_get_bool ("skins", "player_shaded"));
-}
-
-static void mainwin_lock_info_text (const char * text)
-{
- GtkWidget * textbox =
- active_skin->properties.mainwin_othertext_is_status ?
- mainwin_othertext : mainwin_info;
-
- if (! mainwin_info_text_locked)
- mainwin_tb_old_text = String (textbox_get_text (textbox));
-
- mainwin_info_text_locked = true;
- textbox_set_text (textbox, text);
-}
-
-static void mainwin_release_info_text (void)
-{
- if (! mainwin_info_text_locked)
- return;
-
- if (active_skin->properties.mainwin_othertext_is_status)
- textbox_set_text (mainwin_othertext, mainwin_tb_old_text);
- else
- textbox_set_text (mainwin_info, mainwin_tb_old_text);
-
- mainwin_info_text_locked = false;
- mainwin_tb_old_text = String ();
-}
-
-static void mainwin_set_info_text (const char * text)
-{
- if (mainwin_info_text_locked && ! active_skin->properties.mainwin_othertext_is_status)
- mainwin_tb_old_text = String (text);
- else
- textbox_set_text (mainwin_info, text);
-}
-
-static void mainwin_set_othertext (const char * text)
-{
- if (mainwin_info_text_locked && active_skin->properties.mainwin_othertext_is_status)
- mainwin_tb_old_text = String (text);
- else
- textbox_set_text (mainwin_othertext, text);
-}
-
-static gboolean clear_status_message (void *)
-{
- mainwin_release_info_text ();
- status_message_source = 0;
- return G_SOURCE_REMOVE;
-}
-
-void mainwin_show_status_message (const char * message)
-{
- if (status_message_source)
- g_source_remove (status_message_source);
-
- mainwin_lock_info_text (message);
- status_message_source = g_timeout_add (1000, clear_status_message, nullptr);
-}
-
-static char *
-make_mainwin_title(const char * title)
-{
- if (title != nullptr)
- return g_strdup_printf(_("%s - Audacious"), title);
- else
- return g_strdup(_("Audacious"));
-}
-
-void
-mainwin_set_song_title(const char * title)
-{
- char *mainwin_title_text = make_mainwin_title(title);
- gtk_window_set_title(GTK_WINDOW(mainwin), mainwin_title_text);
- g_free(mainwin_title_text);
-
- mainwin_set_info_text (title ? title : "");
-}
-
-static void setup_widget (GtkWidget * widget, int x, int y, gboolean show)
-{
- /* leave no-show-all widgets alone (they are shown/hidden elsewhere) */
- if (! gtk_widget_get_no_show_all (widget))
- {
- int width, height;
-
- /* use get_size_request(), not get_preferred_size() */
- /* get_preferred_size() will return 0x0 for hidden widgets */
- gtk_widget_get_size_request (widget, & width, & height);
-
- width /= config.scale;
- height /= config.scale;
-
- /* hide widgets that are outside the window boundary */
- if (x < 0 || x + width > active_skin->properties.mainwin_width ||
- y < 0 || y + height > active_skin->properties.mainwin_height)
- show = FALSE;
-
- 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 (aud_get_bool ("skins", "player_shaded"))
- window_set_size (mainwin, MAINWIN_SHADED_WIDTH, MAINWIN_SHADED_HEIGHT);
- else
- window_set_size (mainwin, p->mainwin_width, p->mainwin_height);
-}
-
-/* note that the song info is not translated since it is displayed using
- * the skinned bitmap font, which supports only the English alphabet */
-void mainwin_set_song_info (int bitrate, int samplerate, int channels)
-{
- char scratch32;
- int length;
-
- if (bitrate > 0)
- {
- if (bitrate < 1000000)
- snprintf (scratch, sizeof scratch, "%3d", bitrate / 1000);
- else
- snprintf (scratch, sizeof scratch, "%2dH", bitrate / 100000);
-
- textbox_set_text (mainwin_rate_text, scratch);
- }
- else
- textbox_set_text (mainwin_rate_text, "");
-
- if (samplerate > 0)
- {
- snprintf (scratch, sizeof scratch, "%2d", samplerate / 1000);
- textbox_set_text (mainwin_freq_text, scratch);
- }
- else
- textbox_set_text (mainwin_freq_text, "");
-
- ui_skinned_monostereo_set_num_channels (mainwin_monostereo, channels);
-
- if (bitrate > 0)
- snprintf (scratch, sizeof scratch, "%d kbps", bitrate / 1000);
- else
- scratch0 = 0;
-
- if (samplerate > 0)
- {
- length = strlen (scratch);
- snprintf (scratch + length, sizeof scratch - length, "%s%d kHz", length ?
- ", " : "", samplerate / 1000);
- }
-
- if (channels > 0)
- {
- length = strlen (scratch);
- snprintf (scratch + length, sizeof scratch - length, "%s%s", length ?
- ", " : "", channels > 2 ? "surround" : channels > 1 ? "stereo" : "mono");
- }
-
- mainwin_set_othertext (scratch);
-}
-
-void
-mainwin_clear_song_info(void)
-{
- mainwin_set_song_title (nullptr);
-
- ui_vis_clear_data (mainwin_vis);
- ui_svis_clear_data (mainwin_svis);
-
- gtk_widget_hide (mainwin_minus_num);
- gtk_widget_hide (mainwin_10min_num);
- gtk_widget_hide (mainwin_min_num);
- gtk_widget_hide (mainwin_10sec_num);
- gtk_widget_hide (mainwin_sec_num);
- gtk_widget_hide (mainwin_stime_min);
- gtk_widget_hide (mainwin_stime_sec);
- gtk_widget_hide (mainwin_position);
- gtk_widget_hide (mainwin_sposition);
-
- hslider_set_pressed (mainwin_position, FALSE);
- hslider_set_pressed (mainwin_sposition, FALSE);
-
- /* clear sampling parameter displays */
- textbox_set_text (mainwin_rate_text, " ");
- textbox_set_text (mainwin_freq_text, " ");
- ui_skinned_monostereo_set_num_channels(mainwin_monostereo, 0);
- mainwin_set_othertext ("");
-
- if (mainwin_playstatus != nullptr)
- ui_skinned_playstatus_set_status(mainwin_playstatus, STATUS_STOP);
-
- playlistwin_hide_timer();
-}
-
-void
-mainwin_disable_seekbar(void)
-{
- if (!mainwin)
- return;
-
- gtk_widget_hide(mainwin_position);
- gtk_widget_hide(mainwin_sposition);
-}
-
-static void mainwin_scrolled (GtkWidget * widget, GdkEventScroll * event, void *
- unused)
-{
- switch (event->direction) {
- case GDK_SCROLL_UP:
- mainwin_set_volume_diff (5);
- break;
- case GDK_SCROLL_DOWN:
- mainwin_set_volume_diff (-5);
- break;
- case GDK_SCROLL_LEFT:
- aud_drct_seek (aud_drct_get_time () - 5000);
- break;
- case GDK_SCROLL_RIGHT:
- aud_drct_seek (aud_drct_get_time () + 5000);
- break;
- default:
- break;
- }
-}
-
-static gboolean
-mainwin_mouse_button_press(GtkWidget * widget,
- GdkEventButton * event,
- void * callback_data)
-{
- if (event->button == 1 && event->type == GDK_2BUTTON_PRESS &&
- event->window == gtk_widget_get_window (widget)&&
- event->y < 14 * config.scale)
- {
- mainwin_shade_toggle ();
- return TRUE;
- }
-
- if (event->button == 3)
- {
- menu_popup (UI_MENU_MAIN, event->x_root, event->y_root, FALSE, FALSE,
- event->button, event->time);
- return TRUE;
- }
-
- return FALSE;
-}
-
-static void mainwin_playback_rpress (GtkWidget * button, GdkEventButton * event)
-{
- menu_popup (UI_MENU_PLAYBACK, event->x_root, event->y_root, FALSE, FALSE,
- event->button, event->time);
-}
-
-gboolean mainwin_keypress (GtkWidget * widget, GdkEventKey * event,
- void * unused)
-{
- if (ui_skinned_playlist_key (playlistwin_list, event))
- return 1;
-
- switch (event->keyval)
- {
- case GDK_KEY_minus:
- mainwin_set_volume_diff (-5);
- break;
- case GDK_KEY_plus:
- mainwin_set_volume_diff (5);
- break;
- case GDK_KEY_Left:
- case GDK_KEY_KP_Left:
- case GDK_KEY_KP_7:
- aud_drct_seek (aud_drct_get_time () - 5000);
- break;
- case GDK_KEY_Right:
- case GDK_KEY_KP_Right:
- case GDK_KEY_KP_9:
- aud_drct_seek (aud_drct_get_time () + 5000);
- break;
- case GDK_KEY_KP_4:
- aud_drct_pl_prev ();
- break;
- case GDK_KEY_KP_6:
- aud_drct_pl_next ();
- break;
- case GDK_KEY_KP_Insert:
- audgui_jump_to_track ();
- break;
- case GDK_KEY_space:
- aud_drct_pause();
- break;
- case GDK_KEY_Tab: /* GtkUIManager does not handle tab, apparently. */
- if (event->state & GDK_SHIFT_MASK)
- action_playlist_prev ();
- else
- action_playlist_next ();
-
- break;
- case GDK_KEY_ISO_Left_Tab:
- action_playlist_prev ();
- break;
- default:
- return FALSE;
- }
-
- return TRUE;
-}
-
-/*
- * Rewritten 09/13/06:
- *
- * Remove all of this flaky iter/sourcelist/strsplit stuff.
- * All we care about is the filepath.
- *
- * We can figure this out and easily pass it to g_filename_from_uri().
- * - nenolod
- */
-void
-mainwin_drag_data_received(GtkWidget * widget,
- GdkDragContext * context,
- int x,
- int y,
- GtkSelectionData * selection_data,
- unsigned info,
- unsigned time,
- void * user_data)
-{
- g_return_if_fail(selection_data != nullptr);
-
- const char * data = (const char *) gtk_selection_data_get_data
- (selection_data);
- g_return_if_fail (data);
-
- if (str_has_prefix_nocase (data, "file:///"))
- {
- if (str_has_suffix_nocase (data, ".wsz\r\n") || str_has_suffix_nocase
- (data, ".zip\r\n"))
- {
- on_skin_view_drag_data_received (0, context, x, y, selection_data, info, time, 0);
- return;
- }
- }
-
- audgui_urilist_open (data);
-}
-
-static int time_now (void)
-{
- struct timeval tv;
- gettimeofday (& tv, nullptr);
- return (tv.tv_sec % (24 * 3600) * 1000 + tv.tv_usec / 1000);
-}
-
-static int time_diff (int a, int b)
-{
- if (a > 18 * 3600 * 1000 && b < 6 * 3600 * 1000) /* detect midnight */
- b += 24 * 3600 * 1000;
- return (b > a) ? b - a : 0;
-}
-
-static gboolean seek_timeout (void * rewind)
-{
- if (! aud_drct_get_playing ())
- {
- seek_source = 0;
- return G_SOURCE_REMOVE;
- }
-
- int held = time_diff (seek_time, time_now ());
- if (held < SEEK_THRESHOLD)
- return G_SOURCE_CONTINUE;
-
- int position;
- if (GPOINTER_TO_INT (rewind))
- position = seek_start - held / SEEK_SPEED;
- else
- position = seek_start + held / SEEK_SPEED;
-
- position = aud::clamp (position, 0, 219);
- hslider_set_pos (mainwin_position, position);
- mainwin_position_motion_cb ();
-
- return G_SOURCE_CONTINUE;
-}
-
-static gboolean seek_press (GtkWidget * widget, GdkEventButton * event,
- gboolean rewind)
-{
- if (event->button != 1 || seek_source)
- return FALSE;
-
- seek_start = hslider_get_pos (mainwin_position);
- seek_time = time_now ();
- seek_source = g_timeout_add (SEEK_TIMEOUT, seek_timeout, GINT_TO_POINTER (rewind));
- return FALSE;
-}
-
-static gboolean seek_release (GtkWidget * widget, GdkEventButton * event,
- gboolean rewind)
-{
- if (event->button != 1 || ! seek_source)
- return FALSE;
-
- if (! aud_drct_get_playing () || time_diff (seek_time, time_now ()) <
- SEEK_THRESHOLD)
- {
- if (rewind)
- aud_drct_pl_prev ();
- else
- aud_drct_pl_next ();
- }
- else
- mainwin_position_release_cb ();
-
- g_source_remove (seek_source);
- seek_source = 0;
- return FALSE;
-}
-
-static void mainwin_rew_press (GtkWidget * button, GdkEventButton * event)
- {seek_press (button, event, TRUE); }
-static void mainwin_rew_release (GtkWidget * button, GdkEventButton * event)
- {seek_release (button, event, TRUE); }
-static void mainwin_fwd_press (GtkWidget * button, GdkEventButton * event)
- {seek_press (button, event, FALSE); }
-static void mainwin_fwd_release (GtkWidget * button, GdkEventButton * event)
- {seek_release (button, event, FALSE); }
-
-static void mainwin_shuffle_cb (GtkWidget * button, GdkEventButton * event)
- {aud_set_bool (nullptr, "shuffle", button_get_active (button)); }
-static void mainwin_repeat_cb (GtkWidget * button, GdkEventButton * event)
- {aud_set_bool (nullptr, "repeat", button_get_active (button)); }
-static void mainwin_eq_cb (GtkWidget * button, GdkEventButton * event)
- {view_set_show_equalizer (button_get_active (button)); }
-static void mainwin_pl_cb (GtkWidget * button, GdkEventButton * event)
- {view_set_show_playlist (button_get_active (button)); }
-
-static void mainwin_spos_set_knob (void)
-{
- int pos = hslider_get_pos (mainwin_sposition);
-
- int x;
- if (pos < 6)
- x = 17;
- else if (pos < 9)
- x = 20;
- else
- x = 23;
-
- hslider_set_knob (mainwin_sposition, x, 36, x, 36);
-}
-
-static void mainwin_spos_motion_cb (void)
-{
- mainwin_spos_set_knob ();
-
- int pos = hslider_get_pos (mainwin_sposition);
- int length = aud_drct_get_length ();
- int time = (pos - 1) * length / 12;
-
- char buf7;
- format_time (buf, time, length);
-
- textbox_set_text (mainwin_stime_min, buf);
- textbox_set_text (mainwin_stime_sec, buf + 4);
-}
-
-static void mainwin_spos_release_cb (void)
-{
- mainwin_spos_set_knob ();
-
- int pos = hslider_get_pos (mainwin_sposition);
- aud_drct_seek (aud_drct_get_length () * (pos - 1) / 12);
-}
-
-static void mainwin_position_motion_cb (void)
-{
- int length = aud_drct_get_length () / 1000;
- int pos = hslider_get_pos (mainwin_position);
- int time = pos * length / 219;
-
- char * seek_msg = g_strdup_printf (_("Seek to %d:%-2.2d / %d:%-2.2d"), time
- / 60, time % 60, length / 60, length % 60);
- mainwin_lock_info_text(seek_msg);
- g_free(seek_msg);
-}
-
-static void mainwin_position_release_cb (void)
-{
- int length = aud_drct_get_length ();
- int pos = hslider_get_pos (mainwin_position);
- int time = (int64_t) pos * length / 219;
-
- aud_drct_seek(time);
- mainwin_release_info_text();
-}
-
-void
-mainwin_adjust_volume_motion(int v)
-{
- char *volume_msg;
-
- volume_msg = g_strdup_printf(_("Volume: %d%%"), v);
- mainwin_lock_info_text(volume_msg);
- g_free(volume_msg);
-
- aud_drct_set_volume_main (v);
- aud_drct_set_volume_balance (balance);
-}
-
-void
-mainwin_adjust_volume_release(void)
-{
- mainwin_release_info_text();
-}
-
-void
-mainwin_adjust_balance_motion(int b)
-{
- char *balance_msg;
-
- balance = b;
- aud_drct_set_volume_balance (b);
-
- if (b < 0)
- balance_msg = g_strdup_printf(_("Balance: %d%% left"), -b);
- else if (b == 0)
- balance_msg = g_strdup_printf(_("Balance: center"));
- else
- balance_msg = g_strdup_printf(_("Balance: %d%% right"), b);
-
- mainwin_lock_info_text(balance_msg);
- g_free(balance_msg);
-}
-
-void
-mainwin_adjust_balance_release(void)
-{
- mainwin_release_info_text();
-}
-
-static void mainwin_volume_set_frame (void)
-{
- int pos = hslider_get_pos (mainwin_volume);
- int frame = (pos * 27 + 25) / 51;
- hslider_set_frame (mainwin_volume, 0, 15 * frame);
-}
-
-void mainwin_set_volume_slider (int percent)
-{
- hslider_set_pos (mainwin_volume, (percent * 51 + 50) / 100);
- mainwin_volume_set_frame ();
-}
-
-static void mainwin_volume_motion_cb (void)
-{
- mainwin_volume_set_frame ();
- int pos = hslider_get_pos (mainwin_volume);
- int vol = (pos * 100 + 25) / 51;
-
- mainwin_adjust_volume_motion(vol);
- equalizerwin_set_volume_slider(vol);
-}
-
-static void mainwin_volume_release_cb (void)
-{
- mainwin_volume_set_frame ();
- mainwin_adjust_volume_release();
-}
-
-static gboolean mainwin_volume_timeout_cb (void *)
-{
- mainwin_volume_release_cb ();
- mainwin_volume_release_timeout = 0;
- return G_SOURCE_REMOVE;
-}
-
-static void mainwin_balance_set_frame (void)
-{
- int pos = hslider_get_pos (mainwin_balance);
- int frame = (abs (pos - 12) * 27 + 6) / 12;
- hslider_set_frame (mainwin_balance, 9, 15 * frame);
-}
-
-void mainwin_set_balance_slider (int percent)
-{
- if (percent > 0)
- hslider_set_pos (mainwin_balance, 12 + (percent * 12 + 50) / 100);
- else
- hslider_set_pos (mainwin_balance, 12 + (percent * 12 - 50) / 100);
-
- mainwin_balance_set_frame ();
-}
-
-static void mainwin_balance_motion_cb (void)
-{
- mainwin_balance_set_frame ();
- int pos = hslider_get_pos (mainwin_balance);
-
- int bal;
- if (pos > 12)
- bal = ((pos - 12) * 100 + 6) / 12;
- else
- bal = ((pos - 12) * 100 - 6) / 12;
-
- mainwin_adjust_balance_motion(bal);
- equalizerwin_set_balance_slider(bal);
-}
-
-static void mainwin_balance_release_cb (void)
-{
- mainwin_balance_set_frame ();
- mainwin_adjust_volume_release();
-}
-
-static void mainwin_set_volume_diff (int diff)
-{
- int vol = aud_drct_get_volume_main ();
-
- vol = aud::clamp (vol + diff, 0, 100);
- mainwin_adjust_volume_motion(vol);
- mainwin_set_volume_slider(vol);
- equalizerwin_set_volume_slider(vol);
-
- if (mainwin_volume_release_timeout)
- g_source_remove(mainwin_volume_release_timeout);
- mainwin_volume_release_timeout =
- g_timeout_add(700, mainwin_volume_timeout_cb, nullptr);
-}
-
-void mainwin_mr_change (MenuRowItem i)
-{
- switch (i)
- {
- case MENUROW_OPTIONS:
- mainwin_lock_info_text (_("Options Menu"));
- break;
- case MENUROW_ALWAYS:
- if (aud_get_bool ("skins", "always_on_top"))
- mainwin_lock_info_text (_("Disable 'Always On Top'"));
- else
- mainwin_lock_info_text (_("Enable 'Always On Top'"));
- break;
- case MENUROW_FILEINFOBOX:
- mainwin_lock_info_text (_("File Info Box"));
- break;
- case MENUROW_SCALE:
- mainwin_lock_info_text (_("Double Size"));
- break;
- case MENUROW_VISUALIZATION:
- mainwin_lock_info_text (_("Visualizations"));
- break;
- default:
- break;
- }
-}
-
-void mainwin_mr_release (MenuRowItem i, GdkEventButton * event)
-{
- switch (i)
- {
- case MENUROW_OPTIONS:
- menu_popup (UI_MENU_VIEW, event->x_root, event->y_root, FALSE, FALSE, 1, event->time);
- break;
- case MENUROW_ALWAYS:
- view_set_on_top (! aud_get_bool ("skins", "always_on_top"));
- break;
- case MENUROW_FILEINFOBOX:
- audgui_infowin_show_current ();
- break;
- case MENUROW_SCALE:
- view_set_double_size (! aud_get_bool ("skins", "double_size"));
- break;
- case MENUROW_VISUALIZATION:
- audgui_show_prefs_for_plugin_type (PluginType::Vis);
- break;
- default:
- break;
- }
-
- mainwin_release_info_text();
-}
-
-gboolean
-change_timer_mode_cb(GtkWidget *widget, GdkEventButton *event)
-{
- if (event->button == 1)
- view_set_show_remaining (! aud_get_bool ("skins", "show_remaining_time"));
- else if (event->button == 3)
- return FALSE;
-
- return TRUE;
-}
-
-static gboolean mainwin_info_button_press (GtkWidget * widget, GdkEventButton *
- event)
-{
- if (event->type == GDK_BUTTON_PRESS && event->button == 3)
- {
- menu_popup (UI_MENU_PLAYBACK, event->x_root, event->y_root, FALSE,
- FALSE, event->button, event->time);
- return TRUE;
- }
-
- if (event->type == GDK_2BUTTON_PRESS && event->button == 1)
- {
- audgui_infowin_show_current ();
- return TRUE;
- }
-
- return FALSE;
-}
-
-static void
-mainwin_create_widgets(void)
-{
- mainwin_menubtn = button_new (9, 9, 0, 0, 0, 9, SKIN_TITLEBAR, SKIN_TITLEBAR);
- window_put_widget (mainwin, FALSE, mainwin_menubtn, 6, 3);
- button_on_release (mainwin_menubtn, (ButtonCB) mainwin_menubtn_cb);
-
- mainwin_minimize = button_new (9, 9, 9, 0, 9, 9, SKIN_TITLEBAR, SKIN_TITLEBAR);
- window_put_widget (mainwin, FALSE, mainwin_minimize, 244, 3);
- button_on_release (mainwin_minimize, (ButtonCB) mainwin_minimize_cb);
-
- mainwin_shade = button_new (9, 9, 0, 18, 9, 18, SKIN_TITLEBAR, SKIN_TITLEBAR);
- window_put_widget (mainwin, FALSE, mainwin_shade, 254, 3);
- button_on_release (mainwin_shade, (ButtonCB) mainwin_shade_toggle);
-
- mainwin_close = button_new (9, 9, 18, 0, 18, 9, SKIN_TITLEBAR, SKIN_TITLEBAR);
- window_put_widget (mainwin, FALSE, mainwin_close, 264, 3);
- button_on_release (mainwin_close, (ButtonCB) handle_window_close);
-
- mainwin_rew = button_new (23, 18, 0, 0, 0, 18, SKIN_CBUTTONS, SKIN_CBUTTONS);
- window_put_widget (mainwin, FALSE, mainwin_rew, 16, 88);
- button_on_press (mainwin_rew, mainwin_rew_press);
- button_on_release (mainwin_rew, mainwin_rew_release);
- button_on_rpress (mainwin_rew, mainwin_playback_rpress);
-
- mainwin_fwd = button_new (22, 18, 92, 0, 92, 18, SKIN_CBUTTONS, SKIN_CBUTTONS);
- window_put_widget (mainwin, FALSE, mainwin_fwd, 108, 88);
- button_on_press (mainwin_fwd, mainwin_fwd_press);
- button_on_release (mainwin_fwd, mainwin_fwd_release);
- button_on_rpress (mainwin_fwd, mainwin_playback_rpress);
-
- 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) 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);
- window_put_widget (mainwin, FALSE, mainwin_pause, 62, 88);
- button_on_release (mainwin_pause, (ButtonCB) aud_drct_pause);
- button_on_rpress (mainwin_pause, mainwin_playback_rpress);
-
- mainwin_stop = button_new (23, 18, 69, 0, 69, 18, SKIN_CBUTTONS, SKIN_CBUTTONS);
- window_put_widget (mainwin, FALSE, mainwin_stop, 85, 88);
- button_on_release (mainwin_stop, (ButtonCB) aud_drct_stop);
- button_on_rpress (mainwin_stop, mainwin_playback_rpress);
-
- mainwin_eject = button_new (22, 16, 114, 0, 114, 16, SKIN_CBUTTONS, SKIN_CBUTTONS);
- window_put_widget (mainwin, FALSE, mainwin_eject, 136, 89);
- button_on_release (mainwin_eject, (ButtonCB) action_play_file);
-
- mainwin_shuffle = button_new_toggle (46, 15, 28, 0, 28, 15, 28, 30, 28, 45, SKIN_SHUFREP, SKIN_SHUFREP);
- window_put_widget (mainwin, FALSE, mainwin_shuffle, 164, 89);
- button_set_active (mainwin_shuffle, aud_get_bool (nullptr, "shuffle"));
- button_on_release (mainwin_shuffle, mainwin_shuffle_cb);
-
- mainwin_repeat = button_new_toggle (28, 15, 0, 0, 0, 15, 0, 30, 0, 45, SKIN_SHUFREP, SKIN_SHUFREP);
- window_put_widget (mainwin, FALSE, mainwin_repeat, 210, 89);
- button_set_active (mainwin_repeat, aud_get_bool (nullptr, "repeat"));
- button_on_release (mainwin_repeat, mainwin_repeat_cb);
-
- mainwin_eq = button_new_toggle (23, 12, 0, 61, 46, 61, 0, 73, 46, 73, SKIN_SHUFREP, SKIN_SHUFREP);
- window_put_widget (mainwin, FALSE, mainwin_eq, 219, 58);
- button_on_release (mainwin_eq, mainwin_eq_cb);
-
- mainwin_pl = button_new_toggle (23, 12, 23, 61, 69, 61, 23, 73, 69, 73, SKIN_SHUFREP, SKIN_SHUFREP);
- window_put_widget (mainwin, FALSE, mainwin_pl, 242, 58);
- button_on_release (mainwin_pl, mainwin_pl_cb);
-
- String font = aud_get_str ("skins", "mainwin_font");
- mainwin_info = textbox_new (153, "", config.mainwin_use_bitmapfont ? nullptr :
- (const char *) font, config.autoscroll);
-
- window_put_widget (mainwin, FALSE, mainwin_info, 112, 27);
- g_signal_connect (mainwin_info, "button-press-event", (GCallback)
- mainwin_info_button_press, nullptr);
-
- mainwin_othertext = textbox_new (153, "", nullptr, FALSE);
- window_put_widget (mainwin, FALSE, mainwin_othertext, 112, 43);
-
- mainwin_rate_text = textbox_new (15, "", nullptr, FALSE);
- window_put_widget (mainwin, FALSE, mainwin_rate_text, 111, 43);
-
- mainwin_freq_text = textbox_new (10, "", nullptr, FALSE);
- window_put_widget (mainwin, FALSE, mainwin_freq_text, 156, 43);
-
- mainwin_menurow = ui_skinned_menurow_new ();
- window_put_widget (mainwin, FALSE, mainwin_menurow, 10, 22);
-
- mainwin_volume = hslider_new (0, 51, SKIN_VOLUME, 68, 13, 0, 0, 14, 11, 15, 422, 0, 422);
- window_put_widget (mainwin, FALSE, mainwin_volume, 107, 57);
- hslider_on_motion (mainwin_volume, mainwin_volume_motion_cb);
- hslider_on_release (mainwin_volume, mainwin_volume_release_cb);
-
- mainwin_balance = hslider_new (0, 24, SKIN_BALANCE, 38, 13, 9, 0, 14, 11, 15, 422, 0, 422);
- window_put_widget (mainwin, FALSE, mainwin_balance, 177, 57);
- hslider_on_motion (mainwin_balance, mainwin_balance_motion_cb);
- hslider_on_release (mainwin_balance, mainwin_balance_release_cb);
-
- mainwin_monostereo = ui_skinned_monostereo_new ();
- window_put_widget (mainwin, FALSE, mainwin_monostereo, 212, 41);
-
- mainwin_playstatus = ui_skinned_playstatus_new ();
- window_put_widget (mainwin, FALSE, mainwin_playstatus, 24, 28);
-
- mainwin_minus_num = ui_skinned_number_new ();
- window_put_widget (mainwin, FALSE, mainwin_minus_num, 36, 26);
- g_signal_connect(mainwin_minus_num, "button-press-event", G_CALLBACK(change_timer_mode_cb), nullptr);
-
- mainwin_10min_num = ui_skinned_number_new ();
- window_put_widget (mainwin, FALSE, mainwin_10min_num, 48, 26);
- g_signal_connect(mainwin_10min_num, "button-press-event", G_CALLBACK(change_timer_mode_cb), nullptr);
-
- mainwin_min_num = ui_skinned_number_new ();
- window_put_widget (mainwin, FALSE, mainwin_min_num, 60, 26);
- g_signal_connect(mainwin_min_num, "button-press-event", G_CALLBACK(change_timer_mode_cb), nullptr);
-
- mainwin_10sec_num = ui_skinned_number_new ();
- window_put_widget (mainwin, FALSE, mainwin_10sec_num, 78, 26);
- g_signal_connect(mainwin_10sec_num, "button-press-event", G_CALLBACK(change_timer_mode_cb), nullptr);
-
- mainwin_sec_num = ui_skinned_number_new ();
- window_put_widget (mainwin, FALSE, mainwin_sec_num, 90, 26);
- g_signal_connect(mainwin_sec_num, "button-press-event", G_CALLBACK(change_timer_mode_cb), nullptr);
-
- mainwin_about = button_new_small (20, 25);
- window_put_widget (mainwin, FALSE, mainwin_about, 247, 83);
- button_on_release (mainwin_about, (ButtonCB) audgui_show_about_window);
-
- mainwin_vis = ui_vis_new ();
- window_put_widget (mainwin, FALSE, mainwin_vis, 24, 43);
-
- mainwin_position = hslider_new (0, 219, SKIN_POSBAR, 248, 10, 0, 0, 29, 10, 248, 0, 278, 0);
- window_put_widget (mainwin, FALSE, mainwin_position, 16, 72);
- hslider_on_motion (mainwin_position, mainwin_position_motion_cb);
- hslider_on_release (mainwin_position, mainwin_position_release_cb);
-
- /* shaded */
-
- mainwin_shaded_menubtn = button_new (9, 9, 0, 0, 0, 9, SKIN_TITLEBAR, SKIN_TITLEBAR);
- window_put_widget (mainwin, TRUE, mainwin_shaded_menubtn, 6, 3);
- button_on_release (mainwin_shaded_menubtn, (ButtonCB) mainwin_menubtn_cb);
-
- mainwin_shaded_minimize = button_new (9, 9, 9, 0, 9, 9, SKIN_TITLEBAR, SKIN_TITLEBAR);
- window_put_widget (mainwin, TRUE, mainwin_shaded_minimize, 244, 3);
- button_on_release (mainwin_shaded_minimize, (ButtonCB) mainwin_minimize_cb);
-
- mainwin_shaded_shade = button_new (9, 9, 0, 27, 9, 27, SKIN_TITLEBAR, SKIN_TITLEBAR);
- window_put_widget (mainwin, TRUE, mainwin_shaded_shade, 254, 3);
- button_on_release (mainwin_shaded_shade, (ButtonCB) mainwin_shade_toggle);
-
- mainwin_shaded_close = button_new (9, 9, 18, 0, 18, 9, SKIN_TITLEBAR, SKIN_TITLEBAR);
- window_put_widget (mainwin, TRUE, mainwin_shaded_close, 264, 3);
- button_on_release (mainwin_shaded_close, (ButtonCB) handle_window_close);
-
- mainwin_srew = button_new_small (8, 7);
- window_put_widget (mainwin, TRUE, mainwin_srew, 169, 4);
- button_on_release (mainwin_srew, (ButtonCB) aud_drct_pl_prev);
-
- mainwin_splay = button_new_small (10, 7);
- window_put_widget (mainwin, TRUE, mainwin_splay, 177, 4);
- 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);
- button_on_release (mainwin_spause, (ButtonCB) aud_drct_pause);
-
- mainwin_sstop = button_new_small (9, 7);
- window_put_widget (mainwin, TRUE, mainwin_sstop, 197, 4);
- button_on_release (mainwin_sstop, (ButtonCB) aud_drct_stop);
-
- mainwin_sfwd = button_new_small (8, 7);
- window_put_widget (mainwin, TRUE, mainwin_sfwd, 206, 4);
- button_on_release (mainwin_sfwd, (ButtonCB) aud_drct_pl_next);
-
- mainwin_seject = button_new_small (9, 7);
- window_put_widget (mainwin, TRUE, mainwin_seject, 216, 4);
- button_on_release (mainwin_seject, (ButtonCB) action_play_file);
-
- mainwin_svis = ui_svis_new ();
- window_put_widget (mainwin, TRUE, mainwin_svis, 79, 5);
-
- mainwin_sposition = hslider_new (1, 13, SKIN_TITLEBAR, 17, 7, 0, 36, 3, 7, 17, 36, 17, 36);
- window_put_widget (mainwin, TRUE, mainwin_sposition, 226, 4);
- hslider_on_motion (mainwin_sposition, mainwin_spos_motion_cb);
- hslider_on_release (mainwin_sposition, mainwin_spos_release_cb);
-
- mainwin_stime_min = textbox_new (15, "", nullptr, FALSE);
- window_put_widget (mainwin, TRUE, mainwin_stime_min, 130, 4);
-
- mainwin_stime_sec = textbox_new (10, "", nullptr, FALSE);
- window_put_widget (mainwin, TRUE, mainwin_stime_sec, 147, 4);
-
- g_signal_connect(mainwin_stime_min, "button-press-event", G_CALLBACK(change_timer_mode_cb), nullptr);
- g_signal_connect(mainwin_stime_sec, "button-press-event", G_CALLBACK(change_timer_mode_cb), nullptr);
-}
-
-static void show_widgets (void)
-{
- gtk_widget_set_no_show_all (mainwin_minus_num, TRUE);
- gtk_widget_set_no_show_all (mainwin_10min_num, TRUE);
- gtk_widget_set_no_show_all (mainwin_min_num, TRUE);
- gtk_widget_set_no_show_all (mainwin_10sec_num, TRUE);
- gtk_widget_set_no_show_all (mainwin_sec_num, TRUE);
- gtk_widget_set_no_show_all (mainwin_stime_min, TRUE);
- gtk_widget_set_no_show_all (mainwin_stime_sec, TRUE);
- gtk_widget_set_no_show_all (mainwin_position, TRUE);
- gtk_widget_set_no_show_all (mainwin_sposition, TRUE);
-
- window_set_shaded (mainwin, aud_get_bool ("skins", "player_shaded"));
- window_show_all (mainwin);
-}
-
-static gboolean state_cb (GtkWidget * widget, GdkEventWindowState * event,
- void * unused)
-{
- if (event->changed_mask & GDK_WINDOW_STATE_STICKY)
- view_set_sticky (!! (event->new_window_state & GDK_WINDOW_STATE_STICKY));
-
- if (event->changed_mask & GDK_WINDOW_STATE_ABOVE)
- view_set_on_top (!! (event->new_window_state & GDK_WINDOW_STATE_ABOVE));
-
- return TRUE;
-}
-
-static void mainwin_draw (GtkWidget * window, cairo_t * cr)
-{
- gboolean shaded = aud_get_bool ("skins", "player_shaded");
- int width = shaded ? MAINWIN_SHADED_WIDTH : active_skin->properties.mainwin_width;
- int height = shaded ? MAINWIN_SHADED_HEIGHT : active_skin->properties.mainwin_height;
-
- skin_draw_pixbuf (cr, SKIN_MAIN, 0, 0, 0, 0, width, height);
- skin_draw_mainwin_titlebar (cr, shaded, TRUE);
-}
-
-static void
-mainwin_create_window(void)
-{
- gboolean shaded = aud_get_bool ("skins", "player_shaded");
- int width = shaded ? MAINWIN_SHADED_WIDTH : active_skin->properties.mainwin_width;
- int height = shaded ? MAINWIN_SHADED_HEIGHT : active_skin->properties.mainwin_height;
-
- mainwin = window_new (& config.player_x, & config.player_y, width, height,
- TRUE, shaded, mainwin_draw);
-
- gtk_window_set_title(GTK_WINDOW(mainwin), _("Audacious"));
-
- g_signal_connect(mainwin, "button_press_event",
- G_CALLBACK(mainwin_mouse_button_press), nullptr);
- g_signal_connect(mainwin, "scroll_event",
- G_CALLBACK(mainwin_scrolled), nullptr);
-
- drag_dest_set(mainwin);
- g_signal_connect ((GObject *) mainwin, "drag-data-received", (GCallback)
- mainwin_drag_data_received, 0);
-
- g_signal_connect(mainwin, "key_press_event",
- G_CALLBACK(mainwin_keypress), nullptr);
-
- ui_main_evlistener_init();
-
- g_signal_connect ((GObject *) mainwin, "window-state-event", (GCallback) state_cb, nullptr);
- g_signal_connect ((GObject *) mainwin, "delete-event", (GCallback) handle_window_close, nullptr);
-}
-
-void mainwin_unhook (void)
-{
- if (seek_source)
- {
- g_source_remove (seek_source);
- seek_source = 0;
- }
-
- if (status_message_source)
- {
- g_source_remove (status_message_source);
- status_message_source = 0;
- }
-
- if (mainwin_volume_release_timeout)
- {
- g_source_remove (mainwin_volume_release_timeout);
- mainwin_volume_release_timeout = 0;
- }
-
- ui_main_evlistener_dissociate ();
- start_stop_visual (TRUE);
-
- mainwin_info_text_locked = false;
- mainwin_tb_old_text = String ();
-}
-
-void
-mainwin_create(void)
-{
- mainwin_create_window();
-
- gtk_window_add_accel_group ((GtkWindow *) mainwin, menu_get_accel_group ());
-
- mainwin_create_widgets();
- show_widgets ();
-}
-
-static void mainwin_update_volume (void)
-{
- int volume = aud_drct_get_volume_main ();
- int balance = aud_drct_get_volume_balance ();
-
- mainwin_set_volume_slider (volume);
- mainwin_set_balance_slider (balance);
- equalizerwin_set_volume_slider (volume);
- equalizerwin_set_balance_slider (balance);
-}
-
-static void mainwin_update_time_display (int time, int length)
-{
- char scratch7;
- format_time (scratch, time, length);
-
- ui_skinned_number_set (mainwin_minus_num, scratch0);
- ui_skinned_number_set (mainwin_10min_num, scratch1);
- ui_skinned_number_set (mainwin_min_num, scratch2);
- ui_skinned_number_set (mainwin_10sec_num, scratch4);
- ui_skinned_number_set (mainwin_sec_num, scratch5);
-
- if (! hslider_get_pressed (mainwin_sposition))
- {
- textbox_set_text (mainwin_stime_min, scratch);
- textbox_set_text (mainwin_stime_sec, scratch + 4);
- }
-
- playlistwin_set_time (scratch, scratch + 4);
-}
-
-static void mainwin_update_time_slider (int time, int length)
-{
- gtk_widget_set_visible (mainwin_position, length > 0);
- gtk_widget_set_visible (mainwin_sposition, length > 0);
-
- if (length > 0 && seek_source == 0)
- {
- if (time < length)
- {
- hslider_set_pos (mainwin_position, time * (int64_t) 219 / length);
- hslider_set_pos (mainwin_sposition, 1 + time * (int64_t) 12 / length);
- }
- else
- {
- hslider_set_pos (mainwin_position, 219);
- hslider_set_pos (mainwin_sposition, 13);
- }
-
- mainwin_spos_set_knob ();
- }
-}
-
-void mainwin_update_song_info (void)
-{
- mainwin_update_volume ();
-
- if (! aud_drct_get_playing ())
- return;
-
- int time = 0, length = 0;
- if (aud_drct_get_ready ())
- {
- time = aud_drct_get_time ();
- length = aud_drct_get_length ();
- }
-
- mainwin_update_time_display (time, length);
- mainwin_update_time_slider (time, length);
-}
-
-/* actionentries actions */
-
-void action_play_file (void)
-{
- audgui_run_filebrowser(TRUE); /* TRUE = PLAY_BUTTON */
-}
-
-void action_play_location (void)
-{
- audgui_show_add_url_window (TRUE);
-}
-
-void action_playlist_manager (void)
-{
- PluginHandle * manager = aud_plugin_lookup_basename ("playlist-manager");
- if (manager)
- {
- aud_plugin_enable (manager, true);
- focus_plugin_window (manager);
- }
-}
-
-void action_search_tool (void)
-{
- PluginHandle * search = aud_plugin_lookup_basename ("search-tool");
- if (search)
- {
- aud_plugin_enable (search, true);
- focus_plugin_window (search);
- }
-}
-
-void action_ab_set (void)
-{
- if (aud_drct_get_length () > 0)
- {
- int a, b;
- aud_drct_get_ab_repeat (a, b);
-
- if (a < 0 || b >= 0)
- {
- a = aud_drct_get_time ();
- b = -1;
- mainwin_show_status_message (_("Repeat point A set."));
- }
- else
- {
- 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)
-{
- mainwin_show_status_message (_("Repeat points cleared."));
- aud_drct_set_ab_repeat (-1, -1);
-}

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/ui_main.h Deleted

@@ -1,89 +0,0 @@
-/* BMP - Cross-platform multimedia player
- * Copyright (C) 2003-2004 BMP development team.
- *
- * Based on XMMS:
- * Copyright (C) 1998-2003 XMMS development team.
- *
- * 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; under version 3 of the License.
- *
- * 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>.
- *
- * The Audacious team does not consider modular code linking to
- * Audacious or using our public API to be a derived work.
- */
-
-#ifndef SKINS_UI_MAIN_H
-#define SKINS_UI_MAIN_H
-
-#include <gtk/gtk.h>
-
-/* yes, main window size is fixed */
-#define MAINWIN_WIDTH (int)275
-#define MAINWIN_HEIGHT (int)116
-#define MAINWIN_TITLEBAR_HEIGHT (int)14
-#define MAINWIN_SHADED_WIDTH MAINWIN_WIDTH
-#define MAINWIN_SHADED_HEIGHT MAINWIN_TITLEBAR_HEIGHT
-
-extern GtkWidget *mainwin;
-
-extern GtkWidget *mainwin_shuffle, *mainwin_repeat;
-extern GtkWidget *mainwin_eq, *mainwin_pl;
-extern GtkWidget *mainwin_info;
-
-extern GtkWidget *mainwin_stime_min, *mainwin_stime_sec;
-
-extern GtkWidget *mainwin_vis;
-extern GtkWidget *mainwin_svis;
-
-extern GtkWidget *mainwin_playstatus;
-
-extern GtkWidget *mainwin_minus_num, *mainwin_10min_num, *mainwin_min_num;
-extern GtkWidget *mainwin_10sec_num, *mainwin_sec_num;
-
-extern GtkWidget *mainwin_menurow;
-extern GtkWidget *mainwin_position, *mainwin_sposition;
-
-void mainwin_create(void);
-void mainwin_unhook (void);
-
-void mainwin_adjust_volume_motion(int v);
-void mainwin_adjust_volume_release(void);
-void mainwin_adjust_balance_motion(int b);
-void mainwin_adjust_balance_release(void);
-void mainwin_set_volume_slider(int percent);
-void mainwin_set_balance_slider(int percent);
-
-void mainwin_refresh_hints(void);
-void mainwin_set_song_title (const char * title);
-void mainwin_set_song_info(int rate, int freq, int nch);
-void mainwin_clear_song_info(void);
-
-void mainwin_disable_seekbar(void);
-
-void mainwin_update_song_info (void);
-void mainwin_show_status_message (const char * message);
-
-void mainwin_drag_data_received(GtkWidget * widget,
- GdkDragContext * context,
- int x,
- int y,
- GtkSelectionData * selection_data,
- unsigned info,
- unsigned time,
- void * user_data);
-
-gboolean change_timer_mode_cb(GtkWidget *widget, GdkEventButton *event);
-
-/* widget should be null if called manually. */
-gboolean mainwin_keypress (GtkWidget * widget, GdkEventKey * event,
- void * unused);
-
-#endif /* SKINS_UI_MAIN_H */

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/ui_main_evlisteners.cc Deleted

@@ -1,346 +0,0 @@
-/*
- * Audacious
- * Copyright (c) 2006-2007 Audacious development team.
- *
- * 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; under version 3 of the License.
- *
- * 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>.
- *
- * The Audacious team does not consider modular code linking to
- * Audacious or using our public API to be a derived work.
- */
-
-#include <math.h>
-
-#include <libaudcore/drct.h>
-#include <libaudcore/hook.h>
-#include <libaudcore/i18n.h>
-#include <libaudcore/interface.h>
-#include <libaudcore/runtime.h>
-
-#include "skins_cfg.h"
-#include "ui_main.h"
-#include "ui_main_evlisteners.h"
-#include "ui_skin.h"
-#include "ui_skinned_button.h"
-#include "ui_skinned_playstatus.h"
-#include "ui_vis.h"
-#include "util.h"
-
-static void title_change (void)
-{
- if (aud_drct_get_ready ())
- mainwin_set_song_title (aud_drct_get_title ());
- else
- mainwin_set_song_title ("Buffering ...");
-}
-
-static void info_change (void)
-{
- int bitrate, samplerate, channels;
- aud_drct_get_info (bitrate, samplerate, channels);
- mainwin_set_song_info (bitrate, samplerate, channels);
-}
-
-static void
-ui_main_evlistener_hide_seekbar(void * hook_data, void * user_data)
-{
- mainwin_disable_seekbar();
-}
-
-void ui_main_evlistener_playback_begin (void * hook_data, void * user_data)
-{
- mainwin_disable_seekbar();
- mainwin_update_song_info();
-
- gtk_widget_show (mainwin_stime_min);
- gtk_widget_show (mainwin_stime_sec);
- gtk_widget_show (mainwin_minus_num);
- gtk_widget_show (mainwin_10min_num);
- gtk_widget_show (mainwin_min_num);
- gtk_widget_show (mainwin_10sec_num);
- gtk_widget_show (mainwin_sec_num);
-
- if (aud_drct_get_ready () && aud_drct_get_length () > 0)
- {
- gtk_widget_show (mainwin_position);
- gtk_widget_show (mainwin_sposition);
- }
-
- ui_skinned_playstatus_set_status(mainwin_playstatus, STATUS_PLAY);
-
- title_change ();
- info_change ();
-}
-
-static void
-ui_main_evlistener_playback_stop(void * hook_data, void * user_data)
-{
- mainwin_clear_song_info ();
-}
-
-static void repeat_toggled (void * data, void * user)
-{
- button_set_active (mainwin_repeat, aud_get_bool (nullptr, "repeat"));
-}
-
-static void shuffle_toggled (void * data, void * user)
-{
- button_set_active (mainwin_shuffle, aud_get_bool (nullptr, "shuffle"));
-}
-
-static void no_advance_toggled (void * data, void * user)
-{
- if (aud_get_bool (nullptr, "no_playlist_advance"))
- mainwin_show_status_message (_("Single mode."));
- else
- mainwin_show_status_message (_("Playlist mode."));
-}
-
-static void stop_after_song_toggled (void * hook_data, void * user_data)
-{
- if (aud_get_bool (nullptr, "stop_after_current_song"))
- mainwin_show_status_message (_("Stopping after song."));
-}
-
-void ui_main_evlistener_playback_pause (void * hook_data, void * user_data)
-{
- ui_skinned_playstatus_set_status(mainwin_playstatus, STATUS_PAUSE);
-}
-
-static void
-ui_main_evlistener_playback_unpause(void * hook_data, void * user_data)
-{
- ui_skinned_playstatus_set_status(mainwin_playstatus, STATUS_PLAY);
-}
-
-class VisCallbacks : public Visualizer
-{
-public:
- constexpr VisCallbacks () :
- Visualizer (MonoPCM | MultiPCM | Freq) {}
-
- void clear ();
- void render_mono_pcm (const float * pcm);
- void render_multi_pcm (const float * pcm, int channels);
- void render_freq (const float * freq);
-};
-
-void VisCallbacks::clear ()
-{
- ui_vis_clear_data (mainwin_vis);
- ui_svis_clear_data (mainwin_svis);
-}
-
-void VisCallbacks::render_mono_pcm (const float * pcm)
-{
- unsigned char data512;
-
- if (config.vis_type != VIS_SCOPE)
- return;
-
- for (int i = 0; i < 75; i ++)
- {
- /* the signal is amplified by 2x */
- /* output values are in the range 0 to 16 */
- int val = 8 + roundf (16 * pcmi * 512 / 75);
- datai = aud::clamp (val, 0, 16);
- }
-
- if (aud_get_bool ("skins", "player_shaded"))
- ui_svis_timeout_func (mainwin_svis, data);
- else
- ui_vis_timeout_func (mainwin_vis, data);
-}
-
-/* calculate peak dB level, where 1 is 0 dB */
-static float calc_peak_level (const float * pcm, int step)
-{
- float peak = 0.0001; /* must be > 0, or level = -inf */
-
- for (int i = 0; i < 512; i ++)
- {
- peak = aud::max (peak, * pcm);
- pcm += step;
- }
-
- return 20 * log10 (peak);
-}
-
-void VisCallbacks::render_multi_pcm (const float * pcm, int channels)
-{
- /* "VU meter" */
- if (config.vis_type != VIS_VOICEPRINT || ! aud_get_bool ("skins", "player_shaded"))
- return;
-
- unsigned char data512;
-
- int level = 38 + calc_peak_level (pcm, channels);
- data0 = aud::clamp (level, 0, 38);
-
- if (channels >= 2)
- {
- level = 38 + calc_peak_level (pcm + 1, channels);
- data1 = aud::clamp (level, 0, 38);
- }
- else
- data1 = data0;
-
- ui_svis_timeout_func (mainwin_svis, data);
-}
-
-/* convert linear frequency graph to logarithmic one */
-static void make_log_graph (const float * freq, int bands, int db_range, int
- int_range, unsigned char * graph)
-{
- static int last_bands = 0;
- static float * xscale = nullptr;
-
- /* conversion table for the x-axis */
- if (bands != last_bands)
- {
- xscale = g_renew (float, xscale, bands + 1);
- for (int i = 0; i <= bands; i ++)
- xscalei = powf (256, (float) i / bands) - 0.5f;
-
- last_bands = bands;
- }
-
- for (int i = 0; i < bands; i ++)
- {
- /* sum up values in freq array between xscalei and xscalei + 1,
- including fractional parts */
- int a = ceilf (xscalei);
- int b = floorf (xscalei + 1);
- float sum = 0;
-
- if (b < a)
- sum += freqb * (xscalei + 1 - xscalei);
- else
- {
- if (a > 0)
- sum += freqa - 1 * (a - xscalei);
- for (; a < b; a ++)
- sum += freqa;
- if (b < 256)
- sum += freqb * (xscalei + 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) bands / 12;
-
- /* convert to dB */
- float val = 20 * log10f (sum);
-
- /* scale (-db_range, 0.0) to (0.0, int_range) */
- val = (1 + val / db_range) * int_range;
-
- graphi = aud::clamp ((int) val, 0, int_range);
- }
-}
-
-void VisCallbacks::render_freq (const float * freq)
-{
- bool shaded = aud_get_bool ("skins", "player_shaded");
-
- unsigned char data512;
-
- if (config.vis_type == VIS_ANALYZER)
- {
- if (config.analyzer_type == ANALYZER_BARS)
- {
- if (shaded)
- make_log_graph (freq, 13, 40, 8, data);
- else
- make_log_graph (freq, 19, 40, 16, data);
- }
- else
- {
- if (shaded)
- make_log_graph (freq, 37, 40, 8, data);
- else
- make_log_graph (freq, 75, 40, 16, data);
- }
- }
- else if (config.vis_type == VIS_VOICEPRINT && ! shaded)
- make_log_graph (freq, 17, 40, 255, data);
- else
- return;
-
- if (shaded)
- ui_svis_timeout_func (mainwin_svis, data);
- else
- ui_vis_timeout_func (mainwin_vis, data);
-}
-
-void
-ui_main_evlistener_init(void)
-{
- hook_associate("hide seekbar", ui_main_evlistener_hide_seekbar, nullptr);
- hook_associate("playback begin", ui_main_evlistener_playback_begin, nullptr);
- hook_associate("playback ready", ui_main_evlistener_playback_begin, nullptr);
- hook_associate("playback stop", ui_main_evlistener_playback_stop, nullptr);
- hook_associate("playback pause", ui_main_evlistener_playback_pause, nullptr);
- hook_associate("playback unpause", ui_main_evlistener_playback_unpause, nullptr);
- hook_associate ("title change", (HookFunction) title_change, nullptr);
- hook_associate ("info change", (HookFunction) info_change, nullptr);
-
- hook_associate("playback seek", (HookFunction) mainwin_update_song_info, nullptr);
-
- hook_associate ("set repeat", repeat_toggled, nullptr);
- hook_associate ("set shuffle", shuffle_toggled, nullptr);
- hook_associate ("set no_playlist_advance", no_advance_toggled, nullptr);
- hook_associate ("set stop_after_current_song", stop_after_song_toggled, nullptr);
-}
-
-void
-ui_main_evlistener_dissociate(void)
-{
- hook_dissociate("hide seekbar", ui_main_evlistener_hide_seekbar);
- hook_dissociate("playback begin", ui_main_evlistener_playback_begin);
- hook_dissociate("playback ready", ui_main_evlistener_playback_begin);
- hook_dissociate("playback stop", ui_main_evlistener_playback_stop);
- hook_dissociate("playback pause", ui_main_evlistener_playback_pause);
- hook_dissociate("playback unpause", ui_main_evlistener_playback_unpause);
- hook_dissociate ("title change", (HookFunction) title_change);
- hook_dissociate ("info change", (HookFunction) info_change);
-
- hook_dissociate("playback seek", (HookFunction) mainwin_update_song_info);
-
- hook_dissociate ("set repeat", repeat_toggled);
- hook_dissociate ("set shuffle", shuffle_toggled);
- hook_dissociate ("set no_playlist_advance", no_advance_toggled);
- hook_dissociate ("set stop_after_current_song", stop_after_song_toggled);
-}
-
-void start_stop_visual (gboolean exiting)
-{
- static VisCallbacks callbacks;
- static bool started = false;
-
- if (config.vis_type != VIS_OFF && ! exiting && gtk_widget_get_visible (mainwin))
- {
- if (! started)
- {
- aud_visualizer_add (& callbacks);
- started = true;
- }
- }
- else
- {
- if (started)
- {
- aud_visualizer_remove (& callbacks);
- started = false;
- }
- }
-}

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/ui_main_evlisteners.h Deleted

@@ -1,34 +0,0 @@
-/*
- * Audacious
- * Copyright (c) 2006-2007 Audacious development team.
- *
- * 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; under version 3 of the License.
- *
- * 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>.
- *
- * The Audacious team does not consider modular code linking to
- * Audacious or using our public API to be a derived work.
- */
-
-#include <glib.h>
-
-#ifndef SKINS_UI_MAIN_EVLISTENERS_H
-#define SKINS_UI_MAIN_EVLISTENERS_H
-
-void ui_main_evlistener_init(void);
-void ui_main_evlistener_dissociate(void);
-
-void ui_main_evlistener_playback_begin (void * hook_data, void * user_data);
-void ui_main_evlistener_playback_pause (void * hook_data, void * user_data);
-
-void start_stop_visual (gboolean exiting);
-
-#endif /* SKINS_UI_MAIN_EVLISTENERS_H */

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/ui_playlist.cc Deleted

@@ -1,1169 +0,0 @@
-/* Audacious - Cross-platform multimedia player
- * Copyright (C) 2005-2011 Audacious development team.
- *
- * BMP - Cross-platform multimedia player
- * Copyright (C) 2003-2004 BMP development team.
- *
- * Based on XMMS:
- * Copyright (C) 1998-2003 XMMS development team.
- *
- * 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; under version 3 of the License.
- *
- * 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>.
- *
- * The Audacious team does not consider modular code linking to
- * Audacious or using our public API to be a derived work.
- */
-
-#include <inttypes.h>
-#include <string.h>
-
-#include <gdk/gdkkeysyms.h>
-#include <gtk/gtk.h>
-
-#include <libaudcore/audstrings.h>
-#include <libaudcore/drct.h>
-#include <libaudcore/hook.h>
-#include <libaudcore/i18n.h>
-#include <libaudcore/playlist.h>
-#include <libaudcore/runtime.h>
-#include <libaudcore/tuple.h>
-#include <libaudgui/libaudgui.h>
-
-#include "actions-mainwin.h"
-#include "dnd.h"
-#include "drag-handle.h"
-#include "menus.h"
-#include "plugin.h"
-#include "skins_cfg.h"
-#include "ui_main.h"
-#include "ui_playlist.h"
-#include "ui_skinned_button.h"
-#include "ui_skinned_playlist.h"
-#include "ui_skinned_playlist_slider.h"
-#include "ui_skinned_textbox.h"
-#include "ui_skinned_window.h"
-#include "view.h"
-
-#define PLAYLISTWIN_MIN_WIDTH MAINWIN_WIDTH
-#define PLAYLISTWIN_MIN_HEIGHT MAINWIN_HEIGHT
-#define PLAYLISTWIN_WIDTH_SNAP 25
-#define PLAYLISTWIN_HEIGHT_SNAP 29
-#define PLAYLISTWIN_SHADED_HEIGHT MAINWIN_SHADED_HEIGHT
-
-#define APPEND(b, ...) snprintf (b + strlen (b), sizeof b - strlen (b), __VA_ARGS__)
-
-int active_playlist = -1, active_length = 0;
-char * active_title = nullptr;
-
-GtkWidget * playlistwin, * playlistwin_list, * playlistwin_sinfo;
-
-static GtkWidget *playlistwin_shade, *playlistwin_close;
-static GtkWidget *playlistwin_shaded_shade, *playlistwin_shaded_close;
-
-static GtkWidget *playlistwin_slider;
-static GtkWidget *playlistwin_time_min, *playlistwin_time_sec;
-static GtkWidget *playlistwin_info;
-static GtkWidget *playlistwin_srew, *playlistwin_splay;
-static GtkWidget *playlistwin_spause, *playlistwin_sstop;
-static GtkWidget *playlistwin_sfwd, *playlistwin_seject;
-static GtkWidget *playlistwin_sscroll_up, *playlistwin_sscroll_down;
-static GtkWidget * resize_handle, * sresize_handle;
-static GtkWidget * button_add, * button_sub, * button_sel, * button_misc,
- * button_list;
-
-static void playlistwin_select_search_cbt_cb(GtkWidget *called_cbt,
- void * other_cbt);
-static gboolean playlistwin_select_search_kp_cb(GtkWidget *entry,
- GdkEventKey *event,
- void * searchdlg_win);
-
-static int resize_base_width, resize_base_height;
-static int drop_position;
-static gboolean song_changed;
-
-static void playlistwin_update_info (void)
-{
- StringBuf s1 = str_format_time (aud_playlist_get_selected_length (active_playlist));
- StringBuf s2 = str_format_time (aud_playlist_get_total_length (active_playlist));
- textbox_set_text (playlistwin_info, str_concat ({s1, "/", s2}));
-}
-
-static void update_rollup_text (void)
-{
- int playlist = aud_playlist_get_active ();
- int entry = aud_playlist_get_position (playlist);
- Tuple tuple = aud_playlist_entry_get_tuple (playlist, entry, Playlist::Guess);
- char scratch512;
-
- scratch0 = 0;
-
- if (entry > -1)
- {
- String title = tuple.get_str (Tuple::FormattedTitle);
- int length = tuple.get_int (Tuple::Length);
-
- if (aud_get_bool (nullptr, "show_numbers_in_pl"))
- APPEND (scratch, "%d. ", 1 + entry);
-
- APPEND (scratch, "%s", (const char *) title);
-
- if (length >= 0)
- {
- StringBuf buf = str_format_time (length);
- APPEND (scratch, " (%s)", (const char *) buf);
- }
- }
-
- textbox_set_text (playlistwin_sinfo, scratch);
-}
-
-static void real_update (void)
-{
- ui_skinned_playlist_update (playlistwin_list);
- playlistwin_update_info ();
- update_rollup_text ();
-}
-
-void playlistwin_update (void)
-{
- if (! aud_playlist_update_pending ())
- real_update ();
-}
-
-static void
-playlistwin_shade_toggle(void)
-{
- view_set_playlist_shaded (! aud_get_bool ("skins", "playlist_shaded"));
-}
-
-static void playlistwin_scroll (gboolean up)
-{
- int rows, first;
-
- ui_skinned_playlist_row_info (playlistwin_list, & rows, & first);
- ui_skinned_playlist_scroll_to (playlistwin_list, first + (up ? -1 : 1) *
- rows / 3);
-}
-
-static void playlistwin_scroll_up_pushed (void)
-{
- playlistwin_scroll (TRUE);
-}
-
-static void playlistwin_scroll_down_pushed (void)
-{
- playlistwin_scroll (FALSE);
-}
-
-static void
-playlistwin_select_all(void)
-{
- aud_playlist_select_all (active_playlist, 1);
-}
-
-static void
-playlistwin_select_none(void)
-{
- aud_playlist_select_all (active_playlist, 0);
-}
-
-static void copy_selected_to_new (int playlist)
-{
- int entries = aud_playlist_entry_count (playlist);
- int new_list = aud_playlist_count ();
- Index<PlaylistAddItem> items;
- int entry;
-
- aud_playlist_insert (new_list);
-
- for (entry = 0; entry < entries; entry ++)
- {
- if (aud_playlist_entry_get_selected (playlist, entry))
- {
- items.append (
- aud_playlist_entry_get_filename (playlist, entry),
- aud_playlist_entry_get_tuple (playlist, entry, Playlist::Guess)
- );
- }
- }
-
- aud_playlist_entry_insert_batch (new_list, 0, std::move (items), FALSE);
- aud_playlist_set_active (new_list);
-}
-
-static void
-playlistwin_select_search(void)
-{
- GtkWidget *searchdlg_win, *searchdlg_grid;
- GtkWidget *searchdlg_hbox, *searchdlg_logo, *searchdlg_helptext;
- GtkWidget *searchdlg_entry_title, *searchdlg_label_title;
- GtkWidget *searchdlg_entry_album, *searchdlg_label_album;
- GtkWidget *searchdlg_entry_file_name, *searchdlg_label_file_name;
- GtkWidget *searchdlg_entry_performer, *searchdlg_label_performer;
- GtkWidget *searchdlg_checkbt_clearprevsel;
- GtkWidget *searchdlg_checkbt_newplaylist;
- GtkWidget *searchdlg_checkbt_autoenqueue;
- int result;
-
- /* create dialog */
- searchdlg_win = gtk_dialog_new_with_buttons(
- _("Search entries in active playlist") , GTK_WINDOW(mainwin) ,
- (GtkDialogFlags) (GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT),
- _("Cancel") , GTK_RESPONSE_REJECT , _("Search") , GTK_RESPONSE_ACCEPT , nullptr );
-
- /* help text and logo */
- searchdlg_hbox = gtk_box_new( GTK_ORIENTATION_HORIZONTAL , 4 );
- searchdlg_logo = gtk_image_new_from_icon_name( "edit-find" , GTK_ICON_SIZE_DIALOG );
- searchdlg_helptext = gtk_label_new( _("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.") );
- gtk_label_set_max_width_chars( GTK_LABEL(searchdlg_helptext), 70 );
- gtk_label_set_line_wrap( GTK_LABEL(searchdlg_helptext) , TRUE );
- gtk_box_pack_start( GTK_BOX(searchdlg_hbox) , searchdlg_logo , FALSE , FALSE , 0 );
- gtk_box_pack_start( GTK_BOX(searchdlg_hbox) , searchdlg_helptext , FALSE , FALSE , 0 );
-
- /* title */
- searchdlg_label_title = gtk_label_new( _("Title:") );
- searchdlg_entry_title = gtk_entry_new();
- gtk_widget_set_hexpand( searchdlg_entry_title , TRUE );
- gtk_widget_set_halign( searchdlg_label_title , GTK_ALIGN_START );
- g_signal_connect( searchdlg_entry_title , "key-press-event" ,
- G_CALLBACK(playlistwin_select_search_kp_cb) , searchdlg_win );
-
- /* album */
- searchdlg_label_album= gtk_label_new( _("Album:") );
- searchdlg_entry_album= gtk_entry_new();
- gtk_widget_set_hexpand( searchdlg_entry_album , TRUE );
- gtk_widget_set_halign( searchdlg_label_album , GTK_ALIGN_START );
- g_signal_connect( searchdlg_entry_album , "key-press-event" ,
- G_CALLBACK(playlistwin_select_search_kp_cb) , searchdlg_win );
-
- /* artist */
- searchdlg_label_performer = gtk_label_new( _("Artist:") );
- searchdlg_entry_performer = gtk_entry_new();
- gtk_widget_set_hexpand( searchdlg_entry_performer , TRUE );
- gtk_widget_set_halign( searchdlg_label_performer , GTK_ALIGN_START );
- g_signal_connect( searchdlg_entry_performer , "key-press-event" ,
- G_CALLBACK(playlistwin_select_search_kp_cb) , searchdlg_win );
-
- /* file name */
- searchdlg_label_file_name = gtk_label_new( _("File Name:") );
- searchdlg_entry_file_name = gtk_entry_new();
- gtk_widget_set_hexpand( searchdlg_entry_file_name , TRUE );
- gtk_widget_set_halign( searchdlg_label_file_name , GTK_ALIGN_START );
- g_signal_connect( searchdlg_entry_file_name , "key-press-event" ,
- G_CALLBACK(playlistwin_select_search_kp_cb) , searchdlg_win );
-
- /* some options that control behaviour */
- searchdlg_checkbt_clearprevsel = gtk_check_button_new_with_label(
- _("Clear previous selection before searching") );
- gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON(searchdlg_checkbt_clearprevsel) , TRUE );
- searchdlg_checkbt_autoenqueue = gtk_check_button_new_with_label(
- _("Automatically toggle queue for matching entries") );
- gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON(searchdlg_checkbt_autoenqueue) , FALSE );
- searchdlg_checkbt_newplaylist = gtk_check_button_new_with_label(
- _("Create a new playlist with matching entries") );
- gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON(searchdlg_checkbt_newplaylist) , FALSE );
- g_signal_connect( searchdlg_checkbt_autoenqueue , "clicked" ,
- G_CALLBACK(playlistwin_select_search_cbt_cb) , searchdlg_checkbt_newplaylist );
- g_signal_connect( searchdlg_checkbt_newplaylist , "clicked" ,
- G_CALLBACK(playlistwin_select_search_cbt_cb) , searchdlg_checkbt_autoenqueue );
-
- /* place fields in searchdlg_grid */
- searchdlg_grid = gtk_grid_new();
- gtk_grid_set_row_spacing( GTK_GRID(searchdlg_grid) , 2 );
- gtk_widget_set_margin_bottom( searchdlg_hbox , 8 );
- gtk_widget_set_margin_top( searchdlg_checkbt_clearprevsel , 8 );
- gtk_grid_attach( GTK_GRID(searchdlg_grid) , searchdlg_hbox , 0 , 0 , 2 , 1 );
- gtk_grid_attach( GTK_GRID(searchdlg_grid) , searchdlg_label_title , 0 , 1 , 1 , 1 );
- gtk_grid_attach( GTK_GRID(searchdlg_grid) , searchdlg_entry_title , 1 , 1 , 1 , 1 );
- gtk_grid_attach( GTK_GRID(searchdlg_grid) , searchdlg_label_album , 0 , 2 , 1 , 1 );
- gtk_grid_attach( GTK_GRID(searchdlg_grid) , searchdlg_entry_album , 1 , 2 , 1 , 1 );
- gtk_grid_attach( GTK_GRID(searchdlg_grid) , searchdlg_label_performer , 0 , 3 , 1 , 1 );
- gtk_grid_attach( GTK_GRID(searchdlg_grid) , searchdlg_entry_performer , 1 , 3 , 1 , 1 );
- gtk_grid_attach( GTK_GRID(searchdlg_grid) , searchdlg_label_file_name , 0 , 4 , 1 , 1 );
- gtk_grid_attach( GTK_GRID(searchdlg_grid) , searchdlg_entry_file_name , 1 , 4 , 1 , 1 );
- gtk_grid_attach( GTK_GRID(searchdlg_grid) , searchdlg_checkbt_clearprevsel , 0 , 5 , 2 , 1 );
- gtk_grid_attach( GTK_GRID(searchdlg_grid) , searchdlg_checkbt_autoenqueue , 0 , 6 , 2 , 1 );
- gtk_grid_attach( GTK_GRID(searchdlg_grid) , searchdlg_checkbt_newplaylist , 0 , 7 , 2 , 1 );
-
- gtk_container_set_border_width( GTK_CONTAINER(searchdlg_grid) , 5 );
- gtk_container_add ( GTK_CONTAINER(gtk_dialog_get_content_area
- (GTK_DIALOG(searchdlg_win))) , searchdlg_grid );
- gtk_widget_show_all( searchdlg_win );
- result = gtk_dialog_run( GTK_DIALOG(searchdlg_win) );
-
- switch(result)
- {
- case GTK_RESPONSE_ACCEPT:
- {
- /* create a TitleInput tuple with user search data */
- Tuple tuple;
- char *searchdata = nullptr;
-
- searchdata = (char*)gtk_entry_get_text( GTK_ENTRY(searchdlg_entry_title) );
- AUDDBG("title=\"%s\"\n", searchdata);
- tuple.set_str (Tuple::Title, searchdata);
-
- searchdata = (char*)gtk_entry_get_text( GTK_ENTRY(searchdlg_entry_album) );
- AUDDBG("album=\"%s\"\n", searchdata);
- tuple.set_str (Tuple::Album, searchdata);
-
- searchdata = (char*)gtk_entry_get_text( GTK_ENTRY(searchdlg_entry_performer) );
- AUDDBG("performer=\"%s\"\n", searchdata);
- tuple.set_str (Tuple::Artist, searchdata);
-
- searchdata = (char*)gtk_entry_get_text( GTK_ENTRY(searchdlg_entry_file_name) );
- AUDDBG("filename=\"%s\"\n", searchdata);
- tuple.set_str (Tuple::Basename, searchdata);
-
- /* check if previous selection should be cleared before searching */
- if ( gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(searchdlg_checkbt_clearprevsel)) == TRUE )
- playlistwin_select_none();
-
- aud_playlist_select_by_patterns (active_playlist, tuple);
-
- /* check if a new playlist should be created after searching */
- if ( gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(searchdlg_checkbt_newplaylist)) == TRUE )
- copy_selected_to_new (active_playlist);
- else
- {
- /* set focus on the first entry found */
- int entries = aud_playlist_entry_count (active_playlist);
- int count;
-
- for (count = 0; count < entries; count ++)
- {
- if (aud_playlist_entry_get_selected (active_playlist, count))
- {
- ui_skinned_playlist_set_focused (playlistwin_list, count);
- break;
- }
- }
-
- /* check if matched entries should be queued */
- if (gtk_toggle_button_get_active ((GtkToggleButton *)
- searchdlg_checkbt_autoenqueue))
- aud_playlist_queue_insert_selected (active_playlist, -1);
- }
-
- playlistwin_update ();
- break;
- }
- default:
- break;
- }
- /* done here :) */
- gtk_widget_destroy( searchdlg_win );
-}
-
-static void playlistwin_inverse_selection (void)
-{
- int entries = aud_playlist_entry_count (active_playlist);
- int entry;
-
- for (entry = 0; entry < entries; entry ++)
- aud_playlist_entry_set_selected (active_playlist, entry,
- ! aud_playlist_entry_get_selected (active_playlist, entry));
-}
-
-/* note: height is ignored if the window is shaded */
-static void playlistwin_resize (int w, int h)
-{
- int tx, ty;
-
- g_return_if_fail(w > 0 && h > 0);
-
- tx = (w - PLAYLISTWIN_MIN_WIDTH) / PLAYLISTWIN_WIDTH_SNAP;
- tx = (tx * PLAYLISTWIN_WIDTH_SNAP) + PLAYLISTWIN_MIN_WIDTH;
- if (tx < PLAYLISTWIN_MIN_WIDTH)
- tx = PLAYLISTWIN_MIN_WIDTH;
-
- if (! aud_get_bool ("skins", "playlist_shaded"))
- {
- ty = (h - PLAYLISTWIN_MIN_HEIGHT) / PLAYLISTWIN_HEIGHT_SNAP;
- ty = (ty * PLAYLISTWIN_HEIGHT_SNAP) + PLAYLISTWIN_MIN_HEIGHT;
- if (ty < PLAYLISTWIN_MIN_HEIGHT)
- ty = PLAYLISTWIN_MIN_HEIGHT;
- }
- else
- ty = config.playlist_height;
-
- if (tx == config.playlist_width && ty == config.playlist_height)
- return;
-
- config.playlist_width = w = tx;
- config.playlist_height = h = ty;
-
- ui_skinned_playlist_resize (playlistwin_list, w - 31, h - 58);
- window_move_widget (playlistwin, FALSE, playlistwin_slider, w - 15, 20);
- ui_skinned_playlist_slider_resize (playlistwin_slider, h - 58);
-
- window_move_widget (playlistwin, TRUE, playlistwin_shaded_shade, w - 21, 3);
- window_move_widget (playlistwin, TRUE, playlistwin_shaded_close, w - 11, 3);
- window_move_widget (playlistwin, FALSE, playlistwin_shade, w - 21, 3);
- window_move_widget (playlistwin, FALSE, playlistwin_close, w - 11, 3);
-
- window_move_widget (playlistwin, FALSE, playlistwin_time_min, w - 82, h - 15);
- window_move_widget (playlistwin, FALSE, playlistwin_time_sec, w - 64, h - 15);
- window_move_widget (playlistwin, FALSE, playlistwin_info, w - 143, h - 28);
-
- window_move_widget (playlistwin, FALSE, playlistwin_srew, w - 144, h - 16);
- window_move_widget (playlistwin, FALSE, playlistwin_splay, w - 138, h - 16);
- window_move_widget (playlistwin, FALSE, playlistwin_spause, w - 128, h - 16);
- window_move_widget (playlistwin, FALSE, playlistwin_sstop, w - 118, h - 16);
- window_move_widget (playlistwin, FALSE, playlistwin_sfwd, w - 109, h - 16);
- window_move_widget (playlistwin, FALSE, playlistwin_seject, w - 100, h - 16);
- window_move_widget (playlistwin, FALSE, playlistwin_sscroll_up, w - 14, h - 35);
- window_move_widget (playlistwin, FALSE, playlistwin_sscroll_down, w - 14, h - 30);
-
- window_move_widget (playlistwin, FALSE, resize_handle, w - 20, h - 20);
- window_move_widget (playlistwin, TRUE, sresize_handle, w - 31, 0);
-
- textbox_set_width (playlistwin_sinfo, w - 35);
-
- window_move_widget (playlistwin, FALSE, button_add, 12, h - 29);
- window_move_widget (playlistwin, FALSE, button_sub, 40, h - 29);
- window_move_widget (playlistwin, FALSE, button_sel, 68, h - 29);
- window_move_widget (playlistwin, FALSE, button_misc, 100, h - 29);
- window_move_widget (playlistwin, FALSE, button_list, w - 46, h - 29);
-}
-
-static void
-playlistwin_fileinfo(void)
-{
- audgui_infowin_show (active_playlist, aud_playlist_get_focus (active_playlist));
-}
-
-static void
-playlistwin_scrolled(GtkWidget * widget,
- GdkEventScroll * event,
- void * callback_data)
-{
- switch (event->direction)
- {
- case GDK_SCROLL_DOWN:
- playlistwin_scroll (FALSE);
- break;
- case GDK_SCROLL_UP:
- playlistwin_scroll (TRUE);
- break;
- default:
- break;
- }
-}
-
-static gboolean
-playlistwin_press(GtkWidget * widget,
- GdkEventButton * event,
- void * callback_data)
-{
- if (event->button == 1 && event->type == GDK_2BUTTON_PRESS &&
- event->window == gtk_widget_get_window (widget) && event->y < 14)
- playlistwin_shade_toggle();
- else if (event->button == 3)
- menu_popup (UI_MENU_PLAYLIST, event->x_root, event->y_root, FALSE, FALSE, 3, event->time);
-
- return TRUE;
-}
-
-void
-playlistwin_hide_timer(void)
-{
- textbox_set_text (playlistwin_time_min, " ");
- textbox_set_text (playlistwin_time_sec, " ");
-}
-
-void playlistwin_set_time (const char * minutes, const char * seconds)
-{
- textbox_set_text (playlistwin_time_min, minutes);
- textbox_set_text (playlistwin_time_sec, seconds);
-}
-
-static void drag_motion (GtkWidget * widget, GdkDragContext * context, int x,
- int y, unsigned time, void * unused)
-{
- if (! aud_get_bool ("skins", "playlist_shaded"))
- ui_skinned_playlist_hover (playlistwin_list, x - 12, y - 20);
-}
-
-static void drag_leave (GtkWidget * widget, GdkDragContext * context, unsigned time,
- void * unused)
-{
- if (! aud_get_bool ("skins", "playlist_shaded"))
- ui_skinned_playlist_hover_end (playlistwin_list);
-}
-
-static void drag_drop (GtkWidget * widget, GdkDragContext * context, int x,
- int y, unsigned time, void * unused)
-{
- if (aud_get_bool ("skins", "playlist_shaded"))
- drop_position = -1;
- else
- {
- ui_skinned_playlist_hover (playlistwin_list, x - 12, y - 20);
- drop_position = ui_skinned_playlist_hover_end (playlistwin_list);
- }
-}
-
-static void drag_data_received (GtkWidget * widget, GdkDragContext * context,
- int x, int y, GtkSelectionData * data, unsigned info, unsigned time, void * unused)
-{
- audgui_urilist_insert (active_playlist, drop_position, (const char *)
- gtk_selection_data_get_data (data));
- drop_position = -1;
-}
-
-static void playlistwin_hide (void)
-{
- view_set_show_playlist (FALSE);
-}
-
-static void resize_press (void)
-{
- resize_base_width = config.playlist_width;
- resize_base_height = config.playlist_height;
-}
-
-static void resize_drag (int x_offset, int y_offset)
-{
- gboolean shaded = aud_get_bool ("skins", "playlist_shaded");
-
- /* compromise between rounding and truncating; this has no real
- * justification at all other than it "looks about right". */
- playlistwin_resize (resize_base_width + x_offset + PLAYLISTWIN_WIDTH_SNAP /
- 3, resize_base_height + y_offset + PLAYLISTWIN_HEIGHT_SNAP / 3);
- window_set_size (playlistwin, config.playlist_width, shaded ?
- PLAYLISTWIN_SHADED_HEIGHT : config.playlist_height);
-}
-
-static void button_add_cb (GtkWidget * button, GdkEventButton * event)
-{
- int xpos, ypos;
- gtk_window_get_position ((GtkWindow *) playlistwin, & xpos, & ypos);
- menu_popup (UI_MENU_PLAYLIST_ADD, xpos + 12 * config.scale,
- ypos + (config.playlist_height - 8) * config.scale, FALSE, TRUE,
- event->button, event->time);
-}
-
-static void button_sub_cb (GtkWidget * button, GdkEventButton * event)
-{
- int xpos, ypos;
- gtk_window_get_position ((GtkWindow *) playlistwin, & xpos, & ypos);
- menu_popup (UI_MENU_PLAYLIST_REMOVE, xpos + 40 * config.scale,
- ypos + (config.playlist_height - 8) * config.scale, FALSE, TRUE,
- event->button, event->time);
-}
-
-static void button_sel_cb (GtkWidget * button, GdkEventButton * event)
-{
- int xpos, ypos;
- gtk_window_get_position ((GtkWindow *) playlistwin, & xpos, & ypos);
- menu_popup (UI_MENU_PLAYLIST_SELECT, xpos + 68 * config.scale,
- ypos + (config.playlist_height - 8) * config.scale, FALSE, TRUE,
- event->button, event->time);
-}
-
-static void button_misc_cb (GtkWidget * button, GdkEventButton * event)
-{
- int xpos, ypos;
- gtk_window_get_position ((GtkWindow *) playlistwin, & xpos, & ypos);
- menu_popup (UI_MENU_PLAYLIST_SORT, xpos + 100 * config.scale,
- ypos + (config.playlist_height - 8) * config.scale, FALSE, TRUE,
- event->button, event->time);
-}
-
-static void button_list_cb (GtkWidget * button, GdkEventButton * event)
-{
- int xpos, ypos;
- gtk_window_get_position ((GtkWindow *) playlistwin, & xpos, & ypos);
- menu_popup (UI_MENU_PLAYLIST,
- xpos + (config.playlist_width - 12) * config.scale,
- ypos + (config.playlist_height - 8) * config.scale, TRUE, TRUE,
- event->button, event->time);
-}
-
-static void
-playlistwin_create_widgets(void)
-{
- int w = config.playlist_width, h = config.playlist_height;
-
- playlistwin_sinfo = textbox_new (w - 35, "", nullptr, config.autoscroll);
- window_put_widget (playlistwin, TRUE, playlistwin_sinfo, 4, 4);
-
- playlistwin_shaded_shade = button_new (9, 9, 128, 45, 150, 42, SKIN_PLEDIT, SKIN_PLEDIT);
- window_put_widget (playlistwin, TRUE, playlistwin_shaded_shade, w - 21, 3);
- button_on_release (playlistwin_shaded_shade, (ButtonCB) playlistwin_shade_toggle);
-
- playlistwin_shaded_close = button_new (9, 9, 138, 45, 52, 42, SKIN_PLEDIT, SKIN_PLEDIT);
- window_put_widget (playlistwin, TRUE, playlistwin_shaded_close, w - 11, 3);
- button_on_release (playlistwin_shaded_close, (ButtonCB) playlistwin_hide);
-
- playlistwin_shade = button_new (9, 9, 157, 3, 62, 42, SKIN_PLEDIT, SKIN_PLEDIT);
- window_put_widget (playlistwin, FALSE, playlistwin_shade, w - 21, 3);
- button_on_release (playlistwin_shade, (ButtonCB) playlistwin_shade_toggle);
-
- playlistwin_close = button_new (9, 9, 167, 3, 52, 42, SKIN_PLEDIT, SKIN_PLEDIT);
- window_put_widget (playlistwin, FALSE, playlistwin_close, w - 11, 3);
- button_on_release (playlistwin_close, (ButtonCB) playlistwin_hide);
-
- String font = aud_get_str ("skins", "playlist_font");
- playlistwin_list = ui_skinned_playlist_new (w - 31, h - 58, font);
- window_put_widget (playlistwin, FALSE, playlistwin_list, 12, 20);
-
- /* playlist list box slider */
- playlistwin_slider = ui_skinned_playlist_slider_new (playlistwin_list, h - 58);
- window_put_widget (playlistwin, FALSE, playlistwin_slider, w - 15, 20);
- ui_skinned_playlist_set_slider (playlistwin_list, playlistwin_slider);
-
- playlistwin_time_min = textbox_new (15, "", nullptr, FALSE);
- window_put_widget (playlistwin, FALSE, playlistwin_time_min, w - 82, h - 15);
-
- playlistwin_time_sec = textbox_new (10, "", nullptr, FALSE);
- window_put_widget (playlistwin, FALSE, playlistwin_time_sec, w - 64, h - 15);
-
- g_signal_connect(playlistwin_time_min, "button-press-event", G_CALLBACK(change_timer_mode_cb), nullptr);
- g_signal_connect(playlistwin_time_sec, "button-press-event", G_CALLBACK(change_timer_mode_cb), nullptr);
-
- playlistwin_info = textbox_new (90, "", nullptr, FALSE);
- window_put_widget (playlistwin, FALSE, playlistwin_info, w - 143, h - 28);
-
- /* mini play control buttons at right bottom corner */
-
- playlistwin_srew = button_new_small (8, 7);
- window_put_widget (playlistwin, FALSE, playlistwin_srew, w - 144, h - 16);
- button_on_release (playlistwin_srew, (ButtonCB) aud_drct_pl_prev);
-
- playlistwin_splay = button_new_small (10, 7);
- window_put_widget (playlistwin, FALSE, playlistwin_splay, w - 138, h - 16);
- 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);
- button_on_release (playlistwin_spause, (ButtonCB) aud_drct_pause);
-
- playlistwin_sstop = button_new_small (9, 7);
- window_put_widget (playlistwin, FALSE, playlistwin_sstop, w - 118, h - 16);
- button_on_release (playlistwin_sstop, (ButtonCB) aud_drct_stop);
-
- playlistwin_sfwd = button_new_small (8, 7);
- window_put_widget (playlistwin, FALSE, playlistwin_sfwd, w - 109, h - 16);
- button_on_release (playlistwin_sfwd, (ButtonCB) aud_drct_pl_next);
-
- playlistwin_seject = button_new_small (9, 7);
- window_put_widget (playlistwin, FALSE, playlistwin_seject, w - 100, h - 16);
- button_on_release (playlistwin_seject, (ButtonCB) action_play_file);
-
- playlistwin_sscroll_up = button_new_small (8, 5);
- window_put_widget (playlistwin, FALSE, playlistwin_sscroll_up, w - 14, h - 35);
- button_on_release (playlistwin_sscroll_up, (ButtonCB) playlistwin_scroll_up_pushed);
-
- playlistwin_sscroll_down = button_new_small (8, 5);
- window_put_widget (playlistwin, FALSE, playlistwin_sscroll_down, w - 14, h - 30);
- button_on_release (playlistwin_sscroll_down, (ButtonCB) playlistwin_scroll_down_pushed);
-
- /* resize handles */
-
- resize_handle = drag_handle_new (20, 20, resize_press, resize_drag);
- window_put_widget (playlistwin, FALSE, resize_handle, w - 20, h - 20);
-
- sresize_handle = drag_handle_new (9, PLAYLISTWIN_SHADED_HEIGHT, resize_press, resize_drag);
- window_put_widget (playlistwin, TRUE, sresize_handle, w - 31, 0);
-
- /* lower button row */
-
- button_add = button_new_small (25, 18);
- window_put_widget (playlistwin, FALSE, button_add, 12, h - 29);
- button_on_press (button_add, button_add_cb);
-
- button_sub = button_new_small (25, 18);
- window_put_widget (playlistwin, FALSE, button_sub, 40, h - 29);
- button_on_press (button_sub, button_sub_cb);
-
- button_sel = button_new_small (25, 18);
- window_put_widget (playlistwin, FALSE, button_sel, 68, h - 29);
- button_on_press (button_sel, button_sel_cb);
-
- button_misc = button_new_small (25, 18);
- window_put_widget (playlistwin, FALSE, button_misc, 100, h - 29);
- button_on_press (button_misc, button_misc_cb);
-
- button_list = button_new_small (23, 18);
- window_put_widget (playlistwin, FALSE, button_list, w - 46, h - 29);
- button_on_press (button_list, button_list_cb);
-}
-
-static void pl_win_draw (GtkWidget * window, cairo_t * cr)
-{
- if (aud_get_bool ("skins", "playlist_shaded"))
- skin_draw_playlistwin_shaded (cr, config.playlist_width, TRUE);
- else
- skin_draw_playlistwin_frame (cr, config.playlist_width,
- config.playlist_height, TRUE);
-}
-
-static void
-playlistwin_create_window(void)
-{
- gboolean shaded = aud_get_bool ("skins", "playlist_shaded");
-
- playlistwin = window_new (& config.playlist_x, & config.playlist_y,
- config.playlist_width, shaded ? PLAYLISTWIN_SHADED_HEIGHT :
- config.playlist_height, FALSE, shaded, pl_win_draw);
-
- gtk_window_set_title(GTK_WINDOW(playlistwin), _("Audacious Playlist Editor"));
-
- gtk_window_set_transient_for(GTK_WINDOW(playlistwin),
- GTK_WINDOW(mainwin));
- gtk_window_set_skip_pager_hint(GTK_WINDOW(playlistwin), TRUE);
- gtk_window_set_skip_taskbar_hint(GTK_WINDOW(playlistwin), TRUE);
-
- gtk_widget_add_events(playlistwin, GDK_POINTER_MOTION_MASK |
- GDK_FOCUS_CHANGE_MASK | GDK_BUTTON_MOTION_MASK |
- GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK |
- GDK_SCROLL_MASK | GDK_VISIBILITY_NOTIFY_MASK);
-
- g_signal_connect (playlistwin, "delete-event", (GCallback) handle_window_close, nullptr);
- g_signal_connect (playlistwin, "button-press-event", (GCallback) playlistwin_press, nullptr);
- g_signal_connect (playlistwin, "scroll-event", (GCallback) playlistwin_scrolled, nullptr);
- g_signal_connect (playlistwin, "key-press-event", (GCallback) mainwin_keypress, nullptr);
-
- drag_dest_set (playlistwin);
- drop_position = -1;
-
- g_signal_connect (playlistwin, "drag-motion", (GCallback) drag_motion, nullptr);
- g_signal_connect (playlistwin, "drag-leave", (GCallback) drag_leave, nullptr);
- g_signal_connect (playlistwin, "drag-drop", (GCallback) drag_drop, nullptr);
- g_signal_connect (playlistwin, "drag-data-received", (GCallback) drag_data_received, nullptr);
-}
-
-static void get_title (void)
-{
- int playlists = aud_playlist_count ();
-
- g_free (active_title);
-
- if (playlists > 1)
- {
- String title = aud_playlist_get_title (active_playlist);
- active_title = g_strdup_printf (_("%s (%d of %d)"),
- (const char *) title, 1 + active_playlist, playlists);
- }
- else
- active_title = nullptr;
-}
-
-static void update_cb (void * unused, void * another)
-{
- int old = active_playlist;
-
- active_playlist = aud_playlist_get_active ();
- active_length = aud_playlist_entry_count (active_playlist);
- get_title ();
-
- if (active_playlist != old)
- {
- ui_skinned_playlist_scroll_to (playlistwin_list, 0);
- song_changed = TRUE;
- }
-
- if (song_changed)
- {
- ui_skinned_playlist_set_focused (playlistwin_list,
- aud_playlist_get_position (active_playlist));
- song_changed = FALSE;
- }
-
- real_update ();
-}
-
-static void follow_cb (void * data, void * another)
-{
- int list = aud::from_ptr<int> (data);
- aud_playlist_select_all (list, FALSE);
-
- int row = aud_playlist_get_position (list);
- if (row >= 0)
- aud_playlist_entry_set_selected (list, row, TRUE);
-
- if (list == active_playlist)
- song_changed = TRUE;
-}
-
-void
-playlistwin_create(void)
-{
- active_playlist = aud_playlist_get_active ();
- active_length = aud_playlist_entry_count (active_playlist);
- active_title = nullptr;
- get_title ();
-
- playlistwin_create_window();
-
- playlistwin_create_widgets();
- window_show_all (playlistwin);
-
- gtk_window_add_accel_group ((GtkWindow *) playlistwin, menu_get_accel_group ());
-
- aud_playlist_select_all (active_playlist, FALSE);
-
- int row = aud_playlist_get_position (active_playlist);
- if (row >= 0)
- aud_playlist_entry_set_selected (active_playlist, row, TRUE);
-
- ui_skinned_playlist_set_focused (playlistwin_list, row);
-
- song_changed = FALSE;
-
- hook_associate ("playlist position", follow_cb, nullptr);
- hook_associate ("playlist activate", update_cb, nullptr);
- hook_associate ("playlist update", update_cb, nullptr);
-}
-
-void playlistwin_unhook (void)
-{
- hook_dissociate ("playlist position", follow_cb);
- hook_dissociate ("playlist activate", update_cb);
- hook_dissociate ("playlist update", update_cb);
- g_free (active_title);
- active_title = nullptr;
-}
-
-void action_playlist_track_info(void)
-{
- playlistwin_fileinfo();
-}
-
-void action_queue_toggle (void)
-{
- int focus = aud_playlist_get_focus (active_playlist);
- if (focus == -1)
- return;
-
- /* make sure focused row is selected */
- if (! aud_playlist_entry_get_selected (active_playlist, focus))
- {
- aud_playlist_select_all (active_playlist, false);
- aud_playlist_entry_set_selected (active_playlist, focus, true);
- }
-
- int at = aud_playlist_queue_find_entry (active_playlist, focus);
-
- if (at == -1)
- aud_playlist_queue_insert_selected (active_playlist, -1);
- else
- aud_playlist_queue_delete_selected (active_playlist);
-}
-
-void action_playlist_sort_by_track_number (void)
-{
- aud_playlist_sort_by_scheme (active_playlist, Playlist::Track);
-}
-
-void action_playlist_sort_by_title (void)
-{
- aud_playlist_sort_by_scheme (active_playlist, Playlist::Title);
-}
-
-void action_playlist_sort_by_album (void)
-{
- aud_playlist_sort_by_scheme (active_playlist, Playlist::Album);
-}
-
-void action_playlist_sort_by_artist (void)
-{
- aud_playlist_sort_by_scheme (active_playlist, Playlist::Artist);
-}
-
-void action_playlist_sort_by_album_artist (void)
-{
- aud_playlist_sort_by_scheme (active_playlist, Playlist::AlbumArtist);
-}
-
-void action_playlist_sort_by_full_path (void)
-{
- aud_playlist_sort_by_scheme (active_playlist, Playlist::Path);
-}
-
-void action_playlist_sort_by_date (void)
-{
- aud_playlist_sort_by_scheme (active_playlist, Playlist::Date);
-}
-
-void action_playlist_sort_by_length (void)
-{
- aud_playlist_sort_by_scheme (active_playlist, Playlist::Length);
-}
-
-void action_playlist_sort_by_genre (void)
-{
- aud_playlist_sort_by_scheme (active_playlist, Playlist::Genre);
-}
-
-void action_playlist_sort_by_filename (void)
-{
- aud_playlist_sort_by_scheme (active_playlist, Playlist::Filename);
-}
-
-void action_playlist_sort_by_custom_title (void)
-{
- aud_playlist_sort_by_scheme (active_playlist, Playlist::FormattedTitle);
-}
-
-void action_playlist_sort_selected_by_track_number (void)
-{
- aud_playlist_sort_selected_by_scheme (active_playlist, Playlist::Track);
-}
-
-void action_playlist_sort_selected_by_title (void)
-{
- aud_playlist_sort_selected_by_scheme (active_playlist, Playlist::Title);
-}
-
-void action_playlist_sort_selected_by_album (void)
-{
- aud_playlist_sort_selected_by_scheme (active_playlist, Playlist::Album);
-}
-
-void action_playlist_sort_selected_by_artist (void)
-{
- aud_playlist_sort_selected_by_scheme (active_playlist, Playlist::Artist);
-}
-
-void action_playlist_sort_selected_by_album_artist (void)
-{
- aud_playlist_sort_selected_by_scheme (active_playlist, Playlist::AlbumArtist);
-}
-
-void action_playlist_sort_selected_by_length (void)
-{
- aud_playlist_sort_selected_by_scheme (active_playlist, Playlist::Length);
-}
-
-void action_playlist_sort_selected_by_genre (void)
-{
- aud_playlist_sort_selected_by_scheme (active_playlist, Playlist::Genre);
-}
-
-void action_playlist_sort_selected_by_full_path (void)
-{
- aud_playlist_sort_selected_by_scheme (active_playlist, Playlist::Path);
-}
-
-void action_playlist_sort_selected_by_date (void)
-{
- aud_playlist_sort_selected_by_scheme (active_playlist, Playlist::Date);
-}
-
-void action_playlist_sort_selected_by_filename (void)
-{
- aud_playlist_sort_selected_by_scheme (active_playlist, Playlist::Filename);
-}
-
-void action_playlist_sort_selected_by_custom_title (void)
-{
- aud_playlist_sort_selected_by_scheme (active_playlist, Playlist::FormattedTitle);
-}
-
-void action_playlist_randomize_list (void)
-{
- aud_playlist_randomize (active_playlist);
-}
-
-void action_playlist_reverse_list (void)
-{
- aud_playlist_reverse (active_playlist);
-}
-
-void action_playlist_clear_queue (void)
-{
- aud_playlist_queue_delete (active_playlist, 0, aud_playlist_queue_count
- (active_playlist));
-}
-
-void action_playlist_remove_unavailable (void)
-{
- aud_playlist_remove_failed (active_playlist);
-}
-
-void action_playlist_remove_dupes_by_title (void)
-{
- aud_playlist_remove_duplicates_by_scheme (active_playlist, Playlist::Title);
-}
-
-void action_playlist_remove_dupes_by_filename (void)
-{
- aud_playlist_remove_duplicates_by_scheme (active_playlist, Playlist::Filename);
-}
-
-void action_playlist_remove_dupes_by_full_path (void)
-{
- aud_playlist_remove_duplicates_by_scheme (active_playlist, Playlist::Path);
-}
-
-void action_playlist_remove_all (void)
-{
- aud_playlist_entry_delete (active_playlist, 0, aud_playlist_entry_count
- (active_playlist));
-}
-
-void action_playlist_remove_selected (void)
-{
- aud_playlist_delete_selected (active_playlist);
-}
-
-void action_playlist_remove_unselected (void)
-{
- playlistwin_inverse_selection ();
- aud_playlist_delete_selected (active_playlist);
- aud_playlist_select_all (active_playlist, TRUE);
-}
-
-void action_playlist_copy (void)
-{
- GtkClipboard * clip = gtk_clipboard_get (GDK_SELECTION_CLIPBOARD);
- Index<char> list = audgui_urilist_create_from_selected (active_playlist);
-
- if (! list.len ())
- return;
-
- gtk_clipboard_set_text (clip, list.begin (), list.len ());
-}
-
-void action_playlist_cut (void)
-{
- action_playlist_copy ();
- action_playlist_remove_selected ();
-}
-
-void action_playlist_paste (void)
-{
- GtkClipboard * clip = gtk_clipboard_get (GDK_SELECTION_CLIPBOARD);
- char * list = gtk_clipboard_wait_for_text (clip);
-
- if (list == nullptr)
- return;
-
- audgui_urilist_insert (active_playlist,
- aud_playlist_get_focus (active_playlist), list);
- g_free (list);
-}
-
-void
-action_playlist_add_files(void)
-{
- audgui_run_filebrowser(FALSE); /* FALSE = NO_PLAY_BUTTON */
-}
-
-void
-action_playlist_add_url(void)
-{
- audgui_show_add_url_window (FALSE);
-}
-
-void action_playlist_play (void)
-{
- aud_playlist_play (aud_playlist_get_active ());
-}
-
-void action_playlist_new (void)
-{
- int playlist = aud_playlist_count ();
-
- aud_playlist_insert (playlist);
- aud_playlist_set_active (playlist);
-}
-
-void action_playlist_prev (void)
-{
- if (active_playlist > 0)
- aud_playlist_set_active (active_playlist - 1);
- else
- {
- int count = aud_playlist_count ();
- if (count > 1)
- aud_playlist_set_active (count - 1);
- }
-}
-
-void action_playlist_next (void)
-{
- int count = aud_playlist_count ();
-
- if (active_playlist + 1 < count)
- aud_playlist_set_active (active_playlist + 1);
- else if (count > 1)
- aud_playlist_set_active (0);
-}
-
-void action_playlist_rename (void)
-{
- audgui_show_playlist_rename (active_playlist);
-}
-
-void action_playlist_delete (void)
-{
- audgui_confirm_playlist_delete (active_playlist);
-}
-
-void
-action_playlist_refresh_list(void)
-{
- aud_playlist_rescan (active_playlist);
-}
-
-void
-action_playlist_search_and_select(void)
-{
- playlistwin_select_search();
-}
-
-void
-action_playlist_invert_selection(void)
-{
- playlistwin_inverse_selection();
-}
-
-void
-action_playlist_select_none(void)
-{
- playlistwin_select_none();
-}
-
-void
-action_playlist_select_all(void)
-{
- playlistwin_select_all();
-}
-
-
-static void
-playlistwin_select_search_cbt_cb(GtkWidget *called_cbt, void * other_cbt)
-{
- if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(called_cbt)) == TRUE)
- gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(other_cbt), FALSE);
- return;
-}
-
-static gboolean
-playlistwin_select_search_kp_cb(GtkWidget *entry, GdkEventKey *event,
- void * searchdlg_win)
-{
- switch (event->keyval)
- {
- case GDK_KEY_Return:
- gtk_dialog_response(GTK_DIALOG(searchdlg_win), GTK_RESPONSE_ACCEPT);
- return TRUE;
- default:
- return FALSE;
- }
-}

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/ui_playlist.h Deleted

@@ -1,38 +0,0 @@
-/* BMP - Cross-platform multimedia player
- * Copyright (C) 2003-2004 BMP development team.
- *
- * Based on XMMS:
- * Copyright (C) 1998-2003 XMMS development team.
- *
- * 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; under version 3 of the License.
- *
- * 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>.
- *
- * The Audacious team does not consider modular code linking to
- * Audacious or using our public API to be a derived work.
- */
-
-#ifndef SKINS_UI_PLAYLIST_H
-#define SKINS_UI_PLAYLIST_H
-
-#include <gtk/gtk.h>
-
-void playlistwin_update (void);
-void playlistwin_create(void);
-void playlistwin_unhook (void);
-void playlistwin_hide_timer(void);
-void playlistwin_set_time (const char * minutes, const char * seconds);
-
-extern int active_playlist, active_length;
-extern char * active_title;
-extern GtkWidget * playlistwin, * playlistwin_list, * playlistwin_sinfo;
-
-#endif /* SKINS_UI_PLAYLIST_H */

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/ui_skin.cc Deleted

@@ -1,809 +0,0 @@
-/* Audacious
- * Copyright (C) 2005-2011 Audacious development team.
- *
- * BMP - Cross-platform multimedia player
- * Copyright (C) 2003-2004 BMP development team.
- *
- * Based on XMMS:
- * Copyright (C) 1998-2003 XMMS development team.
- *
- * 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; under version 3 of the License.
- *
- * 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>.
- *
- * The Audacious team does not consider modular code linking to
- * Audacious or using our public API to be a derived work.
- */
-
-#include <errno.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/stat.h>
-
-#include <gtk/gtk.h>
-
-#include <libaudcore/runtime.h>
-#include <libaudcore/runtime.h>
-
-#include "plugin.h"
-#include "skins_cfg.h"
-#include "surface.h"
-#include "ui_equalizer.h"
-#include "ui_main.h"
-#include "ui_playlist.h"
-#include "ui_skin.h"
-#include "ui_skinned_number.h"
-#include "ui_skinned_playstatus.h"
-#include "ui_skinned_textbox.h"
-#include "ui_skinned_window.h"
-#include "ui_skinselector.h"
-#include "ui_vis.h"
-#include "util.h"
-
-#define EXTENSION_TARGETS 7
-
-static const char *ext_targetsEXTENSION_TARGETS =
-{ "bmp", "xpm", "png", "svg", "gif", "jpg", "jpeg" };
-
-struct _SkinPixmapIdMapping {
- SkinPixmapId id;
- const char *name;
- const char *alt_name;
- int width, height;
-};
-
-typedef struct _SkinPixmapIdMapping SkinPixmapIdMapping;
-
-static gboolean skin_load (Skin * skin, const char * path);
-
-Skin *active_skin = nullptr;
-
-static SkinPixmapIdMapping skin_pixmap_id_map = {
- {SKIN_MAIN, "main", nullptr, 0, 0},
- {SKIN_CBUTTONS, "cbuttons", nullptr, 0, 0},
- {SKIN_SHUFREP, "shufrep", nullptr, 0, 0},
- {SKIN_TEXT, "text", nullptr, 0, 0},
- {SKIN_TITLEBAR, "titlebar", nullptr, 0, 0},
- {SKIN_VOLUME, "volume", nullptr, 0, 0},
- {SKIN_BALANCE, "balance", "volume", 0, 0},
- {SKIN_MONOSTEREO, "monoster", nullptr, 0, 0},
- {SKIN_PLAYPAUSE, "playpaus", nullptr, 0, 0},
- {SKIN_NUMBERS, "nums_ex", "numbers", 0, 0},
- {SKIN_POSBAR, "posbar", nullptr, 0, 0},
- {SKIN_EQMAIN, "eqmain", nullptr, 0, 0},
- {SKIN_PLEDIT, "pledit", nullptr, 0, 0},
- {SKIN_EQ_EX, "eq_ex", nullptr, 0, 0}
-};
-
-static const uint32_t default_vis_colors24 = {
- 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)
-};
-
-gboolean active_skin_load (const char * path)
-{
- AUDDBG("%s\n", path);
- g_return_val_if_fail(active_skin != nullptr, FALSE);
-
- if (!skin_load(active_skin, path)) {
- AUDDBG("loading failed\n");
- return FALSE;
- }
-
- mainwin_refresh_hints ();
- textbox_update_all ();
- ui_vis_set_colors ();
- gtk_widget_queue_draw (mainwin);
- gtk_widget_queue_draw (equalizerwin);
- gtk_widget_queue_draw (playlistwin);
-
- aud_set_str ("skins", "skin", path);
-
- return TRUE;
-}
-
-static Skin *
-skin_new(void)
-{
- Skin *skin;
- skin = g_new0(Skin, 1);
- return skin;
-}
-
-/**
- * Frees the data associated for skin.
- *
- * Does not free skin itself or lock variable so that the skin can immediately
- * populated with new skin data if needed.
- */
-static void
-skin_free(Skin * skin)
-{
- int i;
-
- g_return_if_fail(skin != nullptr);
-
- for (i = 0; i < SKIN_PIXMAP_COUNT; i++)
- {
- if (skin->pixmapsi)
- {
- cairo_surface_destroy (skin->pixmapsi);
- skin->pixmapsi = nullptr;
- }
- }
-
- g_free(skin->path);
- skin->path = nullptr;
-}
-
-static void
-skin_destroy(Skin * skin)
-{
- g_return_if_fail(skin != nullptr);
- skin_free(skin);
- g_free(skin);
-}
-
-static const SkinPixmapIdMapping *
-skin_pixmap_id_lookup(unsigned id)
-{
- for (auto & info : skin_pixmap_id_map)
- {
- if (info.id == id)
- return & info;
- }
-
- return nullptr;
-}
-
-static char * skin_pixmap_locate (const char * dirname, char * * basenames)
-{
- char * filename = nullptr;
- int i;
-
- for (i = 0; basenamesi != nullptr; i ++)
- {
- if ((filename = find_file_case_path (dirname, basenamesi)) != nullptr)
- break;
- }
-
- return filename;
-}
-
-/**
- * Creates possible file names for a pixmap.
- *
- * Basically this makes list of all possible file names that pixmap data
- * can be found from by using the static ext_targets variable to get all
- * possible extensions that pixmap file might have.
- */
-static char **
-skin_pixmap_create_basenames(const SkinPixmapIdMapping * pixmap_id_mapping)
-{
- char **basenames = g_new0 (char *, EXTENSION_TARGETS * 2 + 1);
- int i, y;
-
- // Create list of all possible image formats that can be loaded
- for (i = 0, y = 0; i < EXTENSION_TARGETS; i++, y++)
- {
- basenamesy =
- g_strdup_printf("%s.%s", pixmap_id_mapping->name, ext_targetsi);
-
- if (pixmap_id_mapping->alt_name)
- basenames++y =
- g_strdup_printf("%s.%s", pixmap_id_mapping->alt_name,
- ext_targetsi);
- }
-
- return basenames;
-}
-
-/**
- * Frees the data allocated by skin_pixmap_create_basenames
- */
-static void
-skin_pixmap_free_basenames(char ** basenames)
-{
- int i;
- for (i = 0; basenamesi != nullptr; i++)
- {
- g_free(basenamesi);
- basenamesi = nullptr;
- }
- g_free(basenames);
-}
-
-/**
- * Locates a pixmap file for skin.
- */
-static char *
-skin_pixmap_locate_basenames(const Skin * skin,
- const SkinPixmapIdMapping * pixmap_id_mapping,
- const char * path_p)
-{
- char *filename = nullptr;
- const char *path = path_p ? path_p : skin->path;
- char **basenames = skin_pixmap_create_basenames(pixmap_id_mapping);
-
- filename = skin_pixmap_locate(path, basenames);
-
- skin_pixmap_free_basenames(basenames);
-
- if (! filename)
- AUDERR ("Skin does not contain a \"%s\" pixmap.\n",
- pixmap_id_mapping->name);
-
- return filename;
-}
-
-
-static gboolean
-skin_load_pixmap_id(Skin * skin, SkinPixmapId id, const char * path_p)
-{
- const SkinPixmapIdMapping *pixmap_id_mapping;
- char *filename;
-
- g_return_val_if_fail(skin != nullptr, FALSE);
- g_return_val_if_fail(id < SKIN_PIXMAP_COUNT, FALSE);
- g_return_val_if_fail(! skin->pixmapsid, FALSE);
-
- pixmap_id_mapping = skin_pixmap_id_lookup(id);
- g_return_val_if_fail(pixmap_id_mapping != nullptr, FALSE);
-
- filename = skin_pixmap_locate_basenames(skin, pixmap_id_mapping, path_p);
-
- if (filename == nullptr)
- return FALSE;
-
- skin->pixmapsid = surface_new_from_file (filename);
-
- g_free (filename);
- return skin->pixmapsid ? TRUE : FALSE;
-}
-
-static int color_diff (uint32_t a, uint32_t b)
-{
- return abs (COLOR_R (a) - COLOR_R (b)) + abs (COLOR_G (a) - COLOR_G (b)) +
- abs (COLOR_B (a) - COLOR_B (b));
-}
-
-static void skin_get_textcolors (Skin * skin, cairo_surface_t * s)
-{
- /*
- * Try to extract reasonable background and foreground colors
- * from the font pixmap
- */
-
- /* Get a pixel from the middle of the space character */
- skin->colorsSKIN_TEXTBG = surface_get_pixel (s, 152, 3);
-
- int max_d = -1;
- for (int y = 0; y < 6; y ++)
- {
- for (int x = 1; x < 150; x ++)
- {
- int c = surface_get_pixel (s, x, y);
- int d = color_diff (skin->colorsSKIN_TEXTBG, c);
- if (d > max_d)
- {
- skin->colorsSKIN_TEXTFG = c;
- max_d = d;
- }
- }
- }
-}
-
-gboolean
-init_skins(const char * path)
-{
- active_skin = skin_new();
-
- active_skin->properties = skin_default_hints;
-
- /* create the windows if they haven't been created yet, needed for bootstrapping */
- if (mainwin == nullptr)
- {
- mainwin_create();
- equalizerwin_create();
- playlistwin_create();
- }
-
- if (! path || ! active_skin_load (path))
- {
- if (path != nullptr)
- AUDDBG("Unable to load skin (%s), trying default...\n", path);
- else
- AUDDBG("Skin not defined: trying default...\n");
-
- /* can't load configured skin, retry with default */
- char * def = g_strdup_printf ("%s" G_DIR_SEPARATOR_S "Skins"
- G_DIR_SEPARATOR_S "Default", aud_get_path (AudPath::DataDir));
-
- if (! active_skin_load (def))
- {
- AUDDBG ("Unable to load default skin (%s)! Giving up.\n", def);
- g_free (def);
- return FALSE;
- }
-
- g_free (def);
- }
-
- return TRUE;
-}
-
-void cleanup_skins()
-{
- skin_destroy(active_skin);
- active_skin = nullptr;
-
- gtk_widget_destroy (mainwin);
- mainwin = nullptr;
- gtk_widget_destroy (playlistwin);
- playlistwin = nullptr;
- gtk_widget_destroy (equalizerwin);
- equalizerwin = nullptr;
-}
-
-static void skin_load_viscolor (Skin * skin, const char * path)
-{
- memcpy (skin->vis_colors, default_vis_colors, sizeof skin->vis_colors);
-
- VFSFile file = open_local_file_nocase (path, "viscolor.txt");
- if (! file)
- return;
-
- Index<char> buffer = file.read_all ();
- buffer.append (0); /* null-terminated */
-
- char * string = buffer.begin ();
-
- for (int line = 0; string && line < 24; line ++)
- {
- char * next = text_parse_line (string);
- GArray * array = string_to_garray (string);
-
- if (array->len >= 3)
- skin->vis_colorsline = COLOR (g_array_index (array, int, 0),
- g_array_index (array, int, 1), g_array_index (array, int, 2));
-
- g_array_free (array, TRUE);
- string = next;
- }
-}
-
-static void
-skin_numbers_generate_dash(Skin * skin)
-{
- g_return_if_fail(skin != nullptr);
-
- cairo_surface_t * old = skin->pixmapsSKIN_NUMBERS;
- if (! old || cairo_image_surface_get_width (old) < 99)
- return;
-
- int h = cairo_image_surface_get_height (old);
- cairo_surface_t * surface = surface_new (108, h);
-
- surface_copy_rect (old, 0, 0, 99, h, surface, 0, 0);
- surface_copy_rect (old, 90, 0, 9, h, surface, 99, 0);
- surface_copy_rect (old, 20, 6, 5, 1, surface, 101, 6);
-
- cairo_surface_destroy (old);
- skin->pixmapsSKIN_NUMBERS = surface;
-}
-
-static gboolean
-skin_load_pixmaps(Skin * skin, const char * path)
-{
- AUDDBG("Loading pixmaps in %s\n", path);
-
- for (int i = 0; i < SKIN_PIXMAP_COUNT; i++)
- if (! skin_load_pixmap_id (skin, (SkinPixmapId) i, path))
- return FALSE;
-
- if (skin->pixmapsSKIN_TEXT)
- skin_get_textcolors (skin, skin->pixmapsSKIN_TEXT);
-
- if (skin->pixmapsSKIN_NUMBERS && cairo_image_surface_get_width
- (skin->pixmapsSKIN_NUMBERS) < 108)
- skin_numbers_generate_dash (skin);
-
- skin_load_pl_colors (skin, path);
- skin_load_viscolor (skin, path);
-
- return TRUE;
-}
-
-/**
- * Checks if all pixmap files exist that skin needs.
- */
-static gboolean
-skin_check_pixmaps(const Skin * skin, const char * skin_path)
-{
- unsigned i;
- for (i = 0; i < SKIN_PIXMAP_COUNT; i++)
- {
- char *filename = skin_pixmap_locate_basenames(skin,
- skin_pixmap_id_lookup(i),
- skin_path);
- if (!filename)
- return FALSE;
- g_free(filename);
- }
- return TRUE;
-}
-
-static gboolean
-skin_load_nolock(Skin * skin, const char * path, gboolean force)
-{
- char *newpath, *skin_path;
- int archive = 0;
-
- AUDDBG("Attempt to load skin \"%s\"\n", path);
-
- g_return_val_if_fail(skin != nullptr, FALSE);
- g_return_val_if_fail(path != nullptr, FALSE);
-
- if (! g_file_test (path, G_FILE_TEST_EXISTS))
- return FALSE;
-
- if(force) AUDDBG("reloading forced!\n");
- if (!force && skin->path && !strcmp(skin->path, path)) {
- AUDDBG("skin %s already loaded\n", path);
- return FALSE;
- }
-
- if (file_is_archive(path)) {
- AUDDBG("Attempt to load archive\n");
- if (!(skin_path = archive_decompress(path))) {
- AUDDBG("Unable to extract skin archive (%s)\n", path);
- return FALSE;
- }
- archive = 1;
- } else {
- skin_path = g_strdup(path);
- }
-
- // Check if skin path has all necessary files.
- if (!skin_check_pixmaps(skin, skin_path)) {
- if(archive) del_directory(skin_path);
- AUDDBG("Skin path (%s) doesn't have all wanted pixmaps\n", skin_path);
- g_free(skin_path);
- return FALSE;
- }
-
- // skin_free() frees skin->path and variable path can actually be skin->path
- // and we want to get the path before possibly freeing it.
- newpath = g_strdup(path);
- skin_free(skin);
- skin->path = newpath;
-
- skin_load_hints (skin, skin_path);
-
- if (!skin_load_pixmaps(skin, skin_path)) {
- if(archive) del_directory(skin_path);
- g_free(skin_path);
- AUDDBG("Skin loading failed\n");
- return FALSE;
- }
-
- cairo_region_t * masksSKIN_MASK_COUNT;
- skin_load_masks (skin, skin_path, masks);
- window_set_shapes (mainwin, masksSKIN_MASK_MAIN, masksSKIN_MASK_MAIN_SHADE);
- window_set_shapes (equalizerwin, masksSKIN_MASK_EQ, masksSKIN_MASK_EQ_SHADE);
-
- if(archive) del_directory(skin_path);
- g_free(skin_path);
-
- return TRUE;
-}
-
-void skin_install_skin (const char * path)
-{
- GError * err = 0;
- char * data;
- size_t len;
-
- if (! g_file_get_contents (path, & data, & len, & err))
- {
- AUDERR ("Failed to read %s: %s\n", path, err->message);
- g_error_free (err);
- return;
- }
-
- make_directory (skins_pathsSKINS_PATH_USER_SKIN_DIR);
-
- char * base = g_path_get_basename (path);
- char * target = g_build_filename (skins_pathsSKINS_PATH_USER_SKIN_DIR, base, nullptr);
-
- if (! g_file_set_contents (target, data, len, & err))
- {
- AUDERR ("Failed to write %s: %s\n", path, err->message);
- g_error_free (err);
- g_free (data);
- g_free (base);
- g_free (target);
- return;
- }
-
- g_free (data);
- g_free (base);
- g_free (target);
-}
-
-static gboolean skin_load (Skin * skin, const char * path)
-{
- gboolean ret;
-
- g_return_val_if_fail(skin != nullptr, FALSE);
-
- if (!path)
- return FALSE;
-
- ret = skin_load_nolock(skin, path, FALSE);
-
- if(!ret) {
- AUDDBG("loading failed\n");
- return FALSE; /* don't try to update anything if loading failed --asphyx */
- }
-
- if (skin->pixmapsSKIN_NUMBERS)
- {
- int h = cairo_image_surface_get_height (skin->pixmapsSKIN_NUMBERS);
- ui_skinned_number_set_size (mainwin_minus_num, 9, h);
- ui_skinned_number_set_size (mainwin_10min_num, 9, h);
- ui_skinned_number_set_size (mainwin_min_num, 9, h);
- ui_skinned_number_set_size (mainwin_10sec_num, 9, h);
- ui_skinned_number_set_size (mainwin_sec_num, 9, h);
- }
-
- if (skin->pixmapsSKIN_PLAYPAUSE)
- ui_skinned_playstatus_set_size (mainwin_playstatus, 11,
- cairo_image_surface_get_height (skin->pixmapsSKIN_PLAYPAUSE));
-
- // hide the menurow if it is not present in the skin
- if (cairo_image_surface_get_width (skin->pixmapsSKIN_TITLEBAR) < 344)
- skin->properties.mainwin_menurow_visible = false;
-
- // hide the equalizer graph if we have a short eqmain.bmp
- gtk_widget_set_visible (equalizerwin_graph,
- cairo_image_surface_get_height (skin->pixmapsSKIN_EQMAIN) >= 315);
-
- return TRUE;
-}
-
-void skin_draw_pixbuf (cairo_t * cr, SkinPixmapId id, int xsrc, int ysrc, int
- xdest, int ydest, int width, int height)
-{
- if (! active_skin->pixmapsid)
- return;
-
- cairo_save (cr);
- cairo_scale (cr, config.scale, config.scale);
- cairo_set_source_surface (cr, active_skin->pixmapsid, xdest - xsrc, ydest - ysrc);
- cairo_pattern_set_filter (cairo_get_source (cr), CAIRO_FILTER_NEAREST);
- cairo_rectangle (cr, xdest, ydest, width, height);
- cairo_fill (cr);
- cairo_restore (cr);
-}
-
-void skin_get_eq_spline_colors (Skin * skin, uint32_t colors19)
-{
- if (! skin->pixmapsSKIN_EQMAIN)
- {
- memset (colors, 0, sizeof (uint32_t) * 19);
- return;
- }
-
- for (int i = 0; i < 19; i ++)
- colorsi = surface_get_pixel (skin->pixmapsSKIN_EQMAIN, 115, i + 294);
-}
-
-static void skin_draw_playlistwin_frame_top (cairo_t * cr, int width, int
- height, gboolean focus)
-{
- /* The title bar skin consists of 2 sets of 4 images, 1 set
- * for focused state and the other for unfocused. The 4 images
- * are:
- *
- * a. right corner (25,20)
- * b. left corner (25,20)
- * c. tiler (25,20)
- * d. title (100,20)
- *
- * min allowed width = 100+25+25 = 150
- */
-
- int i, y, c;
-
- /* get y offset of the pixmap set to use */
- if (focus)
- y = 0;
- else
- y = 21;
-
- /* left corner */
- skin_draw_pixbuf (cr, SKIN_PLEDIT, 0, y, 0, 0, 25, 20);
-
- /* titlebar title */
- skin_draw_pixbuf (cr, SKIN_PLEDIT, 26, y, (width - 100) / 2, 0, 100, 20);
-
- /* titlebar right corner */
- skin_draw_pixbuf (cr, SKIN_PLEDIT, 153, y, width - 25, 0, 25, 20);
-
- /* tile draw the remaining frame */
-
- /* compute tile count */
- c = (width - (100 + 25 + 25)) / 25;
-
- for (i = 0; i < c / 2; i++) {
- /* left of title */
- skin_draw_pixbuf (cr, SKIN_PLEDIT, 127, y, 25 + i * 25, 0, 25, 20);
-
- /* right of title */
- skin_draw_pixbuf (cr, SKIN_PLEDIT, 127, y, (width + 100) / 2 + i * 25,
- 0, 25, 20);
- }
-
- if (c & 1) {
- /* Odd tile count, so one remaining to draw. Here we split
- * it into two and draw half on either side of the title */
- skin_draw_pixbuf (cr, SKIN_PLEDIT, 127, y, ((c / 2) * 25) + 25, 0, 12,
- 20);
- skin_draw_pixbuf (cr, SKIN_PLEDIT, 127, y, (width / 2) + ((c / 2) * 25)
- + 50, 0, 13, 20);
- }
-}
-
-static void skin_draw_playlistwin_frame_bottom (cairo_t * cr, int width, int
- height, gboolean focus)
-{
- /* The bottom frame skin consists of 1 set of 4 images. The 4
- * images are:
- *
- * a. left corner with menu buttons (125,38)
- * b. visualization window (75,38)
- * c. right corner with play buttons (150,38)
- * d. frame tile (25,38)
- *
- * (min allowed width = 125+150+25=300
- */
-
- int i, c;
-
- /* bottom left corner (menu buttons) */
- skin_draw_pixbuf (cr, SKIN_PLEDIT, 0, 72, 0, height - 38, 125, 38);
-
- c = (width - 275) / 25;
-
- /* draw visualization window, if width allows */
- if (c >= 3) {
- c -= 3;
- skin_draw_pixbuf (cr, SKIN_PLEDIT, 205, 0, width - (150 + 75), height -
- 38, 75, 38);
- }
-
- /* Bottom right corner (playbuttons etc) */
- skin_draw_pixbuf (cr, SKIN_PLEDIT, 126, 72, width - 150, height - 38, 150,
- 38);
-
- /* Tile draw the remaining undrawn portions */
- for (i = 0; i < c; i++)
- skin_draw_pixbuf (cr, SKIN_PLEDIT, 179, 0, 125 + i * 25, height - 38,
- 25, 38);
-}
-
-static void skin_draw_playlistwin_frame_sides (cairo_t * cr, int width, int
- height, gboolean focus)
-{
- /* The side frames consist of 2 tile images. 1 for the left, 1 for
- * the right.
- * a. left (12,29)
- * b. right (19,29)
- */
-
- int i;
-
- /* frame sides */
- for (i = 0; i < (height - (20 + 38)) / 29; i++) {
- /* left */
- skin_draw_pixbuf (cr, SKIN_PLEDIT, 0, 42, 0, 20 + i * 29, 12, 29);
-
- /* right */
- skin_draw_pixbuf (cr, SKIN_PLEDIT, 32, 42, width - 19, 20 + i * 29, 19,
- 29);
- }
-}
-
-void skin_draw_playlistwin_frame (cairo_t * cr, int width, int height,
- gboolean focus)
-{
- skin_draw_playlistwin_frame_top (cr, width, height, focus);
- skin_draw_playlistwin_frame_bottom (cr, width, height, focus);
- skin_draw_playlistwin_frame_sides (cr, width, height, focus);
-}
-
-void skin_draw_playlistwin_shaded (cairo_t * cr, int width, gboolean focus)
-{
- /* The shade mode titlebar skin consists of 4 images:
- * a) left corner offset (72,42) size (25,14)
- * b) right corner, focused offset (99,57) size (50,14)
- * c) right corner, unfocused offset (99,42) size (50,14)
- * d) bar tile offset (72,57) size (25,14)
- */
-
- int i;
-
- /* left corner */
- skin_draw_pixbuf (cr, SKIN_PLEDIT, 72, 42, 0, 0, 25, 14);
-
- /* bar tile */
- for (i = 0; i < (width - 75) / 25; i++)
- skin_draw_pixbuf (cr, SKIN_PLEDIT, 72, 57, (i * 25) + 25, 0, 25, 14);
-
- /* right corner */
- skin_draw_pixbuf (cr, SKIN_PLEDIT, 99, focus ? 42 : 57, width - 50, 0, 50,
- 14);
-}
-
-void skin_draw_mainwin_titlebar (cairo_t * cr, gboolean shaded, gboolean focus)
-{
- /* The titlebar skin consists of 2 sets of 2 images, one for for
- * shaded and the other for unshaded mode, giving a total of 4.
- * The images are exactly 275x14 pixels, aligned and arranged
- * vertically on each other in the pixmap in the following order:
- *
- * a) unshaded, focused offset (27, 0)
- * b) unshaded, unfocused offset (27, 15)
- * c) shaded, focused offset (27, 29)
- * d) shaded, unfocused offset (27, 42)
- */
-
- int y_offset;
-
- if (shaded) {
- if (focus)
- y_offset = 29;
- else
- y_offset = 42;
- }
- else {
- if (focus)
- y_offset = 0;
- else
- y_offset = 15;
- }
-
- skin_draw_pixbuf (cr, SKIN_TITLEBAR, 27, y_offset, 0, 0,
- active_skin->properties.mainwin_width, MAINWIN_TITLEBAR_HEIGHT);
-}

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/ui_skin.h Deleted

@@ -1,209 +0,0 @@
-/* Audacious
- * Copyright (C) 2005-2011 Audacious development team.
- *
- * BMP - Cross-platform multimedia player
- * Copyright (C) 2003-2004 BMP development team.
- *
- * Based on XMMS:
- * Copyright (C) 1998-2003 XMMS development team.
- *
- * 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; under version 3 of the License.
- *
- * 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>.
- *
- * The Audacious team does not consider modular code linking to
- * Audacious or using our public API to be a derived work.
- */
-
-#ifndef SKIN_H
-#define SKIN_H
-
-#include <stdint.h>
-#include <gtk/gtk.h>
-
-#define COLOR(r,g,b) (((uint32_t) (r) << 16) | ((uint32_t) (g) << 8) | (uint32_t) (b))
-#define COLOR_R(c) ((int) (((c) & 0xff0000) >> 16))
-#define COLOR_G(c) ((int) (((c) & 0xff00) >> 8))
-#define COLOR_B(c) ((int) ((c) & 0xff))
-
-typedef enum {
- SKIN_MAIN = 0,
- SKIN_CBUTTONS,
- SKIN_TITLEBAR,
- SKIN_SHUFREP,
- SKIN_TEXT,
- SKIN_VOLUME,
- SKIN_BALANCE,
- SKIN_MONOSTEREO,
- SKIN_PLAYPAUSE,
- SKIN_NUMBERS,
- SKIN_POSBAR,
- SKIN_PLEDIT,
- SKIN_EQMAIN,
- SKIN_EQ_EX,
- SKIN_PIXMAP_COUNT
-} SkinPixmapId;
-
-typedef enum {
- SKIN_MASK_MAIN = 0,
- SKIN_MASK_MAIN_SHADE,
- SKIN_MASK_EQ,
- SKIN_MASK_EQ_SHADE,
- SKIN_MASK_COUNT
-} SkinMaskId;
-
-typedef enum {
- SKIN_PLEDIT_NORMAL = 0,
- SKIN_PLEDIT_CURRENT,
- SKIN_PLEDIT_NORMALBG,
- SKIN_PLEDIT_SELECTEDBG,
- SKIN_TEXTBG,
- SKIN_TEXTFG,
- SKIN_COLOR_COUNT
-} SkinColorId;
-
-struct SkinProperties {
- /* Vis properties */
- int mainwin_vis_x = 24;
- int mainwin_vis_y = 43;
- int mainwin_vis_visible = true;
-
- /* Text properties */
- int mainwin_text_x = 112;
- int mainwin_text_y = 27;
- int mainwin_text_width = 153;
- int mainwin_text_visible = true;
-
- /* Infobar properties */
- int mainwin_infobar_x = 112;
- int mainwin_infobar_y = 43;
- int mainwin_othertext_visible = false;
-
- int mainwin_number_0_x = 36;
- int mainwin_number_0_y = 26;
-
- int mainwin_number_1_x = 48;
- int mainwin_number_1_y = 26;
-
- int mainwin_number_2_x = 60;
- int mainwin_number_2_y = 26;
-
- int mainwin_number_3_x = 78;
- int mainwin_number_3_y = 26;
-
- int mainwin_number_4_x = 90;
- int mainwin_number_4_y = 26;
-
- int mainwin_playstatus_x = 24;
- int mainwin_playstatus_y = 28;
-
- int mainwin_volume_x = 107;
- int mainwin_volume_y = 57;
-
- int mainwin_balance_x = 177;
- int mainwin_balance_y = 57;
-
- int mainwin_position_x = 16;
- int mainwin_position_y = 72;
-
- int mainwin_previous_x = 16;
- int mainwin_previous_y = 88;
-
- int mainwin_play_x = 39;
- int mainwin_play_y = 88;
-
- int mainwin_pause_x = 62;
- int mainwin_pause_y = 88;
-
- int mainwin_stop_x = 85;
- int mainwin_stop_y = 88;
-
- int mainwin_next_x = 108;
- int mainwin_next_y = 88;
-
- int mainwin_eject_x = 136;
- int mainwin_eject_y = 89;
-
- int mainwin_eqbutton_x = 219;
- int mainwin_eqbutton_y = 58;
-
- int mainwin_plbutton_x = 242;
- int mainwin_plbutton_y = 58;
-
- int mainwin_shuffle_x = 164;
- int mainwin_shuffle_y = 89;
-
- int mainwin_repeat_x = 210;
- int mainwin_repeat_y = 89;
-
- int mainwin_about_x = 247;
- int mainwin_about_y = 83;
-
- int mainwin_minimize_x = 244;
- int mainwin_minimize_y = 3;
-
- int mainwin_shade_x = 254;
- int mainwin_shade_y = 3;
-
- int mainwin_close_x = 264;
- int mainwin_close_y = 3;
-
- int mainwin_width = 275;
- int mainwin_height = 116;
-
- int mainwin_menurow_visible = true;
- int mainwin_streaminfo_visible = true;
- int mainwin_othertext_is_status = false;
-
- int textbox_bitmap_font_width = 5;
- int textbox_bitmap_font_height = 6;
-};
-
-extern const SkinProperties skin_default_hints;
-
-typedef struct {
- char *path;
- cairo_surface_t * pixmapsSKIN_PIXMAP_COUNT;
- uint32_t colorsSKIN_COLOR_COUNT;
- uint32_t vis_colors24;
- SkinProperties properties;
-} Skin;
-
-extern Skin * active_skin;
-
-gboolean init_skins(const char * path);
-void cleanup_skins(void);
-
-gboolean active_skin_load(const char * path);
-
-void skin_draw_pixbuf (cairo_t * cr, SkinPixmapId id, int xsrc, int ysrc,
- int xdest, int ydest, int width, int height);
-
-void skin_get_eq_spline_colors(Skin * skin, uint32_t colors19);
-void skin_install_skin(const char * path);
-
-void skin_draw_playlistwin_shaded (cairo_t * cr, int width, gboolean focus);
-void skin_draw_playlistwin_frame (cairo_t * cr, int width, int height,
- gboolean focus);
-void skin_draw_mainwin_titlebar (cairo_t * cr, gboolean shaded, gboolean focus);
-
-/* ui_skin_load_ini.c */
-void skin_load_hints (Skin * skin, const char * path);
-void skin_load_pl_colors (Skin * skin, const char * path);
-void skin_load_masks (Skin * skin, const char * path, cairo_region_t * masksSKIN_MASK_COUNT);
-
-static inline void set_cairo_color (cairo_t * cr, uint32_t c)
-{
- cairo_set_source_rgb (cr, COLOR_R(c) / 255.0, COLOR_G(c) / 255.0, COLOR_B(c)
- / 255.0);
-}
-
-#endif

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/ui_skin_load_ini.cc Deleted

@@ -1,315 +0,0 @@
-/*
- * Audacious
- * Copyright 2011-2013 Audacious development team
- *
- * 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; under version 3 of the License.
- *
- * 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>.
- *
- * The Audacious team does not consider modular code linking to
- * Audacious or using our public API to be a derived work.
- */
-
-#include <stdlib.h>
-
-#include <libaudcore/inifile.h>
-
-#include "skins_cfg.h"
-#include "ui_skin.h"
-#include "util.h"
-
-/*
- * skin.hints parsing
- */
-
-typedef struct {
- const char * name;
- int * value_ptr;
-} HintPair;
-
-const SkinProperties skin_default_hints = SkinProperties ();
-
-/* so we can use static addresses in the table below */
-static SkinProperties static_hints;
-
-/* in alphabetical order to allow binary search */
-static const HintPair hint_pairs = {
- {"mainwinaboutx", & static_hints.mainwin_about_x},
- {"mainwinabouty", & static_hints.mainwin_about_y},
- {"mainwinbalancex", & static_hints.mainwin_balance_x},
- {"mainwinbalancey", & static_hints.mainwin_balance_y},
- {"mainwinclosex", & static_hints.mainwin_close_x},
- {"mainwinclosey", & static_hints.mainwin_close_y},
- {"mainwinejectx", & static_hints.mainwin_eject_x},
- {"mainwinejecty", & static_hints.mainwin_eject_y},
- {"mainwineqbuttonx", & static_hints.mainwin_eqbutton_x},
- {"mainwineqbuttony", & static_hints.mainwin_eqbutton_y},
- {"mainwinheight", & static_hints.mainwin_height},
- {"mainwininfobarx", & static_hints.mainwin_infobar_x},
- {"mainwininfobary", & static_hints.mainwin_infobar_y},
- {"mainwinmenurowvisible", & static_hints.mainwin_menurow_visible},
- {"mainwinminimizex", & static_hints.mainwin_minimize_x},
- {"mainwinminimizey", & static_hints.mainwin_minimize_y},
- {"mainwinnextx", & static_hints.mainwin_next_x},
- {"mainwinnexty", & static_hints.mainwin_next_y},
- {"mainwinnumber0x", & static_hints.mainwin_number_0_x},
- {"mainwinnumber0y", & static_hints.mainwin_number_0_y},
- {"mainwinnumber1x", & static_hints.mainwin_number_1_x},
- {"mainwinnumber1y", & static_hints.mainwin_number_1_y},
- {"mainwinnumber2x", & static_hints.mainwin_number_2_x},
- {"mainwinnumber2y", & static_hints.mainwin_number_2_y},
- {"mainwinnumber3x", & static_hints.mainwin_number_3_x},
- {"mainwinnumber3y", & static_hints.mainwin_number_3_y},
- {"mainwinnumber4x", & static_hints.mainwin_number_4_x},
- {"mainwinnumber4y", & static_hints.mainwin_number_4_y},
- {"mainwinothertextisstatus", & static_hints.mainwin_othertext_is_status},
- {"mainwinothertextvisible", & static_hints.mainwin_othertext_visible},
- {"mainwinpausex", & static_hints.mainwin_pause_x},
- {"mainwinpausey", & static_hints.mainwin_pause_y},
- {"mainwinplaystatusx", & static_hints.mainwin_playstatus_x},
- {"mainwinplaystatusy", & static_hints.mainwin_playstatus_y},
- {"mainwinplayx", & static_hints.mainwin_play_x},
- {"mainwinplayy", & static_hints.mainwin_play_y},
- {"mainwinplbuttonx", & static_hints.mainwin_plbutton_x},
- {"mainwinplbuttony", & static_hints.mainwin_plbutton_y},
- {"mainwinpositionx", & static_hints.mainwin_position_x},
- {"mainwinpositiony", & static_hints.mainwin_position_y},
- {"mainwinpreviousx", & static_hints.mainwin_previous_x},
- {"mainwinpreviousy", & static_hints.mainwin_previous_y},
- {"mainwinrepeatx", & static_hints.mainwin_repeat_x},
- {"mainwinrepeaty", & static_hints.mainwin_repeat_y},
- {"mainwinshadex", & static_hints.mainwin_shade_x},
- {"mainwinshadey", & static_hints.mainwin_shade_y},
- {"mainwinshufflex", & static_hints.mainwin_shuffle_x},
- {"mainwinshuffley", & static_hints.mainwin_shuffle_y},
- {"mainwinstopx", & static_hints.mainwin_stop_x},
- {"mainwinstopy", & static_hints.mainwin_stop_y},
- {"mainwinstreaminfovisible", & static_hints.mainwin_streaminfo_visible},
- {"mainwintextvisible", & static_hints.mainwin_text_visible},
- {"mainwintextwidth", & static_hints.mainwin_text_width},
- {"mainwintextx", & static_hints.mainwin_text_x},
- {"mainwintexty", & static_hints.mainwin_text_y},
- {"mainwinvisvisible", & static_hints.mainwin_vis_visible},
- {"mainwinvisx", & static_hints.mainwin_vis_x},
- {"mainwinvisy", & static_hints.mainwin_vis_y},
- {"mainwinvolumex", & static_hints.mainwin_volume_x},
- {"mainwinvolumey", & static_hints.mainwin_volume_y},
- {"mainwinwidth", & static_hints.mainwin_width},
- {"textboxbitmapfontheight", & static_hints.textbox_bitmap_font_height},
- {"textboxbitmapfontwidth", & static_hints.textbox_bitmap_font_width},
-};
-
-static int hint_pair_compare (const void * key, const void * pair)
-{
- return g_ascii_strcasecmp ((const char *) key, ((const HintPair *) pair)->name);
-}
-
-class HintsParser : public IniParser
-{
-private:
- bool valid_heading = false;
-
- void handle_heading (const char * heading)
- { valid_heading = ! g_ascii_strcasecmp (heading, "skin"); }
-
- void handle_entry (const char * key, const char * value)
- {
- if (! valid_heading)
- return;
-
- HintPair * pair = (HintPair *) bsearch (key, hint_pairs,
- aud::n_elems (hint_pairs), sizeof (HintPair), hint_pair_compare);
-
- if (pair)
- * pair->value_ptr = atoi (value);
- }
-};
-
-void skin_load_hints (Skin * skin, const char * path)
-{
- static_hints = skin_default_hints;
-
- VFSFile file = open_local_file_nocase (path, "skin.hints");
- if (file)
- HintsParser ().parse (file);
-
- skin->properties = static_hints;
-}
-
-/*
- * pledit.txt parsing
- */
-
-class PLColorsParser : public IniParser
-{
-public:
- PLColorsParser (Skin & skin) :
- skin (skin),
- valid_heading (false) {}
-
-private:
- Skin & skin;
- bool valid_heading;
-
- void handle_heading (const char * heading)
- { valid_heading = ! g_ascii_strcasecmp (heading, "text"); }
-
- void handle_entry (const char * key, const char * value)
- {
- if (! valid_heading)
- return;
-
- if (value0 == '#')
- value ++;
-
- uint32_t color = strtol (value, nullptr, 16);
-
- if (! g_ascii_strcasecmp (key, "normal"))
- skin.colorsSKIN_PLEDIT_NORMAL = color;
- else if (! g_ascii_strcasecmp (key, "current"))
- skin.colorsSKIN_PLEDIT_CURRENT = color;
- else if (! g_ascii_strcasecmp (key, "normalbg"))
- skin.colorsSKIN_PLEDIT_NORMALBG = color;
- else if (! g_ascii_strcasecmp (key, "selectedbg"))
- skin.colorsSKIN_PLEDIT_SELECTEDBG = color;
- }
-};
-
-void skin_load_pl_colors (Skin * skin, const char * path)
-{
- skin->colorsSKIN_PLEDIT_NORMAL = 0x2499ff;
- skin->colorsSKIN_PLEDIT_CURRENT = 0xffeeff;
- skin->colorsSKIN_PLEDIT_NORMALBG = 0x0a120a;
- skin->colorsSKIN_PLEDIT_SELECTEDBG = 0x0a124a;
-
- VFSFile file = open_local_file_nocase (path, "pledit.txt");
- if (file)
- PLColorsParser (* skin).parse (file);
-}
-
-/*
- * region.txt parsing
- */
-
-class MaskParser : public IniParser
-{
-public:
- GArray * numpointsSKIN_MASK_COUNT {};
- GArray * pointlistSKIN_MASK_COUNT {};
-
- ~MaskParser ()
- {
- for (GArray * array : numpoints)
- if (array) g_array_free (array, true);
- for (GArray * array : pointlist)
- if (array) g_array_free (array, true);
- }
-
-private:
- SkinMaskId current_id = SkinMaskId (-1);
-
- void handle_heading (const char * heading)
- {
- if (! g_ascii_strcasecmp (heading, "normal"))
- current_id = SKIN_MASK_MAIN;
- else if (! g_ascii_strcasecmp (heading, "windowshade"))
- current_id = SKIN_MASK_MAIN_SHADE;
- else if (! g_ascii_strcasecmp (heading, "equalizer"))
- current_id = SKIN_MASK_EQ;
- else if (! g_ascii_strcasecmp (heading, "equalizerws"))
- current_id = SKIN_MASK_EQ_SHADE;
- else
- current_id = (SkinMaskId) -1;
- }
-
- void handle_entry (const char * key, const char * value)
- {
- if (current_id == (SkinMaskId) -1)
- return;
-
- if (! g_ascii_strcasecmp (key, "numpoints"))
- {
- if (! numpointscurrent_id)
- numpointscurrent_id = string_to_garray (value);
- }
- else if (! g_ascii_strcasecmp (key, "pointlist"))
- {
- if (! pointlistcurrent_id)
- pointlistcurrent_id = string_to_garray (value);
- }
- }
-};
-
-static cairo_region_t * skin_create_mask (const GArray * num,
- const GArray * point, int width, int height)
-{
- if (! num || ! point)
- return nullptr;
-
- width *= config.scale;
- height *= config.scale;
-
- cairo_region_t * mask = nullptr;
-
- unsigned j = 0;
- for (unsigned i = 0; i < num->len; i ++)
- {
- int n_points = g_array_index (num, int, i);
- if (n_points <= 0 || j + 2 * n_points > point->len)
- break;
-
- int xmin = width, ymin = height, xmax = 0, ymax = 0;
-
- for (int k = 0; k < n_points; k ++)
- {
- int x = g_array_index (point, int, j + k * 2) * config.scale;
- int y = g_array_index (point, int, j + k * 2 + 1) * config.scale;
-
- xmin = aud::min (xmin, x);
- ymin = aud::min (ymin, y);
- xmax = aud::max (xmax, x);
- ymax = aud::max (ymax, y);
- }
-
- if (xmax > xmin && ymax > ymin)
- {
- cairo_rectangle_int_t rect = {xmin, ymin, xmax - xmin, ymax - ymin};
-
- if (mask)
- cairo_region_union_rectangle (mask, & rect);
- else
- mask = cairo_region_create_rectangle (& rect);
- }
-
- j += n_points * 2;
- }
-
- return mask;
-}
-
-void skin_load_masks (Skin * skin, const char * path, cairo_region_t * masksSKIN_MASK_COUNT)
-{
- int sizesSKIN_MASK_COUNT2 = {
- {skin->properties.mainwin_width, skin->properties.mainwin_height},
- {275, 16},
- {275, 116},
- {275, 16}
- };
-
- MaskParser parser;
- VFSFile file = open_local_file_nocase (path, "region.txt");
- if (file)
- parser.parse (file);
-
- for (int id = 0; id < SKIN_MASK_COUNT; id ++)
- masksid = skin_create_mask (parser.numpointsid,
- parser.pointlistid, sizesid0, sizesid1);
-}

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/ui_skinned_button.cc Deleted

@@ -1,264 +0,0 @@
-/*
- * Audacious - a cross-platform multimedia player
- * Copyright (c) 2007 Tomasz Moń
- * Copyright (c) 2011 John Lindgren
- *
- * 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; under version 3 of the License.
- *
- * 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>.
- *
- * The Audacious team does not consider modular code linking to
- * Audacious or using our public API to be a derived work.
- */
-
-#include "draw-compat.h"
-#include "skins_cfg.h"
-#include "ui_skinned_button.h"
-
-enum {BUTTON_TYPE_NORMAL, BUTTON_TYPE_TOGGLE, BUTTON_TYPE_SMALL};
-
-typedef struct {
- int type;
- int w, h;
- int nx, ny, px, py;
- int pnx, pny, ppx, ppy;
- SkinPixmapId si1, si2;
- gboolean pressed, rpressed, active;
- ButtonCB on_press, on_release, on_rpress, on_rrelease;
-} ButtonData;
-
-DRAW_FUNC_BEGIN (button_draw)
- ButtonData * data = (ButtonData *) g_object_get_data ((GObject *) wid, "buttondata");
- g_return_val_if_fail (data, FALSE);
-
- switch (data->type)
- {
- case BUTTON_TYPE_NORMAL:
- if (data->pressed)
- skin_draw_pixbuf (cr, data->si2, data->px, data->py, 0, 0, data->w, data->h);
- else
- skin_draw_pixbuf (cr, data->si1, data->nx, data->ny, 0, 0, data->w, data->h);
- break;
- case BUTTON_TYPE_TOGGLE:
- if (data->active)
- {
- if (data->pressed)
- skin_draw_pixbuf (cr, data->si2, data->ppx, data->ppy, 0, 0, data->w, data->h);
- else
- skin_draw_pixbuf (cr, data->si1, data->pnx, data->pny, 0, 0, data->w, data->h);
- }
- else
- {
- if (data->pressed)
- skin_draw_pixbuf (cr, data->si2, data->px, data->py, 0, 0, data->w, data->h);
- else
- skin_draw_pixbuf (cr, data->si1, data->nx, data->ny, 0, 0, data->w, data->h);
- }
- break;
- }
-DRAW_FUNC_END
-
-static gboolean button_press (GtkWidget * button, GdkEventButton * event)
-{
- ButtonData * data = (ButtonData *) g_object_get_data ((GObject *) button, "buttondata");
- g_return_val_if_fail (data, FALSE);
-
- /* pass events through to the parent widget only if neither the press nor
- * release signals are connected; sending one and not the other causes
- * problems (in particular with dragging windows around) */
- if (event->button == 1 && (data->on_press || data->on_release))
- {
- data->pressed = TRUE;
- if (data->on_press)
- data->on_press (button, event);
- }
- else if (event->button == 3 && (data->on_rpress || data->on_rrelease))
- {
- data->rpressed = TRUE;
- if (data->on_rpress)
- data->on_rpress (button, event);
- }
- else
- return FALSE;
-
- if (data->type != BUTTON_TYPE_SMALL)
- gtk_widget_queue_draw (button);
-
- return TRUE;
-}
-
-static gboolean button_release (GtkWidget * button, GdkEventButton * event)
-{
- ButtonData * data = (ButtonData *) g_object_get_data ((GObject *) button, "buttondata");
- g_return_val_if_fail (data, FALSE);
-
- if (event->button == 1 && (data->on_press || data->on_release))
- {
- if (! data->pressed)
- return TRUE;
-
- data->pressed = FALSE;
- if (data->type == BUTTON_TYPE_TOGGLE)
- data->active = ! data->active;
- if (data->on_release)
- data->on_release (button, event);
- }
- else if (event->button == 3 && (data->on_rpress || data->on_rrelease))
- {
- if (! data->rpressed)
- return TRUE;
-
- data->rpressed = FALSE;
- if (data->on_rrelease)
- data->on_rrelease (button, event);
- }
- else
- return FALSE;
-
- if (data->type != BUTTON_TYPE_SMALL)
- gtk_widget_queue_draw (button);
-
- return TRUE;
-}
-
-static void button_destroy (GtkWidget * button)
-{
- g_free (g_object_get_data ((GObject *) button, "buttondata"));
-}
-
-static GtkWidget * button_new_base (int type, int w, int h)
-{
- GtkWidget * button;
-
- if (type == BUTTON_TYPE_SMALL)
- {
- button = gtk_event_box_new ();
- gtk_event_box_set_visible_window ((GtkEventBox *) button, FALSE);
- }
- else
- button = gtk_drawing_area_new ();
-
- gtk_widget_set_size_request (button, w * config.scale, h * config.scale);
- gtk_widget_add_events (button, GDK_BUTTON_PRESS_MASK |
- GDK_BUTTON_RELEASE_MASK | GDK_LEAVE_NOTIFY_MASK);
-
- if (type != BUTTON_TYPE_SMALL)
- DRAW_CONNECT (button, button_draw);
-
- g_signal_connect (button, "button-press-event", (GCallback) button_press,
- nullptr);
- g_signal_connect (button, "button-release-event", (GCallback)
- button_release, nullptr);
- g_signal_connect (button, "destroy", (GCallback) button_destroy, nullptr);
-
- ButtonData * data = g_new0 (ButtonData, 1);
- data->type = type;
- data->w = w;
- data->h = h;
- g_object_set_data ((GObject *) button, "buttondata", data);
-
- return button;
-}
-
-GtkWidget * button_new (int w, int h, int nx, int ny, int px, int py,
- SkinPixmapId si1, SkinPixmapId si2)
-{
- GtkWidget * button = button_new_base (BUTTON_TYPE_NORMAL, w, h);
- ButtonData * data = (ButtonData *) g_object_get_data ((GObject *) button, "buttondata");
- g_return_val_if_fail (data, nullptr);
-
- data->nx = nx;
- data->ny = ny;
- data->px = px;
- data->py = py;
- data->si1 = si1;
- data->si2 = si2;
-
- return button;
-}
-
-GtkWidget * button_new_toggle (int w, int h, int nx, int ny, int px, int
- py, int pnx, int pny, int ppx, int ppy, SkinPixmapId si1, SkinPixmapId si2)
-{
- GtkWidget * button = button_new_base (BUTTON_TYPE_TOGGLE, w, h);
- ButtonData * data = (ButtonData *) g_object_get_data ((GObject *) button, "buttondata");
- g_return_val_if_fail (data, nullptr);
-
- data->nx = nx;
- data->ny = ny;
- data->px = px;
- data->py = py;
- data->pnx = pnx;
- data->pny = pny;
- data->ppx = ppx;
- data->ppy = ppy;
- data->si1 = si1;
- data->si2 = si2;
-
- return button;
-}
-
-GtkWidget * button_new_small (int w, int h)
-{
- return button_new_base (BUTTON_TYPE_SMALL, w, h);
-}
-
-void button_on_press (GtkWidget * button, ButtonCB callback)
-{
- ButtonData * data = (ButtonData *) g_object_get_data ((GObject *) button, "buttondata");
- g_return_if_fail (data);
-
- data->on_press = callback;
-}
-
-void button_on_release (GtkWidget * button, ButtonCB callback)
-{
- ButtonData * data = (ButtonData *) g_object_get_data ((GObject *) button, "buttondata");
- g_return_if_fail (data);
-
- data->on_release = callback;
-}
-
-void button_on_rpress (GtkWidget * button, ButtonCB callback)
-{
- ButtonData * data = (ButtonData *) g_object_get_data ((GObject *) button, "buttondata");
- g_return_if_fail (data);
-
- data->on_rpress = callback;
-}
-
-void button_on_rrelease (GtkWidget * button, ButtonCB callback)
-{
- ButtonData * data = (ButtonData *) g_object_get_data ((GObject *) button, "buttondata");
- g_return_if_fail (data);
-
- data->on_rrelease = callback;
-}
-
-gboolean button_get_active (GtkWidget * button)
-{
- ButtonData * data = (ButtonData *) g_object_get_data ((GObject *) button, "buttondata");
- g_return_val_if_fail (data && data->type == BUTTON_TYPE_TOGGLE, FALSE);
-
- return data->active;
-}
-
-void button_set_active (GtkWidget * button, gboolean active)
-{
- ButtonData * data = (ButtonData *) g_object_get_data ((GObject *) button, "buttondata");
- g_return_if_fail (data && data->type == BUTTON_TYPE_TOGGLE);
-
- if (data->active == active)
- return;
-
- data->active = active;
- gtk_widget_queue_draw (button);
-}

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/ui_skinned_button.h Deleted

@@ -1,46 +0,0 @@
-/*
- * Audacious - a cross-platform multimedia player
- * Copyright (c) 2007 Tomasz Moń
- * Copyright (c) 2011 John Lindgren
- *
- * 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; under version 3 of the License.
- *
- * 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>.
- *
- * The Audacious team does not consider modular code linking to
- * Audacious or using our public API to be a derived work.
- */
-
-#ifndef SKINS_UI_SKINNED_BUTTON_H
-#define SKINS_UI_SKINNED_BUTTON_H
-
-#include <gtk/gtk.h>
-
-#include "ui_skin.h"
-
-typedef void (* ButtonCB) (GtkWidget * button, GdkEventButton * event);
-
-GtkWidget * button_new (int w, int h, int nx, int ny, int px,
- int py, SkinPixmapId si1, SkinPixmapId si2);
-GtkWidget * button_new_toggle (int w, int h, int nx, int ny,
- int px, int py, int pnx, int pny, int ppx, int ppy, SkinPixmapId si1,
- SkinPixmapId si2);
-GtkWidget * button_new_small (int w, int h);
-
-void button_on_press (GtkWidget * button, ButtonCB callback);
-void button_on_release (GtkWidget * button, ButtonCB callback);
-void button_on_rpress (GtkWidget * button, ButtonCB callback);
-void button_on_rrelease (GtkWidget * button, ButtonCB callback);
-
-gboolean button_get_active (GtkWidget * button);
-void button_set_active (GtkWidget * button, gboolean active);
-
-#endif

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/ui_skinned_equalizer_graph.cc Deleted

@@ -1,147 +0,0 @@
-/*
- * Audacious - a cross-platform multimedia player
- * Copyright (c) 2007 Tomasz Moń
- * Copyright (c) 2011 John Lindgren
- *
- * Based on:
- * BMP - Cross-platform multimedia player
- * Copyright (C) 2003-2004 BMP development team.
- * XMMS:
- * Copyright (C) 1998-2003 XMMS development team.
- *
- * 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; under version 3 of the License.
- *
- * 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>.
- */
-
-#include <libaudcore/equalizer.h>
-#include <libaudcore/runtime.h>
-
-#include "draw-compat.h"
-#include "skins_cfg.h"
-#include "ui_skin.h"
-#include "ui_skinned_equalizer_graph.h"
-
-static void init_spline (const double * x, const double * y, int n, double * y2)
-{
- int i, k;
- double p, qn, sig, un, *u;
-
- u = (double *) g_malloc(n * sizeof(double));
-
- y20 = u0 = 0.0;
-
- for (i = 1; i < n - 1; i++) {
- sig = ((double) xi - xi - 1) / ((double) xi + 1 - xi - 1);
- p = sig * y2i - 1 + 2.0;
- y2i = (sig - 1.0) / p;
- ui =
- (((double) yi + 1 - yi) / (xi + 1 - xi)) -
- (((double) yi - yi - 1) / (xi - xi - 1));
- ui = (6.0 * ui / (xi + 1 - xi - 1) - sig * ui - 1) / p;
- }
- qn = un = 0.0;
-
- y2n - 1 = (un - qn * un - 2) / (qn * y2n - 2 + 1.0);
- for (k = n - 2; k >= 0; k--)
- y2k = y2k * y2k + 1 + uk;
- g_free(u);
-}
-
-double eval_spline (const double * xa, const double * ya, const double * y2a,
- int n, double x)
-{
- int klo, khi, k;
- double h, b, a;
-
- klo = 0;
- khi = n - 1;
- while (khi - klo > 1) {
- k = (khi + klo) >> 1;
- if (xak > x)
- khi = k;
- else
- klo = k;
- }
- h = xakhi - xaklo;
- a = (xakhi - x) / h;
- b = (x - xaklo) / h;
- return (a * yaklo + b * yakhi +
- ((a * a * a - a) * y2aklo +
- (b * b * b - b) * y2akhi) * (h * h) / 6.0);
-}
-
-DRAW_FUNC_BEGIN (eq_graph_draw)
- static const double x10 = {0, 11, 23, 35, 47, 59, 71, 83, 97, 109};
-
- skin_draw_pixbuf (cr, SKIN_EQMAIN, 0, 294, 0, 0, 113, 19);
- skin_draw_pixbuf (cr, SKIN_EQMAIN, 0, 314, 0, 9 + (aud_get_double (nullptr,
- "equalizer_preamp") * 9 + AUD_EQ_MAX_GAIN / 2) / AUD_EQ_MAX_GAIN, 113, 1);
-
- cairo_scale (cr, config.scale, config.scale);
-
- uint32_t cols19;
- skin_get_eq_spline_colors(active_skin, cols);
-
- double bandsAUD_EQ_NBANDS;
- aud_eq_get_bands (bands);
-
- double yf10;
- init_spline (x, bands, 10, yf);
-
- /* now draw a pixelated line with vector graphics ... -- jlindgren */
- int py = 0;
- for (int i = 0; i < 109; i ++)
- {
- int y = 9.5 - eval_spline (x, bands, yf, 10, i) * 9 / AUD_EQ_MAX_GAIN;
- y = aud::clamp (y, 0, 18);
-
- if (!i)
- py = y;
-
- int ymin, ymax;
-
- if (y > py)
- {
- ymin = py + 1;
- ymax = y;
- }
- else if (y < py)
- {
- ymin = y;
- ymax = py - 1;
- }
- else
- ymin = ymax = y;
-
- py = y;
-
- for (y = ymin; y <= ymax; y++)
- {
- cairo_rectangle (cr, i + 2, y, 1, 1);
- set_cairo_color (cr, colsy);
- cairo_fill (cr);
- }
- }
-DRAW_FUNC_END
-
-GtkWidget * eq_graph_new (void)
-{
- GtkWidget * graph = gtk_drawing_area_new ();
- gtk_widget_set_size_request (graph, 113 * config.scale, 19 * config.scale);
- DRAW_CONNECT (graph, eq_graph_draw);
- return graph;
-}
-
-void eq_graph_update (GtkWidget * graph)
-{
- gtk_widget_queue_draw (graph);
-}

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/ui_skinned_equalizer_graph.h Deleted

@@ -1,36 +0,0 @@
-/*
- * Audacious - a cross-platform multimedia player
- * Copyright (c) 2007 Tomasz Moń
- * Copyright (c) 2011 John Lindgren
- *
- * Based on:
- * BMP - Cross-platform multimedia player
- * Copyright (C) 2003-2004 BMP development team.
- * XMMS:
- * Copyright (C) 1998-2003 XMMS development team.
- *
- * 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; under version 3 of the License.
- *
- * 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>.
- *
- * The Audacious team does not consider modular code linking to
- * Audacious or using our public API to be a derived work.
- */
-
-#ifndef SKINS_UI_SKINNED_EQUALIZER_GRAPH_H
-#define SKINS_UI_SKINNED_EQUALIZER_GRAPH_H
-
-#include <gtk/gtk.h>
-
-GtkWidget * eq_graph_new ();
-void eq_graph_update (GtkWidget * graph);
-
-#endif

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/ui_skinned_equalizer_slider.cc Deleted

@@ -1,191 +0,0 @@
-/*
- * Audacious - a cross-platform multimedia player
- * Copyright (c) 2007 Tomasz Moń
- * Copyright (c) 2011 John Lindgren
- *
- * Based on:
- * BMP - Cross-platform multimedia player
- * Copyright (C) 2003-2004 BMP development team.
- * XMMS:
- * Copyright (C) 1998-2003 XMMS development team.
- *
- * 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; under version 3 of the License.
- *
- * 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>.
- */
-
-#include <libaudcore/i18n.h>
-
-#include "draw-compat.h"
-#include "skins_cfg.h"
-#include "ui_equalizer.h"
-#include "ui_main.h"
-#include "ui_skin.h"
-#include "ui_skinned_equalizer_slider.h"
-
-typedef struct {
- char * name;
- int pos;
- float val;
- gboolean pressed;
-} EqSliderData;
-
-DRAW_FUNC_BEGIN (eq_slider_draw)
- EqSliderData * data = (EqSliderData *) g_object_get_data ((GObject *) wid, "eqsliderdata");
- g_return_val_if_fail (data, FALSE);
-
- int frame = 27 - data->pos * 27 / 50;
- if (frame < 14)
- skin_draw_pixbuf (cr, SKIN_EQMAIN, 13 + 15 * frame, 164, 0, 0, 14, 63);
- else
- skin_draw_pixbuf (cr, SKIN_EQMAIN, 13 + 15 * (frame - 14), 229, 0, 0,
- 14, 63);
-
- if (data->pressed)
- skin_draw_pixbuf (cr, SKIN_EQMAIN, 0, 176, 1, data->pos, 11, 11);
- else
- skin_draw_pixbuf (cr, SKIN_EQMAIN, 0, 164, 1, data->pos, 11, 11);
-DRAW_FUNC_END
-
-static void eq_slider_moved (EqSliderData * data, int pos)
-{
- data->pos = aud::clamp (pos, 0, 50);
- if (data->pos == 24 || data->pos == 26)
- data->pos = 25;
-
- data->val = (float) (25 - data->pos) * AUD_EQ_MAX_GAIN / 25;
-
- equalizerwin_eq_changed ();
-
- char buf100;
- snprintf (buf, sizeof buf, "%s: %+.1f dB", data->name, data->val);
- mainwin_show_status_message (buf);
-}
-
-static gboolean eq_slider_button_press (GtkWidget * slider, GdkEventButton *
- event)
-{
- EqSliderData * data = (EqSliderData *) g_object_get_data ((GObject *) slider, "eqsliderdata");
- g_return_val_if_fail (data, FALSE);
-
- if (event->button != 1)
- return FALSE;
-
- data->pressed = TRUE;
-
- eq_slider_moved (data, event->y / config.scale - 5);
- gtk_widget_queue_draw (slider);
- return TRUE;
-}
-
-static gboolean eq_slider_button_release (GtkWidget * slider, GdkEventButton *
- event)
-{
- EqSliderData * data = (EqSliderData *) g_object_get_data ((GObject *) slider, "eqsliderdata");
- g_return_val_if_fail (data, FALSE);
-
- if (event->button != 1)
- return FALSE;
-
- if (! data->pressed)
- return TRUE;
-
- data->pressed = FALSE;
-
- eq_slider_moved (data, event->y / config.scale - 5);
- gtk_widget_queue_draw (slider);
- return TRUE;
-}
-
-static gboolean eq_slider_motion (GtkWidget * slider, GdkEventMotion * event)
-{
- EqSliderData * data = (EqSliderData *) g_object_get_data ((GObject *) slider, "eqsliderdata");
- g_return_val_if_fail (data, FALSE);
-
- if (! data->pressed)
- return TRUE;
-
- eq_slider_moved (data, event->y / config.scale - 5);
- gtk_widget_queue_draw (slider);
- return TRUE;
-}
-
-static gboolean eq_slider_scroll (GtkWidget * slider, GdkEventScroll * event)
-{
- EqSliderData * data = (EqSliderData *) g_object_get_data ((GObject *) slider, "eqsliderdata");
- g_return_val_if_fail (data, FALSE);
-
- if (event->direction == GDK_SCROLL_UP)
- eq_slider_moved (data, data->pos - 2);
- else
- eq_slider_moved (data, data->pos + 2);
-
- gtk_widget_queue_draw (slider);
- return TRUE;
-}
-
-void eq_slider_set_val (GtkWidget * slider, float val)
-{
- EqSliderData * data = (EqSliderData *) g_object_get_data ((GObject *) slider, "eqsliderdata");
- g_return_if_fail (data);
-
- if (data->pressed)
- return;
-
- data->val = val;
- data->pos = 25 - (int) (val * 25 / AUD_EQ_MAX_GAIN);
- data->pos = aud::clamp (data->pos, 0, 50);
-
- gtk_widget_queue_draw (slider);
-}
-
-float eq_slider_get_val (GtkWidget * slider)
-{
- EqSliderData * data = (EqSliderData *) g_object_get_data ((GObject *) slider, "eqsliderdata");
- g_return_val_if_fail (data, 0);
-
- return data->val;
-}
-
-static void eq_slider_destroy (GtkWidget * slider)
-{
- EqSliderData * data = (EqSliderData *) g_object_get_data ((GObject *) slider, "eqsliderdata");
- g_return_if_fail (data);
-
- g_free (data->name);
- g_free (data);
-}
-
-GtkWidget * eq_slider_new (const char * name)
-{
- GtkWidget * slider = gtk_drawing_area_new ();
- gtk_widget_set_size_request (slider, 14 * config.scale, 63 * config.scale);
- gtk_widget_add_events (slider, GDK_BUTTON_PRESS_MASK |
- GDK_BUTTON_RELEASE_MASK | GDK_POINTER_MOTION_MASK | GDK_SCROLL_MASK);
-
- DRAW_CONNECT (slider, eq_slider_draw);
-
- g_signal_connect (slider, "button-press-event", (GCallback)
- eq_slider_button_press, nullptr);
- g_signal_connect (slider, "button-release-event", (GCallback)
- eq_slider_button_release, nullptr);
- g_signal_connect (slider, "motion-notify-event", (GCallback)
- eq_slider_motion, nullptr);
- g_signal_connect (slider, "scroll-event", (GCallback) eq_slider_scroll,
- nullptr);
- g_signal_connect (slider, "destroy", (GCallback) eq_slider_destroy, nullptr);
-
- EqSliderData * data = g_new0 (EqSliderData, 1);
- data->name = g_strdup (name);
- g_object_set_data ((GObject *) slider, "eqsliderdata", data);
-
- return slider;
-}

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/ui_skinned_equalizer_slider.h Deleted

@@ -1,34 +0,0 @@
-/*
- * Audacious - a cross-platform multimedia player
- * Copyright (c) 2007 Tomasz Moń
- * Copyright (c) 2011 John Lindgren
- *
- * Based on:
- * BMP - Cross-platform multimedia player
- * Copyright (C) 2003-2004 BMP development team.
- * XMMS:
- * Copyright (C) 1998-2003 XMMS development team.
- *
- * 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; under version 3 of the License.
- *
- * 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>.
- */
-
-#ifndef SKINS_UI_SKINNED_EQUALIZER_SLIDER_H
-#define SKINS_UI_SKINNED_EQUALIZER_SLIDER_H
-
-#include <gtk/gtk.h>
-
-GtkWidget * eq_slider_new (const char * name);
-void eq_slider_set_val (GtkWidget * widget, float val);
-float eq_slider_get_val (GtkWidget * widget);
-
-#endif

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/ui_skinned_horizontal_slider.cc Deleted

@@ -1,241 +0,0 @@
-/*
- * Audacious - a cross-platform multimedia player
- * Copyright (c) 2007 Tomasz Moń
- * Copyright (c) 2011 John Lindgren
- *
- * Based on:
- * BMP - Cross-platform multimedia player
- * Copyright (C) 2003-2004 BMP development team.
- * XMMS:
- * Copyright (C) 1998-2003 XMMS development team.
- *
- * 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; under version 3 of the License.
- *
- * 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>.
- *
- * The Audacious team does not consider modular code linking to
- * Audacious or using our public API to be a derived work.
- */
-
-#include <libaudcore/objects.h>
-
-#include "draw-compat.h"
-#include "skins_cfg.h"
-#include "ui_skin.h"
-#include "ui_skinned_horizontal_slider.h"
-
-typedef struct {
- int min, max, pos;
- gboolean pressed;
- SkinPixmapId si;
- int w, h;
- int fx, fy;
- int kw, kh;
- int knx, kny, kpx, kpy;
- void (* on_motion) (void);
- void (* on_release) (void);
-} HSliderData;
-
-DRAW_FUNC_BEGIN (hslider_draw)
- HSliderData * data = (HSliderData *) g_object_get_data ((GObject *) wid, "hsliderdata");
- g_return_val_if_fail (data, FALSE);
-
- skin_draw_pixbuf (cr, data->si, data->fx, data->fy, 0, 0, data->w, data->h);
-
- if (data->pressed)
- skin_draw_pixbuf (cr, data->si, data->kpx, data->kpy, data->pos,
- (data->h - data->kh) / 2, data->kw, data->kh);
- else
- skin_draw_pixbuf (cr, data->si, data->knx, data->kny, data->pos,
- (data->h - data->kh) / 2, data->kw, data->kh);
-DRAW_FUNC_END
-
-static gboolean hslider_button_press (GtkWidget * hslider, GdkEventButton *
- event)
-{
- HSliderData * data = (HSliderData *) g_object_get_data ((GObject *) hslider, "hsliderdata");
- g_return_val_if_fail (data, FALSE);
-
- if (event->button != 1)
- return FALSE;
-
- data->pressed = TRUE;
- data->pos = event->x / config.scale - data->kw / 2;
- data->pos = aud::clamp (data->pos, data->min, data->max);
-
- if (data->on_motion)
- data->on_motion ();
-
- gtk_widget_queue_draw (hslider);
- return TRUE;
-}
-
-static gboolean hslider_button_release (GtkWidget * hslider, GdkEventButton *
- event)
-{
- HSliderData * data = (HSliderData *) g_object_get_data ((GObject *) hslider, "hsliderdata");
- g_return_val_if_fail (data, FALSE);
-
- if (event->button != 1)
- return FALSE;
-
- if (! data->pressed)
- return TRUE;
-
- data->pressed = FALSE;
- data->pos = event->x / config.scale - data->kw / 2;
- data->pos = aud::clamp (data->pos, data->min, data->max);
-
- if (data->on_release)
- data->on_release ();
-
- gtk_widget_queue_draw (hslider);
- return TRUE;
-}
-
-static gboolean hslider_motion_notify (GtkWidget * hslider, GdkEventMotion *
- event)
-{
- HSliderData * data = (HSliderData *) g_object_get_data ((GObject *) hslider, "hsliderdata");
- g_return_val_if_fail (data, FALSE);
-
- if (! data->pressed)
- return TRUE;
-
- data->pressed = TRUE;
- data->pos = event->x / config.scale - data->kw / 2;
- data->pos = aud::clamp (data->pos, data->min, data->max);
-
- if (data->on_motion)
- data->on_motion ();
-
- gtk_widget_queue_draw (hslider);
- return TRUE;
-}
-
-static void hslider_destroy (GtkWidget * hslider)
-{
- g_free (g_object_get_data ((GObject *) hslider, "hsliderdata"));
-}
-
-GtkWidget * hslider_new (int min, int max, SkinPixmapId si, int w, int h,
- int fx, int fy, int kw, int kh, int knx, int kny, int kpx, int kpy)
-{
- GtkWidget * hslider = gtk_drawing_area_new ();
- gtk_widget_set_size_request (hslider, w * config.scale, h * config.scale);
- gtk_widget_add_events (hslider, GDK_BUTTON_PRESS_MASK |
- GDK_BUTTON_RELEASE_MASK | GDK_POINTER_MOTION_MASK);
-
- DRAW_CONNECT (hslider, hslider_draw);
-
- g_signal_connect (hslider, "button-press-event", (GCallback)
- hslider_button_press, nullptr);
- g_signal_connect (hslider, "button-release-event", (GCallback)
- hslider_button_release, nullptr);
- g_signal_connect (hslider, "motion-notify-event", (GCallback)
- hslider_motion_notify, nullptr);
- g_signal_connect (hslider, "destroy", (GCallback) hslider_destroy, nullptr);
-
- HSliderData * data = g_new0 (HSliderData, 1);
- data->min = min;
- data->max = max;
- data->pos = min;
- data->si = si;
- data->w = w;
- data->h = h;
- data->fx = fx;
- data->fy = fy;
- data->kw = kw;
- data->kh = kh;
- data->knx = knx;
- data->kny = kny;
- data->kpx = kpx;
- data->kpy = kpy;
- g_object_set_data ((GObject *) hslider, "hsliderdata", data);
-
- return hslider;
-}
-
-void hslider_set_frame (GtkWidget * hslider, int fx, int fy)
-{
- HSliderData * data = (HSliderData *) g_object_get_data ((GObject *) hslider, "hsliderdata");
- g_return_if_fail (data);
-
- data->fx = fx;
- data->fy = fy;
- gtk_widget_queue_draw (hslider);
-}
-
-void hslider_set_knob (GtkWidget * hslider, int knx, int kny, int kpx, int
- kpy)
-{
- HSliderData * data = (HSliderData *) g_object_get_data ((GObject *) hslider, "hsliderdata");
- g_return_if_fail (data);
-
- data->knx = knx;
- data->kny = kny;
- data->kpx = kpx;
- data->kpy = kpy;
- gtk_widget_queue_draw (hslider);
-}
-
-int hslider_get_pos (GtkWidget * hslider)
-{
- HSliderData * data = (HSliderData *) g_object_get_data ((GObject *) hslider, "hsliderdata");
- g_return_val_if_fail (data, 0);
-
- return data->pos;
-}
-
-void hslider_set_pos (GtkWidget * hslider, int pos)
-{
- HSliderData * data = (HSliderData *) g_object_get_data ((GObject *) hslider, "hsliderdata");
- g_return_if_fail (data);
-
- if (data->pressed)
- return;
-
- data->pos = aud::clamp (pos, data->min, data->max);
- gtk_widget_queue_draw (hslider);
-}
-
-gboolean hslider_get_pressed (GtkWidget * hslider)
-{
- HSliderData * data = (HSliderData *) g_object_get_data ((GObject *) hslider, "hsliderdata");
- g_return_val_if_fail (data, FALSE);
-
- return data->pressed;
-}
-
-void hslider_set_pressed (GtkWidget * hslider, gboolean pressed)
-{
- HSliderData * data = (HSliderData *) g_object_get_data ((GObject *) hslider, "hsliderdata");
- g_return_if_fail (data);
-
- data->pressed = pressed;
- gtk_widget_queue_draw (hslider);
-}
-
-void hslider_on_motion (GtkWidget * hslider, void (* callback) (void))
-{
- HSliderData * data = (HSliderData *) g_object_get_data ((GObject *) hslider, "hsliderdata");
- g_return_if_fail (data);
-
- data->on_motion = callback;
-}
-
-void hslider_on_release (GtkWidget * hslider, void (* callback) (void))
-{
- HSliderData * data = (HSliderData *) g_object_get_data ((GObject *) hslider, "hsliderdata");
- g_return_if_fail (data);
-
- data->on_release = callback;
-}

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/ui_skinned_horizontal_slider.h Deleted

@@ -1,45 +0,0 @@
-/*
- * Audacious - a cross-platform multimedia player
- * Copyright (c) 2007 Tomasz Moń
- * Copyright (c) 2011 John Lindgren
- *
- * Based on:
- * BMP - Cross-platform multimedia player
- * Copyright (C) 2003-2004 BMP development team.
- * XMMS:
- * Copyright (C) 1998-2003 XMMS development team.
- *
- * 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; under version 3 of the License.
- *
- * 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>.
- *
- * The Audacious team does not consider modular code linking to
- * Audacious or using our public API to be a derived work.
- */
-
-#ifndef SKINS_UI_SKINNED_HORIZONTAL_SLIDER_H
-#define SKINS_UI_SKINNED_HORIZONTAL_SLIDER_H
-
-#include <gtk/gtk.h>
-
-GtkWidget * hslider_new (int min, int max, SkinPixmapId si, int w, int h,
- int fx, int fy, int kw, int kh, int knx, int kny, int kpx, int kpy);
-void hslider_set_frame (GtkWidget * hslider, int fx, int fy);
-void hslider_set_knob (GtkWidget * hslider, int knx, int kny, int kpx, int
- kpy);
-int hslider_get_pos (GtkWidget * hslider);
-void hslider_set_pos (GtkWidget * hslider, int pos);
-gboolean hslider_get_pressed (GtkWidget * hslider);
-void hslider_set_pressed (GtkWidget * hslider, gboolean pressed);
-void hslider_on_motion (GtkWidget * hslider, void (* callback) (void));
-void hslider_on_release (GtkWidget * hslider, void (* callback) (void));
-
-#endif

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/ui_skinned_menurow.cc Deleted

@@ -1,147 +0,0 @@
-/*
- * Audacious - a cross-platform multimedia player
- * Copyright (c) 2007 Tomasz Moń
- * Copyright (c) 2011 John Lindgren
- *
- * Based on:
- * BMP - Cross-platform multimedia player
- * Copyright (C) 2003-2004 BMP development team.
- * XMMS:
- * Copyright (C) 1998-2003 XMMS development team.
- *
- * 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; under version 3 of the License.
- *
- * 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>.
- *
- * The Audacious team does not consider modular code linking to
- * Audacious or using our public API to be a derived work.
- */
-
-#include <libaudcore/runtime.h>
-
-#include "draw-compat.h"
-#include "skins_cfg.h"
-#include "ui_skin.h"
-#include "ui_skinned_menurow.h"
-
-static struct {
- MenuRowItem selected;
- gboolean pushed;
-} mr;
-
-DRAW_FUNC_BEGIN (menurow_draw)
- if (mr.selected == MENUROW_NONE)
- {
- if (mr.pushed)
- skin_draw_pixbuf (cr, SKIN_TITLEBAR, 304, 0, 0, 0, 8, 43);
- else
- skin_draw_pixbuf (cr, SKIN_TITLEBAR, 312, 0, 0, 0, 8, 43);
- }
- else
- skin_draw_pixbuf (cr, SKIN_TITLEBAR, 304 + 8 * (mr.selected - 1), 44, 0,
- 0, 8, 43);
-
- if (mr.pushed)
- {
- if (aud_get_bool ("skins", "always_on_top"))
- skin_draw_pixbuf (cr, SKIN_TITLEBAR, 312, 54, 0, 10, 8, 8);
- if (aud_get_bool ("skins", "double_size"))
- skin_draw_pixbuf (cr, SKIN_TITLEBAR, 328, 70, 0, 26, 8, 8);
- }
-DRAW_FUNC_END
-
-static MenuRowItem menurow_find_selected (int x, int y)
-{
- if (x >= 0 && x < 8)
- {
- if (y >= 0 && y < 10)
- return MENUROW_OPTIONS;
- if (y >= 10 && y < 18)
- return MENUROW_ALWAYS;
- if (y >= 18 && y < 26)
- return MENUROW_FILEINFOBOX;
- if (y >= 26 && y < 34)
- return MENUROW_SCALE;
- if (y >= 34 && y < 43)
- return MENUROW_VISUALIZATION;
- }
-
- return MENUROW_NONE;
-}
-
-static gboolean menurow_button_press (GtkWidget * widget, GdkEventButton * event)
-{
- if (event->button != 1)
- return FALSE;
-
- mr.pushed = TRUE;
- mr.selected = menurow_find_selected (event->x / config.scale, event->y / config.scale);
-
- mainwin_mr_change (mr.selected);
-
- gtk_widget_queue_draw (widget);
- return TRUE;
-}
-
-static gboolean menurow_button_release (GtkWidget * widget, GdkEventButton *
- event)
-{
- if (event->button != 1)
- return FALSE;
-
- if (! mr.pushed)
- return TRUE;
-
- mainwin_mr_release (mr.selected, event);
-
- mr.pushed = FALSE;
- mr.selected = MENUROW_NONE;
-
- gtk_widget_queue_draw (widget);
- return TRUE;
-}
-
-static gboolean menurow_motion_notify (GtkWidget * widget, GdkEventMotion *
- event)
-{
- if (! mr.pushed)
- return TRUE;
-
- mr.selected = menurow_find_selected (event->x / config.scale, event->y / config.scale);
-
- mainwin_mr_change (mr.selected);
-
- gtk_widget_queue_draw (widget);
- return TRUE;
-}
-
-GtkWidget * ui_skinned_menurow_new (void)
-{
- GtkWidget * wid = gtk_drawing_area_new ();
- gtk_widget_set_size_request (wid, 8 * config.scale, 43 * config.scale);
- gtk_widget_add_events (wid, GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
- | GDK_POINTER_MOTION_MASK);
-
- DRAW_CONNECT (wid, menurow_draw);
- g_signal_connect (wid, "button-press-event", (GCallback)
- menurow_button_press, nullptr);
- g_signal_connect (wid, "button-release-event", (GCallback)
- menurow_button_release, nullptr);
- g_signal_connect (wid, "motion-notify-event", (GCallback)
- menurow_motion_notify, nullptr);
-
- return wid;
-}
-
-void ui_skinned_menurow_update (GtkWidget * menurow)
-{
- gtk_widget_queue_draw (menurow);
-}

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/ui_skinned_menurow.h Deleted

@@ -1,45 +0,0 @@
-/*
- * Audacious - a cross-platform multimedia player
- * Copyright (c) 2007 Tomasz Moń
- * Copyright (c) 2011 John Lindgren
- *
- * Based on:
- * BMP - Cross-platform multimedia player
- * Copyright (C) 2003-2004 BMP development team.
- * XMMS:
- * Copyright (C) 1998-2003 XMMS development team.
- *
- * 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; under version 3 of the License.
- *
- * 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>.
- *
- * The Audacious team does not consider modular code linking to
- * Audacious or using our public API to be a derived work.
- */
-
-#ifndef SKINS_UI_SKINNED_MENUROW_H
-#define SKINS_UI_SKINNED_MENUROW_H
-
-#include <gtk/gtk.h>
-
-typedef enum {
- MENUROW_NONE, MENUROW_OPTIONS, MENUROW_ALWAYS, MENUROW_FILEINFOBOX,
- MENUROW_SCALE, MENUROW_VISUALIZATION
-} MenuRowItem;
-
-GtkWidget * ui_skinned_menurow_new (void);
-void ui_skinned_menurow_update (GtkWidget * menurow);
-
-/* callbacks in ui_main.c */
-void mainwin_mr_change (MenuRowItem i);
-void mainwin_mr_release (MenuRowItem i, GdkEventButton * event);
-
-#endif

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/ui_skinned_monostereo.cc Deleted

@@ -1,66 +0,0 @@
-/*
- * Audacious - a cross-platform multimedia player
- * Copyright (c) 2007 Tomasz Moń
- * Copyright (c) 2011 John Lindgren
- *
- * Based on:
- * BMP - Cross-platform multimedia player
- * Copyright (C) 2003-2004 BMP development team.
- * XMMS:
- * Copyright (C) 1998-2003 XMMS development team.
- *
- * 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; under version 3 of the License.
- *
- * 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>.
- *
- * The Audacious team does not consider modular code linking to
- * Audacious or using our public API to be a derived work.
- */
-
-#include "draw-compat.h"
-#include "skins_cfg.h"
-#include "ui_skin.h"
-#include "ui_skinned_monostereo.h"
-
-static int monostereo_num_channels;
-
-DRAW_FUNC_BEGIN (monostereo_draw)
- switch (monostereo_num_channels)
- {
- case -1:
- case 0:
- skin_draw_pixbuf (cr, SKIN_MONOSTEREO, 29, 12, 0, 0, 27, 12);
- skin_draw_pixbuf (cr, SKIN_MONOSTEREO, 0, 12, 27, 0, 29, 12);
- break;
- case 1:
- skin_draw_pixbuf (cr, SKIN_MONOSTEREO, 29, 0, 0, 0, 27, 12);
- skin_draw_pixbuf (cr, SKIN_MONOSTEREO, 0, 12, 27, 0, 29, 12);
- break;
- default:
- skin_draw_pixbuf (cr, SKIN_MONOSTEREO, 29, 12, 0, 0, 27, 12);
- skin_draw_pixbuf (cr, SKIN_MONOSTEREO, 0, 0, 27, 0, 29, 12);
- break;
- }
-DRAW_FUNC_END
-
-GtkWidget * ui_skinned_monostereo_new (void)
-{
- GtkWidget * monostereo = gtk_drawing_area_new ();
- gtk_widget_set_size_request (monostereo, 56 * config.scale, 12 * config.scale);
- DRAW_CONNECT (monostereo, monostereo_draw);
- return monostereo;
-}
-
-void ui_skinned_monostereo_set_num_channels (GtkWidget * monostereo, int nch)
-{
- monostereo_num_channels = nch;
- gtk_widget_queue_draw (monostereo);
-}

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/ui_skinned_monostereo.h Deleted

@@ -1,36 +0,0 @@
-/*
- * Audacious - a cross-platform multimedia player
- * Copyright (c) 2007 Tomasz Moń
- * Copyright (c) 2011 John Lindgren
- *
- * Based on:
- * BMP - Cross-platform multimedia player
- * Copyright (C) 2003-2004 BMP development team.
- * XMMS:
- * Copyright (C) 1998-2003 XMMS development team.
- *
- * 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; under version 3 of the License.
- *
- * 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>.
- *
- * The Audacious team does not consider modular code linking to
- * Audacious or using our public API to be a derived work.
- */
-
-#ifndef SKINS_UI_SKINNED_MONOSTEREO_H
-#define SKINS_UI_SKINNED_MONOSTEREO_H
-
-#include <gtk/gtk.h>
-
-GtkWidget * ui_skinned_monostereo_new (void);
-void ui_skinned_monostereo_set_num_channels(GtkWidget *widget, int nch);
-
-#endif

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/ui_skinned_number.cc Deleted

@@ -1,93 +0,0 @@
-/*
- * Audacious - a cross-platform multimedia player
- * Copyright (c) 2007 Tomasz Moń
- * Copyright (c) 2011 John Lindgren
- *
- * Based on:
- * BMP - Cross-platform multimedia player
- * Copyright (C) 2003-2004 BMP development team.
- * XMMS:
- * Copyright (C) 1998-2003 XMMS development team.
- *
- * 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; under version 3 of the License.
- *
- * 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>.
- *
- * The Audacious team does not consider modular code linking to
- * Audacious or using our public API to be a derived work.
- */
-
-#include "draw-compat.h"
-#include "skins_cfg.h"
-#include "ui_skin.h"
-#include "ui_skinned_number.h"
-
-typedef struct {
- int w, h;
- int num;
-} NumberData;
-
-DRAW_FUNC_BEGIN (number_draw)
- NumberData * data = (NumberData *) g_object_get_data ((GObject *) wid, "numberdata");
- g_return_val_if_fail (data, FALSE);
-
- skin_draw_pixbuf (cr, SKIN_NUMBERS, data->num * 9, 0, 0, 0, data->w, data->h);
-DRAW_FUNC_END
-
-static void number_destroy (GtkWidget * number)
-{
- g_free (g_object_get_data ((GObject *) number, "numberdata"));
-}
-
-GtkWidget * ui_skinned_number_new (void)
-{
- GtkWidget * number = gtk_drawing_area_new ();
- gtk_widget_set_size_request (number, 9 * config.scale, 13 * config.scale);
-
- gtk_widget_add_events (number, GDK_BUTTON_PRESS_MASK |
- GDK_BUTTON_RELEASE_MASK);
-
- DRAW_CONNECT (number, number_draw);
- g_signal_connect (number, "destroy", (GCallback) number_destroy, nullptr);
-
- NumberData * data = g_new0 (NumberData, 1);
- data->w = 9;
- data->h = 13;
- g_object_set_data ((GObject *) number, "numberdata", data);
-
- return number;
-}
-
-void ui_skinned_number_set (GtkWidget * number, char c)
-{
- NumberData * data = (NumberData *) g_object_get_data ((GObject *) number, "numberdata");
- g_return_if_fail (data);
-
- int value = (c >= '0' && c <= '9') ? c - '0' : (c == '-') ? 11 : 10;
-
- if (data->num == value)
- return;
-
- data->num = value;
- gtk_widget_queue_draw (number);
-}
-
-void ui_skinned_number_set_size (GtkWidget * number, int width, int height)
-{
- NumberData * data = (NumberData *) g_object_get_data ((GObject *) number, "numberdata");
- g_return_if_fail (data);
-
- data->w = width;
- data->h = height;
-
- gtk_widget_set_size_request (number, width * config.scale, height * config.scale);
- gtk_widget_queue_draw (number);
-}

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/ui_skinned_number.h Deleted

@@ -1,31 +0,0 @@
-/*
- * Audacious - a cross-platform multimedia player
- * Copyright (c) 2007 Tomasz Moń
- * Copyright (c) 2011 John Lindgren
- *
- * 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; under version 3 of the License.
- *
- * 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>.
- *
- * The Audacious team does not consider modular code linking to
- * Audacious or using our public API to be a derived work.
- */
-
-#ifndef SKINS_UI_SKINNED_NUMBER_H
-#define SKINS_UI_SKINNED_NUMBER_H
-
-#include <gtk/gtk.h>
-
-GtkWidget * ui_skinned_number_new ();
-void ui_skinned_number_set (GtkWidget * widget, char c);
-void ui_skinned_number_set_size(GtkWidget *widget, int width, int height);
-
-#endif

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/ui_skinned_playlist.cc Deleted

@@ -1,945 +0,0 @@
-/*
- * Audacious - a cross-platform multimedia player
- * Copyright (c) 2007 Tomasz Moń
- * Copyright (c) 2008 William Pitcock
- * Copyright (c) 2009-2011 John Lindgren
- *
- * Based on:
- * BMP - Cross-platform multimedia player
- * Copyright (C) 2003-2004 BMP development team.
- *
- * XMMS:
- * Copyright (C) 1998-2003 XMMS development team.
- *
- * 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; under version 3 of the License.
- *
- * 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>.
- *
- * The Audacious team does not consider modular code linking to
- * Audacious or using our public API to be a derived work.
- */
-
-#include <gdk/gdkkeysyms.h>
-
-#include "draw-compat.h"
-#include "menus.h"
-#include "skins_cfg.h"
-#include "ui_playlist.h"
-#include "ui_skin.h"
-#include "ui_skinned_playlist.h"
-#include "ui_skinned_playlist_slider.h"
-
-#include <libaudcore/audstrings.h>
-#include <libaudcore/runtime.h>
-#include <libaudcore/playlist.h>
-#include <libaudgui/libaudgui.h>
-
-enum {DRAG_SELECT = 1, DRAG_MOVE};
-
-typedef struct {
- GtkWidget * slider;
- PangoFontDescription * font;
- int width, height, row_height, offset, rows, first, scroll, scroll_source,
- hover, drag;
- int popup_pos, popup_source;
- gboolean popup_shown;
-} PlaylistData;
-
-static gboolean playlist_button_press (GtkWidget * list, GdkEventButton * event);
-static gboolean playlist_button_release (GtkWidget * list, GdkEventButton *
- event);
-static gboolean playlist_motion (GtkWidget * list, GdkEventMotion * event);
-static gboolean playlist_leave (GtkWidget * list, GdkEventCrossing * event);
-
-static void popup_trigger (GtkWidget * list, PlaylistData * data, int pos);
-static void popup_hide (GtkWidget * list, PlaylistData * data);
-
-static void calc_layout (PlaylistData * data)
-{
- data->rows = data->height / data->row_height;
-
- if (data->rows && active_title)
- {
- data->offset = data->row_height;
- data->rows --;
- }
- else
- data->offset = 0;
-
- if (data->first + data->rows > active_length)
- data->first = active_length - data->rows;
- if (data->first < 0)
- data->first = 0;
-}
-
-static int calc_position (PlaylistData * data, int y)
-{
- if (y < data->offset)
- return -1;
-
- int position = data->first + (y - data->offset) / data->row_height;
-
- if (position >= data->first + data->rows || position >= active_length)
- return active_length;
-
- return position;
-}
-
-static int adjust_position (PlaylistData * data, gboolean relative, int
- position)
-{
- if (active_length == 0)
- return -1;
-
- if (relative)
- {
- int focus = aud_playlist_get_focus (active_playlist);
- if (focus == -1)
- return 0;
-
- position += focus;
- }
-
- if (position < 0)
- return 0;
- if (position >= active_length)
- return active_length - 1;
-
- return position;
-}
-
-static void cancel_all (GtkWidget * list, PlaylistData * data)
-{
- data->drag = FALSE;
-
- if (data->scroll)
- {
- data->scroll = 0;
- g_source_remove (data->scroll_source);
- }
-
- if (data->hover != -1)
- {
- data->hover = -1;
- gtk_widget_queue_draw (list);
- }
-
- popup_hide (list, data);
-}
-
-DRAW_FUNC_BEGIN (playlist_draw)
- PlaylistData * data = (PlaylistData *) g_object_get_data ((GObject *) wid, "playlistdata");
- g_return_val_if_fail (data, FALSE);
-
- int active_entry = aud_playlist_get_position (active_playlist);
- int left = 3, right = 3;
- PangoLayout * layout;
- int width;
-
- /* background */
-
- set_cairo_color (cr, active_skin->colorsSKIN_PLEDIT_NORMALBG);
- cairo_paint (cr);
-
- /* playlist title */
-
- if (data->offset)
- {
- layout = gtk_widget_create_pango_layout (wid, active_title);
- pango_layout_set_font_description (layout, data->font);
- pango_layout_set_width (layout, PANGO_SCALE * (data->width - left -
- right));
- pango_layout_set_alignment (layout, PANGO_ALIGN_CENTER);
- pango_layout_set_ellipsize (layout, PANGO_ELLIPSIZE_MIDDLE);
-
- cairo_move_to (cr, left, 0);
- set_cairo_color (cr, active_skin->colorsSKIN_PLEDIT_NORMAL);
- pango_cairo_show_layout (cr, layout);
- g_object_unref (layout);
- }
-
- /* selection highlight */
-
- for (int i = data->first; i < data->first + data->rows && i <
- active_length; i ++)
- {
- if (! aud_playlist_entry_get_selected (active_playlist, i))
- continue;
-
- cairo_rectangle (cr, 0, data->offset + data->row_height * (i -
- data->first), data->width, data->row_height);
- set_cairo_color (cr, active_skin->colorsSKIN_PLEDIT_SELECTEDBG);
- cairo_fill (cr);
- }
-
- /* entry numbers */
-
- if (aud_get_bool (nullptr, "show_numbers_in_pl"))
- {
- width = 0;
-
- for (int i = data->first; i < data->first + data->rows && i <
- active_length; i ++)
- {
- char buf16;
- snprintf (buf, sizeof buf, "%d.", 1 + i);
-
- layout = gtk_widget_create_pango_layout (wid, buf);
- pango_layout_set_font_description (layout, data->font);
-
- PangoRectangle rect;
- pango_layout_get_pixel_extents (layout, nullptr, & rect);
- width = aud::max (width, rect.width);
-
- cairo_move_to (cr, left, data->offset + data->row_height * (i -
- data->first));
- set_cairo_color (cr, active_skin->colors(i == active_entry) ?
- SKIN_PLEDIT_CURRENT : SKIN_PLEDIT_NORMAL);
- pango_cairo_show_layout (cr, layout);
- g_object_unref (layout);
- }
-
- left += width + 4;
- }
-
- /* entry lengths */
-
- width = 0;
-
- for (int i = data->first; i < data->first + data->rows && i <
- active_length; i ++)
- {
- Tuple tuple = aud_playlist_entry_get_tuple (active_playlist, i, Playlist::Guess);
- int len = tuple.get_int (Tuple::Length);
- if (len < 0)
- continue;
-
- layout = gtk_widget_create_pango_layout (wid, str_format_time (len));
- pango_layout_set_font_description (layout, data->font);
-
- PangoRectangle rect;
- pango_layout_get_pixel_extents (layout, nullptr, & rect);
- width = aud::max (width, rect.width);
-
- cairo_move_to (cr, data->width - right - rect.width, data->offset +
- data->row_height * (i - data->first));
- set_cairo_color (cr, active_skin->colors(i == active_entry) ?
- SKIN_PLEDIT_CURRENT : SKIN_PLEDIT_NORMAL);
- pango_cairo_show_layout (cr, layout);
- g_object_unref (layout);
- }
-
- right += width + 6;
-
- /* queue positions */
-
- if (aud_playlist_queue_count (active_playlist))
- {
- width = 0;
-
- for (int i = data->first; i < data->first + data->rows && i <
- active_length; i ++)
- {
- int pos = aud_playlist_queue_find_entry (active_playlist, i);
- if (pos < 0)
- continue;
-
- char buf16;
- snprintf (buf, sizeof buf, "(#%d)", 1 + pos);
-
- layout = gtk_widget_create_pango_layout (wid, buf);
- pango_layout_set_font_description (layout, data->font);
-
- PangoRectangle rect;
- pango_layout_get_pixel_extents (layout, nullptr, & rect);
- width = aud::max (width, rect.width);
-
- cairo_move_to (cr, data->width - right - rect.width, data->offset +
- data->row_height * (i - data->first));
- set_cairo_color (cr, active_skin->colors(i == active_entry) ?
- SKIN_PLEDIT_CURRENT : SKIN_PLEDIT_NORMAL);
- pango_cairo_show_layout (cr, layout);
- g_object_unref (layout);
- }
-
- right += width + 6;
- }
-
- /* titles */
-
- for (int i = data->first; i < data->first + data->rows && i <
- active_length; i ++)
- {
- Tuple tuple = aud_playlist_entry_get_tuple (active_playlist, i, Playlist::Guess);
- String title = tuple.get_str (Tuple::FormattedTitle);
-
- layout = gtk_widget_create_pango_layout (wid, title);
- pango_layout_set_font_description (layout, data->font);
- pango_layout_set_width (layout, PANGO_SCALE * (data->width - left -
- right));
- pango_layout_set_ellipsize (layout, PANGO_ELLIPSIZE_END);
-
- cairo_move_to (cr, left, data->offset + data->row_height * (i -
- data->first));
- set_cairo_color (cr, active_skin->colors(i == active_entry) ?
- SKIN_PLEDIT_CURRENT : SKIN_PLEDIT_NORMAL);
- pango_cairo_show_layout (cr, layout);
- g_object_unref (layout);
- }
-
- /* focus rectangle */
-
- int 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 * (focus -
- data->first) + 0.5, data->width - 1, data->row_height - 1);
- set_cairo_color (cr, active_skin->colorsSKIN_PLEDIT_NORMAL);
- cairo_stroke (cr);
- }
-
- /* hover line */
-
- if (data->hover >= data->first && data->hover <= data->first + data->rows)
- {
- cairo_new_path (cr);
- cairo_set_line_width (cr, 2);
- cairo_move_to (cr, 0, data->offset + data->row_height * (data->hover -
- data->first));
- cairo_rel_line_to (cr, data->width, 0);
- set_cairo_color (cr, active_skin->colorsSKIN_PLEDIT_NORMAL);
- cairo_stroke (cr);
- }
-DRAW_FUNC_END
-
-static void playlist_destroy (GtkWidget * list)
-{
- PlaylistData * data = (PlaylistData *) g_object_get_data ((GObject *) list, "playlistdata");
- g_return_if_fail (data);
-
- cancel_all (list, data);
-
- pango_font_description_free (data->font);
- g_free (data);
-}
-
-GtkWidget * ui_skinned_playlist_new (int width, int height, const char * font)
-{
- GtkWidget * list = gtk_drawing_area_new ();
- gtk_widget_set_size_request (list, width * config.scale, height * config.scale);
- gtk_widget_add_events (list, GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
- | GDK_LEAVE_NOTIFY_MASK | GDK_POINTER_MOTION_MASK);
-
- DRAW_CONNECT (list, playlist_draw);
- g_signal_connect (list, "button-press-event", (GCallback)
- playlist_button_press, nullptr);
- g_signal_connect (list, "button-release-event", (GCallback)
- playlist_button_release, nullptr);
- g_signal_connect (list, "leave-notify-event", (GCallback) playlist_leave,
- nullptr);
- g_signal_connect (list, "motion-notify-event", (GCallback) playlist_motion,
- nullptr);
- g_signal_connect (list, "destroy", (GCallback) playlist_destroy, nullptr);
-
- PlaylistData * data = g_new0 (PlaylistData, 1);
- data->width = width * config.scale;
- data->height = height * config.scale;
- data->hover = -1;
- data->popup_pos = -1;
- g_object_set_data ((GObject *) list, "playlistdata", data);
-
- ui_skinned_playlist_set_font (list, font);
-
- return list;
-}
-
-void ui_skinned_playlist_set_slider (GtkWidget * list, GtkWidget * slider)
-{
- PlaylistData * data = (PlaylistData *) g_object_get_data ((GObject *) list, "playlistdata");
- g_return_if_fail (data);
-
- data->slider = slider;
-}
-
-void ui_skinned_playlist_resize (GtkWidget * list, int width, int height)
-{
- PlaylistData * data = (PlaylistData *) g_object_get_data ((GObject *) list, "playlistdata");
- g_return_if_fail (data);
-
- gtk_widget_set_size_request (list, width * config.scale, height * config.scale);
-
- data->width = width * config.scale;
- data->height = height * config.scale;
-
- calc_layout (data);
- gtk_widget_queue_draw (list);
-
- if (data->slider)
- ui_skinned_playlist_slider_update (data->slider);
-}
-
-void ui_skinned_playlist_set_font (GtkWidget * list, const char * font)
-{
- PlaylistData * data = (PlaylistData *) g_object_get_data ((GObject *) list, "playlistdata");
- g_return_if_fail (data);
-
- pango_font_description_free (data->font);
- data->font = pango_font_description_from_string (font);
-
- PangoLayout * layout = gtk_widget_create_pango_layout (list, "A");
- pango_layout_set_font_description (layout, data->font);
-
- PangoRectangle rect;
- pango_layout_get_pixel_extents (layout, nullptr, & rect);
-
- /* make sure row_height is non-zero; we divide by it */
- data->row_height = aud::max (rect.height, 1);
-
- g_object_unref (layout);
-
- calc_layout (data);
- gtk_widget_queue_draw (list);
-
- if (data->slider)
- ui_skinned_playlist_slider_update (data->slider);
-}
-
-void ui_skinned_playlist_update (GtkWidget * list)
-{
- PlaylistData * data = (PlaylistData *) g_object_get_data ((GObject *) list, "playlistdata");
- g_return_if_fail (data);
-
- calc_layout (data);
-
- gtk_widget_queue_draw (list);
-
- if (data->slider != nullptr)
- ui_skinned_playlist_slider_update (data->slider);
-}
-
-static void scroll_to (PlaylistData * data, int position)
-{
- if (position < data->first || position >= data->first + data->rows)
- data->first = position - data->rows / 2;
-
- calc_layout (data);
-}
-
-static void select_single (PlaylistData * data, gboolean relative, int position)
-{
- position = adjust_position (data, relative, position);
-
- if (position == -1)
- return;
-
- aud_playlist_select_all (active_playlist, FALSE);
- aud_playlist_entry_set_selected (active_playlist, position, TRUE);
- aud_playlist_set_focus (active_playlist, position);
- scroll_to (data, position);
-}
-
-static void select_extend (PlaylistData * data, gboolean relative, int position)
-{
- position = adjust_position (data, relative, position);
-
- if (position == -1)
- return;
-
- int count = adjust_position (data, TRUE, 0);
- int sign = (position > count) ? 1 : -1;
-
- for (; count != position; count += sign)
- aud_playlist_entry_set_selected (active_playlist, count,
- ! aud_playlist_entry_get_selected (active_playlist, count + sign));
-
- aud_playlist_entry_set_selected (active_playlist, position, TRUE);
- aud_playlist_set_focus (active_playlist, position);
- scroll_to (data, position);
-}
-
-static void select_slide (PlaylistData * data, gboolean relative, int position)
-{
- position = adjust_position (data, relative, position);
-
- if (position == -1)
- return;
-
- aud_playlist_set_focus (active_playlist, position);
- scroll_to (data, position);
-}
-
-static void select_toggle (PlaylistData * data, gboolean relative, int position)
-{
- position = adjust_position (data, relative, position);
-
- if (position == -1)
- return;
-
- aud_playlist_entry_set_selected (active_playlist, position,
- ! aud_playlist_entry_get_selected (active_playlist, position));
- aud_playlist_set_focus (active_playlist, position);
- scroll_to (data, position);
-}
-
-static void select_move (PlaylistData * data, gboolean relative, int position)
-{
- int focus = aud_playlist_get_focus (active_playlist);
- position = adjust_position (data, relative, position);
-
- if (focus == -1 || position == -1 || position == focus)
- return;
-
- focus += aud_playlist_shift (active_playlist, focus, position - focus);
- scroll_to (data, focus);
-}
-
-static void delete_selected (PlaylistData * data)
-{
- aud_playlist_delete_selected (active_playlist);
-
- active_length = aud_playlist_entry_count (active_playlist);
- int focus = aud_playlist_get_focus (active_playlist);
-
- 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)
-{
- PlaylistData * data = (PlaylistData *) g_object_get_data ((GObject *) list, "playlistdata");
- g_return_val_if_fail (data, FALSE);
-
- cancel_all (list, data);
-
- switch (event->state & (GDK_SHIFT_MASK | GDK_CONTROL_MASK | GDK_MOD1_MASK))
- {
- case 0:
- switch (event->keyval)
- {
- case GDK_KEY_Up:
- select_single (data, TRUE, -1);
- break;
- case GDK_KEY_Down:
- select_single (data, TRUE, 1);
- break;
- case GDK_KEY_Page_Up:
- select_single (data, TRUE, - data->rows);
- break;
- case GDK_KEY_Page_Down:
- select_single (data, TRUE, data->rows);
- break;
- case GDK_KEY_Home:
- select_single (data, FALSE, 0);
- break;
- case GDK_KEY_End:
- select_single (data, FALSE, active_length - 1);
- break;
- case GDK_KEY_Return:
- select_single (data, TRUE, 0);
- aud_playlist_set_position (active_playlist,
- aud_playlist_get_focus (active_playlist));
- aud_playlist_play (active_playlist);
- break;
- case GDK_KEY_Escape:
- select_single (data, FALSE, aud_playlist_get_position
- (active_playlist));
- break;
- case GDK_KEY_Delete:
- delete_selected (data);
- break;
- default:
- return FALSE;
- }
- break;
- case GDK_SHIFT_MASK:
- switch (event->keyval)
- {
- case GDK_KEY_Up:
- select_extend (data, TRUE, -1);
- break;
- case GDK_KEY_Down:
- select_extend (data, TRUE, 1);
- break;
- case GDK_KEY_Page_Up:
- select_extend (data, TRUE, -data->rows);
- break;
- case GDK_KEY_Page_Down:
- select_extend (data, TRUE, data->rows);
- break;
- case GDK_KEY_Home:
- select_extend (data, FALSE, 0);
- break;
- case GDK_KEY_End:
- select_extend (data, FALSE, active_length - 1);
- break;
- default:
- return FALSE;
- }
- break;
- case GDK_CONTROL_MASK:
- switch (event->keyval)
- {
- case GDK_KEY_space:
- select_toggle (data, TRUE, 0);
- break;
- case GDK_KEY_Up:
- select_slide (data, TRUE, -1);
- break;
- case GDK_KEY_Down:
- select_slide (data, TRUE, 1);
- break;
- case GDK_KEY_Page_Up:
- select_slide (data, TRUE, -data->rows);
- break;
- case GDK_KEY_Page_Down:
- select_slide (data, TRUE, data->rows);
- break;
- case GDK_KEY_Home:
- select_slide (data, FALSE, 0);
- break;
- case GDK_KEY_End:
- select_slide (data, FALSE, active_length - 1);
- break;
- default:
- return FALSE;
- }
- break;
- case GDK_MOD1_MASK:
- switch (event->keyval)
- {
- case GDK_KEY_Up:
- select_move (data, TRUE, -1);
- break;
- case GDK_KEY_Down:
- select_move (data, TRUE, 1);
- break;
- case GDK_KEY_Page_Up:
- select_move (data, TRUE, -data->rows);
- break;
- case GDK_KEY_Page_Down:
- select_move (data, TRUE, data->rows);
- break;
- case GDK_KEY_Home:
- select_move (data, FALSE, 0);
- break;
- case GDK_KEY_End:
- select_move (data, FALSE, active_length - 1);
- break;
- default:
- return FALSE;
- }
- break;
- default:
- return FALSE;
- }
-
- playlistwin_update ();
- return TRUE;
-}
-
-void ui_skinned_playlist_row_info (GtkWidget * list, int * rows, int * first)
-{
- PlaylistData * data = (PlaylistData *) g_object_get_data ((GObject *) list, "playlistdata");
- g_return_if_fail (data);
-
- * rows = data->rows;
- * first = data->first;
-}
-
-void ui_skinned_playlist_scroll_to (GtkWidget * list, int row)
-{
- PlaylistData * data = (PlaylistData *) g_object_get_data ((GObject *) list, "playlistdata");
- g_return_if_fail (data);
-
- cancel_all (list, data);
- data->first = row;
- calc_layout (data);
-
- gtk_widget_queue_draw (list);
-
- if (data->slider)
- ui_skinned_playlist_slider_update (data->slider);
-}
-
-void ui_skinned_playlist_set_focused (GtkWidget * list, int row)
-{
- PlaylistData * data = (PlaylistData *) g_object_get_data ((GObject *) list, "playlistdata");
- g_return_if_fail (data);
-
- cancel_all (list, data);
- aud_playlist_set_focus (active_playlist, row);
- scroll_to (data, row);
-
- gtk_widget_queue_draw (list);
-}
-
-void ui_skinned_playlist_hover (GtkWidget * list, int x, int y)
-{
- PlaylistData * data = (PlaylistData *) g_object_get_data ((GObject *) list, "playlistdata");
- g_return_if_fail (data);
-
- int row;
-
- if (y < data->offset)
- row = data->first;
- else if (y > data->offset + data->row_height * data->rows)
- row = data->first + data->rows;
- else
- row = data->first + (y - data->offset + data->row_height / 2) /
- data->row_height;
-
- if (row > active_length)
- row = active_length;
-
- if (row != data->hover)
- {
- data->hover = row;
- gtk_widget_queue_draw (list);
- }
-}
-
-int ui_skinned_playlist_hover_end (GtkWidget * list)
-{
- PlaylistData * data = (PlaylistData *) g_object_get_data ((GObject *) list, "playlistdata");
- g_return_val_if_fail (data, -1);
-
- int temp = data->hover;
- data->hover = -1;
-
- gtk_widget_queue_draw (list);
- return temp;
-}
-
-static gboolean playlist_button_press (GtkWidget * list, GdkEventButton * event)
-{
- PlaylistData * data = (PlaylistData *) g_object_get_data ((GObject *) list, "playlistdata");
- g_return_val_if_fail (data, FALSE);
-
- int position = calc_position (data, event->y);
- int state = event->state & (GDK_SHIFT_MASK | GDK_CONTROL_MASK |
- GDK_MOD1_MASK);
-
- cancel_all (list, data);
-
- switch (event->type)
- {
- case GDK_BUTTON_PRESS:
- switch (event->button)
- {
- case 1:
- if (position == -1 || position == active_length)
- return TRUE;
-
- switch (state)
- {
- case 0:
- if (aud_playlist_entry_get_selected (active_playlist, position))
- select_slide (data, FALSE, position);
- else
- select_single (data, FALSE, position);
-
- data->drag = DRAG_MOVE;
- break;
- case GDK_SHIFT_MASK:
- select_extend (data, FALSE, position);
- data->drag = DRAG_SELECT;
- break;
- case GDK_CONTROL_MASK:
- select_toggle (data, FALSE, position);
- data->drag = DRAG_SELECT;
- break;
- default:
- return TRUE;
- }
-
- break;
- case 3:
- if (state)
- return TRUE;
-
- if (position != -1 && position != active_length)
- {
- if (aud_playlist_entry_get_selected (active_playlist, position))
- select_slide (data, FALSE, position);
- else
- select_single (data, FALSE, position);
- }
-
- menu_popup ((position == -1) ? UI_MENU_PLAYLIST :
- UI_MENU_PLAYLIST_CONTEXT, event->x_root, event->y_root, FALSE,
- FALSE, 3, event->time);
- break;
- default:
- return FALSE;
- }
-
- break;
- case GDK_2BUTTON_PRESS:
- if (event->button != 1 || state || position == active_length)
- return TRUE;
-
- if (position != -1)
- aud_playlist_set_position (active_playlist, position);
-
- aud_playlist_play (active_playlist);
- break;
- default:
- return TRUE;
- }
-
- playlistwin_update ();
- return TRUE;
-}
-
-static gboolean playlist_button_release (GtkWidget * list, GdkEventButton *
- event)
-{
- PlaylistData * data = (PlaylistData *) g_object_get_data ((GObject *) list, "playlistdata");
- g_return_val_if_fail (data, FALSE);
-
- cancel_all (list, data);
- return TRUE;
-}
-
-static gboolean scroll_cb (void * data_)
-{
- auto data = (PlaylistData *) data_;
- int position = adjust_position (data, TRUE, data->scroll);
-
- if (position == -1)
- return G_SOURCE_CONTINUE;
-
- switch (data->drag)
- {
- case DRAG_SELECT:
- select_extend (data, FALSE, position);
- break;
- case DRAG_MOVE:
- select_move (data, FALSE, position);
- break;
- }
-
- playlistwin_update ();
- return G_SOURCE_CONTINUE;
-}
-
-static gboolean playlist_motion (GtkWidget * list, GdkEventMotion * event)
-{
- PlaylistData * data = (PlaylistData *) g_object_get_data ((GObject *) list, "playlistdata");
- g_return_val_if_fail (data, FALSE);
-
- int position = calc_position (data, event->y);
- int new_scroll;
-
- if (data->drag)
- {
- if (position == -1 || position == active_length)
- {
- new_scroll = (position == -1 ? -1 : 1);
-
- if (data->scroll != new_scroll)
- {
- if (data->scroll)
- g_source_remove (data->scroll_source);
-
- data->scroll = new_scroll;
- data->scroll_source = g_timeout_add (100, scroll_cb, data);
- }
- }
- else
- {
- if (data->scroll)
- {
- data->scroll = 0;
- g_source_remove (data->scroll_source);
- }
-
- switch (data->drag)
- {
- case DRAG_SELECT:
- select_extend (data, FALSE, position);
- break;
- case DRAG_MOVE:
- select_move (data, FALSE, position);
- break;
- }
-
- playlistwin_update ();
- }
- }
- else
- {
- if (position == -1 || position == active_length)
- cancel_all (list, data);
- else if (aud_get_bool (nullptr, "show_filepopup_for_tuple") && data->popup_pos != position)
- {
- cancel_all (list, data);
- popup_trigger (list, data, position);
- }
- }
-
- return TRUE;
-}
-
-static gboolean playlist_leave (GtkWidget * list, GdkEventCrossing * event)
-{
- PlaylistData * data = (PlaylistData *) g_object_get_data ((GObject *) list, "playlistdata");
- g_return_val_if_fail (data, FALSE);
-
- if (! data->drag)
- cancel_all (list, data);
-
- return TRUE;
-}
-
-static gboolean popup_show (void * list)
-{
- PlaylistData * data = (PlaylistData *) g_object_get_data ((GObject *) list, "playlistdata");
- g_return_val_if_fail (data, FALSE);
-
- audgui_infopopup_show (active_playlist, data->popup_pos);
- data->popup_shown = TRUE;
-
- g_source_remove (data->popup_source);
- data->popup_source = 0;
- return G_SOURCE_REMOVE;
-}
-
-static void popup_trigger (GtkWidget * list, PlaylistData * data, int pos)
-{
- popup_hide (list, data);
-
- data->popup_pos = pos;
- data->popup_source = g_timeout_add (aud_get_int (nullptr, "filepopup_delay") *
- 100, popup_show, list);
-}
-
-static void popup_hide (GtkWidget * list, PlaylistData * data)
-{
- if (data->popup_source)
- {
- g_source_remove (data->popup_source);
- data->popup_source = 0;
- }
-
- if (data->popup_shown)
- {
- audgui_infopopup_hide ();
- data->popup_shown = FALSE;
- }
-
- data->popup_pos = -1;
-}

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/ui_skinned_playlist.h Deleted

@@ -1,45 +0,0 @@
-/*
- * Audacious - a cross-platform multimedia player
- * Copyright (c) 2007 Tomasz Moń
- * Copyright (c) 2009-2011 John Lindgren
- *
- * Based on:
- * BMP - Cross-platform multimedia player
- * Copyright (C) 2003-2004 BMP development team.
- * XMMS:
- * Copyright (C) 1998-2003 XMMS development team.
- *
- * 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; under version 3 of the License.
- *
- * 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>.
- *
- * The Audacious team does not consider modular code linking to
- * Audacious or using our public API to be a derived work.
- */
-
-#ifndef SKINS_UI_SKINNED_PLAYLIST_H
-#define SKINS_UI_SKINNED_PLAYLIST_H
-
-#include <gtk/gtk.h>
-
-GtkWidget * ui_skinned_playlist_new (int width, int height, const char * font);
-void ui_skinned_playlist_set_slider (GtkWidget * list, GtkWidget * slider);
-void ui_skinned_playlist_resize (GtkWidget * list, int w, int h);
-void ui_skinned_playlist_set_font (GtkWidget * list, const char * font);
-void ui_skinned_playlist_update (GtkWidget * list);
-gboolean ui_skinned_playlist_key (GtkWidget * list, GdkEventKey * event);
-void ui_skinned_playlist_row_info (GtkWidget * list, int * rows, int * first);
-void ui_skinned_playlist_scroll_to (GtkWidget * list, int row);
-void ui_skinned_playlist_set_focused (GtkWidget * list, int row);
-void ui_skinned_playlist_hover (GtkWidget * list, int x, int y);
-int ui_skinned_playlist_hover_end (GtkWidget * list);
-
-#endif

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/ui_skinned_playlist_slider.cc Deleted

@@ -1,144 +0,0 @@
-/*
- * Audacious - a cross-platform multimedia player
- * Copyright (c) 2007 Tomasz Moń
- * Copyright (c) 2011 John Lindgren
- *
- * Based on:
- * BMP - Cross-platform multimedia player
- * Copyright (C) 2003-2004 BMP development team.
- * XMMS:
- * Copyright (C) 1998-2003 XMMS development team.
- *
- * 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; under version 3 of the License.
- *
- * 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>.
- *
- * The Audacious team does not consider modular code linking to
- * Audacious or using our public API to be a derived work.
- */
-
-#include <libaudcore/objects.h>
-
-#include "draw-compat.h"
-#include "skins_cfg.h"
-#include "ui_playlist.h"
-#include "ui_skin.h"
-#include "ui_skinned_playlist.h"
-#include "ui_skinned_playlist_slider.h"
-
-static GtkWidget * pl_slider_list;
-static int pl_slider_height;
-static gboolean pl_slider_pressed;
-
-DRAW_FUNC_BEGIN (pl_slider_draw)
- int rows, first;
- ui_skinned_playlist_row_info (pl_slider_list, & rows, & first);
-
- int range = active_length - rows;
-
- int y;
- if (active_length > rows)
- y = (first * (pl_slider_height - 19) + range / 2) / range;
- else
- y = 0;
-
- for (int i = 0; i < pl_slider_height / 29; i ++)
- skin_draw_pixbuf (cr, SKIN_PLEDIT, 36, 42, 0, 29 * i, 8, 29);
-
- skin_draw_pixbuf (cr, SKIN_PLEDIT, pl_slider_pressed ? 61 : 52, 53, 0, y, 8,
- 18);
-DRAW_FUNC_END
-
-static void pl_slider_set_pos (int y)
-{
- y = aud::clamp (y, 0, pl_slider_height - 19);
-
- int rows, first;
- ui_skinned_playlist_row_info (pl_slider_list, & rows, & first);
-
- int range = pl_slider_height - 19;
-
- ui_skinned_playlist_scroll_to (pl_slider_list, (y * (active_length - rows) +
- range / 2) / range);
-}
-
-static gboolean pl_slider_button_press (GtkWidget * slider, GdkEventButton *
- event)
-{
- if (event->button != 1)
- return FALSE;
-
- pl_slider_pressed = TRUE;
- pl_slider_set_pos (event->y / config.scale - 9);
-
- gtk_widget_queue_draw (slider);
- return TRUE;
-}
-
-static gboolean pl_slider_button_release (GtkWidget * slider, GdkEventButton *
- event)
-{
- if (event->button != 1)
- return FALSE;
-
- if (! pl_slider_pressed)
- return TRUE;
-
- pl_slider_pressed = FALSE;
- pl_slider_set_pos (event->y / config.scale - 9);
-
- gtk_widget_queue_draw (slider);
- return TRUE;
-}
-
-static gboolean pl_slider_motion (GtkWidget * slider, GdkEventMotion * event)
-{
- if (! pl_slider_pressed)
- return TRUE;
-
- pl_slider_set_pos (event->y / config.scale - 9);
-
- gtk_widget_queue_draw (slider);
- return TRUE;
-}
-
-GtkWidget * ui_skinned_playlist_slider_new (GtkWidget * list, int height)
-{
- GtkWidget * slider = gtk_drawing_area_new ();
- gtk_widget_set_size_request (slider, 8 * config.scale, height * config.scale);
- gtk_widget_add_events (slider, GDK_BUTTON_PRESS_MASK |
- GDK_BUTTON_RELEASE_MASK | GDK_POINTER_MOTION_MASK);
-
- pl_slider_list = list;
- pl_slider_height = height;
-
- DRAW_CONNECT (slider, pl_slider_draw);
- g_signal_connect (slider, "button-press-event", (GCallback)
- pl_slider_button_press, nullptr);
- g_signal_connect (slider, "button-release-event", (GCallback)
- pl_slider_button_release, nullptr);
- g_signal_connect (slider, "motion-notify-event", (GCallback)
- pl_slider_motion, nullptr);
-
- return slider;
-}
-
-void ui_skinned_playlist_slider_resize (GtkWidget * slider, int height)
-{
- pl_slider_height = height;
- gtk_widget_set_size_request (slider, 8 * config.scale, height * config.scale);
- gtk_widget_queue_draw (slider);
-}
-
-void ui_skinned_playlist_slider_update (GtkWidget * slider)
-{
- gtk_widget_queue_draw (slider);
-}

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/ui_skinned_playlist_slider.h Deleted

@@ -1,37 +0,0 @@
-/*
- * Audacious - a cross-platform multimedia player
- * Copyright (c) 2007 Tomasz Moń
- * Copyright (c) 2011 John Lindgren
- *
- * Based on:
- * BMP - Cross-platform multimedia player
- * Copyright (C) 2003-2004 BMP development team.
- * XMMS:
- * Copyright (C) 1998-2003 XMMS development team.
- *
- * 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; under version 3 of the License.
- *
- * 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>.
- *
- * The Audacious team does not consider modular code linking to
- * Audacious or using our public API to be a derived work.
- */
-
-#ifndef SKINS_UI_SKINNED_PLAYLIST_SLIDER_H
-#define SKINS_UI_SKINNED_PLAYLIST_SLIDER_H
-
-#include <gtk/gtk.h>
-
-GtkWidget * ui_skinned_playlist_slider_new (GtkWidget * list, int height);
-void ui_skinned_playlist_slider_resize (GtkWidget * slider, int height);
-void ui_skinned_playlist_slider_update (GtkWidget * slider);
-
-#endif

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/ui_skinned_playstatus.cc Deleted

@@ -1,82 +0,0 @@
-/*
- * Audacious - a cross-platform multimedia player
- * Copyright (c) 2007 Tomasz Moń
- * Copyright (c) 2011 John Lindgren
- *
- * Based on:
- * BMP - Cross-platform multimedia player
- * Copyright (C) 2003-2004 BMP development team.
- * XMMS:
- * Copyright (C) 1998-2003 XMMS development team.
- *
- * 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; under version 3 of the License.
- *
- * 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>.
- *
- * The Audacious team does not consider modular code linking to
- * Audacious or using our public API to be a derived work.
- */
-
-#include "draw-compat.h"
-#include "skins_cfg.h"
-#include "ui_skin.h"
-#include "ui_skinned_playstatus.h"
-
-static int playstatus_width, playstatus_height;
-static PStatus playstatus_status;
-
-DRAW_FUNC_BEGIN (playstatus_draw)
- if (! playstatus_width || ! playstatus_height)
- goto DONE;
-
- if (playstatus_status == STATUS_PLAY)
- skin_draw_pixbuf (cr, SKIN_PLAYPAUSE, 36, 0, 0, 0, 3, playstatus_height);
- else
- skin_draw_pixbuf (cr, SKIN_PLAYPAUSE, 27, 0, 0, 0, 2, playstatus_height);
-
- switch (playstatus_status)
- {
- case STATUS_STOP:
- skin_draw_pixbuf (cr, SKIN_PLAYPAUSE, 18, 0, 2, 0, 9, playstatus_height);
- break;
- case STATUS_PAUSE:
- skin_draw_pixbuf (cr, SKIN_PLAYPAUSE, 9, 0, 2, 0, 9, playstatus_height);
- break;
- case STATUS_PLAY:
- skin_draw_pixbuf (cr, SKIN_PLAYPAUSE, 1, 0, 3, 0, 8, playstatus_height);
- break;
- }
-
-DONE:
-DRAW_FUNC_END
-
-GtkWidget * ui_skinned_playstatus_new (void)
-{
- GtkWidget * playstatus = gtk_drawing_area_new ();
- DRAW_CONNECT (playstatus, playstatus_draw);
- return playstatus;
-}
-
-void ui_skinned_playstatus_set_status (GtkWidget * playstatus, PStatus status)
-{
- playstatus_status = status;
- gtk_widget_queue_draw (playstatus);
-}
-
-void ui_skinned_playstatus_set_size (GtkWidget * playstatus, int width, int
- height)
-{
- playstatus_width = width;
- playstatus_height = height;
-
- gtk_widget_set_size_request (playstatus, width * config.scale, height * config.scale);
- gtk_widget_queue_draw (playstatus);
-}

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/ui_skinned_playstatus.h Deleted

@@ -1,41 +0,0 @@
-/*
- * Audacious - a cross-platform multimedia player
- * Copyright (c) 2007 Tomasz Moń
- * Copyright (c) 2011 John Lindgren
- *
- * Based on:
- * BMP - Cross-platform multimedia player
- * Copyright (C) 2003-2004 BMP development team.
- * XMMS:
- * Copyright (C) 1998-2003 XMMS development team.
- *
- * 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; under version 3 of the License.
- *
- * 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>.
- *
- * The Audacious team does not consider modular code linking to
- * Audacious or using our public API to be a derived work.
- */
-
-#ifndef SKINS_UI_SKINNED_PLAYSTATUS_H
-#define SKINS_UI_SKINNED_PLAYSTATUS_H
-
-#include <gtk/gtk.h>
-
-typedef enum {
- STATUS_STOP, STATUS_PAUSE, STATUS_PLAY
-} PStatus;
-
-GtkWidget * ui_skinned_playstatus_new (void);
-void ui_skinned_playstatus_set_status(GtkWidget *widget, PStatus status);
-void ui_skinned_playstatus_set_size(GtkWidget *widget, int width, int height);
-
-#endif

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/ui_skinned_textbox.cc Deleted

@@ -1,412 +0,0 @@
-/*
- * Audacious - a cross-platform multimedia player
- * Copyright (c) 2007 Tomasz Moń
- * Copyright (c) 2011 John Lindgren
- *
- * Based on:
- * BMP - Cross-platform multimedia player
- * Copyright (C) 2003-2004 BMP development team.
- * XMMS:
- * Copyright (C) 1998-2003 XMMS development team.
- *
- * 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; under version 3 of the License.
- *
- * 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>.
- *
- * The Audacious team does not consider modular code linking to
- * Audacious or using our public API to be a derived work.
- */
-
-#include <string.h>
-#include <libaudcore/objects.h>
-
-#include "draw-compat.h"
-#include "skins_cfg.h"
-#include "ui_skin.h"
-#include "ui_skinned_textbox.h"
-
-#define TIMEOUT 30
-#define DELAY 50
-
-typedef struct {
- int width;
- char * text;
- PangoFontDescription * font;
- cairo_surface_t * buf;
- int buf_width;
- bool may_scroll, two_way;
- bool scrolling, backward;
- int scroll_source;
- int offset, delay;
-} TextboxData;
-
-static GList * textboxes;
-
-DRAW_FUNC_BEGIN (textbox_draw)
- TextboxData * data = (TextboxData *) g_object_get_data ((GObject *) wid, "textboxdata");
- g_return_val_if_fail (data && data->buf, FALSE);
-
- if (data->scrolling)
- {
- cairo_set_source_surface (cr, data->buf, -data->offset * config.scale, 0);
- cairo_paint (cr);
-
- if (-data->offset + data->buf_width < data->width)
- {
- cairo_set_source_surface (cr, data->buf, (-data->offset +
- data->buf_width) * config.scale, 0);
- cairo_paint (cr);
- }
- }
- else
- {
- cairo_set_source_surface (cr, data->buf, 0, 0);
- cairo_paint (cr);
- }
-DRAW_FUNC_END
-
-static gboolean textbox_scroll (void * textbox)
-{
- TextboxData * data = (TextboxData *) g_object_get_data ((GObject *) textbox, "textboxdata");
- g_return_val_if_fail (data, FALSE);
-
- if (data->delay < DELAY)
- {
- data->delay ++;
- return G_SOURCE_CONTINUE;
- }
-
- if (data->two_way && data->backward)
- data->offset --;
- else
- data->offset ++;
-
- if (data->two_way && (data->backward ? (data->offset <= 0) :
- (data->offset + data->width >= data->buf_width)))
- {
- data->backward = ! data->backward;
- data->delay = 0;
- }
-
- if (! data->two_way && data->offset >= data->buf_width)
- data->offset = 0;
-
- gtk_widget_queue_draw ((GtkWidget *) textbox);
- return G_SOURCE_CONTINUE;
-}
-
-static void textbox_render_vector (GtkWidget * textbox, TextboxData * data,
- const char * text)
-{
- g_return_if_fail (data->font && ! data->buf && text);
-
- PangoLayout * layout = gtk_widget_create_pango_layout (textbox, text);
- pango_layout_set_font_description (layout, data->font);
-
- PangoRectangle ink, logical;
- pango_layout_get_pixel_extents (layout, & ink, & logical);
-
- /* use logical width so as not to trim off the trailing space of the " --- " */
- /* use ink height since vertical space is quite limited */
- logical.width = aud::max (logical.width, 1);
- ink.height = aud::max (ink.height, 1);
-
- gtk_widget_set_size_request (textbox, data->width * config.scale, ink.height);
-
- data->buf_width = aud::max ((logical.width + config.scale - 1) / config.scale, data->width);
- data->buf = cairo_image_surface_create (CAIRO_FORMAT_ARGB32,
- data->buf_width * config.scale, ink.height);
-
- cairo_t * cr = cairo_create (data->buf);
-
- set_cairo_color (cr, active_skin->colorsSKIN_TEXTBG);
- cairo_paint (cr);
-
- cairo_move_to (cr, -logical.x, -ink.y);
- set_cairo_color (cr, active_skin->colorsSKIN_TEXTFG);
- pango_cairo_show_layout (cr, layout);
-
- cairo_destroy (cr);
- g_object_unref (layout);
-}
-
-static void lookup_char (const char c, int * x, int * y)
-{
- int tx, ty;
-
- switch (c)
- {
- case '"': tx = 26; ty = 0; break;
- case '@': tx = 27; ty = 0; break;
- case ' ': tx = 29; ty = 0; break;
- case ':':
- case ';':
- case '|': tx = 12; ty = 1; break;
- case '(':
- case '{': tx = 13; ty = 1; break;
- case ')':
- case '}': tx = 14; ty = 1; break;
- case '-':
- case '~': tx = 15; ty = 1; break;
- case '`':
- case '\'': tx = 16; ty = 1; break;
- case '!': tx = 17; ty = 1; break;
- case '_': tx = 18; ty = 1; break;
- case '+': tx = 19; ty = 1; break;
- case '\\': tx = 20; ty = 1; break;
- case '/': tx = 21; ty = 1; break;
- case '': tx = 22; ty = 1; break;
- case '': tx = 23; ty = 1; break;
- case '^': tx = 24; ty = 1; break;
- case '&': tx = 25; ty = 1; break;
- case '%': tx = 26; ty = 1; break;
- case '.':
- case ',': tx = 27; ty = 1; break;
- case '=': tx = 28; ty = 1; break;
- case '$': tx = 29; ty = 1; break;
- case '#': tx = 30; ty = 1; break;
- case '?': tx = 3; ty = 2; break;
- case '*': tx = 4; ty = 2; break;
- default: tx = 3; ty = 2; break; /* '?' */
- }
-
- * x = tx * active_skin->properties.textbox_bitmap_font_width;
- * y = ty * active_skin->properties.textbox_bitmap_font_height;
-}
-
-static void textbox_render_bitmap (GtkWidget * textbox, TextboxData * data,
- const char * text)
-{
- g_return_if_fail (! data->font && ! data->buf && text);
-
- int cw = active_skin->properties.textbox_bitmap_font_width;
- int ch = active_skin->properties.textbox_bitmap_font_height;
-
- gtk_widget_set_size_request (textbox, data->width * config.scale, ch * config.scale);
-
- long len;
- gunichar * utf32 = g_utf8_to_ucs4 (text, -1, nullptr, & len, nullptr);
- g_return_if_fail (utf32);
-
- data->buf_width = aud::max (cw * (int) len, data->width);
- data->buf = cairo_image_surface_create (CAIRO_FORMAT_ARGB32,
- data->buf_width * config.scale, ch * config.scale);
-
- cairo_t * cr = cairo_create (data->buf);
-
- gunichar * s = utf32;
- for (int x = 0; x < data->buf_width; x += cw)
- {
- gunichar c = * s ? * s ++ : ' ';
- int cx = 0, cy = 0;
-
- if (c >= 'A' && c <= 'Z')
- cx = cw * (c - 'A');
- else if (c >= 'a' && c <= 'z')
- cx = cw * (c - 'a');
- else if (c >= '0' && c <= '9')
- {
- cx = cw * (c - '0');
- cy = ch;
- }
- else
- lookup_char (c, & cx, & cy);
-
- skin_draw_pixbuf (cr, SKIN_TEXT, cx, cy, x, 0, cw, ch);
- }
-
- cairo_destroy (cr);
- g_free (utf32);
-}
-
-static void textbox_render (GtkWidget * textbox, TextboxData * data)
-{
- g_return_if_fail (data->text);
-
- if (data->buf)
- {
- cairo_surface_destroy (data->buf);
- data->buf = nullptr;
- }
-
- data->scrolling = FALSE;
- data->backward = FALSE;
- data->offset = 0;
- data->delay = 0;
-
- if (data->font)
- textbox_render_vector (textbox, data, data->text);
- else
- textbox_render_bitmap (textbox, data, data->text);
-
- if (data->may_scroll && data->buf_width > data->width)
- {
- data->scrolling = TRUE;
-
- if (! data->two_way)
- {
- if (data->buf)
- {
- cairo_surface_destroy (data->buf);
- data->buf = nullptr;
- }
-
- char * temp = g_strdup_printf ("%s --- ", data->text);
-
- if (data->font)
- textbox_render_vector (textbox, data, temp);
- else
- textbox_render_bitmap (textbox, data, temp);
-
- g_free (temp);
- }
- }
-
- gtk_widget_queue_draw (textbox);
-
- if (data->scrolling)
- {
- if (! data->scroll_source)
- data->scroll_source = g_timeout_add (TIMEOUT, textbox_scroll, textbox);
- }
- else
- {
- if (data->scroll_source)
- {
- g_source_remove (data->scroll_source);
- data->scroll_source = 0;
- }
- }
-}
-
-void textbox_set_width (GtkWidget * textbox, int width)
-{
- TextboxData * data = (TextboxData *) g_object_get_data ((GObject *) textbox, "textboxdata");
- g_return_if_fail (data);
-
- if (data->width == width)
- return;
-
- data->width = width;
- textbox_render (textbox, data);
-}
-
-const char * textbox_get_text (GtkWidget * textbox)
-{
- TextboxData * data = (TextboxData *) g_object_get_data ((GObject *) textbox, "textboxdata");
- g_return_val_if_fail (data, nullptr);
-
- return data->text;
-}
-
-void textbox_set_text (GtkWidget * textbox, const char * text)
-{
- TextboxData * data = (TextboxData *) g_object_get_data ((GObject *) textbox, "textboxdata");
- g_return_if_fail (data);
-
- if (! text)
- text = "";
-
- if (data->text && ! strcmp (data->text, text))
- return;
-
- g_free (data->text);
- data->text = g_strdup (text);
- textbox_render (textbox, data);
-}
-
-void textbox_set_font (GtkWidget * textbox, const char * font)
-{
- TextboxData * data = (TextboxData *) g_object_get_data ((GObject *) textbox, "textboxdata");
- g_return_if_fail (data);
-
- if (data->font)
- {
- pango_font_description_free (data->font);
- data->font = nullptr;
- }
-
- if (font)
- data->font = pango_font_description_from_string (font);
-
- textbox_render (textbox, data);
-}
-
-void textbox_set_scroll (GtkWidget * textbox, gboolean scroll)
-{
- TextboxData * data = (TextboxData *) g_object_get_data ((GObject *) textbox, "textboxdata");
- g_return_if_fail (data);
-
- if (data->may_scroll == scroll && data->two_way == config.twoway_scroll)
- return;
-
- data->may_scroll = scroll;
- data->two_way = config.twoway_scroll;
- textbox_render (textbox, data);
-}
-
-static void textbox_destroy (GtkWidget * textbox)
-{
- TextboxData * data = (TextboxData *) g_object_get_data ((GObject *) textbox, "textboxdata");
- g_return_if_fail (data);
-
- if (data->font)
- pango_font_description_free (data->font);
- if (data->buf)
- cairo_surface_destroy (data->buf);
- if (data->scroll_source)
- g_source_remove (data->scroll_source);
-
- g_free (data->text);
- g_free (data);
-
- textboxes = g_list_remove (textboxes, textbox);
-}
-
-GtkWidget * textbox_new (int width, const char * text, const char * font,
- gboolean scroll)
-{
- GtkWidget * textbox = gtk_drawing_area_new ();
- gtk_widget_set_size_request (textbox, width, 0);
- gtk_widget_add_events (textbox, GDK_BUTTON_PRESS_MASK |
- GDK_BUTTON_RELEASE_MASK);
-
- DRAW_CONNECT (textbox, textbox_draw);
- g_signal_connect (textbox, "destroy", (GCallback) textbox_destroy, nullptr);
-
- TextboxData * data = g_new0 (TextboxData, 1);
- data->width = width;
- data->text = g_strdup (text);
- data->may_scroll = scroll;
- data->two_way = config.twoway_scroll;
- g_object_set_data ((GObject *) textbox, "textboxdata", data);
-
- if (font)
- data->font = pango_font_description_from_string (font);
-
- textboxes = g_list_prepend (textboxes, textbox);
-
- textbox_render (textbox, data);
- return textbox;
-}
-
-void textbox_update_all (void)
-{
- for (GList * node = textboxes; node; node = node->next)
- {
- GtkWidget * textbox = (GtkWidget *) node->data;
- g_return_if_fail (textbox);
- TextboxData * data = (TextboxData *) g_object_get_data ((GObject *) textbox, "textboxdata");
- g_return_if_fail (data);
-
- textbox_render (textbox, data);
- }
-}

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/ui_skinned_textbox.h Deleted

@@ -1,43 +0,0 @@
-/*
- * Audacious - a cross-platform multimedia player
- * Copyright (c) 2007 Tomasz Moń
- * Copyright (c) 2011 John Lindgren
- *
- * Based on:
- * BMP - Cross-platform multimedia player
- * Copyright (C) 2003-2004 BMP development team.
- * XMMS:
- * Copyright (C) 1998-2003 XMMS development team.
- *
- * 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; under version 3 of the License.
- *
- * 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>.
- *
- * The Audacious team does not consider modular code linking to
- * Audacious or using our public API to be a derived work.
- */
-
-#ifndef SKINS_UI_SKINNED_TEXTBOX_H
-#define SKINS_UI_SKINNED_TEXTBOX_H
-
-#include <gtk/gtk.h>
-
-GtkWidget * textbox_new (int width, const char * text, const char * font,
- gboolean scroll);
-void textbox_set_width (GtkWidget * textbox, int width);
-const char * textbox_get_text (GtkWidget * textbox);
-void textbox_set_text (GtkWidget * textbox, const char * text);
-void textbox_set_font (GtkWidget * textbox, const char * font);
-void textbox_set_scroll (GtkWidget * textbox, gboolean scroll);
-
-void textbox_update_all (void);
-
-#endif

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/ui_skinned_window.cc Deleted

@@ -1,246 +0,0 @@
-/*
- * ui_skinned_window.c
- * Copyright 2011 John Lindgren
- *
- * This file is part of Audacious.
- *
- * Audacious 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, version 2 or version 3 of the License.
- *
- * Audacious 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
- * Audacious. If not, see <http://www.gnu.org/licenses/>.
- *
- * The Audacious team does not consider modular code linking to Audacious or
- * using our public API to be a derived work.
- */
-
-#include "draw-compat.h"
-#include "skins_cfg.h"
-#include "ui_dock.h"
-#include "ui_skinned_window.h"
-
-typedef struct {
- void (* draw) (GtkWidget * window, cairo_t * cr);
- GtkWidget * normal, * shaded;
- cairo_region_t * shape, * sshape;
- gboolean is_shaded, is_moving;
-} WindowData;
-
-DRAW_FUNC_BEGIN (window_draw)
- WindowData * data = (WindowData *) g_object_get_data ((GObject *) wid, "windowdata");
- g_return_val_if_fail (data, FALSE);
-
- if (data->draw)
- data->draw (wid, cr);
-DRAW_FUNC_END
-
-static void window_apply_shape (GtkWidget * window)
-{
- WindowData * data = (WindowData *) g_object_get_data ((GObject *) window, "windowdata");
- g_return_if_fail (data);
-
- gdk_window_shape_combine_region (gtk_widget_get_window (window),
- data->is_shaded ? data->sshape : data->shape, 0, 0);
-}
-
-static gboolean window_button_press (GtkWidget * window, GdkEventButton * event)
-{
- WindowData * data = (WindowData *) g_object_get_data ((GObject *) window, "windowdata");
- g_return_val_if_fail (data, FALSE);
-
- /* pass double clicks through; they are handled elsewhere */
- if (event->button != 1 || event->type == GDK_2BUTTON_PRESS)
- return FALSE;
-
- if (data->is_moving)
- return TRUE;
-
- dock_move_start (window, event->x_root, event->y_root);
- data->is_moving = TRUE;
- return TRUE;
-}
-
-static gboolean window_button_release (GtkWidget * window, GdkEventButton *
- event)
-{
- WindowData * data = (WindowData *) g_object_get_data ((GObject *) window, "windowdata");
- g_return_val_if_fail (data, FALSE);
-
- if (event->button != 1)
- return FALSE;
-
- data->is_moving = FALSE;
- return TRUE;
-}
-
-static gboolean window_motion (GtkWidget * window, GdkEventMotion * event)
-{
- WindowData * data = (WindowData *) g_object_get_data ((GObject *) window, "windowdata");
- g_return_val_if_fail (data, FALSE);
-
- if (! data->is_moving)
- return TRUE;
-
- dock_move (event->x_root, event->y_root);
- return TRUE;
-}
-
-static void window_destroy (GtkWidget * window)
-{
- WindowData * data = (WindowData *) g_object_get_data ((GObject *) window, "windowdata");
- g_return_if_fail (data);
-
- dock_remove_window (window);
-
- if (data->is_shaded)
- gtk_container_remove ((GtkContainer *) window, data->shaded);
- else
- gtk_container_remove ((GtkContainer *) window, data->normal);
-
- g_object_unref (data->normal);
- g_object_unref (data->shaded);
-
- if (data->shape)
- cairo_region_destroy (data->shape);
- if (data->sshape)
- cairo_region_destroy (data->sshape);
-
- g_free (data);
-}
-
-GtkWidget * window_new (int * x, int * y, int w, int h, gboolean main,
- gboolean shaded, void (* draw) (GtkWidget * window, cairo_t * cr))
-{
- w *= config.scale;
- h *= config.scale;
-
- GtkWidget * window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
- gtk_window_set_decorated ((GtkWindow *) window, FALSE);
- gtk_window_set_resizable ((GtkWindow *) window, FALSE);
- gtk_window_move ((GtkWindow *) window, * x, * y);
- gtk_widget_set_size_request (window, w, h);
- gtk_window_resize ((GtkWindow *) window, w, h);
-
- gtk_widget_set_app_paintable (window, TRUE);
- gtk_widget_add_events (window, GDK_BUTTON_PRESS_MASK |
- GDK_BUTTON_RELEASE_MASK | GDK_POINTER_MOTION_MASK | GDK_SCROLL_MASK);
-
- DRAW_CONNECT (window, window_draw);
- g_signal_connect (window, "realize", (GCallback) window_apply_shape, nullptr);
- g_signal_connect (window, "button-press-event", (GCallback) window_button_press, nullptr);
- g_signal_connect (window, "button-release-event", (GCallback) window_button_release, nullptr);
- g_signal_connect (window, "motion-notify-event", (GCallback) window_motion, nullptr);
- g_signal_connect (window, "destroy", (GCallback) window_destroy, nullptr);
-
- WindowData * data = g_new0 (WindowData, 1);
- g_object_set_data ((GObject *) window, "windowdata", data);
-
- data->normal = gtk_fixed_new ();
- g_object_ref (data->normal);
-
- data->shaded = gtk_fixed_new ();
- g_object_ref (data->shaded);
-
- if (shaded)
- gtk_container_add ((GtkContainer *) window, data->shaded);
- else
- gtk_container_add ((GtkContainer *) window, data->normal);
-
- data->is_shaded = shaded;
- data->draw = draw;
-
- dock_add_window (window, x, y, w, h, main);
- return window;
-}
-
-void window_set_size (GtkWidget * window, int w, int h)
-{
- w *= config.scale;
- h *= config.scale;
-
- gtk_widget_set_size_request (window, w, h);
- gtk_window_resize ((GtkWindow *) window, w, h);
- dock_set_size (window, w, h);
-}
-
-void window_set_shapes (GtkWidget * window, cairo_region_t * shape, cairo_region_t * sshape)
-{
- WindowData * data = (WindowData *) g_object_get_data ((GObject *) window, "windowdata");
- g_return_if_fail (data);
-
- if (data->shape)
- cairo_region_destroy (data->shape);
- if (data->sshape)
- cairo_region_destroy (data->sshape);
-
- data->shape = shape;
- data->sshape = sshape;
-
- if (gtk_widget_get_realized (window))
- window_apply_shape (window);
-}
-
-void window_set_shaded (GtkWidget * window, gboolean shaded)
-{
- WindowData * data = (WindowData *) g_object_get_data ((GObject *) window, "windowdata");
- g_return_if_fail (data);
-
- if (data->is_shaded == shaded)
- return;
-
- if (shaded)
- {
- gtk_container_remove ((GtkContainer *) window, data->normal);
- gtk_container_add ((GtkContainer *) window, data->shaded);
- }
- else
- {
- gtk_container_remove ((GtkContainer *) window, data->shaded);
- gtk_container_add ((GtkContainer *) window, data->normal);
- }
-
- data->is_shaded = shaded;
-
- if (gtk_widget_get_realized (window))
- window_apply_shape (window);
-}
-
-void window_put_widget (GtkWidget * window, gboolean shaded, GtkWidget * widget,
- int x, int y)
-{
- x *= config.scale;
- y *= config.scale;
-
- WindowData * data = (WindowData *) g_object_get_data ((GObject *) window, "windowdata");
- g_return_if_fail (data);
-
- GtkWidget * fixed = shaded ? data->shaded : data->normal;
- gtk_fixed_put ((GtkFixed *) fixed, widget, x, y);
-}
-
-void window_move_widget (GtkWidget * window, gboolean shaded, GtkWidget *
- widget, int x, int y)
-{
- x *= config.scale;
- y *= config.scale;
-
- WindowData * data = (WindowData *) g_object_get_data ((GObject *) window, "windowdata");
- g_return_if_fail (data);
-
- GtkWidget * fixed = shaded ? data->shaded : data->normal;
- gtk_fixed_move ((GtkFixed *) fixed, widget, x, y);
-}
-
-void window_show_all (GtkWidget * window)
-{
- WindowData * data = (WindowData *) g_object_get_data ((GObject *) window, "windowdata");
- g_return_if_fail (data);
-
- gtk_widget_show_all (data->normal);
- gtk_widget_show_all (data->shaded);
-}

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/ui_skinned_window.h Deleted

@@ -1,38 +0,0 @@
-/*
- * ui_skinned_window.h
- * Copyright 2011 John Lindgren
- *
- * This file is part of Audacious.
- *
- * Audacious 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, version 2 or version 3 of the License.
- *
- * Audacious 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
- * Audacious. If not, see <http://www.gnu.org/licenses/>.
- *
- * The Audacious team does not consider modular code linking to Audacious or
- * using our public API to be a derived work.
- */
-
-#ifndef SKINS_UI_SKINNED_WINDOW_H
-#define SKINS_UI_SKINNED_WINDOW_H
-
-#include <gtk/gtk.h>
-
-GtkWidget * window_new (int * x, int * y, int w, int h, gboolean main,
- gboolean shaded, void (* draw) (GtkWidget * window, cairo_t * cr));
-void window_set_size (GtkWidget * window, int w, int h);
-void window_set_shapes (GtkWidget * window, cairo_region_t * shape, cairo_region_t * sshape);
-void window_set_shaded (GtkWidget * window, gboolean shaded);
-void window_put_widget (GtkWidget * window, gboolean shaded, GtkWidget * widget,
- int x, int y);
-void window_move_widget (GtkWidget * window, gboolean shaded, GtkWidget *
- widget, int x, int y);
-void window_show_all (GtkWidget * window);
-
-#endif

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/ui_skinselector.cc Deleted

@@ -1,401 +0,0 @@
-/*
- * ui_skinselector.c
- * Copyright 1998-2003 XMMS Development Team
- * Copyright 2003-2004 BMP Development Team
- * Copyright 2011 John Lindgren
- *
- * This file is part of Audacious.
- *
- * Audacious 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, version 2 or version 3 of the License.
- *
- * Audacious 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
- * Audacious. If not, see <http://www.gnu.org/licenses/>.
- *
- * The Audacious team does not consider modular code linking to Audacious or
- * using our public API to be a derived work.
- */
-
-#include <stdlib.h>
-#include <string.h>
-
-#include <libaudcore/i18n.h>
-#include <libaudcore/runtime.h>
-#include <libaudcore/runtime.h>
-#include <libaudgui/libaudgui-gtk.h>
-
-#include "plugin.h"
-#include "ui_skin.h"
-#include "ui_skinselector.h"
-#include "util.h"
-
-#define EXTENSION_TARGETS 7
-
-static const char *ext_targetsEXTENSION_TARGETS = { "bmp", "xpm", "png", "svg",
- "gif", "jpg", "jpeg" };
-
-enum SkinViewCols {
- SKIN_VIEW_COL_PREVIEW,
- SKIN_VIEW_COL_FORMATTEDNAME,
- SKIN_VIEW_COL_NAME,
- SKIN_VIEW_N_COLS
-};
-
-typedef struct {
- char *name;
- char *desc;
- char *path;
- GTime *time;
-} SkinNode;
-
-static void skin_view_on_cursor_changed (GtkTreeView * treeview, void * data);
-
-static GList *skinlist = nullptr;
-
-static char *
-get_thumbnail_filename(const char * path)
-{
- char *basename, *pngname, *thumbname;
-
- g_return_val_if_fail(path != nullptr, nullptr);
-
- basename = g_path_get_basename(path);
- pngname = g_strconcat(basename, ".png", nullptr);
-
- thumbname = g_build_filename(skins_pathsSKINS_PATH_SKIN_THUMB_DIR,
- pngname, nullptr);
-
- g_free(basename);
- g_free(pngname);
-
- return thumbname;
-}
-
-
-static GdkPixbuf *
-skin_get_preview(const char * path)
-{
- GdkPixbuf *preview = nullptr;
- char *dec_path, *preview_path;
- gboolean is_archive = FALSE;
- int i = 0;
- char buf60;			/* gives us lots of room */
-
- if (file_is_archive(path))
- {
- if (!(dec_path = archive_decompress(path)))
- return nullptr;
-
- is_archive = TRUE;
- }
- else
- {
- dec_path = g_strdup(path);
- }
-
- for (i = 0; i < EXTENSION_TARGETS; i++)
- {
- sprintf(buf, "main.%s", ext_targetsi);
-
- if ((preview_path = find_file_case_path (dec_path, buf)) != nullptr)
- break;
- }
-
- if (preview_path)
- {
- preview = gdk_pixbuf_new_from_file(preview_path, nullptr);
- g_free(preview_path);
- }
-
- if (is_archive)
- del_directory(dec_path);
-
- g_free(dec_path);
-
- return preview;
-}
-
-static GdkPixbuf * skin_get_thumbnail (const char * path)
-{
- char * thumbname = get_thumbnail_filename (path);
- GdkPixbuf * thumb = nullptr;
-
- if (g_file_test (thumbname, G_FILE_TEST_EXISTS))
- {
- thumb = gdk_pixbuf_new_from_file (thumbname, nullptr);
- if (thumb)
- goto DONE;
- }
-
- thumb = skin_get_preview (path);
- if (! thumb)
- goto DONE;
-
- audgui_pixbuf_scale_within (& thumb, 128);
-
- if (thumb)
- {
- make_directory (skins_pathsSKINS_PATH_SKIN_THUMB_DIR);
- gdk_pixbuf_save (thumb, thumbname, "png", nullptr, nullptr);
- }
-
-DONE:
- g_free (thumbname);
- return thumb;
-}
-
-static void
-skinlist_add(const char * filename)
-{
- SkinNode *node;
- char *basename;
-
- g_return_if_fail(filename != nullptr);
-
- node = g_slice_new0(SkinNode);
- node->path = g_strdup(filename);
-
- basename = g_path_get_basename(filename);
-
- if (file_is_archive(filename)) {
- node->name = archive_basename(basename);
- node->desc = _("Archived Winamp 2.x skin");
- g_free(basename);
- }
- else {
- node->name = basename;
- node->desc = _("Unarchived Winamp 2.x skin");
- }
-
- skinlist = g_list_prepend(skinlist, node);
-}
-
-static gboolean
-scan_skindir_func(const char * path, const char * basename, void * data)
-{
- if (g_file_test(path, G_FILE_TEST_IS_REGULAR)) {
- if (file_is_archive(path)) {
- skinlist_add(path);
- }
- }
- else if (g_file_test(path, G_FILE_TEST_IS_DIR)) {
- skinlist_add(path);
- }
-
- return FALSE;
-}
-
-static void
-scan_skindir(const char * path)
-{
- GError *error = nullptr;
-
- g_return_if_fail(path != nullptr);
-
- if (path0 == '.')
- return;
-
- if (!dir_foreach(path, scan_skindir_func, nullptr, &error)) {
- g_warning("Failed to open directory (%s): %s", path, error->message);
- g_error_free(error);
- return;
- }
-}
-
-static int skinlist_compare_func (const void * _a, const void * _b)
-{
- const SkinNode * a = (SkinNode *) _a, * b = (SkinNode *) _b;
- g_return_val_if_fail (a && a->name, 1);
- g_return_val_if_fail (b && b->name, 1);
- return g_ascii_strcasecmp (a->name, b->name);
-}
-
-static void skin_free_func (void * _data)
-{
- SkinNode * data = (SkinNode *) _data;
- g_return_if_fail(data != nullptr);
- g_free (data->name);
- g_free (data->path);
- g_slice_free(SkinNode, data);
-}
-
-
-static void
-skinlist_clear(void)
-{
- if (!skinlist)
- return;
-
- g_list_foreach(skinlist, (GFunc) skin_free_func, nullptr);
- g_list_free(skinlist);
- skinlist = nullptr;
-}
-
-static void
-skinlist_update(void)
-{
- char *skinsdir;
-
- skinlist_clear();
-
- if (g_file_test (skins_pathsSKINS_PATH_USER_SKIN_DIR, G_FILE_TEST_EXISTS))
- scan_skindir (skins_pathsSKINS_PATH_USER_SKIN_DIR);
-
- char * path = g_strdup_printf ("%s/Skins", aud_get_path (AudPath::DataDir));
- scan_skindir (path);
- g_free (path);
-
- skinsdir = getenv("SKINSDIR");
- if (skinsdir) {
- char **dir_list = g_strsplit(skinsdir, ":", 0);
- char **dir;
-
- for (dir = dir_list; *dir; dir++)
- scan_skindir(*dir);
- g_strfreev(dir_list);
- }
-
- skinlist = g_list_sort(skinlist, skinlist_compare_func);
-
- g_assert(skinlist != nullptr);
-}
-
-void skin_view_update (GtkTreeView * treeview)
-{
- GtkTreeSelection *selection = nullptr;
- GtkListStore *store;
- GtkTreeIter iter, iter_current_skin;
- gboolean have_current_skin = FALSE;
- GtkTreePath *path;
-
- GdkPixbuf *thumbnail;
- char *formattedname;
- char *name;
- GList *entry;
-
- g_signal_handlers_block_by_func (treeview, (void *) skin_view_on_cursor_changed, nullptr);
-
- store = GTK_LIST_STORE(gtk_tree_view_get_model(treeview));
-
- gtk_list_store_clear(store);
-
- skinlist_update();
-
- for (entry = skinlist; entry; entry = entry->next)
- {
- SkinNode * node = (SkinNode *) entry->data;
-
- thumbnail = skin_get_thumbnail (node->path);
- formattedname = g_strdup_printf ("<big>%s</big>\n%s",
- node->name, node->desc);
- name = node->name;
-
- gtk_list_store_append(store, &iter);
- gtk_list_store_set(store, &iter,
- SKIN_VIEW_COL_PREVIEW, thumbnail,
- SKIN_VIEW_COL_FORMATTEDNAME, formattedname,
- SKIN_VIEW_COL_NAME, name, -1);
- if (thumbnail)
- g_object_unref(thumbnail);
- g_free(formattedname);
-
- if (g_strstr_len(active_skin->path,
- strlen(active_skin->path), name) ) {
- iter_current_skin = iter;
- have_current_skin = TRUE;
- }
- }
-
- if (have_current_skin) {
- selection = gtk_tree_view_get_selection(treeview);
- gtk_tree_selection_select_iter(selection, &iter_current_skin);
-
- path = gtk_tree_model_get_path(GTK_TREE_MODEL(store),
- &iter_current_skin);
- gtk_tree_view_scroll_to_cell(treeview, path, nullptr, TRUE, 0.5, 0.5);
- gtk_tree_path_free(path);
- }
-
- g_signal_handlers_unblock_by_func (treeview, (void *) skin_view_on_cursor_changed, nullptr);
-}
-
-
-static void
-skin_view_on_cursor_changed(GtkTreeView * treeview,
- void * data)
-{
- GtkTreeModel *model;
- GtkTreeSelection *selection;
- GtkTreeIter iter;
-
- GList *node;
- char *name;
- char *comp = nullptr;
-
- selection = gtk_tree_view_get_selection(treeview);
-
- /* workaround for Gnome bug #679291 */
- if (! selection)
- return;
-
- if (!gtk_tree_selection_get_selected(selection, &model, &iter))
- return;
-
- gtk_tree_model_get(model, &iter, SKIN_VIEW_COL_NAME, &name, -1);
-
- for (node = skinlist; node; node = g_list_next(node)) {
- comp = ((SkinNode *) node->data)->path;
- if (g_strrstr(comp, name))
- break;
- }
-
- g_free(name);
-
- active_skin_load (comp);
-}
-
-
-void
-skin_view_realize(GtkTreeView * treeview)
-{
- GtkListStore *store;
- GtkTreeViewColumn *column;
- GtkCellRenderer *renderer;
- GtkTreeSelection *selection;
-
- gtk_widget_show_all(GTK_WIDGET(treeview));
-
- gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(treeview), FALSE);
-
- store = gtk_list_store_new(SKIN_VIEW_N_COLS, GDK_TYPE_PIXBUF,
- G_TYPE_STRING , G_TYPE_STRING);
- gtk_tree_view_set_model(treeview, GTK_TREE_MODEL(store));
- g_object_unref (store);
-
- column = gtk_tree_view_column_new();
- gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_AUTOSIZE);
- gtk_tree_view_column_set_spacing(column, 16);
- gtk_tree_view_append_column(GTK_TREE_VIEW(treeview),
- GTK_TREE_VIEW_COLUMN(column));
-
- renderer = gtk_cell_renderer_pixbuf_new();
- gtk_tree_view_column_pack_start(column, renderer, FALSE);
- gtk_tree_view_column_set_attributes(column, renderer, "pixbuf",
- SKIN_VIEW_COL_PREVIEW, nullptr);
-
- renderer = gtk_cell_renderer_text_new();
- gtk_tree_view_column_pack_start(column, renderer, TRUE);
- gtk_tree_view_column_set_attributes(column, renderer, "markup",
- SKIN_VIEW_COL_FORMATTEDNAME, nullptr);
-
- selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(treeview));
- gtk_tree_selection_set_mode(selection, GTK_SELECTION_BROWSE);
-
- g_signal_connect(treeview, "cursor-changed",
- G_CALLBACK(skin_view_on_cursor_changed), nullptr);
-}

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/ui_svis.cc Deleted

@@ -1,215 +0,0 @@
-/*
- * Audacious - a cross-platform multimedia player
- * Copyright (c) 2007-2011 Audacious development team.
- *
- * Based on:
- * BMP - Cross-platform multimedia player
- * Copyright (C) 2003-2004 BMP development team.
- * XMMS:
- * Copyright (C) 1998-2003 XMMS development team.
- *
- * 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; under version 3 of the License.
- *
- * 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>.
- *
- * The Audacious team does not consider modular code linking to
- * Audacious or using our public API to be a derived work.
- */
-
-#include <string.h>
-#include <libaudcore/objects.h>
-
-#include "draw-compat.h"
-#include "skins_cfg.h"
-#include "surface.h"
-#include "ui_skin.h"
-#include "ui_vis.h"
-
-static int svis_analyzer_colors = {14, 11, 8, 5, 2};
-static int svis_scope_colors = {20, 19, 18, 19, 20};
-static int svis_vu_normal_colors = {16, 14, 12, 10, 8, 6, 4, 2};
-
-static struct {
- gboolean active;
- int data75;
-} svis;
-
-#define RGB_SEEK(x,y) (set = rgb + 38 * (y) + (x))
-#define RGB_SET(c) (* set ++ = (c))
-#define RGB_SET_Y(c) do {* set = (c); set += 38;} while (0)
-#define RGB_SET_INDEX(c) RGB_SET (active_skin->vis_colorsc)
-#define RGB_SET_INDEX_Y(c) RGB_SET_Y (active_skin->vis_colorsc)
-
-DRAW_FUNC_BEGIN (ui_svis_draw)
- uint32_t rgb38 * 5;
- uint32_t * set;
-
- RGB_SEEK (0, 0);
- for (int x = 0; x < 38 * 5; x ++)
- RGB_SET_INDEX (0);
-
- switch (config.vis_type)
- {
- case VIS_ANALYZER:
- {
- gboolean bars = (config.analyzer_type == ANALYZER_BARS);
-
- for (int x = 0; x < 38; x ++)
- {
- if (bars && (x % 3) == 2)
- continue;
-
- int h = svis.databars ? (x / 3) : x;
- h = aud::clamp (h, 0, 5);
- RGB_SEEK (x, 5 - h);
-
- for (int y = 0; y < h; y ++)
- RGB_SET_INDEX_Y (svis_analyzer_colorsh - 1 - y);
- }
-
- break;
- }
- case VIS_VOICEPRINT:
- switch (config.vu_mode)
- {
- case VU_NORMAL:
- for (int y = 0; y < 5; y ++)
- {
- if (y == 2)
- continue;
-
- int h = (svis.datay / 3 * 8 + 19) / 38;
- h = aud::clamp (h, 0, 8);
- RGB_SEEK (0, y);
-
- for (int x = 0; x < h; x ++)
- {
- RGB_SET_INDEX (svis_vu_normal_colorsx);
- RGB_SET_INDEX (svis_vu_normal_colorsx);
- RGB_SET_INDEX (svis_vu_normal_colorsx);
- set += 2;
- }
- }
- break;
- default: /* VU_SMOOTH */
- for (int y = 0; y < 5; y ++)
- {
- if (y == 2)
- continue;
-
- int h = svis.datay / 3;
- h = aud::clamp (h, 0, 38);
- RGB_SEEK (0, y);
-
- for (int x = 0; x < h; x ++)
- RGB_SET_INDEX (17 - (x * 16) / 38);
- }
- break;
- }
- break;
- case VIS_SCOPE:
- {
- static const int scale17 = {0, 0, 0, 0, 0, 0, 1, 1, 2, 3, 3, 4,
- 4, 4, 4, 4, 4};
-
- if (! svis.active)
- goto DRAW;
-
- switch (config.scope_mode)
- {
- case SCOPE_DOT:
- for (int x = 0; x < 38; x ++)
- {
- int h = scaleaud::clamp (svis.data2 * x, 0, 16);
- RGB_SEEK (x, h);
- RGB_SET_INDEX (svis_scope_colorsh);
- }
- break;
- case SCOPE_LINE:
- {
- for (int x = 0; x < 37; x++)
- {
- int h = scaleaud::clamp (svis.data2 * x, 0, 16);
- int h2 = scaleaud::clamp (svis.data2 * (x + 1), 0, 16);
-
- if (h < h2) h2 --;
- else if (h > h2) {int temp = h; h = h2 + 1; h2 = temp;}
-
- RGB_SEEK (x, h);
- for (int y = h; y <= h2; y ++)
- RGB_SET_INDEX_Y (svis_scope_colorsy);
- }
-
- int h = scaleaud::clamp (svis.data74, 0, 16);
- RGB_SEEK (37, h);
- RGB_SET_INDEX (svis_scope_colorsh);
- break;
- }
- default: /* SCOPE_SOLID */
- for (int x = 0; x < 38; x++)
- {
- int h = scaleaud::clamp (svis.data2 * x, 0, 16);
- int h2;
-
- if (h < 2) h2 = 2;
- else {h2 = h; h = 2;}
-
- RGB_SEEK (x, h);
- for (int y = h; y <= h2; y ++)
- RGB_SET_INDEX_Y (svis_scope_colorsy);
- }
- break;
- }
- break;
- }
- }
-
-DRAW:;
- cairo_surface_t * surf = cairo_image_surface_create_for_data
- ((unsigned char *) rgb, CAIRO_FORMAT_RGB24, 38, 5, 4 * 38);
- cairo_scale (cr, config.scale, config.scale);
- cairo_set_source_surface (cr, surf, 0, 0);
- cairo_pattern_set_filter (cairo_get_source (cr), CAIRO_FILTER_NEAREST);
- cairo_paint (cr);
- cairo_surface_destroy (surf);
-DRAW_FUNC_END
-
-GtkWidget * ui_svis_new (void)
-{
- GtkWidget * wid = gtk_drawing_area_new ();
- gtk_widget_set_size_request (wid, 38 * config.scale, 5 * config.scale);
- gtk_widget_add_events (wid, GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK);
- DRAW_CONNECT (wid, ui_svis_draw);
- return wid;
-}
-
-void ui_svis_clear_data (GtkWidget * widget)
-{
- memset (& svis, 0, sizeof svis);
- gtk_widget_queue_draw (widget);
-}
-
-void ui_svis_timeout_func (GtkWidget * widget, unsigned char * data)
-{
- if (config.vis_type == VIS_VOICEPRINT)
- {
- for (int i = 0; i < 2; i ++)
- svis.datai = datai;
- }
- else
- {
- for (int i = 0; i < 75; i ++)
- svis.datai = datai;
- }
-
- svis.active = TRUE;
- gtk_widget_queue_draw (widget);
-}

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/ui_vis.cc Deleted

@@ -1,325 +0,0 @@
-/*
- * Audacious - a cross-platform multimedia player
- * Copyright (c) 2007-2011 Audacious development team.
- *
- * Based on:
- * BMP - Cross-platform multimedia player
- * Copyright (C) 2003-2004 BMP development team.
- * XMMS:
- * Copyright (C) 1998-2003 XMMS development team.
- *
- * 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; under version 3 of the License.
- *
- * 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>.
- *
- * The Audacious team does not consider modular code linking to
- * Audacious or using our public API to be a derived work.
- */
-
-#include <string.h>
-#include <libaudcore/objects.h>
-
-#include "draw-compat.h"
-#include "skins_cfg.h"
-#include "surface.h"
-#include "ui_skin.h"
-#include "ui_vis.h"
-
-static const float vis_afalloff_speeds = {0.34, 0.5, 1.0, 1.3, 1.6};
-static const float vis_pfalloff_speeds = {1.2, 1.3, 1.4, 1.5, 1.6};
-static const int vis_scope_colors16 = {22, 22, 21, 21, 20, 10, 19, 19, 18,
- 19, 19, 20, 20, 21, 21, 22};
-
-static uint32_t vis_voice_color256;
-static uint32_t vis_voice_color_fire256;
-static uint32_t vis_voice_color_ice256;
-static uint32_t pattern_fill76 * 2;
-
-static struct {
- gboolean active;
- float data75, peak75, peak_speed75;
- unsigned char voiceprint_data76 * 16;
- gboolean voiceprint_advance;
-} vis;
-
-#define RGB_SEEK(x,y) (set = rgb + 76 * (y) + (x))
-#define RGB_SET(c) (* set ++ = (c))
-#define RGB_SET_Y(c) do {* set = (c); set += 76;} while (0)
-#define RGB_SET_INDEX(c) RGB_SET (active_skin->vis_colorsc)
-#define RGB_SET_INDEX_Y(c) RGB_SET_Y (active_skin->vis_colorsc)
-
-void ui_vis_set_colors (void)
-{
- g_return_if_fail (active_skin != nullptr);
-
- uint32_t fgc = active_skin->colorsSKIN_TEXTFG;
- uint32_t bgc = active_skin->colorsSKIN_TEXTBG;
- int fg3 = {COLOR_R (fgc), COLOR_G (fgc), COLOR_B (fgc)};
- int bg3 = {COLOR_R (bgc), COLOR_G (bgc), COLOR_B (bgc)};
-
- for (int x = 0; x < 256; x ++)
- {
- unsigned char c3;
- for (int n = 0; n < 3; n ++)
- cn = bgn + (fgn - bgn) * x / 255;
- vis_voice_colorx = COLOR (c0, c1, c2);
- }
-
- for (int x = 0; x < 256; x ++)
- {
- unsigned char r = aud::min (x, 127) * 2;
- unsigned char g = aud::clamp (x - 64, 0, 127) * 2;
- unsigned char b = aud::max (x - 128, 0) * 2;
- vis_voice_color_firex = COLOR (r, g, b);
- }
-
- for (int x = 0; x < 256; x ++)
- vis_voice_color_icex = COLOR (x / 2, x, aud::min (x * 2, 255));
-
- uint32_t * set = pattern_fill;
- uint32_t * end = set + 76;
-
- while (set < end)
- RGB_SET_INDEX (0);
-
- end = set + 76;
-
- while (set < end)
- {
- RGB_SET_INDEX (1);
- RGB_SET_INDEX (0);
- }
-}
-
-DRAW_FUNC_BEGIN (ui_vis_draw)
- uint32_t rgb76 * 16;
- uint32_t * set;
-
- if (config.vis_type != VIS_VOICEPRINT)
- {
- for (set = rgb; set < rgb + 76 * 16; set += 76 * 2)
- memcpy (set, pattern_fill, sizeof pattern_fill);
- }
-
- switch (config.vis_type)
- {
- case VIS_ANALYZER:
- {
- gboolean bars = (config.analyzer_type == ANALYZER_BARS);
-
- for (int x = 0; x < 75; x ++)
- {
- if (bars && (x & 3) == 3)
- continue;
-
- int h = vis.databars ? (x >> 2) : x;
- h = aud::clamp (h, 0, 16);
- RGB_SEEK (x, 16 - h);
-
- switch (config.analyzer_mode)
- {
- case ANALYZER_NORMAL:
- for (int y = 0; y < h; y ++)
- RGB_SET_INDEX_Y (18 - h + y);
- break;
- case ANALYZER_FIRE:
- for (int y = 0; y < h; y ++)
- RGB_SET_INDEX_Y (2 + y);
- break;
- default: /* ANALYZER_VLINES */
- for (int y = 0; y < h; y ++)
- RGB_SET_INDEX_Y (18 - h);
- break;
- }
-
- if (config.analyzer_peaks)
- {
- int h = vis.peakbars ? (x >> 2) : x;
- h = aud::clamp (h, 0, 16);
-
- if (h)
- {
- RGB_SEEK (x, 16 - h);
- RGB_SET_INDEX (23);
- }
- }
- }
-
- break;
- }
- case VIS_VOICEPRINT:
- {
- if (vis.voiceprint_advance)
- {
- vis.voiceprint_advance = FALSE;
- memmove (vis.voiceprint_data, vis.voiceprint_data + 1, sizeof
- vis.voiceprint_data - 1);
-
- for (int y = 0; y < 16; y ++)
- vis.voiceprint_data76 * y + 75 = vis.datay;
- }
-
- unsigned char * get = vis.voiceprint_data;
- uint32_t * colors = (config.voiceprint_mode == VOICEPRINT_NORMAL) ?
- vis_voice_color : (config.voiceprint_mode == VOICEPRINT_FIRE) ?
- vis_voice_color_fire : /* VOICEPRINT_ICE */ vis_voice_color_ice;
- set = rgb;
-
- for (int y = 0; y < 16; y ++)
- for (int x = 0; x < 76; x ++)
- RGB_SET (colors* get ++);
- break;
- }
- case VIS_SCOPE:
- if (! vis.active)
- goto DRAW;
-
- switch (config.scope_mode)
- {
- case SCOPE_DOT:
- for (int x = 0; x < 75; x ++)
- {
- int h = aud::clamp ((int) vis.datax, 0, 15);
- RGB_SEEK (x, h);
- RGB_SET_INDEX (vis_scope_colorsh);
- }
- break;
- case SCOPE_LINE:
- {
- for (int x = 0; x < 74; x++)
- {
- int h = aud::clamp ((int) vis.datax, 0, 15);
- int h2 = aud::clamp ((int) vis.datax + 1, 0, 15);
-
- if (h < h2) h2 --;
- else if (h > h2) {int temp = h; h = h2 + 1; h2 = temp;}
-
- RGB_SEEK (x, h);
-
- for (int y = h; y <= h2; y ++)
- RGB_SET_INDEX_Y (vis_scope_colorsy);
- }
-
- int h = aud::clamp ((int) vis.data74, 0, 15);
- RGB_SEEK (74, h);
- RGB_SET_INDEX (vis_scope_colorsh);
- break;
- }
- default: /* SCOPE_SOLID */
- for (int x = 0; x < 75; x++)
- {
- int h = aud::clamp ((int) vis.datax, 0, 15);
- int h2;
-
- if (h < 8) h2 = 8;
- else {h2 = h; h = 8;}
-
- RGB_SEEK (x, h);
-
- for (int y = h; y <= h2; y ++)
- RGB_SET_INDEX_Y (vis_scope_colorsy);
- }
- break;
- }
- break;
- }
-
-DRAW:;
- cairo_surface_t * surf = cairo_image_surface_create_for_data
- ((unsigned char *) rgb, CAIRO_FORMAT_RGB24, 76, 16, 4 * 76);
- cairo_scale (cr, config.scale, config.scale);
- cairo_set_source_surface (cr, surf, 0, 0);
- cairo_pattern_set_filter (cairo_get_source (cr), CAIRO_FILTER_NEAREST);
- cairo_paint (cr);
- cairo_surface_destroy (surf);
-DRAW_FUNC_END
-
-GtkWidget * ui_vis_new (void)
-{
- GtkWidget * wid = gtk_drawing_area_new ();
- gtk_widget_set_size_request (wid, 76 * config.scale, 16 * config.scale);
- gtk_widget_add_events (wid, GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK);
- DRAW_CONNECT (wid, ui_vis_draw);
- return wid;
-}
-
-void ui_vis_clear_data (GtkWidget * wid)
-{
- memset (& vis, 0, sizeof vis);
- gtk_widget_queue_draw (wid);
-}
-
-void ui_vis_timeout_func (GtkWidget * widget, unsigned char * data)
-{
- if (config.vis_type == VIS_ANALYZER)
- {
- const int n = (config.analyzer_type == ANALYZER_BARS) ? 19 : 75;
-
- for (int i = 0; i < n; i++)
- {
- if (datai > vis.datai)
- {
- vis.datai = datai;
- if (vis.datai > vis.peaki)
- {
- vis.peaki = vis.datai;
- vis.peak_speedi = 0.01;
-
- }
- else if (vis.peaki > 0.0)
- {
- vis.peaki -= vis.peak_speedi;
- vis.peak_speedi *=
- vis_pfalloff_speedsconfig.peaks_falloff;
- if (vis.peaki < vis.datai)
- vis.peaki = vis.datai;
- if (vis.peaki < 0.0)
- vis.peaki = 0.0;
- }
- }
- else
- {
- if (vis.datai > 0.0)
- {
- vis.datai -=
- vis_afalloff_speedsconfig.analyzer_falloff;
- if (vis.datai < 0.0)
- vis.datai = 0.0;
- }
- if (vis.peaki > 0.0)
- {
- vis.peaki -= vis.peak_speedi;
- vis.peak_speedi *=
- vis_pfalloff_speedsconfig.peaks_falloff;
- if (vis.peaki < vis.datai)
- vis.peaki = vis.datai;
- if (vis.peaki < 0.0)
- vis.peaki = 0.0;
- }
- }
- }
- }
- else if (config.vis_type == VIS_VOICEPRINT)
- {
- for (int i = 0; i < 16; i++)
- vis.datai = data15 - i;
-
- vis.voiceprint_advance = TRUE;
- }
- else
- {
- for (int i = 0; i < 75; i++)
- vis.datai = datai;
- }
-
- vis.active = TRUE;
- gtk_widget_queue_draw (widget);
-}

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/ui_vis.h Deleted

@@ -1,63 +0,0 @@
-/*
- * Audacious - a cross-platform multimedia player
- * Copyright (c) 2007-2011 Audacious development team.
- *
- * 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; under version 3 of the License.
- *
- * 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>.
- *
- * The Audacious team does not consider modular code linking to
- * Audacious or using our public API to be a derived work.
- */
-
-#ifndef SKINS_UI_VIS_H
-#define SKINS_UI_VIS_H
-
-#include <gtk/gtk.h>
-
-typedef enum {
- VIS_ANALYZER, VIS_SCOPE, VIS_VOICEPRINT, VIS_OFF
-} VisType;
-
-typedef enum {
- ANALYZER_NORMAL, ANALYZER_FIRE, ANALYZER_VLINES
-} AnalyzerMode;
-
-typedef enum {
- ANALYZER_LINES, ANALYZER_BARS
-} AnalyzerType;
-
-typedef enum {
- SCOPE_DOT, SCOPE_LINE, SCOPE_SOLID
-} ScopeMode;
-
-typedef enum {
- VOICEPRINT_NORMAL, VOICEPRINT_FIRE, VOICEPRINT_ICE
-} VoiceprintMode;
-
-typedef enum {
- VU_NORMAL, VU_SMOOTH
-} VUMode;
-
-typedef enum {
- FALLOFF_SLOWEST, FALLOFF_SLOW, FALLOFF_MEDIUM, FALLOFF_FAST, FALLOFF_FASTEST
-} FalloffSpeed;
-
-GtkWidget * ui_vis_new (void);
-void ui_vis_set_colors (void);
-void ui_vis_clear_data (GtkWidget * widget);
-void ui_vis_timeout_func (GtkWidget * widget, unsigned char * data);
-
-GtkWidget * ui_svis_new (void);
-void ui_svis_clear_data (GtkWidget * widget);
-void ui_svis_timeout_func (GtkWidget * widget, unsigned char * data);
-
-#endif

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/util.cc Deleted

@@ -1,432 +0,0 @@
-/* Audacious - Cross-platform multimedia player
- * Copyright (C) 2005-2009 Audacious development team
- *
- * Based on BMP:
- * Copyright (C) 2003-2004 BMP development team.
- *
- * Based on XMMS:
- * Copyright (C) 1998-2003 XMMS development team.
- *
- * 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; under version 3 of the License.
- *
- * 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>.
- *
- * The Audacious team does not consider modular code linking to
- * Audacious or using our public API to be a derived work.
- */
-
-#include <errno.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/stat.h>
-#include <unistd.h>
-
-#include <glib/gstdio.h>
-
-#include <libaudcore/runtime.h>
-#include <libaudcore/i18n.h>
-#include <libaudcore/audstrings.h>
-#include <libaudcore/hook.h>
-#include <libaudcore/vfs.h>
-
-#include "util.h"
-
-#ifdef S_IRGRP
-#define DIRMODE (S_IRWXU | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH)
-#else
-#define DIRMODE (S_IRWXU)
-#endif
-
-char * find_file_case (const char * folder, const char * basename)
-{
- static GHashTable * cache = nullptr;
- GList * list = nullptr;
- void * vlist;
-
- if (cache == nullptr)
- cache = g_hash_table_new ((GHashFunc) str_calc_hash, g_str_equal);
-
- if (g_hash_table_lookup_extended (cache, folder, nullptr, & vlist))
- list = (GList *) vlist;
- else
- {
- GDir * handle = g_dir_open (folder, 0, nullptr);
- if (! handle)
- return nullptr;
-
- const char * name;
- while ((name = g_dir_read_name (handle)))
- list = g_list_prepend (list, g_strdup (name));
-
- g_hash_table_insert (cache, g_strdup (folder), list);
- g_dir_close (handle);
- }
-
- for (; list != nullptr; list = list->next)
- {
- if (! g_ascii_strcasecmp ((char *) list->data, basename))
- return g_strdup ((char *) list->data);
- }
-
- return nullptr;
-}
-
-char * find_file_case_path (const char * folder, const char * basename)
-{
- char * found, * path;
-
- if ((found = find_file_case (folder, basename)) == nullptr)
- return nullptr;
-
- path = g_strdup_printf ("%s/%s", folder, found);
- g_free (found);
- return path;
-}
-
-VFSFile open_local_file_nocase (const char * folder, const char * basename)
-{
- char * path = find_file_case_path (folder, basename);
- if (! path)
- return VFSFile ();
-
- StringBuf uri = filename_to_uri (path);
- g_free (path);
-
- if (! uri)
- return VFSFile ();
-
- return VFSFile (uri, "r");
-}
-
-char * text_parse_line (char * text)
-{
- char * newline = strchr (text, '\n');
-
- if (newline == nullptr)
- return nullptr;
-
- * newline = 0;
- return newline + 1;
-}
-
-typedef enum
-{
- ARCHIVE_UNKNOWN = 0,
- ARCHIVE_DIR,
- ARCHIVE_TAR,
- ARCHIVE_TGZ,
- ARCHIVE_ZIP,
- ARCHIVE_TBZ2
-} ArchiveType;
-
-typedef char *(*ArchiveExtractFunc) (const char *, const char *);
-
-typedef struct
-{
- ArchiveType type;
- const char *ext;
-} ArchiveExtensionType;
-
-static ArchiveExtensionType archive_extensions = {
- {ARCHIVE_TAR, ".tar"},
- {ARCHIVE_ZIP, ".wsz"},
- {ARCHIVE_ZIP, ".zip"},
- {ARCHIVE_TGZ, ".tar.gz"},
- {ARCHIVE_TGZ, ".tgz"},
- {ARCHIVE_TBZ2, ".tar.bz2"},
- {ARCHIVE_TBZ2, ".bz2"},
- {ARCHIVE_UNKNOWN, nullptr}
-};
-
-static char *archive_extract_tar(const char *archive, const char *dest);
-static char *archive_extract_zip(const char *archive, const char *dest);
-static char *archive_extract_tgz(const char *archive, const char *dest);
-static char *archive_extract_tbz2(const char *archive, const char *dest);
-
-static ArchiveExtractFunc archive_extract_funcs = {
- nullptr,
- nullptr,
- archive_extract_tar,
- archive_extract_tgz,
- archive_extract_zip,
- archive_extract_tbz2
-};
-
-
-/* FIXME: these functions can be generalised into a function using a
- * command lookup table */
-
-static const char *get_tar_command(void)
-{
- static const char *command = nullptr;
-
- if (!command)
- {
- if (!(command = getenv("TARCMD")))
- command = "tar";
- }
-
- return command;
-}
-
-static const char *get_unzip_command(void)
-{
- static const char *command = nullptr;
-
- if (!command)
- {
- if (!(command = getenv("UNZIPCMD")))
- command = "unzip";
- }
-
- return command;
-}
-
-
-static char *archive_extract_tar(const char *archive, const char *dest)
-{
- return g_strdup_printf("%s >/dev/null xf \"%s\" -C %s", get_tar_command(),
- archive, dest);
-}
-
-static char *archive_extract_zip(const char *archive, const char *dest)
-{
- return g_strdup_printf("%s >/dev/null -o -j \"%s\" -d %s",
- get_unzip_command(), archive, dest);
-}
-
-static char *archive_extract_tgz(const char *archive, const char *dest)
-{
- return g_strdup_printf("%s >/dev/null xzf \"%s\" -C %s", get_tar_command(),
- archive, dest);
-}
-
-static char *archive_extract_tbz2(const char *archive, const char *dest)
-{
- return g_strdup_printf("bzip2 -dc \"%s\" | %s >/dev/null xf - -C %s",
- archive, get_tar_command(), dest);
-}
-
-
-static ArchiveType archive_get_type(const char *filename)
-{
- int i = 0;
-
- if (g_file_test(filename, G_FILE_TEST_IS_DIR))
- return ARCHIVE_DIR;
-
- while (archive_extensionsi.ext)
- {
- if (g_str_has_suffix(filename, archive_extensionsi.ext))
- {
- return archive_extensionsi.type;
- }
- i++;
- }
-
- return ARCHIVE_UNKNOWN;
-}
-
-gboolean file_is_archive(const char *filename)
-{
- return (archive_get_type(filename) > ARCHIVE_DIR);
-}
-
-char *archive_basename(const char *str)
-{
- int i = 0;
-
- while (archive_extensionsi.ext)
- {
- if (str_has_suffix_nocase(str, archive_extensionsi.ext))
- {
- const char *end = g_strrstr(str, archive_extensionsi.ext);
- if (end)
- {
- return g_strndup(str, end - str);
- }
- break;
- }
- i++;
- }
-
- return nullptr;
-}
-
-/**
- * Escapes characters that are special to the shell inside double quotes.
- *
- * @param string String to be escaped.
- * @return Given string with special characters escaped. Must be freed with g_free().
- */
-static char *
-escape_shell_chars(const char * string)
-{
- const char *special = "$`\"\\"; /* Characters to escape */
- const char *in = string;
- char *out, *escaped;
- int num = 0;
-
- while (*in != '\0')
- if (strchr(special, *in++))
- num++;
-
- escaped = g_new (char, strlen(string) + num + 1);
-
- in = string;
- out = escaped;
-
- while (*in != '\0') {
- if (strchr(special, *in))
- *out++ = '\\';
- *out++ = *in++;
- }
- *out = '\0';
-
- return escaped;
-}
-
-/*
- decompress_archive
-
- Decompresses the archive "filename" to a temporary directory,
- returns the path to the temp dir, or nullptr if failed,
- watch out tho, doesn't actually check if the system command succeeds :-|
-*/
-
-char *archive_decompress(const char *filename)
-{
- char *tmpdir, *cmd, *escaped_filename;
- ArchiveType type;
-
- if ((type = archive_get_type(filename)) <= ARCHIVE_DIR)
- return nullptr;
-
- tmpdir = g_build_filename(g_get_tmp_dir(), "audacious.XXXXXX", nullptr);
- if (!g_mkdtemp(tmpdir))
- {
- g_free(tmpdir);
- AUDDBG("Unable to load skin: Failed to create temporary "
- "directory: %s\n", g_strerror(errno));
- return nullptr;
- }
-
- escaped_filename = escape_shell_chars(filename);
- cmd = archive_extract_funcstype (escaped_filename, tmpdir);
- g_free(escaped_filename);
-
- if (!cmd)
- {
- AUDDBG("extraction function is nullptr!\n");
- g_free(tmpdir);
- return nullptr;
- }
-
- AUDDBG("Attempt to execute \"%s\"\n", cmd);
-
- if (system(cmd) != 0)
- {
- AUDDBG("could not execute cmd %s\n", cmd);
- g_free(cmd);
- return nullptr;
- }
- g_free(cmd);
-
- return tmpdir;
-}
-
-static gboolean del_directory_func(const char *path, const char *basename,
- void *params)
-{
- if (!strcmp(basename, ".") || !strcmp(path, ".."))
- return FALSE;
-
- if (g_file_test(path, G_FILE_TEST_IS_DIR))
- {
- dir_foreach(path, del_directory_func, nullptr, nullptr);
- g_rmdir(path);
- return FALSE;
- }
-
- g_unlink(path);
-
- return FALSE;
-}
-
-void del_directory(const char *path)
-{
- dir_foreach(path, del_directory_func, nullptr, nullptr);
- g_rmdir(path);
-}
-
-GArray *string_to_garray(const char *str)
-{
- GArray *array;
- int temp;
- const char *ptr = str;
- char *endptr;
-
- array = g_array_new(FALSE, TRUE, sizeof(int));
- for (;;)
- {
- temp = strtol(ptr, &endptr, 10);
- if (ptr == endptr)
- break;
- g_array_append_val(array, temp);
- ptr = endptr;
- while (!g_ascii_isdigit((int)*ptr) && (*ptr) != '\0')
- ptr++;
- if (*ptr == '\0')
- break;
- }
- return (array);
-}
-
-gboolean dir_foreach(const char *path, DirForeachFunc function,
- void * user_data, GError **error)
-{
- GError *error_out = nullptr;
- GDir *dir;
- const char *entry;
- char *entry_fullpath;
-
- if (!(dir = g_dir_open(path, 0, &error_out)))
- {
- g_propagate_error(error, error_out);
- return FALSE;
- }
-
- while ((entry = g_dir_read_name(dir)))
- {
- entry_fullpath = g_build_filename(path, entry, nullptr);
-
- if ((*function) (entry_fullpath, entry, user_data))
- {
- g_free(entry_fullpath);
- break;
- }
-
- g_free(entry_fullpath);
- }
-
- g_dir_close(dir);
-
- return TRUE;
-}
-
-void make_directory(const char *path)
-{
- if (g_mkdir_with_parents(path, DIRMODE) == 0)
- return;
-
- g_printerr(_("Could not create directory (%s): %s\n"), path,
- g_strerror(errno));
-}

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/util.h Deleted

@@ -1,55 +0,0 @@
-/* Audacious - Cross-platform multimedia player
- * Copyright (C) 2005-2009 Audacious development team
- *
- * Based on BMP:
- * Copyright (C) 2003-2004 BMP development team
- *
- * Based on XMMS:
- * Copyright (C) 1998-2003 XMMS development team
- *
- * 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; under version 3 of the License.
- *
- * 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>.
- *
- * The Audacious team does not consider modular code linking to
- * Audacious or using our public API to be a derived work.
- */
-
-#ifndef UTIL_H
-#define UTIL_H
-
-#include <glib.h>
-
-#include <libaudcore/vfs.h>
-
-typedef gboolean(*DirForeachFunc) (const char *path, const char *basename,
- void * user_data);
-
-char * find_file_case (const char * folder, const char * basename);
-char * find_file_case_path (const char * folder, const char * basename);
-
-VFSFile open_local_file_nocase (const char * folder, const char * basename);
-
-char * text_parse_line (char * text);
-
-void make_directory(const char *path);
-void del_directory(const char *path);
-
-gboolean dir_foreach(const char *path, DirForeachFunc function,
- void * user_data, GError **error);
-
-GArray *string_to_garray(const char *str);
-
-gboolean file_is_archive(const char *filename);
-char *archive_decompress(const char *path);
-char *archive_basename(const char *path);
-
-#endif

audacious-plugins-3.6.2-gtk3.tar.bz2/src/sndio-ng Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/sndio-ng/Makefile Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/sndio-ng/sndio.cc Deleted

@@ -1,376 +0,0 @@
-/*
- * Sndio Output Plugin for Audacious
- * Copyright 2014 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 <libaudcore/audstrings.h>
-#include <libaudcore/i18n.h>
-#include <libaudcore/interface.h>
-#include <libaudcore/plugin.h>
-#include <libaudcore/preferences.h>
-#include <libaudcore/runtime.h>
-
-#include <errno.h>
-#include <poll.h>
-#include <pthread.h>
-#include <string.h>
-#include <sys/time.h>
-#include <time.h>
-
-#include <sndio.h>
-
-class SndioPlugin : public OutputPlugin
-{
-public:
- static const char * const defaults;
- static const PreferencesWidget widgets;
- static const PluginPreferences prefs;
-
- static constexpr PluginInfo info = {
- N_("Sndio Output"),
- PACKAGE,
- nullptr,
- & prefs
- };
-
- constexpr SndioPlugin () : OutputPlugin (info, 5) {}
-
- bool init ();
-
- StereoVolume get_volume ();
- void set_volume (StereoVolume v);
-
- bool open_audio (int format, int rate, int channels);
- void close_audio ();
-
- void period_wait ();
- int write_audio (const void * data, int size);
- void drain ();
-
- int get_delay ();
-
- void pause (bool pause);
- void flush ();
-
-private:
- bool poll_locked ();
-
- static void volume_cb (void *, unsigned int vol);
- static void move_cb (void * arg, int delta);
-
- sio_hdl * m_handle = nullptr;
-
- int m_rate = 0, m_channels = 0;
- int m_bytes_per_frame = 0;
-
- bool m_paused = false;
- int m_frames_buffered = 0;
- timeval m_last_write_time = timeval ();
- int m_flush_count = 0;
-
- pthread_mutex_t m_mutex = PTHREAD_MUTEX_INITIALIZER;
- pthread_cond_t m_cond = PTHREAD_COND_INITIALIZER;
-};
-
-EXPORT SndioPlugin aud_plugin_instance;
-
-const char * const SndioPlugin::defaults = {
- "save_volume", "FALSE",
- "volume", "100",
- nullptr
-};
-
-const PreferencesWidget SndioPlugin::widgets = {
- WidgetEntry (N_("Device (blank for default):"),
- WidgetString ("sndio", "device")),
- WidgetCheck (N_("Save and restore volume:"),
- WidgetBool ("sndio", "save_volume"))
-};
-
-const PluginPreferences SndioPlugin::prefs = {{widgets}};
-
-bool SndioPlugin::init ()
-{
- aud_config_set_defaults ("sndio", defaults);
- return true;
-}
-
-void SndioPlugin::volume_cb (void *, unsigned int vol)
-{
- aud_set_int ("sndio", "volume", aud::rescale ((int) vol, SIO_MAXVOL, 100));
-}
-
-void SndioPlugin::set_volume (StereoVolume v)
-{
- int vol = aud::max (v.left, v.right);
- aud_set_int ("sndio", "volume", vol);
-
- pthread_mutex_lock (& m_mutex);
-
- if (m_handle)
- sio_setvol (m_handle, aud::rescale (vol, 100, SIO_MAXVOL));
-
- pthread_mutex_unlock (& m_mutex);
-}
-
-StereoVolume SndioPlugin::get_volume ()
-{
- int vol = aud_get_int ("sndio", "volume");
- return {vol, vol};
-}
-
-void SndioPlugin::move_cb (void * arg, int delta)
-{
- auto me = (SndioPlugin *) arg;
-
- me->m_frames_buffered -= delta;
- gettimeofday (& me->m_last_write_time, nullptr);
-
- pthread_cond_broadcast (& me->m_cond);
-}
-
-struct FormatData {
- int format;
- int bits, bytes;
- bool sign, le;
-};
-
-static const FormatData format_table = {
- {FMT_S8, 8, 1, true, false},
- {FMT_U8, 8, 1, false, false},
- {FMT_S16_LE, 16, 2, true, true},
- {FMT_S16_BE, 16, 2, true, false},
- {FMT_U16_LE, 16, 2, false, true},
- {FMT_U16_BE, 16, 2, false, false},
- {FMT_S24_LE, 24, 4, true, true},
- {FMT_S24_BE, 24, 4, true, false},
- {FMT_U24_LE, 24, 4, false, true},
- {FMT_U24_BE, 24, 4, false, false},
- {FMT_S32_LE, 32, 4, true, true},
- {FMT_S32_BE, 32, 4, true, false},
- {FMT_U32_LE, 32, 4, false, true},
- {FMT_U32_BE, 32, 4, false, false},
-};
-
-bool SndioPlugin::open_audio (int format, int rate, int channels)
-{
- const FormatData * fdata = nullptr;
-
- for (const FormatData & f : format_table)
- {
- if (f.format == format)
- fdata = & f;
- }
-
- if (! fdata)
- {
- aud_ui_show_error (str_printf (_("Sndio error: Unsupported audio format (%d)"), format));
- return false;
- }
-
- String device = aud_get_str ("sndio", "device");
- const char * device2 = device0 ? (const char *) device : SIO_DEVANY;
-
- m_handle = sio_open (device2, SIO_PLAY, true);
-
- if (! m_handle)
- {
- aud_ui_show_error (_("Sndio error: sio_open() failed"));
- return false;
- }
-
- m_rate = rate;
- m_channels = channels;
- m_bytes_per_frame = FMT_SIZEOF (format) * channels;
-
- m_paused = false;
- m_frames_buffered = 0;
- m_last_write_time = timeval ();
- m_flush_count = 0;
-
- int buffer_ms = aud_get_int (nullptr, "output_buffer_size");
-
- sio_par par;
- sio_initpar (& par);
-
- par.bits = fdata->bits;
- par.bps = fdata->bytes;
- par.sig = fdata->sign;
- par.le = fdata->le;
- par.msb = false;
- par.pchan = channels;
- par.rate = rate;
- par.bufsz = aud::rescale (buffer_ms, 1000, rate);
- par.xrun = SIO_IGNORE;
-
- if (! sio_setpar (m_handle, & par))
- {
- aud_ui_show_error (_("Sndio error: sio_setpar() failed"));
- goto fail;
- }
-
- if (aud_get_bool ("sndio", "save_volume"))
- set_volume (get_volume ());
-
- sio_onvol (m_handle, volume_cb, nullptr);
- sio_onmove (m_handle, move_cb, this);
-
- if (! sio_start (m_handle))
- {
- aud_ui_show_error (_("Sndio error: sio_start() failed"));
- goto fail;
- }
-
- return true;
-
-fail:
- sio_close (m_handle);
- m_handle = nullptr;
- return false;
-}
-
-void SndioPlugin::close_audio ()
-{
- sio_close (m_handle);
- m_handle = nullptr;
-}
-
-bool SndioPlugin::poll_locked ()
-{
- bool success = false;
- pollfd * fds = nullptr;
- int nfds, old_flush_count;
-
- nfds = sio_nfds (m_handle);
- if (nfds < 1)
- goto fail;
-
- fds = new pollfdnfds;
-
- nfds = sio_pollfd (m_handle, fds, POLLOUT);
- if (nfds < 1)
- goto fail;
-
- old_flush_count = m_flush_count;
-
- pthread_mutex_unlock (& m_mutex);
-
- if (poll (fds, nfds, -1) < 0)
- AUDERR ("poll() failed: %s\n", strerror (errno));
- else
- success = true;
-
- pthread_mutex_lock (& m_mutex);
-
- if (success && m_flush_count == old_flush_count)
- sio_revents (m_handle, fds);
-
-fail:
- delete fds;
- return success;
-}
-
-void SndioPlugin::period_wait ()
-{
- pthread_mutex_lock (& m_mutex);
-
- if (m_paused || sio_eof (m_handle) || ! poll_locked ())
- pthread_cond_wait (& m_cond, & m_mutex);
-
- pthread_mutex_unlock (& m_mutex);
-}
-
-int SndioPlugin::write_audio (const void * data, int size)
-{
- int len = 0;
- pthread_mutex_lock (& m_mutex);
-
- if (! m_paused)
- {
- len = sio_write (m_handle, data, size);
- m_frames_buffered += len / m_bytes_per_frame;
- }
-
- pthread_mutex_unlock (& m_mutex);
- return len;
-}
-
-void SndioPlugin::drain ()
-{
- pthread_mutex_lock (& m_mutex);
-
- if (! m_paused)
- {
- int d = aud::rescale (m_frames_buffered, m_rate, 1000);
- timespec delay = {d / 1000, d % 1000 * 1000000};
-
- pthread_mutex_unlock (& m_mutex);
- nanosleep (& delay, nullptr);
- pthread_mutex_lock (& m_mutex);
-
- poll_locked ();
- }
-
- pthread_mutex_unlock (& m_mutex);
-}
-
-int SndioPlugin::get_delay ()
-{
- auto timediff = (const timeval & a, const timeval & b) -> int64_t
- { return 1000 * (int64_t) (b.tv_sec - a.tv_sec) + (b.tv_usec - a.tv_usec) / 1000; };
-
- pthread_mutex_lock (& m_mutex);
-
- int delay = aud::rescale (m_frames_buffered, m_rate, 1000);
-
- if (m_last_write_time.tv_sec)
- {
- timeval now;
- gettimeofday (& now, nullptr);
- delay = aud::max (delay - timediff (m_last_write_time, now), (int64_t) 0);
- }
-
- pthread_mutex_unlock (& m_mutex);
- return delay;
-}
-
-void SndioPlugin::pause (bool pause)
-{
- pthread_mutex_lock (& m_mutex);
-
- m_paused = pause;
-
- pthread_cond_broadcast (& m_cond);
- pthread_mutex_unlock (& m_mutex);
-}
-
-void SndioPlugin::flush ()
-{
- pthread_mutex_lock (& m_mutex);
-
- sio_stop (m_handle);
-
- m_frames_buffered = 0;
- m_last_write_time = timeval ();
- m_flush_count ++;
-
- if (! sio_start (m_handle))
- AUDERR ("sio_start() failed\n");
-
- pthread_cond_broadcast (& m_cond);
- pthread_mutex_unlock (& m_mutex);
-}

audacious-plugins-3.6.2-gtk3.tar.bz2/src/song_change Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/song_change/Makefile Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/song_change/formatter.cc Deleted

@@ -1,104 +0,0 @@
-/* Audacious
- * Copyright (C) 2005-2007 Audacious team
- *
- * XMMS - Cross-platform multimedia player
- * Copyright (C) 1998-2003 Peter Alm, Mikael Alm, Olle Hallnas,
- * Thomas Nilsson and 4Front Technologies
- * Copyright (C) 1999-2003 Haavard Kvaalen
- *
- * 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; under version 3 of the License.
- *
- * 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>.
- *
- * The Audacious team does not consider modular code linking to
- * Audacious or using our public API to be a derived work.
- */
-
-#include <glib.h>
-#include <string.h>
-#include "formatter.h"
-
-Formatter *
-formatter_new(void)
-{
- Formatter *formatter = g_slice_new0(Formatter);
-
- formatter_associate(formatter, '%', "%");
- return formatter;
-}
-
-void
-formatter_destroy(Formatter * formatter)
-{
- int i;
-
- for (i = 0; i < 256; i++)
- if (formatter->valuesi)
- g_free(formatter->valuesi);
-
- g_slice_free(Formatter, formatter);
-}
-
-void
-formatter_associate(Formatter * formatter, const unsigned char id, const char *value)
-{
- formatter_dissociate(formatter, id);
- formatter->valuesid = g_strdup(value);
-}
-
-void
-formatter_dissociate(Formatter * formatter, const unsigned char id)
-{
- if (formatter->valuesid)
- g_free(formatter->valuesid);
- formatter->valuesid = 0;
-}
-
-char *
-formatter_format(Formatter * formatter, const char *format)
-{
- const char *p;
- char *q, *buffer;
- int len;
-
- for (p = format, len = 0; *p; p++)
- if (*p == '%') {
- if (formatter->values(int) *++p)
- len += strlen(formatter->values(int) *p);
- else if (!*p) {
- len += 1;
- p--;
- }
- else
- len += 2;
- }
- else
- len++;
- buffer = g_new(char, len + 1);
- for (p = format, q = buffer; *p; p++)
- if (*p == '%') {
- if (formatter->values(int) *++p) {
- g_strlcpy(q, formatter->values(int) *p, len - 1);
- q += strlen(q);
- }
- else {
- *q++ = '%';
- if (*p != '\0')
- *q++ = *p;
- else
- p--;
- }
- }
- else
- *q++ = *p;
- *q = 0;
- return buffer;
-}

audacious-plugins-3.6.2-gtk3.tar.bz2/src/song_change/formatter.h Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/song_change/song_change.cc Deleted

@@ -1,415 +0,0 @@
-/*
- * Audacious: A cross-platform multimedia player.
- * Copyright (c) 2005 Audacious Team
- */
-#include <glib.h>
-#include <gtk/gtk.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-
-#include <signal.h>
-#include <unistd.h>
-
-#include <string.h>
-
-#include <libaudcore/runtime.h>
-#include <libaudcore/drct.h>
-#include <libaudcore/i18n.h>
-#include <libaudcore/plugin.h>
-#include <libaudcore/preferences.h>
-#include <libaudcore/hook.h>
-#include <libaudcore/audstrings.h>
-#include <libaudcore/tuple.h>
-
-#include "formatter.h"
-
-class SongChange : public GeneralPlugin
-{
-public:
- static const PreferencesWidget widgets;
- static const PluginPreferences prefs;
-
- static constexpr PluginInfo info = {
- N_("Song Change"),
- PACKAGE,
- nullptr,
- & prefs
- };
-
- constexpr SongChange () : GeneralPlugin (info, false) {}
-
- bool init ();
- void cleanup ();
-};
-
-EXPORT SongChange aud_plugin_instance;
-
-static void songchange_playback_begin(void *, void *);
-static void songchange_playback_end(void *, void *);
-static void songchange_playlist_eof(void *, void *);
-static void songchange_playback_ttc(void *, void *);
-
-static String cmd_line;
-static String cmd_line_after;
-static String cmd_line_end;
-static String cmd_line_ttc;
-
-static GtkWidget *cmd_warn_label, *cmd_warn_img;
-
-/**
- * Escapes characters that are special to the shell inside double quotes.
- *
- * @param string String to be escaped.
- * @return Given string with special characters escaped. Must be freed with g_free().
- */
-static char *escape_shell_chars(const char * string)
-{
- const char *special = "$`\"\\"; /* Characters to escape */
- const char *in = string;
- char *out, *escaped;
- int num = 0;
-
- while (*in != '\0')
- if (strchr(special, *in++))
- num++;
-
- escaped = g_new(char, strlen(string) + num + 1);
-
- in = string;
- out = escaped;
-
- while (*in != '\0') {
- if (strchr(special, *in))
- *out++ = '\\';
- *out++ = *in++;
- }
- *out = '\0';
-
- return escaped;
-}
-
-static void bury_child(int signal)
-{
- waitpid(-1, nullptr, WNOHANG);
-}
-
-static void execute_command(char *cmd)
-{
- const char *argv4 = {"/bin/sh", "-c", nullptr, nullptr};
- int i;
- argv2 = cmd;
- signal(SIGCHLD, bury_child);
- if (fork() == 0)
- {
- /* We don't want this process to hog the audio device etc */
- for (i = 3; i < 255; i++)
- close(i);
- execv("/bin/sh", (char **)argv);
- }
-}
-
-/* Format codes:
- *
- * F - frequency (in hertz)
- * c - number of channels
- * f - filename (full path)
- * l - length (in milliseconds)
- * n - name
- * r - rate (in bits per second)
- * s - name (since everyone's used to it)
- * t - playlist position (%02d)
- * p - currently playing (1 or 0)
- * a - artist
- * b - album
- * r - track title
- */
-/* do_command(): do @cmd after replacing the format codes
- @cmd: command to run */
-static void do_command (const char * cmd)
-{
- char *shstring = nullptr, *temp;
- gboolean playing;
- Formatter *formatter;
-
- if (cmd && strlen(cmd) > 0)
- {
- formatter = formatter_new();
-
- playing = aud_drct_get_ready();
-
- Tuple tuple;
- if (playing)
- tuple = aud_drct_get_tuple ();
-
- String ctitle = tuple.get_str (Tuple::FormattedTitle);
- if (ctitle)
- {
- temp = escape_shell_chars (ctitle);
- formatter_associate(formatter, 's', temp);
- formatter_associate(formatter, 'n', temp);
- g_free(temp);
- }
- else
- {
- formatter_associate(formatter, 's', "");
- formatter_associate(formatter, 'n', "");
- }
-
- String filename = aud_drct_get_filename ();
- if (filename)
- {
- temp = escape_shell_chars (filename);
- formatter_associate(formatter, 'f', temp);
- g_free(temp);
- }
- else
- formatter_associate(formatter, 'f', "");
-
- if (playing)
- {
- int pos = aud_drct_get_position ();
- formatter_associate (formatter, 't', str_printf ("%02d", pos + 1));
- }
- else
- formatter_associate (formatter, 't', "");
-
- int length = tuple.get_int (Tuple::Length);
- if (length > 0)
- formatter_associate(formatter, 'l', int_to_str (length));
- else
- formatter_associate(formatter, 'l', "0");
-
- formatter_associate(formatter, 'p', int_to_str (playing));
-
- if (playing)
- {
- int brate, srate, chans;
- aud_drct_get_info (brate, srate, chans);
- formatter_associate (formatter, 'r', int_to_str (brate));
- formatter_associate (formatter, 'F', int_to_str (srate));
- formatter_associate (formatter, 'c', int_to_str (chans));
- }
-
- String artist = tuple.get_str (Tuple::Artist);
- if (artist)
- formatter_associate(formatter, 'a', artist);
- else
- formatter_associate(formatter, 'a', "");
-
- String album = tuple.get_str (Tuple::Album);
- if (album)
- formatter_associate(formatter, 'b', album);
- else
- formatter_associate(formatter, 'b', "");
-
- String title = tuple.get_str (Tuple::Title);
- if (title)
- formatter_associate(formatter, 'T', title);
- else
- formatter_associate(formatter, 'T', "");
-
- shstring = formatter_format(formatter, cmd);
- formatter_destroy(formatter);
-
- if (shstring)
- {
- execute_command(shstring);
- /* FIXME: This can possibly be freed too early */
- g_free(shstring);
- }
- }
-}
-
-static void read_config(void)
-{
- cmd_line = aud_get_str("song_change", "cmd_line");
- cmd_line_after = aud_get_str("song_change", "cmd_line_after");
- cmd_line_end = aud_get_str("song_change", "cmd_line_end");
- cmd_line_ttc = aud_get_str("song_change", "cmd_line_ttc");
-}
-
-void SongChange::cleanup ()
-{
- hook_dissociate("playback ready", songchange_playback_begin);
- hook_dissociate("playback end", songchange_playback_end);
- hook_dissociate("playlist end reached", songchange_playlist_eof);
- hook_dissociate("title change", songchange_playback_ttc);
-
- cmd_line = String ();
- cmd_line_after = String ();
- cmd_line_end = String ();
- cmd_line_ttc = String ();
-
- signal(SIGCHLD, SIG_DFL);
-}
-
-static int check_command(const char *command)
-{
- const char *dangerous = "fns";
- const char *c;
- int qu = 0;
-
- for (c = command; *c != '\0'; c++)
- {
- if (*c == '"' && (c == command || *(c - 1) != '\\'))
- qu = !qu;
- else if (*c == '%' && !qu && strchr(dangerous, *(c + 1)))
- return -1;
- }
- return 0;
-}
-
-bool SongChange::init ()
-{
- read_config();
-
- hook_associate("playback ready", songchange_playback_begin, nullptr);
- hook_associate("playback end", songchange_playback_end, nullptr);
- hook_associate("playlist end reached", songchange_playlist_eof, nullptr);
- hook_associate("title change", songchange_playback_ttc, nullptr);
-
- return TRUE;
-}
-
-static void songchange_playback_begin(void *, void *)
-{
- do_command (cmd_line);
-}
-
-static void songchange_playback_end(void *, void *)
-{
- do_command (cmd_line_after);
-}
-
-static void songchange_playback_ttc(void *, void *)
-{
- do_command (cmd_line_ttc);
-}
-
-static void songchange_playlist_eof(void *, void *)
-{
- do_command (cmd_line_end);
-}
-
-typedef struct {
- String cmd;
- String cmd_after;
- String cmd_end;
- String cmd_ttc;
-} SongChangeConfig;
-
-static SongChangeConfig config;
-
-static void edit_cb()
-{
- if (check_command(config.cmd) < 0 || check_command(config.cmd_after) < 0 ||
- check_command(config.cmd_end) < 0 || check_command(config.cmd_ttc) < 0)
- {
- gtk_widget_show(cmd_warn_img);
- gtk_widget_show(cmd_warn_label);
- }
- else
- {
- gtk_widget_hide(cmd_warn_img);
- gtk_widget_hide(cmd_warn_label);
- }
-}
-
-static void configure_ok_cb()
-{
- aud_set_str("song_change", "cmd_line", config.cmd);
- aud_set_str("song_change", "cmd_line_after", config.cmd_after);
- aud_set_str("song_change", "cmd_line_end", config.cmd_end);
- aud_set_str("song_change", "cmd_line_ttc", config.cmd_ttc);
-
- cmd_line = config.cmd;
- cmd_line_after = config.cmd_after;
- cmd_line_end = config.cmd_end;
- cmd_line_ttc = config.cmd_ttc;
-}
-
-/* static GtkWidget * custom_warning (void) */
-static void * custom_warning (void)
-{
- GtkWidget *bbox_hbox;
- char * temp;
-
- bbox_hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 6);
-
- cmd_warn_img = gtk_image_new_from_icon_name("dialog-warning", GTK_ICON_SIZE_MENU);
- gtk_box_pack_start(GTK_BOX(bbox_hbox), cmd_warn_img, FALSE, FALSE, 0);
-
- temp = g_strdup_printf(_("Parameters passed to the shell should be encapsulated in quotes. Doing otherwise is a security risk."));
- cmd_warn_label = gtk_label_new(temp);
- gtk_label_set_markup(GTK_LABEL(cmd_warn_label), temp);
- gtk_label_set_line_wrap(GTK_LABEL(cmd_warn_label), TRUE);
- gtk_box_pack_start(GTK_BOX(bbox_hbox), cmd_warn_label, FALSE, FALSE, 0);
- g_free(temp);
-
- gtk_widget_set_no_show_all(cmd_warn_img, TRUE);
- gtk_widget_set_no_show_all(cmd_warn_label, TRUE);
-
- edit_cb();
-
- return bbox_hbox;
-}
-
-const PreferencesWidget SongChange::widgets = {
- WidgetLabel (N_("Commands")),
-
- WidgetLabel (N_("Command to run when starting a new song:")),
- WidgetEntry (0, WidgetString (config.cmd, edit_cb)),
- WidgetSeparator ({true}),
-
- WidgetLabel (N_("Command to run at the end of a song:")),
- WidgetEntry (0, WidgetString (config.cmd_after, edit_cb)),
- WidgetSeparator ({true}),
-
- WidgetLabel (N_("Command to run at the end of the playlist:")),
- WidgetEntry (0, WidgetString (config.cmd_end, edit_cb)),
- WidgetSeparator ({true}),
-
- WidgetLabel (N_("Command to run when song title changes (for network streams):")),
- WidgetEntry (0, WidgetString (config.cmd_ttc, edit_cb)),
- WidgetSeparator ({true}),
-
- WidgetLabel (N_("You can use the following format strings which "
- "will be substituted before calling the command "
- "(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")),
-
- WidgetCustomGTK (custom_warning)
-};
-
-static void configure_init(void)
-{
- config.cmd = cmd_line;
- config.cmd_after = cmd_line_after;
- config.cmd_end = cmd_line_end;
- config.cmd_ttc = cmd_line_ttc;
-}
-
-static void configure_cleanup(void)
-{
- config.cmd = String ();
- config.cmd_after = String ();
- config.cmd_end = String ();
- config.cmd_ttc = String ();
-}
-
-const PluginPreferences SongChange::prefs = {
- {widgets},
- configure_init,
- configure_ok_cb,
- configure_cleanup,
-};

audacious-plugins-3.6.2-gtk3.tar.bz2/src/sox-resampler Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/sox-resampler/sox-resampler.cc Deleted

@@ -1,166 +0,0 @@
-/*
- * 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 <stdlib.h>
-#include <soxr.h>
-
-#include <libaudcore/i18n.h>
-#include <libaudcore/runtime.h>
-#include <libaudcore/plugin.h>
-#include <libaudcore/preferences.h>
-
-#define MIN_RATE 8000
-#define MAX_RATE 192000
-#define RATE_STEP 50
-
-class SoXResampler : public EffectPlugin
-{
-public:
- static const char about;
- static const char * const defaults;
- static const PreferencesWidget widgets;
- static const PluginPreferences prefs;
-
- static constexpr PluginInfo info = {
- N_("SoX Resampler"),
- PACKAGE,
- about,
- & prefs
- };
-
- /* order #2: must be before crossfade */
- constexpr SoXResampler () : EffectPlugin (info, 2, false) {}
-
- bool init ();
- void cleanup ();
-
- void start (int & channels, int & rate);
- Index<float> & process (Index<float> & data);
- bool flush (bool force);
-};
-
-EXPORT SoXResampler aud_plugin_instance;
-
-const char * const SoXResampler::defaults = {
- "quality", aud::numeric_string<SOXR_HQ>::str,
- "rate", "44100",
- nullptr};
-
-static soxr_t soxr;
-static soxr_error_t error;
-static int stored_channels;
-static double ratio;
-static Index<float> buffer;
-
-bool SoXResampler::init ()
-{
- aud_config_set_defaults ("soxr", defaults);
- return true;
-}
-
-void SoXResampler::cleanup ()
-{
- soxr_delete (soxr);
- soxr = 0;
- buffer.clear ();
-}
-
-void SoXResampler::start (int & channels, int & rate)
-{
- soxr_delete (soxr);
- soxr = 0;
-
- int new_rate = aud_get_int ("soxr", "rate");
- new_rate = aud::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(rate, new_rate, channels, & error, nullptr, & q, nullptr);
-
- if (error)
- {
- AUDERR (error);
- return;
- }
-
- stored_channels = channels;
- ratio = (double) new_rate / rate;
- rate = new_rate;
-}
-
-Index<float> & SoXResampler::process (Index<float> & data)
-{
- if (! soxr)
- return data;
-
- buffer.resize ((int) (data.len () * ratio) + 256);
-
- size_t samples_done;
- error = soxr_process (soxr, data.begin (), data.len () / stored_channels,
- nullptr, buffer.begin (), buffer.len () / stored_channels, & samples_done);
-
- if (error)
- {
- AUDERR (error);
- return data;
- }
-
- buffer.resize (samples_done * stored_channels);
-
- return buffer;
-}
-
-bool SoXResampler::flush (bool force)
-{
- if (soxr && (error = soxr_process(soxr, nullptr, 0, nullptr, nullptr, 0, nullptr)))
- AUDERR (error);
-
- return true;
-}
-
-const char SoXResampler::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 ComboItem method_list = {
- ComboItem (N_("Quick"), SOXR_QQ),
- ComboItem (N_("Low"), SOXR_LQ),
- ComboItem (N_("Medium"), SOXR_MQ),
- ComboItem (N_("High"), SOXR_HQ),
- ComboItem (N_("Very High"), SOXR_VHQ)
-};
-
-const PreferencesWidget SoXResampler::widgets = {
- WidgetCombo (N_("Quality:"),
- WidgetInt ("soxr", "quality"),
- {{method_list}}),
- WidgetSpin (N_("Rate:"),
- WidgetInt ("soxr", "rate"),
- {MIN_RATE, MAX_RATE, RATE_STEP, N_("Hz")})
-};
-
-const PluginPreferences SoXResampler::prefs = {{widgets}};

audacious-plugins-3.6.2-gtk3.tar.bz2/src/speed-pitch Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/speed-pitch/speed-pitch.cc Deleted

@@ -1,237 +0,0 @@
-/*
- * Speed and Pitch effect plugin for Audacious
- * Copyright 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 <math.h>
-#include <samplerate.h>
-
-#include <libaudcore/i18n.h>
-#include <libaudcore/runtime.h>
-#include <libaudcore/plugin.h>
-#include <libaudcore/preferences.h>
-
-/* The general idea of the speed change algorithm is to divide the input signal
- * into pieces, spaced at a time interval A, using a cosine-shaped window
- * function. The pieces are then reassembled by adding them together again,
- * spaced at another time interval B. By varying the ratio A:B, we change the
- * speed of the audio. */
-
-#define FREQ 10
-#define OVERLAP 3
-
-#define CFGSECT "speed-pitch"
-#define MINSPEED 0.5
-#define MAXSPEED 2.0
-#define MINPITCH 0.5
-#define MAXPITCH 2.0
-
-class SpeedPitch : public EffectPlugin
-{
-public:
- static const char * const defaults;
- static const PreferencesWidget widgets;
- static const PluginPreferences prefs;
-
- static constexpr PluginInfo info = {
- N_("Speed and Pitch"),
- PACKAGE,
- nullptr,
- & prefs
- };
-
- constexpr SpeedPitch () : EffectPlugin (info, 0, true) {}
-
- bool init ();
- void cleanup ();
-
- void start (int & channels, int & rate);
- bool flush (bool force);
- int adjust_delay (int delay);
-
- Index<float> & process (Index<float> & samples)
- { return process (samples, false); }
- Index<float> & finish (Index<float> & samples, bool end_of_playlist)
- { return process (samples, true); }
-
-private:
- Index<float> & process (Index<float> & samples, bool ending);
-};
-
-EXPORT SpeedPitch aud_plugin_instance;
-
-static int curchans, currate;
-static SRC_STATE * srcstate;
-static int outstep, width;
-static Index<float> cosine;
-static Index<float> in, out;
-static int src, dst;
-
-static void add_data (Index<float> & b, Index<float> & data, float ratio)
-{
- int oldlen = b.len ();
- int inframes = data.len () / curchans;
- int maxframes = (int) (inframes * ratio) + 256;
- b.resize (oldlen + maxframes * curchans);
-
- SRC_DATA d = SRC_DATA ();
-
- d.data_in = data.begin ();
- d.input_frames = inframes;
- d.data_out = & boldlen;
- d.output_frames = maxframes;
- d.src_ratio = ratio;
-
- src_process (srcstate, & d);
- b.resize (oldlen + d.output_frames_gen * curchans);
-}
-
-bool SpeedPitch::flush (bool force)
-{
- src_reset (srcstate);
-
- in.resize (0);
- out.resize (0);
-
- /* The source and destination pointers give the center of the next cosine
- * window to be copied, relative to the current input and output buffers. */
- src = dst = 0;
-
- /* The output buffer always extends right of the destination pointer by half
- * the width of a cosine window. */
- out.insert (0, width / 2);
-
- return true;
-}
-
-void SpeedPitch::start (int & chans, int & rate)
-{
- curchans = chans;
- currate = rate;
-
- if (srcstate)
- src_delete (srcstate);
-
- srcstate = src_new (SRC_LINEAR, curchans, nullptr);
-
- /* Calculate the width of the cosine window and the spacing interval for
- * output. Make them both even numbers for convenience. Note that the
- * cosine window is applied without deinterleaving the audio samples. */
- outstep = ((currate / FREQ) & ~1) * curchans;
- width = outstep * OVERLAP;
-
- /* Generate the cosine window, scaled vertically to compensate for the
- * overlap of the reassembled pieces of audio. */
- cosine.resize (width);
- for (int i = 0; i < width; i ++)
- cosinei = (1.0 - cos (2.0 * M_PI * i / width)) / OVERLAP;
-
- flush (true);
-}
-
-Index<float> & SpeedPitch::process (Index<float> & data, bool ending)
-{
- const float * cosine_center = & cosinewidth / 2;
- float pitch = aud_get_double (CFGSECT, "pitch");
- float speed = aud_get_double (CFGSECT, "speed");
-
- /* Copy the passed audio to the input buffer, scaled to adjust pitch. */
- add_data (in, data, 1.0 / pitch);
-
- /* Calculate the spacing interval for input. */
- int instep = (int) round ((outstep / curchans) * speed / pitch) * curchans;
-
- /* Stop copying half a window's width before the end of the input buffer (or
- * right up to the end of the buffer if the song is ending). */
- int stop = in.len () - (ending ? 0 : width / 2);
-
- while (src <= stop)
- {
- /* Truncate the window to avoid overflows if necessary. */
- int begin = aud::max (-(width / 2), aud::max (-src, -dst));
- int end = aud::min (width / 2, aud::min (in.len () - src, out.len () - dst));
-
- for (int i = begin; i < end; i ++)
- outdst + i += insrc + i * cosine_centeri;
-
- src += instep;
- dst += outstep;
-
- out.insert (-1, outstep);
- }
-
- /* Discard input up to half a window's width before the source pointer (or
- * right up to the previous source pointer if the song is ending. */
- int seek = aud::clamp (0, src - (ending ? instep : width / 2), in.len ());
- in.remove (0, seek);
- src -= seek;
-
- data.resize (0);
-
- /* Return output up to half a window's width before the destination pointer
- * (or right up to the previous destination pointer if the song is ending). */
- int ret = aud::clamp (0, dst - (ending ? outstep : width / 2), out.len ());
- data.move_from (out, 0, 0, ret, true, true);
- dst -= ret;
-
- return data;
-}
-
-int SpeedPitch::adjust_delay (int delay)
-{
- float samples_to_ms = 1000.0 / (curchans * currate);
- float speed = aud_get_double (CFGSECT, "speed");
- int in_samples = in.len () - src;
- int out_samples = dst;
-
- return (delay + in_samples * samples_to_ms) * speed + out_samples * samples_to_ms;
-}
-
-const char * const SpeedPitch::defaults = {
- "speed", "1",
- "pitch", "1",
- nullptr};
-
-const PreferencesWidget SpeedPitch::widgets = {
- WidgetLabel (N_("Speed and Pitch")),
- WidgetSpin (N_("Speed:"),
- WidgetFloat (CFGSECT, "speed"),
- {MINSPEED, MAXSPEED, 0.05}),
- WidgetSpin (N_("Pitch:"),
- WidgetFloat (CFGSECT, "pitch"),
- {MINPITCH, MAXPITCH, 0.05})
-};
-
-const PluginPreferences SpeedPitch::prefs = {{widgets}};
-
-bool SpeedPitch::init ()
-{
- aud_config_set_defaults (CFGSECT, defaults);
- return true;
-}
-
-void SpeedPitch::cleanup ()
-{
- if (srcstate)
- src_delete (srcstate);
-
- srcstate = nullptr;
-
- cosine.clear ();
- in.clear ();
- out.clear ();
-}

audacious-plugins-3.6.2-gtk3.tar.bz2/src/xsf/ao.h Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/xsf/corlett.cc Deleted

@@ -1,385 +0,0 @@
-/*
-
-	Audio Overload SDK
-
-	Copyright (c) 2007-2008, R. Belmont and Richard Bannister.
-
-	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.
-	* Neither the names of R. Belmont and Richard Bannister nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
-
-	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 OWNER 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.
-*/
-
-// corlett.c
-
-// Decodes file format designed by Neill Corlett (PSF, QSF, ...)
-
-/*
- - First 3 bytes: ASCII signature: "PSF" (case sensitive)
-
-- Next 1 byte: Version byte
- The version byte is used to determine the type of PSF file. It does NOT
- affect the basic structure of the file in any way.
-
- Currently accepted version bytes are:
- 0x01: Playstation (PSF1)
- 0x02: Playstation 2 (PSF2)
- 0x11: Saturn (SSF) TENTATIVE
- 0x12: Dreamcast (DSF) TENTATIVE
- 0x21: Nintendo 64 (USF) RESERVED
- 0x41: Capcom QSound (QSF)
-
-- Next 4 bytes: Size of reserved area (R), little-endian unsigned long
-
-- Next 4 bytes: Compressed program length (N), little-endian unsigned long
- This is the length of the program data _after_ compression.
-
-- Next 4 bytes: Compressed program CRC-32, little-endian unsigned long
- This is the CRC-32 of the program data _after_ compression. Filling in
- this value is mandatory, as a PSF file may be regarded as corrupt if it
- does not match.
-
-- Next R bytes: Reserved area.
- May be empty if R is 0 bytes.
-
-- Next N bytes: Compressed program, in zlib compress() format.
- May be empty if N is 0 bytes.
-
-The following data is optional and may be omitted:
-
-- Next 5 bytes: ASCII signature: "TAG" (case sensitive)
- If these 5 bytes do not match, then the remainder of the file may be
- regarded as invalid and discarded.
-
-- Remainder of file: Uncompressed ASCII tag data.
-*/
-
-#include <assert.h>
-#include <string.h>
-#include <stdlib.h>
-
-#include <zlib.h>
-
-#define WANT_AUD_BSWAP
-#include <libaudcore/audio.h>
-#include <libaudcore/audstrings.h>
-
-#include "ao.h"
-#include "corlett.h"
-
-#define LE32(x) FROM_LE32(x)
-
-#define DECOMP_MAX_SIZE		((32 * 1024 * 1024) + 12)
-
-int corlett_decode(uint8_t *input, uint32_t input_len, uint8_t **output, uint64_t *size, corlett_t **c)
-{
-	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_t *)input;
-
-	// Check we have a PSF format file.
-	if ((input0 != 'P') || (input1 != 'S') || (input2 != 'F'))
-	{
-		return AO_FAIL;
-	}
-
-	// Get our values
-	res_area = LE32(buf1);
-	comp_length = LE32(buf2);
-	comp_crc = LE32(buf3);
-
-	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 *)&buf4+(res_area/4), comp_length);
-		if (actual_crc != comp_crc)
-			return AO_FAIL;
-
-		// Decompress data if any
-		decomp_dat = (uint8_t *) malloc(DECOMP_MAX_SIZE);
-		decomp_length = DECOMP_MAX_SIZE;
-		if (uncompress(decomp_dat, &decomp_length, (unsigned char *)&buf4+(res_area/4), comp_length) != Z_OK)
-		{
-			free(decomp_dat);
-			return AO_FAIL;
-		}
-
-		// Resize memory buffer to what we actually need
-		decomp_dat = (uint8_t *) realloc(decomp_dat, (size_t)decomp_length + 1);
-	}
-	else
-	{
-		decomp_dat = nullptr;
-		decomp_length = 0;
-	}
-
-	// Make structure
-	*c = (corlett_t *) malloc(sizeof(corlett_t));
-	if (!(*c))
-	{
-		free(decomp_dat);
-		return AO_FAIL;
-	}
-	memset(*c, 0, sizeof(corlett_t));
-	strcpy((*c)->inf_title, "n/a");
-	strcpy((*c)->inf_copy, "n/a");
-	strcpy((*c)->inf_artist, "n/a");
-	strcpy((*c)->inf_game, "n/a");
-	strcpy((*c)->inf_year, "n/a");
-	strcpy((*c)->inf_length, "n/a");
-	strcpy((*c)->inf_fade, "n/a");
-
-	// set reserved section pointer
-	(*c)->res_section = &buf4;
-	(*c)->res_size = res_area;
-
-	// Return it
-	if (output != nullptr && size != nullptr)
-	{
-		*output = decomp_dat;
-		*size = decomp_length;
-	}
-	else
-		free(decomp_dat);
-
-	// Next check for tags
-	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_dec0 == '') && (tag_dec1 == 'T') && (tag_dec2 == 'A') && (tag_dec3 == 'G') && (tag_dec4 == ''))
-	{
-		int l, num_tags, data;
-
-		// Tags found!
-		tag_dec += 5;
-		input_len -= 5;
-
-		data = false;
-		num_tags = 0;
-		l = 0;
-		while (input_len && (num_tags < MAX_UNKNOWN_TAGS))
-		{
-			if (data)
-			{
-				if ((*tag_dec == 0xA) || (*tag_dec == 0x00))
-				{
-					(*c)->tag_datanum_tagsl = 0;
-					data = false;
-					num_tags++;
-					l = 0;
-				}
-				else
-				{
-					(*c)->tag_datanum_tagsl++ = *tag_dec;
-				}
-			}
-			else
-			{
-				if (*tag_dec == '=')
-				{
-					(*c)->tag_namenum_tagsl = 0;
-					l = 0;
-					data = true;
-				}
-				else
-				{
-					(*c)->tag_namenum_tagsl++ = *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 (!strcmp_nocase((*c)->tag_namenum_tags, "_lib"))
-			{
-				strcpy((*c)->lib, (*c)->tag_datanum_tags);
-				(*c)->tag_datanum_tags0 = 0;
-				(*c)->tag_namenum_tags0 = 0;
-			}
-			else if (!strncmp((*c)->tag_namenum_tags, "_lib2", 5))
-			{
-				strcpy((*c)->libaux0, (*c)->tag_datanum_tags);
-				(*c)->tag_datanum_tags0 = 0;
-				(*c)->tag_namenum_tags0 = 0;
-			}
-			else if (!strncmp((*c)->tag_namenum_tags, "_lib3", 5))
-			{
-				strcpy((*c)->libaux1, (*c)->tag_datanum_tags);
-				(*c)->tag_datanum_tags0 = 0;
-				(*c)->tag_namenum_tags0 = 0;
-			}
-			else if (!strncmp((*c)->tag_namenum_tags, "_lib4", 5))
-			{
-				strcpy((*c)->libaux2, (*c)->tag_datanum_tags);
-				(*c)->tag_datanum_tags0 = 0;
-				(*c)->tag_namenum_tags0 = 0;
-			}
-			else if (!strncmp((*c)->tag_namenum_tags, "_lib5", 5))
-			{
-				strcpy((*c)->libaux3, (*c)->tag_datanum_tags);
-				(*c)->tag_datanum_tags0 = 0;
-				(*c)->tag_namenum_tags0 = 0;
-			}
-			else if (!strncmp((*c)->tag_namenum_tags, "_lib6", 5))
-			{
-				strcpy((*c)->libaux4, (*c)->tag_datanum_tags);
-				(*c)->tag_datanum_tags0 = 0;
-				(*c)->tag_namenum_tags0 = 0;
-			}
-			else if (!strncmp((*c)->tag_namenum_tags, "_lib7", 5))
-			{
-				strcpy((*c)->libaux5, (*c)->tag_datanum_tags);
-				(*c)->tag_datanum_tags0 = 0;
-				(*c)->tag_namenum_tags0 = 0;
-			}
-			else if (!strncmp((*c)->tag_namenum_tags, "_lib8", 5))
-			{
-				strcpy((*c)->libaux6, (*c)->tag_datanum_tags);
-				(*c)->tag_datanum_tags0 = 0;
-				(*c)->tag_namenum_tags0 = 0;
-			}
-			else if (!strncmp((*c)->tag_namenum_tags, "_lib9", 5))
-			{
-				strcpy((*c)->libaux7, (*c)->tag_datanum_tags);
-				(*c)->tag_datanum_tags0 = 0;
-				(*c)->tag_namenum_tags0 = 0;
-			}
-			else if (!strncmp((*c)->tag_namenum_tags, "_refresh", 8))
-			{
-				strcpy((*c)->inf_refresh, (*c)->tag_datanum_tags);
-				(*c)->tag_datanum_tags0 = 0;
-				(*c)->tag_namenum_tags0 = 0;
-			}
-			else if (!strncmp((*c)->tag_namenum_tags, "title", 5))
-			{
-				strcpy((*c)->inf_title, (*c)->tag_datanum_tags);
-				(*c)->tag_datanum_tags0 = 0;
-				(*c)->tag_namenum_tags0 = 0;
-			}
-			else if (!strncmp((*c)->tag_namenum_tags, "copyright", 9))
-			{
-				strcpy((*c)->inf_copy, (*c)->tag_datanum_tags);
-				(*c)->tag_datanum_tags0 = 0;
-				(*c)->tag_namenum_tags0 = 0;
-			}
-			else if (!strncmp((*c)->tag_namenum_tags, "artist", 6))
-			{
-				strcpy((*c)->inf_artist, (*c)->tag_datanum_tags);
-				(*c)->tag_datanum_tags0 = 0;
-				(*c)->tag_namenum_tags0 = 0;
-			}
-			else if (!strncmp((*c)->tag_namenum_tags, "game", 4))
-			{
-				strcpy((*c)->inf_game, (*c)->tag_datanum_tags);
-				(*c)->tag_datanum_tags0 = 0;
-				(*c)->tag_namenum_tags0 = 0;
-			}
-			else if (!strncmp((*c)->tag_namenum_tags, "year", 4))
-			{
-				strcpy((*c)->inf_year, (*c)->tag_datanum_tags);
-				(*c)->tag_datanum_tags0 = 0;
-				(*c)->tag_namenum_tags0 = 0;
-			}
-			else if (!strncmp((*c)->tag_namenum_tags, "length", 6))
-			{
-				strcpy((*c)->inf_length, (*c)->tag_datanum_tags);
-				(*c)->tag_datanum_tags0 = 0;
-				(*c)->tag_namenum_tags0 = 0;
-			}
-			else if (!strncmp((*c)->tag_namenum_tags, "fade", 4))
-			{
-				strcpy((*c)->inf_fade, (*c)->tag_datanum_tags);
-				(*c)->tag_datanum_tags0 = 0;
-				(*c)->tag_namenum_tags0 = 0;
-			}
-		}
-	}
-
-	// Bingo
-	return AO_SUCCESS;
-}
-
-uint32_t psfTimeToMS(char *str)
-{
-	int x, c=0;
-	uint32_t acc=0;
-	char s100;
-
-	strncpy(s,str,100);
-	s99=0;
-
-	for (x=strlen(s); x>=0; x--)
-	{
-		if (sx=='.' || sx==',')
-		{
-			acc=atoi(s+x+1);
-			sx=0;
-		}
-		else if (sx==':')
-		{
-			if(c==0)
-			{
-				acc+=atoi(s+x+1)*10;
-			}
-			else if(c==1)
-			{
-				acc+=atoi(s+x+(x?1:0))*10*60;
-			}
-
-			c++;
-			sx=0;
-		}
-		else if (x==0)
-		{
-			if(c==0)
-			{
-				acc+=atoi(s+x)*10;
-			}
-			else if(c==1)
-			{
-				acc+=atoi(s+x)*10*60;
-			}
-			else if(c==2)
-			{
-				acc+=atoi(s+x)*10*60*60;
-			}
-		}
-	}
-
-	acc*=100;
-	return(acc);
-}
-

audacious-plugins-3.6.2-gtk3.tar.bz2/src/xsf/corlett.h Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/xsf/desmume/GPU.cc Deleted

@@ -1,98 +0,0 @@
-/* Copyright (C) 2006 yopyop
- yopyop156@ifrance.com
- yopyop156.ifrance.com
-
- Copyright (C) 2006-2007 Theo Berkau
- Copyright (C) 2007 shash
-
- This file is part of DeSmuME
-
- DeSmuME 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.
-
- DeSmuME 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 DeSmuME; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-*/
-
-// CONTENTS
-//	INITIALIZATION
-//	ENABLING / DISABLING LAYERS
-//	PARAMETERS OF BACKGROUNDS
-//	PARAMETERS OF ROTOSCALE
-//	PARAMETERS OF EFFECTS
-//	PARAMETERS OF WINDOWS
-//	ROUTINES FOR INSIDE / OUTSIDE WINDOW CHECKS
-//	PIXEL RENDERING
-//	BACKGROUND RENDERING -TEXT-
-//	BACKGROUND RENDERING -ROTOSCALE-
-//	BACKGROUND RENDERING -HELPER FUNCTIONS-
-//	SPRITE RENDERING -HELPER FUNCTIONS-
-//	SPRITE RENDERING
-//	SCREEN FUNCTIONS
-//	GRAPHICS CORE
-//	GPU_ligne
-
-#include <string.h>
-#include <stdlib.h>
-#include <assert.h>
-#include "MMU.h"
-#include "GPU.h"
-
-ARM9_struct ARM9Mem;
-
-NDS_Screen MainScreen;
-NDS_Screen SubScreen;
-
-//#define DEBUG_TRI
-
-/*****************************************************************************/
-//			INITIALIZATION
-/*****************************************************************************/
-
-GPU * GPU_Init(u8 l)
-{
- GPU * g;
-
- if ((g = (GPU *) malloc(sizeof(GPU))) == nullptr)
- return nullptr;
-
- GPU_Reset(g, l);
- return g;
-}
-
-void GPU_Reset(GPU *g, u8 l)
-{
- memset(g, 0, sizeof(GPU));
-}
-
-void GPU_DeInit(GPU * gpu)
-{
-	if (gpu) free(gpu);
-}
-
-
-int Screen_Init(int coreid) {
- MainScreen.gpu = GPU_Init(0);
- SubScreen.gpu = GPU_Init(1);
-
- return 0;
-}
-
-void Screen_Reset(void) {
- GPU_Reset(MainScreen.gpu, 0);
- GPU_Reset(SubScreen.gpu, 1);
-}
-
-void Screen_DeInit(void) {
-	GPU_DeInit(MainScreen.gpu);
-	GPU_DeInit(SubScreen.gpu);
-
-}

audacious-plugins-3.6.2-gtk3.tar.bz2/src/xsf/desmume/GPU.h Deleted

@@ -1,805 +0,0 @@
-/* Copyright (C) 2006 yopyop
-	yopyop156@ifrance.com
-	yopyop156.ifrance.com
-
-	Copyright (C) 2006-2007 Theo Berkau
-	Copyright (C) 2007 shash
-
-	This file is part of DeSmuME
-
-	DeSmuME 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.
-
-	DeSmuME 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 DeSmuME; if not, write to the Free Software
-	Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-*/
-
-#ifndef GPU_H
-#define GPU_H
-
-#include "ARM9.h"
-#include <stdio.h>
-#include "mem.h"
-#include "registers.h"
-#include "FIFO.h"
-#include "MMU.h"
-
-/*******************************************************************************
- this structure is for display control,
- it holds flags for general display
-*******************************************************************************/
-
-#ifdef WORDS_BIGENDIAN
-struct _DISPCNT
-{
-/* 7*/ u8 ForceBlank:1; // A+B:
-/* 6*/ u8 OBJ_BMP_mapping:1; // A+B: 0=2D (128KB), 1=1D (128..256KB)
-/* 5*/ u8 OBJ_BMP_2D_dim:1; // A+B: 0=128x512, 1=256x256 pixels
-/* 4*/ u8 OBJ_Tile_1D:1; // A+B: 0=2D (32KB), 1=1D (32..256KB)
-/* 3*/ u8 BG0_3D:1; // A : 0=2D, 1=3D
-/* 0*/ u8 BG_Mode:3; // A+B:
-/*15*/ u8 WinOBJ_Enable:1; // A+B: 0=disable, 1=Enable
-/*14*/ u8 Win1_Enable:1; // A+B: 0=disable, 1=Enable
-/*13*/ u8 Win0_Enable:1; // A+B: 0=disable, 1=Enable
-/*12*/ u8 OBJ_Enable:1; // A+B: 0=disable, 1=Enable
-/*11*/ u8 BG3_Enable:1; // A+B: 0=disable, 1=Enable
-/*10*/ u8 BG2_Enable:1; // A+B: 0=disable, 1=Enable
-/* 9*/ u8 BG1_Enable:1; // A+B: 0=disable, 1=Enable
-/* 8*/ u8 BG0_Enable:1; // A+B: 0=disable, 1=Enable
-/*23*/ u8 OBJ_HBlank_process:1; // A+B: OBJ processed during HBlank (GBA bit5)
-/*22*/ u8 OBJ_BMP_1D_Bound:1; // A :
-/*20*/ u8 OBJ_Tile_1D_Bound:2; // A+B:
-/*18*/ u8 VRAM_Block:2; // A : VRAM block (0..3=A..D)
-
-/*16*/ u8 DisplayMode:2; // A+B: coreA(0..3) coreB(0..1) GBA(Green Swap)
- // 0=off (white screen)
- // 1=on (normal BG & OBJ layers)
- // 2=VRAM display (coreA only)
- // 3=RAM display (coreA only, DMA transfers)
-
-/*31*/ u8 ExOBJPalette_Enable:1; // A+B: 0=disable, 1=Enable OBJ extended Palette
-/*30*/ u8 ExBGxPalette_Enable:1; // A+B: 0=disable, 1=Enable BG extended Palette
-/*27*/ u8 ScreenBase_Block:3; // A : Screen Base (64K step)
-/*24*/ u8 CharacBase_Block:3; // A : Character Base (64K step)
-};
-#else
-struct _DISPCNT
-{
-/* 0*/ u8 BG_Mode:3; // A+B:
-/* 3*/ u8 BG0_3D:1; // A : 0=2D, 1=3D
-/* 4*/ u8 OBJ_Tile_1D:1; // A+B: 0=2D (32KB), 1=1D (32..256KB)
-/* 5*/ u8 OBJ_BMP_2D_dim:1; // A+B: 0=128x512, 1=256x256 pixels
-/* 6*/ u8 OBJ_BMP_mapping:1; // A+B: 0=2D (128KB), 1=1D (128..256KB)
-
- // 7-15 same as GBA
-/* 7*/ u8 ForceBlank:1; // A+B:
-/* 8*/ u8 BG0_Enable:1; // A+B: 0=disable, 1=Enable
-/* 9*/ u8 BG1_Enable:1; // A+B: 0=disable, 1=Enable
-/*10*/ u8 BG2_Enable:1; // A+B: 0=disable, 1=Enable
-/*11*/ u8 BG3_Enable:1; // A+B: 0=disable, 1=Enable
-/*12*/ u8 OBJ_Enable:1; // A+B: 0=disable, 1=Enable
-/*13*/ u8 Win0_Enable:1; // A+B: 0=disable, 1=Enable
-/*14*/ u8 Win1_Enable:1; // A+B: 0=disable, 1=Enable
-/*15*/ u8 WinOBJ_Enable:1; // A+B: 0=disable, 1=Enable
-
-/*16*/ u8 DisplayMode:2; // A+B: coreA(0..3) coreB(0..1) GBA(Green Swap)
- // 0=off (white screen)
- // 1=on (normal BG & OBJ layers)
- // 2=VRAM display (coreA only)
- // 3=RAM display (coreA only, DMA transfers)
-
-/*18*/ u8 VRAM_Block:2; // A : VRAM block (0..3=A..D)
-/*20*/ u8 OBJ_Tile_1D_Bound:2; // A+B:
-/*22*/ u8 OBJ_BMP_1D_Bound:1; // A :
-/*23*/ u8 OBJ_HBlank_process:1; // A+B: OBJ processed during HBlank (GBA bit5)
-/*24*/ u8 CharacBase_Block:3; // A : Character Base (64K step)
-/*27*/ u8 ScreenBase_Block:3; // A : Screen Base (64K step)
-/*30*/ u8 ExBGxPalette_Enable:1; // A+B: 0=disable, 1=Enable BG extended Palette
-/*31*/ u8 ExOBJPalette_Enable:1; // A+B: 0=disable, 1=Enable OBJ extended Palette
-};
-#endif
-
-typedef union
-{
- struct _DISPCNT bits;
- u32 val;
-} DISPCNT;
-#define BGxENABLED(cnt,num) ((num<8)? ((cnt.val>>8) & num):0)
-
-
-
-
-/*******************************************************************************
- this structure is for display control of a specific layer,
- there are 4 background layers
- their priority indicate which one to draw on top of the other
- some flags indicate special drawing mode, size, FX
-*******************************************************************************/
-
-#ifdef WORDS_BIGENDIAN
-struct _BGxCNT
-{
-/* 7*/ u8 Palette_256:1; // 0=16x16, 1=1*256 palette
-/* 6*/ u8 Mosaic_Enable:1; // 0=disable, 1=Enable mosaic
-/* 2*/ u8 CharacBase_Block:4; // individual character base offset (n*16KB)
-/* 0*/ u8 Priority:2; // 0..3=high..low
-/*14*/ u8 ScreenSize:2; // text : 256x256 512x256 256x512 512x512
- // x/rot/s : 128x128 256x256 512x512 1024x1024
- // bmp : 128x128 256x256 512x256 512x512
- // large : 512x1024 1024x512 - -
-/*13*/ u8 PaletteSet_Wrap:1; // BG0 extended palette set 0=set0, 1=set2
- // BG1 extended palette set 0=set1, 1=set3
- // BG2 overflow area wraparound 0=off, 1=wrap
- // BG3 overflow area wraparound 0=off, 1=wrap
-/* 8*/ u8 ScreenBase_Block:5; // individual screen base offset (text n*2KB, BMP n*16KB)
-};
-#else
-struct _BGxCNT
-{
-/* 0*/ u8 Priority:2; // 0..3=high..low
-/* 2*/ u8 CharacBase_Block:4; // individual character base offset (n*16KB)
-/* 6*/ u8 Mosaic_Enable:1; // 0=disable, 1=Enable mosaic
-/* 7*/ u8 Palette_256:1; // 0=16x16, 1=1*256 palette
-/* 8*/ u8 ScreenBase_Block:5; // individual screen base offset (text n*2KB, BMP n*16KB)
-/*13*/ u8 PaletteSet_Wrap:1; // BG0 extended palette set 0=set0, 1=set2
- // BG1 extended palette set 0=set1, 1=set3
- // BG2 overflow area wraparound 0=off, 1=wrap
- // BG3 overflow area wraparound 0=off, 1=wrap
-/*14*/ u8 ScreenSize:2; // text : 256x256 512x256 256x512 512x512
- // x/rot/s : 128x128 256x256 512x512 1024x1024
- // bmp : 128x128 256x256 512x256 512x512
- // large : 512x1024 1024x512 - -
-};
-#endif
-
-
-typedef union
-{
- struct _BGxCNT bits;
- u16 val;
-} BGxCNT;
-
-/*******************************************************************************
- this structure is for background offset
-*******************************************************************************/
-
-typedef struct {
- u16 BGxHOFS;
- u16 BGxVOFS;
-} BGxOFS;
-
-/*******************************************************************************
- this structure is for rotoscale parameters
-*******************************************************************************/
-
-typedef struct {
- s16 BGxPA;
- s16 BGxPB;
- s16 BGxPC;
- s16 BGxPD;
- s32 BGxX;
- s32 BGxY;
-} BGxPARMS;
-
-
-/*******************************************************************************
-	these structures are for window description,
-	windows are square regions and can "subclass"
-	background layers or object layers (i.e window controls the layers)
-
-	screen
-	|
-	+-- Window0/Window1/OBJwindow/OutOfWindows
-		|
-		+-- BG0/BG1/BG2/BG3/OBJ
-*******************************************************************************/
-
-typedef union {
-	struct	{
-		u8 end:8;
-		u8 start:8;
-	} bits ;
-	u16 val;
-} WINxDIM;
-
-#ifdef WORDS_BIGENDIAN
-typedef struct {
-/* 6*/ u8 :2;
-/* 5*/ u8 WINx_Effect_Enable:1;
-/* 4*/ u8 WINx_OBJ_Enable:1;
-/* 3*/ u8 WINx_BG3_Enable:1;
-/* 2*/ u8 WINx_BG2_Enable:1;
-/* 1*/ u8 WINx_BG1_Enable:1;
-/* 0*/ u8 WINx_BG0_Enable:1;
-} WINxBIT;
-#else
-typedef struct {
-/* 0*/ u8 WINx_BG0_Enable:1;
-/* 1*/ u8 WINx_BG1_Enable:1;
-/* 2*/ u8 WINx_BG2_Enable:1;
-/* 3*/ u8 WINx_BG3_Enable:1;
-/* 4*/ u8 WINx_OBJ_Enable:1;
-/* 5*/ u8 WINx_Effect_Enable:1;
-/* 6*/ u8 :2;
-} WINxBIT;
-#endif
-
-#ifdef WORDS_BIGENDIAN
-typedef union {
-	struct {
-		WINxBIT win0;
-		WINxBIT win1;
-	} bits;
-	struct {
-		u8 :3;
-		u8 win0_en:5;
-		u8 :3;
-		u8 win1_en:5;
-	} packed_bits;
-	struct {
-		u8 low;
-		u8 high;
-	} bytes;
-	u16 val ;
-} WINxCNT ;
-#else
-typedef union {
-	struct {
-		WINxBIT win0;
-		WINxBIT win1;
-	} bits;
-	struct {
-		u8 win0_en:5;
-		u8 :3;
-		u8 win1_en:5;
-		u8 :3;
-	} packed_bits;
-	struct {
-		u8 low;
-		u8 high;
-	} bytes;
-	u16 val ;
-} WINxCNT ;
-#endif
-
-/*
-typedef struct {
- WINxDIM WIN0H;
- WINxDIM WIN1H;
- WINxDIM WIN0V;
- WINxDIM WIN1V;
- WINxCNT WININ;
- WINxCNT WINOUT;
-} WINCNT;
-*/
-
-/*******************************************************************************
- this structure is for miscellanous settings
- //TODO: needs further description
-*******************************************************************************/
-
-typedef struct {
- u16 MOSAIC;
- u16 unused1;
- u16 unused2;//BLDCNT;
- u16 unused3;//BLDALPHA;
- u16 unused4;//BLDY;
- u16 unused5;
-	/*
- u16 unused6;
- u16 unused7;
- u16 unused8;
- u16 unused9;
-	*/
-} MISCCNT;
-
-
-/*******************************************************************************
- this structure is for 3D settings
-*******************************************************************************/
-
-struct _DISP3DCNT
-{
-/* 0*/ u8 EnableTexMapping:1; //
-/* 1*/ u8 PolygonShading:1; // 0=Toon Shading, 1=Highlight Shading
-/* 2*/ u8 EnableAlphaTest:1; // see ALPHA_TEST_REF
-/* 3*/ u8 EnableAlphaBlending:1; // see various Alpha values
-/* 4*/ u8 EnableAntiAliasing:1; //
-/* 5*/ u8 EnableEdgeMarking:1; // see EDGE_COLOR
-/* 6*/ u8 FogOnlyAlpha:1; // 0=Alpha and Color, 1=Only Alpha (see FOG_COLOR)
-/* 7*/ u8 EnableFog:1; // Fog Master Enable
-/* 8*/ u8 FogShiftSHR:4; // 0..10 SHR-Divider (see FOG_OFFSET)
-/*12*/ u8 AckColorBufferUnderflow:1; // Color Buffer RDLINES Underflow (0=None, 1=Underflow/Acknowledge)
-/*13*/ u8 AckVertexRAMOverflow:1; // Polygon/Vertex RAM Overflow (0=None, 1=Overflow/Acknowledge)
-/*14*/ u8 RearPlaneMode:1; // 0=Blank, 1=Bitmap
-/*15*/ u8 :1;
-/*16*/ u16 :16;
-};
-
-typedef union
-{
- struct _DISP3DCNT bits;
- u32 val;
-} DISP3DCNT;
-
-/*******************************************************************************
- this structure is for capture control (core A only)
-
- source:
- http://nocash.emubase.de/gbatek.htm#dsvideocaptureandmainmemorydisplaymode
-*******************************************************************************/
-
-struct _DISPCAPCNT
-{
-/* 0*/ u8 BlendFactor_A:5; // 0..16 = Blending Factor for Source A
-/* 5*/ u8 :3; //
-/* 8*/ u8 BlendFactor_B:5; // 0..16 = Blending Factor for Source B
-/*13*/ u8 :3; //
-/*16*/ u8 VRAM_Write_Block:2; // 0..3 = VRAM A..D
-/*18*/ u8 VRAM_Write_Offset:2; // n x 0x08000
-/*20*/ u8 Capture_Size:2; // 0=128x128, 1=256x64, 2=256x128, 3=256x192 dots
-/*22*/ u8 :2; //
-/*24*/ u8 Source_A:1; // 0=Graphics Screen BG+3D+OBJ, 1=3D Screen
-/*25*/ u8 Source_B:1; // 0=VRAM, 1=Main Memory Display FIFO
-/*26*/ u8 VRAM_Read_Offset:2; // n x 0x08000
-/*28*/ u8 :1; //
-/*29*/ u8 Capture_Source:2; // 0=Source A, 1=Source B, 2/3=Sources A+B blended
-/*31*/ u8 Capture_Enable:1; // 0=Disable/Ready, 1=Enable/Busy
-};
-
-typedef union
-{
- struct _DISPCAPCNT bits;
- u32 val;
-} DISPCAPCNT;
-
-
-/*******************************************************************************
- this structure holds everything and should be mapped to
- * core A : 0x04000000
- * core B : 0x04001000
-*******************************************************************************/
-
-typedef struct _reg_dispx {
- DISPCNT dispx_DISPCNT; // 0x0400x000
- u16 dispA_DISPSTAT; // 0x04000004
- u16 dispx_VCOUNT; // 0x0400x006
- BGxCNT dispx_BGxCNT4; // 0x0400x008
- BGxOFS dispx_BGxOFS4; // 0x0400x010
- BGxPARMS dispx_BG2PARMS; // 0x0400x020
- BGxPARMS dispx_BG3PARMS; // 0x0400x030
- u8			filler12; // 0x0400x040
- MISCCNT dispx_MISC; // 0x0400x04C
- DISP3DCNT dispA_DISP3DCNT; // 0x04000060
- DISPCAPCNT dispA_DISPCAPCNT; // 0x04000064
- u32 dispA_DISPMMEMFIFO; // 0x04000068
-} REG_DISPx ;
-
-
-
-
-
-
-
-#ifndef __cplusplus
-#ifndef min
-#define min(a,b) (((a)<(b))?(a):(b))
-#endif
-
-#ifndef max
-#define max(a,b) (((a)>(b))?(a):(b))
-#endif
-#endif
-
-typedef BOOL (*fun_gl_Begin) (int screen);
-typedef void (*fun_gl_End) (int screen);
-// the GUI should use this function prior to all gl calls
-// if call to beg succeeds opengl draw
-void register_gl_fun(fun_gl_Begin beg,fun_gl_End end);
-
-#define GPU_MAIN	0
-#define GPU_SUB		1
-
-/* human readable bitmask names */
-#define ADDRESS_STEP_512B	 0x00200
-#define ADDRESS_STEP_1KB		0x00400
-#define ADDRESS_STEP_2KB		0x00800
-#define ADDRESS_STEP_4KB		0x01000
-#define ADDRESS_STEP_8KB		0x02000
-#define ADDRESS_STEP_16KB	 0x04000
-#define ADDRESS_STEP_32KB	 0x08000
-#define ADDRESS_STEP_64kB	 0x10000
-
-#ifdef WORDS_BIGENDIAN
-struct _TILEENTRY
-{
-/*14*/	unsigned Palette:4;
-/*13*/	unsigned VFlip:1;	// VERTICAL FLIP (top<-->bottom)
-/*12*/	unsigned HFlip:1;	// HORIZONTAL FLIP (left<-->right)
-/* 0*/	unsigned TileNum:10;
-};
-#else
-struct _TILEENTRY
-{
-/* 0*/	unsigned TileNum:10;
-/*12*/	unsigned HFlip:1;	// HORIZONTAL FLIP (left<-->right)
-/*13*/	unsigned VFlip:1;	// VERTICAL FLIP (top<-->bottom)
-/*14*/	unsigned Palette:4;
-};
-#endif
-typedef union
-{
-	struct _TILEENTRY bits;
-	u16 val;
-} TILEENTRY;
-
-struct _ROTOCOORD
-{
-/* 0*/	unsigned Fraction:8;
-/* 8*/	 signed Integer:24;
-// /*28*/	unsigned :4;
-};
-typedef union
-{
-	struct _ROTOCOORD bits;
-	s32 val;
-} ROTOCOORD;
-
-
-/*
-	this structure is for color representation,
-	it holds 5 meaningful bits per color channel (red,green,blue)
-	and	 1 meaningful bit for alpha representation
-	this bit can be unused or used for special FX
-*/
-
-struct _COLOR { // abgr x555
-#ifdef WORDS_BIGENDIAN
-	unsigned alpha:1; // sometimes it is unused (pad)
-	unsigned blue:5;
-	unsigned green:5;
-	unsigned red:5;
-#else
- unsigned red:5;
- unsigned green:5;
- unsigned blue:5;
- unsigned alpha:1; // sometimes it is unused (pad)
-#endif
-};
-struct _COLORx { // abgr x555
-	unsigned bgr:15;
-	unsigned alpha:1;	// sometimes it is unused (pad)
-};
-
-typedef union
-{
-	struct _COLOR bits;
-	struct _COLORx bitx;
-	u16 val;
-} COLOR;
-
-struct _COLOR32 { // ARGB
-	unsigned :3;
-	unsigned blue:5;
-	unsigned :3;
-	unsigned green:5;
-	unsigned :3;
-	unsigned red:5;
-	unsigned :7;
-	unsigned alpha:1;	// sometimes it is unused (pad)
-};
-
-typedef union
-{
-	struct _COLOR32 bits;
-	u32 val;
-} COLOR32;
-
-#define COLOR_16_32(w,i)	\
-	/* doesnt matter who's 16bit who's 32bit */ \
-	i.bits.red = w.bits.red; \
-	i.bits.green = w.bits.green; \
-	i.bits.blue = w.bits.blue; \
-	i.bits.alpha = w.bits.alpha;
-
-
-
-
-
-
-/*
-	this structure is for Sprite description,
-	it holds flags & transformations for 1 sprite
-	(max 128 OBJs / screen)
-ref: http://www.bottledlight.com/ds/index.php/Video/Sprites
-*/
-
-typedef struct
-{
-#ifdef WORDS_BIGENDIAN
-// attr0
-/* 0*/ unsigned Y:8;
-/*14*/ unsigned Shape:2; // (00: Square, 01: Wide, 10: Tall, 11: Illegal)
-/*13*/ unsigned Depth:1; // (0: 16, 1: 256)
-/*12*/ unsigned Mosaic:1; // (1: Enabled)
-/*10*/ unsigned Mode:2; // (00: Normal, 01: Transparent, 10: Object window, 11: Bitmap)
-/* 8*/ unsigned RotScale:2; // (00: Normal, 01: Rot/scale, 10: Disabled, 11: Double-size rot/scale)
-// attr1
-/* 0*/ signed X:9;
-/*14*/ unsigned Size:2;
-/*13*/ unsigned VFlip:1;
-/*12*/ unsigned HFlip:1;
-/* 9*/ unsigned RotScalIndex:3; // Rot/scale matrix index
-// attr2
-/* 0*/ unsigned TileIndex:10;
-/*12*/ unsigned PaletteIndex:4;
-/*10*/ unsigned Priority:2;
-// attr3
-unsigned attr3:16;
-#else
-// attr0
-/* 0*/	unsigned Y:8;
-/* 8*/	unsigned RotScale:2; // (00: Normal, 01: Rot/scale, 10: Disabled, 11: Double-size rot/scale)
-/*10*/	unsigned Mode:2;	 // (00: Normal, 01: Transparent, 10: Object window, 11: Bitmap)
-/*12*/	unsigned Mosaic:1; // (1: Enabled)
-/*13*/	unsigned Depth:1;	// (0: 16, 1: 256)
-/*14*/	unsigned Shape:2;	// (00: Square, 01: Wide, 10: Tall, 11: Illegal)
-// attr1
-/* 0*/	signed X:9;
-/* 9*/	unsigned RotScalIndex:3; // Rot/scale matrix index
-/*12*/	unsigned HFlip:1;
-/*13*/	unsigned VFlip:1;
-/*14*/	unsigned Size:2;
-// attr2
-/* 0*/	unsigned TileIndex:10;
-/*10*/	unsigned Priority:2;
-/*12*/	unsigned PaletteIndex:4;
-// attr3
-	unsigned attr3:16;
-#endif
-} _OAM_;
-
-typedef struct
-{
-	 u16 attr0;
-	 u16 attr1;
-	 u16 attr2;
-	 u16 attr3;
-} OAM;
-
-
-
-typedef struct
-{
-	 s16 x;
-	 s16 y;
-} size;
-
-
-
-
-/*
-	this structure holds information
-	for rendering.
-*/
-
-#define NB_PRIORITIES	4
-#define NB_BG		4
-typedef struct
-{
-	u8 BGsNB_BG, nbBGs;
-	u8 PixelsX256;
-	// doh ! yoda says : 256 pixels we can have...
-	u16 nbPixelsX;
-} itemsForPriority_t;
-
-
-typedef struct _GPU GPU;
-
-struct _GPU
-{
-	// some structs are becoming redundant
-	// some functions too (no need to recopy some vars as it is done by MMU)
-	REG_DISPx * dispx_st;
-
-	DISPCAPCNT dispCapCnt;
-	BOOL LayersEnable5;
-	itemsForPriority_t itemsForPriorityNB_PRIORITIES;
-	u8 sprWin256256;
-
-#define BGBmpBB BG_bmp_ram
-#define BGChBB BG_tile_ram
-
-	u8 *(BG_bmp_ram4);
-	u8 *(BG_tile_ram4);
-	u8 *(BG_map_ram4);
-
-	u8 BGExtPalSlot4;
-	u32 BGSize42;
-
-	u8 lcd;
-	u8 core;
-
-	u8 dispMode;
-	u8 vramBlock;
-
-	BOOL dispBG4;
-	BOOL dispOBJ;
-
-	OAM * oam;
-	u8 * sprMem;
-	u8 sprBoundary;
-	u8 sprBMPBoundary;
-	u8 sprBMPMode;
-	u32 sprEnable;
-
-	u8 WIN0H0;
-	u8 WIN0H1;
-	u8 WIN0V0;
-	u8 WIN0V1;
-
-	u8 WIN1H0;
-	u8 WIN1H1;
-	u8 WIN1V0;
-	u8 WIN1V1;
-
-	u8 WININ0;
-	u8 WININ0_SPECIAL;
-	u8 WININ1;
-	u8 WININ1_SPECIAL;
-
-	u8 WINOUT;
-	u8 WINOUT_SPECIAL;
-	u8 WINOBJ;
-	u8 WINOBJ_SPECIAL;
-
-	u8 WIN0_ENABLED;
-	u8 WIN1_ENABLED;
-	u8 WINOBJ_ENABLED;
-
-	u16 BLDCNT;
-	u8	BLDALPHA_EVA;
-	u8	BLDALPHA_EVB;
-	u8	BLDY_EVY;
-
-	u8	MasterBrightMode;
-	u32 MasterBrightFactor;
-
-	BOOL (*setFinalColorSpr)(const GPU *gpu, u32 passing, u8 bgnum, u8 *dst, u16 color, u16 x, u16 y);
-	BOOL (*setFinalColorBck)(const GPU *gpu, u32 passing, u8 bgnum, u8 *dst, u16 color, u16 x, u16 y);
-	void (*spriteRender) (GPU * gpu, u16 l, u8 * dst, u8 * prioTab);
-};
-/*
-// normally should have same addresses
-static void REG_DISPx_pack_test(GPU * gpu)
-{
-	REG_DISPx * r = gpu->dispx_st;
-	printf ("%08x %02x\n", r, (long)(&r->dispx_DISPCNT) - (long)r);
-	printf ("\t%02x\n", (long)(&r->dispA_DISPSTAT) - (long)r);
-	printf ("\t%02x\n", (long)(&r->dispx_VCOUNT) - (long)r);
-	printf ("\t%02x\n", (long)(&r->dispx_BGxCNT0) - (long)r);
-	printf ("\t%02x\n", (long)(&r->dispx_BGxOFS0) - (long)r);
-	printf ("\t%02x\n", (long)(&r->dispx_BG2PARMS) - (long)r);
-	printf ("\t%02x\n", (long)(&r->dispx_BG3PARMS) - (long)r);
-	printf ("\t%02x\n", (long)(&r->dispx_WINCNT) - (long)r);
-	printf ("\t%02x\n", (long)(&r->dispx_MISC) - (long)r);
-	printf ("\t%02x\n", (long)(&r->dispA_DISP3DCNT) - (long)r);
-	printf ("\t%02x\n", (long)(&r->dispA_DISPCAPCNT) - (long)r);
-	printf ("\t%02x\n", (long)(&r->dispA_DISPMMEMFIFO) - (long)r);
-}
-*/
-
-extern u8 GPU_screen4*256*192;
-
-
-GPU * GPU_Init(u8 l);
-void GPU_Reset(GPU *g, u8 l);
-void GPU_DeInit(GPU *);
-
-void textBG(const GPU * gpu, u8 num, u8 * DST);		//Draw text based background
-void rotBG(GPU * gpu, u8 num, u8 * DST);
-void extRotBG(GPU * gpu, u8 num, u8 * DST);
-void sprite1D(GPU * gpu, u16 l, u8 * dst, u8 * prioTab);
-void sprite2D(GPU * gpu, u16 l, u8 * dst, u8 * prioTab);
-
-extern short sizeTab442;
-extern size sprSizeTab44;
-extern s8 mode2type84;
-extern void (*modeRender84)(GPU * gpu, u8 num, u16 l, u8 * DST);
-
-typedef struct {
-	GPU * gpu;
-	u16 offset;
-} NDS_Screen;
-
-extern NDS_Screen MainScreen;
-extern NDS_Screen SubScreen;
-
-int Screen_Init(int coreid);
-void Screen_Reset(void);
-void Screen_DeInit(void);
-
-extern MMU_struct MMU;
-
-
-
-#define GFXCORE_DEFAULT		 -1
-#define GFXCORE_DUMMY		 0
-
-#define GFXCORE_FULLSCREEN	 (1 << 0)
-
-typedef struct
-{
- int id; // ID number for core(see above defines)
- const char *Name; // Name of core
- int flags; // What features the core supports(full screen, etc.)
- int (*Init)(); // Initializes stuff related to core
- void (*DeInit)(); // Deinitializes stuff related to core
- void (*Resize)(int width, int height, BOOL fullscreen); // Resizes window or fullscreen
- void (*OnScreenText)(char *string, ...); // For handling save state messages, etc.
-} GraphicsInterface_struct;
-
-extern GraphicsInterface_struct GFXDummy;
-
-void GPU_setVideoProp(GPU *, u32 p);
-void GPU_setBGProp(GPU *, u16 num, u16 p);
-
-void GPU_setBLDCNT(GPU *gpu, u16 v) ;
-void GPU_setBLDALPHA(GPU *gpu, u16 v) ;
-void GPU_setBLDY(GPU *gpu, u16 v) ;
-void GPU_setMOSAIC(GPU *gpu, u16 v) ;
-
-
-void GPU_remove(GPU *, u8 num);
-void GPU_addBack(GPU *, u8 num);
-
-int GPU_ChangeGraphicsCore(int coreid);
-
-void GPU_set_DISPCAPCNT(GPU * gpu, u32 val) ;
-void GPU_ligne(NDS_Screen * screen, u16 l) ;
-void GPU_setMasterBrightness (GPU *gpu, u16 val);
-
-void GPU_setWIN0_H	(GPU *gpu, u16 val);
-void GPU_setWIN0_H0 (GPU *gpu, u8 val);
-void GPU_setWIN0_H1 (GPU *gpu, u8 val);
-
-void GPU_setWIN0_V	(GPU *gpu, u16 val);
-void GPU_setWIN0_V0 (GPU *gpu, u8 val);
-void GPU_setWIN0_V1 (GPU *gpu, u8 val);
-
-void GPU_setWIN1_H	(GPU *gpu, u16 val);
-void GPU_setWIN1_H0 (GPU *gpu, u8 val);
-void GPU_setWIN1_H1 (GPU *gpu, u8 val);
-
-void GPU_setWIN1_V	(GPU *gpu, u16 val);
-void GPU_setWIN1_V0 (GPU *gpu, u8 val);
-void GPU_setWIN1_V1 (GPU *gpu, u8 val);
-
-void GPU_setWININ (GPU *gpu, u16 val);
-void GPU_setWININ0 (GPU *gpu, u8 val);
-void GPU_setWININ1 (GPU *gpu, u8 val);
-
-void GPU_setWINOUT16(GPU *gpu, u16 val);
-void GPU_setWINOUT	(GPU *gpu, u8 val);
-void GPU_setWINOBJ	(GPU *gpu, u8 val);
-
-void GPU_setBLDCNT_LOW	(GPU *gpu, u8 val);
-void GPU_setBLDCNT_HIGH (GPU *gpu, u8 val);
-void GPU_setBLDCNT		(GPU *gpu, u16 val);
-
-void GPU_setBLDALPHA	(GPU *gpu, u16 val);
-void GPU_setBLDALPHA_EVA(GPU *gpu, u8 val);
-void GPU_setBLDALPHA_EVB(GPU *gpu, u8 val);
-
-void GPU_setBLDY_EVY	(GPU *gpu, u8 val);
-
-#endif
-

audacious-plugins-3.6.2-gtk3.tar.bz2/src/xsf/desmume/matrix.cc Deleted

@@ -1,257 +0,0 @@
-/*
-	Copyright (C) 2006-2007 shash
-
- This file is part of DeSmuME
-
- DeSmuME 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.
-
- DeSmuME 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 DeSmuME; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-*/
-
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include "matrix.h"
-
-void MatrixInit (float *matrix)
-{
-	memset (matrix, 0, sizeof(float)*16);
-
-	matrix0 = matrix5 = matrix10 = matrix15 = 1.f;
-}
-
-void MatrixMultVec4x4 (float *matrix, float *vecPtr)
-{
-	float x = vecPtr0;
-	float y = vecPtr1;
-	float z = vecPtr2;
-
-	vecPtr0 = x * matrix0 + y * matrix4 + z * matrix 8 + matrix12;
-	vecPtr1 = x * matrix1 + y * matrix5 + z * matrix 9 + matrix13;
-	vecPtr2 = x * matrix2 + y * matrix6 + z * matrix10 + matrix14;
-}
-
-void MatrixMultVec3x3 (float *matrix, float *vecPtr)
-{
-	float x = vecPtr0;
-	float y = vecPtr1;
-	float z = vecPtr2;
-
-	vecPtr0 = x * matrix0 + y * matrix4 + z * matrix 8;
-	vecPtr1 = x * matrix1 + y * matrix5 + z * matrix 9;
-	vecPtr2 = x * matrix2 + y * matrix6 + z * matrix10;
-}
-
-void MatrixIdentity	(float *matrix)
-{
-	memset (matrix, 0, sizeof(float)*16);
-
-	matrix0 = matrix5 = matrix10 = matrix15 = 1.f;
-}
-
-void MatrixMultiply (float *matrix, float *rightMatrix)
-{
-	float tmpMatrix16;
-
-	tmpMatrix0 = (matrix0*rightMatrix0)+(matrix4*rightMatrix1)+(matrix8*rightMatrix2)+(matrix12*rightMatrix3);
-	tmpMatrix1 = (matrix1*rightMatrix0)+(matrix5*rightMatrix1)+(matrix9*rightMatrix2)+(matrix13*rightMatrix3);
-	tmpMatrix2 = (matrix2*rightMatrix0)+(matrix6*rightMatrix1)+(matrix10*rightMatrix2)+(matrix14*rightMatrix3);
-	tmpMatrix3 = (matrix3*rightMatrix0)+(matrix7*rightMatrix1)+(matrix11*rightMatrix2)+(matrix15*rightMatrix3);
-
-	tmpMatrix4 = (matrix0*rightMatrix4)+(matrix4*rightMatrix5)+(matrix8*rightMatrix6)+(matrix12*rightMatrix7);
-	tmpMatrix5 = (matrix1*rightMatrix4)+(matrix5*rightMatrix5)+(matrix9*rightMatrix6)+(matrix13*rightMatrix7);
-	tmpMatrix6 = (matrix2*rightMatrix4)+(matrix6*rightMatrix5)+(matrix10*rightMatrix6)+(matrix14*rightMatrix7);
-	tmpMatrix7 = (matrix3*rightMatrix4)+(matrix7*rightMatrix5)+(matrix11*rightMatrix6)+(matrix15*rightMatrix7);
-
-	tmpMatrix8 = (matrix0*rightMatrix8)+(matrix4*rightMatrix9)+(matrix8*rightMatrix10)+(matrix12*rightMatrix11);
-	tmpMatrix9 = (matrix1*rightMatrix8)+(matrix5*rightMatrix9)+(matrix9*rightMatrix10)+(matrix13*rightMatrix11);
-	tmpMatrix10 = (matrix2*rightMatrix8)+(matrix6*rightMatrix9)+(matrix10*rightMatrix10)+(matrix14*rightMatrix11);
-	tmpMatrix11 = (matrix3*rightMatrix8)+(matrix7*rightMatrix9)+(matrix11*rightMatrix10)+(matrix15*rightMatrix11);
-
-	tmpMatrix12 = (matrix0*rightMatrix12)+(matrix4*rightMatrix13)+(matrix8*rightMatrix14)+(matrix12*rightMatrix15);
-	tmpMatrix13 = (matrix1*rightMatrix12)+(matrix5*rightMatrix13)+(matrix9*rightMatrix14)+(matrix13*rightMatrix15);
-	tmpMatrix14 = (matrix2*rightMatrix12)+(matrix6*rightMatrix13)+(matrix10*rightMatrix14)+(matrix14*rightMatrix15);
-	tmpMatrix15 = (matrix3*rightMatrix12)+(matrix7*rightMatrix13)+(matrix11*rightMatrix14)+(matrix15*rightMatrix15);
-
-	memcpy (matrix, tmpMatrix, sizeof(float)*16);
-}
-/*
-void MatrixMulti (float* right)
-{
-	float tmpMatrix16;
-
-	tmpMatrix0 = (matrix0*right0)+(matrix4*right1)+(matrix8*right2)+(matrix12*right3);
-	tmpMatrix1 = (matrix1*right0)+(matrix5*right1)+(matrix9*right2)+(matrix13*right3);
-	tmpMatrix2 = (matrix2*right0)+(matrix6*right1)+(matrix10*right2)+(matrix14*right3);
-	tmpMatrix3 = (matrix3*right0)+(matrix7*right1)+(matrix11*right2)+(matrix15*right3);
-
-	tmpMatrix4 = (matrix0*right4)+(matrix4*right5)+(matrix8*right6)+(matrix12*right7);
-	tmpMatrix5 = (matrix1*right4)+(matrix5*right5)+(matrix9*right6)+(matrix13*right7);
-	tmpMatrix6 = (matrix2*right4)+(matrix6*right5)+(matrix10*right6)+(matrix14*right7);
-	tmpMatrix7 = (matrix3*right4)+(matrix7*right5)+(matrix11*right6)+(matrix15*right7);
-
-	tmpMatrix8 = (matrix0*right8)+(matrix4*right9)+(matrix8*right10)+(matrix12*right11);
-	tmpMatrix9 = (matrix1*right8)+(matrix5*right9)+(matrix9*right10)+(matrix13*right11);
-	tmpMatrix10 = (matrix2*right8)+(matrix6*right9)+(matrix10*right10)+(matrix14*right11);
-	tmpMatrix11 = (matrix3*right8)+(matrix7*right9)+(matrix11*right10)+(matrix15*right11);
-
-	tmpMatrix12 = (matrix0*right12)+(matrix4*right13)+(matrix8*right14)+(matrix12*right15);
-	tmpMatrix13 = (matrix1*right12)+(matrix5*right13)+(matrix9*right14)+(matrix13*right15);
-	tmpMatrix14 = (matrix2*right12)+(matrix6*right13)+(matrix10*right14)+(matrix14*right15);
-	tmpMatrix15 = (matrix3*right12)+(matrix7*right13)+(matrix11*right14)+(matrix15*right15);
-
-	memcpy (matrix, tmpMatrix, sizeof(float)*16);
-}
-
-
-float*	Matrix::Get		(void)
-{
-	return matrix;
-}
-
-float MatrixGet (float *matrix, int index)
-{
-	return matrixindex;
-}
-*/
-
-float MatrixGetMultipliedIndex (int index, float *matrix, float *rightMatrix)
-{
-	int iMod = index%4, iDiv = (index>>2)<<2;
-
-	return	(matrixiMod *rightMatrixiDiv )+(matrixiMod+ 4*rightMatrixiDiv+1)+
-			(matrixiMod+8*rightMatrixiDiv+2)+(matrixiMod+12*rightMatrixiDiv+3);
-}
-
-void MatrixSet (float *matrix, int x, int y, float value)
-{
-	matrix x+(y<<2) = value;
-}
-/*
-void	Matrix::Set		(int pos, float value)
-{
-	matrix pos = value;
-}
-*/
-void MatrixCopy (float *matrixDST, float *matrixSRC)
-{
-	memcpy (matrixDST, matrixSRC, sizeof(float)*16);
-}
-
-void MatrixTranslate	(float *matrix, float *ptr)
-{
-	matrix12 += (matrix0*ptr0)+(matrix4*ptr1)+(matrix 8*ptr2);
-	matrix13 += (matrix1*ptr0)+(matrix5*ptr1)+(matrix 9*ptr2);
-	matrix14 += (matrix2*ptr0)+(matrix6*ptr1)+(matrix10*ptr2);
-	matrix15 += (matrix3*ptr0)+(matrix7*ptr1)+(matrix11*ptr2);
-}
-
-void MatrixScale (float *matrix, float *ptr)
-{
-	matrix0 *= ptr0;
-	matrix1 *= ptr0;
-	matrix2 *= ptr0;
-	matrix3 *= ptr0;
-
-	matrix4 *= ptr1;
-	matrix5 *= ptr1;
-	matrix6 *= ptr1;
-	matrix7 *= ptr1;
-
-	matrix8 *= ptr2;
-	matrix9 *= ptr2;
-	matrix10 *= ptr2;
-	matrix11 *= ptr2;
-}
-/*
-void	Matrix::Set	(float a11, float a21, float a31, float a41,
-					 float a12, float a22, float a32, float a42,
-					 float a13, float a23, float a33, float a43,
-					 float a14, float a24, float a34, float a44)
-{
-}
-*/
-
-
-//-----------------------------------------
-
-void MatrixStackInit (MatrixStack *stack)
-{
-	stack->matrix	= nullptr;
-	stack->position	= 0;
-	stack->size		= 0;
-}
-
-void MatrixStackSetMaxSize (MatrixStack *stack, int size)
-{
-	int i = 0;
-
-	stack->size = size;
-
-	if (stack->matrix == nullptr)
-	{
-		stack->matrix = (float*) malloc (stack->size*16*sizeof(float));
-	}
-	else
-	{
-		free (stack->matrix);
-		stack->matrix = (float*) malloc (stack->size*16*sizeof(float));
-	}
-
-	for (i = 0; i < stack->size; i++)
-	{
-		MatrixInit (&stack->matrixi*16);
-	}
-
-	stack->size--;
-}
-
-
-void MatrixStackSetStackPosition (MatrixStack *stack, int pos)
-{
-	stack->position += pos;
-
-	if (stack->position < 0)
-		stack->position = 0;
-	else if (stack->position > stack->size)
-		stack->position = stack->size;
-}
-
-void MatrixStackPushMatrix (MatrixStack *stack, float *ptr)
-{
-	MatrixCopy (&stack->matrixstack->position*16, ptr);
-
-	MatrixStackSetStackPosition (stack, 1);
-}
-
-float * MatrixStackPopMatrix (MatrixStack *stack, int size)
-{
-	MatrixStackSetStackPosition(stack, -size);
-
-	return &stack->matrixstack->position*16;
-}
-
-float * MatrixStackGetPos (MatrixStack *stack, int pos)
-{
-	return &stack->matrixpos*16;
-}
-
-float * MatrixStackGet (MatrixStack *stack)
-{
-	return &stack->matrixstack->position*16;
-}
-
-void MatrixStackLoadMatrix (MatrixStack *stack, int pos, float *ptr)
-{
-	MatrixCopy (&stack->matrixpos*16, ptr);
-}

audacious-plugins-3.6.2-gtk3.tar.bz2/src/xsf/tagget.h Deleted

@@ -1,128 +0,0 @@
-static int getdwordle(const unsigned char *pData)
-{
-	return pData0 | ((pData1) << 8) | ((pData2) << 16) | ((pData3) << 24);
-}
-
-static int xsf_tagsearchraw(const unsigned char *pData, int dwSize)
-{
-	int dwPos;
-	int dwReservedAreaSize;
-	int dwProgramLength;
-/*	int dwProgramCRC; */
-	if (dwSize < 16 + 5 + 1) return 0;
-	if (pData0 != 'P') return 0;
-	if (pData1 != 'S') return 0;
-	if (pData2 != 'F') return 0;
-	dwReservedAreaSize = getdwordle(pData + 4);
-	dwProgramLength = getdwordle(pData + 8);
-/*	dwProgramCRC = getdwordle(pData + 12); */
-	dwPos = 16 + dwReservedAreaSize + dwProgramLength;
-	if (dwPos >= dwSize) return 0;
-	return dwPos;
-}
-static int xsf_tagsearch(int *pdwRet, const unsigned char *pData, int dwSize)
-{
-	int dwPos = xsf_tagsearchraw(pData, dwSize);
-	if (dwSize < dwPos + 5) return 0;
-	if (memcmp(pData + dwPos, "TAG", 5)) return 0;
-	*pdwRet = dwPos + 5;
-	return 1;
-}
-
-enum xsf_tagenum_callback_returnvalue
-{
-	xsf_tagenum_callback_returnvaluecontinue = 0,
-	xsf_tagenum_callback_returnvaluebreak = 1
-};
-typedef int (*pfnxsf_tagenum_callback_t)(void *pWork, const char *pNameTop, const char *pNameEnd, const char *pValueTop, const char *pValueEnd);
-static int xsf_tagenumraw(pfnxsf_tagenum_callback_t pCallBack, void *pWork, const unsigned char *pData, int dwSize)
-{
-	int dwPos = 0;
-	while (dwPos < dwSize)
-	{
-		int dwNameTop;
-		int dwNameEnd;
-		int dwValueTop;
-		int dwValueEnd;
-		if (dwPos < dwSize && pDatadwPos == 0x0a) dwPos++;
-		while (dwPos < dwSize && pDatadwPos != 0x0a && 0x01 <= pDatadwPos && pDatadwPos <= 0x20)
-			dwPos++;
-		if (dwPos >= dwSize || pDatadwPos == 0x0a) continue;
-		dwNameTop = dwPos;
-		while (dwPos < dwSize && pDatadwPos != 0x0a && pDatadwPos != '=')
-			dwPos++;
-		if (dwPos >= dwSize || pDatadwPos == 0x0a) continue;
-		dwNameEnd = dwPos;
-		while (dwNameTop < dwNameEnd && 0x01 <= pDatadwNameEnd - 1 && pDatadwNameEnd - 1 <= 0x20)
-			dwNameEnd--;
-		if (dwPos < dwSize && pDatadwPos == '=') dwPos++;
-		while (dwPos < dwSize && pDatadwPos != 0x0a && 0x01 <= pDatadwPos && pDatadwPos <= 0x20)
-			dwPos++;
-		dwValueTop = dwPos;
-		while (dwPos < dwSize && pDatadwPos != 0x0a)
-			dwPos++;
-		dwValueEnd = dwPos;
-		while (dwValueTop < dwValueEnd && 0x01 <= pDatadwValueEnd - 1 && pDatadwValueEnd - 1 <= 0x20)
-			dwValueEnd--;
-
-		if (pCallBack)
-		{
-			if (xsf_tagenum_callback_returnvaluecontinue != pCallBack(pWork, (const char *)pData + dwNameTop, (const char *)pData + dwNameEnd, (const char *)pData + dwValueTop, (const char *)pData + dwValueEnd))
-				return -1;
-		}
-	}
-	return 1;
-}
-
-static int xsf_tagenum(pfnxsf_tagenum_callback_t pCallBack, void *pWork, const unsigned char *pData, int dwSize)
-{
-	int dwPos = 0;
-	if (!xsf_tagsearch(&dwPos, pData, dwSize))
-		return 0;
-	return xsf_tagenumraw(pCallBack, pWork, pData + dwPos, dwSize - dwPos);
-}
-
-typedef struct
-{
-	int taglen;
-	const char *tag;
-	char *ret;
-} xsf_tagget_work_t;
-
-static int xsf_tagenum_callback_tagget(void *pWork, const char *pNameTop, const char *pNameEnd, const char *pValueTop, const char *pValueEnd)
-{
-	xsf_tagget_work_t *pwork = (xsf_tagget_work_t *)pWork;
-	if (pwork->taglen == pNameEnd - pNameTop && !strcmp_nocase(pNameTop, pwork->tag, pwork->taglen))
-	{
-		char *ret = (char *)malloc(pValueEnd - pValueTop + 1);
-		if (!ret) return xsf_tagenum_callback_returnvaluecontinue;
-		memcpy(ret, pValueTop, pValueEnd - pValueTop);
-		retpValueEnd - pValueTop = 0;
-		pwork->ret = ret;
-		return xsf_tagenum_callback_returnvaluebreak;
-	}
-	return xsf_tagenum_callback_returnvaluecontinue;
-}
-
-static char *xsf_tagget(const char *tag, const unsigned char *pData, int dwSize)
-{
-	xsf_tagget_work_t work;
-	work.ret = 0;
-	work.tag = tag;
-	work.taglen = (int)strlen(tag);
-	xsf_tagenum(xsf_tagenum_callback_tagget, &work, pData, dwSize);
-	return work.ret;
-}
-
-static int xsf_tagget_int(const char *tag, const unsigned char *pData, int dwSize, int value_default)
-{
-	int ret = value_default;
-	char *value = xsf_tagget(tag, pData, dwSize);
-	if (value)
-	{
-		if (*value) ret = atoi(value);
-		free(value);
-	}
-	return ret;
-}
-

audacious-plugins-3.6.2-gtk3.tar.bz2/src/xsf/vio2sf.cc Deleted

@@ -1,828 +0,0 @@
-#include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "desmume/MMU.h"
-#include "desmume/armcpu.h"
-#include "desmume/NDSSystem.h"
-#include "desmume/SPU.h"
-#include "desmume/cp15.h"
-
-#include <zlib.h>
-
-#include <libaudcore/audstrings.h>
-
-#include "tagget.h"
-#include "vio2sf.h"
-
-volatile BOOL execute = false;
-
-static struct
-{
-	unsigned char *rom;
-	unsigned char *state;
-	unsigned romsize;
-	unsigned statesize;
-	unsigned stateptr;
-} loaderwork = {0, 0, 0, 0, 0};
-
-static void load_term(void)
-{
-	if (loaderwork.rom)
-	{
-		free(loaderwork.rom);
-		loaderwork.rom = 0;
-	}
-	loaderwork.romsize = 0;
-	if (loaderwork.state)
-	{
-		free(loaderwork.state);
-		loaderwork.state = 0;
-	}
-	loaderwork.statesize = 0;
-}
-
-static int load_map(int issave, unsigned char *udata, unsigned usize)
-{
-	unsigned char *iptr;
-	unsigned isize;
-	unsigned char *xptr;
-	unsigned xsize = getdwordle(udata + 4);
-	unsigned xofs = getdwordle(udata + 0);
-	if (issave)
-	{
-		iptr = loaderwork.state;
-		isize = loaderwork.statesize;
-		loaderwork.state = 0;
-		loaderwork.statesize = 0;
-	}
-	else
-	{
-		iptr = loaderwork.rom;
-		isize = loaderwork.romsize;
-		loaderwork.rom = 0;
-		loaderwork.romsize = 0;
-	}
-	if (!iptr)
-	{
-		iptr = (unsigned char *) malloc(xofs + xsize + 10);
-		if (!iptr)
-			return false;
-		memset(iptr, 0, xofs + xsize + 10);
-		isize = xofs + xsize;
-	}
-	else if (isize < xofs + xsize)
-	{
-		unsigned rsize = xofs + xsize;
-		if (!issave)
-		{
-			rsize -= 1;
-			rsize |= rsize >> 1;
-			rsize |= rsize >> 2;
-			rsize |= rsize >> 4;
-			rsize |= rsize >> 8;
-			rsize |= rsize >> 16;
-			rsize += 1;
-		}
-		xptr = (unsigned char *) realloc(iptr, xofs + rsize + 10);
-		if (!xptr)
-		{
-			free(iptr);
-			return false;
-		}
-		iptr = xptr;
-		isize = rsize;
-	}
-	memcpy(iptr + xofs, udata + 8, xsize);
-	if (issave)
-	{
-		loaderwork.state = iptr;
-		loaderwork.statesize = isize;
-	}
-	else
-	{
-		loaderwork.rom = iptr;
-		loaderwork.romsize = isize;
-	}
-	return true;
-}
-
-static int load_mapz(int issave, unsigned char *zdata, unsigned zsize, unsigned zcrc)
-{
-	int ret;
-	int zerr;
-	uLongf usize = 8;
-	uLongf rsize = usize;
-	unsigned char *udata;
-	unsigned char *rdata;
-
-	udata = (unsigned char *) malloc(usize);
-	if (!udata)
-		return false;
-
-	while (Z_OK != (zerr = uncompress(udata, &usize, zdata, zsize)))
-	{
-		if (Z_MEM_ERROR != zerr && Z_BUF_ERROR != zerr)
-		{
-			free(udata);
-			return false;
-		}
-		if (usize >= 8)
-		{
-			usize = getdwordle(udata + 4) + 8;
-			if (usize < rsize)
-			{
-				rsize += rsize;
-				usize = rsize;
-			}
-			else
-				rsize = usize;
-		}
-		else
-		{
-			rsize += rsize;
-			usize = rsize;
-		}
-		free(udata);
-		udata = (unsigned char *) malloc(usize);
-		if (!udata)
-			return false;
-	}
-
-	rdata = (unsigned char *) realloc(udata, usize);
-	if (!rdata)
-	{
-		free(udata);
-		return false;
-	}
-
-	if (0)
-	{
-		unsigned ccrc = crc32(crc32(0L, Z_NULL, 0), rdata, usize);
-		if (ccrc != zcrc)
-			return false;
-	}
-
-	ret = load_map(issave, rdata, usize);
-	free(rdata);
-	return ret;
-}
-
-static int load_psf_one(unsigned char *pfile, unsigned bytes)
-{
-	unsigned char *ptr = pfile;
-	unsigned code_size;
-	unsigned resv_size;
-	unsigned code_crc;
-	if (bytes < 16 || getdwordle(ptr) != 0x24465350)
-		return false;
-
-	resv_size = getdwordle(ptr + 4);
-	code_size = getdwordle(ptr + 8);
-	code_crc = getdwordle(ptr + 12);
-
-	if (resv_size)
-	{
-		unsigned resv_pos = 0;
-		ptr = pfile + 16;
-		if (16+ resv_size > bytes)
-			return false;
-		while (resv_pos + 12 < resv_size)
-		{
-			unsigned save_size = getdwordle(ptr + resv_pos + 4);
-			unsigned save_crc = getdwordle(ptr + resv_pos + 8);
-			if (getdwordle(ptr + resv_pos + 0) == 0x45564153)
-			{
-				if (resv_pos + 12 + save_size > resv_size)
-					return false;
-				if (!load_mapz(1, ptr + resv_pos + 12, save_size, save_crc))
-					return false;
-			}
-			resv_pos += 12 + save_size;
-		}
-	}
-
-	if (code_size)
-	{
-		ptr = pfile + 16 + resv_size;
-		if (16 + resv_size + code_size > bytes)
-			return false;
-		if (!load_mapz(0, ptr, code_size, code_crc))
-			return false;
-	}
-
-	return true;
-}
-
-typedef struct
-{
-	const char *tag;
-	int taglen;
-	int level;
-	int found;
-} loadlibwork_t;
-
-static int load_libs(int level, void *pfile, unsigned bytes);
-
-static int load_psfcb(void *pWork, const char *pNameTop, const char *pNameEnd, const char *pValueTop, const char *pValueEnd)
-{
-	loadlibwork_t *pwork = (loadlibwork_t *)pWork;
-	int ret = xsf_tagenum_callback_returnvaluecontinue;
-	if (pNameEnd - pNameTop == pwork->taglen && !strcmp_nocase(pNameTop, pwork->tag, pwork->taglen))
-	{
-		StringBuf lib = str_copy(pValueTop, pValueEnd - pValueTop);
-		Index<char> buf = xsf_get_lib(lib);
-
-		if (buf.len() &&
-			load_libs(pwork->level + 1, buf.begin(), buf.len()) &&
-			load_psf_one((unsigned char *) buf.begin(), buf.len()))
-		{
-			pwork->found++;
-		}
-		else
-		{
-			ret = xsf_tagenum_callback_returnvaluebreak;
-		}
-	}
-	return ret;
-}
-
-static int load_libs(int level, void *pfile, unsigned bytes)
-{
-	char tbuf16;
-	loadlibwork_t work;
-	int n = 1;
-
-	if (level > 10)
-		return true;
-
-	work.level = level;
-	work.tag = "_lib";
-
-	do
-	{
-		work.taglen = strlen(work.tag);
-		work.found = 0;
-
-		if (xsf_tagenum(load_psfcb, &work, (unsigned char *) pfile, bytes) < 0)
-			return false;
-
-#ifdef HAVE_SPRINTF_S
-		sprintf_s(tbuf, sizeof(tbuf), "_lib%10d", ++n);
-#else
-		sprintf(tbuf, "_lib%10d", ++n);
-#endif
-		work.tag = tbuf;
-	}
-	while (work.found);
-
-	return true;
-}
-
-static int load_psf(void *pfile, unsigned bytes)
-{
-	load_term();
-
-	if (!load_libs(1, pfile, bytes) || !load_psf_one((unsigned char *) pfile, bytes))
-		return false;
-
-	return true;
-}
-
-static void load_getstateinit(unsigned ptr)
-{
-	loaderwork.stateptr = ptr;
-}
-
-static u16 getwordle(const unsigned char *pData)
-{
-	return pData0 | (((u16)pData1) << 8);
-}
-
-static void load_getsta(Status_Reg *ptr, unsigned l)
-{
-	unsigned s = l << 2;
-	unsigned i;
-	if ((loaderwork.stateptr > loaderwork.statesize) || ((loaderwork.stateptr + s) > loaderwork.statesize))
-		return;
-	for (i = 0; i < l; i++)
-		{
-			u32 st = getdwordle(loaderwork.state + loaderwork.stateptr + (i << 2));
-			ptri.bits.N = (st >> 31) & 1;
-			ptri.bits.Z = (st >> 30) & 1;
-			ptri.bits.C = (st >> 29) & 1;
-			ptri.bits.V = (st >> 28) & 1;
-			ptri.bits.Q = (st >> 27) & 1;
-			ptri.bits.RAZ = (st >> 8) & ((1 << 19) - 1);
-			ptri.bits.I = (st >> 7) & 1;
-			ptri.bits.F = (st >> 6) & 1;
-			ptri.bits.T = (st >> 5) & 1;
-			ptri.bits.mode = (st >> 0) & 0x1f;
-		}
-	loaderwork.stateptr += s;
-}
-
-static void load_getbool(BOOL *ptr, unsigned l)
-{
-	unsigned s = l << 2;
-	unsigned i;
-	if ((loaderwork.stateptr > loaderwork.statesize) || ((loaderwork.stateptr + s) > loaderwork.statesize))
-		return;
-	for (i = 0; i < l; i++)
-		ptri = (BOOL)getdwordle(loaderwork.state + loaderwork.stateptr + (i << 2));
-	loaderwork.stateptr += s;
-}
-
-#if defined(SIGNED_IS_NOT_2S_COMPLEMENT)
-/* 2's complement */
-#define u32tos32(v) ((s32)((((s64)(v)) ^ 0x8000) - 0x8000))
-#else
-/* 2's complement */
-#define u32tos32(v) ((s32)v)
-#endif
-
-static void load_gets32(s32 *ptr, unsigned l)
-{
-	unsigned s = l << 2;
-	unsigned i;
-	if ((loaderwork.stateptr > loaderwork.statesize) || ((loaderwork.stateptr + s) > loaderwork.statesize))
-		return;
-	for (i = 0; i < l; i++)
-		ptri = u32tos32(getdwordle(loaderwork.state + loaderwork.stateptr + (i << 2)));
-	loaderwork.stateptr += s;
-}
-
-static void load_getu32(u32 *ptr, unsigned l)
-{
-	unsigned s = l << 2;
-	unsigned i;
-	if ((loaderwork.stateptr > loaderwork.statesize) || ((loaderwork.stateptr + s) > loaderwork.statesize))
-		return;
-	for (i = 0; i < l; i++)
-		ptri = getdwordle(loaderwork.state + loaderwork.stateptr + (i << 2));
-	loaderwork.stateptr += s;
-}
-
-static void load_getu16(u16 *ptr, unsigned l)
-{
-	unsigned s = l << 1;
-	unsigned i;
-	if ((loaderwork.stateptr > loaderwork.statesize) || ((loaderwork.stateptr + s) > loaderwork.statesize))
-		return;
-	for (i = 0; i < l; i++)
-		ptri = getwordle(loaderwork.state + loaderwork.stateptr + (i << 1));
-	loaderwork.stateptr += s;
-}
-
-static void load_getu8(u8 *ptr, unsigned l)
-{
-	unsigned s = l;
-	unsigned i;
-	if ((loaderwork.stateptr > loaderwork.statesize) || ((loaderwork.stateptr + s) > loaderwork.statesize))
-		return;
-	for (i = 0; i < l; i++)
-		ptri = loaderwork.stateloaderwork.stateptr + i;
-	loaderwork.stateptr += s;
-}
-
-void gdb_stub_fix(armcpu_t *armcpu)
-{
-	/* armcpu->R15 = armcpu->instruct_adr; */
-	armcpu->next_instruction = armcpu->instruct_adr;
-	if(armcpu->CPSR.bits.T == 0)
-	{
-		armcpu->instruction = MMU_read32_acl(armcpu->proc_ID, armcpu->next_instruction,CP15_ACCESS_EXECUTE);
-		armcpu->instruct_adr = armcpu->next_instruction;
-		armcpu->next_instruction += 4;
-		armcpu->R15 = armcpu->next_instruction + 4;
-	}
-	else
-	{
-		armcpu->instruction = MMU_read16_acl(armcpu->proc_ID, armcpu->next_instruction,CP15_ACCESS_EXECUTE);
-		armcpu->instruct_adr = armcpu->next_instruction;
-		armcpu->next_instruction += 2;
-		armcpu->R15 = armcpu->next_instruction + 2;
-	}
-}
-
-static void load_setstate(void)
-{
-	if (!loaderwork.statesize)
-		return;
-
-	/* Skip over "Desmume Save File" crap */
-	load_getstateinit(0x17);
-
-	/* Read ARM7 cpu registers */
-	load_getu32(&NDS_ARM7.proc_ID, 1);
-	load_getu32(&NDS_ARM7.instruction, 1);
-	load_getu32(&NDS_ARM7.instruct_adr, 1);
-	load_getu32(&NDS_ARM7.next_instruction, 1);
-	load_getu32(NDS_ARM7.R, 16);
-	load_getsta(&NDS_ARM7.CPSR, 1);
-	load_getsta(&NDS_ARM7.SPSR, 1);
-	load_getu32(&NDS_ARM7.R13_usr, 1);
-	load_getu32(&NDS_ARM7.R14_usr, 1);
-	load_getu32(&NDS_ARM7.R13_svc, 1);
-	load_getu32(&NDS_ARM7.R14_svc, 1);
-	load_getu32(&NDS_ARM7.R13_abt, 1);
-	load_getu32(&NDS_ARM7.R14_abt, 1);
-	load_getu32(&NDS_ARM7.R13_und, 1);
-	load_getu32(&NDS_ARM7.R14_und, 1);
-	load_getu32(&NDS_ARM7.R13_irq, 1);
-	load_getu32(&NDS_ARM7.R14_irq, 1);
-	load_getu32(&NDS_ARM7.R8_fiq, 1);
-	load_getu32(&NDS_ARM7.R9_fiq, 1);
-	load_getu32(&NDS_ARM7.R10_fiq, 1);
-	load_getu32(&NDS_ARM7.R11_fiq, 1);
-	load_getu32(&NDS_ARM7.R12_fiq, 1);
-	load_getu32(&NDS_ARM7.R13_fiq, 1);
-	load_getu32(&NDS_ARM7.R14_fiq, 1);
-	load_getsta(&NDS_ARM7.SPSR_svc, 1);
-	load_getsta(&NDS_ARM7.SPSR_abt, 1);
-	load_getsta(&NDS_ARM7.SPSR_und, 1);
-	load_getsta(&NDS_ARM7.SPSR_irq, 1);
-	load_getsta(&NDS_ARM7.SPSR_fiq, 1);
-	load_getu32(&NDS_ARM7.intVector, 1);
-	load_getu8(&NDS_ARM7.LDTBit, 1);
-	load_getbool(&NDS_ARM7.waitIRQ, 1);
-	load_getbool(&NDS_ARM7.wIRQ, 1);
-	load_getbool(&NDS_ARM7.wirq, 1);
-
-	/* Read ARM9 cpu registers */
-	load_getu32(&NDS_ARM9.proc_ID, 1);
-	load_getu32(&NDS_ARM9.instruction, 1);
-	load_getu32(&NDS_ARM9.instruct_adr, 1);
-	load_getu32(&NDS_ARM9.next_instruction, 1);
-	load_getu32(NDS_ARM9.R, 16);
-	load_getsta(&NDS_ARM9.CPSR, 1);
-	load_getsta(&NDS_ARM9.SPSR, 1);
-	load_getu32(&NDS_ARM9.R13_usr, 1);
-	load_getu32(&NDS_ARM9.R14_usr, 1);
-	load_getu32(&NDS_ARM9.R13_svc, 1);
-	load_getu32(&NDS_ARM9.R14_svc, 1);
-	load_getu32(&NDS_ARM9.R13_abt, 1);
-	load_getu32(&NDS_ARM9.R14_abt, 1);
-	load_getu32(&NDS_ARM9.R13_und, 1);
-	load_getu32(&NDS_ARM9.R14_und, 1);
-	load_getu32(&NDS_ARM9.R13_irq, 1);
-	load_getu32(&NDS_ARM9.R14_irq, 1);
-	load_getu32(&NDS_ARM9.R8_fiq, 1);
-	load_getu32(&NDS_ARM9.R9_fiq, 1);
-	load_getu32(&NDS_ARM9.R10_fiq, 1);
-	load_getu32(&NDS_ARM9.R11_fiq, 1);
-	load_getu32(&NDS_ARM9.R12_fiq, 1);
-	load_getu32(&NDS_ARM9.R13_fiq, 1);
-	load_getu32(&NDS_ARM9.R14_fiq, 1);
-	load_getsta(&NDS_ARM9.SPSR_svc, 1);
-	load_getsta(&NDS_ARM9.SPSR_abt, 1);
-	load_getsta(&NDS_ARM9.SPSR_und, 1);
-	load_getsta(&NDS_ARM9.SPSR_irq, 1);
-	load_getsta(&NDS_ARM9.SPSR_fiq, 1);
-	load_getu32(&NDS_ARM9.intVector, 1);
-	load_getu8(&NDS_ARM9.LDTBit, 1);
-	load_getbool(&NDS_ARM9.waitIRQ, 1);
-	load_getbool(&NDS_ARM9.wIRQ, 1);
-	load_getbool(&NDS_ARM9.wirq, 1);
-
-	/* Read in other internal variables that are important */
-	load_gets32(&nds.ARM9Cycle, 1);
-	load_gets32(&nds.ARM7Cycle, 1);
-	load_gets32(&nds.cycles, 1);
-	load_gets32(nds.timerCycle0, 4);
-	load_gets32(nds.timerCycle1, 4);
-	load_getbool(nds.timerOver0, 4);
-	load_getbool(nds.timerOver1, 4);
-	load_gets32(&nds.nextHBlank, 1);
-	load_getu32(&nds.VCount, 1);
-	load_getu32(&nds.old, 1);
-	load_gets32(&nds.diff, 1);
-	load_getbool(&nds.lignerendu, 1);
-	load_getu16(&nds.touchX, 1);
-	load_getu16(&nds.touchY, 1);
-
-	/* Read in memory/registers specific to the ARM9 */
-	load_getu8 (ARM9Mem.ARM9_ITCM, 0x8000);
-	load_getu8 (ARM9Mem.ARM9_DTCM, 0x4000);
-	load_getu8 (ARM9Mem.ARM9_WRAM, 0x1000000);
-	load_getu8 (ARM9Mem.MAIN_MEM, 0x400000);
-	load_getu8 (ARM9Mem.ARM9_REG, 0x10000);
-	load_getu8 (ARM9Mem.ARM9_VMEM, 0x800);
-	load_getu8 (ARM9Mem.ARM9_OAM, 0x800);
-	load_getu8 (ARM9Mem.ARM9_ABG, 0x80000);
-	load_getu8 (ARM9Mem.ARM9_BBG, 0x20000);
-	load_getu8 (ARM9Mem.ARM9_AOBJ, 0x40000);
-	load_getu8 (ARM9Mem.ARM9_BOBJ, 0x20000);
-	load_getu8 (ARM9Mem.ARM9_LCD, 0xA4000);
-
-	/* Read in memory/registers specific to the ARM7 */
-	load_getu8 (MMU.ARM7_ERAM, 0x10000);
-	load_getu8 (MMU.ARM7_REG, 0x10000);
-	load_getu8 (MMU.ARM7_WIRAM, 0x10000);
-
-	/* Read in shared memory */
-	load_getu8 (MMU.SWIRAM, 0x8000);
-
-#ifdef GDB_STUB
-#else
-	gdb_stub_fix(&NDS_ARM9);
-	gdb_stub_fix(&NDS_ARM7);
-#endif
-}
-
-static struct
-{
-	unsigned char *pcmbufalloc;
-	unsigned char *pcmbuftop;
-	unsigned filled;
-	unsigned used;
-	u32 bufferbytes;
-	u32 cycles;
-	int xfs_load;
-	int sync_type;
-	int arm7_clockdown_level;
-	int arm9_clockdown_level;
-} sndifwork = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
-
-static void SNDIFDeInit(void)
-{
-	if (sndifwork.pcmbufalloc)
-	{
-		free(sndifwork.pcmbufalloc);
-		sndifwork.pcmbufalloc = 0;
-		sndifwork.pcmbuftop = 0;
-		sndifwork.bufferbytes = 0;
-	}
-}
-static int SNDIFInit(int buffersize)
-{
-	u32 bufferbytes = buffersize * sizeof(s16);
-	SNDIFDeInit();
-	sndifwork.pcmbufalloc = (unsigned char *) malloc(bufferbytes + 3);
-	if (!sndifwork.pcmbufalloc)
-		return -1;
-	sndifwork.pcmbuftop = (unsigned char *) (((uintptr_t) sndifwork.pcmbufalloc + 3) & ~3);
-	sndifwork.bufferbytes = bufferbytes;
-	sndifwork.filled = 0;
-	sndifwork.used = 0;
-	sndifwork.cycles = 0;
-	return 0;
-}
-static void SNDIFMuteAudio(void)
-{
-}
-static void SNDIFUnMuteAudio(void)
-{
-}
-static void SNDIFSetVolume(int volume)
-{
-}
-static u32 SNDIFGetAudioSpace(void)
-{
-	return sndifwork.bufferbytes >> 2; // bytes to samples
-}
-static void SNDIFUpdateAudio(s16 * buffer, u32 num_samples)
-{
-	u32 num_bytes = num_samples << 2;
-	if (num_bytes > sndifwork.bufferbytes) num_bytes = sndifwork.bufferbytes;
-	memcpy(sndifwork.pcmbuftop, buffer, num_bytes);
-	sndifwork.filled = num_bytes;
-	sndifwork.used = 0;
-}
-#define VIO2SFSNDIFID 2
-static SoundInterface_struct VIO2SFSNDIF =
-{
-	VIO2SFSNDIFID,
-	"vio2sf Sound Interface",
-	SNDIFInit,
-	SNDIFDeInit,
-	SNDIFUpdateAudio,
-	SNDIFGetAudioSpace,
-	SNDIFMuteAudio,
-	SNDIFUnMuteAudio,
-	SNDIFSetVolume
-};
-
-SoundInterface_struct *SNDCoreList = {
-	&VIO2SFSNDIF,
-	&SNDDummy,
-	nullptr
-};
-
-#ifdef GDB_STUB
-static struct armcpu_ctrl_iface *arm9_ctrl_iface = 0;
-static struct armcpu_ctrl_iface *arm7_ctrl_iface = 0;
-#endif
-
-int xsf_start(void *pfile, unsigned bytes)
-{
-	int frames = xsf_tagget_int("_frames", (unsigned char *) pfile, bytes, -1);
-	int clockdown = xsf_tagget_int("_clockdown", (unsigned char *) pfile, bytes, 0);
-	sndifwork.sync_type = xsf_tagget_int("_vio2sf_sync_type", (unsigned char *) pfile, bytes, 0);
-	sndifwork.arm9_clockdown_level = xsf_tagget_int("_vio2sf_arm9_clockdown_level", (unsigned char *) pfile, bytes, clockdown);
-	sndifwork.arm7_clockdown_level = xsf_tagget_int("_vio2sf_arm7_clockdown_level", (unsigned char *) pfile, bytes, clockdown);
-
-	sndifwork.xfs_load = 0;
-	printf("load_psf... ");
-	if (!load_psf(pfile, bytes))
-		return false;
-	printf("ok!\n");
-
-#ifdef GDB_STUB
-	if (NDS_Init(&arm9_base_memory_iface, &arm9_ctrl_iface, &arm7_base_memory_iface, &arm7_ctrl_iface))
-#else
-	if (NDS_Init())
-#endif
-		return false;
-
-	SPU_ChangeSoundCore(VIO2SFSNDIFID, 737);
-
-	execute = false;
-
-	MMU_unsetRom();
-	if (loaderwork.rom)
-	{
-		NDS_SetROM(loaderwork.rom, loaderwork.romsize - 1);
-	}
-
-	NDS_Reset();
-
-	execute = true;
-
-	if (loaderwork.state)
-	{
-		armcp15_t *c9 = (armcp15_t *)NDS_ARM9.coproc15;
-		int proc;
-		if (frames == -1)
-		{
-
-			/* set initial ARM9 coprocessor state */
-
-			armcp15_moveARM2CP(c9, 0x00000000, 0x01, 0x00, 0, 0);
-			armcp15_moveARM2CP(c9, 0x00000000, 0x07, 0x05, 0, 0);
-			armcp15_moveARM2CP(c9, 0x00000000, 0x07, 0x06, 0, 0);
-			armcp15_moveARM2CP(c9, 0x00000000, 0x07, 0x0a, 0, 4);
-			armcp15_moveARM2CP(c9, 0x04000033, 0x06, 0x00, 0, 4);
-			armcp15_moveARM2CP(c9, 0x0200002d, 0x06, 0x01, 0, 0);
-			armcp15_moveARM2CP(c9, 0x027e0021, 0x06, 0x02, 0, 0);
-			armcp15_moveARM2CP(c9, 0x08000035, 0x06, 0x03, 0, 0);
-			armcp15_moveARM2CP(c9, 0x027e001b, 0x06, 0x04, 0, 0);
-			armcp15_moveARM2CP(c9, 0x0100002f, 0x06, 0x05, 0, 0);
-			armcp15_moveARM2CP(c9, 0xffff001d, 0x06, 0x06, 0, 0);
-			armcp15_moveARM2CP(c9, 0x027ff017, 0x06, 0x07, 0, 0);
-			armcp15_moveARM2CP(c9, 0x00000020, 0x09, 0x01, 0, 1);
-
-			armcp15_moveARM2CP(c9, 0x027e000a, 0x09, 0x01, 0, 0);
-
-			armcp15_moveARM2CP(c9, 0x00000042, 0x02, 0x00, 0, 1);
-			armcp15_moveARM2CP(c9, 0x00000042, 0x02, 0x00, 0, 0);
-			armcp15_moveARM2CP(c9, 0x00000002, 0x03, 0x00, 0, 0);
-			armcp15_moveARM2CP(c9, 0x05100011, 0x05, 0x00, 0, 3);
-			armcp15_moveARM2CP(c9, 0x15111011, 0x05, 0x00, 0, 2);
-			armcp15_moveARM2CP(c9, 0x07dd1e10, 0x01, 0x00, 0, 0);
-			armcp15_moveARM2CP(c9, 0x0005707d, 0x01, 0x00, 0, 0);
-
-			armcp15_moveARM2CP(c9, 0x00000000, 0x07, 0x0a, 0, 4);
-			armcp15_moveARM2CP(c9, 0x02004000, 0x07, 0x05, 0, 1);
-			armcp15_moveARM2CP(c9, 0x02004000, 0x07, 0x0e, 0, 1);
-
-			/* set initial timer state */
-
-			MMU_write16(0, REG_TM0CNTL, 0x0000);
-			MMU_write16(0, REG_TM0CNTH, 0x00C1);
-			MMU_write16(1, REG_TM0CNTL, 0x0000);
-			MMU_write16(1, REG_TM0CNTH, 0x00C1);
-			MMU_write16(1, REG_TM1CNTL, 0xf7e7);
-			MMU_write16(1, REG_TM1CNTH, 0x00C1);
-
-			/* set initial interrupt state */
-
-			MMU.reg_IME0 = 0x00000001;
-			MMU.reg_IE0 = 0x00042001;
-			MMU.reg_IME1 = 0x00000001;
-			MMU.reg_IE1 = 0x0104009d;
-		}
-		else if (frames > 0)
-		{
-			/* execute boot code */
-			int i;
-			for (i=0; i<frames; i++)
-				NDS_exec_frame(0, 0);
-			i = 0;
-		}
-
-		/* load state */
-
-		load_setstate();
-		free(loaderwork.state);
-		loaderwork.state = 0;
-
-		if (frames == -1)
-		{
-			armcp15_moveARM2CP(c9, (NDS_ARM9.R13_irq & 0x0fff0000) | 0x0a, 0x09, 0x01, 0, 0);
-		}
-
-		/* restore timer state */
-
-		for (proc = 0; proc < 2; proc++)
-		{
-			MMU_write16(proc, REG_TM0CNTH, T1ReadWord(MMU.MMU_MEMproc0x40, REG_TM0CNTH & 0xFFF));
-			MMU_write16(proc, REG_TM1CNTH, T1ReadWord(MMU.MMU_MEMproc0x40, REG_TM1CNTH & 0xFFF));
-			MMU_write16(proc, REG_TM2CNTH, T1ReadWord(MMU.MMU_MEMproc0x40, REG_TM2CNTH & 0xFFF));
-			MMU_write16(proc, REG_TM3CNTH, T1ReadWord(MMU.MMU_MEMproc0x40, REG_TM3CNTH & 0xFFF));
-		}
-	}
-	else if (frames > 0)
-	{
-		/* skip 1 sec */
-		int i;
-		for (i=0; i<frames; i++)
-			NDS_exec_frame(0, 0);
-	}
-	execute = true;
-	sndifwork.xfs_load = 1;
-	return true;
-}
-
-int xsf_gen(void *pbuffer, unsigned samples)
-{
-	unsigned char *ptr = (unsigned char *) pbuffer;
-	unsigned bytes = samples <<= 2;
-	if (!sndifwork.xfs_load) return 0;
-	while (bytes)
-	{
-		unsigned remainbytes = sndifwork.filled - sndifwork.used;
-		if (remainbytes > 0)
-		{
-			if (remainbytes > bytes)
-			{
-				memcpy(ptr, sndifwork.pcmbuftop + sndifwork.used, bytes);
-				sndifwork.used += bytes;
-				ptr += bytes;
-				remainbytes -= bytes; /**/
-				bytes = 0; /**/
-				break;
-			}
-			else
-			{
-				memcpy(ptr, sndifwork.pcmbuftop + sndifwork.used, remainbytes);
-				sndifwork.used += remainbytes;
-				ptr += remainbytes;
-				bytes -= remainbytes;
-				remainbytes = 0;
-			}
-		}
-		if (remainbytes == 0)
-		{
-
-#define HBASE_CYCLES 33509300.322234
-#define VBASE_CYCLES (((double)HBASE_CYCLES) / 100)
-#define HSAMPLES ((u32)((44100.0 * 6 * (99 + 256)) / HBASE_CYCLES))
-#define VSAMPLES ((u32)((44100.0 * 6 * (99 + 256) * 263) / HBASE_CYCLES))
-
-			int numsamples;
-			if (sndifwork.sync_type == 1)
-			{
-				/* vsync */
-				sndifwork.cycles += (441 * 6 * (99 + 256) * 263);
-				if (sndifwork.cycles >= (u32)(VBASE_CYCLES * (VSAMPLES + 1)))
-				{
-					numsamples = (VSAMPLES + 1);
-					sndifwork.cycles -= (u32)(VBASE_CYCLES * (VSAMPLES + 1));
-				}
-				else
-				{
-					numsamples = (VSAMPLES + 0);
-					sndifwork.cycles -= (u32)(VBASE_CYCLES * (VSAMPLES + 0));
-				}
-				NDS_exec_frame(sndifwork.arm9_clockdown_level, sndifwork.arm7_clockdown_level);
-			}
-			else
-			{
-				/* hsync */
-				sndifwork.cycles += (44100 * 6 * (99 + 256));
-				if (sndifwork.cycles >= (u32)(HBASE_CYCLES * (HSAMPLES + 1)))
-				{
-					numsamples = (HSAMPLES + 1);
-					sndifwork.cycles -= (u32)(HBASE_CYCLES * (HSAMPLES + 1));
-				}
-				else
-				{
-					numsamples = (HSAMPLES + 0);
-					sndifwork.cycles -= (u32)(HBASE_CYCLES * (HSAMPLES + 0));
-				}
-				NDS_exec_hframe(sndifwork.arm9_clockdown_level, sndifwork.arm7_clockdown_level);
-			}
-			SPU_EmulateSamples(numsamples);
-		}
-	}
-	return ptr - (unsigned char *)pbuffer;
-}
-
-void xsf_term(void)
-{
-	MMU_unsetRom();
-	NDS_DeInit();
-	load_term();
-}

audacious-plugins-3.6.2-gtk3.tar.bz2/src/xsf/vio2sf.h Deleted

audacious-plugins-3.6.2-gtk3.tar.bz2/src/xsf/xsfdrv.h Deleted

audacious-plugins-4.4.1.tar.bz2/.clang-format Added

audacious-plugins-4.4.1.tar.bz2/.mailmap Added

audacious-plugins-3.6.2-gtk3.tar.bz2/COPYING -> audacious-plugins-4.4.1.tar.bz2/COPYING Changed

audacious-plugins-3.6.2-gtk3.tar.bz2/acinclude.m4 -> audacious-plugins-4.4.1.tar.bz2/acinclude.m4 Changed

@@ -1,3 +1,22 @@
+dnl Backward compatibility with older pkg-config <= 0.28
+dnl Retrieves the value of the pkg-config variable
+dnl for the given module.
+dnl PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE,
+dnl ACTION-IF-FOUND, ACTION-IF-NOT-FOUND)
+dnl ====================================================
+m4_ifndef(PKG_CHECK_VAR, 
+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
+)
+)
+
+
 dnl Add $1 to CFLAGS and CXXFLAGS if supported
 dnl ==========================================
 
@@ -82,13 +101,16 @@
 
 if test "x$GCC" = "xyes"; then
 CFLAGS="$CFLAGS -std=gnu99 -ffast-math -Wall -pipe"
- if test "x$HAVE_DARWIN" = "xyes"; then
- CXXFLAGS="$CXXFLAGS -stdlib=libc++ -std=gnu++11 -ffast-math -Wall -pipe"
- LDFLAGS="$LDFLAGS -lc++ -stdlib=libc++"
- else
- CXXFLAGS="$CXXFLAGS -std=gnu++11 -ffast-math -Wall -pipe"
+ CXXFLAGS="$CXXFLAGS -ffast-math -Wall -pipe"
+
+ # use C++17 if possible (Qt 6 requires it)
+ AUD_CHECK_CXXFLAGS(-std=gnu++17)
+ if test "${CXXFLAGS%gnu++17}" = "$CXXFLAGS" ; then
+ CXXFLAGS="$CXXFLAGS -std=gnu++11"
 fi
+
 AUD_CHECK_CFLAGS(-Wtype-limits)
+ AUD_CHECK_CFLAGS(-Wno-stringop-truncation)
 AUD_CHECK_CXXFLAGS(-Woverloaded-virtual)
 fi
 
@@ -101,19 +123,19 @@
 AC_PROG_OBJCXX
 AC_PROG_OBJCXXCPP
 
- OBJCXXFLAGS="$OBJCXXFLAGS -stdlib=libc++ -std=c++11"
+ OBJCXXFLAGS="$OBJCXXFLAGS -std=c++11"
 fi
 
 dnl Enable "-Wl,-z,defs" only on Linux
 dnl ==================================
 if test $HAVE_LINUX = yes ; then
-	LDFLAGS="$LDFLAGS -Wl,-z,defs"
+ LDFLAGS="$LDFLAGS -Wl,-z,defs"
 fi
 
-dnl MinGW needs -march=i686 for atomics
-dnl ===================================
+dnl MinGW-specific flags
+dnl ====================
 if test $HAVE_MSWINDOWS = yes ; then
-	CFLAGS="$CFLAGS -march=i686"
+ AC_DEFINE(__USE_MINGW_ANSI_STDIO, 1, "Use GNU-style printf")
 fi
 
 dnl Byte order
@@ -142,38 +164,49 @@
 AC_PATH_PROG(RM, rm)
 AC_PATH_PROG(MV, mv)
 AC_PATH_PROG(CP, cp)
-AC_PATH_PROG(AR, ar)
-AC_PATH_PROG(RANLIB, ranlib)
-AC_PATH_PROG(WINDRES, windres)
+AC_PATH_TOOL(AR, ar)
+AC_PATH_TOOL(RANLIB, ranlib)
+AC_PATH_TOOL(RC, windres)
 
 dnl Check for POSIX threads
 dnl =======================
 AC_SEARCH_LIBS(pthread_create, pthread)
 
-dnl Check for GTK+ and pals
-dnl =======================
+dnl Check for GTK and pals
+dnl ======================
 
 PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.32)
 PKG_CHECK_MODULES(GMODULE, gmodule-2.0 >= 2.32)
 
-dnl GTK+ support
-dnl =============
+AC_DEFINE(GLIB_VERSION_MIN_REQUIRED, GLIB_VERSION_2_32, target GLib 2.32)
+
+dnl GTK support
+dnl ===========
 
 AC_ARG_ENABLE(gtk,
- AS_HELP_STRING(--disable-gtk, Disable GTK+ support (default=enabled)),
+ AS_HELP_STRING(--disable-gtk, Disable GTK support (default=enabled)),
 USE_GTK=$enableval, USE_GTK=yes)
 
-if test $USE_GTK = yes ; then
- PKG_CHECK_MODULES(GTK, gtk+-3.0 >= 3.4)
- AC_DEFINE(USE_GTK, 1, Define if GTK+ support enabled)
+AC_ARG_ENABLE(gtk2,
+ AS_HELP_STRING(--enable-gtk2, Use GTK 2 instead of GTK 3 (default=disabled)),
+ USE_GTK2=$enableval, USE_GTK2=no)
+
+if test $USE_GTK2 = yes ; then
+ PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.24)
+ AC_DEFINE(USE_GTK, 1, Define if GTK support enabled)
+elif test $USE_GTK = yes ; then
+ PKG_CHECK_MODULES(GTK, gtk+-3.0 >= 3.18)
+ AC_DEFINE(USE_GTK, 1, Define if GTK support enabled)
+ AC_DEFINE(USE_GTK3, 1, Define if GTK 3 support enabled)
 fi
 
 AC_SUBST(USE_GTK)
+AC_SUBST(USE_GTK3)
 
 if test $HAVE_MSWINDOWS = yes ; then
 PKG_CHECK_MODULES(GIO, gio-2.0 >= 2.32)
 else
-	PKG_CHECK_MODULES(GIO, gio-2.0 >= 2.32 gio-unix-2.0 >= 2.32)
+ PKG_CHECK_MODULES(GIO, gio-2.0 >= 2.32 gio-unix-2.0 >= 2.32)
 fi
 
 AC_SUBST(GLIB_CFLAGS)
@@ -189,19 +222,33 @@
 dnl ==========
 
 AC_ARG_ENABLE(qt,
- AS_HELP_STRING(--enable-qt, Enable Qt support (default=disabled)),
- USE_QT=$enableval, USE_QT=no)
+ AS_HELP_STRING(--disable-qt, Disable Qt support (default=enabled)),
+ USE_QT=$enableval, USE_QT=yes)
+
+AC_ARG_ENABLE(qt5,
+ AS_HELP_STRING(--enable-qt5, Use Qt 5 instead of Qt 6 (default=disabled)),
+ USE_QT5=$enableval, USE_QT5=no)
 
-if test $USE_QT = yes ; then
- PKG_CHECK_MODULES(QT, Qt5Core Qt5Gui Qt5Widgets)
- AC_DEFINE(USE_QT, 1, Define if Qt support enabled)
+if test $USE_QT5 = yes ; then
+ PKG_CHECK_MODULES(QTCORE, Qt5Core >= 5.2)
+ PKG_CHECK_VAR(QTBINPATH, Qt5Core >= 5.2, host_bins)
+ PKG_CHECK_MODULES(QT, Qt5Core Qt5Gui Qt5Widgets Qt5Svg >= 5.2)
+ AC_DEFINE(USE_QT, 1, Define if Qt support enabled)
 
 # needed if Qt was built with -reduce-relocations
+ QTCORE_CFLAGS="$QTCORE_CFLAGS -fPIC"
 QT_CFLAGS="$QT_CFLAGS -fPIC"
+elif test $USE_QT = yes ; then
+ PKG_CHECK_MODULES(QTCORE, Qt6Core >= 6.0)
+ PKG_CHECK_VAR(QTBINPATH, Qt6Core >= 6.0, libexecdir)
+ PKG_CHECK_MODULES(QT, Qt6Core Qt6Gui Qt6Widgets Qt6Svg >= 6.0)
+ AC_DEFINE(USE_QT, 1, Define if Qt support enabled)
 fi
 
 AC_SUBST(USE_QT)
+AC_SUBST(USE_QT5)
 AC_SUBST(QT_CFLAGS)
 AC_SUBST(QT_LIBS)
+AC_SUBST(QTBINPATH)
 
 )

audacious-plugins-3.6.2-gtk3.tar.bz2/autogen.sh -> audacious-plugins-4.4.1.tar.bz2/autogen.sh Changed

audacious-plugins-3.6.2-gtk3.tar.bz2/buildsys.mk.in -> audacious-plugins-4.4.1.tar.bz2/buildsys.mk.in Changed

@@ -1,8 +1,9 @@
 #
-# Copyright (c) 2007, 2008, 2009, 2010, 2011, 2012
-# Jonathan Schleifer <js@webkeks.org>
+# Copyright (c) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016,
+# 2017, 2018, 2020, 2021, 2022, 2023, 2024
+# Jonathan Schleifer <js@nil.im>
 #
-# https://webkeks.org/git/?p=buildsys.git
+# https://fossil.nil.im/buildsys
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
@@ -52,38 +53,48 @@
 PROG_SUFFIX = @EXEEXT@
 LIB_CFLAGS = @LIB_CFLAGS@
 LIB_LDFLAGS = @LIB_LDFLAGS@
+LIB_LDFLAGS_INSTALL_NAME = @LIB_LDFLAGS_INSTALL_NAME@
 LIB_PREFIX = @LIB_PREFIX@
 LIB_SUFFIX = @LIB_SUFFIX@
+LINK_LIB = @LINK_LIB@
+AMIGA_LIB_CFLAGS = @AMIGA_LIB_CFLAGS@
+AMIGA_LIB_LDFLAGS = @AMIGA_LIB_LDFLAGS@
 PLUGIN_CFLAGS = @PLUGIN_CFLAGS@
 PLUGIN_LDFLAGS = @PLUGIN_LDFLAGS@
 PLUGIN_SUFFIX = @PLUGIN_SUFFIX@
-INSTALL_LIB = @INSTALL_LIB@
-UNINSTALL_LIB = @UNINSTALL_LIB@
+FRAMEWORK_LDFLAGS = @FRAMEWORK_LDFLAGS@
+FRAMEWORK_LDFLAGS_INSTALL_NAME = @FRAMEWORK_LDFLAGS_INSTALL_NAME@
+FRAMEWORK_LIBS = @FRAMEWORK_LIBS@
+CODESIGN = @CODESIGN@
+CODESIGN_IDENTITY ?= -
 CLEAN_LIB = @CLEAN_LIB@
-AS_DEPENDS = @AS_DEPENDS@
-CC_DEPENDS = @CC_DEPENDS@
-CXX_DEPENDS = @CXX_DEPENDS@
-OBJC_DEPENDS = @OBJC_DEPENDS@
-OBJCXX_DEPENDS = @OBJCXX_DEPENDS@
+DEP_ASFLAGS = @DEP_ASFLAGS@
+DEP_CFLAGS = @DEP_CFLAGS@
+DEP_CXXFLAGS = @DEP_CXXFLAGS@
+DEP_OBJCFLAGS = @DEP_OBJCFLAGS@
+DEP_OBJCXXFLAGS = @DEP_OBJCXXFLAGS@
 LN_S = @LN_S@
-MKDIR_P = mkdir -p
+MKDIR_P = @INSTALL@ -d
 INSTALL = @INSTALL@ -p
 SHELL = @SHELL@
 MSGFMT = @MSGFMT@
 JAVAC = @JAVAC@
 JAVACFLAGS = @JAVACFLAGS@
 JAR = @JAR@
-WINDRES = @WINDRES@
+RC = @RC@
+BUILD_AND_HOST_ARE_DARWIN = @BUILD_AND_HOST_ARE_DARWIN@
 prefix = @prefix@
 exec_prefix = @exec_prefix@
 bindir = @bindir@
 libdir = @libdir@
-pkgconfigdir = @pkgconfigdir@
+amigalibdir ?= ${prefix}/libs
 plugindir ?= ${libdir}/${PACKAGE_NAME}
+bundledir ?= ${prefix}/Library/PlugIns/${PACKAGE_NAME}
 datarootdir = @datarootdir@
 datadir = @datadir@
 includedir = @includedir@
 includesubdir ?= ${PACKAGE_NAME}
+INSTALL_INCLUDES ?= yes
 localedir = @localedir@
 localename ?= ${PACKAGE_NAME}
 mandir = @mandir@
@@ -103,108 +114,66 @@
 OBJS += ${OBJS11:.xpm=.o}
 
 LIB_OBJS = ${OBJS:.o=.lib.o}
+AMIGA_LIB_OBJS = ${OBJS:.o=.amigalib.o}
 PLUGIN_OBJS = ${OBJS:.o=.plugin.o}
 
+DEPS = ${OBJS:.o=.dep}			\
+ ${LIB_OBJS:.o=.dep}		\
+ ${AMIGA_LIB_OBJS:.o=.dep}	\
+ ${PLUGIN_OBJS:.o=.dep}
+
 MO_FILES = ${LOCALES:.po=.mo}
 
-.SILENT:
+@SILENT@
 .SUFFIXES:
-.SUFFIXES: .beam .c .c.dep .cc .cc.dep .class .cxx .cxx.dep .d .erl .lib.o .java .mo .m .m.dep .mm .mm.dep .o .plugin.o .po .py .pyc .rc .S .S.dep .xpm
-.PHONY: all subdirs pre-depend depend install install-extra uninstall uninstall-extra clean distclean locales ${SUBDIRS}
+.SUFFIXES: .amigalib.o .beam .c .cc .class .cxx .d .erl .lib.o .java	\
+	 .mo .m .mm .o .plugin.o .po .py .pyc .rc .S .xpm
+.PHONY: all subdirs subdirs-after pre-depend depend install		\
+	install-extra uninstall uninstall-extra clean distclean locales	\
+	copy-headers-into-framework ${SUBDIRS} ${SUBDIRS_AFTER}
 
 all:
-	${MAKE} ${MFLAGS} subdirs
-	${MAKE} ${MFLAGS} depend
-	${MAKE} ${STATIC_LIB} ${STATIC_LIB_NOINST} ${STATIC_PIC_LIB} ${STATIC_PIC_LIB_NOINST} ${SHARED_LIB} ${SHARED_LIB_NOINST} ${PLUGIN} ${PLUGIN_NOINST} ${PROG} ${PROG_NOINST} ${JARFILE} locales
+	${MAKE} @MAKEFLAGS_SILENT@ pre-all
+	${MAKE} @MAKEFLAGS_SILENT@ subdirs
+	${MAKE} @MAKEFLAGS_SILENT@ depend
+	${MAKE} @MAKEFLAGS_SILENT@				\
+	 ${STATIC_LIB} ${STATIC_LIB_NOINST}			\
+	 ${STATIC_PIC_LIB} ${STATIC_PIC_LIB_NOINST}		\
+	 ${STATIC_AMIGA_LIB}${STATIC_AMIGA_LIB_NOINST}	\
+	 ${SHARED_LIB} ${SHARED_LIB_NOINST}			\
+	 ${FRAMEWORK} ${FRAMEWORK_NOINST}			\
+	 ${AMIGA_LIB} ${AMIGA_LIB_NOINST}			\
+	 ${PLUGIN} ${PLUGIN_NOINST}				\
+	 ${BUNDLE} ${BUNDLE_NOINST}				\
+	 ${PROG} ${PROG_NOINST}				\
+	 ${JARFILE} locales
+	${MAKE} @MAKEFLAGS_SILENT@ subdirs-after
+	${MAKE} @MAKEFLAGS_SILENT@ post-all
+
+pre-all post-all:
 
 subdirs: ${SUBDIRS}
+subdirs-after: ${SUBDIRS_AFTER}
 
-${SUBDIRS}:
+${SUBDIRS} ${SUBDIRS_AFTER}:
 	for i in $@; do \
 		${DIR_ENTER}; \
-		${MAKE} ${MFLAGS} || exit $$?; \
+		${MAKE} @MAKEFLAGS_SILENT@ || exit $$?; \
 		${DIR_LEAVE}; \
 	done
 
-depend: pre-depend ${SRCS}
-	regen=0; \
-	deps=""; \
-	test -f .deps || regen=1; \
-	for i in ${SRCS}; do \
-		case $$i in \
-			*.c) \
-				if test x"${CC_DEPENDS}" = x"yes"; then \
-					test $$i -nt .deps && regen=1; \
-					deps="$$deps $$i.dep"; \
-				fi; \
-				;; \
-			*.cc | *.cxx) \
-				if test x"${CXX_DEPENDS}" = x"yes"; then \
-					test $$i -nt .deps && regen=1; \
-					deps="$$deps $$i.dep"; \
-				fi; \
-				;; \
-			*.m) \
-				if test x"${OBJC_DEPENDS}" = x"yes"; then \
-					test $$i -nt .deps && regen=1; \
-					deps="$$deps $$i.dep"; \
-				fi; \
-				;; \
-			*.mm) \
-				if test x"${OBJCXX_DEPENDS}" = x"yes"; then \
-					test $$i -nt .deps && regen=1; \
-					deps="$$deps $$i.dep"; \
-				fi; \
-				;; \
-			*.S) \
-				if test x"${AS_DEPENDS}" = x"yes"; then \
-					test $$i -nt .deps && regen=1; \
-					deps="$$deps $$i.dep"; \
-				fi; \
-				;; \
-		esac; \
-	done; \
-	if test x"$$regen" = x"1" -a x"$$deps" != x""; then \
-		${DEPEND_STATUS}; \
-		if ${MAKE} ${MFLAGS} $$deps && cat $$deps >.deps; then \
-			rm -f $$deps; \
-			${DEPEND_OK}; \
-		else \
-			:> .deps; \
-			touch -t 0001010000 .deps; \
-			${DEPEND_FAILED}; \
-		fi; \
-	fi
-
-.c.c.dep:
-	${CPP} ${CPPFLAGS} ${CFLAGS} -M $< | \
-	sed 's/^$^\.*$\.o:/\1.o \1.lib.o \1.plugin.o:/' >$@ || \
-	{ rm -f $@; false; }
-
-.cc.cc.dep .cxx.cxx.dep:
-	${CPP} ${CPPFLAGS} ${CXXFLAGS} -M $< | \
-	sed 's/^$^\.*$\.o:/\1.o \1.lib.o \1.plugin.o:/' >$@ || \
-	{ rm -f $@; false; }
-
-.m.m.dep:
-	${CPP} ${CPPFLAGS} ${OBJCFLAGS} -M $< | \
-	sed 's/^$^\.*$\.o:/\1.o \1.lib.o \1.plugin.o:/' >$@ || \
-	{ rm -f $@; false; }
-
-.mm.mm.dep:
-	${CPP} ${CPPFLAGS} ${OBJCPPFLAGS} -M $< | \
-	sed 's/^$^\.*$\.o:/\1.o \1.lib.o \1.plugin.o:/' >$@ || \
-	{ rm -f $@; false; }
-
-.S.S.dep:
-	${CPP} ${CPPFLAGS} ${ASFLAGS} -M $< | \
-	sed 's/^$^\.*$\.o:/\1.o \1.lib.o \1.plugin.o:/' >$@ || \
-	{ rm -f $@; false; }
+depend: pre-depend
+	: >.deps
+	for i in "" ${DEPS}; do \
+		test x"$$i" = x"" && continue; \
+		echo "-include \$${.CURDIR}/$$i" >>.deps; \
+	done
 
 pre-depend:
 
 ${PROG} ${PROG_NOINST}: ${EXT_DEPS} ${OBJS} ${OBJS_EXTRA}
 	${LINK_STATUS}
+	out="$@"; \
 	if ${LD} -o $@ ${OBJS} ${OBJS_EXTRA} ${LDFLAGS} ${LIBS}; then \
 		${LINK_OK}; \
 	else \
@@ -214,7 +183,8 @@
 ${JARFILE}: ${EXT_DEPS} ${JAR_MANIFEST} ${OBJS} ${OBJS_EXTRA}
 	${LINK_STATUS}
 	if test x"${JAR_MANIFEST}" != x""; then \
-		if ${JAR} cfm ${JARFILE} ${JAR_MANIFEST} ${OBJS} ${OBJS_EXTRA}; then \
+		if ${JAR} cfm ${JARFILE} ${JAR_MANIFEST} ${OBJS} \
+		 ${OBJS_EXTRA}; then \
 			${LINK_OK}; \
 		else \
 			${LINK_FAILED}; \
@@ -228,125 +198,238 @@
 	fi
 
 ${SHARED_LIB} ${SHARED_LIB_NOINST}: ${EXT_DEPS} ${LIB_OBJS} ${LIB_OBJS_EXTRA}
-	${LINK_STATUS}; \
-	objs=""; \
-	ars=""; \
-	for i in ${LIB_OBJS} ${LIB_OBJS_EXTRA}; do \
-		case $$i in \
-			*.a) \
-				ars="$$ars $$i" \
-				;; \
-			*.o) \
-				objs="$$objs $$i" \
-				;; \
-		esac \
-	done; \
-	for i in $$ars; do \
-		dir=".$$(echo $$i | sed 's/\//_/g').objs"; \
-		rm -fr $$dir; \
-		mkdir -p $$dir; \
-		cd $$dir; \
-		${AR} x ../$$i; \
-		for j in *.o; do \
-			objs="$$objs $$dir/$$j"; \
-		done; \
-		cd ..; \
-	done; \
-	if ${LD} -o $@ $$objs ${LIB_LDFLAGS} ${LDFLAGS} ${LIBS}; then \
+	${LINK_STATUS}
+	out="$@"; \
+	if ${LD} -o $@ ${LIB_OBJS} ${LIB_OBJS_EXTRA} ${LIB_LDFLAGS} \
+	 ${LIB_LDFLAGS_INSTALL_NAME} ${LDFLAGS} ${LIBS} ${LINK_LIB}; then \
 		${LINK_OK}; \
 	else \
 		${LINK_FAILED}; \
-	fi; \
-	for i in $$ars; do \
-		dir=".$$(echo $$i | sed 's/\//_/g').objs"; \
-		rm -fr $$dir; \
+	fi
+
+${FRAMEWORK} ${FRAMEWORK_NOINST}: ${EXT_DEPS} ${LIB_OBJS} ${LIB_OBJS_EXTRA}
+	${LINK_STATUS}
+	out="$@"; \
+	if test x"@HOST_IS_IOS@" = x"yes"; then \
+		if rm -fr $@ && \
+		 ${MAKE} @MAKEFLAGS_SILENT@ \
+			COPY_HEADERS_IF_SUBDIR=${includesubdir} \
+			COPY_HEADERS_DESTINATION=$$PWD/$@/Headers \
+			copy-headers-into-framework && \
+		 ${INSTALL} -m 644 Info.plist $@/Info.plist && \
+		 if test -f module.modulemap; then \
+			 ${MKDIR_P} $@/Modules && \
+			 ${INSTALL} -m 644 module.modulemap \
+				$@/Modules/module.modulemap; \
+		 fi && \
+		 ${LD} -o $@/$${out%.framework} \
+			${LIB_OBJS} ${LIB_OBJS_EXTRA} ${FRAMEWORK_LDFLAGS} \
+			${FRAMEWORK_LDFLAGS_INSTALL_NAME} ${LDFLAGS} \
+			${FRAMEWORK_LIBS} && \
+		 ${CODESIGN} -fs ${CODESIGN_IDENTITY} $@; then \
+			${LINK_OK}; \
+		else \
+			rm -fr $$out; false; \
+			${LINK_FAILED}; \
+		fi; \
+	else \
+		versiondir="$@/Versions/${LIB_MAJOR}"; \
+		if rm -fr $@ && \
+		 ${MKDIR_P} $$versiondir && \
+		 ${LN_S} ${LIB_MAJOR} $@/Versions/Current && \
+		 ${MAKE} @MAKEFLAGS_SILENT@ \
+			COPY_HEADERS_IF_SUBDIR=${includesubdir} \
+			COPY_HEADERS_DESTINATION=$$PWD/$$versiondir/Headers \
+			copy-headers-into-framework && \
+		 ${LN_S} Versions/Current/Headers $@/Headers && \
+		 if test -f Info.plist; then \
+			 ${MKDIR_P} $$versiondir/Resources && \
+			 ${INSTALL} -m 644 Info.plist \
+				$$versiondir/Resources/Info.plist && \
+			 ${LN_S} Versions/Current/Resources $@/Resources; \
+		 fi && \
+		 if test -f module.modulemap; then \
+			 ${MKDIR_P} $$versiondir/Modules && \
+			 ${INSTALL} -m 644 module.modulemap \
+				$$versiondir/Modules/module.modulemap && \
+			 ${LN_S} Versions/Current/Modules $@/Modules; \
+		 fi && \
+		 ${LD} -o $$versiondir/$${out%.framework} \
+			${LIB_OBJS} ${LIB_OBJS_EXTRA} ${FRAMEWORK_LDFLAGS} \
+			${FRAMEWORK_LDFLAGS_INSTALL_NAME} ${LDFLAGS} \
+			${FRAMEWORK_LIBS} && \
+		 ${LN_S} Versions/Current/$${out%.framework} \
+			$@/$${out%.framework} && \
+		 ${CODESIGN} -fs ${CODESIGN_IDENTITY} $@; then \
+			${LINK_OK}; \
+		else \
+			rm -fr $$out; false; \
+			${LINK_FAILED}; \
+		fi; \
+	fi
+
+copy-headers-into-framework:
+	for i in "" ${SUBDIRS} ${SUBDIRS_AFTER}; do \
+		test x"$$i" = x"" && continue; \
+		cd $$i || exit 1; \
+		${MAKE} @MAKEFLAGS_SILENT@ copy-headers-into-framework || \
+		 exit $$?; \
+		cd .. || exit 1; \
 	done
 
-${PLUGIN} ${PLUGIN_NOINST}: ${EXT_DEPS} ${PLUGIN_OBJS}
+	if test x"${includesubdir}" = x"${COPY_HEADERS_IF_SUBDIR}"; then \
+		for i in "" ${INCLUDES}; do \
+			test x"$$i" = x"" && continue; \
+			${MKDIR_P} \
+			 $$(dirname ${COPY_HEADERS_DESTINATION}/$$i) || \
+			 exit $$?; \
+			${INSTALL} -m 644 $$i \
+			 ${COPY_HEADERS_DESTINATION}/$$i || exit $$?; \
+		done \
+	fi
+
+${AMIGA_LIB} ${AMIGA_LIB_NOINST}: ${EXT_DEPS} ${AMIGA_LIB_OBJS_START}	 \
+				 ${AMIGA_LIB_OBJS} ${AMIGA_LIB_OBJS_EXTRA}
 	${LINK_STATUS}
-	objs=""; \
-	ars=""; \
-	for i in ${PLUGIN_OBJS}; do \
-		case $$i in \
-			*.a) \
-				ars="$$ars $$i" \
-				;; \
-			*.o) \
-				objs="$$objs $$i" \
-				;; \
-		esac \
-	done; \
-	for i in $$ars; do \
-		dir=".$$(echo $$i | sed 's/\//_/g').objs"; \
-		rm -fr $$dir; \
-		mkdir -p $$dir; \
-		cd $$dir; \
-		${AR} x ../$$i; \
-		for j in *.o; do \
-			objs="$$objs $$dir/$$j"; \
-		done; \
-		cd ..; \
-	done; \
-	if ${LD} -o $@ $$objs ${PLUGIN_LDFLAGS} ${LDFLAGS} ${LIBS}; then \
+	if ${LD} -o $@ ${AMIGA_LIB_OBJS_START} ${AMIGA_LIB_OBJS} \
+	 ${AMIGA_LIB_OBJS_EXTRA} ${AMIGA_LIB_LDFLAGS} \
+	 ${AMIGA_LIB_LIBS}; then \
 		${LINK_OK}; \
 	else \
 		${LINK_FAILED}; \
-	fi; \
-	for i in $$ars; do \
-		dir=".$$(echo $$i | sed 's/\//_/g').objs"; \
-		rm -fr $$dir; \
-	done
+	fi
+
+${PLUGIN} ${PLUGIN_NOINST}: ${EXT_DEPS} ${PLUGIN_OBJS} ${PLUGIN_OBJS_EXTRA}
+	${LINK_STATUS}
+	out="$@"; \
+	if ${LD} -o $$out ${PLUGIN_OBJS} ${PLUGIN_OBJS_EXTRA} ${PLUGIN_LDFLAGS} ${LDFLAGS} ${LIBS}; then \
+		${LINK_OK}; \
+	else \
+		rm -fr $$out; false; \
+		${LINK_FAILED}; \
+	fi
+
+${BUNDLE} ${BUNDLE_NOINST}: ${EXT_DEPS} ${PLUGIN_OBJS} ${PLUGIN_OBJS_EXTRA}
+	${LINK_STATUS}
+	out="$@"; \
+	if rm -fr $$out && @LINK_BUNDLE@ && ${CODESIGN} -fs ${CODESIGN_IDENTITY} $$out; then \
+		${LINK_OK}; \
+	else \
+		rm -fr $$out; false; \
+		${LINK_FAILED}; \
+	fi
 
 ${STATIC_LIB} ${STATIC_LIB_NOINST}: ${EXT_DEPS} ${OBJS} ${OBJS_EXTRA}
 	${LINK_STATUS}
 	rm -f $@
-	objs=""; \
-	ars=""; \
-	for i in ${OBJS} ${OBJS_EXTRA}; do \
-		case $$i in \
+	if test x"${BUILD_AND_HOST_ARE_DARWIN}" = x"yes"; then \
+		if /usr/bin/libtool -static -o $@ ${OBJS} ${OBJS_EXTRA}; then \
+			${LINK_OK}; \
+		else \
+			rm -f $@; false; \
+			${LINK_FAILED}; \
+		fi; \
+	else \
+		out="$@"; \
+		objs=""; \
+		ars=""; \
+		for i in ${OBJS} ${OBJS_EXTRA}; do \
+			case $$i in \
 			*.a) \
 				ars="$$ars $$i" \
 				;; \
 			*.o) \
 				objs="$$objs $$i" \
 				;; \
-		esac \
-	done; \
-	for i in $$ars; do \
-		dir=".$$(echo $$i | sed 's/\//_/g').objs"; \
-		rm -fr $$dir; \
-		mkdir -p $$dir; \
-		cd $$dir; \
-		${AR} x ../$$i; \
-		for j in *.o; do \
-			objs="$$objs $$dir/$$j"; \
+			esac \
 		done; \
-		cd ..; \
-	done; \
-	if ${AR} cr $@ $$objs && ${RANLIB} $@; then \
-		${LINK_OK}; \
-	else \
-		${LINK_FAILED}; \
-		rm -f $@; \
-	fi; \
-	for i in $$ars; do \
-		dir=".$$(echo $$i | sed 's/\//_/g').objs"; \
-		rm -fr $$dir; \
-	done
+		for i in $$ars; do \
+			dir=".$$(echo $$i | sed 's/\//_/g').objs"; \
+			rm -fr $$dir; \
+			mkdir -p $$dir; \
+			cd $$dir; \
+			${AR} x ../$$i; \
+			for j in *.o; do \
+				objs="$$objs $$dir/$$j"; \
+			done; \
+			cd ..; \
+		done; \
+		if ${AR} cr $@ $$objs && ${RANLIB} $@; then \
+			${LINK_OK}; \
+		else \
+			rm -f $@; false; \
+			${LINK_FAILED}; \
+		fi; \
+		for i in $$ars; do \
+			dir=".$$(echo $$i | sed 's/\//_/g').objs"; \
+			rm -fr $$dir; \
+		done; \
+	fi
 
-${STATIC_PIC_LIB} ${STATIC_PIC_LIB_NOINST}: ${EXT_DEPS} ${LIB_OBJS} ${LIB_OBJS_EXTRA}
+${STATIC_PIC_LIB} ${STATIC_PIC_LIB_NOINST}: ${EXT_DEPS} ${LIB_OBJS} \
+					 ${LIB_OBJS_EXTRA}
 	${LINK_STATUS}
 	rm -f $@
-	objs=""; \
-	ars=""; \
-	for i in ${LIB_OBJS} ${LIB_OBJS_EXTRA}; do \
-		case $$i in \
+	if test x"${BUILD_AND_HOST_ARE_DARWIN}" = x"yes"; then \
+		if /usr/bin/libtool -static -o $@ ${LIB_OBJS} \
+		 ${LIB_OBJS_EXTRA}; then \
+			${LINK_OK}; \
+		else \
+			rm -f $@; false; \
+			${LINK_FAILED}; \
+		fi; \
+	else \
+		out="$@"; \
+		objs=""; \
+		ars=""; \
+		for i in ${LIB_OBJS} ${LIB_OBJS_EXTRA}; do \
+			case $$i in \
 			*.a) \
 				ars="$$ars $$i" \
 				;; \
 			*.o) \
 				objs="$$objs $$i" \
 				;; \
+			esac \
+		done; \
+		for i in $$ars; do \
+			dir=".$$(echo $$i | sed 's/\//_/g').objs"; \
+			rm -fr $$dir; \
+			mkdir -p $$dir; \
+			cd $$dir; \
+			${AR} x ../$$i; \
+			for j in *.o; do \
+				objs="$$objs $$dir/$$j"; \
+			done; \
+			cd ..; \
+		done; \
+		if ${AR} cr $@ $$objs && ${RANLIB} $@; then \
+			${LINK_OK}; \
+		else \
+			rm -f $@; false; \
+			${LINK_FAILED}; \
+		fi; \
+		for i in $$ars; do \
+			dir=".$$(echo $$i | sed 's/\//_/g').objs"; \
+			rm -fr $$dir; \
+		done; \
+	fi
+
+${STATIC_AMIGA_LIB} ${STATIC_AMIGA_LIB_NOINST}: ${EXT_DEPS} ${AMIGA_LIB_OBJS} \
+						${AMIGA_LIB_OBJS_EXTRA}
+	${LINK_STATUS}
+	rm -f $@
+	out="$@"; \
+	objs=""; \
+	ars=""; \
+	for i in ${AMIGA_LIB_OBJS} ${AMIGA_LIB_OBJS_EXTRA}; do \
+		case $$i in \
+		*.a) \
+			ars="$$ars $$i" \
+			;; \
+		*.o) \
+			objs="$$objs $$i" \
+			;; \
 		esac \
 	done; \
 	for i in $$ars; do \
@@ -363,8 +446,8 @@
 	if ${AR} cr $@ $$objs && ${RANLIB} $@; then \
 		${LINK_OK}; \
 	else \
+		rm -f $@; false; \
 		${LINK_FAILED}; \
-		rm -f $@; \
 	fi; \
 	for i in $$ars; do \
 		dir=".$$(echo $$i | sed 's/\//_/g').objs"; \
@@ -375,21 +458,40 @@
 
 .c.o:
 	${COMPILE_STATUS}
-	if ${CC} ${CFLAGS} ${CPPFLAGS} -c -o $@ $<; then \
+	in="$<"; \
+	out="$@"; \
+	if ${CC} ${CFLAGS} ${CPPFLAGS} ${CFLAGS_$<} ${CFLAGS_$@} ${DEP_CFLAGS} \
+	 -c -o $@ $<; then \
 		${COMPILE_OK}; \
 	else \
 		${COMPILE_FAILED}; \
 	fi
 .c.lib.o:
 	${COMPILE_LIB_STATUS}
-	if ${CC} ${LIB_CFLAGS} ${CFLAGS} ${CPPFLAGS} -c -o $@ $<; then \
+	in="$<"; \
+	out="$@"; \
+	if ${CC} ${LIB_CFLAGS} ${CFLAGS} ${CPPFLAGS} ${CFLAGS_$<} ${CFLAGS_$@} \
+	 ${DEP_CFLAGS} -c -o $@ $<; then \
 		${COMPILE_LIB_OK}; \
 	else \
 		${COMPILE_LIB_FAILED}; \
 	fi
+.c.amigalib.o:
+	${COMPILE_AMIGA_LIB_STATUS}
+	in="$<"; \
+	out="$@"; \
+	if ${CC} ${AMIGA_LIB_CFLAGS} ${CFLAGS} ${CPPFLAGS} ${CFLAGS_$<} \
+	 ${CFLAGS_$@} ${DEP_CFLAGS} -c -o $@ $<; then \
+		${COMPILE_AMIGA_LIB_OK}; \
+	else \
+		${COMPILE_AMIGA_LIB_FAILED}; \
+	fi
 .c.plugin.o:
 	${COMPILE_PLUGIN_STATUS}
-	if ${CC} ${PLUGIN_CFLAGS} ${CFLAGS} ${CPPFLAGS} -c -o $@ $<; then \
+	in="$<"; \
+	out="$@"; \
+	if ${CC} ${PLUGIN_CFLAGS} ${CFLAGS} ${CPPFLAGS} ${CFLAGS_$<} \
+	 ${CFLAGS_$@} ${DEP_CFLAGS} -c -o $@ $<; then \
 		${COMPILE_PLUGIN_OK}; \
 	else \
 		${COMPILE_PLUGIN_FAILED}; \
@@ -397,21 +499,40 @@
 
 .cc.o .cxx.o:
 	${COMPILE_STATUS}
-	if ${CXX} ${CXXFLAGS} ${CPPFLAGS} -c -o $@ $<; then \
+	in="$<"; \
+	out="$@"; \
+	if ${CXX} ${CXXFLAGS} ${CPPFLAGS} ${CXXFLAGS_$<} ${CXXFLAGS_$@} \
+	 ${DEP_CXXFLAGS} -c -o $@ $<; then \
 		${COMPILE_OK}; \
 	else \
 		${COMPILE_FAILED}; \
 	fi
 .cc.lib.o .cxx.lib.o:
 	${COMPILE_LIB_STATUS}
-	if ${CXX} ${LIB_CFLAGS} ${CXXFLAGS} ${CPPFLAGS} -c -o $@ $<; then \
+	in="$<"; \
+	out="$@"; \
+	if ${CXX} ${LIB_CFLAGS} ${CXXFLAGS} ${CPPFLAGS} ${CXXFLAGS_$<} \
+	 ${CXXFLAGS_$@} ${DEP_CXXFLAGS} -c -o $@ $<; then \
 		${COMPILE_LIB_OK}; \
 	else \
 		${COMPILE_LIB_FAILED}; \
 	fi
+.cc.amigalib.o .cxx.amigalib.o:
+	${COMPILE_AMIGA_LIB_STATUS}
+	in="$<"; \
+	out="$@"; \
+	if ${CXX} ${AMIGA_LIB_CFLAGS} ${CXXFLAGS} ${CPPFLAGS} ${CXXFLAGS_$<} \
+	 ${CXXFLAGS_$@} ${DEP_CXXFLAGS} -c -o $@ $<; then \
+		${COMPILE_AMIGA_LIB_OK}; \
+	else \
+		${COMPILE_AMIGA_LIB_FAILED}; \
+	fi
 .cc.plugin.o .cxx.plugin.o:
 	${COMPILE_PLUGIN_STATUS}
-	if ${CXX} ${PLUGIN_CFLAGS} ${CXXFLAGS} ${CPPFLAGS} -c -o $@ $<; then \
+	in="$<"; \
+	out="$@"; \
+	if ${CXX} ${PLUGIN_CFLAGS} ${CXXFLAGS} ${CPPFLAGS} ${CXXFLAGS_$<} \
+	 ${CXXFLAGS_$@} ${DEP_CXXFLAGS} -c -o $@ $<; then \
 		${COMPILE_PLUGIN_OK}; \
 	else \
 		${COMPILE_PLUGIN_FAILED}; \
@@ -419,6 +540,8 @@
 
 .d.o:
 	${COMPILE_STATUS}
+	in="$<"; \
+	out="$@"; \
 	if test x"$(basename ${DC})" = x"dmd"; then \
 		if ${DC} ${DFLAGS} -c -of$@ $<; then \
 			${COMPILE_OK}; \
@@ -435,6 +558,8 @@
 
 .erl.beam:
 	${COMPILE_STATUS}
+	in="$<"; \
+	out="$@"; \
 	if ${ERLC} ${ERLCFLAGS} -o $@ $<; then \
 		${COMPILE_OK}; \
 	else \
@@ -443,6 +568,8 @@
 
 .java.class:
 	${COMPILE_STATUS}
+	in="$<"; \
+	out="$@"; \
 	if ${JAVAC} ${JAVACFLAGS} $<; then \
 		${COMPILE_OK}; \
 	else \
@@ -451,21 +578,40 @@
 
 .m.o:
 	${COMPILE_STATUS}
-	if ${OBJC} ${OBJCFLAGS} ${CPPFLAGS} -c -o $@ $<; then \
+	in="$<"; \
+	out="$@"; \
+	if ${OBJC} ${OBJCFLAGS} ${CPPFLAGS} ${OBJCFLAGS_$<} ${OBJCFLAGS_$@} \
+	 ${DEP_OBJCFLAGS} -c -o $@ $<; then \
 		${COMPILE_OK}; \
 	else \
 		${COMPILE_FAILED}; \
 	fi
 .m.lib.o:
 	${COMPILE_LIB_STATUS}
-	if ${OBJC} ${LIB_CFLAGS} ${OBJCFLAGS} ${CPPFLAGS} -c -o $@ $<; then \
+	in="$<"; \
+	out="$@"; \
+	if ${OBJC} ${LIB_CFLAGS} ${OBJCFLAGS} ${CPPFLAGS} ${OBJCFLAGS_$<} \
+	 ${OBJCFLAGS_$@} ${DEP_OBJCFLAGS} -c -o $@ $<; then \
 		${COMPILE_LIB_OK}; \
 	else \
 		${COMPILE_LIB_FAILED}; \
 	fi
+.m.amigalib.o:
+	${COMPILE_AMIGA_LIB_STATUS}
+	in="$<"; \
+	out="$@"; \
+	if ${OBJC} ${AMIGA_LIB_CFLAGS} ${OBJCFLAGS} ${CPPFLAGS} \
+	 ${OBJCFLAGS_$<} ${OBJCFLAGS_$@} ${DEP_OBJCFLAGS} -c -o $@ $<; then \
+		${COMPILE_AMIGA_LIB_OK}; \
+	else \
+		${COMPILE_AMIGA_LIB_FAILED}; \
+	fi
 .m.plugin.o:
 	${COMPILE_PLUGIN_STATUS}
-	if ${OBJC} ${PLUGIN_CFLAGS} ${OBJCFLAGS} ${CPPFLAGS} -c -o $@ $<; then \
+	in="$<"; \
+	out="$@"; \
+	if ${OBJC} ${PLUGIN_CFLAGS} ${OBJCFLAGS} ${CPPFLAGS} ${OBJCFLAGS_$<} \
+	 ${OBJCFLAGS_$@} ${DEP_OBJCFLAGS} -c -o $@ $<; then \
 		${COMPILE_PLUGIN_OK}; \
 	else \
 		${COMPILE_PLUGIN_FAILED}; \
@@ -473,21 +619,43 @@
 
 .mm.o:
 	${COMPILE_STATUS}
-	if ${OBJCXX} ${OBJCXXFLAGS} ${OBJCFLAGS} ${CXXFLAGS} ${CPPFLAGS} -c -o $@ $<; then \
+	in="$<"; \
+	out="$@"; \
+	if ${OBJCXX} ${OBJCXXFLAGS} ${CPPFLAGS} ${OBJCXXFLAGS_$<} \
+	 ${OBJCXXFLAGS_$@} ${DEP_OBJCXXFLAGS} -c -o $@ $<; then \
 		${COMPILE_OK}; \
 	else \
 		${COMPILE_FAILED}; \
 	fi
 .mm.lib.o:
 	${COMPILE_LIB_STATUS}
-	if ${OBJCXX} ${LIB_CFLAGS} ${OBJCXXFLAGS} ${OBJCFLAGS} ${CXXFLAGS} ${CPPFLAGS} -c -o $@ $<; then \
+	in="$<"; \
+	out="$@"; \
+	if ${OBJCXX} ${LIB_CFLAGS} ${OBJCXXFLAGS} ${CPPFLAGS} \
+	 ${OBJCXXFLAGS_$<} ${OBJCXXFLAGS_$@} ${DEP_OBJCXXFLAGS} -c -o $@ \
+	 $<; then \
 		${COMPILE_LIB_OK}; \
 	else \
 		${COMPILE_LIB_FAILED}; \
 	fi
+.mm.amigalib.o:
+	${COMPILE_AMIGA_LIB_STATUS}
+	in="$<"; \
+	out="$@"; \
+	if ${OBJCXX} ${AMIGA_LIB_CFLAGS} ${OBJCXXFLAGS} ${CPPFLAGS} \
+	 ${OBJCXXFLAGS_$<} ${OBJCXXFLAGS_$@} ${DEP_OBJCXXFLAGS} -c -o $@ \
+	 $<; then \
+		${COMPILE_AMIGA_LIB_OK}; \
+	else \
+		${COMPILE_AMIGA_LIB_FAILED}; \
+	fi
 .mm.plugin.o:
 	${COMPILE_PLUGIN_STATUS}
-	if ${OBJCXX} ${PLUGIN_CFLAGS} ${OBJCXXFLAGS} ${OBJCFLAGS} ${CXXFLAGS} ${CPPFLAGS} -c -o $@ $<; then \
+	in="$<"; \
+	out="$@"; \
+	if ${OBJCXX} ${PLUGIN_CFLAGS} ${OBJCXXFLAGS} ${CPPFLAGS} \
+	 ${OBJCXXFLAGS_$<} ${OBJCXXFLAGS_$@} ${DEP_OBJCXXFLAGS} -c -o $@ \
+	 $<; then \
 		${COMPILE_PLUGIN_OK}; \
 	else \
 		${COMPILE_PLUGIN_FAILED}; \
@@ -495,6 +663,8 @@
 
 .po.mo:
 	${COMPILE_STATUS}
+	in="$<"; \
+	out="$@"; \
 	if ${MSGFMT} -c -o $@ $<; then \
 		${COMPILE_OK}; \
 	else \
@@ -503,7 +673,10 @@
 
 .py.pyc:
 	${COMPILE_STATUS}
-	if ${PYTHON} ${PYTHON_FLAGS} -c "import py_compile; py_compile.compile('$<')"; then \
+	in="$<"; \
+	out="$@"; \
+	if ${PYTHON} ${PYTHON_FLAGS} -c \
+	 "import py_compile; py_compile.compile('$<')"; then \
 		${COMPILE_OK}; \
 	else \
 		${COMPILE_FAILED}; \
@@ -511,29 +684,40 @@
 
 .rc.o .rc.lib.o .rc.plugin.o:
 	${COMPILE_STATUS}
-	if ${WINDRES} -J rc -O coff -o $@ $<; then \
+	in="$<"; \
+	out="$@"; \
+	if ${RC} ${RCFLAGS} -J rc -O coff -o $@ $<; then \
 		${COMPILE_OK}; \
 	else \
 		${COMPILE_FAILED}; \
 	fi
 
-.S.o:
+.S.o .S.amigalib.o:
 	${COMPILE_STATUS}
-	if ${AS} ${ASFLAGS} ${CPPFLAGS} -c -o $@ $<; then \
+	in="$<"; \
+	out="$@"; \
+	if ${AS} ${ASFLAGS} ${CPPFLAGS} ${ASFLAGS_$<} ${ASFLAGS_$@} \
+	 ${DEP_ASFLAGS} -c -o $@ $<; then \
 		${COMPILE_OK}; \
 	else \
 		${COMPILE_FAILED}; \
 	fi
 .S.lib.o:
 	${COMPILE_LIB_STATUS}
-	if ${AS} ${LIB_CFLAGS} ${ASFLAGS} ${CPPFLAGS} -c -o $@ $<; then \
+	in="$<"; \
+	out="$@"; \
+	if ${AS} ${LIB_CFLAGS} ${ASFLAGS} ${CPPFLAGS} ${ASFLAGS_$<} \
+	 ${ASFLAGS_$@} ${DEP_ASFLAGS} -c -o $@ $<; then \
 		${COMPILE_LIB_OK}; \
 	else \
 		${COMPILE_LIB_FAILED}; \
 	fi
 .S.plugin.o:
 	${COMPILE_PLUGIN_STATUS}
-	if ${AS} ${PLUGIN_CFLAGS} ${ASFLAGS} ${CPPFLAGS} -c -o $@ $<; then \
+	in="$<"; \
+	out="$@"; \
+	if ${AS} ${PLUGIN_CFLAGS} ${ASFLAGS} ${CPPFLAGS} ${ASFLAGS_$<} \
+	 ${ASFLAGS_$@} ${DEP_ASFLAGS} -c -o $@ $<; then \
 		${COMPILE_PLUGIN_OK}; \
 	else \
 		${COMPILE_PLUGIN_FAILED}; \
@@ -541,52 +725,99 @@
 
 .xpm.o:
 	${COMPILE_STATUS}
-	if ${CC} ${CFLAGS} ${CPPFLAGS} -x c -c -o $@ $<; then \
+	in="$<"; \
+	out="$@"; \
+	if ${CC} ${CFLAGS} ${CPPFLAGS} ${CFLAGS_$<} ${CFLAGS_$@} -x c -c -o $@ \
+	 $<; then \
 		${COMPILE_OK}; \
 	else \
 		${COMPILE_FAILED}; \
 	fi
 .xpm.lib.o:
 	${COMPILE_LIB_STATUS}
-	if ${CC} ${LIB_CFLAGS} ${CFLAGS} ${CPPFLAGS} -x c -c -o $@ $<; then \
+	in="$<"; \
+	out="$@"; \
+	if ${CC} ${LIB_CFLAGS} ${CFLAGS} ${CPPFLAGS} ${CFLAGS_$<} ${CFLAGS_$@} \
+	 -x c -c -o $@ $<; then \
 		${COMPILE_LIB_OK}; \
 	else \
 		${COMPILE_LIB_FAILED}; \
 	fi
+.xpm.amigalib.o:
+	${COMPILE_AMIGA_LIB_STATUS}
+	in="$<"; \
+	out="$@"; \
+	if ${CC} ${AMIGA_LIB_CFLAGS} ${CFLAGS} ${CPPFLAGS} ${CFLAGS_$<} \
+	 ${CFLAGS_$@} -x c -c -o $@ $<; then \
+		${COMPILE_AMIGA_LIB_OK}; \
+	else \
+		${COMPILE_AMIGA_LIB_FAILED}; \
+	fi
 .xpm.plugin.o:
 	${COMPILE_PLUGIN_STATUS}
-	if ${CC} ${PLUGIN_CFLAGS} ${CFLAGS} ${CPPFLAGS} -x c -c -o $@ $<; then \
+	in="$<"; \
+	out="$@"; \
+	if ${CC} ${PLUGIN_CFLAGS} ${CFLAGS} ${CPPFLAGS} ${CFLAGS_$<} \
+	 ${CFLAGS_$@} -x c -c -o $@ $<; then \
 		${COMPILE_PLUGIN_OK}; \
 	else \
 		${COMPILE_PLUGIN_FAILED}; \
 	fi
 
 install: install-extra
-	for i in ${SUBDIRS}; do \
+	for i in "" ${SUBDIRS} ${SUBDIRS_AFTER}; do \
+		test x"$$i" = x"" && continue; \
 		${DIR_ENTER}; \
-		${MAKE} ${MFLAGS} install || exit $$?; \
+		${MAKE} @MAKEFLAGS_SILENT@ install || exit $$?; \
 		${DIR_LEAVE}; \
 	done
 
-	for i in ${SHARED_LIB}; do \
+	for i in "" ${SHARED_LIB}; do \
+		test x"$$i" = x"" && continue; \
 		${INSTALL_STATUS}; \
-		if ${MKDIR_P} ${DESTDIR}${libdir} ${INSTALL_LIB}; then \
+		if ${MKDIR_P} ${DESTDIR}${libdir} @INSTALL_LIB@; then \
 			${INSTALL_OK}; \
 		else \
 			${INSTALL_FAILED}; \
 		fi \
 	done
 
-	for i in ${STATIC_LIB} ${STATIC_PIC_LIB}; do \
+	for i in "" ${FRAMEWORK}; do \
+		test x"$$i" = x"" && continue; \
 		${INSTALL_STATUS}; \
-		if ${MKDIR_P} ${DESTDIR}${libdir} && ${INSTALL} -m 644 $$i ${DESTDIR}${libdir}/$$i; then \
+		rm -fr ${DESTDIR}${prefix}/Library/Frameworks/$$i; \
+		if ${MKDIR_P} ${DESTDIR}${prefix}/Library/Frameworks && \
+		 cp -R $$i ${DESTDIR}${prefix}/Library/Frameworks/; then \
 			${INSTALL_OK}; \
 		else \
 			${INSTALL_FAILED}; \
 		fi \
 	done
 
-	for i in ${PLUGIN}; do \
+	for i in "" ${AMIGA_LIB}; do \
+		test x"$$i" = x"" && continue; \
+		${INSTALL_STATUS}; \
+		if ${MKDIR_P} ${DESTDIR}${amigalibdir} && \
+		 ${INSTALL} -m 755 $$i ${DESTDIR}${amigalibdir}/$$i; then \
+			${INSTALL_OK}; \
+		else \
+			${INSTALL_FAILED}; \
+		fi \
+	done
+
+	for i in "" ${STATIC_LIB} ${STATIC_PIC_LIB} ${STATIC_AMIGA_LIB}; do \
+		test x"$$i" = x"" && continue; \
+		${INSTALL_STATUS}; \
+		if ${MKDIR_P} ${DESTDIR}${libdir} && \
+		 ${INSTALL} -m 644 $$i ${DESTDIR}${libdir}/$$i; then \
+			${INSTALL_OK}; \
+		else \
+			${INSTALL_FAILED}; \
+		fi \
+	done
+
+	for i in "" ${PLUGIN}; do \
+		test x"$$i" = x"" && continue; \
 		${INSTALL_STATUS}; \
 		if ${MKDIR_P} ${DESTDIR}${plugindir} && ${INSTALL} -m 755 $$i ${DESTDIR}${plugindir}/$$i; then \
 			${INSTALL_OK}; \
@@ -595,45 +826,76 @@
 		fi \
 	done
 
-	for i in ${DATA}; do \
+	for i in "" ${BUNDLE}; do \
+		test x"$$i" = x"" && continue; \
 		${INSTALL_STATUS}; \
-		if ${MKDIR_P} $$(dirname ${DESTDIR}${datadir}/${PACKAGE_NAME}/$$i) && ${INSTALL} -m 644 $$i ${DESTDIR}${datadir}/${PACKAGE_NAME}/$$i; then \
+		rm -fr ${DESTDIR}${bundledir}/$$i; \
+		if ${MKDIR_P} ${DESTDIR}${bundledir} && \
+		 cp -R $$i ${DESTDIR}${bundledir}/; then \
 			${INSTALL_OK}; \
 		else \
 			${INSTALL_FAILED}; \
 		fi \
 	done
 
-	for i in ${PROG}; do \
+	for i in "" ${DATA}; do \
+		test x"$$i" = x"" && continue; \
 		${INSTALL_STATUS}; \
-		if ${MKDIR_P} ${DESTDIR}${bindir} && ${INSTALL} -m 755 $$i ${DESTDIR}${bindir}/$$i; then \
+		if ${MKDIR_P} $$(dirname \
+		 ${DESTDIR}${datadir}/${PACKAGE_NAME}/$$i) && \
+		 ${INSTALL} -m 644 $$i \
+		 ${DESTDIR}${datadir}/${PACKAGE_NAME}/$$i; then \
 			${INSTALL_OK}; \
 		else \
 			${INSTALL_FAILED}; \
 		fi \
 	done
 
-	for i in ${INCLUDES}; do \
+	for i in "" ${PROG}; do \
+		test x"$$i" = x"" && continue; \
 		${INSTALL_STATUS}; \
-		if ${MKDIR_P} ${DESTDIR}${includedir}/${includesubdir} && ${INSTALL} -m 644 $$i ${DESTDIR}${includedir}/${includesubdir}/$$i; then \
+		if ${MKDIR_P} ${DESTDIR}${bindir} && \
+		 ${INSTALL} -m 755 $$i ${DESTDIR}${bindir}/$$i; then \
 			${INSTALL_OK}; \
 		else \
 			${INSTALL_FAILED}; \
 		fi \
 	done
 
-	for i in ${MO_FILES}; do \
+	if test x"${INSTALL_INCLUDES}" = x"yes"; then \
+		for i in "" ${INCLUDES}; do \
+			test x"$$i" = x"" && continue; \
+			${INSTALL_STATUS}; \
+			if ${MKDIR_P} $$(dirname \
+			 ${DESTDIR}${includedir}/${includesubdir}/$$i) && \
+			 ${INSTALL} -m 644 $$i \
+			 ${DESTDIR}${includedir}/${includesubdir}/$$i; then \
+				${INSTALL_OK}; \
+			else \
+				${INSTALL_FAILED}; \
+			fi \
+		done \
+	fi
+
+	for i in "" ${MO_FILES}; do \
+		test x"$$i" = x"" && continue; \
 		${INSTALL_STATUS}; \
-		if ${MKDIR_P} ${DESTDIR}${localedir}/$${i%.mo}/LC_MESSAGES && ${INSTALL} -m 644 $$i ${DESTDIR}${localedir}/$${i%.mo}/LC_MESSAGES/${localename}.mo; then \
+		dest="${localedir}/$${i%.mo}/LC_MESSAGES/${localename}.mo"; \
+		dest="${DESTDIR}$$dest"; \
+		if ${MKDIR_P} ${DESTDIR}${localedir}/$${i%.mo}/LC_MESSAGES && \
+		 ${INSTALL} -m 644 $$i $$dest; then \
 			${INSTALL_OK}; \
 		else \
 			${INSTALL_FAILED}; \
 		fi \
 	done
 
-	for i in ${MAN}; do \
+	for i in "" ${MAN}; do \
+		test x"$$i" = x"" && continue; \
 		${INSTALL_STATUS}; \
-		if ${MKDIR_P} ${DESTDIR}${mandir}/${mansubdir} && ${INSTALL} -m 644 $$i ${DESTDIR}${mandir}/${mansubdir}/$$i; then \
+		dest="${DESTDIR}${mandir}/${mansubdir}/$$i"; \
+		if ${MKDIR_P} ${DESTDIR}${mandir}/${mansubdir} && \
+		 ${INSTALL} -m 644 $$i $$dest; then \
 			${INSTALL_OK}; \
 		else \
 			${INSTALL_FAILED}; \
@@ -642,16 +904,19 @@
 
 install-extra:
 
-uninstall: uninstall-extra
-	for i in ${SUBDIRS}; do \
+uninstall:
+	for i in "" ${SUBDIRS} ${SUBDIRS_AFTER}; do \
+		test x"$$i" = x"" && continue; \
 		${DIR_ENTER}; \
-		${MAKE} ${MFLAGS} uninstall || exit $$?; \
+		${MAKE} @MAKEFLAGS_SILENT@ uninstall || exit $$?; \
 		${DIR_LEAVE}; \
 	done
 
-	for i in ${SHARED_LIB}; do \
-		if test -f ${DESTDIR}${libdir}/$$i; then \
-			if : ${UNINSTALL_LIB}; then \
+	for i in "" ${SHARED_LIB}; do \
+		test x"$$i" = x"" && continue; \
+		if test -f ${DESTDIR}${libdir}/$$i \
+		 -o -f ${DESTDIR}${bindir}/$$i; then \
+			if : @UNINSTALL_LIB@; then \
 				${DELETE_OK}; \
 			else \
 				${DELETE_FAILED}; \
@@ -659,7 +924,22 @@
 		fi; \
 	done
 
-	for i in ${STATIC_LIB} ${STATIC_PIC_LIB}; do \
+	for i in "" ${FRAMEWORK}; do \
+		test x"$$i" = x"" && continue; \
+		if test -d ${DESTDIR}${prefix}/Library/Frameworks/$$i; then \
+			if rm -fr ${DESTDIR}${prefix}/Library/Frameworks/$$i; \
+			then \
+				${DELETE_OK}; \
+			else \
+				${DELETE_FAILED}; \
+			fi \
+		fi \
+	done
+	rmdir ${DESTDIR}${prefix}/Library/Frameworks >/dev/null 2>&1 || true
+	rmdir ${DESTDIR}${prefix}/Library >/dev/null 2>&1 || true
+
+	for i in "" ${STATIC_LIB} ${STATIC_PIC_LIB} ${STATIC_AMIGA_LIB}; do \
+		test x"$$i" = x"" && continue; \
 		if test -f ${DESTDIR}${libdir}/$$i; then \
 			if rm -f ${DESTDIR}${libdir}/$$i; then \
 				${DELETE_OK}; \
@@ -669,8 +949,9 @@
 		fi \
 	done
 
-	for i in ${PLUGIN}; do \
-		if test -f ${DESTDIR}${plugindir}/$$i; then \
+	for i in "" ${PLUGIN}; do \
+		test x"$$i" = x"" && continue; \
+		if test -e ${DESTDIR}${plugindir}/$$i; then \
 			if rm -f ${DESTDIR}${plugindir}/$$i; then \
 				${DELETE_OK}; \
 			else \
@@ -678,21 +959,39 @@
 			fi \
 		fi \
 	done
-	-rmdir ${DESTDIR}${plugindir} >/dev/null 2>&1
+	rmdir ${DESTDIR}${plugindir} >/dev/null 2>&1 || true
 
-	for i in ${DATA}; do \
+	for i in "" ${BUNDLE}; do \
+		test x"$$i" = x"" && continue; \
+		if test -d ${DESTDIR}${bundledir}/$$i; then \
+			if rm -fr ${DESTDIR}${bundledir}/$$i; \
+			then \
+				${DELETE_OK}; \
+			else \
+				${DELETE_FAILED}; \
+			fi \
+		fi \
+	done
+	rmdir ${DESTDIR}${bundledir} >/dev/null 2>&1 || true
+	rmdir ${DESTDIR}${prefix}/Library >/dev/null 2>&1 || true
+
+	for i in "" ${DATA}; do \
+		test x"$$i" = x"" && continue; \
 		if test -f ${DESTDIR}${datadir}/${PACKAGE_NAME}/$$i; then \
-			if rm -f ${DESTDIR}${datadir}/${PACKAGE_NAME}/$$i; then \
+			if rm -f ${DESTDIR}${datadir}/${PACKAGE_NAME}/$$i; \
+			then \
 				${DELETE_OK}; \
 			else \
 				${DELETE_FAILED}; \
 			fi \
 		fi; \
-		rmdir "$$(dirname ${DESTDIR}${datadir}/${PACKAGE_NAME}/$$i)" >/dev/null 2>&1 || true; \
+		rmdir "$$(dirname ${DESTDIR}${datadir}/${PACKAGE_NAME}/$$i)" \
+		 >/dev/null 2>&1 || true; \
 	done
-	-rmdir ${DESTDIR}${datadir}/${PACKAGE_NAME} >/dev/null 2>&1
+	rmdir ${DESTDIR}${datadir}/${PACKAGE_NAME} >/dev/null 2>&1 || true
 
-	for i in ${PROG}; do \
+	for i in "" ${PROG}; do \
+		test x"$$i" = x"" && continue; \
 		if test -f ${DESTDIR}${bindir}/$$i; then \
 			if rm -f ${DESTDIR}${bindir}/$$i; then \
 				${DELETE_OK}; \
@@ -702,20 +1001,25 @@
 		fi \
 	done
 
-	for i in ${INCLUDES}; do \
+	for i in "" ${INCLUDES}; do \
+		test x"$$i" = x"" && continue; \
 		if test -f ${DESTDIR}${includedir}/${includesubdir}/$$i; then \
-			if rm -f ${DESTDIR}${includedir}/${includesubdir}/$$i; then \
+			if rm -f ${DESTDIR}${includedir}/${includesubdir}/$$i; \
+			then \
 				${DELETE_OK}; \
 			else \
 				${DELETE_FAILED}; \
 			fi \
 		fi \
 	done
-	-rmdir ${DESTDIR}${includedir}/${includesubdir} >/dev/null 2>&1
+	rmdir ${DESTDIR}${includedir}/${includesubdir} >/dev/null 2>&1 || true
 
-	for i in ${MO_FILES}; do \
-		if test -f ${DESTDIR}${localedir}/$${i%.mo}/LC_MESSAGES/${localename}.mo; then \
-			if rm -f ${DESTDIR}${localedir}/$${i%.mo}/LC_MESSAGES/${localename}.mo; then \
+	for i in "" ${MO_FILES}; do \
+		test x"$$i" = x"" && continue; \
+		mo="${localedir}/$${i%.mo}/LC_MESSAGES/${localename}.mo"; \
+		mo="${DESTDIR}$$mo"; \
+		if test -f $$mo; then \
+			if rm -f $$mo; then \
 				${DELETE_OK}; \
 			else \
 				${DELETE_FAILED}; \
@@ -723,7 +1027,8 @@
 		fi \
 	done
 
-	for i in ${MAN}; do \
+	for i in "" ${MAN}; do \
+		test x"$$i" = x"" && continue; \
 		if test -f ${DESTDIR}${mandir}/${mansubdir}/$$i; then \
 			if rm -f ${DESTDIR}${mandir}/${mansubdir}/$$i; then \
 				${DELETE_OK}; \
@@ -733,16 +1038,30 @@
 		fi \
 	done
 
+	${MAKE} @MAKEFLAGS_SILENT@ uninstall-extra
+
 uninstall-extra:
 
 clean:
-	for i in ${SUBDIRS}; do \
+	for i in "" ${SUBDIRS} ${SUBDIRS_AFTER}; do \
+		test x"$$i" = x"" && continue; \
 		${DIR_ENTER}; \
-		${MAKE} ${MFLAGS} clean || exit $$?; \
+		${MAKE} @MAKEFLAGS_SILENT@ clean || exit $$?; \
 		${DIR_LEAVE}; \
 	done
 
-	for i in ${DEPS} ${OBJS} ${OBJS_EXTRA} ${LIB_OBJS} ${LIB_OBJS_EXTRA} ${PLUGIN_OBJS} ${PROG} ${PROG_NOINST} ${SHARED_LIB} ${SHARED_LIB_NOINST} ${STATIC_LIB} ${STATIC_LIB_NOINST} ${STATIC_PIC_LIB} ${STATIC_PIC_LIB_NOINST} ${PLUGIN} ${PLUGIN_NOINST} ${CLEAN_LIB} ${MO_FILES} ${CLEAN}; do \
+	: >.deps
+
+	for i in "" ${DEPS} ${OBJS} ${OBJS_EXTRA} ${LIB_OBJS} \
+	 ${LIB_OBJS_EXTRA} ${AMIGA_LIB_OBJS} ${AMIGA_LIB_OBJS_START} \
+	 ${AMIGA_LIB_OBJS_EXTRA} ${PLUGIN_OBJS} ${PROG} ${PROG_NOINST} \
+	 ${SHARED_LIB} ${SHARED_LIB_NOINST} ${AMIGA_LIB} \
+	 ${AMIGA_LIB_NOINST} ${STATIC_LIB} ${STATIC_LIB_NOINST} \
+	 ${STATIC_PIC_LIB} ${STATIC_PIC_LIB_NOINST} ${STATIC_AMIGA_LIB} \
+	 ${STATIC_AMIGA_LIB_NOINST} ${FRAMEWORK} ${FRAMEWORK_NOINST} \
+	 ${PLUGIN} ${PLUGIN_NOINST} ${BUNDLE} ${BUNDLE_NOINST} \
+	 ${CLEAN_LIB} ${MO_FILES} ${CLEAN}; do \
+		test x"$$i" = x"" && continue; \
 		if test -f $$i -o -d $$i; then \
 			if rm -fr $$i; then \
 				${DELETE_OK}; \
@@ -753,13 +1072,15 @@
 	done
 
 distclean: clean
-	for i in ${SUBDIRS}; do \
+	for i in "" ${SUBDIRS} ${SUBDIRS_AFTER}; do \
+		test x"$$i" = x"" && continue; \
 		${DIR_ENTER}; \
-		${MAKE} ${MFLAGS} distclean || exit $$?; \
+		${MAKE} @MAKEFLAGS_SILENT@ distclean || exit $$?; \
 		${DIR_LEAVE}; \
 	done
 
-	for i in ${DISTCLEAN} .deps *~; do \
+	for i in "" ${DISTCLEAN} .deps *~; do \
+		test x"$$i" = x"" && continue; \
 		if test -f $$i -o -d $$i; then \
 			if rm -fr $$i; then \
 				${DELETE_OK}; \
@@ -769,27 +1090,41 @@
 		fi \
 	done
 
-DIR_ENTER = printf "@TERM_EL@@TERM_SETAF6@Entering directory @TERM_BOLD@$$i@TERM_SGR0@@TERM_SETAF6@.@TERM_SGR0@\n"; cd $$i || exit $$?
-DIR_LEAVE = printf "@TERM_EL@@TERM_SETAF6@Leaving directory @TERM_BOLD@$$i@TERM_SGR0@@TERM_SETAF6@.@TERM_SGR0@\n"; cd .. || exit $$?
-DEPEND_STATUS = printf "@TERM_EL@@TERM_SETAF3@Generating dependencies...@TERM_SGR0@\r"
-DEPEND_OK = printf "@TERM_EL@@TERM_SETAF2@Successfully generated dependencies.@TERM_SGR0@\n"
-DEPEND_FAILED = err=$$?; printf "@TERM_EL@@TERM_SETAF1@Failed to generate dependencies!@TERM_SGR0@\n"; exit $$err
-COMPILE_STATUS = printf "@TERM_EL@@TERM_SETAF3@Compiling @TERM_BOLD@$<@TERM_SGR0@@TERM_SETAF3@...@TERM_SGR0@\r"
-COMPILE_OK = printf "@TERM_EL@@TERM_SETAF2@Successfully compiled @TERM_BOLD@$<@TERM_SGR0@@TERM_SETAF2@.@TERM_SGR0@\n"
-COMPILE_FAILED = err=$$?; printf "@TERM_EL@@TERM_SETAF1@Failed to compile @TERM_BOLD@$<@TERM_SGR0@@TERM_SETAF1@!@TERM_SGR0@\n"; exit $$err
-COMPILE_LIB_STATUS = printf "@TERM_EL@@TERM_SETAF3@Compiling @TERM_BOLD@$<@TERM_SGR0@@TERM_SETAF3@ (lib)...@TERM_SGR0@\r"
-COMPILE_LIB_OK = printf "@TERM_EL@@TERM_SETAF2@Successfully compiled @TERM_BOLD@$<@TERM_SGR0@@TERM_SETAF2@ (lib).@TERM_SGR0@\n"
-COMPILE_LIB_FAILED = err=$$?; printf "@TERM_EL@@TERM_SETAF1@Failed to compile @TERM_BOLD@$<@TERM_SGR0@@TERM_SETAF1@ (lib)!@TERM_SGR0@\n"; exit $$err
-COMPILE_PLUGIN_STATUS = printf "@TERM_EL@@TERM_SETAF3@Compiling @TERM_BOLD@$<@TERM_SGR0@@TERM_SETAF3@ (plugin)...@TERM_SGR0@\r"
-COMPILE_PLUGIN_OK = printf "@TERM_EL@@TERM_SETAF2@Successfully compiled @TERM_BOLD@$<@TERM_SGR0@@TERM_SETAF2@ (plugin).@TERM_SGR0@\n"
-COMPILE_PLUGIN_FAILED = err=$$?; printf "@TERM_EL@@TERM_SETAF1@Failed to compile @TERM_BOLD@$<@TERM_SGR0@@TERM_SETAF1@ (plugin)!@TERM_SGR0@\n"; exit $$err
+print-hierarchy:
+	for i in "" ${SUBDIRS} ${SUBDIRS_AFTER}; do \
+		test x"$$i" = x"" && continue; \
+		echo ${PRINT_HIERARCHY_PREFIX}$$i; \
+		cd $$i || exit $$?; \
+		${MAKE} @MAKEFLAGS_SILENT@ PRINT_HIERARCHY_PREFIX=$$i/ \
+		 print-hierarchy || exit $$?; \
+		cd .. || exit $$?; \
+	done
+
+print-var:
+	printf '%s\n' '${${VAR}}'
+
+DIR_ENTER = printf "@TERM_EL@@TERM_SETAF6@Entering directory @TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF6@.@TERM_SGR0@\n" "$$i"; cd $$i || exit $$?
+DIR_LEAVE = printf "@TERM_EL@@TERM_SETAF6@Leaving directory @TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF6@.@TERM_SGR0@\n" "$$i"; cd .. || exit $$?
+COMPILE_STATUS = printf "@TERM_EL@@TERM_SETAF3@Compiling @TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF3@...@TERM_SGR0@\r" "$<"
+COMPILE_OK = printf "@TERM_EL@@TERM_SETAF2@Successfully compiled @TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF2@.@TERM_SGR0@\n" "$<"
+COMPILE_FAILED = err=$$?; printf "@TERM_EL@@TERM_SETAF1@Failed to compile @TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF1@!@TERM_SGR0@\n" "$<"; exit $$err
+COMPILE_LIB_STATUS = printf "@TERM_EL@@TERM_SETAF3@Compiling @TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF3@ (lib)...@TERM_SGR0@\r" "$<"
+COMPILE_LIB_OK = printf "@TERM_EL@@TERM_SETAF2@Successfully compiled @TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF2@ (lib).@TERM_SGR0@\n" "$<"
+COMPILE_LIB_FAILED = err=$$?; printf "@TERM_EL@@TERM_SETAF1@Failed to compile @TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF1@ (lib)!@TERM_SGR0@\n" "$<"; exit $$err
+COMPILE_AMIGA_LIB_STATUS = printf "@TERM_EL@@TERM_SETAF3@Compiling @TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF3@ (Amiga lib)...@TERM_SGR0@\r" "$<"
+COMPILE_AMIGA_LIB_OK = printf "@TERM_EL@@TERM_SETAF2@Successfully compiled @TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF2@ (Amiga lib).@TERM_SGR0@\n" "$<"
+COMPILE_AMIGA_LIB_FAILED = err=$$?; printf "@TERM_EL@@TERM_SETAF1@Failed to compile @TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF1@ (Amiga lib)!@TERM_SGR0@\n" "$<"; exit $$err
+COMPILE_PLUGIN_STATUS = printf "@TERM_EL@@TERM_SETAF3@Compiling @TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF3@ (plugin)...@TERM_SGR0@\r" "$<"
+COMPILE_PLUGIN_OK = printf "@TERM_EL@@TERM_SETAF2@Successfully compiled @TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF2@ (plugin).@TERM_SGR0@\n" "$<"
+COMPILE_PLUGIN_FAILED = err=$$?; printf "@TERM_EL@@TERM_SETAF1@Failed to compile @TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF1@ (plugin)!@TERM_SGR0@\n" "$<"; exit $$err
 LINK_STATUS = printf "@TERM_EL@@TERM_SETAF3@Linking @TERM_BOLD@$@@TERM_SGR0@@TERM_SETAF3@...@TERM_SGR0@\r"
 LINK_OK = printf "@TERM_EL@@TERM_SETAF2@Successfully linked @TERM_BOLD@$@@TERM_SGR0@@TERM_SETAF2@.@TERM_SGR0@\n"
 LINK_FAILED = err=$$?; printf "@TERM_EL@@TERM_SETAF1@Failed to link @TERM_BOLD@$@@TERM_SGR0@@TERM_SETAF1@!@TERM_SGR0@\n"; exit $$err
-INSTALL_STATUS = printf "@TERM_EL@@TERM_SETAF3@Installing @TERM_BOLD@$$i@TERM_SGR0@@TERM_SETAF3@...@TERM_SGR0@\r"
-INSTALL_OK = printf "@TERM_EL@@TERM_SETAF2@Successfully installed @TERM_BOLD@$$i@TERM_SGR0@@TERM_SETAF2@.@TERM_SGR0@\n"
-INSTALL_FAILED = err=$$?; printf "@TERM_EL@@TERM_SETAF1@Failed to install @TERM_BOLD@$$i@TERM_SGR0@@TERM_SETAF1@!@TERM_SGR0@\n"; exit $$err
-DELETE_OK = printf "@TERM_EL@@TERM_SETAF4@Deleted @TERM_BOLD@$$i@TERM_SGR0@@TERM_SETAF4@.@TERM_SGR0@\n"
-DELETE_FAILED = err=$$?; printf "@TERM_EL@@TERM_SETAF1@Failed to delete @TERM_BOLD@$$i@TERM_SGR0@@TERM_SETAF1@!@TERM_SGR0@\n"; exit $$err
+INSTALL_STATUS = printf "@TERM_EL@@TERM_SETAF3@Installing @TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF3@...@TERM_SGR0@\r" "$$i"
+INSTALL_OK = printf "@TERM_EL@@TERM_SETAF2@Successfully installed @TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF2@.@TERM_SGR0@\n" "$$i"
+INSTALL_FAILED = err=$$?; printf "@TERM_EL@@TERM_SETAF1@Failed to install @TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF1@!@TERM_SGR0@\n" "$$i"; exit $$err
+DELETE_OK = printf "@TERM_EL@@TERM_SETAF4@Deleted @TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF4@.@TERM_SGR0@\n" "$$i"
+DELETE_FAILED = err=$$?; printf "@TERM_EL@@TERM_SETAF1@Failed to delete @TERM_BOLD@%s@TERM_SGR0@@TERM_SETAF1@!@TERM_SGR0@\n" "$$i"; exit $$err
 
-include .deps
+.CURDIR ?= .
+-include ${.CURDIR}/.deps

audacious-plugins-3.6.2-gtk3.tar.bz2/config.h.in -> audacious-plugins-4.4.1.tar.bz2/config.h.in Changed

@@ -19,9 +19,21 @@
 /* Define if Vorbis output part should be built */
 #undef FILEWRITER_VORBIS
 
-/* Define to 1 if you have the Mac OS X function CFLocaleCopyCurrent in the
- CoreFoundation framework. */
-#undef HAVE_CFLOCALECOPYCURRENT
+/* target GLib 2.32 */
+#undef GLIB_VERSION_MIN_REQUIRED
+
+/* Define to 1 if you have the <adplug/kemuopl.h> header file. */
+#undef HAVE_ADPLUG_KEMUOPL_H
+
+/* Define to 1 if you have the <adplug/nemuopl.h> header file. */
+#undef HAVE_ADPLUG_NEMUOPL_H
+
+/* Define to 1 if you have the <adplug/wemuopl.h> header file. */
+#undef HAVE_ADPLUG_WEMUOPL_H
+
+/* Define to 1 if you have the Mac OS X function
+ CFLocaleCopyPreferredLanguages in the CoreFoundation framework. */
+#undef HAVE_CFLOCALECOPYPREFERREDLANGUAGES
 
 /* Define to 1 if you have the Mac OS X function CFPreferencesCopyAppValue in
 the CoreFoundation framework. */
@@ -31,9 +43,6 @@
 */
 #undef HAVE_DCGETTEXT
 
-/* Define if using FFmpeg */
-#undef HAVE_FFMPEG
-
 /* Define if the GNU gettext() function is already present or preinstalled. */
 #undef HAVE_GETTEXT
 
@@ -43,21 +52,24 @@
 /* Define to 1 if you have the <inttypes.h> header file. */
 #undef HAVE_INTTYPES_H
 
-/* Define if using libav */
-#undef HAVE_LIBAV
+/* Define if libcddb is installed */
+#undef HAVE_LIBCDDB
+
+/* Define if libcue version is >= 2.0 */
+#undef HAVE_LIBCUE2
 
 /* Define to 1 if you have the <lirc/lirc_client.h> header file. */
 #undef HAVE_LIRC_LIRC_CLIENT_H
 
-/* Define to 1 if you have the <memory.h> header file. */
-#undef HAVE_MEMORY_H
-
-/* Define to 1 if you have the <soundcard.h> header file. */
-#undef HAVE_SOUNDCARD_H
+/* Define if sndio version is >= 1.9 */
+#undef HAVE_SNDIO_1_9
 
 /* Define to 1 if you have the <stdint.h> header file. */
 #undef HAVE_STDINT_H
 
+/* Define to 1 if you have the <stdio.h> header file. */
+#undef HAVE_STDIO_H
+
 /* Define to 1 if you have the <stdlib.h> header file. */
 #undef HAVE_STDLIB_H
 
@@ -82,9 +94,6 @@
 /* Define to 1 if you have the <unistd.h> header file. */
 #undef HAVE_UNISTD_H
 
-/* X Composite extension available */
-#undef HAVE_XCOMPOSITE
-
 /* Define to 1 if you have the <zlib.h> header file. */
 #undef HAVE_ZLIB_H
 
@@ -109,12 +118,17 @@
 /* Define to the version of this package. */
 #undef PACKAGE_VERSION
 
-/* Define to 1 if you have the ANSI C header files. */
+/* Define to 1 if all of the C89 standard headers exist (not just the ones
+ required in a freestanding environment). This macro is provided for
+ backward compatibility; new code need not use it. */
 #undef STDC_HEADERS
 
-/* Define if GTK+ support enabled */
+/* Define if GTK support enabled */
 #undef USE_GTK
 
+/* Define if GTK 3 support enabled */
+#undef USE_GTK3
+
 /* Define if Qt support enabled */
 #undef USE_QT
 
@@ -133,13 +147,17 @@
 # endif
 #endif
 
-/* Enable large inode numbers on Mac OS X 10.5. */
-#ifndef _DARWIN_USE_64_BIT_INODE
-# define _DARWIN_USE_64_BIT_INODE 1
-#endif
-
 /* Number of bits in a file offset, on hosts where this is settable. */
 #undef _FILE_OFFSET_BITS
 
-/* Define for large files, on AIX-style hosts. */
+/* Define to 1 on platforms where this makes off_t a 64-bit type. */
 #undef _LARGE_FILES
+
+/* Number of bits in time_t, on hosts where this is settable. */
+#undef _TIME_BITS
+
+/* Define to 1 on platforms where this makes time_t a 64-bit type. */
+#undef __MINGW_USE_VC2005_COMPAT
+
+/* "Use GNU-style printf" */
+#undef __USE_MINGW_ANSI_STDIO

audacious-plugins-3.6.2-gtk3.tar.bz2/configure -> audacious-plugins-4.4.1.tar.bz2/configure Changed

@@ -1,78 +1,81 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for audacious-plugins 3.6.2.
+# Generated by GNU Autoconf 2.72 for audacious-plugins 4.4.1.
 #
 #
-# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
+# Copyright (C) 1992-1996, 1998-2017, 2020-2023 Free Software Foundation,
+# Inc.
 #
 #
 # This configure script is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.
 #
-# Copyright (C) 2001-2015 Audacious developers and others
+# Copyright (C) 2001-2024 Audacious developers and others
 ## -------------------- ##
 ## M4sh Initialization. ##
 ## -------------------- ##
 
 # Be more Bourne compatible
 DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
+if test ${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1
+then :
 emulate sh
 NULLCMD=:
 # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
 # is contrary to our usage. Disable this feature.
 alias -g '${1+"$@"}'='"$@"'
 setopt NO_GLOB_SUBST
-else
- case `(set -o) 2>/dev/null` in #(
+else case e in #(
+ e) case `(set -o) 2>/dev/null` in #(
 *posix*) :
 set -o posix ;; #(
 *) :
 ;;
+esac ;;
 esac
 fi
 
 
+
+# Reset variables that may have inherited troublesome values from
+# the environment.
+
+# IFS needs to be set, to space, tab, and newline, in precisely that order.
+# (If _AS_PATH_WALK were called with IFS unset, it would have the
+# side effect of setting IFS to empty, thus disabling word splitting.)
+# Quoting is to prevent editors from complaining about space-tab.
 as_nl='
 '
 export as_nl
-# Printing a long string crashes Solaris 7 /usr/bin/printf.
-as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
-# Prefer a ksh shell builtin over an external printf program on Solaris,
-# but without wasting forks for bash or zsh.
-if test -z "$BASH_VERSION$ZSH_VERSION" \
- && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
- as_echo='print -r --'
- as_echo_n='print -rn --'
-elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
- as_echo='printf %s\n'
- as_echo_n='printf %s'
-else
- if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
- as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
- as_echo_n='/usr/ucb/echo -n'
- else
- as_echo_body='eval expr "X$1" : "X\$.*\$"'
- as_echo_n_body='eval
- arg=$1;
- case $arg in #(
- *"$as_nl"*)
-	expr "X$arg" : "X\$.*\$$as_nl";
-	arg=`expr "X$arg" : ".*$as_nl\$.*\$"`;;
- esac;
- expr "X$arg" : "X\$.*\$" | tr -d "$as_nl"
- '
- export as_echo_n_body
- as_echo_n='sh -c $as_echo_n_body as_echo'
- fi
- export as_echo_body
- as_echo='sh -c $as_echo_body as_echo'
-fi
+IFS=" ""	$as_nl"
+
+PS1='$ '
+PS2='> '
+PS4='+ '
+
+# Ensure predictable behavior from utilities with locale-dependent output.
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
+
+# We cannot yet rely on "unset" to work, but we need these variables
+# to be unset--not just set to an empty or harmless value--now, to
+# avoid bugs in old shells (e.g. pre-3.0 UWIN ksh). This construct
+# also avoids known problems related to "unset" and subshell syntax
+# in other old shells (e.g. bash 2.01 and pdksh 5.2.14).
+for as_var in BASH_ENV ENV MAIL MAILPATH CDPATH
+do eval test \${$as_var+y} \
+ && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
+done
+
+# Ensure that fds 0, 1, and 2 are open.
+if (exec 3>&0) 2>/dev/null; then :; else exec 0</dev/null; fi
+if (exec 3>&1) 2>/dev/null; then :; else exec 1>/dev/null; fi
+if (exec 3>&2) ; then :; else exec 2>/dev/null; fi
 
 # The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
+if ${PATH_SEPARATOR+false} :; then
 PATH_SEPARATOR=:
 (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
 (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
@@ -81,13 +84,6 @@
 fi
 
 
-# IFS
-# We need space, tab and new line, in precisely that order. Quoting is
-# there to prevent editors from complaining about space-tab.
-# (If _AS_PATH_WALK were called with IFS unset, it would disable word
-# splitting by setting IFS to empty value.)
-IFS=" ""	$as_nl"
-
 # Find who we are. Look in the path if we contain no directory separator.
 as_myself=
 case $0 in #((
@@ -96,43 +92,27 @@
 for as_dir in $PATH
 do
 IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+ case $as_dir in #(((
+ '') as_dir=./ ;;
+ */) ;;
+ *) as_dir=$as_dir/ ;;
+ esac
+ test -r "$as_dir$0" && as_myself=$as_dir$0 && break
 done
 IFS=$as_save_IFS
 
 ;;
 esac
-# We did not find ourselves, most probably we were run as `sh COMMAND'
+# We did not find ourselves, most probably we were run as 'sh COMMAND'
 # in which case we are not to be found in the path.
 if test "x$as_myself" = x; then
 as_myself=$0
 fi
 if test ! -f "$as_myself"; then
- $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+ printf "%s\n" "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
 exit 1
 fi
 
-# Unset variables that we do not need and which cause bugs (e.g. in
-# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1"
-# suppresses any "Segmentation fault" message there. '((' could
-# trigger a bug in pdksh 5.2.14.
-for as_var in BASH_ENV ENV MAIL MAILPATH
-do eval test x\${$as_var+set} = xset \
- && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
-done
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# NLS nuisances.
-LC_ALL=C
-export LC_ALL
-LANGUAGE=C
-export LANGUAGE
-
-# CDPATH.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
 # Use a proper internal environment variable to ensure we don't fall
 # into an infinite loop, continuously re-executing ourselves.
@@ -153,26 +133,28 @@
 esac
 exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
 # Admittedly, this is quite paranoid, since all the known shells bail
-# out after a failed `exec'.
-$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
-as_fn_exit 255
+# out after a failed 'exec'.
+printf "%s\n" "$0: could not re-execute with $CONFIG_SHELL" >&2
+exit 255
 fi
 # We don't want this to propagate to other subprocesses.
 { _as_can_reexec=; unset _as_can_reexec;}
 if test "x$CONFIG_SHELL" = x; then
- as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
+ as_bourne_compatible="if test \${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1
+then :
 emulate sh
 NULLCMD=:
 # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which
 # is contrary to our usage. Disable this feature.
 alias -g '\${1+\"\$@\"}'='\"\$@\"'
 setopt NO_GLOB_SUBST
-else
- case \`(set -o) 2>/dev/null\` in #(
+else case e in #(
+ e) case \`(set -o) 2>/dev/null\` in #(
 *posix*) :
 set -o posix ;; #(
 *) :
 ;;
+esac ;;
 esac
 fi
 "
@@ -187,42 +169,55 @@
 as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; }
 as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; }
 as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; }
-if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
+if ( set x; as_fn_ret_success y && test x = \"\$1\" )
+then :
 
-else
- exitcode=1; echo positional parameters were not saved.
+else case e in #(
+ e) exitcode=1; echo positional parameters were not saved. ;;
+esac
 fi
 test x\$exitcode = x0 || exit 1
+blah=\$(echo \$(echo blah))
+test x\"\$blah\" = xblah || exit 1
 test -x / || exit 1"
 as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
 as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
 eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
 test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
 test \$(( 1 + 1 )) = 2 || exit 1"
- if (eval "$as_required") 2>/dev/null; then :
+ if (eval "$as_required") 2>/dev/null
+then :
 as_have_required=yes
-else
- as_have_required=no
+else case e in #(
+ e) as_have_required=no ;;
+esac
 fi
- if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then :
+ if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null
+then :
 
-else
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+else case e in #(
+ e) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 as_found=false
 for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
 do
 IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
+ case $as_dir in #(((
+ '') as_dir=./ ;;
+ */) ;;
+ *) as_dir=$as_dir/ ;;
+ esac
 as_found=:
 case $as_dir in #(
 	 /*)
 	 for as_base in sh bash ksh sh5; do
 	 # Try only shells that exist, to save several forks.
-	 as_shell=$as_dir/$as_base
+	 as_shell=$as_dir$as_base
 	 if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
-		 { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then :
+		 as_run=a "$as_shell" -c "$as_bourne_compatible""$as_required" 2>/dev/null
+then :
 CONFIG_SHELL=$as_shell as_have_required=yes
-		 if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then :
+		 if as_run=a "$as_shell" -c "$as_bourne_compatible""$as_suggested" 2>/dev/null
+then :
 break 2
 fi
 fi
@@ -230,14 +225,22 @@
 esac
 as_found=false
 done
-$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
-	 { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then :
- CONFIG_SHELL=$SHELL as_have_required=yes
-fi; }
 IFS=$as_save_IFS
+if $as_found
+then :
+
+else case e in #(
+ e) if { test -f "$SHELL" || test -f "$SHELL.exe"; } &&
+	 as_run=a "$SHELL" -c "$as_bourne_compatible""$as_required" 2>/dev/null
+then :
+ CONFIG_SHELL=$SHELL as_have_required=yes
+fi ;;
+esac
+fi
 
 
- if test "x$CONFIG_SHELL" != x; then :
+ if test "x$CONFIG_SHELL" != x
+then :
 export CONFIG_SHELL
 # We cannot yet assume a decent shell, so we have to provide a
 # neutralization value for shells without unset; and this also
@@ -254,25 +257,27 @@
 esac
 exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
 # Admittedly, this is quite paranoid, since all the known shells bail
-# out after a failed `exec'.
-$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+# out after a failed 'exec'.
+printf "%s\n" "$0: could not re-execute with $CONFIG_SHELL" >&2
 exit 255
 fi
 
- if test x$as_have_required = xno; then :
- $as_echo "$0: This script requires a shell more modern than all"
- $as_echo "$0: the shells that I found on your system."
- if test x${ZSH_VERSION+set} = xset ; then
- $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
- $as_echo "$0: be upgraded to zsh 4.3.4 or later."
+ if test x$as_have_required = xno
+then :
+ printf "%s\n" "$0: This script requires a shell more modern than all"
+ printf "%s\n" "$0: the shells that I found on your system."
+ if test ${ZSH_VERSION+y} ; then
+ printf "%s\n" "$0: In particular, zsh $ZSH_VERSION has bugs and should"
+ printf "%s\n" "$0: be upgraded to zsh 4.3.4 or later."
 else
- $as_echo "$0: Please tell bug-autoconf@gnu.org about your system,
+ printf "%s\n" "$0: Please tell bug-autoconf@gnu.org about your system,
 $0: including any error possibly output before this
 $0: message. Then install a modern shell, or manually run
 $0: the script under such a shell if you do have one."
 fi
 exit 1
-fi
+fi ;;
+esac
 fi
 fi
 SHELL=${CONFIG_SHELL-/bin/sh}
@@ -293,6 +298,7 @@
 }
 as_unset=as_fn_unset
 
+
 # as_fn_set_status STATUS
 # -----------------------
 # Set $? to STATUS, without forking.
@@ -324,7 +330,7 @@
 as_dirs=
 while :; do
 case $as_dir in #(
- *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+ *\'*) as_qdir=`printf "%s\n" "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
 *) as_qdir=$as_dir;;
 esac
 as_dirs="'$as_qdir' $as_dirs"
@@ -333,7 +339,7 @@
 	 X"$as_dir" : 'X$//$^/' \| \
 	 X"$as_dir" : 'X$//$$' \| \
 	 X"$as_dir" : 'X$/$' \| . 2>/dev/null ||
-$as_echo X"$as_dir" |
+printf "%s\n" X"$as_dir" |
 sed '/^X$.*^/$\/\/*^/^/*\/*$/{
 	 s//\1/
 	 q
@@ -372,16 +378,18 @@
 # advantage of any shell optimizations that allow amortized linear growth over
 # repeated appends, instead of the typical quadratic growth present in naive
 # implementations.
-if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null
+then :
 eval 'as_fn_append ()
 {
 eval $1+=\$2
 }'
-else
- as_fn_append ()
+else case e in #(
+ e) as_fn_append ()
 {
 eval $1=\$$1\$2
- }
+ } ;;
+esac
 fi # as_fn_append
 
 # as_fn_arith ARG...
@@ -389,16 +397,18 @@
 # Perform arithmetic evaluation on the ARGs, and store the result in the
 # global $as_val. Take advantage of shells that can avoid forks. The arguments
 # must be portable across $(()) and expr.
-if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null
+then :
 eval 'as_fn_arith ()
 {
 as_val=$(( $* ))
 }'
-else
- as_fn_arith ()
+else case e in #(
+ e) as_fn_arith ()
 {
 as_val=`expr "$@" || test $? -eq 1`
- }
+ } ;;
+esac
 fi # as_fn_arith
 
 
@@ -412,9 +422,9 @@
 as_status=$1; test $as_status -eq 0 && as_status=1
 if test "$4"; then
 as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
 fi
- $as_echo "$as_me: error: $2" >&2
+ printf "%s\n" "$as_me: error: $2" >&2
 as_fn_exit $as_status
 } # as_fn_error
 
@@ -441,7 +451,7 @@
 $as_expr X/"$0" : '.*/$^/^/*$/*$' \| \
 	 X"$0" : 'X$//$$' \| \
 	 X"$0" : 'X$/$' \| . 2>/dev/null ||
-$as_echo X/"$0" |
+printf "%s\n" X/"$0" |
 sed '/^.*\/$^/^/*$\/*$/{
 	 s//\1/
 	 q
@@ -474,6 +484,8 @@
 /$LINENO/=
 ' <$as_myself |
 sed '
+ t clear
+ :clear
 s/$LINENO.*/&-/
 t lineno
 b
@@ -485,7 +497,7 @@
 s/-\n.*//
 ' >$as_me.lineno &&
 chmod +x "$as_me.lineno" ||
- { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
+ { printf "%s\n" "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
 
 # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
 # already done that, so ensure we don't try to do so again and fall
@@ -499,6 +511,10 @@
 exit
 }
 
+
+# Determine whether it's possible to make 'echo' print without a newline.
+# These variables are no longer used directly by Autoconf, but are AC_SUBSTed
+# for compatibility with existing Makefiles.
 ECHO_C= ECHO_N= ECHO_T=
 case `echo -n x` in #(((((
 -n*)
@@ -512,6 +528,12 @@
 ECHO_N='-n';;
 esac
 
+# For backward compatibility with old third-party macros, we provide
+# the shell variables $as_echo and $as_echo_n. New code should use
+# AS_ECHO("message") and AS_ECHO_N("message"), respectively.
+as_echo='printf %s\n'
+as_echo_n='printf %s'
+
 rm -f conf$$ conf$$.exe conf$$.file
 if test -d conf$$.dir; then
 rm -f conf$$.dir/conf$$.file
@@ -523,9 +545,9 @@
 if ln -s conf$$.file conf$$ 2>/dev/null; then
 as_ln_s='ln -s'
 # ... but there are two gotchas:
- # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
- # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
- # In both cases, we have to default to `cp -pR'.
+ # 1) On MSYS, both 'ln -s file dir' and 'ln file dir' fail.
+ # 2) DJGPP < 2.04 has no symlinks; 'ln -s' creates a wrapper executable.
+ # In both cases, we have to default to 'cp -pR'.
 ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
 as_ln_s='cp -pR'
 elif ln conf$$.file conf$$ 2>/dev/null; then
@@ -550,10 +572,12 @@
 as_executable_p=as_fn_executable_p
 
 # Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%^_$as_cr_alnum%_%g'"
+as_sed_cpp="y%*$as_cr_letters%P$as_cr_LETTERS%;s%^_$as_cr_alnum%_%g"
+as_tr_cpp="eval sed '$as_sed_cpp'" # deprecated
 
 # Sed expression to map a string onto a valid variable name.
-as_tr_sh="eval sed 'y%*+%pp%;s%^_$as_cr_alnum%_%g'"
+as_sed_sh="y%*+%pp%;s%^_$as_cr_alnum%_%g"
+as_tr_sh="eval sed '$as_sed_sh'" # deprecated
 
 
 test -n "$DJDIR" || exec 7<&0 </dev/null
@@ -579,49 +603,48 @@
 # Identity of this package.
 PACKAGE_NAME='audacious-plugins'
 PACKAGE_TARNAME='audacious-plugins'
-PACKAGE_VERSION='3.6.2'
-PACKAGE_STRING='audacious-plugins 3.6.2'
+PACKAGE_VERSION='4.4.1'
+PACKAGE_STRING='audacious-plugins 4.4.1'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
 # Factoring default headers for most tests.
 ac_includes_default="\
-#include <stdio.h>
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_STAT_H
-# include <sys/stat.h>
+#include <stddef.h>
+#ifdef HAVE_STDIO_H
+# include <stdio.h>
 #endif
-#ifdef STDC_HEADERS
+#ifdef HAVE_STDLIB_H
 # include <stdlib.h>
-# include <stddef.h>
-#else
-# ifdef HAVE_STDLIB_H
-# include <stdlib.h>
-# endif
 #endif
 #ifdef HAVE_STRING_H
-# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
-# include <memory.h>
-# endif
 # include <string.h>
 #endif
-#ifdef HAVE_STRINGS_H
-# include <strings.h>
-#endif
 #ifdef HAVE_INTTYPES_H
 # include <inttypes.h>
 #endif
 #ifdef HAVE_STDINT_H
 # include <stdint.h>
 #endif
+#ifdef HAVE_STRINGS_H
+# include <strings.h>
+#endif
+#ifdef HAVE_SYS_TYPES_H
+# include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_STAT_H
+# include <sys/stat.h>
+#endif
 #ifdef HAVE_UNISTD_H
 # include <unistd.h>
 #endif"
 
+ac_header_c_list=
 gt_needs=
-ac_subst_vars='TERM_SETAF6
+enable_year2038=no
+ac_subst_vars='MAKEFLAGS_SILENT
+SILENT
+TERM_SETAF6
 TERM_SETAF4
 TERM_SETAF3
 TERM_SETAF2
@@ -630,10 +653,12 @@
 TERM_SGR0
 TERM_EL
 TPUT
-OBJCXX_DEPENDS
-OBJC_DEPENDS
-CXX_DEPENDS
-CC_DEPENDS
+AMIGA_LIB_LDFLAGS
+AMIGA_LIB_CFLAGS
+DEP_OBJCXXFLAGS
+DEP_OBJCFLAGS
+DEP_CXXFLAGS
+DEP_CFLAGS
 LTLIBOBJS
 LIBOBJS
 TRANSPORT_PLUGINS
@@ -651,82 +676,87 @@
 OUTPUT_PLUGIN_DIR
 INPUT_PLUGIN_DIR
 plugindir
+FILEWRITER_LIBS
+FILEWRITER_CFLAGS
+SDL_LIBS
+SDL_CFLAGS
+QTX11EXTRAS_LIBS
+QTX11EXTRAS_CFLAGS
 QTOPENGL_LIBS
 QTOPENGL_CFLAGS
+QTNETWORK_LIBS
+QTNETWORK_CFLAGS
+QTMULTIMEDIA_LIBS
+QTMULTIMEDIA_CFLAGS
+AMPACHE_LIBS
+AMPACHE_CFLAGS
+X11EXT_LIBS
+X11EXT_CFLAGS
+GDKX11_LIBS
+GDKX11_CFLAGS
 GL_LIBS
-GLIB214_LIBS
-GLIB214_CFLAGS
-SOXR_LIBS
-SOXR_CFLAGS
-SAMPLERATE_LIBS
-SAMPLERATE_CFLAGS
-BS2B_LIBS
-BS2B_CFLAGS
-FILEWRITER_LIBS
-FILEWRITER_CFLAGS
-FLAC_LIBS
-FLAC_CFLAGS
-CUE_LIBS
-CUE_CFLAGS
+CURL_LIBS
+CURL_CFLAGS
+have_mpris2
+NOTIFY_LIBS
+NOTIFY_CFLAGS
 MMS_LIBS
 MMS_CFLAGS
 NEON_LIBS
 NEON_CFLAGS
-CURL_LIBS
-CURL_CFLAGS
-CDDB_LIBS
-CDDB_CFLAGS
-CDIO_LIBS
-CDIO_CFLAGS
-FLUIDSYNTH_LIBS
-FLUIDSYNTH_CFLAGS
+CUE_LIBS
+CUE_CFLAGS
 SNDIO_LIBS
-SDL_LIBS
-SDL_CFLAGS
+SNDIO_CFLAGS
+PULSE_LIBS
+PULSE_CFLAGS
+PIPEWIRE_LIBS
+PIPEWIRE_CFLAGS
+OSS_CFLAGS
+JACK_LIBS
+JACK_CFLAGS
 ALSA_LIBS
 ALSA_CFLAGS
-OSS_CFLAGS
+SOXR_LIBS
+SOXR_CFLAGS
+SAMPLERATE_LIBS
+SAMPLERATE_CFLAGS
+BS2B_LIBS
+BS2B_CFLAGS
 SIDPLAYFP_LIBS
 SIDPLAYFP_CFLAGS
-JACK_LIBS
-JACK_CFLAGS
-FFMPEG_LIBS
-FFMPEG_CFLAGS
+OPENMPT_LIBS
+OPENMPT_CFLAGS
 MODPLUG_LIBS
 MODPLUG_CFLAGS
 SNDFILE_LIBS
 SNDFILE_CFLAGS
-FAAD_LIBS
-FAAD_CFLAGS
+FFMPEG_LIBS
+FFMPEG_CFLAGS
 WAVPACK_LIBS
 WAVPACK_CFLAGS
-LIBFLAC_LIBS
-LIBFLAC_CFLAGS
-VORBIS_LIBS
-VORBIS_CFLAGS
-BINIO_LIBS
-BINIO_CFLAGS
-have_mpris2
-NOTIFY_LIBS
-NOTIFY_CFLAGS
-XCOMPOSITE_LIBS
-XCOMPOSITE_CFLAGS
-XRENDER_LIBS
-XRENDER_CFLAGS
-DBUS_LIBS
-DBUS_CFLAGS
-GDKX11_LIBS
-GDKX11_CFLAGS
 MPG123_LIBS
 MPG123_CFLAGS
-PULSE_LIBS
-PULSE_CFLAGS
-QTMULTIMEDIA_LIBS
-QTMULTIMEDIA_CFLAGS
+FLUIDSYNTH_LIBS
+FLUIDSYNTH_CFLAGS
+OPUS_LIBS
+OPUS_CFLAGS
+VORBIS_LIBS
+VORBIS_CFLAGS
+LIBFLAC_LIBS
+LIBFLAC_CFLAGS
+CDIO_LIBS
+CDIO_CFLAGS
+ADLIB_LIBS
+ADLIB_CFLAGS
+JSON_GLIB_LIBS
+JSON_GLIB_CFLAGS
 XML_CFLAGS
 XML_LIBS
 AUDACIOUS_LIBS
 AUDACIOUS_CFLAGS
+localedir_c_make
+localedir_c
 POSUB
 LTLIBINTL
 LIBINTL
@@ -735,37 +765,48 @@
 LIBICONV
 INTL_MACOSX_LIBS
 XGETTEXT_EXTRA_OPTIONS
+MSGMERGE_FOR_MSGFMT_OPTION
 MSGMERGE
 XGETTEXT_015
 XGETTEXT
 GMSGFMT_015
-MSGFMT_015
 GMSGFMT
 MSGFMT
 GETTEXT_MACRO_VERSION
 USE_NLS
 SED
 MKDIR_P
-INSTALL_DATA
-INSTALL_SCRIPT
-INSTALL_PROGRAM
 SET_MAKE
-CLEAN_LIB
-UNINSTALL_LIB
-INSTALL_LIB
 PLUGIN_SUFFIX
 PLUGIN_LDFLAGS
 PLUGIN_CFLAGS
+CLEAN_LIB
+UNINSTALL_LIB
+INSTALL_LIB
 LDFLAGS_RPATH
+LINK_LIB
 LIB_SUFFIX
 LIB_PREFIX
+LIB_LDFLAGS_INSTALL_NAME
 LIB_LDFLAGS
 LIB_CFLAGS
+CODESIGN
+HOST_IS_IOS
+CPP
+INSTALL_DATA
+INSTALL_SCRIPT
+INSTALL_PROGRAM
+BUILD_AND_HOST_ARE_DARWIN
+USE_QT5
 USE_QT
 QT_LIBS
 QT_CFLAGS
+QTBINPATH
+QTCORE_LIBS
+QTCORE_CFLAGS
 GIO_LIBS
 GIO_CFLAGS
+USE_GTK3
 USE_GTK
 GTK_LIBS
 GTK_CFLAGS
@@ -776,7 +817,7 @@
 PKG_CONFIG_LIBDIR
 PKG_CONFIG_PATH
 PKG_CONFIG
-WINDRES
+RC
 RANLIB
 AR
 CP
@@ -792,9 +833,6 @@
 ac_ct_OBJC
 OBJCFLAGS
 OBJC
-EGREP
-GREP
-CPP
 ac_ct_CXX
 CXXFLAGS
 CXX
@@ -839,6 +877,7 @@
 docdir
 oldincludedir
 includedir
+runstatedir
 localstatedir
 sharedstatedir
 sysconfdir
@@ -863,65 +902,64 @@
 enable_option_checking
 enable_largefile
 enable_gtk
+enable_gtk2
 enable_qt
+enable_qt5
+enable_rpath
+enable_silent_rules
 enable_nls
 with_gnu_ld
-enable_rpath
 with_libiconv_prefix
 with_libintl_prefix
 with_system_libxml2
-enable_console
-enable_xsf
-enable_qtaudio
-enable_coreaudio
-enable_pulse
-enable_psf
-enable_mp3
-enable_hotkey
-enable_gnomeshortcuts
-enable_lirc
-enable_songchange
-enable_statusicon
-enable_aosd
-enable_aosd_xcomp
-enable_notify
-enable_mpris2
 enable_adplug
+enable_cdaudio
+enable_flac
 enable_vorbis
-enable_flacng
-enable_wavpack
+enable_opus
+enable_amidiplug
+enable_mpg123
 enable_aac
+enable_wavpack
+enable_ffaudio
 enable_sndfile
 enable_modplug
-with_ffmpeg
-enable_jack
+enable_openmpt
 enable_sid
-enable_oss4
-enable_alsa
-enable_sdlout
-with_libsdl
-enable_sndio
-enable_amidiplug
-enable_cdaudio
-enable_scrobbler2
-enable_neon
-enable_mms
-enable_cue
-enable_filewriter
-enable_filewriter_mp3
-enable_filewriter_flac
+enable_console
 enable_bs2b
 enable_resample
 enable_speedpitch
 enable_soxr
-enable_lyricwiki
+enable_alsa
+enable_jack
+enable_oss4
+enable_pipewire
+enable_pulse
+enable_sndio
+enable_cue
+enable_neon
+enable_mms
+enable_notify
+enable_lirc
+enable_mpris2
+enable_songchange
+enable_scrobbler2
 enable_glspectrum
+enable_hotkey
+enable_aosd
+enable_ampache
+enable_qtaudio
+enable_streamtuner
 enable_qtglspectrum
-enable_vtx
-enable_ladspa
-enable_blur_scope
-enable_cairo_spectrum
+enable_qthotkey
+enable_coreaudio
+with_libsdl
+enable_sdlout
+enable_filewriter
+enable_filewriter_mp3
 enable_mac_media_keys
+enable_year2038
 '
 ac_precious_vars='build_alias
 host_alias
@@ -934,7 +972,6 @@
 CXX
 CXXFLAGS
 CCC
-CPP
 OBJC
 OBJCFLAGS
 OBJCPP
@@ -952,76 +989,86 @@
 GTK_LIBS
 GIO_CFLAGS
 GIO_LIBS
+QTCORE_CFLAGS
+QTCORE_LIBS
+QTBINPATH
 QT_CFLAGS
 QT_LIBS
+CPP
 AUDACIOUS_CFLAGS
 AUDACIOUS_LIBS
 XML_CFLAGS
 XML_LIBS
-QTMULTIMEDIA_CFLAGS
-QTMULTIMEDIA_LIBS
-PULSE_CFLAGS
-PULSE_LIBS
-MPG123_CFLAGS
-MPG123_LIBS
-GDKX11_CFLAGS
-GDKX11_LIBS
-DBUS_CFLAGS
-DBUS_LIBS
-XRENDER_CFLAGS
-XRENDER_LIBS
-XCOMPOSITE_CFLAGS
-XCOMPOSITE_LIBS
-NOTIFY_CFLAGS
-NOTIFY_LIBS
-BINIO_CFLAGS
-BINIO_LIBS
-VORBIS_CFLAGS
-VORBIS_LIBS
+JSON_GLIB_CFLAGS
+JSON_GLIB_LIBS
+ADLIB_CFLAGS
+ADLIB_LIBS
+CDIO_CFLAGS
+CDIO_LIBS
 LIBFLAC_CFLAGS
 LIBFLAC_LIBS
+VORBIS_CFLAGS
+VORBIS_LIBS
+OPUS_CFLAGS
+OPUS_LIBS
+FLUIDSYNTH_CFLAGS
+FLUIDSYNTH_LIBS
+MPG123_CFLAGS
+MPG123_LIBS
 WAVPACK_CFLAGS
 WAVPACK_LIBS
+FFMPEG_CFLAGS
+FFMPEG_LIBS
 SNDFILE_CFLAGS
 SNDFILE_LIBS
 MODPLUG_CFLAGS
 MODPLUG_LIBS
-FFMPEG_CFLAGS
-FFMPEG_LIBS
-JACK_CFLAGS
-JACK_LIBS
+OPENMPT_CFLAGS
+OPENMPT_LIBS
 SIDPLAYFP_CFLAGS
 SIDPLAYFP_LIBS
-ALSA_CFLAGS
-ALSA_LIBS
-SDL_CFLAGS
-SDL_LIBS
-FLUIDSYNTH_CFLAGS
-FLUIDSYNTH_LIBS
-CDIO_CFLAGS
-CDIO_LIBS
-CDDB_CFLAGS
-CDDB_LIBS
-CURL_CFLAGS
-CURL_LIBS
-NEON_CFLAGS
-NEON_LIBS
-MMS_CFLAGS
-MMS_LIBS
-CUE_CFLAGS
-CUE_LIBS
-FLAC_CFLAGS
-FLAC_LIBS
 BS2B_CFLAGS
 BS2B_LIBS
 SAMPLERATE_CFLAGS
 SAMPLERATE_LIBS
 SOXR_CFLAGS
 SOXR_LIBS
-GLIB214_CFLAGS
-GLIB214_LIBS
+ALSA_CFLAGS
+ALSA_LIBS
+JACK_CFLAGS
+JACK_LIBS
+PIPEWIRE_CFLAGS
+PIPEWIRE_LIBS
+PULSE_CFLAGS
+PULSE_LIBS
+SNDIO_CFLAGS
+SNDIO_LIBS
+CUE_CFLAGS
+CUE_LIBS
+NEON_CFLAGS
+NEON_LIBS
+MMS_CFLAGS
+MMS_LIBS
+NOTIFY_CFLAGS
+NOTIFY_LIBS
+CURL_CFLAGS
+CURL_LIBS
+GDKX11_CFLAGS
+GDKX11_LIBS
+X11EXT_CFLAGS
+X11EXT_LIBS
+AMPACHE_CFLAGS
+AMPACHE_LIBS
+QTMULTIMEDIA_CFLAGS
+QTMULTIMEDIA_LIBS
+QTNETWORK_CFLAGS
+QTNETWORK_LIBS
 QTOPENGL_CFLAGS
-QTOPENGL_LIBS'
+QTOPENGL_LIBS
+QTX11EXTRAS_CFLAGS
+QTX11EXTRAS_LIBS
+SDL_CFLAGS
+SDL_LIBS'
 
 
 # Initialize some variables set by options.
@@ -1060,6 +1107,7 @@
 sysconfdir='${prefix}/etc'
 sharedstatedir='${prefix}/com'
 localstatedir='${prefix}/var'
+runstatedir='${localstatedir}/run'
 includedir='${prefix}/include'
 oldincludedir='/usr/include'
 docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
@@ -1089,8 +1137,6 @@
 *) ac_optarg=yes ;;
 esac
 
- # Accept the important Cygnus configure options, so we can diagnose typos.
-
 case $ac_dashdash$ac_option in
 --)
 ac_dashdash=yes ;;
@@ -1131,9 +1177,9 @@
 ac_useropt=`expr "x$ac_option" : 'x-*disable-$.*$'`
 # Reject names that are not valid shell variable names.
 expr "x$ac_useropt" : ".*^-+._$as_cr_alnum" >/dev/null &&
- as_fn_error $? "invalid feature name: $ac_useropt"
+ as_fn_error $? "invalid feature name: '$ac_useropt'"
 ac_useropt_orig=$ac_useropt
- ac_useropt=`$as_echo "$ac_useropt" | sed 's/-+./_/g'`
+ ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/-+./_/g'`
 case $ac_user_opts in
 *"
 "enable_$ac_useropt"
@@ -1157,9 +1203,9 @@
 ac_useropt=`expr "x$ac_option" : 'x-*enable-$^=*$'`
 # Reject names that are not valid shell variable names.
 expr "x$ac_useropt" : ".*^-+._$as_cr_alnum" >/dev/null &&
- as_fn_error $? "invalid feature name: $ac_useropt"
+ as_fn_error $? "invalid feature name: '$ac_useropt'"
 ac_useropt_orig=$ac_useropt
- ac_useropt=`$as_echo "$ac_useropt" | sed 's/-+./_/g'`
+ ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/-+./_/g'`
 case $ac_user_opts in
 *"
 "enable_$ac_useropt"
@@ -1312,6 +1358,15 @@
 | -silent | --silent | --silen | --sile | --sil)
 silent=yes ;;
 
+ -runstatedir | --runstatedir | --runstatedi | --runstated \
+ | --runstate | --runstat | --runsta | --runst | --runs \
+ | --run | --ru | --r)
+ ac_prev=runstatedir ;;
+ -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
+ | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
+ | --run=* | --ru=* | --r=*)
+ runstatedir=$ac_optarg ;;
+
 -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
 ac_prev=sbindir ;;
 -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
@@ -1361,9 +1416,9 @@
 ac_useropt=`expr "x$ac_option" : 'x-*with-$^=*$'`
 # Reject names that are not valid shell variable names.
 expr "x$ac_useropt" : ".*^-+._$as_cr_alnum" >/dev/null &&
- as_fn_error $? "invalid package name: $ac_useropt"
+ as_fn_error $? "invalid package name: '$ac_useropt'"
 ac_useropt_orig=$ac_useropt
- ac_useropt=`$as_echo "$ac_useropt" | sed 's/-+./_/g'`
+ ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/-+./_/g'`
 case $ac_user_opts in
 *"
 "with_$ac_useropt"
@@ -1377,9 +1432,9 @@
 ac_useropt=`expr "x$ac_option" : 'x-*without-$.*$'`
 # Reject names that are not valid shell variable names.
 expr "x$ac_useropt" : ".*^-+._$as_cr_alnum" >/dev/null &&
- as_fn_error $? "invalid package name: $ac_useropt"
+ as_fn_error $? "invalid package name: '$ac_useropt'"
 ac_useropt_orig=$ac_useropt
- ac_useropt=`$as_echo "$ac_useropt" | sed 's/-+./_/g'`
+ ac_useropt=`printf "%s\n" "$ac_useropt" | sed 's/-+./_/g'`
 case $ac_user_opts in
 *"
 "with_$ac_useropt"
@@ -1407,8 +1462,8 @@
 | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
 x_libraries=$ac_optarg ;;
 
- -*) as_fn_error $? "unrecognized option: \`$ac_option'
-Try \`$0 --help' for more information"
+ -*) as_fn_error $? "unrecognized option: '$ac_option'
+Try '$0 --help' for more information"
 ;;
 
 *=*)
@@ -1416,16 +1471,16 @@
 # Reject names that are not valid shell variable names.
 case $ac_envvar in #(
 '' | 0-9* | *!_$as_cr_alnum* )
- as_fn_error $? "invalid variable name: \`$ac_envvar'" ;;
+ as_fn_error $? "invalid variable name: '$ac_envvar'" ;;
 esac
 eval $ac_envvar=\$ac_optarg
 export $ac_envvar ;;
 
 *)
 # FIXME: should be removed in autoconf 3.0.
- $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
+ printf "%s\n" "$as_me: WARNING: you should use --build, --host, --target" >&2
 expr "x$ac_option" : ".*^-._$as_cr_alnum" >/dev/null &&
- $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
+ printf "%s\n" "$as_me: WARNING: invalid host type: $ac_option" >&2
 : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}"
 ;;
 
@@ -1441,7 +1496,7 @@
 case $enable_option_checking in
 no) ;;
 fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
- *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
+ *) printf "%s\n" "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
 esac
 fi
 
@@ -1449,7 +1504,7 @@
 for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
 		datadir sysconfdir sharedstatedir localstatedir includedir \
 		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
-		libdir localedir mandir
+		libdir localedir mandir runstatedir
 do
 eval ac_val=\$$ac_var
 # Remove trailing slashes.
@@ -1466,7 +1521,7 @@
 as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val"
 done
 
-# There might be people who depend on the old broken behavior: `$host'
+# There might be people who depend on the old broken behavior: '$host'
 # used to hold the argument of --host etc.
 # FIXME: To remove some day.
 build=$build_alias
@@ -1505,7 +1560,7 @@
 	 X"$as_myself" : 'X$//$^/' \| \
 	 X"$as_myself" : 'X$//$$' \| \
 	 X"$as_myself" : 'X$/$' \| . 2>/dev/null ||
-$as_echo X"$as_myself" |
+printf "%s\n" X"$as_myself" |
 sed '/^X$.*^/$\/\/*^/^/*\/*$/{
 	 s//\1/
 	 q
@@ -1534,7 +1589,7 @@
 test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
 as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir"
 fi
-ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
+ac_msg="sources are in $srcdir, but 'cd $srcdir' does not work"
 ac_abs_confdir=`(
 	cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg"
 	pwd)`
@@ -1562,7 +1617,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.6.2 to adapt to many kinds of systems.
+'configure' configures audacious-plugins 4.4.1 to adapt to many kinds of systems.
 
 Usage: $0 OPTION... VAR=VALUE...
 
@@ -1576,11 +1631,11 @@
 --help=short display options specific to this package
 --help=recursive display the short help of all the included packages
 -V, --version display version information and exit
- -q, --quiet, --silent do not print \`checking ...' messages
+ -q, --quiet, --silent do not print 'checking ...' messages
 --cache-file=FILE cache test results in FILE disabled
- -C, --config-cache alias for \`--cache-file=config.cache'
+ -C, --config-cache alias for '--cache-file=config.cache'
 -n, --no-create do not create output files
- --srcdir=DIR find the sources in DIR configure dir or \`..'
+ --srcdir=DIR find the sources in DIR configure dir or '..'
 
 Installation directories:
 --prefix=PREFIX install architecture-independent files in PREFIX
@@ -1588,10 +1643,10 @@
 --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX
 PREFIX
 
-By default, \`make install' will install all the files in
-\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify
-an installation prefix other than \`$ac_default_prefix' using \`--prefix',
-for instance \`--prefix=\$HOME'.
+By default, 'make install' will install all the files in
+'$ac_default_prefix/bin', '$ac_default_prefix/lib' etc. You can specify
+an installation prefix other than '$ac_default_prefix' using '--prefix',
+for instance '--prefix=\$HOME'.
 
 For better control, use the options below.
 
@@ -1602,6 +1657,7 @@
 --sysconfdir=DIR read-only single-machine data PREFIX/etc
 --sharedstatedir=DIR modifiable architecture-independent data PREFIX/com
 --localstatedir=DIR modifiable single-machine data PREFIX/var
+ --runstatedir=DIR modifiable per-process data LOCALSTATEDIR/run
 --libdir=DIR object code libraries EPREFIX/lib
 --includedir=DIR C header files PREFIX/include
 --oldincludedir=DIR C header files for non-gcc /usr/include
@@ -1629,7 +1685,7 @@
 
 if test -n "$ac_init_help"; then
 case $ac_init_help in
- short | recursive ) echo "Configuration of audacious-plugins 3.6.2:";;
+ short | recursive ) echo "Configuration of audacious-plugins 4.4.1:";;
 esac
 cat <<\_ACEOF
 
@@ -1638,68 +1694,62 @@
 --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
 --enable-FEATURE=ARG include FEATURE ARG=yes
 --disable-largefile omit support for large files
- --disable-gtk Disable GTK+ support (default=enabled)
- --enable-qt Enable Qt support (default=disabled)
+ --disable-gtk Disable GTK support (default=enabled)
+ --enable-gtk2 Use GTK 2 instead of GTK 3 (default=disabled)
+ --disable-qt Disable Qt support (default=enabled)
+ --enable-qt5 Use Qt 5 instead of Qt 6 (default=disabled)
+ --disable-rpath do not use rpath
+ --disable-silent-rules print executed commands during build
 --disable-nls do not use Native Language Support
 --disable-rpath do not hardcode runtime library paths
- --disable-console disable game music decoder (console)
- --disable-xsf disable Nintendo DS audio decoder (xsf)
- --disable-qtaudio disable QtMultimedia output plugin (default=enabled)
+ --enable-adplug enable AdLib support (default=auto)
+ --enable-cdaudio enable audio CD support (default=auto)
+ --enable-flac enable FLAC support (default=yes)
+ --enable-vorbis enable Ogg Vorbis support (default=yes)
+ --enable-opus enable Opus support (default=yes)
+ --enable-amidiplug enable MIDI synthesizer (default=auto)
+ --enable-mpg123 enable MP3 support (default=yes)
+ --enable-aac enable AAC support (default=auto)
+ --enable-wavpack enable WavPack support (default=yes)
+ --enable-ffaudio enable FFmpeg decoder (default=auto)
+ --enable-sndfile enable libsndfile decoder (default=auto)
+ --enable-modplug enable ModPlug (default=auto)
+ --enable-openmpt enable libopenmpt (default=auto)
+ --enable-sid enable Commodore 64 audio (default=auto)
+ --enable-console enable Game Music Emu (default=auto)
+ --enable-bs2b enable BS2B effect (default=auto)
+ --enable-resample enable sample rate converter (default=auto)
+ --enable-speedpitch enable speed/pitch effect (default=auto)
+ --enable-soxr enable SoX resampler (default=auto)
+ --enable-alsa enable ALSA output (default=auto)
+ --enable-jack enable JACK output (default=auto)
+ --enable-oss4 enable OSS output (default=auto)
+ --enable-pipewire enable PipeWire output (default=auto)
+ --enable-pulse enable PulseAudio output (default=auto)
+ --enable-sndio enable Sndio output (default=auto)
+ --enable-cue enable cue sheet support (default=auto)
+ --enable-neon enable HTTP/HTTPS transport (default=yes)
+ --enable-mms enable MMS transport (default=auto)
+ --enable-notify enable libnotify OSD (default=auto)
+ --enable-lirc enable LIRC support (default=auto)
+ --enable-mpris2 enable MPRIS 2 server (default=auto)
+ --enable-songchange enable song change plugin (default=auto)
+ --enable-scrobbler2 enable Scrobbler 2 (default=auto)
+ --enable-glspectrum enable OpenGL spectrum analyzer (default=auto)
+ --enable-hotkey enable global hotkeys (X11) (default=auto)
+ --enable-aosd enable X11 OSD (default=auto)
+ --enable-ampache enable Ampache browser (default=auto)
+ --enable-qtaudio enable QtMultimedia output (default=auto)
+ --enable-streamtuner enable Stream tuner (experimental) (default=no)
+ --enable-qtglspectrum enable Qt OpenGL spectrum analyzer (default=auto)
+ --enable-qthotkey enable global hotkeys (X11) (default=auto)
 --disable-coreaudio disable CoreAudio output plugin (default=enabled)
- --disable-pulse disable PulseAudio output plugin (default=enabled)
- --disable-psf disable PlayStation (psf/psf2) audio decoder
- --disable-mp3 disable MP3 support (default=enabled)
- --disable-hotkey disable global hotkey plugin (default=enabled)
- --disable-gnomeshortcuts
- disable gnome shortcuts (default=enabled)
- --disable-lirc disable LIRC support (default=enabled)
- --disable-songchange disable song change plugin
- --enable-statusicon enable X11 Status Icon plugin (default=disabled)
- --disable-aosd disable Audacious OSD plugin (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=auto)
- --disable-adplug disable AdPlug plugin (default=enabled)
- --disable-vorbis disable Ogg Vorbis support (default=enabled)
- --disable-flacng disable FLAC support (default=enabled)
- --disable-wavpack disable WavPack input plugin (default=enabled)
- --disable-aac disable AAC support (default=enabled)
- --disable-sndfile disable sndfile extensions. default=enabled
- --disable-modplug disable ModPlug plugin (default=enabled)
- --disable-jack disable JACK output plugin (default=enabled)
- --disable-sid disable SID input plugin (default=enabled)
- --disable-oss4 disable OSS4 output plugin
- --disable-alsa disable ALSA output plugin
- --disable-sdlout disable SDL output plugin
- --disable-sndio disable sndio output plugin (default=enabled)
- --disable-amidiplug disable amidi-plug input plugin
- --disable-cdaudio disable cdaudio-ng input 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)
+ --enable-sdlout enable SDL Output (default=auto)
 --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-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-lyricwiki disable LyricWiki plugin (default=enabled)
- --enable-glspectrum enable OpenGL Spectrum Analyzer (default=auto)
- --disable-qtglspectrum disable Qt OpenGL Spectrum Analyzer
- (default=enabled)
- --disable-vtx disable VTX Decoder
- --disable-ladspa disable LADSPA Host
- --disable-blur-scope disable Blur Scope
- --disable-cairo-spectrum
- disable Cairo Spectrum Analyzer
 --enable-mac-media-keys enable Mac Media Keys
+ --enable-year2038 support timestamps after 2038
 
 Optional Packages:
 --with-PACKAGE=ARG use PACKAGE ARG=yes
@@ -1711,11 +1761,7 @@
 --without-libintl-prefix don't search for libintl in includedir and libdir
 --with-system-libxml2=yes,no
 Use system version of libxml2 (default=yes)
- --with-ffmpeg=ffmpeg,libav,none
- choose between FFmpeg, libav, or neither
- (default=ffmpeg)
- --with-libsdl=VER select which SDL version to use. Set VER to 1 for
- libsdl1, to 2 for libsdl2. default=check
+ --with-libsdl=1,2 select which SDL version to use (default=auto)
 
 Some influential environment variables:
 CC C compiler command
@@ -1727,7 +1773,6 @@
 you have headers in a nonstandard directory <include dir>
 CXX C++ compiler command
 CXXFLAGS C++ compiler flags
- CPP C preprocessor
 OBJC Objective C compiler command
 OBJCFLAGS Objective C compiler flags
 OBJCPP Objective C preprocessor
@@ -1749,54 +1794,51 @@
 GTK_LIBS linker flags for GTK, overriding pkg-config
 GIO_CFLAGS C compiler flags for GIO, overriding pkg-config
 GIO_LIBS linker flags for GIO, overriding pkg-config
+ QTCORE_CFLAGS
+ C compiler flags for QTCORE, overriding pkg-config
+ QTCORE_LIBS linker flags for QTCORE, overriding pkg-config
+ QTBINPATH value of host_bins for Qt5Core >= 5.2, overriding pkg-config
 QT_CFLAGS C compiler flags for QT, overriding pkg-config
 QT_LIBS linker flags for QT, overriding pkg-config
+ CPP C preprocessor
 AUDACIOUS_CFLAGS
 C compiler flags for AUDACIOUS, overriding pkg-config
 AUDACIOUS_LIBS
 linker flags for AUDACIOUS, overriding pkg-config
 XML_CFLAGS C compiler flags for XML, overriding pkg-config
 XML_LIBS linker flags for XML, overriding pkg-config
- QTMULTIMEDIA_CFLAGS
- C compiler flags for QTMULTIMEDIA, overriding pkg-config
- QTMULTIMEDIA_LIBS
- linker flags for QTMULTIMEDIA, overriding pkg-config
- PULSE_CFLAGS
- C compiler flags for PULSE, overriding pkg-config
- PULSE_LIBS linker flags for PULSE, overriding pkg-config
- MPG123_CFLAGS
- C compiler flags for MPG123, overriding pkg-config
- MPG123_LIBS linker flags for MPG123, overriding pkg-config
- GDKX11_CFLAGS
- C compiler flags for GDKX11, overriding pkg-config
- GDKX11_LIBS linker flags for GDKX11, overriding pkg-config
- DBUS_CFLAGS C compiler flags for DBUS, overriding pkg-config
- DBUS_LIBS linker flags for DBUS, overriding pkg-config
- XRENDER_CFLAGS
- C compiler flags for XRENDER, overriding pkg-config
- XRENDER_LIBS
- linker flags for XRENDER, overriding pkg-config
- XCOMPOSITE_CFLAGS
- C compiler flags for XCOMPOSITE, overriding pkg-config
- XCOMPOSITE_LIBS
- linker flags for XCOMPOSITE, overriding pkg-config
- NOTIFY_CFLAGS
- C compiler flags for NOTIFY, overriding pkg-config
- NOTIFY_LIBS linker flags for NOTIFY, overriding pkg-config
- BINIO_CFLAGS
- C compiler flags for BINIO, overriding pkg-config
- BINIO_LIBS linker flags for BINIO, overriding pkg-config
- VORBIS_CFLAGS
- C compiler flags for VORBIS, overriding pkg-config
- VORBIS_LIBS linker flags for VORBIS, overriding pkg-config
+ JSON_GLIB_CFLAGS
+ C compiler flags for JSON_GLIB, overriding pkg-config
+ JSON_GLIB_LIBS
+ linker flags for JSON_GLIB, overriding pkg-config
+ ADLIB_CFLAGS
+ C compiler flags for ADLIB, overriding pkg-config
+ ADLIB_LIBS linker flags for ADLIB, overriding pkg-config
+ CDIO_CFLAGS C compiler flags for CDIO, overriding pkg-config
+ CDIO_LIBS linker flags for CDIO, overriding pkg-config
 LIBFLAC_CFLAGS
 C compiler flags for LIBFLAC, overriding pkg-config
 LIBFLAC_LIBS
 linker flags for LIBFLAC, overriding pkg-config
+ VORBIS_CFLAGS
+ C compiler flags for VORBIS, overriding pkg-config
+ VORBIS_LIBS linker flags for VORBIS, overriding pkg-config
+ OPUS_CFLAGS C compiler flags for OPUS, overriding pkg-config
+ OPUS_LIBS linker flags for OPUS, overriding pkg-config
+ FLUIDSYNTH_CFLAGS
+ C compiler flags for FLUIDSYNTH, overriding pkg-config
+ FLUIDSYNTH_LIBS
+ linker flags for FLUIDSYNTH, overriding pkg-config
+ MPG123_CFLAGS
+ C compiler flags for MPG123, overriding pkg-config
+ MPG123_LIBS linker flags for MPG123, overriding pkg-config
 WAVPACK_CFLAGS
 C compiler flags for WAVPACK, overriding pkg-config
 WAVPACK_LIBS
 linker flags for WAVPACK, overriding pkg-config
+ FFMPEG_CFLAGS
+ C compiler flags for FFMPEG, overriding pkg-config
+ FFMPEG_LIBS linker flags for FFMPEG, overriding pkg-config
 SNDFILE_CFLAGS
 C compiler flags for SNDFILE, overriding pkg-config
 SNDFILE_LIBS
@@ -1805,37 +1847,14 @@
 C compiler flags for MODPLUG, overriding pkg-config
 MODPLUG_LIBS
 linker flags for MODPLUG, overriding pkg-config
- FFMPEG_CFLAGS
- C compiler flags for FFMPEG, overriding pkg-config
- FFMPEG_LIBS linker flags for FFMPEG, overriding pkg-config
- JACK_CFLAGS C compiler flags for JACK, overriding pkg-config
- JACK_LIBS linker flags for JACK, overriding pkg-config
+ OPENMPT_CFLAGS
+ C compiler flags for OPENMPT, overriding pkg-config
+ OPENMPT_LIBS
+ linker flags for OPENMPT, overriding pkg-config
 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
- SDL_LIBS linker flags for SDL, overriding pkg-config
- FLUIDSYNTH_CFLAGS
- C compiler flags for FLUIDSYNTH, overriding pkg-config
- FLUIDSYNTH_LIBS
- linker flags for FLUIDSYNTH, overriding pkg-config
- CDIO_CFLAGS C compiler flags for CDIO, overriding pkg-config
- CDIO_LIBS linker flags for CDIO, overriding pkg-config
- CDDB_CFLAGS C compiler flags for CDDB, overriding pkg-config
- CDDB_LIBS linker flags for CDDB, overriding pkg-config
- CURL_CFLAGS C compiler flags for CURL, overriding pkg-config
- CURL_LIBS linker flags for CURL, overriding pkg-config
- NEON_CFLAGS C compiler flags for NEON, overriding pkg-config
- NEON_LIBS linker flags for NEON, overriding pkg-config
- MMS_CFLAGS C compiler flags for MMS, overriding pkg-config
- MMS_LIBS linker flags for MMS, overriding pkg-config
- CUE_CFLAGS C compiler flags for CUE, overriding pkg-config
- CUE_LIBS linker flags for CUE, overriding pkg-config
- FLAC_CFLAGS C compiler flags for FLAC, overriding pkg-config
- 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
 SAMPLERATE_CFLAGS
@@ -1844,16 +1863,61 @@
 linker flags for SAMPLERATE, 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
- linker flags for GLIB214, overriding pkg-config
+ ALSA_CFLAGS C compiler flags for ALSA, overriding pkg-config
+ ALSA_LIBS linker flags for ALSA, overriding pkg-config
+ JACK_CFLAGS C compiler flags for JACK, overriding pkg-config
+ JACK_LIBS linker flags for JACK, overriding pkg-config
+ PIPEWIRE_CFLAGS
+ C compiler flags for PIPEWIRE, overriding pkg-config
+ PIPEWIRE_LIBS
+ linker flags for PIPEWIRE, overriding pkg-config
+ PULSE_CFLAGS
+ C compiler flags for PULSE, overriding pkg-config
+ PULSE_LIBS linker flags for PULSE, overriding pkg-config
+ SNDIO_CFLAGS
+ C compiler flags for SNDIO, overriding pkg-config
+ SNDIO_LIBS linker flags for SNDIO, overriding pkg-config
+ CUE_CFLAGS C compiler flags for CUE, overriding pkg-config
+ CUE_LIBS linker flags for CUE, overriding pkg-config
+ NEON_CFLAGS C compiler flags for NEON, overriding pkg-config
+ NEON_LIBS linker flags for NEON, overriding pkg-config
+ MMS_CFLAGS C compiler flags for MMS, overriding pkg-config
+ MMS_LIBS linker flags for MMS, overriding pkg-config
+ NOTIFY_CFLAGS
+ C compiler flags for NOTIFY, overriding pkg-config
+ NOTIFY_LIBS linker flags for NOTIFY, overriding pkg-config
+ CURL_CFLAGS C compiler flags for CURL, overriding pkg-config
+ CURL_LIBS linker flags for CURL, overriding pkg-config
+ GDKX11_CFLAGS
+ C compiler flags for GDKX11, overriding pkg-config
+ GDKX11_LIBS linker flags for GDKX11, overriding pkg-config
+ X11EXT_CFLAGS
+ C compiler flags for X11EXT, overriding pkg-config
+ X11EXT_LIBS linker flags for X11EXT, overriding pkg-config
+ AMPACHE_CFLAGS
+ C compiler flags for AMPACHE, overriding pkg-config
+ AMPACHE_LIBS
+ linker flags for AMPACHE, overriding pkg-config
+ QTMULTIMEDIA_CFLAGS
+ C compiler flags for QTMULTIMEDIA, overriding pkg-config
+ QTMULTIMEDIA_LIBS
+ linker flags for QTMULTIMEDIA, overriding pkg-config
+ QTNETWORK_CFLAGS
+ C compiler flags for QTNETWORK, overriding pkg-config
+ QTNETWORK_LIBS
+ linker flags for QTNETWORK, overriding pkg-config
 QTOPENGL_CFLAGS
 C compiler flags for QTOPENGL, overriding pkg-config
 QTOPENGL_LIBS
 linker flags for QTOPENGL, overriding pkg-config
+ QTX11EXTRAS_CFLAGS
+ C compiler flags for QTX11EXTRAS, overriding pkg-config
+ QTX11EXTRAS_LIBS
+ linker flags for QTX11EXTRAS, overriding pkg-config
+ SDL_CFLAGS C compiler flags for SDL, overriding pkg-config
+ SDL_LIBS linker flags for SDL, overriding pkg-config
 
-Use these variables to override the choices made by `configure' or to help
+Use these variables to override the choices made by 'configure' or to help
 it to find libraries and programs with nonstandard names/locations.
 
 Report bugs to the package provider.
@@ -1872,9 +1936,9 @@
 case "$ac_dir" in
 .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
 *)
- ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.\\/||'`
+ ac_dir_suffix=/`printf "%s\n" "$ac_dir" | sed 's|^\.\\/||'`
 # A ".." for each directory in $ac_dir_suffix.
- ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/^\\/*|/..|g;s|/||'`
+ ac_top_builddir_sub=`printf "%s\n" "$ac_dir_suffix" | sed 's|/^\\/*|/..|g;s|/||'`
 case $ac_top_builddir_sub in
 "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
 *) ac_top_build_prefix=$ac_top_builddir_sub/ ;;
@@ -1902,7 +1966,8 @@
 ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
 
 cd "$ac_dir" || { ac_status=$?; continue; }
- # Check for guested configure.
+ # Check for configure.gnu first; this name is used for a wrapper for
+ # Metaconfig's "Configure" on case-insensitive file systems.
 if test -f "$ac_srcdir/configure.gnu"; then
 echo &&
 $SHELL "$ac_srcdir/configure.gnu" --help=recursive
@@ -1910,7 +1975,7 @@
 echo &&
 $SHELL "$ac_srcdir/configure" --help=recursive
 else
- $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
+ printf "%s\n" "$as_me: WARNING: no configuration information is in $ac_dir" >&2
 fi || ac_status=$?
 cd "$ac_pwd" || { ac_status=$?; break; }
 done
@@ -1919,14 +1984,14 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
 cat <<\_ACEOF
-audacious-plugins configure 3.6.2
-generated by GNU Autoconf 2.69
+audacious-plugins configure 4.4.1
+generated by GNU Autoconf 2.72
 
-Copyright (C) 2012 Free Software Foundation, Inc.
+Copyright (C) 2023 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 
-Copyright (C) 2001-2015 Audacious developers and others
+Copyright (C) 2001-2024 Audacious developers and others
 _ACEOF
 exit
 fi
@@ -1941,14 +2006,14 @@
 ac_fn_c_try_compile ()
 {
 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- rm -f conftest.$ac_objext
+ rm -f conftest.$ac_objext conftest.beam
 if { { ac_try="$ac_compile"
 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
+printf "%s\n" "$ac_try_echo"; } >&5
 (eval "$ac_compile") 2>conftest.err
 ac_status=$?
 if test -s conftest.err; then
@@ -1956,17 +2021,19 @@
 cat conftest.er1 >&5
 mv -f conftest.er1 conftest.err
 fi
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; } && {
 	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
- } && test -s conftest.$ac_objext; then :
+ } && test -s conftest.$ac_objext
+then :
 ac_retval=0
-else
- $as_echo "$as_me: failed program was:" >&5
+else case e in #(
+ e) printf "%s\n" "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	ac_retval=1
+	ac_retval=1 ;;
+esac
 fi
 eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 as_fn_set_status $ac_retval
@@ -1979,14 +2046,14 @@
 ac_fn_cxx_try_compile ()
 {
 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- rm -f conftest.$ac_objext
+ rm -f conftest.$ac_objext conftest.beam
 if { { ac_try="$ac_compile"
 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
+printf "%s\n" "$ac_try_echo"; } >&5
 (eval "$ac_compile") 2>conftest.err
 ac_status=$?
 if test -s conftest.err; then
@@ -1994,101 +2061,116 @@
 cat conftest.er1 >&5
 mv -f conftest.er1 conftest.err
 fi
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ printf "%s\n" "$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_objext; then :
+ } && test -s conftest.$ac_objext
+then :
 ac_retval=0
-else
- $as_echo "$as_me: failed program was:" >&5
+else case e in #(
+ e) printf "%s\n" "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	ac_retval=1
+	ac_retval=1 ;;
+esac
 fi
 eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 as_fn_set_status $ac_retval
 
 } # ac_fn_cxx_try_compile
 
-# ac_fn_c_try_run LINENO
-# ----------------------
-# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes
-# that executables *can* be run.
-ac_fn_c_try_run ()
+# ac_fn_c_try_link LINENO
+# -----------------------
+# Try to link conftest.$ac_ext, and return whether this succeeded.
+ac_fn_c_try_link ()
 {
 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+ rm -f conftest.$ac_objext conftest.beam 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>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
- { { case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
- (eval "$ac_try") 2>&5
+printf "%s\n" "$ac_try_echo"; } >&5
+ (eval "$ac_link") 2>conftest.err
 ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; }; then :
+ if test -s conftest.err; then
+ grep -v '^ *+' conftest.err >conftest.er1
+ cat conftest.er1 >&5
+ mv -f conftest.er1 conftest.err
+ fi
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; } && {
+	 test -z "$ac_c_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: program exited with status $ac_status" >&5
- $as_echo "$as_me: failed program was:" >&5
+else case e in #(
+ e) printf "%s\n" "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
- ac_retval=$ac_status
+	ac_retval=1 ;;
+esac
 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_c_try_run
+} # ac_fn_c_try_link
 
-# ac_fn_c_try_cpp LINENO
+# ac_fn_c_try_run LINENO
 # ----------------------
-# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
-ac_fn_c_try_cpp ()
+# Try to run conftest.$ac_ext, and return whether this succeeded. Assumes that
+# executables *can* be run.
+ac_fn_c_try_run ()
 {
 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- if { { ac_try="$ac_cpp conftest.$ac_ext"
+ 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_cpp conftest.$ac_ext") 2>conftest.err
+printf "%s\n" "$ac_try_echo"; } >&5
+ (eval "$ac_link") 2>&5
 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_c_preproc_warn_flag$ac_c_werror_flag" ||
-	 test ! -s conftest.err
- }; then :
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
+ { { 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\""
+printf "%s\n" "$ac_try_echo"; } >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; }
+then :
 ac_retval=0
-else
- $as_echo "$as_me: failed program was:" >&5
+else case e in #(
+ e) printf "%s\n" "$as_me: program exited with status $ac_status" >&5
+ printf "%s\n" "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
- ac_retval=1
+ ac_retval=$ac_status ;;
+esac
 fi
+ 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_c_try_cpp
+} # ac_fn_c_try_run
 
 # ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
 # -------------------------------------------------------
@@ -2097,26 +2179,30 @@
 ac_fn_c_check_header_compile ()
 {
 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+printf %s "checking for $2... " >&6; }
+if eval test \${$3+y}
+then :
+ printf %s "(cached) " >&6
+else case e in #(
+ e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 $4
 #include <$2>
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
 eval "$3=yes"
-else
- eval "$3=no"
+else case e in #(
+ e) eval "$3=no" ;;
+esac
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 eval ac_res=\$$3
-	 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
+	 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf "%s\n" "$ac_res" >&6; }
 eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } # ac_fn_c_check_header_compile
@@ -2127,14 +2213,14 @@
 ac_fn_objc_try_compile ()
 {
 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- rm -f conftest.$ac_objext
+ rm -f conftest.$ac_objext conftest.beam
 if { { ac_try="$ac_compile"
 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
+printf "%s\n" "$ac_try_echo"; } >&5
 (eval "$ac_compile") 2>conftest.err
 ac_status=$?
 if test -s conftest.err; then
@@ -2142,17 +2228,19 @@
 cat conftest.er1 >&5
 mv -f conftest.er1 conftest.err
 fi
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; } && {
 	 test -z "$ac_objc_werror_flag" ||
 	 test ! -s conftest.err
- } && test -s conftest.$ac_objext; then :
+ } && test -s conftest.$ac_objext
+then :
 ac_retval=0
-else
- $as_echo "$as_me: failed program was:" >&5
+else case e in #(
+ e) printf "%s\n" "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	ac_retval=1
+	ac_retval=1 ;;
+esac
 fi
 eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 as_fn_set_status $ac_retval
@@ -2171,7 +2259,7 @@
 *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
+printf "%s\n" "$ac_try_echo"; } >&5
 (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
 ac_status=$?
 if test -s conftest.err; then
@@ -2179,17 +2267,19 @@
 cat conftest.er1 >&5
 mv -f conftest.er1 conftest.err
 fi
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; } > conftest.i && {
 	 test -z "$ac_objc_preproc_warn_flag$ac_objc_werror_flag" ||
 	 test ! -s conftest.err
- }; then :
+ }
+then :
 ac_retval=0
-else
- $as_echo "$as_me: failed program was:" >&5
+else case e in #(
+ e) printf "%s\n" "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
- ac_retval=1
+ ac_retval=1 ;;
+esac
 fi
 eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 as_fn_set_status $ac_retval
@@ -2202,14 +2292,14 @@
 ac_fn_objcxx_try_compile ()
 {
 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- rm -f conftest.$ac_objext
+ rm -f conftest.$ac_objext conftest.beam
 if { { ac_try="$ac_compile"
 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
+printf "%s\n" "$ac_try_echo"; } >&5
 (eval "$ac_compile") 2>conftest.err
 ac_status=$?
 if test -s conftest.err; then
@@ -2217,17 +2307,19 @@
 cat conftest.er1 >&5
 mv -f conftest.er1 conftest.err
 fi
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; } && {
 	 test -z "$ac_objcxx_werror_flag" ||
 	 test ! -s conftest.err
- } && test -s conftest.$ac_objext; then :
+ } && test -s conftest.$ac_objext
+then :
 ac_retval=0
-else
- $as_echo "$as_me: failed program was:" >&5
+else case e in #(
+ e) printf "%s\n" "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	ac_retval=1
+	ac_retval=1 ;;
+esac
 fi
 eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 as_fn_set_status $ac_retval
@@ -2246,7 +2338,7 @@
 *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
+printf "%s\n" "$ac_try_echo"; } >&5
 (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
 ac_status=$?
 if test -s conftest.err; then
@@ -2254,163 +2346,126 @@
 cat conftest.er1 >&5
 mv -f conftest.er1 conftest.err
 fi
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; } > conftest.i && {
 	 test -z "$ac_objcxx_preproc_warn_flag$ac_objcxx_werror_flag" ||
 	 test ! -s conftest.err
- }; then :
+ }
+then :
 ac_retval=0
-else
- $as_echo "$as_me: failed program was:" >&5
+else case e in #(
+ e) printf "%s\n" "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
- ac_retval=1
+ ac_retval=1 ;;
+esac
 fi
 eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 as_fn_set_status $ac_retval
 
 } # ac_fn_objcxx_try_cpp
 
-# ac_fn_c_try_link LINENO
-# -----------------------
-# Try to link conftest.$ac_ext, and return whether this succeeded.
-ac_fn_c_try_link ()
+# ac_fn_c_try_cpp LINENO
+# ----------------------
+# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
+ac_fn_c_try_cpp ()
 {
 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"
+ 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_link") 2>conftest.err
+printf "%s\n" "$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; } && {
-	 test -z "$ac_c_werror_flag" ||
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; } > conftest.i && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 	 test ! -s conftest.err
- } && test -s conftest$ac_exeext && {
-	 test "$cross_compiling" = yes ||
-	 test -x conftest$ac_exeext
- }; then :
+ }
+then :
 ac_retval=0
-else
- $as_echo "$as_me: failed program was:" >&5
+else case e in #(
+ e) printf "%s\n" "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-	ac_retval=1
+ ac_retval=1 ;;
+esac
 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_c_try_link
+} # ac_fn_c_try_cpp
 
-# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES
-# -------------------------------------------------------
-# Tests whether HEADER exists, giving a warning if it cannot be compiled using
-# the include files in INCLUDES and setting the cache variable VAR
-# accordingly.
-ac_fn_c_check_header_mongrel ()
+# ac_fn_cxx_check_header_compile LINENO HEADER VAR INCLUDES
+# ---------------------------------------------------------
+# Tests whether HEADER exists and can be compiled using the include files in
+# INCLUDES, setting the cache variable VAR accordingly.
+ac_fn_cxx_check_header_compile ()
 {
 as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- if eval \${$3+:} false; then :
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
- $as_echo_n "(cached) " >&6
-fi
-eval ac_res=\$$3
-	 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-else
- # Is the header compilable?
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5
-$as_echo_n "checking $2 usability... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+printf %s "checking for $2... " >&6; }
+if eval test \${$3+y}
+then :
+ printf %s "(cached) " >&6
+else case e in #(
+ e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 $4
 #include <$2>
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- ac_header_compiler=yes
-else
- ac_header_compiler=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5
-$as_echo "$ac_header_compiler" >&6; }
-
-# Is the header present?
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5
-$as_echo_n "checking $2 presence... " >&6; }
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <$2>
-_ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
- ac_header_preproc=yes
-else
- ac_header_preproc=no
+if ac_fn_cxx_try_compile "$LINENO"
+then :
+ eval "$3=yes"
+else case e in #(
+ e) eval "$3=no" ;;
+esac
 fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
-$as_echo "$ac_header_preproc" >&6; }
-
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #((
- yes:no: )
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5
-$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
- ;;
- no:yes:* )
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5
-$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;}
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: check for missing prerequisite headers?" >&5
-$as_echo "$as_me: WARNING: $2: check for missing prerequisite headers?" >&2;}
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5
-$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&5
-$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;}
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
-$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
- ;;
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
 esac
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
-$as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- eval "$3=\$ac_header_compiler"
 fi
 eval ac_res=\$$3
-	 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-fi
+	 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf "%s\n" "$ac_res" >&6; }
 eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
-} # ac_fn_c_check_header_mongrel
+} # ac_fn_cxx_check_header_compile
+ac_configure_args_raw=
+for ac_arg
+do
+ case $ac_arg in
+ *\'*)
+ ac_arg=`printf "%s\n" "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+ esac
+ as_fn_append ac_configure_args_raw " '$ac_arg'"
+done
+
+case $ac_configure_args_raw in
+ *$as_nl*)
+ ac_safe_unquote= ;;
+ *)
+ ac_unsafe_z='|&;<>()$`\\"*? ''	' # This string ends in space, tab.
+ ac_unsafe_a="$ac_unsafe_z#~"
+ ac_safe_unquote="s/ '\$^$ac_unsafe_a^$ac_unsafe_z*\$'/ \\1/g"
+ ac_configure_args_raw=` printf "%s\n" "$ac_configure_args_raw" | sed "$ac_safe_unquote"`;;
+esac
+
 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.6.2, which was
-generated by GNU Autoconf 2.69. Invocation command line was
+It was created by audacious-plugins $as_me 4.4.1, which was
+generated by GNU Autoconf 2.72. Invocation command line was
 
- $ $0 $@
+ $ $0$ac_configure_args_raw
 
 _ACEOF
 exec 5>>config.log
@@ -2443,8 +2498,12 @@
 for as_dir in $PATH
 do
 IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- $as_echo "PATH: $as_dir"
+ case $as_dir in #(((
+ '') as_dir=./ ;;
+ */) ;;
+ *) as_dir=$as_dir/ ;;
+ esac
+ printf "%s\n" "PATH: $as_dir"
 done
 IFS=$as_save_IFS
 
@@ -2479,7 +2538,7 @@
 | -silent | --silent | --silen | --sile | --sil)
 continue ;;
 *\'*)
- ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+ ac_arg=`printf "%s\n" "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
 esac
 case $ac_pass in
 1) as_fn_append ac_configure_args0 " '$ac_arg'" ;;
@@ -2514,11 +2573,13 @@
 # WARNING: Use '\'' to represent an apostrophe within the trap.
 # WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
 trap 'exit_status=$?
+ # Sanitize IFS.
+ IFS=" ""	$as_nl"
 # Save into config.log some information that might help in debugging.
 {
 echo
 
- $as_echo "## ---------------- ##
+ printf "%s\n" "## ---------------- ##
 ## Cache variables. ##
 ## ---------------- ##"
 echo
@@ -2529,8 +2590,8 @@
 case $ac_val in #(
 *${as_nl}*)
 case $ac_var in #(
- *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
-$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
+ *_cv_*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
+printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
 esac
 case $ac_var in #(
 _ | IFS | as_nl) ;; #(
@@ -2554,7 +2615,7 @@
 )
 echo
 
- $as_echo "## ----------------- ##
+ printf "%s\n" "## ----------------- ##
 ## Output variables. ##
 ## ----------------- ##"
 echo
@@ -2562,14 +2623,14 @@
 do
 eval ac_val=\$$ac_var
 case $ac_val in
- *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+ *\'\''*) ac_val=`printf "%s\n" "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
 esac
- $as_echo "$ac_var='\''$ac_val'\''"
+ printf "%s\n" "$ac_var='\''$ac_val'\''"
 done | sort
 echo
 
 if test -n "$ac_subst_files"; then
- $as_echo "## ------------------- ##
+ printf "%s\n" "## ------------------- ##
 ## File substitutions. ##
 ## ------------------- ##"
 echo
@@ -2577,15 +2638,15 @@
 do
 	eval ac_val=\$$ac_var
 	case $ac_val in
-	*\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+	*\'\''*) ac_val=`printf "%s\n" "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
 	esac
-	$as_echo "$ac_var='\''$ac_val'\''"
+	printf "%s\n" "$ac_var='\''$ac_val'\''"
 done | sort
 echo
 fi
 
 if test -s confdefs.h; then
- $as_echo "## ----------- ##
+ printf "%s\n" "## ----------- ##
 ## confdefs.h. ##
 ## ----------- ##"
 echo
@@ -2593,8 +2654,8 @@
 echo
 fi
 test "$ac_signal" != 0 &&
- $as_echo "$as_me: caught signal $ac_signal"
- $as_echo "$as_me: exit $exit_status"
+ printf "%s\n" "$as_me: caught signal $ac_signal"
+ printf "%s\n" "$as_me: exit $exit_status"
 } >&5
 rm -f core *.core core.conftest.* &&
 rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
@@ -2608,65 +2669,50 @@
 # confdefs.h avoids OS command line length limits that DEFS can exceed.
 rm -f -r conftest* confdefs.h
 
-$as_echo "/* confdefs.h */" > confdefs.h
+printf "%s\n" "/* confdefs.h */" > confdefs.h
 
 # Predefined preprocessor variables.
 
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_NAME "$PACKAGE_NAME"
-_ACEOF
+printf "%s\n" "#define PACKAGE_NAME \"$PACKAGE_NAME\"" >>confdefs.h
 
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_TARNAME "$PACKAGE_TARNAME"
-_ACEOF
+printf "%s\n" "#define PACKAGE_TARNAME \"$PACKAGE_TARNAME\"" >>confdefs.h
 
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_VERSION "$PACKAGE_VERSION"
-_ACEOF
+printf "%s\n" "#define PACKAGE_VERSION \"$PACKAGE_VERSION\"" >>confdefs.h
 
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_STRING "$PACKAGE_STRING"
-_ACEOF
+printf "%s\n" "#define PACKAGE_STRING \"$PACKAGE_STRING\"" >>confdefs.h
 
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
-_ACEOF
+printf "%s\n" "#define PACKAGE_BUGREPORT \"$PACKAGE_BUGREPORT\"" >>confdefs.h
 
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_URL "$PACKAGE_URL"
-_ACEOF
+printf "%s\n" "#define PACKAGE_URL \"$PACKAGE_URL\"" >>confdefs.h
 
 
 # Let the site file select an alternate cache file if it wants to.
 # Prefer an explicitly selected file to automatically selected ones.
-ac_site_file1=NONE
-ac_site_file2=NONE
 if test -n "$CONFIG_SITE"; then
- # We do not want a PATH search for config.site.
- case $CONFIG_SITE in #((
- -*) ac_site_file1=./$CONFIG_SITE;;
- */*) ac_site_file1=$CONFIG_SITE;;
- *) ac_site_file1=./$CONFIG_SITE;;
- esac
+ ac_site_files="$CONFIG_SITE"
 elif test "x$prefix" != xNONE; then
- ac_site_file1=$prefix/share/config.site
- ac_site_file2=$prefix/etc/config.site
+ ac_site_files="$prefix/share/config.site $prefix/etc/config.site"
 else
- ac_site_file1=$ac_default_prefix/share/config.site
- ac_site_file2=$ac_default_prefix/etc/config.site
+ ac_site_files="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
 fi
-for ac_site_file in "$ac_site_file1" "$ac_site_file2"
+
+for ac_site_file in $ac_site_files
 do
- test "x$ac_site_file" = xNONE && continue
- if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
-$as_echo "$as_me: loading site script $ac_site_file" >&6;}
+ case $ac_site_file in #(
+ */*) :
+ ;; #(
+ *) :
+ ac_site_file=./$ac_site_file ;;
+esac
+ if test -f "$ac_site_file" && test -r "$ac_site_file"; then
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
+printf "%s\n" "$as_me: loading site script $ac_site_file" >&6;}
 sed 's/^/| /' "$ac_site_file" >&5
 . "$ac_site_file" \
- || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+ || { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
 as_fn_error $? "failed to load site script $ac_site_file
-See \`config.log' for more details" "$LINENO" 5; }
+See 'config.log' for more details" "$LINENO" 5; }
 fi
 done
 
@@ -2674,20 +2720,669 @@
 # Some versions of bash will fail to source /dev/null (special files
 # actually), so we avoid doing that. DJGPP emulates it as a regular file.
 if test /dev/null != "$cache_file" && test -f "$cache_file"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
-$as_echo "$as_me: loading cache $cache_file" >&6;}
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
+printf "%s\n" "$as_me: loading cache $cache_file" >&6;}
 case $cache_file in
 \\/* | ?:\\/* ) . "$cache_file";;
 *) . "./$cache_file";;
 esac
 fi
 else
- { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
-$as_echo "$as_me: creating cache $cache_file" >&6;}
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
+printf "%s\n" "$as_me: creating cache $cache_file" >&6;}
 >$cache_file
 fi
 
+# Test code for whether the C compiler supports C89 (global declarations)
+ac_c_conftest_c89_globals='
+/* Does the compiler advertise C89 conformance?
+ Do not test the value of __STDC__, because some compilers set it to 0
+ while being otherwise adequately conformant. */
+#if !defined __STDC__
+# error "Compiler does not advertise C89 conformance"
+#endif
+
+#include <stddef.h>
+#include <stdarg.h>
+struct stat;
+/* Most of the following tests are stolen from RCS 5.7 src/conf.sh. */
+struct buf { int x; };
+struct buf * (*rcsopen) (struct buf *, struct stat *, int);
+static char *e (char **p, int i)
+{
+ return pi;
+}
+static char *f (char * (*g) (char **, int), char **p, ...)
+{
+ char *s;
+ va_list v;
+ va_start (v,p);
+ s = g (p, va_arg (v,int));
+ va_end (v);
+ return s;
+}
+
+/* C89 style stringification. */
+#define noexpand_stringify(a) #a
+const char *stringified = noexpand_stringify(arbitrary+token=sequence);
+
+/* C89 style token pasting. Exercises some of the corner cases that
+ e.g. old MSVC gets wrong, but not very hard. */
+#define noexpand_concat(a,b) a##b
+#define expand_concat(a,b) noexpand_concat(a,b)
+extern int vA;
+extern int vbee;
+#define aye A
+#define bee B
+int *pvA = &expand_concat(v,aye);
+int *pvbee = &noexpand_concat(v,bee);
+
+/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has
+ function prototypes and stuff, but not \xHH hex character constants.
+ These do not provoke an error unfortunately, instead are silently treated
+ as an "x". The following induces an error, until -std is added to get
+ proper ANSI mode. Curiously \x00 != x always comes out true, for an
+ array size at least. It is necessary to write \x00 == 0 to get something
+ that is true only with -std. */
+int osf4_cc_array '\''\x00'\'' == 0 ? 1 : -1;
+
+/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
+ inside strings and character constants. */
+#define FOO(x) '\''x'\''
+int xlc6_cc_arrayFOO(a) == '\''x'\'' ? 1 : -1;
+
+int test (int i, double x);
+struct s1 {int (*f) (int a);};
+struct s2 {int (*f) (double a);};
+int pairnames (int, char **, int *(*)(struct buf *, struct stat *, int),
+ int, int);'
+
+# Test code for whether the C compiler supports C89 (body of main).
+ac_c_conftest_c89_main='
+ok |= (argc == 0 || f (e, argv, 0) != argv0 || f (e, argv, 1) != argv1);
+'
+
+# Test code for whether the C compiler supports C99 (global declarations)
+ac_c_conftest_c99_globals='
+/* Does the compiler advertise C99 conformance? */
+#if !defined __STDC_VERSION__ || __STDC_VERSION__ < 199901L
+# error "Compiler does not advertise C99 conformance"
+#endif
+
+// See if C++-style comments work.
+
+#include <stdbool.h>
+extern int puts (const char *);
+extern int printf (const char *, ...);
+extern int dprintf (int, const char *, ...);
+extern void *malloc (size_t);
+extern void free (void *);
+
+// Check varargs macros. These examples are taken from C99 6.10.3.5.
+// dprintf is used instead of fprintf to avoid needing to declare
+// FILE and stderr.
+#define debug(...) dprintf (2, __VA_ARGS__)
+#define showlist(...) puts (#__VA_ARGS__)
+#define report(test,...) ((test) ? puts (#test) : printf (__VA_ARGS__))
+static void
+test_varargs_macros (void)
+{
+ int x = 1234;
+ int y = 5678;
+ debug ("Flag");
+ debug ("X = %d\n", x);
+ showlist (The first, second, and third items.);
+ report (x>y, "x is %d but y is %d", x, y);
+}
+
+// Check long long types.
+#define BIG64 18446744073709551615ull
+#define BIG32 4294967295ul
+#define BIG_OK (BIG64 / BIG32 == 4294967297ull && BIG64 % BIG32 == 0)
+#if !BIG_OK
+ #error "your preprocessor is broken"
+#endif
+#if BIG_OK
+#else
+ #error "your preprocessor is broken"
+#endif
+static long long int bignum = -9223372036854775807LL;
+static unsigned long long int ubignum = BIG64;
+
+struct incomplete_array
+{
+ int datasize;
+ double data;
+};
+
+struct named_init {
+ int number;
+ const wchar_t *name;
+ double average;
+};
+
+typedef const char *ccp;
+
+static inline int
+test_restrict (ccp restrict text)
+{
+ // Iterate through items via the restricted pointer.
+ // Also check for declarations in for loops.
+ for (unsigned int i = 0; *(text+i) != '\''\0'\''; ++i)
+ continue;
+ return 0;
+}
+
+// Check varargs and va_copy.
+static bool
+test_varargs (const char *format, ...)
+{
+ va_list args;
+ va_start (args, format);
+ va_list args_copy;
+ va_copy (args_copy, args);
+
+ const char *str = "";
+ int number = 0;
+ float fnumber = 0;
+
+ while (*format)
+ {
+ switch (*format++)
+	{
+	case '\''s'\'': // string
+	 str = va_arg (args_copy, const char *);
+	 break;
+	case '\''d'\'': // int
+	 number = va_arg (args_copy, int);
+	 break;
+	case '\''f'\'': // float
+	 fnumber = va_arg (args_copy, double);
+	 break;
+	default:
+	 break;
+	}
+ }
+ va_end (args_copy);
+ va_end (args);
+
+ return *str && number && fnumber;
+}
+'
+
+# Test code for whether the C compiler supports C99 (body of main).
+ac_c_conftest_c99_main='
+ // Check bool.
+ _Bool success = false;
+ success |= (argc != 0);
+
+ // Check restrict.
+ if (test_restrict ("String literal") == 0)
+ success = true;
+ char *restrict newvar = "Another string";
+
+ // Check varargs.
+ success &= test_varargs ("s, d'\'' f .", "string", 65, 34.234);
+ test_varargs_macros ();
+
+ // Check flexible array members.
+ struct incomplete_array *ia =
+ malloc (sizeof (struct incomplete_array) + (sizeof (double) * 10));
+ ia->datasize = 10;
+ for (int i = 0; i < ia->datasize; ++i)
+ ia->datai = i * 1.234;
+ // Work around memory leak warnings.
+ free (ia);
+
+ // Check named initializers.
+ struct named_init ni = {
+ .number = 34,
+ .name = L"Test wide string",
+ .average = 543.34343,
+ };
+
+ ni.number = 58;
+
+ int dynamic_arrayni.number;
+ dynamic_array0 = argv00;
+ dynamic_arrayni.number - 1 = 543;
+
+ // work around unused variable warnings
+ ok |= (!success || bignum == 0LL || ubignum == 0uLL || newvar0 == '\''x'\''
+	 || dynamic_arrayni.number - 1 != 543);
+'
+
+# Test code for whether the C compiler supports C11 (global declarations)
+ac_c_conftest_c11_globals='
+/* Does the compiler advertise C11 conformance? */
+#if !defined __STDC_VERSION__ || __STDC_VERSION__ < 201112L
+# error "Compiler does not advertise C11 conformance"
+#endif
+
+// Check _Alignas.
+char _Alignas (double) aligned_as_double;
+char _Alignas (0) no_special_alignment;
+extern char aligned_as_int;
+char _Alignas (0) _Alignas (int) aligned_as_int;
+
+// Check _Alignof.
+enum
+{
+ int_alignment = _Alignof (int),
+ int_array_alignment = _Alignof (int100),
+ char_alignment = _Alignof (char)
+};
+_Static_assert (0 < -_Alignof (int), "_Alignof is signed");
+
+// Check _Noreturn.
+int _Noreturn does_not_return (void) { for (;;) continue; }
+
+// Check _Static_assert.
+struct test_static_assert
+{
+ int x;
+ _Static_assert (sizeof (int) <= sizeof (long int),
+ "_Static_assert does not work in struct");
+ long int y;
+};
+
+// Check UTF-8 literals.
+#define u8 syntax error!
+char const utf8_literal = u8"happens to be ASCII" "another string";
+
+// Check duplicate typedefs.
+typedef long *long_ptr;
+typedef long int *long_ptr;
+typedef long_ptr long_ptr;
+
+// Anonymous structures and unions -- taken from C11 6.7.2.1 Example 1.
+struct anonymous
+{
+ union {
+ struct { int i; int j; };
+ struct { int k; long int l; } w;
+ };
+ int m;
+} v1;
+'
+
+# Test code for whether the C compiler supports C11 (body of main).
+ac_c_conftest_c11_main='
+ _Static_assert ((offsetof (struct anonymous, i)
+		 == offsetof (struct anonymous, w.k)),
+		 "Anonymous union alignment botch");
+ v1.i = 2;
+ v1.w.k = 5;
+ ok |= v1.i != 5;
+'
+
+# Test code for whether the C compiler supports C11 (complete).
+ac_c_conftest_c11_program="${ac_c_conftest_c89_globals}
+${ac_c_conftest_c99_globals}
+${ac_c_conftest_c11_globals}
+
+int
+main (int argc, char **argv)
+{
+ int ok = 0;
+ ${ac_c_conftest_c89_main}
+ ${ac_c_conftest_c99_main}
+ ${ac_c_conftest_c11_main}
+ return ok;
+}
+"
+
+# Test code for whether the C compiler supports C99 (complete).
+ac_c_conftest_c99_program="${ac_c_conftest_c89_globals}
+${ac_c_conftest_c99_globals}
+
+int
+main (int argc, char **argv)
+{
+ int ok = 0;
+ ${ac_c_conftest_c89_main}
+ ${ac_c_conftest_c99_main}
+ return ok;
+}
+"
+
+# Test code for whether the C compiler supports C89 (complete).
+ac_c_conftest_c89_program="${ac_c_conftest_c89_globals}
+
+int
+main (int argc, char **argv)
+{
+ int ok = 0;
+ ${ac_c_conftest_c89_main}
+ return ok;
+}
+"
+
+# Test code for whether the C++ compiler supports C++98 (global declarations)
+ac_cxx_conftest_cxx98_globals='
+// Does the compiler advertise C++98 conformance?
+#if !defined __cplusplus || __cplusplus < 199711L
+# error "Compiler does not advertise C++98 conformance"
+#endif
+
+// These inclusions are to reject old compilers that
+// lack the unsuffixed header files.
+#include <cstdlib>
+#include <exception>
+
+// <cassert> and <cstring> are *not* freestanding headers in C++98.
+extern void assert (int);
+namespace std {
+ extern int strcmp (const char *, const char *);
+}
+
+// Namespaces, exceptions, and templates were all added after "C++ 2.0".
+using std::exception;
+using std::strcmp;
+
+namespace {
+
+void test_exception_syntax()
+{
+ try {
+ throw "test";
+ } catch (const char *s) {
+ // Extra parentheses suppress a warning when building autoconf itself,
+ // due to lint rules shared with more typical C programs.
+ assert (!(strcmp) (s, "test"));
+ }
+}
+
+template <typename T> struct test_template
+{
+ T const val;
+ explicit test_template(T t) : val(t) {}
+ template <typename U> T add(U u) { return static_cast<T>(u) + val; }
+};
+
+} // anonymous namespace
+'
+
+# Test code for whether the C++ compiler supports C++98 (body of main)
+ac_cxx_conftest_cxx98_main='
+ assert (argc);
+ assert (! argv0);
+{
+ test_exception_syntax ();
+ test_template<double> tt (2.0);
+ assert (tt.add (4) == 6.0);
+ assert (true && !false);
+}
+'
+
+# Test code for whether the C++ compiler supports C++11 (global declarations)
+ac_cxx_conftest_cxx11_globals='
+// Does the compiler advertise C++ 2011 conformance?
+#if !defined __cplusplus || __cplusplus < 201103L
+# error "Compiler does not advertise C++11 conformance"
+#endif
+
+namespace cxx11test
+{
+ constexpr int get_val() { return 20; }
+
+ struct testinit
+ {
+ int i;
+ double d;
+ };
+
+ class delegate
+ {
+ public:
+ delegate(int n) : n(n) {}
+ delegate(): delegate(2354) {}
+
+ virtual int getval() { return this->n; };
+ protected:
+ int n;
+ };
+
+ class overridden : public delegate
+ {
+ public:
+ overridden(int n): delegate(n) {}
+ virtual int getval() override final { return this->n * 2; }
+ };
+
+ class nocopy
+ {
+ public:
+ nocopy(int i): i(i) {}
+ nocopy() = default;
+ nocopy(const nocopy&) = delete;
+ nocopy & operator=(const nocopy&) = delete;
+ private:
+ int i;
+ };
+
+ // for testing lambda expressions
+ template <typename Ret, typename Fn> Ret eval(Fn f, Ret v)
+ {
+ return f(v);
+ }
+
+ // for testing variadic templates and trailing return types
+ template <typename V> auto sum(V first) -> V
+ {
+ return first;
+ }
+ template <typename V, typename... Args> auto sum(V first, Args... rest) -> V
+ {
+ return first + sum(rest...);
+ }
+}
+'
+
+# Test code for whether the C++ compiler supports C++11 (body of main)
+ac_cxx_conftest_cxx11_main='
+{
+ // Test auto and decltype
+ auto a1 = 6538;
+ auto a2 = 48573953.4;
+ auto a3 = "String literal";
+
+ int total = 0;
+ for (auto i = a3; *i; ++i) { total += *i; }
+
+ decltype(a2) a4 = 34895.034;
+}
+{
+ // Test constexpr
+ short sacxx11test::get_val() = { 0 };
+}
+{
+ // Test initializer lists
+ cxx11test::testinit il = { 4323, 435234.23544 };
+}
+{
+ // Test range-based for
+ int array = {9, 7, 13, 15, 4, 18, 12, 10, 5, 3,
+ 14, 19, 17, 8, 6, 20, 16, 2, 11, 1};
+ for (auto &x : array) { x += 23; }
+}
+{
+ // Test lambda expressions
+ using cxx11test::eval;
+ assert (eval ((int x) { return x*2; }, 21) == 42);
+ double d = 2.0;
+ assert (eval (&(double x) { return d += x; }, 3.0) == 5.0);
+ assert (d == 5.0);
+ assert (eval (=(double x) mutable { return d += x; }, 4.0) == 9.0);
+ assert (d == 5.0);
+}
+{
+ // Test use of variadic templates
+ using cxx11test::sum;
+ auto a = sum(1);
+ auto b = sum(1, 2);
+ auto c = sum(1.0, 2.0, 3.0);
+}
+{
+ // Test constructor delegation
+ cxx11test::delegate d1;
+ cxx11test::delegate d2();
+ cxx11test::delegate d3(45);
+}
+{
+ // Test override and final
+ cxx11test::overridden o1(55464);
+}
+{
+ // Test nullptr
+ char *c = nullptr;
+}
+{
+ // Test template brackets
+ test_template<::test_template<int>> v(test_template<int>(12));
+}
+{
+ // Unicode literals
+ char const *utf8 = u8"UTF-8 string \u2500";
+ char16_t const *utf16 = u"UTF-8 string \u2500";
+ char32_t const *utf32 = U"UTF-32 string \u2500";
+}
+'
+
+# Test code for whether the C compiler supports C++11 (complete).
+ac_cxx_conftest_cxx11_program="${ac_cxx_conftest_cxx98_globals}
+${ac_cxx_conftest_cxx11_globals}
+
+int
+main (int argc, char **argv)
+{
+ int ok = 0;
+ ${ac_cxx_conftest_cxx98_main}
+ ${ac_cxx_conftest_cxx11_main}
+ return ok;
+}
+"
+
+# Test code for whether the C compiler supports C++98 (complete).
+ac_cxx_conftest_cxx98_program="${ac_cxx_conftest_cxx98_globals}
+int
+main (int argc, char **argv)
+{
+ int ok = 0;
+ ${ac_cxx_conftest_cxx98_main}
+ return ok;
+}
+"
+
+as_fn_append ac_header_c_list " stdio.h stdio_h HAVE_STDIO_H"
+as_fn_append ac_header_c_list " stdlib.h stdlib_h HAVE_STDLIB_H"
+as_fn_append ac_header_c_list " string.h string_h HAVE_STRING_H"
+as_fn_append ac_header_c_list " inttypes.h inttypes_h HAVE_INTTYPES_H"
+as_fn_append ac_header_c_list " stdint.h stdint_h HAVE_STDINT_H"
+as_fn_append ac_header_c_list " strings.h strings_h HAVE_STRINGS_H"
+as_fn_append ac_header_c_list " sys/stat.h sys_stat_h HAVE_SYS_STAT_H"
+as_fn_append ac_header_c_list " sys/types.h sys_types_h HAVE_SYS_TYPES_H"
+as_fn_append ac_header_c_list " unistd.h unistd_h HAVE_UNISTD_H"
 gt_needs="$gt_needs "
+
+# Auxiliary files required by this configure script.
+ac_aux_files="config.rpath install-sh config.guess config.sub"
+
+# Locations in which to look for auxiliary files.
+ac_aux_dir_candidates="${srcdir}/build-aux"
+
+# Search for a directory containing all of the required auxiliary files,
+# $ac_aux_files, from the $PATH-style list $ac_aux_dir_candidates.
+# If we don't find one directory that contains all the files we need,
+# we report the set of missing files from the *first* directory in
+# $ac_aux_dir_candidates and give up.
+ac_missing_aux_files=""
+ac_first_candidate=:
+printf "%s\n" "$as_me:${as_lineno-$LINENO}: looking for aux files: $ac_aux_files" >&5
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+as_found=false
+for as_dir in $ac_aux_dir_candidates
+do
+ IFS=$as_save_IFS
+ case $as_dir in #(((
+ '') as_dir=./ ;;
+ */) ;;
+ *) as_dir=$as_dir/ ;;
+ esac
+ as_found=:
+
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: trying $as_dir" >&5
+ ac_aux_dir_found=yes
+ ac_install_sh=
+ for ac_aux in $ac_aux_files
+ do
+ # As a special case, if "install-sh" is required, that requirement
+ # can be satisfied by any of "install-sh", "install.sh", or "shtool",
+ # and $ac_install_sh is set appropriately for whichever one is found.
+ if test x"$ac_aux" = x"install-sh"
+ then
+ if test -f "${as_dir}install-sh"; then
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: ${as_dir}install-sh found" >&5
+ ac_install_sh="${as_dir}install-sh -c"
+ elif test -f "${as_dir}install.sh"; then
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: ${as_dir}install.sh found" >&5
+ ac_install_sh="${as_dir}install.sh -c"
+ elif test -f "${as_dir}shtool"; then
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: ${as_dir}shtool found" >&5
+ ac_install_sh="${as_dir}shtool install -c"
+ else
+ ac_aux_dir_found=no
+ if $ac_first_candidate; then
+ ac_missing_aux_files="${ac_missing_aux_files} install-sh"
+ else
+ break
+ fi
+ fi
+ else
+ if test -f "${as_dir}${ac_aux}"; then
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: ${as_dir}${ac_aux} found" >&5
+ else
+ ac_aux_dir_found=no
+ if $ac_first_candidate; then
+ ac_missing_aux_files="${ac_missing_aux_files} ${ac_aux}"
+ else
+ break
+ fi
+ fi
+ fi
+ done
+ if test "$ac_aux_dir_found" = yes; then
+ ac_aux_dir="$as_dir"
+ break
+ fi
+ ac_first_candidate=false
+
+ as_found=false
+done
+IFS=$as_save_IFS
+if $as_found
+then :
+
+else case e in #(
+ e) as_fn_error $? "cannot find required auxiliary files:$ac_missing_aux_files" "$LINENO" 5 ;;
+esac
+fi
+
+
+# These three variables are undocumented and unsupported,
+# and are intended to be withdrawn in a future Autoconf release.
+# They can cause serious problems if a builder's source tree is in a directory
+# whose full name contains unusual characters.
+if test -f "${ac_aux_dir}config.guess"; then
+ ac_config_guess="$SHELL ${ac_aux_dir}config.guess"
+fi
+if test -f "${ac_aux_dir}config.sub"; then
+ ac_config_sub="$SHELL ${ac_aux_dir}config.sub"
+fi
+if test -f "$ac_aux_dir/configure"; then
+ ac_configure="$SHELL ${ac_aux_dir}configure"
+fi
+
 # Check that the precious variables saved in the cache have kept the same
 # value.
 ac_cache_corrupted=false
@@ -2698,12 +3393,12 @@
 eval ac_new_val=\$ac_env_${ac_var}_value
 case $ac_old_set,$ac_new_set in
 set,)
- { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: '$ac_var' was set to '$ac_old_val' in the previous run" >&5
+printf "%s\n" "$as_me: error: '$ac_var' was set to '$ac_old_val' in the previous run" >&2;}
 ac_cache_corrupted=: ;;
 ,set)
- { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5
-$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: '$ac_var' was not set in the previous run" >&5
+printf "%s\n" "$as_me: error: '$ac_var' was not set in the previous run" >&2;}
 ac_cache_corrupted=: ;;
 ,);;
 *)
@@ -2712,24 +3407,24 @@
 	ac_old_val_w=`echo x $ac_old_val`
 	ac_new_val_w=`echo x $ac_new_val`
 	if test "$ac_old_val_w" != "$ac_new_val_w"; then
-	 { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5
-$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
+	 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: '$ac_var' has changed since the previous run:" >&5
+printf "%s\n" "$as_me: error: '$ac_var' has changed since the previous run:" >&2;}
 	 ac_cache_corrupted=:
 	else
-	 { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
-$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
+	 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in '$ac_var' since the previous run:" >&5
+printf "%s\n" "$as_me: warning: ignoring whitespace changes in '$ac_var' since the previous run:" >&2;}
 	 eval $ac_var=\$ac_old_val
 	fi
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5
-$as_echo "$as_me: former value: \`$ac_old_val'" >&2;}
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5
-$as_echo "$as_me: current value: \`$ac_new_val'" >&2;}
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: former value: '$ac_old_val'" >&5
+printf "%s\n" "$as_me: former value: '$ac_old_val'" >&2;}
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: current value: '$ac_new_val'" >&5
+printf "%s\n" "$as_me: current value: '$ac_new_val'" >&2;}
 fi;;
 esac
 # Pass precious variables to config.status.
 if test "$ac_new_set" = set; then
 case $ac_new_val in
- *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
+ *\'*) ac_arg=$ac_var=`printf "%s\n" "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
 *) ac_arg=$ac_var=$ac_new_val ;;
 esac
 case " $ac_configure_args " in
@@ -2739,11 +3434,12 @@
 fi
 done
 if $ac_cache_corrupted; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
- { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
-$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
- as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
+printf "%s\n" "$as_me: error: changes in the environment can compromise the build" >&2;}
+ as_fn_error $? "run '${MAKE-make} distclean' and/or 'rm $cache_file'
+	 and start over" "$LINENO" 5
 fi
 ## -------------------- ##
 ## Main body of script. ##
@@ -2759,69 +3455,42 @@
 
 
 
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE "$PACKAGE_NAME"
-_ACEOF
+printf "%s\n" "#define PACKAGE \"$PACKAGE_NAME\"" >>confdefs.h
 
 
-cat >>confdefs.h <<_ACEOF
-#define VERSION "$PACKAGE_VERSION"
-_ACEOF
+printf "%s\n" "#define VERSION \"$PACKAGE_VERSION\"" >>confdefs.h
 
 
-ac_aux_dir=
-for ac_dir in build-aux "$srcdir"/build-aux; do
- if test -f "$ac_dir/install-sh"; then
- ac_aux_dir=$ac_dir
- ac_install_sh="$ac_aux_dir/install-sh -c"
- break
- elif test -f "$ac_dir/install.sh"; then
- ac_aux_dir=$ac_dir
- ac_install_sh="$ac_aux_dir/install.sh -c"
- break
- elif test -f "$ac_dir/shtool"; then
- ac_aux_dir=$ac_dir
- ac_install_sh="$ac_aux_dir/shtool install -c"
- break
- fi
-done
-if test -z "$ac_aux_dir"; then
- as_fn_error $? "cannot find install-sh, install.sh, or shtool in build-aux \"$srcdir\"/build-aux" "$LINENO" 5
-fi
 
-# These three variables are undocumented and unsupported,
-# and are intended to be withdrawn in a future Autoconf release.
-# They can cause serious problems if a builder's source tree is in a directory
-# whose full name contains unusual characters.
-ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var.
-ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var.
-ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var.
+ac_config_headers="$ac_config_headers config.h"
 
 
-ac_config_headers="$ac_config_headers config.h"
 
 
 
-# Make sure we can run config.sub.
-$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
- as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
-$as_echo_n "checking build system type... " >&6; }
-if ${ac_cv_build+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_build_alias=$build_alias
+
+ # Make sure we can run config.sub.
+$SHELL "${ac_aux_dir}config.sub" sun4 >/dev/null 2>&1 ||
+ as_fn_error $? "cannot run $SHELL ${ac_aux_dir}config.sub" "$LINENO" 5
+
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
+printf %s "checking build system type... " >&6; }
+if test ${ac_cv_build+y}
+then :
+ printf %s "(cached) " >&6
+else case e in #(
+ e) ac_build_alias=$build_alias
 test "x$ac_build_alias" = x &&
- ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
+ ac_build_alias=`$SHELL "${ac_aux_dir}config.guess"`
 test "x$ac_build_alias" = x &&
 as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
-ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
- as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
-
+ac_cv_build=`$SHELL "${ac_aux_dir}config.sub" $ac_build_alias` ||
+ as_fn_error $? "$SHELL ${ac_aux_dir}config.sub $ac_build_alias failed" "$LINENO" 5
+ ;;
+esac
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
-$as_echo "$ac_cv_build" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
+printf "%s\n" "$ac_cv_build" >&6; }
 case $ac_cv_build in
 *-*-*) ;;
 *) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
@@ -2840,21 +3509,23 @@
 case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
-$as_echo_n "checking host system type... " >&6; }
-if ${ac_cv_host+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test "x$host_alias" = x; then
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
+printf %s "checking host system type... " >&6; }
+if test ${ac_cv_host+y}
+then :
+ printf %s "(cached) " >&6
+else case e in #(
+ e) if test "x$host_alias" = x; then
 ac_cv_host=$ac_cv_build
 else
- ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
- as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
+ ac_cv_host=`$SHELL "${ac_aux_dir}config.sub" $host_alias` ||
+ as_fn_error $? "$SHELL ${ac_aux_dir}config.sub $host_alias failed" "$LINENO" 5
 fi
-
+ ;;
+esac
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
-$as_echo "$ac_cv_host" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
+printf "%s\n" "$ac_cv_host" >&6; }
 case $ac_cv_host in
 *-*-*) ;;
 *) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
@@ -2873,21 +3544,23 @@
 case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking target system type" >&5
-$as_echo_n "checking target system type... " >&6; }
-if ${ac_cv_target+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test "x$target_alias" = x; then
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking target system type" >&5
+printf %s "checking target system type... " >&6; }
+if test ${ac_cv_target+y}
+then :
+ printf %s "(cached) " >&6
+else case e in #(
+ e) if test "x$target_alias" = x; then
 ac_cv_target=$ac_cv_host
 else
- ac_cv_target=`$SHELL "$ac_aux_dir/config.sub" $target_alias` ||
- as_fn_error $? "$SHELL $ac_aux_dir/config.sub $target_alias failed" "$LINENO" 5
+ ac_cv_target=`$SHELL "${ac_aux_dir}config.sub" $target_alias` ||
+ as_fn_error $? "$SHELL ${ac_aux_dir}config.sub $target_alias failed" "$LINENO" 5
 fi
-
+ ;;
+esac
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_target" >&5
-$as_echo "$ac_cv_target" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_target" >&5
+printf "%s\n" "$ac_cv_target" >&6; }
 case $ac_cv_target in
 *-*-*) ;;
 *) as_fn_error $? "invalid value of canonical target" "$LINENO" 5;;
@@ -2912,6 +3585,15 @@
 test "$program_prefix$program_suffix$program_transform_name" = \
 NONENONEs,x,x, &&
 program_prefix=${target_alias}-
+
+
+
+
+
+
+
+
+
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -2920,38 +3602,44 @@
 if test -n "$ac_tool_prefix"; then
 # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}gcc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test -n "$CC"; then
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_CC+y}
+then :
+ printf %s "(cached) " >&6
+else case e in #(
+ e) if test -n "$CC"; then
 ac_cv_prog_CC="$CC" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
 IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
+ case $as_dir in #(((
+ '') as_dir=./ ;;
+ */) ;;
+ *) as_dir=$as_dir/ ;;
+ esac
 for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
 ac_cv_prog_CC="${ac_tool_prefix}gcc"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
 break 2
 fi
 done
 done
 IFS=$as_save_IFS
 
-fi
+fi ;;
+esac
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+printf "%s\n" "$CC" >&6; }
 else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -2960,38 +3648,44 @@
 ac_ct_CC=$CC
 # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_CC+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test -n "$ac_ct_CC"; then
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_ac_ct_CC+y}
+then :
+ printf %s "(cached) " >&6
+else case e in #(
+ e) if test -n "$ac_ct_CC"; then
 ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
 IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
+ case $as_dir in #(((
+ '') as_dir=./ ;;
+ */) ;;
+ *) as_dir=$as_dir/ ;;
+ esac
 for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
 ac_cv_prog_ac_ct_CC="gcc"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
 break 2
 fi
 done
 done
 IFS=$as_save_IFS
 
-fi
+fi ;;
+esac
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
-$as_echo "$ac_ct_CC" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+printf "%s\n" "$ac_ct_CC" >&6; }
 else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 if test "x$ac_ct_CC" = x; then
@@ -2999,8 +3693,8 @@
 else
 case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
 CC=$ac_ct_CC
@@ -3013,38 +3707,44 @@
 if test -n "$ac_tool_prefix"; then
 # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}cc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test -n "$CC"; then
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_CC+y}
+then :
+ printf %s "(cached) " >&6
+else case e in #(
+ e) if test -n "$CC"; then
 ac_cv_prog_CC="$CC" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
 IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
+ case $as_dir in #(((
+ '') as_dir=./ ;;
+ */) ;;
+ *) as_dir=$as_dir/ ;;
+ esac
 for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
 ac_cv_prog_CC="${ac_tool_prefix}cc"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
 break 2
 fi
 done
 done
 IFS=$as_save_IFS
 
-fi
+fi ;;
+esac
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+printf "%s\n" "$CC" >&6; }
 else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -3053,12 +3753,13 @@
 if test -z "$CC"; then
 # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test -n "$CC"; then
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_CC+y}
+then :
+ printf %s "(cached) " >&6
+else case e in #(
+ e) if test -n "$CC"; then
 ac_cv_prog_CC="$CC" # Let the user override the test.
 else
 ac_prog_rejected=no
@@ -3066,15 +3767,19 @@
 for as_dir in $PATH
 do
 IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
+ case $as_dir in #(((
+ '') as_dir=./ ;;
+ */) ;;
+ *) as_dir=$as_dir/ ;;
+ esac
 for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
+ if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+ if test "$as_dir$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
 ac_prog_rejected=yes
 continue
 fi
 ac_cv_prog_CC="cc"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
 break 2
 fi
 done
@@ -3090,18 +3795,19 @@
 # However, it has the same basename, so the bogon will be chosen
 # first if we set CC to just the basename; use the full file name.
 shift
- ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
+ ac_cv_prog_CC="$as_dir$ac_word${1+' '}$@"
 fi
 fi
-fi
+fi ;;
+esac
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+printf "%s\n" "$CC" >&6; }
 else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -3112,38 +3818,44 @@
 do
 # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test -n "$CC"; then
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_CC+y}
+then :
+ printf %s "(cached) " >&6
+else case e in #(
+ e) if test -n "$CC"; then
 ac_cv_prog_CC="$CC" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
 IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
+ case $as_dir in #(((
+ '') as_dir=./ ;;
+ */) ;;
+ *) as_dir=$as_dir/ ;;
+ esac
 for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
 ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
 break 2
 fi
 done
 done
 IFS=$as_save_IFS
 
-fi
+fi ;;
+esac
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
-$as_echo "$CC" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+printf "%s\n" "$CC" >&6; }
 else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -3156,38 +3868,44 @@
 do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_CC+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test -n "$ac_ct_CC"; then
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_ac_ct_CC+y}
+then :
+ printf %s "(cached) " >&6
+else case e in #(
+ e) if test -n "$ac_ct_CC"; then
 ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
 IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
+ case $as_dir in #(((
+ '') as_dir=./ ;;
+ */) ;;
+ *) as_dir=$as_dir/ ;;
+ esac
 for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
 ac_cv_prog_ac_ct_CC="$ac_prog"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
 break 2
 fi
 done
 done
 IFS=$as_save_IFS
 
-fi
+fi ;;
+esac
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
-$as_echo "$ac_ct_CC" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+printf "%s\n" "$ac_ct_CC" >&6; }
 else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -3199,8 +3917,8 @@
 else
 case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
 CC=$ac_ct_CC
@@ -3208,25 +3926,131 @@
 fi
 
 fi
+if test -z "$CC"; then
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}clang", so it can be a program name with args.
+set dummy ${ac_tool_prefix}clang; ac_word=$2
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_CC+y}
+then :
+ printf %s "(cached) " >&6
+else case e in #(
+ e) if test -n "$CC"; then
+ ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ case $as_dir in #(((
+ '') as_dir=./ ;;
+ */) ;;
+ *) as_dir=$as_dir/ ;;
+ esac
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+ ac_cv_prog_CC="${ac_tool_prefix}clang"
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+fi ;;
+esac
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
+printf "%s\n" "$CC" >&6; }
+else
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+fi
 
 
-test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+fi
+if test -z "$ac_cv_prog_CC"; then
+ ac_ct_CC=$CC
+ # Extract the first word of "clang", so it can be a program name with args.
+set dummy clang; ac_word=$2
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_ac_ct_CC+y}
+then :
+ printf %s "(cached) " >&6
+else case e in #(
+ e) if test -n "$ac_ct_CC"; then
+ ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ case $as_dir in #(((
+ '') as_dir=./ ;;
+ */) ;;
+ *) as_dir=$as_dir/ ;;
+ esac
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+ ac_cv_prog_ac_ct_CC="clang"
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+fi ;;
+esac
+fi
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
+if test -n "$ac_ct_CC"; then
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
+printf "%s\n" "$ac_ct_CC" >&6; }
+else
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+fi
+
+ if test "x$ac_ct_CC" = x; then
+ CC=""
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+ CC=$ac_ct_CC
+ fi
+else
+ CC="$ac_cv_prog_CC"
+fi
+
+fi
+
+
+test -z "$CC" && { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
 as_fn_error $? "no acceptable C compiler found in \$PATH
-See \`config.log' for more details" "$LINENO" 5; }
+See 'config.log' for more details" "$LINENO" 5; }
 
 # Provide some information about the compiler.
-$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
+printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
 set X $ac_compile
 ac_compiler=$2
-for ac_option in --version -v -V -qversion; do
+for ac_option in --version -v -V -qversion -version; do
 { { ac_try="$ac_compiler $ac_option >&5"
 case "(($ac_try" in
 *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
+printf "%s\n" "$ac_try_echo"; } >&5
 (eval "$ac_compiler $ac_option >&5") 2>conftest.err
 ac_status=$?
 if test -s conftest.err; then
@@ -3236,7 +4060,7 @@
 cat conftest.er1 >&5
 fi
 rm -f conftest.er1 conftest.err
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }
 done
 
@@ -3244,7 +4068,7 @@
 /* end confdefs.h. */
 
 int
-main ()
+main (void)
 {
 
 ;
@@ -3256,9 +4080,9 @@
 # Try to create an executable without -o first, disregard a.out.
 # It will help us diagnose broken compilers, and finding out an intuition
 # of exeext.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
-$as_echo_n "checking whether the C compiler works... " >&6; }
-ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest^ *//'`
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
+printf %s "checking whether the C compiler works... " >&6; }
+ac_link_default=`printf "%s\n" "$ac_link" | sed 's/ -o *conftest^ *//'`
 
 # The possible output files:
 ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
@@ -3279,13 +4103,14 @@
 *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
+printf "%s\n" "$ac_try_echo"; } >&5
 (eval "$ac_link_default") 2>&5
 ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then :
- # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
-# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }
+then :
+ # Autoconf-2.13 could set the ac_cv_exeext variable to 'no'.
+# So ignore a value of 'no', otherwise this would lead to 'EXEEXT = no'
 # in a Makefile. We should not override ac_cv_exeext if it was cached,
 # so that the user can short-circuit this test for compilers unknown to
 # Autoconf.
@@ -3300,12 +4125,12 @@
 	# certainly right.
 	break;;
 *.* )
-	if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
+	if test ${ac_cv_exeext+y} && test "$ac_cv_exeext" != no;
 	then :; else
 	 ac_cv_exeext=`expr "$ac_file" : '^.*$\..*$'`
 	fi
 	# We set ac_cv_exeext here because the later test for it is not
-	# safe: cross compilers may not add the suffix if given an `-o'
+	# safe: cross compilers may not add the suffix if given an '-o'
 	# argument, so we may need to know it at that point already.
 	# Even if this section looks crufty: it has the advantage of
 	# actually working.
@@ -3316,48 +4141,52 @@
 done
 test "$ac_cv_exeext" = no && ac_cv_exeext=
 
-else
- ac_file=''
+else case e in #(
+ e) ac_file='' ;;
+esac
 fi
-if test -z "$ac_file"; then :
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-$as_echo "$as_me: failed program was:" >&5
+if test -z "$ac_file"
+then :
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+printf "%s\n" "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
 as_fn_error 77 "C compiler cannot create executables
-See \`config.log' for more details" "$LINENO" 5; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+See 'config.log' for more details" "$LINENO" 5; }
+else case e in #(
+ e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; } ;;
+esac
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
-$as_echo_n "checking for C compiler default output file name... " >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
-$as_echo "$ac_file" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
+printf %s "checking for C compiler default output file name... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
+printf "%s\n" "$ac_file" >&6; }
 ac_exeext=$ac_cv_exeext
 
 rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
 ac_clean_files=$ac_clean_files_save
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
-$as_echo_n "checking for suffix of executables... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
+printf %s "checking for suffix of executables... " >&6; }
 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
+printf "%s\n" "$ac_try_echo"; } >&5
 (eval "$ac_link") 2>&5
 ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then :
- # If both `conftest.exe' and `conftest' are `present' (well, observable)
-# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will
-# work properly (i.e., refer to `conftest.exe'), while it won't with
-# `rm'.
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }
+then :
+ # If both 'conftest.exe' and 'conftest' are 'present' (well, observable)
+# catch 'conftest.exe'. For instance with Cygwin, 'ls conftest' will
+# work properly (i.e., refer to 'conftest.exe'), while it won't with
+# 'rm'.
 for ac_file in conftest.exe conftest conftest.*; do
 test -f "$ac_file" || continue
 case $ac_file in
@@ -3367,15 +4196,16 @@
 * ) break;;
 esac
 done
-else
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+else case e in #(
+ e) { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
 as_fn_error $? "cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details" "$LINENO" 5; }
+See 'config.log' for more details" "$LINENO" 5; } ;;
+esac
 fi
 rm -f conftest conftest$ac_cv_exeext
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
-$as_echo "$ac_cv_exeext" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
+printf "%s\n" "$ac_cv_exeext" >&6; }
 
 rm -f conftest.$ac_ext
 EXEEXT=$ac_cv_exeext
@@ -3384,9 +4214,11 @@
 /* end confdefs.h. */
 #include <stdio.h>
 int
-main ()
+main (void)
 {
 FILE *f = fopen ("conftest.out", "w");
+ if (!f)
+ return 1;
 return ferror (f) || fclose (f) != 0;
 
 ;
@@ -3396,8 +4228,8 @@
 ac_clean_files="$ac_clean_files conftest.out"
 # Check that the compiler produces executables we can run. If not, either
 # the compiler is broken, or we cross compile.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
-$as_echo_n "checking whether we are cross compiling... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
+printf %s "checking whether we are cross compiling... " >&6; }
 if test "$cross_compiling" != yes; then
 { { ac_try="$ac_link"
 case "(($ac_try" in
@@ -3405,10 +4237,10 @@
 *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
+printf "%s\n" "$ac_try_echo"; } >&5
 (eval "$ac_link") 2>&5
 ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }
 if { ac_try='./conftest$ac_cv_exeext'
 { { case "(($ac_try" in
@@ -3416,39 +4248,41 @@
 *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
+printf "%s\n" "$ac_try_echo"; } >&5
 (eval "$ac_try") 2>&5
 ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; }; then
 cross_compiling=no
 else
 if test "$cross_compiling" = maybe; then
 	cross_compiling=yes
 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 $? "cannot run C compiled programs.
-If you meant to cross compile, use \`--host'.
-See \`config.log' for more details" "$LINENO" 5; }
+	{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+as_fn_error 77 "cannot run C compiled programs.
+If you meant to cross compile, use '--host'.
+See 'config.log' for more details" "$LINENO" 5; }
 fi
 fi
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
-$as_echo "$cross_compiling" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
+printf "%s\n" "$cross_compiling" >&6; }
 
-rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
+rm -f conftest.$ac_ext conftest$ac_cv_exeext \
+ conftest.o conftest.obj conftest.out
 ac_clean_files=$ac_clean_files_save
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
-$as_echo_n "checking for suffix of object files... " >&6; }
-if ${ac_cv_objext+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
+printf %s "checking for suffix of object files... " >&6; }
+if test ${ac_cv_objext+y}
+then :
+ printf %s "(cached) " >&6
+else case e in #(
+ e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 
 int
-main ()
+main (void)
 {
 
 ;
@@ -3462,11 +4296,12 @@
 *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
+printf "%s\n" "$ac_try_echo"; } >&5
 (eval "$ac_compile") 2>&5
 ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then :
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }
+then :
 for ac_file in conftest.o conftest.obj conftest.*; do
 test -f "$ac_file" || continue;
 case $ac_file in
@@ -3475,31 +4310,34 @@
 break;;
 esac
 done
-else
- $as_echo "$as_me: failed program was:" >&5
+else case e in #(
+ e) printf "%s\n" "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
 as_fn_error $? "cannot compute suffix of object files: cannot compile
-See \`config.log' for more details" "$LINENO" 5; }
+See 'config.log' for more details" "$LINENO" 5; } ;;
+esac
 fi
-rm -f conftest.$ac_cv_objext conftest.$ac_ext
+rm -f conftest.$ac_cv_objext conftest.$ac_ext ;;
+esac
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
-$as_echo "$ac_cv_objext" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
+printf "%s\n" "$ac_cv_objext" >&6; }
 OBJEXT=$ac_cv_objext
 ac_objext=$OBJEXT
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
-$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
-if ${ac_cv_c_compiler_gnu+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports GNU C" >&5
+printf %s "checking whether the compiler supports GNU C... " >&6; }
+if test ${ac_cv_c_compiler_gnu+y}
+then :
+ printf %s "(cached) " >&6
+else case e in #(
+ e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 
 int
-main ()
+main (void)
 {
 #ifndef __GNUC__
 choke me
@@ -3509,30 +4347,36 @@
 return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
 ac_compiler_gnu=yes
-else
- ac_compiler_gnu=no
+else case e in #(
+ e) ac_compiler_gnu=no ;;
+esac
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 ac_cv_c_compiler_gnu=$ac_compiler_gnu
-
+ ;;
+esac
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
-$as_echo "$ac_cv_c_compiler_gnu" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
+printf "%s\n" "$ac_cv_c_compiler_gnu" >&6; }
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
 if test $ac_compiler_gnu = yes; then
 GCC=yes
 else
 GCC=
 fi
-ac_test_CFLAGS=${CFLAGS+set}
+ac_test_CFLAGS=${CFLAGS+y}
 ac_save_CFLAGS=$CFLAGS
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
-$as_echo_n "checking whether $CC accepts -g... " >&6; }
-if ${ac_cv_prog_cc_g+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_save_c_werror_flag=$ac_c_werror_flag
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
+printf %s "checking whether $CC accepts -g... " >&6; }
+if test ${ac_cv_prog_cc_g+y}
+then :
+ printf %s "(cached) " >&6
+else case e in #(
+ e) ac_save_c_werror_flag=$ac_c_werror_flag
 ac_c_werror_flag=yes
 ac_cv_prog_cc_g=no
 CFLAGS="-g"
@@ -3540,57 +4384,63 @@
 /* end confdefs.h. */
 
 int
-main ()
+main (void)
 {
 
 ;
 return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
 ac_cv_prog_cc_g=yes
-else
- CFLAGS=""
+else case e in #(
+ e) CFLAGS=""
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 
 int
-main ()
+main (void)
 {
 
 ;
 return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
 
-else
- ac_c_werror_flag=$ac_save_c_werror_flag
+else case e in #(
+ e) ac_c_werror_flag=$ac_save_c_werror_flag
 	 CFLAGS="-g"
 	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 
 int
-main ()
+main (void)
 {
 
 ;
 return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
 ac_cv_prog_cc_g=yes
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- ac_c_werror_flag=$ac_save_c_werror_flag
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+ ac_c_werror_flag=$ac_save_c_werror_flag ;;
+esac
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
-$as_echo "$ac_cv_prog_cc_g" >&6; }
-if test "$ac_test_CFLAGS" = set; then
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
+printf "%s\n" "$ac_cv_prog_cc_g" >&6; }
+if test $ac_test_CFLAGS; then
 CFLAGS=$ac_save_CFLAGS
 elif test $ac_cv_prog_cc_g = yes; then
 if test "$GCC" = yes; then
@@ -3605,94 +4455,153 @@
 CFLAGS=
 fi
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
-$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
-if ${ac_cv_prog_cc_c89+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_cv_prog_cc_c89=no
+ac_prog_cc_stdc=no
+if test x$ac_prog_cc_stdc = xno
+then :
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C11 features" >&5
+printf %s "checking for $CC option to enable C11 features... " >&6; }
+if test ${ac_cv_prog_cc_c11+y}
+then :
+ printf %s "(cached) " >&6
+else case e in #(
+ e) ac_cv_prog_cc_c11=no
 ac_save_CC=$CC
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
-#include <stdarg.h>
-#include <stdio.h>
-struct stat;
-/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */
-struct buf { int x; };
-FILE * (*rcsopen) (struct buf *, struct stat *, int);
-static char *e (p, i)
- char **p;
- int i;
-{
- return pi;
-}
-static char *f (char * (*g) (char **, int), char **p, ...)
-{
- char *s;
- va_list v;
- va_start (v,p);
- s = g (p, va_arg (v,int));
- va_end (v);
- return s;
-}
-
-/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has
- function prototypes and stuff, but not '\xHH' hex character constants.
- These don't provoke an error unfortunately, instead are silently treated
- as 'x'. The following induces an error, until -std is added to get
- proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an
- array size at least. It's necessary to write '\x00'==0 to get something
- that's true only with -std. */
-int osf4_cc_array '\x00' == 0 ? 1 : -1;
+$ac_c_conftest_c11_program
+_ACEOF
+for ac_arg in '' -std=gnu11
+do
+ CC="$ac_save_CC $ac_arg"
+ if ac_fn_c_try_compile "$LINENO"
+then :
+ ac_cv_prog_cc_c11=$ac_arg
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam
+ test "x$ac_cv_prog_cc_c11" != "xno" && break
+done
+rm -f conftest.$ac_ext
+CC=$ac_save_CC ;;
+esac
+fi
 
-/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
- inside strings and character constants. */
-#define FOO(x) 'x'
-int xlc6_cc_arrayFOO(a) == 'x' ? 1 : -1;
+if test "x$ac_cv_prog_cc_c11" = xno
+then :
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+printf "%s\n" "unsupported" >&6; }
+else case e in #(
+ e) if test "x$ac_cv_prog_cc_c11" = x
+then :
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+printf "%s\n" "none needed" >&6; }
+else case e in #(
+ e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c11" >&5
+printf "%s\n" "$ac_cv_prog_cc_c11" >&6; }
+ CC="$CC $ac_cv_prog_cc_c11" ;;
+esac
+fi
+ ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c11
+ ac_prog_cc_stdc=c11 ;;
+esac
+fi
+fi
+if test x$ac_prog_cc_stdc = xno
+then :
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C99 features" >&5
+printf %s "checking for $CC option to enable C99 features... " >&6; }
+if test ${ac_cv_prog_cc_c99+y}
+then :
+ printf %s "(cached) " >&6
+else case e in #(
+ e) ac_cv_prog_cc_c99=no
+ac_save_CC=$CC
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+$ac_c_conftest_c99_program
+_ACEOF
+for ac_arg in '' -std=gnu99 -std=c99 -c99 -qlanglvl=extc1x -qlanglvl=extc99 -AC99 -D_STDC_C99=
+do
+ CC="$ac_save_CC $ac_arg"
+ if ac_fn_c_try_compile "$LINENO"
+then :
+ ac_cv_prog_cc_c99=$ac_arg
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam
+ test "x$ac_cv_prog_cc_c99" != "xno" && break
+done
+rm -f conftest.$ac_ext
+CC=$ac_save_CC ;;
+esac
+fi
 
-int test (int i, double x);
-struct s1 {int (*f) (int a);};
-struct s2 {int (*f) (double a);};
-int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
-int argc;
-char **argv;
-int
-main ()
-{
-return f (e, argv, 0) != argv0 || f (e, argv, 1) != argv1;
- ;
- return 0;
-}
+if test "x$ac_cv_prog_cc_c99" = xno
+then :
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+printf "%s\n" "unsupported" >&6; }
+else case e in #(
+ e) if test "x$ac_cv_prog_cc_c99" = x
+then :
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+printf "%s\n" "none needed" >&6; }
+else case e in #(
+ e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c99" >&5
+printf "%s\n" "$ac_cv_prog_cc_c99" >&6; }
+ CC="$CC $ac_cv_prog_cc_c99" ;;
+esac
+fi
+ ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c99
+ ac_prog_cc_stdc=c99 ;;
+esac
+fi
+fi
+if test x$ac_prog_cc_stdc = xno
+then :
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable C89 features" >&5
+printf %s "checking for $CC option to enable C89 features... " >&6; }
+if test ${ac_cv_prog_cc_c89+y}
+then :
+ printf %s "(cached) " >&6
+else case e in #(
+ e) ac_cv_prog_cc_c89=no
+ac_save_CC=$CC
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+$ac_c_conftest_c89_program
 _ACEOF
-for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
-	-Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
+for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
 do
 CC="$ac_save_CC $ac_arg"
- if ac_fn_c_try_compile "$LINENO"; then :
+ if ac_fn_c_try_compile "$LINENO"
+then :
 ac_cv_prog_cc_c89=$ac_arg
 fi
-rm -f core conftest.err conftest.$ac_objext
+rm -f core conftest.err conftest.$ac_objext conftest.beam
 test "x$ac_cv_prog_cc_c89" != "xno" && break
 done
 rm -f conftest.$ac_ext
-CC=$ac_save_CC
+CC=$ac_save_CC ;;
+esac
+fi
 
+if test "x$ac_cv_prog_cc_c89" = xno
+then :
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+printf "%s\n" "unsupported" >&6; }
+else case e in #(
+ e) if test "x$ac_cv_prog_cc_c89" = x
+then :
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+printf "%s\n" "none needed" >&6; }
+else case e in #(
+ e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
+printf "%s\n" "$ac_cv_prog_cc_c89" >&6; }
+ CC="$CC $ac_cv_prog_cc_c89" ;;
+esac
 fi
-# AC_CACHE_VAL
-case "x$ac_cv_prog_cc_c89" in
- x)
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
-$as_echo "none needed" >&6; } ;;
- xno)
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
-$as_echo "unsupported" >&6; } ;;
- *)
- CC="$CC $ac_cv_prog_cc_c89"
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
-$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
+ ac_cv_prog_cc_stdc=$ac_cv_prog_cc_c89
+ ac_prog_cc_stdc=c89 ;;
 esac
-if test "x$ac_cv_prog_cc_c89" != xno; then :
-
+fi
 fi
 
 ac_ext=c
@@ -3701,6 +4610,12 @@
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
+
+
+
+
+
+
 ac_ext=cpp
 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -3711,42 +4626,48 @@
 CXX=$CCC
 else
 if test -n "$ac_tool_prefix"; then
- for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
+ for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC clang++
 do
 # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CXX+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test -n "$CXX"; then
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_CXX+y}
+then :
+ printf %s "(cached) " >&6
+else case e in #(
+ e) if test -n "$CXX"; then
 ac_cv_prog_CXX="$CXX" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
 IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
+ case $as_dir in #(((
+ '') as_dir=./ ;;
+ */) ;;
+ *) as_dir=$as_dir/ ;;
+ esac
 for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
 ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
 break 2
 fi
 done
 done
 IFS=$as_save_IFS
 
-fi
+fi ;;
+esac
 fi
 CXX=$ac_cv_prog_CXX
 if test -n "$CXX"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5
-$as_echo "$CXX" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5
+printf "%s\n" "$CXX" >&6; }
 else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -3755,42 +4676,48 @@
 fi
 if test -z "$CXX"; then
 ac_ct_CXX=$CXX
- for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
+ for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC clang++
 do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_CXX+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test -n "$ac_ct_CXX"; then
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_ac_ct_CXX+y}
+then :
+ printf %s "(cached) " >&6
+else case e in #(
+ e) if test -n "$ac_ct_CXX"; then
 ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
 IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
+ case $as_dir in #(((
+ '') as_dir=./ ;;
+ */) ;;
+ *) as_dir=$as_dir/ ;;
+ esac
 for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
 ac_cv_prog_ac_ct_CXX="$ac_prog"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
 break 2
 fi
 done
 done
 IFS=$as_save_IFS
 
-fi
+fi ;;
+esac
 fi
 ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
 if test -n "$ac_ct_CXX"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5
-$as_echo "$ac_ct_CXX" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5
+printf "%s\n" "$ac_ct_CXX" >&6; }
 else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -3802,8 +4729,8 @@
 else
 case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
 CXX=$ac_ct_CXX
@@ -3813,7 +4740,7 @@
 fi
 fi
 # Provide some information about the compiler.
-$as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5
+printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5
 set X $ac_compile
 ac_compiler=$2
 for ac_option in --version -v -V -qversion; do
@@ -3823,7 +4750,7 @@
 *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
+printf "%s\n" "$ac_try_echo"; } >&5
 (eval "$ac_compiler $ac_option >&5") 2>conftest.err
 ac_status=$?
 if test -s conftest.err; then
@@ -3833,20 +4760,21 @@
 cat conftest.er1 >&5
 fi
 rm -f conftest.er1 conftest.err
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }
 done
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5
-$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
-if ${ac_cv_cxx_compiler_gnu+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports GNU C++" >&5
+printf %s "checking whether the compiler supports GNU C++... " >&6; }
+if test ${ac_cv_cxx_compiler_gnu+y}
+then :
+ printf %s "(cached) " >&6
+else case e in #(
+ e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 
 int
-main ()
+main (void)
 {
 #ifndef __GNUC__
 choke me
@@ -3856,30 +4784,36 @@
 return 0;
 }
 _ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
+if ac_fn_cxx_try_compile "$LINENO"
+then :
 ac_compiler_gnu=yes
-else
- ac_compiler_gnu=no
+else case e in #(
+ e) ac_compiler_gnu=no ;;
+esac
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
-
+ ;;
+esac
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5
-$as_echo "$ac_cv_cxx_compiler_gnu" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5
+printf "%s\n" "$ac_cv_cxx_compiler_gnu" >&6; }
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+
 if test $ac_compiler_gnu = yes; then
 GXX=yes
 else
 GXX=
 fi
-ac_test_CXXFLAGS=${CXXFLAGS+set}
+ac_test_CXXFLAGS=${CXXFLAGS+y}
 ac_save_CXXFLAGS=$CXXFLAGS
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5
-$as_echo_n "checking whether $CXX accepts -g... " >&6; }
-if ${ac_cv_prog_cxx_g+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_save_cxx_werror_flag=$ac_cxx_werror_flag
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5
+printf %s "checking whether $CXX accepts -g... " >&6; }
+if test ${ac_cv_prog_cxx_g+y}
+then :
+ printf %s "(cached) " >&6
+else case e in #(
+ e) ac_save_cxx_werror_flag=$ac_cxx_werror_flag
 ac_cxx_werror_flag=yes
 ac_cv_prog_cxx_g=no
 CXXFLAGS="-g"
@@ -3887,57 +4821,63 @@
 /* end confdefs.h. */
 
 int
-main ()
+main (void)
 {
 
 ;
 return 0;
 }
 _ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
+if ac_fn_cxx_try_compile "$LINENO"
+then :
 ac_cv_prog_cxx_g=yes
-else
- CXXFLAGS=""
+else case e in #(
+ e) CXXFLAGS=""
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 
 int
-main ()
+main (void)
 {
 
 ;
 return 0;
 }
 _ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
+if ac_fn_cxx_try_compile "$LINENO"
+then :
 
-else
- ac_cxx_werror_flag=$ac_save_cxx_werror_flag
+else case e in #(
+ e) ac_cxx_werror_flag=$ac_save_cxx_werror_flag
 	 CXXFLAGS="-g"
 	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 
 int
-main ()
+main (void)
 {
 
 ;
 return 0;
 }
 _ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
+if ac_fn_cxx_try_compile "$LINENO"
+then :
 ac_cv_prog_cxx_g=yes
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- ac_cxx_werror_flag=$ac_save_cxx_werror_flag
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+ ac_cxx_werror_flag=$ac_save_cxx_werror_flag ;;
+esac
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5
-$as_echo "$ac_cv_prog_cxx_g" >&6; }
-if test "$ac_test_CXXFLAGS" = set; then
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5
+printf "%s\n" "$ac_cv_prog_cxx_g" >&6; }
+if test $ac_test_CXXFLAGS; then
 CXXFLAGS=$ac_save_CXXFLAGS
 elif test $ac_cv_prog_cxx_g = yes; then
 if test "$GXX" = yes; then
@@ -3952,142 +4892,104 @@
 CXXFLAGS=
 fi
 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
-
-
-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 how to run the C preprocessor" >&5
-$as_echo_n "checking how to run the C preprocessor... " >&6; }
-# On Suns, sometimes $CPP names a directory.
-if test -n "$CPP" && test -d "$CPP"; then
- CPP=
-fi
-if test -z "$CPP"; then
- if ${ac_cv_prog_CPP+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- # Double quotes because CPP needs to be expanded
- for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
- do
- ac_preproc_ok=false
-for ac_c_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_c_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
+ac_prog_cxx_stdcxx=no
+if test x$ac_prog_cxx_stdcxx = xno
+then :
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++11 features" >&5
+printf %s "checking for $CXX option to enable C++11 features... " >&6; }
+if test ${ac_cv_prog_cxx_cxx11+y}
+then :
+ printf %s "(cached) " >&6
+else case e in #(
+ e) ac_cv_prog_cxx_cxx11=no
+ac_save_CXX=$CXX
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
-#include <ac_nonexistent.h>
+$ac_cxx_conftest_cxx11_program
 _ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
- # Broken: success on invalid input.
-continue
-else
- # Passes both tests.
-ac_preproc_ok=:
-break
+for ac_arg in '' -std=gnu++11 -std=gnu++0x -std=c++11 -std=c++0x -qlanglvl=extended0x -AA
+do
+ CXX="$ac_save_CXX $ac_arg"
+ if ac_fn_cxx_try_compile "$LINENO"
+then :
+ ac_cv_prog_cxx_cxx11=$ac_arg
 fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-
+rm -f core conftest.err conftest.$ac_objext conftest.beam
+ test "x$ac_cv_prog_cxx_cxx11" != "xno" && break
 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
+rm -f conftest.$ac_ext
+CXX=$ac_save_CXX ;;
+esac
 fi
 
- done
- ac_cv_prog_CPP=$CPP
-
+if test "x$ac_cv_prog_cxx_cxx11" = xno
+then :
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+printf "%s\n" "unsupported" >&6; }
+else case e in #(
+ e) if test "x$ac_cv_prog_cxx_cxx11" = x
+then :
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+printf "%s\n" "none needed" >&6; }
+else case e in #(
+ e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_cxx11" >&5
+printf "%s\n" "$ac_cv_prog_cxx_cxx11" >&6; }
+ CXX="$CXX $ac_cv_prog_cxx_cxx11" ;;
+esac
 fi
- CPP=$ac_cv_prog_CPP
-else
- ac_cv_prog_CPP=$CPP
+ ac_cv_prog_cxx_stdcxx=$ac_cv_prog_cxx_cxx11
+ ac_prog_cxx_stdcxx=cxx11 ;;
+esac
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
-$as_echo "$CPP" >&6; }
-ac_preproc_ok=false
-for ac_c_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_c_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
+if test x$ac_prog_cxx_stdcxx = xno
+then :
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CXX option to enable C++98 features" >&5
+printf %s "checking for $CXX option to enable C++98 features... " >&6; }
+if test ${ac_cv_prog_cxx_cxx98+y}
+then :
+ printf %s "(cached) " >&6
+else case e in #(
+ e) ac_cv_prog_cxx_cxx98=no
+ac_save_CXX=$CXX
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
-#include <ac_nonexistent.h>
+$ac_cxx_conftest_cxx98_program
 _ACEOF
-if ac_fn_c_try_cpp "$LINENO"; then :
- # Broken: success on invalid input.
-continue
-else
- # Passes both tests.
-ac_preproc_ok=:
-break
+for ac_arg in '' -std=gnu++98 -std=c++98 -qlanglvl=extended -AA
+do
+ CXX="$ac_save_CXX $ac_arg"
+ if ac_fn_cxx_try_compile "$LINENO"
+then :
+ ac_cv_prog_cxx_cxx98=$ac_arg
 fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-
+rm -f core conftest.err conftest.$ac_objext conftest.beam
+ test "x$ac_cv_prog_cxx_cxx98" != "xno" && break
 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 :
+rm -f conftest.$ac_ext
+CXX=$ac_save_CXX ;;
+esac
+fi
 
-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 \"$CPP\" fails sanity check
-See \`config.log' for more details" "$LINENO" 5; }
+if test "x$ac_cv_prog_cxx_cxx98" = xno
+then :
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
+printf "%s\n" "unsupported" >&6; }
+else case e in #(
+ e) if test "x$ac_cv_prog_cxx_cxx98" = x
+then :
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
+printf "%s\n" "none needed" >&6; }
+else case e in #(
+ e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_cxx98" >&5
+printf "%s\n" "$ac_cv_prog_cxx_cxx98" >&6; }
+ CXX="$CXX $ac_cv_prog_cxx_cxx98" ;;
+esac
+fi
+ ac_cv_prog_cxx_stdcxx=$ac_cv_prog_cxx_cxx98
+ ac_prog_cxx_stdcxx=cxx98 ;;
+esac
+fi
 fi
 
 ac_ext=c
@@ -4097,271 +4999,42 @@
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
-$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
-if ${ac_cv_path_GREP+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test -z "$GREP"; then
- ac_path_GREP_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$PATH_SEPARATOR/usr/xpg4/bin
+ac_header= ac_cache=
+for ac_item in $ac_header_c_list
 do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_prog in grep ggrep; do
- for ac_exec_ext in '' $ac_executable_extensions; do
- ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
- as_fn_executable_p "$ac_path_GREP" || continue
-# Check for GNU ac_path_GREP and select it if it is found.
- # Check for GNU $ac_path_GREP
-case `"$ac_path_GREP" --version 2>&1` in
-*GNU*)
- ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_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 'GREP' >> "conftest.nl"
- "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "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_GREP_max-0}; then
- # Best one so far, save it but keep looking for a better one
- ac_cv_path_GREP="$ac_path_GREP"
- ac_path_GREP_max=$ac_count
+ if test $ac_cache; then
+ ac_fn_c_check_header_compile "$LINENO" $ac_header ac_cv_header_$ac_cache "$ac_includes_default"
+ if eval test \"x\$ac_cv_header_$ac_cache\" = xyes; then
+ printf "%s\n" "#define $ac_item 1" >> confdefs.h
 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_GREP_found && break 3
- done
- done
- done
-IFS=$as_save_IFS
- if test -z "$ac_cv_path_GREP"; then
- as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
- fi
-else
- ac_cv_path_GREP=$GREP
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
-$as_echo "$ac_cv_path_GREP" >&6; }
- GREP="$ac_cv_path_GREP"
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
-$as_echo_n "checking for egrep... " >&6; }
-if ${ac_cv_path_EGREP+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
- then ac_cv_path_EGREP="$GREP -E"
- else
- if test -z "$EGREP"; then
- ac_path_EGREP_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$PATH_SEPARATOR/usr/xpg4/bin
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_prog in egrep; do
- for ac_exec_ext in '' $ac_executable_extensions; do
- ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
- as_fn_executable_p "$ac_path_EGREP" || continue
-# Check for GNU ac_path_EGREP and select it if it is found.
- # Check for GNU $ac_path_EGREP
-case `"$ac_path_EGREP" --version 2>&1` in
-*GNU*)
- ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_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 'EGREP' >> "conftest.nl"
- "$ac_path_EGREP" 'EGREP$' < "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_EGREP_max-0}; then
- # Best one so far, save it but keep looking for a better one
- ac_cv_path_EGREP="$ac_path_EGREP"
- ac_path_EGREP_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_EGREP_found && break 3
- done
- done
- done
-IFS=$as_save_IFS
- if test -z "$ac_cv_path_EGREP"; then
- as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+ ac_header= ac_cache=
+ elif test $ac_header; then
+ ac_cache=$ac_item
+ else
+ ac_header=$ac_item
 fi
-else
- ac_cv_path_EGREP=$EGREP
-fi
-
- fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
-$as_echo "$ac_cv_path_EGREP" >&6; }
- EGREP="$ac_cv_path_EGREP"
-
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
-$as_echo_n "checking for ANSI C header files... " >&6; }
-if ${ac_cv_header_stdc+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#include <float.h>
-
-int
-main ()
-{
-
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- ac_cv_header_stdc=yes
-else
- ac_cv_header_stdc=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
-if test $ac_cv_header_stdc = yes; then
- # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <string.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "memchr" >/dev/null 2>&1; then :
-
-else
- ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-fi
-
-if test $ac_cv_header_stdc = yes; then
- # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <stdlib.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "free" >/dev/null 2>&1; then :
+done
 
-else
- ac_cv_header_stdc=no
-fi
-rm -f conftest*
 
-fi
 
-if test $ac_cv_header_stdc = yes; then
- # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
- if test "$cross_compiling" = yes; then :
- :
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <ctype.h>
-#include <stdlib.h>
-#if ((' ' & 0x0FF) == 0x020)
-# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-#else
-# define ISLOWER(c) \
-		 (('a' <= (c) && (c) <= 'i') \
-		 || ('j' <= (c) && (c) <= 'r') \
-		 || ('s' <= (c) && (c) <= 'z'))
-# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
-#endif
 
-#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
-int
-main ()
-{
- int i;
- for (i = 0; i < 256; i++)
- if (XOR (islower (i), ISLOWER (i))
-	|| toupper (i) != TOUPPER (i))
- return 2;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
 
-else
- ac_cv_header_stdc=no
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
- conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
 
-fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
-$as_echo "$ac_cv_header_stdc" >&6; }
-if test $ac_cv_header_stdc = yes; then
 
-$as_echo "#define STDC_HEADERS 1" >>confdefs.h
 
-fi
+if test $ac_cv_header_stdlib_h = yes && test $ac_cv_header_string_h = yes
+then :
 
-# On IRIX 5.3, sys/types and inttypes.h are conflicting.
-for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
-		 inttypes.h stdint.h unistd.h
-do :
- as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
-"
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
- cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
+printf "%s\n" "#define STDC_HEADERS 1" >>confdefs.h
 
 fi
-
-done
-
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5
-$as_echo_n "checking whether byte ordering is bigendian... " >&6; }
-if ${ac_cv_c_bigendian+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_cv_c_bigendian=unknown
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5
+printf %s "checking whether byte ordering is bigendian... " >&6; }
+if test ${ac_cv_c_bigendian+y}
+then :
+ printf %s "(cached) " >&6
+else case e in #(
+ e) ac_cv_c_bigendian=unknown
 # See if we're dealing with a universal compiler.
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
@@ -4371,7 +5044,8 @@
 	 typedef int dummy;
 
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
 
 	# Check for potential -arch flags. It is not universal unless
 	# there are at least two -arch flags with different values.
@@ -4395,7 +5069,7 @@
 	 fi
 done
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 if test $ac_cv_c_bigendian = unknown; then
 # See if sys/param.h defines the BYTE_ORDER macro.
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -4404,10 +5078,10 @@
 	 #include <sys/param.h>
 
 int
-main ()
+main (void)
 {
-#if ! (defined BYTE_ORDER && defined BIG_ENDIAN \
-		 && defined LITTLE_ENDIAN && BYTE_ORDER && BIG_ENDIAN \
+#if ! (defined BYTE_ORDER && defined BIG_ENDIAN \\
+		 && defined LITTLE_ENDIAN && BYTE_ORDER && BIG_ENDIAN \\
 		 && LITTLE_ENDIAN)
 	 bogus endian macros
 	 #endif
@@ -4416,7 +5090,8 @@
 return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
 # It does; now see whether it defined to BIG_ENDIAN or not.
 	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
@@ -4424,7 +5099,7 @@
 		#include <sys/param.h>
 
 int
-main ()
+main (void)
 {
 #if BYTE_ORDER != BIG_ENDIAN
 		 not big endian
@@ -4434,14 +5109,16 @@
 return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
 ac_cv_c_bigendian=yes
-else
- ac_cv_c_bigendian=no
+else case e in #(
+ e) ac_cv_c_bigendian=no ;;
+esac
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 if test $ac_cv_c_bigendian = unknown; then
 # See if <limits.h> defines _LITTLE_ENDIAN or _BIG_ENDIAN (e.g., Solaris).
@@ -4450,7 +5127,7 @@
 #include <limits.h>
 
 int
-main ()
+main (void)
 {
 #if ! (defined _LITTLE_ENDIAN || defined _BIG_ENDIAN)
 	 bogus endian macros
@@ -4460,14 +5137,15 @@
 return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
 # It does; now see whether it defined to _BIG_ENDIAN or not.
 	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 #include <limits.h>
 
 int
-main ()
+main (void)
 {
 #ifndef _BIG_ENDIAN
 		 not big endian
@@ -4477,50 +5155,55 @@
 return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
 ac_cv_c_bigendian=yes
-else
- ac_cv_c_bigendian=no
+else case e in #(
+ e) ac_cv_c_bigendian=no ;;
+esac
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 if test $ac_cv_c_bigendian = unknown; then
 # Compile a test program.
- if test "$cross_compiling" = yes; then :
+ if test "$cross_compiling" = yes
+then :
 # Try to guess by grepping values from an object file.
 	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
-short int ascii_mm =
+unsigned short int ascii_mm =
 		 { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
-		short int ascii_ii =
+		unsigned short int ascii_ii =
 		 { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
 		int use_ascii (int i) {
 		 return ascii_mmi + ascii_iii;
 		}
-		short int ebcdic_ii =
+		unsigned short int ebcdic_ii =
 		 { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
-		short int ebcdic_mm =
+		unsigned short int ebcdic_mm =
 		 { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };
 		int use_ebcdic (int i) {
 		 return ebcdic_mmi + ebcdic_iii;
 		}
-		extern int foo;
-
-int
-main ()
-{
-return use_ascii (foo) == use_ebcdic (foo);
- ;
- return 0;
-}
+		int
+		main (int argc, char **argv)
+		{
+		 /* Intimidate the compiler so that it does not
+		 optimize the arrays away. */
+		 char *p = argv0;
+		 ascii_mm1 = *p++; ebcdic_mm1 = *p++;
+		 ascii_ii1 = *p++; ebcdic_ii1 = *p++;
+		 return use_ascii (argc) == use_ebcdic (*p);
+		}
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- if grep BIGenDianSyS conftest.$ac_objext >/dev/null; then
+if ac_fn_c_try_link "$LINENO"
+then :
+ if grep BIGenDianSyS conftest$ac_exeext >/dev/null; then
 	 ac_cv_c_bigendian=yes
 	 fi
-	 if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then
+	 if grep LiTTleEnDian conftest$ac_exeext >/dev/null ; then
 	 if test "$ac_cv_c_bigendian" = unknown; then
 		ac_cv_c_bigendian=no
 	 else
@@ -4529,13 +5212,14 @@
 	 fi
 	 fi
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
+ conftest$ac_exeext conftest.$ac_ext
+else case e in #(
+ e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 $ac_includes_default
 int
-main ()
+main (void)
 {
 
 	 /* Are we little or big endian? From Harbison&Steele. */
@@ -4551,28 +5235,32 @@
 return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_run "$LINENO"
+then :
 ac_cv_c_bigendian=no
-else
- ac_cv_c_bigendian=yes
+else case e in #(
+ e) ac_cv_c_bigendian=yes ;;
+esac
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
- conftest.$ac_objext conftest.beam conftest.$ac_ext
+ conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 
- fi
+ fi ;;
+esac
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_bigendian" >&5
-$as_echo "$ac_cv_c_bigendian" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_bigendian" >&5
+printf "%s\n" "$ac_cv_c_bigendian" >&6; }
 case $ac_cv_c_bigendian in #(
 yes)
- $as_echo "#define WORDS_BIGENDIAN 1" >>confdefs.h
+ printf "%s\n" "#define WORDS_BIGENDIAN 1" >>confdefs.h
 ;; #(
 no)
 ;; #(
 universal)
 
-$as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h
+printf "%s\n" "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h
 
 ;; #(
 *)
@@ -4581,205 +5269,180 @@
 esac
 
 # Check whether --enable-largefile was given.
-if test "${enable_largefile+set}" = set; then :
+if test ${enable_largefile+y}
+then :
 enableval=$enable_largefile;
 fi
-
-if test "$enable_largefile" != no; then
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for special C compiler options needed for large files" >&5
-$as_echo_n "checking for special C compiler options needed for large files... " >&6; }
-if ${ac_cv_sys_largefile_CC+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_cv_sys_largefile_CC=no
- if test "$GCC" != yes; then
- ac_save_CC=$CC
- while :; do
-	 # IRIX 6.2 and later do not support large files by default,
-	 # so use the C compiler's -n32 option if that helps.
-	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+if test "$enable_largefile,$enable_year2038" != no,no
+then :
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option to enable large file support" >&5
+printf %s "checking for $CC option to enable large file support... " >&6; }
+if test ${ac_cv_sys_largefile_opts+y}
+then :
+ printf %s "(cached) " >&6
+else case e in #(
+ e) ac_save_CC="$CC"
+ ac_opt_found=no
+ for ac_opt in "none needed" "-D_FILE_OFFSET_BITS=64" "-D_LARGE_FILES=1" "-n32"; do
+ if test x"$ac_opt" != x"none needed"
+then :
+ CC="$ac_save_CC $ac_opt"
+fi
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 #include <sys/types.h>
- /* Check that off_t can represent 2**63 - 1 correctly.
- We can't simply define LARGE_OFF_T to be 9223372036854775807,
+#ifndef FTYPE
+# define FTYPE off_t
+#endif
+ /* Check that FTYPE can represent 2**63 - 1 correctly.
+ We can't simply define LARGE_FTYPE to be 9223372036854775807,
 since some C++ compilers masquerading as C compilers
 incorrectly reject 9223372036854775807. */
-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
- int off_t_is_large(LARGE_OFF_T % 2147483629 == 721
-		 && LARGE_OFF_T % 2147483647 == 1)
+#define LARGE_FTYPE (((FTYPE) 1 << 31 << 31) - 1 + ((FTYPE) 1 << 31 << 31))
+ int FTYPE_is_large(LARGE_FTYPE % 2147483629 == 721
+		 && LARGE_FTYPE % 2147483647 == 1)
 		 ? 1 : -1;
 int
-main ()
+main (void)
 {
 
 ;
 return 0;
 }
 _ACEOF
-	 if ac_fn_c_try_compile "$LINENO"; then :
- break
+if ac_fn_c_try_compile "$LINENO"
+then :
+ if test x"$ac_opt" = x"none needed"
+then :
+ # GNU/Linux s390x and alpha need _FILE_OFFSET_BITS=64 for wide ino_t.
+	 CC="$CC -DFTYPE=ino_t"
+	 if ac_fn_c_try_compile "$LINENO"
+then :
+
+else case e in #(
+ e) CC="$CC -D_FILE_OFFSET_BITS=64"
+	 if ac_fn_c_try_compile "$LINENO"
+then :
+ ac_opt='-D_FILE_OFFSET_BITS=64'
 fi
-rm -f core conftest.err conftest.$ac_objext
-	 CC="$CC -n32"
-	 if ac_fn_c_try_compile "$LINENO"; then :
- ac_cv_sys_largefile_CC=' -n32'; break
+rm -f core conftest.err conftest.$ac_objext conftest.beam ;;
+esac
 fi
-rm -f core conftest.err conftest.$ac_objext
-	 break
- done
- CC=$ac_save_CC
- rm -f conftest.$ac_ext
- fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_largefile_CC" >&5
-$as_echo "$ac_cv_sys_largefile_CC" >&6; }
- if test "$ac_cv_sys_largefile_CC" != no; then
- CC=$CC$ac_cv_sys_largefile_CC
- fi
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _FILE_OFFSET_BITS value needed for large files" >&5
-$as_echo_n "checking for _FILE_OFFSET_BITS value needed for large files... " >&6; }
-if ${ac_cv_sys_file_offset_bits+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- while :; do
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <sys/types.h>
- /* Check that off_t can represent 2**63 - 1 correctly.
- We can't simply define LARGE_OFF_T to be 9223372036854775807,
- since some C++ compilers masquerading as C compilers
- incorrectly reject 9223372036854775807. */
-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
- int off_t_is_large(LARGE_OFF_T % 2147483629 == 721
-		 && LARGE_OFF_T % 2147483647 == 1)
-		 ? 1 : -1;
-int
-main ()
-{
-
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- ac_cv_sys_file_offset_bits=no; break
+ ac_cv_sys_largefile_opts=$ac_opt
+ ac_opt_found=yes
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#define _FILE_OFFSET_BITS 64
-#include <sys/types.h>
- /* Check that off_t can represent 2**63 - 1 correctly.
- We can't simply define LARGE_OFF_T to be 9223372036854775807,
- since some C++ compilers masquerading as C compilers
- incorrectly reject 9223372036854775807. */
-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
- int off_t_is_large(LARGE_OFF_T % 2147483629 == 721
-		 && LARGE_OFF_T % 2147483647 == 1)
-		 ? 1 : -1;
-int
-main ()
-{
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+ test $ac_opt_found = no || break
+ done
+ CC="$ac_save_CC"
 
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- ac_cv_sys_file_offset_bits=64; break
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- ac_cv_sys_file_offset_bits=unknown
- break
-done
+ test $ac_opt_found = yes || ac_cv_sys_largefile_opts="support not detected" ;;
+esac
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_file_offset_bits" >&5
-$as_echo "$ac_cv_sys_file_offset_bits" >&6; }
-case $ac_cv_sys_file_offset_bits in #(
- no | unknown) ;;
- *)
-cat >>confdefs.h <<_ACEOF
-#define _FILE_OFFSET_BITS $ac_cv_sys_file_offset_bits
-_ACEOF
-;;
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_largefile_opts" >&5
+printf "%s\n" "$ac_cv_sys_largefile_opts" >&6; }
+
+ac_have_largefile=yes
+case $ac_cv_sys_largefile_opts in #(
+ "none needed") :
+ ;; #(
+ "supported through gnulib") :
+ ;; #(
+ "support not detected") :
+ ac_have_largefile=no ;; #(
+ "-D_FILE_OFFSET_BITS=64") :
+
+printf "%s\n" "#define _FILE_OFFSET_BITS 64" >>confdefs.h
+ ;; #(
+ "-D_LARGE_FILES=1") :
+
+printf "%s\n" "#define _LARGE_FILES 1" >>confdefs.h
+ ;; #(
+ "-n32") :
+ CC="$CC -n32" ;; #(
+ *) :
+ as_fn_error $? "internal error: bad value for \$ac_cv_sys_largefile_opts" "$LINENO" 5 ;;
 esac
-rm -rf conftest*
- if test $ac_cv_sys_file_offset_bits = unknown; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _LARGE_FILES value needed for large files" >&5
-$as_echo_n "checking for _LARGE_FILES value needed for large files... " >&6; }
-if ${ac_cv_sys_large_files+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- while :; do
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include <sys/types.h>
- /* Check that off_t can represent 2**63 - 1 correctly.
- We can't simply define LARGE_OFF_T to be 9223372036854775807,
- since some C++ compilers masquerading as C compilers
- incorrectly reject 9223372036854775807. */
-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
- int off_t_is_large(LARGE_OFF_T % 2147483629 == 721
-		 && LARGE_OFF_T % 2147483647 == 1)
-		 ? 1 : -1;
-int
-main ()
-{
 
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- ac_cv_sys_large_files=no; break
+if test "$enable_year2038" != no
+then :
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $CC option for timestamps after 2038" >&5
+printf %s "checking for $CC option for timestamps after 2038... " >&6; }
+if test ${ac_cv_sys_year2038_opts+y}
+then :
+ printf %s "(cached) " >&6
+else case e in #(
+ e) ac_save_CPPFLAGS="$CPPFLAGS"
+ ac_opt_found=no
+ for ac_opt in "none needed" "-D_TIME_BITS=64" "-D__MINGW_USE_VC2005_COMPAT" "-U_USE_32_BIT_TIME_T -D__MINGW_USE_VC2005_COMPAT"; do
+ if test x"$ac_opt" != x"none needed"
+then :
+ CPPFLAGS="$ac_save_CPPFLAGS $ac_opt"
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
-#define _LARGE_FILES 1
-#include <sys/types.h>
- /* Check that off_t can represent 2**63 - 1 correctly.
- We can't simply define LARGE_OFF_T to be 9223372036854775807,
- since some C++ compilers masquerading as C compilers
- incorrectly reject 9223372036854775807. */
-#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
- int off_t_is_large(LARGE_OFF_T % 2147483629 == 721
-		 && LARGE_OFF_T % 2147483647 == 1)
-		 ? 1 : -1;
+
+ #include <time.h>
+ /* Check that time_t can represent 2**32 - 1 correctly. */
+ #define LARGE_TIME_T \\
+ ((time_t) (((time_t) 1 << 30) - 1 + 3 * ((time_t) 1 << 30)))
+ int verify_time_t_range(LARGE_TIME_T / 65537 == 65535
+ && LARGE_TIME_T % 65537 == 0)
+ ? 1 : -1;
+
 int
-main ()
+main (void)
 {
 
 ;
 return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- ac_cv_sys_large_files=1; break
+if ac_fn_c_try_compile "$LINENO"
+then :
+ ac_cv_sys_year2038_opts="$ac_opt"
+ ac_opt_found=yes
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- ac_cv_sys_large_files=unknown
- break
-done
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_large_files" >&5
-$as_echo "$ac_cv_sys_large_files" >&6; }
-case $ac_cv_sys_large_files in #(
- no | unknown) ;;
- *)
-cat >>confdefs.h <<_ACEOF
-#define _LARGE_FILES $ac_cv_sys_large_files
-_ACEOF
-;;
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+ test $ac_opt_found = no || break
+ done
+ CPPFLAGS="$ac_save_CPPFLAGS"
+ test $ac_opt_found = yes || ac_cv_sys_year2038_opts="support not detected" ;;
 esac
-rm -rf conftest*
- fi
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_year2038_opts" >&5
+printf "%s\n" "$ac_cv_sys_year2038_opts" >&6; }
 
+ac_have_year2038=yes
+case $ac_cv_sys_year2038_opts in #(
+ "none needed") :
+ ;; #(
+ "support not detected") :
+ ac_have_year2038=no ;; #(
+ "-D_TIME_BITS=64") :
+
+printf "%s\n" "#define _TIME_BITS 64" >>confdefs.h
+ ;; #(
+ "-D__MINGW_USE_VC2005_COMPAT") :
+
+printf "%s\n" "#define __MINGW_USE_VC2005_COMPAT 1" >>confdefs.h
+ ;; #(
+ "-U_USE_32_BIT_TIME_T"*) :
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+as_fn_error $? "the 'time_t' type is currently forced to be 32-bit. It
+will stop working after mid-January 2038. Remove
+_USE_32BIT_TIME_T from the compiler flags.
+See 'config.log' for more details" "$LINENO" 5; } ;; #(
+ *) :
+ as_fn_error $? "internal error: bad value for \$ac_cv_sys_year2038_opts" "$LINENO" 5 ;;
+esac
 
 fi
 
+fi
 
 
 
@@ -4792,12 +5455,13 @@
 	if test -n "$ac_tool_prefix"; then
 # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
 set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_PKG_CONFIG+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- case $PKG_CONFIG in
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_path_PKG_CONFIG+y}
+then :
+ printf %s "(cached) " >&6
+else case e in #(
+ e) case $PKG_CONFIG in
 \\/* | ?:\\/*)
 ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
 ;;
@@ -4806,11 +5470,15 @@
 for as_dir in $PATH
 do
 IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
+ case $as_dir in #(((
+ '') as_dir=./ ;;
+ */) ;;
+ *) as_dir=$as_dir/ ;;
+ esac
 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
+ 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"
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
 break 2
 fi
 done
@@ -4818,15 +5486,16 @@
 IFS=$as_save_IFS
 
 ;;
+esac ;;
 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; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+printf "%s\n" "$PKG_CONFIG" >&6; }
 else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -4835,12 +5504,13 @@
 ac_pt_PKG_CONFIG=$PKG_CONFIG
 # 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_ac_pt_PKG_CONFIG+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- case $ac_pt_PKG_CONFIG in
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_path_ac_pt_PKG_CONFIG+y}
+then :
+ printf %s "(cached) " >&6
+else case e in #(
+ e) case $ac_pt_PKG_CONFIG in
 \\/* | ?:\\/*)
 ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
 ;;
@@ -4849,11 +5519,15 @@
 for as_dir in $PATH
 do
 IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
+ case $as_dir in #(((
+ '') as_dir=./ ;;
+ */) ;;
+ *) as_dir=$as_dir/ ;;
+ esac
 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_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+ ac_cv_path_ac_pt_PKG_CONFIG="$as_dir$ac_word$ac_exec_ext"
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
 break 2
 fi
 done
@@ -4861,15 +5535,16 @@
 IFS=$as_save_IFS
 
 ;;
+esac ;;
 esac
 fi
 ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
 if test -n "$ac_pt_PKG_CONFIG"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
-$as_echo "$ac_pt_PKG_CONFIG" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
+printf "%s\n" "$ac_pt_PKG_CONFIG" >&6; }
 else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 if test "x$ac_pt_PKG_CONFIG" = x; then
@@ -4877,8 +5552,8 @@
 else
 case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
 PKG_CONFIG=$ac_pt_PKG_CONFIG
@@ -4890,14 +5565,14 @@
 fi
 if test -n "$PKG_CONFIG"; then
 	_pkg_min_version=0.9.0
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
-$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
+printf %s "checking pkg-config is at least version $_pkg_min_version... " >&6; }
 	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 	else
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 		PKG_CONFIG=""
 	fi
 fi
@@ -4907,8 +5582,8 @@
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking operating system type" >&5
-$as_echo_n "checking operating system type... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking operating system type" >&5
+printf %s "checking operating system type... " >&6; }
 
 HAVE_LINUX=no
 HAVE_MSWINDOWS=no
@@ -4916,23 +5591,23 @@
 
 case "$target" in
 *linux*)
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: Linux" >&5
-$as_echo "Linux" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Linux" >&5
+printf "%s\n" "Linux" >&6; }
 HAVE_LINUX=yes
 ;;
 *mingw*)
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: Windows" >&5
-$as_echo "Windows" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Windows" >&5
+printf "%s\n" "Windows" >&6; }
 HAVE_MSWINDOWS=yes
 ;;
 *darwin*)
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: Darwin" >&5
-$as_echo "Darwin" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Darwin" >&5
+printf "%s\n" "Darwin" >&6; }
 HAVE_DARWIN=yes
 ;;
 *)
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: other UNIX" >&5
-$as_echo "other UNIX" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: other UNIX" >&5
+printf "%s\n" "other UNIX" >&6; }
 ;;
 esac
 
@@ -4947,47 +5622,129 @@
 
 if test "x$GCC" = "xyes"; then
 CFLAGS="$CFLAGS -std=gnu99 -ffast-math -Wall -pipe"
- if test "x$HAVE_DARWIN" = "xyes"; then
- CXXFLAGS="$CXXFLAGS -stdlib=libc++ -std=gnu++11 -ffast-math -Wall -pipe"
- LDFLAGS="$LDFLAGS -lc++ -stdlib=libc++"
- else
- CXXFLAGS="$CXXFLAGS -std=gnu++11 -ffast-math -Wall -pipe"
+ CXXFLAGS="$CXXFLAGS -ffast-math -Wall -pipe"
+
+ # use C++17 if possible (Qt 6 requires it)
+
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the C++ compiler supports -std=gnu++17" >&5
+printf %s "checking whether the C++ compiler supports -std=gnu++17... " >&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
+
+ OLDCXXFLAGS="$CXXFLAGS"
+ CXXFLAGS="$CXXFLAGS -std=gnu++17 -Werror"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+int
+main (void)
+{
+return 0;
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"
+then :
+
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+ CXXFLAGS="$OLDCXXFLAGS -std=gnu++17"
+
+else case e in #(
+ e)
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+ CXXFLAGS="$OLDCXXFLAGS"
+ ;;
+esac
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+ 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 "${CXXFLAGS%gnu++17}" = "$CXXFLAGS" ; then
+ CXXFLAGS="$CXXFLAGS -std=gnu++11"
 fi
 
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C/C++ compiler supports -Wtype-limits" >&5
-$as_echo_n "checking whether the C/C++ compiler supports -Wtype-limits... " >&6; }
+
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the C/C++ compiler supports -Wtype-limits" >&5
+printf %s "checking whether the C/C++ compiler supports -Wtype-limits... " >&6; }
 OLDCFLAGS="$CFLAGS"
 CFLAGS="$CFLAGS -Wtype-limits -Werror"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 
 int
-main ()
+main (void)
 {
 return 0;
 ;
 return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
 
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 CFLAGS="$OLDCFLAGS -Wtype-limits"
 CXXFLAGS="$CXXFLAGS -Wtype-limits"
 
-else
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+else case e in #(
+ e)
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 CFLAGS="$OLDCFLAGS"
+ ;;
+esac
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+
+
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the C/C++ compiler supports -Wno-stringop-truncation" >&5
+printf %s "checking whether the C/C++ compiler supports -Wno-stringop-truncation... " >&6; }
+ OLDCFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS -Wno-stringop-truncation -Werror"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+int
+main (void)
+{
+return 0;
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"
+then :
 
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+ CFLAGS="$OLDCFLAGS -Wno-stringop-truncation"
+ CXXFLAGS="$CXXFLAGS -Wno-stringop-truncation"
+
+else case e in #(
+ e)
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+ CFLAGS="$OLDCFLAGS"
+ ;;
+esac
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 
 
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C++ compiler supports -Woverloaded-virtual" >&5
-$as_echo_n "checking whether the C++ compiler supports -Woverloaded-virtual... " >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the C++ compiler supports -Woverloaded-virtual" >&5
+printf %s "checking whether the C++ compiler supports -Woverloaded-virtual... " >&6; }
 ac_ext=cpp
 ac_cpp='$CXXCPP $CPPFLAGS'
 ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -5000,27 +5757,29 @@
 /* end confdefs.h. */
 
 int
-main ()
+main (void)
 {
 return 0;
 ;
 return 0;
 }
 _ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
+if ac_fn_cxx_try_compile "$LINENO"
+then :
 
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 CXXFLAGS="$OLDCXXFLAGS -Woverloaded-virtual"
 
-else
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+else case e in #(
+ e)
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 CXXFLAGS="$OLDCXXFLAGS"
-
+ ;;
+esac
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -5038,42 +5797,48 @@
 ac_link='$OBJC -o conftest$ac_exeext $OBJCFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_objc_compiler_gnu
 if test -n "$ac_tool_prefix"; then
- for ac_prog in gcc objcc objc cc CC
+ for ac_prog in gcc objcc objc cc CC clang
 do
 # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_OBJC+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test -n "$OBJC"; then
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_OBJC+y}
+then :
+ printf %s "(cached) " >&6
+else case e in #(
+ e) if test -n "$OBJC"; then
 ac_cv_prog_OBJC="$OBJC" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
 IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
+ case $as_dir in #(((
+ '') as_dir=./ ;;
+ */) ;;
+ *) as_dir=$as_dir/ ;;
+ esac
 for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
 ac_cv_prog_OBJC="$ac_tool_prefix$ac_prog"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
 break 2
 fi
 done
 done
 IFS=$as_save_IFS
 
-fi
+fi ;;
+esac
 fi
 OBJC=$ac_cv_prog_OBJC
 if test -n "$OBJC"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJC" >&5
-$as_echo "$OBJC" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $OBJC" >&5
+printf "%s\n" "$OBJC" >&6; }
 else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -5082,42 +5847,48 @@
 fi
 if test -z "$OBJC"; then
 ac_ct_OBJC=$OBJC
- for ac_prog in gcc objcc objc cc CC
+ for ac_prog in gcc objcc objc cc CC clang
 do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_OBJC+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test -n "$ac_ct_OBJC"; then
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_ac_ct_OBJC+y}
+then :
+ printf %s "(cached) " >&6
+else case e in #(
+ e) if test -n "$ac_ct_OBJC"; then
 ac_cv_prog_ac_ct_OBJC="$ac_ct_OBJC" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
 IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
+ case $as_dir in #(((
+ '') as_dir=./ ;;
+ */) ;;
+ *) as_dir=$as_dir/ ;;
+ esac
 for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
 ac_cv_prog_ac_ct_OBJC="$ac_prog"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
 break 2
 fi
 done
 done
 IFS=$as_save_IFS
 
-fi
+fi ;;
+esac
 fi
 ac_ct_OBJC=$ac_cv_prog_ac_ct_OBJC
 if test -n "$ac_ct_OBJC"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJC" >&5
-$as_echo "$ac_ct_OBJC" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJC" >&5
+printf "%s\n" "$ac_ct_OBJC" >&6; }
 else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -5129,8 +5900,8 @@
 else
 case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
 OBJC=$ac_ct_OBJC
@@ -5138,7 +5909,7 @@
 fi
 
 # Provide some information about the compiler.
-$as_echo "$as_me:${as_lineno-$LINENO}: checking for Objective C compiler version" >&5
+printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Objective C compiler version" >&5
 set X $ac_compile
 ac_compiler=$2
 for ac_option in --version -v -V -qversion; do
@@ -5148,7 +5919,7 @@
 *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
+printf "%s\n" "$ac_try_echo"; } >&5
 (eval "$ac_compiler $ac_option >&5") 2>conftest.err
 ac_status=$?
 if test -s conftest.err; then
@@ -5158,20 +5929,21 @@
 cat conftest.er1 >&5
 fi
 rm -f conftest.er1 conftest.err
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }
 done
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU Objective C compiler" >&5
-$as_echo_n "checking whether we are using the GNU Objective C compiler... " >&6; }
-if ${ac_cv_objc_compiler_gnu+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports GNU Objective C" >&5
+printf %s "checking whether the compiler supports GNU Objective C... " >&6; }
+if test ${ac_cv_objc_compiler_gnu+y}
+then :
+ printf %s "(cached) " >&6
+else case e in #(
+ e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 
 int
-main ()
+main (void)
 {
 #ifndef __GNUC__
 choke me
@@ -5181,30 +5953,36 @@
 return 0;
 }
 _ACEOF
-if ac_fn_objc_try_compile "$LINENO"; then :
+if ac_fn_objc_try_compile "$LINENO"
+then :
 ac_compiler_gnu=yes
-else
- ac_compiler_gnu=no
+else case e in #(
+ e) ac_compiler_gnu=no ;;
+esac
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 ac_cv_objc_compiler_gnu=$ac_compiler_gnu
-
+ ;;
+esac
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objc_compiler_gnu" >&5
-$as_echo "$ac_cv_objc_compiler_gnu" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objc_compiler_gnu" >&5
+printf "%s\n" "$ac_cv_objc_compiler_gnu" >&6; }
+ac_compiler_gnu=$ac_cv_objc_compiler_gnu
+
 if test $ac_compiler_gnu = yes; then
 GOBJC=yes
 else
 GOBJC=
 fi
-ac_test_OBJCFLAGS=${OBJCFLAGS+set}
+ac_test_OBJCFLAGS=${OBJCFLAGS+y}
 ac_save_OBJCFLAGS=$OBJCFLAGS
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $OBJC accepts -g" >&5
-$as_echo_n "checking whether $OBJC accepts -g... " >&6; }
-if ${ac_cv_prog_objc_g+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_save_objc_werror_flag=$ac_objc_werror_flag
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $OBJC accepts -g" >&5
+printf %s "checking whether $OBJC accepts -g... " >&6; }
+if test ${ac_cv_prog_objc_g+y}
+then :
+ printf %s "(cached) " >&6
+else case e in #(
+ e) ac_save_objc_werror_flag=$ac_objc_werror_flag
 ac_objc_werror_flag=yes
 ac_cv_prog_objc_g=no
 OBJCFLAGS="-g"
@@ -5212,57 +5990,63 @@
 /* end confdefs.h. */
 
 int
-main ()
+main (void)
 {
 
 ;
 return 0;
 }
 _ACEOF
-if ac_fn_objc_try_compile "$LINENO"; then :
+if ac_fn_objc_try_compile "$LINENO"
+then :
 ac_cv_prog_objc_g=yes
-else
- OBJCFLAGS=""
+else case e in #(
+ e) OBJCFLAGS=""
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 
 int
-main ()
+main (void)
 {
 
 ;
 return 0;
 }
 _ACEOF
-if ac_fn_objc_try_compile "$LINENO"; then :
+if ac_fn_objc_try_compile "$LINENO"
+then :
 
-else
- ac_objc_werror_flag=$ac_save_objc_werror_flag
+else case e in #(
+ e) ac_objc_werror_flag=$ac_save_objc_werror_flag
 	 OBJCFLAGS="-g"
 	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 
 int
-main ()
+main (void)
 {
 
 ;
 return 0;
 }
 _ACEOF
-if ac_fn_objc_try_compile "$LINENO"; then :
+if ac_fn_objc_try_compile "$LINENO"
+then :
 ac_cv_prog_objc_g=yes
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- ac_objc_werror_flag=$ac_save_objc_werror_flag
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+ ac_objc_werror_flag=$ac_save_objc_werror_flag ;;
+esac
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_objc_g" >&5
-$as_echo "$ac_cv_prog_objc_g" >&6; }
-if test "$ac_test_OBJCFLAGS" = set; then
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_objc_g" >&5
+printf "%s\n" "$ac_cv_prog_objc_g" >&6; }
+if test $ac_test_OBJCFLAGS; then
 OBJCFLAGS=$ac_save_OBJCFLAGS
 elif test $ac_cv_prog_objc_g = yes; then
 if test "$GOBJC" = yes; then
@@ -5288,38 +6072,35 @@
 ac_compile='$OBJC -c $OBJCFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$OBJC -o conftest$ac_exeext $OBJCFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_objc_compiler_gnu
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the Objective C preprocessor" >&5
-$as_echo_n "checking how to run the Objective C preprocessor... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to run the Objective C preprocessor" >&5
+printf %s "checking how to run the Objective C preprocessor... " >&6; }
 if test -z "$OBJCPP"; then
- if ${ac_cv_prog_OBJCPP+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- # Double quotes because OBJCPP needs to be expanded
- for OBJCPP in "$OBJC -E" "/lib/cpp"
+ if test ${ac_cv_prog_OBJCPP+y}
+then :
+ printf %s "(cached) " >&6
+else case e in #(
+ e) # Double quotes because $OBJC needs to be expanded
+ for OBJCPP in "$OBJC -E" cpp /lib/cpp
 do
 ac_preproc_ok=false
 for ac_objc_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
+#include <limits.h>
 		 Syntax error
 _ACEOF
-if ac_fn_objc_try_cpp "$LINENO"; then :
+if ac_fn_objc_try_cpp "$LINENO"
+then :
 
-else
- # Broken: fails on valid input.
-continue
+else case e in #(
+ e) # Broken: fails on valid input.
+continue ;;
+esac
 fi
 rm -f conftest.err conftest.i conftest.$ac_ext
 
@@ -5329,56 +6110,56 @@
 /* end confdefs.h. */
 #include <ac_nonexistent.h>
 _ACEOF
-if ac_fn_objc_try_cpp "$LINENO"; then :
+if ac_fn_objc_try_cpp "$LINENO"
+then :
 # Broken: success on invalid input.
 continue
-else
- # Passes both tests.
+else case e in #(
+ e) # Passes both tests.
 ac_preproc_ok=:
-break
+break ;;
+esac
 fi
 rm -f conftest.err conftest.i conftest.$ac_ext
 
 done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+# 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 :
+if $ac_preproc_ok
+then :
 break
 fi
 
 done
 ac_cv_prog_OBJCPP=$OBJCPP
-
+ ;;
+esac
 fi
 OBJCPP=$ac_cv_prog_OBJCPP
 else
 ac_cv_prog_OBJCPP=$OBJCPP
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJCPP" >&5
-$as_echo "$OBJCPP" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $OBJCPP" >&5
+printf "%s\n" "$OBJCPP" >&6; }
 ac_preproc_ok=false
 for ac_objc_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
+#include <limits.h>
 		 Syntax error
 _ACEOF
-if ac_fn_objc_try_cpp "$LINENO"; then :
+if ac_fn_objc_try_cpp "$LINENO"
+then :
 
-else
- # Broken: fails on valid input.
-continue
+else case e in #(
+ e) # Broken: fails on valid input.
+continue ;;
+esac
 fi
 rm -f conftest.err conftest.i conftest.$ac_ext
 
@@ -5388,26 +6169,30 @@
 /* end confdefs.h. */
 #include <ac_nonexistent.h>
 _ACEOF
-if ac_fn_objc_try_cpp "$LINENO"; then :
+if ac_fn_objc_try_cpp "$LINENO"
+then :
 # Broken: success on invalid input.
 continue
-else
- # Passes both tests.
+else case e in #(
+ e) # Passes both tests.
 ac_preproc_ok=:
-break
+break ;;
+esac
 fi
 rm -f conftest.err conftest.i conftest.$ac_ext
 
 done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+# 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 :
+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;}
+else case e in #(
+ e) { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
 as_fn_error $? "Objective C preprocessor \"$OBJCPP\" fails sanity check
-See \`config.log' for more details" "$LINENO" 5; }
+See 'config.log' for more details" "$LINENO" 5; } ;;
+esac
 fi
 
 ac_ext=c
@@ -5426,38 +6211,44 @@
 do
 # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_OBJCXX+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test -n "$OBJCXX"; then
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_OBJCXX+y}
+then :
+ printf %s "(cached) " >&6
+else case e in #(
+ e) if test -n "$OBJCXX"; then
 ac_cv_prog_OBJCXX="$OBJCXX" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
 IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
+ case $as_dir in #(((
+ '') as_dir=./ ;;
+ */) ;;
+ *) as_dir=$as_dir/ ;;
+ esac
 for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
 ac_cv_prog_OBJCXX="$ac_tool_prefix$ac_prog"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
 break 2
 fi
 done
 done
 IFS=$as_save_IFS
 
-fi
+fi ;;
+esac
 fi
 OBJCXX=$ac_cv_prog_OBJCXX
 if test -n "$OBJCXX"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJCXX" >&5
-$as_echo "$OBJCXX" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $OBJCXX" >&5
+printf "%s\n" "$OBJCXX" >&6; }
 else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -5470,38 +6261,44 @@
 do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_OBJCXX+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test -n "$ac_ct_OBJCXX"; then
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_ac_ct_OBJCXX+y}
+then :
+ printf %s "(cached) " >&6
+else case e in #(
+ e) if test -n "$ac_ct_OBJCXX"; then
 ac_cv_prog_ac_ct_OBJCXX="$ac_ct_OBJCXX" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
 IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
+ case $as_dir in #(((
+ '') as_dir=./ ;;
+ */) ;;
+ *) as_dir=$as_dir/ ;;
+ esac
 for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+ if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
 ac_cv_prog_ac_ct_OBJCXX="$ac_prog"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
 break 2
 fi
 done
 done
 IFS=$as_save_IFS
 
-fi
+fi ;;
+esac
 fi
 ac_ct_OBJCXX=$ac_cv_prog_ac_ct_OBJCXX
 if test -n "$ac_ct_OBJCXX"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJCXX" >&5
-$as_echo "$ac_ct_OBJCXX" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJCXX" >&5
+printf "%s\n" "$ac_ct_OBJCXX" >&6; }
 else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
@@ -5513,8 +6310,8 @@
 else
 case $cross_compiling:$ac_tool_warned in
 yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
 OBJCXX=$ac_ct_OBJCXX
@@ -5522,7 +6319,7 @@
 fi
 
 # Provide some information about the compiler.
-$as_echo "$as_me:${as_lineno-$LINENO}: checking for Objective C++ compiler version" >&5
+printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Objective C++ compiler version" >&5
 set X $ac_compile
 ac_compiler=$2
 for ac_option in --version -v -V -qversion; do
@@ -5532,7 +6329,7 @@
 *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
+printf "%s\n" "$ac_try_echo"; } >&5
 (eval "$ac_compiler $ac_option >&5") 2>conftest.err
 ac_status=$?
 if test -s conftest.err; then
@@ -5542,20 +6339,21 @@
 cat conftest.er1 >&5
 fi
 rm -f conftest.er1 conftest.err
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }
 done
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU Objective C++ compiler" >&5
-$as_echo_n "checking whether we are using the GNU Objective C++ compiler... " >&6; }
-if ${ac_cv_objcxx_compiler_gnu+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports GNU Objective C++" >&5
+printf %s "checking whether the compiler supports GNU Objective C++... " >&6; }
+if test ${ac_cv_objcxx_compiler_gnu+y}
+then :
+ printf %s "(cached) " >&6
+else case e in #(
+ e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 
 int
-main ()
+main (void)
 {
 #ifndef __GNUC__
 choke me
@@ -5565,30 +6363,36 @@
 return 0;
 }
 _ACEOF
-if ac_fn_objcxx_try_compile "$LINENO"; then :
+if ac_fn_objcxx_try_compile "$LINENO"
+then :
 ac_compiler_gnu=yes
-else
- ac_compiler_gnu=no
+else case e in #(
+ e) ac_compiler_gnu=no ;;
+esac
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 ac_cv_objcxx_compiler_gnu=$ac_compiler_gnu
-
+ ;;
+esac
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objcxx_compiler_gnu" >&5
-$as_echo "$ac_cv_objcxx_compiler_gnu" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objcxx_compiler_gnu" >&5
+printf "%s\n" "$ac_cv_objcxx_compiler_gnu" >&6; }
+ac_compiler_gnu=$ac_cv_objcxx_compiler_gnu
+
 if test $ac_compiler_gnu = yes; then
 GOBJCXX=yes
 else
 GOBJCXX=
 fi
-ac_test_OBJCXXFLAGS=${OBJCXXFLAGS+set}
+ac_test_OBJCXXFLAGS=${OBJCXXFLAGS+y}
 ac_save_OBJCXXFLAGS=$OBJCXXFLAGS
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $OBJCXX accepts -g" >&5
-$as_echo_n "checking whether $OBJCXX accepts -g... " >&6; }
-if ${ac_cv_prog_objcxx_g+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_save_objcxx_werror_flag=$ac_objcxx_werror_flag
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $OBJCXX accepts -g" >&5
+printf %s "checking whether $OBJCXX accepts -g... " >&6; }
+if test ${ac_cv_prog_objcxx_g+y}
+then :
+ printf %s "(cached) " >&6
+else case e in #(
+ e) ac_save_objcxx_werror_flag=$ac_objcxx_werror_flag
 ac_objcxx_werror_flag=yes
 ac_cv_prog_objcxx_g=no
 OBJCXXFLAGS="-g"
@@ -5596,57 +6400,63 @@
 /* end confdefs.h. */
 
 int
-main ()
+main (void)
 {
 
 ;
 return 0;
 }
 _ACEOF
-if ac_fn_objcxx_try_compile "$LINENO"; then :
+if ac_fn_objcxx_try_compile "$LINENO"
+then :
 ac_cv_prog_objcxx_g=yes
-else
- OBJCXXFLAGS=""
+else case e in #(
+ e) OBJCXXFLAGS=""
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 
 int
-main ()
+main (void)
 {
 
 ;
 return 0;
 }
 _ACEOF
-if ac_fn_objcxx_try_compile "$LINENO"; then :
+if ac_fn_objcxx_try_compile "$LINENO"
+then :
 
-else
- ac_objcxx_werror_flag=$ac_save_objcxx_werror_flag
+else case e in #(
+ e) ac_objcxx_werror_flag=$ac_save_objcxx_werror_flag
 	 OBJCXXFLAGS="-g"
 	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 
 int
-main ()
+main (void)
 {
 
 ;
 return 0;
 }
 _ACEOF
-if ac_fn_objcxx_try_compile "$LINENO"; then :
+if ac_fn_objcxx_try_compile "$LINENO"
+then :
 ac_cv_prog_objcxx_g=yes
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
- ac_objcxx_werror_flag=$ac_save_objcx_werror_flag
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+ ac_objcxx_werror_flag=$ac_save_objcx_werror_flag ;;
+esac
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_objcxx_g" >&5
-$as_echo "$ac_cv_prog_objcxx_g" >&6; }
-if test "$ac_test_OBJCXXFLAGS" = set; then
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_objcxx_g" >&5
+printf "%s\n" "$ac_cv_prog_objcxx_g" >&6; }
+if test $ac_test_OBJCXXFLAGS; then
 OBJCXXFLAGS=$ac_save_OBJCXXFLAGS
 elif test $ac_cv_prog_objcxx_g = yes; then
 if test "$GOBJCXX" = yes; then
@@ -5672,38 +6482,35 @@
 ac_compile='$OBJCXX -c $OBJCXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$OBJCXX -o conftest$ac_exeext $OBJCXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_objcxx_compiler_gnu
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the Objective C++ preprocessor" >&5
-$as_echo_n "checking how to run the Objective C++ preprocessor... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to run the Objective C++ preprocessor" >&5
+printf %s "checking how to run the Objective C++ preprocessor... " >&6; }
 if test -z "$OBJCXXCPP"; then
- if ${ac_cv_prog_OBJCXXCPP+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- # Double quotes because OBJCXXCPP needs to be expanded
- for OBJCXXCPP in "$OBJCXX -E" "/lib/cpp"
+ if test ${ac_cv_prog_OBJCXXCPP+y}
+then :
+ printf %s "(cached) " >&6
+else case e in #(
+ e) # Double quotes because $OBJCXX needs to be expanded
+ for OBJCXXCPP in "$OBJCXX -E" cpp /lib/cpp
 do
 ac_preproc_ok=false
 for ac_objcxx_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
+#include <limits.h>
 		 Syntax error
 _ACEOF
-if ac_fn_objcxx_try_cpp "$LINENO"; then :
+if ac_fn_objcxx_try_cpp "$LINENO"
+then :
 
-else
- # Broken: fails on valid input.
-continue
+else case e in #(
+ e) # Broken: fails on valid input.
+continue ;;
+esac
 fi
 rm -f conftest.err conftest.i conftest.$ac_ext
 
@@ -5713,56 +6520,56 @@
 /* end confdefs.h. */
 #include <ac_nonexistent.h>
 _ACEOF
-if ac_fn_objcxx_try_cpp "$LINENO"; then :
+if ac_fn_objcxx_try_cpp "$LINENO"
+then :
 # Broken: success on invalid input.
 continue
-else
- # Passes both tests.
+else case e in #(
+ e) # Passes both tests.
 ac_preproc_ok=:
-break
+break ;;
+esac
 fi
 rm -f conftest.err conftest.i conftest.$ac_ext
 
 done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+# 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 :
+if $ac_preproc_ok
+then :
 break
 fi
 
 done
 ac_cv_prog_OBJCXXCPP=$OBJCXXCPP
-
+ ;;
+esac
 fi
 OBJCXXCPP=$ac_cv_prog_OBJCXXCPP
 else
 ac_cv_prog_OBJCXXCPP=$OBJCXXCPP
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJCXXCPP" >&5
-$as_echo "$OBJCXXCPP" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $OBJCXXCPP" >&5
+printf "%s\n" "$OBJCXXCPP" >&6; }
 ac_preproc_ok=false
 for ac_objcxx_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
+#include <limits.h>
 		 Syntax error
 _ACEOF
-if ac_fn_objcxx_try_cpp "$LINENO"; then :
+if ac_fn_objcxx_try_cpp "$LINENO"
+then :
 
-else
- # Broken: fails on valid input.
-continue
+else case e in #(
+ e) # Broken: fails on valid input.
+continue ;;
+esac
 fi
 rm -f conftest.err conftest.i conftest.$ac_ext
 
@@ -5772,26 +6579,30 @@
 /* end confdefs.h. */
 #include <ac_nonexistent.h>
 _ACEOF
-if ac_fn_objcxx_try_cpp "$LINENO"; then :
+if ac_fn_objcxx_try_cpp "$LINENO"
+then :
 # Broken: success on invalid input.
 continue
-else
- # Passes both tests.
+else case e in #(
+ e) # Passes both tests.
 ac_preproc_ok=:
-break
+break ;;
+esac
 fi
 rm -f conftest.err conftest.i conftest.$ac_ext
 
 done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+# 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 :
+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;}
+else case e in #(
+ e) { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
 as_fn_error $? "Objective C++ preprocessor \"$OBJCXXCPP\" fails sanity check
-See \`config.log' for more details" "$LINENO" 5; }
+See 'config.log' for more details" "$LINENO" 5; } ;;
+esac
 fi
 
 ac_ext=c
@@ -5801,23 +6612,26 @@
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
- OBJCXXFLAGS="$OBJCXXFLAGS -stdlib=libc++ -std=c++11"
+ OBJCXXFLAGS="$OBJCXXFLAGS -std=c++11"
 fi
 
 if test $HAVE_LINUX = yes ; then
-	LDFLAGS="$LDFLAGS -Wl,-z,defs"
+ LDFLAGS="$LDFLAGS -Wl,-z,defs"
 fi
 
 if test $HAVE_MSWINDOWS = yes ; then
-	CFLAGS="$CFLAGS -march=i686"
+
+printf "%s\n" "#define __USE_MINGW_ANSI_STDIO 1" >>confdefs.h
+
 fi
 
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5
-$as_echo_n "checking whether byte ordering is bigendian... " >&6; }
-if ${ac_cv_c_bigendian+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_cv_c_bigendian=unknown
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5
+printf %s "checking whether byte ordering is bigendian... " >&6; }
+if test ${ac_cv_c_bigendian+y}
+then :
+ printf %s "(cached) " >&6
+else case e in #(
+ e) ac_cv_c_bigendian=unknown
 # See if we're dealing with a universal compiler.
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
@@ -5827,7 +6641,8 @@
 	 typedef int dummy;
 
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
 
 	# Check for potential -arch flags. It is not universal unless
 	# there are at least two -arch flags with different values.
@@ -5851,7 +6666,7 @@
 	 fi
 done
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 if test $ac_cv_c_bigendian = unknown; then
 # See if sys/param.h defines the BYTE_ORDER macro.
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -5860,10 +6675,10 @@
 	 #include <sys/param.h>
 
 int
-main ()
+main (void)
 {
-#if ! (defined BYTE_ORDER && defined BIG_ENDIAN \
-		 && defined LITTLE_ENDIAN && BYTE_ORDER && BIG_ENDIAN \
+#if ! (defined BYTE_ORDER && defined BIG_ENDIAN \\
+		 && defined LITTLE_ENDIAN && BYTE_ORDER && BIG_ENDIAN \\
 		 && LITTLE_ENDIAN)
 	 bogus endian macros
 	 #endif
@@ -5872,7 +6687,8 @@
 return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
 # It does; now see whether it defined to BIG_ENDIAN or not.
 	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
@@ -5880,7 +6696,7 @@
 		#include <sys/param.h>
 
 int
-main ()
+main (void)
 {
 #if BYTE_ORDER != BIG_ENDIAN
 		 not big endian
@@ -5890,14 +6706,16 @@
 return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
 ac_cv_c_bigendian=yes
-else
- ac_cv_c_bigendian=no
+else case e in #(
+ e) ac_cv_c_bigendian=no ;;
+esac
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 if test $ac_cv_c_bigendian = unknown; then
 # See if <limits.h> defines _LITTLE_ENDIAN or _BIG_ENDIAN (e.g., Solaris).
@@ -5906,7 +6724,7 @@
 #include <limits.h>
 
 int
-main ()
+main (void)
 {
 #if ! (defined _LITTLE_ENDIAN || defined _BIG_ENDIAN)
 	 bogus endian macros
@@ -5916,14 +6734,15 @@
 return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
 # It does; now see whether it defined to _BIG_ENDIAN or not.
 	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 #include <limits.h>
 
 int
-main ()
+main (void)
 {
 #ifndef _BIG_ENDIAN
 		 not big endian
@@ -5933,50 +6752,55 @@
 return 0;
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_compile "$LINENO"
+then :
 ac_cv_c_bigendian=yes
-else
- ac_cv_c_bigendian=no
+else case e in #(
+ e) ac_cv_c_bigendian=no ;;
+esac
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
 fi
 if test $ac_cv_c_bigendian = unknown; then
 # Compile a test program.
- if test "$cross_compiling" = yes; then :
+ if test "$cross_compiling" = yes
+then :
 # Try to guess by grepping values from an object file.
 	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
-short int ascii_mm =
+unsigned short int ascii_mm =
 		 { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
-		short int ascii_ii =
+		unsigned short int ascii_ii =
 		 { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
 		int use_ascii (int i) {
 		 return ascii_mmi + ascii_iii;
 		}
-		short int ebcdic_ii =
+		unsigned short int ebcdic_ii =
 		 { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
-		short int ebcdic_mm =
+		unsigned short int ebcdic_mm =
 		 { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };
 		int use_ebcdic (int i) {
 		 return ebcdic_mmi + ebcdic_iii;
 		}
-		extern int foo;
-
-int
-main ()
-{
-return use_ascii (foo) == use_ebcdic (foo);
- ;
- return 0;
-}
+		int
+		main (int argc, char **argv)
+		{
+		 /* Intimidate the compiler so that it does not
+		 optimize the arrays away. */
+		 char *p = argv0;
+		 ascii_mm1 = *p++; ebcdic_mm1 = *p++;
+		 ascii_ii1 = *p++; ebcdic_ii1 = *p++;
+		 return use_ascii (argc) == use_ebcdic (*p);
+		}
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- if grep BIGenDianSyS conftest.$ac_objext >/dev/null; then
+if ac_fn_c_try_link "$LINENO"
+then :
+ if grep BIGenDianSyS conftest$ac_exeext >/dev/null; then
 	 ac_cv_c_bigendian=yes
 	 fi
-	 if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then
+	 if grep LiTTleEnDian conftest$ac_exeext >/dev/null ; then
 	 if test "$ac_cv_c_bigendian" = unknown; then
 		ac_cv_c_bigendian=no
 	 else
@@ -5985,13 +6809,14 @@
 	 fi
 	 fi
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
+ conftest$ac_exeext conftest.$ac_ext
+else case e in #(
+ e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 $ac_includes_default
 int
-main ()
+main (void)
 {
 
 	 /* Are we little or big endian? From Harbison&Steele. */
@@ -6007,19 +6832,23 @@
 return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_run "$LINENO"
+then :
 ac_cv_c_bigendian=no
-else
- ac_cv_c_bigendian=yes
+else case e in #(
+ e) ac_cv_c_bigendian=yes ;;
+esac
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
- conftest.$ac_objext conftest.beam conftest.$ac_ext
+ conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 
- fi
+ fi ;;
+esac
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_bigendian" >&5
-$as_echo "$ac_cv_c_bigendian" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_bigendian" >&5
+printf "%s\n" "$ac_cv_c_bigendian" >&6; }
 case $ac_cv_c_bigendian in #(
 yes)
 BIGENDIAN=1;; #(
@@ -6044,30 +6873,29 @@
 as_fn_error $? "Unknown syntax for EXPORT keyword" "$LINENO" 5
 fi
 
-cat >>confdefs.h <<_ACEOF
-#define EXPORT $EXPORT
-_ACEOF
+printf "%s\n" "#define EXPORT $EXPORT" >>confdefs.h
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5
-$as_echo_n "checking whether ln -s works... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5
+printf %s "checking whether ln -s works... " >&6; }
 LN_S=$as_ln_s
 if test "$LN_S" = "ln -s"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5
-$as_echo "no, using $LN_S" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5
+printf "%s\n" "no, using $LN_S" >&6; }
 fi
 
 # Extract the first word of "rm", so it can be a program name with args.
 set dummy rm; 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_RM+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- case $RM in
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_path_RM+y}
+then :
+ printf %s "(cached) " >&6
+else case e in #(
+ e) case $RM in
 \\/* | ?:\\/*)
 ac_cv_path_RM="$RM" # Let the user override the test with a path.
 ;;
@@ -6076,11 +6904,15 @@
 for as_dir in $PATH
 do
 IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
+ case $as_dir in #(((
+ '') as_dir=./ ;;
+ */) ;;
+ *) as_dir=$as_dir/ ;;
+ esac
 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_RM="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+ ac_cv_path_RM="$as_dir$ac_word$ac_exec_ext"
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
 break 2
 fi
 done
@@ -6088,26 +6920,28 @@
 IFS=$as_save_IFS
 
 ;;
+esac ;;
 esac
 fi
 RM=$ac_cv_path_RM
 if test -n "$RM"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RM" >&5
-$as_echo "$RM" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $RM" >&5
+printf "%s\n" "$RM" >&6; }
 else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
 # Extract the first word of "mv", so it can be a program name with args.
 set dummy mv; 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_MV+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- case $MV in
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_path_MV+y}
+then :
+ printf %s "(cached) " >&6
+else case e in #(
+ e) case $MV in
 \\/* | ?:\\/*)
 ac_cv_path_MV="$MV" # Let the user override the test with a path.
 ;;
@@ -6116,11 +6950,15 @@
 for as_dir in $PATH
 do
 IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
+ case $as_dir in #(((
+ '') as_dir=./ ;;
+ */) ;;
+ *) as_dir=$as_dir/ ;;
+ esac
 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_MV="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+ ac_cv_path_MV="$as_dir$ac_word$ac_exec_ext"
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
 break 2
 fi
 done
@@ -6128,26 +6966,28 @@
 IFS=$as_save_IFS
 
 ;;
+esac ;;
 esac
 fi
 MV=$ac_cv_path_MV
 if test -n "$MV"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MV" >&5
-$as_echo "$MV" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MV" >&5
+printf "%s\n" "$MV" >&6; }
 else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
 # Extract the first word of "cp", so it can be a program name with args.
 set dummy cp; 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_CP+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- case $CP in
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_path_CP+y}
+then :
+ printf %s "(cached) " >&6
+else case e in #(
+ e) case $CP in
 \\/* | ?:\\/*)
 ac_cv_path_CP="$CP" # Let the user override the test with a path.
 ;;
@@ -6156,11 +6996,15 @@
 for as_dir in $PATH
 do
 IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
+ case $as_dir in #(((
+ '') as_dir=./ ;;
+ */) ;;
+ *) as_dir=$as_dir/ ;;
+ esac
 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_CP="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+ ac_cv_path_CP="$as_dir$ac_word$ac_exec_ext"
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
 break 2
 fi
 done
@@ -6168,26 +7012,29 @@
 IFS=$as_save_IFS
 
 ;;
+esac ;;
 esac
 fi
 CP=$ac_cv_path_CP
 if test -n "$CP"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CP" >&5
-$as_echo "$CP" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CP" >&5
+printf "%s\n" "$CP" >&6; }
 else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
-# Extract the first word of "ar", so it can be a program name with args.
-set dummy ar; 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_AR+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- case $AR in
+if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
+set dummy ${ac_tool_prefix}ar; ac_word=$2
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_path_AR+y}
+then :
+ printf %s "(cached) " >&6
+else case e in #(
+ e) case $AR in
 \\/* | ?:\\/*)
 ac_cv_path_AR="$AR" # Let the user override the test with a path.
 ;;
@@ -6196,11 +7043,15 @@
 for as_dir in $PATH
 do
 IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
+ case $as_dir in #(((
+ '') as_dir=./ ;;
+ */) ;;
+ *) as_dir=$as_dir/ ;;
+ esac
 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_AR="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+ ac_cv_path_AR="$as_dir$ac_word$ac_exec_ext"
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
 break 2
 fi
 done
@@ -6208,26 +7059,92 @@
 IFS=$as_save_IFS
 
 ;;
+esac ;;
 esac
 fi
 AR=$ac_cv_path_AR
 if test -n "$AR"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
-$as_echo "$AR" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
+printf "%s\n" "$AR" >&6; }
 else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
-# Extract the first word of "ranlib", so it can be a program name with args.
-set dummy ranlib; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_RANLIB+:} false; then :
- $as_echo_n "(cached) " >&6
+fi
+if test -z "$ac_cv_path_AR"; then
+ ac_pt_AR=$AR
+ # Extract the first word of "ar", so it can be a program name with args.
+set dummy ar; ac_word=$2
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_path_ac_pt_AR+y}
+then :
+ printf %s "(cached) " >&6
+else case e in #(
+ e) case $ac_pt_AR in
+ \\/* | ?:\\/*)
+ ac_cv_path_ac_pt_AR="$ac_pt_AR" # 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
+ case $as_dir in #(((
+ '') as_dir=./ ;;
+ */) ;;
+ *) as_dir=$as_dir/ ;;
+ esac
+ 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_ac_pt_AR="$as_dir$ac_word$ac_exec_ext"
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+ ;;
+esac ;;
+esac
+fi
+ac_pt_AR=$ac_cv_path_ac_pt_AR
+if test -n "$ac_pt_AR"; then
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_pt_AR" >&5
+printf "%s\n" "$ac_pt_AR" >&6; }
+else
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+fi
+
+ if test "x$ac_pt_AR" = x; then
+ AR=""
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+ AR=$ac_pt_AR
+ fi
 else
- case $RANLIB in
+ AR="$ac_cv_path_AR"
+fi
+
+if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
+set dummy ${ac_tool_prefix}ranlib; ac_word=$2
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_path_RANLIB+y}
+then :
+ printf %s "(cached) " >&6
+else case e in #(
+ e) case $RANLIB in
 \\/* | ?:\\/*)
 ac_cv_path_RANLIB="$RANLIB" # Let the user override the test with a path.
 ;;
@@ -6236,11 +7153,15 @@
 for as_dir in $PATH
 do
 IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
+ case $as_dir in #(((
+ '') as_dir=./ ;;
+ */) ;;
+ *) as_dir=$as_dir/ ;;
+ esac
 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_RANLIB="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+ ac_cv_path_RANLIB="$as_dir$ac_word$ac_exec_ext"
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
 break 2
 fi
 done
@@ -6248,39 +7169,109 @@
 IFS=$as_save_IFS
 
 ;;
+esac ;;
 esac
 fi
 RANLIB=$ac_cv_path_RANLIB
 if test -n "$RANLIB"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
-$as_echo "$RANLIB" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5
+printf "%s\n" "$RANLIB" >&6; }
 else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
-# Extract the first word of "windres", so it can be a program name with args.
-set dummy windres; 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_WINDRES+:} false; then :
- $as_echo_n "(cached) " >&6
+fi
+if test -z "$ac_cv_path_RANLIB"; then
+ ac_pt_RANLIB=$RANLIB
+ # Extract the first word of "ranlib", so it can be a program name with args.
+set dummy ranlib; ac_word=$2
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_path_ac_pt_RANLIB+y}
+then :
+ printf %s "(cached) " >&6
+else case e in #(
+ e) case $ac_pt_RANLIB in
+ \\/* | ?:\\/*)
+ ac_cv_path_ac_pt_RANLIB="$ac_pt_RANLIB" # 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
+ case $as_dir in #(((
+ '') as_dir=./ ;;
+ */) ;;
+ *) as_dir=$as_dir/ ;;
+ esac
+ 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_ac_pt_RANLIB="$as_dir$ac_word$ac_exec_ext"
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+ ;;
+esac ;;
+esac
+fi
+ac_pt_RANLIB=$ac_cv_path_ac_pt_RANLIB
+if test -n "$ac_pt_RANLIB"; then
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_pt_RANLIB" >&5
+printf "%s\n" "$ac_pt_RANLIB" >&6; }
+else
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+fi
+
+ if test "x$ac_pt_RANLIB" = x; then
+ RANLIB=""
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+ RANLIB=$ac_pt_RANLIB
+ fi
 else
- case $WINDRES in
+ RANLIB="$ac_cv_path_RANLIB"
+fi
+
+if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}windres", so it can be a program name with args.
+set dummy ${ac_tool_prefix}windres; ac_word=$2
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_path_RC+y}
+then :
+ printf %s "(cached) " >&6
+else case e in #(
+ e) case $RC in
 \\/* | ?:\\/*)
- ac_cv_path_WINDRES="$WINDRES" # Let the user override the test with a path.
+ ac_cv_path_RC="$RC" # 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=.
+ case $as_dir in #(((
+ '') as_dir=./ ;;
+ */) ;;
+ *) as_dir=$as_dir/ ;;
+ esac
 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_WINDRES="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+ ac_cv_path_RC="$as_dir$ac_word$ac_exec_ext"
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
 break 2
 fi
 done
@@ -6288,71 +7279,146 @@
 IFS=$as_save_IFS
 
 ;;
+esac ;;
 esac
 fi
-WINDRES=$ac_cv_path_WINDRES
-if test -n "$WINDRES"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $WINDRES" >&5
-$as_echo "$WINDRES" >&6; }
+RC=$ac_cv_path_RC
+if test -n "$RC"; then
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $RC" >&5
+printf "%s\n" "$RC" >&6; }
 else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
+fi
+if test -z "$ac_cv_path_RC"; then
+ ac_pt_RC=$RC
+ # Extract the first word of "windres", so it can be a program name with args.
+set dummy windres; ac_word=$2
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_path_ac_pt_RC+y}
+then :
+ printf %s "(cached) " >&6
+else case e in #(
+ e) case $ac_pt_RC in
+ \\/* | ?:\\/*)
+ ac_cv_path_ac_pt_RC="$ac_pt_RC" # 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
+ case $as_dir in #(((
+ '') as_dir=./ ;;
+ */) ;;
+ *) as_dir=$as_dir/ ;;
+ esac
+ 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_ac_pt_RC="$as_dir$ac_word$ac_exec_ext"
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+ ;;
+esac ;;
+esac
+fi
+ac_pt_RC=$ac_cv_path_ac_pt_RC
+if test -n "$ac_pt_RC"; then
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_pt_RC" >&5
+printf "%s\n" "$ac_pt_RC" >&6; }
+else
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing pthread_create" >&5
-$as_echo_n "checking for library containing pthread_create... " >&6; }
-if ${ac_cv_search_pthread_create+:} false; then :
- $as_echo_n "(cached) " >&6
+ if test "x$ac_pt_RC" = x; then
+ RC=""
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+ RC=$ac_pt_RC
+ fi
 else
- ac_func_search_save_LIBS=$LIBS
+ RC="$ac_cv_path_RC"
+fi
+
+
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing pthread_create" >&5
+printf %s "checking for library containing pthread_create... " >&6; }
+if test ${ac_cv_search_pthread_create+y}
+then :
+ printf %s "(cached) " >&6
+else case e in #(
+ e) ac_func_search_save_LIBS=$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. */
+ builtin and then its argument prototype would still apply.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
 #ifdef __cplusplus
 extern "C"
 #endif
-char pthread_create ();
+char pthread_create (void);
 int
-main ()
+main (void)
 {
 return pthread_create ();
 ;
 return 0;
 }
 _ACEOF
-for ac_lib in '' pthread; do
+for ac_lib in '' pthread
+do
 if test -z "$ac_lib"; then
 ac_res="none required"
 else
 ac_res=-l$ac_lib
 LIBS="-l$ac_lib $ac_func_search_save_LIBS"
 fi
- if ac_fn_c_try_link "$LINENO"; then :
+ if ac_fn_c_try_link "$LINENO"
+then :
 ac_cv_search_pthread_create=$ac_res
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
 conftest$ac_exeext
- if ${ac_cv_search_pthread_create+:} false; then :
+ if test ${ac_cv_search_pthread_create+y}
+then :
 break
 fi
 done
-if ${ac_cv_search_pthread_create+:} false; then :
+if test ${ac_cv_search_pthread_create+y}
+then :
 
-else
- ac_cv_search_pthread_create=no
+else case e in #(
+ e) ac_cv_search_pthread_create=no ;;
+esac
 fi
 rm conftest.$ac_ext
-LIBS=$ac_func_search_save_LIBS
+LIBS=$ac_func_search_save_LIBS ;;
+esac
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_pthread_create" >&5
-$as_echo "$ac_cv_search_pthread_create" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_pthread_create" >&5
+printf "%s\n" "$ac_cv_search_pthread_create" >&6; }
 ac_res=$ac_cv_search_pthread_create
-if test "$ac_res" != no; then :
+if test "$ac_res" != no
+then :
 test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
 
 fi
@@ -6361,17 +7427,17 @@
 
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GLIB" >&5
-$as_echo_n "checking for GLIB... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for glib-2.0 >= 2.32" >&5
+printf %s "checking for glib-2.0 >= 2.32... " >&6; }
 
 if test -n "$GLIB_CFLAGS"; then
 pkg_cv_GLIB_CFLAGS="$GLIB_CFLAGS"
 elif test -n "$PKG_CONFIG"; then
 if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.32\""; } >&5
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.32\""; } >&5
 ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.32") 2>&5
 ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
 pkg_cv_GLIB_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 2.32" 2>/dev/null`
 		 test "x$?" != "x0" && pkg_failed=yes
@@ -6385,10 +7451,10 @@
 pkg_cv_GLIB_LIBS="$GLIB_LIBS"
 elif test -n "$PKG_CONFIG"; then
 if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.32\""; } >&5
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.32\""; } >&5
 ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.32") 2>&5
 ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
 pkg_cv_GLIB_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.32" 2>/dev/null`
 		 test "x$?" != "x0" && pkg_failed=yes
@@ -6402,8 +7468,8 @@
 
 
 if test $pkg_failed = yes; then
- 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
 _pkg_short_errors_supported=yes
@@ -6411,14 +7477,14 @@
 _pkg_short_errors_supported=no
 fi
 if test $_pkg_short_errors_supported = yes; then
-	 GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "glib-2.0 >= 2.32" 2>&1`
+ GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "glib-2.0 >= 2.32" 2>&1`
 else
-	 GLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "glib-2.0 >= 2.32" 2>&1`
+ GLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "glib-2.0 >= 2.32" 2>&1`
 fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$GLIB_PKG_ERRORS" >&5
+ # Put the nasty error message in config.log where it belongs
+ echo "$GLIB_PKG_ERRORS" >&5
 
-	as_fn_error $? "Package requirements (glib-2.0 >= 2.32) were not met:
+ as_fn_error $? "Package requirements (glib-2.0 >= 2.32) were not met:
 
 $GLIB_PKG_ERRORS
 
@@ -6429,10 +7495,10 @@
 and GLIB_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; }
-	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf "%s\n" "$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.
@@ -6442,27 +7508,27 @@
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5; }
+See 'config.log' for more details" "$LINENO" 5; }
 else
-	GLIB_CFLAGS=$pkg_cv_GLIB_CFLAGS
-	GLIB_LIBS=$pkg_cv_GLIB_LIBS
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+ GLIB_CFLAGS=$pkg_cv_GLIB_CFLAGS
+ GLIB_LIBS=$pkg_cv_GLIB_LIBS
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
 fi
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GMODULE" >&5
-$as_echo_n "checking for GMODULE... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for gmodule-2.0 >= 2.32" >&5
+printf %s "checking for gmodule-2.0 >= 2.32... " >&6; }
 
 if test -n "$GMODULE_CFLAGS"; then
 pkg_cv_GMODULE_CFLAGS="$GMODULE_CFLAGS"
 elif test -n "$PKG_CONFIG"; then
 if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gmodule-2.0 >= 2.32\""; } >&5
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gmodule-2.0 >= 2.32\""; } >&5
 ($PKG_CONFIG --exists --print-errors "gmodule-2.0 >= 2.32") 2>&5
 ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
 pkg_cv_GMODULE_CFLAGS=`$PKG_CONFIG --cflags "gmodule-2.0 >= 2.32" 2>/dev/null`
 		 test "x$?" != "x0" && pkg_failed=yes
@@ -6476,10 +7542,10 @@
 pkg_cv_GMODULE_LIBS="$GMODULE_LIBS"
 elif test -n "$PKG_CONFIG"; then
 if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gmodule-2.0 >= 2.32\""; } >&5
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gmodule-2.0 >= 2.32\""; } >&5
 ($PKG_CONFIG --exists --print-errors "gmodule-2.0 >= 2.32") 2>&5
 ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
 pkg_cv_GMODULE_LIBS=`$PKG_CONFIG --libs "gmodule-2.0 >= 2.32" 2>/dev/null`
 		 test "x$?" != "x0" && pkg_failed=yes
@@ -6493,8 +7559,8 @@
 
 
 if test $pkg_failed = yes; then
- 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
 _pkg_short_errors_supported=yes
@@ -6502,14 +7568,14 @@
 _pkg_short_errors_supported=no
 fi
 if test $_pkg_short_errors_supported = yes; then
-	 GMODULE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gmodule-2.0 >= 2.32" 2>&1`
+ GMODULE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gmodule-2.0 >= 2.32" 2>&1`
 else
-	 GMODULE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gmodule-2.0 >= 2.32" 2>&1`
+ GMODULE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gmodule-2.0 >= 2.32" 2>&1`
 fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$GMODULE_PKG_ERRORS" >&5
+ # Put the nasty error message in config.log where it belongs
+ echo "$GMODULE_PKG_ERRORS" >&5
 
-	as_fn_error $? "Package requirements (gmodule-2.0 >= 2.32) were not met:
+ as_fn_error $? "Package requirements (gmodule-2.0 >= 2.32) were not met:
 
 $GMODULE_PKG_ERRORS
 
@@ -6520,10 +7586,10 @@
 and GMODULE_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; }
-	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf "%s\n" "$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.
@@ -6533,40 +7599,151 @@
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5; }
+See 'config.log' for more details" "$LINENO" 5; }
 else
-	GMODULE_CFLAGS=$pkg_cv_GMODULE_CFLAGS
-	GMODULE_LIBS=$pkg_cv_GMODULE_LIBS
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+ GMODULE_CFLAGS=$pkg_cv_GMODULE_CFLAGS
+ GMODULE_LIBS=$pkg_cv_GMODULE_LIBS
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
 fi
 
 
+printf "%s\n" "#define GLIB_VERSION_MIN_REQUIRED GLIB_VERSION_2_32" >>confdefs.h
+
+
+
 # Check whether --enable-gtk was given.
-if test "${enable_gtk+set}" = set; then :
+if test ${enable_gtk+y}
+then :
 enableval=$enable_gtk; USE_GTK=$enableval
+else case e in #(
+ e) USE_GTK=yes ;;
+esac
+fi
+
+
+# Check whether --enable-gtk2 was given.
+if test ${enable_gtk2+y}
+then :
+ enableval=$enable_gtk2; USE_GTK2=$enableval
+else case e in #(
+ e) USE_GTK2=no ;;
+esac
+fi
+
+
+if test $USE_GTK2 = yes ; then
+
+pkg_failed=no
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for gtk+-2.0 >= 2.24" >&5
+printf %s "checking for gtk+-2.0 >= 2.24... " >&6; }
+
+if test -n "$GTK_CFLAGS"; then
+ pkg_cv_GTK_CFLAGS="$GTK_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= 2.24\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= 2.24") 2>&5
+ ac_status=$?
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_GTK_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= 2.24" 2>/dev/null`
+		 test "x$?" != "x0" && pkg_failed=yes
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+if test -n "$GTK_LIBS"; then
+ pkg_cv_GTK_LIBS="$GTK_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= 2.24\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= 2.24") 2>&5
+ ac_status=$?
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_GTK_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= 2.24" 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
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
 else
- USE_GTK=yes
+ _pkg_short_errors_supported=no
 fi
+ if test $_pkg_short_errors_supported = yes; then
+ GTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gtk+-2.0 >= 2.24" 2>&1`
+ else
+ GTK_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gtk+-2.0 >= 2.24" 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$GTK_PKG_ERRORS" >&5
 
+ as_fn_error $? "Package requirements (gtk+-2.0 >= 2.24) were not met:
 
-if test $USE_GTK = yes ; then
+$GTK_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 GTK_CFLAGS
+and GTK_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
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf "%s\n" "$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 GTK_CFLAGS
+and GTK_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
+ GTK_CFLAGS=$pkg_cv_GTK_CFLAGS
+ GTK_LIBS=$pkg_cv_GTK_LIBS
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+
+fi
+
+printf "%s\n" "#define USE_GTK 1" >>confdefs.h
+
+elif test $USE_GTK = yes ; then
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTK" >&5
-$as_echo_n "checking for GTK... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for gtk+-3.0 >= 3.18" >&5
+printf %s "checking for gtk+-3.0 >= 3.18... " >&6; }
 
 if test -n "$GTK_CFLAGS"; then
 pkg_cv_GTK_CFLAGS="$GTK_CFLAGS"
 elif test -n "$PKG_CONFIG"; then
 if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-3.0 >= 3.4\""; } >&5
- ($PKG_CONFIG --exists --print-errors "gtk+-3.0 >= 3.4") 2>&5
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-3.0 >= 3.18\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "gtk+-3.0 >= 3.18") 2>&5
 ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
- pkg_cv_GTK_CFLAGS=`$PKG_CONFIG --cflags "gtk+-3.0 >= 3.4" 2>/dev/null`
+ pkg_cv_GTK_CFLAGS=`$PKG_CONFIG --cflags "gtk+-3.0 >= 3.18" 2>/dev/null`
 		 test "x$?" != "x0" && pkg_failed=yes
 else
 pkg_failed=yes
@@ -6578,12 +7755,12 @@
 pkg_cv_GTK_LIBS="$GTK_LIBS"
 elif test -n "$PKG_CONFIG"; then
 if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-3.0 >= 3.4\""; } >&5
- ($PKG_CONFIG --exists --print-errors "gtk+-3.0 >= 3.4") 2>&5
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-3.0 >= 3.18\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "gtk+-3.0 >= 3.18") 2>&5
 ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
- pkg_cv_GTK_LIBS=`$PKG_CONFIG --libs "gtk+-3.0 >= 3.4" 2>/dev/null`
+ pkg_cv_GTK_LIBS=`$PKG_CONFIG --libs "gtk+-3.0 >= 3.18" 2>/dev/null`
 		 test "x$?" != "x0" && pkg_failed=yes
 else
 pkg_failed=yes
@@ -6595,8 +7772,8 @@
 
 
 if test $pkg_failed = yes; then
- 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
 _pkg_short_errors_supported=yes
@@ -6604,14 +7781,14 @@
 _pkg_short_errors_supported=no
 fi
 if test $_pkg_short_errors_supported = yes; then
-	 GTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gtk+-3.0 >= 3.4" 2>&1`
+ GTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gtk+-3.0 >= 3.18" 2>&1`
 else
-	 GTK_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gtk+-3.0 >= 3.4" 2>&1`
+ GTK_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gtk+-3.0 >= 3.18" 2>&1`
 fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$GTK_PKG_ERRORS" >&5
+ # Put the nasty error message in config.log where it belongs
+ echo "$GTK_PKG_ERRORS" >&5
 
-	as_fn_error $? "Package requirements (gtk+-3.0 >= 3.4) were not met:
+ as_fn_error $? "Package requirements (gtk+-3.0 >= 3.18) were not met:
 
 $GTK_PKG_ERRORS
 
@@ -6622,10 +7799,10 @@
 and GTK_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; }
-	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf "%s\n" "$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.
@@ -6635,35 +7812,39 @@
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5; }
+See 'config.log' for more details" "$LINENO" 5; }
 else
-	GTK_CFLAGS=$pkg_cv_GTK_CFLAGS
-	GTK_LIBS=$pkg_cv_GTK_LIBS
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+ GTK_CFLAGS=$pkg_cv_GTK_CFLAGS
+ GTK_LIBS=$pkg_cv_GTK_LIBS
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
 fi
 
-$as_echo "#define USE_GTK 1" >>confdefs.h
+printf "%s\n" "#define USE_GTK 1" >>confdefs.h
+
+
+printf "%s\n" "#define USE_GTK3 1" >>confdefs.h
 
 fi
 
 
 
+
 if test $HAVE_MSWINDOWS = yes ; then
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GIO" >&5
-$as_echo_n "checking for GIO... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for gio-2.0 >= 2.32" >&5
+printf %s "checking for gio-2.0 >= 2.32... " >&6; }
 
 if test -n "$GIO_CFLAGS"; then
 pkg_cv_GIO_CFLAGS="$GIO_CFLAGS"
 elif test -n "$PKG_CONFIG"; then
 if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gio-2.0 >= 2.32\""; } >&5
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gio-2.0 >= 2.32\""; } >&5
 ($PKG_CONFIG --exists --print-errors "gio-2.0 >= 2.32") 2>&5
 ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
 pkg_cv_GIO_CFLAGS=`$PKG_CONFIG --cflags "gio-2.0 >= 2.32" 2>/dev/null`
 		 test "x$?" != "x0" && pkg_failed=yes
@@ -6677,10 +7858,10 @@
 pkg_cv_GIO_LIBS="$GIO_LIBS"
 elif test -n "$PKG_CONFIG"; then
 if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gio-2.0 >= 2.32\""; } >&5
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gio-2.0 >= 2.32\""; } >&5
 ($PKG_CONFIG --exists --print-errors "gio-2.0 >= 2.32") 2>&5
 ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
 pkg_cv_GIO_LIBS=`$PKG_CONFIG --libs "gio-2.0 >= 2.32" 2>/dev/null`
 		 test "x$?" != "x0" && pkg_failed=yes
@@ -6694,8 +7875,8 @@
 
 
 if test $pkg_failed = yes; then
- 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
 _pkg_short_errors_supported=yes
@@ -6703,14 +7884,14 @@
 _pkg_short_errors_supported=no
 fi
 if test $_pkg_short_errors_supported = yes; then
-	 GIO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gio-2.0 >= 2.32" 2>&1`
+ GIO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gio-2.0 >= 2.32" 2>&1`
 else
-	 GIO_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gio-2.0 >= 2.32" 2>&1`
+ GIO_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gio-2.0 >= 2.32" 2>&1`
 fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$GIO_PKG_ERRORS" >&5
+ # Put the nasty error message in config.log where it belongs
+ echo "$GIO_PKG_ERRORS" >&5
 
-	as_fn_error $? "Package requirements (gio-2.0 >= 2.32) were not met:
+ as_fn_error $? "Package requirements (gio-2.0 >= 2.32) were not met:
 
 $GIO_PKG_ERRORS
 
@@ -6721,10 +7902,10 @@
 and GIO_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; }
-	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf "%s\n" "$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.
@@ -6734,28 +7915,28 @@
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5; }
+See 'config.log' for more details" "$LINENO" 5; }
 else
-	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; }
+ GIO_CFLAGS=$pkg_cv_GIO_CFLAGS
+ GIO_LIBS=$pkg_cv_GIO_LIBS
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
 fi
 else
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GIO" >&5
-$as_echo_n "checking for GIO... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for gio-2.0 >= 2.32 gio-unix-2.0 >= 2.32" >&5
+printf %s "checking for gio-2.0 >= 2.32 gio-unix-2.0 >= 2.32... " >&6; }
 
 if test -n "$GIO_CFLAGS"; then
 pkg_cv_GIO_CFLAGS="$GIO_CFLAGS"
 elif test -n "$PKG_CONFIG"; then
 if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gio-2.0 >= 2.32 gio-unix-2.0 >= 2.32\""; } >&5
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gio-2.0 >= 2.32 gio-unix-2.0 >= 2.32\""; } >&5
 ($PKG_CONFIG --exists --print-errors "gio-2.0 >= 2.32 gio-unix-2.0 >= 2.32") 2>&5
 ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
 pkg_cv_GIO_CFLAGS=`$PKG_CONFIG --cflags "gio-2.0 >= 2.32 gio-unix-2.0 >= 2.32" 2>/dev/null`
 		 test "x$?" != "x0" && pkg_failed=yes
@@ -6769,10 +7950,10 @@
 pkg_cv_GIO_LIBS="$GIO_LIBS"
 elif test -n "$PKG_CONFIG"; then
 if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gio-2.0 >= 2.32 gio-unix-2.0 >= 2.32\""; } >&5
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gio-2.0 >= 2.32 gio-unix-2.0 >= 2.32\""; } >&5
 ($PKG_CONFIG --exists --print-errors "gio-2.0 >= 2.32 gio-unix-2.0 >= 2.32") 2>&5
 ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
 pkg_cv_GIO_LIBS=`$PKG_CONFIG --libs "gio-2.0 >= 2.32 gio-unix-2.0 >= 2.32" 2>/dev/null`
 		 test "x$?" != "x0" && pkg_failed=yes
@@ -6786,8 +7967,8 @@
 
 
 if test $pkg_failed = yes; then
- 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
 _pkg_short_errors_supported=yes
@@ -6795,14 +7976,14 @@
 _pkg_short_errors_supported=no
 fi
 if test $_pkg_short_errors_supported = yes; then
-	 GIO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gio-2.0 >= 2.32 gio-unix-2.0 >= 2.32" 2>&1`
+ GIO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gio-2.0 >= 2.32 gio-unix-2.0 >= 2.32" 2>&1`
 else
-	 GIO_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gio-2.0 >= 2.32 gio-unix-2.0 >= 2.32" 2>&1`
+ GIO_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gio-2.0 >= 2.32 gio-unix-2.0 >= 2.32" 2>&1`
 fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$GIO_PKG_ERRORS" >&5
+ # Put the nasty error message in config.log where it belongs
+ echo "$GIO_PKG_ERRORS" >&5
 
-	as_fn_error $? "Package requirements (gio-2.0 >= 2.32 gio-unix-2.0 >= 2.32) were not met:
+ as_fn_error $? "Package requirements (gio-2.0 >= 2.32 gio-unix-2.0 >= 2.32) were not met:
 
 $GIO_PKG_ERRORS
 
@@ -6813,10 +7994,10 @@
 and GIO_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; }
-	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf "%s\n" "$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.
@@ -6826,12 +8007,12 @@
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5; }
+See 'config.log' for more details" "$LINENO" 5; }
 else
-	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; }
+ GIO_CFLAGS=$pkg_cv_GIO_CFLAGS
+ GIO_LIBS=$pkg_cv_GIO_LIBS
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
 fi
 fi
@@ -6847,29 +8028,156 @@
 
 
 # Check whether --enable-qt was given.
-if test "${enable_qt+set}" = set; then :
+if test ${enable_qt+y}
+then :
 enableval=$enable_qt; USE_QT=$enableval
+else case e in #(
+ e) USE_QT=yes ;;
+esac
+fi
+
+
+# Check whether --enable-qt5 was given.
+if test ${enable_qt5+y}
+then :
+ enableval=$enable_qt5; USE_QT5=$enableval
+else case e in #(
+ e) USE_QT5=no ;;
+esac
+fi
+
+
+if test $USE_QT5 = yes ; then
+
+pkg_failed=no
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Qt5Core >= 5.2" >&5
+printf %s "checking for Qt5Core >= 5.2... " >&6; }
+
+if test -n "$QTCORE_CFLAGS"; then
+ pkg_cv_QTCORE_CFLAGS="$QTCORE_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"Qt5Core >= 5.2\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "Qt5Core >= 5.2") 2>&5
+ ac_status=$?
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_QTCORE_CFLAGS=`$PKG_CONFIG --cflags "Qt5Core >= 5.2" 2>/dev/null`
+		 test "x$?" != "x0" && pkg_failed=yes
 else
- USE_QT=no
+ pkg_failed=yes
 fi
+ else
+ pkg_failed=untried
+fi
+if test -n "$QTCORE_LIBS"; then
+ pkg_cv_QTCORE_LIBS="$QTCORE_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"Qt5Core >= 5.2\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "Qt5Core >= 5.2") 2>&5
+ ac_status=$?
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_QTCORE_LIBS=`$PKG_CONFIG --libs "Qt5Core >= 5.2" 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
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "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
+ QTCORE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "Qt5Core >= 5.2" 2>&1`
+ else
+ QTCORE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "Qt5Core >= 5.2" 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$QTCORE_PKG_ERRORS" >&5
+
+ as_fn_error $? "Package requirements (Qt5Core >= 5.2) were not met:
+
+$QTCORE_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 QTCORE_CFLAGS
+and QTCORE_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
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf "%s\n" "$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 QTCORE_CFLAGS
+and QTCORE_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
+ QTCORE_CFLAGS=$pkg_cv_QTCORE_CFLAGS
+ QTCORE_LIBS=$pkg_cv_QTCORE_LIBS
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+
+fi
+
+if test -n "$QTBINPATH"; then
+ pkg_cv_QTBINPATH="$QTBINPATH"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"Qt5Core >= 5.2\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "Qt5Core >= 5.2") 2>&5
+ ac_status=$?
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_QTBINPATH=`$PKG_CONFIG --variable="host_bins" "Qt5Core >= 5.2" 2>/dev/null`
+		 test "x$?" != "x0" && pkg_failed=yes
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+QTBINPATH=$pkg_cv_QTBINPATH
 
+if test "x$QTBINPATH" = x""
+then :
 
-if test $USE_QT = yes ; then
+fi
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for QT" >&5
-$as_echo_n "checking for QT... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Qt5Core Qt5Gui Qt5Widgets Qt5Svg >= 5.2" >&5
+printf %s "checking for Qt5Core Qt5Gui Qt5Widgets Qt5Svg >= 5.2... " >&6; }
 
 if test -n "$QT_CFLAGS"; then
 pkg_cv_QT_CFLAGS="$QT_CFLAGS"
 elif test -n "$PKG_CONFIG"; then
 if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"Qt5Core Qt5Gui Qt5Widgets\""; } >&5
- ($PKG_CONFIG --exists --print-errors "Qt5Core Qt5Gui Qt5Widgets") 2>&5
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"Qt5Core Qt5Gui Qt5Widgets Qt5Svg >= 5.2\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "Qt5Core Qt5Gui Qt5Widgets Qt5Svg >= 5.2") 2>&5
 ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
- pkg_cv_QT_CFLAGS=`$PKG_CONFIG --cflags "Qt5Core Qt5Gui Qt5Widgets" 2>/dev/null`
+ pkg_cv_QT_CFLAGS=`$PKG_CONFIG --cflags "Qt5Core Qt5Gui Qt5Widgets Qt5Svg >= 5.2" 2>/dev/null`
 		 test "x$?" != "x0" && pkg_failed=yes
 else
 pkg_failed=yes
@@ -6881,12 +8189,12 @@
 pkg_cv_QT_LIBS="$QT_LIBS"
 elif test -n "$PKG_CONFIG"; then
 if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"Qt5Core Qt5Gui Qt5Widgets\""; } >&5
- ($PKG_CONFIG --exists --print-errors "Qt5Core Qt5Gui Qt5Widgets") 2>&5
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"Qt5Core Qt5Gui Qt5Widgets Qt5Svg >= 5.2\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "Qt5Core Qt5Gui Qt5Widgets Qt5Svg >= 5.2") 2>&5
 ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
- pkg_cv_QT_LIBS=`$PKG_CONFIG --libs "Qt5Core Qt5Gui Qt5Widgets" 2>/dev/null`
+ pkg_cv_QT_LIBS=`$PKG_CONFIG --libs "Qt5Core Qt5Gui Qt5Widgets Qt5Svg >= 5.2" 2>/dev/null`
 		 test "x$?" != "x0" && pkg_failed=yes
 else
 pkg_failed=yes
@@ -6898,8 +8206,8 @@
 
 
 if test $pkg_failed = yes; then
- 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
 _pkg_short_errors_supported=yes
@@ -6907,14 +8215,14 @@
 _pkg_short_errors_supported=no
 fi
 if test $_pkg_short_errors_supported = yes; then
-	 QT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "Qt5Core Qt5Gui Qt5Widgets" 2>&1`
+ QT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "Qt5Core Qt5Gui Qt5Widgets Qt5Svg >= 5.2" 2>&1`
 else
-	 QT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "Qt5Core Qt5Gui Qt5Widgets" 2>&1`
+ QT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "Qt5Core Qt5Gui Qt5Widgets Qt5Svg >= 5.2" 2>&1`
 fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$QT_PKG_ERRORS" >&5
+ # Put the nasty error message in config.log where it belongs
+ echo "$QT_PKG_ERRORS" >&5
 
-	as_fn_error $? "Package requirements (Qt5Core Qt5Gui Qt5Widgets) were not met:
+ as_fn_error $? "Package requirements (Qt5Core Qt5Gui Qt5Widgets Qt5Svg >= 5.2) were not met:
 
 $QT_PKG_ERRORS
 
@@ -6925,10 +8233,10 @@
 and QT_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; }
-	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf "%s\n" "$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.
@@ -6938,155 +8246,243 @@
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5; }
+See 'config.log' for more details" "$LINENO" 5; }
 else
-	QT_CFLAGS=$pkg_cv_QT_CFLAGS
-	QT_LIBS=$pkg_cv_QT_LIBS
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+ QT_CFLAGS=$pkg_cv_QT_CFLAGS
+ QT_LIBS=$pkg_cv_QT_LIBS
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
 fi
 
-$as_echo "#define USE_QT 1" >>confdefs.h
+printf "%s\n" "#define USE_QT 1" >>confdefs.h
 
 
 # needed if Qt was built with -reduce-relocations
+ QTCORE_CFLAGS="$QTCORE_CFLAGS -fPIC"
 QT_CFLAGS="$QT_CFLAGS -fPIC"
+elif test $USE_QT = yes ; then
+
+pkg_failed=no
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Qt6Core >= 6.0" >&5
+printf %s "checking for Qt6Core >= 6.0... " >&6; }
+
+if test -n "$QTCORE_CFLAGS"; then
+ pkg_cv_QTCORE_CFLAGS="$QTCORE_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"Qt6Core >= 6.0\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "Qt6Core >= 6.0") 2>&5
+ ac_status=$?
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_QTCORE_CFLAGS=`$PKG_CONFIG --cflags "Qt6Core >= 6.0" 2>/dev/null`
+		 test "x$?" != "x0" && pkg_failed=yes
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+if test -n "$QTCORE_LIBS"; then
+ pkg_cv_QTCORE_LIBS="$QTCORE_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"Qt6Core >= 6.0\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "Qt6Core >= 6.0") 2>&5
+ ac_status=$?
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_QTCORE_LIBS=`$PKG_CONFIG --libs "Qt6Core >= 6.0" 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
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "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
+ QTCORE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "Qt6Core >= 6.0" 2>&1`
+ else
+ QTCORE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "Qt6Core >= 6.0" 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$QTCORE_PKG_ERRORS" >&5
 
+ as_fn_error $? "Package requirements (Qt6Core >= 6.0) were not met:
 
+$QTCORE_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 QTCORE_CFLAGS
+and QTCORE_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
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf "%s\n" "$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.
 
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for shared library system" >&5
-$as_echo_n "checking for shared library system... " >&6; }
-	case "$host_os" in
-		darwin*)
-			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Darwin" >&5
-$as_echo "Darwin" >&6; }
-			LIB_CFLAGS='-fPIC -DPIC -mmacosx-version-min=10.7'
-			LIB_LDFLAGS='-dynamiclib -current_version ${LIB_MAJOR}.${LIB_MINOR} -compatibility_version ${LIB_MAJOR} -mmacosx-version-min=10.7 -install_name "${libdir}/$$(i=${SHARED_LIB}; echo $${i%${LIB_SUFFIX}}).${LIB_MAJOR}${LIB_SUFFIX}"'
-			LIB_PREFIX='lib'
-			LIB_SUFFIX='.dylib'
-			LDFLAGS_RPATH='-Wl,-rpath,${libdir}'
-			PLUGIN_CFLAGS='-fPIC -DPIC -mmacosx-version-min=10.7'
-			PLUGIN_LDFLAGS='-bundle -undefined dynamic_lookup -mmacosx-version-min=10.7'
-			PLUGIN_SUFFIX='.bundle'
-			INSTALL_LIB='&& ${INSTALL} -m 755 $$i ${DESTDIR}${libdir}/$${i%.dylib}.${LIB_MAJOR}.${LIB_MINOR}.dylib && ${LN_S} -f $${i%.dylib}.${LIB_MAJOR}.${LIB_MINOR}.dylib ${DESTDIR}${libdir}/$${i%.dylib}.${LIB_MAJOR}.dylib && ${LN_S} -f $${i%.dylib}.${LIB_MAJOR}.${LIB_MINOR}.dylib ${DESTDIR}${libdir}/$$i'
-			UNINSTALL_LIB='&& rm -f ${DESTDIR}${libdir}/$$i ${DESTDIR}${libdir}/$${i%.dylib}.${LIB_MAJOR}.dylib ${DESTDIR}${libdir}/$${i%.dylib}.${LIB_MAJOR}.${LIB_MINOR}.dylib'
-			CLEAN_LIB=''
-			;;
-		solaris*)
-			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Solaris" >&5
-$as_echo "Solaris" >&6; }
-			LIB_CFLAGS='-fPIC -DPIC'
-			LIB_LDFLAGS='-shared -Wl,-soname=${SHARED_LIB}.${LIB_MAJOR}.${LIB_MINOR}'
-			LIB_PREFIX='lib'
-			LIB_SUFFIX='.so'
-			LDFLAGS_RPATH='-Wl,-rpath,${libdir}'
-			PLUGIN_CFLAGS='-fPIC -DPIC'
-			PLUGIN_LDFLAGS='-shared'
-			PLUGIN_SUFFIX='.so'
-			INSTALL_LIB='&& ${INSTALL} -m 755 $$i ${DESTDIR}${libdir}/$$i.${LIB_MAJOR}.${LIB_MINOR} && rm -f ${DESTDIR}${libdir}/$$i && ${LN_S} $$i.${LIB_MAJOR}.${LIB_MINOR} ${DESTDIR}${libdir}/$$i'
-			UNINSTALL_LIB='&& rm -f ${DESTDIR}${libdir}/$$i ${DESTDIR}${libdir}/$$i.${LIB_MAJOR}.${LIB_MINOR}'
-			CLEAN_LIB=''
-			;;
-		openbsd* | mirbsd*)
-			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: OpenBSD" >&5
-$as_echo "OpenBSD" >&6; }
-			LIB_CFLAGS='-fPIC -DPIC'
-			LIB_LDFLAGS='-shared'
-			LIB_PREFIX='lib'
-			LIB_SUFFIX='.so.${LIB_MAJOR}.${LIB_MINOR}'
-			LDFLAGS_RPATH='-Wl,-rpath,${libdir}'
-			PLUGIN_CFLAGS='-fPIC -DPIC'
-			PLUGIN_LDFLAGS='-shared'
-			PLUGIN_SUFFIX='.so'
-			INSTALL_LIB='&& ${INSTALL} -m 755 $$i ${DESTDIR}${libdir}/$$i'
-			UNINSTALL_LIB='&& rm -f ${DESTDIR}${libdir}/$$i'
-			CLEAN_LIB=''
-			;;
-		cygwin* | mingw*)
-			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Win32" >&5
-$as_echo "Win32" >&6; }
-			LIB_CFLAGS=''
-			LIB_LDFLAGS='-shared -Wl,--out-implib,${SHARED_LIB}.a'
-			LIB_PREFIX='lib'
-			LIB_SUFFIX='.dll'
-			LDFLAGS_RPATH='-Wl,-rpath,${libdir}'
-			PLUGIN_CFLAGS=''
-			PLUGIN_LDFLAGS='-shared'
-			PLUGIN_SUFFIX='.dll'
-			INSTALL_LIB='&& ${MKDIR_P} ${DESTDIR}${bindir} && ${INSTALL} -m 755 $$i ${DESTDIR}${bindir}/$$i && ${INSTALL} -m 755 $$i.a ${DESTDIR}${libdir}/$$i.a'
-			UNINSTALL_LIB='&& rm -f ${DESTDIR}${bindir}/$$i ${DESTDIR}${libdir}/$$i.a'
-			CLEAN_LIB='${SHARED_LIB}.a'
-			;;
-		*)
-			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: GNU" >&5
-$as_echo "GNU" >&6; }
-			LIB_CFLAGS='-fPIC -DPIC'
-			LIB_LDFLAGS='-shared -Wl,-soname=${SHARED_LIB}.${LIB_MAJOR}'
-			LIB_PREFIX='lib'
-			LIB_SUFFIX='.so'
-			LDFLAGS_RPATH='-Wl,-rpath,${libdir}'
-			PLUGIN_CFLAGS='-fPIC -DPIC'
-			PLUGIN_LDFLAGS='-shared'
-			PLUGIN_SUFFIX='.so'
-			INSTALL_LIB='&& ${INSTALL} -m 755 $$i ${DESTDIR}${libdir}/$$i.${LIB_MAJOR}.${LIB_MINOR}.0 && ${LN_S} -f $$i.${LIB_MAJOR}.${LIB_MINOR}.0 ${DESTDIR}${libdir}/$$i.${LIB_MAJOR} && ${LN_S} -f $$i.${LIB_MAJOR}.${LIB_MINOR}.0 ${DESTDIR}${libdir}/$$i'
-			UNINSTALL_LIB='&& rm -f ${DESTDIR}${libdir}/$$i ${DESTDIR}${libdir}/$$i.${LIB_MAJOR} ${DESTDIR}${libdir}/$$i.${LIB_MAJOR}.${LIB_MINOR}.0'
-			CLEAN_LIB=''
-			;;
-	esac
+Alternatively, you may set the environment variables QTCORE_CFLAGS
+and QTCORE_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
+ QTCORE_CFLAGS=$pkg_cv_QTCORE_CFLAGS
+ QTCORE_LIBS=$pkg_cv_QTCORE_LIBS
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
+fi
 
+if test -n "$QTBINPATH"; then
+ pkg_cv_QTBINPATH="$QTBINPATH"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"Qt6Core >= 6.0\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "Qt6Core >= 6.0") 2>&5
+ ac_status=$?
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_QTBINPATH=`$PKG_CONFIG --variable="libexecdir" "Qt6Core >= 6.0" 2>/dev/null`
+		 test "x$?" != "x0" && pkg_failed=yes
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+QTBINPATH=$pkg_cv_QTBINPATH
 
+if test "x$QTBINPATH" = x""
+then :
 
+fi
 
+pkg_failed=no
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Qt6Core Qt6Gui Qt6Widgets Qt6Svg >= 6.0" >&5
+printf %s "checking for Qt6Core Qt6Gui Qt6Widgets Qt6Svg >= 6.0... " >&6; }
 
+if test -n "$QT_CFLAGS"; then
+ pkg_cv_QT_CFLAGS="$QT_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"Qt6Core Qt6Gui Qt6Widgets Qt6Svg >= 6.0\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "Qt6Core Qt6Gui Qt6Widgets Qt6Svg >= 6.0") 2>&5
+ ac_status=$?
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_QT_CFLAGS=`$PKG_CONFIG --cflags "Qt6Core Qt6Gui Qt6Widgets Qt6Svg >= 6.0" 2>/dev/null`
+		 test "x$?" != "x0" && pkg_failed=yes
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+if test -n "$QT_LIBS"; then
+ pkg_cv_QT_LIBS="$QT_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"Qt6Core Qt6Gui Qt6Widgets Qt6Svg >= 6.0\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "Qt6Core Qt6Gui Qt6Widgets Qt6Svg >= 6.0") 2>&5
+ ac_status=$?
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_QT_LIBS=`$PKG_CONFIG --libs "Qt6Core Qt6Gui Qt6Widgets Qt6Svg >= 6.0" 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
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "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
+ QT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "Qt6Core Qt6Gui Qt6Widgets Qt6Svg >= 6.0" 2>&1`
+ else
+ QT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "Qt6Core Qt6Gui Qt6Widgets Qt6Svg >= 6.0" 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$QT_PKG_ERRORS" >&5
 
+ as_fn_error $? "Package requirements (Qt6Core Qt6Gui Qt6Widgets Qt6Svg >= 6.0) were not met:
 
+$QT_PKG_ERRORS
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
-$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
-set x ${MAKE-make}
-ac_make=`$as_echo "$2" | sed 's/+/p/g; s/^a-zA-Z0-9_/_/g'`
-if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then :
- $as_echo_n "(cached) " >&6
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+Alternatively, you may set the environment variables QT_CFLAGS
+and QT_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
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf "%s\n" "$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 QT_CFLAGS
+and QT_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
- cat >conftest.make <<\_ACEOF
-SHELL = /bin/sh
-all:
-	@echo '@@@%%%=$(MAKE)=@@@%%%'
-_ACEOF
-# GNU make sometimes prints "make1: Entering ...", which would confuse us.
-case `${MAKE-make} -f conftest.make 2>/dev/null` in
- *@@@%%%=?*=@@@%%%*)
- eval ac_cv_prog_make_${ac_make}_set=yes;;
- *)
- eval ac_cv_prog_make_${ac_make}_set=no;;
-esac
-rm -f conftest.make
+ QT_CFLAGS=$pkg_cv_QT_CFLAGS
+ QT_LIBS=$pkg_cv_QT_LIBS
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+
 fi
-if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
- SET_MAKE=
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
- SET_MAKE="MAKE=${MAKE-make}"
+
+printf "%s\n" "#define USE_QT 1" >>confdefs.h
+
 fi
 
-# Find a good install program. We prefer a C program (faster),
+
+
+
+
+
+
+
+
+
+ # Find a good install program. We prefer a C program (faster),
 # so one script is as good as another. But avoid the broken or
 # incompatible versions:
 # SysV /etc/install, /usr/sbin/install
@@ -7100,20 +8496,25 @@
 # OS/2's system install, which has a completely different semantic
 # ./install, which can be erroneously created by make from ./install.sh.
 # Reject install programs that cannot install multiple files.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
-$as_echo_n "checking for a BSD-compatible install... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
+printf %s "checking for a BSD-compatible install... " >&6; }
 if test -z "$INSTALL"; then
-if ${ac_cv_path_install+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+if test ${ac_cv_path_install+y}
+then :
+ printf %s "(cached) " >&6
+else case e in #(
+ e) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
 do
 IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- # Account for people who put trailing slashes in PATH elements.
-case $as_dir/ in #((
- ./ | .// | /cC/* | \
+ case $as_dir in #(((
+ '') as_dir=./ ;;
+ */) ;;
+ *) as_dir=$as_dir/ ;;
+ esac
+ # Account for fact that we put trailing slashes in our PATH walk.
+case $as_dir in #((
+ ./ | /cC/* | \
 /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
 ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \
 /usr/ucb/* ) ;;
@@ -7123,13 +8524,13 @@
 # by default.
 for ac_prog in ginstall scoinst install; do
 for ac_exec_ext in '' $ac_executable_extensions; do
-	if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
+	if as_fn_executable_p "$as_dir$ac_prog$ac_exec_ext"; then
 	 if test $ac_prog = install &&
-	 grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
+	 grep dspmsg "$as_dir$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
 	 # AIX install. It has an incompatible calling convention.
 	 :
 	 elif test $ac_prog = install &&
-	 grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
+	 grep pwplus "$as_dir$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
 	 # program-specific install script used by HP pwplus--don't use.
 	 :
 	 else
@@ -7137,12 +8538,12 @@
 	 echo one > conftest.one
 	 echo two > conftest.two
 	 mkdir conftest.dir
-	 if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&
+	 if "$as_dir$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir/" &&
 	 test -s conftest.one && test -s conftest.two &&
 	 test -s conftest.dir/conftest.one &&
 	 test -s conftest.dir/conftest.two
 	 then
-	 ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
+	 ac_cv_path_install="$as_dir$ac_prog$ac_exec_ext -c"
 	 break 3
 	 fi
 	 fi
@@ -7156,9 +8557,10 @@
 IFS=$as_save_IFS
 
 rm -rf conftest.one conftest.two conftest.dir
-
+ ;;
+esac
 fi
- if test "${ac_cv_path_install+set}" = set; then
+ if test ${ac_cv_path_install+y}; then
 INSTALL=$ac_cv_path_install
 else
 # As a last resort, use the slow shell script. Don't cache a
@@ -7168,8 +8570,8 @@
 INSTALL=$ac_install_sh
 fi
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5
-$as_echo "$INSTALL" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5
+printf "%s\n" "$INSTALL" >&6; }
 
 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
 # It thinks the first close brace ends the variable substitution.
@@ -7179,54 +8581,743 @@
 
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5
-$as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
-if test -z "$MKDIR_P"; then
- if ${ac_cv_path_mkdir+:} false; then :
- $as_echo_n "(cached) " >&6
+
+
+
+
+	# Check whether --enable-rpath was given.
+if test ${enable_rpath+y}
+then :
+ enableval=$enable_rpath;
+fi
+
+
+	# Check whether --enable-silent-rules was given.
+if test ${enable_silent_rules+y}
+then :
+ enableval=$enable_silent_rules;
+fi
+
+
+	case "$build_os" in
+	darwin*)
+		case "$host_os" in
+		darwin*)
+			BUILD_AND_HOST_ARE_DARWIN=yes
+
+			;;
+		esac
+		;;
+	esac
+
+
+	case "$INSTALL" in
+	./build-aux/install-sh*)
+		INSTALL="$PWD/$INSTALL"
+		;;
+	esac
+
+
+
+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
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
+printf %s "checking how to run the C preprocessor... " >&6; }
+# On Suns, sometimes $CPP names a directory.
+if test -n "$CPP" && test -d "$CPP"; then
+ CPP=
+fi
+if test -z "$CPP"; then
+ if test ${ac_cv_prog_CPP+y}
+then :
+ printf %s "(cached) " >&6
+else case e in #(
+ e) # Double quotes because $CC needs to be expanded
+ for CPP in "$CC -E" "$CC -E -traditional-cpp" cpp /lib/cpp
+ do
+ ac_preproc_ok=false
+for ac_c_preproc_warn_flag in '' yes
+do
+ # Use a header file that comes with gcc, so configuring glibc
+ # with a fresh cross-compiler works.
+ # 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. */
+#include <limits.h>
+		 Syntax error
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"
+then :
+
+else case e in #(
+ e) # Broken: fails on valid input.
+continue ;;
+esac
+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_c_try_cpp "$LINENO"
+then :
+ # Broken: success on invalid input.
+continue
+else case e in #(
+ e) # Passes both tests.
+ac_preproc_ok=:
+break ;;
+esac
+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_CPP=$CPP
+ ;;
+esac
+fi
+ CPP=$ac_cv_prog_CPP
 else
+ ac_cv_prog_CPP=$CPP
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
+printf "%s\n" "$CPP" >&6; }
+ac_preproc_ok=false
+for ac_c_preproc_warn_flag in '' yes
+do
+ # Use a header file that comes with gcc, so configuring glibc
+ # with a fresh cross-compiler works.
+ # 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. */
+#include <limits.h>
+		 Syntax error
+_ACEOF
+if ac_fn_c_try_cpp "$LINENO"
+then :
+
+else case e in #(
+ e) # Broken: fails on valid input.
+continue ;;
+esac
+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_c_try_cpp "$LINENO"
+then :
+ # Broken: success on invalid input.
+continue
+else case e in #(
+ e) # Passes both tests.
+ac_preproc_ok=:
+break ;;
+esac
+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 case e in #(
+ e) { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf "%s\n" "$as_me: error: in '$ac_pwd':" >&2;}
+as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
+See 'config.log' for more details" "$LINENO" 5; } ;;
+esac
+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
+
+
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for egrep -e" >&5
+printf %s "checking for egrep -e... " >&6; }
+if test ${ac_cv_path_EGREP_TRADITIONAL+y}
+then :
+ printf %s "(cached) " >&6
+else case e in #(
+ e) if test -z "$EGREP_TRADITIONAL"; then
+ ac_path_EGREP_TRADITIONAL_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$PATH_SEPARATOR/usr/xpg4/bin
+do
+ IFS=$as_save_IFS
+ case $as_dir in #(((
+ '') as_dir=./ ;;
+ */) ;;
+ *) as_dir=$as_dir/ ;;
+ esac
+ for ac_prog in grep ggrep
+ do
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ ac_path_EGREP_TRADITIONAL="$as_dir$ac_prog$ac_exec_ext"
+ as_fn_executable_p "$ac_path_EGREP_TRADITIONAL" || continue
+# Check for GNU ac_path_EGREP_TRADITIONAL and select it if it is found.
+ # Check for GNU $ac_path_EGREP_TRADITIONAL
+case `"$ac_path_EGREP_TRADITIONAL" --version 2>&1` in #(
+*GNU*)
+ ac_cv_path_EGREP_TRADITIONAL="$ac_path_EGREP_TRADITIONAL" ac_path_EGREP_TRADITIONAL_found=:;;
+#(
+*)
+ ac_count=0
+ printf %s 0123456789 >"conftest.in"
+ while :
+ do
+ cat "conftest.in" "conftest.in" >"conftest.tmp"
+ mv "conftest.tmp" "conftest.in"
+ cp "conftest.in" "conftest.nl"
+ printf "%s\n" 'EGREP_TRADITIONAL' >> "conftest.nl"
+ "$ac_path_EGREP_TRADITIONAL" -E 'EGR(EP|AC)_TRADITIONAL$' < "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_EGREP_TRADITIONAL_max-0}; then
+ # Best one so far, save it but keep looking for a better one
+ ac_cv_path_EGREP_TRADITIONAL="$ac_path_EGREP_TRADITIONAL"
+ ac_path_EGREP_TRADITIONAL_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_EGREP_TRADITIONAL_found && break 3
+ done
+ done
+ done
+IFS=$as_save_IFS
+ if test -z "$ac_cv_path_EGREP_TRADITIONAL"; then
+ :
+ fi
+else
+ ac_cv_path_EGREP_TRADITIONAL=$EGREP_TRADITIONAL
+fi
+
+ if test "$ac_cv_path_EGREP_TRADITIONAL"
+then :
+ ac_cv_path_EGREP_TRADITIONAL="$ac_cv_path_EGREP_TRADITIONAL -E"
+else case e in #(
+ e) if test -z "$EGREP_TRADITIONAL"; then
+ ac_path_EGREP_TRADITIONAL_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$PATH_SEPARATOR/usr/xpg4/bin
+do
+ IFS=$as_save_IFS
+ case $as_dir in #(((
+ '') as_dir=./ ;;
+ */) ;;
+ *) as_dir=$as_dir/ ;;
+ esac
+ for ac_prog in egrep
+ do
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ ac_path_EGREP_TRADITIONAL="$as_dir$ac_prog$ac_exec_ext"
+ as_fn_executable_p "$ac_path_EGREP_TRADITIONAL" || continue
+# Check for GNU ac_path_EGREP_TRADITIONAL and select it if it is found.
+ # Check for GNU $ac_path_EGREP_TRADITIONAL
+case `"$ac_path_EGREP_TRADITIONAL" --version 2>&1` in #(
+*GNU*)
+ ac_cv_path_EGREP_TRADITIONAL="$ac_path_EGREP_TRADITIONAL" ac_path_EGREP_TRADITIONAL_found=:;;
+#(
+*)
+ ac_count=0
+ printf %s 0123456789 >"conftest.in"
+ while :
+ do
+ cat "conftest.in" "conftest.in" >"conftest.tmp"
+ mv "conftest.tmp" "conftest.in"
+ cp "conftest.in" "conftest.nl"
+ printf "%s\n" 'EGREP_TRADITIONAL' >> "conftest.nl"
+ "$ac_path_EGREP_TRADITIONAL" 'EGR(EP|AC)_TRADITIONAL$' < "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_EGREP_TRADITIONAL_max-0}; then
+ # Best one so far, save it but keep looking for a better one
+ ac_cv_path_EGREP_TRADITIONAL="$ac_path_EGREP_TRADITIONAL"
+ ac_path_EGREP_TRADITIONAL_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_EGREP_TRADITIONAL_found && break 3
+ done
+ done
+ done
+IFS=$as_save_IFS
+ if test -z "$ac_cv_path_EGREP_TRADITIONAL"; then
+ as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+ fi
+else
+ ac_cv_path_EGREP_TRADITIONAL=$EGREP_TRADITIONAL
+fi
+ ;;
+esac
+fi ;;
+esac
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP_TRADITIONAL" >&5
+printf "%s\n" "$ac_cv_path_EGREP_TRADITIONAL" >&6; }
+ EGREP_TRADITIONAL=$ac_cv_path_EGREP_TRADITIONAL
+
+
+	case "$host_os" in
+	darwin*)
+		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether host is iOS" >&5
+printf %s "checking whether host is iOS... " >&6; }
+		cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+			#include <TargetConditionals.h>
+
+			#if (defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE) || \
+			 (defined(TARGET_OS_SIMULATOR) && \
+			 TARGET_OS_SIMULATOR)
+			yes
+			#endif
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+ $EGREP_TRADITIONAL "yes" >/dev/null 2>&1
+then :
+
+			host_is_ios="yes"
+			HOST_IS_IOS=yes
+
+
+else case e in #(
+ e)
+			host_is_ios="no"
+		 ;;
+esac
+fi
+rm -rf conftest*
+
+		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $host_is_ios" >&5
+printf "%s\n" "$host_is_ios" >&6; }
+		if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}codesign", so it can be a program name with args.
+set dummy ${ac_tool_prefix}codesign; ac_word=$2
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_CODESIGN+y}
+then :
+ printf %s "(cached) " >&6
+else case e in #(
+ e) if test -n "$CODESIGN"; then
+ ac_cv_prog_CODESIGN="$CODESIGN" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ case $as_dir in #(((
+ '') as_dir=./ ;;
+ */) ;;
+ *) as_dir=$as_dir/ ;;
+ esac
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+ ac_cv_prog_CODESIGN="${ac_tool_prefix}codesign"
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+fi ;;
+esac
+fi
+CODESIGN=$ac_cv_prog_CODESIGN
+if test -n "$CODESIGN"; then
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CODESIGN" >&5
+printf "%s\n" "$CODESIGN" >&6; }
+else
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_CODESIGN"; then
+ ac_ct_CODESIGN=$CODESIGN
+ # Extract the first word of "codesign", so it can be a program name with args.
+set dummy codesign; ac_word=$2
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_ac_ct_CODESIGN+y}
+then :
+ printf %s "(cached) " >&6
+else case e in #(
+ e) if test -n "$ac_ct_CODESIGN"; then
+ ac_cv_prog_ac_ct_CODESIGN="$ac_ct_CODESIGN" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ case $as_dir in #(((
+ '') as_dir=./ ;;
+ */) ;;
+ *) as_dir=$as_dir/ ;;
+ esac
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+ ac_cv_prog_ac_ct_CODESIGN="codesign"
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
+
+fi ;;
+esac
+fi
+ac_ct_CODESIGN=$ac_cv_prog_ac_ct_CODESIGN
+if test -n "$ac_ct_CODESIGN"; then
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CODESIGN" >&5
+printf "%s\n" "$ac_ct_CODESIGN" >&6; }
+else
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+fi
+
+ if test "x$ac_ct_CODESIGN" = x; then
+ CODESIGN=""
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+ CODESIGN=$ac_ct_CODESIGN
+ fi
+else
+ CODESIGN="$ac_cv_prog_CODESIGN"
+fi
+
+		;;
+	esac
+
+
+
+
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for shared library type" >&5
+printf %s "checking for shared library type... " >&6; }
+
+	case "$host" in
+	*-*-darwin*)
+		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Darwin" >&5
+printf "%s\n" "Darwin" >&6; }
+		LIB_CFLAGS='-fPIC -DPIC'
+		LIB_LDFLAGS='-dynamiclib -current_version ${LIB_MAJOR}.${LIB_MINOR} -compatibility_version ${LIB_MAJOR}'
+		LIB_LDFLAGS_INSTALL_NAME='-Wl,-install_name,${libdir}/$${out%.dylib}.${LIB_MAJOR}.dylib'
+		LIB_PREFIX='lib'
+		LIB_SUFFIX='.dylib'
+		if test x"$enable_rpath" != x"no"
+then :
+
+			LDFLAGS_RPATH='-Wl,-rpath,${libdir}'
+
+fi
+		INSTALL_LIB='&& ${INSTALL} -m 755 $$i ${DESTDIR}${libdir}/$${i%.dylib}.${LIB_MAJOR}.${LIB_MINOR}.dylib && ${LN_S} -f $${i%.dylib}.${LIB_MAJOR}.${LIB_MINOR}.dylib ${DESTDIR}${libdir}/$${i%.dylib}.${LIB_MAJOR}.dylib && ${LN_S} -f $${i%.dylib}.${LIB_MAJOR}.${LIB_MINOR}.dylib ${DESTDIR}${libdir}/$$i'
+		UNINSTALL_LIB='&& rm -f ${DESTDIR}${libdir}/$$i ${DESTDIR}${libdir}/$${i%.dylib}.${LIB_MAJOR}.dylib ${DESTDIR}${libdir}/$${i%.dylib}.${LIB_MAJOR}.${LIB_MINOR}.dylib'
+		CLEAN_LIB=''
+		;;
+	*-*-mingw* | *-*-cygwin*)
+		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: MinGW / Cygwin" >&5
+printf "%s\n" "MinGW / Cygwin" >&6; }
+		LIB_CFLAGS=''
+		LIB_LDFLAGS='-shared -Wl,--export-all-symbols'
+		LIB_LDFLAGS_INSTALL_NAME=''
+		LIB_PREFIX=''
+		LIB_SUFFIX='${LIB_MAJOR}.dll'
+		LINK_LIB='&& rm -f lib$${out%${LIB_SUFFIX}}.dll.a && ${LN_S} $$out lib$${out%${LIB_SUFFIX}}.dll.a'
+		INSTALL_LIB='&& ${MKDIR_P} ${DESTDIR}${bindir} && ${INSTALL} -m 755 $$i ${DESTDIR}${bindir}/$$i && ${INSTALL} -m 755 lib$${i%${LIB_SUFFIX}}.dll.a ${DESTDIR}${libdir}/lib$${i%${LIB_SUFFIX}}.dll.a'
+		UNINSTALL_LIB='&& rm -f ${DESTDIR}${bindir}/$$i ${DESTDIR}${libdir}/lib$${i%${LIB_SUFFIX}}.dll.a'
+		CLEAN_LIB='${SHARED_LIB}.a ${SHARED_LIB_NOINST}.a'
+		;;
+	*-*-openbsd* | *-*-mirbsd*)
+		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: OpenBSD" >&5
+printf "%s\n" "OpenBSD" >&6; }
+		LIB_CFLAGS='-fPIC -DPIC'
+		LIB_LDFLAGS='-shared'
+		LIB_LDFLAGS_INSTALL_NAME=''
+		LIB_PREFIX='lib'
+		LIB_SUFFIX='.so.${LIB_MAJOR}.${LIB_MINOR}'
+		if test x"$enable_rpath" != x"no"
+then :
+
+			LDFLAGS_RPATH='-Wl,-rpath,${libdir}'
+
+fi
+		INSTALL_LIB='&& ${INSTALL} -m 755 $$i ${DESTDIR}${libdir}/$$i'
+		UNINSTALL_LIB='&& rm -f ${DESTDIR}${libdir}/$$i'
+		CLEAN_LIB=''
+		;;
+	*-*-solaris*)
+		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Solaris" >&5
+printf "%s\n" "Solaris" >&6; }
+		LIB_CFLAGS='-fPIC -DPIC'
+		LIB_LDFLAGS='-shared -Wl,-soname=$$out.${LIB_MAJOR}.${LIB_MINOR}'
+		LIB_LDFLAGS_INSTALL_NAME=''
+		LIB_PREFIX='lib'
+		LIB_SUFFIX='.so'
+		if test x"$enable_rpath" != x"no"
+then :
+
+			LDFLAGS_RPATH='-Wl,-rpath,${libdir}'
+
+fi
+		INSTALL_LIB='&& ${INSTALL} -m 755 $$i ${DESTDIR}${libdir}/$$i.${LIB_MAJOR}.${LIB_MINOR} && rm -f ${DESTDIR}${libdir}/$$i && ${LN_S} $$i.${LIB_MAJOR}.${LIB_MINOR} ${DESTDIR}${libdir}/$$i'
+		UNINSTALL_LIB='&& rm -f ${DESTDIR}${libdir}/$$i ${DESTDIR}${libdir}/$$i.${LIB_MAJOR}.${LIB_MINOR}'
+		CLEAN_LIB=''
+		;;
+	*-*-android*)
+		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Android" >&5
+printf "%s\n" "Android" >&6; }
+		LIB_CFLAGS='-fPIC -DPIC'
+		LIB_LDFLAGS='-shared -Wl,-soname=$$out.${LIB_MAJOR}'
+		LIB_LDFLAGS_INSTALL_NAME=''
+		LIB_PREFIX='lib'
+		LIB_SUFFIX='.so'
+		INSTALL_LIB='&& ${INSTALL} -m 755 $$i ${DESTDIR}${libdir}/$$i.${LIB_MAJOR}.${LIB_MINOR}.${LIB_PATCH} && ${LN_S} -f $$i.${LIB_MAJOR}.${LIB_MINOR}.${LIB_PATCH} ${DESTDIR}${libdir}/$$i.${LIB_MAJOR} && ${LN_S} -f $$i.${LIB_MAJOR}.${LIB_MINOR}.${LIB_PATCH} ${DESTDIR}${libdir}/$$i'
+		UNINSTALL_LIB='&& rm -f ${DESTDIR}${libdir}/$$i ${DESTDIR}${libdir}/$$i.${LIB_MAJOR} ${DESTDIR}${libdir}/$$i.${LIB_MAJOR}.${LIB_MINOR}.${LIB_PATCH}'
+		CLEAN_LIB=''
+		;;
+	hppa*-*-hpux*)
+		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: HP-UX (PA-RISC)" >&5
+printf "%s\n" "HP-UX (PA-RISC)" >&6; }
+		LIB_CFLAGS='-fPIC -DPIC'
+		LIB_LDFLAGS='-shared -Wl,+h,$$out'
+		LIB_LDFLAGS_INSTALL_NAME=''
+		LIB_PREFIX='lib'
+		LIB_SUFFIX='.${LIB_MAJOR}'
+		LINK_LIB='&& rm -f $${out%%.*}.sl && ${LN_S} $$out $${out%%.*}.sl'
+		if test x"$enable_rpath" != x"no"
+then :
+
+			LDFLAGS_RPATH='-Wl,+b,${libdir}'
+
+fi
+		INSTALL_LIB='&& ${INSTALL} -m 755 $$i ${DESTDIR}${libdir}/$$i && ${LN_S} -f $$i ${DESTDIR}${libdir}/$${i%%.*}.sl'
+		UNINSTALL_LIB='&& rm -f ${DESTDIR}${libdir}/$$i ${DESTDIR}${libdir}/$${i%%.*}.sl'
+		CLEAN_LIB=''
+		;;
+	ia64*-*-hpux*)
+		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: HP-UX (Itanium)" >&5
+printf "%s\n" "HP-UX (Itanium)" >&6; }
+		LIB_CFLAGS='-fPIC -DPIC'
+		LIB_LDFLAGS='-shared -Wl,+h,$$out'
+		LIB_LDFLAGS_INSTALL_NAME=''
+		LIB_PREFIX='lib'
+		LIB_SUFFIX='.${LIB_MAJOR}'
+		LINK_LIB='&& rm -f $${out%%.*}.so && ${LN_S} $$out $${out%%.*}.so'
+		if test x"$enable_rpath" != x"no"
+then :
+
+			LDFLAGS_RPATH='-Wl,+b,${libdir}'
+
+fi
+		INSTALL_LIB='&& ${INSTALL} -m 755 $$i ${DESTDIR}${libdir}/$$i && ${LN_S} -f $$i ${DESTDIR}${libdir}/$${i%%.*}.so'
+		UNINSTALL_LIB='&& rm -f ${DESTDIR}${libdir}/$$i ${DESTDIR}${libdir}/$${i%%.*}.so'
+		CLEAN_LIB=''
+		;;
+	*)
+		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ELF" >&5
+printf "%s\n" "ELF" >&6; }
+		LIB_CFLAGS='-fPIC -DPIC'
+		LIB_LDFLAGS='-shared -Wl,-soname=$$out.${LIB_MAJOR}'
+		LIB_LDFLAGS_INSTALL_NAME=''
+		LIB_PREFIX='lib'
+		LIB_SUFFIX='.so'
+		if test x"$enable_rpath" != x"no"
+then :
+
+			LDFLAGS_RPATH='-Wl,-rpath,${libdir}'
+
+fi
+		INSTALL_LIB='&& ${INSTALL} -m 755 $$i ${DESTDIR}${libdir}/$$i.${LIB_MAJOR}.${LIB_MINOR}.${LIB_PATCH} && ${LN_S} -f $$i.${LIB_MAJOR}.${LIB_MINOR}.${LIB_PATCH} ${DESTDIR}${libdir}/$$i.${LIB_MAJOR} && ${LN_S} -f $$i.${LIB_MAJOR}.${LIB_MINOR}.${LIB_PATCH} ${DESTDIR}${libdir}/$$i'
+		UNINSTALL_LIB='&& rm -f ${DESTDIR}${libdir}/$$i ${DESTDIR}${libdir}/$$i.${LIB_MAJOR} ${DESTDIR}${libdir}/$$i.${LIB_MAJOR}.${LIB_MINOR}.${LIB_PATCH}'
+		CLEAN_LIB=''
+		;;
+	esac
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for plugin type" >&5
+printf %s "checking for plugin type... " >&6; }
+
+	case "$host" in
+	*-*-darwin*)
+		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: Darwin" >&5
+printf "%s\n" "Darwin" >&6; }
+		PLUGIN_CFLAGS='-fPIC -DPIC'
+		PLUGIN_LDFLAGS='-bundle'
+		PLUGIN_SUFFIX='.dylib'
+		;;
+	*-*-mingw* | *-*-cygwin*)
+		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: MinGW / Cygwin" >&5
+printf "%s\n" "MinGW / Cygwin" >&6; }
+		PLUGIN_CFLAGS=''
+		PLUGIN_LDFLAGS='-shared -Wl,--export-all-symbols'
+		PLUGIN_SUFFIX='.dll'
+		;;
+	hppa*-*-hpux*)
+		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: HP-UX (PA-RISC)" >&5
+printf "%s\n" "HP-UX (PA-RISC)" >&6; }
+		PLUGIN_CFLAGS='-fPIC -DPIC'
+		PLUGIN_LDFLAGS='-shared'
+		PLUGIN_SUFFIX='.sl'
+		;;
+	*)
+		{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: ELF" >&5
+printf "%s\n" "ELF" >&6; }
+		PLUGIN_CFLAGS='-fPIC -DPIC'
+		PLUGIN_LDFLAGS='-shared'
+		PLUGIN_SUFFIX='.so'
+		;;
+	esac
+
+
+
+
+
+
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
+printf %s "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
+set x ${MAKE-make}
+ac_make=`printf "%s\n" "$2" | sed 's/+/p/g; s/^a-zA-Z0-9_/_/g'`
+if eval test \${ac_cv_prog_make_${ac_make}_set+y}
+then :
+ printf %s "(cached) " >&6
+else case e in #(
+ e) cat >conftest.make <<\_ACEOF
+SHELL = /bin/sh
+all:
+	@echo '@@@%%%=$(MAKE)=@@@%%%'
+_ACEOF
+# GNU make sometimes prints "make1: Entering ...", which would confuse us.
+case `${MAKE-make} -f conftest.make 2>/dev/null` in
+ *@@@%%%=?*=@@@%%%*)
+ eval ac_cv_prog_make_${ac_make}_set=yes;;
+ *)
+ eval ac_cv_prog_make_${ac_make}_set=no;;
+esac
+rm -f conftest.make ;;
+esac
+fi
+if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+ SET_MAKE=
+else
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+ SET_MAKE="MAKE=${MAKE-make}"
+fi
+
+
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a race-free mkdir -p" >&5
+printf %s "checking for a race-free mkdir -p... " >&6; }
+if test -z "$MKDIR_P"; then
+ if test ${ac_cv_path_mkdir+y}
+then :
+ printf %s "(cached) " >&6
+else case e in #(
+ e) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
 do
 IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
+ case $as_dir in #(((
+ '') as_dir=./ ;;
+ */) ;;
+ *) as_dir=$as_dir/ ;;
+ esac
 for ac_prog in mkdir gmkdir; do
 	 for ac_exec_ext in '' $ac_executable_extensions; do
-	 as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue
-	 case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
-	 'mkdir (GNU coreutils) '* | \
-	 'mkdir (coreutils) '* | \
+	 as_fn_executable_p "$as_dir$ac_prog$ac_exec_ext" || continue
+	 case `"$as_dir$ac_prog$ac_exec_ext" --version 2>&1` in #(
+	 'mkdir ('*'coreutils) '* | \
+	 *'BusyBox '* | \
 	 'mkdir (fileutils) '4.1*)
-	 ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext
+	 ac_cv_path_mkdir=$as_dir$ac_prog$ac_exec_ext
 	 break 3;;
 	 esac
 	 done
 done
 done
 IFS=$as_save_IFS
-
+ ;;
+esac
 fi
 
 test -d ./--version && rmdir ./--version
- if test "${ac_cv_path_mkdir+set}" = set; then
+ if test ${ac_cv_path_mkdir+y}; then
 MKDIR_P="$ac_cv_path_mkdir -p"
 else
- # As a last resort, use the slow shell script. Don't cache a
- # value for MKDIR_P within a source directory, because that will
- # break other packages using the cache if that directory is
- # removed, or if the value is a relative name.
- MKDIR_P="$ac_install_sh -d"
+ # As a last resort, use plain mkdir -p,
+ # in the hope it doesn't have the bugs of ancient mkdir.
+ MKDIR_P='mkdir -p'
 fi
 fi
-{ $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/
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
+printf "%s\n" "$MKDIR_P" >&6; }
+
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
+printf %s "checking for a sed that does not truncate output... " >&6; }
+if test ${ac_cv_path_SED+y}
+then :
+ printf %s "(cached) " >&6
+else case e in #(
+ e) 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
@@ -7239,25 +9330,31 @@
 for as_dir in $PATH
 do
 IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_prog in sed gsed; do
+ case $as_dir in #(((
+ '') as_dir=./ ;;
+ */) ;;
+ *) as_dir=$as_dir/ ;;
+ esac
+ 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"
+ 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
+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"
+ printf %s 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"
+ printf "%s\n" '' >> "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
@@ -7283,30 +9380,33 @@
 else
 ac_cv_path_SED=$SED
 fi
-
+ ;;
+esac
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5
-$as_echo "$ac_cv_path_SED" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_SED" >&5
+printf "%s\n" "$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; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether NLS is requested" >&5
+printf %s "checking whether NLS is requested... " >&6; }
 # Check whether --enable-nls was given.
-if test "${enable_nls+set}" = set; then :
+if test ${enable_nls+y}
+then :
 enableval=$enable_nls; USE_NLS=$enableval
-else
- USE_NLS=yes
+else case e in #(
+ e) USE_NLS=yes ;;
+esac
 fi
 
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_NLS" >&5
-$as_echo "$USE_NLS" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $USE_NLS" >&5
+printf "%s\n" "$USE_NLS" >&6; }
 
 
 
 
- GETTEXT_MACRO_VERSION=0.19
+ GETTEXT_MACRO_VERSION=0.20
 
 
 
@@ -7340,19 +9440,20 @@
 
 # Extract the first word of "msgfmt", so it can be a program name with args.
 set dummy msgfmt; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_MSGFMT+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- case "$MSGFMT" in
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_path_MSGFMT+y}
+then :
+ printf %s "(cached) " >&6
+else case e in #(
+ e) case "$MSGFMT" in
 \\/* | ?:\\/*)
 ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path.
 ;;
 *)
- ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR
+ gt_saved_IFS="$IFS"; IFS=$PATH_SEPARATOR
 for ac_dir in $PATH; do
- IFS="$ac_save_IFS"
+ IFS="$gt_saved_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
@@ -7365,28 +9466,30 @@
 fi
 done
 done
- IFS="$ac_save_IFS"
+ IFS="$gt_saved_IFS"
 test -z "$ac_cv_path_MSGFMT" && ac_cv_path_MSGFMT=":"
 ;;
+esac ;;
 esac
 fi
 MSGFMT="$ac_cv_path_MSGFMT"
 if test "$MSGFMT" != ":"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5
-$as_echo "$MSGFMT" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5
+printf "%s\n" "$MSGFMT" >&6; }
 else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 # Extract the first word of "gmsgfmt", so it can be a program name with args.
 set dummy gmsgfmt; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_GMSGFMT+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- case $GMSGFMT in
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_path_GMSGFMT+y}
+then :
+ printf %s "(cached) " >&6
+else case e in #(
+ e) case $GMSGFMT in
 \\/* | ?:\\/*)
 ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path.
 ;;
@@ -7395,11 +9498,15 @@
 for as_dir in $PATH
 do
 IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
+ case $as_dir in #(((
+ '') as_dir=./ ;;
+ */) ;;
+ *) as_dir=$as_dir/ ;;
+ esac
 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_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+ ac_cv_path_GMSGFMT="$as_dir$ac_word$ac_exec_ext"
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
 break 2
 fi
 done
@@ -7408,25 +9515,21 @@
 
 test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
 ;;
+esac ;;
 esac
 fi
 GMSGFMT=$ac_cv_path_GMSGFMT
 if test -n "$GMSGFMT"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GMSGFMT" >&5
-$as_echo "$GMSGFMT" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $GMSGFMT" >&5
+printf "%s\n" "$GMSGFMT" >&6; }
 else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
 
- case `$MSGFMT --version | sed 1q | sed -e 's,^^0-9*,,'` in
- '' | 0.0-9 | 0.0-9.* | 0.10-4 | 0.10-4.*) MSGFMT_015=: ;;
- *) MSGFMT_015=$MSGFMT ;;
- esac
-
- case `$GMSGFMT --version | sed 1q | sed -e 's,^^0-9*,,'` in
+ case `$GMSGFMT --version | sed 1q | sed -e 's,^^0-9*,,'` in
 '' | 0.0-9 | 0.0-9.* | 0.10-4 | 0.10-4.*) GMSGFMT_015=: ;;
 *) GMSGFMT_015=$GMSGFMT ;;
 esac
@@ -7462,19 +9565,20 @@
 
 # Extract the first word of "xgettext", so it can be a program name with args.
 set dummy xgettext; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_XGETTEXT+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- case "$XGETTEXT" in
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_path_XGETTEXT+y}
+then :
+ printf %s "(cached) " >&6
+else case e in #(
+ e) case "$XGETTEXT" in
 \\/* | ?:\\/*)
 ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path.
 ;;
 *)
- ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR
+ gt_saved_IFS="$IFS"; IFS=$PATH_SEPARATOR
 for ac_dir in $PATH; do
- IFS="$ac_save_IFS"
+ IFS="$gt_saved_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
@@ -7487,18 +9591,19 @@
 fi
 done
 done
- IFS="$ac_save_IFS"
+ IFS="$gt_saved_IFS"
 test -z "$ac_cv_path_XGETTEXT" && ac_cv_path_XGETTEXT=":"
 ;;
+esac ;;
 esac
 fi
 XGETTEXT="$ac_cv_path_XGETTEXT"
 if test "$XGETTEXT" != ":"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XGETTEXT" >&5
-$as_echo "$XGETTEXT" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $XGETTEXT" >&5
+printf "%s\n" "$XGETTEXT" >&6; }
 else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 rm -f messages.po
@@ -7539,19 +9644,20 @@
 
 # Extract the first word of "msgmerge", so it can be a program name with args.
 set dummy msgmerge; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_MSGMERGE+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- case "$MSGMERGE" in
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_path_MSGMERGE+y}
+then :
+ printf %s "(cached) " >&6
+else case e in #(
+ e) case "$MSGMERGE" in
 \\/* | ?:\\/*)
 ac_cv_path_MSGMERGE="$MSGMERGE" # Let the user override the test with a path.
 ;;
 *)
- ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR
+ gt_saved_IFS="$IFS"; IFS=$PATH_SEPARATOR
 for ac_dir in $PATH; do
- IFS="$ac_save_IFS"
+ IFS="$gt_saved_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
@@ -7563,22 +9669,31 @@
 fi
 done
 done
- IFS="$ac_save_IFS"
+ IFS="$gt_saved_IFS"
 test -z "$ac_cv_path_MSGMERGE" && ac_cv_path_MSGMERGE=":"
 ;;
+esac ;;
 esac
 fi
 MSGMERGE="$ac_cv_path_MSGMERGE"
 if test "$MSGMERGE" != ":"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGMERGE" >&5
-$as_echo "$MSGMERGE" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $MSGMERGE" >&5
+printf "%s\n" "$MSGMERGE" >&6; }
 else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
- test -n "$localedir" || localedir='${datadir}/locale'
+ if LC_ALL=C $MSGMERGE --help | grep ' --for-msgfmt ' >/dev/null; then
+ MSGMERGE_FOR_MSGFMT_OPTION='--for-msgfmt'
+ else
+ if LC_ALL=C $MSGMERGE --help | grep ' --no-fuzzy-matching ' >/dev/null; then
+ MSGMERGE_FOR_MSGFMT_OPTION='--no-fuzzy-matching --no-location --quiet'
+ else
+ MSGMERGE_FOR_MSGFMT_OPTION='--no-location --quiet'
+ fi
+ fi
 
 
 test -n "${XGETTEXT_EXTRA_OPTIONS+set}" || XGETTEXT_EXTRA_OPTIONS=
@@ -7598,18 +9713,20 @@
 else
 acl_final_exec_prefix="$exec_prefix"
 fi
- acl_save_prefix="$prefix"
+ acl_saved_prefix="$prefix"
 prefix="$acl_final_prefix"
 eval acl_final_exec_prefix=\"$acl_final_exec_prefix\"
- prefix="$acl_save_prefix"
+ prefix="$acl_saved_prefix"
 
 
 
 # Check whether --with-gnu-ld was given.
-if test "${with_gnu_ld+set}" = set; then :
+if test ${with_gnu_ld+y}
+then :
 withval=$with_gnu_ld; test "$withval" = no || with_gnu_ld=yes
-else
- with_gnu_ld=no
+else case e in #(
+ e) with_gnu_ld=no ;;
+esac
 fi
 
 # Prepare PATH_SEPARATOR.
@@ -7625,89 +9742,154 @@
 }
 fi
 
-ac_prog=ld
-if test "$GCC" = yes; then
- # Check if gcc -print-prog-name=ld gives a path.
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
-$as_echo_n "checking for ld used by $CC... " >&6; }
- case $host in
- *-*-mingw*)
- # gcc leaves a trailing carriage return which upsets mingw
- 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
+if test -n "$LD"; then
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ld" >&5
+printf %s "checking for ld... " >&6; }
+elif test "$GCC" = yes; then
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ld used by $CC" >&5
+printf %s "checking for ld used by $CC... " >&6; }
 elif test "$with_gnu_ld" = yes; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
-$as_echo_n "checking for GNU ld... " >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GNU ld" >&5
+printf %s "checking for GNU ld... " >&6; }
 else
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
-$as_echo_n "checking for non-GNU ld... " >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
+printf %s "checking for non-GNU ld... " >&6; }
 fi
-if ${acl_cv_path_LD+:} false; then :
- $as_echo_n "(cached) " >&6
+if test -n "$LD"; then
+ # Let the user override the test with a path.
+ :
 else
- 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
- ;;
+ if test ${acl_cv_path_LD+y}
+then :
+ printf %s "(cached) " >&6
+else case e in #(
+ e)
+ acl_cv_path_LD= # Final result of this test
+ ac_prog=ld # Program to search in $PATH
+ if test "$GCC" = yes; then
+ # Check if gcc -print-prog-name=ld gives a path.
+ case $host in
+ *-*-mingw* | windows*)
+ # gcc leaves a trailing carriage return which upsets mingw
+ acl_output=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
+ *)
+ acl_output=`($CC -print-prog-name=ld) 2>&5` ;;
+ esac
+ case $acl_output in
+ # Accept absolute paths.
+ \\/* | ?:\\/*)
+ re_direlt='/^/^/*/\.\./'
+ # Canonicalize the pathname of ld
+ acl_output=`echo "$acl_output" | sed 's%\\\\%/%g'`
+ while echo "$acl_output" | grep "$re_direlt" > /dev/null 2>&1; do
+ acl_output=`echo $acl_output | sed "s%$re_direlt%/%"`
+ done
+ # Got the pathname. No search in PATH is needed.
+ acl_cv_path_LD="$acl_output"
+ ac_prog=
+ ;;
+ "")
+ # If it fails, then pretend we aren't using GCC.
+ ;;
+ *)
+ # If it is relative, then search for the first ld in PATH.
+ with_gnu_ld=unknown
+ ;;
 esac
 fi
- done
- IFS="$acl_save_ifs"
-else
- acl_cv_path_LD="$LD" # Let the user override the test with a path.
+ if test -n "$ac_prog"; then
+ # Search for $ac_prog in $PATH.
+ acl_saved_IFS="$IFS"; IFS=$PATH_SEPARATOR
+ for ac_dir in $PATH; do
+ IFS="$acl_saved_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_saved_IFS"
+ fi
+ case $host in
+ *-*-aix*)
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#if defined __powerpc64__ || defined __LP64__
+ int ok;
+ #else
+ error fail
+ #endif
+
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"
+then :
+ # The compiler produces 64-bit code. Add option '-b64' so that the
+ # linker groks 64-bit object files.
+ case "$acl_cv_path_LD " in
+ *" -b64 "*) ;;
+ *) acl_cv_path_LD="$acl_cv_path_LD -b64" ;;
+ esac
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+ ;;
+ sparc64-*-netbsd*)
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#if defined __sparcv9 || defined __arch64__
+ int ok;
+ #else
+ error fail
+ #endif
+
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"
+then :
+
+else case e in #(
+ e) # The compiler produces 32-bit code. Add option '-m elf32_sparc'
+ # so that the linker groks 32-bit object files.
+ case "$acl_cv_path_LD " in
+ *" -m elf32_sparc "*) ;;
+ *) acl_cv_path_LD="$acl_cv_path_LD -m elf32_sparc" ;;
+ esac
+ ;;
+esac
 fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+ ;;
+ esac
+ ;;
+esac
 fi
 
-LD="$acl_cv_path_LD"
-if test -n "$LD"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
-$as_echo "$LD" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+ LD="$acl_cv_path_LD"
 fi
-test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
-$as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
-if ${acl_cv_prog_gnu_ld+:} false; then :
- $as_echo_n "(cached) " >&6
+if test -n "$LD"; then
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
+printf "%s\n" "$LD" >&6; }
 else
- # I'd rather use --version here, but apparently some GNU lds only accept -v.
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+ as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
+printf %s "checking if the linker ($LD) is GNU ld... " >&6; }
+if test ${acl_cv_prog_gnu_ld+y}
+then :
+ printf %s "(cached) " >&6
+else case e in #(
+ e) # 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
@@ -7715,30 +9897,35 @@
 *)
 acl_cv_prog_gnu_ld=no
 ;;
+esac ;;
 esac
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $acl_cv_prog_gnu_ld" >&5
-$as_echo "$acl_cv_prog_gnu_ld" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $acl_cv_prog_gnu_ld" >&5
+printf "%s\n" "$acl_cv_prog_gnu_ld" >&6; }
 with_gnu_ld=$acl_cv_prog_gnu_ld
 
 
 
 
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shared library run path origin" >&5
-$as_echo_n "checking for shared library run path origin... " >&6; }
-if ${acl_cv_rpath+:} false; then :
- $as_echo_n "(cached) " >&6
-else
 
+
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for shared library run path origin" >&5
+printf %s "checking for shared library run path origin... " >&6; }
+if test ${acl_cv_rpath+y}
+then :
+ printf %s "(cached) " >&6
+else case e in #(
+ e)
 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
-
+ ;;
+esac
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $acl_cv_rpath" >&5
-$as_echo "$acl_cv_rpath" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $acl_cv_rpath" >&5
+printf "%s\n" "$acl_cv_rpath" >&6; }
 wl="$acl_cv_wl"
 acl_libext="$acl_cv_libext"
 acl_shlibext="$acl_cv_shlibext"
@@ -7749,76 +9936,253 @@
 acl_hardcode_direct="$acl_cv_hardcode_direct"
 acl_hardcode_minus_L="$acl_cv_hardcode_minus_L"
 # Check whether --enable-rpath was given.
-if test "${enable_rpath+set}" = set; then :
+if test ${enable_rpath+y}
+then :
 enableval=$enable_rpath; :
-else
- enable_rpath=yes
+else case e in #(
+ e) enable_rpath=yes ;;
+esac
 fi
 
 
 
 
- acl_libdirstem=lib
- acl_libdirstem2=
- case "$host_os" in
- solaris*)
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for 64-bit host" >&5
-$as_echo_n "checking for 64-bit host... " >&6; }
-if ${gl_cv_solaris_64bit+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking 32-bit host C ABI" >&5
+printf %s "checking 32-bit host C ABI... " >&6; }
+if test ${gl_cv_host_cpu_c_abi_32bit+y}
+then :
+ printf %s "(cached) " >&6
+else case e in #(
+ e) case "$host_cpu" in
+
+ # CPUs that only support a 32-bit ABI.
+ arc \
+ | bfin \
+ | cris* \
+ | csky \
+ | epiphany \
+ | ft32 \
+ | h8300 \
+ | m68k \
+ | microblaze | microblazeel \
+ | nds32 | nds32le | nds32be \
+ | nios2 | nios2eb | nios2el \
+ | or1k* \
+ | or32 \
+ | sh | sh1234 | sh1234elb \
+ | tic6x \
+ | xtensa* )
+ gl_cv_host_cpu_c_abi_32bit=yes
+ ;;
+
+ # CPUs that only support a 64-bit ABI.
+ alpha | alphaev4-8 | alphaev56 | alphapca567 | alphaev678 \
+ | mmix )
+ gl_cv_host_cpu_c_abi_32bit=no
+ ;;
+
+ *)
+ if test -n "$gl_cv_host_cpu_c_abi"; then
+ case "$gl_cv_host_cpu_c_abi" in
+ i386 | x86_64-x32 | arm | armhf | arm64-ilp32 | hppa | ia64-ilp32 | mips | mipsn32 | powerpc | riscv*-ilp32* | s390 | sparc)
+ gl_cv_host_cpu_c_abi_32bit=yes ;;
+ x86_64 | alpha | arm64 | aarch64c | hppa64 | ia64 | mips64 | powerpc64 | powerpc64-elfv2 | riscv*-lp64* | s390x | sparc64 )
+ gl_cv_host_cpu_c_abi_32bit=no ;;
+ *)
+ gl_cv_host_cpu_c_abi_32bit=unknown ;;
+ esac
+ else
+ gl_cv_host_cpu_c_abi_32bit=unknown
+ fi
+ if test $gl_cv_host_cpu_c_abi_32bit = unknown; then
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
+int test_pointer_sizesizeof (void *) - 5;
 
-#ifdef _LP64
-sixtyfour bits
-#endif
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"
+then :
+ gl_cv_host_cpu_c_abi_32bit=no
+else case e in #(
+ e) gl_cv_host_cpu_c_abi_32bit=yes ;;
+esac
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
+ fi
+ ;;
+ esac
+ ;;
+esac
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_host_cpu_c_abi_32bit" >&5
+printf "%s\n" "$gl_cv_host_cpu_c_abi_32bit" >&6; }
+
+ HOST_CPU_C_ABI_32BIT="$gl_cv_host_cpu_c_abi_32bit"
+
+
+
+
+
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ELF binary format" >&5
+printf %s "checking for ELF binary format... " >&6; }
+if test ${gl_cv_elf+y}
+then :
+ printf %s "(cached) " >&6
+else case e in #(
+ e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#if defined __ELF__ || (defined __linux__ && defined __EDG__)
+ Extensible Linking Format
+ #endif
 
 _ACEOF
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "sixtyfour bits" >/dev/null 2>&1; then :
- gl_cv_solaris_64bit=yes
-else
- gl_cv_solaris_64bit=no
+ $EGREP_TRADITIONAL "Extensible Linking Format" >/dev/null 2>&1
+then :
+ gl_cv_elf=yes
+else case e in #(
+ e) gl_cv_elf=no ;;
+esac
 fi
-rm -f conftest*
-
+rm -rf conftest*
 
+ ;;
+esac
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_solaris_64bit" >&5
-$as_echo "$gl_cv_solaris_64bit" >&6; }
- 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"
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_elf" >&5
+printf "%s\n" "$gl_cv_elf" >&6; }
+ if test $gl_cv_elf = yes; then
+ # Extract the ELF class of a file (5th byte) in decimal.
+ # Cf. https://en.wikipedia.org/wiki/Executable_and_Linkable_Format#File_header
+ if od -A x < /dev/null >/dev/null 2>/dev/null; then
+ # Use POSIX od.
+ func_elfclass ()
+ {
+ od -A n -t d1 -j 4 -N 1
+ }
+ else
+ # Use BSD hexdump.
+ func_elfclass ()
+ {
+ dd bs=1 count=1 skip=4 2>/dev/null | hexdump -e '1/1 "%3d "'
+ echo
+ }
+ fi
+ # Use 'expr', not 'test', to compare the values of func_elfclass, because on
+ # Solaris 11 OpenIndiana and Solaris 11 OmniOS, the result is 001 or 002,
+ # not 1 or 2.
+ case $HOST_CPU_C_ABI_32BIT in
+ yes)
+ # 32-bit ABI.
+ acl_is_expected_elfclass ()
+ {
+ expr "`func_elfclass | sed -e 's/ 	//g'`" = 1 > /dev/null
+ }
+ ;;
+ no)
+ # 64-bit ABI.
+ acl_is_expected_elfclass ()
+ {
+ expr "`func_elfclass | sed -e 's/ 	//g'`" = 2 > /dev/null
+ }
+ ;;
+ *)
+ # Unknown.
+ acl_is_expected_elfclass ()
+ {
+ :
+ }
+ ;;
+ esac
+ else
+ acl_is_expected_elfclass ()
+ {
+ :
+ }
+ fi
 
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for the common suffixes of directories in the library search path" >&5
+printf %s "checking for the common suffixes of directories in the library search path... " >&6; }
+if test ${acl_cv_libdirstems+y}
+then :
+ printf %s "(cached) " >&6
+else case e in #(
+ e) acl_libdirstem=lib
+ acl_libdirstem2=
+ acl_libdirstem3=
+ case "$host_os" in
+ solaris*)
+ if test $HOST_CPU_C_ABI_32BIT = no; then
+ acl_libdirstem2=lib/64
+ case "$host_cpu" in
+ sparc*) acl_libdirstem3=lib/sparcv9 ;;
+ i*86 | x86_64) acl_libdirstem3=lib/amd64 ;;
+ esac
+ fi
+ ;;
+ netbsd*)
+ if test $HOST_CPU_C_ABI_32BIT != no; then
+ case "$host_cpu" in
+ sparc*) acl_libdirstem2=lib/sparc ;;
+ esac
+ fi
+ ;;
+ *)
+ searchpath=`(LC_ALL=C $CC $CPPFLAGS $CFLAGS -print-search-dirs) 2>/dev/null \
+ | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'`
+ if test $HOST_CPU_C_ABI_32BIT != no; then
+ # 32-bit or unknown ABI.
+ if test -d /usr/lib32; then
+ acl_libdirstem2=lib32
+ fi
+ fi
+ if test $HOST_CPU_C_ABI_32BIT != yes; then
+ # 64-bit or unknown ABI.
+ if test -d /usr/lib64; then
+ acl_libdirstem3=lib64
+ fi
+ fi
+ if test -n "$searchpath"; then
+ acl_saved_IFS="${IFS= 	}"; IFS=":"
+ for searchdir in $searchpath; do
+ if test -d "$searchdir"; then
+ case "$searchdir" in
+ */lib32/ | */lib32 ) acl_libdirstem2=lib32 ;;
+ */lib64/ | */lib64 ) acl_libdirstem3=lib64 ;;
+ */../ | */.. )
+ # Better ignore directories of this form. They are misleading.
+ ;;
+ *) searchdir=`cd "$searchdir" && pwd`
+ case "$searchdir" in
+ */lib32 ) acl_libdirstem2=lib32 ;;
+ */lib64 ) acl_libdirstem3=lib64 ;;
+ esac ;;
+ esac
+ fi
+ done
+ IFS="$acl_saved_IFS"
+ if test $HOST_CPU_C_ABI_32BIT = yes; then
+ # 32-bit ABI.
+ acl_libdirstem3=
+ fi
+ if test $HOST_CPU_C_ABI_32BIT = no; then
+ # 64-bit ABI.
+ acl_libdirstem2=
+ fi
+ fi
+ ;;
+ esac
+ test -n "$acl_libdirstem2" || acl_libdirstem2="$acl_libdirstem"
+ test -n "$acl_libdirstem3" || acl_libdirstem3="$acl_libdirstem"
+ acl_cv_libdirstems="$acl_libdirstem,$acl_libdirstem2,$acl_libdirstem3"
+ ;;
+esac
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $acl_cv_libdirstems" >&5
+printf "%s\n" "$acl_cv_libdirstems" >&6; }
+ acl_libdirstem=`echo "$acl_cv_libdirstems" | sed -e 's/,.*//'`
+ acl_libdirstem2=`echo "$acl_cv_libdirstems" | sed -e 's/^^,*,//' -e 's/,.*//'`
+ acl_libdirstem3=`echo "$acl_cv_libdirstems" | sed -e 's/^^,*,^,*,//' -e 's/,.*//'`
 
 
 
@@ -7832,49 +10196,58 @@
 
 use_additional=yes
 
- acl_save_prefix="$prefix"
+ acl_saved_prefix="$prefix"
 prefix="$acl_final_prefix"
- acl_save_exec_prefix="$exec_prefix"
+ acl_saved_exec_prefix="$exec_prefix"
 exec_prefix="$acl_final_exec_prefix"
 
 eval additional_includedir=\"$includedir\"
 eval additional_libdir=\"$libdir\"
+ eval additional_libdir2=\"$exec_prefix/$acl_libdirstem2\"
+ eval additional_libdir3=\"$exec_prefix/$acl_libdirstem3\"
 
- exec_prefix="$acl_save_exec_prefix"
- prefix="$acl_save_prefix"
+ exec_prefix="$acl_saved_exec_prefix"
+ prefix="$acl_saved_prefix"
 
 
 # Check whether --with-libiconv-prefix was given.
-if test "${with_libiconv_prefix+set}" = set; then :
+if test ${with_libiconv_prefix+y}
+then :
 withval=$with_libiconv_prefix;
 if test "X$withval" = "Xno"; then
 use_additional=no
 else
 if test "X$withval" = "X"; then
 
- acl_save_prefix="$prefix"
+ acl_saved_prefix="$prefix"
 prefix="$acl_final_prefix"
- acl_save_exec_prefix="$exec_prefix"
+ acl_saved_exec_prefix="$exec_prefix"
 exec_prefix="$acl_final_exec_prefix"
 
 eval additional_includedir=\"$includedir\"
 eval additional_libdir=\"$libdir\"
+ eval additional_libdir2=\"$exec_prefix/$acl_libdirstem2\"
+ eval additional_libdir3=\"$exec_prefix/$acl_libdirstem3\"
 
- exec_prefix="$acl_save_exec_prefix"
- prefix="$acl_save_prefix"
+ exec_prefix="$acl_saved_exec_prefix"
+ prefix="$acl_saved_prefix"
 
 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
+ additional_libdir2="$withval/$acl_libdirstem2"
+ additional_libdir3="$withval/$acl_libdirstem3"
 fi
 fi
 
 fi
 
+ if test "X$additional_libdir2" = "X$additional_libdir"; then
+ additional_libdir2=
+ fi
+ if test "X$additional_libdir3" = "X$additional_libdir"; then
+ additional_libdir3=
+ fi
 LIBICONV=
 LTLIBICONV=
 INCICONV=
@@ -7920,62 +10293,68 @@
 shrext=
 fi
 if test $use_additional = yes; then
- dir="$additional_libdir"
- 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"
+ for additional_libdir_variable in additional_libdir additional_libdir2 additional_libdir3; do
+ if test "X$found_dir" = "X"; then
+ eval dir=\$$additional_libdir_variable
+ if test -n "$dir"; then
+ if test -n "$acl_shlibext"; then
+ if test -f "$dir/$libname$shrext" && acl_is_expected_elfclass < "$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" && acl_is_expected_elfclass < "$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" && acl_is_expected_elfclass < "$dir/$f"; then
+ found_dir="$dir"
+ found_so="$dir/$f"
+ break
+ fi
+ done
+ fi
+ fi
 fi
- else
- eval library_names=\"$acl_library_names_spec\"
- for f in $library_names; do
- if test -f "$dir/$f"; then
+ if test "X$found_dir" = "X"; then
+ if test -f "$dir/$libname.$acl_libext" && ${AR-ar} -p "$dir/$libname.$acl_libext" | acl_is_expected_elfclass; then
 found_dir="$dir"
- found_so="$dir/$f"
- break
+ found_a="$dir/$libname.$acl_libext"
 fi
- done
+ fi
+ if test "X$found_dir" != "X"; then
+ if test -f "$dir/$libname.la"; then
+ found_la="$dir/$libname.la"
+ fi
+ fi
 fi
 fi
- fi
- 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
+ done
 fi
 if test "X$found_dir" = "X"; then
 for x in $LDFLAGS $LTLIBICONV; do
 
- acl_save_prefix="$prefix"
+ acl_saved_prefix="$prefix"
 prefix="$acl_final_prefix"
- acl_save_exec_prefix="$exec_prefix"
+ acl_saved_exec_prefix="$exec_prefix"
 exec_prefix="$acl_final_exec_prefix"
 eval x=\"$x\"
- exec_prefix="$acl_save_exec_prefix"
- prefix="$acl_save_prefix"
+ exec_prefix="$acl_saved_exec_prefix"
+ prefix="$acl_saved_prefix"
 
 case "$x" in
 -L*)
 dir=`echo "X$x" | sed -e 's/^X-L//'`
 if test -n "$acl_shlibext"; then
- if test -f "$dir/$libname$shrext"; then
+ if test -f "$dir/$libname$shrext" && acl_is_expected_elfclass < "$dir/$libname$shrext"; then
 found_dir="$dir"
 found_so="$dir/$libname$shrext"
 else
@@ -7985,14 +10364,14 @@
 | 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
+ if test -n "$ver" && test -f "$dir/$libname$shrext.$ver" && acl_is_expected_elfclass < "$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
+ if test -f "$dir/$f" && acl_is_expected_elfclass < "$dir/$f"; then
 found_dir="$dir"
 found_so="$dir/$f"
 break
@@ -8002,7 +10381,7 @@
 fi
 fi
 if test "X$found_dir" = "X"; then
- if test -f "$dir/$libname.$acl_libext"; then
+ if test -f "$dir/$libname.$acl_libext" && ${AR-ar} -p "$dir/$libname.$acl_libext" | acl_is_expected_elfclass; then
 found_dir="$dir"
 found_a="$dir/$libname.$acl_libext"
 fi
@@ -8024,7 +10403,8 @@
 if test "X$found_so" != "X"; then
 if test "$enable_rpath" = no \
 || test "X$found_dir" = "X/usr/$acl_libdirstem" \
- || test "X$found_dir" = "X/usr/$acl_libdirstem2"; then
+ || test "X$found_dir" = "X/usr/$acl_libdirstem2" \
+ || test "X$found_dir" = "X/usr/$acl_libdirstem3"; then
 LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
 else
 haveit=
@@ -8056,13 +10436,13 @@
 haveit=
 for x in $LDFLAGS $LIBICONV; do
 
- acl_save_prefix="$prefix"
+ acl_saved_prefix="$prefix"
 prefix="$acl_final_prefix"
- acl_save_exec_prefix="$exec_prefix"
+ acl_saved_exec_prefix="$exec_prefix"
 exec_prefix="$acl_final_exec_prefix"
 eval x=\"$x\"
- exec_prefix="$acl_save_exec_prefix"
- prefix="$acl_save_prefix"
+ exec_prefix="$acl_saved_exec_prefix"
+ prefix="$acl_saved_prefix"
 
 if test "X$x" = "X-L$found_dir"; then
 haveit=yes
@@ -8103,6 +10483,13 @@
 fi
 additional_includedir="$basedir/include"
 ;;
+ */$acl_libdirstem3 | */$acl_libdirstem3/)
+ basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem3/"'*$,,'`
+ if test "$name" = 'iconv'; then
+ LIBICONV_PREFIX="$basedir"
+ fi
+ additional_includedir="$basedir/include"
+ ;;
 esac
 if test "X$additional_includedir" != "X"; then
 if test "X$additional_includedir" != "X/usr/include"; then
@@ -8117,13 +10504,13 @@
 if test -z "$haveit"; then
 for x in $CPPFLAGS $INCICONV; do
 
- acl_save_prefix="$prefix"
+ acl_saved_prefix="$prefix"
 prefix="$acl_final_prefix"
- acl_save_exec_prefix="$exec_prefix"
+ acl_saved_exec_prefix="$exec_prefix"
 exec_prefix="$acl_final_exec_prefix"
 eval x=\"$x\"
- exec_prefix="$acl_save_exec_prefix"
- prefix="$acl_save_prefix"
+ exec_prefix="$acl_saved_exec_prefix"
+ prefix="$acl_saved_prefix"
 
 if test "X$x" = "X-I$additional_includedir"; then
 haveit=yes
@@ -8139,21 +10526,23 @@
 fi
 fi
 if test -n "$found_la"; then
- save_libdir="$libdir"
+ saved_libdir="$libdir"
 case "$found_la" in
 */* | *\\*) . "$found_la" ;;
 *) . "./$found_la" ;;
 esac
- libdir="$save_libdir"
+ libdir="$saved_libdir"
 for dep in $dependency_libs; do
 case "$dep" in
 -L*)
- additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'`
- if test "X$additional_libdir" != "X/usr/$acl_libdirstem" \
- && test "X$additional_libdir" != "X/usr/$acl_libdirstem2"; then
+ dependency_libdir=`echo "X$dep" | sed -e 's/^X-L//'`
+ if test "X$dependency_libdir" != "X/usr/$acl_libdirstem" \
+ && test "X$dependency_libdir" != "X/usr/$acl_libdirstem2" \
+ && test "X$dependency_libdir" != "X/usr/$acl_libdirstem3"; then
 haveit=
- if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem" \
- || test "X$additional_libdir" = "X/usr/local/$acl_libdirstem2"; then
+ if test "X$dependency_libdir" = "X/usr/local/$acl_libdirstem" \
+ || test "X$dependency_libdir" = "X/usr/local/$acl_libdirstem2" \
+ || test "X$dependency_libdir" = "X/usr/local/$acl_libdirstem3"; then
 if test -n "$GCC"; then
 case $host_os in
 linux* | gnu* | k*bsd*-gnu) haveit=yes;;
@@ -8164,43 +10553,43 @@
 haveit=
 for x in $LDFLAGS $LIBICONV; do
 
- acl_save_prefix="$prefix"
+ acl_saved_prefix="$prefix"
 prefix="$acl_final_prefix"
- acl_save_exec_prefix="$exec_prefix"
+ acl_saved_exec_prefix="$exec_prefix"
 exec_prefix="$acl_final_exec_prefix"
 eval x=\"$x\"
- exec_prefix="$acl_save_exec_prefix"
- prefix="$acl_save_prefix"
+ exec_prefix="$acl_saved_exec_prefix"
+ prefix="$acl_saved_prefix"
 
- if test "X$x" = "X-L$additional_libdir"; then
+ if test "X$x" = "X-L$dependency_libdir"; then
 haveit=yes
 break
 fi
 done
 if test -z "$haveit"; then
- if test -d "$additional_libdir"; then
- LIBICONV="${LIBICONV}${LIBICONV:+ }-L$additional_libdir"
+ if test -d "$dependency_libdir"; then
+ LIBICONV="${LIBICONV}${LIBICONV:+ }-L$dependency_libdir"
 fi
 fi
 haveit=
 for x in $LDFLAGS $LTLIBICONV; do
 
- acl_save_prefix="$prefix"
+ acl_saved_prefix="$prefix"
 prefix="$acl_final_prefix"
- acl_save_exec_prefix="$exec_prefix"
+ acl_saved_exec_prefix="$exec_prefix"
 exec_prefix="$acl_final_exec_prefix"
 eval x=\"$x\"
- exec_prefix="$acl_save_exec_prefix"
- prefix="$acl_save_prefix"
+ exec_prefix="$acl_saved_exec_prefix"
+ prefix="$acl_saved_prefix"
 
- if test "X$x" = "X-L$additional_libdir"; then
+ if test "X$x" = "X-L$dependency_libdir"; then
 haveit=yes
 break
 fi
 done
 if test -z "$haveit"; then
- if test -d "$additional_libdir"; then
- LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-L$additional_libdir"
+ if test -d "$dependency_libdir"; then
+ LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-L$dependency_libdir"
 fi
 fi
 fi
@@ -8232,7 +10621,14 @@
 fi
 ;;
 -l*)
- names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'`
+ dep=`echo "X$dep" | sed -e 's/^X-l//'`
+ if test "X$dep" != Xc \
+ || case $host_os in
+ linux* | gnu* | k*bsd*-gnu) false ;;
+ *) true ;;
+ esac; then
+ names_next_round="$names_next_round $dep"
+ fi
 ;;
 *.la)
 names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'`
@@ -8258,17 +10654,17 @@
 for found_dir in $rpathdirs; do
 alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir"
 done
- acl_save_libdir="$libdir"
+ acl_saved_libdir="$libdir"
 libdir="$alldirs"
 eval flag=\"$acl_hardcode_libdir_flag_spec\"
- libdir="$acl_save_libdir"
+ libdir="$acl_saved_libdir"
 LIBICONV="${LIBICONV}${LIBICONV:+ }$flag"
 else
 for found_dir in $rpathdirs; do
- acl_save_libdir="$libdir"
+ acl_saved_libdir="$libdir"
 libdir="$found_dir"
 eval flag=\"$acl_hardcode_libdir_flag_spec\"
- libdir="$acl_save_libdir"
+ libdir="$acl_saved_libdir"
 LIBICONV="${LIBICONV}${LIBICONV:+ }$flag"
 done
 fi
@@ -8285,6 +10681,14 @@
 
 
 
+ gl_sed_double_backslashes='s/\\/\\\\/g'
+ gl_sed_escape_doublequotes='s/"/\\"/g'
+ gl_sed_escape_for_make_1="s,\$ \"&'();<>\\\\\`|\$,\\\\\\1,g"
+ gl_sed_escape_for_make_2='s,\$,\\$$,g'
+ case `echo r | tr -d '\r'` in
+ '') gl_tr_cr='\015' ;;
+ *) gl_tr_cr='\r' ;;
+ esac
 
 
 
@@ -8308,78 +10712,86 @@
 
 
 
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CFPreferencesCopyAppValue" >&5
-$as_echo_n "checking for CFPreferencesCopyAppValue... " >&6; }
-if ${gt_cv_func_CFPreferencesCopyAppValue+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- gt_save_LIBS="$LIBS"
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for CFPreferencesCopyAppValue" >&5
+printf %s "checking for CFPreferencesCopyAppValue... " >&6; }
+if test ${gt_cv_func_CFPreferencesCopyAppValue+y}
+then :
+ printf %s "(cached) " >&6
+else case e in #(
+ e) gt_saved_LIBS="$LIBS"
 LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 #include <CoreFoundation/CFPreferences.h>
 int
-main ()
+main (void)
 {
 CFPreferencesCopyAppValue(NULL, NULL)
 ;
 return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
 gt_cv_func_CFPreferencesCopyAppValue=yes
-else
- gt_cv_func_CFPreferencesCopyAppValue=no
+else case e in #(
+ e) gt_cv_func_CFPreferencesCopyAppValue=no ;;
+esac
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
 conftest$ac_exeext conftest.$ac_ext
- LIBS="$gt_save_LIBS"
+ LIBS="$gt_saved_LIBS" ;;
+esac
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_CFPreferencesCopyAppValue" >&5
-$as_echo "$gt_cv_func_CFPreferencesCopyAppValue" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_CFPreferencesCopyAppValue" >&5
+printf "%s\n" "$gt_cv_func_CFPreferencesCopyAppValue" >&6; }
 if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then
 
-$as_echo "#define HAVE_CFPREFERENCESCOPYAPPVALUE 1" >>confdefs.h
+printf "%s\n" "#define HAVE_CFPREFERENCESCOPYAPPVALUE 1" >>confdefs.h
 
 fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CFLocaleCopyCurrent" >&5
-$as_echo_n "checking for CFLocaleCopyCurrent... " >&6; }
-if ${gt_cv_func_CFLocaleCopyCurrent+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- gt_save_LIBS="$LIBS"
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for CFLocaleCopyPreferredLanguages" >&5
+printf %s "checking for CFLocaleCopyPreferredLanguages... " >&6; }
+if test ${gt_cv_func_CFLocaleCopyPreferredLanguages+y}
+then :
+ printf %s "(cached) " >&6
+else case e in #(
+ e) gt_saved_LIBS="$LIBS"
 LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 #include <CoreFoundation/CFLocale.h>
 int
-main ()
+main (void)
 {
-CFLocaleCopyCurrent();
+CFLocaleCopyPreferredLanguages();
 ;
 return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- gt_cv_func_CFLocaleCopyCurrent=yes
-else
- gt_cv_func_CFLocaleCopyCurrent=no
+if ac_fn_c_try_link "$LINENO"
+then :
+ gt_cv_func_CFLocaleCopyPreferredLanguages=yes
+else case e in #(
+ e) gt_cv_func_CFLocaleCopyPreferredLanguages=no ;;
+esac
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
 conftest$ac_exeext conftest.$ac_ext
- LIBS="$gt_save_LIBS"
+ LIBS="$gt_saved_LIBS" ;;
+esac
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_CFLocaleCopyCurrent" >&5
-$as_echo "$gt_cv_func_CFLocaleCopyCurrent" >&6; }
- if test $gt_cv_func_CFLocaleCopyCurrent = yes; then
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gt_cv_func_CFLocaleCopyPreferredLanguages" >&5
+printf "%s\n" "$gt_cv_func_CFLocaleCopyPreferredLanguages" >&6; }
+ if test $gt_cv_func_CFLocaleCopyPreferredLanguages = yes; then
 
-$as_echo "#define HAVE_CFLOCALECOPYCURRENT 1" >>confdefs.h
+printf "%s\n" "#define HAVE_CFLOCALECOPYPREFERREDLANGUAGES 1" >>confdefs.h
 
 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"
+ if test $gt_cv_func_CFPreferencesCopyAppValue = yes \
+ || test $gt_cv_func_CFLocaleCopyPreferredLanguages = yes; then
+ INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation -Wl,-framework -Wl,CoreServices"
 fi
 
 
@@ -8419,41 +10831,50 @@
 gt_expression_test_code=
 fi
 
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU gettext in libc" >&5
-$as_echo_n "checking for GNU gettext in libc... " >&6; }
-if eval \${$gt_func_gnugettext_libc+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GNU gettext in libc" >&5
+printf %s "checking for GNU gettext in libc... " >&6; }
+if eval test \${$gt_func_gnugettext_libc+y}
+then :
+ printf %s "(cached) " >&6
+else case e in #(
+ e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 
 #include <libintl.h>
-$gt_revision_test_code
+#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
 extern int _nl_msg_cat_cntr;
 extern int *_nl_domain_bindings;
+#define __GNU_GETTEXT_SYMBOL_EXPRESSION (_nl_msg_cat_cntr + *_nl_domain_bindings)
+#else
+#define __GNU_GETTEXT_SYMBOL_EXPRESSION 0
+#endif
+$gt_revision_test_code
 
 int
-main ()
+main (void)
 {
 
 bindtextdomain ("", "");
-return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_domain_bindings
+return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION
 
 ;
 return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
 eval "$gt_func_gnugettext_libc=yes"
-else
- eval "$gt_func_gnugettext_libc=no"
+else case e in #(
+ e) eval "$gt_func_gnugettext_libc=no" ;;
+esac
 fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
+ conftest$ac_exeext conftest.$ac_ext ;;
+esac
 fi
 eval ac_res=\$$gt_func_gnugettext_libc
-	 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
+	 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf "%s\n" "$ac_res" >&6; }
 
 if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" != "yes"; }; then
 
@@ -8461,19 +10882,19 @@
 
 
 
- am_save_CPPFLAGS="$CPPFLAGS"
+ gl_saved_CPPFLAGS="$CPPFLAGS"
 
 for element in $INCICONV; do
 haveit=
 for x in $CPPFLAGS; do
 
- acl_save_prefix="$prefix"
+ acl_saved_prefix="$prefix"
 prefix="$acl_final_prefix"
- acl_save_exec_prefix="$exec_prefix"
+ acl_saved_exec_prefix="$exec_prefix"
 exec_prefix="$acl_final_exec_prefix"
 eval x=\"$x\"
- exec_prefix="$acl_save_exec_prefix"
- prefix="$acl_save_prefix"
+ exec_prefix="$acl_saved_exec_prefix"
+ prefix="$acl_saved_prefix"
 
 if test "X$x" = "X$element"; then
 haveit=yes
@@ -8486,12 +10907,13 @@
 done
 
 
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for iconv" >&5
-$as_echo_n "checking for iconv... " >&6; }
-if ${am_cv_func_iconv+:} false; then :
- $as_echo_n "(cached) " >&6
-else
-
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for iconv" >&5
+printf %s "checking for iconv... " >&6; }
+if test ${am_cv_func_iconv+y}
+then :
+ printf %s "(cached) " >&6
+else case e in #(
+ e)
 am_cv_func_iconv="no, consider installing GNU libiconv"
 am_cv_lib_iconv=no
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -8501,7 +10923,7 @@
 #include <iconv.h>
 
 int
-main ()
+main (void)
 {
 iconv_t cd = iconv_open("","");
 iconv(cd,NULL,NULL,NULL,NULL);
@@ -8510,13 +10932,14 @@
 return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
 am_cv_func_iconv=yes
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
 conftest$ac_exeext conftest.$ac_ext
 if test "$am_cv_func_iconv" != yes; then
- am_save_LIBS="$LIBS"
+ gl_saved_LIBS="$LIBS"
 LIBS="$LIBS $LIBICONV"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
@@ -8525,7 +10948,7 @@
 #include <iconv.h>
 
 int
-main ()
+main (void)
 {
 iconv_t cd = iconv_open("","");
 iconv(cd,NULL,NULL,NULL,NULL);
@@ -8534,38 +10957,42 @@
 return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
 am_cv_lib_iconv=yes
 am_cv_func_iconv=yes
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
 conftest$ac_exeext conftest.$ac_ext
- LIBS="$am_save_LIBS"
+ LIBS="$gl_saved_LIBS"
 fi
-
+ ;;
+esac
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv" >&5
-$as_echo "$am_cv_func_iconv" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv" >&5
+printf "%s\n" "$am_cv_func_iconv" >&6; }
 if test "$am_cv_func_iconv" = yes; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working iconv" >&5
-$as_echo_n "checking for working iconv... " >&6; }
-if ${am_cv_func_iconv_works+:} false; then :
- $as_echo_n "(cached) " >&6
-else
-
- am_save_LIBS="$LIBS"
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for working iconv" >&5
+printf %s "checking for working iconv... " >&6; }
+if test ${am_cv_func_iconv_works+y}
+then :
+ printf %s "(cached) " >&6
+else case e in #(
+ e)
+ gl_saved_LIBS="$LIBS"
 if test $am_cv_lib_iconv = yes; then
 LIBS="$LIBS $LIBICONV"
 fi
 am_cv_func_iconv_works=no
 for ac_iconv_const in '' 'const'; do
- if test "$cross_compiling" = yes; then :
+ if test "$cross_compiling" = yes
+then :
 case "$host_os" in
 aix* | hpux*) am_cv_func_iconv_works="guessing no" ;;
 *) am_cv_func_iconv_works="guessing yes" ;;
 esac
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+else case e in #(
+ e) cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 
 #include <iconv.h>
@@ -8576,11 +11003,12 @@
 #endif
 
 int
-main ()
+main (void)
 {
 int result = 0;
- /* Test against AIX 5.1 bug: Failures are not distinguishable from successful
- returns. */
+ /* Test against AIX 5.1...7.2 bug: Failures are not distinguishable from
+ successful returns. This is even documented in
+ <https://www.ibm.com/support/knowledgecenter/ssw_aix_72/i_bostechref/iconv.html> */
 {
 iconv_t cd_utf8_to_88591 = iconv_open ("ISO8859-1", "UTF-8");
 if (cd_utf8_to_88591 != (iconv_t)(-1))
@@ -8661,35 +11089,50 @@
 #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;
+ {
+ /* Try standardized names. */
+ iconv_t cd1 = iconv_open ("UTF-8", "EUC-JP");
+ /* Try IRIX, OSF/1 names. */
+ iconv_t cd2 = iconv_open ("UTF-8", "eucJP");
+ /* Try AIX names. */
+ iconv_t cd3 = iconv_open ("UTF-8", "IBM-eucJP");
+ /* Try HP-UX names. */
+ iconv_t cd4 = iconv_open ("utf8", "eucJP");
+ if (cd1 == (iconv_t)(-1) && cd2 == (iconv_t)(-1)
+ && cd3 == (iconv_t)(-1) && cd4 == (iconv_t)(-1))
+ result |= 16;
+ if (cd1 != (iconv_t)(-1))
+ iconv_close (cd1);
+ if (cd2 != (iconv_t)(-1))
+ iconv_close (cd2);
+ if (cd3 != (iconv_t)(-1))
+ iconv_close (cd3);
+ if (cd4 != (iconv_t)(-1))
+ iconv_close (cd4);
+ }
 return result;
 
 ;
 return 0;
 }
 _ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_run "$LINENO"
+then :
 am_cv_func_iconv_works=yes
 fi
 rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
- conftest.$ac_objext conftest.beam conftest.$ac_ext
+ conftest.$ac_objext conftest.beam conftest.$ac_ext ;;
+esac
 fi
 
 test "$am_cv_func_iconv_works" = no || break
 done
- LIBS="$am_save_LIBS"
-
+ LIBS="$gl_saved_LIBS"
+ ;;
+esac
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv_works" >&5
-$as_echo "$am_cv_func_iconv_works" >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv_works" >&5
+printf "%s\n" "$am_cv_func_iconv_works" >&6; }
 case "$am_cv_func_iconv_works" in
 *no) am_func_iconv=no am_cv_lib_iconv=no ;;
 *) am_func_iconv=yes ;;
@@ -8699,16 +11142,16 @@
 fi
 if test "$am_func_iconv" = yes; then
 
-$as_echo "#define HAVE_ICONV 1" >>confdefs.h
+printf "%s\n" "#define HAVE_ICONV 1" >>confdefs.h
 
 fi
 if test "$am_cv_lib_iconv" = yes; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to link with libiconv" >&5
-$as_echo_n "checking how to link with libiconv... " >&6; }
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBICONV" >&5
-$as_echo "$LIBICONV" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to link with libiconv" >&5
+printf %s "checking how to link with libiconv... " >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LIBICONV" >&5
+printf "%s\n" "$LIBICONV" >&6; }
 else
- CPPFLAGS="$am_save_CPPFLAGS"
+ CPPFLAGS="$gl_saved_CPPFLAGS"
 LIBICONV=
 LTLIBICONV=
 fi
@@ -8722,52 +11165,60 @@
 
 
 
-
 use_additional=yes
 
- acl_save_prefix="$prefix"
+ acl_saved_prefix="$prefix"
 prefix="$acl_final_prefix"
- acl_save_exec_prefix="$exec_prefix"
+ acl_saved_exec_prefix="$exec_prefix"
 exec_prefix="$acl_final_exec_prefix"
 
 eval additional_includedir=\"$includedir\"
 eval additional_libdir=\"$libdir\"
+ eval additional_libdir2=\"$exec_prefix/$acl_libdirstem2\"
+ eval additional_libdir3=\"$exec_prefix/$acl_libdirstem3\"
 
- exec_prefix="$acl_save_exec_prefix"
- prefix="$acl_save_prefix"
+ exec_prefix="$acl_saved_exec_prefix"
+ prefix="$acl_saved_prefix"
 
 
 # Check whether --with-libintl-prefix was given.
-if test "${with_libintl_prefix+set}" = set; then :
+if test ${with_libintl_prefix+y}
+then :
 withval=$with_libintl_prefix;
 if test "X$withval" = "Xno"; then
 use_additional=no
 else
 if test "X$withval" = "X"; then
 
- acl_save_prefix="$prefix"
+ acl_saved_prefix="$prefix"
 prefix="$acl_final_prefix"
- acl_save_exec_prefix="$exec_prefix"
+ acl_saved_exec_prefix="$exec_prefix"
 exec_prefix="$acl_final_exec_prefix"
 
 eval additional_includedir=\"$includedir\"
 eval additional_libdir=\"$libdir\"
+ eval additional_libdir2=\"$exec_prefix/$acl_libdirstem2\"
+ eval additional_libdir3=\"$exec_prefix/$acl_libdirstem3\"
 
- exec_prefix="$acl_save_exec_prefix"
- prefix="$acl_save_prefix"
+ exec_prefix="$acl_saved_exec_prefix"
+ prefix="$acl_saved_prefix"
 
 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
+ additional_libdir2="$withval/$acl_libdirstem2"
+ additional_libdir3="$withval/$acl_libdirstem3"
 fi
 fi
 
 fi
 
+ if test "X$additional_libdir2" = "X$additional_libdir"; then
+ additional_libdir2=
+ fi
+ if test "X$additional_libdir3" = "X$additional_libdir"; then
+ additional_libdir3=
+ fi
 LIBINTL=
 LTLIBINTL=
 INCINTL=
@@ -8813,62 +11264,68 @@
 shrext=
 fi
 if test $use_additional = yes; then
- dir="$additional_libdir"
- 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"
+ for additional_libdir_variable in additional_libdir additional_libdir2 additional_libdir3; do
+ if test "X$found_dir" = "X"; then
+ eval dir=\$$additional_libdir_variable
+ if test -n "$dir"; then
+ if test -n "$acl_shlibext"; then
+ if test -f "$dir/$libname$shrext" && acl_is_expected_elfclass < "$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" && acl_is_expected_elfclass < "$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" && acl_is_expected_elfclass < "$dir/$f"; then
+ found_dir="$dir"
+ found_so="$dir/$f"
+ break
+ fi
+ done
+ fi
+ fi
 fi
- else
- eval library_names=\"$acl_library_names_spec\"
- for f in $library_names; do
- if test -f "$dir/$f"; then
+ if test "X$found_dir" = "X"; then
+ if test -f "$dir/$libname.$acl_libext" && ${AR-ar} -p "$dir/$libname.$acl_libext" | acl_is_expected_elfclass; then
 found_dir="$dir"
- found_so="$dir/$f"
- break
+ found_a="$dir/$libname.$acl_libext"
 fi
- done
+ fi
+ if test "X$found_dir" != "X"; then
+ if test -f "$dir/$libname.la"; then
+ found_la="$dir/$libname.la"
+ fi
+ fi
 fi
 fi
- fi
- 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
+ done
 fi
 if test "X$found_dir" = "X"; then
 for x in $LDFLAGS $LTLIBINTL; do
 
- acl_save_prefix="$prefix"
+ acl_saved_prefix="$prefix"
 prefix="$acl_final_prefix"
- acl_save_exec_prefix="$exec_prefix"
+ acl_saved_exec_prefix="$exec_prefix"
 exec_prefix="$acl_final_exec_prefix"
 eval x=\"$x\"
- exec_prefix="$acl_save_exec_prefix"
- prefix="$acl_save_prefix"
+ exec_prefix="$acl_saved_exec_prefix"
+ prefix="$acl_saved_prefix"
 
 case "$x" in
 -L*)
 dir=`echo "X$x" | sed -e 's/^X-L//'`
 if test -n "$acl_shlibext"; then
- if test -f "$dir/$libname$shrext"; then
+ if test -f "$dir/$libname$shrext" && acl_is_expected_elfclass < "$dir/$libname$shrext"; then
 found_dir="$dir"
 found_so="$dir/$libname$shrext"
 else
@@ -8878,14 +11335,14 @@
 | 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
+ if test -n "$ver" && test -f "$dir/$libname$shrext.$ver" && acl_is_expected_elfclass < "$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
+ if test -f "$dir/$f" && acl_is_expected_elfclass < "$dir/$f"; then
 found_dir="$dir"
 found_so="$dir/$f"
 break
@@ -8895,7 +11352,7 @@
 fi
 fi
 if test "X$found_dir" = "X"; then
- if test -f "$dir/$libname.$acl_libext"; then
+ if test -f "$dir/$libname.$acl_libext" && ${AR-ar} -p "$dir/$libname.$acl_libext" | acl_is_expected_elfclass; then
 found_dir="$dir"
 found_a="$dir/$libname.$acl_libext"
 fi
@@ -8917,7 +11374,8 @@
 if test "X$found_so" != "X"; then
 if test "$enable_rpath" = no \
 || test "X$found_dir" = "X/usr/$acl_libdirstem" \
- || test "X$found_dir" = "X/usr/$acl_libdirstem2"; then
+ || test "X$found_dir" = "X/usr/$acl_libdirstem2" \
+ || test "X$found_dir" = "X/usr/$acl_libdirstem3"; then
 LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so"
 else
 haveit=
@@ -8949,13 +11407,13 @@
 haveit=
 for x in $LDFLAGS $LIBINTL; do
 
- acl_save_prefix="$prefix"
+ acl_saved_prefix="$prefix"
 prefix="$acl_final_prefix"
- acl_save_exec_prefix="$exec_prefix"
+ acl_saved_exec_prefix="$exec_prefix"
 exec_prefix="$acl_final_exec_prefix"
 eval x=\"$x\"
- exec_prefix="$acl_save_exec_prefix"
- prefix="$acl_save_prefix"
+ exec_prefix="$acl_saved_exec_prefix"
+ prefix="$acl_saved_prefix"
 
 if test "X$x" = "X-L$found_dir"; then
 haveit=yes
@@ -8996,6 +11454,13 @@
 fi
 additional_includedir="$basedir/include"
 ;;
+ */$acl_libdirstem3 | */$acl_libdirstem3/)
+ basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem3/"'*$,,'`
+ if test "$name" = 'intl'; then
+ LIBINTL_PREFIX="$basedir"
+ fi
+ additional_includedir="$basedir/include"
+ ;;
 esac
 if test "X$additional_includedir" != "X"; then
 if test "X$additional_includedir" != "X/usr/include"; then
@@ -9010,13 +11475,13 @@
 if test -z "$haveit"; then
 for x in $CPPFLAGS $INCINTL; do
 
- acl_save_prefix="$prefix"
+ acl_saved_prefix="$prefix"
 prefix="$acl_final_prefix"
- acl_save_exec_prefix="$exec_prefix"
+ acl_saved_exec_prefix="$exec_prefix"
 exec_prefix="$acl_final_exec_prefix"
 eval x=\"$x\"
- exec_prefix="$acl_save_exec_prefix"
- prefix="$acl_save_prefix"
+ exec_prefix="$acl_saved_exec_prefix"
+ prefix="$acl_saved_prefix"
 
 if test "X$x" = "X-I$additional_includedir"; then
 haveit=yes
@@ -9032,21 +11497,23 @@
 fi
 fi
 if test -n "$found_la"; then
- save_libdir="$libdir"
+ saved_libdir="$libdir"
 case "$found_la" in
 */* | *\\*) . "$found_la" ;;
 *) . "./$found_la" ;;
 esac
- libdir="$save_libdir"
+ libdir="$saved_libdir"
 for dep in $dependency_libs; do
 case "$dep" in
 -L*)
- additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'`
- if test "X$additional_libdir" != "X/usr/$acl_libdirstem" \
- && test "X$additional_libdir" != "X/usr/$acl_libdirstem2"; then
+ dependency_libdir=`echo "X$dep" | sed -e 's/^X-L//'`
+ if test "X$dependency_libdir" != "X/usr/$acl_libdirstem" \
+ && test "X$dependency_libdir" != "X/usr/$acl_libdirstem2" \
+ && test "X$dependency_libdir" != "X/usr/$acl_libdirstem3"; then
 haveit=
- if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem" \
- || test "X$additional_libdir" = "X/usr/local/$acl_libdirstem2"; then
+ if test "X$dependency_libdir" = "X/usr/local/$acl_libdirstem" \
+ || test "X$dependency_libdir" = "X/usr/local/$acl_libdirstem2" \
+ || test "X$dependency_libdir" = "X/usr/local/$acl_libdirstem3"; then
 if test -n "$GCC"; then
 case $host_os in
 linux* | gnu* | k*bsd*-gnu) haveit=yes;;
@@ -9057,43 +11524,43 @@
 haveit=
 for x in $LDFLAGS $LIBINTL; do
 
- acl_save_prefix="$prefix"
+ acl_saved_prefix="$prefix"
 prefix="$acl_final_prefix"
- acl_save_exec_prefix="$exec_prefix"
+ acl_saved_exec_prefix="$exec_prefix"
 exec_prefix="$acl_final_exec_prefix"
 eval x=\"$x\"
- exec_prefix="$acl_save_exec_prefix"
- prefix="$acl_save_prefix"
+ exec_prefix="$acl_saved_exec_prefix"
+ prefix="$acl_saved_prefix"
 
- if test "X$x" = "X-L$additional_libdir"; then
+ if test "X$x" = "X-L$dependency_libdir"; then
 haveit=yes
 break
 fi
 done
 if test -z "$haveit"; then
- if test -d "$additional_libdir"; then
- LIBINTL="${LIBINTL}${LIBINTL:+ }-L$additional_libdir"
+ if test -d "$dependency_libdir"; then
+ LIBINTL="${LIBINTL}${LIBINTL:+ }-L$dependency_libdir"
 fi
 fi
 haveit=
 for x in $LDFLAGS $LTLIBINTL; do
 
- acl_save_prefix="$prefix"
+ acl_saved_prefix="$prefix"
 prefix="$acl_final_prefix"
- acl_save_exec_prefix="$exec_prefix"
+ acl_saved_exec_prefix="$exec_prefix"
 exec_prefix="$acl_final_exec_prefix"
 eval x=\"$x\"
- exec_prefix="$acl_save_exec_prefix"
- prefix="$acl_save_prefix"
+ exec_prefix="$acl_saved_exec_prefix"
+ prefix="$acl_saved_prefix"
 
- if test "X$x" = "X-L$additional_libdir"; then
+ if test "X$x" = "X-L$dependency_libdir"; then
 haveit=yes
 break
 fi
 done
 if test -z "$haveit"; then
- if test -d "$additional_libdir"; then
- LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-L$additional_libdir"
+ if test -d "$dependency_libdir"; then
+ LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-L$dependency_libdir"
 fi
 fi
 fi
@@ -9125,7 +11592,14 @@
 fi
 ;;
 -l*)
- names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'`
+ dep=`echo "X$dep" | sed -e 's/^X-l//'`
+ if test "X$dep" != Xc \
+ || case $host_os in
+ linux* | gnu* | k*bsd*-gnu) false ;;
+ *) true ;;
+ esac; then
+ names_next_round="$names_next_round $dep"
+ fi
 ;;
 *.la)
 names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'`
@@ -9151,17 +11625,17 @@
 for found_dir in $rpathdirs; do
 alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir"
 done
- acl_save_libdir="$libdir"
+ acl_saved_libdir="$libdir"
 libdir="$alldirs"
 eval flag=\"$acl_hardcode_libdir_flag_spec\"
- libdir="$acl_save_libdir"
+ libdir="$acl_saved_libdir"
 LIBINTL="${LIBINTL}${LIBINTL:+ }$flag"
 else
 for found_dir in $rpathdirs; do
- acl_save_libdir="$libdir"
+ acl_saved_libdir="$libdir"
 libdir="$found_dir"
 eval flag=\"$acl_hardcode_libdir_flag_spec\"
- libdir="$acl_save_libdir"
+ libdir="$acl_saved_libdir"
 LIBINTL="${LIBINTL}${LIBINTL:+ }$flag"
 done
 fi
@@ -9176,13 +11650,13 @@
 
 
 
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU gettext in libintl" >&5
-$as_echo_n "checking for GNU gettext in libintl... " >&6; }
-if eval \${$gt_func_gnugettext_libintl+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- gt_save_CPPFLAGS="$CPPFLAGS"
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for GNU gettext in libintl" >&5
+printf %s "checking for GNU gettext in libintl... " >&6; }
+if eval test \${$gt_func_gnugettext_libintl+y}
+then :
+ printf %s "(cached) " >&6
+else case e in #(
+ e) gt_save_CPPFLAGS="$CPPFLAGS"
 CPPFLAGS="$CPPFLAGS $INCINTL"
 gt_save_LIBS="$LIBS"
 LIBS="$LIBS $LIBINTL"
@@ -9190,78 +11664,99 @@
 /* end confdefs.h. */
 
 #include <libintl.h>
-$gt_revision_test_code
+#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
 extern int _nl_msg_cat_cntr;
 extern
 #ifdef __cplusplus
 "C"
 #endif
 const char *_nl_expand_alias (const char *);
+#define __GNU_GETTEXT_SYMBOL_EXPRESSION (_nl_msg_cat_cntr + *_nl_expand_alias (""))
+#else
+#define __GNU_GETTEXT_SYMBOL_EXPRESSION 0
+#endif
+$gt_revision_test_code
 
 int
-main ()
+main (void)
 {
 
 bindtextdomain ("", "");
-return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")
+return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION
 
 ;
 return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"
+then :
 eval "$gt_func_gnugettext_libintl=yes"
-else
- eval "$gt_func_gnugettext_libintl=no"
+else case e in #(
+ e) eval "$gt_func_gnugettext_libintl=no" ;;
+esac
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
 conftest$ac_exeext conftest.$ac_ext
- if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" != yes; } && test -n "$LIBICONV"; then
- LIBS="$LIBS $LIBICONV"
+ gt_LIBINTL_EXTRA="$INTL_MACOSX_LIBS"
+
+ case "$host_os" in
+ aix*) gt_LIBINTL_EXTRA="-lpthread" ;;
+ esac
+ if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" != yes; } \
+ && { test -n "$LIBICONV" || test -n "$gt_LIBINTL_EXTRA"; }; then
+ LIBS="$LIBS $LIBICONV $gt_LIBINTL_EXTRA"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h. */
 
 #include <libintl.h>
-$gt_revision_test_code
+#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
 extern int _nl_msg_cat_cntr;
 extern
 #ifdef __cplusplus
 "C"
 #endif
 const char *_nl_expand_alias (const char *);
+#define __GNU_GETTEXT_SYMBOL_EXPRESSION (_nl_msg_cat_cntr + *_nl_expand_alias (""))
+#else
+#define __GNU_GETTEXT_SYMBOL_EXPRESSION 0
+#endif
+$gt_revision_test_code
 
 int
-main ()
+main (void)
 {
 
 bindtextdomain ("", "");
-return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_alias ("")
+return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION
 
 ;
 return 0;
 }
 _ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- LIBINTL="$LIBINTL $LIBICONV"
- LTLIBINTL="$LTLIBINTL $LTLIBICONV"
+if ac_fn_c_try_link "$LINENO"
+then :
+ LIBINTL="$LIBINTL $LIBICONV $gt_LIBINTL_EXTRA"
+ LTLIBINTL="$LTLIBINTL $LTLIBICONV $gt_LIBINTL_EXTRA"
 eval "$gt_func_gnugettext_libintl=yes"
 
 fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
 conftest$ac_exeext conftest.$ac_ext
 fi
 CPPFLAGS="$gt_save_CPPFLAGS"
- LIBS="$gt_save_LIBS"
+ LIBS="$gt_save_LIBS" ;;
+esac
 fi
 eval ac_res=\$$gt_func_gnugettext_libintl
-	 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
+	 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+printf "%s\n" "$ac_res" >&6; }
 fi
 
 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
+ && test "$PACKAGE" != gettext-tools \
+ && test "$PACKAGE" != libintl; }; then
 gt_use_preinstalled_gnugettext=yes
 else
 LIBINTL=
@@ -9282,20 +11777,20 @@
 if test "$gt_use_preinstalled_gnugettext" = "yes" \
 || test "$nls_cv_use_gnu_gettext" = "yes"; then
 
-$as_echo "#define ENABLE_NLS 1" >>confdefs.h
+printf "%s\n" "#define ENABLE_NLS 1" >>confdefs.h
 
 else
 USE_NLS=no
 fi
 fi
 
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use NLS" >&5
-$as_echo_n "checking whether to use NLS... " >&6; }
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_NLS" >&5
-$as_echo "$USE_NLS" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to use NLS" >&5
+printf %s "checking whether to use NLS... " >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $USE_NLS" >&5
+printf "%s\n" "$USE_NLS" >&6; }
 if test "$USE_NLS" = "yes"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking where the gettext function comes from" >&5
-$as_echo_n "checking where the gettext function comes from... " >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking where the gettext function comes from" >&5
+printf %s "checking where the gettext function comes from... " >&6; }
 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"
@@ -9305,30 +11800,30 @@
 else
 gt_source="included intl directory"
 fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gt_source" >&5
-$as_echo "$gt_source" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gt_source" >&5
+printf "%s\n" "$gt_source" >&6; }
 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
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to link with libintl" >&5
-$as_echo_n "checking how to link with libintl... " >&6; }
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBINTL" >&5
-$as_echo "$LIBINTL" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to link with libintl" >&5
+printf %s "checking how to link with libintl... " >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LIBINTL" >&5
+printf "%s\n" "$LIBINTL" >&6; }
 
 for element in $INCINTL; do
 haveit=
 for x in $CPPFLAGS; do
 
- acl_save_prefix="$prefix"
+ acl_saved_prefix="$prefix"
 prefix="$acl_final_prefix"
- acl_save_exec_prefix="$exec_prefix"
+ acl_saved_exec_prefix="$exec_prefix"
 exec_prefix="$acl_final_exec_prefix"
 eval x=\"$x\"
- exec_prefix="$acl_save_exec_prefix"
- prefix="$acl_save_prefix"
+ exec_prefix="$acl_saved_exec_prefix"
+ prefix="$acl_saved_prefix"
 
 if test "X$x" = "X$element"; then
 haveit=yes
@@ -9343,10 +11838,10 @@
 fi
 
 
-$as_echo "#define HAVE_GETTEXT 1" >>confdefs.h
+printf "%s\n" "#define HAVE_GETTEXT 1" >>confdefs.h
 
 
-$as_echo "#define HAVE_DCGETTEXT 1" >>confdefs.h
+printf "%s\n" "#define HAVE_DCGETTEXT 1" >>confdefs.h
 
 fi
 
@@ -9355,13 +11850,52 @@
 
 
 
- INTLLIBS="$LIBINTL"
 
+ INTLLIBS="$LIBINTL"
 
 
 
 
 
+
+
+ gt_save_prefix="${prefix}"
+ gt_save_datarootdir="${datarootdir}"
+ gt_save_localedir="${localedir}"
+ if test "X$prefix" = "XNONE"; then
+ prefix="$ac_default_prefix"
+ fi
+ eval datarootdir="$datarootdir"
+ eval localedir="$localedir"
+
+
+
+
+
+ gl_final_localedir="$localedir"
+ case "$build_os" in
+ cygwin*)
+ case "$host_os" in
+ mingw* | windows*)
+ gl_final_localedir=`cygpath -w "$gl_final_localedir"` ;;
+ esac
+ ;;
+ esac
+ localedir_c=`printf '%s\n' "$gl_final_localedir" | sed -e "$gl_sed_double_backslashes" -e "$gl_sed_escape_doublequotes" | tr -d "$gl_tr_cr"`
+ localedir_c='"'"$localedir_c"'"'
+
+
+ localedir_c_make=`printf '%s\n' "$localedir_c" | sed -e "$gl_sed_escape_for_make_1" -e "$gl_sed_escape_for_make_2" | tr -d "$gl_tr_cr"`
+ if test "$localedir_c_make" = '\"'"${gl_final_localedir}"'\"'; then
+ localedir_c_make='\"$(localedir)\"'
+ fi
+
+
+ localedir="${gt_save_localedir}"
+ datarootdir="${gt_save_datarootdir}"
+ prefix="${gt_save_prefix}"
+
+
 if test "$MSGFMT" = ":" ; then
 as_fn_error $? "msgfmt was not found; have you installed gettext?" "$LINENO" 5
 fi
@@ -9371,19 +11905,19 @@
 
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for AUDACIOUS" >&5
-$as_echo_n "checking for AUDACIOUS... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for audacious >= 4.4" >&5
+printf %s "checking for audacious >= 4.4... " >&6; }
 
 if test -n "$AUDACIOUS_CFLAGS"; then
 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.6\""; } >&5
- ($PKG_CONFIG --exists --print-errors "audacious >= 3.6") 2>&5
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"audacious >= 4.4\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "audacious >= 4.4") 2>&5
 ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
- pkg_cv_AUDACIOUS_CFLAGS=`$PKG_CONFIG --cflags "audacious >= 3.6" 2>/dev/null`
+ pkg_cv_AUDACIOUS_CFLAGS=`$PKG_CONFIG --cflags "audacious >= 4.4" 2>/dev/null`
 		 test "x$?" != "x0" && pkg_failed=yes
 else
 pkg_failed=yes
@@ -9395,12 +11929,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.6\""; } >&5
- ($PKG_CONFIG --exists --print-errors "audacious >= 3.6") 2>&5
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"audacious >= 4.4\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "audacious >= 4.4") 2>&5
 ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
- pkg_cv_AUDACIOUS_LIBS=`$PKG_CONFIG --libs "audacious >= 3.6" 2>/dev/null`
+ pkg_cv_AUDACIOUS_LIBS=`$PKG_CONFIG --libs "audacious >= 4.4" 2>/dev/null`
 		 test "x$?" != "x0" && pkg_failed=yes
 else
 pkg_failed=yes
@@ -9412,8 +11946,8 @@
 
 
 if test $pkg_failed = yes; then
- 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
 _pkg_short_errors_supported=yes
@@ -9421,25 +11955,25 @@
 _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.6" 2>&1`
+ AUDACIOUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "audacious >= 4.4" 2>&1`
 else
-	 AUDACIOUS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "audacious >= 3.6" 2>&1`
+ AUDACIOUS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "audacious >= 4.4" 2>&1`
 fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$AUDACIOUS_PKG_ERRORS" >&5
+ # Put the nasty error message in config.log where it belongs
+ echo "$AUDACIOUS_PKG_ERRORS" >&5
 
-	as_fn_error $? "Cannot find Audacious 3.6; have you installed Audacious yet?" "$LINENO" 5
+ as_fn_error $? "Cannot find Audacious 4.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.6; have you installed Audacious yet?" "$LINENO" 5
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+ as_fn_error $? "Cannot find Audacious 4.4; have you installed Audacious yet?" "$LINENO" 5
 
 else
-	AUDACIOUS_CFLAGS=$pkg_cv_AUDACIOUS_CFLAGS
-	AUDACIOUS_LIBS=$pkg_cv_AUDACIOUS_LIBS
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+ AUDACIOUS_CFLAGS=$pkg_cv_AUDACIOUS_CFLAGS
+ AUDACIOUS_LIBS=$pkg_cv_AUDACIOUS_LIBS
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
 fi
 
@@ -9450,32 +11984,34 @@
 if test $HAVE_DARWIN = yes ; then
 
 # Check whether --with-system-libxml2 was given.
-if test "${with_system_libxml2+set}" = set; then :
+if test ${with_system_libxml2+y}
+then :
 withval=$with_system_libxml2; with_system_libxml2=$withval
-else
- with_system_libxml2=yes
+else case e in #(
+ e) with_system_libxml2=yes ;;
+esac
 fi
 
 
 if test $with_system_libxml2 = yes ; then
- XML_LIBS="-lxml2"
- XML_CFLAGS="-I/usr/include/libxml2"
+ XML_LIBS=$(xml2-config --libs)
+ XML_CFLAGS=$(xml2-config --cflags)
 
 
 else
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XML" >&5
-$as_echo_n "checking for XML... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libxml-2.0" >&5
+printf %s "checking for libxml-2.0... " >&6; }
 
 if test -n "$XML_CFLAGS"; then
 pkg_cv_XML_CFLAGS="$XML_CFLAGS"
 elif test -n "$PKG_CONFIG"; then
 if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0\""; } >&5
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0\""; } >&5
 ($PKG_CONFIG --exists --print-errors "libxml-2.0") 2>&5
 ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
 pkg_cv_XML_CFLAGS=`$PKG_CONFIG --cflags "libxml-2.0" 2>/dev/null`
 		 test "x$?" != "x0" && pkg_failed=yes
@@ -9489,10 +12025,10 @@
 pkg_cv_XML_LIBS="$XML_LIBS"
 elif test -n "$PKG_CONFIG"; then
 if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0\""; } >&5
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0\""; } >&5
 ($PKG_CONFIG --exists --print-errors "libxml-2.0") 2>&5
 ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
 pkg_cv_XML_LIBS=`$PKG_CONFIG --libs "libxml-2.0" 2>/dev/null`
 		 test "x$?" != "x0" && pkg_failed=yes
@@ -9506,8 +12042,8 @@
 
 
 if test $pkg_failed = yes; then
- 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
 _pkg_short_errors_supported=yes
@@ -9515,14 +12051,14 @@
 _pkg_short_errors_supported=no
 fi
 if test $_pkg_short_errors_supported = yes; then
-	 XML_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libxml-2.0" 2>&1`
+ XML_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libxml-2.0" 2>&1`
 else
-	 XML_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libxml-2.0" 2>&1`
+ XML_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libxml-2.0" 2>&1`
 fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$XML_PKG_ERRORS" >&5
+ # Put the nasty error message in config.log where it belongs
+ echo "$XML_PKG_ERRORS" >&5
 
-	as_fn_error $? "Package requirements (libxml-2.0) were not met:
+ as_fn_error $? "Package requirements (libxml-2.0) were not met:
 
 $XML_PKG_ERRORS
 
@@ -9533,10 +12069,10 @@
 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; }
-	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf "%s\n" "$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.
@@ -9546,29 +12082,29 @@
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5; }
+See 'config.log' for more details" "$LINENO" 5; }
 else
-	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; }
+ XML_CFLAGS=$pkg_cv_XML_CFLAGS
+ XML_LIBS=$pkg_cv_XML_LIBS
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
 fi
 fi
 else
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XML" >&5
-$as_echo_n "checking for XML... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libxml-2.0" >&5
+printf %s "checking for libxml-2.0... " >&6; }
 
 if test -n "$XML_CFLAGS"; then
 pkg_cv_XML_CFLAGS="$XML_CFLAGS"
 elif test -n "$PKG_CONFIG"; then
 if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0\""; } >&5
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0\""; } >&5
 ($PKG_CONFIG --exists --print-errors "libxml-2.0") 2>&5
 ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
 pkg_cv_XML_CFLAGS=`$PKG_CONFIG --cflags "libxml-2.0" 2>/dev/null`
 		 test "x$?" != "x0" && pkg_failed=yes
@@ -9582,10 +12118,10 @@
 pkg_cv_XML_LIBS="$XML_LIBS"
 elif test -n "$PKG_CONFIG"; then
 if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0\""; } >&5
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxml-2.0\""; } >&5
 ($PKG_CONFIG --exists --print-errors "libxml-2.0") 2>&5
 ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
 pkg_cv_XML_LIBS=`$PKG_CONFIG --libs "libxml-2.0" 2>/dev/null`
 		 test "x$?" != "x0" && pkg_failed=yes
@@ -9599,8 +12135,8 @@
 
 
 if test $pkg_failed = yes; then
- 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
 _pkg_short_errors_supported=yes
@@ -9608,14 +12144,14 @@
 _pkg_short_errors_supported=no
 fi
 if test $_pkg_short_errors_supported = yes; then
-	 XML_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libxml-2.0" 2>&1`
+ XML_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libxml-2.0" 2>&1`
 else
-	 XML_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libxml-2.0" 2>&1`
+ XML_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libxml-2.0" 2>&1`
 fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$XML_PKG_ERRORS" >&5
+ # Put the nasty error message in config.log where it belongs
+ echo "$XML_PKG_ERRORS" >&5
 
-	as_fn_error $? "Package requirements (libxml-2.0) were not met:
+ as_fn_error $? "Package requirements (libxml-2.0) were not met:
 
 $XML_PKG_ERRORS
 
@@ -9626,10 +12162,10 @@
 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; }
-	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf "%s\n" "$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.
@@ -9639,105 +12175,205 @@
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5; }
+See 'config.log' for more details" "$LINENO" 5; }
 else
-	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; }
+ XML_CFLAGS=$pkg_cv_XML_CFLAGS
+ XML_LIBS=$pkg_cv_XML_LIBS
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+
+fi
+fi
+
+
+if test $USE_GTK = yes ; then
+
+pkg_failed=no
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for json-glib-1.0 >= 1.0" >&5
+printf %s "checking for json-glib-1.0 >= 1.0... " >&6; }
 
+if test -n "$JSON_GLIB_CFLAGS"; then
+ pkg_cv_JSON_GLIB_CFLAGS="$JSON_GLIB_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"json-glib-1.0 >= 1.0\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "json-glib-1.0 >= 1.0") 2>&5
+ ac_status=$?
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_JSON_GLIB_CFLAGS=`$PKG_CONFIG --cflags "json-glib-1.0 >= 1.0" 2>/dev/null`
+		 test "x$?" != "x0" && pkg_failed=yes
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+if test -n "$JSON_GLIB_LIBS"; then
+ pkg_cv_JSON_GLIB_LIBS="$JSON_GLIB_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"json-glib-1.0 >= 1.0\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "json-glib-1.0 >= 1.0") 2>&5
+ ac_status=$?
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_JSON_GLIB_LIBS=`$PKG_CONFIG --libs "json-glib-1.0 >= 1.0" 2>/dev/null`
+		 test "x$?" != "x0" && pkg_failed=yes
+else
+ pkg_failed=yes
 fi
+ else
+ pkg_failed=untried
 fi
 
 
-INPUT_PLUGINS="tonegen metronom"
+
+if test $pkg_failed = yes; then
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "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
+ JSON_GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "json-glib-1.0 >= 1.0" 2>&1`
+ else
+ JSON_GLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "json-glib-1.0 >= 1.0" 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$JSON_GLIB_PKG_ERRORS" >&5
+
+ as_fn_error $? "Package requirements (json-glib-1.0 >= 1.0) were not met:
+
+$JSON_GLIB_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 JSON_GLIB_CFLAGS
+and JSON_GLIB_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
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in '$ac_pwd':" >&5
+printf "%s\n" "$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 JSON_GLIB_CFLAGS
+and JSON_GLIB_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
+ JSON_GLIB_CFLAGS=$pkg_cv_JSON_GLIB_CFLAGS
+ JSON_GLIB_LIBS=$pkg_cv_JSON_GLIB_LIBS
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+
+fi
+fi
+
+
+INPUT_PLUGINS="metronom psf tonegen vtx xsf"
 OUTPUT_PLUGINS=""
-EFFECT_PLUGINS="compressor crossfade crystalizer mixer silence-removal stereo_plugin voice_removal echo_plugin"
+EFFECT_PLUGINS="background_music bitcrusher compressor crossfade crystalizer echo_plugin mixer silence-removal stereo_plugin voice_removal"
 GENERAL_PLUGINS=""
 VISUALIZATION_PLUGINS=""
 CONTAINER_PLUGINS="asx asx3 audpl m3u pls xspf"
 TRANSPORT_PLUGINS="gio"
 
 if test "x$USE_GTK" = "xyes" ; then
- GENERAL_PLUGINS="$GENERAL_PLUGINS alarm albumart delete-files playlist-manager search-tool"
+ EFFECT_PLUGINS="$EFFECT_PLUGINS ladspa"
+ GENERAL_PLUGINS="$GENERAL_PLUGINS albumart lyrics-gtk playlist-manager search-tool statusicon"
 GENERAL_PLUGINS="$GENERAL_PLUGINS gtkui skins"
+ VISUALIZATION_PLUGINS="$VISUALIZATION_PLUGINS blur_scope cairo-spectrum"
 fi
 
 if test "x$USE_QT" = "xyes" ; then
- GENERAL_PLUGINS="$GENERAL_PLUGINS albumart-qt lyricwiki-qt song-info-qt"
- GENERAL_PLUGINS="$GENERAL_PLUGINS qtui"
+ GENERAL_PLUGINS="$GENERAL_PLUGINS albumart-qt lyrics-qt playlist-manager-qt search-tool-qt song-info-qt statusicon-qt"
+ GENERAL_PLUGINS="$GENERAL_PLUGINS qtui skins-qt"
+ VISUALIZATION_PLUGINS="$VISUALIZATION_PLUGINS blur_scope-qt qt-spectrum vumeter-qt"
 fi
 
-
-# Check whether --enable-console was given.
-if test "${enable_console+set}" = set; then :
- enableval=$enable_console; enable_console=$enableval
-else
- enable_console=auto
+USE_GTK_OR_QT=no
+if test "x$USE_GTK" = "xyes" -o "x$USE_QT" = "xyes" ; then
+ USE_GTK_OR_QT=yes
+ GENERAL_PLUGINS="$GENERAL_PLUGINS delete-files skins-data"
 fi
 
+if test $HAVE_MSWINDOWS = yes ; then
+ OUTPUT_PLUGINS="$OUTPUT_PLUGINS waveout"
+fi
 
-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"
-if test "x$ac_cv_header_zlib_h" = xyes; then :
- cat >>confdefs.h <<_ACEOF
-#define HAVE_ZLIB_H 1
-_ACEOF
- have_console=yes
- INPUT_PLUGINS="$INPUT_PLUGINS console"
-else
- 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
+check_allowed () {
+ case $1 in
+ glspectrum|hotkey|aosd)
+ plugin_allowed=$USE_GTK
+ if test $plugin_allowed = no -a $2 = yes ; then
+ as_fn_error $? "--enable-$1 cannot be used without --enable-gtk" "$LINENO" 5
+ fi
+ ;;
+ ampache|qtaudio|qtglspectrum|qthotkey|streamtuner)
+ plugin_allowed=$USE_QT
+ if test $plugin_allowed = no -a $2 = yes ; then
+ as_fn_error $? "--enable-$1 cannot be used without --enable-qt" "$LINENO" 5
+ fi
+ if test $plugin_allowed = yes -a $1 = ampache ; then
+ plugin_allowed=$have_neon
+ if test $plugin_allowed = no -a $2 = yes ; then
+ as_fn_error $? "--enable-$1 cannot be used without --enable-neon" "$LINENO" 5
+ fi
+ fi
+ ;;
+ *)
+ plugin_allowed=yes
+ ;;
+ esac
+}
 
-fi
 
-done
 
-fi
 
 
-# Check whether --enable-xsf was given.
-if test "${enable_xsf+set}" = set; then :
- enableval=$enable_xsf; enable_xsf=$enableval
-else
- enable_xsf="yes"
-fi
 
 
-if test "x$enable_xsf" != "xno"; then
- INPUT_PLUGINS="$INPUT_PLUGINS xsf"
-fi
 
 
-# Check whether --enable-qtaudio was given.
-if test "${enable_qtaudio+set}" = set; then :
- enableval=$enable_qtaudio; enable_qtaudio=$enableval
-else
- enable_qtaudio=auto
+ # Check whether --enable-adplug was given.
+if test ${enable_adplug+y}
+then :
+ enableval=$enable_adplug; enable_adplug=$enableval
+else case e in #(
+ e) enable_adplug=auto ;;
+esac
 fi
 
 
-have_qtaudio=no
-if test "x$enable_qtaudio" = "xyes" -o $ "x$USE_QT" = "xyes" -a "x$enable_qtaudio" = "xauto" $; then
+ have_adplug=no
+ check_allowed adplug $enable_adplug
+ if test $enable_adplug != no -a $plugin_allowed = yes ; then
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for QTMULTIMEDIA" >&5
-$as_echo_n "checking for QTMULTIMEDIA... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for adplug" >&5
+printf %s "checking for adplug... " >&6; }
 
-if test -n "$QTMULTIMEDIA_CFLAGS"; then
- pkg_cv_QTMULTIMEDIA_CFLAGS="$QTMULTIMEDIA_CFLAGS"
+if test -n "$ADLIB_CFLAGS"; then
+ pkg_cv_ADLIB_CFLAGS="$ADLIB_CFLAGS"
 elif test -n "$PKG_CONFIG"; then
 if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"Qt5Multimedia\""; } >&5
- ($PKG_CONFIG --exists --print-errors "Qt5Multimedia") 2>&5
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"adplug\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "adplug") 2>&5
 ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
- pkg_cv_QTMULTIMEDIA_CFLAGS=`$PKG_CONFIG --cflags "Qt5Multimedia" 2>/dev/null`
+ pkg_cv_ADLIB_CFLAGS=`$PKG_CONFIG --cflags "adplug" 2>/dev/null`
 		 test "x$?" != "x0" && pkg_failed=yes
 else
 pkg_failed=yes
@@ -9745,16 +12381,16 @@
 else
 pkg_failed=untried
 fi
-if test -n "$QTMULTIMEDIA_LIBS"; then
- pkg_cv_QTMULTIMEDIA_LIBS="$QTMULTIMEDIA_LIBS"
+if test -n "$ADLIB_LIBS"; then
+ pkg_cv_ADLIB_LIBS="$ADLIB_LIBS"
 elif test -n "$PKG_CONFIG"; then
 if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"Qt5Multimedia\""; } >&5
- ($PKG_CONFIG --exists --print-errors "Qt5Multimedia") 2>&5
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"adplug\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "adplug") 2>&5
 ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
- pkg_cv_QTMULTIMEDIA_LIBS=`$PKG_CONFIG --libs "Qt5Multimedia" 2>/dev/null`
+ pkg_cv_ADLIB_LIBS=`$PKG_CONFIG --libs "adplug" 2>/dev/null`
 		 test "x$?" != "x0" && pkg_failed=yes
 else
 pkg_failed=yes
@@ -9766,8 +12402,8 @@
 
 
 if test $pkg_failed = yes; then
- 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
 _pkg_short_errors_supported=yes
@@ -9775,81 +12411,114 @@
 _pkg_short_errors_supported=no
 fi
 if test $_pkg_short_errors_supported = yes; then
-	 QTMULTIMEDIA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "Qt5Multimedia" 2>&1`
+ ADLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "adplug" 2>&1`
 else
-	 QTMULTIMEDIA_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "Qt5Multimedia" 2>&1`
+ ADLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "adplug" 2>&1`
 fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$QTMULTIMEDIA_PKG_ERRORS" >&5
+ # Put the nasty error message in config.log where it belongs
+ echo "$ADLIB_PKG_ERRORS" >&5
+
+
+ if test $enable_adplug = yes ; then
+ as_fn_error $? "Missing dependency for AdLib support: adplug" "$LINENO" 5
+ else
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: AdLib support disabled due to missing dependency: adplug" >&5
+printf "%s\n" "$as_me: WARNING: AdLib support disabled due to missing dependency: adplug" >&2;}
+ fi
 
-	have_qtaudio=no
 elif test $pkg_failed = untried; then
- 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-	have_qtaudio=no
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+
+ if test $enable_adplug = yes ; then
+ as_fn_error $? "Missing dependency for AdLib support: adplug" "$LINENO" 5
+ else
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: AdLib support disabled due to missing dependency: adplug" >&5
+printf "%s\n" "$as_me: WARNING: AdLib support disabled due to missing dependency: adplug" >&2;}
+ fi
+
 else
-	QTMULTIMEDIA_CFLAGS=$pkg_cv_QTMULTIMEDIA_CFLAGS
-	QTMULTIMEDIA_LIBS=$pkg_cv_QTMULTIMEDIA_LIBS
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-	have_qtaudio=yes
+ ADLIB_CFLAGS=$pkg_cv_ADLIB_CFLAGS
+ ADLIB_LIBS=$pkg_cv_ADLIB_LIBS
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+
+ have_adplug=yes
+ INPUT_PLUGINS="$INPUT_PLUGINS adplug"
+
 fi
- if test "x$have_qtaudio" = "xyes"; then
- QTMULTIMEDIA_CFLAGS="$QTMULTIMEDIA_CFLAGS -fPIC"
- OUTPUT_PLUGINS="$OUTPUT_PLUGINS qtaudio"
- elif test "x$enable_qtaudio" = "xyes"; then
- as_fn_error $? "QtAudio output plugin requested but QtMultimedia not found!" "$LINENO" 5
 fi
-fi
 
 
-# Check whether --enable-coreaudio was given.
-if test "${enable_coreaudio+set}" = set; then :
- enableval=$enable_coreaudio; enable_coreaudio=$enableval
-else
- enable_coreaudio=auto
+if test $have_adplug = yes ; then
+ 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
+
+ CPPFLAGS_adplug_backup="${CPPFLAGS}"
+ CPPFLAGS="${CPPFLAGS} ${ADLIB_CFLAGS}"
+ ac_fn_cxx_check_header_compile "$LINENO" "adplug/nemuopl.h" "ac_cv_header_adplug_nemuopl_h" "#include <adplug/adplug.h>
+"
+if test "x$ac_cv_header_adplug_nemuopl_h" = xyes
+then :
+ printf "%s\n" "#define HAVE_ADPLUG_NEMUOPL_H 1" >>confdefs.h
 
 fi
+ac_fn_cxx_check_header_compile "$LINENO" "adplug/wemuopl.h" "ac_cv_header_adplug_wemuopl_h" "#include <adplug/adplug.h>
+"
+if test "x$ac_cv_header_adplug_wemuopl_h" = xyes
+then :
+ printf "%s\n" "#define HAVE_ADPLUG_WEMUOPL_H 1" >>confdefs.h
 
+fi
+ac_fn_cxx_check_header_compile "$LINENO" "adplug/kemuopl.h" "ac_cv_header_adplug_kemuopl_h" "#include <adplug/adplug.h>
+"
+if test "x$ac_cv_header_adplug_kemuopl_h" = xyes
+then :
+ printf "%s\n" "#define HAVE_ADPLUG_KEMUOPL_H 1" >>confdefs.h
 
-have_coreaudio=no
-if test "x$enable_coreaudio" != "xno"; then
- if test "x$HAVE_DARWIN" != "xno"; then
- have_coreaudio=yes
- OUTPUT_PLUGINS="$OUTPUT_PLUGINS coreaudio"
- fi
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: *** CoreAudio output plugin disabled per user request ***" >&5
-$as_echo "*** CoreAudio output plugin disabled per user request ***" >&6; }
 fi
 
+ CPPFLAGS="${CPPFLAGS_adplug_backup}"
+ 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
+
+fi
 
-# Check whether --enable-pulse was given.
-if test "${enable_pulse+set}" = set; then :
- enableval=$enable_pulse; enable_pulse=$enableval
-else
- enable_pulse=auto
 
+ # Check whether --enable-cdaudio was given.
+if test ${enable_cdaudio+y}
+then :
+ enableval=$enable_cdaudio; enable_cdaudio=$enableval
+else case e in #(
+ e) enable_cdaudio=auto ;;
+esac
 fi
 
 
-have_pulse=no
-if test "x$enable_pulse" != "xno"; then
+ have_cdaudio=no
+ check_allowed cdaudio $enable_cdaudio
+ if test $enable_cdaudio != no -a $plugin_allowed = yes ; then
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PULSE" >&5
-$as_echo_n "checking for PULSE... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libcdio >= 0.70 libcdio_cdda >= 0.70 libcddb >= 1.2.1" >&5
+printf %s "checking for libcdio >= 0.70 libcdio_cdda >= 0.70 libcddb >= 1.2.1... " >&6; }
 
-if test -n "$PULSE_CFLAGS"; then
- pkg_cv_PULSE_CFLAGS="$PULSE_CFLAGS"
+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 \"libpulse >= 0.9.5\""; } >&5
- ($PKG_CONFIG --exists --print-errors "libpulse >= 0.9.5") 2>&5
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcdio >= 0.70 libcdio_cdda >= 0.70 libcddb >= 1.2.1\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libcdio >= 0.70 libcdio_cdda >= 0.70 libcddb >= 1.2.1") 2>&5
 ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
- pkg_cv_PULSE_CFLAGS=`$PKG_CONFIG --cflags "libpulse >= 0.9.5" 2>/dev/null`
+ pkg_cv_CDIO_CFLAGS=`$PKG_CONFIG --cflags "libcdio >= 0.70 libcdio_cdda >= 0.70 libcddb >= 1.2.1" 2>/dev/null`
 		 test "x$?" != "x0" && pkg_failed=yes
 else
 pkg_failed=yes
@@ -9857,16 +12526,16 @@
 else
 pkg_failed=untried
 fi
-if test -n "$PULSE_LIBS"; then
- pkg_cv_PULSE_LIBS="$PULSE_LIBS"
+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 \"libpulse >= 0.9.5\""; } >&5
- ($PKG_CONFIG --exists --print-errors "libpulse >= 0.9.5") 2>&5
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcdio >= 0.70 libcdio_cdda >= 0.70 libcddb >= 1.2.1\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libcdio >= 0.70 libcdio_cdda >= 0.70 libcddb >= 1.2.1") 2>&5
 ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
- pkg_cv_PULSE_LIBS=`$PKG_CONFIG --libs "libpulse >= 0.9.5" 2>/dev/null`
+ pkg_cv_CDIO_LIBS=`$PKG_CONFIG --libs "libcdio >= 0.70 libcdio_cdda >= 0.70 libcddb >= 1.2.1" 2>/dev/null`
 		 test "x$?" != "x0" && pkg_failed=yes
 else
 pkg_failed=yes
@@ -9878,8 +12547,8 @@
 
 
 if test $pkg_failed = yes; then
- 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
 _pkg_short_errors_supported=yes
@@ -9887,75 +12556,81 @@
 _pkg_short_errors_supported=no
 fi
 if test $_pkg_short_errors_supported = yes; then
-	 PULSE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libpulse >= 0.9.5" 2>&1`
+ CDIO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libcdio >= 0.70 libcdio_cdda >= 0.70 libcddb >= 1.2.1" 2>&1`
 else
-	 PULSE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libpulse >= 0.9.5" 2>&1`
+ CDIO_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libcdio >= 0.70 libcdio_cdda >= 0.70 libcddb >= 1.2.1" 2>&1`
 fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$PULSE_PKG_ERRORS" >&5
+ # Put the nasty error message in config.log where it belongs
+ echo "$CDIO_PKG_ERRORS" >&5
 
-	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
+
+ if test $enable_cdaudio = yes ; then
+ as_fn_error $? "Missing dependency for audio CD support: libcdio >= 0.70 libcdio_cdda >= 0.70 libcddb >= 1.2.1" "$LINENO" 5
+ else
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: audio CD support disabled due to missing dependency: libcdio >= 0.70 libcdio_cdda >= 0.70 libcddb >= 1.2.1" >&5
+printf "%s\n" "$as_me: WARNING: audio CD support disabled due to missing dependency: libcdio >= 0.70 libcdio_cdda >= 0.70 libcddb >= 1.2.1" >&2;}
+ 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_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
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+
+ if test $enable_cdaudio = yes ; then
+ as_fn_error $? "Missing dependency for audio CD support: libcdio >= 0.70 libcdio_cdda >= 0.70 libcddb >= 1.2.1" "$LINENO" 5
+ else
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: audio CD support disabled due to missing dependency: libcdio >= 0.70 libcdio_cdda >= 0.70 libcddb >= 1.2.1" >&5
+printf "%s\n" "$as_me: WARNING: audio CD support disabled due to missing dependency: libcdio >= 0.70 libcdio_cdda >= 0.70 libcddb >= 1.2.1" >&2;}
+ fi
 
 else
-	PULSE_CFLAGS=$pkg_cv_PULSE_CFLAGS
-	PULSE_LIBS=$pkg_cv_PULSE_LIBS
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-	have_pulse=yes
- OUTPUT_PLUGINS="$OUTPUT_PLUGINS pulse_audio"
-fi
-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; }
-fi
+ CDIO_CFLAGS=$pkg_cv_CDIO_CFLAGS
+ CDIO_LIBS=$pkg_cv_CDIO_LIBS
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
+ have_cdaudio=yes
+ INPUT_PLUGINS="$INPUT_PLUGINS cdaudio"
 
-# Check whether --enable-psf was given.
-if test "${enable_psf+set}" = set; then :
- enableval=$enable_psf; enable_psf=$enableval
-else
- enable_psf=yes
 fi
+ fi
+
 
+if test $have_cdaudio = yes ; then
+ GENERAL_PLUGINS="$GENERAL_PLUGINS cd-menu-items"
+
+printf "%s\n" "#define HAVE_LIBCDDB 1" >>confdefs.h
 
-if test "x$enable_psf" != "xno"; then
- INPUT_PLUGINS="$INPUT_PLUGINS psf"
 fi
 
 
-# Check whether --enable-mp3 was given.
-if test "${enable_mp3+set}" = set; then :
- enableval=$enable_mp3; enable_mp3=$enableval
-else
- enable_mp3=yes
+ # Check whether --enable-flac was given.
+if test ${enable_flac+y}
+then :
+ enableval=$enable_flac; enable_flac=$enableval
+else case e in #(
+ e) enable_flac=yes ;;
+esac
 fi
 
 
-if test $enable_mp3 = yes ; then
+ have_flac=no
+ check_allowed flac $enable_flac
+ if test $enable_flac != no -a $plugin_allowed = yes ; then
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for MPG123" >&5
-$as_echo_n "checking for MPG123... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for flac >= 1.2.1" >&5
+printf %s "checking for flac >= 1.2.1... " >&6; }
 
-if test -n "$MPG123_CFLAGS"; then
- pkg_cv_MPG123_CFLAGS="$MPG123_CFLAGS"
+if test -n "$LIBFLAC_CFLAGS"; then
+ pkg_cv_LIBFLAC_CFLAGS="$LIBFLAC_CFLAGS"
 elif test -n "$PKG_CONFIG"; then
 if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmpg123 >= 1.12\""; } >&5
- ($PKG_CONFIG --exists --print-errors "libmpg123 >= 1.12") 2>&5
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"flac >= 1.2.1\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "flac >= 1.2.1") 2>&5
 ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
- pkg_cv_MPG123_CFLAGS=`$PKG_CONFIG --cflags "libmpg123 >= 1.12" 2>/dev/null`
+ pkg_cv_LIBFLAC_CFLAGS=`$PKG_CONFIG --cflags "flac >= 1.2.1" 2>/dev/null`
 		 test "x$?" != "x0" && pkg_failed=yes
 else
 pkg_failed=yes
@@ -9963,16 +12638,16 @@
 else
 pkg_failed=untried
 fi
-if test -n "$MPG123_LIBS"; then
- pkg_cv_MPG123_LIBS="$MPG123_LIBS"
+if test -n "$LIBFLAC_LIBS"; then
+ pkg_cv_LIBFLAC_LIBS="$LIBFLAC_LIBS"
 elif test -n "$PKG_CONFIG"; then
 if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmpg123 >= 1.12\""; } >&5
- ($PKG_CONFIG --exists --print-errors "libmpg123 >= 1.12") 2>&5
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"flac >= 1.2.1\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "flac >= 1.2.1") 2>&5
 ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
- pkg_cv_MPG123_LIBS=`$PKG_CONFIG --libs "libmpg123 >= 1.12" 2>/dev/null`
+ pkg_cv_LIBFLAC_LIBS=`$PKG_CONFIG --libs "flac >= 1.2.1" 2>/dev/null`
 		 test "x$?" != "x0" && pkg_failed=yes
 else
 pkg_failed=yes
@@ -9984,8 +12659,8 @@
 
 
 if test $pkg_failed = yes; then
- 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
 _pkg_short_errors_supported=yes
@@ -9993,75 +12668,74 @@
 _pkg_short_errors_supported=no
 fi
 if test $_pkg_short_errors_supported = yes; then
-	 MPG123_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libmpg123 >= 1.12" 2>&1`
+ LIBFLAC_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "flac >= 1.2.1" 2>&1`
 else
-	 MPG123_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libmpg123 >= 1.12" 2>&1`
+ LIBFLAC_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "flac >= 1.2.1" 2>&1`
 fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$MPG123_PKG_ERRORS" >&5
+ # Put the nasty error message in config.log where it belongs
+ echo "$LIBFLAC_PKG_ERRORS" >&5
 
-	as_fn_error $? "Package requirements (libmpg123 >= 1.12) were not met:
 
-$MPG123_PKG_ERRORS
-
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
+ if test $enable_flac = yes ; then
+ as_fn_error $? "Missing dependency for FLAC support: flac >= 1.2.1" "$LINENO" 5
+ else
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: FLAC support disabled due to missing dependency: flac >= 1.2.1" >&5
+printf "%s\n" "$as_me: WARNING: FLAC support disabled due to missing dependency: flac >= 1.2.1" >&2;}
+ fi
 
-Alternatively, you may set the environment variables MPG123_CFLAGS
-and MPG123_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; }
-	{ { $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.
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
-Alternatively, you may set the environment variables MPG123_CFLAGS
-and MPG123_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
+ if test $enable_flac = yes ; then
+ as_fn_error $? "Missing dependency for FLAC support: flac >= 1.2.1" "$LINENO" 5
+ else
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: FLAC support disabled due to missing dependency: flac >= 1.2.1" >&5
+printf "%s\n" "$as_me: WARNING: FLAC support disabled due to missing dependency: flac >= 1.2.1" >&2;}
+ fi
 
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5; }
 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; }
+ LIBFLAC_CFLAGS=$pkg_cv_LIBFLAC_CFLAGS
+ LIBFLAC_LIBS=$pkg_cv_LIBFLAC_LIBS
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+
+ have_flac=yes
+ INPUT_PLUGINS="$INPUT_PLUGINS flac"
 
 fi
- INPUT_PLUGINS="$INPUT_PLUGINS mpg123"
-fi
+ fi
 
 
-# Check whether --enable-hotkey was given.
-if test "${enable_hotkey+set}" = set; then :
- enableval=$enable_hotkey; enable_hotkey=$enableval
-else
- enable_hotkey=auto
 
+ # Check whether --enable-vorbis was given.
+if test ${enable_vorbis+y}
+then :
+ enableval=$enable_vorbis; enable_vorbis=$enableval
+else case e in #(
+ e) enable_vorbis=yes ;;
+esac
 fi
 
 
-have_hotkey=no
-if test "x$enable_hotkey" != "xno"; then
+ have_vorbis=no
+ check_allowed vorbis $enable_vorbis
+ if test $enable_vorbis != no -a $plugin_allowed = yes ; then
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GDKX11" >&5
-$as_echo_n "checking for GDKX11... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ogg >= 1.0 vorbis >= 1.0 vorbisenc >= 1.0 vorbisfile >= 1.0" >&5
+printf %s "checking for ogg >= 1.0 vorbis >= 1.0 vorbisenc >= 1.0 vorbisfile >= 1.0... " >&6; }
 
-if test -n "$GDKX11_CFLAGS"; then
- pkg_cv_GDKX11_CFLAGS="$GDKX11_CFLAGS"
+if test -n "$VORBIS_CFLAGS"; then
+ pkg_cv_VORBIS_CFLAGS="$VORBIS_CFLAGS"
 elif test -n "$PKG_CONFIG"; then
 if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gdk-x11-3.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "gdk-x11-3.0") 2>&5
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ogg >= 1.0 vorbis >= 1.0 vorbisenc >= 1.0 vorbisfile >= 1.0\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "ogg >= 1.0 vorbis >= 1.0 vorbisenc >= 1.0 vorbisfile >= 1.0") 2>&5
 ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
- pkg_cv_GDKX11_CFLAGS=`$PKG_CONFIG --cflags "gdk-x11-3.0" 2>/dev/null`
+ pkg_cv_VORBIS_CFLAGS=`$PKG_CONFIG --cflags "ogg >= 1.0 vorbis >= 1.0 vorbisenc >= 1.0 vorbisfile >= 1.0" 2>/dev/null`
 		 test "x$?" != "x0" && pkg_failed=yes
 else
 pkg_failed=yes
@@ -10069,16 +12743,16 @@
 else
 pkg_failed=untried
 fi
-if test -n "$GDKX11_LIBS"; then
- pkg_cv_GDKX11_LIBS="$GDKX11_LIBS"
+if test -n "$VORBIS_LIBS"; then
+ pkg_cv_VORBIS_LIBS="$VORBIS_LIBS"
 elif test -n "$PKG_CONFIG"; then
 if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gdk-x11-3.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "gdk-x11-3.0") 2>&5
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ogg >= 1.0 vorbis >= 1.0 vorbisenc >= 1.0 vorbisfile >= 1.0\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "ogg >= 1.0 vorbis >= 1.0 vorbisenc >= 1.0 vorbisfile >= 1.0") 2>&5
 ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
- pkg_cv_GDKX11_LIBS=`$PKG_CONFIG --libs "gdk-x11-3.0" 2>/dev/null`
+ pkg_cv_VORBIS_LIBS=`$PKG_CONFIG --libs "ogg >= 1.0 vorbis >= 1.0 vorbisenc >= 1.0 vorbisfile >= 1.0" 2>/dev/null`
 		 test "x$?" != "x0" && pkg_failed=yes
 else
 pkg_failed=yes
@@ -10090,8 +12764,8 @@
 
 
 if test $pkg_failed = yes; then
- 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
 _pkg_short_errors_supported=yes
@@ -10099,64 +12773,74 @@
 _pkg_short_errors_supported=no
 fi
 if test $_pkg_short_errors_supported = yes; then
-	 GDKX11_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gdk-x11-3.0" 2>&1`
+ VORBIS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "ogg >= 1.0 vorbis >= 1.0 vorbisenc >= 1.0 vorbisfile >= 1.0" 2>&1`
 else
-	 GDKX11_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gdk-x11-3.0" 2>&1`
+ VORBIS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "ogg >= 1.0 vorbis >= 1.0 vorbisenc >= 1.0 vorbisfile >= 1.0" 2>&1`
 fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$GDKX11_PKG_ERRORS" >&5
+ # Put the nasty error message in config.log where it belongs
+ echo "$VORBIS_PKG_ERRORS" >&5
 
-	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
+
+ if test $enable_vorbis = yes ; then
+ as_fn_error $? "Missing dependency for Ogg Vorbis support: ogg >= 1.0 vorbis >= 1.0 vorbisenc >= 1.0 vorbisfile >= 1.0" "$LINENO" 5
+ else
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Ogg Vorbis support disabled due to missing dependency: ogg >= 1.0 vorbis >= 1.0 vorbisenc >= 1.0 vorbisfile >= 1.0" >&5
+printf "%s\n" "$as_me: WARNING: Ogg Vorbis support disabled due to missing dependency: ogg >= 1.0 vorbis >= 1.0 vorbisenc >= 1.0 vorbisfile >= 1.0" >&2;}
+ 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_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
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+
+ if test $enable_vorbis = yes ; then
+ as_fn_error $? "Missing dependency for Ogg Vorbis support: ogg >= 1.0 vorbis >= 1.0 vorbisenc >= 1.0 vorbisfile >= 1.0" "$LINENO" 5
+ else
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Ogg Vorbis support disabled due to missing dependency: ogg >= 1.0 vorbis >= 1.0 vorbisenc >= 1.0 vorbisfile >= 1.0" >&5
+printf "%s\n" "$as_me: WARNING: Ogg Vorbis support disabled due to missing dependency: ogg >= 1.0 vorbis >= 1.0 vorbisenc >= 1.0 vorbisfile >= 1.0" >&2;}
+ 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; }
+ VORBIS_CFLAGS=$pkg_cv_VORBIS_CFLAGS
+ VORBIS_LIBS=$pkg_cv_VORBIS_LIBS
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+
+ have_vorbis=yes
+ INPUT_PLUGINS="$INPUT_PLUGINS vorbis"
+
 fi
+ fi
 
 
-# Check whether --enable-gnomeshortcuts was given.
-if test "${enable_gnomeshortcuts+set}" = set; then :
- enableval=$enable_gnomeshortcuts; enable_gnomeshortcuts=$enableval
-else
- enable_gnomeshortcuts=auto
 
+ # Check whether --enable-opus was given.
+if test ${enable_opus+y}
+then :
+ enableval=$enable_opus; enable_opus=$enableval
+else case e in #(
+ e) enable_opus=yes ;;
+esac
 fi
 
 
-have_gnomeshortcuts=no
-if test "x$enable_gnomeshortcuts" != "xno"; then
+ have_opus=no
+ check_allowed opus $enable_opus
+ if test $enable_opus != no -a $plugin_allowed = yes ; then
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DBUS" >&5
-$as_echo_n "checking for DBUS... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for opusfile >= 0.4" >&5
+printf %s "checking for opusfile >= 0.4... " >&6; }
 
-if test -n "$DBUS_CFLAGS"; then
- pkg_cv_DBUS_CFLAGS="$DBUS_CFLAGS"
+if test -n "$OPUS_CFLAGS"; then
+ pkg_cv_OPUS_CFLAGS="$OPUS_CFLAGS"
 elif test -n "$PKG_CONFIG"; then
 if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-1 >= 0.60 dbus-glib-1 >= 0.60\""; } >&5
- ($PKG_CONFIG --exists --print-errors "dbus-1 >= 0.60 dbus-glib-1 >= 0.60") 2>&5
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"opusfile >= 0.4\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "opusfile >= 0.4") 2>&5
 ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
- pkg_cv_DBUS_CFLAGS=`$PKG_CONFIG --cflags "dbus-1 >= 0.60 dbus-glib-1 >= 0.60" 2>/dev/null`
+ pkg_cv_OPUS_CFLAGS=`$PKG_CONFIG --cflags "opusfile >= 0.4" 2>/dev/null`
 		 test "x$?" != "x0" && pkg_failed=yes
 else
 pkg_failed=yes
@@ -10164,16 +12848,16 @@
 else
 pkg_failed=untried
 fi
-if test -n "$DBUS_LIBS"; then
- pkg_cv_DBUS_LIBS="$DBUS_LIBS"
+if test -n "$OPUS_LIBS"; then
+ pkg_cv_OPUS_LIBS="$OPUS_LIBS"
 elif test -n "$PKG_CONFIG"; then
 if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"dbus-1 >= 0.60 dbus-glib-1 >= 0.60\""; } >&5
- ($PKG_CONFIG --exists --print-errors "dbus-1 >= 0.60 dbus-glib-1 >= 0.60") 2>&5
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"opusfile >= 0.4\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "opusfile >= 0.4") 2>&5
 ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
- pkg_cv_DBUS_LIBS=`$PKG_CONFIG --libs "dbus-1 >= 0.60 dbus-glib-1 >= 0.60" 2>/dev/null`
+ pkg_cv_OPUS_LIBS=`$PKG_CONFIG --libs "opusfile >= 0.4" 2>/dev/null`
 		 test "x$?" != "x0" && pkg_failed=yes
 else
 pkg_failed=yes
@@ -10185,8 +12869,8 @@
 
 
 if test $pkg_failed = yes; then
- 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
 _pkg_short_errors_supported=yes
@@ -10194,138 +12878,179 @@
 _pkg_short_errors_supported=no
 fi
 if test $_pkg_short_errors_supported = yes; then
-	 DBUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "dbus-1 >= 0.60 dbus-glib-1 >= 0.60" 2>&1`
+ OPUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "opusfile >= 0.4" 2>&1`
 else
-	 DBUS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "dbus-1 >= 0.60 dbus-glib-1 >= 0.60" 2>&1`
+ OPUS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "opusfile >= 0.4" 2>&1`
 fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$DBUS_PKG_ERRORS" >&5
+ # Put the nasty error message in config.log where it belongs
+ echo "$OPUS_PKG_ERRORS" >&5
 
-	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
+
+ if test $enable_opus = yes ; then
+ as_fn_error $? "Missing dependency for Opus support: opusfile >= 0.4" "$LINENO" 5
+ else
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Opus support disabled due to missing dependency: opusfile >= 0.4" >&5
+printf "%s\n" "$as_me: WARNING: Opus support disabled due to missing dependency: opusfile >= 0.4" >&2;}
+ 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_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
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+
+ if test $enable_opus = yes ; then
+ as_fn_error $? "Missing dependency for Opus support: opusfile >= 0.4" "$LINENO" 5
+ else
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Opus support disabled due to missing dependency: opusfile >= 0.4" >&5
+printf "%s\n" "$as_me: WARNING: Opus support disabled due to missing dependency: opusfile >= 0.4" >&2;}
+ 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; }
-fi
+ OPUS_CFLAGS=$pkg_cv_OPUS_CFLAGS
+ OPUS_LIBS=$pkg_cv_OPUS_LIBS
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
+ have_opus=yes
+ INPUT_PLUGINS="$INPUT_PLUGINS opus"
 
-# Check whether --enable-lirc was given.
-if test "${enable_lirc+set}" = set; then :
- enableval=$enable_lirc; enable_lirc=$enableval
-else
- enable_lirc=auto
 fi
+ fi
 
 
-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"
-if test "x$ac_cv_header_lirc_lirc_client_h" = xyes; then :
- cat >>confdefs.h <<_ACEOF
-#define HAVE_LIRC_LIRC_CLIENT_H 1
-_ACEOF
- have_lirc=yes
- GENERAL_PLUGINS="$GENERAL_PLUGINS lirc"
-else
- 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
+
+ # Check whether --enable-amidiplug was given.
+if test ${enable_amidiplug+y}
+then :
+ enableval=$enable_amidiplug; enable_amidiplug=$enableval
+else case e in #(
+ e) enable_amidiplug=auto ;;
+esac
 fi
 
-done
 
-fi
+ have_amidiplug=no
+ check_allowed amidiplug $enable_amidiplug
+ if test $enable_amidiplug != no -a $plugin_allowed = yes ; then
 
+pkg_failed=no
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for fluidsynth >= 1.0.6" >&5
+printf %s "checking for fluidsynth >= 1.0.6... " >&6; }
 
-# Check whether --enable-songchange was given.
-if test "${enable_songchange+set}" = set; then :
- enableval=$enable_songchange; enable_songchange=$enableval
+if test -n "$FLUIDSYNTH_CFLAGS"; then
+ pkg_cv_FLUIDSYNTH_CFLAGS="$FLUIDSYNTH_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"fluidsynth >= 1.0.6\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "fluidsynth >= 1.0.6") 2>&5
+ ac_status=$?
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_FLUIDSYNTH_CFLAGS=`$PKG_CONFIG --cflags "fluidsynth >= 1.0.6" 2>/dev/null`
+		 test "x$?" != "x0" && pkg_failed=yes
 else
- enable_songchange=auto
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+if test -n "$FLUIDSYNTH_LIBS"; then
+ pkg_cv_FLUIDSYNTH_LIBS="$FLUIDSYNTH_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"fluidsynth >= 1.0.6\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "fluidsynth >= 1.0.6") 2>&5
+ ac_status=$?
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_FLUIDSYNTH_LIBS=`$PKG_CONFIG --libs "fluidsynth >= 1.0.6" 2>/dev/null`
+		 test "x$?" != "x0" && pkg_failed=yes
+else
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
 fi
 
 
-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"
-if test "x$ac_cv_header_sys_wait_h" = xyes; then :
- cat >>confdefs.h <<_ACEOF
-#define HAVE_SYS_WAIT_H 1
-_ACEOF
- have_songchange=yes
- GENERAL_PLUGINS="$GENERAL_PLUGINS song_change"
-else
- 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
 
+if test $pkg_failed = yes; then
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "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
+ FLUIDSYNTH_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "fluidsynth >= 1.0.6" 2>&1`
+ else
+ FLUIDSYNTH_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "fluidsynth >= 1.0.6" 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$FLUIDSYNTH_PKG_ERRORS" >&5
 
-done
 
-fi
+ if test $enable_amidiplug = yes ; then
+ as_fn_error $? "Missing dependency for MIDI synthesizer: fluidsynth >= 1.0.6" "$LINENO" 5
+ else
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: MIDI synthesizer disabled due to missing dependency: fluidsynth >= 1.0.6" >&5
+printf "%s\n" "$as_me: WARNING: MIDI synthesizer disabled due to missing dependency: fluidsynth >= 1.0.6" >&2;}
+ fi
+
+elif test $pkg_failed = untried; then
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
+ if test $enable_amidiplug = yes ; then
+ as_fn_error $? "Missing dependency for MIDI synthesizer: fluidsynth >= 1.0.6" "$LINENO" 5
+ else
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: MIDI synthesizer disabled due to missing dependency: fluidsynth >= 1.0.6" >&5
+printf "%s\n" "$as_me: WARNING: MIDI synthesizer disabled due to missing dependency: fluidsynth >= 1.0.6" >&2;}
+ fi
 
-# Check whether --enable-statusicon was given.
-if test "${enable_statusicon+set}" = set; then :
- enableval=$enable_statusicon; have_statusicon=$enableval
 else
- have_statusicon="no"
-fi
+ FLUIDSYNTH_CFLAGS=$pkg_cv_FLUIDSYNTH_CFLAGS
+ FLUIDSYNTH_LIBS=$pkg_cv_FLUIDSYNTH_LIBS
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
+ have_amidiplug=yes
+ INPUT_PLUGINS="$INPUT_PLUGINS amidiplug"
 
-if test "x$have_statusicon" != "xno"; then
- GENERAL_PLUGINS="$GENERAL_PLUGINS statusicon"
 fi
+ fi
 
 
-# Check whether --enable-aosd was given.
-if test "${enable_aosd+set}" = set; then :
- enableval=$enable_aosd; enable_aosd=$enableval
-else
- enable_aosd=auto
 
+ # Check whether --enable-mpg123 was given.
+if test ${enable_mpg123+y}
+then :
+ enableval=$enable_mpg123; enable_mpg123=$enableval
+else case e in #(
+ e) enable_mpg123=yes ;;
+esac
 fi
 
 
-have_aosd=no
-if test "x$enable_aosd" != "xno"; then
+ have_mpg123=no
+ check_allowed mpg123 $enable_mpg123
+ if test $enable_mpg123 != no -a $plugin_allowed = yes ; then
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XRENDER" >&5
-$as_echo_n "checking for XRENDER... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libmpg123 >= 1.12" >&5
+printf %s "checking for libmpg123 >= 1.12... " >&6; }
 
-if test -n "$XRENDER_CFLAGS"; then
- pkg_cv_XRENDER_CFLAGS="$XRENDER_CFLAGS"
+if test -n "$MPG123_CFLAGS"; then
+ pkg_cv_MPG123_CFLAGS="$MPG123_CFLAGS"
 elif test -n "$PKG_CONFIG"; then
 if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xrender\""; } >&5
- ($PKG_CONFIG --exists --print-errors "xrender") 2>&5
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmpg123 >= 1.12\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libmpg123 >= 1.12") 2>&5
 ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
- pkg_cv_XRENDER_CFLAGS=`$PKG_CONFIG --cflags "xrender" 2>/dev/null`
+ pkg_cv_MPG123_CFLAGS=`$PKG_CONFIG --cflags "libmpg123 >= 1.12" 2>/dev/null`
 		 test "x$?" != "x0" && pkg_failed=yes
 else
 pkg_failed=yes
@@ -10333,16 +13058,16 @@
 else
 pkg_failed=untried
 fi
-if test -n "$XRENDER_LIBS"; then
- pkg_cv_XRENDER_LIBS="$XRENDER_LIBS"
+if test -n "$MPG123_LIBS"; then
+ pkg_cv_MPG123_LIBS="$MPG123_LIBS"
 elif test -n "$PKG_CONFIG"; then
 if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xrender\""; } >&5
- ($PKG_CONFIG --exists --print-errors "xrender") 2>&5
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmpg123 >= 1.12\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libmpg123 >= 1.12") 2>&5
 ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
- pkg_cv_XRENDER_LIBS=`$PKG_CONFIG --libs "xrender" 2>/dev/null`
+ pkg_cv_MPG123_LIBS=`$PKG_CONFIG --libs "libmpg123 >= 1.12" 2>/dev/null`
 		 test "x$?" != "x0" && pkg_failed=yes
 else
 pkg_failed=yes
@@ -10354,8 +13079,8 @@
 
 
 if test $pkg_failed = yes; then
- 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
 _pkg_short_errors_supported=yes
@@ -10363,73 +13088,163 @@
 _pkg_short_errors_supported=no
 fi
 if test $_pkg_short_errors_supported = yes; then
-	 XRENDER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "xrender" 2>&1`
+ MPG123_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libmpg123 >= 1.12" 2>&1`
 else
-	 XRENDER_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "xrender" 2>&1`
+ MPG123_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libmpg123 >= 1.12" 2>&1`
 fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$XRENDER_PKG_ERRORS" >&5
+ # Put the nasty error message in config.log where it belongs
+ echo "$MPG123_PKG_ERRORS" >&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; }
+ if test $enable_mpg123 = yes ; then
+ as_fn_error $? "Missing dependency for MP3 support: libmpg123 >= 1.12" "$LINENO" 5
+ else
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: MP3 support disabled due to missing dependency: libmpg123 >= 1.12" >&5
+printf "%s\n" "$as_me: WARNING: MP3 support disabled due to missing dependency: libmpg123 >= 1.12" >&2;}
+ 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}: result: *** X Render extension is required for Audacious OSD plugin ***" >&5
-$as_echo "*** X Render extension is required for Audacious OSD plugin ***" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+
+ if test $enable_mpg123 = yes ; then
+ as_fn_error $? "Missing dependency for MP3 support: libmpg123 >= 1.12" "$LINENO" 5
+ else
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: MP3 support disabled due to missing dependency: libmpg123 >= 1.12" >&5
+printf "%s\n" "$as_me: WARNING: MP3 support disabled due to missing dependency: libmpg123 >= 1.12" >&2;}
+ fi
 
 else
-	XRENDER_CFLAGS=$pkg_cv_XRENDER_CFLAGS
-	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
+ MPG123_CFLAGS=$pkg_cv_MPG123_CFLAGS
+ MPG123_LIBS=$pkg_cv_MPG123_LIBS
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+
+ have_mpg123=yes
+ INPUT_PLUGINS="$INPUT_PLUGINS mpg123"
 
- 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
 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; }
+
+
+test_aac () {
+ ac_fn_c_check_header_compile "$LINENO" "neaacdec.h" "ac_cv_header_neaacdec_h" "$ac_includes_default"
+if test "x$ac_cv_header_neaacdec_h" = xyes
+then :
+ have_aac=yes
+else case e in #(
+ e) have_aac=no ;;
+esac
 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
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for NeAACDecInit2 in -lfaad" >&5
+printf %s "checking for NeAACDecInit2 in -lfaad... " >&6; }
+if test ${ac_cv_lib_faad_NeAACDecInit2+y}
+then :
+ printf %s "(cached) " >&6
+else case e in #(
+ e) ac_check_lib_save_LIBS=$LIBS
+LIBS="-lfaad $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.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char NeAACDecInit2 (void);
+int
+main (void)
+{
+return NeAACDecInit2 ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"
+then :
+ ac_cv_lib_faad_NeAACDecInit2=yes
+else case e in #(
+ e) ac_cv_lib_faad_NeAACDecInit2=no ;;
+esac
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS ;;
+esac
+fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_faad_NeAACDecInit2" >&5
+printf "%s\n" "$ac_cv_lib_faad_NeAACDecInit2" >&6; }
+if test "x$ac_cv_lib_faad_NeAACDecInit2" = xyes
+then :
+ true
+else case e in #(
+ e) have_aac=no ;;
+esac
+fi
 
+}
+
+
+ # Check whether --enable-aac was given.
+if test ${enable_aac+y}
+then :
+ enableval=$enable_aac; enable_aac=$enableval
+else case e in #(
+ e) enable_aac=auto ;;
+esac
 fi
 
 
-if test "x$have_aosd" != "xyes"; then
- if test "x$enable_aosd_xcomp" = "xyes"; then
- as_fn_error $? "Cannot enable X Composite support for Audacious OSD plugin which is disabled" "$LINENO" 5
- else
- enable_aosd_xcomp=no
+ have_aac=no
+ check_allowed aac $enable_aac
+ if test $enable_aac != no -a $plugin_allowed = yes ; then
+ test_aac
+ if test $have_aac = yes ; then
+ INPUT_PLUGINS="$INPUT_PLUGINS aac"
+ elif test $enable_aac = yes ; then
+ as_fn_error $? "Missing dependency for AAC support" "$LINENO" 5
+ else
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: AAC support disabled due to missing dependency" >&5
+printf "%s\n" "$as_me: WARNING: AAC support disabled due to missing dependency" >&2;}
+ fi
 fi
+
+
+
+ # Check whether --enable-wavpack was given.
+if test ${enable_wavpack+y}
+then :
+ enableval=$enable_wavpack; enable_wavpack=$enableval
+else case e in #(
+ e) enable_wavpack=yes ;;
+esac
 fi
 
-have_aosd_xcomp=no
-if test "x$enable_aosd_xcomp" != "xno"; then
+
+ have_wavpack=no
+ check_allowed wavpack $enable_wavpack
+ if test $enable_wavpack != no -a $plugin_allowed = yes ; then
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XCOMPOSITE" >&5
-$as_echo_n "checking for XCOMPOSITE... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for wavpack >= 4.31" >&5
+printf %s "checking for wavpack >= 4.31... " >&6; }
 
-if test -n "$XCOMPOSITE_CFLAGS"; then
- pkg_cv_XCOMPOSITE_CFLAGS="$XCOMPOSITE_CFLAGS"
+if test -n "$WAVPACK_CFLAGS"; then
+ pkg_cv_WAVPACK_CFLAGS="$WAVPACK_CFLAGS"
 elif test -n "$PKG_CONFIG"; then
 if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xcomposite\""; } >&5
- ($PKG_CONFIG --exists --print-errors "xcomposite") 2>&5
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"wavpack >= 4.31\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "wavpack >= 4.31") 2>&5
 ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
- pkg_cv_XCOMPOSITE_CFLAGS=`$PKG_CONFIG --cflags "xcomposite" 2>/dev/null`
+ pkg_cv_WAVPACK_CFLAGS=`$PKG_CONFIG --cflags "wavpack >= 4.31" 2>/dev/null`
 		 test "x$?" != "x0" && pkg_failed=yes
 else
 pkg_failed=yes
@@ -10437,16 +13252,16 @@
 else
 pkg_failed=untried
 fi
-if test -n "$XCOMPOSITE_LIBS"; then
- pkg_cv_XCOMPOSITE_LIBS="$XCOMPOSITE_LIBS"
+if test -n "$WAVPACK_LIBS"; then
+ pkg_cv_WAVPACK_LIBS="$WAVPACK_LIBS"
 elif test -n "$PKG_CONFIG"; then
 if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xcomposite\""; } >&5
- ($PKG_CONFIG --exists --print-errors "xcomposite") 2>&5
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"wavpack >= 4.31\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "wavpack >= 4.31") 2>&5
 ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
- pkg_cv_XCOMPOSITE_LIBS=`$PKG_CONFIG --libs "xcomposite" 2>/dev/null`
+ pkg_cv_WAVPACK_LIBS=`$PKG_CONFIG --libs "wavpack >= 4.31" 2>/dev/null`
 		 test "x$?" != "x0" && pkg_failed=yes
 else
 pkg_failed=yes
@@ -10458,8 +13273,8 @@
 
 
 if test $pkg_failed = yes; then
- 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
 _pkg_short_errors_supported=yes
@@ -10467,65 +13282,74 @@
 _pkg_short_errors_supported=no
 fi
 if test $_pkg_short_errors_supported = yes; then
-	 XCOMPOSITE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "xcomposite" 2>&1`
+ WAVPACK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "wavpack >= 4.31" 2>&1`
 else
-	 XCOMPOSITE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "xcomposite" 2>&1`
+ WAVPACK_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "wavpack >= 4.31" 2>&1`
 fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$XCOMPOSITE_PKG_ERRORS" >&5
+ # Put the nasty error message in config.log where it belongs
+ echo "$WAVPACK_PKG_ERRORS" >&5
 
-	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
+
+ if test $enable_wavpack = yes ; then
+ as_fn_error $? "Missing dependency for WavPack support: wavpack >= 4.31" "$LINENO" 5
+ else
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: WavPack support disabled due to missing dependency: wavpack >= 4.31" >&5
+printf "%s\n" "$as_me: WARNING: WavPack support disabled due to missing dependency: wavpack >= 4.31" >&2;}
+ 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_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
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+
+ if test $enable_wavpack = yes ; then
+ as_fn_error $? "Missing dependency for WavPack support: wavpack >= 4.31" "$LINENO" 5
+ else
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: WavPack support disabled due to missing dependency: wavpack >= 4.31" >&5
+printf "%s\n" "$as_me: WARNING: WavPack support disabled due to missing dependency: wavpack >= 4.31" >&2;}
+ 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
+ WAVPACK_CFLAGS=$pkg_cv_WAVPACK_CFLAGS
+ WAVPACK_LIBS=$pkg_cv_WAVPACK_LIBS
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
-$as_echo "#define HAVE_XCOMPOSITE /**/" >>confdefs.h
+ have_wavpack=yes
+ INPUT_PLUGINS="$INPUT_PLUGINS wavpack"
 
 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; }
-fi
+ fi
 
 
-# Check whether --enable-notify was given.
-if test "${enable_notify+set}" = set; then :
- enableval=$enable_notify; enable_notify=$enableval
-else
- enable_notify=auto
+
+ # Check whether --enable-ffaudio was given.
+if test ${enable_ffaudio+y}
+then :
+ enableval=$enable_ffaudio; enable_ffaudio=$enableval
+else case e in #(
+ e) enable_ffaudio=auto ;;
+esac
 fi
 
 
-have_notify=no
-if test "x$enable_notify" != "xno"; then
+ have_ffaudio=no
+ check_allowed ffaudio $enable_ffaudio
+ if test $enable_ffaudio != no -a $plugin_allowed = yes ; then
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for NOTIFY" >&5
-$as_echo_n "checking for NOTIFY... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libavcodec >= 56.60.100 libavformat >= 56.40.101 libavutil >= 54.31.100" >&5
+printf %s "checking for libavcodec >= 56.60.100 libavformat >= 56.40.101 libavutil >= 54.31.100... " >&6; }
 
-if test -n "$NOTIFY_CFLAGS"; then
- pkg_cv_NOTIFY_CFLAGS="$NOTIFY_CFLAGS"
+if test -n "$FFMPEG_CFLAGS"; then
+ pkg_cv_FFMPEG_CFLAGS="$FFMPEG_CFLAGS"
 elif test -n "$PKG_CONFIG"; then
 if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnotify >= 0.7\""; } >&5
- ($PKG_CONFIG --exists --print-errors "libnotify >= 0.7") 2>&5
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libavcodec >= 56.60.100 libavformat >= 56.40.101 libavutil >= 54.31.100\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libavcodec >= 56.60.100 libavformat >= 56.40.101 libavutil >= 54.31.100") 2>&5
 ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
- pkg_cv_NOTIFY_CFLAGS=`$PKG_CONFIG --cflags "libnotify >= 0.7" 2>/dev/null`
+ pkg_cv_FFMPEG_CFLAGS=`$PKG_CONFIG --cflags "libavcodec >= 56.60.100 libavformat >= 56.40.101 libavutil >= 54.31.100" 2>/dev/null`
 		 test "x$?" != "x0" && pkg_failed=yes
 else
 pkg_failed=yes
@@ -10533,16 +13357,16 @@
 else
 pkg_failed=untried
 fi
-if test -n "$NOTIFY_LIBS"; then
- pkg_cv_NOTIFY_LIBS="$NOTIFY_LIBS"
+if test -n "$FFMPEG_LIBS"; then
+ pkg_cv_FFMPEG_LIBS="$FFMPEG_LIBS"
 elif test -n "$PKG_CONFIG"; then
 if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnotify >= 0.7\""; } >&5
- ($PKG_CONFIG --exists --print-errors "libnotify >= 0.7") 2>&5
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libavcodec >= 56.60.100 libavformat >= 56.40.101 libavutil >= 54.31.100\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libavcodec >= 56.60.100 libavformat >= 56.40.101 libavutil >= 54.31.100") 2>&5
 ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
- pkg_cv_NOTIFY_LIBS=`$PKG_CONFIG --libs "libnotify >= 0.7" 2>/dev/null`
+ pkg_cv_FFMPEG_LIBS=`$PKG_CONFIG --libs "libavcodec >= 56.60.100 libavformat >= 56.40.101 libavutil >= 54.31.100" 2>/dev/null`
 		 test "x$?" != "x0" && pkg_failed=yes
 else
 pkg_failed=yes
@@ -10554,8 +13378,8 @@
 
 
 if test $pkg_failed = yes; then
- 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
 _pkg_short_errors_supported=yes
@@ -10563,118 +13387,74 @@
 _pkg_short_errors_supported=no
 fi
 if test $_pkg_short_errors_supported = yes; then
-	 NOTIFY_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libnotify >= 0.7" 2>&1`
+ FFMPEG_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libavcodec >= 56.60.100 libavformat >= 56.40.101 libavutil >= 54.31.100" 2>&1`
 else
-	 NOTIFY_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libnotify >= 0.7" 2>&1`
+ FFMPEG_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libavcodec >= 56.60.100 libavformat >= 56.40.101 libavutil >= 54.31.100" 2>&1`
 fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$NOTIFY_PKG_ERRORS" >&5
-
-	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
+ # Put the nasty error message in config.log where it belongs
+ echo "$FFMPEG_PKG_ERRORS" >&5
 
-elif test $pkg_failed = untried; then
- 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-	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
- GENERAL_PLUGINS="$GENERAL_PLUGINS notify"
-fi
-fi
-
-
-# Check whether --enable-mpris2 was given.
-if test "${enable_mpris2+set}" = set; then :
- enableval=$enable_mpris2; enable_mpris2=$enableval
-else
- enable_mpris2=auto
-fi
+ if test $enable_ffaudio = yes ; then
+ as_fn_error $? "Missing dependency for FFmpeg decoder: libavcodec >= 56.60.100 libavformat >= 56.40.101 libavutil >= 54.31.100" "$LINENO" 5
+ else
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: FFmpeg decoder disabled due to missing dependency: libavcodec >= 56.60.100 libavformat >= 56.40.101 libavutil >= 54.31.100" >&5
+printf "%s\n" "$as_me: WARNING: FFmpeg decoder disabled due to missing dependency: libavcodec >= 56.60.100 libavformat >= 56.40.101 libavutil >= 54.31.100" >&2;}
+ fi
 
+elif test $pkg_failed = untried; then
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
-if test $enable_mpris2 = no ; then
-	have_mpris2=no
-else
-	# Extract the first word of "gdbus-codegen", so it can be a program name with args.
-set dummy gdbus-codegen; 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_prog_have_mpris2+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test -n "$have_mpris2"; then
- ac_cv_prog_have_mpris2="$have_mpris2" # Let the user override the test.
-else
-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_prog_have_mpris2="yes"
- $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
+ if test $enable_ffaudio = yes ; then
+ as_fn_error $? "Missing dependency for FFmpeg decoder: libavcodec >= 56.60.100 libavformat >= 56.40.101 libavutil >= 54.31.100" "$LINENO" 5
+ else
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: FFmpeg decoder disabled due to missing dependency: libavcodec >= 56.60.100 libavformat >= 56.40.101 libavutil >= 54.31.100" >&5
+printf "%s\n" "$as_me: WARNING: FFmpeg decoder disabled due to missing dependency: libavcodec >= 56.60.100 libavformat >= 56.40.101 libavutil >= 54.31.100" >&2;}
+ fi
 
- test -z "$ac_cv_prog_have_mpris2" && ac_cv_prog_have_mpris2="no"
-fi
-fi
-have_mpris2=$ac_cv_prog_have_mpris2
-if test -n "$have_mpris2"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_mpris2" >&5
-$as_echo "$have_mpris2" >&6; }
 else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
+ FFMPEG_CFLAGS=$pkg_cv_FFMPEG_CFLAGS
+ FFMPEG_LIBS=$pkg_cv_FFMPEG_LIBS
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
+ have_ffaudio=yes
+ INPUT_PLUGINS="$INPUT_PLUGINS ffaudio"
 
-	if test $have_mpris2 = yes ; then
-		GENERAL_PLUGINS="$GENERAL_PLUGINS mpris2"
-	elif test $enable_mpris2 = yes ; then
-		as_fn_error $? "MPRIS 2 plugin could not be enabled; check config.log" "$LINENO" 5
-	fi
 fi
+ fi
 
 
-# Check whether --enable-adplug was given.
-if test "${enable_adplug+set}" = set; then :
- enableval=$enable_adplug; enable_adplug=$enableval
-else
- enable_adplug=auto
 
+ # Check whether --enable-sndfile was given.
+if test ${enable_sndfile+y}
+then :
+ enableval=$enable_sndfile; enable_sndfile=$enableval
+else case e in #(
+ e) enable_sndfile=auto ;;
+esac
 fi
 
 
-have_adplug=no
-if test "x$enable_adplug" != "xno"; then
+ have_sndfile=no
+ check_allowed sndfile $enable_sndfile
+ if test $enable_sndfile != no -a $plugin_allowed = yes ; then
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BINIO" >&5
-$as_echo_n "checking for BINIO... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sndfile >= 0.19" >&5
+printf %s "checking for sndfile >= 0.19... " >&6; }
 
-if test -n "$BINIO_CFLAGS"; then
- pkg_cv_BINIO_CFLAGS="$BINIO_CFLAGS"
+if test -n "$SNDFILE_CFLAGS"; then
+ pkg_cv_SNDFILE_CFLAGS="$SNDFILE_CFLAGS"
 elif test -n "$PKG_CONFIG"; then
 if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libbinio >= 1.4\""; } >&5
- ($PKG_CONFIG --exists --print-errors "libbinio >= 1.4") 2>&5
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"sndfile >= 0.19\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "sndfile >= 0.19") 2>&5
 ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
- pkg_cv_BINIO_CFLAGS=`$PKG_CONFIG --cflags "libbinio >= 1.4" 2>/dev/null`
+ pkg_cv_SNDFILE_CFLAGS=`$PKG_CONFIG --cflags "sndfile >= 0.19" 2>/dev/null`
 		 test "x$?" != "x0" && pkg_failed=yes
 else
 pkg_failed=yes
@@ -10682,16 +13462,16 @@
 else
 pkg_failed=untried
 fi
-if test -n "$BINIO_LIBS"; then
- pkg_cv_BINIO_LIBS="$BINIO_LIBS"
+if test -n "$SNDFILE_LIBS"; then
+ pkg_cv_SNDFILE_LIBS="$SNDFILE_LIBS"
 elif test -n "$PKG_CONFIG"; then
 if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libbinio >= 1.4\""; } >&5
- ($PKG_CONFIG --exists --print-errors "libbinio >= 1.4") 2>&5
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"sndfile >= 0.19\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "sndfile >= 0.19") 2>&5
 ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
- pkg_cv_BINIO_LIBS=`$PKG_CONFIG --libs "libbinio >= 1.4" 2>/dev/null`
+ pkg_cv_SNDFILE_LIBS=`$PKG_CONFIG --libs "sndfile >= 0.19" 2>/dev/null`
 		 test "x$?" != "x0" && pkg_failed=yes
 else
 pkg_failed=yes
@@ -10703,8 +13483,8 @@
 
 
 if test $pkg_failed = yes; then
- 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
 _pkg_short_errors_supported=yes
@@ -10712,64 +13492,74 @@
 _pkg_short_errors_supported=no
 fi
 if test $_pkg_short_errors_supported = yes; then
-	 BINIO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libbinio >= 1.4" 2>&1`
+ SNDFILE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "sndfile >= 0.19" 2>&1`
 else
-	 BINIO_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libbinio >= 1.4" 2>&1`
+ SNDFILE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "sndfile >= 0.19" 2>&1`
 fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$BINIO_PKG_ERRORS" >&5
+ # Put the nasty error message in config.log where it belongs
+ echo "$SNDFILE_PKG_ERRORS" >&5
 
-	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
+
+ if test $enable_sndfile = yes ; then
+ as_fn_error $? "Missing dependency for libsndfile decoder: sndfile >= 0.19" "$LINENO" 5
+ else
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: libsndfile decoder disabled due to missing dependency: sndfile >= 0.19" >&5
+printf "%s\n" "$as_me: WARNING: libsndfile decoder disabled due to missing dependency: sndfile >= 0.19" >&2;}
+ 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_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
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
-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"
+ if test $enable_sndfile = yes ; then
+ as_fn_error $? "Missing dependency for libsndfile decoder: sndfile >= 0.19" "$LINENO" 5
+ else
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: libsndfile decoder disabled due to missing dependency: sndfile >= 0.19" >&5
+printf "%s\n" "$as_me: WARNING: libsndfile decoder disabled due to missing dependency: sndfile >= 0.19" >&2;}
+ fi
 
-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; }
+ SNDFILE_CFLAGS=$pkg_cv_SNDFILE_CFLAGS
+ SNDFILE_LIBS=$pkg_cv_SNDFILE_LIBS
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+
+ have_sndfile=yes
+ INPUT_PLUGINS="$INPUT_PLUGINS sndfile"
+
 fi
+ fi
 
 
 
-# Check whether --enable-vorbis was given.
-if test "${enable_vorbis+set}" = set; then :
- enableval=$enable_vorbis; enable_vorbis=$enableval
-else
- enable_vorbis=yes
+ # Check whether --enable-modplug was given.
+if test ${enable_modplug+y}
+then :
+ enableval=$enable_modplug; enable_modplug=$enableval
+else case e in #(
+ e) enable_modplug=auto ;;
+esac
 fi
 
 
-if test $enable_vorbis = yes ; then
+ have_modplug=no
+ check_allowed modplug $enable_modplug
+ if test $enable_modplug != no -a $plugin_allowed = yes ; then
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for VORBIS" >&5
-$as_echo_n "checking for VORBIS... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libmodplug" >&5
+printf %s "checking for libmodplug... " >&6; }
 
-if test -n "$VORBIS_CFLAGS"; then
- pkg_cv_VORBIS_CFLAGS="$VORBIS_CFLAGS"
+if test -n "$MODPLUG_CFLAGS"; then
+ pkg_cv_MODPLUG_CFLAGS="$MODPLUG_CFLAGS"
 elif test -n "$PKG_CONFIG"; then
 if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ogg >= 1.0 vorbis >= 1.0 vorbisenc >= 1.0 vorbisfile >= 1.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "ogg >= 1.0 vorbis >= 1.0 vorbisenc >= 1.0 vorbisfile >= 1.0") 2>&5
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmodplug\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libmodplug") 2>&5
 ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
- pkg_cv_VORBIS_CFLAGS=`$PKG_CONFIG --cflags "ogg >= 1.0 vorbis >= 1.0 vorbisenc >= 1.0 vorbisfile >= 1.0" 2>/dev/null`
+ pkg_cv_MODPLUG_CFLAGS=`$PKG_CONFIG --cflags "libmodplug" 2>/dev/null`
 		 test "x$?" != "x0" && pkg_failed=yes
 else
 pkg_failed=yes
@@ -10777,16 +13567,16 @@
 else
 pkg_failed=untried
 fi
-if test -n "$VORBIS_LIBS"; then
- pkg_cv_VORBIS_LIBS="$VORBIS_LIBS"
+if test -n "$MODPLUG_LIBS"; then
+ pkg_cv_MODPLUG_LIBS="$MODPLUG_LIBS"
 elif test -n "$PKG_CONFIG"; then
 if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ogg >= 1.0 vorbis >= 1.0 vorbisenc >= 1.0 vorbisfile >= 1.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "ogg >= 1.0 vorbis >= 1.0 vorbisenc >= 1.0 vorbisfile >= 1.0") 2>&5
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmodplug\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libmodplug") 2>&5
 ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
- pkg_cv_VORBIS_LIBS=`$PKG_CONFIG --libs "ogg >= 1.0 vorbis >= 1.0 vorbisenc >= 1.0 vorbisfile >= 1.0" 2>/dev/null`
+ pkg_cv_MODPLUG_LIBS=`$PKG_CONFIG --libs "libmodplug" 2>/dev/null`
 		 test "x$?" != "x0" && pkg_failed=yes
 else
 pkg_failed=yes
@@ -10798,8 +13588,8 @@
 
 
 if test $pkg_failed = yes; then
- 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
 _pkg_short_errors_supported=yes
@@ -10807,73 +13597,74 @@
 _pkg_short_errors_supported=no
 fi
 if test $_pkg_short_errors_supported = yes; then
-	 VORBIS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "ogg >= 1.0 vorbis >= 1.0 vorbisenc >= 1.0 vorbisfile >= 1.0" 2>&1`
+ MODPLUG_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libmodplug" 2>&1`
 else
-	 VORBIS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "ogg >= 1.0 vorbis >= 1.0 vorbisenc >= 1.0 vorbisfile >= 1.0" 2>&1`
+ MODPLUG_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libmodplug" 2>&1`
 fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$VORBIS_PKG_ERRORS" >&5
-
-	as_fn_error $? "Package requirements (ogg >= 1.0 vorbis >= 1.0 vorbisenc >= 1.0 vorbisfile >= 1.0) were not met:
+ # Put the nasty error message in config.log where it belongs
+ echo "$MODPLUG_PKG_ERRORS" >&5
 
-$VORBIS_PKG_ERRORS
 
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
+ if test $enable_modplug = yes ; then
+ as_fn_error $? "Missing dependency for ModPlug: libmodplug" "$LINENO" 5
+ else
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: ModPlug disabled due to missing dependency: libmodplug" >&5
+printf "%s\n" "$as_me: WARNING: ModPlug disabled due to missing dependency: libmodplug" >&2;}
+ fi
 
-Alternatively, you may set the environment variables VORBIS_CFLAGS
-and VORBIS_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; }
-	{ { $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.
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
-Alternatively, you may set the environment variables VORBIS_CFLAGS
-and VORBIS_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
+ if test $enable_modplug = yes ; then
+ as_fn_error $? "Missing dependency for ModPlug: libmodplug" "$LINENO" 5
+ else
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: ModPlug disabled due to missing dependency: libmodplug" >&5
+printf "%s\n" "$as_me: WARNING: ModPlug disabled due to missing dependency: libmodplug" >&2;}
+ fi
 
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5; }
 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; }
+ MODPLUG_CFLAGS=$pkg_cv_MODPLUG_CFLAGS
+ MODPLUG_LIBS=$pkg_cv_MODPLUG_LIBS
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+
+ have_modplug=yes
+ INPUT_PLUGINS="$INPUT_PLUGINS modplug"
 
 fi
- INPUT_PLUGINS="$INPUT_PLUGINS vorbis"
-fi
+ fi
 
 
-# Check whether --enable-flacng was given.
-if test "${enable_flacng+set}" = set; then :
- enableval=$enable_flacng; enable_flacng=$enableval
-else
- enable_flacng=yes
+
+ # Check whether --enable-openmpt was given.
+if test ${enable_openmpt+y}
+then :
+ enableval=$enable_openmpt; enable_openmpt=$enableval
+else case e in #(
+ e) enable_openmpt=auto ;;
+esac
 fi
 
 
-if test $enable_flacng = yes ; then
+ have_openmpt=no
+ check_allowed openmpt $enable_openmpt
+ if test $enable_openmpt != no -a $plugin_allowed = yes ; then
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBFLAC" >&5
-$as_echo_n "checking for LIBFLAC... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libopenmpt >= 0.2" >&5
+printf %s "checking for libopenmpt >= 0.2... " >&6; }
 
-if test -n "$LIBFLAC_CFLAGS"; then
- pkg_cv_LIBFLAC_CFLAGS="$LIBFLAC_CFLAGS"
+if test -n "$OPENMPT_CFLAGS"; then
+ pkg_cv_OPENMPT_CFLAGS="$OPENMPT_CFLAGS"
 elif test -n "$PKG_CONFIG"; then
 if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"flac >= 1.2.1\""; } >&5
- ($PKG_CONFIG --exists --print-errors "flac >= 1.2.1") 2>&5
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libopenmpt >= 0.2\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libopenmpt >= 0.2") 2>&5
 ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
- pkg_cv_LIBFLAC_CFLAGS=`$PKG_CONFIG --cflags "flac >= 1.2.1" 2>/dev/null`
+ pkg_cv_OPENMPT_CFLAGS=`$PKG_CONFIG --cflags "libopenmpt >= 0.2" 2>/dev/null`
 		 test "x$?" != "x0" && pkg_failed=yes
 else
 pkg_failed=yes
@@ -10881,16 +13672,16 @@
 else
 pkg_failed=untried
 fi
-if test -n "$LIBFLAC_LIBS"; then
- pkg_cv_LIBFLAC_LIBS="$LIBFLAC_LIBS"
+if test -n "$OPENMPT_LIBS"; then
+ pkg_cv_OPENMPT_LIBS="$OPENMPT_LIBS"
 elif test -n "$PKG_CONFIG"; then
 if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"flac >= 1.2.1\""; } >&5
- ($PKG_CONFIG --exists --print-errors "flac >= 1.2.1") 2>&5
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libopenmpt >= 0.2\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libopenmpt >= 0.2") 2>&5
 ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
- pkg_cv_LIBFLAC_LIBS=`$PKG_CONFIG --libs "flac >= 1.2.1" 2>/dev/null`
+ pkg_cv_OPENMPT_LIBS=`$PKG_CONFIG --libs "libopenmpt >= 0.2" 2>/dev/null`
 		 test "x$?" != "x0" && pkg_failed=yes
 else
 pkg_failed=yes
@@ -10902,8 +13693,8 @@
 
 
 if test $pkg_failed = yes; then
- 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
 _pkg_short_errors_supported=yes
@@ -10911,75 +13702,74 @@
 _pkg_short_errors_supported=no
 fi
 if test $_pkg_short_errors_supported = yes; then
-	 LIBFLAC_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "flac >= 1.2.1" 2>&1`
+ OPENMPT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libopenmpt >= 0.2" 2>&1`
 else
-	 LIBFLAC_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "flac >= 1.2.1" 2>&1`
+ OPENMPT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libopenmpt >= 0.2" 2>&1`
 fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$LIBFLAC_PKG_ERRORS" >&5
-
-	as_fn_error $? "Package requirements (flac >= 1.2.1) were not met:
+ # Put the nasty error message in config.log where it belongs
+ echo "$OPENMPT_PKG_ERRORS" >&5
 
-$LIBFLAC_PKG_ERRORS
 
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
+ if test $enable_openmpt = yes ; then
+ as_fn_error $? "Missing dependency for libopenmpt: libopenmpt >= 0.2" "$LINENO" 5
+ else
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: libopenmpt disabled due to missing dependency: libopenmpt >= 0.2" >&5
+printf "%s\n" "$as_me: WARNING: libopenmpt disabled due to missing dependency: libopenmpt >= 0.2" >&2;}
+ fi
 
-Alternatively, you may set the environment variables LIBFLAC_CFLAGS
-and LIBFLAC_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; }
-	{ { $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.
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
-Alternatively, you may set the environment variables LIBFLAC_CFLAGS
-and LIBFLAC_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
+ if test $enable_openmpt = yes ; then
+ as_fn_error $? "Missing dependency for libopenmpt: libopenmpt >= 0.2" "$LINENO" 5
+ else
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: libopenmpt disabled due to missing dependency: libopenmpt >= 0.2" >&5
+printf "%s\n" "$as_me: WARNING: libopenmpt disabled due to missing dependency: libopenmpt >= 0.2" >&2;}
+ fi
 
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5; }
 else
-	LIBFLAC_CFLAGS=$pkg_cv_LIBFLAC_CFLAGS
-	LIBFLAC_LIBS=$pkg_cv_LIBFLAC_LIBS
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
+ OPENMPT_CFLAGS=$pkg_cv_OPENMPT_CFLAGS
+ OPENMPT_LIBS=$pkg_cv_OPENMPT_LIBS
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+
+ have_openmpt=yes
+ INPUT_PLUGINS="$INPUT_PLUGINS openmpt"
 
 fi
- INPUT_PLUGINS="$INPUT_PLUGINS flacng"
-fi
+ fi
 
 
-# Check whether --enable-wavpack was given.
-if test "${enable_wavpack+set}" = set; then :
- enableval=$enable_wavpack; enable_wavpack=$enableval
-else
- enable_wavpack=auto
 
+ # Check whether --enable-sid was given.
+if test ${enable_sid+y}
+then :
+ enableval=$enable_sid; enable_sid=$enableval
+else case e in #(
+ e) enable_sid=auto ;;
+esac
 fi
 
 
-have_wavpack=no
-if test "x$enable_wavpack" != "xno"; then
+ have_sid=no
+ check_allowed sid $enable_sid
+ if test $enable_sid != no -a $plugin_allowed = yes ; then
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for WAVPACK" >&5
-$as_echo_n "checking for WAVPACK... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libsidplayfp >= 2.0" >&5
+printf %s "checking for libsidplayfp >= 2.0... " >&6; }
 
-if test -n "$WAVPACK_CFLAGS"; then
- pkg_cv_WAVPACK_CFLAGS="$WAVPACK_CFLAGS"
+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 \"wavpack >= 4.31\""; } >&5
- ($PKG_CONFIG --exists --print-errors "wavpack >= 4.31") 2>&5
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsidplayfp >= 2.0\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libsidplayfp >= 2.0") 2>&5
 ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
- pkg_cv_WAVPACK_CFLAGS=`$PKG_CONFIG --cflags "wavpack >= 4.31" 2>/dev/null`
+ pkg_cv_SIDPLAYFP_CFLAGS=`$PKG_CONFIG --cflags "libsidplayfp >= 2.0" 2>/dev/null`
 		 test "x$?" != "x0" && pkg_failed=yes
 else
 pkg_failed=yes
@@ -10987,16 +13777,16 @@
 else
 pkg_failed=untried
 fi
-if test -n "$WAVPACK_LIBS"; then
- pkg_cv_WAVPACK_LIBS="$WAVPACK_LIBS"
+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 \"wavpack >= 4.31\""; } >&5
- ($PKG_CONFIG --exists --print-errors "wavpack >= 4.31") 2>&5
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsidplayfp >= 2.0\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libsidplayfp >= 2.0") 2>&5
 ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
- pkg_cv_WAVPACK_LIBS=`$PKG_CONFIG --libs "wavpack >= 4.31" 2>/dev/null`
+ pkg_cv_SIDPLAYFP_LIBS=`$PKG_CONFIG --libs "libsidplayfp >= 2.0" 2>/dev/null`
 		 test "x$?" != "x0" && pkg_failed=yes
 else
 pkg_failed=yes
@@ -11008,8 +13798,8 @@
 
 
 if test $pkg_failed = yes; then
- 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
 _pkg_short_errors_supported=yes
@@ -11017,137 +13807,221 @@
 _pkg_short_errors_supported=no
 fi
 if test $_pkg_short_errors_supported = yes; then
-	 WAVPACK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "wavpack >= 4.31" 2>&1`
+ SIDPLAYFP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libsidplayfp >= 2.0" 2>&1`
 else
-	 WAVPACK_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "wavpack >= 4.31" 2>&1`
+ SIDPLAYFP_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libsidplayfp >= 2.0" 2>&1`
 fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$WAVPACK_PKG_ERRORS" >&5
+ # Put the nasty error message in config.log where it belongs
+ echo "$SIDPLAYFP_PKG_ERRORS" >&5
 
-	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
+
+ if test $enable_sid = yes ; then
+ as_fn_error $? "Missing dependency for Commodore 64 audio: libsidplayfp >= 2.0" "$LINENO" 5
+ else
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Commodore 64 audio disabled due to missing dependency: libsidplayfp >= 2.0" >&5
+printf "%s\n" "$as_me: WARNING: Commodore 64 audio disabled due to missing dependency: libsidplayfp >= 2.0" >&2;}
+ 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_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
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+
+ if test $enable_sid = yes ; then
+ as_fn_error $? "Missing dependency for Commodore 64 audio: libsidplayfp >= 2.0" "$LINENO" 5
+ else
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Commodore 64 audio disabled due to missing dependency: libsidplayfp >= 2.0" >&5
+printf "%s\n" "$as_me: WARNING: Commodore 64 audio disabled due to missing dependency: libsidplayfp >= 2.0" >&2;}
+ fi
 
 else
-	WAVPACK_CFLAGS=$pkg_cv_WAVPACK_CFLAGS
-	WAVPACK_LIBS=$pkg_cv_WAVPACK_LIBS
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-	have_wavpack=yes
- INPUT_PLUGINS="$INPUT_PLUGINS wavpack"
+ SIDPLAYFP_CFLAGS=$pkg_cv_SIDPLAYFP_CFLAGS
+ SIDPLAYFP_LIBS=$pkg_cv_SIDPLAYFP_LIBS
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+
+ have_sid=yes
+ INPUT_PLUGINS="$INPUT_PLUGINS sid"
+
 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; }
+ fi
+
+
+test_console () {
+ for ac_header in zlib.h
+do :
+ ac_fn_c_check_header_compile "$LINENO" "zlib.h" "ac_cv_header_zlib_h" "$ac_includes_default"
+if test "x$ac_cv_header_zlib_h" = xyes
+then :
+ printf "%s\n" "#define HAVE_ZLIB_H 1" >>confdefs.h
+ have_console=yes
+else case e in #(
+ e) have_console=no ;;
+esac
 fi
 
+done
+}
 
-# Check whether --enable-aac was given.
-if test "${enable_aac+set}" = set; then :
- enableval=$enable_aac; enable_aac=$enableval
-else
- enable_aac=yes
+
+ # Check whether --enable-console was given.
+if test ${enable_console+y}
+then :
+ enableval=$enable_console; enable_console=$enableval
+else case e in #(
+ e) enable_console=auto ;;
+esac
 fi
 
 
-if test $enable_aac = yes ; then
- ac_fn_c_check_header_mongrel "$LINENO" "neaacdec.h" "ac_cv_header_neaacdec_h" "$ac_includes_default"
-if test "x$ac_cv_header_neaacdec_h" = xyes; then :
- have_aac=yes
-else
- have_aac=no
+ have_console=no
+ check_allowed console $enable_console
+ if test $enable_console != no -a $plugin_allowed = yes ; then
+ test_console
+ if test $have_console = yes ; then
+ INPUT_PLUGINS="$INPUT_PLUGINS console"
+ elif test $enable_console = yes ; then
+ as_fn_error $? "Missing dependency for Game Music Emu" "$LINENO" 5
+ else
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Game Music Emu disabled due to missing dependency" >&5
+printf "%s\n" "$as_me: WARNING: Game Music Emu disabled due to missing dependency" >&2;}
+ fi
+ fi
+
+
+
+ # Check whether --enable-bs2b was given.
+if test ${enable_bs2b+y}
+then :
+ enableval=$enable_bs2b; enable_bs2b=$enableval
+else case e in #(
+ e) enable_bs2b=auto ;;
+esac
 fi
 
 
- { $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
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lfaad $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
+ have_bs2b=no
+ check_allowed bs2b $enable_bs2b
+ if test $enable_bs2b != no -a $plugin_allowed = yes ; then
 
-/* 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 NeAACDecInit2 ();
-int
-main ()
-{
-return NeAACDecInit2 ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_faad_NeAACDecInit2=yes
+pkg_failed=no
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libbs2b >= 3.0.0" >&5
+printf %s "checking for libbs2b >= 3.0.0... " >&6; }
+
+if test -n "$BS2B_CFLAGS"; then
+ pkg_cv_BS2B_CFLAGS="$BS2B_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libbs2b >= 3.0.0\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libbs2b >= 3.0.0") 2>&5
+ ac_status=$?
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_BS2B_CFLAGS=`$PKG_CONFIG --cflags "libbs2b >= 3.0.0" 2>/dev/null`
+		 test "x$?" != "x0" && pkg_failed=yes
 else
- ac_cv_lib_faad_NeAACDecInit2=no
+ pkg_failed=yes
 fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
+ else
+ pkg_failed=untried
 fi
-{ $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 :
- have_aac=$have_aac
+if test -n "$BS2B_LIBS"; then
+ pkg_cv_BS2B_LIBS="$BS2B_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libbs2b >= 3.0.0\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libbs2b >= 3.0.0") 2>&5
+ ac_status=$?
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_BS2B_LIBS=`$PKG_CONFIG --libs "libbs2b >= 3.0.0" 2>/dev/null`
+		 test "x$?" != "x0" && pkg_failed=yes
 else
- have_aac=no
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
 fi
 
 
- if test $have_aac != yes ; then
- as_fn_error $? "Please install libfaad, or use --disable-aac to disable AAC support." "$LINENO" 5
- fi
 
- FAAD_CFLAGS=
- FAAD_LIBS="-lfaad"
+if test $pkg_failed = yes; then
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "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
+ BS2B_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libbs2b >= 3.0.0" 2>&1`
+ else
+ BS2B_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libbs2b >= 3.0.0" 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$BS2B_PKG_ERRORS" >&5
 
 
+ if test $enable_bs2b = yes ; then
+ as_fn_error $? "Missing dependency for BS2B effect: libbs2b >= 3.0.0" "$LINENO" 5
+ else
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: BS2B effect disabled due to missing dependency: libbs2b >= 3.0.0" >&5
+printf "%s\n" "$as_me: WARNING: BS2B effect disabled due to missing dependency: libbs2b >= 3.0.0" >&2;}
+ fi
 
- INPUT_PLUGINS="$INPUT_PLUGINS aac-raw"
-fi
+elif test $pkg_failed = untried; then
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
+ if test $enable_bs2b = yes ; then
+ as_fn_error $? "Missing dependency for BS2B effect: libbs2b >= 3.0.0" "$LINENO" 5
+ else
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: BS2B effect disabled due to missing dependency: libbs2b >= 3.0.0" >&5
+printf "%s\n" "$as_me: WARNING: BS2B effect disabled due to missing dependency: libbs2b >= 3.0.0" >&2;}
+ fi
 
-# Check whether --enable-sndfile was given.
-if test "${enable_sndfile+set}" = set; then :
- enableval=$enable_sndfile; enable_sndfile=$enableval
 else
- enable_sndfile=auto
+ BS2B_CFLAGS=$pkg_cv_BS2B_CFLAGS
+ BS2B_LIBS=$pkg_cv_BS2B_LIBS
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+
+ have_bs2b=yes
+ EFFECT_PLUGINS="$EFFECT_PLUGINS bs2b"
+
+fi
+ fi
+
 
+
+ # Check whether --enable-resample was given.
+if test ${enable_resample+y}
+then :
+ enableval=$enable_resample; enable_resample=$enableval
+else case e in #(
+ e) enable_resample=auto ;;
+esac
 fi
 
 
-have_sndfile=no
-if test "x$enable_sndfile" != "xno"; then
+ have_resample=no
+ check_allowed resample $enable_resample
+ if test $enable_resample != no -a $plugin_allowed = yes ; then
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SNDFILE" >&5
-$as_echo_n "checking for SNDFILE... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for samplerate" >&5
+printf %s "checking for samplerate... " >&6; }
 
-if test -n "$SNDFILE_CFLAGS"; then
- pkg_cv_SNDFILE_CFLAGS="$SNDFILE_CFLAGS"
+if test -n "$SAMPLERATE_CFLAGS"; then
+ pkg_cv_SAMPLERATE_CFLAGS="$SAMPLERATE_CFLAGS"
 elif test -n "$PKG_CONFIG"; then
 if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"sndfile >= 0.19\""; } >&5
- ($PKG_CONFIG --exists --print-errors "sndfile >= 0.19") 2>&5
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"samplerate\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "samplerate") 2>&5
 ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
- pkg_cv_SNDFILE_CFLAGS=`$PKG_CONFIG --cflags "sndfile >= 0.19" 2>/dev/null`
+ pkg_cv_SAMPLERATE_CFLAGS=`$PKG_CONFIG --cflags "samplerate" 2>/dev/null`
 		 test "x$?" != "x0" && pkg_failed=yes
 else
 pkg_failed=yes
@@ -11155,16 +14029,16 @@
 else
 pkg_failed=untried
 fi
-if test -n "$SNDFILE_LIBS"; then
- pkg_cv_SNDFILE_LIBS="$SNDFILE_LIBS"
+if test -n "$SAMPLERATE_LIBS"; then
+ pkg_cv_SAMPLERATE_LIBS="$SAMPLERATE_LIBS"
 elif test -n "$PKG_CONFIG"; then
 if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"sndfile >= 0.19\""; } >&5
- ($PKG_CONFIG --exists --print-errors "sndfile >= 0.19") 2>&5
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"samplerate\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "samplerate") 2>&5
 ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
- pkg_cv_SNDFILE_LIBS=`$PKG_CONFIG --libs "sndfile >= 0.19" 2>/dev/null`
+ pkg_cv_SAMPLERATE_LIBS=`$PKG_CONFIG --libs "samplerate" 2>/dev/null`
 		 test "x$?" != "x0" && pkg_failed=yes
 else
 pkg_failed=yes
@@ -11176,8 +14050,8 @@
 
 
 if test $pkg_failed = yes; then
- 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
 _pkg_short_errors_supported=yes
@@ -11185,64 +14059,74 @@
 _pkg_short_errors_supported=no
 fi
 if test $_pkg_short_errors_supported = yes; then
-	 SNDFILE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "sndfile >= 0.19" 2>&1`
+ SAMPLERATE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "samplerate" 2>&1`
 else
-	 SNDFILE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "sndfile >= 0.19" 2>&1`
+ SAMPLERATE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "samplerate" 2>&1`
 fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$SNDFILE_PKG_ERRORS" >&5
+ # Put the nasty error message in config.log where it belongs
+ echo "$SAMPLERATE_PKG_ERRORS" >&5
 
-	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
+
+ if test $enable_resample = yes ; then
+ as_fn_error $? "Missing dependency for sample rate converter: samplerate" "$LINENO" 5
+ else
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: sample rate converter disabled due to missing dependency: samplerate" >&5
+printf "%s\n" "$as_me: WARNING: sample rate converter disabled due to missing dependency: samplerate" >&2;}
+ 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_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
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+
+ if test $enable_resample = yes ; then
+ as_fn_error $? "Missing dependency for sample rate converter: samplerate" "$LINENO" 5
+ else
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: sample rate converter disabled due to missing dependency: samplerate" >&5
+printf "%s\n" "$as_me: WARNING: sample rate converter disabled due to missing dependency: samplerate" >&2;}
+ 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; }
-	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; }
+ SAMPLERATE_CFLAGS=$pkg_cv_SAMPLERATE_CFLAGS
+ SAMPLERATE_LIBS=$pkg_cv_SAMPLERATE_LIBS
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+
+ have_resample=yes
+ EFFECT_PLUGINS="$EFFECT_PLUGINS resample"
+
 fi
+ fi
 
 
-# Check whether --enable-modplug was given.
-if test "${enable_modplug+set}" = set; then :
- enableval=$enable_modplug; enable_modplug=$enableval
-else
- enable_modplug=auto
 
+ # Check whether --enable-speedpitch was given.
+if test ${enable_speedpitch+y}
+then :
+ enableval=$enable_speedpitch; enable_speedpitch=$enableval
+else case e in #(
+ e) enable_speedpitch=auto ;;
+esac
 fi
 
 
-have_modplug=no
-if test "x$enable_modplug" != "xno"; then
+ have_speedpitch=no
+ check_allowed speedpitch $enable_speedpitch
+ if test $enable_speedpitch != no -a $plugin_allowed = yes ; then
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for MODPLUG" >&5
-$as_echo_n "checking for MODPLUG... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for samplerate" >&5
+printf %s "checking for samplerate... " >&6; }
 
-if test -n "$MODPLUG_CFLAGS"; then
- pkg_cv_MODPLUG_CFLAGS="$MODPLUG_CFLAGS"
+if test -n "$SAMPLERATE_CFLAGS"; then
+ pkg_cv_SAMPLERATE_CFLAGS="$SAMPLERATE_CFLAGS"
 elif test -n "$PKG_CONFIG"; then
 if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmodplug\""; } >&5
- ($PKG_CONFIG --exists --print-errors "libmodplug") 2>&5
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"samplerate\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "samplerate") 2>&5
 ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
- pkg_cv_MODPLUG_CFLAGS=`$PKG_CONFIG --cflags "libmodplug" 2>/dev/null`
+ pkg_cv_SAMPLERATE_CFLAGS=`$PKG_CONFIG --cflags "samplerate" 2>/dev/null`
 		 test "x$?" != "x0" && pkg_failed=yes
 else
 pkg_failed=yes
@@ -11250,16 +14134,16 @@
 else
 pkg_failed=untried
 fi
-if test -n "$MODPLUG_LIBS"; then
- pkg_cv_MODPLUG_LIBS="$MODPLUG_LIBS"
+if test -n "$SAMPLERATE_LIBS"; then
+ pkg_cv_SAMPLERATE_LIBS="$SAMPLERATE_LIBS"
 elif test -n "$PKG_CONFIG"; then
 if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmodplug\""; } >&5
- ($PKG_CONFIG --exists --print-errors "libmodplug") 2>&5
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"samplerate\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "samplerate") 2>&5
 ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
- pkg_cv_MODPLUG_LIBS=`$PKG_CONFIG --libs "libmodplug" 2>/dev/null`
+ pkg_cv_SAMPLERATE_LIBS=`$PKG_CONFIG --libs "samplerate" 2>/dev/null`
 		 test "x$?" != "x0" && pkg_failed=yes
 else
 pkg_failed=yes
@@ -11271,8 +14155,8 @@
 
 
 if test $pkg_failed = yes; then
- 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
 _pkg_short_errors_supported=yes
@@ -11280,60 +14164,74 @@
 _pkg_short_errors_supported=no
 fi
 if test $_pkg_short_errors_supported = yes; then
-	 MODPLUG_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libmodplug" 2>&1`
+ SAMPLERATE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "samplerate" 2>&1`
 else
-	 MODPLUG_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libmodplug" 2>&1`
+ SAMPLERATE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "samplerate" 2>&1`
 fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$MODPLUG_PKG_ERRORS" >&5
+ # Put the nasty error message in config.log where it belongs
+ echo "$SAMPLERATE_PKG_ERRORS" >&5
 
-	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
+
+ if test $enable_speedpitch = yes ; then
+ as_fn_error $? "Missing dependency for speed/pitch effect: samplerate" "$LINENO" 5
+ else
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: speed/pitch effect disabled due to missing dependency: samplerate" >&5
+printf "%s\n" "$as_me: WARNING: speed/pitch effect disabled due to missing dependency: samplerate" >&2;}
+ 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_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
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+
+ if test $enable_speedpitch = yes ; then
+ as_fn_error $? "Missing dependency for speed/pitch effect: samplerate" "$LINENO" 5
+ else
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: speed/pitch effect disabled due to missing dependency: samplerate" >&5
+printf "%s\n" "$as_me: WARNING: speed/pitch effect disabled due to missing dependency: samplerate" >&2;}
+ fi
 
 else
-	MODPLUG_CFLAGS=$pkg_cv_MODPLUG_CFLAGS
-	MODPLUG_LIBS=$pkg_cv_MODPLUG_LIBS
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-	INPUT_PLUGINS="$INPUT_PLUGINS modplug"
- have_modplug=yes
-fi
+ SAMPLERATE_CFLAGS=$pkg_cv_SAMPLERATE_CFLAGS
+ SAMPLERATE_LIBS=$pkg_cv_SAMPLERATE_LIBS
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+
+ have_speedpitch=yes
+ EFFECT_PLUGINS="$EFFECT_PLUGINS speedpitch"
+
 fi
+ fi
 
 
 
-# Check whether --with-ffmpeg was given.
-if test "${with_ffmpeg+set}" = set; then :
- withval=$with_ffmpeg; ffmpeg_variant=$withval
-else
- ffmpeg_variant=ffmpeg
+ # Check whether --enable-soxr was given.
+if test ${enable_soxr+y}
+then :
+ enableval=$enable_soxr; enable_soxr=$enableval
+else case e in #(
+ e) enable_soxr=auto ;;
+esac
 fi
 
 
-if test $ffmpeg_variant = ffmpeg ; then
+ have_soxr=no
+ check_allowed soxr $enable_soxr
+ if test $enable_soxr != no -a $plugin_allowed = yes ; then
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for FFMPEG" >&5
-$as_echo_n "checking for FFMPEG... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for soxr" >&5
+printf %s "checking for soxr... " >&6; }
 
-if test -n "$FFMPEG_CFLAGS"; then
- pkg_cv_FFMPEG_CFLAGS="$FFMPEG_CFLAGS"
+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 \"libavcodec >= 53.40.0 libavformat >= 53.21.0 libavutil >= 51.27.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "libavcodec >= 53.40.0 libavformat >= 53.21.0 libavutil >= 51.27.0") 2>&5
+ { { printf "%s\n" "$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
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
- pkg_cv_FFMPEG_CFLAGS=`$PKG_CONFIG --cflags "libavcodec >= 53.40.0 libavformat >= 53.21.0 libavutil >= 51.27.0" 2>/dev/null`
+ pkg_cv_SOXR_CFLAGS=`$PKG_CONFIG --cflags "soxr" 2>/dev/null`
 		 test "x$?" != "x0" && pkg_failed=yes
 else
 pkg_failed=yes
@@ -11341,16 +14239,16 @@
 else
 pkg_failed=untried
 fi
-if test -n "$FFMPEG_LIBS"; then
- pkg_cv_FFMPEG_LIBS="$FFMPEG_LIBS"
+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 \"libavcodec >= 53.40.0 libavformat >= 53.21.0 libavutil >= 51.27.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "libavcodec >= 53.40.0 libavformat >= 53.21.0 libavutil >= 51.27.0") 2>&5
+ { { printf "%s\n" "$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
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
- pkg_cv_FFMPEG_LIBS=`$PKG_CONFIG --libs "libavcodec >= 53.40.0 libavformat >= 53.21.0 libavutil >= 51.27.0" 2>/dev/null`
+ pkg_cv_SOXR_LIBS=`$PKG_CONFIG --libs "soxr" 2>/dev/null`
 		 test "x$?" != "x0" && pkg_failed=yes
 else
 pkg_failed=yes
@@ -11362,8 +14260,8 @@
 
 
 if test $pkg_failed = yes; then
- 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
 _pkg_short_errors_supported=yes
@@ -11371,44 +14269,74 @@
 _pkg_short_errors_supported=no
 fi
 if test $_pkg_short_errors_supported = yes; then
-	 FFMPEG_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libavcodec >= 53.40.0 libavformat >= 53.21.0 libavutil >= 51.27.0" 2>&1`
+ SOXR_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "soxr" 2>&1`
 else
-	 FFMPEG_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libavcodec >= 53.40.0 libavformat >= 53.21.0 libavutil >= 51.27.0" 2>&1`
+ 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 "$FFMPEG_PKG_ERRORS" >&5
+ # Put the nasty error message in config.log where it belongs
+ echo "$SOXR_PKG_ERRORS" >&5
+
+
+ if test $enable_soxr = yes ; then
+ as_fn_error $? "Missing dependency for SoX resampler: soxr" "$LINENO" 5
+ else
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: SoX resampler disabled due to missing dependency: soxr" >&5
+printf "%s\n" "$as_me: WARNING: SoX resampler disabled due to missing dependency: soxr" >&2;}
+ fi
 
-	as_fn_error $? "FFmpeg is not installed or too old (required: libavcodec 53.40.0, libavformat 53.21.0, libavutil 51.27.0). Use --with-ffmpeg=none to disable the ffaudio plugin or --with-ffmpeg=libav to use libav instead." "$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 $? "FFmpeg is not installed or too old (required: libavcodec 53.40.0, libavformat 53.21.0, libavutil 51.27.0). Use --with-ffmpeg=none to disable the ffaudio plugin or --with-ffmpeg=libav to use libav instead." "$LINENO" 5
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+
+ if test $enable_soxr = yes ; then
+ as_fn_error $? "Missing dependency for SoX resampler: soxr" "$LINENO" 5
+ else
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: SoX resampler disabled due to missing dependency: soxr" >&5
+printf "%s\n" "$as_me: WARNING: SoX resampler disabled due to missing dependency: soxr" >&2;}
+ 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; }
-	INPUT_PLUGINS="$INPUT_PLUGINS ffaudio"
+ SOXR_CFLAGS=$pkg_cv_SOXR_CFLAGS
+ SOXR_LIBS=$pkg_cv_SOXR_LIBS
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
-$as_echo "#define HAVE_FFMPEG 1" >>confdefs.h
+ have_soxr=yes
+ EFFECT_PLUGINS="$EFFECT_PLUGINS soxr"
 
 fi
-elif test $ffmpeg_variant = libav ; then
+ fi
+
+
+
+ # Check whether --enable-alsa was given.
+if test ${enable_alsa+y}
+then :
+ enableval=$enable_alsa; enable_alsa=$enableval
+else case e in #(
+ e) enable_alsa=auto ;;
+esac
+fi
+
+
+ have_alsa=no
+ check_allowed alsa $enable_alsa
+ if test $enable_alsa != no -a $plugin_allowed = yes ; then
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for FFMPEG" >&5
-$as_echo_n "checking for FFMPEG... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for alsa >= 1.0.16" >&5
+printf %s "checking for alsa >= 1.0.16... " >&6; }
 
-if test -n "$FFMPEG_CFLAGS"; then
- pkg_cv_FFMPEG_CFLAGS="$FFMPEG_CFLAGS"
+if test -n "$ALSA_CFLAGS"; then
+ pkg_cv_ALSA_CFLAGS="$ALSA_CFLAGS"
 elif test -n "$PKG_CONFIG"; then
 if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libavcodec >= 53.25.0 libavformat >= 53.15.0 libavutil >= 51.18.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "libavcodec >= 53.25.0 libavformat >= 53.15.0 libavutil >= 51.18.0") 2>&5
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"alsa >= 1.0.16\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "alsa >= 1.0.16") 2>&5
 ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
- pkg_cv_FFMPEG_CFLAGS=`$PKG_CONFIG --cflags "libavcodec >= 53.25.0 libavformat >= 53.15.0 libavutil >= 51.18.0" 2>/dev/null`
+ pkg_cv_ALSA_CFLAGS=`$PKG_CONFIG --cflags "alsa >= 1.0.16" 2>/dev/null`
 		 test "x$?" != "x0" && pkg_failed=yes
 else
 pkg_failed=yes
@@ -11416,16 +14344,16 @@
 else
 pkg_failed=untried
 fi
-if test -n "$FFMPEG_LIBS"; then
- pkg_cv_FFMPEG_LIBS="$FFMPEG_LIBS"
+if test -n "$ALSA_LIBS"; then
+ pkg_cv_ALSA_LIBS="$ALSA_LIBS"
 elif test -n "$PKG_CONFIG"; then
 if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libavcodec >= 53.25.0 libavformat >= 53.15.0 libavutil >= 51.18.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "libavcodec >= 53.25.0 libavformat >= 53.15.0 libavutil >= 51.18.0") 2>&5
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"alsa >= 1.0.16\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "alsa >= 1.0.16") 2>&5
 ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
- pkg_cv_FFMPEG_LIBS=`$PKG_CONFIG --libs "libavcodec >= 53.25.0 libavformat >= 53.15.0 libavutil >= 51.18.0" 2>/dev/null`
+ pkg_cv_ALSA_LIBS=`$PKG_CONFIG --libs "alsa >= 1.0.16" 2>/dev/null`
 		 test "x$?" != "x0" && pkg_failed=yes
 else
 pkg_failed=yes
@@ -11437,8 +14365,8 @@
 
 
 if test $pkg_failed = yes; then
- 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
 _pkg_short_errors_supported=yes
@@ -11446,54 +14374,59 @@
 _pkg_short_errors_supported=no
 fi
 if test $_pkg_short_errors_supported = yes; then
-	 FFMPEG_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libavcodec >= 53.25.0 libavformat >= 53.15.0 libavutil >= 51.18.0" 2>&1`
+ ALSA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "alsa >= 1.0.16" 2>&1`
 else
-	 FFMPEG_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libavcodec >= 53.25.0 libavformat >= 53.15.0 libavutil >= 51.18.0" 2>&1`
+ ALSA_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "alsa >= 1.0.16" 2>&1`
 fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$FFMPEG_PKG_ERRORS" >&5
+ # Put the nasty error message in config.log where it belongs
+ echo "$ALSA_PKG_ERRORS" >&5
 
-	as_fn_error $? "libav is not installed or too old (required: libavcodec 53.25.0, libavformat 53.15.0, libavutil 51.18.0)." "$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 $? "libav is not installed or too old (required: libavcodec 53.25.0, libavformat 53.15.0, libavutil 51.18.0)." "$LINENO" 5
-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; }
-	INPUT_PLUGINS="$INPUT_PLUGINS ffaudio"
 
-$as_echo "#define HAVE_LIBAV 1" >>confdefs.h
+ if test $enable_alsa = yes ; then
+ as_fn_error $? "Missing dependency for ALSA output: alsa >= 1.0.16" "$LINENO" 5
+ else
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: ALSA output disabled due to missing dependency: alsa >= 1.0.16" >&5
+printf "%s\n" "$as_me: WARNING: ALSA output disabled due to missing dependency: alsa >= 1.0.16" >&2;}
+ fi
 
-fi
-fi
+elif test $pkg_failed = untried; then
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
+ if test $enable_alsa = yes ; then
+ as_fn_error $? "Missing dependency for ALSA output: alsa >= 1.0.16" "$LINENO" 5
+ else
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: ALSA output disabled due to missing dependency: alsa >= 1.0.16" >&5
+printf "%s\n" "$as_me: WARNING: ALSA output disabled due to missing dependency: alsa >= 1.0.16" >&2;}
+ fi
 
-# Check whether --enable-jack was given.
-if test "${enable_jack+set}" = set; then :
- enableval=$enable_jack; enable_jack=$enableval
 else
- enable_jack=auto
+ ALSA_CFLAGS=$pkg_cv_ALSA_CFLAGS
+ ALSA_LIBS=$pkg_cv_ALSA_LIBS
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+
+ have_alsa=yes
+ OUTPUT_PLUGINS="$OUTPUT_PLUGINS alsa"
+
 fi
+ fi
 
 
-have_jack=no
-if test "x$enable_jack" != "xno"; then
+test_jack () {
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for JACK" >&5
-$as_echo_n "checking for JACK... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for jack >= 1.9.7" >&5
+printf %s "checking for jack >= 1.9.7... " >&6; }
 
 if test -n "$JACK_CFLAGS"; then
 pkg_cv_JACK_CFLAGS="$JACK_CFLAGS"
 elif test -n "$PKG_CONFIG"; then
 if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"jack >= 1.9.7\""; } >&5
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"jack >= 1.9.7\""; } >&5
 ($PKG_CONFIG --exists --print-errors "jack >= 1.9.7") 2>&5
 ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
 pkg_cv_JACK_CFLAGS=`$PKG_CONFIG --cflags "jack >= 1.9.7" 2>/dev/null`
 		 test "x$?" != "x0" && pkg_failed=yes
@@ -11507,10 +14440,10 @@
 pkg_cv_JACK_LIBS="$JACK_LIBS"
 elif test -n "$PKG_CONFIG"; then
 if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"jack >= 1.9.7\""; } >&5
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"jack >= 1.9.7\""; } >&5
 ($PKG_CONFIG --exists --print-errors "jack >= 1.9.7") 2>&5
 ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
 pkg_cv_JACK_LIBS=`$PKG_CONFIG --libs "jack >= 1.9.7" 2>/dev/null`
 		 test "x$?" != "x0" && pkg_failed=yes
@@ -11524,8 +14457,8 @@
 
 
 if test $pkg_failed = yes; then
- 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
 _pkg_short_errors_supported=yes
@@ -11533,26 +14466,27 @@
 _pkg_short_errors_supported=no
 fi
 if test $_pkg_short_errors_supported = yes; then
-	 JACK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "jack >= 1.9.7" 2>&1`
+ JACK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "jack >= 1.9.7" 2>&1`
 else
-	 JACK_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "jack >= 1.9.7" 2>&1`
+ JACK_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "jack >= 1.9.7" 2>&1`
 fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$JACK_PKG_ERRORS" >&5
+ # Put the nasty error message in config.log where it belongs
+ 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; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for jack >= 0.120.1 jack < 1.0" >&5
+printf %s "checking for jack >= 0.120.1 jack < 1.0... " >&6; }
 
 if test -n "$JACK_CFLAGS"; then
 pkg_cv_JACK_CFLAGS="$JACK_CFLAGS"
 elif test -n "$PKG_CONFIG"; then
 if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"jack >= 0.120.1 jack < 1.0\""; } >&5
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"jack >= 0.120.1 jack < 1.0\""; } >&5
 ($PKG_CONFIG --exists --print-errors "jack >= 0.120.1 jack < 1.0") 2>&5
 ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
 pkg_cv_JACK_CFLAGS=`$PKG_CONFIG --cflags "jack >= 0.120.1 jack < 1.0" 2>/dev/null`
 		 test "x$?" != "x0" && pkg_failed=yes
@@ -11566,10 +14500,10 @@
 pkg_cv_JACK_LIBS="$JACK_LIBS"
 elif test -n "$PKG_CONFIG"; then
 if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"jack >= 0.120.1 jack < 1.0\""; } >&5
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"jack >= 0.120.1 jack < 1.0\""; } >&5
 ($PKG_CONFIG --exists --print-errors "jack >= 0.120.1 jack < 1.0") 2>&5
 ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
 pkg_cv_JACK_LIBS=`$PKG_CONFIG --libs "jack >= 0.120.1 jack < 1.0" 2>/dev/null`
 		 test "x$?" != "x0" && pkg_failed=yes
@@ -11583,8 +14517,8 @@
 
 
 if test $pkg_failed = yes; then
- 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
 _pkg_short_errors_supported=yes
@@ -11592,42 +14526,43 @@
 _pkg_short_errors_supported=no
 fi
 if test $_pkg_short_errors_supported = yes; then
-	 JACK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "jack >= 0.120.1 jack < 1.0" 2>&1`
+ JACK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "jack >= 0.120.1 jack < 1.0" 2>&1`
 else
-	 JACK_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "jack >= 0.120.1 jack < 1.0" 2>&1`
+ JACK_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "jack >= 0.120.1 jack < 1.0" 2>&1`
 fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$JACK_PKG_ERRORS" >&5
+ # Put the nasty error message in config.log where it belongs
+ echo "$JACK_PKG_ERRORS" >&5
 
-	have_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; }
-	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; }
-	have_jack=yes
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+ have_jack=no
+else
+ JACK_CFLAGS=$pkg_cv_JACK_CFLAGS
+ JACK_LIBS=$pkg_cv_JACK_LIBS
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+ have_jack=yes
 fi
 
 elif test $pkg_failed = untried; then
- 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for JACK" >&5
-$as_echo_n "checking for JACK... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for jack >= 0.120.1 jack < 1.0" >&5
+printf %s "checking for jack >= 0.120.1 jack < 1.0... " >&6; }
 
 if test -n "$JACK_CFLAGS"; then
 pkg_cv_JACK_CFLAGS="$JACK_CFLAGS"
 elif test -n "$PKG_CONFIG"; then
 if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"jack >= 0.120.1 jack < 1.0\""; } >&5
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"jack >= 0.120.1 jack < 1.0\""; } >&5
 ($PKG_CONFIG --exists --print-errors "jack >= 0.120.1 jack < 1.0") 2>&5
 ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
 pkg_cv_JACK_CFLAGS=`$PKG_CONFIG --cflags "jack >= 0.120.1 jack < 1.0" 2>/dev/null`
 		 test "x$?" != "x0" && pkg_failed=yes
@@ -11641,10 +14576,10 @@
 pkg_cv_JACK_LIBS="$JACK_LIBS"
 elif test -n "$PKG_CONFIG"; then
 if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"jack >= 0.120.1 jack < 1.0\""; } >&5
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"jack >= 0.120.1 jack < 1.0\""; } >&5
 ($PKG_CONFIG --exists --print-errors "jack >= 0.120.1 jack < 1.0") 2>&5
 ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
 pkg_cv_JACK_LIBS=`$PKG_CONFIG --libs "jack >= 0.120.1 jack < 1.0" 2>/dev/null`
 		 test "x$?" != "x0" && pkg_failed=yes
@@ -11658,8 +14593,8 @@
 
 
 if test $pkg_failed = yes; then
- 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
 _pkg_short_errors_supported=yes
@@ -11667,66 +14602,143 @@
 _pkg_short_errors_supported=no
 fi
 if test $_pkg_short_errors_supported = yes; then
-	 JACK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "jack >= 0.120.1 jack < 1.0" 2>&1`
+ JACK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "jack >= 0.120.1 jack < 1.0" 2>&1`
 else
-	 JACK_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "jack >= 0.120.1 jack < 1.0" 2>&1`
+ JACK_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "jack >= 0.120.1 jack < 1.0" 2>&1`
 fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$JACK_PKG_ERRORS" >&5
+ # Put the nasty error message in config.log where it belongs
+ echo "$JACK_PKG_ERRORS" >&5
 
-	have_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; }
-	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; }
-	have_jack=yes
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+ have_jack=no
+else
+ JACK_CFLAGS=$pkg_cv_JACK_CFLAGS
+ JACK_LIBS=$pkg_cv_JACK_LIBS
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+ have_jack=yes
 fi
 
 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; }
-	have_jack=yes
+ JACK_CFLAGS=$pkg_cv_JACK_CFLAGS
+ JACK_LIBS=$pkg_cv_JACK_LIBS
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+ have_jack=yes
 fi
+}
 
- if test "x$have_jack" = "xyes"; then
- OUTPUT_PLUGINS="$OUTPUT_PLUGINS jack-ng"
- elif test "x$enable_jack" = "xyes"; then
- as_fn_error $? "Cannot find JACK (ver >= 0.120.1 but < 1.0 or >= 1.9.7) development files, but compilation of JACK output plugin has been explicitly requested; please install JACK dev files and run configure again" "$LINENO" 5
+
+ # Check whether --enable-jack was given.
+if test ${enable_jack+y}
+then :
+ enableval=$enable_jack; enable_jack=$enableval
+else case e in #(
+ e) enable_jack=auto ;;
+esac
+fi
+
+
+ have_jack=no
+ check_allowed jack $enable_jack
+ if test $enable_jack != no -a $plugin_allowed = yes ; then
+ test_jack
+ if test $have_jack = yes ; then
+ OUTPUT_PLUGINS="$OUTPUT_PLUGINS jack"
+ elif test $enable_jack = yes ; then
+ as_fn_error $? "Missing dependency for JACK output" "$LINENO" 5
+ else
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: JACK output disabled due to missing dependency" >&5
+printf "%s\n" "$as_me: WARNING: JACK output disabled due to missing dependency" >&2;}
+ fi
 fi
+
+
+test_oss4 () {
+ OSS_CFLAGS=
+ if test -f "/etc/oss.conf"; then
+ . "/etc/oss.conf"
+ OSS_CFLAGS="-I$OSSLIBDIR/include"
+ fi
+
+
+ OLD_CPPFLAGS="$CPPFLAGS"
+ CPPFLAGS="$CPPFLAGS $OSS_CFLAGS"
+ have_oss4=no
+ for ac_header in sys/soundcard.h
+do :
+ ac_fn_c_check_header_compile "$LINENO" "sys/soundcard.h" "ac_cv_header_sys_soundcard_h" "$ac_includes_default"
+if test "x$ac_cv_header_sys_soundcard_h" = xyes
+then :
+ printf "%s\n" "#define HAVE_SYS_SOUNDCARD_H 1" >>confdefs.h
+
+ have_oss4=yes
+ break
+
 fi
 
-# Check whether --enable-sid was given.
-if test "${enable_sid+set}" = set; then :
- enableval=$enable_sid; enable_sid=$enableval
-else
- enable_sid=auto
+done
+ CPPFLAGS="$OLD_CPPFLAGS"
+}
+
+
+ # Check whether --enable-oss4 was given.
+if test ${enable_oss4+y}
+then :
+ enableval=$enable_oss4; enable_oss4=$enableval
+else case e in #(
+ e) enable_oss4=auto ;;
+esac
 fi
 
 
-have_sidplay=no
-if test "x$enable_sid" != "xno"; then
+ have_oss4=no
+ check_allowed oss4 $enable_oss4
+ if test $enable_oss4 != no -a $plugin_allowed = yes ; then
+ test_oss4
+ if test $have_oss4 = yes ; then
+ OUTPUT_PLUGINS="$OUTPUT_PLUGINS oss4"
+ elif test $enable_oss4 = yes ; then
+ as_fn_error $? "Missing dependency for OSS output" "$LINENO" 5
+ else
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: OSS output disabled due to missing dependency" >&5
+printf "%s\n" "$as_me: WARNING: OSS output disabled due to missing dependency" >&2;}
+ fi
+ fi
+
+
+
+ # Check whether --enable-pipewire was given.
+if test ${enable_pipewire+y}
+then :
+ enableval=$enable_pipewire; enable_pipewire=$enableval
+else case e in #(
+ e) enable_pipewire=auto ;;
+esac
+fi
+
+
+ have_pipewire=no
+ check_allowed pipewire $enable_pipewire
+ if test $enable_pipewire != no -a $plugin_allowed = yes ; then
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SIDPLAYFP" >&5
-$as_echo_n "checking for SIDPLAYFP... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libpipewire-0.3 >= 0.3.26 libspa-0.2 >= 0.2" >&5
+printf %s "checking for libpipewire-0.3 >= 0.3.26 libspa-0.2 >= 0.2... " >&6; }
 
-if test -n "$SIDPLAYFP_CFLAGS"; then
- pkg_cv_SIDPLAYFP_CFLAGS="$SIDPLAYFP_CFLAGS"
+if test -n "$PIPEWIRE_CFLAGS"; then
+ pkg_cv_PIPEWIRE_CFLAGS="$PIPEWIRE_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
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpipewire-0.3 >= 0.3.26 libspa-0.2 >= 0.2\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libpipewire-0.3 >= 0.3.26 libspa-0.2 >= 0.2") 2>&5
 ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ printf "%s\n" "$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`
+ pkg_cv_PIPEWIRE_CFLAGS=`$PKG_CONFIG --cflags "libpipewire-0.3 >= 0.3.26 libspa-0.2 >= 0.2" 2>/dev/null`
 		 test "x$?" != "x0" && pkg_failed=yes
 else
 pkg_failed=yes
@@ -11734,16 +14746,16 @@
 else
 pkg_failed=untried
 fi
-if test -n "$SIDPLAYFP_LIBS"; then
- pkg_cv_SIDPLAYFP_LIBS="$SIDPLAYFP_LIBS"
+if test -n "$PIPEWIRE_LIBS"; then
+ pkg_cv_PIPEWIRE_LIBS="$PIPEWIRE_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
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpipewire-0.3 >= 0.3.26 libspa-0.2 >= 0.2\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libpipewire-0.3 >= 0.3.26 libspa-0.2 >= 0.2") 2>&5
 ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ printf "%s\n" "$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`
+ pkg_cv_PIPEWIRE_LIBS=`$PKG_CONFIG --libs "libpipewire-0.3 >= 0.3.26 libspa-0.2 >= 0.2" 2>/dev/null`
 		 test "x$?" != "x0" && pkg_failed=yes
 else
 pkg_failed=yes
@@ -11755,8 +14767,8 @@
 
 
 if test $pkg_failed = yes; then
- 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
 _pkg_short_errors_supported=yes
@@ -11764,109 +14776,74 @@
 _pkg_short_errors_supported=no
 fi
 if test $_pkg_short_errors_supported = yes; then
-	 SIDPLAYFP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libsidplayfp >= 1.0" 2>&1`
+ PIPEWIRE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libpipewire-0.3 >= 0.3.26 libspa-0.2 >= 0.2" 2>&1`
 else
-	 SIDPLAYFP_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libsidplayfp >= 1.0" 2>&1`
+ PIPEWIRE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libpipewire-0.3 >= 0.3.26 libspa-0.2 >= 0.2" 2>&1`
 fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$SIDPLAYFP_PKG_ERRORS" >&5
+ # Put the nasty error message in config.log where it belongs
+ echo "$PIPEWIRE_PKG_ERRORS" >&5
 
-	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
 
-elif test $pkg_failed = untried; then
- 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-	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
+ if test $enable_pipewire = yes ; then
+ as_fn_error $? "Missing dependency for PipeWire output: libpipewire-0.3 >= 0.3.26 libspa-0.2 >= 0.2" "$LINENO" 5
+ else
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: PipeWire output disabled due to missing dependency: libpipewire-0.3 >= 0.3.26 libspa-0.2 >= 0.2" >&5
+printf "%s\n" "$as_me: WARNING: PipeWire output disabled due to missing dependency: libpipewire-0.3 >= 0.3.26 libspa-0.2 >= 0.2" >&2;}
+ fi
 
-else
-	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; }
-	have_sidplay=yes
- INPUT_PLUGINS="$INPUT_PLUGINS sid"
-fi
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: *** SID plugin disabled per user request ***" >&5
-$as_echo "*** SID plugin disabled per user request ***" >&6; }
-fi
+elif test $pkg_failed = untried; then
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
+ if test $enable_pipewire = yes ; then
+ as_fn_error $? "Missing dependency for PipeWire output: libpipewire-0.3 >= 0.3.26 libspa-0.2 >= 0.2" "$LINENO" 5
+ else
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: PipeWire output disabled due to missing dependency: libpipewire-0.3 >= 0.3.26 libspa-0.2 >= 0.2" >&5
+printf "%s\n" "$as_me: WARNING: PipeWire output disabled due to missing dependency: libpipewire-0.3 >= 0.3.26 libspa-0.2 >= 0.2" >&2;}
+ fi
 
-# Check whether --enable-oss4 was given.
-if test "${enable_oss4+set}" = set; then :
- enableval=$enable_oss4; enable_oss4=$enableval
 else
- enable_oss4=auto
-fi
+ PIPEWIRE_CFLAGS=$pkg_cv_PIPEWIRE_CFLAGS
+ PIPEWIRE_LIBS=$pkg_cv_PIPEWIRE_LIBS
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
+ have_pipewire=yes
+ OUTPUT_PLUGINS="$OUTPUT_PLUGINS pipewire"
 
-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"
- fi
-
- OLD_CPPFLAGS="$CPPFLAGS"
- CPPFLAGS="$CPPFLAGS $OSS_CFLAGS"
- for ac_header in sys/soundcard.h soundcard.h
-do :
- as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
- cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
- have_oss4=yes
 fi
-
-done
-
- CPPFLAGS="$OLD_CPPFLAGS"
-
- if test "x$have_oss4" = "xyes" ; then
- OUTPUT_PLUGINS="$OUTPUT_PLUGINS oss4"
-
- elif test "x$enable_oss4" = "xyes" ; then
- as_fn_error $? "OSS4 output was enabled but soundcard.h was not found" "$LINENO" 5
 fi
 
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_oss4" >&5
-$as_echo "$have_oss4" >&6; }
-fi
-
 
-# Check whether --enable-alsa was given.
-if test "${enable_alsa+set}" = set; then :
- enableval=$enable_alsa; enable_alsa=$enableval
-else
- enable_alsa=auto
 
+ # Check whether --enable-pulse was given.
+if test ${enable_pulse+y}
+then :
+ enableval=$enable_pulse; enable_pulse=$enableval
+else case e in #(
+ e) enable_pulse=auto ;;
+esac
 fi
 
 
-have_alsa=no
-if test "x$enable_alsa" != "xno"; then
+ have_pulse=no
+ check_allowed pulse $enable_pulse
+ if test $enable_pulse != no -a $plugin_allowed = yes ; then
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ALSA" >&5
-$as_echo_n "checking for ALSA... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libpulse >= 0.9.11" >&5
+printf %s "checking for libpulse >= 0.9.11... " >&6; }
 
-if test -n "$ALSA_CFLAGS"; then
- pkg_cv_ALSA_CFLAGS="$ALSA_CFLAGS"
+if test -n "$PULSE_CFLAGS"; then
+ pkg_cv_PULSE_CFLAGS="$PULSE_CFLAGS"
 elif test -n "$PKG_CONFIG"; then
 if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"alsa >= 1.0.16\""; } >&5
- ($PKG_CONFIG --exists --print-errors "alsa >= 1.0.16") 2>&5
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpulse >= 0.9.11\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libpulse >= 0.9.11") 2>&5
 ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
- pkg_cv_ALSA_CFLAGS=`$PKG_CONFIG --cflags "alsa >= 1.0.16" 2>/dev/null`
+ pkg_cv_PULSE_CFLAGS=`$PKG_CONFIG --cflags "libpulse >= 0.9.11" 2>/dev/null`
 		 test "x$?" != "x0" && pkg_failed=yes
 else
 pkg_failed=yes
@@ -11874,16 +14851,16 @@
 else
 pkg_failed=untried
 fi
-if test -n "$ALSA_LIBS"; then
- pkg_cv_ALSA_LIBS="$ALSA_LIBS"
+if test -n "$PULSE_LIBS"; then
+ pkg_cv_PULSE_LIBS="$PULSE_LIBS"
 elif test -n "$PKG_CONFIG"; then
 if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"alsa >= 1.0.16\""; } >&5
- ($PKG_CONFIG --exists --print-errors "alsa >= 1.0.16") 2>&5
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libpulse >= 0.9.11\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libpulse >= 0.9.11") 2>&5
 ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
- pkg_cv_ALSA_LIBS=`$PKG_CONFIG --libs "alsa >= 1.0.16" 2>/dev/null`
+ pkg_cv_PULSE_LIBS=`$PKG_CONFIG --libs "libpulse >= 0.9.11" 2>/dev/null`
 		 test "x$?" != "x0" && pkg_failed=yes
 else
 pkg_failed=yes
@@ -11895,8 +14872,8 @@
 
 
 if test $pkg_failed = yes; then
- 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
 _pkg_short_errors_supported=yes
@@ -11904,81 +14881,61 @@
 _pkg_short_errors_supported=no
 fi
 if test $_pkg_short_errors_supported = yes; then
-	 ALSA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "alsa >= 1.0.16" 2>&1`
+ PULSE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libpulse >= 0.9.11" 2>&1`
 else
-	 ALSA_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "alsa >= 1.0.16" 2>&1`
+ PULSE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libpulse >= 0.9.11" 2>&1`
 fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$ALSA_PKG_ERRORS" >&5
-
-	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; }
-	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; }
-fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$PULSE_PKG_ERRORS" >&5
 
 
-# Check whether --enable-sdlout was given.
-if test "${enable_sdlout+set}" = set; then :
- enableval=$enable_sdlout; enable_sdlout=$enableval
-else
- enable_sdlout=auto
-fi
+ if test $enable_pulse = yes ; then
+ as_fn_error $? "Missing dependency for PulseAudio output: libpulse >= 0.9.11" "$LINENO" 5
+ else
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: PulseAudio output disabled due to missing dependency: libpulse >= 0.9.11" >&5
+printf "%s\n" "$as_me: WARNING: PulseAudio output disabled due to missing dependency: libpulse >= 0.9.11" >&2;}
+ fi
 
+elif test $pkg_failed = untried; then
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
-if test "x$enable_sdlout" != "xno"; then
+ if test $enable_pulse = yes ; then
+ as_fn_error $? "Missing dependency for PulseAudio output: libpulse >= 0.9.11" "$LINENO" 5
+ else
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: PulseAudio output disabled due to missing dependency: libpulse >= 0.9.11" >&5
+printf "%s\n" "$as_me: WARNING: PulseAudio output disabled due to missing dependency: libpulse >= 0.9.11" >&2;}
+ fi
 
-# Check whether --with-libsdl was given.
-if test "${with_libsdl+set}" = set; then :
- withval=$with_libsdl; case "x$withval" in
- x1) ;;
- x2) ;;
- x*) withval=check;;
- esac
- with_libsdl=$withval
 else
- with_libsdl=check
-fi
+ PULSE_CFLAGS=$pkg_cv_PULSE_CFLAGS
+ PULSE_LIBS=$pkg_cv_PULSE_LIBS
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+
+ have_pulse=yes
+ OUTPUT_PLUGINS="$OUTPUT_PLUGINS pulse"
 
 fi
+ fi
 
-libsdl1_min="1.2.11";
-libsdl2_min="2.0";
 
-have_sdlout=no
-if test "x$enable_sdlout" != "xno"; then
- if test "x$with_libsdl" = "xcheck"; then
+test_sndio () {
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SDL" >&5
-$as_echo_n "checking for SDL... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sndio >= 1.9" >&5
+printf %s "checking for sndio >= 1.9... " >&6; }
 
-if test -n "$SDL_CFLAGS"; then
- pkg_cv_SDL_CFLAGS="$SDL_CFLAGS"
+if test -n "$SNDIO_CFLAGS"; then
+ pkg_cv_SNDIO_CFLAGS="$SNDIO_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 >= \$libsdl2_min\""; } >&5
- ($PKG_CONFIG --exists --print-errors "sdl2 >= $libsdl2_min") 2>&5
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"sndio >= 1.9\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "sndio >= 1.9") 2>&5
 ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
- pkg_cv_SDL_CFLAGS=`$PKG_CONFIG --cflags "sdl2 >= $libsdl2_min" 2>/dev/null`
+ pkg_cv_SNDIO_CFLAGS=`$PKG_CONFIG --cflags "sndio >= 1.9" 2>/dev/null`
 		 test "x$?" != "x0" && pkg_failed=yes
 else
 pkg_failed=yes
@@ -11986,16 +14943,16 @@
 else
 pkg_failed=untried
 fi
-if test -n "$SDL_LIBS"; then
- pkg_cv_SDL_LIBS="$SDL_LIBS"
+if test -n "$SNDIO_LIBS"; then
+ pkg_cv_SNDIO_LIBS="$SNDIO_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 >= \$libsdl2_min\""; } >&5
- ($PKG_CONFIG --exists --print-errors "sdl2 >= $libsdl2_min") 2>&5
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"sndio >= 1.9\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "sndio >= 1.9") 2>&5
 ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
- pkg_cv_SDL_LIBS=`$PKG_CONFIG --libs "sdl2 >= $libsdl2_min" 2>/dev/null`
+ pkg_cv_SNDIO_LIBS=`$PKG_CONFIG --libs "sndio >= 1.9" 2>/dev/null`
 		 test "x$?" != "x0" && pkg_failed=yes
 else
 pkg_failed=yes
@@ -12007,8 +14964,8 @@
 
 
 if test $pkg_failed = yes; then
- 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
 _pkg_short_errors_supported=yes
@@ -12016,28 +14973,29 @@
 _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 >= $libsdl2_min" 2>&1`
+ SNDIO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "sndio >= 1.9" 2>&1`
 else
-	 SDL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "sdl2 >= $libsdl2_min" 2>&1`
+ SNDIO_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "sndio >= 1.9" 2>&1`
 fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$SDL_PKG_ERRORS" >&5
+ # Put the nasty error message in config.log where it belongs
+ echo "$SNDIO_PKG_ERRORS" >&5
+
 
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SDL" >&5
-$as_echo_n "checking for SDL... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sndio" >&5
+printf %s "checking for sndio... " >&6; }
 
-if test -n "$SDL_CFLAGS"; then
- pkg_cv_SDL_CFLAGS="$SDL_CFLAGS"
+if test -n "$SNDIO_CFLAGS"; then
+ pkg_cv_SNDIO_CFLAGS="$SNDIO_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 >= \$libsdl1_min\""; } >&5
- ($PKG_CONFIG --exists --print-errors "sdl >= $libsdl1_min") 2>&5
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"sndio\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "sndio") 2>&5
 ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
- pkg_cv_SDL_CFLAGS=`$PKG_CONFIG --cflags "sdl >= $libsdl1_min" 2>/dev/null`
+ pkg_cv_SNDIO_CFLAGS=`$PKG_CONFIG --cflags "sndio" 2>/dev/null`
 		 test "x$?" != "x0" && pkg_failed=yes
 else
 pkg_failed=yes
@@ -12045,16 +15003,16 @@
 else
 pkg_failed=untried
 fi
-if test -n "$SDL_LIBS"; then
- pkg_cv_SDL_LIBS="$SDL_LIBS"
+if test -n "$SNDIO_LIBS"; then
+ pkg_cv_SNDIO_LIBS="$SNDIO_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 >= \$libsdl1_min\""; } >&5
- ($PKG_CONFIG --exists --print-errors "sdl >= $libsdl1_min") 2>&5
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"sndio\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "sndio") 2>&5
 ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
- pkg_cv_SDL_LIBS=`$PKG_CONFIG --libs "sdl >= $libsdl1_min" 2>/dev/null`
+ pkg_cv_SNDIO_LIBS=`$PKG_CONFIG --libs "sndio" 2>/dev/null`
 		 test "x$?" != "x0" && pkg_failed=yes
 else
 pkg_failed=yes
@@ -12066,8 +15024,8 @@
 
 
 if test $pkg_failed = yes; then
- 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
 _pkg_short_errors_supported=yes
@@ -12075,48 +15033,45 @@
 _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 >= $libsdl1_min" 2>&1`
+ SNDIO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "sndio" 2>&1`
 else
-	 SDL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "sdl >= $libsdl1_min" 2>&1`
+ SNDIO_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "sndio" 2>&1`
 fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$SDL_PKG_ERRORS" >&5
+ # Put the nasty error message in config.log where it belongs
+ echo "$SNDIO_PKG_ERRORS" >&5
 
-	if test "x$enable_sdlout" = "xyes"; then
- as_fn_error $? "Cannot find SDL development files (ver >= $libsdl1_min), but compilation of SDL output plugin has been explicitly requested; please install SDL dev files and run configure again" "$LINENO" 5
- fi
+ have_sndio=no
 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 >= $libsdl1_min), 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"
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+ have_sndio=no
+else
+ SNDIO_CFLAGS=$pkg_cv_SNDIO_CFLAGS
+ SNDIO_LIBS=$pkg_cv_SNDIO_LIBS
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+ have_sndio=yes
 fi
+
 elif test $pkg_failed = untried; then
- 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SDL" >&5
-$as_echo_n "checking for SDL... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sndio" >&5
+printf %s "checking for sndio... " >&6; }
 
-if test -n "$SDL_CFLAGS"; then
- pkg_cv_SDL_CFLAGS="$SDL_CFLAGS"
+if test -n "$SNDIO_CFLAGS"; then
+ pkg_cv_SNDIO_CFLAGS="$SNDIO_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 >= \$libsdl1_min\""; } >&5
- ($PKG_CONFIG --exists --print-errors "sdl >= $libsdl1_min") 2>&5
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"sndio\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "sndio") 2>&5
 ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
- pkg_cv_SDL_CFLAGS=`$PKG_CONFIG --cflags "sdl >= $libsdl1_min" 2>/dev/null`
+ pkg_cv_SNDIO_CFLAGS=`$PKG_CONFIG --cflags "sndio" 2>/dev/null`
 		 test "x$?" != "x0" && pkg_failed=yes
 else
 pkg_failed=yes
@@ -12124,16 +15079,16 @@
 else
 pkg_failed=untried
 fi
-if test -n "$SDL_LIBS"; then
- pkg_cv_SDL_LIBS="$SDL_LIBS"
+if test -n "$SNDIO_LIBS"; then
+ pkg_cv_SNDIO_LIBS="$SNDIO_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 >= \$libsdl1_min\""; } >&5
- ($PKG_CONFIG --exists --print-errors "sdl >= $libsdl1_min") 2>&5
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"sndio\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "sndio") 2>&5
 ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
- pkg_cv_SDL_LIBS=`$PKG_CONFIG --libs "sdl >= $libsdl1_min" 2>/dev/null`
+ pkg_cv_SNDIO_LIBS=`$PKG_CONFIG --libs "sndio" 2>/dev/null`
 		 test "x$?" != "x0" && pkg_failed=yes
 else
 pkg_failed=yes
@@ -12145,8 +15100,8 @@
 
 
 if test $pkg_failed = yes; then
- 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
 _pkg_short_errors_supported=yes
@@ -12154,54 +15109,82 @@
 _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 >= $libsdl1_min" 2>&1`
+ SNDIO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "sndio" 2>&1`
 else
-	 SDL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "sdl >= $libsdl1_min" 2>&1`
+ SNDIO_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "sndio" 2>&1`
 fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$SDL_PKG_ERRORS" >&5
+ # Put the nasty error message in config.log where it belongs
+ echo "$SNDIO_PKG_ERRORS" >&5
 
-	if test "x$enable_sdlout" = "xyes"; then
- as_fn_error $? "Cannot find SDL development files (ver >= $libsdl1_min), but compilation of SDL output plugin has been explicitly requested; please install SDL dev files and run configure again" "$LINENO" 5
- fi
+ have_sndio=no
 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 >= $libsdl1_min), but compilation of SDL output plugin has been explicitly requested; please install SDL dev files and run configure again" "$LINENO" 5
- fi
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+ have_sndio=no
 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"
+ SNDIO_CFLAGS=$pkg_cv_SNDIO_CFLAGS
+ SNDIO_LIBS=$pkg_cv_SNDIO_LIBS
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+ have_sndio=yes
 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"
+ SNDIO_CFLAGS=$pkg_cv_SNDIO_CFLAGS
+ SNDIO_LIBS=$pkg_cv_SNDIO_LIBS
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+
+
+printf "%s\n" "#define HAVE_SNDIO_1_9 1" >>confdefs.h
+
+ have_sndio=yes
+
 fi
- elif test "x$with_libsdl" = "x1"; then
+}
+
+
+ # Check whether --enable-sndio was given.
+if test ${enable_sndio+y}
+then :
+ enableval=$enable_sndio; enable_sndio=$enableval
+else case e in #(
+ e) enable_sndio=auto ;;
+esac
+fi
+
+
+ have_sndio=no
+ check_allowed sndio $enable_sndio
+ if test $enable_sndio != no -a $plugin_allowed = yes ; then
+ test_sndio
+ if test $have_sndio = yes ; then
+ OUTPUT_PLUGINS="$OUTPUT_PLUGINS sndio"
+ elif test $enable_sndio = yes ; then
+ as_fn_error $? "Missing dependency for Sndio output" "$LINENO" 5
+ else
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Sndio output disabled due to missing dependency" >&5
+printf "%s\n" "$as_me: WARNING: Sndio output disabled due to missing dependency" >&2;}
+ fi
+ fi
+
+
+test_cue () {
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SDL" >&5
-$as_echo_n "checking for SDL... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libcue >= 2.0" >&5
+printf %s "checking for libcue >= 2.0... " >&6; }
 
-if test -n "$SDL_CFLAGS"; then
- pkg_cv_SDL_CFLAGS="$SDL_CFLAGS"
+if test -n "$CUE_CFLAGS"; then
+ pkg_cv_CUE_CFLAGS="$CUE_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 >= \$libsdl1_min\""; } >&5
- ($PKG_CONFIG --exists --print-errors "sdl >= $libsdl1_min") 2>&5
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcue >= 2.0\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libcue >= 2.0") 2>&5
 ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
- pkg_cv_SDL_CFLAGS=`$PKG_CONFIG --cflags "sdl >= $libsdl1_min" 2>/dev/null`
+ pkg_cv_CUE_CFLAGS=`$PKG_CONFIG --cflags "libcue >= 2.0" 2>/dev/null`
 		 test "x$?" != "x0" && pkg_failed=yes
 else
 pkg_failed=yes
@@ -12209,16 +15192,16 @@
 else
 pkg_failed=untried
 fi
-if test -n "$SDL_LIBS"; then
- pkg_cv_SDL_LIBS="$SDL_LIBS"
+if test -n "$CUE_LIBS"; then
+ pkg_cv_CUE_LIBS="$CUE_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 >= \$libsdl1_min\""; } >&5
- ($PKG_CONFIG --exists --print-errors "sdl >= $libsdl1_min") 2>&5
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcue >= 2.0\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libcue >= 2.0") 2>&5
 ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
- pkg_cv_SDL_LIBS=`$PKG_CONFIG --libs "sdl >= $libsdl1_min" 2>/dev/null`
+ pkg_cv_CUE_LIBS=`$PKG_CONFIG --libs "libcue >= 2.0" 2>/dev/null`
 		 test "x$?" != "x0" && pkg_failed=yes
 else
 pkg_failed=yes
@@ -12230,8 +15213,8 @@
 
 
 if test $pkg_failed = yes; then
- 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
 _pkg_short_errors_supported=yes
@@ -12239,46 +15222,29 @@
 _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 >= $libsdl1_min" 2>&1`
+ CUE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libcue >= 2.0" 2>&1`
 else
-	 SDL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "sdl >= $libsdl1_min" 2>&1`
+ CUE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libcue >= 2.0" 2>&1`
 fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$SDL_PKG_ERRORS" >&5
+ # Put the nasty error message in config.log where it belongs
+ echo "$CUE_PKG_ERRORS" >&5
+
 
-	if test "x$enable_sdlout" = "xyes"; then
- as_fn_error $? "Cannot find SDL1 development files (ver >= $libsdl1_min), but compilation of SDL output plugin has been explicitly requested; please install SDL1 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 SDL1 development files (ver >= $libsdl1_min), but compilation of SDL output plugin has been explicitly requested; please install SDL1 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
- elif test "x$with_libsdl" = "x2"; then
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SDL" >&5
-$as_echo_n "checking for SDL... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libcue" >&5
+printf %s "checking for libcue... " >&6; }
 
-if test -n "$SDL_CFLAGS"; then
- pkg_cv_SDL_CFLAGS="$SDL_CFLAGS"
+if test -n "$CUE_CFLAGS"; then
+ pkg_cv_CUE_CFLAGS="$CUE_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 >= \$libsdl2_min\""; } >&5
- ($PKG_CONFIG --exists --print-errors "sdl2 >= $libsdl2_min") 2>&5
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcue\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libcue") 2>&5
 ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
- pkg_cv_SDL_CFLAGS=`$PKG_CONFIG --cflags "sdl2 >= $libsdl2_min" 2>/dev/null`
+ pkg_cv_CUE_CFLAGS=`$PKG_CONFIG --cflags "libcue" 2>/dev/null`
 		 test "x$?" != "x0" && pkg_failed=yes
 else
 pkg_failed=yes
@@ -12286,16 +15252,16 @@
 else
 pkg_failed=untried
 fi
-if test -n "$SDL_LIBS"; then
- pkg_cv_SDL_LIBS="$SDL_LIBS"
+if test -n "$CUE_LIBS"; then
+ pkg_cv_CUE_LIBS="$CUE_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 >= \$libsdl2_min\""; } >&5
- ($PKG_CONFIG --exists --print-errors "sdl2 >= $libsdl2_min") 2>&5
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcue\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libcue") 2>&5
 ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
- pkg_cv_SDL_LIBS=`$PKG_CONFIG --libs "sdl2 >= $libsdl2_min" 2>/dev/null`
+ pkg_cv_CUE_LIBS=`$PKG_CONFIG --libs "libcue" 2>/dev/null`
 		 test "x$?" != "x0" && pkg_failed=yes
 else
 pkg_failed=yes
@@ -12307,8 +15273,8 @@
 
 
 if test $pkg_failed = yes; then
- 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
 _pkg_short_errors_supported=yes
@@ -12316,132 +15282,171 @@
 _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 >= $libsdl2_min" 2>&1`
+ CUE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libcue" 2>&1`
 else
-	 SDL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "sdl2 >= $libsdl2_min" 2>&1`
+ CUE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libcue" 2>&1`
 fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$SDL_PKG_ERRORS" >&5
+ # Put the nasty error message in config.log where it belongs
+ echo "$CUE_PKG_ERRORS" >&5
 
-	if test "x$enable_sdlout" = "xyes"; then
- as_fn_error $? "Cannot find SDL2 development files (ver >= $libsdl2_min), but compilation of SDL output plugin has been explicitly requested; please install SDL2 dev files and run configure again" "$LINENO" 5
- fi
+ have_cue=no
 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 SDL2 development files (ver >= $libsdl2_min), but compilation of SDL output plugin has been explicitly requested; please install SDL2 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
- fi
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+ have_cue=no
+else
+ CUE_CFLAGS=$pkg_cv_CUE_CFLAGS
+ CUE_LIBS=$pkg_cv_CUE_LIBS
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+ have_cue=yes
 fi
 
+elif test $pkg_failed = untried; then
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
-# Check whether --enable-sndio was given.
-if test "${enable_sndio+set}" = set; then :
- enableval=$enable_sndio; enable_sndio=$enableval
-else
- enable_sndio=auto
-
-fi
 
+pkg_failed=no
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libcue" >&5
+printf %s "checking for libcue... " >&6; }
 
-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 :
- { $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
+if test -n "$CUE_CFLAGS"; then
+ pkg_cv_CUE_CFLAGS="$CUE_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcue\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libcue") 2>&5
+ ac_status=$?
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_CUE_CFLAGS=`$PKG_CONFIG --cflags "libcue" 2>/dev/null`
+		 test "x$?" != "x0" && pkg_failed=yes
 else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lsndio $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 sio_open ();
-int
-main ()
-{
-return sio_open ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_sndio_sio_open=yes
+ pkg_failed=yes
+fi
+ else
+ pkg_failed=untried
+fi
+if test -n "$CUE_LIBS"; then
+ pkg_cv_CUE_LIBS="$CUE_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcue\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libcue") 2>&5
+ ac_status=$?
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+ pkg_cv_CUE_LIBS=`$PKG_CONFIG --libs "libcue" 2>/dev/null`
+		 test "x$?" != "x0" && pkg_failed=yes
 else
- ac_cv_lib_sndio_sio_open=no
+ pkg_failed=yes
 fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
+ else
+ pkg_failed=untried
 fi
-{ $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 :
- have_sndio=yes
- OUTPUT_PLUGINS="$OUTPUT_PLUGINS sndio-ng"
- SNDIO_LIBS="-lsndio"
 
 
-fi
 
+if test $pkg_failed = yes; then
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "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
+ CUE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libcue" 2>&1`
+ else
+ CUE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libcue" 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$CUE_PKG_ERRORS" >&5
 
+ have_cue=no
+elif test $pkg_failed = untried; then
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+ have_cue=no
+else
+ CUE_CFLAGS=$pkg_cv_CUE_CFLAGS
+ CUE_LIBS=$pkg_cv_CUE_LIBS
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+ have_cue=yes
 fi
 
+else
+ CUE_CFLAGS=$pkg_cv_CUE_CFLAGS
+ CUE_LIBS=$pkg_cv_CUE_LIBS
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
 
- 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
+printf "%s\n" "#define HAVE_LIBCUE2 1" >>confdefs.h
+
+ have_cue=yes
+
 fi
+}
 
 
-if test "x$OUTPUT_PLUGINS" = "x" ; then
- as_fn_error $? "No output plugin was enabled. Please install the necessary packages for your system and run configure again." "$LINENO" 5
+ # Check whether --enable-cue was given.
+if test ${enable_cue+y}
+then :
+ enableval=$enable_cue; enable_cue=$enableval
+else case e in #(
+ e) enable_cue=auto ;;
+esac
 fi
 
 
-# Check whether --enable-amidiplug was given.
-if test "${enable_amidiplug+set}" = set; then :
- enableval=$enable_amidiplug; enable_amidiplug=$enableval
-else
- enable_amidiplug=auto
+ have_cue=no
+ check_allowed cue $enable_cue
+ if test $enable_cue != no -a $plugin_allowed = yes ; then
+ test_cue
+ if test $have_cue = yes ; then
+ CONTAINER_PLUGINS="$CONTAINER_PLUGINS cue"
+ elif test $enable_cue = yes ; then
+ as_fn_error $? "Missing dependency for cue sheet support" "$LINENO" 5
+ else
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cue sheet support disabled due to missing dependency" >&5
+printf "%s\n" "$as_me: WARNING: cue sheet support disabled due to missing dependency" >&2;}
+ fi
+ fi
+
+
+
+ # Check whether --enable-neon was given.
+if test ${enable_neon+y}
+then :
+ enableval=$enable_neon; enable_neon=$enableval
+else case e in #(
+ e) enable_neon=yes ;;
+esac
 fi
 
 
-have_amidiplug=no
-if test "x$enable_amidiplug" != "xno"; then
+ have_neon=no
+ check_allowed neon $enable_neon
+ if test $enable_neon != no -a $plugin_allowed = yes ; then
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for FLUIDSYNTH" >&5
-$as_echo_n "checking for FLUIDSYNTH... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for neon >= 0.27" >&5
+printf %s "checking for neon >= 0.27... " >&6; }
 
-if test -n "$FLUIDSYNTH_CFLAGS"; then
- pkg_cv_FLUIDSYNTH_CFLAGS="$FLUIDSYNTH_CFLAGS"
+if test -n "$NEON_CFLAGS"; then
+ pkg_cv_NEON_CFLAGS="$NEON_CFLAGS"
 elif test -n "$PKG_CONFIG"; then
 if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"fluidsynth >= 1.0.6\""; } >&5
- ($PKG_CONFIG --exists --print-errors "fluidsynth >= 1.0.6") 2>&5
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"neon >= 0.27\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "neon >= 0.27") 2>&5
 ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
- pkg_cv_FLUIDSYNTH_CFLAGS=`$PKG_CONFIG --cflags "fluidsynth >= 1.0.6" 2>/dev/null`
+ pkg_cv_NEON_CFLAGS=`$PKG_CONFIG --cflags "neon >= 0.27" 2>/dev/null`
 		 test "x$?" != "x0" && pkg_failed=yes
 else
 pkg_failed=yes
@@ -12449,16 +15454,16 @@
 else
 pkg_failed=untried
 fi
-if test -n "$FLUIDSYNTH_LIBS"; then
- pkg_cv_FLUIDSYNTH_LIBS="$FLUIDSYNTH_LIBS"
+if test -n "$NEON_LIBS"; then
+ pkg_cv_NEON_LIBS="$NEON_LIBS"
 elif test -n "$PKG_CONFIG"; then
 if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"fluidsynth >= 1.0.6\""; } >&5
- ($PKG_CONFIG --exists --print-errors "fluidsynth >= 1.0.6") 2>&5
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"neon >= 0.27\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "neon >= 0.27") 2>&5
 ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
- pkg_cv_FLUIDSYNTH_LIBS=`$PKG_CONFIG --libs "fluidsynth >= 1.0.6" 2>/dev/null`
+ pkg_cv_NEON_LIBS=`$PKG_CONFIG --libs "neon >= 0.27" 2>/dev/null`
 		 test "x$?" != "x0" && pkg_failed=yes
 else
 pkg_failed=yes
@@ -12470,8 +15475,8 @@
 
 
 if test $pkg_failed = yes; then
- 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
 _pkg_short_errors_supported=yes
@@ -12479,59 +15484,74 @@
 _pkg_short_errors_supported=no
 fi
 if test $_pkg_short_errors_supported = yes; then
-	 FLUIDSYNTH_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "fluidsynth >= 1.0.6" 2>&1`
+ NEON_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "neon >= 0.27" 2>&1`
 else
-	 FLUIDSYNTH_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "fluidsynth >= 1.0.6" 2>&1`
+ NEON_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "neon >= 0.27" 2>&1`
 fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$FLUIDSYNTH_PKG_ERRORS" >&5
+ # Put the nasty error message in config.log where it belongs
+ echo "$NEON_PKG_ERRORS" >&5
+
+
+ if test $enable_neon = yes ; then
+ as_fn_error $? "Missing dependency for HTTP/HTTPS transport: neon >= 0.27" "$LINENO" 5
+ else
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: HTTP/HTTPS transport disabled due to missing dependency: neon >= 0.27" >&5
+printf "%s\n" "$as_me: WARNING: HTTP/HTTPS transport disabled due to missing dependency: neon >= 0.27" >&2;}
+ fi
 
-	if test "x$enable_amidiplug" = "xyes"; then
- as_fn_error $? "Cannot find FluidSynth development files (ver >= 1.0.6), but compilation of amidi-plug input plugin has been explicitly requested; please install FluidSynth 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_amidiplug" = "xyes"; then
- as_fn_error $? "Cannot find FluidSynth development files (ver >= 1.0.6), but compilation of amidi-plug input plugin has been explicitly requested; please install FluidSynth dev files and run configure again" "$LINENO" 5
- fi
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+
+ if test $enable_neon = yes ; then
+ as_fn_error $? "Missing dependency for HTTP/HTTPS transport: neon >= 0.27" "$LINENO" 5
+ else
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: HTTP/HTTPS transport disabled due to missing dependency: neon >= 0.27" >&5
+printf "%s\n" "$as_me: WARNING: HTTP/HTTPS transport disabled due to missing dependency: neon >= 0.27" >&2;}
+ fi
+
 else
-	FLUIDSYNTH_CFLAGS=$pkg_cv_FLUIDSYNTH_CFLAGS
-	FLUIDSYNTH_LIBS=$pkg_cv_FLUIDSYNTH_LIBS
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-	have_amidiplug=yes
- INPUT_PLUGINS="$INPUT_PLUGINS amidi-plug"
-fi
+ NEON_CFLAGS=$pkg_cv_NEON_CFLAGS
+ NEON_LIBS=$pkg_cv_NEON_LIBS
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+
+ have_neon=yes
+ TRANSPORT_PLUGINS="$TRANSPORT_PLUGINS neon"
+
 fi
+ fi
 
 
-# Check whether --enable-cdaudio was given.
-if test "${enable_cdaudio+set}" = set; then :
- enableval=$enable_cdaudio; enable_cdaudio_ng=$enableval
-else
- enable_cdaudio_ng=auto
 
+ # Check whether --enable-mms was given.
+if test ${enable_mms+y}
+then :
+ enableval=$enable_mms; enable_mms=$enableval
+else case e in #(
+ e) enable_mms=auto ;;
+esac
 fi
 
 
-have_cdaudio_ng=no
-if test "x$enable_cdaudio_ng" != "xno"; then
+ have_mms=no
+ check_allowed mms $enable_mms
+ if test $enable_mms != no -a $plugin_allowed = yes ; then
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CDIO" >&5
-$as_echo_n "checking for CDIO... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libmms >= 0.3" >&5
+printf %s "checking for libmms >= 0.3... " >&6; }
 
-if test -n "$CDIO_CFLAGS"; then
- pkg_cv_CDIO_CFLAGS="$CDIO_CFLAGS"
+if test -n "$MMS_CFLAGS"; then
+ pkg_cv_MMS_CFLAGS="$MMS_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 libcdio_cdda >= 0.70\""; } >&5
- ($PKG_CONFIG --exists --print-errors "libcdio >= 0.70 libcdio_cdda >= 0.70") 2>&5
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmms >= 0.3\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libmms >= 0.3") 2>&5
 ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
- pkg_cv_CDIO_CFLAGS=`$PKG_CONFIG --cflags "libcdio >= 0.70 libcdio_cdda >= 0.70" 2>/dev/null`
+ pkg_cv_MMS_CFLAGS=`$PKG_CONFIG --cflags "libmms >= 0.3" 2>/dev/null`
 		 test "x$?" != "x0" && pkg_failed=yes
 else
 pkg_failed=yes
@@ -12539,16 +15559,16 @@
 else
 pkg_failed=untried
 fi
-if test -n "$CDIO_LIBS"; then
- pkg_cv_CDIO_LIBS="$CDIO_LIBS"
+if test -n "$MMS_LIBS"; then
+ pkg_cv_MMS_LIBS="$MMS_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 libcdio_cdda >= 0.70\""; } >&5
- ($PKG_CONFIG --exists --print-errors "libcdio >= 0.70 libcdio_cdda >= 0.70") 2>&5
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmms >= 0.3\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libmms >= 0.3") 2>&5
 ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
- pkg_cv_CDIO_LIBS=`$PKG_CONFIG --libs "libcdio >= 0.70 libcdio_cdda >= 0.70" 2>/dev/null`
+ pkg_cv_MMS_LIBS=`$PKG_CONFIG --libs "libmms >= 0.3" 2>/dev/null`
 		 test "x$?" != "x0" && pkg_failed=yes
 else
 pkg_failed=yes
@@ -12560,8 +15580,8 @@
 
 
 if test $pkg_failed = yes; then
- 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
 _pkg_short_errors_supported=yes
@@ -12569,42 +15589,74 @@
 _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 libcdio_cdda >= 0.70" 2>&1`
+ MMS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libmms >= 0.3" 2>&1`
 else
-	 CDIO_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libcdio >= 0.70 libcdio_cdda >= 0.70" 2>&1`
+ MMS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libmms >= 0.3" 2>&1`
 fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$CDIO_PKG_ERRORS" >&5
+ # Put the nasty error message in config.log where it belongs
+ echo "$MMS_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;}
+
+ if test $enable_mms = yes ; then
+ as_fn_error $? "Missing dependency for MMS transport: libmms >= 0.3" "$LINENO" 5
+ else
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: MMS transport disabled due to missing dependency: libmms >= 0.3" >&5
+printf "%s\n" "$as_me: WARNING: MMS transport disabled due to missing dependency: libmms >= 0.3" >&2;}
+ 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 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;}
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+
+ if test $enable_mms = yes ; then
+ as_fn_error $? "Missing dependency for MMS transport: libmms >= 0.3" "$LINENO" 5
+ else
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: MMS transport disabled due to missing dependency: libmms >= 0.3" >&5
+printf "%s\n" "$as_me: WARNING: MMS transport disabled due to missing dependency: libmms >= 0.3" >&2;}
+ fi
 
 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; }
+ MMS_CFLAGS=$pkg_cv_MMS_CFLAGS
+ MMS_LIBS=$pkg_cv_MMS_LIBS
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+
+ have_mms=yes
+ TRANSPORT_PLUGINS="$TRANSPORT_PLUGINS mms"
+
+fi
+ fi
+
+
+
+ # Check whether --enable-notify was given.
+if test ${enable_notify+y}
+then :
+ enableval=$enable_notify; enable_notify=$enableval
+else case e in #(
+ e) enable_notify=auto ;;
+esac
+fi
+
+
+ have_notify=no
+ check_allowed notify $enable_notify
+ if test $enable_notify != no -a $plugin_allowed = yes ; then
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CDDB" >&5
-$as_echo_n "checking for CDDB... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libnotify >= 0.7 gdk-pixbuf-2.0 >= 2.26" >&5
+printf %s "checking for libnotify >= 0.7 gdk-pixbuf-2.0 >= 2.26... " >&6; }
 
-if test -n "$CDDB_CFLAGS"; then
- pkg_cv_CDDB_CFLAGS="$CDDB_CFLAGS"
+if test -n "$NOTIFY_CFLAGS"; then
+ pkg_cv_NOTIFY_CFLAGS="$NOTIFY_CFLAGS"
 elif test -n "$PKG_CONFIG"; then
 if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcddb >= 1.2.1\""; } >&5
- ($PKG_CONFIG --exists --print-errors "libcddb >= 1.2.1") 2>&5
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnotify >= 0.7 gdk-pixbuf-2.0 >= 2.26\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libnotify >= 0.7 gdk-pixbuf-2.0 >= 2.26") 2>&5
 ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
- pkg_cv_CDDB_CFLAGS=`$PKG_CONFIG --cflags "libcddb >= 1.2.1" 2>/dev/null`
+ pkg_cv_NOTIFY_CFLAGS=`$PKG_CONFIG --cflags "libnotify >= 0.7 gdk-pixbuf-2.0 >= 2.26" 2>/dev/null`
 		 test "x$?" != "x0" && pkg_failed=yes
 else
 pkg_failed=yes
@@ -12612,16 +15664,16 @@
 else
 pkg_failed=untried
 fi
-if test -n "$CDDB_LIBS"; then
- pkg_cv_CDDB_LIBS="$CDDB_LIBS"
+if test -n "$NOTIFY_LIBS"; then
+ pkg_cv_NOTIFY_LIBS="$NOTIFY_LIBS"
 elif test -n "$PKG_CONFIG"; then
 if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcddb >= 1.2.1\""; } >&5
- ($PKG_CONFIG --exists --print-errors "libcddb >= 1.2.1") 2>&5
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnotify >= 0.7 gdk-pixbuf-2.0 >= 2.26\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libnotify >= 0.7 gdk-pixbuf-2.0 >= 2.26") 2>&5
 ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
- pkg_cv_CDDB_LIBS=`$PKG_CONFIG --libs "libcddb >= 1.2.1" 2>/dev/null`
+ pkg_cv_NOTIFY_LIBS=`$PKG_CONFIG --libs "libnotify >= 0.7 gdk-pixbuf-2.0 >= 2.26" 2>/dev/null`
 		 test "x$?" != "x0" && pkg_failed=yes
 else
 pkg_failed=yes
@@ -12633,8 +15685,8 @@
 
 
 if test $pkg_failed = yes; then
- 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
 _pkg_short_errors_supported=yes
@@ -12642,66 +15694,238 @@
 _pkg_short_errors_supported=no
 fi
 if test $_pkg_short_errors_supported = yes; then
-	 CDDB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libcddb >= 1.2.1" 2>&1`
+ NOTIFY_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libnotify >= 0.7 gdk-pixbuf-2.0 >= 2.26" 2>&1`
 else
-	 CDDB_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libcddb >= 1.2.1" 2>&1`
+ NOTIFY_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libnotify >= 0.7 gdk-pixbuf-2.0 >= 2.26" 2>&1`
 fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$CDDB_PKG_ERRORS" >&5
+ # Put the nasty error message in config.log where it belongs
+ echo "$NOTIFY_PKG_ERRORS" >&5
 
-	{ $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;}
+
+ if test $enable_notify = yes ; then
+ as_fn_error $? "Missing dependency for libnotify OSD: libnotify >= 0.7 gdk-pixbuf-2.0 >= 2.26" "$LINENO" 5
+ else
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: libnotify OSD disabled due to missing dependency: libnotify >= 0.7 gdk-pixbuf-2.0 >= 2.26" >&5
+printf "%s\n" "$as_me: WARNING: libnotify OSD disabled due to missing dependency: libnotify >= 0.7 gdk-pixbuf-2.0 >= 2.26" >&2;}
+ 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 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;}
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+
+ if test $enable_notify = yes ; then
+ as_fn_error $? "Missing dependency for libnotify OSD: libnotify >= 0.7 gdk-pixbuf-2.0 >= 2.26" "$LINENO" 5
+ else
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: libnotify OSD disabled due to missing dependency: libnotify >= 0.7 gdk-pixbuf-2.0 >= 2.26" >&5
+printf "%s\n" "$as_me: WARNING: libnotify OSD disabled due to missing dependency: libnotify >= 0.7 gdk-pixbuf-2.0 >= 2.26" >&2;}
+ fi
 
 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; }
-	have_cdaudio_ng=yes
- INPUT_PLUGINS="$INPUT_PLUGINS cdaudio-ng"
- GENERAL_PLUGINS="$GENERAL_PLUGINS cd-menu-items"
+ NOTIFY_CFLAGS=$pkg_cv_NOTIFY_CFLAGS
+ NOTIFY_LIBS=$pkg_cv_NOTIFY_LIBS
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+
+ have_notify=yes
+ GENERAL_PLUGINS="$GENERAL_PLUGINS notify"
+
+fi
+ fi
+
+
+test_lirc () {
+ for ac_header in lirc/lirc_client.h
+do :
+ ac_fn_c_check_header_compile "$LINENO" "lirc/lirc_client.h" "ac_cv_header_lirc_lirc_client_h" "$ac_includes_default"
+if test "x$ac_cv_header_lirc_lirc_client_h" = xyes
+then :
+ printf "%s\n" "#define HAVE_LIRC_LIRC_CLIENT_H 1" >>confdefs.h
+ have_lirc=yes
+else case e in #(
+ e) have_lirc=no ;;
+esac
+fi
+
+done
+}
+
+
+ # Check whether --enable-lirc was given.
+if test ${enable_lirc+y}
+then :
+ enableval=$enable_lirc; enable_lirc=$enableval
+else case e in #(
+ e) enable_lirc=auto ;;
+esac
+fi
+
 
+ have_lirc=no
+ check_allowed lirc $enable_lirc
+ if test $enable_lirc != no -a $plugin_allowed = yes ; then
+ test_lirc
+ if test $have_lirc = yes ; then
+ GENERAL_PLUGINS="$GENERAL_PLUGINS lirc"
+ elif test $enable_lirc = yes ; then
+ as_fn_error $? "Missing dependency for LIRC support" "$LINENO" 5
+ else
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: LIRC support disabled due to missing dependency" >&5
+printf "%s\n" "$as_me: WARNING: LIRC support disabled due to missing dependency" >&2;}
+ fi
+ fi
 
 
+test_mpris2 () {
+ if test $HAVE_MSWINDOWS = yes ; then
+ have_mpris2=no
+ else
+ unset have_mpris2
+ # Extract the first word of "gdbus-codegen", so it can be a program name with args.
+set dummy gdbus-codegen; ac_word=$2
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_prog_have_mpris2+y}
+then :
+ printf %s "(cached) " >&6
+else case e in #(
+ e) if test -n "$have_mpris2"; then
+ ac_cv_prog_have_mpris2="$have_mpris2" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ case $as_dir in #(((
+ '') as_dir=./ ;;
+ */) ;;
+ *) as_dir=$as_dir/ ;;
+ esac
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+ ac_cv_prog_have_mpris2="yes"
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+ done
+IFS=$as_save_IFS
 
+ test -z "$ac_cv_prog_have_mpris2" && ac_cv_prog_have_mpris2="no"
+fi ;;
+esac
 fi
+have_mpris2=$ac_cv_prog_have_mpris2
+if test -n "$have_mpris2"; then
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $have_mpris2" >&5
+printf "%s\n" "$have_mpris2" >&6; }
+else
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 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
+}
+
+
+ # Check whether --enable-mpris2 was given.
+if test ${enable_mpris2+y}
+then :
+ enableval=$enable_mpris2; enable_mpris2=$enableval
+else case e in #(
+ e) enable_mpris2=auto ;;
+esac
 fi
 
 
-# Check whether --enable-scrobbler2 was given.
-if test "${enable_scrobbler2+set}" = set; then :
+ have_mpris2=no
+ check_allowed mpris2 $enable_mpris2
+ if test $enable_mpris2 != no -a $plugin_allowed = yes ; then
+ test_mpris2
+ if test $have_mpris2 = yes ; then
+ GENERAL_PLUGINS="$GENERAL_PLUGINS mpris2"
+ elif test $enable_mpris2 = yes ; then
+ as_fn_error $? "Missing dependency for MPRIS 2 server" "$LINENO" 5
+ else
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: MPRIS 2 server disabled due to missing dependency" >&5
+printf "%s\n" "$as_me: WARNING: MPRIS 2 server disabled due to missing dependency" >&2;}
+ fi
+ fi
+
+
+test_songchange () {
+ if test $HAVE_MSWINDOWS = yes ; then
+ have_songchange=yes
+ else
+ for ac_header in sys/wait.h
+do :
+ ac_fn_c_check_header_compile "$LINENO" "sys/wait.h" "ac_cv_header_sys_wait_h" "$ac_includes_default"
+if test "x$ac_cv_header_sys_wait_h" = xyes
+then :
+ printf "%s\n" "#define HAVE_SYS_WAIT_H 1" >>confdefs.h
+ have_songchange=yes
+else case e in #(
+ e) have_songchange=no ;;
+esac
+fi
+
+done
+ fi
+}
+
+
+ # Check whether --enable-songchange was given.
+if test ${enable_songchange+y}
+then :
+ enableval=$enable_songchange; enable_songchange=$enableval
+else case e in #(
+ e) enable_songchange=auto ;;
+esac
+fi
+
+
+ have_songchange=no
+ check_allowed songchange $enable_songchange
+ if test $enable_songchange != no -a $plugin_allowed = yes ; then
+ test_songchange
+ if test $have_songchange = yes ; then
+ GENERAL_PLUGINS="$GENERAL_PLUGINS songchange"
+ elif test $enable_songchange = yes ; then
+ as_fn_error $? "Missing dependency for song change plugin" "$LINENO" 5
+ else
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: song change plugin disabled due to missing dependency" >&5
+printf "%s\n" "$as_me: WARNING: song change plugin disabled due to missing dependency" >&2;}
+ fi
+ fi
+
+
+
+ # Check whether --enable-scrobbler2 was given.
+if test ${enable_scrobbler2+y}
+then :
 enableval=$enable_scrobbler2; enable_scrobbler2=$enableval
-else
- enable_scrobbler2=auto
+else case e in #(
+ e) enable_scrobbler2=auto ;;
+esac
 fi
 
 
-have_scrobbler2=no
-if test "x$enable_scrobbler2" != "xno"; then
+ have_scrobbler2=no
+ check_allowed scrobbler2 $enable_scrobbler2
+ if test $enable_scrobbler2 != no -a $plugin_allowed = yes ; then
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CURL" >&5
-$as_echo_n "checking for CURL... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libcurl >= 7.9.7" >&5
+printf %s "checking for libcurl >= 7.9.7... " >&6; }
 
 if test -n "$CURL_CFLAGS"; then
 pkg_cv_CURL_CFLAGS="$CURL_CFLAGS"
 elif test -n "$PKG_CONFIG"; then
 if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcurl >= 7.9.7\""; } >&5
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcurl >= 7.9.7\""; } >&5
 ($PKG_CONFIG --exists --print-errors "libcurl >= 7.9.7") 2>&5
 ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
 pkg_cv_CURL_CFLAGS=`$PKG_CONFIG --cflags "libcurl >= 7.9.7" 2>/dev/null`
 		 test "x$?" != "x0" && pkg_failed=yes
@@ -12715,10 +15939,10 @@
 pkg_cv_CURL_LIBS="$CURL_LIBS"
 elif test -n "$PKG_CONFIG"; then
 if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcurl >= 7.9.7\""; } >&5
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcurl >= 7.9.7\""; } >&5
 ($PKG_CONFIG --exists --print-errors "libcurl >= 7.9.7") 2>&5
 ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
 pkg_cv_CURL_LIBS=`$PKG_CONFIG --libs "libcurl >= 7.9.7" 2>/dev/null`
 		 test "x$?" != "x0" && pkg_failed=yes
@@ -12732,8 +15956,8 @@
 
 
 if test $pkg_failed = yes; then
- 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
 _pkg_short_errors_supported=yes
@@ -12741,61 +15965,172 @@
 _pkg_short_errors_supported=no
 fi
 if test $_pkg_short_errors_supported = yes; then
-	 CURL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libcurl >= 7.9.7" 2>&1`
+ CURL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libcurl >= 7.9.7" 2>&1`
 else
-	 CURL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libcurl >= 7.9.7" 2>&1`
+ CURL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libcurl >= 7.9.7" 2>&1`
 fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$CURL_PKG_ERRORS" >&5
+ # Put the nasty error message in config.log where it belongs
+ echo "$CURL_PKG_ERRORS" >&5
 
-	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
+
+ if test $enable_scrobbler2 = yes ; then
+ as_fn_error $? "Missing dependency for Scrobbler 2: libcurl >= 7.9.7" "$LINENO" 5
+ else
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Scrobbler 2 disabled due to missing dependency: libcurl >= 7.9.7" >&5
+printf "%s\n" "$as_me: WARNING: Scrobbler 2 disabled due to missing dependency: libcurl >= 7.9.7" >&2;}
+ 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_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
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+
+ if test $enable_scrobbler2 = yes ; then
+ as_fn_error $? "Missing dependency for Scrobbler 2: libcurl >= 7.9.7" "$LINENO" 5
+ else
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Scrobbler 2 disabled due to missing dependency: libcurl >= 7.9.7" >&5
+printf "%s\n" "$as_me: WARNING: Scrobbler 2 disabled due to missing dependency: libcurl >= 7.9.7" >&2;}
+ 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_scrobbler2=yes
+ CURL_CFLAGS=$pkg_cv_CURL_CFLAGS
+ CURL_LIBS=$pkg_cv_CURL_LIBS
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+
+ have_scrobbler2=yes
+ GENERAL_PLUGINS="$GENERAL_PLUGINS scrobbler2"
+
+fi
+ fi
 
 
- GENERAL_PLUGINS="$GENERAL_PLUGINS scrobbler2"
+
+test_glspectrum () {
+ if test $HAVE_DARWIN = yes ; then
+ have_glspectrum=no
+ elif test $HAVE_MSWINDOWS = yes ; then
+ have_glspectrum=yes
+ GL_LIBS="-lopengl32"
+ else
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for glXCreateContext in -lGL" >&5
+printf %s "checking for glXCreateContext in -lGL... " >&6; }
+if test ${ac_cv_lib_GL_glXCreateContext+y}
+then :
+ printf %s "(cached) " >&6
+else case e in #(
+ e) 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.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char glXCreateContext (void);
+int
+main (void)
+{
+return glXCreateContext ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"
+then :
+ ac_cv_lib_GL_glXCreateContext=yes
+else case e in #(
+ e) ac_cv_lib_GL_glXCreateContext=no ;;
+esac
 fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS ;;
+esac
 fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_GL_glXCreateContext" >&5
+printf "%s\n" "$ac_cv_lib_GL_glXCreateContext" >&6; }
+if test "x$ac_cv_lib_GL_glXCreateContext" = xyes
+then :
+
+ have_glspectrum=yes
+ GL_LIBS="-lGL -lX11"
 
+else case e in #(
+ e) have_glspectrum=no ;;
+esac
+fi
 
-# Check whether --enable-neon was given.
-if test "${enable_neon+set}" = set; then :
- enableval=$enable_neon; enable_neon=$enableval
+ fi
+
+}
+
+
+ # Check whether --enable-glspectrum was given.
+if test ${enable_glspectrum+y}
+then :
+ enableval=$enable_glspectrum; enable_glspectrum=$enableval
+else case e in #(
+ e) enable_glspectrum=auto ;;
+esac
+fi
+
+
+ have_glspectrum=no
+ check_allowed glspectrum $enable_glspectrum
+ if test $enable_glspectrum != no -a $plugin_allowed = yes ; then
+ test_glspectrum
+ if test $have_glspectrum = yes ; then
+ VISUALIZATION_PLUGINS="$VISUALIZATION_PLUGINS glspectrum"
+ elif test $enable_glspectrum = yes ; then
+ as_fn_error $? "Missing dependency for OpenGL spectrum analyzer" "$LINENO" 5
+ else
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: OpenGL spectrum analyzer disabled due to missing dependency" >&5
+printf "%s\n" "$as_me: WARNING: OpenGL spectrum analyzer disabled due to missing dependency" >&2;}
+ fi
+ fi
+
+
+if test "x$USE_GTK2" = "xyes"; then
+ GDK_X11_DEP=gdk-x11-2.0
 else
- enable_neon=yes
+ GDK_X11_DEP=gdk-x11-3.0
+fi
+
+
+ # Check whether --enable-hotkey was given.
+if test ${enable_hotkey+y}
+then :
+ enableval=$enable_hotkey; enable_hotkey=$enableval
+else case e in #(
+ e) enable_hotkey=auto ;;
+esac
 fi
 
 
-if test $enable_neon = yes ; then
+ have_hotkey=no
+ check_allowed hotkey $enable_hotkey
+ if test $enable_hotkey != no -a $plugin_allowed = yes ; then
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for NEON" >&5
-$as_echo_n "checking for NEON... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $GDK_X11_DEP" >&5
+printf %s "checking for $GDK_X11_DEP... " >&6; }
 
-if test -n "$NEON_CFLAGS"; then
- pkg_cv_NEON_CFLAGS="$NEON_CFLAGS"
+if test -n "$GDKX11_CFLAGS"; then
+ pkg_cv_GDKX11_CFLAGS="$GDKX11_CFLAGS"
 elif test -n "$PKG_CONFIG"; then
 if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"neon >= 0.27\""; } >&5
- ($PKG_CONFIG --exists --print-errors "neon >= 0.27") 2>&5
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$GDK_X11_DEP\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "$GDK_X11_DEP") 2>&5
 ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
- pkg_cv_NEON_CFLAGS=`$PKG_CONFIG --cflags "neon >= 0.27" 2>/dev/null`
+ pkg_cv_GDKX11_CFLAGS=`$PKG_CONFIG --cflags "$GDK_X11_DEP" 2>/dev/null`
 		 test "x$?" != "x0" && pkg_failed=yes
 else
 pkg_failed=yes
@@ -12803,16 +16138,16 @@
 else
 pkg_failed=untried
 fi
-if test -n "$NEON_LIBS"; then
- pkg_cv_NEON_LIBS="$NEON_LIBS"
+if test -n "$GDKX11_LIBS"; then
+ pkg_cv_GDKX11_LIBS="$GDKX11_LIBS"
 elif test -n "$PKG_CONFIG"; then
 if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"neon >= 0.27\""; } >&5
- ($PKG_CONFIG --exists --print-errors "neon >= 0.27") 2>&5
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$GDK_X11_DEP\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "$GDK_X11_DEP") 2>&5
 ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
- pkg_cv_NEON_LIBS=`$PKG_CONFIG --libs "neon >= 0.27" 2>/dev/null`
+ pkg_cv_GDKX11_LIBS=`$PKG_CONFIG --libs "$GDK_X11_DEP" 2>/dev/null`
 		 test "x$?" != "x0" && pkg_failed=yes
 else
 pkg_failed=yes
@@ -12824,8 +16159,8 @@
 
 
 if test $pkg_failed = yes; then
- 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
 _pkg_short_errors_supported=yes
@@ -12833,74 +16168,74 @@
 _pkg_short_errors_supported=no
 fi
 if test $_pkg_short_errors_supported = yes; then
-	 NEON_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "neon >= 0.27" 2>&1`
+ GDKX11_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$GDK_X11_DEP" 2>&1`
 else
-	 NEON_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "neon >= 0.27" 2>&1`
+ GDKX11_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$GDK_X11_DEP" 2>&1`
 fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$NEON_PKG_ERRORS" >&5
-
-	as_fn_error $? "Package requirements (neon >= 0.27) were not met:
+ # Put the nasty error message in config.log where it belongs
+ echo "$GDKX11_PKG_ERRORS" >&5
 
-$NEON_PKG_ERRORS
 
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
+ if test $enable_hotkey = yes ; then
+ as_fn_error $? "Missing dependency for global hotkeys (X11): $GDK_X11_DEP" "$LINENO" 5
+ else
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: global hotkeys (X11) disabled due to missing dependency: $GDK_X11_DEP" >&5
+printf "%s\n" "$as_me: WARNING: global hotkeys (X11) disabled due to missing dependency: $GDK_X11_DEP" >&2;}
+ fi
 
-Alternatively, you may set the environment variables NEON_CFLAGS
-and NEON_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; }
-	{ { $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.
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
-Alternatively, you may set the environment variables NEON_CFLAGS
-and NEON_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
+ if test $enable_hotkey = yes ; then
+ as_fn_error $? "Missing dependency for global hotkeys (X11): $GDK_X11_DEP" "$LINENO" 5
+ else
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: global hotkeys (X11) disabled due to missing dependency: $GDK_X11_DEP" >&5
+printf "%s\n" "$as_me: WARNING: global hotkeys (X11) disabled due to missing dependency: $GDK_X11_DEP" >&2;}
+ fi
 
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5; }
 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; }
+ GDKX11_CFLAGS=$pkg_cv_GDKX11_CFLAGS
+ GDKX11_LIBS=$pkg_cv_GDKX11_LIBS
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+
+ have_hotkey=yes
+ GENERAL_PLUGINS="$GENERAL_PLUGINS hotkey"
 
 fi
- TRANSPORT_PLUGINS="$TRANSPORT_PLUGINS neon"
-fi
+ fi
 
 
-# Check whether --enable-mms was given.
-if test "${enable_mms+set}" = set; then :
- enableval=$enable_mms; enable_mms=$enableval
-else
- enable_mms=auto
+
+ # Check whether --enable-aosd was given.
+if test ${enable_aosd+y}
+then :
+ enableval=$enable_aosd; enable_aosd=$enableval
+else case e in #(
+ e) enable_aosd=auto ;;
+esac
 fi
 
 
-have_mms=no
-if test "x$enable_mms" != "xno"; then
+ have_aosd=no
+ check_allowed aosd $enable_aosd
+ if test $enable_aosd != no -a $plugin_allowed = yes ; then
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for MMS" >&5
-$as_echo_n "checking for MMS... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for xrender xcomposite" >&5
+printf %s "checking for xrender xcomposite... " >&6; }
 
-if test -n "$MMS_CFLAGS"; then
- pkg_cv_MMS_CFLAGS="$MMS_CFLAGS"
+if test -n "$X11EXT_CFLAGS"; then
+ pkg_cv_X11EXT_CFLAGS="$X11EXT_CFLAGS"
 elif test -n "$PKG_CONFIG"; then
 if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmms >= 0.3\""; } >&5
- ($PKG_CONFIG --exists --print-errors "libmms >= 0.3") 2>&5
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xrender xcomposite\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "xrender xcomposite") 2>&5
 ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
- pkg_cv_MMS_CFLAGS=`$PKG_CONFIG --cflags "libmms >= 0.3" 2>/dev/null`
+ pkg_cv_X11EXT_CFLAGS=`$PKG_CONFIG --cflags "xrender xcomposite" 2>/dev/null`
 		 test "x$?" != "x0" && pkg_failed=yes
 else
 pkg_failed=yes
@@ -12908,16 +16243,16 @@
 else
 pkg_failed=untried
 fi
-if test -n "$MMS_LIBS"; then
- pkg_cv_MMS_LIBS="$MMS_LIBS"
+if test -n "$X11EXT_LIBS"; then
+ pkg_cv_X11EXT_LIBS="$X11EXT_LIBS"
 elif test -n "$PKG_CONFIG"; then
 if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libmms >= 0.3\""; } >&5
- ($PKG_CONFIG --exists --print-errors "libmms >= 0.3") 2>&5
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xrender xcomposite\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "xrender xcomposite") 2>&5
 ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
- pkg_cv_MMS_LIBS=`$PKG_CONFIG --libs "libmms >= 0.3" 2>/dev/null`
+ pkg_cv_X11EXT_LIBS=`$PKG_CONFIG --libs "xrender xcomposite" 2>/dev/null`
 		 test "x$?" != "x0" && pkg_failed=yes
 else
 pkg_failed=yes
@@ -12929,8 +16264,8 @@
 
 
 if test $pkg_failed = yes; then
- 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
 _pkg_short_errors_supported=yes
@@ -12938,63 +16273,75 @@
 _pkg_short_errors_supported=no
 fi
 if test $_pkg_short_errors_supported = yes; then
-	 MMS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libmms >= 0.3" 2>&1`
+ X11EXT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "xrender xcomposite" 2>&1`
 else
-	 MMS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libmms >= 0.3" 2>&1`
+ X11EXT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "xrender xcomposite" 2>&1`
 fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$MMS_PKG_ERRORS" >&5
+ # Put the nasty error message in config.log where it belongs
+ echo "$X11EXT_PKG_ERRORS" >&5
 
-	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
+
+ if test $enable_aosd = yes ; then
+ as_fn_error $? "Missing dependency for X11 OSD: xrender xcomposite" "$LINENO" 5
+ else
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: X11 OSD disabled due to missing dependency: xrender xcomposite" >&5
+printf "%s\n" "$as_me: WARNING: X11 OSD disabled due to missing dependency: xrender xcomposite" >&2;}
+ 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_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
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+
+ if test $enable_aosd = yes ; then
+ as_fn_error $? "Missing dependency for X11 OSD: xrender xcomposite" "$LINENO" 5
+ else
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: X11 OSD disabled due to missing dependency: xrender xcomposite" >&5
+printf "%s\n" "$as_me: WARNING: X11 OSD disabled due to missing dependency: xrender xcomposite" >&2;}
+ 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; }
-	have_mms=yes
- TRANSPORT_PLUGINS="$TRANSPORT_PLUGINS mms"
-fi
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: *** mms plugin disabled by request ***" >&5
-$as_echo "*** mms plugin disabled by request ***" >&6; }
+ X11EXT_CFLAGS=$pkg_cv_X11EXT_CFLAGS
+ X11EXT_LIBS=$pkg_cv_X11EXT_LIBS
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+
+ have_aosd=yes
+ GENERAL_PLUGINS="$GENERAL_PLUGINS aosd"
+
 fi
+ fi
 
 
-# Check whether --enable-cue was given.
-if test "${enable_cue+set}" = set; then :
- enableval=$enable_cue; enable_cue=$enableval
-else
- enable_cue=auto
+
+
+ # Check whether --enable-ampache was given.
+if test ${enable_ampache+y}
+then :
+ enableval=$enable_ampache; enable_ampache=$enableval
+else case e in #(
+ e) enable_ampache=auto ;;
+esac
 fi
 
 
-have_cue=no
-if test "x$enable_cue" != "xno"; then
+ have_ampache=no
+ check_allowed ampache $enable_ampache
+ if test $enable_ampache != no -a $plugin_allowed = yes ; then
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CUE" >&5
-$as_echo_n "checking for CUE... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ampache_browser_1" >&5
+printf %s "checking for ampache_browser_1... " >&6; }
 
-if test -n "$CUE_CFLAGS"; then
- pkg_cv_CUE_CFLAGS="$CUE_CFLAGS"
+if test -n "$AMPACHE_CFLAGS"; then
+ pkg_cv_AMPACHE_CFLAGS="$AMPACHE_CFLAGS"
 elif test -n "$PKG_CONFIG"; then
 if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcue\""; } >&5
- ($PKG_CONFIG --exists --print-errors "libcue") 2>&5
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ampache_browser_1\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "ampache_browser_1") 2>&5
 ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
- pkg_cv_CUE_CFLAGS=`$PKG_CONFIG --cflags "libcue" 2>/dev/null`
+ pkg_cv_AMPACHE_CFLAGS=`$PKG_CONFIG --cflags "ampache_browser_1" 2>/dev/null`
 		 test "x$?" != "x0" && pkg_failed=yes
 else
 pkg_failed=yes
@@ -13002,16 +16349,16 @@
 else
 pkg_failed=untried
 fi
-if test -n "$CUE_LIBS"; then
- pkg_cv_CUE_LIBS="$CUE_LIBS"
+if test -n "$AMPACHE_LIBS"; then
+ pkg_cv_AMPACHE_LIBS="$AMPACHE_LIBS"
 elif test -n "$PKG_CONFIG"; then
 if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcue\""; } >&5
- ($PKG_CONFIG --exists --print-errors "libcue") 2>&5
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ampache_browser_1\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "ampache_browser_1") 2>&5
 ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
- pkg_cv_CUE_LIBS=`$PKG_CONFIG --libs "libcue" 2>/dev/null`
+ pkg_cv_AMPACHE_LIBS=`$PKG_CONFIG --libs "ampache_browser_1" 2>/dev/null`
 		 test "x$?" != "x0" && pkg_failed=yes
 else
 pkg_failed=yes
@@ -13023,8 +16370,8 @@
 
 
 if test $pkg_failed = yes; then
- 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
 _pkg_short_errors_supported=yes
@@ -13032,153 +16379,86 @@
 _pkg_short_errors_supported=no
 fi
 if test $_pkg_short_errors_supported = yes; then
-	 CUE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libcue" 2>&1`
+ AMPACHE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "ampache_browser_1" 2>&1`
 else
-	 CUE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libcue" 2>&1`
+ AMPACHE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "ampache_browser_1" 2>&1`
 fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$CUE_PKG_ERRORS" >&5
+ # Put the nasty error message in config.log where it belongs
+ echo "$AMPACHE_PKG_ERRORS" >&5
 
-	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; }
-	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; }
-	have_cue=yes
- CONTAINER_PLUGINS="$CONTAINER_PLUGINS cue"
-fi
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: *** cue plugin disabled by request ***" >&5
-$as_echo "*** cue plugin disabled by request ***" >&6; }
-fi
-
-
-# Check whether --enable-filewriter was given.
-if test "${enable_filewriter+set}" = set; then :
- enableval=$enable_filewriter; enable_filewriter=$enableval
-else
- enable_filewriter=yes
-
-fi
 
+ if test $enable_ampache = yes ; then
+ as_fn_error $? "Missing dependency for Ampache browser: ampache_browser_1" "$LINENO" 5
+ else
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Ampache browser disabled due to missing dependency: ampache_browser_1" >&5
+printf "%s\n" "$as_me: WARNING: Ampache browser disabled due to missing dependency: ampache_browser_1" >&2;}
+ fi
 
-have_filewriter=no
-if test "x$enable_filewriter" != "xno"; then
- have_filewriter=yes
- OUTPUT_PLUGINS="$OUTPUT_PLUGINS filewriter"
-fi
+elif test $pkg_failed = untried; then
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
+ if test $enable_ampache = yes ; then
+ as_fn_error $? "Missing dependency for Ampache browser: ampache_browser_1" "$LINENO" 5
+ else
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Ampache browser disabled due to missing dependency: ampache_browser_1" >&5
+printf "%s\n" "$as_me: WARNING: Ampache browser disabled due to missing dependency: ampache_browser_1" >&2;}
+ fi
 
-# Check whether --enable-filewriter_mp3 was given.
-if test "${enable_filewriter_mp3+set}" = set; then :
- enableval=$enable_filewriter_mp3; enable_filewriter_mp3=$enableval
 else
- enable_filewriter_mp3=auto
-
-fi
+ AMPACHE_CFLAGS=$pkg_cv_AMPACHE_CFLAGS
+ AMPACHE_LIBS=$pkg_cv_AMPACHE_LIBS
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
+ have_ampache=yes
+ GENERAL_PLUGINS="$GENERAL_PLUGINS ampache"
 
-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"
-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 lame_get_id3v2_tag ();
-int
-main ()
-{
-return lame_get_id3v2_tag ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_mp3lame_lame_get_id3v2_tag=yes
-else
- ac_cv_lib_mp3lame_lame_get_id3v2_tag=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_mp3lame_lame_get_id3v2_tag" >&5
-$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
-
-$as_echo "#define FILEWRITER_MP3 1" >>confdefs.h
-
- 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
-
-
-have_vorbisenc=no
-if test "x$have_filewriter" = "xyes" -a "x$enable_vorbis" = "xyes"; then
- have_vorbisenc=yes
+ fi
 
-$as_echo "#define FILEWRITER_VORBIS 1" >>confdefs.h
 
- FILEWRITER_CFLAGS="$FILEWRITER_CFLAGS $VORBIS_CFLAGS"
- FILEWRITER_LIBS="$FILEWRITER_LIBS $VORBIS_LIBS"
+if test "x$USE_QT5" = "xyes"; then
+ QT_MULTIMEDIA_DEP=Qt5Multimedia
+ QT_NETWORK_DEP=Qt5Network
+ QT_OPENGL_DEP="Qt5OpenGL >= 5.4"
+ QT_X11_DEP=Qt5X11Extras
+else
+ QT_MULTIMEDIA_DEP=Qt6Multimedia
+ QT_NETWORK_DEP=Qt6Network
+ QT_OPENGL_DEP="Qt6OpenGL Qt6OpenGLWidgets"
+ QT_X11_DEP="Qt6Gui >= 6.2 x11 xcb-proto"
 fi
 
-# Check whether --enable-filewriter_flac was given.
-if test "${enable_filewriter_flac+set}" = set; then :
- enableval=$enable_filewriter_flac; enable_filewriter_flac=$enableval
-else
- enable_filewriter_flac=auto
 
+ # Check whether --enable-qtaudio was given.
+if test ${enable_qtaudio+y}
+then :
+ enableval=$enable_qtaudio; enable_qtaudio=$enableval
+else case e in #(
+ e) enable_qtaudio=auto ;;
+esac
 fi
 
 
-have_writer_flac=no
-if test "x$have_filewriter" = "xyes" -a "x$enable_filewriter_flac" != "xno"; then
+ have_qtaudio=no
+ check_allowed qtaudio $enable_qtaudio
+ if test $enable_qtaudio != no -a $plugin_allowed = yes ; then
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for FLAC" >&5
-$as_echo_n "checking for FLAC... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $QT_MULTIMEDIA_DEP" >&5
+printf %s "checking for $QT_MULTIMEDIA_DEP... " >&6; }
 
-if test -n "$FLAC_CFLAGS"; then
- pkg_cv_FLAC_CFLAGS="$FLAC_CFLAGS"
+if test -n "$QTMULTIMEDIA_CFLAGS"; then
+ pkg_cv_QTMULTIMEDIA_CFLAGS="$QTMULTIMEDIA_CFLAGS"
 elif test -n "$PKG_CONFIG"; then
 if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"flac >= 1.1.3\""; } >&5
- ($PKG_CONFIG --exists --print-errors "flac >= 1.1.3") 2>&5
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$QT_MULTIMEDIA_DEP\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "$QT_MULTIMEDIA_DEP") 2>&5
 ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
- pkg_cv_FLAC_CFLAGS=`$PKG_CONFIG --cflags "flac >= 1.1.3" 2>/dev/null`
+ pkg_cv_QTMULTIMEDIA_CFLAGS=`$PKG_CONFIG --cflags "$QT_MULTIMEDIA_DEP" 2>/dev/null`
 		 test "x$?" != "x0" && pkg_failed=yes
 else
 pkg_failed=yes
@@ -13186,16 +16466,16 @@
 else
 pkg_failed=untried
 fi
-if test -n "$FLAC_LIBS"; then
- pkg_cv_FLAC_LIBS="$FLAC_LIBS"
+if test -n "$QTMULTIMEDIA_LIBS"; then
+ pkg_cv_QTMULTIMEDIA_LIBS="$QTMULTIMEDIA_LIBS"
 elif test -n "$PKG_CONFIG"; then
 if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"flac >= 1.1.3\""; } >&5
- ($PKG_CONFIG --exists --print-errors "flac >= 1.1.3") 2>&5
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$QT_MULTIMEDIA_DEP\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "$QT_MULTIMEDIA_DEP") 2>&5
 ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
- pkg_cv_FLAC_LIBS=`$PKG_CONFIG --libs "flac >= 1.1.3" 2>/dev/null`
+ pkg_cv_QTMULTIMEDIA_LIBS=`$PKG_CONFIG --libs "$QT_MULTIMEDIA_DEP" 2>/dev/null`
 		 test "x$?" != "x0" && pkg_failed=yes
 else
 pkg_failed=yes
@@ -13207,8 +16487,8 @@
 
 
 if test $pkg_failed = yes; then
- 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
 _pkg_short_errors_supported=yes
@@ -13216,68 +16496,74 @@
 _pkg_short_errors_supported=no
 fi
 if test $_pkg_short_errors_supported = yes; then
-	 FLAC_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "flac >= 1.1.3" 2>&1`
+ QTMULTIMEDIA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$QT_MULTIMEDIA_DEP" 2>&1`
 else
-	 FLAC_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "flac >= 1.1.3" 2>&1`
+ QTMULTIMEDIA_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$QT_MULTIMEDIA_DEP" 2>&1`
 fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$FLAC_PKG_ERRORS" >&5
+ # Put the nasty error message in config.log where it belongs
+ echo "$QTMULTIMEDIA_PKG_ERRORS" >&5
 
-	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
+
+ if test $enable_qtaudio = yes ; then
+ as_fn_error $? "Missing dependency for QtMultimedia output: $QT_MULTIMEDIA_DEP" "$LINENO" 5
+ else
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: QtMultimedia output disabled due to missing dependency: $QT_MULTIMEDIA_DEP" >&5
+printf "%s\n" "$as_me: WARNING: QtMultimedia output disabled due to missing dependency: $QT_MULTIMEDIA_DEP" >&2;}
+ 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_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
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+
+ if test $enable_qtaudio = yes ; then
+ as_fn_error $? "Missing dependency for QtMultimedia output: $QT_MULTIMEDIA_DEP" "$LINENO" 5
+ else
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: QtMultimedia output disabled due to missing dependency: $QT_MULTIMEDIA_DEP" >&5
+printf "%s\n" "$as_me: WARNING: QtMultimedia output disabled due to missing dependency: $QT_MULTIMEDIA_DEP" >&2;}
+ fi
 
 else
-	FLAC_CFLAGS=$pkg_cv_FLAC_CFLAGS
-	FLAC_LIBS=$pkg_cv_FLAC_LIBS
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-	have_writer_flac=yes
+ QTMULTIMEDIA_CFLAGS=$pkg_cv_QTMULTIMEDIA_CFLAGS
+ QTMULTIMEDIA_LIBS=$pkg_cv_QTMULTIMEDIA_LIBS
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
-$as_echo "#define FILEWRITER_FLAC 1" >>confdefs.h
+ have_qtaudio=yes
+ OUTPUT_PLUGINS="$OUTPUT_PLUGINS qtaudio"
 
- FILEWRITER_CFLAGS="$FILEWRITER_CFLAGS $FLAC_CFLAGS"
- FILEWRITER_LIBS="$FILEWRITER_LIBS $FLAC_LIBS"
 fi
-fi
-
-
-
+ fi
 
 
-# Check whether --enable-bs2b was given.
-if test "${enable_bs2b+set}" = set; then :
- enableval=$enable_bs2b; enable_bs2b=$enableval
-else
- enable_bs2b=auto
 
+ # Check whether --enable-streamtuner was given.
+if test ${enable_streamtuner+y}
+then :
+ enableval=$enable_streamtuner; enable_streamtuner=$enableval
+else case e in #(
+ e) enable_streamtuner=no ;;
+esac
 fi
 
 
-have_bs2b=no
-if test "x$enable_bs2b" != "xno"; then
+ have_streamtuner=no
+ check_allowed streamtuner $enable_streamtuner
+ if test $enable_streamtuner != no -a $plugin_allowed = yes ; then
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for BS2B" >&5
-$as_echo_n "checking for BS2B... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $QT_NETWORK_DEP" >&5
+printf %s "checking for $QT_NETWORK_DEP... " >&6; }
 
-if test -n "$BS2B_CFLAGS"; then
- pkg_cv_BS2B_CFLAGS="$BS2B_CFLAGS"
+if test -n "$QTNETWORK_CFLAGS"; then
+ pkg_cv_QTNETWORK_CFLAGS="$QTNETWORK_CFLAGS"
 elif test -n "$PKG_CONFIG"; then
 if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libbs2b >= 3.0.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "libbs2b >= 3.0.0") 2>&5
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$QT_NETWORK_DEP\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "$QT_NETWORK_DEP") 2>&5
 ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
- pkg_cv_BS2B_CFLAGS=`$PKG_CONFIG --cflags "libbs2b >= 3.0.0" 2>/dev/null`
+ pkg_cv_QTNETWORK_CFLAGS=`$PKG_CONFIG --cflags "$QT_NETWORK_DEP" 2>/dev/null`
 		 test "x$?" != "x0" && pkg_failed=yes
 else
 pkg_failed=yes
@@ -13285,16 +16571,16 @@
 else
 pkg_failed=untried
 fi
-if test -n "$BS2B_LIBS"; then
- pkg_cv_BS2B_LIBS="$BS2B_LIBS"
+if test -n "$QTNETWORK_LIBS"; then
+ pkg_cv_QTNETWORK_LIBS="$QTNETWORK_LIBS"
 elif test -n "$PKG_CONFIG"; then
 if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libbs2b >= 3.0.0\""; } >&5
- ($PKG_CONFIG --exists --print-errors "libbs2b >= 3.0.0") 2>&5
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$QT_NETWORK_DEP\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "$QT_NETWORK_DEP") 2>&5
 ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
- pkg_cv_BS2B_LIBS=`$PKG_CONFIG --libs "libbs2b >= 3.0.0" 2>/dev/null`
+ pkg_cv_QTNETWORK_LIBS=`$PKG_CONFIG --libs "$QT_NETWORK_DEP" 2>/dev/null`
 		 test "x$?" != "x0" && pkg_failed=yes
 else
 pkg_failed=yes
@@ -13306,8 +16592,8 @@
 
 
 if test $pkg_failed = yes; then
- 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
 _pkg_short_errors_supported=yes
@@ -13315,64 +16601,61 @@
 _pkg_short_errors_supported=no
 fi
 if test $_pkg_short_errors_supported = yes; then
-	 BS2B_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libbs2b >= 3.0.0" 2>&1`
+ QTNETWORK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$QT_NETWORK_DEP" 2>&1`
 else
-	 BS2B_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libbs2b >= 3.0.0" 2>&1`
+ QTNETWORK_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$QT_NETWORK_DEP" 2>&1`
 fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$BS2B_PKG_ERRORS" >&5
+ # Put the nasty error message in config.log where it belongs
+ echo "$QTNETWORK_PKG_ERRORS" >&5
 
-	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; }
-	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
+ if test $enable_streamtuner = yes ; then
+ as_fn_error $? "Missing dependency for Stream tuner (experimental): $QT_NETWORK_DEP" "$LINENO" 5
+ else
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Stream tuner (experimental) disabled due to missing dependency: $QT_NETWORK_DEP" >&5
+printf "%s\n" "$as_me: WARNING: Stream tuner (experimental) disabled due to missing dependency: $QT_NETWORK_DEP" >&2;}
+ 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; }
-fi
+elif test $pkg_failed = untried; then
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
+ if test $enable_streamtuner = yes ; then
+ as_fn_error $? "Missing dependency for Stream tuner (experimental): $QT_NETWORK_DEP" "$LINENO" 5
+ else
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Stream tuner (experimental) disabled due to missing dependency: $QT_NETWORK_DEP" >&5
+printf "%s\n" "$as_me: WARNING: Stream tuner (experimental) disabled due to missing dependency: $QT_NETWORK_DEP" >&2;}
+ fi
 
-# Check whether --enable-resample was given.
-if test "${enable_resample+set}" = set; then :
- enableval=$enable_resample; enable_resample=$enableval
 else
- enable_resample=auto
+ QTNETWORK_CFLAGS=$pkg_cv_QTNETWORK_CFLAGS
+ QTNETWORK_LIBS=$pkg_cv_QTNETWORK_LIBS
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+
+ have_streamtuner=yes
+ GENERAL_PLUGINS="$GENERAL_PLUGINS streamtuner"
 
 fi
+ fi
 
 
-have_resample=no
-if test "x$enable_resample" != "xno"; then
+test_qtglspectrum () {
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SAMPLERATE" >&5
-$as_echo_n "checking for SAMPLERATE... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $QT_OPENGL_DEP" >&5
+printf %s "checking for $QT_OPENGL_DEP... " >&6; }
 
-if test -n "$SAMPLERATE_CFLAGS"; then
- pkg_cv_SAMPLERATE_CFLAGS="$SAMPLERATE_CFLAGS"
+if test -n "$QTOPENGL_CFLAGS"; then
+ pkg_cv_QTOPENGL_CFLAGS="$QTOPENGL_CFLAGS"
 elif test -n "$PKG_CONFIG"; then
 if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"samplerate\""; } >&5
- ($PKG_CONFIG --exists --print-errors "samplerate") 2>&5
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$QT_OPENGL_DEP\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "$QT_OPENGL_DEP") 2>&5
 ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
- pkg_cv_SAMPLERATE_CFLAGS=`$PKG_CONFIG --cflags "samplerate" 2>/dev/null`
+ pkg_cv_QTOPENGL_CFLAGS=`$PKG_CONFIG --cflags "$QT_OPENGL_DEP" 2>/dev/null`
 		 test "x$?" != "x0" && pkg_failed=yes
 else
 pkg_failed=yes
@@ -13380,16 +16663,16 @@
 else
 pkg_failed=untried
 fi
-if test -n "$SAMPLERATE_LIBS"; then
- pkg_cv_SAMPLERATE_LIBS="$SAMPLERATE_LIBS"
+if test -n "$QTOPENGL_LIBS"; then
+ pkg_cv_QTOPENGL_LIBS="$QTOPENGL_LIBS"
 elif test -n "$PKG_CONFIG"; then
 if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"samplerate\""; } >&5
- ($PKG_CONFIG --exists --print-errors "samplerate") 2>&5
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$QT_OPENGL_DEP\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "$QT_OPENGL_DEP") 2>&5
 ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
- pkg_cv_SAMPLERATE_LIBS=`$PKG_CONFIG --libs "samplerate" 2>/dev/null`
+ pkg_cv_QTOPENGL_LIBS=`$PKG_CONFIG --libs "$QT_OPENGL_DEP" 2>/dev/null`
 		 test "x$?" != "x0" && pkg_failed=yes
 else
 pkg_failed=yes
@@ -13401,8 +16684,8 @@
 
 
 if test $pkg_failed = yes; then
- 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
 _pkg_short_errors_supported=yes
@@ -13410,60 +16693,145 @@
 _pkg_short_errors_supported=no
 fi
 if test $_pkg_short_errors_supported = yes; then
-	 SAMPLERATE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "samplerate" 2>&1`
+ QTOPENGL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$QT_OPENGL_DEP" 2>&1`
 else
-	 SAMPLERATE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "samplerate" 2>&1`
+ QTOPENGL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$QT_OPENGL_DEP" 2>&1`
 fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$SAMPLERATE_PKG_ERRORS" >&5
-
-	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
+ # Put the nasty error message in config.log where it belongs
+ echo "$QTOPENGL_PKG_ERRORS" >&5
 
+ have_qtglspectrum=no
 elif test $pkg_failed = untried; then
- 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-	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
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+ have_qtglspectrum=no
+else
+ QTOPENGL_CFLAGS=$pkg_cv_QTOPENGL_CFLAGS
+ QTOPENGL_LIBS=$pkg_cv_QTOPENGL_LIBS
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
 
-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; }
-	have_resample=yes
- EFFECT_PLUGINS="$EFFECT_PLUGINS resample"
+ if test $have_glspectrum = yes ; then
+ have_qtglspectrum=yes
+ elif test $HAVE_MSWINDOWS = yes ; then
+ have_qtglspectrum=yes
+ GL_LIBS="-lopengl32"
+ else
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for glBegin in -lGL" >&5
+printf %s "checking for glBegin in -lGL... " >&6; }
+if test ${ac_cv_lib_GL_glBegin+y}
+then :
+ printf %s "(cached) " >&6
+else case e in #(
+ e) 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.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char glBegin (void);
+int
+main (void)
+{
+return glBegin ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"
+then :
+ ac_cv_lib_GL_glBegin=yes
+else case e in #(
+ e) ac_cv_lib_GL_glBegin=no ;;
+esac
 fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS ;;
+esac
 fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_GL_glBegin" >&5
+printf "%s\n" "$ac_cv_lib_GL_glBegin" >&6; }
+if test "x$ac_cv_lib_GL_glBegin" = xyes
+then :
 
+ have_qtglspectrum=yes
+ GL_LIBS="-lGL"
 
-# Check whether --enable-speedpitch was given.
-if test "${enable_speedpitch+set}" = set; then :
- enableval=$enable_speedpitch; enable_speedpitch="$enableval"
-else
- enable_speedpitch=auto
+else case e in #(
+ e) have_qtglspectrum=no ;;
+esac
 fi
 
+ fi
 
-have_speedpitch=no
-if test "x$enable_speedpitch" != "xno"; then
+
+fi
+}
+
+
+ # Check whether --enable-qtglspectrum was given.
+if test ${enable_qtglspectrum+y}
+then :
+ enableval=$enable_qtglspectrum; enable_qtglspectrum=$enableval
+else case e in #(
+ e) enable_qtglspectrum=auto ;;
+esac
+fi
+
+
+ have_qtglspectrum=no
+ check_allowed qtglspectrum $enable_qtglspectrum
+ if test $enable_qtglspectrum != no -a $plugin_allowed = yes ; then
+ test_qtglspectrum
+ if test $have_qtglspectrum = yes ; then
+ VISUALIZATION_PLUGINS="$VISUALIZATION_PLUGINS qtglspectrum"
+ elif test $enable_qtglspectrum = yes ; then
+ as_fn_error $? "Missing dependency for Qt OpenGL spectrum analyzer" "$LINENO" 5
+ else
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Qt OpenGL spectrum analyzer disabled due to missing dependency" >&5
+printf "%s\n" "$as_me: WARNING: Qt OpenGL spectrum analyzer disabled due to missing dependency" >&2;}
+ fi
+ fi
+
+
+
+ # Check whether --enable-qthotkey was given.
+if test ${enable_qthotkey+y}
+then :
+ enableval=$enable_qthotkey; enable_qthotkey=$enableval
+else case e in #(
+ e) enable_qthotkey=auto ;;
+esac
+fi
+
+
+ have_qthotkey=no
+ check_allowed qthotkey $enable_qthotkey
+ if test $enable_qthotkey != no -a $plugin_allowed = yes ; then
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SAMPLERATE" >&5
-$as_echo_n "checking for SAMPLERATE... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $QT_X11_DEP" >&5
+printf %s "checking for $QT_X11_DEP... " >&6; }
 
-if test -n "$SAMPLERATE_CFLAGS"; then
- pkg_cv_SAMPLERATE_CFLAGS="$SAMPLERATE_CFLAGS"
+if test -n "$QTX11EXTRAS_CFLAGS"; then
+ pkg_cv_QTX11EXTRAS_CFLAGS="$QTX11EXTRAS_CFLAGS"
 elif test -n "$PKG_CONFIG"; then
 if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"samplerate\""; } >&5
- ($PKG_CONFIG --exists --print-errors "samplerate") 2>&5
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$QT_X11_DEP\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "$QT_X11_DEP") 2>&5
 ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
- pkg_cv_SAMPLERATE_CFLAGS=`$PKG_CONFIG --cflags "samplerate" 2>/dev/null`
+ pkg_cv_QTX11EXTRAS_CFLAGS=`$PKG_CONFIG --cflags "$QT_X11_DEP" 2>/dev/null`
 		 test "x$?" != "x0" && pkg_failed=yes
 else
 pkg_failed=yes
@@ -13471,16 +16839,16 @@
 else
 pkg_failed=untried
 fi
-if test -n "$SAMPLERATE_LIBS"; then
- pkg_cv_SAMPLERATE_LIBS="$SAMPLERATE_LIBS"
+if test -n "$QTX11EXTRAS_LIBS"; then
+ pkg_cv_QTX11EXTRAS_LIBS="$QTX11EXTRAS_LIBS"
 elif test -n "$PKG_CONFIG"; then
 if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"samplerate\""; } >&5
- ($PKG_CONFIG --exists --print-errors "samplerate") 2>&5
+ { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$QT_X11_DEP\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "$QT_X11_DEP") 2>&5
 ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
- pkg_cv_SAMPLERATE_LIBS=`$PKG_CONFIG --libs "samplerate" 2>/dev/null`
+ pkg_cv_QTX11EXTRAS_LIBS=`$PKG_CONFIG --libs "$QT_X11_DEP" 2>/dev/null`
 		 test "x$?" != "x0" && pkg_failed=yes
 else
 pkg_failed=yes
@@ -13492,8 +16860,8 @@
 
 
 if test $pkg_failed = yes; then
- 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
 _pkg_short_errors_supported=yes
@@ -13501,61 +16869,97 @@
 _pkg_short_errors_supported=no
 fi
 if test $_pkg_short_errors_supported = yes; then
-	 SAMPLERATE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "samplerate" 2>&1`
+ QTX11EXTRAS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$QT_X11_DEP" 2>&1`
 else
-	 SAMPLERATE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "samplerate" 2>&1`
+ QTX11EXTRAS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$QT_X11_DEP" 2>&1`
 fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$SAMPLERATE_PKG_ERRORS" >&5
+ # Put the nasty error message in config.log where it belongs
+ echo "$QTX11EXTRAS_PKG_ERRORS" >&5
 
-	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
+
+ if test $enable_qthotkey = yes ; then
+ as_fn_error $? "Missing dependency for global hotkeys (X11): $QT_X11_DEP" "$LINENO" 5
+ else
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: global hotkeys (X11) disabled due to missing dependency: $QT_X11_DEP" >&5
+printf "%s\n" "$as_me: WARNING: global hotkeys (X11) disabled due to missing dependency: $QT_X11_DEP" >&2;}
+ 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_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
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+
+ if test $enable_qthotkey = yes ; then
+ as_fn_error $? "Missing dependency for global hotkeys (X11): $QT_X11_DEP" "$LINENO" 5
+ else
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: global hotkeys (X11) disabled due to missing dependency: $QT_X11_DEP" >&5
+printf "%s\n" "$as_me: WARNING: global hotkeys (X11) disabled due to missing dependency: $QT_X11_DEP" >&2;}
+ 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; }
-	have_speedpitch=yes
- EFFECT_PLUGINS="$EFFECT_PLUGINS speed-pitch"
+ QTX11EXTRAS_CFLAGS=$pkg_cv_QTX11EXTRAS_CFLAGS
+ QTX11EXTRAS_LIBS=$pkg_cv_QTX11EXTRAS_LIBS
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+
+ have_qthotkey=yes
+ GENERAL_PLUGINS="$GENERAL_PLUGINS qthotkey"
+
 fi
+ fi
+
+
+
+# Check whether --enable-coreaudio was given.
+if test ${enable_coreaudio+y}
+then :
+ enableval=$enable_coreaudio; enable_coreaudio=$enableval
+else case e in #(
+ e) enable_coreaudio=auto
+ ;;
+esac
 fi
 
 
-# Check whether --enable-soxr was given.
-if test "${enable_soxr+set}" = set; then :
- enableval=$enable_soxr; enable_soxr=$enableval
+have_coreaudio=no
+if test "x$enable_coreaudio" != "xno"; then
+ if test "x$HAVE_DARWIN" != "xno"; then
+ have_coreaudio=yes
+ OUTPUT_PLUGINS="$OUTPUT_PLUGINS coreaudio"
+ fi
 else
- enable_soxr=auto
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: *** CoreAudio output plugin disabled per user request ***" >&5
+printf "%s\n" "*** CoreAudio output plugin disabled per user request ***" >&6; }
+fi
+
 
+
+# Check whether --with-libsdl was given.
+if test ${with_libsdl+y}
+then :
+ withval=$with_libsdl; with_libsdl=$withval
+else case e in #(
+ e) with_libsdl=auto ;;
+esac
 fi
 
 
-have_soxr=no
-if test "x$enable_soxr" != "xno"; then
+test_sdlout () {
+ if test "x$with_libsdl" = "x1"; then
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for SOXR" >&5
-$as_echo_n "checking for SOXR... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sdl >= 1.2.11" >&5
+printf %s "checking for sdl >= 1.2.11... " >&6; }
 
-if test -n "$SOXR_CFLAGS"; then
- pkg_cv_SOXR_CFLAGS="$SOXR_CFLAGS"
+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 \"soxr\""; } >&5
- ($PKG_CONFIG --exists --print-errors "soxr") 2>&5
+ { { printf "%s\n" "$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
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
- pkg_cv_SOXR_CFLAGS=`$PKG_CONFIG --cflags "soxr" 2>/dev/null`
+ pkg_cv_SDL_CFLAGS=`$PKG_CONFIG --cflags "sdl >= 1.2.11" 2>/dev/null`
 		 test "x$?" != "x0" && pkg_failed=yes
 else
 pkg_failed=yes
@@ -13563,16 +16967,16 @@
 else
 pkg_failed=untried
 fi
-if test -n "$SOXR_LIBS"; then
- pkg_cv_SOXR_LIBS="$SOXR_LIBS"
+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 \"soxr\""; } >&5
- ($PKG_CONFIG --exists --print-errors "soxr") 2>&5
+ { { printf "%s\n" "$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
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
- pkg_cv_SOXR_LIBS=`$PKG_CONFIG --libs "soxr" 2>/dev/null`
+ pkg_cv_SDL_LIBS=`$PKG_CONFIG --libs "sdl >= 1.2.11" 2>/dev/null`
 		 test "x$?" != "x0" && pkg_failed=yes
 else
 pkg_failed=yes
@@ -13584,8 +16988,8 @@
 
 
 if test $pkg_failed = yes; then
- 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
 _pkg_short_errors_supported=yes
@@ -13593,60 +16997,41 @@
 _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`
+ SDL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "sdl >= 1.2.11" 2>&1`
 else
-	 SOXR_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "soxr" 2>&1`
+ 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 "$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
+ # Put the nasty error message in config.log where it belongs
+ echo "$SDL_PKG_ERRORS" >&5
 
+ have_sdlout=no
 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
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+ have_sdlout=no
+else
+ SDL_CFLAGS=$pkg_cv_SDL_CFLAGS
+ SDL_LIBS=$pkg_cv_SDL_LIBS
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+ have_sdlout=yes
 fi
-
-
-# Check whether --enable-lyricwiki was given.
-if test "${enable_lyricwiki+set}" = set; then :
- enableval=$enable_lyricwiki; enable_lyricwiki=$enableval
-else
- enable_lyricwiki=auto
-fi
-
-
-have_lyricwiki=no
-if test "x$enable_lyricwiki" != "xno"; then
+ elif test "x$with_libsdl" = "x2"; then
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GLIB214" >&5
-$as_echo_n "checking for GLIB214... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sdl2 >= 2.0" >&5
+printf %s "checking for sdl2 >= 2.0... " >&6; }
 
-if test -n "$GLIB214_CFLAGS"; then
- pkg_cv_GLIB214_CFLAGS="$GLIB214_CFLAGS"
+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 \"glib-2.0 >= 2.14\""; } >&5
- ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.14") 2>&5
+ { { printf "%s\n" "$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
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
- pkg_cv_GLIB214_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 2.14" 2>/dev/null`
+ pkg_cv_SDL_CFLAGS=`$PKG_CONFIG --cflags "sdl2 >= 2.0" 2>/dev/null`
 		 test "x$?" != "x0" && pkg_failed=yes
 else
 pkg_failed=yes
@@ -13654,16 +17039,16 @@
 else
 pkg_failed=untried
 fi
-if test -n "$GLIB214_LIBS"; then
- pkg_cv_GLIB214_LIBS="$GLIB214_LIBS"
+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 \"glib-2.0 >= 2.14\""; } >&5
- ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.14") 2>&5
+ { { printf "%s\n" "$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
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
- pkg_cv_GLIB214_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.14" 2>/dev/null`
+ pkg_cv_SDL_LIBS=`$PKG_CONFIG --libs "sdl2 >= 2.0" 2>/dev/null`
 		 test "x$?" != "x0" && pkg_failed=yes
 else
 pkg_failed=yes
@@ -13675,8 +17060,8 @@
 
 
 if test $pkg_failed = yes; then
- 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
 _pkg_short_errors_supported=yes
@@ -13684,137 +17069,177 @@
 _pkg_short_errors_supported=no
 fi
 if test $_pkg_short_errors_supported = yes; then
-	 GLIB214_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "glib-2.0 >= 2.14" 2>&1`
+ SDL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "sdl2 >= 2.0" 2>&1`
 else
-	 GLIB214_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "glib-2.0 >= 2.14" 2>&1`
+ 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 "$GLIB214_PKG_ERRORS" >&5
-
-	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
+ # Put the nasty error message in config.log where it belongs
+ echo "$SDL_PKG_ERRORS" >&5
 
+ have_sdlout=no
 elif test $pkg_failed = untried; then
- 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-	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
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+ have_sdlout=no
+else
+ SDL_CFLAGS=$pkg_cv_SDL_CFLAGS
+ SDL_LIBS=$pkg_cv_SDL_LIBS
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+ have_sdlout=yes
+fi
+ else
+
+pkg_failed=no
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sdl2 >= 2.0" >&5
+printf %s "checking for sdl2 >= 2.0... " >&6; }
 
+if test -n "$SDL_CFLAGS"; then
+ pkg_cv_SDL_CFLAGS="$SDL_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { printf "%s\n" "$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=$?
+ printf "%s\n" "$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
-	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; }
-	have_lyricwiki=yes
- GENERAL_PLUGINS="$GENERAL_PLUGINS lyricwiki"
+ 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" && \
+ { { printf "%s\n" "$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=$?
+ printf "%s\n" "$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
 
 
-# Check whether --enable-glspectrum was given.
-if test "${enable_glspectrum+set}" = set; then :
- enableval=$enable_glspectrum; enable_glspectrum=$enableval
+
+if test $pkg_failed = yes; then
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
 else
- enable_glspectrum=auto
+ _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
 
 
-have_glspectrum=no
 
-if test $enable_glspectrum != no ; then
- if test $HAVE_MSWINDOWS = yes ; then
- have_glspectrum=yes
- GL_LIBS="-lopengl32"
- else
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for glXCreateContext in -lGL" >&5
-$as_echo_n "checking for glXCreateContext in -lGL... " >&6; }
-if ${ac_cv_lib_GL_glXCreateContext+:} 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. */
+pkg_failed=no
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sdl >= 1.2.11" >&5
+printf %s "checking for sdl >= 1.2.11... " >&6; }
 
-/* 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 glXCreateContext ();
-int
-main ()
-{
-return glXCreateContext ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_lib_GL_glXCreateContext=yes
+if test -n "$SDL_CFLAGS"; then
+ pkg_cv_SDL_CFLAGS="$SDL_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { printf "%s\n" "$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=$?
+ printf "%s\n" "$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
- ac_cv_lib_GL_glXCreateContext=no
+ pkg_failed=yes
 fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
+ else
+ pkg_failed=untried
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_GL_glXCreateContext" >&5
-$as_echo "$ac_cv_lib_GL_glXCreateContext" >&6; }
-if test "x$ac_cv_lib_GL_glXCreateContext" = xyes; then :
- have_glspectrum=yes
+if test -n "$SDL_LIBS"; then
+ pkg_cv_SDL_LIBS="$SDL_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+ { { printf "%s\n" "$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=$?
+ printf "%s\n" "$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
- have_glspectrum=no
+ pkg_failed=yes
 fi
-
- if test $have_glspectrum = yes ; then
- GL_LIBS="-lGL -lX11"
- fi
- fi
-
- if test $enable_glspectrum = yes && test $have_glspectrum = no ; then
- as_fn_error $? "Unable to enable OpenGL Spectrum Analyzer; check config.log" "$LINENO" 5
- fi
-
- if test $have_glspectrum = yes ; then
- VISUALIZATION_PLUGINS="$VISUALIZATION_PLUGINS gl-spectrum"
- fi
+ else
+ pkg_failed=untried
 fi
 
 
 
+if test $pkg_failed = yes; then
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
-# Check whether --enable-qtglspectrum was given.
-if test "${enable_qtglspectrum+set}" = set; then :
- enableval=$enable_qtglspectrum; enable_qtglspectrum=$enableval
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+ _pkg_short_errors_supported=yes
 else
- enable_qtglspectrum=auto
+ _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
 
-
-have_qtglspectrum=no
-if test "x$USE_QT" = "xno" -a "x$enable_qtglspectrum" = "xyes"; then
- as_fn_error $? "--enable-qtglspectrum cannot be used without --enable-qt" "$LINENO" 5
+ have_sdlout=no
+elif test $pkg_failed = untried; then
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+ have_sdlout=no
+else
+ SDL_CFLAGS=$pkg_cv_SDL_CFLAGS
+ SDL_LIBS=$pkg_cv_SDL_LIBS
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+ have_sdlout=yes
 fi
-if test "x$USE_QT" = "xyes" -a "x$enable_qtglspectrum" != "xno"; then
+
+elif test $pkg_failed = untried; then
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+
 
 pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for QTOPENGL" >&5
-$as_echo_n "checking for QTOPENGL... " >&6; }
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for sdl >= 1.2.11" >&5
+printf %s "checking for sdl >= 1.2.11... " >&6; }
 
-if test -n "$QTOPENGL_CFLAGS"; then
- pkg_cv_QTOPENGL_CFLAGS="$QTOPENGL_CFLAGS"
+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 \"Qt5OpenGL\""; } >&5
- ($PKG_CONFIG --exists --print-errors "Qt5OpenGL") 2>&5
+ { { printf "%s\n" "$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
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
- pkg_cv_QTOPENGL_CFLAGS=`$PKG_CONFIG --cflags "Qt5OpenGL" 2>/dev/null`
+ pkg_cv_SDL_CFLAGS=`$PKG_CONFIG --cflags "sdl >= 1.2.11" 2>/dev/null`
 		 test "x$?" != "x0" && pkg_failed=yes
 else
 pkg_failed=yes
@@ -13822,16 +17247,16 @@
 else
 pkg_failed=untried
 fi
-if test -n "$QTOPENGL_LIBS"; then
- pkg_cv_QTOPENGL_LIBS="$QTOPENGL_LIBS"
+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 \"Qt5OpenGL\""; } >&5
- ($PKG_CONFIG --exists --print-errors "Qt5OpenGL") 2>&5
+ { { printf "%s\n" "$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
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
 test $ac_status = 0; }; then
- pkg_cv_QTOPENGL_LIBS=`$PKG_CONFIG --libs "Qt5OpenGL" 2>/dev/null`
+ pkg_cv_SDL_LIBS=`$PKG_CONFIG --libs "sdl >= 1.2.11" 2>/dev/null`
 		 test "x$?" != "x0" && pkg_failed=yes
 else
 pkg_failed=yes
@@ -13843,8 +17268,8 @@
 
 
 if test $pkg_failed = yes; then
- 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 
 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
 _pkg_short_errors_supported=yes
@@ -13852,91 +17277,184 @@
 _pkg_short_errors_supported=no
 fi
 if test $_pkg_short_errors_supported = yes; then
-	 QTOPENGL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "Qt5OpenGL" 2>&1`
+ SDL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "sdl >= 1.2.11" 2>&1`
 else
-	 QTOPENGL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "Qt5OpenGL" 2>&1`
+ 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 "$QTOPENGL_PKG_ERRORS" >&5
+ # Put the nasty error message in config.log where it belongs
+ echo "$SDL_PKG_ERRORS" >&5
 
-	have_qtglspectrum=no
+ have_sdlout=no
 elif test $pkg_failed = untried; then
- 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-	have_qtglspectrum=no
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
+ have_sdlout=no
+else
+ SDL_CFLAGS=$pkg_cv_SDL_CFLAGS
+ SDL_LIBS=$pkg_cv_SDL_LIBS
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+ have_sdlout=yes
+fi
+
 else
-	QTOPENGL_CFLAGS=$pkg_cv_QTOPENGL_CFLAGS
-	QTOPENGL_LIBS=$pkg_cv_QTOPENGL_LIBS
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-	have_qtglspectrum=yes
+ SDL_CFLAGS=$pkg_cv_SDL_CFLAGS
+ SDL_LIBS=$pkg_cv_SDL_LIBS
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+printf "%s\n" "yes" >&6; }
+ have_sdlout=yes
 fi
- if test "x$have_qtglspectrum" = "xyes"; then
- QTOPENGL_CFLAGS="$QTOPENGL_CFLAGS -fPIC"
- VISUALIZATION_PLUGINS="$VISUALIZATION_PLUGINS gl-spectrum-qt"
- elif test "x$enable_qtglspectrum" = "xyes"; then
- as_fn_error $? "Qt OpenGL Spectrum Analyzer plugin requested but QtOpenGL not found!" "$LINENO" 5
 fi
-fi
+}
 
 
-# Check whether --enable-vtx was given.
-if test "${enable_vtx+set}" = set; then :
- enableval=$enable_vtx; enable_vtx=$enableval
-else
- enable_vtx="yes"
+ # Check whether --enable-sdlout was given.
+if test ${enable_sdlout+y}
+then :
+ enableval=$enable_sdlout; enable_sdlout=$enableval
+else case e in #(
+ e) enable_sdlout=auto ;;
+esac
 fi
 
 
-if test "x$enable_vtx" != "xno"; then
- INPUT_PLUGINS="$INPUT_PLUGINS vtx"
+ have_sdlout=no
+ check_allowed sdlout $enable_sdlout
+ if test $enable_sdlout != no -a $plugin_allowed = yes ; then
+ test_sdlout
+ if test $have_sdlout = yes ; then
+ OUTPUT_PLUGINS="$OUTPUT_PLUGINS sdlout"
+ elif test $enable_sdlout = yes ; then
+ as_fn_error $? "Missing dependency for SDL Output" "$LINENO" 5
+ else
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: SDL Output disabled due to missing dependency" >&5
+printf "%s\n" "$as_me: WARNING: SDL Output disabled due to missing dependency" >&2;}
+ fi
+ fi
+
+
+
+if test "x$OUTPUT_PLUGINS" = "x" ; then
+ as_fn_error $? "No output plugin was enabled. Please install the necessary packages for your system and run configure again." "$LINENO" 5
 fi
 
 
-# Check whether --enable-ladspa was given.
-if test "${enable_ladspa+set}" = set; then :
- enableval=$enable_ladspa; enable_ladspa=$enableval
-else
- enable_ladspa="yes"
+# Check whether --enable-filewriter was given.
+if test ${enable_filewriter+y}
+then :
+ enableval=$enable_filewriter; enable_filewriter=$enableval
+else case e in #(
+ e) enable_filewriter=yes
+ ;;
+esac
 fi
 
 
-if test "x$enable_ladspa" != "xno"; then
- EFFECT_PLUGINS="$EFFECT_PLUGINS ladspa"
+if test "x$enable_filewriter" != "xno"; then
+ OUTPUT_PLUGINS="$OUTPUT_PLUGINS filewriter"
 fi
 
+# Check whether --enable-filewriter_mp3 was given.
+if test ${enable_filewriter_mp3+y}
+then :
+ enableval=$enable_filewriter_mp3; enable_filewriter_mp3=$enableval
+else case e in #(
+ e) enable_filewriter_mp3=auto
+ ;;
+esac
+fi
 
-# Check whether --enable-blur_scope was given.
-if test "${enable_blur_scope+set}" = set; then :
- enableval=$enable_blur_scope; enable_blur_scope=$enableval
-else
- enable_blur_scope="yes"
+
+have_lame=no
+if test "x$enable_filewriter" = "xyes" -a "x$enable_filewriter_mp3" != "xno"; then
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for lame_get_id3v2_tag in -lmp3lame" >&5
+printf %s "checking for lame_get_id3v2_tag in -lmp3lame... " >&6; }
+if test ${ac_cv_lib_mp3lame_lame_get_id3v2_tag+y}
+then :
+ printf %s "(cached) " >&6
+else case e in #(
+ e) ac_check_lib_save_LIBS=$LIBS
+LIBS="-lmp3lame -lm
+ $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.
+ The 'extern "C"' is for builds by C++ compilers;
+ although this is not generally supported in C code supporting it here
+ has little cost and some practical benefit (sr 110532). */
+#ifdef __cplusplus
+extern "C"
+#endif
+char lame_get_id3v2_tag (void);
+int
+main (void)
+{
+return lame_get_id3v2_tag ();
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"
+then :
+ ac_cv_lib_mp3lame_lame_get_id3v2_tag=yes
+else case e in #(
+ e) ac_cv_lib_mp3lame_lame_get_id3v2_tag=no ;;
+esac
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.beam \
+ conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS ;;
+esac
 fi
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mp3lame_lame_get_id3v2_tag" >&5
+printf "%s\n" "$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
 
+printf "%s\n" "#define FILEWRITER_MP3 1" >>confdefs.h
+
+ FILEWRITER_LIBS="$FILEWRITER_LIBS -lmp3lame"
+else case e in #(
+ e) 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 ;;
+esac
+fi
 
-if test "x$enable_blur_scope" != "xno"; then
- VISUALIZATION_PLUGINS="$VISUALIZATION_PLUGINS blur_scope"
 fi
 
 
-# Check whether --enable-cairo_spectrum was given.
-if test "${enable_cairo_spectrum+set}" = set; then :
- enableval=$enable_cairo_spectrum; enable_cairo_spectrum=$enableval
-else
- enable_cairo_spectrum="yes"
+if test "x$enable_filewriter" = "xyes" -a "x$have_vorbis" = "xyes"; then
+
+printf "%s\n" "#define FILEWRITER_VORBIS 1" >>confdefs.h
+
+ FILEWRITER_CFLAGS="$FILEWRITER_CFLAGS $VORBIS_CFLAGS"
+ FILEWRITER_LIBS="$FILEWRITER_LIBS $VORBIS_LIBS"
 fi
 
+if test "x$enable_filewriter" = "xyes" -a "x$have_flac" = "xyes"; then
+
+printf "%s\n" "#define FILEWRITER_FLAC 1" >>confdefs.h
 
-if test "x$enable_cairo_spectrum" != "xno"; then
- VISUALIZATION_PLUGINS="$VISUALIZATION_PLUGINS cairo-spectrum"
+ FILEWRITER_CFLAGS="$FILEWRITER_CFLAGS $LIBFLAC_CFLAGS"
+ FILEWRITER_LIBS="$FILEWRITER_LIBS $LIBFLAC_LIBS"
 fi
 
 
+
+
+
 # Check whether --enable-mac_media_keys was given.
-if test "${enable_mac_media_keys+set}" = set; then :
+if test ${enable_mac_media_keys+y}
+then :
 enableval=$enable_mac_media_keys; enable_mac_media_keys=$enableval
-else
- enable_mac_media_keys="no"
+else case e in #(
+ e) enable_mac_media_keys="no" ;;
+esac
 fi
 
 
@@ -13994,8 +17512,8 @@
 # config.status only pays attention to the cache file if you give it
 # the --recheck option to rerun configure.
 #
-# `ac_cv_env_foo' variables (set or unset) will be overridden when
-# loading this file, other *unset* `ac_cv_foo' will be assigned the
+# 'ac_cv_env_foo' variables (set or unset) will be overridden when
+# loading this file, other *unset* 'ac_cv_foo' will be assigned the
 # following values.
 
 _ACEOF
@@ -14011,8 +17529,8 @@
 case $ac_val in #(
 *${as_nl}*)
 case $ac_var in #(
- *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
-$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
+ *_cv_*) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
+printf "%s\n" "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
 esac
 case $ac_var in #(
 _ | IFS | as_nl) ;; #(
@@ -14025,14 +17543,14 @@
 (set) 2>&1 |
 case $as_nl`(ac_space=' '; set) 2>&1` in #(
 *${as_nl}ac_space=\ *)
- # `set' does not quote correctly, so add quotes: double-quote
+ # 'set' does not quote correctly, so add quotes: double-quote
 # substitution turns \\\\ into \\, and sed turns \\ into \.
 sed -n \
 	"s/'/'\\\\''/g;
 	 s/^\$_$as_cr_alnum*_cv__$as_cr_alnum*\$=\$.*\$/\\1='\\2'/p"
 ;; #(
 *)
- # `set' quotes correctly as required by POSIX, so do not add quotes.
+ # 'set' quotes correctly as required by POSIX, so do not add quotes.
 sed -n "/^_$as_cr_alnum*_cv__$as_cr_alnum*=/p"
 ;;
 esac |
@@ -14042,15 +17560,15 @@
 /^ac_cv_env_/b end
 t clear
 :clear
- s/^$^=*$=$.*{}.*$$/test "${\1+set}" = set || &/
+ s/^$^=*$=$.*{}.*$$/test ${\1+y} || &/
 t end
 s/^$^=*$=$.*$$/\1=${\1=\2}/
 :end' >>confcache
 if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
 if test -w "$cache_file"; then
 if test "x$cache_file" != "x/dev/null"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
-$as_echo "$as_me: updating cache $cache_file" >&6;}
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
+printf "%s\n" "$as_me: updating cache $cache_file" >&6;}
 if test ! -f "$cache_file" || test -h "$cache_file"; then
 	cat confcache >"$cache_file"
 else
@@ -14064,8 +17582,8 @@
 fi
 fi
 else
- { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
-$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
+printf "%s\n" "$as_me: not updating unwritable cache $cache_file" >&6;}
 fi
 fi
 rm -f confcache
@@ -14082,7 +17600,7 @@
 for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
 # 1. Remove the extension, and $U if already installed.
 ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
- ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
+ ac_i=`printf "%s\n" "$ac_i" | sed "$ac_script"`
 # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR
 # will be set to the directory where LIBOBJS objects are built.
 as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext"
@@ -14094,23 +17612,50 @@
 
 
 
-	CC_DEPENDS=$GCC
+# Check whether --enable-year2038 was given.
+if test ${enable_year2038+y}
+then :
+ enableval=$enable_year2038;
+fi
+
+
+		if test x"$GCC" = x"yes"
+then :
+ DEP_CFLAGS='-MD -MF $${out%.o}.dep'
+
+fi
+		if test x"$GXX" = x"yes"
+then :
+ DEP_CXXFLAGS='-MD -MF $${out%.o}.dep'
 
-	CXX_DEPENDS=$GXX
+fi
+		if test x"$GOBJC" = x"yes"
+then :
+ DEP_OBJCFLAGS='-MD -MF $${out%.o}.dep'
 
-	OBJC_DEPENDS=$GOBJC
+fi
+		if test x"$GOBJCXX" = x"yes"
+then :
+ DEP_OBJCXXFLAGS='-MD -MF $${out%.o}.dep'
 
-	OBJCXX_DEPENDS=$GOBJCXX
+fi
 
 
-	# Extract the first word of "tput", so it can be a program name with args.
+
+
+		case "$build_os" in
+		morphos*)
+															;;
+		*)
+			# Extract the first word of "tput", so it can be a program name with args.
 set dummy tput; 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_TPUT+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- case $TPUT in
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+printf %s "checking for $ac_word... " >&6; }
+if test ${ac_cv_path_TPUT+y}
+then :
+ printf %s "(cached) " >&6
+else case e in #(
+ e) case $TPUT in
 \\/* | ?:\\/*)
 ac_cv_path_TPUT="$TPUT" # Let the user override the test with a path.
 ;;
@@ -14119,11 +17664,15 @@
 for as_dir in $PATH
 do
 IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
+ case $as_dir in #(((
+ '') as_dir=./ ;;
+ */) ;;
+ *) as_dir=$as_dir/ ;;
+ esac
 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_TPUT="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+ if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
+ ac_cv_path_TPUT="$as_dir$ac_word$ac_exec_ext"
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
 break 2
 fi
 done
@@ -14131,98 +17680,103 @@
 IFS=$as_save_IFS
 
 ;;
+esac ;;
 esac
 fi
 TPUT=$ac_cv_path_TPUT
 if test -n "$TPUT"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $TPUT" >&5
-$as_echo "$TPUT" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $TPUT" >&5
+printf "%s\n" "$TPUT" >&6; }
 else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+printf "%s\n" "no" >&6; }
 fi
 
 
+			;;
+		esac
 
-	if test x"$TPUT" != x""; then :
+		if test x"$TPUT" != x""
+then :
 
-		if x=$($TPUT el 2>/dev/null); then
-			TERM_EL="$x"
+			if x=$($TPUT el 2>/dev/null); then
+				TERM_EL="$x"
 
-		else
-			TERM_EL="$($TPUT ce 2>/dev/null)"
+			else
+				TERM_EL="$($TPUT ce 2>/dev/null)"
 
-		fi
+			fi
 
-		if x=$($TPUT sgr0 2>/dev/null); then
-			TERM_SGR0="$x"
+			if x=$($TPUT sgr0 2>/dev/null); then
+				TERM_SGR0="$x"
 
-		else
-			TERM_SGR0="$($TPUT me 2>/dev/null)"
+			else
+				TERM_SGR0="$($TPUT me 2>/dev/null)"
 
-		fi
+			fi
 
-		if x=$($TPUT bold 2>/dev/null); then
-			TERM_BOLD="$x"
+			if x=$($TPUT bold 2>/dev/null); then
+				TERM_BOLD="$x"
 
-		else
-			TERM_BOLD="$($TPUT md 2>/dev/null)"
+			else
+				TERM_BOLD="$($TPUT md 2>/dev/null)"
 
-		fi
+			fi
 
-		if x=$($TPUT setaf 1 2>/dev/null); then
-			TERM_SETAF1="$x"
+			if x=$($TPUT setaf 1 2>/dev/null); then
+				TERM_SETAF1="$x"
 
-			TERM_SETAF2="$($TPUT setaf 2 2>/dev/null)"
+				TERM_SETAF2="$($TPUT setaf 2 2>/dev/null)"
 
-			TERM_SETAF3="$($TPUT setaf 3 2>/dev/null)"
+				TERM_SETAF3="$($TPUT setaf 3 2>/dev/null)"
 
-			TERM_SETAF4="$($TPUT setaf 4 2>/dev/null)"
+				TERM_SETAF4="$($TPUT setaf 4 2>/dev/null)"
 
-			TERM_SETAF6="$($TPUT setaf 6 2>/dev/null)"
+				TERM_SETAF6="$($TPUT setaf 6 2>/dev/null)"
 
-		else
-			TERM_SETAF1="$($TPUT AF 1 2>/dev/null)"
+															elif x=$($TPUT setaf 1 0 0 2>/dev/null); then
+				TERM_SETAF1="$x"
 
-			TERM_SETAF2="$($TPUT AF 2 2>/dev/null)"
+				TERM_SETAF2="$($TPUT setaf 2 0 0 2>/dev/null)"
 
-			TERM_SETAF3="$($TPUT AF 3 2>/dev/null)"
+				TERM_SETAF3="$($TPUT setaf 3 0 0 2>/dev/null)"
 
-			TERM_SETAF4="$($TPUT AF 4 2>/dev/null)"
+				TERM_SETAF4="$($TPUT setaf 4 0 0 2>/dev/null)"
 
-			TERM_SETAF6="$($TPUT AF 6 2>/dev/null)"
+				TERM_SETAF6="$($TPUT setaf 6 0 0 2>/dev/null)"
 
-		fi
+			else
+				TERM_SETAF1="$($TPUT AF 1 2>/dev/null)"
 
-else
+				TERM_SETAF2="$($TPUT AF 2 2>/dev/null)"
 
-		TERM_EL='\033\133K'
+				TERM_SETAF3="$($TPUT AF 3 2>/dev/null)"
 
-		TERM_SGR0='\033\133m'
+				TERM_SETAF4="$($TPUT AF 4 2>/dev/null)"
 
-		TERM_BOLD='\033\1331m'
+				TERM_SETAF6="$($TPUT AF 6 2>/dev/null)"
 
-		TERM_SETAF1='\033\13331m'
+			fi
 
-		TERM_SETAF2='\033\13332m'
+fi
 
-		TERM_SETAF3='\033\13333m'
+		if test x"$enable_silent_rules" != x"no"
+then :
 
-		TERM_SETAF4='\033\13334m'
+			SILENT='.SILENT:'
 
-		TERM_SETAF6='\033\13336m'
+			MAKEFLAGS_SILENT='-s'
 
 
 fi
 
 
-
 : "${CONFIG_STATUS=./config.status}"
 ac_write_fail=0
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
-$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
+{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
+printf "%s\n" "$as_me: creating $CONFIG_STATUS" >&6;}
 as_write_fail=0
 cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1
 #! $SHELL
@@ -14245,63 +17799,65 @@
 
 # Be more Bourne compatible
 DUALCASE=1; export DUALCASE # for MKS sh
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
+if test ${ZSH_VERSION+y} && (emulate sh) >/dev/null 2>&1
+then :
 emulate sh
 NULLCMD=:
 # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
 # is contrary to our usage. Disable this feature.
 alias -g '${1+"$@"}'='"$@"'
 setopt NO_GLOB_SUBST
-else
- case `(set -o) 2>/dev/null` in #(
+else case e in #(
+ e) case `(set -o) 2>/dev/null` in #(
 *posix*) :
 set -o posix ;; #(
 *) :
 ;;
+esac ;;
 esac
 fi
 
 
+
+# Reset variables that may have inherited troublesome values from
+# the environment.
+
+# IFS needs to be set, to space, tab, and newline, in precisely that order.
+# (If _AS_PATH_WALK were called with IFS unset, it would have the
+# side effect of setting IFS to empty, thus disabling word splitting.)
+# Quoting is to prevent editors from complaining about space-tab.
 as_nl='
 '
 export as_nl
-# Printing a long string crashes Solaris 7 /usr/bin/printf.
-as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
-as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
-# Prefer a ksh shell builtin over an external printf program on Solaris,
-# but without wasting forks for bash or zsh.
-if test -z "$BASH_VERSION$ZSH_VERSION" \
- && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
- as_echo='print -r --'
- as_echo_n='print -rn --'
-elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
- as_echo='printf %s\n'
- as_echo_n='printf %s'
-else
- if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
- as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
- as_echo_n='/usr/ucb/echo -n'
- else
- as_echo_body='eval expr "X$1" : "X\$.*\$"'
- as_echo_n_body='eval
- arg=$1;
- case $arg in #(
- *"$as_nl"*)
-	expr "X$arg" : "X\$.*\$$as_nl";
-	arg=`expr "X$arg" : ".*$as_nl\$.*\$"`;;
- esac;
- expr "X$arg" : "X\$.*\$" | tr -d "$as_nl"
- '
- export as_echo_n_body
- as_echo_n='sh -c $as_echo_n_body as_echo'
- fi
- export as_echo_body
- as_echo='sh -c $as_echo_body as_echo'
-fi
+IFS=" ""	$as_nl"
+
+PS1='$ '
+PS2='> '
+PS4='+ '
+
+# Ensure predictable behavior from utilities with locale-dependent output.
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
+
+# We cannot yet rely on "unset" to work, but we need these variables
+# to be unset--not just set to an empty or harmless value--now, to
+# avoid bugs in old shells (e.g. pre-3.0 UWIN ksh). This construct
+# also avoids known problems related to "unset" and subshell syntax
+# in other old shells (e.g. bash 2.01 and pdksh 5.2.14).
+for as_var in BASH_ENV ENV MAIL MAILPATH CDPATH
+do eval test \${$as_var+y} \
+ && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
+done
+
+# Ensure that fds 0, 1, and 2 are open.
+if (exec 3>&0) 2>/dev/null; then :; else exec 0</dev/null; fi
+if (exec 3>&1) 2>/dev/null; then :; else exec 1>/dev/null; fi
+if (exec 3>&2) ; then :; else exec 2>/dev/null; fi
 
 # The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
+if ${PATH_SEPARATOR+false} :; then
 PATH_SEPARATOR=:
 (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
 (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
@@ -14310,13 +17866,6 @@
 fi
 
 
-# IFS
-# We need space, tab and new line, in precisely that order. Quoting is
-# there to prevent editors from complaining about space-tab.
-# (If _AS_PATH_WALK were called with IFS unset, it would disable word
-# splitting by setting IFS to empty value.)
-IFS=" ""	$as_nl"
-
 # Find who we are. Look in the path if we contain no directory separator.
 as_myself=
 case $0 in #((
@@ -14325,43 +17874,27 @@
 for as_dir in $PATH
 do
 IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+ case $as_dir in #(((
+ '') as_dir=./ ;;
+ */) ;;
+ *) as_dir=$as_dir/ ;;
+ esac
+ test -r "$as_dir$0" && as_myself=$as_dir$0 && break
 done
 IFS=$as_save_IFS
 
 ;;
 esac
-# We did not find ourselves, most probably we were run as `sh COMMAND'
+# We did not find ourselves, most probably we were run as 'sh COMMAND'
 # in which case we are not to be found in the path.
 if test "x$as_myself" = x; then
 as_myself=$0
 fi
 if test ! -f "$as_myself"; then
- $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+ printf "%s\n" "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
 exit 1
 fi
 
-# Unset variables that we do not need and which cause bugs (e.g. in
-# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1"
-# suppresses any "Segmentation fault" message there. '((' could
-# trigger a bug in pdksh 5.2.14.
-for as_var in BASH_ENV ENV MAIL MAILPATH
-do eval test x\${$as_var+set} = xset \
- && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
-done
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# NLS nuisances.
-LC_ALL=C
-export LC_ALL
-LANGUAGE=C
-export LANGUAGE
-
-# CDPATH.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
 
 # as_fn_error STATUS ERROR LINENO LOG_FD
@@ -14374,9 +17907,9 @@
 as_status=$1; test $as_status -eq 0 && as_status=1
 if test "$4"; then
 as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
- $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+ printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
 fi
- $as_echo "$as_me: error: $2" >&2
+ printf "%s\n" "$as_me: error: $2" >&2
 as_fn_exit $as_status
 } # as_fn_error
 
@@ -14407,22 +17940,25 @@
 { eval $1=; unset $1;}
 }
 as_unset=as_fn_unset
+
 # as_fn_append VAR VALUE
 # ----------------------
 # Append the text in VALUE to the end of the definition contained in VAR. Take
 # advantage of any shell optimizations that allow amortized linear growth over
 # repeated appends, instead of the typical quadratic growth present in naive
 # implementations.
-if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null
+then :
 eval 'as_fn_append ()
 {
 eval $1+=\$2
 }'
-else
- as_fn_append ()
+else case e in #(
+ e) as_fn_append ()
 {
 eval $1=\$$1\$2
- }
+ } ;;
+esac
 fi # as_fn_append
 
 # as_fn_arith ARG...
@@ -14430,16 +17966,18 @@
 # Perform arithmetic evaluation on the ARGs, and store the result in the
 # global $as_val. Take advantage of shells that can avoid forks. The arguments
 # must be portable across $(()) and expr.
-if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null
+then :
 eval 'as_fn_arith ()
 {
 as_val=$(( $* ))
 }'
-else
- as_fn_arith ()
+else case e in #(
+ e) as_fn_arith ()
 {
 as_val=`expr "$@" || test $? -eq 1`
- }
+ } ;;
+esac
 fi # as_fn_arith
 
 
@@ -14466,7 +18004,7 @@
 $as_expr X/"$0" : '.*/$^/^/*$/*$' \| \
 	 X"$0" : 'X$//$$' \| \
 	 X"$0" : 'X$/$' \| . 2>/dev/null ||
-$as_echo X/"$0" |
+printf "%s\n" X/"$0" |
 sed '/^.*\/$^/^/*$\/*$/{
 	 s//\1/
 	 q
@@ -14488,6 +18026,10 @@
 as_cr_digits='0123456789'
 as_cr_alnum=$as_cr_Letters$as_cr_digits
 
+
+# Determine whether it's possible to make 'echo' print without a newline.
+# These variables are no longer used directly by Autoconf, but are AC_SUBSTed
+# for compatibility with existing Makefiles.
 ECHO_C= ECHO_N= ECHO_T=
 case `echo -n x` in #(((((
 -n*)
@@ -14501,6 +18043,12 @@
 ECHO_N='-n';;
 esac
 
+# For backward compatibility with old third-party macros, we provide
+# the shell variables $as_echo and $as_echo_n. New code should use
+# AS_ECHO("message") and AS_ECHO_N("message"), respectively.
+as_echo='printf %s\n'
+as_echo_n='printf %s'
+
 rm -f conf$$ conf$$.exe conf$$.file
 if test -d conf$$.dir; then
 rm -f conf$$.dir/conf$$.file
@@ -14512,9 +18060,9 @@
 if ln -s conf$$.file conf$$ 2>/dev/null; then
 as_ln_s='ln -s'
 # ... but there are two gotchas:
- # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
- # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
- # In both cases, we have to default to `cp -pR'.
+ # 1) On MSYS, both 'ln -s file dir' and 'ln file dir' fail.
+ # 2) DJGPP < 2.04 has no symlinks; 'ln -s' creates a wrapper executable.
+ # In both cases, we have to default to 'cp -pR'.
 ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
 as_ln_s='cp -pR'
 elif ln conf$$.file conf$$ 2>/dev/null; then
@@ -14542,7 +18090,7 @@
 as_dirs=
 while :; do
 case $as_dir in #(
- *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+ *\'*) as_qdir=`printf "%s\n" "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
 *) as_qdir=$as_dir;;
 esac
 as_dirs="'$as_qdir' $as_dirs"
@@ -14551,7 +18099,7 @@
 	 X"$as_dir" : 'X$//$^/' \| \
 	 X"$as_dir" : 'X$//$$' \| \
 	 X"$as_dir" : 'X$/$' \| . 2>/dev/null ||
-$as_echo X"$as_dir" |
+printf "%s\n" X"$as_dir" |
 sed '/^X$.*^/$\/\/*^/^/*\/*$/{
 	 s//\1/
 	 q
@@ -14595,10 +18143,12 @@
 as_executable_p=as_fn_executable_p
 
 # Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%^_$as_cr_alnum%_%g'"
+as_sed_cpp="y%*$as_cr_letters%P$as_cr_LETTERS%;s%^_$as_cr_alnum%_%g"
+as_tr_cpp="eval sed '$as_sed_cpp'" # deprecated
 
 # Sed expression to map a string onto a valid variable name.
-as_tr_sh="eval sed 'y%*+%pp%;s%^_$as_cr_alnum%_%g'"
+as_sed_sh="y%*+%pp%;s%^_$as_cr_alnum%_%g"
+as_tr_sh="eval sed '$as_sed_sh'" # deprecated
 
 
 exec 6>&1
@@ -14613,8 +18163,8 @@
 # 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.6.2, which was
-generated by GNU Autoconf 2.69. Invocation command line was
+This file was extended by audacious-plugins $as_me 4.4.1, which was
+generated by GNU Autoconf 2.72. Invocation command line was
 
 CONFIG_FILES = $CONFIG_FILES
 CONFIG_HEADERS = $CONFIG_HEADERS
@@ -14646,7 +18196,7 @@
 
 cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 ac_cs_usage="\
-\`$as_me' instantiates files and other configuration actions
+'$as_me' instantiates files and other configuration actions
 from templates according to the current configuration. Unless the files
 and actions are specified as TAGs, all are instantiated by default.
 
@@ -14676,14 +18226,16 @@
 Report bugs to the package provider."
 
 _ACEOF
+ac_cs_config=`printf "%s\n" "$ac_configure_args" | sed "$ac_safe_unquote"`
+ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\''/g"`
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/\\""\`\$/\\\\&/g'`"
+ac_cs_config='$ac_cs_config_escaped'
 ac_cs_version="\\
-audacious-plugins config.status 3.6.2
-configured by $0, generated by GNU Autoconf 2.69,
+audacious-plugins config.status 4.4.1
+configured by $0, generated by GNU Autoconf 2.72,
 with options \\"\$ac_cs_config\\"
 
-Copyright (C) 2012 Free Software Foundation, Inc.
+Copyright (C) 2023 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 
@@ -14722,15 +18274,15 @@
 -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
 ac_cs_recheck=: ;;
 --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
- $as_echo "$ac_cs_version"; exit ;;
+ printf "%s\n" "$ac_cs_version"; exit ;;
 --config | --confi | --conf | --con | --co | --c )
- $as_echo "$ac_cs_config"; exit ;;
+ printf "%s\n" "$ac_cs_config"; exit ;;
 --debug | --debu | --deb | --de | --d | -d )
 debug=: ;;
 --file | --fil | --fi | --f )
 $ac_shift
 case $ac_optarg in
- *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+ *\'*) ac_optarg=`printf "%s\n" "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
 '') as_fn_error $? "missing file argument" ;;
 esac
 as_fn_append CONFIG_FILES " '$ac_optarg'"
@@ -14738,23 +18290,23 @@
 --header | --heade | --head | --hea )
 $ac_shift
 case $ac_optarg in
- *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+ *\'*) ac_optarg=`printf "%s\n" "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
 esac
 as_fn_append CONFIG_HEADERS " '$ac_optarg'"
 ac_need_defaults=false;;
 --he | --h)
 # Conflict between --help and --header
- as_fn_error $? "ambiguous option: \`$1'
-Try \`$0 --help' for more information.";;
+ as_fn_error $? "ambiguous option: '$1'
+Try '$0 --help' for more information.";;
 --help | --hel | -h )
- $as_echo "$ac_cs_usage"; exit ;;
+ printf "%s\n" "$ac_cs_usage"; exit ;;
 -q | -quiet | --quiet | --quie | --qui | --qu | --q \
 | -silent | --silent | --silen | --sile | --sil | --si | --s)
 ac_cs_silent=: ;;
 
 # This is an error.
- -*) as_fn_error $? "unrecognized option: \`$1'
-Try \`$0 --help' for more information." ;;
+ -*) as_fn_error $? "unrecognized option: '$1'
+Try '$0 --help' for more information." ;;
 
 *) as_fn_append ac_config_targets " $1"
 ac_need_defaults=false ;;
@@ -14775,7 +18327,7 @@
 if \$ac_cs_recheck; then
 set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
 shift
- \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
+ \printf "%s\n" "running CONFIG_SHELL=$SHELL \$*" >&6
 CONFIG_SHELL='$SHELL'
 export CONFIG_SHELL
 exec "\$@"
@@ -14789,7 +18341,7 @@
 sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
 ## Running $as_me. ##
 _ASBOX
- $as_echo "$ac_log"
+ printf "%s\n" "$ac_log"
 } >&5
 
 _ACEOF
@@ -14798,9 +18350,8 @@
 # INIT-COMMANDS
 #
 # 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"'
+ # POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES, CATALOGS.
+ OBSOLETE_ALL_LINGUAS="$ALL_LINGUAS"
 # Capture the value of LINGUAS because we need it to compute CATALOGS.
 LINGUAS="${LINGUAS-%UNSET%}"
 
@@ -14818,7 +18369,7 @@
 "buildsys.mk") CONFIG_FILES="$CONFIG_FILES buildsys.mk" ;;
 "extra.mk") CONFIG_FILES="$CONFIG_FILES extra.mk" ;;
 
- *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
+ *) as_fn_error $? "invalid argument: '$ac_config_target'" "$LINENO" 5;;
 esac
 done
 
@@ -14828,9 +18379,9 @@
 # We use the long form for the default assignment because of an extremely
 # bizarre bug on SunOS 4.1.3.
 if $ac_need_defaults; then
- test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
- test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers
- test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands
+ test ${CONFIG_FILES+y} || CONFIG_FILES=$config_files
+ test ${CONFIG_HEADERS+y} || CONFIG_HEADERS=$config_headers
+ test ${CONFIG_COMMANDS+y} || CONFIG_COMMANDS=$config_commands
 fi
 
 # Have a temporary directory for convenience. Make it in the build tree
@@ -14838,7 +18389,7 @@
 # creating and moving files from /tmp can sometimes cause problems.
 # Hook for its removal unless debugging.
 # Note that there is a small window in which the directory will not be cleaned:
-# after its creation but before its name has been assigned to `$tmp'.
+# after its creation but before its name has been assigned to '$tmp'.
 $debug ||
 {
 tmp= ac_tmp=
@@ -14862,7 +18413,7 @@
 
 # Set up the scripts for CONFIG_FILES section.
 # No need to generate them if there are no CONFIG_FILES.
-# This happens for instance with `./config.status config.h'.
+# This happens for instance with './config.status config.h'.
 if test -n "$CONFIG_FILES"; then
 
 
@@ -15020,13 +18571,13 @@
 
 # Set up the scripts for CONFIG_HEADERS section.
 # No need to generate them if there are no CONFIG_HEADERS.
-# This happens for instance with `./config.status Makefile'.
+# This happens for instance with './config.status Makefile'.
 if test -n "$CONFIG_HEADERS"; then
 cat >"$ac_tmp/defines.awk" <<\_ACAWK ||
 BEGIN {
 _ACEOF
 
-# Transform confdefs.h into an awk script `defines.awk', embedded as
+# Transform confdefs.h into an awk script 'defines.awk', embedded as
 # here-document in config.status, that substitutes the proper values into
 # config.h.in to produce config.h.
 
@@ -15136,7 +18687,7 @@
 esac
 case $ac_mode$ac_tag in
 :FHL*:*);;
- :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;
+ :L* | :C*:*) as_fn_error $? "invalid tag '$ac_tag'" "$LINENO" 5;;
 :FH-) ac_tag=-:-;;
 :FH*) ac_tag=$ac_tag:$ac_tag.in;;
 esac
@@ -15158,33 +18709,33 @@
 -) ac_f="$ac_tmp/stdin";;
 *) # Look for the file first in the build tree, then in the source tree
 	 # (if the path is not absolute). The absolute path cannot be DOS-style,
-	 # because $ac_f cannot contain `:'.
+	 # because $ac_f cannot contain ':'.
 	 test -f "$ac_f" ||
 	 case $ac_f in
 	 \\/$*) false;;
 	 *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
 	 esac ||
-	 as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
+	 as_fn_error 1 "cannot find input file: '$ac_f'" "$LINENO" 5;;
 esac
- case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
+ case $ac_f in *\'*) ac_f=`printf "%s\n" "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
 as_fn_append ac_file_inputs " '$ac_f'"
 done
 
- # Let's still pretend it is `configure' which instantiates (i.e., don't
+ # Let's still pretend it is 'configure' which instantiates (i.e., don't
 # use $as_me), people would be surprised to read:
 # /* config.h. Generated by config.status. */
 configure_input='Generated from '`
-	 $as_echo "$*" | sed 's|^^:*/||;s|:^:*/|, |g'
+	 printf "%s\n" "$*" | sed 's|^^:*/||;s|:^:*/|, |g'
 	`' by configure.'
 if test x"$ac_file" != x-; then
 configure_input="$ac_file. $configure_input"
- { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
-$as_echo "$as_me: creating $ac_file" >&6;}
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
+printf "%s\n" "$as_me: creating $ac_file" >&6;}
 fi
 # Neutralize special characters interpreted by sed in replacement strings.
 case $configure_input in #(
 *\&* | *\|* | *\\* )
- ac_sed_conf_input=`$as_echo "$configure_input" |
+ ac_sed_conf_input=`printf "%s\n" "$configure_input" |
 sed 's/\\\\&|/\\\\&/g'`;; #(
 *) ac_sed_conf_input=$configure_input;;
 esac
@@ -15201,7 +18752,7 @@
 	 X"$ac_file" : 'X$//$^/' \| \
 	 X"$ac_file" : 'X$//$$' \| \
 	 X"$ac_file" : 'X$/$' \| . 2>/dev/null ||
-$as_echo X"$ac_file" |
+printf "%s\n" X"$ac_file" |
 sed '/^X$.*^/$\/\/*^/^/*\/*$/{
 	 s//\1/
 	 q
@@ -15225,9 +18776,9 @@
 case "$ac_dir" in
 .) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
 *)
- ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.\\/||'`
+ ac_dir_suffix=/`printf "%s\n" "$ac_dir" | sed 's|^\.\\/||'`
 # A ".." for each directory in $ac_dir_suffix.
- ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/^\\/*|/..|g;s|/||'`
+ ac_top_builddir_sub=`printf "%s\n" "$ac_dir_suffix" | sed 's|/^\\/*|/..|g;s|/||'`
 case $ac_top_builddir_sub in
 "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
 *) ac_top_build_prefix=$ac_top_builddir_sub/ ;;
@@ -15289,8 +18840,8 @@
 case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
 *datarootdir*) ac_datarootdir_seen=yes;;
 *@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
-$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
+printf "%s\n" "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_datarootdir_hack='
@@ -15303,7 +18854,7 @@
 esac
 _ACEOF
 
-# Neutralize VPATH when `$srcdir' = `.'.
+# Neutralize VPATH when '$srcdir' = '.'.
 # Shell code in configure.ac might set extrasub.
 # FIXME: do we really want to maintain this feature?
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
@@ -15334,9 +18885,9 @@
 { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } &&
 { ac_out=`sed -n '/^	 *datarootdir	 *:*=/p' \
 "$ac_tmp/out"`; test -z "$ac_out"; } &&
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable 'datarootdir'
 which seems to be undefined. Please make sure it is defined" >&5
-$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+printf "%s\n" "$as_me: WARNING: $ac_file contains a reference to the variable 'datarootdir'
 which seems to be undefined. Please make sure it is defined" >&2;}
 
 rm -f "$ac_tmp/stdin"
@@ -15352,27 +18903,27 @@
 #
 if test x"$ac_file" != x-; then
 {
- $as_echo "/* $configure_input */" \
+ printf "%s\n" "/* $configure_input */" >&1 \
 && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs"
 } >"$ac_tmp/config.h" \
 || as_fn_error $? "could not create $ac_file" "$LINENO" 5
 if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
-$as_echo "$as_me: $ac_file is unchanged" >&6;}
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
+printf "%s\n" "$as_me: $ac_file is unchanged" >&6;}
 else
 rm -f "$ac_file"
 mv "$ac_tmp/config.h" "$ac_file" \
 	|| as_fn_error $? "could not create $ac_file" "$LINENO" 5
 fi
 else
- $as_echo "/* $configure_input */" \
+ printf "%s\n" "/* $configure_input */" >&1 \
 && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \
 || as_fn_error $? "could not create -" "$LINENO" 5
 fi
 ;;
 
- :C) { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5
-$as_echo "$as_me: executing $ac_file commands" >&6;}
+ :C) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5
+printf "%s\n" "$as_me: executing $ac_file commands" >&6;}
 ;;
 esac
 
@@ -15415,14 +18966,11 @@
 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_'
+ ALL_LINGUAS=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/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'
+ ALL_LINGUAS=$OBSOLETE_ALL_LINGUAS
 fi
 # Compute POFILES
 # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po)
@@ -15464,7 +19012,9 @@
 # presentlang can be used as a fallback for messages
 # which are not translated in the desiredlang catalog).
 case "$desiredlang" in
- "$presentlang"*) useit=yes;;
+ "$presentlang" | "$presentlang"_* | "$presentlang".* | "$presentlang"@*)
+ useit=yes
+ ;;
 esac
 done
 if test $useit = yes; then
@@ -15505,14 +19055,6 @@
 as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
 
 
-	${as_echo:="echo"} ${as_me:="configure"}": touching .deps files"
-	for i in $(find . -name Makefile); do
-		DEPSFILE="$(dirname $i)/.deps"
-		test -f "$DEPSFILE" && rm "$DEPSFILE"
-		touch -t 0001010000 "$DEPSFILE"
-	done
-
-
 # configure is writing to config.log, and then calls config.status.
 # config.status does its own redirection, appending to config.log.
 # Unfortunately, on DOS this fails, as config.log is still kept open
@@ -15534,8 +19076,8 @@
 $ac_cs_success || as_fn_exit 1
 fi
 if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
-$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
+printf "%s\n" "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
 fi
 
 
@@ -15546,103 +19088,142 @@
 echo
 echo " Install path: $plugindir"
 echo
-echo " Output Plugins"
-echo " --------------"
-echo " Open Sound System (oss4): $have_oss4"
-echo " Advanced Linux Sound Arch. (alsa): $have_alsa"
-echo " Sndio (sndio): $have_sndio"
-echo " CoreAudio (coreaudio): $have_coreaudio"
-echo " PulseAudio (pulse): $have_pulse"
-echo " Jack Audio Connection Kit (jack): $have_jack"
-echo " Simple DirectMedia Layer (sdlout): $have_sdlout"
-echo " Qt Multimedia (qtaudio): $have_qtaudio"
-echo " FileWriter: $have_filewriter"
-echo " -> FileWriter MP3 output part: $have_lame"
-echo " -> FileWriter Vorbis output part: $have_vorbisenc"
-echo " -> FileWriter FLAC output part: $have_writer_flac"
+echo " GTK support: $USE_GTK"
+echo " Qt support: $USE_QT"
 echo
-echo " Input Plugins"
+echo " Audio Formats"
 echo " -------------"
-echo " MPEG-1 Layer I/II/III (mpg123): $enable_mp3"
-echo " MPEG-2/4 AAC (aac): $enable_aac"
-echo " FFaudio (ffaudio): $ffmpeg_variant"
-echo " Module decoder (modplug): $have_modplug"
-echo " MIDI synthesizer (amidi-plug): $have_amidiplug"
-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 " Free Lossless Audio Codec (flacng): $enable_flacng"
-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 " Audio CD: $have_cdaudio"
+echo " Free Lossless Audio Codec: $have_flac"
+echo " Ogg Vorbis: $have_vorbis"
+echo " Opus: $have_opus"
+echo " MIDI (via FluidSynth): $have_amidiplug"
+echo " MPEG-1 Layer I/II/III (via mpg123): $have_mpg123"
+echo " MPEG-2/4 AAC: $have_aac"
+echo " WavPack: $have_wavpack"
+echo
+echo " External Decoders"
+echo " -----------------"
+echo " FFmpeg: $have_ffaudio"
+echo " libsndfile: $have_sndfile"
+echo
+echo " Chiptunes"
+echo " ---------"
 echo " AdLib synthesizer (adplug): $have_adplug"
-echo " WavPack 4.31+ (wavpack): $have_wavpack"
-echo " Metronom: yes"
-echo " VTX Decoder: $enable_vtx"
+echo " Commodore 64 audio (sid): $have_sid"
+echo " Game Music Emu (spc, nsf, gbs, etc.): $have_console"
+echo " ModPlug: $have_modplug"
+echo " OpenMPT: $have_openmpt"
+echo " Nintendo DS audio (xsf): yes"
+echo " PlayStation audio (psf/psf2): yes"
+echo " Vortex Tracker (vtx): yes"
 echo
-echo " General"
-echo " -------"
-echo " Alarm: $USE_GTK"
-echo " Album Art: $USE_GTK"
-echo " Delete from Filesystem: $USE_GTK"
-echo " Linux Infrared Remote Control (LIRC) $have_lirc"
-echo " MPRIS 2 Server: $have_mpris2"
-echo " Playlist Manager: $USE_GTK"
-echo " Search Tool: $USE_GTK"
-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 " Scrobbler 2.0: $have_scrobbler2"
-echo " LyricWiki viewer: $have_lyricwiki"
-echo " Mac Media Keys: $enable_mac_media_keys"
+echo " Other Inputs"
+echo " ------------"
+echo " Metronome: yes"
+echo " Tone Generator: yes"
 echo
-echo " Effect"
-echo " ------"
+echo " Effects"
+echo " -------"
+echo " Background Music yes"
+echo " Bauer stereophonic-to-binaural (bs2b): $have_bs2b"
+echo " Bitcrusher: yes"
 echo " Channel Mixer: yes"
 echo " Crystalizer: yes"
 echo " Dynamic Range Compressor: yes"
 echo " Echo/Surround: yes"
 echo " Extra Stereo: yes"
-echo " LADSPA Host: $enable_ladspa"
-echo " Voice Removal: yes"
-echo " Bauer stereophonic-to-binaural (bs2b): $have_bs2b"
-echo " Sample Rate Converter (resample): $have_resample"
+echo " LADSPA Host (requires GTK): $USE_GTK"
+echo " Sample Rate Converter: $have_resample"
 echo " Silence Removal: yes"
-echo " Speed and Pitch: $have_speedpitch"
 echo " SoX Resampler: $have_soxr"
+echo " Speed and Pitch: $have_speedpitch"
+echo " Voice Removal: yes"
 echo
-echo " Visualization"
-echo " -------------"
-echo " Blur Scope: $enable_blur_scope"
-echo " Cairo Spectrum Analyzer: $enable_cairo_spectrum"
-echo " GTK+ OpenGL Spectrum Analyzer: $have_glspectrum"
-echo " Qt OpenGL Spectrum Analyzer: $have_qtglspectrum"
-echo
-echo " Transport"
-echo " ---------"
-echo " neon-based http/https: $enable_neon"
-echo " libmms-based mms: $have_mms"
-echo " GIO: yes"
+echo " Outputs"
+echo " -------"
+echo " Advanced Linux Sound Architecture: $have_alsa"
+echo " Jack Audio Connection Kit: $have_jack"
+echo " Open Sound System: $have_oss4"
+echo " PipeWire: $have_pipewire"
+echo " PulseAudio: $have_pulse"
+echo " Simple DirectMedia Layer: $have_sdlout"
+echo " Sndio: $have_sndio"
+echo " Win32 waveOut: $HAVE_MSWINDOWS"
+echo " FileWriter: $enable_filewriter"
+echo " -> MP3 encoding: $have_lame"
+echo " -> Vorbis encoding: $have_vorbis"
+echo " -> FLAC encoding: $have_flac"
 echo
-echo " Container"
+echo " Playlists"
 echo " ---------"
-echo " Audacious playlist format (audpl): yes"
-echo " Winamp PLS playlist format (pls): yes"
-echo " M3U playlist format (m3u): yes"
+echo " Cue sheets: $have_cue"
+echo " M3U playlists: yes"
 echo " Microsoft ASX (legacy): yes"
 echo " Microsoft ASX 3.0: yes"
-echo " XML Sharable Playlist Format (xspf): yes"
-echo " CUE playlist format (cue): $have_cue"
+echo " PLS playlists: yes"
+echo " XML Sharable Playlist Format (XSPF): yes"
 echo
-echo " Interfaces"
+echo " Transports"
 echo " ----------"
-echo " GTK (gtkui): $USE_GTK"
-echo " Qt (qtui): $USE_QT"
-echo " Winamp Classic (skins): $USE_GTK"
+echo " FTP, SFTP, SMB (via GIO): yes"
+echo " HTTP/HTTPS (via neon): $have_neon"
+echo " MMS (via libmms): $have_mms"
+echo
+echo " General"
+echo " -------"
+echo " Ampache browser (requires Qt): $have_ampache"
+echo " Delete Files: $USE_GTK_OR_QT"
+echo " libnotify OSD: $have_notify"
+echo " Linux Infrared Remote Control (LIRC): $have_lirc"
+echo " Lyrics Viewer: yes"
+echo " MPRIS 2 Server: $have_mpris2"
+echo " Scrobbler 2.0: $have_scrobbler2"
+echo " Song Change: $have_songchange"
 echo
+
+if test "x$USE_GTK" = "xyes" ; then
+ echo " GTK Support"
+ echo " -----------"
+ echo " GTK Interface: yes"
+ echo " Winamp Classic Interface: yes"
+ echo " Album Art: yes"
+ echo " Blur Scope: yes"
+ echo " OpenGL Spectrum Analyzer: $have_glspectrum"
+ echo " Playlist Manager: yes"
+ echo " Search Tool: yes"
+ echo " Spectrum Analyzer (2D): yes"
+ echo " Status Icon: yes"
+ echo " X11 Global Hotkeys: $have_hotkey"
+ echo " X11 On-Screen Display (aosd): $have_aosd"
+ echo
+fi
+
+if test "x$USE_QT" = "xyes" ; then
+ echo " Qt Support"
+ echo " ----------"
+ echo " Qt Multimedia output: $have_qtaudio"
+ echo " Qt Interface: yes"
+ echo " Winamp Classic Interface: yes"
+ echo " Album Art: yes"
+ echo " Blur Scope: yes"
+ echo " OpenGL Spectrum Analyzer: $have_qtglspectrum"
+ echo " Playlist Manager: yes"
+ echo " Search Tool: yes"
+ echo " Song Info: yes"
+ echo " Spectrum Analyzer (2D): yes"
+ echo " Status Icon: yes"
+ echo " Stream Tuner (experimental): $have_streamtuner"
+ echo " VU Meter: yes"
+ echo " X11 Global Hotkeys: $have_qthotkey"
+ echo
+fi
+
+if test "x$HAVE_DARWIN" = "xyes" ; then
+ echo " macOS Support"
+ echo " -------------"
+ echo " CoreAudio output: $have_coreaudio"
+ echo " Media Keys: $enable_mac_media_keys"
+ echo
+fi
+

audacious-plugins-3.6.2-gtk3.tar.bz2/configure.ac -> audacious-plugins-4.4.1.tar.bz2/configure.ac Changed

@@ -5,8 +5,8 @@
 dnl Initialize
 dnl ==========
 AC_PREREQ(2.59)
-AC_INIT(audacious-plugins, 3.6.2)
-AC_COPYRIGHT(Copyright (C) 2001-2015 Audacious developers and others)
+AC_INIT(audacious-plugins, 4.4.1)
+AC_COPYRIGHT(Copyright (C) 2001-2024 Audacious developers and others)
 
 AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE_NAME", Name of package)
 AC_DEFINE_UNQUOTED(VERSION, "$PACKAGE_VERSION", Version number of package)
@@ -17,11 +17,14 @@
 
 AUD_COMMON_PROGS
 
+BUILDSYS_INIT
 BUILDSYS_SHARED_LIB
+BUILDSYS_PLUGIN
 
 dnl gettext
 dnl =======
 AM_GNU_GETTEXT(external)
+AM_GNU_GETTEXT_VERSION(0.18.1)
 if test "$MSGFMT" = ":" ; then
 AC_MSG_ERROR(msgfmt was not found; have you installed gettext?)
 fi
@@ -31,9 +34,9 @@
 dnl Check for Audacious
 dnl ===================
 
-PKG_CHECK_MODULES(AUDACIOUS, audacious >= 3.6,
+PKG_CHECK_MODULES(AUDACIOUS, audacious >= 4.4,
 ,
- AC_MSG_ERROR(Cannot find Audacious 3.6; have you installed Audacious yet?)
+ AC_MSG_ERROR(Cannot find Audacious 4.4; have you installed Audacious yet?)
 )
 
 CPPFLAGS="$CPPFLAGS $AUDACIOUS_CFLAGS"
@@ -49,8 +52,8 @@
 with_system_libxml2=yes)
 
 if test $with_system_libxml2 = yes ; then
- XML_LIBS="-lxml2"
- XML_CFLAGS="-I/usr/include/libxml2"
+ XML_LIBS=$(xml2-config --libs)
+ XML_CFLAGS=$(xml2-config --cflags)
 AC_SUBST(XML_LIBS)
 AC_SUBST(XML_CFLAGS)
 else
@@ -60,74 +63,541 @@
 PKG_CHECK_MODULES(XML, libxml-2.0)
 fi
 
+dnl Check for json-glib (required for lyrics-gtk)
+dnl =============================================
+
+if test $USE_GTK = yes ; then
+ PKG_CHECK_MODULES(JSON_GLIB, json-glib-1.0 >= 1.0)
+fi
+
 dnl Default Set of Plugins
 dnl ======================
 
-INPUT_PLUGINS="tonegen metronom"
+INPUT_PLUGINS="metronom psf tonegen vtx xsf"
 OUTPUT_PLUGINS=""
-EFFECT_PLUGINS="compressor crossfade crystalizer mixer silence-removal stereo_plugin voice_removal echo_plugin"
+EFFECT_PLUGINS="background_music bitcrusher compressor crossfade crystalizer echo_plugin mixer silence-removal stereo_plugin voice_removal"
 GENERAL_PLUGINS=""
 VISUALIZATION_PLUGINS=""
 CONTAINER_PLUGINS="asx asx3 audpl m3u pls xspf"
 TRANSPORT_PLUGINS="gio"
 
 if test "x$USE_GTK" = "xyes" ; then
- GENERAL_PLUGINS="$GENERAL_PLUGINS alarm albumart delete-files playlist-manager search-tool"
+ EFFECT_PLUGINS="$EFFECT_PLUGINS ladspa"
+ GENERAL_PLUGINS="$GENERAL_PLUGINS albumart lyrics-gtk playlist-manager search-tool statusicon"
 GENERAL_PLUGINS="$GENERAL_PLUGINS gtkui skins"
+ VISUALIZATION_PLUGINS="$VISUALIZATION_PLUGINS blur_scope cairo-spectrum"
 fi
 
 if test "x$USE_QT" = "xyes" ; then
- GENERAL_PLUGINS="$GENERAL_PLUGINS albumart-qt lyricwiki-qt song-info-qt"
- GENERAL_PLUGINS="$GENERAL_PLUGINS qtui"
-fi
+ GENERAL_PLUGINS="$GENERAL_PLUGINS albumart-qt lyrics-qt playlist-manager-qt search-tool-qt song-info-qt statusicon-qt"
+ GENERAL_PLUGINS="$GENERAL_PLUGINS qtui skins-qt"
+ VISUALIZATION_PLUGINS="$VISUALIZATION_PLUGINS blur_scope-qt qt-spectrum vumeter-qt"
+fi
+
+USE_GTK_OR_QT=no
+if test "x$USE_GTK" = "xyes" -o "x$USE_QT" = "xyes" ; then
+ USE_GTK_OR_QT=yes
+ GENERAL_PLUGINS="$GENERAL_PLUGINS delete-files skins-data"
+fi
+
+if test $HAVE_MSWINDOWS = yes ; then
+ OUTPUT_PLUGINS="$OUTPUT_PLUGINS waveout"
+fi
+
+check_allowed () {
+ case $1 in
+ glspectrum|hotkey|aosd)
+ plugin_allowed=$USE_GTK
+ if test $plugin_allowed = no -a $2 = yes ; then
+ AC_MSG_ERROR(--enable-$1 cannot be used without --enable-gtk)
+ fi
+ ;;
+ ampache|qtaudio|qtglspectrum|qthotkey|streamtuner)
+ plugin_allowed=$USE_QT
+ if test $plugin_allowed = no -a $2 = yes ; then
+ AC_MSG_ERROR(--enable-$1 cannot be used without --enable-qt)
+ fi
+ if test $plugin_allowed = yes -a $1 = ampache ; then
+ plugin_allowed=$have_neon
+ if test $plugin_allowed = no -a $2 = yes ; then
+ AC_MSG_ERROR(--enable-$1 cannot be used without --enable-neon)
+ fi
+ fi
+ ;;
+ *)
+ plugin_allowed=yes
+ ;;
+ esac
+}
+
+dnl Enable/disable plugin with pkg-config dependency
+dnl ================================================
+dnl $1 = short name of plugin (e.g. pulse)
+dnl $2 = long name of plugin (e.g. PulseAudio output plugin)
+dnl $3 = enabled by default (auto/yes/no)
+dnl $4 = type of plugin (e.g. OUTPUT)
+dnl $5 = CFLAGS/LIBS prefix (e.g. PULSE)
+dnl $6 = dependency (e.g. libpulse >= 0.9.11)
+
+AC_DEFUN(ENABLE_PLUGIN_WITH_DEP, 
+ AC_ARG_ENABLE($1,
+ AS_HELP_STRING(--enable-$1, enable $2 (default=$3)),
+ enable_$1=$enableval,
+ enable_$1=$3)
+
+ have_$1=no
+ check_allowed $1 $enable_$1
+ if test $enable_$1 != no -a $plugin_allowed = yes ; then
+ PKG_CHECK_MODULES($5, $6, 
+ have_$1=yes
+ $4_PLUGINS="$$4_PLUGINS $1"
+ , 
+ if test $enable_$1 = yes ; then
+ AC_MSG_ERROR(Missing dependency for $2: $6)
+ else
+ AC_MSG_WARN($2 disabled due to missing dependency: $6)
+ fi
+ )
+ fi
+)
 
-dnl Console
-dnl =======
+dnl Enable/disable plugin, first calling test_<name>
+dnl ================================================
+dnl $1 = short name of plugin (e.g. pulse)
+dnl $2 = long name of plugin (e.g. PulseAudio output plugin)
+dnl $3 = enabled by default (auto/yes/no)
+dnl $4 = type of plugin (e.g. OUTPUT)
+
+AC_DEFUN(ENABLE_PLUGIN_WITH_TEST, 
+ AC_ARG_ENABLE($1,
+ AS_HELP_STRING(--enable-$1, enable $2 (default=$3)),
+ enable_$1=$enableval,
+ enable_$1=$3)
+
+ have_$1=no
+ check_allowed $1 $enable_$1
+ if test $enable_$1 != no -a $plugin_allowed = yes ; then
+ test_$1
+ if test $have_$1 = yes ; then
+ $4_PLUGINS="$$4_PLUGINS $1"
+ elif test $enable_$1 = yes ; then
+ AC_MSG_ERROR(Missing dependency for $2)
+ else
+ AC_MSG_WARN($2 disabled due to missing dependency)
+ fi
+ fi
+)
 
-AC_ARG_ENABLE(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 Optional Plugins
+dnl ================
+
+ENABLE_PLUGIN_WITH_DEP(adplug,
+ AdLib support,
+ auto,
+ INPUT,
+ ADLIB,
+ adplug)
+
+if test $have_adplug = yes ; then
+ AC_LANG_PUSH(C++)
+ CPPFLAGS_adplug_backup="${CPPFLAGS}"
+ CPPFLAGS="${CPPFLAGS} ${ADLIB_CFLAGS}"
+ AC_CHECK_HEADERS(adplug/nemuopl.h adplug/wemuopl.h adplug/kemuopl.h, ,
+ , #include <adplug/adplug.h>)
+ CPPFLAGS="${CPPFLAGS_adplug_backup}"
+ AC_LANG_POP(C++)
+fi
+
+ENABLE_PLUGIN_WITH_DEP(cdaudio,
+ audio CD support,
+ auto,
+ INPUT,
+ CDIO,
+ libcdio >= 0.70 libcdio_cdda >= 0.70 libcddb >= 1.2.1)
+
+if test $have_cdaudio = yes ; then
+ GENERAL_PLUGINS="$GENERAL_PLUGINS cd-menu-items"
+ AC_DEFINE(HAVE_LIBCDDB, 1, Define if libcddb is installed)
+fi
+
+ENABLE_PLUGIN_WITH_DEP(flac,
+ FLAC support,
+ yes,
+ INPUT,
+ LIBFLAC,
+ flac >= 1.2.1)
+
+ENABLE_PLUGIN_WITH_DEP(vorbis,
+ Ogg Vorbis support,
+ yes,
+ INPUT,
+ VORBIS,
+ ogg >= 1.0 vorbis >= 1.0 vorbisenc >= 1.0 vorbisfile >= 1.0)
+
+ENABLE_PLUGIN_WITH_DEP(opus,
+ Opus support,
+ yes,
+ INPUT,
+ OPUS,
+ opusfile >= 0.4)
+
+ENABLE_PLUGIN_WITH_DEP(amidiplug,
+ MIDI synthesizer,
+ auto,
+ INPUT,
+ FLUIDSYNTH,
+ fluidsynth >= 1.0.6)
+
+ENABLE_PLUGIN_WITH_DEP(mpg123,
+ MP3 support,
+ yes,
+ INPUT,
+ MPG123,
+ libmpg123 >= 1.12)
+
+test_aac () {
+ AC_CHECK_HEADER(neaacdec.h, have_aac=yes, have_aac=no)
+ AC_CHECK_LIB(faad, NeAACDecInit2, true, have_aac=no)
+}
+
+ENABLE_PLUGIN_WITH_TEST(aac,
+ AAC support,
+ auto,
+ INPUT)
+
+ENABLE_PLUGIN_WITH_DEP(wavpack,
+ WavPack support,
+ yes,
+ INPUT,
+ WAVPACK,
+ wavpack >= 4.31)
+
+ENABLE_PLUGIN_WITH_DEP(ffaudio,
+ FFmpeg decoder,
+ auto,
+ INPUT,
+ FFMPEG,
+ libavcodec >= 56.60.100 libavformat >= 56.40.101 libavutil >= 54.31.100)
+
+ENABLE_PLUGIN_WITH_DEP(sndfile,
+ libsndfile decoder,
+ auto,
+ INPUT,
+ SNDFILE,
+ sndfile >= 0.19)
+
+ENABLE_PLUGIN_WITH_DEP(modplug,
+ ModPlug,
+ auto,
+ INPUT,
+ MODPLUG,
+ libmodplug)
+
+ENABLE_PLUGIN_WITH_DEP(openmpt,
+ libopenmpt,
+ auto,
+ INPUT,
+ OPENMPT,
+ libopenmpt >= 0.2)
+
+ENABLE_PLUGIN_WITH_DEP(sid,
+ Commodore 64 audio,
+ auto,
+ INPUT,
+ SIDPLAYFP,
+ libsidplayfp >= 2.0)
+
+test_console () {
+ AC_CHECK_HEADERS(zlib.h, have_console=yes, have_console=no)
+}
+
+ENABLE_PLUGIN_WITH_TEST(console,
+ Game Music Emu,
+ auto,
+ INPUT)
+
+ENABLE_PLUGIN_WITH_DEP(bs2b,
+ BS2B effect,
+ auto,
+ EFFECT,
+ BS2B,
+ libbs2b >= 3.0.0)
+
+ENABLE_PLUGIN_WITH_DEP(resample,
+ sample rate converter,
+ auto,
+ EFFECT,
+ SAMPLERATE,
+ samplerate)
+
+ENABLE_PLUGIN_WITH_DEP(speedpitch,
+ speed/pitch effect,
+ auto,
+ EFFECT,
+ SAMPLERATE,
+ samplerate)
+
+ENABLE_PLUGIN_WITH_DEP(soxr,
+ SoX resampler,
+ auto,
+ EFFECT,
+ SOXR,
+ soxr)
+
+ENABLE_PLUGIN_WITH_DEP(alsa,
+ ALSA output,
+ auto,
+ OUTPUT,
+ ALSA,
+ alsa >= 1.0.16)
+
+test_jack () {
+ PKG_CHECK_MODULES(JACK, jack >= 1.9.7, have_jack=yes, 
+ PKG_CHECK_MODULES(JACK, jack >= 0.120.1 jack < 1.0, have_jack=yes, have_jack=no)
+ )
+}
+
+ENABLE_PLUGIN_WITH_TEST(jack,
+ JACK output,
+ auto,
+ OUTPUT)
+
+test_oss4 () {
+ OSS_CFLAGS=
+ if test -f "/etc/oss.conf"; then
+ . "/etc/oss.conf"
+ OSS_CFLAGS="-I$OSSLIBDIR/include"
+ fi
+ AC_SUBST(OSS_CFLAGS)
 
-dnl XSF
-dnl =======
+ OLD_CPPFLAGS="$CPPFLAGS"
+ CPPFLAGS="$CPPFLAGS $OSS_CFLAGS"
+ have_oss4=no
+ AC_CHECK_HEADERS(sys/soundcard.h, 
+ have_oss4=yes
+ break
+ )
+ CPPFLAGS="$OLD_CPPFLAGS"
+}
+
+ENABLE_PLUGIN_WITH_TEST(oss4,
+ OSS output,
+ auto,
+ OUTPUT)
+
+ENABLE_PLUGIN_WITH_DEP(pipewire,
+ PipeWire output,
+ auto,
+ OUTPUT,
+ PIPEWIRE,
+ libpipewire-0.3 >= 0.3.26 libspa-0.2 >= 0.2)
+
+ENABLE_PLUGIN_WITH_DEP(pulse,
+ PulseAudio output,
+ auto,
+ OUTPUT,
+ PULSE,
+ libpulse >= 0.9.11)
+
+test_sndio () {
+ PKG_CHECK_MODULES(SNDIO, sndio >= 1.9, 
+ AC_DEFINE(HAVE_SNDIO_1_9, 1, Define if sndio version is >= 1.9)
+ have_sndio=yes
+ , 
+ PKG_CHECK_MODULES(SNDIO, sndio, have_sndio=yes, have_sndio=no)
+ )
+}
+
+ENABLE_PLUGIN_WITH_TEST(sndio,
+ Sndio output,
+ auto,
+ OUTPUT)
+
+test_cue () {
+ PKG_CHECK_MODULES(CUE, libcue >= 2.0, 
+ AC_DEFINE(HAVE_LIBCUE2, 1, Define if libcue version is >= 2.0)
+ have_cue=yes
+ , 
+ PKG_CHECK_MODULES(CUE, libcue, have_cue=yes, have_cue=no)
+ )
+}
+
+ENABLE_PLUGIN_WITH_TEST(cue,
+ cue sheet support,
+ auto,
+ CONTAINER)
+
+ENABLE_PLUGIN_WITH_DEP(neon,
+ HTTP/HTTPS transport,
+ yes,
+ TRANSPORT,
+ NEON,
+ neon >= 0.27)
+
+ENABLE_PLUGIN_WITH_DEP(mms,
+ MMS transport,
+ auto,
+ TRANSPORT,
+ MMS,
+ libmms >= 0.3)
+
+ENABLE_PLUGIN_WITH_DEP(notify,
+ libnotify OSD,
+ auto,
+ GENERAL,
+ NOTIFY,
+ libnotify >= 0.7 gdk-pixbuf-2.0 >= 2.26)
+
+test_lirc () {
+ AC_CHECK_HEADERS(lirc/lirc_client.h, have_lirc=yes, have_lirc=no)
+}
+
+ENABLE_PLUGIN_WITH_TEST(lirc,
+ LIRC support,
+ auto,
+ GENERAL)
+
+test_mpris2 () {
+ if test $HAVE_MSWINDOWS = yes ; then
+ have_mpris2=no
+ else
+ unset have_mpris2
+ AC_CHECK_PROG(have_mpris2, gdbus-codegen, yes, no)
+ fi
+}
 
-AC_ARG_ENABLE(xsf,
- AS_HELP_STRING(--disable-xsf, disable Nintendo DS audio decoder (xsf)),
- enable_xsf=$enableval, enable_xsf="yes")
+ENABLE_PLUGIN_WITH_TEST(mpris2,
+ MPRIS 2 server,
+ auto,
+ GENERAL)
 
-if test "x$enable_xsf" != "xno"; then
- INPUT_PLUGINS="$INPUT_PLUGINS xsf"
-fi
+test_songchange () {
+ if test $HAVE_MSWINDOWS = yes ; then
+ have_songchange=yes
+ else
+ AC_CHECK_HEADERS(sys/wait.h, have_songchange=yes, have_songchange=no)
+ fi
+}
 
-dnl QtAudio
-dnl =======
+ENABLE_PLUGIN_WITH_TEST(songchange,
+ song change plugin,
+ auto,
+ GENERAL)
+
+ENABLE_PLUGIN_WITH_DEP(scrobbler2,
+ Scrobbler 2,
+ auto,
+ GENERAL,
+ CURL,
+ libcurl >= 7.9.7)
 
-AC_ARG_ENABLE(qtaudio,
- AS_HELP_STRING(--disable-qtaudio, disable QtMultimedia output plugin (default=enabled)),
- enable_qtaudio=$enableval,
- enable_qtaudio=auto)
-
-have_qtaudio=no
-if test "x$enable_qtaudio" = "xyes" -o $ "x$USE_QT" = "xyes" -a "x$enable_qtaudio" = "xauto" $; then
- PKG_CHECK_MODULES(QTMULTIMEDIA, Qt5Multimedia, have_qtaudio=yes, have_qtaudio=no)
- if test "x$have_qtaudio" = "xyes"; then
- QTMULTIMEDIA_CFLAGS="$QTMULTIMEDIA_CFLAGS -fPIC"
- OUTPUT_PLUGINS="$OUTPUT_PLUGINS qtaudio"
- elif test "x$enable_qtaudio" = "xyes"; then
- AC_MSG_ERROR(QtAudio output plugin requested but QtMultimedia not found!)
+dnl Optional plugins (GTK-only)
+dnl ===========================
+
+test_glspectrum () {
+ if test $HAVE_DARWIN = yes ; then
+ have_glspectrum=no
+ elif test $HAVE_MSWINDOWS = yes ; then
+ have_glspectrum=yes
+ GL_LIBS="-lopengl32"
+ else
+ AC_CHECK_LIB(GL, glXCreateContext, 
+ have_glspectrum=yes
+ GL_LIBS="-lGL -lX11"
+ , have_glspectrum=no)
 fi
-fi
+ AC_SUBST(GL_LIBS)
+}
+
+ENABLE_PLUGIN_WITH_TEST(glspectrum,
+ OpenGL spectrum analyzer,
+ auto,
+ VISUALIZATION)
+
+if test "x$USE_GTK2" = "xyes"; then
+ GDK_X11_DEP=gdk-x11-2.0
+else
+ GDK_X11_DEP=gdk-x11-3.0
+fi
+
+ENABLE_PLUGIN_WITH_DEP(hotkey,
+ global hotkeys (X11),
+ auto,
+ GENERAL,
+ GDKX11,
+ $GDK_X11_DEP)
+
+ENABLE_PLUGIN_WITH_DEP(aosd,
+ X11 OSD,
+ auto,
+ GENERAL,
+ X11EXT,
+ xrender xcomposite)
+
+dnl Optional plugins (Qt-only)
+dnl ==========================
+
+ENABLE_PLUGIN_WITH_DEP(ampache,
+ Ampache browser,
+ auto,
+ GENERAL,
+ AMPACHE,
+ ampache_browser_1)
+
+if test "x$USE_QT5" = "xyes"; then
+ QT_MULTIMEDIA_DEP=Qt5Multimedia
+ QT_NETWORK_DEP=Qt5Network
+ QT_OPENGL_DEP="Qt5OpenGL >= 5.4"
+ QT_X11_DEP=Qt5X11Extras
+else
+ QT_MULTIMEDIA_DEP=Qt6Multimedia
+ QT_NETWORK_DEP=Qt6Network
+ QT_OPENGL_DEP="Qt6OpenGL Qt6OpenGLWidgets"
+ QT_X11_DEP="Qt6Gui >= 6.2 x11 xcb-proto"
+fi
+
+ENABLE_PLUGIN_WITH_DEP(qtaudio,
+ QtMultimedia output,
+ auto,
+ OUTPUT,
+ QTMULTIMEDIA,
+ $QT_MULTIMEDIA_DEP)
+
+ENABLE_PLUGIN_WITH_DEP(streamtuner,
+ Stream tuner (experimental),
+ no,
+ GENERAL,
+ QTNETWORK,
+ $QT_NETWORK_DEP)
+
+test_qtglspectrum () {
+ PKG_CHECK_MODULES(QTOPENGL, $QT_OPENGL_DEP, 
+ if test $have_glspectrum = yes ; then
+ have_qtglspectrum=yes
+ elif test $HAVE_MSWINDOWS = yes ; then
+ have_qtglspectrum=yes
+ GL_LIBS="-lopengl32"
+ else
+ AC_CHECK_LIB(GL, glBegin, 
+ have_qtglspectrum=yes
+ GL_LIBS="-lGL"
+ , have_qtglspectrum=no)
+ fi
+ AC_SUBST(GL_LIBS)
+ , have_qtglspectrum=no)
+}
+
+ENABLE_PLUGIN_WITH_TEST(qtglspectrum,
+ Qt OpenGL spectrum analyzer,
+ auto,
+ VISUALIZATION)
+
+ENABLE_PLUGIN_WITH_DEP(qthotkey,
+ global hotkeys (X11),
+ auto,
+ GENERAL,
+ QTX11EXTRAS,
+ $QT_X11_DEP)
 
 dnl CoreAudio
 dnl =========
@@ -148,540 +618,29 @@
 AC_MSG_RESULT(*** CoreAudio output plugin disabled per user request ***)
 fi
 
-dnl PulseAudio
-dnl ==========
-
-AC_ARG_ENABLE( pulse,
- AS_HELP_STRING(--disable-pulse, disable PulseAudio output plugin (default=enabled)),
- enable_pulse=$enableval,
- enable_pulse=auto
-)
-
-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",
- 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 ***)
-fi
-
-dnl PSF
-dnl ===
-
-AC_ARG_ENABLE(psf,
- AS_HELP_STRING(--disable-psf, disable PlayStation (psf/psf2) audio decoder),
- enable_psf=$enableval,
- enable_psf=yes)
-
-if test "x$enable_psf" != "xno"; then
- INPUT_PLUGINS="$INPUT_PLUGINS psf"
-fi
-
-dnl MP3 (enabled by default)
-dnl ========================
-
-AC_ARG_ENABLE(mp3,
- AS_HELP_STRING(--disable-mp3, disable MP3 support (default=enabled)),
- enable_mp3=$enableval, enable_mp3=yes)
-
-if test $enable_mp3 = yes ; then
- PKG_CHECK_MODULES(MPG123, libmpg123 >= 1.12)
- INPUT_PLUGINS="$INPUT_PLUGINS mpg123"
-fi
-
-dnl *** Global Hotkey general plugin (only built on X11)
-
-AC_ARG_ENABLE(hotkey,
- AS_HELP_STRING(--disable-hotkey, disable global hotkey plugin (default=enabled)),
- enable_hotkey=$enableval,
- enable_hotkey=auto
-)
-
-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 ***)
-fi
-
-dnl *** Gnome Shortcuts Plugin
-
-AC_ARG_ENABLE(gnomeshortcuts,
- AS_HELP_STRING(--disable-gnomeshortcuts, disable gnome shortcuts (default=enabled)),
- enable_gnomeshortcuts=$enableval,
- enable_gnomeshortcuts=auto
-)
-
-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
- 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 ***)
-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=auto)
-
-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,
- 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,
- AS_HELP_STRING(--enable-statusicon, enable X11 Status Icon plugin (default=disabled)),
- have_statusicon=$enableval, have_statusicon="no")
-
-if test "x$have_statusicon" != "xno"; then
- GENERAL_PLUGINS="$GENERAL_PLUGINS statusicon"
-fi
-
-dnl *** Audacious OSD plugin (pangocairo-based)
-
-AC_ARG_ENABLE(aosd,
- AS_HELP_STRING(--disable-aosd, disable Audacious OSD plugin (default=enabled)),
- enable_aosd=$enableval,
- enable_aosd=auto
-)
-
-have_aosd=no
-if test "x$enable_aosd" != "xno"; then
- 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 ***)
- )
-
- 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,
- AS_HELP_STRING(--disable-aosd-xcomp, disable Audacious OSD X Composite Support (default=enabled)),
- enable_aosd_xcomp=$enableval,
- enable_aosd_xcomp=auto
-)
-
-if test "x$have_aosd" != "xyes"; then
- if test "x$enable_aosd_xcomp" = "xyes"; then
- AC_MSG_ERROR(Cannot enable X Composite support for Audacious OSD plugin which is disabled)
- else
- enable_aosd_xcomp=no
- fi
-fi
-
-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,
- 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=auto)),
- enable_mpris2=$enableval, enable_mpris2=auto)
-
-if test $enable_mpris2 = no ; then
-	have_mpris2=no
-else
-	AC_CHECK_PROG(have_mpris2, gdbus-codegen, yes, no)
-	if test $have_mpris2 = yes ; then
-		GENERAL_PLUGINS="$GENERAL_PLUGINS mpris2"
-	elif test $enable_mpris2 = yes ; then
-		AC_MSG_ERROR(MPRIS 2 plugin could not be enabled; check config.log)
-	fi
-fi
-
-dnl *** AdPlug requirement (libbinio)
-
-AC_ARG_ENABLE(adplug,
- AS_HELP_STRING(--disable-adplug, disable AdPlug plugin (default=enabled)),
- enable_adplug=$enableval,
- enable_adplug=auto
-)
-
-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 ***)
-fi
-
-dnl Ogg Vorbis (enabled by default)
-dnl ===============================
-
-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 support (default=enabled)),
- 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)
- INPUT_PLUGINS="$INPUT_PLUGINS vorbis"
-fi
-
-dnl FLAC (enabled by default)
-dnl =========================
-
-AC_ARG_ENABLE(flacng,
- AS_HELP_STRING(--disable-flacng, disable FLAC support (default=enabled)),
- enable_flacng=$enableval, enable_flacng=yes)
-
-if test $enable_flacng = yes ; then
- PKG_CHECK_MODULES(LIBFLAC, flac >= 1.2.1)
- INPUT_PLUGINS="$INPUT_PLUGINS flacng"
-fi
-
-dnl *** WavPack 4.31 support
-
-AC_ARG_ENABLE(wavpack,
- AS_HELP_STRING(--disable-wavpack, disable WavPack input plugin (default=enabled)),
- enable_wavpack=$enableval,
- enable_wavpack=auto
-)
-
-have_wavpack=no
-if test "x$enable_wavpack" != "xno"; then
- PKG_CHECK_MODULES(WAVPACK, wavpack >= 4.31,
- 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 ***)
-fi
-
-dnl AAC (enabled by default)
-dnl ========================
-
-AC_ARG_ENABLE(aac,
- AS_HELP_STRING(--disable-aac, disable AAC support (default=enabled)),
- enable_aac=$enableval, enable_aac=yes)
-
-if test $enable_aac = yes ; then
- AC_CHECK_HEADER(neaacdec.h, have_aac=yes, have_aac=no)
- AC_CHECK_LIB(faad, NeAACDecInit2, have_aac=$have_aac, have_aac=no)
-
- if test $have_aac != yes ; then
- AC_MSG_ERROR(Please install libfaad, or use --disable-aac to disable AAC support.)
- fi
-
- FAAD_CFLAGS=
- FAAD_LIBS="-lfaad"
- AC_SUBST(FAAD_CFLAGS)
- AC_SUBST(FAAD_LIBS)
-
- INPUT_PLUGINS="$INPUT_PLUGINS aac-raw"
-fi
-
-dnl *** sndfile
-
-AC_ARG_ENABLE(sndfile,
- AS_HELP_STRING(--disable-sndfile, disable sndfile extensions. default=enabled),
- enable_sndfile=$enableval,
- enable_sndfile=auto
-)
-
-have_sndfile=no
-if test "x$enable_sndfile" != "xno"; then
- PKG_CHECK_MODULES(SNDFILE, sndfile >= 0.19,
- 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 ***)
-fi
-
-dnl *** modplug
-
-AC_ARG_ENABLE(modplug,
- AS_HELP_STRING(--disable-modplug, disable ModPlug plugin (default=enabled)),
- enable_modplug=$enableval,
- enable_modplug=auto
-)
-
-have_modplug=no
-if test "x$enable_modplug" != "xno"; then
- PKG_CHECK_MODULES(MODPLUG, libmodplug,
- INPUT_PLUGINS="$INPUT_PLUGINS modplug"
- have_modplug=yes,
- 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
-
-AC_ARG_WITH(ffmpeg,
- AS_HELP_STRING(--with-ffmpeg=ffmpeg,libav,none, choose between FFmpeg, libav, or neither (default=ffmpeg)),
- ffmpeg_variant=$withval,
- ffmpeg_variant=ffmpeg)
-
-if test $ffmpeg_variant = ffmpeg ; then
- PKG_CHECK_MODULES(FFMPEG, libavcodec >= 53.40.0 libavformat >= 53.21.0 libavutil >= 51.27.0,
- INPUT_PLUGINS="$INPUT_PLUGINS ffaudio"
- AC_DEFINE(HAVE_FFMPEG, 1, Define if using FFmpeg),
- AC_MSG_ERROR(FFmpeg is not installed or too old (required: libavcodec 53.40.0, libavformat 53.21.0, libavutil 51.27.0). Use --with-ffmpeg=none to disable the ffaudio plugin or --with-ffmpeg=libav to use libav instead.))
-elif test $ffmpeg_variant = libav ; then
- PKG_CHECK_MODULES(FFMPEG, libavcodec >= 53.25.0 libavformat >= 53.15.0 libavutil >= 51.18.0,
- INPUT_PLUGINS="$INPUT_PLUGINS ffaudio"
- AC_DEFINE(HAVE_LIBAV, 1, Define if using libav),
- AC_MSG_ERROR(libav is not installed or too old (required: libavcodec 53.25.0, libavformat 53.15.0, libavutil 51.18.0).))
-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=auto)
-
-have_jack=no
-if test "x$enable_jack" != "xno"; then
- PKG_CHECK_MODULES(JACK, jack >= 1.9.7,
- have_jack=yes,
- PKG_CHECK_MODULES(JACK, jack >= 0.120.1 jack < 1.0,
- have_jack=yes,
- have_jack=no)
- )
-
- if test "x$have_jack" = "xyes"; then
- OUTPUT_PLUGINS="$OUTPUT_PLUGINS jack-ng"
- elif test "x$enable_jack" = "xyes"; then
- AC_MSG_ERROR(Cannot find JACK (ver >= 0.120.1 but < 1.0 or >= 1.9.7) development files, but compilation of JACK output plugin has been explicitly requested; please install JACK dev files and run configure again)
- fi
-fi
-
-dnl *** sid
-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 ***)
-fi
-
-dnl OSS output
-dnl ==========
-
-AC_ARG_ENABLE(oss4,
- AS_HELP_STRING(--disable-oss4, disable OSS4 output plugin),
- enable_oss4=$enableval, enable_oss4=auto)
-
-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"
- fi
-
- OLD_CPPFLAGS="$CPPFLAGS"
- CPPFLAGS="$CPPFLAGS $OSS_CFLAGS"
- AC_CHECK_HEADERS(sys/soundcard.h soundcard.h, have_oss4=yes)
- CPPFLAGS="$OLD_CPPFLAGS"
-
- if test "x$have_oss4" = "xyes" ; then
- OUTPUT_PLUGINS="$OUTPUT_PLUGINS oss4"
- AC_SUBST(OSS_CFLAGS)
- elif test "x$enable_oss4" = "xyes" ; then
- AC_MSG_ERROR(OSS4 output was enabled but soundcard.h was not found)
- fi
-
- AC_MSG_RESULT($have_oss4)
-fi
-
-dnl *** ALSA output plugin
-
-AC_ARG_ENABLE(alsa,
- AS_HELP_STRING(--disable-alsa, disable ALSA output plugin),
- enable_alsa=$enableval,
- enable_alsa=auto
-)
-
-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 ***)
-fi
-
 dnl SDL Output
 dnl ==========
 
-AC_ARG_ENABLE(sdlout,
- AS_HELP_STRING(--disable-sdlout, disable SDL output plugin),
- enable_sdlout=$enableval, enable_sdlout=auto)
-
-if test "x$enable_sdlout" != "xno"; then
- AC_ARG_WITH(libsdl,
- AS_HELP_STRING(--with-libsdl=VER, select which SDL version to use. Set VER to 1 for libsdl1, to 2 for libsdl2. @<:@default=check@:>@),
- case "x$withval" in
- x1) ;;
- x2) ;;
- x*) withval=check;;
- esac
- with_libsdl=$withval, with_libsdl=check)
-fi
+AC_ARG_WITH(libsdl,
+ AS_HELP_STRING(--with-libsdl=1,2, select which SDL version to use (default=auto)),
+ with_libsdl=$withval, with_libsdl=auto)
 
-libsdl1_min="1.2.11";
-libsdl2_min="2.0";
-
-have_sdlout=no
-if test "x$enable_sdlout" != "xno"; then
- if test "x$with_libsdl" = "xcheck"; then
- PKG_CHECK_MODULES(SDL, sdl2 >= $libsdl2_min,
- have_sdlout=yes
- OUTPUT_PLUGINS="$OUTPUT_PLUGINS sdlout",
- PKG_CHECK_MODULES(SDL, sdl >= $libsdl1_min,
- have_sdlout=yes
- OUTPUT_PLUGINS="$OUTPUT_PLUGINS sdlout",
- if test "x$enable_sdlout" = "xyes"; then
- AC_MSG_ERROR(Cannot find SDL development files (ver >= $libsdl1_min), but compilation of SDL output plugin has been explicitly requested; please install SDL dev files and run configure again)
- fi))
- elif test "x$with_libsdl" = "x1"; then
- PKG_CHECK_MODULES(SDL, sdl >= $libsdl1_min,
- have_sdlout=yes
- OUTPUT_PLUGINS="$OUTPUT_PLUGINS sdlout",
- if test "x$enable_sdlout" = "xyes"; then
- AC_MSG_ERROR(Cannot find SDL1 development files (ver >= $libsdl1_min), but compilation of SDL output plugin has been explicitly requested; please install SDL1 dev files and run configure again)
- fi)
+test_sdlout () {
+ if test "x$with_libsdl" = "x1"; then
+ PKG_CHECK_MODULES(SDL, sdl >= 1.2.11, have_sdlout=yes, have_sdlout=no)
 elif test "x$with_libsdl" = "x2"; then
- PKG_CHECK_MODULES(SDL, sdl2 >= $libsdl2_min,
- have_sdlout=yes
- OUTPUT_PLUGINS="$OUTPUT_PLUGINS sdlout",
- if test "x$enable_sdlout" = "xyes"; then
- AC_MSG_ERROR(Cannot find SDL2 development files (ver >= $libsdl2_min), but compilation of SDL output plugin has been explicitly requested; please install SDL2 dev files and run configure again)
- fi)
+ PKG_CHECK_MODULES(SDL, sdl2 >= 2.0, have_sdlout=yes, have_sdlout=no)
+ else
+ PKG_CHECK_MODULES(SDL, sdl2 >= 2.0, have_sdlout=yes, 
+ PKG_CHECK_MODULES(SDL, sdl >= 1.2.11, have_sdlout=yes, have_sdlout=no)
+ )
 fi
-fi
-
-dnl *** sndio output
+}
 
-AC_ARG_ENABLE(sndio,
- AS_HELP_STRING(--disable-sndio, disable sndio output plugin (default=enabled)),
- enable_sndio=$enableval,
- enable_sndio=auto
-)
-
-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-ng"
- 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
+ENABLE_PLUGIN_WITH_TEST(sdlout,
+ SDL Output,
+ auto,
+ OUTPUT)
 
 dnl Check for at least one output plugin (not including filewriter)
 dnl ===============================================================
@@ -690,126 +649,6 @@
 AC_MSG_ERROR(No output plugin was enabled. Please install the necessary packages for your system and run configure again.)
 fi
 
-dnl amidi-plug
-dnl ==========
-
-AC_ARG_ENABLE(amidiplug,
- AS_HELP_STRING(--disable-amidiplug, disable amidi-plug input plugin),
- enable_amidiplug=$enableval, enable_amidiplug=auto)
-
-have_amidiplug=no
-if test "x$enable_amidiplug" != "xno"; then
- PKG_CHECK_MODULES(FLUIDSYNTH, fluidsynth >= 1.0.6,
- have_amidiplug=yes
- INPUT_PLUGINS="$INPUT_PLUGINS amidi-plug",
- if test "x$enable_amidiplug" = "xyes"; then
- AC_MSG_ERROR(Cannot find FluidSynth development files (ver >= 1.0.6), but compilation of amidi-plug input plugin has been explicitly requested; please install FluidSynth dev files and run configure again)
- fi)
-fi
-
-dnl Audio CD
-dnl ========
-
-AC_ARG_ENABLE(cdaudio,
- AS_HELP_STRING(--disable-cdaudio, disable cdaudio-ng input plugin (default=enabled)),
- enable_cdaudio_ng=$enableval,
- enable_cdaudio_ng=auto
-)
-
-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 "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 ***
-
-AC_ARG_ENABLE(scrobbler2,
- AS_HELP_STRING(--disable-scrobbler2, disable Scrobbler 2 plugin (default=enabled)),
- enable_scrobbler2=$enableval, enable_scrobbler2=auto)
-
-have_scrobbler2=no
-if test "x$enable_scrobbler2" != "xno"; then
- PKG_CHECK_MODULES(CURL, libcurl >= 7.9.7,
- 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 support (enabled by default)
-dnl ======================================
-
-AC_ARG_ENABLE(neon,
- AS_HELP_STRING(--disable-neon, disable neon HTTP support (default=enabled)),
- enable_neon=$enableval, enable_neon=yes)
-
-if test $enable_neon = yes ; then
- PKG_CHECK_MODULES(NEON, neon >= 0.27)
- TRANSPORT_PLUGINS="$TRANSPORT_PLUGINS neon"
-fi
-
-dnl MMS
-dnl ===
-
-AC_ARG_ENABLE(mms,
-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
- AC_MSG_RESULT(*** mms plugin disabled by request ***)
-fi
-
-dnl CUE
-dnl ---
-
-AC_ARG_ENABLE(cue,
-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
- AC_MSG_RESULT(*** cue plugin disabled by request ***)
-fi
-
 dnl FileWriter
 dnl ==========
 
@@ -819,20 +658,17 @@
 enable_filewriter=yes
 )
 
-have_filewriter=no
 if test "x$enable_filewriter" != "xno"; then
- have_filewriter=yes
 OUTPUT_PLUGINS="$OUTPUT_PLUGINS filewriter"
 fi
 
-
 AC_ARG_ENABLE(filewriter_mp3,
 AS_HELP_STRING(--disable-filewriter_mp3, disable FileWriter MP3 output part (default=enabled)),
 enable_filewriter_mp3=$enableval, enable_filewriter_mp3=auto
 )
 
 have_lame=no
-if test "x$have_filewriter" = "xyes" -a "x$enable_filewriter_mp3" != "xno"; then
+if test "x$enable_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)
@@ -844,227 +680,23 @@
 )
 fi
 
-dnl Vorbis support reuses test done for Vorbis input plugin.
+dnl Vorbis and FLAC support support reuse input plugin checks.
 
-have_vorbisenc=no
-if test "x$have_filewriter" = "xyes" -a "x$enable_vorbis" = "xyes"; then
- have_vorbisenc=yes
+if test "x$enable_filewriter" = "xyes" -a "x$have_vorbis" = "xyes"; then
 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,
- AS_HELP_STRING(--disable-filewriter_flac, disable FileWriter FLAC output part (default=enabled)),
- enable_filewriter_flac=$enableval, enable_filewriter_flac=auto
-)
-
-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$enable_filewriter" = "xyes" -a "x$have_flac" = "xyes"; then
+ AC_DEFINE(FILEWRITER_FLAC, 1, Define if FLAC output part should be built)
+ FILEWRITER_CFLAGS="$FILEWRITER_CFLAGS $LIBFLAC_CFLAGS"
+ FILEWRITER_LIBS="$FILEWRITER_LIBS $LIBFLAC_LIBS"
 fi
 
 AC_SUBST(FILEWRITER_CFLAGS)
 AC_SUBST(FILEWRITER_LIBS)
 
-dnl *** BS2B effect plugin
-
-AC_ARG_ENABLE(bs2b,
- AS_HELP_STRING(--disable-bs2b, disable BS2B effect plugin (default=enabled)),
- enable_bs2b=$enableval,
- enable_bs2b=auto
-)
-
-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 ***)
-fi
-
-dnl *** Resample effect plugin
-
-AC_ARG_ENABLE(resample,
- AS_HELP_STRING(--disable-resample, disable resample effect plugin (default=enabled)),
- enable_resample=$enableval, enable_resample=auto
-)
-
-have_resample=no
-if test "x$enable_resample" != "xno"; then
- PKG_CHECK_MODULES(SAMPLERATE, samplerate,
- 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=auto)
-
-have_speedpitch=no
-if test "x$enable_speedpitch" != "xno"; then
- PKG_CHECK_MODULES(SAMPLERATE, samplerate,
- 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
-
-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 LyricWiki
-dnl =========
-
-AC_ARG_ENABLE(lyricwiki,
- 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
-
-dnl OpenGL Spectrum Analyzer
-dnl ========================
-
-AC_ARG_ENABLE(glspectrum,
- AS_HELP_STRING(--enable-glspectrum, enable OpenGL Spectrum Analyzer (default=auto)),
- enable_glspectrum=$enableval, enable_glspectrum=auto)
-
-have_glspectrum=no
-
-if test $enable_glspectrum != no ; then
- if test $HAVE_MSWINDOWS = yes ; then
- have_glspectrum=yes
- GL_LIBS="-lopengl32"
- else
- AC_CHECK_LIB(GL, glXCreateContext, have_glspectrum=yes, have_glspectrum=no)
- if test $have_glspectrum = yes ; then
- GL_LIBS="-lGL -lX11"
- fi
- fi
-
- if test $enable_glspectrum = yes && test $have_glspectrum = no ; then
- AC_MSG_ERROR(Unable to enable OpenGL Spectrum Analyzer; check config.log)
- fi
-
- if test $have_glspectrum = yes ; then
- VISUALIZATION_PLUGINS="$VISUALIZATION_PLUGINS gl-spectrum"
- fi
-fi
-
-AC_SUBST(GL_LIBS)
-
-dnl Qt OpenGL Spectrum Analyzer
-dnl ===========================
-
-AC_ARG_ENABLE(qtglspectrum,
- AS_HELP_STRING(--disable-qtglspectrum, disable Qt OpenGL Spectrum Analyzer (default=enabled)),
- enable_qtglspectrum=$enableval,
- enable_qtglspectrum=auto)
-
-have_qtglspectrum=no
-if test "x$USE_QT" = "xno" -a "x$enable_qtglspectrum" = "xyes"; then
- AC_MSG_ERROR(--enable-qtglspectrum cannot be used without --enable-qt)
-fi
-if test "x$USE_QT" = "xyes" -a "x$enable_qtglspectrum" != "xno"; then
- PKG_CHECK_MODULES(QTOPENGL, Qt5OpenGL, have_qtglspectrum=yes, have_qtglspectrum=no)
- if test "x$have_qtglspectrum" = "xyes"; then
- QTOPENGL_CFLAGS="$QTOPENGL_CFLAGS -fPIC"
- VISUALIZATION_PLUGINS="$VISUALIZATION_PLUGINS gl-spectrum-qt"
- elif test "x$enable_qtglspectrum" = "xyes"; then
- AC_MSG_ERROR(Qt OpenGL Spectrum Analyzer plugin requested but QtOpenGL not found!)
- fi
-fi
-
-dnl VTX Decoder
-dnl =============
-
-AC_ARG_ENABLE(vtx,
- AS_HELP_STRING(--disable-vtx, disable VTX Decoder),
- enable_vtx=$enableval, enable_vtx="yes")
-
-if test "x$enable_vtx" != "xno"; then
- INPUT_PLUGINS="$INPUT_PLUGINS vtx"
-fi
-
-dnl LADSPA Host
-dnl =============
-
-AC_ARG_ENABLE(ladspa,
- AS_HELP_STRING(--disable-ladspa, disable LADSPA Host),
- enable_ladspa=$enableval, enable_ladspa="yes")
-
-if test "x$enable_ladspa" != "xno"; then
- EFFECT_PLUGINS="$EFFECT_PLUGINS ladspa"
-fi
-
-dnl Blur Scope
-dnl =============
-
-AC_ARG_ENABLE(blur_scope,
- AS_HELP_STRING(--disable-blur-scope, disable Blur Scope),
- enable_blur_scope=$enableval, enable_blur_scope="yes")
-
-if test "x$enable_blur_scope" != "xno"; then
- VISUALIZATION_PLUGINS="$VISUALIZATION_PLUGINS blur_scope"
-fi
-
-dnl Cairo Spectrum Analyzer
-dnl =============
-
-AC_ARG_ENABLE(cairo_spectrum,
- AS_HELP_STRING(--disable-cairo-spectrum, disable Cairo Spectrum Analyzer),
- enable_cairo_spectrum=$enableval, enable_cairo_spectrum="yes")
-
-if test "x$enable_cairo_spectrum" != "xno"; then
- VISUALIZATION_PLUGINS="$VISUALIZATION_PLUGINS cairo-spectrum"
-fi
-
 dnl Mac Media Keys
 dnl ============
 
@@ -1135,103 +767,141 @@
 echo
 echo " Install path: $plugindir"
 echo
-echo " Output Plugins"
-echo " --------------"
-echo " Open Sound System (oss4): $have_oss4"
-echo " Advanced Linux Sound Arch. (alsa): $have_alsa"
-echo " Sndio (sndio): $have_sndio"
-echo " CoreAudio (coreaudio): $have_coreaudio"
-echo " PulseAudio (pulse): $have_pulse"
-echo " Jack Audio Connection Kit (jack): $have_jack"
-echo " Simple DirectMedia Layer (sdlout): $have_sdlout"
-echo " Qt Multimedia (qtaudio): $have_qtaudio"
-echo " FileWriter: $have_filewriter"
-echo " -> FileWriter MP3 output part: $have_lame"
-echo " -> FileWriter Vorbis output part: $have_vorbisenc"
-echo " -> FileWriter FLAC output part: $have_writer_flac"
+echo " GTK support: $USE_GTK"
+echo " Qt support: $USE_QT"
 echo
-echo " Input Plugins"
+echo " Audio Formats"
 echo " -------------"
-echo " MPEG-1 Layer I/II/III (mpg123): $enable_mp3"
-echo " MPEG-2/4 AAC (aac): $enable_aac"
-echo " FFaudio (ffaudio): $ffmpeg_variant"
-echo " Module decoder (modplug): $have_modplug"
-echo " MIDI synthesizer (amidi-plug): $have_amidiplug"
-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 " Free Lossless Audio Codec (flacng): $enable_flacng"
-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 " Audio CD: $have_cdaudio"
+echo " Free Lossless Audio Codec: $have_flac"
+echo " Ogg Vorbis: $have_vorbis"
+echo " Opus: $have_opus"
+echo " MIDI (via FluidSynth): $have_amidiplug"
+echo " MPEG-1 Layer I/II/III (via mpg123): $have_mpg123"
+echo " MPEG-2/4 AAC: $have_aac"
+echo " WavPack: $have_wavpack"
+echo
+echo " External Decoders"
+echo " -----------------"
+echo " FFmpeg: $have_ffaudio"
+echo " libsndfile: $have_sndfile"
+echo
+echo " Chiptunes"
+echo " ---------"
 echo " AdLib synthesizer (adplug): $have_adplug"
-echo " WavPack 4.31+ (wavpack): $have_wavpack"
-echo " Metronom: yes"
-echo " VTX Decoder: $enable_vtx"
+echo " Commodore 64 audio (sid): $have_sid"
+echo " Game Music Emu (spc, nsf, gbs, etc.): $have_console"
+echo " ModPlug: $have_modplug"
+echo " OpenMPT: $have_openmpt"
+echo " Nintendo DS audio (xsf): yes"
+echo " PlayStation audio (psf/psf2): yes"
+echo " Vortex Tracker (vtx): yes"
 echo
-echo " General"
-echo " -------"
-echo " Alarm: $USE_GTK"
-echo " Album Art: $USE_GTK"
-echo " Delete from Filesystem: $USE_GTK"
-echo " Linux Infrared Remote Control (LIRC) $have_lirc"
-echo " MPRIS 2 Server: $have_mpris2"
-echo " Playlist Manager: $USE_GTK"
-echo " Search Tool: $USE_GTK"
-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 " Scrobbler 2.0: $have_scrobbler2"
-echo " LyricWiki viewer: $have_lyricwiki"
-echo " Mac Media Keys: $enable_mac_media_keys"
+echo " Other Inputs"
+echo " ------------"
+echo " Metronome: yes"
+echo " Tone Generator: yes"
 echo
-echo " Effect"
-echo " ------"
+echo " Effects"
+echo " -------"
+echo " Background Music yes"
+echo " Bauer stereophonic-to-binaural (bs2b): $have_bs2b"
+echo " Bitcrusher: yes"
 echo " Channel Mixer: yes"
 echo " Crystalizer: yes"
 echo " Dynamic Range Compressor: yes"
 echo " Echo/Surround: yes"
 echo " Extra Stereo: yes"
-echo " LADSPA Host: $enable_ladspa"
-echo " Voice Removal: yes"
-echo " Bauer stereophonic-to-binaural (bs2b): $have_bs2b"
-echo " Sample Rate Converter (resample): $have_resample"
+echo " LADSPA Host (requires GTK): $USE_GTK"
+echo " Sample Rate Converter: $have_resample"
 echo " Silence Removal: yes"
-echo " Speed and Pitch: $have_speedpitch"
 echo " SoX Resampler: $have_soxr"
+echo " Speed and Pitch: $have_speedpitch"
+echo " Voice Removal: yes"
 echo
-echo " Visualization"
-echo " -------------"
-echo " Blur Scope: $enable_blur_scope"
-echo " Cairo Spectrum Analyzer: $enable_cairo_spectrum"
-echo " GTK+ OpenGL Spectrum Analyzer: $have_glspectrum"
-echo " Qt OpenGL Spectrum Analyzer: $have_qtglspectrum"
-echo
-echo " Transport"
-echo " ---------"
-echo " neon-based http/https: $enable_neon"
-echo " libmms-based mms: $have_mms"
-echo " GIO: yes"
+echo " Outputs"
+echo " -------"
+echo " Advanced Linux Sound Architecture: $have_alsa"
+echo " Jack Audio Connection Kit: $have_jack"
+echo " Open Sound System: $have_oss4"
+echo " PipeWire: $have_pipewire"
+echo " PulseAudio: $have_pulse"
+echo " Simple DirectMedia Layer: $have_sdlout"
+echo " Sndio: $have_sndio"
+echo " Win32 waveOut: $HAVE_MSWINDOWS"
+echo " FileWriter: $enable_filewriter"
+echo " -> MP3 encoding: $have_lame"
+echo " -> Vorbis encoding: $have_vorbis"
+echo " -> FLAC encoding: $have_flac"
 echo
-echo " Container"
+echo " Playlists"
 echo " ---------"
-echo " Audacious playlist format (audpl): yes"
-echo " Winamp PLS playlist format (pls): yes"
-echo " M3U playlist format (m3u): yes"
+echo " Cue sheets: $have_cue"
+echo " M3U playlists: yes"
 echo " Microsoft ASX (legacy): yes"
 echo " Microsoft ASX 3.0: yes"
-echo " XML Sharable Playlist Format (xspf): yes"
-echo " CUE playlist format (cue): $have_cue"
+echo " PLS playlists: yes"
+echo " XML Sharable Playlist Format (XSPF): yes"
 echo
-echo " Interfaces"
+echo " Transports"
 echo " ----------"
-echo " GTK (gtkui): $USE_GTK"
-echo " Qt (qtui): $USE_QT"
-echo " Winamp Classic (skins): $USE_GTK"
+echo " FTP, SFTP, SMB (via GIO): yes"
+echo " HTTP/HTTPS (via neon): $have_neon"
+echo " MMS (via libmms): $have_mms"
 echo
+echo " General"
+echo " -------"
+echo " Ampache browser (requires Qt): $have_ampache"
+echo " Delete Files: $USE_GTK_OR_QT"
+echo " libnotify OSD: $have_notify"
+echo " Linux Infrared Remote Control (LIRC): $have_lirc"
+echo " Lyrics Viewer: yes"
+echo " MPRIS 2 Server: $have_mpris2"
+echo " Scrobbler 2.0: $have_scrobbler2"
+echo " Song Change: $have_songchange"
+echo
+
+if test "x$USE_GTK" = "xyes" ; then
+ echo " GTK Support"
+ echo " -----------"
+ echo " GTK Interface: yes"
+ echo " Winamp Classic Interface: yes"
+ echo " Album Art: yes"
+ echo " Blur Scope: yes"
+ echo " OpenGL Spectrum Analyzer: $have_glspectrum"
+ echo " Playlist Manager: yes"
+ echo " Search Tool: yes"
+ echo " Spectrum Analyzer (2D): yes"
+ echo " Status Icon: yes"
+ echo " X11 Global Hotkeys: $have_hotkey"
+ echo " X11 On-Screen Display (aosd): $have_aosd"
+ echo
+fi
+
+if test "x$USE_QT" = "xyes" ; then
+ echo " Qt Support"
+ echo " ----------"
+ echo " Qt Multimedia output: $have_qtaudio"
+ echo " Qt Interface: yes"
+ echo " Winamp Classic Interface: yes"
+ echo " Album Art: yes"
+ echo " Blur Scope: yes"
+ echo " OpenGL Spectrum Analyzer: $have_qtglspectrum"
+ echo " Playlist Manager: yes"
+ echo " Search Tool: yes"
+ echo " Song Info: yes"
+ echo " Spectrum Analyzer (2D): yes"
+ echo " Status Icon: yes"
+ echo " Stream Tuner (experimental): $have_streamtuner"
+ echo " VU Meter: yes"
+ echo " X11 Global Hotkeys: $have_qthotkey"
+ echo
+fi
+
+if test "x$HAVE_DARWIN" = "xyes" ; then
+ echo " macOS Support"
+ echo " -------------"
+ echo " CoreAudio output: $have_coreaudio"
+ echo " Media Keys: $enable_mac_media_keys"
+ echo
+fi

audacious-plugins-3.6.2-gtk3.tar.bz2/extra.mk.in -> audacious-plugins-4.4.1.tar.bz2/extra.mk.in Changed

@@ -19,24 +19,20 @@
 USE_GTK ?= @USE_GTK@
 USE_QT ?= @USE_QT@
 
+ADLIB_CFLAGS ?= @ADLIB_CFLAGS@
+ADLIB_LIBS ?= @ADLIB_LIBS@
 ALSA_CFLAGS ?= @ALSA_CFLAGS@
 ALSA_LIBS ?= @ALSA_LIBS@
-BINIO_CFLAGS ?= @BINIO_CFLAGS@
-BINIO_LIBS ?= @BINIO_LIBS@
+AMPACHE_CFLAGS ?= @AMPACHE_CFLAGS@
+AMPACHE_LIBS ?= @AMPACHE_LIBS@
 BS2B_CFLAGS ?= @BS2B_CFLAGS@
 BS2B_LIBS ?= @BS2B_LIBS@
 CDIO_LIBS ?= @CDIO_LIBS@
 CDIO_CFLAGS ?= @CDIO_CFLAGS@
-CDDB_LIBS ?= @CDDB_LIBS@
-CDDB_CFLAGS ?= @CDDB_CFLAGS@
 CUE_CFLAGS ?= @CUE_CFLAGS@
 CUE_LIBS ?= @CUE_LIBS@
 CURL_CFLAGS ?= @CURL_CFLAGS@
 CURL_LIBS ?= @CURL_LIBS@
-DBUS_CFLAGS ?= @DBUS_CFLAGS@
-DBUS_LIBS ?= @DBUS_LIBS@
-FAAD_CFLAGS ?= @FAAD_CFLAGS@
-FAAD_LIBS ?= @FAAD_LIBS@
 FFMPEG_CFLAGS ?= @FFMPEG_CFLAGS@
 FFMPEG_LIBS ?= @FFMPEG_LIBS@
 FILEWRITER_CFLAGS ?= @FILEWRITER_CFLAGS@
@@ -56,6 +52,8 @@
 GTK_LIBS ?= @GTK_LIBS@
 JACK_CFLAGS ?= @JACK_CFLAGS@
 JACK_LIBS ?= @JACK_LIBS@
+JSON_GLIB_CFLAGS ?= @JSON_GLIB_CFLAGS@
+JSON_GLIB_LIBS ?= @JSON_GLIB_LIBS@
 LIBFLAC_LIBS ?= @LIBFLAC_LIBS@
 LIBFLAC_CFLAGS ?= @LIBFLAC_CFLAGS@
 MMS_CFLAGS ?= @MMS_CFLAGS@
@@ -68,7 +66,13 @@
 NEON_LIBS ?= @NEON_LIBS@
 NOTIFY_CFLAGS ?= @NOTIFY_CFLAGS@
 NOTIFY_LIBS ?= @NOTIFY_LIBS@
+OPENMPT_CFLAGS ?= @OPENMPT_CFLAGS@
+OPENMPT_LIBS ?= @OPENMPT_LIBS@
+OPUS_CFLAGS ?= @OPUS_CFLAGS@
+OPUS_LIBS ?= @OPUS_LIBS@
 OSS_CFLAGS ?= @OSS_CFLAGS@
+PIPEWIRE_CFLAGS ?= @PIPEWIRE_CFLAGS@
+PIPEWIRE_LIBS ?= @PIPEWIRE_LIBS@
 SAMPLERATE_CFLAGS ?= @SAMPLERATE_CFLAGS@
 SAMPLERATE_LIBS ?= @SAMPLERATE_LIBS@
 SDL_CFLAGS ?= @SDL_CFLAGS@
@@ -77,23 +81,24 @@
 SIDPLAYFP_LIBS ?= @SIDPLAYFP_LIBS@
 SNDFILE_CFLAGS ?= @SNDFILE_CFLAGS@
 SNDFILE_LIBS ?= @SNDFILE_LIBS@
-SNDIO_LIBS ?= @SNDIO_LIBS@
 QT_CFLAGS ?= @QT_CFLAGS@
 QT_LIBS ?= @QT_LIBS@
 QTMULTIMEDIA_CFLAGS ?= @QTMULTIMEDIA_CFLAGS@
 QTMULTIMEDIA_LIBS ?= @QTMULTIMEDIA_LIBS@
 QTOPENGL_CFLAGS ?= @QTOPENGL_CFLAGS@
 QTOPENGL_LIBS ?= @QTOPENGL_LIBS@
+QTNETWORK_CFLAGS ?= @QTNETWORK_CFLAGS@
+QTNETWORK_LIBS ?= @QTNETWORK_LIBS@
+QTX11EXTRAS_CFLAGS ?= @QTX11EXTRAS_CFLAGS@
+QTX11EXTRAS_LIBS ?= @QTX11EXTRAS_LIBS@
 VORBIS_CFLAGS ?= @VORBIS_CFLAGS@
 VORBIS_LIBS ?= @VORBIS_LIBS@
 WAVPACK_CFLAGS ?= @WAVPACK_CFLAGS@
 WAVPACK_LIBS ?= @WAVPACK_LIBS@
-XCOMPOSITE_CFLAGS ?= @XCOMPOSITE_CFLAGS@
-XCOMPOSITE_LIBS ?= @XCOMPOSITE_LIBS@
+X11EXT_CFLAGS ?= @X11EXT_CFLAGS@
+X11EXT_LIBS ?= @X11EXT_LIBS@
 XML_CFLAGS ?= @XML_CFLAGS@
 XML_LIBS ?= @XML_LIBS@
-XRENDER_CFLAGS ?= @XRENDER_CFLAGS@
-XRENDER_LIBS ?= @XRENDER_LIBS@
 
 HAVE_LINUX ?= @HAVE_LINUX@
 HAVE_MSWINDOWS ?= @HAVE_MSWINDOWS@

audacious-plugins-3.6.2-gtk3.tar.bz2/m4/buildsys.m4 -> audacious-plugins-4.4.1.tar.bz2/m4/buildsys.m4 Changed

@@ -1,8 +1,9 @@
 dnl
-dnl Copyright (c) 2007, 2008, 2009, 2010, 2011, 2012
-dnl Jonathan Schleifer <js@webkeks.org>
+dnl Copyright (c) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2016, 2017,
+dnl 2018, 2020, 2021, 2022, 2023, 2024
+dnl Jonathan Schleifer <js@nil.im>
 dnl
-dnl https://webkeks.org/git/?p=buildsys.git
+dnl https://fossil.nil.im/buildsys
 dnl
 dnl Permission to use, copy, modify, and/or distribute this software for any
 dnl purpose with or without fee is hereby granted, provided that the above
@@ -21,81 +22,161 @@
 dnl POSSIBILITY OF SUCH DAMAGE.
 dnl
 
-AC_CONFIG_COMMANDS_PRE(
-	AC_SUBST(CC_DEPENDS, $GCC)
-	AC_SUBST(CXX_DEPENDS, $GXX)
-	AC_SUBST(OBJC_DEPENDS, $GOBJC)
-	AC_SUBST(OBJCXX_DEPENDS, $GOBJCXX)
-
-	AC_PATH_PROG(TPUT, tput)
-
-	AS_IF(test x"$TPUT" != x"", 
-		if x=$($TPUT el 2>/dev/null); then
-			AC_SUBST(TERM_EL, "$x")
-		else
-			AC_SUBST(TERM_EL, "$($TPUT ce 2>/dev/null)")
-		fi
-
-		if x=$($TPUT sgr0 2>/dev/null); then
-			AC_SUBST(TERM_SGR0, "$x")
-		else
-			AC_SUBST(TERM_SGR0, "$($TPUT me 2>/dev/null)")
-		fi
-
-		if x=$($TPUT bold 2>/dev/null); then
-			AC_SUBST(TERM_BOLD, "$x")
-		else
-			AC_SUBST(TERM_BOLD, "$($TPUT md 2>/dev/null)")
-		fi
-
-		if x=$($TPUT setaf 1 2>/dev/null); then
-			AC_SUBST(TERM_SETAF1, "$x")
-			AC_SUBST(TERM_SETAF2, "$($TPUT setaf 2 2>/dev/null)")
-			AC_SUBST(TERM_SETAF3, "$($TPUT setaf 3 2>/dev/null)")
-			AC_SUBST(TERM_SETAF4, "$($TPUT setaf 4 2>/dev/null)")
-			AC_SUBST(TERM_SETAF6, "$($TPUT setaf 6 2>/dev/null)")
-		else
-			AC_SUBST(TERM_SETAF1, "$($TPUT AF 1 2>/dev/null)")
-			AC_SUBST(TERM_SETAF2, "$($TPUT AF 2 2>/dev/null)")
-			AC_SUBST(TERM_SETAF3, "$($TPUT AF 3 2>/dev/null)")
-			AC_SUBST(TERM_SETAF4, "$($TPUT AF 4 2>/dev/null)")
-			AC_SUBST(TERM_SETAF6, "$($TPUT AF 6 2>/dev/null)")
-		fi
-	, 
-		AC_SUBST(TERM_EL, '\033\133K')
-		AC_SUBST(TERM_SGR0, '\033\133m')
-		AC_SUBST(TERM_BOLD, '\033\1331m')
-		AC_SUBST(TERM_SETAF1, '\033\13331m')
-		AC_SUBST(TERM_SETAF2, '\033\13332m')
-		AC_SUBST(TERM_SETAF3, '\033\13333m')
-		AC_SUBST(TERM_SETAF4, '\033\13334m')
-		AC_SUBST(TERM_SETAF6, '\033\13336m')
+AC_DEFUN(BUILDSYS_INIT, 
+	AC_REQUIRE(AC_CANONICAL_BUILD)
+	AC_REQUIRE(AC_CANONICAL_HOST)
+
+	AC_ARG_ENABLE(rpath,
+		AS_HELP_STRING(--disable-rpath, do not use rpath))
+
+	AC_ARG_ENABLE(silent-rules,
+		AS_HELP_STRING(--disable-silent-rules,
+			print executed commands during build))
+
+	case "$build_os" in
+	darwin*)
+		case "$host_os" in
+		darwin*)
+			AC_SUBST(BUILD_AND_HOST_ARE_DARWIN, yes)
+			;;
+		esac
+		;;
+	esac
+
+	AC_PROG_INSTALL
+	case "$INSTALL" in
+	./build-aux/install-sh*)
+		INSTALL="$PWD/$INSTALL"
+		;;
+	esac
+
+	AC_CONFIG_COMMANDS_PRE(
+		AS_IF(test x"$GCC" = x"yes",
+			AC_SUBST(DEP_CFLAGS, '-MD -MF $${out%.o}.dep'))
+		AS_IF(test x"$GXX" = x"yes",
+			AC_SUBST(DEP_CXXFLAGS, '-MD -MF $${out%.o}.dep'))
+		AS_IF(test x"$GOBJC" = x"yes",
+			AC_SUBST(DEP_OBJCFLAGS, '-MD -MF $${out%.o}.dep'))
+		AS_IF(test x"$GOBJCXX" = x"yes",
+			AC_SUBST(DEP_OBJCXXFLAGS, '-MD -MF $${out%.o}.dep'))
+
+		AC_SUBST(AMIGA_LIB_CFLAGS)
+		AC_SUBST(AMIGA_LIB_LDFLAGS)
+
+		case "$build_os" in
+		morphos*)
+			dnl Don't use tput on MorphOS: The colored output is
+			dnl quite unreadable and in some MorphOS versions the
+			dnl output from tput is not 8-bit safe, with awk (for
+			dnl AC_SUBST) failing as a result.
+			;;
+		*)
+			AC_PATH_PROG(TPUT, tput)
+			;;
+		esac
+
+		AS_IF(test x"$TPUT" != x"", 
+			if x=$($TPUT el 2>/dev/null); then
+				AC_SUBST(TERM_EL, "$x")
+			else
+				AC_SUBST(TERM_EL, "$($TPUT ce 2>/dev/null)")
+			fi
+
+			if x=$($TPUT sgr0 2>/dev/null); then
+				AC_SUBST(TERM_SGR0, "$x")
+			else
+				AC_SUBST(TERM_SGR0, "$($TPUT me 2>/dev/null)")
+			fi
+
+			if x=$($TPUT bold 2>/dev/null); then
+				AC_SUBST(TERM_BOLD, "$x")
+			else
+				AC_SUBST(TERM_BOLD, "$($TPUT md 2>/dev/null)")
+			fi
+
+			if x=$($TPUT setaf 1 2>/dev/null); then
+				AC_SUBST(TERM_SETAF1, "$x")
+				AC_SUBST(TERM_SETAF2,
+					"$($TPUT setaf 2 2>/dev/null)")
+				AC_SUBST(TERM_SETAF3,
+					"$($TPUT setaf 3 2>/dev/null)")
+				AC_SUBST(TERM_SETAF4,
+					"$($TPUT setaf 4 2>/dev/null)")
+				AC_SUBST(TERM_SETAF6,
+					"$($TPUT setaf 6 2>/dev/null)")
+			dnl OpenBSD seems to want 3 parameters for terminals
+			dnl ending in -256color, but the additional two
+			dnl parameters don't seem to do anything, so we set
+			dnl them to 0.
+			elif x=$($TPUT setaf 1 0 0 2>/dev/null); then
+				AC_SUBST(TERM_SETAF1, "$x")
+				AC_SUBST(TERM_SETAF2,
+					"$($TPUT setaf 2 0 0 2>/dev/null)")
+				AC_SUBST(TERM_SETAF3,
+					"$($TPUT setaf 3 0 0 2>/dev/null)")
+				AC_SUBST(TERM_SETAF4,
+					"$($TPUT setaf 4 0 0 2>/dev/null)")
+				AC_SUBST(TERM_SETAF6,
+					"$($TPUT setaf 6 0 0 2>/dev/null)")
+			else
+				AC_SUBST(TERM_SETAF1,
+					"$($TPUT AF 1 2>/dev/null)")
+				AC_SUBST(TERM_SETAF2,
+					"$($TPUT AF 2 2>/dev/null)")
+				AC_SUBST(TERM_SETAF3,
+					"$($TPUT AF 3 2>/dev/null)")
+				AC_SUBST(TERM_SETAF4,
+					"$($TPUT AF 4 2>/dev/null)")
+				AC_SUBST(TERM_SETAF6,
+					"$($TPUT AF 6 2>/dev/null)")
+			fi
+		)
+
+		AS_IF(test x"$enable_silent_rules" != x"no", 
+			AC_SUBST(SILENT, '.SILENT:')
+			AC_SUBST(MAKEFLAGS_SILENT, '-s')
+		)
 	)
 )
 
-AC_CONFIG_COMMANDS_POST(
-	${as_echo:="echo"} ${as_me:="configure"}": touching .deps files"
-	for i in $(find . -name Makefile); do
-		DEPSFILE="$(dirname $i)/.deps"
-		test -f "$DEPSFILE" && rm "$DEPSFILE"
-		touch -t 0001010000 "$DEPSFILE"
-	done
+AC_DEFUN(BUILDSYS_CHECK_IOS, 
+	case "$host_os" in
+	darwin*)
+		AC_MSG_CHECKING(whether host is iOS)
+		AC_EGREP_CPP(yes, 
+			#include <TargetConditionals.h>
+
+			#if (defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE) || \
+			 (defined(TARGET_OS_SIMULATOR) && \
+			 TARGET_OS_SIMULATOR)
+			yes
+			#endif
+		, 
+			host_is_ios="yes"
+			AC_SUBST(HOST_IS_IOS, yes)
+		, 
+			host_is_ios="no"
+		)
+		AC_MSG_RESULT($host_is_ios)
+		AC_CHECK_TOOL(CODESIGN, codesign)
+		;;
+	esac
 )
 
 AC_DEFUN(BUILDSYS_PROG_IMPLIB, 
 	AC_REQUIRE(AC_CANONICAL_HOST)
 	AC_MSG_CHECKING(whether we need an implib)
 	case "$host_os" in
-		cygwin* | mingw*)
-			AC_MSG_RESULT(yes)
-			PROG_IMPLIB_NEEDED='yes'
-			PROG_IMPLIB_LDFLAGS='-Wl,-export-all-symbols,--out-implib,lib${PROG}.a'
-			;;
-		*)
-			AC_MSG_RESULT(no)
-			PROG_IMPLIB_NEEDED='no'
-			PROG_IMPLIB_LDFLAGS=''
-			;;
+	cygwin* | mingw*)
+		AC_MSG_RESULT(yes)
+		PROG_IMPLIB_NEEDED='yes'
+		PROG_IMPLIB_LDFLAGS='-Wl,--export-all-symbols,--out-implib,lib${PROG}.a'
+		;;
+	*)
+		AC_MSG_RESULT(no)
+		PROG_IMPLIB_NEEDED='no'
+		PROG_IMPLIB_LDFLAGS=''
+		;;
 	esac
 
 	AC_SUBST(PROG_IMPLIB_NEEDED)
@@ -104,89 +185,209 @@
 
 AC_DEFUN(BUILDSYS_SHARED_LIB, 
 	AC_REQUIRE(AC_CANONICAL_HOST)
-	AC_MSG_CHECKING(for shared library system)
-	case "$host_os" in
-		darwin*)
-			AC_MSG_RESULT(Darwin)
-			LIB_CFLAGS='-fPIC -DPIC -mmacosx-version-min=10.7'
-			LIB_LDFLAGS='-dynamiclib -current_version ${LIB_MAJOR}.${LIB_MINOR} -compatibility_version ${LIB_MAJOR} -mmacosx-version-min=10.7 -install_name "${libdir}/$$(i=${SHARED_LIB}; echo $${i%${LIB_SUFFIX}}).${LIB_MAJOR}${LIB_SUFFIX}"'
-			LIB_PREFIX='lib'
-			LIB_SUFFIX='.dylib'
-			LDFLAGS_RPATH='-Wl,-rpath,${libdir}'
-			PLUGIN_CFLAGS='-fPIC -DPIC -mmacosx-version-min=10.7'
-			PLUGIN_LDFLAGS='-bundle -undefined dynamic_lookup -mmacosx-version-min=10.7'
-			PLUGIN_SUFFIX='.bundle'
-			INSTALL_LIB='&& ${INSTALL} -m 755 $$i ${DESTDIR}${libdir}/$${i%.dylib}.${LIB_MAJOR}.${LIB_MINOR}.dylib && ${LN_S} -f $${i%.dylib}.${LIB_MAJOR}.${LIB_MINOR}.dylib ${DESTDIR}${libdir}/$${i%.dylib}.${LIB_MAJOR}.dylib && ${LN_S} -f $${i%.dylib}.${LIB_MAJOR}.${LIB_MINOR}.dylib ${DESTDIR}${libdir}/$$i'
-			UNINSTALL_LIB='&& rm -f ${DESTDIR}${libdir}/$$i ${DESTDIR}${libdir}/$${i%.dylib}.${LIB_MAJOR}.dylib ${DESTDIR}${libdir}/$${i%.dylib}.${LIB_MAJOR}.${LIB_MINOR}.dylib'
-			CLEAN_LIB=''
-			;;
-		solaris*)
-			AC_MSG_RESULT(Solaris)
-			LIB_CFLAGS='-fPIC -DPIC'
-			LIB_LDFLAGS='-shared -Wl,-soname=${SHARED_LIB}.${LIB_MAJOR}.${LIB_MINOR}'
-			LIB_PREFIX='lib'
-			LIB_SUFFIX='.so'
+	AC_REQUIRE(BUILDSYS_CHECK_IOS)
+	AC_MSG_CHECKING(for shared library type)
+
+	case "$host" in
+	*-*-darwin*)
+		AC_MSG_RESULT(Darwin)
+		LIB_CFLAGS='-fPIC -DPIC'
+		LIB_LDFLAGS='-dynamiclib -current_version ${LIB_MAJOR}.${LIB_MINOR} -compatibility_version ${LIB_MAJOR}'
+		LIB_LDFLAGS_INSTALL_NAME='-Wl,-install_name,${libdir}/$${out%.dylib}.${LIB_MAJOR}.dylib'
+		LIB_PREFIX='lib'
+		LIB_SUFFIX='.dylib'
+		AS_IF(test x"$enable_rpath" != x"no", 
 			LDFLAGS_RPATH='-Wl,-rpath,${libdir}'
-			PLUGIN_CFLAGS='-fPIC -DPIC'
-			PLUGIN_LDFLAGS='-shared'
-			PLUGIN_SUFFIX='.so'
-			INSTALL_LIB='&& ${INSTALL} -m 755 $$i ${DESTDIR}${libdir}/$$i.${LIB_MAJOR}.${LIB_MINOR} && rm -f ${DESTDIR}${libdir}/$$i && ${LN_S} $$i.${LIB_MAJOR}.${LIB_MINOR} ${DESTDIR}${libdir}/$$i'
-			UNINSTALL_LIB='&& rm -f ${DESTDIR}${libdir}/$$i ${DESTDIR}${libdir}/$$i.${LIB_MAJOR}.${LIB_MINOR}'
-			CLEAN_LIB=''
-			;;
-		openbsd* | mirbsd*)
-			AC_MSG_RESULT(OpenBSD)
-			LIB_CFLAGS='-fPIC -DPIC'
-			LIB_LDFLAGS='-shared'
-			LIB_PREFIX='lib'
-			LIB_SUFFIX='.so.${LIB_MAJOR}.${LIB_MINOR}'
+		)
+		INSTALL_LIB='&& ${INSTALL} -m 755 $$i ${DESTDIR}${libdir}/$${i%.dylib}.${LIB_MAJOR}.${LIB_MINOR}.dylib && ${LN_S} -f $${i%.dylib}.${LIB_MAJOR}.${LIB_MINOR}.dylib ${DESTDIR}${libdir}/$${i%.dylib}.${LIB_MAJOR}.dylib && ${LN_S} -f $${i%.dylib}.${LIB_MAJOR}.${LIB_MINOR}.dylib ${DESTDIR}${libdir}/$$i'
+		UNINSTALL_LIB='&& rm -f ${DESTDIR}${libdir}/$$i ${DESTDIR}${libdir}/$${i%.dylib}.${LIB_MAJOR}.dylib ${DESTDIR}${libdir}/$${i%.dylib}.${LIB_MAJOR}.${LIB_MINOR}.dylib'
+		CLEAN_LIB=''
+		;;
+	*-*-mingw* | *-*-cygwin*)
+		AC_MSG_RESULT(MinGW / Cygwin)
+		LIB_CFLAGS=''
+		LIB_LDFLAGS='-shared -Wl,--export-all-symbols'
+		LIB_LDFLAGS_INSTALL_NAME=''
+		LIB_PREFIX=''
+		LIB_SUFFIX='${LIB_MAJOR}.dll'
+		LINK_LIB='&& rm -f lib$${out%${LIB_SUFFIX}}.dll.a && ${LN_S} $$out lib$${out%${LIB_SUFFIX}}.dll.a'
+		INSTALL_LIB='&& ${MKDIR_P} ${DESTDIR}${bindir} && ${INSTALL} -m 755 $$i ${DESTDIR}${bindir}/$$i && ${INSTALL} -m 755 lib$${i%${LIB_SUFFIX}}.dll.a ${DESTDIR}${libdir}/lib$${i%${LIB_SUFFIX}}.dll.a'
+		UNINSTALL_LIB='&& rm -f ${DESTDIR}${bindir}/$$i ${DESTDIR}${libdir}/lib$${i%${LIB_SUFFIX}}.dll.a'
+		CLEAN_LIB='${SHARED_LIB}.a ${SHARED_LIB_NOINST}.a'
+		;;
+	*-*-openbsd* | *-*-mirbsd*)
+		AC_MSG_RESULT(OpenBSD)
+		LIB_CFLAGS='-fPIC -DPIC'
+		LIB_LDFLAGS='-shared'
+		LIB_LDFLAGS_INSTALL_NAME=''
+		LIB_PREFIX='lib'
+		LIB_SUFFIX='.so.${LIB_MAJOR}.${LIB_MINOR}'
+		AS_IF(test x"$enable_rpath" != x"no", 
 			LDFLAGS_RPATH='-Wl,-rpath,${libdir}'
-			PLUGIN_CFLAGS='-fPIC -DPIC'
-			PLUGIN_LDFLAGS='-shared'
-			PLUGIN_SUFFIX='.so'
-			INSTALL_LIB='&& ${INSTALL} -m 755 $$i ${DESTDIR}${libdir}/$$i'
-			UNINSTALL_LIB='&& rm -f ${DESTDIR}${libdir}/$$i'
-			CLEAN_LIB=''
-			;;
-		cygwin* | mingw*)
-			AC_MSG_RESULT(Win32)
-			LIB_CFLAGS=''
-			LIB_LDFLAGS='-shared -Wl,--out-implib,${SHARED_LIB}.a'
-			LIB_PREFIX='lib'
-			LIB_SUFFIX='.dll'
+		)
+		INSTALL_LIB='&& ${INSTALL} -m 755 $$i ${DESTDIR}${libdir}/$$i'
+		UNINSTALL_LIB='&& rm -f ${DESTDIR}${libdir}/$$i'
+		CLEAN_LIB=''
+		;;
+	*-*-solaris*)
+		AC_MSG_RESULT(Solaris)
+		LIB_CFLAGS='-fPIC -DPIC'
+		LIB_LDFLAGS='-shared -Wl,-soname=$$out.${LIB_MAJOR}.${LIB_MINOR}'
+		LIB_LDFLAGS_INSTALL_NAME=''
+		LIB_PREFIX='lib'
+		LIB_SUFFIX='.so'
+		AS_IF(test x"$enable_rpath" != x"no", 
 			LDFLAGS_RPATH='-Wl,-rpath,${libdir}'
-			PLUGIN_CFLAGS=''
-			PLUGIN_LDFLAGS='-shared'
-			PLUGIN_SUFFIX='.dll'
-			INSTALL_LIB='&& ${MKDIR_P} ${DESTDIR}${bindir} && ${INSTALL} -m 755 $$i ${DESTDIR}${bindir}/$$i && ${INSTALL} -m 755 $$i.a ${DESTDIR}${libdir}/$$i.a'
-			UNINSTALL_LIB='&& rm -f ${DESTDIR}${bindir}/$$i ${DESTDIR}${libdir}/$$i.a'
-			CLEAN_LIB='${SHARED_LIB}.a'
-			;;
-		*)
-			AC_MSG_RESULT(GNU)
-			LIB_CFLAGS='-fPIC -DPIC'
-			LIB_LDFLAGS='-shared -Wl,-soname=${SHARED_LIB}.${LIB_MAJOR}'
-			LIB_PREFIX='lib'
-			LIB_SUFFIX='.so'
+		)
+		INSTALL_LIB='&& ${INSTALL} -m 755 $$i ${DESTDIR}${libdir}/$$i.${LIB_MAJOR}.${LIB_MINOR} && rm -f ${DESTDIR}${libdir}/$$i && ${LN_S} $$i.${LIB_MAJOR}.${LIB_MINOR} ${DESTDIR}${libdir}/$$i'
+		UNINSTALL_LIB='&& rm -f ${DESTDIR}${libdir}/$$i ${DESTDIR}${libdir}/$$i.${LIB_MAJOR}.${LIB_MINOR}'
+		CLEAN_LIB=''
+		;;
+	*-*-android*)
+		AC_MSG_RESULT(Android)
+		LIB_CFLAGS='-fPIC -DPIC'
+		LIB_LDFLAGS='-shared -Wl,-soname=$$out.${LIB_MAJOR}'
+		LIB_LDFLAGS_INSTALL_NAME=''
+		LIB_PREFIX='lib'
+		LIB_SUFFIX='.so'
+		INSTALL_LIB='&& ${INSTALL} -m 755 $$i ${DESTDIR}${libdir}/$$i.${LIB_MAJOR}.${LIB_MINOR}.${LIB_PATCH} && ${LN_S} -f $$i.${LIB_MAJOR}.${LIB_MINOR}.${LIB_PATCH} ${DESTDIR}${libdir}/$$i.${LIB_MAJOR} && ${LN_S} -f $$i.${LIB_MAJOR}.${LIB_MINOR}.${LIB_PATCH} ${DESTDIR}${libdir}/$$i'
+		UNINSTALL_LIB='&& rm -f ${DESTDIR}${libdir}/$$i ${DESTDIR}${libdir}/$$i.${LIB_MAJOR} ${DESTDIR}${libdir}/$$i.${LIB_MAJOR}.${LIB_MINOR}.${LIB_PATCH}'
+		CLEAN_LIB=''
+		;;
+	hppa*-*-hpux*)
+		AC_MSG_RESULT(HP-UX (PA-RISC))
+		LIB_CFLAGS='-fPIC -DPIC'
+		LIB_LDFLAGS='-shared -Wl,+h,$$out'
+		LIB_LDFLAGS_INSTALL_NAME=''
+		LIB_PREFIX='lib'
+		LIB_SUFFIX='.${LIB_MAJOR}'
+		LINK_LIB='&& rm -f $${out%%.*}.sl && ${LN_S} $$out $${out%%.*}.sl'
+		AS_IF(test x"$enable_rpath" != x"no", 
+			LDFLAGS_RPATH='-Wl,+b,${libdir}'
+		)
+		INSTALL_LIB='&& ${INSTALL} -m 755 $$i ${DESTDIR}${libdir}/$$i && ${LN_S} -f $$i ${DESTDIR}${libdir}/$${i%%.*}.sl'
+		UNINSTALL_LIB='&& rm -f ${DESTDIR}${libdir}/$$i ${DESTDIR}${libdir}/$${i%%.*}.sl'
+		CLEAN_LIB=''
+		;;
+	ia64*-*-hpux*)
+		AC_MSG_RESULT(HP-UX (Itanium))
+		LIB_CFLAGS='-fPIC -DPIC'
+		LIB_LDFLAGS='-shared -Wl,+h,$$out'
+		LIB_LDFLAGS_INSTALL_NAME=''
+		LIB_PREFIX='lib'
+		LIB_SUFFIX='.${LIB_MAJOR}'
+		LINK_LIB='&& rm -f $${out%%.*}.so && ${LN_S} $$out $${out%%.*}.so'
+		AS_IF(test x"$enable_rpath" != x"no", 
+			LDFLAGS_RPATH='-Wl,+b,${libdir}'
+		)
+		INSTALL_LIB='&& ${INSTALL} -m 755 $$i ${DESTDIR}${libdir}/$$i && ${LN_S} -f $$i ${DESTDIR}${libdir}/$${i%%.*}.so'
+		UNINSTALL_LIB='&& rm -f ${DESTDIR}${libdir}/$$i ${DESTDIR}${libdir}/$${i%%.*}.so'
+		CLEAN_LIB=''
+		;;
+	*)
+		AC_MSG_RESULT(ELF)
+		LIB_CFLAGS='-fPIC -DPIC'
+		LIB_LDFLAGS='-shared -Wl,-soname=$$out.${LIB_MAJOR}'
+		LIB_LDFLAGS_INSTALL_NAME=''
+		LIB_PREFIX='lib'
+		LIB_SUFFIX='.so'
+		AS_IF(test x"$enable_rpath" != x"no", 
 			LDFLAGS_RPATH='-Wl,-rpath,${libdir}'
-			PLUGIN_CFLAGS='-fPIC -DPIC'
-			PLUGIN_LDFLAGS='-shared'
-			PLUGIN_SUFFIX='.so'
-			INSTALL_LIB='&& ${INSTALL} -m 755 $$i ${DESTDIR}${libdir}/$$i.${LIB_MAJOR}.${LIB_MINOR}.0 && ${LN_S} -f $$i.${LIB_MAJOR}.${LIB_MINOR}.0 ${DESTDIR}${libdir}/$$i.${LIB_MAJOR} && ${LN_S} -f $$i.${LIB_MAJOR}.${LIB_MINOR}.0 ${DESTDIR}${libdir}/$$i'
-			UNINSTALL_LIB='&& rm -f ${DESTDIR}${libdir}/$$i ${DESTDIR}${libdir}/$$i.${LIB_MAJOR} ${DESTDIR}${libdir}/$$i.${LIB_MAJOR}.${LIB_MINOR}.0'
-			CLEAN_LIB=''
-			;;
+		)
+		INSTALL_LIB='&& ${INSTALL} -m 755 $$i ${DESTDIR}${libdir}/$$i.${LIB_MAJOR}.${LIB_MINOR}.${LIB_PATCH} && ${LN_S} -f $$i.${LIB_MAJOR}.${LIB_MINOR}.${LIB_PATCH} ${DESTDIR}${libdir}/$$i.${LIB_MAJOR} && ${LN_S} -f $$i.${LIB_MAJOR}.${LIB_MINOR}.${LIB_PATCH} ${DESTDIR}${libdir}/$$i'
+		UNINSTALL_LIB='&& rm -f ${DESTDIR}${libdir}/$$i ${DESTDIR}${libdir}/$$i.${LIB_MAJOR} ${DESTDIR}${libdir}/$$i.${LIB_MAJOR}.${LIB_MINOR}.${LIB_PATCH}'
+		CLEAN_LIB=''
+		;;
 	esac
 
 	AC_SUBST(LIB_CFLAGS)
 	AC_SUBST(LIB_LDFLAGS)
+	AC_SUBST(LIB_LDFLAGS_INSTALL_NAME)
 	AC_SUBST(LIB_PREFIX)
 	AC_SUBST(LIB_SUFFIX)
+	AC_SUBST(LINK_LIB)
 	AC_SUBST(LDFLAGS_RPATH)
-	AC_SUBST(PLUGIN_CFLAGS)
-	AC_SUBST(PLUGIN_LDFLAGS)
-	AC_SUBST(PLUGIN_SUFFIX)
 	AC_SUBST(INSTALL_LIB)
 	AC_SUBST(UNINSTALL_LIB)
 	AC_SUBST(CLEAN_LIB)
 )
+
+AC_DEFUN(BUILDSYS_FRAMEWORK, 
+	AC_REQUIRE(AC_CANONICAL_HOST)
+	AC_REQUIRE(BUILDSYS_CHECK_IOS)
+	AC_REQUIRE(BUILDSYS_SHARED_LIB)
+
+	case "$host_os" in
+	darwin*)
+		FRAMEWORK_LDFLAGS='-dynamiclib -current_version ${LIB_MAJOR}.${LIB_MINOR} -compatibility_version ${LIB_MAJOR}'
+		AS_IF(test x"$host_is_ios" = x"yes", 
+			FRAMEWORK_LDFLAGS_INSTALL_NAME='-Wl,-install_name,@executable_path/Frameworks/$$out/$${out%.framework}'
+		, 
+			FRAMEWORK_LDFLAGS_INSTALL_NAME='-Wl,-install_name,@executable_path/../Frameworks/$$out/$${out%.framework}'
+		)
+
+		AC_SUBST(FRAMEWORK_LDFLAGS)
+		AC_SUBST(FRAMEWORK_LDFLAGS_INSTALL_NAME)
+		AC_SUBST(FRAMEWORK_LIBS)
+
+		$1
+		;;
+	esac
+)
+
+AC_DEFUN(BUILDSYS_PLUGIN, 
+	AC_REQUIRE(AC_CANONICAL_HOST)
+	AC_REQUIRE(BUILDSYS_CHECK_IOS)
+	AC_MSG_CHECKING(for plugin type)
+
+	case "$host" in
+	*-*-darwin*)
+		AC_MSG_RESULT(Darwin)
+		PLUGIN_CFLAGS='-fPIC -DPIC'
+		PLUGIN_LDFLAGS='-bundle'
+		PLUGIN_SUFFIX='.dylib'
+		;;
+	*-*-mingw* | *-*-cygwin*)
+		AC_MSG_RESULT(MinGW / Cygwin)
+		PLUGIN_CFLAGS=''
+		PLUGIN_LDFLAGS='-shared -Wl,--export-all-symbols'
+		PLUGIN_SUFFIX='.dll'
+		;;
+	hppa*-*-hpux*)
+		AC_MSG_RESULT(HP-UX (PA-RISC))
+		PLUGIN_CFLAGS='-fPIC -DPIC'
+		PLUGIN_LDFLAGS='-shared'
+		PLUGIN_SUFFIX='.sl'
+		;;
+	*)
+		AC_MSG_RESULT(ELF)
+		PLUGIN_CFLAGS='-fPIC -DPIC'
+		PLUGIN_LDFLAGS='-shared'
+		PLUGIN_SUFFIX='.so'
+		;;
+	esac
+
+	AC_SUBST(PLUGIN_CFLAGS)
+	AC_SUBST(PLUGIN_LDFLAGS)
+	AC_SUBST(PLUGIN_SUFFIX)
+)
+
+AC_DEFUN(BUILDSYS_BUNDLE, 
+	AC_REQUIRE(AC_CANONICAL_HOST)
+	AC_REQUIRE(BUILDSYS_CHECK_IOS)
+	AC_REQUIRE(BUILDSYS_PLUGIN)
+
+	case "$host_os" in
+	darwin*)
+		AS_IF(test x"$host_is_ios" = x"yes", 
+			LINK_BUNDLE='${MKDIR_P} $$out && ${INSTALL} -m 644 Info.plist $$out/Info.plist && ${LD} -o $$out/$${out%.bundle} ${PLUGIN_OBJS} ${PLUGIN_OBJS_EXTRA} ${PLUGIN_LDFLAGS} ${LDFLAGS} ${LIBS}'
+		, 
+			LINK_BUNDLE='${MKDIR_P} $$out/Contents/MacOS && ${INSTALL} -m 644 Info.plist $$out/Contents/Info.plist && ${LD} -o $$out/Contents/MacOS/$${out%.bundle} ${PLUGIN_OBJS} ${PLUGIN_OBJS_EXTRA} ${PLUGIN_LDFLAGS} ${LDFLAGS} ${LIBS}'
+		)
+
+		AC_SUBST(LINK_BUNDLE)
+
+		$1
+		;;
+	esac
+)

audacious-plugins-4.4.1.tar.bz2/meson.build Added

@@ -0,0 +1,345 @@
+project('audacious-plugins', 'c', 'cpp',
+ version: '4.4.1',
+ meson_version: '>= 0.51',
+ default_options: 
+ 'c_std=gnu99',
+ 'cpp_std=gnu++17',
+ 'warning_level=1'
+ )
+
+
+copyright = 'Copyright (C) 2001-2024 Audacious developers and others'
+
+
+have_darwin = host_machine.system() == 'darwin'
+have_windows = host_machine.system() == 'windows'
+have_cygwin = host_machine.system() == 'cygwin'
+
+
+cc = meson.get_compiler('c')
+cxx = meson.get_compiler('cpp')
+
+if have_darwin
+ add_languages('objc', 'objcpp')
+
+ objc = meson.get_compiler('objc')
+ objcpp = meson.get_compiler('objcpp')
+endif
+
+
+audacious_req = '>= 4.4'
+audacious_dep = dependency('audacious', version: audacious_req, required: true)
+
+
+# XXX - make this its own .pc file
+audtag_dep = declare_dependency(link_args: 
+ '-L@0@'.format(audacious_dep.get_variable(pkgconfig: 'lib_dir')),
+ '-laudtag'
+)
+
+
+# XXX - make this its own .pc file
+audqt_dep = declare_dependency(link_args: 
+ '-L@0@'.format(audacious_dep.get_variable(pkgconfig: 'lib_dir')),
+ '-laudqt'
+)
+
+
+# XXX - make this its own .pc file
+audgui_dep = declare_dependency(link_args: 
+ '-L@0@'.format(audacious_dep.get_variable(pkgconfig: 'lib_dir')),
+ '-laudgui'
+)
+
+
+glib_req = '>= 2.32'
+glib_dep = dependency('glib-2.0', version: glib_req, required: true)
+gmodule_dep = dependency('gmodule-2.0', version: glib_req, required: true)
+zlib_dep = dependency('zlib', required: true)
+
+math_dep = cxx.find_library('m', required: false)
+samplerate_dep = dependency('samplerate', required: false)
+xml_dep = dependency('libxml-2.0', required: false)
+x11_dep = dependency('x11', required: false)
+
+
+if get_option('qt')
+ if get_option('qt5')
+ qt_req = '>= 5.2'
+ qt_dep = dependency('qt5', version: qt_req, required: true, modules: 'Core', 'Widgets', 'Gui')
+ else
+ qt_req = '>= 6.0'
+ qt_dep = dependency('qt6', version: qt_req, required: true, modules: 'Core', 'Widgets', 'Gui')
+ endif
+endif
+
+
+if get_option('gtk')
+ if get_option('gtk2')
+ gtk_req = '>= 2.24'
+ gtk_dep = dependency('gtk+-2.0', version: gtk_req, required: true)
+ else
+ gtk_req = '>= 3.18'
+ gtk_dep = dependency('gtk+-3.0', version: gtk_req, required: true)
+ endif
+endif
+
+
+if cc.get_id() in 'gcc', 'clang'
+ common_flags = 
+ '-ffast-math',
+ '-Wtype-limits',
+ '-Wno-stringop-truncation',
+ '-fvisibility=hidden'
+ 
+
+ cxx_flags = 
+ '-Wno-non-virtual-dtor',
+ '-Woverloaded-virtual'
+ 
+
+ check_cflags = common_flags
+ check_cxxflags = common_flags + cxx_flags
+
+ add_project_arguments(cc.get_supported_arguments(check_cflags), language: 'c')
+ add_project_arguments(cxx.get_supported_arguments(check_cxxflags), language: 'cpp')
+
+ if have_darwin
+ add_project_arguments(objc.get_supported_arguments(check_cflags), language: 'objc')
+ add_project_arguments(objcpp.get_supported_arguments(check_cxxflags), language: 'objcpp')
+ endif
+endif
+
+
+conf = configuration_data()
+conf.set_quoted('COPYRIGHT', copyright)
+conf.set_quoted('PACKAGE', meson.project_name())
+conf.set_quoted('VERSION', meson.project_version())
+conf.set('PACKAGE_VERSION', meson.project_version())
+if host_machine.endian() == 'big'
+ conf.set10('WORDS_BIGENDIAN', true)
+endif
+
+
+# XXX - investigate to see if we can do better
+if have_windows or have_cygwin
+ conf.set_quoted('PLUGIN_SUFFIX', '.dll')
+elif have_darwin
+ conf.set_quoted('PLUGIN_SUFFIX', '.dylib')
+else
+ conf.set_quoted('PLUGIN_SUFFIX', '.so')
+endif
+
+
+if have_windows
+ conf.set('EXPORT', '__declspec(dllexport)')
+elif cxx.has_argument('-fvisibility=default')
+ conf.set('EXPORT', '__attribute__((visibility("default")))')
+else
+ error('Could not define EXPORT keyword for public symbols.')
+endif
+
+
+if meson.version().version_compare('>= 0.59')
+ intl_dep = dependency('intl', required: false)
+ intl_found = intl_dep.found()
+else
+ if cxx.has_function('ngettext', prefix: '#include <libintl.h>')
+ intl_dep = dependency('', required: false)
+ intl_found = true
+ else
+ intl_dep = cxx.find_library('intl', required: false)
+ intl_found = intl_dep.found()
+ endif
+endif
+
+if intl_found
+ conf.set10('HAVE_GETTEXT', true)
+endif
+
+
+install_plugindir = audacious_dep.get_variable(pkgconfig: 'plugin_dir')
+
+
+conf.set_quoted('INSTALL_PLUGINDIR', install_plugindir)
+conf.set('plugindir', install_plugindir)
+
+
+container_plugin_dir = join_paths(install_plugindir, 'Container')
+effect_plugin_dir = join_paths(install_plugindir, 'Effect')
+general_plugin_dir = join_paths(install_plugindir, 'General')
+input_plugin_dir = join_paths(install_plugindir, 'Input')
+output_plugin_dir = join_paths(install_plugindir, 'Output')
+transport_plugin_dir = join_paths(install_plugindir, 'Transport')
+visualization_plugin_dir = join_paths(install_plugindir, 'Visualization')
+
+
+if get_option('qt')
+ conf.set10('USE_QT', true)
+endif
+
+
+if get_option('gtk')
+ conf.set10('USE_GTK', true)
+ if not get_option('gtk2')
+ conf.set10('USE_GTK3', true)
+ endif
+endif
+
+
+if get_option('qt') or get_option('gtk')
+ conf.set10('USE_GTK_OR_QT', true)
+endif
+
+
+subdir('src')
+subdir('po')
+
+
+if meson.version().version_compare('>= 0.53')
+ summary({
+ 'Prefix': get_option('prefix'),
+ 'Bin dir': get_option('bindir'),
+ 'Lib dir': get_option('libdir'),
+ 'Data dir': get_option('datadir'),
+ }, section: 'Directories')
+
+ summary({
+ 'Qt 5 support': get_option('qt5'),
+ 'Qt 6 support': get_option('qt') and not get_option('qt5'),
+ 'GTK 2 support': get_option('gtk2'),
+ 'GTK 3 support': get_option('gtk') and not get_option('gtk2'),
+ }, section: 'GUI Toolkits')
+
+ summary({
+ 'Audio CD': get_variable('have_cdaudio', false),
+ 'Free Lossless Audio Codec': get_variable('have_flac', false),
+ 'Ogg Vorbis': get_variable('have_vorbis', false),
+ 'Opus': get_variable('have_opus', false),
+ 'MIDI (via FluidSynth)': get_variable('have_amidiplug', false),
+ 'MPEG-1 Layer I/II/III (via mpg123)': get_variable('have_mpg123', false),
+ 'MPEG-2/4 AAC': get_variable('have_aac', false),
+ 'WavPack': get_variable('have_wavpack', false),
+ }, section: 'Audio Formats')
+
+ summary({
+ 'FFmpeg': get_variable('have_ffaudio', false),
+ 'Libsndfile': get_variable('have_sndfile', false),
+ }, section: 'External Decoders')
+
+ summary({
+ 'AdLib synthesizer (adplug)': get_variable('have_adplug', false),
+ 'Commodore 64 audio (sid)': get_variable('have_sid', false),
+ 'Game Music Emu (spc, nsf, gbs, etc.)': get_option('console'),
+ 'ModPlug': get_variable('have_modplug', false),
+ 'OpenMPT': get_variable('have_openmpt', false),
+ 'Nintendo DS audio (xsf)': true,
+ 'PlayStation audio (psf/psf2)': true,
+ 'Vortex Tracker (vtx)': true,
+ }, section: 'Chiptunes')
+
+ summary({
+ 'Metronome': true,
+ 'Tone Generator': true,
+ }, section: 'Other Inputs')
+
+ summary({
+ 'Background Music': true,
+ 'Bauer stereophonic-to-binaural (bs2b)': get_variable('have_bs2b', false),
+ 'Bitcrusher': true,
+ 'Channel Mixer': true,
+ 'Crystalizer': true,
+ 'Dynamic Range Compressor': true,
+ 'Echo/Surround': true,
+ 'Extra Stereo': true,
+ 'LADSPA Host (requires GTK)': conf.has('USE_GTK'),
+ 'Sample Rate Converter': get_variable('have_resample', false),
+ 'Silence Removal': true,
+ 'SoX Resampler': get_variable('have_soxr', false),
+ 'Speed and Pitch': get_variable('have_speedpitch', false),
+ 'Voice Removal': true,
+ }, section: 'Effects')
+
+ summary({
+ 'Advanced Linux Sound Architecture': get_variable('have_alsa', false),
+ 'Jack Audio Connection Kit': get_variable('have_jack', false),
+ 'Open Sound System': get_variable('have_oss4', false),
+ 'PipeWire': get_variable('have_pipewire', false),
+ 'PulseAudio': get_variable('have_pulse', false),
+ 'Simple DirectMedia Layer': get_variable('have_sdlout', false),
+ 'Sndio': get_variable('have_sndio', false),
+ 'Win32 waveOut': have_windows or have_cygwin,
+ 'FileWriter': get_option('filewriter'),
+ ' -> MP3 encoding': conf.has('FILEWRITER_MP3'),
+ ' -> Vorbis encoding': conf.has('FILEWRITER_VORBIS'),
+ ' -> FLAC encoding': conf.has('FILEWRITER_FLAC'),
+ }, section: 'Outputs')
+
+ summary({
+ 'Cue sheets': get_variable('have_cue', false),
+ 'M3U playlists': true,
+ 'Microsoft ASX (legacy)': true,
+ 'Microsoft ASX 3.0': get_variable('have_asx3', false),
+ 'PLS playlists': true,
+ 'XML Sharable Playlist Format (XSPF)': get_variable('have_xspf', false),
+ }, section: 'Playlists')
+
+ summary({
+ 'FTP, SFTP, SMB (via GIO)': true,
+ 'HTTP/HTTPS (via neon)': get_variable('have_neon', false),
+ 'MMS (via libmms)': get_variable('have_mms', false),
+ }, section: 'Transports')
+
+ summary({
+ 'Ampache browser (requires Qt)': get_variable('have_ampache', false),
+ 'Delete Files': conf.has('USE_GTK_OR_QT'),
+ 'Libnotify OSD': get_variable('have_notify', false),
+ 'Linux Infrared Remote Control (LIRC)': get_variable('have_lirc', false),
+ 'Lyrics Viewer': get_variable('have_lyrics', false),
+ 'MPRIS 2 Server': get_variable('have_mpris2', false),
+ 'Scrobbler 2.0': get_variable('have_scrobbler2', false),
+ 'Song Change': get_option('songchange'),
+ }, section: 'General')
+
+ if conf.has('USE_QT')
+ summary({
+ 'Qt Multimedia output': get_variable('have_qtaudio', false),
+ 'Qt Interface': true,
+ 'Winamp Classic Interface': true,
+ 'Album Art': true,
+ 'Blur Scope': true,
+ 'OpenGL Spectrum Analyzer': get_variable('have_qtglspectrum', false),
+ 'Playlist Manager': true,
+ 'Search Tool': true,
+ 'Song Info': true,
+ 'Spectrum Analyzer (2D)': true,
+ 'Status Icon': true,
+ 'Stream Tuner (experimental)': get_variable('have_streamtuner', false),
+ 'VU Meter': get_option('vumeter'),
+ 'X11 Global Hotkeys': get_variable('have_qthotkey', false),
+ }, section: 'Qt Support')
+ endif
+
+ if conf.has('USE_GTK')
+ summary({
+ 'GTK Interface': true,
+ 'Winamp Classic Interface': true,
+ 'Album Art': true,
+ 'Blur Scope': true,
+ 'OpenGL Spectrum Analyzer': get_variable('have_glspectrum', false),
+ 'Playlist Manager': true,
+ 'Search Tool': true,
+ 'Spectrum Analyzer (2D)': true,
+ 'Status Icon': true,
+ 'X11 Global Hotkeys': get_variable('have_hotkey', false),
+ 'X11 On-Screen Display (aosd)': get_variable('have_aosd', false),
+ }, section: 'GTK Support')
+ endif
+
+ if have_darwin
+ summary({
+ 'CoreAudio Output': get_option('coreaudio'),
+ 'Media Keys': get_option('mac-media-keys'),
+ }, section: 'macOS Support')
+ endif
+endif

audacious-plugins-4.4.1.tar.bz2/meson_options.txt Added

@@ -0,0 +1,131 @@
+# GUI toolkits
+option('gtk', type: 'boolean', value: true,
+       description: 'Whether GTK support is enabled')
+option('gtk2', type: 'boolean', value: false,
+       description: 'Whether GTK 2 support is enabled')
+option('qt', type: 'boolean', value: true,
+       description: 'Whether Qt support is enabled')
+option('qt5', type: 'boolean', value: false,
+       description: 'Whether Qt 5 support is enabled')
+
+
+# container plugins
+option('cue', type: 'boolean', value: true,
+       description: 'Whether libcue support is enabled')
+
+
+# transport plugins
+option('mms', type: 'boolean', value: true,
+       description: 'Whether the libmms MMS client is enabled')
+option('neon', type: 'boolean', value: true,
+       description: 'Whether the neon HTTP client is enabled')
+
+
+# input plugins
+option('aac', type: 'boolean', value: true,
+       description: 'Whether the FAAD-based raw AAC plugin is enabled')
+option('adplug', type: 'boolean', value: true,
+       description: 'Whether AdPlug support is enabled')
+option('amidiplug', type: 'boolean', value: true,
+       description: 'Whether AMidiPlug plugin is enabled')
+option('cdaudio', type: 'boolean', value: true,
+       description: 'Whether CD audio support is enabled')
+option('cdaudio-cddb', type: 'boolean', value: true,
+       description: 'Whether CDDB support for the Audio CD plugin is enabled')
+option('console', type: 'boolean', value: true,
+       description: 'Whether Game Music Emu support is enabled')
+option('ffaudio', type: 'boolean', value: true,
+       description: 'Whether FFmpeg support is enabled')
+option('flac', type: 'boolean', value: true,
+       description: 'Whether FLAC support is enabled')
+option('modplug', type: 'boolean', value: true,
+       description: 'Whether ModPlug support is enabled')
+option('mpg123', type: 'boolean', value: true,
+       description: 'Whether MPG123 support is enabled')
+option('openmpt', type: 'boolean', value: true,
+       description: 'Whether OpenMPT support is enabled')
+option('opus', type: 'boolean', value: true,
+       description: 'Whether Opus support is enabled')
+option('sid', type: 'boolean', value: true,
+       description: 'Whether SID emulation support is enabled')
+option('sndfile', type: 'boolean', value: true,
+       description: 'Whether libsndfile support is enabled')
+option('vorbis', type: 'boolean', value: true,
+       description: 'Whether Ogg Vorbis support is enabled')
+option('wavpack', type: 'boolean', value: true,
+       description: 'Whether WavPack support is enabled')
+
+
+# output plugins
+option('alsa', type: 'boolean', value: true,
+       description: 'Whether ALSA support is enabled')
+option('coreaudio', type: 'boolean', value: true,
+       description: 'Whether CoreAudio support is enabled')
+option('filewriter', type: 'boolean', value: true,
+       description: 'Whether FileWriter (transcoding) support is enabled')
+option('filewriter-flac', type: 'boolean', value: true,
+       description: 'Whether FileWriter (transcoding) FLAC support is enabled')
+option('filewriter-mp3', type: 'boolean', value: true,
+       description: 'Whether FileWriter (transcoding) MP3 support is enabled')
+option('filewriter-ogg', type: 'boolean', value: true,
+       description: 'Whether FileWriter (transcoding) OGG support is enabled')
+option('jack', type: 'boolean', value: true,
+       description: 'Whether JACK support is enabled')
+option('oss', type: 'boolean', value: true,
+       description: 'Whether OSS support is enabled')
+option('pipewire', type: 'boolean', value: true,
+       description: 'Whether PipeWire support is enabled')
+option('pulse', type: 'boolean', value: true,
+       description: 'Whether PulseAudio support is enabled')
+option('qtaudio', type: 'boolean', value: true,
+       description: 'Whether QtMultimedia support is enabled')
+option('sdlout', type: 'boolean', value: true,
+       description: 'Whether SDL support is enabled')
+option('sndio', type: 'boolean', value: true,
+       description: 'Whether sndio support is enabled')
+
+
+# general plugins
+option('ampache', type: 'boolean', value: true,
+       description: 'Whether the Ampache browser plugin is enabled')
+option('aosd', type: 'boolean', value: true,
+       description: 'Whether the OSD plugin (X11) is enabled')
+option('hotkey', type: 'boolean', value: true,
+       description: 'Whether the global hotkey plugin (X11) is enabled')
+option('lirc', type: 'boolean', value: true,
+       description: 'Whether the LIRC plugin is enabled')
+option('mac-media-keys', type: 'boolean', value: false,
+       description: 'Whether the Mac Media Keys plugin is enabled')
+option('mpris2', type: 'boolean', value: true,
+       description: 'Whether MPRIS 2.0 support is enabled')
+option('notify', type: 'boolean', value: true,
+       description: 'Whether the libnotify OSD plugin is enabled')
+option('scrobbler2', type: 'boolean', value: true,
+       description: 'Whether the Last.fm Scrobbler plugin is enabled')
+option('songchange', type: 'boolean', value: true,
+       description: 'Whether the Song Change plugin is enabled')
+option('streamtuner', type: 'boolean', value: false,
+       description: 'Whether the Stream Tuner plugin is enabled')
+
+
+# effect plugins
+option('bs2b', type: 'boolean', value: true,
+       description: 'Whether the BS2B effect plugin is enabled')
+option('resample', type: 'boolean', value: true,
+       description: 'Whether the resample effect plugin is enabled')
+option('soxr', type: 'boolean', value: true,
+       description: 'Whether the SoX resampler effect plugin is enabled')
+option('speedpitch', type: 'boolean', value: true,
+       description: 'Whether the speed / pitch effect plugin is enabled')
+
+
+# visualization plugins
+option('gl-spectrum', type: 'boolean', value: true,
+       description: 'Whether the OpenGL spectrum visualization plugin is enabled')
+option('vumeter', type: 'boolean', value: true,
+       description: 'Whether the VUMeter visualization plugin is enabled')
+
+
+# interface plugins
+option('moonstone', type: 'boolean', value: false,
+       description: 'Whether the Moonstone UI plugin is enabled')

audacious-plugins-3.6.2-gtk3.tar.bz2/mkrelease.sh -> audacious-plugins-4.4.1.tar.bz2/mkrelease.sh Changed

audacious-plugins-4.4.1.tar.bz2/po/LINGUAS Added

audacious-plugins-3.6.2-gtk3.tar.bz2/po/Makefile -> audacious-plugins-4.4.1.tar.bz2/po/Makefile Changed

audacious-plugins-3.6.2-gtk3.tar.bz2/po/POTFILES.in -> audacious-plugins-4.4.1.tar.bz2/po/POTFILES.in Changed

@@ -1,17 +1,15 @@
 # Please don't update this file manually - use ./update-potfiles.sh instead!
-src/aac-raw/aac.cc
+src/aac/aac.cc
 src/adplug/adplug-xmms.cc
-src/adplug/core/rix.h
-src/alarm/alarm.cc
-src/alarm/interface.cc
 src/albumart/albumart.cc
 src/albumart-qt/albumart.cc
 src/alsa/alsa.h
 src/alsa/config.cc
-src/amidi-plug/amidi-plug.cc
-src/amidi-plug/i_configure.cc
-src/amidi-plug/i_configure-fluidsynth.cc
-src/amidi-plug/i_fileinfo.cc
+src/amidiplug/amidi-plug.cc
+src/amidiplug/i_configure.cc
+src/amidiplug/i_configure-fluidsynth.cc
+src/amidiplug/i_fileinfo.cc
+src/ampache/ampache.cc
 src/aosd/aosd.cc
 src/aosd/aosd.h
 src/aosd/aosd_style.cc
@@ -20,10 +18,13 @@
 src/asx3/asx3.cc
 src/asx/asx.cc
 src/audpl/audpl.cc
+src/background_music/background_music.cc
+src/bitcrusher/bitcrusher.cc
 src/blur_scope/blur_scope.cc
+src/blur_scope-qt/blur_scope.cc
 src/bs2b/plugin.cc
 src/cairo-spectrum/cairo-spectrum.cc
-src/cdaudio-ng/cdaudio-ng.cc
+src/cdaudio/cdaudio-ng.cc
 src/cd-menu-items/cd-menu-items.cc
 src/compressor/compressor.cc
 src/console/Ay_Apu.cc
@@ -88,15 +89,11 @@
 src/echo_plugin/echo.cc
 src/ffaudio/ffaudio-core.cc
 src/filewriter/filewriter.cc
-src/filewriter/mp3.cc
-src/filewriter/vorbis.cc
-src/flacng/flacng.h
-src/flacng/metadata.cc
-src/flacng/plugin.cc
+src/flac/flacng.h
+src/flac/metadata.cc
+src/flac/plugin.cc
 src/gio/gio.cc
-src/gl-spectrum/gl-spectrum.cc
-src/gl-spectrum-qt/gl-spectrum.cc
-src/gnomeshortcuts/gnomeshortcuts.cc
+src/glspectrum/gl-spectrum.cc
 src/gtkui/columns.cc
 src/gtkui/layout.cc
 src/gtkui/menus.cc
@@ -106,12 +103,16 @@
 src/gtkui/ui_statusbar.cc
 src/hotkey/gui.cc
 src/hotkey/plugin.cc
-src/jack-ng/jack-ng.cc
+src/jack/jack-ng.cc
 src/ladspa/plugin.cc
 src/ladspa/plugin.h
 src/lirc/lirc.cc
-src/lyricwiki/lyricwiki.cc
-src/lyricwiki-qt/lyricwiki.cc
+src/lyrics-common/chart_lyrics_provider.cc
+src/lyrics-common/lyrics_ovh_provider.cc
+src/lyrics-common/preferences.h
+src/lyrics-common/utils.cc
+src/lyrics-gtk/lyrics-gtk.cc
+src/lyrics-qt/lyrics-qt.cc
 src/m3u/m3u.cc
 src/metronom/metronom.cc
 src/mixer/mixer.cc
@@ -119,62 +120,106 @@
 src/modplug/modplugbmp.cc
 src/modplug/modplugbmp.h
 src/modplug/plugin_main.cc
+src/moonstone/main_window.cc
+src/moonstone/moonstone.cc
+src/moonstone/playlist_header.cc
+src/moonstone/playlist_model.cc
+src/moonstone/playlist_selection.cc
+src/moonstone/playlist_tabs.cc
 src/mpg123/mpg123.cc
 src/mpris2/plugin.cc
 src/neon/neon.cc
 src/notify/event.cc
 src/notify/notify.cc
 src/notify/osd.cc
+src/openmpt/mpt.cc
+src/openmpt/mptwrap.h
+src/opus/opus.cc
 src/oss4/oss.h
 src/oss4/plugin.cc
+src/pipewire/pipewire.cc
 src/playlist-manager/playlist-manager.cc
+src/playlist-manager-qt/playlist-manager-qt.cc
 src/pls/pls.cc
 src/psf/plugin.cc
 src/psf/psx.h
-src/pulse_audio/pulse_audio.cc
+src/pulse/pulse_audio.cc
 src/qtaudio/qtaudio.cc
-src/qtui/dialog_windows.cc
-src/qtui/filter_input.cc
-src/qtui/main_window_actions.cc
+src/qtglspectrum/gl-spectrum.cc
+src/qthotkey/gui.cc
+src/qthotkey/plugin.cc
+src/qt-spectrum/qt-spectrum.cc
 src/qtui/main_window.cc
+src/qtui/menus.cc
+src/qtui/playlist_header.cc
 src/qtui/playlist_model.cc
+src/qtui/playlist_tabs.cc
 src/qtui/qtui.cc
+src/qtui/search_bar.cc
+src/qtui/settings.cc
 src/qtui/status_bar.cc
 src/resample/resample.cc
 src/scrobbler2/config_window.cc
 src/scrobbler2/scrobbler.cc
-src/scrobbler2/scrobbler_communication.cc
 src/sdlout/sdlout.cc
+src/search-tool/library.cc
+src/search-tool-qt/library.cc
+src/search-tool-qt/search-model.cc
+src/search-tool-qt/search-model.h
+src/search-tool-qt/search-tool-qt.cc
+src/search-tool/search-model.h
 src/search-tool/search-tool.cc
 src/sid/xmms-sid.cc
 src/sid/xs_config.cc
 src/silence-removal/silence-removal.cc
+src/skins/actions.cc
+src/skins/equalizer.cc
+src/skins/main.cc
 src/skins/menus.cc
+src/skins/playlist-widget.cc
+src/skins/playlistwin.cc
 src/skins/plugin.cc
-src/skins/preset-browser.cc
-src/skins/preset-list.cc
+src/skins-qt/actions.cc
+src/skins-qt/equalizer.cc
+src/skins-qt/main.cc
+src/skins-qt/menus.cc
+src/skins-qt/playlist-widget.cc
+src/skins-qt/playlistwin.cc
+src/skins-qt/plugin.cc
+src/skins-qt/search-select.cc
+src/skins-qt/skins_cfg.cc
+src/skins-qt/skinselector.cc
+src/skins/search-select.cc
 src/skins/skins_cfg.cc
-src/skins/ui_equalizer.cc
-src/skins/ui_main.cc
-src/skins/ui_main_evlisteners.cc
-src/skins/ui_playlist.cc
-src/skins/ui_skinselector.cc
-src/skins/util.cc
+src/skins/skinselector.cc
 src/sndfile/plugin.cc
-src/sndio-ng/sndio.cc
-src/song_change/song_change.cc
+src/sndio/sndio.cc
+src/songchange/song_change.cc
 src/song-info-qt/song-info.cc
-src/sox-resampler/sox-resampler.cc
-src/speed-pitch/speed-pitch.cc
+src/soxr/sox-resampler.cc
+src/speedpitch/speed-pitch.cc
+src/statusicon-qt/statusicon.cc
 src/statusicon/statusicon.cc
 src/stereo_plugin/stereo.cc
+src/streamtuner/icecast-model.cc
+src/streamtuner/ihr-model.cc
+src/streamtuner/shoutcast-model.cc
+src/streamtuner/streamtuner.cc
 src/tonegen/tonegen.cc
+src/ui-common/dialogs-qt.cc
+src/ui-common/menu-ops-gtk.cc
+src/ui-common/menu-ops-qt.cc
 src/voice_removal/voice_removal.cc
 src/vorbis/vorbis.cc
 src/vorbis/vorbis.h
 src/vtx/info.cc
 src/vtx/vtx.cc
+src/vumeter-qt/vumeter_qt.cc
+src/vumeter-qt/vumeter_qt.h
+src/waveout/waveout.cc
 src/wavpack/wavpack.cc
+src/xsf/desmume/arm_instructions.cc
+src/xsf/desmume/PACKED.h
 src/xsf/desmume/types.h
 src/xsf/plugin.cc
 src/xspf/xspf.cc

audacious-plugins-4.4.1.tar.bz2/po/af.po Added

@@ -0,0 +1,4856 @@
+# Afrikaans translation for Audacious Plugins
+# Copyright (C) Audacious translators
+# This file is distributed under the same license as the Audacious Plugins package.
+#
+# Translators:
+# Reynier West, 2022-2023
+msgid ""
+msgstr ""
+"Project-Id-Version: Audacious Plugins\n"
+"Report-Msgid-Bugs-To: https://github.com/audacious-media-player/audacious/"
+"issues\n"
+"POT-Creation-Date: 2024-09-26 21:54+0200\n"
+"PO-Revision-Date: 2011-10-10 17:43+0000\n"
+"Last-Translator: Reynier West, 2022-2023\n"
+"Language-Team: Afrikaans (http://app.transifex.com/audacious/audacious/"
+"language/af/)\n"
+"Language: af\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/aac.cc:19
+msgid "AAC (Raw) Decoder"
+msgstr "AAC (Rou) Dekodeerder"
+
+#: src/adplug/adplug-xmms.cc:70
+msgid "AdPlug (AdLib Player)"
+msgstr "AdPlug (AdLib Speler)"
+
+#: src/adplug/adplug-xmms.cc:167 src/modplug/modplugbmp.cc:321
+#: src/psf/plugin.cc:161 src/vtx/vtx.cc:89 src/xsf/plugin.cc:204
+msgid "sequenced"
+msgstr "gerangskik"
+
+#: src/adplug/adplug-xmms.cc:349 src/sid/xs_config.cc:61
+msgid "Output"
+msgstr "Uitsette"
+
+#: src/adplug/adplug-xmms.cc:350
+msgid "OPL Emulator:"
+msgstr "OPL Emuleerder:"
+
+#: src/adplug/adplug-xmms.cc:353 src/amidiplug/i_configure.cc:153
+#: src/console/plugin.cc:45 src/filewriter/filewriter.cc:481
+#: src/sid/xs_config.cc:65 src/xsf/plugin.cc:446
+msgid "Sample rate:"
+msgstr "Monstertempo:"
+
+#: src/adplug/adplug-xmms.cc:354 src/amidiplug/i_configure.cc:155
+#: src/bs2b/plugin.cc:141 src/console/plugin.cc:47
+#: src/modplug/plugin_main.cc:77 src/resample/resample.cc:201
+#: src/resample/resample.cc:207 src/resample/resample.cc:211
+#: src/resample/resample.cc:215 src/resample/resample.cc:219
+#: src/resample/resample.cc:223 src/resample/resample.cc:227
+#: src/resample/resample.cc:231 src/resample/resample.cc:235
+#: src/resample/resample.cc:239 src/resample/resample.cc:243
+#: src/sid/xs_config.cc:67 src/soxr/sox-resampler.cc:205
+msgid "Hz"
+msgstr "Hz"
+
+#: src/adplug/adplug-xmms.cc:355 src/gtkui/settings.cc:55
+#: src/modplug/plugin_main.cc:105 src/qtui/settings.cc:85
+#: src/skins-qt/skins_cfg.cc:302 src/skins/skins_cfg.cc:284
+msgid "Miscellaneous"
+msgstr "Allerlei"
+
+#: src/adplug/adplug-xmms.cc:356
+msgid "Repeat song in endless loop"
+msgstr "Herhaal liedjie in eindelose lus"
+
+#: src/albumart/albumart.cc:31 src/albumart-qt/albumart.cc:35
+msgid "Album Art"
+msgstr "Albumkuns"
+
+#: src/alsa/alsa.h:64
+msgid "ALSA Output"
+msgstr "ALSA Uitset"
+
+#: src/alsa/config.cc:28
+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 Uitset Inprop vir Audacious\n"
+"Kopiereg 2009-2012 John Lindgren\n"
+"\n"
+"My dank aan William Pitcock, skrywer van die ALSA Uitset Inprop NG, wie se "
+"kode as 'n verwysing gedien het toe die ALSA handleiding nie genoeg was nie."
+
+#: src/alsa/config.cc:61
+msgid "(no description)"
+msgstr "(geen beskrywing)"
+
+#: src/alsa/config.cc:166
+msgid "Default PCM device"
+msgstr "Verstek PCM toestel"
+
+#: src/alsa/config.cc:188
+msgid "Default mixer device"
+msgstr "Verstek menger toestel"
+
+#: src/alsa/config.cc:296
+msgid "PCM device:"
+msgstr "PCM toestel:"
+
+#: src/alsa/config.cc:299
+msgid "Mixer device:"
+msgstr "Menger toestel:"
+
+#: src/alsa/config.cc:302
+msgid "Mixer element:"
+msgstr "Menger element"
+
+#: src/amidiplug/amidi-plug.cc:42
+msgid "AMIDI-Plug (MIDI Player)"
+msgstr "AMIDI-Plug (MIDI Speler)"
+
+#: src/amidiplug/amidi-plug.cc:445
+msgid ""
+"AMIDI-Plug\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 ""
+"AMIDI-Plug\n"
+"modulêre MIDI-musiekspeler\n"
+"http://www.develia.org/projects.php?p=amidiplug\n"
+"\n"
+"geskryf deur Giacomo Lozito\n"
+"<james@develia.org>\n"
+"\n"
+"spesiale dank aan...\n"
+"\n"
+"Clemens Ladisch en Jaroslav Kysela\n"
+"vir hulle kwaai programme aplaymidi en amixer; hulle\n"
+"was regtig nuttig, saam met die alsa-lib doks, om\n"
+"meer te leer van die ALSA API\n"
+"\n"
+"Alfredo Spadafina\n"
+"vir die mooi midi-sleutelbord logo\n"
+"\n"
+"Tony Vroon\n"
+"vir die goeie hulp met alpha-toetsing"
+
+#: src/amidiplug/i_configure.cc:94
+msgid "Override default gain:"
+msgstr "Oorskryf verstek versterking:"
+
+#: src/amidiplug/i_configure.cc:102
+msgid "Override default polyphony:"
+msgstr "Oorskryf verstek polifonie:"
+
+#: src/amidiplug/i_configure.cc:110
+msgid "Override default reverb:"
+msgstr "Oorskryf verstek galm:"
+
+#: src/amidiplug/i_configure.cc:112 src/amidiplug/i_configure.cc:120
+msgid "On"
+msgstr "Aan"
+
+#: src/amidiplug/i_configure.cc:118
+msgid "Override default chorus:"
+msgstr "Oorskryf verstek koor:"
+
+#: src/amidiplug/i_configure.cc:128 src/console/plugin.cc:29
+msgid "Playback"
+msgstr "Terugspeel"
+
+#: src/amidiplug/i_configure.cc:129
+msgid "Transpose:"
+msgstr "Transponeer:"
+
+#: src/amidiplug/i_configure.cc:131 src/speedpitch/speed-pitch.cc:257
+msgid "semitones"
+msgstr "halftone"
+
+#: src/amidiplug/i_configure.cc:132
+msgid "Drum shift:"
+msgstr "Dromme skuif:"
+
+#: src/amidiplug/i_configure.cc:134
+msgid "note numbers"
+msgstr "noot nommers"
+
+#: src/amidiplug/i_configure.cc:135
+msgid "Skip leading silence"
+msgstr "Slaan leiende stilte oor"
+
+#: src/amidiplug/i_configure.cc:137
+msgid "Skip trailing silence"
+msgstr "Slaan agterstilte oor"
+
+#: src/amidiplug/i_configure.cc:141
+msgid "SoundFont"
+msgstr "SoundFont"
+
+#: src/amidiplug/i_configure.cc:148
+msgid "Synthesizer"
+msgstr "Sintetiseerder"
+
+#: src/amidiplug/i_configure-fluidsynth.cc:58
+#: src/amidiplug/i_configure-fluidsynth.cc:527
+msgid "AMIDI-Plug - select SoundFont file"
+msgstr "AMIDI-Plug - kies SoundFont lêer"
+
+#: src/amidiplug/i_configure-fluidsynth.cc:61
+msgid "_Cancel"
+msgstr "_Kanselleer"
+
+#: src/amidiplug/i_configure-fluidsynth.cc:62
+msgid "_Open"
+msgstr "_Oop"
+
+#: src/amidiplug/i_configure-fluidsynth.cc:233
+#: src/amidiplug/i_configure-fluidsynth.cc:461
+msgid "File name"
+msgstr "Lêer naam"
+
+#: src/amidiplug/i_configure-fluidsynth.cc:237
+#: src/amidiplug/i_configure-fluidsynth.cc:464
+msgid "Size (bytes)"
+msgstr "Grote (grepe)"
+
+#: src/amidiplug/i_fileinfo.cc:184
+msgid "Name:"
+msgstr "Naam:"
+
+#: src/amidiplug/i_fileinfo.cc:202
+msgid " MIDI Info "
+msgstr "MIDI Info"
+
+#: src/amidiplug/i_fileinfo.cc:216
+msgid "Format:"
+msgstr "Formaat:"
+
+#: src/amidiplug/i_fileinfo.cc:219
+msgid "Length (msec):"
+msgstr "Lengte (msek):"
+
+#: src/amidiplug/i_fileinfo.cc:222
+msgid "No. of Tracks:"
+msgstr "Aantal Snitte:"
+
+#: src/amidiplug/i_fileinfo.cc:228
+msgid "variable"
+msgstr "veranderlik"
+
+#: src/amidiplug/i_fileinfo.cc:230
+msgid "BPM:"
+msgstr "SPM:"
+
+#: src/amidiplug/i_fileinfo.cc:238
+msgid "BPM (wavg):"
+msgstr "SPM (ggem):"
+
+#: src/amidiplug/i_fileinfo.cc:241
+msgid "Time Div:"
+msgstr "Tydverdeling:"
+
+#: src/amidiplug/i_fileinfo.cc:252
+msgid " MIDI Comments and Lyrics "
+msgstr "MIDI Kommentaar en Lirieke"
+
+#: src/amidiplug/i_fileinfo.cc:299
+msgid "* no comments available in this MIDI file *"
+msgstr "* geen kommentaar beskikbaar in hierdie MIDI lêer nie *"
+
+#: src/amidiplug/i_fileinfo.cc:311
+msgid "* no lyrics available in this MIDI file *"
+msgstr "* geen lirieke beskikbaar in hierdie MIDI lêer nie *"
+
+#: src/amidiplug/i_fileinfo.cc:321 src/ladspa/plugin.cc:418
+#: src/ui-common/dialogs-qt.cc:32
+msgid "_Close"
+msgstr "_Toe"
+
+#: src/amidiplug/i_fileinfo.cc:346
+msgid " (invalid UTF-8)"
+msgstr "(ongeldige UTF-8)"
+
+#: src/ampache/ampache.cc:33
+msgid "Ampache Browser"
+msgstr "Ampache Blaaier"
+
+#: src/ampache/ampache.cc:46
+msgid ""
+"Ampache Browser for Audacious\n"
+"http://ampache-browser.org/\n"
+"\n"
+"Copyright (C) Róbert Čerňanský and John Lindgren\n"
+"License: GNU GPLv3"
+msgstr ""
+"Ampache Blaaier vir Audacious\n"
+"http://ampache-browser.org/\n"
+"\n"
+"Kopiereg (K) Róbert Čerňanský en John Lindgren\n"
+"Lisensie: GNU GPLv3"
+
+#: src/aosd/aosd.cc:31
+msgid ""
+"Audacious OSD\n"
+"http://www.develia.org/projects.php?p=audacious#aosd\n"
+"\n"
+"Written by Giacomo Lozito <james@develia.org>\n"
+"\n"
+"Based in part on Evan Martin's Ghosd library:\n"
+"http://neugierig.org/software/ghosd/"
+msgstr ""
+"Audacious OSD\n"
+"http://www.develia.org/projects.php?p=audacious#aosd\n"
+"\n"
+"Geskryf deur Giacomo Lozito <james@develia.org>\n"
+"\n"
+"Gedeeltelik gebaseer op Evan Martin se Ghosd biblioteek:\n"
+"http://neugierig.org/software/ghosd/"
+
+#: src/aosd/aosd.h:37
+msgid "AOSD (On-Screen Display)"
+msgstr "AOSD (Op-Skerm-Vertoon)"
+
+#: src/aosd/aosd_style.cc:54
+msgid "Rectangle"
+msgstr "Reghoek"
+
+#: src/aosd/aosd_style.cc:59
+msgid "Rounded Rectangle"
+msgstr "Geronde reghoek"
+
+#: src/aosd/aosd_style.cc:64
+msgid "Concave Rectangle"
+msgstr "Konkawe reghoek"
+
+#: src/aosd/aosd_style.cc:69 src/openmpt/mptwrap.h:50 src/xsf/plugin.cc:436
+msgid "None"
+msgstr "Geen"
+
+#: src/aosd/aosd_trigger.cc:49
+msgid "Playback Start"
+msgstr "Begin Terugspeel"
+
+#: src/aosd/aosd_trigger.cc:50
+msgid "Triggers OSD when a playlist entry is played."
+msgstr "Aktiveer OSV wanneer 'n snitlys item gespeel word."
+
+#: src/aosd/aosd_trigger.cc:55
+msgid "Title Change"
+msgstr "Titel verandering"
+
+#: src/aosd/aosd_trigger.cc:56
+msgid "Triggers OSD when the song title changes (for internet streams)."
+msgstr "Aktiveer OSV wanneer die lied se titel verander (vir internet strome)"
+
+#: src/aosd/aosd_trigger.cc:61
+msgid "Pause On"
+msgstr "Pouse Aan"
+
+#: src/aosd/aosd_trigger.cc:62
+msgid "Triggers OSD when playback is paused."
+msgstr "Aktiveer OSV wanneer terugspeel pouse aan geskakel word."
+
+#: src/aosd/aosd_trigger.cc:67
+msgid "Pause Off"
+msgstr "Pouse Af"
+
+#: src/aosd/aosd_trigger.cc:68
+msgid "Triggers OSD when playback is unpaused."
+msgstr "Aktiveer OSV wanneer terugspeel pouse af geskakel word."
+
+#: src/aosd/aosd_ui.cc:204
+msgid "Placement"
+msgstr "Plasing"
+
+#: src/aosd/aosd_ui.cc:241
+msgid "Relative X offset:"
+msgstr "Relatiewe X verreken:"
+
+#: src/aosd/aosd_ui.cc:245
+msgid "Relative Y offset:"
+msgstr "Relatiewe Y verreken:"
+
+#: src/aosd/aosd_ui.cc:249
+msgid "Max OSD width:"
+msgstr "Maks. OSV wydte:"
+
+#: src/aosd/aosd_ui.cc:281
+msgid "Multi-Monitor options"
+msgstr "Multi-Skerm opsies"
+
+#: src/aosd/aosd_ui.cc:285
+msgid "Display OSD using:"
+msgstr "Vertoon OSV met:"
+
+#: src/aosd/aosd_ui.cc:287
+msgid "all monitors"
+msgstr "alle skerms"
+
+#: src/aosd/aosd_ui.cc:290
+#, c-format
+msgid "monitor %i"
+msgstr "skerm %i"
+
+#: src/aosd/aosd_ui.cc:342
+msgid "Timing (ms)"
+msgstr "Tydsberekening (ms)"
+
+#: src/aosd/aosd_ui.cc:347
+msgid "Display:"
+msgstr "Vertoon:"
+
+#: src/aosd/aosd_ui.cc:352
+msgid "Fade in:"
+msgstr "Vervaag in:"
+
+#: src/aosd/aosd_ui.cc:357
+msgid "Fade out:"
+msgstr "Vervaag uit:"
+
+#: src/aosd/aosd_ui.cc:442
+msgid "Fonts"
+msgstr "Lettertipes"
+
+#: src/aosd/aosd_ui.cc:449
+#, c-format
+msgid "Font %i:"
+msgstr "Lettertipe %i:"
+
+#: src/aosd/aosd_ui.cc:466
+msgid "Shadow"
+msgstr "Skaduwee"
+
+#: src/aosd/aosd_ui.cc:589
+msgid "Render Style"
+msgstr "Lewer styl"
+
+#: src/aosd/aosd_ui.cc:605
+msgid "Colors"
+msgstr "Kleure"
+
+#: src/aosd/aosd_ui.cc:616
+#, c-format
+msgid "Color %i:"
+msgstr "Kleur %i:"
+
+#: src/aosd/aosd_ui.cc:714
+msgid "Enable trigger"
+msgstr "Aktiveer sneller"
+
+#: src/aosd/aosd_ui.cc:741
+msgid "Event"
+msgstr "Gebeurtenis"
+
+#: src/aosd/aosd_ui.cc:768
+msgid "Composite manager detected"
+msgstr "Saamgestelde bestuurder bespeur"
+
+#: src/aosd/aosd_ui.cc:775
+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 ""
+"Saamgestelde bestuurder nie bespeur nie;\n"
+"tensy jy weet dat jy een het wat hardloop, aktiveer een asseblief anders sal "
+"die OSV nie reg werk nie"
+
+#: src/aosd/aosd_ui.cc:783
+msgid "Composite manager not required for fake transparency"
+msgstr "Saamgestelde bestuurder word nie vereis vir vals deursigtigheid nie"
+
+#: src/aosd/aosd_ui.cc:820
+msgid "Transparency"
+msgstr "Deursigtigheid "
+
+#: src/aosd/aosd_ui.cc:826
+msgid "Fake transparency"
+msgstr "Vals deursigtigheid"
+
+#: src/aosd/aosd_ui.cc:828
+msgid "Real transparency (requires X Composite Ext.)"
+msgstr "Egte deursigtigheid (vereis X Composite Ext.)"
+
+#: src/aosd/aosd_ui.cc:875
+msgid "Composite extension not loaded"
+msgstr "Saamgestelde uitbreiding nie gelaai nie"
+
+#: src/aosd/aosd_ui.cc:892
+#, c-format
+msgid "Audacious OSD"
+msgstr "Audacious OSV"
+
+#: src/aosd/aosd_ui.cc:955
+msgid "Position"
+msgstr "Posisie"
+
+#: src/aosd/aosd_ui.cc:960
+msgid "Animation"
+msgstr "Animasie"
+
+#: src/aosd/aosd_ui.cc:965
+msgid "Text"
+msgstr "Teks"
+
+#: src/aosd/aosd_ui.cc:970
+msgid "Decoration"
+msgstr "Versiering"
+
+#: src/aosd/aosd_ui.cc:975
+msgid "Trigger"
+msgstr "Sneller"
+
+#: src/aosd/aosd_ui.cc:980 src/streamtuner/shoutcast-model.cc:202
+msgid "Misc"
+msgstr "Allerlei"
+
+#: src/aosd/aosd_ui.cc:989
+msgid "Test"
+msgstr "Toets"
+
+#: src/asx3/asx3.cc:35
+msgid "ASXv3 Playlists"
+msgstr "ASXv3 Snitlyste"
+
+#: src/asx/asx.cc:33
+msgid "ASXv1/ASXv2 Playlists"
+msgstr "ASXv1/ASXv2 Snitlyste"
+
+#: src/audpl/audpl.cc:33
+msgid "Audacious Playlists (audpl)"
+msgstr "Audacious Snitlyste (audpl)"
+
+#: src/background_music/background_music.cc:24
+msgid "Background music"
+msgstr ""
+
+#: src/background_music/background_music.cc:25
+msgid "Target level:"
+msgstr ""
+
+#: src/background_music/background_music.cc:28
+#: src/background_music/background_music.cc:33
+#: src/silence-removal/silence-removal.cc:70
+msgid "dB"
+msgstr "dB"
+
+#: src/background_music/background_music.cc:29
+msgid "Maximum amplification:"
+msgstr ""
+
+#: src/background_music/background_music.cc:34 src/mpg123/mpg123.cc:81
+msgid "Advanced"
+msgstr "Gevorderd"
+
+#: src/background_music/background_music.cc:36
+msgid "Slow detection weight:"
+msgstr ""
+
+#: src/background_music/background_music.cc:39
+msgid "Hint"
+msgstr ""
+
+#: src/background_music/background_music.cc:41
+msgid ""
+"Slow detection weight is the relative weight\n"
+"of a long term average detection when compared\n"
+"to the actual, faster loudness detection.\n"
+"A value of zero gives a more radio-like sound\n"
+"where soft passages get \"pulled up\" more quickly,\n"
+"a value of two makes the sound feel less compressed."
+msgstr ""
+
+#: src/background_music/background_music.cc:52
+msgid ""
+"Background Music Plugin for Audacious\n"
+"Copyright 2023;2024 Michel Fleur\n"
+"\n"
+"Controls the volume to make the sound equally loud within and between "
+"tracks.\n"
+" It uses accurate loudness measurement and tries to make the volume changes "
+"sound natural without audible peaks, yet without lowering the volume before "
+"a peak in advance."
+msgstr ""
+
+#: src/background_music/background_music.cc:61
+msgid "Background Music"
+msgstr ""
+
+#: src/bitcrusher/bitcrusher.cc:33
+msgid "Bitcrusher"
+msgstr "Bitcrusher"
+
+#: src/bitcrusher/bitcrusher.cc:34
+msgid "Bit Depth:"
+msgstr "Bis diepte:"
+
+#: src/bitcrusher/bitcrusher.cc:37
+msgid "Downsample ratio:"
+msgstr "Monster afskaal verhouding:"
+
+#: src/bitcrusher/bitcrusher.cc:48
+msgid "Bitcrusher"
+msgstr "Bitcrusher"
+
+#: src/blur_scope/blur_scope.cc:40 src/blur_scope-qt/blur_scope.cc:45
+msgid "Color"
+msgstr "Kleur"
+
+#: src/blur_scope/blur_scope.cc:56 src/blur_scope-qt/blur_scope.cc:158
+msgid "Blur Scope"
+msgstr "Vervaag Skoop"
+
+#: src/bs2b/plugin.cc:38
+msgid "Bauer Stereophonic-to-Binaural (BS2B)"
+msgstr "Bauer Stereofonies-tot-Binauraal (BS2B)"
+
+#: src/bs2b/plugin.cc:129
+msgid "Presets:"
+msgstr "Voorinstellings"
+
+#: src/bs2b/plugin.cc:130
+msgid "Default"
+msgstr "Verstek"
+
+#: src/bs2b/plugin.cc:136
+msgid "Feed level:"
+msgstr "Voervlak:"
+
+#: src/bs2b/plugin.cc:138
+msgid "x1/10 dB"
+msgstr "x1/10 dB"
+
+#: src/bs2b/plugin.cc:139
+msgid "Cut frequency:"
+msgstr "Uitsny frekwensie:"
+
+#: src/cairo-spectrum/cairo-spectrum.cc:42 src/qt-spectrum/qt-spectrum.cc:107
+msgid "Spectrum Analyzer"
+msgstr "Spektrum ontleder"
+
+#: src/cdaudio/cdaudio-ng.cc:74
+msgid "Audio CD Plugin"
+msgstr "Oudio CD Inprop"
+
+#: src/cdaudio/cdaudio-ng.cc:121
+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 ""
+"Kopiereg (K) 2007-2012 Calin Crisan <ccrisan@gmail.com> en ander.\n"
+"\n"
+"Baie dank aan die libcdio onwikkelaars <http://www.gnu.org/software/libcdio/"
+">\n"
+"en aan die libcddb ontwikkelaars<http://libcddb.sourceforge.net/>.\n"
+"\n"
+"Ook, dankie aan Tony Vroon vir my mentorskap en leiding.\n"
+"\n"
+"Dit was 'n Google Summer of Code 2007 projek."
+
+#: src/cdaudio/cdaudio-ng.cc:140
+msgid "Device"
+msgstr "Toestel"
+
+#: src/cdaudio/cdaudio-ng.cc:141
+msgid "Read speed:"
+msgstr "Lees spoed:"
+
+#: src/cdaudio/cdaudio-ng.cc:144
+msgid "Override device:"
+msgstr "Oorheers toestel:"
+
+#: src/cdaudio/cdaudio-ng.cc:146
+msgid "Metadata"
+msgstr "Metadata"
+
+#: src/cdaudio/cdaudio-ng.cc:147
+msgid "Use CD-Text"
+msgstr "Gebruik CD-Teks"
+
+#: src/cdaudio/cdaudio-ng.cc:150
+msgid "Use CDDB"
+msgstr "Gebruik CDDB"
+
+#: src/cdaudio/cdaudio-ng.cc:152
+msgid "Use HTTP instead of CDDBP"
+msgstr "Gebruik HTTP inplaas van CDDBP"
+
+#: src/cdaudio/cdaudio-ng.cc:155
+msgid "Server:"
+msgstr "Bediener:"
+
+#: src/cdaudio/cdaudio-ng.cc:159
+msgid "Path:"
+msgstr "Pad:"
+
+#: src/cdaudio/cdaudio-ng.cc:163
+msgid "Port:"
+msgstr "Poort:"
+
+#: src/cdaudio/cdaudio-ng.cc:228
+msgid "Failed to initialize cdio subsystem."
+msgstr "Kon nie die CDIO-substelsel inisialiseer nie."
+
+#: src/cdaudio/cdaudio-ng.cc:260
+#, c-format
+msgid "Invalid URI %s."
+msgstr "Ongeldige URI %s."
+
+#: src/cdaudio/cdaudio-ng.cc:262
+#, c-format
+msgid "Track %d not found."
+msgstr "Snit %d nie gevind nie."
+
+#: src/cdaudio/cdaudio-ng.cc:264
+#, c-format
+msgid "Track %d is a data track."
+msgstr "Snit %d is 'n data baan."
+
+#: src/cdaudio/cdaudio-ng.cc:339
+msgid "Error reading audio CD."
+msgstr "Fout met die lees van die oudio-CD."
+
+#: src/cdaudio/cdaudio-ng.cc:410
+msgid "Audio CD"
+msgstr "Oudio-CD"
+
+#: src/cdaudio/cdaudio-ng.cc:446 src/cdaudio/cdaudio-ng.cc:455
+#, c-format
+msgid "Failed to open CD device %s."
+msgstr "Kon nie CD-toestel %s oopmaak nie."
+
+#: src/cdaudio/cdaudio-ng.cc:458
+msgid "No audio capable CD drive found."
+msgstr "Geen oudio-bekwame CD-aandrywer gevind nie."
+
+#: src/cdaudio/cdaudio-ng.cc:481
+msgid "Drive is empty."
+msgstr "Aandrywer is leeg."
+
+#: src/cdaudio/cdaudio-ng.cc:483
+msgid "Unsupported disk type."
+msgstr "Onondersteunde skyftipe."
+
+#: src/cdaudio/cdaudio-ng.cc:507
+msgid "Failed to finish initializing opened CD drive."
+msgstr "Kon nie die inisialisering van geopende CD-aandrywer voltooi nie."
+
+#: src/cdaudio/cdaudio-ng.cc:520
+msgid "Failed to retrieve first/last track number."
+msgstr "Kon nie eerste/laaste snitnommer herwin nie."
+
+#: src/cdaudio/cdaudio-ng.cc:541
+#, c-format
+msgid "Cannot read start/end LSN for track %d."
+msgstr "Kan nie begin/ einde LSN vir snit %d lees nie."
+
+#: src/cdaudio/cdaudio-ng.cc:624
+msgid "Failed to create the CDDB connection."
+msgstr "Kon nie die CDDB-verbinding skep nie."
+
+#: src/cdaudio/cdaudio-ng.cc:690
+msgid "Failed to query the CDDB server"
+msgstr "Navraag by die CDDB-bediener het misluk"
+
+#: src/cdaudio/cdaudio-ng.cc:692
+#, c-format
+msgid "Failed to query the CDDB server: %s"
+msgstr "Navraag het misluk by die CDDB-bediener: %s"
+
+#: src/cdaudio/cdaudio-ng.cc:716
+#, c-format
+msgid "Failed to read the CDDB info: %s"
+msgstr "Lees het misluk by die CDDB-bediener: %s"
+
+#: src/cd-menu-items/cd-menu-items.cc:33
+msgid "Audio CD Menu Items"
+msgstr "Oudio-CD kieslysitems"
+
+#: src/cd-menu-items/cd-menu-items.cc:45
+msgid "Pla_y CD"
+msgstr "Speel CD"
+
+#: src/cd-menu-items/cd-menu-items.cc:45
+msgid "_Add CD"
+msgstr "Voeg CD by"
+
+#: src/compressor/compressor.cc:45
+msgid "Compression"
+msgstr "Kompressie"
+
+#: src/compressor/compressor.cc:46
+msgid "Center volume:"
+msgstr "Sentrale volume:"
+
+#: src/compressor/compressor.cc:49
+msgid "Dynamic range:"
+msgstr "Dinamiese reikwydte:"
+
+#: src/compressor/compressor.cc:57
+msgid ""
+"Dynamic Range Compression Plugin for Audacious\n"
+"Copyright 2010-2014 John Lindgren"
+msgstr ""
+"Dinamiese Reikwydte Kompressie Inprop vir Audacious\n"
+"Kopiereg 2010-2014 John Lindgren"
+
+#: src/compressor/compressor.cc:64
+msgid "Dynamic Range Compressor"
+msgstr "Dinamiese reeks kompressor"
+
+#: src/console/plugin.cc:15
+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 ""
+"Konsole musiek dekodeerder enjin gebaseer op Game_Music_Emu 0.5.2\n"
+"Ondersteunde formate: AY, GBS, GYM, HES, KSS, NSF, NSFE, SAP, SPC, VGM, VGZ\n"
+"\n"
+"Audacious inprop deur:\n"
+"William Pitcock <nenolod@dereferenced.org>\n"
+"Shay Green <gblargg@gmail.com>"
+
+#: src/console/plugin.cc:30
+msgid "Bass:"
+msgstr "Bas:"
+
+#: src/console/plugin.cc:33
+msgid "Treble:"
+msgstr "Sopraan:"
+
+#: src/console/plugin.cc:36
+msgid "Echo:"
+msgstr "Eggo:"
+
+#: src/console/plugin.cc:39
+msgid "Default song length:"
+msgstr "Verstek lied lengte:"
+
+#: src/console/plugin.cc:41 src/crossfade/crossfade.cc:56
+#: src/crossfade/crossfade.cc:62 src/lirc/lirc.cc:395 src/notify/notify.cc:113
+#: src/sid/xs_config.cc:85 src/sid/xs_config.cc:94 src/sid/xs_config.cc:103
+#: src/vumeter-qt/vumeter_qt.cc:39
+msgid "seconds"
+msgstr "sekondes"
+
+#: src/console/plugin.cc:42 src/modplug/plugin_main.cc:58
+msgid "Resampling"
+msgstr "Hermonster"
+
+#: src/console/plugin.cc:43
+msgid "Enable audio resampling"
+msgstr "Aktiveer oudi-hermonstering"
+
+#: src/console/plugin.cc:49
+msgid "SPC"
+msgstr "SPC"
+
+#: src/console/plugin.cc:50
+msgid "Ignore length from SPC tags"
+msgstr "Ignoreer lengte van SPC-etikette"
+
+#: src/console/plugin.cc:52
+msgid "Increase reverb"
+msgstr "Verhoog galm"
+
+#: src/console/plugin.h:26
+msgid "Game Console Music Decoder"
+msgstr "Speletjies Konsole Musiek Dekodeerder"
+
+#: src/coreaudio/coreaudio.cc:53
+msgid "CoreAudio output"
+msgstr "CoreAudio uitset"
+
+#: src/coreaudio/coreaudio.cc:155
+msgid ""
+"CoreAudio Output Plugin for Audacious\n"
+"Copyright 2014 William Pitcock\n"
+"Copyright 2017,18 René J.V. Bertin\n"
+" (original code and code adapted from\n"
+" Apple examples, (C) Apple 2013)\n"
+"\n"
+"Based on SDL Output Plugin for Audacious\n"
+"Copyright 2010 John Lindgren"
+msgstr ""
+"CoreAudio-uitvoer-inprop vir Audacious\n"
+"Kopiereg 2014 William Pitcock\n"
+"Kopiereg 2017/2018 René J.V. Bertin\n"
+"(oorspronklike kode en kode aangepas vanaf\n"
+"Apple voorbeelde, (K) Apple 2013)\n"
+"\n"
+"Gebaseer op SDL Output Plugin vir Audacious\n"
+"Kopiereg 2010 John Lindgren"
+
+#: src/coreaudio/coreaudio.cc:171
+msgid "Use exclusive mode"
+msgstr "Gebruik eksklusiewe modus"
+
+#: src/coreaudio/coreaudio.cc:173
+msgid "Use bit perfect audio (adapt device sampling rate)"
+msgstr "Gebruik bis perfekte oudio (pas toestelmonstertempo aan)"
+
+#: src/crossfade/crossfade.cc:47
+msgid ""
+"Crossfade Plugin for Audacious\n"
+"Copyright 2010-2014 John Lindgren"
+msgstr ""
+"Kruisvervaag Inprop vir Audacious\n"
+"Kopiereg 2010-2014 John Lindgren"
+
+#: src/crossfade/crossfade.cc:51
+msgid "Crossfade"
+msgstr "Kruisvervaag"
+
+#: src/crossfade/crossfade.cc:52
+msgid "On automatic song change"
+msgstr "Op outomatiese lied verander"
+
+#: src/crossfade/crossfade.cc:54 src/crossfade/crossfade.cc:60
+msgid "Overlap:"
+msgstr "Oorvleuel:"
+
+#: src/crossfade/crossfade.cc:58
+msgid "On seek or manual song change"
+msgstr "Op soek of handmatige liedjieverandering"
+
+#: src/crossfade/crossfade.cc:64
+msgid "No fade in"
+msgstr ""
+
+#: src/crossfade/crossfade.cc:66
+msgid "Use S-curve fade"
+msgstr ""
+
+#: src/crossfade/crossfade.cc:68
+msgid "S-curve steepness:"
+msgstr ""
+
+#: src/crossfade/crossfade.cc:70
+msgid "(higher is steeper)"
+msgstr ""
+
+#: src/crossfade/crossfade.cc:72
+msgid "Tip"
+msgstr "Wenk"
+
+#: src/crossfade/crossfade.cc:73
+msgid ""
+"For better crossfading, enable\n"
+"the Silence Removal effect."
+msgstr ""
+"Vir beter kruisvervaag, aktiveer \n"
+"die Stilte-Verwyder effek."
+
+#: src/crossfade/crossfade.cc:83
+msgid "Crossfade"
+msgstr "Kruisvervaag"
+
+#: src/crystalizer/crystalizer.cc:31
+msgid "Crystalizer"
+msgstr "Kristaliseerder"
+
+#: src/crystalizer/crystalizer.cc:32 src/stereo_plugin/stereo.cc:45
+msgid "Intensity:"
+msgstr "Intensiteit:"
+
+#: src/crystalizer/crystalizer.cc:43
+msgid "Crystalizer"
+msgstr "Kristaliseerder"
+
+#: src/cue/cue.cc:42
+msgid "Cue Sheet Plugin"
+msgstr "Tou Blad Inprop"
+
+#: src/delete-files/delete-files.cc:53 src/delete-files/delete-files.cc:215
+#: src/delete-files/delete-files.cc:230
+msgid "Delete Files"
+msgstr "Skrap lêers"
+
+#: src/delete-files/delete-files.cc:120
+msgid "No files are selected."
+msgstr "Geen lêers was geselekteer nie."
+
+#: src/delete-files/delete-files.cc:125
+#, c-format
+msgid "Do you want to move %s to the trash?"
+msgstr "Wil jy %s na die drom skuif?"
+
+#: src/delete-files/delete-files.cc:126
+#, c-format
+msgid "Do you want to permanently delete %s?"
+msgstr "Wil jy %s permanent skrap?"
+
+#: src/delete-files/delete-files.cc:133
+#, c-format
+msgid "Do you want to move %d files to the trash?"
+msgstr "Wil jy %dlêers na die drom skuif?"
+
+#: src/delete-files/delete-files.cc:134
+#, c-format
+msgid "Do you want to permanently delete %d files?"
+msgstr "Wil jy permanent %d lêers skrap?"
+
+#: src/delete-files/delete-files.cc:146
+msgid "Move to trash"
+msgstr "Skuif na drom"
+
+#: src/delete-files/delete-files.cc:146
+msgid "Delete"
+msgstr "Skrap"
+
+#: src/delete-files/delete-files.cc:213 src/delete-files/delete-files.cc:235
+#: src/skins-qt/search-select.cc:102 src/skins/search-select.cc:78
+msgid "Cancel"
+msgstr "Kanselleer"
+
+#: src/delete-files/delete-files.cc:267
+msgid "Delete Selected Files"
+msgstr "Skrap geselekteerde lêers"
+
+#: src/delete-files/delete-files.cc:287
+msgid "Delete Method"
+msgstr "Skrap Metode"
+
+#: src/delete-files/delete-files.cc:288
+msgid "Move to trash instead of deleting immediately"
+msgstr "Skuif na drom inplaas van skrap onmiddelik"
+
+#: src/echo_plugin/echo.cc:9
+msgid ""
+"Echo Plugin\n"
+"By Johan Levin, 1999\n"
+"Surround echo by Carl van Schaik, 1999\n"
+"Updated for Audacious by William Pitcock and John Lindgren, 2010-2014"
+msgstr ""
+"Echo-inprop \n"
+"Deur Johan Levin, 1999 \n"
+"Omringende eggo deur Carl van Schaik, 1999\n"
+"Opgedateer vir Audacious deur William Pitcock en John Lindgren, 2010-2014"
+
+#: src/echo_plugin/echo.cc:21
+msgid "Echo"
+msgstr "Eggo"
+
+#: src/echo_plugin/echo.cc:22 src/modplug/plugin_main.cc:72
+#: src/modplug/plugin_main.cc:82
+msgid "Delay:"
+msgstr "Vertraag:"
+
+#: src/echo_plugin/echo.cc:24 src/modplug/plugin_main.cc:72
+#: src/modplug/plugin_main.cc:82 src/xsf/plugin.cc:445
+msgid "ms"
+msgstr "ms"
+
+#: src/echo_plugin/echo.cc:25
+msgid "Feedback:"
+msgstr "Terugvoer:"
+
+#: src/echo_plugin/echo.cc:28 src/modplug/plugin_main.cc:86
+msgid "Volume:"
+msgstr "Volume:"
+
+#: src/echo_plugin/echo.cc:39
+msgid "Echo"
+msgstr "Eggo"
+
+#: src/ffaudio/ffaudio-core.cc:50
+msgid "FFmpeg Plugin"
+msgstr "FFmpeg Inprop"
+
+#: src/ffaudio/ffaudio-core.cc:649
+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 ""
+"Multi-formaat klank dekodering inprop vir Audacious, \n"
+"wat gebruik maak van FFmpeg multimedia-raamwerk \n"
+"(http://www.ffmpeg.org/)\n"
+"\n"
+"Audacious inprop deur:\n"
+"William Pitcock <nenolod@nenolod.net>\n"
+"Matti Hämäläinen <ccr@tnsp.org>"
+
+#: src/filewriter/filewriter.cc:48
+msgid "FileWriter Plugin"
+msgstr "Lêerskrywer-inprop"
+
+#: src/filewriter/filewriter.cc:316
+#, c-format
+msgid ""
+"Error opening %s:\n"
+"%s"
+msgstr ""
+"Fout tydens oopmaak van %s:\n"
+"%s"
+
+#: src/filewriter/filewriter.cc:358
+msgid ""
+"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 ""
+"Hierdie program is gratis sagteware; jy kan dit herverdeel en/of wysig onder "
+"die bepalings van die GNU General Public License soos gepubliseer deur die "
+"Free Software Foundation; óf weergawe 2 van die lisensie, óf (na jou keuse) "
+"enige latere weergawe.\n"
+"\n"
+"Hierdie program word versprei in die hoop dat dit nuttig sal wees, maar "
+"SONDER ENIGE WAARBORG; selfs sonder die stilswyende waarborg van "
+"VERHANDELBAARHEID of GESKIKTHEID VIR 'N SPESIFIEKE DOEL. Sien die GNU "
+"General Public License vir meer besonderhede.\n"
+"\n"
+"Jy moes 'n afskrif van die GNU General Public License saam met hierdie "
+"program ontvang het; indien nie, skryf aan die Free Software Foundation, "
+"Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, VSA."
+
+#: src/filewriter/filewriter.cc:385
+msgid "Output file format:"
+msgstr "Uitset lêer formaat:"
+
+#: src/filewriter/filewriter.cc:389
+msgid "Save into original directory"
+msgstr "Stoor in oorspronklike gids"
+
+#: src/filewriter/filewriter.cc:392
+msgid "Save into custom directory:"
+msgstr "Stoor in pasgemaakte gids:"
+
+#: src/filewriter/filewriter.cc:400
+msgid "Generate file name from:"
+msgstr "Genereer lêernaam vanaf:"
+
+#: src/filewriter/filewriter.cc:401
+msgid "Original file name"
+msgstr "Oorspronklike lêernaam"
+
+#: src/filewriter/filewriter.cc:404
+msgid "Original file name (no suffix)"
+msgstr "Oorspronklike lêernaam (geen agtervoegsel)"
+
+#: src/filewriter/filewriter.cc:407
+msgid "Original file tag"
+msgstr "Oorspronklike lêeretiket"
+
+#: src/filewriter/filewriter.cc:411
+msgid "Prepend track number to file name"
+msgstr "Las snitnommer voor aan lêernaam"
+
+#: src/filewriter/filewriter.cc:417 src/filewriter/filewriter.cc:449
+msgid "Auto"
+msgstr "Outo"
+
+#: src/filewriter/filewriter.cc:418
+msgid "8000 Hz"
+msgstr "8000 Hz"
+
+#: src/filewriter/filewriter.cc:419
+msgid "11025 Hz"
+msgstr "11025 Hz"
+
+#: src/filewriter/filewriter.cc:420
+msgid "12000 Hz"
+msgstr "12000 Hz"
+
+#: src/filewriter/filewriter.cc:421
+msgid "16000 Hz"
+msgstr "16000 Hz"
+
+#: src/filewriter/filewriter.cc:422
+msgid "22050 Hz"
+msgstr "22050 Hz"
+
+#: src/filewriter/filewriter.cc:423
+msgid "24000 Hz"
+msgstr "24000 Hz"
+
+#: src/filewriter/filewriter.cc:424
+msgid "32000 Hz"
+msgstr "32000 Hz"
+
+#: src/filewriter/filewriter.cc:425 src/xsf/plugin.cc:430
+msgid "44100 Hz"
+msgstr "44100 Hz"
+
+#: src/filewriter/filewriter.cc:426 src/xsf/plugin.cc:431
+msgid "48000 Hz"
+msgstr "48000 Hz"
+
+#: src/filewriter/filewriter.cc:430
+msgid "8 kbit/s"
+msgstr "8 kbps"
+
+#: src/filewriter/filewriter.cc:431
+msgid "16 kbit/s"
+msgstr "16 kbps"
+
+#: src/filewriter/filewriter.cc:432
+msgid "32 kbit/s"
+msgstr "32 kbps"
+
+#: src/filewriter/filewriter.cc:433
+msgid "40 kbit/s"
+msgstr "40 kbps"
+
+#: src/filewriter/filewriter.cc:434
+msgid "48 kbit/s"
+msgstr "48 kbps"
+
+#: src/filewriter/filewriter.cc:435
+msgid "56 kbit/s"
+msgstr "56 kbps"
+
+#: src/filewriter/filewriter.cc:436
+msgid "64 kbit/s"
+msgstr "64 kbps"
+
+#: src/filewriter/filewriter.cc:437
+msgid "80 kbit/s"
+msgstr "80 kbps"
+
+#: src/filewriter/filewriter.cc:438
+msgid "96 kbit/s"
+msgstr "96 kbps"
+
+#: src/filewriter/filewriter.cc:439
+msgid "112 kbit/s"
+msgstr "112 kbps"
+
+#: src/filewriter/filewriter.cc:440
+msgid "128 kbit/s"
+msgstr "128 kbps"
+
+#: src/filewriter/filewriter.cc:441
+msgid "160 kbit/s"
+msgstr "160 kbps"
+
+#: src/filewriter/filewriter.cc:442
+msgid "192 kbit/s"
+msgstr "192 kbps"
+
+#: src/filewriter/filewriter.cc:443
+msgid "224 kbit/s"
+msgstr "224 kbps"
+
+#: src/filewriter/filewriter.cc:444
+msgid "256 kbit/s"
+msgstr "256 kbps"
+
+#: src/filewriter/filewriter.cc:445
+msgid "320 kbit/s"
+msgstr "320 kbps"
+
+#: src/filewriter/filewriter.cc:450
+msgid "Joint Stereo"
+msgstr "Gesamentlike stereo"
+
+#: src/filewriter/filewriter.cc:451 src/modplug/plugin_main.cc:57
+#: src/mpg123/mpg123.cc:259
+msgid "Stereo"
+msgstr "Stereo"
+
+#: src/filewriter/filewriter.cc:452 src/modplug/plugin_main.cc:56
+#: src/mpg123/mpg123.cc:260
+msgid "Mono"
+msgstr "Mono"
+
+#: src/filewriter/filewriter.cc:456
+msgid "VBR"
+msgstr "VBT"
+
+#: src/filewriter/filewriter.cc:457
+msgid "ABR"
+msgstr "ABT"
+
+#: src/filewriter/filewriter.cc:478
+msgid "Algorithm quality:"
+msgstr "Algoritme kwaliteit:"
+
+#: src/filewriter/filewriter.cc:484
+msgid "Bitrate:"
+msgstr "Bistempo:"
+
+#: src/filewriter/filewriter.cc:491
+msgid "Compression ratio:"
+msgstr "Kompressieverhouding:"
+
+#: src/filewriter/filewriter.cc:498
+msgid "Audio mode:"
+msgstr "Oudio modus:"
+
+#: src/filewriter/filewriter.cc:501
+msgid "Enforce strict ISO compliance"
+msgstr "Handhaaf streng ISO-nakoming"
+
+#: src/filewriter/filewriter.cc:503
+msgid "Error protection"
+msgstr "Foutbeskerming"
+
+#: src/filewriter/filewriter.cc:508
+msgid "Enable VBR/ABR"
+msgstr "Aktiveer VBT/ABT"
+
+#: src/filewriter/filewriter.cc:510
+msgid "Type:"
+msgstr "Tipe:"
+
+#: src/filewriter/filewriter.cc:514
+msgid "Minimum bitrate:"
+msgstr "Minimum bistempo:"
+
+#: src/filewriter/filewriter.cc:518
+msgid "Maximum bitrate:"
+msgstr "Maksimum bistempo:"
+
+#: src/filewriter/filewriter.cc:522
+msgid "Average bitrate:"
+msgstr "Gemiddelde bistempo:"
+
+#: src/filewriter/filewriter.cc:526
+msgid "VBR quality level:"
+msgstr "VBT kwaliteit vlak:"
+
+#: src/filewriter/filewriter.cc:530
+msgid "Strictly enforce minimum bitrate"
+msgstr "Handhaaf streng minimum bistempo"
+
+#: src/filewriter/filewriter.cc:533
+msgid "Omit Xing VBR header"
+msgstr "Laat Xing VBT kopskrif weg"
+
+#: src/filewriter/filewriter.cc:539
+msgid "Frame Headers"
+msgstr "Raam Kopskrif"
+
+#: src/filewriter/filewriter.cc:540
+msgid "Mark as copyright"
+msgstr "Merk as kopiereg"
+
+#: src/filewriter/filewriter.cc:542
+msgid "Mark as original"
+msgstr "Merk as oorspronklik"
+
+#: src/filewriter/filewriter.cc:544
+msgid "ID3 Tags"
+msgstr "ID3-etikette"
+
+#: src/filewriter/filewriter.cc:545
+msgid "Force addition of version 2 tag"
+msgstr "Forseer toevoeging van weergawe 2 etiket"
+
+#: src/filewriter/filewriter.cc:547
+msgid "Only add v1 tag"
+msgstr "Voeg slegs v1 etiket by"
+
+#: src/filewriter/filewriter.cc:549
+msgid "Only add v2 tag"
+msgstr "Voeg slegs v2 etiket by"
+
+#: src/filewriter/filewriter.cc:554
+msgid "Quality"
+msgstr "Kwaliteit"
+
+#: src/filewriter/filewriter.cc:555
+msgid "VBR/ABR"
+msgstr "VBT/ABT"
+
+#: src/filewriter/filewriter.cc:556
+msgid "Tags"
+msgstr "Etikette"
+
+#: src/filewriter/filewriter.cc:566
+msgid "Quality (0-1):"
+msgstr "Kwaliteit (0-1):"
+
+#: src/filewriter/filewriter.cc:573 src/skins-qt/skins_cfg.cc:307
+#: src/skins/skins_cfg.cc:289
+msgid "General"
+msgstr "Algemeen"
+
+#: src/flac/flacng.h:36
+msgid "FLAC Decoder"
+msgstr "FLAC Dekodeerder"
+
+#: src/flac/metadata.cc:296 src/wavpack/wavpack.cc:215
+msgid "lossless"
+msgstr "verliesvry"
+
+#: src/flac/plugin.cc:214
+msgid ""
+"Original code by\n"
+"Ralf Ertzinger <ralf@skytale.net>\n"
+"\n"
+"http://www.skytale.net/projects/bmp-flac2/"
+msgstr ""
+"Oorspronklike kode deur\n"
+"Ralf Ertzinger <ralf@skytale.net>\n"
+"\n"
+"http://www.skytale.net/projects/bmp-flac2/"
+
+#: src/gio/gio.cc:34
+msgid ""
+"GIO Plugin for Audacious\n"
+"Copyright 2009-2012 John Lindgren"
+msgstr ""
+"GIO Inprop vir Audacious\n"
+"Kopiereg 2009-2012 John Lindgren"
+
+#: src/gio/gio.cc:42
+msgid "GIO Plugin"
+msgstr "GIO Inprop"
+
+#: src/gio/gio.cc:152
+msgid "Read-and-append mode not supported"
+msgstr "Lees-en-byvoeg modus word nie ondersteun nie"
+
+#: src/gio/gio.cc:165
+msgid "Invalid open mode"
+msgstr "Ongeldige oop modus"
+
+#: src/glspectrum/gl-spectrum.cc:52
+msgid ""
+"OpenGL Spectrum Analyzer for Audacious\n"
+"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\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 Spektrum Ontleder vir Audacious\n"
+"Kopiereg 2013 Christophe Budé, John Lindgren en Carlo Bramini\n"
+"\n"
+"Gebaseer op die XMMS-inprop:\n"
+"Kopiereg 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson en "
+"4Front Technologies\n"
+"\n"
+"Lisensie: GPLv2+"
+
+#: src/glspectrum/gl-spectrum.cc:63 src/qtglspectrum/gl-spectrum.cc:53
+msgid "OpenGL Spectrum Analyzer"
+msgstr "OpenGL Spektrum Ontleder"
+
+#: src/gtkui/columns.cc:36 src/moonstone/playlist_model.cc:38
+#: src/qtui/playlist_model.cc:33
+msgid "Entry Number"
+msgstr "Inskrywingsnommer"
+
+#: src/gtkui/columns.cc:37 src/moonstone/playlist_model.cc:38
+#: src/moonstone/playlist_selection.cc:64
+#: src/playlist-manager/playlist-manager.cc:200
+#: src/playlist-manager-qt/playlist-manager-qt.cc:188
+#: src/qtui/playlist_model.cc:33 src/streamtuner/icecast-model.cc:120
+#: src/streamtuner/ihr-model.cc:159 src/streamtuner/shoutcast-model.cc:122
+msgid "Title"
+msgstr "Titel"
+
+#: src/gtkui/columns.cc:38 src/moonstone/playlist_model.cc:39
+#: src/qtui/playlist_model.cc:33
+msgid "Artist"
+msgstr "Kunstenaar"
+
+#: src/gtkui/columns.cc:39 src/moonstone/playlist_model.cc:39
+#: src/qtui/playlist_model.cc:33
+msgid "Year"
+msgstr "Jaar"
+
+#: src/gtkui/columns.cc:40 src/moonstone/playlist_model.cc:39
+#: src/qtui/playlist_model.cc:34
+msgid "Album"
+msgstr "Album"
+
+#: src/gtkui/columns.cc:41 src/moonstone/playlist_model.cc:40
+#: src/qtui/playlist_model.cc:34
+msgid "Album Artist"
+msgstr "Album Kunstenaar"
+
+#: src/gtkui/columns.cc:42 src/moonstone/playlist_model.cc:40
+#: src/qtui/playlist_model.cc:34
+msgid "Track"
+msgstr "Snit"
+
+#: src/gtkui/columns.cc:43 src/moonstone/playlist_model.cc:40
+#: src/qtui/playlist_model.cc:34 src/streamtuner/icecast-model.cc:123
+#: src/streamtuner/shoutcast-model.cc:125
+#: src/streamtuner/shoutcast-model.cc:236
+msgid "Genre"
+msgstr "Genre"
+
+#: src/gtkui/columns.cc:44 src/moonstone/playlist_model.cc:41
+#: src/qtui/playlist_model.cc:35
+msgid "Queue Position"
+msgstr "Tou Posisie"
+
+#: src/gtkui/columns.cc:45 src/moonstone/playlist_model.cc:41
+#: src/qtui/playlist_model.cc:35
+msgid "Length"
+msgstr "Lengte"
+
+#: src/gtkui/columns.cc:46 src/moonstone/playlist_model.cc:41
+#: src/qtui/playlist_model.cc:35
+msgid "File Path"
+msgstr "Lêer Pad"
+
+#: src/gtkui/columns.cc:47 src/moonstone/playlist_model.cc:42
+#: src/qtui/playlist_model.cc:35
+msgid "File Name"
+msgstr "Lêer Naam"
+
+#: src/gtkui/columns.cc:48 src/moonstone/playlist_model.cc:42
+#: src/qtui/playlist_model.cc:36
+msgid "Custom Title"
+msgstr "Pas gemaakte titel"
+
+#: src/gtkui/columns.cc:49 src/moonstone/playlist_model.cc:42
+#: src/qtui/playlist_model.cc:36 src/streamtuner/icecast-model.cc:129
+#: src/streamtuner/shoutcast-model.cc:134
+msgid "Bitrate"
+msgstr "Bistempo"
+
+#: src/gtkui/columns.cc:50 src/moonstone/playlist_model.cc:43
+#: src/qtui/playlist_model.cc:36
+msgid "Comment"
+msgstr "Kommentaar"
+
+#: src/gtkui/columns.cc:51 src/qtui/playlist_model.cc:36
+msgid "Publisher"
+msgstr "Uitgewer"
+
+#: src/gtkui/columns.cc:52 src/qtui/playlist_model.cc:37
+msgid "Catalog Number"
+msgstr "Katalogusnommer"
+
+#: src/gtkui/columns.cc:53 src/moonstone/playlist_model.cc:43
+#: src/qtui/playlist_model.cc:37
+msgid "Disc"
+msgstr ""
+
+#: src/gtkui/columns.cc:325
+msgid "Available columns"
+msgstr "Beskikbare kolomme"
+
+#: src/gtkui/columns.cc:351
+msgid "Displayed columns"
+msgstr "Vertoonde kolomme"
+
+#: src/gtkui/layout.cc:74 src/search-tool-qt/search-tool-qt.cc:58
+#: src/search-tool/search-tool.cc:49
+msgid "Search Tool"
+msgstr "Soek gereedskap"
+
+#: src/gtkui/layout.cc:170
+msgid "Dock at Left"
+msgstr "Dok aan Linkerkant"
+
+#: src/gtkui/layout.cc:170
+msgid "Dock at Right"
+msgstr "Dok aan Regterkant"
+
+#: src/gtkui/layout.cc:171
+msgid "Dock at Top"
+msgstr "Dok aan Bokant"
+
+#: src/gtkui/layout.cc:171
+msgid "Dock at Bottom"
+msgstr "Dok aan Onderkant"
+
+#: src/gtkui/layout.cc:171
+msgid "Undock"
+msgstr "Ontdok"
+
+#: src/gtkui/layout.cc:171 src/ladspa/plugin.cc:540
+msgid "Disable"
+msgstr "Deaktiveer"
+
+#: src/gtkui/menus.cc:79 src/qtui/menus.cc:107
+#: src/statusicon-qt/statusicon.cc:115 src/statusicon/statusicon.cc:286
+msgid "_Open Files ..."
+msgstr "Maak Lêers _Oop ..."
+
+#: src/gtkui/menus.cc:80 src/qtui/menus.cc:111
+msgid "Open _URL ..."
+msgstr "Maak _URL Oop ..."
+
+#: src/gtkui/menus.cc:81 src/qtui/menus.cc:113
+msgid "_Add Files ..."
+msgstr "Voeg Lêers By ..."
+
+#: src/gtkui/menus.cc:82 src/qtui/menus.cc:118
+msgid "Add U_RL ..."
+msgstr "Voeg U_RL By ..."
+
+#: src/gtkui/menus.cc:84 src/qtui/menus.cc:120
+msgid "Search _Library"
+msgstr "Deursoek Biblioteek "
+
+#: src/gtkui/menus.cc:86 src/qtui/menus.cc:123
+msgid "A_bout ..."
+msgstr "Aangaande ..."
+
+#: src/gtkui/menus.cc:87 src/qtui/menus.cc:125
+msgid "_Settings ..."
+msgstr "_Stellings ..."
+
+#: src/gtkui/menus.cc:88 src/qtui/menus.cc:131
+#: src/statusicon-qt/statusicon.cc:117 src/statusicon/statusicon.cc:288
+msgid "_Quit"
+msgstr "Verlaat"
+
+#: src/gtkui/menus.cc:92 src/gtkui/menus.cc:226
+#: src/moonstone/playlist_tabs.cc:306 src/qtui/menus.cc:135
+#: src/qtui/playlist_tabs.cc:331 src/search-tool-qt/search-tool-qt.cc:499
+#: src/search-tool/search-tool.cc:339 src/statusicon-qt/statusicon.cc:109
+#: src/statusicon/statusicon.cc:280
+msgid "_Play"
+msgstr "_Speel"
+
+#: src/gtkui/menus.cc:93 src/qtui/menus.cc:137
+#: src/statusicon-qt/statusicon.cc:110 src/statusicon/statusicon.cc:281
+msgid "Paus_e"
+msgstr "Pous_eer"
+
+#: src/gtkui/menus.cc:94 src/qtui/menus.cc:139
+#: src/statusicon-qt/statusicon.cc:111 src/statusicon/statusicon.cc:282
+msgid "_Stop"
+msgstr "_Stop"
+
+#: src/gtkui/menus.cc:95 src/qtui/menus.cc:141
+#: src/statusicon-qt/statusicon.cc:112 src/statusicon/statusicon.cc:283
+msgid "Pre_vious"
+msgstr "Vorige"
+
+#: src/gtkui/menus.cc:96 src/qtui/menus.cc:143
+#: src/statusicon-qt/statusicon.cc:113 src/statusicon/statusicon.cc:284
+msgid "_Next"
+msgstr "Volgende"
+
+#: src/gtkui/menus.cc:97 src/qtui/menus.cc:145 src/skins/menus.cc:114
+#: src/skins-qt/menus.cc:105
+msgid "Previous Album"
+msgstr "Vorige Album"
+
+#: src/gtkui/menus.cc:98 src/qtui/menus.cc:146 src/skins/menus.cc:115
+#: src/skins-qt/menus.cc:106
+msgid "Next Album"
+msgstr "Volgende Album"
+
+#: src/gtkui/menus.cc:100 src/qtui/menus.cc:148
+msgid "_Repeat"
+msgstr "Herhaal"
+
+#: src/gtkui/menus.cc:101 src/qtui/menus.cc:150
+msgid "S_huffle"
+msgstr "Skommel"
+
+#: src/gtkui/menus.cc:102 src/qtui/menus.cc:152
+msgid "Shuffle by Albu_m"
+msgstr "Skoffel volgens Albu_ms"
+
+#: src/gtkui/menus.cc:103 src/qtui/menus.cc:155
+msgid "N_o Playlist Advance"
+msgstr "Geen Snitlys Outo-vordering Nie"
+
+#: src/gtkui/menus.cc:104 src/qtui/menus.cc:157
+msgid "Stop A_fter This Song"
+msgstr "Stop Na Hierdie Lied"
+
+#: src/gtkui/menus.cc:106 src/gtkui/menus.cc:210 src/qtui/menus.cc:162
+#: src/qtui/menus.cc:294
+msgid "Song _Info ..."
+msgstr "Lied _Info ..."
+
+#: src/gtkui/menus.cc:107
+msgid "Jump to _Time ..."
+msgstr "Spring tot _Tyd ..."
+
+#: src/gtkui/menus.cc:108
+msgid "_Jump to Song ..."
+msgstr "Spring tot Lied ..."
+
+#: src/gtkui/menus.cc:110 src/qtui/menus.cc:165
+msgid "Set Repeat Point _A"
+msgstr "Stel Herhaal Punt _A"
+
+#: src/gtkui/menus.cc:111 src/qtui/menus.cc:167
+msgid "Set Repeat Point _B"
+msgstr "Stel Herhaal Punt _B"
+
+#: src/gtkui/menus.cc:112 src/qtui/menus.cc:169
+msgid "_Clear Repeat Points"
+msgstr "Maak herhalingspunte skoon"
+
+#: src/gtkui/menus.cc:116 src/gtkui/menus.cc:123 src/gtkui/menus.cc:141
+#: src/qtui/menus.cc:173 src/qtui/menus.cc:180 src/qtui/menus.cc:198
+msgid "By _Title"
+msgstr "Volgens _Titel"
+
+#: src/gtkui/menus.cc:117 src/qtui/menus.cc:174
+msgid "By _File Name"
+msgstr "Volgens Lêer Naam"
+
+#: src/gtkui/menus.cc:118 src/qtui/menus.cc:175
+msgid "By File _Path"
+msgstr "Volgens Lêer Pad"
+
+#: src/gtkui/menus.cc:122 src/gtkui/menus.cc:140 src/qtui/menus.cc:179
+#: src/qtui/menus.cc:197
+msgid "By Track _Number"
+msgstr "Volgens Snit _Nommer"
+
+#: src/gtkui/menus.cc:124 src/gtkui/menus.cc:142 src/qtui/menus.cc:181
+#: src/qtui/menus.cc:199
+msgid "By _Artist"
+msgstr "Volgens Kunstenaar"
+
+#: src/gtkui/menus.cc:125 src/gtkui/menus.cc:143 src/qtui/menus.cc:182
+#: src/qtui/menus.cc:200
+msgid "By Al_bum"
+msgstr "Volgens Al_bum"
+
+#: src/gtkui/menus.cc:126 src/gtkui/menus.cc:144 src/qtui/menus.cc:183
+#: src/qtui/menus.cc:201
+msgid "By Albu_m Artist"
+msgstr "Volgens Albu_m Kunstenaar"
+
+#: src/gtkui/menus.cc:127 src/gtkui/menus.cc:145 src/qtui/menus.cc:184
+#: src/qtui/menus.cc:202
+msgid "By Release _Date"
+msgstr "Volgens Vrystelling _Datum"
+
+#: src/gtkui/menus.cc:128 src/gtkui/menus.cc:146 src/qtui/menus.cc:185
+#: src/qtui/menus.cc:203
+msgid "By _Genre"
+msgstr "Volgens _Genre"
+
+#: src/gtkui/menus.cc:129 src/gtkui/menus.cc:147 src/qtui/menus.cc:186
+#: src/qtui/menus.cc:204
+msgid "By _Length"
+msgstr "Volgens _Lengte"
+
+#: src/gtkui/menus.cc:130 src/gtkui/menus.cc:148 src/qtui/menus.cc:187
+#: src/qtui/menus.cc:205
+msgid "By _File Path"
+msgstr "Volgens Lêer Pad"
+
+#: src/gtkui/menus.cc:131 src/gtkui/menus.cc:149 src/qtui/menus.cc:188
+#: src/qtui/menus.cc:206
+msgid "By _Custom Title"
+msgstr "By Pasgemaakte Titel"
+
+#: src/gtkui/menus.cc:132 src/gtkui/menus.cc:150 src/qtui/menus.cc:189
+#: src/qtui/menus.cc:207
+msgid "By C_omment"
+msgstr "By K_ommentaar"
+
+#: src/gtkui/menus.cc:133 src/gtkui/menus.cc:151 src/qtui/menus.cc:190
+#: src/qtui/menus.cc:208
+msgid "By D_isc Number"
+msgstr ""
+
+#: src/gtkui/menus.cc:135 src/gtkui/menus.cc:153 src/qtui/menus.cc:192
+#: src/qtui/menus.cc:210
+msgid "R_everse Order"
+msgstr "Omg_ekeerde Volgorde"
+
+#: src/gtkui/menus.cc:136 src/gtkui/menus.cc:154 src/qtui/menus.cc:194
+#: src/qtui/menus.cc:212
+msgid "_Random Order"
+msgstr "Ewekansige Volgorde"
+
+#: src/gtkui/menus.cc:158 src/qtui/menus.cc:216
+msgid "_Play/Resume"
+msgstr "Speel/Hervat"
+
+#: src/gtkui/menus.cc:159 src/qtui/menus.cc:218
+msgid "_Refresh"
+msgstr "Verfris"
+
+#: src/gtkui/menus.cc:161 src/qtui/menus.cc:222
+msgid "_Sort"
+msgstr "_Sorteer"
+
+#: src/gtkui/menus.cc:162 src/qtui/menus.cc:223
+msgid "Sort Se_lected"
+msgstr "Sorteer Seleksie"
+
+#: src/gtkui/menus.cc:163 src/qtui/menus.cc:225
+msgid "Remove _Duplicates"
+msgstr "Verwyder _Duplikate"
+
+#: src/gtkui/menus.cc:164 src/qtui/menus.cc:226
+msgid "Remove _Unavailable Files"
+msgstr "Verwyder Onbeskikbare Lêers"
+
+#: src/gtkui/menus.cc:166 src/playlist-manager/playlist-manager.cc:219
+#: src/playlist-manager-qt/playlist-manager-qt.cc:348 src/qtui/menus.cc:229
+msgid "_New"
+msgstr "_Nuwe"
+
+#: src/gtkui/menus.cc:167 src/qtui/menus.cc:230
+msgid "Ren_ame ..."
+msgstr "Hernoem ..."
+
+#: src/gtkui/menus.cc:168 src/gtkui/menus.cc:228
+#: src/moonstone/playlist_tabs.cc:311 src/qtui/menus.cc:231
+#: src/qtui/playlist_tabs.cc:336
+msgid "Remo_ve"
+msgstr "Verwyder"
+
+#: src/gtkui/menus.cc:170 src/qtui/menus.cc:233
+msgid "_Import ..."
+msgstr "Voer in ..."
+
+#: src/gtkui/menus.cc:171 src/qtui/menus.cc:234
+msgid "_Export ..."
+msgstr "Voer uit ..."
+
+#: src/gtkui/menus.cc:173 src/qtui/menus.cc:237
+msgid "Playlist _Manager ..."
+msgstr "Snitlys Bestuurder ..."
+
+#: src/gtkui/menus.cc:174 src/qtui/menus.cc:239
+msgid "_Queue Manager ..."
+msgstr "Tou Bestuurder ..."
+
+#: src/gtkui/menus.cc:178 src/qtui/menus.cc:243
+msgid "Volume _Up"
+msgstr "Volume Op"
+
+#: src/gtkui/menus.cc:179 src/qtui/menus.cc:245
+msgid "Volume _Down"
+msgstr "Volume Af"
+
+#: src/gtkui/menus.cc:181 src/qtui/menus.cc:249
+msgid "_Equalizer ..."
+msgstr "Gelykmaker ..."
+
+#: src/gtkui/menus.cc:182 src/qtui/menus.cc:251
+msgid "E_ffects ..."
+msgstr "E_ffekte ..."
+
+#: src/gtkui/menus.cc:184
+msgid "_Record Stream"
+msgstr "Neem Stroom Op"
+
+#: src/gtkui/menus.cc:185
+msgid "Audio _Settings ..."
+msgstr "Oudio _Stellings ..."
+
+#: src/gtkui/menus.cc:189 src/qtui/menus.cc:260
+msgid "Show _Menu Bar"
+msgstr "Wys kieslysbalk"
+
+#: src/gtkui/menus.cc:190 src/qtui/menus.cc:262
+msgid "Show I_nfo Bar"
+msgstr "Wys Infobalk"
+
+#: src/gtkui/menus.cc:191 src/qtui/menus.cc:264
+msgid "Show Info Bar _Album Art"
+msgstr "Wys Infobalk _Album Kuns"
+
+#: src/gtkui/menus.cc:192 src/qtui/menus.cc:266
+msgid "Show Info Bar Vis_ualization"
+msgstr "Wys Infobalk Vis_ualisering"
+
+#: src/gtkui/menus.cc:193 src/qtui/menus.cc:268
+msgid "Show _Status Bar"
+msgstr "Wys _Status Balk"
+
+#: src/gtkui/menus.cc:195 src/qtui/menus.cc:272
+msgid "Show _Remaining Time"
+msgstr "Wys Oorblywende Tyd"
+
+#: src/gtkui/menus.cc:197 src/qtui/menus.cc:276 src/skins/menus.cc:157
+#: src/skins-qt/menus.cc:152
+msgid "_Visualizations ..."
+msgstr "_Visualiserings ..."
+
+#: src/gtkui/menus.cc:201 src/qtui/menus.cc:280
+msgid "_File"
+msgstr "Lêer ..."
+
+#: src/gtkui/menus.cc:202 src/qtui/menus.cc:281
+msgid "_Playback"
+msgstr "Terugspeel"
+
+#: src/gtkui/menus.cc:203 src/qtui/menus.cc:282
+msgid "P_laylist"
+msgstr "Snit_lys"
+
+#: src/gtkui/menus.cc:204 src/gtkui/menus.cc:222 src/qtui/menus.cc:283
+#: src/qtui/menus.cc:312
+msgid "_Services"
+msgstr "Dienste"
+
+#: src/gtkui/menus.cc:205 src/qtui/menus.cc:284
+msgid "_Output"
+msgstr "Uitset"
+
+#: src/gtkui/menus.cc:206 src/qtui/menus.cc:285
+msgid "_View"
+msgstr "Aansig"
+
+#: src/gtkui/menus.cc:211 src/qtui/menus.cc:296
+msgid "_Queue/Unqueue"
+msgstr "Tou/Ontou"
+
+#: src/gtkui/menus.cc:213 src/qtui/menus.cc:299
+msgid "_Open Containing Folder"
+msgstr "Maak Bevattende Gids _Oop"
+
+#: src/gtkui/menus.cc:214 src/qtui/menus.cc:301
+msgid "_Refresh Selected"
+msgstr "Verfris Seleksie"
+
+#: src/gtkui/menus.cc:216 src/qtui/menus.cc:304
+msgid "Cu_t"
+msgstr "Sny"
+
+#: src/gtkui/menus.cc:217 src/qtui/menus.cc:305
+msgid "_Copy"
+msgstr "Kopie"
+
+#: src/gtkui/menus.cc:218 src/qtui/menus.cc:306
+msgid "_Paste"
+msgstr "_Plak"
+
+#: src/gtkui/menus.cc:219 src/qtui/menus.cc:307
+msgid "Paste at _End"
+msgstr "Plak op _Einde"
+
+#: src/gtkui/menus.cc:220 src/qtui/menus.cc:309
+msgid "Select _All"
+msgstr "Selekteer _Alles"
+
+#: src/gtkui/menus.cc:227 src/moonstone/playlist_tabs.cc:309
+#: src/qtui/playlist_tabs.cc:334
+msgid "_Rename ..."
+msgstr "Hernoem ..."
+
+#: src/gtkui/settings.cc:35 src/qtui/settings.cc:59
+msgid "Always"
+msgstr "Altyd"
+
+#: src/gtkui/settings.cc:36 src/qtui/settings.cc:60
+msgid "Auto-hide"
+msgstr "Versteek outomaties"
+
+#: src/gtkui/settings.cc:37 src/qtui/settings.cc:61
+msgid "Never"
+msgstr "Nooit"
+
+#: src/gtkui/settings.cc:41 src/qtui/settings.cc:64
+msgid "Playlist Tabs"
+msgstr "Snitlys Oortjies"
+
+#: src/gtkui/settings.cc:42 src/qtui/settings.cc:65
+msgid "Show playlist tabs:"
+msgstr "Wys snitlys oortjies:"
+
+#: src/gtkui/settings.cc:45 src/qtui/settings.cc:69
+msgid "Show entry counts"
+msgstr "Wys item tellings"
+
+#: src/gtkui/settings.cc:47 src/qtui/settings.cc:72
+msgid "Show close buttons"
+msgstr "Wys maak toe knoppies"
+
+#: src/gtkui/settings.cc:49 src/qtui/settings.cc:75
+msgid "Playlist Columns"
+msgstr "Snitlys Kolomme"
+
+#: src/gtkui/settings.cc:51 src/qtui/settings.cc:77
+msgid "Show column headers"
+msgstr "Wys kolom opskrifte"
+
+#: src/gtkui/settings.cc:53 src/qtui/settings.cc:82
+msgid "Make column headers clickable for sorting"
+msgstr ""
+
+#: src/gtkui/settings.cc:56
+msgid "Use symbolic icons in toolbar"
+msgstr "Gebruik simboliese ikone in die nutsbalk"
+
+#: src/gtkui/settings.cc:58 src/qtui/settings.cc:86
+msgid "Scroll on song change"
+msgstr "Rollees op lied verandering"
+
+#: src/gtkui/ui_gtk.cc:82
+msgid "GTK Interface"
+msgstr "GTK Koppelvlak"
+
+#: src/gtkui/ui_gtk.cc:219 src/skins/main.cc:228 src/skins-qt/main.cc:231
+#, c-format
+msgid "%s - Audacious"
+msgstr "%s - Audacious"
+
+#: src/gtkui/ui_gtk.cc:221 src/moonstone/main_window.cc:184
+#: src/qtui/main_window.cc:385
+msgid "Buffering ..."
+msgstr "Buffer tans..."
+
+#: src/gtkui/ui_gtk.cc:224 src/pipewire/pipewire.cc:402 src/skins/main.cc:230
+#: src/skins-qt/main.cc:233
+msgid "Audacious"
+msgstr "Audacious"
+
+#: src/gtkui/ui_gtk.cc:487 src/gtkui/ui_gtk.cc:518 src/gtkui/ui_gtk.cc:882
+#: src/hotkey/gui.cc:72 src/moonstone/main_window.cc:67
+#: src/moonstone/main_window.cc:145 src/moonstone/main_window.cc:146
+#: src/notify/osd.cc:85 src/qthotkey/gui.cc:67 src/qtui/main_window.cc:154
+#: src/qtui/main_window.cc:347 src/qtui/main_window.cc:348
+#: src/skins/menus.cc:109 src/skins-qt/menus.cc:100
+msgid "Play"
+msgstr "Speel"
+
+#: src/gtkui/ui_gtk.cc:487 src/moonstone/main_window.cc:151
+#: src/moonstone/main_window.cc:152 src/notify/osd.cc:82
+#: src/qtui/main_window.cc:353 src/qtui/main_window.cc:354
+#: src/skins/menus.cc:110 src/skins-qt/menus.cc:101
+msgid "Pause"
+msgstr "Pouseer"
+
+#: src/gtkui/ui_gtk.cc:868 src/moonstone/main_window.cc:57
+#: src/qtui/main_window.cc:145 src/skins/menus.cc:86 src/skins-qt/menus.cc:77
+msgid "Search Library"
+msgstr "Deursoek Biblioteek"
+
+#: src/gtkui/ui_gtk.cc:875 src/moonstone/main_window.cc:60
+#: src/qtui/main_window.cc:147
+msgid "Open Files"
+msgstr "Maak Lêers Oop"
+
+#: src/gtkui/ui_gtk.cc:876 src/moonstone/main_window.cc:62
+#: src/qtui/main_window.cc:149
+msgid "Add Files"
+msgstr "Voeg Lêers By"
+
+#: src/gtkui/ui_gtk.cc:881 src/moonstone/main_window.cc:65
+#: src/qtui/main_window.cc:152 src/skins/menus.cc:112 src/skins-qt/menus.cc:103
+msgid "Previous"
+msgstr "Vorige"
+
+#: src/gtkui/ui_gtk.cc:883 src/hotkey/gui.cc:74 src/moonstone/main_window.cc:69
+#: src/qthotkey/gui.cc:69 src/qtui/main_window.cc:156 src/skins/menus.cc:111
+#: src/skins-qt/menus.cc:102
+msgid "Stop"
+msgstr "Stop"
+
+#: src/gtkui/ui_gtk.cc:884 src/moonstone/main_window.cc:76 src/notify/osd.cc:89
+#: src/qtui/main_window.cc:163 src/skins/menus.cc:113 src/skins-qt/menus.cc:104
+msgid "Next"
+msgstr "Volgende"
+
+#: src/gtkui/ui_gtk.cc:886 src/moonstone/main_window.cc:79
+#: src/qtui/main_window.cc:166 src/qtui/menus.cc:254 src/skins/menus.cc:79
+#: src/skins-qt/menus.cc:69
+msgid "Record Stream"
+msgstr "Neem Stroom Op"
+
+#: src/gtkui/ui_gtk.cc:919 src/moonstone/main_window.cc:86
+#: src/qtui/main_window.cc:173 src/skins/menus.cc:103 src/skins-qt/menus.cc:94
+msgid "Repeat"
+msgstr "Herhaal"
+
+#: src/gtkui/ui_gtk.cc:922 src/moonstone/main_window.cc:89
+#: src/qtui/main_window.cc:176 src/skins/menus.cc:104 src/skins-qt/menus.cc:95
+msgid "Shuffle"
+msgstr "Skoffel"
+
+#: src/gtkui/ui_gtk.cc:1114 src/qtui/main_window.cc:123
+msgid "Menu"
+msgstr "Kieslys"
+
+#: src/gtkui/ui_statusbar.cc:64 src/qtui/status_bar.cc:155
+msgid "mono"
+msgstr "mono"
+
+#: src/gtkui/ui_statusbar.cc:66 src/qtui/status_bar.cc:157
+msgid "stereo"
+msgstr "stereo"
+
+#: src/gtkui/ui_statusbar.cc:68 src/qtui/status_bar.cc:160
+#, c-format
+msgid "%d channel"
+msgid_plural "%d channels"
+msgstr0 "%d kanaal"
+msgstr1 "%d kanale"
+
+#: src/gtkui/ui_statusbar.cc:76 src/qtui/status_bar.cc:168
+#, c-format
+msgid "%d kHz"
+msgstr "%d kHz"
+
+#: src/gtkui/ui_statusbar.cc:82 src/qtui/status_bar.cc:174
+#, c-format
+msgid "%d kbit/s"
+msgstr "%d kbps"
+
+#: src/gtkui/ui_statusbar.cc:108 src/skins/main.cc:478 src/skins-qt/main.cc:461
+msgid "Single mode."
+msgstr "Enkel modus."
+
+#: src/gtkui/ui_statusbar.cc:110 src/skins/main.cc:480 src/skins-qt/main.cc:463
+msgid "Playlist mode."
+msgstr "Snitlys modus."
+
+#: src/gtkui/ui_statusbar.cc:118 src/skins/main.cc:486 src/skins-qt/main.cc:469
+msgid "Stopping after song."
+msgstr "Gaan stop na lied."
+
+#: src/hotkey/gui.cc:71 src/qthotkey/gui.cc:66
+msgid "Previous track"
+msgstr "Vorige snit"
+
+#: src/hotkey/gui.cc:73 src/qthotkey/gui.cc:68
+msgid "Pause/Resume"
+msgstr "Pouseer/Hervat"
+
+#: src/hotkey/gui.cc:75 src/qthotkey/gui.cc:70
+msgid "Next track"
+msgstr "Volgende snit"
+
+#: src/hotkey/gui.cc:76 src/qthotkey/gui.cc:71
+msgid "Step forward"
+msgstr "Tree voorwaarts"
+
+#: src/hotkey/gui.cc:77 src/qthotkey/gui.cc:72
+msgid "Step backward"
+msgstr "Tree terugwaarts"
+
+#: src/hotkey/gui.cc:78 src/qthotkey/gui.cc:73
+msgid "Mute"
+msgstr "Demp"
+
+#: src/hotkey/gui.cc:79 src/qthotkey/gui.cc:74
+msgid "Volume up"
+msgstr "Volume op"
+
+#: src/hotkey/gui.cc:80 src/qthotkey/gui.cc:75
+msgid "Volume down"
+msgstr "Volume af"
+
+#: src/hotkey/gui.cc:81 src/qthotkey/gui.cc:76
+msgid "Jump to file"
+msgstr "Spring tot lêer"
+
+#: src/hotkey/gui.cc:82 src/qthotkey/gui.cc:77
+msgid "Toggle player window(s)"
+msgstr "Wissel speler venster(s)"
+
+#: src/hotkey/gui.cc:83 src/qthotkey/gui.cc:78
+msgid "Show On-Screen-Display"
+msgstr "Wys Op-Skerm-Vertoon"
+
+#: src/hotkey/gui.cc:84 src/qthotkey/gui.cc:79
+msgid "Toggle repeat"
+msgstr "Wissel herhaal"
+
+#: src/hotkey/gui.cc:85 src/qthotkey/gui.cc:80
+msgid "Toggle shuffle"
+msgstr "Wissel skoffel"
+
+#: src/hotkey/gui.cc:86 src/qthotkey/gui.cc:81
+msgid "Toggle stop after current"
+msgstr "Wissel stop na huidige"
+
+#: src/hotkey/gui.cc:87 src/qthotkey/gui.cc:82
+msgid "Raise player window(s)"
+msgstr "Lig speler venster(s) op"
+
+#: src/hotkey/gui.cc:98 src/qthotkey/gui.cc:100
+msgid "(none)"
+msgstr "(geen)"
+
+#: src/hotkey/gui.cc:261
+msgid ""
+"It is not recommended to bind the primary mouse buttons without modifiers.\n"
+"\n"
+"Do you want to continue?"
+msgstr ""
+"Dit word nie aanbeveel om die primêre muisknoppies te sonder wysigers te "
+"bind nie.\n"
+"\n"
+"Wil jy voortgaan?"
+
+#: src/hotkey/gui.cc:264
+msgid "Binding mouse buttons"
+msgstr "Binding van muisknoppies"
+
+#: src/hotkey/gui.cc:434
+msgid ""
+"Press a key combination inside a text field.\n"
+"You can also bind mouse buttons."
+msgstr ""
+"Druk 'n sleutelkombinasie binne 'n teksveld.\n"
+"Jy kan ook muisknoppies bind."
+
+#: src/hotkey/gui.cc:444 src/qthotkey/gui.cc:179
+msgid "Hotkeys:"
+msgstr "Snelsleutels:"
+
+#: src/hotkey/gui.cc:457 src/qthotkey/gui.cc:181
+msgid "Action:"
+msgstr "Aksie:"
+
+#: src/hotkey/gui.cc:461 src/qthotkey/gui.cc:182
+msgid "Key Binding:"
+msgstr "Sleutel Binding:"
+
+#: src/hotkey/gui.cc:518 src/qthotkey/gui.cc:184
+msgid "_Add"
+msgstr "Voeg by"
+
+#: src/hotkey/plugin.cc:59 src/qthotkey/plugin.cc:78
+msgid "Global Hotkeys"
+msgstr "Globale Snelsleutels"
+
+#: src/hotkey/plugin.cc:74
+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"
+"Contributors 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 ""
+"Globale Snelsleutel Inprop\n"
+"Beheer die speler met globale sleutelkombinasies of multimediasleutels.\n"
+"\n"
+"Kopiereg (K) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n"
+"\n"
+"Bydraers sluit in:\n"
+"Kopiereg (K) 2006-2007 Vladimir Paskov <vlado.paskov@gmail.com>\n"
+"Kopiereg (K) 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/jack/jack-ng.cc:54
+msgid "JACK Output"
+msgstr "JACK Uitset"
+
+#: src/jack/jack-ng.cc:126
+msgid "Client name:"
+msgstr "Kliënt naam:"
+
+#: src/jack/jack-ng.cc:128
+msgid "Automatically connect to output ports"
+msgstr "Konnekteer outomaties aan uitset poorte"
+
+#: src/jack/jack-ng.cc:130
+msgid "Filter ports (regex, use any port if blank):"
+msgstr "Filtreer poorte (regex, gebruik enige poort as leeg):"
+
+#: src/jack/jack-ng.cc:136
+msgid "Connect to physical ports only"
+msgstr "Koppel slegs aan fisiese poorte"
+
+#: src/jack/jack-ng.cc:139
+msgid "Upmix to"
+msgstr "\"Upmix\" na"
+
+#: src/jack/jack-ng.cc:141
+msgid "ports if input has fewer channels"
+msgstr "poorte as inset minder kanale het"
+
+#: src/jack/jack-ng.cc:143
+msgid "Ignore insufficient number of ports"
+msgstr "Ignoreer onvoldoende aantal poorte"
+
+#: src/jack/jack-ng.cc:181
+msgid "No JACK output ports were found. Please check settings."
+msgstr "Geen JACK uitset poorte was gevind nie. Hersien asseblief stellings."
+
+#: src/jack/jack-ng.cc:195
+#, c-format
+msgid "Only %d JACK output ports were found but %d are required."
+msgstr "Slegs %dJACK uitset poorte was gevind maar %dword benodig."
+
+#: src/jack/jack-ng.cc:210
+#, c-format
+msgid "Failed to connect to JACK port %s."
+msgstr "Kon nie aan JACK-poort %s koppel nie."
+
+#: src/jack/jack-ng.cc:230
+msgid ""
+"JACK supports only floating-point audio. You must change the output bit "
+"depth to floating-point in Audacious settings."
+msgstr ""
+"JACK ondersteun slegs drywende-punt-klank. Jy moet die uitset bisdiepte na "
+"drywende-punt in Audacious-instellings verander."
+
+#: src/jack/jack-ng.cc:245
+msgid "Failed to connect to the JACK server; is it running?"
+msgstr "Kon nie aan JACK-bediener koppel nie; Hardloop dit?"
+
+#: src/jack/jack-ng.cc:321
+#, c-format
+msgid ""
+"The JACK server requires a sample rate of %d Hz, but Audacious is playing at "
+"%d Hz. Please use the Sample Rate Converter effect to correct the mismatch."
+msgstr ""
+"Die JACK-bediener vereis 'n monstertempo van %d Hz, maar Audacious speel "
+"teen %d Hz. Gebruik asseblief die MonsterTempoOmsitter-effek om die "
+"wanpassing reg te stel."
+
+#: src/ladspa/plugin.cc:416
+#, c-format
+msgid "%s Settings"
+msgstr "%s Stellings"
+
+#: src/ladspa/plugin.cc:482
+msgid "Module paths:"
+msgstr "Module paaie:"
+
+#: src/ladspa/plugin.cc:487
+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 ""
+"Skei verskeie paaie met 'n dubbelpunt.\n"
+"Hierdie paaie, so wel as LADSPA_PATH, word deursoek.\n"
+"Nadat u nuwe paaie bygevoeg het, druk Enter om vir nuwe inproppe te soek.</"
+"small>"
+
+#: src/ladspa/plugin.cc:508
+msgid "Available plugins:"
+msgstr "Beskikbare inproppe:"
+
+#: src/ladspa/plugin.cc:521 src/modplug/plugin_main.cc:91
+#: src/modplug/plugin_main.cc:94 src/modplug/plugin_main.cc:97
+#: src/modplug/plugin_main.cc:100
+msgid "Enable"
+msgstr "Aktiveer"
+
+#: src/ladspa/plugin.cc:527
+msgid "Enabled plugins:"
+msgstr "Aktiveer inproppe:"
+
+#: src/ladspa/plugin.cc:543
+msgid "Settings"
+msgstr "Stellings"
+
+#: src/ladspa/plugin.cc:560
+msgid ""
+"LADSPA Host for Audacious\n"
+"Copyright 2011 John Lindgren"
+msgstr ""
+"LADSPA Gasheer vir Audacious\n"
+"Kopiereg 2011 John Lindgren"
+
+#: src/ladspa/plugin.h:78
+msgid "LADSPA Host"
+msgstr "LADSPA Gasheer"
+
+#: src/lirc/lirc.cc:55
+msgid "LIRC Plugin"
+msgstr "LIRC Inprop"
+
+#: src/lirc/lirc.cc:379
+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 ""
+"'n Eenvoudige inprop om Audacious te beheer deur die LIRC-afstandbeheer "
+"damonion te gebruik\n"
+"\n"
+"Aangepas vir Audacious deur:\n"
+"Tony Vroon <chainsaw@gentoo.org>\n"
+"Joonas Harjumäki <jharjuma@gmail.com>\n"
+"\n"
+"Gebaseer op die XMMS LIRC-inprop deur:\n"
+"Carl van Schaik <carl@leg.uct.ac.za>\n"
+"Christoph Bartelmus <xmms@bartelmus.de>\n"
+"Andrew O. Shadoura <bugzilla@tut.by>\n"
+"\n"
+"Vir meer inligting oor LIRC, sien http://lirc.org."
+
+#: src/lirc/lirc.cc:390
+msgid "Connection"
+msgstr "Konneksie"
+
+#: src/lirc/lirc.cc:391
+msgid "Reconnect to LIRC server"
+msgstr "Herkoppel aan LIRC-bediener"
+
+#: src/lirc/lirc.cc:393
+msgid "Wait before reconnecting:"
+msgstr "Wag voor herkoppel:"
+
+#: src/lyrics-common/chart_lyrics_provider.cc:93
+#: src/lyrics-common/chart_lyrics_provider.cc:150
+#: src/lyrics-common/lyrics_ovh_provider.cc:50
+#, c-format
+msgid "Unable to fetch %s"
+msgstr "Kan nie %s gaan haal nie"
+
+#: src/lyrics-common/chart_lyrics_provider.cc:100
+#: src/lyrics-common/chart_lyrics_provider.cc:157
+#: src/lyrics-common/lyrics_ovh_provider.cc:57
+#, c-format
+msgid "Unable to parse %s"
+msgstr "Kan nie %s ontleed nie"
+
+#: src/lyrics-common/chart_lyrics_provider.cc:121
+#: src/lyrics-common/chart_lyrics_provider.cc:194
+#: src/lyrics-common/lyrics_ovh_provider.cc:88
+msgid "Looking for lyrics ..."
+msgstr "Soek vir lirieke ..."
+
+#: src/lyrics-common/preferences.h:43
+msgid "Nowhere"
+msgstr "Nêrens nie"
+
+#: src/lyrics-common/preferences.h:49
+msgid "Artist is truncated at the start, Title -- at the end"
+msgstr ""
+"Kunstenaar word aan die begin afgekap, Titel -- aan die einde"
+
+#: src/lyrics-common/preferences.h:50
+msgid "Chars to truncate on:"
+msgstr "Karakters om af te kap:"
+
+#: src/lyrics-common/preferences.h:54
+msgid "Chars are ORed in RegExp, surrounded by whitespace"
+msgstr "Karakters word ge-OF in RegExp, omring deur witspasie"
+
+#: src/lyrics-common/preferences.h:55
+msgid "Chars to split on:"
+msgstr "Karakters om op te verdeel:"
+
+#: src/lyrics-common/preferences.h:56
+msgid "Further truncate those on chars"
+msgstr "Knip dié op karakters verder af"
+
+#: src/lyrics-common/preferences.h:62
+msgid "General"
+msgstr "Algemeen"
+
+#: src/lyrics-common/preferences.h:63
+msgid "Split title into artist and title on chars"
+msgstr "Verdeel titel, in kunstenaar en titel op, volgens karakters"
+
+#: src/lyrics-common/preferences.h:66
+msgid "Sources"
+msgstr "Bronne"
+
+#: src/lyrics-common/preferences.h:67
+msgid "Use embedded lyrics (from Lyrics tag)"
+msgstr "Gebruik ingebedde lirieke (vanaf Lyrics etiket)"
+
+#: src/lyrics-common/preferences.h:69
+msgid "Fetch lyrics from internet:"
+msgstr "Gaan haal lirieke van die internet af:"
+
+#: src/lyrics-common/preferences.h:72
+msgid "Store fetched lyrics in local cache"
+msgstr "Stoor afgehaalde lirieke in plaaslike kas"
+
+#: src/lyrics-common/preferences.h:74
+msgid "Local Storage"
+msgstr "Plaaslike Berging"
+
+#: src/lyrics-common/preferences.h:75
+msgid "Load lyric files (.lrc) from local storage"
+msgstr "Laai lirieklêers (.lrc) vanaf plaaslike berging"
+
+#: src/lyrics-common/utils.cc:54 src/ui-common/dialogs-qt.cc:63
+msgid "Error"
+msgstr "Fout"
+
+#: src/lyrics-common/utils.cc:60
+msgid "Lyrics could not be found."
+msgstr "Lirieke kon nie gevind word nie."
+
+#: src/lyrics-common/utils.cc:142
+msgid "Missing title and/or artist."
+msgstr "Titel en/of kunstenaar ontbreek."
+
+#: src/lyrics-gtk/lyrics-gtk.cc:37 src/lyrics-qt/lyrics-qt.cc:50
+msgid "Lyrics"
+msgstr "Lirieke"
+
+#: src/lyrics-gtk/lyrics-gtk.cc:189 src/lyrics-qt/lyrics-qt.cc:171
+msgid "Edit Lyrics ..."
+msgstr ""
+
+#: src/lyrics-gtk/lyrics-gtk.cc:195 src/lyrics-qt/lyrics-qt.cc:178
+msgid "Save Locally"
+msgstr "Stoor Plaaslik"
+
+#: src/lyrics-gtk/lyrics-gtk.cc:201 src/lyrics-qt/lyrics-qt.cc:186
+msgid "Refresh"
+msgstr "Verfris"
+
+#: src/m3u/m3u.cc:33
+msgid "M3U Playlists"
+msgstr "M3U Snitlyste"
+
+#: src/metronom/metronom.cc:44
+msgid "Tact Generator"
+msgstr "Tact Generator"
+
+#: src/metronom/metronom.cc:145
+#, c-format
+msgid "Tact generator: %d bpm"
+msgstr "Tact generator: %d spm"
+
+#: src/metronom/metronom.cc:147
+#, c-format
+msgid "Tact generator: %d bpm %d/%d"
+msgstr "Tact generator: %d spm %d/%d"
+
+#: src/metronom/metronom.cc:235
+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 deur Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
+"\n"
+"Om dit te gebruik, voeg 'n URL by: tact://beats*num/den\n"
+"bv. tact://77 om 77 slae per minuut te speel\n"
+"of tact://60*3/4 om 60 spm in 3/4 takte te speel"
+
+#: src/mixer/mixer.cc:43
+msgid "Channel Mixer"
+msgstr "Kanaal Menger"
+
+#: src/mixer/mixer.cc:255
+msgid ""
+"Channel Mixer Plugin for Audacious\n"
+"Copyright 2011-2012 John Lindgren and Michał Lipski"
+msgstr ""
+"Kanaal Menger Inprop vir Audacious\n"
+"Kopiereg 2011-2012 John Lindgren en Michał Lipski"
+
+#: src/mixer/mixer.cc:259
+msgid "Channel Mixer"
+msgstr "Kanaal Menger"
+
+#: src/mixer/mixer.cc:260
+msgid "Output channels:"
+msgstr "Uitset kanale:"
+
+#: src/mms/mms.cc:35
+msgid "MMS Plugin"
+msgstr "MMS Inprop"
+
+#: src/mms/mms.cc:82
+msgid "Error connecting to MMS server"
+msgstr "Kon nie aan MMS bediener koppel nie"
+
+#: src/modplug/modplugbmp.h:57
+msgid "ModPlug (Module Player)"
+msgstr "ModPlug (Module Speler)"
+
+#: src/modplug/plugin_main.cc:55
+msgid "Channels"
+msgstr "Kanale"
+
+#: src/modplug/plugin_main.cc:59
+msgid "Nearest (fastest)"
+msgstr "Naaste (vinnigste)"
+
+#: src/modplug/plugin_main.cc:60
+msgid "Linear (fast)"
+msgstr "Lineêr (vinnig)"
+
+#: src/modplug/plugin_main.cc:61
+msgid "Spline (good)"
+msgstr "Spline (goed)"
+
+#: src/modplug/plugin_main.cc:62
+msgid "Polyphase (best)"
+msgstr "Polifase (beste)"
+
+#: src/modplug/plugin_main.cc:63
+msgid "Sample rate"
+msgstr "Monstertempo"
+
+#: src/modplug/plugin_main.cc:64
+msgid "22 kHz"
+msgstr "22 kHz"
+
+#: src/modplug/plugin_main.cc:65
+msgid "44 kHz"
+msgstr "44 kHz"
+
+#: src/modplug/plugin_main.cc:66
+msgid "48 kHz"
+msgstr "48 kHz"
+
+#: src/modplug/plugin_main.cc:67
+msgid "96 kHz"
+msgstr "96 kHz"
+
+#: src/modplug/plugin_main.cc:71 src/modplug/plugin_main.cc:76
+#: src/modplug/plugin_main.cc:81
+msgid "Level:"
+msgstr "Vlak:"
+
+#: src/modplug/plugin_main.cc:77
+msgid "Cutoff:"
+msgstr "Afsnypunt:"
+
+#: src/modplug/plugin_main.cc:90
+msgid "Reverb"
+msgstr "Weerklank"
+
+#: src/modplug/plugin_main.cc:93
+msgid "Bass Boost"
+msgstr "Basversterking"
+
+#: src/modplug/plugin_main.cc:96
+msgid "Surround"
+msgstr "Omring"
+
+#: src/modplug/plugin_main.cc:99
+msgid "Preamp"
+msgstr "Voorversterk"
+
+#: src/modplug/plugin_main.cc:106
+msgid "Oversample"
+msgstr "Oormonster"
+
+#: src/modplug/plugin_main.cc:107
+msgid "Noise reduction"
+msgstr "Geraas vermindering"
+
+#: src/modplug/plugin_main.cc:108
+msgid "Play Amiga MODs"
+msgstr "Speel Amiga MODs"
+
+#: src/modplug/plugin_main.cc:109
+msgid "Repeat"
+msgstr "Herhaal"
+
+#: src/modplug/plugin_main.cc:110
+msgid "Repeat count:"
+msgstr "Herhaal telling:"
+
+#: src/modplug/plugin_main.cc:111
+msgid "To repeat forever, set the repeat count to -1."
+msgstr "Om vir ewig te herhaal, stel die herhalingtelling op -1."
+
+#: src/modplug/plugin_main.cc:124 src/sid/xs_config.cc:106
+msgid "These settings will take effect when Audacious is restarted."
+msgstr ""
+"Hierdie instellings sal in werking tree wanneer Audacious herbegin word."
+
+#: src/moonstone/main_window.cc:72 src/moonstone/main_window.cc:73
+#: src/qtui/main_window.cc:159 src/qtui/main_window.cc:160
+#: src/skins/menus.cc:107 src/skins-qt/menus.cc:98
+msgid "Stop After This Song"
+msgstr "Stop na hierdie lied"
+
+#: src/moonstone/moonstone.cc:39
+msgid "Moonstone"
+msgstr "Maansteen"
+
+#: src/moonstone/playlist_header.cc:212 src/qtui/playlist_header.cc:258
+msgid "Reset to Defaults"
+msgstr "Stel terug na verstek waardes"
+
+#: src/moonstone/playlist_model.cc:38 src/qtui/playlist_header.cc:232
+msgid "Now Playing"
+msgstr "Speel nou"
+
+#: src/moonstone/playlist_selection.cc:66
+#: src/playlist-manager/playlist-manager.cc:201
+#: src/playlist-manager-qt/playlist-manager-qt.cc:190
+msgid "Entries"
+msgstr "Inskrywings"
+
+#: src/mpg123/mpg123.cc:54
+msgid "MPG123 Plugin"
+msgstr "MPG123 Inprop"
+
+#: src/mpg123/mpg123.cc:82
+msgid "Use accurate length calculation (slow)"
+msgstr "Gebruik akkurate lengte berekeninge (stadig)"
+
+#: src/mpg123/mpg123.cc:260
+msgid "Surround"
+msgstr "Omsingel"
+
+#: src/mpris2/plugin.cc:40
+msgid "MPRIS 2 Server"
+msgstr "MPRIS 2 Bediener"
+
+#: src/neon/neon.cc:102
+msgid "Neon HTTP/HTTPS Plugin"
+msgstr "Neon HTTP/HTTPS Inprop"
+
+#: src/neon/neon.cc:526
+msgid "Error parsing redirect"
+msgstr "Kon nie herleiding ontleed nie"
+
+#: src/neon/neon.cc:540
+msgid "Unknown HTTP error"
+msgstr "Onbekende HTTP fout"
+
+#: src/neon/neon.cc:614
+msgid "Error parsing URL"
+msgstr "Kon nie URL ontleed nie"
+
+#: src/neon/neon.cc:687
+msgid "Too many redirects"
+msgstr "Te veel herleidings"
+
+#: src/notify/event.cc:97
+msgid "Stopped"
+msgstr "Gestop"
+
+#: src/notify/event.cc:97
+msgid "Audacious is not playing."
+msgstr "Audacious is nie besig om te speel nie."
+
+#: src/notify/notify.cc:39
+msgid "Desktop Notifications"
+msgstr "Werkskermkennisgewings"
+
+#: src/notify/notify.cc:57
+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 ""
+"Werkskermkennisgewings-inprop vir Audacious\n"
+"Kopiereg (C) 2010 Maximilian Bogner\n"
+"Kopiereg (C) 2011-2013 John Lindgren en Jean-Alexandre Anglès d'Auriac\n"
+"\n"
+"Hierdie inprop is gratis sagteware: jy kan dit herverdeel en/of wysig onder "
+"die bepalings van die GNU General Public License soos gepubliseer deur die "
+"Free Software Foundation, óf weergawe 3 van die lisensie, óf (na jou keuse) "
+"enige latere weergawe.\n"
+"\n"
+"Hierdie inprop word versprei in die hoop dat dit nuttig sal wees, maar "
+"SONDER ENIGE WAARBORG; selfs sonder die stilswyende waarborg van "
+"VERHANDELBAARHEID of GESKIKTHEID VIR 'N SPESIFIEKE DOEL. Sien die GNU "
+"General Public License vir meer besonderhede.\n"
+"\n"
+"Jy moes 'n afskrif van die GNU General Public License saam met hierdie "
+"program ontvang het. Indien nie, sien <http://www.gnu.org/licenses/>."
+
+#: src/notify/notify.cc:104
+msgid "Show playback controls"
+msgstr "Wys terugspeel kontroles"
+
+#: src/notify/notify.cc:106
+msgid "Always show notification"
+msgstr "Wys altyd 'n kennisgewing"
+
+#: src/notify/notify.cc:108
+msgid "Include album name in notification"
+msgstr "Sluit album naam in kennisgewing in"
+
+#: src/notify/notify.cc:110
+msgid "Custom notification duration:"
+msgstr "Pas gemaakte kennisgewingsduur:"
+
+#: src/notify/osd.cc:74
+msgid "Show"
+msgstr "Wys"
+
+#: src/openmpt/mpt.cc:50
+msgid "OpenMPT (Module Player)"
+msgstr "OpenMPT (Module Speler)"
+
+#: src/openmpt/mpt.cc:132
+msgid ""
+"Module player based on libopenmpt\n"
+"\n"
+"Written by: Chris Spiegel <cspiegel@gmail.com>"
+msgstr ""
+"Module speler gebaseer op libopenmpt\n"
+"\n"
+"Geskryf deur: Chris Spiegel <cspiegel@gmail.com>"
+
+#: src/openmpt/mpt.cc:151
+msgid "Stereo separation:"
+msgstr "Stereo skeiding:"
+
+#: src/openmpt/mpt.cc:153
+msgid "% (0=mono, 100=default, 200=full)"
+msgstr ""
+
+#: src/openmpt/mpt.cc:157
+msgid "Interpolation:"
+msgstr "Interpolasie:"
+
+#: src/openmpt/mptwrap.h:51 src/soxr/sox-resampler.cc:189 src/xsf/plugin.cc:437
+msgid "Linear"
+msgstr "Lineêr"
+
+#: src/openmpt/mptwrap.h:52
+msgid "Cubic"
+msgstr "Kubies"
+
+#: src/openmpt/mptwrap.h:53
+msgid "Windowed sinc"
+msgstr "Venster sink"
+
+#: src/opus/opus.cc:39
+msgid "Opus Decoder"
+msgstr "Opus Dekodeerder"
+
+#: src/opus/opus.cc:336
+msgid ""
+"Opus Decoder Plugin for Audacious\n"
+"Copyright 2022 Thomas Lange"
+msgstr ""
+"Opus Dekodeerder Inprop vir Audacious\n"
+"Kopiereg 2022 Thomas Lange"
+
+#: src/oss4/oss.h:70
+msgid "OSS4 Output"
+msgstr "OSS4 Uitset"
+
+#: src/oss4/oss.h:72
+msgid "OSS3 Output"
+msgstr "OSS3 Uitset"
+
+#: src/oss4/plugin.cc:35
+msgid "Default device"
+msgstr "Verstek toestel"
+
+#: src/oss4/plugin.cc:78
+msgid "Audio device:"
+msgstr "Oudio toestel:"
+
+#: src/oss4/plugin.cc:81
+msgid "Use alternate device:"
+msgstr "Gebruik alternatiewe toestel:"
+
+#: src/oss4/plugin.cc:85
+msgid "Save volume between sessions."
+msgstr "Berg volume tussen sessies."
+
+#: src/oss4/plugin.cc:87
+msgid "Enable format conversions made by the OSS software."
+msgstr "Aktiveer formaatomskakelings wat deur die OSS-sagteware gemaak word."
+
+#: src/oss4/plugin.cc:89
+msgid "Enable exclusive mode to prevent virtual mixing."
+msgstr "Aktiveer eksklusiewe modus om virtuele menging te voorkom."
+
+#: src/oss4/plugin.cc:101
+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-uitvoerinprop vir Audacious\n"
+"Kopiereg 2010-2012 Michał Lipski\n"
+"\n"
+"Ek wil graag mense op #audacious bedank, veral Tony Vroon en John Lindgren "
+"en natuurlik die skrywers van die vorige OSS-inprop."
+
+#: src/pipewire/pipewire.cc:44
+msgid "PipeWire Output"
+msgstr "PipeWire Uitset"
+
+#: src/pipewire/pipewire.cc:118
+msgid ""
+"PipeWire Output Plugin for Audacious\n"
+"Copyright 2022 Thomas Lange\n"
+"\n"
+"Based on the PipeWire Output Plugin for Qmmp\n"
+"Copyright 2021 Ilya Kotov"
+msgstr ""
+"PipeWire Uitset Inprop vir Audacious\n"
+"Kopiereg 2022 Thomas Lange\n"
+"\n"
+"Gebaseer op die PipeWire Uitset Inprop vir Qmmp\n"
+"Kopiereg 2021 Ilya Kotov"
+
+#: src/pipewire/pipewire.cc:408 src/skins/menus.cc:88 src/skins-qt/menus.cc:79
+msgid "Playback"
+msgstr "Terugspeel"
+
+#: src/playlist-manager/playlist-manager.cc:38
+#: src/playlist-manager-qt/playlist-manager-qt.cc:42
+msgid "Playlist Manager"
+msgstr "Snitlys Bestuurder"
+
+#: src/playlist-manager/playlist-manager.cc:221
+#: src/playlist-manager-qt/playlist-manager-qt.cc:356
+msgid "_Remove"
+msgstr "_Verwyder"
+
+#: src/playlist-manager/playlist-manager.cc:222
+#: src/playlist-manager-qt/playlist-manager-qt.cc:351
+msgid "Ren_ame"
+msgstr "Hernoem"
+
+#: src/pls/pls.cc:35
+msgid "PLS Playlists"
+msgstr "PLS Snilyste"
+
+#: src/psf/plugin.cc:53
+msgid "OpenPSF PSF1/PSF2 Decoder"
+msgstr "OpenPSF PSF1/PSF2 Dekodeerder"
+
+#: src/psf/plugin.cc:270
+msgid "OpenPSF Configuration"
+msgstr "OpenPSF Konfigurasie"
+
+#: src/psf/plugin.cc:271 src/xsf/plugin.cc:444
+msgid "Ignore length from file"
+msgstr "Ignoreer lengte van lêer"
+
+#: src/pulse/pulse_audio.cc:42
+msgid "PulseAudio Output"
+msgstr "PulseAudio Uitset"
+
+#: src/pulse/pulse_audio.cc:84
+msgid "Context name:"
+msgstr "Konteksnaam:"
+
+#: src/pulse/pulse_audio.cc:86
+msgid "Stream name:"
+msgstr "Stroom naam:"
+
+#: src/pulse/pulse_audio.cc:596
+msgid ""
+"Audacious PulseAudio Output Plugin\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 ""
+"Audacious PulseAudio Uitset-inprop\n"
+"\n"
+"Hierdie program is gratis sagteware; jy kan dit herverdeel en/of wysig onder "
+"die bepalings van die GNU General Public License soos gepubliseer deur die "
+"Free Software Foundation; óf weergawe 2 van die lisensie, óf (na jou keuse) "
+"enige latere weergawe.\n"
+"\n"
+"Hierdie program word versprei in die hoop dat dit nuttig sal wees, maar "
+"SONDER ENIGE WAARBORG; selfs sonder die stilswyende waarborg van "
+"VERHANDELBAARHEID of GESKIKTHEID VIR 'N SPESIFIEKE DOEL. Sien die GNU "
+"General Public License vir meer besonderhede.\n"
+"\n"
+"Jy moes 'n afskrif van die GNU General Public License saam met hierdie "
+"program ontvang het; indien nie, skryf aan die Free Software Foundation, "
+"Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, VSA."
+
+#: src/qtaudio/qtaudio.cc:53
+msgid "QtMultimedia Output"
+msgstr "QtMultimedia Uitset"
+
+#: src/qtaudio/qtaudio.cc:84
+msgid ""
+"QtMultimedia Audio Output Plugin for Audacious\n"
+"Copyright 2014 William Pitcock\n"
+"\n"
+"Based on SDL Output Plugin for Audacious\n"
+"Copyright 2010 John Lindgren"
+msgstr ""
+"QtMultimedia oudio-uitvoer-inprop vir Audacious\n"
+"Kopiereg 2014 William Pitcock\n"
+"\n"
+"Gebaseer op SDL Output Plugin vir Audacious\n"
+"Kopiereg 2010 John Lindgren"
+
+#: src/qtglspectrum/gl-spectrum.cc:41
+msgid ""
+"OpenGL Spectrum Analyzer for Audacious\n"
+"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
+"Copyright 2014, 2020 Ariadne Conill\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 vir Audacious\n"
+"Kopiereg 2013 Christophe Budé, John Lindgren en Carlo Bramini\n"
+"Kopiereg 2014, 2020 Ariadne Conill\n"
+"\n"
+"Gebaseer op die XMMS-inprop:\n"
+"Kopiereg 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson en "
+"4Front Technologies\n"
+"\n"
+"Lisensie: GPLv2+"
+
+#: src/qthotkey/gui.cc:177
+msgid "Press a key combination inside a text field."
+msgstr "Druk 'n sleutelkombinasie binne 'n teksveld."
+
+#: src/qthotkey/plugin.cc:105
+msgid ""
+"Global Hotkey Plugin\n"
+"Control the player with global key combinations or multimedia keys.\n"
+"\n"
+"Copyright (C) 2020 i.Dark_Templar <darktemplar@dark-templar-archives.net>\n"
+"Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n"
+"\n"
+"Contributors 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 Plugin\n"
+"Beheer die speler met globale sleutelkombinasies of multimediasleutels.\n"
+"\n"
+"Kopiereg (C) 2020 i.Dark_Templar <darktemplar@dark-templar-archives.net>\n"
+"Kopiereg (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n"
+"\n"
+"Bydraers sluit in:\n"
+"Kopiereg (C) 2006-2007 Vladimir Paskov <vlado.paskov@gmail.com>\n"
+"Kopiereg (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/qtui/menus.cc:109
+msgid "_Open Folder ..."
+msgstr "Maak vouer oop..."
+
+#: src/qtui/menus.cc:115
+msgid "_Add Folder ..."
+msgstr "Voeg vouer by..."
+
+#: src/qtui/menus.cc:128
+msgid "_Log Inspector ..."
+msgstr "_Log inspekteur..."
+
+#: src/qtui/menus.cc:220
+msgid "_Find ..."
+msgstr "Vind..."
+
+#: src/qtui/menus.cc:256 src/skins/menus.cc:80 src/skins-qt/menus.cc:70
+msgid "Audio Settings ..."
+msgstr "Oudio Instellings..."
+
+#: src/qtui/playlist_model.cc:188
+msgid "Q#"
+msgstr "T#"
+
+#: src/qtui/playlist_model.cc:190
+msgid "T#"
+msgstr "S#"
+
+#: src/qtui/playlist_model.cc:192
+msgid "C#"
+msgstr "C#"
+
+#: src/qtui/playlist_model.cc:194
+msgid "D#"
+msgstr ""
+
+#: src/qtui/qtui.cc:40
+msgid "Qt Interface"
+msgstr "Qt-Kopperlvlak"
+
+#: src/qtui/search_bar.cc:46
+msgid "Search playlist"
+msgstr "Deursoek snitlys"
+
+#: src/qtui/settings.cc:79
+msgid "Use bold font for column headers"
+msgstr "Gebruik vetdruk vir kolomopskrifte"
+
+#: src/resample/resample.cc:43
+msgid "Sample Rate Converter"
+msgstr "Monstertempo Omskakelaar"
+
+#: src/resample/resample.cc:183
+msgid ""
+"Sample Rate Converter Plugin for Audacious\n"
+"Copyright 2010-2012 John Lindgren"
+msgstr ""
+"Monstertempo Omskakelaar Inprop vir Audacious\n"
+"Kopiereg 2010-2012 John Lindgren"
+
+#: src/resample/resample.cc:187
+msgid "Skip/repeat samples"
+msgstr "Slaan oor/herhaal monsters"
+
+#: src/resample/resample.cc:188
+msgid "Linear interpolation"
+msgstr "Lineêre interpolasie"
+
+#: src/resample/resample.cc:189
+msgid "Fast sinc interpolation"
+msgstr "Vinnige sinc interpolasie"
+
+#: src/resample/resample.cc:190
+msgid "Medium sinc interpolation"
+msgstr "Medium sinc interpolasie"
+
+#: src/resample/resample.cc:191
+msgid "Best sinc interpolation"
+msgstr "Beste sinc interpolasie"
+
+#: src/resample/resample.cc:195
+msgid "Conversion"
+msgstr "Omskakeling"
+
+#: src/resample/resample.cc:196
+msgid "Method:"
+msgstr "Metode:"
+
+#: src/resample/resample.cc:199 src/soxr/sox-resampler.cc:203
+msgid "Rate:"
+msgstr "Tempo:"
+
+#: src/resample/resample.cc:202
+msgid "Rate Mappings"
+msgstr "Tempo Karterings"
+
+#: src/resample/resample.cc:203
+msgid "Use rate mappings"
+msgstr "Gebruik tempo karterings"
+
+#: src/resample/resample.cc:205
+msgid "8 kHz:"
+msgstr "8 kHz:"
+
+#: src/resample/resample.cc:209
+msgid "16 kHz:"
+msgstr "16 kHz:"
+
+#: src/resample/resample.cc:213
+msgid "22.05 kHz:"
+msgstr "22.05 kHz:"
+
+#: src/resample/resample.cc:217
+msgid "32.0 kHz:"
+msgstr "32.0 kHz:"
+
+#: src/resample/resample.cc:221
+msgid "44.1 kHz:"
+msgstr "44.1 kHz:"
+
+#: src/resample/resample.cc:225
+msgid "48 kHz:"
+msgstr "48 kHz:"
+
+#: src/resample/resample.cc:229
+msgid "88.2 kHz:"
+msgstr "88.2 kHz:"
+
+#: src/resample/resample.cc:233
+msgid "96 kHz:"
+msgstr "96 kHz:"
+
+#: src/resample/resample.cc:237
+msgid "176.4 kHz:"
+msgstr "176.4 kHz:"
+
+#: src/resample/resample.cc:241
+msgid "192 kHz:"
+msgstr "192 kHz:"
+
+#: src/scrobbler2/config_window.cc:29
+msgid "Checking Last.fm access ..."
+msgstr "Gaan Last.fm-toegang na ..."
+
+#: src/scrobbler2/config_window.cc:35
+msgid ""
+"Your scrobbles are being saved on your computer temporarily. They will be "
+"submitted as soon as Audacious is allowed access."
+msgstr ""
+"Jou scrobbles word tydelik op jou rekenaar gestoor. Dit sal ingedien word "
+"sodra Audacious toegang kry."
+
+#: src/scrobbler2/config_window.cc:41
+#, c-format
+msgid "Permission granted. Scrobbling for user %s."
+msgstr "Toestemming verleen. Scrobbling vir gebruiker %s."
+
+#: src/scrobbler2/config_window.cc:44
+msgid ""
+"Permission denied. Open the following URL in a browser, allow Audacious "
+"access to your account, and then click 'Check Permission' again:"
+msgstr ""
+"Toestemming geweier. Maak die volgende URL in 'n blaaier oop, laat Audacious "
+"toegang tot jou rekening toe, en klik dan weer 'Kontroleer toestemming':"
+
+#: src/scrobbler2/config_window.cc:53
+msgid "There was a problem contacting Last.fm."
+msgstr "Daar was 'n probleem om Last.fm te kontak."
+
+#: src/scrobbler2/config_window.cc:92
+msgid "Check Permission"
+msgstr "Gaan toestemming na"
+
+#: src/scrobbler2/config_window.cc:93
+msgid "Revoke Permission"
+msgstr "Herroep toestemming"
+
+#: src/scrobbler2/config_window.cc:97
+msgid "You need to allow Audacious to scrobble tracks to your Last.fm account."
+msgstr ""
+"Jy moet Audacious toelaat om snitte na jou Last.fm-rekening te scrobble."
+
+#: src/scrobbler2/scrobbler.cc:29
+msgid "Scrobbler 2.0"
+msgstr "Scrobbler 2.0"
+
+#: src/scrobbler2/scrobbler.cc:200
+msgid ""
+"The Scrobbler plugin could not be started.\n"
+"There might be a problem with your installation."
+msgstr ""
+"Die Scrobbler-inprop kon nie begin word nie.\n"
+"Daar is dalk 'n probleem met jou installasie."
+
+#: src/scrobbler2/scrobbler.cc:245
+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."
+msgstr ""
+
+#: src/sdlout/sdlout.cc:43
+msgid "SDL Output"
+msgstr "SDL-uitset"
+
+#: src/sdlout/sdlout.cc:72
+msgid ""
+"SDL Output Plugin for Audacious\n"
+"Copyright 2010 John Lindgren"
+msgstr ""
+"SDL-uitvoerinprop vir Audacious\n"
+"Kopiereg 2010 John Lindgren"
+
+#: src/search-tool/library.cc:35 src/search-tool/library.cc:46
+#: src/search-tool-qt/library.cc:35 src/search-tool-qt/library.cc:46
+msgid "Library"
+msgstr "Biblioteek"
+
+#: src/search-tool-qt/search-model.cc:44 src/search-tool/search-tool.cc:287
+#, c-format
+msgid "%d song"
+msgid_plural "%d songs"
+msgstr0 "%dlied"
+msgstr1 "%dliedjies"
+
+#: src/search-tool-qt/search-model.cc:53 src/search-tool/search-tool.cc:294
+msgid "of this genre"
+msgstr "van hierdie genre"
+
+#: src/search-tool-qt/search-model.h:47 src/search-tool/search-model.h:45
+msgid "on"
+msgstr "op"
+
+#: src/search-tool-qt/search-model.h:47 src/search-tool/search-model.h:45
+msgid "by"
+msgstr "deur"
+
+#: src/search-tool-qt/search-tool-qt.cc:165 src/search-tool/search-tool.cc:74
+msgid "Number of results to show:"
+msgstr "Aantal resultate om te wys:"
+
+#: src/search-tool-qt/search-tool-qt.cc:168 src/search-tool/search-tool.cc:77
+msgid "Rescan library at startup"
+msgstr "Skandeer biblioteek weer gedurende begin"
+
+#: src/search-tool-qt/search-tool-qt.cc:170
+msgid "Monitor library for changes"
+msgstr "Monitor biblioteek vir veranderinge"
+
+#: src/search-tool-qt/search-tool-qt.cc:193 src/search-tool/search-tool.cc:450
+msgid ""
+"To import your music library into Audacious, choose a folder and then click "
+"the \"refresh\" icon."
+msgstr ""
+"Om jou musiekbiblioteek in Audacious in te voer, kies 'n vouer en klik dan "
+"op die \"herlaai\"-ikoon."
+
+#: src/search-tool-qt/search-tool-qt.cc:195 src/search-tool/search-tool.cc:459
+msgid "Please wait ..."
+msgstr "Wag asseblief ..."
+
+#: src/search-tool-qt/search-tool-qt.cc:197 src/search-tool/search-tool.cc:487
+msgid "Choose Folder"
+msgstr "Kies Omslag"
+
+#: src/search-tool-qt/search-tool-qt.cc:201 src/search-tool/search-tool.cc:445
+msgid "Search library"
+msgstr "Deursoek biblioteek"
+
+#: src/search-tool-qt/search-tool-qt.cc:327 src/search-tool/search-tool.cc:156
+#, c-format
+msgid "%d of %d result shown"
+msgid_plural "%d of %d results shown"
+msgstr0 "%d of %d resultaat word gewys"
+msgstr1 "%d van %d resultate word gewys"
+
+#: src/search-tool-qt/search-tool-qt.cc:331 src/search-tool/search-tool.cc:160
+#, c-format
+msgid "%d result"
+msgid_plural "%d results"
+msgstr0 "%d resultaat"
+msgstr1 "%d resultate"
+
+#: src/search-tool-qt/search-tool-qt.cc:501 src/search-tool/search-tool.cc:341
+msgid "_Create Playlist"
+msgstr "Maak Snitlys"
+
+#: src/search-tool-qt/search-tool-qt.cc:503 src/search-tool/search-tool.cc:343
+msgid "_Add to Playlist"
+msgstr "Voeg Snitlys by"
+
+#: src/sid/xmms-sid.cc:43
+msgid "SID Player"
+msgstr "SID Speler"
+
+#: src/sid/xs_config.cc:62
+msgid "Channels:"
+msgstr "Kanale:"
+
+#: src/sid/xs_config.cc:68
+msgid "Emulation"
+msgstr "Emulasie"
+
+#: src/sid/xs_config.cc:69
+msgid "Emulate MOS 8580 (default: MOS 6581)"
+msgstr "Emuleer MOS 8580 (verstek: MOS 6581)"
+
+#: src/sid/xs_config.cc:71
+msgid "Do not automatically select chip model"
+msgstr "Moenie outomaties skyfiemodel kies nie"
+
+#: src/sid/xs_config.cc:73
+msgid "Emulate filter"
+msgstr "Emulasie filtreerder"
+
+#: src/sid/xs_config.cc:75
+msgid "Clock speed:"
+msgstr "Klokspoed:"
+
+#: src/sid/xs_config.cc:78
+msgid "Do not automatically select clock speed"
+msgstr "Moenie outomaties klokspoed kies nie"
+
+#: src/sid/xs_config.cc:80
+msgid "Playback time"
+msgstr "Terugspeel tyd"
+
+#: src/sid/xs_config.cc:81
+msgid "Set maximum playback time:"
+msgstr "Stel maksimum terugspeel tyd:"
+
+#: src/sid/xs_config.cc:87
+msgid "Use only when song length is unknown"
+msgstr "Gebruik slegs wanneer die lengte van die liedjie onbekend is"
+
+#: src/sid/xs_config.cc:90
+msgid "Set minimum playback time:"
+msgstr "Stel minimum speeltyd:"
+
+#: src/sid/xs_config.cc:96
+msgid "Subtunes"
+msgstr "Subtunes"
+
+#: src/sid/xs_config.cc:97
+msgid "Enable subtunes"
+msgstr "Aktiveer subtunes"
+
+#: src/sid/xs_config.cc:99
+msgid "Ignore subtunes shorter than:"
+msgstr "Ignoreer subtunes korter as:"
+
+#: src/sid/xs_config.cc:105
+msgid "Note"
+msgstr "Nota"
+
+#: src/silence-removal/silence-removal.cc:39
+msgid "Silence Removal"
+msgstr "Stilte verwydering"
+
+#: src/silence-removal/silence-removal.cc:58
+msgid ""
+"Silence Removal Plugin for Audacious\n"
+"Copyright 2014 John Lindgren"
+msgstr ""
+"Stilte Verwydering Inprop vir Audacious\n"
+"Kopiereg 2014 John Lindgren"
+
+#: src/silence-removal/silence-removal.cc:67
+msgid "Silence Removal"
+msgstr "Stilte Verwydering"
+
+#: src/silence-removal/silence-removal.cc:68
+msgid "Threshold:"
+msgstr "Drempel:"
+
+#: src/skins/actions.cc:45 src/skins-qt/actions.cc:43
+msgid "Repeat points cleared."
+msgstr "Herhaal punte uitgevee."
+
+#: src/skins/actions.cc:60 src/skins-qt/actions.cc:58
+msgid "Repeat point A set."
+msgstr "Herhaal punt A gestel."
+
+#: src/skins/actions.cc:65 src/skins-qt/actions.cc:63
+msgid "Repeat point B set."
+msgstr "Herhaal punt B gestel."
+
+#: src/skins/equalizer.cc:223 src/skins-qt/equalizer.cc:223
+msgid "Preamp"
+msgstr "Voorversterker"
+
+#: src/skins/equalizer.cc:227 src/skins-qt/equalizer.cc:227
+msgid "31 Hz"
+msgstr "31 Hz"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "63 Hz"
+msgstr "63 Hz"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "125 Hz"
+msgstr "125 Hz"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "250 Hz"
+msgstr "250 Hz"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "500 Hz"
+msgstr "500 Hz"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "1 kHz"
+msgstr "1 kHz"
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "2 kHz"
+msgstr "2 kHz"
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "4 kHz"
+msgstr "4 kHz"
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "8 kHz"
+msgstr "8 kHz"
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "16 kHz"
+msgstr "16 kHz"
+
+#: src/skins/equalizer.cc:270 src/skins-qt/equalizer.cc:270
+msgid "Audacious Equalizer"
+msgstr "Audacious-gelykmaker"
+
+#: src/skins/main.cc:459 src/skins-qt/main.cc:442
+msgid "Recording on"
+msgstr "Opname aan"
+
+#: src/skins/main.cc:461 src/skins-qt/main.cc:444
+msgid "Recording off"
+msgstr "Opname af"
+
+#: src/skins/main.cc:754 src/skins-qt/main.cc:701
+#, c-format
+msgid "Seek to %d:%-2.2d / %d:%-2.2d"
+msgstr "Soek tot %d:%-2.2d / %d:%-2.2d"
+
+#: src/skins/main.cc:771 src/skins-qt/main.cc:718
+#, c-format
+msgid "Volume: %d%%"
+msgstr "Volume: %d%%"
+
+#: src/skins/main.cc:784 src/skins-qt/main.cc:731
+#, c-format
+msgid "Balance: %d%% left"
+msgstr "Balans: %d%% links"
+
+#: src/skins/main.cc:786 src/skins-qt/main.cc:733
+msgid "Balance: center"
+msgstr "Balans: middel"
+
+#: src/skins/main.cc:788 src/skins-qt/main.cc:735
+#, c-format
+msgid "Balance: %d%% right"
+msgstr "Balans: %d%% regs"
+
+#: src/skins/main.cc:880 src/skins-qt/main.cc:827
+msgid "Options Menu"
+msgstr "Opsieskieslys"
+
+#: src/skins/main.cc:884 src/skins-qt/main.cc:831
+msgid "Disable 'Always On Top'"
+msgstr "Deaktiveer 'Altyd bo-op'"
+
+#: src/skins/main.cc:886 src/skins-qt/main.cc:833
+msgid "Enable 'Always On Top'"
+msgstr "Aktiveer 'Altyd bo-op'"
+
+#: src/skins/main.cc:889 src/skins-qt/main.cc:836
+msgid "File Info Box"
+msgstr "Lêer inligtingskassie"
+
+#: src/skins/main.cc:892 src/skins/menus.cc:149 src/skins-qt/main.cc:839
+#: src/skins-qt/menus.cc:142
+msgid "Double Size"
+msgstr "Dubbel grootte"
+
+#: src/skins/main.cc:895 src/skins-qt/main.cc:842
+msgid "Visualizations"
+msgstr "Visualisasies"
+
+#: src/skins/menus.cc:74 src/skins-qt/menus.cc:64
+msgid "Volume Up"
+msgstr "Volume Op"
+
+#: src/skins/menus.cc:75 src/skins-qt/menus.cc:65
+msgid "Volume Down"
+msgstr "Volume Af"
+
+#: src/skins/menus.cc:77 src/skins-qt/menus.cc:67
+msgid "Effects ..."
+msgstr "Effekte ..."
+
+#: src/skins/menus.cc:84 src/skins-qt/menus.cc:74
+msgid "Open Files ..."
+msgstr "Maak lêers oop ..."
+
+#: src/skins/menus.cc:85 src/skins-qt/menus.cc:76
+msgid "Open URL ..."
+msgstr "Maak URL oop ..."
+
+#: src/skins/menus.cc:89 src/skins-qt/menus.cc:80
+msgid "Playlist"
+msgstr "Snitlys"
+
+#: src/skins/menus.cc:90 src/skins-qt/menus.cc:81
+msgid "Output"
+msgstr "Uitset"
+
+#: src/skins/menus.cc:91 src/skins-qt/menus.cc:82
+msgid "View"
+msgstr "Aansig"
+
+#: src/skins/menus.cc:93 src/skins/menus.cc:161 src/skins/menus.cc:174
+#: src/skins/menus.cc:245 src/skins-qt/menus.cc:84 src/skins-qt/menus.cc:156
+#: src/skins-qt/menus.cc:170 src/skins-qt/menus.cc:241
+msgid "Services"
+msgstr "Dienste"
+
+#: src/skins/menus.cc:95 src/skins-qt/menus.cc:86
+msgid "About ..."
+msgstr "Aangaande ..."
+
+#: src/skins/menus.cc:96 src/skins-qt/menus.cc:87
+msgid "Settings ..."
+msgstr "Stellings ..."
+
+#: src/skins/menus.cc:97 src/skins-qt/menus.cc:88
+msgid "Quit"
+msgstr "Verlaat"
+
+#: src/skins/menus.cc:101 src/skins/menus.cc:235 src/skins-qt/menus.cc:92
+#: src/skins-qt/menus.cc:231
+msgid "Song Info ..."
+msgstr "Lied Info ..."
+
+#: src/skins/menus.cc:105 src/skins-qt/menus.cc:96
+msgid "Shuffle by Album"
+msgstr "Skommel volgens Album"
+
+#: src/skins/menus.cc:106 src/skins-qt/menus.cc:97
+msgid "No Playlist Advance"
+msgstr "Geen Snitlys Bevordering nie"
+
+#: src/skins/menus.cc:117 src/skins-qt/menus.cc:108
+msgid "Set A-B Repeat"
+msgstr "Stel A-B Herhaal"
+
+#: src/skins/menus.cc:118 src/skins-qt/menus.cc:109
+msgid "Clear A-B Repeat"
+msgstr "Verwyder A-B Herhaal"
+
+#: src/skins/menus.cc:120 src/skins-qt/menus.cc:111
+msgid "Jump to Song ..."
+msgstr "Spring tot Lied ..."
+
+#: src/skins/menus.cc:121 src/skins-qt/menus.cc:113
+msgid "Jump to Time ..."
+msgstr "Spring tot Tyd ..."
+
+#: src/skins/menus.cc:125 src/skins-qt/menus.cc:118
+msgid "Play/Resume"
+msgstr "Speel/Hervat"
+
+#: src/skins/menus.cc:127 src/skins-qt/menus.cc:120
+msgid "New Playlist"
+msgstr "Nuwe Snitlys"
+
+#: src/skins/menus.cc:128 src/skins-qt/menus.cc:121
+msgid "Rename Playlist ..."
+msgstr "Hernoem Snitlys ..."
+
+#: src/skins/menus.cc:129 src/skins-qt/menus.cc:122
+msgid "Remove Playlist"
+msgstr "Verwyder Snitlys"
+
+#: src/skins/menus.cc:131 src/skins-qt/menus.cc:124
+msgid "Previous Playlist"
+msgstr "Vorige Snitlys"
+
+#: src/skins/menus.cc:132 src/skins-qt/menus.cc:125
+msgid "Next Playlist"
+msgstr "Volgende Snitlys"
+
+#: src/skins/menus.cc:134 src/skins-qt/menus.cc:127
+msgid "Import Playlist ..."
+msgstr "Voer Snitlys in ..."
+
+#: src/skins/menus.cc:135 src/skins-qt/menus.cc:128
+msgid "Export Playlist ..."
+msgstr "Voer Snitlys uit ..."
+
+#: src/skins/menus.cc:137 src/skins-qt/menus.cc:130
+msgid "Playlist Manager ..."
+msgstr "Snitlys Bestuurder ..."
+
+#: src/skins/menus.cc:138 src/skins-qt/menus.cc:131
+msgid "Queue Manager ..."
+msgstr "Tou Bestuurder ..."
+
+#: src/skins/menus.cc:140 src/skins-qt/menus.cc:133
+msgid "Refresh Playlist"
+msgstr "Verfris Snitlys"
+
+#: src/skins/menus.cc:144 src/skins-qt/menus.cc:137
+msgid "Show Playlist Editor"
+msgstr "Wys Snitlys Redigeerder"
+
+#: src/skins/menus.cc:145 src/skins-qt/menus.cc:138
+msgid "Show Equalizer"
+msgstr "Wys Gelykmaker"
+
+#: src/skins/menus.cc:147 src/skins-qt/menus.cc:140
+msgid "Show Remaining Time"
+msgstr "Wys Oorblywende Tyd"
+
+#: src/skins/menus.cc:150 src/skins-qt/menus.cc:143
+msgid "Always on Top"
+msgstr "Altyd Bo-op"
+
+#: src/skins/menus.cc:151 src/skins-qt/menus.cc:145
+msgid "On All Workspaces"
+msgstr "Op Alle Werkskerms"
+
+#: src/skins/menus.cc:153 src/skins-qt/menus.cc:148
+msgid "Roll Up Player"
+msgstr "Rol Speler Op"
+
+#: src/skins/menus.cc:154 src/skins-qt/menus.cc:149
+msgid "Roll Up Playlist Editor"
+msgstr "Rol Snitlys Redigeerder Op"
+
+#: src/skins/menus.cc:155 src/skins-qt/menus.cc:150
+msgid "Roll Up Equalizer"
+msgstr "Rol Gelykmaker Op"
+
+#: src/skins/menus.cc:163 src/skins-qt/menus.cc:158
+msgid "Add URL ..."
+msgstr "Voeg URL by ..."
+
+#: src/skins/menus.cc:164 src/skins-qt/menus.cc:160
+msgid "Add Files ..."
+msgstr "Voeg Lêers by ..."
+
+#: src/skins/menus.cc:168 src/skins/menus.cc:196 src/skins/menus.cc:212
+#: src/skins-qt/menus.cc:164 src/skins-qt/menus.cc:192
+#: src/skins-qt/menus.cc:208
+msgid "By Title"
+msgstr "Volgens Titel"
+
+#: src/skins/menus.cc:169 src/skins/menus.cc:203 src/skins/menus.cc:219
+#: src/skins-qt/menus.cc:165 src/skins-qt/menus.cc:199
+#: src/skins-qt/menus.cc:215
+msgid "By File Name"
+msgstr "Volgens Lêer Naam"
+
+#: src/skins/menus.cc:170 src/skins/menus.cc:204 src/skins/menus.cc:220
+#: src/skins-qt/menus.cc:166 src/skins-qt/menus.cc:200
+#: src/skins-qt/menus.cc:216
+msgid "By File Path"
+msgstr "Volgens Lêer Pad"
+
+#: src/skins/menus.cc:176 src/skins-qt/menus.cc:172
+msgid "Remove All"
+msgstr "Verwyder Alles"
+
+#: src/skins/menus.cc:177 src/skins-qt/menus.cc:173
+msgid "Clear Queue"
+msgstr "Vee tou uit"
+
+#: src/skins/menus.cc:179 src/skins-qt/menus.cc:175
+msgid "Remove Unavailable Files"
+msgstr "Verwyder onbeskikbare lêers"
+
+#: src/skins/menus.cc:180 src/skins-qt/menus.cc:176
+msgid "Remove Duplicates"
+msgstr "Verwyder Duplikate"
+
+#: src/skins/menus.cc:182 src/skins-qt/menus.cc:178
+msgid "Remove Unselected"
+msgstr "Verwyder Ongekiesdes"
+
+#: src/skins/menus.cc:183 src/skins-qt/menus.cc:179
+msgid "Remove Selected"
+msgstr "Verwyder Gekiesdes"
+
+#: src/skins/menus.cc:187 src/skins-qt/menus.cc:183
+msgid "Search and Select"
+msgstr "Soek en kies"
+
+#: src/skins/menus.cc:189 src/skins-qt/menus.cc:185
+msgid "Invert Selection"
+msgstr "Keer Seleksie Om"
+
+#: src/skins/menus.cc:190 src/skins-qt/menus.cc:186
+msgid "Select None"
+msgstr "Kies Geen"
+
+#: src/skins/menus.cc:191 src/skins-qt/menus.cc:187
+msgid "Select All"
+msgstr "Kies Alles"
+
+#: src/skins/menus.cc:195 src/skins/menus.cc:211 src/skins-qt/menus.cc:191
+#: src/skins-qt/menus.cc:207
+msgid "By Track Number"
+msgstr "Volgens Snit Nommer"
+
+#: src/skins/menus.cc:197 src/skins/menus.cc:213 src/skins-qt/menus.cc:193
+#: src/skins-qt/menus.cc:209
+msgid "By Artist"
+msgstr "Volgens Kunstenaar"
+
+#: src/skins/menus.cc:198 src/skins/menus.cc:214 src/skins-qt/menus.cc:194
+#: src/skins-qt/menus.cc:210
+msgid "By Album"
+msgstr "Volgens Album"
+
+#: src/skins/menus.cc:199 src/skins/menus.cc:215 src/skins-qt/menus.cc:195
+#: src/skins-qt/menus.cc:211
+msgid "By Album Artist"
+msgstr "Volgens Album Kunstenaar"
+
+#: src/skins/menus.cc:200 src/skins/menus.cc:216 src/skins-qt/menus.cc:196
+#: src/skins-qt/menus.cc:212
+msgid "By Release Date"
+msgstr "Volgens Vrystellingsdatum"
+
+#: src/skins/menus.cc:201 src/skins/menus.cc:217 src/skins-qt/menus.cc:197
+#: src/skins-qt/menus.cc:213
+msgid "By Genre"
+msgstr "Volgens Genre"
+
+#: src/skins/menus.cc:202 src/skins/menus.cc:218 src/skins-qt/menus.cc:198
+#: src/skins-qt/menus.cc:214
+msgid "By Length"
+msgstr "Volgens Lengte"
+
+#: src/skins/menus.cc:205 src/skins/menus.cc:221 src/skins-qt/menus.cc:201
+#: src/skins-qt/menus.cc:217
+msgid "By Custom Title"
+msgstr "Volgens Pasgemaakte Titel"
+
+#: src/skins/menus.cc:206 src/skins/menus.cc:222 src/skins-qt/menus.cc:202
+#: src/skins-qt/menus.cc:218
+msgid "By Comment"
+msgstr "Volgens Kommentaar"
+
+#: src/skins/menus.cc:207 src/skins/menus.cc:223 src/skins-qt/menus.cc:203
+#: src/skins-qt/menus.cc:219
+msgid "By Disc Number"
+msgstr ""
+
+#: src/skins/menus.cc:227 src/skins-qt/menus.cc:223
+msgid "Randomize List"
+msgstr "Maak Lys Ewekansig"
+
+#: src/skins/menus.cc:228 src/skins-qt/menus.cc:224
+msgid "Reverse List"
+msgstr "Keer Lys Om"
+
+#: src/skins/menus.cc:230 src/skins-qt/menus.cc:226
+msgid "Sort Selected"
+msgstr "Sorteer Gekiesdes"
+
+#: src/skins/menus.cc:231 src/skins-qt/menus.cc:227
+msgid "Sort List"
+msgstr "Sorteer lys"
+
+#: src/skins/menus.cc:236 src/skins-qt/menus.cc:232
+msgid "Open Containing Folder"
+msgstr "Maak Bevat-vouer oop"
+
+#: src/skins/menus.cc:238 src/skins-qt/menus.cc:234
+msgid "Cut"
+msgstr "Sny"
+
+#: src/skins/menus.cc:239 src/skins-qt/menus.cc:235
+msgid "Copy"
+msgstr "Kopieer"
+
+#: src/skins/menus.cc:240 src/skins-qt/menus.cc:236
+msgid "Paste"
+msgstr "Plak"
+
+#: src/skins/menus.cc:241 src/skins-qt/menus.cc:237
+msgid "Paste at End"
+msgstr "Plak op Einde"
+
+#: src/skins/menus.cc:243 src/skins-qt/menus.cc:239
+msgid "Queue/Unqueue"
+msgstr "Sit in Tou/Haal uit Tou"
+
+#: src/skins/playlist-widget.cc:58 src/skins-qt/playlist-widget.cc:58
+#, c-format
+msgid "%s (%d of %d)"
+msgstr "%s (%d of %d)"
+
+#: src/skins/playlistwin.cc:491 src/skins-qt/playlistwin.cc:478
+msgid "Audacious Playlist Editor"
+msgstr "Audacious Snitlys Redigeerder"
+
+#: src/skins/plugin.cc:53 src/skins-qt/plugin.cc:65
+msgid "Winamp Classic Interface"
+msgstr "Winamp Klassieke Koppelvlak"
+
+#: src/skins-qt/menus.cc:75
+msgid "Open Folder ..."
+msgstr "Maak Vouer Oop ..."
+
+#: src/skins-qt/menus.cc:159
+msgid "Add Folder ..."
+msgstr "Voeg Vouer By ..."
+
+#: src/skins-qt/search-select.cc:62 src/skins/search-select.cc:77
+msgid "Search entries in active playlist"
+msgstr "Soek inskrywings in aktiewe snitlys"
+
+#: src/skins-qt/search-select.cc:70 src/skins/search-select.cc:83
+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 ""
+"Kies inskrywings in snitlys deur een of meer velde in te vul. Velde gebruik "
+"gewone uitdrukkings sintaksis, hoofletter-onsensitief. As jy nie weet hoe "
+"gereelde uitdrukkings werk nie, voeg eenvoudig dan 'n letterlike gedeelte in "
+"van waarna jy soek."
+
+#: src/skins-qt/search-select.cc:75 src/skins/search-select.cc:91
+msgid "Title:"
+msgstr "Titel:"
+
+#: src/skins-qt/search-select.cc:79 src/skins/search-select.cc:96
+msgid "Album:"
+msgstr "Album:"
+
+#: src/skins-qt/search-select.cc:82 src/skins/search-select.cc:101
+msgid "Artist:"
+msgstr "Kunstenaar:"
+
+#: src/skins-qt/search-select.cc:85 src/skins/search-select.cc:106
+msgid "File Name:"
+msgstr "Lêer Naam:"
+
+#: src/skins-qt/search-select.cc:88 src/skins/search-select.cc:134
+msgid "Clear previous selection before searching"
+msgstr "Vee vorige keuse uit voordat jy soek"
+
+#: src/skins-qt/search-select.cc:89 src/skins/search-select.cc:137
+msgid "Automatically toggle queue for matching entries"
+msgstr "Wissel outomaties tou vir bypassende inskrywings"
+
+#: src/skins-qt/search-select.cc:90 src/skins/search-select.cc:140
+msgid "Create a new playlist with matching entries"
+msgstr "Skep 'n nuwe snitlys met bypassende inskrywings"
+
+#: src/skins-qt/search-select.cc:101 src/skins/search-select.cc:78
+msgid "Search"
+msgstr "Soek"
+
+#: src/skins-qt/skins_cfg.cc:198 src/skins/skins_cfg.cc:182
+msgid "Player:"
+msgstr "Speler:"
+
+#: src/skins-qt/skins_cfg.cc:200 src/skins/skins_cfg.cc:184
+msgid "Select main player window font:"
+msgstr "Kies hoof speler venster lettertipe:"
+
+#: src/skins-qt/skins_cfg.cc:201 src/skins/skins_cfg.cc:185
+msgid "Playlist:"
+msgstr "Snitlys:"
+
+#: src/skins-qt/skins_cfg.cc:203 src/skins/skins_cfg.cc:187
+msgid "Select playlist font:"
+msgstr "Kies snitlys lettertipe:"
+
+#: src/skins-qt/skins_cfg.cc:207 src/skins/skins_cfg.cc:191
+msgid "Skin"
+msgstr "Vel"
+
+#: src/skins-qt/skins_cfg.cc:211 src/skins/skins_cfg.cc:193
+msgid "Display active titlebar when any window is focused"
+msgstr "Vertoon aktiewe titelbalk wanneer enige venster gefokus is"
+
+#: src/skins-qt/skins_cfg.cc:213 src/skins/skins_cfg.cc:195
+msgid "Fonts"
+msgstr "Lettertipes"
+
+#: src/skins-qt/skins_cfg.cc:215 src/skins/skins_cfg.cc:197
+msgid "Use bitmap fonts (supports ASCII only)"
+msgstr "Gebruik bitmap-lettertipes (ondersteun slegs ASCII)"
+
+#: src/skins-qt/skins_cfg.cc:217 src/skins/skins_cfg.cc:199
+msgid "Scroll song title"
+msgstr "Rollees liedjie titel"
+
+#: src/skins-qt/skins_cfg.cc:219 src/skins/skins_cfg.cc:201
+msgid "Scroll song title in both directions"
+msgstr "Rollees liedjie titel in beide rigtings"
+
+#: src/skins-qt/skins_cfg.cc:224 src/skins/skins_cfg.cc:206
+msgid "Analyzer"
+msgstr "Ontleder"
+
+#: src/skins-qt/skins_cfg.cc:225 src/skins/skins_cfg.cc:207
+msgid "Scope"
+msgstr "Skoop"
+
+#: src/skins-qt/skins_cfg.cc:226 src/skins/skins_cfg.cc:208
+msgid "Voiceprint / VU meter"
+msgstr "Stemafdruk / VU meter"
+
+#: src/skins-qt/skins_cfg.cc:227 src/skins/skins_cfg.cc:209
+msgid "Off"
+msgstr "Af"
+
+#: src/skins-qt/skins_cfg.cc:231 src/skins-qt/skins_cfg.cc:256
+#: src/skins-qt/skins_cfg.cc:262 src/skins/skins_cfg.cc:213
+#: src/skins/skins_cfg.cc:238 src/skins/skins_cfg.cc:244
+msgid "Normal"
+msgstr "Normaal"
+
+#: src/skins-qt/skins_cfg.cc:232 src/skins-qt/skins_cfg.cc:257
+#: src/skins/skins_cfg.cc:214 src/skins/skins_cfg.cc:239
+msgid "Fire"
+msgstr "Vuur"
+
+#: src/skins-qt/skins_cfg.cc:233 src/skins/skins_cfg.cc:215
+msgid "Vertical lines"
+msgstr "Vertikale lyne"
+
+#: src/skins-qt/skins_cfg.cc:237 src/skins/skins_cfg.cc:219
+msgid "Lines"
+msgstr "Lyne"
+
+#: src/skins-qt/skins_cfg.cc:238 src/skins/skins_cfg.cc:220
+msgid "Bars"
+msgstr "Balke"
+
+#: src/skins-qt/skins_cfg.cc:242 src/skins/skins_cfg.cc:224
+msgid "Slowest"
+msgstr "Stadigste"
+
+#: src/skins-qt/skins_cfg.cc:243 src/skins/skins_cfg.cc:225
+msgid "Slow"
+msgstr "Stadig"
+
+#: src/skins-qt/skins_cfg.cc:244 src/skins/skins_cfg.cc:226
+#: src/soxr/sox-resampler.cc:180
+msgid "Medium"
+msgstr "Medium"
+
+#: src/skins-qt/skins_cfg.cc:245 src/skins/skins_cfg.cc:227
+msgid "Fast"
+msgstr "Vinnig"
+
+#: src/skins-qt/skins_cfg.cc:246 src/skins/skins_cfg.cc:228
+msgid "Fastest"
+msgstr "Vinnigste"
+
+#: src/skins-qt/skins_cfg.cc:250 src/skins/skins_cfg.cc:232
+msgid "Dots"
+msgstr "Kolletjies"
+
+#: src/skins-qt/skins_cfg.cc:251 src/skins/skins_cfg.cc:233
+msgid "Line"
+msgstr "Lyne"
+
+#: src/skins-qt/skins_cfg.cc:252 src/skins/skins_cfg.cc:234
+msgid "Solid"
+msgstr "Solied"
+
+#: src/skins-qt/skins_cfg.cc:258 src/skins/skins_cfg.cc:240
+msgid "Ice"
+msgstr "Ys"
+
+#: src/skins-qt/skins_cfg.cc:263 src/skins/skins_cfg.cc:245
+msgid "Smooth"
+msgstr "Glad"
+
+#: src/skins-qt/skins_cfg.cc:267 src/skins/skins_cfg.cc:249
+msgid "Coloring:"
+msgstr "Kleur:"
+
+#: src/skins-qt/skins_cfg.cc:270 src/skins/skins_cfg.cc:252
+msgid "Style:"
+msgstr "Style:"
+
+#: src/skins-qt/skins_cfg.cc:273 src/skins/skins_cfg.cc:255
+msgid "Falloff:"
+msgstr "Daling:"
+
+#: src/skins-qt/skins_cfg.cc:276 src/skins/skins_cfg.cc:258
+msgid "Peak falloff:"
+msgstr "Piek daling:"
+
+#: src/skins-qt/skins_cfg.cc:282 src/skins/skins_cfg.cc:264
+msgid "Scope Style:"
+msgstr "Skoop styl:"
+
+#: src/skins-qt/skins_cfg.cc:285 src/skins/skins_cfg.cc:267
+msgid "Voiceprint Coloring:"
+msgstr "Stemafdruk Kleur:"
+
+#: src/skins-qt/skins_cfg.cc:288 src/skins/skins_cfg.cc:270
+msgid "VU Meter Style:"
+msgstr "VU Meter Styl:"
+
+#: src/skins-qt/skins_cfg.cc:294 src/skins/skins_cfg.cc:276
+msgid "Type"
+msgstr "Tipe"
+
+#: src/skins-qt/skins_cfg.cc:295 src/skins/skins_cfg.cc:277
+msgid "Visualization type:"
+msgstr "Visualisering tipe:"
+
+#: src/skins-qt/skins_cfg.cc:298 src/skins/skins_cfg.cc:280
+msgid "Analyzer"
+msgstr "Ontleder"
+
+#: src/skins-qt/skins_cfg.cc:299 src/skins/skins_cfg.cc:281
+msgid "Show peaks"
+msgstr "Wys pieke:"
+
+#: src/skins-qt/skins_cfg.cc:308 src/skins/skins_cfg.cc:290
+msgid "Visualization"
+msgstr "Visualisering"
+
+#: src/skins-qt/skinselector.cc:98 src/skins/skinselector.cc:111
+msgid "Archived Winamp 2.x skin"
+msgstr "Geargiveer Winamp 2.x vel"
+
+#: src/skins-qt/skinselector.cc:102 src/skins/skinselector.cc:115
+msgid "Unarchived Winamp 2.x skin"
+msgstr "Gedeargiveerde Winamp 2.x vel"
+
+#: src/sndfile/plugin.cc:38
+msgid "Sndfile Plugin"
+msgstr "Sndfile Inprop"
+
+#: src/sndfile/plugin.cc:372
+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 ""
+"Gebaseer op die xmms_sndfile-inprop:\n"
+"Kopiereg (C) 2000, 2002 Erik de Castro Lopo\n"
+"\n"
+"Aangepas vir Audacious deur Tony Vroon <chainsaw@gentoo.org>\n"
+"\n"
+"Hierdie program is gratis sagteware; jy kan dit herverdeel en/of wysig onder "
+"die bepalings van die GNU General Public License soos gepubliseer deur die "
+"Free Software Foundation; óf weergawe 2 van die lisensie, óf (na jou keuse) "
+"enige latere weergawe.\n"
+"\n"
+"Hierdie program word versprei in die hoop dat dit nuttig sal wees, maar "
+"SONDER ENIGE WAARBORG; selfs sonder die stilswyende waarborg van "
+"VERHANDELBAARHEID of GESKIKTHEID VIR 'N SPESIFIEKE DOEL. Sien die GNU "
+"General Public License vir meer besonderhede.\n"
+"\n"
+"Jy moes 'n afskrif van die GNU General Public License saam met hierdie "
+"program ontvang het; indien nie, skryf aan die Free Software Foundation, "
+"Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, VSA."
+
+#: src/sndio/sndio.cc:43
+msgid "Sndio Output"
+msgstr "Sndio Uitset"
+
+#: src/sndio/sndio.cc:98
+msgid "Device (blank for default):"
+msgstr "Toestel (leeg vir verstek):"
+
+#: src/sndio/sndio.cc:100
+msgid "Save and restore volume:"
+msgstr "Stoor en herstel volume:"
+
+#: src/sndio/sndio.cc:181
+#, c-format
+msgid "Sndio error: Unsupported audio format (%d)"
+msgstr "Sndio-fout: ongesteunde oudioformaat (%d)"
+
+#: src/sndio/sndio.cc:192
+msgid "Sndio error: sio_open() failed"
+msgstr "Sndio-fout: sio_open() het misluk"
+
+#: src/sndio/sndio.cc:221
+msgid "Sndio error: sio_setpar() failed"
+msgstr "Sndio-fout: sio_setpar() het misluk"
+
+#: src/sndio/sndio.cc:233
+msgid "Sndio error: sio_start() failed"
+msgstr "Sndio-fout: sio_start() het misluk"
+
+#: src/songchange/song_change.cc:30
+msgid "Song Change"
+msgstr "Lied Verander"
+
+#: src/songchange/song_change.cc:256
+msgid "Commands"
+msgstr "Bevele"
+
+#: src/songchange/song_change.cc:258
+msgid "Command to run when starting a new song:"
+msgstr "Bevel om te hardloop wanneer 'n nuwe lied begin:"
+
+#: src/songchange/song_change.cc:261
+msgid "Command to run when stopping a song:"
+msgstr ""
+
+#: src/songchange/song_change.cc:264
+msgid "Command to run at the end of a song:"
+msgstr "Bevel om te hardloop na die einde van 'n lied:"
+
+#: src/songchange/song_change.cc:267
+msgid "Command to run at the end of the playlist:"
+msgstr "Bevel om te hardloop na die einde van die snitlys:"
+
+#: src/songchange/song_change.cc:270
+msgid "Command to run when song title changes (for network streams):"
+msgstr ""
+"Bevel om uit te voer wanneer liedjietitel verander (vir netwerkstrome):"
+
+#: src/songchange/song_change.cc:273
+msgid ""
+"You can use the following format codes, which will be replaced before "
+"running the command.\n"
+"Not all are useful though for the song-stopped or end-of-playlist command."
+msgstr ""
+
+#: src/songchange/song_change.cc:276
+msgid ""
+"%a: Artist\n"
+"%b: Album\n"
+"%c: Number of channels\n"
+"%f: File name (full path)\n"
+"%F: Frequency (Hertz)\n"
+"%l: Length (milliseconds)\n"
+"%n or %s: Formatted title (see playlist settings)\n"
+"%p: Currently playing (1 or 0)\n"
+"%r: Rate (bits per second)\n"
+"%t: Playlist position\n"
+"%T: Title (unformatted)"
+msgstr ""
+"%a: Kunstenaar\n"
+"%b: Album\n"
+"%c: Aantal kanale\n"
+"%f: Lêernaam (volledige pad)\n"
+"%F: Frekwensie (Hertz)\n"
+"%l: Lengte (millisekondes)\n"
+"%n of %s: Geformateerde titel (sien snitlys instellings)\n"
+"%p: Speel tans (1 of 0)\n"
+"%r: Koers (bisse per sekonde)\n"
+"%t: Snitlys Posisie\n"
+"%T: Titel (ongeformateer)"
+
+#: src/songchange/song_change.cc:287
+msgid ""
+"Parameters passed to the shell should be enclosed in quotation marks.\n"
+"Unquoted parameters may lead to unexpected results."
+msgstr ""
+
+#: src/song-info-qt/song-info.cc:30
+msgid "Song Info"
+msgstr "Lied Info"
+
+#: src/soxr/sox-resampler.cc:44
+msgid "SoX Resampler"
+msgstr "SoX Hermonster"
+
+#: src/soxr/sox-resampler.cc:172
+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 Hermonster Inprop vir Audacious\n"
+"Kopiereg 2013 Michał Lipski\n"
+"\n"
+"Gebaseer op Sample Rate Converter Plugin:\n"
+"Kopiereg 2010-2012 John Lindgren"
+
+#: src/soxr/sox-resampler.cc:178
+msgid "Quick"
+msgstr "Vinnig"
+
+#: src/soxr/sox-resampler.cc:179
+msgid "Low"
+msgstr "Laag"
+
+#: src/soxr/sox-resampler.cc:181
+msgid "High"
+msgstr "Hoog"
+
+#: src/soxr/sox-resampler.cc:182
+msgid "Very High"
+msgstr "Baie Hoog"
+
+#: src/soxr/sox-resampler.cc:183
+msgid "Ultra High"
+msgstr "Ultra Hoog"
+
+#: src/soxr/sox-resampler.cc:187
+msgid "Minimum"
+msgstr "Minimum"
+
+#: src/soxr/sox-resampler.cc:188
+msgid "Intermediate"
+msgstr "Intermediêr"
+
+#: src/soxr/sox-resampler.cc:193
+msgid "Quality:"
+msgstr "Kwaliteit:"
+
+#: src/soxr/sox-resampler.cc:196
+msgid "Phase:"
+msgstr "Fase:"
+
+#: src/soxr/sox-resampler.cc:200
+msgid "Allow aliasing"
+msgstr "Laat aliasering toe"
+
+#: src/soxr/sox-resampler.cc:202
+msgid "Use steep filter"
+msgstr "Gebruik steil filtreerder"
+
+#: src/speedpitch/speed-pitch.cc:54
+msgid "Speed and Pitch"
+msgstr "Spoed en Toonhoogte"
+
+#: src/speedpitch/speed-pitch.cc:247
+msgid "Speed"
+msgstr "Spoed"
+
+#: src/speedpitch/speed-pitch.cc:248
+msgid "Decouple from pitch"
+msgstr "Ontkoppel van Toonhoogte"
+
+#: src/speedpitch/speed-pitch.cc:250 src/speedpitch/speed-pitch.cc:258
+msgid "Multiplier:"
+msgstr "Vermenigvuldiger:"
+
+#: src/speedpitch/speed-pitch.cc:254
+msgid "Pitch"
+msgstr "Toonhoogte"
+
+#: src/statusicon-qt/statusicon.cc:45 src/statusicon/statusicon.cc:47
+msgid "Status Icon"
+msgstr "Status Ikoon"
+
+#: src/statusicon-qt/statusicon.cc:68
+msgid ""
+"Status Icon Plugin (partial port for Qt interface)\n"
+"\n"
+"Copyright 2005-2007 Giacomo Lozito <james@develia.org>\n"
+"Copyright 2010 Michał Lipski <tallica@o2.pl>\n"
+"Copyright 2015 Eugene Paskevich <eugene@raptor.kiev.ua>\n"
+"\n"
+"This plugin provides a status icon, placed in\n"
+"the system tray area of the window manager."
+msgstr ""
+"Status Ikoon Inprop (gedeeltelike poort vir Qt-koppelvlak)\n"
+"\n"
+"Kopiereg 2005-2007 Giacomo Lozito <james@develia.org>\n"
+"Kopiereg 2010 Michał Lipski <tallica@o2.pl>\n"
+"Kopiereg 2015 Eugene Paskevich <eugene@raptor.kiev.ua>\n"
+"\n"
+"Hierdie inprop verskaf 'n status ikoon, geplaas in\n"
+"die sisteem laai area van die venster bestuurder."
+
+#: src/statusicon-qt/statusicon.cc:89 src/statusicon/statusicon.cc:384
+msgid "Mouse Scroll Action"
+msgstr "Muis Rollees Aksie"
+
+#: src/statusicon-qt/statusicon.cc:90 src/statusicon/statusicon.cc:385
+msgid "Change volume"
+msgstr "Verander volume"
+
+#: src/statusicon-qt/statusicon.cc:93 src/statusicon/statusicon.cc:388
+msgid "Change playing song"
+msgstr "Verander spelende lied"
+
+#: src/statusicon-qt/statusicon.cc:96 src/statusicon/statusicon.cc:391
+msgid "Other Settings"
+msgstr "Ander Stellings"
+
+#: src/statusicon-qt/statusicon.cc:97 src/statusicon/statusicon.cc:392
+msgid "Disable the popup window"
+msgstr "Deaktiveer die opspring venster"
+
+#: src/statusicon-qt/statusicon.cc:99 src/statusicon/statusicon.cc:394
+msgid "Close to the system tray"
+msgstr "Maak toe na die sisteem laai"
+
+#: src/statusicon-qt/statusicon.cc:101 src/statusicon/statusicon.cc:396
+msgid "Advance in playlist when scrolling upward"
+msgstr "Bevorder die snitlys wanneer jy rollees opwaarts"
+
+#: src/statusicon-qt/statusicon.cc:116 src/statusicon/statusicon.cc:287
+msgid "Se_ttings ..."
+msgstr "S_tellings ..."
+
+#: src/statusicon/statusicon.cc:377
+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 ""
+"Status-ikoon-inprop\n"
+"\n"
+"Kopiereg 2005-2007 Giacomo Lozito <james@develia.org>\n"
+"Kopiereg 2010 Michał Lipski <tallica@o2.pl>\n"
+"\n"
+"Hierdie inprop verskaf 'n statusikoon, geplaas in\n"
+"die system tray area van die vensterbestuurder."
+
+#: src/stereo_plugin/stereo.cc:19
+msgid "Extra Stereo"
+msgstr "Ekstra Stereo"
+
+#: src/stereo_plugin/stereo.cc:36
+msgid ""
+"Extra Stereo Plugin\n"
+"\n"
+"By Johan Levin, 1999"
+msgstr ""
+"Ekstra Stereo Inprop\n"
+"\n"
+"Deur Johan Levin, 1999"
+
+#: src/stereo_plugin/stereo.cc:44
+msgid "Extra Stereo"
+msgstr "Ekstra Stereo"
+
+#: src/streamtuner/icecast-model.cc:126 src/streamtuner/shoutcast-model.cc:131
+msgid "Type"
+msgstr "Tipe"
+
+#: src/streamtuner/icecast-model.cc:132
+msgid "Current Song"
+msgstr "Huidige Lied"
+
+#: src/streamtuner/icecast-model.cc:164
+msgid "Other"
+msgstr "Ander"
+
+#: src/streamtuner/ihr-model.cc:63
+msgid "Market"
+msgstr "Mark"
+
+#: src/streamtuner/ihr-model.cc:156
+msgid "Call Letters"
+msgstr "Roep Letters"
+
+#: src/streamtuner/ihr-model.cc:162
+msgid "Description"
+msgstr "Beskrywing"
+
+#: src/streamtuner/shoutcast-model.cc:128
+msgid "Listeners"
+msgstr "Luisteraars"
+
+#: src/streamtuner/shoutcast-model.cc:188
+msgid "Top 500 Stations"
+msgstr "Top 500 Stasies"
+
+#: src/streamtuner/shoutcast-model.cc:189
+msgid "Alternative"
+msgstr "Alternatief"
+
+#: src/streamtuner/shoutcast-model.cc:190
+msgid "Blues"
+msgstr "Blues"
+
+#: src/streamtuner/shoutcast-model.cc:191
+msgid "Classical"
+msgstr "Klassieke"
+
+#: src/streamtuner/shoutcast-model.cc:192
+msgid "Country"
+msgstr "Country"
+
+#: src/streamtuner/shoutcast-model.cc:193
+msgid "Decades"
+msgstr "Dekades"
+
+#: src/streamtuner/shoutcast-model.cc:194
+msgid "Easy Listening"
+msgstr "Gemaklike Luister"
+
+#: src/streamtuner/shoutcast-model.cc:195
+msgid "Electronic"
+msgstr "Elektronies"
+
+#: src/streamtuner/shoutcast-model.cc:196
+msgid "Folk"
+msgstr "Volk"
+
+#: src/streamtuner/shoutcast-model.cc:197
+msgid "Inspirational"
+msgstr "Inspirerend"
+
+#: src/streamtuner/shoutcast-model.cc:198
+msgid "International"
+msgstr "Internasionaal"
+
+#: src/streamtuner/shoutcast-model.cc:199
+msgid "Jazz"
+msgstr "Jazz"
+
+#: src/streamtuner/shoutcast-model.cc:200
+msgid "Latin"
+msgstr "Latyns"
+
+#: src/streamtuner/shoutcast-model.cc:201
+msgid "Metal"
+msgstr "Metal"
+
+#: src/streamtuner/shoutcast-model.cc:203
+msgid "New Age"
+msgstr "Nuwe Era"
+
+#: src/streamtuner/shoutcast-model.cc:204
+msgid "Pop"
+msgstr "Pop"
+
+#: src/streamtuner/shoutcast-model.cc:205
+msgid "Public Radio"
+msgstr "Publieke Radio"
+
+#: src/streamtuner/shoutcast-model.cc:206
+msgid "R&B and Urban"
+msgstr "R&B en Urban"
+
+#: src/streamtuner/shoutcast-model.cc:207
+msgid "Rap"
+msgstr "Rap"
+
+#: src/streamtuner/shoutcast-model.cc:208
+msgid "Reggae"
+msgstr "Reggae"
+
+#: src/streamtuner/shoutcast-model.cc:209
+msgid "Rock"
+msgstr "Rock"
+
+#: src/streamtuner/shoutcast-model.cc:210
+msgid "Seasonal and Holiday"
+msgstr "Seisoenale en Vakansie"
+
+#: src/streamtuner/shoutcast-model.cc:211
+msgid "Soundtracks"
+msgstr "Klankbane"
+
+#: src/streamtuner/shoutcast-model.cc:212
+msgid "Talk"
+msgstr "Praat"
+
+#: src/streamtuner/shoutcast-model.cc:213
+msgid "Themes"
+msgstr "Temas"
+
+#: src/streamtuner/streamtuner.cc:59
+msgid "Shoutcast"
+msgstr "Shoutcast"
+
+#: src/streamtuner/streamtuner.cc:60
+msgid "Icecast"
+msgstr "Icecast"
+
+#: src/streamtuner/streamtuner.cc:71
+msgid "Stream Tuner"
+msgstr "Stroom Stemmer"
+
+#: src/tonegen/tonegen.cc:45
+msgid "Tone Generator"
+msgstr "Toongenerator"
+
+#: src/tonegen/tonegen.cc:92
+#, c-format
+msgid "%s %.1f Hz"
+msgstr "%s %.1f Hz"
+
+#: src/tonegen/tonegen.cc:92
+msgid "Tone Generator: "
+msgstr "Toongenerator:"
+
+#: src/tonegen/tonegen.cc:161
+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 ""
+"Sinustoongenerator deur Håvard Kvålen <havardk@xmms.org>\n"
+"Gewysig deur Daniel J. Peng <danielpeng@bigfoot.com>\n"
+"\n"
+"Om dit te gebruik, voeg 'n URL by: tone://frekwensie1;frekwensie2;"
+"frekwensie3;...\n"
+"bv. tone://2000;2005 om 'n 2000 Hz-toon en 'n 2005 Hz-toon te speel"
+
+#: src/ui-common/dialogs-qt.cc:40
+msgid ""
+"\n"
+"(Further messages have been hidden.)"
+msgstr ""
+"\n"
+"(Verdere boodskappe is versteek.)"
+
+#: src/ui-common/dialogs-qt.cc:52
+msgid "Working ..."
+msgstr "In Werking ..."
+
+#: src/ui-common/dialogs-qt.cc:73
+msgid "Information"
+msgstr "Informasie"
+
+#: src/ui-common/menu-ops-gtk.cc:132 src/ui-common/menu-ops-qt.cc:113
+#, c-format
+msgid "%s does not appear to be a valid folder."
+msgstr "Dit blyk dat %s nie 'n geldige vouer is nie."
+
+#: src/voice_removal/voice_removal.cc:28
+msgid "Voice Removal"
+msgstr "Stem Verwydering"
+
+#: src/vorbis/vorbis.cc:433
+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 Dekodeerder\n"
+"\n"
+"Gebaseer op die Xiph.org-stigting se Ogg Vorbis-inprop:\n"
+"http://www.xiph.org/\n"
+"\n"
+"Oorspronklike kode deur:\n"
+"Tony Arcieri <bascule@inferno.tusculum.edu>\n"
+"\n"
+"Bydraes van:\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.h:18
+msgid "Ogg Vorbis Decoder"
+msgstr "Ogg Vorbis Dekodeerder"
+
+#: src/vtx/info.cc:24
+#, c-format
+msgid "Details about %s"
+msgstr "Besonderhede oor %s"
+
+#: src/vtx/info.cc:26
+msgid ""
+"Title: %t\n"
+"Author: %a\n"
+"From: %f\n"
+"Tracker: %T\n"
+"Comment: %C\n"
+"Chip type: %c\n"
+"Stereo: %s\n"
+"Loop: %l\n"
+"Chip freq: %F\n"
+"Player Freq: %P\n"
+"Year: %y"
+msgstr ""
+"Titel: %t\n"
+"Skrywer: %a\n"
+"Van: %f\n"
+"Spoor: %T\n"
+"Kommentaar: %C\n"
+"Chip tipe: %c\n"
+"Stereo: %s\n"
+"Lus: %l\n"
+"Chip frekwensie: %F\n"
+"Speler frekwensie: %P\n"
+"Jaar: %y"
+
+#: src/vtx/vtx.cc:38
+msgid "VTX Decoder"
+msgstr "VTX Dekodeerder"
+
+#: src/vtx/vtx.cc:178
+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-lêerformaatspeler deur Sashnov Alexander <sashnov@ngs.ru>\n"
+"Gebaseer op in_vtx.dll deur Roman Sherbakov <v_soft@microfor.ru>\n"
+"Audacious plugin deur Pavel Vymetalek <pvymetalek@seznam.cz>"
+
+#: src/vumeter-qt/vumeter_qt.cc:31
+msgid ""
+"VU Meter Plugin for Audacious\n"
+"Copyright 2017-2019 Marc Sánchez Fauste"
+msgstr ""
+"VU Meter-inprop vir Audacious\n"
+"Kopiereg 2017-2019 Marc Sánchez Faustea"
+
+#: src/vumeter-qt/vumeter_qt.cc:35
+msgid "VU Meter Settings"
+msgstr "VU Meter Stellings"
+
+#: src/vumeter-qt/vumeter_qt.cc:37
+msgid "Peak hold time:"
+msgstr "Piek hou tyd:"
+
+#: src/vumeter-qt/vumeter_qt.cc:42
+msgid "Fall-off time:"
+msgstr "Daling tyd:"
+
+#: src/vumeter-qt/vumeter_qt.cc:44
+msgid "dB/second"
+msgstr "dB/sekonde"
+
+#: src/vumeter-qt/vumeter_qt.cc:46
+msgid "Display legend"
+msgstr "Wys legende"
+
+#: src/vumeter-qt/vumeter_qt.h:37
+msgid "VU Meter"
+msgstr "VU Meter"
+
+#: src/waveout/waveout.cc:43
+msgid "Win32 waveOut"
+msgstr "Win32 waveOut"
+
+#: src/waveout/waveout.cc:69
+msgid ""
+"Win32 waveOut Plugin for Audacious\n"
+"Copyright 2016 John Lindgren"
+msgstr ""
+"Win32 waveOut-inprop vir Audacious\n"
+"Kopiereg 2016 John Lindgren"
+
+#: src/wavpack/wavpack.cc:25
+msgid "WavPack Decoder"
+msgstr "WavPack Dekodeerder"
+
+#: src/wavpack/wavpack.cc:217
+msgid "lossy (hybrid)"
+msgstr "verliesagtig (hibriede)"
+
+#: src/wavpack/wavpack.cc:219
+msgid "lossy"
+msgstr "verliesagtig"
+
+#: src/wavpack/wavpack.cc:259
+msgid ""
+"Copyright 2006 William Pitcock <nenolod@nenolod.net>\n"
+"\n"
+"Some of the plugin code was by Miles Egan."
+msgstr ""
+"Kopiereg 2006 William Pitcock <nenolod@nenolod.net>\n"
+"\n"
+"Sommige van die inpropkode was deur Miles Egan."
+
+#: src/xsf/plugin.cc:74
+msgid "2SF Decoder"
+msgstr "2SF Dekodeerder"
+
+#: src/xsf/plugin.cc:429
+msgid "32728 Hz"
+msgstr "32728 Hz"
+
+#: src/xsf/plugin.cc:432
+msgid "65456 Hz"
+msgstr "65456 Hz"
+
+#: src/xsf/plugin.cc:438
+msgid "Cosine"
+msgstr "Cosinus"
+
+#: src/xsf/plugin.cc:439
+msgid "Sharp"
+msgstr "Skerp"
+
+#: src/xsf/plugin.cc:443
+msgid "XSF Configuration"
+msgstr "XSF Konfigurasie"
+
+#: src/xsf/plugin.cc:445
+msgid "Default fade time:"
+msgstr "Verstek vervaag tyd:"
+
+#: src/xsf/plugin.cc:447
+msgid "Interpolation mode:"
+msgstr "Interpolasiemodus:"
+
+#: src/xspf/xspf.cc:95
+msgid "XML Shareable Playlists (XSPF)"
+msgstr "XML deelbare snitlyste (XSPF)"

audacious-plugins-4.4.1.tar.bz2/po/ar.po Added

@@ -0,0 +1,4864 @@
+# Arabic translation for Audacious Plugins
+# Copyright (C) Audacious translators
+# This file is distributed under the same license as the Audacious Plugins package.
+#
+# Translators:
+# abouzakaria kov <zakariakov@gmail.com>, 2016
+# Rached Noureddine <rached.noureddine@gmail.com>, 2019
+# Riyadh Talal <a.shamil77@yahoo.com>, 2020,2022
+msgid ""
+msgstr ""
+"Project-Id-Version: Audacious Plugins\n"
+"Report-Msgid-Bugs-To: https://github.com/audacious-media-player/audacious/"
+"issues\n"
+"POT-Creation-Date: 2024-09-26 21:54+0200\n"
+"PO-Revision-Date: 2011-10-10 17:43+0000\n"
+"Last-Translator: Riyadh Talal <a.shamil77@yahoo.com>, 2020,2022\n"
+"Language-Team: Arabic (http://app.transifex.com/audacious/audacious/language/"
+"ar/)\n"
+"Language: ar\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
+"&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
+
+#: src/aac/aac.cc:19
+msgid "AAC (Raw) Decoder"
+msgstr " مرمز AAC (الخام)"
+
+#: src/adplug/adplug-xmms.cc:70
+msgid "AdPlug (AdLib Player)"
+msgstr "مكتبة AdPlug (مشغّل AdLib)"
+
+#: src/adplug/adplug-xmms.cc:167 src/modplug/modplugbmp.cc:321
+#: src/psf/plugin.cc:161 src/vtx/vtx.cc:89 src/xsf/plugin.cc:204
+msgid "sequenced"
+msgstr "متسلسلة"
+
+#: src/adplug/adplug-xmms.cc:349 src/sid/xs_config.cc:61
+msgid "Output"
+msgstr "المُخرَج"
+
+#: src/adplug/adplug-xmms.cc:350
+msgid "OPL Emulator:"
+msgstr "محاكي OPL:"
+
+#: src/adplug/adplug-xmms.cc:353 src/amidiplug/i_configure.cc:153
+#: src/console/plugin.cc:45 src/filewriter/filewriter.cc:481
+#: src/sid/xs_config.cc:65 src/xsf/plugin.cc:446
+msgid "Sample rate:"
+msgstr "معدل العينة:"
+
+#: src/adplug/adplug-xmms.cc:354 src/amidiplug/i_configure.cc:155
+#: src/bs2b/plugin.cc:141 src/console/plugin.cc:47
+#: src/modplug/plugin_main.cc:77 src/resample/resample.cc:201
+#: src/resample/resample.cc:207 src/resample/resample.cc:211
+#: src/resample/resample.cc:215 src/resample/resample.cc:219
+#: src/resample/resample.cc:223 src/resample/resample.cc:227
+#: src/resample/resample.cc:231 src/resample/resample.cc:235
+#: src/resample/resample.cc:239 src/resample/resample.cc:243
+#: src/sid/xs_config.cc:67 src/soxr/sox-resampler.cc:205
+msgid "Hz"
+msgstr "هرتز"
+
+#: src/adplug/adplug-xmms.cc:355 src/gtkui/settings.cc:55
+#: src/modplug/plugin_main.cc:105 src/qtui/settings.cc:85
+#: src/skins-qt/skins_cfg.cc:302 src/skins/skins_cfg.cc:284
+msgid "Miscellaneous"
+msgstr "متفرقات"
+
+#: src/adplug/adplug-xmms.cc:356
+msgid "Repeat song in endless loop"
+msgstr "كرر المقطوعة بحلقة غير منتهية"
+
+#: src/albumart/albumart.cc:31 src/albumart-qt/albumart.cc:35
+msgid "Album Art"
+msgstr "لوحة الألبوم"
+
+#: src/alsa/alsa.h:64
+msgid "ALSA Output"
+msgstr "مُخرجات ALSA"
+
+#: src/alsa/config.cc:28
+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 John Lindgren\n"
+"\n"
+"شكري إلى William Pitcock، مؤلف ملحقة مخرَجات ALSA NG، الذي أفادني نصه البرمجي "
+"كمرجع عندما لم يكن مرشد ALSA كافيا."
+
+#: src/alsa/config.cc:61
+msgid "(no description)"
+msgstr "(بدون وصف)"
+
+#: src/alsa/config.cc:166
+msgid "Default PCM device"
+msgstr "الجهاز الافتراضي PCM"
+
+#: src/alsa/config.cc:188
+msgid "Default mixer device"
+msgstr "لجهاز الخالط الافتراضي"
+
+#: src/alsa/config.cc:296
+msgid "PCM device:"
+msgstr "جهاز PCM:"
+
+#: src/alsa/config.cc:299
+msgid "Mixer device:"
+msgstr "جهاز الخالط:"
+
+#: src/alsa/config.cc:302
+msgid "Mixer element:"
+msgstr "عنصر خالط:"
+
+#: src/amidiplug/amidi-plug.cc:42
+msgid "AMIDI-Plug (MIDI Player)"
+msgstr "AMIDI-التوصيل(MIDI مشغل)"
+
+#: src/amidiplug/amidi-plug.cc:445
+msgid ""
+"AMIDI-Plug\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 ""
+"AMIDI-Plug\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/amidiplug/i_configure.cc:94
+msgid "Override default gain:"
+msgstr "تجاوز الكاسب الافتراضي:"
+
+#: src/amidiplug/i_configure.cc:102
+msgid "Override default polyphony:"
+msgstr "تجاوز تعدد الأصوات الافتراضية:"
+
+#: src/amidiplug/i_configure.cc:110
+msgid "Override default reverb:"
+msgstr "تجاوز التردد الافتراضي:"
+
+#: src/amidiplug/i_configure.cc:112 src/amidiplug/i_configure.cc:120
+msgid "On"
+msgstr "مفتوح"
+
+#: src/amidiplug/i_configure.cc:118
+msgid "Override default chorus:"
+msgstr "تجاوز الجوقة الافتراضية:"
+
+#: src/amidiplug/i_configure.cc:128 src/console/plugin.cc:29
+msgid "Playback"
+msgstr "التشغيل"
+
+#: src/amidiplug/i_configure.cc:129
+msgid "Transpose:"
+msgstr "ترجم:"
+
+#: src/amidiplug/i_configure.cc:131 src/speedpitch/speed-pitch.cc:257
+msgid "semitones"
+msgstr "نصف نغمة"
+
+#: src/amidiplug/i_configure.cc:132
+msgid "Drum shift:"
+msgstr "تحول الطبل:"
+
+#: src/amidiplug/i_configure.cc:134
+msgid "note numbers"
+msgstr "ارقام النوتة"
+
+#: src/amidiplug/i_configure.cc:135
+msgid "Skip leading silence"
+msgstr "تخطي leading silence"
+
+#: src/amidiplug/i_configure.cc:137
+msgid "Skip trailing silence"
+msgstr "تخطي trailing silence"
+
+#: src/amidiplug/i_configure.cc:141
+msgid "SoundFont"
+msgstr "SoundFont"
+
+#: src/amidiplug/i_configure.cc:148
+msgid "Synthesizer"
+msgstr "المزج"
+
+#: src/amidiplug/i_configure-fluidsynth.cc:58
+#: src/amidiplug/i_configure-fluidsynth.cc:527
+msgid "AMIDI-Plug - select SoundFont file"
+msgstr "AMIDI-Plug - حدد ملف SoundFont "
+
+#: src/amidiplug/i_configure-fluidsynth.cc:61
+msgid "_Cancel"
+msgstr "_إلغ"
+
+#: src/amidiplug/i_configure-fluidsynth.cc:62
+msgid "_Open"
+msgstr "_افتح"
+
+#: src/amidiplug/i_configure-fluidsynth.cc:233
+#: src/amidiplug/i_configure-fluidsynth.cc:461
+msgid "File name"
+msgstr "إسم الملف"
+
+#: src/amidiplug/i_configure-fluidsynth.cc:237
+#: src/amidiplug/i_configure-fluidsynth.cc:464
+msgid "Size (bytes)"
+msgstr "حجم(بايت)"
+
+#: src/amidiplug/i_fileinfo.cc:184
+msgid "Name:"
+msgstr "اسم:"
+
+#: src/amidiplug/i_fileinfo.cc:202
+msgid " MIDI Info "
+msgstr " ميدي معلومات"
+
+#: src/amidiplug/i_fileinfo.cc:216
+msgid "Format:"
+msgstr "صِيغة:"
+
+#: src/amidiplug/i_fileinfo.cc:219
+msgid "Length (msec):"
+msgstr "طول (مللي ثانية):"
+
+#: src/amidiplug/i_fileinfo.cc:222
+msgid "No. of Tracks:"
+msgstr "عدد المقاطع:"
+
+#: src/amidiplug/i_fileinfo.cc:228
+msgid "variable"
+msgstr "متغير"
+
+#: src/amidiplug/i_fileinfo.cc:230
+msgid "BPM:"
+msgstr "BPM:"
+
+#: src/amidiplug/i_fileinfo.cc:238
+msgid "BPM (wavg):"
+msgstr "BPM (wavg):"
+
+#: src/amidiplug/i_fileinfo.cc:241
+msgid "Time Div:"
+msgstr "الوقت Div:"
+
+#: src/amidiplug/i_fileinfo.cc:252
+msgid " MIDI Comments and Lyrics "
+msgstr "تعليقات MIDI and Lyrics "
+
+#: src/amidiplug/i_fileinfo.cc:299
+msgid "* no comments available in this MIDI file *"
+msgstr "* لا يوجد تعليقات متاحة في ملف MIDI *"
+
+#: src/amidiplug/i_fileinfo.cc:311
+msgid "* no lyrics available in this MIDI file *"
+msgstr "* لا كلمات متاحة في ملف MIDI *"
+
+#: src/amidiplug/i_fileinfo.cc:321 src/ladspa/plugin.cc:418
+#: src/ui-common/dialogs-qt.cc:32
+msgid "_Close"
+msgstr "_اخرج"
+
+#: src/amidiplug/i_fileinfo.cc:346
+msgid " (invalid UTF-8)"
+msgstr " (غير صالحة UTF-8)"
+
+#: src/ampache/ampache.cc:33
+msgid "Ampache Browser"
+msgstr "Ampache متصفخ"
+
+#: src/ampache/ampache.cc:46
+msgid ""
+"Ampache Browser for Audacious\n"
+"http://ampache-browser.org/\n"
+"\n"
+"Copyright (C) Róbert Čerňanský and John Lindgren\n"
+"License: GNU GPLv3"
+msgstr ""
+"المتصفح Ampache لأوداسيش\n"
+"http://ampache-browser.org/\n"
+"\n"
+"حقوق النشر (C) Róbert Čerňanský و John Lindgren\n"
+"الرخصة: GNU GPLv3"
+
+#: src/aosd/aosd.cc:31
+msgid ""
+"Audacious OSD\n"
+"http://www.develia.org/projects.php?p=audacious#aosd\n"
+"\n"
+"Written by Giacomo Lozito <james@develia.org>\n"
+"\n"
+"Based in part on Evan Martin's Ghosd library:\n"
+"http://neugierig.org/software/ghosd/"
+msgstr ""
+"Audacious OSD\n"
+"http://www.develia.org/projects.php?p=audacious#aosd\n"
+"\n"
+"Written by Giacomo Lozito <james@develia.org>\n"
+"\n"
+"Based in part on Evan Martin's Ghosd library:\n"
+"http://neugierig.org/software/ghosd/"
+
+#: src/aosd/aosd.h:37
+msgid "AOSD (On-Screen Display)"
+msgstr "AOSD (العرض على الشاشة)"
+
+#: src/aosd/aosd_style.cc:54
+msgid "Rectangle"
+msgstr "مستطيل"
+
+#: src/aosd/aosd_style.cc:59
+msgid "Rounded Rectangle"
+msgstr "مستطيل دائري"
+
+#: src/aosd/aosd_style.cc:64
+msgid "Concave Rectangle"
+msgstr "مستطيل مقعر"
+
+#: src/aosd/aosd_style.cc:69 src/openmpt/mptwrap.h:50 src/xsf/plugin.cc:436
+msgid "None"
+msgstr "لا شيء"
+
+#: src/aosd/aosd_trigger.cc:49
+msgid "Playback Start"
+msgstr "بداية التشغيل"
+
+#: src/aosd/aosd_trigger.cc:50
+msgid "Triggers OSD when a playlist entry is played."
+msgstr "اطلق OSD عند تشغيل القائمة."
+
+#: src/aosd/aosd_trigger.cc:55
+msgid "Title Change"
+msgstr "تغير العنوان"
+
+#: src/aosd/aosd_trigger.cc:56
+msgid "Triggers OSD when the song title changes (for internet streams)."
+msgstr "اطلق OSD عند تغيير عنوان المقطع (لتيارات الإنترنت)."
+
+#: src/aosd/aosd_trigger.cc:61
+msgid "Pause On"
+msgstr "اللبث مشغل"
+
+#: src/aosd/aosd_trigger.cc:62
+msgid "Triggers OSD when playback is paused."
+msgstr "يطلق OSD عند لبث التشغيل."
+
+#: src/aosd/aosd_trigger.cc:67
+msgid "Pause Off"
+msgstr "الليث متوقف"
+
+#: src/aosd/aosd_trigger.cc:68
+msgid "Triggers OSD when playback is unpaused."
+msgstr "يطلق OSD عندما التشغيل يتم إيقافه مؤقتا."
+
+#: src/aosd/aosd_ui.cc:204
+msgid "Placement"
+msgstr "الموضع"
+
+#: src/aosd/aosd_ui.cc:241
+msgid "Relative X offset:"
+msgstr "نسبية X أوفسات:"
+
+#: src/aosd/aosd_ui.cc:245
+msgid "Relative Y offset:"
+msgstr "نسبية Y أوفسات:"
+
+#: src/aosd/aosd_ui.cc:249
+msgid "Max OSD width:"
+msgstr "اكبر عرض OSD :"
+
+#: src/aosd/aosd_ui.cc:281
+msgid "Multi-Monitor options"
+msgstr "خيارات الشاشه المتعددة "
+
+#: src/aosd/aosd_ui.cc:285
+msgid "Display OSD using:"
+msgstr "عرض OSD باستخدام:"
+
+#: src/aosd/aosd_ui.cc:287
+msgid "all monitors"
+msgstr "كل الشاشات"
+
+#: src/aosd/aosd_ui.cc:290
+#, c-format
+msgid "monitor %i"
+msgstr "شاشة%i"
+
+#: src/aosd/aosd_ui.cc:342
+msgid "Timing (ms)"
+msgstr "توقيت (مللي ثانية)"
+
+#: src/aosd/aosd_ui.cc:347
+msgid "Display:"
+msgstr "عرض:"
+
+#: src/aosd/aosd_ui.cc:352
+msgid "Fade in:"
+msgstr "تتلاشى في:"
+
+#: src/aosd/aosd_ui.cc:357
+msgid "Fade out:"
+msgstr "تتلاشى خارج:"
+
+#: src/aosd/aosd_ui.cc:442
+msgid "Fonts"
+msgstr "خطوط"
+
+#: src/aosd/aosd_ui.cc:449
+#, c-format
+msgid "Font %i:"
+msgstr "خط %i:"
+
+#: src/aosd/aosd_ui.cc:466
+msgid "Shadow"
+msgstr "ظل"
+
+#: src/aosd/aosd_ui.cc:589
+msgid "Render Style"
+msgstr "نمط الاداء"
+
+#: src/aosd/aosd_ui.cc:605
+msgid "Colors"
+msgstr "الوان"
+
+#: src/aosd/aosd_ui.cc:616
+#, c-format
+msgid "Color %i:"
+msgstr "خط %i:"
+
+#: src/aosd/aosd_ui.cc:714
+msgid "Enable trigger"
+msgstr "تمكين المشغل"
+
+#: src/aosd/aosd_ui.cc:741
+msgid "Event"
+msgstr "حدث"
+
+#: src/aosd/aosd_ui.cc:768
+msgid "Composite manager detected"
+msgstr "Composite manager عثر على"
+
+#: src/aosd/aosd_ui.cc:775
+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;\n"
+"إلا إذا كنت تعرف أن لديك واحد مشغل, الرجاء تنشيط Composite manager "
+
+#: src/aosd/aosd_ui.cc:783
+msgid "Composite manager not required for fake transparency"
+msgstr "مدير مركب غير مطلوب للشفافية "
+
+#: src/aosd/aosd_ui.cc:820
+msgid "Transparency"
+msgstr "الشفافية"
+
+#: src/aosd/aosd_ui.cc:826
+msgid "Fake transparency"
+msgstr "شفافية وهمية"
+
+#: src/aosd/aosd_ui.cc:828
+msgid "Real transparency (requires X Composite Ext.)"
+msgstr "الشفافية الحقيقية (تتطلب X Composite Ext.)"
+
+#: src/aosd/aosd_ui.cc:875
+msgid "Composite extension not loaded"
+msgstr "Composite extension لم يحمل"
+
+#: src/aosd/aosd_ui.cc:892
+#, c-format
+msgid "Audacious OSD"
+msgstr "OSD لأوداشْيَس"
+
+#: src/aosd/aosd_ui.cc:955
+msgid "Position"
+msgstr "الموضع"
+
+#: src/aosd/aosd_ui.cc:960
+msgid "Animation"
+msgstr "الحركة"
+
+#: src/aosd/aosd_ui.cc:965
+msgid "Text"
+msgstr "نص"
+
+#: src/aosd/aosd_ui.cc:970
+msgid "Decoration"
+msgstr "زخرفة"
+
+#: src/aosd/aosd_ui.cc:975
+msgid "Trigger"
+msgstr "أثار"
+
+#: src/aosd/aosd_ui.cc:980 src/streamtuner/shoutcast-model.cc:202
+msgid "Misc"
+msgstr "متفرقات"
+
+#: src/aosd/aosd_ui.cc:989
+msgid "Test"
+msgstr "تجربة"
+
+#: src/asx3/asx3.cc:35
+msgid "ASXv3 Playlists"
+msgstr "قوائم ASXv3"
+
+#: src/asx/asx.cc:33
+msgid "ASXv1/ASXv2 Playlists"
+msgstr "قوائم ASXv1/ASXv2"
+
+#: src/audpl/audpl.cc:33
+msgid "Audacious Playlists (audpl)"
+msgstr "قوائم Audacious (audpl)"
+
+#: src/background_music/background_music.cc:24
+msgid "Background music"
+msgstr ""
+
+#: src/background_music/background_music.cc:25
+msgid "Target level:"
+msgstr ""
+
+#: src/background_music/background_music.cc:28
+#: src/background_music/background_music.cc:33
+#: src/silence-removal/silence-removal.cc:70
+msgid "dB"
+msgstr "dB"
+
+#: src/background_music/background_music.cc:29
+msgid "Maximum amplification:"
+msgstr ""
+
+#: src/background_music/background_music.cc:34 src/mpg123/mpg123.cc:81
+msgid "Advanced"
+msgstr "متقدم"
+
+#: src/background_music/background_music.cc:36
+msgid "Slow detection weight:"
+msgstr ""
+
+#: src/background_music/background_music.cc:39
+msgid "Hint"
+msgstr ""
+
+#: src/background_music/background_music.cc:41
+msgid ""
+"Slow detection weight is the relative weight\n"
+"of a long term average detection when compared\n"
+"to the actual, faster loudness detection.\n"
+"A value of zero gives a more radio-like sound\n"
+"where soft passages get \"pulled up\" more quickly,\n"
+"a value of two makes the sound feel less compressed."
+msgstr ""
+
+#: src/background_music/background_music.cc:52
+msgid ""
+"Background Music Plugin for Audacious\n"
+"Copyright 2023;2024 Michel Fleur\n"
+"\n"
+"Controls the volume to make the sound equally loud within and between "
+"tracks.\n"
+" It uses accurate loudness measurement and tries to make the volume changes "
+"sound natural without audible peaks, yet without lowering the volume before "
+"a peak in advance."
+msgstr ""
+
+#: src/background_music/background_music.cc:61
+msgid "Background Music"
+msgstr ""
+
+#: src/bitcrusher/bitcrusher.cc:33
+msgid "Bitcrusher"
+msgstr "ماحق البت"
+
+#: src/bitcrusher/bitcrusher.cc:34
+msgid "Bit Depth:"
+msgstr "عمق البت:"
+
+#: src/bitcrusher/bitcrusher.cc:37
+msgid "Downsample ratio:"
+msgstr "نسبة إنقاص العيّنة"
+
+#: src/bitcrusher/bitcrusher.cc:48
+msgid "Bitcrusher"
+msgstr "ماحق البت"
+
+#: src/blur_scope/blur_scope.cc:40 src/blur_scope-qt/blur_scope.cc:45
+msgid "Color"
+msgstr "لون"
+
+#: src/blur_scope/blur_scope.cc:56 src/blur_scope-qt/blur_scope.cc:158
+msgid "Blur Scope"
+msgstr "نطاق الضباب"
+
+#: src/bs2b/plugin.cc:38
+msgid "Bauer Stereophonic-to-Binaural (BS2B)"
+msgstr "Bauer Stereophonic-to-Binaural (BS2B)"
+
+#: src/bs2b/plugin.cc:129
+msgid "Presets:"
+msgstr "معادلات:"
+
+#: src/bs2b/plugin.cc:130
+msgid "Default"
+msgstr "افتراضي"
+
+#: src/bs2b/plugin.cc:136
+msgid "Feed level:"
+msgstr "مستوى التغذية:"
+
+#: src/bs2b/plugin.cc:138
+msgid "x1/10 dB"
+msgstr "x1/10 dB"
+
+#: src/bs2b/plugin.cc:139
+msgid "Cut frequency:"
+msgstr "قطع التردد:"
+
+#: src/cairo-spectrum/cairo-spectrum.cc:42 src/qt-spectrum/qt-spectrum.cc:107
+msgid "Spectrum Analyzer"
+msgstr "محلل الطيف"
+
+#: src/cdaudio/cdaudio-ng.cc:74
+msgid "Audio CD Plugin"
+msgstr "ملحقة الأقراص الصوتية"
+
+#: src/cdaudio/cdaudio-ng.cc:121
+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> 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/cdaudio-ng.cc:140
+msgid "Device"
+msgstr "الجهاز"
+
+#: src/cdaudio/cdaudio-ng.cc:141
+msgid "Read speed:"
+msgstr "سرعة القراءة:"
+
+#: src/cdaudio/cdaudio-ng.cc:144
+msgid "Override device:"
+msgstr "تجاوز الجهاز:"
+
+#: src/cdaudio/cdaudio-ng.cc:146
+msgid "Metadata"
+msgstr "البيانات الوصفية"
+
+#: src/cdaudio/cdaudio-ng.cc:147
+msgid "Use CD-Text"
+msgstr "استخدم CD-Text"
+
+#: src/cdaudio/cdaudio-ng.cc:150
+msgid "Use CDDB"
+msgstr "استخدم CDDB"
+
+#: src/cdaudio/cdaudio-ng.cc:152
+msgid "Use HTTP instead of CDDBP"
+msgstr "استخدم HTTP بدلا من CDDBP"
+
+#: src/cdaudio/cdaudio-ng.cc:155
+msgid "Server:"
+msgstr "الخادم:"
+
+#: src/cdaudio/cdaudio-ng.cc:159
+msgid "Path:"
+msgstr "المسار:"
+
+#: src/cdaudio/cdaudio-ng.cc:163
+msgid "Port:"
+msgstr "المنفذ:"
+
+#: src/cdaudio/cdaudio-ng.cc:228
+msgid "Failed to initialize cdio subsystem."
+msgstr "فشل تهيئة cdio الفرعي."
+
+#: src/cdaudio/cdaudio-ng.cc:260
+#, c-format
+msgid "Invalid URI %s."
+msgstr "غير صالح URI %s."
+
+#: src/cdaudio/cdaudio-ng.cc:262
+#, c-format
+msgid "Track %d not found."
+msgstr "المقطع %d غير موجود."
+
+#: src/cdaudio/cdaudio-ng.cc:264
+#, c-format
+msgid "Track %d is a data track."
+msgstr "المسار %d هو مسار البيانات."
+
+#: src/cdaudio/cdaudio-ng.cc:339
+msgid "Error reading audio CD."
+msgstr "خطأ في قراءة صوت CD."
+
+#: src/cdaudio/cdaudio-ng.cc:410
+msgid "Audio CD"
+msgstr "صوت CD"
+
+#: src/cdaudio/cdaudio-ng.cc:446 src/cdaudio/cdaudio-ng.cc:455
+#, c-format
+msgid "Failed to open CD device %s."
+msgstr "خطأ في فتح جهاز CD %s."
+
+#: src/cdaudio/cdaudio-ng.cc:458
+msgid "No audio capable CD drive found."
+msgstr "لم يتم العثور على الصوت محرك الأقراص قادرة."
+
+#: src/cdaudio/cdaudio-ng.cc:481
+msgid "Drive is empty."
+msgstr "القرص فارغ"
+
+#: src/cdaudio/cdaudio-ng.cc:483
+msgid "Unsupported disk type."
+msgstr "نوع القرص غير معتمد."
+
+#: src/cdaudio/cdaudio-ng.cc:507
+msgid "Failed to finish initializing opened CD drive."
+msgstr "فشل في إنهاء تهيئة فتح محرك الأقراص."
+
+#: src/cdaudio/cdaudio-ng.cc:520
+msgid "Failed to retrieve first/last track number."
+msgstr "فشل في استرداد الأول / آخر عدد المسار."
+
+#: src/cdaudio/cdaudio-ng.cc:541
+#, c-format
+msgid "Cannot read start/end LSN for track %d."
+msgstr "لا يمكن قراءة بداية / نهاية LSN للمسار %d."
+
+#: src/cdaudio/cdaudio-ng.cc:624
+msgid "Failed to create the CDDB connection."
+msgstr "فشل إنشاء اتصال CDDB."
+
+#: src/cdaudio/cdaudio-ng.cc:690
+msgid "Failed to query the CDDB server"
+msgstr "فشل الاستعلام عن الخادم CDDB"
+
+#: src/cdaudio/cdaudio-ng.cc:692
+#, c-format
+msgid "Failed to query the CDDB server: %s"
+msgstr "فشل الاستعلام عن الخادم CDDB: %s"
+
+#: src/cdaudio/cdaudio-ng.cc:716
+#, c-format
+msgid "Failed to read the CDDB info: %s"
+msgstr "فشلت قراءة معلومات CDDB: %s"
+
+#: src/cd-menu-items/cd-menu-items.cc:33
+msgid "Audio CD Menu Items"
+msgstr "Audio CD قائمة عناصر"
+
+#: src/cd-menu-items/cd-menu-items.cc:45
+msgid "Pla_y CD"
+msgstr "تشغيل قرص"
+
+#: src/cd-menu-items/cd-menu-items.cc:45
+msgid "_Add CD"
+msgstr "إضافة قرص"
+
+#: src/compressor/compressor.cc:45
+msgid "Compression"
+msgstr "ضغط"
+
+#: src/compressor/compressor.cc:46
+msgid "Center volume:"
+msgstr "وسط حجم الصوت"
+
+#: src/compressor/compressor.cc:49
+msgid "Dynamic range:"
+msgstr "النطاق الديناميكي:"
+
+#: src/compressor/compressor.cc:57
+msgid ""
+"Dynamic Range Compression Plugin for Audacious\n"
+"Copyright 2010-2014 John Lindgren"
+msgstr ""
+"ملحقة الضغط بالنطاق الديناميكي لأوادشيَس\n"
+"حقوق النشر 2010-2014 John Lindgren"
+
+#: src/compressor/compressor.cc:64
+msgid "Dynamic Range Compressor"
+msgstr "ضغط النطاق الديناميكي"
+
+#: src/console/plugin.cc:15
+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"
+"ملحَقة أوادشيَس من قبَل:\n"
+"William Pitcock <nenolod@dereferenced.org>\n"
+"Shay Green <gblargg@gmail.com>"
+
+#: src/console/plugin.cc:30
+msgid "Bass:"
+msgstr "صوت عميق:"
+
+#: src/console/plugin.cc:33
+msgid "Treble:"
+msgstr "صوت مرتفع:"
+
+#: src/console/plugin.cc:36
+msgid "Echo:"
+msgstr "صدى:"
+
+#: src/console/plugin.cc:39
+msgid "Default song length:"
+msgstr "المدة الافتراضية للقطعة:"
+
+#: src/console/plugin.cc:41 src/crossfade/crossfade.cc:56
+#: src/crossfade/crossfade.cc:62 src/lirc/lirc.cc:395 src/notify/notify.cc:113
+#: src/sid/xs_config.cc:85 src/sid/xs_config.cc:94 src/sid/xs_config.cc:103
+#: src/vumeter-qt/vumeter_qt.cc:39
+msgid "seconds"
+msgstr "ثواني"
+
+#: src/console/plugin.cc:42 src/modplug/plugin_main.cc:58
+msgid "Resampling"
+msgstr ""
+"\n"
+"اختزال"
+
+#: src/console/plugin.cc:43
+msgid "Enable audio resampling"
+msgstr "تمكين اختزال الصوت"
+
+#: src/console/plugin.cc:49
+msgid "SPC"
+msgstr "SPC"
+
+#: src/console/plugin.cc:50
+msgid "Ignore length from SPC tags"
+msgstr "تجاهل الطول من علاماتSPC"
+
+#: src/console/plugin.cc:52
+msgid "Increase reverb"
+msgstr "زيادة التردد"
+
+#: src/console/plugin.h:26
+msgid "Game Console Music Decoder"
+msgstr "فك لعبة وحدة تحكم الموسيقى"
+
+#: src/coreaudio/coreaudio.cc:53
+msgid "CoreAudio output"
+msgstr "إخراج الصوت الأساسي"
+
+#: src/coreaudio/coreaudio.cc:155
+msgid ""
+"CoreAudio Output Plugin for Audacious\n"
+"Copyright 2014 William Pitcock\n"
+"Copyright 2017,18 René J.V. Bertin\n"
+" (original code and code adapted from\n"
+" Apple examples, (C) Apple 2013)\n"
+"\n"
+"Based on SDL Output Plugin for Audacious\n"
+"Copyright 2010 John Lindgren"
+msgstr ""
+"ملحَقة مخرَجات CoreAudio لأوادشيَس\n"
+"حقوق النشر 2014 William Pitcock\n"
+"حقوق النشر 2017,18 René J.V. Bertin\n"
+" (الشفرة الأصلية وشفرة مطوَّعة من\n"
+"أمثلة أبل Apple، (C) Apple 2013)\n"
+"\n"
+"مستندة إلى ملحَقة مخرَجات SDL لأوادشيَس\n"
+"حقوق النشر 2010 John Lindgren"
+
+#: src/coreaudio/coreaudio.cc:171
+msgid "Use exclusive mode"
+msgstr "استخدام وضع خاص"
+
+#: src/coreaudio/coreaudio.cc:173
+msgid "Use bit perfect audio (adapt device sampling rate)"
+msgstr "استخدم صوت تام البت (يتبنّى معدل نمذجة الجهاز)"
+
+#: src/crossfade/crossfade.cc:47
+msgid ""
+"Crossfade Plugin for Audacious\n"
+"Copyright 2010-2014 John Lindgren"
+msgstr ""
+"ملحَقة الخفوت المتعابر لأوادشيَس\n"
+"حقوق النشر 2010-2014 John Lindgren"
+
+#: src/crossfade/crossfade.cc:51
+msgid "Crossfade"
+msgstr "الخافت"
+
+#: src/crossfade/crossfade.cc:52
+msgid "On automatic song change"
+msgstr "عند التغيير التلقائي للمقطوعة"
+
+#: src/crossfade/crossfade.cc:54 src/crossfade/crossfade.cc:60
+msgid "Overlap:"
+msgstr "التداخل:"
+
+#: src/crossfade/crossfade.cc:58
+msgid "On seek or manual song change"
+msgstr "عند التطبيق او تغيير المقطوعة يدويا"
+
+#: src/crossfade/crossfade.cc:64
+msgid "No fade in"
+msgstr ""
+
+#: src/crossfade/crossfade.cc:66
+msgid "Use S-curve fade"
+msgstr ""
+
+#: src/crossfade/crossfade.cc:68
+msgid "S-curve steepness:"
+msgstr ""
+
+#: src/crossfade/crossfade.cc:70
+msgid "(higher is steeper)"
+msgstr ""
+
+#: src/crossfade/crossfade.cc:72
+msgid "Tip"
+msgstr "Tip"
+
+#: src/crossfade/crossfade.cc:73
+msgid ""
+"For better crossfading, enable\n"
+"the Silence Removal effect."
+msgstr ""
+"لأفضل إبهات متداخل، تمكين\n"
+"تأثير إزالة الصمت."
+
+#: src/crossfade/crossfade.cc:83
+msgid "Crossfade"
+msgstr "خافت"
+
+#: src/crystalizer/crystalizer.cc:31
+msgid "Crystalizer"
+msgstr "الكريستال"
+
+#: src/crystalizer/crystalizer.cc:32 src/stereo_plugin/stereo.cc:45
+msgid "Intensity:"
+msgstr "الكثافة:"
+
+#: src/crystalizer/crystalizer.cc:43
+msgid "Crystalizer"
+msgstr "الكريستال"
+
+#: src/cue/cue.cc:42
+msgid "Cue Sheet Plugin"
+msgstr "ملحَقة قطعة النغمات التحفيزية"
+
+#: src/delete-files/delete-files.cc:53 src/delete-files/delete-files.cc:215
+#: src/delete-files/delete-files.cc:230
+msgid "Delete Files"
+msgstr "حذف ملفات"
+
+#: src/delete-files/delete-files.cc:120
+msgid "No files are selected."
+msgstr "لم تحدَّد ملفات."
+
+#: src/delete-files/delete-files.cc:125
+#, c-format
+msgid "Do you want to move %s to the trash?"
+msgstr "أتريد نقل %s إلى سلة المهملات؟"
+
+#: src/delete-files/delete-files.cc:126
+#, c-format
+msgid "Do you want to permanently delete %s?"
+msgstr "أتريد أن تحذف %s نهائيا؟"
+
+#: src/delete-files/delete-files.cc:133
+#, c-format
+msgid "Do you want to move %d files to the trash?"
+msgstr "أتريد نقل %d ملف إلى سلة المهملات؟"
+
+#: src/delete-files/delete-files.cc:134
+#, c-format
+msgid "Do you want to permanently delete %d files?"
+msgstr "أتريد أن تحذف %d ملف نهائيا؟"
+
+#: src/delete-files/delete-files.cc:146
+msgid "Move to trash"
+msgstr "نقل إلى سلة المهملات"
+
+#: src/delete-files/delete-files.cc:146
+msgid "Delete"
+msgstr "حذف"
+
+#: src/delete-files/delete-files.cc:213 src/delete-files/delete-files.cc:235
+#: src/skins-qt/search-select.cc:102 src/skins/search-select.cc:78
+msgid "Cancel"
+msgstr "إلغ"
+
+#: src/delete-files/delete-files.cc:267
+msgid "Delete Selected Files"
+msgstr "حذف الملفات المحددة"
+
+#: src/delete-files/delete-files.cc:287
+msgid "Delete Method"
+msgstr "طريقة الحذف"
+
+#: src/delete-files/delete-files.cc:288
+msgid "Move to trash instead of deleting immediately"
+msgstr "النقل إلى سلة المهملات بدلا من الحذف الفوري"
+
+#: src/echo_plugin/echo.cc:9
+msgid ""
+"Echo Plugin\n"
+"By Johan Levin, 1999\n"
+"Surround echo by Carl van Schaik, 1999\n"
+"Updated for Audacious by William Pitcock and John Lindgren, 2010-2014"
+msgstr ""
+"ملحَقة الصدى\n"
+"بواسطة Johan Levin, 1999\n"
+"الصدى المحيطي بواسطة Carl van Schaik, 1999\n"
+"حدّثها لأوادشيَس William Pitcock و John Lindgren, 2010-2014"
+
+#: src/echo_plugin/echo.cc:21
+msgid "Echo"
+msgstr "ضدى"
+
+#: src/echo_plugin/echo.cc:22 src/modplug/plugin_main.cc:72
+#: src/modplug/plugin_main.cc:82
+msgid "Delay:"
+msgstr "تأخير:"
+
+#: src/echo_plugin/echo.cc:24 src/modplug/plugin_main.cc:72
+#: src/modplug/plugin_main.cc:82 src/xsf/plugin.cc:445
+msgid "ms"
+msgstr "م ث"
+
+#: src/echo_plugin/echo.cc:25
+msgid "Feedback:"
+msgstr "التردد:"
+
+#: src/echo_plugin/echo.cc:28 src/modplug/plugin_main.cc:86
+msgid "Volume:"
+msgstr "الصوت:"
+
+#: src/echo_plugin/echo.cc:39
+msgid "Echo"
+msgstr "صدى"
+
+#: src/ffaudio/ffaudio-core.cc:50
+msgid "FFmpeg Plugin"
+msgstr "ملحَقة FFmpeg"
+
+#: src/ffaudio/ffaudio-core.cc:649
+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 ""
+"ملحَقة تشفير لصيغ متعددة لأوادشيَس\n"
+"نَسَق FFmpeg للوسائط المتعددة (http://www.ffmpeg.org/)\n"
+"\n"
+"ملحَقة أوادشيَس بواسطة:\n"
+"William Pitcock <nenolod@nenolod.net>\n"
+"Matti Hämäläinen <ccr@tnsp.org>"
+
+#: src/filewriter/filewriter.cc:48
+msgid "FileWriter Plugin"
+msgstr "ملحَقة FileWriter"
+
+#: src/filewriter/filewriter.cc:316
+#, c-format
+msgid ""
+"Error opening %s:\n"
+"%s"
+msgstr ""
+"خطأ فتح %s:\n"
+" %s"
+
+#: src/filewriter/filewriter.cc:358
+msgid ""
+"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."
+
+#: src/filewriter/filewriter.cc:385
+msgid "Output file format:"
+msgstr "صيغة اخراج الملف:"
+
+#: src/filewriter/filewriter.cc:389
+msgid "Save into original directory"
+msgstr "حفظ في المجلد الاصلي"
+
+#: src/filewriter/filewriter.cc:392
+msgid "Save into custom directory:"
+msgstr "حفظ في مجلد مخصص:"
+
+#: src/filewriter/filewriter.cc:400
+msgid "Generate file name from:"
+msgstr "توليد اسم ملف من:"
+
+#: src/filewriter/filewriter.cc:401
+msgid "Original file name"
+msgstr "اسم الملف الاصلي"
+
+#: src/filewriter/filewriter.cc:404
+msgid "Original file name (no suffix)"
+msgstr "اسم الملف الاصلي (بدون ملحق)"
+
+#: src/filewriter/filewriter.cc:407
+msgid "Original file tag"
+msgstr "وسم الملف الاصلي"
+
+#: src/filewriter/filewriter.cc:411
+msgid "Prepend track number to file name"
+msgstr "ارفق رقم المقطوعة في اسم الملف"
+
+#: src/filewriter/filewriter.cc:417 src/filewriter/filewriter.cc:449
+msgid "Auto"
+msgstr "تلقائي"
+
+#: src/filewriter/filewriter.cc:418
+msgid "8000 Hz"
+msgstr "8000 هرتز"
+
+#: src/filewriter/filewriter.cc:419
+msgid "11025 Hz"
+msgstr "11025 هرتز"
+
+#: src/filewriter/filewriter.cc:420
+msgid "12000 Hz"
+msgstr "12000 هرتز"
+
+#: src/filewriter/filewriter.cc:421
+msgid "16000 Hz"
+msgstr "16000 هرتز"
+
+#: src/filewriter/filewriter.cc:422
+msgid "22050 Hz"
+msgstr "22050 هرتز"
+
+#: src/filewriter/filewriter.cc:423
+msgid "24000 Hz"
+msgstr "24000 هرتز"
+
+#: src/filewriter/filewriter.cc:424
+msgid "32000 Hz"
+msgstr "32000 هرتز"
+
+#: src/filewriter/filewriter.cc:425 src/xsf/plugin.cc:430
+msgid "44100 Hz"
+msgstr "44100 هرتز"
+
+#: src/filewriter/filewriter.cc:426 src/xsf/plugin.cc:431
+msgid "48000 Hz"
+msgstr "48000 هرتز"
+
+#: src/filewriter/filewriter.cc:430
+msgid "8 kbit/s"
+msgstr "8 ك‌بت/ث"
+
+#: src/filewriter/filewriter.cc:431
+msgid "16 kbit/s"
+msgstr "16 ك‌بت/ث"
+
+#: src/filewriter/filewriter.cc:432
+msgid "32 kbit/s"
+msgstr "32 ك‌بت/ث"
+
+#: src/filewriter/filewriter.cc:433
+msgid "40 kbit/s"
+msgstr "40 ك‌بت/ث"
+
+#: src/filewriter/filewriter.cc:434
+msgid "48 kbit/s"
+msgstr "48 ك‌بت/ث"
+
+#: src/filewriter/filewriter.cc:435
+msgid "56 kbit/s"
+msgstr "56 ك‌بت/ث"
+
+#: src/filewriter/filewriter.cc:436
+msgid "64 kbit/s"
+msgstr "64 ك‌بت/ث"
+
+#: src/filewriter/filewriter.cc:437
+msgid "80 kbit/s"
+msgstr "80 ك‌بت/ث"
+
+#: src/filewriter/filewriter.cc:438
+msgid "96 kbit/s"
+msgstr "96 ك‌بت/ث"
+
+#: src/filewriter/filewriter.cc:439
+msgid "112 kbit/s"
+msgstr "112 ك‌بت/ث"
+
+#: src/filewriter/filewriter.cc:440
+msgid "128 kbit/s"
+msgstr "128 ك‌بت/ث"
+
+#: src/filewriter/filewriter.cc:441
+msgid "160 kbit/s"
+msgstr "160 ك‌بت/ث"
+
+#: src/filewriter/filewriter.cc:442
+msgid "192 kbit/s"
+msgstr "192 ك‌بت/ث"
+
+#: src/filewriter/filewriter.cc:443
+msgid "224 kbit/s"
+msgstr "224 ك‌بت/ث"
+
+#: src/filewriter/filewriter.cc:444
+msgid "256 kbit/s"
+msgstr "256 ك‌بت/ث"
+
+#: src/filewriter/filewriter.cc:445
+msgid "320 kbit/s"
+msgstr "320 ك‌بت/ث"
+
+#: src/filewriter/filewriter.cc:450
+msgid "Joint Stereo"
+msgstr "صوت مُجَسَّم مشترك"
+
+#: src/filewriter/filewriter.cc:451 src/modplug/plugin_main.cc:57
+#: src/mpg123/mpg123.cc:259
+msgid "Stereo"
+msgstr "صوت مُجَسَّم"
+
+#: src/filewriter/filewriter.cc:452 src/modplug/plugin_main.cc:56
+#: src/mpg123/mpg123.cc:260
+msgid "Mono"
+msgstr "أحادي"
+
+#: src/filewriter/filewriter.cc:456
+msgid "VBR"
+msgstr "VBR"
+
+#: src/filewriter/filewriter.cc:457
+msgid "ABR"
+msgstr "ABR"
+
+#: src/filewriter/filewriter.cc:478
+msgid "Algorithm quality:"
+msgstr "جودة اللغة ريتم:"
+
+#: src/filewriter/filewriter.cc:484
+msgid "Bitrate:"
+msgstr "معدل البت:"
+
+#: src/filewriter/filewriter.cc:491
+msgid "Compression ratio:"
+msgstr "نسبة الضغط:"
+
+#: src/filewriter/filewriter.cc:498
+msgid "Audio mode:"
+msgstr "الوضع الصوتي:"
+
+#: src/filewriter/filewriter.cc:501
+msgid "Enforce strict ISO compliance"
+msgstr "إنفاذ الامتثال الصارم ل ISO"
+
+#: src/filewriter/filewriter.cc:503
+msgid "Error protection"
+msgstr "خطأ الحماية"
+
+#: src/filewriter/filewriter.cc:508
+msgid "Enable VBR/ABR"
+msgstr "تفعيل VBR/ABR"
+
+#: src/filewriter/filewriter.cc:510
+msgid "Type:"
+msgstr "نوع:"
+
+#: src/filewriter/filewriter.cc:514
+msgid "Minimum bitrate:"
+msgstr "الحد الأدنى لمعدل البت:"
+
+#: src/filewriter/filewriter.cc:518
+msgid "Maximum bitrate:"
+msgstr "معدل البت الأقصى:"
+
+#: src/filewriter/filewriter.cc:522
+msgid "Average bitrate:"
+msgstr "متوسط معدل البت:"
+
+#: src/filewriter/filewriter.cc:526
+msgid "VBR quality level:"
+msgstr "VBR مستوى الجودة:"
+
+#: src/filewriter/filewriter.cc:530
+msgid "Strictly enforce minimum bitrate"
+msgstr "فرض بدقة الحد الأدنى لمعدل البت"
+
+#: src/filewriter/filewriter.cc:533
+msgid "Omit Xing VBR header"
+msgstr "اهمل رأس Xing VBR"
+
+#: src/filewriter/filewriter.cc:539
+msgid "Frame Headers"
+msgstr "رؤوس الإطار"
+
+#: src/filewriter/filewriter.cc:540
+msgid "Mark as copyright"
+msgstr "إجعلها حقوق التأليف والنشر"
+
+#: src/filewriter/filewriter.cc:542
+msgid "Mark as original"
+msgstr "إجعلها الأصلية"
+
+#: src/filewriter/filewriter.cc:544
+msgid "ID3 Tags"
+msgstr "ID3 Tags"
+
+#: src/filewriter/filewriter.cc:545
+msgid "Force addition of version 2 tag"
+msgstr "اجبر اضافته الى النسخة 2 tag"
+
+#: src/filewriter/filewriter.cc:547
+msgid "Only add v1 tag"
+msgstr "إضافة فقط v1 tag"
+
+#: src/filewriter/filewriter.cc:549
+msgid "Only add v2 tag"
+msgstr "إضافة فقط v2 tag"
+
+#: src/filewriter/filewriter.cc:554
+msgid "Quality"
+msgstr "جودة"
+
+#: src/filewriter/filewriter.cc:555
+msgid "VBR/ABR"
+msgstr "VBR/ABR"
+
+#: src/filewriter/filewriter.cc:556
+msgid "Tags"
+msgstr "الاوسمة"
+
+#: src/filewriter/filewriter.cc:566
+msgid "Quality (0-1):"
+msgstr "الجودة (0-1):"
+
+#: src/filewriter/filewriter.cc:573 src/skins-qt/skins_cfg.cc:307
+#: src/skins/skins_cfg.cc:289
+msgid "General"
+msgstr "عامْ"
+
+#: src/flac/flacng.h:36
+msgid "FLAC Decoder"
+msgstr "FLAC مفكك"
+
+#: src/flac/metadata.cc:296 src/wavpack/wavpack.cc:215
+msgid "lossless"
+msgstr "lossless"
+
+#: src/flac/plugin.cc:214
+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/gio/gio.cc:34
+msgid ""
+"GIO Plugin for Audacious\n"
+"Copyright 2009-2012 John Lindgren"
+msgstr ""
+"ملحَقة GIO لأوادشيَس\n"
+"حقوق النشر 2009-2012 John Lindgren"
+
+#: src/gio/gio.cc:42
+msgid "GIO Plugin"
+msgstr "ملحَقة GIO"
+
+#: src/gio/gio.cc:152
+msgid "Read-and-append mode not supported"
+msgstr "وضع القراءة وإلاحاق غير معتمد"
+
+#: src/gio/gio.cc:165
+msgid "Invalid open mode"
+msgstr "وضع الفتح غير صالح"
+
+#: src/glspectrum/gl-spectrum.cc:52
+msgid ""
+"OpenGL Spectrum Analyzer for Audacious\n"
+"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\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"
+"حقوق النشر 2013 Christophe Budé و John Lindgren و Carlo Bramini\n"
+"\n"
+"مستندة إلى ملحَقة XMMS:\n"
+"حقوق النشر 1998-2000 Peter Alm و Mikael Alm و Olle Hallnas و Thomas Nilsson "
+"و 4Front Technologies\n"
+"\n"
+"الرخصة: GPLv2‪+"
+
+#: src/glspectrum/gl-spectrum.cc:63 src/qtglspectrum/gl-spectrum.cc:53
+msgid "OpenGL Spectrum Analyzer"
+msgstr "محلل الطيف برنامج OpenGL"
+
+#: src/gtkui/columns.cc:36 src/moonstone/playlist_model.cc:38
+#: src/qtui/playlist_model.cc:33
+msgid "Entry Number"
+msgstr "رقم البدأ"
+
+#: src/gtkui/columns.cc:37 src/moonstone/playlist_model.cc:38
+#: src/moonstone/playlist_selection.cc:64
+#: src/playlist-manager/playlist-manager.cc:200
+#: src/playlist-manager-qt/playlist-manager-qt.cc:188
+#: src/qtui/playlist_model.cc:33 src/streamtuner/icecast-model.cc:120
+#: src/streamtuner/ihr-model.cc:159 src/streamtuner/shoutcast-model.cc:122
+msgid "Title"
+msgstr "العنوان"
+
+#: src/gtkui/columns.cc:38 src/moonstone/playlist_model.cc:39
+#: src/qtui/playlist_model.cc:33
+msgid "Artist"
+msgstr "المؤدي"
+
+#: src/gtkui/columns.cc:39 src/moonstone/playlist_model.cc:39
+#: src/qtui/playlist_model.cc:33
+msgid "Year"
+msgstr "السَّنة"
+
+#: src/gtkui/columns.cc:40 src/moonstone/playlist_model.cc:39
+#: src/qtui/playlist_model.cc:34
+msgid "Album"
+msgstr "الألبوم"
+
+#: src/gtkui/columns.cc:41 src/moonstone/playlist_model.cc:40
+#: src/qtui/playlist_model.cc:34
+msgid "Album Artist"
+msgstr "ألبوم المؤدي"
+
+#: src/gtkui/columns.cc:42 src/moonstone/playlist_model.cc:40
+#: src/qtui/playlist_model.cc:34
+msgid "Track"
+msgstr "المقطع"
+
+#: src/gtkui/columns.cc:43 src/moonstone/playlist_model.cc:40
+#: src/qtui/playlist_model.cc:34 src/streamtuner/icecast-model.cc:123
+#: src/streamtuner/shoutcast-model.cc:125
+#: src/streamtuner/shoutcast-model.cc:236
+msgid "Genre"
+msgstr "النوع"
+
+#: src/gtkui/columns.cc:44 src/moonstone/playlist_model.cc:41
+#: src/qtui/playlist_model.cc:35
+msgid "Queue Position"
+msgstr "موضع القائمة المنتظرة"
+
+#: src/gtkui/columns.cc:45 src/moonstone/playlist_model.cc:41
+#: src/qtui/playlist_model.cc:35
+msgid "Length"
+msgstr "المُدة"
+
+#: src/gtkui/columns.cc:46 src/moonstone/playlist_model.cc:41
+#: src/qtui/playlist_model.cc:35
+msgid "File Path"
+msgstr "مسار الملف"
+
+#: src/gtkui/columns.cc:47 src/moonstone/playlist_model.cc:42
+#: src/qtui/playlist_model.cc:35
+msgid "File Name"
+msgstr "اسم الملف"
+
+#: src/gtkui/columns.cc:48 src/moonstone/playlist_model.cc:42
+#: src/qtui/playlist_model.cc:36
+msgid "Custom Title"
+msgstr "عنوان مخصص"
+
+#: src/gtkui/columns.cc:49 src/moonstone/playlist_model.cc:42
+#: src/qtui/playlist_model.cc:36 src/streamtuner/icecast-model.cc:129
+#: src/streamtuner/shoutcast-model.cc:134
+msgid "Bitrate"
+msgstr "معدل البت"
+
+#: src/gtkui/columns.cc:50 src/moonstone/playlist_model.cc:43
+#: src/qtui/playlist_model.cc:36
+msgid "Comment"
+msgstr "تعليق"
+
+#: src/gtkui/columns.cc:51 src/qtui/playlist_model.cc:36
+msgid "Publisher"
+msgstr ""
+
+#: src/gtkui/columns.cc:52 src/qtui/playlist_model.cc:37
+msgid "Catalog Number"
+msgstr ""
+
+#: src/gtkui/columns.cc:53 src/moonstone/playlist_model.cc:43
+#: src/qtui/playlist_model.cc:37
+msgid "Disc"
+msgstr ""
+
+#: src/gtkui/columns.cc:325
+msgid "Available columns"
+msgstr "الأعمدة المتوفرة"
+
+#: src/gtkui/columns.cc:351
+msgid "Displayed columns"
+msgstr "الأعمدة المعروضة"
+
+#: src/gtkui/layout.cc:74 src/search-tool-qt/search-tool-qt.cc:58
+#: src/search-tool/search-tool.cc:49
+msgid "Search Tool"
+msgstr "أداة البحث"
+
+#: src/gtkui/layout.cc:170
+msgid "Dock at Left"
+msgstr "ارساء على اليسار"
+
+#: src/gtkui/layout.cc:170
+msgid "Dock at Right"
+msgstr "ارساء على اليمين"
+
+#: src/gtkui/layout.cc:171
+msgid "Dock at Top"
+msgstr "ارساء الى الفوق"
+
+#: src/gtkui/layout.cc:171
+msgid "Dock at Bottom"
+msgstr "ارساء الى الاسفل"
+
+#: src/gtkui/layout.cc:171
+msgid "Undock"
+msgstr "لا ترسي"
+
+#: src/gtkui/layout.cc:171 src/ladspa/plugin.cc:540
+msgid "Disable"
+msgstr "تعطيل"
+
+#: src/gtkui/menus.cc:79 src/qtui/menus.cc:107
+#: src/statusicon-qt/statusicon.cc:115 src/statusicon/statusicon.cc:286
+msgid "_Open Files ..."
+msgstr "_افتح ملفات..."
+
+#: src/gtkui/menus.cc:80 src/qtui/menus.cc:111
+msgid "Open _URL ..."
+msgstr "إفتح ال‍ _‍رابط ..."
+
+#: src/gtkui/menus.cc:81 src/qtui/menus.cc:113
+msgid "_Add Files ..."
+msgstr "أضف _ملفات ..."
+
+#: src/gtkui/menus.cc:82 src/qtui/menus.cc:118
+msgid "Add U_RL ..."
+msgstr "أ_ضف الرابط ..."
+
+#: src/gtkui/menus.cc:84 src/qtui/menus.cc:120
+msgid "Search _Library"
+msgstr "مكتبة البح_ث"
+
+#: src/gtkui/menus.cc:86 src/qtui/menus.cc:123
+msgid "A_bout ..."
+msgstr "_عن البرنامج ..."
+
+#: src/gtkui/menus.cc:87 src/qtui/menus.cc:125
+msgid "_Settings ..."
+msgstr "_اعدادات ..."
+
+#: src/gtkui/menus.cc:88 src/qtui/menus.cc:131
+#: src/statusicon-qt/statusicon.cc:117 src/statusicon/statusicon.cc:288
+msgid "_Quit"
+msgstr "_خروج"
+
+#: src/gtkui/menus.cc:92 src/gtkui/menus.cc:226
+#: src/moonstone/playlist_tabs.cc:306 src/qtui/menus.cc:135
+#: src/qtui/playlist_tabs.cc:331 src/search-tool-qt/search-tool-qt.cc:499
+#: src/search-tool/search-tool.cc:339 src/statusicon-qt/statusicon.cc:109
+#: src/statusicon/statusicon.cc:280
+msgid "_Play"
+msgstr "تش‍_‍غيل"
+
+#: src/gtkui/menus.cc:93 src/qtui/menus.cc:137
+#: src/statusicon-qt/statusicon.cc:110 src/statusicon/statusicon.cc:281
+msgid "Paus_e"
+msgstr "لب‍_‍ث"
+
+#: src/gtkui/menus.cc:94 src/qtui/menus.cc:139
+#: src/statusicon-qt/statusicon.cc:111 src/statusicon/statusicon.cc:282
+msgid "_Stop"
+msgstr "تو_قف"
+
+#: src/gtkui/menus.cc:95 src/qtui/menus.cc:141
+#: src/statusicon-qt/statusicon.cc:112 src/statusicon/statusicon.cc:283
+msgid "Pre_vious"
+msgstr "ال‍_سابق"
+
+#: src/gtkui/menus.cc:96 src/qtui/menus.cc:143
+#: src/statusicon-qt/statusicon.cc:113 src/statusicon/statusicon.cc:284
+msgid "_Next"
+msgstr "ال‍_‍تالي"
+
+#: src/gtkui/menus.cc:97 src/qtui/menus.cc:145 src/skins/menus.cc:114
+#: src/skins-qt/menus.cc:105
+msgid "Previous Album"
+msgstr "الألبوم السابق"
+
+#: src/gtkui/menus.cc:98 src/qtui/menus.cc:146 src/skins/menus.cc:115
+#: src/skins-qt/menus.cc:106
+msgid "Next Album"
+msgstr "الألبوم التالي"
+
+#: src/gtkui/menus.cc:100 src/qtui/menus.cc:148
+msgid "_Repeat"
+msgstr "تك‍_رار"
+
+#: src/gtkui/menus.cc:101 src/qtui/menus.cc:150
+msgid "S_huffle"
+msgstr "_خلط"
+
+#: src/gtkui/menus.cc:102 src/qtui/menus.cc:152
+msgid "Shuffle by Albu_m"
+msgstr "_عشوائي حسب الالبوم"
+
+#: src/gtkui/menus.cc:103 src/qtui/menus.cc:155
+msgid "N_o Playlist Advance"
+msgstr "_لا تتابع قائمة التشغيل"
+
+#: src/gtkui/menus.cc:104 src/qtui/menus.cc:157
+msgid "Stop A_fter This Song"
+msgstr "توقف _بعد هذا المقطع"
+
+#: src/gtkui/menus.cc:106 src/gtkui/menus.cc:210 src/qtui/menus.cc:162
+#: src/qtui/menus.cc:294
+msgid "Song _Info ..."
+msgstr "_معلومات المقطع ..."
+
+#: src/gtkui/menus.cc:107
+msgid "Jump to _Time ..."
+msgstr "الا_نتقال السريع إلى الوقت ..."
+
+#: src/gtkui/menus.cc:108
+msgid "_Jump to Song ..."
+msgstr "إذهب للمق‍_طع ..."
+
+#: src/gtkui/menus.cc:110 src/qtui/menus.cc:165
+msgid "Set Repeat Point _A"
+msgstr "نقطة التكرار _أ"
+
+#: src/gtkui/menus.cc:111 src/qtui/menus.cc:167
+msgid "Set Repeat Point _B"
+msgstr "نقطة التكرار _ب"
+
+#: src/gtkui/menus.cc:112 src/qtui/menus.cc:169
+msgid "_Clear Repeat Points"
+msgstr "مسح _نقطة التكرار"
+
+#: src/gtkui/menus.cc:116 src/gtkui/menus.cc:123 src/gtkui/menus.cc:141
+#: src/qtui/menus.cc:173 src/qtui/menus.cc:180 src/qtui/menus.cc:198
+msgid "By _Title"
+msgstr "حسب ال_عنوان"
+
+#: src/gtkui/menus.cc:117 src/qtui/menus.cc:174
+msgid "By _File Name"
+msgstr "حسب إسم ال_ملف"
+
+#: src/gtkui/menus.cc:118 src/qtui/menus.cc:175
+msgid "By File _Path"
+msgstr "حسب م_سار الملف"
+
+#: src/gtkui/menus.cc:122 src/gtkui/menus.cc:140 src/qtui/menus.cc:179
+#: src/qtui/menus.cc:197
+msgid "By Track _Number"
+msgstr "حسب ر_قم المقطع"
+
+#: src/gtkui/menus.cc:124 src/gtkui/menus.cc:142 src/qtui/menus.cc:181
+#: src/qtui/menus.cc:199
+msgid "By _Artist"
+msgstr "حسب المؤ_دي"
+
+#: src/gtkui/menus.cc:125 src/gtkui/menus.cc:143 src/qtui/menus.cc:182
+#: src/qtui/menus.cc:200
+msgid "By Al_bum"
+msgstr "حسب _الألبوم"
+
+#: src/gtkui/menus.cc:126 src/gtkui/menus.cc:144 src/qtui/menus.cc:183
+#: src/qtui/menus.cc:201
+msgid "By Albu_m Artist"
+msgstr "حسب الالبوم ال_مؤدي"
+
+#: src/gtkui/menus.cc:127 src/gtkui/menus.cc:145 src/qtui/menus.cc:184
+#: src/qtui/menus.cc:202
+msgid "By Release _Date"
+msgstr "حسب _تاريخ الإصدار"
+
+#: src/gtkui/menus.cc:128 src/gtkui/menus.cc:146 src/qtui/menus.cc:185
+#: src/qtui/menus.cc:203
+msgid "By _Genre"
+msgstr "حسب ال_نوع"
+
+#: src/gtkui/menus.cc:129 src/gtkui/menus.cc:147 src/qtui/menus.cc:186
+#: src/qtui/menus.cc:204
+msgid "By _Length"
+msgstr "حسب ال_طول"
+
+#: src/gtkui/menus.cc:130 src/gtkui/menus.cc:148 src/qtui/menus.cc:187
+#: src/qtui/menus.cc:205
+msgid "By _File Path"
+msgstr "حسب مسار المل_ف"
+
+#: src/gtkui/menus.cc:131 src/gtkui/menus.cc:149 src/qtui/menus.cc:188
+#: src/qtui/menus.cc:206
+msgid "By _Custom Title"
+msgstr "حسب العنوان المخص_ص"
+
+#: src/gtkui/menus.cc:132 src/gtkui/menus.cc:150 src/qtui/menus.cc:189
+#: src/qtui/menus.cc:207
+msgid "By C_omment"
+msgstr "حسب التعليق"
+
+#: src/gtkui/menus.cc:133 src/gtkui/menus.cc:151 src/qtui/menus.cc:190
+#: src/qtui/menus.cc:208
+msgid "By D_isc Number"
+msgstr ""
+
+#: src/gtkui/menus.cc:135 src/gtkui/menus.cc:153 src/qtui/menus.cc:192
+#: src/qtui/menus.cc:210
+msgid "R_everse Order"
+msgstr "اقلب ال_ترتيب"
+
+#: src/gtkui/menus.cc:136 src/gtkui/menus.cc:154 src/qtui/menus.cc:194
+#: src/qtui/menus.cc:212
+msgid "_Random Order"
+msgstr "ترتيب ع_شوائي"
+
+#: src/gtkui/menus.cc:158 src/qtui/menus.cc:216
+msgid "_Play/Resume"
+msgstr "_قراءة/استأناف"
+
+#: src/gtkui/menus.cc:159 src/qtui/menus.cc:218
+msgid "_Refresh"
+msgstr "_تحديث"
+
+#: src/gtkui/menus.cc:161 src/qtui/menus.cc:222
+msgid "_Sort"
+msgstr "_ترتيب"
+
+#: src/gtkui/menus.cc:162 src/qtui/menus.cc:223
+msgid "Sort Se_lected"
+msgstr "ترتيب ال_محددة"
+
+#: src/gtkui/menus.cc:163 src/qtui/menus.cc:225
+msgid "Remove _Duplicates"
+msgstr "ازالة المك_ررة"
+
+#: src/gtkui/menus.cc:164 src/qtui/menus.cc:226
+msgid "Remove _Unavailable Files"
+msgstr "إزالة الملفات _غير متوفر"
+
+#: src/gtkui/menus.cc:166 src/playlist-manager/playlist-manager.cc:219
+#: src/playlist-manager-qt/playlist-manager-qt.cc:348 src/qtui/menus.cc:229
+msgid "_New"
+msgstr "_جديد"
+
+#: src/gtkui/menus.cc:167 src/qtui/menus.cc:230
+msgid "Ren_ame ..."
+msgstr "اع_د التسمية"
+
+#: src/gtkui/menus.cc:168 src/gtkui/menus.cc:228
+#: src/moonstone/playlist_tabs.cc:311 src/qtui/menus.cc:231
+#: src/qtui/playlist_tabs.cc:336
+msgid "Remo_ve"
+msgstr "ح_ذف"
+
+#: src/gtkui/menus.cc:170 src/qtui/menus.cc:233
+msgid "_Import ..."
+msgstr "ا_ستيراد ..."
+
+#: src/gtkui/menus.cc:171 src/qtui/menus.cc:234
+msgid "_Export ..."
+msgstr "_صدر ..."
+
+#: src/gtkui/menus.cc:173 src/qtui/menus.cc:237
+msgid "Playlist _Manager ..."
+msgstr "مدير _قائمة التشغيل"
+
+#: src/gtkui/menus.cc:174 src/qtui/menus.cc:239
+msgid "_Queue Manager ..."
+msgstr "_مدير قوائم الانتظار ..."
+
+#: src/gtkui/menus.cc:178 src/qtui/menus.cc:243
+msgid "Volume _Up"
+msgstr "رف_ع الصوت"
+
+#: src/gtkui/menus.cc:179 src/qtui/menus.cc:245
+msgid "Volume _Down"
+msgstr "_خفض الصوت"
+
+#: src/gtkui/menus.cc:181 src/qtui/menus.cc:249
+msgid "_Equalizer ..."
+msgstr "ال_خالط..."
+
+#: src/gtkui/menus.cc:182 src/qtui/menus.cc:251
+msgid "E_ffects ..."
+msgstr "مؤ_ثرات ..."
+
+#: src/gtkui/menus.cc:184
+msgid "_Record Stream"
+msgstr "سجل _ستريم"
+
+#: src/gtkui/menus.cc:185
+msgid "Audio _Settings ..."
+msgstr "إعدادات ال_صوت ..."
+
+#: src/gtkui/menus.cc:189 src/qtui/menus.cc:260
+msgid "Show _Menu Bar"
+msgstr "عرض لوحة ال_قائمة"
+
+#: src/gtkui/menus.cc:190 src/qtui/menus.cc:262
+msgid "Show I_nfo Bar"
+msgstr "عرض لوحة الم_علومات"
+
+#: src/gtkui/menus.cc:191 src/qtui/menus.cc:264
+msgid "Show Info Bar _Album Art"
+msgstr "إظهار صورة أل_بوم شريط المعلومات"
+
+#: src/gtkui/menus.cc:192 src/qtui/menus.cc:266
+msgid "Show Info Bar Vis_ualization"
+msgstr "عرض لوحة _معلومات المرئيات"
+
+#: src/gtkui/menus.cc:193 src/qtui/menus.cc:268
+msgid "Show _Status Bar"
+msgstr "عرض لوحة ال_حالة"
+
+#: src/gtkui/menus.cc:195 src/qtui/menus.cc:272
+msgid "Show _Remaining Time"
+msgstr "عرض الو_قت المتبقي"
+
+#: src/gtkui/menus.cc:197 src/qtui/menus.cc:276 src/skins/menus.cc:157
+#: src/skins-qt/menus.cc:152
+msgid "_Visualizations ..."
+msgstr "ال_مرئيات ..."
+
+#: src/gtkui/menus.cc:201 src/qtui/menus.cc:280
+msgid "_File"
+msgstr "_ملف"
+
+#: src/gtkui/menus.cc:202 src/qtui/menus.cc:281
+msgid "_Playback"
+msgstr "_تشغيل"
+
+#: src/gtkui/menus.cc:203 src/qtui/menus.cc:282
+msgid "P_laylist"
+msgstr "ال_قائمة"
+
+#: src/gtkui/menus.cc:204 src/gtkui/menus.cc:222 src/qtui/menus.cc:283
+#: src/qtui/menus.cc:312
+msgid "_Services"
+msgstr "_خدمات"
+
+#: src/gtkui/menus.cc:205 src/qtui/menus.cc:284
+msgid "_Output"
+msgstr "الم‍_خرَجات"
+
+#: src/gtkui/menus.cc:206 src/qtui/menus.cc:285
+msgid "_View"
+msgstr "_عرض"
+
+#: src/gtkui/menus.cc:211 src/qtui/menus.cc:296
+msgid "_Queue/Unqueue"
+msgstr "_اضف/ازل من قائمة الانتظار"
+
+#: src/gtkui/menus.cc:213 src/qtui/menus.cc:299
+msgid "_Open Containing Folder"
+msgstr "فتح الم_جلد المحتوي"
+
+#: src/gtkui/menus.cc:214 src/qtui/menus.cc:301
+msgid "_Refresh Selected"
+msgstr "تحدي_ث المحددة"
+
+#: src/gtkui/menus.cc:216 src/qtui/menus.cc:304
+msgid "Cu_t"
+msgstr "ق_ص"
+
+#: src/gtkui/menus.cc:217 src/qtui/menus.cc:305
+msgid "_Copy"
+msgstr "_نسخ"
+
+#: src/gtkui/menus.cc:218 src/qtui/menus.cc:306
+msgid "_Paste"
+msgstr "_لصق"
+
+#: src/gtkui/menus.cc:219 src/qtui/menus.cc:307
+msgid "Paste at _End"
+msgstr "لص_ق عند الانتهاء"
+
+#: src/gtkui/menus.cc:220 src/qtui/menus.cc:309
+msgid "Select _All"
+msgstr "تحديد ال_كل"
+
+#: src/gtkui/menus.cc:227 src/moonstone/playlist_tabs.cc:309
+#: src/qtui/playlist_tabs.cc:334
+msgid "_Rename ..."
+msgstr "_اعد الت_سمية ..."
+
+#: src/gtkui/settings.cc:35 src/qtui/settings.cc:59
+msgid "Always"
+msgstr "دائما"
+
+#: src/gtkui/settings.cc:36 src/qtui/settings.cc:60
+msgid "Auto-hide"
+msgstr "إخفاء تلقائي"
+
+#: src/gtkui/settings.cc:37 src/qtui/settings.cc:61
+msgid "Never"
+msgstr "مطلقا"
+
+#: src/gtkui/settings.cc:41 src/qtui/settings.cc:64
+msgid "Playlist Tabs"
+msgstr "علامات قائمة التبويب "
+
+#: src/gtkui/settings.cc:42 src/qtui/settings.cc:65
+msgid "Show playlist tabs:"
+msgstr "إظهار تبويبات قائمة التشغيل:"
+
+#: src/gtkui/settings.cc:45 src/qtui/settings.cc:69
+msgid "Show entry counts"
+msgstr "عرض عدد المدخلاة"
+
+#: src/gtkui/settings.cc:47 src/qtui/settings.cc:72
+msgid "Show close buttons"
+msgstr "عرض زر الخروج"
+
+#: src/gtkui/settings.cc:49 src/qtui/settings.cc:75
+msgid "Playlist Columns"
+msgstr "أعمدة القائمة"
+
+#: src/gtkui/settings.cc:51 src/qtui/settings.cc:77
+msgid "Show column headers"
+msgstr "اعرض رؤوس الأعمدة"
+
+#: src/gtkui/settings.cc:53 src/qtui/settings.cc:82
+msgid "Make column headers clickable for sorting"
+msgstr ""
+
+#: src/gtkui/settings.cc:56
+msgid "Use symbolic icons in toolbar"
+msgstr ""
+
+#: src/gtkui/settings.cc:58 src/qtui/settings.cc:86
+msgid "Scroll on song change"
+msgstr "انتقل عند تغير المقطع"
+
+#: src/gtkui/ui_gtk.cc:82
+msgid "GTK Interface"
+msgstr "مظهر GTK "
+
+#: src/gtkui/ui_gtk.cc:219 src/skins/main.cc:228 src/skins-qt/main.cc:231
+#, c-format
+msgid "%s - Audacious"
+msgstr "%s - Audacious"
+
+#: src/gtkui/ui_gtk.cc:221 src/moonstone/main_window.cc:184
+#: src/qtui/main_window.cc:385
+msgid "Buffering ..."
+msgstr "التخزين المؤقت ..."
+
+#: src/gtkui/ui_gtk.cc:224 src/pipewire/pipewire.cc:402 src/skins/main.cc:230
+#: src/skins-qt/main.cc:233
+msgid "Audacious"
+msgstr "Audacious"
+
+#: src/gtkui/ui_gtk.cc:487 src/gtkui/ui_gtk.cc:518 src/gtkui/ui_gtk.cc:882
+#: src/hotkey/gui.cc:72 src/moonstone/main_window.cc:67
+#: src/moonstone/main_window.cc:145 src/moonstone/main_window.cc:146
+#: src/notify/osd.cc:85 src/qthotkey/gui.cc:67 src/qtui/main_window.cc:154
+#: src/qtui/main_window.cc:347 src/qtui/main_window.cc:348
+#: src/skins/menus.cc:109 src/skins-qt/menus.cc:100
+msgid "Play"
+msgstr "شغل"
+
+#: src/gtkui/ui_gtk.cc:487 src/moonstone/main_window.cc:151
+#: src/moonstone/main_window.cc:152 src/notify/osd.cc:82
+#: src/qtui/main_window.cc:353 src/qtui/main_window.cc:354
+#: src/skins/menus.cc:110 src/skins-qt/menus.cc:101
+msgid "Pause"
+msgstr "البث"
+
+#: src/gtkui/ui_gtk.cc:868 src/moonstone/main_window.cc:57
+#: src/qtui/main_window.cc:145 src/skins/menus.cc:86 src/skins-qt/menus.cc:77
+msgid "Search Library"
+msgstr "مكتبة البحث"
+
+#: src/gtkui/ui_gtk.cc:875 src/moonstone/main_window.cc:60
+#: src/qtui/main_window.cc:147
+msgid "Open Files"
+msgstr "إفتح ملفات"
+
+#: src/gtkui/ui_gtk.cc:876 src/moonstone/main_window.cc:62
+#: src/qtui/main_window.cc:149
+msgid "Add Files"
+msgstr "أضف ملفات"
+
+#: src/gtkui/ui_gtk.cc:881 src/moonstone/main_window.cc:65
+#: src/qtui/main_window.cc:152 src/skins/menus.cc:112 src/skins-qt/menus.cc:103
+msgid "Previous"
+msgstr "السابق"
+
+#: src/gtkui/ui_gtk.cc:883 src/hotkey/gui.cc:74 src/moonstone/main_window.cc:69
+#: src/qthotkey/gui.cc:69 src/qtui/main_window.cc:156 src/skins/menus.cc:111
+#: src/skins-qt/menus.cc:102
+msgid "Stop"
+msgstr "توقف"
+
+#: src/gtkui/ui_gtk.cc:884 src/moonstone/main_window.cc:76 src/notify/osd.cc:89
+#: src/qtui/main_window.cc:163 src/skins/menus.cc:113 src/skins-qt/menus.cc:104
+msgid "Next"
+msgstr "التالي"
+
+#: src/gtkui/ui_gtk.cc:886 src/moonstone/main_window.cc:79
+#: src/qtui/main_window.cc:166 src/qtui/menus.cc:254 src/skins/menus.cc:79
+#: src/skins-qt/menus.cc:69
+msgid "Record Stream"
+msgstr "سجل ستريم"
+
+#: src/gtkui/ui_gtk.cc:919 src/moonstone/main_window.cc:86
+#: src/qtui/main_window.cc:173 src/skins/menus.cc:103 src/skins-qt/menus.cc:94
+msgid "Repeat"
+msgstr "تكرار"
+
+#: src/gtkui/ui_gtk.cc:922 src/moonstone/main_window.cc:89
+#: src/qtui/main_window.cc:176 src/skins/menus.cc:104 src/skins-qt/menus.cc:95
+msgid "Shuffle"
+msgstr "عشوائي"
+
+#: src/gtkui/ui_gtk.cc:1114 src/qtui/main_window.cc:123
+msgid "Menu"
+msgstr "القائمة"
+
+#: src/gtkui/ui_statusbar.cc:64 src/qtui/status_bar.cc:155
+msgid "mono"
+msgstr "احادي"
+
+#: src/gtkui/ui_statusbar.cc:66 src/qtui/status_bar.cc:157
+msgid "stereo"
+msgstr "ستيريو"
+
+#: src/gtkui/ui_statusbar.cc:68 src/qtui/status_bar.cc:160
+#, c-format
+msgid "%d channel"
+msgid_plural "%d channels"
+msgstr0 "%d قناة"
+msgstr1 "%d قناة"
+msgstr2 "%d قناتين"
+msgstr3 "%d قنوات"
+msgstr4 "%d قنوات"
+msgstr5 "%d قنوات"
+
+#: src/gtkui/ui_statusbar.cc:76 src/qtui/status_bar.cc:168
+#, c-format
+msgid "%d kHz"
+msgstr "%d كيلوهرتز"
+
+#: src/gtkui/ui_statusbar.cc:82 src/qtui/status_bar.cc:174
+#, c-format
+msgid "%d kbit/s"
+msgstr "%d ك‌بت/ث"
+
+#: src/gtkui/ui_statusbar.cc:108 src/skins/main.cc:478 src/skins-qt/main.cc:461
+msgid "Single mode."
+msgstr "وضع فردي."
+
+#: src/gtkui/ui_statusbar.cc:110 src/skins/main.cc:480 src/skins-qt/main.cc:463
+msgid "Playlist mode."
+msgstr "وضع قائمة التشغيل."
+
+#: src/gtkui/ui_statusbar.cc:118 src/skins/main.cc:486 src/skins-qt/main.cc:469
+msgid "Stopping after song."
+msgstr "توقف بعد المقطوعة."
+
+#: src/hotkey/gui.cc:71 src/qthotkey/gui.cc:66
+msgid "Previous track"
+msgstr "المقطوعة السابقة"
+
+#: src/hotkey/gui.cc:73 src/qthotkey/gui.cc:68
+msgid "Pause/Resume"
+msgstr "لبث/استئناف"
+
+#: src/hotkey/gui.cc:75 src/qthotkey/gui.cc:70
+msgid "Next track"
+msgstr "المقطوعة التالية"
+
+#: src/hotkey/gui.cc:76 src/qthotkey/gui.cc:71
+msgid "Step forward"
+msgstr "خطوة للأمام"
+
+#: src/hotkey/gui.cc:77 src/qthotkey/gui.cc:72
+msgid "Step backward"
+msgstr "خطوة للخلف"
+
+#: src/hotkey/gui.cc:78 src/qthotkey/gui.cc:73
+msgid "Mute"
+msgstr "كتم"
+
+#: src/hotkey/gui.cc:79 src/qthotkey/gui.cc:74
+msgid "Volume up"
+msgstr "رفع الصوت"
+
+#: src/hotkey/gui.cc:80 src/qthotkey/gui.cc:75
+msgid "Volume down"
+msgstr "خفض الصوت"
+
+#: src/hotkey/gui.cc:81 src/qthotkey/gui.cc:76
+msgid "Jump to file"
+msgstr "انتقال إلى ملف"
+
+#: src/hotkey/gui.cc:82 src/qthotkey/gui.cc:77
+msgid "Toggle player window(s)"
+msgstr "تبديل نافذة(ت) التشغيل"
+
+#: src/hotkey/gui.cc:83 src/qthotkey/gui.cc:78
+msgid "Show On-Screen-Display"
+msgstr "اظهار في شاشة العرض"
+
+#: src/hotkey/gui.cc:84 src/qthotkey/gui.cc:79
+msgid "Toggle repeat"
+msgstr "تبديل التكرار"
+
+#: src/hotkey/gui.cc:85 src/qthotkey/gui.cc:80
+msgid "Toggle shuffle"
+msgstr "تبديل الخلط"
+
+#: src/hotkey/gui.cc:86 src/qthotkey/gui.cc:81
+msgid "Toggle stop after current"
+msgstr "تبديل التوقف بعد الحالية"
+
+#: src/hotkey/gui.cc:87 src/qthotkey/gui.cc:82
+msgid "Raise player window(s)"
+msgstr "رفع نافذة التشغيل(s)"
+
+#: src/hotkey/gui.cc:98 src/qthotkey/gui.cc:100
+msgid "(none)"
+msgstr "(لا شيئ)"
+
+#: src/hotkey/gui.cc:261
+msgid ""
+"It is not recommended to bind the primary mouse buttons without modifiers.\n"
+"\n"
+"Do you want to continue?"
+msgstr ""
+"من غير المستحسَن ربط أزرار الفأرة الأساسية دون معدِّلات.\n"
+"\n"
+"أتريد الاستمرار؟"
+
+#: src/hotkey/gui.cc:264
+msgid "Binding mouse buttons"
+msgstr "ربط أزرار الماوس"
+
+#: src/hotkey/gui.cc:434
+msgid ""
+"Press a key combination inside a text field.\n"
+"You can also bind mouse buttons."
+msgstr ""
+"اضغط تركيبة مفاتيح داخل حقل النص..\n"
+"يمكنك أيضا ربط أزرار الماوس."
+
+#: src/hotkey/gui.cc:444 src/qthotkey/gui.cc:179
+msgid "Hotkeys:"
+msgstr "المفاتيخ الساخنة:"
+
+#: src/hotkey/gui.cc:457 src/qthotkey/gui.cc:181
+msgid "Action:"
+msgstr "أمر:"
+
+#: src/hotkey/gui.cc:461 src/qthotkey/gui.cc:182
+msgid "Key Binding:"
+msgstr "مفتاح الربط:"
+
+#: src/hotkey/gui.cc:518 src/qthotkey/gui.cc:184
+msgid "_Add"
+msgstr "_أضف"
+
+#: src/hotkey/plugin.cc:59 src/qthotkey/plugin.cc:78
+msgid "Global Hotkeys"
+msgstr "المفاتيح العامة"
+
+#: src/hotkey/plugin.cc:74
+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"
+"Contributors 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"
+"تحكّم بالمشغّل بتركيبة مفاتيح عمومية أو مفاتيح الوسائط.\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/jack/jack-ng.cc:54
+msgid "JACK Output"
+msgstr "JACK مخرج"
+
+#: src/jack/jack-ng.cc:126
+msgid "Client name:"
+msgstr "اسم العميل:"
+
+#: src/jack/jack-ng.cc:128
+msgid "Automatically connect to output ports"
+msgstr "الاتصال تلقائيا إلى منافذ الإخراج"
+
+#: src/jack/jack-ng.cc:130
+msgid "Filter ports (regex, use any port if blank):"
+msgstr "تصفية المنافذ (تعبير نظامي regex، يستخدم أي منفذ إذا كان فارغا):"
+
+#: src/jack/jack-ng.cc:136
+msgid "Connect to physical ports only"
+msgstr "الارتباط بمنافذ مادية فقط"
+
+#: src/jack/jack-ng.cc:139
+msgid "Upmix to"
+msgstr "صعّد المزج إلى"
+
+#: src/jack/jack-ng.cc:141
+msgid "ports if input has fewer channels"
+msgstr "منفذاً إذا كان للمُدخَلات قنوات أقل"
+
+#: src/jack/jack-ng.cc:143
+msgid "Ignore insufficient number of ports"
+msgstr "أهمل عدد المنافذ غير الكافي"
+
+#: src/jack/jack-ng.cc:181
+msgid "No JACK output ports were found. Please check settings."
+msgstr "لم يُعثر على منافذ إخراج صوتي. رجاءا تأكد من الإعدادات."
+
+#: src/jack/jack-ng.cc:195
+#, c-format
+msgid "Only %d JACK output ports were found but %d are required."
+msgstr "تم العثور على %d فقط منافذ الإخراج JACK ولكن يلزم %d ."
+
+#: src/jack/jack-ng.cc:210
+#, c-format
+msgid "Failed to connect to JACK port %s."
+msgstr "فشل الاتصال بمنفذ الخادم %s."
+
+#: src/jack/jack-ng.cc:230
+msgid ""
+"JACK supports only floating-point audio. You must change the output bit "
+"depth to floating-point in Audacious settings."
+msgstr ""
+"جاك يدعم فقط الفاصلة العائمة للصوت. يجب تغيير عمق الاخراج قليلا لالفاصلة "
+"العائمة في إعدادات اوداسيو"
+
+#: src/jack/jack-ng.cc:245
+msgid "Failed to connect to the JACK server; is it running?"
+msgstr "فشل الاتصال بالخادم JACK. وتشغيله؟"
+
+#: src/jack/jack-ng.cc:321
+#, c-format
+msgid ""
+"The JACK server requires a sample rate of %d Hz, but Audacious is playing at "
+"%d Hz. Please use the Sample Rate Converter effect to correct the mismatch."
+msgstr ""
+"يتطلب خادم جاك معدل عينة من %d هرتز، ولكن يشغل اوداسيو في %d هرتز. يرجى "
+"استخدام نموذج تأثير محول معدل العينة لتصحيح عدم التوافق."
+
+#: src/ladspa/plugin.cc:416
+#, c-format
+msgid "%s Settings"
+msgstr "%s إعدادات"
+
+#: src/ladspa/plugin.cc:482
+msgid "Module paths:"
+msgstr "مسار الموديول:"
+
+#: src/ladspa/plugin.cc:487
+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.cc:508
+msgid "Available plugins:"
+msgstr "الملحَقات المتوفرة:"
+
+#: src/ladspa/plugin.cc:521 src/modplug/plugin_main.cc:91
+#: src/modplug/plugin_main.cc:94 src/modplug/plugin_main.cc:97
+#: src/modplug/plugin_main.cc:100
+msgid "Enable"
+msgstr "تمكين"
+
+#: src/ladspa/plugin.cc:527
+msgid "Enabled plugins:"
+msgstr "الماحَقات النشطة:"
+
+#: src/ladspa/plugin.cc:543
+msgid "Settings"
+msgstr "الإعدادات"
+
+#: src/ladspa/plugin.cc:560
+msgid ""
+"LADSPA Host for Audacious\n"
+"Copyright 2011 John Lindgren"
+msgstr ""
+"LADSPA Host for Audacious\n"
+"Copyright 2011 John Lindgren"
+
+#: src/ladspa/plugin.h:78
+msgid "LADSPA Host"
+msgstr "LADSPA Host"
+
+#: src/lirc/lirc.cc:55
+msgid "LIRC Plugin"
+msgstr "ملحَقة LIRC"
+
+#: src/lirc/lirc.cc:379
+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\n"
+"\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.cc:390
+msgid "Connection"
+msgstr "اتصال"
+
+#: src/lirc/lirc.cc:391
+msgid "Reconnect to LIRC server"
+msgstr "إعادة الاتصال بخادم LIRC"
+
+#: src/lirc/lirc.cc:393
+msgid "Wait before reconnecting:"
+msgstr "الانتظار حتى إعادةالاتصال:"
+
+#: src/lyrics-common/chart_lyrics_provider.cc:93
+#: src/lyrics-common/chart_lyrics_provider.cc:150
+#: src/lyrics-common/lyrics_ovh_provider.cc:50
+#, c-format
+msgid "Unable to fetch %s"
+msgstr "غير قادر على جلب %s"
+
+#: src/lyrics-common/chart_lyrics_provider.cc:100
+#: src/lyrics-common/chart_lyrics_provider.cc:157
+#: src/lyrics-common/lyrics_ovh_provider.cc:57
+#, c-format
+msgid "Unable to parse %s"
+msgstr "Unable to parse %s"
+
+#: src/lyrics-common/chart_lyrics_provider.cc:121
+#: src/lyrics-common/chart_lyrics_provider.cc:194
+#: src/lyrics-common/lyrics_ovh_provider.cc:88
+msgid "Looking for lyrics ..."
+msgstr "أبحث عن lyrics ..."
+
+#: src/lyrics-common/preferences.h:43
+msgid "Nowhere"
+msgstr "Nowhere"
+
+#: src/lyrics-common/preferences.h:49
+msgid "Artist is truncated at the start, Title -- at the end"
+msgstr "الفنان يُقتَطع عند البداية، العنوان -- عند النهاية"
+
+#: src/lyrics-common/preferences.h:50
+msgid "Chars to truncate on:"
+msgstr "الحروف التي سيُقتَطع عندها:"
+
+#: src/lyrics-common/preferences.h:54
+msgid "Chars are ORed in RegExp, surrounded by whitespace"
+msgstr "الحروف محكومة بـ OR في التعبير النظامي، محاطة بفراغ"
+
+#: src/lyrics-common/preferences.h:55
+msgid "Chars to split on:"
+msgstr "الحروف التي سيُقسَم عندها:"
+
+#: src/lyrics-common/preferences.h:56
+msgid "Further truncate those on chars"
+msgstr "زيادة اقتطاع هذا عند الحروف"
+
+#: src/lyrics-common/preferences.h:62
+msgid "General"
+msgstr "عمومي"
+
+#: src/lyrics-common/preferences.h:63
+msgid "Split title into artist and title on chars"
+msgstr "اقتطع العنوان إلى فنان و عنوان عند الحروف"
+
+#: src/lyrics-common/preferences.h:66
+msgid "Sources"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:67
+msgid "Use embedded lyrics (from Lyrics tag)"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:69
+msgid "Fetch lyrics from internet:"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:72
+msgid "Store fetched lyrics in local cache"
+msgstr "اخزن الأشعار المجلوبة في الذاكرة الخبيئة المحلية"
+
+#: src/lyrics-common/preferences.h:74
+msgid "Local Storage"
+msgstr "الخزن المحلي"
+
+#: src/lyrics-common/preferences.h:75
+msgid "Load lyric files (.lrc) from local storage"
+msgstr "تحميل ملفات الاشعار (‎.lrc) من الخزن المحلي"
+
+#: src/lyrics-common/utils.cc:54 src/ui-common/dialogs-qt.cc:63
+msgid "Error"
+msgstr "خطأ"
+
+#: src/lyrics-common/utils.cc:60
+msgid "Lyrics could not be found."
+msgstr "لم يُعثر على الأشعار."
+
+#: src/lyrics-common/utils.cc:142
+msgid "Missing title and/or artist."
+msgstr "عنوان و/أو فنان مفقود."
+
+#: src/lyrics-gtk/lyrics-gtk.cc:37 src/lyrics-qt/lyrics-qt.cc:50
+msgid "Lyrics"
+msgstr "Lyrics"
+
+#: src/lyrics-gtk/lyrics-gtk.cc:189 src/lyrics-qt/lyrics-qt.cc:171
+msgid "Edit Lyrics ..."
+msgstr "تعديل الأشعار ..."
+
+#: src/lyrics-gtk/lyrics-gtk.cc:195 src/lyrics-qt/lyrics-qt.cc:178
+msgid "Save Locally"
+msgstr "حفظ محلياً"
+
+#: src/lyrics-gtk/lyrics-gtk.cc:201 src/lyrics-qt/lyrics-qt.cc:186
+msgid "Refresh"
+msgstr "إعادة تحميل"
+
+#: src/m3u/m3u.cc:33
+msgid "M3U Playlists"
+msgstr "قوائم M3U"
+
+#: src/metronom/metronom.cc:44
+msgid "Tact Generator"
+msgstr "مولّد المضمار"
+
+#: src/metronom/metronom.cc:145
+#, c-format
+msgid "Tact generator: %d bpm"
+msgstr "مولّد المضمار: %d ضربة بالدقيقة"
+
+#: src/metronom/metronom.cc:147
+#, c-format
+msgid "Tact generator: %d bpm %d/%d"
+msgstr "مولّد المضمار: %d ضربة بالدقيقة %d/%d"
+
+#: src/metronom/metronom.cc:235
+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/mixer/mixer.cc:43
+msgid "Channel Mixer"
+msgstr "خلاط القنوات"
+
+#: src/mixer/mixer.cc:255
+msgid ""
+"Channel Mixer Plugin for Audacious\n"
+"Copyright 2011-2012 John Lindgren and Michał Lipski"
+msgstr ""
+"ملحَقة مازج القنوات لأوادشيَس\n"
+"حقوق النشر 2011-2012 John Lindgren و Michał Lipski"
+
+#: src/mixer/mixer.cc:259
+msgid "Channel Mixer"
+msgstr "خلاط القنوات"
+
+#: src/mixer/mixer.cc:260
+msgid "Output channels:"
+msgstr "مخرج القنوات:"
+
+#: src/mms/mms.cc:35
+msgid "MMS Plugin"
+msgstr "ملحَقة MMS"
+
+#: src/mms/mms.cc:82
+msgid "Error connecting to MMS server"
+msgstr "خطأ في الاتصال بخادم MMS"
+
+#: src/modplug/modplugbmp.h:57
+msgid "ModPlug (Module Player)"
+msgstr "ModPlug (مشغّل موديول)"
+
+#: src/modplug/plugin_main.cc:55
+msgid "Channels"
+msgstr "قنوات"
+
+#: src/modplug/plugin_main.cc:59
+msgid "Nearest (fastest)"
+msgstr "الأقرب (أسرع)"
+
+#: src/modplug/plugin_main.cc:60
+msgid "Linear (fast)"
+msgstr "الخطي (سريع)"
+
+#: src/modplug/plugin_main.cc:61
+msgid "Spline (good)"
+msgstr ""
+"13/5000\n"
+"المفتاح (جيد)"
+
+#: src/modplug/plugin_main.cc:62
+msgid "Polyphase (best)"
+msgstr "الأطوار (أفضل)"
+
+#: src/modplug/plugin_main.cc:63
+msgid "Sample rate"
+msgstr "معدل العينة"
+
+#: src/modplug/plugin_main.cc:64
+msgid "22 kHz"
+msgstr "22 كيلوهرتز"
+
+#: src/modplug/plugin_main.cc:65
+msgid "44 kHz"
+msgstr "44 كيلوهرتز"
+
+#: src/modplug/plugin_main.cc:66
+msgid "48 kHz"
+msgstr "48 كيلوهرتز"
+
+#: src/modplug/plugin_main.cc:67
+msgid "96 kHz"
+msgstr "96 كيلوهرتز"
+
+#: src/modplug/plugin_main.cc:71 src/modplug/plugin_main.cc:76
+#: src/modplug/plugin_main.cc:81
+msgid "Level:"
+msgstr "مستوى:"
+
+#: src/modplug/plugin_main.cc:77
+msgid "Cutoff:"
+msgstr "قطع:"
+
+#: src/modplug/plugin_main.cc:90
+msgid "Reverb"
+msgstr "تردد"
+
+#: src/modplug/plugin_main.cc:93
+msgid "Bass Boost"
+msgstr "صوت إستهجان"
+
+#: src/modplug/plugin_main.cc:96
+msgid "Surround"
+msgstr "إحاطة"
+
+#: src/modplug/plugin_main.cc:99
+msgid "Preamp"
+msgstr "Preamp"
+
+#: src/modplug/plugin_main.cc:106
+msgid "Oversample"
+msgstr "Oversample"
+
+#: src/modplug/plugin_main.cc:107
+msgid "Noise reduction"
+msgstr "تقليل الضوضاء"
+
+#: src/modplug/plugin_main.cc:108
+msgid "Play Amiga MODs"
+msgstr "قراءة Amiga MODs"
+
+#: src/modplug/plugin_main.cc:109
+msgid "Repeat"
+msgstr "تكرار"
+
+#: src/modplug/plugin_main.cc:110
+msgid "Repeat count:"
+msgstr "عدد التكرار:"
+
+#: src/modplug/plugin_main.cc:111
+msgid "To repeat forever, set the repeat count to -1."
+msgstr "للتكرار لا نهائي، تعيين تكرار العد إلى -1."
+
+#: src/modplug/plugin_main.cc:124 src/sid/xs_config.cc:106
+msgid "These settings will take effect when Audacious is restarted."
+msgstr ""
+"60/5000\n"
+"وهذه الإعدادات نافذة المفعول عند إعادة تشغيل اوداسيو."
+
+#: src/moonstone/main_window.cc:72 src/moonstone/main_window.cc:73
+#: src/qtui/main_window.cc:159 src/qtui/main_window.cc:160
+#: src/skins/menus.cc:107 src/skins-qt/menus.cc:98
+msgid "Stop After This Song"
+msgstr "توقف بعد هذا المقطع"
+
+#: src/moonstone/moonstone.cc:39
+msgid "Moonstone"
+msgstr "Moonstone"
+
+#: src/moonstone/playlist_header.cc:212 src/qtui/playlist_header.cc:258
+msgid "Reset to Defaults"
+msgstr "التصفير إلى القيم الإفتراضية"
+
+#: src/moonstone/playlist_model.cc:38 src/qtui/playlist_header.cc:232
+msgid "Now Playing"
+msgstr "المُشَغّل الأن"
+
+#: src/moonstone/playlist_selection.cc:66
+#: src/playlist-manager/playlist-manager.cc:201
+#: src/playlist-manager-qt/playlist-manager-qt.cc:190
+msgid "Entries"
+msgstr "المدخلات"
+
+#: src/mpg123/mpg123.cc:54
+msgid "MPG123 Plugin"
+msgstr "ملحَقة MPG123"
+
+#: src/mpg123/mpg123.cc:82
+msgid "Use accurate length calculation (slow)"
+msgstr "استخدام دقة حساب طويل (بطيء)"
+
+#: src/mpg123/mpg123.cc:260
+msgid "Surround"
+msgstr "إحاطة"
+
+#: src/mpris2/plugin.cc:40
+msgid "MPRIS 2 Server"
+msgstr "MPRIS 2 خادم"
+
+#: src/neon/neon.cc:102
+msgid "Neon HTTP/HTTPS Plugin"
+msgstr "ملحَقة Neon HTTP/HTTPS"
+
+#: src/neon/neon.cc:526
+msgid "Error parsing redirect"
+msgstr "خطأ في توزيع إعادة توجيه"
+
+#: src/neon/neon.cc:540
+msgid "Unknown HTTP error"
+msgstr "خطأ HTTP غير معروف"
+
+#: src/neon/neon.cc:614
+msgid "Error parsing URL"
+msgstr "تحليل عنوان خطأ"
+
+#: src/neon/neon.cc:687
+msgid "Too many redirects"
+msgstr "الكثير من الموجهات"
+
+#: src/notify/event.cc:97
+msgid "Stopped"
+msgstr "توقفت"
+
+#: src/notify/event.cc:97
+msgid "Audacious is not playing."
+msgstr "Audacious ليس في حاة تشغيل."
+
+#: src/notify/notify.cc:39
+msgid "Desktop Notifications"
+msgstr "تنبيهات سطح المكتب"
+
+#: src/notify/notify.cc:57
+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 ""
+"ملحَقة إشعارات سطح المكتب لأوداشيَس\n"
+"حقوق النشر (C) 2010 Maximilian Bogner\n"
+"حقوق النشر (C) 2011-2013 John Lindgren و Jean-Alexandre Anglès d'Auriac\n"
+"\n"
+"هذه الملحَقة برنامج مجاني: يمكنك إعادة توزيعها و/أو تعديلها وفق بنود الرخصة "
+"الشعبية العامة GNU General Public License كما تنشرها مؤسسة البرمجيات الحرة "
+"Free Software Foundation، إمّا الإصدار 3 من الرخصة، أو (وفق خيارك) أي إصدار "
+"لاحق.\n"
+"\n"
+"هذه الملحَقة موزَّعة على أمل أنها ستكون مفيدة، لكن بلا أية ضمانات: حتى بدون "
+"الضمانة الضمنية بالموائمة التجارية أو الموائمة لغرض بعينه. انظر الرخصة "
+"الشعبية العامة GNU General Public License لمزيد من التفاصيل.\n"
+"\n"
+"ينبغي ان تكون قد تلقيت نسخة من الرخصة الشعبية العامة GNU General Public "
+"License مع هذا البرنامج. إن لم يكن الأمر كذلك، راجع <http://www.gnu.org/"
+"licenses/>."
+
+#: src/notify/notify.cc:104
+msgid "Show playback controls"
+msgstr "اظهر عناصر التحكم بالتشغيل"
+
+#: src/notify/notify.cc:106
+msgid "Always show notification"
+msgstr "اعرض دائما الاخطارات"
+
+#: src/notify/notify.cc:108
+msgid "Include album name in notification"
+msgstr "اعرض اسم الالبوم في الاخطارات"
+
+#: src/notify/notify.cc:110
+msgid "Custom notification duration:"
+msgstr "فترة الإشعار المخصصة:"
+
+#: src/notify/osd.cc:74
+msgid "Show"
+msgstr "اظهار"
+
+#: src/openmpt/mpt.cc:50
+msgid "OpenMPT (Module Player)"
+msgstr "OpenMPT (مشغّل موديول)"
+
+#: src/openmpt/mpt.cc:132
+msgid ""
+"Module player based on libopenmpt\n"
+"\n"
+"Written by: Chris Spiegel <cspiegel@gmail.com>"
+msgstr ""
+"مشغّل موديول مستمَد من libopenmpt\n"
+"\n"
+"كتبه: Chris Spiegel <cspiegel@gmail.com>"
+
+#: src/openmpt/mpt.cc:151
+msgid "Stereo separation:"
+msgstr "فصل الستريو:"
+
+#: src/openmpt/mpt.cc:153
+msgid "% (0=mono, 100=default, 200=full)"
+msgstr ""
+
+#: src/openmpt/mpt.cc:157
+msgid "Interpolation:"
+msgstr "الاستيفاء:"
+
+#: src/openmpt/mptwrap.h:51 src/soxr/sox-resampler.cc:189 src/xsf/plugin.cc:437
+msgid "Linear"
+msgstr "خطّيّ"
+
+#: src/openmpt/mptwrap.h:52
+msgid "Cubic"
+msgstr "مكعّب"
+
+#: src/openmpt/mptwrap.h:53
+msgid "Windowed sinc"
+msgstr "دالة sinc محتواة"
+
+#: src/opus/opus.cc:39
+msgid "Opus Decoder"
+msgstr ""
+
+#: src/opus/opus.cc:336
+msgid ""
+"Opus Decoder Plugin for Audacious\n"
+"Copyright 2022 Thomas Lange"
+msgstr ""
+
+#: src/oss4/oss.h:70
+msgid "OSS4 Output"
+msgstr "OSS4 الناتج"
+
+#: src/oss4/oss.h:72
+msgid "OSS3 Output"
+msgstr "OSS3 الناتج"
+
+#: src/oss4/plugin.cc:35
+msgid "Default device"
+msgstr "الجهاز الافتراضي"
+
+#: src/oss4/plugin.cc:78
+msgid "Audio device:"
+msgstr "جهاز الصوت:"
+
+#: src/oss4/plugin.cc:81
+msgid "Use alternate device:"
+msgstr "استخدام جهاز بديل:"
+
+#: src/oss4/plugin.cc:85
+msgid "Save volume between sessions."
+msgstr "حفظ الصوت بين الجلسات."
+
+#: src/oss4/plugin.cc:87
+msgid "Enable format conversions made by the OSS software."
+msgstr "تمكين تنسيق التحويلات التي أدلى بها البرنامج OSS."
+
+#: src/oss4/plugin.cc:89
+msgid "Enable exclusive mode to prevent virtual mixing."
+msgstr "تمكين وضع خاص لمنع الاختلاط الظاهري."
+
+#: src/oss4/plugin.cc:101
+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 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/pipewire/pipewire.cc:44
+msgid "PipeWire Output"
+msgstr ""
+
+#: src/pipewire/pipewire.cc:118
+msgid ""
+"PipeWire Output Plugin for Audacious\n"
+"Copyright 2022 Thomas Lange\n"
+"\n"
+"Based on the PipeWire Output Plugin for Qmmp\n"
+"Copyright 2021 Ilya Kotov"
+msgstr ""
+
+#: src/pipewire/pipewire.cc:408 src/skins/menus.cc:88 src/skins-qt/menus.cc:79
+msgid "Playback"
+msgstr "التشغيل"
+
+#: src/playlist-manager/playlist-manager.cc:38
+#: src/playlist-manager-qt/playlist-manager-qt.cc:42
+msgid "Playlist Manager"
+msgstr "مدير قائمة التشغيل"
+
+#: src/playlist-manager/playlist-manager.cc:221
+#: src/playlist-manager-qt/playlist-manager-qt.cc:356
+msgid "_Remove"
+msgstr "_حذف"
+
+#: src/playlist-manager/playlist-manager.cc:222
+#: src/playlist-manager-qt/playlist-manager-qt.cc:351
+msgid "Ren_ame"
+msgstr "اع_د التسمية"
+
+#: src/pls/pls.cc:35
+msgid "PLS Playlists"
+msgstr "قوائم PLS"
+
+#: src/psf/plugin.cc:53
+msgid "OpenPSF PSF1/PSF2 Decoder"
+msgstr "OpenPSF PSF1/PSF2 مفكك"
+
+#: src/psf/plugin.cc:270
+msgid "OpenPSF Configuration"
+msgstr "إعدادات OpenPSF"
+
+#: src/psf/plugin.cc:271 src/xsf/plugin.cc:444
+msgid "Ignore length from file"
+msgstr "تجاهل الطول من الملف"
+
+#: src/pulse/pulse_audio.cc:42
+msgid "PulseAudio Output"
+msgstr "ناتج PulseAudio"
+
+#: src/pulse/pulse_audio.cc:84
+msgid "Context name:"
+msgstr "إسم السياق:"
+
+#: src/pulse/pulse_audio.cc:86
+msgid "Stream name:"
+msgstr "إسم الدفق:"
+
+#: src/pulse/pulse_audio.cc:596
+msgid ""
+"Audacious PulseAudio Output Plugin\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 ""
+"Audacious PulseAudio Output Plugin\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/qtaudio/qtaudio.cc:53
+msgid "QtMultimedia Output"
+msgstr "ناتج QtMultimedia"
+
+#: src/qtaudio/qtaudio.cc:84
+msgid ""
+"QtMultimedia Audio Output Plugin for Audacious\n"
+"Copyright 2014 William Pitcock\n"
+"\n"
+"Based on SDL Output Plugin for Audacious\n"
+"Copyright 2010 John Lindgren"
+msgstr ""
+"QtMultimedia Audio Output Plugin for Audacious\n"
+"Copyright 2014 William Pitcock\n"
+"\n"
+"Based on SDL Output Plugin for Audacious\n"
+"Copyright 2010 John Lindgren"
+
+#: src/qtglspectrum/gl-spectrum.cc:41
+msgid ""
+"OpenGL Spectrum Analyzer for Audacious\n"
+"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
+"Copyright 2014, 2020 Ariadne Conill\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"
+"حقوق النشر لسنة 2013 لـ Christophe Budé و John Lindgren و Carlo Bramini\n"
+"حقوق النشر 2014, 2020 لـ Ariadne Conill\n"
+"\n"
+"مستمد من ملحَقة XMMS:\n"
+"حقوق النشر 1998-2000 لـ Peter Alm و Mikael Alm و Olle Hallnas و Thomas "
+"Nilsson و 4Front Technologies\n"
+"\n"
+"الرخصة: GPLv2‭+"
+
+#: src/qthotkey/gui.cc:177
+msgid "Press a key combination inside a text field."
+msgstr "اضغط تركيبة مفاتيح داخل حقل نص."
+
+#: src/qthotkey/plugin.cc:105
+msgid ""
+"Global Hotkey Plugin\n"
+"Control the player with global key combinations or multimedia keys.\n"
+"\n"
+"Copyright (C) 2020 i.Dark_Templar <darktemplar@dark-templar-archives.net>\n"
+"Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n"
+"\n"
+"Contributors 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"
+"تحكّم بالمشغّل بتركيبة مفاتيح عمومية أو مفاتيح الوسائط.\n"
+"\n"
+"حقوق النشر (C) لسنة 2020 لـ i.Dark_Templar <darktemplar@dark-templar-"
+"archives.net>\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/qtui/menus.cc:109
+msgid "_Open Folder ..."
+msgstr "_افتح مجلد ..."
+
+#: src/qtui/menus.cc:115
+msgid "_Add Folder ..."
+msgstr "_اضافة مجلد..."
+
+#: src/qtui/menus.cc:128
+msgid "_Log Inspector ..."
+msgstr "_سجل المفتش..."
+
+#: src/qtui/menus.cc:220
+msgid "_Find ..."
+msgstr "_بحث..."
+
+#: src/qtui/menus.cc:256 src/skins/menus.cc:80 src/skins-qt/menus.cc:70
+msgid "Audio Settings ..."
+msgstr "إعدادات الصوت ..."
+
+#: src/qtui/playlist_model.cc:188
+msgid "Q#"
+msgstr "ط#"
+
+#: src/qtui/playlist_model.cc:190
+msgid "T#"
+msgstr "م#"
+
+#: src/qtui/playlist_model.cc:192
+msgid "C#"
+msgstr ""
+
+#: src/qtui/playlist_model.cc:194
+msgid "D#"
+msgstr ""
+
+#: src/qtui/qtui.cc:40
+msgid "Qt Interface"
+msgstr "مظهر كيوتي"
+
+#: src/qtui/search_bar.cc:46
+msgid "Search playlist"
+msgstr "البحث في قائمة التشغيل"
+
+#: src/qtui/settings.cc:79
+msgid "Use bold font for column headers"
+msgstr "استخدم نصاً ثخيناً لترويسات الأعمدة"
+
+#: src/resample/resample.cc:43
+msgid "Sample Rate Converter"
+msgstr "محول معدل العينة"
+
+#: src/resample/resample.cc:183
+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.cc:187
+msgid "Skip/repeat samples"
+msgstr "تخطي/تكرار العينات"
+
+#: src/resample/resample.cc:188
+msgid "Linear interpolation"
+msgstr "استيفاء خطي"
+
+#: src/resample/resample.cc:189
+msgid "Fast sinc interpolation"
+msgstr "استيفاء سينك sinc السريع"
+
+#: src/resample/resample.cc:190
+msgid "Medium sinc interpolation"
+msgstr "استيفاء سينك sinc متوسط"
+
+#: src/resample/resample.cc:191
+msgid "Best sinc interpolation"
+msgstr "استيفاء سينك sinc الأفضل"
+
+#: src/resample/resample.cc:195
+msgid "Conversion"
+msgstr "تحويل"
+
+#: src/resample/resample.cc:196
+msgid "Method:"
+msgstr "طريقة:"
+
+#: src/resample/resample.cc:199 src/soxr/sox-resampler.cc:203
+msgid "Rate:"
+msgstr "معدل:"
+
+#: src/resample/resample.cc:202
+msgid "Rate Mappings"
+msgstr "تعيينات معدل"
+
+#: src/resample/resample.cc:203
+msgid "Use rate mappings"
+msgstr "استخدم تعيينات المعدل"
+
+#: src/resample/resample.cc:205
+msgid "8 kHz:"
+msgstr "8 كيلوهرتز:"
+
+#: src/resample/resample.cc:209
+msgid "16 kHz:"
+msgstr "16 كيلوهرتز:"
+
+#: src/resample/resample.cc:213
+msgid "22.05 kHz:"
+msgstr "22.05 كيلوهرتز:"
+
+#: src/resample/resample.cc:217
+msgid "32.0 kHz:"
+msgstr "32.0 كيلوهرتز:"
+
+#: src/resample/resample.cc:221
+msgid "44.1 kHz:"
+msgstr "44.1 كيلوهرتز:"
+
+#: src/resample/resample.cc:225
+msgid "48 kHz:"
+msgstr "48 كيلوهرتز:"
+
+#: src/resample/resample.cc:229
+msgid "88.2 kHz:"
+msgstr "88.2 كيلوهرتز:"
+
+#: src/resample/resample.cc:233
+msgid "96 kHz:"
+msgstr "96 كيلوهرتز:"
+
+#: src/resample/resample.cc:237
+msgid "176.4 kHz:"
+msgstr "176.4 كيلوهرتز:"
+
+#: src/resample/resample.cc:241
+msgid "192 kHz:"
+msgstr "192 كيلوهرتز:"
+
+#: src/scrobbler2/config_window.cc:29
+msgid "Checking Last.fm access ..."
+msgstr "Checking Last.fm access ..."
+
+#: src/scrobbler2/config_window.cc:35
+msgid ""
+"Your scrobbles are being saved on your computer temporarily. They will be "
+"submitted as soon as Audacious is allowed access."
+msgstr ""
+"يتم حفظ scrobbles على جهاز الكمبيوتر الخاص بك مؤقتا. أنها ستقدم في أقرب وقت "
+"يسمح Audacious بالوصول."
+
+#: src/scrobbler2/config_window.cc:41
+#, c-format
+msgid "Permission granted. Scrobbling for user %s."
+msgstr "تم تأمين التصريح Scrobbling للمستخدم %s."
+
+#: src/scrobbler2/config_window.cc:44
+msgid ""
+"Permission denied. Open the following URL in a browser, allow Audacious "
+"access to your account, and then click 'Check Permission' again:"
+msgstr ""
+"طلب الاذن مرفوض. فتح الرابط التالي في متصفح، سماح بالوصول Audacious إلى "
+"حسابك، ومن ثم انقر فوق \"تحقق تصريح 'مرة أخرى:"
+
+#: src/scrobbler2/config_window.cc:53
+msgid "There was a problem contacting Last.fm."
+msgstr "كانت هناك مشكلة الاتصال Last.fm."
+
+#: src/scrobbler2/config_window.cc:92
+msgid "Check Permission"
+msgstr "التحقق من الاإذن"
+
+#: src/scrobbler2/config_window.cc:93
+msgid "Revoke Permission"
+msgstr ""
+"17/5000\n"
+"إلغاء التراخيص"
+
+#: src/scrobbler2/config_window.cc:97
+msgid "You need to allow Audacious to scrobble tracks to your Last.fm account."
+msgstr "تحتاج إلى سماح Audacious لscrobble المسارات لحساب Last.fm الخاص بك."
+
+#: src/scrobbler2/scrobbler.cc:29
+msgid "Scrobbler 2.0"
+msgstr "Scrobbler 2.0"
+
+#: src/scrobbler2/scrobbler.cc:200
+msgid ""
+"The Scrobbler plugin could not be started.\n"
+"There might be a problem with your installation."
+msgstr ""
+"تعذر بدء البرنامج المساعد Scrobbler.\n"
+"قد تكون هناك مشكلة مع التثبيت."
+
+#: src/scrobbler2/scrobbler.cc:245
+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."
+msgstr ""
+
+#: src/sdlout/sdlout.cc:43
+msgid "SDL Output"
+msgstr "SDL ناتج"
+
+#: src/sdlout/sdlout.cc:72
+msgid ""
+"SDL Output Plugin for Audacious\n"
+"Copyright 2010 John Lindgren"
+msgstr ""
+"SDL Output Plugin for Audacious\n"
+"Copyright 2010 John Lindgren"
+
+#: src/search-tool/library.cc:35 src/search-tool/library.cc:46
+#: src/search-tool-qt/library.cc:35 src/search-tool-qt/library.cc:46
+msgid "Library"
+msgstr "مكتبة"
+
+#: src/search-tool-qt/search-model.cc:44 src/search-tool/search-tool.cc:287
+#, c-format
+msgid "%d song"
+msgid_plural "%d songs"
+msgstr0 "%d مقطوعة"
+msgstr1 "%d مقطوعة"
+msgstr2 "%d مقطوعات"
+msgstr3 "%d مقطوعات"
+msgstr4 "%d مقطوعات"
+msgstr5 "%d مقطوعات"
+
+#: src/search-tool-qt/search-model.cc:53 src/search-tool/search-tool.cc:294
+msgid "of this genre"
+msgstr "من هذا النوع"
+
+#: src/search-tool-qt/search-model.h:47 src/search-tool/search-model.h:45
+msgid "on"
+msgstr "مشغل"
+
+#: src/search-tool-qt/search-model.h:47 src/search-tool/search-model.h:45
+msgid "by"
+msgstr "بواسطة"
+
+#: src/search-tool-qt/search-tool-qt.cc:165 src/search-tool/search-tool.cc:74
+msgid "Number of results to show:"
+msgstr "عدد النتائج لإظهارها:"
+
+#: src/search-tool-qt/search-tool-qt.cc:168 src/search-tool/search-tool.cc:77
+msgid "Rescan library at startup"
+msgstr "إعادة فحص المكتبة عند البدء"
+
+#: src/search-tool-qt/search-tool-qt.cc:170
+msgid "Monitor library for changes"
+msgstr "مراقبة المكتبة عن التغييرات"
+
+#: src/search-tool-qt/search-tool-qt.cc:193 src/search-tool/search-tool.cc:450
+msgid ""
+"To import your music library into Audacious, choose a folder and then click "
+"the \"refresh\" icon."
+msgstr ""
+"لاستيراد مكتبة الموسيقى الخاصة بك إلى أوداشيَس، اختر المجلد ثم انقر أيقونة "
+"\"التحديث\" ."
+
+#: src/search-tool-qt/search-tool-qt.cc:195 src/search-tool/search-tool.cc:459
+msgid "Please wait ..."
+msgstr "الرجاء الانتظار ..."
+
+#: src/search-tool-qt/search-tool-qt.cc:197 src/search-tool/search-tool.cc:487
+msgid "Choose Folder"
+msgstr "اختر مجلد"
+
+#: src/search-tool-qt/search-tool-qt.cc:201 src/search-tool/search-tool.cc:445
+msgid "Search library"
+msgstr "مكتبة البحث"
+
+#: src/search-tool-qt/search-tool-qt.cc:327 src/search-tool/search-tool.cc:156
+#, c-format
+msgid "%d of %d result shown"
+msgid_plural "%d of %d results shown"
+msgstr0 "تظهر %d من %d من النتائج"
+msgstr1 "تظهر %d من %d من النتائج"
+msgstr2 "تظهر %d من %d من النتائج"
+msgstr3 "تظهر %d من %d من النتائج"
+msgstr4 "تظهر %d من %d من النتائج"
+msgstr5 "تظهر %d من %d من النتائج"
+
+#: src/search-tool-qt/search-tool-qt.cc:331 src/search-tool/search-tool.cc:160
+#, c-format
+msgid "%d result"
+msgid_plural "%d results"
+msgstr0 "%d ناتج"
+msgstr1 "%d ناتج"
+msgstr2 "%d نتيجتين"
+msgstr3 "%d نتائج"
+msgstr4 "%d نتائج"
+msgstr5 "%d النتائج"
+
+#: src/search-tool-qt/search-tool-qt.cc:501 src/search-tool/search-tool.cc:341
+msgid "_Create Playlist"
+msgstr "_انشاء قائمة"
+
+#: src/search-tool-qt/search-tool-qt.cc:503 src/search-tool/search-tool.cc:343
+msgid "_Add to Playlist"
+msgstr "_اضافة للقائمة"
+
+#: src/sid/xmms-sid.cc:43
+msgid "SID Player"
+msgstr "قارئ SID "
+
+#: src/sid/xs_config.cc:62
+msgid "Channels:"
+msgstr "قنوات:"
+
+#: src/sid/xs_config.cc:68
+msgid "Emulation"
+msgstr "محاكاة"
+
+#: src/sid/xs_config.cc:69
+msgid "Emulate MOS 8580 (default: MOS 6581)"
+msgstr "حاكي MOS 8580 (الافتراضي: MOS 6581)"
+
+#: src/sid/xs_config.cc:71
+msgid "Do not automatically select chip model"
+msgstr "لا تحدد تلقائيا نموذج الرقاقة"
+
+#: src/sid/xs_config.cc:73
+msgid "Emulate filter"
+msgstr "فلتر المحاكاة"
+
+#: src/sid/xs_config.cc:75
+msgid "Clock speed:"
+msgstr "سرعة الساعة:"
+
+#: src/sid/xs_config.cc:78
+msgid "Do not automatically select clock speed"
+msgstr "لاتحدد تلقائيا سرعة الساعة"
+
+#: src/sid/xs_config.cc:80
+msgid "Playback time"
+msgstr "وقت التشغيل"
+
+#: src/sid/xs_config.cc:81
+msgid "Set maximum playback time:"
+msgstr "السرعة القصوى لساعة التشغيل"
+
+#: src/sid/xs_config.cc:87
+msgid "Use only when song length is unknown"
+msgstr "استخدم فقط عندما يمون طول المقطوعة غير معروف"
+
+#: src/sid/xs_config.cc:90
+msgid "Set minimum playback time:"
+msgstr "السرعة الدنيا لساعة التشغيل"
+
+#: src/sid/xs_config.cc:96
+msgid "Subtunes"
+msgstr "Subtunes"
+
+#: src/sid/xs_config.cc:97
+msgid "Enable subtunes"
+msgstr "تمكين subtunes"
+
+#: src/sid/xs_config.cc:99
+msgid "Ignore subtunes shorter than:"
+msgstr "تجاهل subtunes أقصر من:"
+
+#: src/sid/xs_config.cc:105
+msgid "Note"
+msgstr "ملاحظة"
+
+#: src/silence-removal/silence-removal.cc:39
+msgid "Silence Removal"
+msgstr "إزالة الصمت"
+
+#: src/silence-removal/silence-removal.cc:58
+msgid ""
+"Silence Removal Plugin for Audacious\n"
+"Copyright 2014 John Lindgren"
+msgstr ""
+"Silence Removal Plugin for Audacious\n"
+"Copyright 2014 John Lindgren"
+
+#: src/silence-removal/silence-removal.cc:67
+msgid "Silence Removal"
+msgstr "إزالة الصمت"
+
+#: src/silence-removal/silence-removal.cc:68
+msgid "Threshold:"
+msgstr "عتبة:"
+
+#: src/skins/actions.cc:45 src/skins-qt/actions.cc:43
+msgid "Repeat points cleared."
+msgstr "كرر نقاط التصفية"
+
+#: src/skins/actions.cc:60 src/skins-qt/actions.cc:58
+msgid "Repeat point A set."
+msgstr "كرر النقطة A مجموعة."
+
+#: src/skins/actions.cc:65 src/skins-qt/actions.cc:63
+msgid "Repeat point B set."
+msgstr "كرر النقطة B مجموعة."
+
+#: src/skins/equalizer.cc:223 src/skins-qt/equalizer.cc:223
+msgid "Preamp"
+msgstr "Preamp"
+
+#: src/skins/equalizer.cc:227 src/skins-qt/equalizer.cc:227
+msgid "31 Hz"
+msgstr "31 هرتز"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "63 Hz"
+msgstr "63 هرتز"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "125 Hz"
+msgstr "125 هرتز"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "250 Hz"
+msgstr "250 هرتز"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "500 Hz"
+msgstr "500 هرتز"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "1 kHz"
+msgstr "1 هرتز"
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "2 kHz"
+msgstr "2 هرتز"
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "4 kHz"
+msgstr "4 هرتز"
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "8 kHz"
+msgstr "8 هرتز"
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "16 kHz"
+msgstr "16 هرتز"
+
+#: src/skins/equalizer.cc:270 src/skins-qt/equalizer.cc:270
+msgid "Audacious Equalizer"
+msgstr "خالط Audacious"
+
+#: src/skins/main.cc:459 src/skins-qt/main.cc:442
+msgid "Recording on"
+msgstr "التسجيل مفعل"
+
+#: src/skins/main.cc:461 src/skins-qt/main.cc:444
+msgid "Recording off"
+msgstr "التسجيل متوقف"
+
+#: src/skins/main.cc:754 src/skins-qt/main.cc:701
+#, c-format
+msgid "Seek to %d:%-2.2d / %d:%-2.2d"
+msgstr "انتقل الى %d:%-2.2d / %d:%-2.2d"
+
+#: src/skins/main.cc:771 src/skins-qt/main.cc:718
+#, c-format
+msgid "Volume: %d%%"
+msgstr "الصوت: %d%%"
+
+#: src/skins/main.cc:784 src/skins-qt/main.cc:731
+#, c-format
+msgid "Balance: %d%% left"
+msgstr "توازن: %d%% يسار"
+
+#: src/skins/main.cc:786 src/skins-qt/main.cc:733
+msgid "Balance: center"
+msgstr "توازن: وسط"
+
+#: src/skins/main.cc:788 src/skins-qt/main.cc:735
+#, c-format
+msgid "Balance: %d%% right"
+msgstr "توازن: %d%% يمين"
+
+#: src/skins/main.cc:880 src/skins-qt/main.cc:827
+msgid "Options Menu"
+msgstr "خيارات القائمة"
+
+#: src/skins/main.cc:884 src/skins-qt/main.cc:831
+msgid "Disable 'Always On Top'"
+msgstr "تعطيل 'دائما فوق الكل'"
+
+#: src/skins/main.cc:886 src/skins-qt/main.cc:833
+msgid "Enable 'Always On Top'"
+msgstr "تفعيل 'دائما فوق الكل'"
+
+#: src/skins/main.cc:889 src/skins-qt/main.cc:836
+msgid "File Info Box"
+msgstr "مربع معلومات الملف"
+
+#: src/skins/main.cc:892 src/skins/menus.cc:149 src/skins-qt/main.cc:839
+#: src/skins-qt/menus.cc:142
+msgid "Double Size"
+msgstr "ضعف الحجم"
+
+#: src/skins/main.cc:895 src/skins-qt/main.cc:842
+msgid "Visualizations"
+msgstr "المرئيات"
+
+#: src/skins/menus.cc:74 src/skins-qt/menus.cc:64
+msgid "Volume Up"
+msgstr "رفع الصوت"
+
+#: src/skins/menus.cc:75 src/skins-qt/menus.cc:65
+msgid "Volume Down"
+msgstr "خفض الصوت"
+
+#: src/skins/menus.cc:77 src/skins-qt/menus.cc:67
+msgid "Effects ..."
+msgstr "مؤثرات ..."
+
+#: src/skins/menus.cc:84 src/skins-qt/menus.cc:74
+msgid "Open Files ..."
+msgstr "إفتح الملفات ..."
+
+#: src/skins/menus.cc:85 src/skins-qt/menus.cc:76
+msgid "Open URL ..."
+msgstr "إفتح الرابط ..."
+
+#: src/skins/menus.cc:89 src/skins-qt/menus.cc:80
+msgid "Playlist"
+msgstr "قائمة التشغيل"
+
+#: src/skins/menus.cc:90 src/skins-qt/menus.cc:81
+msgid "Output"
+msgstr "الناتج"
+
+#: src/skins/menus.cc:91 src/skins-qt/menus.cc:82
+msgid "View"
+msgstr "عرض"
+
+#: src/skins/menus.cc:93 src/skins/menus.cc:161 src/skins/menus.cc:174
+#: src/skins/menus.cc:245 src/skins-qt/menus.cc:84 src/skins-qt/menus.cc:156
+#: src/skins-qt/menus.cc:170 src/skins-qt/menus.cc:241
+msgid "Services"
+msgstr "خدمات"
+
+#: src/skins/menus.cc:95 src/skins-qt/menus.cc:86
+msgid "About ..."
+msgstr "حول ..."
+
+#: src/skins/menus.cc:96 src/skins-qt/menus.cc:87
+msgid "Settings ..."
+msgstr "الإعدادات..."
+
+#: src/skins/menus.cc:97 src/skins-qt/menus.cc:88
+msgid "Quit"
+msgstr "اخرج"
+
+#: src/skins/menus.cc:101 src/skins/menus.cc:235 src/skins-qt/menus.cc:92
+#: src/skins-qt/menus.cc:231
+msgid "Song Info ..."
+msgstr "معلومات المقطع ..."
+
+#: src/skins/menus.cc:105 src/skins-qt/menus.cc:96
+msgid "Shuffle by Album"
+msgstr "عشوائي حسب الالبوم"
+
+#: src/skins/menus.cc:106 src/skins-qt/menus.cc:97
+msgid "No Playlist Advance"
+msgstr "لا قائمة التشغيل مسبقة"
+
+#: src/skins/menus.cc:117 src/skins-qt/menus.cc:108
+msgid "Set A-B Repeat"
+msgstr "تكرار أ-ي"
+
+#: src/skins/menus.cc:118 src/skins-qt/menus.cc:109
+msgid "Clear A-B Repeat"
+msgstr "مسح تكرار أ-ي"
+
+#: src/skins/menus.cc:120 src/skins-qt/menus.cc:111
+msgid "Jump to Song ..."
+msgstr "إذهب للمقطع ..."
+
+#: src/skins/menus.cc:121 src/skins-qt/menus.cc:113
+msgid "Jump to Time ..."
+msgstr "الانتقال السريع للوقت ..."
+
+#: src/skins/menus.cc:125 src/skins-qt/menus.cc:118
+msgid "Play/Resume"
+msgstr "لبث/استئناف"
+
+#: src/skins/menus.cc:127 src/skins-qt/menus.cc:120
+msgid "New Playlist"
+msgstr "قائمة تشغيل جديدة"
+
+#: src/skins/menus.cc:128 src/skins-qt/menus.cc:121
+msgid "Rename Playlist ..."
+msgstr "اعادة تسمية القائمة ..."
+
+#: src/skins/menus.cc:129 src/skins-qt/menus.cc:122
+msgid "Remove Playlist"
+msgstr "إزالة قائمة التشغيل ..."
+
+#: src/skins/menus.cc:131 src/skins-qt/menus.cc:124
+msgid "Previous Playlist"
+msgstr "قائمة النشغيل السابقة"
+
+#: src/skins/menus.cc:132 src/skins-qt/menus.cc:125
+msgid "Next Playlist"
+msgstr "قائمة التشغيل التالية"
+
+#: src/skins/menus.cc:134 src/skins-qt/menus.cc:127
+msgid "Import Playlist ..."
+msgstr "استورد قائمة التشغيل"
+
+#: src/skins/menus.cc:135 src/skins-qt/menus.cc:128
+msgid "Export Playlist ..."
+msgstr "صدر قائمة التشغيل"
+
+#: src/skins/menus.cc:137 src/skins-qt/menus.cc:130
+msgid "Playlist Manager ..."
+msgstr "مدير قائمة التشغيل"
+
+#: src/skins/menus.cc:138 src/skins-qt/menus.cc:131
+msgid "Queue Manager ..."
+msgstr "مدير قوائم الانتظار ..."
+
+#: src/skins/menus.cc:140 src/skins-qt/menus.cc:133
+msgid "Refresh Playlist"
+msgstr "حدث قائمة التشغيل"
+
+#: src/skins/menus.cc:144 src/skins-qt/menus.cc:137
+msgid "Show Playlist Editor"
+msgstr "اظهار قائمة التشغيل"
+
+#: src/skins/menus.cc:145 src/skins-qt/menus.cc:138
+msgid "Show Equalizer"
+msgstr "إظهار الخالط"
+
+#: src/skins/menus.cc:147 src/skins-qt/menus.cc:140
+msgid "Show Remaining Time"
+msgstr "إظهار الوقت المتبقي"
+
+#: src/skins/menus.cc:150 src/skins-qt/menus.cc:143
+msgid "Always on Top"
+msgstr "دائما فوق الكل"
+
+#: src/skins/menus.cc:151 src/skins-qt/menus.cc:145
+msgid "On All Workspaces"
+msgstr "على كل اسطح المكتب"
+
+#: src/skins/menus.cc:153 src/skins-qt/menus.cc:148
+msgid "Roll Up Player"
+msgstr "ظلل المشغل"
+
+#: src/skins/menus.cc:154 src/skins-qt/menus.cc:149
+msgid "Roll Up Playlist Editor"
+msgstr "ظلل قائمة التشغيل"
+
+#: src/skins/menus.cc:155 src/skins-qt/menus.cc:150
+msgid "Roll Up Equalizer"
+msgstr "ظلل الخاط"
+
+#: src/skins/menus.cc:163 src/skins-qt/menus.cc:158
+msgid "Add URL ..."
+msgstr "أضف رابط ..."
+
+#: src/skins/menus.cc:164 src/skins-qt/menus.cc:160
+msgid "Add Files ..."
+msgstr "أضف ملفات ..."
+
+#: src/skins/menus.cc:168 src/skins/menus.cc:196 src/skins/menus.cc:212
+#: src/skins-qt/menus.cc:164 src/skins-qt/menus.cc:192
+#: src/skins-qt/menus.cc:208
+msgid "By Title"
+msgstr "حسب العنوان"
+
+#: src/skins/menus.cc:169 src/skins/menus.cc:203 src/skins/menus.cc:219
+#: src/skins-qt/menus.cc:165 src/skins-qt/menus.cc:199
+#: src/skins-qt/menus.cc:215
+msgid "By File Name"
+msgstr "حسب إسم الملف"
+
+#: src/skins/menus.cc:170 src/skins/menus.cc:204 src/skins/menus.cc:220
+#: src/skins-qt/menus.cc:166 src/skins-qt/menus.cc:200
+#: src/skins-qt/menus.cc:216
+msgid "By File Path"
+msgstr "حسب مسار الملف"
+
+#: src/skins/menus.cc:176 src/skins-qt/menus.cc:172
+msgid "Remove All"
+msgstr "حذف الكل"
+
+#: src/skins/menus.cc:177 src/skins-qt/menus.cc:173
+msgid "Clear Queue"
+msgstr "مسح قائمة انتظار"
+
+#: src/skins/menus.cc:179 src/skins-qt/menus.cc:175
+msgid "Remove Unavailable Files"
+msgstr "إزالة الملفات غير متوفر"
+
+#: src/skins/menus.cc:180 src/skins-qt/menus.cc:176
+msgid "Remove Duplicates"
+msgstr "ازالة المكررة"
+
+#: src/skins/menus.cc:182 src/skins-qt/menus.cc:178
+msgid "Remove Unselected"
+msgstr "حذف الغير محددة"
+
+#: src/skins/menus.cc:183 src/skins-qt/menus.cc:179
+msgid "Remove Selected"
+msgstr "حذف المحددة"
+
+#: src/skins/menus.cc:187 src/skins-qt/menus.cc:183
+msgid "Search and Select"
+msgstr "ابحث و حدد"
+
+#: src/skins/menus.cc:189 src/skins-qt/menus.cc:185
+msgid "Invert Selection"
+msgstr "عكس التحديد"
+
+#: src/skins/menus.cc:190 src/skins-qt/menus.cc:186
+msgid "Select None"
+msgstr "لا تحدد شيء"
+
+#: src/skins/menus.cc:191 src/skins-qt/menus.cc:187
+msgid "Select All"
+msgstr "تحديد الكل"
+
+#: src/skins/menus.cc:195 src/skins/menus.cc:211 src/skins-qt/menus.cc:191
+#: src/skins-qt/menus.cc:207
+msgid "By Track Number"
+msgstr "حسب رقم المقطع"
+
+#: src/skins/menus.cc:197 src/skins/menus.cc:213 src/skins-qt/menus.cc:193
+#: src/skins-qt/menus.cc:209
+msgid "By Artist"
+msgstr "حسب المؤدي"
+
+#: src/skins/menus.cc:198 src/skins/menus.cc:214 src/skins-qt/menus.cc:194
+#: src/skins-qt/menus.cc:210
+msgid "By Album"
+msgstr "حسب الألبوم"
+
+#: src/skins/menus.cc:199 src/skins/menus.cc:215 src/skins-qt/menus.cc:195
+#: src/skins-qt/menus.cc:211
+msgid "By Album Artist"
+msgstr "حسب الالبوم المؤدي"
+
+#: src/skins/menus.cc:200 src/skins/menus.cc:216 src/skins-qt/menus.cc:196
+#: src/skins-qt/menus.cc:212
+msgid "By Release Date"
+msgstr "حسب تاريخ الإصدار"
+
+#: src/skins/menus.cc:201 src/skins/menus.cc:217 src/skins-qt/menus.cc:197
+#: src/skins-qt/menus.cc:213
+msgid "By Genre"
+msgstr "حسب النوع"
+
+#: src/skins/menus.cc:202 src/skins/menus.cc:218 src/skins-qt/menus.cc:198
+#: src/skins-qt/menus.cc:214
+msgid "By Length"
+msgstr "حسب الطول"
+
+#: src/skins/menus.cc:205 src/skins/menus.cc:221 src/skins-qt/menus.cc:201
+#: src/skins-qt/menus.cc:217
+msgid "By Custom Title"
+msgstr "حسب العنوان المخصص"
+
+#: src/skins/menus.cc:206 src/skins/menus.cc:222 src/skins-qt/menus.cc:202
+#: src/skins-qt/menus.cc:218
+msgid "By Comment"
+msgstr "حسب التعليق"
+
+#: src/skins/menus.cc:207 src/skins/menus.cc:223 src/skins-qt/menus.cc:203
+#: src/skins-qt/menus.cc:219
+msgid "By Disc Number"
+msgstr ""
+
+#: src/skins/menus.cc:227 src/skins-qt/menus.cc:223
+msgid "Randomize List"
+msgstr "قائمة عشوائية"
+
+#: src/skins/menus.cc:228 src/skins-qt/menus.cc:224
+msgid "Reverse List"
+msgstr "عكس القائمة"
+
+#: src/skins/menus.cc:230 src/skins-qt/menus.cc:226
+msgid "Sort Selected"
+msgstr "عرض المحدد"
+
+#: src/skins/menus.cc:231 src/skins-qt/menus.cc:227
+msgid "Sort List"
+msgstr "عرض القائمة"
+
+#: src/skins/menus.cc:236 src/skins-qt/menus.cc:232
+msgid "Open Containing Folder"
+msgstr "فتح المجلد المحتوي"
+
+#: src/skins/menus.cc:238 src/skins-qt/menus.cc:234
+msgid "Cut"
+msgstr "قص"
+
+#: src/skins/menus.cc:239 src/skins-qt/menus.cc:235
+msgid "Copy"
+msgstr "نسخ"
+
+#: src/skins/menus.cc:240 src/skins-qt/menus.cc:236
+msgid "Paste"
+msgstr "لصق"
+
+#: src/skins/menus.cc:241 src/skins-qt/menus.cc:237
+msgid "Paste at End"
+msgstr "لصق عند الانتهاء"
+
+#: src/skins/menus.cc:243 src/skins-qt/menus.cc:239
+msgid "Queue/Unqueue"
+msgstr "اضف/ازل من قائمة الانتظار"
+
+#: src/skins/playlist-widget.cc:58 src/skins-qt/playlist-widget.cc:58
+#, c-format
+msgid "%s (%d of %d)"
+msgstr "%s (%d الى %d)"
+
+#: src/skins/playlistwin.cc:491 src/skins-qt/playlistwin.cc:478
+msgid "Audacious Playlist Editor"
+msgstr "محرر قائمة أوداشيَس"
+
+#: src/skins/plugin.cc:53 src/skins-qt/plugin.cc:65
+msgid "Winamp Classic Interface"
+msgstr "مظهر Winamp الكلاسيكي"
+
+#: src/skins-qt/menus.cc:75
+msgid "Open Folder ..."
+msgstr "افتح مجلد ..."
+
+#: src/skins-qt/menus.cc:159
+msgid "Add Folder ..."
+msgstr "اضافة مجلد..."
+
+#: src/skins-qt/search-select.cc:62 src/skins/search-select.cc:77
+msgid "Search entries in active playlist"
+msgstr "بحث عن مدخلة في قائمة التشغيل النشطة"
+
+#: src/skins-qt/search-select.cc:70 src/skins/search-select.cc:83
+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-qt/search-select.cc:75 src/skins/search-select.cc:91
+msgid "Title:"
+msgstr "العنوان:"
+
+#: src/skins-qt/search-select.cc:79 src/skins/search-select.cc:96
+msgid "Album:"
+msgstr "الألبوم:"
+
+#: src/skins-qt/search-select.cc:82 src/skins/search-select.cc:101
+msgid "Artist:"
+msgstr "المؤدي:"
+
+#: src/skins-qt/search-select.cc:85 src/skins/search-select.cc:106
+msgid "File Name:"
+msgstr "اسم الملف:"
+
+#: src/skins-qt/search-select.cc:88 src/skins/search-select.cc:134
+msgid "Clear previous selection before searching"
+msgstr "مسح التحديد السابقة قبل البحث"
+
+#: src/skins-qt/search-select.cc:89 src/skins/search-select.cc:137
+msgid "Automatically toggle queue for matching entries"
+msgstr "تبديل تلقائيا لقائمة الانتظار لمطابقة الإدخالات"
+
+#: src/skins-qt/search-select.cc:90 src/skins/search-select.cc:140
+msgid "Create a new playlist with matching entries"
+msgstr "إنشاء قائمة تشغيل جديدة مع إدخالات مطابقة"
+
+#: src/skins-qt/search-select.cc:101 src/skins/search-select.cc:78
+msgid "Search"
+msgstr "بحث"
+
+#: src/skins-qt/skins_cfg.cc:198 src/skins/skins_cfg.cc:182
+msgid "Player:"
+msgstr "مشغل:"
+
+#: src/skins-qt/skins_cfg.cc:200 src/skins/skins_cfg.cc:184
+msgid "Select main player window font:"
+msgstr "حدد الخط الرئيسي لنافذة التشغيل:"
+
+#: src/skins-qt/skins_cfg.cc:201 src/skins/skins_cfg.cc:185
+msgid "Playlist:"
+msgstr "قائمة التشغيل:"
+
+#: src/skins-qt/skins_cfg.cc:203 src/skins/skins_cfg.cc:187
+msgid "Select playlist font:"
+msgstr "كحدد خط قائمة التشغيل"
+
+#: src/skins-qt/skins_cfg.cc:207 src/skins/skins_cfg.cc:191
+msgid "Skin"
+msgstr "المظهر"
+
+#: src/skins-qt/skins_cfg.cc:211 src/skins/skins_cfg.cc:193
+msgid "Display active titlebar when any window is focused"
+msgstr "اعرِض شريط العنوان النشط عندما تكون أية نافذة مستحوِذة"
+
+#: src/skins-qt/skins_cfg.cc:213 src/skins/skins_cfg.cc:195
+msgid "Fonts"
+msgstr "خطوط"
+
+#: src/skins-qt/skins_cfg.cc:215 src/skins/skins_cfg.cc:197
+msgid "Use bitmap fonts (supports ASCII only)"
+msgstr "استخدم صورة خطوط (supports ASCII only)"
+
+#: src/skins-qt/skins_cfg.cc:217 src/skins/skins_cfg.cc:199
+msgid "Scroll song title"
+msgstr "تمرير عنوان المقطع"
+
+#: src/skins-qt/skins_cfg.cc:219 src/skins/skins_cfg.cc:201
+msgid "Scroll song title in both directions"
+msgstr "تمرير عنوان المقطع في كلا الاتجاهين"
+
+#: src/skins-qt/skins_cfg.cc:224 src/skins/skins_cfg.cc:206
+msgid "Analyzer"
+msgstr "محلل"
+
+#: src/skins-qt/skins_cfg.cc:225 src/skins/skins_cfg.cc:207
+msgid "Scope"
+msgstr "نطاق"
+
+#: src/skins-qt/skins_cfg.cc:226 src/skins/skins_cfg.cc:208
+msgid "Voiceprint / VU meter"
+msgstr "Voiceprint / VU meter"
+
+#: src/skins-qt/skins_cfg.cc:227 src/skins/skins_cfg.cc:209
+msgid "Off"
+msgstr "إيقاف"
+
+#: src/skins-qt/skins_cfg.cc:231 src/skins-qt/skins_cfg.cc:256
+#: src/skins-qt/skins_cfg.cc:262 src/skins/skins_cfg.cc:213
+#: src/skins/skins_cfg.cc:238 src/skins/skins_cfg.cc:244
+msgid "Normal"
+msgstr "عادي"
+
+#: src/skins-qt/skins_cfg.cc:232 src/skins-qt/skins_cfg.cc:257
+#: src/skins/skins_cfg.cc:214 src/skins/skins_cfg.cc:239
+msgid "Fire"
+msgstr "ناري"
+
+#: src/skins-qt/skins_cfg.cc:233 src/skins/skins_cfg.cc:215
+msgid "Vertical lines"
+msgstr "خطوط افقية"
+
+#: src/skins-qt/skins_cfg.cc:237 src/skins/skins_cfg.cc:219
+msgid "Lines"
+msgstr "خطوط"
+
+#: src/skins-qt/skins_cfg.cc:238 src/skins/skins_cfg.cc:220
+msgid "Bars"
+msgstr "اشرطة"
+
+#: src/skins-qt/skins_cfg.cc:242 src/skins/skins_cfg.cc:224
+msgid "Slowest"
+msgstr "أبطأ"
+
+#: src/skins-qt/skins_cfg.cc:243 src/skins/skins_cfg.cc:225
+msgid "Slow"
+msgstr "بطيء"
+
+#: src/skins-qt/skins_cfg.cc:244 src/skins/skins_cfg.cc:226
+#: src/soxr/sox-resampler.cc:180
+msgid "Medium"
+msgstr "متوسطة"
+
+#: src/skins-qt/skins_cfg.cc:245 src/skins/skins_cfg.cc:227
+msgid "Fast"
+msgstr "سرعة"
+
+#: src/skins-qt/skins_cfg.cc:246 src/skins/skins_cfg.cc:228
+msgid "Fastest"
+msgstr "أسرع"
+
+#: src/skins-qt/skins_cfg.cc:250 src/skins/skins_cfg.cc:232
+msgid "Dots"
+msgstr "النقاط"
+
+#: src/skins-qt/skins_cfg.cc:251 src/skins/skins_cfg.cc:233
+msgid "Line"
+msgstr "خط"
+
+#: src/skins-qt/skins_cfg.cc:252 src/skins/skins_cfg.cc:234
+msgid "Solid"
+msgstr "صلب"
+
+#: src/skins-qt/skins_cfg.cc:258 src/skins/skins_cfg.cc:240
+msgid "Ice"
+msgstr "جليد"
+
+#: src/skins-qt/skins_cfg.cc:263 src/skins/skins_cfg.cc:245
+msgid "Smooth"
+msgstr "ناعم"
+
+#: src/skins-qt/skins_cfg.cc:267 src/skins/skins_cfg.cc:249
+msgid "Coloring:"
+msgstr "تلوين:"
+
+#: src/skins-qt/skins_cfg.cc:270 src/skins/skins_cfg.cc:252
+msgid "Style:"
+msgstr "نمط:"
+
+#: src/skins-qt/skins_cfg.cc:273 src/skins/skins_cfg.cc:255
+msgid "Falloff:"
+msgstr "سقوط"
+
+#: src/skins-qt/skins_cfg.cc:276 src/skins/skins_cfg.cc:258
+msgid "Peak falloff:"
+msgstr "سقوط الذروة:"
+
+#: src/skins-qt/skins_cfg.cc:282 src/skins/skins_cfg.cc:264
+msgid "Scope Style:"
+msgstr "نمط النطاق:"
+
+#: src/skins-qt/skins_cfg.cc:285 src/skins/skins_cfg.cc:267
+msgid "Voiceprint Coloring:"
+msgstr "تلوين Voiceprint"
+
+#: src/skins-qt/skins_cfg.cc:288 src/skins/skins_cfg.cc:270
+msgid "VU Meter Style:"
+msgstr "نمط ميتر"
+
+#: src/skins-qt/skins_cfg.cc:294 src/skins/skins_cfg.cc:276
+msgid "Type"
+msgstr "النمط"
+
+#: src/skins-qt/skins_cfg.cc:295 src/skins/skins_cfg.cc:277
+msgid "Visualization type:"
+msgstr "نوع مرئيات:"
+
+#: src/skins-qt/skins_cfg.cc:298 src/skins/skins_cfg.cc:280
+msgid "Analyzer"
+msgstr "محلل"
+
+#: src/skins-qt/skins_cfg.cc:299 src/skins/skins_cfg.cc:281
+msgid "Show peaks"
+msgstr "اظهار القمة"
+
+#: src/skins-qt/skins_cfg.cc:308 src/skins/skins_cfg.cc:290
+msgid "Visualization"
+msgstr "مرئيات"
+
+#: src/skins-qt/skinselector.cc:98 src/skins/skinselector.cc:111
+msgid "Archived Winamp 2.x skin"
+msgstr "ارشفة مظهر Winamp 2.x "
+
+#: src/skins-qt/skinselector.cc:102 src/skins/skinselector.cc:115
+msgid "Unarchived Winamp 2.x skin"
+msgstr "إلغاء أرشفة مظهر Winamp 2.x "
+
+#: src/sndfile/plugin.cc:38
+msgid "Sndfile Plugin"
+msgstr "Sndfile اضافة"
+
+#: src/sndfile/plugin.cc:372
+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:\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."
+
+#: src/sndio/sndio.cc:43
+msgid "Sndio Output"
+msgstr "Sndio مخرج"
+
+#: src/sndio/sndio.cc:98
+msgid "Device (blank for default):"
+msgstr "الجهاز (فارغ لالافتراضي):"
+
+#: src/sndio/sndio.cc:100
+msgid "Save and restore volume:"
+msgstr "حفظ واستعادة حجم الصوت"
+
+#: src/sndio/sndio.cc:181
+#, c-format
+msgid "Sndio error: Unsupported audio format (%d)"
+msgstr "Sndio خطأ: تنسيق الصوت غير معتمد (%d)"
+
+#: src/sndio/sndio.cc:192
+msgid "Sndio error: sio_open() failed"
+msgstr "Sndio خطأ: sio_open() فشل"
+
+#: src/sndio/sndio.cc:221
+msgid "Sndio error: sio_setpar() failed"
+msgstr "Sndio خطأ: sio_setpar() فشل"
+
+#: src/sndio/sndio.cc:233
+msgid "Sndio error: sio_start() failed"
+msgstr "Sndio خطأ: sio_start() فشل"
+
+#: src/songchange/song_change.cc:30
+msgid "Song Change"
+msgstr "تغير المقطوعة الصوتية"
+
+#: src/songchange/song_change.cc:256
+msgid "Commands"
+msgstr "أوامر"
+
+#: src/songchange/song_change.cc:258
+msgid "Command to run when starting a new song:"
+msgstr "الأوامر لتشغيل عند بدء مقطوعة جديدة:"
+
+#: src/songchange/song_change.cc:261
+msgid "Command to run when stopping a song:"
+msgstr ""
+
+#: src/songchange/song_change.cc:264
+msgid "Command to run at the end of a song:"
+msgstr "امر لتشغيل في نهاية تشغيل المقطوعة:"
+
+#: src/songchange/song_change.cc:267
+msgid "Command to run at the end of the playlist:"
+msgstr "امر لتشغيل في نهاية قائمة التشغيل:"
+
+#: src/songchange/song_change.cc:270
+msgid "Command to run when song title changes (for network streams):"
+msgstr "اوامر لتشغيل عند تغيير عنوان الأغنية (لتدفق الشبكة):"
+
+#: src/songchange/song_change.cc:273
+msgid ""
+"You can use the following format codes, which will be replaced before "
+"running the command.\n"
+"Not all are useful though for the song-stopped or end-of-playlist command."
+msgstr ""
+
+#: src/songchange/song_change.cc:276
+msgid ""
+"%a: Artist\n"
+"%b: Album\n"
+"%c: Number of channels\n"
+"%f: File name (full path)\n"
+"%F: Frequency (Hertz)\n"
+"%l: Length (milliseconds)\n"
+"%n or %s: Formatted title (see playlist settings)\n"
+"%p: Currently playing (1 or 0)\n"
+"%r: Rate (bits per second)\n"
+"%t: Playlist position\n"
+"%T: Title (unformatted)"
+msgstr ""
+"%a: المؤدي\n"
+"%b: الالبوم\n"
+"%c: عدد القنوات\n"
+"%f: اسم الملف (المسار كاملا)\n"
+"%F: التردد (هرتز)\n"
+"%l: الطول (الثانية على الالف)\n"
+"%n أو %s: تنسيق العنوان (انظر اعدادات القائمة)\n"
+"%p: القراءة الحالية (1 or 0)\n"
+"%r: المعدل (بايت في الثانية)\n"
+"%t: وضعية القائمة\n"
+"%T: العنوان (غير منسق)"
+
+#: src/songchange/song_change.cc:287
+msgid ""
+"Parameters passed to the shell should be enclosed in quotation marks.\n"
+"Unquoted parameters may lead to unexpected results."
+msgstr ""
+
+#: src/song-info-qt/song-info.cc:30
+msgid "Song Info"
+msgstr "معلومات المقطوعة"
+
+#: src/soxr/sox-resampler.cc:44
+msgid "SoX Resampler"
+msgstr "SoX إعادة إعداد"
+
+#: src/soxr/sox-resampler.cc:172
+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/soxr/sox-resampler.cc:178
+msgid "Quick"
+msgstr "سريع"
+
+#: src/soxr/sox-resampler.cc:179
+msgid "Low"
+msgstr "منخفض"
+
+#: src/soxr/sox-resampler.cc:181
+msgid "High"
+msgstr "عالي"
+
+#: src/soxr/sox-resampler.cc:182
+msgid "Very High"
+msgstr "عالي جدا"
+
+#: src/soxr/sox-resampler.cc:183
+msgid "Ultra High"
+msgstr "شديد العلوّ"
+
+#: src/soxr/sox-resampler.cc:187
+msgid "Minimum"
+msgstr "الحد الأدنى"
+
+#: src/soxr/sox-resampler.cc:188
+msgid "Intermediate"
+msgstr "متوسط"
+
+#: src/soxr/sox-resampler.cc:193
+msgid "Quality:"
+msgstr "جودة:"
+
+#: src/soxr/sox-resampler.cc:196
+msgid "Phase:"
+msgstr "الطور:"
+
+#: src/soxr/sox-resampler.cc:200
+msgid "Allow aliasing"
+msgstr "السماح بالتعرج"
+
+#: src/soxr/sox-resampler.cc:202
+msgid "Use steep filter"
+msgstr "استخدم تصفية الإنحدار"
+
+#: src/speedpitch/speed-pitch.cc:54
+msgid "Speed and Pitch"
+msgstr "السرعة والنغمة"
+
+#: src/speedpitch/speed-pitch.cc:247
+msgid "Speed"
+msgstr "السرعة"
+
+#: src/speedpitch/speed-pitch.cc:248
+msgid "Decouple from pitch"
+msgstr "فكّ عن الحدّة"
+
+#: src/speedpitch/speed-pitch.cc:250 src/speedpitch/speed-pitch.cc:258
+msgid "Multiplier:"
+msgstr "المضخم:"
+
+#: src/speedpitch/speed-pitch.cc:254
+msgid "Pitch"
+msgstr "الشدة"
+
+#: src/statusicon-qt/statusicon.cc:45 src/statusicon/statusicon.cc:47
+msgid "Status Icon"
+msgstr "ايقونة النظام"
+
+#: src/statusicon-qt/statusicon.cc:68
+msgid ""
+"Status Icon Plugin (partial port for Qt interface)\n"
+"\n"
+"Copyright 2005-2007 Giacomo Lozito <james@develia.org>\n"
+"Copyright 2010 Michał Lipski <tallica@o2.pl>\n"
+"Copyright 2015 Eugene Paskevich <eugene@raptor.kiev.ua>\n"
+"\n"
+"This plugin provides a status icon, placed in\n"
+"the system tray area of the window manager."
+msgstr ""
+"Status Icon Plugin (partial port for Qt interface)\n"
+"\n"
+"Copyright 2005-2007 Giacomo Lozito <james@develia.org>\n"
+"Copyright 2010 Michał Lipski <tallica@o2.pl>\n"
+"Copyright 2015 Eugene Paskevich <eugene@raptor.kiev.ua>\n"
+"\n"
+"This plugin provides a status icon, placed in\n"
+"the system tray area of the window manager."
+
+#: src/statusicon-qt/statusicon.cc:89 src/statusicon/statusicon.cc:384
+msgid "Mouse Scroll Action"
+msgstr "عملية تمرير المؤشر"
+
+#: src/statusicon-qt/statusicon.cc:90 src/statusicon/statusicon.cc:385
+msgid "Change volume"
+msgstr "تغيير الصوت"
+
+#: src/statusicon-qt/statusicon.cc:93 src/statusicon/statusicon.cc:388
+msgid "Change playing song"
+msgstr "تغيير تشغيل المقطوعة"
+
+#: src/statusicon-qt/statusicon.cc:96 src/statusicon/statusicon.cc:391
+msgid "Other Settings"
+msgstr "اعدادات اخرى"
+
+#: src/statusicon-qt/statusicon.cc:97 src/statusicon/statusicon.cc:392
+msgid "Disable the popup window"
+msgstr "تعطيل النافذة المنبثقة"
+
+#: src/statusicon-qt/statusicon.cc:99 src/statusicon/statusicon.cc:394
+msgid "Close to the system tray"
+msgstr "الخروج من علبة النظام"
+
+#: src/statusicon-qt/statusicon.cc:101 src/statusicon/statusicon.cc:396
+msgid "Advance in playlist when scrolling upward"
+msgstr "التقدم في قائمة التشغيل عند التمرير إلى الأعلى"
+
+#: src/statusicon-qt/statusicon.cc:116 src/statusicon/statusicon.cc:287
+msgid "Se_ttings ..."
+msgstr "إع_دادات ..."
+
+#: src/statusicon/statusicon.cc:377
+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 ""
+"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."
+
+#: src/stereo_plugin/stereo.cc:19
+msgid "Extra Stereo"
+msgstr "ستيريو إضافية"
+
+#: src/stereo_plugin/stereo.cc:36
+msgid ""
+"Extra Stereo Plugin\n"
+"\n"
+"By Johan Levin, 1999"
+msgstr ""
+"اضافة ستيريو إضافية\n"
+"\n"
+"بواسطة Johan Levin, 1999"
+
+#: src/stereo_plugin/stereo.cc:44
+msgid "Extra Stereo"
+msgstr "ستيريو إضافية"
+
+#: src/streamtuner/icecast-model.cc:126 src/streamtuner/shoutcast-model.cc:131
+msgid "Type"
+msgstr "النوع"
+
+#: src/streamtuner/icecast-model.cc:132
+msgid "Current Song"
+msgstr "المقطع الحالي"
+
+#: src/streamtuner/icecast-model.cc:164
+msgid "Other"
+msgstr "آخر"
+
+#: src/streamtuner/ihr-model.cc:63
+msgid "Market"
+msgstr "السوق"
+
+#: src/streamtuner/ihr-model.cc:156
+msgid "Call Letters"
+msgstr "حروف اتصال"
+
+#: src/streamtuner/ihr-model.cc:162
+msgid "Description"
+msgstr "الوصف"
+
+#: src/streamtuner/shoutcast-model.cc:128
+msgid "Listeners"
+msgstr "المستمعون"
+
+#: src/streamtuner/shoutcast-model.cc:188
+msgid "Top 500 Stations"
+msgstr "أعلى 500 محطة"
+
+#: src/streamtuner/shoutcast-model.cc:189
+msgid "Alternative"
+msgstr "البديل"
+
+#: src/streamtuner/shoutcast-model.cc:190
+msgid "Blues"
+msgstr "بلوز"
+
+#: src/streamtuner/shoutcast-model.cc:191
+msgid "Classical"
+msgstr "كلاسيكي"
+
+#: src/streamtuner/shoutcast-model.cc:192
+msgid "Country"
+msgstr "ريفي"
+
+#: src/streamtuner/shoutcast-model.cc:193
+msgid "Decades"
+msgstr "العقود"
+
+#: src/streamtuner/shoutcast-model.cc:194
+msgid "Easy Listening"
+msgstr "استماع سهل"
+
+#: src/streamtuner/shoutcast-model.cc:195
+msgid "Electronic"
+msgstr "الكتروني"
+
+#: src/streamtuner/shoutcast-model.cc:196
+msgid "Folk"
+msgstr "قوم"
+
+#: src/streamtuner/shoutcast-model.cc:197
+msgid "Inspirational"
+msgstr "إلهامي"
+
+#: src/streamtuner/shoutcast-model.cc:198
+msgid "International"
+msgstr "دولي"
+
+#: src/streamtuner/shoutcast-model.cc:199
+msgid "Jazz"
+msgstr "جاز"
+
+#: src/streamtuner/shoutcast-model.cc:200
+msgid "Latin"
+msgstr "لاتيني"
+
+#: src/streamtuner/shoutcast-model.cc:201
+msgid "Metal"
+msgstr "ميتال"
+
+#: src/streamtuner/shoutcast-model.cc:203
+msgid "New Age"
+msgstr "عصر جديد"
+
+#: src/streamtuner/shoutcast-model.cc:204
+msgid "Pop"
+msgstr "بوب"
+
+#: src/streamtuner/shoutcast-model.cc:205
+msgid "Public Radio"
+msgstr "راديو عام"
+
+#: src/streamtuner/shoutcast-model.cc:206
+msgid "R&B and Urban"
+msgstr "R&B وحضري"
+
+#: src/streamtuner/shoutcast-model.cc:207
+msgid "Rap"
+msgstr "راب"
+
+#: src/streamtuner/shoutcast-model.cc:208
+msgid "Reggae"
+msgstr "ريڭي"
+
+#: src/streamtuner/shoutcast-model.cc:209
+msgid "Rock"
+msgstr "روك"
+
+#: src/streamtuner/shoutcast-model.cc:210
+msgid "Seasonal and Holiday"
+msgstr "فصلي وعطلات"
+
+#: src/streamtuner/shoutcast-model.cc:211
+msgid "Soundtracks"
+msgstr "مقاطع صوتية"
+
+#: src/streamtuner/shoutcast-model.cc:212
+msgid "Talk"
+msgstr "حديث"
+
+#: src/streamtuner/shoutcast-model.cc:213
+msgid "Themes"
+msgstr "سِمات"
+
+#: src/streamtuner/streamtuner.cc:59
+msgid "Shoutcast"
+msgstr "شاوتكاست Shoutcast"
+
+#: src/streamtuner/streamtuner.cc:60
+msgid "Icecast"
+msgstr "آيسكاست Icecast"
+
+#: src/streamtuner/streamtuner.cc:71
+msgid "Stream Tuner"
+msgstr "منعّم الدفق"
+
+#: src/tonegen/tonegen.cc:45
+msgid "Tone Generator"
+msgstr "مولد النغمة"
+
+#: src/tonegen/tonegen.cc:92
+#, c-format
+msgid "%s %.1f Hz"
+msgstr "%s %.1f هرتز"
+
+#: src/tonegen/tonegen.cc:92
+msgid "Tone Generator: "
+msgstr "مولد النغمة"
+
+#: src/tonegen/tonegen.cc:161
+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>\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"
+
+#: src/ui-common/dialogs-qt.cc:40
+msgid ""
+"\n"
+"(Further messages have been hidden.)"
+msgstr ""
+"\n"
+"(تنبيهات أخرى تم إخفائها.)"
+
+#: src/ui-common/dialogs-qt.cc:52
+msgid "Working ..."
+msgstr "جاري العمل..."
+
+#: src/ui-common/dialogs-qt.cc:73
+msgid "Information"
+msgstr "معلومات"
+
+#: src/ui-common/menu-ops-gtk.cc:132 src/ui-common/menu-ops-qt.cc:113
+#, c-format
+msgid "%s does not appear to be a valid folder."
+msgstr "%s لا يبدو مجلداً صحيحًا."
+
+#: src/voice_removal/voice_removal.cc:28
+msgid "Voice Removal"
+msgstr "إزالة صوت"
+
+#: src/vorbis/vorbis.cc:433
+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 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.h:18
+msgid "Ogg Vorbis Decoder"
+msgstr "Ogg Vorbis مفكك"
+
+#: src/vtx/info.cc:24
+#, c-format
+msgid "Details about %s"
+msgstr " تفاصيل حول %s"
+
+#: src/vtx/info.cc:26
+msgid ""
+"Title: %t\n"
+"Author: %a\n"
+"From: %f\n"
+"Tracker: %T\n"
+"Comment: %C\n"
+"Chip type: %c\n"
+"Stereo: %s\n"
+"Loop: %l\n"
+"Chip freq: %F\n"
+"Player Freq: %P\n"
+"Year: %y"
+msgstr ""
+"العنوان: %t\n"
+"المؤلف: %a\n"
+"من عند: %f\n"
+"Tracker: %T\n"
+"التعليق: %C\n"
+"نوع الرقاقة: %c\n"
+"ستيريو: %s\n"
+"حلقة: %l\n"
+"تردد الرقاقة: %F\n"
+"تكرار القراءة: %P\n"
+"عام: %y"
+
+#: src/vtx/vtx.cc:38
+msgid "VTX Decoder"
+msgstr "VTX مفكك"
+
+#: src/vtx/vtx.cc:178
+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/vumeter-qt/vumeter_qt.cc:31
+msgid ""
+"VU Meter Plugin for Audacious\n"
+"Copyright 2017-2019 Marc Sánchez Fauste"
+msgstr ""
+"ملحَقة مقياس VU لأوداشيَس\n"
+"حقوق النشر 2017-2019 لـ Marc Sánchez Fauste"
+
+#: src/vumeter-qt/vumeter_qt.cc:35
+msgid "VU Meter Settings"
+msgstr "إعدادات مقياس VU"
+
+#: src/vumeter-qt/vumeter_qt.cc:37
+msgid "Peak hold time:"
+msgstr "وقت إبقاء الذروة:"
+
+#: src/vumeter-qt/vumeter_qt.cc:42
+msgid "Fall-off time:"
+msgstr "وقت النزول:"
+
+#: src/vumeter-qt/vumeter_qt.cc:44
+msgid "dB/second"
+msgstr "ديسبل/ثانية"
+
+#: src/vumeter-qt/vumeter_qt.cc:46
+msgid "Display legend"
+msgstr "مفاتيح تعريف العَرض"
+
+#: src/vumeter-qt/vumeter_qt.h:37
+msgid "VU Meter"
+msgstr "مقياس VU"
+
+#: src/waveout/waveout.cc:43
+msgid "Win32 waveOut"
+msgstr "Win32 waveOut"
+
+#: src/waveout/waveout.cc:69
+msgid ""
+"Win32 waveOut Plugin for Audacious\n"
+"Copyright 2016 John Lindgren"
+msgstr ""
+"Win32 waveOut Plugin for Audacious\n"
+"Copyright 2016 John Lindgren"
+
+#: src/wavpack/wavpack.cc:25
+msgid "WavPack Decoder"
+msgstr "WavPack فك"
+
+#: src/wavpack/wavpack.cc:217
+msgid "lossy (hybrid)"
+msgstr "lossy (hybrid)"
+
+#: src/wavpack/wavpack.cc:219
+msgid "lossy"
+msgstr "lossy"
+
+#: src/wavpack/wavpack.cc:259
+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/xsf/plugin.cc:74
+msgid "2SF Decoder"
+msgstr "2SF مفكك"
+
+#: src/xsf/plugin.cc:429
+msgid "32728 Hz"
+msgstr "32728 هرتز"
+
+#: src/xsf/plugin.cc:432
+msgid "65456 Hz"
+msgstr "65456 هرتز"
+
+#: src/xsf/plugin.cc:438
+msgid "Cosine"
+msgstr "جيب تمام"
+
+#: src/xsf/plugin.cc:439
+msgid "Sharp"
+msgstr "حادّ"
+
+#: src/xsf/plugin.cc:443
+msgid "XSF Configuration"
+msgstr "XSF خيارات"
+
+#: src/xsf/plugin.cc:445
+msgid "Default fade time:"
+msgstr "وقت التلاشي المبدئي:"
+
+#: src/xsf/plugin.cc:447
+msgid "Interpolation mode:"
+msgstr "نمط الاستيفاء:"
+
+#: src/xspf/xspf.cc:95
+msgid "XML Shareable Playlists (XSPF)"
+msgstr "قوائم تشغيل XML قابلة للمشاركة (XSPF)"

audacious-plugins-3.6.2-gtk3.tar.bz2/po/audacious-plugins.pot -> audacious-plugins-4.4.1.tar.bz2/po/audacious-plugins.pot Changed

@@ -7,8 +7,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: http://redmine.audacious-media-player.org/\n"
-"POT-Creation-Date: 2015-05-30 15:52+0200\n"
+"Report-Msgid-Bugs-To: https://github.com/audacious-media-player/audacious/"
+"issues\n"
+"POT-Creation-Date: 2024-09-26 21:54+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,239 +19,60 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#: src/aac-raw/aac.cc:18
+#: src/aac/aac.cc:19
 msgid "AAC (Raw) Decoder"
 msgstr ""
 
-#: src/adplug/adplug-xmms.cc:42
+#: src/adplug/adplug-xmms.cc:70
 msgid "AdPlug (AdLib Player)"
 msgstr ""
 
-#: src/adplug/adplug-xmms.cc:156 src/modplug/modplugbmp.cc:335
-#: src/psf/plugin.cc:138 src/vtx/vtx.cc:87 src/xsf/plugin.cc:113
+#: src/adplug/adplug-xmms.cc:167 src/modplug/modplugbmp.cc:321
+#: src/psf/plugin.cc:161 src/vtx/vtx.cc:89 src/xsf/plugin.cc:204
 msgid "sequenced"
 msgstr ""
 
-#: src/alarm/alarm.cc:55 src/alarm/interface.cc:82
-msgid "Alarm"
-msgstr ""
-
-#: src/alarm/alarm.cc:782
-msgid "Set Alarm ..."
-msgstr ""
-
-#: src/alarm/alarm.cc:810
-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/interface.cc: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.cc: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.cc: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.cc:81
-msgid "This is your wakeup call."
-msgstr ""
-
-#: src/alarm/interface.cc:99
-msgid "Your reminder for today is..."
-msgstr ""
-
-#: src/alarm/interface.cc:101 src/alarm/interface.cc:386
-msgid "Reminder"
-msgstr ""
-
-#: src/alarm/interface.cc:132
-msgid "Monday"
-msgstr ""
-
-#: src/alarm/interface.cc:132
-msgid "Tuesday"
-msgstr ""
-
-#: src/alarm/interface.cc:132
-msgid "Wednesday"
-msgstr ""
-
-#: src/alarm/interface.cc:133
-msgid "Thursday"
-msgstr ""
-
-#: src/alarm/interface.cc:133
-msgid "Friday"
-msgstr ""
-
-#: src/alarm/interface.cc:133
-msgid "Saturday"
-msgstr ""
-
-#: src/alarm/interface.cc:133
-msgid "Sunday"
-msgstr ""
-
-#: src/alarm/interface.cc:171 src/alarm/interface.cc:230
-#: src/alarm/interface.cc:245
-msgid "Time"
-msgstr ""
-
-#: src/alarm/interface.cc:178
-msgid "Alarm at (default):"
-msgstr ""
-
-#: src/alarm/interface.cc:200
-msgid "h"
-msgstr ""
-
-#: src/alarm/interface.cc:203
-msgid "Quiet after:"
-msgstr ""
-
-#: src/alarm/interface.cc:215
-msgid "hours"
-msgstr ""
-
-#: src/alarm/interface.cc:226
-msgid "minutes"
-msgstr ""
-
-#: src/alarm/interface.cc:235
-msgid "Choose the days for the alarm to come on"
-msgstr ""
-
-#: src/alarm/interface.cc:242
-msgid "Day"
-msgstr ""
-
-#: src/alarm/interface.cc:259 src/bs2b/plugin.cc:130
-#: src/skins/preset-list.cc:434 src/skins/preset-list.cc:440
-msgid "Default"
-msgstr ""
-
-#: src/alarm/interface.cc:288
-msgid "Days"
-msgstr ""
-
-#: src/alarm/interface.cc:297
-msgid "Fading"
-msgstr ""
-
-#: src/alarm/interface.cc:305 src/console/plugin.cc:41
-#: src/crossfade/crossfade.cc:53 src/crossfade/crossfade.cc:59
-#: src/gtkui/settings.cc:49 src/lirc/lirc.cc:397 src/sid/xs_config.cc:85
-#: src/sid/xs_config.cc:94 src/sid/xs_config.cc:103
-msgid "seconds"
-msgstr ""
-
-#: src/alarm/interface.cc:312 src/alarm/interface.cc:353
-msgid "Volume"
-msgstr ""
-
-#: src/alarm/interface.cc:317
-msgid "Start at"
-msgstr ""
-
-#: src/alarm/interface.cc:333
-msgid "Final"
-msgstr ""
-
-#: src/alarm/interface.cc:346
-msgid "Current"
-msgstr ""
-
-#: src/alarm/interface.cc:359
-msgid "Additional Command"
-msgstr ""
-
-#: src/alarm/interface.cc:365 src/alarm/interface.cc:391
-msgid "enable"
+#: src/adplug/adplug-xmms.cc:349 src/sid/xs_config.cc:61
+msgid "Output"
 msgstr ""
 
-#: src/alarm/interface.cc:372
-msgid "Playlist (optional)"
+#: src/adplug/adplug-xmms.cc:350
+msgid "OPL Emulator:"
 msgstr ""
 
-#: src/alarm/interface.cc:379
-msgid "Select a playlist"
+#: src/adplug/adplug-xmms.cc:353 src/amidiplug/i_configure.cc:153
+#: src/console/plugin.cc:45 src/filewriter/filewriter.cc:481
+#: src/sid/xs_config.cc:65 src/xsf/plugin.cc:446
+msgid "Sample rate:"
 msgstr ""
 
-#: src/alarm/interface.cc:399
-msgid "Options"
+#: src/adplug/adplug-xmms.cc:354 src/amidiplug/i_configure.cc:155
+#: src/bs2b/plugin.cc:141 src/console/plugin.cc:47
+#: src/modplug/plugin_main.cc:77 src/resample/resample.cc:201
+#: src/resample/resample.cc:207 src/resample/resample.cc:211
+#: src/resample/resample.cc:215 src/resample/resample.cc:219
+#: src/resample/resample.cc:223 src/resample/resample.cc:227
+#: src/resample/resample.cc:231 src/resample/resample.cc:235
+#: src/resample/resample.cc:239 src/resample/resample.cc:243
+#: src/sid/xs_config.cc:67 src/soxr/sox-resampler.cc:205
+msgid "Hz"
 msgstr ""
 
-#: src/alarm/interface.cc:404
-msgid "What do these options mean?"
+#: src/adplug/adplug-xmms.cc:355 src/gtkui/settings.cc:55
+#: src/modplug/plugin_main.cc:105 src/qtui/settings.cc:85
+#: src/skins-qt/skins_cfg.cc:302 src/skins/skins_cfg.cc:284
+msgid "Miscellaneous"
 msgstr ""
 
-#: src/alarm/interface.cc:420
-msgid "Help"
+#: src/adplug/adplug-xmms.cc:356
+msgid "Repeat song in endless loop"
 msgstr ""
 
-#: src/albumart/albumart.cc:31
+#: src/albumart/albumart.cc:31 src/albumart-qt/albumart.cc:35
 msgid "Album Art"
 msgstr ""
 
-#: src/albumart-qt/albumart.cc:33
-msgid "Album Art (Qt)"
-msgstr ""
-
-#: src/alsa/alsa.h:70
+#: src/alsa/alsa.h:64
 msgid "ALSA Output"
 msgstr ""
 
@@ -287,11 +109,11 @@
 msgid "Mixer element:"
 msgstr ""
 
-#: src/amidi-plug/amidi-plug.cc:41
+#: src/amidiplug/amidi-plug.cc:42
 msgid "AMIDI-Plug (MIDI Player)"
 msgstr ""
 
-#: src/amidi-plug/amidi-plug.cc:437
+#: src/amidiplug/amidi-plug.cc:445
 msgid ""
 "AMIDI-Plug\n"
 "modular MIDI music player\n"
@@ -314,157 +136,156 @@
 "for the good help with alpha testing"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:94
+#: src/amidiplug/i_configure.cc:94
 msgid "Override default gain:"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:102
+#: src/amidiplug/i_configure.cc:102
 msgid "Override default polyphony:"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:110
+#: src/amidiplug/i_configure.cc:110
 msgid "Override default reverb:"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:112 src/amidi-plug/i_configure.cc:120
+#: src/amidiplug/i_configure.cc:112 src/amidiplug/i_configure.cc:120
 msgid "On"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:118
+#: src/amidiplug/i_configure.cc:118
 msgid "Override default chorus:"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:128 src/console/plugin.cc:29
+#: src/amidiplug/i_configure.cc:128 src/console/plugin.cc:29
 msgid "Playback"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:129
+#: src/amidiplug/i_configure.cc:129
 msgid "Transpose:"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:131
+#: src/amidiplug/i_configure.cc:131 src/speedpitch/speed-pitch.cc:257
 msgid "semitones"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:132
+#: src/amidiplug/i_configure.cc:132
 msgid "Drum shift:"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:134
+#: src/amidiplug/i_configure.cc:134
 msgid "note numbers"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:135
+#: src/amidiplug/i_configure.cc:135
 msgid "Skip leading silence"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:137
+#: src/amidiplug/i_configure.cc:137
 msgid "Skip trailing silence"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:141
+#: src/amidiplug/i_configure.cc:141
 msgid "SoundFont"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:143
+#: src/amidiplug/i_configure.cc:148
 msgid "Synthesizer"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:148 src/console/plugin.cc:45
-#: src/sid/xs_config.cc:65
-msgid "Sample rate:"
-msgstr ""
-
-#: src/amidi-plug/i_configure.cc:150 src/bs2b/plugin.cc:141
-#: src/console/plugin.cc:47 src/modplug/plugin_main.cc:78
-#: src/resample/resample.cc:201 src/resample/resample.cc:207
-#: src/resample/resample.cc:211 src/resample/resample.cc:215
-#: src/resample/resample.cc:219 src/resample/resample.cc:223
-#: src/resample/resample.cc:227 src/resample/resample.cc:231
-#: src/resample/resample.cc:235 src/resample/resample.cc:239
-#: src/resample/resample.cc:243 src/sid/xs_config.cc:67
-#: src/sox-resampler/sox-resampler.cc:163
-msgid "Hz"
-msgstr ""
-
-#: src/amidi-plug/i_configure-fluidsynth.cc:52
+#: src/amidiplug/i_configure-fluidsynth.cc:58
+#: src/amidiplug/i_configure-fluidsynth.cc:527
 msgid "AMIDI-Plug - select SoundFont file"
 msgstr ""
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:55 src/filewriter/mp3.cc:658
+#: src/amidiplug/i_configure-fluidsynth.cc:61
 msgid "_Cancel"
 msgstr ""
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:56
+#: src/amidiplug/i_configure-fluidsynth.cc:62
 msgid "_Open"
 msgstr ""
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:225 src/gtkui/columns.cc:46
+#: src/amidiplug/i_configure-fluidsynth.cc:233
+#: src/amidiplug/i_configure-fluidsynth.cc:461
 msgid "File name"
 msgstr ""
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:229
+#: src/amidiplug/i_configure-fluidsynth.cc:237
+#: src/amidiplug/i_configure-fluidsynth.cc:464
 msgid "Size (bytes)"
 msgstr ""
 
-#: src/amidi-plug/i_fileinfo.cc:163
+#: src/amidiplug/i_fileinfo.cc:184
 msgid "Name:"
 msgstr ""
 
-#: src/amidi-plug/i_fileinfo.cc:181
+#: src/amidiplug/i_fileinfo.cc:202
 msgid " MIDI Info "
 msgstr ""
 
-#: src/amidi-plug/i_fileinfo.cc:195
+#: src/amidiplug/i_fileinfo.cc:216
 msgid "Format:"
 msgstr ""
 
-#: src/amidi-plug/i_fileinfo.cc:198
+#: src/amidiplug/i_fileinfo.cc:219
 msgid "Length (msec):"
 msgstr ""
 
-#: src/amidi-plug/i_fileinfo.cc:201
+#: src/amidiplug/i_fileinfo.cc:222
 msgid "No. of Tracks:"
 msgstr ""
 
-#: src/amidi-plug/i_fileinfo.cc:207
+#: src/amidiplug/i_fileinfo.cc:228
 msgid "variable"
 msgstr ""
 
-#: src/amidi-plug/i_fileinfo.cc:209
+#: src/amidiplug/i_fileinfo.cc:230
 msgid "BPM:"
 msgstr ""
 
-#: src/amidi-plug/i_fileinfo.cc:217
+#: src/amidiplug/i_fileinfo.cc:238
 msgid "BPM (wavg):"
 msgstr ""
 
-#: src/amidi-plug/i_fileinfo.cc:220
+#: src/amidiplug/i_fileinfo.cc:241
 msgid "Time Div:"
 msgstr ""
 
-#: src/amidi-plug/i_fileinfo.cc:231
+#: src/amidiplug/i_fileinfo.cc:252
 msgid " MIDI Comments and Lyrics "
 msgstr ""
 
-#: src/amidi-plug/i_fileinfo.cc:278
+#: src/amidiplug/i_fileinfo.cc:299
 msgid "* no comments available in this MIDI file *"
 msgstr ""
 
-#: src/amidi-plug/i_fileinfo.cc:290
+#: src/amidiplug/i_fileinfo.cc:311
 msgid "* no lyrics available in this MIDI file *"
 msgstr ""
 
-#: src/amidi-plug/i_fileinfo.cc:300 src/filewriter/vorbis.cc:197
-#: src/ladspa/plugin.cc:416
+#: src/amidiplug/i_fileinfo.cc:321 src/ladspa/plugin.cc:418
+#: src/ui-common/dialogs-qt.cc:32
 msgid "_Close"
 msgstr ""
 
-#: src/amidi-plug/i_fileinfo.cc:325
+#: src/amidiplug/i_fileinfo.cc:346
 msgid " (invalid UTF-8)"
 msgstr ""
 
-#: src/aosd/aosd.cc:32
+#: src/ampache/ampache.cc:33
+msgid "Ampache Browser"
+msgstr ""
+
+#: src/ampache/ampache.cc:46
+msgid ""
+"Ampache Browser for Audacious\n"
+"http://ampache-browser.org/\n"
+"\n"
+"Copyright (C) Róbert Čerňanský and John Lindgren\n"
+"License: GNU GPLv3"
+msgstr ""
+
+#: src/aosd/aosd.cc:31
 msgid ""
 "Audacious OSD\n"
 "http://www.develia.org/projects.php?p=audacious#aosd\n"
@@ -491,190 +312,186 @@
 msgid "Concave Rectangle"
 msgstr ""
 
-#: src/aosd/aosd_style.cc:69
+#: src/aosd/aosd_style.cc:69 src/openmpt/mptwrap.h:50 src/xsf/plugin.cc:436
 msgid "None"
 msgstr ""
 
-#: src/aosd/aosd_trigger.cc:50
+#: src/aosd/aosd_trigger.cc:49
 msgid "Playback Start"
 msgstr ""
 
-#: src/aosd/aosd_trigger.cc:51
+#: src/aosd/aosd_trigger.cc:50
 msgid "Triggers OSD when a playlist entry is played."
 msgstr ""
 
-#: src/aosd/aosd_trigger.cc:56
+#: src/aosd/aosd_trigger.cc:55
 msgid "Title Change"
 msgstr ""
 
-#: src/aosd/aosd_trigger.cc:57
+#: src/aosd/aosd_trigger.cc:56
 msgid "Triggers OSD when the song title changes (for internet streams)."
 msgstr ""
 
-#: src/aosd/aosd_trigger.cc:62
+#: src/aosd/aosd_trigger.cc:61
 msgid "Pause On"
 msgstr ""
 
-#: src/aosd/aosd_trigger.cc:63
+#: src/aosd/aosd_trigger.cc:62
 msgid "Triggers OSD when playback is paused."
 msgstr ""
 
-#: src/aosd/aosd_trigger.cc:68
+#: src/aosd/aosd_trigger.cc:67
 msgid "Pause Off"
 msgstr ""
 
-#: src/aosd/aosd_trigger.cc:69
+#: src/aosd/aosd_trigger.cc:68
 msgid "Triggers OSD when playback is unpaused."
 msgstr ""
 
-#: src/aosd/aosd_ui.cc:163
+#: src/aosd/aosd_ui.cc:204
 msgid "Placement"
 msgstr ""
 
-#: src/aosd/aosd_ui.cc:196
+#: src/aosd/aosd_ui.cc:241
 msgid "Relative X offset:"
 msgstr ""
 
-#: src/aosd/aosd_ui.cc:203
+#: src/aosd/aosd_ui.cc:245
 msgid "Relative Y offset:"
 msgstr ""
 
-#: src/aosd/aosd_ui.cc:210
+#: src/aosd/aosd_ui.cc:249
 msgid "Max OSD width:"
 msgstr ""
 
-#: src/aosd/aosd_ui.cc:221
+#: src/aosd/aosd_ui.cc:281
 msgid "Multi-Monitor options"
 msgstr ""
 
-#: src/aosd/aosd_ui.cc:225
+#: src/aosd/aosd_ui.cc:285
 msgid "Display OSD using:"
 msgstr ""
 
-#: src/aosd/aosd_ui.cc:227
+#: src/aosd/aosd_ui.cc:287
 msgid "all monitors"
 msgstr ""
 
-#: src/aosd/aosd_ui.cc:230
+#: src/aosd/aosd_ui.cc:290
 #, c-format
 msgid "monitor %i"
 msgstr ""
 
-#: src/aosd/aosd_ui.cc:282
+#: src/aosd/aosd_ui.cc:342
 msgid "Timing (ms)"
 msgstr ""
 
-#: src/aosd/aosd_ui.cc:287
+#: src/aosd/aosd_ui.cc:347
 msgid "Display:"
 msgstr ""
 
-#: src/aosd/aosd_ui.cc:292
+#: src/aosd/aosd_ui.cc:352
 msgid "Fade in:"
 msgstr ""
 
-#: src/aosd/aosd_ui.cc:297
+#: src/aosd/aosd_ui.cc:357
 msgid "Fade out:"
 msgstr ""
 
-#: src/aosd/aosd_ui.cc:361
+#: src/aosd/aosd_ui.cc:442
 msgid "Fonts"
 msgstr ""
 
-#: src/aosd/aosd_ui.cc:368
+#: src/aosd/aosd_ui.cc:449
 #, c-format
 msgid "Font %i:"
 msgstr ""
 
-#: src/aosd/aosd_ui.cc:382
+#: src/aosd/aosd_ui.cc:466
 msgid "Shadow"
 msgstr ""
 
-#: src/aosd/aosd_ui.cc:486
+#: src/aosd/aosd_ui.cc:589
 msgid "Render Style"
 msgstr ""
 
-#: src/aosd/aosd_ui.cc:502
+#: src/aosd/aosd_ui.cc:605
 msgid "Colors"
 msgstr ""
 
-#: src/aosd/aosd_ui.cc:513
+#: src/aosd/aosd_ui.cc:616
 #, c-format
 msgid "Color %i:"
 msgstr ""
 
-#: src/aosd/aosd_ui.cc:600
+#: src/aosd/aosd_ui.cc:714
 msgid "Enable trigger"
 msgstr ""
 
-#: src/aosd/aosd_ui.cc:627
+#: src/aosd/aosd_ui.cc:741
 msgid "Event"
 msgstr ""
 
-#: src/aosd/aosd_ui.cc:655
+#: src/aosd/aosd_ui.cc:768
 msgid "Composite manager detected"
 msgstr ""
 
-#: src/aosd/aosd_ui.cc:662
+#: src/aosd/aosd_ui.cc:775
 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.cc:670
+#: src/aosd/aosd_ui.cc:783
 msgid "Composite manager not required for fake transparency"
 msgstr ""
 
-#: src/aosd/aosd_ui.cc:706
+#: src/aosd/aosd_ui.cc:820
 msgid "Transparency"
 msgstr ""
 
-#: src/aosd/aosd_ui.cc:712
+#: src/aosd/aosd_ui.cc:826
 msgid "Fake transparency"
 msgstr ""
 
-#: src/aosd/aosd_ui.cc:714
+#: src/aosd/aosd_ui.cc:828
 msgid "Real transparency (requires X Composite Ext.)"
 msgstr ""
 
-#: src/aosd/aosd_ui.cc:756
+#: src/aosd/aosd_ui.cc:875
 msgid "Composite extension not loaded"
 msgstr ""
 
-#: src/aosd/aosd_ui.cc:764
-msgid "Composite extension not available"
-msgstr ""
-
-#: src/aosd/aosd_ui.cc:781
+#: src/aosd/aosd_ui.cc:892
 #, c-format
 msgid "Audacious OSD"
 msgstr ""
 
-#: src/aosd/aosd_ui.cc:844
+#: src/aosd/aosd_ui.cc:955
 msgid "Position"
 msgstr ""
 
-#: src/aosd/aosd_ui.cc:849
+#: src/aosd/aosd_ui.cc:960
 msgid "Animation"
 msgstr ""
 
-#: src/aosd/aosd_ui.cc:854
+#: src/aosd/aosd_ui.cc:965
 msgid "Text"
 msgstr ""
 
-#: src/aosd/aosd_ui.cc:859
+#: src/aosd/aosd_ui.cc:970
 msgid "Decoration"
 msgstr ""
 
-#: src/aosd/aosd_ui.cc:864
+#: src/aosd/aosd_ui.cc:975
 msgid "Trigger"
 msgstr ""
 
-#: src/aosd/aosd_ui.cc:869
+#: src/aosd/aosd_ui.cc:980 src/streamtuner/shoutcast-model.cc:202
 msgid "Misc"
 msgstr ""
 
-#: src/aosd/aosd_ui.cc:878
+#: src/aosd/aosd_ui.cc:989
 msgid "Test"
 msgstr ""
 
@@ -690,11 +507,83 @@
 msgid "Audacious Playlists (audpl)"
 msgstr ""
 
-#: src/blur_scope/blur_scope.cc:42
+#: src/background_music/background_music.cc:24
+msgid "Background music"
+msgstr ""
+
+#: src/background_music/background_music.cc:25
+msgid "Target level:"
+msgstr ""
+
+#: src/background_music/background_music.cc:28
+#: src/background_music/background_music.cc:33
+#: src/silence-removal/silence-removal.cc:70
+msgid "dB"
+msgstr ""
+
+#: src/background_music/background_music.cc:29
+msgid "Maximum amplification:"
+msgstr ""
+
+#: src/background_music/background_music.cc:34 src/mpg123/mpg123.cc:81
+msgid "Advanced"
+msgstr ""
+
+#: src/background_music/background_music.cc:36
+msgid "Slow detection weight:"
+msgstr ""
+
+#: src/background_music/background_music.cc:39
+msgid "Hint"
+msgstr ""
+
+#: src/background_music/background_music.cc:41
+msgid ""
+"Slow detection weight is the relative weight\n"
+"of a long term average detection when compared\n"
+"to the actual, faster loudness detection.\n"
+"A value of zero gives a more radio-like sound\n"
+"where soft passages get \"pulled up\" more quickly,\n"
+"a value of two makes the sound feel less compressed."
+msgstr ""
+
+#: src/background_music/background_music.cc:52
+msgid ""
+"Background Music Plugin for Audacious\n"
+"Copyright 2023;2024 Michel Fleur\n"
+"\n"
+"Controls the volume to make the sound equally loud within and between "
+"tracks.\n"
+" It uses accurate loudness measurement and tries to make the volume changes "
+"sound natural without audible peaks, yet without lowering the volume before "
+"a peak in advance."
+msgstr ""
+
+#: src/background_music/background_music.cc:61
+msgid "Background Music"
+msgstr ""
+
+#: src/bitcrusher/bitcrusher.cc:33
+msgid "Bitcrusher"
+msgstr ""
+
+#: src/bitcrusher/bitcrusher.cc:34
+msgid "Bit Depth:"
+msgstr ""
+
+#: src/bitcrusher/bitcrusher.cc:37
+msgid "Downsample ratio:"
+msgstr ""
+
+#: src/bitcrusher/bitcrusher.cc:48
+msgid "Bitcrusher"
+msgstr ""
+
+#: src/blur_scope/blur_scope.cc:40 src/blur_scope-qt/blur_scope.cc:45
 msgid "Color"
 msgstr ""
 
-#: src/blur_scope/blur_scope.cc:58
+#: src/blur_scope/blur_scope.cc:56 src/blur_scope-qt/blur_scope.cc:158
 msgid "Blur Scope"
 msgstr ""
 
@@ -706,6 +595,10 @@
 msgid "Presets:"
 msgstr ""
 
+#: src/bs2b/plugin.cc:130
+msgid "Default"
+msgstr ""
+
 #: src/bs2b/plugin.cc:136
 msgid "Feed level:"
 msgstr ""
@@ -718,15 +611,15 @@
 msgid "Cut frequency:"
 msgstr ""
 
-#: src/cairo-spectrum/cairo-spectrum.cc:41
+#: src/cairo-spectrum/cairo-spectrum.cc:42 src/qt-spectrum/qt-spectrum.cc:107
 msgid "Spectrum Analyzer"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:72
+#: src/cdaudio/cdaudio-ng.cc:74
 msgid "Audio CD Plugin"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:121
+#: src/cdaudio/cdaudio-ng.cc:121
 msgid ""
 "Copyright (C) 2007-2012 Calin Crisan <ccrisan@gmail.com> and others.\n"
 "\n"
@@ -738,131 +631,131 @@
 "This was a Google Summer of Code 2007 project."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:137
+#: src/cdaudio/cdaudio-ng.cc:140
 msgid "Device"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:138
+#: src/cdaudio/cdaudio-ng.cc:141
 msgid "Read speed:"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:141
+#: src/cdaudio/cdaudio-ng.cc:144
 msgid "Override device:"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:143
+#: src/cdaudio/cdaudio-ng.cc:146
 msgid "Metadata"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:144
+#: src/cdaudio/cdaudio-ng.cc:147
 msgid "Use CD-Text"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:146
+#: src/cdaudio/cdaudio-ng.cc:150
 msgid "Use CDDB"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:148
+#: src/cdaudio/cdaudio-ng.cc:152
 msgid "Use HTTP instead of CDDBP"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:151
+#: src/cdaudio/cdaudio-ng.cc:155
 msgid "Server:"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:155
+#: src/cdaudio/cdaudio-ng.cc:159
 msgid "Path:"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:159
+#: src/cdaudio/cdaudio-ng.cc:163
 msgid "Port:"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:246
+#: src/cdaudio/cdaudio-ng.cc:228
 msgid "Failed to initialize cdio subsystem."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:281
+#: src/cdaudio/cdaudio-ng.cc:260
 #, c-format
 msgid "Invalid URI %s."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:283
+#: src/cdaudio/cdaudio-ng.cc:262
 #, c-format
 msgid "Track %d not found."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:285
+#: src/cdaudio/cdaudio-ng.cc:264
 #, c-format
 msgid "Track %d is a data track."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:360
+#: src/cdaudio/cdaudio-ng.cc:339
 msgid "Error reading audio CD."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:429
+#: src/cdaudio/cdaudio-ng.cc:410
 msgid "Audio CD"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:460 src/cdaudio-ng/cdaudio-ng.cc:469
+#: src/cdaudio/cdaudio-ng.cc:446 src/cdaudio/cdaudio-ng.cc:455
 #, c-format
 msgid "Failed to open CD device %s."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:472
+#: src/cdaudio/cdaudio-ng.cc:458
 msgid "No audio capable CD drive found."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:497
+#: src/cdaudio/cdaudio-ng.cc:481
+msgid "Drive is empty."
+msgstr ""
+
+#: src/cdaudio/cdaudio-ng.cc:483
+msgid "Unsupported disk type."
+msgstr ""
+
+#: src/cdaudio/cdaudio-ng.cc:507
 msgid "Failed to finish initializing opened CD drive."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:510
+#: src/cdaudio/cdaudio-ng.cc:520
 msgid "Failed to retrieve first/last track number."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:531
+#: src/cdaudio/cdaudio-ng.cc:541
 #, c-format
 msgid "Cannot read start/end LSN for track %d."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:613
-msgid "Failed to create the cddb connection."
+#: src/cdaudio/cdaudio-ng.cc:624
+msgid "Failed to create the CDDB connection."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:679
+#: src/cdaudio/cdaudio-ng.cc:690
 msgid "Failed to query the CDDB server"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:681
+#: src/cdaudio/cdaudio-ng.cc:692
 #, c-format
 msgid "Failed to query the CDDB server: %s"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:705
+#: src/cdaudio/cdaudio-ng.cc:716
 #, c-format
-msgid "Failed to read the cddb info: %s"
-msgstr ""
-
-#: src/cdaudio-ng/cdaudio-ng.cc:765
-msgid "Drive is empty."
+msgid "Failed to read the CDDB info: %s"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:767
-msgid "Unsupported disk type."
-msgstr ""
-
-#: src/cd-menu-items/cd-menu-items.cc:35
+#: src/cd-menu-items/cd-menu-items.cc:33
 msgid "Audio CD Menu Items"
 msgstr ""
 
-#: src/cd-menu-items/cd-menu-items.cc:47
-msgid "Play CD"
+#: src/cd-menu-items/cd-menu-items.cc:45
+msgid "Pla_y CD"
 msgstr ""
 
-#: src/cd-menu-items/cd-menu-items.cc:47
-msgid "Add CD"
+#: src/cd-menu-items/cd-menu-items.cc:45
+msgid "_Add CD"
 msgstr ""
 
 #: src/compressor/compressor.cc:45
@@ -913,7 +806,14 @@
 msgid "Default song length:"
 msgstr ""
 
-#: src/console/plugin.cc:42 src/modplug/plugin_main.cc:59
+#: src/console/plugin.cc:41 src/crossfade/crossfade.cc:56
+#: src/crossfade/crossfade.cc:62 src/lirc/lirc.cc:395 src/notify/notify.cc:113
+#: src/sid/xs_config.cc:85 src/sid/xs_config.cc:94 src/sid/xs_config.cc:103
+#: src/vumeter-qt/vumeter_qt.cc:39
+msgid "seconds"
+msgstr ""
+
+#: src/console/plugin.cc:42 src/modplug/plugin_main.cc:58
 msgid "Resampling"
 msgstr ""
 
@@ -937,70 +837,80 @@
 msgid "Game Console Music Decoder"
 msgstr ""
 
-#: src/coreaudio/coreaudio.cc:50
+#: src/coreaudio/coreaudio.cc:53
 msgid "CoreAudio output"
 msgstr ""
 
-#: src/coreaudio/coreaudio.cc:131
+#: src/coreaudio/coreaudio.cc:155
 msgid ""
 "CoreAudio Output Plugin for Audacious\n"
 "Copyright 2014 William Pitcock\n"
+"Copyright 2017,18 René J.V. Bertin\n"
+" (original code and code adapted from\n"
+" Apple examples, (C) Apple 2013)\n"
 "\n"
 "Based on SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
 msgstr ""
 
-#: src/coreaudio/coreaudio.cc:143
+#: src/coreaudio/coreaudio.cc:171
 msgid "Use exclusive mode"
 msgstr ""
 
-#: src/crossfade/crossfade.cc:44
+#: src/coreaudio/coreaudio.cc:173
+msgid "Use bit perfect audio (adapt device sampling rate)"
+msgstr ""
+
+#: src/crossfade/crossfade.cc:47
 msgid ""
 "Crossfade Plugin for Audacious\n"
 "Copyright 2010-2014 John Lindgren"
 msgstr ""
 
-#: src/crossfade/crossfade.cc:48
+#: src/crossfade/crossfade.cc:51
 msgid "Crossfade"
 msgstr ""
 
-#: src/crossfade/crossfade.cc:49
+#: src/crossfade/crossfade.cc:52
 msgid "On automatic song change"
 msgstr ""
 
-#: src/crossfade/crossfade.cc:51 src/crossfade/crossfade.cc:57
+#: src/crossfade/crossfade.cc:54 src/crossfade/crossfade.cc:60
 msgid "Overlap:"
 msgstr ""
 
-#: src/crossfade/crossfade.cc:55
+#: src/crossfade/crossfade.cc:58
 msgid "On seek or manual song change"
 msgstr ""
 
-#: src/crossfade/crossfade.cc:61
-msgid "Tip"
+#: src/crossfade/crossfade.cc:64
+msgid "No fade in"
 msgstr ""
 
-#: src/crossfade/crossfade.cc:62
-msgid ""
-"For better crossfading, enable\n"
-"the Silence Removal effect."
+#: src/crossfade/crossfade.cc:66
+msgid "Use S-curve fade"
+msgstr ""
+
+#: src/crossfade/crossfade.cc:68
+msgid "S-curve steepness:"
+msgstr ""
+
+#: src/crossfade/crossfade.cc:70
+msgid "(higher is steeper)"
 msgstr ""
 
 #: src/crossfade/crossfade.cc:72
-msgid "Crossfade"
+msgid "Tip"
 msgstr ""
 
-#: src/crossfade/crossfade.cc:161
+#: src/crossfade/crossfade.cc:73
 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."
+"For better crossfading, enable\n"
+"the Silence Removal effect."
 msgstr ""
 
-#: src/crossfade/crossfade.cc:168
-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."
+#: src/crossfade/crossfade.cc:83
+msgid "Crossfade"
 msgstr ""
 
 #: src/crystalizer/crystalizer.cc:31
@@ -1015,60 +925,61 @@
 msgid "Crystalizer"
 msgstr ""
 
-#: src/cue/cue.cc:37
+#: src/cue/cue.cc:42
 msgid "Cue Sheet Plugin"
 msgstr ""
 
-#: src/delete-files/delete-files.cc:46 src/delete-files/delete-files.cc:146
+#: src/delete-files/delete-files.cc:53 src/delete-files/delete-files.cc:215
+#: src/delete-files/delete-files.cc:230
 msgid "Delete Files"
 msgstr ""
 
-#: src/delete-files/delete-files.cc:75
-#, c-format
-msgid "Error moving %s to trash: %s."
+#: src/delete-files/delete-files.cc:120
+msgid "No files are selected."
 msgstr ""
 
-#: src/delete-files/delete-files.cc:86
+#: src/delete-files/delete-files.cc:125
 #, c-format
-msgid "Error deleting %s: %s."
+msgid "Do you want to move %s to the trash?"
 msgstr ""
 
-#: src/delete-files/delete-files.cc:117
+#: src/delete-files/delete-files.cc:126
 #, c-format
-msgid "Error deleting %s: not a local file."
+msgid "Do you want to permanently delete %s?"
 msgstr ""
 
-#: src/delete-files/delete-files.cc:134
-msgid "Do you want to move the selected files to the trash?"
+#: src/delete-files/delete-files.cc:133
+#, c-format
+msgid "Do you want to move %d files to the trash?"
 msgstr ""
 
-#: src/delete-files/delete-files.cc:135
-msgid "Move to Trash"
+#: src/delete-files/delete-files.cc:134
+#, c-format
+msgid "Do you want to permanently delete %d files?"
 msgstr ""
 
-#: src/delete-files/delete-files.cc:140
-msgid "Do you want to permanently delete the selected files?"
+#: src/delete-files/delete-files.cc:146
+msgid "Move to trash"
 msgstr ""
 
-#: src/delete-files/delete-files.cc:141 src/skins/preset-list.cc:411
-#: src/skins/preset-list.cc:427
+#: src/delete-files/delete-files.cc:146
 msgid "Delete"
 msgstr ""
 
-#: src/delete-files/delete-files.cc:145 src/skins/preset-browser.cc:56
-#: src/skins/preset-list.cc:307 src/skins/ui_playlist.cc:221
+#: src/delete-files/delete-files.cc:213 src/delete-files/delete-files.cc:235
+#: src/skins-qt/search-select.cc:102 src/skins/search-select.cc:78
 msgid "Cancel"
 msgstr ""
 
-#: src/delete-files/delete-files.cc:166
+#: src/delete-files/delete-files.cc:267
 msgid "Delete Selected Files"
 msgstr ""
 
-#: src/delete-files/delete-files.cc:181
+#: src/delete-files/delete-files.cc:287
 msgid "Delete Method"
 msgstr ""
 
-#: src/delete-files/delete-files.cc:182
+#: src/delete-files/delete-files.cc:288
 msgid "Move to trash instead of deleting immediately"
 msgstr ""
 
@@ -1084,13 +995,13 @@
 msgid "Echo"
 msgstr ""
 
-#: src/echo_plugin/echo.cc:22 src/modplug/plugin_main.cc:73
-#: src/modplug/plugin_main.cc:83
+#: src/echo_plugin/echo.cc:22 src/modplug/plugin_main.cc:72
+#: src/modplug/plugin_main.cc:82
 msgid "Delay:"
 msgstr ""
 
-#: src/echo_plugin/echo.cc:24 src/modplug/plugin_main.cc:73
-#: src/modplug/plugin_main.cc:83
+#: src/echo_plugin/echo.cc:24 src/modplug/plugin_main.cc:72
+#: src/modplug/plugin_main.cc:82 src/xsf/plugin.cc:445
 msgid "ms"
 msgstr ""
 
@@ -1098,7 +1009,7 @@
 msgid "Feedback:"
 msgstr ""
 
-#: src/echo_plugin/echo.cc:28 src/modplug/plugin_main.cc:87
+#: src/echo_plugin/echo.cc:28 src/modplug/plugin_main.cc:86
 msgid "Volume:"
 msgstr ""
 
@@ -1106,11 +1017,11 @@
 msgid "Echo"
 msgstr ""
 
-#: src/ffaudio/ffaudio-core.cc:41
+#: src/ffaudio/ffaudio-core.cc:50
 msgid "FFmpeg Plugin"
 msgstr ""
 
-#: src/ffaudio/ffaudio-core.cc:571
+#: src/ffaudio/ffaudio-core.cc:649
 msgid ""
 "Multi-format audio decoding plugin for Audacious using\n"
 "FFmpeg multimedia framework (http://www.ffmpeg.org/)\n"
@@ -1120,235 +1031,306 @@
 "Matti Hämäläinen <ccr@tnsp.org>"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:45
+#: src/filewriter/filewriter.cc:48
 msgid "FileWriter Plugin"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:386
-msgid "Output file format:"
+#: src/filewriter/filewriter.cc:316
+#, c-format
+msgid ""
+"Error opening %s:\n"
+"%s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:358
+msgid ""
+"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/filewriter/filewriter.cc:403
-msgid "Configure"
+#: src/filewriter/filewriter.cc:385
+msgid "Output file format:"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:413
+#: src/filewriter/filewriter.cc:389
 msgid "Save into original directory"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:417
-msgid "Save into custom directory"
+#: src/filewriter/filewriter.cc:392
+msgid "Save into custom directory:"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:427
-msgid "Output file folder:"
+#: src/filewriter/filewriter.cc:400
+msgid "Generate file name from:"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:431
-msgid "Pick a folder"
+#: src/filewriter/filewriter.cc:401
+msgid "Original file name"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:444
-msgid "Generate file name from:"
+#: src/filewriter/filewriter.cc:404
+msgid "Original file name (no suffix)"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:448
+#: src/filewriter/filewriter.cc:407
 msgid "Original file tag"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:453
-msgid "Original file name"
+#: src/filewriter/filewriter.cc:411
+msgid "Prepend track number to file name"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:459
-msgid "Include original file name extension"
+#: src/filewriter/filewriter.cc:417 src/filewriter/filewriter.cc:449
+msgid "Auto"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:468
-msgid "Prepend track number to file name"
+#: src/filewriter/filewriter.cc:418
+msgid "8000 Hz"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:484
-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."
+#: src/filewriter/filewriter.cc:419
+msgid "11025 Hz"
 msgstr ""
 
-#: src/filewriter/mp3.cc:40 src/filewriter/mp3.cc:717
-msgid "Auto"
+#: src/filewriter/filewriter.cc:420
+msgid "12000 Hz"
 msgstr ""
 
-#: src/filewriter/mp3.cc:40
-msgid "Joint Stereo"
+#: src/filewriter/filewriter.cc:421
+msgid "16000 Hz"
 msgstr ""
 
-#: src/filewriter/mp3.cc:41 src/modplug/plugin_main.cc:58
-#: src/mpg123/mpg123.cc:248
-msgid "Stereo"
+#: src/filewriter/filewriter.cc:422
+msgid "22050 Hz"
 msgstr ""
 
-#: src/filewriter/mp3.cc:41 src/modplug/plugin_main.cc:57
-#: src/mpg123/mpg123.cc:248
-msgid "Mono"
+#: src/filewriter/filewriter.cc:423
+msgid "24000 Hz"
 msgstr ""
 
-#: src/filewriter/mp3.cc:657
-msgid "MP3 Configuration"
+#: src/filewriter/filewriter.cc:424
+msgid "32000 Hz"
 msgstr ""
 
-#: src/filewriter/mp3.cc:658
-msgid "_OK"
+#: src/filewriter/filewriter.cc:425 src/xsf/plugin.cc:430
+msgid "44100 Hz"
 msgstr ""
 
-#: src/filewriter/mp3.cc:681
-msgid "Algorithm Quality:"
+#: src/filewriter/filewriter.cc:426 src/xsf/plugin.cc:431
+msgid "48000 Hz"
 msgstr ""
 
-#: src/filewriter/mp3.cc:706
-msgid "Output Sample Rate:"
+#: src/filewriter/filewriter.cc:430
+msgid "8 kbit/s"
 msgstr ""
 
-#: src/filewriter/mp3.cc:733
-msgid "(Hz)"
+#: src/filewriter/filewriter.cc:431
+msgid "16 kbit/s"
 msgstr ""
 
-#: src/filewriter/mp3.cc:740
-msgid "Bitrate / Compression Ratio:"
+#: src/filewriter/filewriter.cc:432
+msgid "32 kbit/s"
 msgstr ""
 
-#: src/filewriter/mp3.cc:764
-msgid "Bitrate (kbps):"
+#: src/filewriter/filewriter.cc:433
+msgid "40 kbit/s"
 msgstr ""
 
-#: src/filewriter/mp3.cc:796
-msgid "Compression ratio:"
+#: src/filewriter/filewriter.cc:434
+msgid "48 kbit/s"
 msgstr ""
 
-#: src/filewriter/mp3.cc:820
-msgid "Audio Mode:"
+#: src/filewriter/filewriter.cc:435
+msgid "56 kbit/s"
 msgstr ""
 
-#: src/filewriter/mp3.cc:845
-msgid "Miscellaneous:"
+#: src/filewriter/filewriter.cc:436
+msgid "64 kbit/s"
 msgstr ""
 
-#: src/filewriter/mp3.cc:856
-msgid "Enforce strict ISO compliance"
+#: src/filewriter/filewriter.cc:437
+msgid "80 kbit/s"
 msgstr ""
 
-#: src/filewriter/mp3.cc:867
-msgid "Error protection"
+#: src/filewriter/filewriter.cc:438
+msgid "96 kbit/s"
 msgstr ""
 
-#: src/filewriter/mp3.cc:879 src/filewriter/vorbis.cc:206
-msgid "Quality"
+#: src/filewriter/filewriter.cc:439
+msgid "112 kbit/s"
 msgstr ""
 
-#: src/filewriter/mp3.cc:888
-msgid "Enable VBR/ABR"
+#: src/filewriter/filewriter.cc:440
+msgid "128 kbit/s"
 msgstr ""
 
-#: src/filewriter/mp3.cc:898
-msgid "Type:"
+#: src/filewriter/filewriter.cc:441
+msgid "160 kbit/s"
 msgstr ""
 
-#: src/filewriter/mp3.cc:931
-msgid "VBR Options:"
+#: src/filewriter/filewriter.cc:442
+msgid "192 kbit/s"
 msgstr ""
 
-#: src/filewriter/mp3.cc:947
-msgid "Minimum bitrate (kbps):"
+#: src/filewriter/filewriter.cc:443
+msgid "224 kbit/s"
 msgstr ""
 
-#: src/filewriter/mp3.cc:973
-msgid "Maximum bitrate (kbps):"
+#: src/filewriter/filewriter.cc:444
+msgid "256 kbit/s"
 msgstr ""
 
-#: src/filewriter/mp3.cc:995
-msgid "Strictly enforce minimum bitrate"
+#: src/filewriter/filewriter.cc:445
+msgid "320 kbit/s"
 msgstr ""
 
-#: src/filewriter/mp3.cc:1007
-msgid "ABR Options:"
+#: src/filewriter/filewriter.cc:450
+msgid "Joint Stereo"
 msgstr ""
 
-#: src/filewriter/mp3.cc:1017
-msgid "Average bitrate (kbps):"
+#: src/filewriter/filewriter.cc:451 src/modplug/plugin_main.cc:57
+#: src/mpg123/mpg123.cc:259
+msgid "Stereo"
 msgstr ""
 
-#: src/filewriter/mp3.cc:1044
-msgid "VBR quality level:"
+#: src/filewriter/filewriter.cc:452 src/modplug/plugin_main.cc:56
+#: src/mpg123/mpg123.cc:260
+msgid "Mono"
 msgstr ""
 
-#: src/filewriter/mp3.cc:1063
-msgid "Omit Xing VBR header"
+#: src/filewriter/filewriter.cc:456
+msgid "VBR"
 msgstr ""
 
-#: src/filewriter/mp3.cc:1076
-msgid "VBR/ABR"
+#: src/filewriter/filewriter.cc:457
+msgid "ABR"
 msgstr ""
 
-#: src/filewriter/mp3.cc:1085
-msgid "Frame Parameters:"
+#: src/filewriter/filewriter.cc:478
+msgid "Algorithm quality:"
 msgstr ""
 
-#: src/filewriter/mp3.cc:1097
-msgid "Mark as copyright"
+#: src/filewriter/filewriter.cc:484
+msgid "Bitrate:"
 msgstr ""
 
-#: src/filewriter/mp3.cc:1108
-msgid "Mark as original"
+#: src/filewriter/filewriter.cc:491
+msgid "Compression ratio:"
 msgstr ""
 
-#: src/filewriter/mp3.cc:1120
-msgid "ID3 Parameters:"
+#: src/filewriter/filewriter.cc:498
+msgid "Audio mode:"
 msgstr ""
 
-#: src/filewriter/mp3.cc:1131
-msgid "Force addition of version 2 tag"
+#: src/filewriter/filewriter.cc:501
+msgid "Enforce strict ISO compliance"
 msgstr ""
 
-#: src/filewriter/mp3.cc:1141
-msgid "Only add v1 tag"
+#: src/filewriter/filewriter.cc:503
+msgid "Error protection"
 msgstr ""
 
-#: src/filewriter/mp3.cc:1148
-msgid "Only add v2 tag"
+#: src/filewriter/filewriter.cc:508
+msgid "Enable VBR/ABR"
 msgstr ""
 
-#: src/filewriter/mp3.cc:1169
-msgid "Tags"
+#: src/filewriter/filewriter.cc:510
+msgid "Type:"
 msgstr ""
 
-#: src/filewriter/vorbis.cc:196
-msgid "Vorbis Encoder Configuration"
+#: src/filewriter/filewriter.cc:514
+msgid "Minimum bitrate:"
 msgstr ""
 
-#: src/filewriter/vorbis.cc:219
-msgid "Quality level (0 - 10):"
+#: src/filewriter/filewriter.cc:518
+msgid "Maximum bitrate:"
 msgstr ""
 
-#: src/flacng/flacng.h:35
+#: src/filewriter/filewriter.cc:522
+msgid "Average bitrate:"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:526
+msgid "VBR quality level:"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:530
+msgid "Strictly enforce minimum bitrate"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:533
+msgid "Omit Xing VBR header"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:539
+msgid "Frame Headers"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:540
+msgid "Mark as copyright"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:542
+msgid "Mark as original"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:544
+msgid "ID3 Tags"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:545
+msgid "Force addition of version 2 tag"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:547
+msgid "Only add v1 tag"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:549
+msgid "Only add v2 tag"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:554
+msgid "Quality"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:555
+msgid "VBR/ABR"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:556
+msgid "Tags"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:566
+msgid "Quality (0-1):"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:573 src/skins-qt/skins_cfg.cc:307
+#: src/skins/skins_cfg.cc:289
+msgid "General"
+msgstr ""
+
+#: src/flac/flacng.h:36
 msgid "FLAC Decoder"
 msgstr ""
 
-#: src/flacng/metadata.cc:351 src/wavpack/wavpack.cc:209
+#: src/flac/metadata.cc:296 src/wavpack/wavpack.cc:215
 msgid "lossless"
 msgstr ""
 
-#: src/flacng/plugin.cc:169
+#: src/flac/plugin.cc:214
 msgid ""
 "Original code by\n"
 "Ralf Ertzinger <ralf@skytale.net>\n"
@@ -1366,15 +1348,15 @@
 msgid "GIO Plugin"
 msgstr ""
 
-#: src/gio/gio.cc:153
+#: src/gio/gio.cc:152
 msgid "Read-and-append mode not supported"
 msgstr ""
 
-#: src/gio/gio.cc:166
+#: src/gio/gio.cc:165
 msgid "Invalid open mode"
 msgstr ""
 
-#: src/gl-spectrum/gl-spectrum.cc:51
+#: src/glspectrum/gl-spectrum.cc:52
 msgid ""
 "OpenGL Spectrum Analyzer for Audacious\n"
 "Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
@@ -1386,652 +1368,787 @@
 "License: GPLv2+"
 msgstr ""
 
-#: src/gl-spectrum/gl-spectrum.cc:62
+#: src/glspectrum/gl-spectrum.cc:63 src/qtglspectrum/gl-spectrum.cc:53
 msgid "OpenGL Spectrum Analyzer"
 msgstr ""
 
-#: src/gl-spectrum-qt/gl-spectrum.cc:41
-msgid ""
-"OpenGL Spectrum Analyzer for Audacious\n"
-"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
-"Copyright 2014 William Pitcock\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-qt/gl-spectrum.cc:53
-msgid "OpenGL Spectrum Analyzer (Qt)"
-msgstr ""
-
-#: src/gnomeshortcuts/gnomeshortcuts.cc:38
-msgid "GNOME Shortcuts"
-msgstr ""
-
-#: src/gnomeshortcuts/gnomeshortcuts.cc:54
-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/gtkui/columns.cc:35
-msgid "Entry number"
+#: src/gtkui/columns.cc:36 src/moonstone/playlist_model.cc:38
+#: src/qtui/playlist_model.cc:33
+msgid "Entry Number"
 msgstr ""
 
-#: src/gtkui/columns.cc:36 src/playlist-manager/playlist-manager.cc:225
-#: src/qtui/playlist_model.cc:123
+#: src/gtkui/columns.cc:37 src/moonstone/playlist_model.cc:38
+#: src/moonstone/playlist_selection.cc:64
+#: src/playlist-manager/playlist-manager.cc:200
+#: src/playlist-manager-qt/playlist-manager-qt.cc:188
+#: src/qtui/playlist_model.cc:33 src/streamtuner/icecast-model.cc:120
+#: src/streamtuner/ihr-model.cc:159 src/streamtuner/shoutcast-model.cc:122
 msgid "Title"
 msgstr ""
 
-#: src/gtkui/columns.cc:37 src/qtui/playlist_model.cc:125
+#: src/gtkui/columns.cc:38 src/moonstone/playlist_model.cc:39
+#: src/qtui/playlist_model.cc:33
 msgid "Artist"
 msgstr ""
 
-#: src/gtkui/columns.cc:38
+#: src/gtkui/columns.cc:39 src/moonstone/playlist_model.cc:39
+#: src/qtui/playlist_model.cc:33
 msgid "Year"
 msgstr ""
 
-#: src/gtkui/columns.cc:39 src/qtui/playlist_model.cc:127
+#: src/gtkui/columns.cc:40 src/moonstone/playlist_model.cc:39
+#: src/qtui/playlist_model.cc:34
 msgid "Album"
 msgstr ""
 
-#: src/gtkui/columns.cc:40
-msgid "Album artist"
+#: src/gtkui/columns.cc:41 src/moonstone/playlist_model.cc:40
+#: src/qtui/playlist_model.cc:34
+msgid "Album Artist"
 msgstr ""
 
-#: src/gtkui/columns.cc:41
+#: src/gtkui/columns.cc:42 src/moonstone/playlist_model.cc:40
+#: src/qtui/playlist_model.cc:34
 msgid "Track"
 msgstr ""
 
-#: src/gtkui/columns.cc:42
+#: src/gtkui/columns.cc:43 src/moonstone/playlist_model.cc:40
+#: src/qtui/playlist_model.cc:34 src/streamtuner/icecast-model.cc:123
+#: src/streamtuner/shoutcast-model.cc:125
+#: src/streamtuner/shoutcast-model.cc:236
 msgid "Genre"
 msgstr ""
 
-#: src/gtkui/columns.cc:43
-msgid "Queue position"
+#: src/gtkui/columns.cc:44 src/moonstone/playlist_model.cc:41
+#: src/qtui/playlist_model.cc:35
+msgid "Queue Position"
 msgstr ""
 
-#: src/gtkui/columns.cc:44
+#: src/gtkui/columns.cc:45 src/moonstone/playlist_model.cc:41
+#: src/qtui/playlist_model.cc:35
 msgid "Length"
 msgstr ""
 
-#: src/gtkui/columns.cc:45
-msgid "File path"
+#: src/gtkui/columns.cc:46 src/moonstone/playlist_model.cc:41
+#: src/qtui/playlist_model.cc:35
+msgid "File Path"
 msgstr ""
 
-#: src/gtkui/columns.cc:47
-msgid "Custom title"
+#: src/gtkui/columns.cc:47 src/moonstone/playlist_model.cc:42
+#: src/qtui/playlist_model.cc:35
+msgid "File Name"
 msgstr ""
 
-#: src/gtkui/columns.cc:48
+#: src/gtkui/columns.cc:48 src/moonstone/playlist_model.cc:42
+#: src/qtui/playlist_model.cc:36
+msgid "Custom Title"
+msgstr ""
+
+#: src/gtkui/columns.cc:49 src/moonstone/playlist_model.cc:42
+#: src/qtui/playlist_model.cc:36 src/streamtuner/icecast-model.cc:129
+#: src/streamtuner/shoutcast-model.cc:134
 msgid "Bitrate"
 msgstr ""
 
-#: src/gtkui/columns.cc:308
+#: src/gtkui/columns.cc:50 src/moonstone/playlist_model.cc:43
+#: src/qtui/playlist_model.cc:36
+msgid "Comment"
+msgstr ""
+
+#: src/gtkui/columns.cc:51 src/qtui/playlist_model.cc:36
+msgid "Publisher"
+msgstr ""
+
+#: src/gtkui/columns.cc:52 src/qtui/playlist_model.cc:37
+msgid "Catalog Number"
+msgstr ""
+
+#: src/gtkui/columns.cc:53 src/moonstone/playlist_model.cc:43
+#: src/qtui/playlist_model.cc:37
+msgid "Disc"
+msgstr ""
+
+#: src/gtkui/columns.cc:325
 msgid "Available columns"
 msgstr ""
 
-#: src/gtkui/columns.cc:334
+#: src/gtkui/columns.cc:351
 msgid "Displayed columns"
 msgstr ""
 
-#: src/gtkui/layout.cc:72 src/search-tool/search-tool.cc:40
+#: src/gtkui/layout.cc:74 src/search-tool-qt/search-tool-qt.cc:58
+#: src/search-tool/search-tool.cc:49
 msgid "Search Tool"
 msgstr ""
 
-#: src/gtkui/layout.cc:167
+#: src/gtkui/layout.cc:170
 msgid "Dock at Left"
 msgstr ""
 
-#: src/gtkui/layout.cc:167
+#: src/gtkui/layout.cc:170
 msgid "Dock at Right"
 msgstr ""
 
-#: src/gtkui/layout.cc:168
+#: src/gtkui/layout.cc:171
 msgid "Dock at Top"
 msgstr ""
 
-#: src/gtkui/layout.cc:168
+#: src/gtkui/layout.cc:171
 msgid "Dock at Bottom"
 msgstr ""
 
-#: src/gtkui/layout.cc:168
+#: src/gtkui/layout.cc:171
 msgid "Undock"
 msgstr ""
 
-#: src/gtkui/layout.cc:168 src/ladspa/plugin.cc:531
+#: src/gtkui/layout.cc:171 src/ladspa/plugin.cc:540
 msgid "Disable"
 msgstr ""
 
-#: src/gtkui/menus.cc:126 src/qtui/main_window_actions.cc:93
-#: src/statusicon/statusicon.cc:276
+#: src/gtkui/menus.cc:79 src/qtui/menus.cc:107
+#: src/statusicon-qt/statusicon.cc:115 src/statusicon/statusicon.cc:286
 msgid "_Open Files ..."
 msgstr ""
 
-#: src/gtkui/menus.cc:127
+#: src/gtkui/menus.cc:80 src/qtui/menus.cc:111
 msgid "Open _URL ..."
 msgstr ""
 
-#: src/gtkui/menus.cc:128 src/qtui/main_window_actions.cc:95
+#: src/gtkui/menus.cc:81 src/qtui/menus.cc:113
 msgid "_Add Files ..."
 msgstr ""
 
-#: src/gtkui/menus.cc:129
+#: src/gtkui/menus.cc:82 src/qtui/menus.cc:118
 msgid "Add U_RL ..."
 msgstr ""
 
-#: src/gtkui/menus.cc:131
+#: src/gtkui/menus.cc:84 src/qtui/menus.cc:120
 msgid "Search _Library"
 msgstr ""
 
-#: src/gtkui/menus.cc:133 src/qtui/main_window_actions.cc:98
+#: src/gtkui/menus.cc:86 src/qtui/menus.cc:123
 msgid "A_bout ..."
 msgstr ""
 
-#: src/gtkui/menus.cc:134 src/qtui/main_window_actions.cc:99
+#: src/gtkui/menus.cc:87 src/qtui/menus.cc:125
 msgid "_Settings ..."
 msgstr ""
 
-#: src/gtkui/menus.cc:135 src/qtui/main_window_actions.cc:103
-#: src/statusicon/statusicon.cc:284
+#: src/gtkui/menus.cc:88 src/qtui/menus.cc:131
+#: src/statusicon-qt/statusicon.cc:117 src/statusicon/statusicon.cc:288
 msgid "_Quit"
 msgstr ""
 
-#: src/gtkui/menus.cc:139 src/gtkui/menus.cc:262
-#: src/qtui/main_window_actions.cc:107 src/search-tool/search-tool.cc:641
-#: src/statusicon/statusicon.cc:278
+#: src/gtkui/menus.cc:92 src/gtkui/menus.cc:226
+#: src/moonstone/playlist_tabs.cc:306 src/qtui/menus.cc:135
+#: src/qtui/playlist_tabs.cc:331 src/search-tool-qt/search-tool-qt.cc:499
+#: src/search-tool/search-tool.cc:339 src/statusicon-qt/statusicon.cc:109
+#: src/statusicon/statusicon.cc:280
 msgid "_Play"
 msgstr ""
 
-#: src/gtkui/menus.cc:140 src/qtui/main_window_actions.cc:108
-#: src/statusicon/statusicon.cc:279
+#: src/gtkui/menus.cc:93 src/qtui/menus.cc:137
+#: src/statusicon-qt/statusicon.cc:110 src/statusicon/statusicon.cc:281
 msgid "Paus_e"
 msgstr ""
 
-#: src/gtkui/menus.cc:141 src/qtui/main_window_actions.cc:109
-#: src/statusicon/statusicon.cc:280
+#: src/gtkui/menus.cc:94 src/qtui/menus.cc:139
+#: src/statusicon-qt/statusicon.cc:111 src/statusicon/statusicon.cc:282
 msgid "_Stop"
 msgstr ""
 
-#: src/gtkui/menus.cc:142 src/qtui/main_window_actions.cc:110
-#: src/statusicon/statusicon.cc:277
+#: src/gtkui/menus.cc:95 src/qtui/menus.cc:141
+#: src/statusicon-qt/statusicon.cc:112 src/statusicon/statusicon.cc:283
 msgid "Pre_vious"
 msgstr ""
 
-#: src/gtkui/menus.cc:143 src/qtui/main_window_actions.cc:111
-#: src/statusicon/statusicon.cc:281
+#: src/gtkui/menus.cc:96 src/qtui/menus.cc:143
+#: src/statusicon-qt/statusicon.cc:113 src/statusicon/statusicon.cc:284
 msgid "_Next"
 msgstr ""
 
-#: src/gtkui/menus.cc:145 src/qtui/main_window_actions.cc:113
+#: src/gtkui/menus.cc:97 src/qtui/menus.cc:145 src/skins/menus.cc:114
+#: src/skins-qt/menus.cc:105
+msgid "Previous Album"
+msgstr ""
+
+#: src/gtkui/menus.cc:98 src/qtui/menus.cc:146 src/skins/menus.cc:115
+#: src/skins-qt/menus.cc:106
+msgid "Next Album"
+msgstr ""
+
+#: src/gtkui/menus.cc:100 src/qtui/menus.cc:148
 msgid "_Repeat"
 msgstr ""
 
-#: src/gtkui/menus.cc:146 src/qtui/main_window_actions.cc:114
+#: src/gtkui/menus.cc:101 src/qtui/menus.cc:150
 msgid "S_huffle"
 msgstr ""
 
-#: src/gtkui/menus.cc:147 src/qtui/main_window_actions.cc:115
+#: src/gtkui/menus.cc:102 src/qtui/menus.cc:152
+msgid "Shuffle by Albu_m"
+msgstr ""
+
+#: src/gtkui/menus.cc:103 src/qtui/menus.cc:155
 msgid "N_o Playlist Advance"
 msgstr ""
 
-#: src/gtkui/menus.cc:148 src/qtui/main_window_actions.cc:116
+#: src/gtkui/menus.cc:104 src/qtui/menus.cc:157
 msgid "Stop A_fter This Song"
 msgstr ""
 
-#: src/gtkui/menus.cc:150 src/gtkui/menus.cc:247
-#: src/qtui/main_window_actions.cc:118
+#: src/gtkui/menus.cc:106 src/gtkui/menus.cc:210 src/qtui/menus.cc:162
+#: src/qtui/menus.cc:294
 msgid "Song _Info ..."
 msgstr ""
 
-#: src/gtkui/menus.cc:151
+#: src/gtkui/menus.cc:107
 msgid "Jump to _Time ..."
 msgstr ""
 
-#: src/gtkui/menus.cc:152
+#: src/gtkui/menus.cc:108
 msgid "_Jump to Song ..."
 msgstr ""
 
-#: src/gtkui/menus.cc:154
+#: src/gtkui/menus.cc:110 src/qtui/menus.cc:165
 msgid "Set Repeat Point _A"
 msgstr ""
 
-#: src/gtkui/menus.cc:155
+#: src/gtkui/menus.cc:111 src/qtui/menus.cc:167
 msgid "Set Repeat Point _B"
 msgstr ""
 
-#: src/gtkui/menus.cc:156
+#: src/gtkui/menus.cc:112 src/qtui/menus.cc:169
 msgid "_Clear Repeat Points"
 msgstr ""
 
-#: src/gtkui/menus.cc:160 src/gtkui/menus.cc:167 src/gtkui/menus.cc:183
-#: src/qtui/main_window_actions.cc:122 src/qtui/main_window_actions.cc:129
-#: src/qtui/main_window_actions.cc:145
+#: src/gtkui/menus.cc:116 src/gtkui/menus.cc:123 src/gtkui/menus.cc:141
+#: src/qtui/menus.cc:173 src/qtui/menus.cc:180 src/qtui/menus.cc:198
 msgid "By _Title"
 msgstr ""
 
-#: src/gtkui/menus.cc:161 src/qtui/main_window_actions.cc:123
+#: src/gtkui/menus.cc:117 src/qtui/menus.cc:174
 msgid "By _File Name"
 msgstr ""
 
-#: src/gtkui/menus.cc:162 src/qtui/main_window_actions.cc:124
+#: src/gtkui/menus.cc:118 src/qtui/menus.cc:175
 msgid "By File _Path"
 msgstr ""
 
-#: src/gtkui/menus.cc:166 src/gtkui/menus.cc:182
-#: src/qtui/main_window_actions.cc:128 src/qtui/main_window_actions.cc:144
+#: src/gtkui/menus.cc:122 src/gtkui/menus.cc:140 src/qtui/menus.cc:179
+#: src/qtui/menus.cc:197
 msgid "By Track _Number"
 msgstr ""
 
-#: src/gtkui/menus.cc:168 src/gtkui/menus.cc:184
-#: src/qtui/main_window_actions.cc:130 src/qtui/main_window_actions.cc:146
+#: src/gtkui/menus.cc:124 src/gtkui/menus.cc:142 src/qtui/menus.cc:181
+#: src/qtui/menus.cc:199
 msgid "By _Artist"
 msgstr ""
 
-#: src/gtkui/menus.cc:169 src/gtkui/menus.cc:185
-#: src/qtui/main_window_actions.cc:131 src/qtui/main_window_actions.cc:147
+#: src/gtkui/menus.cc:125 src/gtkui/menus.cc:143 src/qtui/menus.cc:182
+#: src/qtui/menus.cc:200
 msgid "By Al_bum"
 msgstr ""
 
-#: src/gtkui/menus.cc:170 src/gtkui/menus.cc:186
-#: src/qtui/main_window_actions.cc:132 src/qtui/main_window_actions.cc:148
+#: src/gtkui/menus.cc:126 src/gtkui/menus.cc:144 src/qtui/menus.cc:183
+#: src/qtui/menus.cc:201
 msgid "By Albu_m Artist"
 msgstr ""
 
-#: src/gtkui/menus.cc:171 src/gtkui/menus.cc:187
-#: src/qtui/main_window_actions.cc:133 src/qtui/main_window_actions.cc:149
+#: src/gtkui/menus.cc:127 src/gtkui/menus.cc:145 src/qtui/menus.cc:184
+#: src/qtui/menus.cc:202
 msgid "By Release _Date"
 msgstr ""
 
-#: src/gtkui/menus.cc:172 src/gtkui/menus.cc:188
-#: src/qtui/main_window_actions.cc:134 src/qtui/main_window_actions.cc:150
+#: src/gtkui/menus.cc:128 src/gtkui/menus.cc:146 src/qtui/menus.cc:185
+#: src/qtui/menus.cc:203
 msgid "By _Genre"
 msgstr ""
 
-#: src/gtkui/menus.cc:173 src/gtkui/menus.cc:189
-#: src/qtui/main_window_actions.cc:135 src/qtui/main_window_actions.cc:151
+#: src/gtkui/menus.cc:129 src/gtkui/menus.cc:147 src/qtui/menus.cc:186
+#: src/qtui/menus.cc:204
 msgid "By _Length"
 msgstr ""
 
-#: src/gtkui/menus.cc:174 src/gtkui/menus.cc:190
-#: src/qtui/main_window_actions.cc:136 src/qtui/main_window_actions.cc:152
+#: src/gtkui/menus.cc:130 src/gtkui/menus.cc:148 src/qtui/menus.cc:187
+#: src/qtui/menus.cc:205
 msgid "By _File Path"
 msgstr ""
 
-#: src/gtkui/menus.cc:175 src/gtkui/menus.cc:191
-#: src/qtui/main_window_actions.cc:137 src/qtui/main_window_actions.cc:153
+#: src/gtkui/menus.cc:131 src/gtkui/menus.cc:149 src/qtui/menus.cc:188
+#: src/qtui/menus.cc:206
 msgid "By _Custom Title"
 msgstr ""
 
-#: src/gtkui/menus.cc:177 src/gtkui/menus.cc:193
-#: src/qtui/main_window_actions.cc:139 src/qtui/main_window_actions.cc:155
+#: src/gtkui/menus.cc:132 src/gtkui/menus.cc:150 src/qtui/menus.cc:189
+#: src/qtui/menus.cc:207
+msgid "By C_omment"
+msgstr ""
+
+#: src/gtkui/menus.cc:133 src/gtkui/menus.cc:151 src/qtui/menus.cc:190
+#: src/qtui/menus.cc:208
+msgid "By D_isc Number"
+msgstr ""
+
+#: src/gtkui/menus.cc:135 src/gtkui/menus.cc:153 src/qtui/menus.cc:192
+#: src/qtui/menus.cc:210
 msgid "R_everse Order"
 msgstr ""
 
-#: src/gtkui/menus.cc:178 src/gtkui/menus.cc:194
-#: src/qtui/main_window_actions.cc:140 src/qtui/main_window_actions.cc:156
+#: src/gtkui/menus.cc:136 src/gtkui/menus.cc:154 src/qtui/menus.cc:194
+#: src/qtui/menus.cc:212
 msgid "_Random Order"
 msgstr ""
 
-#: src/gtkui/menus.cc:198 src/qtui/main_window_actions.cc:160
+#: src/gtkui/menus.cc:158 src/qtui/menus.cc:216
 msgid "_Play/Resume"
 msgstr ""
 
-#: src/gtkui/menus.cc:199 src/gtkui/menus.cc:251
-#: src/qtui/main_window_actions.cc:161
+#: src/gtkui/menus.cc:159 src/qtui/menus.cc:218
 msgid "_Refresh"
 msgstr ""
 
-#: src/gtkui/menus.cc:201 src/qtui/main_window_actions.cc:163
+#: src/gtkui/menus.cc:161 src/qtui/menus.cc:222
 msgid "_Sort"
 msgstr ""
 
-#: src/gtkui/menus.cc:202 src/qtui/main_window_actions.cc:164
+#: src/gtkui/menus.cc:162 src/qtui/menus.cc:223
 msgid "Sort Se_lected"
 msgstr ""
 
-#: src/gtkui/menus.cc:203 src/qtui/main_window_actions.cc:165
+#: src/gtkui/menus.cc:163 src/qtui/menus.cc:225
 msgid "Remove _Duplicates"
 msgstr ""
 
-#: src/gtkui/menus.cc:204 src/qtui/main_window_actions.cc:166
+#: src/gtkui/menus.cc:164 src/qtui/menus.cc:226
 msgid "Remove _Unavailable Files"
 msgstr ""
 
-#: src/gtkui/menus.cc:206 src/playlist-manager/playlist-manager.cc:244
-#: src/qtui/main_window_actions.cc:168
+#: src/gtkui/menus.cc:166 src/playlist-manager/playlist-manager.cc:219
+#: src/playlist-manager-qt/playlist-manager-qt.cc:348 src/qtui/menus.cc:229
 msgid "_New"
 msgstr ""
 
-#: src/gtkui/menus.cc:207
+#: src/gtkui/menus.cc:167 src/qtui/menus.cc:230
 msgid "Ren_ame ..."
 msgstr ""
 
-#: src/gtkui/menus.cc:208 src/gtkui/menus.cc:264
-#: src/qtui/main_window_actions.cc:170
+#: src/gtkui/menus.cc:168 src/gtkui/menus.cc:228
+#: src/moonstone/playlist_tabs.cc:311 src/qtui/menus.cc:231
+#: src/qtui/playlist_tabs.cc:336
 msgid "Remo_ve"
 msgstr ""
 
-#: src/gtkui/menus.cc:210
+#: src/gtkui/menus.cc:170 src/qtui/menus.cc:233
 msgid "_Import ..."
 msgstr ""
 
-#: src/gtkui/menus.cc:211
+#: src/gtkui/menus.cc:171 src/qtui/menus.cc:234
 msgid "_Export ..."
 msgstr ""
 
-#: src/gtkui/menus.cc:213
+#: src/gtkui/menus.cc:173 src/qtui/menus.cc:237
 msgid "Playlist _Manager ..."
 msgstr ""
 
-#: src/gtkui/menus.cc:214 src/qtui/main_window_actions.cc:176
+#: src/gtkui/menus.cc:174 src/qtui/menus.cc:239
 msgid "_Queue Manager ..."
 msgstr ""
 
-#: src/gtkui/menus.cc:218 src/qtui/main_window_actions.cc:180
+#: src/gtkui/menus.cc:178 src/qtui/menus.cc:243
 msgid "Volume _Up"
 msgstr ""
 
-#: src/gtkui/menus.cc:219 src/qtui/main_window_actions.cc:181
+#: src/gtkui/menus.cc:179 src/qtui/menus.cc:245
 msgid "Volume _Down"
 msgstr ""
 
-#: src/gtkui/menus.cc:221 src/qtui/main_window_actions.cc:183
-msgid "_Equalizer"
+#: src/gtkui/menus.cc:181 src/qtui/menus.cc:249
+msgid "_Equalizer ..."
 msgstr ""
 
-#: src/gtkui/menus.cc:223 src/qtui/main_window_actions.cc:185
+#: src/gtkui/menus.cc:182 src/qtui/menus.cc:251
 msgid "E_ffects ..."
 msgstr ""
 
-#: src/gtkui/menus.cc:227
+#: src/gtkui/menus.cc:184
+msgid "_Record Stream"
+msgstr ""
+
+#: src/gtkui/menus.cc:185
+msgid "Audio _Settings ..."
+msgstr ""
+
+#: src/gtkui/menus.cc:189 src/qtui/menus.cc:260
 msgid "Show _Menu Bar"
 msgstr ""
 
-#: src/gtkui/menus.cc:228
+#: src/gtkui/menus.cc:190 src/qtui/menus.cc:262
 msgid "Show I_nfo Bar"
 msgstr ""
 
-#: src/gtkui/menus.cc:229
+#: src/gtkui/menus.cc:191 src/qtui/menus.cc:264
+msgid "Show Info Bar _Album Art"
+msgstr ""
+
+#: src/gtkui/menus.cc:192 src/qtui/menus.cc:266
 msgid "Show Info Bar Vis_ualization"
 msgstr ""
 
-#: src/gtkui/menus.cc:230
+#: src/gtkui/menus.cc:193 src/qtui/menus.cc:268
 msgid "Show _Status Bar"
 msgstr ""
 
-#: src/gtkui/menus.cc:232
+#: src/gtkui/menus.cc:195 src/qtui/menus.cc:272
 msgid "Show _Remaining Time"
 msgstr ""
 
-#: src/gtkui/menus.cc:234
+#: src/gtkui/menus.cc:197 src/qtui/menus.cc:276 src/skins/menus.cc:157
+#: src/skins-qt/menus.cc:152
 msgid "_Visualizations ..."
 msgstr ""
 
-#: src/gtkui/menus.cc:238 src/qtui/main_window_actions.cc:189
+#: src/gtkui/menus.cc:201 src/qtui/menus.cc:280
 msgid "_File"
 msgstr ""
 
-#: src/gtkui/menus.cc:239 src/qtui/main_window_actions.cc:190
+#: src/gtkui/menus.cc:202 src/qtui/menus.cc:281
 msgid "_Playback"
 msgstr ""
 
-#: src/gtkui/menus.cc:240 src/qtui/main_window_actions.cc:191
+#: src/gtkui/menus.cc:203 src/qtui/menus.cc:282
 msgid "P_laylist"
 msgstr ""
 
-#: src/gtkui/menus.cc:241 src/gtkui/menus.cc:258
-#: src/qtui/main_window_actions.cc:192
+#: src/gtkui/menus.cc:204 src/gtkui/menus.cc:222 src/qtui/menus.cc:283
+#: src/qtui/menus.cc:312
 msgid "_Services"
 msgstr ""
 
-#: src/gtkui/menus.cc:242 src/qtui/main_window_actions.cc:193
+#: src/gtkui/menus.cc:205 src/qtui/menus.cc:284
 msgid "_Output"
 msgstr ""
 
-#: src/gtkui/menus.cc:243
+#: src/gtkui/menus.cc:206 src/qtui/menus.cc:285
 msgid "_View"
 msgstr ""
 
-#: src/gtkui/menus.cc:248
+#: src/gtkui/menus.cc:211 src/qtui/menus.cc:296
 msgid "_Queue/Unqueue"
 msgstr ""
 
-#: src/gtkui/menus.cc:250
+#: src/gtkui/menus.cc:213 src/qtui/menus.cc:299
 msgid "_Open Containing Folder"
 msgstr ""
 
-#: src/gtkui/menus.cc:253
+#: src/gtkui/menus.cc:214 src/qtui/menus.cc:301
+msgid "_Refresh Selected"
+msgstr ""
+
+#: src/gtkui/menus.cc:216 src/qtui/menus.cc:304
 msgid "Cu_t"
 msgstr ""
 
-#: src/gtkui/menus.cc:254
+#: src/gtkui/menus.cc:217 src/qtui/menus.cc:305
 msgid "_Copy"
 msgstr ""
 
-#: src/gtkui/menus.cc:255
+#: src/gtkui/menus.cc:218 src/qtui/menus.cc:306
 msgid "_Paste"
 msgstr ""
 
-#: src/gtkui/menus.cc:256
+#: src/gtkui/menus.cc:219 src/qtui/menus.cc:307
+msgid "Paste at _End"
+msgstr ""
+
+#: src/gtkui/menus.cc:220 src/qtui/menus.cc:309
 msgid "Select _All"
 msgstr ""
 
-#: src/gtkui/menus.cc:263
+#: src/gtkui/menus.cc:227 src/moonstone/playlist_tabs.cc:309
+#: src/qtui/playlist_tabs.cc:334
 msgid "_Rename ..."
 msgstr ""
 
-#: src/gtkui/settings.cc:35
+#: src/gtkui/settings.cc:35 src/qtui/settings.cc:59
+msgid "Always"
+msgstr ""
+
+#: src/gtkui/settings.cc:36 src/qtui/settings.cc:60
+msgid "Auto-hide"
+msgstr ""
+
+#: src/gtkui/settings.cc:37 src/qtui/settings.cc:61
+msgid "Never"
+msgstr ""
+
+#: src/gtkui/settings.cc:41 src/qtui/settings.cc:64
 msgid "Playlist Tabs"
 msgstr ""
 
-#: src/gtkui/settings.cc:36
-msgid "Always show tabs"
+#: src/gtkui/settings.cc:42 src/qtui/settings.cc:65
+msgid "Show playlist tabs:"
 msgstr ""
 
-#: src/gtkui/settings.cc:38
+#: src/gtkui/settings.cc:45 src/qtui/settings.cc:69
 msgid "Show entry counts"
 msgstr ""
 
-#: src/gtkui/settings.cc:40
+#: src/gtkui/settings.cc:47 src/qtui/settings.cc:72
 msgid "Show close buttons"
 msgstr ""
 
-#: src/gtkui/settings.cc:42
+#: src/gtkui/settings.cc:49 src/qtui/settings.cc:75
 msgid "Playlist Columns"
 msgstr ""
 
-#: src/gtkui/settings.cc:44
+#: src/gtkui/settings.cc:51 src/qtui/settings.cc:77
 msgid "Show column headers"
 msgstr ""
 
-#: src/gtkui/settings.cc:46 src/modplug/plugin_main.cc:106
-#: src/skins/skins_cfg.cc:263
-msgid "Miscellaneous"
+#: src/gtkui/settings.cc:53 src/qtui/settings.cc:82
+msgid "Make column headers clickable for sorting"
 msgstr ""
 
-#: src/gtkui/settings.cc:47
-msgid "Arrow keys seek by:"
+#: src/gtkui/settings.cc:56
+msgid "Use symbolic icons in toolbar"
 msgstr ""
 
-#: src/gtkui/settings.cc:50
+#: src/gtkui/settings.cc:58 src/qtui/settings.cc:86
 msgid "Scroll on song change"
 msgstr ""
 
-#: src/gtkui/ui_gtk.cc:71
+#: src/gtkui/ui_gtk.cc:82
 msgid "GTK Interface"
 msgstr ""
 
-#: src/gtkui/ui_gtk.cc:222 src/skins/ui_main.cc:232
+#: src/gtkui/ui_gtk.cc:219 src/skins/main.cc:228 src/skins-qt/main.cc:231
 #, c-format
 msgid "%s - Audacious"
 msgstr ""
 
-#: src/gtkui/ui_gtk.cc:225 src/qtui/main_window.cc:186
+#: src/gtkui/ui_gtk.cc:221 src/moonstone/main_window.cc:184
+#: src/qtui/main_window.cc:385
 msgid "Buffering ..."
 msgstr ""
 
-#: src/gtkui/ui_gtk.cc:228 src/skins/ui_main.cc:234 src/skins/ui_main.cc:1164
+#: src/gtkui/ui_gtk.cc:224 src/pipewire/pipewire.cc:402 src/skins/main.cc:230
+#: src/skins-qt/main.cc:233
 msgid "Audacious"
 msgstr ""
 
-#: src/gtkui/ui_statusbar.cc:63 src/qtui/status_bar.cc:67
+#: src/gtkui/ui_gtk.cc:487 src/gtkui/ui_gtk.cc:518 src/gtkui/ui_gtk.cc:882
+#: src/hotkey/gui.cc:72 src/moonstone/main_window.cc:67
+#: src/moonstone/main_window.cc:145 src/moonstone/main_window.cc:146
+#: src/notify/osd.cc:85 src/qthotkey/gui.cc:67 src/qtui/main_window.cc:154
+#: src/qtui/main_window.cc:347 src/qtui/main_window.cc:348
+#: src/skins/menus.cc:109 src/skins-qt/menus.cc:100
+msgid "Play"
+msgstr ""
+
+#: src/gtkui/ui_gtk.cc:487 src/moonstone/main_window.cc:151
+#: src/moonstone/main_window.cc:152 src/notify/osd.cc:82
+#: src/qtui/main_window.cc:353 src/qtui/main_window.cc:354
+#: src/skins/menus.cc:110 src/skins-qt/menus.cc:101
+msgid "Pause"
+msgstr ""
+
+#: src/gtkui/ui_gtk.cc:868 src/moonstone/main_window.cc:57
+#: src/qtui/main_window.cc:145 src/skins/menus.cc:86 src/skins-qt/menus.cc:77
+msgid "Search Library"
+msgstr ""
+
+#: src/gtkui/ui_gtk.cc:875 src/moonstone/main_window.cc:60
+#: src/qtui/main_window.cc:147
+msgid "Open Files"
+msgstr ""
+
+#: src/gtkui/ui_gtk.cc:876 src/moonstone/main_window.cc:62
+#: src/qtui/main_window.cc:149
+msgid "Add Files"
+msgstr ""
+
+#: src/gtkui/ui_gtk.cc:881 src/moonstone/main_window.cc:65
+#: src/qtui/main_window.cc:152 src/skins/menus.cc:112 src/skins-qt/menus.cc:103
+msgid "Previous"
+msgstr ""
+
+#: src/gtkui/ui_gtk.cc:883 src/hotkey/gui.cc:74 src/moonstone/main_window.cc:69
+#: src/qthotkey/gui.cc:69 src/qtui/main_window.cc:156 src/skins/menus.cc:111
+#: src/skins-qt/menus.cc:102
+msgid "Stop"
+msgstr ""
+
+#: src/gtkui/ui_gtk.cc:884 src/moonstone/main_window.cc:76 src/notify/osd.cc:89
+#: src/qtui/main_window.cc:163 src/skins/menus.cc:113 src/skins-qt/menus.cc:104
+msgid "Next"
+msgstr ""
+
+#: src/gtkui/ui_gtk.cc:886 src/moonstone/main_window.cc:79
+#: src/qtui/main_window.cc:166 src/qtui/menus.cc:254 src/skins/menus.cc:79
+#: src/skins-qt/menus.cc:69
+msgid "Record Stream"
+msgstr ""
+
+#: src/gtkui/ui_gtk.cc:919 src/moonstone/main_window.cc:86
+#: src/qtui/main_window.cc:173 src/skins/menus.cc:103 src/skins-qt/menus.cc:94
+msgid "Repeat"
+msgstr ""
+
+#: src/gtkui/ui_gtk.cc:922 src/moonstone/main_window.cc:89
+#: src/qtui/main_window.cc:176 src/skins/menus.cc:104 src/skins-qt/menus.cc:95
+msgid "Shuffle"
+msgstr ""
+
+#: src/gtkui/ui_gtk.cc:1114 src/qtui/main_window.cc:123
+msgid "Menu"
+msgstr ""
+
+#: src/gtkui/ui_statusbar.cc:64 src/qtui/status_bar.cc:155
 msgid "mono"
 msgstr ""
 
-#: src/gtkui/ui_statusbar.cc:65 src/qtui/status_bar.cc:69
+#: src/gtkui/ui_statusbar.cc:66 src/qtui/status_bar.cc:157
 msgid "stereo"
 msgstr ""
 
-#: src/gtkui/ui_statusbar.cc:67 src/qtui/status_bar.cc:71
+#: src/gtkui/ui_statusbar.cc:68 src/qtui/status_bar.cc:160
 #, c-format
 msgid "%d channel"
 msgid_plural "%d channels"
 msgstr0 ""
 msgstr1 ""
 
-#: src/gtkui/ui_statusbar.cc:81 src/qtui/status_bar.cc:85
+#: src/gtkui/ui_statusbar.cc:76 src/qtui/status_bar.cc:168
+#, c-format
+msgid "%d kHz"
+msgstr ""
+
+#: src/gtkui/ui_statusbar.cc:82 src/qtui/status_bar.cc:174
 #, c-format
-msgid "%d kbps"
+msgid "%d kbit/s"
 msgstr ""
 
-#: src/gtkui/ui_statusbar.cc:107 src/skins/ui_main_evlisteners.cc:103
+#: src/gtkui/ui_statusbar.cc:108 src/skins/main.cc:478 src/skins-qt/main.cc:461
 msgid "Single mode."
 msgstr ""
 
-#: src/gtkui/ui_statusbar.cc:109 src/skins/ui_main_evlisteners.cc:105
+#: src/gtkui/ui_statusbar.cc:110 src/skins/main.cc:480 src/skins-qt/main.cc:463
 msgid "Playlist mode."
 msgstr ""
 
-#: src/gtkui/ui_statusbar.cc:117 src/skins/ui_main_evlisteners.cc:111
+#: src/gtkui/ui_statusbar.cc:118 src/skins/main.cc:486 src/skins-qt/main.cc:469
 msgid "Stopping after song."
 msgstr ""
 
-#: src/hotkey/gui.cc:71
+#: src/hotkey/gui.cc:71 src/qthotkey/gui.cc:66
 msgid "Previous track"
 msgstr ""
 
-#: src/hotkey/gui.cc:72 src/notify/osd.cc:69 src/qtui/main_window.cc:69
-#: src/qtui/main_window.cc:172 src/qtui/main_window.cc:173
-#: src/skins/menus.cc:87
-msgid "Play"
-msgstr ""
-
-#: src/hotkey/gui.cc:73
+#: src/hotkey/gui.cc:73 src/qthotkey/gui.cc:68
 msgid "Pause/Resume"
 msgstr ""
 
-#: src/hotkey/gui.cc:74 src/qtui/main_window.cc:70 src/skins/menus.cc:89
-msgid "Stop"
-msgstr ""
-
-#: src/hotkey/gui.cc:75
+#: src/hotkey/gui.cc:75 src/qthotkey/gui.cc:70
 msgid "Next track"
 msgstr ""
 
-#: src/hotkey/gui.cc:76
-msgid "Forward 5 seconds"
+#: src/hotkey/gui.cc:76 src/qthotkey/gui.cc:71
+msgid "Step forward"
 msgstr ""
 
-#: src/hotkey/gui.cc:77
-msgid "Rewind 5 seconds"
+#: src/hotkey/gui.cc:77 src/qthotkey/gui.cc:72
+msgid "Step backward"
 msgstr ""
 
-#: src/hotkey/gui.cc:78
+#: src/hotkey/gui.cc:78 src/qthotkey/gui.cc:73
 msgid "Mute"
 msgstr ""
 
-#: src/hotkey/gui.cc:79
+#: src/hotkey/gui.cc:79 src/qthotkey/gui.cc:74
 msgid "Volume up"
 msgstr ""
 
-#: src/hotkey/gui.cc:80
+#: src/hotkey/gui.cc:80 src/qthotkey/gui.cc:75
 msgid "Volume down"
 msgstr ""
 
-#: src/hotkey/gui.cc:81
+#: src/hotkey/gui.cc:81 src/qthotkey/gui.cc:76
 msgid "Jump to file"
 msgstr ""
 
-#: src/hotkey/gui.cc:82
+#: src/hotkey/gui.cc:82 src/qthotkey/gui.cc:77
 msgid "Toggle player window(s)"
 msgstr ""
 
-#: src/hotkey/gui.cc:83
+#: src/hotkey/gui.cc:83 src/qthotkey/gui.cc:78
 msgid "Show On-Screen-Display"
 msgstr ""
 
-#: src/hotkey/gui.cc:84
+#: src/hotkey/gui.cc:84 src/qthotkey/gui.cc:79
 msgid "Toggle repeat"
 msgstr ""
 
-#: src/hotkey/gui.cc:85
+#: src/hotkey/gui.cc:85 src/qthotkey/gui.cc:80
 msgid "Toggle shuffle"
 msgstr ""
 
-#: src/hotkey/gui.cc:86
+#: src/hotkey/gui.cc:86 src/qthotkey/gui.cc:81
 msgid "Toggle stop after current"
 msgstr ""
 
-#: src/hotkey/gui.cc:87
+#: src/hotkey/gui.cc:87 src/qthotkey/gui.cc:82
 msgid "Raise player window(s)"
 msgstr ""
 
-#: src/hotkey/gui.cc:97
+#: src/hotkey/gui.cc:98 src/qthotkey/gui.cc:100
 msgid "(none)"
 msgstr ""
 
-#: src/hotkey/gui.cc:234
+#: src/hotkey/gui.cc:261
 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 modifiers.\n"
 "\n"
 "Do you want to continue?"
 msgstr ""
 
-#: src/hotkey/gui.cc:236
+#: src/hotkey/gui.cc:264
 msgid "Binding mouse buttons"
 msgstr ""
 
-#: src/hotkey/gui.cc:391
+#: src/hotkey/gui.cc:434
 msgid ""
 "Press a key combination inside a text field.\n"
 "You can also bind mouse buttons."
 msgstr ""
 
-#: src/hotkey/gui.cc:396
+#: src/hotkey/gui.cc:444 src/qthotkey/gui.cc:179
 msgid "Hotkeys:"
 msgstr ""
 
-#: src/hotkey/gui.cc:413
+#: src/hotkey/gui.cc:457 src/qthotkey/gui.cc:181
 msgid "Action:"
 msgstr ""
 
-#: src/hotkey/gui.cc:420
+#: src/hotkey/gui.cc:461 src/qthotkey/gui.cc:182
 msgid "Key Binding:"
 msgstr ""
 
-#: src/hotkey/gui.cc:468
+#: src/hotkey/gui.cc:518 src/qthotkey/gui.cc:184
 msgid "_Add"
 msgstr ""
 
-#: src/hotkey/plugin.cc:61
+#: src/hotkey/plugin.cc:59 src/qthotkey/plugin.cc:78
 msgid "Global Hotkeys"
 msgstr ""
 
-#: src/hotkey/plugin.cc:79
+#: src/hotkey/plugin.cc:74
 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"
+"Contributors 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"
@@ -2039,76 +2156,104 @@
 " Jeremy Tan <nsx@nsx.homeip.net>"
 msgstr ""
 
-#: src/jack-ng/jack-ng.cc:49
+#: src/jack/jack-ng.cc:54
 msgid "JACK Output"
 msgstr ""
 
-#: src/jack-ng/jack-ng.cc:114
+#: src/jack/jack-ng.cc:126
+msgid "Client name:"
+msgstr ""
+
+#: src/jack/jack-ng.cc:128
 msgid "Automatically connect to output ports"
 msgstr ""
 
-#: src/jack-ng/jack-ng.cc:155
+#: src/jack/jack-ng.cc:130
+msgid "Filter ports (regex, use any port if blank):"
+msgstr ""
+
+#: src/jack/jack-ng.cc:136
+msgid "Connect to physical ports only"
+msgstr ""
+
+#: src/jack/jack-ng.cc:139
+msgid "Upmix to"
+msgstr ""
+
+#: src/jack/jack-ng.cc:141
+msgid "ports if input has fewer channels"
+msgstr ""
+
+#: src/jack/jack-ng.cc:143
+msgid "Ignore insufficient number of ports"
+msgstr ""
+
+#: src/jack/jack-ng.cc:181
+msgid "No JACK output ports were found. Please check settings."
+msgstr ""
+
+#: src/jack/jack-ng.cc:195
 #, c-format
 msgid "Only %d JACK output ports were found but %d are required."
 msgstr ""
 
-#: src/jack-ng/jack-ng.cc:164
+#: src/jack/jack-ng.cc:210
 #, c-format
 msgid "Failed to connect to JACK port %s."
 msgstr ""
 
-#: src/jack-ng/jack-ng.cc:184
+#: src/jack/jack-ng.cc:230
 msgid ""
 "JACK supports only floating-point audio. You must change the output bit "
 "depth to floating-point in Audacious settings."
 msgstr ""
 
-#: src/jack-ng/jack-ng.cc:197
+#: src/jack/jack-ng.cc:245
 msgid "Failed to connect to the JACK server; is it running?"
 msgstr ""
 
-#: src/jack-ng/jack-ng.cc:273
+#: src/jack/jack-ng.cc:321
 #, c-format
 msgid ""
 "The JACK server requires a sample rate of %d Hz, but Audacious is playing at "
 "%d Hz. Please use the Sample Rate Converter effect to correct the mismatch."
 msgstr ""
 
-#: src/ladspa/plugin.cc:414
+#: src/ladspa/plugin.cc:416
 #, c-format
 msgid "%s Settings"
 msgstr ""
 
-#: src/ladspa/plugin.cc:478
+#: src/ladspa/plugin.cc:482
 msgid "Module paths:"
 msgstr ""
 
-#: src/ladspa/plugin.cc:483
+#: src/ladspa/plugin.cc:487
 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.cc:499
+#: src/ladspa/plugin.cc:508
 msgid "Available plugins:"
 msgstr ""
 
-#: src/ladspa/plugin.cc:512 src/modplug/plugin_main.cc:92
-#: src/modplug/plugin_main.cc:95 src/modplug/plugin_main.cc:98
-#: src/modplug/plugin_main.cc:101
+#: src/ladspa/plugin.cc:521 src/modplug/plugin_main.cc:91
+#: src/modplug/plugin_main.cc:94 src/modplug/plugin_main.cc:97
+#: src/modplug/plugin_main.cc:100
 msgid "Enable"
 msgstr ""
 
-#: src/ladspa/plugin.cc:518
+#: src/ladspa/plugin.cc:527
 msgid "Enabled plugins:"
 msgstr ""
 
-#: src/ladspa/plugin.cc:534
+#: src/ladspa/plugin.cc:543
 msgid "Settings"
 msgstr ""
 
-#: src/ladspa/plugin.cc:551
+#: src/ladspa/plugin.cc:560
 msgid ""
 "LADSPA Host for Audacious\n"
 "Copyright 2011 John Lindgren"
@@ -2122,7 +2267,7 @@
 msgid "LIRC Plugin"
 msgstr ""
 
-#: src/lirc/lirc.cc:381
+#: src/lirc/lirc.cc:379
 msgid ""
 "A simple plugin to control Audacious using the LIRC remote control daemon\n"
 "\n"
@@ -2138,63 +2283,123 @@
 "For more information about LIRC, see http://lirc.org."
 msgstr ""
 
-#: src/lirc/lirc.cc:392
+#: src/lirc/lirc.cc:390
 msgid "Connection"
 msgstr ""
 
-#: src/lirc/lirc.cc:393
+#: src/lirc/lirc.cc:391
 msgid "Reconnect to LIRC server"
 msgstr ""
 
-#: src/lirc/lirc.cc:395
+#: src/lirc/lirc.cc:393
 msgid "Wait before reconnecting:"
 msgstr ""
 
-#: src/lyricwiki/lyricwiki.cc:41
-msgid "LyricWiki Plugin"
+#: src/lyrics-common/chart_lyrics_provider.cc:93
+#: src/lyrics-common/chart_lyrics_provider.cc:150
+#: src/lyrics-common/lyrics_ovh_provider.cc:50
+#, c-format
+msgid "Unable to fetch %s"
+msgstr ""
+
+#: src/lyrics-common/chart_lyrics_provider.cc:100
+#: src/lyrics-common/chart_lyrics_provider.cc:157
+#: src/lyrics-common/lyrics_ovh_provider.cc:57
+#, c-format
+msgid "Unable to parse %s"
+msgstr ""
+
+#: src/lyrics-common/chart_lyrics_provider.cc:121
+#: src/lyrics-common/chart_lyrics_provider.cc:194
+#: src/lyrics-common/lyrics_ovh_provider.cc:88
+msgid "Looking for lyrics ..."
+msgstr ""
+
+#: src/lyrics-common/preferences.h:43
+msgid "Nowhere"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:49
+msgid "Artist is truncated at the start, Title -- at the end"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:50
+msgid "Chars to truncate on:"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:54
+msgid "Chars are ORed in RegExp, surrounded by whitespace"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:55
+msgid "Chars to split on:"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:56
+msgid "Further truncate those on chars"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:62
+msgid "General"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:63
+msgid "Split title into artist and title on chars"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:66
+msgid "Sources"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:67
+msgid "Use embedded lyrics (from Lyrics tag)"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:69
+msgid "Fetch lyrics from internet:"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:72
+msgid "Store fetched lyrics in local cache"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:74
+msgid "Local Storage"
 msgstr ""
 
-#: src/lyricwiki/lyricwiki.cc:131 src/lyricwiki-qt/lyricwiki.cc:136
-msgid "No lyrics available"
+#: src/lyrics-common/preferences.h:75
+msgid "Load lyric files (.lrc) from local storage"
 msgstr ""
 
-#: src/lyricwiki/lyricwiki.cc:217 src/lyricwiki/lyricwiki.cc:226
-#: src/lyricwiki/lyricwiki.cc:243 src/lyricwiki/lyricwiki.cc:252
-#: src/lyricwiki/lyricwiki.cc:267 src/lyricwiki-qt/lyricwiki.cc:222
-#: src/lyricwiki-qt/lyricwiki.cc:231 src/lyricwiki-qt/lyricwiki.cc:248
-#: src/lyricwiki-qt/lyricwiki.cc:257 src/lyricwiki-qt/lyricwiki.cc:272
+#: src/lyrics-common/utils.cc:54 src/ui-common/dialogs-qt.cc:63
 msgid "Error"
 msgstr ""
 
-#: src/lyricwiki/lyricwiki.cc:218 src/lyricwiki/lyricwiki.cc:244
-#: src/lyricwiki-qt/lyricwiki.cc:223 src/lyricwiki-qt/lyricwiki.cc:249
-#, c-format
-msgid "Unable to fetch %s"
+#: src/lyrics-common/utils.cc:60
+msgid "Lyrics could not be found."
 msgstr ""
 
-#: src/lyricwiki/lyricwiki.cc:227 src/lyricwiki/lyricwiki.cc:253
-#: src/lyricwiki-qt/lyricwiki.cc:232 src/lyricwiki-qt/lyricwiki.cc:258
-#, c-format
-msgid "Unable to parse %s"
+#: src/lyrics-common/utils.cc:142
+msgid "Missing title and/or artist."
 msgstr ""
 
-#: src/lyricwiki/lyricwiki.cc:259 src/lyricwiki-qt/lyricwiki.cc:264
-msgid "Looking for lyrics ..."
+#: src/lyrics-gtk/lyrics-gtk.cc:37 src/lyrics-qt/lyrics-qt.cc:50
+msgid "Lyrics"
 msgstr ""
 
-#: src/lyricwiki/lyricwiki.cc:267 src/lyricwiki-qt/lyricwiki.cc:272
-msgid "Missing song metadata"
+#: src/lyrics-gtk/lyrics-gtk.cc:189 src/lyrics-qt/lyrics-qt.cc:171
+msgid "Edit Lyrics ..."
 msgstr ""
 
-#: src/lyricwiki/lyricwiki.cc:278 src/lyricwiki-qt/lyricwiki.cc:283
-msgid "Connecting to lyrics.wikia.com ..."
+#: src/lyrics-gtk/lyrics-gtk.cc:195 src/lyrics-qt/lyrics-qt.cc:178
+msgid "Save Locally"
 msgstr ""
 
-#: src/lyricwiki-qt/lyricwiki.cc:55
-msgid "LyricWiki Plugin (Qt)"
+#: src/lyrics-gtk/lyrics-gtk.cc:201 src/lyrics-qt/lyrics-qt.cc:186
+msgid "Refresh"
 msgstr ""
 
-#: src/m3u/m3u.cc:32
+#: src/m3u/m3u.cc:33
 msgid "M3U Playlists"
 msgstr ""
 
@@ -2202,17 +2407,17 @@
 msgid "Tact Generator"
 msgstr ""
 
-#: src/metronom/metronom.cc:147
+#: src/metronom/metronom.cc:145
 #, c-format
 msgid "Tact generator: %d bpm"
 msgstr ""
 
-#: src/metronom/metronom.cc:149
+#: src/metronom/metronom.cc:147
 #, c-format
 msgid "Tact generator: %d bpm %d/%d"
 msgstr ""
 
-#: src/metronom/metronom.cc:237
+#: src/metronom/metronom.cc:235
 msgid ""
 "A Tact Generator by Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
 "\n"
@@ -2221,21 +2426,21 @@
 "or tact://60*3/4 to play 60 bpm in 3/4 tacts"
 msgstr ""
 
-#: src/mixer/mixer.cc:38
+#: src/mixer/mixer.cc:43
 msgid "Channel Mixer"
 msgstr ""
 
-#: src/mixer/mixer.cc:202
+#: src/mixer/mixer.cc:255
 msgid ""
 "Channel Mixer Plugin for Audacious\n"
 "Copyright 2011-2012 John Lindgren and Michał Lipski"
 msgstr ""
 
-#: src/mixer/mixer.cc:206
+#: src/mixer/mixer.cc:259
 msgid "Channel Mixer"
 msgstr ""
 
-#: src/mixer/mixer.cc:207
+#: src/mixer/mixer.cc:260
 msgid "Output channels:"
 msgstr ""
 
@@ -2247,168 +2452,176 @@
 msgid "Error connecting to MMS server"
 msgstr ""
 
-#: src/modplug/modplugbmp.h:53
+#: src/modplug/modplugbmp.h:57
 msgid "ModPlug (Module Player)"
 msgstr ""
 
-#: src/modplug/plugin_main.cc:53
-msgid "Resolution"
-msgstr ""
-
-#: src/modplug/plugin_main.cc:54
-msgid "8-bit"
-msgstr ""
-
 #: src/modplug/plugin_main.cc:55
-msgid "16-bit"
-msgstr ""
-
-#: src/modplug/plugin_main.cc:56
 msgid "Channels"
 msgstr ""
 
-#: src/modplug/plugin_main.cc:60
+#: src/modplug/plugin_main.cc:59
 msgid "Nearest (fastest)"
 msgstr ""
 
-#: src/modplug/plugin_main.cc:61
+#: src/modplug/plugin_main.cc:60
 msgid "Linear (fast)"
 msgstr ""
 
-#: src/modplug/plugin_main.cc:62
+#: src/modplug/plugin_main.cc:61
 msgid "Spline (good)"
 msgstr ""
 
-#: src/modplug/plugin_main.cc:63
+#: src/modplug/plugin_main.cc:62
 msgid "Polyphase (best)"
 msgstr ""
 
-#: src/modplug/plugin_main.cc:64
+#: src/modplug/plugin_main.cc:63
 msgid "Sample rate"
 msgstr ""
 
-#: src/modplug/plugin_main.cc:65
+#: src/modplug/plugin_main.cc:64
 msgid "22 kHz"
 msgstr ""
 
-#: src/modplug/plugin_main.cc:66
+#: src/modplug/plugin_main.cc:65
 msgid "44 kHz"
 msgstr ""
 
-#: src/modplug/plugin_main.cc:67
+#: src/modplug/plugin_main.cc:66
 msgid "48 kHz"
 msgstr ""
 
-#: src/modplug/plugin_main.cc:68
+#: src/modplug/plugin_main.cc:67
 msgid "96 kHz"
 msgstr ""
 
-#: src/modplug/plugin_main.cc:72 src/modplug/plugin_main.cc:77
-#: src/modplug/plugin_main.cc:82
+#: src/modplug/plugin_main.cc:71 src/modplug/plugin_main.cc:76
+#: src/modplug/plugin_main.cc:81
 msgid "Level:"
 msgstr ""
 
-#: src/modplug/plugin_main.cc:78
+#: src/modplug/plugin_main.cc:77
 msgid "Cutoff:"
 msgstr ""
 
-#: src/modplug/plugin_main.cc:91
+#: src/modplug/plugin_main.cc:90
 msgid "Reverb"
 msgstr ""
 
-#: src/modplug/plugin_main.cc:94
+#: src/modplug/plugin_main.cc:93
 msgid "Bass Boost"
 msgstr ""
 
-#: src/modplug/plugin_main.cc:97
+#: src/modplug/plugin_main.cc:96
 msgid "Surround"
 msgstr ""
 
-#: src/modplug/plugin_main.cc:100
+#: src/modplug/plugin_main.cc:99
 msgid "Preamp"
 msgstr ""
 
-#: src/modplug/plugin_main.cc:107
+#: src/modplug/plugin_main.cc:106
 msgid "Oversample"
 msgstr ""
 
-#: src/modplug/plugin_main.cc:108
+#: src/modplug/plugin_main.cc:107
 msgid "Noise reduction"
 msgstr ""
 
-#: src/modplug/plugin_main.cc:109
+#: src/modplug/plugin_main.cc:108
 msgid "Play Amiga MODs"
 msgstr ""
 
-#: src/modplug/plugin_main.cc:110
+#: src/modplug/plugin_main.cc:109
 msgid "Repeat"
 msgstr ""
 
-#: src/modplug/plugin_main.cc:111
+#: src/modplug/plugin_main.cc:110
 msgid "Repeat count:"
 msgstr ""
 
-#: src/modplug/plugin_main.cc:112
+#: src/modplug/plugin_main.cc:111
 msgid "To repeat forever, set the repeat count to -1."
 msgstr ""
 
-#: src/modplug/plugin_main.cc:125 src/sid/xs_config.cc:106
+#: src/modplug/plugin_main.cc:124 src/sid/xs_config.cc:106
 msgid "These settings will take effect when Audacious is restarted."
 msgstr ""
 
-#: src/mpg123/mpg123.cc:54
-msgid "MPG123 Plugin"
+#: src/moonstone/main_window.cc:72 src/moonstone/main_window.cc:73
+#: src/qtui/main_window.cc:159 src/qtui/main_window.cc:160
+#: src/skins/menus.cc:107 src/skins-qt/menus.cc:98
+msgid "Stop After This Song"
 msgstr ""
 
-#: src/mpg123/mpg123.cc:83
-msgid "Advanced"
+#: src/moonstone/moonstone.cc:39
+msgid "Moonstone"
+msgstr ""
+
+#: src/moonstone/playlist_header.cc:212 src/qtui/playlist_header.cc:258
+msgid "Reset to Defaults"
+msgstr ""
+
+#: src/moonstone/playlist_model.cc:38 src/qtui/playlist_header.cc:232
+msgid "Now Playing"
 msgstr ""
 
-#: src/mpg123/mpg123.cc:84
+#: src/moonstone/playlist_selection.cc:66
+#: src/playlist-manager/playlist-manager.cc:201
+#: src/playlist-manager-qt/playlist-manager-qt.cc:190
+msgid "Entries"
+msgstr ""
+
+#: src/mpg123/mpg123.cc:54
+msgid "MPG123 Plugin"
+msgstr ""
+
+#: src/mpg123/mpg123.cc:82
 msgid "Use accurate length calculation (slow)"
 msgstr ""
 
-#: src/mpg123/mpg123.cc:248
+#: src/mpg123/mpg123.cc:260
 msgid "Surround"
 msgstr ""
 
-#: src/mpris2/plugin.cc:39
+#: src/mpris2/plugin.cc:40
 msgid "MPRIS 2 Server"
 msgstr ""
 
-#: src/neon/neon.cc:97
+#: src/neon/neon.cc:102
 msgid "Neon HTTP/HTTPS Plugin"
 msgstr ""
 
-#: src/neon/neon.cc:521
+#: src/neon/neon.cc:526
 msgid "Error parsing redirect"
 msgstr ""
 
-#: src/neon/neon.cc:535
+#: src/neon/neon.cc:540
 msgid "Unknown HTTP error"
 msgstr ""
 
-#: src/neon/neon.cc:569
+#: src/neon/neon.cc:614
 msgid "Error parsing URL"
 msgstr ""
 
-#: src/neon/neon.cc:632
+#: src/neon/neon.cc:687
 msgid "Too many redirects"
 msgstr ""
 
-#: src/notify/event.cc:64
+#: src/notify/event.cc:97
 msgid "Stopped"
 msgstr ""
 
-#: src/notify/event.cc:64
+#: src/notify/event.cc:97
 msgid "Audacious is not playing."
 msgstr ""
 
-#: src/notify/notify.cc:42
+#: src/notify/notify.cc:39
 msgid "Desktop Notifications"
 msgstr ""
 
-#: src/notify/notify.cc:60
+#: src/notify/notify.cc:57
 msgid ""
 "Desktop Notifications Plugin for Audacious\n"
 "Copyright (C) 2010 Maximilian Bogner\n"
@@ -2428,36 +2641,76 @@
 "this program. If not, see <http://www.gnu.org/licenses/>."
 msgstr ""
 
-#: src/notify/notify.cc:110
+#: src/notify/notify.cc:104
 msgid "Show playback controls"
 msgstr ""
 
-#: src/notify/notify.cc:112
+#: src/notify/notify.cc:106
 msgid "Always show notification"
 msgstr ""
 
-#: src/notify/notify.cc:114
+#: src/notify/notify.cc:108
 msgid "Include album name in notification"
 msgstr ""
 
-#: src/notify/osd.cc:58
+#: src/notify/notify.cc:110
+msgid "Custom notification duration:"
+msgstr ""
+
+#: src/notify/osd.cc:74
 msgid "Show"
 msgstr ""
 
-#: src/notify/osd.cc:66 src/qtui/main_window.cc:178
-#: src/qtui/main_window.cc:179 src/skins/menus.cc:88
-msgid "Pause"
+#: src/openmpt/mpt.cc:50
+msgid "OpenMPT (Module Player)"
 msgstr ""
 
-#: src/notify/osd.cc:73 src/qtui/main_window.cc:72 src/skins/menus.cc:91
-msgid "Next"
+#: src/openmpt/mpt.cc:132
+msgid ""
+"Module player based on libopenmpt\n"
+"\n"
+"Written by: Chris Spiegel <cspiegel@gmail.com>"
+msgstr ""
+
+#: src/openmpt/mpt.cc:151
+msgid "Stereo separation:"
+msgstr ""
+
+#: src/openmpt/mpt.cc:153
+msgid "% (0=mono, 100=default, 200=full)"
+msgstr ""
+
+#: src/openmpt/mpt.cc:157
+msgid "Interpolation:"
+msgstr ""
+
+#: src/openmpt/mptwrap.h:51 src/soxr/sox-resampler.cc:189 src/xsf/plugin.cc:437
+msgid "Linear"
+msgstr ""
+
+#: src/openmpt/mptwrap.h:52
+msgid "Cubic"
+msgstr ""
+
+#: src/openmpt/mptwrap.h:53
+msgid "Windowed sinc"
+msgstr ""
+
+#: src/opus/opus.cc:39
+msgid "Opus Decoder"
+msgstr ""
+
+#: src/opus/opus.cc:336
+msgid ""
+"Opus Decoder Plugin for Audacious\n"
+"Copyright 2022 Thomas Lange"
 msgstr ""
 
-#: src/oss4/oss.h:93
+#: src/oss4/oss.h:70
 msgid "OSS4 Output"
 msgstr ""
 
-#: src/oss4/oss.h:95
+#: src/oss4/oss.h:72
 msgid "OSS3 Output"
 msgstr ""
 
@@ -2465,27 +2718,27 @@
 msgid "Default device"
 msgstr ""
 
-#: src/oss4/plugin.cc:77
+#: src/oss4/plugin.cc:78
 msgid "Audio device:"
 msgstr ""
 
-#: src/oss4/plugin.cc:80
+#: src/oss4/plugin.cc:81
 msgid "Use alternate device:"
 msgstr ""
 
-#: src/oss4/plugin.cc:84
+#: src/oss4/plugin.cc:85
 msgid "Save volume between sessions."
 msgstr ""
 
-#: src/oss4/plugin.cc:86
+#: src/oss4/plugin.cc:87
 msgid "Enable format conversions made by the OSS software."
 msgstr ""
 
-#: src/oss4/plugin.cc:88
+#: src/oss4/plugin.cc:89
 msgid "Enable exclusive mode to prevent virtual mixing."
 msgstr ""
 
-#: src/oss4/plugin.cc:100
+#: src/oss4/plugin.cc:101
 msgid ""
 "OSS4 Output Plugin for Audacious\n"
 "Copyright 2010-2012 Michał Lipski\n"
@@ -2494,19 +2747,35 @@
 "Lindgren and of course the authors of the previous OSS plugin."
 msgstr ""
 
-#: src/playlist-manager/playlist-manager.cc:37
-msgid "Playlist Manager"
+#: src/pipewire/pipewire.cc:44
+msgid "PipeWire Output"
 msgstr ""
 
-#: src/playlist-manager/playlist-manager.cc:226
-msgid "Entries"
+#: src/pipewire/pipewire.cc:118
+msgid ""
+"PipeWire Output Plugin for Audacious\n"
+"Copyright 2022 Thomas Lange\n"
+"\n"
+"Based on the PipeWire Output Plugin for Qmmp\n"
+"Copyright 2021 Ilya Kotov"
+msgstr ""
+
+#: src/pipewire/pipewire.cc:408 src/skins/menus.cc:88 src/skins-qt/menus.cc:79
+msgid "Playback"
+msgstr ""
+
+#: src/playlist-manager/playlist-manager.cc:38
+#: src/playlist-manager-qt/playlist-manager-qt.cc:42
+msgid "Playlist Manager"
 msgstr ""
 
-#: src/playlist-manager/playlist-manager.cc:245
+#: src/playlist-manager/playlist-manager.cc:221
+#: src/playlist-manager-qt/playlist-manager-qt.cc:356
 msgid "_Remove"
 msgstr ""
 
-#: src/playlist-manager/playlist-manager.cc:246
+#: src/playlist-manager/playlist-manager.cc:222
+#: src/playlist-manager-qt/playlist-manager-qt.cc:351
 msgid "Ren_ame"
 msgstr ""
 
@@ -2514,39 +2783,54 @@
 msgid "PLS Playlists"
 msgstr ""
 
-#: src/psf/plugin.cc:45
+#: src/psf/plugin.cc:53
 msgid "OpenPSF PSF1/PSF2 Decoder"
 msgstr ""
 
-#: src/pulse_audio/pulse_audio.cc:38
+#: src/psf/plugin.cc:270
+msgid "OpenPSF Configuration"
+msgstr ""
+
+#: src/psf/plugin.cc:271 src/xsf/plugin.cc:444
+msgid "Ignore length from file"
+msgstr ""
+
+#: src/pulse/pulse_audio.cc:42
 msgid "PulseAudio Output"
 msgstr ""
 
-#: src/pulse_audio/pulse_audio.cc:611
+#: src/pulse/pulse_audio.cc:84
+msgid "Context name:"
+msgstr ""
+
+#: src/pulse/pulse_audio.cc:86
+msgid "Stream name:"
+msgstr ""
+
+#: src/pulse/pulse_audio.cc:596
 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"
+"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,\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"
+"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\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."
+"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/qtaudio/qtaudio.cc:49
+#: src/qtaudio/qtaudio.cc:53
 msgid "QtMultimedia Output"
 msgstr ""
 
-#: src/qtaudio/qtaudio.cc:77
+#: src/qtaudio/qtaudio.cc:84
 msgid ""
 "QtMultimedia Audio Output Plugin for Audacious\n"
 "Copyright 2014 William Pitcock\n"
@@ -2555,50 +2839,87 @@
 "Copyright 2010 John Lindgren"
 msgstr ""
 
-#: src/qtui/dialog_windows.cc:31
-msgid "Working ..."
+#: src/qtglspectrum/gl-spectrum.cc:41
+msgid ""
+"OpenGL Spectrum Analyzer for Audacious\n"
+"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
+"Copyright 2014, 2020 Ariadne Conill\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/qtui/filter_input.cc:44 src/skins/ui_playlist.cc:221
-msgid "Search"
+#: src/qthotkey/gui.cc:177
+msgid "Press a key combination inside a text field."
+msgstr ""
+
+#: src/qthotkey/plugin.cc:105
+msgid ""
+"Global Hotkey Plugin\n"
+"Control the player with global key combinations or multimedia keys.\n"
+"\n"
+"Copyright (C) 2020 i.Dark_Templar <darktemplar@dark-templar-archives.net>\n"
+"Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n"
+"\n"
+"Contributors 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/qtui/main_window_actions.cc:94
+#: src/qtui/menus.cc:109
 msgid "_Open Folder ..."
 msgstr ""
 
-#: src/qtui/main_window_actions.cc:96
+#: src/qtui/menus.cc:115
 msgid "_Add Folder ..."
 msgstr ""
 
-#: src/qtui/main_window_actions.cc:101
+#: src/qtui/menus.cc:128
 msgid "_Log Inspector ..."
 msgstr ""
 
-#: src/qtui/main_window.cc:64
-msgid "Open Files"
+#: src/qtui/menus.cc:220
+msgid "_Find ..."
 msgstr ""
 
-#: src/qtui/main_window.cc:66
-msgid "Add Files"
+#: src/qtui/menus.cc:256 src/skins/menus.cc:80 src/skins-qt/menus.cc:70
+msgid "Audio Settings ..."
 msgstr ""
 
-#: src/qtui/main_window.cc:71 src/skins/menus.cc:90
-msgid "Previous"
+#: src/qtui/playlist_model.cc:188
+msgid "Q#"
 msgstr ""
 
-#: src/qtui/main_window.cc:77 src/skins/menus.cc:82
-msgid "Repeat"
+#: src/qtui/playlist_model.cc:190
+msgid "T#"
 msgstr ""
 
-#: src/qtui/main_window.cc:79 src/skins/menus.cc:83
-msgid "Shuffle"
+#: src/qtui/playlist_model.cc:192
+msgid "C#"
+msgstr ""
+
+#: src/qtui/playlist_model.cc:194
+msgid "D#"
 msgstr ""
 
-#: src/qtui/qtui.cc:42
+#: src/qtui/qtui.cc:40
 msgid "Qt Interface"
 msgstr ""
 
+#: src/qtui/search_bar.cc:46
+msgid "Search playlist"
+msgstr ""
+
+#: src/qtui/settings.cc:79
+msgid "Use bold font for column headers"
+msgstr ""
+
 #: src/resample/resample.cc:43
 msgid "Sample Rate Converter"
 msgstr ""
@@ -2637,7 +2958,7 @@
 msgid "Method:"
 msgstr ""
 
-#: src/resample/resample.cc:199 src/sox-resampler/sox-resampler.cc:161
+#: src/resample/resample.cc:199 src/soxr/sox-resampler.cc:203
 msgid "Rate:"
 msgstr ""
 
@@ -2689,160 +3010,151 @@
 msgid "192 kHz:"
 msgstr ""
 
-#: src/scrobbler2/config_window.cc:41
-#, c-format
-msgid "OK. Scrobbling for user: %s"
-msgstr ""
-
-#: src/scrobbler2/config_window.cc:54
-msgid "Permission Denied"
-msgstr ""
-
-#: src/scrobbler2/config_window.cc:56
-msgid "Access the following link to allow Audacious to scrobble your plays:"
-msgstr ""
-
-#: src/scrobbler2/config_window.cc:66
-msgid "Keep this window open and click 'Check Permission' again.\n"
+#: src/scrobbler2/config_window.cc:29
+msgid "Checking Last.fm access ..."
 msgstr ""
 
-#: src/scrobbler2/config_window.cc:69 src/scrobbler2/config_window.cc:80
+#: src/scrobbler2/config_window.cc:35
 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."
+"Your scrobbles are being saved on your computer temporarily. They will be "
+"submitted as soon as Audacious is allowed access."
 msgstr ""
 
-#: src/scrobbler2/config_window.cc:77
-msgid "Network Problem."
+#: src/scrobbler2/config_window.cc:41
+#, c-format
+msgid "Permission granted. Scrobbling for user %s."
 msgstr ""
 
-#: src/scrobbler2/config_window.cc:78
-msgid "There was a problem contacting Last.fm. Please try again later."
+#: src/scrobbler2/config_window.cc:44
+msgid ""
+"Permission denied. Open the following URL in a browser, allow Audacious "
+"access to your account, and then click 'Check Permission' again:"
 msgstr ""
 
-#: src/scrobbler2/config_window.cc:110
-msgid "Checking..."
+#: src/scrobbler2/config_window.cc:53
+msgid "There was a problem contacting Last.fm."
 msgstr ""
 
-#: src/scrobbler2/config_window.cc:176
-msgid "C_heck Permission"
+#: src/scrobbler2/config_window.cc:92
+msgid "Check Permission"
 msgstr ""
 
-#: src/scrobbler2/config_window.cc:177
-msgid "_Revoke Permission"
+#: src/scrobbler2/config_window.cc:93
+msgid "Revoke Permission"
 msgstr ""
 
-#: src/scrobbler2/config_window.cc:220
-msgid ""
-"You need to allow Audacious to scrobble tracks to your Last.fm account.\n"
+#: src/scrobbler2/config_window.cc:97
+msgid "You need to allow Audacious to scrobble tracks to your Last.fm account."
 msgstr ""
 
 #: src/scrobbler2/scrobbler.cc:29
 msgid "Scrobbler 2.0"
 msgstr ""
 
-#: src/scrobbler2/scrobbler.cc:224
+#: src/scrobbler2/scrobbler.cc:200
 msgid ""
 "The Scrobbler plugin could not be started.\n"
 "There might be a problem with your installation."
 msgstr ""
 
-#: src/scrobbler2/scrobbler.cc:289
+#: src/scrobbler2/scrobbler.cc:245
 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_communication.cc:642
-msgid ""
-"Audacious is now using an improved version of the Last.fm Scrobbler.\n"
-"Please check the Preferences for the Scrobbler plugin."
+"project."
 msgstr ""
 
-#: src/sdlout/sdlout.cc:48
+#: src/sdlout/sdlout.cc:43
 msgid "SDL Output"
 msgstr ""
 
-#: src/sdlout/sdlout.cc:77
+#: src/sdlout/sdlout.cc:72
 msgid ""
 "SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
 msgstr ""
 
-#: src/search-tool/search-tool.cc:116 src/search-tool/search-tool.cc:124
+#: src/search-tool/library.cc:35 src/search-tool/library.cc:46
+#: src/search-tool-qt/library.cc:35 src/search-tool-qt/library.cc:46
 msgid "Library"
 msgstr ""
 
-#: src/search-tool/search-tool.cc:394
-#, c-format
-msgid "%d result"
-msgid_plural "%d results"
-msgstr0 ""
-msgstr1 ""
-
-#: src/search-tool/search-tool.cc:400
-#, c-format
-msgid "(%d hidden)"
-msgid_plural "(%d hidden)"
-msgstr0 ""
-msgstr1 ""
-
-#: src/search-tool/search-tool.cc:594
+#: src/search-tool-qt/search-model.cc:44 src/search-tool/search-tool.cc:287
 #, c-format
 msgid "%d song"
 msgid_plural "%d songs"
 msgstr0 ""
 msgstr1 ""
 
-#: src/search-tool/search-tool.cc:601
+#: src/search-tool-qt/search-model.cc:53 src/search-tool/search-tool.cc:294
 msgid "of this genre"
 msgstr ""
 
-#: src/search-tool/search-tool.cc:607
+#: src/search-tool-qt/search-model.h:47 src/search-tool/search-model.h:45
 msgid "on"
 msgstr ""
 
-#: src/search-tool/search-tool.cc:607
+#: src/search-tool-qt/search-model.h:47 src/search-tool/search-model.h:45
 msgid "by"
 msgstr ""
 
-#: src/search-tool/search-tool.cc:643
-msgid "_Create Playlist"
+#: src/search-tool-qt/search-tool-qt.cc:165 src/search-tool/search-tool.cc:74
+msgid "Number of results to show:"
 msgstr ""
 
-#: src/search-tool/search-tool.cc:645
-msgid "_Add to Playlist"
+#: src/search-tool-qt/search-tool-qt.cc:168 src/search-tool/search-tool.cc:77
+msgid "Rescan library at startup"
 msgstr ""
 
-#: src/search-tool/search-tool.cc:684
-msgid "Search library"
+#: src/search-tool-qt/search-tool-qt.cc:170
+msgid "Monitor library for changes"
 msgstr ""
 
-#: src/search-tool/search-tool.cc:688
+#: src/search-tool-qt/search-tool-qt.cc:193 src/search-tool/search-tool.cc:450
 msgid ""
 "To import your music library into Audacious, choose a folder and then click "
 "the \"refresh\" icon."
 msgstr ""
 
-#: src/search-tool/search-tool.cc:696
+#: src/search-tool-qt/search-tool-qt.cc:195 src/search-tool/search-tool.cc:459
 msgid "Please wait ..."
 msgstr ""
 
-#: src/search-tool/search-tool.cc:723
+#: src/search-tool-qt/search-tool-qt.cc:197 src/search-tool/search-tool.cc:487
 msgid "Choose Folder"
 msgstr ""
 
-#: src/sid/xmms-sid.cc:43
-msgid "SID Player"
+#: src/search-tool-qt/search-tool-qt.cc:201 src/search-tool/search-tool.cc:445
+msgid "Search library"
 msgstr ""
 
-#: src/sid/xs_config.cc:61
-msgid "Output"
+#: src/search-tool-qt/search-tool-qt.cc:327 src/search-tool/search-tool.cc:156
+#, c-format
+msgid "%d of %d result shown"
+msgid_plural "%d of %d results shown"
+msgstr0 ""
+msgstr1 ""
+
+#: src/search-tool-qt/search-tool-qt.cc:331 src/search-tool/search-tool.cc:160
+#, c-format
+msgid "%d result"
+msgid_plural "%d results"
+msgstr0 ""
+msgstr1 ""
+
+#: src/search-tool-qt/search-tool-qt.cc:501 src/search-tool/search-tool.cc:341
+msgid "_Create Playlist"
+msgstr ""
+
+#: src/search-tool-qt/search-tool-qt.cc:503 src/search-tool/search-tool.cc:343
+msgid "_Add to Playlist"
+msgstr ""
+
+#: src/sid/xmms-sid.cc:43
+msgid "SID Player"
 msgstr ""
 
 #: src/sid/xs_config.cc:62
@@ -2923,737 +3235,680 @@
 msgid "Threshold:"
 msgstr ""
 
-#: src/silence-removal/silence-removal.cc:70
-msgid "dB"
+#: src/skins/actions.cc:45 src/skins-qt/actions.cc:43
+msgid "Repeat points cleared."
 msgstr ""
 
-#: src/skins/menus.cc:64
-msgid "Open Files ..."
+#: src/skins/actions.cc:60 src/skins-qt/actions.cc:58
+msgid "Repeat point A set."
 msgstr ""
 
-#: src/skins/menus.cc:65
-msgid "Open URL ..."
+#: src/skins/actions.cc:65 src/skins-qt/actions.cc:63
+msgid "Repeat point B set."
 msgstr ""
 
-#: src/skins/menus.cc:66
-msgid "Search Library"
+#: src/skins/equalizer.cc:223 src/skins-qt/equalizer.cc:223
+msgid "Preamp"
 msgstr ""
 
-#: src/skins/menus.cc:68
-msgid "Playback"
+#: src/skins/equalizer.cc:227 src/skins-qt/equalizer.cc:227
+msgid "31 Hz"
+msgstr ""
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "63 Hz"
+msgstr ""
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "125 Hz"
+msgstr ""
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "250 Hz"
+msgstr ""
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "500 Hz"
+msgstr ""
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "1 kHz"
+msgstr ""
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "2 kHz"
+msgstr ""
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "4 kHz"
+msgstr ""
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "8 kHz"
+msgstr ""
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "16 kHz"
+msgstr ""
+
+#: src/skins/equalizer.cc:270 src/skins-qt/equalizer.cc:270
+msgid "Audacious Equalizer"
+msgstr ""
+
+#: src/skins/main.cc:459 src/skins-qt/main.cc:442
+msgid "Recording on"
+msgstr ""
+
+#: src/skins/main.cc:461 src/skins-qt/main.cc:444
+msgid "Recording off"
+msgstr ""
+
+#: src/skins/main.cc:754 src/skins-qt/main.cc:701
+#, c-format
+msgid "Seek to %d:%-2.2d / %d:%-2.2d"
+msgstr ""
+
+#: src/skins/main.cc:771 src/skins-qt/main.cc:718
+#, c-format
+msgid "Volume: %d%%"
+msgstr ""
+
+#: src/skins/main.cc:784 src/skins-qt/main.cc:731
+#, c-format
+msgid "Balance: %d%% left"
+msgstr ""
+
+#: src/skins/main.cc:786 src/skins-qt/main.cc:733
+msgid "Balance: center"
+msgstr ""
+
+#: src/skins/main.cc:788 src/skins-qt/main.cc:735
+#, c-format
+msgid "Balance: %d%% right"
+msgstr ""
+
+#: src/skins/main.cc:880 src/skins-qt/main.cc:827
+msgid "Options Menu"
+msgstr ""
+
+#: src/skins/main.cc:884 src/skins-qt/main.cc:831
+msgid "Disable 'Always On Top'"
+msgstr ""
+
+#: src/skins/main.cc:886 src/skins-qt/main.cc:833
+msgid "Enable 'Always On Top'"
+msgstr ""
+
+#: src/skins/main.cc:889 src/skins-qt/main.cc:836
+msgid "File Info Box"
+msgstr ""
+
+#: src/skins/main.cc:892 src/skins/menus.cc:149 src/skins-qt/main.cc:839
+#: src/skins-qt/menus.cc:142
+msgid "Double Size"
+msgstr ""
+
+#: src/skins/main.cc:895 src/skins-qt/main.cc:842
+msgid "Visualizations"
+msgstr ""
+
+#: src/skins/menus.cc:74 src/skins-qt/menus.cc:64
+msgid "Volume Up"
 msgstr ""
 
-#: src/skins/menus.cc:69
+#: src/skins/menus.cc:75 src/skins-qt/menus.cc:65
+msgid "Volume Down"
+msgstr ""
+
+#: src/skins/menus.cc:77 src/skins-qt/menus.cc:67
+msgid "Effects ..."
+msgstr ""
+
+#: src/skins/menus.cc:84 src/skins-qt/menus.cc:74
+msgid "Open Files ..."
+msgstr ""
+
+#: src/skins/menus.cc:85 src/skins-qt/menus.cc:76
+msgid "Open URL ..."
+msgstr ""
+
+#: src/skins/menus.cc:89 src/skins-qt/menus.cc:80
 msgid "Playlist"
 msgstr ""
 
-#: src/skins/menus.cc:70
+#: src/skins/menus.cc:90 src/skins-qt/menus.cc:81
+msgid "Output"
+msgstr ""
+
+#: src/skins/menus.cc:91 src/skins-qt/menus.cc:82
 msgid "View"
 msgstr ""
 
-#: src/skins/menus.cc:72 src/skins/menus.cc:136 src/skins/menus.cc:149
-#: src/skins/menus.cc:214
+#: src/skins/menus.cc:93 src/skins/menus.cc:161 src/skins/menus.cc:174
+#: src/skins/menus.cc:245 src/skins-qt/menus.cc:84 src/skins-qt/menus.cc:156
+#: src/skins-qt/menus.cc:170 src/skins-qt/menus.cc:241
 msgid "Services"
 msgstr ""
 
-#: src/skins/menus.cc:74
+#: src/skins/menus.cc:95 src/skins-qt/menus.cc:86
 msgid "About ..."
 msgstr ""
 
-#: src/skins/menus.cc:75
+#: src/skins/menus.cc:96 src/skins-qt/menus.cc:87
 msgid "Settings ..."
 msgstr ""
 
-#: src/skins/menus.cc:76
+#: src/skins/menus.cc:97 src/skins-qt/menus.cc:88
 msgid "Quit"
 msgstr ""
 
-#: src/skins/menus.cc:80 src/skins/menus.cc:206
+#: src/skins/menus.cc:101 src/skins/menus.cc:235 src/skins-qt/menus.cc:92
+#: src/skins-qt/menus.cc:231
 msgid "Song Info ..."
 msgstr ""
 
-#: src/skins/menus.cc:84
-msgid "No Playlist Advance"
+#: src/skins/menus.cc:105 src/skins-qt/menus.cc:96
+msgid "Shuffle by Album"
 msgstr ""
 
-#: src/skins/menus.cc:85
-msgid "Stop After This Song"
+#: src/skins/menus.cc:106 src/skins-qt/menus.cc:97
+msgid "No Playlist Advance"
 msgstr ""
 
-#: src/skins/menus.cc:93
+#: src/skins/menus.cc:117 src/skins-qt/menus.cc:108
 msgid "Set A-B Repeat"
 msgstr ""
 
-#: src/skins/menus.cc:94
+#: src/skins/menus.cc:118 src/skins-qt/menus.cc:109
 msgid "Clear A-B Repeat"
 msgstr ""
 
-#: src/skins/menus.cc:96
+#: src/skins/menus.cc:120 src/skins-qt/menus.cc:111
 msgid "Jump to Song ..."
 msgstr ""
 
-#: src/skins/menus.cc:97
+#: src/skins/menus.cc:121 src/skins-qt/menus.cc:113
 msgid "Jump to Time ..."
 msgstr ""
 
-#: src/skins/menus.cc:101
+#: src/skins/menus.cc:125 src/skins-qt/menus.cc:118
 msgid "Play/Resume"
 msgstr ""
 
-#: src/skins/menus.cc:103
+#: src/skins/menus.cc:127 src/skins-qt/menus.cc:120
 msgid "New Playlist"
 msgstr ""
 
-#: src/skins/menus.cc:104
+#: src/skins/menus.cc:128 src/skins-qt/menus.cc:121
 msgid "Rename Playlist ..."
 msgstr ""
 
-#: src/skins/menus.cc:105
+#: src/skins/menus.cc:129 src/skins-qt/menus.cc:122
 msgid "Remove Playlist"
 msgstr ""
 
-#: src/skins/menus.cc:107
+#: src/skins/menus.cc:131 src/skins-qt/menus.cc:124
 msgid "Previous Playlist"
 msgstr ""
 
-#: src/skins/menus.cc:108
+#: src/skins/menus.cc:132 src/skins-qt/menus.cc:125
 msgid "Next Playlist"
 msgstr ""
 
-#: src/skins/menus.cc:110
+#: src/skins/menus.cc:134 src/skins-qt/menus.cc:127
 msgid "Import Playlist ..."
 msgstr ""
 
-#: src/skins/menus.cc:111
+#: src/skins/menus.cc:135 src/skins-qt/menus.cc:128
 msgid "Export Playlist ..."
 msgstr ""
 
-#: src/skins/menus.cc:113
+#: src/skins/menus.cc:137 src/skins-qt/menus.cc:130
 msgid "Playlist Manager ..."
 msgstr ""
 
-#: src/skins/menus.cc:114
+#: src/skins/menus.cc:138 src/skins-qt/menus.cc:131
 msgid "Queue Manager ..."
 msgstr ""
 
-#: src/skins/menus.cc:116
+#: src/skins/menus.cc:140 src/skins-qt/menus.cc:133
 msgid "Refresh Playlist"
 msgstr ""
 
-#: src/skins/menus.cc:120
+#: src/skins/menus.cc:144 src/skins-qt/menus.cc:137
 msgid "Show Playlist Editor"
 msgstr ""
 
-#: src/skins/menus.cc:121
+#: src/skins/menus.cc:145 src/skins-qt/menus.cc:138
 msgid "Show Equalizer"
 msgstr ""
 
-#: src/skins/menus.cc:123
+#: src/skins/menus.cc:147 src/skins-qt/menus.cc:140
 msgid "Show Remaining Time"
 msgstr ""
 
-#: src/skins/menus.cc:125
+#: src/skins/menus.cc:150 src/skins-qt/menus.cc:143
 msgid "Always on Top"
 msgstr ""
 
-#: src/skins/menus.cc:126
+#: src/skins/menus.cc:151 src/skins-qt/menus.cc:145
 msgid "On All Workspaces"
 msgstr ""
 
-#: src/skins/menus.cc:128
+#: src/skins/menus.cc:153 src/skins-qt/menus.cc:148
 msgid "Roll Up Player"
 msgstr ""
 
-#: src/skins/menus.cc:129
+#: src/skins/menus.cc:154 src/skins-qt/menus.cc:149
 msgid "Roll Up Playlist Editor"
 msgstr ""
 
-#: src/skins/menus.cc:130
+#: src/skins/menus.cc:155 src/skins-qt/menus.cc:150
 msgid "Roll Up Equalizer"
 msgstr ""
 
-#: src/skins/menus.cc:132 src/skins/ui_main.cc:854
-msgid "Double Size"
-msgstr ""
-
-#: src/skins/menus.cc:138
+#: src/skins/menus.cc:163 src/skins-qt/menus.cc:158
 msgid "Add URL ..."
 msgstr ""
 
-#: src/skins/menus.cc:139
+#: src/skins/menus.cc:164 src/skins-qt/menus.cc:160
 msgid "Add Files ..."
 msgstr ""
 
-#: src/skins/menus.cc:143 src/skins/menus.cc:171 src/skins/menus.cc:185
+#: src/skins/menus.cc:168 src/skins/menus.cc:196 src/skins/menus.cc:212
+#: src/skins-qt/menus.cc:164 src/skins-qt/menus.cc:192
+#: src/skins-qt/menus.cc:208
 msgid "By Title"
 msgstr ""
 
-#: src/skins/menus.cc:144 src/skins/menus.cc:178 src/skins/menus.cc:192
+#: src/skins/menus.cc:169 src/skins/menus.cc:203 src/skins/menus.cc:219
+#: src/skins-qt/menus.cc:165 src/skins-qt/menus.cc:199
+#: src/skins-qt/menus.cc:215
 msgid "By File Name"
 msgstr ""
 
-#: src/skins/menus.cc:145 src/skins/menus.cc:179 src/skins/menus.cc:193
+#: src/skins/menus.cc:170 src/skins/menus.cc:204 src/skins/menus.cc:220
+#: src/skins-qt/menus.cc:166 src/skins-qt/menus.cc:200
+#: src/skins-qt/menus.cc:216
 msgid "By File Path"
 msgstr ""
 
-#: src/skins/menus.cc:151
+#: src/skins/menus.cc:176 src/skins-qt/menus.cc:172
 msgid "Remove All"
 msgstr ""
 
-#: src/skins/menus.cc:152
+#: src/skins/menus.cc:177 src/skins-qt/menus.cc:173
 msgid "Clear Queue"
 msgstr ""
 
-#: src/skins/menus.cc:154
+#: src/skins/menus.cc:179 src/skins-qt/menus.cc:175
 msgid "Remove Unavailable Files"
 msgstr ""
 
-#: src/skins/menus.cc:155
+#: src/skins/menus.cc:180 src/skins-qt/menus.cc:176
 msgid "Remove Duplicates"
 msgstr ""
 
-#: src/skins/menus.cc:157
+#: src/skins/menus.cc:182 src/skins-qt/menus.cc:178
 msgid "Remove Unselected"
 msgstr ""
 
-#: src/skins/menus.cc:158
+#: src/skins/menus.cc:183 src/skins-qt/menus.cc:179
 msgid "Remove Selected"
 msgstr ""
 
-#: src/skins/menus.cc:162
+#: src/skins/menus.cc:187 src/skins-qt/menus.cc:183
 msgid "Search and Select"
 msgstr ""
 
-#: src/skins/menus.cc:164
+#: src/skins/menus.cc:189 src/skins-qt/menus.cc:185
 msgid "Invert Selection"
 msgstr ""
 
-#: src/skins/menus.cc:165
+#: src/skins/menus.cc:190 src/skins-qt/menus.cc:186
 msgid "Select None"
 msgstr ""
 
-#: src/skins/menus.cc:166
+#: src/skins/menus.cc:191 src/skins-qt/menus.cc:187
 msgid "Select All"
 msgstr ""
 
-#: src/skins/menus.cc:170 src/skins/menus.cc:184
+#: src/skins/menus.cc:195 src/skins/menus.cc:211 src/skins-qt/menus.cc:191
+#: src/skins-qt/menus.cc:207
 msgid "By Track Number"
 msgstr ""
 
-#: src/skins/menus.cc:172 src/skins/menus.cc:186
+#: src/skins/menus.cc:197 src/skins/menus.cc:213 src/skins-qt/menus.cc:193
+#: src/skins-qt/menus.cc:209
 msgid "By Artist"
 msgstr ""
 
-#: src/skins/menus.cc:173 src/skins/menus.cc:187
+#: src/skins/menus.cc:198 src/skins/menus.cc:214 src/skins-qt/menus.cc:194
+#: src/skins-qt/menus.cc:210
 msgid "By Album"
 msgstr ""
 
-#: src/skins/menus.cc:174 src/skins/menus.cc:188
+#: src/skins/menus.cc:199 src/skins/menus.cc:215 src/skins-qt/menus.cc:195
+#: src/skins-qt/menus.cc:211
 msgid "By Album Artist"
 msgstr ""
 
-#: src/skins/menus.cc:175 src/skins/menus.cc:190
+#: src/skins/menus.cc:200 src/skins/menus.cc:216 src/skins-qt/menus.cc:196
+#: src/skins-qt/menus.cc:212
 msgid "By Release Date"
 msgstr ""
 
-#: src/skins/menus.cc:176 src/skins/menus.cc:189
+#: src/skins/menus.cc:201 src/skins/menus.cc:217 src/skins-qt/menus.cc:197
+#: src/skins-qt/menus.cc:213
 msgid "By Genre"
 msgstr ""
 
-#: src/skins/menus.cc:177 src/skins/menus.cc:191
+#: src/skins/menus.cc:202 src/skins/menus.cc:218 src/skins-qt/menus.cc:198
+#: src/skins-qt/menus.cc:214
 msgid "By Length"
 msgstr ""
 
-#: src/skins/menus.cc:180 src/skins/menus.cc:194
+#: src/skins/menus.cc:205 src/skins/menus.cc:221 src/skins-qt/menus.cc:201
+#: src/skins-qt/menus.cc:217
 msgid "By Custom Title"
 msgstr ""
 
-#: src/skins/menus.cc:198
+#: src/skins/menus.cc:206 src/skins/menus.cc:222 src/skins-qt/menus.cc:202
+#: src/skins-qt/menus.cc:218
+msgid "By Comment"
+msgstr ""
+
+#: src/skins/menus.cc:207 src/skins/menus.cc:223 src/skins-qt/menus.cc:203
+#: src/skins-qt/menus.cc:219
+msgid "By Disc Number"
+msgstr ""
+
+#: src/skins/menus.cc:227 src/skins-qt/menus.cc:223
 msgid "Randomize List"
 msgstr ""
 
-#: src/skins/menus.cc:199
+#: src/skins/menus.cc:228 src/skins-qt/menus.cc:224
 msgid "Reverse List"
 msgstr ""
 
-#: src/skins/menus.cc:201
+#: src/skins/menus.cc:230 src/skins-qt/menus.cc:226
 msgid "Sort Selected"
 msgstr ""
 
-#: src/skins/menus.cc:202
+#: src/skins/menus.cc:231 src/skins-qt/menus.cc:227
 msgid "Sort List"
 msgstr ""
 
-#: src/skins/menus.cc:208
+#: src/skins/menus.cc:236 src/skins-qt/menus.cc:232
+msgid "Open Containing Folder"
+msgstr ""
+
+#: src/skins/menus.cc:238 src/skins-qt/menus.cc:234
 msgid "Cut"
 msgstr ""
 
-#: src/skins/menus.cc:209
+#: src/skins/menus.cc:239 src/skins-qt/menus.cc:235
 msgid "Copy"
 msgstr ""
 
-#: src/skins/menus.cc:210
+#: src/skins/menus.cc:240 src/skins-qt/menus.cc:236
 msgid "Paste"
 msgstr ""
 
-#: src/skins/menus.cc:212
-msgid "Queue/Unqueue"
+#: src/skins/menus.cc:241 src/skins-qt/menus.cc:237
+msgid "Paste at End"
 msgstr ""
 
-#: src/skins/menus.cc:218
-msgid "Load Preset ..."
+#: src/skins/menus.cc:243 src/skins-qt/menus.cc:239
+msgid "Queue/Unqueue"
 msgstr ""
 
-#: src/skins/menus.cc:219
-msgid "Load Auto Preset ..."
+#: src/skins/playlist-widget.cc:58 src/skins-qt/playlist-widget.cc:58
+#, c-format
+msgid "%s (%d of %d)"
 msgstr ""
 
-#: src/skins/menus.cc:220
-msgid "Load Default"
+#: src/skins/playlistwin.cc:491 src/skins-qt/playlistwin.cc:478
+msgid "Audacious Playlist Editor"
 msgstr ""
 
-#: src/skins/menus.cc:221
-msgid "Load Preset File ..."
+#: src/skins/plugin.cc:53 src/skins-qt/plugin.cc:65
+msgid "Winamp Classic Interface"
 msgstr ""
 
-#: src/skins/menus.cc:222
-msgid "Load EQF File ..."
+#: src/skins-qt/menus.cc:75
+msgid "Open Folder ..."
 msgstr ""
 
-#: src/skins/menus.cc:224
-msgid "Save Preset ..."
+#: src/skins-qt/menus.cc:159
+msgid "Add Folder ..."
 msgstr ""
 
-#: src/skins/menus.cc:225
-msgid "Save Auto Preset ..."
+#: src/skins-qt/search-select.cc:62 src/skins/search-select.cc:77
+msgid "Search entries in active playlist"
 msgstr ""
 
-#: src/skins/menus.cc:226
-msgid "Save Default"
-msgstr ""
-
-#: src/skins/menus.cc:227
-msgid "Save Preset File ..."
-msgstr ""
-
-#: src/skins/menus.cc:228
-msgid "Save EQF File ..."
-msgstr ""
-
-#: src/skins/menus.cc:230
-msgid "Delete Preset ..."
-msgstr ""
-
-#: src/skins/menus.cc:231
-msgid "Delete Auto Preset ..."
-msgstr ""
-
-#: src/skins/menus.cc:233
-msgid "Import Winamp Presets ..."
-msgstr ""
-
-#: src/skins/menus.cc:235
-msgid "Reset to Zero"
-msgstr ""
-
-#: src/skins/plugin.cc:48
-msgid "Winamp Classic Interface"
-msgstr ""
-
-#: src/skins/preset-browser.cc:57 src/skins/preset-list.cc:371
-#: src/skins/preset-list.cc:386
-msgid "Save"
-msgstr ""
-
-#: src/skins/preset-browser.cc:57 src/skins/preset-list.cc:338
-#: src/skins/preset-list.cc:354
-msgid "Load"
-msgstr ""
-
-#: src/skins/preset-browser.cc:83
-msgid "Load Preset File"
-msgstr ""
-
-#: src/skins/preset-browser.cc:100
-msgid "Load EQF File"
-msgstr ""
-
-#: src/skins/preset-browser.cc:119
-msgid "Save Preset File"
-msgstr ""
-
-#: src/skins/preset-browser.cc:137
-msgid "Save EQF File"
+#: src/skins-qt/search-select.cc:70 src/skins/search-select.cc:83
+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/preset-browser.cc:151
-msgid "Import Winamp Presets"
+#: src/skins-qt/search-select.cc:75 src/skins/search-select.cc:91
+msgid "Title:"
 msgstr ""
 
-#: src/skins/preset-list.cc:285
-msgid "Presets"
+#: src/skins-qt/search-select.cc:79 src/skins/search-select.cc:96
+msgid "Album:"
 msgstr ""
 
-#: src/skins/preset-list.cc:335
-msgid "Load preset"
+#: src/skins-qt/search-select.cc:82 src/skins/search-select.cc:101
+msgid "Artist:"
 msgstr ""
 
-#: src/skins/preset-list.cc:351
-msgid "Load auto-preset"
+#: src/skins-qt/search-select.cc:85 src/skins/search-select.cc:106
+msgid "File Name:"
 msgstr ""
 
-#: src/skins/preset-list.cc:367
-msgid "Save preset"
+#: src/skins-qt/search-select.cc:88 src/skins/search-select.cc:134
+msgid "Clear previous selection before searching"
 msgstr ""
 
-#: src/skins/preset-list.cc:382
-msgid "Save auto-preset"
+#: src/skins-qt/search-select.cc:89 src/skins/search-select.cc:137
+msgid "Automatically toggle queue for matching entries"
 msgstr ""
 
-#: src/skins/preset-list.cc:408
-msgid "Delete preset"
+#: src/skins-qt/search-select.cc:90 src/skins/search-select.cc:140
+msgid "Create a new playlist with matching entries"
 msgstr ""
 
-#: src/skins/preset-list.cc:424
-msgid "Delete auto-preset"
+#: src/skins-qt/search-select.cc:101 src/skins/search-select.cc:78
+msgid "Search"
 msgstr ""
 
-#: src/skins/skins_cfg.cc:176
+#: src/skins-qt/skins_cfg.cc:198 src/skins/skins_cfg.cc:182
 msgid "Player:"
 msgstr ""
 
-#: src/skins/skins_cfg.cc:178
+#: src/skins-qt/skins_cfg.cc:200 src/skins/skins_cfg.cc:184
 msgid "Select main player window font:"
 msgstr ""
 
-#: src/skins/skins_cfg.cc:179
+#: src/skins-qt/skins_cfg.cc:201 src/skins/skins_cfg.cc:185
 msgid "Playlist:"
 msgstr ""
 
-#: src/skins/skins_cfg.cc:181
+#: src/skins-qt/skins_cfg.cc:203 src/skins/skins_cfg.cc:187
 msgid "Select playlist font:"
 msgstr ""
 
-#: src/skins/skins_cfg.cc:187
+#: src/skins-qt/skins_cfg.cc:207 src/skins/skins_cfg.cc:191
 msgid "Skin"
 msgstr ""
 
-#: src/skins/skins_cfg.cc:189
+#: src/skins-qt/skins_cfg.cc:211 src/skins/skins_cfg.cc:193
+msgid "Display active titlebar when any window is focused"
+msgstr ""
+
+#: src/skins-qt/skins_cfg.cc:213 src/skins/skins_cfg.cc:195
 msgid "Fonts"
 msgstr ""
 
-#: src/skins/skins_cfg.cc:192
+#: src/skins-qt/skins_cfg.cc:215 src/skins/skins_cfg.cc:197
 msgid "Use bitmap fonts (supports ASCII only)"
 msgstr ""
 
-#: src/skins/skins_cfg.cc:194
+#: src/skins-qt/skins_cfg.cc:217 src/skins/skins_cfg.cc:199
 msgid "Scroll song title"
 msgstr ""
 
-#: src/skins/skins_cfg.cc:196
+#: src/skins-qt/skins_cfg.cc:219 src/skins/skins_cfg.cc:201
 msgid "Scroll song title in both directions"
 msgstr ""
 
-#: src/skins/skins_cfg.cc:201
+#: src/skins-qt/skins_cfg.cc:224 src/skins/skins_cfg.cc:206
 msgid "Analyzer"
 msgstr ""
 
-#: src/skins/skins_cfg.cc:202
+#: src/skins-qt/skins_cfg.cc:225 src/skins/skins_cfg.cc:207
 msgid "Scope"
 msgstr ""
 
-#: src/skins/skins_cfg.cc:203
+#: src/skins-qt/skins_cfg.cc:226 src/skins/skins_cfg.cc:208
 msgid "Voiceprint / VU meter"
 msgstr ""
 
-#: src/skins/skins_cfg.cc:204
+#: src/skins-qt/skins_cfg.cc:227 src/skins/skins_cfg.cc:209
 msgid "Off"
 msgstr ""
 
-#: src/skins/skins_cfg.cc:208 src/skins/skins_cfg.cc:233
-#: src/skins/skins_cfg.cc:239
+#: src/skins-qt/skins_cfg.cc:231 src/skins-qt/skins_cfg.cc:256
+#: src/skins-qt/skins_cfg.cc:262 src/skins/skins_cfg.cc:213
+#: src/skins/skins_cfg.cc:238 src/skins/skins_cfg.cc:244
 msgid "Normal"
 msgstr ""
 
-#: src/skins/skins_cfg.cc:209 src/skins/skins_cfg.cc:234
+#: src/skins-qt/skins_cfg.cc:232 src/skins-qt/skins_cfg.cc:257
+#: src/skins/skins_cfg.cc:214 src/skins/skins_cfg.cc:239
 msgid "Fire"
 msgstr ""
 
-#: src/skins/skins_cfg.cc:210
+#: src/skins-qt/skins_cfg.cc:233 src/skins/skins_cfg.cc:215
 msgid "Vertical lines"
 msgstr ""
 
-#: src/skins/skins_cfg.cc:214
+#: src/skins-qt/skins_cfg.cc:237 src/skins/skins_cfg.cc:219
 msgid "Lines"
 msgstr ""
 
-#: src/skins/skins_cfg.cc:215
+#: src/skins-qt/skins_cfg.cc:238 src/skins/skins_cfg.cc:220
 msgid "Bars"
 msgstr ""
 
-#: src/skins/skins_cfg.cc:219
+#: src/skins-qt/skins_cfg.cc:242 src/skins/skins_cfg.cc:224
 msgid "Slowest"
 msgstr ""
 
-#: src/skins/skins_cfg.cc:220
+#: src/skins-qt/skins_cfg.cc:243 src/skins/skins_cfg.cc:225
 msgid "Slow"
 msgstr ""
 
-#: src/skins/skins_cfg.cc:221 src/sox-resampler/sox-resampler.cc:152
+#: src/skins-qt/skins_cfg.cc:244 src/skins/skins_cfg.cc:226
+#: src/soxr/sox-resampler.cc:180
 msgid "Medium"
 msgstr ""
 
-#: src/skins/skins_cfg.cc:222
+#: src/skins-qt/skins_cfg.cc:245 src/skins/skins_cfg.cc:227
 msgid "Fast"
 msgstr ""
 
-#: src/skins/skins_cfg.cc:223
+#: src/skins-qt/skins_cfg.cc:246 src/skins/skins_cfg.cc:228
 msgid "Fastest"
 msgstr ""
 
-#: src/skins/skins_cfg.cc:227
+#: src/skins-qt/skins_cfg.cc:250 src/skins/skins_cfg.cc:232
 msgid "Dots"
 msgstr ""
 
-#: src/skins/skins_cfg.cc:228
+#: src/skins-qt/skins_cfg.cc:251 src/skins/skins_cfg.cc:233
 msgid "Line"
 msgstr ""
 
-#: src/skins/skins_cfg.cc:229
+#: src/skins-qt/skins_cfg.cc:252 src/skins/skins_cfg.cc:234
 msgid "Solid"
 msgstr ""
 
-#: src/skins/skins_cfg.cc:235
+#: src/skins-qt/skins_cfg.cc:258 src/skins/skins_cfg.cc:240
 msgid "Ice"
 msgstr ""
 
-#: src/skins/skins_cfg.cc:240
+#: src/skins-qt/skins_cfg.cc:263 src/skins/skins_cfg.cc:245
 msgid "Smooth"
 msgstr ""
 
-#: src/skins/skins_cfg.cc:244
-msgid "Type"
-msgstr ""
-
-#: src/skins/skins_cfg.cc:245
-msgid "Visualization type:"
-msgstr ""
-
-#: src/skins/skins_cfg.cc:248
-msgid "Analyzer"
-msgstr ""
-
-#: src/skins/skins_cfg.cc:249
-msgid "Show peaks"
-msgstr ""
-
-#: src/skins/skins_cfg.cc:251
+#: src/skins-qt/skins_cfg.cc:267 src/skins/skins_cfg.cc:249
 msgid "Coloring:"
 msgstr ""
 
-#: src/skins/skins_cfg.cc:254
+#: src/skins-qt/skins_cfg.cc:270 src/skins/skins_cfg.cc:252
 msgid "Style:"
 msgstr ""
 
-#: src/skins/skins_cfg.cc:257
+#: src/skins-qt/skins_cfg.cc:273 src/skins/skins_cfg.cc:255
 msgid "Falloff:"
 msgstr ""
 
-#: src/skins/skins_cfg.cc:260
+#: src/skins-qt/skins_cfg.cc:276 src/skins/skins_cfg.cc:258
 msgid "Peak falloff:"
 msgstr ""
 
-#: src/skins/skins_cfg.cc:264
+#: src/skins-qt/skins_cfg.cc:282 src/skins/skins_cfg.cc:264
 msgid "Scope Style:"
 msgstr ""
 
-#: src/skins/skins_cfg.cc:267
+#: src/skins-qt/skins_cfg.cc:285 src/skins/skins_cfg.cc:267
 msgid "Voiceprint Coloring:"
 msgstr ""
 
-#: src/skins/skins_cfg.cc:270
+#: src/skins-qt/skins_cfg.cc:288 src/skins/skins_cfg.cc:270
 msgid "VU Meter Style:"
 msgstr ""
 
-#: src/skins/skins_cfg.cc:276
-msgid "General"
-msgstr ""
-
-#: src/skins/skins_cfg.cc:277
-msgid "Visualization"
-msgstr ""
-
-#: src/skins/ui_equalizer.cc:282
-msgid "Preamp"
-msgstr ""
-
-#: src/skins/ui_equalizer.cc:286
-msgid "31 Hz"
-msgstr ""
-
-#: src/skins/ui_equalizer.cc:287
-msgid "63 Hz"
-msgstr ""
-
-#: src/skins/ui_equalizer.cc:287
-msgid "125 Hz"
-msgstr ""
-
-#: src/skins/ui_equalizer.cc:287
-msgid "250 Hz"
-msgstr ""
-
-#: src/skins/ui_equalizer.cc:287
-msgid "500 Hz"
-msgstr ""
-
-#: src/skins/ui_equalizer.cc:287
-msgid "1 kHz"
-msgstr ""
-
-#: src/skins/ui_equalizer.cc:288
-msgid "2 kHz"
-msgstr ""
-
-#: src/skins/ui_equalizer.cc:288
-msgid "4 kHz"
-msgstr ""
-
-#: src/skins/ui_equalizer.cc:288
-msgid "8 kHz"
-msgstr ""
-
-#: src/skins/ui_equalizer.cc:288
-msgid "16 kHz"
-msgstr ""
-
-#: src/skins/ui_equalizer.cc:330
-msgid "Audacious Equalizer"
-msgstr ""
-
-#: src/skins/ui_main.cc:688
-#, c-format
-msgid "Seek to %d:%-2.2d / %d:%-2.2d"
-msgstr ""
-
-#: src/skins/ui_main.cc:709
-#, c-format
-msgid "Volume: %d%%"
-msgstr ""
-
-#: src/skins/ui_main.cc:732
-#, c-format
-msgid "Balance: %d%% left"
-msgstr ""
-
-#: src/skins/ui_main.cc:734
-msgid "Balance: center"
-msgstr ""
-
-#: src/skins/ui_main.cc:736
-#, c-format
-msgid "Balance: %d%% right"
-msgstr ""
-
-#: src/skins/ui_main.cc:842
-msgid "Options Menu"
-msgstr ""
-
-#: src/skins/ui_main.cc:846
-msgid "Disable 'Always On Top'"
-msgstr ""
-
-#: src/skins/ui_main.cc:848
-msgid "Enable 'Always On Top'"
-msgstr ""
-
-#: src/skins/ui_main.cc:851
-msgid "File Info Box"
-msgstr ""
-
-#: src/skins/ui_main.cc:857
-msgid "Visualizations"
-msgstr ""
-
-#: src/skins/ui_main.cc:1336
-msgid "Repeat point A set."
-msgstr ""
-
-#: src/skins/ui_main.cc:1341
-msgid "Repeat point B set."
-msgstr ""
-
-#: src/skins/ui_main.cc:1350
-msgid "Repeat points cleared."
-msgstr ""
-
-#: src/skins/ui_playlist.cc:219
-msgid "Search entries in active playlist"
-msgstr ""
-
-#: src/skins/ui_playlist.cc:226
-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.cc:234
-msgid "Title:"
-msgstr ""
-
-#: src/skins/ui_playlist.cc:241
-msgid "Album:"
-msgstr ""
-
-#: src/skins/ui_playlist.cc:248
-msgid "Artist:"
-msgstr ""
-
-#: src/skins/ui_playlist.cc:255
-msgid "File Name:"
-msgstr ""
-
-#: src/skins/ui_playlist.cc:263
-msgid "Clear previous selection before searching"
+#: src/skins-qt/skins_cfg.cc:294 src/skins/skins_cfg.cc:276
+msgid "Type"
 msgstr ""
 
-#: src/skins/ui_playlist.cc:266
-msgid "Automatically toggle queue for matching entries"
+#: src/skins-qt/skins_cfg.cc:295 src/skins/skins_cfg.cc:277
+msgid "Visualization type:"
 msgstr ""
 
-#: src/skins/ui_playlist.cc:269
-msgid "Create a new playlist with matching entries"
+#: src/skins-qt/skins_cfg.cc:298 src/skins/skins_cfg.cc:280
+msgid "Analyzer"
 msgstr ""
 
-#: src/skins/ui_playlist.cc:717
-msgid "Audacious Playlist Editor"
+#: src/skins-qt/skins_cfg.cc:299 src/skins/skins_cfg.cc:281
+msgid "Show peaks"
 msgstr ""
 
-#: src/skins/ui_playlist.cc:752
-#, c-format
-msgid "%s (%d of %d)"
+#: src/skins-qt/skins_cfg.cc:308 src/skins/skins_cfg.cc:290
+msgid "Visualization"
 msgstr ""
 
-#: src/skins/ui_skinselector.cc:167
+#: src/skins-qt/skinselector.cc:98 src/skins/skinselector.cc:111
 msgid "Archived Winamp 2.x skin"
 msgstr ""
 
-#: src/skins/ui_skinselector.cc:172
+#: src/skins-qt/skinselector.cc:102 src/skins/skinselector.cc:115
 msgid "Unarchived Winamp 2.x skin"
 msgstr ""
 
-#: src/skins/util.cc:430
-#, c-format
-msgid "Could not create directory (%s): %s\n"
-msgstr ""
-
-#: src/sndfile/plugin.cc:39
+#: src/sndfile/plugin.cc:38
 msgid "Sndfile Plugin"
 msgstr ""
 
-#: src/sndfile/plugin.cc:336
+#: src/sndfile/plugin.cc:372
 msgid ""
 "Based on the xmms_sndfile plugin:\n"
 "Copyright (C) 2000, 2002 Erik de Castro Lopo\n"
@@ -3675,92 +3930,100 @@
 "Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:44
+#: src/sndio/sndio.cc:43
 msgid "Sndio Output"
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:98
+#: src/sndio/sndio.cc:98
 msgid "Device (blank for default):"
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:100
+#: src/sndio/sndio.cc:100
 msgid "Save and restore volume:"
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:181
+#: src/sndio/sndio.cc:181
 #, c-format
 msgid "Sndio error: Unsupported audio format (%d)"
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:192
+#: src/sndio/sndio.cc:192
 msgid "Sndio error: sio_open() failed"
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:222
+#: src/sndio/sndio.cc:221
 msgid "Sndio error: sio_setpar() failed"
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:234
+#: src/sndio/sndio.cc:233
 msgid "Sndio error: sio_start() failed"
 msgstr ""
 
-#: src/song_change/song_change.cc:33
+#: src/songchange/song_change.cc:30
 msgid "Song Change"
 msgstr ""
 
-#: src/song_change/song_change.cc:342
-msgid ""
-"Parameters passed to the shell should be encapsulated in "
-"quotes. Doing otherwise is a security risk."
-msgstr ""
-
-#: src/song_change/song_change.cc:358
+#: src/songchange/song_change.cc:256
 msgid "Commands"
 msgstr ""
 
-#: src/song_change/song_change.cc:360
+#: src/songchange/song_change.cc:258
 msgid "Command to run when starting a new song:"
 msgstr ""
 
-#: src/song_change/song_change.cc:364
+#: src/songchange/song_change.cc:261
+msgid "Command to run when stopping a song:"
+msgstr ""
+
+#: src/songchange/song_change.cc:264
 msgid "Command to run at the end of a song:"
 msgstr ""
 
-#: src/song_change/song_change.cc:368
+#: src/songchange/song_change.cc:267
 msgid "Command to run at the end of the playlist:"
 msgstr ""
 
-#: src/song_change/song_change.cc:372
+#: src/songchange/song_change.cc:270
 msgid "Command to run when song title changes (for network streams):"
 msgstr ""
 
-#: src/song_change/song_change.cc:376
+#: src/songchange/song_change.cc:273
 msgid ""
-"You can use the following format strings which will be substituted before "
-"calling the command (not all are useful for the end-of-playlist command):\n"
-"\n"
-"%F: Frequency (in hertz)\n"
+"You can use the following format codes, which will be replaced before "
+"running the command.\n"
+"Not all are useful though for the song-stopped or end-of-playlist command."
+msgstr ""
+
+#: src/songchange/song_change.cc:276
+msgid ""
+"%a: Artist\n"
+"%b: Album\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"
+"%F: Frequency (Hertz)\n"
+"%l: Length (milliseconds)\n"
+"%n or %s: Formatted title (see playlist settings)\n"
 "%p: Currently playing (1 or 0)\n"
-"%a: Artist\n"
-"%b: Album\n"
-"%T: Track title"
+"%r: Rate (bits per second)\n"
+"%t: Playlist position\n"
+"%T: Title (unformatted)"
+msgstr ""
+
+#: src/songchange/song_change.cc:287
+msgid ""
+"Parameters passed to the shell should be enclosed in quotation marks.\n"
+"Unquoted parameters may lead to unexpected results."
 msgstr ""
 
-#: src/song-info-qt/song-info.cc:32
-msgid "Song Info (Qt)"
+#: src/song-info-qt/song-info.cc:30
+msgid "Song Info"
 msgstr ""
 
-#: src/sox-resampler/sox-resampler.cc:44
+#: src/soxr/sox-resampler.cc:44
 msgid "SoX Resampler"
 msgstr ""
 
-#: src/sox-resampler/sox-resampler.cc:144
+#: src/soxr/sox-resampler.cc:172
 msgid ""
 "SoX Resampler Plugin for Audacious\n"
 "Copyright 2013 Michał Lipski\n"
@@ -3769,89 +4032,129 @@
 "Copyright 2010-2012 John Lindgren"
 msgstr ""
 
-#: src/sox-resampler/sox-resampler.cc:150
+#: src/soxr/sox-resampler.cc:178
 msgid "Quick"
 msgstr ""
 
-#: src/sox-resampler/sox-resampler.cc:151
+#: src/soxr/sox-resampler.cc:179
 msgid "Low"
 msgstr ""
 
-#: src/sox-resampler/sox-resampler.cc:153
+#: src/soxr/sox-resampler.cc:181
 msgid "High"
 msgstr ""
 
-#: src/sox-resampler/sox-resampler.cc:154
+#: src/soxr/sox-resampler.cc:182
 msgid "Very High"
 msgstr ""
 
-#: src/sox-resampler/sox-resampler.cc:158
+#: src/soxr/sox-resampler.cc:183
+msgid "Ultra High"
+msgstr ""
+
+#: src/soxr/sox-resampler.cc:187
+msgid "Minimum"
+msgstr ""
+
+#: src/soxr/sox-resampler.cc:188
+msgid "Intermediate"
+msgstr ""
+
+#: src/soxr/sox-resampler.cc:193
 msgid "Quality:"
 msgstr ""
 
-#: src/speed-pitch/speed-pitch.cc:51
+#: src/soxr/sox-resampler.cc:196
+msgid "Phase:"
+msgstr ""
+
+#: src/soxr/sox-resampler.cc:200
+msgid "Allow aliasing"
+msgstr ""
+
+#: src/soxr/sox-resampler.cc:202
+msgid "Use steep filter"
+msgstr ""
+
+#: src/speedpitch/speed-pitch.cc:54
 msgid "Speed and Pitch"
 msgstr ""
 
-#: src/speed-pitch/speed-pitch.cc:210
-msgid "Speed and Pitch"
+#: src/speedpitch/speed-pitch.cc:247
+msgid "Speed"
 msgstr ""
 
-#: src/speed-pitch/speed-pitch.cc:211
-msgid "Speed:"
+#: src/speedpitch/speed-pitch.cc:248
+msgid "Decouple from pitch"
 msgstr ""
 
-#: src/speed-pitch/speed-pitch.cc:214
-msgid "Pitch:"
+#: src/speedpitch/speed-pitch.cc:250 src/speedpitch/speed-pitch.cc:258
+msgid "Multiplier:"
 msgstr ""
 
-#: src/statusicon/statusicon.cc:47
-msgid "Status Icon"
+#: src/speedpitch/speed-pitch.cc:254
+msgid "Pitch"
 msgstr ""
 
-#: src/statusicon/statusicon.cc:283
-msgid "Se_ttings ..."
+#: src/statusicon-qt/statusicon.cc:45 src/statusicon/statusicon.cc:47
+msgid "Status Icon"
 msgstr ""
 
-#: src/statusicon/statusicon.cc:372
+#: src/statusicon-qt/statusicon.cc:68
 msgid ""
-"Status Icon Plugin\n"
+"Status Icon Plugin (partial port for Qt interface)\n"
 "\n"
 "Copyright 2005-2007 Giacomo Lozito <james@develia.org>\n"
 "Copyright 2010 Michał Lipski <tallica@o2.pl>\n"
+"Copyright 2015 Eugene Paskevich <eugene@raptor.kiev.ua>\n"
 "\n"
 "This plugin provides a status icon, placed in\n"
 "the system tray area of the window manager."
 msgstr ""
 
-#: src/statusicon/statusicon.cc:379
+#: src/statusicon-qt/statusicon.cc:89 src/statusicon/statusicon.cc:384
 msgid "Mouse Scroll Action"
 msgstr ""
 
-#: src/statusicon/statusicon.cc:380
+#: src/statusicon-qt/statusicon.cc:90 src/statusicon/statusicon.cc:385
 msgid "Change volume"
 msgstr ""
 
-#: src/statusicon/statusicon.cc:383
+#: src/statusicon-qt/statusicon.cc:93 src/statusicon/statusicon.cc:388
 msgid "Change playing song"
 msgstr ""
 
-#: src/statusicon/statusicon.cc:386
+#: src/statusicon-qt/statusicon.cc:96 src/statusicon/statusicon.cc:391
 msgid "Other Settings"
 msgstr ""
 
-#: src/statusicon/statusicon.cc:387
+#: src/statusicon-qt/statusicon.cc:97 src/statusicon/statusicon.cc:392
 msgid "Disable the popup window"
 msgstr ""
 
-#: src/statusicon/statusicon.cc:389
+#: src/statusicon-qt/statusicon.cc:99 src/statusicon/statusicon.cc:394
 msgid "Close to the system tray"
 msgstr ""
 
-#: src/statusicon/statusicon.cc:391
+#: src/statusicon-qt/statusicon.cc:101 src/statusicon/statusicon.cc:396
 msgid "Advance in playlist when scrolling upward"
 msgstr ""
 
+#: src/statusicon-qt/statusicon.cc:116 src/statusicon/statusicon.cc:287
+msgid "Se_ttings ..."
+msgstr ""
+
+#: src/statusicon/statusicon.cc:377
+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/stereo_plugin/stereo.cc:19
 msgid "Extra Stereo"
 msgstr ""
@@ -3867,20 +4170,160 @@
 msgid "Extra Stereo"
 msgstr ""
 
+#: src/streamtuner/icecast-model.cc:126 src/streamtuner/shoutcast-model.cc:131
+msgid "Type"
+msgstr ""
+
+#: src/streamtuner/icecast-model.cc:132
+msgid "Current Song"
+msgstr ""
+
+#: src/streamtuner/icecast-model.cc:164
+msgid "Other"
+msgstr ""
+
+#: src/streamtuner/ihr-model.cc:63
+msgid "Market"
+msgstr ""
+
+#: src/streamtuner/ihr-model.cc:156
+msgid "Call Letters"
+msgstr ""
+
+#: src/streamtuner/ihr-model.cc:162
+msgid "Description"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:128
+msgid "Listeners"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:188
+msgid "Top 500 Stations"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:189
+msgid "Alternative"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:190
+msgid "Blues"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:191
+msgid "Classical"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:192
+msgid "Country"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:193
+msgid "Decades"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:194
+msgid "Easy Listening"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:195
+msgid "Electronic"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:196
+msgid "Folk"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:197
+msgid "Inspirational"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:198
+msgid "International"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:199
+msgid "Jazz"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:200
+msgid "Latin"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:201
+msgid "Metal"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:203
+msgid "New Age"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:204
+msgid "Pop"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:205
+msgid "Public Radio"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:206
+msgid "R&B and Urban"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:207
+msgid "Rap"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:208
+msgid "Reggae"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:209
+msgid "Rock"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:210
+msgid "Seasonal and Holiday"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:211
+msgid "Soundtracks"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:212
+msgid "Talk"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:213
+msgid "Themes"
+msgstr ""
+
+#: src/streamtuner/streamtuner.cc:59
+msgid "Shoutcast"
+msgstr ""
+
+#: src/streamtuner/streamtuner.cc:60
+msgid "Icecast"
+msgstr ""
+
+#: src/streamtuner/streamtuner.cc:71
+msgid "Stream Tuner"
+msgstr ""
+
 #: src/tonegen/tonegen.cc:45
 msgid "Tone Generator"
 msgstr ""
 
-#: src/tonegen/tonegen.cc:94
+#: src/tonegen/tonegen.cc:92
 #, c-format
 msgid "%s %.1f Hz"
 msgstr ""
 
-#: src/tonegen/tonegen.cc:94
+#: src/tonegen/tonegen.cc:92
 msgid "Tone Generator: "
 msgstr ""
 
-#: src/tonegen/tonegen.cc:160
+#: src/tonegen/tonegen.cc:161
 msgid ""
 "Sine tone generator by Håvard Kvålen <havardk@xmms.org>\n"
 "Modified by Daniel J. Peng <danielpeng@bigfoot.com>\n"
@@ -3889,11 +4332,30 @@
 "e.g. tone://2000;2005 to play a 2000 Hz tone and a 2005 Hz tone"
 msgstr ""
 
+#: src/ui-common/dialogs-qt.cc:40
+msgid ""
+"\n"
+"(Further messages have been hidden.)"
+msgstr ""
+
+#: src/ui-common/dialogs-qt.cc:52
+msgid "Working ..."
+msgstr ""
+
+#: src/ui-common/dialogs-qt.cc:73
+msgid "Information"
+msgstr ""
+
+#: src/ui-common/menu-ops-gtk.cc:132 src/ui-common/menu-ops-qt.cc:113
+#, c-format
+msgid "%s does not appear to be a valid folder."
+msgstr ""
+
 #: src/voice_removal/voice_removal.cc:28
 msgid "Voice Removal"
 msgstr ""
 
-#: src/vorbis/vorbis.cc:465
+#: src/vorbis/vorbis.cc:433
 msgid ""
 "Audacious Ogg Vorbis Decoder\n"
 "\n"
@@ -3918,12 +4380,12 @@
 msgid "Ogg Vorbis Decoder"
 msgstr ""
 
-#: src/vtx/info.cc:22
+#: src/vtx/info.cc:24
 #, c-format
 msgid "Details about %s"
 msgstr ""
 
-#: src/vtx/info.cc:24
+#: src/vtx/info.cc:26
 msgid ""
 "Title: %t\n"
 "Author: %a\n"
@@ -3942,44 +4404,104 @@
 msgid "VTX Decoder"
 msgstr ""
 
-#: src/vtx/vtx.cc:184
+#: src/vtx/vtx.cc:178
 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/wavpack/wavpack.cc:24
+#: src/vumeter-qt/vumeter_qt.cc:31
+msgid ""
+"VU Meter Plugin for Audacious\n"
+"Copyright 2017-2019 Marc Sánchez Fauste"
+msgstr ""
+
+#: src/vumeter-qt/vumeter_qt.cc:35
+msgid "VU Meter Settings"
+msgstr ""
+
+#: src/vumeter-qt/vumeter_qt.cc:37
+msgid "Peak hold time:"
+msgstr ""
+
+#: src/vumeter-qt/vumeter_qt.cc:42
+msgid "Fall-off time:"
+msgstr ""
+
+#: src/vumeter-qt/vumeter_qt.cc:44
+msgid "dB/second"
+msgstr ""
+
+#: src/vumeter-qt/vumeter_qt.cc:46
+msgid "Display legend"
+msgstr ""
+
+#: src/vumeter-qt/vumeter_qt.h:37
+msgid "VU Meter"
+msgstr ""
+
+#: src/waveout/waveout.cc:43
+msgid "Win32 waveOut"
+msgstr ""
+
+#: src/waveout/waveout.cc:69
+msgid ""
+"Win32 waveOut Plugin for Audacious\n"
+"Copyright 2016 John Lindgren"
+msgstr ""
+
+#: src/wavpack/wavpack.cc:25
 msgid "WavPack Decoder"
 msgstr ""
 
-#: src/wavpack/wavpack.cc:211
+#: src/wavpack/wavpack.cc:217
 msgid "lossy (hybrid)"
 msgstr ""
 
-#: src/wavpack/wavpack.cc:213
+#: src/wavpack/wavpack.cc:219
 msgid "lossy"
 msgstr ""
 
-#: src/wavpack/wavpack.cc:255
+#: src/wavpack/wavpack.cc:259
 msgid ""
 "Copyright 2006 William Pitcock <nenolod@nenolod.net>\n"
 "\n"
 "Some of the plugin code was by Miles Egan."
 msgstr ""
 
-#: src/xsf/plugin.cc:50
+#: src/xsf/plugin.cc:74
 msgid "2SF Decoder"
 msgstr ""
 
-#: src/xsf/plugin.cc:238
+#: src/xsf/plugin.cc:429
+msgid "32728 Hz"
+msgstr ""
+
+#: src/xsf/plugin.cc:432
+msgid "65456 Hz"
+msgstr ""
+
+#: src/xsf/plugin.cc:438
+msgid "Cosine"
+msgstr ""
+
+#: src/xsf/plugin.cc:439
+msgid "Sharp"
+msgstr ""
+
+#: src/xsf/plugin.cc:443
 msgid "XSF Configuration"
 msgstr ""
 
-#: src/xsf/plugin.cc:239
-msgid "Ignore length from file"
+#: src/xsf/plugin.cc:445
+msgid "Default fade time:"
+msgstr ""
+
+#: src/xsf/plugin.cc:447
+msgid "Interpolation mode:"
 msgstr ""
 
-#: src/xspf/xspf.cc:89
+#: src/xspf/xspf.cc:95
 msgid "XML Shareable Playlists (XSPF)"
 msgstr ""

audacious-plugins-3.6.2-gtk3.tar.bz2/po/be.po -> audacious-plugins-4.4.1.tar.bz2/po/be.po Changed

@@ -3,257 +3,80 @@
 # 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,2017
 # debconf <prach.by@gmail.com>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: Audacious Plugins\n"
-"Report-Msgid-Bugs-To: http://redmine.audacious-media-player.org/\n"
-"POT-Creation-Date: 2015-02-28 19:18+0100\n"
-"PO-Revision-Date: 2015-02-04 21:21+0000\n"
-"Last-Translator: Thomas Lange <thomas-lange2@gmx.de>\n"
-"Language-Team: Belarusian (http://www.transifex.com/projects/p/audacious/"
+"Report-Msgid-Bugs-To: https://github.com/audacious-media-player/audacious/"
+"issues\n"
+"POT-Creation-Date: 2024-09-26 21:54+0200\n"
+"PO-Revision-Date: 2011-10-10 17:43+0000\n"
+"Last-Translator: Mikalai Udodau <crom-a@tut.by>, 2012,2017\n"
+"Language-Team: Belarusian (http://app.transifex.com/audacious/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"
-"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<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || "
+"(n%100>=11 && n%100<=14)? 2 : 3);\n"
 
-#: src/aac-raw/aac.cc:18
+#: src/aac/aac.cc:19
 msgid "AAC (Raw) Decoder"
 msgstr ""
 
-#: src/adplug/adplug-xmms.cc:42
+#: src/adplug/adplug-xmms.cc:70
 msgid "AdPlug (AdLib Player)"
 msgstr "AdPlug (AdLib Плэер)"
 
-#: src/adplug/adplug-xmms.cc:156 src/modplug/modplugbmp.cc:335
-#: src/psf/plugin.cc:138 src/vtx/vtx.cc:87 src/xsf/plugin.cc:113
+#: src/adplug/adplug-xmms.cc:167 src/modplug/modplugbmp.cc:321
+#: src/psf/plugin.cc:161 src/vtx/vtx.cc:89 src/xsf/plugin.cc:204
 msgid "sequenced"
 msgstr ""
 
-#: src/alarm/alarm.cc:55 src/alarm/interface.cc:82
-msgid "Alarm"
-msgstr "Алярм"
-
-#: src/alarm/alarm.cc:782
-msgid "Set Alarm ..."
+#: src/adplug/adplug-xmms.cc:349 src/sid/xs_config.cc:61
+msgid "Output"
 msgstr ""
 
-#: src/alarm/alarm.cc:810
-msgid ""
-"A plugin that can be used to start playing at a certain time.\n"
-"\n"
-"Originally written by Adam Feakin and Daniel Stodden."
+#: src/adplug/adplug-xmms.cc:350
+msgid "OPL Emulator:"
 msgstr ""
 
-#: src/alarm/interface.cc: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"
+#: src/adplug/adplug-xmms.cc:353 src/amidiplug/i_configure.cc:153
+#: src/console/plugin.cc:45 src/filewriter/filewriter.cc:481
+#: src/sid/xs_config.cc:65 src/xsf/plugin.cc:446
+msgid "Sample rate:"
 msgstr ""
 
-#: src/alarm/interface.cc: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/adplug/adplug-xmms.cc:354 src/amidiplug/i_configure.cc:155
+#: src/bs2b/plugin.cc:141 src/console/plugin.cc:47
+#: src/modplug/plugin_main.cc:77 src/resample/resample.cc:201
+#: src/resample/resample.cc:207 src/resample/resample.cc:211
+#: src/resample/resample.cc:215 src/resample/resample.cc:219
+#: src/resample/resample.cc:223 src/resample/resample.cc:227
+#: src/resample/resample.cc:231 src/resample/resample.cc:235
+#: src/resample/resample.cc:239 src/resample/resample.cc:243
+#: src/sid/xs_config.cc:67 src/soxr/sox-resampler.cc:205
+msgid "Hz"
+msgstr "Гц"
 
-#: src/alarm/interface.cc: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."
+#: src/adplug/adplug-xmms.cc:355 src/gtkui/settings.cc:55
+#: src/modplug/plugin_main.cc:105 src/qtui/settings.cc:85
+#: src/skins-qt/skins_cfg.cc:302 src/skins/skins_cfg.cc:284
+msgid "Miscellaneous"
 msgstr ""
 
-#: src/alarm/interface.cc:81
-msgid "This is your wakeup call."
-msgstr "Гэта ваш выклік абуджэння."
-
-#: src/alarm/interface.cc:99
-msgid "Your reminder for today is..."
+#: src/adplug/adplug-xmms.cc:356
+msgid "Repeat song in endless loop"
 msgstr ""
 
-#: src/alarm/interface.cc:101 src/alarm/interface.cc:386
-msgid "Reminder"
-msgstr "Напамін"
-
-#: src/alarm/interface.cc:132
-msgid "Monday"
-msgstr "Панядзелак"
-
-#: src/alarm/interface.cc:132
-msgid "Tuesday"
-msgstr "Аўторак"
-
-#: src/alarm/interface.cc:132
-msgid "Wednesday"
-msgstr "Серада"
-
-#: src/alarm/interface.cc:133
-msgid "Thursday"
-msgstr "Чацвер"
-
-#: src/alarm/interface.cc:133
-msgid "Friday"
-msgstr "Пятніца"
-
-#: src/alarm/interface.cc:133
-msgid "Saturday"
-msgstr "Субота"
-
-#: src/alarm/interface.cc:133
-msgid "Sunday"
-msgstr "Нядзеля"
-
-#: src/alarm/interface.cc:171 src/alarm/interface.cc:230
-#: src/alarm/interface.cc:245
-msgid "Time"
-msgstr "Час"
-
-#: src/alarm/interface.cc:178
-msgid "Alarm at (default):"
-msgstr "Алярм у час (па-змоўчванню):"
-
-#: src/alarm/interface.cc:200
-msgid "h"
-msgstr "г"
-
-#: src/alarm/interface.cc:203
-msgid "Quiet after:"
-msgstr "Сцішыць пасля:"
-
-#: src/alarm/interface.cc:215
-msgid "hours"
-msgstr "гадзін"
-
-#: src/alarm/interface.cc:226
-msgid "minutes"
-msgstr "хвілін"
-
-#: src/alarm/interface.cc:235
-msgid "Choose the days for the alarm to come on"
-msgstr "Абярыце дні для ўжывання алярмаў"
-
-#: src/alarm/interface.cc:242
-msgid "Day"
-msgstr "Дзень"
-
-#: src/alarm/interface.cc:259 src/bs2b/plugin.cc:130
-#: src/skins/preset-list.cc:434 src/skins/preset-list.cc:440
-msgid "Default"
-msgstr "Па-змоўчванню"
-
-#: src/alarm/interface.cc:288
-msgid "Days"
-msgstr "Дзён"
-
-#: src/alarm/interface.cc:297
-msgid "Fading"
-msgstr "Згасанне"
-
-#: src/alarm/interface.cc:305 src/console/plugin.cc:41
-#: src/crossfade/crossfade.cc:53 src/crossfade/crossfade.cc:59
-#: src/gtkui/settings.cc:49 src/lirc/lirc.cc:397 src/sid/xs_config.cc:85
-#: src/sid/xs_config.cc:94 src/sid/xs_config.cc:103
-msgid "seconds"
-msgstr "секунд"
-
-#: src/alarm/interface.cc:312 src/alarm/interface.cc:353
-msgid "Volume"
-msgstr "Гучнасць"
-
-#: src/alarm/interface.cc:317
-msgid "Start at"
-msgstr "Пачаць у"
-
-#: src/alarm/interface.cc:333
-msgid "Final"
-msgstr "Фінальны"
-
-#: src/alarm/interface.cc:346
-msgid "Current"
-msgstr "Бягучы"
-
-#: src/alarm/interface.cc:359
-msgid "Additional Command"
-msgstr "Дадатковы загад"
-
-#: src/alarm/interface.cc:365 src/alarm/interface.cc:391
-msgid "enable"
-msgstr "уключыць"
-
-#: src/alarm/interface.cc:372
-msgid "Playlist (optional)"
-msgstr "Плэйліст (апцыянальны)"
-
-#: src/alarm/interface.cc:379
-msgid "Select a playlist"
-msgstr "Выбраць плэйліст"
-
-#: src/alarm/interface.cc:399
-msgid "Options"
-msgstr "Опцыі"
-
-#: src/alarm/interface.cc:404
-msgid "What do these options mean?"
-msgstr "Што азначаюць гэтыя опцыі?"
-
-#: src/alarm/interface.cc:420
-msgid "Help"
-msgstr "Даведка"
-
-#: src/albumart/albumart.cc:31
+#: src/albumart/albumart.cc:31 src/albumart-qt/albumart.cc:35
 msgid "Album Art"
 msgstr "Афармленне альбома"
 
-#: src/albumart-qt/albumart.cc:33
-msgid "Album Art (Qt)"
-msgstr ""
-
-#: src/alsa/alsa.h:70
+#: src/alsa/alsa.h:64
 msgid "ALSA Output"
 msgstr "Вывад ALSA"
 
@@ -290,11 +113,11 @@
 msgid "Mixer element:"
 msgstr "Элемент мікшара:"
 
-#: src/amidi-plug/amidi-plug.cc:41
+#: src/amidiplug/amidi-plug.cc:42
 msgid "AMIDI-Plug (MIDI Player)"
 msgstr ""
 
-#: src/amidi-plug/amidi-plug.cc:437
+#: src/amidiplug/amidi-plug.cc:445
 msgid ""
 "AMIDI-Plug\n"
 "modular MIDI music player\n"
@@ -317,157 +140,156 @@
 "for the good help with alpha testing"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:94
+#: src/amidiplug/i_configure.cc:94
 msgid "Override default gain:"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:102
+#: src/amidiplug/i_configure.cc:102
 msgid "Override default polyphony:"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:110
+#: src/amidiplug/i_configure.cc:110
 msgid "Override default reverb:"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:112 src/amidi-plug/i_configure.cc:120
+#: src/amidiplug/i_configure.cc:112 src/amidiplug/i_configure.cc:120
 msgid "On"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:118
+#: src/amidiplug/i_configure.cc:118
 msgid "Override default chorus:"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:128 src/console/plugin.cc:29
+#: src/amidiplug/i_configure.cc:128 src/console/plugin.cc:29
 msgid "Playback"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:129
+#: src/amidiplug/i_configure.cc:129
 msgid "Transpose:"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:131
+#: src/amidiplug/i_configure.cc:131 src/speedpitch/speed-pitch.cc:257
 msgid "semitones"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:132
+#: src/amidiplug/i_configure.cc:132
 msgid "Drum shift:"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:134
+#: src/amidiplug/i_configure.cc:134
 msgid "note numbers"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:135
+#: src/amidiplug/i_configure.cc:135
 msgid "Skip leading silence"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:137
+#: src/amidiplug/i_configure.cc:137
 msgid "Skip trailing silence"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:141
+#: src/amidiplug/i_configure.cc:141
 msgid "SoundFont"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:143
+#: src/amidiplug/i_configure.cc:148
 msgid "Synthesizer"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:148 src/console/plugin.cc:45
-#: src/sid/xs_config.cc:65
-msgid "Sample rate:"
-msgstr ""
-
-#: src/amidi-plug/i_configure.cc:150 src/bs2b/plugin.cc:141
-#: src/console/plugin.cc:47 src/modplug/plugin_main.cc:78
-#: src/resample/resample.cc:201 src/resample/resample.cc:207
-#: src/resample/resample.cc:211 src/resample/resample.cc:215
-#: src/resample/resample.cc:219 src/resample/resample.cc:223
-#: src/resample/resample.cc:227 src/resample/resample.cc:231
-#: src/resample/resample.cc:235 src/resample/resample.cc:239
-#: src/resample/resample.cc:243 src/sid/xs_config.cc:67
-#: src/sox-resampler/sox-resampler.cc:163
-msgid "Hz"
-msgstr "Гц"
-
-#: src/amidi-plug/i_configure-fluidsynth.cc:52
+#: src/amidiplug/i_configure-fluidsynth.cc:58
+#: src/amidiplug/i_configure-fluidsynth.cc:527
 msgid "AMIDI-Plug - select SoundFont file"
 msgstr ""
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:55 src/filewriter/mp3.cc:658
+#: src/amidiplug/i_configure-fluidsynth.cc:61
 msgid "_Cancel"
-msgstr ""
+msgstr "_Скасаваць"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:56
+#: src/amidiplug/i_configure-fluidsynth.cc:62
 msgid "_Open"
-msgstr ""
+msgstr "А_дкрыць"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:225 src/gtkui/columns.cc:46
+#: src/amidiplug/i_configure-fluidsynth.cc:233
+#: src/amidiplug/i_configure-fluidsynth.cc:461
 msgid "File name"
 msgstr "Імя файла"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:229
+#: src/amidiplug/i_configure-fluidsynth.cc:237
+#: src/amidiplug/i_configure-fluidsynth.cc:464
 msgid "Size (bytes)"
 msgstr "Памер (байтаў)"
 
-#: src/amidi-plug/i_fileinfo.cc:163
+#: src/amidiplug/i_fileinfo.cc:184
 msgid "Name:"
 msgstr "Назва:"
 
-#: src/amidi-plug/i_fileinfo.cc:181
+#: src/amidiplug/i_fileinfo.cc:202
 msgid " MIDI Info "
 msgstr " Звесткі па MIDI "
 
-#: src/amidi-plug/i_fileinfo.cc:195
+#: src/amidiplug/i_fileinfo.cc:216
 msgid "Format:"
 msgstr "Фармат:"
 
-#: src/amidi-plug/i_fileinfo.cc:198
+#: src/amidiplug/i_fileinfo.cc:219
 msgid "Length (msec):"
 msgstr "Даўжыня (мсек):"
 
-#: src/amidi-plug/i_fileinfo.cc:201
+#: src/amidiplug/i_fileinfo.cc:222
 msgid "No. of Tracks:"
 msgstr "Нум. трэкаў:"
 
-#: src/amidi-plug/i_fileinfo.cc:207
+#: src/amidiplug/i_fileinfo.cc:228
 msgid "variable"
 msgstr "пераменны"
 
-#: src/amidi-plug/i_fileinfo.cc:209
+#: src/amidiplug/i_fileinfo.cc:230
 msgid "BPM:"
 msgstr "УЗХ:"
 
-#: src/amidi-plug/i_fileinfo.cc:217
+#: src/amidiplug/i_fileinfo.cc:238
 msgid "BPM (wavg):"
 msgstr "УЗХ (wavg):"
 
-#: src/amidi-plug/i_fileinfo.cc:220
+#: src/amidiplug/i_fileinfo.cc:241
 msgid "Time Div:"
 msgstr ""
 
-#: src/amidi-plug/i_fileinfo.cc:231
+#: src/amidiplug/i_fileinfo.cc:252
 msgid " MIDI Comments and Lyrics "
 msgstr " MIDI Каментары і Лірыка "
 
-#: src/amidi-plug/i_fileinfo.cc:278
+#: src/amidiplug/i_fileinfo.cc:299
 msgid "* no comments available in this MIDI file *"
 msgstr " * у гэтым MIDI-файле каментарыі недаступныя *"
 
-#: src/amidi-plug/i_fileinfo.cc:290
+#: src/amidiplug/i_fileinfo.cc:311
 msgid "* no lyrics available in this MIDI file *"
 msgstr "* у гэтым MIDI-файле лірыка недаступная *"
 
-#: src/amidi-plug/i_fileinfo.cc:300 src/filewriter/vorbis.cc:197
-#: src/ladspa/plugin.cc:416
+#: src/amidiplug/i_fileinfo.cc:321 src/ladspa/plugin.cc:418
+#: src/ui-common/dialogs-qt.cc:32
 msgid "_Close"
 msgstr "Закры_ць"
 
-#: src/amidi-plug/i_fileinfo.cc:325
+#: src/amidiplug/i_fileinfo.cc:346
 msgid " (invalid UTF-8)"
 msgstr "(недапушчальны UTF-8)"
 
-#: src/aosd/aosd.cc:32
+#: src/ampache/ampache.cc:33
+msgid "Ampache Browser"
+msgstr ""
+
+#: src/ampache/ampache.cc:46
+msgid ""
+"Ampache Browser for Audacious\n"
+"http://ampache-browser.org/\n"
+"\n"
+"Copyright (C) Róbert Čerňanský and John Lindgren\n"
+"License: GNU GPLv3"
+msgstr ""
+
+#: src/aosd/aosd.cc:31
 msgid ""
 "Audacious OSD\n"
 "http://www.develia.org/projects.php?p=audacious#aosd\n"
@@ -494,130 +316,130 @@
 msgid "Concave Rectangle"
 msgstr "Увагнуты Прамавугольнік"
 
-#: src/aosd/aosd_style.cc:69
+#: src/aosd/aosd_style.cc:69 src/openmpt/mptwrap.h:50 src/xsf/plugin.cc:436
 msgid "None"
 msgstr "Няма"
 
-#: src/aosd/aosd_trigger.cc:50
+#: src/aosd/aosd_trigger.cc:49
 msgid "Playback Start"
 msgstr "Старт Прайгравання"
 
-#: src/aosd/aosd_trigger.cc:51
+#: src/aosd/aosd_trigger.cc:50
 msgid "Triggers OSD when a playlist entry is played."
 msgstr "Выводзіць OSD калі пункт плэйліста прайграваецца."
 
-#: src/aosd/aosd_trigger.cc:56
+#: src/aosd/aosd_trigger.cc:55
 msgid "Title Change"
 msgstr "Змена Назвы"
 
-#: src/aosd/aosd_trigger.cc:57
+#: src/aosd/aosd_trigger.cc:56
 msgid "Triggers OSD when the song title changes (for internet streams)."
 msgstr ""
 
-#: src/aosd/aosd_trigger.cc:62
+#: src/aosd/aosd_trigger.cc:61
 msgid "Pause On"
 msgstr "Паўза УКЛ."
 
-#: src/aosd/aosd_trigger.cc:63
+#: src/aosd/aosd_trigger.cc:62
 msgid "Triggers OSD when playback is paused."
 msgstr "Выводзіць OSD калі прайграванне на паўзе."
 
-#: src/aosd/aosd_trigger.cc:68
+#: src/aosd/aosd_trigger.cc:67
 msgid "Pause Off"
 msgstr "Паўза ВЫКЛ."
 
-#: src/aosd/aosd_trigger.cc:69
+#: src/aosd/aosd_trigger.cc:68
 msgid "Triggers OSD when playback is unpaused."
 msgstr "Выводзіць OSD калі прайраванне працягваецца з паўзы."
 
-#: src/aosd/aosd_ui.cc:163
+#: src/aosd/aosd_ui.cc:204
 msgid "Placement"
 msgstr "Змяшчэнне"
 
-#: src/aosd/aosd_ui.cc:196
+#: src/aosd/aosd_ui.cc:241
 msgid "Relative X offset:"
 msgstr "Зрушэнне адносна X:"
 
-#: src/aosd/aosd_ui.cc:203
+#: src/aosd/aosd_ui.cc:245
 msgid "Relative Y offset:"
 msgstr "Зрушэнне адносна Y:"
 
-#: src/aosd/aosd_ui.cc:210
+#: src/aosd/aosd_ui.cc:249
 msgid "Max OSD width:"
 msgstr "Максімальная шырыня OSD:"
 
-#: src/aosd/aosd_ui.cc:221
+#: src/aosd/aosd_ui.cc:281
 msgid "Multi-Monitor options"
 msgstr "Опцыі для некалькіх манітораў"
 
-#: src/aosd/aosd_ui.cc:225
+#: src/aosd/aosd_ui.cc:285
 msgid "Display OSD using:"
 msgstr "Паказваць OSD праз:"
 
-#: src/aosd/aosd_ui.cc:227
+#: src/aosd/aosd_ui.cc:287
 msgid "all monitors"
 msgstr "усе маніторы"
 
-#: src/aosd/aosd_ui.cc:230
+#: src/aosd/aosd_ui.cc:290
 #, c-format
 msgid "monitor %i"
 msgstr "манітор %i"
 
-#: src/aosd/aosd_ui.cc:282
+#: src/aosd/aosd_ui.cc:342
 msgid "Timing (ms)"
 msgstr "Затрымка (мс)"
 
-#: src/aosd/aosd_ui.cc:287
+#: src/aosd/aosd_ui.cc:347
 msgid "Display:"
 msgstr "Паказваць:"
 
-#: src/aosd/aosd_ui.cc:292
+#: src/aosd/aosd_ui.cc:352
 msgid "Fade in:"
 msgstr "З'яўленне:"
 
-#: src/aosd/aosd_ui.cc:297
+#: src/aosd/aosd_ui.cc:357
 msgid "Fade out:"
 msgstr "Знікненне:"
 
-#: src/aosd/aosd_ui.cc:361
+#: src/aosd/aosd_ui.cc:442
 msgid "Fonts"
 msgstr "Шрыфты"
 
-#: src/aosd/aosd_ui.cc:368
+#: src/aosd/aosd_ui.cc:449
 #, c-format
 msgid "Font %i:"
 msgstr "Шрыфт %i:"
 
-#: src/aosd/aosd_ui.cc:382
+#: src/aosd/aosd_ui.cc:466
 msgid "Shadow"
 msgstr "Цень"
 
-#: src/aosd/aosd_ui.cc:486
+#: src/aosd/aosd_ui.cc:589
 msgid "Render Style"
 msgstr "Стыль Рэндэру"
 
-#: src/aosd/aosd_ui.cc:502
+#: src/aosd/aosd_ui.cc:605
 msgid "Colors"
 msgstr "Колеры"
 
-#: src/aosd/aosd_ui.cc:513
+#: src/aosd/aosd_ui.cc:616
 #, c-format
 msgid "Color %i:"
 msgstr "Колер %i:"
 
-#: src/aosd/aosd_ui.cc:600
+#: src/aosd/aosd_ui.cc:714
 msgid "Enable trigger"
 msgstr "Уключыць трыгер"
 
-#: src/aosd/aosd_ui.cc:627
+#: src/aosd/aosd_ui.cc:741
 msgid "Event"
 msgstr "Падзея"
 
-#: src/aosd/aosd_ui.cc:655
+#: src/aosd/aosd_ui.cc:768
 msgid "Composite manager detected"
 msgstr "Выяўлены кампазітны менэджар"
 
-#: src/aosd/aosd_ui.cc:662
+#: src/aosd/aosd_ui.cc:775
 msgid ""
 "Composite manager not detected;\n"
 "unless you know that you have one running, please activate a composite "
@@ -627,62 +449,58 @@
 "калі вы не ведаёце, ці запушчаны ён, актывуйце кампазітны менэджар. Інакш "
 "OSD не будзе працаваць карэктна"
 
-#: src/aosd/aosd_ui.cc:670
+#: src/aosd/aosd_ui.cc:783
 msgid "Composite manager not required for fake transparency"
 msgstr "Кампазітны менэджар не патрэбны для імітацыйнай празрыстасці"
 
-#: src/aosd/aosd_ui.cc:706
+#: src/aosd/aosd_ui.cc:820
 msgid "Transparency"
 msgstr "Празрыстасць"
 
-#: src/aosd/aosd_ui.cc:712
+#: src/aosd/aosd_ui.cc:826
 msgid "Fake transparency"
 msgstr "Імітацыйная празрыстасць"
 
-#: src/aosd/aosd_ui.cc:714
+#: src/aosd/aosd_ui.cc:828
 msgid "Real transparency (requires X Composite Ext.)"
 msgstr "Сапраўдная празрыстасць (патрабуе X Composite Ext.)"
 
-#: src/aosd/aosd_ui.cc:756
+#: src/aosd/aosd_ui.cc:875
 msgid "Composite extension not loaded"
 msgstr "Кампазітныя пашырэнні не загружаны"
 
-#: src/aosd/aosd_ui.cc:764
-msgid "Composite extension not available"
-msgstr "Кампазітныя пашырэнні недаступныя"
-
-#: src/aosd/aosd_ui.cc:781
+#: src/aosd/aosd_ui.cc:892
 #, c-format
 msgid "Audacious OSD"
 msgstr ""
 
-#: src/aosd/aosd_ui.cc:844
+#: src/aosd/aosd_ui.cc:955
 msgid "Position"
 msgstr "Пазіцыя"
 
-#: src/aosd/aosd_ui.cc:849
+#: src/aosd/aosd_ui.cc:960
 msgid "Animation"
 msgstr "Анімацыя"
 
-#: src/aosd/aosd_ui.cc:854
+#: src/aosd/aosd_ui.cc:965
 msgid "Text"
 msgstr "Тэкст"
 
-#: src/aosd/aosd_ui.cc:859
+#: src/aosd/aosd_ui.cc:970
 msgid "Decoration"
 msgstr "Абрамленне"
 
-#: src/aosd/aosd_ui.cc:864
+#: src/aosd/aosd_ui.cc:975
 msgid "Trigger"
 msgstr "Пераключальнік"
 
-#: src/aosd/aosd_ui.cc:869
+#: src/aosd/aosd_ui.cc:980 src/streamtuner/shoutcast-model.cc:202
 msgid "Misc"
 msgstr "Іншае"
 
-#: src/aosd/aosd_ui.cc:878
+#: src/aosd/aosd_ui.cc:989
 msgid "Test"
-msgstr ""
+msgstr "Тэст"
 
 #: src/asx3/asx3.cc:35
 msgid "ASXv3 Playlists"
@@ -696,11 +514,83 @@
 msgid "Audacious Playlists (audpl)"
 msgstr "Плэйлісты Audacious (audpl)"
 
-#: src/blur_scope/blur_scope.cc:42
+#: src/background_music/background_music.cc:24
+msgid "Background music"
+msgstr ""
+
+#: src/background_music/background_music.cc:25
+msgid "Target level:"
+msgstr ""
+
+#: src/background_music/background_music.cc:28
+#: src/background_music/background_music.cc:33
+#: src/silence-removal/silence-removal.cc:70
+msgid "dB"
+msgstr "дБ"
+
+#: src/background_music/background_music.cc:29
+msgid "Maximum amplification:"
+msgstr ""
+
+#: src/background_music/background_music.cc:34 src/mpg123/mpg123.cc:81
+msgid "Advanced"
+msgstr "Пашыраныя"
+
+#: src/background_music/background_music.cc:36
+msgid "Slow detection weight:"
+msgstr ""
+
+#: src/background_music/background_music.cc:39
+msgid "Hint"
+msgstr ""
+
+#: src/background_music/background_music.cc:41
+msgid ""
+"Slow detection weight is the relative weight\n"
+"of a long term average detection when compared\n"
+"to the actual, faster loudness detection.\n"
+"A value of zero gives a more radio-like sound\n"
+"where soft passages get \"pulled up\" more quickly,\n"
+"a value of two makes the sound feel less compressed."
+msgstr ""
+
+#: src/background_music/background_music.cc:52
+msgid ""
+"Background Music Plugin for Audacious\n"
+"Copyright 2023;2024 Michel Fleur\n"
+"\n"
+"Controls the volume to make the sound equally loud within and between "
+"tracks.\n"
+" It uses accurate loudness measurement and tries to make the volume changes "
+"sound natural without audible peaks, yet without lowering the volume before "
+"a peak in advance."
+msgstr ""
+
+#: src/background_music/background_music.cc:61
+msgid "Background Music"
+msgstr ""
+
+#: src/bitcrusher/bitcrusher.cc:33
+msgid "Bitcrusher"
+msgstr ""
+
+#: src/bitcrusher/bitcrusher.cc:34
+msgid "Bit Depth:"
+msgstr ""
+
+#: src/bitcrusher/bitcrusher.cc:37
+msgid "Downsample ratio:"
+msgstr ""
+
+#: src/bitcrusher/bitcrusher.cc:48
+msgid "Bitcrusher"
+msgstr ""
+
+#: src/blur_scope/blur_scope.cc:40 src/blur_scope-qt/blur_scope.cc:45
 msgid "Color"
 msgstr "Колер"
 
-#: src/blur_scope/blur_scope.cc:58
+#: src/blur_scope/blur_scope.cc:56 src/blur_scope-qt/blur_scope.cc:158
 msgid "Blur Scope"
 msgstr "Размыты асцылограф"
 
@@ -712,6 +602,10 @@
 msgid "Presets:"
 msgstr "Прэсеты:"
 
+#: src/bs2b/plugin.cc:130
+msgid "Default"
+msgstr "Па-змоўчванню"
+
 #: src/bs2b/plugin.cc:136
 msgid "Feed level:"
 msgstr ""
@@ -724,15 +618,15 @@
 msgid "Cut frequency:"
 msgstr ""
 
-#: src/cairo-spectrum/cairo-spectrum.cc:41
+#: src/cairo-spectrum/cairo-spectrum.cc:42 src/qt-spectrum/qt-spectrum.cc:107
 msgid "Spectrum Analyzer"
 msgstr "Спектральны аналізатар"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:72
+#: src/cdaudio/cdaudio-ng.cc:74
 msgid "Audio CD Plugin"
 msgstr "Плагін Аўдыё КД"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:121
+#: src/cdaudio/cdaudio-ng.cc:121
 msgid ""
 "Copyright (C) 2007-2012 Calin Crisan <ccrisan@gmail.com> and others.\n"
 "\n"
@@ -744,132 +638,132 @@
 "This was a Google Summer of Code 2007 project."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:137
+#: src/cdaudio/cdaudio-ng.cc:140
 msgid "Device"
 msgstr "Прылада"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:138
+#: src/cdaudio/cdaudio-ng.cc:141
 msgid "Read speed:"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:141
+#: src/cdaudio/cdaudio-ng.cc:144
 msgid "Override device:"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:143
+#: src/cdaudio/cdaudio-ng.cc:146
 msgid "Metadata"
 msgstr "Метазвесткі"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:144
+#: src/cdaudio/cdaudio-ng.cc:147
 msgid "Use CD-Text"
 msgstr "Ужываць CD-Text"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:146
+#: src/cdaudio/cdaudio-ng.cc:150
 msgid "Use CDDB"
 msgstr "Ужываць CDDB"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:148
+#: src/cdaudio/cdaudio-ng.cc:152
 msgid "Use HTTP instead of CDDBP"
 msgstr "Ужываць HTTP замест CDDBP"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:151
+#: src/cdaudio/cdaudio-ng.cc:155
 msgid "Server:"
 msgstr "Сервер:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:155
+#: src/cdaudio/cdaudio-ng.cc:159
 msgid "Path:"
 msgstr "Шлях:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:159
+#: src/cdaudio/cdaudio-ng.cc:163
 msgid "Port:"
 msgstr "Порт:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:246
+#: src/cdaudio/cdaudio-ng.cc:228
 msgid "Failed to initialize cdio subsystem."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:281
+#: src/cdaudio/cdaudio-ng.cc:260
 #, c-format
 msgid "Invalid URI %s."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:283
+#: src/cdaudio/cdaudio-ng.cc:262
 #, c-format
 msgid "Track %d not found."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:285
+#: src/cdaudio/cdaudio-ng.cc:264
 #, c-format
 msgid "Track %d is a data track."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:360
+#: src/cdaudio/cdaudio-ng.cc:339
 msgid "Error reading audio CD."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:429
+#: src/cdaudio/cdaudio-ng.cc:410
 msgid "Audio CD"
 msgstr "Audio CD"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:460 src/cdaudio-ng/cdaudio-ng.cc:469
+#: src/cdaudio/cdaudio-ng.cc:446 src/cdaudio/cdaudio-ng.cc:455
 #, c-format
 msgid "Failed to open CD device %s."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:472
+#: src/cdaudio/cdaudio-ng.cc:458
 msgid "No audio capable CD drive found."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:497
+#: src/cdaudio/cdaudio-ng.cc:481
+msgid "Drive is empty."
+msgstr "Прывад пусты."
+
+#: src/cdaudio/cdaudio-ng.cc:483
+msgid "Unsupported disk type."
+msgstr "Тып не падтрымліваецца."
+
+#: src/cdaudio/cdaudio-ng.cc:507
 msgid "Failed to finish initializing opened CD drive."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:510
+#: src/cdaudio/cdaudio-ng.cc:520
 msgid "Failed to retrieve first/last track number."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:531
+#: src/cdaudio/cdaudio-ng.cc:541
 #, c-format
 msgid "Cannot read start/end LSN for track %d."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:613
-msgid "Failed to create the cddb connection."
+#: src/cdaudio/cdaudio-ng.cc:624
+msgid "Failed to create the CDDB connection."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:679
+#: src/cdaudio/cdaudio-ng.cc:690
 msgid "Failed to query the CDDB server"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:681
+#: src/cdaudio/cdaudio-ng.cc:692
 #, c-format
 msgid "Failed to query the CDDB server: %s"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:705
+#: src/cdaudio/cdaudio-ng.cc:716
 #, c-format
-msgid "Failed to read the cddb info: %s"
+msgid "Failed to read the CDDB info: %s"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:765
-msgid "Drive is empty."
-msgstr "Прывад пусты."
-
-#: src/cdaudio-ng/cdaudio-ng.cc:767
-msgid "Unsupported disk type."
-msgstr "Тып не падтрымліваецца."
-
-#: src/cd-menu-items/cd-menu-items.cc:35
+#: src/cd-menu-items/cd-menu-items.cc:33
 msgid "Audio CD Menu Items"
 msgstr ""
 
-#: src/cd-menu-items/cd-menu-items.cc:47
-msgid "Play CD"
-msgstr "Прайграць CD"
-
-#: src/cd-menu-items/cd-menu-items.cc:47
-msgid "Add CD"
-msgstr "Дадаць CD"
+#: src/cd-menu-items/cd-menu-items.cc:45
+msgid "Pla_y CD"
+msgstr ""
+
+#: src/cd-menu-items/cd-menu-items.cc:45
+msgid "_Add CD"
+msgstr ""
 
 #: src/compressor/compressor.cc:45
 msgid "Compression"
@@ -919,7 +813,14 @@
 msgid "Default song length:"
 msgstr "Тыповая працягласць песні:"
 
-#: src/console/plugin.cc:42 src/modplug/plugin_main.cc:59
+#: src/console/plugin.cc:41 src/crossfade/crossfade.cc:56
+#: src/crossfade/crossfade.cc:62 src/lirc/lirc.cc:395 src/notify/notify.cc:113
+#: src/sid/xs_config.cc:85 src/sid/xs_config.cc:94 src/sid/xs_config.cc:103
+#: src/vumeter-qt/vumeter_qt.cc:39
+msgid "seconds"
+msgstr "секунд"
+
+#: src/console/plugin.cc:42 src/modplug/plugin_main.cc:58
 msgid "Resampling"
 msgstr ""
 
@@ -943,72 +844,82 @@
 msgid "Game Console Music Decoder"
 msgstr ""
 
-#: src/coreaudio/coreaudio.cc:50
+#: src/coreaudio/coreaudio.cc:53
 msgid "CoreAudio output"
 msgstr ""
 
-#: src/coreaudio/coreaudio.cc:131
+#: src/coreaudio/coreaudio.cc:155
 msgid ""
 "CoreAudio Output Plugin for Audacious\n"
 "Copyright 2014 William Pitcock\n"
+"Copyright 2017,18 René J.V. Bertin\n"
+" (original code and code adapted from\n"
+" Apple examples, (C) Apple 2013)\n"
 "\n"
 "Based on SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
 msgstr ""
 
-#: src/coreaudio/coreaudio.cc:143
+#: src/coreaudio/coreaudio.cc:171
 msgid "Use exclusive mode"
 msgstr ""
 
-#: src/crossfade/crossfade.cc:44
+#: src/coreaudio/coreaudio.cc:173
+msgid "Use bit perfect audio (adapt device sampling rate)"
+msgstr ""
+
+#: src/crossfade/crossfade.cc:47
 msgid ""
 "Crossfade Plugin for Audacious\n"
 "Copyright 2010-2014 John Lindgren"
 msgstr ""
 
-#: src/crossfade/crossfade.cc:48
+#: src/crossfade/crossfade.cc:51
 msgid "Crossfade"
 msgstr "Пераход"
 
-#: src/crossfade/crossfade.cc:49
+#: src/crossfade/crossfade.cc:52
 msgid "On automatic song change"
 msgstr ""
 
-#: src/crossfade/crossfade.cc:51 src/crossfade/crossfade.cc:57
+#: src/crossfade/crossfade.cc:54 src/crossfade/crossfade.cc:60
 msgid "Overlap:"
 msgstr "Перакрыццё:"
 
-#: src/crossfade/crossfade.cc:55
+#: src/crossfade/crossfade.cc:58
 msgid "On seek or manual song change"
 msgstr ""
 
-#: src/crossfade/crossfade.cc:61
+#: src/crossfade/crossfade.cc:64
+msgid "No fade in"
+msgstr ""
+
+#: src/crossfade/crossfade.cc:66
+msgid "Use S-curve fade"
+msgstr ""
+
+#: src/crossfade/crossfade.cc:68
+msgid "S-curve steepness:"
+msgstr ""
+
+#: src/crossfade/crossfade.cc:70
+msgid "(higher is steeper)"
+msgstr ""
+
+#: src/crossfade/crossfade.cc:72
 msgid "Tip"
 msgstr ""
 
-#: src/crossfade/crossfade.cc:62
+#: src/crossfade/crossfade.cc:73
 msgid ""
 "For better crossfading, enable\n"
 "the Silence Removal effect."
 msgstr ""
 
-#: src/crossfade/crossfade.cc:72
+#: src/crossfade/crossfade.cc:83
 msgid "Crossfade"
 msgstr "Пераход"
 
-#: src/crossfade/crossfade.cc:161
-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.cc:168
-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/crystalizer/crystalizer.cc:31
 msgid "Crystalizer"
 msgstr "Крышталайзер"
@@ -1021,60 +932,61 @@
 msgid "Crystalizer"
 msgstr "Крышталайзер"
 
-#: src/cue/cue.cc:37
+#: src/cue/cue.cc:42
 msgid "Cue Sheet Plugin"
 msgstr ""
 
-#: src/delete-files/delete-files.cc:46 src/delete-files/delete-files.cc:146
+#: src/delete-files/delete-files.cc:53 src/delete-files/delete-files.cc:215
+#: src/delete-files/delete-files.cc:230
 msgid "Delete Files"
 msgstr ""
 
-#: src/delete-files/delete-files.cc:75
-#, c-format
-msgid "Error moving %s to trash: %s."
+#: src/delete-files/delete-files.cc:120
+msgid "No files are selected."
 msgstr ""
 
-#: src/delete-files/delete-files.cc:86
+#: src/delete-files/delete-files.cc:125
 #, c-format
-msgid "Error deleting %s: %s."
+msgid "Do you want to move %s to the trash?"
 msgstr ""
 
-#: src/delete-files/delete-files.cc:117
+#: src/delete-files/delete-files.cc:126
 #, c-format
-msgid "Error deleting %s: not a local file."
+msgid "Do you want to permanently delete %s?"
 msgstr ""
 
-#: src/delete-files/delete-files.cc:134
-msgid "Do you want to move the selected files to the trash?"
+#: src/delete-files/delete-files.cc:133
+#, c-format
+msgid "Do you want to move %d files to the trash?"
 msgstr ""
 
-#: src/delete-files/delete-files.cc:135
-msgid "Move to Trash"
+#: src/delete-files/delete-files.cc:134
+#, c-format
+msgid "Do you want to permanently delete %d files?"
 msgstr ""
 
-#: src/delete-files/delete-files.cc:140
-msgid "Do you want to permanently delete the selected files?"
+#: src/delete-files/delete-files.cc:146
+msgid "Move to trash"
 msgstr ""
 
-#: src/delete-files/delete-files.cc:141 src/skins/preset-list.cc:411
-#: src/skins/preset-list.cc:427
+#: src/delete-files/delete-files.cc:146
 msgid "Delete"
 msgstr "Сцерці"
 
-#: src/delete-files/delete-files.cc:145 src/skins/preset-browser.cc:56
-#: src/skins/preset-list.cc:307 src/skins/ui_playlist.cc:221
+#: src/delete-files/delete-files.cc:213 src/delete-files/delete-files.cc:235
+#: src/skins-qt/search-select.cc:102 src/skins/search-select.cc:78
 msgid "Cancel"
 msgstr "Скасаваць"
 
-#: src/delete-files/delete-files.cc:166
+#: src/delete-files/delete-files.cc:267
 msgid "Delete Selected Files"
 msgstr ""
 
-#: src/delete-files/delete-files.cc:181
+#: src/delete-files/delete-files.cc:287
 msgid "Delete Method"
 msgstr ""
 
-#: src/delete-files/delete-files.cc:182
+#: src/delete-files/delete-files.cc:288
 msgid "Move to trash instead of deleting immediately"
 msgstr ""
 
@@ -1090,13 +1002,13 @@
 msgid "Echo"
 msgstr "Рэха"
 
-#: src/echo_plugin/echo.cc:22 src/modplug/plugin_main.cc:73
-#: src/modplug/plugin_main.cc:83
+#: src/echo_plugin/echo.cc:22 src/modplug/plugin_main.cc:72
+#: src/modplug/plugin_main.cc:82
 msgid "Delay:"
 msgstr "Затрымка:"
 
-#: src/echo_plugin/echo.cc:24 src/modplug/plugin_main.cc:73
-#: src/modplug/plugin_main.cc:83
+#: src/echo_plugin/echo.cc:24 src/modplug/plugin_main.cc:72
+#: src/modplug/plugin_main.cc:82 src/xsf/plugin.cc:445
 msgid "ms"
 msgstr "мс"
 
@@ -1104,7 +1016,7 @@
 msgid "Feedback:"
 msgstr "Зваротная сувязь:"
 
-#: src/echo_plugin/echo.cc:28 src/modplug/plugin_main.cc:87
+#: src/echo_plugin/echo.cc:28 src/modplug/plugin_main.cc:86
 msgid "Volume:"
 msgstr "Гучнасць:"
 
@@ -1112,11 +1024,11 @@
 msgid "Echo"
 msgstr "Рэха"
 
-#: src/ffaudio/ffaudio-core.cc:41
+#: src/ffaudio/ffaudio-core.cc:50
 msgid "FFmpeg Plugin"
 msgstr "Плагін FFmpeg"
 
-#: src/ffaudio/ffaudio-core.cc:571
+#: src/ffaudio/ffaudio-core.cc:649
 msgid ""
 "Multi-format audio decoding plugin for Audacious using\n"
 "FFmpeg multimedia framework (http://www.ffmpeg.org/)\n"
@@ -1126,235 +1038,308 @@
 "Matti Hämäläinen <ccr@tnsp.org>"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:45
+#: src/filewriter/filewriter.cc:48
 msgid "FileWriter Plugin"
 msgstr "Плагін запісу файлаў"
 
-#: src/filewriter/filewriter.cc:386
+#: src/filewriter/filewriter.cc:316
+#, c-format
+msgid ""
+"Error opening %s:\n"
+"%s"
+msgstr ""
+"Памылка пры адкрыцці %s:\n"
+"%s"
+
+#: src/filewriter/filewriter.cc:358
+msgid ""
+"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/filewriter/filewriter.cc:385
 msgid "Output file format:"
 msgstr "Фармат файла вываду:"
 
-#: src/filewriter/filewriter.cc:403
-msgid "Configure"
-msgstr "Канфігураваць"
-
-#: src/filewriter/filewriter.cc:413
+#: src/filewriter/filewriter.cc:389
 msgid "Save into original directory"
 msgstr "Запісваць у выточны каталог"
 
-#: src/filewriter/filewriter.cc:417
-msgid "Save into custom directory"
-msgstr "Запісваць у адмысловы каталог"
-
-#: src/filewriter/filewriter.cc:427
-msgid "Output file folder:"
-msgstr "Каталог файлаў вываду:"
-
-#: src/filewriter/filewriter.cc:431
-msgid "Pick a folder"
-msgstr "Абраць каталог"
-
-#: src/filewriter/filewriter.cc:444
-msgid "Generate file name from:"
+#: src/filewriter/filewriter.cc:392
+msgid "Save into custom directory:"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:448
-msgid "Original file tag"
+#: src/filewriter/filewriter.cc:400
+msgid "Generate file name from:"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:453
+#: src/filewriter/filewriter.cc:401
 msgid "Original file name"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:459
-msgid "Include original file name extension"
+#: src/filewriter/filewriter.cc:404
+msgid "Original file name (no suffix)"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:468
-msgid "Prepend track number to file name"
+#: src/filewriter/filewriter.cc:407
+msgid "Original file tag"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:484
-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."
+#: src/filewriter/filewriter.cc:411
+msgid "Prepend track number to file name"
 msgstr ""
 
-#: src/filewriter/mp3.cc:40 src/filewriter/mp3.cc:717
+#: src/filewriter/filewriter.cc:417 src/filewriter/filewriter.cc:449
 msgid "Auto"
 msgstr "Аўта"
 
-#: src/filewriter/mp3.cc:40
+#: src/filewriter/filewriter.cc:418
+msgid "8000 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:419
+msgid "11025 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:420
+msgid "12000 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:421
+msgid "16000 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:422
+msgid "22050 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:423
+msgid "24000 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:424
+msgid "32000 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:425 src/xsf/plugin.cc:430
+msgid "44100 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:426 src/xsf/plugin.cc:431
+msgid "48000 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:430
+msgid "8 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:431
+msgid "16 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:432
+msgid "32 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:433
+msgid "40 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:434
+msgid "48 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:435
+msgid "56 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:436
+msgid "64 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:437
+msgid "80 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:438
+msgid "96 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:439
+msgid "112 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:440
+msgid "128 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:441
+msgid "160 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:442
+msgid "192 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:443
+msgid "224 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:444
+msgid "256 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:445
+msgid "320 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:450
 msgid "Joint Stereo"
 msgstr "Аб'яднанае стэрэа"
 
-#: src/filewriter/mp3.cc:41 src/modplug/plugin_main.cc:58
-#: src/mpg123/mpg123.cc:248
+#: src/filewriter/filewriter.cc:451 src/modplug/plugin_main.cc:57
+#: src/mpg123/mpg123.cc:259
 msgid "Stereo"
 msgstr "Стэрэа"
 
-#: src/filewriter/mp3.cc:41 src/modplug/plugin_main.cc:57
-#: src/mpg123/mpg123.cc:248
+#: src/filewriter/filewriter.cc:452 src/modplug/plugin_main.cc:56
+#: src/mpg123/mpg123.cc:260
 msgid "Mono"
 msgstr "Мона"
 
-#: src/filewriter/mp3.cc:657
-msgid "MP3 Configuration"
-msgstr "Канфігурацыя MP3"
-
-#: src/filewriter/mp3.cc:658
-msgid "_OK"
+#: src/filewriter/filewriter.cc:456
+msgid "VBR"
 msgstr ""
 
-#: src/filewriter/mp3.cc:681
-msgid "Algorithm Quality:"
-msgstr "Алгарытмічная якасць:"
-
-#: src/filewriter/mp3.cc:706
-msgid "Output Sample Rate:"
+#: src/filewriter/filewriter.cc:457
+msgid "ABR"
 msgstr ""
 
-#: src/filewriter/mp3.cc:733
-msgid "(Hz)"
-msgstr "(Гц)"
-
-#: src/filewriter/mp3.cc:740
-msgid "Bitrate / Compression Ratio:"
+#: src/filewriter/filewriter.cc:478
+msgid "Algorithm quality:"
 msgstr ""
 
-#: src/filewriter/mp3.cc:764
-msgid "Bitrate (kbps):"
-msgstr "Бітрэйт (кб/с):"
+#: src/filewriter/filewriter.cc:484
+msgid "Bitrate:"
+msgstr "Бітрэйт:"
 
-#: src/filewriter/mp3.cc:796
+#: src/filewriter/filewriter.cc:491
 msgid "Compression ratio:"
 msgstr "Узровень сціску:"
 
-#: src/filewriter/mp3.cc:820
-msgid "Audio Mode:"
-msgstr "Рэжым аўдыё:"
-
-#: src/filewriter/mp3.cc:845
-msgid "Miscellaneous:"
+#: src/filewriter/filewriter.cc:498
+msgid "Audio mode:"
 msgstr ""
 
-#: src/filewriter/mp3.cc:856
+#: src/filewriter/filewriter.cc:501
 msgid "Enforce strict ISO compliance"
 msgstr ""
 
-#: src/filewriter/mp3.cc:867
+#: src/filewriter/filewriter.cc:503
 msgid "Error protection"
 msgstr "Абарона ад памылак"
 
-#: src/filewriter/mp3.cc:879 src/filewriter/vorbis.cc:206
-msgid "Quality"
-msgstr "Якасць"
-
-#: src/filewriter/mp3.cc:888
+#: src/filewriter/filewriter.cc:508
 msgid "Enable VBR/ABR"
 msgstr "Уключыць VBR/ABR"
 
-#: src/filewriter/mp3.cc:898
+#: src/filewriter/filewriter.cc:510
 msgid "Type:"
 msgstr "Тып:"
 
-#: src/filewriter/mp3.cc:931
-msgid "VBR Options:"
-msgstr "Опцыі VBR:"
-
-#: src/filewriter/mp3.cc:947
-msgid "Minimum bitrate (kbps):"
-msgstr "Мінімальны бітрэйт (кб/с):"
-
-#: src/filewriter/mp3.cc:973
-msgid "Maximum bitrate (kbps):"
-msgstr "Максімальны бітрэйт (кб/с):"
+#: src/filewriter/filewriter.cc:514
+msgid "Minimum bitrate:"
+msgstr ""
 
-#: src/filewriter/mp3.cc:995
-msgid "Strictly enforce minimum bitrate"
-msgstr "Строгая адпаведнасць мінімальнаму бітрэйту"
+#: src/filewriter/filewriter.cc:518
+msgid "Maximum bitrate:"
+msgstr ""
 
-#: src/filewriter/mp3.cc:1007
-msgid "ABR Options:"
-msgstr "Опцыі ABR:"
-
-#: src/filewriter/mp3.cc:1017
-msgid "Average bitrate (kbps):"
-msgstr "Сярэдні бітрэйт (кб/с):"
+#: src/filewriter/filewriter.cc:522
+msgid "Average bitrate:"
+msgstr ""
 
-#: src/filewriter/mp3.cc:1044
+#: src/filewriter/filewriter.cc:526
 msgid "VBR quality level:"
 msgstr "Узровень якасці VBR:"
 
-#: src/filewriter/mp3.cc:1063
+#: src/filewriter/filewriter.cc:530
+msgid "Strictly enforce minimum bitrate"
+msgstr "Строгая адпаведнасць мінімальнаму бітрэйту"
+
+#: src/filewriter/filewriter.cc:533
 msgid "Omit Xing VBR header"
 msgstr ""
 
-#: src/filewriter/mp3.cc:1076
-msgid "VBR/ABR"
-msgstr "VBR/ABR"
-
-#: src/filewriter/mp3.cc:1085
-msgid "Frame Parameters:"
+#: src/filewriter/filewriter.cc:539
+msgid "Frame Headers"
 msgstr ""
 
-#: src/filewriter/mp3.cc:1097
+#: src/filewriter/filewriter.cc:540
 msgid "Mark as copyright"
 msgstr "Пазначыць copyright"
 
-#: src/filewriter/mp3.cc:1108
+#: src/filewriter/filewriter.cc:542
 msgid "Mark as original"
 msgstr "Пазначыць як арыгінал"
 
-#: src/filewriter/mp3.cc:1120
-msgid "ID3 Parameters:"
+#: src/filewriter/filewriter.cc:544
+msgid "ID3 Tags"
 msgstr ""
 
-#: src/filewriter/mp3.cc:1131
+#: src/filewriter/filewriter.cc:545
 msgid "Force addition of version 2 tag"
 msgstr "Прымусова дадаваць тэг версіі 2"
 
-#: src/filewriter/mp3.cc:1141
+#: src/filewriter/filewriter.cc:547
 msgid "Only add v1 tag"
 msgstr "Дадаваць толькі тэг v1"
 
-#: src/filewriter/mp3.cc:1148
+#: src/filewriter/filewriter.cc:549
 msgid "Only add v2 tag"
 msgstr "Дадаваць толькі тэг v2"
 
-#: src/filewriter/mp3.cc:1169
+#: src/filewriter/filewriter.cc:554
+msgid "Quality"
+msgstr "Якасць"
+
+#: src/filewriter/filewriter.cc:555
+msgid "VBR/ABR"
+msgstr "VBR/ABR"
+
+#: src/filewriter/filewriter.cc:556
 msgid "Tags"
 msgstr "Тэгі"
 
-#: src/filewriter/vorbis.cc:196
-msgid "Vorbis Encoder Configuration"
-msgstr "Канфігурацыя Энкэдэра Vorbis"
-
-#: src/filewriter/vorbis.cc:219
-msgid "Quality level (0 - 10):"
-msgstr "Узровень якасці (0 - 10):"
+#: src/filewriter/filewriter.cc:566
+msgid "Quality (0-1):"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:573 src/skins-qt/skins_cfg.cc:307
+#: src/skins/skins_cfg.cc:289
+msgid "General"
+msgstr "Агульныя"
 
-#: src/flacng/flacng.h:35
+#: src/flac/flacng.h:36
 msgid "FLAC Decoder"
 msgstr "Дэкодар FLAC"
 
-#: src/flacng/metadata.cc:351 src/wavpack/wavpack.cc:209
+#: src/flac/metadata.cc:296 src/wavpack/wavpack.cc:215
 msgid "lossless"
 msgstr ""
 
-#: src/flacng/plugin.cc:169
+#: src/flac/plugin.cc:214
 msgid ""
 "Original code by\n"
 "Ralf Ertzinger <ralf@skytale.net>\n"
@@ -1372,15 +1357,15 @@
 msgid "GIO Plugin"
 msgstr "Плагін GIO"
 
-#: src/gio/gio.cc:153
+#: src/gio/gio.cc:152
 msgid "Read-and-append mode not supported"
 msgstr ""
 
-#: src/gio/gio.cc:166
+#: src/gio/gio.cc:165
 msgid "Invalid open mode"
 msgstr ""
 
-#: src/gl-spectrum/gl-spectrum.cc:51
+#: src/glspectrum/gl-spectrum.cc:52
 msgid ""
 "OpenGL Spectrum Analyzer for Audacious\n"
 "Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
@@ -1392,509 +1377,650 @@
 "License: GPLv2+"
 msgstr ""
 
-#: src/gl-spectrum/gl-spectrum.cc:62
+#: src/glspectrum/gl-spectrum.cc:63 src/qtglspectrum/gl-spectrum.cc:53
 msgid "OpenGL Spectrum Analyzer"
 msgstr ""
 
-#: src/gl-spectrum-qt/gl-spectrum.cc:41
-msgid ""
-"OpenGL Spectrum Analyzer for Audacious\n"
-"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
-"Copyright 2014 William Pitcock\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-qt/gl-spectrum.cc:53
-msgid "OpenGL Spectrum Analyzer (Qt)"
-msgstr ""
-
-#: src/gnomeshortcuts/gnomeshortcuts.cc:38
-msgid "GNOME Shortcuts"
-msgstr ""
-
-#: src/gnomeshortcuts/gnomeshortcuts.cc:54
-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>"
+#: src/gtkui/columns.cc:36 src/moonstone/playlist_model.cc:38
+#: src/qtui/playlist_model.cc:33
+msgid "Entry Number"
 msgstr ""
 
-#: src/gtkui/columns.cc:35
-msgid "Entry number"
-msgstr "Нумар запіса"
-
-#: src/gtkui/columns.cc:36 src/playlist-manager/playlist-manager.cc:225
-#: src/qtui/playlist_model.cc:123
+#: src/gtkui/columns.cc:37 src/moonstone/playlist_model.cc:38
+#: src/moonstone/playlist_selection.cc:64
+#: src/playlist-manager/playlist-manager.cc:200
+#: src/playlist-manager-qt/playlist-manager-qt.cc:188
+#: src/qtui/playlist_model.cc:33 src/streamtuner/icecast-model.cc:120
+#: src/streamtuner/ihr-model.cc:159 src/streamtuner/shoutcast-model.cc:122
 msgid "Title"
 msgstr "Назва"
 
-#: src/gtkui/columns.cc:37 src/qtui/playlist_model.cc:125
+#: src/gtkui/columns.cc:38 src/moonstone/playlist_model.cc:39
+#: src/qtui/playlist_model.cc:33
 msgid "Artist"
 msgstr "Выканаўца"
 
-#: src/gtkui/columns.cc:38
+#: src/gtkui/columns.cc:39 src/moonstone/playlist_model.cc:39
+#: src/qtui/playlist_model.cc:33
 msgid "Year"
 msgstr "Год"
 
-#: src/gtkui/columns.cc:39 src/qtui/playlist_model.cc:127
+#: src/gtkui/columns.cc:40 src/moonstone/playlist_model.cc:39
+#: src/qtui/playlist_model.cc:34
 msgid "Album"
 msgstr "Альбом"
 
-#: src/gtkui/columns.cc:40
-msgid "Album artist"
-msgstr ""
+#: src/gtkui/columns.cc:41 src/moonstone/playlist_model.cc:40
+#: src/qtui/playlist_model.cc:34
+msgid "Album Artist"
+msgstr "Выканаўца альбома"
 
-#: src/gtkui/columns.cc:41
+#: src/gtkui/columns.cc:42 src/moonstone/playlist_model.cc:40
+#: src/qtui/playlist_model.cc:34
 msgid "Track"
 msgstr "Трэк"
 
-#: src/gtkui/columns.cc:42
+#: src/gtkui/columns.cc:43 src/moonstone/playlist_model.cc:40
+#: src/qtui/playlist_model.cc:34 src/streamtuner/icecast-model.cc:123
+#: src/streamtuner/shoutcast-model.cc:125
+#: src/streamtuner/shoutcast-model.cc:236
 msgid "Genre"
 msgstr "Жанр"
 
-#: src/gtkui/columns.cc:43
-msgid "Queue position"
-msgstr "Пазіцыя ў чарзе"
+#: src/gtkui/columns.cc:44 src/moonstone/playlist_model.cc:41
+#: src/qtui/playlist_model.cc:35
+msgid "Queue Position"
+msgstr ""
 
-#: src/gtkui/columns.cc:44
+#: src/gtkui/columns.cc:45 src/moonstone/playlist_model.cc:41
+#: src/qtui/playlist_model.cc:35
 msgid "Length"
 msgstr "Працягласць"
 
-#: src/gtkui/columns.cc:45
-msgid "File path"
-msgstr "Шлях да файла"
-
-#: src/gtkui/columns.cc:47
-msgid "Custom title"
-msgstr "Адмысловы загаловак"
+#: src/gtkui/columns.cc:46 src/moonstone/playlist_model.cc:41
+#: src/qtui/playlist_model.cc:35
+msgid "File Path"
+msgstr ""
+
+#: src/gtkui/columns.cc:47 src/moonstone/playlist_model.cc:42
+#: src/qtui/playlist_model.cc:35
+msgid "File Name"
+msgstr ""
+
+#: src/gtkui/columns.cc:48 src/moonstone/playlist_model.cc:42
+#: src/qtui/playlist_model.cc:36
+msgid "Custom Title"
+msgstr ""
 
-#: src/gtkui/columns.cc:48
+#: src/gtkui/columns.cc:49 src/moonstone/playlist_model.cc:42
+#: src/qtui/playlist_model.cc:36 src/streamtuner/icecast-model.cc:129
+#: src/streamtuner/shoutcast-model.cc:134
 msgid "Bitrate"
 msgstr "Бітрэйт"
 
-#: src/gtkui/columns.cc:308
+#: src/gtkui/columns.cc:50 src/moonstone/playlist_model.cc:43
+#: src/qtui/playlist_model.cc:36
+msgid "Comment"
+msgstr "Каментар"
+
+#: src/gtkui/columns.cc:51 src/qtui/playlist_model.cc:36
+msgid "Publisher"
+msgstr ""
+
+#: src/gtkui/columns.cc:52 src/qtui/playlist_model.cc:37
+msgid "Catalog Number"
+msgstr ""
+
+#: src/gtkui/columns.cc:53 src/moonstone/playlist_model.cc:43
+#: src/qtui/playlist_model.cc:37
+msgid "Disc"
+msgstr ""
+
+#: src/gtkui/columns.cc:325
 msgid "Available columns"
 msgstr ""
 
-#: src/gtkui/columns.cc:334
+#: src/gtkui/columns.cc:351
 msgid "Displayed columns"
 msgstr ""
 
-#: src/gtkui/layout.cc:72 src/search-tool/search-tool.cc:40
+#: src/gtkui/layout.cc:74 src/search-tool-qt/search-tool-qt.cc:58
+#: src/search-tool/search-tool.cc:49
 msgid "Search Tool"
 msgstr "Пошукавая прылада"
 
-#: src/gtkui/layout.cc:167
+#: src/gtkui/layout.cc:170
 msgid "Dock at Left"
 msgstr "Стыкаваць Злева"
 
-#: src/gtkui/layout.cc:167
+#: src/gtkui/layout.cc:170
 msgid "Dock at Right"
 msgstr "Стыкаваць Справа"
 
-#: src/gtkui/layout.cc:168
+#: src/gtkui/layout.cc:171
 msgid "Dock at Top"
 msgstr "Стыкаваць Уверсе"
 
-#: src/gtkui/layout.cc:168
+#: src/gtkui/layout.cc:171
 msgid "Dock at Bottom"
 msgstr "Стыкаваць Долу"
 
-#: src/gtkui/layout.cc:168
+#: src/gtkui/layout.cc:171
 msgid "Undock"
 msgstr ""
 
-#: src/gtkui/layout.cc:168 src/ladspa/plugin.cc:531
+#: src/gtkui/layout.cc:171 src/ladspa/plugin.cc:540
 msgid "Disable"
 msgstr "Выключыць"
 
-#: src/gtkui/menus.cc:126 src/qtui/main_window_actions.cc:93
-#: src/statusicon/statusicon.cc:276
+#: src/gtkui/menus.cc:79 src/qtui/menus.cc:107
+#: src/statusicon-qt/statusicon.cc:115 src/statusicon/statusicon.cc:286
 msgid "_Open Files ..."
 msgstr "Адк_рыць файлы ..."
 
-#: src/gtkui/menus.cc:127
+#: src/gtkui/menus.cc:80 src/qtui/menus.cc:111
 msgid "Open _URL ..."
 msgstr "Адкрыць _URL ..."
 
-#: src/gtkui/menus.cc:128 src/qtui/main_window_actions.cc:95
+#: src/gtkui/menus.cc:81 src/qtui/menus.cc:113
 msgid "_Add Files ..."
 msgstr "Дадаць _файлы ..."
 
-#: src/gtkui/menus.cc:129
+#: src/gtkui/menus.cc:82 src/qtui/menus.cc:118
 msgid "Add U_RL ..."
 msgstr "Дадаць U_RL ..."
 
-#: src/gtkui/menus.cc:131
+#: src/gtkui/menus.cc:84 src/qtui/menus.cc:120
 msgid "Search _Library"
 msgstr ""
 
-#: src/gtkui/menus.cc:133 src/qtui/main_window_actions.cc:98
+#: src/gtkui/menus.cc:86 src/qtui/menus.cc:123
 msgid "A_bout ..."
 msgstr "Аб ..."
 
-#: src/gtkui/menus.cc:134 src/qtui/main_window_actions.cc:99
+#: src/gtkui/menus.cc:87 src/qtui/menus.cc:125
 msgid "_Settings ..."
 msgstr ""
 
-#: src/gtkui/menus.cc:135 src/qtui/main_window_actions.cc:103
-#: src/statusicon/statusicon.cc:284
+#: src/gtkui/menus.cc:88 src/qtui/menus.cc:131
+#: src/statusicon-qt/statusicon.cc:117 src/statusicon/statusicon.cc:288
 msgid "_Quit"
 msgstr "Вы_йсці"
 
-#: src/gtkui/menus.cc:139 src/gtkui/menus.cc:262
-#: src/qtui/main_window_actions.cc:107 src/search-tool/search-tool.cc:641
-#: src/statusicon/statusicon.cc:278
+#: src/gtkui/menus.cc:92 src/gtkui/menus.cc:226
+#: src/moonstone/playlist_tabs.cc:306 src/qtui/menus.cc:135
+#: src/qtui/playlist_tabs.cc:331 src/search-tool-qt/search-tool-qt.cc:499
+#: src/search-tool/search-tool.cc:339 src/statusicon-qt/statusicon.cc:109
+#: src/statusicon/statusicon.cc:280
 msgid "_Play"
 msgstr "_Прайграць"
 
-#: src/gtkui/menus.cc:140 src/qtui/main_window_actions.cc:108
-#: src/statusicon/statusicon.cc:279
+#: src/gtkui/menus.cc:93 src/qtui/menus.cc:137
+#: src/statusicon-qt/statusicon.cc:110 src/statusicon/statusicon.cc:281
 msgid "Paus_e"
 msgstr "Па_уза"
 
-#: src/gtkui/menus.cc:141 src/qtui/main_window_actions.cc:109
-#: src/statusicon/statusicon.cc:280
+#: src/gtkui/menus.cc:94 src/qtui/menus.cc:139
+#: src/statusicon-qt/statusicon.cc:111 src/statusicon/statusicon.cc:282
 msgid "_Stop"
 msgstr "Сп_ыніць"
 
-#: src/gtkui/menus.cc:142 src/qtui/main_window_actions.cc:110
-#: src/statusicon/statusicon.cc:277
+#: src/gtkui/menus.cc:95 src/qtui/menus.cc:141
+#: src/statusicon-qt/statusicon.cc:112 src/statusicon/statusicon.cc:283
 msgid "Pre_vious"
 msgstr "Пап_ярэдні"
 
-#: src/gtkui/menus.cc:143 src/qtui/main_window_actions.cc:111
-#: src/statusicon/statusicon.cc:281
+#: src/gtkui/menus.cc:96 src/qtui/menus.cc:143
+#: src/statusicon-qt/statusicon.cc:113 src/statusicon/statusicon.cc:284
 msgid "_Next"
 msgstr "Нас_тупны"
 
-#: src/gtkui/menus.cc:145 src/qtui/main_window_actions.cc:113
+#: src/gtkui/menus.cc:97 src/qtui/menus.cc:145 src/skins/menus.cc:114
+#: src/skins-qt/menus.cc:105
+msgid "Previous Album"
+msgstr ""
+
+#: src/gtkui/menus.cc:98 src/qtui/menus.cc:146 src/skins/menus.cc:115
+#: src/skins-qt/menus.cc:106
+msgid "Next Album"
+msgstr ""
+
+#: src/gtkui/menus.cc:100 src/qtui/menus.cc:148
 msgid "_Repeat"
 msgstr "Па_ўтор"
 
-#: src/gtkui/menus.cc:146 src/qtui/main_window_actions.cc:114
+#: src/gtkui/menus.cc:101 src/qtui/menus.cc:150
 msgid "S_huffle"
 msgstr "У_разнабой"
 
-#: src/gtkui/menus.cc:147 src/qtui/main_window_actions.cc:115
+#: src/gtkui/menus.cc:102 src/qtui/menus.cc:152
+msgid "Shuffle by Albu_m"
+msgstr ""
+
+#: src/gtkui/menus.cc:103 src/qtui/menus.cc:155
 msgid "N_o Playlist Advance"
 msgstr "_Не пераходзіць да наступнай"
 
-#: src/gtkui/menus.cc:148 src/qtui/main_window_actions.cc:116
+#: src/gtkui/menus.cc:104 src/qtui/menus.cc:157
 msgid "Stop A_fter This Song"
 msgstr ""
 
-#: src/gtkui/menus.cc:150 src/gtkui/menus.cc:247
-#: src/qtui/main_window_actions.cc:118
+#: src/gtkui/menus.cc:106 src/gtkui/menus.cc:210 src/qtui/menus.cc:162
+#: src/qtui/menus.cc:294
 msgid "Song _Info ..."
 msgstr "_Звесткі пра песню ..."
 
-#: src/gtkui/menus.cc:151
+#: src/gtkui/menus.cc:107
 msgid "Jump to _Time ..."
 msgstr "Перайсці да _часу ..."
 
-#: src/gtkui/menus.cc:152
+#: src/gtkui/menus.cc:108
 msgid "_Jump to Song ..."
 msgstr "_Перайсці да песні ..."
 
-#: src/gtkui/menus.cc:154
+#: src/gtkui/menus.cc:110 src/qtui/menus.cc:165
 msgid "Set Repeat Point _A"
 msgstr ""
 
-#: src/gtkui/menus.cc:155
+#: src/gtkui/menus.cc:111 src/qtui/menus.cc:167
 msgid "Set Repeat Point _B"
 msgstr ""
 
-#: src/gtkui/menus.cc:156
+#: src/gtkui/menus.cc:112 src/qtui/menus.cc:169
 msgid "_Clear Repeat Points"
 msgstr ""
 
-#: src/gtkui/menus.cc:160 src/gtkui/menus.cc:167 src/gtkui/menus.cc:183
-#: src/qtui/main_window_actions.cc:122 src/qtui/main_window_actions.cc:129
-#: src/qtui/main_window_actions.cc:145
+#: src/gtkui/menus.cc:116 src/gtkui/menus.cc:123 src/gtkui/menus.cc:141
+#: src/qtui/menus.cc:173 src/qtui/menus.cc:180 src/qtui/menus.cc:198
 msgid "By _Title"
 msgstr "Па _назве"
 
-#: src/gtkui/menus.cc:161 src/qtui/main_window_actions.cc:123
+#: src/gtkui/menus.cc:117 src/qtui/menus.cc:174
 msgid "By _File Name"
 msgstr ""
 
-#: src/gtkui/menus.cc:162 src/qtui/main_window_actions.cc:124
+#: src/gtkui/menus.cc:118 src/qtui/menus.cc:175
 msgid "By File _Path"
 msgstr ""
 
-#: src/gtkui/menus.cc:166 src/gtkui/menus.cc:182
-#: src/qtui/main_window_actions.cc:128 src/qtui/main_window_actions.cc:144
+#: src/gtkui/menus.cc:122 src/gtkui/menus.cc:140 src/qtui/menus.cc:179
+#: src/qtui/menus.cc:197
 msgid "By Track _Number"
 msgstr "Па _нумары трэка"
 
-#: src/gtkui/menus.cc:168 src/gtkui/menus.cc:184
-#: src/qtui/main_window_actions.cc:130 src/qtui/main_window_actions.cc:146
+#: src/gtkui/menus.cc:124 src/gtkui/menus.cc:142 src/qtui/menus.cc:181
+#: src/qtui/menus.cc:199
 msgid "By _Artist"
 msgstr "Па вык_анаўцу"
 
-#: src/gtkui/menus.cc:169 src/gtkui/menus.cc:185
-#: src/qtui/main_window_actions.cc:131 src/qtui/main_window_actions.cc:147
+#: src/gtkui/menus.cc:125 src/gtkui/menus.cc:143 src/qtui/menus.cc:182
+#: src/qtui/menus.cc:200
 msgid "By Al_bum"
 msgstr ""
 
-#: src/gtkui/menus.cc:170 src/gtkui/menus.cc:186
-#: src/qtui/main_window_actions.cc:132 src/qtui/main_window_actions.cc:148
+#: src/gtkui/menus.cc:126 src/gtkui/menus.cc:144 src/qtui/menus.cc:183
+#: src/qtui/menus.cc:201
 msgid "By Albu_m Artist"
 msgstr ""
 
-#: src/gtkui/menus.cc:171 src/gtkui/menus.cc:187
-#: src/qtui/main_window_actions.cc:133 src/qtui/main_window_actions.cc:149
+#: src/gtkui/menus.cc:127 src/gtkui/menus.cc:145 src/qtui/menus.cc:184
+#: src/qtui/menus.cc:202
 msgid "By Release _Date"
 msgstr "Па даце _выдання"
 
-#: src/gtkui/menus.cc:172 src/gtkui/menus.cc:188
-#: src/qtui/main_window_actions.cc:134 src/qtui/main_window_actions.cc:150
+#: src/gtkui/menus.cc:128 src/gtkui/menus.cc:146 src/qtui/menus.cc:185
+#: src/qtui/menus.cc:203
 msgid "By _Genre"
 msgstr ""
 
-#: src/gtkui/menus.cc:173 src/gtkui/menus.cc:189
-#: src/qtui/main_window_actions.cc:135 src/qtui/main_window_actions.cc:151
+#: src/gtkui/menus.cc:129 src/gtkui/menus.cc:147 src/qtui/menus.cc:186
+#: src/qtui/menus.cc:204
 msgid "By _Length"
 msgstr ""
 
-#: src/gtkui/menus.cc:174 src/gtkui/menus.cc:190
-#: src/qtui/main_window_actions.cc:136 src/qtui/main_window_actions.cc:152
+#: src/gtkui/menus.cc:130 src/gtkui/menus.cc:148 src/qtui/menus.cc:187
+#: src/qtui/menus.cc:205
 msgid "By _File Path"
 msgstr "Па шляху да файла"
 
-#: src/gtkui/menus.cc:175 src/gtkui/menus.cc:191
-#: src/qtui/main_window_actions.cc:137 src/qtui/main_window_actions.cc:153
+#: src/gtkui/menus.cc:131 src/gtkui/menus.cc:149 src/qtui/menus.cc:188
+#: src/qtui/menus.cc:206
 msgid "By _Custom Title"
 msgstr "Па адмы_словым загалоўку"
 
-#: src/gtkui/menus.cc:177 src/gtkui/menus.cc:193
-#: src/qtui/main_window_actions.cc:139 src/qtui/main_window_actions.cc:155
+#: src/gtkui/menus.cc:132 src/gtkui/menus.cc:150 src/qtui/menus.cc:189
+#: src/qtui/menus.cc:207
+msgid "By C_omment"
+msgstr ""
+
+#: src/gtkui/menus.cc:133 src/gtkui/menus.cc:151 src/qtui/menus.cc:190
+#: src/qtui/menus.cc:208
+msgid "By D_isc Number"
+msgstr ""
+
+#: src/gtkui/menus.cc:135 src/gtkui/menus.cc:153 src/qtui/menus.cc:192
+#: src/qtui/menus.cc:210
 msgid "R_everse Order"
 msgstr "Ад_варотны парадак"
 
-#: src/gtkui/menus.cc:178 src/gtkui/menus.cc:194
-#: src/qtui/main_window_actions.cc:140 src/qtui/main_window_actions.cc:156
+#: src/gtkui/menus.cc:136 src/gtkui/menus.cc:154 src/qtui/menus.cc:194
+#: src/qtui/menus.cc:212
 msgid "_Random Order"
 msgstr "Выпад_ковы парадак"
 
-#: src/gtkui/menus.cc:198 src/qtui/main_window_actions.cc:160
+#: src/gtkui/menus.cc:158 src/qtui/menus.cc:216
 msgid "_Play/Resume"
 msgstr ""
 
-#: src/gtkui/menus.cc:199 src/gtkui/menus.cc:251
-#: src/qtui/main_window_actions.cc:161
+#: src/gtkui/menus.cc:159 src/qtui/menus.cc:218
 msgid "_Refresh"
 msgstr "А_бнавіць"
 
-#: src/gtkui/menus.cc:201 src/qtui/main_window_actions.cc:163
+#: src/gtkui/menus.cc:161 src/qtui/menus.cc:222
 msgid "_Sort"
 msgstr "_Парадкаваць"
 
-#: src/gtkui/menus.cc:202 src/qtui/main_window_actions.cc:164
+#: src/gtkui/menus.cc:162 src/qtui/menus.cc:223
 msgid "Sort Se_lected"
 msgstr ""
 
-#: src/gtkui/menus.cc:203 src/qtui/main_window_actions.cc:165
+#: src/gtkui/menus.cc:163 src/qtui/menus.cc:225
 msgid "Remove _Duplicates"
 msgstr ""
 
-#: src/gtkui/menus.cc:204 src/qtui/main_window_actions.cc:166
+#: src/gtkui/menus.cc:164 src/qtui/menus.cc:226
 msgid "Remove _Unavailable Files"
 msgstr "Сцерці _недаступныя файлы"
 
-#: src/gtkui/menus.cc:206 src/playlist-manager/playlist-manager.cc:244
-#: src/qtui/main_window_actions.cc:168
+#: src/gtkui/menus.cc:166 src/playlist-manager/playlist-manager.cc:219
+#: src/playlist-manager-qt/playlist-manager-qt.cc:348 src/qtui/menus.cc:229
 msgid "_New"
 msgstr "_Дадаць"
 
-#: src/gtkui/menus.cc:207
+#: src/gtkui/menus.cc:167 src/qtui/menus.cc:230
 msgid "Ren_ame ..."
 msgstr "Перайменаваць ..."
 
-#: src/gtkui/menus.cc:208 src/gtkui/menus.cc:264
-#: src/qtui/main_window_actions.cc:170
+#: src/gtkui/menus.cc:168 src/gtkui/menus.cc:228
+#: src/moonstone/playlist_tabs.cc:311 src/qtui/menus.cc:231
+#: src/qtui/playlist_tabs.cc:336
 msgid "Remo_ve"
 msgstr ""
 
-#: src/gtkui/menus.cc:210
+#: src/gtkui/menus.cc:170 src/qtui/menus.cc:233
 msgid "_Import ..."
 msgstr "_Імпарт ..."
 
-#: src/gtkui/menus.cc:211
+#: src/gtkui/menus.cc:171 src/qtui/menus.cc:234
 msgid "_Export ..."
 msgstr "Э_кспарт ..."
 
-#: src/gtkui/menus.cc:213
+#: src/gtkui/menus.cc:173 src/qtui/menus.cc:237
 msgid "Playlist _Manager ..."
 msgstr "Кіра_ўнік плэйлістоў ..."
 
-#: src/gtkui/menus.cc:214 src/qtui/main_window_actions.cc:176
+#: src/gtkui/menus.cc:174 src/qtui/menus.cc:239
 msgid "_Queue Manager ..."
 msgstr "Кіраўнік _чаргі ..."
 
-#: src/gtkui/menus.cc:218 src/qtui/main_window_actions.cc:180
+#: src/gtkui/menus.cc:178 src/qtui/menus.cc:243
 msgid "Volume _Up"
 msgstr "_Гучней"
 
-#: src/gtkui/menus.cc:219 src/qtui/main_window_actions.cc:181
+#: src/gtkui/menus.cc:179 src/qtui/menus.cc:245
 msgid "Volume _Down"
 msgstr "_Цішэй"
 
-#: src/gtkui/menus.cc:221 src/qtui/main_window_actions.cc:183
-msgid "_Equalizer"
-msgstr "Э_квалайзер"
+#: src/gtkui/menus.cc:181 src/qtui/menus.cc:249
+msgid "_Equalizer ..."
+msgstr ""
 
-#: src/gtkui/menus.cc:223 src/qtui/main_window_actions.cc:185
+#: src/gtkui/menus.cc:182 src/qtui/menus.cc:251
 msgid "E_ffects ..."
 msgstr ""
 
-#: src/gtkui/menus.cc:227
+#: src/gtkui/menus.cc:184
+msgid "_Record Stream"
+msgstr ""
+
+#: src/gtkui/menus.cc:185
+msgid "Audio _Settings ..."
+msgstr ""
+
+#: src/gtkui/menus.cc:189 src/qtui/menus.cc:260
 msgid "Show _Menu Bar"
 msgstr "Паказваць стужку _меню"
 
-#: src/gtkui/menus.cc:228
+#: src/gtkui/menus.cc:190 src/qtui/menus.cc:262
 msgid "Show I_nfo Bar"
 msgstr "Паказваць стужку звес_так"
 
-#: src/gtkui/menus.cc:229
+#: src/gtkui/menus.cc:191 src/qtui/menus.cc:264
+msgid "Show Info Bar _Album Art"
+msgstr ""
+
+#: src/gtkui/menus.cc:192 src/qtui/menus.cc:266
 msgid "Show Info Bar Vis_ualization"
 msgstr "Паказваць ві_зуалізацыю стужкі звестак"
 
-#: src/gtkui/menus.cc:230
+#: src/gtkui/menus.cc:193 src/qtui/menus.cc:268
 msgid "Show _Status Bar"
 msgstr "Паказваць стужку _статусу"
 
-#: src/gtkui/menus.cc:232
+#: src/gtkui/menus.cc:195 src/qtui/menus.cc:272
 msgid "Show _Remaining Time"
 msgstr ""
 
-#: src/gtkui/menus.cc:234
+#: src/gtkui/menus.cc:197 src/qtui/menus.cc:276 src/skins/menus.cc:157
+#: src/skins-qt/menus.cc:152
 msgid "_Visualizations ..."
 msgstr ""
 
-#: src/gtkui/menus.cc:238 src/qtui/main_window_actions.cc:189
+#: src/gtkui/menus.cc:201 src/qtui/menus.cc:280
 msgid "_File"
 msgstr "Ф_айл"
 
-#: src/gtkui/menus.cc:239 src/qtui/main_window_actions.cc:190
+#: src/gtkui/menus.cc:202 src/qtui/menus.cc:281
 msgid "_Playback"
 msgstr "_Прайграванне"
 
-#: src/gtkui/menus.cc:240 src/qtui/main_window_actions.cc:191
+#: src/gtkui/menus.cc:203 src/qtui/menus.cc:282
 msgid "P_laylist"
 msgstr "П_лэйліст"
 
-#: src/gtkui/menus.cc:241 src/gtkui/menus.cc:258
-#: src/qtui/main_window_actions.cc:192
+#: src/gtkui/menus.cc:204 src/gtkui/menus.cc:222 src/qtui/menus.cc:283
+#: src/qtui/menus.cc:312
 msgid "_Services"
 msgstr "Сервіс_ы"
 
-#: src/gtkui/menus.cc:242 src/qtui/main_window_actions.cc:193
+#: src/gtkui/menus.cc:205 src/qtui/menus.cc:284
 msgid "_Output"
 msgstr "Выва_д"
 
-#: src/gtkui/menus.cc:243
+#: src/gtkui/menus.cc:206 src/qtui/menus.cc:285
 msgid "_View"
 msgstr "Вы_гляд"
 
-#: src/gtkui/menus.cc:248
+#: src/gtkui/menus.cc:211 src/qtui/menus.cc:296
 msgid "_Queue/Unqueue"
 msgstr "У чаргу / З чаргі"
 
-#: src/gtkui/menus.cc:250
+#: src/gtkui/menus.cc:213 src/qtui/menus.cc:299
 msgid "_Open Containing Folder"
 msgstr ""
 
-#: src/gtkui/menus.cc:253
+#: src/gtkui/menus.cc:214 src/qtui/menus.cc:301
+msgid "_Refresh Selected"
+msgstr ""
+
+#: src/gtkui/menus.cc:216 src/qtui/menus.cc:304
 msgid "Cu_t"
 msgstr "_Выразаць"
 
-#: src/gtkui/menus.cc:254
+#: src/gtkui/menus.cc:217 src/qtui/menus.cc:305
 msgid "_Copy"
 msgstr "_Капіраваць"
 
-#: src/gtkui/menus.cc:255
+#: src/gtkui/menus.cc:218 src/qtui/menus.cc:306
 msgid "_Paste"
 msgstr "_Уставіць"
 
-#: src/gtkui/menus.cc:256
+#: src/gtkui/menus.cc:219 src/qtui/menus.cc:307
+msgid "Paste at _End"
+msgstr ""
+
+#: src/gtkui/menus.cc:220 src/qtui/menus.cc:309
 msgid "Select _All"
 msgstr "Вылучыць усе"
 
-#: src/gtkui/menus.cc:263
+#: src/gtkui/menus.cc:227 src/moonstone/playlist_tabs.cc:309
+#: src/qtui/playlist_tabs.cc:334
 msgid "_Rename ..."
 msgstr "П_ерайменаваць ..."
 
-#: src/gtkui/settings.cc:35
+#: src/gtkui/settings.cc:35 src/qtui/settings.cc:59
+msgid "Always"
+msgstr ""
+
+#: src/gtkui/settings.cc:36 src/qtui/settings.cc:60
+msgid "Auto-hide"
+msgstr ""
+
+#: src/gtkui/settings.cc:37 src/qtui/settings.cc:61
+msgid "Never"
+msgstr ""
+
+#: src/gtkui/settings.cc:41 src/qtui/settings.cc:64
 msgid "Playlist Tabs"
 msgstr ""
 
-#: src/gtkui/settings.cc:36
-msgid "Always show tabs"
+#: src/gtkui/settings.cc:42 src/qtui/settings.cc:65
+msgid "Show playlist tabs:"
 msgstr ""
 
-#: src/gtkui/settings.cc:38
+#: src/gtkui/settings.cc:45 src/qtui/settings.cc:69
 msgid "Show entry counts"
 msgstr ""
 
-#: src/gtkui/settings.cc:40
+#: src/gtkui/settings.cc:47 src/qtui/settings.cc:72
 msgid "Show close buttons"
 msgstr ""
 
-#: src/gtkui/settings.cc:42
+#: src/gtkui/settings.cc:49 src/qtui/settings.cc:75
 msgid "Playlist Columns"
 msgstr ""
 
-#: src/gtkui/settings.cc:44
+#: src/gtkui/settings.cc:51 src/qtui/settings.cc:77
 msgid "Show column headers"
 msgstr ""
 
-#: src/gtkui/settings.cc:46 src/modplug/plugin_main.cc:106
-#: src/skins/skins_cfg.cc:263
-msgid "Miscellaneous"
+#: src/gtkui/settings.cc:53 src/qtui/settings.cc:82
+msgid "Make column headers clickable for sorting"
 msgstr ""
 
-#: src/gtkui/settings.cc:47
-msgid "Arrow keys seek by:"
+#: src/gtkui/settings.cc:56
+msgid "Use symbolic icons in toolbar"
 msgstr ""
 
-#: src/gtkui/settings.cc:50
+#: src/gtkui/settings.cc:58 src/qtui/settings.cc:86
 msgid "Scroll on song change"
 msgstr ""
 
-#: src/gtkui/ui_gtk.cc:71
+#: src/gtkui/ui_gtk.cc:82
 msgid "GTK Interface"
 msgstr "Інтэрфейс GTK"
 
-#: src/gtkui/ui_gtk.cc:222 src/skins/ui_main.cc:232
+#: src/gtkui/ui_gtk.cc:219 src/skins/main.cc:228 src/skins-qt/main.cc:231
 #, c-format
 msgid "%s - Audacious"
 msgstr "%s - Audacious"
 
-#: src/gtkui/ui_gtk.cc:225 src/qtui/main_window.cc:186
+#: src/gtkui/ui_gtk.cc:221 src/moonstone/main_window.cc:184
+#: src/qtui/main_window.cc:385
 msgid "Buffering ..."
 msgstr "Назапашванне ..."
 
-#: src/gtkui/ui_gtk.cc:228 src/skins/ui_main.cc:234 src/skins/ui_main.cc:1164
+#: src/gtkui/ui_gtk.cc:224 src/pipewire/pipewire.cc:402 src/skins/main.cc:230
+#: src/skins-qt/main.cc:233
 msgid "Audacious"
 msgstr "Audacious"
 
-#: src/gtkui/ui_statusbar.cc:63 src/qtui/status_bar.cc:67
+#: src/gtkui/ui_gtk.cc:487 src/gtkui/ui_gtk.cc:518 src/gtkui/ui_gtk.cc:882
+#: src/hotkey/gui.cc:72 src/moonstone/main_window.cc:67
+#: src/moonstone/main_window.cc:145 src/moonstone/main_window.cc:146
+#: src/notify/osd.cc:85 src/qthotkey/gui.cc:67 src/qtui/main_window.cc:154
+#: src/qtui/main_window.cc:347 src/qtui/main_window.cc:348
+#: src/skins/menus.cc:109 src/skins-qt/menus.cc:100
+msgid "Play"
+msgstr "Граць"
+
+#: src/gtkui/ui_gtk.cc:487 src/moonstone/main_window.cc:151
+#: src/moonstone/main_window.cc:152 src/notify/osd.cc:82
+#: src/qtui/main_window.cc:353 src/qtui/main_window.cc:354
+#: src/skins/menus.cc:110 src/skins-qt/menus.cc:101
+msgid "Pause"
+msgstr "Пауза"
+
+#: src/gtkui/ui_gtk.cc:868 src/moonstone/main_window.cc:57
+#: src/qtui/main_window.cc:145 src/skins/menus.cc:86 src/skins-qt/menus.cc:77
+msgid "Search Library"
+msgstr ""
+
+#: src/gtkui/ui_gtk.cc:875 src/moonstone/main_window.cc:60
+#: src/qtui/main_window.cc:147
+msgid "Open Files"
+msgstr "Адкрыць файлы"
+
+#: src/gtkui/ui_gtk.cc:876 src/moonstone/main_window.cc:62
+#: src/qtui/main_window.cc:149
+msgid "Add Files"
+msgstr "Дадаць файлы"
+
+#: src/gtkui/ui_gtk.cc:881 src/moonstone/main_window.cc:65
+#: src/qtui/main_window.cc:152 src/skins/menus.cc:112 src/skins-qt/menus.cc:103
+msgid "Previous"
+msgstr "Папярэдні"
+
+#: src/gtkui/ui_gtk.cc:883 src/hotkey/gui.cc:74 src/moonstone/main_window.cc:69
+#: src/qthotkey/gui.cc:69 src/qtui/main_window.cc:156 src/skins/menus.cc:111
+#: src/skins-qt/menus.cc:102
+msgid "Stop"
+msgstr "Спыніць"
+
+#: src/gtkui/ui_gtk.cc:884 src/moonstone/main_window.cc:76 src/notify/osd.cc:89
+#: src/qtui/main_window.cc:163 src/skins/menus.cc:113 src/skins-qt/menus.cc:104
+msgid "Next"
+msgstr "Наступны"
+
+#: src/gtkui/ui_gtk.cc:886 src/moonstone/main_window.cc:79
+#: src/qtui/main_window.cc:166 src/qtui/menus.cc:254 src/skins/menus.cc:79
+#: src/skins-qt/menus.cc:69
+msgid "Record Stream"
+msgstr ""
+
+#: src/gtkui/ui_gtk.cc:919 src/moonstone/main_window.cc:86
+#: src/qtui/main_window.cc:173 src/skins/menus.cc:103 src/skins-qt/menus.cc:94
+msgid "Repeat"
+msgstr "Паўтор"
+
+#: src/gtkui/ui_gtk.cc:922 src/moonstone/main_window.cc:89
+#: src/qtui/main_window.cc:176 src/skins/menus.cc:104 src/skins-qt/menus.cc:95
+msgid "Shuffle"
+msgstr "Уразнабой"
+
+#: src/gtkui/ui_gtk.cc:1114 src/qtui/main_window.cc:123
+msgid "Menu"
+msgstr ""
+
+#: src/gtkui/ui_statusbar.cc:64 src/qtui/status_bar.cc:155
 msgid "mono"
 msgstr "мона"
 
-#: src/gtkui/ui_statusbar.cc:65 src/qtui/status_bar.cc:69
+#: src/gtkui/ui_statusbar.cc:66 src/qtui/status_bar.cc:157
 msgid "stereo"
 msgstr "стэрэа"
 
-#: src/gtkui/ui_statusbar.cc:67 src/qtui/status_bar.cc:71
+#: src/gtkui/ui_statusbar.cc:68 src/qtui/status_bar.cc:160
 #, c-format
 msgid "%d channel"
 msgid_plural "%d channels"
@@ -1903,143 +2029,137 @@
 msgstr2 "%d каналаў"
 msgstr3 "%d каналаў"
 
-#: src/gtkui/ui_statusbar.cc:81 src/qtui/status_bar.cc:85
+#: src/gtkui/ui_statusbar.cc:76 src/qtui/status_bar.cc:168
 #, c-format
-msgid "%d kbps"
-msgstr "%d кб/с"
+msgid "%d kHz"
+msgstr ""
 
-#: src/gtkui/ui_statusbar.cc:107 src/skins/ui_main_evlisteners.cc:103
+#: src/gtkui/ui_statusbar.cc:82 src/qtui/status_bar.cc:174
+#, c-format
+msgid "%d kbit/s"
+msgstr ""
+
+#: src/gtkui/ui_statusbar.cc:108 src/skins/main.cc:478 src/skins-qt/main.cc:461
 msgid "Single mode."
 msgstr ""
 
-#: src/gtkui/ui_statusbar.cc:109 src/skins/ui_main_evlisteners.cc:105
+#: src/gtkui/ui_statusbar.cc:110 src/skins/main.cc:480 src/skins-qt/main.cc:463
 msgid "Playlist mode."
 msgstr "Рэжым плэйліста."
 
-#: src/gtkui/ui_statusbar.cc:117 src/skins/ui_main_evlisteners.cc:111
+#: src/gtkui/ui_statusbar.cc:118 src/skins/main.cc:486 src/skins-qt/main.cc:469
 msgid "Stopping after song."
 msgstr "Спыненне пасля песні."
 
-#: src/hotkey/gui.cc:71
+#: src/hotkey/gui.cc:71 src/qthotkey/gui.cc:66
 msgid "Previous track"
 msgstr ""
 
-#: src/hotkey/gui.cc:72 src/notify/osd.cc:69 src/qtui/main_window.cc:69
-#: src/qtui/main_window.cc:172 src/qtui/main_window.cc:173
-#: src/skins/menus.cc:87
-msgid "Play"
-msgstr "Граць"
-
-#: src/hotkey/gui.cc:73
+#: src/hotkey/gui.cc:73 src/qthotkey/gui.cc:68
 msgid "Pause/Resume"
 msgstr "Паўза/Працягнуць"
 
-#: src/hotkey/gui.cc:74 src/qtui/main_window.cc:70 src/skins/menus.cc:89
-msgid "Stop"
-msgstr "Спыніць"
-
-#: src/hotkey/gui.cc:75
+#: src/hotkey/gui.cc:75 src/qthotkey/gui.cc:70
 msgid "Next track"
 msgstr ""
 
-#: src/hotkey/gui.cc:76
-msgid "Forward 5 seconds"
+#: src/hotkey/gui.cc:76 src/qthotkey/gui.cc:71
+msgid "Step forward"
 msgstr ""
 
-#: src/hotkey/gui.cc:77
-msgid "Rewind 5 seconds"
+#: src/hotkey/gui.cc:77 src/qthotkey/gui.cc:72
+msgid "Step backward"
 msgstr ""
 
-#: src/hotkey/gui.cc:78
+#: src/hotkey/gui.cc:78 src/qthotkey/gui.cc:73
 msgid "Mute"
 msgstr "Цішыня"
 
-#: src/hotkey/gui.cc:79
+#: src/hotkey/gui.cc:79 src/qthotkey/gui.cc:74
 msgid "Volume up"
 msgstr ""
 
-#: src/hotkey/gui.cc:80
+#: src/hotkey/gui.cc:80 src/qthotkey/gui.cc:75
 msgid "Volume down"
 msgstr ""
 
-#: src/hotkey/gui.cc:81
+#: src/hotkey/gui.cc:81 src/qthotkey/gui.cc:76
 msgid "Jump to file"
 msgstr ""
 
-#: src/hotkey/gui.cc:82
+#: src/hotkey/gui.cc:82 src/qthotkey/gui.cc:77
 msgid "Toggle player window(s)"
 msgstr ""
 
-#: src/hotkey/gui.cc:83
+#: src/hotkey/gui.cc:83 src/qthotkey/gui.cc:78
 msgid "Show On-Screen-Display"
 msgstr "Паказаць Дысплей на Экране :OSD:"
 
-#: src/hotkey/gui.cc:84
+#: src/hotkey/gui.cc:84 src/qthotkey/gui.cc:79
 msgid "Toggle repeat"
 msgstr ""
 
-#: src/hotkey/gui.cc:85
+#: src/hotkey/gui.cc:85 src/qthotkey/gui.cc:80
 msgid "Toggle shuffle"
 msgstr ""
 
-#: src/hotkey/gui.cc:86
+#: src/hotkey/gui.cc:86 src/qthotkey/gui.cc:81
 msgid "Toggle stop after current"
 msgstr ""
 
-#: src/hotkey/gui.cc:87
+#: src/hotkey/gui.cc:87 src/qthotkey/gui.cc:82
 msgid "Raise player window(s)"
 msgstr ""
 
-#: src/hotkey/gui.cc:97
+#: src/hotkey/gui.cc:98 src/qthotkey/gui.cc:100
 msgid "(none)"
 msgstr "(няма)"
 
-#: src/hotkey/gui.cc:234
+#: src/hotkey/gui.cc:261
 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 modifiers.\n"
 "\n"
 "Do you want to continue?"
 msgstr ""
 
-#: src/hotkey/gui.cc:236
+#: src/hotkey/gui.cc:264
 msgid "Binding mouse buttons"
 msgstr ""
 
-#: src/hotkey/gui.cc:391
+#: src/hotkey/gui.cc:434
 msgid ""
 "Press a key combination inside a text field.\n"
 "You can also bind mouse buttons."
 msgstr ""
 
-#: src/hotkey/gui.cc:396
+#: src/hotkey/gui.cc:444 src/qthotkey/gui.cc:179
 msgid "Hotkeys:"
 msgstr ""
 
-#: src/hotkey/gui.cc:413
+#: src/hotkey/gui.cc:457 src/qthotkey/gui.cc:181
 msgid "Action:"
 msgstr "Дзеянне:"
 
-#: src/hotkey/gui.cc:420
+#: src/hotkey/gui.cc:461 src/qthotkey/gui.cc:182
 msgid "Key Binding:"
 msgstr ""
 
-#: src/hotkey/gui.cc:468
+#: src/hotkey/gui.cc:518 src/qthotkey/gui.cc:184
 msgid "_Add"
-msgstr ""
+msgstr "Дадаць"
 
-#: src/hotkey/plugin.cc:61
+#: src/hotkey/plugin.cc:59 src/qthotkey/plugin.cc:78
 msgid "Global Hotkeys"
 msgstr ""
 
-#: src/hotkey/plugin.cc:79
+#: src/hotkey/plugin.cc:74
 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"
+"Contributors 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"
@@ -2047,76 +2167,104 @@
 " Jeremy Tan <nsx@nsx.homeip.net>"
 msgstr ""
 
-#: src/jack-ng/jack-ng.cc:49
+#: src/jack/jack-ng.cc:54
 msgid "JACK Output"
 msgstr "Вывад JACK"
 
-#: src/jack-ng/jack-ng.cc:114
+#: src/jack/jack-ng.cc:126
+msgid "Client name:"
+msgstr ""
+
+#: src/jack/jack-ng.cc:128
 msgid "Automatically connect to output ports"
 msgstr ""
 
-#: src/jack-ng/jack-ng.cc:155
+#: src/jack/jack-ng.cc:130
+msgid "Filter ports (regex, use any port if blank):"
+msgstr ""
+
+#: src/jack/jack-ng.cc:136
+msgid "Connect to physical ports only"
+msgstr ""
+
+#: src/jack/jack-ng.cc:139
+msgid "Upmix to"
+msgstr ""
+
+#: src/jack/jack-ng.cc:141
+msgid "ports if input has fewer channels"
+msgstr ""
+
+#: src/jack/jack-ng.cc:143
+msgid "Ignore insufficient number of ports"
+msgstr ""
+
+#: src/jack/jack-ng.cc:181
+msgid "No JACK output ports were found. Please check settings."
+msgstr ""
+
+#: src/jack/jack-ng.cc:195
 #, c-format
 msgid "Only %d JACK output ports were found but %d are required."
 msgstr ""
 
-#: src/jack-ng/jack-ng.cc:164
+#: src/jack/jack-ng.cc:210
 #, c-format
 msgid "Failed to connect to JACK port %s."
 msgstr ""
 
-#: src/jack-ng/jack-ng.cc:184
+#: src/jack/jack-ng.cc:230
 msgid ""
 "JACK supports only floating-point audio. You must change the output bit "
 "depth to floating-point in Audacious settings."
 msgstr ""
 
-#: src/jack-ng/jack-ng.cc:197
+#: src/jack/jack-ng.cc:245
 msgid "Failed to connect to the JACK server; is it running?"
 msgstr ""
 
-#: src/jack-ng/jack-ng.cc:273
+#: src/jack/jack-ng.cc:321
 #, c-format
 msgid ""
 "The JACK server requires a sample rate of %d Hz, but Audacious is playing at "
 "%d Hz. Please use the Sample Rate Converter effect to correct the mismatch."
 msgstr ""
 
-#: src/ladspa/plugin.cc:414
+#: src/ladspa/plugin.cc:416
 #, c-format
 msgid "%s Settings"
 msgstr "%s Настаўленні"
 
-#: src/ladspa/plugin.cc:478
+#: src/ladspa/plugin.cc:482
 msgid "Module paths:"
 msgstr "Шлях да модуля:"
 
-#: src/ladspa/plugin.cc:483
+#: src/ladspa/plugin.cc:487
 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.cc:499
+#: src/ladspa/plugin.cc:508
 msgid "Available plugins:"
 msgstr "Даступныя плагіны:"
 
-#: src/ladspa/plugin.cc:512 src/modplug/plugin_main.cc:92
-#: src/modplug/plugin_main.cc:95 src/modplug/plugin_main.cc:98
-#: src/modplug/plugin_main.cc:101
+#: src/ladspa/plugin.cc:521 src/modplug/plugin_main.cc:91
+#: src/modplug/plugin_main.cc:94 src/modplug/plugin_main.cc:97
+#: src/modplug/plugin_main.cc:100
 msgid "Enable"
 msgstr "Уключыць"
 
-#: src/ladspa/plugin.cc:518
+#: src/ladspa/plugin.cc:527
 msgid "Enabled plugins:"
 msgstr "Уключаныя плагіны:"
 
-#: src/ladspa/plugin.cc:534
+#: src/ladspa/plugin.cc:543
 msgid "Settings"
 msgstr "Настаўленні"
 
-#: src/ladspa/plugin.cc:551
+#: src/ladspa/plugin.cc:560
 msgid ""
 "LADSPA Host for Audacious\n"
 "Copyright 2011 John Lindgren"
@@ -2130,7 +2278,7 @@
 msgid "LIRC Plugin"
 msgstr "Плагін LIRC"
 
-#: src/lirc/lirc.cc:381
+#: src/lirc/lirc.cc:379
 msgid ""
 "A simple plugin to control Audacious using the LIRC remote control daemon\n"
 "\n"
@@ -2146,63 +2294,123 @@
 "For more information about LIRC, see http://lirc.org."
 msgstr ""
 
-#: src/lirc/lirc.cc:392
+#: src/lirc/lirc.cc:390
 msgid "Connection"
 msgstr "Злучэнне"
 
-#: src/lirc/lirc.cc:393
+#: src/lirc/lirc.cc:391
 msgid "Reconnect to LIRC server"
 msgstr "Перазлучэнне з серверам LIRC"
 
-#: src/lirc/lirc.cc:395
+#: src/lirc/lirc.cc:393
 msgid "Wait before reconnecting:"
 msgstr ""
 
-#: src/lyricwiki/lyricwiki.cc:41
-msgid "LyricWiki Plugin"
-msgstr "Плагін LyricWiki"
-
-#: src/lyricwiki/lyricwiki.cc:131 src/lyricwiki-qt/lyricwiki.cc:136
-msgid "No lyrics available"
-msgstr "Словы недаступныя"
-
-#: src/lyricwiki/lyricwiki.cc:217 src/lyricwiki/lyricwiki.cc:226
-#: src/lyricwiki/lyricwiki.cc:243 src/lyricwiki/lyricwiki.cc:252
-#: src/lyricwiki/lyricwiki.cc:267 src/lyricwiki-qt/lyricwiki.cc:222
-#: src/lyricwiki-qt/lyricwiki.cc:231 src/lyricwiki-qt/lyricwiki.cc:248
-#: src/lyricwiki-qt/lyricwiki.cc:257 src/lyricwiki-qt/lyricwiki.cc:272
-msgid "Error"
-msgstr "Памылка"
-
-#: src/lyricwiki/lyricwiki.cc:218 src/lyricwiki/lyricwiki.cc:244
-#: src/lyricwiki-qt/lyricwiki.cc:223 src/lyricwiki-qt/lyricwiki.cc:249
+#: src/lyrics-common/chart_lyrics_provider.cc:93
+#: src/lyrics-common/chart_lyrics_provider.cc:150
+#: src/lyrics-common/lyrics_ovh_provider.cc:50
 #, c-format
 msgid "Unable to fetch %s"
 msgstr "Немагчыма атрымаць %s"
 
-#: src/lyricwiki/lyricwiki.cc:227 src/lyricwiki/lyricwiki.cc:253
-#: src/lyricwiki-qt/lyricwiki.cc:232 src/lyricwiki-qt/lyricwiki.cc:258
+#: src/lyrics-common/chart_lyrics_provider.cc:100
+#: src/lyrics-common/chart_lyrics_provider.cc:157
+#: src/lyrics-common/lyrics_ovh_provider.cc:57
 #, c-format
 msgid "Unable to parse %s"
 msgstr "Немагчыма разабраць %s"
 
-#: src/lyricwiki/lyricwiki.cc:259 src/lyricwiki-qt/lyricwiki.cc:264
+#: src/lyrics-common/chart_lyrics_provider.cc:121
+#: src/lyrics-common/chart_lyrics_provider.cc:194
+#: src/lyrics-common/lyrics_ovh_provider.cc:88
 msgid "Looking for lyrics ..."
 msgstr "Шукаюцца словы ..."
 
-#: src/lyricwiki/lyricwiki.cc:267 src/lyricwiki-qt/lyricwiki.cc:272
-msgid "Missing song metadata"
-msgstr "Адсутнічаюць метазвесткі ў песні"
+#: src/lyrics-common/preferences.h:43
+msgid "Nowhere"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:49
+msgid "Artist is truncated at the start, Title -- at the end"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:50
+msgid "Chars to truncate on:"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:54
+msgid "Chars are ORed in RegExp, surrounded by whitespace"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:55
+msgid "Chars to split on:"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:56
+msgid "Further truncate those on chars"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:62
+msgid "General"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:63
+msgid "Split title into artist and title on chars"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:66
+msgid "Sources"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:67
+msgid "Use embedded lyrics (from Lyrics tag)"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:69
+msgid "Fetch lyrics from internet:"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:72
+msgid "Store fetched lyrics in local cache"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:74
+msgid "Local Storage"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:75
+msgid "Load lyric files (.lrc) from local storage"
+msgstr ""
+
+#: src/lyrics-common/utils.cc:54 src/ui-common/dialogs-qt.cc:63
+msgid "Error"
+msgstr "Памылка"
 
-#: src/lyricwiki/lyricwiki.cc:278 src/lyricwiki-qt/lyricwiki.cc:283
-msgid "Connecting to lyrics.wikia.com ..."
-msgstr "Злучэнне з lyrics.wikia.com ..."
+#: src/lyrics-common/utils.cc:60
+msgid "Lyrics could not be found."
+msgstr ""
 
-#: src/lyricwiki-qt/lyricwiki.cc:55
-msgid "LyricWiki Plugin (Qt)"
+#: src/lyrics-common/utils.cc:142
+msgid "Missing title and/or artist."
 msgstr ""
 
-#: src/m3u/m3u.cc:32
+#: src/lyrics-gtk/lyrics-gtk.cc:37 src/lyrics-qt/lyrics-qt.cc:50
+msgid "Lyrics"
+msgstr ""
+
+#: src/lyrics-gtk/lyrics-gtk.cc:189 src/lyrics-qt/lyrics-qt.cc:171
+msgid "Edit Lyrics ..."
+msgstr ""
+
+#: src/lyrics-gtk/lyrics-gtk.cc:195 src/lyrics-qt/lyrics-qt.cc:178
+msgid "Save Locally"
+msgstr ""
+
+#: src/lyrics-gtk/lyrics-gtk.cc:201 src/lyrics-qt/lyrics-qt.cc:186
+msgid "Refresh"
+msgstr ""
+
+#: src/m3u/m3u.cc:33
 msgid "M3U Playlists"
 msgstr "Плэйлісты M3U"
 
@@ -2210,17 +2418,17 @@
 msgid "Tact Generator"
 msgstr "Тактавы генератар"
 
-#: src/metronom/metronom.cc:147
+#: src/metronom/metronom.cc:145
 #, c-format
 msgid "Tact generator: %d bpm"
 msgstr "Тактавы генератар: %d bpm"
 
-#: src/metronom/metronom.cc:149
+#: src/metronom/metronom.cc:147
 #, c-format
 msgid "Tact generator: %d bpm %d/%d"
 msgstr "Тактавы генератар: %d bpm %d/%d"
 
-#: src/metronom/metronom.cc:237
+#: src/metronom/metronom.cc:235
 msgid ""
 "A Tact Generator by Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
 "\n"
@@ -2229,21 +2437,21 @@
 "or tact://60*3/4 to play 60 bpm in 3/4 tacts"
 msgstr ""
 
-#: src/mixer/mixer.cc:38
+#: src/mixer/mixer.cc:43
 msgid "Channel Mixer"
 msgstr "Мікшар каналаў"
 
-#: src/mixer/mixer.cc:202
+#: src/mixer/mixer.cc:255
 msgid ""
 "Channel Mixer Plugin for Audacious\n"
 "Copyright 2011-2012 John Lindgren and Michał Lipski"
 msgstr ""
 
-#: src/mixer/mixer.cc:206
+#: src/mixer/mixer.cc:259
 msgid "Channel Mixer"
 msgstr "Мікшар каналаў"
 
-#: src/mixer/mixer.cc:207
+#: src/mixer/mixer.cc:260
 msgid "Output channels:"
 msgstr "Каналаў вываду:"
 
@@ -2255,168 +2463,176 @@
 msgid "Error connecting to MMS server"
 msgstr ""
 
-#: src/modplug/modplugbmp.h:53
+#: src/modplug/modplugbmp.h:57
 msgid "ModPlug (Module Player)"
 msgstr ""
 
-#: src/modplug/plugin_main.cc:53
-msgid "Resolution"
-msgstr ""
-
-#: src/modplug/plugin_main.cc:54
-msgid "8-bit"
-msgstr ""
-
 #: src/modplug/plugin_main.cc:55
-msgid "16-bit"
-msgstr ""
-
-#: src/modplug/plugin_main.cc:56
 msgid "Channels"
 msgstr ""
 
-#: src/modplug/plugin_main.cc:60
+#: src/modplug/plugin_main.cc:59
 msgid "Nearest (fastest)"
 msgstr ""
 
-#: src/modplug/plugin_main.cc:61
+#: src/modplug/plugin_main.cc:60
 msgid "Linear (fast)"
 msgstr ""
 
-#: src/modplug/plugin_main.cc:62
+#: src/modplug/plugin_main.cc:61
 msgid "Spline (good)"
 msgstr ""
 
-#: src/modplug/plugin_main.cc:63
+#: src/modplug/plugin_main.cc:62
 msgid "Polyphase (best)"
 msgstr ""
 
-#: src/modplug/plugin_main.cc:64
+#: src/modplug/plugin_main.cc:63
 msgid "Sample rate"
 msgstr ""
 
-#: src/modplug/plugin_main.cc:65
+#: src/modplug/plugin_main.cc:64
 msgid "22 kHz"
 msgstr ""
 
-#: src/modplug/plugin_main.cc:66
+#: src/modplug/plugin_main.cc:65
 msgid "44 kHz"
 msgstr ""
 
-#: src/modplug/plugin_main.cc:67
+#: src/modplug/plugin_main.cc:66
 msgid "48 kHz"
 msgstr ""
 
-#: src/modplug/plugin_main.cc:68
+#: src/modplug/plugin_main.cc:67
 msgid "96 kHz"
 msgstr ""
 
-#: src/modplug/plugin_main.cc:72 src/modplug/plugin_main.cc:77
-#: src/modplug/plugin_main.cc:82
+#: src/modplug/plugin_main.cc:71 src/modplug/plugin_main.cc:76
+#: src/modplug/plugin_main.cc:81
 msgid "Level:"
 msgstr ""
 
-#: src/modplug/plugin_main.cc:78
+#: src/modplug/plugin_main.cc:77
 msgid "Cutoff:"
 msgstr ""
 
-#: src/modplug/plugin_main.cc:91
+#: src/modplug/plugin_main.cc:90
 msgid "Reverb"
 msgstr ""
 
-#: src/modplug/plugin_main.cc:94
+#: src/modplug/plugin_main.cc:93
 msgid "Bass Boost"
 msgstr ""
 
-#: src/modplug/plugin_main.cc:97
+#: src/modplug/plugin_main.cc:96
 msgid "Surround"
 msgstr ""
 
-#: src/modplug/plugin_main.cc:100
+#: src/modplug/plugin_main.cc:99
 msgid "Preamp"
 msgstr ""
 
-#: src/modplug/plugin_main.cc:107
+#: src/modplug/plugin_main.cc:106
 msgid "Oversample"
 msgstr ""
 
-#: src/modplug/plugin_main.cc:108
+#: src/modplug/plugin_main.cc:107
 msgid "Noise reduction"
 msgstr ""
 
-#: src/modplug/plugin_main.cc:109
+#: src/modplug/plugin_main.cc:108
 msgid "Play Amiga MODs"
 msgstr ""
 
-#: src/modplug/plugin_main.cc:110
+#: src/modplug/plugin_main.cc:109
 msgid "Repeat"
 msgstr ""
 
-#: src/modplug/plugin_main.cc:111
+#: src/modplug/plugin_main.cc:110
 msgid "Repeat count:"
 msgstr ""
 
-#: src/modplug/plugin_main.cc:112
+#: src/modplug/plugin_main.cc:111
 msgid "To repeat forever, set the repeat count to -1."
 msgstr ""
 
-#: src/modplug/plugin_main.cc:125 src/sid/xs_config.cc:106
+#: src/modplug/plugin_main.cc:124 src/sid/xs_config.cc:106
 msgid "These settings will take effect when Audacious is restarted."
 msgstr ""
 
+#: src/moonstone/main_window.cc:72 src/moonstone/main_window.cc:73
+#: src/qtui/main_window.cc:159 src/qtui/main_window.cc:160
+#: src/skins/menus.cc:107 src/skins-qt/menus.cc:98
+msgid "Stop After This Song"
+msgstr ""
+
+#: src/moonstone/moonstone.cc:39
+msgid "Moonstone"
+msgstr ""
+
+#: src/moonstone/playlist_header.cc:212 src/qtui/playlist_header.cc:258
+msgid "Reset to Defaults"
+msgstr ""
+
+#: src/moonstone/playlist_model.cc:38 src/qtui/playlist_header.cc:232
+msgid "Now Playing"
+msgstr "Цяпер грае"
+
+#: src/moonstone/playlist_selection.cc:66
+#: src/playlist-manager/playlist-manager.cc:201
+#: src/playlist-manager-qt/playlist-manager-qt.cc:190
+msgid "Entries"
+msgstr "Запісы"
+
 #: src/mpg123/mpg123.cc:54
 msgid "MPG123 Plugin"
 msgstr "Плагін MPG123"
 
-#: src/mpg123/mpg123.cc:83
-msgid "Advanced"
-msgstr ""
-
-#: src/mpg123/mpg123.cc:84
+#: src/mpg123/mpg123.cc:82
 msgid "Use accurate length calculation (slow)"
 msgstr ""
 
-#: src/mpg123/mpg123.cc:248
+#: src/mpg123/mpg123.cc:260
 msgid "Surround"
 msgstr ""
 
-#: src/mpris2/plugin.cc:39
+#: src/mpris2/plugin.cc:40
 msgid "MPRIS 2 Server"
 msgstr ""
 
-#: src/neon/neon.cc:97
+#: src/neon/neon.cc:102
 msgid "Neon HTTP/HTTPS Plugin"
 msgstr "Плагін Neon HTTP/HTTPS"
 
-#: src/neon/neon.cc:521
+#: src/neon/neon.cc:526
 msgid "Error parsing redirect"
 msgstr ""
 
-#: src/neon/neon.cc:535
+#: src/neon/neon.cc:540
 msgid "Unknown HTTP error"
 msgstr ""
 
-#: src/neon/neon.cc:569
+#: src/neon/neon.cc:614
 msgid "Error parsing URL"
 msgstr ""
 
-#: src/neon/neon.cc:632
+#: src/neon/neon.cc:687
 msgid "Too many redirects"
 msgstr ""
 
-#: src/notify/event.cc:64
+#: src/notify/event.cc:97
 msgid "Stopped"
 msgstr "Спынена"
 
-#: src/notify/event.cc:64
+#: src/notify/event.cc:97
 msgid "Audacious is not playing."
 msgstr "Audacious не іграе."
 
-#: src/notify/notify.cc:42
+#: src/notify/notify.cc:39
 msgid "Desktop Notifications"
 msgstr ""
 
-#: src/notify/notify.cc:60
+#: src/notify/notify.cc:57
 msgid ""
 "Desktop Notifications Plugin for Audacious\n"
 "Copyright (C) 2010 Maximilian Bogner\n"
@@ -2436,36 +2652,76 @@
 "this program. If not, see <http://www.gnu.org/licenses/>."
 msgstr ""
 
-#: src/notify/notify.cc:110
+#: src/notify/notify.cc:104
 msgid "Show playback controls"
 msgstr ""
 
-#: src/notify/notify.cc:112
+#: src/notify/notify.cc:106
 msgid "Always show notification"
 msgstr ""
 
-#: src/notify/notify.cc:114
+#: src/notify/notify.cc:108
 msgid "Include album name in notification"
 msgstr ""
 
-#: src/notify/osd.cc:58
+#: src/notify/notify.cc:110
+msgid "Custom notification duration:"
+msgstr ""
+
+#: src/notify/osd.cc:74
 msgid "Show"
 msgstr ""
 
-#: src/notify/osd.cc:66 src/qtui/main_window.cc:178
-#: src/qtui/main_window.cc:179 src/skins/menus.cc:88
-msgid "Pause"
-msgstr "Пауза"
+#: src/openmpt/mpt.cc:50
+msgid "OpenMPT (Module Player)"
+msgstr ""
 
-#: src/notify/osd.cc:73 src/qtui/main_window.cc:72 src/skins/menus.cc:91
-msgid "Next"
-msgstr "Наступны"
+#: src/openmpt/mpt.cc:132
+msgid ""
+"Module player based on libopenmpt\n"
+"\n"
+"Written by: Chris Spiegel <cspiegel@gmail.com>"
+msgstr ""
+
+#: src/openmpt/mpt.cc:151
+msgid "Stereo separation:"
+msgstr ""
+
+#: src/openmpt/mpt.cc:153
+msgid "% (0=mono, 100=default, 200=full)"
+msgstr ""
+
+#: src/openmpt/mpt.cc:157
+msgid "Interpolation:"
+msgstr ""
+
+#: src/openmpt/mptwrap.h:51 src/soxr/sox-resampler.cc:189 src/xsf/plugin.cc:437
+msgid "Linear"
+msgstr ""
 
-#: src/oss4/oss.h:93
+#: src/openmpt/mptwrap.h:52
+msgid "Cubic"
+msgstr ""
+
+#: src/openmpt/mptwrap.h:53
+msgid "Windowed sinc"
+msgstr ""
+
+#: src/opus/opus.cc:39
+msgid "Opus Decoder"
+msgstr ""
+
+#: src/opus/opus.cc:336
+msgid ""
+"Opus Decoder Plugin for Audacious\n"
+"Copyright 2022 Thomas Lange"
+msgstr ""
+
+#: src/oss4/oss.h:70
 msgid "OSS4 Output"
 msgstr "Вывад OSS4"
 
-#: src/oss4/oss.h:95
+#: src/oss4/oss.h:72
 msgid "OSS3 Output"
 msgstr ""
 
@@ -2473,27 +2729,27 @@
 msgid "Default device"
 msgstr ""
 
-#: src/oss4/plugin.cc:77
+#: src/oss4/plugin.cc:78
 msgid "Audio device:"
 msgstr "Аўдыё-прылада:"
 
-#: src/oss4/plugin.cc:80
+#: src/oss4/plugin.cc:81
 msgid "Use alternate device:"
 msgstr ""
 
-#: src/oss4/plugin.cc:84
+#: src/oss4/plugin.cc:85
 msgid "Save volume between sessions."
 msgstr "Захоўваць гучнасць паміж сеансамі."
 
-#: src/oss4/plugin.cc:86
+#: src/oss4/plugin.cc:87
 msgid "Enable format conversions made by the OSS software."
 msgstr ""
 
-#: src/oss4/plugin.cc:88
+#: src/oss4/plugin.cc:89
 msgid "Enable exclusive mode to prevent virtual mixing."
 msgstr ""
 
-#: src/oss4/plugin.cc:100
+#: src/oss4/plugin.cc:101
 msgid ""
 "OSS4 Output Plugin for Audacious\n"
 "Copyright 2010-2012 Michał Lipski\n"
@@ -2502,59 +2758,90 @@
 "Lindgren and of course the authors of the previous OSS plugin."
 msgstr ""
 
-#: src/playlist-manager/playlist-manager.cc:37
-msgid "Playlist Manager"
+#: src/pipewire/pipewire.cc:44
+msgid "PipeWire Output"
 msgstr ""
 
-#: src/playlist-manager/playlist-manager.cc:226
-msgid "Entries"
+#: src/pipewire/pipewire.cc:118
+msgid ""
+"PipeWire Output Plugin for Audacious\n"
+"Copyright 2022 Thomas Lange\n"
+"\n"
+"Based on the PipeWire Output Plugin for Qmmp\n"
+"Copyright 2021 Ilya Kotov"
 msgstr ""
 
-#: src/playlist-manager/playlist-manager.cc:245
+#: src/pipewire/pipewire.cc:408 src/skins/menus.cc:88 src/skins-qt/menus.cc:79
+msgid "Playback"
+msgstr "Прайграванне"
+
+#: src/playlist-manager/playlist-manager.cc:38
+#: src/playlist-manager-qt/playlist-manager-qt.cc:42
+msgid "Playlist Manager"
+msgstr "Кіраўнік плэйлістоў"
+
+#: src/playlist-manager/playlist-manager.cc:221
+#: src/playlist-manager-qt/playlist-manager-qt.cc:356
 msgid "_Remove"
-msgstr ""
+msgstr "_Выдаліць"
 
-#: src/playlist-manager/playlist-manager.cc:246
+#: src/playlist-manager/playlist-manager.cc:222
+#: src/playlist-manager-qt/playlist-manager-qt.cc:351
 msgid "Ren_ame"
-msgstr ""
+msgstr "Пера_назваць"
 
 #: src/pls/pls.cc:35
 msgid "PLS Playlists"
 msgstr "Плэйлісты PLS"
 
-#: src/psf/plugin.cc:45
+#: src/psf/plugin.cc:53
 msgid "OpenPSF PSF1/PSF2 Decoder"
 msgstr "Дэкодар OpenPSF PSF1/PSF2"
 
-#: src/pulse_audio/pulse_audio.cc:38
+#: src/psf/plugin.cc:270
+msgid "OpenPSF Configuration"
+msgstr ""
+
+#: src/psf/plugin.cc:271 src/xsf/plugin.cc:444
+msgid "Ignore length from file"
+msgstr ""
+
+#: src/pulse/pulse_audio.cc:42
 msgid "PulseAudio Output"
 msgstr "Вывад PulseAudio"
 
-#: src/pulse_audio/pulse_audio.cc:611
+#: src/pulse/pulse_audio.cc:84
+msgid "Context name:"
+msgstr ""
+
+#: src/pulse/pulse_audio.cc:86
+msgid "Stream name:"
+msgstr ""
+
+#: src/pulse/pulse_audio.cc:596
 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."
+"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/qtaudio/qtaudio.cc:49
+#: src/qtaudio/qtaudio.cc:53
 msgid "QtMultimedia Output"
 msgstr ""
 
-#: src/qtaudio/qtaudio.cc:77
+#: src/qtaudio/qtaudio.cc:84
 msgid ""
 "QtMultimedia Audio Output Plugin for Audacious\n"
 "Copyright 2014 William Pitcock\n"
@@ -2563,50 +2850,87 @@
 "Copyright 2010 John Lindgren"
 msgstr ""
 
-#: src/qtui/dialog_windows.cc:31
-msgid "Working ..."
+#: src/qtglspectrum/gl-spectrum.cc:41
+msgid ""
+"OpenGL Spectrum Analyzer for Audacious\n"
+"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
+"Copyright 2014, 2020 Ariadne Conill\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/qtui/filter_input.cc:44 src/skins/ui_playlist.cc:221
-msgid "Search"
+#: src/qthotkey/gui.cc:177
+msgid "Press a key combination inside a text field."
+msgstr ""
+
+#: src/qthotkey/plugin.cc:105
+msgid ""
+"Global Hotkey Plugin\n"
+"Control the player with global key combinations or multimedia keys.\n"
+"\n"
+"Copyright (C) 2020 i.Dark_Templar <darktemplar@dark-templar-archives.net>\n"
+"Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n"
+"\n"
+"Contributors 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/qtui/main_window_actions.cc:94
+#: src/qtui/menus.cc:109
 msgid "_Open Folder ..."
 msgstr ""
 
-#: src/qtui/main_window_actions.cc:96
+#: src/qtui/menus.cc:115
 msgid "_Add Folder ..."
 msgstr ""
 
-#: src/qtui/main_window_actions.cc:101
+#: src/qtui/menus.cc:128
 msgid "_Log Inspector ..."
 msgstr ""
 
-#: src/qtui/main_window.cc:64
-msgid "Open Files"
+#: src/qtui/menus.cc:220
+msgid "_Find ..."
 msgstr ""
 
-#: src/qtui/main_window.cc:66
-msgid "Add Files"
+#: src/qtui/menus.cc:256 src/skins/menus.cc:80 src/skins-qt/menus.cc:70
+msgid "Audio Settings ..."
 msgstr ""
 
-#: src/qtui/main_window.cc:71 src/skins/menus.cc:90
-msgid "Previous"
-msgstr "Папярэдні"
+#: src/qtui/playlist_model.cc:188
+msgid "Q#"
+msgstr ""
 
-#: src/qtui/main_window.cc:77 src/skins/menus.cc:82
-msgid "Repeat"
-msgstr "Паўтор"
+#: src/qtui/playlist_model.cc:190
+msgid "T#"
+msgstr ""
 
-#: src/qtui/main_window.cc:79 src/skins/menus.cc:83
-msgid "Shuffle"
-msgstr "Уразнабой"
+#: src/qtui/playlist_model.cc:192
+msgid "C#"
+msgstr ""
 
-#: src/qtui/qtui.cc:42
+#: src/qtui/playlist_model.cc:194
+msgid "D#"
+msgstr ""
+
+#: src/qtui/qtui.cc:40
 msgid "Qt Interface"
 msgstr ""
 
+#: src/qtui/search_bar.cc:46
+msgid "Search playlist"
+msgstr ""
+
+#: src/qtui/settings.cc:79
+msgid "Use bold font for column headers"
+msgstr ""
+
 #: src/resample/resample.cc:43
 msgid "Sample Rate Converter"
 msgstr ""
@@ -2645,7 +2969,7 @@
 msgid "Method:"
 msgstr "Метад:"
 
-#: src/resample/resample.cc:199 src/sox-resampler/sox-resampler.cc:161
+#: src/resample/resample.cc:199 src/soxr/sox-resampler.cc:203
 msgid "Rate:"
 msgstr ""
 
@@ -2697,114 +3021,79 @@
 msgid "192 kHz:"
 msgstr "192 кГц:"
 
-#: src/scrobbler2/config_window.cc:41
-#, c-format
-msgid "OK. Scrobbling for user: %s"
-msgstr ""
-
-#: src/scrobbler2/config_window.cc:54
-msgid "Permission Denied"
-msgstr ""
-
-#: src/scrobbler2/config_window.cc:56
-msgid "Access the following link to allow Audacious to scrobble your plays:"
-msgstr ""
-
-#: src/scrobbler2/config_window.cc:66
-msgid "Keep this window open and click 'Check Permission' again.\n"
+#: src/scrobbler2/config_window.cc:29
+msgid "Checking Last.fm access ..."
 msgstr ""
 
-#: src/scrobbler2/config_window.cc:69 src/scrobbler2/config_window.cc:80
+#: src/scrobbler2/config_window.cc:35
 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."
+"Your scrobbles are being saved on your computer temporarily. They will be "
+"submitted as soon as Audacious is allowed access."
 msgstr ""
 
-#: src/scrobbler2/config_window.cc:77
-msgid "Network Problem."
+#: src/scrobbler2/config_window.cc:41
+#, c-format
+msgid "Permission granted. Scrobbling for user %s."
 msgstr ""
 
-#: src/scrobbler2/config_window.cc:78
-msgid "There was a problem contacting Last.fm. Please try again later."
+#: src/scrobbler2/config_window.cc:44
+msgid ""
+"Permission denied. Open the following URL in a browser, allow Audacious "
+"access to your account, and then click 'Check Permission' again:"
 msgstr ""
 
-#: src/scrobbler2/config_window.cc:110
-msgid "Checking..."
+#: src/scrobbler2/config_window.cc:53
+msgid "There was a problem contacting Last.fm."
 msgstr ""
 
-#: src/scrobbler2/config_window.cc:176
-msgid "C_heck Permission"
+#: src/scrobbler2/config_window.cc:92
+msgid "Check Permission"
 msgstr ""
 
-#: src/scrobbler2/config_window.cc:177
-msgid "_Revoke Permission"
+#: src/scrobbler2/config_window.cc:93
+msgid "Revoke Permission"
 msgstr ""
 
-#: src/scrobbler2/config_window.cc:220
-msgid ""
-"You need to allow Audacious to scrobble tracks to your Last.fm account.\n"
+#: src/scrobbler2/config_window.cc:97
+msgid "You need to allow Audacious to scrobble tracks to your Last.fm account."
 msgstr ""
 
 #: src/scrobbler2/scrobbler.cc:29
 msgid "Scrobbler 2.0"
 msgstr ""
 
-#: src/scrobbler2/scrobbler.cc:224
+#: src/scrobbler2/scrobbler.cc:200
 msgid ""
 "The Scrobbler plugin could not be started.\n"
 "There might be a problem with your installation."
 msgstr ""
 
-#: src/scrobbler2/scrobbler.cc:289
+#: src/scrobbler2/scrobbler.cc:245
 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"
+"project."
 msgstr ""
 
-#: src/scrobbler2/scrobbler_communication.cc:642
-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/sdlout.cc:48
+#: src/sdlout/sdlout.cc:43
 msgid "SDL Output"
 msgstr ""
 
-#: src/sdlout/sdlout.cc:77
+#: src/sdlout/sdlout.cc:72
 msgid ""
 "SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
 msgstr ""
 
-#: src/search-tool/search-tool.cc:116 src/search-tool/search-tool.cc:124
+#: src/search-tool/library.cc:35 src/search-tool/library.cc:46
+#: src/search-tool-qt/library.cc:35 src/search-tool-qt/library.cc:46
 msgid "Library"
 msgstr "Бібліятэка"
 
-#: src/search-tool/search-tool.cc:394
-#, c-format
-msgid "%d result"
-msgid_plural "%d results"
-msgstr0 ""
-msgstr1 ""
-msgstr2 ""
-msgstr3 ""
-
-#: src/search-tool/search-tool.cc:400
-#, c-format
-msgid "(%d hidden)"
-msgid_plural "(%d hidden)"
-msgstr0 ""
-msgstr1 ""
-msgstr2 ""
-msgstr3 ""
-
-#: src/search-tool/search-tool.cc:594
+#: src/search-tool-qt/search-model.cc:44 src/search-tool/search-tool.cc:287
 #, c-format
 msgid "%d song"
 msgid_plural "%d songs"
@@ -2813,52 +3102,78 @@
 msgstr2 ""
 msgstr3 ""
 
-#: src/search-tool/search-tool.cc:601
+#: src/search-tool-qt/search-model.cc:53 src/search-tool/search-tool.cc:294
 msgid "of this genre"
 msgstr ""
 
-#: src/search-tool/search-tool.cc:607
+#: src/search-tool-qt/search-model.h:47 src/search-tool/search-model.h:45
 msgid "on"
 msgstr ""
 
-#: src/search-tool/search-tool.cc:607
+#: src/search-tool-qt/search-model.h:47 src/search-tool/search-model.h:45
 msgid "by"
 msgstr ""
 
-#: src/search-tool/search-tool.cc:643
-msgid "_Create Playlist"
-msgstr "_Стварыць плэйліст"
+#: src/search-tool-qt/search-tool-qt.cc:165 src/search-tool/search-tool.cc:74
+msgid "Number of results to show:"
+msgstr ""
 
-#: src/search-tool/search-tool.cc:645
-msgid "_Add to Playlist"
-msgstr "_Дадаць у плэйліст"
+#: src/search-tool-qt/search-tool-qt.cc:168 src/search-tool/search-tool.cc:77
+msgid "Rescan library at startup"
+msgstr ""
 
-#: src/search-tool/search-tool.cc:684
-msgid "Search library"
-msgstr "Шукаць у бібліятэцы"
+#: src/search-tool-qt/search-tool-qt.cc:170
+msgid "Monitor library for changes"
+msgstr ""
 
-#: src/search-tool/search-tool.cc:688
+#: src/search-tool-qt/search-tool-qt.cc:193 src/search-tool/search-tool.cc:450
 msgid ""
 "To import your music library into Audacious, choose a folder and then click "
 "the \"refresh\" icon."
 msgstr ""
 
-#: src/search-tool/search-tool.cc:696
+#: src/search-tool-qt/search-tool-qt.cc:195 src/search-tool/search-tool.cc:459
 msgid "Please wait ..."
 msgstr "Пачакайце, калі ласка ..."
 
-#: src/search-tool/search-tool.cc:723
+#: src/search-tool-qt/search-tool-qt.cc:197 src/search-tool/search-tool.cc:487
 msgid "Choose Folder"
 msgstr "Выберыце каталог"
 
+#: src/search-tool-qt/search-tool-qt.cc:201 src/search-tool/search-tool.cc:445
+msgid "Search library"
+msgstr "Шукаць у бібліятэцы"
+
+#: src/search-tool-qt/search-tool-qt.cc:327 src/search-tool/search-tool.cc:156
+#, c-format
+msgid "%d of %d result shown"
+msgid_plural "%d of %d results shown"
+msgstr0 ""
+msgstr1 ""
+msgstr2 ""
+msgstr3 ""
+
+#: src/search-tool-qt/search-tool-qt.cc:331 src/search-tool/search-tool.cc:160
+#, c-format
+msgid "%d result"
+msgid_plural "%d results"
+msgstr0 ""
+msgstr1 ""
+msgstr2 ""
+msgstr3 ""
+
+#: src/search-tool-qt/search-tool-qt.cc:501 src/search-tool/search-tool.cc:341
+msgid "_Create Playlist"
+msgstr "_Стварыць плэйліст"
+
+#: src/search-tool-qt/search-tool-qt.cc:503 src/search-tool/search-tool.cc:343
+msgid "_Add to Playlist"
+msgstr "_Дадаць у плэйліст"
+
 #: src/sid/xmms-sid.cc:43
 msgid "SID Player"
 msgstr ""
 
-#: src/sid/xs_config.cc:61
-msgid "Output"
-msgstr ""
-
 #: src/sid/xs_config.cc:62
 msgid "Channels:"
 msgstr ""
@@ -2937,737 +3252,680 @@
 msgid "Threshold:"
 msgstr ""
 
-#: src/silence-removal/silence-removal.cc:70
-msgid "dB"
+#: src/skins/actions.cc:45 src/skins-qt/actions.cc:43
+msgid "Repeat points cleared."
 msgstr ""
 
-#: src/skins/menus.cc:64
-msgid "Open Files ..."
+#: src/skins/actions.cc:60 src/skins-qt/actions.cc:58
+msgid "Repeat point A set."
 msgstr ""
 
-#: src/skins/menus.cc:65
-msgid "Open URL ..."
+#: src/skins/actions.cc:65 src/skins-qt/actions.cc:63
+msgid "Repeat point B set."
 msgstr ""
 
-#: src/skins/menus.cc:66
-msgid "Search Library"
+#: src/skins/equalizer.cc:223 src/skins-qt/equalizer.cc:223
+msgid "Preamp"
+msgstr "Перадузмацненне"
+
+#: src/skins/equalizer.cc:227 src/skins-qt/equalizer.cc:227
+msgid "31 Hz"
+msgstr "31 Гц"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "63 Hz"
+msgstr "63 Гц"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "125 Hz"
+msgstr "125 Гц"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "250 Hz"
+msgstr "250 Гц"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "500 Hz"
+msgstr "500 Гц"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "1 kHz"
+msgstr "2 кГц"
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "2 kHz"
+msgstr "2 кГц"
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "4 kHz"
+msgstr "4 кГц"
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "8 kHz"
+msgstr "8 кГц"
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "16 kHz"
+msgstr "16 кГц"
+
+#: src/skins/equalizer.cc:270 src/skins-qt/equalizer.cc:270
+msgid "Audacious Equalizer"
+msgstr "Эквалайзер Audacious"
+
+#: src/skins/main.cc:459 src/skins-qt/main.cc:442
+msgid "Recording on"
 msgstr ""
 
-#: src/skins/menus.cc:68
-msgid "Playback"
-msgstr "Прайграванне"
+#: src/skins/main.cc:461 src/skins-qt/main.cc:444
+msgid "Recording off"
+msgstr ""
+
+#: src/skins/main.cc:754 src/skins-qt/main.cc:701
+#, c-format
+msgid "Seek to %d:%-2.2d / %d:%-2.2d"
+msgstr ""
+
+#: src/skins/main.cc:771 src/skins-qt/main.cc:718
+#, c-format
+msgid "Volume: %d%%"
+msgstr "Гучнасць: %d%%"
+
+#: src/skins/main.cc:784 src/skins-qt/main.cc:731
+#, c-format
+msgid "Balance: %d%% left"
+msgstr "Баланс: %d%% ўлева"
+
+#: src/skins/main.cc:786 src/skins-qt/main.cc:733
+msgid "Balance: center"
+msgstr "Баланс: цэнтр"
+
+#: src/skins/main.cc:788 src/skins-qt/main.cc:735
+#, c-format
+msgid "Balance: %d%% right"
+msgstr "Баланс: %d%% ўправа"
+
+#: src/skins/main.cc:880 src/skins-qt/main.cc:827
+msgid "Options Menu"
+msgstr "Меню опцый"
+
+#: src/skins/main.cc:884 src/skins-qt/main.cc:831
+msgid "Disable 'Always On Top'"
+msgstr "Адключыць 'Заўсёды зверху'"
+
+#: src/skins/main.cc:886 src/skins-qt/main.cc:833
+msgid "Enable 'Always On Top'"
+msgstr "Уключыць 'Заўсёды зверху'"
+
+#: src/skins/main.cc:889 src/skins-qt/main.cc:836
+msgid "File Info Box"
+msgstr ""
+
+#: src/skins/main.cc:892 src/skins/menus.cc:149 src/skins-qt/main.cc:839
+#: src/skins-qt/menus.cc:142
+msgid "Double Size"
+msgstr ""
+
+#: src/skins/main.cc:895 src/skins-qt/main.cc:842
+msgid "Visualizations"
+msgstr ""
+
+#: src/skins/menus.cc:74 src/skins-qt/menus.cc:64
+msgid "Volume Up"
+msgstr "Гучней"
+
+#: src/skins/menus.cc:75 src/skins-qt/menus.cc:65
+msgid "Volume Down"
+msgstr "Цішэй"
 
-#: src/skins/menus.cc:69
+#: src/skins/menus.cc:77 src/skins-qt/menus.cc:67
+msgid "Effects ..."
+msgstr ""
+
+#: src/skins/menus.cc:84 src/skins-qt/menus.cc:74
+msgid "Open Files ..."
+msgstr ""
+
+#: src/skins/menus.cc:85 src/skins-qt/menus.cc:76
+msgid "Open URL ..."
+msgstr ""
+
+#: src/skins/menus.cc:89 src/skins-qt/menus.cc:80
 msgid "Playlist"
 msgstr "Плэйліст"
 
-#: src/skins/menus.cc:70
+#: src/skins/menus.cc:90 src/skins-qt/menus.cc:81
+msgid "Output"
+msgstr ""
+
+#: src/skins/menus.cc:91 src/skins-qt/menus.cc:82
 msgid "View"
 msgstr "Выгляд"
 
-#: src/skins/menus.cc:72 src/skins/menus.cc:136 src/skins/menus.cc:149
-#: src/skins/menus.cc:214
+#: src/skins/menus.cc:93 src/skins/menus.cc:161 src/skins/menus.cc:174
+#: src/skins/menus.cc:245 src/skins-qt/menus.cc:84 src/skins-qt/menus.cc:156
+#: src/skins-qt/menus.cc:170 src/skins-qt/menus.cc:241
 msgid "Services"
-msgstr ""
+msgstr "Сэрвісы"
 
-#: src/skins/menus.cc:74
+#: src/skins/menus.cc:95 src/skins-qt/menus.cc:86
 msgid "About ..."
 msgstr ""
 
-#: src/skins/menus.cc:75
+#: src/skins/menus.cc:96 src/skins-qt/menus.cc:87
 msgid "Settings ..."
 msgstr ""
 
-#: src/skins/menus.cc:76
+#: src/skins/menus.cc:97 src/skins-qt/menus.cc:88
 msgid "Quit"
 msgstr ""
 
-#: src/skins/menus.cc:80 src/skins/menus.cc:206
+#: src/skins/menus.cc:101 src/skins/menus.cc:235 src/skins-qt/menus.cc:92
+#: src/skins-qt/menus.cc:231
 msgid "Song Info ..."
 msgstr ""
 
-#: src/skins/menus.cc:84
+#: src/skins/menus.cc:105 src/skins-qt/menus.cc:96
+msgid "Shuffle by Album"
+msgstr ""
+
+#: src/skins/menus.cc:106 src/skins-qt/menus.cc:97
 msgid "No Playlist Advance"
 msgstr "Не пераходзіць да наступнай"
 
-#: src/skins/menus.cc:85
-msgid "Stop After This Song"
-msgstr ""
-
-#: src/skins/menus.cc:93
+#: src/skins/menus.cc:117 src/skins-qt/menus.cc:108
 msgid "Set A-B Repeat"
 msgstr ""
 
-#: src/skins/menus.cc:94
+#: src/skins/menus.cc:118 src/skins-qt/menus.cc:109
 msgid "Clear A-B Repeat"
 msgstr ""
 
-#: src/skins/menus.cc:96
+#: src/skins/menus.cc:120 src/skins-qt/menus.cc:111
 msgid "Jump to Song ..."
 msgstr ""
 
-#: src/skins/menus.cc:97
+#: src/skins/menus.cc:121 src/skins-qt/menus.cc:113
 msgid "Jump to Time ..."
 msgstr ""
 
-#: src/skins/menus.cc:101
+#: src/skins/menus.cc:125 src/skins-qt/menus.cc:118
 msgid "Play/Resume"
 msgstr ""
 
-#: src/skins/menus.cc:103
+#: src/skins/menus.cc:127 src/skins-qt/menus.cc:120
 msgid "New Playlist"
 msgstr "Новы плэйліст"
 
-#: src/skins/menus.cc:104
+#: src/skins/menus.cc:128 src/skins-qt/menus.cc:121
 msgid "Rename Playlist ..."
 msgstr ""
 
-#: src/skins/menus.cc:105
+#: src/skins/menus.cc:129 src/skins-qt/menus.cc:122
 msgid "Remove Playlist"
-msgstr ""
+msgstr "Сцерці плэйліст"
 
-#: src/skins/menus.cc:107
+#: src/skins/menus.cc:131 src/skins-qt/menus.cc:124
 msgid "Previous Playlist"
 msgstr ""
 
-#: src/skins/menus.cc:108
+#: src/skins/menus.cc:132 src/skins-qt/menus.cc:125
 msgid "Next Playlist"
 msgstr ""
 
-#: src/skins/menus.cc:110
+#: src/skins/menus.cc:134 src/skins-qt/menus.cc:127
 msgid "Import Playlist ..."
 msgstr ""
 
-#: src/skins/menus.cc:111
+#: src/skins/menus.cc:135 src/skins-qt/menus.cc:128
 msgid "Export Playlist ..."
 msgstr ""
 
-#: src/skins/menus.cc:113
+#: src/skins/menus.cc:137 src/skins-qt/menus.cc:130
 msgid "Playlist Manager ..."
 msgstr ""
 
-#: src/skins/menus.cc:114
+#: src/skins/menus.cc:138 src/skins-qt/menus.cc:131
 msgid "Queue Manager ..."
 msgstr ""
 
-#: src/skins/menus.cc:116
+#: src/skins/menus.cc:140 src/skins-qt/menus.cc:133
 msgid "Refresh Playlist"
 msgstr ""
 
-#: src/skins/menus.cc:120
+#: src/skins/menus.cc:144 src/skins-qt/menus.cc:137
 msgid "Show Playlist Editor"
 msgstr "Паказваць рэдактар спісаў"
 
-#: src/skins/menus.cc:121
+#: src/skins/menus.cc:145 src/skins-qt/menus.cc:138
 msgid "Show Equalizer"
 msgstr "Паказваць эквалайзер"
 
-#: src/skins/menus.cc:123
+#: src/skins/menus.cc:147 src/skins-qt/menus.cc:140
 msgid "Show Remaining Time"
 msgstr ""
 
-#: src/skins/menus.cc:125
+#: src/skins/menus.cc:150 src/skins-qt/menus.cc:143
 msgid "Always on Top"
 msgstr "Заўсёды зверху"
 
-#: src/skins/menus.cc:126
+#: src/skins/menus.cc:151 src/skins-qt/menus.cc:145
 msgid "On All Workspaces"
 msgstr ""
 
-#: src/skins/menus.cc:128
+#: src/skins/menus.cc:153 src/skins-qt/menus.cc:148
 msgid "Roll Up Player"
 msgstr ""
 
-#: src/skins/menus.cc:129
+#: src/skins/menus.cc:154 src/skins-qt/menus.cc:149
 msgid "Roll Up Playlist Editor"
 msgstr ""
 
-#: src/skins/menus.cc:130
+#: src/skins/menus.cc:155 src/skins-qt/menus.cc:150
 msgid "Roll Up Equalizer"
 msgstr ""
 
-#: src/skins/menus.cc:132 src/skins/ui_main.cc:854
-msgid "Double Size"
-msgstr ""
-
-#: src/skins/menus.cc:138
+#: src/skins/menus.cc:163 src/skins-qt/menus.cc:158
 msgid "Add URL ..."
 msgstr ""
 
-#: src/skins/menus.cc:139
+#: src/skins/menus.cc:164 src/skins-qt/menus.cc:160
 msgid "Add Files ..."
 msgstr ""
 
-#: src/skins/menus.cc:143 src/skins/menus.cc:171 src/skins/menus.cc:185
+#: src/skins/menus.cc:168 src/skins/menus.cc:196 src/skins/menus.cc:212
+#: src/skins-qt/menus.cc:164 src/skins-qt/menus.cc:192
+#: src/skins-qt/menus.cc:208
 msgid "By Title"
 msgstr "Па загалоўку"
 
-#: src/skins/menus.cc:144 src/skins/menus.cc:178 src/skins/menus.cc:192
+#: src/skins/menus.cc:169 src/skins/menus.cc:203 src/skins/menus.cc:219
+#: src/skins-qt/menus.cc:165 src/skins-qt/menus.cc:199
+#: src/skins-qt/menus.cc:215
 msgid "By File Name"
 msgstr ""
 
-#: src/skins/menus.cc:145 src/skins/menus.cc:179 src/skins/menus.cc:193
+#: src/skins/menus.cc:170 src/skins/menus.cc:204 src/skins/menus.cc:220
+#: src/skins-qt/menus.cc:166 src/skins-qt/menus.cc:200
+#: src/skins-qt/menus.cc:216
 msgid "By File Path"
 msgstr ""
 
-#: src/skins/menus.cc:151
+#: src/skins/menus.cc:176 src/skins-qt/menus.cc:172
 msgid "Remove All"
 msgstr "Сцерці усе"
 
-#: src/skins/menus.cc:152
+#: src/skins/menus.cc:177 src/skins-qt/menus.cc:173
 msgid "Clear Queue"
 msgstr "Ачысціць чаргу"
 
-#: src/skins/menus.cc:154
+#: src/skins/menus.cc:179 src/skins-qt/menus.cc:175
 msgid "Remove Unavailable Files"
 msgstr "Сцерці недаступныя файлы"
 
-#: src/skins/menus.cc:155
+#: src/skins/menus.cc:180 src/skins-qt/menus.cc:176
 msgid "Remove Duplicates"
 msgstr "Сцерці дублікаты"
 
-#: src/skins/menus.cc:157
+#: src/skins/menus.cc:182 src/skins-qt/menus.cc:178
 msgid "Remove Unselected"
 msgstr "Сцерці невылучаныя"
 
-#: src/skins/menus.cc:158
+#: src/skins/menus.cc:183 src/skins-qt/menus.cc:179
 msgid "Remove Selected"
 msgstr "Сцерці вылучаныя"
 
-#: src/skins/menus.cc:162
+#: src/skins/menus.cc:187 src/skins-qt/menus.cc:183
 msgid "Search and Select"
 msgstr "Пошук і вылучэнне"
 
-#: src/skins/menus.cc:164
+#: src/skins/menus.cc:189 src/skins-qt/menus.cc:185
 msgid "Invert Selection"
 msgstr "Інвертаваць вылучэнне"
 
-#: src/skins/menus.cc:165
+#: src/skins/menus.cc:190 src/skins-qt/menus.cc:186
 msgid "Select None"
 msgstr "Зняць вылучэнне"
 
-#: src/skins/menus.cc:166
+#: src/skins/menus.cc:191 src/skins-qt/menus.cc:187
 msgid "Select All"
 msgstr "Вылучыць усе"
 
-#: src/skins/menus.cc:170 src/skins/menus.cc:184
+#: src/skins/menus.cc:195 src/skins/menus.cc:211 src/skins-qt/menus.cc:191
+#: src/skins-qt/menus.cc:207
 msgid "By Track Number"
 msgstr "Па нумары трэка"
 
-#: src/skins/menus.cc:172 src/skins/menus.cc:186
+#: src/skins/menus.cc:197 src/skins/menus.cc:213 src/skins-qt/menus.cc:193
+#: src/skins-qt/menus.cc:209
 msgid "By Artist"
 msgstr "Па выканаўцу"
 
-#: src/skins/menus.cc:173 src/skins/menus.cc:187
+#: src/skins/menus.cc:198 src/skins/menus.cc:214 src/skins-qt/menus.cc:194
+#: src/skins-qt/menus.cc:210
 msgid "By Album"
 msgstr "Па альбому"
 
-#: src/skins/menus.cc:174 src/skins/menus.cc:188
+#: src/skins/menus.cc:199 src/skins/menus.cc:215 src/skins-qt/menus.cc:195
+#: src/skins-qt/menus.cc:211
 msgid "By Album Artist"
 msgstr ""
 
-#: src/skins/menus.cc:175 src/skins/menus.cc:190
+#: src/skins/menus.cc:200 src/skins/menus.cc:216 src/skins-qt/menus.cc:196
+#: src/skins-qt/menus.cc:212
 msgid "By Release Date"
 msgstr ""
 
-#: src/skins/menus.cc:176 src/skins/menus.cc:189
+#: src/skins/menus.cc:201 src/skins/menus.cc:217 src/skins-qt/menus.cc:197
+#: src/skins-qt/menus.cc:213
 msgid "By Genre"
 msgstr ""
 
-#: src/skins/menus.cc:177 src/skins/menus.cc:191
+#: src/skins/menus.cc:202 src/skins/menus.cc:218 src/skins-qt/menus.cc:198
+#: src/skins-qt/menus.cc:214
 msgid "By Length"
 msgstr ""
 
-#: src/skins/menus.cc:180 src/skins/menus.cc:194
+#: src/skins/menus.cc:205 src/skins/menus.cc:221 src/skins-qt/menus.cc:201
+#: src/skins-qt/menus.cc:217
 msgid "By Custom Title"
 msgstr ""
 
-#: src/skins/menus.cc:198
+#: src/skins/menus.cc:206 src/skins/menus.cc:222 src/skins-qt/menus.cc:202
+#: src/skins-qt/menus.cc:218
+msgid "By Comment"
+msgstr ""
+
+#: src/skins/menus.cc:207 src/skins/menus.cc:223 src/skins-qt/menus.cc:203
+#: src/skins-qt/menus.cc:219
+msgid "By Disc Number"
+msgstr ""
+
+#: src/skins/menus.cc:227 src/skins-qt/menus.cc:223
 msgid "Randomize List"
 msgstr "Раскідаць спіс"
 
-#: src/skins/menus.cc:199
+#: src/skins/menus.cc:228 src/skins-qt/menus.cc:224
 msgid "Reverse List"
 msgstr "Спіс наадварот"
 
-#: src/skins/menus.cc:201
+#: src/skins/menus.cc:230 src/skins-qt/menus.cc:226
 msgid "Sort Selected"
 msgstr "Сартаваць вылучаныя"
 
-#: src/skins/menus.cc:202
+#: src/skins/menus.cc:231 src/skins-qt/menus.cc:227
 msgid "Sort List"
 msgstr "Сартаваць спіс"
 
-#: src/skins/menus.cc:208
+#: src/skins/menus.cc:236 src/skins-qt/menus.cc:232
+msgid "Open Containing Folder"
+msgstr ""
+
+#: src/skins/menus.cc:238 src/skins-qt/menus.cc:234
 msgid "Cut"
 msgstr "Выразаць"
 
-#: src/skins/menus.cc:209
+#: src/skins/menus.cc:239 src/skins-qt/menus.cc:235
 msgid "Copy"
 msgstr "Капіраваць"
 
-#: src/skins/menus.cc:210
+#: src/skins/menus.cc:240 src/skins-qt/menus.cc:236
 msgid "Paste"
 msgstr "Уставіць"
 
-#: src/skins/menus.cc:212
-msgid "Queue/Unqueue"
-msgstr ""
-
-#: src/skins/menus.cc:218
-msgid "Load Preset ..."
-msgstr ""
-
-#: src/skins/menus.cc:219
-msgid "Load Auto Preset ..."
-msgstr ""
-
-#: src/skins/menus.cc:220
-msgid "Load Default"
-msgstr ""
-
-#: src/skins/menus.cc:221
-msgid "Load Preset File ..."
+#: src/skins/menus.cc:241 src/skins-qt/menus.cc:237
+msgid "Paste at End"
 msgstr ""
 
-#: src/skins/menus.cc:222
-msgid "Load EQF File ..."
-msgstr ""
-
-#: src/skins/menus.cc:224
-msgid "Save Preset ..."
-msgstr ""
-
-#: src/skins/menus.cc:225
-msgid "Save Auto Preset ..."
-msgstr ""
-
-#: src/skins/menus.cc:226
-msgid "Save Default"
-msgstr ""
-
-#: src/skins/menus.cc:227
-msgid "Save Preset File ..."
-msgstr ""
-
-#: src/skins/menus.cc:228
-msgid "Save EQF File ..."
-msgstr ""
-
-#: src/skins/menus.cc:230
-msgid "Delete Preset ..."
-msgstr ""
-
-#: src/skins/menus.cc:231
-msgid "Delete Auto Preset ..."
+#: src/skins/menus.cc:243 src/skins-qt/menus.cc:239
+msgid "Queue/Unqueue"
 msgstr ""
 
-#: src/skins/menus.cc:233
-msgid "Import Winamp Presets ..."
-msgstr ""
+#: src/skins/playlist-widget.cc:58 src/skins-qt/playlist-widget.cc:58
+#, c-format
+msgid "%s (%d of %d)"
+msgstr "%s (%d з %d)"
 
-#: src/skins/menus.cc:235
-msgid "Reset to Zero"
-msgstr ""
+#: src/skins/playlistwin.cc:491 src/skins-qt/playlistwin.cc:478
+msgid "Audacious Playlist Editor"
+msgstr "Рэдактар плэйлістоў Audacious"
 
-#: src/skins/plugin.cc:48
+#: src/skins/plugin.cc:53 src/skins-qt/plugin.cc:65
 msgid "Winamp Classic Interface"
 msgstr "Інтэрфейс Winamp-класік"
 
-#: src/skins/preset-browser.cc:57 src/skins/preset-list.cc:371
-#: src/skins/preset-list.cc:386
-msgid "Save"
-msgstr "Запісаць"
-
-#: src/skins/preset-browser.cc:57 src/skins/preset-list.cc:338
-#: src/skins/preset-list.cc:354
-msgid "Load"
-msgstr "Загрузіць"
-
-#: src/skins/preset-browser.cc:83
-msgid "Load Preset File"
+#: src/skins-qt/menus.cc:75
+msgid "Open Folder ..."
 msgstr ""
 
-#: src/skins/preset-browser.cc:100
-msgid "Load EQF File"
+#: src/skins-qt/menus.cc:159
+msgid "Add Folder ..."
 msgstr ""
 
-#: src/skins/preset-browser.cc:119
-msgid "Save Preset File"
-msgstr ""
+#: src/skins-qt/search-select.cc:62 src/skins/search-select.cc:77
+msgid "Search entries in active playlist"
+msgstr "Шукаць запісы ў бягучым плэйлісце"
 
-#: src/skins/preset-browser.cc:137
-msgid "Save EQF File"
+#: src/skins-qt/search-select.cc:70 src/skins/search-select.cc:83
+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/preset-browser.cc:151
-msgid "Import Winamp Presets"
-msgstr ""
+#: src/skins-qt/search-select.cc:75 src/skins/search-select.cc:91
+msgid "Title:"
+msgstr "Назва:"
 
-#: src/skins/preset-list.cc:285
-msgid "Presets"
-msgstr "Прэсеты"
+#: src/skins-qt/search-select.cc:79 src/skins/search-select.cc:96
+msgid "Album:"
+msgstr "Альбом:"
 
-#: src/skins/preset-list.cc:335
-msgid "Load preset"
-msgstr "Чытаць прэсет"
+#: src/skins-qt/search-select.cc:82 src/skins/search-select.cc:101
+msgid "Artist:"
+msgstr "Выканаўца:"
 
-#: src/skins/preset-list.cc:351
-msgid "Load auto-preset"
-msgstr "Чытаць аўта-прэсет"
+#: src/skins-qt/search-select.cc:85 src/skins/search-select.cc:106
+msgid "File Name:"
+msgstr "Назва файла:"
 
-#: src/skins/preset-list.cc:367
-msgid "Save preset"
-msgstr "Запісаць прэсет"
+#: src/skins-qt/search-select.cc:88 src/skins/search-select.cc:134
+msgid "Clear previous selection before searching"
+msgstr "Ачысціць папярэдняе вылучэнне перад пошукам"
 
-#: src/skins/preset-list.cc:382
-msgid "Save auto-preset"
-msgstr "Запісаць аўта-прэсет"
+#: src/skins-qt/search-select.cc:89 src/skins/search-select.cc:137
+msgid "Automatically toggle queue for matching entries"
+msgstr "Аўтаматычна пераключыць чаргу для адпаведных запісаў"
 
-#: src/skins/preset-list.cc:408
-msgid "Delete preset"
-msgstr "Сцерці прэсет"
+#: src/skins-qt/search-select.cc:90 src/skins/search-select.cc:140
+msgid "Create a new playlist with matching entries"
+msgstr "Стварыць новы плэйліст з адпаведнымі запісамі"
 
-#: src/skins/preset-list.cc:424
-msgid "Delete auto-preset"
-msgstr "Сцерці аўта-прэсет"
+#: src/skins-qt/search-select.cc:101 src/skins/search-select.cc:78
+msgid "Search"
+msgstr ""
 
-#: src/skins/skins_cfg.cc:176
+#: src/skins-qt/skins_cfg.cc:198 src/skins/skins_cfg.cc:182
 msgid "Player:"
 msgstr ""
 
-#: src/skins/skins_cfg.cc:178
+#: src/skins-qt/skins_cfg.cc:200 src/skins/skins_cfg.cc:184
 msgid "Select main player window font:"
 msgstr "Вылучыце шрыфт для галоўнага вакна плэера:"
 
-#: src/skins/skins_cfg.cc:179
+#: src/skins-qt/skins_cfg.cc:201 src/skins/skins_cfg.cc:185
 msgid "Playlist:"
 msgstr ""
 
-#: src/skins/skins_cfg.cc:181
+#: src/skins-qt/skins_cfg.cc:203 src/skins/skins_cfg.cc:187
 msgid "Select playlist font:"
 msgstr "Выберыце шрыфт для плэйліста:"
 
-#: src/skins/skins_cfg.cc:187
+#: src/skins-qt/skins_cfg.cc:207 src/skins/skins_cfg.cc:191
 msgid "Skin"
 msgstr ""
 
-#: src/skins/skins_cfg.cc:189
+#: src/skins-qt/skins_cfg.cc:211 src/skins/skins_cfg.cc:193
+msgid "Display active titlebar when any window is focused"
+msgstr ""
+
+#: src/skins-qt/skins_cfg.cc:213 src/skins/skins_cfg.cc:195
 msgid "Fonts"
 msgstr ""
 
-#: src/skins/skins_cfg.cc:192
+#: src/skins-qt/skins_cfg.cc:215 src/skins/skins_cfg.cc:197
 msgid "Use bitmap fonts (supports ASCII only)"
 msgstr ""
 
-#: src/skins/skins_cfg.cc:194
+#: src/skins-qt/skins_cfg.cc:217 src/skins/skins_cfg.cc:199
 msgid "Scroll song title"
 msgstr ""
 
-#: src/skins/skins_cfg.cc:196
+#: src/skins-qt/skins_cfg.cc:219 src/skins/skins_cfg.cc:201
 msgid "Scroll song title in both directions"
 msgstr "Пракручваць назву песні ў абодвух кірунках"
 
-#: src/skins/skins_cfg.cc:201
+#: src/skins-qt/skins_cfg.cc:224 src/skins/skins_cfg.cc:206
 msgid "Analyzer"
 msgstr "Аналізатар"
 
-#: src/skins/skins_cfg.cc:202
+#: src/skins-qt/skins_cfg.cc:225 src/skins/skins_cfg.cc:207
 msgid "Scope"
 msgstr "Асцылограф"
 
-#: src/skins/skins_cfg.cc:203
+#: src/skins-qt/skins_cfg.cc:226 src/skins/skins_cfg.cc:208
 msgid "Voiceprint / VU meter"
 msgstr ""
 
-#: src/skins/skins_cfg.cc:204
+#: src/skins-qt/skins_cfg.cc:227 src/skins/skins_cfg.cc:209
 msgid "Off"
 msgstr "Выкл"
 
-#: src/skins/skins_cfg.cc:208 src/skins/skins_cfg.cc:233
-#: src/skins/skins_cfg.cc:239
+#: src/skins-qt/skins_cfg.cc:231 src/skins-qt/skins_cfg.cc:256
+#: src/skins-qt/skins_cfg.cc:262 src/skins/skins_cfg.cc:213
+#: src/skins/skins_cfg.cc:238 src/skins/skins_cfg.cc:244
 msgid "Normal"
 msgstr "Норма"
 
-#: src/skins/skins_cfg.cc:209 src/skins/skins_cfg.cc:234
+#: src/skins-qt/skins_cfg.cc:232 src/skins-qt/skins_cfg.cc:257
+#: src/skins/skins_cfg.cc:214 src/skins/skins_cfg.cc:239
 msgid "Fire"
 msgstr "Полымя"
 
-#: src/skins/skins_cfg.cc:210
+#: src/skins-qt/skins_cfg.cc:233 src/skins/skins_cfg.cc:215
 msgid "Vertical lines"
 msgstr ""
 
-#: src/skins/skins_cfg.cc:214
+#: src/skins-qt/skins_cfg.cc:237 src/skins/skins_cfg.cc:219
 msgid "Lines"
 msgstr "Лініі"
 
-#: src/skins/skins_cfg.cc:215
+#: src/skins-qt/skins_cfg.cc:238 src/skins/skins_cfg.cc:220
 msgid "Bars"
 msgstr "Слупкі"
 
-#: src/skins/skins_cfg.cc:219
+#: src/skins-qt/skins_cfg.cc:242 src/skins/skins_cfg.cc:224
 msgid "Slowest"
 msgstr "Наймарудней"
 
-#: src/skins/skins_cfg.cc:220
+#: src/skins-qt/skins_cfg.cc:243 src/skins/skins_cfg.cc:225
 msgid "Slow"
 msgstr "Марудна"
 
-#: src/skins/skins_cfg.cc:221 src/sox-resampler/sox-resampler.cc:152
+#: src/skins-qt/skins_cfg.cc:244 src/skins/skins_cfg.cc:226
+#: src/soxr/sox-resampler.cc:180
 msgid "Medium"
 msgstr "Сярэдне"
 
-#: src/skins/skins_cfg.cc:222
+#: src/skins-qt/skins_cfg.cc:245 src/skins/skins_cfg.cc:227
 msgid "Fast"
 msgstr "Хутка"
 
-#: src/skins/skins_cfg.cc:223
+#: src/skins-qt/skins_cfg.cc:246 src/skins/skins_cfg.cc:228
 msgid "Fastest"
 msgstr "Найхутчэй"
 
-#: src/skins/skins_cfg.cc:227
+#: src/skins-qt/skins_cfg.cc:250 src/skins/skins_cfg.cc:232
 msgid "Dots"
 msgstr ""
 
-#: src/skins/skins_cfg.cc:228
+#: src/skins-qt/skins_cfg.cc:251 src/skins/skins_cfg.cc:233
 msgid "Line"
-msgstr ""
+msgstr "Лінія"
 
-#: src/skins/skins_cfg.cc:229
+#: src/skins-qt/skins_cfg.cc:252 src/skins/skins_cfg.cc:234
 msgid "Solid"
 msgstr ""
 
-#: src/skins/skins_cfg.cc:235
+#: src/skins-qt/skins_cfg.cc:258 src/skins/skins_cfg.cc:240
 msgid "Ice"
 msgstr "Лёд"
 
-#: src/skins/skins_cfg.cc:240
+#: src/skins-qt/skins_cfg.cc:263 src/skins/skins_cfg.cc:245
 msgid "Smooth"
 msgstr "Гладка"
 
-#: src/skins/skins_cfg.cc:244
-msgid "Type"
-msgstr ""
-
-#: src/skins/skins_cfg.cc:245
-msgid "Visualization type:"
-msgstr ""
-
-#: src/skins/skins_cfg.cc:248
-msgid "Analyzer"
-msgstr ""
-
-#: src/skins/skins_cfg.cc:249
-msgid "Show peaks"
-msgstr ""
-
-#: src/skins/skins_cfg.cc:251
+#: src/skins-qt/skins_cfg.cc:267 src/skins/skins_cfg.cc:249
 msgid "Coloring:"
-msgstr ""
+msgstr "Колер:"
 
-#: src/skins/skins_cfg.cc:254
+#: src/skins-qt/skins_cfg.cc:270 src/skins/skins_cfg.cc:252
 msgid "Style:"
-msgstr ""
+msgstr "Стыль:"
 
-#: src/skins/skins_cfg.cc:257
+#: src/skins-qt/skins_cfg.cc:273 src/skins/skins_cfg.cc:255
 msgid "Falloff:"
 msgstr ""
 
-#: src/skins/skins_cfg.cc:260
+#: src/skins-qt/skins_cfg.cc:276 src/skins/skins_cfg.cc:258
 msgid "Peak falloff:"
 msgstr ""
 
-#: src/skins/skins_cfg.cc:264
+#: src/skins-qt/skins_cfg.cc:282 src/skins/skins_cfg.cc:264
 msgid "Scope Style:"
 msgstr ""
 
-#: src/skins/skins_cfg.cc:267
+#: src/skins-qt/skins_cfg.cc:285 src/skins/skins_cfg.cc:267
 msgid "Voiceprint Coloring:"
 msgstr ""
 
-#: src/skins/skins_cfg.cc:270
+#: src/skins-qt/skins_cfg.cc:288 src/skins/skins_cfg.cc:270
 msgid "VU Meter Style:"
 msgstr ""
 
-#: src/skins/skins_cfg.cc:276
-msgid "General"
-msgstr "Агульныя"
-
-#: src/skins/skins_cfg.cc:277
-msgid "Visualization"
-msgstr "Візуалізацыя"
-
-#: src/skins/ui_equalizer.cc:282
-msgid "Preamp"
-msgstr "Перадузмацненне"
-
-#: src/skins/ui_equalizer.cc:286
-msgid "31 Hz"
-msgstr "31 Гц"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "63 Hz"
-msgstr "63 Гц"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "125 Hz"
-msgstr "125 Гц"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "250 Hz"
-msgstr "250 Гц"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "500 Hz"
-msgstr "500 Гц"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "1 kHz"
-msgstr "2 кГц"
-
-#: src/skins/ui_equalizer.cc:288
-msgid "2 kHz"
-msgstr "2 кГц"
-
-#: src/skins/ui_equalizer.cc:288
-msgid "4 kHz"
-msgstr "4 кГц"
-
-#: src/skins/ui_equalizer.cc:288
-msgid "8 kHz"
-msgstr "8 кГц"
-
-#: src/skins/ui_equalizer.cc:288
-msgid "16 kHz"
-msgstr "16 кГц"
-
-#: src/skins/ui_equalizer.cc:330
-msgid "Audacious Equalizer"
-msgstr "Эквалайзер Audacious"
-
-#: src/skins/ui_main.cc:688
-#, c-format
-msgid "Seek to %d:%-2.2d / %d:%-2.2d"
-msgstr ""
-
-#: src/skins/ui_main.cc:709
-#, c-format
-msgid "Volume: %d%%"
-msgstr "Гучнасць: %d%%"
-
-#: src/skins/ui_main.cc:732
-#, c-format
-msgid "Balance: %d%% left"
-msgstr "Баланс: %d%% ўлева"
-
-#: src/skins/ui_main.cc:734
-msgid "Balance: center"
-msgstr "Баланс: цэнтр"
-
-#: src/skins/ui_main.cc:736
-#, c-format
-msgid "Balance: %d%% right"
-msgstr "Баланс: %d%% ўправа"
-
-#: src/skins/ui_main.cc:842
-msgid "Options Menu"
-msgstr "Меню опцый"
-
-#: src/skins/ui_main.cc:846
-msgid "Disable 'Always On Top'"
-msgstr "Адключыць 'Заўсёды зверху'"
-
-#: src/skins/ui_main.cc:848
-msgid "Enable 'Always On Top'"
-msgstr "Уключыць 'Заўсёды зверху'"
-
-#: src/skins/ui_main.cc:851
-msgid "File Info Box"
-msgstr ""
-
-#: src/skins/ui_main.cc:857
-msgid "Visualizations"
-msgstr ""
-
-#: src/skins/ui_main.cc:1336
-msgid "Repeat point A set."
-msgstr ""
-
-#: src/skins/ui_main.cc:1341
-msgid "Repeat point B set."
-msgstr ""
-
-#: src/skins/ui_main.cc:1350
-msgid "Repeat points cleared."
-msgstr ""
-
-#: src/skins/ui_playlist.cc:219
-msgid "Search entries in active playlist"
-msgstr "Шукаць запісы ў бягучым плэйлісце"
-
-#: src/skins/ui_playlist.cc:226
-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.cc:234
-msgid "Title:"
+#: src/skins-qt/skins_cfg.cc:294 src/skins/skins_cfg.cc:276
+msgid "Type"
 msgstr ""
 
-#: src/skins/ui_playlist.cc:241
-msgid "Album:"
+#: src/skins-qt/skins_cfg.cc:295 src/skins/skins_cfg.cc:277
+msgid "Visualization type:"
 msgstr ""
 
-#: src/skins/ui_playlist.cc:248
-msgid "Artist:"
+#: src/skins-qt/skins_cfg.cc:298 src/skins/skins_cfg.cc:280
+msgid "Analyzer"
 msgstr ""
 
-#: src/skins/ui_playlist.cc:255
-msgid "File Name:"
+#: src/skins-qt/skins_cfg.cc:299 src/skins/skins_cfg.cc:281
+msgid "Show peaks"
 msgstr ""
 
-#: src/skins/ui_playlist.cc:263
-msgid "Clear previous selection before searching"
-msgstr "Ачысціць папярэдняе вылучэнне перад пошукам"
-
-#: src/skins/ui_playlist.cc:266
-msgid "Automatically toggle queue for matching entries"
-msgstr "Аўтаматычна пераключыць чаргу для адпаведных запісаў"
-
-#: src/skins/ui_playlist.cc:269
-msgid "Create a new playlist with matching entries"
-msgstr "Стварыць новы плэйліст з адпаведнымі запісамі"
-
-#: src/skins/ui_playlist.cc:717
-msgid "Audacious Playlist Editor"
-msgstr "Рэдактар плэйлістоў Audacious"
-
-#: src/skins/ui_playlist.cc:752
-#, c-format
-msgid "%s (%d of %d)"
-msgstr "%s (%d з %d)"
+#: src/skins-qt/skins_cfg.cc:308 src/skins/skins_cfg.cc:290
+msgid "Visualization"
+msgstr "Візуалізацыя"
 
-#: src/skins/ui_skinselector.cc:167
+#: src/skins-qt/skinselector.cc:98 src/skins/skinselector.cc:111
 msgid "Archived Winamp 2.x skin"
 msgstr "Сціснутая абалонка Winamp 2.x"
 
-#: src/skins/ui_skinselector.cc:172
+#: src/skins-qt/skinselector.cc:102 src/skins/skinselector.cc:115
 msgid "Unarchived Winamp 2.x skin"
 msgstr "Несціснутая абалонка Winamp 2.x"
 
-#: src/skins/util.cc:430
-#, c-format
-msgid "Could not create directory (%s): %s\n"
-msgstr "Немагчыма стварыць каталог (%s): %s\n"
-
-#: src/sndfile/plugin.cc:39
+#: src/sndfile/plugin.cc:38
 msgid "Sndfile Plugin"
 msgstr "Плагін Sndfile"
 
-#: src/sndfile/plugin.cc:336
+#: src/sndfile/plugin.cc:372
 msgid ""
 "Based on the xmms_sndfile plugin:\n"
 "Copyright (C) 2000, 2002 Erik de Castro Lopo\n"
@@ -3689,92 +3947,100 @@
 "Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:44
+#: src/sndio/sndio.cc:43
 msgid "Sndio Output"
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:98
+#: src/sndio/sndio.cc:98
 msgid "Device (blank for default):"
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:100
+#: src/sndio/sndio.cc:100
 msgid "Save and restore volume:"
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:181
+#: src/sndio/sndio.cc:181
 #, c-format
 msgid "Sndio error: Unsupported audio format (%d)"
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:192
+#: src/sndio/sndio.cc:192
 msgid "Sndio error: sio_open() failed"
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:222
+#: src/sndio/sndio.cc:221
 msgid "Sndio error: sio_setpar() failed"
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:234
+#: src/sndio/sndio.cc:233
 msgid "Sndio error: sio_start() failed"
 msgstr ""
 
-#: src/song_change/song_change.cc:33
+#: src/songchange/song_change.cc:30
 msgid "Song Change"
 msgstr "Пераключэнне песні"
 
-#: src/song_change/song_change.cc:342
-msgid ""
-"Parameters passed to the shell should be encapsulated in "
-"quotes. Doing otherwise is a security risk."
-msgstr ""
-
-#: src/song_change/song_change.cc:358
+#: src/songchange/song_change.cc:256
 msgid "Commands"
-msgstr ""
+msgstr "Каманды"
 
-#: src/song_change/song_change.cc:360
+#: src/songchange/song_change.cc:258
 msgid "Command to run when starting a new song:"
 msgstr ""
 
-#: src/song_change/song_change.cc:364
+#: src/songchange/song_change.cc:261
+msgid "Command to run when stopping a song:"
+msgstr ""
+
+#: src/songchange/song_change.cc:264
 msgid "Command to run at the end of a song:"
 msgstr ""
 
-#: src/song_change/song_change.cc:368
+#: src/songchange/song_change.cc:267
 msgid "Command to run at the end of the playlist:"
 msgstr ""
 
-#: src/song_change/song_change.cc:372
+#: src/songchange/song_change.cc:270
 msgid "Command to run when song title changes (for network streams):"
 msgstr ""
 
-#: src/song_change/song_change.cc:376
+#: src/songchange/song_change.cc:273
 msgid ""
-"You can use the following format strings which will be substituted before "
-"calling the command (not all are useful for the end-of-playlist command):\n"
-"\n"
-"%F: Frequency (in hertz)\n"
+"You can use the following format codes, which will be replaced before "
+"running the command.\n"
+"Not all are useful though for the song-stopped or end-of-playlist command."
+msgstr ""
+
+#: src/songchange/song_change.cc:276
+msgid ""
+"%a: Artist\n"
+"%b: Album\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"
+"%F: Frequency (Hertz)\n"
+"%l: Length (milliseconds)\n"
+"%n or %s: Formatted title (see playlist settings)\n"
 "%p: Currently playing (1 or 0)\n"
-"%a: Artist\n"
-"%b: Album\n"
-"%T: Track title"
+"%r: Rate (bits per second)\n"
+"%t: Playlist position\n"
+"%T: Title (unformatted)"
 msgstr ""
 
-#: src/song-info-qt/song-info.cc:32
-msgid "Song Info (Qt)"
+#: src/songchange/song_change.cc:287
+msgid ""
+"Parameters passed to the shell should be enclosed in quotation marks.\n"
+"Unquoted parameters may lead to unexpected results."
 msgstr ""
 
-#: src/sox-resampler/sox-resampler.cc:44
+#: src/song-info-qt/song-info.cc:30
+msgid "Song Info"
+msgstr "Звесткі пра песню"
+
+#: src/soxr/sox-resampler.cc:44
 msgid "SoX Resampler"
 msgstr ""
 
-#: src/sox-resampler/sox-resampler.cc:144
+#: src/soxr/sox-resampler.cc:172
 msgid ""
 "SoX Resampler Plugin for Audacious\n"
 "Copyright 2013 Michał Lipski\n"
@@ -3783,89 +4049,129 @@
 "Copyright 2010-2012 John Lindgren"
 msgstr ""
 
-#: src/sox-resampler/sox-resampler.cc:150
+#: src/soxr/sox-resampler.cc:178
 msgid "Quick"
-msgstr ""
+msgstr "Хутка"
 
-#: src/sox-resampler/sox-resampler.cc:151
+#: src/soxr/sox-resampler.cc:179
 msgid "Low"
-msgstr ""
+msgstr "Нізка"
 
-#: src/sox-resampler/sox-resampler.cc:153
+#: src/soxr/sox-resampler.cc:181
 msgid "High"
-msgstr ""
+msgstr "Высока"
 
-#: src/sox-resampler/sox-resampler.cc:154
+#: src/soxr/sox-resampler.cc:182
 msgid "Very High"
+msgstr "Вельмі высока"
+
+#: src/soxr/sox-resampler.cc:183
+msgid "Ultra High"
+msgstr ""
+
+#: src/soxr/sox-resampler.cc:187
+msgid "Minimum"
 msgstr ""
 
-#: src/sox-resampler/sox-resampler.cc:158
+#: src/soxr/sox-resampler.cc:188
+msgid "Intermediate"
+msgstr ""
+
+#: src/soxr/sox-resampler.cc:193
 msgid "Quality:"
+msgstr "Якасць:"
+
+#: src/soxr/sox-resampler.cc:196
+msgid "Phase:"
+msgstr ""
+
+#: src/soxr/sox-resampler.cc:200
+msgid "Allow aliasing"
 msgstr ""
 
-#: src/speed-pitch/speed-pitch.cc:51
+#: src/soxr/sox-resampler.cc:202
+msgid "Use steep filter"
+msgstr ""
+
+#: src/speedpitch/speed-pitch.cc:54
 msgid "Speed and Pitch"
 msgstr ""
 
-#: src/speed-pitch/speed-pitch.cc:210
-msgid "Speed and Pitch"
+#: src/speedpitch/speed-pitch.cc:247
+msgid "Speed"
 msgstr ""
 
-#: src/speed-pitch/speed-pitch.cc:211
-msgid "Speed:"
-msgstr "Хуткасць"
+#: src/speedpitch/speed-pitch.cc:248
+msgid "Decouple from pitch"
+msgstr ""
 
-#: src/speed-pitch/speed-pitch.cc:214
-msgid "Pitch:"
+#: src/speedpitch/speed-pitch.cc:250 src/speedpitch/speed-pitch.cc:258
+msgid "Multiplier:"
 msgstr ""
 
-#: src/statusicon/statusicon.cc:47
+#: src/speedpitch/speed-pitch.cc:254
+msgid "Pitch"
+msgstr ""
+
+#: src/statusicon-qt/statusicon.cc:45 src/statusicon/statusicon.cc:47
 msgid "Status Icon"
 msgstr "Значок статусу"
 
-#: src/statusicon/statusicon.cc:283
-msgid "Se_ttings ..."
-msgstr ""
-
-#: src/statusicon/statusicon.cc:372
+#: src/statusicon-qt/statusicon.cc:68
 msgid ""
-"Status Icon Plugin\n"
+"Status Icon Plugin (partial port for Qt interface)\n"
 "\n"
 "Copyright 2005-2007 Giacomo Lozito <james@develia.org>\n"
 "Copyright 2010 Michał Lipski <tallica@o2.pl>\n"
+"Copyright 2015 Eugene Paskevich <eugene@raptor.kiev.ua>\n"
 "\n"
 "This plugin provides a status icon, placed in\n"
 "the system tray area of the window manager."
 msgstr ""
 
-#: src/statusicon/statusicon.cc:379
+#: src/statusicon-qt/statusicon.cc:89 src/statusicon/statusicon.cc:384
 msgid "Mouse Scroll Action"
 msgstr "Дзеянні колца мышы"
 
-#: src/statusicon/statusicon.cc:380
+#: src/statusicon-qt/statusicon.cc:90 src/statusicon/statusicon.cc:385
 msgid "Change volume"
 msgstr "Змяняць гук"
 
-#: src/statusicon/statusicon.cc:383
+#: src/statusicon-qt/statusicon.cc:93 src/statusicon/statusicon.cc:388
 msgid "Change playing song"
 msgstr "Змяняць песню"
 
-#: src/statusicon/statusicon.cc:386
+#: src/statusicon-qt/statusicon.cc:96 src/statusicon/statusicon.cc:391
 msgid "Other Settings"
 msgstr "Іншыя настаўленні"
 
-#: src/statusicon/statusicon.cc:387
+#: src/statusicon-qt/statusicon.cc:97 src/statusicon/statusicon.cc:392
 msgid "Disable the popup window"
 msgstr "Адключыць усплыўное акно"
 
-#: src/statusicon/statusicon.cc:389
+#: src/statusicon-qt/statusicon.cc:99 src/statusicon/statusicon.cc:394
 msgid "Close to the system tray"
 msgstr ""
 
-#: src/statusicon/statusicon.cc:391
+#: src/statusicon-qt/statusicon.cc:101 src/statusicon/statusicon.cc:396
 msgid "Advance in playlist when scrolling upward"
 msgstr ""
 
+#: src/statusicon-qt/statusicon.cc:116 src/statusicon/statusicon.cc:287
+msgid "Se_ttings ..."
+msgstr ""
+
+#: src/statusicon/statusicon.cc:377
+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/stereo_plugin/stereo.cc:19
 msgid "Extra Stereo"
 msgstr "Дадатковае стэрэа"
@@ -3881,20 +4187,160 @@
 msgid "Extra Stereo"
 msgstr "Дадатковае стэрэа"
 
+#: src/streamtuner/icecast-model.cc:126 src/streamtuner/shoutcast-model.cc:131
+msgid "Type"
+msgstr ""
+
+#: src/streamtuner/icecast-model.cc:132
+msgid "Current Song"
+msgstr ""
+
+#: src/streamtuner/icecast-model.cc:164
+msgid "Other"
+msgstr ""
+
+#: src/streamtuner/ihr-model.cc:63
+msgid "Market"
+msgstr ""
+
+#: src/streamtuner/ihr-model.cc:156
+msgid "Call Letters"
+msgstr ""
+
+#: src/streamtuner/ihr-model.cc:162
+msgid "Description"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:128
+msgid "Listeners"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:188
+msgid "Top 500 Stations"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:189
+msgid "Alternative"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:190
+msgid "Blues"
+msgstr "Блюз"
+
+#: src/streamtuner/shoutcast-model.cc:191
+msgid "Classical"
+msgstr "Класічная музыка"
+
+#: src/streamtuner/shoutcast-model.cc:192
+msgid "Country"
+msgstr "Кантры"
+
+#: src/streamtuner/shoutcast-model.cc:193
+msgid "Decades"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:194
+msgid "Easy Listening"
+msgstr "Лёгкая Музыка"
+
+#: src/streamtuner/shoutcast-model.cc:195
+msgid "Electronic"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:196
+msgid "Folk"
+msgstr "Фолк"
+
+#: src/streamtuner/shoutcast-model.cc:197
+msgid "Inspirational"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:198
+msgid "International"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:199
+msgid "Jazz"
+msgstr "Джаз"
+
+#: src/streamtuner/shoutcast-model.cc:200
+msgid "Latin"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:201
+msgid "Metal"
+msgstr "Метал"
+
+#: src/streamtuner/shoutcast-model.cc:203
+msgid "New Age"
+msgstr "Нью Эйдж"
+
+#: src/streamtuner/shoutcast-model.cc:204
+msgid "Pop"
+msgstr "Поп"
+
+#: src/streamtuner/shoutcast-model.cc:205
+msgid "Public Radio"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:206
+msgid "R&B and Urban"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:207
+msgid "Rap"
+msgstr "Рэп"
+
+#: src/streamtuner/shoutcast-model.cc:208
+msgid "Reggae"
+msgstr "Рэгі"
+
+#: src/streamtuner/shoutcast-model.cc:209
+msgid "Rock"
+msgstr "Рок"
+
+#: src/streamtuner/shoutcast-model.cc:210
+msgid "Seasonal and Holiday"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:211
+msgid "Soundtracks"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:212
+msgid "Talk"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:213
+msgid "Themes"
+msgstr ""
+
+#: src/streamtuner/streamtuner.cc:59
+msgid "Shoutcast"
+msgstr ""
+
+#: src/streamtuner/streamtuner.cc:60
+msgid "Icecast"
+msgstr ""
+
+#: src/streamtuner/streamtuner.cc:71
+msgid "Stream Tuner"
+msgstr ""
+
 #: src/tonegen/tonegen.cc:45
 msgid "Tone Generator"
 msgstr ""
 
-#: src/tonegen/tonegen.cc:94
+#: src/tonegen/tonegen.cc:92
 #, c-format
 msgid "%s %.1f Hz"
 msgstr "%s %.1f Гц"
 
-#: src/tonegen/tonegen.cc:94
+#: src/tonegen/tonegen.cc:92
 msgid "Tone Generator: "
 msgstr ""
 
-#: src/tonegen/tonegen.cc:160
+#: src/tonegen/tonegen.cc:161
 msgid ""
 "Sine tone generator by Håvard Kvålen <havardk@xmms.org>\n"
 "Modified by Daniel J. Peng <danielpeng@bigfoot.com>\n"
@@ -3903,11 +4349,32 @@
 "e.g. tone://2000;2005 to play a 2000 Hz tone and a 2005 Hz tone"
 msgstr ""
 
+#: src/ui-common/dialogs-qt.cc:40
+msgid ""
+"\n"
+"(Further messages have been hidden.)"
+msgstr ""
+"\n"
+"(Далейшыя паведамленні былі прыхаваныя.)"
+
+#: src/ui-common/dialogs-qt.cc:52
+msgid "Working ..."
+msgstr "Выконваецца..."
+
+#: src/ui-common/dialogs-qt.cc:73
+msgid "Information"
+msgstr "Інфармацыя"
+
+#: src/ui-common/menu-ops-gtk.cc:132 src/ui-common/menu-ops-qt.cc:113
+#, c-format
+msgid "%s does not appear to be a valid folder."
+msgstr ""
+
 #: src/voice_removal/voice_removal.cc:28
 msgid "Voice Removal"
 msgstr "Выдаленне голасу"
 
-#: src/vorbis/vorbis.cc:465
+#: src/vorbis/vorbis.cc:433
 msgid ""
 "Audacious Ogg Vorbis Decoder\n"
 "\n"
@@ -3932,12 +4399,12 @@
 msgid "Ogg Vorbis Decoder"
 msgstr "Дэкодар Ogg Vorbis"
 
-#: src/vtx/info.cc:22
+#: src/vtx/info.cc:24
 #, c-format
 msgid "Details about %s"
 msgstr ""
 
-#: src/vtx/info.cc:24
+#: src/vtx/info.cc:26
 msgid ""
 "Title: %t\n"
 "Author: %a\n"
@@ -3956,44 +4423,104 @@
 msgid "VTX Decoder"
 msgstr "Дэкодар VTX"
 
-#: src/vtx/vtx.cc:184
+#: src/vtx/vtx.cc:178
 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/wavpack/wavpack.cc:24
+#: src/vumeter-qt/vumeter_qt.cc:31
+msgid ""
+"VU Meter Plugin for Audacious\n"
+"Copyright 2017-2019 Marc Sánchez Fauste"
+msgstr ""
+
+#: src/vumeter-qt/vumeter_qt.cc:35
+msgid "VU Meter Settings"
+msgstr ""
+
+#: src/vumeter-qt/vumeter_qt.cc:37
+msgid "Peak hold time:"
+msgstr ""
+
+#: src/vumeter-qt/vumeter_qt.cc:42
+msgid "Fall-off time:"
+msgstr ""
+
+#: src/vumeter-qt/vumeter_qt.cc:44
+msgid "dB/second"
+msgstr ""
+
+#: src/vumeter-qt/vumeter_qt.cc:46
+msgid "Display legend"
+msgstr ""
+
+#: src/vumeter-qt/vumeter_qt.h:37
+msgid "VU Meter"
+msgstr ""
+
+#: src/waveout/waveout.cc:43
+msgid "Win32 waveOut"
+msgstr ""
+
+#: src/waveout/waveout.cc:69
+msgid ""
+"Win32 waveOut Plugin for Audacious\n"
+"Copyright 2016 John Lindgren"
+msgstr ""
+
+#: src/wavpack/wavpack.cc:25
 msgid "WavPack Decoder"
 msgstr "Дэкодар WavPack"
 
-#: src/wavpack/wavpack.cc:211
+#: src/wavpack/wavpack.cc:217
 msgid "lossy (hybrid)"
 msgstr ""
 
-#: src/wavpack/wavpack.cc:213
+#: src/wavpack/wavpack.cc:219
 msgid "lossy"
 msgstr ""
 
-#: src/wavpack/wavpack.cc:255
+#: src/wavpack/wavpack.cc:259
 msgid ""
 "Copyright 2006 William Pitcock <nenolod@nenolod.net>\n"
 "\n"
 "Some of the plugin code was by Miles Egan."
 msgstr ""
 
-#: src/xsf/plugin.cc:50
+#: src/xsf/plugin.cc:74
 msgid "2SF Decoder"
 msgstr "Дэкодар 2SF"
 
-#: src/xsf/plugin.cc:238
+#: src/xsf/plugin.cc:429
+msgid "32728 Hz"
+msgstr ""
+
+#: src/xsf/plugin.cc:432
+msgid "65456 Hz"
+msgstr ""
+
+#: src/xsf/plugin.cc:438
+msgid "Cosine"
+msgstr ""
+
+#: src/xsf/plugin.cc:439
+msgid "Sharp"
+msgstr ""
+
+#: src/xsf/plugin.cc:443
 msgid "XSF Configuration"
 msgstr ""
 
-#: src/xsf/plugin.cc:239
-msgid "Ignore length from file"
+#: src/xsf/plugin.cc:445
+msgid "Default fade time:"
+msgstr ""
+
+#: src/xsf/plugin.cc:447
+msgid "Interpolation mode:"
 msgstr ""
 
-#: src/xspf/xspf.cc:89
+#: src/xspf/xspf.cc:95
 msgid "XML Shareable Playlists (XSPF)"
 msgstr ""

audacious-plugins-3.6.2-gtk3.tar.bz2/po/bg.po -> audacious-plugins-4.4.1.tar.bz2/po/bg.po Changed

@@ -4,20 +4,23 @@
 #
 # Translators:
 # Ivailo Monev <xakepa10@gmail.com>, 2014
-# Kiril Kirilov <cybercop_montana@abv.bg>, 2014-2015
+# Kiril Kirilov <cybercop_montana@abv.bg>, 2014-2015,2017-2019
+# Myselus, 2016-2017,2022
 # Pandi3a <pandi3a@gmail.com>, 2012
 # Pandi3a <pandi3a@gmail.com>, 2012
+# Thomas Arlington, 2022
 # Радослав Иванов <reckku@gmail.com>, 2013-2014
 # Радослав Иванов <reckku@gmail.com>, 2013
-# Радослав Иванов <reckku@gmail.com>, 2015
+# Радослав Иванов <reckku@gmail.com>, 2015-2016
 msgid ""
 msgstr ""
 "Project-Id-Version: Audacious Plugins\n"
-"Report-Msgid-Bugs-To: http://redmine.audacious-media-player.org/\n"
-"POT-Creation-Date: 2015-05-30 15:51+0200\n"
-"PO-Revision-Date: 2015-04-27 08:48+0000\n"
-"Last-Translator: Радослав Иванов <reckku@gmail.com>\n"
-"Language-Team: Bulgarian (http://www.transifex.com/projects/p/audacious/"
+"Report-Msgid-Bugs-To: https://github.com/audacious-media-player/audacious/"
+"issues\n"
+"POT-Creation-Date: 2024-09-26 21:54+0200\n"
+"PO-Revision-Date: 2011-10-10 17:43+0000\n"
+"Last-Translator: Thomas Arlington, 2022\n"
+"Language-Team: Bulgarian (http://app.transifex.com/audacious/audacious/"
 "language/bg/)\n"
 "Language: bg\n"
 "MIME-Version: 1.0\n"
@@ -25,288 +28,60 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/aac-raw/aac.cc:18
+#: src/aac/aac.cc:19
 msgid "AAC (Raw) Decoder"
 msgstr "Разкодиране на AAC (Raw)"
 
-#: src/adplug/adplug-xmms.cc:42
+#: src/adplug/adplug-xmms.cc:70
 msgid "AdPlug (AdLib Player)"
 msgstr "AdPlug (AdLib Плейър)"
 
-#: src/adplug/adplug-xmms.cc:156 src/modplug/modplugbmp.cc:335
-#: src/psf/plugin.cc:138 src/vtx/vtx.cc:87 src/xsf/plugin.cc:113
+#: src/adplug/adplug-xmms.cc:167 src/modplug/modplugbmp.cc:321
+#: src/psf/plugin.cc:161 src/vtx/vtx.cc:89 src/xsf/plugin.cc:204
 msgid "sequenced"
 msgstr "подредени"
 
-#: src/alarm/alarm.cc:55 src/alarm/interface.cc:82
-msgid "Alarm"
-msgstr "Аларма"
-
-#: src/alarm/alarm.cc:782
-msgid "Set Alarm ..."
-msgstr "Задаване на Аларма ..."
-
-#: src/alarm/alarm.cc:810
-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/interface.cc: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.cc: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.cc: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.cc:81
-msgid "This is your wakeup call."
-msgstr "Това е Вашият сигнал за събуждане."
-
-#: src/alarm/interface.cc:99
-msgid "Your reminder for today is..."
-msgstr "Вашето напомняне за днес е..."
-
-#: src/alarm/interface.cc:101 src/alarm/interface.cc:386
-msgid "Reminder"
-msgstr "Напомняне"
-
-#: src/alarm/interface.cc:132
-msgid "Monday"
-msgstr "Понеделник"
-
-#: src/alarm/interface.cc:132
-msgid "Tuesday"
-msgstr "Вторник"
-
-#: src/alarm/interface.cc:132
-msgid "Wednesday"
-msgstr "Сряда"
-
-#: src/alarm/interface.cc:133
-msgid "Thursday"
-msgstr "Четвъртък"
-
-#: src/alarm/interface.cc:133
-msgid "Friday"
-msgstr "Петък"
-
-#: src/alarm/interface.cc:133
-msgid "Saturday"
-msgstr "Събота"
-
-#: src/alarm/interface.cc:133
-msgid "Sunday"
-msgstr "Неделя"
-
-#: src/alarm/interface.cc:171 src/alarm/interface.cc:230
-#: src/alarm/interface.cc:245
-msgid "Time"
-msgstr "Час"
-
-#: src/alarm/interface.cc:178
-msgid "Alarm at (default):"
-msgstr "Алармиране в (по подразбиране):"
-
-#: src/alarm/interface.cc:200
-msgid "h"
-msgstr "ч"
-
-#: src/alarm/interface.cc:203
-msgid "Quiet after:"
-msgstr "Затишие след:"
-
-#: src/alarm/interface.cc:215
-msgid "hours"
-msgstr "часове"
-
-#: src/alarm/interface.cc:226
-msgid "minutes"
-msgstr "минути"
-
-#: src/alarm/interface.cc:235
-msgid "Choose the days for the alarm to come on"
-msgstr "Избор на дни, в които да се активира алармата"
+#: src/adplug/adplug-xmms.cc:349 src/sid/xs_config.cc:61
+msgid "Output"
+msgstr "Изход"
 
-#: src/alarm/interface.cc:242
-msgid "Day"
-msgstr "Ден"
+#: src/adplug/adplug-xmms.cc:350
+msgid "OPL Emulator:"
+msgstr "OPL емулатор:"
+
+#: src/adplug/adplug-xmms.cc:353 src/amidiplug/i_configure.cc:153
+#: src/console/plugin.cc:45 src/filewriter/filewriter.cc:481
+#: src/sid/xs_config.cc:65 src/xsf/plugin.cc:446
+msgid "Sample rate:"
+msgstr "Честота на дискретизация"
 
-#: src/alarm/interface.cc:259 src/bs2b/plugin.cc:130
-#: src/skins/preset-list.cc:434 src/skins/preset-list.cc:440
-msgid "Default"
-msgstr "По подразбиране"
+#: src/adplug/adplug-xmms.cc:354 src/amidiplug/i_configure.cc:155
+#: src/bs2b/plugin.cc:141 src/console/plugin.cc:47
+#: src/modplug/plugin_main.cc:77 src/resample/resample.cc:201
+#: src/resample/resample.cc:207 src/resample/resample.cc:211
+#: src/resample/resample.cc:215 src/resample/resample.cc:219
+#: src/resample/resample.cc:223 src/resample/resample.cc:227
+#: src/resample/resample.cc:231 src/resample/resample.cc:235
+#: src/resample/resample.cc:239 src/resample/resample.cc:243
+#: src/sid/xs_config.cc:67 src/soxr/sox-resampler.cc:205
+msgid "Hz"
+msgstr "Хц"
 
-#: src/alarm/interface.cc:288
-msgid "Days"
-msgstr "Дни"
-
-#: src/alarm/interface.cc:297
-msgid "Fading"
-msgstr "Затихване"
-
-#: src/alarm/interface.cc:305 src/console/plugin.cc:41
-#: src/crossfade/crossfade.cc:53 src/crossfade/crossfade.cc:59
-#: src/gtkui/settings.cc:49 src/lirc/lirc.cc:397 src/sid/xs_config.cc:85
-#: src/sid/xs_config.cc:94 src/sid/xs_config.cc:103
-msgid "seconds"
-msgstr "секунди"
+#: src/adplug/adplug-xmms.cc:355 src/gtkui/settings.cc:55
+#: src/modplug/plugin_main.cc:105 src/qtui/settings.cc:85
+#: src/skins-qt/skins_cfg.cc:302 src/skins/skins_cfg.cc:284
+msgid "Miscellaneous"
+msgstr "Разни"
 
-#: src/alarm/interface.cc:312 src/alarm/interface.cc:353
-msgid "Volume"
-msgstr "Сила на звука"
-
-#: src/alarm/interface.cc:317
-msgid "Start at"
-msgstr "Начало"
-
-#: src/alarm/interface.cc:333
-msgid "Final"
-msgstr "Край"
-
-#: src/alarm/interface.cc:346
-msgid "Current"
-msgstr "Текущо"
-
-#: src/alarm/interface.cc:359
-msgid "Additional Command"
-msgstr "Допълнителна команда"
-
-#: src/alarm/interface.cc:365 src/alarm/interface.cc:391
-msgid "enable"
-msgstr "активиране"
-
-#: src/alarm/interface.cc:372
-msgid "Playlist (optional)"
-msgstr "Списък за изпълнение (по избор)"
-
-#: src/alarm/interface.cc:379
-msgid "Select a playlist"
-msgstr "Избор на списък"
-
-#: src/alarm/interface.cc:399
-msgid "Options"
-msgstr "Опции"
-
-#: src/alarm/interface.cc:404
-msgid "What do these options mean?"
-msgstr "Какво означават тези опции?"
-
-#: src/alarm/interface.cc:420
-msgid "Help"
-msgstr "Помощ"
+#: src/adplug/adplug-xmms.cc:356
+msgid "Repeat song in endless loop"
+msgstr "Повторете песента в безкраен цикъл"
 
-#: src/albumart/albumart.cc:31
+#: src/albumart/albumart.cc:31 src/albumart-qt/albumart.cc:35
 msgid "Album Art"
 msgstr "Обложка на албум"
 
-#: src/albumart-qt/albumart.cc:33
-msgid "Album Art (Qt)"
-msgstr "Обложка (Qt)"
-
-#: src/alsa/alsa.h:70
+#: src/alsa/alsa.h:64
 msgid "ALSA Output"
 msgstr "ALSA изход"
 
@@ -349,11 +124,11 @@
 msgid "Mixer element:"
 msgstr "Елемент на миксера:"
 
-#: src/amidi-plug/amidi-plug.cc:41
+#: src/amidiplug/amidi-plug.cc:42
 msgid "AMIDI-Plug (MIDI Player)"
 msgstr "AMIDI-Plug (MIDI Плеър)"
 
-#: src/amidi-plug/amidi-plug.cc:437
+#: src/amidiplug/amidi-plug.cc:445
 msgid ""
 "AMIDI-Plug\n"
 "modular MIDI music player\n"
@@ -395,157 +170,161 @@
 "Tony Vroon\n"
 "за полезната помощ с алфа тестовете"
 
-#: src/amidi-plug/i_configure.cc:94
+#: src/amidiplug/i_configure.cc:94
 msgid "Override default gain:"
 msgstr "Презапис на стандартното усилване:"
 
-#: src/amidi-plug/i_configure.cc:102
+#: src/amidiplug/i_configure.cc:102
 msgid "Override default polyphony:"
 msgstr "Презапис на стандартната полифония:"
 
-#: src/amidi-plug/i_configure.cc:110
+#: src/amidiplug/i_configure.cc:110
 msgid "Override default reverb:"
 msgstr "Презапис на стандартното ехо"
 
-#: src/amidi-plug/i_configure.cc:112 src/amidi-plug/i_configure.cc:120
+#: src/amidiplug/i_configure.cc:112 src/amidiplug/i_configure.cc:120
 msgid "On"
 msgstr "Включено"
 
-#: src/amidi-plug/i_configure.cc:118
+#: src/amidiplug/i_configure.cc:118
 msgid "Override default chorus:"
 msgstr "Презапис на стандартния хор:"
 
-#: src/amidi-plug/i_configure.cc:128 src/console/plugin.cc:29
+#: src/amidiplug/i_configure.cc:128 src/console/plugin.cc:29
 msgid "Playback"
 msgstr "Възпроизвеждане"
 
-#: src/amidi-plug/i_configure.cc:129
+#: src/amidiplug/i_configure.cc:129
 msgid "Transpose:"
 msgstr "Транспозиции:"
 
-#: src/amidi-plug/i_configure.cc:131
+#: src/amidiplug/i_configure.cc:131 src/speedpitch/speed-pitch.cc:257
 msgid "semitones"
 msgstr "полутонове"
 
-#: src/amidi-plug/i_configure.cc:132
+#: src/amidiplug/i_configure.cc:132
 msgid "Drum shift:"
 msgstr "Промяна на барабана:"
 
-#: src/amidi-plug/i_configure.cc:134
+#: src/amidiplug/i_configure.cc:134
 msgid "note numbers"
 msgstr "номера на бележките"
 
-#: src/amidi-plug/i_configure.cc:135
+#: src/amidiplug/i_configure.cc:135
 msgid "Skip leading silence"
 msgstr "Пропусни водещото затишие"
 
-#: src/amidi-plug/i_configure.cc:137
+#: src/amidiplug/i_configure.cc:137
 msgid "Skip trailing silence"
 msgstr "Пропусни последващото затишие"
 
-#: src/amidi-plug/i_configure.cc:141
+#: src/amidiplug/i_configure.cc:141
 msgid "SoundFont"
 msgstr "Шрифт на звука"
 
-#: src/amidi-plug/i_configure.cc:143
+#: src/amidiplug/i_configure.cc:148
 msgid "Synthesizer"
 msgstr "Синтезатор"
 
-#: src/amidi-plug/i_configure.cc:148 src/console/plugin.cc:45
-#: src/sid/xs_config.cc:65
-msgid "Sample rate:"
-msgstr "Честота на дискретизация"
-
-#: src/amidi-plug/i_configure.cc:150 src/bs2b/plugin.cc:141
-#: src/console/plugin.cc:47 src/modplug/plugin_main.cc:78
-#: src/resample/resample.cc:201 src/resample/resample.cc:207
-#: src/resample/resample.cc:211 src/resample/resample.cc:215
-#: src/resample/resample.cc:219 src/resample/resample.cc:223
-#: src/resample/resample.cc:227 src/resample/resample.cc:231
-#: src/resample/resample.cc:235 src/resample/resample.cc:239
-#: src/resample/resample.cc:243 src/sid/xs_config.cc:67
-#: src/sox-resampler/sox-resampler.cc:163
-msgid "Hz"
-msgstr "Хц"
-
-#: src/amidi-plug/i_configure-fluidsynth.cc:52
+#: src/amidiplug/i_configure-fluidsynth.cc:58
+#: src/amidiplug/i_configure-fluidsynth.cc:527
 msgid "AMIDI-Plug - select SoundFont file"
 msgstr "AMIDI-Контакт - избор на файл за звуково изравняване"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:55 src/filewriter/mp3.cc:658
+#: src/amidiplug/i_configure-fluidsynth.cc:61
 msgid "_Cancel"
 msgstr "_Отказ"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:56
+#: src/amidiplug/i_configure-fluidsynth.cc:62
 msgid "_Open"
 msgstr "_Отваряне"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:225 src/gtkui/columns.cc:46
+#: src/amidiplug/i_configure-fluidsynth.cc:233
+#: src/amidiplug/i_configure-fluidsynth.cc:461
 msgid "File name"
 msgstr "Име на файла"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:229
+#: src/amidiplug/i_configure-fluidsynth.cc:237
+#: src/amidiplug/i_configure-fluidsynth.cc:464
 msgid "Size (bytes)"
 msgstr "Размер (байтове)"
 
-#: src/amidi-plug/i_fileinfo.cc:163
+#: src/amidiplug/i_fileinfo.cc:184
 msgid "Name:"
 msgstr "Име:"
 
-#: src/amidi-plug/i_fileinfo.cc:181
+#: src/amidiplug/i_fileinfo.cc:202
 msgid " MIDI Info "
 msgstr " MIDI информация "
 
-#: src/amidi-plug/i_fileinfo.cc:195
+#: src/amidiplug/i_fileinfo.cc:216
 msgid "Format:"
 msgstr "Формат:"
 
-#: src/amidi-plug/i_fileinfo.cc:198
+#: src/amidiplug/i_fileinfo.cc:219
 msgid "Length (msec):"
 msgstr "Продължителност (милисекунди):"
 
-#: src/amidi-plug/i_fileinfo.cc:201
+#: src/amidiplug/i_fileinfo.cc:222
 msgid "No. of Tracks:"
 msgstr "№ на Записи:"
 
-#: src/amidi-plug/i_fileinfo.cc:207
+#: src/amidiplug/i_fileinfo.cc:228
 msgid "variable"
 msgstr "променливост"
 
-#: src/amidi-plug/i_fileinfo.cc:209
+#: src/amidiplug/i_fileinfo.cc:230
 msgid "BPM:"
 msgstr "УВМ:"
 
-#: src/amidi-plug/i_fileinfo.cc:217
+#: src/amidiplug/i_fileinfo.cc:238
 msgid "BPM (wavg):"
 msgstr "УВМ (вълни):"
 
-#: src/amidi-plug/i_fileinfo.cc:220
+#: src/amidiplug/i_fileinfo.cc:241
 msgid "Time Div:"
 msgstr "Време Разд.:"
 
-#: src/amidi-plug/i_fileinfo.cc:231
+#: src/amidiplug/i_fileinfo.cc:252
 msgid " MIDI Comments and Lyrics "
 msgstr " MIDI Коментари и лирика "
 
-#: src/amidi-plug/i_fileinfo.cc:278
+#: src/amidiplug/i_fileinfo.cc:299
 msgid "* no comments available in this MIDI file *"
 msgstr "* няма достъпни коментари за този MIDI файл *"
 
-#: src/amidi-plug/i_fileinfo.cc:290
+#: src/amidiplug/i_fileinfo.cc:311
 msgid "* no lyrics available in this MIDI file *"
 msgstr "* няма достъпна лирика за този MIDI файл *"
 
-#: src/amidi-plug/i_fileinfo.cc:300 src/filewriter/vorbis.cc:197
-#: src/ladspa/plugin.cc:416
+#: src/amidiplug/i_fileinfo.cc:321 src/ladspa/plugin.cc:418
+#: src/ui-common/dialogs-qt.cc:32
 msgid "_Close"
 msgstr "_Затваряне"
 
-#: src/amidi-plug/i_fileinfo.cc:325
+#: src/amidiplug/i_fileinfo.cc:346
 msgid " (invalid UTF-8)"
 msgstr " (невалиден UTF-8)"
 
-#: src/aosd/aosd.cc:32
+#: src/ampache/ampache.cc:33
+msgid "Ampache Browser"
+msgstr "Ampache Браузер"
+
+#: src/ampache/ampache.cc:46
+msgid ""
+"Ampache Browser for Audacious\n"
+"http://ampache-browser.org/\n"
+"\n"
+"Copyright (C) Róbert Čerňanský and John Lindgren\n"
+"License: GNU GPLv3"
+msgstr ""
+"Ampache браузър за Audacious\n"
+"http://ampache-browser.org/\n"
+"\n"
+"Авторски права (C) Róbert Čerňanský and John Lindgren\n"
+"Лиценз: GNU GPLv3"
+
+#: src/aosd/aosd.cc:31
 msgid ""
 "Audacious OSD\n"
 "http://www.develia.org/projects.php?p=audacious#aosd\n"
@@ -579,133 +358,133 @@
 msgid "Concave Rectangle"
 msgstr "Вдлъбнат правоъгълник"
 
-#: src/aosd/aosd_style.cc:69
+#: src/aosd/aosd_style.cc:69 src/openmpt/mptwrap.h:50 src/xsf/plugin.cc:436
 msgid "None"
 msgstr "Без"
 
-#: src/aosd/aosd_trigger.cc:50
+#: src/aosd/aosd_trigger.cc:49
 msgid "Playback Start"
 msgstr "Начало на възпроизвеждането"
 
-#: src/aosd/aosd_trigger.cc:51
+#: src/aosd/aosd_trigger.cc:50
 msgid "Triggers OSD when a playlist entry is played."
 msgstr "Задействане на OSD, когато започне възпроизвеждането"
 
-#: src/aosd/aosd_trigger.cc:56
+#: src/aosd/aosd_trigger.cc:55
 msgid "Title Change"
 msgstr "Промяна на заглавие"
 
-#: src/aosd/aosd_trigger.cc:57
+#: src/aosd/aosd_trigger.cc:56
 msgid "Triggers OSD when the song title changes (for internet streams)."
 msgstr ""
 "Активира ЕИ, когато се смени заглавието на песента (за интернет потоци)."
 
-#: src/aosd/aosd_trigger.cc:62
+#: src/aosd/aosd_trigger.cc:61
 msgid "Pause On"
 msgstr "Временното спиране е активирано"
 
-#: src/aosd/aosd_trigger.cc:63
+#: src/aosd/aosd_trigger.cc:62
 msgid "Triggers OSD when playback is paused."
 msgstr ""
 "Задействане на OSD, когато\n"
 "възпроижзвеждането е в режим на временна пауза."
 
-#: src/aosd/aosd_trigger.cc:68
+#: src/aosd/aosd_trigger.cc:67
 msgid "Pause Off"
 msgstr "Временното спиране е деактивирано"
 
-#: src/aosd/aosd_trigger.cc:69
+#: src/aosd/aosd_trigger.cc:68
 msgid "Triggers OSD when playback is unpaused."
 msgstr "Задействане на OSD, когато възпроизвеждането продължи."
 
-#: src/aosd/aosd_ui.cc:163
+#: src/aosd/aosd_ui.cc:204
 msgid "Placement"
 msgstr "Местоположение"
 
-#: src/aosd/aosd_ui.cc:196
+#: src/aosd/aosd_ui.cc:241
 msgid "Relative X offset:"
 msgstr "Относителен отстъп за X:"
 
-#: src/aosd/aosd_ui.cc:203
+#: src/aosd/aosd_ui.cc:245
 msgid "Relative Y offset:"
 msgstr "Относителен отстъп за Y:"
 
-#: src/aosd/aosd_ui.cc:210
+#: src/aosd/aosd_ui.cc:249
 msgid "Max OSD width:"
 msgstr "Максимална ширина на OSD:"
 
-#: src/aosd/aosd_ui.cc:221
+#: src/aosd/aosd_ui.cc:281
 msgid "Multi-Monitor options"
 msgstr "Опции за много монитори"
 
-#: src/aosd/aosd_ui.cc:225
+#: src/aosd/aosd_ui.cc:285
 msgid "Display OSD using:"
 msgstr "Извеждай OSD, използвайки:"
 
-#: src/aosd/aosd_ui.cc:227
+#: src/aosd/aosd_ui.cc:287
 msgid "all monitors"
 msgstr "всички монитори"
 
-#: src/aosd/aosd_ui.cc:230
+#: src/aosd/aosd_ui.cc:290
 #, c-format
 msgid "monitor %i"
 msgstr "монитор %i"
 
-#: src/aosd/aosd_ui.cc:282
+#: src/aosd/aosd_ui.cc:342
 msgid "Timing (ms)"
 msgstr "Времетраене (мс)"
 
-#: src/aosd/aosd_ui.cc:287
+#: src/aosd/aosd_ui.cc:347
 msgid "Display:"
 msgstr "Екран:"
 
-#: src/aosd/aosd_ui.cc:292
+#: src/aosd/aosd_ui.cc:352
 msgid "Fade in:"
 msgstr "Проясняване:"
 
-#: src/aosd/aosd_ui.cc:297
+#: src/aosd/aosd_ui.cc:357
 msgid "Fade out:"
 msgstr "Избледняване:"
 
-#: src/aosd/aosd_ui.cc:361
+#: src/aosd/aosd_ui.cc:442
 msgid "Fonts"
 msgstr "Шрифтове"
 
-#: src/aosd/aosd_ui.cc:368
+#: src/aosd/aosd_ui.cc:449
 #, c-format
 msgid "Font %i:"
 msgstr "Шрифт %i:"
 
-#: src/aosd/aosd_ui.cc:382
+#: src/aosd/aosd_ui.cc:466
 msgid "Shadow"
 msgstr "Сянка"
 
-#: src/aosd/aosd_ui.cc:486
+#: src/aosd/aosd_ui.cc:589
 msgid "Render Style"
 msgstr "Създай свой стил"
 
-#: src/aosd/aosd_ui.cc:502
+#: src/aosd/aosd_ui.cc:605
 msgid "Colors"
 msgstr "Цветове"
 
-#: src/aosd/aosd_ui.cc:513
+#: src/aosd/aosd_ui.cc:616
 #, c-format
 msgid "Color %i:"
 msgstr "Цвят %i:"
 
-#: src/aosd/aosd_ui.cc:600
+#: src/aosd/aosd_ui.cc:714
 msgid "Enable trigger"
 msgstr "Активиране на активатора"
 
-#: src/aosd/aosd_ui.cc:627
+#: src/aosd/aosd_ui.cc:741
 msgid "Event"
 msgstr "Събитие"
 
-#: src/aosd/aosd_ui.cc:655
+#: src/aosd/aosd_ui.cc:768
 msgid "Composite manager detected"
 msgstr "Засечен е Композитен мениджър"
 
-#: src/aosd/aosd_ui.cc:662
+#: src/aosd/aosd_ui.cc:775
 msgid ""
 "Composite manager not detected;\n"
 "unless you know that you have one running, please activate a composite "
@@ -715,60 +494,56 @@
 "моля активирайте мениджъра, освен ако вече нямате стартиран, в противен "
 "случай OSD няма да работи правилно"
 
-#: src/aosd/aosd_ui.cc:670
+#: src/aosd/aosd_ui.cc:783
 msgid "Composite manager not required for fake transparency"
 msgstr "Не се изисква композитен мениджър за илюзийна прозрачност"
 
-#: src/aosd/aosd_ui.cc:706
+#: src/aosd/aosd_ui.cc:820
 msgid "Transparency"
 msgstr "Прозрачност"
 
-#: src/aosd/aosd_ui.cc:712
+#: src/aosd/aosd_ui.cc:826
 msgid "Fake transparency"
 msgstr "Илюзийна прозрачност"
 
-#: src/aosd/aosd_ui.cc:714
+#: src/aosd/aosd_ui.cc:828
 msgid "Real transparency (requires X Composite Ext.)"
 msgstr "Истинска прозрачност (изисква разширение за X)"
 
-#: src/aosd/aosd_ui.cc:756
+#: src/aosd/aosd_ui.cc:875
 msgid "Composite extension not loaded"
 msgstr "Композитното разширение не е заредено"
 
-#: src/aosd/aosd_ui.cc:764
-msgid "Composite extension not available"
-msgstr "Композитното разширение не е налично"
-
-#: src/aosd/aosd_ui.cc:781
+#: src/aosd/aosd_ui.cc:892
 #, c-format
 msgid "Audacious OSD"
 msgstr "Audacious OSD"
 
-#: src/aosd/aosd_ui.cc:844
+#: src/aosd/aosd_ui.cc:955
 msgid "Position"
 msgstr "Позиция"
 
-#: src/aosd/aosd_ui.cc:849
+#: src/aosd/aosd_ui.cc:960
 msgid "Animation"
 msgstr "Анимация"
 
-#: src/aosd/aosd_ui.cc:854
+#: src/aosd/aosd_ui.cc:965
 msgid "Text"
 msgstr "Текст"
 
-#: src/aosd/aosd_ui.cc:859
+#: src/aosd/aosd_ui.cc:970
 msgid "Decoration"
 msgstr "Декорация"
 
-#: src/aosd/aosd_ui.cc:864
+#: src/aosd/aosd_ui.cc:975
 msgid "Trigger"
 msgstr "Активатор"
 
-#: src/aosd/aosd_ui.cc:869
+#: src/aosd/aosd_ui.cc:980 src/streamtuner/shoutcast-model.cc:202
 msgid "Misc"
 msgstr "Разни"
 
-#: src/aosd/aosd_ui.cc:878
+#: src/aosd/aosd_ui.cc:989
 msgid "Test"
 msgstr "Тест"
 
@@ -784,11 +559,83 @@
 msgid "Audacious Playlists (audpl)"
 msgstr "Audacious Списъци (audpl)"
 
-#: src/blur_scope/blur_scope.cc:42
+#: src/background_music/background_music.cc:24
+msgid "Background music"
+msgstr ""
+
+#: src/background_music/background_music.cc:25
+msgid "Target level:"
+msgstr ""
+
+#: src/background_music/background_music.cc:28
+#: src/background_music/background_music.cc:33
+#: src/silence-removal/silence-removal.cc:70
+msgid "dB"
+msgstr "дБ"
+
+#: src/background_music/background_music.cc:29
+msgid "Maximum amplification:"
+msgstr ""
+
+#: src/background_music/background_music.cc:34 src/mpg123/mpg123.cc:81
+msgid "Advanced"
+msgstr "Допълнителни"
+
+#: src/background_music/background_music.cc:36
+msgid "Slow detection weight:"
+msgstr ""
+
+#: src/background_music/background_music.cc:39
+msgid "Hint"
+msgstr ""
+
+#: src/background_music/background_music.cc:41
+msgid ""
+"Slow detection weight is the relative weight\n"
+"of a long term average detection when compared\n"
+"to the actual, faster loudness detection.\n"
+"A value of zero gives a more radio-like sound\n"
+"where soft passages get \"pulled up\" more quickly,\n"
+"a value of two makes the sound feel less compressed."
+msgstr ""
+
+#: src/background_music/background_music.cc:52
+msgid ""
+"Background Music Plugin for Audacious\n"
+"Copyright 2023;2024 Michel Fleur\n"
+"\n"
+"Controls the volume to make the sound equally loud within and between "
+"tracks.\n"
+" It uses accurate loudness measurement and tries to make the volume changes "
+"sound natural without audible peaks, yet without lowering the volume before "
+"a peak in advance."
+msgstr ""
+
+#: src/background_music/background_music.cc:61
+msgid "Background Music"
+msgstr ""
+
+#: src/bitcrusher/bitcrusher.cc:33
+msgid "Bitcrusher"
+msgstr "Биткръшър"
+
+#: src/bitcrusher/bitcrusher.cc:34
+msgid "Bit Depth:"
+msgstr "Дълбочина на битовете:"
+
+#: src/bitcrusher/bitcrusher.cc:37
+msgid "Downsample ratio:"
+msgstr "Коефициент на намаляване на дискретизацията:"
+
+#: src/bitcrusher/bitcrusher.cc:48
+msgid "Bitcrusher"
+msgstr "Биткръшър"
+
+#: src/blur_scope/blur_scope.cc:40 src/blur_scope-qt/blur_scope.cc:45
 msgid "Color"
 msgstr "Цвят"
 
-#: src/blur_scope/blur_scope.cc:58
+#: src/blur_scope/blur_scope.cc:56 src/blur_scope-qt/blur_scope.cc:158
 msgid "Blur Scope"
 msgstr "Размит осцилоскоп"
 
@@ -798,7 +645,11 @@
 
 #: src/bs2b/plugin.cc:129
 msgid "Presets:"
-msgstr "Предложения:"
+msgstr "Заготовки:"
+
+#: src/bs2b/plugin.cc:130
+msgid "Default"
+msgstr "По подразбиране"
 
 #: src/bs2b/plugin.cc:136
 msgid "Feed level:"
@@ -812,15 +663,15 @@
 msgid "Cut frequency:"
 msgstr "Честота на срез:"
 
-#: src/cairo-spectrum/cairo-spectrum.cc:41
+#: src/cairo-spectrum/cairo-spectrum.cc:42 src/qt-spectrum/qt-spectrum.cc:107
 msgid "Spectrum Analyzer"
 msgstr "Анализ на спектъра"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:72
+#: src/cdaudio/cdaudio-ng.cc:74
 msgid "Audio CD Plugin"
 msgstr "Аудио CD Приставка"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:121
+#: src/cdaudio/cdaudio-ng.cc:121
 msgid ""
 "Copyright (C) 2007-2012 Calin Crisan <ccrisan@gmail.com> and others.\n"
 "\n"
@@ -843,132 +694,132 @@
 "\n"
 "Това беше проект от Google Summer of Code 2007."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:137
+#: src/cdaudio/cdaudio-ng.cc:140
 msgid "Device"
 msgstr "Устройство"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:138
+#: src/cdaudio/cdaudio-ng.cc:141
 msgid "Read speed:"
 msgstr "Скорост на четене:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:141
+#: src/cdaudio/cdaudio-ng.cc:144
 msgid "Override device:"
 msgstr "Презапис на устройството:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:143
+#: src/cdaudio/cdaudio-ng.cc:146
 msgid "Metadata"
 msgstr "Метаданни"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:144
+#: src/cdaudio/cdaudio-ng.cc:147
 msgid "Use CD-Text"
 msgstr "Използвай CD-Text"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:146
+#: src/cdaudio/cdaudio-ng.cc:150
 msgid "Use CDDB"
 msgstr "Използвай CDDB"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:148
+#: src/cdaudio/cdaudio-ng.cc:152
 msgid "Use HTTP instead of CDDBP"
 msgstr "Използване на HTTP вместо CDDBP"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:151
+#: src/cdaudio/cdaudio-ng.cc:155
 msgid "Server:"
 msgstr "Сървър:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:155
+#: src/cdaudio/cdaudio-ng.cc:159
 msgid "Path:"
 msgstr "Път:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:159
+#: src/cdaudio/cdaudio-ng.cc:163
 msgid "Port:"
 msgstr "Порт:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:246
+#: src/cdaudio/cdaudio-ng.cc:228
 msgid "Failed to initialize cdio subsystem."
 msgstr "Нуспех при откриване на cdio подсистема."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:281
+#: src/cdaudio/cdaudio-ng.cc:260
 #, c-format
 msgid "Invalid URI %s."
 msgstr "Невалиден Интернет адрес %s."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:283
+#: src/cdaudio/cdaudio-ng.cc:262
 #, c-format
 msgid "Track %d not found."
 msgstr "Запис %d не е намерен."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:285
+#: src/cdaudio/cdaudio-ng.cc:264
 #, c-format
 msgid "Track %d is a data track."
 msgstr "Записът %d е от данни."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:360
+#: src/cdaudio/cdaudio-ng.cc:339
 msgid "Error reading audio CD."
 msgstr "Грешка при четене на audio CD."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:429
+#: src/cdaudio/cdaudio-ng.cc:410
 msgid "Audio CD"
 msgstr "Аудио Диск"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:460 src/cdaudio-ng/cdaudio-ng.cc:469
+#: src/cdaudio/cdaudio-ng.cc:446 src/cdaudio/cdaudio-ng.cc:455
 #, c-format
 msgid "Failed to open CD device %s."
 msgstr "Не може да бъде отворено CD устройство %s."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:472
+#: src/cdaudio/cdaudio-ng.cc:458
 msgid "No audio capable CD drive found."
 msgstr "Не е намерено Audio CD устройство."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:497
+#: src/cdaudio/cdaudio-ng.cc:481
+msgid "Drive is empty."
+msgstr "Устройството е празно."
+
+#: src/cdaudio/cdaudio-ng.cc:483
+msgid "Unsupported disk type."
+msgstr "Неподдържан диск."
+
+#: src/cdaudio/cdaudio-ng.cc:507
 msgid "Failed to finish initializing opened CD drive."
 msgstr "Неуспешно приключване на обозначаването на отвореното CD устройство."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:510
+#: src/cdaudio/cdaudio-ng.cc:520
 msgid "Failed to retrieve first/last track number."
 msgstr "Неуспех при извличане на първият/последният номер на запис."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:531
+#: src/cdaudio/cdaudio-ng.cc:541
 #, c-format
 msgid "Cannot read start/end LSN for track %d."
 msgstr "Не може да прочете началото/края на LSN за запис %d."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:613
-msgid "Failed to create the cddb connection."
-msgstr "Неуспех при създаване на cddb връзка."
+#: src/cdaudio/cdaudio-ng.cc:624
+msgid "Failed to create the CDDB connection."
+msgstr "Неуспешно създаване на CDDB връзка."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:679
+#: src/cdaudio/cdaudio-ng.cc:690
 msgid "Failed to query the CDDB server"
 msgstr "Неуспешна заявка към CDDB сървър"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:681
+#: src/cdaudio/cdaudio-ng.cc:692
 #, c-format
 msgid "Failed to query the CDDB server: %s"
 msgstr "Неуспешна заявка към CDDB сървър: %s"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:705
+#: src/cdaudio/cdaudio-ng.cc:716
 #, c-format
-msgid "Failed to read the cddb info: %s"
-msgstr "Неуспешно прочитане на cddb информация: %s"
-
-#: src/cdaudio-ng/cdaudio-ng.cc:765
-msgid "Drive is empty."
-msgstr "Устройството е празно."
-
-#: src/cdaudio-ng/cdaudio-ng.cc:767
-msgid "Unsupported disk type."
-msgstr "Неподдържан диск."
+msgid "Failed to read the CDDB info: %s"
+msgstr "Неуспешно четене на CDDB информацията: %s"
 
-#: src/cd-menu-items/cd-menu-items.cc:35
+#: src/cd-menu-items/cd-menu-items.cc:33
 msgid "Audio CD Menu Items"
 msgstr "Елементи на меню тип Audio CD"
 
-#: src/cd-menu-items/cd-menu-items.cc:47
-msgid "Play CD"
-msgstr "Възпроизвеждане на компакт диск"
-
-#: src/cd-menu-items/cd-menu-items.cc:47
-msgid "Add CD"
-msgstr "Добавяне на компакт диск"
+#: src/cd-menu-items/cd-menu-items.cc:45
+msgid "Pla_y CD"
+msgstr "_Пусни CD"
+
+#: src/cd-menu-items/cd-menu-items.cc:45
+msgid "_Add CD"
+msgstr "_Добави CD"
 
 #: src/compressor/compressor.cc:45
 msgid "Compression"
@@ -1026,7 +877,14 @@
 msgid "Default song length:"
 msgstr "Стандартно времетраене за песен:"
 
-#: src/console/plugin.cc:42 src/modplug/plugin_main.cc:59
+#: src/console/plugin.cc:41 src/crossfade/crossfade.cc:56
+#: src/crossfade/crossfade.cc:62 src/lirc/lirc.cc:395 src/notify/notify.cc:113
+#: src/sid/xs_config.cc:85 src/sid/xs_config.cc:94 src/sid/xs_config.cc:103
+#: src/vumeter-qt/vumeter_qt.cc:39
+msgid "seconds"
+msgstr "секунди"
+
+#: src/console/plugin.cc:42 src/modplug/plugin_main.cc:58
 msgid "Resampling"
 msgstr "Преизчисляване"
 
@@ -1050,29 +908,41 @@
 msgid "Game Console Music Decoder"
 msgstr "Звуково разкодиране за игрална конзола"
 
-#: src/coreaudio/coreaudio.cc:50
+#: src/coreaudio/coreaudio.cc:53
 msgid "CoreAudio output"
 msgstr "CoreAudio изход"
 
-#: src/coreaudio/coreaudio.cc:131
+#: src/coreaudio/coreaudio.cc:155
 msgid ""
 "CoreAudio Output Plugin for Audacious\n"
 "Copyright 2014 William Pitcock\n"
+"Copyright 2017,18 René J.V. Bertin\n"
+" (original code and code adapted from\n"
+" Apple examples, (C) Apple 2013)\n"
 "\n"
 "Based on SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
 msgstr ""
-"Приставка за CoreAudio изход за Audacious\n"
-"Запазени права 2014 William Pitcock\n"
+"Базова добавка за аудио изход на Audacious\n"
+"Авторски права 2014 William Pitcock\n"
+"Авторски права 2017,18 René J.V. Bertin\n"
+"(оригинален код и код, адаптиран от\n"
+" Apple шаблони, (C) Apple 2013)\n"
 "\n"
-"Базирана на приставката за SDL изход за Audacious\n"
-"Запазени права 2010 John Lindgren"
+"Базирана на Изходна добавка за Audacious\n"
+"Авторски права 2010 John Lindgren"
 
-#: src/coreaudio/coreaudio.cc:143
+#: src/coreaudio/coreaudio.cc:171
 msgid "Use exclusive mode"
 msgstr "Използвай изключителен режим"
 
-#: src/crossfade/crossfade.cc:44
+#: src/coreaudio/coreaudio.cc:173
+msgid "Use bit perfect audio (adapt device sampling rate)"
+msgstr ""
+"Използване на битов перфектен звук (адаптиране честотата на дискретизация на "
+"устройството)"
+
+#: src/crossfade/crossfade.cc:47
 msgid ""
 "Crossfade Plugin for Audacious\n"
 "Copyright 2010-2014 John Lindgren"
@@ -1080,27 +950,43 @@
 "Приставка за Застъпване за Audacious\n"
 "Запазени права 2010-2014 John Lindgren"
 
-#: src/crossfade/crossfade.cc:48
+#: src/crossfade/crossfade.cc:51
 msgid "Crossfade"
 msgstr "Плавно преминаване"
 
-#: src/crossfade/crossfade.cc:49
+#: src/crossfade/crossfade.cc:52
 msgid "On automatic song change"
 msgstr "При автиматична смяна на песента"
 
-#: src/crossfade/crossfade.cc:51 src/crossfade/crossfade.cc:57
+#: src/crossfade/crossfade.cc:54 src/crossfade/crossfade.cc:60
 msgid "Overlap:"
 msgstr "Застъпване:"
 
-#: src/crossfade/crossfade.cc:55
+#: src/crossfade/crossfade.cc:58
 msgid "On seek or manual song change"
 msgstr "При превъртане или ръчна смяна на песен"
 
-#: src/crossfade/crossfade.cc:61
+#: src/crossfade/crossfade.cc:64
+msgid "No fade in"
+msgstr ""
+
+#: src/crossfade/crossfade.cc:66
+msgid "Use S-curve fade"
+msgstr ""
+
+#: src/crossfade/crossfade.cc:68
+msgid "S-curve steepness:"
+msgstr ""
+
+#: src/crossfade/crossfade.cc:70
+msgid "(higher is steeper)"
+msgstr ""
+
+#: src/crossfade/crossfade.cc:72
 msgid "Tip"
 msgstr "Подсказка"
 
-#: src/crossfade/crossfade.cc:62
+#: src/crossfade/crossfade.cc:73
 msgid ""
 "For better crossfading, enable\n"
 "the Silence Removal effect."
@@ -1108,29 +994,10 @@
 "За по-добро застъпване, активирайте\n"
 "ефектът Премахване на затишето."
 
-#: src/crossfade/crossfade.cc:72
+#: src/crossfade/crossfade.cc:83
 msgid "Crossfade"
 msgstr "Плавно преминаване"
 
-#: src/crossfade/crossfade.cc:161
-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.cc:168
-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/crystalizer/crystalizer.cc:31
 msgid "Crystalizer"
 msgstr "Кристализиране"
@@ -1143,60 +1010,61 @@
 msgid "Crystalizer"
 msgstr "Кристализатор"
 
-#: src/cue/cue.cc:37
+#: src/cue/cue.cc:42
 msgid "Cue Sheet Plugin"
 msgstr "Приставка за условности"
 
-#: src/delete-files/delete-files.cc:46 src/delete-files/delete-files.cc:146
+#: src/delete-files/delete-files.cc:53 src/delete-files/delete-files.cc:215
+#: src/delete-files/delete-files.cc:230
 msgid "Delete Files"
 msgstr "Изтриване на файлове"
 
-#: src/delete-files/delete-files.cc:75
+#: src/delete-files/delete-files.cc:120
+msgid "No files are selected."
+msgstr "Няма избрани файлове."
+
+#: src/delete-files/delete-files.cc:125
 #, c-format
-msgid "Error moving %s to trash: %s."
-msgstr "Грешка при преместването на %s в коша: %s."
+msgid "Do you want to move %s to the trash?"
+msgstr "Наистина ли искате да преместите %s в кошчето?"
 
-#: src/delete-files/delete-files.cc:86
+#: src/delete-files/delete-files.cc:126
 #, c-format
-msgid "Error deleting %s: %s."
-msgstr "Грешка при изтриването на %s: %s."
+msgid "Do you want to permanently delete %s?"
+msgstr "Наистина ли искате да изтриете завинаги %s?"
 
-#: src/delete-files/delete-files.cc:117
+#: src/delete-files/delete-files.cc:133
 #, c-format
-msgid "Error deleting %s: not a local file."
-msgstr "Грешка при изтриването на %s: не е местен файл."
+msgid "Do you want to move %d files to the trash?"
+msgstr "Наистина ли искате да преместите %d файла в кошчето? "
 
 #: src/delete-files/delete-files.cc:134
-msgid "Do you want to move the selected files to the trash?"
-msgstr "Искате ли да преместите избраните файлове в коша?"
+#, c-format
+msgid "Do you want to permanently delete %d files?"
+msgstr "Наистина ли искате да изтриете завинаги %d файла?"
 
-#: src/delete-files/delete-files.cc:135
-msgid "Move to Trash"
-msgstr "Преместване в Коша"
-
-#: src/delete-files/delete-files.cc:140
-msgid "Do you want to permanently delete the selected files?"
-msgstr "Искате ли окончателно да изтриете избраните файлове?"
+#: src/delete-files/delete-files.cc:146
+msgid "Move to trash"
+msgstr "Преместване в кошчето"
 
-#: src/delete-files/delete-files.cc:141 src/skins/preset-list.cc:411
-#: src/skins/preset-list.cc:427
+#: src/delete-files/delete-files.cc:146
 msgid "Delete"
 msgstr "Изтриване"
 
-#: src/delete-files/delete-files.cc:145 src/skins/preset-browser.cc:56
-#: src/skins/preset-list.cc:307 src/skins/ui_playlist.cc:221
+#: src/delete-files/delete-files.cc:213 src/delete-files/delete-files.cc:235
+#: src/skins-qt/search-select.cc:102 src/skins/search-select.cc:78
 msgid "Cancel"
 msgstr "Отказ"
 
-#: src/delete-files/delete-files.cc:166
+#: src/delete-files/delete-files.cc:267
 msgid "Delete Selected Files"
 msgstr "Изтриване на избраните файлове"
 
-#: src/delete-files/delete-files.cc:181
+#: src/delete-files/delete-files.cc:287
 msgid "Delete Method"
 msgstr "Начин на изтриване"
 
-#: src/delete-files/delete-files.cc:182
+#: src/delete-files/delete-files.cc:288
 msgid "Move to trash instead of deleting immediately"
 msgstr "Премести в коша, вместо незабавно изтриване"
 
@@ -1216,13 +1084,13 @@
 msgid "Echo"
 msgstr "Ехо"
 
-#: src/echo_plugin/echo.cc:22 src/modplug/plugin_main.cc:73
-#: src/modplug/plugin_main.cc:83
+#: src/echo_plugin/echo.cc:22 src/modplug/plugin_main.cc:72
+#: src/modplug/plugin_main.cc:82
 msgid "Delay:"
 msgstr "Забавяне:"
 
-#: src/echo_plugin/echo.cc:24 src/modplug/plugin_main.cc:73
-#: src/modplug/plugin_main.cc:83
+#: src/echo_plugin/echo.cc:24 src/modplug/plugin_main.cc:72
+#: src/modplug/plugin_main.cc:82 src/xsf/plugin.cc:445
 msgid "ms"
 msgstr "мс"
 
@@ -1230,7 +1098,7 @@
 msgid "Feedback:"
 msgstr "Отзиви:"
 
-#: src/echo_plugin/echo.cc:28 src/modplug/plugin_main.cc:87
+#: src/echo_plugin/echo.cc:28 src/modplug/plugin_main.cc:86
 msgid "Volume:"
 msgstr "Сила на звука:"
 
@@ -1238,11 +1106,11 @@
 msgid "Echo"
 msgstr "Ехо"
 
-#: src/ffaudio/ffaudio-core.cc:41
+#: src/ffaudio/ffaudio-core.cc:50
 msgid "FFmpeg Plugin"
 msgstr "Приставка за FFmpeg"
 
-#: src/ffaudio/ffaudio-core.cc:571
+#: src/ffaudio/ffaudio-core.cc:649
 msgid ""
 "Multi-format audio decoding plugin for Audacious using\n"
 "FFmpeg multimedia framework (http://www.ffmpeg.org/)\n"
@@ -1258,247 +1126,320 @@
 "William Pitcock <nenolod@nenolod.net>\n"
 "Matti Hämäläinen <ccr@tnsp.org>"
 
-#: src/filewriter/filewriter.cc:45
+#: src/filewriter/filewriter.cc:48
 msgid "FileWriter Plugin"
 msgstr "Приставка FileWriter"
 
-#: src/filewriter/filewriter.cc:386
+#: src/filewriter/filewriter.cc:316
+#, c-format
+msgid ""
+"Error opening %s:\n"
+"%s"
+msgstr ""
+"Грешка при отваряне на %s:\n"
+"%s"
+
+#: src/filewriter/filewriter.cc:358
+msgid ""
+"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"
+"според правата на 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.cc:385
 msgid "Output file format:"
 msgstr "Формат на изходния файл:"
 
-#: src/filewriter/filewriter.cc:403
-msgid "Configure"
-msgstr "Настройване"
-
-#: src/filewriter/filewriter.cc:413
+#: src/filewriter/filewriter.cc:389
 msgid "Save into original directory"
 msgstr "Запамети в оригиналната директория"
 
-#: src/filewriter/filewriter.cc:417
-msgid "Save into custom directory"
-msgstr "Запамети на избрано място"
-
-#: src/filewriter/filewriter.cc:427
-msgid "Output file folder:"
-msgstr "Папка на изходния файл:"
+#: src/filewriter/filewriter.cc:392
+msgid "Save into custom directory:"
+msgstr "Записване в потребителска директория:"
 
-#: src/filewriter/filewriter.cc:431
-msgid "Pick a folder"
-msgstr "Избор на папка"
-
-#: src/filewriter/filewriter.cc:444
+#: src/filewriter/filewriter.cc:400
 msgid "Generate file name from:"
 msgstr "Генерирай име на файл от:"
 
-#: src/filewriter/filewriter.cc:448
-msgid "Original file tag"
-msgstr "Етикет на оригиналния файл"
-
-#: src/filewriter/filewriter.cc:453
+#: src/filewriter/filewriter.cc:401
 msgid "Original file name"
 msgstr "Оригинално име на файл"
 
-#: src/filewriter/filewriter.cc:459
-msgid "Include original file name extension"
-msgstr "Включвай оригиналното разширение на файла"
+#: src/filewriter/filewriter.cc:404
+msgid "Original file name (no suffix)"
+msgstr "Оригинално име на файла (без наставка)"
 
-#: src/filewriter/filewriter.cc:468
+#: src/filewriter/filewriter.cc:407
+msgid "Original file tag"
+msgstr "Етикет на оригиналния файл"
+
+#: src/filewriter/filewriter.cc:411
 msgid "Prepend track number to file name"
 msgstr "Прикрепване на номера на записа към името на файла"
 
-#: src/filewriter/filewriter.cc:484
-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/mp3.cc:40 src/filewriter/mp3.cc:717
+#: src/filewriter/filewriter.cc:417 src/filewriter/filewriter.cc:449
 msgid "Auto"
 msgstr "Автоматично"
 
-#: src/filewriter/mp3.cc:40
+#: src/filewriter/filewriter.cc:418
+msgid "8000 Hz"
+msgstr "8000 Хц"
+
+#: src/filewriter/filewriter.cc:419
+msgid "11025 Hz"
+msgstr "11025 Хц"
+
+#: src/filewriter/filewriter.cc:420
+msgid "12000 Hz"
+msgstr "12000 Хц"
+
+#: src/filewriter/filewriter.cc:421
+msgid "16000 Hz"
+msgstr "16000 Хц"
+
+#: src/filewriter/filewriter.cc:422
+msgid "22050 Hz"
+msgstr "22050 Хц"
+
+#: src/filewriter/filewriter.cc:423
+msgid "24000 Hz"
+msgstr "24000 Хц"
+
+#: src/filewriter/filewriter.cc:424
+msgid "32000 Hz"
+msgstr "32000 Хц"
+
+#: src/filewriter/filewriter.cc:425 src/xsf/plugin.cc:430
+msgid "44100 Hz"
+msgstr "44100 Хц"
+
+#: src/filewriter/filewriter.cc:426 src/xsf/plugin.cc:431
+msgid "48000 Hz"
+msgstr "48000 Хц"
+
+#: src/filewriter/filewriter.cc:430
+msgid "8 kbit/s"
+msgstr "8 kbit/s"
+
+#: src/filewriter/filewriter.cc:431
+msgid "16 kbit/s"
+msgstr "16 kbit/s"
+
+#: src/filewriter/filewriter.cc:432
+msgid "32 kbit/s"
+msgstr "32 kbit/s"
+
+#: src/filewriter/filewriter.cc:433
+msgid "40 kbit/s"
+msgstr "40 kbit/s"
+
+#: src/filewriter/filewriter.cc:434
+msgid "48 kbit/s"
+msgstr "48 kbit/s"
+
+#: src/filewriter/filewriter.cc:435
+msgid "56 kbit/s"
+msgstr "56 kbit/s"
+
+#: src/filewriter/filewriter.cc:436
+msgid "64 kbit/s"
+msgstr "64 kbit/s"
+
+#: src/filewriter/filewriter.cc:437
+msgid "80 kbit/s"
+msgstr "80 kbit/s"
+
+#: src/filewriter/filewriter.cc:438
+msgid "96 kbit/s"
+msgstr "96 kbit/s"
+
+#: src/filewriter/filewriter.cc:439
+msgid "112 kbit/s"
+msgstr "112 kbit/s"
+
+#: src/filewriter/filewriter.cc:440
+msgid "128 kbit/s"
+msgstr "128 kbit/s"
+
+#: src/filewriter/filewriter.cc:441
+msgid "160 kbit/s"
+msgstr "160 kbit/s"
+
+#: src/filewriter/filewriter.cc:442
+msgid "192 kbit/s"
+msgstr "192 kbit/s"
+
+#: src/filewriter/filewriter.cc:443
+msgid "224 kbit/s"
+msgstr "224 kbit/s"
+
+#: src/filewriter/filewriter.cc:444
+msgid "256 kbit/s"
+msgstr "256 kbit/s"
+
+#: src/filewriter/filewriter.cc:445
+msgid "320 kbit/s"
+msgstr "320 kbit/s"
+
+#: src/filewriter/filewriter.cc:450
 msgid "Joint Stereo"
 msgstr "Общо Стерео"
 
-#: src/filewriter/mp3.cc:41 src/modplug/plugin_main.cc:58
-#: src/mpg123/mpg123.cc:248
+#: src/filewriter/filewriter.cc:451 src/modplug/plugin_main.cc:57
+#: src/mpg123/mpg123.cc:259
 msgid "Stereo"
 msgstr "Стерео"
 
-#: src/filewriter/mp3.cc:41 src/modplug/plugin_main.cc:57
-#: src/mpg123/mpg123.cc:248
+#: src/filewriter/filewriter.cc:452 src/modplug/plugin_main.cc:56
+#: src/mpg123/mpg123.cc:260
 msgid "Mono"
 msgstr "Моно"
 
-#: src/filewriter/mp3.cc:657
-msgid "MP3 Configuration"
-msgstr "MP3 настройки"
-
-#: src/filewriter/mp3.cc:658
-msgid "_OK"
-msgstr "_Добре"
+#: src/filewriter/filewriter.cc:456
+msgid "VBR"
+msgstr "Променлива побитова честота"
+
+#: src/filewriter/filewriter.cc:457
+msgid "ABR"
+msgstr "Средна побитова честота"
 
-#: src/filewriter/mp3.cc:681
-msgid "Algorithm Quality:"
+#: src/filewriter/filewriter.cc:478
+msgid "Algorithm quality:"
 msgstr "Алгоритъм за качество:"
 
-#: src/filewriter/mp3.cc:706
-msgid "Output Sample Rate:"
-msgstr "Изходна честота на дискретизация:"
-
-#: src/filewriter/mp3.cc:733
-msgid "(Hz)"
-msgstr "(Хц)"
-
-#: src/filewriter/mp3.cc:740
-msgid "Bitrate / Compression Ratio:"
-msgstr "Честота/Компресия:"
-
-#: src/filewriter/mp3.cc:764
-msgid "Bitrate (kbps):"
-msgstr "Честота за бит (кбвс):"
+#: src/filewriter/filewriter.cc:484
+msgid "Bitrate:"
+msgstr "Битрейт:"
 
-#: src/filewriter/mp3.cc:796
+#: src/filewriter/filewriter.cc:491
 msgid "Compression ratio:"
 msgstr "Честота на сгъстяване:"
 
-#: src/filewriter/mp3.cc:820
-msgid "Audio Mode:"
-msgstr "Режим на звука:"
-
-#: src/filewriter/mp3.cc:845
-msgid "Miscellaneous:"
-msgstr "Разни:"
+#: src/filewriter/filewriter.cc:498
+msgid "Audio mode:"
+msgstr "Звуков режим:"
 
-#: src/filewriter/mp3.cc:856
+#: src/filewriter/filewriter.cc:501
 msgid "Enforce strict ISO compliance"
 msgstr "Наложи придържане към ISO стандарт"
 
-#: src/filewriter/mp3.cc:867
+#: src/filewriter/filewriter.cc:503
 msgid "Error protection"
 msgstr "Грешна защита"
 
-#: src/filewriter/mp3.cc:879 src/filewriter/vorbis.cc:206
-msgid "Quality"
-msgstr "Качество"
-
-#: src/filewriter/mp3.cc:888
+#: src/filewriter/filewriter.cc:508
 msgid "Enable VBR/ABR"
 msgstr "Активиране VBR/ABR"
 
-#: src/filewriter/mp3.cc:898
+#: src/filewriter/filewriter.cc:510
 msgid "Type:"
 msgstr "Вид:"
 
-#: src/filewriter/mp3.cc:931
-msgid "VBR Options:"
-msgstr "VBR Опции:"
-
-#: src/filewriter/mp3.cc:947
-msgid "Minimum bitrate (kbps):"
-msgstr "Минимална честота за бит (кбвс):"
-
-#: src/filewriter/mp3.cc:973
-msgid "Maximum bitrate (kbps):"
-msgstr "Максимална честота за бит (кбвс):"
-
-#: src/filewriter/mp3.cc:995
-msgid "Strictly enforce minimum bitrate"
-msgstr "Придържане към минимална честота за бит"
-
-#: src/filewriter/mp3.cc:1007
-msgid "ABR Options:"
-msgstr "ABR Опции:"
-
-#: src/filewriter/mp3.cc:1017
-msgid "Average bitrate (kbps):"
-msgstr "Средна честота за бит (кбвс):"
+#: src/filewriter/filewriter.cc:514
+msgid "Minimum bitrate:"
+msgstr "Минимален битрейт:"
+
+#: src/filewriter/filewriter.cc:518
+msgid "Maximum bitrate:"
+msgstr "Максимален битрейт:"
+
+#: src/filewriter/filewriter.cc:522
+msgid "Average bitrate:"
+msgstr "Среден битрейт:"
 
-#: src/filewriter/mp3.cc:1044
+#: src/filewriter/filewriter.cc:526
 msgid "VBR quality level:"
 msgstr "Ниво на качеството на VBR:"
 
-#: src/filewriter/mp3.cc:1063
+#: src/filewriter/filewriter.cc:530
+msgid "Strictly enforce minimum bitrate"
+msgstr "Придържане към минимална честота за бит"
+
+#: src/filewriter/filewriter.cc:533
 msgid "Omit Xing VBR header"
 msgstr "Пропусни титула на Xing VBR"
 
-#: src/filewriter/mp3.cc:1076
-msgid "VBR/ABR"
-msgstr "VBR/ABR"
+#: src/filewriter/filewriter.cc:539
+msgid "Frame Headers"
+msgstr "Заглавни рамки"
 
-#: src/filewriter/mp3.cc:1085
-msgid "Frame Parameters:"
-msgstr "Стойности на рамката:"
-
-#: src/filewriter/mp3.cc:1097
+#: src/filewriter/filewriter.cc:540
 msgid "Mark as copyright"
 msgstr "Маркер „Защитено от копиране“"
 
-#: src/filewriter/mp3.cc:1108
+#: src/filewriter/filewriter.cc:542
 msgid "Mark as original"
 msgstr "Маркер „Оригинал“"
 
-#: src/filewriter/mp3.cc:1120
-msgid "ID3 Parameters:"
-msgstr "ID3 параметри:"
+#: src/filewriter/filewriter.cc:544
+msgid "ID3 Tags"
+msgstr "ID3 етикети"
 
-#: src/filewriter/mp3.cc:1131
+#: src/filewriter/filewriter.cc:545
 msgid "Force addition of version 2 tag"
 msgstr "Принудително добавяне на маркер от 2-ра версия"
 
-#: src/filewriter/mp3.cc:1141
+#: src/filewriter/filewriter.cc:547
 msgid "Only add v1 tag"
 msgstr "Добави само маркер 1-ва версия"
 
-#: src/filewriter/mp3.cc:1148
+#: src/filewriter/filewriter.cc:549
 msgid "Only add v2 tag"
 msgstr "Добави само маркер 2-ра версия"
 
-#: src/filewriter/mp3.cc:1169
+#: src/filewriter/filewriter.cc:554
+msgid "Quality"
+msgstr "Качество"
+
+#: src/filewriter/filewriter.cc:555
+msgid "VBR/ABR"
+msgstr "VBR/ABR"
+
+#: src/filewriter/filewriter.cc:556
 msgid "Tags"
 msgstr "Маркери"
 
-#: src/filewriter/vorbis.cc:196
-msgid "Vorbis Encoder Configuration"
-msgstr "Настройка на Vorbis кодиране"
-
-#: src/filewriter/vorbis.cc:219
-msgid "Quality level (0 - 10):"
-msgstr "Ниво на качеството (0-10):"
+#: src/filewriter/filewriter.cc:566
+msgid "Quality (0-1):"
+msgstr "Качество (0-1):"
+
+#: src/filewriter/filewriter.cc:573 src/skins-qt/skins_cfg.cc:307
+#: src/skins/skins_cfg.cc:289
+msgid "General"
+msgstr "Общи"
 
-#: src/flacng/flacng.h:35
+#: src/flac/flacng.h:36
 msgid "FLAC Decoder"
 msgstr "Разкодиране на FLAC"
 
-#: src/flacng/metadata.cc:351 src/wavpack/wavpack.cc:209
+#: src/flac/metadata.cc:296 src/wavpack/wavpack.cc:215
 msgid "lossless"
 msgstr "по-малко загуби"
 
-#: src/flacng/plugin.cc:169
+#: src/flac/plugin.cc:214
 msgid ""
 "Original code by\n"
 "Ralf Ertzinger <ralf@skytale.net>\n"
@@ -1522,15 +1463,15 @@
 msgid "GIO Plugin"
 msgstr "Приставка GIO"
 
-#: src/gio/gio.cc:153
+#: src/gio/gio.cc:152
 msgid "Read-and-append mode not supported"
 msgstr "Не се поддържа режим на четене и прикрепяне"
 
-#: src/gio/gio.cc:166
+#: src/gio/gio.cc:165
 msgid "Invalid open mode"
 msgstr "Неправилен режим на отваряне"
 
-#: src/gl-spectrum/gl-spectrum.cc:51
+#: src/glspectrum/gl-spectrum.cc:52
 msgid ""
 "OpenGL Spectrum Analyzer for Audacious\n"
 "Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
@@ -1550,636 +1491,757 @@
 "\n"
 "Лиценз: GPLv2+"
 
-#: src/gl-spectrum/gl-spectrum.cc:62
+#: src/glspectrum/gl-spectrum.cc:63 src/qtglspectrum/gl-spectrum.cc:53
 msgid "OpenGL Spectrum Analyzer"
 msgstr "OpenGL осцилоскоп"
 
-#: src/gl-spectrum-qt/gl-spectrum.cc:41
-msgid ""
-"OpenGL Spectrum Analyzer for Audacious\n"
-"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
-"Copyright 2014 William Pitcock\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, и Carlo Bramini\n"
-"Запазени права 2014 William Pitcock\n"
-"\n"
-"На основата на приставката за XMMS:\n"
-"Запазени права 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas "
-"Nilsson, и 4Front Technologies\n"
-"\n"
-"Лиценз: GPLv2+"
-
-#: src/gl-spectrum-qt/gl-spectrum.cc:53
-msgid "OpenGL Spectrum Analyzer (Qt)"
-msgstr "OpenGL анализатор на спектъра (Qt)"
-
-#: src/gnomeshortcuts/gnomeshortcuts.cc:38
-msgid "GNOME Shortcuts"
-msgstr "Бързи клавиши за GNOME"
-
-#: src/gnomeshortcuts/gnomeshortcuts.cc:54
-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 Sascha Hlusiak <contact@saschahlusiak.de>"
-
-#: src/gtkui/columns.cc:35
-msgid "Entry number"
-msgstr "Номер на запис"
-
-#: src/gtkui/columns.cc:36 src/playlist-manager/playlist-manager.cc:225
-#: src/qtui/playlist_model.cc:123
+#: src/gtkui/columns.cc:36 src/moonstone/playlist_model.cc:38
+#: src/qtui/playlist_model.cc:33
+msgid "Entry Number"
+msgstr "Номер по ред"
+
+#: src/gtkui/columns.cc:37 src/moonstone/playlist_model.cc:38
+#: src/moonstone/playlist_selection.cc:64
+#: src/playlist-manager/playlist-manager.cc:200
+#: src/playlist-manager-qt/playlist-manager-qt.cc:188
+#: src/qtui/playlist_model.cc:33 src/streamtuner/icecast-model.cc:120
+#: src/streamtuner/ihr-model.cc:159 src/streamtuner/shoutcast-model.cc:122
 msgid "Title"
 msgstr "Заглавие"
 
-#: src/gtkui/columns.cc:37 src/qtui/playlist_model.cc:125
+#: src/gtkui/columns.cc:38 src/moonstone/playlist_model.cc:39
+#: src/qtui/playlist_model.cc:33
 msgid "Artist"
 msgstr "Изпълнител"
 
-#: src/gtkui/columns.cc:38
+#: src/gtkui/columns.cc:39 src/moonstone/playlist_model.cc:39
+#: src/qtui/playlist_model.cc:33
 msgid "Year"
 msgstr "Година"
 
-#: src/gtkui/columns.cc:39 src/qtui/playlist_model.cc:127
+#: src/gtkui/columns.cc:40 src/moonstone/playlist_model.cc:39
+#: src/qtui/playlist_model.cc:34
 msgid "Album"
 msgstr "Албум"
 
-#: src/gtkui/columns.cc:40
-msgid "Album artist"
-msgstr "Изпълнител на албум"
+#: src/gtkui/columns.cc:41 src/moonstone/playlist_model.cc:40
+#: src/qtui/playlist_model.cc:34
+msgid "Album Artist"
+msgstr " Изпълнител на Албум"
 
-#: src/gtkui/columns.cc:41
+#: src/gtkui/columns.cc:42 src/moonstone/playlist_model.cc:40
+#: src/qtui/playlist_model.cc:34
 msgid "Track"
 msgstr "Запис"
 
-#: src/gtkui/columns.cc:42
+#: src/gtkui/columns.cc:43 src/moonstone/playlist_model.cc:40
+#: src/qtui/playlist_model.cc:34 src/streamtuner/icecast-model.cc:123
+#: src/streamtuner/shoutcast-model.cc:125
+#: src/streamtuner/shoutcast-model.cc:236
 msgid "Genre"
 msgstr "Жанр"
 
-#: src/gtkui/columns.cc:43
-msgid "Queue position"
+#: src/gtkui/columns.cc:44 src/moonstone/playlist_model.cc:41
+#: src/qtui/playlist_model.cc:35
+msgid "Queue Position"
 msgstr "Позиция на опашката"
 
-#: src/gtkui/columns.cc:44
+#: src/gtkui/columns.cc:45 src/moonstone/playlist_model.cc:41
+#: src/qtui/playlist_model.cc:35
 msgid "Length"
 msgstr "Времетраене"
 
-#: src/gtkui/columns.cc:45
-msgid "File path"
+#: src/gtkui/columns.cc:46 src/moonstone/playlist_model.cc:41
+#: src/qtui/playlist_model.cc:35
+msgid "File Path"
 msgstr "Път до файла"
 
-#: src/gtkui/columns.cc:47
-msgid "Custom title"
-msgstr "Избрано заглавие"
+#: src/gtkui/columns.cc:47 src/moonstone/playlist_model.cc:42
+#: src/qtui/playlist_model.cc:35
+msgid "File Name"
+msgstr "Име на файла"
 
-#: src/gtkui/columns.cc:48
+#: src/gtkui/columns.cc:48 src/moonstone/playlist_model.cc:42
+#: src/qtui/playlist_model.cc:36
+msgid "Custom Title"
+msgstr "Заглавие по подразбиране"
+
+#: src/gtkui/columns.cc:49 src/moonstone/playlist_model.cc:42
+#: src/qtui/playlist_model.cc:36 src/streamtuner/icecast-model.cc:129
+#: src/streamtuner/shoutcast-model.cc:134
 msgid "Bitrate"
 msgstr "Честота за бит"
 
-#: src/gtkui/columns.cc:308
+#: src/gtkui/columns.cc:50 src/moonstone/playlist_model.cc:43
+#: src/qtui/playlist_model.cc:36
+msgid "Comment"
+msgstr "Коментар"
+
+#: src/gtkui/columns.cc:51 src/qtui/playlist_model.cc:36
+msgid "Publisher"
+msgstr ""
+
+#: src/gtkui/columns.cc:52 src/qtui/playlist_model.cc:37
+msgid "Catalog Number"
+msgstr ""
+
+#: src/gtkui/columns.cc:53 src/moonstone/playlist_model.cc:43
+#: src/qtui/playlist_model.cc:37
+msgid "Disc"
+msgstr ""
+
+#: src/gtkui/columns.cc:325
 msgid "Available columns"
 msgstr "Налични колони"
 
-#: src/gtkui/columns.cc:334
+#: src/gtkui/columns.cc:351
 msgid "Displayed columns"
 msgstr "Показване колони"
 
-#: src/gtkui/layout.cc:72 src/search-tool/search-tool.cc:40
+#: src/gtkui/layout.cc:74 src/search-tool-qt/search-tool-qt.cc:58
+#: src/search-tool/search-tool.cc:49
 msgid "Search Tool"
 msgstr "Инструмент за търсене"
 
-#: src/gtkui/layout.cc:167
+#: src/gtkui/layout.cc:170
 msgid "Dock at Left"
 msgstr "Панел вляво"
 
-#: src/gtkui/layout.cc:167
+#: src/gtkui/layout.cc:170
 msgid "Dock at Right"
 msgstr "Панел вдясно"
 
-#: src/gtkui/layout.cc:168
+#: src/gtkui/layout.cc:171
 msgid "Dock at Top"
 msgstr "Панел отгоре"
 
-#: src/gtkui/layout.cc:168
+#: src/gtkui/layout.cc:171
 msgid "Dock at Bottom"
 msgstr "Панел отдолу"
 
-#: src/gtkui/layout.cc:168
+#: src/gtkui/layout.cc:171
 msgid "Undock"
 msgstr "Без панел"
 
-#: src/gtkui/layout.cc:168 src/ladspa/plugin.cc:531
+#: src/gtkui/layout.cc:171 src/ladspa/plugin.cc:540
 msgid "Disable"
 msgstr "Деактивиране"
 
-#: src/gtkui/menus.cc:126 src/qtui/main_window_actions.cc:93
-#: src/statusicon/statusicon.cc:276
+#: src/gtkui/menus.cc:79 src/qtui/menus.cc:107
+#: src/statusicon-qt/statusicon.cc:115 src/statusicon/statusicon.cc:286
 msgid "_Open Files ..."
 msgstr "_Отваряне на файлове..."
 
-#: src/gtkui/menus.cc:127
+#: src/gtkui/menus.cc:80 src/qtui/menus.cc:111
 msgid "Open _URL ..."
 msgstr "От_варяне на интернет адрес..."
 
-#: src/gtkui/menus.cc:128 src/qtui/main_window_actions.cc:95
+#: src/gtkui/menus.cc:81 src/qtui/menus.cc:113
 msgid "_Add Files ..."
 msgstr "Доба_вяне на файлове..."
 
-#: src/gtkui/menus.cc:129
+#: src/gtkui/menus.cc:82 src/qtui/menus.cc:118
 msgid "Add U_RL ..."
 msgstr "_Добавяне на интернет адрес..."
 
-#: src/gtkui/menus.cc:131
+#: src/gtkui/menus.cc:84 src/qtui/menus.cc:120
 msgid "Search _Library"
 msgstr "_Библиотека за търсене"
 
-#: src/gtkui/menus.cc:133 src/qtui/main_window_actions.cc:98
+#: src/gtkui/menus.cc:86 src/qtui/menus.cc:123
 msgid "A_bout ..."
 msgstr "От_носно..."
 
-#: src/gtkui/menus.cc:134 src/qtui/main_window_actions.cc:99
+#: src/gtkui/menus.cc:87 src/qtui/menus.cc:125
 msgid "_Settings ..."
 msgstr "_Настройки..."
 
-#: src/gtkui/menus.cc:135 src/qtui/main_window_actions.cc:103
-#: src/statusicon/statusicon.cc:284
+#: src/gtkui/menus.cc:88 src/qtui/menus.cc:131
+#: src/statusicon-qt/statusicon.cc:117 src/statusicon/statusicon.cc:288
 msgid "_Quit"
 msgstr "_Изход"
 
-#: src/gtkui/menus.cc:139 src/gtkui/menus.cc:262
-#: src/qtui/main_window_actions.cc:107 src/search-tool/search-tool.cc:641
-#: src/statusicon/statusicon.cc:278
+#: src/gtkui/menus.cc:92 src/gtkui/menus.cc:226
+#: src/moonstone/playlist_tabs.cc:306 src/qtui/menus.cc:135
+#: src/qtui/playlist_tabs.cc:331 src/search-tool-qt/search-tool-qt.cc:499
+#: src/search-tool/search-tool.cc:339 src/statusicon-qt/statusicon.cc:109
+#: src/statusicon/statusicon.cc:280
 msgid "_Play"
 msgstr "Въ_зпроизвеждане"
 
-#: src/gtkui/menus.cc:140 src/qtui/main_window_actions.cc:108
-#: src/statusicon/statusicon.cc:279
+#: src/gtkui/menus.cc:93 src/qtui/menus.cc:137
+#: src/statusicon-qt/statusicon.cc:110 src/statusicon/statusicon.cc:281
 msgid "Paus_e"
 msgstr "В_ременно спиране"
 
-#: src/gtkui/menus.cc:141 src/qtui/main_window_actions.cc:109
-#: src/statusicon/statusicon.cc:280
+#: src/gtkui/menus.cc:94 src/qtui/menus.cc:139
+#: src/statusicon-qt/statusicon.cc:111 src/statusicon/statusicon.cc:282
 msgid "_Stop"
 msgstr "_Спиране"
 
-#: src/gtkui/menus.cc:142 src/qtui/main_window_actions.cc:110
-#: src/statusicon/statusicon.cc:277
+#: src/gtkui/menus.cc:95 src/qtui/menus.cc:141
+#: src/statusicon-qt/statusicon.cc:112 src/statusicon/statusicon.cc:283
 msgid "Pre_vious"
 msgstr "_Предишен"
 
-#: src/gtkui/menus.cc:143 src/qtui/main_window_actions.cc:111
-#: src/statusicon/statusicon.cc:281
+#: src/gtkui/menus.cc:96 src/qtui/menus.cc:143
+#: src/statusicon-qt/statusicon.cc:113 src/statusicon/statusicon.cc:284
 msgid "_Next"
 msgstr "_Следващ"
 
-#: src/gtkui/menus.cc:145 src/qtui/main_window_actions.cc:113
+#: src/gtkui/menus.cc:97 src/qtui/menus.cc:145 src/skins/menus.cc:114
+#: src/skins-qt/menus.cc:105
+msgid "Previous Album"
+msgstr "Предишен Албум"
+
+#: src/gtkui/menus.cc:98 src/qtui/menus.cc:146 src/skins/menus.cc:115
+#: src/skins-qt/menus.cc:106
+msgid "Next Album"
+msgstr "Следващ Албум"
+
+#: src/gtkui/menus.cc:100 src/qtui/menus.cc:148
 msgid "_Repeat"
 msgstr "Повт_орение"
 
-#: src/gtkui/menus.cc:146 src/qtui/main_window_actions.cc:114
+#: src/gtkui/menus.cc:101 src/qtui/menus.cc:150
 msgid "S_huffle"
 msgstr "Разбърка_но"
 
-#: src/gtkui/menus.cc:147 src/qtui/main_window_actions.cc:115
+#: src/gtkui/menus.cc:102 src/qtui/menus.cc:152
+msgid "Shuffle by Albu_m"
+msgstr "Разбъркване по _Албум"
+
+#: src/gtkui/menus.cc:103 src/qtui/menus.cc:155
 msgid "N_o Playlist Advance"
 msgstr "_Без прескачане към следващо изпълнение"
 
-#: src/gtkui/menus.cc:148 src/qtui/main_window_actions.cc:116
+#: src/gtkui/menus.cc:104 src/qtui/menus.cc:157
 msgid "Stop A_fter This Song"
 msgstr "Спри с_лед тази песен"
 
-#: src/gtkui/menus.cc:150 src/gtkui/menus.cc:247
-#: src/qtui/main_window_actions.cc:118
+#: src/gtkui/menus.cc:106 src/gtkui/menus.cc:210 src/qtui/menus.cc:162
+#: src/qtui/menus.cc:294
 msgid "Song _Info ..."
 msgstr "_Информация за песен..."
 
-#: src/gtkui/menus.cc:151
+#: src/gtkui/menus.cc:107
 msgid "Jump to _Time ..."
 msgstr "Пре_скачане до време..."
 
-#: src/gtkui/menus.cc:152
+#: src/gtkui/menus.cc:108
 msgid "_Jump to Song ..."
 msgstr "Прескачане до п_есен..."
 
-#: src/gtkui/menus.cc:154
+#: src/gtkui/menus.cc:110 src/qtui/menus.cc:165
 msgid "Set Repeat Point _A"
 msgstr "Начална точка н_а повторение"
 
-#: src/gtkui/menus.cc:155
+#: src/gtkui/menus.cc:111 src/qtui/menus.cc:167
 msgid "Set Repeat Point _B"
 msgstr "Крайна точка на повторе_ниe"
 
-#: src/gtkui/menus.cc:156
+#: src/gtkui/menus.cc:112 src/qtui/menus.cc:169
 msgid "_Clear Repeat Points"
 msgstr "Из_чистване на точките на повторение"
 
-#: src/gtkui/menus.cc:160 src/gtkui/menus.cc:167 src/gtkui/menus.cc:183
-#: src/qtui/main_window_actions.cc:122 src/qtui/main_window_actions.cc:129
-#: src/qtui/main_window_actions.cc:145
+#: src/gtkui/menus.cc:116 src/gtkui/menus.cc:123 src/gtkui/menus.cc:141
+#: src/qtui/menus.cc:173 src/qtui/menus.cc:180 src/qtui/menus.cc:198
 msgid "By _Title"
 msgstr "По _заглавие"
 
-#: src/gtkui/menus.cc:161 src/qtui/main_window_actions.cc:123
+#: src/gtkui/menus.cc:117 src/qtui/menus.cc:174
 msgid "By _File Name"
 msgstr "По _име на файл"
 
-#: src/gtkui/menus.cc:162 src/qtui/main_window_actions.cc:124
+#: src/gtkui/menus.cc:118 src/qtui/menus.cc:175
 msgid "By File _Path"
 msgstr "По _път до файла"
 
-#: src/gtkui/menus.cc:166 src/gtkui/menus.cc:182
-#: src/qtui/main_window_actions.cc:128 src/qtui/main_window_actions.cc:144
+#: src/gtkui/menus.cc:122 src/gtkui/menus.cc:140 src/qtui/menus.cc:179
+#: src/qtui/menus.cc:197
 msgid "By Track _Number"
 msgstr "По _номер на запис"
 
-#: src/gtkui/menus.cc:168 src/gtkui/menus.cc:184
-#: src/qtui/main_window_actions.cc:130 src/qtui/main_window_actions.cc:146
+#: src/gtkui/menus.cc:124 src/gtkui/menus.cc:142 src/qtui/menus.cc:181
+#: src/qtui/menus.cc:199
 msgid "By _Artist"
 msgstr "По _изпълнител"
 
-#: src/gtkui/menus.cc:169 src/gtkui/menus.cc:185
-#: src/qtui/main_window_actions.cc:131 src/qtui/main_window_actions.cc:147
+#: src/gtkui/menus.cc:125 src/gtkui/menus.cc:143 src/qtui/menus.cc:182
+#: src/qtui/menus.cc:200
 msgid "By Al_bum"
 msgstr "По ал_бум"
 
-#: src/gtkui/menus.cc:170 src/gtkui/menus.cc:186
-#: src/qtui/main_window_actions.cc:132 src/qtui/main_window_actions.cc:148
+#: src/gtkui/menus.cc:126 src/gtkui/menus.cc:144 src/qtui/menus.cc:183
+#: src/qtui/menus.cc:201
 msgid "By Albu_m Artist"
 msgstr "По и_зпълнител на Албум"
 
-#: src/gtkui/menus.cc:171 src/gtkui/menus.cc:187
-#: src/qtui/main_window_actions.cc:133 src/qtui/main_window_actions.cc:149
+#: src/gtkui/menus.cc:127 src/gtkui/menus.cc:145 src/qtui/menus.cc:184
+#: src/qtui/menus.cc:202
 msgid "By Release _Date"
 msgstr "По _дата на издаване"
 
-#: src/gtkui/menus.cc:172 src/gtkui/menus.cc:188
-#: src/qtui/main_window_actions.cc:134 src/qtui/main_window_actions.cc:150
+#: src/gtkui/menus.cc:128 src/gtkui/menus.cc:146 src/qtui/menus.cc:185
+#: src/qtui/menus.cc:203
 msgid "By _Genre"
 msgstr "По _жанр"
 
-#: src/gtkui/menus.cc:173 src/gtkui/menus.cc:189
-#: src/qtui/main_window_actions.cc:135 src/qtui/main_window_actions.cc:151
+#: src/gtkui/menus.cc:129 src/gtkui/menus.cc:147 src/qtui/menus.cc:186
+#: src/qtui/menus.cc:204
 msgid "By _Length"
 msgstr "По _времетраене"
 
-#: src/gtkui/menus.cc:174 src/gtkui/menus.cc:190
-#: src/qtui/main_window_actions.cc:136 src/qtui/main_window_actions.cc:152
+#: src/gtkui/menus.cc:130 src/gtkui/menus.cc:148 src/qtui/menus.cc:187
+#: src/qtui/menus.cc:205
 msgid "By _File Path"
 msgstr "По _път до файла"
 
-#: src/gtkui/menus.cc:175 src/gtkui/menus.cc:191
-#: src/qtui/main_window_actions.cc:137 src/qtui/main_window_actions.cc:153
+#: src/gtkui/menus.cc:131 src/gtkui/menus.cc:149 src/qtui/menus.cc:188
+#: src/qtui/menus.cc:206
 msgid "By _Custom Title"
 msgstr "По избрано з_аглавие"
 
-#: src/gtkui/menus.cc:177 src/gtkui/menus.cc:193
-#: src/qtui/main_window_actions.cc:139 src/qtui/main_window_actions.cc:155
+#: src/gtkui/menus.cc:132 src/gtkui/menus.cc:150 src/qtui/menus.cc:189
+#: src/qtui/menus.cc:207
+msgid "By C_omment"
+msgstr "По _коментар"
+
+#: src/gtkui/menus.cc:133 src/gtkui/menus.cc:151 src/qtui/menus.cc:190
+#: src/qtui/menus.cc:208
+msgid "By D_isc Number"
+msgstr ""
+
+#: src/gtkui/menus.cc:135 src/gtkui/menus.cc:153 src/qtui/menus.cc:192
+#: src/qtui/menus.cc:210
 msgid "R_everse Order"
 msgstr "Об_ръщане на подредбата"
 
-#: src/gtkui/menus.cc:178 src/gtkui/menus.cc:194
-#: src/qtui/main_window_actions.cc:140 src/qtui/main_window_actions.cc:156
+#: src/gtkui/menus.cc:136 src/gtkui/menus.cc:154 src/qtui/menus.cc:194
+#: src/qtui/menus.cc:212
 msgid "_Random Order"
 msgstr "Сл_учаен ред"
 
-#: src/gtkui/menus.cc:198 src/qtui/main_window_actions.cc:160
+#: src/gtkui/menus.cc:158 src/qtui/menus.cc:216
 msgid "_Play/Resume"
 msgstr "_Възпроизвеждане/Възобновяване"
 
-#: src/gtkui/menus.cc:199 src/gtkui/menus.cc:251
-#: src/qtui/main_window_actions.cc:161
+#: src/gtkui/menus.cc:159 src/qtui/menus.cc:218
 msgid "_Refresh"
 msgstr "_Опресняване"
 
-#: src/gtkui/menus.cc:201 src/qtui/main_window_actions.cc:163
+#: src/gtkui/menus.cc:161 src/qtui/menus.cc:222
 msgid "_Sort"
 msgstr "_Сортиране"
 
-#: src/gtkui/menus.cc:202 src/qtui/main_window_actions.cc:164
+#: src/gtkui/menus.cc:162 src/qtui/menus.cc:223
 msgid "Sort Se_lected"
 msgstr "По_дреждане на избраните"
 
-#: src/gtkui/menus.cc:203 src/qtui/main_window_actions.cc:165
+#: src/gtkui/menus.cc:163 src/qtui/menus.cc:225
 msgid "Remove _Duplicates"
 msgstr "Премахване на по_втарящи се"
 
-#: src/gtkui/menus.cc:204 src/qtui/main_window_actions.cc:166
+#: src/gtkui/menus.cc:164 src/qtui/menus.cc:226
 msgid "Remove _Unavailable Files"
 msgstr "Премахване на _липсващите файлове"
 
-#: src/gtkui/menus.cc:206 src/playlist-manager/playlist-manager.cc:244
-#: src/qtui/main_window_actions.cc:168
+#: src/gtkui/menus.cc:166 src/playlist-manager/playlist-manager.cc:219
+#: src/playlist-manager-qt/playlist-manager-qt.cc:348 src/qtui/menus.cc:229
 msgid "_New"
 msgstr "_Нов"
 
-#: src/gtkui/menus.cc:207
+#: src/gtkui/menus.cc:167 src/qtui/menus.cc:230
 msgid "Ren_ame ..."
 msgstr "_Преименуване..."
 
-#: src/gtkui/menus.cc:208 src/gtkui/menus.cc:264
-#: src/qtui/main_window_actions.cc:170
+#: src/gtkui/menus.cc:168 src/gtkui/menus.cc:228
+#: src/moonstone/playlist_tabs.cc:311 src/qtui/menus.cc:231
+#: src/qtui/playlist_tabs.cc:336
 msgid "Remo_ve"
 msgstr "Премах_ване"
 
-#: src/gtkui/menus.cc:210
+#: src/gtkui/menus.cc:170 src/qtui/menus.cc:233
 msgid "_Import ..."
 msgstr "_Внасяне..."
 
-#: src/gtkui/menus.cc:211
+#: src/gtkui/menus.cc:171 src/qtui/menus.cc:234
 msgid "_Export ..."
 msgstr "_Изнасяне..."
 
-#: src/gtkui/menus.cc:213
+#: src/gtkui/menus.cc:173 src/qtui/menus.cc:237
 msgid "Playlist _Manager ..."
 msgstr "_Управление на списъка..."
 
-#: src/gtkui/menus.cc:214 src/qtui/main_window_actions.cc:176
+#: src/gtkui/menus.cc:174 src/qtui/menus.cc:239
 msgid "_Queue Manager ..."
 msgstr "_Управление на опашката..."
 
-#: src/gtkui/menus.cc:218 src/qtui/main_window_actions.cc:180
+#: src/gtkui/menus.cc:178 src/qtui/menus.cc:243
 msgid "Volume _Up"
 msgstr "Увеличаване на _звука"
 
-#: src/gtkui/menus.cc:219 src/qtui/main_window_actions.cc:181
+#: src/gtkui/menus.cc:179 src/qtui/menus.cc:245
 msgid "Volume _Down"
 msgstr "Намаляване на з_вука"
 
-#: src/gtkui/menus.cc:221 src/qtui/main_window_actions.cc:183
-msgid "_Equalizer"
-msgstr "_Тонкоректор"
+#: src/gtkui/menus.cc:181 src/qtui/menus.cc:249
+msgid "_Equalizer ..."
+msgstr "_Тонкоректор..."
 
-#: src/gtkui/menus.cc:223 src/qtui/main_window_actions.cc:185
+#: src/gtkui/menus.cc:182 src/qtui/menus.cc:251
 msgid "E_ffects ..."
 msgstr "Е_фекти..."
 
-#: src/gtkui/menus.cc:227
+#: src/gtkui/menus.cc:184
+msgid "_Record Stream"
+msgstr "_Запис на поток"
+
+#: src/gtkui/menus.cc:185
+msgid "Audio _Settings ..."
+msgstr "Настройки на _звук..."
+
+#: src/gtkui/menus.cc:189 src/qtui/menus.cc:260
 msgid "Show _Menu Bar"
 msgstr "Показване на панел с _меню"
 
-#: src/gtkui/menus.cc:228
+#: src/gtkui/menus.cc:190 src/qtui/menus.cc:262
 msgid "Show I_nfo Bar"
 msgstr "Показване на лента с _информация"
 
-#: src/gtkui/menus.cc:229
+#: src/gtkui/menus.cc:191 src/qtui/menus.cc:264
+msgid "Show Info Bar _Album Art"
+msgstr "Показване на информационна лента _Обложка на албум"
+
+#: src/gtkui/menus.cc:192 src/qtui/menus.cc:266
 msgid "Show Info Bar Vis_ualization"
 msgstr "Показване на представяне в стълба с информация"
 
-#: src/gtkui/menus.cc:230
+#: src/gtkui/menus.cc:193 src/qtui/menus.cc:268
 msgid "Show _Status Bar"
 msgstr "Показване на лента на _състоянието"
 
-#: src/gtkui/menus.cc:232
+#: src/gtkui/menus.cc:195 src/qtui/menus.cc:272
 msgid "Show _Remaining Time"
 msgstr "Пока_жи оставащо време"
 
-#: src/gtkui/menus.cc:234
+#: src/gtkui/menus.cc:197 src/qtui/menus.cc:276 src/skins/menus.cc:157
+#: src/skins-qt/menus.cc:152
 msgid "_Visualizations ..."
 msgstr "Виз_уализации..."
 
-#: src/gtkui/menus.cc:238 src/qtui/main_window_actions.cc:189
+#: src/gtkui/menus.cc:201 src/qtui/menus.cc:280
 msgid "_File"
 msgstr "_Файл"
 
-#: src/gtkui/menus.cc:239 src/qtui/main_window_actions.cc:190
+#: src/gtkui/menus.cc:202 src/qtui/menus.cc:281
 msgid "_Playback"
 msgstr "Въ_зпроизвеждане"
 
-#: src/gtkui/menus.cc:240 src/qtui/main_window_actions.cc:191
+#: src/gtkui/menus.cc:203 src/qtui/menus.cc:282
 msgid "P_laylist"
 msgstr "_Списък"
 
-#: src/gtkui/menus.cc:241 src/gtkui/menus.cc:258
-#: src/qtui/main_window_actions.cc:192
+#: src/gtkui/menus.cc:204 src/gtkui/menus.cc:222 src/qtui/menus.cc:283
+#: src/qtui/menus.cc:312
 msgid "_Services"
 msgstr "_Услуги"
 
-#: src/gtkui/menus.cc:242 src/qtui/main_window_actions.cc:193
+#: src/gtkui/menus.cc:205 src/qtui/menus.cc:284
 msgid "_Output"
 msgstr "Из_ходящ поток"
 
-#: src/gtkui/menus.cc:243
+#: src/gtkui/menus.cc:206 src/qtui/menus.cc:285
 msgid "_View"
 msgstr "Из_глед"
 
-#: src/gtkui/menus.cc:248
+#: src/gtkui/menus.cc:211 src/qtui/menus.cc:296
 msgid "_Queue/Unqueue"
 msgstr "_Промяна на състоянието в опашката"
 
-#: src/gtkui/menus.cc:250
+#: src/gtkui/menus.cc:213 src/qtui/menus.cc:299
 msgid "_Open Containing Folder"
 msgstr "_Отвори папката със съдържанието"
 
-#: src/gtkui/menus.cc:253
+#: src/gtkui/menus.cc:214 src/qtui/menus.cc:301
+msgid "_Refresh Selected"
+msgstr "_Опресни избраното"
+
+#: src/gtkui/menus.cc:216 src/qtui/menus.cc:304
 msgid "Cu_t"
 msgstr "О_трязване"
 
-#: src/gtkui/menus.cc:254
+#: src/gtkui/menus.cc:217 src/qtui/menus.cc:305
 msgid "_Copy"
 msgstr "_Копиране"
 
-#: src/gtkui/menus.cc:255
+#: src/gtkui/menus.cc:218 src/qtui/menus.cc:306
 msgid "_Paste"
 msgstr "По_ставяне"
 
-#: src/gtkui/menus.cc:256
+#: src/gtkui/menus.cc:219 src/qtui/menus.cc:307
+msgid "Paste at _End"
+msgstr "Постави в_края"
+
+#: src/gtkui/menus.cc:220 src/qtui/menus.cc:309
 msgid "Select _All"
 msgstr "Избор на _всички"
 
-#: src/gtkui/menus.cc:263
+#: src/gtkui/menus.cc:227 src/moonstone/playlist_tabs.cc:309
+#: src/qtui/playlist_tabs.cc:334
 msgid "_Rename ..."
 msgstr "П_реименуване..."
 
-#: src/gtkui/settings.cc:35
+#: src/gtkui/settings.cc:35 src/qtui/settings.cc:59
+msgid "Always"
+msgstr "Винаги"
+
+#: src/gtkui/settings.cc:36 src/qtui/settings.cc:60
+msgid "Auto-hide"
+msgstr "Автоматично скриване"
+
+#: src/gtkui/settings.cc:37 src/qtui/settings.cc:61
+msgid "Never"
+msgstr "Никога"
+
+#: src/gtkui/settings.cc:41 src/qtui/settings.cc:64
 msgid "Playlist Tabs"
 msgstr "Подпрозорци в списъка"
 
-#: src/gtkui/settings.cc:36
-msgid "Always show tabs"
-msgstr "Винаги да се показват подпрозорците"
+#: src/gtkui/settings.cc:42 src/qtui/settings.cc:65
+msgid "Show playlist tabs:"
+msgstr "Показване на раздели на плейлист:"
 
-#: src/gtkui/settings.cc:38
+#: src/gtkui/settings.cc:45 src/qtui/settings.cc:69
 msgid "Show entry counts"
 msgstr "Показване на брояч на записите"
 
-#: src/gtkui/settings.cc:40
+#: src/gtkui/settings.cc:47 src/qtui/settings.cc:72
 msgid "Show close buttons"
 msgstr "Показване на бутони за затваряне"
 
-#: src/gtkui/settings.cc:42
+#: src/gtkui/settings.cc:49 src/qtui/settings.cc:75
 msgid "Playlist Columns"
 msgstr "Колони в списъка"
 
-#: src/gtkui/settings.cc:44
+#: src/gtkui/settings.cc:51 src/qtui/settings.cc:77
 msgid "Show column headers"
 msgstr "Показване на антетки"
 
-#: src/gtkui/settings.cc:46 src/modplug/plugin_main.cc:106
-#: src/skins/skins_cfg.cc:263
-msgid "Miscellaneous"
-msgstr "Разни"
+#: src/gtkui/settings.cc:53 src/qtui/settings.cc:82
+msgid "Make column headers clickable for sorting"
+msgstr ""
 
-#: src/gtkui/settings.cc:47
-msgid "Arrow keys seek by:"
-msgstr "Превъртане със стрелките:"
+#: src/gtkui/settings.cc:56
+msgid "Use symbolic icons in toolbar"
+msgstr ""
 
-#: src/gtkui/settings.cc:50
+#: src/gtkui/settings.cc:58 src/qtui/settings.cc:86
 msgid "Scroll on song change"
 msgstr "Превъртане при смяна на песента"
 
-#: src/gtkui/ui_gtk.cc:71
+#: src/gtkui/ui_gtk.cc:82
 msgid "GTK Interface"
 msgstr "GTK изглед"
 
-#: src/gtkui/ui_gtk.cc:222 src/skins/ui_main.cc:232
+#: src/gtkui/ui_gtk.cc:219 src/skins/main.cc:228 src/skins-qt/main.cc:231
 #, c-format
 msgid "%s - Audacious"
 msgstr "%s - Audacious"
 
-#: src/gtkui/ui_gtk.cc:225 src/qtui/main_window.cc:186
+#: src/gtkui/ui_gtk.cc:221 src/moonstone/main_window.cc:184
+#: src/qtui/main_window.cc:385
 msgid "Buffering ..."
 msgstr "Запълване..."
 
-#: src/gtkui/ui_gtk.cc:228 src/skins/ui_main.cc:234 src/skins/ui_main.cc:1164
+#: src/gtkui/ui_gtk.cc:224 src/pipewire/pipewire.cc:402 src/skins/main.cc:230
+#: src/skins-qt/main.cc:233
 msgid "Audacious"
 msgstr "Audacious"
 
-#: src/gtkui/ui_statusbar.cc:63 src/qtui/status_bar.cc:67
+#: src/gtkui/ui_gtk.cc:487 src/gtkui/ui_gtk.cc:518 src/gtkui/ui_gtk.cc:882
+#: src/hotkey/gui.cc:72 src/moonstone/main_window.cc:67
+#: src/moonstone/main_window.cc:145 src/moonstone/main_window.cc:146
+#: src/notify/osd.cc:85 src/qthotkey/gui.cc:67 src/qtui/main_window.cc:154
+#: src/qtui/main_window.cc:347 src/qtui/main_window.cc:348
+#: src/skins/menus.cc:109 src/skins-qt/menus.cc:100
+msgid "Play"
+msgstr "Изпълнение"
+
+#: src/gtkui/ui_gtk.cc:487 src/moonstone/main_window.cc:151
+#: src/moonstone/main_window.cc:152 src/notify/osd.cc:82
+#: src/qtui/main_window.cc:353 src/qtui/main_window.cc:354
+#: src/skins/menus.cc:110 src/skins-qt/menus.cc:101
+msgid "Pause"
+msgstr "Временно спиране"
+
+#: src/gtkui/ui_gtk.cc:868 src/moonstone/main_window.cc:57
+#: src/qtui/main_window.cc:145 src/skins/menus.cc:86 src/skins-qt/menus.cc:77
+msgid "Search Library"
+msgstr "Търсене в библиотеката"
+
+#: src/gtkui/ui_gtk.cc:875 src/moonstone/main_window.cc:60
+#: src/qtui/main_window.cc:147
+msgid "Open Files"
+msgstr "Отваряне на файлове"
+
+#: src/gtkui/ui_gtk.cc:876 src/moonstone/main_window.cc:62
+#: src/qtui/main_window.cc:149
+msgid "Add Files"
+msgstr "Добавяне на файлове"
+
+#: src/gtkui/ui_gtk.cc:881 src/moonstone/main_window.cc:65
+#: src/qtui/main_window.cc:152 src/skins/menus.cc:112 src/skins-qt/menus.cc:103
+msgid "Previous"
+msgstr "Предишен"
+
+#: src/gtkui/ui_gtk.cc:883 src/hotkey/gui.cc:74 src/moonstone/main_window.cc:69
+#: src/qthotkey/gui.cc:69 src/qtui/main_window.cc:156 src/skins/menus.cc:111
+#: src/skins-qt/menus.cc:102
+msgid "Stop"
+msgstr "Спиране"
+
+#: src/gtkui/ui_gtk.cc:884 src/moonstone/main_window.cc:76 src/notify/osd.cc:89
+#: src/qtui/main_window.cc:163 src/skins/menus.cc:113 src/skins-qt/menus.cc:104
+msgid "Next"
+msgstr "Следващ"
+
+#: src/gtkui/ui_gtk.cc:886 src/moonstone/main_window.cc:79
+#: src/qtui/main_window.cc:166 src/qtui/menus.cc:254 src/skins/menus.cc:79
+#: src/skins-qt/menus.cc:69
+msgid "Record Stream"
+msgstr "Запис на поток"
+
+#: src/gtkui/ui_gtk.cc:919 src/moonstone/main_window.cc:86
+#: src/qtui/main_window.cc:173 src/skins/menus.cc:103 src/skins-qt/menus.cc:94
+msgid "Repeat"
+msgstr "Повторение"
+
+#: src/gtkui/ui_gtk.cc:922 src/moonstone/main_window.cc:89
+#: src/qtui/main_window.cc:176 src/skins/menus.cc:104 src/skins-qt/menus.cc:95
+msgid "Shuffle"
+msgstr "Разбъркване"
+
+#: src/gtkui/ui_gtk.cc:1114 src/qtui/main_window.cc:123
+msgid "Menu"
+msgstr "Меню"
+
+#: src/gtkui/ui_statusbar.cc:64 src/qtui/status_bar.cc:155
 msgid "mono"
 msgstr "еднозвучие"
 
-#: src/gtkui/ui_statusbar.cc:65 src/qtui/status_bar.cc:69
+#: src/gtkui/ui_statusbar.cc:66 src/qtui/status_bar.cc:157
 msgid "stereo"
 msgstr "многозвучие"
 
-#: src/gtkui/ui_statusbar.cc:67 src/qtui/status_bar.cc:71
+#: src/gtkui/ui_statusbar.cc:68 src/qtui/status_bar.cc:160
 #, c-format
 msgid "%d channel"
 msgid_plural "%d channels"
 msgstr0 "%d канал"
 msgstr1 "%d канали"
 
-#: src/gtkui/ui_statusbar.cc:81 src/qtui/status_bar.cc:85
+#: src/gtkui/ui_statusbar.cc:76 src/qtui/status_bar.cc:168
+#, c-format
+msgid "%d kHz"
+msgstr "%d кХц"
+
+#: src/gtkui/ui_statusbar.cc:82 src/qtui/status_bar.cc:174
 #, c-format
-msgid "%d kbps"
-msgstr "%d кбвс"
+msgid "%d kbit/s"
+msgstr "%dkbit/s"
 
-#: src/gtkui/ui_statusbar.cc:107 src/skins/ui_main_evlisteners.cc:103
+#: src/gtkui/ui_statusbar.cc:108 src/skins/main.cc:478 src/skins-qt/main.cc:461
 msgid "Single mode."
 msgstr "Режим „Единичен“."
 
-#: src/gtkui/ui_statusbar.cc:109 src/skins/ui_main_evlisteners.cc:105
+#: src/gtkui/ui_statusbar.cc:110 src/skins/main.cc:480 src/skins-qt/main.cc:463
 msgid "Playlist mode."
 msgstr "Режим „Списък“."
 
-#: src/gtkui/ui_statusbar.cc:117 src/skins/ui_main_evlisteners.cc:111
+#: src/gtkui/ui_statusbar.cc:118 src/skins/main.cc:486 src/skins-qt/main.cc:469
 msgid "Stopping after song."
 msgstr "Спиране след песента."
 
-#: src/hotkey/gui.cc:71
+#: src/hotkey/gui.cc:71 src/qthotkey/gui.cc:66
 msgid "Previous track"
 msgstr "Предишен запис"
 
-#: src/hotkey/gui.cc:72 src/notify/osd.cc:69 src/qtui/main_window.cc:69
-#: src/qtui/main_window.cc:172 src/qtui/main_window.cc:173
-#: src/skins/menus.cc:87
-msgid "Play"
-msgstr "Изпълнение"
-
-#: src/hotkey/gui.cc:73
+#: src/hotkey/gui.cc:73 src/qthotkey/gui.cc:68
 msgid "Pause/Resume"
 msgstr "Временно спиране/Възобновяване"
 
-#: src/hotkey/gui.cc:74 src/qtui/main_window.cc:70 src/skins/menus.cc:89
-msgid "Stop"
-msgstr "Спиране"
-
-#: src/hotkey/gui.cc:75
+#: src/hotkey/gui.cc:75 src/qthotkey/gui.cc:70
 msgid "Next track"
 msgstr "Следващ запис"
 
-#: src/hotkey/gui.cc:76
-msgid "Forward 5 seconds"
-msgstr "Напред с 5 секунди"
-
-#: src/hotkey/gui.cc:77
-msgid "Rewind 5 seconds"
-msgstr "Назад с 5 секунди"
+#: src/hotkey/gui.cc:76 src/qthotkey/gui.cc:71
+msgid "Step forward"
+msgstr "Придвижване напред"
+
+#: src/hotkey/gui.cc:77 src/qthotkey/gui.cc:72
+msgid "Step backward"
+msgstr "Придвижване назад"
 
-#: src/hotkey/gui.cc:78
+#: src/hotkey/gui.cc:78 src/qthotkey/gui.cc:73
 msgid "Mute"
 msgstr "Заглушаване"
 
-#: src/hotkey/gui.cc:79
+#: src/hotkey/gui.cc:79 src/qthotkey/gui.cc:74
 msgid "Volume up"
 msgstr "Увеличаване на звука"
 
-#: src/hotkey/gui.cc:80
+#: src/hotkey/gui.cc:80 src/qthotkey/gui.cc:75
 msgid "Volume down"
 msgstr "Намаляване на звука"
 
-#: src/hotkey/gui.cc:81
+#: src/hotkey/gui.cc:81 src/qthotkey/gui.cc:76
 msgid "Jump to file"
 msgstr "Прескачане до файл"
 
-#: src/hotkey/gui.cc:82
+#: src/hotkey/gui.cc:82 src/qthotkey/gui.cc:77
 msgid "Toggle player window(s)"
 msgstr "Превключване между прозорците"
 
-#: src/hotkey/gui.cc:83
+#: src/hotkey/gui.cc:83 src/qthotkey/gui.cc:78
 msgid "Show On-Screen-Display"
 msgstr "Показване на Прозорец върху екрана"
 
-#: src/hotkey/gui.cc:84
+#: src/hotkey/gui.cc:84 src/qthotkey/gui.cc:79
 msgid "Toggle repeat"
 msgstr "Превключване на повторение"
 
-#: src/hotkey/gui.cc:85
+#: src/hotkey/gui.cc:85 src/qthotkey/gui.cc:80
 msgid "Toggle shuffle"
 msgstr "Превключване на разбъркване"
 
-#: src/hotkey/gui.cc:86
+#: src/hotkey/gui.cc:86 src/qthotkey/gui.cc:81
 msgid "Toggle stop after current"
 msgstr "Превключване на спиране след текущият"
 
-#: src/hotkey/gui.cc:87
+#: src/hotkey/gui.cc:87 src/qthotkey/gui.cc:82
 msgid "Raise player window(s)"
 msgstr "Издигане на прозорците"
 
-#: src/hotkey/gui.cc:97
+#: src/hotkey/gui.cc:98 src/qthotkey/gui.cc:100
 msgid "(none)"
 msgstr "(без)"
 
-#: src/hotkey/gui.cc:234
+#: src/hotkey/gui.cc:261
 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 modifiers.\n"
 "\n"
 "Do you want to continue?"
 msgstr ""
-"Не се препоръчва да се обвързват основните бутони на мишката без наличието "
-"на променливи.\n"
-"\n"
+"Не се препоръчва привързването на основните бутони на мишката без "
+"модификатори.\n"
 "Искате ли да продължите?"
 
-#: src/hotkey/gui.cc:236
+#: src/hotkey/gui.cc:264
 msgid "Binding mouse buttons"
 msgstr "Обвързани бутони на мишката"
 
-#: src/hotkey/gui.cc:391
+#: src/hotkey/gui.cc:434
 msgid ""
 "Press a key combination inside a text field.\n"
 "You can also bind mouse buttons."
@@ -2187,34 +2249,34 @@
 "Наберете комбинация от клавиши в текстовото поле.\n"
 "Можете да включете и бутони от мишката."
 
-#: src/hotkey/gui.cc:396
+#: src/hotkey/gui.cc:444 src/qthotkey/gui.cc:179
 msgid "Hotkeys:"
 msgstr "Бързи клавиши:"
 
-#: src/hotkey/gui.cc:413
+#: src/hotkey/gui.cc:457 src/qthotkey/gui.cc:181
 msgid "Action:"
 msgstr "Действие:"
 
-#: src/hotkey/gui.cc:420
+#: src/hotkey/gui.cc:461 src/qthotkey/gui.cc:182
 msgid "Key Binding:"
 msgstr "Обвързване на клавиш:"
 
-#: src/hotkey/gui.cc:468
+#: src/hotkey/gui.cc:518 src/qthotkey/gui.cc:184
 msgid "_Add"
 msgstr "_Добавяне"
 
-#: src/hotkey/plugin.cc:61
+#: src/hotkey/plugin.cc:59 src/qthotkey/plugin.cc:78
 msgid "Global Hotkeys"
 msgstr "Общи бързи клавиши"
 
-#: src/hotkey/plugin.cc:79
+#: src/hotkey/plugin.cc:74
 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"
+"Contributors 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"
@@ -2233,25 +2295,54 @@
 " Jonathan A. Davis <davis@jdhouse.org>,\n"
 " Jeremy Tan <nsx@nsx.homeip.net>"
 
-#: src/jack-ng/jack-ng.cc:49
+#: src/jack/jack-ng.cc:54
 msgid "JACK Output"
 msgstr "JACK Изход"
 
-#: src/jack-ng/jack-ng.cc:114
+#: src/jack/jack-ng.cc:126
+msgid "Client name:"
+msgstr "Име на клиента:"
+
+#: src/jack/jack-ng.cc:128
 msgid "Automatically connect to output ports"
 msgstr "Автоматично свързване към изходящите портове"
 
-#: src/jack-ng/jack-ng.cc:155
+#: src/jack/jack-ng.cc:130
+msgid "Filter ports (regex, use any port if blank):"
+msgstr ""
+"Филтриране на портове (регулярен израз, ако е празно използва всеки порт):"
+
+#: src/jack/jack-ng.cc:136
+msgid "Connect to physical ports only"
+msgstr "Свързване само към физически портове"
+
+#: src/jack/jack-ng.cc:139
+msgid "Upmix to"
+msgstr "Смесване до"
+
+#: src/jack/jack-ng.cc:141
+msgid "ports if input has fewer channels"
+msgstr "портове ако входа има по-малко канали"
+
+#: src/jack/jack-ng.cc:143
+msgid "Ignore insufficient number of ports"
+msgstr "Игнориране на недостатъчен брой портове"
+
+#: src/jack/jack-ng.cc:181
+msgid "No JACK output ports were found. Please check settings."
+msgstr "Не са намерени JACK изходящи портове. Моля проверете настройките."
+
+#: src/jack/jack-ng.cc:195
 #, c-format
 msgid "Only %d JACK output ports were found but %d are required."
 msgstr "Намерени са само изходни портове %d JACK, но се изискват %d."
 
-#: src/jack-ng/jack-ng.cc:164
+#: src/jack/jack-ng.cc:210
 #, c-format
 msgid "Failed to connect to JACK port %s."
 msgstr "Неуспешно свързване към JACK порт %s."
 
-#: src/jack-ng/jack-ng.cc:184
+#: src/jack/jack-ng.cc:230
 msgid ""
 "JACK supports only floating-point audio. You must change the output bit "
 "depth to floating-point in Audacious settings."
@@ -2259,11 +2350,11 @@
 "JACK поддържа само звук с плаваща запетая. Трябва да смените изходната "
 "побитова честота на плаваща запетая в настройките на Audacious."
 
-#: src/jack-ng/jack-ng.cc:197
+#: src/jack/jack-ng.cc:245
 msgid "Failed to connect to the JACK server; is it running?"
 msgstr "Неуспех при свързването към сървър JACK. Стартиран ли е?"
 
-#: src/jack-ng/jack-ng.cc:273
+#: src/jack/jack-ng.cc:321
 #, c-format
 msgid ""
 "The JACK server requires a sample rate of %d Hz, but Audacious is playing at "
@@ -2273,16 +2364,16 @@
 "възпроизвежда на %d Хц. Моля, използвайте ефектът за Промяна на честотата на "
 "дискретизация, за да поправите несъответствията."
 
-#: src/ladspa/plugin.cc:414
+#: src/ladspa/plugin.cc:416
 #, c-format
 msgid "%s Settings"
 msgstr "%s Настройки"
 
-#: src/ladspa/plugin.cc:478
+#: src/ladspa/plugin.cc:482
 msgid "Module paths:"
 msgstr "Пътища към модул:"
 
-#: src/ladspa/plugin.cc:483
+#: src/ladspa/plugin.cc:487
 msgid ""
 "Separate multiple paths with a colon.\n"
 "These paths are searched in addition to LADSPA_PATH.\n"
@@ -2293,25 +2384,25 @@
 "След добавяне на тези пътища, натиснете Ентер за сканиране за нови приставки."
 ""
 
-#: src/ladspa/plugin.cc:499
+#: src/ladspa/plugin.cc:508
 msgid "Available plugins:"
 msgstr "Достъпни приставки:"
 
-#: src/ladspa/plugin.cc:512 src/modplug/plugin_main.cc:92
-#: src/modplug/plugin_main.cc:95 src/modplug/plugin_main.cc:98
-#: src/modplug/plugin_main.cc:101
+#: src/ladspa/plugin.cc:521 src/modplug/plugin_main.cc:91
+#: src/modplug/plugin_main.cc:94 src/modplug/plugin_main.cc:97
+#: src/modplug/plugin_main.cc:100
 msgid "Enable"
 msgstr "Активиране"
 
-#: src/ladspa/plugin.cc:518
+#: src/ladspa/plugin.cc:527
 msgid "Enabled plugins:"
 msgstr "Активирани приставки:"
 
-#: src/ladspa/plugin.cc:534
+#: src/ladspa/plugin.cc:543
 msgid "Settings"
 msgstr "Настройки"
 
-#: src/ladspa/plugin.cc:551
+#: src/ladspa/plugin.cc:560
 msgid ""
 "LADSPA Host for Audacious\n"
 "Copyright 2011 John Lindgren"
@@ -2327,7 +2418,7 @@
 msgid "LIRC Plugin"
 msgstr "Приставка LIRC"
 
-#: src/lirc/lirc.cc:381
+#: src/lirc/lirc.cc:379
 msgid ""
 "A simple plugin to control Audacious using the LIRC remote control daemon\n"
 "\n"
@@ -2356,63 +2447,124 @@
 "\n"
 "За повече информация относно LIRC, вижте http://lirc.org"
 
-#: src/lirc/lirc.cc:392
+#: src/lirc/lirc.cc:390
 msgid "Connection"
 msgstr "Връзка"
 
-#: src/lirc/lirc.cc:393
+#: src/lirc/lirc.cc:391
 msgid "Reconnect to LIRC server"
 msgstr "Повторно свързване към LIRC сървъра"
 
-#: src/lirc/lirc.cc:395
+#: src/lirc/lirc.cc:393
 msgid "Wait before reconnecting:"
 msgstr "Изчакайте преди да опитате повторно свързване:"
 
-#: src/lyricwiki/lyricwiki.cc:41
-msgid "LyricWiki Plugin"
-msgstr "Приставка LyricWiki"
-
-#: src/lyricwiki/lyricwiki.cc:131 src/lyricwiki-qt/lyricwiki.cc:136
-msgid "No lyrics available"
-msgstr "Няма наличен текст"
-
-#: src/lyricwiki/lyricwiki.cc:217 src/lyricwiki/lyricwiki.cc:226
-#: src/lyricwiki/lyricwiki.cc:243 src/lyricwiki/lyricwiki.cc:252
-#: src/lyricwiki/lyricwiki.cc:267 src/lyricwiki-qt/lyricwiki.cc:222
-#: src/lyricwiki-qt/lyricwiki.cc:231 src/lyricwiki-qt/lyricwiki.cc:248
-#: src/lyricwiki-qt/lyricwiki.cc:257 src/lyricwiki-qt/lyricwiki.cc:272
-msgid "Error"
-msgstr "Грешка"
-
-#: src/lyricwiki/lyricwiki.cc:218 src/lyricwiki/lyricwiki.cc:244
-#: src/lyricwiki-qt/lyricwiki.cc:223 src/lyricwiki-qt/lyricwiki.cc:249
+#: src/lyrics-common/chart_lyrics_provider.cc:93
+#: src/lyrics-common/chart_lyrics_provider.cc:150
+#: src/lyrics-common/lyrics_ovh_provider.cc:50
 #, c-format
 msgid "Unable to fetch %s"
 msgstr "Неуспех при извличане на %s"
 
-#: src/lyricwiki/lyricwiki.cc:227 src/lyricwiki/lyricwiki.cc:253
-#: src/lyricwiki-qt/lyricwiki.cc:232 src/lyricwiki-qt/lyricwiki.cc:258
+#: src/lyrics-common/chart_lyrics_provider.cc:100
+#: src/lyrics-common/chart_lyrics_provider.cc:157
+#: src/lyrics-common/lyrics_ovh_provider.cc:57
 #, c-format
 msgid "Unable to parse %s"
 msgstr "Неуспех при разделяне на %s"
 
-#: src/lyricwiki/lyricwiki.cc:259 src/lyricwiki-qt/lyricwiki.cc:264
+#: src/lyrics-common/chart_lyrics_provider.cc:121
+#: src/lyrics-common/chart_lyrics_provider.cc:194
+#: src/lyrics-common/lyrics_ovh_provider.cc:88
 msgid "Looking for lyrics ..."
 msgstr "Търсене на текст..."
 
-#: src/lyricwiki/lyricwiki.cc:267 src/lyricwiki-qt/lyricwiki.cc:272
-msgid "Missing song metadata"
-msgstr "Липсващи метаданни за песента"
-
-#: src/lyricwiki/lyricwiki.cc:278 src/lyricwiki-qt/lyricwiki.cc:283
-msgid "Connecting to lyrics.wikia.com ..."
-msgstr "Свързване към lyrics.wikia.com..."
-
-#: src/lyricwiki-qt/lyricwiki.cc:55
-msgid "LyricWiki Plugin (Qt)"
-msgstr "Приставка LyricWiki (Qt)"
+#: src/lyrics-common/preferences.h:43
+msgid "Nowhere"
+msgstr "Никъде"
+
+#: src/lyrics-common/preferences.h:49
+msgid "Artist is truncated at the start, Title -- at the end"
+msgstr ""
+"Изпълнителят е съкратен в началото, заглавието -- в края"
+
+#: src/lyrics-common/preferences.h:50
+msgid "Chars to truncate on:"
+msgstr "Символи за съкращаване:"
+
+#: src/lyrics-common/preferences.h:54
+msgid "Chars are ORed in RegExp, surrounded by whitespace"
+msgstr "Знаците са ORed в RegExp, заобиколени от интервал"
+
+#: src/lyrics-common/preferences.h:55
+msgid "Chars to split on:"
+msgstr "Символи за разделяне:"
+
+#: src/lyrics-common/preferences.h:56
+msgid "Further truncate those on chars"
+msgstr "Допълнително съкращение на тези символи"
+
+#: src/lyrics-common/preferences.h:62
+msgid "General"
+msgstr "Главни"
+
+#: src/lyrics-common/preferences.h:63
+msgid "Split title into artist and title on chars"
+msgstr "Разделете заглавието на изпълнител и заглавие на символи"
+
+#: src/lyrics-common/preferences.h:66
+msgid "Sources"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:67
+msgid "Use embedded lyrics (from Lyrics tag)"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:69
+msgid "Fetch lyrics from internet:"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:72
+msgid "Store fetched lyrics in local cache"
+msgstr "Съхраняване на извлечените текстове в локалния кеш"
+
+#: src/lyrics-common/preferences.h:74
+msgid "Local Storage"
+msgstr "Местно пространство"
+
+#: src/lyrics-common/preferences.h:75
+msgid "Load lyric files (.lrc) from local storage"
+msgstr "Зареждане на текстови файлове (.lrc) от локално пространство"
+
+#: src/lyrics-common/utils.cc:54 src/ui-common/dialogs-qt.cc:63
+msgid "Error"
+msgstr "Грешка"
+
+#: src/lyrics-common/utils.cc:60
+msgid "Lyrics could not be found."
+msgstr "Текстът не може да бъде намерен."
+
+#: src/lyrics-common/utils.cc:142
+msgid "Missing title and/or artist."
+msgstr "Липсва заглавие и/или изпълнител."
 
-#: src/m3u/m3u.cc:32
+#: src/lyrics-gtk/lyrics-gtk.cc:37 src/lyrics-qt/lyrics-qt.cc:50
+msgid "Lyrics"
+msgstr "Текстове"
+
+#: src/lyrics-gtk/lyrics-gtk.cc:189 src/lyrics-qt/lyrics-qt.cc:171
+msgid "Edit Lyrics ..."
+msgstr ""
+
+#: src/lyrics-gtk/lyrics-gtk.cc:195 src/lyrics-qt/lyrics-qt.cc:178
+msgid "Save Locally"
+msgstr "Запазете локално"
+
+#: src/lyrics-gtk/lyrics-gtk.cc:201 src/lyrics-qt/lyrics-qt.cc:186
+msgid "Refresh"
+msgstr "Опресняване"
+
+#: src/m3u/m3u.cc:33
 msgid "M3U Playlists"
 msgstr "Списък M3U"
 
@@ -2420,17 +2572,17 @@
 msgid "Tact Generator"
 msgstr "Генератор на тактове"
 
-#: src/metronom/metronom.cc:147
+#: src/metronom/metronom.cc:145
 #, c-format
 msgid "Tact generator: %d bpm"
 msgstr "Генератор на тактове: %d увм"
 
-#: src/metronom/metronom.cc:149
+#: src/metronom/metronom.cc:147
 #, c-format
 msgid "Tact generator: %d bpm %d/%d"
 msgstr "Генератор на тактове: %d увм %d/%d"
 
-#: src/metronom/metronom.cc:237
+#: src/metronom/metronom.cc:235
 msgid ""
 "A Tact Generator by Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
 "\n"
@@ -2444,11 +2596,11 @@
 "напр. tact://77 за изпълняване на 77 удара в минута\n"
 "или tact://60*3/4 за изпълняване на 60 увм в такт 3/4"
 
-#: src/mixer/mixer.cc:38
+#: src/mixer/mixer.cc:43
 msgid "Channel Mixer"
 msgstr "Смесител на канали"
 
-#: src/mixer/mixer.cc:202
+#: src/mixer/mixer.cc:255
 msgid ""
 "Channel Mixer Plugin for Audacious\n"
 "Copyright 2011-2012 John Lindgren and Michał Lipski"
@@ -2456,11 +2608,11 @@
 "Приставка смесител на канали за Audacious\n"
 "Авторски права 2011-2012 John Lindgren и "
 
-#: src/mixer/mixer.cc:206
+#: src/mixer/mixer.cc:259
 msgid "Channel Mixer"
 msgstr "Смесител на канали"
 
-#: src/mixer/mixer.cc:207
+#: src/mixer/mixer.cc:260
 msgid "Output channels:"
 msgstr "Изходни канали:"
 
@@ -2472,168 +2624,176 @@
 msgid "Error connecting to MMS server"
 msgstr "Грешка при свързване към MMS сървър"
 
-#: src/modplug/modplugbmp.h:53
+#: src/modplug/modplugbmp.h:57
 msgid "ModPlug (Module Player)"
 msgstr "ModPlug (Модулен плеър)"
 
-#: src/modplug/plugin_main.cc:53
-msgid "Resolution"
-msgstr "Дълбочина"
-
-#: src/modplug/plugin_main.cc:54
-msgid "8-bit"
-msgstr "8-битов"
-
 #: src/modplug/plugin_main.cc:55
-msgid "16-bit"
-msgstr "16-битов"
-
-#: src/modplug/plugin_main.cc:56
 msgid "Channels"
 msgstr "Канали"
 
-#: src/modplug/plugin_main.cc:60
+#: src/modplug/plugin_main.cc:59
 msgid "Nearest (fastest)"
 msgstr "Най-близкият (най-бърз)"
 
-#: src/modplug/plugin_main.cc:61
+#: src/modplug/plugin_main.cc:60
 msgid "Linear (fast)"
 msgstr "Линеен (бърз)"
 
-#: src/modplug/plugin_main.cc:62
+#: src/modplug/plugin_main.cc:61
 msgid "Spline (good)"
 msgstr "Шпонка (добър)"
 
-#: src/modplug/plugin_main.cc:63
+#: src/modplug/plugin_main.cc:62
 msgid "Polyphase (best)"
 msgstr "Многофазен (най-добър)"
 
-#: src/modplug/plugin_main.cc:64
+#: src/modplug/plugin_main.cc:63
 msgid "Sample rate"
 msgstr "Честота на дискретизация"
 
-#: src/modplug/plugin_main.cc:65
+#: src/modplug/plugin_main.cc:64
 msgid "22 kHz"
 msgstr "22 кХц"
 
-#: src/modplug/plugin_main.cc:66
+#: src/modplug/plugin_main.cc:65
 msgid "44 kHz"
 msgstr "44 кХц"
 
-#: src/modplug/plugin_main.cc:67
+#: src/modplug/plugin_main.cc:66
 msgid "48 kHz"
 msgstr "48 кХц"
 
-#: src/modplug/plugin_main.cc:68
+#: src/modplug/plugin_main.cc:67
 msgid "96 kHz"
 msgstr "96 кХц"
 
-#: src/modplug/plugin_main.cc:72 src/modplug/plugin_main.cc:77
-#: src/modplug/plugin_main.cc:82
+#: src/modplug/plugin_main.cc:71 src/modplug/plugin_main.cc:76
+#: src/modplug/plugin_main.cc:81
 msgid "Level:"
 msgstr "Ниво:"
 
-#: src/modplug/plugin_main.cc:78
+#: src/modplug/plugin_main.cc:77
 msgid "Cutoff:"
 msgstr "Срез:"
 
-#: src/modplug/plugin_main.cc:91
+#: src/modplug/plugin_main.cc:90
 msgid "Reverb"
 msgstr "Ехо"
 
-#: src/modplug/plugin_main.cc:94
+#: src/modplug/plugin_main.cc:93
 msgid "Bass Boost"
 msgstr "Усилване на ниските"
 
-#: src/modplug/plugin_main.cc:97
+#: src/modplug/plugin_main.cc:96
 msgid "Surround"
 msgstr "Обграждащ звук"
 
-#: src/modplug/plugin_main.cc:100
+#: src/modplug/plugin_main.cc:99
 msgid "Preamp"
 msgstr "Предусилвател"
 
-#: src/modplug/plugin_main.cc:107
+#: src/modplug/plugin_main.cc:106
 msgid "Oversample"
 msgstr "Надхвърляне на честотата на дискретизация"
 
-#: src/modplug/plugin_main.cc:108
+#: src/modplug/plugin_main.cc:107
 msgid "Noise reduction"
 msgstr "Намаляване на шума"
 
-#: src/modplug/plugin_main.cc:109
+#: src/modplug/plugin_main.cc:108
 msgid "Play Amiga MODs"
 msgstr "Изпълняване на Amiga MODs"
 
-#: src/modplug/plugin_main.cc:110
+#: src/modplug/plugin_main.cc:109
 msgid "Repeat"
 msgstr "Повторение"
 
-#: src/modplug/plugin_main.cc:111
+#: src/modplug/plugin_main.cc:110
 msgid "Repeat count:"
 msgstr "Брой повторения:"
 
-#: src/modplug/plugin_main.cc:112
+#: src/modplug/plugin_main.cc:111
 msgid "To repeat forever, set the repeat count to -1."
 msgstr "За непрекъснато повторение, задайте стойност -1."
 
-#: src/modplug/plugin_main.cc:125 src/sid/xs_config.cc:106
+#: src/modplug/plugin_main.cc:124 src/sid/xs_config.cc:106
 msgid "These settings will take effect when Audacious is restarted."
 msgstr "Тези настройки ще влязат в сила, когато Audacious бъде рестартиран."
 
+#: src/moonstone/main_window.cc:72 src/moonstone/main_window.cc:73
+#: src/qtui/main_window.cc:159 src/qtui/main_window.cc:160
+#: src/skins/menus.cc:107 src/skins-qt/menus.cc:98
+msgid "Stop After This Song"
+msgstr "Спиране след тази песен"
+
+#: src/moonstone/moonstone.cc:39
+msgid "Moonstone"
+msgstr "Moonstone"
+
+#: src/moonstone/playlist_header.cc:212 src/qtui/playlist_header.cc:258
+msgid "Reset to Defaults"
+msgstr "Възстановяване на началните настройки"
+
+#: src/moonstone/playlist_model.cc:38 src/qtui/playlist_header.cc:232
+msgid "Now Playing"
+msgstr "Възпроизвежда се"
+
+#: src/moonstone/playlist_selection.cc:66
+#: src/playlist-manager/playlist-manager.cc:201
+#: src/playlist-manager-qt/playlist-manager-qt.cc:190
+msgid "Entries"
+msgstr "Елементи"
+
 #: src/mpg123/mpg123.cc:54
 msgid "MPG123 Plugin"
 msgstr "Приставка MPG123"
 
-#: src/mpg123/mpg123.cc:83
-msgid "Advanced"
-msgstr "Допълнителни"
-
-#: src/mpg123/mpg123.cc:84
+#: src/mpg123/mpg123.cc:82
 msgid "Use accurate length calculation (slow)"
 msgstr "Използвай точна калкулация на продължителността (бавно)"
 
-#: src/mpg123/mpg123.cc:248
+#: src/mpg123/mpg123.cc:260
 msgid "Surround"
 msgstr "Обграждащ звук"
 
-#: src/mpris2/plugin.cc:39
+#: src/mpris2/plugin.cc:40
 msgid "MPRIS 2 Server"
 msgstr "Услуга MPRIS 2"
 
-#: src/neon/neon.cc:97
+#: src/neon/neon.cc:102
 msgid "Neon HTTP/HTTPS Plugin"
 msgstr "Приставка Neon HTTP/HTTPS"
 
-#: src/neon/neon.cc:521
+#: src/neon/neon.cc:526
 msgid "Error parsing redirect"
 msgstr "Грешка при пренасочването"
 
-#: src/neon/neon.cc:535
+#: src/neon/neon.cc:540
 msgid "Unknown HTTP error"
 msgstr "Неизвестна HTTP грешка"
 
-#: src/neon/neon.cc:569
+#: src/neon/neon.cc:614
 msgid "Error parsing URL"
 msgstr "Грешка при онаследяване на интернет адрес"
 
-#: src/neon/neon.cc:632
+#: src/neon/neon.cc:687
 msgid "Too many redirects"
 msgstr "Твърде много пренасочвания"
 
-#: src/notify/event.cc:64
+#: src/notify/event.cc:97
 msgid "Stopped"
 msgstr "Спрян"
 
-#: src/notify/event.cc:64
+#: src/notify/event.cc:97
 msgid "Audacious is not playing."
 msgstr "Audacious не изпълнява нищо."
 
-#: src/notify/notify.cc:42
+#: src/notify/notify.cc:39
 msgid "Desktop Notifications"
 msgstr "Уведомления на работния плот"
 
-#: src/notify/notify.cc:60
+#: src/notify/notify.cc:57
 msgid ""
 "Desktop Notifications Plugin for Audacious\n"
 "Copyright (C) 2010 Maximilian Bogner\n"
@@ -2668,36 +2828,79 @@
 "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.cc:110
+#: src/notify/notify.cc:104
 msgid "Show playback controls"
 msgstr "Показване на бутоните за управление"
 
-#: src/notify/notify.cc:112
+#: src/notify/notify.cc:106
 msgid "Always show notification"
 msgstr "Винаги да се показва известие"
 
-#: src/notify/notify.cc:114
+#: src/notify/notify.cc:108
 msgid "Include album name in notification"
 msgstr "Включи името на албума в уведомленията"
 
-#: src/notify/osd.cc:58
+#: src/notify/notify.cc:110
+msgid "Custom notification duration:"
+msgstr "Персонализирана продължителност на известието:"
+
+#: src/notify/osd.cc:74
 msgid "Show"
 msgstr "Показване"
 
-#: src/notify/osd.cc:66 src/qtui/main_window.cc:178
-#: src/qtui/main_window.cc:179 src/skins/menus.cc:88
-msgid "Pause"
-msgstr "Временно спиране"
+#: src/openmpt/mpt.cc:50
+msgid "OpenMPT (Module Player)"
+msgstr "OpenMPT (Модулен плеър)"
 
-#: src/notify/osd.cc:73 src/qtui/main_window.cc:72 src/skins/menus.cc:91
-msgid "Next"
-msgstr "Следващ"
+#: src/openmpt/mpt.cc:132
+msgid ""
+"Module player based on libopenmpt\n"
+"\n"
+"Written by: Chris Spiegel <cspiegel@gmail.com>"
+msgstr ""
+"Модулен плейър, базиран на libopenmpt\n"
+"\n"
+"Написано от: Крис Шпигел <cspiegel@gmail.com>"
+
+#: src/openmpt/mpt.cc:151
+msgid "Stereo separation:"
+msgstr "Стерео разделяне:"
+
+#: src/openmpt/mpt.cc:153
+msgid "% (0=mono, 100=default, 200=full)"
+msgstr ""
 
-#: src/oss4/oss.h:93
+#: src/openmpt/mpt.cc:157
+msgid "Interpolation:"
+msgstr "Интерполация:"
+
+#: src/openmpt/mptwrap.h:51 src/soxr/sox-resampler.cc:189 src/xsf/plugin.cc:437
+msgid "Linear"
+msgstr "Линейно"
+
+#: src/openmpt/mptwrap.h:52
+msgid "Cubic"
+msgstr "Кубичен"
+
+#: src/openmpt/mptwrap.h:53
+msgid "Windowed sinc"
+msgstr "Windowed sinc"
+
+#: src/opus/opus.cc:39
+msgid "Opus Decoder"
+msgstr ""
+
+#: src/opus/opus.cc:336
+msgid ""
+"Opus Decoder Plugin for Audacious\n"
+"Copyright 2022 Thomas Lange"
+msgstr ""
+
+#: src/oss4/oss.h:70
 msgid "OSS4 Output"
 msgstr "OSS4 изход"
 
-#: src/oss4/oss.h:95
+#: src/oss4/oss.h:72
 msgid "OSS3 Output"
 msgstr "OSS3 изход"
 
@@ -2705,27 +2908,27 @@
 msgid "Default device"
 msgstr "Устройство по подразбиране"
 
-#: src/oss4/plugin.cc:77
+#: src/oss4/plugin.cc:78
 msgid "Audio device:"
 msgstr "Аудио устройство:"
 
-#: src/oss4/plugin.cc:80
+#: src/oss4/plugin.cc:81
 msgid "Use alternate device:"
 msgstr "Използване на алтернативно устройство:"
 
-#: src/oss4/plugin.cc:84
+#: src/oss4/plugin.cc:85
 msgid "Save volume between sessions."
 msgstr "Запази нивотона звука между сесиите."
 
-#: src/oss4/plugin.cc:86
+#: src/oss4/plugin.cc:87
 msgid "Enable format conversions made by the OSS software."
 msgstr "Активиране на формати, направени от OSS софтуер."
 
-#: src/oss4/plugin.cc:88
+#: src/oss4/plugin.cc:89
 msgid "Enable exclusive mode to prevent virtual mixing."
 msgstr "Активиране на ексклузивен режим, за предотвратяване на смесване."
 
-#: src/oss4/plugin.cc:100
+#: src/oss4/plugin.cc:101
 msgid ""
 "OSS4 Output Plugin for Audacious\n"
 "Copyright 2010-2012 Michał Lipski\n"
@@ -2739,19 +2942,35 @@
 "Бих искал да благодаря на хората от #audacious, особено на Tony Vroon и John "
 "Lindgren и, разбира се, на авторите на предишната версия на приставката."
 
-#: src/playlist-manager/playlist-manager.cc:37
+#: src/pipewire/pipewire.cc:44
+msgid "PipeWire Output"
+msgstr ""
+
+#: src/pipewire/pipewire.cc:118
+msgid ""
+"PipeWire Output Plugin for Audacious\n"
+"Copyright 2022 Thomas Lange\n"
+"\n"
+"Based on the PipeWire Output Plugin for Qmmp\n"
+"Copyright 2021 Ilya Kotov"
+msgstr ""
+
+#: src/pipewire/pipewire.cc:408 src/skins/menus.cc:88 src/skins-qt/menus.cc:79
+msgid "Playback"
+msgstr "Възпроизвеждане"
+
+#: src/playlist-manager/playlist-manager.cc:38
+#: src/playlist-manager-qt/playlist-manager-qt.cc:42
 msgid "Playlist Manager"
 msgstr "Мениджър на списъка"
 
-#: src/playlist-manager/playlist-manager.cc:226
-msgid "Entries"
-msgstr "Елементи"
-
-#: src/playlist-manager/playlist-manager.cc:245
+#: src/playlist-manager/playlist-manager.cc:221
+#: src/playlist-manager-qt/playlist-manager-qt.cc:356
 msgid "_Remove"
 msgstr "_Премахване"
 
-#: src/playlist-manager/playlist-manager.cc:246
+#: src/playlist-manager/playlist-manager.cc:222
+#: src/playlist-manager-qt/playlist-manager-qt.cc:351
 msgid "Ren_ame"
 msgstr "Преименуван_е"
 
@@ -2759,32 +2978,47 @@
 msgid "PLS Playlists"
 msgstr "Списъци PLS"
 
-#: src/psf/plugin.cc:45
+#: src/psf/plugin.cc:53
 msgid "OpenPSF PSF1/PSF2 Decoder"
 msgstr "Разкодиране OpenPSF PSF1/PSF2"
 
-#: src/pulse_audio/pulse_audio.cc:38
+#: src/psf/plugin.cc:270
+msgid "OpenPSF Configuration"
+msgstr "Конфигурация на OpenPSF"
+
+#: src/psf/plugin.cc:271 src/xsf/plugin.cc:444
+msgid "Ignore length from file"
+msgstr "Игнориране на дължината от файла"
+
+#: src/pulse/pulse_audio.cc:42
 msgid "PulseAudio Output"
 msgstr "PulseAudio изход"
 
-#: src/pulse_audio/pulse_audio.cc:611
+#: src/pulse/pulse_audio.cc:84
+msgid "Context name:"
+msgstr "Име на контекста:"
+
+#: src/pulse/pulse_audio.cc:86
+msgid "Stream name:"
+msgstr "Име на поток:"
+
+#: src/pulse/pulse_audio.cc:596
 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."
+"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 ""
 "Изходна приставка PulseAudio за Audacious\n"
 "\n"
@@ -2801,11 +3035,11 @@
 "ако не сте, пишете до Free Software Foundation, Inc., 51 Franklin Street,\n"
 "Fifth Floor, Boston, MA 02110-1301, USA."
 
-#: src/qtaudio/qtaudio.cc:49
+#: src/qtaudio/qtaudio.cc:53
 msgid "QtMultimedia Output"
 msgstr "QtMultimedia изход"
 
-#: src/qtaudio/qtaudio.cc:77
+#: src/qtaudio/qtaudio.cc:84
 msgid ""
 "QtMultimedia Audio Output Plugin for Audacious\n"
 "Copyright 2014 William Pitcock\n"
@@ -2819,50 +3053,110 @@
 "На основата на приставка за SDL изход за Audacious\n"
 "Запазени права 2010 John Lindgren"
 
-#: src/qtui/dialog_windows.cc:31
-msgid "Working ..."
-msgstr "Работи ..."
+#: src/qtglspectrum/gl-spectrum.cc:41
+msgid ""
+"OpenGL Spectrum Analyzer for Audacious\n"
+"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
+"Copyright 2014, 2020 Ariadne Conill\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 Кристоф Буде, Джон Линдгрен и Карло Брамини\n"
+"Авторско право 2014 г., 2020 г. Ariadne Conill\n"
+"\n"
+"Въз основа на приставката XMMS:\n"
+"Авторско право 1998-2000 г. Питър Алм, Микаел Алм, Оле Халнас, Томас Нилсон "
+"и 4Front Technologies\n"
+"\n"
+"Лиценз: GPLv2+"
 
-#: src/qtui/filter_input.cc:44 src/skins/ui_playlist.cc:221
-msgid "Search"
-msgstr "Търсене"
+#: src/qthotkey/gui.cc:177
+msgid "Press a key combination inside a text field."
+msgstr "Натиснете клавишна комбинация в текстово поле."
+
+#: src/qthotkey/plugin.cc:105
+msgid ""
+"Global Hotkey Plugin\n"
+"Control the player with global key combinations or multimedia keys.\n"
+"\n"
+"Copyright (C) 2020 i.Dark_Templar <darktemplar@dark-templar-archives.net>\n"
+"Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n"
+"\n"
+"Contributors 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) 2020 i.Dark_Templar <darktemplar@dark-templar-archives."
+"net>\n"
+"Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n"
+"\n"
+"Сътрудниците включват:\n"
+"Copyright (C) 2006-2007 Владимир Пасков <vlado.paskov@gmail.com>\n"
+"Авторско право (C) 2000-2002 Ville Syrjälä <syrjala@sci.fi>,\n"
+"Брин Дейвис <curious@ihug.com.au>,\n"
+"Джонатан А. Дейвис <davis@jdhouse.org>,\n"
+"Джереми Тан <nsx@nsx.homeip.net>"
 
-#: src/qtui/main_window_actions.cc:94
+#: src/qtui/menus.cc:109
 msgid "_Open Folder ..."
 msgstr "_Отвори папка..."
 
-#: src/qtui/main_window_actions.cc:96
+#: src/qtui/menus.cc:115
 msgid "_Add Folder ..."
 msgstr "_Добави папка..."
 
-#: src/qtui/main_window_actions.cc:101
+#: src/qtui/menus.cc:128
 msgid "_Log Inspector ..."
 msgstr "Инспектор на от_чети..."
 
-#: src/qtui/main_window.cc:64
-msgid "Open Files"
-msgstr "Отваряне на файлове"
+#: src/qtui/menus.cc:220
+msgid "_Find ..."
+msgstr "_Намери ..."
 
-#: src/qtui/main_window.cc:66
-msgid "Add Files"
-msgstr "Добавяне на файлове"
+#: src/qtui/menus.cc:256 src/skins/menus.cc:80 src/skins-qt/menus.cc:70
+msgid "Audio Settings ..."
+msgstr "Настройки на звук..."
 
-#: src/qtui/main_window.cc:71 src/skins/menus.cc:90
-msgid "Previous"
-msgstr "Предишен"
+#: src/qtui/playlist_model.cc:188
+msgid "Q#"
+msgstr "Q#"
 
-#: src/qtui/main_window.cc:77 src/skins/menus.cc:82
-msgid "Repeat"
-msgstr "Повторение"
+#: src/qtui/playlist_model.cc:190
+msgid "T#"
+msgstr "T#"
 
-#: src/qtui/main_window.cc:79 src/skins/menus.cc:83
-msgid "Shuffle"
-msgstr "Прескачане"
+#: src/qtui/playlist_model.cc:192
+msgid "C#"
+msgstr ""
 
-#: src/qtui/qtui.cc:42
+#: src/qtui/playlist_model.cc:194
+msgid "D#"
+msgstr ""
+
+#: src/qtui/qtui.cc:40
 msgid "Qt Interface"
 msgstr "Qt Интерфейс"
 
+#: src/qtui/search_bar.cc:46
+msgid "Search playlist"
+msgstr "Търсене в списъка"
+
+#: src/qtui/settings.cc:79
+msgid "Use bold font for column headers"
+msgstr "Използване на удебелен шрифт за заглавките на колоните"
+
 #: src/resample/resample.cc:43
 msgid "Sample Rate Converter"
 msgstr "Промяна на честотата на дискретизация"
@@ -2903,7 +3197,7 @@
 msgid "Method:"
 msgstr "Метод:"
 
-#: src/resample/resample.cc:199 src/sox-resampler/sox-resampler.cc:161
+#: src/resample/resample.cc:199 src/soxr/sox-resampler.cc:203
 msgid "Rate:"
 msgstr "Честота:"
 
@@ -2955,66 +3249,56 @@
 msgid "192 kHz:"
 msgstr "192 кХц:"
 
-#: src/scrobbler2/config_window.cc:41
-#, c-format
-msgid "OK. Scrobbling for user: %s"
-msgstr "Добре. Споделяне за потребител: %s"
-
-#: src/scrobbler2/config_window.cc:54
-msgid "Permission Denied"
-msgstr "Нямате права"
+#: src/scrobbler2/config_window.cc:29
+msgid "Checking Last.fm access ..."
+msgstr "Проверяване на Last.fm достъп ..."
 
-#: src/scrobbler2/config_window.cc:56
-msgid "Access the following link to allow Audacious to scrobble your plays:"
+#: src/scrobbler2/config_window.cc:35
+msgid ""
+"Your scrobbles are being saved on your computer temporarily. They will be "
+"submitted as soon as Audacious is allowed access."
 msgstr ""
-"Посетете връзката, за да позволите на Audacious, да споделя Вашите "
-"изпълнения:"
+"Вашите споделяния се запазват на Вашия компютър временно. Ще бъдат изпратени "
+"веднага след даване на права на Audacious."
 
-#: src/scrobbler2/config_window.cc:66
-msgid "Keep this window open and click 'Check Permission' again.\n"
+#: src/scrobbler2/config_window.cc:41
+#, c-format
+msgid "Permission granted. Scrobbling for user %s."
 msgstr ""
-"Запазете този прозорец отворен и отново изберете „Проверка на права“.\n"
+"Получено е разрешение. Изпращане на слушаните изпълнения за потребител %s."
 
-#: src/scrobbler2/config_window.cc:69 src/scrobbler2/config_window.cc:80
+#: src/scrobbler2/config_window.cc:44
 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."
+"Permission denied. Open the following URL in a browser, allow Audacious "
+"access to your account, and then click 'Check Permission' again:"
 msgstr ""
-"Не се притеснявайте. Вашите споделяния са запаметени на компютъра.\n"
-"Ще бъдат изпратени веднага след като на Audacious му бъде позволено."
-
-#: src/scrobbler2/config_window.cc:77
-msgid "Network Problem."
-msgstr "Интернет проблем."
+"Отказано е разрешение. Отворете следния URL в браузер, позволете на "
+"Audacious достъп до вашия акаунт и тогава кликнете 'Проверка за Разрешение' "
+"отново:"
 
-#: src/scrobbler2/config_window.cc:78
-msgid "There was a problem contacting Last.fm. Please try again later."
-msgstr "Възникна проблем при свързване с Last.fm. Опитайте по-късно."
+#: src/scrobbler2/config_window.cc:53
+msgid "There was a problem contacting Last.fm."
+msgstr "Възникна проблем при свързването с Last.fm"
 
-#: src/scrobbler2/config_window.cc:110
-msgid "Checking..."
-msgstr "Проверка..."
+#: src/scrobbler2/config_window.cc:92
+msgid "Check Permission"
+msgstr "Проверка за Разрешение"
 
-#: src/scrobbler2/config_window.cc:176
-msgid "C_heck Permission"
-msgstr "П_роверка на права"
+#: src/scrobbler2/config_window.cc:93
+msgid "Revoke Permission"
+msgstr "Отказване на Разрешение"
 
-#: src/scrobbler2/config_window.cc:177
-msgid "_Revoke Permission"
-msgstr "_Връщане на права"
-
-#: src/scrobbler2/config_window.cc:220
-msgid ""
-"You need to allow Audacious to scrobble tracks to your Last.fm account.\n"
+#: src/scrobbler2/config_window.cc:97
+msgid "You need to allow Audacious to scrobble tracks to your Last.fm account."
 msgstr ""
-"Нужно е да позволите на Audacious да споделя записите във Вашият Last.fm "
-"профил.\n"
+"Нужно е да позволите на Audacious да споделя слушаните изпълнения във вашия "
+"Last.fm акаунт."
 
 #: src/scrobbler2/scrobbler.cc:29
 msgid "Scrobbler 2.0"
 msgstr "Споделяне 2.0"
 
-#: src/scrobbler2/scrobbler.cc:224
+#: src/scrobbler2/scrobbler.cc:200
 msgid ""
 "The Scrobbler plugin could not be started.\n"
 "There might be a problem with your installation."
@@ -3022,36 +3306,21 @@
 "Приставката Споделяне на песен не може да се стартира.\n"
 "Може би има проблем с инсталацията."
 
-#: src/scrobbler2/scrobbler.cc:289
+#: src/scrobbler2/scrobbler.cc:245
 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"
+"project."
 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_communication.cc:642
-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/sdlout.cc:48
+#: src/sdlout/sdlout.cc:43
 msgid "SDL Output"
 msgstr "SDL изход"
 
-#: src/sdlout/sdlout.cc:77
+#: src/sdlout/sdlout.cc:72
 msgid ""
 "SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
@@ -3059,56 +3328,43 @@
 "Изходна приставка SDL за Audacious\n"
 "Авторски права 2010 John Lindgren"
 
-#: src/search-tool/search-tool.cc:116 src/search-tool/search-tool.cc:124
+#: src/search-tool/library.cc:35 src/search-tool/library.cc:46
+#: src/search-tool-qt/library.cc:35 src/search-tool-qt/library.cc:46
 msgid "Library"
 msgstr "Библиотека"
 
-#: src/search-tool/search-tool.cc:394
-#, c-format
-msgid "%d result"
-msgid_plural "%d results"
-msgstr0 "%d резултат"
-msgstr1 "%d резултати"
-
-#: src/search-tool/search-tool.cc:400
-#, c-format
-msgid "(%d hidden)"
-msgid_plural "(%d hidden)"
-msgstr0 "(%d скрит)"
-msgstr1 "(%d скрити)"
-
-#: src/search-tool/search-tool.cc:594
+#: src/search-tool-qt/search-model.cc:44 src/search-tool/search-tool.cc:287
 #, c-format
 msgid "%d song"
 msgid_plural "%d songs"
 msgstr0 "%d песен"
 msgstr1 "%d песни"
 
-#: src/search-tool/search-tool.cc:601
+#: src/search-tool-qt/search-model.cc:53 src/search-tool/search-tool.cc:294
 msgid "of this genre"
 msgstr "на този жанр"
 
-#: src/search-tool/search-tool.cc:607
+#: src/search-tool-qt/search-model.h:47 src/search-tool/search-model.h:45
 msgid "on"
 msgstr "на"
 
-#: src/search-tool/search-tool.cc:607
+#: src/search-tool-qt/search-model.h:47 src/search-tool/search-model.h:45
 msgid "by"
 msgstr "от"
 
-#: src/search-tool/search-tool.cc:643
-msgid "_Create Playlist"
-msgstr "_Създай списък"
-
-#: src/search-tool/search-tool.cc:645
-msgid "_Add to Playlist"
-msgstr "_Добавяне в списък"
-
-#: src/search-tool/search-tool.cc:684
-msgid "Search library"
-msgstr "Търсене в библиотека"
+#: src/search-tool-qt/search-tool-qt.cc:165 src/search-tool/search-tool.cc:74
+msgid "Number of results to show:"
+msgstr "Брой на показваните резултати:"
+
+#: src/search-tool-qt/search-tool-qt.cc:168 src/search-tool/search-tool.cc:77
+msgid "Rescan library at startup"
+msgstr "Сканиране на библиотеката при стартиране"
+
+#: src/search-tool-qt/search-tool-qt.cc:170
+msgid "Monitor library for changes"
+msgstr "Наблюдаване на библиотеката за промени"
 
-#: src/search-tool/search-tool.cc:688
+#: src/search-tool-qt/search-tool-qt.cc:193 src/search-tool/search-tool.cc:450
 msgid ""
 "To import your music library into Audacious, choose a folder and then click "
 "the \"refresh\" icon."
@@ -3116,22 +3372,44 @@
 "За да внесете музикална библиотека в Audacious, изберете папка и кликнете на "
 "бутона \"Опресняване\"."
 
-#: src/search-tool/search-tool.cc:696
+#: src/search-tool-qt/search-tool-qt.cc:195 src/search-tool/search-tool.cc:459
 msgid "Please wait ..."
 msgstr "Моля изчакайте..."
 
-#: src/search-tool/search-tool.cc:723
+#: src/search-tool-qt/search-tool-qt.cc:197 src/search-tool/search-tool.cc:487
 msgid "Choose Folder"
 msgstr "Избор на папка"
 
+#: src/search-tool-qt/search-tool-qt.cc:201 src/search-tool/search-tool.cc:445
+msgid "Search library"
+msgstr "Търсене в библиотека"
+
+#: src/search-tool-qt/search-tool-qt.cc:327 src/search-tool/search-tool.cc:156
+#, c-format
+msgid "%d of %d result shown"
+msgid_plural "%d of %d results shown"
+msgstr0 "%d от %d резултат е показан"
+msgstr1 "%d от %d резултати са показани"
+
+#: src/search-tool-qt/search-tool-qt.cc:331 src/search-tool/search-tool.cc:160
+#, c-format
+msgid "%d result"
+msgid_plural "%d results"
+msgstr0 "%d резултат"
+msgstr1 "%d резултати"
+
+#: src/search-tool-qt/search-tool-qt.cc:501 src/search-tool/search-tool.cc:341
+msgid "_Create Playlist"
+msgstr "_Създай списък"
+
+#: src/search-tool-qt/search-tool-qt.cc:503 src/search-tool/search-tool.cc:343
+msgid "_Add to Playlist"
+msgstr "_Добавяне в списък"
+
 #: src/sid/xmms-sid.cc:43
 msgid "SID Player"
 msgstr "SID Плейър"
 
-#: src/sid/xs_config.cc:61
-msgid "Output"
-msgstr "Изход"
-
 #: src/sid/xs_config.cc:62
 msgid "Channels:"
 msgstr "Канали:"
@@ -3212,741 +3490,685 @@
 msgid "Threshold:"
 msgstr "Праг:"
 
-#: src/silence-removal/silence-removal.cc:70
-msgid "dB"
-msgstr "дБ"
+#: src/skins/actions.cc:45 src/skins-qt/actions.cc:43
+msgid "Repeat points cleared."
+msgstr "Точките на повторение са изчистени."
+
+#: src/skins/actions.cc:60 src/skins-qt/actions.cc:58
+msgid "Repeat point A set."
+msgstr "Зададена е начална точка на повторение."
+
+#: src/skins/actions.cc:65 src/skins-qt/actions.cc:63
+msgid "Repeat point B set."
+msgstr "Зададена е крайна точка на повторение."
+
+#: src/skins/equalizer.cc:223 src/skins-qt/equalizer.cc:223
+msgid "Preamp"
+msgstr "Предусилвател"
+
+#: src/skins/equalizer.cc:227 src/skins-qt/equalizer.cc:227
+msgid "31 Hz"
+msgstr "31 Хц"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "63 Hz"
+msgstr "63 Хц"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "125 Hz"
+msgstr "125 Хц"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "250 Hz"
+msgstr "250 Хц"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "500 Hz"
+msgstr "500 Хц"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "1 kHz"
+msgstr "1 кХц"
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "2 kHz"
+msgstr "2 кХц"
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "4 kHz"
+msgstr "4 кХц"
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "8 kHz"
+msgstr "8 кХц"
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "16 kHz"
+msgstr "16 кХц"
+
+#: src/skins/equalizer.cc:270 src/skins-qt/equalizer.cc:270
+msgid "Audacious Equalizer"
+msgstr "Тонкоректор на Audacious"
+
+#: src/skins/main.cc:459 src/skins-qt/main.cc:442
+msgid "Recording on"
+msgstr "Записване - включено"
+
+#: src/skins/main.cc:461 src/skins-qt/main.cc:444
+msgid "Recording off"
+msgstr "Записване - изключено"
+
+#: src/skins/main.cc:754 src/skins-qt/main.cc:701
+#, c-format
+msgid "Seek to %d:%-2.2d / %d:%-2.2d"
+msgstr "Превъртане до %d:%-2.2d / %d:%-2.2d"
+
+#: src/skins/main.cc:771 src/skins-qt/main.cc:718
+#, c-format
+msgid "Volume: %d%%"
+msgstr "Сила на звука: %d%%"
+
+#: src/skins/main.cc:784 src/skins-qt/main.cc:731
+#, c-format
+msgid "Balance: %d%% left"
+msgstr "Баланс: %d%% ляво"
+
+#: src/skins/main.cc:786 src/skins-qt/main.cc:733
+msgid "Balance: center"
+msgstr "Баланс: център"
+
+#: src/skins/main.cc:788 src/skins-qt/main.cc:735
+#, c-format
+msgid "Balance: %d%% right"
+msgstr "Баланс: %d%% дясно"
+
+#: src/skins/main.cc:880 src/skins-qt/main.cc:827
+msgid "Options Menu"
+msgstr "Меню с опции"
+
+#: src/skins/main.cc:884 src/skins-qt/main.cc:831
+msgid "Disable 'Always On Top'"
+msgstr "Деактивиране на „Винаги отгоре“"
+
+#: src/skins/main.cc:886 src/skins-qt/main.cc:833
+msgid "Enable 'Always On Top'"
+msgstr "Активиране на „Винаги отгоре“"
+
+#: src/skins/main.cc:889 src/skins-qt/main.cc:836
+msgid "File Info Box"
+msgstr "Кутийка с информация за файла"
 
-#: src/skins/menus.cc:64
+#: src/skins/main.cc:892 src/skins/menus.cc:149 src/skins-qt/main.cc:839
+#: src/skins-qt/menus.cc:142
+msgid "Double Size"
+msgstr "Двоен Размер"
+
+#: src/skins/main.cc:895 src/skins-qt/main.cc:842
+msgid "Visualizations"
+msgstr "Визуализации"
+
+#: src/skins/menus.cc:74 src/skins-qt/menus.cc:64
+msgid "Volume Up"
+msgstr "Усилване на звука"
+
+#: src/skins/menus.cc:75 src/skins-qt/menus.cc:65
+msgid "Volume Down"
+msgstr "Намаляне на звука"
+
+#: src/skins/menus.cc:77 src/skins-qt/menus.cc:67
+msgid "Effects ..."
+msgstr "Ефекти..."
+
+#: src/skins/menus.cc:84 src/skins-qt/menus.cc:74
 msgid "Open Files ..."
 msgstr "Отваряне на файлове..."
 
-#: src/skins/menus.cc:65
+#: src/skins/menus.cc:85 src/skins-qt/menus.cc:76
 msgid "Open URL ..."
 msgstr "Отваряне на интернет адрес..."
 
-#: src/skins/menus.cc:66
-msgid "Search Library"
-msgstr "Търсене в библиотеката"
-
-#: src/skins/menus.cc:68
-msgid "Playback"
-msgstr "Възпроизвеждане"
-
-#: src/skins/menus.cc:69
+#: src/skins/menus.cc:89 src/skins-qt/menus.cc:80
 msgid "Playlist"
 msgstr "Списък за изпълнение"
 
-#: src/skins/menus.cc:70
+#: src/skins/menus.cc:90 src/skins-qt/menus.cc:81
+msgid "Output"
+msgstr "Изход"
+
+#: src/skins/menus.cc:91 src/skins-qt/menus.cc:82
 msgid "View"
 msgstr "Изглед"
 
-#: src/skins/menus.cc:72 src/skins/menus.cc:136 src/skins/menus.cc:149
-#: src/skins/menus.cc:214
+#: src/skins/menus.cc:93 src/skins/menus.cc:161 src/skins/menus.cc:174
+#: src/skins/menus.cc:245 src/skins-qt/menus.cc:84 src/skins-qt/menus.cc:156
+#: src/skins-qt/menus.cc:170 src/skins-qt/menus.cc:241
 msgid "Services"
 msgstr "Услуги"
 
-#: src/skins/menus.cc:74
+#: src/skins/menus.cc:95 src/skins-qt/menus.cc:86
 msgid "About ..."
 msgstr "Относно..."
 
-#: src/skins/menus.cc:75
+#: src/skins/menus.cc:96 src/skins-qt/menus.cc:87
 msgid "Settings ..."
 msgstr "Настройки..."
 
-#: src/skins/menus.cc:76
+#: src/skins/menus.cc:97 src/skins-qt/menus.cc:88
 msgid "Quit"
 msgstr "Изход"
 
-#: src/skins/menus.cc:80 src/skins/menus.cc:206
+#: src/skins/menus.cc:101 src/skins/menus.cc:235 src/skins-qt/menus.cc:92
+#: src/skins-qt/menus.cc:231
 msgid "Song Info ..."
 msgstr "Информация за песен..."
 
-#: src/skins/menus.cc:84
+#: src/skins/menus.cc:105 src/skins-qt/menus.cc:96
+msgid "Shuffle by Album"
+msgstr "Разбъркване по албум"
+
+#: src/skins/menus.cc:106 src/skins-qt/menus.cc:97
 msgid "No Playlist Advance"
 msgstr "Без продължаване в списъка"
 
-#: src/skins/menus.cc:85
-msgid "Stop After This Song"
-msgstr "Спиране след тази песен"
-
-#: src/skins/menus.cc:93
+#: src/skins/menus.cc:117 src/skins-qt/menus.cc:108
 msgid "Set A-B Repeat"
 msgstr "Задаване на А-Б повторение"
 
-#: src/skins/menus.cc:94
+#: src/skins/menus.cc:118 src/skins-qt/menus.cc:109
 msgid "Clear A-B Repeat"
 msgstr "Изчистване на А-Б повторение"
 
-#: src/skins/menus.cc:96
+#: src/skins/menus.cc:120 src/skins-qt/menus.cc:111
 msgid "Jump to Song ..."
 msgstr "Прескачане до песен..."
 
-#: src/skins/menus.cc:97
+#: src/skins/menus.cc:121 src/skins-qt/menus.cc:113
 msgid "Jump to Time ..."
 msgstr "Прескачане до време..."
 
-#: src/skins/menus.cc:101
+#: src/skins/menus.cc:125 src/skins-qt/menus.cc:118
 msgid "Play/Resume"
 msgstr "Възпроизвеждане/Възобновяване"
 
-#: src/skins/menus.cc:103
+#: src/skins/menus.cc:127 src/skins-qt/menus.cc:120
 msgid "New Playlist"
 msgstr "Нов списък"
 
-#: src/skins/menus.cc:104
+#: src/skins/menus.cc:128 src/skins-qt/menus.cc:121
 msgid "Rename Playlist ..."
 msgstr "Преименуване на списък..."
 
-#: src/skins/menus.cc:105
+#: src/skins/menus.cc:129 src/skins-qt/menus.cc:122
 msgid "Remove Playlist"
 msgstr "Премахване на списък..."
 
-#: src/skins/menus.cc:107
+#: src/skins/menus.cc:131 src/skins-qt/menus.cc:124
 msgid "Previous Playlist"
 msgstr "Предишен списък"
 
-#: src/skins/menus.cc:108
+#: src/skins/menus.cc:132 src/skins-qt/menus.cc:125
 msgid "Next Playlist"
 msgstr "Следващ списък"
 
-#: src/skins/menus.cc:110
+#: src/skins/menus.cc:134 src/skins-qt/menus.cc:127
 msgid "Import Playlist ..."
 msgstr "Внасяне на списък..."
 
-#: src/skins/menus.cc:111
+#: src/skins/menus.cc:135 src/skins-qt/menus.cc:128
 msgid "Export Playlist ..."
 msgstr "Изнасяне на списък..."
 
-#: src/skins/menus.cc:113
+#: src/skins/menus.cc:137 src/skins-qt/menus.cc:130
 msgid "Playlist Manager ..."
 msgstr "Мениджър на списъци..."
 
-#: src/skins/menus.cc:114
+#: src/skins/menus.cc:138 src/skins-qt/menus.cc:131
 msgid "Queue Manager ..."
 msgstr "Мениджър на опашките..."
 
-#: src/skins/menus.cc:116
+#: src/skins/menus.cc:140 src/skins-qt/menus.cc:133
 msgid "Refresh Playlist"
 msgstr "Опресняване на списък"
 
-#: src/skins/menus.cc:120
+#: src/skins/menus.cc:144 src/skins-qt/menus.cc:137
 msgid "Show Playlist Editor"
 msgstr "Показване на редактор на списъка"
 
-#: src/skins/menus.cc:121
+#: src/skins/menus.cc:145 src/skins-qt/menus.cc:138
 msgid "Show Equalizer"
 msgstr "Показване на тонкоректор"
 
-#: src/skins/menus.cc:123
+#: src/skins/menus.cc:147 src/skins-qt/menus.cc:140
 msgid "Show Remaining Time"
 msgstr "Показвай оставащо време"
 
-#: src/skins/menus.cc:125
+#: src/skins/menus.cc:150 src/skins-qt/menus.cc:143
 msgid "Always on Top"
 msgstr "Винаги отгоре"
 
-#: src/skins/menus.cc:126
+#: src/skins/menus.cc:151 src/skins-qt/menus.cc:145
 msgid "On All Workspaces"
 msgstr "На всички работни среди"
 
-#: src/skins/menus.cc:128
+#: src/skins/menus.cc:153 src/skins-qt/menus.cc:148
 msgid "Roll Up Player"
 msgstr "Свиване на плеър"
 
-#: src/skins/menus.cc:129
+#: src/skins/menus.cc:154 src/skins-qt/menus.cc:149
 msgid "Roll Up Playlist Editor"
 msgstr "Свиване на редактора на списъци"
 
-#: src/skins/menus.cc:130
+#: src/skins/menus.cc:155 src/skins-qt/menus.cc:150
 msgid "Roll Up Equalizer"
 msgstr "Свиване на тонкоректор"
 
-#: src/skins/menus.cc:132 src/skins/ui_main.cc:854
-msgid "Double Size"
-msgstr "Двоен Размер"
-
-#: src/skins/menus.cc:138
+#: src/skins/menus.cc:163 src/skins-qt/menus.cc:158
 msgid "Add URL ..."
 msgstr "Добавяне на интернет адрес..."
 
-#: src/skins/menus.cc:139
+#: src/skins/menus.cc:164 src/skins-qt/menus.cc:160
 msgid "Add Files ..."
 msgstr "Добавяне на файлове..."
 
-#: src/skins/menus.cc:143 src/skins/menus.cc:171 src/skins/menus.cc:185
+#: src/skins/menus.cc:168 src/skins/menus.cc:196 src/skins/menus.cc:212
+#: src/skins-qt/menus.cc:164 src/skins-qt/menus.cc:192
+#: src/skins-qt/menus.cc:208
 msgid "By Title"
 msgstr "По заглавие"
 
-#: src/skins/menus.cc:144 src/skins/menus.cc:178 src/skins/menus.cc:192
+#: src/skins/menus.cc:169 src/skins/menus.cc:203 src/skins/menus.cc:219
+#: src/skins-qt/menus.cc:165 src/skins-qt/menus.cc:199
+#: src/skins-qt/menus.cc:215
 msgid "By File Name"
 msgstr "По име на файл"
 
-#: src/skins/menus.cc:145 src/skins/menus.cc:179 src/skins/menus.cc:193
+#: src/skins/menus.cc:170 src/skins/menus.cc:204 src/skins/menus.cc:220
+#: src/skins-qt/menus.cc:166 src/skins-qt/menus.cc:200
+#: src/skins-qt/menus.cc:216
 msgid "By File Path"
 msgstr "По път до файл"
 
-#: src/skins/menus.cc:151
+#: src/skins/menus.cc:176 src/skins-qt/menus.cc:172
 msgid "Remove All"
 msgstr "Премахване на всички"
 
-#: src/skins/menus.cc:152
+#: src/skins/menus.cc:177 src/skins-qt/menus.cc:173
 msgid "Clear Queue"
 msgstr "Изчистване на опашката"
 
-#: src/skins/menus.cc:154
+#: src/skins/menus.cc:179 src/skins-qt/menus.cc:175
 msgid "Remove Unavailable Files"
 msgstr "Премахване на липсващите файлове"
 
-#: src/skins/menus.cc:155
+#: src/skins/menus.cc:180 src/skins-qt/menus.cc:176
 msgid "Remove Duplicates"
 msgstr "Премахване на повторения"
 
-#: src/skins/menus.cc:157
+#: src/skins/menus.cc:182 src/skins-qt/menus.cc:178
 msgid "Remove Unselected"
 msgstr "Премахване на неизбраните"
 
-#: src/skins/menus.cc:158
+#: src/skins/menus.cc:183 src/skins-qt/menus.cc:179
 msgid "Remove Selected"
 msgstr "Премахване на избраните"
 
-#: src/skins/menus.cc:162
+#: src/skins/menus.cc:187 src/skins-qt/menus.cc:183
 msgid "Search and Select"
 msgstr "Търсене и избиране"
 
-#: src/skins/menus.cc:164
+#: src/skins/menus.cc:189 src/skins-qt/menus.cc:185
 msgid "Invert Selection"
 msgstr "Обръщане на избраното"
 
-#: src/skins/menus.cc:165
+#: src/skins/menus.cc:190 src/skins-qt/menus.cc:186
 msgid "Select None"
 msgstr "Без избрани"
 
-#: src/skins/menus.cc:166
+#: src/skins/menus.cc:191 src/skins-qt/menus.cc:187
 msgid "Select All"
 msgstr "Избор на всички"
 
-#: src/skins/menus.cc:170 src/skins/menus.cc:184
+#: src/skins/menus.cc:195 src/skins/menus.cc:211 src/skins-qt/menus.cc:191
+#: src/skins-qt/menus.cc:207
 msgid "By Track Number"
 msgstr "По номер на записа"
 
-#: src/skins/menus.cc:172 src/skins/menus.cc:186
+#: src/skins/menus.cc:197 src/skins/menus.cc:213 src/skins-qt/menus.cc:193
+#: src/skins-qt/menus.cc:209
 msgid "By Artist"
 msgstr "По изпълнител"
 
-#: src/skins/menus.cc:173 src/skins/menus.cc:187
+#: src/skins/menus.cc:198 src/skins/menus.cc:214 src/skins-qt/menus.cc:194
+#: src/skins-qt/menus.cc:210
 msgid "By Album"
 msgstr "По Албум"
 
-#: src/skins/menus.cc:174 src/skins/menus.cc:188
+#: src/skins/menus.cc:199 src/skins/menus.cc:215 src/skins-qt/menus.cc:195
+#: src/skins-qt/menus.cc:211
 msgid "By Album Artist"
 msgstr "По изпълнител на албум"
 
-#: src/skins/menus.cc:175 src/skins/menus.cc:190
+#: src/skins/menus.cc:200 src/skins/menus.cc:216 src/skins-qt/menus.cc:196
+#: src/skins-qt/menus.cc:212
 msgid "By Release Date"
 msgstr "По дата на издаване"
 
-#: src/skins/menus.cc:176 src/skins/menus.cc:189
+#: src/skins/menus.cc:201 src/skins/menus.cc:217 src/skins-qt/menus.cc:197
+#: src/skins-qt/menus.cc:213
 msgid "By Genre"
 msgstr "По жанр"
 
-#: src/skins/menus.cc:177 src/skins/menus.cc:191
+#: src/skins/menus.cc:202 src/skins/menus.cc:218 src/skins-qt/menus.cc:198
+#: src/skins-qt/menus.cc:214
 msgid "By Length"
 msgstr "По времетраене"
 
-#: src/skins/menus.cc:180 src/skins/menus.cc:194
+#: src/skins/menus.cc:205 src/skins/menus.cc:221 src/skins-qt/menus.cc:201
+#: src/skins-qt/menus.cc:217
 msgid "By Custom Title"
 msgstr "По избрано заглавие"
 
-#: src/skins/menus.cc:198
+#: src/skins/menus.cc:206 src/skins/menus.cc:222 src/skins-qt/menus.cc:202
+#: src/skins-qt/menus.cc:218
+msgid "By Comment"
+msgstr "По коментар"
+
+#: src/skins/menus.cc:207 src/skins/menus.cc:223 src/skins-qt/menus.cc:203
+#: src/skins-qt/menus.cc:219
+msgid "By Disc Number"
+msgstr ""
+
+#: src/skins/menus.cc:227 src/skins-qt/menus.cc:223
 msgid "Randomize List"
 msgstr "Случаен списък"
 
-#: src/skins/menus.cc:199
+#: src/skins/menus.cc:228 src/skins-qt/menus.cc:224
 msgid "Reverse List"
 msgstr "Обръщане на списъка"
 
-#: src/skins/menus.cc:201
+#: src/skins/menus.cc:230 src/skins-qt/menus.cc:226
 msgid "Sort Selected"
 msgstr "Подреждане на избраното"
 
-#: src/skins/menus.cc:202
+#: src/skins/menus.cc:231 src/skins-qt/menus.cc:227
 msgid "Sort List"
 msgstr "Подреждане на списъка"
 
-#: src/skins/menus.cc:208
+#: src/skins/menus.cc:236 src/skins-qt/menus.cc:232
+msgid "Open Containing Folder"
+msgstr "Отваряне на Съдържащата Папка"
+
+#: src/skins/menus.cc:238 src/skins-qt/menus.cc:234
 msgid "Cut"
 msgstr "Изрязване"
 
-#: src/skins/menus.cc:209
+#: src/skins/menus.cc:239 src/skins-qt/menus.cc:235
 msgid "Copy"
 msgstr "Копиране"
 
-#: src/skins/menus.cc:210
+#: src/skins/menus.cc:240 src/skins-qt/menus.cc:236
 msgid "Paste"
 msgstr "Поставяне"
 
-#: src/skins/menus.cc:212
+#: src/skins/menus.cc:241 src/skins-qt/menus.cc:237
+msgid "Paste at End"
+msgstr "Поставяне на Края"
+
+#: src/skins/menus.cc:243 src/skins-qt/menus.cc:239
 msgid "Queue/Unqueue"
 msgstr "На опашка/без опашка"
 
-#: src/skins/menus.cc:218
-msgid "Load Preset ..."
-msgstr "Зареди подготвени..."
-
-#: src/skins/menus.cc:219
-msgid "Load Auto Preset ..."
-msgstr "Зареди автоматично подготвени..."
-
-#: src/skins/menus.cc:220
-msgid "Load Default"
-msgstr "Зареди стандартни"
-
-#: src/skins/menus.cc:221
-msgid "Load Preset File ..."
-msgstr "Зареди файл с подготвени..."
-
-#: src/skins/menus.cc:222
-msgid "Load EQF File ..."
-msgstr "Зареди на EQF файл..."
-
-#: src/skins/menus.cc:224
-msgid "Save Preset ..."
-msgstr "Запази подготвено..."
-
-#: src/skins/menus.cc:225
-msgid "Save Auto Preset ..."
-msgstr "Запази автоматично подготвено..."
-
-#: src/skins/menus.cc:226
-msgid "Save Default"
-msgstr "Запази стандартно"
-
-#: src/skins/menus.cc:227
-msgid "Save Preset File ..."
-msgstr "Запази файл с подготвено..."
-
-#: src/skins/menus.cc:228
-msgid "Save EQF File ..."
-msgstr "Запамети EQF файл..."
-
-#: src/skins/menus.cc:230
-msgid "Delete Preset ..."
-msgstr "Изтрий подготвено..."
-
-#: src/skins/menus.cc:231
-msgid "Delete Auto Preset ..."
-msgstr "Изтрий автоматично подготвено..."
-
-#: src/skins/menus.cc:233
-msgid "Import Winamp Presets ..."
-msgstr "Внасяне на подготвени за Winamp..."
-
-#: src/skins/menus.cc:235
-msgid "Reset to Zero"
-msgstr "Върни до нула"
+#: src/skins/playlist-widget.cc:58 src/skins-qt/playlist-widget.cc:58
+#, c-format
+msgid "%s (%d of %d)"
+msgstr "%s (%d от %d)"
 
-#: src/skins/plugin.cc:48
+#: src/skins/playlistwin.cc:491 src/skins-qt/playlistwin.cc:478
+msgid "Audacious Playlist Editor"
+msgstr "Audacious Редактор на списъка за изпълнение"
+
+#: src/skins/plugin.cc:53 src/skins-qt/plugin.cc:65
 msgid "Winamp Classic Interface"
 msgstr "Класически изглед на Winamp"
 
-#: src/skins/preset-browser.cc:57 src/skins/preset-list.cc:371
-#: src/skins/preset-list.cc:386
-msgid "Save"
-msgstr "Запаметяване"
-
-#: src/skins/preset-browser.cc:57 src/skins/preset-list.cc:338
-#: src/skins/preset-list.cc:354
-msgid "Load"
-msgstr "Зареждане"
-
-#: src/skins/preset-browser.cc:83
-msgid "Load Preset File"
-msgstr "Зареди файл с подготвени"
-
-#: src/skins/preset-browser.cc:100
-msgid "Load EQF File"
-msgstr "Зареди EQF файл"
-
-#: src/skins/preset-browser.cc:119
-msgid "Save Preset File"
-msgstr "Запази файл с подготвено"
-
-#: src/skins/preset-browser.cc:137
-msgid "Save EQF File"
-msgstr "Запамети EQF файл"
-
-#: src/skins/preset-browser.cc:151
-msgid "Import Winamp Presets"
-msgstr "Внасяне на подготвени за Winamp"
-
-#: src/skins/preset-list.cc:285
-msgid "Presets"
-msgstr "Зададени"
-
-#: src/skins/preset-list.cc:335
-msgid "Load preset"
-msgstr "Зареждане на предложение"
-
-#: src/skins/preset-list.cc:351
-msgid "Load auto-preset"
-msgstr "Зареждане на автоматично предложение"
-
-#: src/skins/preset-list.cc:367
-msgid "Save preset"
-msgstr "Запазване на предложение"
-
-#: src/skins/preset-list.cc:382
-msgid "Save auto-preset"
-msgstr "Запазване на автоматично предложение"
-
-#: src/skins/preset-list.cc:408
-msgid "Delete preset"
-msgstr "Изтриване на предложение"
-
-#: src/skins/preset-list.cc:424
-msgid "Delete auto-preset"
-msgstr "Изтриване на автоматично предложение"
+#: src/skins-qt/menus.cc:75
+msgid "Open Folder ..."
+msgstr "Отваряне на папка..."
+
+#: src/skins-qt/menus.cc:159
+msgid "Add Folder ..."
+msgstr "Добавяне на папка..."
+
+#: src/skins-qt/search-select.cc:62 src/skins/search-select.cc:77
+msgid "Search entries in active playlist"
+msgstr "Търсене на записи в активния списък"
+
+#: src/skins-qt/search-select.cc:70 src/skins/search-select.cc:83
+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-qt/search-select.cc:75 src/skins/search-select.cc:91
+msgid "Title:"
+msgstr "Заглавие:"
+
+#: src/skins-qt/search-select.cc:79 src/skins/search-select.cc:96
+msgid "Album:"
+msgstr "Албум:"
+
+#: src/skins-qt/search-select.cc:82 src/skins/search-select.cc:101
+msgid "Artist:"
+msgstr "Изпълнител:"
+
+#: src/skins-qt/search-select.cc:85 src/skins/search-select.cc:106
+msgid "File Name:"
+msgstr "Име на файл:"
 
-#: src/skins/skins_cfg.cc:176
+#: src/skins-qt/search-select.cc:88 src/skins/search-select.cc:134
+msgid "Clear previous selection before searching"
+msgstr "Изчистване на предишния избор преди търсене"
+
+#: src/skins-qt/search-select.cc:89 src/skins/search-select.cc:137
+msgid "Automatically toggle queue for matching entries"
+msgstr "Автоматично превключване в опашката за съвпадащите елементи"
+
+#: src/skins-qt/search-select.cc:90 src/skins/search-select.cc:140
+msgid "Create a new playlist with matching entries"
+msgstr "Създаване на нов списък със съвпадащите елементи"
+
+#: src/skins-qt/search-select.cc:101 src/skins/search-select.cc:78
+msgid "Search"
+msgstr "Търсене"
+
+#: src/skins-qt/skins_cfg.cc:198 src/skins/skins_cfg.cc:182
 msgid "Player:"
 msgstr "Плейър:"
 
-#: src/skins/skins_cfg.cc:178
+#: src/skins-qt/skins_cfg.cc:200 src/skins/skins_cfg.cc:184
 msgid "Select main player window font:"
 msgstr "Избор на основен шрифт за прозореца на плеъра:"
 
-#: src/skins/skins_cfg.cc:179
+#: src/skins-qt/skins_cfg.cc:201 src/skins/skins_cfg.cc:185
 msgid "Playlist:"
 msgstr "Списък за изпълнение:"
 
-#: src/skins/skins_cfg.cc:181
+#: src/skins-qt/skins_cfg.cc:203 src/skins/skins_cfg.cc:187
 msgid "Select playlist font:"
 msgstr "Избор на шрифт за списъка:"
 
-#: src/skins/skins_cfg.cc:187
+#: src/skins-qt/skins_cfg.cc:207 src/skins/skins_cfg.cc:191
 msgid "Skin"
 msgstr "Кожа"
 
-#: src/skins/skins_cfg.cc:189
+#: src/skins-qt/skins_cfg.cc:211 src/skins/skins_cfg.cc:193
+msgid "Display active titlebar when any window is focused"
+msgstr ""
+"Показване на активната заглавна лента, когато някой прозорец е фокусиран"
+
+#: src/skins-qt/skins_cfg.cc:213 src/skins/skins_cfg.cc:195
 msgid "Fonts"
 msgstr "Шрифтове"
 
-#: src/skins/skins_cfg.cc:192
+#: src/skins-qt/skins_cfg.cc:215 src/skins/skins_cfg.cc:197
 msgid "Use bitmap fonts (supports ASCII only)"
 msgstr "Избор на растерни шрифтове (поддържа само ASCII)"
 
-#: src/skins/skins_cfg.cc:194
+#: src/skins-qt/skins_cfg.cc:217 src/skins/skins_cfg.cc:199
 msgid "Scroll song title"
 msgstr "Превъртане на заглавието на песента"
 
-#: src/skins/skins_cfg.cc:196
+#: src/skins-qt/skins_cfg.cc:219 src/skins/skins_cfg.cc:201
 msgid "Scroll song title in both directions"
 msgstr "Превъртане на заглавието на песента в двете посоки"
 
-#: src/skins/skins_cfg.cc:201
+#: src/skins-qt/skins_cfg.cc:224 src/skins/skins_cfg.cc:206
 msgid "Analyzer"
 msgstr "Анализатор"
 
-#: src/skins/skins_cfg.cc:202
+#: src/skins-qt/skins_cfg.cc:225 src/skins/skins_cfg.cc:207
 msgid "Scope"
 msgstr "Осцилоскоп"
 
-#: src/skins/skins_cfg.cc:203
+#: src/skins-qt/skins_cfg.cc:226 src/skins/skins_cfg.cc:208
 msgid "Voiceprint / VU meter"
 msgstr "Гласов отпечатък / VU-метър"
 
-#: src/skins/skins_cfg.cc:204
+#: src/skins-qt/skins_cfg.cc:227 src/skins/skins_cfg.cc:209
 msgid "Off"
 msgstr "Изглючено"
 
-#: src/skins/skins_cfg.cc:208 src/skins/skins_cfg.cc:233
-#: src/skins/skins_cfg.cc:239
+#: src/skins-qt/skins_cfg.cc:231 src/skins-qt/skins_cfg.cc:256
+#: src/skins-qt/skins_cfg.cc:262 src/skins/skins_cfg.cc:213
+#: src/skins/skins_cfg.cc:238 src/skins/skins_cfg.cc:244
 msgid "Normal"
 msgstr "Нормално"
 
-#: src/skins/skins_cfg.cc:209 src/skins/skins_cfg.cc:234
+#: src/skins-qt/skins_cfg.cc:232 src/skins-qt/skins_cfg.cc:257
+#: src/skins/skins_cfg.cc:214 src/skins/skins_cfg.cc:239
 msgid "Fire"
 msgstr "Огън"
 
-#: src/skins/skins_cfg.cc:210
+#: src/skins-qt/skins_cfg.cc:233 src/skins/skins_cfg.cc:215
 msgid "Vertical lines"
 msgstr "Вертикални линии"
 
-#: src/skins/skins_cfg.cc:214
+#: src/skins-qt/skins_cfg.cc:237 src/skins/skins_cfg.cc:219
 msgid "Lines"
 msgstr "Линии"
 
-#: src/skins/skins_cfg.cc:215
+#: src/skins-qt/skins_cfg.cc:238 src/skins/skins_cfg.cc:220
 msgid "Bars"
 msgstr "Стълбове"
 
-#: src/skins/skins_cfg.cc:219
+#: src/skins-qt/skins_cfg.cc:242 src/skins/skins_cfg.cc:224
 msgid "Slowest"
 msgstr "Най-бавно"
 
-#: src/skins/skins_cfg.cc:220
+#: src/skins-qt/skins_cfg.cc:243 src/skins/skins_cfg.cc:225
 msgid "Slow"
 msgstr "Бавно"
 
-#: src/skins/skins_cfg.cc:221 src/sox-resampler/sox-resampler.cc:152
+#: src/skins-qt/skins_cfg.cc:244 src/skins/skins_cfg.cc:226
+#: src/soxr/sox-resampler.cc:180
 msgid "Medium"
 msgstr "Средно"
 
-#: src/skins/skins_cfg.cc:222
+#: src/skins-qt/skins_cfg.cc:245 src/skins/skins_cfg.cc:227
 msgid "Fast"
 msgstr "Бързо"
 
-#: src/skins/skins_cfg.cc:223
+#: src/skins-qt/skins_cfg.cc:246 src/skins/skins_cfg.cc:228
 msgid "Fastest"
 msgstr "Най-бързо"
 
-#: src/skins/skins_cfg.cc:227
+#: src/skins-qt/skins_cfg.cc:250 src/skins/skins_cfg.cc:232
 msgid "Dots"
 msgstr "Точки"
 
-#: src/skins/skins_cfg.cc:228
+#: src/skins-qt/skins_cfg.cc:251 src/skins/skins_cfg.cc:233
 msgid "Line"
 msgstr "Линия"
 
-#: src/skins/skins_cfg.cc:229
+#: src/skins-qt/skins_cfg.cc:252 src/skins/skins_cfg.cc:234
 msgid "Solid"
 msgstr "Плътно"
 
-#: src/skins/skins_cfg.cc:235
+#: src/skins-qt/skins_cfg.cc:258 src/skins/skins_cfg.cc:240
 msgid "Ice"
 msgstr "Лед"
 
-#: src/skins/skins_cfg.cc:240
+#: src/skins-qt/skins_cfg.cc:263 src/skins/skins_cfg.cc:245
 msgid "Smooth"
 msgstr "Размито"
 
-#: src/skins/skins_cfg.cc:244
-msgid "Type"
-msgstr "Вид"
-
-#: src/skins/skins_cfg.cc:245
-msgid "Visualization type:"
-msgstr "Вид на визуализация:"
-
-#: src/skins/skins_cfg.cc:248
-msgid "Analyzer"
-msgstr "Анализатор"
-
-#: src/skins/skins_cfg.cc:249
-msgid "Show peaks"
-msgstr "Показвай пикове"
-
-#: src/skins/skins_cfg.cc:251
+#: src/skins-qt/skins_cfg.cc:267 src/skins/skins_cfg.cc:249
 msgid "Coloring:"
 msgstr "Оцветяване:"
 
-#: src/skins/skins_cfg.cc:254
+#: src/skins-qt/skins_cfg.cc:270 src/skins/skins_cfg.cc:252
 msgid "Style:"
 msgstr "Стил:"
 
-#: src/skins/skins_cfg.cc:257
+#: src/skins-qt/skins_cfg.cc:273 src/skins/skins_cfg.cc:255
 msgid "Falloff:"
 msgstr "Падане:"
 
-#: src/skins/skins_cfg.cc:260
+#: src/skins-qt/skins_cfg.cc:276 src/skins/skins_cfg.cc:258
 msgid "Peak falloff:"
 msgstr "Падане на пиковете:"
 
-#: src/skins/skins_cfg.cc:264
+#: src/skins-qt/skins_cfg.cc:282 src/skins/skins_cfg.cc:264
 msgid "Scope Style:"
 msgstr "Осцилоскопичен стил:"
 
-#: src/skins/skins_cfg.cc:267
+#: src/skins-qt/skins_cfg.cc:285 src/skins/skins_cfg.cc:267
 msgid "Voiceprint Coloring:"
 msgstr "Цвят на гласовия отпечатък:"
 
-#: src/skins/skins_cfg.cc:270
+#: src/skins-qt/skins_cfg.cc:288 src/skins/skins_cfg.cc:270
 msgid "VU Meter Style:"
 msgstr "Стил на VU-метър:"
 
-#: src/skins/skins_cfg.cc:276
-msgid "General"
-msgstr "Общи"
-
-#: src/skins/skins_cfg.cc:277
-msgid "Visualization"
-msgstr "Изобразяване"
-
-#: src/skins/ui_equalizer.cc:282
-msgid "Preamp"
-msgstr "Предусилвател"
-
-#: src/skins/ui_equalizer.cc:286
-msgid "31 Hz"
-msgstr "31 Хц"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "63 Hz"
-msgstr "63 Хц"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "125 Hz"
-msgstr "125 Хц"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "250 Hz"
-msgstr "250 Хц"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "500 Hz"
-msgstr "500 Хц"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "1 kHz"
-msgstr "1 кХц"
-
-#: src/skins/ui_equalizer.cc:288
-msgid "2 kHz"
-msgstr "2 кХц"
-
-#: src/skins/ui_equalizer.cc:288
-msgid "4 kHz"
-msgstr "4 кХц"
-
-#: src/skins/ui_equalizer.cc:288
-msgid "8 kHz"
-msgstr "8 кХц"
-
-#: src/skins/ui_equalizer.cc:288
-msgid "16 kHz"
-msgstr "16 кХц"
-
-#: src/skins/ui_equalizer.cc:330
-msgid "Audacious Equalizer"
-msgstr "Тонкоректор на Audacious"
-
-#: src/skins/ui_main.cc:688
-#, c-format
-msgid "Seek to %d:%-2.2d / %d:%-2.2d"
-msgstr "Превъртане до %d:%-2.2d / %d:%-2.2d"
-
-#: src/skins/ui_main.cc:709
-#, c-format
-msgid "Volume: %d%%"
-msgstr "Сила на звука: %d%%"
-
-#: src/skins/ui_main.cc:732
-#, c-format
-msgid "Balance: %d%% left"
-msgstr "Баланс: %d%% ляво"
-
-#: src/skins/ui_main.cc:734
-msgid "Balance: center"
-msgstr "Баланс: център"
-
-#: src/skins/ui_main.cc:736
-#, c-format
-msgid "Balance: %d%% right"
-msgstr "Баланс: %d%% дясно"
-
-#: src/skins/ui_main.cc:842
-msgid "Options Menu"
-msgstr "Меню с опции"
-
-#: src/skins/ui_main.cc:846
-msgid "Disable 'Always On Top'"
-msgstr "Деактивиране на „Винаги отгоре“"
-
-#: src/skins/ui_main.cc:848
-msgid "Enable 'Always On Top'"
-msgstr "Активиране на „Винаги отгоре“"
-
-#: src/skins/ui_main.cc:851
-msgid "File Info Box"
-msgstr "Кутийка с информация за файла"
-
-#: src/skins/ui_main.cc:857
-msgid "Visualizations"
-msgstr "Визуализации"
-
-#: src/skins/ui_main.cc:1336
-msgid "Repeat point A set."
-msgstr "Зададена е начална точка на повторение."
-
-#: src/skins/ui_main.cc:1341
-msgid "Repeat point B set."
-msgstr "Зададена е крайна точка на повторение."
-
-#: src/skins/ui_main.cc:1350
-msgid "Repeat points cleared."
-msgstr "Точките на повторение са изчистени."
-
-#: src/skins/ui_playlist.cc:219
-msgid "Search entries in active playlist"
-msgstr "Търсене на записи в активния списък"
-
-#: src/skins/ui_playlist.cc:226
-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.cc:234
-msgid "Title:"
-msgstr "Заглавие:"
-
-#: src/skins/ui_playlist.cc:241
-msgid "Album:"
-msgstr "Албум:"
-
-#: src/skins/ui_playlist.cc:248
-msgid "Artist:"
-msgstr "Изпълнител:"
-
-#: src/skins/ui_playlist.cc:255
-msgid "File Name:"
-msgstr "Име на файл:"
-
-#: src/skins/ui_playlist.cc:263
-msgid "Clear previous selection before searching"
-msgstr "Изчистване на предишния избор преди търсене"
+#: src/skins-qt/skins_cfg.cc:294 src/skins/skins_cfg.cc:276
+msgid "Type"
+msgstr "Вид"
 
-#: src/skins/ui_playlist.cc:266
-msgid "Automatically toggle queue for matching entries"
-msgstr "Автоматично превключване в опашката за съвпадащите елементи"
+#: src/skins-qt/skins_cfg.cc:295 src/skins/skins_cfg.cc:277
+msgid "Visualization type:"
+msgstr "Вид на визуализация:"
 
-#: src/skins/ui_playlist.cc:269
-msgid "Create a new playlist with matching entries"
-msgstr "Създаване на нов списък със съвпадащите елементи"
+#: src/skins-qt/skins_cfg.cc:298 src/skins/skins_cfg.cc:280
+msgid "Analyzer"
+msgstr "Анализатор"
 
-#: src/skins/ui_playlist.cc:717
-msgid "Audacious Playlist Editor"
-msgstr "Audacious Редактор на списъка за изпълнение"
+#: src/skins-qt/skins_cfg.cc:299 src/skins/skins_cfg.cc:281
+msgid "Show peaks"
+msgstr "Показвай пикове"
 
-#: src/skins/ui_playlist.cc:752
-#, c-format
-msgid "%s (%d of %d)"
-msgstr "%s (%d от %d)"
+#: src/skins-qt/skins_cfg.cc:308 src/skins/skins_cfg.cc:290
+msgid "Visualization"
+msgstr "Изобразяване"
 
-#: src/skins/ui_skinselector.cc:167
+#: src/skins-qt/skinselector.cc:98 src/skins/skinselector.cc:111
 msgid "Archived Winamp 2.x skin"
 msgstr "Архивирана кожа на Winamp 2.x"
 
-#: src/skins/ui_skinselector.cc:172
+#: src/skins-qt/skinselector.cc:102 src/skins/skinselector.cc:115
 msgid "Unarchived Winamp 2.x skin"
 msgstr "Неархивирана кожа на Winamp 2.x"
 
-#: src/skins/util.cc:430
-#, c-format
-msgid "Could not create directory (%s): %s\n"
-msgstr "Не може да се създаде директория (%s): %s\n"
-
-#: src/sndfile/plugin.cc:39
+#: src/sndfile/plugin.cc:38
 msgid "Sndfile Plugin"
 msgstr "Приставка Sndfile"
 
-#: src/sndfile/plugin.cc:336
+#: src/sndfile/plugin.cc:372
 msgid ""
 "Based on the xmms_sndfile plugin:\n"
 "Copyright (C) 2000, 2002 Erik de Castro Lopo\n"
@@ -3985,111 +4207,113 @@
 "ако не сте, пишете до Free Software Foundation, Inc., 51 Franklin Street,\n"
 "Fifth Floor, Boston, MA 02110-1301, USA."
 
-#: src/sndio-ng/sndio.cc:44
+#: src/sndio/sndio.cc:43
 msgid "Sndio Output"
 msgstr "Sndio изход"
 
-#: src/sndio-ng/sndio.cc:98
+#: src/sndio/sndio.cc:98
 msgid "Device (blank for default):"
 msgstr "Устройство (празно - стойности по подразбиране):"
 
-#: src/sndio-ng/sndio.cc:100
+#: src/sndio/sndio.cc:100
 msgid "Save and restore volume:"
 msgstr "Запази и възстанови силата на звука:"
 
-#: src/sndio-ng/sndio.cc:181
+#: src/sndio/sndio.cc:181
 #, c-format
 msgid "Sndio error: Unsupported audio format (%d)"
 msgstr "Sndio грешка: неподдържан звуков формат (%d)"
 
-#: src/sndio-ng/sndio.cc:192
+#: src/sndio/sndio.cc:192
 msgid "Sndio error: sio_open() failed"
 msgstr "Sndio грешка: sio_open() се провали"
 
-#: src/sndio-ng/sndio.cc:222
+#: src/sndio/sndio.cc:221
 msgid "Sndio error: sio_setpar() failed"
 msgstr "Sndio грешка: sio_setpar() се провали"
 
-#: src/sndio-ng/sndio.cc:234
+#: src/sndio/sndio.cc:233
 msgid "Sndio error: sio_start() failed"
 msgstr "Sndio грешка: sio_start() се провали"
 
-#: src/song_change/song_change.cc:33
+#: src/songchange/song_change.cc:30
 msgid "Song Change"
 msgstr "Промяна на песен"
 
-#: src/song_change/song_change.cc:342
-msgid ""
-"Parameters passed to the shell should be encapsulated in "
-"quotes. Doing otherwise is a security risk."
-msgstr ""
-"Стойностите, изпратени до обвивката, е добре да са в "
-"кавички. В противен случай се крие опасност за сигурността."
-
-#: src/song_change/song_change.cc:358
+#: src/songchange/song_change.cc:256
 msgid "Commands"
 msgstr "Команди"
 
-#: src/song_change/song_change.cc:360
+#: src/songchange/song_change.cc:258
 msgid "Command to run when starting a new song:"
 msgstr "Команда за изпълнение при започване на нова песен:"
 
-#: src/song_change/song_change.cc:364
+#: src/songchange/song_change.cc:261
+msgid "Command to run when stopping a song:"
+msgstr ""
+
+#: src/songchange/song_change.cc:264
 msgid "Command to run at the end of a song:"
 msgstr "Команда за изпълнение при край на песен:"
 
-#: src/song_change/song_change.cc:368
+#: src/songchange/song_change.cc:267
 msgid "Command to run at the end of the playlist:"
 msgstr "Команда за изпълнение при край на списъка."
 
-#: src/song_change/song_change.cc:372
+#: src/songchange/song_change.cc:270
 msgid "Command to run when song title changes (for network streams):"
 msgstr ""
 "Команда за изпълнение, когато се смени заглавието на песента (за интернет "
 "потоци):"
 
-#: src/song_change/song_change.cc:376
+#: src/songchange/song_change.cc:273
 msgid ""
-"You can use the following format strings which will be substituted before "
-"calling the command (not all are useful for the end-of-playlist command):\n"
-"\n"
-"%F: Frequency (in hertz)\n"
+"You can use the following format codes, which will be replaced before "
+"running the command.\n"
+"Not all are useful though for the song-stopped or end-of-playlist command."
+msgstr ""
+
+#: src/songchange/song_change.cc:276
+msgid ""
+"%a: Artist\n"
+"%b: Album\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"
+"%F: Frequency (Hertz)\n"
+"%l: Length (milliseconds)\n"
+"%n or %s: Formatted title (see playlist settings)\n"
 "%p: Currently playing (1 or 0)\n"
-"%a: Artist\n"
-"%b: Album\n"
-"%T: Track title"
-msgstr ""
-"Може да използвате следните променливи, които ще бъдат заменени преди "
-"извикването на командата (не всички са полезни като команда за край на "
-"списъка):\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-info-qt/song-info.cc:32
-msgid "Song Info (Qt)"
-msgstr "Информация за песен (Qt)"
+"%r: Rate (bits per second)\n"
+"%t: Playlist position\n"
+"%T: Title (unformatted)"
+msgstr ""
+"%a: Изпълнител\n"
+"%b: Албум\n"
+"%c: Брой канали\n"
+"%f: Име на файла (цял път до него)\n"
+"%F: Честота (Херц)\n"
+"%l: Времетраене (милисекунди)\n"
+"%n или %s: Форматирано заглавие (виж настройките за списъка)\n"
+"%p: В момента възпроизвеждано (1 или 0)\n"
+"%r: Честота (битове в секунда)\n"
+"%t: Позиция в списъка\n"
+"%T: Заглавие (неформатирано)"
+
+#: src/songchange/song_change.cc:287
+msgid ""
+"Parameters passed to the shell should be enclosed in quotation marks.\n"
+"Unquoted parameters may lead to unexpected results."
+msgstr ""
+
+#: src/song-info-qt/song-info.cc:30
+msgid "Song Info"
+msgstr "Информация за песента"
 
-#: src/sox-resampler/sox-resampler.cc:44
+#: src/soxr/sox-resampler.cc:44
 msgid "SoX Resampler"
 msgstr "Преизчислител SoX"
 
-#: src/sox-resampler/sox-resampler.cc:144
+#: src/soxr/sox-resampler.cc:172
 msgid ""
 "SoX Resampler Plugin for Audacious\n"
 "Copyright 2013 Michał Lipski\n"
@@ -4103,96 +4327,144 @@
 "Базиран на приставката за промяна на честотата:\n"
 "Авторски права 2010-2012 John Lindgren"
 
-#: src/sox-resampler/sox-resampler.cc:150
+#: src/soxr/sox-resampler.cc:178
 msgid "Quick"
 msgstr "Бързо"
 
-#: src/sox-resampler/sox-resampler.cc:151
+#: src/soxr/sox-resampler.cc:179
 msgid "Low"
 msgstr "Ниско"
 
-#: src/sox-resampler/sox-resampler.cc:153
+#: src/soxr/sox-resampler.cc:181
 msgid "High"
 msgstr "Високо"
 
-#: src/sox-resampler/sox-resampler.cc:154
+#: src/soxr/sox-resampler.cc:182
 msgid "Very High"
 msgstr "Много високо"
 
-#: src/sox-resampler/sox-resampler.cc:158
+#: src/soxr/sox-resampler.cc:183
+msgid "Ultra High"
+msgstr "Изключително високо"
+
+#: src/soxr/sox-resampler.cc:187
+msgid "Minimum"
+msgstr "Минимално"
+
+#: src/soxr/sox-resampler.cc:188
+msgid "Intermediate"
+msgstr "Средно"
+
+#: src/soxr/sox-resampler.cc:193
 msgid "Quality:"
 msgstr "Качество:"
 
-#: src/speed-pitch/speed-pitch.cc:51
+#: src/soxr/sox-resampler.cc:196
+msgid "Phase:"
+msgstr "Период:"
+
+#: src/soxr/sox-resampler.cc:200
+msgid "Allow aliasing"
+msgstr "Позволи псевдоними"
+
+#: src/soxr/sox-resampler.cc:202
+msgid "Use steep filter"
+msgstr "Използвай подсилен филтър"
+
+#: src/speedpitch/speed-pitch.cc:54
 msgid "Speed and Pitch"
 msgstr "Скорост и нива"
 
-#: src/speed-pitch/speed-pitch.cc:210
-msgid "Speed and Pitch"
-msgstr "Скорост и нива"
-
-#: src/speed-pitch/speed-pitch.cc:211
-msgid "Speed:"
-msgstr "Скорост:"
-
-#: src/speed-pitch/speed-pitch.cc:214
-msgid "Pitch:"
-msgstr "Нива:"
+#: src/speedpitch/speed-pitch.cc:247
+msgid "Speed"
+msgstr "1"
+
+#: src/speedpitch/speed-pitch.cc:248
+msgid "Decouple from pitch"
+msgstr "Отделяне от нивото"
+
+#: src/speedpitch/speed-pitch.cc:250 src/speedpitch/speed-pitch.cc:258
+msgid "Multiplier:"
+msgstr "Мултипликатор:"
+
+#: src/speedpitch/speed-pitch.cc:254
+msgid "Pitch"
+msgstr "Ниво"
 
-#: src/statusicon/statusicon.cc:47
+#: src/statusicon-qt/statusicon.cc:45 src/statusicon/statusicon.cc:47
 msgid "Status Icon"
 msgstr "Икона на състоянието"
 
-#: src/statusicon/statusicon.cc:283
-msgid "Se_ttings ..."
-msgstr "Настро_йки..."
-
-#: src/statusicon/statusicon.cc:372
+#: src/statusicon-qt/statusicon.cc:68
 msgid ""
-"Status Icon Plugin\n"
+"Status Icon Plugin (partial port for Qt interface)\n"
 "\n"
 "Copyright 2005-2007 Giacomo Lozito <james@develia.org>\n"
 "Copyright 2010 Michał Lipski <tallica@o2.pl>\n"
+"Copyright 2015 Eugene Paskevich <eugene@raptor.kiev.ua>\n"
 "\n"
 "This plugin provides a status icon, placed in\n"
 "the system tray area of the window manager."
 msgstr ""
-"Приставка за икона на състоянието\n"
+"Приставка за икона на състоянието (частичен порт за Qt интерфейс)\n"
 "\n"
-"Авторски права 2005-2007 Giacomo Lozito <james@develia.org>\n"
-"Авторски права 2010 Michał Lipski <tallica@o2.pl>\n"
+"Всички права запазени 2005-2007 Giacomo Lozito <james@develia.org>\n"
+"Всички права запазени 2010 Michał Lipski <tallica@o2.pl>\n"
+"Всички права запазени 2015 Eugene Paskevich <eugene@raptor.kiev.ua>\n"
 "\n"
-"Тази приставка предоставя икона на състоянието, разположена\n"
-"в зоната на системните известия на мениджъра на прозорците."
+"Тази приставка извежда икона на състоянието, разположена\n"
+"в системния панел на мениджъра на прозорци."
 
-#: src/statusicon/statusicon.cc:379
+#: src/statusicon-qt/statusicon.cc:89 src/statusicon/statusicon.cc:384
 msgid "Mouse Scroll Action"
 msgstr "Действие при превъртане с мишка"
 
-#: src/statusicon/statusicon.cc:380
+#: src/statusicon-qt/statusicon.cc:90 src/statusicon/statusicon.cc:385
 msgid "Change volume"
 msgstr "Промяна на силата на звука"
 
-#: src/statusicon/statusicon.cc:383
+#: src/statusicon-qt/statusicon.cc:93 src/statusicon/statusicon.cc:388
 msgid "Change playing song"
 msgstr "Промяна на изпълняваната песен"
 
-#: src/statusicon/statusicon.cc:386
+#: src/statusicon-qt/statusicon.cc:96 src/statusicon/statusicon.cc:391
 msgid "Other Settings"
 msgstr "Други настройки"
 
-#: src/statusicon/statusicon.cc:387
+#: src/statusicon-qt/statusicon.cc:97 src/statusicon/statusicon.cc:392
 msgid "Disable the popup window"
 msgstr "Деактивиране на изскачащ прозорец"
 
-#: src/statusicon/statusicon.cc:389
+#: src/statusicon-qt/statusicon.cc:99 src/statusicon/statusicon.cc:394
 msgid "Close to the system tray"
 msgstr "Затваряне в системната табла"
 
-#: src/statusicon/statusicon.cc:391
+#: src/statusicon-qt/statusicon.cc:101 src/statusicon/statusicon.cc:396
 msgid "Advance in playlist when scrolling upward"
 msgstr "Напред в списъка при привъртане нагоре"
 
+#: src/statusicon-qt/statusicon.cc:116 src/statusicon/statusicon.cc:287
+msgid "Se_ttings ..."
+msgstr "Настро_йки..."
+
+#: src/statusicon/statusicon.cc:377
+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/stereo_plugin/stereo.cc:19
 msgid "Extra Stereo"
 msgstr "Допълнително съзвучие"
@@ -4211,20 +4483,160 @@
 msgid "Extra Stereo"
 msgstr "Допълнително многозвучие"
 
+#: src/streamtuner/icecast-model.cc:126 src/streamtuner/shoutcast-model.cc:131
+msgid "Type"
+msgstr "Тип"
+
+#: src/streamtuner/icecast-model.cc:132
+msgid "Current Song"
+msgstr "Сегашна песен"
+
+#: src/streamtuner/icecast-model.cc:164
+msgid "Other"
+msgstr "Други"
+
+#: src/streamtuner/ihr-model.cc:63
+msgid "Market"
+msgstr "Пазар"
+
+#: src/streamtuner/ihr-model.cc:156
+msgid "Call Letters"
+msgstr "Повиквателни писма"
+
+#: src/streamtuner/ihr-model.cc:162
+msgid "Description"
+msgstr "Описание"
+
+#: src/streamtuner/shoutcast-model.cc:128
+msgid "Listeners"
+msgstr "Слушатели"
+
+#: src/streamtuner/shoutcast-model.cc:188
+msgid "Top 500 Stations"
+msgstr "Топ 500 станции"
+
+#: src/streamtuner/shoutcast-model.cc:189
+msgid "Alternative"
+msgstr "Алтернативно"
+
+#: src/streamtuner/shoutcast-model.cc:190
+msgid "Blues"
+msgstr "Блус"
+
+#: src/streamtuner/shoutcast-model.cc:191
+msgid "Classical"
+msgstr "Класика"
+
+#: src/streamtuner/shoutcast-model.cc:192
+msgid "Country"
+msgstr "Кънтри"
+
+#: src/streamtuner/shoutcast-model.cc:193
+msgid "Decades"
+msgstr "Десетолетиня"
+
+#: src/streamtuner/shoutcast-model.cc:194
+msgid "Easy Listening"
+msgstr "Изи Листънинг"
+
+#: src/streamtuner/shoutcast-model.cc:195
+msgid "Electronic"
+msgstr "Електронна"
+
+#: src/streamtuner/shoutcast-model.cc:196
+msgid "Folk"
+msgstr "Фолк"
+
+#: src/streamtuner/shoutcast-model.cc:197
+msgid "Inspirational"
+msgstr "Вдъхновяваща"
+
+#: src/streamtuner/shoutcast-model.cc:198
+msgid "International"
+msgstr "Международна"
+
+#: src/streamtuner/shoutcast-model.cc:199
+msgid "Jazz"
+msgstr "Джаз"
+
+#: src/streamtuner/shoutcast-model.cc:200
+msgid "Latin"
+msgstr "Латин"
+
+#: src/streamtuner/shoutcast-model.cc:201
+msgid "Metal"
+msgstr "Метъл"
+
+#: src/streamtuner/shoutcast-model.cc:203
+msgid "New Age"
+msgstr "Ню Ейдж"
+
+#: src/streamtuner/shoutcast-model.cc:204
+msgid "Pop"
+msgstr "Поп"
+
+#: src/streamtuner/shoutcast-model.cc:205
+msgid "Public Radio"
+msgstr "Публично ради"
+
+#: src/streamtuner/shoutcast-model.cc:206
+msgid "R&B and Urban"
+msgstr "R&B и Urban"
+
+#: src/streamtuner/shoutcast-model.cc:207
+msgid "Rap"
+msgstr "Рап"
+
+#: src/streamtuner/shoutcast-model.cc:208
+msgid "Reggae"
+msgstr "Реге"
+
+#: src/streamtuner/shoutcast-model.cc:209
+msgid "Rock"
+msgstr "Рок"
+
+#: src/streamtuner/shoutcast-model.cc:210
+msgid "Seasonal and Holiday"
+msgstr "Сезонни и празнични"
+
+#: src/streamtuner/shoutcast-model.cc:211
+msgid "Soundtracks"
+msgstr "Саундтракове"
+
+#: src/streamtuner/shoutcast-model.cc:212
+msgid "Talk"
+msgstr "Говорене"
+
+#: src/streamtuner/shoutcast-model.cc:213
+msgid "Themes"
+msgstr "Теми"
+
+#: src/streamtuner/streamtuner.cc:59
+msgid "Shoutcast"
+msgstr "Шауткаст"
+
+#: src/streamtuner/streamtuner.cc:60
+msgid "Icecast"
+msgstr "Айскаст"
+
+#: src/streamtuner/streamtuner.cc:71
+msgid "Stream Tuner"
+msgstr "Поточен тунер"
+
 #: src/tonegen/tonegen.cc:45
 msgid "Tone Generator"
 msgstr "Генератор на тонове"
 
-#: src/tonegen/tonegen.cc:94
+#: src/tonegen/tonegen.cc:92
 #, c-format
 msgid "%s %.1f Hz"
 msgstr "%s %.1f Хц"
 
-#: src/tonegen/tonegen.cc:94
+#: src/tonegen/tonegen.cc:92
 msgid "Tone Generator: "
 msgstr "Генератор на тонове:"
 
-#: src/tonegen/tonegen.cc:160
+#: src/tonegen/tonegen.cc:161
 msgid ""
 "Sine tone generator by Håvard Kvålen <havardk@xmms.org>\n"
 "Modified by Daniel J. Peng <danielpeng@bigfoot.com>\n"
@@ -4239,11 +4651,32 @@
 "frequency3;...\n"
 "напр. tone://2000;2005 за изпълняването на тон от 2000 Хц и тон от 2005 Хц"
 
+#: src/ui-common/dialogs-qt.cc:40
+msgid ""
+"\n"
+"(Further messages have been hidden.)"
+msgstr ""
+"\n"
+"(Допълнителните съобщения са били скрити.)"
+
+#: src/ui-common/dialogs-qt.cc:52
+msgid "Working ..."
+msgstr "Работи ..."
+
+#: src/ui-common/dialogs-qt.cc:73
+msgid "Information"
+msgstr "Информация"
+
+#: src/ui-common/menu-ops-gtk.cc:132 src/ui-common/menu-ops-qt.cc:113
+#, c-format
+msgid "%s does not appear to be a valid folder."
+msgstr "%sне изглежда да е валидна папка."
+
 #: src/voice_removal/voice_removal.cc:28
 msgid "Voice Removal"
 msgstr "Премахване на глас"
 
-#: src/vorbis/vorbis.cc:465
+#: src/vorbis/vorbis.cc:433
 msgid ""
 "Audacious Ogg Vorbis Decoder\n"
 "\n"
@@ -4285,12 +4718,12 @@
 msgid "Ogg Vorbis Decoder"
 msgstr "Разгодиране на Ogg Vorbis"
 
-#: src/vtx/info.cc:22
+#: src/vtx/info.cc:24
 #, c-format
 msgid "Details about %s"
 msgstr "Данни за %s"
 
-#: src/vtx/info.cc:24
+#: src/vtx/info.cc:26
 msgid ""
 "Title: %t\n"
 "Author: %a\n"
@@ -4320,7 +4753,7 @@
 msgid "VTX Decoder"
 msgstr "Разкодиране VTX"
 
-#: src/vtx/vtx.cc:184
+#: src/vtx/vtx.cc:178
 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"
@@ -4330,19 +4763,63 @@
 "На основата на in_vtx.dll от Roman Sherbakov <v_soft@microfor.ru>\n"
 "Приставка за Audacious от Pavel Vymetalek <pvymetalek@seznam.cz>"
 
-#: src/wavpack/wavpack.cc:24
+#: src/vumeter-qt/vumeter_qt.cc:31
+msgid ""
+"VU Meter Plugin for Audacious\n"
+"Copyright 2017-2019 Marc Sánchez Fauste"
+msgstr ""
+"Добавка за VU Метър за Audacious\n"
+"Авторско право 2017-2019 Marc Sánchez Fauste"
+
+#: src/vumeter-qt/vumeter_qt.cc:35
+msgid "VU Meter Settings"
+msgstr "Настройки за VU Метъра"
+
+#: src/vumeter-qt/vumeter_qt.cc:37
+msgid "Peak hold time:"
+msgstr "Пиково време на задържане:"
+
+#: src/vumeter-qt/vumeter_qt.cc:42
+msgid "Fall-off time:"
+msgstr "Време на отпадане:"
+
+#: src/vumeter-qt/vumeter_qt.cc:44
+msgid "dB/second"
+msgstr "dB/секунда"
+
+#: src/vumeter-qt/vumeter_qt.cc:46
+msgid "Display legend"
+msgstr "Показване на легенда"
+
+#: src/vumeter-qt/vumeter_qt.h:37
+msgid "VU Meter"
+msgstr "VU Метър"
+
+#: src/waveout/waveout.cc:43
+msgid "Win32 waveOut"
+msgstr "Win32 waveOut"
+
+#: src/waveout/waveout.cc:69
+msgid ""
+"Win32 waveOut Plugin for Audacious\n"
+"Copyright 2016 John Lindgren"
+msgstr ""
+"Win32 waveOut приставка за Audacious\n"
+"Запазени права 2016 John Lindgren"
+
+#: src/wavpack/wavpack.cc:25
 msgid "WavPack Decoder"
 msgstr "Разкодиране WavPack"
 
-#: src/wavpack/wavpack.cc:211
+#: src/wavpack/wavpack.cc:217
 msgid "lossy (hybrid)"
 msgstr "със загуби (смесено)"
 
-#: src/wavpack/wavpack.cc:213
+#: src/wavpack/wavpack.cc:219
 msgid "lossy"
 msgstr "със загуби"
 
-#: src/wavpack/wavpack.cc:255
+#: src/wavpack/wavpack.cc:259
 msgid ""
 "Copyright 2006 William Pitcock <nenolod@nenolod.net>\n"
 "\n"
@@ -4352,18 +4829,38 @@
 "\n"
 "Част от кода е написана от Miles Egan."
 
-#: src/xsf/plugin.cc:50
+#: src/xsf/plugin.cc:74
 msgid "2SF Decoder"
 msgstr "Разкодиране 2SF"
 
-#: src/xsf/plugin.cc:238
+#: src/xsf/plugin.cc:429
+msgid "32728 Hz"
+msgstr "32728 Hz"
+
+#: src/xsf/plugin.cc:432
+msgid "65456 Hz"
+msgstr "65456 Hz"
+
+#: src/xsf/plugin.cc:438
+msgid "Cosine"
+msgstr "Косинус"
+
+#: src/xsf/plugin.cc:439
+msgid "Sharp"
+msgstr "Острър"
+
+#: src/xsf/plugin.cc:443
 msgid "XSF Configuration"
 msgstr "Настройки на XSF"
 
-#: src/xsf/plugin.cc:239
-msgid "Ignore length from file"
-msgstr "Игнориране на дължината от файла"
+#: src/xsf/plugin.cc:445
+msgid "Default fade time:"
+msgstr "Време за избледняване по подразбиране:"
+
+#: src/xsf/plugin.cc:447
+msgid "Interpolation mode:"
+msgstr "Режим на интерполация:"
 
-#: src/xspf/xspf.cc:89
+#: src/xspf/xspf.cc:95
 msgid "XML Shareable Playlists (XSPF)"
 msgstr "Споделяеми списъци XML (XSPF)"

audacious-plugins-3.6.2-gtk3.tar.bz2/po/ca.po -> audacious-plugins-4.4.1.tar.bz2/po/ca.po Changed

@@ -3,17 +3,24 @@
 # This file is distributed under the same license as the Audacious Plugins package.
 #
 # Translators:
-# Adolfo Jayme Barrientos, 2013
+# Adolfo Jayme Barrientos, 2013
+# Catalanoic <catalanoic@gmail.com>, 2016
 # Catalanoic <catalanoic@gmail.com>, 2012
-# Francesc Gordillo i Cortínez <inactive+frangor@transifex.com>, 2013
+# David Surroca Estrada <david.tb303@gmail.com>, 2015-2016
+# d396272506fceeee36fb9ecad66ea4ec_9301ee1 <2f2d48fc838758dd413d8847713d8a44_95171>, 2013
+# Josep M. Ferrer <txemaq@gmail.com>, 2023
+# Marc Sánchez <sanchezfauste@gmail.com>, 2020
+# Robert Antoni Buj i Gelonch <rbuj@fedoraproject.org>, 2016-2018
+# Toni Estévez <toni.estevez@gmail.com>, 2022
 msgid ""
 msgstr ""
 "Project-Id-Version: Audacious Plugins\n"
-"Report-Msgid-Bugs-To: http://redmine.audacious-media-player.org/\n"
-"POT-Creation-Date: 2015-02-28 19:18+0100\n"
-"PO-Revision-Date: 2015-02-04 21:21+0000\n"
-"Last-Translator: Thomas Lange <thomas-lange2@gmx.de>\n"
-"Language-Team: Catalan (http://www.transifex.com/projects/p/audacious/"
+"Report-Msgid-Bugs-To: https://github.com/audacious-media-player/audacious/"
+"issues\n"
+"POT-Creation-Date: 2024-09-26 21:54+0200\n"
+"PO-Revision-Date: 2011-10-10 17:43+0000\n"
+"Last-Translator: Josep M. Ferrer <txemaq@gmail.com>, 2023\n"
+"Language-Team: Catalan (http://app.transifex.com/audacious/audacious/"
 "language/ca/)\n"
 "Language: ca\n"
 "MIME-Version: 1.0\n"
@@ -21,239 +28,60 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/aac-raw/aac.cc:18
+#: src/aac/aac.cc:19
 msgid "AAC (Raw) Decoder"
-msgstr ""
+msgstr "Descodificador d'AAC (Raw)"
 
-#: src/adplug/adplug-xmms.cc:42
+#: src/adplug/adplug-xmms.cc:70
 msgid "AdPlug (AdLib Player)"
-msgstr ""
+msgstr "AdPlug (reproductor AdLib)"
 
-#: src/adplug/adplug-xmms.cc:156 src/modplug/modplugbmp.cc:335
-#: src/psf/plugin.cc:138 src/vtx/vtx.cc:87 src/xsf/plugin.cc:113
+#: src/adplug/adplug-xmms.cc:167 src/modplug/modplugbmp.cc:321
+#: src/psf/plugin.cc:161 src/vtx/vtx.cc:89 src/xsf/plugin.cc:204
 msgid "sequenced"
 msgstr "seqüenciat"
 
-#: src/alarm/alarm.cc:55 src/alarm/interface.cc:82
-msgid "Alarm"
-msgstr "Alarma"
-
-#: src/alarm/alarm.cc:782
-msgid "Set Alarm ..."
-msgstr ""
-
-#: src/alarm/alarm.cc:810
-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/interface.cc: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.cc: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.cc: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.cc:81
-msgid "This is your wakeup call."
-msgstr "Això és l'avís per despertar-se."
-
-#: src/alarm/interface.cc:99
-msgid "Your reminder for today is..."
-msgstr ""
-
-#: src/alarm/interface.cc:101 src/alarm/interface.cc:386
-msgid "Reminder"
-msgstr "Recordatori"
-
-#: src/alarm/interface.cc:132
-msgid "Monday"
-msgstr "Dilluns"
-
-#: src/alarm/interface.cc:132
-msgid "Tuesday"
-msgstr "Dimarts"
-
-#: src/alarm/interface.cc:132
-msgid "Wednesday"
-msgstr "Dimecres"
-
-#: src/alarm/interface.cc:133
-msgid "Thursday"
-msgstr "Dijous"
-
-#: src/alarm/interface.cc:133
-msgid "Friday"
-msgstr "Divendres"
-
-#: src/alarm/interface.cc:133
-msgid "Saturday"
-msgstr "Dissabte"
-
-#: src/alarm/interface.cc:133
-msgid "Sunday"
-msgstr "Diumenge"
-
-#: src/alarm/interface.cc:171 src/alarm/interface.cc:230
-#: src/alarm/interface.cc:245
-msgid "Time"
-msgstr "Hora"
-
-#: src/alarm/interface.cc:178
-msgid "Alarm at (default):"
-msgstr "Alarma (per defecte) a les:"
-
-#: src/alarm/interface.cc:200
-msgid "h"
-msgstr "h"
-
-#: src/alarm/interface.cc:203
-msgid "Quiet after:"
-msgstr "Para al cap de:"
-
-#: src/alarm/interface.cc:215
-msgid "hours"
-msgstr "hores"
-
-#: src/alarm/interface.cc:226
-msgid "minutes"
-msgstr "minuts"
-
-#: src/alarm/interface.cc:235
-msgid "Choose the days for the alarm to come on"
-msgstr "Trieu els dies que ha de saltar l'alarma"
-
-#: src/alarm/interface.cc:242
-msgid "Day"
-msgstr "Dia"
-
-#: src/alarm/interface.cc:259 src/bs2b/plugin.cc:130
-#: src/skins/preset-list.cc:434 src/skins/preset-list.cc:440
-msgid "Default"
-msgstr "Per defecte"
-
-#: src/alarm/interface.cc:288
-msgid "Days"
-msgstr "Dies"
-
-#: src/alarm/interface.cc:297
-msgid "Fading"
-msgstr "Fosa"
-
-#: src/alarm/interface.cc:305 src/console/plugin.cc:41
-#: src/crossfade/crossfade.cc:53 src/crossfade/crossfade.cc:59
-#: src/gtkui/settings.cc:49 src/lirc/lirc.cc:397 src/sid/xs_config.cc:85
-#: src/sid/xs_config.cc:94 src/sid/xs_config.cc:103
-msgid "seconds"
-msgstr "segons"
-
-#: src/alarm/interface.cc:312 src/alarm/interface.cc:353
-msgid "Volume"
-msgstr "Volum"
-
-#: src/alarm/interface.cc:317
-msgid "Start at"
-msgstr "Comença a"
-
-#: src/alarm/interface.cc:333
-msgid "Final"
-msgstr "Final"
-
-#: src/alarm/interface.cc:346
-msgid "Current"
-msgstr "Actual"
-
-#: src/alarm/interface.cc:359
-msgid "Additional Command"
-msgstr "Ordre addicional"
-
-#: src/alarm/interface.cc:365 src/alarm/interface.cc:391
-msgid "enable"
-msgstr "activa"
-
-#: src/alarm/interface.cc:372
-msgid "Playlist (optional)"
-msgstr "Llista de reproducció (opcional)"
+#: src/adplug/adplug-xmms.cc:349 src/sid/xs_config.cc:61
+msgid "Output"
+msgstr "Sortida"
 
-#: src/alarm/interface.cc:379
-msgid "Select a playlist"
-msgstr ""
+#: src/adplug/adplug-xmms.cc:350
+msgid "OPL Emulator:"
+msgstr "Emulador OPL:"
+
+#: src/adplug/adplug-xmms.cc:353 src/amidiplug/i_configure.cc:153
+#: src/console/plugin.cc:45 src/filewriter/filewriter.cc:481
+#: src/sid/xs_config.cc:65 src/xsf/plugin.cc:446
+msgid "Sample rate:"
+msgstr "Freqüència de mostreig:"
 
-#: src/alarm/interface.cc:399
-msgid "Options"
-msgstr "Opcions"
+#: src/adplug/adplug-xmms.cc:354 src/amidiplug/i_configure.cc:155
+#: src/bs2b/plugin.cc:141 src/console/plugin.cc:47
+#: src/modplug/plugin_main.cc:77 src/resample/resample.cc:201
+#: src/resample/resample.cc:207 src/resample/resample.cc:211
+#: src/resample/resample.cc:215 src/resample/resample.cc:219
+#: src/resample/resample.cc:223 src/resample/resample.cc:227
+#: src/resample/resample.cc:231 src/resample/resample.cc:235
+#: src/resample/resample.cc:239 src/resample/resample.cc:243
+#: src/sid/xs_config.cc:67 src/soxr/sox-resampler.cc:205
+msgid "Hz"
+msgstr "Hz"
 
-#: src/alarm/interface.cc:404
-msgid "What do these options mean?"
-msgstr "Què signifiquen aquestes opcions?"
+#: src/adplug/adplug-xmms.cc:355 src/gtkui/settings.cc:55
+#: src/modplug/plugin_main.cc:105 src/qtui/settings.cc:85
+#: src/skins-qt/skins_cfg.cc:302 src/skins/skins_cfg.cc:284
+msgid "Miscellaneous"
+msgstr "Altres"
 
-#: src/alarm/interface.cc:420
-msgid "Help"
-msgstr "Ajuda"
+#: src/adplug/adplug-xmms.cc:356
+msgid "Repeat song in endless loop"
+msgstr "Repeteix la cançó en un bucle sense fi"
 
-#: src/albumart/albumart.cc:31
+#: src/albumart/albumart.cc:31 src/albumart-qt/albumart.cc:35
 msgid "Album Art"
-msgstr "Art del àlbum"
-
-#: src/albumart-qt/albumart.cc:33
-msgid "Album Art (Qt)"
-msgstr ""
+msgstr "Art de l'àlbum"
 
-#: src/alsa/alsa.h:70
+#: src/alsa/alsa.h:64
 msgid "ALSA Output"
 msgstr "Sortida ALSA"
 
@@ -265,10 +93,15 @@
 "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 ""
+"Connector de sortida ALSA per a Audacious\n"
+"Drets d'autor 2009-2012 John Lindgren\n"
+"\n"
+"Molts agraïments a William Pitcock, autor del connector de sortida ALSA NG, "
+"el codi va servir de referència quan el manual d'ALSA no era suficient."
 
 #: src/alsa/config.cc:61
 msgid "(no description)"
-msgstr ""
+msgstr "(sense descripció)"
 
 #: src/alsa/config.cc:166
 msgid "Default PCM device"
@@ -290,11 +123,11 @@
 msgid "Mixer element:"
 msgstr "Element de mescla:"
 
-#: src/amidi-plug/amidi-plug.cc:41
+#: src/amidiplug/amidi-plug.cc:42
 msgid "AMIDI-Plug (MIDI Player)"
-msgstr ""
+msgstr "AMIDI-Plug (reproductor MIDI)"
 
-#: src/amidi-plug/amidi-plug.cc:437
+#: src/amidiplug/amidi-plug.cc:445
 msgid ""
 "AMIDI-Plug\n"
 "modular MIDI music player\n"
@@ -316,158 +149,180 @@
 "Tony Vroon\n"
 "for the good help with alpha testing"
 msgstr ""
+"AMIDI-Plug\n"
+"Reproductor de música MIDI modular\n"
+"http://www.develia.org/projects.php?p=amidiplug\n"
+"\n"
+"programat per Giacomo Lozito\n"
+"<james@develia.org>\n"
+"\n"
+"agraïments especials a...\n"
+"\n"
+"Clemens Ladisch o Jaroslav Kysela\n"
+"pels fantàstics programes aplaymidi i amixer; que són molt útils, així com "
+"l'alsa-lib docs, per poder aprendre més sobre l'API ALSA\n"
+"\n"
+"Alfredo Spadafina\n"
+"per al bon logotip del teclat MIDI\n"
+"\n"
+"Tony Vroon\n"
+"per a la bona ajuda amb les proves alfa"
 
-#: src/amidi-plug/i_configure.cc:94
+#: src/amidiplug/i_configure.cc:94
 msgid "Override default gain:"
-msgstr ""
+msgstr "Ignora el guany per defecte:"
 
-#: src/amidi-plug/i_configure.cc:102
+#: src/amidiplug/i_configure.cc:102
 msgid "Override default polyphony:"
-msgstr ""
+msgstr "Ignora la polifonia per defecte:"
 
-#: src/amidi-plug/i_configure.cc:110
+#: src/amidiplug/i_configure.cc:110
 msgid "Override default reverb:"
-msgstr ""
+msgstr "Ignora la reverberació per defecte:"
 
-#: src/amidi-plug/i_configure.cc:112 src/amidi-plug/i_configure.cc:120
+#: src/amidiplug/i_configure.cc:112 src/amidiplug/i_configure.cc:120
 msgid "On"
-msgstr ""
+msgstr "On"
 
-#: src/amidi-plug/i_configure.cc:118
+#: src/amidiplug/i_configure.cc:118
 msgid "Override default chorus:"
-msgstr ""
+msgstr "Ignora el cor per defecte:"
 
-#: src/amidi-plug/i_configure.cc:128 src/console/plugin.cc:29
+#: src/amidiplug/i_configure.cc:128 src/console/plugin.cc:29
 msgid "Playback"
-msgstr ""
+msgstr "Reproducció"
 
-#: src/amidi-plug/i_configure.cc:129
+#: src/amidiplug/i_configure.cc:129
 msgid "Transpose:"
-msgstr ""
+msgstr "Transposició:"
 
-#: src/amidi-plug/i_configure.cc:131
+#: src/amidiplug/i_configure.cc:131 src/speedpitch/speed-pitch.cc:257
 msgid "semitones"
-msgstr ""
+msgstr "semitons"
 
-#: src/amidi-plug/i_configure.cc:132
+#: src/amidiplug/i_configure.cc:132
 msgid "Drum shift:"
-msgstr ""
+msgstr "Desplaçament de la percussió: "
 
-#: src/amidi-plug/i_configure.cc:134
+#: src/amidiplug/i_configure.cc:134
 msgid "note numbers"
-msgstr ""
+msgstr "nombres de nota"
 
-#: src/amidi-plug/i_configure.cc:135
+#: src/amidiplug/i_configure.cc:135
 msgid "Skip leading silence"
-msgstr ""
+msgstr "Omet el silenci inicial"
 
-#: src/amidi-plug/i_configure.cc:137
+#: src/amidiplug/i_configure.cc:137
 msgid "Skip trailing silence"
-msgstr ""
+msgstr "Omet el silenci posterior"
 
-#: src/amidi-plug/i_configure.cc:141
+#: src/amidiplug/i_configure.cc:141
 msgid "SoundFont"
-msgstr ""
+msgstr "SoundFont"
 
-#: src/amidi-plug/i_configure.cc:143
+#: src/amidiplug/i_configure.cc:148
 msgid "Synthesizer"
-msgstr ""
-
-#: src/amidi-plug/i_configure.cc:148 src/console/plugin.cc:45
-#: src/sid/xs_config.cc:65
-msgid "Sample rate:"
-msgstr ""
-
-#: src/amidi-plug/i_configure.cc:150 src/bs2b/plugin.cc:141
-#: src/console/plugin.cc:47 src/modplug/plugin_main.cc:78
-#: src/resample/resample.cc:201 src/resample/resample.cc:207
-#: src/resample/resample.cc:211 src/resample/resample.cc:215
-#: src/resample/resample.cc:219 src/resample/resample.cc:223
-#: src/resample/resample.cc:227 src/resample/resample.cc:231
-#: src/resample/resample.cc:235 src/resample/resample.cc:239
-#: src/resample/resample.cc:243 src/sid/xs_config.cc:67
-#: src/sox-resampler/sox-resampler.cc:163
-msgid "Hz"
-msgstr "Hz"
+msgstr "Sintetitzador"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:52
+#: src/amidiplug/i_configure-fluidsynth.cc:58
+#: src/amidiplug/i_configure-fluidsynth.cc:527
 msgid "AMIDI-Plug - select SoundFont file"
 msgstr "Connector AMIDI-Plug - Seleccioneu un fitxer SoundFont"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:55 src/filewriter/mp3.cc:658
+#: src/amidiplug/i_configure-fluidsynth.cc:61
 msgid "_Cancel"
-msgstr ""
+msgstr "_Cancel·la"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:56
+#: src/amidiplug/i_configure-fluidsynth.cc:62
 msgid "_Open"
-msgstr ""
+msgstr "_Obre"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:225 src/gtkui/columns.cc:46
+#: src/amidiplug/i_configure-fluidsynth.cc:233
+#: src/amidiplug/i_configure-fluidsynth.cc:461
 msgid "File name"
 msgstr "Nom del fitxer"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:229
+#: src/amidiplug/i_configure-fluidsynth.cc:237
+#: src/amidiplug/i_configure-fluidsynth.cc:464
 msgid "Size (bytes)"
-msgstr "Mida (octets)"
+msgstr "Mida (bytes)"
 
-#: src/amidi-plug/i_fileinfo.cc:163
+#: src/amidiplug/i_fileinfo.cc:184
 msgid "Name:"
 msgstr "Nom:"
 
-#: src/amidi-plug/i_fileinfo.cc:181
+#: src/amidiplug/i_fileinfo.cc:202
 msgid " MIDI Info "
 msgstr " Informació MIDI "
 
-#: src/amidi-plug/i_fileinfo.cc:195
+#: src/amidiplug/i_fileinfo.cc:216
 msgid "Format:"
 msgstr "Format:"
 
-#: src/amidi-plug/i_fileinfo.cc:198
+#: src/amidiplug/i_fileinfo.cc:219
 msgid "Length (msec):"
 msgstr "Durada (ms):"
 
-#: src/amidi-plug/i_fileinfo.cc:201
+#: src/amidiplug/i_fileinfo.cc:222
 msgid "No. of Tracks:"
-msgstr "Num. de pistes:"
+msgstr "Nre. de pistes:"
 
-#: src/amidi-plug/i_fileinfo.cc:207
+#: src/amidiplug/i_fileinfo.cc:228
 msgid "variable"
 msgstr "variable"
 
-#: src/amidi-plug/i_fileinfo.cc:209
+#: src/amidiplug/i_fileinfo.cc:230
 msgid "BPM:"
 msgstr "BPM:"
 
-#: src/amidi-plug/i_fileinfo.cc:217
+#: src/amidiplug/i_fileinfo.cc:238
 msgid "BPM (wavg):"
 msgstr "BPM (wavg):"
 
-#: src/amidi-plug/i_fileinfo.cc:220
+#: src/amidiplug/i_fileinfo.cc:241
 msgid "Time Div:"
 msgstr "Div temps:"
 
-#: src/amidi-plug/i_fileinfo.cc:231
+#: src/amidiplug/i_fileinfo.cc:252
 msgid " MIDI Comments and Lyrics "
 msgstr " Comentaris MIDI i lletres "
 
-#: src/amidi-plug/i_fileinfo.cc:278
+#: src/amidiplug/i_fileinfo.cc:299
 msgid "* no comments available in this MIDI file *"
 msgstr "* aquest fitxer MIDI no té comentaris *"
 
-#: src/amidi-plug/i_fileinfo.cc:290
+#: src/amidiplug/i_fileinfo.cc:311
 msgid "* no lyrics available in this MIDI file *"
 msgstr "* aquest fitxer MIDI no té lletra *"
 
-#: src/amidi-plug/i_fileinfo.cc:300 src/filewriter/vorbis.cc:197
-#: src/ladspa/plugin.cc:416
+#: src/amidiplug/i_fileinfo.cc:321 src/ladspa/plugin.cc:418
+#: src/ui-common/dialogs-qt.cc:32
 msgid "_Close"
 msgstr "Tan_car"
 
-#: src/amidi-plug/i_fileinfo.cc:325
+#: src/amidiplug/i_fileinfo.cc:346
 msgid " (invalid UTF-8)"
 msgstr " (UTF-8 no vàlid)"
 
-#: src/aosd/aosd.cc:32
+#: src/ampache/ampache.cc:33
+msgid "Ampache Browser"
+msgstr "Navegador Ampache"
+
+#: src/ampache/ampache.cc:46
+msgid ""
+"Ampache Browser for Audacious\n"
+"http://ampache-browser.org/\n"
+"\n"
+"Copyright (C) Róbert Čerňanský and John Lindgren\n"
+"License: GNU GPLv3"
+msgstr ""
+"Navegador Ampache per a Audacious\n"
+"http://ampache-browser.org/\n"
+"\n"
+"Drets d'autor (C) Róbert Čerňanský i John Lindgren\n"
+"Llicència: GNU GPLv3"
+
+#: src/aosd/aosd.cc:31
 msgid ""
 "Audacious OSD\n"
 "http://www.develia.org/projects.php?p=audacious#aosd\n"
@@ -477,10 +332,17 @@
 "Based in part on Evan Martin's Ghosd library:\n"
 "http://neugierig.org/software/ghosd/"
 msgstr ""
+"OSD d'Audacious\n"
+"http://www.develia.org/projects.php?p=audacious#aosd\n"
+"\n"
+"Programat per Giacomo Lozito <james@develia.org>\n"
+"\n"
+"Basat en part en la biblioteca Ghosd d'Evan Martin:\n"
+"http://neugierig.org/software/ghosd/"
 
 #: src/aosd/aosd.h:37
 msgid "AOSD (On-Screen Display)"
-msgstr ""
+msgstr "AOSD (On-Screen Display)"
 
 #: src/aosd/aosd_style.cc:54
 msgid "Rectangle"
@@ -494,224 +356,297 @@
 msgid "Concave Rectangle"
 msgstr "Rectangle còncau"
 
-#: src/aosd/aosd_style.cc:69
+#: src/aosd/aosd_style.cc:69 src/openmpt/mptwrap.h:50 src/xsf/plugin.cc:436
 msgid "None"
 msgstr "Cap"
 
-#: src/aosd/aosd_trigger.cc:50
+#: src/aosd/aosd_trigger.cc:49
 msgid "Playback Start"
 msgstr "Inici de la reproducció"
 
-#: src/aosd/aosd_trigger.cc:51
+#: src/aosd/aosd_trigger.cc:50
 msgid "Triggers OSD when a playlist entry is played."
 msgstr ""
-"Activa l'OSD quan es reprodueix una entrada de la llista de reproducció"
+"Dispara l'OSD quan es reprodueix una entrada de la llista de reproducció."
 
-#: src/aosd/aosd_trigger.cc:56
+#: src/aosd/aosd_trigger.cc:55
 msgid "Title Change"
 msgstr "Canvi de títol"
 
-#: src/aosd/aosd_trigger.cc:57
+#: src/aosd/aosd_trigger.cc:56
 msgid "Triggers OSD when the song title changes (for internet streams)."
 msgstr ""
+"Dispara l'OSD quan canvia el nom de la cançó (per als fluxos d'Internet)."
 
-#: src/aosd/aosd_trigger.cc:62
+#: src/aosd/aosd_trigger.cc:61
 msgid "Pause On"
-msgstr "Pausa On"
+msgstr "Pausa engegada"
 
-#: src/aosd/aosd_trigger.cc:63
+#: src/aosd/aosd_trigger.cc:62
 msgid "Triggers OSD when playback is paused."
-msgstr "Activa l'OSD quan la reproducció està en pausa."
+msgstr "Dispara l'OSD quan la reproducció està en pausa."
 
-#: src/aosd/aosd_trigger.cc:68
+#: src/aosd/aosd_trigger.cc:67
 msgid "Pause Off"
-msgstr "Pausa Off"
+msgstr "Pausa apagada"
 
-#: src/aosd/aosd_trigger.cc:69
+#: src/aosd/aosd_trigger.cc:68
 msgid "Triggers OSD when playback is unpaused."
-msgstr "Activa l'OSD quan la reproducció deixa d'estar en pausa."
+msgstr "Dispara l'OSD quan la reproducció deixa d'estar en pausa."
 
-#: src/aosd/aosd_ui.cc:163
+#: src/aosd/aosd_ui.cc:204
 msgid "Placement"
 msgstr "Posició"
 
-#: src/aosd/aosd_ui.cc:196
+#: src/aosd/aosd_ui.cc:241
 msgid "Relative X offset:"
 msgstr "Desplaçament relatiu X:"
 
-#: src/aosd/aosd_ui.cc:203
+#: src/aosd/aosd_ui.cc:245
 msgid "Relative Y offset:"
 msgstr "Desplaçament relatiu Y:"
 
-#: src/aosd/aosd_ui.cc:210
+#: src/aosd/aosd_ui.cc:249
 msgid "Max OSD width:"
 msgstr "Amplada màxima de l'OSD:"
 
-#: src/aosd/aosd_ui.cc:221
+#: src/aosd/aosd_ui.cc:281
 msgid "Multi-Monitor options"
-msgstr "Opcions multi-monitor"
+msgstr "Opcions diversos monitors"
 
-#: src/aosd/aosd_ui.cc:225
+#: src/aosd/aosd_ui.cc:285
 msgid "Display OSD using:"
 msgstr "Mostra l'OSD en:"
 
-#: src/aosd/aosd_ui.cc:227
+#: src/aosd/aosd_ui.cc:287
 msgid "all monitors"
 msgstr "tots els monitors"
 
-#: src/aosd/aosd_ui.cc:230
+#: src/aosd/aosd_ui.cc:290
 #, c-format
 msgid "monitor %i"
 msgstr "el monitor %i"
 
-#: src/aosd/aosd_ui.cc:282
+#: src/aosd/aosd_ui.cc:342
 msgid "Timing (ms)"
 msgstr "Durada (ms)"
 
-#: src/aosd/aosd_ui.cc:287
+#: src/aosd/aosd_ui.cc:347
 msgid "Display:"
 msgstr "Visible:"
 
-#: src/aosd/aosd_ui.cc:292
+#: src/aosd/aosd_ui.cc:352
 msgid "Fade in:"
-msgstr "Fosa entrant:"
+msgstr "Esvaïment d'entrada:"
 
-#: src/aosd/aosd_ui.cc:297
+#: src/aosd/aosd_ui.cc:357
 msgid "Fade out:"
-msgstr "Fosa sortint:"
+msgstr "Esvaïment de sortida:"
 
-#: src/aosd/aosd_ui.cc:361
+#: src/aosd/aosd_ui.cc:442
 msgid "Fonts"
-msgstr "Foses"
+msgstr "Tipus de lletres"
 
-#: src/aosd/aosd_ui.cc:368
+#: src/aosd/aosd_ui.cc:449
 #, c-format
 msgid "Font %i:"
-msgstr "Fosa %i:"
+msgstr "Lletra %i:"
 
-#: src/aosd/aosd_ui.cc:382
+#: src/aosd/aosd_ui.cc:466
 msgid "Shadow"
 msgstr "Ombra"
 
-#: src/aosd/aosd_ui.cc:486
+#: src/aosd/aosd_ui.cc:589
 msgid "Render Style"
 msgstr "Estil de representació"
 
-#: src/aosd/aosd_ui.cc:502
+#: src/aosd/aosd_ui.cc:605
 msgid "Colors"
 msgstr "Colors"
 
-#: src/aosd/aosd_ui.cc:513
+#: src/aosd/aosd_ui.cc:616
 #, c-format
 msgid "Color %i:"
 msgstr "Color %i:"
 
-#: src/aosd/aosd_ui.cc:600
+#: src/aosd/aosd_ui.cc:714
 msgid "Enable trigger"
-msgstr "Habilita activador"
+msgstr "Habilita el disparador"
 
-#: src/aosd/aosd_ui.cc:627
+#: src/aosd/aosd_ui.cc:741
 msgid "Event"
 msgstr "Esdeveniment"
 
-#: src/aosd/aosd_ui.cc:655
+#: src/aosd/aosd_ui.cc:768
 msgid "Composite manager detected"
-msgstr "S'ha detectat un gestor Composite"
+msgstr "S'ha detectat un gestor de composicions"
 
-#: src/aosd/aosd_ui.cc:662
+#: src/aosd/aosd_ui.cc:775
 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;\n"
-"tret que sapigueu que ja n'està funcionant un, activeu un gestor Composite o "
-"l'OSD no funcionarà correctament"
+"No s'ha detectat cap gestor de composicions;\n"
+"tret que sapigueu que ja n'està funcionant un, activeu un gestor de "
+"composicions o l'OSD no funcionarà correctament"
 
-#: src/aosd/aosd_ui.cc:670
+#: src/aosd/aosd_ui.cc:783
 msgid "Composite manager not required for fake transparency"
-msgstr "La transparència simulada no requereix un gestor Composite"
+msgstr "La transparència simulada no requereix un gestor de composicions"
 
-#: src/aosd/aosd_ui.cc:706
+#: src/aosd/aosd_ui.cc:820
 msgid "Transparency"
 msgstr "Transparència"
 
-#: src/aosd/aosd_ui.cc:712
+#: src/aosd/aosd_ui.cc:826
 msgid "Fake transparency"
 msgstr "Transparència simulada"
 
-#: src/aosd/aosd_ui.cc:714
+#: src/aosd/aosd_ui.cc:828
 msgid "Real transparency (requires X Composite Ext.)"
-msgstr "Transparència real (requereix l'ext. X composite)"
+msgstr "Transparència real (requereix l'extensió de composicions de les X)"
 
-#: src/aosd/aosd_ui.cc:756
+#: src/aosd/aosd_ui.cc:875
 msgid "Composite extension not loaded"
-msgstr "L'extensió Composite no està carregada"
-
-#: src/aosd/aosd_ui.cc:764
-msgid "Composite extension not available"
-msgstr "L'extensió Composite no està disponible"
+msgstr "L'extensió de composicions no està carregada"
 
-#: src/aosd/aosd_ui.cc:781
+#: src/aosd/aosd_ui.cc:892
 #, c-format
 msgid "Audacious OSD"
-msgstr "OSD de l'Audacious"
+msgstr "OSD d'Audacious"
 
-#: src/aosd/aosd_ui.cc:844
+#: src/aosd/aosd_ui.cc:955
 msgid "Position"
 msgstr "Posició"
 
-#: src/aosd/aosd_ui.cc:849
+#: src/aosd/aosd_ui.cc:960
 msgid "Animation"
 msgstr "Animació"
 
-#: src/aosd/aosd_ui.cc:854
+#: src/aosd/aosd_ui.cc:965
 msgid "Text"
 msgstr "Text"
 
-#: src/aosd/aosd_ui.cc:859
+#: src/aosd/aosd_ui.cc:970
 msgid "Decoration"
 msgstr "Decoració"
 
-#: src/aosd/aosd_ui.cc:864
+#: src/aosd/aosd_ui.cc:975
 msgid "Trigger"
-msgstr "Llançador"
+msgstr "Disparador"
 
-#: src/aosd/aosd_ui.cc:869
+#: src/aosd/aosd_ui.cc:980 src/streamtuner/shoutcast-model.cc:202
 msgid "Misc"
 msgstr "Misc"
 
-#: src/aosd/aosd_ui.cc:878
+#: src/aosd/aosd_ui.cc:989
 msgid "Test"
-msgstr ""
+msgstr "Prova"
 
 #: src/asx3/asx3.cc:35
 msgid "ASXv3 Playlists"
-msgstr ""
+msgstr "Llistes de reproducció ASXv3"
 
 #: src/asx/asx.cc:33
 msgid "ASXv1/ASXv2 Playlists"
-msgstr ""
+msgstr "Llistes de reproducció ASXv1/ASXv2"
 
 #: src/audpl/audpl.cc:33
 msgid "Audacious Playlists (audpl)"
+msgstr "Llistes de reproducció d'Audacious (audpl)"
+
+#: src/background_music/background_music.cc:24
+msgid "Background music"
+msgstr ""
+
+#: src/background_music/background_music.cc:25
+msgid "Target level:"
+msgstr ""
+
+#: src/background_music/background_music.cc:28
+#: src/background_music/background_music.cc:33
+#: src/silence-removal/silence-removal.cc:70
+msgid "dB"
+msgstr "dB"
+
+#: src/background_music/background_music.cc:29
+msgid "Maximum amplification:"
+msgstr ""
+
+#: src/background_music/background_music.cc:34 src/mpg123/mpg123.cc:81
+msgid "Advanced"
+msgstr "Avançat"
+
+#: src/background_music/background_music.cc:36
+msgid "Slow detection weight:"
+msgstr ""
+
+#: src/background_music/background_music.cc:39
+msgid "Hint"
+msgstr ""
+
+#: src/background_music/background_music.cc:41
+msgid ""
+"Slow detection weight is the relative weight\n"
+"of a long term average detection when compared\n"
+"to the actual, faster loudness detection.\n"
+"A value of zero gives a more radio-like sound\n"
+"where soft passages get \"pulled up\" more quickly,\n"
+"a value of two makes the sound feel less compressed."
+msgstr ""
+
+#: src/background_music/background_music.cc:52
+msgid ""
+"Background Music Plugin for Audacious\n"
+"Copyright 2023;2024 Michel Fleur\n"
+"\n"
+"Controls the volume to make the sound equally loud within and between "
+"tracks.\n"
+" It uses accurate loudness measurement and tries to make the volume changes "
+"sound natural without audible peaks, yet without lowering the volume before "
+"a peak in advance."
+msgstr ""
+
+#: src/background_music/background_music.cc:61
+msgid "Background Music"
 msgstr ""
 
-#: src/blur_scope/blur_scope.cc:42
+#: src/bitcrusher/bitcrusher.cc:33
+msgid "Bitcrusher"
+msgstr "Bitcrusher"
+
+#: src/bitcrusher/bitcrusher.cc:34
+msgid "Bit Depth:"
+msgstr "Profunditat de bits:"
+
+#: src/bitcrusher/bitcrusher.cc:37
+msgid "Downsample ratio:"
+msgstr "Taxa de reducció de la mostra:"
+
+#: src/bitcrusher/bitcrusher.cc:48
+msgid "Bitcrusher"
+msgstr "Bitcrusher"
+
+#: src/blur_scope/blur_scope.cc:40 src/blur_scope-qt/blur_scope.cc:45
 msgid "Color"
 msgstr "Color"
 
-#: src/blur_scope/blur_scope.cc:58
+#: src/blur_scope/blur_scope.cc:56 src/blur_scope-qt/blur_scope.cc:158
 msgid "Blur Scope"
-msgstr ""
+msgstr "Oscil·loscopi difús"
 
 #: src/bs2b/plugin.cc:38
 msgid "Bauer Stereophonic-to-Binaural (BS2B)"
-msgstr ""
+msgstr "BS2B (Bauer Stereophonic-to-Binaural)"
 
 #: src/bs2b/plugin.cc:129
 msgid "Presets:"
-msgstr "Predefinits:"
+msgstr "Valors preestablerts:"
+
+#: src/bs2b/plugin.cc:130
+msgid "Default"
+msgstr "Per defecte"
 
 #: src/bs2b/plugin.cc:136
 msgid "Feed level:"
@@ -719,21 +654,21 @@
 
 #: src/bs2b/plugin.cc:138
 msgid "x1/10 dB"
-msgstr ""
+msgstr "x1/10 dB"
 
 #: src/bs2b/plugin.cc:139
 msgid "Cut frequency:"
-msgstr "Tallar freqüència:"
+msgstr "Retalla la freqüència:"
 
-#: src/cairo-spectrum/cairo-spectrum.cc:41
+#: src/cairo-spectrum/cairo-spectrum.cc:42 src/qt-spectrum/qt-spectrum.cc:107
 msgid "Spectrum Analyzer"
-msgstr "Analitzador d'espectre"
+msgstr "Analitzador espectral"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:72
+#: src/cdaudio/cdaudio-ng.cc:74
 msgid "Audio CD Plugin"
-msgstr "Connector de Àudio CD"
+msgstr "Connector de CD d'àudio"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:121
+#: src/cdaudio/cdaudio-ng.cc:121
 msgid ""
 "Copyright (C) 2007-2012 Calin Crisan <ccrisan@gmail.com> and others.\n"
 "\n"
@@ -744,133 +679,142 @@
 "\n"
 "This was a Google Summer of Code 2007 project."
 msgstr ""
+"Drets d'autor (C) 2007-2012 Calin Crisan <ccrisan@gmail.com> i altres.\n"
+"\n"
+"Moltes gràcies als desenvolupadors de libcdio <http://www.gnu.org/software/"
+"libcdio/>\n"
+"i als desenvolupadors de libcddb <http://libcddb.sourceforge.net/>.\n"
+"\n"
+"També moltes gràcies a Tony Vroon per a assessorar-me i guiar-me.\n"
+"\n"
+"Aquest va ser un projecte de Google Summer of Code del 2007."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:137
+#: src/cdaudio/cdaudio-ng.cc:140
 msgid "Device"
 msgstr "Dispositiu"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:138
+#: src/cdaudio/cdaudio-ng.cc:141
 msgid "Read speed:"
 msgstr "Velocitat de lectura:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:141
+#: src/cdaudio/cdaudio-ng.cc:144
 msgid "Override device:"
-msgstr ""
+msgstr "Anul·la el dispositiu:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:143
+#: src/cdaudio/cdaudio-ng.cc:146
 msgid "Metadata"
 msgstr "Metadades"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:144
+#: src/cdaudio/cdaudio-ng.cc:147
 msgid "Use CD-Text"
-msgstr ""
+msgstr "Utilitza CD-Text"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:146
+#: src/cdaudio/cdaudio-ng.cc:150
 msgid "Use CDDB"
-msgstr "Usa CDDB"
+msgstr "Utilitza la CDDB"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:148
+#: src/cdaudio/cdaudio-ng.cc:152
 msgid "Use HTTP instead of CDDBP"
-msgstr "Usa HTTP en lloc de CDDBP"
+msgstr "Utilitza HTTP en lloc de CDDBP"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:151
+#: src/cdaudio/cdaudio-ng.cc:155
 msgid "Server:"
 msgstr "Servidor:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:155
+#: src/cdaudio/cdaudio-ng.cc:159
 msgid "Path:"
 msgstr "Camí:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:159
+#: src/cdaudio/cdaudio-ng.cc:163
 msgid "Port:"
 msgstr "Port:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:246
+#: src/cdaudio/cdaudio-ng.cc:228
 msgid "Failed to initialize cdio subsystem."
-msgstr ""
+msgstr "No s'ha pogut iniciar el subsistema de cdio."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:281
+#: src/cdaudio/cdaudio-ng.cc:260
 #, c-format
 msgid "Invalid URI %s."
-msgstr "L’URI %s no és vàlid."
+msgstr "L'URI %s no és vàlid."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:283
+#: src/cdaudio/cdaudio-ng.cc:262
 #, c-format
 msgid "Track %d not found."
-msgstr "No s’ha trobat la pista %d."
+msgstr "No s'ha trobat la pista %d."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:285
+#: src/cdaudio/cdaudio-ng.cc:264
 #, c-format
 msgid "Track %d is a data track."
-msgstr ""
+msgstr "La pista %d és una pista de dades."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:360
+#: src/cdaudio/cdaudio-ng.cc:339
 msgid "Error reading audio CD."
-msgstr ""
+msgstr "Error en llegir el CD d'àudio."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:429
+#: src/cdaudio/cdaudio-ng.cc:410
 msgid "Audio CD"
-msgstr "CD d'audio"
+msgstr "CD d'àudio"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:460 src/cdaudio-ng/cdaudio-ng.cc:469
+#: src/cdaudio/cdaudio-ng.cc:446 src/cdaudio/cdaudio-ng.cc:455
 #, c-format
 msgid "Failed to open CD device %s."
-msgstr ""
+msgstr "No s'ha pogut obrir el dispositiu de CD %s."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:472
+#: src/cdaudio/cdaudio-ng.cc:458
 msgid "No audio capable CD drive found."
-msgstr ""
+msgstr "No s'ha trobat cap unitat de CD d'àudio."
+
+#: src/cdaudio/cdaudio-ng.cc:481
+msgid "Drive is empty."
+msgstr "La unitat està buida."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:497
+#: src/cdaudio/cdaudio-ng.cc:483
+msgid "Unsupported disk type."
+msgstr "Tipus de disc no admès."
+
+#: src/cdaudio/cdaudio-ng.cc:507
 msgid "Failed to finish initializing opened CD drive."
-msgstr ""
+msgstr "No s'ha pogut acabar la inicialització de la unitat CD oberta."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:510
+#: src/cdaudio/cdaudio-ng.cc:520
 msgid "Failed to retrieve first/last track number."
-msgstr ""
+msgstr "No s'ha pogut recuperar el primer/últim número de pista."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:531
+#: src/cdaudio/cdaudio-ng.cc:541
 #, c-format
 msgid "Cannot read start/end LSN for track %d."
-msgstr ""
+msgstr "No es pot llegir el LSN de començament o d'acabament per la pista %d."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:613
-msgid "Failed to create the cddb connection."
-msgstr ""
+#: src/cdaudio/cdaudio-ng.cc:624
+msgid "Failed to create the CDDB connection."
+msgstr "No s'ha pogut crear la connexió a la CDDB."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:679
+#: src/cdaudio/cdaudio-ng.cc:690
 msgid "Failed to query the CDDB server"
-msgstr ""
+msgstr "No s'ha pogut consultar al servidor de CDDB"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:681
+#: src/cdaudio/cdaudio-ng.cc:692
 #, c-format
 msgid "Failed to query the CDDB server: %s"
-msgstr ""
+msgstr "No s'ha pogut consultar al servidor de la CDDB: %s"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:705
+#: src/cdaudio/cdaudio-ng.cc:716
 #, c-format
-msgid "Failed to read the cddb info: %s"
-msgstr ""
-
-#: src/cdaudio-ng/cdaudio-ng.cc:765
-msgid "Drive is empty."
-msgstr "La unitat està buida."
-
-#: src/cdaudio-ng/cdaudio-ng.cc:767
-msgid "Unsupported disk type."
-msgstr "Tipus de disc no admès."
+msgid "Failed to read the CDDB info: %s"
+msgstr "No s'ha pogut llegir la informació de la CDDB: %s"
 
-#: src/cd-menu-items/cd-menu-items.cc:35
+#: src/cd-menu-items/cd-menu-items.cc:33
 msgid "Audio CD Menu Items"
-msgstr ""
+msgstr "Elements de menú del CD d'Àudio"
 
-#: src/cd-menu-items/cd-menu-items.cc:47
-msgid "Play CD"
-msgstr "Reprodueix CD"
-
-#: src/cd-menu-items/cd-menu-items.cc:47
-msgid "Add CD"
-msgstr "Afegeix CD"
+#: src/cd-menu-items/cd-menu-items.cc:45
+msgid "Pla_y CD"
+msgstr "Reproduei_x el CD"
+
+#: src/cd-menu-items/cd-menu-items.cc:45
+msgid "_Add CD"
+msgstr "_Afegeix el CD"
 
 #: src/compressor/compressor.cc:45
 msgid "Compression"
@@ -878,7 +822,7 @@
 
 #: src/compressor/compressor.cc:46
 msgid "Center volume:"
-msgstr "Centrar volum"
+msgstr "Centra el volum:"
 
 #: src/compressor/compressor.cc:49
 msgid "Dynamic range:"
@@ -889,10 +833,12 @@
 "Dynamic Range Compression Plugin for Audacious\n"
 "Copyright 2010-2014 John Lindgren"
 msgstr ""
+"Connector de compressió d'interval dinàmic per a Audacious\n"
+"Drets d'autor 2010-2014 John Lindgren"
 
 #: src/compressor/compressor.cc:64
 msgid "Dynamic Range Compressor"
-msgstr ""
+msgstr "Compressor del rang dinàmic"
 
 #: src/console/plugin.cc:15
 msgid ""
@@ -903,6 +849,12 @@
 "William Pitcock <nenolod@dereferenced.org>\n"
 "Shay Green <gblargg@gmail.com>"
 msgstr ""
+"Motor de consola de descodificador de música basat en Game_Music_Emu 0.5.2\n"
+"Formats suportats: AY, GBS, GYM, HES, KSS, NSF, NSFE, SAP, SPC, VGM, VGZ\n"
+"\n"
+"Connector d'Audacious per:\n"
+"William Pitcock <nenolod@dereferenced.org>\n"
+"Shay Green <gblargg@gmail.com>"
 
 #: src/console/plugin.cc:30
 msgid "Bass:"
@@ -914,23 +866,30 @@
 
 #: src/console/plugin.cc:36
 msgid "Echo:"
-msgstr ""
+msgstr "Eco:"
 
 #: src/console/plugin.cc:39
 msgid "Default song length:"
 msgstr "Durada per defecte:"
 
-#: src/console/plugin.cc:42 src/modplug/plugin_main.cc:59
+#: src/console/plugin.cc:41 src/crossfade/crossfade.cc:56
+#: src/crossfade/crossfade.cc:62 src/lirc/lirc.cc:395 src/notify/notify.cc:113
+#: src/sid/xs_config.cc:85 src/sid/xs_config.cc:94 src/sid/xs_config.cc:103
+#: src/vumeter-qt/vumeter_qt.cc:39
+msgid "seconds"
+msgstr "segons"
+
+#: src/console/plugin.cc:42 src/modplug/plugin_main.cc:58
 msgid "Resampling"
-msgstr ""
+msgstr "Remostreig"
 
 #: src/console/plugin.cc:43
 msgid "Enable audio resampling"
-msgstr "Activa el remostratge d'àudio"
+msgstr "Habilita el remostreig de l'àudio"
 
 #: src/console/plugin.cc:49
 msgid "SPC"
-msgstr ""
+msgstr "SPC"
 
 #: src/console/plugin.cc:50
 msgid "Ignore length from SPC tags"
@@ -944,71 +903,95 @@
 msgid "Game Console Music Decoder"
 msgstr "Descodificador musical de videoconsola"
 
-#: src/coreaudio/coreaudio.cc:50
+#: src/coreaudio/coreaudio.cc:53
 msgid "CoreAudio output"
-msgstr ""
+msgstr "Sortida CoreAudio"
 
-#: src/coreaudio/coreaudio.cc:131
+#: src/coreaudio/coreaudio.cc:155
 msgid ""
 "CoreAudio Output Plugin for Audacious\n"
 "Copyright 2014 William Pitcock\n"
+"Copyright 2017,18 René J.V. Bertin\n"
+" (original code and code adapted from\n"
+" Apple examples, (C) Apple 2013)\n"
 "\n"
 "Based on SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
 msgstr ""
+"Connector de sortida CoreAudio per a Audacious\n"
+"Drets d'autor 2014 William Pitcock\n"
+"Drets d'autor 2017-18 René J.V. Bertin\n"
+" (codi original i codi adaptat dels exemples\n"
+" d'Apple, (C) Apple 2013)\n"
+"\n"
+"Basat en el connector de sortida SDL per a Audacious\n"
+"Drets d'autor 2010 John Lindgren"
 
-#: src/coreaudio/coreaudio.cc:143
+#: src/coreaudio/coreaudio.cc:171
 msgid "Use exclusive mode"
+msgstr "Utilitza el mode exclusiu"
+
+#: src/coreaudio/coreaudio.cc:173
+msgid "Use bit perfect audio (adapt device sampling rate)"
 msgstr ""
+"Utilitza un àudio perfecte en bits (adaptar la taxa de mostreig del "
+"dispositiu)"
 
-#: src/crossfade/crossfade.cc:44
+#: src/crossfade/crossfade.cc:47
 msgid ""
 "Crossfade Plugin for Audacious\n"
 "Copyright 2010-2014 John Lindgren"
 msgstr ""
+"Connector de fusió entre cançons per a Audacious\n"
+"Drets d'autor 2010-2014 John Lindgren"
 
-#: src/crossfade/crossfade.cc:48
+#: src/crossfade/crossfade.cc:51
 msgid "Crossfade"
-msgstr ""
+msgstr "Fusió entre cançons"
 
-#: src/crossfade/crossfade.cc:49
+#: src/crossfade/crossfade.cc:52
 msgid "On automatic song change"
-msgstr ""
+msgstr "Amb el canvi automàtic de la cançó"
 
-#: src/crossfade/crossfade.cc:51 src/crossfade/crossfade.cc:57
+#: src/crossfade/crossfade.cc:54 src/crossfade/crossfade.cc:60
 msgid "Overlap:"
-msgstr ""
+msgstr "Solapa:"
 
-#: src/crossfade/crossfade.cc:55
+#: src/crossfade/crossfade.cc:58
 msgid "On seek or manual song change"
-msgstr ""
+msgstr "Cerca o canvi de cançó manual"
 
-#: src/crossfade/crossfade.cc:61
-msgid "Tip"
+#: src/crossfade/crossfade.cc:64
+msgid "No fade in"
 msgstr ""
 
-#: src/crossfade/crossfade.cc:62
-msgid ""
-"For better crossfading, enable\n"
-"the Silence Removal effect."
+#: src/crossfade/crossfade.cc:66
+msgid "Use S-curve fade"
 msgstr ""
 
-#: src/crossfade/crossfade.cc:72
-msgid "Crossfade"
+#: src/crossfade/crossfade.cc:68
+msgid "S-curve steepness:"
 msgstr ""
 
-#: src/crossfade/crossfade.cc:161
-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."
+#: src/crossfade/crossfade.cc:70
+msgid "(higher is steeper)"
 msgstr ""
 
-#: src/crossfade/crossfade.cc:168
+#: src/crossfade/crossfade.cc:72
+msgid "Tip"
+msgstr "Consell"
+
+#: src/crossfade/crossfade.cc:73
 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."
+"For better crossfading, enable\n"
+"the Silence Removal effect."
 msgstr ""
+"Per a una millor fusió entre cançons, activeu\n"
+"l'efecte d'eliminació de silenci."
+
+#: src/crossfade/crossfade.cc:83
+msgid "Crossfade"
+msgstr "Fusió entre cançons"
 
 #: src/crystalizer/crystalizer.cc:31
 msgid "Crystalizer"
@@ -1020,64 +1003,65 @@
 
 #: src/crystalizer/crystalizer.cc:43
 msgid "Crystalizer"
-msgstr ""
+msgstr "Cristal·litzador"
 
-#: src/cue/cue.cc:37
+#: src/cue/cue.cc:42
 msgid "Cue Sheet Plugin"
-msgstr ""
+msgstr "Connector de full CUE"
 
-#: src/delete-files/delete-files.cc:46 src/delete-files/delete-files.cc:146
+#: src/delete-files/delete-files.cc:53 src/delete-files/delete-files.cc:215
+#: src/delete-files/delete-files.cc:230
 msgid "Delete Files"
-msgstr ""
+msgstr "Suprimeix fitxers"
+
+#: src/delete-files/delete-files.cc:120
+msgid "No files are selected."
+msgstr "No hi ha cap fitxer seleccionat."
 
-#: src/delete-files/delete-files.cc:75
+#: src/delete-files/delete-files.cc:125
 #, c-format
-msgid "Error moving %s to trash: %s."
-msgstr ""
+msgid "Do you want to move %s to the trash?"
+msgstr "Voleu moure %s a la paperera?"
 
-#: src/delete-files/delete-files.cc:86
+#: src/delete-files/delete-files.cc:126
 #, c-format
-msgid "Error deleting %s: %s."
-msgstr ""
+msgid "Do you want to permanently delete %s?"
+msgstr "Voleu eliminar permanentment %s?"
 
-#: src/delete-files/delete-files.cc:117
+#: src/delete-files/delete-files.cc:133
 #, c-format
-msgid "Error deleting %s: not a local file."
-msgstr ""
+msgid "Do you want to move %d files to the trash?"
+msgstr "Voleu moure %d fitxers a la paperera?"
 
 #: src/delete-files/delete-files.cc:134
-msgid "Do you want to move the selected files to the trash?"
-msgstr ""
-
-#: src/delete-files/delete-files.cc:135
-msgid "Move to Trash"
-msgstr ""
+#, c-format
+msgid "Do you want to permanently delete %d files?"
+msgstr "Voleu eliminar permanentment %d fitxers?"
 
-#: src/delete-files/delete-files.cc:140
-msgid "Do you want to permanently delete the selected files?"
-msgstr ""
+#: src/delete-files/delete-files.cc:146
+msgid "Move to trash"
+msgstr "Mou a la paperera"
 
-#: src/delete-files/delete-files.cc:141 src/skins/preset-list.cc:411
-#: src/skins/preset-list.cc:427
+#: src/delete-files/delete-files.cc:146
 msgid "Delete"
 msgstr "Elimina"
 
-#: src/delete-files/delete-files.cc:145 src/skins/preset-browser.cc:56
-#: src/skins/preset-list.cc:307 src/skins/ui_playlist.cc:221
+#: src/delete-files/delete-files.cc:213 src/delete-files/delete-files.cc:235
+#: src/skins-qt/search-select.cc:102 src/skins/search-select.cc:78
 msgid "Cancel"
 msgstr "Cancel·la"
 
-#: src/delete-files/delete-files.cc:166
+#: src/delete-files/delete-files.cc:267
 msgid "Delete Selected Files"
-msgstr ""
+msgstr "Suprimeix els fitxers seleccionats"
 
-#: src/delete-files/delete-files.cc:181
+#: src/delete-files/delete-files.cc:287
 msgid "Delete Method"
-msgstr ""
+msgstr "Mètode de supressió"
 
-#: src/delete-files/delete-files.cc:182
+#: src/delete-files/delete-files.cc:288
 msgid "Move to trash instead of deleting immediately"
-msgstr ""
+msgstr "Mou a la paperera en comptes de suprimir immediatament"
 
 #: src/echo_plugin/echo.cc:9
 msgid ""
@@ -1086,18 +1070,22 @@
 "Surround echo by Carl van Schaik, 1999\n"
 "Updated for Audacious by William Pitcock and John Lindgren, 2010-2014"
 msgstr ""
+"Connector d'eco\n"
+"Per Johan Levin, 1999\n"
+"Eco envoltant per Carl van Schaik, 1999\n"
+"Actualitzat per a Audacious per William Pitcock i John Lindgren, 2010-2014"
 
 #: src/echo_plugin/echo.cc:21
 msgid "Echo"
 msgstr "Eco"
 
-#: src/echo_plugin/echo.cc:22 src/modplug/plugin_main.cc:73
-#: src/modplug/plugin_main.cc:83
+#: src/echo_plugin/echo.cc:22 src/modplug/plugin_main.cc:72
+#: src/modplug/plugin_main.cc:82
 msgid "Delay:"
 msgstr "Retard:"
 
-#: src/echo_plugin/echo.cc:24 src/modplug/plugin_main.cc:73
-#: src/modplug/plugin_main.cc:83
+#: src/echo_plugin/echo.cc:24 src/modplug/plugin_main.cc:72
+#: src/modplug/plugin_main.cc:82 src/xsf/plugin.cc:445
 msgid "ms"
 msgstr "ms"
 
@@ -1105,19 +1093,19 @@
 msgid "Feedback:"
 msgstr "Retorn:"
 
-#: src/echo_plugin/echo.cc:28 src/modplug/plugin_main.cc:87
+#: src/echo_plugin/echo.cc:28 src/modplug/plugin_main.cc:86
 msgid "Volume:"
 msgstr "Volum:"
 
 #: src/echo_plugin/echo.cc:39
 msgid "Echo"
-msgstr ""
+msgstr "Eco"
 
-#: src/ffaudio/ffaudio-core.cc:41
+#: src/ffaudio/ffaudio-core.cc:50
 msgid "FFmpeg Plugin"
-msgstr ""
+msgstr "Connector FFmpeg"
 
-#: src/ffaudio/ffaudio-core.cc:571
+#: src/ffaudio/ffaudio-core.cc:649
 msgid ""
 "Multi-format audio decoding plugin for Audacious using\n"
 "FFmpeg multimedia framework (http://www.ffmpeg.org/)\n"
@@ -1126,262 +1114,361 @@
 "William Pitcock <nenolod@nenolod.net>\n"
 "Matti Hämäläinen <ccr@tnsp.org>"
 msgstr ""
+"Connector de descodificació d'àudio de diversos formats per a Audacious "
+"mitjançant\n"
+"el marc de treball multimèdia de FFmpeg (http://www.ffmpeg.org/)\n"
+"\n"
+"Connector d'Audacious per:\n"
+"William Pitcock <nenolod@nenolod.net>\n"
+"Matti Hämäläinen <ccr@tnsp.org>"
 
-#: src/filewriter/filewriter.cc:45
+#: src/filewriter/filewriter.cc:48
 msgid "FileWriter Plugin"
+msgstr "Connector FileWriter"
+
+#: src/filewriter/filewriter.cc:316
+#, c-format
+msgid ""
+"Error opening %s:\n"
+"%s"
+msgstr ""
+"Error en obrir %s:\n"
+"%s"
+
+#: src/filewriter/filewriter.cc:358
+msgid ""
+"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 ""
+"Aquest programa és programari lliure; vostè pot redistribuir-lo i/o "
+"modificar-lo sota els termes de la GNU General Public License segons el "
+"publicat per la Free Software Foundation; ja sigui la versió 2 de la "
+"Llicència, o (a la seva elecció) qualsevol versió posterior.\n"
+"\n"
+"Aquest programa es distribueix amb l'esperança que serà útil, però SENSE CAP "
+"GARANTIA; ni tan sols la garantia implícita de COMERCIALITZACIÓ o APTITUD "
+"PER A UN PROPÒSIT PARTICULAR. Vegeu la GNU General Public License per a més "
+"detalls.\n"
+"\n"
+"Hauríeu de rebre una còpia de la GNU General Public License juntament amb "
+"aquest programa; si no, podeu escriure la Free Software Foundation, Inc., 51 "
+"Franklin Street, Cinquena Planta, Boston, MA 02110-1301, USA."
 
-#: src/filewriter/filewriter.cc:386
+#: src/filewriter/filewriter.cc:385
 msgid "Output file format:"
 msgstr "Format del fitxer de sortida:"
 
-#: src/filewriter/filewriter.cc:403
-msgid "Configure"
-msgstr "Configuració"
-
-#: src/filewriter/filewriter.cc:413
+#: src/filewriter/filewriter.cc:389
 msgid "Save into original directory"
 msgstr "Desa al directori original"
 
-#: src/filewriter/filewriter.cc:417
-msgid "Save into custom directory"
-msgstr "Desa a un altre directori"
-
-#: src/filewriter/filewriter.cc:427
-msgid "Output file folder:"
-msgstr "Directori de sortida:"
-
-#: src/filewriter/filewriter.cc:431
-msgid "Pick a folder"
-msgstr "Trieu un directori"
+#: src/filewriter/filewriter.cc:392
+msgid "Save into custom directory:"
+msgstr "Desa a un altre directori:"
 
-#: src/filewriter/filewriter.cc:444
+#: src/filewriter/filewriter.cc:400
 msgid "Generate file name from:"
-msgstr ""
-
-#: src/filewriter/filewriter.cc:448
-msgid "Original file tag"
-msgstr ""
+msgstr "Agafa el nom del fitxer de:"
 
-#: src/filewriter/filewriter.cc:453
+#: src/filewriter/filewriter.cc:401
 msgid "Original file name"
-msgstr ""
+msgstr "Nom del fitxer original"
 
-#: src/filewriter/filewriter.cc:459
-msgid "Include original file name extension"
-msgstr ""
+#: src/filewriter/filewriter.cc:404
+msgid "Original file name (no suffix)"
+msgstr "Nom del fitxer original (sense sufix)"
 
-#: src/filewriter/filewriter.cc:468
-msgid "Prepend track number to file name"
-msgstr ""
+#: src/filewriter/filewriter.cc:407
+msgid "Original file tag"
+msgstr "Etiqueta del fitxer original"
 
-#: src/filewriter/filewriter.cc:484
-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.cc:411
+msgid "Prepend track number to file name"
+msgstr "Precedeix el nombre de pista pel nom del fitxer"
 
-#: src/filewriter/mp3.cc:40 src/filewriter/mp3.cc:717
+#: src/filewriter/filewriter.cc:417 src/filewriter/filewriter.cc:449
 msgid "Auto"
 msgstr "Auto"
 
-#: src/filewriter/mp3.cc:40
+#: src/filewriter/filewriter.cc:418
+msgid "8000 Hz"
+msgstr "8000 Hz"
+
+#: src/filewriter/filewriter.cc:419
+msgid "11025 Hz"
+msgstr "11025 Hz"
+
+#: src/filewriter/filewriter.cc:420
+msgid "12000 Hz"
+msgstr "12000 Hz"
+
+#: src/filewriter/filewriter.cc:421
+msgid "16000 Hz"
+msgstr "16000 Hz"
+
+#: src/filewriter/filewriter.cc:422
+msgid "22050 Hz"
+msgstr "22050 Hz"
+
+#: src/filewriter/filewriter.cc:423
+msgid "24000 Hz"
+msgstr "24000 Hz"
+
+#: src/filewriter/filewriter.cc:424
+msgid "32000 Hz"
+msgstr "32000 Hz"
+
+#: src/filewriter/filewriter.cc:425 src/xsf/plugin.cc:430
+msgid "44100 Hz"
+msgstr "44100 Hz"
+
+#: src/filewriter/filewriter.cc:426 src/xsf/plugin.cc:431
+msgid "48000 Hz"
+msgstr "48000 Hz"
+
+#: src/filewriter/filewriter.cc:430
+msgid "8 kbit/s"
+msgstr "8 kbit/s"
+
+#: src/filewriter/filewriter.cc:431
+msgid "16 kbit/s"
+msgstr "16 kbit/s"
+
+#: src/filewriter/filewriter.cc:432
+msgid "32 kbit/s"
+msgstr "32 kbit/s"
+
+#: src/filewriter/filewriter.cc:433
+msgid "40 kbit/s"
+msgstr "40 kbit/s"
+
+#: src/filewriter/filewriter.cc:434
+msgid "48 kbit/s"
+msgstr "48 kbit/s"
+
+#: src/filewriter/filewriter.cc:435
+msgid "56 kbit/s"
+msgstr "56 kbit/s"
+
+#: src/filewriter/filewriter.cc:436
+msgid "64 kbit/s"
+msgstr "64 kbit/s"
+
+#: src/filewriter/filewriter.cc:437
+msgid "80 kbit/s"
+msgstr "80 kbit/s"
+
+#: src/filewriter/filewriter.cc:438
+msgid "96 kbit/s"
+msgstr "96 kbit/s"
+
+#: src/filewriter/filewriter.cc:439
+msgid "112 kbit/s"
+msgstr "112 kbit/s"
+
+#: src/filewriter/filewriter.cc:440
+msgid "128 kbit/s"
+msgstr "128 kbit/s"
+
+#: src/filewriter/filewriter.cc:441
+msgid "160 kbit/s"
+msgstr "160 kbit/s"
+
+#: src/filewriter/filewriter.cc:442
+msgid "192 kbit/s"
+msgstr "192 kbit/s"
+
+#: src/filewriter/filewriter.cc:443
+msgid "224 kbit/s"
+msgstr "224 kbit/s"
+
+#: src/filewriter/filewriter.cc:444
+msgid "256 kbit/s"
+msgstr "256 kbit/s"
+
+#: src/filewriter/filewriter.cc:445
+msgid "320 kbit/s"
+msgstr "320 kbit/s"
+
+#: src/filewriter/filewriter.cc:450
 msgid "Joint Stereo"
 msgstr "Estèreo conjunt"
 
-#: src/filewriter/mp3.cc:41 src/modplug/plugin_main.cc:58
-#: src/mpg123/mpg123.cc:248
+#: src/filewriter/filewriter.cc:451 src/modplug/plugin_main.cc:57
+#: src/mpg123/mpg123.cc:259
 msgid "Stereo"
 msgstr "Estèreo"
 
-#: src/filewriter/mp3.cc:41 src/modplug/plugin_main.cc:57
-#: src/mpg123/mpg123.cc:248
+#: src/filewriter/filewriter.cc:452 src/modplug/plugin_main.cc:56
+#: src/mpg123/mpg123.cc:260
 msgid "Mono"
 msgstr "Mono"
 
-#: src/filewriter/mp3.cc:657
-msgid "MP3 Configuration"
-msgstr "Configuració d'MP3"
+#: src/filewriter/filewriter.cc:456
+msgid "VBR"
+msgstr "VBR"
+
+#: src/filewriter/filewriter.cc:457
+msgid "ABR"
+msgstr "ABR"
 
-#: src/filewriter/mp3.cc:658
-msgid "_OK"
-msgstr ""
-
-#: src/filewriter/mp3.cc:681
-msgid "Algorithm Quality:"
+#: src/filewriter/filewriter.cc:478
+msgid "Algorithm quality:"
 msgstr "Qualitat de l'algoritme:"
 
-#: src/filewriter/mp3.cc:706
-msgid "Output Sample Rate:"
-msgstr ""
-
-#: src/filewriter/mp3.cc:733
-msgid "(Hz)"
-msgstr "(Hz)"
-
-#: src/filewriter/mp3.cc:740
-msgid "Bitrate / Compression Ratio:"
-msgstr ""
-
-#: src/filewriter/mp3.cc:764
-msgid "Bitrate (kbps):"
-msgstr "Flux de bits (kbps):"
+#: src/filewriter/filewriter.cc:484
+msgid "Bitrate:"
+msgstr "Taxa de bits:"
 
-#: src/filewriter/mp3.cc:796
+#: src/filewriter/filewriter.cc:491
 msgid "Compression ratio:"
 msgstr "Ràtio de compressió:"
 
-#: src/filewriter/mp3.cc:820
-msgid "Audio Mode:"
+#: src/filewriter/filewriter.cc:498
+msgid "Audio mode:"
 msgstr "Mode d'àudio:"
 
-#: src/filewriter/mp3.cc:845
-msgid "Miscellaneous:"
-msgstr ""
-
-#: src/filewriter/mp3.cc:856
+#: src/filewriter/filewriter.cc:501
 msgid "Enforce strict ISO compliance"
-msgstr ""
+msgstr "Força el compliment estricte de l'estàndard ISO"
 
-#: src/filewriter/mp3.cc:867
+#: src/filewriter/filewriter.cc:503
 msgid "Error protection"
 msgstr "Protecció d'errors"
 
-#: src/filewriter/mp3.cc:879 src/filewriter/vorbis.cc:206
-msgid "Quality"
-msgstr "Qualitat"
-
-#: src/filewriter/mp3.cc:888
+#: src/filewriter/filewriter.cc:508
 msgid "Enable VBR/ABR"
-msgstr "Activa VBR/ABR"
+msgstr "Habilita VBR/ABR"
 
-#: src/filewriter/mp3.cc:898
+#: src/filewriter/filewriter.cc:510
 msgid "Type:"
 msgstr "Tipus:"
 
-#: src/filewriter/mp3.cc:931
-msgid "VBR Options:"
-msgstr "Opcions VBR:"
-
-#: src/filewriter/mp3.cc:947
-msgid "Minimum bitrate (kbps):"
-msgstr "Flux de bits mínim (kbps):"
-
-#: src/filewriter/mp3.cc:973
-msgid "Maximum bitrate (kbps):"
-msgstr "Flux de bits màxim (kbps):"
-
-#: src/filewriter/mp3.cc:995
-msgid "Strictly enforce minimum bitrate"
-msgstr "Compliment estricte el flux de bit mínim"
-
-#: src/filewriter/mp3.cc:1007
-msgid "ABR Options:"
-msgstr "Opcions ABR:"
-
-#: src/filewriter/mp3.cc:1017
-msgid "Average bitrate (kbps):"
-msgstr "Flux de bits mitjà (kbps):"
+#: src/filewriter/filewriter.cc:514
+msgid "Minimum bitrate:"
+msgstr "Taxa de bits mínima:"
+
+#: src/filewriter/filewriter.cc:518
+msgid "Maximum bitrate:"
+msgstr "Taxa de bits màxima:"
+
+#: src/filewriter/filewriter.cc:522
+msgid "Average bitrate:"
+msgstr "Taxa de bits mitjana:"
 
-#: src/filewriter/mp3.cc:1044
+#: src/filewriter/filewriter.cc:526
 msgid "VBR quality level:"
 msgstr "Nivell de qualitat VBR:"
 
-#: src/filewriter/mp3.cc:1063
-msgid "Omit Xing VBR header"
-msgstr ""
+#: src/filewriter/filewriter.cc:530
+msgid "Strictly enforce minimum bitrate"
+msgstr "Estricte compliment de la taxa de bits mínima"
 
-#: src/filewriter/mp3.cc:1076
-msgid "VBR/ABR"
-msgstr "VBR/ABR"
+#: src/filewriter/filewriter.cc:533
+msgid "Omit Xing VBR header"
+msgstr "Omet escriure la capçalera VBR Xing"
 
-#: src/filewriter/mp3.cc:1085
-msgid "Frame Parameters:"
-msgstr ""
+#: src/filewriter/filewriter.cc:539
+msgid "Frame Headers"
+msgstr "Capçaleres dels marcs"
 
-#: src/filewriter/mp3.cc:1097
+#: src/filewriter/filewriter.cc:540
 msgid "Mark as copyright"
-msgstr "Marca com a copyright"
+msgstr "Marca com a drets d'autor"
 
-#: src/filewriter/mp3.cc:1108
+#: src/filewriter/filewriter.cc:542
 msgid "Mark as original"
 msgstr "Marca com a original"
 
-#: src/filewriter/mp3.cc:1120
-msgid "ID3 Parameters:"
-msgstr ""
+#: src/filewriter/filewriter.cc:544
+msgid "ID3 Tags"
+msgstr "Etiquetes ID3 "
 
-#: src/filewriter/mp3.cc:1131
+#: src/filewriter/filewriter.cc:545
 msgid "Force addition of version 2 tag"
-msgstr "Força l'afegit d'etiquetes ID3 versió 2"
+msgstr "Força l'addició de les etiquetes de la versió 2"
 
-#: src/filewriter/mp3.cc:1141
+#: src/filewriter/filewriter.cc:547
 msgid "Only add v1 tag"
-msgstr "Només etiquetes v1"
+msgstr "Només afegeix l'etiqueta v1"
 
-#: src/filewriter/mp3.cc:1148
+#: src/filewriter/filewriter.cc:549
 msgid "Only add v2 tag"
-msgstr "Només etiquetes v2"
+msgstr "Només afegeix l'etiqueta v2"
+
+#: src/filewriter/filewriter.cc:554
+msgid "Quality"
+msgstr "Qualitat"
 
-#: src/filewriter/mp3.cc:1169
+#: src/filewriter/filewriter.cc:555
+msgid "VBR/ABR"
+msgstr "VBR/ABR"
+
+#: src/filewriter/filewriter.cc:556
 msgid "Tags"
 msgstr "Etiquetes"
 
-#: src/filewriter/vorbis.cc:196
-msgid "Vorbis Encoder Configuration"
-msgstr "Configuració del codificador Vorbis"
-
-#: src/filewriter/vorbis.cc:219
-msgid "Quality level (0 - 10):"
-msgstr "Nivell de qualitat (0 - 10):"
+#: src/filewriter/filewriter.cc:566
+msgid "Quality (0-1):"
+msgstr "Qualitat (0-1):"
 
-#: src/flacng/flacng.h:35
+#: src/filewriter/filewriter.cc:573 src/skins-qt/skins_cfg.cc:307
+#: src/skins/skins_cfg.cc:289
+msgid "General"
+msgstr "General"
+
+#: src/flac/flacng.h:36
 msgid "FLAC Decoder"
-msgstr ""
+msgstr "Descodificador FLAC"
 
-#: src/flacng/metadata.cc:351 src/wavpack/wavpack.cc:209
+#: src/flac/metadata.cc:296 src/wavpack/wavpack.cc:215
 msgid "lossless"
 msgstr "sense pèrdues"
 
-#: src/flacng/plugin.cc:169
+#: src/flac/plugin.cc:214
 msgid ""
 "Original code by\n"
 "Ralf Ertzinger <ralf@skytale.net>\n"
 "\n"
 "http://www.skytale.net/projects/bmp-flac2/"
 msgstr ""
+"Codi original per\n"
+"Ralf Ertzinger <ralf@skytale.net>\n"
+"\n"
+"http://www.skytale.net/projects/bmp-flac2/"
 
 #: src/gio/gio.cc:34
 msgid ""
 "GIO Plugin for Audacious\n"
 "Copyright 2009-2012 John Lindgren"
 msgstr ""
+"Connector GIO per a Audacious\n"
+"Drets d'autor 2009-2012 John Lindgren"
 
 #: src/gio/gio.cc:42
 msgid "GIO Plugin"
 msgstr "Connector GIO"
 
-#: src/gio/gio.cc:153
+#: src/gio/gio.cc:152
 msgid "Read-and-append mode not supported"
-msgstr ""
+msgstr "Mode de Llegir i annexar no compatible"
 
-#: src/gio/gio.cc:166
+#: src/gio/gio.cc:165
 msgid "Invalid open mode"
-msgstr ""
+msgstr "Mode d'obriment no vàlid"
 
-#: src/gl-spectrum/gl-spectrum.cc:51
+#: src/glspectrum/gl-spectrum.cc:52
 msgid ""
 "OpenGL Spectrum Analyzer for Audacious\n"
 "Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
@@ -1392,611 +1479,754 @@
 "\n"
 "License: GPLv2+"
 msgstr ""
-
-#: src/gl-spectrum/gl-spectrum.cc:62
-msgid "OpenGL Spectrum Analyzer"
-msgstr "Analitzador d’espectre OpenGL"
-
-#: src/gl-spectrum-qt/gl-spectrum.cc:41
-msgid ""
-"OpenGL Spectrum Analyzer for Audacious\n"
-"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
-"Copyright 2014 William Pitcock\n"
+"Analitzador d'espectre OpenGL per a Audacious\n"
+"Drets d'autor 2013 Christophe Budé, John Lindgren i Carlo Bramini\n"
 "\n"
-"Based on the XMMS plugin:\n"
-"Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson, and "
-"4Front Technologies\n"
+"Basat en el connector de XMMS:\n"
+"Drets d'autor 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson "
+"i 4Front Technologies\n"
 "\n"
-"License: GPLv2+"
-msgstr ""
+"Llicència: GPLv2+"
 
-#: src/gl-spectrum-qt/gl-spectrum.cc:53
-msgid "OpenGL Spectrum Analyzer (Qt)"
-msgstr ""
-
-#: src/gnomeshortcuts/gnomeshortcuts.cc:38
-msgid "GNOME Shortcuts"
-msgstr ""
-
-#: src/gnomeshortcuts/gnomeshortcuts.cc:54
-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/glspectrum/gl-spectrum.cc:63 src/qtglspectrum/gl-spectrum.cc:53
+msgid "OpenGL Spectrum Analyzer"
+msgstr "Analitzador espectral d'OpenGL"
 
-#: src/gtkui/columns.cc:35
-msgid "Entry number"
+#: src/gtkui/columns.cc:36 src/moonstone/playlist_model.cc:38
+#: src/qtui/playlist_model.cc:33
+msgid "Entry Number"
 msgstr "Número d'entrada"
 
-#: src/gtkui/columns.cc:36 src/playlist-manager/playlist-manager.cc:225
-#: src/qtui/playlist_model.cc:123
+#: src/gtkui/columns.cc:37 src/moonstone/playlist_model.cc:38
+#: src/moonstone/playlist_selection.cc:64
+#: src/playlist-manager/playlist-manager.cc:200
+#: src/playlist-manager-qt/playlist-manager-qt.cc:188
+#: src/qtui/playlist_model.cc:33 src/streamtuner/icecast-model.cc:120
+#: src/streamtuner/ihr-model.cc:159 src/streamtuner/shoutcast-model.cc:122
 msgid "Title"
 msgstr "Títol"
 
-#: src/gtkui/columns.cc:37 src/qtui/playlist_model.cc:125
+#: src/gtkui/columns.cc:38 src/moonstone/playlist_model.cc:39
+#: src/qtui/playlist_model.cc:33
 msgid "Artist"
 msgstr "Artista"
 
-#: src/gtkui/columns.cc:38
+#: src/gtkui/columns.cc:39 src/moonstone/playlist_model.cc:39
+#: src/qtui/playlist_model.cc:33
 msgid "Year"
 msgstr "Any"
 
-#: src/gtkui/columns.cc:39 src/qtui/playlist_model.cc:127
+#: src/gtkui/columns.cc:40 src/moonstone/playlist_model.cc:39
+#: src/qtui/playlist_model.cc:34
 msgid "Album"
 msgstr "Àlbum"
 
-#: src/gtkui/columns.cc:40
-msgid "Album artist"
-msgstr ""
+#: src/gtkui/columns.cc:41 src/moonstone/playlist_model.cc:40
+#: src/qtui/playlist_model.cc:34
+msgid "Album Artist"
+msgstr "Artista de l'àlbum"
 
-#: src/gtkui/columns.cc:41
+#: src/gtkui/columns.cc:42 src/moonstone/playlist_model.cc:40
+#: src/qtui/playlist_model.cc:34
 msgid "Track"
 msgstr "Pista"
 
-#: src/gtkui/columns.cc:42
+#: src/gtkui/columns.cc:43 src/moonstone/playlist_model.cc:40
+#: src/qtui/playlist_model.cc:34 src/streamtuner/icecast-model.cc:123
+#: src/streamtuner/shoutcast-model.cc:125
+#: src/streamtuner/shoutcast-model.cc:236
 msgid "Genre"
 msgstr "Gènere"
 
-#: src/gtkui/columns.cc:43
-msgid "Queue position"
+#: src/gtkui/columns.cc:44 src/moonstone/playlist_model.cc:41
+#: src/qtui/playlist_model.cc:35
+msgid "Queue Position"
 msgstr "Posició a la cua"
 
-#: src/gtkui/columns.cc:44
+#: src/gtkui/columns.cc:45 src/moonstone/playlist_model.cc:41
+#: src/qtui/playlist_model.cc:35
 msgid "Length"
 msgstr "Durada"
 
-#: src/gtkui/columns.cc:45
-msgid "File path"
-msgstr "Camí del fitxer"
+#: src/gtkui/columns.cc:46 src/moonstone/playlist_model.cc:41
+#: src/qtui/playlist_model.cc:35
+msgid "File Path"
+msgstr "Camí al fitxer"
+
+#: src/gtkui/columns.cc:47 src/moonstone/playlist_model.cc:42
+#: src/qtui/playlist_model.cc:35
+msgid "File Name"
+msgstr "Nom del fitxer"
 
-#: src/gtkui/columns.cc:47
-msgid "Custom title"
+#: src/gtkui/columns.cc:48 src/moonstone/playlist_model.cc:42
+#: src/qtui/playlist_model.cc:36
+msgid "Custom Title"
 msgstr "Títol personalitzat"
 
-#: src/gtkui/columns.cc:48
+#: src/gtkui/columns.cc:49 src/moonstone/playlist_model.cc:42
+#: src/qtui/playlist_model.cc:36 src/streamtuner/icecast-model.cc:129
+#: src/streamtuner/shoutcast-model.cc:134
 msgid "Bitrate"
-msgstr "Flux de bits"
+msgstr "Taxa de bits"
 
-#: src/gtkui/columns.cc:308
-msgid "Available columns"
+#: src/gtkui/columns.cc:50 src/moonstone/playlist_model.cc:43
+#: src/qtui/playlist_model.cc:36
+msgid "Comment"
+msgstr "Comentari"
+
+#: src/gtkui/columns.cc:51 src/qtui/playlist_model.cc:36
+msgid "Publisher"
+msgstr "Editorial"
+
+#: src/gtkui/columns.cc:52 src/qtui/playlist_model.cc:37
+msgid "Catalog Number"
+msgstr "Número del catàleg"
+
+#: src/gtkui/columns.cc:53 src/moonstone/playlist_model.cc:43
+#: src/qtui/playlist_model.cc:37
+msgid "Disc"
 msgstr ""
 
-#: src/gtkui/columns.cc:334
+#: src/gtkui/columns.cc:325
+msgid "Available columns"
+msgstr "Columnes disponibles"
+
+#: src/gtkui/columns.cc:351
 msgid "Displayed columns"
-msgstr ""
+msgstr "Columnes mostrades"
 
-#: src/gtkui/layout.cc:72 src/search-tool/search-tool.cc:40
+#: src/gtkui/layout.cc:74 src/search-tool-qt/search-tool-qt.cc:58
+#: src/search-tool/search-tool.cc:49
 msgid "Search Tool"
 msgstr "Eina de cerca"
 
-#: src/gtkui/layout.cc:167
+#: src/gtkui/layout.cc:170
 msgid "Dock at Left"
 msgstr "Acoblador a l'esquerre"
 
-#: src/gtkui/layout.cc:167
+#: src/gtkui/layout.cc:170
 msgid "Dock at Right"
 msgstr "Acoblador a la dreta"
 
-#: src/gtkui/layout.cc:168
+#: src/gtkui/layout.cc:171
 msgid "Dock at Top"
 msgstr "Acoblador a la part superior"
 
-#: src/gtkui/layout.cc:168
+#: src/gtkui/layout.cc:171
 msgid "Dock at Bottom"
 msgstr "Acoblador a la part inferior"
 
-#: src/gtkui/layout.cc:168
+#: src/gtkui/layout.cc:171
 msgid "Undock"
 msgstr "Desacoblar"
 
-#: src/gtkui/layout.cc:168 src/ladspa/plugin.cc:531
+#: src/gtkui/layout.cc:171 src/ladspa/plugin.cc:540
 msgid "Disable"
-msgstr "Desactivar"
+msgstr "Inhabilita"
 
-#: src/gtkui/menus.cc:126 src/qtui/main_window_actions.cc:93
-#: src/statusicon/statusicon.cc:276
+#: src/gtkui/menus.cc:79 src/qtui/menus.cc:107
+#: src/statusicon-qt/statusicon.cc:115 src/statusicon/statusicon.cc:286
 msgid "_Open Files ..."
-msgstr "_Obrir Fitxers..."
+msgstr "_Obre els fitxers..."
 
-#: src/gtkui/menus.cc:127
+#: src/gtkui/menus.cc:80 src/qtui/menus.cc:111
 msgid "Open _URL ..."
-msgstr "Obrir _URL..."
+msgstr "Obre l'_URL..."
 
-#: src/gtkui/menus.cc:128 src/qtui/main_window_actions.cc:95
+#: src/gtkui/menus.cc:81 src/qtui/menus.cc:113
 msgid "_Add Files ..."
-msgstr "_Afegir fitxers..."
+msgstr "_Afegeix els fitxers..."
 
-#: src/gtkui/menus.cc:129
+#: src/gtkui/menus.cc:82 src/qtui/menus.cc:118
 msgid "Add U_RL ..."
-msgstr "Afegir U_RL..."
+msgstr "Afegeix l'U_RL..."
 
-#: src/gtkui/menus.cc:131
+#: src/gtkui/menus.cc:84 src/qtui/menus.cc:120
 msgid "Search _Library"
-msgstr ""
+msgstr "Cerca la bib_lioteca"
 
-#: src/gtkui/menus.cc:133 src/qtui/main_window_actions.cc:98
+#: src/gtkui/menus.cc:86 src/qtui/menus.cc:123
 msgid "A_bout ..."
 msgstr "_Quant a..."
 
-#: src/gtkui/menus.cc:134 src/qtui/main_window_actions.cc:99
+#: src/gtkui/menus.cc:87 src/qtui/menus.cc:125
 msgid "_Settings ..."
-msgstr ""
+msgstr "Ajust_s..."
 
-#: src/gtkui/menus.cc:135 src/qtui/main_window_actions.cc:103
-#: src/statusicon/statusicon.cc:284
+#: src/gtkui/menus.cc:88 src/qtui/menus.cc:131
+#: src/statusicon-qt/statusicon.cc:117 src/statusicon/statusicon.cc:288
 msgid "_Quit"
 msgstr "_Surt"
 
-#: src/gtkui/menus.cc:139 src/gtkui/menus.cc:262
-#: src/qtui/main_window_actions.cc:107 src/search-tool/search-tool.cc:641
-#: src/statusicon/statusicon.cc:278
+#: src/gtkui/menus.cc:92 src/gtkui/menus.cc:226
+#: src/moonstone/playlist_tabs.cc:306 src/qtui/menus.cc:135
+#: src/qtui/playlist_tabs.cc:331 src/search-tool-qt/search-tool-qt.cc:499
+#: src/search-tool/search-tool.cc:339 src/statusicon-qt/statusicon.cc:109
+#: src/statusicon/statusicon.cc:280
 msgid "_Play"
-msgstr "Repro_duir"
+msgstr "Re_produeix"
 
-#: src/gtkui/menus.cc:140 src/qtui/main_window_actions.cc:108
-#: src/statusicon/statusicon.cc:279
+#: src/gtkui/menus.cc:93 src/qtui/menus.cc:137
+#: src/statusicon-qt/statusicon.cc:110 src/statusicon/statusicon.cc:281
 msgid "Paus_e"
 msgstr "_Pausa"
 
-#: src/gtkui/menus.cc:141 src/qtui/main_window_actions.cc:109
-#: src/statusicon/statusicon.cc:280
+#: src/gtkui/menus.cc:94 src/qtui/menus.cc:139
+#: src/statusicon-qt/statusicon.cc:111 src/statusicon/statusicon.cc:282
 msgid "_Stop"
 msgstr "_Atura"
 
-#: src/gtkui/menus.cc:142 src/qtui/main_window_actions.cc:110
-#: src/statusicon/statusicon.cc:277
+#: src/gtkui/menus.cc:95 src/qtui/menus.cc:141
+#: src/statusicon-qt/statusicon.cc:112 src/statusicon/statusicon.cc:283
 msgid "Pre_vious"
 msgstr "_Anterior"
 
-#: src/gtkui/menus.cc:143 src/qtui/main_window_actions.cc:111
-#: src/statusicon/statusicon.cc:281
+#: src/gtkui/menus.cc:96 src/qtui/menus.cc:143
+#: src/statusicon-qt/statusicon.cc:113 src/statusicon/statusicon.cc:284
 msgid "_Next"
 msgstr "_Següent"
 
-#: src/gtkui/menus.cc:145 src/qtui/main_window_actions.cc:113
+#: src/gtkui/menus.cc:97 src/qtui/menus.cc:145 src/skins/menus.cc:114
+#: src/skins-qt/menus.cc:105
+msgid "Previous Album"
+msgstr "Àlbum anterior"
+
+#: src/gtkui/menus.cc:98 src/qtui/menus.cc:146 src/skins/menus.cc:115
+#: src/skins-qt/menus.cc:106
+msgid "Next Album"
+msgstr "Àlbum següent"
+
+#: src/gtkui/menus.cc:100 src/qtui/menus.cc:148
 msgid "_Repeat"
-msgstr "_Repetir"
+msgstr "_Repeteix"
 
-#: src/gtkui/menus.cc:146 src/qtui/main_window_actions.cc:114
+#: src/gtkui/menus.cc:101 src/qtui/menus.cc:150
 msgid "S_huffle"
-msgstr "_Mesclar"
+msgstr "Or_dre aleatori"
+
+#: src/gtkui/menus.cc:102 src/qtui/menus.cc:152
+msgid "Shuffle by Albu_m"
+msgstr "Ordre aleatori per àlbu_m"
 
-#: src/gtkui/menus.cc:147 src/qtui/main_window_actions.cc:115
+#: src/gtkui/menus.cc:103 src/qtui/menus.cc:155
 msgid "N_o Playlist Advance"
-msgstr "No ava_nçar la llista de reproducció"
+msgstr "N_o avancis la llista de reproducció"
 
-#: src/gtkui/menus.cc:148 src/qtui/main_window_actions.cc:116
+#: src/gtkui/menus.cc:104 src/qtui/menus.cc:157
 msgid "Stop A_fter This Song"
-msgstr ""
+msgstr "Atura d_esprés d'aquesta cançó"
 
-#: src/gtkui/menus.cc:150 src/gtkui/menus.cc:247
-#: src/qtui/main_window_actions.cc:118
+#: src/gtkui/menus.cc:106 src/gtkui/menus.cc:210 src/qtui/menus.cc:162
+#: src/qtui/menus.cc:294
 msgid "Song _Info ..."
 msgstr "_Informació de la cançó..."
 
-#: src/gtkui/menus.cc:151
+#: src/gtkui/menus.cc:107
 msgid "Jump to _Time ..."
-msgstr "_Salta al temps..."
+msgstr "Salta a l'ins_tant..."
 
-#: src/gtkui/menus.cc:152
+#: src/gtkui/menus.cc:108
 msgid "_Jump to Song ..."
 msgstr "Salta a la _cançó..."
 
-#: src/gtkui/menus.cc:154
+#: src/gtkui/menus.cc:110 src/qtui/menus.cc:165
 msgid "Set Repeat Point _A"
-msgstr ""
+msgstr "Estableix el punt de repetició _A"
 
-#: src/gtkui/menus.cc:155
+#: src/gtkui/menus.cc:111 src/qtui/menus.cc:167
 msgid "Set Repeat Point _B"
-msgstr ""
+msgstr "Estableix el punt de repetició _B"
 
-#: src/gtkui/menus.cc:156
+#: src/gtkui/menus.cc:112 src/qtui/menus.cc:169
 msgid "_Clear Repeat Points"
-msgstr ""
+msgstr "Neteja els punts de repeti_ció"
 
-#: src/gtkui/menus.cc:160 src/gtkui/menus.cc:167 src/gtkui/menus.cc:183
-#: src/qtui/main_window_actions.cc:122 src/qtui/main_window_actions.cc:129
-#: src/qtui/main_window_actions.cc:145
+#: src/gtkui/menus.cc:116 src/gtkui/menus.cc:123 src/gtkui/menus.cc:141
+#: src/qtui/menus.cc:173 src/qtui/menus.cc:180 src/qtui/menus.cc:198
 msgid "By _Title"
 msgstr "Per _títol"
 
-#: src/gtkui/menus.cc:161 src/qtui/main_window_actions.cc:123
+#: src/gtkui/menus.cc:117 src/qtui/menus.cc:174
 msgid "By _File Name"
-msgstr ""
+msgstr "Per nom de _fitxer"
 
-#: src/gtkui/menus.cc:162 src/qtui/main_window_actions.cc:124
+#: src/gtkui/menus.cc:118 src/qtui/menus.cc:175
 msgid "By File _Path"
-msgstr ""
+msgstr "_Per camí al fitxer"
 
-#: src/gtkui/menus.cc:166 src/gtkui/menus.cc:182
-#: src/qtui/main_window_actions.cc:128 src/qtui/main_window_actions.cc:144
+#: src/gtkui/menus.cc:122 src/gtkui/menus.cc:140 src/qtui/menus.cc:179
+#: src/qtui/menus.cc:197
 msgid "By Track _Number"
-msgstr "Pel número de _pista"
+msgstr "Per número de _pista"
 
-#: src/gtkui/menus.cc:168 src/gtkui/menus.cc:184
-#: src/qtui/main_window_actions.cc:130 src/qtui/main_window_actions.cc:146
+#: src/gtkui/menus.cc:124 src/gtkui/menus.cc:142 src/qtui/menus.cc:181
+#: src/qtui/menus.cc:199
 msgid "By _Artist"
-msgstr "Per l'_artista"
+msgstr "Per _artista"
 
-#: src/gtkui/menus.cc:169 src/gtkui/menus.cc:185
-#: src/qtui/main_window_actions.cc:131 src/qtui/main_window_actions.cc:147
+#: src/gtkui/menus.cc:125 src/gtkui/menus.cc:143 src/qtui/menus.cc:182
+#: src/qtui/menus.cc:200
 msgid "By Al_bum"
-msgstr ""
+msgstr "Per àl_bum"
 
-#: src/gtkui/menus.cc:170 src/gtkui/menus.cc:186
-#: src/qtui/main_window_actions.cc:132 src/qtui/main_window_actions.cc:148
+#: src/gtkui/menus.cc:126 src/gtkui/menus.cc:144 src/qtui/menus.cc:183
+#: src/qtui/menus.cc:201
 msgid "By Albu_m Artist"
-msgstr ""
+msgstr "Per artista d'àlbu_m"
 
-#: src/gtkui/menus.cc:171 src/gtkui/menus.cc:187
-#: src/qtui/main_window_actions.cc:133 src/qtui/main_window_actions.cc:149
+#: src/gtkui/menus.cc:127 src/gtkui/menus.cc:145 src/qtui/menus.cc:184
+#: src/qtui/menus.cc:202
 msgid "By Release _Date"
-msgstr "Per la _data"
+msgstr "Per _data de llançament"
 
-#: src/gtkui/menus.cc:172 src/gtkui/menus.cc:188
-#: src/qtui/main_window_actions.cc:134 src/qtui/main_window_actions.cc:150
+#: src/gtkui/menus.cc:128 src/gtkui/menus.cc:146 src/qtui/menus.cc:185
+#: src/qtui/menus.cc:203
 msgid "By _Genre"
-msgstr ""
+msgstr "Per _gènere"
 
-#: src/gtkui/menus.cc:173 src/gtkui/menus.cc:189
-#: src/qtui/main_window_actions.cc:135 src/qtui/main_window_actions.cc:151
+#: src/gtkui/menus.cc:129 src/gtkui/menus.cc:147 src/qtui/menus.cc:186
+#: src/qtui/menus.cc:204
 msgid "By _Length"
-msgstr ""
+msgstr "Per _longitud"
 
-#: src/gtkui/menus.cc:174 src/gtkui/menus.cc:190
-#: src/qtui/main_window_actions.cc:136 src/qtui/main_window_actions.cc:152
+#: src/gtkui/menus.cc:130 src/gtkui/menus.cc:148 src/qtui/menus.cc:187
+#: src/qtui/menus.cc:205
 msgid "By _File Path"
 msgstr "Per nom de _fitxer"
 
-#: src/gtkui/menus.cc:175 src/gtkui/menus.cc:191
-#: src/qtui/main_window_actions.cc:137 src/qtui/main_window_actions.cc:153
+#: src/gtkui/menus.cc:131 src/gtkui/menus.cc:149 src/qtui/menus.cc:188
+#: src/qtui/menus.cc:206
 msgid "By _Custom Title"
 msgstr "Per títol _personalitzat"
 
-#: src/gtkui/menus.cc:177 src/gtkui/menus.cc:193
-#: src/qtui/main_window_actions.cc:139 src/qtui/main_window_actions.cc:155
+#: src/gtkui/menus.cc:132 src/gtkui/menus.cc:150 src/qtui/menus.cc:189
+#: src/qtui/menus.cc:207
+msgid "By C_omment"
+msgstr "Per c_omentari"
+
+#: src/gtkui/menus.cc:133 src/gtkui/menus.cc:151 src/qtui/menus.cc:190
+#: src/qtui/menus.cc:208
+msgid "By D_isc Number"
+msgstr ""
+
+#: src/gtkui/menus.cc:135 src/gtkui/menus.cc:153 src/qtui/menus.cc:192
+#: src/qtui/menus.cc:210
 msgid "R_everse Order"
 msgstr "Ordre _invers"
 
-#: src/gtkui/menus.cc:178 src/gtkui/menus.cc:194
-#: src/qtui/main_window_actions.cc:140 src/qtui/main_window_actions.cc:156
+#: src/gtkui/menus.cc:136 src/gtkui/menus.cc:154 src/qtui/menus.cc:194
+#: src/qtui/menus.cc:212
 msgid "_Random Order"
 msgstr "Ordre alea_tori"
 
-#: src/gtkui/menus.cc:198 src/qtui/main_window_actions.cc:160
+#: src/gtkui/menus.cc:158 src/qtui/menus.cc:216
 msgid "_Play/Resume"
-msgstr ""
+msgstr "Re_produeix/reprèn"
 
-#: src/gtkui/menus.cc:199 src/gtkui/menus.cc:251
-#: src/qtui/main_window_actions.cc:161
+#: src/gtkui/menus.cc:159 src/qtui/menus.cc:218
 msgid "_Refresh"
-msgstr "A_ctualitzar"
+msgstr "_Refresca"
 
-#: src/gtkui/menus.cc:201 src/qtui/main_window_actions.cc:163
+#: src/gtkui/menus.cc:161 src/qtui/menus.cc:222
 msgid "_Sort"
-msgstr "_Ordenar"
+msgstr "_Ordena"
 
-#: src/gtkui/menus.cc:202 src/qtui/main_window_actions.cc:164
+#: src/gtkui/menus.cc:162 src/qtui/menus.cc:223
 msgid "Sort Se_lected"
-msgstr ""
+msgstr "Ordena els se_leccionats"
 
-#: src/gtkui/menus.cc:203 src/qtui/main_window_actions.cc:165
+#: src/gtkui/menus.cc:163 src/qtui/menus.cc:225
 msgid "Remove _Duplicates"
-msgstr ""
+msgstr "Treu els _duplicats"
 
-#: src/gtkui/menus.cc:204 src/qtui/main_window_actions.cc:166
+#: src/gtkui/menus.cc:164 src/qtui/menus.cc:226
 msgid "Remove _Unavailable Files"
-msgstr "Eliminar fitxers _no disponibles"
+msgstr "Elimina els fitxers _no disponibles"
 
-#: src/gtkui/menus.cc:206 src/playlist-manager/playlist-manager.cc:244
-#: src/qtui/main_window_actions.cc:168
+#: src/gtkui/menus.cc:166 src/playlist-manager/playlist-manager.cc:219
+#: src/playlist-manager-qt/playlist-manager-qt.cc:348 src/qtui/menus.cc:229
 msgid "_New"
 msgstr "_Nou"
 
-#: src/gtkui/menus.cc:207
+#: src/gtkui/menus.cc:167 src/qtui/menus.cc:230
 msgid "Ren_ame ..."
-msgstr ""
+msgstr "Re_anomena..."
 
-#: src/gtkui/menus.cc:208 src/gtkui/menus.cc:264
-#: src/qtui/main_window_actions.cc:170
+#: src/gtkui/menus.cc:168 src/gtkui/menus.cc:228
+#: src/moonstone/playlist_tabs.cc:311 src/qtui/menus.cc:231
+#: src/qtui/playlist_tabs.cc:336
 msgid "Remo_ve"
-msgstr ""
+msgstr "Suprimei_x"
 
-#: src/gtkui/menus.cc:210
+#: src/gtkui/menus.cc:170 src/qtui/menus.cc:233
 msgid "_Import ..."
-msgstr "_Importar..."
+msgstr "_Importa..."
 
-#: src/gtkui/menus.cc:211
+#: src/gtkui/menus.cc:171 src/qtui/menus.cc:234
 msgid "_Export ..."
-msgstr "_Exportar..."
+msgstr "_Exporta..."
 
-#: src/gtkui/menus.cc:213
+#: src/gtkui/menus.cc:173 src/qtui/menus.cc:237
 msgid "Playlist _Manager ..."
-msgstr ""
+msgstr "_Gestor de llistes de reproducció..."
 
-#: src/gtkui/menus.cc:214 src/qtui/main_window_actions.cc:176
+#: src/gtkui/menus.cc:174 src/qtui/menus.cc:239
 msgid "_Queue Manager ..."
 msgstr "Gestor de _cues..."
 
-#: src/gtkui/menus.cc:218 src/qtui/main_window_actions.cc:180
+#: src/gtkui/menus.cc:178 src/qtui/menus.cc:243
 msgid "Volume _Up"
-msgstr "P_ujar volum"
+msgstr "Apuja vol_um"
 
-#: src/gtkui/menus.cc:219 src/qtui/main_window_actions.cc:181
+#: src/gtkui/menus.cc:179 src/qtui/menus.cc:245
 msgid "Volume _Down"
-msgstr "_Baixar volum"
+msgstr "A_baixa el volum"
 
-#: src/gtkui/menus.cc:221 src/qtui/main_window_actions.cc:183
-msgid "_Equalizer"
-msgstr "_Equalitzador"
+#: src/gtkui/menus.cc:181 src/qtui/menus.cc:249
+msgid "_Equalizer ..."
+msgstr "_Equalitzador..."
 
-#: src/gtkui/menus.cc:223 src/qtui/main_window_actions.cc:185
+#: src/gtkui/menus.cc:182 src/qtui/menus.cc:251
 msgid "E_ffects ..."
-msgstr ""
+msgstr "E_fectes..."
+
+#: src/gtkui/menus.cc:184
+msgid "_Record Stream"
+msgstr "En_registra el flux"
 
-#: src/gtkui/menus.cc:227
+#: src/gtkui/menus.cc:185
+msgid "Audio _Settings ..."
+msgstr "Ajust_s de l'àudio..."
+
+#: src/gtkui/menus.cc:189 src/qtui/menus.cc:260
 msgid "Show _Menu Bar"
-msgstr "_Mostrar barra de menú"
+msgstr "_Mostra la barra de menús"
 
-#: src/gtkui/menus.cc:228
+#: src/gtkui/menus.cc:190 src/qtui/menus.cc:262
 msgid "Show I_nfo Bar"
-msgstr "Mostrar barra d'_informació"
+msgstr "Mostra la barra d'_informació"
+
+#: src/gtkui/menus.cc:191 src/qtui/menus.cc:264
+msgid "Show Info Bar _Album Art"
+msgstr "Mostra la _caràtula a la barra d'informació"
 
-#: src/gtkui/menus.cc:229
+#: src/gtkui/menus.cc:192 src/qtui/menus.cc:266
 msgid "Show Info Bar Vis_ualization"
-msgstr ""
+msgstr "Mostra la visualització de la barra d'_informació"
 
-#: src/gtkui/menus.cc:230
+#: src/gtkui/menus.cc:193 src/qtui/menus.cc:268
 msgid "Show _Status Bar"
-msgstr "Mostrar barra d'_estat"
+msgstr "Mostra la barra d'_estat"
 
-#: src/gtkui/menus.cc:232
+#: src/gtkui/menus.cc:195 src/qtui/menus.cc:272
 msgid "Show _Remaining Time"
 msgstr "Mostra el temps _restant"
 
-#: src/gtkui/menus.cc:234
+#: src/gtkui/menus.cc:197 src/qtui/menus.cc:276 src/skins/menus.cc:157
+#: src/skins-qt/menus.cc:152
 msgid "_Visualizations ..."
-msgstr ""
+msgstr "_Visualitzacions..."
 
-#: src/gtkui/menus.cc:238 src/qtui/main_window_actions.cc:189
+#: src/gtkui/menus.cc:201 src/qtui/menus.cc:280
 msgid "_File"
 msgstr "_Fitxer"
 
-#: src/gtkui/menus.cc:239 src/qtui/main_window_actions.cc:190
+#: src/gtkui/menus.cc:202 src/qtui/menus.cc:281
 msgid "_Playback"
 msgstr "_Reproducció"
 
-#: src/gtkui/menus.cc:240 src/qtui/main_window_actions.cc:191
+#: src/gtkui/menus.cc:203 src/qtui/menus.cc:282
 msgid "P_laylist"
 msgstr "_Llista de reproducció"
 
-#: src/gtkui/menus.cc:241 src/gtkui/menus.cc:258
-#: src/qtui/main_window_actions.cc:192
+#: src/gtkui/menus.cc:204 src/gtkui/menus.cc:222 src/qtui/menus.cc:283
+#: src/qtui/menus.cc:312
 msgid "_Services"
 msgstr "_Servei"
 
-#: src/gtkui/menus.cc:242 src/qtui/main_window_actions.cc:193
+#: src/gtkui/menus.cc:205 src/qtui/menus.cc:284
 msgid "_Output"
 msgstr "Sorti_da"
 
-#: src/gtkui/menus.cc:243
+#: src/gtkui/menus.cc:206 src/qtui/menus.cc:285
 msgid "_View"
-msgstr "_Veure"
+msgstr "_Visualitza"
 
-#: src/gtkui/menus.cc:248
+#: src/gtkui/menus.cc:211 src/qtui/menus.cc:296
 msgid "_Queue/Unqueue"
-msgstr "_Enviar/Treure de la cua"
+msgstr "Afegeix/treu de la _cua"
 
-#: src/gtkui/menus.cc:250
+#: src/gtkui/menus.cc:213 src/qtui/menus.cc:299
 msgid "_Open Containing Folder"
-msgstr ""
+msgstr "_Obre la carpeta"
 
-#: src/gtkui/menus.cc:253
+#: src/gtkui/menus.cc:214 src/qtui/menus.cc:301
+msgid "_Refresh Selected"
+msgstr "_Refresca els seleccionats"
+
+#: src/gtkui/menus.cc:216 src/qtui/menus.cc:304
 msgid "Cu_t"
-msgstr "Re_tallar"
+msgstr "Re_talla"
 
-#: src/gtkui/menus.cc:254
+#: src/gtkui/menus.cc:217 src/qtui/menus.cc:305
 msgid "_Copy"
-msgstr "_Copiar"
+msgstr "_Copia"
 
-#: src/gtkui/menus.cc:255
+#: src/gtkui/menus.cc:218 src/qtui/menus.cc:306
 msgid "_Paste"
-msgstr "_Enganxar"
+msgstr "_Enganxa"
+
+#: src/gtkui/menus.cc:219 src/qtui/menus.cc:307
+msgid "Paste at _End"
+msgstr "_Enganxa a l'acabament"
 
-#: src/gtkui/menus.cc:256
+#: src/gtkui/menus.cc:220 src/qtui/menus.cc:309
 msgid "Select _All"
-msgstr "Seleccionar _tot"
+msgstr "Selecciona-ho _tot"
 
-#: src/gtkui/menus.cc:263
+#: src/gtkui/menus.cc:227 src/moonstone/playlist_tabs.cc:309
+#: src/qtui/playlist_tabs.cc:334
 msgid "_Rename ..."
+msgstr "_Reanomena..."
+
+#: src/gtkui/settings.cc:35 src/qtui/settings.cc:59
+msgid "Always"
 msgstr ""
 
-#: src/gtkui/settings.cc:35
-msgid "Playlist Tabs"
+#: src/gtkui/settings.cc:36 src/qtui/settings.cc:60
+msgid "Auto-hide"
 msgstr ""
 
-#: src/gtkui/settings.cc:36
-msgid "Always show tabs"
+#: src/gtkui/settings.cc:37 src/qtui/settings.cc:61
+msgid "Never"
 msgstr ""
 
-#: src/gtkui/settings.cc:38
-msgid "Show entry counts"
+#: src/gtkui/settings.cc:41 src/qtui/settings.cc:64
+msgid "Playlist Tabs"
+msgstr "Pestanyes de la llista de reproducció"
+
+#: src/gtkui/settings.cc:42 src/qtui/settings.cc:65
+msgid "Show playlist tabs:"
 msgstr ""
 
-#: src/gtkui/settings.cc:40
+#: src/gtkui/settings.cc:45 src/qtui/settings.cc:69
+msgid "Show entry counts"
+msgstr "Mostra els comptadors de les entrades"
+
+#: src/gtkui/settings.cc:47 src/qtui/settings.cc:72
 msgid "Show close buttons"
-msgstr ""
+msgstr "Mostra els botons de tancament"
 
-#: src/gtkui/settings.cc:42
+#: src/gtkui/settings.cc:49 src/qtui/settings.cc:75
 msgid "Playlist Columns"
-msgstr ""
+msgstr "Columnes de la llista de reproducció"
 
-#: src/gtkui/settings.cc:44
+#: src/gtkui/settings.cc:51 src/qtui/settings.cc:77
 msgid "Show column headers"
-msgstr ""
+msgstr "Mostra les capçaleres de les columnes"
 
-#: src/gtkui/settings.cc:46 src/modplug/plugin_main.cc:106
-#: src/skins/skins_cfg.cc:263
-msgid "Miscellaneous"
+#: src/gtkui/settings.cc:53 src/qtui/settings.cc:82
+msgid "Make column headers clickable for sorting"
 msgstr ""
 
-#: src/gtkui/settings.cc:47
-msgid "Arrow keys seek by:"
-msgstr ""
+#: src/gtkui/settings.cc:56
+msgid "Use symbolic icons in toolbar"
+msgstr "Usa icones simbòliques a la barra d'eines "
 
-#: src/gtkui/settings.cc:50
+#: src/gtkui/settings.cc:58 src/qtui/settings.cc:86
 msgid "Scroll on song change"
-msgstr ""
+msgstr "Desplaça amb el canvi de cançó"
 
-#: src/gtkui/ui_gtk.cc:71
+#: src/gtkui/ui_gtk.cc:82
 msgid "GTK Interface"
-msgstr "Interfície GTK"
+msgstr "Interfície de GTK"
 
-#: src/gtkui/ui_gtk.cc:222 src/skins/ui_main.cc:232
+#: src/gtkui/ui_gtk.cc:219 src/skins/main.cc:228 src/skins-qt/main.cc:231
 #, c-format
 msgid "%s - Audacious"
 msgstr "%s - Audacious"
 
-#: src/gtkui/ui_gtk.cc:225 src/qtui/main_window.cc:186
+#: src/gtkui/ui_gtk.cc:221 src/moonstone/main_window.cc:184
+#: src/qtui/main_window.cc:385
 msgid "Buffering ..."
 msgstr "Gestió de memòria intermèdia..."
 
-#: src/gtkui/ui_gtk.cc:228 src/skins/ui_main.cc:234 src/skins/ui_main.cc:1164
+#: src/gtkui/ui_gtk.cc:224 src/pipewire/pipewire.cc:402 src/skins/main.cc:230
+#: src/skins-qt/main.cc:233
 msgid "Audacious"
 msgstr "Audacious"
 
-#: src/gtkui/ui_statusbar.cc:63 src/qtui/status_bar.cc:67
+#: src/gtkui/ui_gtk.cc:487 src/gtkui/ui_gtk.cc:518 src/gtkui/ui_gtk.cc:882
+#: src/hotkey/gui.cc:72 src/moonstone/main_window.cc:67
+#: src/moonstone/main_window.cc:145 src/moonstone/main_window.cc:146
+#: src/notify/osd.cc:85 src/qthotkey/gui.cc:67 src/qtui/main_window.cc:154
+#: src/qtui/main_window.cc:347 src/qtui/main_window.cc:348
+#: src/skins/menus.cc:109 src/skins-qt/menus.cc:100
+msgid "Play"
+msgstr "Reprodueix"
+
+#: src/gtkui/ui_gtk.cc:487 src/moonstone/main_window.cc:151
+#: src/moonstone/main_window.cc:152 src/notify/osd.cc:82
+#: src/qtui/main_window.cc:353 src/qtui/main_window.cc:354
+#: src/skins/menus.cc:110 src/skins-qt/menus.cc:101
+msgid "Pause"
+msgstr "Pausa"
+
+#: src/gtkui/ui_gtk.cc:868 src/moonstone/main_window.cc:57
+#: src/qtui/main_window.cc:145 src/skins/menus.cc:86 src/skins-qt/menus.cc:77
+msgid "Search Library"
+msgstr "Cerca la biblioteca"
+
+#: src/gtkui/ui_gtk.cc:875 src/moonstone/main_window.cc:60
+#: src/qtui/main_window.cc:147
+msgid "Open Files"
+msgstr "Obre els fitxers"
+
+#: src/gtkui/ui_gtk.cc:876 src/moonstone/main_window.cc:62
+#: src/qtui/main_window.cc:149
+msgid "Add Files"
+msgstr "Afegeix els fitxers"
+
+#: src/gtkui/ui_gtk.cc:881 src/moonstone/main_window.cc:65
+#: src/qtui/main_window.cc:152 src/skins/menus.cc:112 src/skins-qt/menus.cc:103
+msgid "Previous"
+msgstr "Anterior"
+
+#: src/gtkui/ui_gtk.cc:883 src/hotkey/gui.cc:74 src/moonstone/main_window.cc:69
+#: src/qthotkey/gui.cc:69 src/qtui/main_window.cc:156 src/skins/menus.cc:111
+#: src/skins-qt/menus.cc:102
+msgid "Stop"
+msgstr "Atura"
+
+#: src/gtkui/ui_gtk.cc:884 src/moonstone/main_window.cc:76 src/notify/osd.cc:89
+#: src/qtui/main_window.cc:163 src/skins/menus.cc:113 src/skins-qt/menus.cc:104
+msgid "Next"
+msgstr "Següent"
+
+#: src/gtkui/ui_gtk.cc:886 src/moonstone/main_window.cc:79
+#: src/qtui/main_window.cc:166 src/qtui/menus.cc:254 src/skins/menus.cc:79
+#: src/skins-qt/menus.cc:69
+msgid "Record Stream"
+msgstr "Enregistra el flux"
+
+#: src/gtkui/ui_gtk.cc:919 src/moonstone/main_window.cc:86
+#: src/qtui/main_window.cc:173 src/skins/menus.cc:103 src/skins-qt/menus.cc:94
+msgid "Repeat"
+msgstr "Repeteix"
+
+#: src/gtkui/ui_gtk.cc:922 src/moonstone/main_window.cc:89
+#: src/qtui/main_window.cc:176 src/skins/menus.cc:104 src/skins-qt/menus.cc:95
+msgid "Shuffle"
+msgstr "Ordre aleatori"
+
+#: src/gtkui/ui_gtk.cc:1114 src/qtui/main_window.cc:123
+msgid "Menu"
+msgstr "Menú"
+
+#: src/gtkui/ui_statusbar.cc:64 src/qtui/status_bar.cc:155
 msgid "mono"
 msgstr "mono"
 
-#: src/gtkui/ui_statusbar.cc:65 src/qtui/status_bar.cc:69
+#: src/gtkui/ui_statusbar.cc:66 src/qtui/status_bar.cc:157
 msgid "stereo"
 msgstr "estèreo"
 
-#: src/gtkui/ui_statusbar.cc:67 src/qtui/status_bar.cc:71
+#: src/gtkui/ui_statusbar.cc:68 src/qtui/status_bar.cc:160
 #, c-format
 msgid "%d channel"
 msgid_plural "%d channels"
 msgstr0 "%d canal"
 msgstr1 "%d canals"
 
-#: src/gtkui/ui_statusbar.cc:81 src/qtui/status_bar.cc:85
+#: src/gtkui/ui_statusbar.cc:76 src/qtui/status_bar.cc:168
 #, c-format
-msgid "%d kbps"
-msgstr "%d kbps"
+msgid "%d kHz"
+msgstr "%d kHz"
 
-#: src/gtkui/ui_statusbar.cc:107 src/skins/ui_main_evlisteners.cc:103
+#: src/gtkui/ui_statusbar.cc:82 src/qtui/status_bar.cc:174
+#, c-format
+msgid "%d kbit/s"
+msgstr "%d kbit/s"
+
+#: src/gtkui/ui_statusbar.cc:108 src/skins/main.cc:478 src/skins-qt/main.cc:461
 msgid "Single mode."
-msgstr "Mode únic"
+msgstr "Mode únic."
 
-#: src/gtkui/ui_statusbar.cc:109 src/skins/ui_main_evlisteners.cc:105
+#: src/gtkui/ui_statusbar.cc:110 src/skins/main.cc:480 src/skins-qt/main.cc:463
 msgid "Playlist mode."
-msgstr "Mode de llista de reproducció"
+msgstr "Mode de llista de reproducció."
 
-#: src/gtkui/ui_statusbar.cc:117 src/skins/ui_main_evlisteners.cc:111
+#: src/gtkui/ui_statusbar.cc:118 src/skins/main.cc:486 src/skins-qt/main.cc:469
 msgid "Stopping after song."
-msgstr "Parar després de la cançó."
+msgstr "Aturada després de la cançó."
 
-#: src/hotkey/gui.cc:71
+#: src/hotkey/gui.cc:71 src/qthotkey/gui.cc:66
 msgid "Previous track"
-msgstr ""
-
-#: src/hotkey/gui.cc:72 src/notify/osd.cc:69 src/qtui/main_window.cc:69
-#: src/qtui/main_window.cc:172 src/qtui/main_window.cc:173
-#: src/skins/menus.cc:87
-msgid "Play"
-msgstr "Reprodueix"
+msgstr "Pista anterior"
 
-#: src/hotkey/gui.cc:73
+#: src/hotkey/gui.cc:73 src/qthotkey/gui.cc:68
 msgid "Pause/Resume"
-msgstr "Pausa/Represa"
-
-#: src/hotkey/gui.cc:74 src/qtui/main_window.cc:70 src/skins/menus.cc:89
-msgid "Stop"
-msgstr "Para"
+msgstr "Pausa/reprèn"
 
-#: src/hotkey/gui.cc:75
+#: src/hotkey/gui.cc:75 src/qthotkey/gui.cc:70
 msgid "Next track"
-msgstr ""
+msgstr "Pista següent"
 
-#: src/hotkey/gui.cc:76
-msgid "Forward 5 seconds"
-msgstr ""
+#: src/hotkey/gui.cc:76 src/qthotkey/gui.cc:71
+msgid "Step forward"
+msgstr "Un pas endavant"
 
-#: src/hotkey/gui.cc:77
-msgid "Rewind 5 seconds"
-msgstr ""
+#: src/hotkey/gui.cc:77 src/qthotkey/gui.cc:72
+msgid "Step backward"
+msgstr "Un pas enrere"
 
-#: src/hotkey/gui.cc:78
+#: src/hotkey/gui.cc:78 src/qthotkey/gui.cc:73
 msgid "Mute"
 msgstr "Silencia"
 
-#: src/hotkey/gui.cc:79
+#: src/hotkey/gui.cc:79 src/qthotkey/gui.cc:74
 msgid "Volume up"
-msgstr "Puja el volum"
+msgstr "Apuja el volum"
 
-#: src/hotkey/gui.cc:80
+#: src/hotkey/gui.cc:80 src/qthotkey/gui.cc:75
 msgid "Volume down"
-msgstr "Baixa el volum"
+msgstr "Abaixa el volum"
 
-#: src/hotkey/gui.cc:81
+#: src/hotkey/gui.cc:81 src/qthotkey/gui.cc:76
 msgid "Jump to file"
-msgstr ""
+msgstr "Salta al fitxer"
 
-#: src/hotkey/gui.cc:82
+#: src/hotkey/gui.cc:82 src/qthotkey/gui.cc:77
 msgid "Toggle player window(s)"
-msgstr ""
+msgstr "Commuta les finestres"
 
-#: src/hotkey/gui.cc:83
+#: src/hotkey/gui.cc:83 src/qthotkey/gui.cc:78
 msgid "Show On-Screen-Display"
-msgstr "Activa l'OSD (sobre-impressió)"
+msgstr "Mostra l'OSD"
 
-#: src/hotkey/gui.cc:84
+#: src/hotkey/gui.cc:84 src/qthotkey/gui.cc:79
 msgid "Toggle repeat"
-msgstr ""
+msgstr "Activa repetició"
 
-#: src/hotkey/gui.cc:85
+#: src/hotkey/gui.cc:85 src/qthotkey/gui.cc:80
 msgid "Toggle shuffle"
-msgstr ""
+msgstr "Commuta l'ordre aleatori"
 
-#: src/hotkey/gui.cc:86
+#: src/hotkey/gui.cc:86 src/qthotkey/gui.cc:81
 msgid "Toggle stop after current"
-msgstr ""
+msgstr "Commuta l'aturada després de l'actual"
 
-#: src/hotkey/gui.cc:87
+#: src/hotkey/gui.cc:87 src/qthotkey/gui.cc:82
 msgid "Raise player window(s)"
-msgstr ""
+msgstr "Realça les finestres del reproductor"
 
-#: src/hotkey/gui.cc:97
+#: src/hotkey/gui.cc:98 src/qthotkey/gui.cc:100
 msgid "(none)"
 msgstr "(cap)"
 
-#: src/hotkey/gui.cc:234
+#: src/hotkey/gui.cc:261
 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 modifiers.\n"
 "\n"
 "Do you want to continue?"
 msgstr ""
@@ -2005,11 +2235,11 @@
 "\n"
 "Voleu continuar?"
 
-#: src/hotkey/gui.cc:236
+#: src/hotkey/gui.cc:264
 msgid "Binding mouse buttons"
 msgstr "Vinculació dels botons del ratolí"
 
-#: src/hotkey/gui.cc:391
+#: src/hotkey/gui.cc:434
 msgid ""
 "Press a key combination inside a text field.\n"
 "You can also bind mouse buttons."
@@ -2017,125 +2247,177 @@
 "Premeu una combinació de tecles dins del camp de text.\n"
 "També podeu vincular botons del ratolí."
 
-#: src/hotkey/gui.cc:396
+#: src/hotkey/gui.cc:444 src/qthotkey/gui.cc:179
 msgid "Hotkeys:"
 msgstr "Tecles ràpides:"
 
-#: src/hotkey/gui.cc:413
+#: src/hotkey/gui.cc:457 src/qthotkey/gui.cc:181
 msgid "Action:"
 msgstr "Acció:"
 
-#: src/hotkey/gui.cc:420
+#: src/hotkey/gui.cc:461 src/qthotkey/gui.cc:182
 msgid "Key Binding:"
 msgstr "Vinculació de tecles:"
 
-#: src/hotkey/gui.cc:468
+#: src/hotkey/gui.cc:518 src/qthotkey/gui.cc:184
 msgid "_Add"
-msgstr ""
+msgstr "_Afegeix"
 
-#: src/hotkey/plugin.cc:61
+#: src/hotkey/plugin.cc:59 src/qthotkey/plugin.cc:78
 msgid "Global Hotkeys"
-msgstr ""
+msgstr "Tecles ràpides globals"
 
-#: src/hotkey/plugin.cc:79
+#: src/hotkey/plugin.cc:74
 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"
+"Contributors 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 ""
+"Complement Dreceres de teclat globals\n"
+"Controla el reproductor amb combinacions de tecles globals o amb tecles "
+"multimèdia.\n"
+"\n"
+"Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n"
+"\n"
+"Col·laboradors:\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/jack-ng/jack-ng.cc:49
+#: src/jack/jack-ng.cc:54
 msgid "JACK Output"
-msgstr ""
+msgstr "Sortida JACK"
 
-#: src/jack-ng/jack-ng.cc:114
+#: src/jack/jack-ng.cc:126
+msgid "Client name:"
+msgstr "Nom del client:"
+
+#: src/jack/jack-ng.cc:128
 msgid "Automatically connect to output ports"
+msgstr "Connecta automàticament els ports de sortida"
+
+#: src/jack/jack-ng.cc:130
+msgid "Filter ports (regex, use any port if blank):"
 msgstr ""
+"Filtrar ports (expressió regular, s'utilitza qualsevol si es deixa en blanc):"
+
+#: src/jack/jack-ng.cc:136
+msgid "Connect to physical ports only"
+msgstr "Connecta només a ports físics"
+
+#: src/jack/jack-ng.cc:139
+msgid "Upmix to"
+msgstr "Mescla en"
+
+#: src/jack/jack-ng.cc:141
+msgid "ports if input has fewer channels"
+msgstr "ports si l'entrada té menys canals"
 
-#: src/jack-ng/jack-ng.cc:155
+#: src/jack/jack-ng.cc:143
+msgid "Ignore insufficient number of ports"
+msgstr "Ignora un nombre insuficient de ports"
+
+#: src/jack/jack-ng.cc:181
+msgid "No JACK output ports were found. Please check settings."
+msgstr "No s'han trobat ports de sortida JACK. Comproveu la configuració."
+
+#: src/jack/jack-ng.cc:195
 #, c-format
 msgid "Only %d JACK output ports were found but %d are required."
-msgstr ""
+msgstr "Només s'han trobat %d ports de sortida JACK però es necessiten %d."
 
-#: src/jack-ng/jack-ng.cc:164
+#: src/jack/jack-ng.cc:210
 #, c-format
 msgid "Failed to connect to JACK port %s."
-msgstr ""
+msgstr "No s'ha pogut connectar al port JACK %s."
 
-#: src/jack-ng/jack-ng.cc:184
+#: src/jack/jack-ng.cc:230
 msgid ""
 "JACK supports only floating-point audio. You must change the output bit "
 "depth to floating-point in Audacious settings."
 msgstr ""
+"JACK només és compatible amb àudio de punt flotant. Heu de canviar la "
+"profunditat de bits de sortida de punt flotant en la configuració d'Audacity."
 
-#: src/jack-ng/jack-ng.cc:197
+#: src/jack/jack-ng.cc:245
 msgid "Failed to connect to the JACK server; is it running?"
-msgstr ""
+msgstr "No s'ha pogut connectar al servidor JACK; està en execució?"
 
-#: src/jack-ng/jack-ng.cc:273
+#: src/jack/jack-ng.cc:321
 #, c-format
 msgid ""
 "The JACK server requires a sample rate of %d Hz, but Audacious is playing at "
 "%d Hz. Please use the Sample Rate Converter effect to correct the mismatch."
 msgstr ""
+"El servidor JACK requereix una freqüència de mostreig de %d Hz, però "
+"Audacious està reproduint a %d Hz. Utilitzeu l'efecte convertidor de "
+"freqüència de les mostres per corregir el desajust."
 
-#: src/ladspa/plugin.cc:414
+#: src/ladspa/plugin.cc:416
 #, c-format
 msgid "%s Settings"
-msgstr "Paràmetres %s"
+msgstr "Ajusts %s"
 
-#: src/ladspa/plugin.cc:478
+#: src/ladspa/plugin.cc:482
 msgid "Module paths:"
-msgstr "Camí de mòduls:"
+msgstr "Camí als mòduls:"
 
-#: src/ladspa/plugin.cc:483
+#: src/ladspa/plugin.cc:487
 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 múltiples camins amb dos punts.\n"
+"Aquests camins són buscats, a més de LADSPA_PATH.\n"
+"Després de l'addició de nous camins, premeu Intro per explorar a la recerca "
+"de nous connectors."
 
-#: src/ladspa/plugin.cc:499
+#: src/ladspa/plugin.cc:508
 msgid "Available plugins:"
 msgstr "Connectors disponibles: "
 
-#: src/ladspa/plugin.cc:512 src/modplug/plugin_main.cc:92
-#: src/modplug/plugin_main.cc:95 src/modplug/plugin_main.cc:98
-#: src/modplug/plugin_main.cc:101
+#: src/ladspa/plugin.cc:521 src/modplug/plugin_main.cc:91
+#: src/modplug/plugin_main.cc:94 src/modplug/plugin_main.cc:97
+#: src/modplug/plugin_main.cc:100
 msgid "Enable"
-msgstr "Activa"
+msgstr "Habilita"
 
-#: src/ladspa/plugin.cc:518
+#: src/ladspa/plugin.cc:527
 msgid "Enabled plugins:"
 msgstr "Connectors habilitats:"
 
-#: src/ladspa/plugin.cc:534
+#: src/ladspa/plugin.cc:543
 msgid "Settings"
-msgstr "Configuració"
+msgstr "Ajusts"
 
-#: src/ladspa/plugin.cc:551
+#: src/ladspa/plugin.cc:560
 msgid ""
 "LADSPA Host for Audacious\n"
 "Copyright 2011 John Lindgren"
 msgstr ""
+"Amfitrió LADSPA per a Audacious\n"
+"Drets d'autor 2011 John Lindgren"
 
 #: src/ladspa/plugin.h:78
 msgid "LADSPA Host"
-msgstr ""
+msgstr "Servidor LADSPA"
 
 #: src/lirc/lirc.cc:55
 msgid "LIRC Plugin"
-msgstr ""
+msgstr "Connector LIRC"
 
-#: src/lirc/lirc.cc:381
+#: src/lirc/lirc.cc:379
 msgid ""
 "A simple plugin to control Audacious using the LIRC remote control daemon\n"
 "\n"
@@ -2150,82 +2432,157 @@
 "\n"
 "For more information about LIRC, see http://lirc.org."
 msgstr ""
+"Un connector simple per controlar Audacious mitjançant el dimoni de "
+"comandament remot LIRC\n"
+"\n"
+"Adaptat per a Audacious per:\n"
+"Tony Vroon <chainsaw@gentoo.org>\n"
+"Joonas Harjumäki <jharjuma@gmail.com>\n"
+"\n"
+"Basat en el connector XMMS LIRC per:\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 a més informació sobre LIRC, vegeu http://lirc.org."
 
-#: src/lirc/lirc.cc:392
+#: src/lirc/lirc.cc:390
 msgid "Connection"
-msgstr ""
+msgstr "Connexió"
 
-#: src/lirc/lirc.cc:393
+#: src/lirc/lirc.cc:391
 msgid "Reconnect to LIRC server"
-msgstr "Reconnecta amb el servidor LIRC"
+msgstr "Reconnecta al servidor LIRC"
 
-#: src/lirc/lirc.cc:395
+#: src/lirc/lirc.cc:393
 msgid "Wait before reconnecting:"
-msgstr ""
+msgstr "Espera abans de la reconnexió:"
+
+#: src/lyrics-common/chart_lyrics_provider.cc:93
+#: src/lyrics-common/chart_lyrics_provider.cc:150
+#: src/lyrics-common/lyrics_ovh_provider.cc:50
+#, c-format
+msgid "Unable to fetch %s"
+msgstr "No és possible capturar %s"
+
+#: src/lyrics-common/chart_lyrics_provider.cc:100
+#: src/lyrics-common/chart_lyrics_provider.cc:157
+#: src/lyrics-common/lyrics_ovh_provider.cc:57
+#, c-format
+msgid "Unable to parse %s"
+msgstr "No es pot analitzar %s"
+
+#: src/lyrics-common/chart_lyrics_provider.cc:121
+#: src/lyrics-common/chart_lyrics_provider.cc:194
+#: src/lyrics-common/lyrics_ovh_provider.cc:88
+msgid "Looking for lyrics ..."
+msgstr "S'estan cercant les lletres..."
+
+#: src/lyrics-common/preferences.h:43
+msgid "Nowhere"
+msgstr "Enlloc"
+
+#: src/lyrics-common/preferences.h:49
+msgid "Artist is truncated at the start, Title -- at the end"
+msgstr "L'artista es trunca al principi, el títol -- al final"
 
-#: src/lyricwiki/lyricwiki.cc:41
-msgid "LyricWiki Plugin"
+#: src/lyrics-common/preferences.h:50
+msgid "Chars to truncate on:"
+msgstr "Caràcters per truncar:"
+
+#: src/lyrics-common/preferences.h:54
+msgid "Chars are ORed in RegExp, surrounded by whitespace"
 msgstr ""
+"Caràcters amb OR en una expressió regular, envoltats per espais</"
+"small>"
+
+#: src/lyrics-common/preferences.h:55
+msgid "Chars to split on:"
+msgstr "Caràcters per a dividir:"
 
-#: src/lyricwiki/lyricwiki.cc:131 src/lyricwiki-qt/lyricwiki.cc:136
-msgid "No lyrics available"
+#: src/lyrics-common/preferences.h:56
+msgid "Further truncate those on chars"
 msgstr ""
 
-#: src/lyricwiki/lyricwiki.cc:217 src/lyricwiki/lyricwiki.cc:226
-#: src/lyricwiki/lyricwiki.cc:243 src/lyricwiki/lyricwiki.cc:252
-#: src/lyricwiki/lyricwiki.cc:267 src/lyricwiki-qt/lyricwiki.cc:222
-#: src/lyricwiki-qt/lyricwiki.cc:231 src/lyricwiki-qt/lyricwiki.cc:248
-#: src/lyricwiki-qt/lyricwiki.cc:257 src/lyricwiki-qt/lyricwiki.cc:272
-msgid "Error"
-msgstr "Error"
+#: src/lyrics-common/preferences.h:62
+msgid "General"
+msgstr "General"
 
-#: src/lyricwiki/lyricwiki.cc:218 src/lyricwiki/lyricwiki.cc:244
-#: src/lyricwiki-qt/lyricwiki.cc:223 src/lyricwiki-qt/lyricwiki.cc:249
-#, c-format
-msgid "Unable to fetch %s"
+#: src/lyrics-common/preferences.h:63
+msgid "Split title into artist and title on chars"
 msgstr ""
 
-#: src/lyricwiki/lyricwiki.cc:227 src/lyricwiki/lyricwiki.cc:253
-#: src/lyricwiki-qt/lyricwiki.cc:232 src/lyricwiki-qt/lyricwiki.cc:258
-#, c-format
-msgid "Unable to parse %s"
+#: src/lyrics-common/preferences.h:66
+msgid "Sources"
 msgstr ""
 
-#: src/lyricwiki/lyricwiki.cc:259 src/lyricwiki-qt/lyricwiki.cc:264
-msgid "Looking for lyrics ..."
+#: src/lyrics-common/preferences.h:67
+msgid "Use embedded lyrics (from Lyrics tag)"
 msgstr ""
 
-#: src/lyricwiki/lyricwiki.cc:267 src/lyricwiki-qt/lyricwiki.cc:272
-msgid "Missing song metadata"
+#: src/lyrics-common/preferences.h:69
+msgid "Fetch lyrics from internet:"
+msgstr "Recupera les lletres d'Internet:"
+
+#: src/lyrics-common/preferences.h:72
+msgid "Store fetched lyrics in local cache"
+msgstr "Emmagatzema les lletres recuperades a la memòria cau local"
+
+#: src/lyrics-common/preferences.h:74
+msgid "Local Storage"
+msgstr "Emmagatzematge local"
+
+#: src/lyrics-common/preferences.h:75
+msgid "Load lyric files (.lrc) from local storage"
 msgstr ""
 
-#: src/lyricwiki/lyricwiki.cc:278 src/lyricwiki-qt/lyricwiki.cc:283
-msgid "Connecting to lyrics.wikia.com ..."
+#: src/lyrics-common/utils.cc:54 src/ui-common/dialogs-qt.cc:63
+msgid "Error"
+msgstr "Error"
+
+#: src/lyrics-common/utils.cc:60
+msgid "Lyrics could not be found."
 msgstr ""
 
-#: src/lyricwiki-qt/lyricwiki.cc:55
-msgid "LyricWiki Plugin (Qt)"
+#: src/lyrics-common/utils.cc:142
+msgid "Missing title and/or artist."
 msgstr ""
 
-#: src/m3u/m3u.cc:32
-msgid "M3U Playlists"
+#: src/lyrics-gtk/lyrics-gtk.cc:37 src/lyrics-qt/lyrics-qt.cc:50
+msgid "Lyrics"
+msgstr "Lletres"
+
+#: src/lyrics-gtk/lyrics-gtk.cc:189 src/lyrics-qt/lyrics-qt.cc:171
+msgid "Edit Lyrics ..."
 msgstr ""
 
+#: src/lyrics-gtk/lyrics-gtk.cc:195 src/lyrics-qt/lyrics-qt.cc:178
+msgid "Save Locally"
+msgstr "Desa localment"
+
+#: src/lyrics-gtk/lyrics-gtk.cc:201 src/lyrics-qt/lyrics-qt.cc:186
+msgid "Refresh"
+msgstr "Actualitza"
+
+#: src/m3u/m3u.cc:33
+msgid "M3U Playlists"
+msgstr "Llistes de reproducció M3U"
+
 #: src/metronom/metronom.cc:44
 msgid "Tact Generator"
-msgstr ""
+msgstr "Generador de tactes"
 
-#: src/metronom/metronom.cc:147
+#: src/metronom/metronom.cc:145
 #, c-format
 msgid "Tact generator: %d bpm"
 msgstr "Generador de compassos: %d bpm"
 
-#: src/metronom/metronom.cc:149
+#: src/metronom/metronom.cc:147
 #, c-format
 msgid "Tact generator: %d bpm %d/%d"
 msgstr "Generador de compassos: %d bpm %d/%d"
 
-#: src/metronom/metronom.cc:237
+#: src/metronom/metronom.cc:235
 msgid ""
 "A Tact Generator by Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
 "\n"
@@ -2233,195 +2590,210 @@
 "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 de tacte per Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
+"\n"
+"Per a utilitzar-ho, afegiu un URL: tact://beats*num/den\n"
+"p. ex. tact://77 per reproduir 77 batecs per minut\n"
+"o tact://60*3/4 per reproduir 60 bpm en 3/4 tactes"
 
-#: src/mixer/mixer.cc:38
+#: src/mixer/mixer.cc:43
 msgid "Channel Mixer"
-msgstr ""
+msgstr "Mesclador de canals"
 
-#: src/mixer/mixer.cc:202
+#: src/mixer/mixer.cc:255
 msgid ""
 "Channel Mixer Plugin for Audacious\n"
 "Copyright 2011-2012 John Lindgren and Michał Lipski"
 msgstr ""
+"Connector de mesclador de canals per a Audacious\n"
+"Drets d'autor 2011-2012 John Lindgren i Michał Lipski"
 
-#: src/mixer/mixer.cc:206
+#: src/mixer/mixer.cc:259
 msgid "Channel Mixer"
-msgstr ""
+msgstr "Mesclador de canals"
 
-#: src/mixer/mixer.cc:207
+#: src/mixer/mixer.cc:260
 msgid "Output channels:"
 msgstr "Canals de sortida:"
 
 #: src/mms/mms.cc:35
 msgid "MMS Plugin"
-msgstr ""
+msgstr "Connector MMS"
 
 #: src/mms/mms.cc:82
 msgid "Error connecting to MMS server"
-msgstr ""
+msgstr "Error en connectar al servidor MMS"
 
-#: src/modplug/modplugbmp.h:53
+#: src/modplug/modplugbmp.h:57
 msgid "ModPlug (Module Player)"
-msgstr ""
-
-#: src/modplug/plugin_main.cc:53
-msgid "Resolution"
-msgstr "Resolució"
-
-#: src/modplug/plugin_main.cc:54
-msgid "8-bit"
-msgstr "8 bit"
+msgstr "ModPlug (Module Player)"
 
 #: src/modplug/plugin_main.cc:55
-msgid "16-bit"
-msgstr ""
-
-#: src/modplug/plugin_main.cc:56
 msgid "Channels"
-msgstr ""
+msgstr "Canals"
 
-#: src/modplug/plugin_main.cc:60
+#: src/modplug/plugin_main.cc:59
 msgid "Nearest (fastest)"
-msgstr ""
+msgstr "Més proper (més ràpid)"
 
-#: src/modplug/plugin_main.cc:61
+#: src/modplug/plugin_main.cc:60
 msgid "Linear (fast)"
-msgstr ""
+msgstr "Lineal (ràpid)"
 
-#: src/modplug/plugin_main.cc:62
+#: src/modplug/plugin_main.cc:61
 msgid "Spline (good)"
-msgstr ""
+msgstr "Spline (bo)"
 
-#: src/modplug/plugin_main.cc:63
+#: src/modplug/plugin_main.cc:62
 msgid "Polyphase (best)"
-msgstr ""
+msgstr "Polifase (millor)"
 
-#: src/modplug/plugin_main.cc:64
+#: src/modplug/plugin_main.cc:63
 msgid "Sample rate"
-msgstr ""
+msgstr "Freqüència de mostreig"
 
-#: src/modplug/plugin_main.cc:65
+#: src/modplug/plugin_main.cc:64
 msgid "22 kHz"
-msgstr ""
+msgstr "22 kHz"
 
-#: src/modplug/plugin_main.cc:66
+#: src/modplug/plugin_main.cc:65
 msgid "44 kHz"
-msgstr ""
+msgstr "44 kHz"
 
-#: src/modplug/plugin_main.cc:67
+#: src/modplug/plugin_main.cc:66
 msgid "48 kHz"
-msgstr ""
+msgstr "48 kHz"
 
-#: src/modplug/plugin_main.cc:68
+#: src/modplug/plugin_main.cc:67
 msgid "96 kHz"
-msgstr ""
+msgstr "96 kHz"
 
-#: src/modplug/plugin_main.cc:72 src/modplug/plugin_main.cc:77
-#: src/modplug/plugin_main.cc:82
+#: src/modplug/plugin_main.cc:71 src/modplug/plugin_main.cc:76
+#: src/modplug/plugin_main.cc:81
 msgid "Level:"
 msgstr "Nivell:"
 
-#: src/modplug/plugin_main.cc:78
+#: src/modplug/plugin_main.cc:77
 msgid "Cutoff:"
-msgstr ""
+msgstr "Tall:"
 
-#: src/modplug/plugin_main.cc:91
+#: src/modplug/plugin_main.cc:90
 msgid "Reverb"
-msgstr ""
+msgstr "Reverberació"
 
-#: src/modplug/plugin_main.cc:94
+#: src/modplug/plugin_main.cc:93
 msgid "Bass Boost"
-msgstr ""
+msgstr "Increment de baixos"
 
-#: src/modplug/plugin_main.cc:97
+#: src/modplug/plugin_main.cc:96
 msgid "Surround"
-msgstr ""
+msgstr "Envoltant"
 
-#: src/modplug/plugin_main.cc:100
+#: src/modplug/plugin_main.cc:99
 msgid "Preamp"
-msgstr ""
+msgstr "Preamplificador"
 
-#: src/modplug/plugin_main.cc:107
+#: src/modplug/plugin_main.cc:106
 msgid "Oversample"
-msgstr ""
+msgstr "Sobremostreig"
 
-#: src/modplug/plugin_main.cc:108
+#: src/modplug/plugin_main.cc:107
 msgid "Noise reduction"
-msgstr "Reducció de soroll"
+msgstr "Reducció del soroll"
 
-#: src/modplug/plugin_main.cc:109
+#: src/modplug/plugin_main.cc:108
 msgid "Play Amiga MODs"
-msgstr ""
+msgstr "Reprodueix els MOD d'Amiga"
 
-#: src/modplug/plugin_main.cc:110
+#: src/modplug/plugin_main.cc:109
 msgid "Repeat"
-msgstr "Repeteix"
+msgstr "Repetició"
 
-#: src/modplug/plugin_main.cc:111
+#: src/modplug/plugin_main.cc:110
 msgid "Repeat count:"
-msgstr "Comptatge de repeticions:"
+msgstr "Nombre de repeticions:"
 
-#: src/modplug/plugin_main.cc:112
+#: src/modplug/plugin_main.cc:111
 msgid "To repeat forever, set the repeat count to -1."
 msgstr "Per repetir indefinidament, definiu el nombre a -1."
 
-#: src/modplug/plugin_main.cc:125 src/sid/xs_config.cc:106
+#: src/modplug/plugin_main.cc:124 src/sid/xs_config.cc:106
 msgid "These settings will take effect when Audacious is restarted."
+msgstr "Aquests ajusts tindran efecte quan es reiniciï Audacious."
+
+#: src/moonstone/main_window.cc:72 src/moonstone/main_window.cc:73
+#: src/qtui/main_window.cc:159 src/qtui/main_window.cc:160
+#: src/skins/menus.cc:107 src/skins-qt/menus.cc:98
+msgid "Stop After This Song"
+msgstr "Atura després d'aquesta cançó"
+
+#: src/moonstone/moonstone.cc:39
+msgid "Moonstone"
 msgstr ""
 
+#: src/moonstone/playlist_header.cc:212 src/qtui/playlist_header.cc:258
+msgid "Reset to Defaults"
+msgstr "Restableix als valors predeterminats"
+
+#: src/moonstone/playlist_model.cc:38 src/qtui/playlist_header.cc:232
+msgid "Now Playing"
+msgstr "En reproducció ara"
+
+#: src/moonstone/playlist_selection.cc:66
+#: src/playlist-manager/playlist-manager.cc:201
+#: src/playlist-manager-qt/playlist-manager-qt.cc:190
+msgid "Entries"
+msgstr "Elements"
+
 #: src/mpg123/mpg123.cc:54
 msgid "MPG123 Plugin"
-msgstr ""
+msgstr "Connector MPG123"
 
-#: src/mpg123/mpg123.cc:83
-msgid "Advanced"
-msgstr ""
-
-#: src/mpg123/mpg123.cc:84
+#: src/mpg123/mpg123.cc:82
 msgid "Use accurate length calculation (slow)"
-msgstr ""
+msgstr "Utilitza el càlcul acurat de la longitud (lent)"
 
-#: src/mpg123/mpg123.cc:248
+#: src/mpg123/mpg123.cc:260
 msgid "Surround"
-msgstr "So envolvent"
+msgstr "Envoltant"
 
-#: src/mpris2/plugin.cc:39
+#: src/mpris2/plugin.cc:40
 msgid "MPRIS 2 Server"
-msgstr ""
+msgstr "Servidor MPRIS 2"
 
-#: src/neon/neon.cc:97
+#: src/neon/neon.cc:102
 msgid "Neon HTTP/HTTPS Plugin"
-msgstr ""
+msgstr "Connector HTTP/HTTPS de Neon"
 
-#: src/neon/neon.cc:521
+#: src/neon/neon.cc:526
 msgid "Error parsing redirect"
-msgstr ""
+msgstr "Error en analitzar la redirecció:"
 
-#: src/neon/neon.cc:535
+#: src/neon/neon.cc:540
 msgid "Unknown HTTP error"
-msgstr ""
+msgstr "Error HTTP desconegut"
 
-#: src/neon/neon.cc:569
+#: src/neon/neon.cc:614
 msgid "Error parsing URL"
-msgstr ""
+msgstr "Error en analitzar l'URL"
 
-#: src/neon/neon.cc:632
+#: src/neon/neon.cc:687
 msgid "Too many redirects"
-msgstr ""
+msgstr "Massa redireccions"
 
-#: src/notify/event.cc:64
+#: src/notify/event.cc:97
 msgid "Stopped"
 msgstr "Aturat"
 
-#: src/notify/event.cc:64
+#: src/notify/event.cc:97
 msgid "Audacious is not playing."
 msgstr "Audacious no està reproduint."
 
-#: src/notify/notify.cc:42
+#: src/notify/notify.cc:39
 msgid "Desktop Notifications"
-msgstr ""
+msgstr "Notificacions d'escriptori"
 
-#: src/notify/notify.cc:60
+#: src/notify/notify.cc:57
 msgid ""
 "Desktop Notifications Plugin for Audacious\n"
 "Copyright (C) 2010 Maximilian Bogner\n"
@@ -2440,65 +2812,121 @@
 "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 ""
+"Connector de notificacions d'escriptori per a Audacious\n"
+"Drets d'autor (C) 2010 Maximilian Bogner\n"
+"Drets d'autor (C) 2011-2013 John Lindgren i Jean-Alexandre Anglès d'Auriac\n"
+"\n"
+"Aquest connector és programari lliure: podeu redistribuir-lo i/o modificar-"
+"lo sota els termes de la Llicència pública general de GNU com és publicada "
+"per la Free Software Foundation, bé de la versió 3 de la Llicència, o (a la "
+"seva elecció) qualsevol versió posterior.\n"
+"\n"
+"Aquest connector es distribueix amb l'esperança que serà útil, però SENSE "
+"CAP GARANTIA; ni tan sols la garantia implícita de COMERCIALITZACIÓ o "
+"APTITUD DE PROPÒSIT PARTICULAR. Vegeu la Llicència general pública de GNU "
+"per a més detalls.\n"
+"\n"
+"Hauríeu de rebre una còpia de la llicència pública general GNU amb aquest "
+"programa. Si no és així, consulteu <http://www.gnu.org/licenses/>."
 
-#: src/notify/notify.cc:110
+#: src/notify/notify.cc:104
 msgid "Show playback controls"
-msgstr ""
+msgstr "Mostra els controls de reproducció"
 
-#: src/notify/notify.cc:112
+#: src/notify/notify.cc:106
 msgid "Always show notification"
-msgstr ""
+msgstr "Mostra sempre la notificació"
 
-#: src/notify/notify.cc:114
+#: src/notify/notify.cc:108
 msgid "Include album name in notification"
+msgstr "Inclou el nom de l'àlbum a la notificació"
+
+#: src/notify/notify.cc:110
+msgid "Custom notification duration:"
 msgstr ""
 
-#: src/notify/osd.cc:58
+#: src/notify/osd.cc:74
 msgid "Show"
 msgstr "Mostra"
 
-#: src/notify/osd.cc:66 src/qtui/main_window.cc:178
-#: src/qtui/main_window.cc:179 src/skins/menus.cc:88
-msgid "Pause"
-msgstr "Pausa"
+#: src/openmpt/mpt.cc:50
+msgid "OpenMPT (Module Player)"
+msgstr ""
 
-#: src/notify/osd.cc:73 src/qtui/main_window.cc:72 src/skins/menus.cc:91
-msgid "Next"
-msgstr "Següent"
+#: src/openmpt/mpt.cc:132
+msgid ""
+"Module player based on libopenmpt\n"
+"\n"
+"Written by: Chris Spiegel <cspiegel@gmail.com>"
+msgstr ""
 
-#: src/oss4/oss.h:93
-msgid "OSS4 Output"
+#: src/openmpt/mpt.cc:151
+msgid "Stereo separation:"
 msgstr ""
 
-#: src/oss4/oss.h:95
-msgid "OSS3 Output"
+#: src/openmpt/mpt.cc:153
+msgid "% (0=mono, 100=default, 200=full)"
+msgstr ""
+
+#: src/openmpt/mpt.cc:157
+msgid "Interpolation:"
+msgstr "Interpolació:"
+
+#: src/openmpt/mptwrap.h:51 src/soxr/sox-resampler.cc:189 src/xsf/plugin.cc:437
+msgid "Linear"
+msgstr "Lineal"
+
+#: src/openmpt/mptwrap.h:52
+msgid "Cubic"
+msgstr "Cúbica"
+
+#: src/openmpt/mptwrap.h:53
+msgid "Windowed sinc"
+msgstr ""
+
+#: src/opus/opus.cc:39
+msgid "Opus Decoder"
 msgstr ""
 
+#: src/opus/opus.cc:336
+msgid ""
+"Opus Decoder Plugin for Audacious\n"
+"Copyright 2022 Thomas Lange"
+msgstr ""
+
+#: src/oss4/oss.h:70
+msgid "OSS4 Output"
+msgstr "Sortida OSS4"
+
+#: src/oss4/oss.h:72
+msgid "OSS3 Output"
+msgstr "Sortida OSS3"
+
 #: src/oss4/plugin.cc:35
 msgid "Default device"
-msgstr ""
+msgstr "Dispositiu per defecte"
 
-#: src/oss4/plugin.cc:77
+#: src/oss4/plugin.cc:78
 msgid "Audio device:"
 msgstr "Dispositiu d'àudio:"
 
-#: src/oss4/plugin.cc:80
+#: src/oss4/plugin.cc:81
 msgid "Use alternate device:"
-msgstr "Usa un dispositiu alternatiu:"
+msgstr "Utilitza un dispositiu alternatiu:"
 
-#: src/oss4/plugin.cc:84
+#: src/oss4/plugin.cc:85
 msgid "Save volume between sessions."
-msgstr ""
+msgstr "Desa el volum entre les sessions."
 
-#: src/oss4/plugin.cc:86
+#: src/oss4/plugin.cc:87
 msgid "Enable format conversions made by the OSS software."
-msgstr "Activar conversions de format realitzades pel programari OSS."
+msgstr "Habilita les conversions de format realitzades amb el programari OSS."
 
-#: src/oss4/plugin.cc:88
+#: src/oss4/plugin.cc:89
 msgid "Enable exclusive mode to prevent virtual mixing."
-msgstr ""
+msgstr "Habilita el mode exclusiu per evitar la mescla virtual."
 
-#: src/oss4/plugin.cc:100
+#: src/oss4/plugin.cc:101
 msgid ""
 "OSS4 Output Plugin for Audacious\n"
 "Copyright 2010-2012 Michał Lipski\n"
@@ -2507,59 +2935,105 @@
 "Lindgren and of course the authors of the previous OSS plugin."
 msgstr ""
 
-#: src/playlist-manager/playlist-manager.cc:37
-msgid "Playlist Manager"
-msgstr ""
+#: src/pipewire/pipewire.cc:44
+msgid "PipeWire Output"
+msgstr "Sortida del PipeWire"
 
-#: src/playlist-manager/playlist-manager.cc:226
-msgid "Entries"
+#: src/pipewire/pipewire.cc:118
+msgid ""
+"PipeWire Output Plugin for Audacious\n"
+"Copyright 2022 Thomas Lange\n"
+"\n"
+"Based on the PipeWire Output Plugin for Qmmp\n"
+"Copyright 2021 Ilya Kotov"
 msgstr ""
 
-#: src/playlist-manager/playlist-manager.cc:245
+#: src/pipewire/pipewire.cc:408 src/skins/menus.cc:88 src/skins-qt/menus.cc:79
+msgid "Playback"
+msgstr "Reproducció"
+
+#: src/playlist-manager/playlist-manager.cc:38
+#: src/playlist-manager-qt/playlist-manager-qt.cc:42
+msgid "Playlist Manager"
+msgstr "Gestor de llistes de reproducció"
+
+#: src/playlist-manager/playlist-manager.cc:221
+#: src/playlist-manager-qt/playlist-manager-qt.cc:356
 msgid "_Remove"
-msgstr ""
+msgstr "_Suprimeix"
 
-#: src/playlist-manager/playlist-manager.cc:246
+#: src/playlist-manager/playlist-manager.cc:222
+#: src/playlist-manager-qt/playlist-manager-qt.cc:351
 msgid "Ren_ame"
-msgstr ""
+msgstr "Re_anomena"
 
 #: src/pls/pls.cc:35
 msgid "PLS Playlists"
-msgstr ""
+msgstr "Llistes de reproducció PLS"
 
-#: src/psf/plugin.cc:45
+#: src/psf/plugin.cc:53
 msgid "OpenPSF PSF1/PSF2 Decoder"
+msgstr "Descodificador OpenPSF PSF1/PSF2"
+
+#: src/psf/plugin.cc:270
+msgid "OpenPSF Configuration"
 msgstr ""
 
-#: src/pulse_audio/pulse_audio.cc:38
+#: src/psf/plugin.cc:271 src/xsf/plugin.cc:444
+msgid "Ignore length from file"
+msgstr "Ignora la longitud del fitxer"
+
+#: src/pulse/pulse_audio.cc:42
 msgid "PulseAudio Output"
+msgstr "Sortida PulseAudio"
+
+#: src/pulse/pulse_audio.cc:84
+msgid "Context name:"
 msgstr ""
 
-#: src/pulse_audio/pulse_audio.cc:611
+#: src/pulse/pulse_audio.cc:86
+msgid "Stream name:"
+msgstr ""
+
+#: src/pulse/pulse_audio.cc:596
 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."
+"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 ""
+"Connector de sortida de PulseAudio d'Audacious\n"
+"\n"
+"Aquest programa és programari lliure; vostè pot redistribuir-lo i/o "
+"modificar-lo sota els termes de la GNU General Public License segons el "
+"publicat per la Free Software Foundation; ja sigui la versió 2 de la "
+"Llicència, o (a la seva elecció) qualsevol versió posterior.\n"
+"\n"
+"Aquest programa es distribueix amb l'esperança que serà útil, però SENSE CAP "
+"GARANTIA; ni tan sols la garantia implícita de COMERCIALITZACIÓ o APTITUD "
+"PER A UN PROPÒSIT PARTICULAR. Vegeu la GNU General Public License per a més "
+"detalls.\n"
+"\n"
+"Hauríeu de rebre una còpia de la GNU General Public License juntament amb "
+"aquest programa; si no, podeu escriure la Free Software Foundation, Inc., 51 "
+"Franklin Street, Cinquena Planta, Boston, MA 02110-1301, USA."
 
-#: src/qtaudio/qtaudio.cc:49
+#: src/qtaudio/qtaudio.cc:53
 msgid "QtMultimedia Output"
-msgstr ""
+msgstr "Sortida QtMultimedia"
 
-#: src/qtaudio/qtaudio.cc:77
+#: src/qtaudio/qtaudio.cc:84
 msgid ""
 "QtMultimedia Audio Output Plugin for Audacious\n"
 "Copyright 2014 William Pitcock\n"
@@ -2567,64 +3041,108 @@
 "Based on SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
 msgstr ""
+"Connector de sortida d'àudio QtMultimedia per a Audacious\n"
+"Drets d'autor 2014 William Pitcock\n"
+"\n"
+"Basat en el connector de sortida d'àudio SDL per a Audacious\n"
+"Drets d'autor 2010 John Lindgren"
 
-#: src/qtui/dialog_windows.cc:31
-msgid "Working ..."
+#: src/qtglspectrum/gl-spectrum.cc:41
+msgid ""
+"OpenGL Spectrum Analyzer for Audacious\n"
+"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
+"Copyright 2014, 2020 Ariadne Conill\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/qtui/filter_input.cc:44 src/skins/ui_playlist.cc:221
-msgid "Search"
+#: src/qthotkey/gui.cc:177
+msgid "Press a key combination inside a text field."
 msgstr ""
 
-#: src/qtui/main_window_actions.cc:94
-msgid "_Open Folder ..."
+#: src/qthotkey/plugin.cc:105
+msgid ""
+"Global Hotkey Plugin\n"
+"Control the player with global key combinations or multimedia keys.\n"
+"\n"
+"Copyright (C) 2020 i.Dark_Templar <darktemplar@dark-templar-archives.net>\n"
+"Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n"
+"\n"
+"Contributors 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/qtui/main_window_actions.cc:96
+#: src/qtui/menus.cc:109
+msgid "_Open Folder ..."
+msgstr "_Obre la carpeta..."
+
+#: src/qtui/menus.cc:115
 msgid "_Add Folder ..."
-msgstr ""
+msgstr "_Afegeix la carpeta..."
 
-#: src/qtui/main_window_actions.cc:101
+#: src/qtui/menus.cc:128
 msgid "_Log Inspector ..."
+msgstr "_Log Inspector ..."
+
+#: src/qtui/menus.cc:220
+msgid "_Find ..."
+msgstr "_Troba..."
+
+#: src/qtui/menus.cc:256 src/skins/menus.cc:80 src/skins-qt/menus.cc:70
+msgid "Audio Settings ..."
+msgstr "Ajusts de l'àudio..."
+
+#: src/qtui/playlist_model.cc:188
+msgid "Q#"
 msgstr ""
 
-#: src/qtui/main_window.cc:64
-msgid "Open Files"
+#: src/qtui/playlist_model.cc:190
+msgid "T#"
 msgstr ""
 
-#: src/qtui/main_window.cc:66
-msgid "Add Files"
+#: src/qtui/playlist_model.cc:192
+msgid "C#"
 msgstr ""
 
-#: src/qtui/main_window.cc:71 src/skins/menus.cc:90
-msgid "Previous"
-msgstr "Anterior"
+#: src/qtui/playlist_model.cc:194
+msgid "D#"
+msgstr ""
 
-#: src/qtui/main_window.cc:77 src/skins/menus.cc:82
-msgid "Repeat"
-msgstr "Repeteix"
+#: src/qtui/qtui.cc:40
+msgid "Qt Interface"
+msgstr "Interfície Qt"
 
-#: src/qtui/main_window.cc:79 src/skins/menus.cc:83
-msgid "Shuffle"
-msgstr "Barreja"
+#: src/qtui/search_bar.cc:46
+msgid "Search playlist"
+msgstr ""
 
-#: src/qtui/qtui.cc:42
-msgid "Qt Interface"
+#: src/qtui/settings.cc:79
+msgid "Use bold font for column headers"
 msgstr ""
 
 #: src/resample/resample.cc:43
 msgid "Sample Rate Converter"
-msgstr "Convertidor de taxa de mostratge"
+msgstr "Convertidor de taxa de mostreig"
 
 #: src/resample/resample.cc:183
 msgid ""
 "Sample Rate Converter Plugin for Audacious\n"
 "Copyright 2010-2012 John Lindgren"
 msgstr ""
+"Connector de conversió de freqüència de mostreig per a Audacious\n"
+"Drets d'autor 2010-2012 John Lindgren"
 
 #: src/resample/resample.cc:187
 msgid "Skip/repeat samples"
-msgstr ""
+msgstr "Omet/repeteix les mostres"
 
 #: src/resample/resample.cc:188
 msgid "Linear interpolation"
@@ -2632,15 +3150,15 @@
 
 #: src/resample/resample.cc:189
 msgid "Fast sinc interpolation"
-msgstr ""
+msgstr "Interpolació ràpida de la sincronització"
 
 #: src/resample/resample.cc:190
 msgid "Medium sinc interpolation"
-msgstr ""
+msgstr "Interpolació mitjana de la sincronització"
 
 #: src/resample/resample.cc:191
 msgid "Best sinc interpolation"
-msgstr ""
+msgstr "La millor interpolació de la sincronització"
 
 #: src/resample/resample.cc:195
 msgid "Conversion"
@@ -2650,17 +3168,17 @@
 msgid "Method:"
 msgstr "Mètode:"
 
-#: src/resample/resample.cc:199 src/sox-resampler/sox-resampler.cc:161
+#: src/resample/resample.cc:199 src/soxr/sox-resampler.cc:203
 msgid "Rate:"
 msgstr "Taxa:"
 
 #: src/resample/resample.cc:202
 msgid "Rate Mappings"
-msgstr ""
+msgstr "Assignacions de les taxes"
 
 #: src/resample/resample.cc:203
 msgid "Use rate mappings"
-msgstr ""
+msgstr "Utilitza les assignacions de les taxes"
 
 #: src/resample/resample.cc:205
 msgid "8 kHz:"
@@ -2676,7 +3194,7 @@
 
 #: src/resample/resample.cc:217
 msgid "32.0 kHz:"
-msgstr ""
+msgstr "32,0 kHz:"
 
 #: src/resample/resample.cc:221
 msgid "44.1 kHz:"
@@ -2688,7 +3206,7 @@
 
 #: src/resample/resample.cc:229
 msgid "88.2 kHz:"
-msgstr ""
+msgstr "88,2 kHz:"
 
 #: src/resample/resample.cc:233
 msgid "96 kHz:"
@@ -2696,185 +3214,178 @@
 
 #: src/resample/resample.cc:237
 msgid "176.4 kHz:"
-msgstr ""
+msgstr "176,4 kHz:"
 
 #: src/resample/resample.cc:241
 msgid "192 kHz:"
 msgstr "192 kHz:"
 
-#: src/scrobbler2/config_window.cc:41
-#, c-format
-msgid "OK. Scrobbling for user: %s"
-msgstr ""
-
-#: src/scrobbler2/config_window.cc:54
-msgid "Permission Denied"
-msgstr ""
+#: src/scrobbler2/config_window.cc:29
+msgid "Checking Last.fm access ..."
+msgstr "S'està comprovant l'accés a Last.fm..."
 
-#: src/scrobbler2/config_window.cc:56
-msgid "Access the following link to allow Audacious to scrobble your plays:"
+#: src/scrobbler2/config_window.cc:35
+msgid ""
+"Your scrobbles are being saved on your computer temporarily. They will be "
+"submitted as soon as Audacious is allowed access."
 msgstr ""
 
-#: src/scrobbler2/config_window.cc:66
-msgid "Keep this window open and click 'Check Permission' again.\n"
+#: src/scrobbler2/config_window.cc:41
+#, c-format
+msgid "Permission granted. Scrobbling for user %s."
 msgstr ""
 
-#: src/scrobbler2/config_window.cc:69 src/scrobbler2/config_window.cc:80
+#: src/scrobbler2/config_window.cc:44
 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."
+"Permission denied. Open the following URL in a browser, allow Audacious "
+"access to your account, and then click 'Check Permission' again:"
 msgstr ""
 
-#: src/scrobbler2/config_window.cc:77
-msgid "Network Problem."
-msgstr "Hi ha un problema de xarxa."
-
-#: src/scrobbler2/config_window.cc:78
-msgid "There was a problem contacting Last.fm. Please try again later."
-msgstr ""
-
-#: src/scrobbler2/config_window.cc:110
-msgid "Checking..."
-msgstr ""
+#: src/scrobbler2/config_window.cc:53
+msgid "There was a problem contacting Last.fm."
+msgstr "Hi ha hagut un problema en contactar amb Last.fm."
 
-#: src/scrobbler2/config_window.cc:176
-msgid "C_heck Permission"
-msgstr ""
+#: src/scrobbler2/config_window.cc:92
+msgid "Check Permission"
+msgstr "Comprova el permís"
 
-#: src/scrobbler2/config_window.cc:177
-msgid "_Revoke Permission"
-msgstr ""
+#: src/scrobbler2/config_window.cc:93
+msgid "Revoke Permission"
+msgstr "Revoca el permís"
 
-#: src/scrobbler2/config_window.cc:220
-msgid ""
-"You need to allow Audacious to scrobble tracks to your Last.fm account.\n"
+#: src/scrobbler2/config_window.cc:97
+msgid "You need to allow Audacious to scrobble tracks to your Last.fm account."
 msgstr ""
 
 #: src/scrobbler2/scrobbler.cc:29
 msgid "Scrobbler 2.0"
 msgstr "Scrobbler 2.0"
 
-#: src/scrobbler2/scrobbler.cc:224
+#: src/scrobbler2/scrobbler.cc:200
 msgid ""
 "The Scrobbler plugin could not be started.\n"
 "There might be a problem with your installation."
 msgstr ""
 
-#: src/scrobbler2/scrobbler.cc:289
+#: src/scrobbler2/scrobbler.cc:245
 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"
+"project."
 msgstr ""
 
-#: src/scrobbler2/scrobbler_communication.cc:642
-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/sdlout.cc:48
+#: src/sdlout/sdlout.cc:43
 msgid "SDL Output"
-msgstr ""
+msgstr "Sortida SDL"
 
-#: src/sdlout/sdlout.cc:77
+#: src/sdlout/sdlout.cc:72
 msgid ""
 "SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
 msgstr ""
+"Connector de sortida SDL per a Audacious\n"
+"Drets d'autor 2010 John Lindgren"
 
-#: src/search-tool/search-tool.cc:116 src/search-tool/search-tool.cc:124
+#: src/search-tool/library.cc:35 src/search-tool/library.cc:46
+#: src/search-tool-qt/library.cc:35 src/search-tool-qt/library.cc:46
 msgid "Library"
 msgstr "Biblioteca"
 
-#: src/search-tool/search-tool.cc:394
-#, c-format
-msgid "%d result"
-msgid_plural "%d results"
-msgstr0 ""
-msgstr1 ""
-
-#: src/search-tool/search-tool.cc:400
-#, c-format
-msgid "(%d hidden)"
-msgid_plural "(%d hidden)"
-msgstr0 ""
-msgstr1 ""
-
-#: src/search-tool/search-tool.cc:594
+#: src/search-tool-qt/search-model.cc:44 src/search-tool/search-tool.cc:287
 #, c-format
 msgid "%d song"
 msgid_plural "%d songs"
-msgstr0 ""
-msgstr1 ""
+msgstr0 "%d cançó"
+msgstr1 "%d cançons"
 
-#: src/search-tool/search-tool.cc:601
+#: src/search-tool-qt/search-model.cc:53 src/search-tool/search-tool.cc:294
 msgid "of this genre"
-msgstr ""
+msgstr "d'aquest gènere"
 
-#: src/search-tool/search-tool.cc:607
+#: src/search-tool-qt/search-model.h:47 src/search-tool/search-model.h:45
 msgid "on"
 msgstr ""
 
-#: src/search-tool/search-tool.cc:607
+#: src/search-tool-qt/search-model.h:47 src/search-tool/search-model.h:45
 msgid "by"
-msgstr ""
+msgstr "per"
 
-#: src/search-tool/search-tool.cc:643
-msgid "_Create Playlist"
-msgstr "_Crear llista de reproducció"
+#: src/search-tool-qt/search-tool-qt.cc:165 src/search-tool/search-tool.cc:74
+msgid "Number of results to show:"
+msgstr "Nombre de resultats a mostrar:"
 
-#: src/search-tool/search-tool.cc:645
-msgid "_Add to Playlist"
-msgstr "_Afegir a la llista de reproducció"
+#: src/search-tool-qt/search-tool-qt.cc:168 src/search-tool/search-tool.cc:77
+msgid "Rescan library at startup"
+msgstr ""
 
-#: src/search-tool/search-tool.cc:684
-msgid "Search library"
-msgstr "Cercar biblioteca"
+#: src/search-tool-qt/search-tool-qt.cc:170
+msgid "Monitor library for changes"
+msgstr ""
 
-#: src/search-tool/search-tool.cc:688
+#: src/search-tool-qt/search-tool-qt.cc:193 src/search-tool/search-tool.cc:450
 msgid ""
 "To import your music library into Audacious, choose a folder and then click "
 "the \"refresh\" icon."
 msgstr ""
-"Per importar la vostra col·lecció musical en l’Audacious, trieu una carpeta "
-"i feu clic a la icona «Actualitza»."
+"Per importar la vostra biblioteca de música a Audacious, trieu una carpeta i "
+"feu clic a la icona «refresca»."
 
-#: src/search-tool/search-tool.cc:696
+#: src/search-tool-qt/search-tool-qt.cc:195 src/search-tool/search-tool.cc:459
 msgid "Please wait ..."
 msgstr "Esperi si us plau..."
 
-#: src/search-tool/search-tool.cc:723
+#: src/search-tool-qt/search-tool-qt.cc:197 src/search-tool/search-tool.cc:487
 msgid "Choose Folder"
 msgstr "Seleccioneu un directori"
 
+#: src/search-tool-qt/search-tool-qt.cc:201 src/search-tool/search-tool.cc:445
+msgid "Search library"
+msgstr "Cerca la biblioteca"
+
+#: src/search-tool-qt/search-tool-qt.cc:327 src/search-tool/search-tool.cc:156
+#, c-format
+msgid "%d of %d result shown"
+msgid_plural "%d of %d results shown"
+msgstr0 "%d de %d resultat mostrat"
+msgstr1 "%d de %d resultats mostrats"
+
+#: src/search-tool-qt/search-tool-qt.cc:331 src/search-tool/search-tool.cc:160
+#, c-format
+msgid "%d result"
+msgid_plural "%d results"
+msgstr0 "%d resultat"
+msgstr1 "%d resultats"
+
+#: src/search-tool-qt/search-tool-qt.cc:501 src/search-tool/search-tool.cc:341
+msgid "_Create Playlist"
+msgstr "_Crea una llista de reproducció"
+
+#: src/search-tool-qt/search-tool-qt.cc:503 src/search-tool/search-tool.cc:343
+msgid "_Add to Playlist"
+msgstr "_Afegeix a la llista de reproducció"
+
 #: src/sid/xmms-sid.cc:43
 msgid "SID Player"
-msgstr ""
-
-#: src/sid/xs_config.cc:61
-msgid "Output"
-msgstr ""
+msgstr "Reproductor SID"
 
 #: src/sid/xs_config.cc:62
 msgid "Channels:"
-msgstr ""
+msgstr "Canals:"
 
 #: src/sid/xs_config.cc:68
 msgid "Emulation"
-msgstr ""
+msgstr "Emulació"
 
 #: src/sid/xs_config.cc:69
 msgid "Emulate MOS 8580 (default: MOS 6581)"
-msgstr ""
+msgstr "Emula MOS 8580 (per defecte: MOS 6581)"
 
 #: src/sid/xs_config.cc:71
 msgid "Do not automatically select chip model"
-msgstr ""
+msgstr "No seleccionis automàticament el model del xip!"
 
 #: src/sid/xs_config.cc:73
 msgid "Emulate filter"
@@ -2882,797 +3393,743 @@
 
 #: src/sid/xs_config.cc:75
 msgid "Clock speed:"
-msgstr ""
+msgstr "Velocitat de rellotge:"
 
 #: src/sid/xs_config.cc:78
 msgid "Do not automatically select clock speed"
-msgstr ""
+msgstr "No seleccionis automàticament la velocitat del rellotge"
 
 #: src/sid/xs_config.cc:80
 msgid "Playback time"
-msgstr ""
+msgstr "Temps de reproducció"
 
 #: src/sid/xs_config.cc:81
 msgid "Set maximum playback time:"
-msgstr ""
+msgstr "Estableix el temps màxim de reproducció:"
 
 #: src/sid/xs_config.cc:87
 msgid "Use only when song length is unknown"
-msgstr ""
+msgstr "Utilitza-ho només quan es desconegui la durada de la cançó"
 
 #: src/sid/xs_config.cc:90
 msgid "Set minimum playback time:"
-msgstr ""
+msgstr "Estableix el temps mínim de reproducció:"
 
 #: src/sid/xs_config.cc:96
 msgid "Subtunes"
-msgstr ""
+msgstr "Subtons"
 
 #: src/sid/xs_config.cc:97
 msgid "Enable subtunes"
-msgstr ""
+msgstr "Habilita els subtons"
 
 #: src/sid/xs_config.cc:99
 msgid "Ignore subtunes shorter than:"
-msgstr ""
+msgstr "Ignora els subtons més petits que:"
 
 #: src/sid/xs_config.cc:105
 msgid "Note"
-msgstr ""
+msgstr "Nota"
 
 #: src/silence-removal/silence-removal.cc:39
 msgid "Silence Removal"
-msgstr ""
+msgstr "Eliminació del silenci"
 
 #: src/silence-removal/silence-removal.cc:58
 msgid ""
 "Silence Removal Plugin for Audacious\n"
 "Copyright 2014 John Lindgren"
 msgstr ""
+"Connector de supressió del silenci per a Audacious\n"
+"Drets d'autor 2014 John Lindgren"
 
 #: src/silence-removal/silence-removal.cc:67
 msgid "Silence Removal"
-msgstr ""
+msgstr "Eliminació de silenci"
 
 #: src/silence-removal/silence-removal.cc:68
 msgid "Threshold:"
-msgstr ""
+msgstr "Llindar:"
 
-#: src/silence-removal/silence-removal.cc:70
-msgid "dB"
-msgstr ""
+#: src/skins/actions.cc:45 src/skins-qt/actions.cc:43
+msgid "Repeat points cleared."
+msgstr "S'han netejat els punts de repetició."
 
-#: src/skins/menus.cc:64
-msgid "Open Files ..."
-msgstr ""
+#: src/skins/actions.cc:60 src/skins-qt/actions.cc:58
+msgid "Repeat point A set."
+msgstr "S'ha establert el punt de repetició A."
 
-#: src/skins/menus.cc:65
-msgid "Open URL ..."
-msgstr ""
+#: src/skins/actions.cc:65 src/skins-qt/actions.cc:63
+msgid "Repeat point B set."
+msgstr "S'ha establert el punt de repetició B."
 
-#: src/skins/menus.cc:66
-msgid "Search Library"
-msgstr ""
+#: src/skins/equalizer.cc:223 src/skins-qt/equalizer.cc:223
+msgid "Preamp"
+msgstr "Preamplificació"
 
-#: src/skins/menus.cc:68
-msgid "Playback"
-msgstr "Reproducció"
+#: src/skins/equalizer.cc:227 src/skins-qt/equalizer.cc:227
+msgid "31 Hz"
+msgstr "31 Hz"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "63 Hz"
+msgstr "63 Hz"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "125 Hz"
+msgstr "125 Hz"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "250 Hz"
+msgstr "250 Hz"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "500 Hz"
+msgstr "500 Hz"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "1 kHz"
+msgstr "1 kHz"
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "2 kHz"
+msgstr "2 kHz"
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "4 kHz"
+msgstr "4 kHz"
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "8 kHz"
+msgstr "8 kHz"
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "16 kHz"
+msgstr "16 kHz"
+
+#: src/skins/equalizer.cc:270 src/skins-qt/equalizer.cc:270
+msgid "Audacious Equalizer"
+msgstr "Equalitzador d'Audacious"
+
+#: src/skins/main.cc:459 src/skins-qt/main.cc:442
+msgid "Recording on"
+msgstr "Enregistrament engegat"
+
+#: src/skins/main.cc:461 src/skins-qt/main.cc:444
+msgid "Recording off"
+msgstr "Enregistrament apagat"
+
+#: src/skins/main.cc:754 src/skins-qt/main.cc:701
+#, c-format
+msgid "Seek to %d:%-2.2d / %d:%-2.2d"
+msgstr "Vés a la posició %d:%-2.2d / %d:%-2.2d"
+
+#: src/skins/main.cc:771 src/skins-qt/main.cc:718
+#, c-format
+msgid "Volume: %d%%"
+msgstr "Volum: %d%%"
+
+#: src/skins/main.cc:784 src/skins-qt/main.cc:731
+#, c-format
+msgid "Balance: %d%% left"
+msgstr "Balanç: %d%% esquerra"
+
+#: src/skins/main.cc:786 src/skins-qt/main.cc:733
+msgid "Balance: center"
+msgstr "Balanç: centrat"
+
+#: src/skins/main.cc:788 src/skins-qt/main.cc:735
+#, c-format
+msgid "Balance: %d%% right"
+msgstr "Balanç: %d%% dreta"
+
+#: src/skins/main.cc:880 src/skins-qt/main.cc:827
+msgid "Options Menu"
+msgstr "Menú d'opcions"
+
+#: src/skins/main.cc:884 src/skins-qt/main.cc:831
+msgid "Disable 'Always On Top'"
+msgstr "Inhabilita 'Sempre per sobre'"
 
-#: src/skins/menus.cc:69
+#: src/skins/main.cc:886 src/skins-qt/main.cc:833
+msgid "Enable 'Always On Top'"
+msgstr "Habilita 'Sempre per sobre'"
+
+#: src/skins/main.cc:889 src/skins-qt/main.cc:836
+msgid "File Info Box"
+msgstr "Quadre d'informació del fitxer"
+
+#: src/skins/main.cc:892 src/skins/menus.cc:149 src/skins-qt/main.cc:839
+#: src/skins-qt/menus.cc:142
+msgid "Double Size"
+msgstr "Mida doble"
+
+#: src/skins/main.cc:895 src/skins-qt/main.cc:842
+msgid "Visualizations"
+msgstr "Visualitzacions"
+
+#: src/skins/menus.cc:74 src/skins-qt/menus.cc:64
+msgid "Volume Up"
+msgstr "Apuja el volum"
+
+#: src/skins/menus.cc:75 src/skins-qt/menus.cc:65
+msgid "Volume Down"
+msgstr "Abaixa el volum"
+
+#: src/skins/menus.cc:77 src/skins-qt/menus.cc:67
+msgid "Effects ..."
+msgstr "Efectes..."
+
+#: src/skins/menus.cc:84 src/skins-qt/menus.cc:74
+msgid "Open Files ..."
+msgstr "Obre fitxers..."
+
+#: src/skins/menus.cc:85 src/skins-qt/menus.cc:76
+msgid "Open URL ..."
+msgstr "Obre l'URL..."
+
+#: src/skins/menus.cc:89 src/skins-qt/menus.cc:80
 msgid "Playlist"
-msgstr "Llistes"
+msgstr "Llista de reproducció"
 
-#: src/skins/menus.cc:70
+#: src/skins/menus.cc:90 src/skins-qt/menus.cc:81
+msgid "Output"
+msgstr "Sortida"
+
+#: src/skins/menus.cc:91 src/skins-qt/menus.cc:82
 msgid "View"
 msgstr "Finestres"
 
-#: src/skins/menus.cc:72 src/skins/menus.cc:136 src/skins/menus.cc:149
-#: src/skins/menus.cc:214
+#: src/skins/menus.cc:93 src/skins/menus.cc:161 src/skins/menus.cc:174
+#: src/skins/menus.cc:245 src/skins-qt/menus.cc:84 src/skins-qt/menus.cc:156
+#: src/skins-qt/menus.cc:170 src/skins-qt/menus.cc:241
 msgid "Services"
-msgstr ""
+msgstr "Serveis"
 
-#: src/skins/menus.cc:74
+#: src/skins/menus.cc:95 src/skins-qt/menus.cc:86
 msgid "About ..."
-msgstr ""
+msgstr "Quant a..."
 
-#: src/skins/menus.cc:75
+#: src/skins/menus.cc:96 src/skins-qt/menus.cc:87
 msgid "Settings ..."
-msgstr ""
+msgstr "Ajusts..."
 
-#: src/skins/menus.cc:76
+#: src/skins/menus.cc:97 src/skins-qt/menus.cc:88
 msgid "Quit"
-msgstr ""
+msgstr "Surt"
 
-#: src/skins/menus.cc:80 src/skins/menus.cc:206
+#: src/skins/menus.cc:101 src/skins/menus.cc:235 src/skins-qt/menus.cc:92
+#: src/skins-qt/menus.cc:231
 msgid "Song Info ..."
-msgstr ""
+msgstr "Informació de la cançó..."
 
-#: src/skins/menus.cc:84
-msgid "No Playlist Advance"
-msgstr "Discontinua la reproducció programada"
+#: src/skins/menus.cc:105 src/skins-qt/menus.cc:96
+msgid "Shuffle by Album"
+msgstr "Ordre aleatori per àlbum"
 
-#: src/skins/menus.cc:85
-msgid "Stop After This Song"
-msgstr ""
+#: src/skins/menus.cc:106 src/skins-qt/menus.cc:97
+msgid "No Playlist Advance"
+msgstr "Sense l'avanç de la llista de reproducció"
 
-#: src/skins/menus.cc:93
+#: src/skins/menus.cc:117 src/skins-qt/menus.cc:108
 msgid "Set A-B Repeat"
-msgstr ""
+msgstr "Estableix la repetició A-B"
 
-#: src/skins/menus.cc:94
+#: src/skins/menus.cc:118 src/skins-qt/menus.cc:109
 msgid "Clear A-B Repeat"
-msgstr ""
+msgstr "Neteja la repetició A-B"
 
-#: src/skins/menus.cc:96
+#: src/skins/menus.cc:120 src/skins-qt/menus.cc:111
 msgid "Jump to Song ..."
-msgstr ""
+msgstr "Salta a la cançó..."
 
-#: src/skins/menus.cc:97
+#: src/skins/menus.cc:121 src/skins-qt/menus.cc:113
 msgid "Jump to Time ..."
-msgstr ""
+msgstr "Salta a l'instant..."
 
-#: src/skins/menus.cc:101
+#: src/skins/menus.cc:125 src/skins-qt/menus.cc:118
 msgid "Play/Resume"
-msgstr ""
+msgstr "Reprodueix/reprèn"
 
-#: src/skins/menus.cc:103
+#: src/skins/menus.cc:127 src/skins-qt/menus.cc:120
 msgid "New Playlist"
 msgstr "Llista de reproducció nova"
 
-#: src/skins/menus.cc:104
+#: src/skins/menus.cc:128 src/skins-qt/menus.cc:121
 msgid "Rename Playlist ..."
-msgstr ""
+msgstr "Reanomena la llista de reproducció..."
 
-#: src/skins/menus.cc:105
+#: src/skins/menus.cc:129 src/skins-qt/menus.cc:122
 msgid "Remove Playlist"
-msgstr ""
+msgstr "Suprimeix la llista de reproducció"
 
-#: src/skins/menus.cc:107
+#: src/skins/menus.cc:131 src/skins-qt/menus.cc:124
 msgid "Previous Playlist"
-msgstr ""
+msgstr "Llista de reproducció anterior"
 
-#: src/skins/menus.cc:108
+#: src/skins/menus.cc:132 src/skins-qt/menus.cc:125
 msgid "Next Playlist"
-msgstr ""
+msgstr "Llista de reproducció següent"
 
-#: src/skins/menus.cc:110
+#: src/skins/menus.cc:134 src/skins-qt/menus.cc:127
 msgid "Import Playlist ..."
-msgstr ""
+msgstr "Importa la llista de reproducció..."
 
-#: src/skins/menus.cc:111
+#: src/skins/menus.cc:135 src/skins-qt/menus.cc:128
 msgid "Export Playlist ..."
-msgstr ""
+msgstr "Exporta la llista de reproducció..."
 
-#: src/skins/menus.cc:113
+#: src/skins/menus.cc:137 src/skins-qt/menus.cc:130
 msgid "Playlist Manager ..."
-msgstr ""
+msgstr "Gestor de llistes de reproducció..."
 
-#: src/skins/menus.cc:114
+#: src/skins/menus.cc:138 src/skins-qt/menus.cc:131
 msgid "Queue Manager ..."
-msgstr ""
+msgstr "Gestor de la cua..."
 
-#: src/skins/menus.cc:116
+#: src/skins/menus.cc:140 src/skins-qt/menus.cc:133
 msgid "Refresh Playlist"
-msgstr ""
+msgstr "Refresca la llista de reproducció"
 
-#: src/skins/menus.cc:120
+#: src/skins/menus.cc:144 src/skins-qt/menus.cc:137
 msgid "Show Playlist Editor"
-msgstr "Mostra l'editor de llistes"
+msgstr "Mostra l'editor la llista de reproducció"
 
-#: src/skins/menus.cc:121
+#: src/skins/menus.cc:145 src/skins-qt/menus.cc:138
 msgid "Show Equalizer"
 msgstr "Mostra l'equalitzador"
 
-#: src/skins/menus.cc:123
+#: src/skins/menus.cc:147 src/skins-qt/menus.cc:140
 msgid "Show Remaining Time"
-msgstr ""
+msgstr "Mostra el temps restant"
 
-#: src/skins/menus.cc:125
+#: src/skins/menus.cc:150 src/skins-qt/menus.cc:143
 msgid "Always on Top"
 msgstr "Sempre per sobre"
 
-#: src/skins/menus.cc:126
+#: src/skins/menus.cc:151 src/skins-qt/menus.cc:145
 msgid "On All Workspaces"
-msgstr ""
+msgstr "En tots els espais de treball"
 
-#: src/skins/menus.cc:128
+#: src/skins/menus.cc:153 src/skins-qt/menus.cc:148
 msgid "Roll Up Player"
-msgstr ""
+msgstr "Enrotlla cap a dalt el reproductor"
 
-#: src/skins/menus.cc:129
+#: src/skins/menus.cc:154 src/skins-qt/menus.cc:149
 msgid "Roll Up Playlist Editor"
-msgstr ""
+msgstr "Enrotlla cap a dalt l'editor de la llista de reproducció"
 
-#: src/skins/menus.cc:130
+#: src/skins/menus.cc:155 src/skins-qt/menus.cc:150
 msgid "Roll Up Equalizer"
-msgstr ""
-
-#: src/skins/menus.cc:132 src/skins/ui_main.cc:854
-msgid "Double Size"
-msgstr ""
+msgstr "Enrotlla cap a dalt l'equalitzador"
 
-#: src/skins/menus.cc:138
+#: src/skins/menus.cc:163 src/skins-qt/menus.cc:158
 msgid "Add URL ..."
-msgstr ""
+msgstr "Afegeix l'URL..."
 
-#: src/skins/menus.cc:139
+#: src/skins/menus.cc:164 src/skins-qt/menus.cc:160
 msgid "Add Files ..."
-msgstr ""
+msgstr "Afegeix els fitxers..."
 
-#: src/skins/menus.cc:143 src/skins/menus.cc:171 src/skins/menus.cc:185
+#: src/skins/menus.cc:168 src/skins/menus.cc:196 src/skins/menus.cc:212
+#: src/skins-qt/menus.cc:164 src/skins-qt/menus.cc:192
+#: src/skins-qt/menus.cc:208
 msgid "By Title"
 msgstr "Per títol"
 
-#: src/skins/menus.cc:144 src/skins/menus.cc:178 src/skins/menus.cc:192
+#: src/skins/menus.cc:169 src/skins/menus.cc:203 src/skins/menus.cc:219
+#: src/skins-qt/menus.cc:165 src/skins-qt/menus.cc:199
+#: src/skins-qt/menus.cc:215
 msgid "By File Name"
-msgstr ""
+msgstr "Per nom de fitxer"
 
-#: src/skins/menus.cc:145 src/skins/menus.cc:179 src/skins/menus.cc:193
+#: src/skins/menus.cc:170 src/skins/menus.cc:204 src/skins/menus.cc:220
+#: src/skins-qt/menus.cc:166 src/skins-qt/menus.cc:200
+#: src/skins-qt/menus.cc:216
 msgid "By File Path"
-msgstr ""
+msgstr "Per camí al fitxer"
 
-#: src/skins/menus.cc:151
+#: src/skins/menus.cc:176 src/skins-qt/menus.cc:172
 msgid "Remove All"
 msgstr "Treu tots els elements"
 
-#: src/skins/menus.cc:152
+#: src/skins/menus.cc:177 src/skins-qt/menus.cc:173
 msgid "Clear Queue"
 msgstr "Neteja la cua"
 
-#: src/skins/menus.cc:154
+#: src/skins/menus.cc:179 src/skins-qt/menus.cc:175
 msgid "Remove Unavailable Files"
 msgstr "Treu els fitxers no disponibles"
 
-#: src/skins/menus.cc:155
+#: src/skins/menus.cc:180 src/skins-qt/menus.cc:176
 msgid "Remove Duplicates"
 msgstr "Treu els duplicats"
 
-#: src/skins/menus.cc:157
+#: src/skins/menus.cc:182 src/skins-qt/menus.cc:178
 msgid "Remove Unselected"
 msgstr "Treu els no seleccionats"
 
-#: src/skins/menus.cc:158
+#: src/skins/menus.cc:183 src/skins-qt/menus.cc:179
 msgid "Remove Selected"
 msgstr "Treu els seleccionats"
 
-#: src/skins/menus.cc:162
+#: src/skins/menus.cc:187 src/skins-qt/menus.cc:183
 msgid "Search and Select"
 msgstr "Cerca i selecciona"
 
-#: src/skins/menus.cc:164
+#: src/skins/menus.cc:189 src/skins-qt/menus.cc:185
 msgid "Invert Selection"
 msgstr "Inverteix la selecció"
 
-#: src/skins/menus.cc:165
+#: src/skins/menus.cc:190 src/skins-qt/menus.cc:186
 msgid "Select None"
 msgstr "Selecciona no res"
 
-#: src/skins/menus.cc:166
+#: src/skins/menus.cc:191 src/skins-qt/menus.cc:187
 msgid "Select All"
 msgstr "Selecciona tots els elements"
 
-#: src/skins/menus.cc:170 src/skins/menus.cc:184
+#: src/skins/menus.cc:195 src/skins/menus.cc:211 src/skins-qt/menus.cc:191
+#: src/skins-qt/menus.cc:207
 msgid "By Track Number"
-msgstr "Pel número de pista"
+msgstr "Per número de pista"
 
-#: src/skins/menus.cc:172 src/skins/menus.cc:186
+#: src/skins/menus.cc:197 src/skins/menus.cc:213 src/skins-qt/menus.cc:193
+#: src/skins-qt/menus.cc:209
 msgid "By Artist"
-msgstr "Per l'artista"
+msgstr "Per artista"
 
-#: src/skins/menus.cc:173 src/skins/menus.cc:187
+#: src/skins/menus.cc:198 src/skins/menus.cc:214 src/skins-qt/menus.cc:194
+#: src/skins-qt/menus.cc:210
 msgid "By Album"
 msgstr "Per àlbum"
 
-#: src/skins/menus.cc:174 src/skins/menus.cc:188
+#: src/skins/menus.cc:199 src/skins/menus.cc:215 src/skins-qt/menus.cc:195
+#: src/skins-qt/menus.cc:211
 msgid "By Album Artist"
-msgstr ""
+msgstr "Per artista de l'àlbum"
 
-#: src/skins/menus.cc:175 src/skins/menus.cc:190
+#: src/skins/menus.cc:200 src/skins/menus.cc:216 src/skins-qt/menus.cc:196
+#: src/skins-qt/menus.cc:212
 msgid "By Release Date"
-msgstr ""
+msgstr "Per data de llançament"
 
-#: src/skins/menus.cc:176 src/skins/menus.cc:189
+#: src/skins/menus.cc:201 src/skins/menus.cc:217 src/skins-qt/menus.cc:197
+#: src/skins-qt/menus.cc:213
 msgid "By Genre"
-msgstr ""
+msgstr "Per gènere"
 
-#: src/skins/menus.cc:177 src/skins/menus.cc:191
+#: src/skins/menus.cc:202 src/skins/menus.cc:218 src/skins-qt/menus.cc:198
+#: src/skins-qt/menus.cc:214
 msgid "By Length"
-msgstr ""
+msgstr "Per longitud"
 
-#: src/skins/menus.cc:180 src/skins/menus.cc:194
+#: src/skins/menus.cc:205 src/skins/menus.cc:221 src/skins-qt/menus.cc:201
+#: src/skins-qt/menus.cc:217
 msgid "By Custom Title"
+msgstr "Per títol personalitzat"
+
+#: src/skins/menus.cc:206 src/skins/menus.cc:222 src/skins-qt/menus.cc:202
+#: src/skins-qt/menus.cc:218
+msgid "By Comment"
+msgstr "Per comentari"
+
+#: src/skins/menus.cc:207 src/skins/menus.cc:223 src/skins-qt/menus.cc:203
+#: src/skins-qt/menus.cc:219
+msgid "By Disc Number"
 msgstr ""
 
-#: src/skins/menus.cc:198
+#: src/skins/menus.cc:227 src/skins-qt/menus.cc:223
 msgid "Randomize List"
 msgstr "Barreja la llista"
 
-#: src/skins/menus.cc:199
+#: src/skins/menus.cc:228 src/skins-qt/menus.cc:224
 msgid "Reverse List"
 msgstr "Inverteix la llista"
 
-#: src/skins/menus.cc:201
+#: src/skins/menus.cc:230 src/skins-qt/menus.cc:226
 msgid "Sort Selected"
 msgstr "Ordena els seleccionats"
 
-#: src/skins/menus.cc:202
+#: src/skins/menus.cc:231 src/skins-qt/menus.cc:227
 msgid "Sort List"
 msgstr "Ordena la llista"
 
-#: src/skins/menus.cc:208
+#: src/skins/menus.cc:236 src/skins-qt/menus.cc:232
+msgid "Open Containing Folder"
+msgstr "Obre la carpeta contenidora"
+
+#: src/skins/menus.cc:238 src/skins-qt/menus.cc:234
 msgid "Cut"
-msgstr "Retallar"
+msgstr "Retalla"
 
-#: src/skins/menus.cc:209
+#: src/skins/menus.cc:239 src/skins-qt/menus.cc:235
 msgid "Copy"
-msgstr "Copiar"
+msgstr "Copia"
 
-#: src/skins/menus.cc:210
+#: src/skins/menus.cc:240 src/skins-qt/menus.cc:236
 msgid "Paste"
-msgstr "Enganxar"
-
-#: src/skins/menus.cc:212
-msgid "Queue/Unqueue"
-msgstr ""
-
-#: src/skins/menus.cc:218
-msgid "Load Preset ..."
-msgstr ""
-
-#: src/skins/menus.cc:219
-msgid "Load Auto Preset ..."
-msgstr ""
-
-#: src/skins/menus.cc:220
-msgid "Load Default"
-msgstr ""
-
-#: src/skins/menus.cc:221
-msgid "Load Preset File ..."
-msgstr ""
-
-#: src/skins/menus.cc:222
-msgid "Load EQF File ..."
-msgstr ""
-
-#: src/skins/menus.cc:224
-msgid "Save Preset ..."
-msgstr ""
-
-#: src/skins/menus.cc:225
-msgid "Save Auto Preset ..."
-msgstr ""
-
-#: src/skins/menus.cc:226
-msgid "Save Default"
-msgstr ""
-
-#: src/skins/menus.cc:227
-msgid "Save Preset File ..."
-msgstr ""
-
-#: src/skins/menus.cc:228
-msgid "Save EQF File ..."
-msgstr ""
+msgstr "Enganxa"
 
-#: src/skins/menus.cc:230
-msgid "Delete Preset ..."
-msgstr ""
+#: src/skins/menus.cc:241 src/skins-qt/menus.cc:237
+msgid "Paste at End"
+msgstr "Enganxa a l'acabament"
 
-#: src/skins/menus.cc:231
-msgid "Delete Auto Preset ..."
-msgstr ""
+#: src/skins/menus.cc:243 src/skins-qt/menus.cc:239
+msgid "Queue/Unqueue"
+msgstr "Afegeix/treu de la cua"
 
-#: src/skins/menus.cc:233
-msgid "Import Winamp Presets ..."
-msgstr ""
+#: src/skins/playlist-widget.cc:58 src/skins-qt/playlist-widget.cc:58
+#, c-format
+msgid "%s (%d of %d)"
+msgstr "%s (%d de %d)"
 
-#: src/skins/menus.cc:235
-msgid "Reset to Zero"
-msgstr ""
+#: src/skins/playlistwin.cc:491 src/skins-qt/playlistwin.cc:478
+msgid "Audacious Playlist Editor"
+msgstr "Editor de la llista de reproducció d'Audacious"
 
-#: src/skins/plugin.cc:48
+#: src/skins/plugin.cc:53 src/skins-qt/plugin.cc:65
 msgid "Winamp Classic Interface"
-msgstr "Interfície del Winamp clàssic"
+msgstr "Interfície de Winamp clàssic"
 
-#: src/skins/preset-browser.cc:57 src/skins/preset-list.cc:371
-#: src/skins/preset-list.cc:386
-msgid "Save"
-msgstr "Desa"
+#: src/skins-qt/menus.cc:75
+msgid "Open Folder ..."
+msgstr "Obre la carpeta..."
 
-#: src/skins/preset-browser.cc:57 src/skins/preset-list.cc:338
-#: src/skins/preset-list.cc:354
-msgid "Load"
-msgstr "Carrega"
+#: src/skins-qt/menus.cc:159
+msgid "Add Folder ..."
+msgstr "Afegeix la carpeta..."
 
-#: src/skins/preset-browser.cc:83
-msgid "Load Preset File"
-msgstr ""
-
-#: src/skins/preset-browser.cc:100
-msgid "Load EQF File"
-msgstr ""
-
-#: src/skins/preset-browser.cc:119
-msgid "Save Preset File"
-msgstr ""
+#: src/skins-qt/search-select.cc:62 src/skins/search-select.cc:77
+msgid "Search entries in active playlist"
+msgstr "Cerca les entrades a la llista de reproducció activa"
 
-#: src/skins/preset-browser.cc:137
-msgid "Save EQF File"
+#: src/skins-qt/search-select.cc:70 src/skins/search-select.cc:83
+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 ""
+"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/preset-browser.cc:151
-msgid "Import Winamp Presets"
-msgstr ""
+#: src/skins-qt/search-select.cc:75 src/skins/search-select.cc:91
+msgid "Title:"
+msgstr "Títol: "
 
-#: src/skins/preset-list.cc:285
-msgid "Presets"
-msgstr "Perfils"
+#: src/skins-qt/search-select.cc:79 src/skins/search-select.cc:96
+msgid "Album:"
+msgstr "Àlbum:"
 
-#: src/skins/preset-list.cc:335
-msgid "Load preset"
-msgstr "Carrega un perfil"
+#: src/skins-qt/search-select.cc:82 src/skins/search-select.cc:101
+msgid "Artist:"
+msgstr "Artista: "
 
-#: src/skins/preset-list.cc:351
-msgid "Load auto-preset"
-msgstr "Carregar auto-predefinit"
+#: src/skins-qt/search-select.cc:85 src/skins/search-select.cc:106
+msgid "File Name:"
+msgstr "Nom del fitxer:"
 
-#: src/skins/preset-list.cc:367
-msgid "Save preset"
-msgstr "Desa el perfil"
+#: src/skins-qt/search-select.cc:88 src/skins/search-select.cc:134
+msgid "Clear previous selection before searching"
+msgstr "Neteja la selecció anterior abans de cercar"
 
-#: src/skins/preset-list.cc:382
-msgid "Save auto-preset"
-msgstr "Desar auto-predefinit"
+#: src/skins-qt/search-select.cc:89 src/skins/search-select.cc:137
+msgid "Automatically toggle queue for matching entries"
+msgstr "Posa o treu de la cua automàticament els elements trobats"
 
-#: src/skins/preset-list.cc:408
-msgid "Delete preset"
-msgstr "Esborra el perfil"
+#: src/skins-qt/search-select.cc:90 src/skins/search-select.cc:140
+msgid "Create a new playlist with matching entries"
+msgstr "Crea una llista de reproducció nova amb els elements trobats"
 
-#: src/skins/preset-list.cc:424
-msgid "Delete auto-preset"
-msgstr "Suprimir auto-predefinit"
+#: src/skins-qt/search-select.cc:101 src/skins/search-select.cc:78
+msgid "Search"
+msgstr "Cerca"
 
-#: src/skins/skins_cfg.cc:176
+#: src/skins-qt/skins_cfg.cc:198 src/skins/skins_cfg.cc:182
 msgid "Player:"
-msgstr ""
+msgstr "Reproductor:"
 
-#: src/skins/skins_cfg.cc:178
+#: src/skins-qt/skins_cfg.cc:200 src/skins/skins_cfg.cc:184
 msgid "Select main player window font:"
-msgstr "Trieu la fosa de la finestra principal:"
+msgstr ""
+"Seleccioneu el tipus de lletra de la finestra principal del reproductor:"
 
-#: src/skins/skins_cfg.cc:179
+#: src/skins-qt/skins_cfg.cc:201 src/skins/skins_cfg.cc:185
 msgid "Playlist:"
-msgstr ""
+msgstr "Llista de reproducció:"
 
-#: src/skins/skins_cfg.cc:181
+#: src/skins-qt/skins_cfg.cc:203 src/skins/skins_cfg.cc:187
 msgid "Select playlist font:"
-msgstr "Trieu la fosa de la llista de reproducció:"
+msgstr "Seleccioneu el tipus de lletra de la llista de reproducció:"
 
-#: src/skins/skins_cfg.cc:187
+#: src/skins-qt/skins_cfg.cc:207 src/skins/skins_cfg.cc:191
 msgid "Skin"
+msgstr "Tema"
+
+#: src/skins-qt/skins_cfg.cc:211 src/skins/skins_cfg.cc:193
+msgid "Display active titlebar when any window is focused"
 msgstr ""
 
-#: src/skins/skins_cfg.cc:189
+#: src/skins-qt/skins_cfg.cc:213 src/skins/skins_cfg.cc:195
 msgid "Fonts"
-msgstr ""
+msgstr "Tipus de lletres"
 
-#: src/skins/skins_cfg.cc:192
+#: src/skins-qt/skins_cfg.cc:215 src/skins/skins_cfg.cc:197
 msgid "Use bitmap fonts (supports ASCII only)"
-msgstr "Utilitzar tipografies de mapa de bits (nomes suporta ASCII)"
+msgstr "Utilitza els tipus de lletra bitmap (només és compatible amb ASCII)"
 
-#: src/skins/skins_cfg.cc:194
+#: src/skins-qt/skins_cfg.cc:217 src/skins/skins_cfg.cc:199
 msgid "Scroll song title"
-msgstr ""
+msgstr "Desplaça el títol de la cançó"
 
-#: src/skins/skins_cfg.cc:196
+#: src/skins-qt/skins_cfg.cc:219 src/skins/skins_cfg.cc:201
 msgid "Scroll song title in both directions"
-msgstr "Desplaçar el títol de la cançó en ambdues direccions "
+msgstr "Desplaça el títol de la cançó en ambdues direccions"
 
-#: src/skins/skins_cfg.cc:201
+#: src/skins-qt/skins_cfg.cc:224 src/skins/skins_cfg.cc:206
 msgid "Analyzer"
 msgstr "Analitzador"
 
-#: src/skins/skins_cfg.cc:202
+#: src/skins-qt/skins_cfg.cc:225 src/skins/skins_cfg.cc:207
 msgid "Scope"
 msgstr "Oscil·loscopi"
 
-#: src/skins/skins_cfg.cc:203
+#: src/skins-qt/skins_cfg.cc:226 src/skins/skins_cfg.cc:208
 msgid "Voiceprint / VU meter"
 msgstr ""
 
-#: src/skins/skins_cfg.cc:204
+#: src/skins-qt/skins_cfg.cc:227 src/skins/skins_cfg.cc:209
 msgid "Off"
 msgstr "Apagat"
 
-#: src/skins/skins_cfg.cc:208 src/skins/skins_cfg.cc:233
-#: src/skins/skins_cfg.cc:239
+#: src/skins-qt/skins_cfg.cc:231 src/skins-qt/skins_cfg.cc:256
+#: src/skins-qt/skins_cfg.cc:262 src/skins/skins_cfg.cc:213
+#: src/skins/skins_cfg.cc:238 src/skins/skins_cfg.cc:244
 msgid "Normal"
 msgstr "Normal"
 
-#: src/skins/skins_cfg.cc:209 src/skins/skins_cfg.cc:234
+#: src/skins-qt/skins_cfg.cc:232 src/skins-qt/skins_cfg.cc:257
+#: src/skins/skins_cfg.cc:214 src/skins/skins_cfg.cc:239
 msgid "Fire"
 msgstr "Foc"
 
-#: src/skins/skins_cfg.cc:210
+#: src/skins-qt/skins_cfg.cc:233 src/skins/skins_cfg.cc:215
 msgid "Vertical lines"
-msgstr ""
+msgstr "Línies verticals"
 
-#: src/skins/skins_cfg.cc:214
+#: src/skins-qt/skins_cfg.cc:237 src/skins/skins_cfg.cc:219
 msgid "Lines"
 msgstr "Línies"
 
-#: src/skins/skins_cfg.cc:215
+#: src/skins-qt/skins_cfg.cc:238 src/skins/skins_cfg.cc:220
 msgid "Bars"
 msgstr "Barres"
 
-#: src/skins/skins_cfg.cc:219
+#: src/skins-qt/skins_cfg.cc:242 src/skins/skins_cfg.cc:224
 msgid "Slowest"
 msgstr "Mínim"
 
-#: src/skins/skins_cfg.cc:220
+#: src/skins-qt/skins_cfg.cc:243 src/skins/skins_cfg.cc:225
 msgid "Slow"
 msgstr "Lent"
 
-#: src/skins/skins_cfg.cc:221 src/sox-resampler/sox-resampler.cc:152
+#: src/skins-qt/skins_cfg.cc:244 src/skins/skins_cfg.cc:226
+#: src/soxr/sox-resampler.cc:180
 msgid "Medium"
-msgstr "Mitjà"
+msgstr "Mitja"
 
-#: src/skins/skins_cfg.cc:222
+#: src/skins-qt/skins_cfg.cc:245 src/skins/skins_cfg.cc:227
 msgid "Fast"
 msgstr "Ràpid"
 
-#: src/skins/skins_cfg.cc:223
+#: src/skins-qt/skins_cfg.cc:246 src/skins/skins_cfg.cc:228
 msgid "Fastest"
 msgstr "Al màxim"
 
-#: src/skins/skins_cfg.cc:227
+#: src/skins-qt/skins_cfg.cc:250 src/skins/skins_cfg.cc:232
 msgid "Dots"
-msgstr ""
+msgstr "Punts"
 
-#: src/skins/skins_cfg.cc:228
+#: src/skins-qt/skins_cfg.cc:251 src/skins/skins_cfg.cc:233
 msgid "Line"
-msgstr ""
+msgstr "Línia"
 
-#: src/skins/skins_cfg.cc:229
+#: src/skins-qt/skins_cfg.cc:252 src/skins/skins_cfg.cc:234
 msgid "Solid"
-msgstr ""
+msgstr "Sòlid"
 
-#: src/skins/skins_cfg.cc:235
+#: src/skins-qt/skins_cfg.cc:258 src/skins/skins_cfg.cc:240
 msgid "Ice"
 msgstr "Gel"
 
-#: src/skins/skins_cfg.cc:240
+#: src/skins-qt/skins_cfg.cc:263 src/skins/skins_cfg.cc:245
 msgid "Smooth"
 msgstr "Suau"
 
-#: src/skins/skins_cfg.cc:244
-msgid "Type"
-msgstr ""
-
-#: src/skins/skins_cfg.cc:245
-msgid "Visualization type:"
-msgstr ""
-
-#: src/skins/skins_cfg.cc:248
-msgid "Analyzer"
-msgstr ""
-
-#: src/skins/skins_cfg.cc:249
-msgid "Show peaks"
-msgstr ""
-
-#: src/skins/skins_cfg.cc:251
+#: src/skins-qt/skins_cfg.cc:267 src/skins/skins_cfg.cc:249
 msgid "Coloring:"
-msgstr ""
+msgstr "Acoloriment:"
 
-#: src/skins/skins_cfg.cc:254
+#: src/skins-qt/skins_cfg.cc:270 src/skins/skins_cfg.cc:252
 msgid "Style:"
-msgstr ""
+msgstr "Estil:"
 
-#: src/skins/skins_cfg.cc:257
+#: src/skins-qt/skins_cfg.cc:273 src/skins/skins_cfg.cc:255
 msgid "Falloff:"
-msgstr ""
+msgstr "Caiguda:"
 
-#: src/skins/skins_cfg.cc:260
+#: src/skins-qt/skins_cfg.cc:276 src/skins/skins_cfg.cc:258
 msgid "Peak falloff:"
-msgstr ""
+msgstr "Caiguda dels pics:"
 
-#: src/skins/skins_cfg.cc:264
+#: src/skins-qt/skins_cfg.cc:282 src/skins/skins_cfg.cc:264
 msgid "Scope Style:"
-msgstr ""
+msgstr "Estil de l'oscil·loscopi:"
 
-#: src/skins/skins_cfg.cc:267
+#: src/skins-qt/skins_cfg.cc:285 src/skins/skins_cfg.cc:267
 msgid "Voiceprint Coloring:"
-msgstr ""
+msgstr "Acoloriment de l'empremta de veu:"
 
-#: src/skins/skins_cfg.cc:270
+#: src/skins-qt/skins_cfg.cc:288 src/skins/skins_cfg.cc:270
 msgid "VU Meter Style:"
 msgstr ""
 
-#: src/skins/skins_cfg.cc:276
-msgid "General"
-msgstr "General"
-
-#: src/skins/skins_cfg.cc:277
-msgid "Visualization"
-msgstr "Visualització"
-
-#: src/skins/ui_equalizer.cc:282
-msgid "Preamp"
-msgstr "Preamplificació"
-
-#: src/skins/ui_equalizer.cc:286
-msgid "31 Hz"
-msgstr "31 Hz"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "63 Hz"
-msgstr "63 Hz"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "125 Hz"
-msgstr "125 Hz"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "250 Hz"
-msgstr "250 Hz"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "500 Hz"
-msgstr "500 Hz"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "1 kHz"
-msgstr "1 kHz"
-
-#: src/skins/ui_equalizer.cc:288
-msgid "2 kHz"
-msgstr "2 kHz"
-
-#: src/skins/ui_equalizer.cc:288
-msgid "4 kHz"
-msgstr "4 kHz"
-
-#: src/skins/ui_equalizer.cc:288
-msgid "8 kHz"
-msgstr "8 kHz"
-
-#: src/skins/ui_equalizer.cc:288
-msgid "16 kHz"
-msgstr "16 kHz"
-
-#: src/skins/ui_equalizer.cc:330
-msgid "Audacious Equalizer"
-msgstr "Equalitzador de l'Audacious"
-
-#: src/skins/ui_main.cc:688
-#, c-format
-msgid "Seek to %d:%-2.2d / %d:%-2.2d"
-msgstr "Anar a la posició %d:%-2.2d / %d:%-2.2d"
-
-#: src/skins/ui_main.cc:709
-#, c-format
-msgid "Volume: %d%%"
-msgstr "Volum: %d%%"
-
-#: src/skins/ui_main.cc:732
-#, c-format
-msgid "Balance: %d%% left"
-msgstr "Balanç: %d%% esquerra"
-
-#: src/skins/ui_main.cc:734
-msgid "Balance: center"
-msgstr "Balanç: centrat"
-
-#: src/skins/ui_main.cc:736
-#, c-format
-msgid "Balance: %d%% right"
-msgstr "Balanç: %d%% dreta"
-
-#: src/skins/ui_main.cc:842
-msgid "Options Menu"
-msgstr "Menú d'opcions"
-
-#: src/skins/ui_main.cc:846
-msgid "Disable 'Always On Top'"
-msgstr "Desactiva 'Sempre per sobre'"
-
-#: src/skins/ui_main.cc:848
-msgid "Enable 'Always On Top'"
-msgstr "Activa 'Sempre per sobre'"
-
-#: src/skins/ui_main.cc:851
-msgid "File Info Box"
-msgstr "Informació del fitxer"
-
-#: src/skins/ui_main.cc:857
-msgid "Visualizations"
-msgstr ""
-
-#: src/skins/ui_main.cc:1336
-msgid "Repeat point A set."
-msgstr ""
-
-#: src/skins/ui_main.cc:1341
-msgid "Repeat point B set."
-msgstr ""
-
-#: src/skins/ui_main.cc:1350
-msgid "Repeat points cleared."
-msgstr ""
-
-#: src/skins/ui_playlist.cc:219
-msgid "Search entries in active playlist"
-msgstr "Cerca elements en la llista de reproducció activa"
-
-#: src/skins/ui_playlist.cc:226
-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 ""
-"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.cc:234
-msgid "Title:"
-msgstr ""
-
-#: src/skins/ui_playlist.cc:241
-msgid "Album:"
-msgstr ""
-
-#: src/skins/ui_playlist.cc:248
-msgid "Artist:"
-msgstr ""
-
-#: src/skins/ui_playlist.cc:255
-msgid "File Name:"
-msgstr ""
-
-#: src/skins/ui_playlist.cc:263
-msgid "Clear previous selection before searching"
-msgstr "Neteja la selecció anterior abans de cercar"
+#: src/skins-qt/skins_cfg.cc:294 src/skins/skins_cfg.cc:276
+msgid "Type"
+msgstr "Tipus"
 
-#: src/skins/ui_playlist.cc:266
-msgid "Automatically toggle queue for matching entries"
-msgstr "Posa o treu de la cua automàticament els elements trobats"
+#: src/skins-qt/skins_cfg.cc:295 src/skins/skins_cfg.cc:277
+msgid "Visualization type:"
+msgstr "Tipus de visualització:"
 
-#: src/skins/ui_playlist.cc:269
-msgid "Create a new playlist with matching entries"
-msgstr "Crea una llista de reproducció nova amb els elements trobats"
+#: src/skins-qt/skins_cfg.cc:298 src/skins/skins_cfg.cc:280
+msgid "Analyzer"
+msgstr "Analitzador"
 
-#: src/skins/ui_playlist.cc:717
-msgid "Audacious Playlist Editor"
-msgstr "Editor de llistes de l'Audacious"
+#: src/skins-qt/skins_cfg.cc:299 src/skins/skins_cfg.cc:281
+msgid "Show peaks"
+msgstr "Mostra els pics"
 
-#: src/skins/ui_playlist.cc:752
-#, c-format
-msgid "%s (%d of %d)"
-msgstr "%s (%d de %d)"
+#: src/skins-qt/skins_cfg.cc:308 src/skins/skins_cfg.cc:290
+msgid "Visualization"
+msgstr "Visualització"
 
-#: src/skins/ui_skinselector.cc:167
+#: src/skins-qt/skinselector.cc:98 src/skins/skinselector.cc:111
 msgid "Archived Winamp 2.x skin"
-msgstr "Decoració del Winamp 2.x arxivada"
+msgstr "Tema de Winamp 2.x arxivat"
 
-#: src/skins/ui_skinselector.cc:172
+#: src/skins-qt/skinselector.cc:102 src/skins/skinselector.cc:115
 msgid "Unarchived Winamp 2.x skin"
-msgstr "Decoració del Winamp 2.x no arxivada"
+msgstr "Tema de Winamp 2.x no arxivat"
 
-#: src/skins/util.cc:430
-#, c-format
-msgid "Could not create directory (%s): %s\n"
-msgstr "No s'ha pogut crear el directori (%s): %s\n"
-
-#: src/sndfile/plugin.cc:39
+#: src/sndfile/plugin.cc:38
 msgid "Sndfile Plugin"
-msgstr ""
+msgstr "Connector Sndfile"
 
-#: src/sndfile/plugin.cc:336
+#: src/sndfile/plugin.cc:372
 msgid ""
 "Based on the xmms_sndfile plugin:\n"
 "Copyright (C) 2000, 2002 Erik de Castro Lopo\n"
@@ -3693,96 +4150,120 @@
 "this program; if not, write to the Free Software Foundation, Inc., 51 "
 "Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 msgstr ""
+"Basat en el connector xmms_sndfile:\n"
+"Drets d'autor (C) 2000, 2002 Erik de Castro Lopo\n"
+"\n"
+"Adaptat per Audacious per Tony Vroon <chainsaw@gentoo.org>\n"
+"\n"
+"Aquest programa és programari lliure; vostè pot redistribuir-lo i/o "
+"modificar-lo sota els termes de la GNU General Public License segons el "
+"publicat per la Free Software Foundation; ja sigui la versió 2 de la "
+"Llicència, o (a la seva elecció) qualsevol versió posterior.\n"
+"\n"
+"Aquest programa es distribueix amb l'esperança que serà útil, però SENSE CAP "
+"GARANTIA; ni tan sols la garantia implícita de COMERCIALITZACIÓ o APTITUD "
+"PER A UN PROPÒSIT PARTICULAR. Vegeu la GNU General Public License per a més "
+"detalls.\n"
+"\n"
+"Hauríeu de rebre una còpia de la GNU General Public License juntament amb "
+"aquest programa; si no, podeu escriure la Free Software Foundation, Inc., 51 "
+"Franklin Street, Cinquena Planta, Boston, MA 02110-1301, USA."
 
-#: src/sndio-ng/sndio.cc:44
+#: src/sndio/sndio.cc:43
 msgid "Sndio Output"
-msgstr ""
+msgstr "Sortida Sndio"
 
-#: src/sndio-ng/sndio.cc:98
+#: src/sndio/sndio.cc:98
 msgid "Device (blank for default):"
-msgstr ""
+msgstr "Dispositiu (en blanc per al predeterminat):"
 
-#: src/sndio-ng/sndio.cc:100
+#: src/sndio/sndio.cc:100
 msgid "Save and restore volume:"
-msgstr ""
+msgstr "Desa i restaura el volum:"
 
-#: src/sndio-ng/sndio.cc:181
+#: src/sndio/sndio.cc:181
 #, c-format
 msgid "Sndio error: Unsupported audio format (%d)"
-msgstr ""
+msgstr "Error de sndio: format d'àudio no admès (%d)"
 
-#: src/sndio-ng/sndio.cc:192
+#: src/sndio/sndio.cc:192
 msgid "Sndio error: sio_open() failed"
-msgstr ""
+msgstr "Error de Sndio: ha fallat sio_open()"
 
-#: src/sndio-ng/sndio.cc:222
+#: src/sndio/sndio.cc:221
 msgid "Sndio error: sio_setpar() failed"
-msgstr ""
+msgstr "Error de Sndio: ha fallat sio_setpar()"
 
-#: src/sndio-ng/sndio.cc:234
+#: src/sndio/sndio.cc:233
 msgid "Sndio error: sio_start() failed"
-msgstr ""
+msgstr "Error de Sndio: ha fallat sio_start()"
 
-#: src/song_change/song_change.cc:33
+#: src/songchange/song_change.cc:30
 msgid "Song Change"
 msgstr "Canvi de cançó"
 
-#: src/song_change/song_change.cc:342
-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\n"
-"cometes. Altrament seria un risc per a la seguretat."
-
-#: src/song_change/song_change.cc:358
+#: src/songchange/song_change.cc:256
 msgid "Commands"
-msgstr ""
+msgstr "Ordres"
 
-#: src/song_change/song_change.cc:360
+#: src/songchange/song_change.cc:258
 msgid "Command to run when starting a new song:"
+msgstr "Ordre a executar quan es comença una cançó nova:"
+
+#: src/songchange/song_change.cc:261
+msgid "Command to run when stopping a song:"
 msgstr ""
 
-#: src/song_change/song_change.cc:364
+#: src/songchange/song_change.cc:264
 msgid "Command to run at the end of a song:"
-msgstr ""
+msgstr "Ordre a executar a l'acabament d'una cançó:"
 
-#: src/song_change/song_change.cc:368
+#: src/songchange/song_change.cc:267
 msgid "Command to run at the end of the playlist:"
-msgstr ""
+msgstr "Ordre a executar a l'acabament d'una llista de reproducció:"
 
-#: src/song_change/song_change.cc:372
+#: src/songchange/song_change.cc:270
 msgid "Command to run when song title changes (for network streams):"
 msgstr ""
+"Ordre a executar quan canvia el nom de la cançó (per als fluxos de xarxa):"
 
-#: src/song_change/song_change.cc:376
+#: src/songchange/song_change.cc:273
 msgid ""
-"You can use the following format strings which will be substituted before "
-"calling the command (not all are useful for the end-of-playlist command):\n"
-"\n"
-"%F: Frequency (in hertz)\n"
+"You can use the following format codes, which will be replaced before "
+"running the command.\n"
+"Not all are useful though for the song-stopped or end-of-playlist command."
+msgstr ""
+
+#: src/songchange/song_change.cc:276
+msgid ""
+"%a: Artist\n"
+"%b: Album\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"
+"%F: Frequency (Hertz)\n"
+"%l: Length (milliseconds)\n"
+"%n or %s: Formatted title (see playlist settings)\n"
 "%p: Currently playing (1 or 0)\n"
-"%a: Artist\n"
-"%b: Album\n"
-"%T: Track title"
+"%r: Rate (bits per second)\n"
+"%t: Playlist position\n"
+"%T: Title (unformatted)"
 msgstr ""
 
-#: src/song-info-qt/song-info.cc:32
-msgid "Song Info (Qt)"
+#: src/songchange/song_change.cc:287
+msgid ""
+"Parameters passed to the shell should be enclosed in quotation marks.\n"
+"Unquoted parameters may lead to unexpected results."
 msgstr ""
 
-#: src/sox-resampler/sox-resampler.cc:44
+#: src/song-info-qt/song-info.cc:30
+msgid "Song Info"
+msgstr "Informació de la cançó"
+
+#: src/soxr/sox-resampler.cc:44
 msgid "SoX Resampler"
 msgstr ""
 
-#: src/sox-resampler/sox-resampler.cc:144
+#: src/soxr/sox-resampler.cc:172
 msgid ""
 "SoX Resampler Plugin for Audacious\n"
 "Copyright 2013 Michał Lipski\n"
@@ -3791,92 +4272,147 @@
 "Copyright 2010-2012 John Lindgren"
 msgstr ""
 
-#: src/sox-resampler/sox-resampler.cc:150
+#: src/soxr/sox-resampler.cc:178
 msgid "Quick"
 msgstr "Ràpida"
 
-#: src/sox-resampler/sox-resampler.cc:151
+#: src/soxr/sox-resampler.cc:179
 msgid "Low"
 msgstr "Baixa"
 
-#: src/sox-resampler/sox-resampler.cc:153
+#: src/soxr/sox-resampler.cc:181
 msgid "High"
 msgstr "Alta"
 
-#: src/sox-resampler/sox-resampler.cc:154
+#: src/soxr/sox-resampler.cc:182
 msgid "Very High"
 msgstr "Molt alta"
 
-#: src/sox-resampler/sox-resampler.cc:158
+#: src/soxr/sox-resampler.cc:183
+msgid "Ultra High"
+msgstr ""
+
+#: src/soxr/sox-resampler.cc:187
+msgid "Minimum"
+msgstr ""
+
+#: src/soxr/sox-resampler.cc:188
+msgid "Intermediate"
+msgstr ""
+
+#: src/soxr/sox-resampler.cc:193
 msgid "Quality:"
 msgstr "Qualitat:"
 
-#: src/speed-pitch/speed-pitch.cc:51
-msgid "Speed and Pitch"
+#: src/soxr/sox-resampler.cc:196
+msgid "Phase:"
+msgstr "Fase:"
+
+#: src/soxr/sox-resampler.cc:200
+msgid "Allow aliasing"
 msgstr ""
 
-#: src/speed-pitch/speed-pitch.cc:210
-msgid "Speed and Pitch"
+#: src/soxr/sox-resampler.cc:202
+msgid "Use steep filter"
 msgstr ""
 
-#: src/speed-pitch/speed-pitch.cc:211
-msgid "Speed:"
-msgstr "Velocitat:"
+#: src/speedpitch/speed-pitch.cc:54
+msgid "Speed and Pitch"
+msgstr ""
 
-#: src/speed-pitch/speed-pitch.cc:214
-msgid "Pitch:"
+#: src/speedpitch/speed-pitch.cc:247
+msgid "Speed"
+msgstr "Velocitat"
+
+#: src/speedpitch/speed-pitch.cc:248
+msgid "Decouple from pitch"
 msgstr ""
 
-#: src/statusicon/statusicon.cc:47
-msgid "Status Icon"
-msgstr "Icona d’estat"
+#: src/speedpitch/speed-pitch.cc:250 src/speedpitch/speed-pitch.cc:258
+msgid "Multiplier:"
+msgstr "Multiplicador:"
 
-#: src/statusicon/statusicon.cc:283
-msgid "Se_ttings ..."
+#: src/speedpitch/speed-pitch.cc:254
+msgid "Pitch"
 msgstr ""
 
-#: src/statusicon/statusicon.cc:372
+#: src/statusicon-qt/statusicon.cc:45 src/statusicon/statusicon.cc:47
+msgid "Status Icon"
+msgstr "Icona d'estat"
+
+#: src/statusicon-qt/statusicon.cc:68
 msgid ""
-"Status Icon Plugin\n"
+"Status Icon Plugin (partial port for Qt interface)\n"
 "\n"
 "Copyright 2005-2007 Giacomo Lozito <james@develia.org>\n"
 "Copyright 2010 Michał Lipski <tallica@o2.pl>\n"
+"Copyright 2015 Eugene Paskevich <eugene@raptor.kiev.ua>\n"
 "\n"
 "This plugin provides a status icon, placed in\n"
 "the system tray area of the window manager."
 msgstr ""
+"Connector d'icona d'estat (port parcial per a la interfície Qt)\n"
+"\n"
+"Drets d'autor 2005-2007 Giacomo Lozito <james@develia.org>\n"
+"Drets d'autor 2010 Michał Lipski <tallica@o2.pl>\n"
+"Drets d'autor 2015 Eugene Paskevich <eugene@raptor.kiev.ua>\n"
+"\n"
+"Aquest connector proporciona una icona d'estat, ubicada\n"
+"a la safata de sistema del gestor de finestres."
 
-#: src/statusicon/statusicon.cc:379
+#: src/statusicon-qt/statusicon.cc:89 src/statusicon/statusicon.cc:384
 msgid "Mouse Scroll Action"
-msgstr ""
+msgstr "Acció del desplaçament del ratolí"
 
-#: src/statusicon/statusicon.cc:380
+#: src/statusicon-qt/statusicon.cc:90 src/statusicon/statusicon.cc:385
 msgid "Change volume"
 msgstr "Canvia el volum"
 
-#: src/statusicon/statusicon.cc:383
+#: src/statusicon-qt/statusicon.cc:93 src/statusicon/statusicon.cc:388
 msgid "Change playing song"
 msgstr "Canvia la cançó"
 
-#: src/statusicon/statusicon.cc:386
+#: src/statusicon-qt/statusicon.cc:96 src/statusicon/statusicon.cc:391
 msgid "Other Settings"
-msgstr ""
+msgstr "Altres ajusts"
 
-#: src/statusicon/statusicon.cc:387
+#: src/statusicon-qt/statusicon.cc:97 src/statusicon/statusicon.cc:392
 msgid "Disable the popup window"
-msgstr "Desactiva la finestra emergent"
+msgstr "Inhabilita la finestra emergent"
 
-#: src/statusicon/statusicon.cc:389
+#: src/statusicon-qt/statusicon.cc:99 src/statusicon/statusicon.cc:394
 msgid "Close to the system tray"
-msgstr "Tanca a la safata del sistema"
+msgstr "A prop de la safata del sistema"
 
-#: src/statusicon/statusicon.cc:391
+#: src/statusicon-qt/statusicon.cc:101 src/statusicon/statusicon.cc:396
 msgid "Advance in playlist when scrolling upward"
+msgstr "Avança a la llista de reproducció quan es desplaça cap amunt"
+
+#: src/statusicon-qt/statusicon.cc:116 src/statusicon/statusicon.cc:287
+msgid "Se_ttings ..."
+msgstr "Ajus_ts..."
+
+#: src/statusicon/statusicon.cc:377
+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 ""
+"Connector d'icona d'estat\n"
+"\n"
+"Drets d'autor 2005-2007 Giacomo Lozito <james@develia.org>\n"
+"Drets d'autor 2010 Michał Lipski <tallica@o2.pl>\n"
+"\n"
+"Aquest connector proporciona una icona d'estat, ubicada\n"
+"a la safata de sistema del gestor de finestres."
 
 #: src/stereo_plugin/stereo.cc:19
 msgid "Extra Stereo"
-msgstr ""
+msgstr "Estèreo extra"
 
 #: src/stereo_plugin/stereo.cc:36
 msgid ""
@@ -3884,25 +4420,168 @@
 "\n"
 "By Johan Levin, 1999"
 msgstr ""
+"Connector d'estèreo extra\n"
+"\n"
+"Per Johan Levin, 1999"
 
 #: src/stereo_plugin/stereo.cc:44
 msgid "Extra Stereo"
+msgstr "Estèreo extra"
+
+#: src/streamtuner/icecast-model.cc:126 src/streamtuner/shoutcast-model.cc:131
+msgid "Type"
+msgstr ""
+
+#: src/streamtuner/icecast-model.cc:132
+msgid "Current Song"
+msgstr ""
+
+#: src/streamtuner/icecast-model.cc:164
+msgid "Other"
+msgstr ""
+
+#: src/streamtuner/ihr-model.cc:63
+msgid "Market"
+msgstr ""
+
+#: src/streamtuner/ihr-model.cc:156
+msgid "Call Letters"
+msgstr ""
+
+#: src/streamtuner/ihr-model.cc:162
+msgid "Description"
+msgstr "Descripció"
+
+#: src/streamtuner/shoutcast-model.cc:128
+msgid "Listeners"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:188
+msgid "Top 500 Stations"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:189
+msgid "Alternative"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:190
+msgid "Blues"
+msgstr "Blues"
+
+#: src/streamtuner/shoutcast-model.cc:191
+msgid "Classical"
+msgstr "Clàssica"
+
+#: src/streamtuner/shoutcast-model.cc:192
+msgid "Country"
+msgstr "Country"
+
+#: src/streamtuner/shoutcast-model.cc:193
+msgid "Decades"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:194
+msgid "Easy Listening"
+msgstr "Música lleugera"
+
+#: src/streamtuner/shoutcast-model.cc:195
+msgid "Electronic"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:196
+msgid "Folk"
+msgstr "Folk"
+
+#: src/streamtuner/shoutcast-model.cc:197
+msgid "Inspirational"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:198
+msgid "International"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:199
+msgid "Jazz"
+msgstr "Jazz"
+
+#: src/streamtuner/shoutcast-model.cc:200
+msgid "Latin"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:201
+msgid "Metal"
+msgstr "Metal"
+
+#: src/streamtuner/shoutcast-model.cc:203
+msgid "New Age"
+msgstr "New Age"
+
+#: src/streamtuner/shoutcast-model.cc:204
+msgid "Pop"
+msgstr "Pop"
+
+#: src/streamtuner/shoutcast-model.cc:205
+msgid "Public Radio"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:206
+msgid "R&B and Urban"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:207
+msgid "Rap"
+msgstr "Rap"
+
+#: src/streamtuner/shoutcast-model.cc:208
+msgid "Reggae"
+msgstr "Reggae"
+
+#: src/streamtuner/shoutcast-model.cc:209
+msgid "Rock"
+msgstr "Rock"
+
+#: src/streamtuner/shoutcast-model.cc:210
+msgid "Seasonal and Holiday"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:211
+msgid "Soundtracks"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:212
+msgid "Talk"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:213
+msgid "Themes"
+msgstr ""
+
+#: src/streamtuner/streamtuner.cc:59
+msgid "Shoutcast"
+msgstr ""
+
+#: src/streamtuner/streamtuner.cc:60
+msgid "Icecast"
+msgstr ""
+
+#: src/streamtuner/streamtuner.cc:71
+msgid "Stream Tuner"
 msgstr ""
 
 #: src/tonegen/tonegen.cc:45
 msgid "Tone Generator"
-msgstr ""
+msgstr "Generador de tons"
 
-#: src/tonegen/tonegen.cc:94
+#: src/tonegen/tonegen.cc:92
 #, c-format
 msgid "%s %.1f Hz"
 msgstr "%s %.1f Hz"
 
-#: src/tonegen/tonegen.cc:94
+#: src/tonegen/tonegen.cc:92
 msgid "Tone Generator: "
 msgstr "Generador de tons:"
 
-#: src/tonegen/tonegen.cc:160
+#: src/tonegen/tonegen.cc:161
 msgid ""
 "Sine tone generator by Håvard Kvålen <havardk@xmms.org>\n"
 "Modified by Daniel J. Peng <danielpeng@bigfoot.com>\n"
@@ -3910,12 +4589,39 @@
 "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 tons sinusoidals per Haavard Kvaalen <havardk@xmms.org>\n"
+"Modificat per Daniel J. Peng <danielpeng@bigfoot.com>\n"
+"\n"
+"Per a utilitzar-ho, afegiu un URL: tone://feqüència1;feqüència2;"
+"feqüència3;...\n"
+"p. ex. tone://2000;2005 per a reproduir un to de 2000 Hz i un to de 2005 Hz."
+
+#: src/ui-common/dialogs-qt.cc:40
+msgid ""
+"\n"
+"(Further messages have been hidden.)"
+msgstr ""
+"\n"
+"(Els missatges següents han estat amagats)"
+
+#: src/ui-common/dialogs-qt.cc:52
+msgid "Working ..."
+msgstr "S'està treballant..."
+
+#: src/ui-common/dialogs-qt.cc:73
+msgid "Information"
+msgstr "Informació"
+
+#: src/ui-common/menu-ops-gtk.cc:132 src/ui-common/menu-ops-qt.cc:113
+#, c-format
+msgid "%s does not appear to be a valid folder."
+msgstr ""
 
 #: src/voice_removal/voice_removal.cc:28
 msgid "Voice Removal"
-msgstr ""
+msgstr "Eliminació de la veu"
 
-#: src/vorbis/vorbis.cc:465
+#: src/vorbis/vorbis.cc:433
 msgid ""
 "Audacious Ogg Vorbis Decoder\n"
 "\n"
@@ -3935,17 +4641,34 @@
 "Gian-Carlo Pascutto <gcp@sjeng.org>\n"
 "Eugene Zagidullin <e.asphyx@gmail.com>"
 msgstr ""
+"Descodificador Ogg Vorbis d'Audacious\n"
+"\n"
+"Està basat en el connector Ogg Vorbis de la Fundació Xiph.org:\n"
+"http://www.xiph.org/\n"
+"\n"
+"Codi original per:\n"
+"Tony Arcieri <bascule@inferno.tusculum.edu>\n"
+"\n"
+"Contribucions 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.h:18
 msgid "Ogg Vorbis Decoder"
-msgstr ""
+msgstr "Descodificador Ogg Vorbis"
 
-#: src/vtx/info.cc:22
+#: src/vtx/info.cc:24
 #, c-format
 msgid "Details about %s"
-msgstr ""
+msgstr "Detalls quant a %s"
 
-#: src/vtx/info.cc:24
+#: src/vtx/info.cc:26
 msgid ""
 "Title: %t\n"
 "Author: %a\n"
@@ -3959,49 +4682,131 @@
 "Player Freq: %P\n"
 "Year: %y"
 msgstr ""
+"Títol: %t\n"
+"Autor: %a\n"
+"De: %f\n"
+"Tracker: %T\n"
+"Comentari: %C\n"
+"Tipus de xip: %c\n"
+"Estèreo: %s\n"
+"Bucle: %l\n"
+"Freq. del xip: %F\n"
+"Freq. del reproductor: %P\n"
+"Any: %y"
 
 #: src/vtx/vtx.cc:38
 msgid "VTX Decoder"
-msgstr ""
+msgstr "Descodificador VTX"
 
-#: src/vtx/vtx.cc:184
+#: src/vtx/vtx.cc:178
 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 del format de fitxer Vortex per Sashnov Alexander <sashnov@ngs."
+"ru>\n"
+"Està basat en in_vtx.dll per Roman Sherbakov <v_soft@microfor.ru>\n"
+"Connector d'Audacious per Pavel Vymetalek <pvymetalek@seznam.cz>"
 
-#: src/wavpack/wavpack.cc:24
-msgid "WavPack Decoder"
+#: src/vumeter-qt/vumeter_qt.cc:31
+msgid ""
+"VU Meter Plugin for Audacious\n"
+"Copyright 2017-2019 Marc Sánchez Fauste"
+msgstr ""
+"Connector de vúmetre per Audacious\n"
+"Drets d'autor 2017-2019 Marc Sánchez Fauste"
+
+#: src/vumeter-qt/vumeter_qt.cc:35
+msgid "VU Meter Settings"
+msgstr "Ajusts del vúmetre"
+
+#: src/vumeter-qt/vumeter_qt.cc:37
+msgid "Peak hold time:"
+msgstr "Temps que es manté el pic:"
+
+#: src/vumeter-qt/vumeter_qt.cc:42
+msgid "Fall-off time:"
+msgstr "Temps de caiguda:"
+
+#: src/vumeter-qt/vumeter_qt.cc:44
+msgid "dB/second"
+msgstr "dB/segon"
+
+#: src/vumeter-qt/vumeter_qt.cc:46
+msgid "Display legend"
+msgstr "Mostrar llegenda"
+
+#: src/vumeter-qt/vumeter_qt.h:37
+msgid "VU Meter"
+msgstr "Vúmetre"
+
+#: src/waveout/waveout.cc:43
+msgid "Win32 waveOut"
+msgstr "Win32 waveOut"
+
+#: src/waveout/waveout.cc:69
+msgid ""
+"Win32 waveOut Plugin for Audacious\n"
+"Copyright 2016 John Lindgren"
 msgstr ""
+"Connector Win32 waveOut per a Audacious\n"
+"Drets d'autor 2016 John Lindgren"
+
+#: src/wavpack/wavpack.cc:25
+msgid "WavPack Decoder"
+msgstr "Descodificador Wavpack"
 
-#: src/wavpack/wavpack.cc:211
+#: src/wavpack/wavpack.cc:217
 msgid "lossy (hybrid)"
 msgstr "amb pèrdues (híbrid)"
 
-#: src/wavpack/wavpack.cc:213
+#: src/wavpack/wavpack.cc:219
 msgid "lossy"
 msgstr "amb pèrdues"
 
-#: src/wavpack/wavpack.cc:255
+#: src/wavpack/wavpack.cc:259
 msgid ""
 "Copyright 2006 William Pitcock <nenolod@nenolod.net>\n"
 "\n"
 "Some of the plugin code was by Miles Egan."
 msgstr ""
+"Drets d'autor 2006 William Pitcock <nenolod@nenolod.net>\n"
+"\n"
+"Part del codi del connector va ser feta per Miles Egan."
 
-#: src/xsf/plugin.cc:50
+#: src/xsf/plugin.cc:74
 msgid "2SF Decoder"
+msgstr "Descodificador 2SF"
+
+#: src/xsf/plugin.cc:429
+msgid "32728 Hz"
+msgstr "32728 Hz"
+
+#: src/xsf/plugin.cc:432
+msgid "65456 Hz"
+msgstr "65456 Hz"
+
+#: src/xsf/plugin.cc:438
+msgid "Cosine"
 msgstr ""
 
-#: src/xsf/plugin.cc:238
+#: src/xsf/plugin.cc:439
+msgid "Sharp"
+msgstr ""
+
+#: src/xsf/plugin.cc:443
 msgid "XSF Configuration"
+msgstr " Configuració de XSF"
+
+#: src/xsf/plugin.cc:445
+msgid "Default fade time:"
 msgstr ""
 
-#: src/xsf/plugin.cc:239
-msgid "Ignore length from file"
+#: src/xsf/plugin.cc:447
+msgid "Interpolation mode:"
 msgstr ""
 
-#: src/xspf/xspf.cc:89
+#: src/xspf/xspf.cc:95
 msgid "XML Shareable Playlists (XSPF)"
-msgstr ""
+msgstr "XSPF (llistes de reproducció XML que es poden compartir)"

audacious-plugins-3.6.2-gtk3.tar.bz2/po/cmn.po -> audacious-plugins-4.4.1.tar.bz2/po/cmn.po Changed

@@ -8,11 +8,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Audacious Plugins\n"
-"Report-Msgid-Bugs-To: http://redmine.audacious-media-player.org/\n"
-"POT-Creation-Date: 2015-02-28 19:18+0100\n"
-"PO-Revision-Date: 2015-02-04 21:21+0000\n"
-"Last-Translator: Thomas Lange <thomas-lange2@gmx.de>\n"
-"Language-Team: Chinese (Mandarin) (http://www.transifex.com/projects/p/"
+"Report-Msgid-Bugs-To: https://github.com/audacious-media-player/audacious/"
+"issues\n"
+"POT-Creation-Date: 2024-09-26 21:54+0200\n"
+"PO-Revision-Date: 2011-10-10 17:43+0000\n"
+"Last-Translator: 趙惟倫 <bluebat@member.fsf.org>, 2013\n"
+"Language-Team: Chinese (Mandarin) (http://app.transifex.com/audacious/"
 "audacious/language/cmn/)\n"
 "Language: cmn\n"
 "MIME-Version: 1.0\n"
@@ -20,288 +21,60 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: src/aac-raw/aac.cc:18
+#: src/aac/aac.cc:19
 msgid "AAC (Raw) Decoder"
 msgstr ""
 
-#: src/adplug/adplug-xmms.cc:42
+#: src/adplug/adplug-xmms.cc:70
 msgid "AdPlug (AdLib Player)"
 msgstr "AdPlug (AdLib 播放器)"
 
-#: src/adplug/adplug-xmms.cc:156 src/modplug/modplugbmp.cc:335
-#: src/psf/plugin.cc:138 src/vtx/vtx.cc:87 src/xsf/plugin.cc:113
+#: src/adplug/adplug-xmms.cc:167 src/modplug/modplugbmp.cc:321
+#: src/psf/plugin.cc:161 src/vtx/vtx.cc:89 src/xsf/plugin.cc:204
 msgid "sequenced"
 msgstr "編曲機"
 
-#: src/alarm/alarm.cc:55 src/alarm/interface.cc:82
-msgid "Alarm"
-msgstr "鬧鐘"
-
-#: src/alarm/alarm.cc:782
-msgid "Set Alarm ..."
-msgstr ""
-
-#: src/alarm/alarm.cc:810
-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/interface.cc: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"
+#: src/adplug/adplug-xmms.cc:349 src/sid/xs_config.cc:61
+msgid "Output"
 msgstr ""
-"時間\n"
-" 鈴響於：\n"
-" 鬧鐘的觸發時間。\n"
-"\n"
-" 多久後靜音：\n"
-" 鈴響的時間長度。\n"
-" (若喚醒的對話視窗未被關閉)\n"
-"\n"
-"\n"
-"週排程\n"
-" 哪幾天：\n"
-" 選擇哪幾天要啟用鬧鐘。\n"
-"\n"
-" 時間：\n"
-" 選擇每天的鬧鐘時間，\n"
-" 或者勾選使用預設值。\n"
-"\n"
-"\n"
 
-#: src/alarm/interface.cc: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"
+#: src/adplug/adplug-xmms.cc:350
+msgid "OPL Emulator:"
 msgstr ""
-"音量\n"
-" 淡入：\n"
-" 在指定的時間內將音量\n"
-" 漸漸提升到指定的音量。\n"
-"\n"
-" 初始音量：\n"
-" 從此音量開始淡入。\n"
-"\n"
-" 最終音量：\n"
-" 音量淡入的終點。若淡\n"
-" 入的時間長為零則直\n"
-" 接使用此音量開始播放。\n"
-"\n"
-"\n"
-"選項：\n"
-" 額外的命令：\n"
-" 鬧鐘觸發時執行這個指令。\n"
-"\n"
 
-#: src/alarm/interface.cc: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."
+#: src/adplug/adplug-xmms.cc:353 src/amidiplug/i_configure.cc:153
+#: src/console/plugin.cc:45 src/filewriter/filewriter.cc:481
+#: src/sid/xs_config.cc:65 src/xsf/plugin.cc:446
+msgid "Sample rate:"
 msgstr ""
-" 播放列表：\n"
-" 載入該播放列表。若未指定\n"
-" 則會直接採用目前的列表。\n"
-" 您也可以在此輸入 mp3/ogg\n"
-" 串流的網址。\n"
-"\n"
-" 提醒：\n"
-" 當觸發鬧鐘時顯示提醒訊息。\n"
-" 若您希望它被顯示，請勾選並在欄\n"
-" 位中輸入訊息。"
-
-#: src/alarm/interface.cc:81
-msgid "This is your wakeup call."
-msgstr "這是您的喚醒。"
-
-#: src/alarm/interface.cc:99
-msgid "Your reminder for today is..."
-msgstr "您今天的提醒"
-
-#: src/alarm/interface.cc:101 src/alarm/interface.cc:386
-msgid "Reminder"
-msgstr "提醒"
-
-#: src/alarm/interface.cc:132
-msgid "Monday"
-msgstr "星期一"
-
-#: src/alarm/interface.cc:132
-msgid "Tuesday"
-msgstr "星期二"
-
-#: src/alarm/interface.cc:132
-msgid "Wednesday"
-msgstr "星期三"
-
-#: src/alarm/interface.cc:133
-msgid "Thursday"
-msgstr "星期四"
-
-#: src/alarm/interface.cc:133
-msgid "Friday"
-msgstr "星期五"
-
-#: src/alarm/interface.cc:133
-msgid "Saturday"
-msgstr "星期六"
-
-#: src/alarm/interface.cc:133
-msgid "Sunday"
-msgstr "星期日"
-
-#: src/alarm/interface.cc:171 src/alarm/interface.cc:230
-#: src/alarm/interface.cc:245
-msgid "Time"
-msgstr "時間"
-
-#: src/alarm/interface.cc:178
-msgid "Alarm at (default):"
-msgstr "鈴響於 (預設)"
-
-#: src/alarm/interface.cc:200
-msgid "h"
-msgstr "h"
-
-#: src/alarm/interface.cc:203
-msgid "Quiet after:"
-msgstr "多久後靜音："
-
-#: src/alarm/interface.cc:215
-msgid "hours"
-msgstr "小時"
-
-#: src/alarm/interface.cc:226
-msgid "minutes"
-msgstr "分鐘"
-
-#: src/alarm/interface.cc:235
-msgid "Choose the days for the alarm to come on"
-msgstr "選擇想要在哪幾天啟用鬧鐘"
 
-#: src/alarm/interface.cc:242
-msgid "Day"
-msgstr "哪幾天"
-
-#: src/alarm/interface.cc:259 src/bs2b/plugin.cc:130
-#: src/skins/preset-list.cc:434 src/skins/preset-list.cc:440
-msgid "Default"
-msgstr "預設"
-
-#: src/alarm/interface.cc:288
-msgid "Days"
-msgstr "週排程"
-
-#: src/alarm/interface.cc:297
-msgid "Fading"
-msgstr "淡出"
-
-#: src/alarm/interface.cc:305 src/console/plugin.cc:41
-#: src/crossfade/crossfade.cc:53 src/crossfade/crossfade.cc:59
-#: src/gtkui/settings.cc:49 src/lirc/lirc.cc:397 src/sid/xs_config.cc:85
-#: src/sid/xs_config.cc:94 src/sid/xs_config.cc:103
-msgid "seconds"
-msgstr "秒"
-
-#: src/alarm/interface.cc:312 src/alarm/interface.cc:353
-msgid "Volume"
-msgstr "音量"
-
-#: src/alarm/interface.cc:317
-msgid "Start at"
-msgstr "初始音量"
-
-#: src/alarm/interface.cc:333
-msgid "Final"
-msgstr "最終音量"
-
-#: src/alarm/interface.cc:346
-msgid "Current"
-msgstr "目前音量"
-
-#: src/alarm/interface.cc:359
-msgid "Additional Command"
-msgstr "額外命令"
+#: src/adplug/adplug-xmms.cc:354 src/amidiplug/i_configure.cc:155
+#: src/bs2b/plugin.cc:141 src/console/plugin.cc:47
+#: src/modplug/plugin_main.cc:77 src/resample/resample.cc:201
+#: src/resample/resample.cc:207 src/resample/resample.cc:211
+#: src/resample/resample.cc:215 src/resample/resample.cc:219
+#: src/resample/resample.cc:223 src/resample/resample.cc:227
+#: src/resample/resample.cc:231 src/resample/resample.cc:235
+#: src/resample/resample.cc:239 src/resample/resample.cc:243
+#: src/sid/xs_config.cc:67 src/soxr/sox-resampler.cc:205
+msgid "Hz"
+msgstr "Hz"
 
-#: src/alarm/interface.cc:365 src/alarm/interface.cc:391
-msgid "enable"
-msgstr "啟用"
+#: src/adplug/adplug-xmms.cc:355 src/gtkui/settings.cc:55
+#: src/modplug/plugin_main.cc:105 src/qtui/settings.cc:85
+#: src/skins-qt/skins_cfg.cc:302 src/skins/skins_cfg.cc:284
+msgid "Miscellaneous"
+msgstr "其他選項"
 
-#: src/alarm/interface.cc:372
-msgid "Playlist (optional)"
-msgstr "播放列表 (選用)"
-
-#: src/alarm/interface.cc:379
-msgid "Select a playlist"
-msgstr "請選擇播放列表"
-
-#: src/alarm/interface.cc:399
-msgid "Options"
-msgstr "選項"
-
-#: src/alarm/interface.cc:404
-msgid "What do these options mean?"
-msgstr "這些選項代表什麼意思？"
-
-#: src/alarm/interface.cc:420
-msgid "Help"
-msgstr "說明"
+#: src/adplug/adplug-xmms.cc:356
+msgid "Repeat song in endless loop"
+msgstr ""
 
-#: src/albumart/albumart.cc:31
+#: src/albumart/albumart.cc:31 src/albumart-qt/albumart.cc:35
 msgid "Album Art"
 msgstr "專輯封面"
 
-#: src/albumart-qt/albumart.cc:33
-msgid "Album Art (Qt)"
-msgstr ""
-
-#: src/alsa/alsa.h:70
+#: src/alsa/alsa.h:64
 msgid "ALSA Output"
 msgstr "ALSA 輸出"
 
@@ -343,11 +116,11 @@
 msgid "Mixer element:"
 msgstr "混音器元件："
 
-#: src/amidi-plug/amidi-plug.cc:41
+#: src/amidiplug/amidi-plug.cc:42
 msgid "AMIDI-Plug (MIDI Player)"
 msgstr "AMIDI-Plug (MIDI 播放器)"
 
-#: src/amidi-plug/amidi-plug.cc:437
+#: src/amidiplug/amidi-plug.cc:445
 msgid ""
 "AMIDI-Plug\n"
 "modular MIDI music player\n"
@@ -370,157 +143,156 @@
 "for the good help with alpha testing"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:94
+#: src/amidiplug/i_configure.cc:94
 msgid "Override default gain:"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:102
+#: src/amidiplug/i_configure.cc:102
 msgid "Override default polyphony:"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:110
+#: src/amidiplug/i_configure.cc:110
 msgid "Override default reverb:"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:112 src/amidi-plug/i_configure.cc:120
+#: src/amidiplug/i_configure.cc:112 src/amidiplug/i_configure.cc:120
 msgid "On"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:118
+#: src/amidiplug/i_configure.cc:118
 msgid "Override default chorus:"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:128 src/console/plugin.cc:29
+#: src/amidiplug/i_configure.cc:128 src/console/plugin.cc:29
 msgid "Playback"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:129
+#: src/amidiplug/i_configure.cc:129
 msgid "Transpose:"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:131
+#: src/amidiplug/i_configure.cc:131 src/speedpitch/speed-pitch.cc:257
 msgid "semitones"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:132
+#: src/amidiplug/i_configure.cc:132
 msgid "Drum shift:"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:134
+#: src/amidiplug/i_configure.cc:134
 msgid "note numbers"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:135
+#: src/amidiplug/i_configure.cc:135
 msgid "Skip leading silence"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:137
+#: src/amidiplug/i_configure.cc:137
 msgid "Skip trailing silence"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:141
+#: src/amidiplug/i_configure.cc:141
 msgid "SoundFont"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:143
+#: src/amidiplug/i_configure.cc:148
 msgid "Synthesizer"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:148 src/console/plugin.cc:45
-#: src/sid/xs_config.cc:65
-msgid "Sample rate:"
-msgstr ""
-
-#: src/amidi-plug/i_configure.cc:150 src/bs2b/plugin.cc:141
-#: src/console/plugin.cc:47 src/modplug/plugin_main.cc:78
-#: src/resample/resample.cc:201 src/resample/resample.cc:207
-#: src/resample/resample.cc:211 src/resample/resample.cc:215
-#: src/resample/resample.cc:219 src/resample/resample.cc:223
-#: src/resample/resample.cc:227 src/resample/resample.cc:231
-#: src/resample/resample.cc:235 src/resample/resample.cc:239
-#: src/resample/resample.cc:243 src/sid/xs_config.cc:67
-#: src/sox-resampler/sox-resampler.cc:163
-msgid "Hz"
-msgstr "Hz"
-
-#: src/amidi-plug/i_configure-fluidsynth.cc:52
+#: src/amidiplug/i_configure-fluidsynth.cc:58
+#: src/amidiplug/i_configure-fluidsynth.cc:527
 msgid "AMIDI-Plug - select SoundFont file"
 msgstr "AMIDI-Plug - 選擇 SoundFont 檔案"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:55 src/filewriter/mp3.cc:658
+#: src/amidiplug/i_configure-fluidsynth.cc:61
 msgid "_Cancel"
 msgstr ""
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:56
+#: src/amidiplug/i_configure-fluidsynth.cc:62
 msgid "_Open"
 msgstr ""
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:225 src/gtkui/columns.cc:46
+#: src/amidiplug/i_configure-fluidsynth.cc:233
+#: src/amidiplug/i_configure-fluidsynth.cc:461
 msgid "File name"
 msgstr "檔案名稱"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:229
+#: src/amidiplug/i_configure-fluidsynth.cc:237
+#: src/amidiplug/i_configure-fluidsynth.cc:464
 msgid "Size (bytes)"
 msgstr "大小 (位元組)"
 
-#: src/amidi-plug/i_fileinfo.cc:163
+#: src/amidiplug/i_fileinfo.cc:184
 msgid "Name:"
 msgstr "名稱："
 
-#: src/amidi-plug/i_fileinfo.cc:181
+#: src/amidiplug/i_fileinfo.cc:202
 msgid " MIDI Info "
 msgstr " MIDI 資訊 "
 
-#: src/amidi-plug/i_fileinfo.cc:195
+#: src/amidiplug/i_fileinfo.cc:216
 msgid "Format:"
 msgstr "格式："
 
-#: src/amidi-plug/i_fileinfo.cc:198
+#: src/amidiplug/i_fileinfo.cc:219
 msgid "Length (msec):"
 msgstr "長度 (毫秒)："
 
-#: src/amidi-plug/i_fileinfo.cc:201
+#: src/amidiplug/i_fileinfo.cc:222
 msgid "No. of Tracks:"
 msgstr "音軌編號："
 
-#: src/amidi-plug/i_fileinfo.cc:207
+#: src/amidiplug/i_fileinfo.cc:228
 msgid "variable"
 msgstr "變動的"
 
-#: src/amidi-plug/i_fileinfo.cc:209
+#: src/amidiplug/i_fileinfo.cc:230
 msgid "BPM:"
 msgstr "BPM："
 
-#: src/amidi-plug/i_fileinfo.cc:217
+#: src/amidiplug/i_fileinfo.cc:238
 msgid "BPM (wavg):"
 msgstr "BPM (wavg)："
 
-#: src/amidi-plug/i_fileinfo.cc:220
+#: src/amidiplug/i_fileinfo.cc:241
 msgid "Time Div:"
 msgstr "時間分割："
 
-#: src/amidi-plug/i_fileinfo.cc:231
+#: src/amidiplug/i_fileinfo.cc:252
 msgid " MIDI Comments and Lyrics "
 msgstr " MIDI 備註與歌詞 "
 
-#: src/amidi-plug/i_fileinfo.cc:278
+#: src/amidiplug/i_fileinfo.cc:299
 msgid "* no comments available in this MIDI file *"
 msgstr "* 這個 MIDI 檔不包含備註資料 *"
 
-#: src/amidi-plug/i_fileinfo.cc:290
+#: src/amidiplug/i_fileinfo.cc:311
 msgid "* no lyrics available in this MIDI file *"
 msgstr "* 這個 MIDI 檔不包含歌詞資料 *"
 
-#: src/amidi-plug/i_fileinfo.cc:300 src/filewriter/vorbis.cc:197
-#: src/ladspa/plugin.cc:416
+#: src/amidiplug/i_fileinfo.cc:321 src/ladspa/plugin.cc:418
+#: src/ui-common/dialogs-qt.cc:32
 msgid "_Close"
 msgstr "關閉(_C)"
 
-#: src/amidi-plug/i_fileinfo.cc:325
+#: src/amidiplug/i_fileinfo.cc:346
 msgid " (invalid UTF-8)"
 msgstr " (無效的 UTF-8 字串)"
 
-#: src/aosd/aosd.cc:32
+#: src/ampache/ampache.cc:33
+msgid "Ampache Browser"
+msgstr ""
+
+#: src/ampache/ampache.cc:46
+msgid ""
+"Ampache Browser for Audacious\n"
+"http://ampache-browser.org/\n"
+"\n"
+"Copyright (C) Róbert Čerňanský and John Lindgren\n"
+"License: GNU GPLv3"
+msgstr ""
+
+#: src/aosd/aosd.cc:31
 msgid ""
 "Audacious OSD\n"
 "http://www.develia.org/projects.php?p=audacious#aosd\n"
@@ -547,130 +319,130 @@
 msgid "Concave Rectangle"
 msgstr "角落凹陷的矩形"
 
-#: src/aosd/aosd_style.cc:69
+#: src/aosd/aosd_style.cc:69 src/openmpt/mptwrap.h:50 src/xsf/plugin.cc:436
 msgid "None"
 msgstr "無"
 
-#: src/aosd/aosd_trigger.cc:50
+#: src/aosd/aosd_trigger.cc:49
 msgid "Playback Start"
 msgstr "開始播放"
 
-#: src/aosd/aosd_trigger.cc:51
+#: src/aosd/aosd_trigger.cc:50
 msgid "Triggers OSD when a playlist entry is played."
 msgstr "當播放列表中的項目被播放時觸發 OSD"
 
-#: src/aosd/aosd_trigger.cc:56
+#: src/aosd/aosd_trigger.cc:55
 msgid "Title Change"
 msgstr "標題變更"
 
-#: src/aosd/aosd_trigger.cc:57
+#: src/aosd/aosd_trigger.cc:56
 msgid "Triggers OSD when the song title changes (for internet streams)."
 msgstr ""
 
-#: src/aosd/aosd_trigger.cc:62
+#: src/aosd/aosd_trigger.cc:61
 msgid "Pause On"
 msgstr "暫停播放"
 
-#: src/aosd/aosd_trigger.cc:63
+#: src/aosd/aosd_trigger.cc:62
 msgid "Triggers OSD when playback is paused."
 msgstr "當播放暫停時觸發 OSD"
 
-#: src/aosd/aosd_trigger.cc:68
+#: src/aosd/aosd_trigger.cc:67
 msgid "Pause Off"
 msgstr "解除暫停"
 
-#: src/aosd/aosd_trigger.cc:69
+#: src/aosd/aosd_trigger.cc:68
 msgid "Triggers OSD when playback is unpaused."
 msgstr "當解除暫停時觸發 OSD"
 
-#: src/aosd/aosd_ui.cc:163
+#: src/aosd/aosd_ui.cc:204
 msgid "Placement"
 msgstr "放置位置"
 
-#: src/aosd/aosd_ui.cc:196
+#: src/aosd/aosd_ui.cc:241
 msgid "Relative X offset:"
 msgstr "X 軸相對位移："
 
-#: src/aosd/aosd_ui.cc:203
+#: src/aosd/aosd_ui.cc:245
 msgid "Relative Y offset:"
 msgstr "Y 軸相對位移："
 
-#: src/aosd/aosd_ui.cc:210
+#: src/aosd/aosd_ui.cc:249
 msgid "Max OSD width:"
 msgstr "最大 OSD 寬度："
 
-#: src/aosd/aosd_ui.cc:221
+#: src/aosd/aosd_ui.cc:281
 msgid "Multi-Monitor options"
 msgstr "多螢幕選項"
 
-#: src/aosd/aosd_ui.cc:225
+#: src/aosd/aosd_ui.cc:285
 msgid "Display OSD using:"
 msgstr "顯示 OSD："
 
-#: src/aosd/aosd_ui.cc:227
+#: src/aosd/aosd_ui.cc:287
 msgid "all monitors"
 msgstr "所有螢幕"
 
-#: src/aosd/aosd_ui.cc:230
+#: src/aosd/aosd_ui.cc:290
 #, c-format
 msgid "monitor %i"
 msgstr "螢幕 %i"
 
-#: src/aosd/aosd_ui.cc:282
+#: src/aosd/aosd_ui.cc:342
 msgid "Timing (ms)"
 msgstr "計時 (毫秒)"
 
-#: src/aosd/aosd_ui.cc:287
+#: src/aosd/aosd_ui.cc:347
 msgid "Display:"
 msgstr "顯示："
 
-#: src/aosd/aosd_ui.cc:292
+#: src/aosd/aosd_ui.cc:352
 msgid "Fade in:"
 msgstr "淡入："
 
-#: src/aosd/aosd_ui.cc:297
+#: src/aosd/aosd_ui.cc:357
 msgid "Fade out:"
 msgstr "淡出："
 
-#: src/aosd/aosd_ui.cc:361
+#: src/aosd/aosd_ui.cc:442
 msgid "Fonts"
 msgstr "字型"
 
-#: src/aosd/aosd_ui.cc:368
+#: src/aosd/aosd_ui.cc:449
 #, c-format
 msgid "Font %i:"
 msgstr "字型 %i："
 
-#: src/aosd/aosd_ui.cc:382
+#: src/aosd/aosd_ui.cc:466
 msgid "Shadow"
 msgstr "陰影"
 
-#: src/aosd/aosd_ui.cc:486
+#: src/aosd/aosd_ui.cc:589
 msgid "Render Style"
 msgstr "呈現樣式"
 
-#: src/aosd/aosd_ui.cc:502
+#: src/aosd/aosd_ui.cc:605
 msgid "Colors"
 msgstr "顏色"
 
-#: src/aosd/aosd_ui.cc:513
+#: src/aosd/aosd_ui.cc:616
 #, c-format
 msgid "Color %i:"
 msgstr "顏色 %i："
 
-#: src/aosd/aosd_ui.cc:600
+#: src/aosd/aosd_ui.cc:714
 msgid "Enable trigger"
 msgstr "啟用觸發器"
 
-#: src/aosd/aosd_ui.cc:627
+#: src/aosd/aosd_ui.cc:741
 msgid "Event"
 msgstr "事件"
 
-#: src/aosd/aosd_ui.cc:655
+#: src/aosd/aosd_ui.cc:768
 msgid "Composite manager detected"
 msgstr "已偵測到合成特效管理程式"
 
-#: src/aosd/aosd_ui.cc:662
+#: src/aosd/aosd_ui.cc:775
 msgid ""
 "Composite manager not detected;\n"
 "unless you know that you have one running, please activate a composite "
@@ -679,62 +451,58 @@
 "未偵測到合成特效管理程式；\n"
 "除非您確定已經執行，否則 OSD 將無法正確啟用。"
 
-#: src/aosd/aosd_ui.cc:670
+#: src/aosd/aosd_ui.cc:783
 msgid "Composite manager not required for fake transparency"
 msgstr "假的透明特效不需要 Composite manager"
 
-#: src/aosd/aosd_ui.cc:706
+#: src/aosd/aosd_ui.cc:820
 msgid "Transparency"
 msgstr "透明"
 
-#: src/aosd/aosd_ui.cc:712
+#: src/aosd/aosd_ui.cc:826
 msgid "Fake transparency"
 msgstr "假的透明特效"
 
-#: src/aosd/aosd_ui.cc:714
+#: src/aosd/aosd_ui.cc:828
 msgid "Real transparency (requires X Composite Ext.)"
 msgstr "真的透明特效 (需要 X Composite 延伸功能)"
 
-#: src/aosd/aosd_ui.cc:756
+#: src/aosd/aosd_ui.cc:875
 msgid "Composite extension not loaded"
 msgstr "Composite 延伸功能未載入"
 
-#: src/aosd/aosd_ui.cc:764
-msgid "Composite extension not available"
-msgstr "Composite 延伸功能不存在"
-
-#: src/aosd/aosd_ui.cc:781
+#: src/aosd/aosd_ui.cc:892
 #, c-format
 msgid "Audacious OSD"
 msgstr "Audacious OSD"
 
-#: src/aosd/aosd_ui.cc:844
+#: src/aosd/aosd_ui.cc:955
 msgid "Position"
 msgstr "位置"
 
-#: src/aosd/aosd_ui.cc:849
+#: src/aosd/aosd_ui.cc:960
 msgid "Animation"
 msgstr "動畫"
 
-#: src/aosd/aosd_ui.cc:854
+#: src/aosd/aosd_ui.cc:965
 msgid "Text"
 msgstr "文字"
 
-#: src/aosd/aosd_ui.cc:859
+#: src/aosd/aosd_ui.cc:970
 msgid "Decoration"
 msgstr "裝飾"
 
-#: src/aosd/aosd_ui.cc:864
+#: src/aosd/aosd_ui.cc:975
 msgid "Trigger"
 msgstr "觸發"
 
-#: src/aosd/aosd_ui.cc:869
+#: src/aosd/aosd_ui.cc:980 src/streamtuner/shoutcast-model.cc:202
 msgid "Misc"
 msgstr "雜項"
 
-#: src/aosd/aosd_ui.cc:878
+#: src/aosd/aosd_ui.cc:989
 msgid "Test"
-msgstr ""
+msgstr "測試"
 
 #: src/asx3/asx3.cc:35
 msgid "ASXv3 Playlists"
@@ -748,11 +516,83 @@
 msgid "Audacious Playlists (audpl)"
 msgstr "Audacious 播放列表 (audpl)"
 
-#: src/blur_scope/blur_scope.cc:42
+#: src/background_music/background_music.cc:24
+msgid "Background music"
+msgstr ""
+
+#: src/background_music/background_music.cc:25
+msgid "Target level:"
+msgstr ""
+
+#: src/background_music/background_music.cc:28
+#: src/background_music/background_music.cc:33
+#: src/silence-removal/silence-removal.cc:70
+msgid "dB"
+msgstr "分貝"
+
+#: src/background_music/background_music.cc:29
+msgid "Maximum amplification:"
+msgstr ""
+
+#: src/background_music/background_music.cc:34 src/mpg123/mpg123.cc:81
+msgid "Advanced"
+msgstr ""
+
+#: src/background_music/background_music.cc:36
+msgid "Slow detection weight:"
+msgstr ""
+
+#: src/background_music/background_music.cc:39
+msgid "Hint"
+msgstr ""
+
+#: src/background_music/background_music.cc:41
+msgid ""
+"Slow detection weight is the relative weight\n"
+"of a long term average detection when compared\n"
+"to the actual, faster loudness detection.\n"
+"A value of zero gives a more radio-like sound\n"
+"where soft passages get \"pulled up\" more quickly,\n"
+"a value of two makes the sound feel less compressed."
+msgstr ""
+
+#: src/background_music/background_music.cc:52
+msgid ""
+"Background Music Plugin for Audacious\n"
+"Copyright 2023;2024 Michel Fleur\n"
+"\n"
+"Controls the volume to make the sound equally loud within and between "
+"tracks.\n"
+" It uses accurate loudness measurement and tries to make the volume changes "
+"sound natural without audible peaks, yet without lowering the volume before "
+"a peak in advance."
+msgstr ""
+
+#: src/background_music/background_music.cc:61
+msgid "Background Music"
+msgstr ""
+
+#: src/bitcrusher/bitcrusher.cc:33
+msgid "Bitcrusher"
+msgstr ""
+
+#: src/bitcrusher/bitcrusher.cc:34
+msgid "Bit Depth:"
+msgstr ""
+
+#: src/bitcrusher/bitcrusher.cc:37
+msgid "Downsample ratio:"
+msgstr ""
+
+#: src/bitcrusher/bitcrusher.cc:48
+msgid "Bitcrusher"
+msgstr ""
+
+#: src/blur_scope/blur_scope.cc:40 src/blur_scope-qt/blur_scope.cc:45
 msgid "Color"
 msgstr "色彩"
 
-#: src/blur_scope/blur_scope.cc:58
+#: src/blur_scope/blur_scope.cc:56 src/blur_scope-qt/blur_scope.cc:158
 msgid "Blur Scope"
 msgstr "模糊波形"
 
@@ -764,6 +604,10 @@
 msgid "Presets:"
 msgstr "樣式"
 
+#: src/bs2b/plugin.cc:130
+msgid "Default"
+msgstr "預設"
+
 #: src/bs2b/plugin.cc:136
 msgid "Feed level:"
 msgstr "饋送等級："
@@ -776,15 +620,15 @@
 msgid "Cut frequency:"
 msgstr "截斷頻率："
 
-#: src/cairo-spectrum/cairo-spectrum.cc:41
+#: src/cairo-spectrum/cairo-spectrum.cc:42 src/qt-spectrum/qt-spectrum.cc:107
 msgid "Spectrum Analyzer"
 msgstr "頻譜分析儀"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:72
+#: src/cdaudio/cdaudio-ng.cc:74
 msgid "Audio CD Plugin"
 msgstr "音樂 CD 外掛程式"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:121
+#: src/cdaudio/cdaudio-ng.cc:121
 msgid ""
 "Copyright (C) 2007-2012 Calin Crisan <ccrisan@gmail.com> and others.\n"
 "\n"
@@ -804,132 +648,132 @@
 "\n"
 "這是 Google Summer of Code 2007 專案之一。"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:137
+#: src/cdaudio/cdaudio-ng.cc:140
 msgid "Device"
 msgstr "裝置"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:138
+#: src/cdaudio/cdaudio-ng.cc:141
 msgid "Read speed:"
 msgstr "讀取速度："
 
-#: src/cdaudio-ng/cdaudio-ng.cc:141
+#: src/cdaudio/cdaudio-ng.cc:144
 msgid "Override device:"
 msgstr "覆載裝置："
 
-#: src/cdaudio-ng/cdaudio-ng.cc:143
+#: src/cdaudio/cdaudio-ng.cc:146
 msgid "Metadata"
 msgstr "詮釋資料"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:144
+#: src/cdaudio/cdaudio-ng.cc:147
 msgid "Use CD-Text"
 msgstr "使用 CD-Text"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:146
+#: src/cdaudio/cdaudio-ng.cc:150
 msgid "Use CDDB"
 msgstr "使用 CDDB"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:148
+#: src/cdaudio/cdaudio-ng.cc:152
 msgid "Use HTTP instead of CDDBP"
 msgstr "使用 HTTP 而非 CDDBP"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:151
+#: src/cdaudio/cdaudio-ng.cc:155
 msgid "Server:"
 msgstr "伺服器："
 
-#: src/cdaudio-ng/cdaudio-ng.cc:155
+#: src/cdaudio/cdaudio-ng.cc:159
 msgid "Path:"
 msgstr "路徑："
 
-#: src/cdaudio-ng/cdaudio-ng.cc:159
+#: src/cdaudio/cdaudio-ng.cc:163
 msgid "Port:"
 msgstr "通訊埠："
 
-#: src/cdaudio-ng/cdaudio-ng.cc:246
+#: src/cdaudio/cdaudio-ng.cc:228
 msgid "Failed to initialize cdio subsystem."
 msgstr "無法初始化 cdio 子系統。"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:281
+#: src/cdaudio/cdaudio-ng.cc:260
 #, c-format
 msgid "Invalid URI %s."
 msgstr "無效的 URI %s。"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:283
+#: src/cdaudio/cdaudio-ng.cc:262
 #, c-format
 msgid "Track %d not found."
 msgstr "找不到音軌 %d。"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:285
+#: src/cdaudio/cdaudio-ng.cc:264
 #, c-format
 msgid "Track %d is a data track."
 msgstr "軌道 %d 是資料軌。"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:360
+#: src/cdaudio/cdaudio-ng.cc:339
 msgid "Error reading audio CD."
 msgstr "讀取音樂 CD 時發生錯誤。"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:429
+#: src/cdaudio/cdaudio-ng.cc:410
 msgid "Audio CD"
 msgstr "音樂 CD"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:460 src/cdaudio-ng/cdaudio-ng.cc:469
+#: src/cdaudio/cdaudio-ng.cc:446 src/cdaudio/cdaudio-ng.cc:455
 #, c-format
 msgid "Failed to open CD device %s."
 msgstr "無法開啟 CD 裝置 %s。"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:472
+#: src/cdaudio/cdaudio-ng.cc:458
 msgid "No audio capable CD drive found."
 msgstr "找不到可以播放音訊的光碟機。"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:497
+#: src/cdaudio/cdaudio-ng.cc:481
+msgid "Drive is empty."
+msgstr "光碟機是空的。"
+
+#: src/cdaudio/cdaudio-ng.cc:483
+msgid "Unsupported disk type."
+msgstr "未支援的光碟類型"
+
+#: src/cdaudio/cdaudio-ng.cc:507
 msgid "Failed to finish initializing opened CD drive."
 msgstr "開啟的光碟機無法完成初始化。"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:510
+#: src/cdaudio/cdaudio-ng.cc:520
 msgid "Failed to retrieve first/last track number."
 msgstr "無法取得第一個或最後的音軌編號。"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:531
+#: src/cdaudio/cdaudio-ng.cc:541
 #, c-format
 msgid "Cannot read start/end LSN for track %d."
 msgstr "無法讀取音軌 %d 的起始／結束邏輯磁區編號。"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:613
-msgid "Failed to create the cddb connection."
-msgstr "無法建立 cddb 的連線。"
+#: src/cdaudio/cdaudio-ng.cc:624
+msgid "Failed to create the CDDB connection."
+msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:679
+#: src/cdaudio/cdaudio-ng.cc:690
 msgid "Failed to query the CDDB server"
 msgstr "無法查詢 CDDB 伺服器"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:681
+#: src/cdaudio/cdaudio-ng.cc:692
 #, c-format
 msgid "Failed to query the CDDB server: %s"
 msgstr "無法查詢 CDDB 伺服器：%s"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:705
+#: src/cdaudio/cdaudio-ng.cc:716
 #, c-format
-msgid "Failed to read the cddb info: %s"
-msgstr "無法讀取 cddb 資訊：%s"
-
-#: src/cdaudio-ng/cdaudio-ng.cc:765
-msgid "Drive is empty."
-msgstr "光碟機是空的。"
-
-#: src/cdaudio-ng/cdaudio-ng.cc:767
-msgid "Unsupported disk type."
-msgstr "未支援的光碟類型"
+msgid "Failed to read the CDDB info: %s"
+msgstr ""
 
-#: src/cd-menu-items/cd-menu-items.cc:35
+#: src/cd-menu-items/cd-menu-items.cc:33
 msgid "Audio CD Menu Items"
 msgstr "音樂 CD 選單項目"
 
-#: src/cd-menu-items/cd-menu-items.cc:47
-msgid "Play CD"
-msgstr "播放 CD"
-
-#: src/cd-menu-items/cd-menu-items.cc:47
-msgid "Add CD"
-msgstr "加入 CD"
+#: src/cd-menu-items/cd-menu-items.cc:45
+msgid "Pla_y CD"
+msgstr ""
+
+#: src/cd-menu-items/cd-menu-items.cc:45
+msgid "_Add CD"
+msgstr ""
 
 #: src/compressor/compressor.cc:45
 msgid "Compression"
@@ -985,7 +829,14 @@
 msgid "Default song length:"
 msgstr "預設歌曲長度："
 
-#: src/console/plugin.cc:42 src/modplug/plugin_main.cc:59
+#: src/console/plugin.cc:41 src/crossfade/crossfade.cc:56
+#: src/crossfade/crossfade.cc:62 src/lirc/lirc.cc:395 src/notify/notify.cc:113
+#: src/sid/xs_config.cc:85 src/sid/xs_config.cc:94 src/sid/xs_config.cc:103
+#: src/vumeter-qt/vumeter_qt.cc:39
+msgid "seconds"
+msgstr "秒"
+
+#: src/console/plugin.cc:42 src/modplug/plugin_main.cc:58
 msgid "Resampling"
 msgstr "重取樣"
 
@@ -1009,76 +860,82 @@
 msgid "Game Console Music Decoder"
 msgstr "遊戲主機音樂解碼器"
 
-#: src/coreaudio/coreaudio.cc:50
+#: src/coreaudio/coreaudio.cc:53
 msgid "CoreAudio output"
 msgstr ""
 
-#: src/coreaudio/coreaudio.cc:131
+#: src/coreaudio/coreaudio.cc:155
 msgid ""
 "CoreAudio Output Plugin for Audacious\n"
 "Copyright 2014 William Pitcock\n"
+"Copyright 2017,18 René J.V. Bertin\n"
+" (original code and code adapted from\n"
+" Apple examples, (C) Apple 2013)\n"
 "\n"
 "Based on SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
 msgstr ""
 
-#: src/coreaudio/coreaudio.cc:143
+#: src/coreaudio/coreaudio.cc:171
 msgid "Use exclusive mode"
 msgstr ""
 
-#: src/crossfade/crossfade.cc:44
+#: src/coreaudio/coreaudio.cc:173
+msgid "Use bit perfect audio (adapt device sampling rate)"
+msgstr ""
+
+#: src/crossfade/crossfade.cc:47
 msgid ""
 "Crossfade Plugin for Audacious\n"
 "Copyright 2010-2014 John Lindgren"
 msgstr ""
 
-#: src/crossfade/crossfade.cc:48
+#: src/crossfade/crossfade.cc:51
 msgid "Crossfade"
 msgstr "淡入淡出"
 
-#: src/crossfade/crossfade.cc:49
+#: src/crossfade/crossfade.cc:52
 msgid "On automatic song change"
 msgstr ""
 
-#: src/crossfade/crossfade.cc:51 src/crossfade/crossfade.cc:57
+#: src/crossfade/crossfade.cc:54 src/crossfade/crossfade.cc:60
 msgid "Overlap:"
 msgstr "重疊："
 
-#: src/crossfade/crossfade.cc:55
+#: src/crossfade/crossfade.cc:58
 msgid "On seek or manual song change"
 msgstr ""
 
-#: src/crossfade/crossfade.cc:61
+#: src/crossfade/crossfade.cc:64
+msgid "No fade in"
+msgstr ""
+
+#: src/crossfade/crossfade.cc:66
+msgid "Use S-curve fade"
+msgstr ""
+
+#: src/crossfade/crossfade.cc:68
+msgid "S-curve steepness:"
+msgstr ""
+
+#: src/crossfade/crossfade.cc:70
+msgid "(higher is steeper)"
+msgstr ""
+
+#: src/crossfade/crossfade.cc:72
 msgid "Tip"
 msgstr ""
 
-#: src/crossfade/crossfade.cc:62
+#: src/crossfade/crossfade.cc:73
 msgid ""
 "For better crossfading, enable\n"
 "the Silence Removal effect."
 msgstr ""
 
-#: src/crossfade/crossfade.cc:72
+#: src/crossfade/crossfade.cc:83
 msgid "Crossfade"
 msgstr "淡入淡出"
 
-#: src/crossfade/crossfade.cc:161
-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.cc:168
-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/crystalizer/crystalizer.cc:31
 msgid "Crystalizer"
 msgstr "Crystalizer"
@@ -1091,60 +948,61 @@
 msgid "Crystalizer"
 msgstr "Crystalizer"
 
-#: src/cue/cue.cc:37
+#: src/cue/cue.cc:42
 msgid "Cue Sheet Plugin"
 msgstr "Cue Sheet 外掛程式"
 
-#: src/delete-files/delete-files.cc:46 src/delete-files/delete-files.cc:146
+#: src/delete-files/delete-files.cc:53 src/delete-files/delete-files.cc:215
+#: src/delete-files/delete-files.cc:230
 msgid "Delete Files"
 msgstr ""
 
-#: src/delete-files/delete-files.cc:75
-#, c-format
-msgid "Error moving %s to trash: %s."
+#: src/delete-files/delete-files.cc:120
+msgid "No files are selected."
 msgstr ""
 
-#: src/delete-files/delete-files.cc:86
+#: src/delete-files/delete-files.cc:125
 #, c-format
-msgid "Error deleting %s: %s."
+msgid "Do you want to move %s to the trash?"
 msgstr ""
 
-#: src/delete-files/delete-files.cc:117
+#: src/delete-files/delete-files.cc:126
 #, c-format
-msgid "Error deleting %s: not a local file."
+msgid "Do you want to permanently delete %s?"
 msgstr ""
 
-#: src/delete-files/delete-files.cc:134
-msgid "Do you want to move the selected files to the trash?"
+#: src/delete-files/delete-files.cc:133
+#, c-format
+msgid "Do you want to move %d files to the trash?"
 msgstr ""
 
-#: src/delete-files/delete-files.cc:135
-msgid "Move to Trash"
+#: src/delete-files/delete-files.cc:134
+#, c-format
+msgid "Do you want to permanently delete %d files?"
 msgstr ""
 
-#: src/delete-files/delete-files.cc:140
-msgid "Do you want to permanently delete the selected files?"
+#: src/delete-files/delete-files.cc:146
+msgid "Move to trash"
 msgstr ""
 
-#: src/delete-files/delete-files.cc:141 src/skins/preset-list.cc:411
-#: src/skins/preset-list.cc:427
+#: src/delete-files/delete-files.cc:146
 msgid "Delete"
 msgstr "刪除"
 
-#: src/delete-files/delete-files.cc:145 src/skins/preset-browser.cc:56
-#: src/skins/preset-list.cc:307 src/skins/ui_playlist.cc:221
+#: src/delete-files/delete-files.cc:213 src/delete-files/delete-files.cc:235
+#: src/skins-qt/search-select.cc:102 src/skins/search-select.cc:78
 msgid "Cancel"
 msgstr "取消"
 
-#: src/delete-files/delete-files.cc:166
+#: src/delete-files/delete-files.cc:267
 msgid "Delete Selected Files"
 msgstr ""
 
-#: src/delete-files/delete-files.cc:181
+#: src/delete-files/delete-files.cc:287
 msgid "Delete Method"
 msgstr ""
 
-#: src/delete-files/delete-files.cc:182
+#: src/delete-files/delete-files.cc:288
 msgid "Move to trash instead of deleting immediately"
 msgstr ""
 
@@ -1160,13 +1018,13 @@
 msgid "Echo"
 msgstr "回音"
 
-#: src/echo_plugin/echo.cc:22 src/modplug/plugin_main.cc:73
-#: src/modplug/plugin_main.cc:83
+#: src/echo_plugin/echo.cc:22 src/modplug/plugin_main.cc:72
+#: src/modplug/plugin_main.cc:82
 msgid "Delay:"
 msgstr "延遲："
 
-#: src/echo_plugin/echo.cc:24 src/modplug/plugin_main.cc:73
-#: src/modplug/plugin_main.cc:83
+#: src/echo_plugin/echo.cc:24 src/modplug/plugin_main.cc:72
+#: src/modplug/plugin_main.cc:82 src/xsf/plugin.cc:445
 msgid "ms"
 msgstr "毫秒"
 
@@ -1174,7 +1032,7 @@
 msgid "Feedback:"
 msgstr "反饋："
 
-#: src/echo_plugin/echo.cc:28 src/modplug/plugin_main.cc:87
+#: src/echo_plugin/echo.cc:28 src/modplug/plugin_main.cc:86
 msgid "Volume:"
 msgstr "音量："
 
@@ -1182,11 +1040,11 @@
 msgid "Echo"
 msgstr "回音"
 
-#: src/ffaudio/ffaudio-core.cc:41
+#: src/ffaudio/ffaudio-core.cc:50
 msgid "FFmpeg Plugin"
 msgstr "FFmpeg 外掛程式"
 
-#: src/ffaudio/ffaudio-core.cc:571
+#: src/ffaudio/ffaudio-core.cc:649
 msgid ""
 "Multi-format audio decoding plugin for Audacious using\n"
 "FFmpeg multimedia framework (http://www.ffmpeg.org/)\n"
@@ -1202,249 +1060,306 @@
 "William Pitcock <nenolod@nenolod.net>\n"
 "Matti Hämäläinen <ccr@tnsp.org>"
 
-#: src/filewriter/filewriter.cc:45
+#: src/filewriter/filewriter.cc:48
 msgid "FileWriter Plugin"
 msgstr "檔案輸出外掛程式"
 
-#: src/filewriter/filewriter.cc:386
+#: src/filewriter/filewriter.cc:316
+#, c-format
+msgid ""
+"Error opening %s:\n"
+"%s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:358
+msgid ""
+"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/filewriter/filewriter.cc:385
 msgid "Output file format:"
 msgstr "輸出檔案格式："
 
-#: src/filewriter/filewriter.cc:403
-msgid "Configure"
-msgstr "設定"
-
-#: src/filewriter/filewriter.cc:413
+#: src/filewriter/filewriter.cc:389
 msgid "Save into original directory"
 msgstr "儲存到原始資料夾"
 
-#: src/filewriter/filewriter.cc:417
-msgid "Save into custom directory"
-msgstr "儲存到自訂資料夾"
-
-#: src/filewriter/filewriter.cc:427
-msgid "Output file folder:"
-msgstr "輸出檔案資料夾："
-
-#: src/filewriter/filewriter.cc:431
-msgid "Pick a folder"
-msgstr "選擇一個資料夾"
+#: src/filewriter/filewriter.cc:392
+msgid "Save into custom directory:"
+msgstr ""
 
-#: src/filewriter/filewriter.cc:444
+#: src/filewriter/filewriter.cc:400
 msgid "Generate file name from:"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:448
-msgid "Original file tag"
+#: src/filewriter/filewriter.cc:401
+msgid "Original file name"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:453
-msgid "Original file name"
+#: src/filewriter/filewriter.cc:404
+msgid "Original file name (no suffix)"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:459
-msgid "Include original file name extension"
+#: src/filewriter/filewriter.cc:407
+msgid "Original file tag"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:468
+#: src/filewriter/filewriter.cc:411
 msgid "Prepend track number to file name"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:484
-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 通用公共授權條款來再次散布與/或修改\n"
-"它；無論您依據的是本授權的第二版，或\n"
-"(您自行選擇的) 任何後續的版本。\n"
-"\n"
-"發行本程式是希望它能夠有用，\n"
-"但是沒有任何擔保；亦無對於某一特定目的之\n"
-"適售性與適用性的暗示性擔保。請參看\n"
-"GNU 通用公共授權以獲得更多細節。\n"
-"\n"
-"您應該已經收到隨附於這個程式的\n"
-"GNU 通用公共授權拷貝；如果沒有則請寫信到\n"
-"Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA "
-"02110-1301, USA."
-
-#: src/filewriter/mp3.cc:40 src/filewriter/mp3.cc:717
+#: src/filewriter/filewriter.cc:417 src/filewriter/filewriter.cc:449
 msgid "Auto"
 msgstr "自動"
 
-#: src/filewriter/mp3.cc:40
+#: src/filewriter/filewriter.cc:418
+msgid "8000 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:419
+msgid "11025 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:420
+msgid "12000 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:421
+msgid "16000 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:422
+msgid "22050 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:423
+msgid "24000 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:424
+msgid "32000 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:425 src/xsf/plugin.cc:430
+msgid "44100 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:426 src/xsf/plugin.cc:431
+msgid "48000 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:430
+msgid "8 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:431
+msgid "16 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:432
+msgid "32 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:433
+msgid "40 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:434
+msgid "48 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:435
+msgid "56 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:436
+msgid "64 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:437
+msgid "80 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:438
+msgid "96 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:439
+msgid "112 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:440
+msgid "128 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:441
+msgid "160 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:442
+msgid "192 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:443
+msgid "224 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:444
+msgid "256 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:445
+msgid "320 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:450
 msgid "Joint Stereo"
 msgstr "聯合立體聲"
 
-#: src/filewriter/mp3.cc:41 src/modplug/plugin_main.cc:58
-#: src/mpg123/mpg123.cc:248
+#: src/filewriter/filewriter.cc:451 src/modplug/plugin_main.cc:57
+#: src/mpg123/mpg123.cc:259
 msgid "Stereo"
 msgstr "立體聲"
 
-#: src/filewriter/mp3.cc:41 src/modplug/plugin_main.cc:57
-#: src/mpg123/mpg123.cc:248
+#: src/filewriter/filewriter.cc:452 src/modplug/plugin_main.cc:56
+#: src/mpg123/mpg123.cc:260
 msgid "Mono"
 msgstr "單聲道"
 
-#: src/filewriter/mp3.cc:657
-msgid "MP3 Configuration"
-msgstr "MP3 設定"
-
-#: src/filewriter/mp3.cc:658
-msgid "_OK"
+#: src/filewriter/filewriter.cc:456
+msgid "VBR"
 msgstr ""
 
-#: src/filewriter/mp3.cc:681
-msgid "Algorithm Quality:"
-msgstr "演算法品質："
-
-#: src/filewriter/mp3.cc:706
-msgid "Output Sample Rate:"
+#: src/filewriter/filewriter.cc:457
+msgid "ABR"
 msgstr ""
 
-#: src/filewriter/mp3.cc:733
-msgid "(Hz)"
-msgstr "(Hz)"
-
-#: src/filewriter/mp3.cc:740
-msgid "Bitrate / Compression Ratio:"
+#: src/filewriter/filewriter.cc:478
+msgid "Algorithm quality:"
 msgstr ""
 
-#: src/filewriter/mp3.cc:764
-msgid "Bitrate (kbps):"
-msgstr "位元率 (kbps)："
+#: src/filewriter/filewriter.cc:484
+msgid "Bitrate:"
+msgstr ""
 
-#: src/filewriter/mp3.cc:796
+#: src/filewriter/filewriter.cc:491
 msgid "Compression ratio:"
 msgstr "壓縮比率："
 
-#: src/filewriter/mp3.cc:820
-msgid "Audio Mode:"
-msgstr "音訊模式："
-
-#: src/filewriter/mp3.cc:845
-msgid "Miscellaneous:"
+#: src/filewriter/filewriter.cc:498
+msgid "Audio mode:"
 msgstr ""
 
-#: src/filewriter/mp3.cc:856
+#: src/filewriter/filewriter.cc:501
 msgid "Enforce strict ISO compliance"
 msgstr ""
 
-#: src/filewriter/mp3.cc:867
+#: src/filewriter/filewriter.cc:503
 msgid "Error protection"
 msgstr "錯誤保護"
 
-#: src/filewriter/mp3.cc:879 src/filewriter/vorbis.cc:206
-msgid "Quality"
-msgstr "品質"
-
-#: src/filewriter/mp3.cc:888
+#: src/filewriter/filewriter.cc:508
 msgid "Enable VBR/ABR"
 msgstr "啟用 VBR／ABR"
 
-#: src/filewriter/mp3.cc:898
+#: src/filewriter/filewriter.cc:510
 msgid "Type:"
 msgstr "類型："
 
-#: src/filewriter/mp3.cc:931
-msgid "VBR Options:"
-msgstr "VBR 選項："
-
-#: src/filewriter/mp3.cc:947
-msgid "Minimum bitrate (kbps):"
-msgstr "最小位元率 (kbps)："
-
-#: src/filewriter/mp3.cc:973
-msgid "Maximum bitrate (kbps):"
-msgstr "最大位元率 (kbps)："
+#: src/filewriter/filewriter.cc:514
+msgid "Minimum bitrate:"
+msgstr ""
 
-#: src/filewriter/mp3.cc:995
-msgid "Strictly enforce minimum bitrate"
-msgstr "強制使用最小位元率"
+#: src/filewriter/filewriter.cc:518
+msgid "Maximum bitrate:"
+msgstr ""
 
-#: src/filewriter/mp3.cc:1007
-msgid "ABR Options:"
-msgstr "ABR 選項："
-
-#: src/filewriter/mp3.cc:1017
-msgid "Average bitrate (kbps):"
-msgstr "平均位元率 (kbps)："
+#: src/filewriter/filewriter.cc:522
+msgid "Average bitrate:"
+msgstr ""
 
-#: src/filewriter/mp3.cc:1044
+#: src/filewriter/filewriter.cc:526
 msgid "VBR quality level:"
 msgstr "VBR 品質等級："
 
-#: src/filewriter/mp3.cc:1063
+#: src/filewriter/filewriter.cc:530
+msgid "Strictly enforce minimum bitrate"
+msgstr "強制使用最小位元率"
+
+#: src/filewriter/filewriter.cc:533
 msgid "Omit Xing VBR header"
 msgstr ""
 
-#: src/filewriter/mp3.cc:1076
-msgid "VBR/ABR"
-msgstr "VBR／ABR"
-
-#: src/filewriter/mp3.cc:1085
-msgid "Frame Parameters:"
+#: src/filewriter/filewriter.cc:539
+msgid "Frame Headers"
 msgstr ""
 
-#: src/filewriter/mp3.cc:1097
+#: src/filewriter/filewriter.cc:540
 msgid "Mark as copyright"
 msgstr "標示為著作權"
 
-#: src/filewriter/mp3.cc:1108
+#: src/filewriter/filewriter.cc:542
 msgid "Mark as original"
 msgstr "標示為原創"
 
-#: src/filewriter/mp3.cc:1120
-msgid "ID3 Parameters:"
+#: src/filewriter/filewriter.cc:544
+msgid "ID3 Tags"
 msgstr ""
 
-#: src/filewriter/mp3.cc:1131
+#: src/filewriter/filewriter.cc:545
 msgid "Force addition of version 2 tag"
 msgstr "強制加入第二版標籤"
 
-#: src/filewriter/mp3.cc:1141
+#: src/filewriter/filewriter.cc:547
 msgid "Only add v1 tag"
 msgstr "只加入第一版標籤"
 
-#: src/filewriter/mp3.cc:1148
+#: src/filewriter/filewriter.cc:549
 msgid "Only add v2 tag"
 msgstr "只加入第二版標籤"
 
-#: src/filewriter/mp3.cc:1169
+#: src/filewriter/filewriter.cc:554
+msgid "Quality"
+msgstr "品質"
+
+#: src/filewriter/filewriter.cc:555
+msgid "VBR/ABR"
+msgstr "VBR／ABR"
+
+#: src/filewriter/filewriter.cc:556
 msgid "Tags"
 msgstr "標籤"
 
-#: src/filewriter/vorbis.cc:196
-msgid "Vorbis Encoder Configuration"
-msgstr "Vorbis 編碼器設定"
-
-#: src/filewriter/vorbis.cc:219
-msgid "Quality level (0 - 10):"
-msgstr "品質等級 (0 - 10)："
+#: src/filewriter/filewriter.cc:566
+msgid "Quality (0-1):"
+msgstr ""
 
-#: src/flacng/flacng.h:35
+#: src/filewriter/filewriter.cc:573 src/skins-qt/skins_cfg.cc:307
+#: src/skins/skins_cfg.cc:289
+msgid "General"
+msgstr "一般"
+
+#: src/flac/flacng.h:36
 msgid "FLAC Decoder"
 msgstr "FLAC 解碼器"
 
-#: src/flacng/metadata.cc:351 src/wavpack/wavpack.cc:209
+#: src/flac/metadata.cc:296 src/wavpack/wavpack.cc:215
 msgid "lossless"
 msgstr "無損"
 
-#: src/flacng/plugin.cc:169
+#: src/flac/plugin.cc:214
 msgid ""
 "Original code by\n"
 "Ralf Ertzinger <ralf@skytale.net>\n"
@@ -1468,15 +1383,15 @@
 msgid "GIO Plugin"
 msgstr "GIO 外掛程式"
 
-#: src/gio/gio.cc:153
+#: src/gio/gio.cc:152
 msgid "Read-and-append mode not supported"
 msgstr ""
 
-#: src/gio/gio.cc:166
+#: src/gio/gio.cc:165
 msgid "Invalid open mode"
 msgstr ""
 
-#: src/gl-spectrum/gl-spectrum.cc:51
+#: src/glspectrum/gl-spectrum.cc:52
 msgid ""
 "OpenGL Spectrum Analyzer for Audacious\n"
 "Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
@@ -1488,621 +1403,753 @@
 "License: GPLv2+"
 msgstr ""
 
-#: src/gl-spectrum/gl-spectrum.cc:62
+#: src/glspectrum/gl-spectrum.cc:63 src/qtglspectrum/gl-spectrum.cc:53
 msgid "OpenGL Spectrum Analyzer"
 msgstr "OpenGL 頻譜分析儀"
 
-#: src/gl-spectrum-qt/gl-spectrum.cc:41
-msgid ""
-"OpenGL Spectrum Analyzer for Audacious\n"
-"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
-"Copyright 2014 William Pitcock\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-qt/gl-spectrum.cc:53
-msgid "OpenGL Spectrum Analyzer (Qt)"
+#: src/gtkui/columns.cc:36 src/moonstone/playlist_model.cc:38
+#: src/qtui/playlist_model.cc:33
+msgid "Entry Number"
 msgstr ""
 
-#: src/gnomeshortcuts/gnomeshortcuts.cc:38
-msgid "GNOME Shortcuts"
-msgstr ""
-
-#: src/gnomeshortcuts/gnomeshortcuts.cc:54
-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/gtkui/columns.cc:35
-msgid "Entry number"
-msgstr "項目編號"
-
-#: src/gtkui/columns.cc:36 src/playlist-manager/playlist-manager.cc:225
-#: src/qtui/playlist_model.cc:123
+#: src/gtkui/columns.cc:37 src/moonstone/playlist_model.cc:38
+#: src/moonstone/playlist_selection.cc:64
+#: src/playlist-manager/playlist-manager.cc:200
+#: src/playlist-manager-qt/playlist-manager-qt.cc:188
+#: src/qtui/playlist_model.cc:33 src/streamtuner/icecast-model.cc:120
+#: src/streamtuner/ihr-model.cc:159 src/streamtuner/shoutcast-model.cc:122
 msgid "Title"
 msgstr "標題"
 
-#: src/gtkui/columns.cc:37 src/qtui/playlist_model.cc:125
+#: src/gtkui/columns.cc:38 src/moonstone/playlist_model.cc:39
+#: src/qtui/playlist_model.cc:33
 msgid "Artist"
 msgstr "演出者"
 
-#: src/gtkui/columns.cc:38
+#: src/gtkui/columns.cc:39 src/moonstone/playlist_model.cc:39
+#: src/qtui/playlist_model.cc:33
 msgid "Year"
 msgstr "年分"
 
-#: src/gtkui/columns.cc:39 src/qtui/playlist_model.cc:127
+#: src/gtkui/columns.cc:40 src/moonstone/playlist_model.cc:39
+#: src/qtui/playlist_model.cc:34
 msgid "Album"
 msgstr "專輯"
 
-#: src/gtkui/columns.cc:40
-msgid "Album artist"
+#: src/gtkui/columns.cc:41 src/moonstone/playlist_model.cc:40
+#: src/qtui/playlist_model.cc:34
+msgid "Album Artist"
 msgstr ""
 
-#: src/gtkui/columns.cc:41
+#: src/gtkui/columns.cc:42 src/moonstone/playlist_model.cc:40
+#: src/qtui/playlist_model.cc:34
 msgid "Track"
 msgstr "音軌"
 
-#: src/gtkui/columns.cc:42
+#: src/gtkui/columns.cc:43 src/moonstone/playlist_model.cc:40
+#: src/qtui/playlist_model.cc:34 src/streamtuner/icecast-model.cc:123
+#: src/streamtuner/shoutcast-model.cc:125
+#: src/streamtuner/shoutcast-model.cc:236
 msgid "Genre"
 msgstr "類型"
 
-#: src/gtkui/columns.cc:43
-msgid "Queue position"
-msgstr "佇列位置"
+#: src/gtkui/columns.cc:44 src/moonstone/playlist_model.cc:41
+#: src/qtui/playlist_model.cc:35
+msgid "Queue Position"
+msgstr ""
 
-#: src/gtkui/columns.cc:44
+#: src/gtkui/columns.cc:45 src/moonstone/playlist_model.cc:41
+#: src/qtui/playlist_model.cc:35
 msgid "Length"
 msgstr "長度"
 
-#: src/gtkui/columns.cc:45
-msgid "File path"
-msgstr "檔案路徑"
-
-#: src/gtkui/columns.cc:47
-msgid "Custom title"
-msgstr "自訂標題"
+#: src/gtkui/columns.cc:46 src/moonstone/playlist_model.cc:41
+#: src/qtui/playlist_model.cc:35
+msgid "File Path"
+msgstr ""
 
-#: src/gtkui/columns.cc:48
+#: src/gtkui/columns.cc:47 src/moonstone/playlist_model.cc:42
+#: src/qtui/playlist_model.cc:35
+msgid "File Name"
+msgstr ""
+
+#: src/gtkui/columns.cc:48 src/moonstone/playlist_model.cc:42
+#: src/qtui/playlist_model.cc:36
+msgid "Custom Title"
+msgstr ""
+
+#: src/gtkui/columns.cc:49 src/moonstone/playlist_model.cc:42
+#: src/qtui/playlist_model.cc:36 src/streamtuner/icecast-model.cc:129
+#: src/streamtuner/shoutcast-model.cc:134
 msgid "Bitrate"
 msgstr "位元率"
 
-#: src/gtkui/columns.cc:308
+#: src/gtkui/columns.cc:50 src/moonstone/playlist_model.cc:43
+#: src/qtui/playlist_model.cc:36
+msgid "Comment"
+msgstr "備註"
+
+#: src/gtkui/columns.cc:51 src/qtui/playlist_model.cc:36
+msgid "Publisher"
+msgstr ""
+
+#: src/gtkui/columns.cc:52 src/qtui/playlist_model.cc:37
+msgid "Catalog Number"
+msgstr ""
+
+#: src/gtkui/columns.cc:53 src/moonstone/playlist_model.cc:43
+#: src/qtui/playlist_model.cc:37
+msgid "Disc"
+msgstr ""
+
+#: src/gtkui/columns.cc:325
 msgid "Available columns"
 msgstr ""
 
-#: src/gtkui/columns.cc:334
+#: src/gtkui/columns.cc:351
 msgid "Displayed columns"
 msgstr ""
 
-#: src/gtkui/layout.cc:72 src/search-tool/search-tool.cc:40
+#: src/gtkui/layout.cc:74 src/search-tool-qt/search-tool-qt.cc:58
+#: src/search-tool/search-tool.cc:49
 msgid "Search Tool"
 msgstr "搜尋工具"
 
-#: src/gtkui/layout.cc:167
+#: src/gtkui/layout.cc:170
 msgid "Dock at Left"
 msgstr "嵌入左方"
 
-#: src/gtkui/layout.cc:167
+#: src/gtkui/layout.cc:170
 msgid "Dock at Right"
 msgstr "嵌入右方"
 
-#: src/gtkui/layout.cc:168
+#: src/gtkui/layout.cc:171
 msgid "Dock at Top"
 msgstr "嵌入頂端"
 
-#: src/gtkui/layout.cc:168
+#: src/gtkui/layout.cc:171
 msgid "Dock at Bottom"
 msgstr "嵌入底端"
 
-#: src/gtkui/layout.cc:168
+#: src/gtkui/layout.cc:171
 msgid "Undock"
 msgstr "解除嵌入"
 
-#: src/gtkui/layout.cc:168 src/ladspa/plugin.cc:531
+#: src/gtkui/layout.cc:171 src/ladspa/plugin.cc:540
 msgid "Disable"
 msgstr "關閉"
 
-#: src/gtkui/menus.cc:126 src/qtui/main_window_actions.cc:93
-#: src/statusicon/statusicon.cc:276
+#: src/gtkui/menus.cc:79 src/qtui/menus.cc:107
+#: src/statusicon-qt/statusicon.cc:115 src/statusicon/statusicon.cc:286
 msgid "_Open Files ..."
 msgstr "開啟檔案(_O)…"
 
-#: src/gtkui/menus.cc:127
+#: src/gtkui/menus.cc:80 src/qtui/menus.cc:111
 msgid "Open _URL ..."
 msgstr "開啟網址(_U)…"
 
-#: src/gtkui/menus.cc:128 src/qtui/main_window_actions.cc:95
+#: src/gtkui/menus.cc:81 src/qtui/menus.cc:113
 msgid "_Add Files ..."
 msgstr "加入檔案(_A)… "
 
-#: src/gtkui/menus.cc:129
+#: src/gtkui/menus.cc:82 src/qtui/menus.cc:118
 msgid "Add U_RL ..."
 msgstr "加入網址(_R)…"
 
-#: src/gtkui/menus.cc:131
+#: src/gtkui/menus.cc:84 src/qtui/menus.cc:120
 msgid "Search _Library"
 msgstr ""
 
-#: src/gtkui/menus.cc:133 src/qtui/main_window_actions.cc:98
+#: src/gtkui/menus.cc:86 src/qtui/menus.cc:123
 msgid "A_bout ..."
 msgstr "關於(_B)…"
 
-#: src/gtkui/menus.cc:134 src/qtui/main_window_actions.cc:99
+#: src/gtkui/menus.cc:87 src/qtui/menus.cc:125
 msgid "_Settings ..."
 msgstr ""
 
-#: src/gtkui/menus.cc:135 src/qtui/main_window_actions.cc:103
-#: src/statusicon/statusicon.cc:284
+#: src/gtkui/menus.cc:88 src/qtui/menus.cc:131
+#: src/statusicon-qt/statusicon.cc:117 src/statusicon/statusicon.cc:288
 msgid "_Quit"
 msgstr "離開(_Q)"
 
-#: src/gtkui/menus.cc:139 src/gtkui/menus.cc:262
-#: src/qtui/main_window_actions.cc:107 src/search-tool/search-tool.cc:641
-#: src/statusicon/statusicon.cc:278
+#: src/gtkui/menus.cc:92 src/gtkui/menus.cc:226
+#: src/moonstone/playlist_tabs.cc:306 src/qtui/menus.cc:135
+#: src/qtui/playlist_tabs.cc:331 src/search-tool-qt/search-tool-qt.cc:499
+#: src/search-tool/search-tool.cc:339 src/statusicon-qt/statusicon.cc:109
+#: src/statusicon/statusicon.cc:280
 msgid "_Play"
 msgstr "播放(_P)"
 
-#: src/gtkui/menus.cc:140 src/qtui/main_window_actions.cc:108
-#: src/statusicon/statusicon.cc:279
+#: src/gtkui/menus.cc:93 src/qtui/menus.cc:137
+#: src/statusicon-qt/statusicon.cc:110 src/statusicon/statusicon.cc:281
 msgid "Paus_e"
 msgstr "暫停(_E)"
 
-#: src/gtkui/menus.cc:141 src/qtui/main_window_actions.cc:109
-#: src/statusicon/statusicon.cc:280
+#: src/gtkui/menus.cc:94 src/qtui/menus.cc:139
+#: src/statusicon-qt/statusicon.cc:111 src/statusicon/statusicon.cc:282
 msgid "_Stop"
 msgstr "停止(_S)"
 
-#: src/gtkui/menus.cc:142 src/qtui/main_window_actions.cc:110
-#: src/statusicon/statusicon.cc:277
+#: src/gtkui/menus.cc:95 src/qtui/menus.cc:141
+#: src/statusicon-qt/statusicon.cc:112 src/statusicon/statusicon.cc:283
 msgid "Pre_vious"
 msgstr "上一首(_V)"
 
-#: src/gtkui/menus.cc:143 src/qtui/main_window_actions.cc:111
-#: src/statusicon/statusicon.cc:281
+#: src/gtkui/menus.cc:96 src/qtui/menus.cc:143
+#: src/statusicon-qt/statusicon.cc:113 src/statusicon/statusicon.cc:284
 msgid "_Next"
 msgstr "下一首(_N)"
 
-#: src/gtkui/menus.cc:145 src/qtui/main_window_actions.cc:113
+#: src/gtkui/menus.cc:97 src/qtui/menus.cc:145 src/skins/menus.cc:114
+#: src/skins-qt/menus.cc:105
+msgid "Previous Album"
+msgstr ""
+
+#: src/gtkui/menus.cc:98 src/qtui/menus.cc:146 src/skins/menus.cc:115
+#: src/skins-qt/menus.cc:106
+msgid "Next Album"
+msgstr ""
+
+#: src/gtkui/menus.cc:100 src/qtui/menus.cc:148
 msgid "_Repeat"
 msgstr "重複"
 
-#: src/gtkui/menus.cc:146 src/qtui/main_window_actions.cc:114
+#: src/gtkui/menus.cc:101 src/qtui/menus.cc:150
 msgid "S_huffle"
 msgstr "隨機"
 
-#: src/gtkui/menus.cc:147 src/qtui/main_window_actions.cc:115
+#: src/gtkui/menus.cc:102 src/qtui/menus.cc:152
+msgid "Shuffle by Albu_m"
+msgstr ""
+
+#: src/gtkui/menus.cc:103 src/qtui/menus.cc:155
 msgid "N_o Playlist Advance"
 msgstr "不要切換播放列表"
 
-#: src/gtkui/menus.cc:148 src/qtui/main_window_actions.cc:116
+#: src/gtkui/menus.cc:104 src/qtui/menus.cc:157
 msgid "Stop A_fter This Song"
 msgstr "播放完目前歌曲後停止(_F)"
 
-#: src/gtkui/menus.cc:150 src/gtkui/menus.cc:247
-#: src/qtui/main_window_actions.cc:118
+#: src/gtkui/menus.cc:106 src/gtkui/menus.cc:210 src/qtui/menus.cc:162
+#: src/qtui/menus.cc:294
 msgid "Song _Info ..."
 msgstr "歌曲資訊(_I)…"
 
-#: src/gtkui/menus.cc:151
+#: src/gtkui/menus.cc:107
 msgid "Jump to _Time ..."
 msgstr "跳至時間(_T)…"
 
-#: src/gtkui/menus.cc:152
+#: src/gtkui/menus.cc:108
 msgid "_Jump to Song ..."
 msgstr "跳至歌曲(_J)…"
 
-#: src/gtkui/menus.cc:154
+#: src/gtkui/menus.cc:110 src/qtui/menus.cc:165
 msgid "Set Repeat Point _A"
 msgstr "設定重複點 _A"
 
-#: src/gtkui/menus.cc:155
+#: src/gtkui/menus.cc:111 src/qtui/menus.cc:167
 msgid "Set Repeat Point _B"
 msgstr "設定重複點 _B"
 
-#: src/gtkui/menus.cc:156
+#: src/gtkui/menus.cc:112 src/qtui/menus.cc:169
 msgid "_Clear Repeat Points"
 msgstr "清除重複點(_C)"
 
-#: src/gtkui/menus.cc:160 src/gtkui/menus.cc:167 src/gtkui/menus.cc:183
-#: src/qtui/main_window_actions.cc:122 src/qtui/main_window_actions.cc:129
-#: src/qtui/main_window_actions.cc:145
+#: src/gtkui/menus.cc:116 src/gtkui/menus.cc:123 src/gtkui/menus.cc:141
+#: src/qtui/menus.cc:173 src/qtui/menus.cc:180 src/qtui/menus.cc:198
 msgid "By _Title"
 msgstr "標題(_T)"
 
-#: src/gtkui/menus.cc:161 src/qtui/main_window_actions.cc:123
+#: src/gtkui/menus.cc:117 src/qtui/menus.cc:174
 msgid "By _File Name"
 msgstr ""
 
-#: src/gtkui/menus.cc:162 src/qtui/main_window_actions.cc:124
+#: src/gtkui/menus.cc:118 src/qtui/menus.cc:175
 msgid "By File _Path"
 msgstr "檔案路徑(_P)"
 
-#: src/gtkui/menus.cc:166 src/gtkui/menus.cc:182
-#: src/qtui/main_window_actions.cc:128 src/qtui/main_window_actions.cc:144
+#: src/gtkui/menus.cc:122 src/gtkui/menus.cc:140 src/qtui/menus.cc:179
+#: src/qtui/menus.cc:197
 msgid "By Track _Number"
 msgstr "音軌編號(_N)"
 
-#: src/gtkui/menus.cc:168 src/gtkui/menus.cc:184
-#: src/qtui/main_window_actions.cc:130 src/qtui/main_window_actions.cc:146
+#: src/gtkui/menus.cc:124 src/gtkui/menus.cc:142 src/qtui/menus.cc:181
+#: src/qtui/menus.cc:199
 msgid "By _Artist"
 msgstr "演出者(_A)"
 
-#: src/gtkui/menus.cc:169 src/gtkui/menus.cc:185
-#: src/qtui/main_window_actions.cc:131 src/qtui/main_window_actions.cc:147
+#: src/gtkui/menus.cc:125 src/gtkui/menus.cc:143 src/qtui/menus.cc:182
+#: src/qtui/menus.cc:200
 msgid "By Al_bum"
 msgstr "專輯(_B)"
 
-#: src/gtkui/menus.cc:170 src/gtkui/menus.cc:186
-#: src/qtui/main_window_actions.cc:132 src/qtui/main_window_actions.cc:148
+#: src/gtkui/menus.cc:126 src/gtkui/menus.cc:144 src/qtui/menus.cc:183
+#: src/qtui/menus.cc:201
 msgid "By Albu_m Artist"
 msgstr ""
 
-#: src/gtkui/menus.cc:171 src/gtkui/menus.cc:187
-#: src/qtui/main_window_actions.cc:133 src/qtui/main_window_actions.cc:149
+#: src/gtkui/menus.cc:127 src/gtkui/menus.cc:145 src/qtui/menus.cc:184
+#: src/qtui/menus.cc:202
 msgid "By Release _Date"
 msgstr "釋出日期(_D)"
 
-#: src/gtkui/menus.cc:172 src/gtkui/menus.cc:188
-#: src/qtui/main_window_actions.cc:134 src/qtui/main_window_actions.cc:150
+#: src/gtkui/menus.cc:128 src/gtkui/menus.cc:146 src/qtui/menus.cc:185
+#: src/qtui/menus.cc:203
 msgid "By _Genre"
 msgstr ""
 
-#: src/gtkui/menus.cc:173 src/gtkui/menus.cc:189
-#: src/qtui/main_window_actions.cc:135 src/qtui/main_window_actions.cc:151
+#: src/gtkui/menus.cc:129 src/gtkui/menus.cc:147 src/qtui/menus.cc:186
+#: src/qtui/menus.cc:204
 msgid "By _Length"
 msgstr "長度(_L)"
 
-#: src/gtkui/menus.cc:174 src/gtkui/menus.cc:190
-#: src/qtui/main_window_actions.cc:136 src/qtui/main_window_actions.cc:152
+#: src/gtkui/menus.cc:130 src/gtkui/menus.cc:148 src/qtui/menus.cc:187
+#: src/qtui/menus.cc:205
 msgid "By _File Path"
 msgstr "檔案路徑(_F)"
 
-#: src/gtkui/menus.cc:175 src/gtkui/menus.cc:191
-#: src/qtui/main_window_actions.cc:137 src/qtui/main_window_actions.cc:153
+#: src/gtkui/menus.cc:131 src/gtkui/menus.cc:149 src/qtui/menus.cc:188
+#: src/qtui/menus.cc:206
 msgid "By _Custom Title"
 msgstr "自訂標題(_C)"
 
-#: src/gtkui/menus.cc:177 src/gtkui/menus.cc:193
-#: src/qtui/main_window_actions.cc:139 src/qtui/main_window_actions.cc:155
+#: src/gtkui/menus.cc:132 src/gtkui/menus.cc:150 src/qtui/menus.cc:189
+#: src/qtui/menus.cc:207
+msgid "By C_omment"
+msgstr ""
+
+#: src/gtkui/menus.cc:133 src/gtkui/menus.cc:151 src/qtui/menus.cc:190
+#: src/qtui/menus.cc:208
+msgid "By D_isc Number"
+msgstr ""
+
+#: src/gtkui/menus.cc:135 src/gtkui/menus.cc:153 src/qtui/menus.cc:192
+#: src/qtui/menus.cc:210
 msgid "R_everse Order"
 msgstr "反向順序(_E)"
 
-#: src/gtkui/menus.cc:178 src/gtkui/menus.cc:194
-#: src/qtui/main_window_actions.cc:140 src/qtui/main_window_actions.cc:156
+#: src/gtkui/menus.cc:136 src/gtkui/menus.cc:154 src/qtui/menus.cc:194
+#: src/qtui/menus.cc:212
 msgid "_Random Order"
 msgstr "隨機順序(_R)"
 
-#: src/gtkui/menus.cc:198 src/qtui/main_window_actions.cc:160
+#: src/gtkui/menus.cc:158 src/qtui/menus.cc:216
 msgid "_Play/Resume"
 msgstr ""
 
-#: src/gtkui/menus.cc:199 src/gtkui/menus.cc:251
-#: src/qtui/main_window_actions.cc:161
+#: src/gtkui/menus.cc:159 src/qtui/menus.cc:218
 msgid "_Refresh"
 msgstr "重新整理(_R)"
 
-#: src/gtkui/menus.cc:201 src/qtui/main_window_actions.cc:163
+#: src/gtkui/menus.cc:161 src/qtui/menus.cc:222
 msgid "_Sort"
 msgstr "排序(_S)"
 
-#: src/gtkui/menus.cc:202 src/qtui/main_window_actions.cc:164
+#: src/gtkui/menus.cc:162 src/qtui/menus.cc:223
 msgid "Sort Se_lected"
 msgstr "排序所選(_L)"
 
-#: src/gtkui/menus.cc:203 src/qtui/main_window_actions.cc:165
+#: src/gtkui/menus.cc:163 src/qtui/menus.cc:225
 msgid "Remove _Duplicates"
 msgstr "移除重複的項目(_D)"
 
-#: src/gtkui/menus.cc:204 src/qtui/main_window_actions.cc:166
+#: src/gtkui/menus.cc:164 src/qtui/menus.cc:226
 msgid "Remove _Unavailable Files"
 msgstr "移除不存在的檔案(_U)"
 
-#: src/gtkui/menus.cc:206 src/playlist-manager/playlist-manager.cc:244
-#: src/qtui/main_window_actions.cc:168
+#: src/gtkui/menus.cc:166 src/playlist-manager/playlist-manager.cc:219
+#: src/playlist-manager-qt/playlist-manager-qt.cc:348 src/qtui/menus.cc:229
 msgid "_New"
 msgstr "新增(_N)"
 
-#: src/gtkui/menus.cc:207
+#: src/gtkui/menus.cc:167 src/qtui/menus.cc:230
 msgid "Ren_ame ..."
 msgstr "重新命名(_A)…"
 
-#: src/gtkui/menus.cc:208 src/gtkui/menus.cc:264
-#: src/qtui/main_window_actions.cc:170
+#: src/gtkui/menus.cc:168 src/gtkui/menus.cc:228
+#: src/moonstone/playlist_tabs.cc:311 src/qtui/menus.cc:231
+#: src/qtui/playlist_tabs.cc:336
 msgid "Remo_ve"
 msgstr ""
 
-#: src/gtkui/menus.cc:210
+#: src/gtkui/menus.cc:170 src/qtui/menus.cc:233
 msgid "_Import ..."
 msgstr "匯入(_I)…"
 
-#: src/gtkui/menus.cc:211
+#: src/gtkui/menus.cc:171 src/qtui/menus.cc:234
 msgid "_Export ..."
 msgstr "匯出(_E)…"
 
-#: src/gtkui/menus.cc:213
+#: src/gtkui/menus.cc:173 src/qtui/menus.cc:237
 msgid "Playlist _Manager ..."
 msgstr "播放列表管理(_M)…"
 
-#: src/gtkui/menus.cc:214 src/qtui/main_window_actions.cc:176
+#: src/gtkui/menus.cc:174 src/qtui/menus.cc:239
 msgid "_Queue Manager ..."
 msgstr "佇列管理(_Q)…"
 
-#: src/gtkui/menus.cc:218 src/qtui/main_window_actions.cc:180
+#: src/gtkui/menus.cc:178 src/qtui/menus.cc:243
 msgid "Volume _Up"
 msgstr "提高音量(_U)"
 
-#: src/gtkui/menus.cc:219 src/qtui/main_window_actions.cc:181
+#: src/gtkui/menus.cc:179 src/qtui/menus.cc:245
 msgid "Volume _Down"
 msgstr "降低音量(_D)"
 
-#: src/gtkui/menus.cc:221 src/qtui/main_window_actions.cc:183
-msgid "_Equalizer"
-msgstr "等化器(_E)"
+#: src/gtkui/menus.cc:181 src/qtui/menus.cc:249
+msgid "_Equalizer ..."
+msgstr ""
 
-#: src/gtkui/menus.cc:223 src/qtui/main_window_actions.cc:185
+#: src/gtkui/menus.cc:182 src/qtui/menus.cc:251
 msgid "E_ffects ..."
 msgstr ""
 
-#: src/gtkui/menus.cc:227
+#: src/gtkui/menus.cc:184
+msgid "_Record Stream"
+msgstr ""
+
+#: src/gtkui/menus.cc:185
+msgid "Audio _Settings ..."
+msgstr ""
+
+#: src/gtkui/menus.cc:189 src/qtui/menus.cc:260
 msgid "Show _Menu Bar"
 msgstr "顯示選單列(_M)"
 
-#: src/gtkui/menus.cc:228
+#: src/gtkui/menus.cc:190 src/qtui/menus.cc:262
 msgid "Show I_nfo Bar"
 msgstr "顯示資訊列(_N)"
 
-#: src/gtkui/menus.cc:229
+#: src/gtkui/menus.cc:191 src/qtui/menus.cc:264
+msgid "Show Info Bar _Album Art"
+msgstr ""
+
+#: src/gtkui/menus.cc:192 src/qtui/menus.cc:266
 msgid "Show Info Bar Vis_ualization"
 msgstr "顯示資訊列的視覺特效(_U)"
 
-#: src/gtkui/menus.cc:230
+#: src/gtkui/menus.cc:193 src/qtui/menus.cc:268
 msgid "Show _Status Bar"
 msgstr "顯示狀態列(_S)"
 
-#: src/gtkui/menus.cc:232
+#: src/gtkui/menus.cc:195 src/qtui/menus.cc:272
 msgid "Show _Remaining Time"
 msgstr "顯示剩餘時間(_R)"
 
-#: src/gtkui/menus.cc:234
+#: src/gtkui/menus.cc:197 src/qtui/menus.cc:276 src/skins/menus.cc:157
+#: src/skins-qt/menus.cc:152
 msgid "_Visualizations ..."
 msgstr ""
 
-#: src/gtkui/menus.cc:238 src/qtui/main_window_actions.cc:189
+#: src/gtkui/menus.cc:201 src/qtui/menus.cc:280
 msgid "_File"
 msgstr "檔案(_F)"
 
-#: src/gtkui/menus.cc:239 src/qtui/main_window_actions.cc:190
+#: src/gtkui/menus.cc:202 src/qtui/menus.cc:281
 msgid "_Playback"
 msgstr "播放(_P)"
 
-#: src/gtkui/menus.cc:240 src/qtui/main_window_actions.cc:191
+#: src/gtkui/menus.cc:203 src/qtui/menus.cc:282
 msgid "P_laylist"
 msgstr "播放列表(_L)"
 
-#: src/gtkui/menus.cc:241 src/gtkui/menus.cc:258
-#: src/qtui/main_window_actions.cc:192
+#: src/gtkui/menus.cc:204 src/gtkui/menus.cc:222 src/qtui/menus.cc:283
+#: src/qtui/menus.cc:312
 msgid "_Services"
 msgstr "服務(_S)"
 
-#: src/gtkui/menus.cc:242 src/qtui/main_window_actions.cc:193
+#: src/gtkui/menus.cc:205 src/qtui/menus.cc:284
 msgid "_Output"
 msgstr "輸出(_O)"
 
-#: src/gtkui/menus.cc:243
+#: src/gtkui/menus.cc:206 src/qtui/menus.cc:285
 msgid "_View"
 msgstr "檢視(_V)"
 
-#: src/gtkui/menus.cc:248
+#: src/gtkui/menus.cc:211 src/qtui/menus.cc:296
 msgid "_Queue/Unqueue"
 msgstr "排入／移出佇列(_Q)"
 
-#: src/gtkui/menus.cc:250
+#: src/gtkui/menus.cc:213 src/qtui/menus.cc:299
 msgid "_Open Containing Folder"
 msgstr ""
 
-#: src/gtkui/menus.cc:253
+#: src/gtkui/menus.cc:214 src/qtui/menus.cc:301
+msgid "_Refresh Selected"
+msgstr ""
+
+#: src/gtkui/menus.cc:216 src/qtui/menus.cc:304
 msgid "Cu_t"
 msgstr "剪下(_T)"
 
-#: src/gtkui/menus.cc:254
+#: src/gtkui/menus.cc:217 src/qtui/menus.cc:305
 msgid "_Copy"
 msgstr "拷貝(_C)"
 
-#: src/gtkui/menus.cc:255
+#: src/gtkui/menus.cc:218 src/qtui/menus.cc:306
 msgid "_Paste"
 msgstr "貼上(_P)"
 
-#: src/gtkui/menus.cc:256
+#: src/gtkui/menus.cc:219 src/qtui/menus.cc:307
+msgid "Paste at _End"
+msgstr ""
+
+#: src/gtkui/menus.cc:220 src/qtui/menus.cc:309
 msgid "Select _All"
 msgstr "選擇全部(_A)"
 
-#: src/gtkui/menus.cc:263
+#: src/gtkui/menus.cc:227 src/moonstone/playlist_tabs.cc:309
+#: src/qtui/playlist_tabs.cc:334
 msgid "_Rename ..."
 msgstr "重新命名(_R)…"
 
-#: src/gtkui/settings.cc:35
+#: src/gtkui/settings.cc:35 src/qtui/settings.cc:59
+msgid "Always"
+msgstr ""
+
+#: src/gtkui/settings.cc:36 src/qtui/settings.cc:60
+msgid "Auto-hide"
+msgstr ""
+
+#: src/gtkui/settings.cc:37 src/qtui/settings.cc:61
+msgid "Never"
+msgstr ""
+
+#: src/gtkui/settings.cc:41 src/qtui/settings.cc:64
 msgid "Playlist Tabs"
 msgstr ""
 
-#: src/gtkui/settings.cc:36
-msgid "Always show tabs"
+#: src/gtkui/settings.cc:42 src/qtui/settings.cc:65
+msgid "Show playlist tabs:"
 msgstr ""
 
-#: src/gtkui/settings.cc:38
+#: src/gtkui/settings.cc:45 src/qtui/settings.cc:69
 msgid "Show entry counts"
 msgstr ""
 
-#: src/gtkui/settings.cc:40
+#: src/gtkui/settings.cc:47 src/qtui/settings.cc:72
 msgid "Show close buttons"
 msgstr ""
 
-#: src/gtkui/settings.cc:42
+#: src/gtkui/settings.cc:49 src/qtui/settings.cc:75
 msgid "Playlist Columns"
 msgstr ""
 
-#: src/gtkui/settings.cc:44
+#: src/gtkui/settings.cc:51 src/qtui/settings.cc:77
 msgid "Show column headers"
 msgstr ""
 
-#: src/gtkui/settings.cc:46 src/modplug/plugin_main.cc:106
-#: src/skins/skins_cfg.cc:263
-msgid "Miscellaneous"
-msgstr "其他選項"
+#: src/gtkui/settings.cc:53 src/qtui/settings.cc:82
+msgid "Make column headers clickable for sorting"
+msgstr ""
 
-#: src/gtkui/settings.cc:47
-msgid "Arrow keys seek by:"
+#: src/gtkui/settings.cc:56
+msgid "Use symbolic icons in toolbar"
 msgstr ""
 
-#: src/gtkui/settings.cc:50
+#: src/gtkui/settings.cc:58 src/qtui/settings.cc:86
 msgid "Scroll on song change"
 msgstr ""
 
-#: src/gtkui/ui_gtk.cc:71
+#: src/gtkui/ui_gtk.cc:82
 msgid "GTK Interface"
 msgstr "GTK 介面"
 
-#: src/gtkui/ui_gtk.cc:222 src/skins/ui_main.cc:232
+#: src/gtkui/ui_gtk.cc:219 src/skins/main.cc:228 src/skins-qt/main.cc:231
 #, c-format
 msgid "%s - Audacious"
 msgstr "%s - Audacious"
 
-#: src/gtkui/ui_gtk.cc:225 src/qtui/main_window.cc:186
+#: src/gtkui/ui_gtk.cc:221 src/moonstone/main_window.cc:184
+#: src/qtui/main_window.cc:385
 msgid "Buffering ..."
 msgstr "緩衝中…"
 
-#: src/gtkui/ui_gtk.cc:228 src/skins/ui_main.cc:234 src/skins/ui_main.cc:1164
+#: src/gtkui/ui_gtk.cc:224 src/pipewire/pipewire.cc:402 src/skins/main.cc:230
+#: src/skins-qt/main.cc:233
 msgid "Audacious"
 msgstr "Audacious"
 
-#: src/gtkui/ui_statusbar.cc:63 src/qtui/status_bar.cc:67
+#: src/gtkui/ui_gtk.cc:487 src/gtkui/ui_gtk.cc:518 src/gtkui/ui_gtk.cc:882
+#: src/hotkey/gui.cc:72 src/moonstone/main_window.cc:67
+#: src/moonstone/main_window.cc:145 src/moonstone/main_window.cc:146
+#: src/notify/osd.cc:85 src/qthotkey/gui.cc:67 src/qtui/main_window.cc:154
+#: src/qtui/main_window.cc:347 src/qtui/main_window.cc:348
+#: src/skins/menus.cc:109 src/skins-qt/menus.cc:100
+msgid "Play"
+msgstr "播放"
+
+#: src/gtkui/ui_gtk.cc:487 src/moonstone/main_window.cc:151
+#: src/moonstone/main_window.cc:152 src/notify/osd.cc:82
+#: src/qtui/main_window.cc:353 src/qtui/main_window.cc:354
+#: src/skins/menus.cc:110 src/skins-qt/menus.cc:101
+msgid "Pause"
+msgstr "暫停"
+
+#: src/gtkui/ui_gtk.cc:868 src/moonstone/main_window.cc:57
+#: src/qtui/main_window.cc:145 src/skins/menus.cc:86 src/skins-qt/menus.cc:77
+msgid "Search Library"
+msgstr ""
+
+#: src/gtkui/ui_gtk.cc:875 src/moonstone/main_window.cc:60
+#: src/qtui/main_window.cc:147
+msgid "Open Files"
+msgstr "開啟檔案"
+
+#: src/gtkui/ui_gtk.cc:876 src/moonstone/main_window.cc:62
+#: src/qtui/main_window.cc:149
+msgid "Add Files"
+msgstr "加入檔案"
+
+#: src/gtkui/ui_gtk.cc:881 src/moonstone/main_window.cc:65
+#: src/qtui/main_window.cc:152 src/skins/menus.cc:112 src/skins-qt/menus.cc:103
+msgid "Previous"
+msgstr "上一個"
+
+#: src/gtkui/ui_gtk.cc:883 src/hotkey/gui.cc:74 src/moonstone/main_window.cc:69
+#: src/qthotkey/gui.cc:69 src/qtui/main_window.cc:156 src/skins/menus.cc:111
+#: src/skins-qt/menus.cc:102
+msgid "Stop"
+msgstr "停止"
+
+#: src/gtkui/ui_gtk.cc:884 src/moonstone/main_window.cc:76 src/notify/osd.cc:89
+#: src/qtui/main_window.cc:163 src/skins/menus.cc:113 src/skins-qt/menus.cc:104
+msgid "Next"
+msgstr "下一個"
+
+#: src/gtkui/ui_gtk.cc:886 src/moonstone/main_window.cc:79
+#: src/qtui/main_window.cc:166 src/qtui/menus.cc:254 src/skins/menus.cc:79
+#: src/skins-qt/menus.cc:69
+msgid "Record Stream"
+msgstr ""
+
+#: src/gtkui/ui_gtk.cc:919 src/moonstone/main_window.cc:86
+#: src/qtui/main_window.cc:173 src/skins/menus.cc:103 src/skins-qt/menus.cc:94
+msgid "Repeat"
+msgstr "重複"
+
+#: src/gtkui/ui_gtk.cc:922 src/moonstone/main_window.cc:89
+#: src/qtui/main_window.cc:176 src/skins/menus.cc:104 src/skins-qt/menus.cc:95
+msgid "Shuffle"
+msgstr "隨機"
+
+#: src/gtkui/ui_gtk.cc:1114 src/qtui/main_window.cc:123
+msgid "Menu"
+msgstr ""
+
+#: src/gtkui/ui_statusbar.cc:64 src/qtui/status_bar.cc:155
 msgid "mono"
 msgstr "單聲道"
 
-#: src/gtkui/ui_statusbar.cc:65 src/qtui/status_bar.cc:69
+#: src/gtkui/ui_statusbar.cc:66 src/qtui/status_bar.cc:157
 msgid "stereo"
 msgstr "立體聲"
 
-#: src/gtkui/ui_statusbar.cc:67 src/qtui/status_bar.cc:71
+#: src/gtkui/ui_statusbar.cc:68 src/qtui/status_bar.cc:160
 #, c-format
 msgid "%d channel"
 msgid_plural "%d channels"
 msgstr0 "%d 聲道"
 
-#: src/gtkui/ui_statusbar.cc:81 src/qtui/status_bar.cc:85
+#: src/gtkui/ui_statusbar.cc:76 src/qtui/status_bar.cc:168
 #, c-format
-msgid "%d kbps"
-msgstr "%d kbps"
+msgid "%d kHz"
+msgstr ""
+
+#: src/gtkui/ui_statusbar.cc:82 src/qtui/status_bar.cc:174
+#, c-format
+msgid "%d kbit/s"
+msgstr ""
 
-#: src/gtkui/ui_statusbar.cc:107 src/skins/ui_main_evlisteners.cc:103
+#: src/gtkui/ui_statusbar.cc:108 src/skins/main.cc:478 src/skins-qt/main.cc:461
 msgid "Single mode."
 msgstr "單一模式。"
 
-#: src/gtkui/ui_statusbar.cc:109 src/skins/ui_main_evlisteners.cc:105
+#: src/gtkui/ui_statusbar.cc:110 src/skins/main.cc:480 src/skins-qt/main.cc:463
 msgid "Playlist mode."
 msgstr "播放列表模式。"
 
-#: src/gtkui/ui_statusbar.cc:117 src/skins/ui_main_evlisteners.cc:111
+#: src/gtkui/ui_statusbar.cc:118 src/skins/main.cc:486 src/skins-qt/main.cc:469
 msgid "Stopping after song."
 msgstr "播放完成後停止。"
 
-#: src/hotkey/gui.cc:71
+#: src/hotkey/gui.cc:71 src/qthotkey/gui.cc:66
 msgid "Previous track"
 msgstr "上一個音軌"
 
-#: src/hotkey/gui.cc:72 src/notify/osd.cc:69 src/qtui/main_window.cc:69
-#: src/qtui/main_window.cc:172 src/qtui/main_window.cc:173
-#: src/skins/menus.cc:87
-msgid "Play"
-msgstr "播放"
-
-#: src/hotkey/gui.cc:73
+#: src/hotkey/gui.cc:73 src/qthotkey/gui.cc:68
 msgid "Pause/Resume"
 msgstr "暫停／回復"
 
-#: src/hotkey/gui.cc:74 src/qtui/main_window.cc:70 src/skins/menus.cc:89
-msgid "Stop"
-msgstr "停止"
-
-#: src/hotkey/gui.cc:75
+#: src/hotkey/gui.cc:75 src/qthotkey/gui.cc:70
 msgid "Next track"
 msgstr "下一個音軌"
 
-#: src/hotkey/gui.cc:76
-msgid "Forward 5 seconds"
-msgstr "快轉五秒"
-
-#: src/hotkey/gui.cc:77
-msgid "Rewind 5 seconds"
-msgstr "倒轉五秒"
+#: src/hotkey/gui.cc:76 src/qthotkey/gui.cc:71
+msgid "Step forward"
+msgstr ""
+
+#: src/hotkey/gui.cc:77 src/qthotkey/gui.cc:72
+msgid "Step backward"
+msgstr ""
 
-#: src/hotkey/gui.cc:78
+#: src/hotkey/gui.cc:78 src/qthotkey/gui.cc:73
 msgid "Mute"
 msgstr "靜音"
 
-#: src/hotkey/gui.cc:79
+#: src/hotkey/gui.cc:79 src/qthotkey/gui.cc:74
 msgid "Volume up"
 msgstr "提高音量"
 
-#: src/hotkey/gui.cc:80
+#: src/hotkey/gui.cc:80 src/qthotkey/gui.cc:75
 msgid "Volume down"
 msgstr "降低音量"
 
-#: src/hotkey/gui.cc:81
+#: src/hotkey/gui.cc:81 src/qthotkey/gui.cc:76
 msgid "Jump to file"
 msgstr "跳至檔案"
 
-#: src/hotkey/gui.cc:82
+#: src/hotkey/gui.cc:82 src/qthotkey/gui.cc:77
 msgid "Toggle player window(s)"
 msgstr "切換顯示播放器視窗"
 
-#: src/hotkey/gui.cc:83
+#: src/hotkey/gui.cc:83 src/qthotkey/gui.cc:78
 msgid "Show On-Screen-Display"
 msgstr "顯示 OSD"
 
-#: src/hotkey/gui.cc:84
+#: src/hotkey/gui.cc:84 src/qthotkey/gui.cc:79
 msgid "Toggle repeat"
 msgstr "切換重複播放"
 
-#: src/hotkey/gui.cc:85
+#: src/hotkey/gui.cc:85 src/qthotkey/gui.cc:80
 msgid "Toggle shuffle"
 msgstr "切換隨機播放"
 
-#: src/hotkey/gui.cc:86
+#: src/hotkey/gui.cc:86 src/qthotkey/gui.cc:81
 msgid "Toggle stop after current"
 msgstr "播放完目前歌曲後停止"
 
-#: src/hotkey/gui.cc:87
+#: src/hotkey/gui.cc:87 src/qthotkey/gui.cc:82
 msgid "Raise player window(s)"
 msgstr "將播放器視窗放到最上層"
 
-#: src/hotkey/gui.cc:97
+#: src/hotkey/gui.cc:98 src/qthotkey/gui.cc:100
 msgid "(none)"
 msgstr "(無)"
 
-#: src/hotkey/gui.cc:234
+#: src/hotkey/gui.cc:261
 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 modifiers.\n"
 "\n"
 "Do you want to continue?"
 msgstr ""
-"不建議在不使用組合鍵的情況下綁定滑鼠按鍵。\n"
-"\n"
-"您想要繼續嗎？"
 
-#: src/hotkey/gui.cc:236
+#: src/hotkey/gui.cc:264
 msgid "Binding mouse buttons"
 msgstr "綁定滑鼠按鈕"
 
-#: src/hotkey/gui.cc:391
+#: src/hotkey/gui.cc:434
 msgid ""
 "Press a key combination inside a text field.\n"
 "You can also bind mouse buttons."
@@ -2110,97 +2157,114 @@
 "請在輸入欄位中按下想要的按鍵組合。\n"
 "您也可以綁定滑鼠按鈕。"
 
-#: src/hotkey/gui.cc:396
+#: src/hotkey/gui.cc:444 src/qthotkey/gui.cc:179
 msgid "Hotkeys:"
 msgstr "熱鍵："
 
-#: src/hotkey/gui.cc:413
+#: src/hotkey/gui.cc:457 src/qthotkey/gui.cc:181
 msgid "Action:"
 msgstr "動作："
 
-#: src/hotkey/gui.cc:420
+#: src/hotkey/gui.cc:461 src/qthotkey/gui.cc:182
 msgid "Key Binding:"
 msgstr "按鍵綁定："
 
-#: src/hotkey/gui.cc:468
+#: src/hotkey/gui.cc:518 src/qthotkey/gui.cc:184
 msgid "_Add"
 msgstr ""
 
-#: src/hotkey/plugin.cc:61
+#: src/hotkey/plugin.cc:59 src/qthotkey/plugin.cc:78
 msgid "Global Hotkeys"
 msgstr "全域熱鍵"
 
-#: src/hotkey/plugin.cc:79
+#: src/hotkey/plugin.cc:74
 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"
+"Contributors 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"
-"著作權©2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n"
-"\n"
-"貢獻者包含：\n"
-"著作權©2006-2007 Vladimir Paskov <vlado.paskov@gmail.com>\n"
-"著作權©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/jack-ng/jack-ng.cc:49
+#: src/jack/jack-ng.cc:54
 msgid "JACK Output"
 msgstr "JACK 輸出"
 
-#: src/jack-ng/jack-ng.cc:114
+#: src/jack/jack-ng.cc:126
+msgid "Client name:"
+msgstr ""
+
+#: src/jack/jack-ng.cc:128
 msgid "Automatically connect to output ports"
 msgstr ""
 
-#: src/jack-ng/jack-ng.cc:155
+#: src/jack/jack-ng.cc:130
+msgid "Filter ports (regex, use any port if blank):"
+msgstr ""
+
+#: src/jack/jack-ng.cc:136
+msgid "Connect to physical ports only"
+msgstr ""
+
+#: src/jack/jack-ng.cc:139
+msgid "Upmix to"
+msgstr ""
+
+#: src/jack/jack-ng.cc:141
+msgid "ports if input has fewer channels"
+msgstr ""
+
+#: src/jack/jack-ng.cc:143
+msgid "Ignore insufficient number of ports"
+msgstr ""
+
+#: src/jack/jack-ng.cc:181
+msgid "No JACK output ports were found. Please check settings."
+msgstr ""
+
+#: src/jack/jack-ng.cc:195
 #, c-format
 msgid "Only %d JACK output ports were found but %d are required."
 msgstr ""
 
-#: src/jack-ng/jack-ng.cc:164
+#: src/jack/jack-ng.cc:210
 #, c-format
 msgid "Failed to connect to JACK port %s."
 msgstr ""
 
-#: src/jack-ng/jack-ng.cc:184
+#: src/jack/jack-ng.cc:230
 msgid ""
 "JACK supports only floating-point audio. You must change the output bit "
 "depth to floating-point in Audacious settings."
 msgstr ""
 
-#: src/jack-ng/jack-ng.cc:197
+#: src/jack/jack-ng.cc:245
 msgid "Failed to connect to the JACK server; is it running?"
 msgstr ""
 
-#: src/jack-ng/jack-ng.cc:273
+#: src/jack/jack-ng.cc:321
 #, c-format
 msgid ""
 "The JACK server requires a sample rate of %d Hz, but Audacious is playing at "
 "%d Hz. Please use the Sample Rate Converter effect to correct the mismatch."
 msgstr ""
 
-#: src/ladspa/plugin.cc:414
+#: src/ladspa/plugin.cc:416
 #, c-format
 msgid "%s Settings"
 msgstr "%s 設定"
 
-#: src/ladspa/plugin.cc:478
+#: src/ladspa/plugin.cc:482
 msgid "Module paths:"
 msgstr "模組路徑："
 
-#: src/ladspa/plugin.cc:483
+#: src/ladspa/plugin.cc:487
 msgid ""
 "Separate multiple paths with a colon.\n"
 "These paths are searched in addition to LADSPA_PATH.\n"
@@ -2210,25 +2274,25 @@
 "系統除了 LADSPA_PATH 之外也會搜尋這些路徑。\n"
 "加入新路徑之後請按 Enter 掃描新的外掛。"
 
-#: src/ladspa/plugin.cc:499
+#: src/ladspa/plugin.cc:508
 msgid "Available plugins:"
 msgstr "可用的外掛："
 
-#: src/ladspa/plugin.cc:512 src/modplug/plugin_main.cc:92
-#: src/modplug/plugin_main.cc:95 src/modplug/plugin_main.cc:98
-#: src/modplug/plugin_main.cc:101
+#: src/ladspa/plugin.cc:521 src/modplug/plugin_main.cc:91
+#: src/modplug/plugin_main.cc:94 src/modplug/plugin_main.cc:97
+#: src/modplug/plugin_main.cc:100
 msgid "Enable"
 msgstr "啟用"
 
-#: src/ladspa/plugin.cc:518
+#: src/ladspa/plugin.cc:527
 msgid "Enabled plugins:"
 msgstr "啟用外掛："
 
-#: src/ladspa/plugin.cc:534
+#: src/ladspa/plugin.cc:543
 msgid "Settings"
 msgstr "設定"
 
-#: src/ladspa/plugin.cc:551
+#: src/ladspa/plugin.cc:560
 msgid ""
 "LADSPA Host for Audacious\n"
 "Copyright 2011 John Lindgren"
@@ -2244,7 +2308,7 @@
 msgid "LIRC Plugin"
 msgstr "Linux 紅外線遙控器外掛程式"
 
-#: src/lirc/lirc.cc:381
+#: src/lirc/lirc.cc:379
 msgid ""
 "A simple plugin to control Audacious using the LIRC remote control daemon\n"
 "\n"
@@ -2272,63 +2336,123 @@
 "\n"
 "要獲得更多 LIRC 的相關資訊，請參看 http://lirc.org。"
 
-#: src/lirc/lirc.cc:392
+#: src/lirc/lirc.cc:390
 msgid "Connection"
 msgstr "連線"
 
-#: src/lirc/lirc.cc:393
+#: src/lirc/lirc.cc:391
 msgid "Reconnect to LIRC server"
 msgstr "重新連線至 LIRC 伺服器"
 
-#: src/lirc/lirc.cc:395
+#: src/lirc/lirc.cc:393
 msgid "Wait before reconnecting:"
 msgstr "重新連線前的等待時間："
 
-#: src/lyricwiki/lyricwiki.cc:41
-msgid "LyricWiki Plugin"
-msgstr "LyricWiki 歌詞外掛程式"
-
-#: src/lyricwiki/lyricwiki.cc:131 src/lyricwiki-qt/lyricwiki.cc:136
-msgid "No lyrics available"
-msgstr "無可用的歌詞"
-
-#: src/lyricwiki/lyricwiki.cc:217 src/lyricwiki/lyricwiki.cc:226
-#: src/lyricwiki/lyricwiki.cc:243 src/lyricwiki/lyricwiki.cc:252
-#: src/lyricwiki/lyricwiki.cc:267 src/lyricwiki-qt/lyricwiki.cc:222
-#: src/lyricwiki-qt/lyricwiki.cc:231 src/lyricwiki-qt/lyricwiki.cc:248
-#: src/lyricwiki-qt/lyricwiki.cc:257 src/lyricwiki-qt/lyricwiki.cc:272
-msgid "Error"
-msgstr "錯誤"
-
-#: src/lyricwiki/lyricwiki.cc:218 src/lyricwiki/lyricwiki.cc:244
-#: src/lyricwiki-qt/lyricwiki.cc:223 src/lyricwiki-qt/lyricwiki.cc:249
+#: src/lyrics-common/chart_lyrics_provider.cc:93
+#: src/lyrics-common/chart_lyrics_provider.cc:150
+#: src/lyrics-common/lyrics_ovh_provider.cc:50
 #, c-format
 msgid "Unable to fetch %s"
 msgstr "無法取得 %s"
 
-#: src/lyricwiki/lyricwiki.cc:227 src/lyricwiki/lyricwiki.cc:253
-#: src/lyricwiki-qt/lyricwiki.cc:232 src/lyricwiki-qt/lyricwiki.cc:258
+#: src/lyrics-common/chart_lyrics_provider.cc:100
+#: src/lyrics-common/chart_lyrics_provider.cc:157
+#: src/lyrics-common/lyrics_ovh_provider.cc:57
 #, c-format
 msgid "Unable to parse %s"
 msgstr "無法分析 %s"
 
-#: src/lyricwiki/lyricwiki.cc:259 src/lyricwiki-qt/lyricwiki.cc:264
+#: src/lyrics-common/chart_lyrics_provider.cc:121
+#: src/lyrics-common/chart_lyrics_provider.cc:194
+#: src/lyrics-common/lyrics_ovh_provider.cc:88
 msgid "Looking for lyrics ..."
 msgstr "尋找歌詞中…"
 
-#: src/lyricwiki/lyricwiki.cc:267 src/lyricwiki-qt/lyricwiki.cc:272
-msgid "Missing song metadata"
-msgstr "找不到歌曲詮釋資料"
+#: src/lyrics-common/preferences.h:43
+msgid "Nowhere"
+msgstr ""
 
-#: src/lyricwiki/lyricwiki.cc:278 src/lyricwiki-qt/lyricwiki.cc:283
-msgid "Connecting to lyrics.wikia.com ..."
-msgstr "連線至 lyrics.wikia.com 中…"
+#: src/lyrics-common/preferences.h:49
+msgid "Artist is truncated at the start, Title -- at the end"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:50
+msgid "Chars to truncate on:"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:54
+msgid "Chars are ORed in RegExp, surrounded by whitespace"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:55
+msgid "Chars to split on:"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:56
+msgid "Further truncate those on chars"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:62
+msgid "General"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:63
+msgid "Split title into artist and title on chars"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:66
+msgid "Sources"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:67
+msgid "Use embedded lyrics (from Lyrics tag)"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:69
+msgid "Fetch lyrics from internet:"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:72
+msgid "Store fetched lyrics in local cache"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:74
+msgid "Local Storage"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:75
+msgid "Load lyric files (.lrc) from local storage"
+msgstr ""
+
+#: src/lyrics-common/utils.cc:54 src/ui-common/dialogs-qt.cc:63
+msgid "Error"
+msgstr "錯誤"
+
+#: src/lyrics-common/utils.cc:60
+msgid "Lyrics could not be found."
+msgstr ""
+
+#: src/lyrics-common/utils.cc:142
+msgid "Missing title and/or artist."
+msgstr ""
+
+#: src/lyrics-gtk/lyrics-gtk.cc:37 src/lyrics-qt/lyrics-qt.cc:50
+msgid "Lyrics"
+msgstr ""
+
+#: src/lyrics-gtk/lyrics-gtk.cc:189 src/lyrics-qt/lyrics-qt.cc:171
+msgid "Edit Lyrics ..."
+msgstr ""
 
-#: src/lyricwiki-qt/lyricwiki.cc:55
-msgid "LyricWiki Plugin (Qt)"
+#: src/lyrics-gtk/lyrics-gtk.cc:195 src/lyrics-qt/lyrics-qt.cc:178
+msgid "Save Locally"
 msgstr ""
 
-#: src/m3u/m3u.cc:32
+#: src/lyrics-gtk/lyrics-gtk.cc:201 src/lyrics-qt/lyrics-qt.cc:186
+msgid "Refresh"
+msgstr ""
+
+#: src/m3u/m3u.cc:33
 msgid "M3U Playlists"
 msgstr "M3U 播放列表"
 
@@ -2336,17 +2460,17 @@
 msgid "Tact Generator"
 msgstr "節拍產生器"
 
-#: src/metronom/metronom.cc:147
+#: src/metronom/metronom.cc:145
 #, c-format
 msgid "Tact generator: %d bpm"
 msgstr "節拍產生器：%d bpm"
 
-#: src/metronom/metronom.cc:149
+#: src/metronom/metronom.cc:147
 #, c-format
 msgid "Tact generator: %d bpm %d/%d"
 msgstr "節拍產生器：%d bpm %d／%d"
 
-#: src/metronom/metronom.cc:237
+#: src/metronom/metronom.cc:235
 msgid ""
 "A Tact Generator by Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
 "\n"
@@ -2360,11 +2484,11 @@
 "範例：tact://77 播放 77 BPM\n"
 "或 tact://60*3/4 以 3/4 拍播放 60 BPM"
 
-#: src/mixer/mixer.cc:38
+#: src/mixer/mixer.cc:43
 msgid "Channel Mixer"
 msgstr "聲道混合"
 
-#: src/mixer/mixer.cc:202
+#: src/mixer/mixer.cc:255
 msgid ""
 "Channel Mixer Plugin for Audacious\n"
 "Copyright 2011-2012 John Lindgren and Michał Lipski"
@@ -2372,11 +2496,11 @@
 "Audacious 的頻道混音器外掛程式\n"
 "著作權 2011-2012 John Lindgren 與 Michał Lipski"
 
-#: src/mixer/mixer.cc:206
+#: src/mixer/mixer.cc:259
 msgid "Channel Mixer"
 msgstr "聲道混合"
 
-#: src/mixer/mixer.cc:207
+#: src/mixer/mixer.cc:260
 msgid "Output channels:"
 msgstr "輸出聲道數目："
 
@@ -2388,168 +2512,176 @@
 msgid "Error connecting to MMS server"
 msgstr ""
 
-#: src/modplug/modplugbmp.h:53
+#: src/modplug/modplugbmp.h:57
 msgid "ModPlug (Module Player)"
 msgstr "ModPlug (MOD 播放器)"
 
-#: src/modplug/plugin_main.cc:53
-msgid "Resolution"
-msgstr "解析度"
-
-#: src/modplug/plugin_main.cc:54
-msgid "8-bit"
-msgstr "8-bit"
-
 #: src/modplug/plugin_main.cc:55
-msgid "16-bit"
-msgstr "16-bit"
-
-#: src/modplug/plugin_main.cc:56
 msgid "Channels"
 msgstr "聲道"
 
-#: src/modplug/plugin_main.cc:60
+#: src/modplug/plugin_main.cc:59
 msgid "Nearest (fastest)"
 msgstr "最近點取樣(最快)"
 
-#: src/modplug/plugin_main.cc:61
+#: src/modplug/plugin_main.cc:60
 msgid "Linear (fast)"
 msgstr "線性取樣(快)"
 
-#: src/modplug/plugin_main.cc:62
+#: src/modplug/plugin_main.cc:61
 msgid "Spline (good)"
 msgstr "曲線函數(佳)"
 
-#: src/modplug/plugin_main.cc:63
+#: src/modplug/plugin_main.cc:62
 msgid "Polyphase (best)"
 msgstr "多相位取樣(最佳)"
 
-#: src/modplug/plugin_main.cc:64
+#: src/modplug/plugin_main.cc:63
 msgid "Sample rate"
 msgstr ""
 
-#: src/modplug/plugin_main.cc:65
+#: src/modplug/plugin_main.cc:64
 msgid "22 kHz"
 msgstr "22 kHz"
 
-#: src/modplug/plugin_main.cc:66
+#: src/modplug/plugin_main.cc:65
 msgid "44 kHz"
 msgstr "44 kHz"
 
-#: src/modplug/plugin_main.cc:67
+#: src/modplug/plugin_main.cc:66
 msgid "48 kHz"
 msgstr "48 kHz"
 
-#: src/modplug/plugin_main.cc:68
+#: src/modplug/plugin_main.cc:67
 msgid "96 kHz"
 msgstr "96 kHz"
 
-#: src/modplug/plugin_main.cc:72 src/modplug/plugin_main.cc:77
-#: src/modplug/plugin_main.cc:82
+#: src/modplug/plugin_main.cc:71 src/modplug/plugin_main.cc:76
+#: src/modplug/plugin_main.cc:81
 msgid "Level:"
 msgstr "強度："
 
-#: src/modplug/plugin_main.cc:78
+#: src/modplug/plugin_main.cc:77
 msgid "Cutoff:"
 msgstr "裁切："
 
-#: src/modplug/plugin_main.cc:91
+#: src/modplug/plugin_main.cc:90
 msgid "Reverb"
 msgstr "回音"
 
-#: src/modplug/plugin_main.cc:94
+#: src/modplug/plugin_main.cc:93
 msgid "Bass Boost"
 msgstr "重低音強化"
 
-#: src/modplug/plugin_main.cc:97
+#: src/modplug/plugin_main.cc:96
 msgid "Surround"
 msgstr "環繞音效"
 
-#: src/modplug/plugin_main.cc:100
+#: src/modplug/plugin_main.cc:99
 msgid "Preamp"
 msgstr "前置放大"
 
-#: src/modplug/plugin_main.cc:107
+#: src/modplug/plugin_main.cc:106
 msgid "Oversample"
 msgstr "超取樣"
 
-#: src/modplug/plugin_main.cc:108
+#: src/modplug/plugin_main.cc:107
 msgid "Noise reduction"
 msgstr "降噪"
 
-#: src/modplug/plugin_main.cc:109
+#: src/modplug/plugin_main.cc:108
 msgid "Play Amiga MODs"
 msgstr "播放 Amiga MOD 檔案"
 
-#: src/modplug/plugin_main.cc:110
+#: src/modplug/plugin_main.cc:109
 msgid "Repeat"
 msgstr "重複"
 
-#: src/modplug/plugin_main.cc:111
+#: src/modplug/plugin_main.cc:110
 msgid "Repeat count:"
 msgstr "重複次數："
 
-#: src/modplug/plugin_main.cc:112
+#: src/modplug/plugin_main.cc:111
 msgid "To repeat forever, set the repeat count to -1."
 msgstr "將重複次數設定為 -1 表示永遠重複播放。"
 
-#: src/modplug/plugin_main.cc:125 src/sid/xs_config.cc:106
+#: src/modplug/plugin_main.cc:124 src/sid/xs_config.cc:106
 msgid "These settings will take effect when Audacious is restarted."
 msgstr ""
 
+#: src/moonstone/main_window.cc:72 src/moonstone/main_window.cc:73
+#: src/qtui/main_window.cc:159 src/qtui/main_window.cc:160
+#: src/skins/menus.cc:107 src/skins-qt/menus.cc:98
+msgid "Stop After This Song"
+msgstr ""
+
+#: src/moonstone/moonstone.cc:39
+msgid "Moonstone"
+msgstr ""
+
+#: src/moonstone/playlist_header.cc:212 src/qtui/playlist_header.cc:258
+msgid "Reset to Defaults"
+msgstr ""
+
+#: src/moonstone/playlist_model.cc:38 src/qtui/playlist_header.cc:232
+msgid "Now Playing"
+msgstr "正在播放"
+
+#: src/moonstone/playlist_selection.cc:66
+#: src/playlist-manager/playlist-manager.cc:201
+#: src/playlist-manager-qt/playlist-manager-qt.cc:190
+msgid "Entries"
+msgstr "數量"
+
 #: src/mpg123/mpg123.cc:54
 msgid "MPG123 Plugin"
 msgstr "MPG123 外掛程式"
 
-#: src/mpg123/mpg123.cc:83
-msgid "Advanced"
-msgstr ""
-
-#: src/mpg123/mpg123.cc:84
+#: src/mpg123/mpg123.cc:82
 msgid "Use accurate length calculation (slow)"
 msgstr ""
 
-#: src/mpg123/mpg123.cc:248
+#: src/mpg123/mpg123.cc:260
 msgid "Surround"
 msgstr "環繞"
 
-#: src/mpris2/plugin.cc:39
+#: src/mpris2/plugin.cc:40
 msgid "MPRIS 2 Server"
 msgstr "MPRIS 2 伺服器"
 
-#: src/neon/neon.cc:97
+#: src/neon/neon.cc:102
 msgid "Neon HTTP/HTTPS Plugin"
 msgstr "Neon HTTP／HTTPS 外掛程式"
 
-#: src/neon/neon.cc:521
+#: src/neon/neon.cc:526
 msgid "Error parsing redirect"
 msgstr ""
 
-#: src/neon/neon.cc:535
+#: src/neon/neon.cc:540
 msgid "Unknown HTTP error"
 msgstr ""
 
-#: src/neon/neon.cc:569
+#: src/neon/neon.cc:614
 msgid "Error parsing URL"
 msgstr ""
 
-#: src/neon/neon.cc:632
+#: src/neon/neon.cc:687
 msgid "Too many redirects"
 msgstr ""
 
-#: src/notify/event.cc:64
+#: src/notify/event.cc:97
 msgid "Stopped"
 msgstr "已停止"
 
-#: src/notify/event.cc:64
+#: src/notify/event.cc:97
 msgid "Audacious is not playing."
 msgstr "Audacious 非播放中。"
 
-#: src/notify/notify.cc:42
+#: src/notify/notify.cc:39
 msgid "Desktop Notifications"
 msgstr "桌面通知"
 
-#: src/notify/notify.cc:60
+#: src/notify/notify.cc:57
 msgid ""
 "Desktop Notifications Plugin for Audacious\n"
 "Copyright (C) 2010 Maximilian Bogner\n"
@@ -2582,36 +2714,76 @@
 "您應該已經收到隨附於這個程式的 GNU 通用公共授權拷貝。 如果沒有，請參看 "
 "<http://www.gnu.org/licenses/>。"
 
-#: src/notify/notify.cc:110
+#: src/notify/notify.cc:104
 msgid "Show playback controls"
 msgstr "顯示播放控制元件"
 
-#: src/notify/notify.cc:112
+#: src/notify/notify.cc:106
 msgid "Always show notification"
 msgstr "永遠顯示通知"
 
-#: src/notify/notify.cc:114
+#: src/notify/notify.cc:108
 msgid "Include album name in notification"
 msgstr ""
 
-#: src/notify/osd.cc:58
+#: src/notify/notify.cc:110
+msgid "Custom notification duration:"
+msgstr ""
+
+#: src/notify/osd.cc:74
 msgid "Show"
 msgstr "顯示"
 
-#: src/notify/osd.cc:66 src/qtui/main_window.cc:178
-#: src/qtui/main_window.cc:179 src/skins/menus.cc:88
-msgid "Pause"
-msgstr "暫停"
+#: src/openmpt/mpt.cc:50
+msgid "OpenMPT (Module Player)"
+msgstr ""
 
-#: src/notify/osd.cc:73 src/qtui/main_window.cc:72 src/skins/menus.cc:91
-msgid "Next"
-msgstr "下一個"
+#: src/openmpt/mpt.cc:132
+msgid ""
+"Module player based on libopenmpt\n"
+"\n"
+"Written by: Chris Spiegel <cspiegel@gmail.com>"
+msgstr ""
+
+#: src/openmpt/mpt.cc:151
+msgid "Stereo separation:"
+msgstr ""
+
+#: src/openmpt/mpt.cc:153
+msgid "% (0=mono, 100=default, 200=full)"
+msgstr ""
+
+#: src/openmpt/mpt.cc:157
+msgid "Interpolation:"
+msgstr ""
+
+#: src/openmpt/mptwrap.h:51 src/soxr/sox-resampler.cc:189 src/xsf/plugin.cc:437
+msgid "Linear"
+msgstr ""
+
+#: src/openmpt/mptwrap.h:52
+msgid "Cubic"
+msgstr ""
+
+#: src/openmpt/mptwrap.h:53
+msgid "Windowed sinc"
+msgstr ""
 
-#: src/oss4/oss.h:93
+#: src/opus/opus.cc:39
+msgid "Opus Decoder"
+msgstr ""
+
+#: src/opus/opus.cc:336
+msgid ""
+"Opus Decoder Plugin for Audacious\n"
+"Copyright 2022 Thomas Lange"
+msgstr ""
+
+#: src/oss4/oss.h:70
 msgid "OSS4 Output"
 msgstr "OSS4 輸出"
 
-#: src/oss4/oss.h:95
+#: src/oss4/oss.h:72
 msgid "OSS3 Output"
 msgstr ""
 
@@ -2619,27 +2791,27 @@
 msgid "Default device"
 msgstr ""
 
-#: src/oss4/plugin.cc:77
+#: src/oss4/plugin.cc:78
 msgid "Audio device:"
 msgstr "音訊裝置："
 
-#: src/oss4/plugin.cc:80
+#: src/oss4/plugin.cc:81
 msgid "Use alternate device:"
 msgstr "使用替代裝置："
 
-#: src/oss4/plugin.cc:84
+#: src/oss4/plugin.cc:85
 msgid "Save volume between sessions."
 msgstr "儲存不同工作階段的音量。"
 
-#: src/oss4/plugin.cc:86
+#: src/oss4/plugin.cc:87
 msgid "Enable format conversions made by the OSS software."
 msgstr "啟用格式轉換 (使用 OSS 軟體)。"
 
-#: src/oss4/plugin.cc:88
+#: src/oss4/plugin.cc:89
 msgid "Enable exclusive mode to prevent virtual mixing."
 msgstr "啟用獨占模式以防止虛擬混音。"
 
-#: src/oss4/plugin.cc:100
+#: src/oss4/plugin.cc:101
 msgid ""
 "OSS4 Output Plugin for Audacious\n"
 "Copyright 2010-2012 Michał Lipski\n"
@@ -2653,19 +2825,35 @@
 "我想要謝謝 #audacious 上的人們，特別是 Tony Vroon 與 John Lindgren，當然還有"
 "前一個 OSS 外掛程式的作者。"
 
-#: src/playlist-manager/playlist-manager.cc:37
-msgid "Playlist Manager"
+#: src/pipewire/pipewire.cc:44
+msgid "PipeWire Output"
 msgstr ""
 
-#: src/playlist-manager/playlist-manager.cc:226
-msgid "Entries"
+#: src/pipewire/pipewire.cc:118
+msgid ""
+"PipeWire Output Plugin for Audacious\n"
+"Copyright 2022 Thomas Lange\n"
+"\n"
+"Based on the PipeWire Output Plugin for Qmmp\n"
+"Copyright 2021 Ilya Kotov"
 msgstr ""
 
-#: src/playlist-manager/playlist-manager.cc:245
+#: src/pipewire/pipewire.cc:408 src/skins/menus.cc:88 src/skins-qt/menus.cc:79
+msgid "Playback"
+msgstr "播放"
+
+#: src/playlist-manager/playlist-manager.cc:38
+#: src/playlist-manager-qt/playlist-manager-qt.cc:42
+msgid "Playlist Manager"
+msgstr "播放列表管理"
+
+#: src/playlist-manager/playlist-manager.cc:221
+#: src/playlist-manager-qt/playlist-manager-qt.cc:356
 msgid "_Remove"
 msgstr ""
 
-#: src/playlist-manager/playlist-manager.cc:246
+#: src/playlist-manager/playlist-manager.cc:222
+#: src/playlist-manager-qt/playlist-manager-qt.cc:351
 msgid "Ren_ame"
 msgstr ""
 
@@ -2673,55 +2861,54 @@
 msgid "PLS Playlists"
 msgstr "PLS 播放列表"
 
-#: src/psf/plugin.cc:45
+#: src/psf/plugin.cc:53
 msgid "OpenPSF PSF1/PSF2 Decoder"
 msgstr "OpenPSF PSF1／PSF2 解碼器"
 
-#: src/pulse_audio/pulse_audio.cc:38
+#: src/psf/plugin.cc:270
+msgid "OpenPSF Configuration"
+msgstr ""
+
+#: src/psf/plugin.cc:271 src/xsf/plugin.cc:444
+msgid "Ignore length from file"
+msgstr ""
+
+#: src/pulse/pulse_audio.cc:42
 msgid "PulseAudio Output"
 msgstr "PulseAudio 輸出"
 
-#: src/pulse_audio/pulse_audio.cc:611
+#: src/pulse/pulse_audio.cc:84
+msgid "Context name:"
+msgstr ""
+
+#: src/pulse/pulse_audio.cc:86
+msgid "Stream name:"
+msgstr ""
+
+#: src/pulse/pulse_audio.cc:596
 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"
-"這個程式是自由軟體；您可以遵循由自由軟體基金會\n"
-"所發布的 GNU 通用公共授權條款來再次散布與/或修改\n"
-"它；無論您依據的是本授權的第二版，或\n"
-"(您自行選擇的) 任何後續的版本。\n"
-"\n"
-"發行本程式是希望它能夠有用，\n"
-"但是沒有任何擔保；亦無對於某一特定目的之\n"
-"適售性與適用性的暗示性擔保。請參看\n"
-"GNU 通用公共授權以獲得更多細節。\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"
-"您應該已經收到隨附於這個程式的\n"
-"GNU 通用公共授權拷貝；如果沒有則請寫信到\n"
-"Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA "
-"02110-1301, USA."
+"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/qtaudio/qtaudio.cc:49
+#: src/qtaudio/qtaudio.cc:53
 msgid "QtMultimedia Output"
 msgstr ""
 
-#: src/qtaudio/qtaudio.cc:77
+#: src/qtaudio/qtaudio.cc:84
 msgid ""
 "QtMultimedia Audio Output Plugin for Audacious\n"
 "Copyright 2014 William Pitcock\n"
@@ -2730,50 +2917,87 @@
 "Copyright 2010 John Lindgren"
 msgstr ""
 
-#: src/qtui/dialog_windows.cc:31
-msgid "Working ..."
+#: src/qtglspectrum/gl-spectrum.cc:41
+msgid ""
+"OpenGL Spectrum Analyzer for Audacious\n"
+"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
+"Copyright 2014, 2020 Ariadne Conill\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/qtui/filter_input.cc:44 src/skins/ui_playlist.cc:221
-msgid "Search"
+#: src/qthotkey/gui.cc:177
+msgid "Press a key combination inside a text field."
+msgstr ""
+
+#: src/qthotkey/plugin.cc:105
+msgid ""
+"Global Hotkey Plugin\n"
+"Control the player with global key combinations or multimedia keys.\n"
+"\n"
+"Copyright (C) 2020 i.Dark_Templar <darktemplar@dark-templar-archives.net>\n"
+"Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n"
+"\n"
+"Contributors 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/qtui/main_window_actions.cc:94
+#: src/qtui/menus.cc:109
 msgid "_Open Folder ..."
 msgstr ""
 
-#: src/qtui/main_window_actions.cc:96
+#: src/qtui/menus.cc:115
 msgid "_Add Folder ..."
 msgstr ""
 
-#: src/qtui/main_window_actions.cc:101
+#: src/qtui/menus.cc:128
 msgid "_Log Inspector ..."
 msgstr ""
 
-#: src/qtui/main_window.cc:64
-msgid "Open Files"
+#: src/qtui/menus.cc:220
+msgid "_Find ..."
 msgstr ""
 
-#: src/qtui/main_window.cc:66
-msgid "Add Files"
+#: src/qtui/menus.cc:256 src/skins/menus.cc:80 src/skins-qt/menus.cc:70
+msgid "Audio Settings ..."
 msgstr ""
 
-#: src/qtui/main_window.cc:71 src/skins/menus.cc:90
-msgid "Previous"
-msgstr "上一個"
+#: src/qtui/playlist_model.cc:188
+msgid "Q#"
+msgstr ""
 
-#: src/qtui/main_window.cc:77 src/skins/menus.cc:82
-msgid "Repeat"
-msgstr "重複"
+#: src/qtui/playlist_model.cc:190
+msgid "T#"
+msgstr ""
 
-#: src/qtui/main_window.cc:79 src/skins/menus.cc:83
-msgid "Shuffle"
-msgstr "隨機"
+#: src/qtui/playlist_model.cc:192
+msgid "C#"
+msgstr ""
 
-#: src/qtui/qtui.cc:42
+#: src/qtui/playlist_model.cc:194
+msgid "D#"
+msgstr ""
+
+#: src/qtui/qtui.cc:40
 msgid "Qt Interface"
 msgstr ""
 
+#: src/qtui/search_bar.cc:46
+msgid "Search playlist"
+msgstr ""
+
+#: src/qtui/settings.cc:79
+msgid "Use bold font for column headers"
+msgstr ""
+
 #: src/resample/resample.cc:43
 msgid "Sample Rate Converter"
 msgstr "取樣率轉換"
@@ -2814,7 +3038,7 @@
 msgid "Method:"
 msgstr "演算法："
 
-#: src/resample/resample.cc:199 src/sox-resampler/sox-resampler.cc:161
+#: src/resample/resample.cc:199 src/soxr/sox-resampler.cc:203
 msgid "Rate:"
 msgstr "取樣率："
 
@@ -2866,61 +3090,48 @@
 msgid "192 kHz:"
 msgstr "192 kHz："
 
-#: src/scrobbler2/config_window.cc:41
-#, c-format
-msgid "OK. Scrobbling for user: %s"
-msgstr "確認。上傳使用者 %s 的播放資訊"
-
-#: src/scrobbler2/config_window.cc:54
-msgid "Permission Denied"
-msgstr "存取被拒"
-
-#: src/scrobbler2/config_window.cc:56
-msgid "Access the following link to allow Audacious to scrobble your plays:"
-msgstr "點選下列鏈結允許 Audacious 上傳您的播放資訊："
-
-#: src/scrobbler2/config_window.cc:66
-msgid "Keep this window open and click 'Check Permission' again.\n"
-msgstr "請保持這個視窗的開啟並再次點選「檢查權限」。\n"
+#: src/scrobbler2/config_window.cc:29
+msgid "Checking Last.fm access ..."
+msgstr ""
 
-#: src/scrobbler2/config_window.cc:69 src/scrobbler2/config_window.cc:80
+#: src/scrobbler2/config_window.cc:35
 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."
+"Your scrobbles are being saved on your computer temporarily. They will be "
+"submitted as soon as Audacious is allowed access."
 msgstr ""
-"別擔心。您的資訊已經儲存在電腦上。\n"
-"Audacious 會在狀況允許下盡快地將它們上傳。"
 
-#: src/scrobbler2/config_window.cc:77
-msgid "Network Problem."
-msgstr "網路發生問題。"
+#: src/scrobbler2/config_window.cc:41
+#, c-format
+msgid "Permission granted. Scrobbling for user %s."
+msgstr ""
 
-#: src/scrobbler2/config_window.cc:78
-msgid "There was a problem contacting Last.fm. Please try again later."
-msgstr "存取 Last.fm 時發生問題。請稍候再試。"
+#: src/scrobbler2/config_window.cc:44
+msgid ""
+"Permission denied. Open the following URL in a browser, allow Audacious "
+"access to your account, and then click 'Check Permission' again:"
+msgstr ""
 
-#: src/scrobbler2/config_window.cc:110
-msgid "Checking..."
-msgstr "檢查中…"
+#: src/scrobbler2/config_window.cc:53
+msgid "There was a problem contacting Last.fm."
+msgstr ""
 
-#: src/scrobbler2/config_window.cc:176
-msgid "C_heck Permission"
-msgstr "檢查權限(_H)"
+#: src/scrobbler2/config_window.cc:92
+msgid "Check Permission"
+msgstr ""
 
-#: src/scrobbler2/config_window.cc:177
-msgid "_Revoke Permission"
-msgstr "撤銷授權(_R)"
+#: src/scrobbler2/config_window.cc:93
+msgid "Revoke Permission"
+msgstr ""
 
-#: src/scrobbler2/config_window.cc:220
-msgid ""
-"You need to allow Audacious to scrobble tracks to your Last.fm account.\n"
-msgstr "您需要允許 Audacious 上傳音軌的播放資訊至您的 Last.fm 帳號。\n"
+#: src/scrobbler2/config_window.cc:97
+msgid "You need to allow Audacious to scrobble tracks to your Last.fm account."
+msgstr ""
 
 #: src/scrobbler2/scrobbler.cc:29
 msgid "Scrobbler 2.0"
 msgstr "Scrobbler 2.0"
 
-#: src/scrobbler2/scrobbler.cc:224
+#: src/scrobbler2/scrobbler.cc:200
 msgid ""
 "The Scrobbler plugin could not be started.\n"
 "There might be a problem with your installation."
@@ -2928,36 +3139,21 @@
 "無法啟動 Scrobbler 外掛。\n"
 "您的安裝可能有些問題。"
 
-#: src/scrobbler2/scrobbler.cc:289
+#: src/scrobbler2/scrobbler.cc:245
 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 編寫自 Pitxyoki，\n"
-"\n"
-"著作權©2012-2013 Luís M. Picciochi Oliveira <Pitxyoki@Gmail.com>\n"
-"\n"
-"感謝 John Lindgren 在這個專案的開頭助我一臂之力。\n"
-"\n"
-
-#: src/scrobbler2/scrobbler_communication.cc:642
-msgid ""
-"Audacious is now using an improved version of the Last.fm Scrobbler.\n"
-"Please check the Preferences for the Scrobbler plugin."
+"project."
 msgstr ""
-"Audacious 現在使用改良版的 Last.fm 播放資訊上傳功能。\n"
-"請參閱偏好設定中的播放資訊外掛。"
 
-#: src/sdlout/sdlout.cc:48
+#: src/sdlout/sdlout.cc:43
 msgid "SDL Output"
 msgstr "SDL 輸出"
 
-#: src/sdlout/sdlout.cc:77
+#: src/sdlout/sdlout.cc:72
 msgid ""
 "SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
@@ -2965,75 +3161,84 @@
 "Audacious 的 SDL 輸出外掛程式\n"
 "著作權 2010 John Lindgren"
 
-#: src/search-tool/search-tool.cc:116 src/search-tool/search-tool.cc:124
+#: src/search-tool/library.cc:35 src/search-tool/library.cc:46
+#: src/search-tool-qt/library.cc:35 src/search-tool-qt/library.cc:46
 msgid "Library"
 msgstr "媒體櫃"
 
-#: src/search-tool/search-tool.cc:394
-#, c-format
-msgid "%d result"
-msgid_plural "%d results"
-msgstr0 ""
-
-#: src/search-tool/search-tool.cc:400
-#, c-format
-msgid "(%d hidden)"
-msgid_plural "(%d hidden)"
-msgstr0 ""
-
-#: src/search-tool/search-tool.cc:594
+#: src/search-tool-qt/search-model.cc:44 src/search-tool/search-tool.cc:287
 #, c-format
 msgid "%d song"
 msgid_plural "%d songs"
 msgstr0 ""
 
-#: src/search-tool/search-tool.cc:601
+#: src/search-tool-qt/search-model.cc:53 src/search-tool/search-tool.cc:294
 msgid "of this genre"
 msgstr ""
 
-#: src/search-tool/search-tool.cc:607
+#: src/search-tool-qt/search-model.h:47 src/search-tool/search-model.h:45
 msgid "on"
 msgstr ""
 
-#: src/search-tool/search-tool.cc:607
+#: src/search-tool-qt/search-model.h:47 src/search-tool/search-model.h:45
 msgid "by"
 msgstr ""
 
-#: src/search-tool/search-tool.cc:643
-msgid "_Create Playlist"
-msgstr "建立播放列表(_C)"
+#: src/search-tool-qt/search-tool-qt.cc:165 src/search-tool/search-tool.cc:74
+msgid "Number of results to show:"
+msgstr ""
 
-#: src/search-tool/search-tool.cc:645
-msgid "_Add to Playlist"
-msgstr "加入至播放列表(_A)"
+#: src/search-tool-qt/search-tool-qt.cc:168 src/search-tool/search-tool.cc:77
+msgid "Rescan library at startup"
+msgstr ""
 
-#: src/search-tool/search-tool.cc:684
-msgid "Search library"
-msgstr "搜尋媒體櫃"
+#: src/search-tool-qt/search-tool-qt.cc:170
+msgid "Monitor library for changes"
+msgstr ""
 
-#: src/search-tool/search-tool.cc:688
+#: src/search-tool-qt/search-tool-qt.cc:193 src/search-tool/search-tool.cc:450
 msgid ""
 "To import your music library into Audacious, choose a folder and then click "
 "the \"refresh\" icon."
 msgstr ""
 "要將您的媒體櫃匯入至 Audacious，請選擇目標資料夾並且按下「重新整理」圖示。"
 
-#: src/search-tool/search-tool.cc:696
+#: src/search-tool-qt/search-tool-qt.cc:195 src/search-tool/search-tool.cc:459
 msgid "Please wait ..."
 msgstr "請稍候…"
 
-#: src/search-tool/search-tool.cc:723
+#: src/search-tool-qt/search-tool-qt.cc:197 src/search-tool/search-tool.cc:487
 msgid "Choose Folder"
 msgstr "選擇資料夾"
 
+#: src/search-tool-qt/search-tool-qt.cc:201 src/search-tool/search-tool.cc:445
+msgid "Search library"
+msgstr "搜尋媒體櫃"
+
+#: src/search-tool-qt/search-tool-qt.cc:327 src/search-tool/search-tool.cc:156
+#, c-format
+msgid "%d of %d result shown"
+msgid_plural "%d of %d results shown"
+msgstr0 ""
+
+#: src/search-tool-qt/search-tool-qt.cc:331 src/search-tool/search-tool.cc:160
+#, c-format
+msgid "%d result"
+msgid_plural "%d results"
+msgstr0 ""
+
+#: src/search-tool-qt/search-tool-qt.cc:501 src/search-tool/search-tool.cc:341
+msgid "_Create Playlist"
+msgstr "建立播放列表(_C)"
+
+#: src/search-tool-qt/search-tool-qt.cc:503 src/search-tool/search-tool.cc:343
+msgid "_Add to Playlist"
+msgstr "加入至播放列表(_A)"
+
 #: src/sid/xmms-sid.cc:43
 msgid "SID Player"
 msgstr ""
 
-#: src/sid/xs_config.cc:61
-msgid "Output"
-msgstr ""
-
 #: src/sid/xs_config.cc:62
 msgid "Channels:"
 msgstr ""
@@ -3112,739 +3317,682 @@
 msgid "Threshold:"
 msgstr ""
 
-#: src/silence-removal/silence-removal.cc:70
-msgid "dB"
+#: src/skins/actions.cc:45 src/skins-qt/actions.cc:43
+msgid "Repeat points cleared."
+msgstr "已清除重複點。"
+
+#: src/skins/actions.cc:60 src/skins-qt/actions.cc:58
+msgid "Repeat point A set."
+msgstr "已設定重複點 A。"
+
+#: src/skins/actions.cc:65 src/skins-qt/actions.cc:63
+msgid "Repeat point B set."
+msgstr "已設定重複點 B。"
+
+#: src/skins/equalizer.cc:223 src/skins-qt/equalizer.cc:223
+msgid "Preamp"
+msgstr "前置放大"
+
+#: src/skins/equalizer.cc:227 src/skins-qt/equalizer.cc:227
+msgid "31 Hz"
+msgstr "31 Hz"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "63 Hz"
+msgstr "63 Hz"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "125 Hz"
+msgstr "125 Hz"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "250 Hz"
+msgstr "250 Hz"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "500 Hz"
+msgstr "500 Hz"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "1 kHz"
+msgstr "1 kHz"
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "2 kHz"
+msgstr "2 kHz"
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "4 kHz"
+msgstr "4 kHz"
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "8 kHz"
+msgstr "8 kHz"
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "16 kHz"
+msgstr "16 kHz"
+
+#: src/skins/equalizer.cc:270 src/skins-qt/equalizer.cc:270
+msgid "Audacious Equalizer"
+msgstr "Audacious 等化器"
+
+#: src/skins/main.cc:459 src/skins-qt/main.cc:442
+msgid "Recording on"
 msgstr ""
 
-#: src/skins/menus.cc:64
-msgid "Open Files ..."
+#: src/skins/main.cc:461 src/skins-qt/main.cc:444
+msgid "Recording off"
 msgstr ""
 
-#: src/skins/menus.cc:65
-msgid "Open URL ..."
+#: src/skins/main.cc:754 src/skins-qt/main.cc:701
+#, c-format
+msgid "Seek to %d:%-2.2d / %d:%-2.2d"
+msgstr "移動至 %d:%-2.2d／%d:%-2.2d"
+
+#: src/skins/main.cc:771 src/skins-qt/main.cc:718
+#, c-format
+msgid "Volume: %d%%"
+msgstr "音量：%d％"
+
+#: src/skins/main.cc:784 src/skins-qt/main.cc:731
+#, c-format
+msgid "Balance: %d%% left"
+msgstr "平衡：%d％ 偏左"
+
+#: src/skins/main.cc:786 src/skins-qt/main.cc:733
+msgid "Balance: center"
+msgstr "平衡：中間"
+
+#: src/skins/main.cc:788 src/skins-qt/main.cc:735
+#, c-format
+msgid "Balance: %d%% right"
+msgstr "平衡：%d％ 偏右"
+
+#: src/skins/main.cc:880 src/skins-qt/main.cc:827
+msgid "Options Menu"
+msgstr "選單選項"
+
+#: src/skins/main.cc:884 src/skins-qt/main.cc:831
+msgid "Disable 'Always On Top'"
+msgstr "關閉置頂"
+
+#: src/skins/main.cc:886 src/skins-qt/main.cc:833
+msgid "Enable 'Always On Top'"
+msgstr "啟用置頂"
+
+#: src/skins/main.cc:889 src/skins-qt/main.cc:836
+msgid "File Info Box"
+msgstr "檔案資訊視窗"
+
+#: src/skins/main.cc:892 src/skins/menus.cc:149 src/skins-qt/main.cc:839
+#: src/skins-qt/menus.cc:142
+msgid "Double Size"
 msgstr ""
 
-#: src/skins/menus.cc:66
-msgid "Search Library"
+#: src/skins/main.cc:895 src/skins-qt/main.cc:842
+msgid "Visualizations"
 msgstr ""
 
-#: src/skins/menus.cc:68
-msgid "Playback"
-msgstr "播放"
+#: src/skins/menus.cc:74 src/skins-qt/menus.cc:64
+msgid "Volume Up"
+msgstr ""
+
+#: src/skins/menus.cc:75 src/skins-qt/menus.cc:65
+msgid "Volume Down"
+msgstr ""
+
+#: src/skins/menus.cc:77 src/skins-qt/menus.cc:67
+msgid "Effects ..."
+msgstr ""
+
+#: src/skins/menus.cc:84 src/skins-qt/menus.cc:74
+msgid "Open Files ..."
+msgstr ""
 
-#: src/skins/menus.cc:69
+#: src/skins/menus.cc:85 src/skins-qt/menus.cc:76
+msgid "Open URL ..."
+msgstr ""
+
+#: src/skins/menus.cc:89 src/skins-qt/menus.cc:80
 msgid "Playlist"
 msgstr "播放列表"
 
-#: src/skins/menus.cc:70
+#: src/skins/menus.cc:90 src/skins-qt/menus.cc:81
+msgid "Output"
+msgstr ""
+
+#: src/skins/menus.cc:91 src/skins-qt/menus.cc:82
 msgid "View"
 msgstr "檢視"
 
-#: src/skins/menus.cc:72 src/skins/menus.cc:136 src/skins/menus.cc:149
-#: src/skins/menus.cc:214
+#: src/skins/menus.cc:93 src/skins/menus.cc:161 src/skins/menus.cc:174
+#: src/skins/menus.cc:245 src/skins-qt/menus.cc:84 src/skins-qt/menus.cc:156
+#: src/skins-qt/menus.cc:170 src/skins-qt/menus.cc:241
 msgid "Services"
 msgstr ""
 
-#: src/skins/menus.cc:74
+#: src/skins/menus.cc:95 src/skins-qt/menus.cc:86
 msgid "About ..."
 msgstr ""
 
-#: src/skins/menus.cc:75
+#: src/skins/menus.cc:96 src/skins-qt/menus.cc:87
 msgid "Settings ..."
 msgstr ""
 
-#: src/skins/menus.cc:76
+#: src/skins/menus.cc:97 src/skins-qt/menus.cc:88
 msgid "Quit"
 msgstr ""
 
-#: src/skins/menus.cc:80 src/skins/menus.cc:206
+#: src/skins/menus.cc:101 src/skins/menus.cc:235 src/skins-qt/menus.cc:92
+#: src/skins-qt/menus.cc:231
 msgid "Song Info ..."
 msgstr ""
 
-#: src/skins/menus.cc:84
+#: src/skins/menus.cc:105 src/skins-qt/menus.cc:96
+msgid "Shuffle by Album"
+msgstr ""
+
+#: src/skins/menus.cc:106 src/skins-qt/menus.cc:97
 msgid "No Playlist Advance"
 msgstr "不要切換播放列表"
 
-#: src/skins/menus.cc:85
-msgid "Stop After This Song"
-msgstr ""
-
-#: src/skins/menus.cc:93
+#: src/skins/menus.cc:117 src/skins-qt/menus.cc:108
 msgid "Set A-B Repeat"
 msgstr ""
 
-#: src/skins/menus.cc:94
+#: src/skins/menus.cc:118 src/skins-qt/menus.cc:109
 msgid "Clear A-B Repeat"
 msgstr ""
 
-#: src/skins/menus.cc:96
+#: src/skins/menus.cc:120 src/skins-qt/menus.cc:111
 msgid "Jump to Song ..."
 msgstr ""
 
-#: src/skins/menus.cc:97
+#: src/skins/menus.cc:121 src/skins-qt/menus.cc:113
 msgid "Jump to Time ..."
 msgstr ""
 
-#: src/skins/menus.cc:101
+#: src/skins/menus.cc:125 src/skins-qt/menus.cc:118
 msgid "Play/Resume"
 msgstr ""
 
-#: src/skins/menus.cc:103
+#: src/skins/menus.cc:127 src/skins-qt/menus.cc:120
 msgid "New Playlist"
 msgstr "新增播放列表"
 
-#: src/skins/menus.cc:104
+#: src/skins/menus.cc:128 src/skins-qt/menus.cc:121
 msgid "Rename Playlist ..."
 msgstr ""
 
-#: src/skins/menus.cc:105
+#: src/skins/menus.cc:129 src/skins-qt/menus.cc:122
 msgid "Remove Playlist"
 msgstr ""
 
-#: src/skins/menus.cc:107
+#: src/skins/menus.cc:131 src/skins-qt/menus.cc:124
 msgid "Previous Playlist"
 msgstr ""
 
-#: src/skins/menus.cc:108
+#: src/skins/menus.cc:132 src/skins-qt/menus.cc:125
 msgid "Next Playlist"
 msgstr ""
 
-#: src/skins/menus.cc:110
+#: src/skins/menus.cc:134 src/skins-qt/menus.cc:127
 msgid "Import Playlist ..."
 msgstr ""
 
-#: src/skins/menus.cc:111
+#: src/skins/menus.cc:135 src/skins-qt/menus.cc:128
 msgid "Export Playlist ..."
 msgstr ""
 
-#: src/skins/menus.cc:113
+#: src/skins/menus.cc:137 src/skins-qt/menus.cc:130
 msgid "Playlist Manager ..."
 msgstr ""
 
-#: src/skins/menus.cc:114
+#: src/skins/menus.cc:138 src/skins-qt/menus.cc:131
 msgid "Queue Manager ..."
 msgstr ""
 
-#: src/skins/menus.cc:116
+#: src/skins/menus.cc:140 src/skins-qt/menus.cc:133
 msgid "Refresh Playlist"
 msgstr ""
 
-#: src/skins/menus.cc:120
+#: src/skins/menus.cc:144 src/skins-qt/menus.cc:137
 msgid "Show Playlist Editor"
 msgstr "顯示播放列表編輯器"
 
-#: src/skins/menus.cc:121
+#: src/skins/menus.cc:145 src/skins-qt/menus.cc:138
 msgid "Show Equalizer"
 msgstr "顯示等化器"
 
-#: src/skins/menus.cc:123
+#: src/skins/menus.cc:147 src/skins-qt/menus.cc:140
 msgid "Show Remaining Time"
 msgstr ""
 
-#: src/skins/menus.cc:125
+#: src/skins/menus.cc:150 src/skins-qt/menus.cc:143
 msgid "Always on Top"
 msgstr "永遠在最上層"
 
-#: src/skins/menus.cc:126
+#: src/skins/menus.cc:151 src/skins-qt/menus.cc:145
 msgid "On All Workspaces"
 msgstr ""
 
-#: src/skins/menus.cc:128
+#: src/skins/menus.cc:153 src/skins-qt/menus.cc:148
 msgid "Roll Up Player"
 msgstr ""
 
-#: src/skins/menus.cc:129
+#: src/skins/menus.cc:154 src/skins-qt/menus.cc:149
 msgid "Roll Up Playlist Editor"
 msgstr ""
 
-#: src/skins/menus.cc:130
+#: src/skins/menus.cc:155 src/skins-qt/menus.cc:150
 msgid "Roll Up Equalizer"
 msgstr ""
 
-#: src/skins/menus.cc:132 src/skins/ui_main.cc:854
-msgid "Double Size"
-msgstr ""
-
-#: src/skins/menus.cc:138
+#: src/skins/menus.cc:163 src/skins-qt/menus.cc:158
 msgid "Add URL ..."
 msgstr ""
 
-#: src/skins/menus.cc:139
+#: src/skins/menus.cc:164 src/skins-qt/menus.cc:160
 msgid "Add Files ..."
 msgstr ""
 
-#: src/skins/menus.cc:143 src/skins/menus.cc:171 src/skins/menus.cc:185
+#: src/skins/menus.cc:168 src/skins/menus.cc:196 src/skins/menus.cc:212
+#: src/skins-qt/menus.cc:164 src/skins-qt/menus.cc:192
+#: src/skins-qt/menus.cc:208
 msgid "By Title"
 msgstr "標題"
 
-#: src/skins/menus.cc:144 src/skins/menus.cc:178 src/skins/menus.cc:192
+#: src/skins/menus.cc:169 src/skins/menus.cc:203 src/skins/menus.cc:219
+#: src/skins-qt/menus.cc:165 src/skins-qt/menus.cc:199
+#: src/skins-qt/menus.cc:215
 msgid "By File Name"
 msgstr ""
 
-#: src/skins/menus.cc:145 src/skins/menus.cc:179 src/skins/menus.cc:193
+#: src/skins/menus.cc:170 src/skins/menus.cc:204 src/skins/menus.cc:220
+#: src/skins-qt/menus.cc:166 src/skins-qt/menus.cc:200
+#: src/skins-qt/menus.cc:216
 msgid "By File Path"
 msgstr ""
 
-#: src/skins/menus.cc:151
+#: src/skins/menus.cc:176 src/skins-qt/menus.cc:172
 msgid "Remove All"
 msgstr "全部移除"
 
-#: src/skins/menus.cc:152
+#: src/skins/menus.cc:177 src/skins-qt/menus.cc:173
 msgid "Clear Queue"
 msgstr "清除佇列"
 
-#: src/skins/menus.cc:154
+#: src/skins/menus.cc:179 src/skins-qt/menus.cc:175
 msgid "Remove Unavailable Files"
 msgstr "移除無法使用的檔案"
 
-#: src/skins/menus.cc:155
+#: src/skins/menus.cc:180 src/skins-qt/menus.cc:176
 msgid "Remove Duplicates"
 msgstr "移除重複的項目"
 
-#: src/skins/menus.cc:157
+#: src/skins/menus.cc:182 src/skins-qt/menus.cc:178
 msgid "Remove Unselected"
 msgstr "移除未選擇的項目"
 
-#: src/skins/menus.cc:158
+#: src/skins/menus.cc:183 src/skins-qt/menus.cc:179
 msgid "Remove Selected"
 msgstr "移除選擇的項目"
 
-#: src/skins/menus.cc:162
+#: src/skins/menus.cc:187 src/skins-qt/menus.cc:183
 msgid "Search and Select"
 msgstr "搜尋並選擇"
 
-#: src/skins/menus.cc:164
+#: src/skins/menus.cc:189 src/skins-qt/menus.cc:185
 msgid "Invert Selection"
 msgstr "反向選擇"
 
-#: src/skins/menus.cc:165
+#: src/skins/menus.cc:190 src/skins-qt/menus.cc:186
 msgid "Select None"
 msgstr "取消選擇"
 
-#: src/skins/menus.cc:166
+#: src/skins/menus.cc:191 src/skins-qt/menus.cc:187
 msgid "Select All"
 msgstr "選擇全部"
 
-#: src/skins/menus.cc:170 src/skins/menus.cc:184
+#: src/skins/menus.cc:195 src/skins/menus.cc:211 src/skins-qt/menus.cc:191
+#: src/skins-qt/menus.cc:207
 msgid "By Track Number"
 msgstr "音軌編號"
 
-#: src/skins/menus.cc:172 src/skins/menus.cc:186
+#: src/skins/menus.cc:197 src/skins/menus.cc:213 src/skins-qt/menus.cc:193
+#: src/skins-qt/menus.cc:209
 msgid "By Artist"
 msgstr "演出者"
 
-#: src/skins/menus.cc:173 src/skins/menus.cc:187
+#: src/skins/menus.cc:198 src/skins/menus.cc:214 src/skins-qt/menus.cc:194
+#: src/skins-qt/menus.cc:210
 msgid "By Album"
 msgstr "專輯"
 
-#: src/skins/menus.cc:174 src/skins/menus.cc:188
+#: src/skins/menus.cc:199 src/skins/menus.cc:215 src/skins-qt/menus.cc:195
+#: src/skins-qt/menus.cc:211
 msgid "By Album Artist"
 msgstr ""
 
-#: src/skins/menus.cc:175 src/skins/menus.cc:190
+#: src/skins/menus.cc:200 src/skins/menus.cc:216 src/skins-qt/menus.cc:196
+#: src/skins-qt/menus.cc:212
 msgid "By Release Date"
 msgstr ""
 
-#: src/skins/menus.cc:176 src/skins/menus.cc:189
+#: src/skins/menus.cc:201 src/skins/menus.cc:217 src/skins-qt/menus.cc:197
+#: src/skins-qt/menus.cc:213
 msgid "By Genre"
 msgstr ""
 
-#: src/skins/menus.cc:177 src/skins/menus.cc:191
+#: src/skins/menus.cc:202 src/skins/menus.cc:218 src/skins-qt/menus.cc:198
+#: src/skins-qt/menus.cc:214
 msgid "By Length"
 msgstr ""
 
-#: src/skins/menus.cc:180 src/skins/menus.cc:194
+#: src/skins/menus.cc:205 src/skins/menus.cc:221 src/skins-qt/menus.cc:201
+#: src/skins-qt/menus.cc:217
 msgid "By Custom Title"
 msgstr ""
 
-#: src/skins/menus.cc:198
+#: src/skins/menus.cc:206 src/skins/menus.cc:222 src/skins-qt/menus.cc:202
+#: src/skins-qt/menus.cc:218
+msgid "By Comment"
+msgstr ""
+
+#: src/skins/menus.cc:207 src/skins/menus.cc:223 src/skins-qt/menus.cc:203
+#: src/skins-qt/menus.cc:219
+msgid "By Disc Number"
+msgstr ""
+
+#: src/skins/menus.cc:227 src/skins-qt/menus.cc:223
 msgid "Randomize List"
 msgstr "列表隨機排序"
 
-#: src/skins/menus.cc:199
+#: src/skins/menus.cc:228 src/skins-qt/menus.cc:224
 msgid "Reverse List"
 msgstr "列表反向排序"
 
-#: src/skins/menus.cc:201
+#: src/skins/menus.cc:230 src/skins-qt/menus.cc:226
 msgid "Sort Selected"
 msgstr "排序選擇的項目"
 
-#: src/skins/menus.cc:202
+#: src/skins/menus.cc:231 src/skins-qt/menus.cc:227
 msgid "Sort List"
 msgstr "排序列表"
 
-#: src/skins/menus.cc:208
+#: src/skins/menus.cc:236 src/skins-qt/menus.cc:232
+msgid "Open Containing Folder"
+msgstr ""
+
+#: src/skins/menus.cc:238 src/skins-qt/menus.cc:234
 msgid "Cut"
 msgstr "剪下"
 
-#: src/skins/menus.cc:209
+#: src/skins/menus.cc:239 src/skins-qt/menus.cc:235
 msgid "Copy"
 msgstr "拷貝"
 
-#: src/skins/menus.cc:210
+#: src/skins/menus.cc:240 src/skins-qt/menus.cc:236
 msgid "Paste"
 msgstr "貼上"
 
-#: src/skins/menus.cc:212
-msgid "Queue/Unqueue"
+#: src/skins/menus.cc:241 src/skins-qt/menus.cc:237
+msgid "Paste at End"
 msgstr ""
 
-#: src/skins/menus.cc:218
-msgid "Load Preset ..."
-msgstr ""
-
-#: src/skins/menus.cc:219
-msgid "Load Auto Preset ..."
-msgstr ""
-
-#: src/skins/menus.cc:220
-msgid "Load Default"
-msgstr ""
-
-#: src/skins/menus.cc:221
-msgid "Load Preset File ..."
+#: src/skins/menus.cc:243 src/skins-qt/menus.cc:239
+msgid "Queue/Unqueue"
 msgstr ""
 
-#: src/skins/menus.cc:222
-msgid "Load EQF File ..."
-msgstr ""
+#: src/skins/playlist-widget.cc:58 src/skins-qt/playlist-widget.cc:58
+#, c-format
+msgid "%s (%d of %d)"
+msgstr "%s (%d／%d)"
 
-#: src/skins/menus.cc:224
-msgid "Save Preset ..."
-msgstr ""
+#: src/skins/playlistwin.cc:491 src/skins-qt/playlistwin.cc:478
+msgid "Audacious Playlist Editor"
+msgstr "Audacious 播放列表編輯器"
 
-#: src/skins/menus.cc:225
-msgid "Save Auto Preset ..."
-msgstr ""
+#: src/skins/plugin.cc:53 src/skins-qt/plugin.cc:65
+msgid "Winamp Classic Interface"
+msgstr "Winamp 傳統介面"
 
-#: src/skins/menus.cc:226
-msgid "Save Default"
+#: src/skins-qt/menus.cc:75
+msgid "Open Folder ..."
 msgstr ""
 
-#: src/skins/menus.cc:227
-msgid "Save Preset File ..."
+#: src/skins-qt/menus.cc:159
+msgid "Add Folder ..."
 msgstr ""
 
-#: src/skins/menus.cc:228
-msgid "Save EQF File ..."
-msgstr ""
+#: src/skins-qt/search-select.cc:62 src/skins/search-select.cc:77
+msgid "Search entries in active playlist"
+msgstr "在使用中的播放列表裡搜尋播放項目"
 
-#: src/skins/menus.cc:230
-msgid "Delete Preset ..."
+#: src/skins-qt/search-select.cc:70 src/skins/search-select.cc:83
+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/menus.cc:231
-msgid "Delete Auto Preset ..."
+#: src/skins-qt/search-select.cc:75 src/skins/search-select.cc:91
+msgid "Title:"
 msgstr ""
 
-#: src/skins/menus.cc:233
-msgid "Import Winamp Presets ..."
+#: src/skins-qt/search-select.cc:79 src/skins/search-select.cc:96
+msgid "Album:"
 msgstr ""
 
-#: src/skins/menus.cc:235
-msgid "Reset to Zero"
+#: src/skins-qt/search-select.cc:82 src/skins/search-select.cc:101
+msgid "Artist:"
 msgstr ""
 
-#: src/skins/plugin.cc:48
-msgid "Winamp Classic Interface"
-msgstr "Winamp 傳統介面"
-
-#: src/skins/preset-browser.cc:57 src/skins/preset-list.cc:371
-#: src/skins/preset-list.cc:386
-msgid "Save"
-msgstr "儲存"
-
-#: src/skins/preset-browser.cc:57 src/skins/preset-list.cc:338
-#: src/skins/preset-list.cc:354
-msgid "Load"
-msgstr "載入"
-
-#: src/skins/preset-browser.cc:83
-msgid "Load Preset File"
+#: src/skins-qt/search-select.cc:85 src/skins/search-select.cc:106
+msgid "File Name:"
 msgstr ""
 
-#: src/skins/preset-browser.cc:100
-msgid "Load EQF File"
-msgstr ""
+#: src/skins-qt/search-select.cc:88 src/skins/search-select.cc:134
+msgid "Clear previous selection before searching"
+msgstr "進行搜尋前清空上次的選擇項目"
 
-#: src/skins/preset-browser.cc:119
-msgid "Save Preset File"
-msgstr ""
+#: src/skins-qt/search-select.cc:89 src/skins/search-select.cc:137
+msgid "Automatically toggle queue for matching entries"
+msgstr "自動切換至符合項目的佇列"
 
-#: src/skins/preset-browser.cc:137
-msgid "Save EQF File"
-msgstr ""
+#: src/skins-qt/search-select.cc:90 src/skins/search-select.cc:140
+msgid "Create a new playlist with matching entries"
+msgstr "以符合的項目建立新的播放列表"
 
-#: src/skins/preset-browser.cc:151
-msgid "Import Winamp Presets"
+#: src/skins-qt/search-select.cc:101 src/skins/search-select.cc:78
+msgid "Search"
 msgstr ""
 
-#: src/skins/preset-list.cc:285
-msgid "Presets"
-msgstr "樣式"
-
-#: src/skins/preset-list.cc:335
-msgid "Load preset"
-msgstr "載入樣式"
-
-#: src/skins/preset-list.cc:351
-msgid "Load auto-preset"
-msgstr "讀取自動載入樣式"
-
-#: src/skins/preset-list.cc:367
-msgid "Save preset"
-msgstr "儲存樣式"
-
-#: src/skins/preset-list.cc:382
-msgid "Save auto-preset"
-msgstr "儲存自動載入樣式"
-
-#: src/skins/preset-list.cc:408
-msgid "Delete preset"
-msgstr "刪除樣式"
-
-#: src/skins/preset-list.cc:424
-msgid "Delete auto-preset"
-msgstr "刪除自動載入樣式"
-
-#: src/skins/skins_cfg.cc:176
+#: src/skins-qt/skins_cfg.cc:198 src/skins/skins_cfg.cc:182
 msgid "Player:"
 msgstr ""
 
-#: src/skins/skins_cfg.cc:178
+#: src/skins-qt/skins_cfg.cc:200 src/skins/skins_cfg.cc:184
 msgid "Select main player window font:"
 msgstr "選擇播放器主視窗字型："
 
-#: src/skins/skins_cfg.cc:179
+#: src/skins-qt/skins_cfg.cc:201 src/skins/skins_cfg.cc:185
 msgid "Playlist:"
 msgstr ""
 
-#: src/skins/skins_cfg.cc:181
+#: src/skins-qt/skins_cfg.cc:203 src/skins/skins_cfg.cc:187
 msgid "Select playlist font:"
 msgstr "選擇播放列表字型："
 
-#: src/skins/skins_cfg.cc:187
+#: src/skins-qt/skins_cfg.cc:207 src/skins/skins_cfg.cc:191
 msgid "Skin"
 msgstr ""
 
-#: src/skins/skins_cfg.cc:189
+#: src/skins-qt/skins_cfg.cc:211 src/skins/skins_cfg.cc:193
+msgid "Display active titlebar when any window is focused"
+msgstr ""
+
+#: src/skins-qt/skins_cfg.cc:213 src/skins/skins_cfg.cc:195
 msgid "Fonts"
 msgstr ""
 
-#: src/skins/skins_cfg.cc:192
+#: src/skins-qt/skins_cfg.cc:215 src/skins/skins_cfg.cc:197
 msgid "Use bitmap fonts (supports ASCII only)"
 msgstr "使用點陣字型 (只支援 ASCII)"
 
-#: src/skins/skins_cfg.cc:194
+#: src/skins-qt/skins_cfg.cc:217 src/skins/skins_cfg.cc:199
 msgid "Scroll song title"
 msgstr ""
 
-#: src/skins/skins_cfg.cc:196
+#: src/skins-qt/skins_cfg.cc:219 src/skins/skins_cfg.cc:201
 msgid "Scroll song title in both directions"
 msgstr "雙向捲動歌曲標題"
 
-#: src/skins/skins_cfg.cc:201
+#: src/skins-qt/skins_cfg.cc:224 src/skins/skins_cfg.cc:206
 msgid "Analyzer"
 msgstr "分析儀"
 
-#: src/skins/skins_cfg.cc:202
+#: src/skins-qt/skins_cfg.cc:225 src/skins/skins_cfg.cc:207
 msgid "Scope"
 msgstr "示波器"
 
-#: src/skins/skins_cfg.cc:203
+#: src/skins-qt/skins_cfg.cc:226 src/skins/skins_cfg.cc:208
 msgid "Voiceprint / VU meter"
 msgstr ""
 
-#: src/skins/skins_cfg.cc:204
+#: src/skins-qt/skins_cfg.cc:227 src/skins/skins_cfg.cc:209
 msgid "Off"
 msgstr "關閉"
 
-#: src/skins/skins_cfg.cc:208 src/skins/skins_cfg.cc:233
-#: src/skins/skins_cfg.cc:239
+#: src/skins-qt/skins_cfg.cc:231 src/skins-qt/skins_cfg.cc:256
+#: src/skins-qt/skins_cfg.cc:262 src/skins/skins_cfg.cc:213
+#: src/skins/skins_cfg.cc:238 src/skins/skins_cfg.cc:244
 msgid "Normal"
 msgstr "標準"
 
-#: src/skins/skins_cfg.cc:209 src/skins/skins_cfg.cc:234
+#: src/skins-qt/skins_cfg.cc:232 src/skins-qt/skins_cfg.cc:257
+#: src/skins/skins_cfg.cc:214 src/skins/skins_cfg.cc:239
 msgid "Fire"
 msgstr "火焰"
 
-#: src/skins/skins_cfg.cc:210
+#: src/skins-qt/skins_cfg.cc:233 src/skins/skins_cfg.cc:215
 msgid "Vertical lines"
 msgstr ""
 
-#: src/skins/skins_cfg.cc:214
+#: src/skins-qt/skins_cfg.cc:237 src/skins/skins_cfg.cc:219
 msgid "Lines"
 msgstr "線條"
 
-#: src/skins/skins_cfg.cc:215
+#: src/skins-qt/skins_cfg.cc:238 src/skins/skins_cfg.cc:220
 msgid "Bars"
 msgstr "棒狀"
 
-#: src/skins/skins_cfg.cc:219
+#: src/skins-qt/skins_cfg.cc:242 src/skins/skins_cfg.cc:224
 msgid "Slowest"
 msgstr "最慢"
 
-#: src/skins/skins_cfg.cc:220
+#: src/skins-qt/skins_cfg.cc:243 src/skins/skins_cfg.cc:225
 msgid "Slow"
 msgstr "慢"
 
-#: src/skins/skins_cfg.cc:221 src/sox-resampler/sox-resampler.cc:152
+#: src/skins-qt/skins_cfg.cc:244 src/skins/skins_cfg.cc:226
+#: src/soxr/sox-resampler.cc:180
 msgid "Medium"
 msgstr "中等"
 
-#: src/skins/skins_cfg.cc:222
+#: src/skins-qt/skins_cfg.cc:245 src/skins/skins_cfg.cc:227
 msgid "Fast"
 msgstr "快"
 
-#: src/skins/skins_cfg.cc:223
+#: src/skins-qt/skins_cfg.cc:246 src/skins/skins_cfg.cc:228
 msgid "Fastest"
 msgstr "最快"
 
-#: src/skins/skins_cfg.cc:227
+#: src/skins-qt/skins_cfg.cc:250 src/skins/skins_cfg.cc:232
 msgid "Dots"
 msgstr ""
 
-#: src/skins/skins_cfg.cc:228
+#: src/skins-qt/skins_cfg.cc:251 src/skins/skins_cfg.cc:233
 msgid "Line"
 msgstr ""
 
-#: src/skins/skins_cfg.cc:229
+#: src/skins-qt/skins_cfg.cc:252 src/skins/skins_cfg.cc:234
 msgid "Solid"
 msgstr ""
 
-#: src/skins/skins_cfg.cc:235
+#: src/skins-qt/skins_cfg.cc:258 src/skins/skins_cfg.cc:240
 msgid "Ice"
 msgstr "冰霜"
 
-#: src/skins/skins_cfg.cc:240
+#: src/skins-qt/skins_cfg.cc:263 src/skins/skins_cfg.cc:245
 msgid "Smooth"
 msgstr "平滑"
 
-#: src/skins/skins_cfg.cc:244
-msgid "Type"
-msgstr ""
-
-#: src/skins/skins_cfg.cc:245
-msgid "Visualization type:"
-msgstr ""
-
-#: src/skins/skins_cfg.cc:248
-msgid "Analyzer"
-msgstr ""
-
-#: src/skins/skins_cfg.cc:249
-msgid "Show peaks"
-msgstr ""
-
-#: src/skins/skins_cfg.cc:251
+#: src/skins-qt/skins_cfg.cc:267 src/skins/skins_cfg.cc:249
 msgid "Coloring:"
 msgstr ""
 
-#: src/skins/skins_cfg.cc:254
+#: src/skins-qt/skins_cfg.cc:270 src/skins/skins_cfg.cc:252
 msgid "Style:"
 msgstr ""
 
-#: src/skins/skins_cfg.cc:257
+#: src/skins-qt/skins_cfg.cc:273 src/skins/skins_cfg.cc:255
 msgid "Falloff:"
 msgstr ""
 
-#: src/skins/skins_cfg.cc:260
+#: src/skins-qt/skins_cfg.cc:276 src/skins/skins_cfg.cc:258
 msgid "Peak falloff:"
 msgstr ""
 
-#: src/skins/skins_cfg.cc:264
+#: src/skins-qt/skins_cfg.cc:282 src/skins/skins_cfg.cc:264
 msgid "Scope Style:"
 msgstr ""
 
-#: src/skins/skins_cfg.cc:267
+#: src/skins-qt/skins_cfg.cc:285 src/skins/skins_cfg.cc:267
 msgid "Voiceprint Coloring:"
 msgstr ""
 
-#: src/skins/skins_cfg.cc:270
+#: src/skins-qt/skins_cfg.cc:288 src/skins/skins_cfg.cc:270
 msgid "VU Meter Style:"
 msgstr ""
 
-#: src/skins/skins_cfg.cc:276
-msgid "General"
-msgstr "一般"
-
-#: src/skins/skins_cfg.cc:277
-msgid "Visualization"
-msgstr "視覺特效"
-
-#: src/skins/ui_equalizer.cc:282
-msgid "Preamp"
-msgstr "前置放大"
-
-#: src/skins/ui_equalizer.cc:286
-msgid "31 Hz"
-msgstr "31 Hz"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "63 Hz"
-msgstr "63 Hz"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "125 Hz"
-msgstr "125 Hz"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "250 Hz"
-msgstr "250 Hz"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "500 Hz"
-msgstr "500 Hz"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "1 kHz"
-msgstr "1 kHz"
-
-#: src/skins/ui_equalizer.cc:288
-msgid "2 kHz"
-msgstr "2 kHz"
-
-#: src/skins/ui_equalizer.cc:288
-msgid "4 kHz"
-msgstr "4 kHz"
-
-#: src/skins/ui_equalizer.cc:288
-msgid "8 kHz"
-msgstr "8 kHz"
-
-#: src/skins/ui_equalizer.cc:288
-msgid "16 kHz"
-msgstr "16 kHz"
-
-#: src/skins/ui_equalizer.cc:330
-msgid "Audacious Equalizer"
-msgstr "Audacious 等化器"
-
-#: src/skins/ui_main.cc:688
-#, c-format
-msgid "Seek to %d:%-2.2d / %d:%-2.2d"
-msgstr "移動至 %d:%-2.2d／%d:%-2.2d"
-
-#: src/skins/ui_main.cc:709
-#, c-format
-msgid "Volume: %d%%"
-msgstr "音量：%d％"
-
-#: src/skins/ui_main.cc:732
-#, c-format
-msgid "Balance: %d%% left"
-msgstr "平衡：%d％ 偏左"
-
-#: src/skins/ui_main.cc:734
-msgid "Balance: center"
-msgstr "平衡：中間"
-
-#: src/skins/ui_main.cc:736
-#, c-format
-msgid "Balance: %d%% right"
-msgstr "平衡：%d％ 偏右"
-
-#: src/skins/ui_main.cc:842
-msgid "Options Menu"
-msgstr "選單選項"
-
-#: src/skins/ui_main.cc:846
-msgid "Disable 'Always On Top'"
-msgstr "關閉置頂"
-
-#: src/skins/ui_main.cc:848
-msgid "Enable 'Always On Top'"
-msgstr "啟用置頂"
-
-#: src/skins/ui_main.cc:851
-msgid "File Info Box"
-msgstr "檔案資訊視窗"
-
-#: src/skins/ui_main.cc:857
-msgid "Visualizations"
-msgstr ""
-
-#: src/skins/ui_main.cc:1336
-msgid "Repeat point A set."
-msgstr "已設定重複點 A。"
-
-#: src/skins/ui_main.cc:1341
-msgid "Repeat point B set."
-msgstr "已設定重複點 B。"
-
-#: src/skins/ui_main.cc:1350
-msgid "Repeat points cleared."
-msgstr "已清除重複點。"
-
-#: src/skins/ui_playlist.cc:219
-msgid "Search entries in active playlist"
-msgstr "在使用中的播放列表裡搜尋播放項目"
-
-#: src/skins/ui_playlist.cc:226
-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.cc:234
-msgid "Title:"
+#: src/skins-qt/skins_cfg.cc:294 src/skins/skins_cfg.cc:276
+msgid "Type"
 msgstr ""
 
-#: src/skins/ui_playlist.cc:241
-msgid "Album:"
+#: src/skins-qt/skins_cfg.cc:295 src/skins/skins_cfg.cc:277
+msgid "Visualization type:"
 msgstr ""
 
-#: src/skins/ui_playlist.cc:248
-msgid "Artist:"
+#: src/skins-qt/skins_cfg.cc:298 src/skins/skins_cfg.cc:280
+msgid "Analyzer"
 msgstr ""
 
-#: src/skins/ui_playlist.cc:255
-msgid "File Name:"
+#: src/skins-qt/skins_cfg.cc:299 src/skins/skins_cfg.cc:281
+msgid "Show peaks"
 msgstr ""
 
-#: src/skins/ui_playlist.cc:263
-msgid "Clear previous selection before searching"
-msgstr "進行搜尋前清空上次的選擇項目"
-
-#: src/skins/ui_playlist.cc:266
-msgid "Automatically toggle queue for matching entries"
-msgstr "自動切換至符合項目的佇列"
-
-#: src/skins/ui_playlist.cc:269
-msgid "Create a new playlist with matching entries"
-msgstr "以符合的項目建立新的播放列表"
-
-#: src/skins/ui_playlist.cc:717
-msgid "Audacious Playlist Editor"
-msgstr "Audacious 播放列表編輯器"
-
-#: src/skins/ui_playlist.cc:752
-#, c-format
-msgid "%s (%d of %d)"
-msgstr "%s (%d／%d)"
+#: src/skins-qt/skins_cfg.cc:308 src/skins/skins_cfg.cc:290
+msgid "Visualization"
+msgstr "視覺特效"
 
-#: src/skins/ui_skinselector.cc:167
+#: src/skins-qt/skinselector.cc:98 src/skins/skinselector.cc:111
 msgid "Archived Winamp 2.x skin"
 msgstr "壓縮的 Winamp 2.x 面板"
 
-#: src/skins/ui_skinselector.cc:172
+#: src/skins-qt/skinselector.cc:102 src/skins/skinselector.cc:115
 msgid "Unarchived Winamp 2.x skin"
 msgstr "未壓縮的 Winamp 2.x skin"
 
-#: src/skins/util.cc:430
-#, c-format
-msgid "Could not create directory (%s): %s\n"
-msgstr "無法建立資料夾 (%s)：%s\n"
-
-#: src/sndfile/plugin.cc:39
+#: src/sndfile/plugin.cc:38
 msgid "Sndfile Plugin"
 msgstr "Sndfile 外掛程式"
 
-#: src/sndfile/plugin.cc:336
+#: src/sndfile/plugin.cc:372
 msgid ""
 "Based on the xmms_sndfile plugin:\n"
 "Copyright (C) 2000, 2002 Erik de Castro Lopo\n"
@@ -3882,94 +4030,100 @@
 "Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA "
 "02110-1301, USA."
 
-#: src/sndio-ng/sndio.cc:44
+#: src/sndio/sndio.cc:43
 msgid "Sndio Output"
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:98
+#: src/sndio/sndio.cc:98
 msgid "Device (blank for default):"
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:100
+#: src/sndio/sndio.cc:100
 msgid "Save and restore volume:"
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:181
+#: src/sndio/sndio.cc:181
 #, c-format
 msgid "Sndio error: Unsupported audio format (%d)"
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:192
+#: src/sndio/sndio.cc:192
 msgid "Sndio error: sio_open() failed"
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:222
+#: src/sndio/sndio.cc:221
 msgid "Sndio error: sio_setpar() failed"
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:234
+#: src/sndio/sndio.cc:233
 msgid "Sndio error: sio_start() failed"
 msgstr ""
 
-#: src/song_change/song_change.cc:33
+#: src/songchange/song_change.cc:30
 msgid "Song Change"
 msgstr "歌曲切換"
 
-#: src/song_change/song_change.cc:342
-msgid ""
-"Parameters passed to the shell should be encapsulated in "
-"quotes. Doing otherwise is a security risk."
-msgstr ""
-"傳給 shell 的參數應該用雙引號包起來，否則會有安全風險。</"
-"span>"
-
-#: src/song_change/song_change.cc:358
+#: src/songchange/song_change.cc:256
 msgid "Commands"
 msgstr ""
 
-#: src/song_change/song_change.cc:360
+#: src/songchange/song_change.cc:258
 msgid "Command to run when starting a new song:"
 msgstr ""
 
-#: src/song_change/song_change.cc:364
+#: src/songchange/song_change.cc:261
+msgid "Command to run when stopping a song:"
+msgstr ""
+
+#: src/songchange/song_change.cc:264
 msgid "Command to run at the end of a song:"
 msgstr ""
 
-#: src/song_change/song_change.cc:368
+#: src/songchange/song_change.cc:267
 msgid "Command to run at the end of the playlist:"
 msgstr ""
 
-#: src/song_change/song_change.cc:372
+#: src/songchange/song_change.cc:270
 msgid "Command to run when song title changes (for network streams):"
 msgstr ""
 
-#: src/song_change/song_change.cc:376
+#: src/songchange/song_change.cc:273
 msgid ""
-"You can use the following format strings which will be substituted before "
-"calling the command (not all are useful for the end-of-playlist command):\n"
-"\n"
-"%F: Frequency (in hertz)\n"
+"You can use the following format codes, which will be replaced before "
+"running the command.\n"
+"Not all are useful though for the song-stopped or end-of-playlist command."
+msgstr ""
+
+#: src/songchange/song_change.cc:276
+msgid ""
+"%a: Artist\n"
+"%b: Album\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"
+"%F: Frequency (Hertz)\n"
+"%l: Length (milliseconds)\n"
+"%n or %s: Formatted title (see playlist settings)\n"
 "%p: Currently playing (1 or 0)\n"
-"%a: Artist\n"
-"%b: Album\n"
-"%T: Track title"
+"%r: Rate (bits per second)\n"
+"%t: Playlist position\n"
+"%T: Title (unformatted)"
 msgstr ""
 
-#: src/song-info-qt/song-info.cc:32
-msgid "Song Info (Qt)"
+#: src/songchange/song_change.cc:287
+msgid ""
+"Parameters passed to the shell should be enclosed in quotation marks.\n"
+"Unquoted parameters may lead to unexpected results."
 msgstr ""
 
-#: src/sox-resampler/sox-resampler.cc:44
+#: src/song-info-qt/song-info.cc:30
+msgid "Song Info"
+msgstr "歌曲資訊"
+
+#: src/soxr/sox-resampler.cc:44
 msgid "SoX Resampler"
 msgstr "SoX 重取樣"
 
-#: src/sox-resampler/sox-resampler.cc:144
+#: src/soxr/sox-resampler.cc:172
 msgid ""
 "SoX Resampler Plugin for Audacious\n"
 "Copyright 2013 Michał Lipski\n"
@@ -3983,95 +4137,135 @@
 "基於取樣率轉換器外掛程式：\n"
 "著作權 2010-2012 John Lindgren"
 
-#: src/sox-resampler/sox-resampler.cc:150
+#: src/soxr/sox-resampler.cc:178
 msgid "Quick"
 msgstr "快速"
 
-#: src/sox-resampler/sox-resampler.cc:151
+#: src/soxr/sox-resampler.cc:179
 msgid "Low"
 msgstr "低"
 
-#: src/sox-resampler/sox-resampler.cc:153
+#: src/soxr/sox-resampler.cc:181
 msgid "High"
 msgstr "高"
 
-#: src/sox-resampler/sox-resampler.cc:154
+#: src/soxr/sox-resampler.cc:182
 msgid "Very High"
 msgstr "非常高"
 
-#: src/sox-resampler/sox-resampler.cc:158
+#: src/soxr/sox-resampler.cc:183
+msgid "Ultra High"
+msgstr ""
+
+#: src/soxr/sox-resampler.cc:187
+msgid "Minimum"
+msgstr ""
+
+#: src/soxr/sox-resampler.cc:188
+msgid "Intermediate"
+msgstr ""
+
+#: src/soxr/sox-resampler.cc:193
 msgid "Quality:"
 msgstr "品質："
 
-#: src/speed-pitch/speed-pitch.cc:51
+#: src/soxr/sox-resampler.cc:196
+msgid "Phase:"
+msgstr ""
+
+#: src/soxr/sox-resampler.cc:200
+msgid "Allow aliasing"
+msgstr ""
+
+#: src/soxr/sox-resampler.cc:202
+msgid "Use steep filter"
+msgstr ""
+
+#: src/speedpitch/speed-pitch.cc:54
 msgid "Speed and Pitch"
 msgstr "速度與音高"
 
-#: src/speed-pitch/speed-pitch.cc:210
-msgid "Speed and Pitch"
-msgstr "速度與音高"
-
-#: src/speed-pitch/speed-pitch.cc:211
-msgid "Speed:"
-msgstr "速度："
-
-#: src/speed-pitch/speed-pitch.cc:214
-msgid "Pitch:"
-msgstr "音高："
+#: src/speedpitch/speed-pitch.cc:247
+msgid "Speed"
+msgstr ""
 
-#: src/statusicon/statusicon.cc:47
-msgid "Status Icon"
-msgstr "狀態圖示"
+#: src/speedpitch/speed-pitch.cc:248
+msgid "Decouple from pitch"
+msgstr ""
 
-#: src/statusicon/statusicon.cc:283
-msgid "Se_ttings ..."
+#: src/speedpitch/speed-pitch.cc:250 src/speedpitch/speed-pitch.cc:258
+msgid "Multiplier:"
+msgstr ""
+
+#: src/speedpitch/speed-pitch.cc:254
+msgid "Pitch"
 msgstr ""
 
-#: src/statusicon/statusicon.cc:372
+#: src/statusicon-qt/statusicon.cc:45 src/statusicon/statusicon.cc:47
+msgid "Status Icon"
+msgstr "狀態圖示"
+
+#: src/statusicon-qt/statusicon.cc:68
 msgid ""
-"Status Icon Plugin\n"
+"Status Icon Plugin (partial port for Qt interface)\n"
 "\n"
 "Copyright 2005-2007 Giacomo Lozito <james@develia.org>\n"
 "Copyright 2010 Michał Lipski <tallica@o2.pl>\n"
+"Copyright 2015 Eugene Paskevich <eugene@raptor.kiev.ua>\n"
 "\n"
 "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"
-"這個外掛提供一個狀態圖示並放在系統通知區。"
 
-#: src/statusicon/statusicon.cc:379
+#: src/statusicon-qt/statusicon.cc:89 src/statusicon/statusicon.cc:384
 msgid "Mouse Scroll Action"
 msgstr "滑鼠滾輪動作"
 
-#: src/statusicon/statusicon.cc:380
+#: src/statusicon-qt/statusicon.cc:90 src/statusicon/statusicon.cc:385
 msgid "Change volume"
 msgstr "調整音量"
 
-#: src/statusicon/statusicon.cc:383
+#: src/statusicon-qt/statusicon.cc:93 src/statusicon/statusicon.cc:388
 msgid "Change playing song"
 msgstr "切換播放歌曲"
 
-#: src/statusicon/statusicon.cc:386
+#: src/statusicon-qt/statusicon.cc:96 src/statusicon/statusicon.cc:391
 msgid "Other Settings"
 msgstr "其他設定"
 
-#: src/statusicon/statusicon.cc:387
+#: src/statusicon-qt/statusicon.cc:97 src/statusicon/statusicon.cc:392
 msgid "Disable the popup window"
 msgstr "關閉彈出式視窗"
 
-#: src/statusicon/statusicon.cc:389
+#: src/statusicon-qt/statusicon.cc:99 src/statusicon/statusicon.cc:394
 msgid "Close to the system tray"
 msgstr "縮到系統列"
 
-#: src/statusicon/statusicon.cc:391
+#: src/statusicon-qt/statusicon.cc:101 src/statusicon/statusicon.cc:396
 msgid "Advance in playlist when scrolling upward"
 msgstr "以與滑鼠滾輪的反方向切換歌曲"
 
+#: src/statusicon-qt/statusicon.cc:116 src/statusicon/statusicon.cc:287
+msgid "Se_ttings ..."
+msgstr ""
+
+#: src/statusicon/statusicon.cc:377
+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"
+"Copyright 2005-2007 Giacomo Lozito <james@develia.org>\n"
+"Copyright 2010 Michał Lipski <tallica@o2.pl>\n"
+"\n"
+"這個外掛提供一個狀態圖示並放在系統通知區。"
+
 #: src/stereo_plugin/stereo.cc:19
 msgid "Extra Stereo"
 msgstr "額外立體聲效果"
@@ -4090,20 +4284,160 @@
 msgid "Extra Stereo"
 msgstr "額外立體聲效果"
 
+#: src/streamtuner/icecast-model.cc:126 src/streamtuner/shoutcast-model.cc:131
+msgid "Type"
+msgstr ""
+
+#: src/streamtuner/icecast-model.cc:132
+msgid "Current Song"
+msgstr ""
+
+#: src/streamtuner/icecast-model.cc:164
+msgid "Other"
+msgstr ""
+
+#: src/streamtuner/ihr-model.cc:63
+msgid "Market"
+msgstr ""
+
+#: src/streamtuner/ihr-model.cc:156
+msgid "Call Letters"
+msgstr ""
+
+#: src/streamtuner/ihr-model.cc:162
+msgid "Description"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:128
+msgid "Listeners"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:188
+msgid "Top 500 Stations"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:189
+msgid "Alternative"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:190
+msgid "Blues"
+msgstr "藍調"
+
+#: src/streamtuner/shoutcast-model.cc:191
+msgid "Classical"
+msgstr "古典"
+
+#: src/streamtuner/shoutcast-model.cc:192
+msgid "Country"
+msgstr "鄉村"
+
+#: src/streamtuner/shoutcast-model.cc:193
+msgid "Decades"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:194
+msgid "Easy Listening"
+msgstr "輕音樂"
+
+#: src/streamtuner/shoutcast-model.cc:195
+msgid "Electronic"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:196
+msgid "Folk"
+msgstr "民謠"
+
+#: src/streamtuner/shoutcast-model.cc:197
+msgid "Inspirational"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:198
+msgid "International"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:199
+msgid "Jazz"
+msgstr "爵士"
+
+#: src/streamtuner/shoutcast-model.cc:200
+msgid "Latin"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:201
+msgid "Metal"
+msgstr "金屬"
+
+#: src/streamtuner/shoutcast-model.cc:203
+msgid "New Age"
+msgstr "新世紀"
+
+#: src/streamtuner/shoutcast-model.cc:204
+msgid "Pop"
+msgstr "流行"
+
+#: src/streamtuner/shoutcast-model.cc:205
+msgid "Public Radio"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:206
+msgid "R&B and Urban"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:207
+msgid "Rap"
+msgstr "說唱"
+
+#: src/streamtuner/shoutcast-model.cc:208
+msgid "Reggae"
+msgstr "雷鬼"
+
+#: src/streamtuner/shoutcast-model.cc:209
+msgid "Rock"
+msgstr "搖滾 (Rock)"
+
+#: src/streamtuner/shoutcast-model.cc:210
+msgid "Seasonal and Holiday"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:211
+msgid "Soundtracks"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:212
+msgid "Talk"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:213
+msgid "Themes"
+msgstr ""
+
+#: src/streamtuner/streamtuner.cc:59
+msgid "Shoutcast"
+msgstr ""
+
+#: src/streamtuner/streamtuner.cc:60
+msgid "Icecast"
+msgstr ""
+
+#: src/streamtuner/streamtuner.cc:71
+msgid "Stream Tuner"
+msgstr ""
+
 #: src/tonegen/tonegen.cc:45
 msgid "Tone Generator"
 msgstr "音調產生器"
 
-#: src/tonegen/tonegen.cc:94
+#: src/tonegen/tonegen.cc:92
 #, c-format
 msgid "%s %.1f Hz"
 msgstr "%s %.1f Hz"
 
-#: src/tonegen/tonegen.cc:94
+#: src/tonegen/tonegen.cc:92
 msgid "Tone Generator: "
 msgstr "音調產生器："
 
-#: src/tonegen/tonegen.cc:160
+#: src/tonegen/tonegen.cc:161
 msgid ""
 "Sine tone generator by Håvard Kvålen <havardk@xmms.org>\n"
 "Modified by Daniel J. Peng <danielpeng@bigfoot.com>\n"
@@ -4117,11 +4451,32 @@
 "用法：加入網址：tone://frequency1;frequency2;frequency3;…\n"
 "範例：tone://2000;2005 會播放 2000 HZ 和 2005HZ 的正弦波"
 
+#: src/ui-common/dialogs-qt.cc:40
+msgid ""
+"\n"
+"(Further messages have been hidden.)"
+msgstr ""
+"\n"
+"(詳細訊息已被隱藏。)"
+
+#: src/ui-common/dialogs-qt.cc:52
+msgid "Working ..."
+msgstr ""
+
+#: src/ui-common/dialogs-qt.cc:73
+msgid "Information"
+msgstr ""
+
+#: src/ui-common/menu-ops-gtk.cc:132 src/ui-common/menu-ops-qt.cc:113
+#, c-format
+msgid "%s does not appear to be a valid folder."
+msgstr ""
+
 #: src/voice_removal/voice_removal.cc:28
 msgid "Voice Removal"
 msgstr "人聲移除"
 
-#: src/vorbis/vorbis.cc:465
+#: src/vorbis/vorbis.cc:433
 msgid ""
 "Audacious Ogg Vorbis Decoder\n"
 "\n"
@@ -4163,12 +4518,12 @@
 msgid "Ogg Vorbis Decoder"
 msgstr "Ogg Vorbis 解碼器"
 
-#: src/vtx/info.cc:22
+#: src/vtx/info.cc:24
 #, c-format
 msgid "Details about %s"
 msgstr ""
 
-#: src/vtx/info.cc:24
+#: src/vtx/info.cc:26
 msgid ""
 "Title: %t\n"
 "Author: %a\n"
@@ -4187,7 +4542,7 @@
 msgid "VTX Decoder"
 msgstr "VTX 解碼器"
 
-#: src/vtx/vtx.cc:184
+#: src/vtx/vtx.cc:178
 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"
@@ -4197,19 +4552,59 @@
 "基於 invtx(_V).dll 編寫自 Roman Sherbakov <v_soft@microfor.ru>\n"
 "Audacious 外掛程式編寫自 Pavel Vymetalek <pvymetalek@seznam.cz>"
 
-#: src/wavpack/wavpack.cc:24
+#: src/vumeter-qt/vumeter_qt.cc:31
+msgid ""
+"VU Meter Plugin for Audacious\n"
+"Copyright 2017-2019 Marc Sánchez Fauste"
+msgstr ""
+
+#: src/vumeter-qt/vumeter_qt.cc:35
+msgid "VU Meter Settings"
+msgstr ""
+
+#: src/vumeter-qt/vumeter_qt.cc:37
+msgid "Peak hold time:"
+msgstr ""
+
+#: src/vumeter-qt/vumeter_qt.cc:42
+msgid "Fall-off time:"
+msgstr ""
+
+#: src/vumeter-qt/vumeter_qt.cc:44
+msgid "dB/second"
+msgstr ""
+
+#: src/vumeter-qt/vumeter_qt.cc:46
+msgid "Display legend"
+msgstr ""
+
+#: src/vumeter-qt/vumeter_qt.h:37
+msgid "VU Meter"
+msgstr ""
+
+#: src/waveout/waveout.cc:43
+msgid "Win32 waveOut"
+msgstr ""
+
+#: src/waveout/waveout.cc:69
+msgid ""
+"Win32 waveOut Plugin for Audacious\n"
+"Copyright 2016 John Lindgren"
+msgstr ""
+
+#: src/wavpack/wavpack.cc:25
 msgid "WavPack Decoder"
 msgstr "WavPack 解碼器"
 
-#: src/wavpack/wavpack.cc:211
+#: src/wavpack/wavpack.cc:217
 msgid "lossy (hybrid)"
 msgstr "失真 (混合)"
 
-#: src/wavpack/wavpack.cc:213
+#: src/wavpack/wavpack.cc:219
 msgid "lossy"
 msgstr "失真"
 
-#: src/wavpack/wavpack.cc:255
+#: src/wavpack/wavpack.cc:259
 msgid ""
 "Copyright 2006 William Pitcock <nenolod@nenolod.net>\n"
 "\n"
@@ -4219,18 +4614,38 @@
 "\n"
 "其中一些外掛程式碼是由 Miles Egan 編寫。"
 
-#: src/xsf/plugin.cc:50
+#: src/xsf/plugin.cc:74
 msgid "2SF Decoder"
 msgstr "2SF 解碼器"
 
-#: src/xsf/plugin.cc:238
+#: src/xsf/plugin.cc:429
+msgid "32728 Hz"
+msgstr ""
+
+#: src/xsf/plugin.cc:432
+msgid "65456 Hz"
+msgstr ""
+
+#: src/xsf/plugin.cc:438
+msgid "Cosine"
+msgstr ""
+
+#: src/xsf/plugin.cc:439
+msgid "Sharp"
+msgstr ""
+
+#: src/xsf/plugin.cc:443
 msgid "XSF Configuration"
 msgstr ""
 
-#: src/xsf/plugin.cc:239
-msgid "Ignore length from file"
+#: src/xsf/plugin.cc:445
+msgid "Default fade time:"
+msgstr ""
+
+#: src/xsf/plugin.cc:447
+msgid "Interpolation mode:"
 msgstr ""
 
-#: src/xspf/xspf.cc:89
+#: src/xspf/xspf.cc:95
 msgid "XML Shareable Playlists (XSPF)"
 msgstr "XML 可分享式播放列表 (XSPF)"

audacious-plugins-3.6.2-gtk3.tar.bz2/po/cs.po -> audacious-plugins-4.4.1.tar.bz2/po/cs.po Changed

@@ -3,294 +3,91 @@
 # This file is distributed under the same license as the Audacious Plugins package.
 #
 # Translators:
-# Jiří Vírava <appukonrad@gmail.com>, 2012-2013
+# Appukonrad <appukonrad@gmail.com>, 2012-2013
 # Based on audacious-1.2.2.cs.po by Jan Nárovec <finn@sendmail.cz>, 2004
 # fri, 2012-2013
-# nd76er <nd76er@gmail.com>, 2014
-# nd76er <nd76er@gmail.com>, 2014-2015
+# Andy Andy <nd76er@gmail.com>, 2014
+# Lukáš Kotek <lkotek@suse.com>, 2020
+# IAmNotImportant, 2016-2017
+# Andy Andy <nd76er@gmail.com>, 2014-2015
 # fri, 2014
 # fri, 2012
 # Petr Pisar <petr.pisar@atlas.cz>, 2007-2012
 # Petr Šimáček <petr.simacek@gmail.com>, 2012
 # Petr Šimáček <petr.simacek@gmail.com>, 2012
-# Petr Šimáček <petr.simacek@gmail.com>, 2013-2014
+# Petr Šimáček <petr.simacek@gmail.com>, 2013-2014,2017
+# Roman Horník <roman.hornik@debian-linux.cz>, 2016,2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Audacious Plugins\n"
-"Report-Msgid-Bugs-To: http://redmine.audacious-media-player.org/\n"
-"POT-Creation-Date: 2015-04-03 11:52+0200\n"
-"PO-Revision-Date: 2015-02-27 10:53+0000\n"
-"Last-Translator: nd76er <nd76er@gmail.com>\n"
-"Language-Team: Czech (http://www.transifex.com/projects/p/audacious/language/"
+"Report-Msgid-Bugs-To: https://github.com/audacious-media-player/audacious/"
+"issues\n"
+"POT-Creation-Date: 2024-09-26 21:54+0200\n"
+"PO-Revision-Date: 2011-10-10 17:43+0000\n"
+"Last-Translator: Lukáš Kotek <lkotek@suse.com>, 2020\n"
+"Language-Team: Czech (http://app.transifex.com/audacious/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"
-"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n "
+"<= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;\n"
 
-#: src/aac-raw/aac.cc:18
+#: src/aac/aac.cc:19
 msgid "AAC (Raw) Decoder"
 msgstr "AAC (Raw) dekodér"
 
-#: src/adplug/adplug-xmms.cc:42
+#: src/adplug/adplug-xmms.cc:70
 msgid "AdPlug (AdLib Player)"
 msgstr "AdPlug (AdLib přehrávač)"
 
-#: src/adplug/adplug-xmms.cc:156 src/modplug/modplugbmp.cc:335
-#: src/psf/plugin.cc:138 src/vtx/vtx.cc:87 src/xsf/plugin.cc:113
+#: src/adplug/adplug-xmms.cc:167 src/modplug/modplugbmp.cc:321
+#: src/psf/plugin.cc:161 src/vtx/vtx.cc:89 src/xsf/plugin.cc:204
 msgid "sequenced"
 msgstr "seřazen"
 
-#: src/alarm/alarm.cc:55 src/alarm/interface.cc:82
-msgid "Alarm"
-msgstr "Budík"
-
-#: src/alarm/alarm.cc:782
-msgid "Set Alarm ..."
-msgstr "Nastavit budík"
-
-#: src/alarm/alarm.cc:810
-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"
-"\n"
-"Původně napsal Adam Feakin a Daniel Stodden."
-
-#: src/alarm/interface.cc: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 ""
-"Čas\n"
-"Budit v:\n"
-"Čas pro spuštění budíku.\n"
-"\n"
-"Ticho po:\n"
-"Zastavit budík po nastaveném čase.\n"
-"(jestliže dialog probuzení není zavřený)\n"
-"\n"
-"\n"
-"Dny\n"
-" Den:\n"
-"Nastavit dny, v kterých se má budík spouštět.\n"
-"\n"
-" Čas:\n"
-"Vybrat čas budíku na každý den nebo zaškrtnout tlačítko pro použití "
-"standardního času.\n"
-"\n"
-
-#: src/alarm/interface.cc: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.cc: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 ""
-"Seznam skladeb:\n"
-"Nahraj tento seznam skladeb. Jestliže není\n"
-"žádný dán, bude použit aktuální.\n"
-"URL mp3/ogg proudu se zde může také vložit.\n"
-"\n"
-"Upomínka:\n"
-"Zobraz upomínku, když se budík vypne.\n"
-"Napiš upomínku do rámečku a zapni přepínací tlačítko, \n"
-"jestli chceš aby se zobrazovala."
-
-#: src/alarm/interface.cc:81
-msgid "This is your wakeup call."
-msgstr "Toto je váš budící signál."
-
-#: src/alarm/interface.cc:99
-msgid "Your reminder for today is..."
-msgstr "Vaše připomínka pro dnešek je..."
-
-#: src/alarm/interface.cc:101 src/alarm/interface.cc:386
-msgid "Reminder"
-msgstr "Upomínání"
-
-#: src/alarm/interface.cc:132
-msgid "Monday"
-msgstr "Pondělí"
-
-#: src/alarm/interface.cc:132
-msgid "Tuesday"
-msgstr "Úterý"
-
-#: src/alarm/interface.cc:132
-msgid "Wednesday"
-msgstr "Středa"
-
-#: src/alarm/interface.cc:133
-msgid "Thursday"
-msgstr "Čtvrtek"
-
-#: src/alarm/interface.cc:133
-msgid "Friday"
-msgstr "Pátek"
-
-#: src/alarm/interface.cc:133
-msgid "Saturday"
-msgstr "Sobota"
-
-#: src/alarm/interface.cc:133
-msgid "Sunday"
-msgstr "Neděle"
-
-#: src/alarm/interface.cc:171 src/alarm/interface.cc:230
-#: src/alarm/interface.cc:245
-msgid "Time"
-msgstr "Čas"
-
-#: src/alarm/interface.cc:178
-msgid "Alarm at (default):"
-msgstr "Budit v (standardní):"
-
-#: src/alarm/interface.cc:200
-msgid "h"
-msgstr "h"
-
-#: src/alarm/interface.cc:203
-msgid "Quiet after:"
-msgstr "Ticho po:"
-
-#: src/alarm/interface.cc:215
-msgid "hours"
-msgstr "h"
-
-#: src/alarm/interface.cc:226
-msgid "minutes"
-msgstr "min"
-
-#: src/alarm/interface.cc:235
-msgid "Choose the days for the alarm to come on"
-msgstr "Vyberte dny, kdy má budík budit"
-
-#: src/alarm/interface.cc:242
-msgid "Day"
-msgstr "Den"
-
-#: src/alarm/interface.cc:259 src/bs2b/plugin.cc:130
-#: src/skins/preset-list.cc:434 src/skins/preset-list.cc:440
-msgid "Default"
-msgstr "Standardní"
+#: src/adplug/adplug-xmms.cc:349 src/sid/xs_config.cc:61
+msgid "Output"
+msgstr "Výstup"
 
-#: src/alarm/interface.cc:288
-msgid "Days"
-msgstr "Dny"
-
-#: src/alarm/interface.cc:297
-msgid "Fading"
-msgstr "Zesilování"
-
-#: src/alarm/interface.cc:305 src/console/plugin.cc:41
-#: src/crossfade/crossfade.cc:53 src/crossfade/crossfade.cc:59
-#: src/gtkui/settings.cc:49 src/lirc/lirc.cc:397 src/sid/xs_config.cc:85
-#: src/sid/xs_config.cc:94 src/sid/xs_config.cc:103
-msgid "seconds"
-msgstr "sekund"
+#: src/adplug/adplug-xmms.cc:350
+msgid "OPL Emulator:"
+msgstr "OPL emulátor:"
+
+#: src/adplug/adplug-xmms.cc:353 src/amidiplug/i_configure.cc:153
+#: src/console/plugin.cc:45 src/filewriter/filewriter.cc:481
+#: src/sid/xs_config.cc:65 src/xsf/plugin.cc:446
+msgid "Sample rate:"
+msgstr "Vzorkovací frekvence:"
 
-#: src/alarm/interface.cc:312 src/alarm/interface.cc:353
-msgid "Volume"
-msgstr "Hlasitost"
-
-#: src/alarm/interface.cc:317
-msgid "Start at"
-msgstr "Začít na"
-
-#: src/alarm/interface.cc:333
-msgid "Final"
-msgstr "Skončit na"
-
-#: src/alarm/interface.cc:346
-msgid "Current"
-msgstr "Současná"
-
-#: src/alarm/interface.cc:359
-msgid "Additional Command"
-msgstr "Dodatečný příkaz"
-
-#: src/alarm/interface.cc:365 src/alarm/interface.cc:391
-msgid "enable"
-msgstr "zapnout"
-
-#: src/alarm/interface.cc:372
-msgid "Playlist (optional)"
-msgstr "Seznam skladeb (volitelné)"
-
-#: src/alarm/interface.cc:379
-msgid "Select a playlist"
-msgstr "Vybrat seznam skladeb"
+#: src/adplug/adplug-xmms.cc:354 src/amidiplug/i_configure.cc:155
+#: src/bs2b/plugin.cc:141 src/console/plugin.cc:47
+#: src/modplug/plugin_main.cc:77 src/resample/resample.cc:201
+#: src/resample/resample.cc:207 src/resample/resample.cc:211
+#: src/resample/resample.cc:215 src/resample/resample.cc:219
+#: src/resample/resample.cc:223 src/resample/resample.cc:227
+#: src/resample/resample.cc:231 src/resample/resample.cc:235
+#: src/resample/resample.cc:239 src/resample/resample.cc:243
+#: src/sid/xs_config.cc:67 src/soxr/sox-resampler.cc:205
+msgid "Hz"
+msgstr "Hz"
 
-#: src/alarm/interface.cc:399
-msgid "Options"
-msgstr "Nastavení"
+#: src/adplug/adplug-xmms.cc:355 src/gtkui/settings.cc:55
+#: src/modplug/plugin_main.cc:105 src/qtui/settings.cc:85
+#: src/skins-qt/skins_cfg.cc:302 src/skins/skins_cfg.cc:284
+msgid "Miscellaneous"
+msgstr "Různé"
 
-#: src/alarm/interface.cc:404
-msgid "What do these options mean?"
-msgstr "Co tyto volby znamenají?"
-
-#: src/alarm/interface.cc:420
-msgid "Help"
-msgstr "Nápověda"
+#: src/adplug/adplug-xmms.cc:356
+msgid "Repeat song in endless loop"
+msgstr "Opakovat nahrávku v nekonečné smyčce"
 
-#: src/albumart/albumart.cc:31
+#: src/albumart/albumart.cc:31 src/albumart-qt/albumart.cc:35
 msgid "Album Art"
-msgstr "Album"
+msgstr "Obal alba"
 
-#: src/albumart-qt/albumart.cc:33
-msgid "Album Art (Qt)"
-msgstr "Obal alba (Qt)"
-
-#: src/alsa/alsa.h:70
+#: src/alsa/alsa.h:64
 msgid "ALSA Output"
 msgstr "ALSA výstup:"
 
@@ -310,15 +107,15 @@
 
 #: src/alsa/config.cc:61
 msgid "(no description)"
-msgstr ""
+msgstr "(bez popisu)"
 
 #: src/alsa/config.cc:166
 msgid "Default PCM device"
-msgstr "Implicitní PCM zařízení"
+msgstr "Výchozí PCM zařízení"
 
 #: src/alsa/config.cc:188
 msgid "Default mixer device"
-msgstr "Implicitní směšovací zařízení"
+msgstr "Výchozí směšovací zařízení"
 
 #: src/alsa/config.cc:296
 msgid "PCM device:"
@@ -332,11 +129,11 @@
 msgid "Mixer element:"
 msgstr "Prvek směšovače:"
 
-#: src/amidi-plug/amidi-plug.cc:41
+#: src/amidiplug/amidi-plug.cc:42
 msgid "AMIDI-Plug (MIDI Player)"
 msgstr "AMIDI-Plug (MIDI přehrávač)"
 
-#: src/amidi-plug/amidi-plug.cc:437
+#: src/amidiplug/amidi-plug.cc:445
 msgid ""
 "AMIDI-Plug\n"
 "modular MIDI music player\n"
@@ -358,158 +155,181 @@
 "Tony Vroon\n"
 "for the good help with alpha testing"
 msgstr ""
+"AMIDI-Olug\n"
+"modulární hudební přehrávač MIDI\n"
+"http://www.develia.org/projects.php?p=amidiplug\n"
+"\n"
+"napsal Giacomo Lozito\n"
+"<james@develia.org>\n"
+"\n"
+"zvláštní poděkování náleží:\n"
+"\n"
+"Clemens Ladisch a Jaroslav Kysela\n"
+"pro jejich skvostné programy aplaymidi a amixer; tyto\n"
+"byly vskutku užitečné, společně s dokumentací pro alsa-lib,\n"
+"díky nimž jsem se dozvěděl více o ALSA API\n"
+"\n"
+"Alfredo Spadafina\n"
+"za krásné logo MIDI klávesnice\n"
+"\n"
+"Tony Vroon\n"
+"za hodnotnou pomoc při alfatestování"
 
-#: src/amidi-plug/i_configure.cc:94
+#: src/amidiplug/i_configure.cc:94
 msgid "Override default gain:"
 msgstr "Potlačit výchozí zesílení:"
 
-#: src/amidi-plug/i_configure.cc:102
+#: src/amidiplug/i_configure.cc:102
 msgid "Override default polyphony:"
 msgstr "Potlačit výchozí vícehlas:"
 
-#: src/amidi-plug/i_configure.cc:110
+#: src/amidiplug/i_configure.cc:110
 msgid "Override default reverb:"
 msgstr "Potlačit výchozí dozvuk:"
 
-#: src/amidi-plug/i_configure.cc:112 src/amidi-plug/i_configure.cc:120
+#: src/amidiplug/i_configure.cc:112 src/amidiplug/i_configure.cc:120
 msgid "On"
 msgstr "On"
 
-#: src/amidi-plug/i_configure.cc:118
+#: src/amidiplug/i_configure.cc:118
 msgid "Override default chorus:"
 msgstr "Potlačit výchozí sbor:"
 
-#: src/amidi-plug/i_configure.cc:128 src/console/plugin.cc:29
+#: src/amidiplug/i_configure.cc:128 src/console/plugin.cc:29
 msgid "Playback"
-msgstr "Playback"
+msgstr "Přehrávání"
 
-#: src/amidi-plug/i_configure.cc:129
+#: src/amidiplug/i_configure.cc:129
 msgid "Transpose:"
 msgstr "Transponovat: "
 
-#: src/amidi-plug/i_configure.cc:131
+#: src/amidiplug/i_configure.cc:131 src/speedpitch/speed-pitch.cc:257
 msgid "semitones"
 msgstr "půltóny"
 
-#: src/amidi-plug/i_configure.cc:132
+#: src/amidiplug/i_configure.cc:132
 msgid "Drum shift:"
 msgstr "Posun bubnu: "
 
-#: src/amidi-plug/i_configure.cc:134
+#: src/amidiplug/i_configure.cc:134
 msgid "note numbers"
 msgstr "čísla poznámek"
 
-#: src/amidi-plug/i_configure.cc:135
+#: src/amidiplug/i_configure.cc:135
 msgid "Skip leading silence"
 msgstr "Přeskočit ticho na začátku"
 
-#: src/amidi-plug/i_configure.cc:137
+#: src/amidiplug/i_configure.cc:137
 msgid "Skip trailing silence"
 msgstr "Přeskočit ticho na konci"
 
-#: src/amidi-plug/i_configure.cc:141
+#: src/amidiplug/i_configure.cc:141
 msgid "SoundFont"
 msgstr "SoundFont"
 
-#: src/amidi-plug/i_configure.cc:143
+#: src/amidiplug/i_configure.cc:148
 msgid "Synthesizer"
 msgstr "Synthesizer"
 
-#: src/amidi-plug/i_configure.cc:148 src/console/plugin.cc:45
-#: src/sid/xs_config.cc:65
-msgid "Sample rate:"
-msgstr "Vzorkovací frekvence:"
-
-#: src/amidi-plug/i_configure.cc:150 src/bs2b/plugin.cc:141
-#: src/console/plugin.cc:47 src/modplug/plugin_main.cc:78
-#: src/resample/resample.cc:201 src/resample/resample.cc:207
-#: src/resample/resample.cc:211 src/resample/resample.cc:215
-#: src/resample/resample.cc:219 src/resample/resample.cc:223
-#: src/resample/resample.cc:227 src/resample/resample.cc:231
-#: src/resample/resample.cc:235 src/resample/resample.cc:239
-#: src/resample/resample.cc:243 src/sid/xs_config.cc:67
-#: src/sox-resampler/sox-resampler.cc:163
-msgid "Hz"
-msgstr "Hz"
-
-#: src/amidi-plug/i_configure-fluidsynth.cc:52
+#: src/amidiplug/i_configure-fluidsynth.cc:58
+#: src/amidiplug/i_configure-fluidsynth.cc:527
 msgid "AMIDI-Plug - select SoundFont file"
 msgstr "AMIDI-Plug – vyberte soundfontový soubor"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:55 src/filewriter/mp3.cc:658
+#: src/amidiplug/i_configure-fluidsynth.cc:61
 msgid "_Cancel"
 msgstr "_Zrušit"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:56
+#: src/amidiplug/i_configure-fluidsynth.cc:62
 msgid "_Open"
 msgstr "_Otevřít"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:225 src/gtkui/columns.cc:46
+#: src/amidiplug/i_configure-fluidsynth.cc:233
+#: src/amidiplug/i_configure-fluidsynth.cc:461
 msgid "File name"
 msgstr "Název souboru"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:229
+#: src/amidiplug/i_configure-fluidsynth.cc:237
+#: src/amidiplug/i_configure-fluidsynth.cc:464
 msgid "Size (bytes)"
 msgstr "Velikost (v bajtech):"
 
-#: src/amidi-plug/i_fileinfo.cc:163
+#: src/amidiplug/i_fileinfo.cc:184
 msgid "Name:"
 msgstr "Jméno:"
 
-#: src/amidi-plug/i_fileinfo.cc:181
+#: src/amidiplug/i_fileinfo.cc:202
 msgid " MIDI Info "
 msgstr " Podrobnosti o MIDI "
 
-#: src/amidi-plug/i_fileinfo.cc:195
+#: src/amidiplug/i_fileinfo.cc:216
 msgid "Format:"
 msgstr "Formát:"
 
-#: src/amidi-plug/i_fileinfo.cc:198
+#: src/amidiplug/i_fileinfo.cc:219
 msgid "Length (msec):"
 msgstr "Délka (ms):"
 
-#: src/amidi-plug/i_fileinfo.cc:201
+#: src/amidiplug/i_fileinfo.cc:222
 msgid "No. of Tracks:"
-msgstr "č. skladby"
+msgstr "Počet stop:"
 
-#: src/amidi-plug/i_fileinfo.cc:207
+#: src/amidiplug/i_fileinfo.cc:228
 msgid "variable"
 msgstr "proměnlivé"
 
-#: src/amidi-plug/i_fileinfo.cc:209
+#: src/amidiplug/i_fileinfo.cc:230
 msgid "BPM:"
 msgstr "BPM:"
 
-#: src/amidi-plug/i_fileinfo.cc:217
+#: src/amidiplug/i_fileinfo.cc:238
 msgid "BPM (wavg):"
 msgstr "BPM (váž.):"
 
-#: src/amidi-plug/i_fileinfo.cc:220
+#: src/amidiplug/i_fileinfo.cc:241
 msgid "Time Div:"
 msgstr "Čas. pom.:"
 
-#: src/amidi-plug/i_fileinfo.cc:231
+#: src/amidiplug/i_fileinfo.cc:252
 msgid " MIDI Comments and Lyrics "
 msgstr " Komentáře a text MIDI skladby "
 
-#: src/amidi-plug/i_fileinfo.cc:278
+#: src/amidiplug/i_fileinfo.cc:299
 msgid "* no comments available in this MIDI file *"
 msgstr "* v MIDI souboru se nenachází žádné komentáře *"
 
-#: src/amidi-plug/i_fileinfo.cc:290
+#: src/amidiplug/i_fileinfo.cc:311
 msgid "* no lyrics available in this MIDI file *"
 msgstr "* v MIDI souboru se nenachází text skladby *"
 
-#: src/amidi-plug/i_fileinfo.cc:300 src/filewriter/vorbis.cc:197
-#: src/ladspa/plugin.cc:416
+#: src/amidiplug/i_fileinfo.cc:321 src/ladspa/plugin.cc:418
+#: src/ui-common/dialogs-qt.cc:32
 msgid "_Close"
 msgstr "_Zavřít"
 
-#: src/amidi-plug/i_fileinfo.cc:325
+#: src/amidiplug/i_fileinfo.cc:346
 msgid " (invalid UTF-8)"
 msgstr " (neplatné UTF8)"
 
-#: src/aosd/aosd.cc:32
+#: src/ampache/ampache.cc:33
+msgid "Ampache Browser"
+msgstr "Ampache browser"
+
+#: src/ampache/ampache.cc:46
+msgid ""
+"Ampache Browser for Audacious\n"
+"http://ampache-browser.org/\n"
+"\n"
+"Copyright (C) Róbert Čerňanský and John Lindgren\n"
+"License: GNU GPLv3"
+msgstr ""
+"Prohlížeč Ampache pro Audacious\n"
+"http://ampache-browser.org/\n"
+"\n"
+"Copyright (C) Róbert Čerňanský a John Lindgren\n"
+"License: GNU GPLv3"
+
+#: src/aosd/aosd.cc:31
 msgid ""
 "Audacious OSD\n"
 "http://www.develia.org/projects.php?p=audacious#aosd\n"
@@ -519,6 +339,13 @@
 "Based in part on Evan Martin's Ghosd library:\n"
 "http://neugierig.org/software/ghosd/"
 msgstr ""
+"Audacious OSD\n"
+"http://www.develia.org/projects.php?p=audacious#aosd\n"
+"\n"
+"Napsal Giacomo Lozito <james@develia.org>\n"
+"\n"
+"Částečně založeno na knihovně Ghosd Evana Martina:\n"
+"http://neugierig.org/software/ghosd/"
 
 #: src/aosd/aosd.h:37
 msgid "AOSD (On-Screen Display)"
@@ -536,130 +363,130 @@
 msgid "Concave Rectangle"
 msgstr "Konkávní obdélník"
 
-#: src/aosd/aosd_style.cc:69
+#: src/aosd/aosd_style.cc:69 src/openmpt/mptwrap.h:50 src/xsf/plugin.cc:436
 msgid "None"
 msgstr "Žádný"
 
-#: src/aosd/aosd_trigger.cc:50
+#: src/aosd/aosd_trigger.cc:49
 msgid "Playback Start"
 msgstr "Zahájení přehrávání"
 
-#: src/aosd/aosd_trigger.cc:51
+#: src/aosd/aosd_trigger.cc:50
 msgid "Triggers OSD when a playlist entry is played."
 msgstr "Spustí OSD, když se začne přehrávat skladba."
 
-#: src/aosd/aosd_trigger.cc:56
+#: src/aosd/aosd_trigger.cc:55
 msgid "Title Change"
 msgstr "Změna názvu"
 
-#: src/aosd/aosd_trigger.cc:57
+#: src/aosd/aosd_trigger.cc:56
 msgid "Triggers OSD when the song title changes (for internet streams)."
-msgstr ""
+msgstr "Spustí OSD při změně názvu skladby (pro internetové proudy)."
 
-#: src/aosd/aosd_trigger.cc:62
+#: src/aosd/aosd_trigger.cc:61
 msgid "Pause On"
 msgstr "Pozastavení"
 
-#: src/aosd/aosd_trigger.cc:63
+#: src/aosd/aosd_trigger.cc:62
 msgid "Triggers OSD when playback is paused."
 msgstr "Spustí OSD, když je přehrávání pozastaveno."
 
-#: src/aosd/aosd_trigger.cc:68
+#: src/aosd/aosd_trigger.cc:67
 msgid "Pause Off"
 msgstr "Obnovení přehrávání"
 
-#: src/aosd/aosd_trigger.cc:69
+#: src/aosd/aosd_trigger.cc:68
 msgid "Triggers OSD when playback is unpaused."
 msgstr "Spustí OSD, když přehrávání obnoveno."
 
-#: src/aosd/aosd_ui.cc:163
+#: src/aosd/aosd_ui.cc:204
 msgid "Placement"
 msgstr "Umístění"
 
-#: src/aosd/aosd_ui.cc:196
+#: src/aosd/aosd_ui.cc:241
 msgid "Relative X offset:"
 msgstr "Relativní odsazení ve směru osy X:"
 
-#: src/aosd/aosd_ui.cc:203
+#: src/aosd/aosd_ui.cc:245
 msgid "Relative Y offset:"
 msgstr "Relativní odsazení ve směru osy Y"
 
-#: src/aosd/aosd_ui.cc:210
+#: src/aosd/aosd_ui.cc:249
 msgid "Max OSD width:"
 msgstr "Maximální šířka OSD"
 
-#: src/aosd/aosd_ui.cc:221
+#: src/aosd/aosd_ui.cc:281
 msgid "Multi-Monitor options"
 msgstr "Nastavení pro více monitorů"
 
-#: src/aosd/aosd_ui.cc:225
+#: src/aosd/aosd_ui.cc:285
 msgid "Display OSD using:"
 msgstr "Zobrazit OSD na:"
 
-#: src/aosd/aosd_ui.cc:227
+#: src/aosd/aosd_ui.cc:287
 msgid "all monitors"
 msgstr "všech monitorech"
 
-#: src/aosd/aosd_ui.cc:230
+#: src/aosd/aosd_ui.cc:290
 #, c-format
 msgid "monitor %i"
 msgstr "monitoru %i"
 
-#: src/aosd/aosd_ui.cc:282
+#: src/aosd/aosd_ui.cc:342
 msgid "Timing (ms)"
 msgstr "Časování (ms)"
 
-#: src/aosd/aosd_ui.cc:287
+#: src/aosd/aosd_ui.cc:347
 msgid "Display:"
 msgstr "Zobrazení:"
 
-#: src/aosd/aosd_ui.cc:292
+#: src/aosd/aosd_ui.cc:352
 msgid "Fade in:"
 msgstr "Rozsvícení:"
 
-#: src/aosd/aosd_ui.cc:297
+#: src/aosd/aosd_ui.cc:357
 msgid "Fade out:"
 msgstr "Pohasnutí:"
 
-#: src/aosd/aosd_ui.cc:361
+#: src/aosd/aosd_ui.cc:442
 msgid "Fonts"
 msgstr "Fonty"
 
-#: src/aosd/aosd_ui.cc:368
+#: src/aosd/aosd_ui.cc:449
 #, c-format
 msgid "Font %i:"
 msgstr "Font %i:"
 
-#: src/aosd/aosd_ui.cc:382
+#: src/aosd/aosd_ui.cc:466
 msgid "Shadow"
 msgstr "Stín"
 
-#: src/aosd/aosd_ui.cc:486
+#: src/aosd/aosd_ui.cc:589
 msgid "Render Style"
 msgstr "Styl vyobrazení"
 
-#: src/aosd/aosd_ui.cc:502
+#: src/aosd/aosd_ui.cc:605
 msgid "Colors"
 msgstr "Barvy"
 
-#: src/aosd/aosd_ui.cc:513
+#: src/aosd/aosd_ui.cc:616
 #, c-format
 msgid "Color %i:"
 msgstr "Barvy %i:"
 
-#: src/aosd/aosd_ui.cc:600
+#: src/aosd/aosd_ui.cc:714
 msgid "Enable trigger"
 msgstr "Povolit spouštěč"
 
-#: src/aosd/aosd_ui.cc:627
+#: src/aosd/aosd_ui.cc:741
 msgid "Event"
 msgstr "Událost"
 
-#: src/aosd/aosd_ui.cc:655
+#: src/aosd/aosd_ui.cc:768
 msgid "Composite manager detected"
 msgstr "Nalezen kompozitní správce"
 
-#: src/aosd/aosd_ui.cc:662
+#: src/aosd/aosd_ui.cc:775
 msgid ""
 "Composite manager not detected;\n"
 "unless you know that you have one running, please activate a composite "
@@ -669,60 +496,56 @@
 "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.cc:670
+#: src/aosd/aosd_ui.cc:783
 msgid "Composite manager not required for fake transparency"
 msgstr "Při falešné průhlednosti není kompozitní správce potřeba"
 
-#: src/aosd/aosd_ui.cc:706
+#: src/aosd/aosd_ui.cc:820
 msgid "Transparency"
 msgstr "Průhlednost"
 
-#: src/aosd/aosd_ui.cc:712
+#: src/aosd/aosd_ui.cc:826
 msgid "Fake transparency"
 msgstr "Falešná průhlednost"
 
-#: src/aosd/aosd_ui.cc:714
+#: src/aosd/aosd_ui.cc:828
 msgid "Real transparency (requires X Composite Ext.)"
 msgstr "Skutečná průhlednost (vyžaduje kompozitní rozšíření X)"
 
-#: src/aosd/aosd_ui.cc:756
+#: src/aosd/aosd_ui.cc:875
 msgid "Composite extension not loaded"
 msgstr "Kompozitní rozšíření není nahráno"
 
-#: src/aosd/aosd_ui.cc:764
-msgid "Composite extension not available"
-msgstr "Kompozitní rozšíření není dostupné"
-
-#: src/aosd/aosd_ui.cc:781
+#: src/aosd/aosd_ui.cc:892
 #, c-format
 msgid "Audacious OSD"
 msgstr "OSD Audacious"
 
-#: src/aosd/aosd_ui.cc:844
+#: src/aosd/aosd_ui.cc:955
 msgid "Position"
 msgstr "Umístění"
 
-#: src/aosd/aosd_ui.cc:849
+#: src/aosd/aosd_ui.cc:960
 msgid "Animation"
 msgstr "Animace"
 
-#: src/aosd/aosd_ui.cc:854
+#: src/aosd/aosd_ui.cc:965
 msgid "Text"
 msgstr "Text"
 
-#: src/aosd/aosd_ui.cc:859
+#: src/aosd/aosd_ui.cc:970
 msgid "Decoration"
 msgstr "Výzdoba"
 
-#: src/aosd/aosd_ui.cc:864
+#: src/aosd/aosd_ui.cc:975
 msgid "Trigger"
 msgstr "Spouštěč"
 
-#: src/aosd/aosd_ui.cc:869
+#: src/aosd/aosd_ui.cc:980 src/streamtuner/shoutcast-model.cc:202
 msgid "Misc"
 msgstr "Různé"
 
-#: src/aosd/aosd_ui.cc:878
+#: src/aosd/aosd_ui.cc:989
 msgid "Test"
 msgstr "Zkouška"
 
@@ -738,13 +561,85 @@
 msgid "Audacious Playlists (audpl)"
 msgstr "Audacious seszam skladeb (audpl)"
 
-#: src/blur_scope/blur_scope.cc:42
+#: src/background_music/background_music.cc:24
+msgid "Background music"
+msgstr ""
+
+#: src/background_music/background_music.cc:25
+msgid "Target level:"
+msgstr ""
+
+#: src/background_music/background_music.cc:28
+#: src/background_music/background_music.cc:33
+#: src/silence-removal/silence-removal.cc:70
+msgid "dB"
+msgstr "dB"
+
+#: src/background_music/background_music.cc:29
+msgid "Maximum amplification:"
+msgstr ""
+
+#: src/background_music/background_music.cc:34 src/mpg123/mpg123.cc:81
+msgid "Advanced"
+msgstr "Pokročilé"
+
+#: src/background_music/background_music.cc:36
+msgid "Slow detection weight:"
+msgstr ""
+
+#: src/background_music/background_music.cc:39
+msgid "Hint"
+msgstr ""
+
+#: src/background_music/background_music.cc:41
+msgid ""
+"Slow detection weight is the relative weight\n"
+"of a long term average detection when compared\n"
+"to the actual, faster loudness detection.\n"
+"A value of zero gives a more radio-like sound\n"
+"where soft passages get \"pulled up\" more quickly,\n"
+"a value of two makes the sound feel less compressed."
+msgstr ""
+
+#: src/background_music/background_music.cc:52
+msgid ""
+"Background Music Plugin for Audacious\n"
+"Copyright 2023;2024 Michel Fleur\n"
+"\n"
+"Controls the volume to make the sound equally loud within and between "
+"tracks.\n"
+" It uses accurate loudness measurement and tries to make the volume changes "
+"sound natural without audible peaks, yet without lowering the volume before "
+"a peak in advance."
+msgstr ""
+
+#: src/background_music/background_music.cc:61
+msgid "Background Music"
+msgstr ""
+
+#: src/bitcrusher/bitcrusher.cc:33
+msgid "Bitcrusher"
+msgstr ""
+
+#: src/bitcrusher/bitcrusher.cc:34
+msgid "Bit Depth:"
+msgstr ""
+
+#: src/bitcrusher/bitcrusher.cc:37
+msgid "Downsample ratio:"
+msgstr ""
+
+#: src/bitcrusher/bitcrusher.cc:48
+msgid "Bitcrusher"
+msgstr ""
+
+#: src/blur_scope/blur_scope.cc:40 src/blur_scope-qt/blur_scope.cc:45
 msgid "Color"
 msgstr "Barva"
 
-#: src/blur_scope/blur_scope.cc:58
+#: src/blur_scope/blur_scope.cc:56 src/blur_scope-qt/blur_scope.cc:158
 msgid "Blur Scope"
-msgstr "Rozsah rozostření"
+msgstr "Rozostřený osciloskop"
 
 #: src/bs2b/plugin.cc:38
 msgid "Bauer Stereophonic-to-Binaural (BS2B)"
@@ -754,6 +649,10 @@
 msgid "Presets:"
 msgstr "Předvolby:"
 
+#: src/bs2b/plugin.cc:130
+msgid "Default"
+msgstr "Výchozí"
+
 #: src/bs2b/plugin.cc:136
 msgid "Feed level:"
 msgstr "Úroveň přeslechu:"
@@ -766,15 +665,15 @@
 msgid "Cut frequency:"
 msgstr "Ořezová frekvence:"
 
-#: src/cairo-spectrum/cairo-spectrum.cc:41
+#: src/cairo-spectrum/cairo-spectrum.cc:42 src/qt-spectrum/qt-spectrum.cc:107
 msgid "Spectrum Analyzer"
 msgstr "Analyzátor spektra"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:72
+#: src/cdaudio/cdaudio-ng.cc:74
 msgid "Audio CD Plugin"
-msgstr "Audio CD Plugin"
+msgstr "Audio CD plugin"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:121
+#: src/cdaudio/cdaudio-ng.cc:121
 msgid ""
 "Copyright (C) 2007-2012 Calin Crisan <ccrisan@gmail.com> and others.\n"
 "\n"
@@ -794,132 +693,132 @@
 "\n"
 "Toto byl projekt v rámci Google Summer of Code 2007."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:137
+#: src/cdaudio/cdaudio-ng.cc:140
 msgid "Device"
 msgstr "Zařízení"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:138
+#: src/cdaudio/cdaudio-ng.cc:141
 msgid "Read speed:"
 msgstr "Rychlost čtení:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:141
+#: src/cdaudio/cdaudio-ng.cc:144
 msgid "Override device:"
 msgstr "Přepsat zařízení:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:143
+#: src/cdaudio/cdaudio-ng.cc:146
 msgid "Metadata"
 msgstr "Metadata"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:144
+#: src/cdaudio/cdaudio-ng.cc:147
 msgid "Use CD-Text"
 msgstr "Použití CD-Text"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:146
+#: src/cdaudio/cdaudio-ng.cc:150
 msgid "Use CDDB"
 msgstr "Používat CDDB"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:148
+#: src/cdaudio/cdaudio-ng.cc:152
 msgid "Use HTTP instead of CDDBP"
 msgstr "Použít HTTP místo CDDBP"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:151
+#: src/cdaudio/cdaudio-ng.cc:155
 msgid "Server:"
 msgstr "Server:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:155
+#: src/cdaudio/cdaudio-ng.cc:159
 msgid "Path:"
 msgstr "Cesta:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:159
+#: src/cdaudio/cdaudio-ng.cc:163
 msgid "Port:"
 msgstr "Port:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:246
+#: src/cdaudio/cdaudio-ng.cc:228
 msgid "Failed to initialize cdio subsystem."
 msgstr "Nepodařilo se inicializovat cdio subsystému."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:281
+#: src/cdaudio/cdaudio-ng.cc:260
 #, c-format
 msgid "Invalid URI %s."
 msgstr "Neplatná URI %s."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:283
+#: src/cdaudio/cdaudio-ng.cc:262
 #, c-format
 msgid "Track %d not found."
 msgstr "Stopa %d nebyla nalezena."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:285
+#: src/cdaudio/cdaudio-ng.cc:264
 #, c-format
 msgid "Track %d is a data track."
 msgstr "Stopa %d je datová stopa."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:360
+#: src/cdaudio/cdaudio-ng.cc:339
 msgid "Error reading audio CD."
 msgstr "Chyba při čtení zvukového CD."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:429
+#: src/cdaudio/cdaudio-ng.cc:410
 msgid "Audio CD"
 msgstr "Zvukové CD"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:460 src/cdaudio-ng/cdaudio-ng.cc:469
+#: src/cdaudio/cdaudio-ng.cc:446 src/cdaudio/cdaudio-ng.cc:455
 #, c-format
 msgid "Failed to open CD device %s."
 msgstr "Nelze otevřít CD zařízení %s."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:472
+#: src/cdaudio/cdaudio-ng.cc:458
 msgid "No audio capable CD drive found."
 msgstr "Nebyly nalezeny funkční CD mechaniky"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:497
+#: src/cdaudio/cdaudio-ng.cc:481
+msgid "Drive is empty."
+msgstr "Mechanika je prázdná"
+
+#: src/cdaudio/cdaudio-ng.cc:483
+msgid "Unsupported disk type."
+msgstr "Nepodporovaný druh disku."
+
+#: src/cdaudio/cdaudio-ng.cc:507
 msgid "Failed to finish initializing opened CD drive."
 msgstr "Nepodařilo se dokončit inicializaci otevření CD mechaniky."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:510
+#: src/cdaudio/cdaudio-ng.cc:520
 msgid "Failed to retrieve first/last track number."
 msgstr "Nepodařilo se načíst první/poslední číslo skladby."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:531
+#: src/cdaudio/cdaudio-ng.cc:541
 #, 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.cc:613
-msgid "Failed to create the cddb connection."
-msgstr "Nepodařilo se vytvořit připojení k CDDB."
+#: src/cdaudio/cdaudio-ng.cc:624
+msgid "Failed to create the CDDB connection."
+msgstr "Selhalo vytvoření CDDB spojení."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:679
+#: src/cdaudio/cdaudio-ng.cc:690
 msgid "Failed to query the CDDB server"
 msgstr "Nepodařil se dotaz na server CDDB"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:681
+#: src/cdaudio/cdaudio-ng.cc:692
 #, c-format
 msgid "Failed to query the CDDB server: %s"
 msgstr "Nepodařil se dotaz na server CDDB: %s"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:705
+#: src/cdaudio/cdaudio-ng.cc:716
 #, 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.cc:765
-msgid "Drive is empty."
-msgstr "Mechanika je prázdná"
-
-#: src/cdaudio-ng/cdaudio-ng.cc:767
-msgid "Unsupported disk type."
-msgstr "Nepodporovaný druh disku."
+msgid "Failed to read the CDDB info: %s"
+msgstr "Selhalo čtení CDDB informace: %s"
 
-#: src/cd-menu-items/cd-menu-items.cc:35
+#: src/cd-menu-items/cd-menu-items.cc:33
 msgid "Audio CD Menu Items"
 msgstr "Položky Audio CD menu"
 
-#: src/cd-menu-items/cd-menu-items.cc:47
-msgid "Play CD"
-msgstr "Přehrát CD"
-
-#: src/cd-menu-items/cd-menu-items.cc:47
-msgid "Add CD"
-msgstr "Přidat CD"
+#: src/cd-menu-items/cd-menu-items.cc:45
+msgid "Pla_y CD"
+msgstr "Pře_hrát CD"
+
+#: src/cd-menu-items/cd-menu-items.cc:45
+msgid "_Add CD"
+msgstr "Při_dat CD"
 
 #: src/compressor/compressor.cc:45
 msgid "Compression"
@@ -931,17 +830,19 @@
 
 #: src/compressor/compressor.cc:49
 msgid "Dynamic range:"
-msgstr "Rozsah dynamiky:"
+msgstr "Dynamický rozsah:"
 
 #: src/compressor/compressor.cc:57
 msgid ""
 "Dynamic Range Compression Plugin for Audacious\n"
 "Copyright 2010-2014 John Lindgren"
 msgstr ""
+"Zásuvný modul komprese dynamického rozsahu pro Audacious\n"
+"Copyright 2010-2014 John Lindgren"
 
 #: src/compressor/compressor.cc:64
 msgid "Dynamic Range Compressor"
-msgstr "Dynamický rozsah kompresoru"
+msgstr "Kompresor dynamického rozsahu"
 
 #: src/console/plugin.cc:15
 msgid ""
@@ -952,6 +853,12 @@
 "William Pitcock <nenolod@dereferenced.org>\n"
 "Shay Green <gblargg@gmail.com>"
 msgstr ""
+"Dekodér hudby z herních konzolí, 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 pro Audacious od:\n"
+"William Pitcock <nenolod@dereferenced.org>\n"
+"Shay Green <gblargg@gmail.com>"
 
 #: src/console/plugin.cc:30
 msgid "Bass:"
@@ -967,9 +874,16 @@
 
 #: src/console/plugin.cc:39
 msgid "Default song length:"
-msgstr "Implicitní délka skladby:"
+msgstr "Výchozí délka skladby:"
+
+#: src/console/plugin.cc:41 src/crossfade/crossfade.cc:56
+#: src/crossfade/crossfade.cc:62 src/lirc/lirc.cc:395 src/notify/notify.cc:113
+#: src/sid/xs_config.cc:85 src/sid/xs_config.cc:94 src/sid/xs_config.cc:103
+#: src/vumeter-qt/vumeter_qt.cc:39
+msgid "seconds"
+msgstr "sekund"
 
-#: src/console/plugin.cc:42 src/modplug/plugin_main.cc:59
+#: src/console/plugin.cc:42 src/modplug/plugin_main.cc:58
 msgid "Resampling"
 msgstr "Převzorkování"
 
@@ -993,79 +907,94 @@
 msgid "Game Console Music Decoder"
 msgstr "Dekodér hudby pro herní konzole"
 
-#: src/coreaudio/coreaudio.cc:50
+#: src/coreaudio/coreaudio.cc:53
 msgid "CoreAudio output"
 msgstr "CoreAudio výstup"
 
-#: src/coreaudio/coreaudio.cc:131
+#: src/coreaudio/coreaudio.cc:155
 msgid ""
 "CoreAudio Output Plugin for Audacious\n"
 "Copyright 2014 William Pitcock\n"
+"Copyright 2017,18 René J.V. Bertin\n"
+" (original code and code adapted from\n"
+" Apple examples, (C) Apple 2013)\n"
 "\n"
 "Based on SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
 msgstr ""
+"Výstupní plugin CoreAudio pro Audacious\n"
+"Copyright 2014 William Pitcock\n"
+"Copyright 2017-18 René J.V. Bertin\n"
+" (původní kód a kód převzatý z\n"
+"Apple examples, (c) Apple 2013)\n"
+"\n"
+"Založeno na výstupním pluginu SDL pro Audacious\n"
+"Copyright 2010 John Lindgren"
 
-#: src/coreaudio/coreaudio.cc:143
+#: src/coreaudio/coreaudio.cc:171
 msgid "Use exclusive mode"
 msgstr "Použij exkluzivní mód"
 
-#: src/crossfade/crossfade.cc:44
+#: src/coreaudio/coreaudio.cc:173
+msgid "Use bit perfect audio (adapt device sampling rate)"
+msgstr "Použit bitově dokonalý zvuk (přizpůsobit vzorkovací kmitočet zařízení)"
+
+#: src/crossfade/crossfade.cc:47
 msgid ""
 "Crossfade Plugin for Audacious\n"
 "Copyright 2010-2014 John Lindgren"
 msgstr ""
-"Crossfade výstupní modul for Audacious\n"
+"Zásuvný modul prolínání pro Audacious\n"
 "Copyright 2010-2014 John Lindgren"
 
-#: src/crossfade/crossfade.cc:48
+#: src/crossfade/crossfade.cc:51
 msgid "Crossfade"
 msgstr "Prolínání"
 
-#: src/crossfade/crossfade.cc:49
+#: src/crossfade/crossfade.cc:52
 msgid "On automatic song change"
 msgstr "Při automatické změně skladby"
 
-#: src/crossfade/crossfade.cc:51 src/crossfade/crossfade.cc:57
+#: src/crossfade/crossfade.cc:54 src/crossfade/crossfade.cc:60
 msgid "Overlap:"
 msgstr "Přesah:"
 
-#: src/crossfade/crossfade.cc:55
+#: src/crossfade/crossfade.cc:58
 msgid "On seek or manual song change"
+msgstr "Při vyhledávání nebo při ruční změně skladby"
+
+#: src/crossfade/crossfade.cc:64
+msgid "No fade in"
+msgstr ""
+
+#: src/crossfade/crossfade.cc:66
+msgid "Use S-curve fade"
+msgstr ""
+
+#: src/crossfade/crossfade.cc:68
+msgid "S-curve steepness:"
+msgstr ""
+
+#: src/crossfade/crossfade.cc:70
+msgid "(higher is steeper)"
 msgstr ""
 
-#: src/crossfade/crossfade.cc:61
+#: src/crossfade/crossfade.cc:72
 msgid "Tip"
 msgstr "Tip"
 
-#: src/crossfade/crossfade.cc:62
+#: src/crossfade/crossfade.cc:73
 msgid ""
 "For better crossfading, enable\n"
 "the Silence Removal effect."
 msgstr ""
+"Pro lepší prolínání povolte\n"
+"efekt odstanění ticha."
 
-#: src/crossfade/crossfade.cc:72
+#: src/crossfade/crossfade.cc:83
 msgid "Crossfade"
 msgstr "Prolínání"
 
-#: src/crossfade/crossfade.cc:161
-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ů."
-
-#: src/crossfade/crossfade.cc:168
-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."
-
 #: src/crystalizer/crystalizer.cc:31
 msgid "Crystalizer"
 msgstr "Crystalizer"
@@ -1078,60 +1007,61 @@
 msgid "Crystalizer"
 msgstr "Krystalizér"
 
-#: src/cue/cue.cc:37
+#: src/cue/cue.cc:42
 msgid "Cue Sheet Plugin"
-msgstr ""
+msgstr "Zásuvný modul pro Cue Sheet"
 
-#: src/delete-files/delete-files.cc:46 src/delete-files/delete-files.cc:146
+#: src/delete-files/delete-files.cc:53 src/delete-files/delete-files.cc:215
+#: src/delete-files/delete-files.cc:230
 msgid "Delete Files"
 msgstr "Smazat soubory"
 
-#: src/delete-files/delete-files.cc:75
+#: src/delete-files/delete-files.cc:120
+msgid "No files are selected."
+msgstr "Nebyly zvoleny žádné soubory."
+
+#: src/delete-files/delete-files.cc:125
 #, c-format
-msgid "Error moving %s to trash: %s."
-msgstr ""
+msgid "Do you want to move %s to the trash?"
+msgstr "Chcete přesunout %s do koše?"
 
-#: src/delete-files/delete-files.cc:86
+#: src/delete-files/delete-files.cc:126
 #, c-format
-msgid "Error deleting %s: %s."
-msgstr "Chyba při mazání %s: %s."
+msgid "Do you want to permanently delete %s?"
+msgstr "Chcete trvale odstranit %s?"
 
-#: src/delete-files/delete-files.cc:117
+#: src/delete-files/delete-files.cc:133
 #, c-format
-msgid "Error deleting %s: not a local file."
-msgstr "Chyba při mazání %s: není to lokální soubor."
+msgid "Do you want to move %d files to the trash?"
+msgstr "Chcete přesunout %d souborů do koše?"
 
 #: src/delete-files/delete-files.cc:134
-msgid "Do you want to move the selected files to the trash?"
-msgstr "Chcete přesunout vybrané soubory do koše?"
+#, c-format
+msgid "Do you want to permanently delete %d files?"
+msgstr "Chcete trvale odstranit %d souborů?"
 
-#: src/delete-files/delete-files.cc:135
-msgid "Move to Trash"
+#: src/delete-files/delete-files.cc:146
+msgid "Move to trash"
 msgstr "Přesunout do koše"
 
-#: src/delete-files/delete-files.cc:140
-msgid "Do you want to permanently delete the selected files?"
-msgstr "Opravdu chcete trvale odstranit vybrané soubory?"
-
-#: src/delete-files/delete-files.cc:141 src/skins/preset-list.cc:411
-#: src/skins/preset-list.cc:427
+#: src/delete-files/delete-files.cc:146
 msgid "Delete"
 msgstr "Smazat"
 
-#: src/delete-files/delete-files.cc:145 src/skins/preset-browser.cc:56
-#: src/skins/preset-list.cc:307 src/skins/ui_playlist.cc:221
+#: src/delete-files/delete-files.cc:213 src/delete-files/delete-files.cc:235
+#: src/skins-qt/search-select.cc:102 src/skins/search-select.cc:78
 msgid "Cancel"
 msgstr "Zrušit"
 
-#: src/delete-files/delete-files.cc:166
+#: src/delete-files/delete-files.cc:267
 msgid "Delete Selected Files"
 msgstr "Smazat vybrané soubory"
 
-#: src/delete-files/delete-files.cc:181
+#: src/delete-files/delete-files.cc:287
 msgid "Delete Method"
 msgstr "Metoda mazání"
 
-#: src/delete-files/delete-files.cc:182
+#: src/delete-files/delete-files.cc:288
 msgid "Move to trash instead of deleting immediately"
 msgstr "Presuň do koše místo okamžitého smazání"
 
@@ -1142,18 +1072,22 @@
 "Surround echo by Carl van Schaik, 1999\n"
 "Updated for Audacious by William Pitcock and John Lindgren, 2010-2014"
 msgstr ""
+"Zásuvný modul ozvěny\n"
+"Od: Johan Levin, 1999\n"
+"Prostorová ozvěna od: Carl van Schaik, 1999\n"
+"Aktualizovali pro Audacious: William Pitcock aJohn Lindgren, 2010-2014"
 
 #: src/echo_plugin/echo.cc:21
 msgid "Echo"
 msgstr "Ozvěna"
 
-#: src/echo_plugin/echo.cc:22 src/modplug/plugin_main.cc:73
-#: src/modplug/plugin_main.cc:83
+#: src/echo_plugin/echo.cc:22 src/modplug/plugin_main.cc:72
+#: src/modplug/plugin_main.cc:82
 msgid "Delay:"
 msgstr "Zpoždění:"
 
-#: src/echo_plugin/echo.cc:24 src/modplug/plugin_main.cc:73
-#: src/modplug/plugin_main.cc:83
+#: src/echo_plugin/echo.cc:24 src/modplug/plugin_main.cc:72
+#: src/modplug/plugin_main.cc:82 src/xsf/plugin.cc:445
 msgid "ms"
 msgstr "ms"
 
@@ -1161,7 +1095,7 @@
 msgid "Feedback:"
 msgstr "Zpětná vazba:"
 
-#: src/echo_plugin/echo.cc:28 src/modplug/plugin_main.cc:87
+#: src/echo_plugin/echo.cc:28 src/modplug/plugin_main.cc:86
 msgid "Volume:"
 msgstr "Hlasitost:"
 
@@ -1169,11 +1103,11 @@
 msgid "Echo"
 msgstr "Ozvěna"
 
-#: src/ffaudio/ffaudio-core.cc:41
+#: src/ffaudio/ffaudio-core.cc:50
 msgid "FFmpeg Plugin"
-msgstr "FFmpeg Plugin"
+msgstr "FFmpeg plugin"
 
-#: src/ffaudio/ffaudio-core.cc:571
+#: src/ffaudio/ffaudio-core.cc:649
 msgid ""
 "Multi-format audio decoding plugin for Audacious using\n"
 "FFmpeg multimedia framework (http://www.ffmpeg.org/)\n"
@@ -1189,249 +1123,320 @@
 "Williama Pitcocka <nenolod@nenolod.net>\n"
 "Matti Hämäläinena <ccr@tnsp.org>"
 
-#: src/filewriter/filewriter.cc:45
+#: src/filewriter/filewriter.cc:48
 msgid "FileWriter Plugin"
 msgstr "Přídavný modul FileWriter"
 
-#: src/filewriter/filewriter.cc:386
+#: src/filewriter/filewriter.cc:316
+#, c-format
+msgid ""
+"Error opening %s:\n"
+"%s"
+msgstr ""
+"Chyba při otevírání %s:\n"
+"%s"
+
+#: src/filewriter/filewriter.cc:358
+msgid ""
+"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 ""
+"Tento program je svobodný software: můžete jej šířit a/nebo upravovat dle "
+"podmínek GNU General Public License, vydávané Free Software Foundation, a to "
+"buď verze 2 této licence, nebo (dle vlastního uvážení) kterékoliv pozdější "
+"verze.\n"
+"\n"
+"Tento program je šířen v naději, že bude užitečný, ale BEZ JAKÉKOLIV ZÁRUKY; "
+"dokonce i bez předpokládané záruky PRODEJNOSTI nebo VHODNOSTI PRO KONKRÉTNÍ "
+"ÚČEL. Podívejte se na GNU General Public License pro další podrobnosti.\n"
+"\n"
+"Měli byste obdržet kopii GNU General Public License spolu s tímto programem; "
+"Pokud tomu tak není, napište si do Free Software Foundation, Inc., 51 "
+"Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
+
+#: src/filewriter/filewriter.cc:385
 msgid "Output file format:"
 msgstr "Formát výstupního souboru:"
 
-#: src/filewriter/filewriter.cc:403
-msgid "Configure"
-msgstr "Nastavit"
-
-#: src/filewriter/filewriter.cc:413
+#: src/filewriter/filewriter.cc:389
 msgid "Save into original directory"
 msgstr "Ukládat do původního adresáře"
 
-#: src/filewriter/filewriter.cc:417
-msgid "Save into custom directory"
-msgstr "Ukládat do vlastního adresáře"
-
-#: src/filewriter/filewriter.cc:427
-msgid "Output file folder:"
-msgstr "Složka s výstupními soubory:"
+#: src/filewriter/filewriter.cc:392
+msgid "Save into custom directory:"
+msgstr "Uložit do vlastní složky:"
 
-#: src/filewriter/filewriter.cc:431
-msgid "Pick a folder"
-msgstr "Vybrat složku"
-
-#: src/filewriter/filewriter.cc:444
+#: src/filewriter/filewriter.cc:400
 msgid "Generate file name from:"
 msgstr "Generuj jméno souboru z:"
 
-#: src/filewriter/filewriter.cc:448
-msgid "Original file tag"
-msgstr ""
-
-#: src/filewriter/filewriter.cc:453
+#: src/filewriter/filewriter.cc:401
 msgid "Original file name"
 msgstr "Originální jméno souboru"
 
-#: src/filewriter/filewriter.cc:459
-msgid "Include original file name extension"
-msgstr "Včetně originální přípony jména souboru"
+#: src/filewriter/filewriter.cc:404
+msgid "Original file name (no suffix)"
+msgstr "Původní název souboru (bez přípony)"
+
+#: src/filewriter/filewriter.cc:407
+msgid "Original file tag"
+msgstr "Původní značka souboru"
 
-#: src/filewriter/filewriter.cc:468
+#: src/filewriter/filewriter.cc:411
 msgid "Prepend track number to file name"
 msgstr "Předřadit číslo stopy k jménu souboru"
 
-#: src/filewriter/filewriter.cc:484
-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 ""
-"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/mp3.cc:40 src/filewriter/mp3.cc:717
+#: src/filewriter/filewriter.cc:417 src/filewriter/filewriter.cc:449
 msgid "Auto"
 msgstr "Auto"
 
-#: src/filewriter/mp3.cc:40
+#: src/filewriter/filewriter.cc:418
+msgid "8000 Hz"
+msgstr "8000Hz"
+
+#: src/filewriter/filewriter.cc:419
+msgid "11025 Hz"
+msgstr "11025Hz"
+
+#: src/filewriter/filewriter.cc:420
+msgid "12000 Hz"
+msgstr "12000Hz"
+
+#: src/filewriter/filewriter.cc:421
+msgid "16000 Hz"
+msgstr "16000Hz"
+
+#: src/filewriter/filewriter.cc:422
+msgid "22050 Hz"
+msgstr "22050Hz"
+
+#: src/filewriter/filewriter.cc:423
+msgid "24000 Hz"
+msgstr "24000Hz"
+
+#: src/filewriter/filewriter.cc:424
+msgid "32000 Hz"
+msgstr "32000Hz"
+
+#: src/filewriter/filewriter.cc:425 src/xsf/plugin.cc:430
+msgid "44100 Hz"
+msgstr "44100Hz"
+
+#: src/filewriter/filewriter.cc:426 src/xsf/plugin.cc:431
+msgid "48000 Hz"
+msgstr "48000Hz"
+
+#: src/filewriter/filewriter.cc:430
+msgid "8 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:431
+msgid "16 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:432
+msgid "32 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:433
+msgid "40 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:434
+msgid "48 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:435
+msgid "56 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:436
+msgid "64 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:437
+msgid "80 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:438
+msgid "96 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:439
+msgid "112 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:440
+msgid "128 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:441
+msgid "160 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:442
+msgid "192 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:443
+msgid "224 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:444
+msgid "256 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:445
+msgid "320 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:450
 msgid "Joint Stereo"
 msgstr "Joint-stereo"
 
-#: src/filewriter/mp3.cc:41 src/modplug/plugin_main.cc:58
-#: src/mpg123/mpg123.cc:248
+#: src/filewriter/filewriter.cc:451 src/modplug/plugin_main.cc:57
+#: src/mpg123/mpg123.cc:259
 msgid "Stereo"
 msgstr "Stereo"
 
-#: src/filewriter/mp3.cc:41 src/modplug/plugin_main.cc:57
-#: src/mpg123/mpg123.cc:248
+#: src/filewriter/filewriter.cc:452 src/modplug/plugin_main.cc:56
+#: src/mpg123/mpg123.cc:260
 msgid "Mono"
 msgstr "Mono"
 
-#: src/filewriter/mp3.cc:657
-msgid "MP3 Configuration"
-msgstr "Nastavení MP3"
-
-#: src/filewriter/mp3.cc:658
-msgid "_OK"
-msgstr "_OK"
+#: src/filewriter/filewriter.cc:456
+msgid "VBR"
+msgstr "VBR"
+
+#: src/filewriter/filewriter.cc:457
+msgid "ABR"
+msgstr "ABR"
 
-#: src/filewriter/mp3.cc:681
-msgid "Algorithm Quality:"
+#: src/filewriter/filewriter.cc:478
+msgid "Algorithm quality:"
 msgstr "Kvalita algoritmu:"
 
-#: src/filewriter/mp3.cc:706
-msgid "Output Sample Rate:"
-msgstr "Výstupní vzorkovací frekvence:"
-
-#: src/filewriter/mp3.cc:733
-msgid "(Hz)"
-msgstr "(Hz)"
-
-#: src/filewriter/mp3.cc:740
-msgid "Bitrate / Compression Ratio:"
-msgstr "Bitrate / Kompresní poměr:"
-
-#: src/filewriter/mp3.cc:764
-msgid "Bitrate (kbps):"
-msgstr "Datový tok (kb/s):"
+#: src/filewriter/filewriter.cc:484
+msgid "Bitrate:"
+msgstr "Datový tok:"
 
-#: src/filewriter/mp3.cc:796
+#: src/filewriter/filewriter.cc:491
 msgid "Compression ratio:"
 msgstr "Kompresní poměr:"
 
-#: src/filewriter/mp3.cc:820
-msgid "Audio Mode:"
-msgstr "Zvukový režim:"
-
-#: src/filewriter/mp3.cc:845
-msgid "Miscellaneous:"
-msgstr "Různé:"
+#: src/filewriter/filewriter.cc:498
+msgid "Audio mode:"
+msgstr "Režim zvuku:"
 
-#: src/filewriter/mp3.cc:856
+#: src/filewriter/filewriter.cc:501
 msgid "Enforce strict ISO compliance"
 msgstr "Vynutit přísnou shodu s ISO"
 
-#: src/filewriter/mp3.cc:867
+#: src/filewriter/filewriter.cc:503
 msgid "Error protection"
 msgstr "Ochrana před chybami"
 
-#: src/filewriter/mp3.cc:879 src/filewriter/vorbis.cc:206
-msgid "Quality"
-msgstr "Kvalita"
-
-#: src/filewriter/mp3.cc:888
+#: src/filewriter/filewriter.cc:508
 msgid "Enable VBR/ABR"
 msgstr "Povolit VBR/ABR"
 
-#: src/filewriter/mp3.cc:898
+#: src/filewriter/filewriter.cc:510
 msgid "Type:"
 msgstr "Druh:"
 
-#: src/filewriter/mp3.cc:931
-msgid "VBR Options:"
-msgstr "Nastavení VBR:"
-
-#: src/filewriter/mp3.cc:947
-msgid "Minimum bitrate (kbps):"
-msgstr "Nejmenší datový tok (kb/s):"
-
-#: src/filewriter/mp3.cc:973
-msgid "Maximum bitrate (kbps):"
-msgstr "Největší datový tok (kb/s):"
-
-#: src/filewriter/mp3.cc:995
-msgid "Strictly enforce minimum bitrate"
-msgstr "Přísně vynucovat nejmenší datový tok"
+#: src/filewriter/filewriter.cc:514
+msgid "Minimum bitrate:"
+msgstr "Minimální datový tok:"
+
+#: src/filewriter/filewriter.cc:518
+msgid "Maximum bitrate:"
+msgstr "Maximální datový tok:"
+
+#: src/filewriter/filewriter.cc:522
+msgid "Average bitrate:"
+msgstr "Průměrný datový tok:"
 
-#: src/filewriter/mp3.cc:1007
-msgid "ABR Options:"
-msgstr "Nastavení ABR:"
-
-#: src/filewriter/mp3.cc:1017
-msgid "Average bitrate (kbps):"
-msgstr "Průměrný datový tok (kb/s):"
-
-#: src/filewriter/mp3.cc:1044
+#: src/filewriter/filewriter.cc:526
 msgid "VBR quality level:"
 msgstr "Úroveň kvality VBR:"
 
-#: src/filewriter/mp3.cc:1063
+#: src/filewriter/filewriter.cc:530
+msgid "Strictly enforce minimum bitrate"
+msgstr "Přísně vynucovat nejmenší datový tok"
+
+#: src/filewriter/filewriter.cc:533
 msgid "Omit Xing VBR header"
 msgstr "Vynechat Xing VBR hlavičku"
 
-#: src/filewriter/mp3.cc:1076
-msgid "VBR/ABR"
-msgstr "VBR/ABR"
+#: src/filewriter/filewriter.cc:539
+msgid "Frame Headers"
+msgstr "Hlavičky rámců"
 
-#: src/filewriter/mp3.cc:1085
-msgid "Frame Parameters:"
-msgstr "Parametry rámců:"
-
-#: src/filewriter/mp3.cc:1097
+#: src/filewriter/filewriter.cc:540
 msgid "Mark as copyright"
 msgstr "Označit jako podléhající autorskému právu"
 
-#: src/filewriter/mp3.cc:1108
+#: src/filewriter/filewriter.cc:542
 msgid "Mark as original"
 msgstr "Označit jako původní"
 
-#: src/filewriter/mp3.cc:1120
-msgid "ID3 Parameters:"
-msgstr "ID3 Parametry:"
+#: src/filewriter/filewriter.cc:544
+msgid "ID3 Tags"
+msgstr "ID3 značky"
 
-#: src/filewriter/mp3.cc:1131
+#: src/filewriter/filewriter.cc:545
 msgid "Force addition of version 2 tag"
 msgstr "Vynutit přidání popisků verze 2"
 
-#: src/filewriter/mp3.cc:1141
+#: src/filewriter/filewriter.cc:547
 msgid "Only add v1 tag"
 msgstr "Přidávat jen popisky verze 1"
 
-#: src/filewriter/mp3.cc:1148
+#: src/filewriter/filewriter.cc:549
 msgid "Only add v2 tag"
 msgstr "Přidávat jen popisky verze 2"
 
-#: src/filewriter/mp3.cc:1169
+#: src/filewriter/filewriter.cc:554
+msgid "Quality"
+msgstr "Kvalita"
+
+#: src/filewriter/filewriter.cc:555
+msgid "VBR/ABR"
+msgstr "VBR/ABR"
+
+#: src/filewriter/filewriter.cc:556
 msgid "Tags"
 msgstr "Popisky"
 
-#: src/filewriter/vorbis.cc:196
-msgid "Vorbis Encoder Configuration"
-msgstr "Nastavení vorbis kodéru"
-
-#: src/filewriter/vorbis.cc:219
-msgid "Quality level (0 - 10):"
-msgstr "Úroveň kvality (0–10):"
+#: src/filewriter/filewriter.cc:566
+msgid "Quality (0-1):"
+msgstr "Kvalita (0-1):"
+
+#: src/filewriter/filewriter.cc:573 src/skins-qt/skins_cfg.cc:307
+#: src/skins/skins_cfg.cc:289
+msgid "General"
+msgstr "Obecné"
 
-#: src/flacng/flacng.h:35
+#: src/flac/flacng.h:36
 msgid "FLAC Decoder"
-msgstr "FLAC Dekodér"
+msgstr "FLAC dekodér"
 
-#: src/flacng/metadata.cc:351 src/wavpack/wavpack.cc:209
+#: src/flac/metadata.cc:296 src/wavpack/wavpack.cc:215
 msgid "lossless"
 msgstr "Bezztrátová kvalita"
 
-#: src/flacng/plugin.cc:169
+#: src/flac/plugin.cc:214
 msgid ""
 "Original code by\n"
 "Ralf Ertzinger <ralf@skytale.net>\n"
@@ -1453,17 +1458,17 @@
 
 #: src/gio/gio.cc:42
 msgid "GIO Plugin"
-msgstr "GIO Plugin"
+msgstr "GIO plugin"
 
-#: src/gio/gio.cc:153
+#: src/gio/gio.cc:152
 msgid "Read-and-append mode not supported"
-msgstr ""
+msgstr "Režim \"načíst a přidat\" není podporován"
 
-#: src/gio/gio.cc:166
+#: src/gio/gio.cc:165
 msgid "Invalid open mode"
 msgstr "Neplatný způsob otvírání"
 
-#: src/gl-spectrum/gl-spectrum.cc:51
+#: src/glspectrum/gl-spectrum.cc:52
 msgid ""
 "OpenGL Spectrum Analyzer for Audacious\n"
 "Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
@@ -1483,627 +1488,760 @@
 "\n"
 "Licence: GPLv2+"
 
-#: src/gl-spectrum/gl-spectrum.cc:62
+#: src/glspectrum/gl-spectrum.cc:63 src/qtglspectrum/gl-spectrum.cc:53
 msgid "OpenGL Spectrum Analyzer"
 msgstr "OpenGL analyzátor spektra"
 
-#: src/gl-spectrum-qt/gl-spectrum.cc:41
-msgid ""
-"OpenGL Spectrum Analyzer for Audacious\n"
-"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
-"Copyright 2014 William Pitcock\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-qt/gl-spectrum.cc:53
-msgid "OpenGL Spectrum Analyzer (Qt)"
-msgstr "OpenGL analyzátor spektra (Qt)"
-
-#: src/gnomeshortcuts/gnomeshortcuts.cc:38
-msgid "GNOME Shortcuts"
-msgstr "GNOME Klávesové zkratky"
-
-#: src/gnomeshortcuts/gnomeshortcuts.cc:54
-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 Zásuvný modul pro klávesové zkratky\n"
-"Umožňuje ovládat program pomocí klávesových Gnome\n"
-"\n"
-"Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>"
-
-#: src/gtkui/columns.cc:35
-msgid "Entry number"
-msgstr "Číslo položky"
-
-#: src/gtkui/columns.cc:36 src/playlist-manager/playlist-manager.cc:225
-#: src/qtui/playlist_model.cc:123
+#: src/gtkui/columns.cc:36 src/moonstone/playlist_model.cc:38
+#: src/qtui/playlist_model.cc:33
+msgid "Entry Number"
+msgstr "Vstupní číslo"
+
+#: src/gtkui/columns.cc:37 src/moonstone/playlist_model.cc:38
+#: src/moonstone/playlist_selection.cc:64
+#: src/playlist-manager/playlist-manager.cc:200
+#: src/playlist-manager-qt/playlist-manager-qt.cc:188
+#: src/qtui/playlist_model.cc:33 src/streamtuner/icecast-model.cc:120
+#: src/streamtuner/ihr-model.cc:159 src/streamtuner/shoutcast-model.cc:122
 msgid "Title"
 msgstr "Název"
 
-#: src/gtkui/columns.cc:37 src/qtui/playlist_model.cc:125
+#: src/gtkui/columns.cc:38 src/moonstone/playlist_model.cc:39
+#: src/qtui/playlist_model.cc:33
 msgid "Artist"
 msgstr "Umělec"
 
-#: src/gtkui/columns.cc:38
+#: src/gtkui/columns.cc:39 src/moonstone/playlist_model.cc:39
+#: src/qtui/playlist_model.cc:33
 msgid "Year"
 msgstr "Rok"
 
-#: src/gtkui/columns.cc:39 src/qtui/playlist_model.cc:127
+#: src/gtkui/columns.cc:40 src/moonstone/playlist_model.cc:39
+#: src/qtui/playlist_model.cc:34
 msgid "Album"
 msgstr "Album"
 
-#: src/gtkui/columns.cc:40
-msgid "Album artist"
-msgstr "Umělec alba"
+#: src/gtkui/columns.cc:41 src/moonstone/playlist_model.cc:40
+#: src/qtui/playlist_model.cc:34
+msgid "Album Artist"
+msgstr "Album Umělec"
 
-#: src/gtkui/columns.cc:41
+#: src/gtkui/columns.cc:42 src/moonstone/playlist_model.cc:40
+#: src/qtui/playlist_model.cc:34
 msgid "Track"
 msgstr "Stopa"
 
-#: src/gtkui/columns.cc:42
+#: src/gtkui/columns.cc:43 src/moonstone/playlist_model.cc:40
+#: src/qtui/playlist_model.cc:34 src/streamtuner/icecast-model.cc:123
+#: src/streamtuner/shoutcast-model.cc:125
+#: src/streamtuner/shoutcast-model.cc:236
 msgid "Genre"
 msgstr "Žánr"
 
-#: src/gtkui/columns.cc:43
-msgid "Queue position"
-msgstr "Umístění ve frontě"
+#: src/gtkui/columns.cc:44 src/moonstone/playlist_model.cc:41
+#: src/qtui/playlist_model.cc:35
+msgid "Queue Position"
+msgstr "Pozice fronty"
 
-#: src/gtkui/columns.cc:44
+#: src/gtkui/columns.cc:45 src/moonstone/playlist_model.cc:41
+#: src/qtui/playlist_model.cc:35
 msgid "Length"
 msgstr "Délka"
 
-#: src/gtkui/columns.cc:45
-msgid "File path"
-msgstr "Cesta k souboru"
+#: src/gtkui/columns.cc:46 src/moonstone/playlist_model.cc:41
+#: src/qtui/playlist_model.cc:35
+msgid "File Path"
+msgstr "Cesta souboru"
+
+#: src/gtkui/columns.cc:47 src/moonstone/playlist_model.cc:42
+#: src/qtui/playlist_model.cc:35
+msgid "File Name"
+msgstr "Název souboru"
 
-#: src/gtkui/columns.cc:47
-msgid "Custom title"
+#: src/gtkui/columns.cc:48 src/moonstone/playlist_model.cc:42
+#: src/qtui/playlist_model.cc:36
+msgid "Custom Title"
 msgstr "Vlastní název"
 
-#: src/gtkui/columns.cc:48
+#: src/gtkui/columns.cc:49 src/moonstone/playlist_model.cc:42
+#: src/qtui/playlist_model.cc:36 src/streamtuner/icecast-model.cc:129
+#: src/streamtuner/shoutcast-model.cc:134
 msgid "Bitrate"
 msgstr "Datový tok"
 
-#: src/gtkui/columns.cc:308
+#: src/gtkui/columns.cc:50 src/moonstone/playlist_model.cc:43
+#: src/qtui/playlist_model.cc:36
+msgid "Comment"
+msgstr "Komentář"
+
+#: src/gtkui/columns.cc:51 src/qtui/playlist_model.cc:36
+msgid "Publisher"
+msgstr ""
+
+#: src/gtkui/columns.cc:52 src/qtui/playlist_model.cc:37
+msgid "Catalog Number"
+msgstr ""
+
+#: src/gtkui/columns.cc:53 src/moonstone/playlist_model.cc:43
+#: src/qtui/playlist_model.cc:37
+msgid "Disc"
+msgstr ""
+
+#: src/gtkui/columns.cc:325
 msgid "Available columns"
 msgstr "Použitelné sloupce"
 
-#: src/gtkui/columns.cc:334
+#: src/gtkui/columns.cc:351
 msgid "Displayed columns"
 msgstr "Zobrazené sloupce"
 
-#: src/gtkui/layout.cc:72 src/search-tool/search-tool.cc:40
+#: src/gtkui/layout.cc:74 src/search-tool-qt/search-tool-qt.cc:58
+#: src/search-tool/search-tool.cc:49
 msgid "Search Tool"
 msgstr "Vyhledávací nástroj"
 
-#: src/gtkui/layout.cc:167
+#: src/gtkui/layout.cc:170
 msgid "Dock at Left"
 msgstr "Umístit vlevo"
 
-#: src/gtkui/layout.cc:167
+#: src/gtkui/layout.cc:170
 msgid "Dock at Right"
 msgstr "Umístit vpravo"
 
-#: src/gtkui/layout.cc:168
+#: src/gtkui/layout.cc:171
 msgid "Dock at Top"
 msgstr "Umístit nahoru"
 
-#: src/gtkui/layout.cc:168
+#: src/gtkui/layout.cc:171
 msgid "Dock at Bottom"
 msgstr "Umístit dolů"
 
-#: src/gtkui/layout.cc:168
+#: src/gtkui/layout.cc:171
 msgid "Undock"
 msgstr "Neumisťovat"
 
-#: src/gtkui/layout.cc:168 src/ladspa/plugin.cc:531
+#: src/gtkui/layout.cc:171 src/ladspa/plugin.cc:540
 msgid "Disable"
 msgstr "Zakázat"
 
-#: src/gtkui/menus.cc:126 src/qtui/main_window_actions.cc:93
-#: src/statusicon/statusicon.cc:276
+#: src/gtkui/menus.cc:79 src/qtui/menus.cc:107
+#: src/statusicon-qt/statusicon.cc:115 src/statusicon/statusicon.cc:286
 msgid "_Open Files ..."
 msgstr "_Otevřít soubory…"
 
-#: src/gtkui/menus.cc:127
+#: src/gtkui/menus.cc:80 src/qtui/menus.cc:111
 msgid "Open _URL ..."
 msgstr "Otevřít _URL…"
 
-#: src/gtkui/menus.cc:128 src/qtui/main_window_actions.cc:95
+#: src/gtkui/menus.cc:81 src/qtui/menus.cc:113
 msgid "_Add Files ..."
 msgstr "Přid_at soubory…"
 
-#: src/gtkui/menus.cc:129
+#: src/gtkui/menus.cc:82 src/qtui/menus.cc:118
 msgid "Add U_RL ..."
 msgstr "Přidat U_RL…"
 
-#: src/gtkui/menus.cc:131
+#: src/gtkui/menus.cc:84 src/qtui/menus.cc:120
 msgid "Search _Library"
-msgstr "Prohledej knihovnu"
+msgstr "Prohledat knihovnu"
 
-#: src/gtkui/menus.cc:133 src/qtui/main_window_actions.cc:98
+#: src/gtkui/menus.cc:86 src/qtui/menus.cc:123
 msgid "A_bout ..."
 msgstr "_O programu… "
 
-#: src/gtkui/menus.cc:134 src/qtui/main_window_actions.cc:99
+#: src/gtkui/menus.cc:87 src/qtui/menus.cc:125
 msgid "_Settings ..."
 msgstr "_Nastavení ..."
 
-#: src/gtkui/menus.cc:135 src/qtui/main_window_actions.cc:103
-#: src/statusicon/statusicon.cc:284
+#: src/gtkui/menus.cc:88 src/qtui/menus.cc:131
+#: src/statusicon-qt/statusicon.cc:117 src/statusicon/statusicon.cc:288
 msgid "_Quit"
 msgstr "_Konec"
 
-#: src/gtkui/menus.cc:139 src/gtkui/menus.cc:262
-#: src/qtui/main_window_actions.cc:107 src/search-tool/search-tool.cc:641
-#: src/statusicon/statusicon.cc:278
+#: src/gtkui/menus.cc:92 src/gtkui/menus.cc:226
+#: src/moonstone/playlist_tabs.cc:306 src/qtui/menus.cc:135
+#: src/qtui/playlist_tabs.cc:331 src/search-tool-qt/search-tool-qt.cc:499
+#: src/search-tool/search-tool.cc:339 src/statusicon-qt/statusicon.cc:109
+#: src/statusicon/statusicon.cc:280
 msgid "_Play"
 msgstr "_Hrát"
 
-#: src/gtkui/menus.cc:140 src/qtui/main_window_actions.cc:108
-#: src/statusicon/statusicon.cc:279
+#: src/gtkui/menus.cc:93 src/qtui/menus.cc:137
+#: src/statusicon-qt/statusicon.cc:110 src/statusicon/statusicon.cc:281
 msgid "Paus_e"
 msgstr "P_ozastavit"
 
-#: src/gtkui/menus.cc:141 src/qtui/main_window_actions.cc:109
-#: src/statusicon/statusicon.cc:280
+#: src/gtkui/menus.cc:94 src/qtui/menus.cc:139
+#: src/statusicon-qt/statusicon.cc:111 src/statusicon/statusicon.cc:282
 msgid "_Stop"
 msgstr "Za_stavit"
 
-#: src/gtkui/menus.cc:142 src/qtui/main_window_actions.cc:110
-#: src/statusicon/statusicon.cc:277
+#: src/gtkui/menus.cc:95 src/qtui/menus.cc:141
+#: src/statusicon-qt/statusicon.cc:112 src/statusicon/statusicon.cc:283
 msgid "Pre_vious"
 msgstr "Před_chozí"
 
-#: src/gtkui/menus.cc:143 src/qtui/main_window_actions.cc:111
-#: src/statusicon/statusicon.cc:281
+#: src/gtkui/menus.cc:96 src/qtui/menus.cc:143
+#: src/statusicon-qt/statusicon.cc:113 src/statusicon/statusicon.cc:284
 msgid "_Next"
 msgstr "_Další"
 
-#: src/gtkui/menus.cc:145 src/qtui/main_window_actions.cc:113
+#: src/gtkui/menus.cc:97 src/qtui/menus.cc:145 src/skins/menus.cc:114
+#: src/skins-qt/menus.cc:105
+msgid "Previous Album"
+msgstr "Předchozí album"
+
+#: src/gtkui/menus.cc:98 src/qtui/menus.cc:146 src/skins/menus.cc:115
+#: src/skins-qt/menus.cc:106
+msgid "Next Album"
+msgstr "Další album"
+
+#: src/gtkui/menus.cc:100 src/qtui/menus.cc:148
 msgid "_Repeat"
 msgstr "_Opakovat"
 
-#: src/gtkui/menus.cc:146 src/qtui/main_window_actions.cc:114
+#: src/gtkui/menus.cc:101 src/qtui/menus.cc:150
 msgid "S_huffle"
 msgstr "Ná_hodné přehrávání"
 
-#: src/gtkui/menus.cc:147 src/qtui/main_window_actions.cc:115
+#: src/gtkui/menus.cc:102 src/qtui/menus.cc:152
+msgid "Shuffle by Albu_m"
+msgstr "Náh_odné přehrávání v rámci alba"
+
+#: src/gtkui/menus.cc:103 src/qtui/menus.cc:155
 msgid "N_o Playlist Advance"
 msgstr "Žádné p_okračování dle seznamu skladeb"
 
-#: src/gtkui/menus.cc:148 src/qtui/main_window_actions.cc:116
+#: src/gtkui/menus.cc:104 src/qtui/menus.cc:157
 msgid "Stop A_fter This Song"
 msgstr "Zastavit _po této skladbě"
 
-#: src/gtkui/menus.cc:150 src/gtkui/menus.cc:247
-#: src/qtui/main_window_actions.cc:118
+#: src/gtkui/menus.cc:106 src/gtkui/menus.cc:210 src/qtui/menus.cc:162
+#: src/qtui/menus.cc:294
 msgid "Song _Info ..."
 msgstr "_Informace o skladbě…"
 
-#: src/gtkui/menus.cc:151
+#: src/gtkui/menus.cc:107
 msgid "Jump to _Time ..."
 msgstr "Přejí_t na čas…"
 
-#: src/gtkui/menus.cc:152
+#: src/gtkui/menus.cc:108
 msgid "_Jump to Song ..."
 msgstr "Pře_jít na skladbu…"
 
-#: src/gtkui/menus.cc:154
+#: src/gtkui/menus.cc:110 src/qtui/menus.cc:165
 msgid "Set Repeat Point _A"
 msgstr "Nastavit bod opakování _A"
 
-#: src/gtkui/menus.cc:155
+#: src/gtkui/menus.cc:111 src/qtui/menus.cc:167
 msgid "Set Repeat Point _B"
 msgstr "Nastavit bod opakování _B"
 
-#: src/gtkui/menus.cc:156
+#: src/gtkui/menus.cc:112 src/qtui/menus.cc:169
 msgid "_Clear Repeat Points"
 msgstr "_Vymazat body opakování"
 
-#: src/gtkui/menus.cc:160 src/gtkui/menus.cc:167 src/gtkui/menus.cc:183
-#: src/qtui/main_window_actions.cc:122 src/qtui/main_window_actions.cc:129
-#: src/qtui/main_window_actions.cc:145
+#: src/gtkui/menus.cc:116 src/gtkui/menus.cc:123 src/gtkui/menus.cc:141
+#: src/qtui/menus.cc:173 src/qtui/menus.cc:180 src/qtui/menus.cc:198
 msgid "By _Title"
 msgstr "Podle ná_zvu"
 
-#: src/gtkui/menus.cc:161 src/qtui/main_window_actions.cc:123
+#: src/gtkui/menus.cc:117 src/qtui/menus.cc:174
 msgid "By _File Name"
-msgstr ""
+msgstr "Podle ná_zvu souboru"
 
-#: src/gtkui/menus.cc:162 src/qtui/main_window_actions.cc:124
+#: src/gtkui/menus.cc:118 src/qtui/menus.cc:175
 msgid "By File _Path"
 msgstr "Podle cesty k _souboru"
 
-#: src/gtkui/menus.cc:166 src/gtkui/menus.cc:182
-#: src/qtui/main_window_actions.cc:128 src/qtui/main_window_actions.cc:144
+#: src/gtkui/menus.cc:122 src/gtkui/menus.cc:140 src/qtui/menus.cc:179
+#: src/qtui/menus.cc:197
 msgid "By Track _Number"
 msgstr "Podle čísla _stopy"
 
-#: src/gtkui/menus.cc:168 src/gtkui/menus.cc:184
-#: src/qtui/main_window_actions.cc:130 src/qtui/main_window_actions.cc:146
+#: src/gtkui/menus.cc:124 src/gtkui/menus.cc:142 src/qtui/menus.cc:181
+#: src/qtui/menus.cc:199
 msgid "By _Artist"
 msgstr "Podle _umělce"
 
-#: src/gtkui/menus.cc:169 src/gtkui/menus.cc:185
-#: src/qtui/main_window_actions.cc:131 src/qtui/main_window_actions.cc:147
+#: src/gtkui/menus.cc:125 src/gtkui/menus.cc:143 src/qtui/menus.cc:182
+#: src/qtui/menus.cc:200
 msgid "By Al_bum"
 msgstr "Podle Al_ba"
 
-#: src/gtkui/menus.cc:170 src/gtkui/menus.cc:186
-#: src/qtui/main_window_actions.cc:132 src/qtui/main_window_actions.cc:148
+#: src/gtkui/menus.cc:126 src/gtkui/menus.cc:144 src/qtui/menus.cc:183
+#: src/qtui/menus.cc:201
 msgid "By Albu_m Artist"
-msgstr ""
+msgstr "Podle u_mělce alba"
 
-#: src/gtkui/menus.cc:171 src/gtkui/menus.cc:187
-#: src/qtui/main_window_actions.cc:133 src/qtui/main_window_actions.cc:149
+#: src/gtkui/menus.cc:127 src/gtkui/menus.cc:145 src/qtui/menus.cc:184
+#: src/qtui/menus.cc:202
 msgid "By Release _Date"
 msgstr "Podle data vy_dání"
 
-#: src/gtkui/menus.cc:172 src/gtkui/menus.cc:188
-#: src/qtui/main_window_actions.cc:134 src/qtui/main_window_actions.cc:150
+#: src/gtkui/menus.cc:128 src/gtkui/menus.cc:146 src/qtui/menus.cc:185
+#: src/qtui/menus.cc:203
 msgid "By _Genre"
-msgstr ""
+msgstr "Podle žá_nru"
 
-#: src/gtkui/menus.cc:173 src/gtkui/menus.cc:189
-#: src/qtui/main_window_actions.cc:135 src/qtui/main_window_actions.cc:151
+#: src/gtkui/menus.cc:129 src/gtkui/menus.cc:147 src/qtui/menus.cc:186
+#: src/qtui/menus.cc:204
 msgid "By _Length"
 msgstr "Podle _délky"
 
-#: src/gtkui/menus.cc:174 src/gtkui/menus.cc:190
-#: src/qtui/main_window_actions.cc:136 src/qtui/main_window_actions.cc:152
+#: src/gtkui/menus.cc:130 src/gtkui/menus.cc:148 src/qtui/menus.cc:187
+#: src/qtui/menus.cc:205
 msgid "By _File Path"
 msgstr "Podle _cesty k souboru"
 
-#: src/gtkui/menus.cc:175 src/gtkui/menus.cc:191
-#: src/qtui/main_window_actions.cc:137 src/qtui/main_window_actions.cc:153
+#: src/gtkui/menus.cc:131 src/gtkui/menus.cc:149 src/qtui/menus.cc:188
+#: src/qtui/menus.cc:206
 msgid "By _Custom Title"
 msgstr "_Vlastní název"
 
-#: src/gtkui/menus.cc:177 src/gtkui/menus.cc:193
-#: src/qtui/main_window_actions.cc:139 src/qtui/main_window_actions.cc:155
+#: src/gtkui/menus.cc:132 src/gtkui/menus.cc:150 src/qtui/menus.cc:189
+#: src/qtui/menus.cc:207
+msgid "By C_omment"
+msgstr "Podle k_omentáře"
+
+#: src/gtkui/menus.cc:133 src/gtkui/menus.cc:151 src/qtui/menus.cc:190
+#: src/qtui/menus.cc:208
+msgid "By D_isc Number"
+msgstr ""
+
+#: src/gtkui/menus.cc:135 src/gtkui/menus.cc:153 src/qtui/menus.cc:192
+#: src/qtui/menus.cc:210
 msgid "R_everse Order"
 msgstr "_Obrátit pořadí"
 
-#: src/gtkui/menus.cc:178 src/gtkui/menus.cc:194
-#: src/qtui/main_window_actions.cc:140 src/qtui/main_window_actions.cc:156
+#: src/gtkui/menus.cc:136 src/gtkui/menus.cc:154 src/qtui/menus.cc:194
+#: src/qtui/menus.cc:212
 msgid "_Random Order"
 msgstr "Ná_hodné pořadí"
 
-#: src/gtkui/menus.cc:198 src/qtui/main_window_actions.cc:160
+#: src/gtkui/menus.cc:158 src/qtui/menus.cc:216
 msgid "_Play/Resume"
-msgstr ""
+msgstr "_Přehrát/Pokračovat"
 
-#: src/gtkui/menus.cc:199 src/gtkui/menus.cc:251
-#: src/qtui/main_window_actions.cc:161
+#: src/gtkui/menus.cc:159 src/qtui/menus.cc:218
 msgid "_Refresh"
 msgstr "_Obnovit"
 
-#: src/gtkui/menus.cc:201 src/qtui/main_window_actions.cc:163
+#: src/gtkui/menus.cc:161 src/qtui/menus.cc:222
 msgid "_Sort"
 msgstr "_Seřadit"
 
-#: src/gtkui/menus.cc:202 src/qtui/main_window_actions.cc:164
+#: src/gtkui/menus.cc:162 src/qtui/menus.cc:223
 msgid "Sort Se_lected"
 msgstr "Seřadit vy_brané"
 
-#: src/gtkui/menus.cc:203 src/qtui/main_window_actions.cc:165
+#: src/gtkui/menus.cc:163 src/qtui/menus.cc:225
 msgid "Remove _Duplicates"
 msgstr "Odstranit _duplikáty"
 
-#: src/gtkui/menus.cc:204 src/qtui/main_window_actions.cc:166
+#: src/gtkui/menus.cc:164 src/qtui/menus.cc:226
 msgid "Remove _Unavailable Files"
 msgstr "Odstranit nedost_upné soubory"
 
-#: src/gtkui/menus.cc:206 src/playlist-manager/playlist-manager.cc:244
-#: src/qtui/main_window_actions.cc:168
+#: src/gtkui/menus.cc:166 src/playlist-manager/playlist-manager.cc:219
+#: src/playlist-manager-qt/playlist-manager-qt.cc:348 src/qtui/menus.cc:229
 msgid "_New"
 msgstr "_Nový"
 
-#: src/gtkui/menus.cc:207
+#: src/gtkui/menus.cc:167 src/qtui/menus.cc:230
 msgid "Ren_ame ..."
 msgstr "Přej_menovat"
 
-#: src/gtkui/menus.cc:208 src/gtkui/menus.cc:264
-#: src/qtui/main_window_actions.cc:170
+#: src/gtkui/menus.cc:168 src/gtkui/menus.cc:228
+#: src/moonstone/playlist_tabs.cc:311 src/qtui/menus.cc:231
+#: src/qtui/playlist_tabs.cc:336
 msgid "Remo_ve"
-msgstr "Odstraň"
+msgstr "Odstranit"
 
-#: src/gtkui/menus.cc:210
+#: src/gtkui/menus.cc:170 src/qtui/menus.cc:233
 msgid "_Import ..."
 msgstr "_Importovat…"
 
-#: src/gtkui/menus.cc:211
+#: src/gtkui/menus.cc:171 src/qtui/menus.cc:234
 msgid "_Export ..."
 msgstr "_Exportovat…"
 
-#: src/gtkui/menus.cc:213
+#: src/gtkui/menus.cc:173 src/qtui/menus.cc:237
 msgid "Playlist _Manager ..."
 msgstr "Organizace seznamů skladeb"
 
-#: src/gtkui/menus.cc:214 src/qtui/main_window_actions.cc:176
+#: src/gtkui/menus.cc:174 src/qtui/menus.cc:239
 msgid "_Queue Manager ..."
 msgstr "Správce _fronty…"
 
-#: src/gtkui/menus.cc:218 src/qtui/main_window_actions.cc:180
+#: src/gtkui/menus.cc:178 src/qtui/menus.cc:243
 msgid "Volume _Up"
 msgstr "Ze_sílit"
 
-#: src/gtkui/menus.cc:219 src/qtui/main_window_actions.cc:181
+#: src/gtkui/menus.cc:179 src/qtui/menus.cc:245
 msgid "Volume _Down"
 msgstr "Z_tišit"
 
-#: src/gtkui/menus.cc:221 src/qtui/main_window_actions.cc:183
-msgid "_Equalizer"
-msgstr "_Ekvalizér"
+#: src/gtkui/menus.cc:181 src/qtui/menus.cc:249
+msgid "_Equalizer ..."
+msgstr "_Ekvalizér..."
 
-#: src/gtkui/menus.cc:223 src/qtui/main_window_actions.cc:185
+#: src/gtkui/menus.cc:182 src/qtui/menus.cc:251
 msgid "E_ffects ..."
 msgstr "E_fekty ..."
 
-#: src/gtkui/menus.cc:227
+#: src/gtkui/menus.cc:184
+msgid "_Record Stream"
+msgstr "Záznam p_roudu"
+
+#: src/gtkui/menus.cc:185
+msgid "Audio _Settings ..."
+msgstr "Na_stavení zvuku..."
+
+#: src/gtkui/menus.cc:189 src/qtui/menus.cc:260
 msgid "Show _Menu Bar"
 msgstr "Zobrazit h_lavní nabídku"
 
-#: src/gtkui/menus.cc:228
+#: src/gtkui/menus.cc:190 src/qtui/menus.cc:262
 msgid "Show I_nfo Bar"
 msgstr "Zobrazit oblast i_nformací"
 
-#: src/gtkui/menus.cc:229
+#: src/gtkui/menus.cc:191 src/qtui/menus.cc:264
+msgid "Show Info Bar _Album Art"
+msgstr ""
+
+#: src/gtkui/menus.cc:192 src/qtui/menus.cc:266
 msgid "Show Info Bar Vis_ualization"
 msgstr "Zobrazit znázornění oblasti informací"
 
-#: src/gtkui/menus.cc:230
+#: src/gtkui/menus.cc:193 src/qtui/menus.cc:268
 msgid "Show _Status Bar"
 msgstr "Zobrazit _stavový panel"
 
-#: src/gtkui/menus.cc:232
+#: src/gtkui/menus.cc:195 src/qtui/menus.cc:272
 msgid "Show _Remaining Time"
 msgstr "Ukázat _zbývající čas"
 
-#: src/gtkui/menus.cc:234
+#: src/gtkui/menus.cc:197 src/qtui/menus.cc:276 src/skins/menus.cc:157
+#: src/skins-qt/menus.cc:152
 msgid "_Visualizations ..."
 msgstr "_Vizualizace"
 
-#: src/gtkui/menus.cc:238 src/qtui/main_window_actions.cc:189
+#: src/gtkui/menus.cc:201 src/qtui/menus.cc:280
 msgid "_File"
 msgstr "_Soubor"
 
-#: src/gtkui/menus.cc:239 src/qtui/main_window_actions.cc:190
+#: src/gtkui/menus.cc:202 src/qtui/menus.cc:281
 msgid "_Playback"
 msgstr "_Přehrát"
 
-#: src/gtkui/menus.cc:240 src/qtui/main_window_actions.cc:191
+#: src/gtkui/menus.cc:203 src/qtui/menus.cc:282
 msgid "P_laylist"
 msgstr "Seznam sk_ladeb"
 
-#: src/gtkui/menus.cc:241 src/gtkui/menus.cc:258
-#: src/qtui/main_window_actions.cc:192
+#: src/gtkui/menus.cc:204 src/gtkui/menus.cc:222 src/qtui/menus.cc:283
+#: src/qtui/menus.cc:312
 msgid "_Services"
 msgstr "_Služby"
 
-#: src/gtkui/menus.cc:242 src/qtui/main_window_actions.cc:193
+#: src/gtkui/menus.cc:205 src/qtui/menus.cc:284
 msgid "_Output"
 msgstr "_Výstup"
 
-#: src/gtkui/menus.cc:243
+#: src/gtkui/menus.cc:206 src/qtui/menus.cc:285
 msgid "_View"
 msgstr "_Zobrazení"
 
-#: src/gtkui/menus.cc:248
+#: src/gtkui/menus.cc:211 src/qtui/menus.cc:296
 msgid "_Queue/Unqueue"
 msgstr "Při_dat/odebrat do/z fronty"
 
-#: src/gtkui/menus.cc:250
+#: src/gtkui/menus.cc:213 src/qtui/menus.cc:299
 msgid "_Open Containing Folder"
-msgstr ""
+msgstr "_Otevřít složku"
 
-#: src/gtkui/menus.cc:253
+#: src/gtkui/menus.cc:214 src/qtui/menus.cc:301
+msgid "_Refresh Selected"
+msgstr "Obnovit vyb_rané"
+
+#: src/gtkui/menus.cc:216 src/qtui/menus.cc:304
 msgid "Cu_t"
 msgstr "V_yjmout"
 
-#: src/gtkui/menus.cc:254
+#: src/gtkui/menus.cc:217 src/qtui/menus.cc:305
 msgid "_Copy"
 msgstr "_Kopírovat"
 
-#: src/gtkui/menus.cc:255
+#: src/gtkui/menus.cc:218 src/qtui/menus.cc:306
 msgid "_Paste"
 msgstr "V_ložit"
 
-#: src/gtkui/menus.cc:256
+#: src/gtkui/menus.cc:219 src/qtui/menus.cc:307
+msgid "Paste at _End"
+msgstr "Vložit na kon_ec"
+
+#: src/gtkui/menus.cc:220 src/qtui/menus.cc:309
 msgid "Select _All"
 msgstr "Vybr_at vše"
 
-#: src/gtkui/menus.cc:263
+#: src/gtkui/menus.cc:227 src/moonstone/playlist_tabs.cc:309
+#: src/qtui/playlist_tabs.cc:334
 msgid "_Rename ..."
-msgstr "_Přejmenovat ..."
+msgstr "_Přejmenovat..."
+
+#: src/gtkui/settings.cc:35 src/qtui/settings.cc:59
+msgid "Always"
+msgstr "Vždy"
+
+#: src/gtkui/settings.cc:36 src/qtui/settings.cc:60
+msgid "Auto-hide"
+msgstr "Automaticky skrýt"
+
+#: src/gtkui/settings.cc:37 src/qtui/settings.cc:61
+msgid "Never"
+msgstr "Nikdy"
 
-#: src/gtkui/settings.cc:35
+#: src/gtkui/settings.cc:41 src/qtui/settings.cc:64
 msgid "Playlist Tabs"
 msgstr "Panely seznamu skladeb"
 
-#: src/gtkui/settings.cc:36
-msgid "Always show tabs"
-msgstr "Vždy zobrazovat panely"
+#: src/gtkui/settings.cc:42 src/qtui/settings.cc:65
+msgid "Show playlist tabs:"
+msgstr "Zobrazit karty seznamů skladeb:"
 
-#: src/gtkui/settings.cc:38
+#: src/gtkui/settings.cc:45 src/qtui/settings.cc:69
 msgid "Show entry counts"
 msgstr "Zobrazovat počet skladeb"
 
-#: src/gtkui/settings.cc:40
+#: src/gtkui/settings.cc:47 src/qtui/settings.cc:72
 msgid "Show close buttons"
 msgstr "Zobrazovat zavírací tlačítko"
 
-#: src/gtkui/settings.cc:42
+#: src/gtkui/settings.cc:49 src/qtui/settings.cc:75
 msgid "Playlist Columns"
 msgstr "Sloupce seznamu skladeb"
 
-#: src/gtkui/settings.cc:44
+#: src/gtkui/settings.cc:51 src/qtui/settings.cc:77
 msgid "Show column headers"
 msgstr "Zobrazovat hlavičky sloupců"
 
-#: src/gtkui/settings.cc:46 src/modplug/plugin_main.cc:106
-#: src/skins/skins_cfg.cc:263
-msgid "Miscellaneous"
-msgstr "Různé"
+#: src/gtkui/settings.cc:53 src/qtui/settings.cc:82
+msgid "Make column headers clickable for sorting"
+msgstr ""
 
-#: src/gtkui/settings.cc:47
-msgid "Arrow keys seek by:"
-msgstr "Klávesy šipek posouvají o:"
+#: src/gtkui/settings.cc:56
+msgid "Use symbolic icons in toolbar"
+msgstr ""
 
-#: src/gtkui/settings.cc:50
+#: src/gtkui/settings.cc:58 src/qtui/settings.cc:86
 msgid "Scroll on song change"
 msgstr "Posun při změně skladby"
 
-#: src/gtkui/ui_gtk.cc:71
+#: src/gtkui/ui_gtk.cc:82
 msgid "GTK Interface"
 msgstr "Rozhraní GTK"
 
-#: src/gtkui/ui_gtk.cc:222 src/skins/ui_main.cc:232
+#: src/gtkui/ui_gtk.cc:219 src/skins/main.cc:228 src/skins-qt/main.cc:231
 #, c-format
 msgid "%s - Audacious"
 msgstr "%s – Audacious"
 
-#: src/gtkui/ui_gtk.cc:225 src/qtui/main_window.cc:186
+#: src/gtkui/ui_gtk.cc:221 src/moonstone/main_window.cc:184
+#: src/qtui/main_window.cc:385
 msgid "Buffering ..."
 msgstr "Plnění vyrovnávácí paměti…"
 
-#: src/gtkui/ui_gtk.cc:228 src/skins/ui_main.cc:234 src/skins/ui_main.cc:1164
+#: src/gtkui/ui_gtk.cc:224 src/pipewire/pipewire.cc:402 src/skins/main.cc:230
+#: src/skins-qt/main.cc:233
 msgid "Audacious"
 msgstr "Audacious"
 
-#: src/gtkui/ui_statusbar.cc:63 src/qtui/status_bar.cc:67
+#: src/gtkui/ui_gtk.cc:487 src/gtkui/ui_gtk.cc:518 src/gtkui/ui_gtk.cc:882
+#: src/hotkey/gui.cc:72 src/moonstone/main_window.cc:67
+#: src/moonstone/main_window.cc:145 src/moonstone/main_window.cc:146
+#: src/notify/osd.cc:85 src/qthotkey/gui.cc:67 src/qtui/main_window.cc:154
+#: src/qtui/main_window.cc:347 src/qtui/main_window.cc:348
+#: src/skins/menus.cc:109 src/skins-qt/menus.cc:100
+msgid "Play"
+msgstr "Hrát"
+
+#: src/gtkui/ui_gtk.cc:487 src/moonstone/main_window.cc:151
+#: src/moonstone/main_window.cc:152 src/notify/osd.cc:82
+#: src/qtui/main_window.cc:353 src/qtui/main_window.cc:354
+#: src/skins/menus.cc:110 src/skins-qt/menus.cc:101
+msgid "Pause"
+msgstr "Pozastavit"
+
+#: src/gtkui/ui_gtk.cc:868 src/moonstone/main_window.cc:57
+#: src/qtui/main_window.cc:145 src/skins/menus.cc:86 src/skins-qt/menus.cc:77
+msgid "Search Library"
+msgstr "Prohledat knihovnu"
+
+#: src/gtkui/ui_gtk.cc:875 src/moonstone/main_window.cc:60
+#: src/qtui/main_window.cc:147
+msgid "Open Files"
+msgstr "Otevřít soubory"
+
+#: src/gtkui/ui_gtk.cc:876 src/moonstone/main_window.cc:62
+#: src/qtui/main_window.cc:149
+msgid "Add Files"
+msgstr "Přidat soubory"
+
+#: src/gtkui/ui_gtk.cc:881 src/moonstone/main_window.cc:65
+#: src/qtui/main_window.cc:152 src/skins/menus.cc:112 src/skins-qt/menus.cc:103
+msgid "Previous"
+msgstr "Předchozí"
+
+#: src/gtkui/ui_gtk.cc:883 src/hotkey/gui.cc:74 src/moonstone/main_window.cc:69
+#: src/qthotkey/gui.cc:69 src/qtui/main_window.cc:156 src/skins/menus.cc:111
+#: src/skins-qt/menus.cc:102
+msgid "Stop"
+msgstr "Zastavit"
+
+#: src/gtkui/ui_gtk.cc:884 src/moonstone/main_window.cc:76 src/notify/osd.cc:89
+#: src/qtui/main_window.cc:163 src/skins/menus.cc:113 src/skins-qt/menus.cc:104
+msgid "Next"
+msgstr "Další"
+
+#: src/gtkui/ui_gtk.cc:886 src/moonstone/main_window.cc:79
+#: src/qtui/main_window.cc:166 src/qtui/menus.cc:254 src/skins/menus.cc:79
+#: src/skins-qt/menus.cc:69
+msgid "Record Stream"
+msgstr "Záznam proudu"
+
+#: src/gtkui/ui_gtk.cc:919 src/moonstone/main_window.cc:86
+#: src/qtui/main_window.cc:173 src/skins/menus.cc:103 src/skins-qt/menus.cc:94
+msgid "Repeat"
+msgstr "Opakovat"
+
+#: src/gtkui/ui_gtk.cc:922 src/moonstone/main_window.cc:89
+#: src/qtui/main_window.cc:176 src/skins/menus.cc:104 src/skins-qt/menus.cc:95
+msgid "Shuffle"
+msgstr "Náhodné přehrávání"
+
+#: src/gtkui/ui_gtk.cc:1114 src/qtui/main_window.cc:123
+msgid "Menu"
+msgstr ""
+
+#: src/gtkui/ui_statusbar.cc:64 src/qtui/status_bar.cc:155
 msgid "mono"
 msgstr "mono"
 
-#: src/gtkui/ui_statusbar.cc:65 src/qtui/status_bar.cc:69
+#: src/gtkui/ui_statusbar.cc:66 src/qtui/status_bar.cc:157
 msgid "stereo"
 msgstr "stereo"
 
-#: src/gtkui/ui_statusbar.cc:67 src/qtui/status_bar.cc:71
+#: src/gtkui/ui_statusbar.cc:68 src/qtui/status_bar.cc:160
 #, c-format
 msgid "%d channel"
 msgid_plural "%d channels"
 msgstr0 "%d kanál"
 msgstr1 "%d kanály"
 msgstr2 "%d kanálů"
+msgstr3 "%d kanálů"
+
+#: src/gtkui/ui_statusbar.cc:76 src/qtui/status_bar.cc:168
+#, c-format
+msgid "%d kHz"
+msgstr "%dkHz"
 
-#: src/gtkui/ui_statusbar.cc:81 src/qtui/status_bar.cc:85
+#: src/gtkui/ui_statusbar.cc:82 src/qtui/status_bar.cc:174
 #, c-format
-msgid "%d kbps"
-msgstr "%d kb/s"
+msgid "%d kbit/s"
+msgstr ""
 
-#: src/gtkui/ui_statusbar.cc:107 src/skins/ui_main_evlisteners.cc:103
+#: src/gtkui/ui_statusbar.cc:108 src/skins/main.cc:478 src/skins-qt/main.cc:461
 msgid "Single mode."
 msgstr "Režim jedné skladby."
 
-#: src/gtkui/ui_statusbar.cc:109 src/skins/ui_main_evlisteners.cc:105
+#: src/gtkui/ui_statusbar.cc:110 src/skins/main.cc:480 src/skins-qt/main.cc:463
 msgid "Playlist mode."
 msgstr "Režim seznamu skladeb."
 
-#: src/gtkui/ui_statusbar.cc:117 src/skins/ui_main_evlisteners.cc:111
+#: src/gtkui/ui_statusbar.cc:118 src/skins/main.cc:486 src/skins-qt/main.cc:469
 msgid "Stopping after song."
 msgstr "Zastavuje po skladbě."
 
-#: src/hotkey/gui.cc:71
+#: src/hotkey/gui.cc:71 src/qthotkey/gui.cc:66
 msgid "Previous track"
 msgstr "Předchozí skladba"
 
-#: src/hotkey/gui.cc:72 src/notify/osd.cc:69 src/qtui/main_window.cc:69
-#: src/qtui/main_window.cc:172 src/qtui/main_window.cc:173
-#: src/skins/menus.cc:87
-msgid "Play"
-msgstr "Hrát"
-
-#: src/hotkey/gui.cc:73
+#: src/hotkey/gui.cc:73 src/qthotkey/gui.cc:68
 msgid "Pause/Resume"
 msgstr "Pozastavit/Pokračovat"
 
-#: src/hotkey/gui.cc:74 src/qtui/main_window.cc:70 src/skins/menus.cc:89
-msgid "Stop"
-msgstr "Zastavit"
-
-#: src/hotkey/gui.cc:75
+#: src/hotkey/gui.cc:75 src/qthotkey/gui.cc:70
 msgid "Next track"
 msgstr "Další stopa"
 
-#: src/hotkey/gui.cc:76
-msgid "Forward 5 seconds"
-msgstr "Vpřed o 5 sekund"
-
-#: src/hotkey/gui.cc:77
-msgid "Rewind 5 seconds"
-msgstr "Zpět o 5 sekund"
+#: src/hotkey/gui.cc:76 src/qthotkey/gui.cc:71
+msgid "Step forward"
+msgstr "Krok vpřed"
+
+#: src/hotkey/gui.cc:77 src/qthotkey/gui.cc:72
+msgid "Step backward"
+msgstr "Krok zpět"
 
-#: src/hotkey/gui.cc:78
+#: src/hotkey/gui.cc:78 src/qthotkey/gui.cc:73
 msgid "Mute"
 msgstr "Vypnout zvuk"
 
-#: src/hotkey/gui.cc:79
+#: src/hotkey/gui.cc:79 src/qthotkey/gui.cc:74
 msgid "Volume up"
 msgstr "Zvýšit hlasitost"
 
-#: src/hotkey/gui.cc:80
+#: src/hotkey/gui.cc:80 src/qthotkey/gui.cc:75
 msgid "Volume down"
 msgstr "Snížit hlasitost"
 
-#: src/hotkey/gui.cc:81
+#: src/hotkey/gui.cc:81 src/qthotkey/gui.cc:76
 msgid "Jump to file"
 msgstr "Přejít na soubor"
 
-#: src/hotkey/gui.cc:82
+#: src/hotkey/gui.cc:82 src/qthotkey/gui.cc:77
 msgid "Toggle player window(s)"
 msgstr "Přepnout okno přehrávače"
 
-#: src/hotkey/gui.cc:83
+#: src/hotkey/gui.cc:83 src/qthotkey/gui.cc:78
 msgid "Show On-Screen-Display"
 msgstr "Zobrazit OSD (nápis na obrazovce)"
 
-#: src/hotkey/gui.cc:84
+#: src/hotkey/gui.cc:84 src/qthotkey/gui.cc:79
 msgid "Toggle repeat"
 msgstr "Přepnout opakování"
 
-#: src/hotkey/gui.cc:85
+#: src/hotkey/gui.cc:85 src/qthotkey/gui.cc:80
 msgid "Toggle shuffle"
 msgstr "Přepnout zamíchání"
 
-#: src/hotkey/gui.cc:86
+#: src/hotkey/gui.cc:86 src/qthotkey/gui.cc:81
 msgid "Toggle stop after current"
 msgstr "Přepnout zastavení po současné skladbě"
 
-#: src/hotkey/gui.cc:87
+#: src/hotkey/gui.cc:87 src/qthotkey/gui.cc:82
 msgid "Raise player window(s)"
 msgstr "Vyvolat okno přehrávače"
 
-#: src/hotkey/gui.cc:97
+#: src/hotkey/gui.cc:98 src/qthotkey/gui.cc:100
 msgid "(none)"
 msgstr "(žádné)"
 
-#: src/hotkey/gui.cc:234
+#: src/hotkey/gui.cc:261
 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 modifiers.\n"
 "\n"
 "Do you want to continue?"
 msgstr ""
-"Přiřazení prvního tlačítka myši mez modifikátoru není doporučeno.\n"
+"Nedoporučuje se jako klávesové zkratky používat primární tlačítka myši bez "
+"modifikátorů.\n"
 "\n"
 "Chcete pokračovat?"
 
-#: src/hotkey/gui.cc:236
+#: src/hotkey/gui.cc:264
 msgid "Binding mouse buttons"
 msgstr "Přiřazuji tlačítka myši"
 
-#: src/hotkey/gui.cc:391
+#: src/hotkey/gui.cc:434
 msgid ""
 "Press a key combination inside a text field.\n"
 "You can also bind mouse buttons."
@@ -2111,61 +2249,105 @@
 "Uvnitř textového pole stiskněte kombinaci kláves.\n"
 "Navázat lze také tlačítka myši."
 
-#: src/hotkey/gui.cc:396
+#: src/hotkey/gui.cc:444 src/qthotkey/gui.cc:179
 msgid "Hotkeys:"
 msgstr "Horké klávesy:"
 
-#: src/hotkey/gui.cc:413
+#: src/hotkey/gui.cc:457 src/qthotkey/gui.cc:181
 msgid "Action:"
 msgstr "Akce"
 
-#: src/hotkey/gui.cc:420
+#: src/hotkey/gui.cc:461 src/qthotkey/gui.cc:182
 msgid "Key Binding:"
 msgstr "Navázání kláves:"
 
-#: src/hotkey/gui.cc:468
+#: src/hotkey/gui.cc:518 src/qthotkey/gui.cc:184
 msgid "_Add"
 msgstr "_Přidat"
 
-#: src/hotkey/plugin.cc:61
+#: src/hotkey/plugin.cc:59 src/qthotkey/plugin.cc:78
 msgid "Global Hotkeys"
 msgstr "Globální klávesové zkratky"
 
-#: src/hotkey/plugin.cc:79
+#: src/hotkey/plugin.cc:74
 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"
+"Contributors 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 Plugin\n"
+"Ovládejte přehrávač pomocí globálních klávesových zkratek nebo "
+"multimediálních kláves.\n"
+"\n"
+"Copyright (C) 2007-2008 Sascha Hlusiak\n"
+"\n"
+"Mezi přispěvateli jsou zahrnuti:\n"
+"\n"
+"Copyright (C) 2006-2007 Vladimir Paskov \n"
+"Copyright (C) 2000-2002 Ville Syrjälä ,\n"
+"Bryn Davies ,\n"
+"Jonathan A. Davis ,\n"
+"Jeremy Tan "
 
-#: src/jack-ng/jack-ng.cc:49
+#: src/jack/jack-ng.cc:54
 msgid "JACK Output"
 msgstr "JACK výstup"
 
-#: src/jack-ng/jack-ng.cc:114
+#: src/jack/jack-ng.cc:126
+msgid "Client name:"
+msgstr "Jméno klienta:"
+
+#: src/jack/jack-ng.cc:128
 msgid "Automatically connect to output ports"
 msgstr "Automaticky připojit k výstupním portům"
 
-#: src/jack-ng/jack-ng.cc:155
+#: src/jack/jack-ng.cc:130
+msgid "Filter ports (regex, use any port if blank):"
+msgstr ""
+"Filtrovat porty (regulární výraz, použít kterýkoliv port, není-li vyplněno):"
+
+#: src/jack/jack-ng.cc:136
+msgid "Connect to physical ports only"
+msgstr "Připojit pouze k fyzickým portům"
+
+#: src/jack/jack-ng.cc:139
+msgid "Upmix to"
+msgstr "Upmixovat na"
+
+#: src/jack/jack-ng.cc:141
+msgid "ports if input has fewer channels"
+msgstr "porty pokud má vstup méně kanálů"
+
+#: src/jack/jack-ng.cc:143
+msgid "Ignore insufficient number of ports"
+msgstr "Ignorovat nedostatečné množství portů"
+
+#: src/jack/jack-ng.cc:181
+msgid "No JACK output ports were found. Please check settings."
+msgstr ""
+"Nebyly nalezeny žádné výstupní porty typu JACK. Prosím zkontrolujte "
+"nastavení."
+
+#: src/jack/jack-ng.cc:195
 #, c-format
 msgid "Only %d JACK output ports were found but %d are required."
 msgstr ""
 "Pouze %d JACK výstupních portů bylo nalezeno, ale %d je jich vyžadováno."
 
-#: src/jack-ng/jack-ng.cc:164
+#: src/jack/jack-ng.cc:210
 #, c-format
 msgid "Failed to connect to JACK port %s."
 msgstr "Nepodařilo se připojit na JACK port %s."
 
-#: src/jack-ng/jack-ng.cc:184
+#: src/jack/jack-ng.cc:230
 msgid ""
 "JACK supports only floating-point audio. You must change the output bit "
 "depth to floating-point in Audacious settings."
@@ -2173,11 +2355,11 @@
 "JACK podporuje pouze floating-point audio. Musíte změnit výstupní bitovou "
 "hloubku na Plovoucí desetinnou čárku v nastavení JACK výstupu."
 
-#: src/jack-ng/jack-ng.cc:197
+#: src/jack/jack-ng.cc:245
 msgid "Failed to connect to the JACK server; is it running?"
 msgstr "Nepodařilo se spojit s JACK servrem; běží?"
 
-#: src/jack-ng/jack-ng.cc:273
+#: src/jack/jack-ng.cc:321
 #, c-format
 msgid ""
 "The JACK server requires a sample rate of %d Hz, but Audacious is playing at "
@@ -2186,16 +2368,16 @@
 "JACK server vyžaduje vzorkovací kmitočet %d Hz, ale Audacious přehrává na %d "
 "Hz. Prosím použijte efekt Převodník vzorkovacího kmitočtu na opravu."
 
-#: src/ladspa/plugin.cc:414
+#: src/ladspa/plugin.cc:416
 #, c-format
 msgid "%s Settings"
 msgstr "Nastavení %s"
 
-#: src/ladspa/plugin.cc:478
+#: src/ladspa/plugin.cc:482
 msgid "Module paths:"
 msgstr "Cesta k modulům:"
 
-#: src/ladspa/plugin.cc:483
+#: src/ladspa/plugin.cc:487
 msgid ""
 "Separate multiple paths with a colon.\n"
 "These paths are searched in addition to LADSPA_PATH.\n"
@@ -2206,25 +2388,25 @@
 "Po té, co přidáte novou cestu, je třeba stisknout Enter, aby se vyhledaly "
 "nové moduly."
 
-#: src/ladspa/plugin.cc:499
+#: src/ladspa/plugin.cc:508
 msgid "Available plugins:"
 msgstr "Dostupné moduly:"
 
-#: src/ladspa/plugin.cc:512 src/modplug/plugin_main.cc:92
-#: src/modplug/plugin_main.cc:95 src/modplug/plugin_main.cc:98
-#: src/modplug/plugin_main.cc:101
+#: src/ladspa/plugin.cc:521 src/modplug/plugin_main.cc:91
+#: src/modplug/plugin_main.cc:94 src/modplug/plugin_main.cc:97
+#: src/modplug/plugin_main.cc:100
 msgid "Enable"
 msgstr "Povolit"
 
-#: src/ladspa/plugin.cc:518
+#: src/ladspa/plugin.cc:527
 msgid "Enabled plugins:"
 msgstr "Povolené moduly:"
 
-#: src/ladspa/plugin.cc:534
+#: src/ladspa/plugin.cc:543
 msgid "Settings"
 msgstr "Nastavení"
 
-#: src/ladspa/plugin.cc:551
+#: src/ladspa/plugin.cc:560
 msgid ""
 "LADSPA Host for Audacious\n"
 "Copyright 2011 John Lindgren"
@@ -2238,9 +2420,9 @@
 
 #: src/lirc/lirc.cc:55
 msgid "LIRC Plugin"
-msgstr "LIRC Plugin"
+msgstr "LIRC plugin"
 
-#: src/lirc/lirc.cc:381
+#: src/lirc/lirc.cc:379
 msgid ""
 "A simple plugin to control Audacious using the LIRC remote control daemon\n"
 "\n"
@@ -2269,81 +2451,141 @@
 "\n"
 "Pro více informací o LIRC, navštivte http://lirc.org."
 
-#: src/lirc/lirc.cc:392
+#: src/lirc/lirc.cc:390
 msgid "Connection"
 msgstr "Připojení"
 
-#: src/lirc/lirc.cc:393
+#: src/lirc/lirc.cc:391
 msgid "Reconnect to LIRC server"
 msgstr "Znovu se připojit k serveru LIRC"
 
-#: src/lirc/lirc.cc:395
+#: src/lirc/lirc.cc:393
 msgid "Wait before reconnecting:"
 msgstr "Vyčkat před opětovným připojením:"
 
-#: src/lyricwiki/lyricwiki.cc:41
-msgid "LyricWiki Plugin"
-msgstr "LyricWiki Plugin"
-
-#: src/lyricwiki/lyricwiki.cc:131 src/lyricwiki-qt/lyricwiki.cc:136
-msgid "No lyrics available"
-msgstr "Žádný text k dispozici"
-
-#: src/lyricwiki/lyricwiki.cc:217 src/lyricwiki/lyricwiki.cc:226
-#: src/lyricwiki/lyricwiki.cc:243 src/lyricwiki/lyricwiki.cc:252
-#: src/lyricwiki/lyricwiki.cc:267 src/lyricwiki-qt/lyricwiki.cc:222
-#: src/lyricwiki-qt/lyricwiki.cc:231 src/lyricwiki-qt/lyricwiki.cc:248
-#: src/lyricwiki-qt/lyricwiki.cc:257 src/lyricwiki-qt/lyricwiki.cc:272
-msgid "Error"
-msgstr "Chyba"
-
-#: src/lyricwiki/lyricwiki.cc:218 src/lyricwiki/lyricwiki.cc:244
-#: src/lyricwiki-qt/lyricwiki.cc:223 src/lyricwiki-qt/lyricwiki.cc:249
+#: src/lyrics-common/chart_lyrics_provider.cc:93
+#: src/lyrics-common/chart_lyrics_provider.cc:150
+#: src/lyrics-common/lyrics_ovh_provider.cc:50
 #, c-format
 msgid "Unable to fetch %s"
 msgstr "Nelze načíst %s"
 
-#: src/lyricwiki/lyricwiki.cc:227 src/lyricwiki/lyricwiki.cc:253
-#: src/lyricwiki-qt/lyricwiki.cc:232 src/lyricwiki-qt/lyricwiki.cc:258
+#: src/lyrics-common/chart_lyrics_provider.cc:100
+#: src/lyrics-common/chart_lyrics_provider.cc:157
+#: src/lyrics-common/lyrics_ovh_provider.cc:57
 #, c-format
 msgid "Unable to parse %s"
 msgstr "Nelze analyzovat %s"
 
-#: src/lyricwiki/lyricwiki.cc:259 src/lyricwiki-qt/lyricwiki.cc:264
+#: src/lyrics-common/chart_lyrics_provider.cc:121
+#: src/lyrics-common/chart_lyrics_provider.cc:194
+#: src/lyrics-common/lyrics_ovh_provider.cc:88
 msgid "Looking for lyrics ..."
-msgstr "Hledám texty ..."
+msgstr "Hledám text skladby..."
 
-#: src/lyricwiki/lyricwiki.cc:267 src/lyricwiki-qt/lyricwiki.cc:272
-msgid "Missing song metadata"
-msgstr "Chybí metadata skladby"
+#: src/lyrics-common/preferences.h:43
+msgid "Nowhere"
+msgstr "Nikde"
 
-#: src/lyricwiki/lyricwiki.cc:278 src/lyricwiki-qt/lyricwiki.cc:283
-msgid "Connecting to lyrics.wikia.com ..."
-msgstr "Připojování k lyrics.wikia.com ..."
+#: src/lyrics-common/preferences.h:49
+msgid "Artist is truncated at the start, Title -- at the end"
+msgstr ""
 
-#: src/lyricwiki-qt/lyricwiki.cc:55
-msgid "LyricWiki Plugin (Qt)"
-msgstr "LyricWiki Plugin (Qt)"
+#: src/lyrics-common/preferences.h:50
+msgid "Chars to truncate on:"
+msgstr ""
 
-#: src/m3u/m3u.cc:32
+#: src/lyrics-common/preferences.h:54
+msgid "Chars are ORed in RegExp, surrounded by whitespace"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:55
+msgid "Chars to split on:"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:56
+msgid "Further truncate those on chars"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:62
+msgid "General"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:63
+msgid "Split title into artist and title on chars"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:66
+msgid "Sources"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:67
+msgid "Use embedded lyrics (from Lyrics tag)"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:69
+msgid "Fetch lyrics from internet:"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:72
+msgid "Store fetched lyrics in local cache"
+msgstr "Uchovat získané texty skladeb v lokální mezipaměti"
+
+#: src/lyrics-common/preferences.h:74
+msgid "Local Storage"
+msgstr "Lokální úložiště"
+
+#: src/lyrics-common/preferences.h:75
+msgid "Load lyric files (.lrc) from local storage"
+msgstr "Načíst soubor s texty skladeb (.lrc) z lokálního úložiště"
+
+#: src/lyrics-common/utils.cc:54 src/ui-common/dialogs-qt.cc:63
+msgid "Error"
+msgstr "Chyba"
+
+#: src/lyrics-common/utils.cc:60
+msgid "Lyrics could not be found."
+msgstr "Text skladby nebyl nalezen."
+
+#: src/lyrics-common/utils.cc:142
+msgid "Missing title and/or artist."
+msgstr "Chybějící název a/nebo umělec."
+
+#: src/lyrics-gtk/lyrics-gtk.cc:37 src/lyrics-qt/lyrics-qt.cc:50
+msgid "Lyrics"
+msgstr "Text skladby"
+
+#: src/lyrics-gtk/lyrics-gtk.cc:189 src/lyrics-qt/lyrics-qt.cc:171
+msgid "Edit Lyrics ..."
+msgstr "Upravit text skladby ..."
+
+#: src/lyrics-gtk/lyrics-gtk.cc:195 src/lyrics-qt/lyrics-qt.cc:178
+msgid "Save Locally"
+msgstr "Uložit lokálně"
+
+#: src/lyrics-gtk/lyrics-gtk.cc:201 src/lyrics-qt/lyrics-qt.cc:186
+msgid "Refresh"
+msgstr "Obnovit"
+
+#: src/m3u/m3u.cc:33
 msgid "M3U Playlists"
-msgstr "M3U Playlisty"
+msgstr "M3U seznamy skladeb"
 
 #: src/metronom/metronom.cc:44
 msgid "Tact Generator"
 msgstr "Genetátor taktů"
 
-#: src/metronom/metronom.cc:147
+#: src/metronom/metronom.cc:145
 #, c-format
 msgid "Tact generator: %d bpm"
 msgstr "Generátor taktu: %d dob/min"
 
-#: src/metronom/metronom.cc:149
+#: src/metronom/metronom.cc:147
 #, c-format
 msgid "Tact generator: %d bpm %d/%d"
 msgstr "Generátor taktu: %d dob/min %d⁄%d"
 
-#: src/metronom/metronom.cc:237
+#: src/metronom/metronom.cc:235
 msgid ""
 "A Tact Generator by Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
 "\n"
@@ -2357,11 +2599,11 @@
 "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/mixer/mixer.cc:38
+#: src/mixer/mixer.cc:43
 msgid "Channel Mixer"
 msgstr "Míchání kanálů"
 
-#: src/mixer/mixer.cc:202
+#: src/mixer/mixer.cc:255
 msgid ""
 "Channel Mixer Plugin for Audacious\n"
 "Copyright 2011-2012 John Lindgren and Michał Lipski"
@@ -2369,184 +2611,192 @@
 "Zásuvný modul kanáloveho mixeru pro Audacious\n"
 "Copyright 2011-2012 John Lindgren a Michał Lipski"
 
-#: src/mixer/mixer.cc:206
+#: src/mixer/mixer.cc:259
 msgid "Channel Mixer"
 msgstr "Míchání kanálů"
 
-#: src/mixer/mixer.cc:207
+#: src/mixer/mixer.cc:260
 msgid "Output channels:"
 msgstr "Výstupní kanály:"
 
 #: src/mms/mms.cc:35
 msgid "MMS Plugin"
-msgstr "MMS Plugin"
+msgstr "MMS plugin"
 
 #: src/mms/mms.cc:82
 msgid "Error connecting to MMS server"
 msgstr "Chyba při připojení k MMS servru"
 
-#: src/modplug/modplugbmp.h:53
+#: src/modplug/modplugbmp.h:57
 msgid "ModPlug (Module Player)"
 msgstr "ModPlug (Module Player)"
 
-#: src/modplug/plugin_main.cc:53
-msgid "Resolution"
-msgstr "Rozlišení"
-
-#: src/modplug/plugin_main.cc:54
-msgid "8-bit"
-msgstr "8 bitů"
-
 #: src/modplug/plugin_main.cc:55
-msgid "16-bit"
-msgstr "16 bitů"
-
-#: src/modplug/plugin_main.cc:56
 msgid "Channels"
 msgstr "Kanály"
 
-#: src/modplug/plugin_main.cc:60
+#: src/modplug/plugin_main.cc:59
 msgid "Nearest (fastest)"
 msgstr "Nejbližší (nejrychlejší)"
 
-#: src/modplug/plugin_main.cc:61
+#: src/modplug/plugin_main.cc:60
 msgid "Linear (fast)"
 msgstr "Lineární (rychlé)"
 
-#: src/modplug/plugin_main.cc:62
+#: src/modplug/plugin_main.cc:61
 msgid "Spline (good)"
 msgstr "Křivka (dobré)"
 
-#: src/modplug/plugin_main.cc:63
+#: src/modplug/plugin_main.cc:62
 msgid "Polyphase (best)"
 msgstr "Vícefázové (nejlepší)"
 
-#: src/modplug/plugin_main.cc:64
+#: src/modplug/plugin_main.cc:63
 msgid "Sample rate"
-msgstr "Vzorkovací kmitočet"
+msgstr "Vzorkovací frekvence"
 
-#: src/modplug/plugin_main.cc:65
+#: src/modplug/plugin_main.cc:64
 msgid "22 kHz"
-msgstr "22 kHz"
+msgstr "22.05kHz"
 
-#: src/modplug/plugin_main.cc:66
+#: src/modplug/plugin_main.cc:65
 msgid "44 kHz"
-msgstr "44 kHz"
+msgstr "44.1kHz"
 
-#: src/modplug/plugin_main.cc:67
+#: src/modplug/plugin_main.cc:66
 msgid "48 kHz"
-msgstr "48 kHz"
+msgstr "48kHz"
 
-#: src/modplug/plugin_main.cc:68
+#: src/modplug/plugin_main.cc:67
 msgid "96 kHz"
-msgstr "96 kHz"
+msgstr "96kHz"
 
-#: src/modplug/plugin_main.cc:72 src/modplug/plugin_main.cc:77
-#: src/modplug/plugin_main.cc:82
+#: src/modplug/plugin_main.cc:71 src/modplug/plugin_main.cc:76
+#: src/modplug/plugin_main.cc:81
 msgid "Level:"
 msgstr "Úroveň:"
 
-#: src/modplug/plugin_main.cc:78
+#: src/modplug/plugin_main.cc:77
 msgid "Cutoff:"
 msgstr "Bod zkrácení:"
 
-#: src/modplug/plugin_main.cc:91
+#: src/modplug/plugin_main.cc:90
 msgid "Reverb"
 msgstr "Dozvuk"
 
-#: src/modplug/plugin_main.cc:94
+#: src/modplug/plugin_main.cc:93
 msgid "Bass Boost"
 msgstr "Zdůraznění basů"
 
-#: src/modplug/plugin_main.cc:97
+#: src/modplug/plugin_main.cc:96
 msgid "Surround"
 msgstr "Prostorový zvuk"
 
-#: src/modplug/plugin_main.cc:100
+#: src/modplug/plugin_main.cc:99
 msgid "Preamp"
 msgstr "Předzesílení"
 
-#: src/modplug/plugin_main.cc:107
+#: src/modplug/plugin_main.cc:106
 msgid "Oversample"
 msgstr "Oblast vzorku"
 
-#: src/modplug/plugin_main.cc:108
+#: src/modplug/plugin_main.cc:107
 msgid "Noise reduction"
 msgstr "Zmenšení šumu"
 
-#: src/modplug/plugin_main.cc:109
+#: src/modplug/plugin_main.cc:108
 msgid "Play Amiga MODs"
 msgstr "Přehrát Amiga MOD"
 
-#: src/modplug/plugin_main.cc:110
+#: src/modplug/plugin_main.cc:109
 msgid "Repeat"
 msgstr "Opakovat"
 
-#: src/modplug/plugin_main.cc:111
+#: src/modplug/plugin_main.cc:110
 msgid "Repeat count:"
 msgstr "Počet opakování:"
 
-#: src/modplug/plugin_main.cc:112
+#: src/modplug/plugin_main.cc:111
 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.cc:125 src/sid/xs_config.cc:106
+#: src/modplug/plugin_main.cc:124 src/sid/xs_config.cc:106
 msgid "These settings will take effect when Audacious is restarted."
 msgstr "Tyto nastavení se projeví až po restartu Audacious."
 
+#: src/moonstone/main_window.cc:72 src/moonstone/main_window.cc:73
+#: src/qtui/main_window.cc:159 src/qtui/main_window.cc:160
+#: src/skins/menus.cc:107 src/skins-qt/menus.cc:98
+msgid "Stop After This Song"
+msgstr "Zastavit po této skladbě"
+
+#: src/moonstone/moonstone.cc:39
+msgid "Moonstone"
+msgstr ""
+
+#: src/moonstone/playlist_header.cc:212 src/qtui/playlist_header.cc:258
+msgid "Reset to Defaults"
+msgstr "Obnovit výchozí nastavení"
+
+#: src/moonstone/playlist_model.cc:38 src/qtui/playlist_header.cc:232
+msgid "Now Playing"
+msgstr "Nyní hraje"
+
+#: src/moonstone/playlist_selection.cc:66
+#: src/playlist-manager/playlist-manager.cc:201
+#: src/playlist-manager-qt/playlist-manager-qt.cc:190
+msgid "Entries"
+msgstr "Položky"
+
 #: src/mpg123/mpg123.cc:54
 msgid "MPG123 Plugin"
-msgstr "MPG123 Plugin"
+msgstr "MPG123 plugin"
 
-#: src/mpg123/mpg123.cc:83
-msgid "Advanced"
-msgstr "Pokročilé"
-
-#: src/mpg123/mpg123.cc:84
+#: src/mpg123/mpg123.cc:82
 msgid "Use accurate length calculation (slow)"
 msgstr "Použij přesný výpočet délky (pomalé)"
 
-#: src/mpg123/mpg123.cc:248
+#: src/mpg123/mpg123.cc:260
 msgid "Surround"
 msgstr "Prostorový zvuk"
 
-#: src/mpris2/plugin.cc:39
+#: src/mpris2/plugin.cc:40
 msgid "MPRIS 2 Server"
-msgstr "MPRIS 2 Server"
+msgstr "MPRIS 2 server"
 
-#: src/neon/neon.cc:97
+#: src/neon/neon.cc:102
 msgid "Neon HTTP/HTTPS Plugin"
-msgstr "Neon HTTP/HTTPS Plugin"
+msgstr "Neon HTTP/HTTPS plugin"
 
-#: src/neon/neon.cc:521
+#: src/neon/neon.cc:526
 msgid "Error parsing redirect"
-msgstr ""
+msgstr "Chyba zpracování přesměrování"
 
-#: src/neon/neon.cc:535
+#: src/neon/neon.cc:540
 msgid "Unknown HTTP error"
 msgstr "Neznámá HTTP chyba"
 
-#: src/neon/neon.cc:569
+#: src/neon/neon.cc:614
 msgid "Error parsing URL"
-msgstr ""
+msgstr "Chyba zpracování URL"
 
-#: src/neon/neon.cc:632
+#: src/neon/neon.cc:687
 msgid "Too many redirects"
-msgstr ""
+msgstr "Příliš přesměrování"
 
-#: src/notify/event.cc:64
+#: src/notify/event.cc:97
 msgid "Stopped"
 msgstr "Zastaveno"
 
-#: src/notify/event.cc:64
+#: src/notify/event.cc:97
 msgid "Audacious is not playing."
 msgstr "Audacious nyní nehraje."
 
-#: src/notify/notify.cc:42
+#: src/notify/notify.cc:39
 msgid "Desktop Notifications"
 msgstr "Oznámení na plochu"
 
-#: src/notify/notify.cc:60
+#: src/notify/notify.cc:57
 msgid ""
 "Desktop Notifications Plugin for Audacious\n"
 "Copyright (C) 2010 Maximilian Bogner\n"
@@ -2565,65 +2815,124 @@
 "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 ""
+"Zásuvný modul upozornění pro Audacious\n"
+"Copyright (c) 2010 Maximilian Bogner\n"
+"Copyright (c) 2011-2013 John Lindgren and Jean-Alexandre Anglès d'Auriac\n"
+"\n"
+"Tento zásuvný modul je svobodný software: můžete jej šířit a/nebo upravovat "
+"dle podmínek GNU General Public License, vydávané Free Software Foundation, "
+"a to buď verze 3 této licence, nebo (dle vlastního uvážení) kterékoliv "
+"pozdější verze.\n"
+"\n"
+"Tento zásuvný modul je šířen v naději, že bude užitečný, ale BEZ JAKÉKOLIV "
+"ZÁRUKY; dokonce i bez předpokládané záruky PRODEJNOSTI nebo VHODNOSTI PRO "
+"KONKRÉTNÍ ÚČEL. Podívejte se na GNU General Public License pro další "
+"podrobnosti.\n"
+"\n"
+"Měli byste obdržet kopii GNU General Public License spolu s tímto programem. "
+"Pokud tomu tak není, podívejte se na <http://www.gnu.org/licenses/>."
 
-#: src/notify/notify.cc:110
+#: src/notify/notify.cc:104
 msgid "Show playback controls"
 msgstr "Ukázat ovládání přehrávání"
 
-#: src/notify/notify.cc:112
+#: src/notify/notify.cc:106
 msgid "Always show notification"
 msgstr "Vždy ukázat oznámení"
 
-#: src/notify/notify.cc:114
+#: src/notify/notify.cc:108
 msgid "Include album name in notification"
 msgstr "Včetně jména alba v oznámení"
 
-#: src/notify/osd.cc:58
+#: src/notify/notify.cc:110
+msgid "Custom notification duration:"
+msgstr ""
+
+#: src/notify/osd.cc:74
 msgid "Show"
 msgstr "Ukázat"
 
-#: src/notify/osd.cc:66 src/qtui/main_window.cc:178
-#: src/qtui/main_window.cc:179 src/skins/menus.cc:88
-msgid "Pause"
-msgstr "Pozastavit"
+#: src/openmpt/mpt.cc:50
+msgid "OpenMPT (Module Player)"
+msgstr "OpenMPT (modulární přehrávač)"
 
-#: src/notify/osd.cc:73 src/qtui/main_window.cc:72 src/skins/menus.cc:91
-msgid "Next"
-msgstr "Další"
+#: src/openmpt/mpt.cc:132
+msgid ""
+"Module player based on libopenmpt\n"
+"\n"
+"Written by: Chris Spiegel <cspiegel@gmail.com>"
+msgstr ""
+"Modulární přehrávač založený na libopenmpt\n"
+"\n"
+"Napsal: Chris Spiegel "
+
+#: src/openmpt/mpt.cc:151
+msgid "Stereo separation:"
+msgstr "Stereo separace:"
+
+#: src/openmpt/mpt.cc:153
+msgid "% (0=mono, 100=default, 200=full)"
+msgstr ""
+
+#: src/openmpt/mpt.cc:157
+msgid "Interpolation:"
+msgstr "Interpolace:"
+
+#: src/openmpt/mptwrap.h:51 src/soxr/sox-resampler.cc:189 src/xsf/plugin.cc:437
+msgid "Linear"
+msgstr "Lineární"
 
-#: src/oss4/oss.h:93
+#: src/openmpt/mptwrap.h:52
+msgid "Cubic"
+msgstr "Kubická"
+
+#: src/openmpt/mptwrap.h:53
+msgid "Windowed sinc"
+msgstr "Sinc v okně"
+
+#: src/opus/opus.cc:39
+msgid "Opus Decoder"
+msgstr ""
+
+#: src/opus/opus.cc:336
+msgid ""
+"Opus Decoder Plugin for Audacious\n"
+"Copyright 2022 Thomas Lange"
+msgstr ""
+
+#: src/oss4/oss.h:70
 msgid "OSS4 Output"
 msgstr "OSS4 výstup"
 
-#: src/oss4/oss.h:95
+#: src/oss4/oss.h:72
 msgid "OSS3 Output"
 msgstr "OSS3 výstup"
 
 #: src/oss4/plugin.cc:35
 msgid "Default device"
-msgstr "Standardní zařízení"
+msgstr "Výchozí zařízení"
 
-#: src/oss4/plugin.cc:77
+#: src/oss4/plugin.cc:78
 msgid "Audio device:"
 msgstr "Zvukové zařízení:"
 
-#: src/oss4/plugin.cc:80
+#: src/oss4/plugin.cc:81
 msgid "Use alternate device:"
 msgstr "Použít jiné zařízení:"
 
-#: src/oss4/plugin.cc:84
+#: src/oss4/plugin.cc:85
 msgid "Save volume between sessions."
 msgstr "Uložit hlasitost mezi relacemi."
 
-#: src/oss4/plugin.cc:86
+#: src/oss4/plugin.cc:87
 msgid "Enable format conversions made by the OSS software."
 msgstr "Zapnout převody formátu prostřednictvím OSS."
 
-#: src/oss4/plugin.cc:88
+#: src/oss4/plugin.cc:89
 msgid "Enable exclusive mode to prevent virtual mixing."
 msgstr "Zabránit virtuálnímu směšování použitím výlučného režimu."
 
-#: src/oss4/plugin.cc:100
+#: src/oss4/plugin.cc:101
 msgid ""
 "OSS4 Output Plugin for Audacious\n"
 "Copyright 2010-2012 Michał Lipski\n"
@@ -2637,19 +2946,35 @@
 "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/playlist-manager/playlist-manager.cc:37
+#: src/pipewire/pipewire.cc:44
+msgid "PipeWire Output"
+msgstr ""
+
+#: src/pipewire/pipewire.cc:118
+msgid ""
+"PipeWire Output Plugin for Audacious\n"
+"Copyright 2022 Thomas Lange\n"
+"\n"
+"Based on the PipeWire Output Plugin for Qmmp\n"
+"Copyright 2021 Ilya Kotov"
+msgstr ""
+
+#: src/pipewire/pipewire.cc:408 src/skins/menus.cc:88 src/skins-qt/menus.cc:79
+msgid "Playback"
+msgstr "Přehrát"
+
+#: src/playlist-manager/playlist-manager.cc:38
+#: src/playlist-manager-qt/playlist-manager-qt.cc:42
 msgid "Playlist Manager"
 msgstr "Správce seznamu skladeb"
 
-#: src/playlist-manager/playlist-manager.cc:226
-msgid "Entries"
-msgstr "Položky"
-
-#: src/playlist-manager/playlist-manager.cc:245
+#: src/playlist-manager/playlist-manager.cc:221
+#: src/playlist-manager-qt/playlist-manager-qt.cc:356
 msgid "_Remove"
 msgstr "_Odstranit"
 
-#: src/playlist-manager/playlist-manager.cc:246
+#: src/playlist-manager/playlist-manager.cc:222
+#: src/playlist-manager-qt/playlist-manager-qt.cc:351
 msgid "Ren_ame"
 msgstr "Přejmenovat"
 
@@ -2657,39 +2982,67 @@
 msgid "PLS Playlists"
 msgstr "PLS seznamy skladeb"
 
-#: src/psf/plugin.cc:45
+#: src/psf/plugin.cc:53
 msgid "OpenPSF PSF1/PSF2 Decoder"
-msgstr "OpenPSF PSF1/PSF2 Dekodér"
+msgstr "OpenPSF PSF1/PSF2 dekodér"
+
+#: src/psf/plugin.cc:270
+msgid "OpenPSF Configuration"
+msgstr "Konfigurace OpenPSF"
 
-#: src/pulse_audio/pulse_audio.cc:38
+#: src/psf/plugin.cc:271 src/xsf/plugin.cc:444
+msgid "Ignore length from file"
+msgstr "Ignoruj délku ze souboru"
+
+#: src/pulse/pulse_audio.cc:42
 msgid "PulseAudio Output"
-msgstr "PulseAudio Výstup"
+msgstr "PulseAudio výstup"
+
+#: src/pulse/pulse_audio.cc:84
+msgid "Context name:"
+msgstr "Název kontextu:"
 
-#: src/pulse_audio/pulse_audio.cc:611
+#: src/pulse/pulse_audio.cc:86
+msgid "Stream name:"
+msgstr "Název proudu:"
+
+#: src/pulse/pulse_audio.cc:596
 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."
+"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 ""
+"Audacious PulseAudio plugin pro výstup\n"
+"\n"
+"Tento program je svobodný software; můžete ho šířit a/nebo upravovat podle "
+"podmínek GNU General Public License publikovaných Free Software Foundation, "
+"dle verze 2 nebo (pokud vám to vyhovuje) jakékoliv pozdější verze.\n"
+"\n"
+"Tento program je předáván s nadějí že bude užitečný, ale BEZ JAKÉKOLIV "
+"ZÁRUKY, bez jakékoli nevyslovené záruky PRODEJE nebo VHODNOSTI PRO KONKRÉTNÍ "
+"ÚČEL. Pro více informací vyhledejte GNU General Public License.\n"
+"\n"
+"Spolu s tímto programem byste měli obdržet kopii GNU General Public License. "
+"Pokud tomu tak není, napište na Free Software Foundation, Inc., 51 Franklin "
+"Street, Fifth Floor, Boston, MA 02110-1301, USA."
 
-#: src/qtaudio/qtaudio.cc:49
+#: src/qtaudio/qtaudio.cc:53
 msgid "QtMultimedia Output"
-msgstr ""
+msgstr "Výstup QtMultimedia"
 
-#: src/qtaudio/qtaudio.cc:77
+#: src/qtaudio/qtaudio.cc:84
 msgid ""
 "QtMultimedia Audio Output Plugin for Audacious\n"
 "Copyright 2014 William Pitcock\n"
@@ -2697,51 +3050,93 @@
 "Based on SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
 msgstr ""
+"Výstupní zásuvný modul QtMultimedia pro Audacious\n"
+"Copyright 2014 William Pitcock\n"
+"\n"
+"Založeno na výstupním zásuvném modulu SDL pro Audacious\n"
+"Copyright 2010 John Lindgren"
 
-#: src/qtui/dialog_windows.cc:31
-msgid "Working ..."
-msgstr "Pracuji ..."
+#: src/qtglspectrum/gl-spectrum.cc:41
+msgid ""
+"OpenGL Spectrum Analyzer for Audacious\n"
+"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
+"Copyright 2014, 2020 Ariadne Conill\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/qtui/filter_input.cc:44 src/skins/ui_playlist.cc:221
-msgid "Search"
-msgstr "Hledej"
+#: src/qthotkey/gui.cc:177
+msgid "Press a key combination inside a text field."
+msgstr ""
 
-#: src/qtui/main_window_actions.cc:94
+#: src/qthotkey/plugin.cc:105
+msgid ""
+"Global Hotkey Plugin\n"
+"Control the player with global key combinations or multimedia keys.\n"
+"\n"
+"Copyright (C) 2020 i.Dark_Templar <darktemplar@dark-templar-archives.net>\n"
+"Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n"
+"\n"
+"Contributors 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/qtui/menus.cc:109
 msgid "_Open Folder ..."
 msgstr "_Otevřít složku ..."
 
-#: src/qtui/main_window_actions.cc:96
+#: src/qtui/menus.cc:115
 msgid "_Add Folder ..."
 msgstr "_Přidat složku"
 
-#: src/qtui/main_window_actions.cc:101
+#: src/qtui/menus.cc:128
 msgid "_Log Inspector ..."
 msgstr "Inspektor logů."
 
-#: src/qtui/main_window.cc:64
-msgid "Open Files"
-msgstr "Otevřít soubory"
+#: src/qtui/menus.cc:220
+msgid "_Find ..."
+msgstr "_Hledat ..."
 
-#: src/qtui/main_window.cc:66
-msgid "Add Files"
-msgstr "Přidat soubory"
+#: src/qtui/menus.cc:256 src/skins/menus.cc:80 src/skins-qt/menus.cc:70
+msgid "Audio Settings ..."
+msgstr "Nastavení zvuku..."
 
-#: src/qtui/main_window.cc:71 src/skins/menus.cc:90
-msgid "Previous"
-msgstr "Předchozí"
+#: src/qtui/playlist_model.cc:188
+msgid "Q#"
+msgstr ""
 
-#: src/qtui/main_window.cc:77 src/skins/menus.cc:82
-msgid "Repeat"
-msgstr "Opakovat"
+#: src/qtui/playlist_model.cc:190
+msgid "T#"
+msgstr ""
 
-#: src/qtui/main_window.cc:79 src/skins/menus.cc:83
-msgid "Shuffle"
-msgstr "Náhodné přehrávání"
+#: src/qtui/playlist_model.cc:192
+msgid "C#"
+msgstr ""
+
+#: src/qtui/playlist_model.cc:194
+msgid "D#"
+msgstr ""
 
-#: src/qtui/qtui.cc:42
+#: src/qtui/qtui.cc:40
 msgid "Qt Interface"
 msgstr "Qt rozhraní"
 
+#: src/qtui/search_bar.cc:46
+msgid "Search playlist"
+msgstr "Prohledat seznam skladeb"
+
+#: src/qtui/settings.cc:79
+msgid "Use bold font for column headers"
+msgstr ""
+
 #: src/resample/resample.cc:43
 msgid "Sample Rate Converter"
 msgstr "Převodník vzorkovacího kmitočtu"
@@ -2751,6 +3146,8 @@
 "Sample Rate Converter Plugin for Audacious\n"
 "Copyright 2010-2012 John Lindgren"
 msgstr ""
+"Převodník vzorkovací frekvence pro Audacious\n"
+"Copyright 2010-2012 John Lindgren"
 
 #: src/resample/resample.cc:187
 msgid "Skip/repeat samples"
@@ -2780,13 +3177,13 @@
 msgid "Method:"
 msgstr "Metoda:"
 
-#: src/resample/resample.cc:199 src/sox-resampler/sox-resampler.cc:161
+#: src/resample/resample.cc:199 src/soxr/sox-resampler.cc:203
 msgid "Rate:"
-msgstr "Hodnocení:"
+msgstr "Frekvence:"
 
 #: src/resample/resample.cc:202
 msgid "Rate Mappings"
-msgstr ""
+msgstr "Mapování vzorkovací frekvence"
 
 #: src/resample/resample.cc:203
 msgid "Use rate mappings"
@@ -2832,87 +3229,74 @@
 msgid "192 kHz:"
 msgstr "192 kHz:"
 
-#: src/scrobbler2/config_window.cc:41
-#, c-format
-msgid "OK. Scrobbling for user: %s"
-msgstr ""
-
-#: src/scrobbler2/config_window.cc:54
-msgid "Permission Denied"
-msgstr "Přístup odepřen"
+#: src/scrobbler2/config_window.cc:29
+msgid "Checking Last.fm access ..."
+msgstr "Ověřuje se přístup k Last.fm..."
 
-#: src/scrobbler2/config_window.cc:56
-msgid "Access the following link to allow Audacious to scrobble your plays:"
-msgstr ""
-
-#: src/scrobbler2/config_window.cc:66
-msgid "Keep this window open and click 'Check Permission' again.\n"
-msgstr "Ponech toto okno otevřené a klikni znovu na 'Check Permission'.\n"
-
-#: src/scrobbler2/config_window.cc:69 src/scrobbler2/config_window.cc:80
+#: src/scrobbler2/config_window.cc:35
 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."
+"Your scrobbles are being saved on your computer temporarily. They will be "
+"submitted as soon as Audacious is allowed access."
 msgstr ""
+"Přehrané skladby jsou v počítači uloženy dočasně. Budou odeslány jakmile "
+"bude povolen přístup pro Audacious."
 
-#: src/scrobbler2/config_window.cc:77
-msgid "Network Problem."
-msgstr "Problém se sítí."
+#: src/scrobbler2/config_window.cc:41
+#, c-format
+msgid "Permission granted. Scrobbling for user %s."
+msgstr "Oprávnění uděleno. Scrobbluji pro uživatele %s."
 
-#: src/scrobbler2/config_window.cc:78
-msgid "There was a problem contacting Last.fm. Please try again later."
+#: src/scrobbler2/config_window.cc:44
+msgid ""
+"Permission denied. Open the following URL in a browser, allow Audacious "
+"access to your account, and then click 'Check Permission' again:"
 msgstr ""
-"Objevil se problém při kontaktování Last.fm. Zkuste to prosím za chvíli."
+"Oprávnění zapovězeno. Otevřete v prohlížeči následující URL, povolte přístup "
+"Audacious k vašemu účtu, poté znovu klikněte na 'Ověřit oprávnění':"
 
-#: src/scrobbler2/config_window.cc:110
-msgid "Checking..."
-msgstr "Prověřuje se..."
+#: src/scrobbler2/config_window.cc:53
+msgid "There was a problem contacting Last.fm."
+msgstr "Nastal problém s kontaktováním Last.fm."
 
-#: src/scrobbler2/config_window.cc:176
-msgid "C_heck Permission"
-msgstr "Z_kontrolovat oprávnění"
+#: src/scrobbler2/config_window.cc:92
+msgid "Check Permission"
+msgstr "Ověřit oprávnění"
 
-#: src/scrobbler2/config_window.cc:177
-msgid "_Revoke Permission"
-msgstr "_Odvolání oprávnění"
+#: src/scrobbler2/config_window.cc:93
+msgid "Revoke Permission"
+msgstr "Odvolat oprávnění"
 
-#: src/scrobbler2/config_window.cc:220
-msgid ""
-"You need to allow Audacious to scrobble tracks to your Last.fm account.\n"
-msgstr "Musíte povolit Audacious scrobblovat skladby do Last.fm účtu.\n"
+#: src/scrobbler2/config_window.cc:97
+msgid "You need to allow Audacious to scrobble tracks to your Last.fm account."
+msgstr "Musíte povolit Audacious scrobblovat skladby do Last.fm účtu."
 
 #: src/scrobbler2/scrobbler.cc:29
 msgid "Scrobbler 2.0"
 msgstr "Scrobbler 2.0"
 
-#: src/scrobbler2/scrobbler.cc:224
+#: src/scrobbler2/scrobbler.cc:200
 msgid ""
 "The Scrobbler plugin could not be started.\n"
 "There might be a problem with your installation."
 msgstr ""
+"Zásuvný modul scrobbleru nemohl být spuštěn.\n"
+"Může se jednat o problém ve vaší instalaci."
 
-#: src/scrobbler2/scrobbler.cc:289
+#: src/scrobbler2/scrobbler.cc:245
 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"
+"project."
 msgstr ""
 
-#: src/scrobbler2/scrobbler_communication.cc:642
-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/sdlout.cc:48
+#: src/sdlout/sdlout.cc:43
 msgid "SDL Output"
-msgstr "SDL Výstup"
+msgstr "SDL výstup"
 
-#: src/sdlout/sdlout.cc:77
+#: src/sdlout/sdlout.cc:72
 msgid ""
 "SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
@@ -2920,59 +3304,45 @@
 "SDL výstupní zásuvný modul pro Audacious\n"
 "Copyright 2010 John Lindgren"
 
-#: src/search-tool/search-tool.cc:116 src/search-tool/search-tool.cc:124
+#: src/search-tool/library.cc:35 src/search-tool/library.cc:46
+#: src/search-tool-qt/library.cc:35 src/search-tool-qt/library.cc:46
 msgid "Library"
 msgstr "Knihovna"
 
-#: src/search-tool/search-tool.cc:394
-#, c-format
-msgid "%d result"
-msgid_plural "%d results"
-msgstr0 ""
-msgstr1 ""
-msgstr2 ""
-
-#: src/search-tool/search-tool.cc:400
-#, c-format
-msgid "(%d hidden)"
-msgid_plural "(%d hidden)"
-msgstr0 ""
-msgstr1 ""
-msgstr2 ""
-
-#: src/search-tool/search-tool.cc:594
+#: src/search-tool-qt/search-model.cc:44 src/search-tool/search-tool.cc:287
 #, c-format
 msgid "%d song"
 msgid_plural "%d songs"
-msgstr0 ""
-msgstr1 ""
-msgstr2 ""
+msgstr0 "%d skladba"
+msgstr1 "%d skladby"
+msgstr2 "%d skladeb"
+msgstr3 "%d skladeb"
 
-#: src/search-tool/search-tool.cc:601
+#: src/search-tool-qt/search-model.cc:53 src/search-tool/search-tool.cc:294
 msgid "of this genre"
-msgstr ""
+msgstr "tohoto žánru"
 
-#: src/search-tool/search-tool.cc:607
+#: src/search-tool-qt/search-model.h:47 src/search-tool/search-model.h:45
 msgid "on"
-msgstr ""
+msgstr "na"
 
-#: src/search-tool/search-tool.cc:607
+#: src/search-tool-qt/search-model.h:47 src/search-tool/search-model.h:45
 msgid "by"
-msgstr ""
+msgstr "od"
 
-#: src/search-tool/search-tool.cc:643
-msgid "_Create Playlist"
-msgstr "_Vytvořit seznam skladeb"
+#: src/search-tool-qt/search-tool-qt.cc:165 src/search-tool/search-tool.cc:74
+msgid "Number of results to show:"
+msgstr "Počet výsledků k zobrazení:"
 
-#: src/search-tool/search-tool.cc:645
-msgid "_Add to Playlist"
-msgstr "Přid_at do seznamu skladeb"
+#: src/search-tool-qt/search-tool-qt.cc:168 src/search-tool/search-tool.cc:77
+msgid "Rescan library at startup"
+msgstr "Při spuštění přeskenovat knihovnu"
 
-#: src/search-tool/search-tool.cc:684
-msgid "Search library"
-msgstr "Prohledat knihovnu"
+#: src/search-tool-qt/search-tool-qt.cc:170
+msgid "Monitor library for changes"
+msgstr "Monitorovat knihovnu kvůli změnám"
 
-#: src/search-tool/search-tool.cc:688
+#: src/search-tool-qt/search-tool-qt.cc:193 src/search-tool/search-tool.cc:450
 msgid ""
 "To import your music library into Audacious, choose a folder and then click "
 "the \"refresh\" icon."
@@ -2980,21 +3350,47 @@
 "Hudební knihovnu se do Audacious naimportuje tak, že vyberete složku a pak "
 "kliknete na ikonu „obnovit“."
 
-#: src/search-tool/search-tool.cc:696
+#: src/search-tool-qt/search-tool-qt.cc:195 src/search-tool/search-tool.cc:459
 msgid "Please wait ..."
 msgstr "Prosím, počkejte…"
 
-#: src/search-tool/search-tool.cc:723
+#: src/search-tool-qt/search-tool-qt.cc:197 src/search-tool/search-tool.cc:487
 msgid "Choose Folder"
 msgstr "Vybrat složku"
 
+#: src/search-tool-qt/search-tool-qt.cc:201 src/search-tool/search-tool.cc:445
+msgid "Search library"
+msgstr "Prohledat knihovnu"
+
+#: src/search-tool-qt/search-tool-qt.cc:327 src/search-tool/search-tool.cc:156
+#, c-format
+msgid "%d of %d result shown"
+msgid_plural "%d of %d results shown"
+msgstr0 "Zobrazen %d z %d výsledku"
+msgstr1 "Zobrazeny %d z %d výsledků"
+msgstr2 "Zobrazeno %d z %d výsledků"
+msgstr3 "Zobrazeno %d z %d výsledků"
+
+#: src/search-tool-qt/search-tool-qt.cc:331 src/search-tool/search-tool.cc:160
+#, c-format
+msgid "%d result"
+msgid_plural "%d results"
+msgstr0 "%d výsledek"
+msgstr1 "%d výsledky"
+msgstr2 "%d výsledků"
+msgstr3 "%d výsledků"
+
+#: src/search-tool-qt/search-tool-qt.cc:501 src/search-tool/search-tool.cc:341
+msgid "_Create Playlist"
+msgstr "_Vytvořit seznam skladeb"
+
+#: src/search-tool-qt/search-tool-qt.cc:503 src/search-tool/search-tool.cc:343
+msgid "_Add to Playlist"
+msgstr "Přid_at do seznamu skladeb"
+
 #: src/sid/xmms-sid.cc:43
 msgid "SID Player"
-msgstr "SID Přehrávač"
-
-#: src/sid/xs_config.cc:61
-msgid "Output"
-msgstr "Výstup"
+msgstr "SID přehrávač"
 
 #: src/sid/xs_config.cc:62
 msgid "Channels:"
@@ -3010,7 +3406,7 @@
 
 #: src/sid/xs_config.cc:71
 msgid "Do not automatically select chip model"
-msgstr ""
+msgstr "Nevybírat automaticky model čipu"
 
 #: src/sid/xs_config.cc:73
 msgid "Emulate filter"
@@ -3018,11 +3414,11 @@
 
 #: src/sid/xs_config.cc:75
 msgid "Clock speed:"
-msgstr ""
+msgstr "Hodinová frekvence:"
 
 #: src/sid/xs_config.cc:78
 msgid "Do not automatically select clock speed"
-msgstr ""
+msgstr "Nevybírat automaticky hodinovou frekvenci"
 
 #: src/sid/xs_config.cc:80
 msgid "Playback time"
@@ -3042,15 +3438,15 @@
 
 #: src/sid/xs_config.cc:96
 msgid "Subtunes"
-msgstr ""
+msgstr "Podskladby"
 
 #: src/sid/xs_config.cc:97
 msgid "Enable subtunes"
-msgstr ""
+msgstr "Povolit podskladby"
 
 #: src/sid/xs_config.cc:99
 msgid "Ignore subtunes shorter than:"
-msgstr ""
+msgstr "Ignorovat podskladby kratší jak:"
 
 #: src/sid/xs_config.cc:105
 msgid "Note"
@@ -3076,741 +3472,684 @@
 msgid "Threshold:"
 msgstr "Práh:"
 
-#: src/silence-removal/silence-removal.cc:70
-msgid "dB"
-msgstr "dB"
+#: src/skins/actions.cc:45 src/skins-qt/actions.cc:43
+msgid "Repeat points cleared."
+msgstr "A-B opakování smazáno."
+
+#: src/skins/actions.cc:60 src/skins-qt/actions.cc:58
+msgid "Repeat point A set."
+msgstr "Nastavit bod opakování A."
+
+#: src/skins/actions.cc:65 src/skins-qt/actions.cc:63
+msgid "Repeat point B set."
+msgstr "Nastavit bod opakování B."
+
+#: src/skins/equalizer.cc:223 src/skins-qt/equalizer.cc:223
+msgid "Preamp"
+msgstr "Předzesílení"
+
+#: src/skins/equalizer.cc:227 src/skins-qt/equalizer.cc:227
+msgid "31 Hz"
+msgstr "31 Hz"
 
-#: src/skins/menus.cc:64
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "63 Hz"
+msgstr "63 Hz"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "125 Hz"
+msgstr "125 Hz"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "250 Hz"
+msgstr "250 Hz "
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "500 Hz"
+msgstr "500 Hz"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "1 kHz"
+msgstr "1 kHz"
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "2 kHz"
+msgstr "2 kHz"
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "4 kHz"
+msgstr "4 kHz"
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "8 kHz"
+msgstr "8 kHz"
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "16 kHz"
+msgstr "16 kHz"
+
+#: src/skins/equalizer.cc:270 src/skins-qt/equalizer.cc:270
+msgid "Audacious Equalizer"
+msgstr "Ekvalizér"
+
+#: src/skins/main.cc:459 src/skins-qt/main.cc:442
+msgid "Recording on"
+msgstr "Záznam zapnut"
+
+#: src/skins/main.cc:461 src/skins-qt/main.cc:444
+msgid "Recording off"
+msgstr "Záznam vypnut"
+
+#: src/skins/main.cc:754 src/skins-qt/main.cc:701
+#, c-format
+msgid "Seek to %d:%-2.2d / %d:%-2.2d"
+msgstr "Přejít na %d:%-2.2d / %d:%-2.2d"
+
+#: src/skins/main.cc:771 src/skins-qt/main.cc:718
+#, c-format
+msgid "Volume: %d%%"
+msgstr "Hlasitost: %d %%"
+
+#: src/skins/main.cc:784 src/skins-qt/main.cc:731
+#, c-format
+msgid "Balance: %d%% left"
+msgstr "Vyvážení: %d %% vlevo"
+
+#: src/skins/main.cc:786 src/skins-qt/main.cc:733
+msgid "Balance: center"
+msgstr "Vyvážení: střed"
+
+#: src/skins/main.cc:788 src/skins-qt/main.cc:735
+#, c-format
+msgid "Balance: %d%% right"
+msgstr "Vyvážení: %d %% vpravo"
+
+#: src/skins/main.cc:880 src/skins-qt/main.cc:827
+msgid "Options Menu"
+msgstr "Nabídka nastavení"
+
+#: src/skins/main.cc:884 src/skins-qt/main.cc:831
+msgid "Disable 'Always On Top'"
+msgstr "Vypnout „Vždy na vrchu“"
+
+#: src/skins/main.cc:886 src/skins-qt/main.cc:833
+msgid "Enable 'Always On Top'"
+msgstr "Zapnout „Vždy na vrchu“"
+
+#: src/skins/main.cc:889 src/skins-qt/main.cc:836
+msgid "File Info Box"
+msgstr "Informace o souboru"
+
+#: src/skins/main.cc:892 src/skins/menus.cc:149 src/skins-qt/main.cc:839
+#: src/skins-qt/menus.cc:142
+msgid "Double Size"
+msgstr "Dvojitá velikost"
+
+#: src/skins/main.cc:895 src/skins-qt/main.cc:842
+msgid "Visualizations"
+msgstr "Vizualizace."
+
+#: src/skins/menus.cc:74 src/skins-qt/menus.cc:64
+msgid "Volume Up"
+msgstr "Zvýšit hlasitost"
+
+#: src/skins/menus.cc:75 src/skins-qt/menus.cc:65
+msgid "Volume Down"
+msgstr "Snížit hlasitost"
+
+#: src/skins/menus.cc:77 src/skins-qt/menus.cc:67
+msgid "Effects ..."
+msgstr "Efekty..."
+
+#: src/skins/menus.cc:84 src/skins-qt/menus.cc:74
 msgid "Open Files ..."
 msgstr "Otevři soubory ..."
 
-#: src/skins/menus.cc:65
+#: src/skins/menus.cc:85 src/skins-qt/menus.cc:76
 msgid "Open URL ..."
 msgstr "Otevři URL ..."
 
-#: src/skins/menus.cc:66
-msgid "Search Library"
-msgstr "Prohledej knihovnu"
-
-#: src/skins/menus.cc:68
-msgid "Playback"
-msgstr "Přehrát"
-
-#: src/skins/menus.cc:69
+#: src/skins/menus.cc:89 src/skins-qt/menus.cc:80
 msgid "Playlist"
 msgstr "Seznam skladeb"
 
-#: src/skins/menus.cc:70
+#: src/skins/menus.cc:90 src/skins-qt/menus.cc:81
+msgid "Output"
+msgstr "Výstup"
+
+#: src/skins/menus.cc:91 src/skins-qt/menus.cc:82
 msgid "View"
 msgstr "Zobrazení"
 
-#: src/skins/menus.cc:72 src/skins/menus.cc:136 src/skins/menus.cc:149
-#: src/skins/menus.cc:214
+#: src/skins/menus.cc:93 src/skins/menus.cc:161 src/skins/menus.cc:174
+#: src/skins/menus.cc:245 src/skins-qt/menus.cc:84 src/skins-qt/menus.cc:156
+#: src/skins-qt/menus.cc:170 src/skins-qt/menus.cc:241
 msgid "Services"
 msgstr "Služby"
 
-#: src/skins/menus.cc:74
+#: src/skins/menus.cc:95 src/skins-qt/menus.cc:86
 msgid "About ..."
 msgstr "O programu ..."
 
-#: src/skins/menus.cc:75
+#: src/skins/menus.cc:96 src/skins-qt/menus.cc:87
 msgid "Settings ..."
 msgstr "Nastavení ..."
 
-#: src/skins/menus.cc:76
+#: src/skins/menus.cc:97 src/skins-qt/menus.cc:88
 msgid "Quit"
 msgstr "Ukončit"
 
-#: src/skins/menus.cc:80 src/skins/menus.cc:206
+#: src/skins/menus.cc:101 src/skins/menus.cc:235 src/skins-qt/menus.cc:92
+#: src/skins-qt/menus.cc:231
 msgid "Song Info ..."
 msgstr "Informace o skladbě ..."
 
-#: src/skins/menus.cc:84
+#: src/skins/menus.cc:105 src/skins-qt/menus.cc:96
+msgid "Shuffle by Album"
+msgstr "Náhodně v rámci alba"
+
+#: src/skins/menus.cc:106 src/skins-qt/menus.cc:97
 msgid "No Playlist Advance"
 msgstr "Žádné pokračování dle seznamu skladeb"
 
-#: src/skins/menus.cc:85
-msgid "Stop After This Song"
-msgstr "Zastavit po této skladbě"
-
-#: src/skins/menus.cc:93
+#: src/skins/menus.cc:117 src/skins-qt/menus.cc:108
 msgid "Set A-B Repeat"
 msgstr "Nastavit A-B opakování"
 
-#: src/skins/menus.cc:94
+#: src/skins/menus.cc:118 src/skins-qt/menus.cc:109
 msgid "Clear A-B Repeat"
 msgstr "Smazat A-B opakování"
 
-#: src/skins/menus.cc:96
+#: src/skins/menus.cc:120 src/skins-qt/menus.cc:111
 msgid "Jump to Song ..."
 msgstr "Přejít na skladbu ..."
 
-#: src/skins/menus.cc:97
+#: src/skins/menus.cc:121 src/skins-qt/menus.cc:113
 msgid "Jump to Time ..."
 msgstr "Přejít na čas ..."
 
-#: src/skins/menus.cc:101
+#: src/skins/menus.cc:125 src/skins-qt/menus.cc:118
 msgid "Play/Resume"
-msgstr ""
+msgstr "Přehrát/Pokračovat"
 
-#: src/skins/menus.cc:103
+#: src/skins/menus.cc:127 src/skins-qt/menus.cc:120
 msgid "New Playlist"
 msgstr "Nový seznam skladeb"
 
-#: src/skins/menus.cc:104
+#: src/skins/menus.cc:128 src/skins-qt/menus.cc:121
 msgid "Rename Playlist ..."
 msgstr "Přejmenuj seznam skladeb"
 
-#: src/skins/menus.cc:105
+#: src/skins/menus.cc:129 src/skins-qt/menus.cc:122
 msgid "Remove Playlist"
 msgstr "Odstraň seznam skladeb"
 
-#: src/skins/menus.cc:107
+#: src/skins/menus.cc:131 src/skins-qt/menus.cc:124
 msgid "Previous Playlist"
 msgstr "Předchozí seznam skladeb"
 
-#: src/skins/menus.cc:108
+#: src/skins/menus.cc:132 src/skins-qt/menus.cc:125
 msgid "Next Playlist"
 msgstr "Další seznam skladeb"
 
-#: src/skins/menus.cc:110
+#: src/skins/menus.cc:134 src/skins-qt/menus.cc:127
 msgid "Import Playlist ..."
 msgstr "Importuj seznam skladeb ..."
 
-#: src/skins/menus.cc:111
+#: src/skins/menus.cc:135 src/skins-qt/menus.cc:128
 msgid "Export Playlist ..."
 msgstr "Exportuj seznam skladeb ..."
 
-#: src/skins/menus.cc:113
+#: src/skins/menus.cc:137 src/skins-qt/menus.cc:130
 msgid "Playlist Manager ..."
 msgstr "Správce seznamu skladeb ..."
 
-#: src/skins/menus.cc:114
+#: src/skins/menus.cc:138 src/skins-qt/menus.cc:131
 msgid "Queue Manager ..."
 msgstr "Správce fronty ..."
 
-#: src/skins/menus.cc:116
+#: src/skins/menus.cc:140 src/skins-qt/menus.cc:133
 msgid "Refresh Playlist"
 msgstr "Obnov seznam skladeb"
 
-#: src/skins/menus.cc:120
+#: src/skins/menus.cc:144 src/skins-qt/menus.cc:137
 msgid "Show Playlist Editor"
 msgstr "Zobrazit editor seznamu skladeb"
 
-#: src/skins/menus.cc:121
+#: src/skins/menus.cc:145 src/skins-qt/menus.cc:138
 msgid "Show Equalizer"
 msgstr "Ukázat ekvalizér"
 
-#: src/skins/menus.cc:123
+#: src/skins/menus.cc:147 src/skins-qt/menus.cc:140
 msgid "Show Remaining Time"
 msgstr "Ukaž zbývající čas"
 
-#: src/skins/menus.cc:125
+#: src/skins/menus.cc:150 src/skins-qt/menus.cc:143
 msgid "Always on Top"
 msgstr "Vždy na vrchu"
 
-#: src/skins/menus.cc:126
+#: src/skins/menus.cc:151 src/skins-qt/menus.cc:145
 msgid "On All Workspaces"
 msgstr "Na všech pracovních plochách"
 
-#: src/skins/menus.cc:128
+#: src/skins/menus.cc:153 src/skins-qt/menus.cc:148
 msgid "Roll Up Player"
-msgstr ""
+msgstr "Vybalit přehrávač"
 
-#: src/skins/menus.cc:129
+#: src/skins/menus.cc:154 src/skins-qt/menus.cc:149
 msgid "Roll Up Playlist Editor"
-msgstr ""
+msgstr "Vybalit editor seznamu skladeb"
 
-#: src/skins/menus.cc:130
+#: src/skins/menus.cc:155 src/skins-qt/menus.cc:150
 msgid "Roll Up Equalizer"
-msgstr ""
-
-#: src/skins/menus.cc:132 src/skins/ui_main.cc:854
-msgid "Double Size"
-msgstr "Dvojitá velikost"
+msgstr "Vybalit ekvalizér"
 
-#: src/skins/menus.cc:138
+#: src/skins/menus.cc:163 src/skins-qt/menus.cc:158
 msgid "Add URL ..."
 msgstr "Přidej URL ..."
 
-#: src/skins/menus.cc:139
+#: src/skins/menus.cc:164 src/skins-qt/menus.cc:160
 msgid "Add Files ..."
 msgstr "Přidej soubory ..."
 
-#: src/skins/menus.cc:143 src/skins/menus.cc:171 src/skins/menus.cc:185
+#: src/skins/menus.cc:168 src/skins/menus.cc:196 src/skins/menus.cc:212
+#: src/skins-qt/menus.cc:164 src/skins-qt/menus.cc:192
+#: src/skins-qt/menus.cc:208
 msgid "By Title"
 msgstr "Podle názvu"
 
-#: src/skins/menus.cc:144 src/skins/menus.cc:178 src/skins/menus.cc:192
+#: src/skins/menus.cc:169 src/skins/menus.cc:203 src/skins/menus.cc:219
+#: src/skins-qt/menus.cc:165 src/skins-qt/menus.cc:199
+#: src/skins-qt/menus.cc:215
 msgid "By File Name"
-msgstr ""
+msgstr "Podle názvu souboru"
 
-#: src/skins/menus.cc:145 src/skins/menus.cc:179 src/skins/menus.cc:193
+#: src/skins/menus.cc:170 src/skins/menus.cc:204 src/skins/menus.cc:220
+#: src/skins-qt/menus.cc:166 src/skins-qt/menus.cc:200
+#: src/skins-qt/menus.cc:216
 msgid "By File Path"
-msgstr ""
+msgstr "Podle cesty k souboru"
 
-#: src/skins/menus.cc:151
+#: src/skins/menus.cc:176 src/skins-qt/menus.cc:172
 msgid "Remove All"
 msgstr "Odebrat všechny"
 
-#: src/skins/menus.cc:152
+#: src/skins/menus.cc:177 src/skins-qt/menus.cc:173
 msgid "Clear Queue"
 msgstr "Vyprázdnit frontu"
 
-#: src/skins/menus.cc:154
+#: src/skins/menus.cc:179 src/skins-qt/menus.cc:175
 msgid "Remove Unavailable Files"
 msgstr "Odstranit nedostupné soubory"
 
-#: src/skins/menus.cc:155
+#: src/skins/menus.cc:180 src/skins-qt/menus.cc:176
 msgid "Remove Duplicates"
 msgstr "Odebrat duplikáty"
 
-#: src/skins/menus.cc:157
+#: src/skins/menus.cc:182 src/skins-qt/menus.cc:178
 msgid "Remove Unselected"
 msgstr "Odebrat neoznačené"
 
-#: src/skins/menus.cc:158
+#: src/skins/menus.cc:183 src/skins-qt/menus.cc:179
 msgid "Remove Selected"
 msgstr "Odebrat označené"
 
-#: src/skins/menus.cc:162
+#: src/skins/menus.cc:187 src/skins-qt/menus.cc:183
 msgid "Search and Select"
 msgstr "Hledání a výběr"
 
-#: src/skins/menus.cc:164
+#: src/skins/menus.cc:189 src/skins-qt/menus.cc:185
 msgid "Invert Selection"
 msgstr "Invertovat výběr"
 
-#: src/skins/menus.cc:165
+#: src/skins/menus.cc:190 src/skins-qt/menus.cc:186
 msgid "Select None"
 msgstr "Nevybrat žádné"
 
-#: src/skins/menus.cc:166
+#: src/skins/menus.cc:191 src/skins-qt/menus.cc:187
 msgid "Select All"
 msgstr "Vybrat vše"
 
-#: src/skins/menus.cc:170 src/skins/menus.cc:184
+#: src/skins/menus.cc:195 src/skins/menus.cc:211 src/skins-qt/menus.cc:191
+#: src/skins-qt/menus.cc:207
 msgid "By Track Number"
 msgstr "Podle čísla stopy"
 
-#: src/skins/menus.cc:172 src/skins/menus.cc:186
+#: src/skins/menus.cc:197 src/skins/menus.cc:213 src/skins-qt/menus.cc:193
+#: src/skins-qt/menus.cc:209
 msgid "By Artist"
 msgstr "Podle umělce"
 
-#: src/skins/menus.cc:173 src/skins/menus.cc:187
+#: src/skins/menus.cc:198 src/skins/menus.cc:214 src/skins-qt/menus.cc:194
+#: src/skins-qt/menus.cc:210
 msgid "By Album"
 msgstr "Podle alba"
 
-#: src/skins/menus.cc:174 src/skins/menus.cc:188
+#: src/skins/menus.cc:199 src/skins/menus.cc:215 src/skins-qt/menus.cc:195
+#: src/skins-qt/menus.cc:211
 msgid "By Album Artist"
-msgstr ""
+msgstr "Podle umělce alba"
 
-#: src/skins/menus.cc:175 src/skins/menus.cc:190
+#: src/skins/menus.cc:200 src/skins/menus.cc:216 src/skins-qt/menus.cc:196
+#: src/skins-qt/menus.cc:212
 msgid "By Release Date"
-msgstr ""
+msgstr "Podle data vydání"
 
-#: src/skins/menus.cc:176 src/skins/menus.cc:189
+#: src/skins/menus.cc:201 src/skins/menus.cc:217 src/skins-qt/menus.cc:197
+#: src/skins-qt/menus.cc:213
 msgid "By Genre"
-msgstr ""
+msgstr "Podle žánru"
 
-#: src/skins/menus.cc:177 src/skins/menus.cc:191
+#: src/skins/menus.cc:202 src/skins/menus.cc:218 src/skins-qt/menus.cc:198
+#: src/skins-qt/menus.cc:214
 msgid "By Length"
-msgstr ""
+msgstr "Podle délky"
 
-#: src/skins/menus.cc:180 src/skins/menus.cc:194
+#: src/skins/menus.cc:205 src/skins/menus.cc:221 src/skins-qt/menus.cc:201
+#: src/skins-qt/menus.cc:217
 msgid "By Custom Title"
+msgstr "Podle vlastního názvu"
+
+#: src/skins/menus.cc:206 src/skins/menus.cc:222 src/skins-qt/menus.cc:202
+#: src/skins-qt/menus.cc:218
+msgid "By Comment"
+msgstr "Podle komentáře"
+
+#: src/skins/menus.cc:207 src/skins/menus.cc:223 src/skins-qt/menus.cc:203
+#: src/skins-qt/menus.cc:219
+msgid "By Disc Number"
 msgstr ""
 
-#: src/skins/menus.cc:198
+#: src/skins/menus.cc:227 src/skins-qt/menus.cc:223
 msgid "Randomize List"
 msgstr "Zamíchat pořadí"
 
-#: src/skins/menus.cc:199
+#: src/skins/menus.cc:228 src/skins-qt/menus.cc:224
 msgid "Reverse List"
 msgstr "Otočit seznam"
 
-#: src/skins/menus.cc:201
+#: src/skins/menus.cc:230 src/skins-qt/menus.cc:226
 msgid "Sort Selected"
 msgstr "Seřadit vybrané"
 
-#: src/skins/menus.cc:202
+#: src/skins/menus.cc:231 src/skins-qt/menus.cc:227
 msgid "Sort List"
 msgstr "Seřadit seznam"
 
-#: src/skins/menus.cc:208
+#: src/skins/menus.cc:236 src/skins-qt/menus.cc:232
+msgid "Open Containing Folder"
+msgstr "Otevřít obsahující složku"
+
+#: src/skins/menus.cc:238 src/skins-qt/menus.cc:234
 msgid "Cut"
 msgstr "Oříznout"
 
-#: src/skins/menus.cc:209
+#: src/skins/menus.cc:239 src/skins-qt/menus.cc:235
 msgid "Copy"
 msgstr "Kopírovat"
 
-#: src/skins/menus.cc:210
+#: src/skins/menus.cc:240 src/skins-qt/menus.cc:236
 msgid "Paste"
 msgstr "Vložit"
 
-#: src/skins/menus.cc:212
+#: src/skins/menus.cc:241 src/skins-qt/menus.cc:237
+msgid "Paste at End"
+msgstr "Vložit na konec"
+
+#: src/skins/menus.cc:243 src/skins-qt/menus.cc:239
 msgid "Queue/Unqueue"
 msgstr "Přidat/odebrat do/z fronty"
 
-#: src/skins/menus.cc:218
-msgid "Load Preset ..."
-msgstr "Nahraj předvolbu ..."
-
-#: src/skins/menus.cc:219
-msgid "Load Auto Preset ..."
-msgstr ""
+#: src/skins/playlist-widget.cc:58 src/skins-qt/playlist-widget.cc:58
+#, c-format
+msgid "%s (%d of %d)"
+msgstr "%s (%d z %d)"
 
-#: src/skins/menus.cc:220
-msgid "Load Default"
-msgstr "Nahraj standardní"
+#: src/skins/playlistwin.cc:491 src/skins-qt/playlistwin.cc:478
+msgid "Audacious Playlist Editor"
+msgstr "Zobrazit editor seznamu skladeb"
 
-#: src/skins/menus.cc:221
-msgid "Load Preset File ..."
-msgstr "Nahraj soubor předvoleb ..."
+#: src/skins/plugin.cc:53 src/skins-qt/plugin.cc:65
+msgid "Winamp Classic Interface"
+msgstr "Rozhraní Winamp Classic "
 
-#: src/skins/menus.cc:222
-msgid "Load EQF File ..."
-msgstr "Nahraj EQF soubor ..."
+#: src/skins-qt/menus.cc:75
+msgid "Open Folder ..."
+msgstr "Otevřít složku..."
+
+#: src/skins-qt/menus.cc:159
+msgid "Add Folder ..."
+msgstr "Přidat složku..."
 
-#: src/skins/menus.cc:224
-msgid "Save Preset ..."
-msgstr "Ulož předvolbu ..."
+#: src/skins-qt/search-select.cc:62 src/skins/search-select.cc:77
+msgid "Search entries in active playlist"
+msgstr "Vyhledat skladby v současném seznamu skladeb"
 
-#: src/skins/menus.cc:225
-msgid "Save Auto Preset ..."
+#: src/skins-qt/search-select.cc:70 src/skins/search-select.cc:83
+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 ""
+"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/menus.cc:226
-msgid "Save Default"
-msgstr "Ulož standardní"
-
-#: src/skins/menus.cc:227
-msgid "Save Preset File ..."
-msgstr "Ulož soubor předvoleb ..."
+#: src/skins-qt/search-select.cc:75 src/skins/search-select.cc:91
+msgid "Title:"
+msgstr "Název:"
 
-#: src/skins/menus.cc:228
-msgid "Save EQF File ..."
-msgstr "Ulož EQF soubor ..."
+#: src/skins-qt/search-select.cc:79 src/skins/search-select.cc:96
+msgid "Album:"
+msgstr "Album:"
 
-#: src/skins/menus.cc:230
-msgid "Delete Preset ..."
-msgstr "Smaž předvolbu ..."
+#: src/skins-qt/search-select.cc:82 src/skins/search-select.cc:101
+msgid "Artist:"
+msgstr "Umělec:"
 
-#: src/skins/menus.cc:231
-msgid "Delete Auto Preset ..."
-msgstr ""
+#: src/skins-qt/search-select.cc:85 src/skins/search-select.cc:106
+msgid "File Name:"
+msgstr "Jméno souboru:"
 
-#: src/skins/menus.cc:233
-msgid "Import Winamp Presets ..."
-msgstr "Importuj Winamp předvolbu ..."
+#: src/skins-qt/search-select.cc:88 src/skins/search-select.cc:134
+msgid "Clear previous selection before searching"
+msgstr "Před hledáním vymazat předchozí výběr"
 
-#: src/skins/menus.cc:235
-msgid "Reset to Zero"
-msgstr ""
+#: src/skins-qt/search-select.cc:89 src/skins/search-select.cc:137
+msgid "Automatically toggle queue for matching entries"
+msgstr "Shodující se položky automaticky zařadit/vyřadit z fronty"
 
-#: src/skins/plugin.cc:48
-msgid "Winamp Classic Interface"
-msgstr "Rozhraní Winamp Classic "
+#: src/skins-qt/search-select.cc:90 src/skins/search-select.cc:140
+msgid "Create a new playlist with matching entries"
+msgstr "Ze shodujících se položek vytvořit nový seznam skladeb"
 
-#: src/skins/preset-browser.cc:57 src/skins/preset-list.cc:371
-#: src/skins/preset-list.cc:386
-msgid "Save"
-msgstr "Uložit"
-
-#: src/skins/preset-browser.cc:57 src/skins/preset-list.cc:338
-#: src/skins/preset-list.cc:354
-msgid "Load"
-msgstr "Načíst"
-
-#: src/skins/preset-browser.cc:83
-msgid "Load Preset File"
-msgstr "Nahraj soubor předvoleb"
-
-#: src/skins/preset-browser.cc:100
-msgid "Load EQF File"
-msgstr "Nahraj EQF soubor"
-
-#: src/skins/preset-browser.cc:119
-msgid "Save Preset File"
-msgstr "Ulož soubor předvoleb"
-
-#: src/skins/preset-browser.cc:137
-msgid "Save EQF File"
-msgstr "Ulož EQF soubor"
-
-#: src/skins/preset-browser.cc:151
-msgid "Import Winamp Presets"
-msgstr "Importovat nastavení z Winampu"
-
-#: src/skins/preset-list.cc:285
-msgid "Presets"
-msgstr "Předvolby"
-
-#: src/skins/preset-list.cc:335
-msgid "Load preset"
-msgstr "Načíst předvolbu"
-
-#: src/skins/preset-list.cc:351
-msgid "Load auto-preset"
-msgstr "Načíst souborovou předvolbu"
-
-#: src/skins/preset-list.cc:367
-msgid "Save preset"
-msgstr "Uložit předvolbu"
-
-#: src/skins/preset-list.cc:382
-msgid "Save auto-preset"
-msgstr "Uložit automatickou předvolbu"
-
-#: src/skins/preset-list.cc:408
-msgid "Delete preset"
-msgstr "Smazat předvolbu"
-
-#: src/skins/preset-list.cc:424
-msgid "Delete auto-preset"
-msgstr "Smazat souborovou předvolbu"
+#: src/skins-qt/search-select.cc:101 src/skins/search-select.cc:78
+msgid "Search"
+msgstr "Hledej"
 
-#: src/skins/skins_cfg.cc:176
+#: src/skins-qt/skins_cfg.cc:198 src/skins/skins_cfg.cc:182
 msgid "Player:"
 msgstr "Přehrávač:"
 
-#: src/skins/skins_cfg.cc:178
+#: src/skins-qt/skins_cfg.cc:200 src/skins/skins_cfg.cc:184
 msgid "Select main player window font:"
 msgstr "Font v hlavním okně přehrávače:"
 
-#: src/skins/skins_cfg.cc:179
+#: src/skins-qt/skins_cfg.cc:201 src/skins/skins_cfg.cc:185
 msgid "Playlist:"
 msgstr "Seznam skladeb:"
 
-#: src/skins/skins_cfg.cc:181
+#: src/skins-qt/skins_cfg.cc:203 src/skins/skins_cfg.cc:187
 msgid "Select playlist font:"
 msgstr "Vyberte font pro seznam skladeb:"
 
-#: src/skins/skins_cfg.cc:187
+#: src/skins-qt/skins_cfg.cc:207 src/skins/skins_cfg.cc:191
 msgid "Skin"
+msgstr "Téma vzhledu"
+
+#: src/skins-qt/skins_cfg.cc:211 src/skins/skins_cfg.cc:193
+msgid "Display active titlebar when any window is focused"
 msgstr ""
 
-#: src/skins/skins_cfg.cc:189
+#: src/skins-qt/skins_cfg.cc:213 src/skins/skins_cfg.cc:195
 msgid "Fonts"
 msgstr "Písma"
 
-#: src/skins/skins_cfg.cc:192
+#: src/skins-qt/skins_cfg.cc:215 src/skins/skins_cfg.cc:197
 msgid "Use bitmap fonts (supports ASCII only)"
 msgstr "Použít bitmapové fonty (podporuje pouze ASCII)"
 
-#: src/skins/skins_cfg.cc:194
+#: src/skins-qt/skins_cfg.cc:217 src/skins/skins_cfg.cc:199
 msgid "Scroll song title"
 msgstr "Posouvání názvu skladby"
 
-#: src/skins/skins_cfg.cc:196
+#: src/skins-qt/skins_cfg.cc:219 src/skins/skins_cfg.cc:201
 msgid "Scroll song title in both directions"
 msgstr "Převíjet název skladby oběma směry"
 
-#: src/skins/skins_cfg.cc:201
+#: src/skins-qt/skins_cfg.cc:224 src/skins/skins_cfg.cc:206
 msgid "Analyzer"
 msgstr "Analyzátor"
 
-#: src/skins/skins_cfg.cc:202
+#: src/skins-qt/skins_cfg.cc:225 src/skins/skins_cfg.cc:207
 msgid "Scope"
 msgstr "Vlnovka"
 
-#: src/skins/skins_cfg.cc:203
+#: src/skins-qt/skins_cfg.cc:226 src/skins/skins_cfg.cc:208
 msgid "Voiceprint / VU meter"
-msgstr ""
+msgstr "Zvukový otisk / VU metr"
 
-#: src/skins/skins_cfg.cc:204
+#: src/skins-qt/skins_cfg.cc:227 src/skins/skins_cfg.cc:209
 msgid "Off"
 msgstr "Žádný"
 
-#: src/skins/skins_cfg.cc:208 src/skins/skins_cfg.cc:233
-#: src/skins/skins_cfg.cc:239
+#: src/skins-qt/skins_cfg.cc:231 src/skins-qt/skins_cfg.cc:256
+#: src/skins-qt/skins_cfg.cc:262 src/skins/skins_cfg.cc:213
+#: src/skins/skins_cfg.cc:238 src/skins/skins_cfg.cc:244
 msgid "Normal"
 msgstr "Normální"
 
-#: src/skins/skins_cfg.cc:209 src/skins/skins_cfg.cc:234
+#: src/skins-qt/skins_cfg.cc:232 src/skins-qt/skins_cfg.cc:257
+#: src/skins/skins_cfg.cc:214 src/skins/skins_cfg.cc:239
 msgid "Fire"
 msgstr "Oheň"
 
-#: src/skins/skins_cfg.cc:210
+#: src/skins-qt/skins_cfg.cc:233 src/skins/skins_cfg.cc:215
 msgid "Vertical lines"
-msgstr ""
+msgstr "Svislé čáry"
 
-#: src/skins/skins_cfg.cc:214
+#: src/skins-qt/skins_cfg.cc:237 src/skins/skins_cfg.cc:219
 msgid "Lines"
 msgstr "Čáry"
 
-#: src/skins/skins_cfg.cc:215
+#: src/skins-qt/skins_cfg.cc:238 src/skins/skins_cfg.cc:220
 msgid "Bars"
 msgstr "Sloupce"
 
-#: src/skins/skins_cfg.cc:219
+#: src/skins-qt/skins_cfg.cc:242 src/skins/skins_cfg.cc:224
 msgid "Slowest"
 msgstr "Nejpomalejší"
 
-#: src/skins/skins_cfg.cc:220
+#: src/skins-qt/skins_cfg.cc:243 src/skins/skins_cfg.cc:225
 msgid "Slow"
 msgstr "Pomalé"
 
-#: src/skins/skins_cfg.cc:221 src/sox-resampler/sox-resampler.cc:152
+#: src/skins-qt/skins_cfg.cc:244 src/skins/skins_cfg.cc:226
+#: src/soxr/sox-resampler.cc:180
 msgid "Medium"
 msgstr "Střední"
 
-#: src/skins/skins_cfg.cc:222
+#: src/skins-qt/skins_cfg.cc:245 src/skins/skins_cfg.cc:227
 msgid "Fast"
 msgstr "Rychlé"
 
-#: src/skins/skins_cfg.cc:223
+#: src/skins-qt/skins_cfg.cc:246 src/skins/skins_cfg.cc:228
 msgid "Fastest"
 msgstr "Nejrychlejší"
 
-#: src/skins/skins_cfg.cc:227
+#: src/skins-qt/skins_cfg.cc:250 src/skins/skins_cfg.cc:232
 msgid "Dots"
-msgstr ""
+msgstr "Body"
 
-#: src/skins/skins_cfg.cc:228
+#: src/skins-qt/skins_cfg.cc:251 src/skins/skins_cfg.cc:233
 msgid "Line"
-msgstr ""
+msgstr "Čára"
 
-#: src/skins/skins_cfg.cc:229
+#: src/skins-qt/skins_cfg.cc:252 src/skins/skins_cfg.cc:234
 msgid "Solid"
-msgstr ""
+msgstr "Plná vlnovka"
 
-#: src/skins/skins_cfg.cc:235
+#: src/skins-qt/skins_cfg.cc:258 src/skins/skins_cfg.cc:240
 msgid "Ice"
 msgstr "Led"
 
-#: src/skins/skins_cfg.cc:240
+#: src/skins-qt/skins_cfg.cc:263 src/skins/skins_cfg.cc:245
 msgid "Smooth"
 msgstr "Plynulý"
 
-#: src/skins/skins_cfg.cc:244
-msgid "Type"
-msgstr "Typ"
-
-#: src/skins/skins_cfg.cc:245
-msgid "Visualization type:"
-msgstr "Typ vizualizace:"
-
-#: src/skins/skins_cfg.cc:248
-msgid "Analyzer"
-msgstr "Analyzátor"
-
-#: src/skins/skins_cfg.cc:249
-msgid "Show peaks"
-msgstr "Zobrazovat zvukové špičky"
-
-#: src/skins/skins_cfg.cc:251
+#: src/skins-qt/skins_cfg.cc:267 src/skins/skins_cfg.cc:249
 msgid "Coloring:"
-msgstr ""
+msgstr "Barevné schéma:"
 
-#: src/skins/skins_cfg.cc:254
+#: src/skins-qt/skins_cfg.cc:270 src/skins/skins_cfg.cc:252
 msgid "Style:"
 msgstr "Styl:"
 
-#: src/skins/skins_cfg.cc:257
+#: src/skins-qt/skins_cfg.cc:273 src/skins/skins_cfg.cc:255
 msgid "Falloff:"
-msgstr ""
+msgstr "Klesání:"
 
-#: src/skins/skins_cfg.cc:260
+#: src/skins-qt/skins_cfg.cc:276 src/skins/skins_cfg.cc:258
 msgid "Peak falloff:"
-msgstr ""
+msgstr "Klesání vrcholku:"
 
-#: src/skins/skins_cfg.cc:264
+#: src/skins-qt/skins_cfg.cc:282 src/skins/skins_cfg.cc:264
 msgid "Scope Style:"
-msgstr ""
+msgstr "Styl vlnovky:"
 
-#: src/skins/skins_cfg.cc:267
+#: src/skins-qt/skins_cfg.cc:285 src/skins/skins_cfg.cc:267
 msgid "Voiceprint Coloring:"
-msgstr ""
+msgstr "Barevné schéma zvukového otisku:"
 
-#: src/skins/skins_cfg.cc:270
+#: src/skins-qt/skins_cfg.cc:288 src/skins/skins_cfg.cc:270
 msgid "VU Meter Style:"
 msgstr "Styl VU metru."
 
-#: src/skins/skins_cfg.cc:276
-msgid "General"
-msgstr "Obecné"
-
-#: src/skins/skins_cfg.cc:277
-msgid "Visualization"
-msgstr "Vizualizace"
-
-#: src/skins/ui_equalizer.cc:282
-msgid "Preamp"
-msgstr "Předzesílení"
-
-#: src/skins/ui_equalizer.cc:286
-msgid "31 Hz"
-msgstr "31 Hz"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "63 Hz"
-msgstr "63 Hz"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "125 Hz"
-msgstr "125 Hz"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "250 Hz"
-msgstr "250 Hz "
-
-#: src/skins/ui_equalizer.cc:287
-msgid "500 Hz"
-msgstr "500 Hz"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "1 kHz"
-msgstr "1 kHz"
-
-#: src/skins/ui_equalizer.cc:288
-msgid "2 kHz"
-msgstr "2 kHz"
-
-#: src/skins/ui_equalizer.cc:288
-msgid "4 kHz"
-msgstr "4 kHz"
-
-#: src/skins/ui_equalizer.cc:288
-msgid "8 kHz"
-msgstr "8 kHz"
-
-#: src/skins/ui_equalizer.cc:288
-msgid "16 kHz"
-msgstr "16 kHz"
-
-#: src/skins/ui_equalizer.cc:330
-msgid "Audacious Equalizer"
-msgstr "Ekvalizér"
-
-#: src/skins/ui_main.cc:688
-#, 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.cc:709
-#, c-format
-msgid "Volume: %d%%"
-msgstr "Hlasitost: %d %%"
-
-#: src/skins/ui_main.cc:732
-#, c-format
-msgid "Balance: %d%% left"
-msgstr "Vyvážení: %d %% vlevo"
-
-#: src/skins/ui_main.cc:734
-msgid "Balance: center"
-msgstr "Vyvážení: střed"
-
-#: src/skins/ui_main.cc:736
-#, c-format
-msgid "Balance: %d%% right"
-msgstr "Vyvážení: %d %% vpravo"
-
-#: src/skins/ui_main.cc:842
-msgid "Options Menu"
-msgstr "Nabídka nastavení"
-
-#: src/skins/ui_main.cc:846
-msgid "Disable 'Always On Top'"
-msgstr "Vypnout „Vždy na vrchu“"
-
-#: src/skins/ui_main.cc:848
-msgid "Enable 'Always On Top'"
-msgstr "Zapnout „Vždy na vrchu“"
-
-#: src/skins/ui_main.cc:851
-msgid "File Info Box"
-msgstr "Informace o souboru"
-
-#: src/skins/ui_main.cc:857
-msgid "Visualizations"
-msgstr "Vizualizace."
-
-#: src/skins/ui_main.cc:1336
-msgid "Repeat point A set."
-msgstr "Nastavit bod opakování A."
-
-#: src/skins/ui_main.cc:1341
-msgid "Repeat point B set."
-msgstr "Nastavit bod opakování B."
-
-#: src/skins/ui_main.cc:1350
-msgid "Repeat points cleared."
-msgstr "A-B opakování smazáno."
-
-#: src/skins/ui_playlist.cc:219
-msgid "Search entries in active playlist"
-msgstr "Vyhledat skladby v současném seznamu skladeb"
-
-#: src/skins/ui_playlist.cc:226
-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 ""
-"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.cc:234
-msgid "Title:"
-msgstr "Název:"
-
-#: src/skins/ui_playlist.cc:241
-msgid "Album:"
-msgstr "Album:"
-
-#: src/skins/ui_playlist.cc:248
-msgid "Artist:"
-msgstr "Umělec:"
-
-#: src/skins/ui_playlist.cc:255
-msgid "File Name:"
-msgstr "Jméno souboru:"
-
-#: src/skins/ui_playlist.cc:263
-msgid "Clear previous selection before searching"
-msgstr "Před hledáním vymazat předchozí výběr"
+#: src/skins-qt/skins_cfg.cc:294 src/skins/skins_cfg.cc:276
+msgid "Type"
+msgstr "Typ"
 
-#: src/skins/ui_playlist.cc:266
-msgid "Automatically toggle queue for matching entries"
-msgstr "Shodující se položky automaticky zařadit/vyřadit z fronty"
+#: src/skins-qt/skins_cfg.cc:295 src/skins/skins_cfg.cc:277
+msgid "Visualization type:"
+msgstr "Typ vizualizace:"
 
-#: src/skins/ui_playlist.cc:269
-msgid "Create a new playlist with matching entries"
-msgstr "Ze shodujících se položek vytvořit nový seznam skladeb"
+#: src/skins-qt/skins_cfg.cc:298 src/skins/skins_cfg.cc:280
+msgid "Analyzer"
+msgstr "Analyzátor"
 
-#: src/skins/ui_playlist.cc:717
-msgid "Audacious Playlist Editor"
-msgstr "Zobrazit editor seznamu skladeb"
+#: src/skins-qt/skins_cfg.cc:299 src/skins/skins_cfg.cc:281
+msgid "Show peaks"
+msgstr "Zobrazovat zvukové špičky"
 
-#: src/skins/ui_playlist.cc:752
-#, c-format
-msgid "%s (%d of %d)"
-msgstr "%s (%d z %d)"
+#: src/skins-qt/skins_cfg.cc:308 src/skins/skins_cfg.cc:290
+msgid "Visualization"
+msgstr "Vizualizace"
 
-#: src/skins/ui_skinselector.cc:167
+#: src/skins-qt/skinselector.cc:98 src/skins/skinselector.cc:111
 msgid "Archived Winamp 2.x skin"
 msgstr "Zabalený skin Winapmu 2.x"
 
-#: src/skins/ui_skinselector.cc:172
+#: src/skins-qt/skinselector.cc:102 src/skins/skinselector.cc:115
 msgid "Unarchived Winamp 2.x skin"
 msgstr "Nezabalený skin Winampu 2.x"
 
-#: src/skins/util.cc:430
-#, c-format
-msgid "Could not create directory (%s): %s\n"
-msgstr "Adresář („%s“) nebylo možné vytvořit: %s\n"
-
-#: src/sndfile/plugin.cc:39
+#: src/sndfile/plugin.cc:38
 msgid "Sndfile Plugin"
 msgstr "Sndfile modul"
 
-#: src/sndfile/plugin.cc:336
+#: src/sndfile/plugin.cc:372
 msgid ""
 "Based on the xmms_sndfile plugin:\n"
 "Copyright (C) 2000, 2002 Erik de Castro Lopo\n"
@@ -3850,94 +4189,111 @@
 "this program; if not, write to the Free Software Foundation, Inc., 51 "
 "Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 
-#: src/sndio-ng/sndio.cc:44
+#: src/sndio/sndio.cc:43
 msgid "Sndio Output"
-msgstr "Sndio Výstup"
+msgstr "Sndio výstup"
 
-#: src/sndio-ng/sndio.cc:98
+#: src/sndio/sndio.cc:98
 msgid "Device (blank for default):"
-msgstr "Zařízení (prázdné pro standardní)"
+msgstr "Zařízení (prázdné pro výchozí)"
 
-#: src/sndio-ng/sndio.cc:100
+#: src/sndio/sndio.cc:100
 msgid "Save and restore volume:"
 msgstr "Ulož a obnov hlasitost:"
 
-#: src/sndio-ng/sndio.cc:181
+#: src/sndio/sndio.cc:181
 #, c-format
 msgid "Sndio error: Unsupported audio format (%d)"
 msgstr "Sndio chyba: Nepodporovaný zvukový formát (%d)"
 
-#: src/sndio-ng/sndio.cc:192
+#: src/sndio/sndio.cc:192
 msgid "Sndio error: sio_open() failed"
 msgstr "Sndio chyba: sio_open() selhal"
 
-#: src/sndio-ng/sndio.cc:222
+#: src/sndio/sndio.cc:221
 msgid "Sndio error: sio_setpar() failed"
 msgstr "Sndio chyba: sio_setpar() selhal"
 
-#: src/sndio-ng/sndio.cc:234
+#: src/sndio/sndio.cc:233
 msgid "Sndio error: sio_start() failed"
 msgstr "Sndio chyba: sio_start() selhal"
 
-#: src/song_change/song_change.cc:33
+#: src/songchange/song_change.cc:30
 msgid "Song Change"
 msgstr "Změna skladby"
 
-#: src/song_change/song_change.cc:342
-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."
-
-#: src/song_change/song_change.cc:358
+#: src/songchange/song_change.cc:256
 msgid "Commands"
 msgstr "Příkazy"
 
-#: src/song_change/song_change.cc:360
+#: src/songchange/song_change.cc:258
 msgid "Command to run when starting a new song:"
 msgstr "Spusť příkaz při spuštění nové skladby:"
 
-#: src/song_change/song_change.cc:364
+#: src/songchange/song_change.cc:261
+msgid "Command to run when stopping a song:"
+msgstr ""
+
+#: src/songchange/song_change.cc:264
 msgid "Command to run at the end of a song:"
 msgstr "Spusť příkaz po skončení skladby:"
 
-#: src/song_change/song_change.cc:368
+#: src/songchange/song_change.cc:267
 msgid "Command to run at the end of the playlist:"
 msgstr "Spusť příkaz po skončení přehrávání seznamu skladeb:"
 
-#: src/song_change/song_change.cc:372
+#: src/songchange/song_change.cc:270
 msgid "Command to run when song title changes (for network streams):"
 msgstr "Spusť příkaz při změně názvu skladby (pro síťové proudy):"
 
-#: src/song_change/song_change.cc:376
+#: src/songchange/song_change.cc:273
 msgid ""
-"You can use the following format strings which will be substituted before "
-"calling the command (not all are useful for the end-of-playlist command):\n"
-"\n"
-"%F: Frequency (in hertz)\n"
+"You can use the following format codes, which will be replaced before "
+"running the command.\n"
+"Not all are useful though for the song-stopped or end-of-playlist command."
+msgstr ""
+
+#: src/songchange/song_change.cc:276
+msgid ""
+"%a: Artist\n"
+"%b: Album\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"
+"%F: Frequency (Hertz)\n"
+"%l: Length (milliseconds)\n"
+"%n or %s: Formatted title (see playlist settings)\n"
 "%p: Currently playing (1 or 0)\n"
-"%a: Artist\n"
-"%b: Album\n"
-"%T: Track title"
+"%r: Rate (bits per second)\n"
+"%t: Playlist position\n"
+"%T: Title (unformatted)"
 msgstr ""
+"%a: Umělec\n"
+"%b: Album\n"
+"%c: Počet kanálů\n"
+"%f: Název souboru (s úplnou cestou)\n"
+"%F: Frekvence (Hz)\n"
+"%l: Délka (v milisekundách)\n"
+"%n nebo %s: Formátovaný název (viz nastavení seznamu skladeb)\n"
+"%p: Momentálně přehrávaná skladba (1 nebo 0)\n"
+"%r: Datový tok (bity za sekundu)\n"
+"%t: Pozice v seznamu skladeb\n"
+"%T: Název (neformátovaný)"
+
+#: src/songchange/song_change.cc:287
+msgid ""
+"Parameters passed to the shell should be enclosed in quotation marks.\n"
+"Unquoted parameters may lead to unexpected results."
+msgstr ""
+
+#: src/song-info-qt/song-info.cc:30
+msgid "Song Info"
+msgstr "Informace o skladbě"
 
-#: src/song-info-qt/song-info.cc:32
-msgid "Song Info (Qt)"
-msgstr "Informace o skladbě (Qt)"
-
-#: src/sox-resampler/sox-resampler.cc:44
+#: src/soxr/sox-resampler.cc:44
 msgid "SoX Resampler"
 msgstr "Sox převzorkování"
 
-#: src/sox-resampler/sox-resampler.cc:144
+#: src/soxr/sox-resampler.cc:172
 msgid ""
 "SoX Resampler Plugin for Audacious\n"
 "Copyright 2013 Michał Lipski\n"
@@ -3951,92 +4307,147 @@
 "Založeno na Sample Rate Converter Plugin:\n"
 "Copyright 2010-2012 John Lindgren"
 
-#: src/sox-resampler/sox-resampler.cc:150
+#: src/soxr/sox-resampler.cc:178
 msgid "Quick"
 msgstr "Rychle"
 
-#: src/sox-resampler/sox-resampler.cc:151
+#: src/soxr/sox-resampler.cc:179
 msgid "Low"
 msgstr "Nízká"
 
-#: src/sox-resampler/sox-resampler.cc:153
+#: src/soxr/sox-resampler.cc:181
 msgid "High"
 msgstr "Vysoká"
 
-#: src/sox-resampler/sox-resampler.cc:154
+#: src/soxr/sox-resampler.cc:182
 msgid "Very High"
 msgstr "Velmi vysoká"
 
-#: src/sox-resampler/sox-resampler.cc:158
+#: src/soxr/sox-resampler.cc:183
+msgid "Ultra High"
+msgstr "Ultra vysoká"
+
+#: src/soxr/sox-resampler.cc:187
+msgid "Minimum"
+msgstr "Minimální"
+
+#: src/soxr/sox-resampler.cc:188
+msgid "Intermediate"
+msgstr "Střední"
+
+#: src/soxr/sox-resampler.cc:193
 msgid "Quality:"
 msgstr "Kvalita:"
 
-#: src/speed-pitch/speed-pitch.cc:51
+#: src/soxr/sox-resampler.cc:196
+msgid "Phase:"
+msgstr "Fáze:"
+
+#: src/soxr/sox-resampler.cc:200
+msgid "Allow aliasing"
+msgstr "Povolit aliasing"
+
+#: src/soxr/sox-resampler.cc:202
+msgid "Use steep filter"
+msgstr "Použít strmý filtr"
+
+#: src/speedpitch/speed-pitch.cc:54
 msgid "Speed and Pitch"
-msgstr "Rychlost a výška:"
+msgstr "Rychlost a výška"
+
+#: src/speedpitch/speed-pitch.cc:247
+msgid "Speed"
+msgstr "Rychlost"
 
-#: src/speed-pitch/speed-pitch.cc:210
-msgid "Speed and Pitch"
-msgstr "Rychlost a výška"
+#: src/speedpitch/speed-pitch.cc:248
+msgid "Decouple from pitch"
+msgstr "Oddělit od výšek tónu"
 
-#: src/speed-pitch/speed-pitch.cc:211
-msgid "Speed:"
-msgstr "Rychlost:"
+#: src/speedpitch/speed-pitch.cc:250 src/speedpitch/speed-pitch.cc:258
+msgid "Multiplier:"
+msgstr "Násobitel:"
 
-#: src/speed-pitch/speed-pitch.cc:214
-msgid "Pitch:"
-msgstr "Výška:"
+#: src/speedpitch/speed-pitch.cc:254
+msgid "Pitch"
+msgstr "Výška tónu"
 
-#: src/statusicon/statusicon.cc:47
+#: src/statusicon-qt/statusicon.cc:45 src/statusicon/statusicon.cc:47
 msgid "Status Icon"
 msgstr "Stavová ikona"
 
-#: src/statusicon/statusicon.cc:283
-msgid "Se_ttings ..."
-msgstr ""
-
-#: src/statusicon/statusicon.cc:372
+#: src/statusicon-qt/statusicon.cc:68
 msgid ""
-"Status Icon Plugin\n"
+"Status Icon Plugin (partial port for Qt interface)\n"
 "\n"
 "Copyright 2005-2007 Giacomo Lozito <james@develia.org>\n"
 "Copyright 2010 Michał Lipski <tallica@o2.pl>\n"
+"Copyright 2015 Eugene Paskevich <eugene@raptor.kiev.ua>\n"
 "\n"
 "This plugin provides a status icon, placed in\n"
 "the system tray area of the window manager."
 msgstr ""
+"Zásuvný modul stavové ikony (částečný port rozhraní Qt)\n"
+"\n"
+"Copyright 2005-2007 Giacomo Lozito <james@develia.org>\n"
+"Copyright 2010 Michał Lipski <tallica@o2.pl>\n"
+"Copyright 2015 Evžen Paskevič <eugene@raptor.kiev.ua>\n"
+"\n"
+"Tento zásuvný modul poskytuje stavovou ikonu umístěnou v\n"
+"prostoru systémové lišty okenního správce."
 
-#: src/statusicon/statusicon.cc:379
+#: src/statusicon-qt/statusicon.cc:89 src/statusicon/statusicon.cc:384
 msgid "Mouse Scroll Action"
 msgstr "Reakce na rolování myší"
 
-#: src/statusicon/statusicon.cc:380
+#: src/statusicon-qt/statusicon.cc:90 src/statusicon/statusicon.cc:385
 msgid "Change volume"
 msgstr "Změnit hlasitost"
 
-#: src/statusicon/statusicon.cc:383
+#: src/statusicon-qt/statusicon.cc:93 src/statusicon/statusicon.cc:388
 msgid "Change playing song"
 msgstr "Změnit hranou skladbu"
 
-#: src/statusicon/statusicon.cc:386
+#: src/statusicon-qt/statusicon.cc:96 src/statusicon/statusicon.cc:391
 msgid "Other Settings"
 msgstr "Ostatní nastavení"
 
-#: src/statusicon/statusicon.cc:387
+#: src/statusicon-qt/statusicon.cc:97 src/statusicon/statusicon.cc:392
 msgid "Disable the popup window"
 msgstr "Zakázat vyskakovací okno"
 
-#: src/statusicon/statusicon.cc:389
+#: src/statusicon-qt/statusicon.cc:99 src/statusicon/statusicon.cc:394
 msgid "Close to the system tray"
 msgstr "Zavřít do systémové oblasti"
 
-#: src/statusicon/statusicon.cc:391
+#: src/statusicon-qt/statusicon.cc:101 src/statusicon/statusicon.cc:396
 msgid "Advance in playlist when scrolling upward"
 msgstr "Přecházet v seznamu skladeb, když se roluje nahoru"
 
+#: src/statusicon-qt/statusicon.cc:116 src/statusicon/statusicon.cc:287
+msgid "Se_ttings ..."
+msgstr "Nas_tavení..."
+
+#: src/statusicon/statusicon.cc:377
+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 ""
+"Zásuvný modul stavové ikony\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 stavovou ikonu umístěnou v\n"
+" prostoru systémové lišty okenního správce."
+
 #: src/stereo_plugin/stereo.cc:19
 msgid "Extra Stereo"
-msgstr "Extra Stereo"
+msgstr "Extra stereo"
 
 #: src/stereo_plugin/stereo.cc:36
 msgid ""
@@ -4044,28 +4455,168 @@
 "\n"
 "By Johan Levin, 1999"
 msgstr ""
-"Extra Stereo modul\n"
+"Extra stereo modul\n"
 "\n"
 "Od Johana Levina, 1999"
 
 #: src/stereo_plugin/stereo.cc:44
 msgid "Extra Stereo"
-msgstr "Extra Stereo"
+msgstr "Extra stereo"
+
+#: src/streamtuner/icecast-model.cc:126 src/streamtuner/shoutcast-model.cc:131
+msgid "Type"
+msgstr "Typ"
+
+#: src/streamtuner/icecast-model.cc:132
+msgid "Current Song"
+msgstr "Aktuální píseň"
+
+#: src/streamtuner/icecast-model.cc:164
+msgid "Other"
+msgstr "Další"
+
+#: src/streamtuner/ihr-model.cc:63
+msgid "Market"
+msgstr "Obchod"
+
+#: src/streamtuner/ihr-model.cc:156
+msgid "Call Letters"
+msgstr "Volací znaky"
+
+#: src/streamtuner/ihr-model.cc:162
+msgid "Description"
+msgstr "Popis"
+
+#: src/streamtuner/shoutcast-model.cc:128
+msgid "Listeners"
+msgstr "Posluchači"
+
+#: src/streamtuner/shoutcast-model.cc:188
+msgid "Top 500 Stations"
+msgstr "Top 500 stanic"
+
+#: src/streamtuner/shoutcast-model.cc:189
+msgid "Alternative"
+msgstr "Alternativa"
+
+#: src/streamtuner/shoutcast-model.cc:190
+msgid "Blues"
+msgstr "Blues"
+
+#: src/streamtuner/shoutcast-model.cc:191
+msgid "Classical"
+msgstr "Klasika"
+
+#: src/streamtuner/shoutcast-model.cc:192
+msgid "Country"
+msgstr "Country"
+
+#: src/streamtuner/shoutcast-model.cc:193
+msgid "Decades"
+msgstr "Desetiletí"
+
+#: src/streamtuner/shoutcast-model.cc:194
+msgid "Easy Listening"
+msgstr "Příjemné poslouchání"
+
+#: src/streamtuner/shoutcast-model.cc:195
+msgid "Electronic"
+msgstr "Elektronická"
+
+#: src/streamtuner/shoutcast-model.cc:196
+msgid "Folk"
+msgstr "Folk"
+
+#: src/streamtuner/shoutcast-model.cc:197
+msgid "Inspirational"
+msgstr "Inspirující"
+
+#: src/streamtuner/shoutcast-model.cc:198
+msgid "International"
+msgstr "Mezinárodní"
+
+#: src/streamtuner/shoutcast-model.cc:199
+msgid "Jazz"
+msgstr "Jazz"
+
+#: src/streamtuner/shoutcast-model.cc:200
+msgid "Latin"
+msgstr "Latinská"
+
+#: src/streamtuner/shoutcast-model.cc:201
+msgid "Metal"
+msgstr "Metal"
+
+#: src/streamtuner/shoutcast-model.cc:203
+msgid "New Age"
+msgstr "New Age"
+
+#: src/streamtuner/shoutcast-model.cc:204
+msgid "Pop"
+msgstr "Pop"
+
+#: src/streamtuner/shoutcast-model.cc:205
+msgid "Public Radio"
+msgstr "Veřejné rádio"
+
+#: src/streamtuner/shoutcast-model.cc:206
+msgid "R&B and Urban"
+msgstr "R&B a Urban"
+
+#: src/streamtuner/shoutcast-model.cc:207
+msgid "Rap"
+msgstr "Rap"
+
+#: src/streamtuner/shoutcast-model.cc:208
+msgid "Reggae"
+msgstr "Reggae"
+
+#: src/streamtuner/shoutcast-model.cc:209
+msgid "Rock"
+msgstr "Rock"
+
+#: src/streamtuner/shoutcast-model.cc:210
+msgid "Seasonal and Holiday"
+msgstr "Sezónní a sváteční"
+
+#: src/streamtuner/shoutcast-model.cc:211
+msgid "Soundtracks"
+msgstr "Soundtracky"
+
+#: src/streamtuner/shoutcast-model.cc:212
+msgid "Talk"
+msgstr "Mluvené slovo"
+
+#: src/streamtuner/shoutcast-model.cc:213
+msgid "Themes"
+msgstr "Znělky"
+
+#: src/streamtuner/streamtuner.cc:59
+msgid "Shoutcast"
+msgstr "Shoutcast"
+
+#: src/streamtuner/streamtuner.cc:60
+msgid "Icecast"
+msgstr "Icecast"
+
+#: src/streamtuner/streamtuner.cc:71
+msgid "Stream Tuner"
+msgstr "Ladění proudu"
 
 #: src/tonegen/tonegen.cc:45
 msgid "Tone Generator"
 msgstr "Generátor tónu"
 
-#: src/tonegen/tonegen.cc:94
+#: src/tonegen/tonegen.cc:92
 #, c-format
 msgid "%s %.1f Hz"
 msgstr "%s %.1f Hz"
 
-#: src/tonegen/tonegen.cc:94
+#: src/tonegen/tonegen.cc:92
 msgid "Tone Generator: "
 msgstr "Generátor tónů:"
 
-#: src/tonegen/tonegen.cc:160
+#: src/tonegen/tonegen.cc:161
 msgid ""
 "Sine tone generator by Håvard Kvålen <havardk@xmms.org>\n"
 "Modified by Daniel J. Peng <danielpeng@bigfoot.com>\n"
@@ -4079,11 +4630,32 @@
 "Návod: Použij URL: tone://frekvence1;frekvence2;frekvence3;...\n"
 "např. tone://2000;2005 přehraje 2000 Hz tón a 2005 Hz tón"
 
+#: src/ui-common/dialogs-qt.cc:40
+msgid ""
+"\n"
+"(Further messages have been hidden.)"
+msgstr ""
+"\n"
+"(Další zprávy jsou skryty.)"
+
+#: src/ui-common/dialogs-qt.cc:52
+msgid "Working ..."
+msgstr "Pracuji ..."
+
+#: src/ui-common/dialogs-qt.cc:73
+msgid "Information"
+msgstr "Informace"
+
+#: src/ui-common/menu-ops-gtk.cc:132 src/ui-common/menu-ops-qt.cc:113
+#, c-format
+msgid "%s does not appear to be a valid folder."
+msgstr ""
+
 #: src/voice_removal/voice_removal.cc:28
 msgid "Voice Removal"
 msgstr "Odstranění hlasu"
 
-#: src/vorbis/vorbis.cc:465
+#: src/vorbis/vorbis.cc:433
 msgid ""
 "Audacious Ogg Vorbis Decoder\n"
 "\n"
@@ -4123,14 +4695,14 @@
 
 #: src/vorbis/vorbis.h:18
 msgid "Ogg Vorbis Decoder"
-msgstr "Ogg Vorbis Dekodér"
+msgstr "Ogg Vorbis dekodér"
 
-#: src/vtx/info.cc:22
+#: src/vtx/info.cc:24
 #, c-format
 msgid "Details about %s"
 msgstr "Detaily o %s"
 
-#: src/vtx/info.cc:24
+#: src/vtx/info.cc:26
 msgid ""
 "Title: %t\n"
 "Author: %a\n"
@@ -4144,31 +4716,89 @@
 "Player Freq: %P\n"
 "Year: %y"
 msgstr ""
+"Název: %t\n"
+"Autor: %a\n"
+"Od: %f\n"
+"Tracker: %T\n"
+"Komentář: %C\n"
+"Typ čipu: %c\n"
+"Stereo: %s\n"
+"Smyčka: %l\n"
+"Frekvence čipu: %F\n"
+"Frekvence přehrávače: %P\n"
+"Rok: %y"
 
 #: src/vtx/vtx.cc:38
 msgid "VTX Decoder"
-msgstr "VTX Dekodér"
+msgstr "VTX dekodér"
 
-#: src/vtx/vtx.cc:184
+#: src/vtx/vtx.cc:178
 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 ""
+"Přehrávač zvukového formátu Vortex: Alexandr Sašnov <sashnov@ngs.ru>\n"
+"Založeno na in_vtx.dll: Romana Šerbakov <v_soft@microfor.ru>\n"
+"Zásuvný modul pro Audacious: Pavel Vymetálek <pvymetalek@seznam.cz>"
+
+#: src/vumeter-qt/vumeter_qt.cc:31
+msgid ""
+"VU Meter Plugin for Audacious\n"
+"Copyright 2017-2019 Marc Sánchez Fauste"
+msgstr ""
+"VU Meter Plugin for Audacious\n"
+"Copyright 2017-2019 Marc Sánchez Fauste"
+
+#: src/vumeter-qt/vumeter_qt.cc:35
+msgid "VU Meter Settings"
+msgstr "Nastavení VU metru"
+
+#: src/vumeter-qt/vumeter_qt.cc:37
+msgid "Peak hold time:"
+msgstr "Pozdržení zobrazení maxima:"
+
+#: src/vumeter-qt/vumeter_qt.cc:42
+msgid "Fall-off time:"
+msgstr "Pozdržení před zobrazením minima:"
+
+#: src/vumeter-qt/vumeter_qt.cc:44
+msgid "dB/second"
+msgstr "dB/sekunda"
+
+#: src/vumeter-qt/vumeter_qt.cc:46
+msgid "Display legend"
+msgstr "Zobrazit popisky"
+
+#: src/vumeter-qt/vumeter_qt.h:37
+msgid "VU Meter"
+msgstr "VU metr"
+
+#: src/waveout/waveout.cc:43
+msgid "Win32 waveOut"
+msgstr "Win32 waveOut"
+
+#: src/waveout/waveout.cc:69
+msgid ""
+"Win32 waveOut Plugin for Audacious\n"
+"Copyright 2016 John Lindgren"
+msgstr ""
+"Win32 waveOut plugin pro Audacious\n"
+"Copyright 2016 John Lindgren"
 
-#: src/wavpack/wavpack.cc:24
+#: src/wavpack/wavpack.cc:25
 msgid "WavPack Decoder"
-msgstr "WavPack Dekodér"
+msgstr "WavPack dekodér"
 
-#: src/wavpack/wavpack.cc:211
+#: src/wavpack/wavpack.cc:217
 msgid "lossy (hybrid)"
 msgstr "Ztrátové (hybridní)"
 
-#: src/wavpack/wavpack.cc:213
+#: src/wavpack/wavpack.cc:219
 msgid "lossy"
 msgstr "Ztrátové"
 
-#: src/wavpack/wavpack.cc:255
+#: src/wavpack/wavpack.cc:259
 msgid ""
 "Copyright 2006 William Pitcock <nenolod@nenolod.net>\n"
 "\n"
@@ -4178,18 +4808,38 @@
 "\n"
 "Některý kód pluginů vytvořil Miles Egan."
 
-#: src/xsf/plugin.cc:50
+#: src/xsf/plugin.cc:74
 msgid "2SF Decoder"
-msgstr "2SF Dekodér"
+msgstr "2SF dekodér"
+
+#: src/xsf/plugin.cc:429
+msgid "32728 Hz"
+msgstr ""
+
+#: src/xsf/plugin.cc:432
+msgid "65456 Hz"
+msgstr ""
+
+#: src/xsf/plugin.cc:438
+msgid "Cosine"
+msgstr ""
+
+#: src/xsf/plugin.cc:439
+msgid "Sharp"
+msgstr ""
 
-#: src/xsf/plugin.cc:238
+#: src/xsf/plugin.cc:443
 msgid "XSF Configuration"
 msgstr " Konfigurace XSF"
 
-#: src/xsf/plugin.cc:239
-msgid "Ignore length from file"
-msgstr "Ignoruj délku ze souboru"
+#: src/xsf/plugin.cc:445
+msgid "Default fade time:"
+msgstr ""
+
+#: src/xsf/plugin.cc:447
+msgid "Interpolation mode:"
+msgstr ""
 
-#: src/xspf/xspf.cc:89
+#: src/xspf/xspf.cc:95
 msgid "XML Shareable Playlists (XSPF)"
 msgstr "XML Shareable Playlists (XSPF)"

audacious-plugins-3.6.2-gtk3.tar.bz2/po/da.po -> audacious-plugins-4.4.1.tar.bz2/po/da.po Changed

@@ -3,295 +3,78 @@
 # This file is distributed under the same license as the Audacious Plugins package.
 #
 # Translators:
-# Joe Hansen <joedalton2@yahoo.dk>, 2013-2014
+# Joe Hansen <joedalton2@yahoo.dk>, 2013-2014,2016,2020-2021
+# scootergrisen, 2017-2019
 msgid ""
 msgstr ""
 "Project-Id-Version: Audacious Plugins\n"
-"Report-Msgid-Bugs-To: http://redmine.audacious-media-player.org/\n"
-"POT-Creation-Date: 2015-02-28 19:18+0100\n"
-"PO-Revision-Date: 2015-02-04 21:21+0000\n"
-"Last-Translator: Thomas Lange <thomas-lange2@gmx.de>\n"
-"Language-Team: Danish (http://www.transifex.com/projects/p/audacious/"
-"language/da/)\n"
+"Report-Msgid-Bugs-To: https://github.com/audacious-media-player/audacious/"
+"issues\n"
+"POT-Creation-Date: 2024-09-26 21:54+0200\n"
+"PO-Revision-Date: 2011-10-10 17:43+0000\n"
+"Last-Translator: Joe Hansen <joedalton2@yahoo.dk>, 2013-2014,2016,2020-2021\n"
+"Language-Team: Danish (http://app.transifex.com/audacious/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-raw/aac.cc:18
+#: src/aac/aac.cc:19
 msgid "AAC (Raw) Decoder"
-msgstr "AAC (Raw)-afkoder"
+msgstr "AAC-afkoder (Raw)"
 
-#: src/adplug/adplug-xmms.cc:42
+#: src/adplug/adplug-xmms.cc:70
 msgid "AdPlug (AdLib Player)"
 msgstr "AdPlug (AdLib-afspiller)"
 
-#: src/adplug/adplug-xmms.cc:156 src/modplug/modplugbmp.cc:335
-#: src/psf/plugin.cc:138 src/vtx/vtx.cc:87 src/xsf/plugin.cc:113
+#: src/adplug/adplug-xmms.cc:167 src/modplug/modplugbmp.cc:321
+#: src/psf/plugin.cc:161 src/vtx/vtx.cc:89 src/xsf/plugin.cc:204
 msgid "sequenced"
 msgstr "sekventeret"
 
-#: src/alarm/alarm.cc:55 src/alarm/interface.cc:82
-msgid "Alarm"
-msgstr "Alarm"
-
-#: src/alarm/alarm.cc:782
-msgid "Set Alarm ..."
-msgstr "Angiv alarm ..."
-
-#: src/alarm/alarm.cc:810
-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/interface.cc: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 ""
-"Tidspunkt\n"
-" Alarmtidspunkt:\n"
-" Tidspunktet alarme udløses på.\n"
-"\n"
-" Stille efter:\n"
-" Stop alarmen efter dette tidsforløb.\n"
-" (hvis opvågningsdialogen ikke er lukket)\n"
-"\n"
-"\n"
-"Dage\n"
-" Dag:\n"
-" Vælg dagene for hvor alarmen skal være aktiv.\n"
-"\n"
-" Tidspunkt:\n"
-" Vælg tidspunkt for alarmen på hver dag,\n"
-" eller vælg skift-knappen for at benytte standardtidspunktet.\n"
-"\n"
-"\n"
-
-#: src/alarm/interface.cc: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 ""
-"Lydstyrke\n"
-" Lydovergang:\n"
-" øg lydstyrken til den valgte lydstyrke\n"
-" via denne mængde tid.\n"
-"\n"
-" Begynd ved:\n"
-" Begynd lydovergang fra denne lydstyrke.\n"
-"\n"
-" Endelig:\n"
-" Lydstyrken hvor lydovergang stopper. Hvis lydovergangens\n"
-" tid er 0 så angiv lydstyrken til dette og start\n"
-" afspilning.\n"
-"\n"
-"\n"
-"Tilvalg:\n"
-" Yderligere kommando:\n"
-" Kør denne kommando på alarm-tidspunktet.\n"
-"\n"
-
-#: src/alarm/interface.cc: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.cc:81
-msgid "This is your wakeup call."
-msgstr "Så gik alarmen."
-
-#: src/alarm/interface.cc:99
-msgid "Your reminder for today is..."
-msgstr "Din huskeseddel for i dag er ..."
-
-#: src/alarm/interface.cc:101 src/alarm/interface.cc:386
-msgid "Reminder"
-msgstr "Påmindelse"
-
-#: src/alarm/interface.cc:132
-msgid "Monday"
-msgstr "Mondag"
-
-#: src/alarm/interface.cc:132
-msgid "Tuesday"
-msgstr "Tirsdag"
-
-#: src/alarm/interface.cc:132
-msgid "Wednesday"
-msgstr "Onsdag"
-
-#: src/alarm/interface.cc:133
-msgid "Thursday"
-msgstr "Torsdag"
-
-#: src/alarm/interface.cc:133
-msgid "Friday"
-msgstr "Fredag"
-
-#: src/alarm/interface.cc:133
-msgid "Saturday"
-msgstr "Lørdag"
-
-#: src/alarm/interface.cc:133
-msgid "Sunday"
-msgstr "Søndag"
-
-#: src/alarm/interface.cc:171 src/alarm/interface.cc:230
-#: src/alarm/interface.cc:245
-msgid "Time"
-msgstr "Tid"
-
-#: src/alarm/interface.cc:178
-msgid "Alarm at (default):"
-msgstr "Alarm (standard):"
-
-#: src/alarm/interface.cc:200
-msgid "h"
-msgstr "t"
-
-#: src/alarm/interface.cc:203
-msgid "Quiet after:"
-msgstr "Stille efter:"
-
-#: src/alarm/interface.cc:215
-msgid "hours"
-msgstr "timer"
-
-#: src/alarm/interface.cc:226
-msgid "minutes"
-msgstr "minutter"
-
-#: src/alarm/interface.cc:235
-msgid "Choose the days for the alarm to come on"
-msgstr "Vælg dagene hvor alarmen skal udløses"
-
-#: src/alarm/interface.cc:242
-msgid "Day"
-msgstr "Dag"
-
-#: src/alarm/interface.cc:259 src/bs2b/plugin.cc:130
-#: src/skins/preset-list.cc:434 src/skins/preset-list.cc:440
-msgid "Default"
-msgstr "Standard"
+#: src/adplug/adplug-xmms.cc:349 src/sid/xs_config.cc:61
+msgid "Output"
+msgstr "Lydudgang"
 
-#: src/alarm/interface.cc:288
-msgid "Days"
-msgstr "Dage"
-
-#: src/alarm/interface.cc:297
-msgid "Fading"
-msgstr "Overgang"
-
-#: src/alarm/interface.cc:305 src/console/plugin.cc:41
-#: src/crossfade/crossfade.cc:53 src/crossfade/crossfade.cc:59
-#: src/gtkui/settings.cc:49 src/lirc/lirc.cc:397 src/sid/xs_config.cc:85
-#: src/sid/xs_config.cc:94 src/sid/xs_config.cc:103
-msgid "seconds"
-msgstr "sekunder"
+#: src/adplug/adplug-xmms.cc:350
+msgid "OPL Emulator:"
+msgstr "OPL-emulator:"
+
+#: src/adplug/adplug-xmms.cc:353 src/amidiplug/i_configure.cc:153
+#: src/console/plugin.cc:45 src/filewriter/filewriter.cc:481
+#: src/sid/xs_config.cc:65 src/xsf/plugin.cc:446
+msgid "Sample rate:"
+msgstr "Samplefrekvens:"
 
-#: src/alarm/interface.cc:312 src/alarm/interface.cc:353
-msgid "Volume"
-msgstr "Lydstyrke"
-
-#: src/alarm/interface.cc:317
-msgid "Start at"
-msgstr "Start"
-
-#: src/alarm/interface.cc:333
-msgid "Final"
-msgstr "Endelig"
-
-#: src/alarm/interface.cc:346
-msgid "Current"
-msgstr "Nuværende"
-
-#: src/alarm/interface.cc:359
-msgid "Additional Command"
-msgstr "Yderligere kommando"
-
-#: src/alarm/interface.cc:365 src/alarm/interface.cc:391
-msgid "enable"
-msgstr "aktiver"
-
-#: src/alarm/interface.cc:372
-msgid "Playlist (optional)"
-msgstr "Afspilningsliste (valgfri)"
-
-#: src/alarm/interface.cc:379
-msgid "Select a playlist"
-msgstr "Vælg en afspilningsliste"
+#: src/adplug/adplug-xmms.cc:354 src/amidiplug/i_configure.cc:155
+#: src/bs2b/plugin.cc:141 src/console/plugin.cc:47
+#: src/modplug/plugin_main.cc:77 src/resample/resample.cc:201
+#: src/resample/resample.cc:207 src/resample/resample.cc:211
+#: src/resample/resample.cc:215 src/resample/resample.cc:219
+#: src/resample/resample.cc:223 src/resample/resample.cc:227
+#: src/resample/resample.cc:231 src/resample/resample.cc:235
+#: src/resample/resample.cc:239 src/resample/resample.cc:243
+#: src/sid/xs_config.cc:67 src/soxr/sox-resampler.cc:205
+msgid "Hz"
+msgstr "Hz"
 
-#: src/alarm/interface.cc:399
-msgid "Options"
-msgstr "Indstillinger"
+#: src/adplug/adplug-xmms.cc:355 src/gtkui/settings.cc:55
+#: src/modplug/plugin_main.cc:105 src/qtui/settings.cc:85
+#: src/skins-qt/skins_cfg.cc:302 src/skins/skins_cfg.cc:284
+msgid "Miscellaneous"
+msgstr "Diverse"
 
-#: src/alarm/interface.cc:404
-msgid "What do these options mean?"
-msgstr "Hvad betyder disse indstillinger?"
-
-#: src/alarm/interface.cc:420
-msgid "Help"
-msgstr "Hjælp"
+#: src/adplug/adplug-xmms.cc:356
+msgid "Repeat song in endless loop"
+msgstr "Gentag sang i uendelig løkke"
 
-#: src/albumart/albumart.cc:31
+#: src/albumart/albumart.cc:31 src/albumart-qt/albumart.cc:35
 msgid "Album Art"
-msgstr "Omslag"
-
-#: src/albumart-qt/albumart.cc:33
-msgid "Album Art (Qt)"
-msgstr "Omslagskunst (Qt)"
+msgstr "Albumomslag"
 
-#: src/alsa/alsa.h:70
+#: src/alsa/alsa.h:64
 msgid "ALSA Output"
 msgstr "ALSA-lydkanal"
 
@@ -303,15 +86,15 @@
 "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"
+"ALSA-lydkanal-udvidelsesmodul til Audacious\n"
 "Ophavsret 2009-2012 John Lindgren\n"
 "\n"
-"Mange tak til William Pitcock, forfatter til ALSA Output Plugin NG, hvis "
-"kode fungerede som en reference når ALSA-manualen ikke var nok."
+"Mange tak til William Pitcock, forfatter til ALSA-lydkanal-udvidelsesmodul "
+"NG, hvis kode fungerede som en reference når ALSA-manualen ikke var nok."
 
 #: src/alsa/config.cc:61
 msgid "(no description)"
-msgstr ""
+msgstr "(ingen beskrivelse)"
 
 #: src/alsa/config.cc:166
 msgid "Default PCM device"
@@ -333,11 +116,11 @@
 msgid "Mixer element:"
 msgstr "Mikserelement:"
 
-#: src/amidi-plug/amidi-plug.cc:41
+#: src/amidiplug/amidi-plug.cc:42
 msgid "AMIDI-Plug (MIDI Player)"
 msgstr "AMIDI-Plug (MIDI-afspiller)"
 
-#: src/amidi-plug/amidi-plug.cc:437
+#: src/amidiplug/amidi-plug.cc:445
 msgid ""
 "AMIDI-Plug\n"
 "modular MIDI music player\n"
@@ -359,158 +142,181 @@
 "Tony Vroon\n"
 "for the good help with alpha testing"
 msgstr ""
+"AMIDI-Plug\n"
+"modulær MIDI-musikafspiller\n"
+"http://www.develia.org/projects.php?p=amidiplug\n"
+"\n"
+"skrevet af Giacomo Lozito\n"
+"<james@develia.org>\n"
+"\n"
+"særlig tak til ...\n"
+"\n"
+"Clemens Ladisch og Jaroslav Kysela\n"
+"og deres cool programmer aplaymidi og amixer; de\n"
+"var virkelig nyttige, og alsa-lib doks, for at kunne\n"
+"lære mere om ALSA API'et\n"
+"\n"
+"Alfredo Spadafina\n"
+"for det fine midi-tastatur-logo\n"
+"\n"
+"Tony Vroon\n"
+"for den gode hjælp med alpha-testing"
 
-#: src/amidi-plug/i_configure.cc:94
+#: src/amidiplug/i_configure.cc:94
 msgid "Override default gain:"
 msgstr "Tilsidesæt standardforstærkning:"
 
-#: src/amidi-plug/i_configure.cc:102
+#: src/amidiplug/i_configure.cc:102
 msgid "Override default polyphony:"
 msgstr "Tilsidesæt standardpolyfoni:"
 
-#: src/amidi-plug/i_configure.cc:110
+#: src/amidiplug/i_configure.cc:110
 msgid "Override default reverb:"
 msgstr "Tilsidesæt standardefterklang:"
 
-#: src/amidi-plug/i_configure.cc:112 src/amidi-plug/i_configure.cc:120
+#: src/amidiplug/i_configure.cc:112 src/amidiplug/i_configure.cc:120
 msgid "On"
-msgstr ""
+msgstr "Til"
 
-#: src/amidi-plug/i_configure.cc:118
+#: src/amidiplug/i_configure.cc:118
 msgid "Override default chorus:"
 msgstr "Tilsidesæt standardomkvæd:"
 
-#: src/amidi-plug/i_configure.cc:128 src/console/plugin.cc:29
+#: src/amidiplug/i_configure.cc:128 src/console/plugin.cc:29
 msgid "Playback"
 msgstr "Afspilning"
 
-#: src/amidi-plug/i_configure.cc:129
+#: src/amidiplug/i_configure.cc:129
 msgid "Transpose:"
-msgstr ""
+msgstr "Transponér:"
 
-#: src/amidi-plug/i_configure.cc:131
+#: src/amidiplug/i_configure.cc:131 src/speedpitch/speed-pitch.cc:257
 msgid "semitones"
-msgstr ""
+msgstr "semitoner"
 
-#: src/amidi-plug/i_configure.cc:132
+#: src/amidiplug/i_configure.cc:132
 msgid "Drum shift:"
 msgstr "Trommeskift:"
 
-#: src/amidi-plug/i_configure.cc:134
+#: src/amidiplug/i_configure.cc:134
 msgid "note numbers"
-msgstr ""
+msgstr "nodetal"
 
-#: src/amidi-plug/i_configure.cc:135
+#: src/amidiplug/i_configure.cc:135
 msgid "Skip leading silence"
-msgstr "Udelad foranstillet tavshed"
+msgstr "Udelad indledende tavshed"
 
-#: src/amidi-plug/i_configure.cc:137
+#: src/amidiplug/i_configure.cc:137
 msgid "Skip trailing silence"
-msgstr "Udelad bagvedstillet tavshed"
+msgstr "Udelad afsluttende tavshed"
 
-#: src/amidi-plug/i_configure.cc:141
+#: src/amidiplug/i_configure.cc:141
 msgid "SoundFont"
 msgstr "SoundFont"
 
-#: src/amidi-plug/i_configure.cc:143
+#: src/amidiplug/i_configure.cc:148
 msgid "Synthesizer"
 msgstr "Synthesizer"
 
-#: src/amidi-plug/i_configure.cc:148 src/console/plugin.cc:45
-#: src/sid/xs_config.cc:65
-msgid "Sample rate:"
-msgstr ""
-
-#: src/amidi-plug/i_configure.cc:150 src/bs2b/plugin.cc:141
-#: src/console/plugin.cc:47 src/modplug/plugin_main.cc:78
-#: src/resample/resample.cc:201 src/resample/resample.cc:207
-#: src/resample/resample.cc:211 src/resample/resample.cc:215
-#: src/resample/resample.cc:219 src/resample/resample.cc:223
-#: src/resample/resample.cc:227 src/resample/resample.cc:231
-#: src/resample/resample.cc:235 src/resample/resample.cc:239
-#: src/resample/resample.cc:243 src/sid/xs_config.cc:67
-#: src/sox-resampler/sox-resampler.cc:163
-msgid "Hz"
-msgstr "Hz"
-
-#: src/amidi-plug/i_configure-fluidsynth.cc:52
+#: src/amidiplug/i_configure-fluidsynth.cc:58
+#: src/amidiplug/i_configure-fluidsynth.cc:527
 msgid "AMIDI-Plug - select SoundFont file"
 msgstr "AMIDI-Plug - vælg SoundFont-fil"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:55 src/filewriter/mp3.cc:658
+#: src/amidiplug/i_configure-fluidsynth.cc:61
 msgid "_Cancel"
-msgstr "_Afbryd"
+msgstr "_Annuller"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:56
+#: src/amidiplug/i_configure-fluidsynth.cc:62
 msgid "_Open"
 msgstr "_Åbn"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:225 src/gtkui/columns.cc:46
+#: src/amidiplug/i_configure-fluidsynth.cc:233
+#: src/amidiplug/i_configure-fluidsynth.cc:461
 msgid "File name"
 msgstr "Filnavn"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:229
+#: src/amidiplug/i_configure-fluidsynth.cc:237
+#: src/amidiplug/i_configure-fluidsynth.cc:464
 msgid "Size (bytes)"
 msgstr "Størrelse (byte)"
 
-#: src/amidi-plug/i_fileinfo.cc:163
+#: src/amidiplug/i_fileinfo.cc:184
 msgid "Name:"
 msgstr "Navn:"
 
-#: src/amidi-plug/i_fileinfo.cc:181
+#: src/amidiplug/i_fileinfo.cc:202
 msgid " MIDI Info "
 msgstr " MIDI-information "
 
-#: src/amidi-plug/i_fileinfo.cc:195
+#: src/amidiplug/i_fileinfo.cc:216
 msgid "Format:"
 msgstr "Format:"
 
-#: src/amidi-plug/i_fileinfo.cc:198
+#: src/amidiplug/i_fileinfo.cc:219
 msgid "Length (msec):"
 msgstr "Længde (ms):"
 
-#: src/amidi-plug/i_fileinfo.cc:201
+#: src/amidiplug/i_fileinfo.cc:222
 msgid "No. of Tracks:"
-msgstr "Antallet af numre:"
+msgstr "Antal spor:"
 
-#: src/amidi-plug/i_fileinfo.cc:207
+#: src/amidiplug/i_fileinfo.cc:228
 msgid "variable"
 msgstr "variabel"
 
-#: src/amidi-plug/i_fileinfo.cc:209
+#: src/amidiplug/i_fileinfo.cc:230
 msgid "BPM:"
 msgstr "BPM:"
 
-#: src/amidi-plug/i_fileinfo.cc:217
+#: src/amidiplug/i_fileinfo.cc:238
 msgid "BPM (wavg):"
 msgstr "BPM (wavg):"
 
-#: src/amidi-plug/i_fileinfo.cc:220
+#: src/amidiplug/i_fileinfo.cc:241
 msgid "Time Div:"
-msgstr ""
+msgstr "Tidsdiv:"
 
-#: src/amidi-plug/i_fileinfo.cc:231
+#: src/amidiplug/i_fileinfo.cc:252
 msgid " MIDI Comments and Lyrics "
 msgstr " MIDI-kommentarer og sangtekster "
 
-#: src/amidi-plug/i_fileinfo.cc:278
+#: src/amidiplug/i_fileinfo.cc:299
 msgid "* no comments available in this MIDI file *"
 msgstr "* ingen kommentarer tilgængelig i denne MIDI-fil *"
 
-#: src/amidi-plug/i_fileinfo.cc:290
+#: src/amidiplug/i_fileinfo.cc:311
 msgid "* no lyrics available in this MIDI file *"
 msgstr "* ingen sangtekster tilgængelige i denne MIDI-fil *"
 
-#: src/amidi-plug/i_fileinfo.cc:300 src/filewriter/vorbis.cc:197
-#: src/ladspa/plugin.cc:416
+#: src/amidiplug/i_fileinfo.cc:321 src/ladspa/plugin.cc:418
+#: src/ui-common/dialogs-qt.cc:32
 msgid "_Close"
 msgstr "_Luk"
 
-#: src/amidi-plug/i_fileinfo.cc:325
+#: src/amidiplug/i_fileinfo.cc:346
 msgid " (invalid UTF-8)"
-msgstr "(Ugyldig UTF-8)"
+msgstr " (ugyldig UTF-8)"
+
+#: src/ampache/ampache.cc:33
+msgid "Ampache Browser"
+msgstr "Ampache-browser"
+
+#: src/ampache/ampache.cc:46
+msgid ""
+"Ampache Browser for Audacious\n"
+"http://ampache-browser.org/\n"
+"\n"
+"Copyright (C) Róbert Čerňanský and John Lindgren\n"
+"License: GNU GPLv3"
+msgstr ""
+"Ampache-browser til Audacious\n"
+"http://ampache-browser.org/\n"
+"\n"
+"Ophavsret (C) Róbert Čerňanský og John Lindgren\n"
+"Licens: GNU GPLv3"
 
-#: src/aosd/aosd.cc:32
+#: src/aosd/aosd.cc:31
 msgid ""
 "Audacious OSD\n"
 "http://www.develia.org/projects.php?p=audacious#aosd\n"
@@ -520,7 +326,7 @@
 "Based in part on Evan Martin's Ghosd library:\n"
 "http://neugierig.org/software/ghosd/"
 msgstr ""
-"Audacious OSD\n"
+"Audacious skærmdisplay\n"
 "http://www.develia.org/projects.php?p=audacious#aosd\n"
 "\n"
 "Skrevet af Giacomo Lozito <james@develia.org>\n"
@@ -530,7 +336,7 @@
 
 #: src/aosd/aosd.h:37
 msgid "AOSD (On-Screen Display)"
-msgstr "AOSD (On-Screen Display)"
+msgstr "AOSD (skærmdisplay)"
 
 #: src/aosd/aosd_style.cc:54
 msgid "Rectangle"
@@ -544,193 +350,189 @@
 msgid "Concave Rectangle"
 msgstr "Konkav rektangel"
 
-#: src/aosd/aosd_style.cc:69
+#: src/aosd/aosd_style.cc:69 src/openmpt/mptwrap.h:50 src/xsf/plugin.cc:436
 msgid "None"
 msgstr "Ingen"
 
-#: src/aosd/aosd_trigger.cc:50
+#: src/aosd/aosd_trigger.cc:49
 msgid "Playback Start"
 msgstr "Start for afspilning"
 
-#: src/aosd/aosd_trigger.cc:51
+#: src/aosd/aosd_trigger.cc:50
 msgid "Triggers OSD when a playlist entry is played."
-msgstr "Udløser OSD når et afspilningspunkt spilles."
+msgstr "Udløser skærmdisplay når et afspilningspunkt spilles."
 
-#: src/aosd/aosd_trigger.cc:56
+#: src/aosd/aosd_trigger.cc:55
 msgid "Title Change"
 msgstr "Ændring af titel"
 
-#: src/aosd/aosd_trigger.cc:57
+#: src/aosd/aosd_trigger.cc:56
 msgid "Triggers OSD when the song title changes (for internet streams)."
-msgstr ""
+msgstr "Udløser skærmdisplay når sangtitlen ændres (til internet-strømme)."
 
-#: src/aosd/aosd_trigger.cc:62
+#: src/aosd/aosd_trigger.cc:61
 msgid "Pause On"
 msgstr "Pause aktiveret"
 
-#: src/aosd/aosd_trigger.cc:63
+#: src/aosd/aosd_trigger.cc:62
 msgid "Triggers OSD when playback is paused."
-msgstr "Udløser OSD når afspilning sættes på pause."
+msgstr "Udløser skærmdisplay når afspilning sættes på pause."
 
-#: src/aosd/aosd_trigger.cc:68
+#: src/aosd/aosd_trigger.cc:67
 msgid "Pause Off"
 msgstr "Pause deaktiveret"
 
-#: src/aosd/aosd_trigger.cc:69
+#: src/aosd/aosd_trigger.cc:68
 msgid "Triggers OSD when playback is unpaused."
-msgstr "Udløser OSD når pause fjernes fra afspilning "
+msgstr "Udløser skærmdisplay når pause fjernes fra afspilning."
 
-#: src/aosd/aosd_ui.cc:163
+#: src/aosd/aosd_ui.cc:204
 msgid "Placement"
 msgstr "Placering"
 
-#: src/aosd/aosd_ui.cc:196
+#: src/aosd/aosd_ui.cc:241
 msgid "Relative X offset:"
 msgstr "Relativ X-forskydning:"
 
-#: src/aosd/aosd_ui.cc:203
+#: src/aosd/aosd_ui.cc:245
 msgid "Relative Y offset:"
 msgstr "Relativ Y-forskydning:"
 
-#: src/aosd/aosd_ui.cc:210
+#: src/aosd/aosd_ui.cc:249
 msgid "Max OSD width:"
-msgstr "Maks OSD-bredde:"
+msgstr "Maks. skærmdisplay-bredde:"
 
-#: src/aosd/aosd_ui.cc:221
+#: src/aosd/aosd_ui.cc:281
 msgid "Multi-Monitor options"
 msgstr "Flerskærmsindstillinger"
 
-#: src/aosd/aosd_ui.cc:225
+#: src/aosd/aosd_ui.cc:285
 msgid "Display OSD using:"
-msgstr "Vis OSD med:"
+msgstr "Vis skærmdisplay med:"
 
-#: src/aosd/aosd_ui.cc:227
+#: src/aosd/aosd_ui.cc:287
 msgid "all monitors"
 msgstr "alle skærme"
 
-#: src/aosd/aosd_ui.cc:230
+#: src/aosd/aosd_ui.cc:290
 #, c-format
 msgid "monitor %i"
 msgstr "skærm %i"
 
-#: src/aosd/aosd_ui.cc:282
+#: src/aosd/aosd_ui.cc:342
 msgid "Timing (ms)"
 msgstr "Timing (ms)"
 
-#: src/aosd/aosd_ui.cc:287
+#: src/aosd/aosd_ui.cc:347
 msgid "Display:"
 msgstr "Visning:"
 
-#: src/aosd/aosd_ui.cc:292
+#: src/aosd/aosd_ui.cc:352
 msgid "Fade in:"
 msgstr "Ton ind:"
 
-#: src/aosd/aosd_ui.cc:297
+#: src/aosd/aosd_ui.cc:357
 msgid "Fade out:"
 msgstr "Ton ud:"
 
-#: src/aosd/aosd_ui.cc:361
+#: src/aosd/aosd_ui.cc:442
 msgid "Fonts"
 msgstr "Skrifttyper"
 
-#: src/aosd/aosd_ui.cc:368
+#: src/aosd/aosd_ui.cc:449
 #, c-format
 msgid "Font %i:"
 msgstr "Skrifttype %i:"
 
-#: src/aosd/aosd_ui.cc:382
+#: src/aosd/aosd_ui.cc:466
 msgid "Shadow"
 msgstr "Skygge"
 
-#: src/aosd/aosd_ui.cc:486
+#: src/aosd/aosd_ui.cc:589
 msgid "Render Style"
 msgstr "Optegningsstil"
 
-#: src/aosd/aosd_ui.cc:502
+#: src/aosd/aosd_ui.cc:605
 msgid "Colors"
 msgstr "Farver"
 
-#: src/aosd/aosd_ui.cc:513
+#: src/aosd/aosd_ui.cc:616
 #, c-format
 msgid "Color %i:"
 msgstr "Farve %i:"
 
-#: src/aosd/aosd_ui.cc:600
+#: src/aosd/aosd_ui.cc:714
 msgid "Enable trigger"
-msgstr "Aktiver udløser"
+msgstr "Aktivér udløser"
 
-#: src/aosd/aosd_ui.cc:627
+#: src/aosd/aosd_ui.cc:741
 msgid "Event"
 msgstr "Hændelse"
 
-#: src/aosd/aosd_ui.cc:655
+#: src/aosd/aosd_ui.cc:768
 msgid "Composite manager detected"
 msgstr "Composite-håndtering detekteret"
 
-#: src/aosd/aosd_ui.cc:662
+#: src/aosd/aosd_ui.cc:775
 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"
+"med mindre du ved at du har en kørende, så aktivér en composite-håndtering "
+"ellers vil skærmdisplayet ikke fungere korrekt"
 
-#: src/aosd/aosd_ui.cc:670
+#: src/aosd/aosd_ui.cc:783
 msgid "Composite manager not required for fake transparency"
 msgstr "Composite-håndtering er ikke krævet for falsk gennemsigtighed"
 
-#: src/aosd/aosd_ui.cc:706
+#: src/aosd/aosd_ui.cc:820
 msgid "Transparency"
 msgstr "Gennemsigtighed"
 
-#: src/aosd/aosd_ui.cc:712
+#: src/aosd/aosd_ui.cc:826
 msgid "Fake transparency"
 msgstr "Falsk gennemsigtighed"
 
-#: src/aosd/aosd_ui.cc:714
+#: src/aosd/aosd_ui.cc:828
 msgid "Real transparency (requires X Composite Ext.)"
 msgstr "Reel gennemsigtighed (kræver X Composite Ext.)"
 
-#: src/aosd/aosd_ui.cc:756
+#: src/aosd/aosd_ui.cc:875
 msgid "Composite extension not loaded"
 msgstr "Composite-udvidelse er ikke indlæst"
 
-#: src/aosd/aosd_ui.cc:764
-msgid "Composite extension not available"
-msgstr "Composite-udvidelse er ikke tilgængelig"
-
-#: src/aosd/aosd_ui.cc:781
+#: src/aosd/aosd_ui.cc:892
 #, c-format
 msgid "Audacious OSD"
-msgstr "Audacious OSD"
+msgstr "Audacious skærmdisplay"
 
-#: src/aosd/aosd_ui.cc:844
+#: src/aosd/aosd_ui.cc:955
 msgid "Position"
 msgstr "Position"
 
-#: src/aosd/aosd_ui.cc:849
+#: src/aosd/aosd_ui.cc:960
 msgid "Animation"
 msgstr "Animation"
 
-#: src/aosd/aosd_ui.cc:854
+#: src/aosd/aosd_ui.cc:965
 msgid "Text"
 msgstr "Tekst"
 
-#: src/aosd/aosd_ui.cc:859
+#: src/aosd/aosd_ui.cc:970
 msgid "Decoration"
 msgstr "Dekoration"
 
-#: src/aosd/aosd_ui.cc:864
+#: src/aosd/aosd_ui.cc:975
 msgid "Trigger"
 msgstr "Udløser"
 
-#: src/aosd/aosd_ui.cc:869
+#: src/aosd/aosd_ui.cc:980 src/streamtuner/shoutcast-model.cc:202
 msgid "Misc"
 msgstr "Diverse"
 
-#: src/aosd/aosd_ui.cc:878
+#: src/aosd/aosd_ui.cc:989
 msgid "Test"
 msgstr "Test"
 
@@ -746,13 +548,85 @@
 msgid "Audacious Playlists (audpl)"
 msgstr "Audacious-afspilningslister (audpl)"
 
-#: src/blur_scope/blur_scope.cc:42
+#: src/background_music/background_music.cc:24
+msgid "Background music"
+msgstr ""
+
+#: src/background_music/background_music.cc:25
+msgid "Target level:"
+msgstr ""
+
+#: src/background_music/background_music.cc:28
+#: src/background_music/background_music.cc:33
+#: src/silence-removal/silence-removal.cc:70
+msgid "dB"
+msgstr "dB"
+
+#: src/background_music/background_music.cc:29
+msgid "Maximum amplification:"
+msgstr ""
+
+#: src/background_music/background_music.cc:34 src/mpg123/mpg123.cc:81
+msgid "Advanced"
+msgstr "Avanceret"
+
+#: src/background_music/background_music.cc:36
+msgid "Slow detection weight:"
+msgstr ""
+
+#: src/background_music/background_music.cc:39
+msgid "Hint"
+msgstr ""
+
+#: src/background_music/background_music.cc:41
+msgid ""
+"Slow detection weight is the relative weight\n"
+"of a long term average detection when compared\n"
+"to the actual, faster loudness detection.\n"
+"A value of zero gives a more radio-like sound\n"
+"where soft passages get \"pulled up\" more quickly,\n"
+"a value of two makes the sound feel less compressed."
+msgstr ""
+
+#: src/background_music/background_music.cc:52
+msgid ""
+"Background Music Plugin for Audacious\n"
+"Copyright 2023;2024 Michel Fleur\n"
+"\n"
+"Controls the volume to make the sound equally loud within and between "
+"tracks.\n"
+" It uses accurate loudness measurement and tries to make the volume changes "
+"sound natural without audible peaks, yet without lowering the volume before "
+"a peak in advance."
+msgstr ""
+
+#: src/background_music/background_music.cc:61
+msgid "Background Music"
+msgstr ""
+
+#: src/bitcrusher/bitcrusher.cc:33
+msgid "Bitcrusher"
+msgstr ""
+
+#: src/bitcrusher/bitcrusher.cc:34
+msgid "Bit Depth:"
+msgstr ""
+
+#: src/bitcrusher/bitcrusher.cc:37
+msgid "Downsample ratio:"
+msgstr ""
+
+#: src/bitcrusher/bitcrusher.cc:48
+msgid "Bitcrusher"
+msgstr ""
+
+#: src/blur_scope/blur_scope.cc:40 src/blur_scope-qt/blur_scope.cc:45
 msgid "Color"
 msgstr "Farve"
 
-#: src/blur_scope/blur_scope.cc:58
+#: src/blur_scope/blur_scope.cc:56 src/blur_scope-qt/blur_scope.cc:158
 msgid "Blur Scope"
-msgstr "Sløret omfang"
+msgstr "Sløret skop"
 
 #: src/bs2b/plugin.cc:38
 msgid "Bauer Stereophonic-to-Binaural (BS2B)"
@@ -762,6 +636,10 @@
 msgid "Presets:"
 msgstr "Forhåndsindstillinger:"
 
+#: src/bs2b/plugin.cc:130
+msgid "Default"
+msgstr "Standard"
+
 #: src/bs2b/plugin.cc:136
 msgid "Feed level:"
 msgstr "Nyhedskildeniveau:"
@@ -774,15 +652,15 @@
 msgid "Cut frequency:"
 msgstr "Klip frekvens:"
 
-#: src/cairo-spectrum/cairo-spectrum.cc:41
+#: src/cairo-spectrum/cairo-spectrum.cc:42 src/qt-spectrum/qt-spectrum.cc:107
 msgid "Spectrum Analyzer"
 msgstr "Spektrumanalyseprogram"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:72
+#: src/cdaudio/cdaudio-ng.cc:74
 msgid "Audio CD Plugin"
 msgstr "Lyd-cd-udvidelsesmodul"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:121
+#: src/cdaudio/cdaudio-ng.cc:121
 msgid ""
 "Copyright (C) 2007-2012 Calin Crisan <ccrisan@gmail.com> and others.\n"
 "\n"
@@ -793,7 +671,7 @@
 "\n"
 "This was a Google Summer of Code 2007 project."
 msgstr ""
-"Ophavsret 2007-2012 Calin Crisan <ccrisan@gmail.com> og andre.\n"
+"Ophavsret (C) 2007-2012 Calin Crisan <ccrisan@gmail.com> og andre.\n"
 "\n"
 "Mange tak til libcdio-udviklerne <http://www.gnu.org/software/libcdio/>\n"
 "og til libcddb-udviklere <http://libcddb.sourceforge.net/>.\n"
@@ -802,132 +680,132 @@
 "\n"
 "Dette var et Google Summer of Code 2007-projekt."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:137
+#: src/cdaudio/cdaudio-ng.cc:140
 msgid "Device"
 msgstr "Enhed"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:138
+#: src/cdaudio/cdaudio-ng.cc:141
 msgid "Read speed:"
-msgstr "Læs hastighed:"
+msgstr "Læsehastighed:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:141
+#: src/cdaudio/cdaudio-ng.cc:144
 msgid "Override device:"
 msgstr "Tilsidesæt enhed:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:143
+#: src/cdaudio/cdaudio-ng.cc:146
 msgid "Metadata"
 msgstr "Metadata"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:144
+#: src/cdaudio/cdaudio-ng.cc:147
 msgid "Use CD-Text"
 msgstr "Brug CD-Text"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:146
+#: src/cdaudio/cdaudio-ng.cc:150
 msgid "Use CDDB"
 msgstr "Brug CDDB"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:148
+#: src/cdaudio/cdaudio-ng.cc:152
 msgid "Use HTTP instead of CDDBP"
 msgstr "Brug HTTP i stedet for CDDBP"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:151
+#: src/cdaudio/cdaudio-ng.cc:155
 msgid "Server:"
 msgstr "Server:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:155
+#: src/cdaudio/cdaudio-ng.cc:159
 msgid "Path:"
 msgstr "Sti:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:159
+#: src/cdaudio/cdaudio-ng.cc:163
 msgid "Port:"
 msgstr "Port:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:246
+#: src/cdaudio/cdaudio-ng.cc:228
 msgid "Failed to initialize cdio subsystem."
 msgstr "Kunne ikke initialisere cdio-undersystemet."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:281
+#: src/cdaudio/cdaudio-ng.cc:260
 #, c-format
 msgid "Invalid URI %s."
 msgstr "Ugyldig URI %s."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:283
+#: src/cdaudio/cdaudio-ng.cc:262
 #, c-format
 msgid "Track %d not found."
-msgstr "Nummeret %d blev ikke fundet."
+msgstr "Spor %d blev ikke fundet."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:285
+#: src/cdaudio/cdaudio-ng.cc:264
 #, c-format
 msgid "Track %d is a data track."
 msgstr "Spor %d er et dataspor."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:360
+#: src/cdaudio/cdaudio-ng.cc:339
 msgid "Error reading audio CD."
 msgstr "Kunne ikke læse lyd-cd."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:429
+#: src/cdaudio/cdaudio-ng.cc:410
 msgid "Audio CD"
 msgstr "Lyd-cd"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:460 src/cdaudio-ng/cdaudio-ng.cc:469
+#: src/cdaudio/cdaudio-ng.cc:446 src/cdaudio/cdaudio-ng.cc:455
 #, c-format
 msgid "Failed to open CD device %s."
 msgstr "Kunne ikke åbne cd-enhed %s."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:472
+#: src/cdaudio/cdaudio-ng.cc:458
 msgid "No audio capable CD drive found."
 msgstr "Intet cd-drev med lyd blev fundet."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:497
+#: src/cdaudio/cdaudio-ng.cc:481
+msgid "Drive is empty."
+msgstr "Drev er tomt."
+
+#: src/cdaudio/cdaudio-ng.cc:483
+msgid "Unsupported disk type."
+msgstr "Disktype er ikke understøttet."
+
+#: src/cdaudio/cdaudio-ng.cc:507
 msgid "Failed to finish initializing opened CD drive."
 msgstr "Kunne ikke afslutte initialisering af åbnet cd-drev."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:510
+#: src/cdaudio/cdaudio-ng.cc:520
 msgid "Failed to retrieve first/last track number."
-msgstr "Kunne ikke indhente første/sidste nummer."
+msgstr "Kunne ikke indhente første/sidste spornummer."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:531
+#: src/cdaudio/cdaudio-ng.cc:541
 #, c-format
 msgid "Cannot read start/end LSN for track %d."
 msgstr "Kan ikke læse start/slut LSN for spor %d."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:613
-msgid "Failed to create the cddb connection."
-msgstr "Kunne ikke oprette cddb-forbindelsen."
+#: src/cdaudio/cdaudio-ng.cc:624
+msgid "Failed to create the CDDB connection."
+msgstr "Kunne ikke oprette CDDB-forbindelsen."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:679
+#: src/cdaudio/cdaudio-ng.cc:690
 msgid "Failed to query the CDDB server"
 msgstr "Kunne ikke forespørge CDDB-serveren"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:681
+#: src/cdaudio/cdaudio-ng.cc:692
 #, c-format
 msgid "Failed to query the CDDB server: %s"
 msgstr "Kunne ikke forespørge CDDB-serveren: %s"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:705
+#: src/cdaudio/cdaudio-ng.cc:716
 #, c-format
-msgid "Failed to read the cddb info: %s"
-msgstr "Kunne ikke læse cddb-informationen: %s"
+msgid "Failed to read the CDDB info: %s"
+msgstr "Kunne ikke læse CDDB-informationen: %s"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:765
-msgid "Drive is empty."
-msgstr "Drev er tomt."
-
-#: src/cdaudio-ng/cdaudio-ng.cc:767
-msgid "Unsupported disk type."
-msgstr "Disktype er ikke understøttet."
-
-#: src/cd-menu-items/cd-menu-items.cc:35
+#: src/cd-menu-items/cd-menu-items.cc:33
 msgid "Audio CD Menu Items"
 msgstr "Menupunkter for lyd-cd"
 
-#: src/cd-menu-items/cd-menu-items.cc:47
-msgid "Play CD"
-msgstr "Afspil cd"
-
-#: src/cd-menu-items/cd-menu-items.cc:47
-msgid "Add CD"
-msgstr "Tilføj cd"
+#: src/cd-menu-items/cd-menu-items.cc:45
+msgid "Pla_y CD"
+msgstr "_Afspil cd"
+
+#: src/cd-menu-items/cd-menu-items.cc:45
+msgid "_Add CD"
+msgstr "_Tilføj cd"
 
 #: src/compressor/compressor.cc:45
 msgid "Compression"
@@ -939,19 +817,19 @@
 
 #: src/compressor/compressor.cc:49
 msgid "Dynamic range:"
-msgstr "Dynamisk interval:"
+msgstr "Dynamisk område:"
 
 #: src/compressor/compressor.cc:57
 msgid ""
 "Dynamic Range Compression Plugin for Audacious\n"
 "Copyright 2010-2014 John Lindgren"
 msgstr ""
-"Dynamic Range Compression Plugin for Audacious\n"
+"Dynamisk område kompression-udvidelsesmodul til Audacious\n"
 "Ophavsret 2010-2014 John Lindgren"
 
 #: src/compressor/compressor.cc:64
 msgid "Dynamic Range Compressor"
-msgstr "Dynamisk intervalkomprimering"
+msgstr "Dynamisk område kompression"
 
 #: src/console/plugin.cc:15
 msgid ""
@@ -966,7 +844,7 @@
 "Understøttede formater: AY, GBS, GYM, HES, KSS, NSF, NSFE, SAP, SPC, VGM, "
 "VGZ\n"
 "\n"
-"Audaciousudvidelsesmodul lavet af:\n"
+"Audacious-udvidelsesmodul lavet af:\n"
 "William Pitcock <nenolod@dereferenced.org>\n"
 "Shay Green <gblargg@gmail.com>"
 
@@ -986,13 +864,20 @@
 msgid "Default song length:"
 msgstr "Standardlængde for sang:"
 
-#: src/console/plugin.cc:42 src/modplug/plugin_main.cc:59
+#: src/console/plugin.cc:41 src/crossfade/crossfade.cc:56
+#: src/crossfade/crossfade.cc:62 src/lirc/lirc.cc:395 src/notify/notify.cc:113
+#: src/sid/xs_config.cc:85 src/sid/xs_config.cc:94 src/sid/xs_config.cc:103
+#: src/vumeter-qt/vumeter_qt.cc:39
+msgid "seconds"
+msgstr "sekunder"
+
+#: src/console/plugin.cc:42 src/modplug/plugin_main.cc:58
 msgid "Resampling"
-msgstr "Resampling"
+msgstr "Gensampling"
 
 #: src/console/plugin.cc:43
 msgid "Enable audio resampling"
-msgstr "Aktiver gensampling af lyd"
+msgstr "Aktivér gensampling af lyd"
 
 #: src/console/plugin.cc:49
 msgid "SPC"
@@ -1010,83 +895,97 @@
 msgid "Game Console Music Decoder"
 msgstr "Musikafkoder for spilkonsol"
 
-#: src/coreaudio/coreaudio.cc:50
+#: src/coreaudio/coreaudio.cc:53
 msgid "CoreAudio output"
 msgstr "CoreAudio-udgang"
 
-#: src/coreaudio/coreaudio.cc:131
+#: src/coreaudio/coreaudio.cc:155
 msgid ""
 "CoreAudio Output Plugin for Audacious\n"
 "Copyright 2014 William Pitcock\n"
+"Copyright 2017,18 René J.V. Bertin\n"
+" (original code and code adapted from\n"
+" Apple examples, (C) Apple 2013)\n"
 "\n"
 "Based on SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
 msgstr ""
+"CoreAudio-output-udvidelsesmodul til Audacious\n"
+"Ophavsret 2014 William Pitcock\n"
+"Ophavsret 2017,18 René J.V. Bertin\n"
+" (original kode og kode tilpasset fra\n"
+" Apple-eksempler, (C) Apple 2013)\n"
+"\n"
+"Baseret på SDL-output-udvidelsesmodul til Audacious\n"
+"Ophavsret 2010 John Lindgren"
 
-#: src/coreaudio/coreaudio.cc:143
+#: src/coreaudio/coreaudio.cc:171
 msgid "Use exclusive mode"
-msgstr ""
+msgstr "Brug eksklusiv tilstand"
 
-#: src/crossfade/crossfade.cc:44
+#: src/coreaudio/coreaudio.cc:173
+msgid "Use bit perfect audio (adapt device sampling rate)"
+msgstr "Brug bitperfekt lyd (tilpas enhedens samplingsfrekvens)"
+
+#: src/crossfade/crossfade.cc:47
 msgid ""
 "Crossfade Plugin for Audacious\n"
 "Copyright 2010-2014 John Lindgren"
 msgstr ""
-"Crossfade Plugin for Audacious\n"
+"Crossfade-udvidelsesmodul til Audacious\n"
 "Ophavsret 2010-2014 John Lindgren"
 
-#: src/crossfade/crossfade.cc:48
+#: src/crossfade/crossfade.cc:51
 msgid "Crossfade"
 msgstr "Glidende overgang"
 
-#: src/crossfade/crossfade.cc:49
+#: src/crossfade/crossfade.cc:52
 msgid "On automatic song change"
-msgstr "Ved automatisk sangændring"
+msgstr "Ved automatisk skift af sang"
 
-#: src/crossfade/crossfade.cc:51 src/crossfade/crossfade.cc:57
+#: src/crossfade/crossfade.cc:54 src/crossfade/crossfade.cc:60
 msgid "Overlap:"
-msgstr ""
+msgstr "Overlap:"
 
-#: src/crossfade/crossfade.cc:55
+#: src/crossfade/crossfade.cc:58
 msgid "On seek or manual song change"
-msgstr "Ved søgning eller manuel sangændring"
+msgstr "Ved søgning eller manuel skift af sang"
 
-#: src/crossfade/crossfade.cc:61
+#: src/crossfade/crossfade.cc:64
+msgid "No fade in"
+msgstr ""
+
+#: src/crossfade/crossfade.cc:66
+msgid "Use S-curve fade"
+msgstr ""
+
+#: src/crossfade/crossfade.cc:68
+msgid "S-curve steepness:"
+msgstr ""
+
+#: src/crossfade/crossfade.cc:70
+msgid "(higher is steeper)"
+msgstr ""
+
+#: src/crossfade/crossfade.cc:72
 msgid "Tip"
 msgstr "Fif"
 
-#: src/crossfade/crossfade.cc:62
+#: src/crossfade/crossfade.cc:73
 msgid ""
 "For better crossfading, enable\n"
 "the Silence Removal effect."
 msgstr ""
+"For bedre crossfading, aktivér\n"
+"fjernelse af stilhed-effekten."
 
-#: src/crossfade/crossfade.cc:72
+#: src/crossfade/crossfade.cc:83
 msgid "Crossfade"
 msgstr "Glidende overgang"
 
-#: src/crossfade/crossfade.cc:161
-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.cc:168
-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/crystalizer/crystalizer.cc:31
 msgid "Crystalizer"
-msgstr "Crystalizer"
+msgstr "Krystalisator"
 
 #: src/crystalizer/crystalizer.cc:32 src/stereo_plugin/stereo.cc:45
 msgid "Intensity:"
@@ -1094,62 +993,63 @@
 
 #: src/crystalizer/crystalizer.cc:43
 msgid "Crystalizer"
-msgstr "Crystalizer"
+msgstr "Krystalisator"
 
-#: src/cue/cue.cc:37
+#: src/cue/cue.cc:42
 msgid "Cue Sheet Plugin"
 msgstr "Cue Sheet-udvidelsesmodul"
 
-#: src/delete-files/delete-files.cc:46 src/delete-files/delete-files.cc:146
+#: src/delete-files/delete-files.cc:53 src/delete-files/delete-files.cc:215
+#: src/delete-files/delete-files.cc:230
 msgid "Delete Files"
 msgstr "Slet filer"
 
-#: src/delete-files/delete-files.cc:75
+#: src/delete-files/delete-files.cc:120
+msgid "No files are selected."
+msgstr "Der er ikke valgt nogen filer."
+
+#: src/delete-files/delete-files.cc:125
 #, c-format
-msgid "Error moving %s to trash: %s."
-msgstr "Kunne ikke flytte %s til papirkurven: %s."
+msgid "Do you want to move %s to the trash?"
+msgstr "Vil du flytte %s til papirkurven?"
 
-#: src/delete-files/delete-files.cc:86
+#: src/delete-files/delete-files.cc:126
 #, c-format
-msgid "Error deleting %s: %s."
-msgstr "Kunne ikke slette %s: %s."
+msgid "Do you want to permanently delete %s?"
+msgstr "Vil du slette %s permanent?"
 
-#: src/delete-files/delete-files.cc:117
+#: src/delete-files/delete-files.cc:133
 #, c-format
-msgid "Error deleting %s: not a local file."
-msgstr "Kunne ikke slette %s: ikke en lokal fil."
+msgid "Do you want to move %d files to the trash?"
+msgstr "Vil du flytte %d filer til papirkurven?"
 
 #: src/delete-files/delete-files.cc:134
-msgid "Do you want to move the selected files to the trash?"
-msgstr "Ønsker du at flytte de valgte filer til papirkurven?"
+#, c-format
+msgid "Do you want to permanently delete %d files?"
+msgstr "Vil du slette %d filer permanent?"
 
-#: src/delete-files/delete-files.cc:135
-msgid "Move to Trash"
-msgstr "Flyt til papirkurven"
-
-#: src/delete-files/delete-files.cc:140
-msgid "Do you want to permanently delete the selected files?"
-msgstr "Ønsker du permanent at slette de valgte filer?"
+#: src/delete-files/delete-files.cc:146
+msgid "Move to trash"
+msgstr "Flyt til papirkurv"
 
-#: src/delete-files/delete-files.cc:141 src/skins/preset-list.cc:411
-#: src/skins/preset-list.cc:427
+#: src/delete-files/delete-files.cc:146
 msgid "Delete"
 msgstr "Slet"
 
-#: src/delete-files/delete-files.cc:145 src/skins/preset-browser.cc:56
-#: src/skins/preset-list.cc:307 src/skins/ui_playlist.cc:221
+#: src/delete-files/delete-files.cc:213 src/delete-files/delete-files.cc:235
+#: src/skins-qt/search-select.cc:102 src/skins/search-select.cc:78
 msgid "Cancel"
-msgstr "Afbryd"
+msgstr "Annuller"
 
-#: src/delete-files/delete-files.cc:166
+#: src/delete-files/delete-files.cc:267
 msgid "Delete Selected Files"
 msgstr "Slet valgte filer"
 
-#: src/delete-files/delete-files.cc:181
+#: src/delete-files/delete-files.cc:287
 msgid "Delete Method"
 msgstr "Slettemetode"
 
-#: src/delete-files/delete-files.cc:182
+#: src/delete-files/delete-files.cc:288
 msgid "Move to trash instead of deleting immediately"
 msgstr "Flyt til papirkurven i stedet for at slette øjeblikkeligt"
 
@@ -1160,7 +1060,7 @@
 "Surround echo by Carl van Schaik, 1999\n"
 "Updated for Audacious by William Pitcock and John Lindgren, 2010-2014"
 msgstr ""
-"Echo Plugin\n"
+"Ekko-udvidelsesmodul\n"
 "Af Johan Levin, 1999\n"
 "Surround-ekko af Carl van Schaik, 1999\n"
 "Opdateret for Audacious af William Pitcock og John Lindgren, 2010-2014"
@@ -1169,33 +1069,33 @@
 msgid "Echo"
 msgstr "Ekko"
 
-#: src/echo_plugin/echo.cc:22 src/modplug/plugin_main.cc:73
-#: src/modplug/plugin_main.cc:83
+#: src/echo_plugin/echo.cc:22 src/modplug/plugin_main.cc:72
+#: src/modplug/plugin_main.cc:82
 msgid "Delay:"
 msgstr "Forsinkelse:"
 
-#: src/echo_plugin/echo.cc:24 src/modplug/plugin_main.cc:73
-#: src/modplug/plugin_main.cc:83
+#: src/echo_plugin/echo.cc:24 src/modplug/plugin_main.cc:72
+#: src/modplug/plugin_main.cc:82 src/xsf/plugin.cc:445
 msgid "ms"
 msgstr "ms"
 
 #: src/echo_plugin/echo.cc:25
 msgid "Feedback:"
-msgstr "Tilbagemelding:"
+msgstr "Feedback:"
 
-#: src/echo_plugin/echo.cc:28 src/modplug/plugin_main.cc:87
+#: src/echo_plugin/echo.cc:28 src/modplug/plugin_main.cc:86
 msgid "Volume:"
 msgstr "Lydstyrke:"
 
 #: src/echo_plugin/echo.cc:39
 msgid "Echo"
-msgstr "Echo"
+msgstr "Ekko"
 
-#: src/ffaudio/ffaudio-core.cc:41
+#: src/ffaudio/ffaudio-core.cc:50
 msgid "FFmpeg Plugin"
 msgstr "FFmpeg-udvidelsesmodul"
 
-#: src/ffaudio/ffaudio-core.cc:571
+#: src/ffaudio/ffaudio-core.cc:649
 msgid ""
 "Multi-format audio decoding plugin for Audacious using\n"
 "FFmpeg multimedia framework (http://www.ffmpeg.org/)\n"
@@ -1211,235 +1111,321 @@
 "William Pitcock <nenolod@nenolod.net>\n"
 "Matti Hämäläinen <ccr@tnsp.org>"
 
-#: src/filewriter/filewriter.cc:45
+#: src/filewriter/filewriter.cc:48
 msgid "FileWriter Plugin"
 msgstr "FileWriter-udvidelsesmodul"
 
-#: src/filewriter/filewriter.cc:386
-msgid "Output file format:"
-msgstr "Filformat for lyden:"
+#: src/filewriter/filewriter.cc:316
+#, c-format
+msgid ""
+"Error opening %s:\n"
+"%s"
+msgstr ""
+"Fejl under åbning af %s:\n"
+"%s"
 
-#: src/filewriter/filewriter.cc:403
-msgid "Configure"
-msgstr "Konfigurer"
+#: src/filewriter/filewriter.cc:358
+msgid ""
+"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 ""
+"Dette program er fri software; du kan videredistribuere det og/eller "
+"modificere det under vilkårene i GNU General Public License som udgivet af "
+"Free Software Foundation; enten version 2 af Licensen, eller (efter eget "
+"valg) enhver senere version.\n"
+"\n"
+"Dette program er distribueret i håbet om at det vil være nyttigt, men UDEN "
+"NOGEN GARANTI; uden selv den underforstået garanti vedrørende SALGBARHED "
+"eller EGNETHED TIL ET BESTEMT FORMÅL. Se GNU General Public License for "
+"flere detaljer.\n"
+"\n"
+"Du skulle have modtaget en kopi af GNU General Public License sammen med "
+"dette program. Hvis ikke, skriv til Free Software Foundation, Inc., 51 "
+"Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 
-#: src/filewriter/filewriter.cc:413
+#: src/filewriter/filewriter.cc:385
+msgid "Output file format:"
+msgstr "Filformat for output:"
+
+#: src/filewriter/filewriter.cc:389
 msgid "Save into original directory"
 msgstr "Gem i oprindelig mappe"
 
-#: src/filewriter/filewriter.cc:417
-msgid "Save into custom directory"
-msgstr "Gem i mappe efter eget valg"
-
-#: src/filewriter/filewriter.cc:427
-msgid "Output file folder:"
-msgstr "Filmappe for lyd:"
-
-#: src/filewriter/filewriter.cc:431
-msgid "Pick a folder"
-msgstr "Vælg en mappe"
+#: src/filewriter/filewriter.cc:392
+msgid "Save into custom directory:"
+msgstr "Gem i tilpasset mappe:"
 
-#: src/filewriter/filewriter.cc:444
+#: src/filewriter/filewriter.cc:400
 msgid "Generate file name from:"
 msgstr "Opret filnavnet fra:"
 
-#: src/filewriter/filewriter.cc:448
-msgid "Original file tag"
-msgstr "Original filmærke"
-
-#: src/filewriter/filewriter.cc:453
+#: src/filewriter/filewriter.cc:401
 msgid "Original file name"
-msgstr "Original filnavn"
+msgstr "Oprindeligt filnavn"
 
-#: src/filewriter/filewriter.cc:459
-msgid "Include original file name extension"
-msgstr "Inkluder original navn på filendelsen"
+#: src/filewriter/filewriter.cc:404
+msgid "Original file name (no suffix)"
+msgstr "Oprindeligt filnavn (intet suffiks)"
 
-#: src/filewriter/filewriter.cc:468
-msgid "Prepend track number to file name"
-msgstr "Foranstil rækkefølge for numrene til filnavnet"
+#: src/filewriter/filewriter.cc:407
+msgid "Original file tag"
+msgstr "Oprindeligt filmærke"
 
-#: src/filewriter/filewriter.cc:484
-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.cc:411
+msgid "Prepend track number to file name"
+msgstr "Foranstil spornummer til filnavnet"
 
-#: src/filewriter/mp3.cc:40 src/filewriter/mp3.cc:717
+#: src/filewriter/filewriter.cc:417 src/filewriter/filewriter.cc:449
 msgid "Auto"
 msgstr "Auto"
 
-#: src/filewriter/mp3.cc:40
-msgid "Joint Stereo"
-msgstr "Fælles stereo"
+#: src/filewriter/filewriter.cc:418
+msgid "8000 Hz"
+msgstr "8000 Hz"
+
+#: src/filewriter/filewriter.cc:419
+msgid "11025 Hz"
+msgstr "11025 Hz"
+
+#: src/filewriter/filewriter.cc:420
+msgid "12000 Hz"
+msgstr "12000 Hz"
+
+#: src/filewriter/filewriter.cc:421
+msgid "16000 Hz"
+msgstr "16000 Hz"
+
+#: src/filewriter/filewriter.cc:422
+msgid "22050 Hz"
+msgstr "22050 Hz"
+
+#: src/filewriter/filewriter.cc:423
+msgid "24000 Hz"
+msgstr "24000 Hz"
+
+#: src/filewriter/filewriter.cc:424
+msgid "32000 Hz"
+msgstr "32000 Hz"
+
+#: src/filewriter/filewriter.cc:425 src/xsf/plugin.cc:430
+msgid "44100 Hz"
+msgstr "44100 Hz"
+
+#: src/filewriter/filewriter.cc:426 src/xsf/plugin.cc:431
+msgid "48000 Hz"
+msgstr "48000 Hz"
 
-#: src/filewriter/mp3.cc:41 src/modplug/plugin_main.cc:58
-#: src/mpg123/mpg123.cc:248
-msgid "Stereo"
-msgstr "Stereo"
+#: src/filewriter/filewriter.cc:430
+msgid "8 kbit/s"
+msgstr ""
 
-#: src/filewriter/mp3.cc:41 src/modplug/plugin_main.cc:57
-#: src/mpg123/mpg123.cc:248
-msgid "Mono"
-msgstr "Mono"
+#: src/filewriter/filewriter.cc:431
+msgid "16 kbit/s"
+msgstr ""
 
-#: src/filewriter/mp3.cc:657
-msgid "MP3 Configuration"
-msgstr "MP3-konfiguration"
+#: src/filewriter/filewriter.cc:432
+msgid "32 kbit/s"
+msgstr ""
 
-#: src/filewriter/mp3.cc:658
-msgid "_OK"
-msgstr "_O.k."
+#: src/filewriter/filewriter.cc:433
+msgid "40 kbit/s"
+msgstr ""
 
-#: src/filewriter/mp3.cc:681
-msgid "Algorithm Quality:"
-msgstr "Algoritmekvalitet"
+#: src/filewriter/filewriter.cc:434
+msgid "48 kbit/s"
+msgstr ""
 
-#: src/filewriter/mp3.cc:706
-msgid "Output Sample Rate:"
+#: src/filewriter/filewriter.cc:435
+msgid "56 kbit/s"
 msgstr ""
 
-#: src/filewriter/mp3.cc:733
-msgid "(Hz)"
-msgstr "(Hz)"
+#: src/filewriter/filewriter.cc:436
+msgid "64 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:437
+msgid "80 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:438
+msgid "96 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:439
+msgid "112 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:440
+msgid "128 kbit/s"
+msgstr ""
 
-#: src/filewriter/mp3.cc:740
-msgid "Bitrate / Compression Ratio:"
+#: src/filewriter/filewriter.cc:441
+msgid "160 kbit/s"
 msgstr ""
 
-#: src/filewriter/mp3.cc:764
-msgid "Bitrate (kbps):"
-msgstr "Bithastighed (kbps):"
+#: src/filewriter/filewriter.cc:442
+msgid "192 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:443
+msgid "224 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:444
+msgid "256 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:445
+msgid "320 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:450
+msgid "Joint Stereo"
+msgstr "Fælles stereo"
+
+#: src/filewriter/filewriter.cc:451 src/modplug/plugin_main.cc:57
+#: src/mpg123/mpg123.cc:259
+msgid "Stereo"
+msgstr "Stereo"
+
+#: src/filewriter/filewriter.cc:452 src/modplug/plugin_main.cc:56
+#: src/mpg123/mpg123.cc:260
+msgid "Mono"
+msgstr "Mono"
+
+#: src/filewriter/filewriter.cc:456
+msgid "VBR"
+msgstr "VBR"
+
+#: src/filewriter/filewriter.cc:457
+msgid "ABR"
+msgstr "ABR"
+
+#: src/filewriter/filewriter.cc:478
+msgid "Algorithm quality:"
+msgstr "Algoritmens kvalitet:"
 
-#: src/filewriter/mp3.cc:796
+#: src/filewriter/filewriter.cc:484
+msgid "Bitrate:"
+msgstr "Bithastighed:"
+
+#: src/filewriter/filewriter.cc:491
 msgid "Compression ratio:"
 msgstr "Komprimeringsforhold:"
 
-#: src/filewriter/mp3.cc:820
-msgid "Audio Mode:"
+#: src/filewriter/filewriter.cc:498
+msgid "Audio mode:"
 msgstr "Lydtilstand:"
 
-#: src/filewriter/mp3.cc:845
-msgid "Miscellaneous:"
-msgstr "Diverse:"
-
-#: src/filewriter/mp3.cc:856
+#: src/filewriter/filewriter.cc:501
 msgid "Enforce strict ISO compliance"
 msgstr "Fremtving streng ISO-overholdelse"
 
-#: src/filewriter/mp3.cc:867
+#: src/filewriter/filewriter.cc:503
 msgid "Error protection"
 msgstr "Fejlbeskyttelse"
 
-#: src/filewriter/mp3.cc:879 src/filewriter/vorbis.cc:206
-msgid "Quality"
-msgstr "Kvalitet"
-
-#: src/filewriter/mp3.cc:888
+#: src/filewriter/filewriter.cc:508
 msgid "Enable VBR/ABR"
-msgstr "Aktiver VBH/GBH"
+msgstr "Aktivér VBR/ABR"
 
-#: src/filewriter/mp3.cc:898
+#: src/filewriter/filewriter.cc:510
 msgid "Type:"
 msgstr "Type:"
 
-#: src/filewriter/mp3.cc:931
-msgid "VBR Options:"
-msgstr "VBH-indstillinger:"
-
-#: src/filewriter/mp3.cc:947
-msgid "Minimum bitrate (kbps):"
-msgstr "Minimum for bithastighed (kbps):"
-
-#: src/filewriter/mp3.cc:973
-msgid "Maximum bitrate (kbps):"
-msgstr "Maksimum for bithastighed (kbps):"
+#: src/filewriter/filewriter.cc:514
+msgid "Minimum bitrate:"
+msgstr "Minimum bithastighed:"
+
+#: src/filewriter/filewriter.cc:518
+msgid "Maximum bitrate:"
+msgstr "Maksimum bithastighed:"
+
+#: src/filewriter/filewriter.cc:522
+msgid "Average bitrate:"
+msgstr "Gennemsnitlig bithastighed:"
 
-#: src/filewriter/mp3.cc:995
-msgid "Strictly enforce minimum bitrate"
-msgstr "Fremtving strengt minimum for bithastighed"
-
-#: src/filewriter/mp3.cc:1007
-msgid "ABR Options:"
-msgstr "GBH-indstillinger:"
-
-#: src/filewriter/mp3.cc:1017
-msgid "Average bitrate (kbps):"
-msgstr "Gennemsnitlig bithastighed (kbps):"
-
-#: src/filewriter/mp3.cc:1044
+#: src/filewriter/filewriter.cc:526
 msgid "VBR quality level:"
 msgstr "VBR-kvalitetsniveau:"
 
-#: src/filewriter/mp3.cc:1063
+#: src/filewriter/filewriter.cc:530
+msgid "Strictly enforce minimum bitrate"
+msgstr "Fremtving strengt minimum for bithastighed"
+
+#: src/filewriter/filewriter.cc:533
 msgid "Omit Xing VBR header"
 msgstr "Udelad Xing VBR-teksthoved"
 
-#: src/filewriter/mp3.cc:1076
-msgid "VBR/ABR"
-msgstr "VBH/GBH"
-
-#: src/filewriter/mp3.cc:1085
-msgid "Frame Parameters:"
-msgstr "Billedparametre:"
+#: src/filewriter/filewriter.cc:539
+msgid "Frame Headers"
+msgstr "Frame-headere"
 
-#: src/filewriter/mp3.cc:1097
+#: src/filewriter/filewriter.cc:540
 msgid "Mark as copyright"
 msgstr "Marker som ophavsret"
 
-#: src/filewriter/mp3.cc:1108
+#: src/filewriter/filewriter.cc:542
 msgid "Mark as original"
 msgstr "Marker som original"
 
-#: src/filewriter/mp3.cc:1120
-msgid "ID3 Parameters:"
-msgstr "ID3-parametre:"
+#: src/filewriter/filewriter.cc:544
+msgid "ID3 Tags"
+msgstr "ID3-tags"
 
-#: src/filewriter/mp3.cc:1131
+#: src/filewriter/filewriter.cc:545
 msgid "Force addition of version 2 tag"
 msgstr "Fremtving tilføjelse af version 2-mærke"
 
-#: src/filewriter/mp3.cc:1141
+#: src/filewriter/filewriter.cc:547
 msgid "Only add v1 tag"
 msgstr "Tilføj kun v1-mærke"
 
-#: src/filewriter/mp3.cc:1148
+#: src/filewriter/filewriter.cc:549
 msgid "Only add v2 tag"
 msgstr "Tilføj kun v2-mærke"
 
-#: src/filewriter/mp3.cc:1169
+#: src/filewriter/filewriter.cc:554
+msgid "Quality"
+msgstr "Kvalitet"
+
+#: src/filewriter/filewriter.cc:555
+msgid "VBR/ABR"
+msgstr "VBR/ABR"
+
+#: src/filewriter/filewriter.cc:556
 msgid "Tags"
 msgstr "Mærker"
 
-#: src/filewriter/vorbis.cc:196
-msgid "Vorbis Encoder Configuration"
-msgstr "Konfiguration af Vorbiskoder"
-
-#: src/filewriter/vorbis.cc:219
-msgid "Quality level (0 - 10):"
-msgstr "Kvalitetsniveau (0-10):"
+#: src/filewriter/filewriter.cc:566
+msgid "Quality (0-1):"
+msgstr "Kvalitet (0-1):"
 
-#: src/flacng/flacng.h:35
+#: src/filewriter/filewriter.cc:573 src/skins-qt/skins_cfg.cc:307
+#: src/skins/skins_cfg.cc:289
+msgid "General"
+msgstr "Generelt"
+
+#: src/flac/flacng.h:36
 msgid "FLAC Decoder"
 msgstr "FLAC-afkoder"
 
-#: src/flacng/metadata.cc:351 src/wavpack/wavpack.cc:209
+#: src/flac/metadata.cc:296 src/wavpack/wavpack.cc:215
 msgid "lossless"
 msgstr "uden kvalitetstab"
 
-#: src/flacng/plugin.cc:169
+#: src/flac/plugin.cc:214
 msgid ""
 "Original code by\n"
 "Ralf Ertzinger <ralf@skytale.net>\n"
@@ -1463,15 +1449,15 @@
 msgid "GIO Plugin"
 msgstr "GIO-udvidelsesmodul"
 
-#: src/gio/gio.cc:153
+#: src/gio/gio.cc:152
 msgid "Read-and-append mode not supported"
 msgstr "Læs og tilføj-tilstand er ikke understøttet"
 
-#: src/gio/gio.cc:166
+#: src/gio/gio.cc:165
 msgid "Invalid open mode"
 msgstr "Ugyldig åbn-tilstand"
 
-#: src/gl-spectrum/gl-spectrum.cc:51
+#: src/glspectrum/gl-spectrum.cc:52
 msgid ""
 "OpenGL Spectrum Analyzer for Audacious\n"
 "Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
@@ -1491,635 +1477,757 @@
 "\n"
 "Licens: GPLv2+"
 
-#: src/gl-spectrum/gl-spectrum.cc:62
+#: src/glspectrum/gl-spectrum.cc:63 src/qtglspectrum/gl-spectrum.cc:53
 msgid "OpenGL Spectrum Analyzer"
 msgstr "OpenGL-spektrumanalyseprogram"
 
-#: src/gl-spectrum-qt/gl-spectrum.cc:41
-msgid ""
-"OpenGL Spectrum Analyzer for Audacious\n"
-"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
-"Copyright 2014 William Pitcock\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é, John Lindgren og Carlo Bramini\n"
-"Ophavsret 2014 William Pitcock\n"
-"\n"
-"Based on the XMMS plugin:\n"
-"Ophavsret 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson og "
-"4Front Technologies\n"
-"\n"
-"Licens: GPLv2+"
-
-#: src/gl-spectrum-qt/gl-spectrum.cc:53
-msgid "OpenGL Spectrum Analyzer (Qt)"
-msgstr "OpenGL-spektrumanalyseprogram (Qt)"
-
-#: src/gnomeshortcuts/gnomeshortcuts.cc:38
-msgid "GNOME Shortcuts"
-msgstr "Genvejstaster for GNOME"
-
-#: src/gnomeshortcuts/gnomeshortcuts.cc:54
-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 ""
-"Udvidelsesmodul til genvejstaster for GNOME\n"
-"Gør at du kan kontrollere din afspiller med GNOME's genvejstaster.\n"
-"\n"
-"Ophavsret 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>"
-
-#: src/gtkui/columns.cc:35
-msgid "Entry number"
+#: src/gtkui/columns.cc:36 src/moonstone/playlist_model.cc:38
+#: src/qtui/playlist_model.cc:33
+msgid "Entry Number"
 msgstr "Postnummer"
 
-#: src/gtkui/columns.cc:36 src/playlist-manager/playlist-manager.cc:225
-#: src/qtui/playlist_model.cc:123
+#: src/gtkui/columns.cc:37 src/moonstone/playlist_model.cc:38
+#: src/moonstone/playlist_selection.cc:64
+#: src/playlist-manager/playlist-manager.cc:200
+#: src/playlist-manager-qt/playlist-manager-qt.cc:188
+#: src/qtui/playlist_model.cc:33 src/streamtuner/icecast-model.cc:120
+#: src/streamtuner/ihr-model.cc:159 src/streamtuner/shoutcast-model.cc:122
 msgid "Title"
 msgstr "Titel"
 
-#: src/gtkui/columns.cc:37 src/qtui/playlist_model.cc:125
+#: src/gtkui/columns.cc:38 src/moonstone/playlist_model.cc:39
+#: src/qtui/playlist_model.cc:33
 msgid "Artist"
 msgstr "Kunstner"
 
-#: src/gtkui/columns.cc:38
+#: src/gtkui/columns.cc:39 src/moonstone/playlist_model.cc:39
+#: src/qtui/playlist_model.cc:33
 msgid "Year"
 msgstr "År"
 
-#: src/gtkui/columns.cc:39 src/qtui/playlist_model.cc:127
+#: src/gtkui/columns.cc:40 src/moonstone/playlist_model.cc:39
+#: src/qtui/playlist_model.cc:34
 msgid "Album"
 msgstr "Album"
 
-#: src/gtkui/columns.cc:40
-msgid "Album artist"
+#: src/gtkui/columns.cc:41 src/moonstone/playlist_model.cc:40
+#: src/qtui/playlist_model.cc:34
+msgid "Album Artist"
 msgstr "Kunstner"
 
-#: src/gtkui/columns.cc:41
+#: src/gtkui/columns.cc:42 src/moonstone/playlist_model.cc:40
+#: src/qtui/playlist_model.cc:34
 msgid "Track"
-msgstr "Nummer"
+msgstr "Spor"
 
-#: src/gtkui/columns.cc:42
+#: src/gtkui/columns.cc:43 src/moonstone/playlist_model.cc:40
+#: src/qtui/playlist_model.cc:34 src/streamtuner/icecast-model.cc:123
+#: src/streamtuner/shoutcast-model.cc:125
+#: src/streamtuner/shoutcast-model.cc:236
 msgid "Genre"
 msgstr "Genre"
 
-#: src/gtkui/columns.cc:43
-msgid "Queue position"
-msgstr "Køposition"
+#: src/gtkui/columns.cc:44 src/moonstone/playlist_model.cc:41
+#: src/qtui/playlist_model.cc:35
+msgid "Queue Position"
+msgstr "Køplacering"
 
-#: src/gtkui/columns.cc:44
+#: src/gtkui/columns.cc:45 src/moonstone/playlist_model.cc:41
+#: src/qtui/playlist_model.cc:35
 msgid "Length"
 msgstr "Længde"
 
-#: src/gtkui/columns.cc:45
-msgid "File path"
+#: src/gtkui/columns.cc:46 src/moonstone/playlist_model.cc:41
+#: src/qtui/playlist_model.cc:35
+msgid "File Path"
 msgstr "Filsti"
 
-#: src/gtkui/columns.cc:47
-msgid "Custom title"
+#: src/gtkui/columns.cc:47 src/moonstone/playlist_model.cc:42
+#: src/qtui/playlist_model.cc:35
+msgid "File Name"
+msgstr "Filnavn"
+
+#: src/gtkui/columns.cc:48 src/moonstone/playlist_model.cc:42
+#: src/qtui/playlist_model.cc:36
+msgid "Custom Title"
 msgstr "Tilpasset titel"
 
-#: src/gtkui/columns.cc:48
+#: src/gtkui/columns.cc:49 src/moonstone/playlist_model.cc:42
+#: src/qtui/playlist_model.cc:36 src/streamtuner/icecast-model.cc:129
+#: src/streamtuner/shoutcast-model.cc:134
 msgid "Bitrate"
 msgstr "Bithastighed"
 
-#: src/gtkui/columns.cc:308
+#: src/gtkui/columns.cc:50 src/moonstone/playlist_model.cc:43
+#: src/qtui/playlist_model.cc:36
+msgid "Comment"
+msgstr "Kommentar"
+
+#: src/gtkui/columns.cc:51 src/qtui/playlist_model.cc:36
+msgid "Publisher"
+msgstr "Udgiver"
+
+#: src/gtkui/columns.cc:52 src/qtui/playlist_model.cc:37
+msgid "Catalog Number"
+msgstr "Katalog nr."
+
+#: src/gtkui/columns.cc:53 src/moonstone/playlist_model.cc:43
+#: src/qtui/playlist_model.cc:37
+msgid "Disc"
+msgstr "Plade"
+
+#: src/gtkui/columns.cc:325
 msgid "Available columns"
 msgstr "Tilgængelige kolonner"
 
-#: src/gtkui/columns.cc:334
+#: src/gtkui/columns.cc:351
 msgid "Displayed columns"
 msgstr "Viste kolonner"
 
-#: src/gtkui/layout.cc:72 src/search-tool/search-tool.cc:40
+#: src/gtkui/layout.cc:74 src/search-tool-qt/search-tool-qt.cc:58
+#: src/search-tool/search-tool.cc:49
 msgid "Search Tool"
 msgstr "Søgeværktøj"
 
-#: src/gtkui/layout.cc:167
+#: src/gtkui/layout.cc:170
 msgid "Dock at Left"
 msgstr "Dok til venstre"
 
-#: src/gtkui/layout.cc:167
+#: src/gtkui/layout.cc:170
 msgid "Dock at Right"
 msgstr "Dok til højre"
 
-#: src/gtkui/layout.cc:168
+#: src/gtkui/layout.cc:171
 msgid "Dock at Top"
 msgstr "Dok øverst"
 
-#: src/gtkui/layout.cc:168
+#: src/gtkui/layout.cc:171
 msgid "Dock at Bottom"
 msgstr "Dok nederst"
 
-#: src/gtkui/layout.cc:168
+#: src/gtkui/layout.cc:171
 msgid "Undock"
 msgstr "Fjern dok"
 
-#: src/gtkui/layout.cc:168 src/ladspa/plugin.cc:531
+#: src/gtkui/layout.cc:171 src/ladspa/plugin.cc:540
 msgid "Disable"
-msgstr "Deaktiver"
+msgstr "Deaktivér"
 
-#: src/gtkui/menus.cc:126 src/qtui/main_window_actions.cc:93
-#: src/statusicon/statusicon.cc:276
+#: src/gtkui/menus.cc:79 src/qtui/menus.cc:107
+#: src/statusicon-qt/statusicon.cc:115 src/statusicon/statusicon.cc:286
 msgid "_Open Files ..."
 msgstr "_Åbn filer ..."
 
-#: src/gtkui/menus.cc:127
+#: src/gtkui/menus.cc:80 src/qtui/menus.cc:111
 msgid "Open _URL ..."
-msgstr "Åbn a_dresse ..."
+msgstr "Åbn _URL ..."
 
-#: src/gtkui/menus.cc:128 src/qtui/main_window_actions.cc:95
+#: src/gtkui/menus.cc:81 src/qtui/menus.cc:113
 msgid "_Add Files ..."
 msgstr "_Tilføj filer ..."
 
-#: src/gtkui/menus.cc:129
+#: src/gtkui/menus.cc:82 src/qtui/menus.cc:118
 msgid "Add U_RL ..."
 msgstr "_Tilføj adresse ..."
 
-#: src/gtkui/menus.cc:131
+#: src/gtkui/menus.cc:84 src/qtui/menus.cc:120
 msgid "Search _Library"
-msgstr "Søg _bibliotek"
+msgstr "Søg i _bibliotek"
 
-#: src/gtkui/menus.cc:133 src/qtui/main_window_actions.cc:98
+#: src/gtkui/menus.cc:86 src/qtui/menus.cc:123
 msgid "A_bout ..."
 msgstr "_Om ..."
 
-#: src/gtkui/menus.cc:134 src/qtui/main_window_actions.cc:99
+#: src/gtkui/menus.cc:87 src/qtui/menus.cc:125
 msgid "_Settings ..."
 msgstr "_Indstillinger ..."
 
-#: src/gtkui/menus.cc:135 src/qtui/main_window_actions.cc:103
-#: src/statusicon/statusicon.cc:284
+#: src/gtkui/menus.cc:88 src/qtui/menus.cc:131
+#: src/statusicon-qt/statusicon.cc:117 src/statusicon/statusicon.cc:288
 msgid "_Quit"
 msgstr "_Afslut"
 
-#: src/gtkui/menus.cc:139 src/gtkui/menus.cc:262
-#: src/qtui/main_window_actions.cc:107 src/search-tool/search-tool.cc:641
-#: src/statusicon/statusicon.cc:278
+#: src/gtkui/menus.cc:92 src/gtkui/menus.cc:226
+#: src/moonstone/playlist_tabs.cc:306 src/qtui/menus.cc:135
+#: src/qtui/playlist_tabs.cc:331 src/search-tool-qt/search-tool-qt.cc:499
+#: src/search-tool/search-tool.cc:339 src/statusicon-qt/statusicon.cc:109
+#: src/statusicon/statusicon.cc:280
 msgid "_Play"
 msgstr "_Afspil"
 
-#: src/gtkui/menus.cc:140 src/qtui/main_window_actions.cc:108
-#: src/statusicon/statusicon.cc:279
+#: src/gtkui/menus.cc:93 src/qtui/menus.cc:137
+#: src/statusicon-qt/statusicon.cc:110 src/statusicon/statusicon.cc:281
 msgid "Paus_e"
 msgstr "_Pause"
 
-#: src/gtkui/menus.cc:141 src/qtui/main_window_actions.cc:109
-#: src/statusicon/statusicon.cc:280
+#: src/gtkui/menus.cc:94 src/qtui/menus.cc:139
+#: src/statusicon-qt/statusicon.cc:111 src/statusicon/statusicon.cc:282
 msgid "_Stop"
 msgstr "_Stop"
 
-#: src/gtkui/menus.cc:142 src/qtui/main_window_actions.cc:110
-#: src/statusicon/statusicon.cc:277
+#: src/gtkui/menus.cc:95 src/qtui/menus.cc:141
+#: src/statusicon-qt/statusicon.cc:112 src/statusicon/statusicon.cc:283
 msgid "Pre_vious"
 msgstr "_Forrige"
 
-#: src/gtkui/menus.cc:143 src/qtui/main_window_actions.cc:111
-#: src/statusicon/statusicon.cc:281
+#: src/gtkui/menus.cc:96 src/qtui/menus.cc:143
+#: src/statusicon-qt/statusicon.cc:113 src/statusicon/statusicon.cc:284
 msgid "_Next"
 msgstr "_Næste"
 
-#: src/gtkui/menus.cc:145 src/qtui/main_window_actions.cc:113
+#: src/gtkui/menus.cc:97 src/qtui/menus.cc:145 src/skins/menus.cc:114
+#: src/skins-qt/menus.cc:105
+msgid "Previous Album"
+msgstr "Forrige album"
+
+#: src/gtkui/menus.cc:98 src/qtui/menus.cc:146 src/skins/menus.cc:115
+#: src/skins-qt/menus.cc:106
+msgid "Next Album"
+msgstr "Næste album"
+
+#: src/gtkui/menus.cc:100 src/qtui/menus.cc:148
 msgid "_Repeat"
 msgstr "_Gentag"
 
-#: src/gtkui/menus.cc:146 src/qtui/main_window_actions.cc:114
+#: src/gtkui/menus.cc:101 src/qtui/menus.cc:150
 msgid "S_huffle"
 msgstr "_Bland"
 
-#: src/gtkui/menus.cc:147 src/qtui/main_window_actions.cc:115
+#: src/gtkui/menus.cc:102 src/qtui/menus.cc:152
+msgid "Shuffle by Albu_m"
+msgstr "_Bland efter album"
+
+#: src/gtkui/menus.cc:103 src/qtui/menus.cc:155
 msgid "N_o Playlist Advance"
-msgstr "_Ingen næste afspilningsliste"
+msgstr "_Gå ikke videre i afspilningsliste"
 
-#: src/gtkui/menus.cc:148 src/qtui/main_window_actions.cc:116
+#: src/gtkui/menus.cc:104 src/qtui/menus.cc:157
 msgid "Stop A_fter This Song"
-msgstr "Stop _Efter denne sang"
+msgstr "Stop _efter denne sang"
 
-#: src/gtkui/menus.cc:150 src/gtkui/menus.cc:247
-#: src/qtui/main_window_actions.cc:118
+#: src/gtkui/menus.cc:106 src/gtkui/menus.cc:210 src/qtui/menus.cc:162
+#: src/qtui/menus.cc:294
 msgid "Song _Info ..."
 msgstr "_Sanginformation ..."
 
-#: src/gtkui/menus.cc:151
+#: src/gtkui/menus.cc:107
 msgid "Jump to _Time ..."
-msgstr "_Hop til tid ..."
+msgstr "_Hop til tidspunkt ..."
 
-#: src/gtkui/menus.cc:152
+#: src/gtkui/menus.cc:108
 msgid "_Jump to Song ..."
 msgstr "_Hop til sang ..."
 
-#: src/gtkui/menus.cc:154
+#: src/gtkui/menus.cc:110 src/qtui/menus.cc:165
 msgid "Set Repeat Point _A"
 msgstr "Angiv gentagelsespunkt _A"
 
-#: src/gtkui/menus.cc:155
+#: src/gtkui/menus.cc:111 src/qtui/menus.cc:167
 msgid "Set Repeat Point _B"
 msgstr "Angiv gentagelsespunkt _B"
 
-#: src/gtkui/menus.cc:156
+#: src/gtkui/menus.cc:112 src/qtui/menus.cc:169
 msgid "_Clear Repeat Points"
 msgstr "_Ryd gentagelsespunkter"
 
-#: src/gtkui/menus.cc:160 src/gtkui/menus.cc:167 src/gtkui/menus.cc:183
-#: src/qtui/main_window_actions.cc:122 src/qtui/main_window_actions.cc:129
-#: src/qtui/main_window_actions.cc:145
+#: src/gtkui/menus.cc:116 src/gtkui/menus.cc:123 src/gtkui/menus.cc:141
+#: src/qtui/menus.cc:173 src/qtui/menus.cc:180 src/qtui/menus.cc:198
 msgid "By _Title"
 msgstr "Efter _titel"
 
-#: src/gtkui/menus.cc:161 src/qtui/main_window_actions.cc:123
+#: src/gtkui/menus.cc:117 src/qtui/menus.cc:174
 msgid "By _File Name"
 msgstr "Efter _filnavn"
 
-#: src/gtkui/menus.cc:162 src/qtui/main_window_actions.cc:124
+#: src/gtkui/menus.cc:118 src/qtui/menus.cc:175
 msgid "By File _Path"
 msgstr "Efter fil_sti"
 
-#: src/gtkui/menus.cc:166 src/gtkui/menus.cc:182
-#: src/qtui/main_window_actions.cc:128 src/qtui/main_window_actions.cc:144
+#: src/gtkui/menus.cc:122 src/gtkui/menus.cc:140 src/qtui/menus.cc:179
+#: src/qtui/menus.cc:197
 msgid "By Track _Number"
-msgstr "Efter _rækkefølge for nummeret"
+msgstr "Efter _spornummer"
 
-#: src/gtkui/menus.cc:168 src/gtkui/menus.cc:184
-#: src/qtui/main_window_actions.cc:130 src/qtui/main_window_actions.cc:146
+#: src/gtkui/menus.cc:124 src/gtkui/menus.cc:142 src/qtui/menus.cc:181
+#: src/qtui/menus.cc:199
 msgid "By _Artist"
 msgstr "Efter _kunstner"
 
-#: src/gtkui/menus.cc:169 src/gtkui/menus.cc:185
-#: src/qtui/main_window_actions.cc:131 src/qtui/main_window_actions.cc:147
+#: src/gtkui/menus.cc:125 src/gtkui/menus.cc:143 src/qtui/menus.cc:182
+#: src/qtui/menus.cc:200
 msgid "By Al_bum"
 msgstr "Efter al_bum"
 
-#: src/gtkui/menus.cc:170 src/gtkui/menus.cc:186
-#: src/qtui/main_window_actions.cc:132 src/qtui/main_window_actions.cc:148
+#: src/gtkui/menus.cc:126 src/gtkui/menus.cc:144 src/qtui/menus.cc:183
+#: src/qtui/menus.cc:201
 msgid "By Albu_m Artist"
 msgstr "Efter _kunstner"
 
-#: src/gtkui/menus.cc:171 src/gtkui/menus.cc:187
-#: src/qtui/main_window_actions.cc:133 src/qtui/main_window_actions.cc:149
+#: src/gtkui/menus.cc:127 src/gtkui/menus.cc:145 src/qtui/menus.cc:184
+#: src/qtui/menus.cc:202
 msgid "By Release _Date"
 msgstr "Efter _udgivelsesdato"
 
-#: src/gtkui/menus.cc:172 src/gtkui/menus.cc:188
-#: src/qtui/main_window_actions.cc:134 src/qtui/main_window_actions.cc:150
+#: src/gtkui/menus.cc:128 src/gtkui/menus.cc:146 src/qtui/menus.cc:185
+#: src/qtui/menus.cc:203
 msgid "By _Genre"
-msgstr ""
+msgstr "Efter _genre"
 
-#: src/gtkui/menus.cc:173 src/gtkui/menus.cc:189
-#: src/qtui/main_window_actions.cc:135 src/qtui/main_window_actions.cc:151
+#: src/gtkui/menus.cc:129 src/gtkui/menus.cc:147 src/qtui/menus.cc:186
+#: src/qtui/menus.cc:204
 msgid "By _Length"
 msgstr "Efter _længde"
 
-#: src/gtkui/menus.cc:174 src/gtkui/menus.cc:190
-#: src/qtui/main_window_actions.cc:136 src/qtui/main_window_actions.cc:152
+#: src/gtkui/menus.cc:130 src/gtkui/menus.cc:148 src/qtui/menus.cc:187
+#: src/qtui/menus.cc:205
 msgid "By _File Path"
 msgstr "Efter _filsti"
 
-#: src/gtkui/menus.cc:175 src/gtkui/menus.cc:191
-#: src/qtui/main_window_actions.cc:137 src/qtui/main_window_actions.cc:153
+#: src/gtkui/menus.cc:131 src/gtkui/menus.cc:149 src/qtui/menus.cc:188
+#: src/qtui/menus.cc:206
 msgid "By _Custom Title"
 msgstr "Efter _tilpasset titel"
 
-#: src/gtkui/menus.cc:177 src/gtkui/menus.cc:193
-#: src/qtui/main_window_actions.cc:139 src/qtui/main_window_actions.cc:155
+#: src/gtkui/menus.cc:132 src/gtkui/menus.cc:150 src/qtui/menus.cc:189
+#: src/qtui/menus.cc:207
+msgid "By C_omment"
+msgstr "Efter _kommentar"
+
+#: src/gtkui/menus.cc:133 src/gtkui/menus.cc:151 src/qtui/menus.cc:190
+#: src/qtui/menus.cc:208
+msgid "By D_isc Number"
+msgstr ""
+
+#: src/gtkui/menus.cc:135 src/gtkui/menus.cc:153 src/qtui/menus.cc:192
+#: src/qtui/menus.cc:210
 msgid "R_everse Order"
 msgstr "_Omvendt rækkefølge"
 
-#: src/gtkui/menus.cc:178 src/gtkui/menus.cc:194
-#: src/qtui/main_window_actions.cc:140 src/qtui/main_window_actions.cc:156
+#: src/gtkui/menus.cc:136 src/gtkui/menus.cc:154 src/qtui/menus.cc:194
+#: src/qtui/menus.cc:212
 msgid "_Random Order"
-msgstr "_Vilkårlig rækkefølge"
+msgstr "_Tilfældig rækkefølge"
 
-#: src/gtkui/menus.cc:198 src/qtui/main_window_actions.cc:160
+#: src/gtkui/menus.cc:158 src/qtui/menus.cc:216
 msgid "_Play/Resume"
-msgstr ""
+msgstr "_Afspil/genoptag"
 
-#: src/gtkui/menus.cc:199 src/gtkui/menus.cc:251
-#: src/qtui/main_window_actions.cc:161
+#: src/gtkui/menus.cc:159 src/qtui/menus.cc:218
 msgid "_Refresh"
 msgstr "_Opdater"
 
-#: src/gtkui/menus.cc:201 src/qtui/main_window_actions.cc:163
+#: src/gtkui/menus.cc:161 src/qtui/menus.cc:222
 msgid "_Sort"
-msgstr "_Sorter"
+msgstr "_Sortér"
 
-#: src/gtkui/menus.cc:202 src/qtui/main_window_actions.cc:164
+#: src/gtkui/menus.cc:162 src/qtui/menus.cc:223
 msgid "Sort Se_lected"
-msgstr "Sorter _valgte"
+msgstr "Sortér _valgte"
 
-#: src/gtkui/menus.cc:203 src/qtui/main_window_actions.cc:165
+#: src/gtkui/menus.cc:163 src/qtui/menus.cc:225
 msgid "Remove _Duplicates"
-msgstr "Fjern dupletter"
+msgstr "Fjern _dubletter"
 
-#: src/gtkui/menus.cc:204 src/qtui/main_window_actions.cc:166
+#: src/gtkui/menus.cc:164 src/qtui/menus.cc:226
 msgid "Remove _Unavailable Files"
 msgstr "Fjern _utilgængelige filer"
 
-#: src/gtkui/menus.cc:206 src/playlist-manager/playlist-manager.cc:244
-#: src/qtui/main_window_actions.cc:168
+#: src/gtkui/menus.cc:166 src/playlist-manager/playlist-manager.cc:219
+#: src/playlist-manager-qt/playlist-manager-qt.cc:348 src/qtui/menus.cc:229
 msgid "_New"
 msgstr "_Ny"
 
-#: src/gtkui/menus.cc:207
+#: src/gtkui/menus.cc:167 src/qtui/menus.cc:230
 msgid "Ren_ame ..."
 msgstr "_Omdøb ..."
 
-#: src/gtkui/menus.cc:208 src/gtkui/menus.cc:264
-#: src/qtui/main_window_actions.cc:170
+#: src/gtkui/menus.cc:168 src/gtkui/menus.cc:228
+#: src/moonstone/playlist_tabs.cc:311 src/qtui/menus.cc:231
+#: src/qtui/playlist_tabs.cc:336
 msgid "Remo_ve"
 msgstr "_Fjern"
 
-#: src/gtkui/menus.cc:210
+#: src/gtkui/menus.cc:170 src/qtui/menus.cc:233
 msgid "_Import ..."
-msgstr "_Importer ..."
+msgstr "_Importér ..."
 
-#: src/gtkui/menus.cc:211
+#: src/gtkui/menus.cc:171 src/qtui/menus.cc:234
 msgid "_Export ..."
-msgstr "_Eksporter ..."
+msgstr "_Eksportér ..."
 
-#: src/gtkui/menus.cc:213
+#: src/gtkui/menus.cc:173 src/qtui/menus.cc:237
 msgid "Playlist _Manager ..."
-msgstr "Håndtering af _afspilningslister ..."
+msgstr "_Håndtering af afspilningsliste ..."
 
-#: src/gtkui/menus.cc:214 src/qtui/main_window_actions.cc:176
+#: src/gtkui/menus.cc:174 src/qtui/menus.cc:239
 msgid "_Queue Manager ..."
-msgstr "_Køhåndtering ..."
+msgstr "_Håndtering af kø ..."
 
-#: src/gtkui/menus.cc:218 src/qtui/main_window_actions.cc:180
+#: src/gtkui/menus.cc:178 src/qtui/menus.cc:243
 msgid "Volume _Up"
 msgstr "Lydstyrke _op"
 
-#: src/gtkui/menus.cc:219 src/qtui/main_window_actions.cc:181
+#: src/gtkui/menus.cc:179 src/qtui/menus.cc:245
 msgid "Volume _Down"
 msgstr "Lydstyrke _ned"
 
-#: src/gtkui/menus.cc:221 src/qtui/main_window_actions.cc:183
-msgid "_Equalizer"
-msgstr "_Equalizer"
+#: src/gtkui/menus.cc:181 src/qtui/menus.cc:249
+msgid "_Equalizer ..."
+msgstr "_Equalizer ..."
 
-#: src/gtkui/menus.cc:223 src/qtui/main_window_actions.cc:185
+#: src/gtkui/menus.cc:182 src/qtui/menus.cc:251
 msgid "E_ffects ..."
 msgstr "_Effekter ..."
 
-#: src/gtkui/menus.cc:227
+#: src/gtkui/menus.cc:184
+msgid "_Record Stream"
+msgstr "_Optag strøm"
+
+#: src/gtkui/menus.cc:185
+msgid "Audio _Settings ..."
+msgstr "_Lydindstillinger ..."
+
+#: src/gtkui/menus.cc:189 src/qtui/menus.cc:260
 msgid "Show _Menu Bar"
 msgstr "Vis _menubjælke"
 
-#: src/gtkui/menus.cc:228
+#: src/gtkui/menus.cc:190 src/qtui/menus.cc:262
 msgid "Show I_nfo Bar"
 msgstr "Vis _informationsbjælke"
 
-#: src/gtkui/menus.cc:229
+#: src/gtkui/menus.cc:191 src/qtui/menus.cc:264
+msgid "Show Info Bar _Album Art"
+msgstr "Vis informationsbjælke om albumomslag"
+
+#: src/gtkui/menus.cc:192 src/qtui/menus.cc:266
 msgid "Show Info Bar Vis_ualization"
-msgstr "Vis _visualisering for informationsbjælken"
+msgstr "Vis _visualisering i informationsbjælken"
 
-#: src/gtkui/menus.cc:230
+#: src/gtkui/menus.cc:193 src/qtui/menus.cc:268
 msgid "Show _Status Bar"
 msgstr "Vis _statusbjælke"
 
-#: src/gtkui/menus.cc:232
+#: src/gtkui/menus.cc:195 src/qtui/menus.cc:272
 msgid "Show _Remaining Time"
 msgstr "Vis _resterende tid"
 
-#: src/gtkui/menus.cc:234
+#: src/gtkui/menus.cc:197 src/qtui/menus.cc:276 src/skins/menus.cc:157
+#: src/skins-qt/menus.cc:152
 msgid "_Visualizations ..."
 msgstr "_Visualiseringer ..."
 
-#: src/gtkui/menus.cc:238 src/qtui/main_window_actions.cc:189
+#: src/gtkui/menus.cc:201 src/qtui/menus.cc:280
 msgid "_File"
 msgstr "_Fil"
 
-#: src/gtkui/menus.cc:239 src/qtui/main_window_actions.cc:190
+#: src/gtkui/menus.cc:202 src/qtui/menus.cc:281
 msgid "_Playback"
 msgstr "_Afspilning"
 
-#: src/gtkui/menus.cc:240 src/qtui/main_window_actions.cc:191
+#: src/gtkui/menus.cc:203 src/qtui/menus.cc:282
 msgid "P_laylist"
 msgstr "_Afspilningsliste"
 
-#: src/gtkui/menus.cc:241 src/gtkui/menus.cc:258
-#: src/qtui/main_window_actions.cc:192
+#: src/gtkui/menus.cc:204 src/gtkui/menus.cc:222 src/qtui/menus.cc:283
+#: src/qtui/menus.cc:312
 msgid "_Services"
 msgstr "_Tjenester"
 
-#: src/gtkui/menus.cc:242 src/qtui/main_window_actions.cc:193
+#: src/gtkui/menus.cc:205 src/qtui/menus.cc:284
 msgid "_Output"
-msgstr "_Lydudgang"
+msgstr "_Udgang"
 
-#: src/gtkui/menus.cc:243
+#: src/gtkui/menus.cc:206 src/qtui/menus.cc:285
 msgid "_View"
 msgstr "_Vis"
 
-#: src/gtkui/menus.cc:248
+#: src/gtkui/menus.cc:211 src/qtui/menus.cc:296
 msgid "_Queue/Unqueue"
 msgstr "_Sæt i kø/fjern fra kø"
 
-#: src/gtkui/menus.cc:250
+#: src/gtkui/menus.cc:213 src/qtui/menus.cc:299
 msgid "_Open Containing Folder"
-msgstr ""
+msgstr "_Åbn indeholdende mappe"
 
-#: src/gtkui/menus.cc:253
+#: src/gtkui/menus.cc:214 src/qtui/menus.cc:301
+msgid "_Refresh Selected"
+msgstr "_Opdater valgte"
+
+#: src/gtkui/menus.cc:216 src/qtui/menus.cc:304
 msgid "Cu_t"
 msgstr "_Klip"
 
-#: src/gtkui/menus.cc:254
+#: src/gtkui/menus.cc:217 src/qtui/menus.cc:305
 msgid "_Copy"
-msgstr "_Kopier"
+msgstr "_Kopiér"
 
-#: src/gtkui/menus.cc:255
+#: src/gtkui/menus.cc:218 src/qtui/menus.cc:306
 msgid "_Paste"
 msgstr "_Indsæt"
 
-#: src/gtkui/menus.cc:256
+#: src/gtkui/menus.cc:219 src/qtui/menus.cc:307
+msgid "Paste at _End"
+msgstr "Indsæt ved _slutning"
+
+#: src/gtkui/menus.cc:220 src/qtui/menus.cc:309
 msgid "Select _All"
 msgstr "Vælg _alle"
 
-#: src/gtkui/menus.cc:263
+#: src/gtkui/menus.cc:227 src/moonstone/playlist_tabs.cc:309
+#: src/qtui/playlist_tabs.cc:334
 msgid "_Rename ..."
 msgstr "_Omdøb ..."
 
-#: src/gtkui/settings.cc:35
+#: src/gtkui/settings.cc:35 src/qtui/settings.cc:59
+msgid "Always"
+msgstr "Altid"
+
+#: src/gtkui/settings.cc:36 src/qtui/settings.cc:60
+msgid "Auto-hide"
+msgstr "Skjul automatisk"
+
+#: src/gtkui/settings.cc:37 src/qtui/settings.cc:61
+msgid "Never"
+msgstr "Aldrig"
+
+#: src/gtkui/settings.cc:41 src/qtui/settings.cc:64
 msgid "Playlist Tabs"
 msgstr "Afspilningslistefaneblade"
 
-#: src/gtkui/settings.cc:36
-msgid "Always show tabs"
-msgstr "Vis altid faneblade"
+#: src/gtkui/settings.cc:42 src/qtui/settings.cc:65
+msgid "Show playlist tabs:"
+msgstr "Vis faneblade for afspilningslister:"
 
-#: src/gtkui/settings.cc:38
+#: src/gtkui/settings.cc:45 src/qtui/settings.cc:69
 msgid "Show entry counts"
-msgstr ""
+msgstr "Vis tælling af poster"
 
-#: src/gtkui/settings.cc:40
+#: src/gtkui/settings.cc:47 src/qtui/settings.cc:72
 msgid "Show close buttons"
-msgstr ""
+msgstr "Vis luk-knapper"
 
-#: src/gtkui/settings.cc:42
+#: src/gtkui/settings.cc:49 src/qtui/settings.cc:75
 msgid "Playlist Columns"
 msgstr "Afspilningslistekolonner"
 
-#: src/gtkui/settings.cc:44
+#: src/gtkui/settings.cc:51 src/qtui/settings.cc:77
 msgid "Show column headers"
 msgstr "Vis teksthoveder for kolonner"
 
-#: src/gtkui/settings.cc:46 src/modplug/plugin_main.cc:106
-#: src/skins/skins_cfg.cc:263
-msgid "Miscellaneous"
-msgstr "Diverse"
+#: src/gtkui/settings.cc:53 src/qtui/settings.cc:82
+msgid "Make column headers clickable for sorting"
+msgstr ""
 
-#: src/gtkui/settings.cc:47
-msgid "Arrow keys seek by:"
+#: src/gtkui/settings.cc:56
+msgid "Use symbolic icons in toolbar"
 msgstr ""
 
-#: src/gtkui/settings.cc:50
+#: src/gtkui/settings.cc:58 src/qtui/settings.cc:86
 msgid "Scroll on song change"
-msgstr "Rul ved sangændring"
+msgstr "Rul ved skift af sang"
 
-#: src/gtkui/ui_gtk.cc:71
+#: src/gtkui/ui_gtk.cc:82
 msgid "GTK Interface"
 msgstr "GTK-grænseflade"
 
-#: src/gtkui/ui_gtk.cc:222 src/skins/ui_main.cc:232
+#: src/gtkui/ui_gtk.cc:219 src/skins/main.cc:228 src/skins-qt/main.cc:231
 #, c-format
 msgid "%s - Audacious"
 msgstr "%s - Audacious"
 
-#: src/gtkui/ui_gtk.cc:225 src/qtui/main_window.cc:186
+#: src/gtkui/ui_gtk.cc:221 src/moonstone/main_window.cc:184
+#: src/qtui/main_window.cc:385
 msgid "Buffering ..."
 msgstr "Mellemlagrer ..."
 
-#: src/gtkui/ui_gtk.cc:228 src/skins/ui_main.cc:234 src/skins/ui_main.cc:1164
+#: src/gtkui/ui_gtk.cc:224 src/pipewire/pipewire.cc:402 src/skins/main.cc:230
+#: src/skins-qt/main.cc:233
 msgid "Audacious"
 msgstr "Audacious"
 
-#: src/gtkui/ui_statusbar.cc:63 src/qtui/status_bar.cc:67
+#: src/gtkui/ui_gtk.cc:487 src/gtkui/ui_gtk.cc:518 src/gtkui/ui_gtk.cc:882
+#: src/hotkey/gui.cc:72 src/moonstone/main_window.cc:67
+#: src/moonstone/main_window.cc:145 src/moonstone/main_window.cc:146
+#: src/notify/osd.cc:85 src/qthotkey/gui.cc:67 src/qtui/main_window.cc:154
+#: src/qtui/main_window.cc:347 src/qtui/main_window.cc:348
+#: src/skins/menus.cc:109 src/skins-qt/menus.cc:100
+msgid "Play"
+msgstr "Afspil"
+
+#: src/gtkui/ui_gtk.cc:487 src/moonstone/main_window.cc:151
+#: src/moonstone/main_window.cc:152 src/notify/osd.cc:82
+#: src/qtui/main_window.cc:353 src/qtui/main_window.cc:354
+#: src/skins/menus.cc:110 src/skins-qt/menus.cc:101
+msgid "Pause"
+msgstr "Pause"
+
+#: src/gtkui/ui_gtk.cc:868 src/moonstone/main_window.cc:57
+#: src/qtui/main_window.cc:145 src/skins/menus.cc:86 src/skins-qt/menus.cc:77
+msgid "Search Library"
+msgstr "Søg i bibliotek"
+
+#: src/gtkui/ui_gtk.cc:875 src/moonstone/main_window.cc:60
+#: src/qtui/main_window.cc:147
+msgid "Open Files"
+msgstr "Åbn filer"
+
+#: src/gtkui/ui_gtk.cc:876 src/moonstone/main_window.cc:62
+#: src/qtui/main_window.cc:149
+msgid "Add Files"
+msgstr "Tilføj filer"
+
+#: src/gtkui/ui_gtk.cc:881 src/moonstone/main_window.cc:65
+#: src/qtui/main_window.cc:152 src/skins/menus.cc:112 src/skins-qt/menus.cc:103
+msgid "Previous"
+msgstr "Forrige"
+
+#: src/gtkui/ui_gtk.cc:883 src/hotkey/gui.cc:74 src/moonstone/main_window.cc:69
+#: src/qthotkey/gui.cc:69 src/qtui/main_window.cc:156 src/skins/menus.cc:111
+#: src/skins-qt/menus.cc:102
+msgid "Stop"
+msgstr "Stop"
+
+#: src/gtkui/ui_gtk.cc:884 src/moonstone/main_window.cc:76 src/notify/osd.cc:89
+#: src/qtui/main_window.cc:163 src/skins/menus.cc:113 src/skins-qt/menus.cc:104
+msgid "Next"
+msgstr "Næste"
+
+#: src/gtkui/ui_gtk.cc:886 src/moonstone/main_window.cc:79
+#: src/qtui/main_window.cc:166 src/qtui/menus.cc:254 src/skins/menus.cc:79
+#: src/skins-qt/menus.cc:69
+msgid "Record Stream"
+msgstr "Optag strøm"
+
+#: src/gtkui/ui_gtk.cc:919 src/moonstone/main_window.cc:86
+#: src/qtui/main_window.cc:173 src/skins/menus.cc:103 src/skins-qt/menus.cc:94
+msgid "Repeat"
+msgstr "Gentag"
+
+#: src/gtkui/ui_gtk.cc:922 src/moonstone/main_window.cc:89
+#: src/qtui/main_window.cc:176 src/skins/menus.cc:104 src/skins-qt/menus.cc:95
+msgid "Shuffle"
+msgstr "Bland"
+
+#: src/gtkui/ui_gtk.cc:1114 src/qtui/main_window.cc:123
+msgid "Menu"
+msgstr "Menu"
+
+#: src/gtkui/ui_statusbar.cc:64 src/qtui/status_bar.cc:155
 msgid "mono"
 msgstr "mono"
 
-#: src/gtkui/ui_statusbar.cc:65 src/qtui/status_bar.cc:69
+#: src/gtkui/ui_statusbar.cc:66 src/qtui/status_bar.cc:157
 msgid "stereo"
 msgstr "stereo"
 
-#: src/gtkui/ui_statusbar.cc:67 src/qtui/status_bar.cc:71
+#: src/gtkui/ui_statusbar.cc:68 src/qtui/status_bar.cc:160
 #, c-format
 msgid "%d channel"
 msgid_plural "%d channels"
 msgstr0 "%d kanal"
 msgstr1 "%d kanaler"
 
-#: src/gtkui/ui_statusbar.cc:81 src/qtui/status_bar.cc:85
+#: src/gtkui/ui_statusbar.cc:76 src/qtui/status_bar.cc:168
+#, c-format
+msgid "%d kHz"
+msgstr "%d kHz"
+
+#: src/gtkui/ui_statusbar.cc:82 src/qtui/status_bar.cc:174
 #, c-format
-msgid "%d kbps"
-msgstr "%d kbps"
+msgid "%d kbit/s"
+msgstr "%d kbit/s"
 
-#: src/gtkui/ui_statusbar.cc:107 src/skins/ui_main_evlisteners.cc:103
+#: src/gtkui/ui_statusbar.cc:108 src/skins/main.cc:478 src/skins-qt/main.cc:461
 msgid "Single mode."
 msgstr "Tilstand for én."
 
-#: src/gtkui/ui_statusbar.cc:109 src/skins/ui_main_evlisteners.cc:105
+#: src/gtkui/ui_statusbar.cc:110 src/skins/main.cc:480 src/skins-qt/main.cc:463
 msgid "Playlist mode."
 msgstr "Afspilningstilstand."
 
-#: src/gtkui/ui_statusbar.cc:117 src/skins/ui_main_evlisteners.cc:111
+#: src/gtkui/ui_statusbar.cc:118 src/skins/main.cc:486 src/skins-qt/main.cc:469
 msgid "Stopping after song."
 msgstr "Stopper efter sang."
 
-#: src/hotkey/gui.cc:71
+#: src/hotkey/gui.cc:71 src/qthotkey/gui.cc:66
 msgid "Previous track"
-msgstr "Forrige nummer"
+msgstr "Forrige spor"
 
-#: src/hotkey/gui.cc:72 src/notify/osd.cc:69 src/qtui/main_window.cc:69
-#: src/qtui/main_window.cc:172 src/qtui/main_window.cc:173
-#: src/skins/menus.cc:87
-msgid "Play"
-msgstr "Afspil"
-
-#: src/hotkey/gui.cc:73
+#: src/hotkey/gui.cc:73 src/qthotkey/gui.cc:68
 msgid "Pause/Resume"
 msgstr "Pause/genoptag"
 
-#: src/hotkey/gui.cc:74 src/qtui/main_window.cc:70 src/skins/menus.cc:89
-msgid "Stop"
-msgstr "Stop"
-
-#: src/hotkey/gui.cc:75
+#: src/hotkey/gui.cc:75 src/qthotkey/gui.cc:70
 msgid "Next track"
-msgstr "Næste nummer"
+msgstr "Næste spor"
 
-#: src/hotkey/gui.cc:76
-msgid "Forward 5 seconds"
-msgstr "Fremad 5 sekunder"
+#: src/hotkey/gui.cc:76 src/qthotkey/gui.cc:71
+msgid "Step forward"
+msgstr "Trin fremad"
 
-#: src/hotkey/gui.cc:77
-msgid "Rewind 5 seconds"
-msgstr "Tilbage 5 sekunder"
+#: src/hotkey/gui.cc:77 src/qthotkey/gui.cc:72
+msgid "Step backward"
+msgstr "Trin baglæns"
 
-#: src/hotkey/gui.cc:78
+#: src/hotkey/gui.cc:78 src/qthotkey/gui.cc:73
 msgid "Mute"
 msgstr "Sluk lyden"
 
-#: src/hotkey/gui.cc:79
+#: src/hotkey/gui.cc:79 src/qthotkey/gui.cc:74
 msgid "Volume up"
 msgstr "Lydstyrke op"
 
-#: src/hotkey/gui.cc:80
+#: src/hotkey/gui.cc:80 src/qthotkey/gui.cc:75
 msgid "Volume down"
 msgstr "Lydstyrke ned"
 
-#: src/hotkey/gui.cc:81
+#: src/hotkey/gui.cc:81 src/qthotkey/gui.cc:76
 msgid "Jump to file"
 msgstr "Hop til fil"
 
-#: src/hotkey/gui.cc:82
+#: src/hotkey/gui.cc:82 src/qthotkey/gui.cc:77
 msgid "Toggle player window(s)"
-msgstr "Skift afspillervinduer"
+msgstr "Skift afspillervindue(r)"
 
-#: src/hotkey/gui.cc:83
+#: src/hotkey/gui.cc:83 src/qthotkey/gui.cc:78
 msgid "Show On-Screen-Display"
-msgstr "Vis On-Screen-Display"
+msgstr "Vis skærmdisplay"
 
-#: src/hotkey/gui.cc:84
+#: src/hotkey/gui.cc:84 src/qthotkey/gui.cc:79
 msgid "Toggle repeat"
 msgstr "Skift gentag"
 
-#: src/hotkey/gui.cc:85
+#: src/hotkey/gui.cc:85 src/qthotkey/gui.cc:80
 msgid "Toggle shuffle"
 msgstr "Skift bland"
 
-#: src/hotkey/gui.cc:86
+#: src/hotkey/gui.cc:86 src/qthotkey/gui.cc:81
 msgid "Toggle stop after current"
 msgstr "Skift stop efter nuværende"
 
-#: src/hotkey/gui.cc:87
+#: src/hotkey/gui.cc:87 src/qthotkey/gui.cc:82
 msgid "Raise player window(s)"
-msgstr "Hæv vinduer for afspiller"
+msgstr "Hæv afspillervindue(r)"
 
-#: src/hotkey/gui.cc:97
+#: src/hotkey/gui.cc:98 src/qthotkey/gui.cc:100
 msgid "(none)"
 msgstr "(ingen)"
 
-#: src/hotkey/gui.cc:234
+#: src/hotkey/gui.cc:261
 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 modifiers.\n"
 "\n"
 "Do you want to continue?"
 msgstr ""
-"Det anbefales ikke at binde de primære museknapper uden modifikatorer.\n"
+"Det anbefales ikke at binde de primære museknapper uden ændringstaster.\n"
 "\n"
-"Ønsker du at fortsætte?"
+"Vil du fortsætte?"
 
-#: src/hotkey/gui.cc:236
+#: src/hotkey/gui.cc:264
 msgid "Binding mouse buttons"
 msgstr "Binding af museknapper"
 
-#: src/hotkey/gui.cc:391
+#: src/hotkey/gui.cc:434
 msgid ""
 "Press a key combination inside a text field.\n"
 "You can also bind mouse buttons."
@@ -2127,86 +2235,131 @@
 "Tryk på en tastekombination i et tekstfelt.\n"
 "Du kan også binde museknapper."
 
-#: src/hotkey/gui.cc:396
+#: src/hotkey/gui.cc:444 src/qthotkey/gui.cc:179
 msgid "Hotkeys:"
 msgstr "Genvejstaster:"
 
-#: src/hotkey/gui.cc:413
+#: src/hotkey/gui.cc:457 src/qthotkey/gui.cc:181
 msgid "Action:"
 msgstr "Handling:"
 
-#: src/hotkey/gui.cc:420
+#: src/hotkey/gui.cc:461 src/qthotkey/gui.cc:182
 msgid "Key Binding:"
 msgstr "Genvejstast:"
 
-#: src/hotkey/gui.cc:468
+#: src/hotkey/gui.cc:518 src/qthotkey/gui.cc:184
 msgid "_Add"
 msgstr "_Tilføj"
 
-#: src/hotkey/plugin.cc:61
+#: src/hotkey/plugin.cc:59 src/qthotkey/plugin.cc:78
 msgid "Global Hotkeys"
 msgstr "Globale genvejstaster"
 
-#: src/hotkey/plugin.cc:79
+#: src/hotkey/plugin.cc:74
 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"
+"Contributors 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-udvidelsesmodul\n"
+"Styr afspilleren med globale genvejstaster eller multimedietaster.\n"
+"\n"
+"Ophavsret (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n"
+"\n"
+"Bidrag inkluderer:\n"
+"Ophavsret (C) 2006-2007 Vladimir Paskov <vlado.paskov@gmail.com>\n"
+"Ophavsret (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/jack-ng/jack-ng.cc:49
+#: src/jack/jack-ng.cc:54
 msgid "JACK Output"
-msgstr "JACK-lydkanal"
+msgstr "JACK-udgang"
 
-#: src/jack-ng/jack-ng.cc:114
+#: src/jack/jack-ng.cc:126
+msgid "Client name:"
+msgstr "Klientnavn:"
+
+#: src/jack/jack-ng.cc:128
 msgid "Automatically connect to output ports"
 msgstr "Forbind automatisk til udgangsporte"
 
-#: src/jack-ng/jack-ng.cc:155
+#: src/jack/jack-ng.cc:130
+msgid "Filter ports (regex, use any port if blank):"
+msgstr "Filtrer porte (regulært udtryk, brug enhver port hvis blank):"
+
+#: src/jack/jack-ng.cc:136
+msgid "Connect to physical ports only"
+msgstr "Forbind kun til fysiske porte"
+
+#: src/jack/jack-ng.cc:139
+msgid "Upmix to"
+msgstr "Upmix til"
+
+#: src/jack/jack-ng.cc:141
+msgid "ports if input has fewer channels"
+msgstr "Port hvis indgang har færre kanaler"
+
+#: src/jack/jack-ng.cc:143
+msgid "Ignore insufficient number of ports"
+msgstr "Ignorer utilstrækkeligt antal porte"
+
+#: src/jack/jack-ng.cc:181
+msgid "No JACK output ports were found. Please check settings."
+msgstr ""
+"Ingen JACK-udgangsporte blev fundet. Kontroller venligst indstillingerne."
+
+#: src/jack/jack-ng.cc:195
 #, c-format
 msgid "Only %d JACK output ports were found but %d are required."
-msgstr "Kun %d JACK-udgangsporte blev fundet, men %d var krævet."
+msgstr "Kun %d JACK-udgang blev fundet, men %d var krævet."
 
-#: src/jack-ng/jack-ng.cc:164
+#: src/jack/jack-ng.cc:210
 #, c-format
 msgid "Failed to connect to JACK port %s."
-msgstr "Kunen ikke forbinde til JACK-port %s"
+msgstr "Kunne ikke forbinde til JACK-port %s."
 
-#: src/jack-ng/jack-ng.cc:184
+#: src/jack/jack-ng.cc:230
 msgid ""
 "JACK supports only floating-point audio. You must change the output bit "
 "depth to floating-point in Audacious settings."
 msgstr ""
+"JACK understøtter kun flydende kommatal-lyd. Du skal ændre udgangens "
+"bitdybde til flydende kommatal i indstillingerne for Audacious."
 
-#: src/jack-ng/jack-ng.cc:197
+#: src/jack/jack-ng.cc:245
 msgid "Failed to connect to the JACK server; is it running?"
 msgstr "Kunne ikke forbinde til JACK-serveren; kører den?"
 
-#: src/jack-ng/jack-ng.cc:273
+#: src/jack/jack-ng.cc:321
 #, c-format
 msgid ""
 "The JACK server requires a sample rate of %d Hz, but Audacious is playing at "
 "%d Hz. Please use the Sample Rate Converter effect to correct the mismatch."
 msgstr ""
+"JACK-serveren kræver en samplefrekvens på %d Hz, men Audacious afspiller ved "
+"%d Hz. Brug venligst samplefrekvenskonverter-effekten for at korrigere "
+"uoverensstemmelsen."
 
-#: src/ladspa/plugin.cc:414
+#: src/ladspa/plugin.cc:416
 #, c-format
 msgid "%s Settings"
-msgstr "%s-indstillinger"
+msgstr "Indstillinger for %s"
 
-#: src/ladspa/plugin.cc:478
+#: src/ladspa/plugin.cc:482
 msgid "Module paths:"
 msgstr "Modulstier:"
 
-#: src/ladspa/plugin.cc:483
+#: src/ladspa/plugin.cc:487
 msgid ""
 "Separate multiple paths with a colon.\n"
 "These paths are searched in addition to LADSPA_PATH.\n"
@@ -2217,25 +2370,25 @@
 "Efter tilføjelse af nye stier, tryk Retur for at skanne for nye "
 "udvidelsesmoduler."
 
-#: src/ladspa/plugin.cc:499
+#: src/ladspa/plugin.cc:508
 msgid "Available plugins:"
 msgstr "Tilgængelige udvidelsesmoduler:"
 
-#: src/ladspa/plugin.cc:512 src/modplug/plugin_main.cc:92
-#: src/modplug/plugin_main.cc:95 src/modplug/plugin_main.cc:98
-#: src/modplug/plugin_main.cc:101
+#: src/ladspa/plugin.cc:521 src/modplug/plugin_main.cc:91
+#: src/modplug/plugin_main.cc:94 src/modplug/plugin_main.cc:97
+#: src/modplug/plugin_main.cc:100
 msgid "Enable"
-msgstr "Aktiver"
+msgstr "Aktivér"
 
-#: src/ladspa/plugin.cc:518
+#: src/ladspa/plugin.cc:527
 msgid "Enabled plugins:"
 msgstr "Aktiverede udvidelsesmoduler:"
 
-#: src/ladspa/plugin.cc:534
+#: src/ladspa/plugin.cc:543
 msgid "Settings"
 msgstr "Indstillinger"
 
-#: src/ladspa/plugin.cc:551
+#: src/ladspa/plugin.cc:560
 msgid ""
 "LADSPA Host for Audacious\n"
 "Copyright 2011 John Lindgren"
@@ -2251,7 +2404,7 @@
 msgid "LIRC Plugin"
 msgstr "LIRC-udvidelsesmodul"
 
-#: src/lirc/lirc.cc:381
+#: src/lirc/lirc.cc:379
 msgid ""
 "A simple plugin to control Audacious using the LIRC remote control daemon\n"
 "\n"
@@ -2280,81 +2433,142 @@
 "\n"
 "For yderligere information om LIRC, se http://lirc.org."
 
-#: src/lirc/lirc.cc:392
+#: src/lirc/lirc.cc:390
 msgid "Connection"
 msgstr "Forbindelse"
 
-#: src/lirc/lirc.cc:393
+#: src/lirc/lirc.cc:391
 msgid "Reconnect to LIRC server"
 msgstr "Forbind igen til LIRC-serveren"
 
-#: src/lirc/lirc.cc:395
+#: src/lirc/lirc.cc:393
 msgid "Wait before reconnecting:"
 msgstr "Vent før du forbinder igen:"
 
-#: src/lyricwiki/lyricwiki.cc:41
-msgid "LyricWiki Plugin"
-msgstr "LyricWiki-udvidelsesmodul"
-
-#: src/lyricwiki/lyricwiki.cc:131 src/lyricwiki-qt/lyricwiki.cc:136
-msgid "No lyrics available"
-msgstr "Ingen sangtekster er tilgængelige"
-
-#: src/lyricwiki/lyricwiki.cc:217 src/lyricwiki/lyricwiki.cc:226
-#: src/lyricwiki/lyricwiki.cc:243 src/lyricwiki/lyricwiki.cc:252
-#: src/lyricwiki/lyricwiki.cc:267 src/lyricwiki-qt/lyricwiki.cc:222
-#: src/lyricwiki-qt/lyricwiki.cc:231 src/lyricwiki-qt/lyricwiki.cc:248
-#: src/lyricwiki-qt/lyricwiki.cc:257 src/lyricwiki-qt/lyricwiki.cc:272
-msgid "Error"
-msgstr "Fejl"
-
-#: src/lyricwiki/lyricwiki.cc:218 src/lyricwiki/lyricwiki.cc:244
-#: src/lyricwiki-qt/lyricwiki.cc:223 src/lyricwiki-qt/lyricwiki.cc:249
+#: src/lyrics-common/chart_lyrics_provider.cc:93
+#: src/lyrics-common/chart_lyrics_provider.cc:150
+#: src/lyrics-common/lyrics_ovh_provider.cc:50
 #, c-format
 msgid "Unable to fetch %s"
 msgstr "Kunne ikke hente %s"
 
-#: src/lyricwiki/lyricwiki.cc:227 src/lyricwiki/lyricwiki.cc:253
-#: src/lyricwiki-qt/lyricwiki.cc:232 src/lyricwiki-qt/lyricwiki.cc:258
+#: src/lyrics-common/chart_lyrics_provider.cc:100
+#: src/lyrics-common/chart_lyrics_provider.cc:157
+#: src/lyrics-common/lyrics_ovh_provider.cc:57
 #, c-format
 msgid "Unable to parse %s"
 msgstr "Kunne ikke fortolke %s"
 
-#: src/lyricwiki/lyricwiki.cc:259 src/lyricwiki-qt/lyricwiki.cc:264
+#: src/lyrics-common/chart_lyrics_provider.cc:121
+#: src/lyrics-common/chart_lyrics_provider.cc:194
+#: src/lyrics-common/lyrics_ovh_provider.cc:88
 msgid "Looking for lyrics ..."
 msgstr "Kigger efter sangtekster ..."
 
-#: src/lyricwiki/lyricwiki.cc:267 src/lyricwiki-qt/lyricwiki.cc:272
-msgid "Missing song metadata"
-msgstr "Manglende sangmetadata"
-
-#: src/lyricwiki/lyricwiki.cc:278 src/lyricwiki-qt/lyricwiki.cc:283
-msgid "Connecting to lyrics.wikia.com ..."
-msgstr "Forbinder til lyrics.wikia.com ..."
-
-#: src/lyricwiki-qt/lyricwiki.cc:55
-msgid "LyricWiki Plugin (Qt)"
-msgstr "LyricWiki-udvidelsesmodul (Qt)"
+#: src/lyrics-common/preferences.h:43
+msgid "Nowhere"
+msgstr "Intet sted"
+
+#: src/lyrics-common/preferences.h:49
+msgid "Artist is truncated at the start, Title -- at the end"
+msgstr ""
+"Kunstner er afkortet i begyndelsen, titel -- i slutningen"
+
+#: src/lyrics-common/preferences.h:50
+msgid "Chars to truncate on:"
+msgstr "Tegn at afkorte ved:"
+
+#: src/lyrics-common/preferences.h:54
+msgid "Chars are ORed in RegExp, surrounded by whitespace"
+msgstr "Tegn er ORed i RegExp, omgivet af mellemrum"
+
+#: src/lyrics-common/preferences.h:55
+msgid "Chars to split on:"
+msgstr "Tegn at opdele ved:"
+
+#: src/lyrics-common/preferences.h:56
+msgid "Further truncate those on chars"
+msgstr "Yderligere afkort ved tegn"
+
+#: src/lyrics-common/preferences.h:62
+msgid "General"
+msgstr "Generelt"
+
+#: src/lyrics-common/preferences.h:63
+msgid "Split title into artist and title on chars"
+msgstr "Opdel titel i kunstner og titel ved tegn"
+
+#: src/lyrics-common/preferences.h:66
+msgid "Sources"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:67
+msgid "Use embedded lyrics (from Lyrics tag)"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:69
+msgid "Fetch lyrics from internet:"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:72
+msgid "Store fetched lyrics in local cache"
+msgstr "Lagr hentede sangtekster i lokalt mellemlager"
+
+#: src/lyrics-common/preferences.h:74
+msgid "Local Storage"
+msgstr "Lokalt lager"
 
-#: src/m3u/m3u.cc:32
+#: src/lyrics-common/preferences.h:75
+msgid "Load lyric files (.lrc) from local storage"
+msgstr "Indlæs sangtekstfiler (.lrc) fra lokalt lager"
+
+#: src/lyrics-common/utils.cc:54 src/ui-common/dialogs-qt.cc:63
+msgid "Error"
+msgstr "Fejl"
+
+#: src/lyrics-common/utils.cc:60
+msgid "Lyrics could not be found."
+msgstr "Sangtekster kunne ikke findes."
+
+#: src/lyrics-common/utils.cc:142
+msgid "Missing title and/or artist."
+msgstr "Manglende titel og/eller kunstner."
+
+#: src/lyrics-gtk/lyrics-gtk.cc:37 src/lyrics-qt/lyrics-qt.cc:50
+msgid "Lyrics"
+msgstr "Sangtekster"
+
+#: src/lyrics-gtk/lyrics-gtk.cc:189 src/lyrics-qt/lyrics-qt.cc:171
+msgid "Edit Lyrics ..."
+msgstr "Rediger sangtekster ..."
+
+#: src/lyrics-gtk/lyrics-gtk.cc:195 src/lyrics-qt/lyrics-qt.cc:178
+msgid "Save Locally"
+msgstr "Gem lokalt"
+
+#: src/lyrics-gtk/lyrics-gtk.cc:201 src/lyrics-qt/lyrics-qt.cc:186
+msgid "Refresh"
+msgstr "Opdater"
+
+#: src/m3u/m3u.cc:33
 msgid "M3U Playlists"
 msgstr "M3U-afspilningslister"
 
 #: src/metronom/metronom.cc:44
 msgid "Tact Generator"
-msgstr ""
+msgstr "Taktgenerator"
 
-#: src/metronom/metronom.cc:147
+#: src/metronom/metronom.cc:145
 #, c-format
 msgid "Tact generator: %d bpm"
-msgstr "Tact-opretter: %d bpm"
+msgstr "Taktgenerator: %d bpm"
 
-#: src/metronom/metronom.cc:149
+#: src/metronom/metronom.cc:147
 #, c-format
 msgid "Tact generator: %d bpm %d/%d"
-msgstr "Tact-opretter: %d bpm %d/%d"
+msgstr "Taktgenerator: %d bpm %d/%d"
 
-#: src/metronom/metronom.cc:237
+#: src/metronom/metronom.cc:235
 msgid ""
 "A Tact Generator by Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
 "\n"
@@ -2362,12 +2576,17 @@
 "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 ""
+"En Taktgenerator af Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
+"\n"
+"For at bruge den tilføjes en URL: tact://beats*num/den\n"
+"f.eks. tact://77 for at afspille 77 slag pr. minut\n"
+"eller tact://60*3/4 for at afspille 60 bpm i 3/4-takt"
 
-#: src/mixer/mixer.cc:38
+#: src/mixer/mixer.cc:43
 msgid "Channel Mixer"
 msgstr "Kanalmikser"
 
-#: src/mixer/mixer.cc:202
+#: src/mixer/mixer.cc:255
 msgid ""
 "Channel Mixer Plugin for Audacious\n"
 "Copyright 2011-2012 John Lindgren and Michał Lipski"
@@ -2375,13 +2594,13 @@
 "Channel Mixer-udvidelsesmodul for Audacious\n"
 "Ophavsret 2011-2012 John Lindgren og Michał Lipski"
 
-#: src/mixer/mixer.cc:206
+#: src/mixer/mixer.cc:259
 msgid "Channel Mixer"
 msgstr "Kanalmikser"
 
-#: src/mixer/mixer.cc:207
+#: src/mixer/mixer.cc:260
 msgid "Output channels:"
-msgstr "Kanaler for lydudgang:"
+msgstr "Udgangskanaler:"
 
 #: src/mms/mms.cc:35
 msgid "MMS Plugin"
@@ -2391,168 +2610,176 @@
 msgid "Error connecting to MMS server"
 msgstr "Der opstod en fejl under forbindelse til MMS-server"
 
-#: src/modplug/modplugbmp.h:53
+#: src/modplug/modplugbmp.h:57
 msgid "ModPlug (Module Player)"
 msgstr "ModPlug (Module-afspiller)"
 
-#: src/modplug/plugin_main.cc:53
-msgid "Resolution"
-msgstr "Opløsning"
-
-#: src/modplug/plugin_main.cc:54
-msgid "8-bit"
-msgstr "8-bit"
-
 #: src/modplug/plugin_main.cc:55
-msgid "16-bit"
-msgstr "16-bit"
-
-#: src/modplug/plugin_main.cc:56
 msgid "Channels"
 msgstr "Kanaler"
 
-#: src/modplug/plugin_main.cc:60
+#: src/modplug/plugin_main.cc:59
 msgid "Nearest (fastest)"
 msgstr "Nærmeste (hurtigste)"
 
-#: src/modplug/plugin_main.cc:61
+#: src/modplug/plugin_main.cc:60
 msgid "Linear (fast)"
 msgstr "Lineær (hurtig)"
 
-#: src/modplug/plugin_main.cc:62
+#: src/modplug/plugin_main.cc:61
 msgid "Spline (good)"
-msgstr ""
+msgstr "Spline (god)"
 
-#: src/modplug/plugin_main.cc:63
+#: src/modplug/plugin_main.cc:62
 msgid "Polyphase (best)"
-msgstr ""
+msgstr "Polyphase (bedste)"
 
-#: src/modplug/plugin_main.cc:64
+#: src/modplug/plugin_main.cc:63
 msgid "Sample rate"
-msgstr ""
+msgstr "Samplefrekvens"
 
-#: src/modplug/plugin_main.cc:65
+#: src/modplug/plugin_main.cc:64
 msgid "22 kHz"
 msgstr "22 kHz"
 
-#: src/modplug/plugin_main.cc:66
+#: src/modplug/plugin_main.cc:65
 msgid "44 kHz"
 msgstr "44 kHz"
 
-#: src/modplug/plugin_main.cc:67
+#: src/modplug/plugin_main.cc:66
 msgid "48 kHz"
 msgstr "48 kHz"
 
-#: src/modplug/plugin_main.cc:68
+#: src/modplug/plugin_main.cc:67
 msgid "96 kHz"
 msgstr "96 kHz"
 
-#: src/modplug/plugin_main.cc:72 src/modplug/plugin_main.cc:77
-#: src/modplug/plugin_main.cc:82
+#: src/modplug/plugin_main.cc:71 src/modplug/plugin_main.cc:76
+#: src/modplug/plugin_main.cc:81
 msgid "Level:"
 msgstr "Niveau:"
 
-#: src/modplug/plugin_main.cc:78
+#: src/modplug/plugin_main.cc:77
 msgid "Cutoff:"
-msgstr ""
+msgstr "Cutoff:"
 
-#: src/modplug/plugin_main.cc:91
+#: src/modplug/plugin_main.cc:90
 msgid "Reverb"
 msgstr "Ekko"
 
-#: src/modplug/plugin_main.cc:94
+#: src/modplug/plugin_main.cc:93
 msgid "Bass Boost"
-msgstr ""
+msgstr "Bass-boost"
 
-#: src/modplug/plugin_main.cc:97
+#: src/modplug/plugin_main.cc:96
 msgid "Surround"
 msgstr "Surround"
 
-#: src/modplug/plugin_main.cc:100
+#: src/modplug/plugin_main.cc:99
 msgid "Preamp"
-msgstr ""
+msgstr "Preamp"
 
-#: src/modplug/plugin_main.cc:107
+#: src/modplug/plugin_main.cc:106
 msgid "Oversample"
-msgstr ""
+msgstr "Oversample"
 
-#: src/modplug/plugin_main.cc:108
+#: src/modplug/plugin_main.cc:107
 msgid "Noise reduction"
 msgstr "Støjreduktion"
 
-#: src/modplug/plugin_main.cc:109
+#: src/modplug/plugin_main.cc:108
 msgid "Play Amiga MODs"
 msgstr "Afspil Amiga MOD'er"
 
-#: src/modplug/plugin_main.cc:110
+#: src/modplug/plugin_main.cc:109
 msgid "Repeat"
 msgstr "Gentag"
 
-#: src/modplug/plugin_main.cc:111
+#: src/modplug/plugin_main.cc:110
 msgid "Repeat count:"
 msgstr "Antal gentagelser:"
 
-#: src/modplug/plugin_main.cc:112
+#: src/modplug/plugin_main.cc:111
 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.cc:125 src/sid/xs_config.cc:106
+#: src/modplug/plugin_main.cc:124 src/sid/xs_config.cc:106
 msgid "These settings will take effect when Audacious is restarted."
-msgstr "Disse indstillinger vil træde i kraft når Audacious bliver genstartet"
+msgstr "Disse indstillinger vil træde i kraft når Audacious bliver genstartet."
+
+#: src/moonstone/main_window.cc:72 src/moonstone/main_window.cc:73
+#: src/qtui/main_window.cc:159 src/qtui/main_window.cc:160
+#: src/skins/menus.cc:107 src/skins-qt/menus.cc:98
+msgid "Stop After This Song"
+msgstr "Stop efter denne sang"
+
+#: src/moonstone/moonstone.cc:39
+msgid "Moonstone"
+msgstr "Månesten"
+
+#: src/moonstone/playlist_header.cc:212 src/qtui/playlist_header.cc:258
+msgid "Reset to Defaults"
+msgstr "Nulstil til standarder"
+
+#: src/moonstone/playlist_model.cc:38 src/qtui/playlist_header.cc:232
+msgid "Now Playing"
+msgstr "Afspiller nu"
+
+#: src/moonstone/playlist_selection.cc:66
+#: src/playlist-manager/playlist-manager.cc:201
+#: src/playlist-manager-qt/playlist-manager-qt.cc:190
+msgid "Entries"
+msgstr "Poster"
 
 #: src/mpg123/mpg123.cc:54
 msgid "MPG123 Plugin"
 msgstr "MPG123-udvidelsesmodul"
 
-#: src/mpg123/mpg123.cc:83
-msgid "Advanced"
-msgstr "Avanceret"
-
-#: src/mpg123/mpg123.cc:84
+#: src/mpg123/mpg123.cc:82
 msgid "Use accurate length calculation (slow)"
 msgstr "Brug præcis længdeberegning (langsom)"
 
-#: src/mpg123/mpg123.cc:248
+#: src/mpg123/mpg123.cc:260
 msgid "Surround"
 msgstr "Surround"
 
-#: src/mpris2/plugin.cc:39
+#: src/mpris2/plugin.cc:40
 msgid "MPRIS 2 Server"
 msgstr "MPRIS 2-server"
 
-#: src/neon/neon.cc:97
+#: src/neon/neon.cc:102
 msgid "Neon HTTP/HTTPS Plugin"
 msgstr "Neon HTTP/HTTPS-udvidelsesmodul"
 
-#: src/neon/neon.cc:521
+#: src/neon/neon.cc:526
 msgid "Error parsing redirect"
 msgstr "Der opstod en fejl ved videresendelse af fortolkning"
 
-#: src/neon/neon.cc:535
+#: src/neon/neon.cc:540
 msgid "Unknown HTTP error"
 msgstr "Ukendt HTTP-fejl"
 
-#: src/neon/neon.cc:569
+#: src/neon/neon.cc:614
 msgid "Error parsing URL"
-msgstr "Der opstod en fejl ved fortolkning af adresse"
+msgstr "Der opstod en fejl ved fortolkning af URL"
 
-#: src/neon/neon.cc:632
+#: src/neon/neon.cc:687
 msgid "Too many redirects"
 msgstr "For mange videresendelser"
 
-#: src/notify/event.cc:64
+#: src/notify/event.cc:97
 msgid "Stopped"
 msgstr "Stoppet"
 
-#: src/notify/event.cc:64
+#: src/notify/event.cc:97
 msgid "Audacious is not playing."
 msgstr "Audacious afspiller ikke."
 
-#: src/notify/notify.cc:42
+#: src/notify/notify.cc:39
 msgid "Desktop Notifications"
-msgstr "Skrivebordspåmindelser"
+msgstr "Skrivebordsunderretninger"
 
-#: src/notify/notify.cc:60
+#: src/notify/notify.cc:57
 msgid ""
 "Desktop Notifications Plugin for Audacious\n"
 "Copyright (C) 2010 Maximilian Bogner\n"
@@ -2571,37 +2798,96 @@
 "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 ""
+"Skrivebordsunderretninger-udvidelsesmodul til Audacious\n"
+"Ophavsret (C) 2010 Maximilian Bogner\n"
+"Ophavsret (C) 2011-2013 John Lindgren og Jean-Alexandre Anglès d'Auriac\n"
+"\n"
+"Dette udvidelsesmodul er fri software: du kan videredistribuere det og/eller "
+"modificere det under vilkårene i GNU General Public License som udgivet af "
+"Free Software Foundation, enten version 3 af Licensen, eller (efter eget "
+"valg) enhver senere version.\n"
+"\n"
+"Udvidelsesmodulet er distribueret i håbet om at det vil være nyttigt, men "
+"UDEN NOGEN GARANTI; uden selv den underforstået garanti vedrørende "
+"SALGBARHED eller EGNETHED TIL ET BESTEMT FORMÅL. Se GNU General Public "
+"License for flere detaljer.\n"
+"\n"
+"Du skulle have modtaget en kopi af GNU General Public License sammen med "
+"dette program. Hvis ikke, se <http://www.gnu.org/licenses/>."
 
-#: src/notify/notify.cc:110
+#: src/notify/notify.cc:104
 msgid "Show playback controls"
 msgstr "Vis afspilningskontroller"
 
-#: src/notify/notify.cc:112
+#: src/notify/notify.cc:106
 msgid "Always show notification"
-msgstr "Vis altid påmindelse"
+msgstr "Vis altid underretning"
 
-#: src/notify/notify.cc:114
+#: src/notify/notify.cc:108
 msgid "Include album name in notification"
-msgstr "Inkluder albumnavn i påmindelse"
+msgstr "Inkluder albumnavn i underretning"
+
+#: src/notify/notify.cc:110
+msgid "Custom notification duration:"
+msgstr "Tilpasset påmindelsesvarighed"
 
-#: src/notify/osd.cc:58
+#: src/notify/osd.cc:74
 msgid "Show"
 msgstr "Vis"
 
-#: src/notify/osd.cc:66 src/qtui/main_window.cc:178
-#: src/qtui/main_window.cc:179 src/skins/menus.cc:88
-msgid "Pause"
-msgstr "Pause"
+#: src/openmpt/mpt.cc:50
+msgid "OpenMPT (Module Player)"
+msgstr "OpenMPT (modulafspiller)"
 
-#: src/notify/osd.cc:73 src/qtui/main_window.cc:72 src/skins/menus.cc:91
-msgid "Next"
-msgstr "Næste"
+#: src/openmpt/mpt.cc:132
+msgid ""
+"Module player based on libopenmpt\n"
+"\n"
+"Written by: Chris Spiegel <cspiegel@gmail.com>"
+msgstr ""
+"Modulafspiller baseret på libopenmpt\n"
+"\n"
+"Skrevet af: Chris Spiegel <cspiegel@gmail.com>"
 
-#: src/oss4/oss.h:93
+#: src/openmpt/mpt.cc:151
+msgid "Stereo separation:"
+msgstr "Stereoadskillelse:"
+
+#: src/openmpt/mpt.cc:153
+msgid "% (0=mono, 100=default, 200=full)"
+msgstr ""
+
+#: src/openmpt/mpt.cc:157
+msgid "Interpolation:"
+msgstr "Interpolation:"
+
+#: src/openmpt/mptwrap.h:51 src/soxr/sox-resampler.cc:189 src/xsf/plugin.cc:437
+msgid "Linear"
+msgstr "Linær"
+
+#: src/openmpt/mptwrap.h:52
+msgid "Cubic"
+msgstr "Kubisk"
+
+#: src/openmpt/mptwrap.h:53
+msgid "Windowed sinc"
+msgstr "Vinduesvindue"
+
+#: src/opus/opus.cc:39
+msgid "Opus Decoder"
+msgstr ""
+
+#: src/opus/opus.cc:336
+msgid ""
+"Opus Decoder Plugin for Audacious\n"
+"Copyright 2022 Thomas Lange"
+msgstr ""
+
+#: src/oss4/oss.h:70
 msgid "OSS4 Output"
-msgstr "OSS4-lydkanal"
+msgstr "OSS4-udgang"
 
-#: src/oss4/oss.h:95
+#: src/oss4/oss.h:72
 msgid "OSS3 Output"
 msgstr "OSS3-udgang"
 
@@ -2609,27 +2895,27 @@
 msgid "Default device"
 msgstr "Standardenhed"
 
-#: src/oss4/plugin.cc:77
+#: src/oss4/plugin.cc:78
 msgid "Audio device:"
 msgstr "Lydenhed:"
 
-#: src/oss4/plugin.cc:80
+#: src/oss4/plugin.cc:81
 msgid "Use alternate device:"
 msgstr "Brug anden enhed:"
 
-#: src/oss4/plugin.cc:84
+#: src/oss4/plugin.cc:85
 msgid "Save volume between sessions."
 msgstr "Gem lydstyrke mellem sessioner."
 
-#: src/oss4/plugin.cc:86
+#: src/oss4/plugin.cc:87
 msgid "Enable format conversions made by the OSS software."
-msgstr "Aktiver formatkonvertering lavet af OSS-programmer."
+msgstr "Aktivér formatkonvertering lavet af OSS-programmer."
 
-#: src/oss4/plugin.cc:88
+#: src/oss4/plugin.cc:89
 msgid "Enable exclusive mode to prevent virtual mixing."
-msgstr "Aktiver eksklusiv tilstand for at forhindre virtuel blanding."
+msgstr "Aktivér eksklusiv tilstand for at forhindre virtuel blanding."
 
-#: src/oss4/plugin.cc:100
+#: src/oss4/plugin.cc:101
 msgid ""
 "OSS4 Output Plugin for Audacious\n"
 "Copyright 2010-2012 Michał Lipski\n"
@@ -2637,25 +2923,41 @@
 "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"
+"OSS4-output-udvidelsesmodul til Audacious\n"
 "Ophavsret 2010-2012 Michał Lipski\n"
 "\n"
 "Jeg vil gerne takke folk på #audacious, specielt Tony Vroon og John Lindgren "
 "og selvfølgelig forfatterne af det tidligere OSS-udvidelsesmodul."
 
-#: src/playlist-manager/playlist-manager.cc:37
-msgid "Playlist Manager"
-msgstr "Afspilningshåndtering"
+#: src/pipewire/pipewire.cc:44
+msgid "PipeWire Output"
+msgstr ""
 
-#: src/playlist-manager/playlist-manager.cc:226
-msgid "Entries"
-msgstr "Poster"
+#: src/pipewire/pipewire.cc:118
+msgid ""
+"PipeWire Output Plugin for Audacious\n"
+"Copyright 2022 Thomas Lange\n"
+"\n"
+"Based on the PipeWire Output Plugin for Qmmp\n"
+"Copyright 2021 Ilya Kotov"
+msgstr ""
+
+#: src/pipewire/pipewire.cc:408 src/skins/menus.cc:88 src/skins-qt/menus.cc:79
+msgid "Playback"
+msgstr "Afspilning"
+
+#: src/playlist-manager/playlist-manager.cc:38
+#: src/playlist-manager-qt/playlist-manager-qt.cc:42
+msgid "Playlist Manager"
+msgstr "Håndtering af afspilningsliste"
 
-#: src/playlist-manager/playlist-manager.cc:245
+#: src/playlist-manager/playlist-manager.cc:221
+#: src/playlist-manager-qt/playlist-manager-qt.cc:356
 msgid "_Remove"
 msgstr "_Fjern"
 
-#: src/playlist-manager/playlist-manager.cc:246
+#: src/playlist-manager/playlist-manager.cc:222
+#: src/playlist-manager-qt/playlist-manager-qt.cc:351
 msgid "Ren_ame"
 msgstr "_Omdøb"
 
@@ -2663,55 +2965,69 @@
 msgid "PLS Playlists"
 msgstr "PLS-afspilningslister"
 
-#: src/psf/plugin.cc:45
+#: src/psf/plugin.cc:53
 msgid "OpenPSF PSF1/PSF2 Decoder"
 msgstr "OpenPSF PSF1/PSF2-afkoder"
 
-#: src/pulse_audio/pulse_audio.cc:38
+#: src/psf/plugin.cc:270
+msgid "OpenPSF Configuration"
+msgstr "OpenPSF-konfiguration"
+
+#: src/psf/plugin.cc:271 src/xsf/plugin.cc:444
+msgid "Ignore length from file"
+msgstr "Ignorer længde fra fil"
+
+#: src/pulse/pulse_audio.cc:42
 msgid "PulseAudio Output"
-msgstr "PulseAudio-lydkanal"
+msgstr "PulseAudio-udgang"
 
-#: src/pulse_audio/pulse_audio.cc:611
+#: src/pulse/pulse_audio.cc:84
+msgid "Context name:"
+msgstr "Kontekstnavn:"
+
+#: src/pulse/pulse_audio.cc:86
+msgid "Stream name:"
+msgstr "Udsendelsesnavn:"
+
+#: src/pulse/pulse_audio.cc:596
 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."
+"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 ""
-"Audacious PulseAudio Output Plugin\n"
+"Audacious PulseAudio-output-udvidelsesmodul\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."
+"Dette program er fri software; du kan videredistribuere det og/eller "
+"modificere det under vilkårene i GNU General Public License som udgivet af "
+"Free Software Foundation; enten version 2 af Licensen, eller (efter eget "
+"valg) enhver senere version.\n"
+"\n"
+"Dette program er distribueret i håbet om at det vil være nyttigt, men UDEN "
+"NOGEN GARANTI; uden selv den underforstået garanti vedrørende SALGBARHED "
+"eller EGNETHED TIL ET BESTEMT FORMÅL. Se GNU General Public License for "
+"flere detaljer.\n"
+"\n"
+"Du skulle have modtaget en kopi af GNU General Public License sammen med "
+"dette program. Hvis ikke, skriv til Free Software Foundation, Inc., 51 "
+"Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 
-#: src/qtaudio/qtaudio.cc:49
+#: src/qtaudio/qtaudio.cc:53
 msgid "QtMultimedia Output"
 msgstr "QtMultimedia-udgang"
 
-#: src/qtaudio/qtaudio.cc:77
+#: src/qtaudio/qtaudio.cc:84
 msgid ""
 "QtMultimedia Audio Output Plugin for Audacious\n"
 "Copyright 2014 William Pitcock\n"
@@ -2719,65 +3035,125 @@
 "Based on SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
 msgstr ""
-"QtMultimedia Audio Output Plugin for Audacious\n"
+"QtMultimedia-lydoutput-udvidelsesmodul til Audacious\n"
 "Ophavsret 2014 William Pitcock\n"
 "\n"
-"Baseret på SDL Output Plugin for Audacious\n"
+"Baseret på SDL-output-udvidelsesmodul til Audacious\n"
 "Ophavsret 2010 John Lindgren"
 
-#: src/qtui/dialog_windows.cc:31
-msgid "Working ..."
-msgstr "Arbejder ..."
+#: src/qtglspectrum/gl-spectrum.cc:41
+msgid ""
+"OpenGL Spectrum Analyzer for Audacious\n"
+"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
+"Copyright 2014, 2020 Ariadne Conill\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é, John Lindgren, and Carlo Bramini\n"
+"Ophavsret 2014, 2020 Ariadne Conill\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/qtui/filter_input.cc:44 src/skins/ui_playlist.cc:221
-msgid "Search"
-msgstr "Søg"
+#: src/qthotkey/gui.cc:177
+msgid "Press a key combination inside a text field."
+msgstr "Tryk på en tastekombination i et tekstfelt."
 
-#: src/qtui/main_window_actions.cc:94
-msgid "_Open Folder ..."
+#: src/qthotkey/plugin.cc:105
+msgid ""
+"Global Hotkey Plugin\n"
+"Control the player with global key combinations or multimedia keys.\n"
+"\n"
+"Copyright (C) 2020 i.Dark_Templar <darktemplar@dark-templar-archives.net>\n"
+"Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n"
+"\n"
+"Contributors 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 Plugin\n"
+"Kontroller afspilleren med genvejstaster eller multiemedietaster.\n"
+"\n"
+"Ophavsret 2020 i.Dark_Templar <darktemplar@dark-templar-archives.net>\n"
+"Ophavsret 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n"
+"\n"
+"Bidragsydere:\n"
+"Ophavsret 2006-2007 Vladimir Paskov <vlado.paskov@gmail.com>\n"
+"Ophavsret 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/qtui/main_window_actions.cc:96
+#: src/qtui/menus.cc:109
+msgid "_Open Folder ..."
+msgstr "_Åbn mappe ..."
+
+#: src/qtui/menus.cc:115
 msgid "_Add Folder ..."
-msgstr ""
+msgstr "_Tilføj mappe ..."
 
-#: src/qtui/main_window_actions.cc:101
+#: src/qtui/menus.cc:128
 msgid "_Log Inspector ..."
 msgstr "_Loginspektør ..."
 
-#: src/qtui/main_window.cc:64
-msgid "Open Files"
-msgstr "Åbn filer"
+#: src/qtui/menus.cc:220
+msgid "_Find ..."
+msgstr "_Find ..."
 
-#: src/qtui/main_window.cc:66
-msgid "Add Files"
-msgstr "Tilføj filer"
+#: src/qtui/menus.cc:256 src/skins/menus.cc:80 src/skins-qt/menus.cc:70
+msgid "Audio Settings ..."
+msgstr "Lydindstillinger ..."
 
-#: src/qtui/main_window.cc:71 src/skins/menus.cc:90
-msgid "Previous"
-msgstr "Forrige"
+#: src/qtui/playlist_model.cc:188
+msgid "Q#"
+msgstr "Q#"
 
-#: src/qtui/main_window.cc:77 src/skins/menus.cc:82
-msgid "Repeat"
-msgstr "Gentag"
+#: src/qtui/playlist_model.cc:190
+msgid "T#"
+msgstr "T#"
 
-#: src/qtui/main_window.cc:79 src/skins/menus.cc:83
-msgid "Shuffle"
-msgstr "Bland"
+#: src/qtui/playlist_model.cc:192
+msgid "C#"
+msgstr ""
+
+#: src/qtui/playlist_model.cc:194
+msgid "D#"
+msgstr ""
 
-#: src/qtui/qtui.cc:42
+#: src/qtui/qtui.cc:40
 msgid "Qt Interface"
 msgstr "Qt-grænseflade"
 
+#: src/qtui/search_bar.cc:46
+msgid "Search playlist"
+msgstr "Søg i afspilningsliste"
+
+#: src/qtui/settings.cc:79
+msgid "Use bold font for column headers"
+msgstr "Brug fed skrifttype for kolonneoverskrifter"
+
 #: src/resample/resample.cc:43
 msgid "Sample Rate Converter"
-msgstr ""
+msgstr "Samplefrekvenskonverter"
 
 #: src/resample/resample.cc:183
 msgid ""
 "Sample Rate Converter Plugin for Audacious\n"
 "Copyright 2010-2012 John Lindgren"
 msgstr ""
+"Samplefrekvenskonverter-udvidelsesmodul til Audacious\n"
+"Ophavsret 2010-2012 John Lindgren"
 
 #: src/resample/resample.cc:187
 msgid "Skip/repeat samples"
@@ -2807,17 +3183,17 @@
 msgid "Method:"
 msgstr "Metode:"
 
-#: src/resample/resample.cc:199 src/sox-resampler/sox-resampler.cc:161
+#: src/resample/resample.cc:199 src/soxr/sox-resampler.cc:203
 msgid "Rate:"
-msgstr "Hastighed:"
+msgstr "Frekvens:"
 
 #: src/resample/resample.cc:202
 msgid "Rate Mappings"
-msgstr "Hastighedsoversættelser"
+msgstr "Frekvensoversættelser"
 
 #: src/resample/resample.cc:203
 msgid "Use rate mappings"
-msgstr "Brug hastighedsoversættelser"
+msgstr "Brug frekvensoversættelser"
 
 #: src/resample/resample.cc:205
 msgid "8 kHz:"
@@ -2829,7 +3205,7 @@
 
 #: src/resample/resample.cc:213
 msgid "22.05 kHz:"
-msgstr "22.05 kHz:"
+msgstr "22,05 kHz:"
 
 #: src/resample/resample.cc:217
 msgid "32.0 kHz:"
@@ -2837,7 +3213,7 @@
 
 #: src/resample/resample.cc:221
 msgid "44.1 kHz:"
-msgstr "44.1 kHz:"
+msgstr "44,1 kHz:"
 
 #: src/resample/resample.cc:225
 msgid "48 kHz:"
@@ -2859,61 +3235,53 @@
 msgid "192 kHz:"
 msgstr "192 kHz:"
 
-#: src/scrobbler2/config_window.cc:41
-#, c-format
-msgid "OK. Scrobbling for user: %s"
-msgstr ""
-
-#: src/scrobbler2/config_window.cc:54
-msgid "Permission Denied"
-msgstr "Tilladelse nægtet"
-
-#: src/scrobbler2/config_window.cc:56
-msgid "Access the following link to allow Audacious to scrobble your plays:"
-msgstr ""
-
-#: src/scrobbler2/config_window.cc:66
-msgid "Keep this window open and click 'Check Permission' again.\n"
-msgstr "Hold dette vindue åben og klik så på »Kontroller rettighed« igen.\n"
+#: src/scrobbler2/config_window.cc:29
+msgid "Checking Last.fm access ..."
+msgstr "Tjekker adgang til Last.fm ..."
 
-#: src/scrobbler2/config_window.cc:69 src/scrobbler2/config_window.cc:80
+#: src/scrobbler2/config_window.cc:35
 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."
+"Your scrobbles are being saved on your computer temporarily. They will be "
+"submitted as soon as Audacious is allowed access."
 msgstr ""
+"Dine scrobbler gemmes midlertidigt på din computer. De vil blive indsendt så "
+"snart Audacious har fået adgang."
 
-#: src/scrobbler2/config_window.cc:77
-msgid "Network Problem."
-msgstr "Netværksproblem."
+#: src/scrobbler2/config_window.cc:41
+#, c-format
+msgid "Permission granted. Scrobbling for user %s."
+msgstr "Tilladelse givet. Scrobbling til bruger %s."
 
-#: src/scrobbler2/config_window.cc:78
-msgid "There was a problem contacting Last.fm. Please try again later."
+#: src/scrobbler2/config_window.cc:44
+msgid ""
+"Permission denied. Open the following URL in a browser, allow Audacious "
+"access to your account, and then click 'Check Permission' again:"
 msgstr ""
-"Der opstod et problem under forsøget på at kontakte Last.fm. Prøv igen "
-"senere."
+"Tilladelse nægtet. Åbn følgende URL i en browser, giv Audacious adgang til "
+"din konto og klik så på 'Tjek tilladelse' igen:"
 
-#: src/scrobbler2/config_window.cc:110
-msgid "Checking..."
-msgstr "Kontrollerer ..."
+#: src/scrobbler2/config_window.cc:53
+msgid "There was a problem contacting Last.fm."
+msgstr "Der opstod et problem ved forsøg på at kontakte Last.fm."
 
-#: src/scrobbler2/config_window.cc:176
-msgid "C_heck Permission"
-msgstr "_Kontroller rettighed"
+#: src/scrobbler2/config_window.cc:92
+msgid "Check Permission"
+msgstr "Tjek tilladelse"
 
-#: src/scrobbler2/config_window.cc:177
-msgid "_Revoke Permission"
-msgstr "_Tilbagekald rettighed"
+#: src/scrobbler2/config_window.cc:93
+msgid "Revoke Permission"
+msgstr "Tilbagekald tilladelse"
 
-#: src/scrobbler2/config_window.cc:220
-msgid ""
-"You need to allow Audacious to scrobble tracks to your Last.fm account.\n"
+#: src/scrobbler2/config_window.cc:97
+msgid "You need to allow Audacious to scrobble tracks to your Last.fm account."
 msgstr ""
+"Du skal give Audacious tilladelse til at scrobble spor på din Last.fm-konto."
 
 #: src/scrobbler2/scrobbler.cc:29
 msgid "Scrobbler 2.0"
 msgstr "Scrobbler 2.0"
 
-#: src/scrobbler2/scrobbler.cc:224
+#: src/scrobbler2/scrobbler.cc:200
 msgid ""
 "The Scrobbler plugin could not be started.\n"
 "There might be a problem with your installation."
@@ -2921,117 +3289,110 @@
 "Scrobbler-udvidelsesmodulet kunne ikke startes.\n"
 "Der er måske et problem med din installation."
 
-#: src/scrobbler2/scrobbler.cc:289
+#: src/scrobbler2/scrobbler.cc:245
 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"
+"project."
 msgstr ""
-"Audacious Scrobbler Plugin 2.0 by Pitxyoki,\n"
-"\n"
-"Ophavsret 2012-2013 Luís M. Picciochi Oliveira <Pitxyoki@Gmail.com>\n"
-"\n"
-"Tak til John Lindgren for at give mig en hånd i begyndelsen af dette "
-"projekt.\n"
-"\n"
 
-#: src/scrobbler2/scrobbler_communication.cc:642
-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/sdlout.cc:48
+#: src/sdlout/sdlout.cc:43
 msgid "SDL Output"
-msgstr "SDL-lydkanal"
+msgstr "SDL-udgang"
 
-#: src/sdlout/sdlout.cc:77
+#: src/sdlout/sdlout.cc:72
 msgid ""
 "SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
 msgstr ""
-"SDL Output Plugin for Audacious\n"
+"SDL-output-udvidelsesmodul til Audacious\n"
 "Ophavsret 2010 John Lindgren"
 
-#: src/search-tool/search-tool.cc:116 src/search-tool/search-tool.cc:124
+#: src/search-tool/library.cc:35 src/search-tool/library.cc:46
+#: src/search-tool-qt/library.cc:35 src/search-tool-qt/library.cc:46
 msgid "Library"
 msgstr "Bibliotek"
 
-#: src/search-tool/search-tool.cc:394
-#, c-format
-msgid "%d result"
-msgid_plural "%d results"
-msgstr0 "%d resultat"
-msgstr1 "%d resultater"
-
-#: src/search-tool/search-tool.cc:400
-#, c-format
-msgid "(%d hidden)"
-msgid_plural "(%d hidden)"
-msgstr0 "(%d skjult)"
-msgstr1 "(%d skjulte)"
-
-#: src/search-tool/search-tool.cc:594
+#: src/search-tool-qt/search-model.cc:44 src/search-tool/search-tool.cc:287
 #, c-format
 msgid "%d song"
 msgid_plural "%d songs"
 msgstr0 "%d sang"
 msgstr1 "%d sange"
 
-#: src/search-tool/search-tool.cc:601
+#: src/search-tool-qt/search-model.cc:53 src/search-tool/search-tool.cc:294
 msgid "of this genre"
 msgstr "i denne genre"
 
-#: src/search-tool/search-tool.cc:607
+#: src/search-tool-qt/search-model.h:47 src/search-tool/search-model.h:45
 msgid "on"
 msgstr "på"
 
-#: src/search-tool/search-tool.cc:607
+#: src/search-tool-qt/search-model.h:47 src/search-tool/search-model.h:45
 msgid "by"
 msgstr "af"
 
-#: src/search-tool/search-tool.cc:643
-msgid "_Create Playlist"
-msgstr "_Opret afspilningsliste"
-
-#: src/search-tool/search-tool.cc:645
-msgid "_Add to Playlist"
-msgstr "_Tilføj til afspilningsliste"
-
-#: src/search-tool/search-tool.cc:684
-msgid "Search library"
-msgstr "Søg bibliotek"
+#: src/search-tool-qt/search-tool-qt.cc:165 src/search-tool/search-tool.cc:74
+msgid "Number of results to show:"
+msgstr "Antal resultater som skal vises:"
+
+#: src/search-tool-qt/search-tool-qt.cc:168 src/search-tool/search-tool.cc:77
+msgid "Rescan library at startup"
+msgstr "Skan bibliotek igen ved opstart"
+
+#: src/search-tool-qt/search-tool-qt.cc:170
+msgid "Monitor library for changes"
+msgstr "Overvågningsbibliotek for ændringer"
 
-#: src/search-tool/search-tool.cc:688
+#: src/search-tool-qt/search-tool-qt.cc:193 src/search-tool/search-tool.cc:450
 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«."
+"så klikke på »Opdater«-ikonet."
 
-#: src/search-tool/search-tool.cc:696
+#: src/search-tool-qt/search-tool-qt.cc:195 src/search-tool/search-tool.cc:459
 msgid "Please wait ..."
 msgstr "Vent venligst ..."
 
-#: src/search-tool/search-tool.cc:723
+#: src/search-tool-qt/search-tool-qt.cc:197 src/search-tool/search-tool.cc:487
 msgid "Choose Folder"
 msgstr "Vælg mappe"
 
+#: src/search-tool-qt/search-tool-qt.cc:201 src/search-tool/search-tool.cc:445
+msgid "Search library"
+msgstr "Søg i bibliotek"
+
+#: src/search-tool-qt/search-tool-qt.cc:327 src/search-tool/search-tool.cc:156
+#, c-format
+msgid "%d of %d result shown"
+msgid_plural "%d of %d results shown"
+msgstr0 "%d af %d resultat vist"
+msgstr1 "%d af %d resultater vist"
+
+#: src/search-tool-qt/search-tool-qt.cc:331 src/search-tool/search-tool.cc:160
+#, c-format
+msgid "%d result"
+msgid_plural "%d results"
+msgstr0 "%d resultat"
+msgstr1 "%d resultater"
+
+#: src/search-tool-qt/search-tool-qt.cc:501 src/search-tool/search-tool.cc:341
+msgid "_Create Playlist"
+msgstr "_Opret afspilningsliste"
+
+#: src/search-tool-qt/search-tool-qt.cc:503 src/search-tool/search-tool.cc:343
+msgid "_Add to Playlist"
+msgstr "_Tilføj til afspilningsliste"
+
 #: src/sid/xmms-sid.cc:43
 msgid "SID Player"
 msgstr "SID-afspiller"
 
-#: src/sid/xs_config.cc:61
-msgid "Output"
-msgstr "Lydudgang"
-
 #: src/sid/xs_config.cc:62
 msgid "Channels:"
 msgstr "Kanaler:"
@@ -3066,7 +3427,7 @@
 
 #: src/sid/xs_config.cc:81
 msgid "Set maximum playback time:"
-msgstr ""
+msgstr "Sæt maksimum afspilningstid:"
 
 #: src/sid/xs_config.cc:87
 msgid "Use only when song length is unknown"
@@ -3078,19 +3439,19 @@
 
 #: src/sid/xs_config.cc:96
 msgid "Subtunes"
-msgstr ""
+msgstr "Subtunes"
 
 #: src/sid/xs_config.cc:97
 msgid "Enable subtunes"
-msgstr ""
+msgstr "Aktivér subtunes"
 
 #: src/sid/xs_config.cc:99
 msgid "Ignore subtunes shorter than:"
-msgstr ""
+msgstr "Ignorer subtunes kortere end:"
 
 #: src/sid/xs_config.cc:105
 msgid "Note"
-msgstr ""
+msgstr "Node"
 
 #: src/silence-removal/silence-removal.cc:39
 msgid "Silence Removal"
@@ -3101,7 +3462,7 @@
 "Silence Removal Plugin for Audacious\n"
 "Copyright 2014 John Lindgren"
 msgstr ""
-"Silence Removal Plugin for Audacious\n"
+"Fjernelse af stilhed-udvidelsesmodul til Audacious\n"
 "Ophavsret 2014 John Lindgren"
 
 #: src/silence-removal/silence-removal.cc:67
@@ -3112,741 +3473,684 @@
 msgid "Threshold:"
 msgstr "Tærskel:"
 
-#: src/silence-removal/silence-removal.cc:70
-msgid "dB"
-msgstr "dB"
+#: src/skins/actions.cc:45 src/skins-qt/actions.cc:43
+msgid "Repeat points cleared."
+msgstr "Gentagelsespunkter ryddet."
+
+#: src/skins/actions.cc:60 src/skins-qt/actions.cc:58
+msgid "Repeat point A set."
+msgstr "Gentagelsespunkt A-sæt."
+
+#: src/skins/actions.cc:65 src/skins-qt/actions.cc:63
+msgid "Repeat point B set."
+msgstr "Gentagelsespunkt B-sæt."
+
+#: src/skins/equalizer.cc:223 src/skins-qt/equalizer.cc:223
+msgid "Preamp"
+msgstr "Preamp"
+
+#: src/skins/equalizer.cc:227 src/skins-qt/equalizer.cc:227
+msgid "31 Hz"
+msgstr "31 Hz"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "63 Hz"
+msgstr "63 Hz"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "125 Hz"
+msgstr "125 Hz"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "250 Hz"
+msgstr "250 Hz"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "500 Hz"
+msgstr "500 Hz"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "1 kHz"
+msgstr "1 kHz"
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "2 kHz"
+msgstr "2 kHz"
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "4 kHz"
+msgstr "4 kHz"
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "8 kHz"
+msgstr "8 kHz"
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "16 kHz"
+msgstr "16 kHz"
+
+#: src/skins/equalizer.cc:270 src/skins-qt/equalizer.cc:270
+msgid "Audacious Equalizer"
+msgstr "Audacious-equalizer"
+
+#: src/skins/main.cc:459 src/skins-qt/main.cc:442
+msgid "Recording on"
+msgstr "Optagelse aktiveret"
+
+#: src/skins/main.cc:461 src/skins-qt/main.cc:444
+msgid "Recording off"
+msgstr "Optagelse deaktiveret"
+
+#: src/skins/main.cc:754 src/skins-qt/main.cc:701
+#, c-format
+msgid "Seek to %d:%-2.2d / %d:%-2.2d"
+msgstr "Søg til %d:%-2.2d / %d:%-2.2d"
+
+#: src/skins/main.cc:771 src/skins-qt/main.cc:718
+#, c-format
+msgid "Volume: %d%%"
+msgstr "Lydstyrke: %d%%"
+
+#: src/skins/main.cc:784 src/skins-qt/main.cc:731
+#, c-format
+msgid "Balance: %d%% left"
+msgstr "Balance: %d%% venstre"
+
+#: src/skins/main.cc:786 src/skins-qt/main.cc:733
+msgid "Balance: center"
+msgstr "Balance: centrum"
+
+#: src/skins/main.cc:788 src/skins-qt/main.cc:735
+#, c-format
+msgid "Balance: %d%% right"
+msgstr "Balance: %d%% højre"
+
+#: src/skins/main.cc:880 src/skins-qt/main.cc:827
+msgid "Options Menu"
+msgstr "Menu for indstillinger"
+
+#: src/skins/main.cc:884 src/skins-qt/main.cc:831
+msgid "Disable 'Always On Top'"
+msgstr "Deakiver »Altid øverst«"
+
+#: src/skins/main.cc:886 src/skins-qt/main.cc:833
+msgid "Enable 'Always On Top'"
+msgstr "Aktivér »Altid øverst«"
+
+#: src/skins/main.cc:889 src/skins-qt/main.cc:836
+msgid "File Info Box"
+msgstr "Filinformationsboks"
+
+#: src/skins/main.cc:892 src/skins/menus.cc:149 src/skins-qt/main.cc:839
+#: src/skins-qt/menus.cc:142
+msgid "Double Size"
+msgstr "Dobbelt størrelse"
+
+#: src/skins/main.cc:895 src/skins-qt/main.cc:842
+msgid "Visualizations"
+msgstr "Visualiseringer"
+
+#: src/skins/menus.cc:74 src/skins-qt/menus.cc:64
+msgid "Volume Up"
+msgstr "Lydstyrke op"
+
+#: src/skins/menus.cc:75 src/skins-qt/menus.cc:65
+msgid "Volume Down"
+msgstr "Lydstyrke ned"
+
+#: src/skins/menus.cc:77 src/skins-qt/menus.cc:67
+msgid "Effects ..."
+msgstr "Effekter ..."
 
-#: src/skins/menus.cc:64
+#: src/skins/menus.cc:84 src/skins-qt/menus.cc:74
 msgid "Open Files ..."
 msgstr "Åbn filer ..."
 
-#: src/skins/menus.cc:65
+#: src/skins/menus.cc:85 src/skins-qt/menus.cc:76
 msgid "Open URL ..."
-msgstr "Åbn adresse ..."
+msgstr "Åbn URL ..."
 
-#: src/skins/menus.cc:66
-msgid "Search Library"
-msgstr "Søg i biblioteket"
-
-#: src/skins/menus.cc:68
-msgid "Playback"
-msgstr "Afspilning"
-
-#: src/skins/menus.cc:69
+#: src/skins/menus.cc:89 src/skins-qt/menus.cc:80
 msgid "Playlist"
 msgstr "Afspilningsliste"
 
-#: src/skins/menus.cc:70
+#: src/skins/menus.cc:90 src/skins-qt/menus.cc:81
+msgid "Output"
+msgstr "Udgang"
+
+#: src/skins/menus.cc:91 src/skins-qt/menus.cc:82
 msgid "View"
 msgstr "Vis"
 
-#: src/skins/menus.cc:72 src/skins/menus.cc:136 src/skins/menus.cc:149
-#: src/skins/menus.cc:214
+#: src/skins/menus.cc:93 src/skins/menus.cc:161 src/skins/menus.cc:174
+#: src/skins/menus.cc:245 src/skins-qt/menus.cc:84 src/skins-qt/menus.cc:156
+#: src/skins-qt/menus.cc:170 src/skins-qt/menus.cc:241
 msgid "Services"
 msgstr "Tjenester"
 
-#: src/skins/menus.cc:74
+#: src/skins/menus.cc:95 src/skins-qt/menus.cc:86
 msgid "About ..."
 msgstr "Om ..."
 
-#: src/skins/menus.cc:75
+#: src/skins/menus.cc:96 src/skins-qt/menus.cc:87
 msgid "Settings ..."
 msgstr "Indstillinger ..."
 
-#: src/skins/menus.cc:76
+#: src/skins/menus.cc:97 src/skins-qt/menus.cc:88
 msgid "Quit"
 msgstr "Afslut"
 
-#: src/skins/menus.cc:80 src/skins/menus.cc:206
+#: src/skins/menus.cc:101 src/skins/menus.cc:235 src/skins-qt/menus.cc:92
+#: src/skins-qt/menus.cc:231
 msgid "Song Info ..."
 msgstr "Sanginformation ..."
 
-#: src/skins/menus.cc:84
-msgid "No Playlist Advance"
-msgstr "Ingen næste afspilningsliste"
+#: src/skins/menus.cc:105 src/skins-qt/menus.cc:96
+msgid "Shuffle by Album"
+msgstr "Bland efter album"
 
-#: src/skins/menus.cc:85
-msgid "Stop After This Song"
-msgstr "Stop efter denne sang"
+#: src/skins/menus.cc:106 src/skins-qt/menus.cc:97
+msgid "No Playlist Advance"
+msgstr "Gå ikke videre i afspilningsliste"
 
-#: src/skins/menus.cc:93
+#: src/skins/menus.cc:117 src/skins-qt/menus.cc:108
 msgid "Set A-B Repeat"
-msgstr ""
+msgstr "Angiv A_B-gentagelse"
 
-#: src/skins/menus.cc:94
+#: src/skins/menus.cc:118 src/skins-qt/menus.cc:109
 msgid "Clear A-B Repeat"
-msgstr ""
+msgstr "Ryd A-B-gentagelse"
 
-#: src/skins/menus.cc:96
+#: src/skins/menus.cc:120 src/skins-qt/menus.cc:111
 msgid "Jump to Song ..."
 msgstr "Gå til sang ..."
 
-#: src/skins/menus.cc:97
+#: src/skins/menus.cc:121 src/skins-qt/menus.cc:113
 msgid "Jump to Time ..."
 msgstr "Gå til tidspunkt ..."
 
-#: src/skins/menus.cc:101
+#: src/skins/menus.cc:125 src/skins-qt/menus.cc:118
 msgid "Play/Resume"
-msgstr ""
+msgstr "Afspil/genoptag"
 
-#: src/skins/menus.cc:103
+#: src/skins/menus.cc:127 src/skins-qt/menus.cc:120
 msgid "New Playlist"
 msgstr "Ny afspilningsliste"
 
-#: src/skins/menus.cc:104
+#: src/skins/menus.cc:128 src/skins-qt/menus.cc:121
 msgid "Rename Playlist ..."
 msgstr "Omdøb afspilningsliste ..."
 
-#: src/skins/menus.cc:105
+#: src/skins/menus.cc:129 src/skins-qt/menus.cc:122
 msgid "Remove Playlist"
 msgstr "Fjern afspilningsliste"
 
-#: src/skins/menus.cc:107
+#: src/skins/menus.cc:131 src/skins-qt/menus.cc:124
 msgid "Previous Playlist"
 msgstr "Forrige afspilningsliste"
 
-#: src/skins/menus.cc:108
+#: src/skins/menus.cc:132 src/skins-qt/menus.cc:125
 msgid "Next Playlist"
 msgstr "Næste afspilningsliste"
 
-#: src/skins/menus.cc:110
+#: src/skins/menus.cc:134 src/skins-qt/menus.cc:127
 msgid "Import Playlist ..."
-msgstr "Importer afspilningsliste ..."
+msgstr "Importér afspilningsliste ..."
 
-#: src/skins/menus.cc:111
+#: src/skins/menus.cc:135 src/skins-qt/menus.cc:128
 msgid "Export Playlist ..."
-msgstr "Eksporter afspilningsliste ..."
+msgstr "Eksportér afspilningsliste ..."
 
-#: src/skins/menus.cc:113
+#: src/skins/menus.cc:137 src/skins-qt/menus.cc:130
 msgid "Playlist Manager ..."
-msgstr "Håndtering af afspilningslister ..."
+msgstr "Håndtering af afspilningsliste ..."
 
-#: src/skins/menus.cc:114
+#: src/skins/menus.cc:138 src/skins-qt/menus.cc:131
 msgid "Queue Manager ..."
-msgstr "Køhåndtering ..."
+msgstr "Håndtering af kø ..."
 
-#: src/skins/menus.cc:116
+#: src/skins/menus.cc:140 src/skins-qt/menus.cc:133
 msgid "Refresh Playlist"
 msgstr "Opdater afspilningsliste"
 
-#: src/skins/menus.cc:120
+#: src/skins/menus.cc:144 src/skins-qt/menus.cc:137
 msgid "Show Playlist Editor"
 msgstr "Vis redigeringsprogram for afspilningslister"
 
-#: src/skins/menus.cc:121
+#: src/skins/menus.cc:145 src/skins-qt/menus.cc:138
 msgid "Show Equalizer"
 msgstr "Vis equalizer"
 
-#: src/skins/menus.cc:123
+#: src/skins/menus.cc:147 src/skins-qt/menus.cc:140
 msgid "Show Remaining Time"
 msgstr "Vis tilbageværende tid"
 
-#: src/skins/menus.cc:125
+#: src/skins/menus.cc:150 src/skins-qt/menus.cc:143
 msgid "Always on Top"
 msgstr "Altid øverst"
 
-#: src/skins/menus.cc:126
+#: src/skins/menus.cc:151 src/skins-qt/menus.cc:145
 msgid "On All Workspaces"
 msgstr "På alle arbejdsrum"
 
-#: src/skins/menus.cc:128
+#: src/skins/menus.cc:153 src/skins-qt/menus.cc:148
 msgid "Roll Up Player"
-msgstr ""
+msgstr "Rul afspiller op"
 
-#: src/skins/menus.cc:129
+#: src/skins/menus.cc:154 src/skins-qt/menus.cc:149
 msgid "Roll Up Playlist Editor"
-msgstr ""
+msgstr "Rul afspilningsliste-redigering op"
 
-#: src/skins/menus.cc:130
+#: src/skins/menus.cc:155 src/skins-qt/menus.cc:150
 msgid "Roll Up Equalizer"
-msgstr ""
+msgstr "Rul equalizer op"
 
-#: src/skins/menus.cc:132 src/skins/ui_main.cc:854
-msgid "Double Size"
-msgstr "Dobbelt størrelse"
-
-#: src/skins/menus.cc:138
+#: src/skins/menus.cc:163 src/skins-qt/menus.cc:158
 msgid "Add URL ..."
-msgstr "Tilføj adresse ..."
+msgstr "Tilføj URL ..."
 
-#: src/skins/menus.cc:139
+#: src/skins/menus.cc:164 src/skins-qt/menus.cc:160
 msgid "Add Files ..."
 msgstr "Tilføj filer ..."
 
-#: src/skins/menus.cc:143 src/skins/menus.cc:171 src/skins/menus.cc:185
+#: src/skins/menus.cc:168 src/skins/menus.cc:196 src/skins/menus.cc:212
+#: src/skins-qt/menus.cc:164 src/skins-qt/menus.cc:192
+#: src/skins-qt/menus.cc:208
 msgid "By Title"
 msgstr "Efter titel"
 
-#: src/skins/menus.cc:144 src/skins/menus.cc:178 src/skins/menus.cc:192
+#: src/skins/menus.cc:169 src/skins/menus.cc:203 src/skins/menus.cc:219
+#: src/skins-qt/menus.cc:165 src/skins-qt/menus.cc:199
+#: src/skins-qt/menus.cc:215
 msgid "By File Name"
-msgstr ""
+msgstr "Efter filnavn"
 
-#: src/skins/menus.cc:145 src/skins/menus.cc:179 src/skins/menus.cc:193
+#: src/skins/menus.cc:170 src/skins/menus.cc:204 src/skins/menus.cc:220
+#: src/skins-qt/menus.cc:166 src/skins-qt/menus.cc:200
+#: src/skins-qt/menus.cc:216
 msgid "By File Path"
 msgstr "Efter filsti"
 
-#: src/skins/menus.cc:151
+#: src/skins/menus.cc:176 src/skins-qt/menus.cc:172
 msgid "Remove All"
 msgstr "Fjern alle"
 
-#: src/skins/menus.cc:152
+#: src/skins/menus.cc:177 src/skins-qt/menus.cc:173
 msgid "Clear Queue"
 msgstr "Ryd kø"
 
-#: src/skins/menus.cc:154
+#: src/skins/menus.cc:179 src/skins-qt/menus.cc:175
 msgid "Remove Unavailable Files"
 msgstr "Fjern utilgængelige filer"
 
-#: src/skins/menus.cc:155
+#: src/skins/menus.cc:180 src/skins-qt/menus.cc:176
 msgid "Remove Duplicates"
-msgstr "Fjern duplikater"
+msgstr "Fjern dubletter"
 
-#: src/skins/menus.cc:157
+#: src/skins/menus.cc:182 src/skins-qt/menus.cc:178
 msgid "Remove Unselected"
 msgstr "Fjern dem som ikke er valgt"
 
-#: src/skins/menus.cc:158
+#: src/skins/menus.cc:183 src/skins-qt/menus.cc:179
 msgid "Remove Selected"
 msgstr "Fjern de valgte"
 
-#: src/skins/menus.cc:162
+#: src/skins/menus.cc:187 src/skins-qt/menus.cc:183
 msgid "Search and Select"
 msgstr "Søg og vælg"
 
-#: src/skins/menus.cc:164
+#: src/skins/menus.cc:189 src/skins-qt/menus.cc:185
 msgid "Invert Selection"
 msgstr "Vend markering om"
 
-#: src/skins/menus.cc:165
+#: src/skins/menus.cc:190 src/skins-qt/menus.cc:186
 msgid "Select None"
 msgstr "Vælg ingen"
 
-#: src/skins/menus.cc:166
+#: src/skins/menus.cc:191 src/skins-qt/menus.cc:187
 msgid "Select All"
 msgstr "Vælg alle"
 
-#: src/skins/menus.cc:170 src/skins/menus.cc:184
+#: src/skins/menus.cc:195 src/skins/menus.cc:211 src/skins-qt/menus.cc:191
+#: src/skins-qt/menus.cc:207
 msgid "By Track Number"
-msgstr "Efter rækkefølge"
+msgstr "Efter spornummer"
 
-#: src/skins/menus.cc:172 src/skins/menus.cc:186
+#: src/skins/menus.cc:197 src/skins/menus.cc:213 src/skins-qt/menus.cc:193
+#: src/skins-qt/menus.cc:209
 msgid "By Artist"
 msgstr "Efter kunstner"
 
-#: src/skins/menus.cc:173 src/skins/menus.cc:187
+#: src/skins/menus.cc:198 src/skins/menus.cc:214 src/skins-qt/menus.cc:194
+#: src/skins-qt/menus.cc:210
 msgid "By Album"
 msgstr "Efter album"
 
-#: src/skins/menus.cc:174 src/skins/menus.cc:188
+#: src/skins/menus.cc:199 src/skins/menus.cc:215 src/skins-qt/menus.cc:195
+#: src/skins-qt/menus.cc:211
 msgid "By Album Artist"
-msgstr "Efter kunster"
+msgstr "Efter kunstner"
 
-#: src/skins/menus.cc:175 src/skins/menus.cc:190
+#: src/skins/menus.cc:200 src/skins/menus.cc:216 src/skins-qt/menus.cc:196
+#: src/skins-qt/menus.cc:212
 msgid "By Release Date"
 msgstr "Efter udgivelsesdato"
 
-#: src/skins/menus.cc:176 src/skins/menus.cc:189
+#: src/skins/menus.cc:201 src/skins/menus.cc:217 src/skins-qt/menus.cc:197
+#: src/skins-qt/menus.cc:213
 msgid "By Genre"
-msgstr ""
+msgstr "Efter genre"
 
-#: src/skins/menus.cc:177 src/skins/menus.cc:191
+#: src/skins/menus.cc:202 src/skins/menus.cc:218 src/skins-qt/menus.cc:198
+#: src/skins-qt/menus.cc:214
 msgid "By Length"
-msgstr ""
+msgstr "Efter længde"
 
-#: src/skins/menus.cc:180 src/skins/menus.cc:194
+#: src/skins/menus.cc:205 src/skins/menus.cc:221 src/skins-qt/menus.cc:201
+#: src/skins-qt/menus.cc:217
 msgid "By Custom Title"
+msgstr "Efter tilpasset titel"
+
+#: src/skins/menus.cc:206 src/skins/menus.cc:222 src/skins-qt/menus.cc:202
+#: src/skins-qt/menus.cc:218
+msgid "By Comment"
+msgstr "Efter kommentar"
+
+#: src/skins/menus.cc:207 src/skins/menus.cc:223 src/skins-qt/menus.cc:203
+#: src/skins-qt/menus.cc:219
+msgid "By Disc Number"
 msgstr ""
 
-#: src/skins/menus.cc:198
+#: src/skins/menus.cc:227 src/skins-qt/menus.cc:223
 msgid "Randomize List"
-msgstr "Sæt listen i vilkårlig rækkefølge"
+msgstr "Sæt listen i tilfældig rækkefølge"
 
-#: src/skins/menus.cc:199
+#: src/skins/menus.cc:228 src/skins-qt/menus.cc:224
 msgid "Reverse List"
 msgstr "Vend listen om"
 
-#: src/skins/menus.cc:201
+#: src/skins/menus.cc:230 src/skins-qt/menus.cc:226
 msgid "Sort Selected"
-msgstr "Sorter valgt"
+msgstr "Sortér valgt"
 
-#: src/skins/menus.cc:202
+#: src/skins/menus.cc:231 src/skins-qt/menus.cc:227
 msgid "Sort List"
-msgstr "Sorter listen"
+msgstr "Sortér listen"
 
-#: src/skins/menus.cc:208
+#: src/skins/menus.cc:236 src/skins-qt/menus.cc:232
+msgid "Open Containing Folder"
+msgstr "Åbn indeholdende mappe"
+
+#: src/skins/menus.cc:238 src/skins-qt/menus.cc:234
 msgid "Cut"
 msgstr "Klip"
 
-#: src/skins/menus.cc:209
+#: src/skins/menus.cc:239 src/skins-qt/menus.cc:235
 msgid "Copy"
-msgstr "Kopier"
+msgstr "Kopiér"
 
-#: src/skins/menus.cc:210
+#: src/skins/menus.cc:240 src/skins-qt/menus.cc:236
 msgid "Paste"
 msgstr "Indsæt"
 
-#: src/skins/menus.cc:212
+#: src/skins/menus.cc:241 src/skins-qt/menus.cc:237
+msgid "Paste at End"
+msgstr "Indsæt ved slutning"
+
+#: src/skins/menus.cc:243 src/skins-qt/menus.cc:239
 msgid "Queue/Unqueue"
 msgstr "Tilføj/fjern fra kø"
 
-#: src/skins/menus.cc:218
-msgid "Load Preset ..."
-msgstr "Indlæs forhåndsindstilling ..."
-
-#: src/skins/menus.cc:219
-msgid "Load Auto Preset ..."
-msgstr "Indlæs autoamtisk forhåndsindstilling ..."
-
-#: src/skins/menus.cc:220
-msgid "Load Default"
-msgstr "Indlæs standard"
-
-#: src/skins/menus.cc:221
-msgid "Load Preset File ..."
-msgstr "Indlæs forhåndsindstillingsfil ..."
-
-#: src/skins/menus.cc:222
-msgid "Load EQF File ..."
-msgstr "Indlæs EQF-fil ..."
-
-#: src/skins/menus.cc:224
-msgid "Save Preset ..."
-msgstr "Gem forhåndsindstilling ..."
-
-#: src/skins/menus.cc:225
-msgid "Save Auto Preset ..."
-msgstr "Gem automatisk forhåndsindstilling ..."
-
-#: src/skins/menus.cc:226
-msgid "Save Default"
-msgstr "Gem standard"
-
-#: src/skins/menus.cc:227
-msgid "Save Preset File ..."
-msgstr "Gem forhåndsindstillingsfil ..."
-
-#: src/skins/menus.cc:228
-msgid "Save EQF File ..."
-msgstr "Gem EQF-fil ..."
-
-#: src/skins/menus.cc:230
-msgid "Delete Preset ..."
-msgstr "Slet forhåndsindstilling ..."
-
-#: src/skins/menus.cc:231
-msgid "Delete Auto Preset ..."
-msgstr "Slet automatisk forhåndsindstilling ..."
-
-#: src/skins/menus.cc:233
-msgid "Import Winamp Presets ..."
-msgstr "Importer WinAMP-forhåndsindstillinger ..."
-
-#: src/skins/menus.cc:235
-msgid "Reset to Zero"
-msgstr "Nulstil til nul"
+#: src/skins/playlist-widget.cc:58 src/skins-qt/playlist-widget.cc:58
+#, c-format
+msgid "%s (%d of %d)"
+msgstr "%s (%d of %d)"
+
+#: src/skins/playlistwin.cc:491 src/skins-qt/playlistwin.cc:478
+msgid "Audacious Playlist Editor"
+msgstr "Redigeringsprogram for Audacious' afspilningslister"
 
-#: src/skins/plugin.cc:48
+#: src/skins/plugin.cc:53 src/skins-qt/plugin.cc:65
 msgid "Winamp Classic Interface"
-msgstr "Winamps klassiske brugerflade"
+msgstr "Winamp klassisk-grænseflade"
 
-#: src/skins/preset-browser.cc:57 src/skins/preset-list.cc:371
-#: src/skins/preset-list.cc:386
-msgid "Save"
-msgstr "Gem"
-
-#: src/skins/preset-browser.cc:57 src/skins/preset-list.cc:338
-#: src/skins/preset-list.cc:354
-msgid "Load"
-msgstr "Indlæs"
-
-#: src/skins/preset-browser.cc:83
-msgid "Load Preset File"
-msgstr "Indlæs forhåndsindstillingsfil"
-
-#: src/skins/preset-browser.cc:100
-msgid "Load EQF File"
-msgstr "Indlæs EQF-fil"
-
-#: src/skins/preset-browser.cc:119
-msgid "Save Preset File"
-msgstr "Gem forhåndsindstillingsfil"
-
-#: src/skins/preset-browser.cc:137
-msgid "Save EQF File"
-msgstr "Gem EQF-fil"
-
-#: src/skins/preset-browser.cc:151
-msgid "Import Winamp Presets"
-msgstr "Importer Winamp-forhåndsindstillinger"
-
-#: src/skins/preset-list.cc:285
-msgid "Presets"
-msgstr "Forhåndsindstillinger"
-
-#: src/skins/preset-list.cc:335
-msgid "Load preset"
-msgstr "Indlæs forhåndsindstilling"
-
-#: src/skins/preset-list.cc:351
-msgid "Load auto-preset"
-msgstr "Indlæs automatisk forhåndsindstilling"
-
-#: src/skins/preset-list.cc:367
-msgid "Save preset"
-msgstr "Gem forhåndsindstilling"
-
-#: src/skins/preset-list.cc:382
-msgid "Save auto-preset"
-msgstr "Gem automatisk forhåndsindstilling"
-
-#: src/skins/preset-list.cc:408
-msgid "Delete preset"
-msgstr "Slet forhåndsindstilling"
-
-#: src/skins/preset-list.cc:424
-msgid "Delete auto-preset"
-msgstr "Slet automatisk forhåndsindstilling"
+#: src/skins-qt/menus.cc:75
+msgid "Open Folder ..."
+msgstr "Åbn mappe ..."
+
+#: src/skins-qt/menus.cc:159
+msgid "Add Folder ..."
+msgstr "Tilføj mappe ..."
+
+#: src/skins-qt/search-select.cc:62 src/skins/search-select.cc:77
+msgid "Search entries in active playlist"
+msgstr "Søg i punkter i aktiv afspilningsliste"
+
+#: src/skins-qt/search-select.cc:70 src/skins/search-select.cc:83
+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-qt/search-select.cc:75 src/skins/search-select.cc:91
+msgid "Title:"
+msgstr "Titel:"
+
+#: src/skins-qt/search-select.cc:79 src/skins/search-select.cc:96
+msgid "Album:"
+msgstr "Album:"
+
+#: src/skins-qt/search-select.cc:82 src/skins/search-select.cc:101
+msgid "Artist:"
+msgstr "Kunstner:"
+
+#: src/skins-qt/search-select.cc:85 src/skins/search-select.cc:106
+msgid "File Name:"
+msgstr "Filnavn:"
+
+#: src/skins-qt/search-select.cc:88 src/skins/search-select.cc:134
+msgid "Clear previous selection before searching"
+msgstr "Ryd forrige valg før søgning"
+
+#: src/skins-qt/search-select.cc:89 src/skins/search-select.cc:137
+msgid "Automatically toggle queue for matching entries"
+msgstr "Skift automatisk kø for matchende punkter"
 
-#: src/skins/skins_cfg.cc:176
+#: src/skins-qt/search-select.cc:90 src/skins/search-select.cc:140
+msgid "Create a new playlist with matching entries"
+msgstr "Opret en ny afspilningsliste med matchende punkter"
+
+#: src/skins-qt/search-select.cc:101 src/skins/search-select.cc:78
+msgid "Search"
+msgstr "Søg"
+
+#: src/skins-qt/skins_cfg.cc:198 src/skins/skins_cfg.cc:182
 msgid "Player:"
 msgstr "Afspiller:"
 
-#: src/skins/skins_cfg.cc:178
+#: src/skins-qt/skins_cfg.cc:200 src/skins/skins_cfg.cc:184
 msgid "Select main player window font:"
 msgstr "Vælg skrifttype for hovedafspillerens vindue:"
 
-#: src/skins/skins_cfg.cc:179
+#: src/skins-qt/skins_cfg.cc:201 src/skins/skins_cfg.cc:185
 msgid "Playlist:"
 msgstr "Afspilningsliste:"
 
-#: src/skins/skins_cfg.cc:181
+#: src/skins-qt/skins_cfg.cc:203 src/skins/skins_cfg.cc:187
 msgid "Select playlist font:"
 msgstr "Vælg skrifttype for afspilningslisten:"
 
-#: src/skins/skins_cfg.cc:187
+#: src/skins-qt/skins_cfg.cc:207 src/skins/skins_cfg.cc:191
 msgid "Skin"
 msgstr "Tema"
 
-#: src/skins/skins_cfg.cc:189
+#: src/skins-qt/skins_cfg.cc:211 src/skins/skins_cfg.cc:193
+msgid "Display active titlebar when any window is focused"
+msgstr ""
+
+#: src/skins-qt/skins_cfg.cc:213 src/skins/skins_cfg.cc:195
 msgid "Fonts"
 msgstr "Skrifttyper"
 
-#: src/skins/skins_cfg.cc:192
+#: src/skins-qt/skins_cfg.cc:215 src/skins/skins_cfg.cc:197
 msgid "Use bitmap fonts (supports ASCII only)"
 msgstr "Brug bitmap-skrifttyper (understøtter kun ASCII)"
 
-#: src/skins/skins_cfg.cc:194
+#: src/skins-qt/skins_cfg.cc:217 src/skins/skins_cfg.cc:199
 msgid "Scroll song title"
 msgstr "Rul igennem sangtitel"
 
-#: src/skins/skins_cfg.cc:196
+#: src/skins-qt/skins_cfg.cc:219 src/skins/skins_cfg.cc:201
 msgid "Scroll song title in both directions"
 msgstr "Rul sangtitel i begge retninger"
 
-#: src/skins/skins_cfg.cc:201
+#: src/skins-qt/skins_cfg.cc:224 src/skins/skins_cfg.cc:206
 msgid "Analyzer"
 msgstr "Analyseprogram"
 
-#: src/skins/skins_cfg.cc:202
+#: src/skins-qt/skins_cfg.cc:225 src/skins/skins_cfg.cc:207
 msgid "Scope"
-msgstr "Omfang"
+msgstr "Skop"
 
-#: src/skins/skins_cfg.cc:203
+#: src/skins-qt/skins_cfg.cc:226 src/skins/skins_cfg.cc:208
 msgid "Voiceprint / VU meter"
-msgstr ""
+msgstr "Stemmeprint/VU-viser"
 
-#: src/skins/skins_cfg.cc:204
+#: src/skins-qt/skins_cfg.cc:227 src/skins/skins_cfg.cc:209
 msgid "Off"
 msgstr "Slukket"
 
-#: src/skins/skins_cfg.cc:208 src/skins/skins_cfg.cc:233
-#: src/skins/skins_cfg.cc:239
+#: src/skins-qt/skins_cfg.cc:231 src/skins-qt/skins_cfg.cc:256
+#: src/skins-qt/skins_cfg.cc:262 src/skins/skins_cfg.cc:213
+#: src/skins/skins_cfg.cc:238 src/skins/skins_cfg.cc:244
 msgid "Normal"
 msgstr "Normal"
 
-#: src/skins/skins_cfg.cc:209 src/skins/skins_cfg.cc:234
+#: src/skins-qt/skins_cfg.cc:232 src/skins-qt/skins_cfg.cc:257
+#: src/skins/skins_cfg.cc:214 src/skins/skins_cfg.cc:239
 msgid "Fire"
 msgstr "Ild"
 
-#: src/skins/skins_cfg.cc:210
+#: src/skins-qt/skins_cfg.cc:233 src/skins/skins_cfg.cc:215
 msgid "Vertical lines"
 msgstr "Lodrette linjer"
 
-#: src/skins/skins_cfg.cc:214
+#: src/skins-qt/skins_cfg.cc:237 src/skins/skins_cfg.cc:219
 msgid "Lines"
 msgstr "Linjer"
 
-#: src/skins/skins_cfg.cc:215
+#: src/skins-qt/skins_cfg.cc:238 src/skins/skins_cfg.cc:220
 msgid "Bars"
 msgstr "Bjælker"
 
-#: src/skins/skins_cfg.cc:219
+#: src/skins-qt/skins_cfg.cc:242 src/skins/skins_cfg.cc:224
 msgid "Slowest"
 msgstr "Langsomst"
 
-#: src/skins/skins_cfg.cc:220
+#: src/skins-qt/skins_cfg.cc:243 src/skins/skins_cfg.cc:225
 msgid "Slow"
 msgstr "Langsom"
 
-#: src/skins/skins_cfg.cc:221 src/sox-resampler/sox-resampler.cc:152
+#: src/skins-qt/skins_cfg.cc:244 src/skins/skins_cfg.cc:226
+#: src/soxr/sox-resampler.cc:180
 msgid "Medium"
 msgstr "Mellem"
 
-#: src/skins/skins_cfg.cc:222
+#: src/skins-qt/skins_cfg.cc:245 src/skins/skins_cfg.cc:227
 msgid "Fast"
 msgstr "Hurtig"
 
-#: src/skins/skins_cfg.cc:223
+#: src/skins-qt/skins_cfg.cc:246 src/skins/skins_cfg.cc:228
 msgid "Fastest"
 msgstr "Hurtigst"
 
-#: src/skins/skins_cfg.cc:227
+#: src/skins-qt/skins_cfg.cc:250 src/skins/skins_cfg.cc:232
 msgid "Dots"
 msgstr "Punktummer"
 
-#: src/skins/skins_cfg.cc:228
+#: src/skins-qt/skins_cfg.cc:251 src/skins/skins_cfg.cc:233
 msgid "Line"
 msgstr "Linje"
 
-#: src/skins/skins_cfg.cc:229
+#: src/skins-qt/skins_cfg.cc:252 src/skins/skins_cfg.cc:234
 msgid "Solid"
 msgstr "Fast"
 
-#: src/skins/skins_cfg.cc:235
+#: src/skins-qt/skins_cfg.cc:258 src/skins/skins_cfg.cc:240
 msgid "Ice"
 msgstr "Is"
 
-#: src/skins/skins_cfg.cc:240
+#: src/skins-qt/skins_cfg.cc:263 src/skins/skins_cfg.cc:245
 msgid "Smooth"
 msgstr "Blød"
 
-#: src/skins/skins_cfg.cc:244
-msgid "Type"
-msgstr "Type"
-
-#: src/skins/skins_cfg.cc:245
-msgid "Visualization type:"
-msgstr "Visualiseringstype:"
-
-#: src/skins/skins_cfg.cc:248
-msgid "Analyzer"
-msgstr "Analyseprogram"
-
-#: src/skins/skins_cfg.cc:249
-msgid "Show peaks"
-msgstr "Vis toppunkter"
-
-#: src/skins/skins_cfg.cc:251
+#: src/skins-qt/skins_cfg.cc:267 src/skins/skins_cfg.cc:249
 msgid "Coloring:"
 msgstr "Farver:"
 
-#: src/skins/skins_cfg.cc:254
+#: src/skins-qt/skins_cfg.cc:270 src/skins/skins_cfg.cc:252
 msgid "Style:"
 msgstr "Stil:"
 
-#: src/skins/skins_cfg.cc:257
+#: src/skins-qt/skins_cfg.cc:273 src/skins/skins_cfg.cc:255
 msgid "Falloff:"
-msgstr ""
+msgstr "Falloff:"
 
-#: src/skins/skins_cfg.cc:260
+#: src/skins-qt/skins_cfg.cc:276 src/skins/skins_cfg.cc:258
 msgid "Peak falloff:"
-msgstr ""
+msgstr "Spidspunkts-falloff:"
 
-#: src/skins/skins_cfg.cc:264
+#: src/skins-qt/skins_cfg.cc:282 src/skins/skins_cfg.cc:264
 msgid "Scope Style:"
-msgstr ""
+msgstr "Skopstil:"
 
-#: src/skins/skins_cfg.cc:267
+#: src/skins-qt/skins_cfg.cc:285 src/skins/skins_cfg.cc:267
 msgid "Voiceprint Coloring:"
-msgstr ""
+msgstr "Farvelægning af stemmeprint:"
 
-#: src/skins/skins_cfg.cc:270
+#: src/skins-qt/skins_cfg.cc:288 src/skins/skins_cfg.cc:270
 msgid "VU Meter Style:"
-msgstr ""
-
-#: src/skins/skins_cfg.cc:276
-msgid "General"
-msgstr "Generelt"
-
-#: src/skins/skins_cfg.cc:277
-msgid "Visualization"
-msgstr "Visualisering"
-
-#: src/skins/ui_equalizer.cc:282
-msgid "Preamp"
-msgstr ""
-
-#: src/skins/ui_equalizer.cc:286
-msgid "31 Hz"
-msgstr "31 Hz"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "63 Hz"
-msgstr "63 Hz"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "125 Hz"
-msgstr "125 Hz"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "250 Hz"
-msgstr "250 Hz"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "500 Hz"
-msgstr "500 Hz"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "1 kHz"
-msgstr "1 kHz"
-
-#: src/skins/ui_equalizer.cc:288
-msgid "2 kHz"
-msgstr "2 kHz"
-
-#: src/skins/ui_equalizer.cc:288
-msgid "4 kHz"
-msgstr "4 kHz"
-
-#: src/skins/ui_equalizer.cc:288
-msgid "8 kHz"
-msgstr "8 kHz"
-
-#: src/skins/ui_equalizer.cc:288
-msgid "16 kHz"
-msgstr "16 kHz"
-
-#: src/skins/ui_equalizer.cc:330
-msgid "Audacious Equalizer"
-msgstr "Audacious-equalizer"
-
-#: src/skins/ui_main.cc:688
-#, 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.cc:709
-#, c-format
-msgid "Volume: %d%%"
-msgstr "Lydstyrke: %d%%"
-
-#: src/skins/ui_main.cc:732
-#, c-format
-msgid "Balance: %d%% left"
-msgstr "Balance: %d%% venstre"
-
-#: src/skins/ui_main.cc:734
-msgid "Balance: center"
-msgstr "Balance: centrum"
-
-#: src/skins/ui_main.cc:736
-#, c-format
-msgid "Balance: %d%% right"
-msgstr "Balance: %d%% højre"
-
-#: src/skins/ui_main.cc:842
-msgid "Options Menu"
-msgstr "Menu for indstillinger"
-
-#: src/skins/ui_main.cc:846
-msgid "Disable 'Always On Top'"
-msgstr "Deakiver »Altid øverst«"
-
-#: src/skins/ui_main.cc:848
-msgid "Enable 'Always On Top'"
-msgstr "Aktiver »Altid øverst«"
-
-#: src/skins/ui_main.cc:851
-msgid "File Info Box"
-msgstr "Filinformationsboks"
-
-#: src/skins/ui_main.cc:857
-msgid "Visualizations"
-msgstr ""
-
-#: src/skins/ui_main.cc:1336
-msgid "Repeat point A set."
-msgstr ""
-
-#: src/skins/ui_main.cc:1341
-msgid "Repeat point B set."
-msgstr ""
-
-#: src/skins/ui_main.cc:1350
-msgid "Repeat points cleared."
-msgstr ""
-
-#: src/skins/ui_playlist.cc:219
-msgid "Search entries in active playlist"
-msgstr "Søg i punkter i aktiv afspilningsliste"
-
-#: src/skins/ui_playlist.cc:226
-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.cc:234
-msgid "Title:"
-msgstr "Titel:"
-
-#: src/skins/ui_playlist.cc:241
-msgid "Album:"
-msgstr "Album:"
-
-#: src/skins/ui_playlist.cc:248
-msgid "Artist:"
-msgstr "Kunstner:"
+msgstr "VU-viserstil:"
 
-#: src/skins/ui_playlist.cc:255
-msgid "File Name:"
-msgstr "Filnavn:"
-
-#: src/skins/ui_playlist.cc:263
-msgid "Clear previous selection before searching"
-msgstr "Ryd forrige valg før søgning"
+#: src/skins-qt/skins_cfg.cc:294 src/skins/skins_cfg.cc:276
+msgid "Type"
+msgstr "Type"
 
-#: src/skins/ui_playlist.cc:266
-msgid "Automatically toggle queue for matching entries"
-msgstr "Skift automatisk kø for matchende punkter"
+#: src/skins-qt/skins_cfg.cc:295 src/skins/skins_cfg.cc:277
+msgid "Visualization type:"
+msgstr "Visualiseringstype:"
 
-#: src/skins/ui_playlist.cc:269
-msgid "Create a new playlist with matching entries"
-msgstr "Opret en ny afspilningsliste med matchende punkter"
+#: src/skins-qt/skins_cfg.cc:298 src/skins/skins_cfg.cc:280
+msgid "Analyzer"
+msgstr "Analyseprogram"
 
-#: src/skins/ui_playlist.cc:717
-msgid "Audacious Playlist Editor"
-msgstr "Redigeringsprogram for Audacious' afspilningslister"
+#: src/skins-qt/skins_cfg.cc:299 src/skins/skins_cfg.cc:281
+msgid "Show peaks"
+msgstr "Vis toppunkter"
 
-#: src/skins/ui_playlist.cc:752
-#, c-format
-msgid "%s (%d of %d)"
-msgstr "%s (%d of %d)"
+#: src/skins-qt/skins_cfg.cc:308 src/skins/skins_cfg.cc:290
+msgid "Visualization"
+msgstr "Visualisering"
 
-#: src/skins/ui_skinselector.cc:167
+#: src/skins-qt/skinselector.cc:98 src/skins/skinselector.cc:111
 msgid "Archived Winamp 2.x skin"
 msgstr "Arkiveret Winamp 2.x-tema"
 
-#: src/skins/ui_skinselector.cc:172
+#: src/skins-qt/skinselector.cc:102 src/skins/skinselector.cc:115
 msgid "Unarchived Winamp 2.x skin"
 msgstr "Winamp 2.x-tema der ikke er i arkiv"
 
-#: src/skins/util.cc:430
-#, c-format
-msgid "Could not create directory (%s): %s\n"
-msgstr "Kunne ikke oprette mappe (%s): %s\n"
-
-#: src/sndfile/plugin.cc:39
+#: src/sndfile/plugin.cc:38
 msgid "Sndfile Plugin"
 msgstr "Sndfile-udvidelsesmodul"
 
-#: src/sndfile/plugin.cc:336
+#: src/sndfile/plugin.cc:372
 msgid ""
 "Based on the xmms_sndfile plugin:\n"
 "Copyright (C) 2000, 2002 Erik de Castro Lopo\n"
@@ -3867,96 +4171,131 @@
 "this program; if not, write to the Free Software Foundation, Inc., 51 "
 "Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 msgstr ""
+"Baseret på xmms_sndfile-udvidelsesmodulet:\n"
+"Ophavsret (C) 2000, 2002 Erik de Castro Lopo\n"
+"\n"
+"Tilpasset Audacious af Tony Vroon <chainsaw@gentoo.org>\n"
+"\n"
+"Dette program er fri software; du kan videredistribuere det og/eller "
+"modificere det under vilkårene i GNU General Public License som udgivet af "
+"Free Software Foundation; enten version 2 af Licensen, eller (efter eget "
+"valg) enhver senere version.\n"
+"\n"
+"Dette program er distribueret i håbet om at det vil være nyttigt, men UDEN "
+"NOGEN GARANTI; uden selv den underforstået garanti vedrørende SALGBARHED "
+"eller EGNETHED TIL ET BESTEMT FORMÅL. Se GNU General Public License for "
+"flere detaljer.\n"
+"\n"
+"Du skulle have modtaget en kopi af GNU General Public License sammen med "
+"dette program. Hvis ikke, skriv til Free Software Foundation, Inc., 51 "
+"Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 
-#: src/sndio-ng/sndio.cc:44
+#: src/sndio/sndio.cc:43
 msgid "Sndio Output"
 msgstr "Sndio-lydudgang"
 
-#: src/sndio-ng/sndio.cc:98
+#: src/sndio/sndio.cc:98
 msgid "Device (blank for default):"
 msgstr "Enhed (tom for standard):"
 
-#: src/sndio-ng/sndio.cc:100
+#: src/sndio/sndio.cc:100
 msgid "Save and restore volume:"
 msgstr "Gem og gendan lydstyrke:"
 
-#: src/sndio-ng/sndio.cc:181
+#: src/sndio/sndio.cc:181
 #, c-format
 msgid "Sndio error: Unsupported audio format (%d)"
 msgstr "Sndio-fejl: Lydformat er ikke understøttet (%d)"
 
-#: src/sndio-ng/sndio.cc:192
+#: src/sndio/sndio.cc:192
 msgid "Sndio error: sio_open() failed"
 msgstr "Sndio-fejl: sio_open() mislykkedes"
 
-#: src/sndio-ng/sndio.cc:222
+#: src/sndio/sndio.cc:221
 msgid "Sndio error: sio_setpar() failed"
 msgstr "Sndio-fejl: sio_setpar() mislykkedes"
 
-#: src/sndio-ng/sndio.cc:234
+#: src/sndio/sndio.cc:233
 msgid "Sndio error: sio_start() failed"
 msgstr "Sndio-fejl: sio_start() mislykkedes"
 
-#: src/song_change/song_change.cc:33
+#: src/songchange/song_change.cc:30
 msgid "Song Change"
-msgstr "Sangændring"
-
-#: src/song_change/song_change.cc:342
-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."
+msgstr "Skift af sang"
 
-#: src/song_change/song_change.cc:358
+#: src/songchange/song_change.cc:256
 msgid "Commands"
 msgstr "Kommandoer"
 
-#: src/song_change/song_change.cc:360
+#: src/songchange/song_change.cc:258
 msgid "Command to run when starting a new song:"
 msgstr "Kommando til afvikling ved ny sang:"
 
-#: src/song_change/song_change.cc:364
+#: src/songchange/song_change.cc:261
+msgid "Command to run when stopping a song:"
+msgstr ""
+
+#: src/songchange/song_change.cc:264
 msgid "Command to run at the end of a song:"
 msgstr "Kommando til afvikling ved afsluting på sang:"
 
-#: src/song_change/song_change.cc:368
+#: src/songchange/song_change.cc:267
 msgid "Command to run at the end of the playlist:"
 msgstr "Kommando til afvikling ved slut på afspilningsliste:"
 
-#: src/song_change/song_change.cc:372
+#: src/songchange/song_change.cc:270
 msgid "Command to run when song title changes (for network streams):"
 msgstr ""
-"Kommando til afvikling når sangtitlen ændrer sig (for netværksudsendelser):"
+"Kommando til afvikling når sangtitlen ændrer sig (for netværksstrømme):"
 
-#: src/song_change/song_change.cc:376
+#: src/songchange/song_change.cc:273
 msgid ""
-"You can use the following format strings which will be substituted before "
-"calling the command (not all are useful for the end-of-playlist command):\n"
-"\n"
-"%F: Frequency (in hertz)\n"
+"You can use the following format codes, which will be replaced before "
+"running the command.\n"
+"Not all are useful though for the song-stopped or end-of-playlist command."
+msgstr ""
+
+#: src/songchange/song_change.cc:276
+msgid ""
+"%a: Artist\n"
+"%b: Album\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"
+"%F: Frequency (Hertz)\n"
+"%l: Length (milliseconds)\n"
+"%n or %s: Formatted title (see playlist settings)\n"
 "%p: Currently playing (1 or 0)\n"
-"%a: Artist\n"
-"%b: Album\n"
-"%T: Track title"
-msgstr ""
-
-#: src/song-info-qt/song-info.cc:32
-msgid "Song Info (Qt)"
+"%r: Rate (bits per second)\n"
+"%t: Playlist position\n"
+"%T: Title (unformatted)"
 msgstr ""
+"%a: Kunstner\n"
+"%b: Album\n"
+"%c: Antal kanaler\n"
+"%f: Filnavn (fuld sti)\n"
+"%F: Frekvens (Hertz)\n"
+"%l: Længde (millisekunder)\n"
+"%n eller %s: Formateret titel (se afspilningslisteindstillinger)\n"
+"%p: Afspiller nu (1 eller 0)\n"
+"%r: Frekvens (bit pr. sekund)\n"
+"%t: Afspilningslisteplacering\n"
+"%T: Titel (uformateret)"
+
+#: src/songchange/song_change.cc:287
+msgid ""
+"Parameters passed to the shell should be enclosed in quotation marks.\n"
+"Unquoted parameters may lead to unexpected results."
+msgstr ""
+
+#: src/song-info-qt/song-info.cc:30
+msgid "Song Info"
+msgstr "Sanginformation"
 
-#: src/sox-resampler/sox-resampler.cc:44
+#: src/soxr/sox-resampler.cc:44
 msgid "SoX Resampler"
-msgstr ""
+msgstr "SoX gensampler"
 
-#: src/sox-resampler/sox-resampler.cc:144
+#: src/soxr/sox-resampler.cc:172
 msgid ""
 "SoX Resampler Plugin for Audacious\n"
 "Copyright 2013 Michał Lipski\n"
@@ -3964,96 +4303,149 @@
 "Based on Sample Rate Converter Plugin:\n"
 "Copyright 2010-2012 John Lindgren"
 msgstr ""
+"SoX gensampler-udvidelsesmodul til Audacious\n"
+"Ophavsret 2013 Michał Lipski\n"
+"\n"
+"Baseret på samplefrekvenskonverter-udvidelsesmodul:\n"
+"Ophavsret 2010-2012 John Lindgren"
 
-#: src/sox-resampler/sox-resampler.cc:150
+#: src/soxr/sox-resampler.cc:178
 msgid "Quick"
-msgstr ""
+msgstr "Hurtig"
 
-#: src/sox-resampler/sox-resampler.cc:151
+#: src/soxr/sox-resampler.cc:179
 msgid "Low"
 msgstr "Lav"
 
-#: src/sox-resampler/sox-resampler.cc:153
+#: src/soxr/sox-resampler.cc:181
 msgid "High"
 msgstr "Høj"
 
-#: src/sox-resampler/sox-resampler.cc:154
+#: src/soxr/sox-resampler.cc:182
 msgid "Very High"
 msgstr "Meget høj"
 
-#: src/sox-resampler/sox-resampler.cc:158
+#: src/soxr/sox-resampler.cc:183
+msgid "Ultra High"
+msgstr "Ultra høj"
+
+#: src/soxr/sox-resampler.cc:187
+msgid "Minimum"
+msgstr "Minimum"
+
+#: src/soxr/sox-resampler.cc:188
+msgid "Intermediate"
+msgstr "Mellem"
+
+#: src/soxr/sox-resampler.cc:193
 msgid "Quality:"
 msgstr "Kvalitet:"
 
-#: src/speed-pitch/speed-pitch.cc:51
+#: src/soxr/sox-resampler.cc:196
+msgid "Phase:"
+msgstr "Fase:"
+
+#: src/soxr/sox-resampler.cc:200
+msgid "Allow aliasing"
+msgstr "Tillad aliasing"
+
+#: src/soxr/sox-resampler.cc:202
+msgid "Use steep filter"
+msgstr "Brug stejlt filter"
+
+#: src/speedpitch/speed-pitch.cc:54
 msgid "Speed and Pitch"
 msgstr "Hastighed og tonehøjde"
 
-#: src/speed-pitch/speed-pitch.cc:210
-msgid "Speed and Pitch"
-msgstr "Hastighed og tonehøjde"
-
-#: src/speed-pitch/speed-pitch.cc:211
-msgid "Speed:"
-msgstr "Hastighed:"
-
-#: src/speed-pitch/speed-pitch.cc:214
-msgid "Pitch:"
-msgstr "Tonehøjde:"
+#: src/speedpitch/speed-pitch.cc:247
+msgid "Speed"
+msgstr "Hastighed"
+
+#: src/speedpitch/speed-pitch.cc:248
+msgid "Decouple from pitch"
+msgstr "Afkobl fra tonehøjde"
+
+#: src/speedpitch/speed-pitch.cc:250 src/speedpitch/speed-pitch.cc:258
+msgid "Multiplier:"
+msgstr "Multiplikator:"
+
+#: src/speedpitch/speed-pitch.cc:254
+msgid "Pitch"
+msgstr "Tonehøjde"
 
-#: src/statusicon/statusicon.cc:47
+#: src/statusicon-qt/statusicon.cc:45 src/statusicon/statusicon.cc:47
 msgid "Status Icon"
 msgstr "Statusikon"
 
-#: src/statusicon/statusicon.cc:283
-msgid "Se_ttings ..."
-msgstr "_Indstillinger ..."
-
-#: src/statusicon/statusicon.cc:372
+#: src/statusicon-qt/statusicon.cc:68
 msgid ""
-"Status Icon Plugin\n"
+"Status Icon Plugin (partial port for Qt interface)\n"
 "\n"
 "Copyright 2005-2007 Giacomo Lozito <james@develia.org>\n"
 "Copyright 2010 Michał Lipski <tallica@o2.pl>\n"
+"Copyright 2015 Eugene Paskevich <eugene@raptor.kiev.ua>\n"
 "\n"
 "This plugin provides a status icon, placed in\n"
 "the system tray area of the window manager."
 msgstr ""
-"Status Icon Plugin\n"
+"Statusikon-udvidelsesmodul (delvist porteret til Qt-grænseflade)\n"
 "\n"
 "Ophavsret 2005-2007 Giacomo Lozito <james@develia.org>\n"
 "Ophavsret 2010 Michał Lipski <tallica@o2.pl>\n"
+"Ophavsret 2015 Eugene Paskevich <eugene@raptor.kiev.ua>\n"
 "\n"
-"Dette udvidelsesmdoul tilbyder et statusikon, placeret i statusfeltet i "
-"vindueshåndteringen."
+"Dette udvidelsesmodul giver et statusikon i\n"
+"vindueshåndteringens systembakkeområde."
 
-#: src/statusicon/statusicon.cc:379
+#: src/statusicon-qt/statusicon.cc:89 src/statusicon/statusicon.cc:384
 msgid "Mouse Scroll Action"
-msgstr " Muserul-handling"
+msgstr "Muserul-handling"
 
-#: src/statusicon/statusicon.cc:380
+#: src/statusicon-qt/statusicon.cc:90 src/statusicon/statusicon.cc:385
 msgid "Change volume"
 msgstr "Ændr lydstyrke"
 
-#: src/statusicon/statusicon.cc:383
+#: src/statusicon-qt/statusicon.cc:93 src/statusicon/statusicon.cc:388
 msgid "Change playing song"
-msgstr "Ændr sang der afspilles"
+msgstr "Skift sang der afspilles"
 
-#: src/statusicon/statusicon.cc:386
+#: src/statusicon-qt/statusicon.cc:96 src/statusicon/statusicon.cc:391
 msgid "Other Settings"
 msgstr "Andre indstillinger"
 
-#: src/statusicon/statusicon.cc:387
+#: src/statusicon-qt/statusicon.cc:97 src/statusicon/statusicon.cc:392
 msgid "Disable the popup window"
-msgstr "Deaktiver pop op-vinduet"
+msgstr "Deaktivér pop op-vinduet"
 
-#: src/statusicon/statusicon.cc:389
+#: src/statusicon-qt/statusicon.cc:99 src/statusicon/statusicon.cc:394
 msgid "Close to the system tray"
-msgstr "Luk statusfeltet"
+msgstr "Luk til systembakken"
 
-#: src/statusicon/statusicon.cc:391
+#: src/statusicon-qt/statusicon.cc:101 src/statusicon/statusicon.cc:396
 msgid "Advance in playlist when scrolling upward"
-msgstr "Gå fremad i afspilningslisten når der rulles opad"
+msgstr "Gå videre i afspilningslisten når der rulles opad"
+
+#: src/statusicon-qt/statusicon.cc:116 src/statusicon/statusicon.cc:287
+msgid "Se_ttings ..."
+msgstr "_Indstillinger ..."
+
+#: src/statusicon/statusicon.cc:377
+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 ""
+"Statusikon-udvidelsesmodul\n"
+"\n"
+"Ophavsret 2005-2007 Giacomo Lozito <james@develia.org>\n"
+"Ophavsret 2010 Michał Lipski <tallica@o2.pl>\n"
+"\n"
+"Dette udvidelsesmodul giver et statusikon, placeret i\n"
+"vindueshåndteringens systembakkeområde."
 
 #: src/stereo_plugin/stereo.cc:19
 msgid "Extra Stereo"
@@ -4073,20 +4465,160 @@
 msgid "Extra Stereo"
 msgstr "Ekstra stereo"
 
+#: src/streamtuner/icecast-model.cc:126 src/streamtuner/shoutcast-model.cc:131
+msgid "Type"
+msgstr "Type"
+
+#: src/streamtuner/icecast-model.cc:132
+msgid "Current Song"
+msgstr "Nuværende sang"
+
+#: src/streamtuner/icecast-model.cc:164
+msgid "Other"
+msgstr "Anden"
+
+#: src/streamtuner/ihr-model.cc:63
+msgid "Market"
+msgstr "Marked"
+
+#: src/streamtuner/ihr-model.cc:156
+msgid "Call Letters"
+msgstr "Opkaldsbreve"
+
+#: src/streamtuner/ihr-model.cc:162
+msgid "Description"
+msgstr "Beskrivelse"
+
+#: src/streamtuner/shoutcast-model.cc:128
+msgid "Listeners"
+msgstr "Lyttere"
+
+#: src/streamtuner/shoutcast-model.cc:188
+msgid "Top 500 Stations"
+msgstr "Top 500-stationer"
+
+#: src/streamtuner/shoutcast-model.cc:189
+msgid "Alternative"
+msgstr "Alternativt"
+
+#: src/streamtuner/shoutcast-model.cc:190
+msgid "Blues"
+msgstr "Blues"
+
+#: src/streamtuner/shoutcast-model.cc:191
+msgid "Classical"
+msgstr "Klassisk"
+
+#: src/streamtuner/shoutcast-model.cc:192
+msgid "Country"
+msgstr "Country"
+
+#: src/streamtuner/shoutcast-model.cc:193
+msgid "Decades"
+msgstr "Årtier"
+
+#: src/streamtuner/shoutcast-model.cc:194
+msgid "Easy Listening"
+msgstr "Blød pop"
+
+#: src/streamtuner/shoutcast-model.cc:195
+msgid "Electronic"
+msgstr "Elektronik"
+
+#: src/streamtuner/shoutcast-model.cc:196
+msgid "Folk"
+msgstr "Folk"
+
+#: src/streamtuner/shoutcast-model.cc:197
+msgid "Inspirational"
+msgstr "Inspirerende"
+
+#: src/streamtuner/shoutcast-model.cc:198
+msgid "International"
+msgstr "International"
+
+#: src/streamtuner/shoutcast-model.cc:199
+msgid "Jazz"
+msgstr "Jazz"
+
+#: src/streamtuner/shoutcast-model.cc:200
+msgid "Latin"
+msgstr "Latin"
+
+#: src/streamtuner/shoutcast-model.cc:201
+msgid "Metal"
+msgstr "Metal"
+
+#: src/streamtuner/shoutcast-model.cc:203
+msgid "New Age"
+msgstr "New Age"
+
+#: src/streamtuner/shoutcast-model.cc:204
+msgid "Pop"
+msgstr "Pop"
+
+#: src/streamtuner/shoutcast-model.cc:205
+msgid "Public Radio"
+msgstr "Offentlig radio"
+
+#: src/streamtuner/shoutcast-model.cc:206
+msgid "R&B and Urban"
+msgstr "R&B og urban"
+
+#: src/streamtuner/shoutcast-model.cc:207
+msgid "Rap"
+msgstr "Rap"
+
+#: src/streamtuner/shoutcast-model.cc:208
+msgid "Reggae"
+msgstr "Reggae"
+
+#: src/streamtuner/shoutcast-model.cc:209
+msgid "Rock"
+msgstr "Rock"
+
+#: src/streamtuner/shoutcast-model.cc:210
+msgid "Seasonal and Holiday"
+msgstr "Sæson og helligdage"
+
+#: src/streamtuner/shoutcast-model.cc:211
+msgid "Soundtracks"
+msgstr "Filmmusik"
+
+#: src/streamtuner/shoutcast-model.cc:212
+msgid "Talk"
+msgstr "Tal"
+
+#: src/streamtuner/shoutcast-model.cc:213
+msgid "Themes"
+msgstr "Temaer"
+
+#: src/streamtuner/streamtuner.cc:59
+msgid "Shoutcast"
+msgstr "Shoutcast"
+
+#: src/streamtuner/streamtuner.cc:60
+msgid "Icecast"
+msgstr "Icecast"
+
+#: src/streamtuner/streamtuner.cc:71
+msgid "Stream Tuner"
+msgstr "Udsendelsestuner"
+
 #: src/tonegen/tonegen.cc:45
 msgid "Tone Generator"
-msgstr "Toneopretter"
+msgstr "Tonegenerator"
 
-#: src/tonegen/tonegen.cc:94
+#: src/tonegen/tonegen.cc:92
 #, c-format
 msgid "%s %.1f Hz"
 msgstr "%s %.1f Hz"
 
-#: src/tonegen/tonegen.cc:94
+#: src/tonegen/tonegen.cc:92
 msgid "Tone Generator: "
-msgstr "Tonegenerator:"
+msgstr "Tonegenerator: "
 
-#: src/tonegen/tonegen.cc:160
+#: src/tonegen/tonegen.cc:161
 msgid ""
 "Sine tone generator by Håvard Kvålen <havardk@xmms.org>\n"
 "Modified by Daniel J. Peng <danielpeng@bigfoot.com>\n"
@@ -4094,18 +4626,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-toneopretter af Håvard Kvålen <havardk@xmms.org>\n"
+"Sinustonegenerator af Håvard Kvålen <havardk@xmms.org>\n"
 "Ændret af Daniel J. Peng <danielpeng@bigfoot.com>\n"
 "\n"
-"For at bruge tilføjes en adresse: tone://frequency1;frequency2;"
-"frequency3;...\n"
-"f.eks. tone://2000;2005 for at spille en 2000 Hz tone og en 2005 Hz tone"
+"For at bruge tilføjes en URL: tone://frequency1;frequency2;frequency3;...\n"
+"f.eks. tone://2000;2005 for at afspille en 2000 Hz tone og en 2005 Hz tone"
+
+#: src/ui-common/dialogs-qt.cc:40
+msgid ""
+"\n"
+"(Further messages have been hidden.)"
+msgstr ""
+"\n"
+"(Yderligere beskeder er blevet skjult)."
+
+#: src/ui-common/dialogs-qt.cc:52
+msgid "Working ..."
+msgstr "Arbejder ..."
+
+#: src/ui-common/dialogs-qt.cc:73
+msgid "Information"
+msgstr "Information"
+
+#: src/ui-common/menu-ops-gtk.cc:132 src/ui-common/menu-ops-qt.cc:113
+#, c-format
+msgid "%s does not appear to be a valid folder."
+msgstr ""
 
 #: src/voice_removal/voice_removal.cc:28
 msgid "Voice Removal"
 msgstr "Stemmefjernelse"
 
-#: src/vorbis/vorbis.cc:465
+#: src/vorbis/vorbis.cc:433
 msgid ""
 "Audacious Ogg Vorbis Decoder\n"
 "\n"
@@ -4125,17 +4677,34 @@
 "Gian-Carlo Pascutto <gcp@sjeng.org>\n"
 "Eugene Zagidullin <e.asphyx@gmail.com>"
 msgstr ""
+"Audacious Ogg Vorbis-afkoder\n"
+"\n"
+"Baseret på Xiph.org Foundation's Ogg Vorbis-udvidelsesmodul:\n"
+"http://www.xiph.org/\n"
+"\n"
+"Original kode af:\n"
+"Tony Arcieri <bascule@inferno.tusculum.edu>\n"
+"\n"
+"Bifrag fra:\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.h:18
 msgid "Ogg Vorbis Decoder"
 msgstr "Ogg Vorbis-afkoder"
 
-#: src/vtx/info.cc:22
+#: src/vtx/info.cc:24
 #, c-format
 msgid "Details about %s"
 msgstr "Detaljer om %s"
 
-#: src/vtx/info.cc:24
+#: src/vtx/info.cc:26
 msgid ""
 "Title: %t\n"
 "Author: %a\n"
@@ -4149,31 +4718,89 @@
 "Player Freq: %P\n"
 "Year: %y"
 msgstr ""
+"Titel: %t\n"
+"Forfatter: %a\n"
+"Fra: %f\n"
+"Tracker: %T\n"
+"Kommentar: %C\n"
+"Chiptype: %c\n"
+"Stereo: %s\n"
+"Løkke: %l\n"
+"Chipfrek.: %F\n"
+"Afspillerfrek.: %P\n"
+"År: %y"
 
 #: src/vtx/vtx.cc:38
 msgid "VTX Decoder"
 msgstr "VTX-afkoder"
 
-#: src/vtx/vtx.cc:184
+#: src/vtx/vtx.cc:178
 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-filformat-afspiller af Sashnov Alexander <sashnov@ngs.ru>\n"
+"Baseret på in_vtx.dll af Roman Sherbakov <v_soft@microfor.ru>\n"
+"Audacious-udvidelsesmodul af Pavel Vymetalek <pvymetalek@seznam.cz>"
+
+#: src/vumeter-qt/vumeter_qt.cc:31
+msgid ""
+"VU Meter Plugin for Audacious\n"
+"Copyright 2017-2019 Marc Sánchez Fauste"
+msgstr ""
+"VU Meter Plugin for Audacious\n"
+"Ophavsret 2017-2019 Marc Sánchez Fauste"
+
+#: src/vumeter-qt/vumeter_qt.cc:35
+msgid "VU Meter Settings"
+msgstr "Indstillinger for VU-viser"
+
+#: src/vumeter-qt/vumeter_qt.cc:37
+msgid "Peak hold time:"
+msgstr "Tidsforløb for tonehøjde"
+
+#: src/vumeter-qt/vumeter_qt.cc:42
+msgid "Fall-off time:"
+msgstr "Tidsforløb for ton ud:"
+
+#: src/vumeter-qt/vumeter_qt.cc:44
+msgid "dB/second"
+msgstr "dB/sekund"
+
+#: src/vumeter-qt/vumeter_qt.cc:46
+msgid "Display legend"
+msgstr "Vis forklaring"
+
+#: src/vumeter-qt/vumeter_qt.h:37
+msgid "VU Meter"
+msgstr "VU-viser"
+
+#: src/waveout/waveout.cc:43
+msgid "Win32 waveOut"
+msgstr "Win32 waveOut"
 
-#: src/wavpack/wavpack.cc:24
+#: src/waveout/waveout.cc:69
+msgid ""
+"Win32 waveOut Plugin for Audacious\n"
+"Copyright 2016 John Lindgren"
+msgstr ""
+"Win32 waveOut-udvidelsesmodul til Audacious\n"
+"Ophavsret 2016 John Lindgren"
+
+#: src/wavpack/wavpack.cc:25
 msgid "WavPack Decoder"
 msgstr "WavPack-afkoder"
 
-#: src/wavpack/wavpack.cc:211
+#: src/wavpack/wavpack.cc:217
 msgid "lossy (hybrid)"
 msgstr "kvalitetstab (hybrid)"
 
-#: src/wavpack/wavpack.cc:213
+#: src/wavpack/wavpack.cc:219
 msgid "lossy"
 msgstr "kvalitetstab"
 
-#: src/wavpack/wavpack.cc:255
+#: src/wavpack/wavpack.cc:259
 msgid ""
 "Copyright 2006 William Pitcock <nenolod@nenolod.net>\n"
 "\n"
@@ -4183,18 +4810,38 @@
 "\n"
 "Lidt af udvidelsesmodulets kode blev udført af Miles Egan."
 
-#: src/xsf/plugin.cc:50
+#: src/xsf/plugin.cc:74
 msgid "2SF Decoder"
 msgstr "2SF-afkoder"
 
-#: src/xsf/plugin.cc:238
+#: src/xsf/plugin.cc:429
+msgid "32728 Hz"
+msgstr ""
+
+#: src/xsf/plugin.cc:432
+msgid "65456 Hz"
+msgstr ""
+
+#: src/xsf/plugin.cc:438
+msgid "Cosine"
+msgstr ""
+
+#: src/xsf/plugin.cc:439
+msgid "Sharp"
+msgstr ""
+
+#: src/xsf/plugin.cc:443
 msgid "XSF Configuration"
-msgstr "XSF-konfiguration"
+msgstr "Konfiguration af XSF"
 
-#: src/xsf/plugin.cc:239
-msgid "Ignore length from file"
-msgstr "Ignorer længde fra fil"
+#: src/xsf/plugin.cc:445
+msgid "Default fade time:"
+msgstr ""
+
+#: src/xsf/plugin.cc:447
+msgid "Interpolation mode:"
+msgstr ""
 
-#: src/xspf/xspf.cc:89
+#: src/xspf/xspf.cc:95
 msgid "XML Shareable Playlists (XSPF)"
-msgstr "XML Shareable-afspilningslister (XSPF)"
+msgstr "XML delbare-afspilningslister (XSPF)"

audacious-plugins-3.6.2-gtk3.tar.bz2/po/de.po -> audacious-plugins-4.4.1.tar.bz2/po/de.po Changed

@@ -5,310 +5,82 @@
 # Translators:
 # Chris <ppt23@lkj.hopto.org>, 2012
 # Chris <ppt23@lkj.hopto.org>, 2012
-# Ettore Atalan <atalanttore@googlemail.com>, 2014
+# Ettore Atalan <atalanttore@googlemail.com>, 2014,2016,2020
 # Maximilian Vesper <maximilian@mail.com>, 2013
 # mschwendt <mschwendt@fedoraproject.org>, 2012
 # mschwendt <mschwendt@fedoraproject.org>, 2012
 # Chris <ppt23@lkj.hopto.org>, 2012
-# Thomas Lange <thomas-lange2@gmx.de>, 2014-2015
+# Thomas Lange, 2014-2015,2018-2019,2021-2024
 msgid ""
 msgstr ""
 "Project-Id-Version: Audacious Plugins\n"
-"Report-Msgid-Bugs-To: http://redmine.audacious-media-player.org/\n"
-"POT-Creation-Date: 2015-02-28 19:18+0100\n"
-"PO-Revision-Date: 2015-02-18 14:41+0000\n"
-"Last-Translator: Thomas Lange <thomas-lange2@gmx.de>\n"
-"Language-Team: German (http://www.transifex.com/projects/p/audacious/"
-"language/de/)\n"
+"Report-Msgid-Bugs-To: https://github.com/audacious-media-player/audacious/"
+"issues\n"
+"POT-Creation-Date: 2024-09-26 21:54+0200\n"
+"PO-Revision-Date: 2011-10-10 17:43+0000\n"
+"Last-Translator: Thomas Lange, 2014-2015,2018-2019,2021-2024\n"
+"Language-Team: German (http://app.transifex.com/audacious/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"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/aac-raw/aac.cc:18
+#: src/aac/aac.cc:19
 msgid "AAC (Raw) Decoder"
 msgstr "AAC (Raw) Dekodierer"
 
-#: src/adplug/adplug-xmms.cc:42
+#: src/adplug/adplug-xmms.cc:70
 msgid "AdPlug (AdLib Player)"
 msgstr "AdPlug (AdLib-Spieler)"
 
-#: src/adplug/adplug-xmms.cc:156 src/modplug/modplugbmp.cc:335
-#: src/psf/plugin.cc:138 src/vtx/vtx.cc:87 src/xsf/plugin.cc:113
+#: src/adplug/adplug-xmms.cc:167 src/modplug/modplugbmp.cc:321
+#: src/psf/plugin.cc:161 src/vtx/vtx.cc:89 src/xsf/plugin.cc:204
 msgid "sequenced"
 msgstr "Sequenziell"
 
-#: src/alarm/alarm.cc:55 src/alarm/interface.cc:82
-msgid "Alarm"
-msgstr "Alarm"
-
-#: src/alarm/alarm.cc:782
-msgid "Set Alarm ..."
-msgstr "Alarm setzen ..."
-
-#: src/alarm/alarm.cc:810
-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\n"
-"einer bestimmten Zeit die Wiedergabe zu starten.\n"
-"\n"
-"Ursprünglich geschrieben von Adam Feakin und Daniel Stodden."
-
-#: src/alarm/interface.cc: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 Aufweckdialog 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 Standardzeit aktivieren.\n"
-"\n"
-"\n"
-
-#: src/alarm/interface.cc: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.cc: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"
-" Aktivieren Sie dazu den Checkbutton und schreiben Sie\n"
-" die Erinnerungsnachricht in die Textbox."
-
-#: src/alarm/interface.cc:81
-msgid "This is your wakeup call."
-msgstr "Dies ist Ihr Aufwachsignal."
-
-#: src/alarm/interface.cc:99
-msgid "Your reminder for today is..."
-msgstr "Die Erinnerung für heute lautet..."
-
-#: src/alarm/interface.cc:101 src/alarm/interface.cc:386
-msgid "Reminder"
-msgstr "Erinnerung"
-
-#: src/alarm/interface.cc:132
-msgid "Monday"
-msgstr "Montag"
-
-#: src/alarm/interface.cc:132
-msgid "Tuesday"
-msgstr "Dienstag"
-
-#: src/alarm/interface.cc:132
-msgid "Wednesday"
-msgstr "Mittwoch"
-
-#: src/alarm/interface.cc:133
-msgid "Thursday"
-msgstr "Donnerstag"
-
-#: src/alarm/interface.cc:133
-msgid "Friday"
-msgstr "Freitag"
-
-#: src/alarm/interface.cc:133
-msgid "Saturday"
-msgstr "Samstag"
-
-#: src/alarm/interface.cc:133
-msgid "Sunday"
-msgstr "Sonntag"
-
-#: src/alarm/interface.cc:171 src/alarm/interface.cc:230
-#: src/alarm/interface.cc:245
-msgid "Time"
-msgstr "Uhrzeit"
-
-#: src/alarm/interface.cc:178
-msgid "Alarm at (default):"
-msgstr "Alarm um (Standard):"
-
-#: src/alarm/interface.cc:200
-msgid "h"
-msgstr "Uhr"
-
-#: src/alarm/interface.cc:203
-msgid "Quiet after:"
-msgstr "Still nach:"
-
-#: src/alarm/interface.cc:215
-msgid "hours"
-msgstr "Stunden"
-
-#: src/alarm/interface.cc:226
-msgid "minutes"
-msgstr "Minuten"
-
-#: src/alarm/interface.cc:235
-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.cc:242
-msgid "Day"
-msgstr "Tag"
-
-#: src/alarm/interface.cc:259 src/bs2b/plugin.cc:130
-#: src/skins/preset-list.cc:434 src/skins/preset-list.cc:440
-msgid "Default"
-msgstr "Standard"
+#: src/adplug/adplug-xmms.cc:349 src/sid/xs_config.cc:61
+msgid "Output"
+msgstr "Ausgabe"
 
-#: src/alarm/interface.cc:288
-msgid "Days"
-msgstr "Tage"
-
-#: src/alarm/interface.cc:297
-msgid "Fading"
-msgstr "Übergang"
-
-#: src/alarm/interface.cc:305 src/console/plugin.cc:41
-#: src/crossfade/crossfade.cc:53 src/crossfade/crossfade.cc:59
-#: src/gtkui/settings.cc:49 src/lirc/lirc.cc:397 src/sid/xs_config.cc:85
-#: src/sid/xs_config.cc:94 src/sid/xs_config.cc:103
-msgid "seconds"
-msgstr "Sekunden"
+#: src/adplug/adplug-xmms.cc:350
+msgid "OPL Emulator:"
+msgstr "OPL-Emulator:"
+
+#: src/adplug/adplug-xmms.cc:353 src/amidiplug/i_configure.cc:153
+#: src/console/plugin.cc:45 src/filewriter/filewriter.cc:481
+#: src/sid/xs_config.cc:65 src/xsf/plugin.cc:446
+msgid "Sample rate:"
+msgstr "Abtastrate:"
 
-#: src/alarm/interface.cc:312 src/alarm/interface.cc:353
-msgid "Volume"
-msgstr "Lautstärke"
-
-#: src/alarm/interface.cc:317
-msgid "Start at"
-msgstr "Beginnen bei"
-
-#: src/alarm/interface.cc:333
-msgid "Final"
-msgstr "Schluss"
-
-#: src/alarm/interface.cc:346
-msgid "Current"
-msgstr "Momentan"
-
-#: src/alarm/interface.cc:359
-msgid "Additional Command"
-msgstr "Zusätzlicher Befehl"
-
-#: src/alarm/interface.cc:365 src/alarm/interface.cc:391
-msgid "enable"
-msgstr "aktivieren"
-
-#: src/alarm/interface.cc:372
-msgid "Playlist (optional)"
-msgstr "Wiedergabeliste (optional)"
-
-#: src/alarm/interface.cc:379
-msgid "Select a playlist"
-msgstr "Wiedergabeliste wählen"
+#: src/adplug/adplug-xmms.cc:354 src/amidiplug/i_configure.cc:155
+#: src/bs2b/plugin.cc:141 src/console/plugin.cc:47
+#: src/modplug/plugin_main.cc:77 src/resample/resample.cc:201
+#: src/resample/resample.cc:207 src/resample/resample.cc:211
+#: src/resample/resample.cc:215 src/resample/resample.cc:219
+#: src/resample/resample.cc:223 src/resample/resample.cc:227
+#: src/resample/resample.cc:231 src/resample/resample.cc:235
+#: src/resample/resample.cc:239 src/resample/resample.cc:243
+#: src/sid/xs_config.cc:67 src/soxr/sox-resampler.cc:205
+msgid "Hz"
+msgstr "Hz"
 
-#: src/alarm/interface.cc:399
-msgid "Options"
-msgstr "Optionen"
+#: src/adplug/adplug-xmms.cc:355 src/gtkui/settings.cc:55
+#: src/modplug/plugin_main.cc:105 src/qtui/settings.cc:85
+#: src/skins-qt/skins_cfg.cc:302 src/skins/skins_cfg.cc:284
+msgid "Miscellaneous"
+msgstr "Sonstiges"
 
-#: src/alarm/interface.cc:404
-msgid "What do these options mean?"
-msgstr "Was bedeuten diese Einstellungen?"
-
-#: src/alarm/interface.cc:420
-msgid "Help"
-msgstr "Hilfe"
+#: src/adplug/adplug-xmms.cc:356
+msgid "Repeat song in endless loop"
+msgstr "Wiederhole Titel in Endlosschleife"
 
-#: src/albumart/albumart.cc:31
+#: src/albumart/albumart.cc:31 src/albumart-qt/albumart.cc:35
 msgid "Album Art"
 msgstr "Album-Cover"
 
-#: src/albumart-qt/albumart.cc:33
-msgid "Album Art (Qt)"
-msgstr "Album-Cover (Qt)"
-
-#: src/alsa/alsa.h:70
+#: src/alsa/alsa.h:64
 msgid "ALSA Output"
 msgstr "ALSA Ausgabe"
 
@@ -351,11 +123,11 @@
 msgid "Mixer element:"
 msgstr "Mixer-Element:"
 
-#: src/amidi-plug/amidi-plug.cc:41
+#: src/amidiplug/amidi-plug.cc:42
 msgid "AMIDI-Plug (MIDI Player)"
 msgstr "AMIDI-Plug (MIDI-Spieler)"
 
-#: src/amidi-plug/amidi-plug.cc:437
+#: src/amidiplug/amidi-plug.cc:445
 msgid ""
 "AMIDI-Plug\n"
 "modular MIDI music player\n"
@@ -397,157 +169,161 @@
 "Tony Vroon\n"
 "für die gute Hilfe beim Testen"
 
-#: src/amidi-plug/i_configure.cc:94
+#: src/amidiplug/i_configure.cc:94
 msgid "Override default gain:"
 msgstr "Standard Verstärkung überschreiben:"
 
-#: src/amidi-plug/i_configure.cc:102
+#: src/amidiplug/i_configure.cc:102
 msgid "Override default polyphony:"
 msgstr "Standard Polyfonie überschreiben:"
 
-#: src/amidi-plug/i_configure.cc:110
+#: src/amidiplug/i_configure.cc:110
 msgid "Override default reverb:"
 msgstr "Standard Hall überschreiben:"
 
-#: src/amidi-plug/i_configure.cc:112 src/amidi-plug/i_configure.cc:120
+#: src/amidiplug/i_configure.cc:112 src/amidiplug/i_configure.cc:120
 msgid "On"
 msgstr "An"
 
-#: src/amidi-plug/i_configure.cc:118
+#: src/amidiplug/i_configure.cc:118
 msgid "Override default chorus:"
 msgstr "Standard Refrain überschreiben:"
 
-#: src/amidi-plug/i_configure.cc:128 src/console/plugin.cc:29
+#: src/amidiplug/i_configure.cc:128 src/console/plugin.cc:29
 msgid "Playback"
 msgstr "Wiedergabe"
 
-#: src/amidi-plug/i_configure.cc:129
+#: src/amidiplug/i_configure.cc:129
 msgid "Transpose:"
 msgstr "Transponieren:"
 
-#: src/amidi-plug/i_configure.cc:131
+#: src/amidiplug/i_configure.cc:131 src/speedpitch/speed-pitch.cc:257
 msgid "semitones"
 msgstr "Halbtöne"
 
-#: src/amidi-plug/i_configure.cc:132
+#: src/amidiplug/i_configure.cc:132
 msgid "Drum shift:"
 msgstr "Drum-Shift:"
 
-#: src/amidi-plug/i_configure.cc:134
+#: src/amidiplug/i_configure.cc:134
 msgid "note numbers"
 msgstr "Notennummern"
 
-#: src/amidi-plug/i_configure.cc:135
+#: src/amidiplug/i_configure.cc:135
 msgid "Skip leading silence"
 msgstr "Stille am Anfang überspringen"
 
-#: src/amidi-plug/i_configure.cc:137
+#: src/amidiplug/i_configure.cc:137
 msgid "Skip trailing silence"
 msgstr "Stille am Ende überspringen"
 
-#: src/amidi-plug/i_configure.cc:141
+#: src/amidiplug/i_configure.cc:141
 msgid "SoundFont"
 msgstr "SoundFont"
 
-#: src/amidi-plug/i_configure.cc:143
+#: src/amidiplug/i_configure.cc:148
 msgid "Synthesizer"
 msgstr "Synthesizer"
 
-#: src/amidi-plug/i_configure.cc:148 src/console/plugin.cc:45
-#: src/sid/xs_config.cc:65
-msgid "Sample rate:"
-msgstr "Abtastrate:"
-
-#: src/amidi-plug/i_configure.cc:150 src/bs2b/plugin.cc:141
-#: src/console/plugin.cc:47 src/modplug/plugin_main.cc:78
-#: src/resample/resample.cc:201 src/resample/resample.cc:207
-#: src/resample/resample.cc:211 src/resample/resample.cc:215
-#: src/resample/resample.cc:219 src/resample/resample.cc:223
-#: src/resample/resample.cc:227 src/resample/resample.cc:231
-#: src/resample/resample.cc:235 src/resample/resample.cc:239
-#: src/resample/resample.cc:243 src/sid/xs_config.cc:67
-#: src/sox-resampler/sox-resampler.cc:163
-msgid "Hz"
-msgstr "Hz"
-
-#: src/amidi-plug/i_configure-fluidsynth.cc:52
+#: src/amidiplug/i_configure-fluidsynth.cc:58
+#: src/amidiplug/i_configure-fluidsynth.cc:527
 msgid "AMIDI-Plug - select SoundFont file"
 msgstr "AMIDI-Plug - SoundFont-Datei wählen"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:55 src/filewriter/mp3.cc:658
+#: src/amidiplug/i_configure-fluidsynth.cc:61
 msgid "_Cancel"
 msgstr "_Abbrechen"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:56
+#: src/amidiplug/i_configure-fluidsynth.cc:62
 msgid "_Open"
 msgstr "Ö_ffnen"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:225 src/gtkui/columns.cc:46
+#: src/amidiplug/i_configure-fluidsynth.cc:233
+#: src/amidiplug/i_configure-fluidsynth.cc:461
 msgid "File name"
 msgstr "Dateiname"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:229
+#: src/amidiplug/i_configure-fluidsynth.cc:237
+#: src/amidiplug/i_configure-fluidsynth.cc:464
 msgid "Size (bytes)"
 msgstr "Größe (Bytes)"
 
-#: src/amidi-plug/i_fileinfo.cc:163
+#: src/amidiplug/i_fileinfo.cc:184
 msgid "Name:"
 msgstr "Name:"
 
-#: src/amidi-plug/i_fileinfo.cc:181
+#: src/amidiplug/i_fileinfo.cc:202
 msgid " MIDI Info "
 msgstr " MIDI Info "
 
-#: src/amidi-plug/i_fileinfo.cc:195
+#: src/amidiplug/i_fileinfo.cc:216
 msgid "Format:"
 msgstr "Format:"
 
-#: src/amidi-plug/i_fileinfo.cc:198
+#: src/amidiplug/i_fileinfo.cc:219
 msgid "Length (msec):"
 msgstr "Länge (ms):"
 
-#: src/amidi-plug/i_fileinfo.cc:201
+#: src/amidiplug/i_fileinfo.cc:222
 msgid "No. of Tracks:"
 msgstr "Anzahl an Titeln:"
 
-#: src/amidi-plug/i_fileinfo.cc:207
+#: src/amidiplug/i_fileinfo.cc:228
 msgid "variable"
 msgstr "variabel"
 
-#: src/amidi-plug/i_fileinfo.cc:209
+#: src/amidiplug/i_fileinfo.cc:230
 msgid "BPM:"
 msgstr "BPM:"
 
-#: src/amidi-plug/i_fileinfo.cc:217
+#: src/amidiplug/i_fileinfo.cc:238
 msgid "BPM (wavg):"
 msgstr "BPM (Wavg):"
 
-#: src/amidi-plug/i_fileinfo.cc:220
+#: src/amidiplug/i_fileinfo.cc:241
 msgid "Time Div:"
 msgstr "Zeitmultiplex:"
 
-#: src/amidi-plug/i_fileinfo.cc:231
+#: src/amidiplug/i_fileinfo.cc:252
 msgid " MIDI Comments and Lyrics "
 msgstr " MIDI Kommentare und Liedtexte "
 
-#: src/amidi-plug/i_fileinfo.cc:278
+#: src/amidiplug/i_fileinfo.cc:299
 msgid "* no comments available in this MIDI file *"
-msgstr "* keine Kommentare in dieser MIDI-Datei verfügbar *"
+msgstr "* keine Kommentare in dieser MIDI-Datei vorhanden *"
 
-#: src/amidi-plug/i_fileinfo.cc:290
+#: src/amidiplug/i_fileinfo.cc:311
 msgid "* no lyrics available in this MIDI file *"
-msgstr "* keine Liedtexte in dieser MIDI-Datei verfügbar *"
+msgstr "* keine Liedtexte in dieser MIDI-Datei vorhanden *"
 
-#: src/amidi-plug/i_fileinfo.cc:300 src/filewriter/vorbis.cc:197
-#: src/ladspa/plugin.cc:416
+#: src/amidiplug/i_fileinfo.cc:321 src/ladspa/plugin.cc:418
+#: src/ui-common/dialogs-qt.cc:32
 msgid "_Close"
 msgstr "S_chließen"
 
-#: src/amidi-plug/i_fileinfo.cc:325
+#: src/amidiplug/i_fileinfo.cc:346
 msgid " (invalid UTF-8)"
 msgstr " (ungültiges UTF-8)"
 
-#: src/aosd/aosd.cc:32
+#: src/ampache/ampache.cc:33
+msgid "Ampache Browser"
+msgstr "Ampache Browser"
+
+#: src/ampache/ampache.cc:46
+msgid ""
+"Ampache Browser for Audacious\n"
+"http://ampache-browser.org/\n"
+"\n"
+"Copyright (C) Róbert Čerňanský and John Lindgren\n"
+"License: GNU GPLv3"
+msgstr ""
+"Ampache Browser für Audacious\n"
+"http://ampache-browser.org/\n"
+"\n"
+"Copyright (C) Róbert Čerňanský und John Lindgren\n"
+"Lizenz: GNU GPLv3"
+
+#: src/aosd/aosd.cc:31
 msgid ""
 "Audacious OSD\n"
 "http://www.develia.org/projects.php?p=audacious#aosd\n"
@@ -581,130 +357,130 @@
 msgid "Concave Rectangle"
 msgstr "Konkaves Rechteck"
 
-#: src/aosd/aosd_style.cc:69
+#: src/aosd/aosd_style.cc:69 src/openmpt/mptwrap.h:50 src/xsf/plugin.cc:436
 msgid "None"
 msgstr "Kein"
 
-#: src/aosd/aosd_trigger.cc:50
+#: src/aosd/aosd_trigger.cc:49
 msgid "Playback Start"
 msgstr "Wiedergabebeginn"
 
-#: src/aosd/aosd_trigger.cc:51
+#: src/aosd/aosd_trigger.cc:50
 msgid "Triggers OSD when a playlist entry is played."
 msgstr "Löst OSD beim Abspielen eines Wiedergabelisteneintrags aus."
 
-#: src/aosd/aosd_trigger.cc:56
+#: src/aosd/aosd_trigger.cc:55
 msgid "Title Change"
 msgstr "Titeländerung"
 
-#: src/aosd/aosd_trigger.cc:57
+#: src/aosd/aosd_trigger.cc:56
 msgid "Triggers OSD when the song title changes (for internet streams)."
 msgstr "Löst OSD aus, wenn sich der Liedtitel ändert (für Internetstreams)."
 
-#: src/aosd/aosd_trigger.cc:62
+#: src/aosd/aosd_trigger.cc:61
 msgid "Pause On"
 msgstr "Pause An"
 
-#: src/aosd/aosd_trigger.cc:63
+#: src/aosd/aosd_trigger.cc:62
 msgid "Triggers OSD when playback is paused."
 msgstr "Löst OSD beim Pausieren der Wiedergabe aus."
 
-#: src/aosd/aosd_trigger.cc:68
+#: src/aosd/aosd_trigger.cc:67
 msgid "Pause Off"
 msgstr "Pause Aus"
 
-#: src/aosd/aosd_trigger.cc:69
+#: src/aosd/aosd_trigger.cc:68
 msgid "Triggers OSD when playback is unpaused."
 msgstr "Löst OSD beim Fortsetzen der Wiedergabe aus."
 
-#: src/aosd/aosd_ui.cc:163
+#: src/aosd/aosd_ui.cc:204
 msgid "Placement"
 msgstr "Platzierung"
 
-#: src/aosd/aosd_ui.cc:196
+#: src/aosd/aosd_ui.cc:241
 msgid "Relative X offset:"
 msgstr "Relative X-Verschiebung:"
 
-#: src/aosd/aosd_ui.cc:203
+#: src/aosd/aosd_ui.cc:245
 msgid "Relative Y offset:"
 msgstr "Relative Y-Verschiebung:"
 
-#: src/aosd/aosd_ui.cc:210
+#: src/aosd/aosd_ui.cc:249
 msgid "Max OSD width:"
 msgstr "Maximale OSD-Breite:"
 
-#: src/aosd/aosd_ui.cc:221
+#: src/aosd/aosd_ui.cc:281
 msgid "Multi-Monitor options"
 msgstr "Multi-Head-Optionen"
 
-#: src/aosd/aosd_ui.cc:225
+#: src/aosd/aosd_ui.cc:285
 msgid "Display OSD using:"
 msgstr "OSD anzeigen auf:"
 
-#: src/aosd/aosd_ui.cc:227
+#: src/aosd/aosd_ui.cc:287
 msgid "all monitors"
 msgstr "allen Bildschirmen"
 
-#: src/aosd/aosd_ui.cc:230
+#: src/aosd/aosd_ui.cc:290
 #, c-format
 msgid "monitor %i"
 msgstr "Bildschirm %i"
 
-#: src/aosd/aosd_ui.cc:282
+#: src/aosd/aosd_ui.cc:342
 msgid "Timing (ms)"
 msgstr "Zeitablauf (ms)"
 
-#: src/aosd/aosd_ui.cc:287
+#: src/aosd/aosd_ui.cc:347
 msgid "Display:"
 msgstr "Anzeige:"
 
-#: src/aosd/aosd_ui.cc:292
+#: src/aosd/aosd_ui.cc:352
 msgid "Fade in:"
 msgstr "Einblenden:"
 
-#: src/aosd/aosd_ui.cc:297
+#: src/aosd/aosd_ui.cc:357
 msgid "Fade out:"
 msgstr "Ausblenden:"
 
-#: src/aosd/aosd_ui.cc:361
+#: src/aosd/aosd_ui.cc:442
 msgid "Fonts"
 msgstr "Schriftarten"
 
-#: src/aosd/aosd_ui.cc:368
+#: src/aosd/aosd_ui.cc:449
 #, c-format
 msgid "Font %i:"
 msgstr "Schriftart %i:"
 
-#: src/aosd/aosd_ui.cc:382
+#: src/aosd/aosd_ui.cc:466
 msgid "Shadow"
 msgstr "Schatten"
 
-#: src/aosd/aosd_ui.cc:486
+#: src/aosd/aosd_ui.cc:589
 msgid "Render Style"
 msgstr "Render-Stil"
 
-#: src/aosd/aosd_ui.cc:502
+#: src/aosd/aosd_ui.cc:605
 msgid "Colors"
 msgstr "Farben"
 
-#: src/aosd/aosd_ui.cc:513
+#: src/aosd/aosd_ui.cc:616
 #, c-format
 msgid "Color %i:"
 msgstr "Farbe %i:"
 
-#: src/aosd/aosd_ui.cc:600
+#: src/aosd/aosd_ui.cc:714
 msgid "Enable trigger"
 msgstr "Auslöser aktivieren"
 
-#: src/aosd/aosd_ui.cc:627
+#: src/aosd/aosd_ui.cc:741
 msgid "Event"
 msgstr "Ereignis"
 
-#: src/aosd/aosd_ui.cc:655
+#: src/aosd/aosd_ui.cc:768
 msgid "Composite manager detected"
 msgstr "Composite-Manager erkannt"
 
-#: src/aosd/aosd_ui.cc:662
+#: src/aosd/aosd_ui.cc:775
 msgid ""
 "Composite manager not detected;\n"
 "unless you know that you have one running, please activate a composite "
@@ -714,60 +490,56 @@
 "Sofern ein solcher nicht doch aktiv ist, bitte einen solchen aktivieren, "
 "ansonsten wird das OSD nicht funktionieren"
 
-#: src/aosd/aosd_ui.cc:670
+#: src/aosd/aosd_ui.cc:783
 msgid "Composite manager not required for fake transparency"
 msgstr "Composite-Manager nicht benötigt für vorgetäuschte Transparenz"
 
-#: src/aosd/aosd_ui.cc:706
+#: src/aosd/aosd_ui.cc:820
 msgid "Transparency"
 msgstr "Transparenz"
 
-#: src/aosd/aosd_ui.cc:712
+#: src/aosd/aosd_ui.cc:826
 msgid "Fake transparency"
 msgstr "Pseudo-Transparenz"
 
-#: src/aosd/aosd_ui.cc:714
+#: src/aosd/aosd_ui.cc:828
 msgid "Real transparency (requires X Composite Ext.)"
 msgstr "Echte Transparenz (benötigt X-Composite-Erweiterung)"
 
-#: src/aosd/aosd_ui.cc:756
+#: src/aosd/aosd_ui.cc:875
 msgid "Composite extension not loaded"
 msgstr "Composite-Erweiterung nicht geladen"
 
-#: src/aosd/aosd_ui.cc:764
-msgid "Composite extension not available"
-msgstr "Composite-Erweiterung nicht verfügbar"
-
-#: src/aosd/aosd_ui.cc:781
+#: src/aosd/aosd_ui.cc:892
 #, c-format
 msgid "Audacious OSD"
 msgstr "Audacious-OSD"
 
-#: src/aosd/aosd_ui.cc:844
+#: src/aosd/aosd_ui.cc:955
 msgid "Position"
 msgstr "Position"
 
-#: src/aosd/aosd_ui.cc:849
+#: src/aosd/aosd_ui.cc:960
 msgid "Animation"
 msgstr "Animation"
 
-#: src/aosd/aosd_ui.cc:854
+#: src/aosd/aosd_ui.cc:965
 msgid "Text"
 msgstr "Text"
 
-#: src/aosd/aosd_ui.cc:859
+#: src/aosd/aosd_ui.cc:970
 msgid "Decoration"
 msgstr "Dekoration"
 
-#: src/aosd/aosd_ui.cc:864
+#: src/aosd/aosd_ui.cc:975
 msgid "Trigger"
 msgstr "Auslöser"
 
-#: src/aosd/aosd_ui.cc:869
+#: src/aosd/aosd_ui.cc:980 src/streamtuner/shoutcast-model.cc:202
 msgid "Misc"
 msgstr "Verschiedenes"
 
-#: src/aosd/aosd_ui.cc:878
+#: src/aosd/aosd_ui.cc:989
 msgid "Test"
 msgstr "Test"
 
@@ -783,11 +555,98 @@
 msgid "Audacious Playlists (audpl)"
 msgstr "Audacious Wiedergabelisten (audpl)"
 
-#: src/blur_scope/blur_scope.cc:42
+#: src/background_music/background_music.cc:24
+msgid "Background music"
+msgstr "Hintergrundmusik"
+
+#: src/background_music/background_music.cc:25
+msgid "Target level:"
+msgstr "Zielwert:"
+
+#: src/background_music/background_music.cc:28
+#: src/background_music/background_music.cc:33
+#: src/silence-removal/silence-removal.cc:70
+msgid "dB"
+msgstr "dB"
+
+#: src/background_music/background_music.cc:29
+msgid "Maximum amplification:"
+msgstr "Maximale Verstärkung:"
+
+#: src/background_music/background_music.cc:34 src/mpg123/mpg123.cc:81
+msgid "Advanced"
+msgstr "Erweitert"
+
+#: src/background_music/background_music.cc:36
+msgid "Slow detection weight:"
+msgstr "Langsames Erkennungsgewicht:"
+
+#: src/background_music/background_music.cc:39
+msgid "Hint"
+msgstr "Hinweis"
+
+#: src/background_music/background_music.cc:41
+msgid ""
+"Slow detection weight is the relative weight\n"
+"of a long term average detection when compared\n"
+"to the actual, faster loudness detection.\n"
+"A value of zero gives a more radio-like sound\n"
+"where soft passages get \"pulled up\" more quickly,\n"
+"a value of two makes the sound feel less compressed."
+msgstr ""
+"Das langsame Erkennungsgewicht ist das relative Gewicht\n"
+"einer langfristigen Durchschnittserkennung im Vergleich\n"
+"zur tatsächlichen, schnelleren Lautheitserkennung.\n"
+"Ein Wert von Null ergibt einen eher radioähnlichen Klang,\n"
+"wo leise Passagen schneller „hochgezogen“ werden,\n"
+"ein Wert von zwei lässt den Klang weniger komprimiert\n"
+"erscheinen."
+
+#: src/background_music/background_music.cc:52
+msgid ""
+"Background Music Plugin for Audacious\n"
+"Copyright 2023;2024 Michel Fleur\n"
+"\n"
+"Controls the volume to make the sound equally loud within and between "
+"tracks.\n"
+" It uses accurate loudness measurement and tries to make the volume changes "
+"sound natural without audible peaks, yet without lowering the volume before "
+"a peak in advance."
+msgstr ""
+"Hintergrundmusik Plugin für Audacious\n"
+"Copyright 2023, 2024 Michel Fleur\n"
+"\n"
+"Regelt die Lautstärke, um den Ton innerhalb und zwischen den Titeln gleich "
+"laut zu machen.\n"
+"Es verwendet eine genaue Lautstärkemessung und versucht, die "
+"Lautstärkeänderungen natürlich klingen zu lassen, ohne hörbare Spitzen, aber "
+"auch ohne die Lautstärke vor einer Spitze im Voraus zu senken."
+
+#: src/background_music/background_music.cc:61
+msgid "Background Music"
+msgstr "Hintergrundmusik"
+
+#: src/bitcrusher/bitcrusher.cc:33
+msgid "Bitcrusher"
+msgstr "Bitcrusher"
+
+#: src/bitcrusher/bitcrusher.cc:34
+msgid "Bit Depth:"
+msgstr "Bittiefe:"
+
+#: src/bitcrusher/bitcrusher.cc:37
+msgid "Downsample ratio:"
+msgstr "Downsample-Verhältnis:"
+
+#: src/bitcrusher/bitcrusher.cc:48
+msgid "Bitcrusher"
+msgstr "Bitcrusher"
+
+#: src/blur_scope/blur_scope.cc:40 src/blur_scope-qt/blur_scope.cc:45
 msgid "Color"
 msgstr "Farbe"
 
-#: src/blur_scope/blur_scope.cc:58
+#: src/blur_scope/blur_scope.cc:56 src/blur_scope-qt/blur_scope.cc:158
 msgid "Blur Scope"
 msgstr "Oszilloskop"
 
@@ -799,6 +658,10 @@
 msgid "Presets:"
 msgstr "Voreinstellungen:"
 
+#: src/bs2b/plugin.cc:130
+msgid "Default"
+msgstr "Standard"
+
 #: src/bs2b/plugin.cc:136
 msgid "Feed level:"
 msgstr "Eingabepegel:"
@@ -811,15 +674,15 @@
 msgid "Cut frequency:"
 msgstr "Grenzfrequenz:"
 
-#: src/cairo-spectrum/cairo-spectrum.cc:41
+#: src/cairo-spectrum/cairo-spectrum.cc:42 src/qt-spectrum/qt-spectrum.cc:107
 msgid "Spectrum Analyzer"
 msgstr "Spektrumanalysator"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:72
+#: src/cdaudio/cdaudio-ng.cc:74
 msgid "Audio CD Plugin"
 msgstr "Audio-CD Plugin"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:121
+#: src/cdaudio/cdaudio-ng.cc:121
 msgid ""
 "Copyright (C) 2007-2012 Calin Crisan <ccrisan@gmail.com> and others.\n"
 "\n"
@@ -840,132 +703,132 @@
 "\n"
 "Dies war ein Google Summer of Code 2007 Projekt."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:137
+#: src/cdaudio/cdaudio-ng.cc:140
 msgid "Device"
 msgstr "Gerät"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:138
+#: src/cdaudio/cdaudio-ng.cc:141
 msgid "Read speed:"
 msgstr "Lesegeschwindigkeit:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:141
+#: src/cdaudio/cdaudio-ng.cc:144
 msgid "Override device:"
 msgstr "Gerät überschreiben:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:143
+#: src/cdaudio/cdaudio-ng.cc:146
 msgid "Metadata"
 msgstr "Metadaten"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:144
+#: src/cdaudio/cdaudio-ng.cc:147
 msgid "Use CD-Text"
 msgstr "CD-Text benutzen"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:146
+#: src/cdaudio/cdaudio-ng.cc:150
 msgid "Use CDDB"
 msgstr "CDDB benutzen"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:148
+#: src/cdaudio/cdaudio-ng.cc:152
 msgid "Use HTTP instead of CDDBP"
 msgstr "HTTP anstatt CDDBP benutzen"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:151
+#: src/cdaudio/cdaudio-ng.cc:155
 msgid "Server:"
 msgstr "Server:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:155
+#: src/cdaudio/cdaudio-ng.cc:159
 msgid "Path:"
 msgstr "Pfad:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:159
+#: src/cdaudio/cdaudio-ng.cc:163
 msgid "Port:"
 msgstr "Port:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:246
+#: src/cdaudio/cdaudio-ng.cc:228
 msgid "Failed to initialize cdio subsystem."
 msgstr "Initialisieren des cdio Subsystems fehlgeschlagen."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:281
+#: src/cdaudio/cdaudio-ng.cc:260
 #, c-format
 msgid "Invalid URI %s."
 msgstr "Ungültige URI »%s«."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:283
+#: src/cdaudio/cdaudio-ng.cc:262
 #, c-format
 msgid "Track %d not found."
 msgstr "Titel %d nicht gefunden."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:285
+#: src/cdaudio/cdaudio-ng.cc:264
 #, c-format
 msgid "Track %d is a data track."
 msgstr "Titel %d ist eine Datenspur."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:360
+#: src/cdaudio/cdaudio-ng.cc:339
 msgid "Error reading audio CD."
 msgstr "Fehler beim Lesen der Audio-CD."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:429
+#: src/cdaudio/cdaudio-ng.cc:410
 msgid "Audio CD"
 msgstr "Audio-CD"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:460 src/cdaudio-ng/cdaudio-ng.cc:469
+#: src/cdaudio/cdaudio-ng.cc:446 src/cdaudio/cdaudio-ng.cc:455
 #, c-format
 msgid "Failed to open CD device %s."
 msgstr "Öffnen des CD-Laufwerks »%s« fehlgeschlagen."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:472
+#: src/cdaudio/cdaudio-ng.cc:458
 msgid "No audio capable CD drive found."
 msgstr "Kein geeignetes CD-Laufwerk gefunden."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:497
+#: src/cdaudio/cdaudio-ng.cc:481
+msgid "Drive is empty."
+msgstr "Laufwerk ist leer."
+
+#: src/cdaudio/cdaudio-ng.cc:483
+msgid "Unsupported disk type."
+msgstr "Nicht unterstützter Disk-Typ."
+
+#: src/cdaudio/cdaudio-ng.cc:507
 msgid "Failed to finish initializing opened CD drive."
 msgstr "Abschließen der Initialisierung des CD-Laufwerks fehlgeschlagen."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:510
+#: src/cdaudio/cdaudio-ng.cc:520
 msgid "Failed to retrieve first/last track number."
 msgstr "Abfragen der ersten/letzten Titelnummer fehlgeschlagen."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:531
+#: src/cdaudio/cdaudio-ng.cc:541
 #, 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.cc:613
-msgid "Failed to create the cddb connection."
+#: src/cdaudio/cdaudio-ng.cc:624
+msgid "Failed to create the CDDB connection."
 msgstr "Herstellen der CDDB Verbindung fehlgeschlagen."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:679
+#: src/cdaudio/cdaudio-ng.cc:690
 msgid "Failed to query the CDDB server"
 msgstr "Abfragen des CDDB Servers fehlgeschlagen"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:681
+#: src/cdaudio/cdaudio-ng.cc:692
 #, c-format
 msgid "Failed to query the CDDB server: %s"
 msgstr "Abfragen des CDDB Servers fehlgeschlagen: %s"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:705
+#: src/cdaudio/cdaudio-ng.cc:716
 #, c-format
-msgid "Failed to read the cddb info: %s"
+msgid "Failed to read the CDDB info: %s"
 msgstr "Lesen der CDDB Information fehlgeschlagen: %s"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:765
-msgid "Drive is empty."
-msgstr "Laufwerk ist leer."
-
-#: src/cdaudio-ng/cdaudio-ng.cc:767
-msgid "Unsupported disk type."
-msgstr "Nicht unterstützter Disk-Typ."
-
-#: src/cd-menu-items/cd-menu-items.cc:35
+#: src/cd-menu-items/cd-menu-items.cc:33
 msgid "Audio CD Menu Items"
-msgstr "Audio-CD Menueinträge"
+msgstr "Audio-CD Menüeinträge"
 
-#: src/cd-menu-items/cd-menu-items.cc:47
-msgid "Play CD"
-msgstr "CD wiedergeben"
-
-#: src/cd-menu-items/cd-menu-items.cc:47
-msgid "Add CD"
-msgstr "CD hinzufügen"
+#: src/cd-menu-items/cd-menu-items.cc:45
+msgid "Pla_y CD"
+msgstr "CD _wiedergeben"
+
+#: src/cd-menu-items/cd-menu-items.cc:45
+msgid "_Add CD"
+msgstr "CD _hinzufügen"
 
 #: src/compressor/compressor.cc:45
 msgid "Compression"
@@ -1023,7 +886,14 @@
 msgid "Default song length:"
 msgstr "Standard-Liedlänge:"
 
-#: src/console/plugin.cc:42 src/modplug/plugin_main.cc:59
+#: src/console/plugin.cc:41 src/crossfade/crossfade.cc:56
+#: src/crossfade/crossfade.cc:62 src/lirc/lirc.cc:395 src/notify/notify.cc:113
+#: src/sid/xs_config.cc:85 src/sid/xs_config.cc:94 src/sid/xs_config.cc:103
+#: src/vumeter-qt/vumeter_qt.cc:39
+msgid "seconds"
+msgstr "Sekunden"
+
+#: src/console/plugin.cc:42 src/modplug/plugin_main.cc:58
 msgid "Resampling"
 msgstr "Resampling"
 
@@ -1047,29 +917,39 @@
 msgid "Game Console Music Decoder"
 msgstr "Spielekonsolen-Musik Dekodierer"
 
-#: src/coreaudio/coreaudio.cc:50
+#: src/coreaudio/coreaudio.cc:53
 msgid "CoreAudio output"
 msgstr "CoreAudio Ausgabe"
 
-#: src/coreaudio/coreaudio.cc:131
+#: src/coreaudio/coreaudio.cc:155
 msgid ""
 "CoreAudio Output Plugin for Audacious\n"
 "Copyright 2014 William Pitcock\n"
+"Copyright 2017,18 René J.V. Bertin\n"
+" (original code and code adapted from\n"
+" Apple examples, (C) Apple 2013)\n"
 "\n"
 "Based on SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
 msgstr ""
 "CoreAudio Ausgabeplugin für Audacious\n"
 "Copyright 2014 William Pitcock\n"
+"Copyright 2017,18 René J.V. Bertin\n"
+" (ursprünglicher Code und adaptierte\n"
+" Codebeispiele von Apple, (C) Apple 2013)\n"
 "\n"
 "Basierend auf dem SDL Ausgabeplugin für Audacious\n"
 "Copyright 2010 John Lindgren"
 
-#: src/coreaudio/coreaudio.cc:143
+#: src/coreaudio/coreaudio.cc:171
 msgid "Use exclusive mode"
 msgstr "Benutze exklusiven Modus"
 
-#: src/crossfade/crossfade.cc:44
+#: src/coreaudio/coreaudio.cc:173
+msgid "Use bit perfect audio (adapt device sampling rate)"
+msgstr "Benutze bitperfektes Audio (Angleichung der Geräteabtastrate)"
+
+#: src/crossfade/crossfade.cc:47
 msgid ""
 "Crossfade Plugin for Audacious\n"
 "Copyright 2010-2014 John Lindgren"
@@ -1077,27 +957,43 @@
 "Crossfade Plugin für Audacious\n"
 "Copyright 2010-2014 John Lindgren"
 
-#: src/crossfade/crossfade.cc:48
+#: src/crossfade/crossfade.cc:51
 msgid "Crossfade"
 msgstr "Crossfade"
 
-#: src/crossfade/crossfade.cc:49
+#: src/crossfade/crossfade.cc:52
 msgid "On automatic song change"
 msgstr "Bei automatischem Titelwechsel"
 
-#: src/crossfade/crossfade.cc:51 src/crossfade/crossfade.cc:57
+#: src/crossfade/crossfade.cc:54 src/crossfade/crossfade.cc:60
 msgid "Overlap:"
 msgstr "Überschneiden:"
 
-#: src/crossfade/crossfade.cc:55
+#: src/crossfade/crossfade.cc:58
 msgid "On seek or manual song change"
 msgstr "Beim Suchen oder manuellem Titelwechsel"
 
-#: src/crossfade/crossfade.cc:61
+#: src/crossfade/crossfade.cc:64
+msgid "No fade in"
+msgstr "Kein Einblenden"
+
+#: src/crossfade/crossfade.cc:66
+msgid "Use S-curve fade"
+msgstr "S-Kurven-Überblendung verwenden"
+
+#: src/crossfade/crossfade.cc:68
+msgid "S-curve steepness:"
+msgstr "Steilheit der S-Kurve:"
+
+#: src/crossfade/crossfade.cc:70
+msgid "(higher is steeper)"
+msgstr "(höher ist steiler)"
+
+#: src/crossfade/crossfade.cc:72
 msgid "Tip"
 msgstr "Hinweis"
 
-#: src/crossfade/crossfade.cc:62
+#: src/crossfade/crossfade.cc:73
 msgid ""
 "For better crossfading, enable\n"
 "the Silence Removal effect."
@@ -1105,29 +1001,10 @@
 "Für besseres Crossfading, aktivieren Sie\n"
 "den Effekt »Stille entfernen«."
 
-#: src/crossfade/crossfade.cc:72
+#: src/crossfade/crossfade.cc:83
 msgid "Crossfade"
 msgstr "Crossfade"
 
-#: src/crossfade/crossfade.cc:161
-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. Sie können den Kanal-Mixer benutzen, um die Lieder auf die selbe "
-"Anzahl an Kanälen zu konvertieren."
-
-#: src/crossfade/crossfade.cc:168
-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. Sie können den Abtastraten-Konverter benutzen, um die Lieder auf die "
-"selbe Abtastrate zu resamplen."
-
 #: src/crystalizer/crystalizer.cc:31
 msgid "Crystalizer"
 msgstr "Crystalizer"
@@ -1140,62 +1017,63 @@
 msgid "Crystalizer"
 msgstr "Crystalizer"
 
-#: src/cue/cue.cc:37
+#: src/cue/cue.cc:42
 msgid "Cue Sheet Plugin"
 msgstr "Cuesheet Plugin"
 
-#: src/delete-files/delete-files.cc:46 src/delete-files/delete-files.cc:146
+#: src/delete-files/delete-files.cc:53 src/delete-files/delete-files.cc:215
+#: src/delete-files/delete-files.cc:230
 msgid "Delete Files"
 msgstr "Dateien löschen"
 
-#: src/delete-files/delete-files.cc:75
+#: src/delete-files/delete-files.cc:120
+msgid "No files are selected."
+msgstr "Keine Dateien sind ausgewählt."
+
+#: src/delete-files/delete-files.cc:125
 #, c-format
-msgid "Error moving %s to trash: %s."
-msgstr "Fehler beim Verschieben von »%s« in den Papierkorb: %s."
+msgid "Do you want to move %s to the trash?"
+msgstr "Wollen Sie \"%s\" in den Papierkorb verschieben?"
 
-#: src/delete-files/delete-files.cc:86
+#: src/delete-files/delete-files.cc:126
 #, c-format
-msgid "Error deleting %s: %s."
-msgstr "Fehler beim Löschen von »%s«: %s."
+msgid "Do you want to permanently delete %s?"
+msgstr "Wollen Sie \"%s\" dauerhaft löschen?"
 
-#: src/delete-files/delete-files.cc:117
+#: src/delete-files/delete-files.cc:133
 #, c-format
-msgid "Error deleting %s: not a local file."
-msgstr "Fehler beim Löschen von »%s«: Datei nicht lokal gespeichert."
+msgid "Do you want to move %d files to the trash?"
+msgstr "Wollen Sie %d Dateien in den Papierkorb verschieben?"
 
 #: src/delete-files/delete-files.cc:134
-msgid "Do you want to move the selected files to the trash?"
-msgstr "Möchten Sie die ausgewählten Dateien in den Papierkorb verschieben?"
+#, c-format
+msgid "Do you want to permanently delete %d files?"
+msgstr "Wollen Sie %d Dateien dauerhaft löschen?"
 
-#: src/delete-files/delete-files.cc:135
-msgid "Move to Trash"
+#: src/delete-files/delete-files.cc:146
+msgid "Move to trash"
 msgstr "In den Papierkorb verschieben"
 
-#: src/delete-files/delete-files.cc:140
-msgid "Do you want to permanently delete the selected files?"
-msgstr "Möchten Sie die ausgewählten Dateien dauerhaft löschen?"
-
-#: src/delete-files/delete-files.cc:141 src/skins/preset-list.cc:411
-#: src/skins/preset-list.cc:427
+#: src/delete-files/delete-files.cc:146
 msgid "Delete"
 msgstr "Löschen"
 
-#: src/delete-files/delete-files.cc:145 src/skins/preset-browser.cc:56
-#: src/skins/preset-list.cc:307 src/skins/ui_playlist.cc:221
+#: src/delete-files/delete-files.cc:213 src/delete-files/delete-files.cc:235
+#: src/skins-qt/search-select.cc:102 src/skins/search-select.cc:78
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: src/delete-files/delete-files.cc:166
+#: src/delete-files/delete-files.cc:267
 msgid "Delete Selected Files"
 msgstr "Ausgewählte Dateien löschen"
 
-#: src/delete-files/delete-files.cc:181
+#: src/delete-files/delete-files.cc:287
 msgid "Delete Method"
 msgstr "Löschmethode"
 
-#: src/delete-files/delete-files.cc:182
+#: src/delete-files/delete-files.cc:288
 msgid "Move to trash instead of deleting immediately"
-msgstr "In den Papierkorb verschieben anstatt sofort zu löschen"
+msgstr "In den Papierkorb verschieben, anstatt sofort zu löschen"
 
 #: src/echo_plugin/echo.cc:9
 msgid ""
@@ -1213,13 +1091,13 @@
 msgid "Echo"
 msgstr "Echo"
 
-#: src/echo_plugin/echo.cc:22 src/modplug/plugin_main.cc:73
-#: src/modplug/plugin_main.cc:83
+#: src/echo_plugin/echo.cc:22 src/modplug/plugin_main.cc:72
+#: src/modplug/plugin_main.cc:82
 msgid "Delay:"
 msgstr "Verzögerung:"
 
-#: src/echo_plugin/echo.cc:24 src/modplug/plugin_main.cc:73
-#: src/modplug/plugin_main.cc:83
+#: src/echo_plugin/echo.cc:24 src/modplug/plugin_main.cc:72
+#: src/modplug/plugin_main.cc:82 src/xsf/plugin.cc:445
 msgid "ms"
 msgstr "ms"
 
@@ -1227,7 +1105,7 @@
 msgid "Feedback:"
 msgstr "Rückkopplung:"
 
-#: src/echo_plugin/echo.cc:28 src/modplug/plugin_main.cc:87
+#: src/echo_plugin/echo.cc:28 src/modplug/plugin_main.cc:86
 msgid "Volume:"
 msgstr "Lautstärke:"
 
@@ -1235,11 +1113,11 @@
 msgid "Echo"
 msgstr "Echo"
 
-#: src/ffaudio/ffaudio-core.cc:41
+#: src/ffaudio/ffaudio-core.cc:50
 msgid "FFmpeg Plugin"
 msgstr "FFmpeg Plugin"
 
-#: src/ffaudio/ffaudio-core.cc:571
+#: src/ffaudio/ffaudio-core.cc:649
 msgid ""
 "Multi-format audio decoding plugin for Audacious using\n"
 "FFmpeg multimedia framework (http://www.ffmpeg.org/)\n"
@@ -1255,248 +1133,321 @@
 "William Pitcock <nenolod@nenolod.net>\n"
 "Matti Hämäläinen <ccr@tnsp.org>"
 
-#: src/filewriter/filewriter.cc:45
+#: src/filewriter/filewriter.cc:48
 msgid "FileWriter Plugin"
 msgstr "FileWriter Plugin"
 
-#: src/filewriter/filewriter.cc:386
+#: src/filewriter/filewriter.cc:316
+#, c-format
+msgid ""
+"Error opening %s:\n"
+"%s"
+msgstr ""
+"Fehler beim Öffnen von %s:\n"
+"%s"
+
+#: src/filewriter/filewriter.cc:358
+msgid ""
+"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 ""
+"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.cc:385
 msgid "Output file format:"
 msgstr "Ausgabedateiformat:"
 
-#: src/filewriter/filewriter.cc:403
-msgid "Configure"
-msgstr "Konfigurieren"
-
-#: src/filewriter/filewriter.cc:413
+#: src/filewriter/filewriter.cc:389
 msgid "Save into original directory"
 msgstr "In Ursprungsverzeichnis speichern"
 
-#: src/filewriter/filewriter.cc:417
-msgid "Save into custom directory"
-msgstr "In benutzerdefiniertem Verzeichnis speichern"
-
-#: src/filewriter/filewriter.cc:427
-msgid "Output file folder:"
-msgstr "Ausgabedateiverzeichnis:"
+#: src/filewriter/filewriter.cc:392
+msgid "Save into custom directory:"
+msgstr "In benutzerdefiniertes Verzeichnis speichern:"
 
-#: src/filewriter/filewriter.cc:431
-msgid "Pick a folder"
-msgstr "Verzeichnis wählen"
-
-#: src/filewriter/filewriter.cc:444
+#: src/filewriter/filewriter.cc:400
 msgid "Generate file name from:"
 msgstr "Dateiname generieren von:"
 
-#: src/filewriter/filewriter.cc:448
-msgid "Original file tag"
-msgstr "Ursprünglichen Datei-Tags"
-
-#: src/filewriter/filewriter.cc:453
+#: src/filewriter/filewriter.cc:401
 msgid "Original file name"
 msgstr "Ursprünglichem Dateiname"
 
-#: src/filewriter/filewriter.cc:459
-msgid "Include original file name extension"
-msgstr "Ursprüngliche Dateiendung einbeziehen"
+#: src/filewriter/filewriter.cc:404
+msgid "Original file name (no suffix)"
+msgstr "Ursprünglicher Dateiname (kein Suffix)"
 
-#: src/filewriter/filewriter.cc:468
+#: src/filewriter/filewriter.cc:407
+msgid "Original file tag"
+msgstr "Ursprünglichen Datei-Tags"
+
+#: src/filewriter/filewriter.cc:411
 msgid "Prepend track number to file name"
 msgstr "Titelnummer an Dateiname voranstellen"
 
-#: src/filewriter/filewriter.cc:484
-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 ""
-"Dieses Programm ist freie Software. Sie können es unter den Bedingungen der\n"
-"GNU General Public License, wie von der Free Software Foundation\n"
-"veröffentlicht, weitergeben und/oder modifizieren, entweder gemäß Version 2\n"
-"der Lizenz oder (nach Ihrer Option) jeder späteren Version.\n"
-"\n"
-"Die Veröffentlichung dieses Programms erfolgt in der Hoffnung, daß es Ihnen\n"
-"von Nutzen sein wird, aber OHNE IRGENDEINE GARANTIE, sogar ohne die\n"
-"implizite Garantie der MARKTREIFE oder der VERWENDBARKEIT FÜR EINEN\n"
-"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\n"
-"Programm erhalten haben. Falls nicht, schreiben Sie an die Free Software\n"
-"Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110, USA."
-
-#: src/filewriter/mp3.cc:40 src/filewriter/mp3.cc:717
+#: src/filewriter/filewriter.cc:417 src/filewriter/filewriter.cc:449
 msgid "Auto"
 msgstr "Automatisch"
 
-#: src/filewriter/mp3.cc:40
+#: src/filewriter/filewriter.cc:418
+msgid "8000 Hz"
+msgstr "8000 Hz"
+
+#: src/filewriter/filewriter.cc:419
+msgid "11025 Hz"
+msgstr "11025 Hz"
+
+#: src/filewriter/filewriter.cc:420
+msgid "12000 Hz"
+msgstr "12000 Hz"
+
+#: src/filewriter/filewriter.cc:421
+msgid "16000 Hz"
+msgstr "16000 Hz"
+
+#: src/filewriter/filewriter.cc:422
+msgid "22050 Hz"
+msgstr "22050 Hz"
+
+#: src/filewriter/filewriter.cc:423
+msgid "24000 Hz"
+msgstr "24000 Hz"
+
+#: src/filewriter/filewriter.cc:424
+msgid "32000 Hz"
+msgstr "32000 Hz"
+
+#: src/filewriter/filewriter.cc:425 src/xsf/plugin.cc:430
+msgid "44100 Hz"
+msgstr "44100 Hz"
+
+#: src/filewriter/filewriter.cc:426 src/xsf/plugin.cc:431
+msgid "48000 Hz"
+msgstr "48000 Hz"
+
+#: src/filewriter/filewriter.cc:430
+msgid "8 kbit/s"
+msgstr "8 kbit/s"
+
+#: src/filewriter/filewriter.cc:431
+msgid "16 kbit/s"
+msgstr "16 kbit/s"
+
+#: src/filewriter/filewriter.cc:432
+msgid "32 kbit/s"
+msgstr "32 kbit/s"
+
+#: src/filewriter/filewriter.cc:433
+msgid "40 kbit/s"
+msgstr "40 kbit/s"
+
+#: src/filewriter/filewriter.cc:434
+msgid "48 kbit/s"
+msgstr "48 kbit/s"
+
+#: src/filewriter/filewriter.cc:435
+msgid "56 kbit/s"
+msgstr "56 kbit/s"
+
+#: src/filewriter/filewriter.cc:436
+msgid "64 kbit/s"
+msgstr "64 kbit/s"
+
+#: src/filewriter/filewriter.cc:437
+msgid "80 kbit/s"
+msgstr "80 kbit/s"
+
+#: src/filewriter/filewriter.cc:438
+msgid "96 kbit/s"
+msgstr "96 kbit/s"
+
+#: src/filewriter/filewriter.cc:439
+msgid "112 kbit/s"
+msgstr "112 kbit/s"
+
+#: src/filewriter/filewriter.cc:440
+msgid "128 kbit/s"
+msgstr "128 kbit/s"
+
+#: src/filewriter/filewriter.cc:441
+msgid "160 kbit/s"
+msgstr "160 kbit/s"
+
+#: src/filewriter/filewriter.cc:442
+msgid "192 kbit/s"
+msgstr "192 kbit/s"
+
+#: src/filewriter/filewriter.cc:443
+msgid "224 kbit/s"
+msgstr "224 kbit/s"
+
+#: src/filewriter/filewriter.cc:444
+msgid "256 kbit/s"
+msgstr "256 kbit/s"
+
+#: src/filewriter/filewriter.cc:445
+msgid "320 kbit/s"
+msgstr "320 kbit/s"
+
+#: src/filewriter/filewriter.cc:450
 msgid "Joint Stereo"
 msgstr "Joint-Stereo"
 
-#: src/filewriter/mp3.cc:41 src/modplug/plugin_main.cc:58
-#: src/mpg123/mpg123.cc:248
+#: src/filewriter/filewriter.cc:451 src/modplug/plugin_main.cc:57
+#: src/mpg123/mpg123.cc:259
 msgid "Stereo"
 msgstr "Stereo"
 
-#: src/filewriter/mp3.cc:41 src/modplug/plugin_main.cc:57
-#: src/mpg123/mpg123.cc:248
+#: src/filewriter/filewriter.cc:452 src/modplug/plugin_main.cc:56
+#: src/mpg123/mpg123.cc:260
 msgid "Mono"
 msgstr "Mono"
 
-#: src/filewriter/mp3.cc:657
-msgid "MP3 Configuration"
-msgstr "MP3-Konfiguration"
-
-#: src/filewriter/mp3.cc:658
-msgid "_OK"
-msgstr "_OK"
-
-#: src/filewriter/mp3.cc:681
-msgid "Algorithm Quality:"
-msgstr "Algorithmen-Qualität:"
-
-#: src/filewriter/mp3.cc:706
-msgid "Output Sample Rate:"
-msgstr "Ausgabe-Abtastrate:"
-
-#: src/filewriter/mp3.cc:733
-msgid "(Hz)"
-msgstr "(Hz)"
-
-#: src/filewriter/mp3.cc:740
-msgid "Bitrate / Compression Ratio:"
-msgstr "Bitrate / Kompressionsverhältnis:"
-
-#: src/filewriter/mp3.cc:764
-msgid "Bitrate (kbps):"
-msgstr "Bitrate (kbps):"
+#: src/filewriter/filewriter.cc:456
+msgid "VBR"
+msgstr "VBR"
+
+#: src/filewriter/filewriter.cc:457
+msgid "ABR"
+msgstr "ABR"
+
+#: src/filewriter/filewriter.cc:478
+msgid "Algorithm quality:"
+msgstr "Algorithmusqualität:"
 
-#: src/filewriter/mp3.cc:796
+#: src/filewriter/filewriter.cc:484
+msgid "Bitrate:"
+msgstr "Bitrate:"
+
+#: src/filewriter/filewriter.cc:491
 msgid "Compression ratio:"
 msgstr "Kompressionsverhältnis:"
 
-#: src/filewriter/mp3.cc:820
-msgid "Audio Mode:"
-msgstr "Audio-Modus:"
-
-#: src/filewriter/mp3.cc:845
-msgid "Miscellaneous:"
-msgstr "Sonstiges:"
+#: src/filewriter/filewriter.cc:498
+msgid "Audio mode:"
+msgstr "Audiomodus:"
 
-#: src/filewriter/mp3.cc:856
+#: src/filewriter/filewriter.cc:501
 msgid "Enforce strict ISO compliance"
 msgstr "Strikte ISO-Konformität erzwingen"
 
-#: src/filewriter/mp3.cc:867
+#: src/filewriter/filewriter.cc:503
 msgid "Error protection"
 msgstr "Fehlerschutz"
 
-#: src/filewriter/mp3.cc:879 src/filewriter/vorbis.cc:206
-msgid "Quality"
-msgstr "Qualität"
-
-#: src/filewriter/mp3.cc:888
+#: src/filewriter/filewriter.cc:508
 msgid "Enable VBR/ABR"
 msgstr "VBR/ABR aktivieren"
 
-#: src/filewriter/mp3.cc:898
+#: src/filewriter/filewriter.cc:510
 msgid "Type:"
 msgstr "Typ:"
 
-#: src/filewriter/mp3.cc:931
-msgid "VBR Options:"
-msgstr "VBR-Optionen:"
-
-#: src/filewriter/mp3.cc:947
-msgid "Minimum bitrate (kbps):"
-msgstr "Minimale Bitrate (kbps):"
-
-#: src/filewriter/mp3.cc:973
-msgid "Maximum bitrate (kbps):"
-msgstr "Maximale Bitrate (kbps):"
-
-#: src/filewriter/mp3.cc:995
-msgid "Strictly enforce minimum bitrate"
-msgstr "Minimale Bitrate erzwingen"
-
-#: src/filewriter/mp3.cc:1007
-msgid "ABR Options:"
-msgstr "ABR-Optionen:"
-
-#: src/filewriter/mp3.cc:1017
-msgid "Average bitrate (kbps):"
-msgstr "Durchschnittliche Bitrate (kbps):"
+#: src/filewriter/filewriter.cc:514
+msgid "Minimum bitrate:"
+msgstr "Minimale Bitrate:"
+
+#: src/filewriter/filewriter.cc:518
+msgid "Maximum bitrate:"
+msgstr "Maximale Bitrate:"
+
+#: src/filewriter/filewriter.cc:522
+msgid "Average bitrate:"
+msgstr "Durchschnittliche Bitrate:"
 
-#: src/filewriter/mp3.cc:1044
+#: src/filewriter/filewriter.cc:526
 msgid "VBR quality level:"
 msgstr "VBR-Qualitätsstufe:"
 
-#: src/filewriter/mp3.cc:1063
+#: src/filewriter/filewriter.cc:530
+msgid "Strictly enforce minimum bitrate"
+msgstr "Minimale Bitrate erzwingen"
+
+#: src/filewriter/filewriter.cc:533
 msgid "Omit Xing VBR header"
 msgstr "Xing-VBR-Header auslassen"
 
-#: src/filewriter/mp3.cc:1076
-msgid "VBR/ABR"
-msgstr "VBR/ABR"
-
-#: src/filewriter/mp3.cc:1085
-msgid "Frame Parameters:"
-msgstr "Frame-Parameter:"
+#: src/filewriter/filewriter.cc:539
+msgid "Frame Headers"
+msgstr "Frame-Headers"
 
-#: src/filewriter/mp3.cc:1097
+#: src/filewriter/filewriter.cc:540
 msgid "Mark as copyright"
 msgstr "Als Copyright kennzeichnen"
 
-#: src/filewriter/mp3.cc:1108
+#: src/filewriter/filewriter.cc:542
 msgid "Mark as original"
 msgstr "Als Original kennzeichnen"
 
-#: src/filewriter/mp3.cc:1120
-msgid "ID3 Parameters:"
-msgstr "ID3-Parameter:"
+#: src/filewriter/filewriter.cc:544
+msgid "ID3 Tags"
+msgstr "ID3-Schlagwörter"
 
-#: src/filewriter/mp3.cc:1131
+#: src/filewriter/filewriter.cc:545
 msgid "Force addition of version 2 tag"
 msgstr "Hinzufügen von Version-2-Tags erzwingen"
 
-#: src/filewriter/mp3.cc:1141
+#: src/filewriter/filewriter.cc:547
 msgid "Only add v1 tag"
 msgstr "Nur v1-Tag hinzufügen"
 
-#: src/filewriter/mp3.cc:1148
+#: src/filewriter/filewriter.cc:549
 msgid "Only add v2 tag"
 msgstr "Nur v2-Tag hinzufügen"
 
-#: src/filewriter/mp3.cc:1169
+#: src/filewriter/filewriter.cc:554
+msgid "Quality"
+msgstr "Qualität"
+
+#: src/filewriter/filewriter.cc:555
+msgid "VBR/ABR"
+msgstr "VBR/ABR"
+
+#: src/filewriter/filewriter.cc:556
 msgid "Tags"
 msgstr "Tags"
 
-#: src/filewriter/vorbis.cc:196
-msgid "Vorbis Encoder Configuration"
-msgstr "Vorbis-Encoder-Konfiguration"
-
-#: src/filewriter/vorbis.cc:219
-msgid "Quality level (0 - 10):"
-msgstr "Qualitätsstufe (0 - 10):"
+#: src/filewriter/filewriter.cc:566
+msgid "Quality (0-1):"
+msgstr "Qualität (0-1):"
+
+#: src/filewriter/filewriter.cc:573 src/skins-qt/skins_cfg.cc:307
+#: src/skins/skins_cfg.cc:289
+msgid "General"
+msgstr "Allgemein"
 
-#: src/flacng/flacng.h:35
+#: src/flac/flacng.h:36
 msgid "FLAC Decoder"
 msgstr "FLAC Dekodierer"
 
-#: src/flacng/metadata.cc:351 src/wavpack/wavpack.cc:209
+#: src/flac/metadata.cc:296 src/wavpack/wavpack.cc:215
 msgid "lossless"
 msgstr "Verlustfrei"
 
-#: src/flacng/plugin.cc:169
+#: src/flac/plugin.cc:214
 msgid ""
 "Original code by\n"
 "Ralf Ertzinger <ralf@skytale.net>\n"
@@ -1520,15 +1471,15 @@
 msgid "GIO Plugin"
 msgstr "GIO Plugin"
 
-#: src/gio/gio.cc:153
+#: src/gio/gio.cc:152
 msgid "Read-and-append mode not supported"
 msgstr "»Lesen-und-Anhängen«-Modus nicht unterstützt"
 
-#: src/gio/gio.cc:166
+#: src/gio/gio.cc:165
 msgid "Invalid open mode"
 msgstr "Ungültiger Modus zum Öffnen"
 
-#: src/gl-spectrum/gl-spectrum.cc:51
+#: src/glspectrum/gl-spectrum.cc:52
 msgid ""
 "OpenGL Spectrum Analyzer for Audacious\n"
 "Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
@@ -1548,623 +1499,745 @@
 "\n"
 "Lizenz: GPLv2+"
 
-#: src/gl-spectrum/gl-spectrum.cc:62
+#: src/glspectrum/gl-spectrum.cc:63 src/qtglspectrum/gl-spectrum.cc:53
 msgid "OpenGL Spectrum Analyzer"
 msgstr "OpenGL Spektrumanalysator"
 
-#: src/gl-spectrum-qt/gl-spectrum.cc:41
-msgid ""
-"OpenGL Spectrum Analyzer for Audacious\n"
-"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
-"Copyright 2014 William Pitcock\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é, John Lindgren und Carlo Bramini\n"
-"Copyright 2014 William Pitcock\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-qt/gl-spectrum.cc:53
-msgid "OpenGL Spectrum Analyzer (Qt)"
-msgstr "OpenGL Spektrumanalysator (Qt)"
-
-#: src/gnomeshortcuts/gnomeshortcuts.cc:38
-msgid "GNOME Shortcuts"
-msgstr "GNOME-Tastenkürzel"
-
-#: src/gnomeshortcuts/gnomeshortcuts.cc:54
-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\n"
-"Ermöglicht die Kontrolle von Audacious mit GNOME Tastenkürzeln.\n"
-"\n"
-"Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>"
-
-#: src/gtkui/columns.cc:35
-msgid "Entry number"
+#: src/gtkui/columns.cc:36 src/moonstone/playlist_model.cc:38
+#: src/qtui/playlist_model.cc:33
+msgid "Entry Number"
 msgstr "Eintragsnummer"
 
-#: src/gtkui/columns.cc:36 src/playlist-manager/playlist-manager.cc:225
-#: src/qtui/playlist_model.cc:123
+#: src/gtkui/columns.cc:37 src/moonstone/playlist_model.cc:38
+#: src/moonstone/playlist_selection.cc:64
+#: src/playlist-manager/playlist-manager.cc:200
+#: src/playlist-manager-qt/playlist-manager-qt.cc:188
+#: src/qtui/playlist_model.cc:33 src/streamtuner/icecast-model.cc:120
+#: src/streamtuner/ihr-model.cc:159 src/streamtuner/shoutcast-model.cc:122
 msgid "Title"
 msgstr "Titel"
 
-#: src/gtkui/columns.cc:37 src/qtui/playlist_model.cc:125
+#: src/gtkui/columns.cc:38 src/moonstone/playlist_model.cc:39
+#: src/qtui/playlist_model.cc:33
 msgid "Artist"
 msgstr "Künstler"
 
-#: src/gtkui/columns.cc:38
+#: src/gtkui/columns.cc:39 src/moonstone/playlist_model.cc:39
+#: src/qtui/playlist_model.cc:33
 msgid "Year"
 msgstr "Jahr"
 
-#: src/gtkui/columns.cc:39 src/qtui/playlist_model.cc:127
+#: src/gtkui/columns.cc:40 src/moonstone/playlist_model.cc:39
+#: src/qtui/playlist_model.cc:34
 msgid "Album"
 msgstr "Album"
 
-#: src/gtkui/columns.cc:40
-msgid "Album artist"
+#: src/gtkui/columns.cc:41 src/moonstone/playlist_model.cc:40
+#: src/qtui/playlist_model.cc:34
+msgid "Album Artist"
 msgstr "Album-Künstler"
 
-#: src/gtkui/columns.cc:41
+#: src/gtkui/columns.cc:42 src/moonstone/playlist_model.cc:40
+#: src/qtui/playlist_model.cc:34
 msgid "Track"
 msgstr "Titelnummer"
 
-#: src/gtkui/columns.cc:42
+#: src/gtkui/columns.cc:43 src/moonstone/playlist_model.cc:40
+#: src/qtui/playlist_model.cc:34 src/streamtuner/icecast-model.cc:123
+#: src/streamtuner/shoutcast-model.cc:125
+#: src/streamtuner/shoutcast-model.cc:236
 msgid "Genre"
 msgstr "Genre"
 
-#: src/gtkui/columns.cc:43
-msgid "Queue position"
+#: src/gtkui/columns.cc:44 src/moonstone/playlist_model.cc:41
+#: src/qtui/playlist_model.cc:35
+msgid "Queue Position"
 msgstr "Warteschlangenposition"
 
-#: src/gtkui/columns.cc:44
+#: src/gtkui/columns.cc:45 src/moonstone/playlist_model.cc:41
+#: src/qtui/playlist_model.cc:35
 msgid "Length"
 msgstr "Länge"
 
-#: src/gtkui/columns.cc:45
-msgid "File path"
+#: src/gtkui/columns.cc:46 src/moonstone/playlist_model.cc:41
+#: src/qtui/playlist_model.cc:35
+msgid "File Path"
 msgstr "Dateipfad"
 
-#: src/gtkui/columns.cc:47
-msgid "Custom title"
+#: src/gtkui/columns.cc:47 src/moonstone/playlist_model.cc:42
+#: src/qtui/playlist_model.cc:35
+msgid "File Name"
+msgstr "Dateiname"
+
+#: src/gtkui/columns.cc:48 src/moonstone/playlist_model.cc:42
+#: src/qtui/playlist_model.cc:36
+msgid "Custom Title"
 msgstr "Benutzerdefinierter Titel"
 
-#: src/gtkui/columns.cc:48
+#: src/gtkui/columns.cc:49 src/moonstone/playlist_model.cc:42
+#: src/qtui/playlist_model.cc:36 src/streamtuner/icecast-model.cc:129
+#: src/streamtuner/shoutcast-model.cc:134
 msgid "Bitrate"
 msgstr "Bitrate"
 
-#: src/gtkui/columns.cc:308
+#: src/gtkui/columns.cc:50 src/moonstone/playlist_model.cc:43
+#: src/qtui/playlist_model.cc:36
+msgid "Comment"
+msgstr "Kommentar"
+
+#: src/gtkui/columns.cc:51 src/qtui/playlist_model.cc:36
+msgid "Publisher"
+msgstr "Verlag"
+
+#: src/gtkui/columns.cc:52 src/qtui/playlist_model.cc:37
+msgid "Catalog Number"
+msgstr "Katalognummer"
+
+#: src/gtkui/columns.cc:53 src/moonstone/playlist_model.cc:43
+#: src/qtui/playlist_model.cc:37
+msgid "Disc"
+msgstr "Disc"
+
+#: src/gtkui/columns.cc:325
 msgid "Available columns"
 msgstr "Verfügbare Spalten"
 
-#: src/gtkui/columns.cc:334
+#: src/gtkui/columns.cc:351
 msgid "Displayed columns"
 msgstr "Angezeigte Spalten"
 
-#: src/gtkui/layout.cc:72 src/search-tool/search-tool.cc:40
+#: src/gtkui/layout.cc:74 src/search-tool-qt/search-tool-qt.cc:58
+#: src/search-tool/search-tool.cc:49
 msgid "Search Tool"
 msgstr "Suchwerkzeug"
 
-#: src/gtkui/layout.cc:167
+#: src/gtkui/layout.cc:170
 msgid "Dock at Left"
 msgstr "Links andocken"
 
-#: src/gtkui/layout.cc:167
+#: src/gtkui/layout.cc:170
 msgid "Dock at Right"
 msgstr "Rechts andocken"
 
-#: src/gtkui/layout.cc:168
+#: src/gtkui/layout.cc:171
 msgid "Dock at Top"
 msgstr "Oben andocken"
 
-#: src/gtkui/layout.cc:168
+#: src/gtkui/layout.cc:171
 msgid "Dock at Bottom"
 msgstr "Unten andocken"
 
-#: src/gtkui/layout.cc:168
+#: src/gtkui/layout.cc:171
 msgid "Undock"
 msgstr "Abdocken"
 
-#: src/gtkui/layout.cc:168 src/ladspa/plugin.cc:531
+#: src/gtkui/layout.cc:171 src/ladspa/plugin.cc:540
 msgid "Disable"
 msgstr "Deaktivieren"
 
-#: src/gtkui/menus.cc:126 src/qtui/main_window_actions.cc:93
-#: src/statusicon/statusicon.cc:276
+#: src/gtkui/menus.cc:79 src/qtui/menus.cc:107
+#: src/statusicon-qt/statusicon.cc:115 src/statusicon/statusicon.cc:286
 msgid "_Open Files ..."
 msgstr "_Dateien öffnen ..."
 
-#: src/gtkui/menus.cc:127
+#: src/gtkui/menus.cc:80 src/qtui/menus.cc:111
 msgid "Open _URL ..."
 msgstr "_URL öffnen ..."
 
-#: src/gtkui/menus.cc:128 src/qtui/main_window_actions.cc:95
+#: src/gtkui/menus.cc:81 src/qtui/menus.cc:113
 msgid "_Add Files ..."
 msgstr "Dateien _hinzufügen ..."
 
-#: src/gtkui/menus.cc:129
+#: src/gtkui/menus.cc:82 src/qtui/menus.cc:118
 msgid "Add U_RL ..."
 msgstr "U_RL hinzufügen ..."
 
-#: src/gtkui/menus.cc:131
+#: src/gtkui/menus.cc:84 src/qtui/menus.cc:120
 msgid "Search _Library"
-msgstr "Durchsuche _Sammlung"
+msgstr "Bibli_othek durchsuchen"
 
-#: src/gtkui/menus.cc:133 src/qtui/main_window_actions.cc:98
+#: src/gtkui/menus.cc:86 src/qtui/menus.cc:123
 msgid "A_bout ..."
 msgstr "_Info ..."
 
-#: src/gtkui/menus.cc:134 src/qtui/main_window_actions.cc:99
+#: src/gtkui/menus.cc:87 src/qtui/menus.cc:125
 msgid "_Settings ..."
 msgstr "_Einstellungen ..."
 
-#: src/gtkui/menus.cc:135 src/qtui/main_window_actions.cc:103
-#: src/statusicon/statusicon.cc:284
+#: src/gtkui/menus.cc:88 src/qtui/menus.cc:131
+#: src/statusicon-qt/statusicon.cc:117 src/statusicon/statusicon.cc:288
 msgid "_Quit"
 msgstr "_Beenden"
 
-#: src/gtkui/menus.cc:139 src/gtkui/menus.cc:262
-#: src/qtui/main_window_actions.cc:107 src/search-tool/search-tool.cc:641
-#: src/statusicon/statusicon.cc:278
+#: src/gtkui/menus.cc:92 src/gtkui/menus.cc:226
+#: src/moonstone/playlist_tabs.cc:306 src/qtui/menus.cc:135
+#: src/qtui/playlist_tabs.cc:331 src/search-tool-qt/search-tool-qt.cc:499
+#: src/search-tool/search-tool.cc:339 src/statusicon-qt/statusicon.cc:109
+#: src/statusicon/statusicon.cc:280
 msgid "_Play"
 msgstr "_Wiedergabe"
 
-#: src/gtkui/menus.cc:140 src/qtui/main_window_actions.cc:108
-#: src/statusicon/statusicon.cc:279
+#: src/gtkui/menus.cc:93 src/qtui/menus.cc:137
+#: src/statusicon-qt/statusicon.cc:110 src/statusicon/statusicon.cc:281
 msgid "Paus_e"
 msgstr "_Pause"
 
-#: src/gtkui/menus.cc:141 src/qtui/main_window_actions.cc:109
-#: src/statusicon/statusicon.cc:280
+#: src/gtkui/menus.cc:94 src/qtui/menus.cc:139
+#: src/statusicon-qt/statusicon.cc:111 src/statusicon/statusicon.cc:282
 msgid "_Stop"
 msgstr "_Stopp"
 
-#: src/gtkui/menus.cc:142 src/qtui/main_window_actions.cc:110
-#: src/statusicon/statusicon.cc:277
+#: src/gtkui/menus.cc:95 src/qtui/menus.cc:141
+#: src/statusicon-qt/statusicon.cc:112 src/statusicon/statusicon.cc:283
 msgid "Pre_vious"
 msgstr "_Vorheriger"
 
-#: src/gtkui/menus.cc:143 src/qtui/main_window_actions.cc:111
-#: src/statusicon/statusicon.cc:281
+#: src/gtkui/menus.cc:96 src/qtui/menus.cc:143
+#: src/statusicon-qt/statusicon.cc:113 src/statusicon/statusicon.cc:284
 msgid "_Next"
 msgstr "_Nächster"
 
-#: src/gtkui/menus.cc:145 src/qtui/main_window_actions.cc:113
+#: src/gtkui/menus.cc:97 src/qtui/menus.cc:145 src/skins/menus.cc:114
+#: src/skins-qt/menus.cc:105
+msgid "Previous Album"
+msgstr "Vorheriges Album"
+
+#: src/gtkui/menus.cc:98 src/qtui/menus.cc:146 src/skins/menus.cc:115
+#: src/skins-qt/menus.cc:106
+msgid "Next Album"
+msgstr "Nächstes Album"
+
+#: src/gtkui/menus.cc:100 src/qtui/menus.cc:148
 msgid "_Repeat"
 msgstr "Wieder_holen"
 
-#: src/gtkui/menus.cc:146 src/qtui/main_window_actions.cc:114
+#: src/gtkui/menus.cc:101 src/qtui/menus.cc:150
 msgid "S_huffle"
 msgstr "_Zufällige Wiedergabe"
 
-#: src/gtkui/menus.cc:147 src/qtui/main_window_actions.cc:115
+#: src/gtkui/menus.cc:102 src/qtui/menus.cc:152
+msgid "Shuffle by Albu_m"
+msgstr "Nach Album _mischen"
+
+#: src/gtkui/menus.cc:103 src/qtui/menus.cc:155
 msgid "N_o Playlist Advance"
 msgstr "Wiedergabeliste ni_cht weiterspielen"
 
-#: src/gtkui/menus.cc:148 src/qtui/main_window_actions.cc:116
+#: src/gtkui/menus.cc:104 src/qtui/menus.cc:157
 msgid "Stop A_fter This Song"
 msgstr "Nach _diesem Titel stoppen"
 
-#: src/gtkui/menus.cc:150 src/gtkui/menus.cc:247
-#: src/qtui/main_window_actions.cc:118
+#: src/gtkui/menus.cc:106 src/gtkui/menus.cc:210 src/qtui/menus.cc:162
+#: src/qtui/menus.cc:294
 msgid "Song _Info ..."
 msgstr "Titel_info ..."
 
-#: src/gtkui/menus.cc:151
+#: src/gtkui/menus.cc:107
 msgid "Jump to _Time ..."
 msgstr "Zu Z_eitangabe springen ..."
 
-#: src/gtkui/menus.cc:152
+#: src/gtkui/menus.cc:108
 msgid "_Jump to Song ..."
 msgstr "Zu _Titel springen ..."
 
-#: src/gtkui/menus.cc:154
+#: src/gtkui/menus.cc:110 src/qtui/menus.cc:165
 msgid "Set Repeat Point _A"
 msgstr "Wiederholpunkt _A setzen"
 
-#: src/gtkui/menus.cc:155
+#: src/gtkui/menus.cc:111 src/qtui/menus.cc:167
 msgid "Set Repeat Point _B"
 msgstr "Wiederholpunkt _B setzen"
 
-#: src/gtkui/menus.cc:156
+#: src/gtkui/menus.cc:112 src/qtui/menus.cc:169
 msgid "_Clear Repeat Points"
 msgstr "Wiederholpunkte _löschen"
 
-#: src/gtkui/menus.cc:160 src/gtkui/menus.cc:167 src/gtkui/menus.cc:183
-#: src/qtui/main_window_actions.cc:122 src/qtui/main_window_actions.cc:129
-#: src/qtui/main_window_actions.cc:145
+#: src/gtkui/menus.cc:116 src/gtkui/menus.cc:123 src/gtkui/menus.cc:141
+#: src/qtui/menus.cc:173 src/qtui/menus.cc:180 src/qtui/menus.cc:198
 msgid "By _Title"
 msgstr "Nach _Titel"
 
-#: src/gtkui/menus.cc:161 src/qtui/main_window_actions.cc:123
+#: src/gtkui/menus.cc:117 src/qtui/menus.cc:174
 msgid "By _File Name"
 msgstr "Nach _Dateinamen"
 
-#: src/gtkui/menus.cc:162 src/qtui/main_window_actions.cc:124
+#: src/gtkui/menus.cc:118 src/qtui/menus.cc:175
 msgid "By File _Path"
 msgstr "Nach Datei_pfad"
 
-#: src/gtkui/menus.cc:166 src/gtkui/menus.cc:182
-#: src/qtui/main_window_actions.cc:128 src/qtui/main_window_actions.cc:144
+#: src/gtkui/menus.cc:122 src/gtkui/menus.cc:140 src/qtui/menus.cc:179
+#: src/qtui/menus.cc:197
 msgid "By Track _Number"
 msgstr "Nach Titel_nummer"
 
-#: src/gtkui/menus.cc:168 src/gtkui/menus.cc:184
-#: src/qtui/main_window_actions.cc:130 src/qtui/main_window_actions.cc:146
+#: src/gtkui/menus.cc:124 src/gtkui/menus.cc:142 src/qtui/menus.cc:181
+#: src/qtui/menus.cc:199
 msgid "By _Artist"
 msgstr "Nach _Künstler"
 
-#: src/gtkui/menus.cc:169 src/gtkui/menus.cc:185
-#: src/qtui/main_window_actions.cc:131 src/qtui/main_window_actions.cc:147
+#: src/gtkui/menus.cc:125 src/gtkui/menus.cc:143 src/qtui/menus.cc:182
+#: src/qtui/menus.cc:200
 msgid "By Al_bum"
 msgstr "Nach _Album"
 
-#: src/gtkui/menus.cc:170 src/gtkui/menus.cc:186
-#: src/qtui/main_window_actions.cc:132 src/qtui/main_window_actions.cc:148
+#: src/gtkui/menus.cc:126 src/gtkui/menus.cc:144 src/qtui/menus.cc:183
+#: src/qtui/menus.cc:201
 msgid "By Albu_m Artist"
 msgstr "Nach Albu_m-Künstler"
 
-#: src/gtkui/menus.cc:171 src/gtkui/menus.cc:187
-#: src/qtui/main_window_actions.cc:133 src/qtui/main_window_actions.cc:149
+#: src/gtkui/menus.cc:127 src/gtkui/menus.cc:145 src/qtui/menus.cc:184
+#: src/qtui/menus.cc:202
 msgid "By Release _Date"
 msgstr "Nach _Erscheinungsdatum"
 
-#: src/gtkui/menus.cc:172 src/gtkui/menus.cc:188
-#: src/qtui/main_window_actions.cc:134 src/qtui/main_window_actions.cc:150
+#: src/gtkui/menus.cc:128 src/gtkui/menus.cc:146 src/qtui/menus.cc:185
+#: src/qtui/menus.cc:203
 msgid "By _Genre"
 msgstr "Nach _Genre"
 
-#: src/gtkui/menus.cc:173 src/gtkui/menus.cc:189
-#: src/qtui/main_window_actions.cc:135 src/qtui/main_window_actions.cc:151
+#: src/gtkui/menus.cc:129 src/gtkui/menus.cc:147 src/qtui/menus.cc:186
+#: src/qtui/menus.cc:204
 msgid "By _Length"
 msgstr "Nach _Länge"
 
-#: src/gtkui/menus.cc:174 src/gtkui/menus.cc:190
-#: src/qtui/main_window_actions.cc:136 src/qtui/main_window_actions.cc:152
+#: src/gtkui/menus.cc:130 src/gtkui/menus.cc:148 src/qtui/menus.cc:187
+#: src/qtui/menus.cc:205
 msgid "By _File Path"
 msgstr "Nach _Dateipfad"
 
-#: src/gtkui/menus.cc:175 src/gtkui/menus.cc:191
-#: src/qtui/main_window_actions.cc:137 src/qtui/main_window_actions.cc:153
+#: src/gtkui/menus.cc:131 src/gtkui/menus.cc:149 src/qtui/menus.cc:188
+#: src/qtui/menus.cc:206
 msgid "By _Custom Title"
 msgstr "Nach _benutzerdefiniertem Titel"
 
-#: src/gtkui/menus.cc:177 src/gtkui/menus.cc:193
-#: src/qtui/main_window_actions.cc:139 src/qtui/main_window_actions.cc:155
+#: src/gtkui/menus.cc:132 src/gtkui/menus.cc:150 src/qtui/menus.cc:189
+#: src/qtui/menus.cc:207
+msgid "By C_omment"
+msgstr "Nach K_ommentar"
+
+#: src/gtkui/menus.cc:133 src/gtkui/menus.cc:151 src/qtui/menus.cc:190
+#: src/qtui/menus.cc:208
+msgid "By D_isc Number"
+msgstr "Nach D_isc-Nummer"
+
+#: src/gtkui/menus.cc:135 src/gtkui/menus.cc:153 src/qtui/menus.cc:192
+#: src/qtui/menus.cc:210
 msgid "R_everse Order"
 msgstr "_Vertausche Anordnung"
 
-#: src/gtkui/menus.cc:178 src/gtkui/menus.cc:194
-#: src/qtui/main_window_actions.cc:140 src/qtui/main_window_actions.cc:156
+#: src/gtkui/menus.cc:136 src/gtkui/menus.cc:154 src/qtui/menus.cc:194
+#: src/qtui/menus.cc:212
 msgid "_Random Order"
 msgstr "_Zufällige Anordnung"
 
-#: src/gtkui/menus.cc:198 src/qtui/main_window_actions.cc:160
+#: src/gtkui/menus.cc:158 src/qtui/menus.cc:216
 msgid "_Play/Resume"
 msgstr "_Abspielen/Fortsetzen"
 
-#: src/gtkui/menus.cc:199 src/gtkui/menus.cc:251
-#: src/qtui/main_window_actions.cc:161
+#: src/gtkui/menus.cc:159 src/qtui/menus.cc:218
 msgid "_Refresh"
 msgstr "Aktualisie_ren"
 
-#: src/gtkui/menus.cc:201 src/qtui/main_window_actions.cc:163
+#: src/gtkui/menus.cc:161 src/qtui/menus.cc:222
 msgid "_Sort"
-msgstr "_Sortieren"
+msgstr "S_ortieren"
 
-#: src/gtkui/menus.cc:202 src/qtui/main_window_actions.cc:164
+#: src/gtkui/menus.cc:162 src/qtui/menus.cc:223
 msgid "Sort Se_lected"
 msgstr "Auswahl sor_tieren"
 
-#: src/gtkui/menus.cc:203 src/qtui/main_window_actions.cc:165
+#: src/gtkui/menus.cc:163 src/qtui/menus.cc:225
 msgid "Remove _Duplicates"
 msgstr "_Duplikate entfernen"
 
-#: src/gtkui/menus.cc:204 src/qtui/main_window_actions.cc:166
+#: src/gtkui/menus.cc:164 src/qtui/menus.cc:226
 msgid "Remove _Unavailable Files"
 msgstr "Nicht _verfügbare Dateien entfernen"
 
-#: src/gtkui/menus.cc:206 src/playlist-manager/playlist-manager.cc:244
-#: src/qtui/main_window_actions.cc:168
+#: src/gtkui/menus.cc:166 src/playlist-manager/playlist-manager.cc:219
+#: src/playlist-manager-qt/playlist-manager-qt.cc:348 src/qtui/menus.cc:229
 msgid "_New"
 msgstr "_Neu"
 
-#: src/gtkui/menus.cc:207
+#: src/gtkui/menus.cc:167 src/qtui/menus.cc:230
 msgid "Ren_ame ..."
 msgstr "_Umbenennen ..."
 
-#: src/gtkui/menus.cc:208 src/gtkui/menus.cc:264
-#: src/qtui/main_window_actions.cc:170
+#: src/gtkui/menus.cc:168 src/gtkui/menus.cc:228
+#: src/moonstone/playlist_tabs.cc:311 src/qtui/menus.cc:231
+#: src/qtui/playlist_tabs.cc:336
 msgid "Remo_ve"
 msgstr "_Löschen"
 
-#: src/gtkui/menus.cc:210
+#: src/gtkui/menus.cc:170 src/qtui/menus.cc:233
 msgid "_Import ..."
 msgstr "_Importieren ..."
 
-#: src/gtkui/menus.cc:211
+#: src/gtkui/menus.cc:171 src/qtui/menus.cc:234
 msgid "_Export ..."
 msgstr "_Exportieren ..."
 
-#: src/gtkui/menus.cc:213
+#: src/gtkui/menus.cc:173 src/qtui/menus.cc:237
 msgid "Playlist _Manager ..."
 msgstr "_Wiedergabelisten-Manager ..."
 
-#: src/gtkui/menus.cc:214 src/qtui/main_window_actions.cc:176
+#: src/gtkui/menus.cc:174 src/qtui/menus.cc:239
 msgid "_Queue Manager ..."
 msgstr "Warteschlangen-_Manager ..."
 
-#: src/gtkui/menus.cc:218 src/qtui/main_window_actions.cc:180
+#: src/gtkui/menus.cc:178 src/qtui/menus.cc:243
 msgid "Volume _Up"
 msgstr "Lautstärke er_höhen"
 
-#: src/gtkui/menus.cc:219 src/qtui/main_window_actions.cc:181
+#: src/gtkui/menus.cc:179 src/qtui/menus.cc:245
 msgid "Volume _Down"
 msgstr "Lautstärke _verringern"
 
-#: src/gtkui/menus.cc:221 src/qtui/main_window_actions.cc:183
-msgid "_Equalizer"
-msgstr "_Equalizer"
+#: src/gtkui/menus.cc:181 src/qtui/menus.cc:249
+msgid "_Equalizer ..."
+msgstr "_Equalizer ..."
 
-#: src/gtkui/menus.cc:223 src/qtui/main_window_actions.cc:185
+#: src/gtkui/menus.cc:182 src/qtui/menus.cc:251
 msgid "E_ffects ..."
 msgstr "E_ffekte ..."
 
-#: src/gtkui/menus.cc:227
+#: src/gtkui/menus.cc:184
+msgid "_Record Stream"
+msgstr "Audio _aufnehmen"
+
+#: src/gtkui/menus.cc:185
+msgid "Audio _Settings ..."
+msgstr "Audio-Einstellungen ..."
+
+#: src/gtkui/menus.cc:189 src/qtui/menus.cc:260
 msgid "Show _Menu Bar"
 msgstr "_Menüleiste anzeigen"
 
-#: src/gtkui/menus.cc:228
+#: src/gtkui/menus.cc:190 src/qtui/menus.cc:262
 msgid "Show I_nfo Bar"
 msgstr "I_nfobereich anzeigen"
 
-#: src/gtkui/menus.cc:229
+#: src/gtkui/menus.cc:191 src/qtui/menus.cc:264
+msgid "Show Info Bar _Album Art"
+msgstr "_Album-Cover im Infobereich"
+
+#: src/gtkui/menus.cc:192 src/qtui/menus.cc:266
 msgid "Show Info Bar Vis_ualization"
 msgstr "Vis_ualisierungen im Infobereich"
 
-#: src/gtkui/menus.cc:230
+#: src/gtkui/menus.cc:193 src/qtui/menus.cc:268
 msgid "Show _Status Bar"
 msgstr "_Statusleiste anzeigen"
 
-#: src/gtkui/menus.cc:232
+#: src/gtkui/menus.cc:195 src/qtui/menus.cc:272
 msgid "Show _Remaining Time"
 msgstr "Verbleibende _Zeit anzeigen"
 
-#: src/gtkui/menus.cc:234
+#: src/gtkui/menus.cc:197 src/qtui/menus.cc:276 src/skins/menus.cc:157
+#: src/skins-qt/menus.cc:152
 msgid "_Visualizations ..."
 msgstr "_Visualisierungen ..."
 
-#: src/gtkui/menus.cc:238 src/qtui/main_window_actions.cc:189
+#: src/gtkui/menus.cc:201 src/qtui/menus.cc:280
 msgid "_File"
 msgstr "_Datei"
 
-#: src/gtkui/menus.cc:239 src/qtui/main_window_actions.cc:190
+#: src/gtkui/menus.cc:202 src/qtui/menus.cc:281
 msgid "_Playback"
 msgstr "_Wiedergabe"
 
-#: src/gtkui/menus.cc:240 src/qtui/main_window_actions.cc:191
+#: src/gtkui/menus.cc:203 src/qtui/menus.cc:282
 msgid "P_laylist"
 msgstr "Wiederga_beliste"
 
-#: src/gtkui/menus.cc:241 src/gtkui/menus.cc:258
-#: src/qtui/main_window_actions.cc:192
+#: src/gtkui/menus.cc:204 src/gtkui/menus.cc:222 src/qtui/menus.cc:283
+#: src/qtui/menus.cc:312
 msgid "_Services"
 msgstr "Die_nste"
 
-#: src/gtkui/menus.cc:242 src/qtui/main_window_actions.cc:193
+#: src/gtkui/menus.cc:205 src/qtui/menus.cc:284
 msgid "_Output"
 msgstr "_Ausgabe"
 
-#: src/gtkui/menus.cc:243
+#: src/gtkui/menus.cc:206 src/qtui/menus.cc:285
 msgid "_View"
 msgstr "An_sicht"
 
-#: src/gtkui/menus.cc:248
+#: src/gtkui/menus.cc:211 src/qtui/menus.cc:296
 msgid "_Queue/Unqueue"
 msgstr "In/Aus _Warteschlange"
 
-#: src/gtkui/menus.cc:250
+#: src/gtkui/menus.cc:213 src/qtui/menus.cc:299
 msgid "_Open Containing Folder"
 msgstr "_Beinhaltenden Ordner öffen"
 
-#: src/gtkui/menus.cc:253
+#: src/gtkui/menus.cc:214 src/qtui/menus.cc:301
+msgid "_Refresh Selected"
+msgstr "Ausgewählte aktualisie_ren"
+
+#: src/gtkui/menus.cc:216 src/qtui/menus.cc:304
 msgid "Cu_t"
 msgstr "Aus_schneiden"
 
-#: src/gtkui/menus.cc:254
+#: src/gtkui/menus.cc:217 src/qtui/menus.cc:305
 msgid "_Copy"
 msgstr "_Kopieren"
 
-#: src/gtkui/menus.cc:255
+#: src/gtkui/menus.cc:218 src/qtui/menus.cc:306
 msgid "_Paste"
 msgstr "_Einfügen"
 
-#: src/gtkui/menus.cc:256
+#: src/gtkui/menus.cc:219 src/qtui/menus.cc:307
+msgid "Paste at _End"
+msgstr "Am _Ende einfügen"
+
+#: src/gtkui/menus.cc:220 src/qtui/menus.cc:309
 msgid "Select _All"
 msgstr "_Alles auswählen"
 
-#: src/gtkui/menus.cc:263
+#: src/gtkui/menus.cc:227 src/moonstone/playlist_tabs.cc:309
+#: src/qtui/playlist_tabs.cc:334
 msgid "_Rename ..."
 msgstr "_Umbenennen ..."
 
-#: src/gtkui/settings.cc:35
+#: src/gtkui/settings.cc:35 src/qtui/settings.cc:59
+msgid "Always"
+msgstr "Immer"
+
+#: src/gtkui/settings.cc:36 src/qtui/settings.cc:60
+msgid "Auto-hide"
+msgstr "Automatisch verstecken"
+
+#: src/gtkui/settings.cc:37 src/qtui/settings.cc:61
+msgid "Never"
+msgstr "Nie"
+
+#: src/gtkui/settings.cc:41 src/qtui/settings.cc:64
 msgid "Playlist Tabs"
 msgstr "Wiedergabelistenreiter"
 
-#: src/gtkui/settings.cc:36
-msgid "Always show tabs"
-msgstr "Wiedergabelistenreiter immer anzeigen"
+#: src/gtkui/settings.cc:42 src/qtui/settings.cc:65
+msgid "Show playlist tabs:"
+msgstr "Wiedergabelistenreiter anzeigen:"
 
-#: src/gtkui/settings.cc:38
+#: src/gtkui/settings.cc:45 src/qtui/settings.cc:69
 msgid "Show entry counts"
 msgstr "Titelanzahl anzeigen"
 
-#: src/gtkui/settings.cc:40
+#: src/gtkui/settings.cc:47 src/qtui/settings.cc:72
 msgid "Show close buttons"
-msgstr "Schließen-Buttons anzeigen"
+msgstr "Schließen-Schaltflächen anzeigen"
 
-#: src/gtkui/settings.cc:42
+#: src/gtkui/settings.cc:49 src/qtui/settings.cc:75
 msgid "Playlist Columns"
 msgstr "Wiedergabelistenspalten"
 
-#: src/gtkui/settings.cc:44
+#: src/gtkui/settings.cc:51 src/qtui/settings.cc:77
 msgid "Show column headers"
 msgstr "Spaltenüberschriften anzeigen"
 
-#: src/gtkui/settings.cc:46 src/modplug/plugin_main.cc:106
-#: src/skins/skins_cfg.cc:263
-msgid "Miscellaneous"
-msgstr "Sonstiges"
-
-#: src/gtkui/settings.cc:47
-msgid "Arrow keys seek by:"
-msgstr "Zeitspanne für Pfeiltasten:"
+#: src/gtkui/settings.cc:53 src/qtui/settings.cc:82
+msgid "Make column headers clickable for sorting"
+msgstr "Spaltenüberschriften zum Sortieren anklickbar machen"
+
+#: src/gtkui/settings.cc:56
+msgid "Use symbolic icons in toolbar"
+msgstr "Symbolische Icons in Werkzeugleiste verwenden"
 
-#: src/gtkui/settings.cc:50
+#: src/gtkui/settings.cc:58 src/qtui/settings.cc:86
 msgid "Scroll on song change"
 msgstr "Mit Titelwechsel scrollen"
 
-#: src/gtkui/ui_gtk.cc:71
+#: src/gtkui/ui_gtk.cc:82
 msgid "GTK Interface"
 msgstr "GTK Interface"
 
-#: src/gtkui/ui_gtk.cc:222 src/skins/ui_main.cc:232
+#: src/gtkui/ui_gtk.cc:219 src/skins/main.cc:228 src/skins-qt/main.cc:231
 #, c-format
 msgid "%s - Audacious"
 msgstr "%s - Audacious"
 
-#: src/gtkui/ui_gtk.cc:225 src/qtui/main_window.cc:186
+#: src/gtkui/ui_gtk.cc:221 src/moonstone/main_window.cc:184
+#: src/qtui/main_window.cc:385
 msgid "Buffering ..."
 msgstr "Puffern ..."
 
-#: src/gtkui/ui_gtk.cc:228 src/skins/ui_main.cc:234 src/skins/ui_main.cc:1164
+#: src/gtkui/ui_gtk.cc:224 src/pipewire/pipewire.cc:402 src/skins/main.cc:230
+#: src/skins-qt/main.cc:233
 msgid "Audacious"
 msgstr "Audacious"
 
-#: src/gtkui/ui_statusbar.cc:63 src/qtui/status_bar.cc:67
+#: src/gtkui/ui_gtk.cc:487 src/gtkui/ui_gtk.cc:518 src/gtkui/ui_gtk.cc:882
+#: src/hotkey/gui.cc:72 src/moonstone/main_window.cc:67
+#: src/moonstone/main_window.cc:145 src/moonstone/main_window.cc:146
+#: src/notify/osd.cc:85 src/qthotkey/gui.cc:67 src/qtui/main_window.cc:154
+#: src/qtui/main_window.cc:347 src/qtui/main_window.cc:348
+#: src/skins/menus.cc:109 src/skins-qt/menus.cc:100
+msgid "Play"
+msgstr "Wiedergabe"
+
+#: src/gtkui/ui_gtk.cc:487 src/moonstone/main_window.cc:151
+#: src/moonstone/main_window.cc:152 src/notify/osd.cc:82
+#: src/qtui/main_window.cc:353 src/qtui/main_window.cc:354
+#: src/skins/menus.cc:110 src/skins-qt/menus.cc:101
+msgid "Pause"
+msgstr "Pause"
+
+#: src/gtkui/ui_gtk.cc:868 src/moonstone/main_window.cc:57
+#: src/qtui/main_window.cc:145 src/skins/menus.cc:86 src/skins-qt/menus.cc:77
+msgid "Search Library"
+msgstr "Bibliothek durchsuchen"
+
+#: src/gtkui/ui_gtk.cc:875 src/moonstone/main_window.cc:60
+#: src/qtui/main_window.cc:147
+msgid "Open Files"
+msgstr "Dateien öffnen"
+
+#: src/gtkui/ui_gtk.cc:876 src/moonstone/main_window.cc:62
+#: src/qtui/main_window.cc:149
+msgid "Add Files"
+msgstr "Dateien hinzufügen"
+
+#: src/gtkui/ui_gtk.cc:881 src/moonstone/main_window.cc:65
+#: src/qtui/main_window.cc:152 src/skins/menus.cc:112 src/skins-qt/menus.cc:103
+msgid "Previous"
+msgstr "Vorheriger"
+
+#: src/gtkui/ui_gtk.cc:883 src/hotkey/gui.cc:74 src/moonstone/main_window.cc:69
+#: src/qthotkey/gui.cc:69 src/qtui/main_window.cc:156 src/skins/menus.cc:111
+#: src/skins-qt/menus.cc:102
+msgid "Stop"
+msgstr "Stopp"
+
+#: src/gtkui/ui_gtk.cc:884 src/moonstone/main_window.cc:76 src/notify/osd.cc:89
+#: src/qtui/main_window.cc:163 src/skins/menus.cc:113 src/skins-qt/menus.cc:104
+msgid "Next"
+msgstr "Nächster"
+
+#: src/gtkui/ui_gtk.cc:886 src/moonstone/main_window.cc:79
+#: src/qtui/main_window.cc:166 src/qtui/menus.cc:254 src/skins/menus.cc:79
+#: src/skins-qt/menus.cc:69
+msgid "Record Stream"
+msgstr "Audio aufnehmen"
+
+#: src/gtkui/ui_gtk.cc:919 src/moonstone/main_window.cc:86
+#: src/qtui/main_window.cc:173 src/skins/menus.cc:103 src/skins-qt/menus.cc:94
+msgid "Repeat"
+msgstr "Wiederholen"
+
+#: src/gtkui/ui_gtk.cc:922 src/moonstone/main_window.cc:89
+#: src/qtui/main_window.cc:176 src/skins/menus.cc:104 src/skins-qt/menus.cc:95
+msgid "Shuffle"
+msgstr "Zufällige Wiedergabe"
+
+#: src/gtkui/ui_gtk.cc:1114 src/qtui/main_window.cc:123
+msgid "Menu"
+msgstr "Menü"
+
+#: src/gtkui/ui_statusbar.cc:64 src/qtui/status_bar.cc:155
 msgid "mono"
 msgstr "Mono"
 
-#: src/gtkui/ui_statusbar.cc:65 src/qtui/status_bar.cc:69
+#: src/gtkui/ui_statusbar.cc:66 src/qtui/status_bar.cc:157
 msgid "stereo"
 msgstr "Stereo"
 
-#: src/gtkui/ui_statusbar.cc:67 src/qtui/status_bar.cc:71
+#: src/gtkui/ui_statusbar.cc:68 src/qtui/status_bar.cc:160
 #, c-format
 msgid "%d channel"
 msgid_plural "%d channels"
 msgstr0 "%d Kanal"
 msgstr1 "%d Kanäle"
 
-#: src/gtkui/ui_statusbar.cc:81 src/qtui/status_bar.cc:85
+#: src/gtkui/ui_statusbar.cc:76 src/qtui/status_bar.cc:168
 #, c-format
-msgid "%d kbps"
-msgstr "%d kbps"
+msgid "%d kHz"
+msgstr "%d kHz"
 
-#: src/gtkui/ui_statusbar.cc:107 src/skins/ui_main_evlisteners.cc:103
+#: src/gtkui/ui_statusbar.cc:82 src/qtui/status_bar.cc:174
+#, c-format
+msgid "%d kbit/s"
+msgstr "%d kbit/s"
+
+#: src/gtkui/ui_statusbar.cc:108 src/skins/main.cc:478 src/skins-qt/main.cc:461
 msgid "Single mode."
 msgstr "Single-Modus."
 
-#: src/gtkui/ui_statusbar.cc:109 src/skins/ui_main_evlisteners.cc:105
+#: src/gtkui/ui_statusbar.cc:110 src/skins/main.cc:480 src/skins-qt/main.cc:463
 msgid "Playlist mode."
 msgstr "Wiedergabelistenmodus."
 
-#: src/gtkui/ui_statusbar.cc:117 src/skins/ui_main_evlisteners.cc:111
+#: src/gtkui/ui_statusbar.cc:118 src/skins/main.cc:486 src/skins-qt/main.cc:469
 msgid "Stopping after song."
 msgstr "Nach Titel stoppen."
 
-#: src/hotkey/gui.cc:71
+#: src/hotkey/gui.cc:71 src/qthotkey/gui.cc:66
 msgid "Previous track"
 msgstr "Vorheriger Titel"
 
-#: src/hotkey/gui.cc:72 src/notify/osd.cc:69 src/qtui/main_window.cc:69
-#: src/qtui/main_window.cc:172 src/qtui/main_window.cc:173
-#: src/skins/menus.cc:87
-msgid "Play"
-msgstr "Wiedergabe"
-
-#: src/hotkey/gui.cc:73
+#: src/hotkey/gui.cc:73 src/qthotkey/gui.cc:68
 msgid "Pause/Resume"
 msgstr "Pause/Fortsetzen"
 
-#: src/hotkey/gui.cc:74 src/qtui/main_window.cc:70 src/skins/menus.cc:89
-msgid "Stop"
-msgstr "Stopp"
-
-#: src/hotkey/gui.cc:75
+#: src/hotkey/gui.cc:75 src/qthotkey/gui.cc:70
 msgid "Next track"
 msgstr "Nächster Titel"
 
-#: src/hotkey/gui.cc:76
-msgid "Forward 5 seconds"
-msgstr "5 Sekunden vorspulen"
-
-#: src/hotkey/gui.cc:77
-msgid "Rewind 5 seconds"
-msgstr "5 Sekunden zurückspulen"
+#: src/hotkey/gui.cc:76 src/qthotkey/gui.cc:71
+msgid "Step forward"
+msgstr "Vorspringen"
+
+#: src/hotkey/gui.cc:77 src/qthotkey/gui.cc:72
+msgid "Step backward"
+msgstr "Zurückspringen"
 
-#: src/hotkey/gui.cc:78
+#: src/hotkey/gui.cc:78 src/qthotkey/gui.cc:73
 msgid "Mute"
 msgstr "Stumm"
 
-#: src/hotkey/gui.cc:79
+#: src/hotkey/gui.cc:79 src/qthotkey/gui.cc:74
 msgid "Volume up"
 msgstr "Lautstärke erhöhen"
 
-#: src/hotkey/gui.cc:80
+#: src/hotkey/gui.cc:80 src/qthotkey/gui.cc:75
 msgid "Volume down"
 msgstr "Lautstärke verringern"
 
-#: src/hotkey/gui.cc:81
+#: src/hotkey/gui.cc:81 src/qthotkey/gui.cc:76
 msgid "Jump to file"
 msgstr "Zu Titel springen"
 
-#: src/hotkey/gui.cc:82
+#: src/hotkey/gui.cc:82 src/qthotkey/gui.cc:77
 msgid "Toggle player window(s)"
 msgstr "Fenster anzeigen/verstecken"
 
-#: src/hotkey/gui.cc:83
+#: src/hotkey/gui.cc:83 src/qthotkey/gui.cc:78
 msgid "Show On-Screen-Display"
 msgstr "On-Screen-Display anzeigen"
 
-#: src/hotkey/gui.cc:84
+#: src/hotkey/gui.cc:84 src/qthotkey/gui.cc:79
 msgid "Toggle repeat"
 msgstr "Wiederholen ein-/ausschalten"
 
-#: src/hotkey/gui.cc:85
+#: src/hotkey/gui.cc:85 src/qthotkey/gui.cc:80
 msgid "Toggle shuffle"
 msgstr "Zufällige Wiedergabe ein-/ausschalten"
 
-#: src/hotkey/gui.cc:86
+#: src/hotkey/gui.cc:86 src/qthotkey/gui.cc:81
 msgid "Toggle stop after current"
 msgstr "Nach diesem Titel stoppen ein-/ausschalten"
 
-#: src/hotkey/gui.cc:87
+#: src/hotkey/gui.cc:87 src/qthotkey/gui.cc:82
 msgid "Raise player window(s)"
 msgstr "Fenster in den Vordergrund holen"
 
-#: src/hotkey/gui.cc:97
+#: src/hotkey/gui.cc:98 src/qthotkey/gui.cc:100
 msgid "(none)"
 msgstr "(keine)"
 
-#: src/hotkey/gui.cc:234
+#: src/hotkey/gui.cc:261
 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 modifiers.\n"
 "\n"
 "Do you want to continue?"
 msgstr ""
@@ -2172,11 +2245,11 @@
 "\n"
 "Möchten Sie trotzdem fortfahren?"
 
-#: src/hotkey/gui.cc:236
+#: src/hotkey/gui.cc:264
 msgid "Binding mouse buttons"
 msgstr "Maustastenkombinationen"
 
-#: src/hotkey/gui.cc:391
+#: src/hotkey/gui.cc:434
 msgid ""
 "Press a key combination inside a text field.\n"
 "You can also bind mouse buttons."
@@ -2184,34 +2257,34 @@
 "Drücken Sie eine Tastenkombination innerhalb eines Textfeldes.\n"
 "Sie können auch Maustasten verwenden."
 
-#: src/hotkey/gui.cc:396
+#: src/hotkey/gui.cc:444 src/qthotkey/gui.cc:179
 msgid "Hotkeys:"
 msgstr "Tastenkürzel:"
 
-#: src/hotkey/gui.cc:413
+#: src/hotkey/gui.cc:457 src/qthotkey/gui.cc:181
 msgid "Action:"
 msgstr "Aktion:"
 
-#: src/hotkey/gui.cc:420
+#: src/hotkey/gui.cc:461 src/qthotkey/gui.cc:182
 msgid "Key Binding:"
 msgstr "Tastenkombination:"
 
-#: src/hotkey/gui.cc:468
+#: src/hotkey/gui.cc:518 src/qthotkey/gui.cc:184
 msgid "_Add"
 msgstr "_Hinzufügen"
 
-#: src/hotkey/plugin.cc:61
+#: src/hotkey/plugin.cc:59 src/qthotkey/plugin.cc:78
 msgid "Global Hotkeys"
 msgstr "Globale Tastenkürzel"
 
-#: src/hotkey/plugin.cc:79
+#: src/hotkey/plugin.cc:74
 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"
+"Contributors 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"
@@ -2221,7 +2294,7 @@
 "Globale Tastenkürzel Plugin\n"
 "Audacious mit globalen Tastenkürzeln oder Multimediatasten bedienen.\n"
 "\n"
-"Copyright (C) 2007 Sascha Hlusiak <contact@saschahlusiak.de>\n"
+"Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n"
 "\n"
 "Mitwirkende:\n"
 "Copyright (C) 2006-2007 Vladimir Paskov <vlado.paskov@gmail.com>\n"
@@ -2230,25 +2303,54 @@
 " Jonathan A. Davis <davis@jdhouse.org>,\n"
 " Jeremy Tan <nsx@nsx.homeip.net>"
 
-#: src/jack-ng/jack-ng.cc:49
+#: src/jack/jack-ng.cc:54
 msgid "JACK Output"
 msgstr "JACK Ausgabe"
 
-#: src/jack-ng/jack-ng.cc:114
+#: src/jack/jack-ng.cc:126
+msgid "Client name:"
+msgstr "Client-Name:"
+
+#: src/jack/jack-ng.cc:128
 msgid "Automatically connect to output ports"
 msgstr "Automatisch mit Ausgabeports verbinden"
 
-#: src/jack-ng/jack-ng.cc:155
+#: src/jack/jack-ng.cc:130
+msgid "Filter ports (regex, use any port if blank):"
+msgstr "Ports filtern (Regex, wenn leer benutze jeden Port):"
+
+#: src/jack/jack-ng.cc:136
+msgid "Connect to physical ports only"
+msgstr "Verbinde nur zu physikalischen Ports"
+
+#: src/jack/jack-ng.cc:139
+msgid "Upmix to"
+msgstr "Verwende Upmix auf"
+
+#: src/jack/jack-ng.cc:141
+msgid "ports if input has fewer channels"
+msgstr "Ports wenn Eingabe weniger Kanäle hat"
+
+#: src/jack/jack-ng.cc:143
+msgid "Ignore insufficient number of ports"
+msgstr "Ignoriere nicht ausreichende Anzahl an Ports"
+
+#: src/jack/jack-ng.cc:181
+msgid "No JACK output ports were found. Please check settings."
+msgstr ""
+"Es wurde kein JACK Ausgabeport gefunden. Bitte prüfen Sie die Einstellungen."
+
+#: src/jack/jack-ng.cc:195
 #, c-format
 msgid "Only %d JACK output ports were found but %d are required."
 msgstr "Nur %d JACK Ausgabeports gefunden, aber %d erforderlich."
 
-#: src/jack-ng/jack-ng.cc:164
+#: src/jack/jack-ng.cc:210
 #, c-format
 msgid "Failed to connect to JACK port %s."
 msgstr "Verbinden zu JACK Port %s fehlgeschlagen."
 
-#: src/jack-ng/jack-ng.cc:184
+#: src/jack/jack-ng.cc:230
 msgid ""
 "JACK supports only floating-point audio. You must change the output bit "
 "depth to floating-point in Audacious settings."
@@ -2256,11 +2358,11 @@
 "JACK unterstützt nur Gleitkomma Audio. Sie müssen die Ausgabe Bittiefe in "
 "den Audacious Einstellungen auf »Gleitkomma« ändern."
 
-#: src/jack-ng/jack-ng.cc:197
+#: src/jack/jack-ng.cc:245
 msgid "Failed to connect to the JACK server; is it running?"
 msgstr "Verbinden zum JACK Server fehlgeschlagen. Ist er aktiv?"
 
-#: src/jack-ng/jack-ng.cc:273
+#: src/jack/jack-ng.cc:321
 #, c-format
 msgid ""
 "The JACK server requires a sample rate of %d Hz, but Audacious is playing at "
@@ -2270,16 +2372,16 @@
 "mit %d Hz. Bitte benutzen Sie den Abtastraten-Konverter Effekt, um diese "
 "Diskrepanz zu korrigieren."
 
-#: src/ladspa/plugin.cc:414
+#: src/ladspa/plugin.cc:416
 #, c-format
 msgid "%s Settings"
 msgstr "%s Einstellungen"
 
-#: src/ladspa/plugin.cc:478
+#: src/ladspa/plugin.cc:482
 msgid "Module paths:"
 msgstr "Modulpfade:"
 
-#: src/ladspa/plugin.cc:483
+#: src/ladspa/plugin.cc:487
 msgid ""
 "Separate multiple paths with a colon.\n"
 "These paths are searched in addition to LADSPA_PATH.\n"
@@ -2290,25 +2392,25 @@
 "Drücken Sie nach dem Hinzufügen neuer Pfade Enter, um nach neuen Plugins zu "
 "suchen."
 
-#: src/ladspa/plugin.cc:499
+#: src/ladspa/plugin.cc:508
 msgid "Available plugins:"
 msgstr "Verfügbare Plugins:"
 
-#: src/ladspa/plugin.cc:512 src/modplug/plugin_main.cc:92
-#: src/modplug/plugin_main.cc:95 src/modplug/plugin_main.cc:98
-#: src/modplug/plugin_main.cc:101
+#: src/ladspa/plugin.cc:521 src/modplug/plugin_main.cc:91
+#: src/modplug/plugin_main.cc:94 src/modplug/plugin_main.cc:97
+#: src/modplug/plugin_main.cc:100
 msgid "Enable"
 msgstr "Aktivieren"
 
-#: src/ladspa/plugin.cc:518
+#: src/ladspa/plugin.cc:527
 msgid "Enabled plugins:"
 msgstr "Aktive Plugins:"
 
-#: src/ladspa/plugin.cc:534
+#: src/ladspa/plugin.cc:543
 msgid "Settings"
 msgstr "Einstellungen"
 
-#: src/ladspa/plugin.cc:551
+#: src/ladspa/plugin.cc:560
 msgid ""
 "LADSPA Host for Audacious\n"
 "Copyright 2011 John Lindgren"
@@ -2324,7 +2426,7 @@
 msgid "LIRC Plugin"
 msgstr "LIRC Plugin"
 
-#: src/lirc/lirc.cc:381
+#: src/lirc/lirc.cc:379
 msgid ""
 "A simple plugin to control Audacious using the LIRC remote control daemon\n"
 "\n"
@@ -2352,63 +2454,125 @@
 "\n"
 "Besuchen Sie http://lirc.org für weitere Informationen über LIRC."
 
-#: src/lirc/lirc.cc:392
+#: src/lirc/lirc.cc:390
 msgid "Connection"
 msgstr "Verbindung"
 
-#: src/lirc/lirc.cc:393
+#: src/lirc/lirc.cc:391
 msgid "Reconnect to LIRC server"
 msgstr "Zum LIRC Server wiederverbinden"
 
-#: src/lirc/lirc.cc:395
+#: src/lirc/lirc.cc:393
 msgid "Wait before reconnecting:"
 msgstr "Zeitspanne bis zum Wiederverbinden:"
 
-#: src/lyricwiki/lyricwiki.cc:41
-msgid "LyricWiki Plugin"
-msgstr "LyricWiki Plugin"
-
-#: src/lyricwiki/lyricwiki.cc:131 src/lyricwiki-qt/lyricwiki.cc:136
-msgid "No lyrics available"
-msgstr "Keine Liedtexte verfügbar"
-
-#: src/lyricwiki/lyricwiki.cc:217 src/lyricwiki/lyricwiki.cc:226
-#: src/lyricwiki/lyricwiki.cc:243 src/lyricwiki/lyricwiki.cc:252
-#: src/lyricwiki/lyricwiki.cc:267 src/lyricwiki-qt/lyricwiki.cc:222
-#: src/lyricwiki-qt/lyricwiki.cc:231 src/lyricwiki-qt/lyricwiki.cc:248
-#: src/lyricwiki-qt/lyricwiki.cc:257 src/lyricwiki-qt/lyricwiki.cc:272
-msgid "Error"
-msgstr "Fehler"
-
-#: src/lyricwiki/lyricwiki.cc:218 src/lyricwiki/lyricwiki.cc:244
-#: src/lyricwiki-qt/lyricwiki.cc:223 src/lyricwiki-qt/lyricwiki.cc:249
+#: src/lyrics-common/chart_lyrics_provider.cc:93
+#: src/lyrics-common/chart_lyrics_provider.cc:150
+#: src/lyrics-common/lyrics_ovh_provider.cc:50
 #, c-format
 msgid "Unable to fetch %s"
 msgstr "Abrufen von »%s« nicht möglich"
 
-#: src/lyricwiki/lyricwiki.cc:227 src/lyricwiki/lyricwiki.cc:253
-#: src/lyricwiki-qt/lyricwiki.cc:232 src/lyricwiki-qt/lyricwiki.cc:258
+#: src/lyrics-common/chart_lyrics_provider.cc:100
+#: src/lyrics-common/chart_lyrics_provider.cc:157
+#: src/lyrics-common/lyrics_ovh_provider.cc:57
 #, c-format
 msgid "Unable to parse %s"
 msgstr "Parsen von »%s« nicht möglich"
 
-#: src/lyricwiki/lyricwiki.cc:259 src/lyricwiki-qt/lyricwiki.cc:264
+#: src/lyrics-common/chart_lyrics_provider.cc:121
+#: src/lyrics-common/chart_lyrics_provider.cc:194
+#: src/lyrics-common/lyrics_ovh_provider.cc:88
 msgid "Looking for lyrics ..."
 msgstr "Suche nach Liedtexten ..."
 
-#: src/lyricwiki/lyricwiki.cc:267 src/lyricwiki-qt/lyricwiki.cc:272
-msgid "Missing song metadata"
-msgstr "Fehlende Titel-Metadaten"
-
-#: src/lyricwiki/lyricwiki.cc:278 src/lyricwiki-qt/lyricwiki.cc:283
-msgid "Connecting to lyrics.wikia.com ..."
-msgstr "Verbinde zu lyrics.wikia.com ..."
-
-#: src/lyricwiki-qt/lyricwiki.cc:55
-msgid "LyricWiki Plugin (Qt)"
-msgstr "LyricWiki-Plugin (Qt)"
+#: src/lyrics-common/preferences.h:43
+msgid "Nowhere"
+msgstr "Nirgendwo"
+
+#: src/lyrics-common/preferences.h:49
+msgid "Artist is truncated at the start, Title -- at the end"
+msgstr "Künstler wird vorne abgeschnitten, Titel am Ende"
+
+#: src/lyrics-common/preferences.h:50
+msgid "Chars to truncate on:"
+msgstr "Zeichen, nach denen abgeschnitten wird:"
+
+#: src/lyrics-common/preferences.h:54
+msgid "Chars are ORed in RegExp, surrounded by whitespace"
+msgstr ""
+"Zeichen sind in Regulären Ausdrücken verodert, umschlossen von "
+"Leerzeichen"
+
+#: src/lyrics-common/preferences.h:55
+msgid "Chars to split on:"
+msgstr "Zeichen für das Auftrennen:"
+
+#: src/lyrics-common/preferences.h:56
+msgid "Further truncate those on chars"
+msgstr "Weiter abschneiden nach Zeichen"
+
+#: src/lyrics-common/preferences.h:62
+msgid "General"
+msgstr "Allgemeines"
+
+#: src/lyrics-common/preferences.h:63
+msgid "Split title into artist and title on chars"
+msgstr "Trenne Titel in Künstler und Titel anhand Zeichen"
 
-#: src/m3u/m3u.cc:32
+#: src/lyrics-common/preferences.h:66
+msgid "Sources"
+msgstr "Bezugsquellen"
+
+#: src/lyrics-common/preferences.h:67
+msgid "Use embedded lyrics (from Lyrics tag)"
+msgstr "Nutze eingebettete Liedtexte (aus den Lyrics-Metadaten)"
+
+#: src/lyrics-common/preferences.h:69
+msgid "Fetch lyrics from internet:"
+msgstr "Rufe Liedtexte aus dem Internet ab:"
+
+#: src/lyrics-common/preferences.h:72
+msgid "Store fetched lyrics in local cache"
+msgstr "Speichere abgerufene Liedtexte in lokalem Zwischenspeicher"
+
+#: src/lyrics-common/preferences.h:74
+msgid "Local Storage"
+msgstr "Lokaler Speicher"
+
+#: src/lyrics-common/preferences.h:75
+msgid "Load lyric files (.lrc) from local storage"
+msgstr "Lade Liedtextdateien (.lrc) von lokalem Speicher"
+
+#: src/lyrics-common/utils.cc:54 src/ui-common/dialogs-qt.cc:63
+msgid "Error"
+msgstr "Fehler"
+
+#: src/lyrics-common/utils.cc:60
+msgid "Lyrics could not be found."
+msgstr "Kein Liedtext gefunden."
+
+#: src/lyrics-common/utils.cc:142
+msgid "Missing title and/or artist."
+msgstr "Fehlender Titel und/oder Künstler."
+
+#: src/lyrics-gtk/lyrics-gtk.cc:37 src/lyrics-qt/lyrics-qt.cc:50
+msgid "Lyrics"
+msgstr "Liedtexte"
+
+#: src/lyrics-gtk/lyrics-gtk.cc:189 src/lyrics-qt/lyrics-qt.cc:171
+msgid "Edit Lyrics ..."
+msgstr "Liedtext bearbeiten ..."
+
+#: src/lyrics-gtk/lyrics-gtk.cc:195 src/lyrics-qt/lyrics-qt.cc:178
+msgid "Save Locally"
+msgstr "Lokal speichern"
+
+#: src/lyrics-gtk/lyrics-gtk.cc:201 src/lyrics-qt/lyrics-qt.cc:186
+msgid "Refresh"
+msgstr "Aktualisieren"
+
+#: src/m3u/m3u.cc:33
 msgid "M3U Playlists"
 msgstr "M3U Wiedergabelisten"
 
@@ -2416,17 +2580,17 @@
 msgid "Tact Generator"
 msgstr "Takt-Generator"
 
-#: src/metronom/metronom.cc:147
+#: src/metronom/metronom.cc:145
 #, c-format
 msgid "Tact generator: %d bpm"
 msgstr "Takt-Generator: %d BPM"
 
-#: src/metronom/metronom.cc:149
+#: src/metronom/metronom.cc:147
 #, c-format
 msgid "Tact generator: %d bpm %d/%d"
 msgstr "Takt-Generator: %d BPM %d/%d"
 
-#: src/metronom/metronom.cc:237
+#: src/metronom/metronom.cc:235
 msgid ""
 "A Tact Generator by Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
 "\n"
@@ -2437,14 +2601,14 @@
 "Ein Takt-Generator von Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
 "\n"
 "Um ihn zu benutzen, fügen Sie eine URL hinzu: tact://Schläge*Zähler/Nenner\n"
-"z.B. tact://77 zum Spielen von 77 BPM\n"
+"z. B. tact://77 zum Spielen von 77 BPM\n"
 "oder tact://60*3/4 zum Spielen von 60 BPM im 3/4-Takt"
 
-#: src/mixer/mixer.cc:38
+#: src/mixer/mixer.cc:43
 msgid "Channel Mixer"
 msgstr "Kanal-Mixer"
 
-#: src/mixer/mixer.cc:202
+#: src/mixer/mixer.cc:255
 msgid ""
 "Channel Mixer Plugin for Audacious\n"
 "Copyright 2011-2012 John Lindgren and Michał Lipski"
@@ -2452,11 +2616,11 @@
 "Kanal-Mixer Plugin für Audacious\n"
 "Copyright 2011-2012 John Lindgren und Michał Lipski"
 
-#: src/mixer/mixer.cc:206
+#: src/mixer/mixer.cc:259
 msgid "Channel Mixer"
 msgstr "Kanal-Mixer"
 
-#: src/mixer/mixer.cc:207
+#: src/mixer/mixer.cc:260
 msgid "Output channels:"
 msgstr "Ausgabekanäle:"
 
@@ -2468,168 +2632,177 @@
 msgid "Error connecting to MMS server"
 msgstr "Fehler beim Verbinden zum MMS Server"
 
-#: src/modplug/modplugbmp.h:53
+#: src/modplug/modplugbmp.h:57
 msgid "ModPlug (Module Player)"
 msgstr "ModPlug (Modulspieler)"
 
-#: src/modplug/plugin_main.cc:53
-msgid "Resolution"
-msgstr "Auflösung"
-
-#: src/modplug/plugin_main.cc:54
-msgid "8-bit"
-msgstr "8-Bit"
-
 #: src/modplug/plugin_main.cc:55
-msgid "16-bit"
-msgstr "16-Bit"
-
-#: src/modplug/plugin_main.cc:56
 msgid "Channels"
 msgstr "Kanäle"
 
-#: src/modplug/plugin_main.cc:60
+#: src/modplug/plugin_main.cc:59
 msgid "Nearest (fastest)"
 msgstr "Nächstliegend (am schnellsten)"
 
-#: src/modplug/plugin_main.cc:61
+#: src/modplug/plugin_main.cc:60
 msgid "Linear (fast)"
 msgstr "Linear (schnell)"
 
-#: src/modplug/plugin_main.cc:62
+#: src/modplug/plugin_main.cc:61
 msgid "Spline (good)"
 msgstr "Spline (gute Qualität)"
 
-#: src/modplug/plugin_main.cc:63
+#: src/modplug/plugin_main.cc:62
 msgid "Polyphase (best)"
 msgstr "Polyphase (beste Qualität)"
 
-#: src/modplug/plugin_main.cc:64
+#: src/modplug/plugin_main.cc:63
 msgid "Sample rate"
 msgstr "Abtastrate"
 
-#: src/modplug/plugin_main.cc:65
+#: src/modplug/plugin_main.cc:64
 msgid "22 kHz"
 msgstr "22 kHz"
 
-#: src/modplug/plugin_main.cc:66
+#: src/modplug/plugin_main.cc:65
 msgid "44 kHz"
 msgstr "44 kHz"
 
-#: src/modplug/plugin_main.cc:67
+#: src/modplug/plugin_main.cc:66
 msgid "48 kHz"
 msgstr "48 kHz"
 
-#: src/modplug/plugin_main.cc:68
+#: src/modplug/plugin_main.cc:67
 msgid "96 kHz"
 msgstr "96 kHz"
 
-#: src/modplug/plugin_main.cc:72 src/modplug/plugin_main.cc:77
-#: src/modplug/plugin_main.cc:82
+#: src/modplug/plugin_main.cc:71 src/modplug/plugin_main.cc:76
+#: src/modplug/plugin_main.cc:81
 msgid "Level:"
 msgstr "Pegel:"
 
-#: src/modplug/plugin_main.cc:78
+#: src/modplug/plugin_main.cc:77
 msgid "Cutoff:"
 msgstr "Grenzfrequenz:"
 
-#: src/modplug/plugin_main.cc:91
+#: src/modplug/plugin_main.cc:90
 msgid "Reverb"
 msgstr "Hall"
 
-#: src/modplug/plugin_main.cc:94
+#: src/modplug/plugin_main.cc:93
 msgid "Bass Boost"
 msgstr "Bassverstärkung"
 
-#: src/modplug/plugin_main.cc:97
+#: src/modplug/plugin_main.cc:96
 msgid "Surround"
 msgstr "Surround"
 
-#: src/modplug/plugin_main.cc:100
+#: src/modplug/plugin_main.cc:99
 msgid "Preamp"
 msgstr "Vorverstärkung"
 
-#: src/modplug/plugin_main.cc:107
+#: src/modplug/plugin_main.cc:106
 msgid "Oversample"
 msgstr "Oversampling"
 
-#: src/modplug/plugin_main.cc:108
+#: src/modplug/plugin_main.cc:107
 msgid "Noise reduction"
 msgstr "Geräuschreduktion"
 
-#: src/modplug/plugin_main.cc:109
+#: src/modplug/plugin_main.cc:108
 msgid "Play Amiga MODs"
 msgstr "Amiga MOD abspielen"
 
-#: src/modplug/plugin_main.cc:110
+#: src/modplug/plugin_main.cc:109
 msgid "Repeat"
 msgstr "Wiederholen"
 
-#: src/modplug/plugin_main.cc:111
+#: src/modplug/plugin_main.cc:110
 msgid "Repeat count:"
 msgstr "Wiederholzahl:"
 
-#: src/modplug/plugin_main.cc:112
+#: src/modplug/plugin_main.cc:111
 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.cc:125 src/sid/xs_config.cc:106
+#: src/modplug/plugin_main.cc:124 src/sid/xs_config.cc:106
 msgid "These settings will take effect when Audacious is restarted."
-msgstr "Diese Einstellungen treten in Kraft, wenn Audacious neugestartet wird."
+msgstr ""
+"Diese Einstellungen treten in Kraft, wenn Audacious neu gestartet wird."
+
+#: src/moonstone/main_window.cc:72 src/moonstone/main_window.cc:73
+#: src/qtui/main_window.cc:159 src/qtui/main_window.cc:160
+#: src/skins/menus.cc:107 src/skins-qt/menus.cc:98
+msgid "Stop After This Song"
+msgstr "Nach diesem Titel stoppen"
+
+#: src/moonstone/moonstone.cc:39
+msgid "Moonstone"
+msgstr "Mondstein"
+
+#: src/moonstone/playlist_header.cc:212 src/qtui/playlist_header.cc:258
+msgid "Reset to Defaults"
+msgstr "Auf Standardwerte zurücksetzen"
+
+#: src/moonstone/playlist_model.cc:38 src/qtui/playlist_header.cc:232
+msgid "Now Playing"
+msgstr "Momentane Wiedergabe"
+
+#: src/moonstone/playlist_selection.cc:66
+#: src/playlist-manager/playlist-manager.cc:201
+#: src/playlist-manager-qt/playlist-manager-qt.cc:190
+msgid "Entries"
+msgstr "Einträge"
 
 #: src/mpg123/mpg123.cc:54
 msgid "MPG123 Plugin"
 msgstr "MPG123 Plugin"
 
-#: src/mpg123/mpg123.cc:83
-msgid "Advanced"
-msgstr "Erweitert"
-
-#: src/mpg123/mpg123.cc:84
+#: src/mpg123/mpg123.cc:82
 msgid "Use accurate length calculation (slow)"
 msgstr "Nutze exakte Längenberechnung (langsam)"
 
-#: src/mpg123/mpg123.cc:248
+#: src/mpg123/mpg123.cc:260
 msgid "Surround"
 msgstr "Surround"
 
-#: src/mpris2/plugin.cc:39
+#: src/mpris2/plugin.cc:40
 msgid "MPRIS 2 Server"
 msgstr "MPRIS 2 Server"
 
-#: src/neon/neon.cc:97
+#: src/neon/neon.cc:102
 msgid "Neon HTTP/HTTPS Plugin"
 msgstr "Neon HTTP/HTTPS Plugin"
 
-#: src/neon/neon.cc:521
+#: src/neon/neon.cc:526
 msgid "Error parsing redirect"
 msgstr "Fehler beim Parsen der Weiterleitung"
 
-#: src/neon/neon.cc:535
+#: src/neon/neon.cc:540
 msgid "Unknown HTTP error"
 msgstr "Unbekannter HTTP Fehler"
 
-#: src/neon/neon.cc:569
+#: src/neon/neon.cc:614
 msgid "Error parsing URL"
 msgstr "Fehler beim Parsen der URL"
 
-#: src/neon/neon.cc:632
+#: src/neon/neon.cc:687
 msgid "Too many redirects"
 msgstr "Zu viele Weiterleitungen"
 
-#: src/notify/event.cc:64
+#: src/notify/event.cc:97
 msgid "Stopped"
 msgstr "Gestoppt"
 
-#: src/notify/event.cc:64
+#: src/notify/event.cc:97
 msgid "Audacious is not playing."
 msgstr "Audacious spielt gerade nichts ab."
 
-#: src/notify/notify.cc:42
+#: src/notify/notify.cc:39
 msgid "Desktop Notifications"
 msgstr "Desktop-Benachrichtigungen"
 
-#: src/notify/notify.cc:60
+#: src/notify/notify.cc:57
 msgid ""
 "Desktop Notifications Plugin for Audacious\n"
 "Copyright (C) 2010 Maximilian Bogner\n"
@@ -2665,36 +2838,81 @@
 "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.cc:110
+#: src/notify/notify.cc:104
 msgid "Show playback controls"
 msgstr "Bedienelemente für Wiedergabe anzeigen"
 
-#: src/notify/notify.cc:112
+#: src/notify/notify.cc:106
 msgid "Always show notification"
 msgstr "Benachrichtigungen immer anzeigen"
 
-#: src/notify/notify.cc:114
+#: src/notify/notify.cc:108
 msgid "Include album name in notification"
 msgstr "Albumname in Benachrichtigung einschließen"
 
-#: src/notify/osd.cc:58
+#: src/notify/notify.cc:110
+msgid "Custom notification duration:"
+msgstr "Benutzerdefinierte Benachrichtigungsdauer:"
+
+#: src/notify/osd.cc:74
 msgid "Show"
 msgstr "Anzeigen"
 
-#: src/notify/osd.cc:66 src/qtui/main_window.cc:178
-#: src/qtui/main_window.cc:179 src/skins/menus.cc:88
-msgid "Pause"
-msgstr "Pause"
+#: src/openmpt/mpt.cc:50
+msgid "OpenMPT (Module Player)"
+msgstr "OpenMPT (Modulspieler)"
 
-#: src/notify/osd.cc:73 src/qtui/main_window.cc:72 src/skins/menus.cc:91
-msgid "Next"
-msgstr "Nächster"
+#: src/openmpt/mpt.cc:132
+msgid ""
+"Module player based on libopenmpt\n"
+"\n"
+"Written by: Chris Spiegel <cspiegel@gmail.com>"
+msgstr ""
+"Modulspieler basierend auf libopenmpt\n"
+"\n"
+"Entwickelt von: Chris Spiegel <cspiegel@gmail.com>"
+
+#: src/openmpt/mpt.cc:151
+msgid "Stereo separation:"
+msgstr "Stereo-Trennung:"
+
+#: src/openmpt/mpt.cc:153
+msgid "% (0=mono, 100=default, 200=full)"
+msgstr "% (0=Mono, 100=Standard, 200=Vollständig)"
 
-#: src/oss4/oss.h:93
+#: src/openmpt/mpt.cc:157
+msgid "Interpolation:"
+msgstr "Interpolation:"
+
+#: src/openmpt/mptwrap.h:51 src/soxr/sox-resampler.cc:189 src/xsf/plugin.cc:437
+msgid "Linear"
+msgstr "Linear"
+
+#: src/openmpt/mptwrap.h:52
+msgid "Cubic"
+msgstr "Kubisch"
+
+#: src/openmpt/mptwrap.h:53
+msgid "Windowed sinc"
+msgstr "Sinc-Fensterfunktion"
+
+#: src/opus/opus.cc:39
+msgid "Opus Decoder"
+msgstr "Opus Dekodierer"
+
+#: src/opus/opus.cc:336
+msgid ""
+"Opus Decoder Plugin for Audacious\n"
+"Copyright 2022 Thomas Lange"
+msgstr ""
+"Opus Dekodierer Plugin für Audacious\n"
+"Copyright 2022 Thomas Lange"
+
+#: src/oss4/oss.h:70
 msgid "OSS4 Output"
 msgstr "OSS4 Ausgabe"
 
-#: src/oss4/oss.h:95
+#: src/oss4/oss.h:72
 msgid "OSS3 Output"
 msgstr "OSS3 Ausgabe"
 
@@ -2702,27 +2920,27 @@
 msgid "Default device"
 msgstr "Standardgerät"
 
-#: src/oss4/plugin.cc:77
+#: src/oss4/plugin.cc:78
 msgid "Audio device:"
 msgstr "Audiogerät:"
 
-#: src/oss4/plugin.cc:80
+#: src/oss4/plugin.cc:81
 msgid "Use alternate device:"
 msgstr "Alternatives Gerät benutzen:"
 
-#: src/oss4/plugin.cc:84
+#: src/oss4/plugin.cc:85
 msgid "Save volume between sessions."
 msgstr "Lautstärke zwischen Sitzungen speichern."
 
-#: src/oss4/plugin.cc:86
+#: src/oss4/plugin.cc:87
 msgid "Enable format conversions made by the OSS software."
 msgstr "Formatkonvertierung durch OSS aktivieren."
 
-#: src/oss4/plugin.cc:88
+#: src/oss4/plugin.cc:89
 msgid "Enable exclusive mode to prevent virtual mixing."
 msgstr "Exklusivmodus aktivieren, um virtuelles Mischen zu verhindern."
 
-#: src/oss4/plugin.cc:100
+#: src/oss4/plugin.cc:101
 msgid ""
 "OSS4 Output Plugin for Audacious\n"
 "Copyright 2010-2012 Michał Lipski\n"
@@ -2736,19 +2954,40 @@
 "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/playlist-manager/playlist-manager.cc:37
+#: src/pipewire/pipewire.cc:44
+msgid "PipeWire Output"
+msgstr "PipeWire Ausgabe"
+
+#: src/pipewire/pipewire.cc:118
+msgid ""
+"PipeWire Output Plugin for Audacious\n"
+"Copyright 2022 Thomas Lange\n"
+"\n"
+"Based on the PipeWire Output Plugin for Qmmp\n"
+"Copyright 2021 Ilya Kotov"
+msgstr ""
+"PipeWire Ausgabeplugin für Audacious\n"
+"Copyright 2022 Thomas Lange\n"
+"\n"
+"Basierend auf dem PipeWire Ausgabeplugin für Qmmp\n"
+"Copyright 2021 Ilya Kotov"
+
+#: src/pipewire/pipewire.cc:408 src/skins/menus.cc:88 src/skins-qt/menus.cc:79
+msgid "Playback"
+msgstr "Wiedergabe"
+
+#: src/playlist-manager/playlist-manager.cc:38
+#: src/playlist-manager-qt/playlist-manager-qt.cc:42
 msgid "Playlist Manager"
 msgstr "Wiedergabelisten-Manager"
 
-#: src/playlist-manager/playlist-manager.cc:226
-msgid "Entries"
-msgstr "Einträge"
-
-#: src/playlist-manager/playlist-manager.cc:245
+#: src/playlist-manager/playlist-manager.cc:221
+#: src/playlist-manager-qt/playlist-manager-qt.cc:356
 msgid "_Remove"
 msgstr "_Löschen"
 
-#: src/playlist-manager/playlist-manager.cc:246
+#: src/playlist-manager/playlist-manager.cc:222
+#: src/playlist-manager-qt/playlist-manager-qt.cc:351
 msgid "Ren_ame"
 msgstr "_Umbenennen"
 
@@ -2756,54 +2995,69 @@
 msgid "PLS Playlists"
 msgstr "PLS Wiedergabelisten"
 
-#: src/psf/plugin.cc:45
+#: src/psf/plugin.cc:53
 msgid "OpenPSF PSF1/PSF2 Decoder"
 msgstr "OpenPSF PSF1/PSF2 Dekodierer"
 
-#: src/pulse_audio/pulse_audio.cc:38
+#: src/psf/plugin.cc:270
+msgid "OpenPSF Configuration"
+msgstr "OpenPSF-Konfiguration"
+
+#: src/psf/plugin.cc:271 src/xsf/plugin.cc:444
+msgid "Ignore length from file"
+msgstr "Länge aus Datei ignorieren"
+
+#: src/pulse/pulse_audio.cc:42
 msgid "PulseAudio Output"
 msgstr "PulseAudio Ausgabe"
 
-#: src/pulse_audio/pulse_audio.cc:611
+#: src/pulse/pulse_audio.cc:84
+msgid "Context name:"
+msgstr "Kontext-Name:"
+
+#: src/pulse/pulse_audio.cc:86
+msgid "Stream name:"
+msgstr "Stream-Name:"
+
+#: src/pulse/pulse_audio.cc:596
 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."
+"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 ""
 "Audacious PulseAudio Ausgabeplugin\n"
 "\n"
-"Dieses Programm ist freie Software. Sie können es unter den Bedingungen der\n"
-"GNU General Public License, wie von der Free Software Foundation\n"
-"veröffentlicht, weitergeben und/oder modifizieren, entweder gemäß Version 2\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\n"
-"von Nutzen sein wird, aber OHNE IRGENDEINE GARANTIE, sogar ohne die\n"
-"implizite Garantie der MARKTREIFE oder der VERWENDBARKEIT FÜR EINEN\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\n"
-"Programm erhalten haben. Falls nicht, schreiben Sie an die Free Software\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/qtaudio/qtaudio.cc:49
+#: src/qtaudio/qtaudio.cc:53
 msgid "QtMultimedia Output"
 msgstr "QtMultimedia Ausgabe"
 
-#: src/qtaudio/qtaudio.cc:77
+#: src/qtaudio/qtaudio.cc:84
 msgid ""
 "QtMultimedia Audio Output Plugin for Audacious\n"
 "Copyright 2014 William Pitcock\n"
@@ -2817,50 +3071,108 @@
 "Basierend auf dem SDL Ausgabeplugin für Audacious\n"
 "Copyright 2010 John Lindgren"
 
-#: src/qtui/dialog_windows.cc:31
-msgid "Working ..."
-msgstr "In Bearbeitung ..."
+#: src/qtglspectrum/gl-spectrum.cc:41
+msgid ""
+"OpenGL Spectrum Analyzer for Audacious\n"
+"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
+"Copyright 2014, 2020 Ariadne Conill\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é, John Lindgren und Carlo Bramini\n"
+"Copyright 2014, 2020 Ariadne Conill\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/qtui/filter_input.cc:44 src/skins/ui_playlist.cc:221
-msgid "Search"
-msgstr "Suchen"
+#: src/qthotkey/gui.cc:177
+msgid "Press a key combination inside a text field."
+msgstr "Drücken Sie eine Tastenkombination innerhalb eines Textfeldes."
 
-#: src/qtui/main_window_actions.cc:94
+#: src/qthotkey/plugin.cc:105
+msgid ""
+"Global Hotkey Plugin\n"
+"Control the player with global key combinations or multimedia keys.\n"
+"\n"
+"Copyright (C) 2020 i.Dark_Templar <darktemplar@dark-templar-archives.net>\n"
+"Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n"
+"\n"
+"Contributors 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 ""
+"Globale Tastenkürzel Plugin\n"
+"Audacious mit globalen Tastenkürzeln oder Multimediatasten bedienen.\n"
+"\n"
+"Copyright (C) 2020 i.Dark_Templar <darktemplar@dark-templar-archives.net>\n"
+"Copyright (C) 2007-2008 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/qtui/menus.cc:109
 msgid "_Open Folder ..."
 msgstr "_Ordner öffnen ..."
 
-#: src/qtui/main_window_actions.cc:96
+#: src/qtui/menus.cc:115
 msgid "_Add Folder ..."
 msgstr "Ordner hin_zufügen ..."
 
-#: src/qtui/main_window_actions.cc:101
+#: src/qtui/menus.cc:128
 msgid "_Log Inspector ..."
 msgstr "Protoko_ll-Inspektor ..."
 
-#: src/qtui/main_window.cc:64
-msgid "Open Files"
-msgstr "Dateien öffnen"
-
-#: src/qtui/main_window.cc:66
-msgid "Add Files"
-msgstr "Dateien hinzufügen"
-
-#: src/qtui/main_window.cc:71 src/skins/menus.cc:90
-msgid "Previous"
-msgstr "Vorheriger"
+#: src/qtui/menus.cc:220
+msgid "_Find ..."
+msgstr "_Suchen ..."
+
+#: src/qtui/menus.cc:256 src/skins/menus.cc:80 src/skins-qt/menus.cc:70
+msgid "Audio Settings ..."
+msgstr "Audio-Einstellungen ..."
+
+#: src/qtui/playlist_model.cc:188
+msgid "Q#"
+msgstr "W#"
+
+#: src/qtui/playlist_model.cc:190
+msgid "T#"
+msgstr "T#"
+
+#: src/qtui/playlist_model.cc:192
+msgid "C#"
+msgstr "K#"
+
+#: src/qtui/playlist_model.cc:194
+msgid "D#"
+msgstr "D#"
 
-#: src/qtui/main_window.cc:77 src/skins/menus.cc:82
-msgid "Repeat"
-msgstr "Wiederholen"
-
-#: src/qtui/main_window.cc:79 src/skins/menus.cc:83
-msgid "Shuffle"
-msgstr "Zufällige Wiedergabe"
-
-#: src/qtui/qtui.cc:42
+#: src/qtui/qtui.cc:40
 msgid "Qt Interface"
 msgstr "Qt Interface"
 
+#: src/qtui/search_bar.cc:46
+msgid "Search playlist"
+msgstr "Wiedergabeliste durchsuchen"
+
+#: src/qtui/settings.cc:79
+msgid "Use bold font for column headers"
+msgstr "Für Spaltenüberschriften fettgedruckte Schrift verwenden"
+
 #: src/resample/resample.cc:43
 msgid "Sample Rate Converter"
 msgstr "Abtastraten-Konverter"
@@ -2901,7 +3213,7 @@
 msgid "Method:"
 msgstr "Methode:"
 
-#: src/resample/resample.cc:199 src/sox-resampler/sox-resampler.cc:161
+#: src/resample/resample.cc:199 src/soxr/sox-resampler.cc:203
 msgid "Rate:"
 msgstr "Abtastrate:"
 
@@ -2953,69 +3265,55 @@
 msgid "192 kHz:"
 msgstr "192 kHz:"
 
-#: src/scrobbler2/config_window.cc:41
-#, c-format
-msgid "OK. Scrobbling for user: %s"
-msgstr "OK. Scrobbeln für Profil: »%s«"
-
-#: src/scrobbler2/config_window.cc:54
-msgid "Permission Denied"
-msgstr "Zugriff verweigert"
-
-#: src/scrobbler2/config_window.cc:56
-msgid "Access the following link to allow Audacious to scrobble your plays:"
-msgstr ""
-"Besuchen Sie den folgenden Link, um Audacious das Scrobbeln Ihrer Titel zu "
-"erlauben:"
+#: src/scrobbler2/config_window.cc:29
+msgid "Checking Last.fm access ..."
+msgstr "Last.fm-Zugang wird überprüft ..."
 
-#: src/scrobbler2/config_window.cc:66
-msgid "Keep this window open and click 'Check Permission' again.\n"
-msgstr ""
-"Lassen Sie das Fenster geöffnet und klicken Sie erneut auf »Berechtigung "
-"überprüfen«.\n"
-
-#: src/scrobbler2/config_window.cc:69 src/scrobbler2/config_window.cc:80
+#: src/scrobbler2/config_window.cc:35
 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."
+"Your scrobbles are being saved on your computer temporarily. They will be "
+"submitted as soon as Audacious is allowed access."
 msgstr ""
-"Keine Sorge, Ihre Scrobbels sind auf Ihrem Computer gespeichert.\n"
-"Sie werden übermittelt, sobald Audacious die Berechtigung dazu hat."
+"Ihre Scrobbels werden temporär auf Ihrem Computer zwischengespeichert. Sie "
+"werden übermittelt, sobald Audacious die Berechtigung dazu hat."
 
-#: src/scrobbler2/config_window.cc:77
-msgid "Network Problem."
-msgstr "Netzwerkproblem."
+#: src/scrobbler2/config_window.cc:41
+#, c-format
+msgid "Permission granted. Scrobbling for user %s."
+msgstr "Berechtigung erteilt. Starte Scrobbeln für Benutzer %s."
 
-#: src/scrobbler2/config_window.cc:78
-msgid "There was a problem contacting Last.fm. Please try again later."
+#: src/scrobbler2/config_window.cc:44
+msgid ""
+"Permission denied. Open the following URL in a browser, allow Audacious "
+"access to your account, and then click 'Check Permission' again:"
 msgstr ""
-"Es gab ein Problem bei der Verbindung zu Last.fm. Bitte versuchen Sie es "
-"später noch einmal."
+"Zugriff verweigert. Öffnen Sie die folgende URL in einem Browser, erlauben "
+"Sie Audacious den Zugriff auf Ihr Profil und klicken Sie anschließend erneut "
+"auf »Berechtigung überprüfen«."
 
-#: src/scrobbler2/config_window.cc:110
-msgid "Checking..."
-msgstr "Überprüfen..."
+#: src/scrobbler2/config_window.cc:53
+msgid "There was a problem contacting Last.fm."
+msgstr "Es gab ein Problem bei der Verbindung zu Last.fm."
 
-#: src/scrobbler2/config_window.cc:176
-msgid "C_heck Permission"
-msgstr "_Berechtigung überprüfen"
+#: src/scrobbler2/config_window.cc:92
+msgid "Check Permission"
+msgstr "Berechtigung überprüfen"
 
-#: src/scrobbler2/config_window.cc:177
-msgid "_Revoke Permission"
-msgstr "Berechtigung _entziehen"
+#: src/scrobbler2/config_window.cc:93
+msgid "Revoke Permission"
+msgstr "Berechtigung entziehen"
 
-#: src/scrobbler2/config_window.cc:220
-msgid ""
-"You need to allow Audacious to scrobble tracks to your Last.fm account.\n"
+#: src/scrobbler2/config_window.cc:97
+msgid "You need to allow Audacious to scrobble tracks to your Last.fm account."
 msgstr ""
 "Sie müssen Audacious erlauben, Titel zu Ihrem Last.fm Profil scrobbeln zu "
-"dürfen.\n"
+"dürfen."
 
 #: src/scrobbler2/scrobbler.cc:29
 msgid "Scrobbler 2.0"
 msgstr "Scrobbler 2.0"
 
-#: src/scrobbler2/scrobbler.cc:224
+#: src/scrobbler2/scrobbler.cc:200
 msgid ""
 "The Scrobbler plugin could not be started.\n"
 "There might be a problem with your installation."
@@ -3023,36 +3321,26 @@
 "Das Scrobbler Plugin konnte nicht gestartet werden.\n"
 "Es könnte sich dabei um ein Installationsproblem handeln."
 
-#: src/scrobbler2/scrobbler.cc:289
+#: src/scrobbler2/scrobbler.cc:245
 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"
+"project."
 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"
-
-#: src/scrobbler2/scrobbler_communication.cc:642
-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üfen Sie die Einstellungen für das Scrobbler Plugin."
+"Danke an John Lindgren für die anfängliche Hilfe bei diesem Projekt."
 
-#: src/sdlout/sdlout.cc:48
+#: src/sdlout/sdlout.cc:43
 msgid "SDL Output"
 msgstr "SDL Ausgabe"
 
-#: src/sdlout/sdlout.cc:77
+#: src/sdlout/sdlout.cc:72
 msgid ""
 "SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
@@ -3060,79 +3348,88 @@
 "SDL Ausgabeplugin für Audacious\n"
 "Copyright 2010 John Lindgren"
 
-#: src/search-tool/search-tool.cc:116 src/search-tool/search-tool.cc:124
+#: src/search-tool/library.cc:35 src/search-tool/library.cc:46
+#: src/search-tool-qt/library.cc:35 src/search-tool-qt/library.cc:46
 msgid "Library"
-msgstr "Sammlung"
-
-#: src/search-tool/search-tool.cc:394
-#, c-format
-msgid "%d result"
-msgid_plural "%d results"
-msgstr0 "%d Ergebnis"
-msgstr1 "%d Ergebnisse"
+msgstr "Bibliothek"
 
-#: src/search-tool/search-tool.cc:400
-#, c-format
-msgid "(%d hidden)"
-msgid_plural "(%d hidden)"
-msgstr0 "(%d versteckt)"
-msgstr1 "(%d versteckt)"
-
-#: src/search-tool/search-tool.cc:594
+#: src/search-tool-qt/search-model.cc:44 src/search-tool/search-tool.cc:287
 #, c-format
 msgid "%d song"
 msgid_plural "%d songs"
 msgstr0 "%d Titel"
 msgstr1 "%d Titel"
 
-#: src/search-tool/search-tool.cc:601
+#: src/search-tool-qt/search-model.cc:53 src/search-tool/search-tool.cc:294
 msgid "of this genre"
 msgstr "dieses Genres"
 
-#: src/search-tool/search-tool.cc:607
+#: src/search-tool-qt/search-model.h:47 src/search-tool/search-model.h:45
 msgid "on"
 msgstr "in"
 
-#: src/search-tool/search-tool.cc:607
+#: src/search-tool-qt/search-model.h:47 src/search-tool/search-model.h:45
 msgid "by"
 msgstr "von"
 
-#: src/search-tool/search-tool.cc:643
-msgid "_Create Playlist"
-msgstr "Wiedergabeliste _erstellen"
+#: src/search-tool-qt/search-tool-qt.cc:165 src/search-tool/search-tool.cc:74
+msgid "Number of results to show:"
+msgstr "Anzahl angezeigter Ergebnisse:"
+
+#: src/search-tool-qt/search-tool-qt.cc:168 src/search-tool/search-tool.cc:77
+msgid "Rescan library at startup"
+msgstr "Bibliothek beim Start erneut scannen"
+
+#: src/search-tool-qt/search-tool-qt.cc:170
+msgid "Monitor library for changes"
+msgstr "Bibliothek auf Änderungen überwachen"
 
-#: src/search-tool/search-tool.cc:645
-msgid "_Add to Playlist"
-msgstr "Zur Wiedergabeliste _hinzufügen"
-
-#: src/search-tool/search-tool.cc:684
-msgid "Search library"
-msgstr "Durchsuche Sammlung"
-
-#: src/search-tool/search-tool.cc:688
+#: src/search-tool-qt/search-tool-qt.cc:193 src/search-tool/search-tool.cc:450
 msgid ""
 "To import your music library into Audacious, choose a folder and then click "
 "the \"refresh\" icon."
 msgstr ""
 "Wählen Sie einen Ordner und klicken Sie auf »Aktualisieren«, um Ihre "
-"Musiksammlung in Audacious zu importieren."
+"Musikbibliothek in Audacious zu importieren."
 
-#: src/search-tool/search-tool.cc:696
+#: src/search-tool-qt/search-tool-qt.cc:195 src/search-tool/search-tool.cc:459
 msgid "Please wait ..."
 msgstr "Bitte warten ..."
 
-#: src/search-tool/search-tool.cc:723
+#: src/search-tool-qt/search-tool-qt.cc:197 src/search-tool/search-tool.cc:487
 msgid "Choose Folder"
 msgstr "Ordner auswählen"
 
+#: src/search-tool-qt/search-tool-qt.cc:201 src/search-tool/search-tool.cc:445
+msgid "Search library"
+msgstr "Bibliothek durchsuchen"
+
+#: src/search-tool-qt/search-tool-qt.cc:327 src/search-tool/search-tool.cc:156
+#, c-format
+msgid "%d of %d result shown"
+msgid_plural "%d of %d results shown"
+msgstr0 "%d von %d Ergebnis angezeigt"
+msgstr1 "%d von %d Ergebnissen angezeigt"
+
+#: src/search-tool-qt/search-tool-qt.cc:331 src/search-tool/search-tool.cc:160
+#, c-format
+msgid "%d result"
+msgid_plural "%d results"
+msgstr0 "%d Ergebnis"
+msgstr1 "%d Ergebnisse"
+
+#: src/search-tool-qt/search-tool-qt.cc:501 src/search-tool/search-tool.cc:341
+msgid "_Create Playlist"
+msgstr "Wiedergabeliste _erstellen"
+
+#: src/search-tool-qt/search-tool-qt.cc:503 src/search-tool/search-tool.cc:343
+msgid "_Add to Playlist"
+msgstr "Zur Wiedergabeliste _hinzufügen"
+
 #: src/sid/xmms-sid.cc:43
 msgid "SID Player"
 msgstr "SID-Spieler"
 
-#: src/sid/xs_config.cc:61
-msgid "Output"
-msgstr "Ausgabe"
-
 #: src/sid/xs_config.cc:62
 msgid "Channels:"
 msgstr "Kanäle:"
@@ -3213,742 +3510,685 @@
 msgid "Threshold:"
 msgstr "Grenzbereich:"
 
-#: src/silence-removal/silence-removal.cc:70
-msgid "dB"
-msgstr "dB"
+#: src/skins/actions.cc:45 src/skins-qt/actions.cc:43
+msgid "Repeat points cleared."
+msgstr "Wiederholpunkte geloescht."
+
+#: src/skins/actions.cc:60 src/skins-qt/actions.cc:58
+msgid "Repeat point A set."
+msgstr "Wiederholpunkt A gesetzt."
+
+#: src/skins/actions.cc:65 src/skins-qt/actions.cc:63
+msgid "Repeat point B set."
+msgstr "Wiederholpunkt B gesetzt."
+
+#: src/skins/equalizer.cc:223 src/skins-qt/equalizer.cc:223
+msgid "Preamp"
+msgstr "Vorverstaerkung"
+
+#: src/skins/equalizer.cc:227 src/skins-qt/equalizer.cc:227
+msgid "31 Hz"
+msgstr "31 Hz"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "63 Hz"
+msgstr "63 Hz"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "125 Hz"
+msgstr "125 Hz"
 
-#: src/skins/menus.cc:64
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "250 Hz"
+msgstr "250 Hz"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "500 Hz"
+msgstr "500 Hz"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "1 kHz"
+msgstr "1 kHz"
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "2 kHz"
+msgstr "2 kHz"
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "4 kHz"
+msgstr "4 kHz"
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "8 kHz"
+msgstr "8 kHz"
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "16 kHz"
+msgstr "16 kHz"
+
+#: src/skins/equalizer.cc:270 src/skins-qt/equalizer.cc:270
+msgid "Audacious Equalizer"
+msgstr "Audacious Equalizer"
+
+#: src/skins/main.cc:459 src/skins-qt/main.cc:442
+msgid "Recording on"
+msgstr "Aufnahme aktiv"
+
+#: src/skins/main.cc:461 src/skins-qt/main.cc:444
+msgid "Recording off"
+msgstr "Aufnahme inaktiv"
+
+#: src/skins/main.cc:754 src/skins-qt/main.cc:701
+#, c-format
+msgid "Seek to %d:%-2.2d / %d:%-2.2d"
+msgstr "Suche nach %d:%-2.2d / %d:%-2.2d"
+
+#: src/skins/main.cc:771 src/skins-qt/main.cc:718
+#, c-format
+msgid "Volume: %d%%"
+msgstr "Lautstaerke: %d%%"
+
+#: src/skins/main.cc:784 src/skins-qt/main.cc:731
+#, c-format
+msgid "Balance: %d%% left"
+msgstr "Balance: %d%% links"
+
+#: src/skins/main.cc:786 src/skins-qt/main.cc:733
+msgid "Balance: center"
+msgstr "Balance: Mitte"
+
+#: src/skins/main.cc:788 src/skins-qt/main.cc:735
+#, c-format
+msgid "Balance: %d%% right"
+msgstr "Balance: %d%% rechts"
+
+#: src/skins/main.cc:880 src/skins-qt/main.cc:827
+msgid "Options Menu"
+msgstr "Optionen"
+
+#: src/skins/main.cc:884 src/skins-qt/main.cc:831
+msgid "Disable 'Always On Top'"
+msgstr "'Immer im Vordergrund' aus"
+
+#: src/skins/main.cc:886 src/skins-qt/main.cc:833
+msgid "Enable 'Always On Top'"
+msgstr "'Immer im Vordergrund' an"
+
+#: src/skins/main.cc:889 src/skins-qt/main.cc:836
+msgid "File Info Box"
+msgstr "Dateiinformationen"
+
+#: src/skins/main.cc:892 src/skins/menus.cc:149 src/skins-qt/main.cc:839
+#: src/skins-qt/menus.cc:142
+msgid "Double Size"
+msgstr "Doppelte Größe"
+
+#: src/skins/main.cc:895 src/skins-qt/main.cc:842
+msgid "Visualizations"
+msgstr "Visualisierungen"
+
+#: src/skins/menus.cc:74 src/skins-qt/menus.cc:64
+msgid "Volume Up"
+msgstr "Lautstärke erhöhen"
+
+#: src/skins/menus.cc:75 src/skins-qt/menus.cc:65
+msgid "Volume Down"
+msgstr "Lautstärke verringern"
+
+#: src/skins/menus.cc:77 src/skins-qt/menus.cc:67
+msgid "Effects ..."
+msgstr "Effekte ..."
+
+#: src/skins/menus.cc:84 src/skins-qt/menus.cc:74
 msgid "Open Files ..."
 msgstr "Dateien öffnen ..."
 
-#: src/skins/menus.cc:65
+#: src/skins/menus.cc:85 src/skins-qt/menus.cc:76
 msgid "Open URL ..."
 msgstr "URL öffnen ..."
 
-#: src/skins/menus.cc:66
-msgid "Search Library"
-msgstr "Durchsuche Sammlung"
-
-#: src/skins/menus.cc:68
-msgid "Playback"
-msgstr "Wiedergabe"
-
-#: src/skins/menus.cc:69
+#: src/skins/menus.cc:89 src/skins-qt/menus.cc:80
 msgid "Playlist"
 msgstr "Wiedergabeliste"
 
-#: src/skins/menus.cc:70
+#: src/skins/menus.cc:90 src/skins-qt/menus.cc:81
+msgid "Output"
+msgstr "Ausgabe"
+
+#: src/skins/menus.cc:91 src/skins-qt/menus.cc:82
 msgid "View"
 msgstr "Ansicht"
 
-#: src/skins/menus.cc:72 src/skins/menus.cc:136 src/skins/menus.cc:149
-#: src/skins/menus.cc:214
+#: src/skins/menus.cc:93 src/skins/menus.cc:161 src/skins/menus.cc:174
+#: src/skins/menus.cc:245 src/skins-qt/menus.cc:84 src/skins-qt/menus.cc:156
+#: src/skins-qt/menus.cc:170 src/skins-qt/menus.cc:241
 msgid "Services"
 msgstr "Dienste"
 
-#: src/skins/menus.cc:74
+#: src/skins/menus.cc:95 src/skins-qt/menus.cc:86
 msgid "About ..."
 msgstr "Info ..."
 
-#: src/skins/menus.cc:75
+#: src/skins/menus.cc:96 src/skins-qt/menus.cc:87
 msgid "Settings ..."
 msgstr "Einstellungen ..."
 
-#: src/skins/menus.cc:76
+#: src/skins/menus.cc:97 src/skins-qt/menus.cc:88
 msgid "Quit"
 msgstr "Beenden"
 
-#: src/skins/menus.cc:80 src/skins/menus.cc:206
+#: src/skins/menus.cc:101 src/skins/menus.cc:235 src/skins-qt/menus.cc:92
+#: src/skins-qt/menus.cc:231
 msgid "Song Info ..."
 msgstr "Titelinfo ..."
 
-#: src/skins/menus.cc:84
+#: src/skins/menus.cc:105 src/skins-qt/menus.cc:96
+msgid "Shuffle by Album"
+msgstr "Nach Album mischen"
+
+#: src/skins/menus.cc:106 src/skins-qt/menus.cc:97
 msgid "No Playlist Advance"
 msgstr "Wiedergabeliste nicht weiterspielen"
 
-#: src/skins/menus.cc:85
-msgid "Stop After This Song"
-msgstr "Nach diesem Titel stoppen"
-
-#: src/skins/menus.cc:93
+#: src/skins/menus.cc:117 src/skins-qt/menus.cc:108
 msgid "Set A-B Repeat"
 msgstr "A-B Wiederholung setzen"
 
-#: src/skins/menus.cc:94
+#: src/skins/menus.cc:118 src/skins-qt/menus.cc:109
 msgid "Clear A-B Repeat"
 msgstr "A-B Wiederholung leeren"
 
-#: src/skins/menus.cc:96
+#: src/skins/menus.cc:120 src/skins-qt/menus.cc:111
 msgid "Jump to Song ..."
 msgstr "Zu Titel springen ..."
 
-#: src/skins/menus.cc:97
+#: src/skins/menus.cc:121 src/skins-qt/menus.cc:113
 msgid "Jump to Time ..."
 msgstr "Zu Zeitangabe springen ..."
 
-#: src/skins/menus.cc:101
+#: src/skins/menus.cc:125 src/skins-qt/menus.cc:118
 msgid "Play/Resume"
 msgstr "Abspielen/Fortsetzen"
 
-#: src/skins/menus.cc:103
+#: src/skins/menus.cc:127 src/skins-qt/menus.cc:120
 msgid "New Playlist"
 msgstr "Neue Wiedergabeliste"
 
-#: src/skins/menus.cc:104
+#: src/skins/menus.cc:128 src/skins-qt/menus.cc:121
 msgid "Rename Playlist ..."
 msgstr "Wiedergabeliste umbenennen ..."
 
-#: src/skins/menus.cc:105
+#: src/skins/menus.cc:129 src/skins-qt/menus.cc:122
 msgid "Remove Playlist"
 msgstr "Wiedergabeliste löschen"
 
-#: src/skins/menus.cc:107
+#: src/skins/menus.cc:131 src/skins-qt/menus.cc:124
 msgid "Previous Playlist"
 msgstr "Vorherige Wiedergabeliste"
 
-#: src/skins/menus.cc:108
+#: src/skins/menus.cc:132 src/skins-qt/menus.cc:125
 msgid "Next Playlist"
 msgstr "Nächste Wiedergabeliste"
 
-#: src/skins/menus.cc:110
+#: src/skins/menus.cc:134 src/skins-qt/menus.cc:127
 msgid "Import Playlist ..."
 msgstr "Wiedergabeliste importieren ..."
 
-#: src/skins/menus.cc:111
+#: src/skins/menus.cc:135 src/skins-qt/menus.cc:128
 msgid "Export Playlist ..."
 msgstr "Wiedergabeliste exportieren ..."
 
-#: src/skins/menus.cc:113
+#: src/skins/menus.cc:137 src/skins-qt/menus.cc:130
 msgid "Playlist Manager ..."
 msgstr "Wiedergabelisten-Manager ..."
 
-#: src/skins/menus.cc:114
+#: src/skins/menus.cc:138 src/skins-qt/menus.cc:131
 msgid "Queue Manager ..."
 msgstr "Warteschlangen-Manager ..."
 
-#: src/skins/menus.cc:116
+#: src/skins/menus.cc:140 src/skins-qt/menus.cc:133
 msgid "Refresh Playlist"
 msgstr "Wiedergabeliste aktualisieren"
 
-#: src/skins/menus.cc:120
+#: src/skins/menus.cc:144 src/skins-qt/menus.cc:137
 msgid "Show Playlist Editor"
 msgstr "Wiedergabeliste anzeigen"
 
-#: src/skins/menus.cc:121
+#: src/skins/menus.cc:145 src/skins-qt/menus.cc:138
 msgid "Show Equalizer"
 msgstr "Equalizer anzeigen"
 
-#: src/skins/menus.cc:123
+#: src/skins/menus.cc:147 src/skins-qt/menus.cc:140
 msgid "Show Remaining Time"
 msgstr "Verbleibende Zeit anzeigen"
 
-#: src/skins/menus.cc:125
+#: src/skins/menus.cc:150 src/skins-qt/menus.cc:143
 msgid "Always on Top"
 msgstr "Immer im Vordergrund"
 
-#: src/skins/menus.cc:126
+#: src/skins/menus.cc:151 src/skins-qt/menus.cc:145
 msgid "On All Workspaces"
 msgstr "Auf allen Arbeitsflächen"
 
-#: src/skins/menus.cc:128
+#: src/skins/menus.cc:153 src/skins-qt/menus.cc:148
 msgid "Roll Up Player"
 msgstr "Hauptfenster aufrollen"
 
-#: src/skins/menus.cc:129
+#: src/skins/menus.cc:154 src/skins-qt/menus.cc:149
 msgid "Roll Up Playlist Editor"
 msgstr "Wiedergabeliste aufrollen"
 
-#: src/skins/menus.cc:130
+#: src/skins/menus.cc:155 src/skins-qt/menus.cc:150
 msgid "Roll Up Equalizer"
 msgstr "Equalizer aufrollen"
 
-#: src/skins/menus.cc:132 src/skins/ui_main.cc:854
-msgid "Double Size"
-msgstr "Doppelte Größe"
-
-#: src/skins/menus.cc:138
+#: src/skins/menus.cc:163 src/skins-qt/menus.cc:158
 msgid "Add URL ..."
 msgstr "URL hinzufügen ..."
 
-#: src/skins/menus.cc:139
+#: src/skins/menus.cc:164 src/skins-qt/menus.cc:160
 msgid "Add Files ..."
 msgstr "Dateien hinzufügen ..."
 
-#: src/skins/menus.cc:143 src/skins/menus.cc:171 src/skins/menus.cc:185
+#: src/skins/menus.cc:168 src/skins/menus.cc:196 src/skins/menus.cc:212
+#: src/skins-qt/menus.cc:164 src/skins-qt/menus.cc:192
+#: src/skins-qt/menus.cc:208
 msgid "By Title"
 msgstr "Nach Titel"
 
-#: src/skins/menus.cc:144 src/skins/menus.cc:178 src/skins/menus.cc:192
+#: src/skins/menus.cc:169 src/skins/menus.cc:203 src/skins/menus.cc:219
+#: src/skins-qt/menus.cc:165 src/skins-qt/menus.cc:199
+#: src/skins-qt/menus.cc:215
 msgid "By File Name"
 msgstr "Nach Dateinamen"
 
-#: src/skins/menus.cc:145 src/skins/menus.cc:179 src/skins/menus.cc:193
+#: src/skins/menus.cc:170 src/skins/menus.cc:204 src/skins/menus.cc:220
+#: src/skins-qt/menus.cc:166 src/skins-qt/menus.cc:200
+#: src/skins-qt/menus.cc:216
 msgid "By File Path"
 msgstr "Nach Dateipfad"
 
-#: src/skins/menus.cc:151
+#: src/skins/menus.cc:176 src/skins-qt/menus.cc:172
 msgid "Remove All"
 msgstr "Alle entfernen"
 
-#: src/skins/menus.cc:152
+#: src/skins/menus.cc:177 src/skins-qt/menus.cc:173
 msgid "Clear Queue"
 msgstr "Warteschlange löschen"
 
-#: src/skins/menus.cc:154
+#: src/skins/menus.cc:179 src/skins-qt/menus.cc:175
 msgid "Remove Unavailable Files"
 msgstr "Nicht verfügbare Dateien entfernen"
 
-#: src/skins/menus.cc:155
+#: src/skins/menus.cc:180 src/skins-qt/menus.cc:176
 msgid "Remove Duplicates"
 msgstr "Duplikate entfernen"
 
-#: src/skins/menus.cc:157
+#: src/skins/menus.cc:182 src/skins-qt/menus.cc:178
 msgid "Remove Unselected"
 msgstr "Nicht ausgewählte entfernen"
 
-#: src/skins/menus.cc:158
+#: src/skins/menus.cc:183 src/skins-qt/menus.cc:179
 msgid "Remove Selected"
 msgstr "Auswahl entfernen"
 
-#: src/skins/menus.cc:162
+#: src/skins/menus.cc:187 src/skins-qt/menus.cc:183
 msgid "Search and Select"
 msgstr "Suchen und Auswählen"
 
-#: src/skins/menus.cc:164
+#: src/skins/menus.cc:189 src/skins-qt/menus.cc:185
 msgid "Invert Selection"
 msgstr "Auswahl invertieren"
 
-#: src/skins/menus.cc:165
+#: src/skins/menus.cc:190 src/skins-qt/menus.cc:186
 msgid "Select None"
 msgstr "Keine auswählen"
 
-#: src/skins/menus.cc:166
+#: src/skins/menus.cc:191 src/skins-qt/menus.cc:187
 msgid "Select All"
 msgstr "Alle auswählen"
 
-#: src/skins/menus.cc:170 src/skins/menus.cc:184
+#: src/skins/menus.cc:195 src/skins/menus.cc:211 src/skins-qt/menus.cc:191
+#: src/skins-qt/menus.cc:207
 msgid "By Track Number"
 msgstr "Nach Titelnummer"
 
-#: src/skins/menus.cc:172 src/skins/menus.cc:186
+#: src/skins/menus.cc:197 src/skins/menus.cc:213 src/skins-qt/menus.cc:193
+#: src/skins-qt/menus.cc:209
 msgid "By Artist"
 msgstr "Nach Künstler"
 
-#: src/skins/menus.cc:173 src/skins/menus.cc:187
+#: src/skins/menus.cc:198 src/skins/menus.cc:214 src/skins-qt/menus.cc:194
+#: src/skins-qt/menus.cc:210
 msgid "By Album"
 msgstr "Nach Album"
 
-#: src/skins/menus.cc:174 src/skins/menus.cc:188
+#: src/skins/menus.cc:199 src/skins/menus.cc:215 src/skins-qt/menus.cc:195
+#: src/skins-qt/menus.cc:211
 msgid "By Album Artist"
 msgstr "Nach Album-Künstler"
 
-#: src/skins/menus.cc:175 src/skins/menus.cc:190
+#: src/skins/menus.cc:200 src/skins/menus.cc:216 src/skins-qt/menus.cc:196
+#: src/skins-qt/menus.cc:212
 msgid "By Release Date"
 msgstr "Nach Erscheinungsdatum"
 
-#: src/skins/menus.cc:176 src/skins/menus.cc:189
+#: src/skins/menus.cc:201 src/skins/menus.cc:217 src/skins-qt/menus.cc:197
+#: src/skins-qt/menus.cc:213
 msgid "By Genre"
 msgstr "Nach Genre"
 
-#: src/skins/menus.cc:177 src/skins/menus.cc:191
+#: src/skins/menus.cc:202 src/skins/menus.cc:218 src/skins-qt/menus.cc:198
+#: src/skins-qt/menus.cc:214
 msgid "By Length"
 msgstr "Nach Länge"
 
-#: src/skins/menus.cc:180 src/skins/menus.cc:194
+#: src/skins/menus.cc:205 src/skins/menus.cc:221 src/skins-qt/menus.cc:201
+#: src/skins-qt/menus.cc:217
 msgid "By Custom Title"
 msgstr "Nach benutzerdefiniertem Titel"
 
-#: src/skins/menus.cc:198
+#: src/skins/menus.cc:206 src/skins/menus.cc:222 src/skins-qt/menus.cc:202
+#: src/skins-qt/menus.cc:218
+msgid "By Comment"
+msgstr "Nach Kommentar"
+
+#: src/skins/menus.cc:207 src/skins/menus.cc:223 src/skins-qt/menus.cc:203
+#: src/skins-qt/menus.cc:219
+msgid "By Disc Number"
+msgstr "Nach Disc-Nummer"
+
+#: src/skins/menus.cc:227 src/skins-qt/menus.cc:223
 msgid "Randomize List"
 msgstr "Wiedergabeliste zufällig anordnen"
 
-#: src/skins/menus.cc:199
+#: src/skins/menus.cc:228 src/skins-qt/menus.cc:224
 msgid "Reverse List"
 msgstr "Wiedergabeliste umkehren"
 
-#: src/skins/menus.cc:201
+#: src/skins/menus.cc:230 src/skins-qt/menus.cc:226
 msgid "Sort Selected"
 msgstr "Auswahl sortieren"
 
-#: src/skins/menus.cc:202
+#: src/skins/menus.cc:231 src/skins-qt/menus.cc:227
 msgid "Sort List"
 msgstr "Wiedergabeliste sortieren"
 
-#: src/skins/menus.cc:208
+#: src/skins/menus.cc:236 src/skins-qt/menus.cc:232
+msgid "Open Containing Folder"
+msgstr "Beinhaltenden Ordner öffen"
+
+#: src/skins/menus.cc:238 src/skins-qt/menus.cc:234
 msgid "Cut"
 msgstr "Ausschneiden"
 
-#: src/skins/menus.cc:209
+#: src/skins/menus.cc:239 src/skins-qt/menus.cc:235
 msgid "Copy"
 msgstr "Kopieren"
 
-#: src/skins/menus.cc:210
+#: src/skins/menus.cc:240 src/skins-qt/menus.cc:236
 msgid "Paste"
 msgstr "Einfügen"
 
-#: src/skins/menus.cc:212
+#: src/skins/menus.cc:241 src/skins-qt/menus.cc:237
+msgid "Paste at End"
+msgstr "Am Ende einfügen"
+
+#: src/skins/menus.cc:243 src/skins-qt/menus.cc:239
 msgid "Queue/Unqueue"
 msgstr "In/Aus Warteschlange"
 
-#: src/skins/menus.cc:218
-msgid "Load Preset ..."
-msgstr "Lade Voreinstellung ..."
-
-#: src/skins/menus.cc:219
-msgid "Load Auto Preset ..."
-msgstr "Lade automatische Voreinstellung ..."
-
-#: src/skins/menus.cc:220
-msgid "Load Default"
-msgstr "Lade Standardwert"
-
-#: src/skins/menus.cc:221
-msgid "Load Preset File ..."
-msgstr "Lade Voreinstellung aus Datei ..."
-
-#: src/skins/menus.cc:222
-msgid "Load EQF File ..."
-msgstr "Lade EQF-Datei ..."
-
-#: src/skins/menus.cc:224
-msgid "Save Preset ..."
-msgstr "Speichere Voreinstellung ..."
-
-#: src/skins/menus.cc:225
-msgid "Save Auto Preset ..."
-msgstr "Speichere automatische Voreinstellung ..."
-
-#: src/skins/menus.cc:226
-msgid "Save Default"
-msgstr "Speichere Standardwert"
-
-#: src/skins/menus.cc:227
-msgid "Save Preset File ..."
-msgstr "Speichere Voreinstellung in Datei ..."
-
-#: src/skins/menus.cc:228
-msgid "Save EQF File ..."
-msgstr "Speichere EQF-Datei ..."
-
-#: src/skins/menus.cc:230
-msgid "Delete Preset ..."
-msgstr "Lösche Voreinstellung ..."
-
-#: src/skins/menus.cc:231
-msgid "Delete Auto Preset ..."
-msgstr "Lösche automatische Voreinstellung ..."
-
-#: src/skins/menus.cc:233
-msgid "Import Winamp Presets ..."
-msgstr "Importiere Winamp Voreinstellungen ..."
-
-#: src/skins/menus.cc:235
-msgid "Reset to Zero"
-msgstr "Setze Werte auf Null zurück"
+#: src/skins/playlist-widget.cc:58 src/skins-qt/playlist-widget.cc:58
+#, c-format
+msgid "%s (%d of %d)"
+msgstr "%s (%d von %d)"
 
-#: src/skins/plugin.cc:48
+#: src/skins/playlistwin.cc:491 src/skins-qt/playlistwin.cc:478
+msgid "Audacious Playlist Editor"
+msgstr "Audacious Wiedergabeliste"
+
+#: src/skins/plugin.cc:53 src/skins-qt/plugin.cc:65
 msgid "Winamp Classic Interface"
 msgstr "Winamp Interface"
 
-#: src/skins/preset-browser.cc:57 src/skins/preset-list.cc:371
-#: src/skins/preset-list.cc:386
-msgid "Save"
-msgstr "Speichern"
-
-#: src/skins/preset-browser.cc:57 src/skins/preset-list.cc:338
-#: src/skins/preset-list.cc:354
-msgid "Load"
-msgstr "Laden"
-
-#: src/skins/preset-browser.cc:83
-msgid "Load Preset File"
-msgstr "Lade Voreinstellung aus Datei"
-
-#: src/skins/preset-browser.cc:100
-msgid "Load EQF File"
-msgstr "Lade EQF-Datei"
-
-#: src/skins/preset-browser.cc:119
-msgid "Save Preset File"
-msgstr "Speichere Voreinstellung in Datei"
-
-#: src/skins/preset-browser.cc:137
-msgid "Save EQF File"
-msgstr "Speichere EQF-Datei"
-
-#: src/skins/preset-browser.cc:151
-msgid "Import Winamp Presets"
-msgstr "Importiere Winamp Voreinstellungen"
-
-#: src/skins/preset-list.cc:285
-msgid "Presets"
-msgstr "Voreinstellungen"
-
-#: src/skins/preset-list.cc:335
-msgid "Load preset"
-msgstr "Lade Voreinstellung"
-
-#: src/skins/preset-list.cc:351
-msgid "Load auto-preset"
-msgstr "Lade automatische Voreinstellung"
-
-#: src/skins/preset-list.cc:367
-msgid "Save preset"
-msgstr "Speichere Voreinstellung"
-
-#: src/skins/preset-list.cc:382
-msgid "Save auto-preset"
-msgstr "Speichere automatische Voreinstellung"
-
-#: src/skins/preset-list.cc:408
-msgid "Delete preset"
-msgstr "Lösche Voreinstellung"
-
-#: src/skins/preset-list.cc:424
-msgid "Delete auto-preset"
-msgstr "Lösche automatische Voreinstellung"
+#: src/skins-qt/menus.cc:75
+msgid "Open Folder ..."
+msgstr "Ordner öffnen ..."
+
+#: src/skins-qt/menus.cc:159
+msgid "Add Folder ..."
+msgstr "Ordner hinzufügen ..."
+
+#: src/skins-qt/search-select.cc:62 src/skins/search-select.cc:77
+msgid "Search entries in active playlist"
+msgstr "Suche Einträge in aktiver Wiedergabeliste"
+
+#: src/skins-qt/search-select.cc:70 src/skins/search-select.cc:83
+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 ""
+"Wählen Sie 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 Sie nicht wissen, wie reguläre "
+"Ausdrücke funktionieren, geben Sie einfach nur einen Teilbegriff für Ihre "
+"Suche ein."
+
+#: src/skins-qt/search-select.cc:75 src/skins/search-select.cc:91
+msgid "Title:"
+msgstr "Titel:"
+
+#: src/skins-qt/search-select.cc:79 src/skins/search-select.cc:96
+msgid "Album:"
+msgstr "Album:"
 
-#: src/skins/skins_cfg.cc:176
+#: src/skins-qt/search-select.cc:82 src/skins/search-select.cc:101
+msgid "Artist:"
+msgstr "Künstler:"
+
+#: src/skins-qt/search-select.cc:85 src/skins/search-select.cc:106
+msgid "File Name:"
+msgstr "Dateiname:"
+
+#: src/skins-qt/search-select.cc:88 src/skins/search-select.cc:134
+msgid "Clear previous selection before searching"
+msgstr "Vorherige Auswahl vor dem Suchen löschen"
+
+#: src/skins-qt/search-select.cc:89 src/skins/search-select.cc:137
+msgid "Automatically toggle queue for matching entries"
+msgstr "Warteschlange automatisch umschalten für passende Einträge"
+
+#: src/skins-qt/search-select.cc:90 src/skins/search-select.cc:140
+msgid "Create a new playlist with matching entries"
+msgstr "Erstelle neue Wiedergabeliste mit passenden Einträgen"
+
+#: src/skins-qt/search-select.cc:101 src/skins/search-select.cc:78
+msgid "Search"
+msgstr "Suchen"
+
+#: src/skins-qt/skins_cfg.cc:198 src/skins/skins_cfg.cc:182
 msgid "Player:"
 msgstr "Hauptfenster:"
 
-#: src/skins/skins_cfg.cc:178
+#: src/skins-qt/skins_cfg.cc:200 src/skins/skins_cfg.cc:184
 msgid "Select main player window font:"
 msgstr "Hauptfenster-Schrift auswählen:"
 
-#: src/skins/skins_cfg.cc:179
+#: src/skins-qt/skins_cfg.cc:201 src/skins/skins_cfg.cc:185
 msgid "Playlist:"
 msgstr "Wiedergabeliste:"
 
-#: src/skins/skins_cfg.cc:181
+#: src/skins-qt/skins_cfg.cc:203 src/skins/skins_cfg.cc:187
 msgid "Select playlist font:"
 msgstr "Wiedergabelisten-Schrift auswählen:"
 
-#: src/skins/skins_cfg.cc:187
+#: src/skins-qt/skins_cfg.cc:207 src/skins/skins_cfg.cc:191
 msgid "Skin"
 msgstr "Skin"
 
-#: src/skins/skins_cfg.cc:189
+#: src/skins-qt/skins_cfg.cc:211 src/skins/skins_cfg.cc:193
+msgid "Display active titlebar when any window is focused"
+msgstr "Titelleiste als aktiv anzeigen, wenn irgendein Fenster fokussiert ist"
+
+#: src/skins-qt/skins_cfg.cc:213 src/skins/skins_cfg.cc:195
 msgid "Fonts"
 msgstr "Schriftarten"
 
-#: src/skins/skins_cfg.cc:192
+#: src/skins-qt/skins_cfg.cc:215 src/skins/skins_cfg.cc:197
 msgid "Use bitmap fonts (supports ASCII only)"
 msgstr "Benutze Bitmap-Schriftarten (nur ASCII-Unterstützung)"
 
-#: src/skins/skins_cfg.cc:194
+#: src/skins-qt/skins_cfg.cc:217 src/skins/skins_cfg.cc:199
 msgid "Scroll song title"
 msgstr "Titel scrollen"
 
-#: src/skins/skins_cfg.cc:196
+#: src/skins-qt/skins_cfg.cc:219 src/skins/skins_cfg.cc:201
 msgid "Scroll song title in both directions"
 msgstr "Titel in beide Richtungen scrollen"
 
-#: src/skins/skins_cfg.cc:201
+#: src/skins-qt/skins_cfg.cc:224 src/skins/skins_cfg.cc:206
 msgid "Analyzer"
 msgstr "Analysator"
 
-#: src/skins/skins_cfg.cc:202
+#: src/skins-qt/skins_cfg.cc:225 src/skins/skins_cfg.cc:207
 msgid "Scope"
 msgstr "Oszilloskop"
 
-#: src/skins/skins_cfg.cc:203
+#: src/skins-qt/skins_cfg.cc:226 src/skins/skins_cfg.cc:208
 msgid "Voiceprint / VU meter"
 msgstr "Spektrogramm"
 
-#: src/skins/skins_cfg.cc:204
+#: src/skins-qt/skins_cfg.cc:227 src/skins/skins_cfg.cc:209
 msgid "Off"
 msgstr "Aus"
 
-#: src/skins/skins_cfg.cc:208 src/skins/skins_cfg.cc:233
-#: src/skins/skins_cfg.cc:239
+#: src/skins-qt/skins_cfg.cc:231 src/skins-qt/skins_cfg.cc:256
+#: src/skins-qt/skins_cfg.cc:262 src/skins/skins_cfg.cc:213
+#: src/skins/skins_cfg.cc:238 src/skins/skins_cfg.cc:244
 msgid "Normal"
 msgstr "Normal"
 
-#: src/skins/skins_cfg.cc:209 src/skins/skins_cfg.cc:234
+#: src/skins-qt/skins_cfg.cc:232 src/skins-qt/skins_cfg.cc:257
+#: src/skins/skins_cfg.cc:214 src/skins/skins_cfg.cc:239
 msgid "Fire"
 msgstr "Feuer"
 
-#: src/skins/skins_cfg.cc:210
+#: src/skins-qt/skins_cfg.cc:233 src/skins/skins_cfg.cc:215
 msgid "Vertical lines"
 msgstr "Vertikale Linien"
 
-#: src/skins/skins_cfg.cc:214
+#: src/skins-qt/skins_cfg.cc:237 src/skins/skins_cfg.cc:219
 msgid "Lines"
 msgstr "Linien"
 
-#: src/skins/skins_cfg.cc:215
+#: src/skins-qt/skins_cfg.cc:238 src/skins/skins_cfg.cc:220
 msgid "Bars"
 msgstr "Balken"
 
-#: src/skins/skins_cfg.cc:219
+#: src/skins-qt/skins_cfg.cc:242 src/skins/skins_cfg.cc:224
 msgid "Slowest"
 msgstr "Am langsamsten"
 
-#: src/skins/skins_cfg.cc:220
+#: src/skins-qt/skins_cfg.cc:243 src/skins/skins_cfg.cc:225
 msgid "Slow"
 msgstr "Langsam"
 
-#: src/skins/skins_cfg.cc:221 src/sox-resampler/sox-resampler.cc:152
+#: src/skins-qt/skins_cfg.cc:244 src/skins/skins_cfg.cc:226
+#: src/soxr/sox-resampler.cc:180
 msgid "Medium"
 msgstr "Normal"
 
-#: src/skins/skins_cfg.cc:222
+#: src/skins-qt/skins_cfg.cc:245 src/skins/skins_cfg.cc:227
 msgid "Fast"
 msgstr "Schnell"
 
-#: src/skins/skins_cfg.cc:223
+#: src/skins-qt/skins_cfg.cc:246 src/skins/skins_cfg.cc:228
 msgid "Fastest"
 msgstr "Am schnellsten"
 
-#: src/skins/skins_cfg.cc:227
+#: src/skins-qt/skins_cfg.cc:250 src/skins/skins_cfg.cc:232
 msgid "Dots"
 msgstr "Punkte"
 
-#: src/skins/skins_cfg.cc:228
+#: src/skins-qt/skins_cfg.cc:251 src/skins/skins_cfg.cc:233
 msgid "Line"
 msgstr "Linie"
 
-#: src/skins/skins_cfg.cc:229
+#: src/skins-qt/skins_cfg.cc:252 src/skins/skins_cfg.cc:234
 msgid "Solid"
 msgstr "Beständig"
 
-#: src/skins/skins_cfg.cc:235
+#: src/skins-qt/skins_cfg.cc:258 src/skins/skins_cfg.cc:240
 msgid "Ice"
 msgstr "Eis"
 
-#: src/skins/skins_cfg.cc:240
+#: src/skins-qt/skins_cfg.cc:263 src/skins/skins_cfg.cc:245
 msgid "Smooth"
 msgstr "Weich"
 
-#: src/skins/skins_cfg.cc:244
-msgid "Type"
-msgstr "Modus"
-
-#: src/skins/skins_cfg.cc:245
-msgid "Visualization type:"
-msgstr "Visualisierungsmodus:"
-
-#: src/skins/skins_cfg.cc:248
-msgid "Analyzer"
-msgstr "Analysator"
-
-#: src/skins/skins_cfg.cc:249
-msgid "Show peaks"
-msgstr "Spitzen anzeigen"
-
-#: src/skins/skins_cfg.cc:251
+#: src/skins-qt/skins_cfg.cc:267 src/skins/skins_cfg.cc:249
 msgid "Coloring:"
 msgstr "Farbgebung:"
 
-#: src/skins/skins_cfg.cc:254
+#: src/skins-qt/skins_cfg.cc:270 src/skins/skins_cfg.cc:252
 msgid "Style:"
 msgstr "Stil:"
 
-#: src/skins/skins_cfg.cc:257
+#: src/skins-qt/skins_cfg.cc:273 src/skins/skins_cfg.cc:255
 msgid "Falloff:"
 msgstr "Fallgeschwindigkeit:"
 
-#: src/skins/skins_cfg.cc:260
+#: src/skins-qt/skins_cfg.cc:276 src/skins/skins_cfg.cc:258
 msgid "Peak falloff:"
 msgstr "Spitzen-Fallgeschwindigkeit:"
 
-#: src/skins/skins_cfg.cc:264
+#: src/skins-qt/skins_cfg.cc:282 src/skins/skins_cfg.cc:264
 msgid "Scope Style:"
 msgstr "Oszilloskop-Stil:"
 
-#: src/skins/skins_cfg.cc:267
+#: src/skins-qt/skins_cfg.cc:285 src/skins/skins_cfg.cc:267
 msgid "Voiceprint Coloring:"
 msgstr "Spektrogramm-Farbgebung:"
 
-#: src/skins/skins_cfg.cc:270
+#: src/skins-qt/skins_cfg.cc:288 src/skins/skins_cfg.cc:270
 msgid "VU Meter Style:"
 msgstr "VU-Meter-Stil:"
 
-#: src/skins/skins_cfg.cc:276
-msgid "General"
-msgstr "Allgemein"
-
-#: src/skins/skins_cfg.cc:277
-msgid "Visualization"
-msgstr "Visualisierung"
-
-#: src/skins/ui_equalizer.cc:282
-msgid "Preamp"
-msgstr "Vorverstaerkung"
-
-#: src/skins/ui_equalizer.cc:286
-msgid "31 Hz"
-msgstr "31 Hz"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "63 Hz"
-msgstr "63 Hz"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "125 Hz"
-msgstr "125 Hz"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "250 Hz"
-msgstr "250 Hz"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "500 Hz"
-msgstr "500 Hz"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "1 kHz"
-msgstr "1 kHz"
-
-#: src/skins/ui_equalizer.cc:288
-msgid "2 kHz"
-msgstr "2 kHz"
-
-#: src/skins/ui_equalizer.cc:288
-msgid "4 kHz"
-msgstr "4 kHz"
-
-#: src/skins/ui_equalizer.cc:288
-msgid "8 kHz"
-msgstr "8 kHz"
-
-#: src/skins/ui_equalizer.cc:288
-msgid "16 kHz"
-msgstr "16 kHz"
-
-#: src/skins/ui_equalizer.cc:330
-msgid "Audacious Equalizer"
-msgstr "Audacious Equalizer"
-
-#: src/skins/ui_main.cc:688
-#, c-format
-msgid "Seek to %d:%-2.2d / %d:%-2.2d"
-msgstr "Suche nach %d:%-2.2d / %d:%-2.2d"
-
-#: src/skins/ui_main.cc:709
-#, c-format
-msgid "Volume: %d%%"
-msgstr "Lautstaerke: %d%%"
-
-#: src/skins/ui_main.cc:732
-#, c-format
-msgid "Balance: %d%% left"
-msgstr "Balance: %d%% links"
-
-#: src/skins/ui_main.cc:734
-msgid "Balance: center"
-msgstr "Balance: Mitte"
-
-#: src/skins/ui_main.cc:736
-#, c-format
-msgid "Balance: %d%% right"
-msgstr "Balance: %d%% rechts"
-
-#: src/skins/ui_main.cc:842
-msgid "Options Menu"
-msgstr "Optionen"
-
-#: src/skins/ui_main.cc:846
-msgid "Disable 'Always On Top'"
-msgstr "'Immer im Vordergrund' aus"
-
-#: src/skins/ui_main.cc:848
-msgid "Enable 'Always On Top'"
-msgstr "'Immer im Vordergrund' an"
-
-#: src/skins/ui_main.cc:851
-msgid "File Info Box"
-msgstr "Dateiinformationen"
-
-#: src/skins/ui_main.cc:857
-msgid "Visualizations"
-msgstr "Visualisierungen"
-
-#: src/skins/ui_main.cc:1336
-msgid "Repeat point A set."
-msgstr "Wiederholpunkt A gesetzt."
-
-#: src/skins/ui_main.cc:1341
-msgid "Repeat point B set."
-msgstr "Wiederholpunkt B gesetzt."
-
-#: src/skins/ui_main.cc:1350
-msgid "Repeat points cleared."
-msgstr "Wiederholpunkte geloescht."
-
-#: src/skins/ui_playlist.cc:219
-msgid "Search entries in active playlist"
-msgstr "Suche Einträge in aktiver Wiedergabeliste"
-
-#: src/skins/ui_playlist.cc:226
-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 ""
-"Wählen Sie 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 Sie nicht wissen, wie reguläre "
-"Ausdrücke funktionieren, geben Sie einfach nur einen Teilbegriff für Ihre "
-"Suche ein."
-
-#: src/skins/ui_playlist.cc:234
-msgid "Title:"
-msgstr "Titel:"
-
-#: src/skins/ui_playlist.cc:241
-msgid "Album:"
-msgstr "Album:"
-
-#: src/skins/ui_playlist.cc:248
-msgid "Artist:"
-msgstr "Künstler:"
-
-#: src/skins/ui_playlist.cc:255
-msgid "File Name:"
-msgstr "Dateiname:"
-
-#: src/skins/ui_playlist.cc:263
-msgid "Clear previous selection before searching"
-msgstr "Vorherige Auswahl vor dem Suchen löschen"
+#: src/skins-qt/skins_cfg.cc:294 src/skins/skins_cfg.cc:276
+msgid "Type"
+msgstr "Modus"
 
-#: src/skins/ui_playlist.cc:266
-msgid "Automatically toggle queue for matching entries"
-msgstr "Automatisch zwischen passenden Einträgen wechseln"
+#: src/skins-qt/skins_cfg.cc:295 src/skins/skins_cfg.cc:277
+msgid "Visualization type:"
+msgstr "Visualisierungsmodus:"
 
-#: src/skins/ui_playlist.cc:269
-msgid "Create a new playlist with matching entries"
-msgstr "Erstelle neue Wiedergabeliste mit passenden Einträgen"
+#: src/skins-qt/skins_cfg.cc:298 src/skins/skins_cfg.cc:280
+msgid "Analyzer"
+msgstr "Analysator"
 
-#: src/skins/ui_playlist.cc:717
-msgid "Audacious Playlist Editor"
-msgstr "Audacious Wiedergabeliste"
+#: src/skins-qt/skins_cfg.cc:299 src/skins/skins_cfg.cc:281
+msgid "Show peaks"
+msgstr "Spitzen anzeigen"
 
-#: src/skins/ui_playlist.cc:752
-#, c-format
-msgid "%s (%d of %d)"
-msgstr "%s (%d von %d)"
+#: src/skins-qt/skins_cfg.cc:308 src/skins/skins_cfg.cc:290
+msgid "Visualization"
+msgstr "Visualisierung"
 
-#: src/skins/ui_skinselector.cc:167
+#: src/skins-qt/skinselector.cc:98 src/skins/skinselector.cc:111
 msgid "Archived Winamp 2.x skin"
 msgstr "Archivierter Winamp 2.x-Skin"
 
-#: src/skins/ui_skinselector.cc:172
+#: src/skins-qt/skinselector.cc:102 src/skins/skinselector.cc:115
 msgid "Unarchived Winamp 2.x skin"
 msgstr "Nicht archivierter Winamp 2.x-Skin"
 
-#: src/skins/util.cc:430
-#, c-format
-msgid "Could not create directory (%s): %s\n"
-msgstr "Konnte Ordner nicht erstellen (»%s«): %s\n"
-
-#: src/sndfile/plugin.cc:39
+#: src/sndfile/plugin.cc:38
 msgid "Sndfile Plugin"
 msgstr "Sndfile Plugin"
 
-#: src/sndfile/plugin.cc:336
+#: src/sndfile/plugin.cc:372
 msgid ""
 "Based on the xmms_sndfile plugin:\n"
 "Copyright (C) 2000, 2002 Erik de Castro Lopo\n"
@@ -3988,111 +4228,119 @@
 "Programm erhalten haben. Falls nicht, schreiben Sie an die Free Software "
 "Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110, USA."
 
-#: src/sndio-ng/sndio.cc:44
+#: src/sndio/sndio.cc:43
 msgid "Sndio Output"
 msgstr "Sndio-Ausgabe"
 
-#: src/sndio-ng/sndio.cc:98
+#: src/sndio/sndio.cc:98
 msgid "Device (blank for default):"
 msgstr "Gerät (leer für Standard):"
 
-#: src/sndio-ng/sndio.cc:100
+#: src/sndio/sndio.cc:100
 msgid "Save and restore volume:"
 msgstr "Lautstärke speichern und wiederherstellen:"
 
-#: src/sndio-ng/sndio.cc:181
+#: src/sndio/sndio.cc:181
 #, c-format
 msgid "Sndio error: Unsupported audio format (%d)"
 msgstr "Sndio-Fehler: Nicht unterstütztes Audioformat (%d)"
 
-#: src/sndio-ng/sndio.cc:192
+#: src/sndio/sndio.cc:192
 msgid "Sndio error: sio_open() failed"
 msgstr "Sndio-Fehler: sio_open() fehlgeschlagen"
 
-#: src/sndio-ng/sndio.cc:222
+#: src/sndio/sndio.cc:221
 msgid "Sndio error: sio_setpar() failed"
 msgstr "Sndio-Fehler: sio_setpar() fehlgeschlagen"
 
-#: src/sndio-ng/sndio.cc:234
+#: src/sndio/sndio.cc:233
 msgid "Sndio error: sio_start() failed"
 msgstr "Sndio-Fehler: sio_start() fehlgeschlagen"
 
-#: src/song_change/song_change.cc:33
+#: src/songchange/song_change.cc:30
 msgid "Song Change"
 msgstr "Titelwechsel"
 
-#: src/song_change/song_change.cc:342
-msgid ""
-"Parameters passed to the shell should be encapsulated in "
-"quotes. Doing otherwise is a security risk."
-msgstr ""
-"Parameter sollten zwischen Anführungszeichen stehen, "
-"ansonsten besteht ein Sicherheitsrisiko."
-
-#: src/song_change/song_change.cc:358
+#: src/songchange/song_change.cc:256
 msgid "Commands"
 msgstr "Befehle"
 
-#: src/song_change/song_change.cc:360
+#: src/songchange/song_change.cc:258
 msgid "Command to run when starting a new song:"
-msgstr "Auszuführender Befehl, wenn Audacious einen neuen Titel startet:"
+msgstr "Auszuführender Befehl beim Starten eines neuen Titels:"
+
+#: src/songchange/song_change.cc:261
+msgid "Command to run when stopping a song:"
+msgstr "Auszuführender Befehl beim Stoppen eines Titels:"
 
-#: src/song_change/song_change.cc:364
+#: src/songchange/song_change.cc:264
 msgid "Command to run at the end of a song:"
 msgstr "Auszuführender Befehl am Ende eines Titels:"
 
-#: src/song_change/song_change.cc:368
+#: src/songchange/song_change.cc:267
 msgid "Command to run at the end of the playlist:"
 msgstr "Auszuführender Befehl am Ende der Wiedergabeliste:"
 
-#: src/song_change/song_change.cc:372
+#: src/songchange/song_change.cc:270
 msgid "Command to run when song title changes (for network streams):"
 msgstr ""
-"Auszuführender Befehl, wenn sich der Titel eines Lieds ändert (z.B. bei "
+"Auszuführender Befehl, wenn sich der Titel eines Lieds ändert (z. B. bei "
 "Netzwerkstreams):"
 
-#: src/song_change/song_change.cc:376
+#: src/songchange/song_change.cc:273
 msgid ""
-"You can use the following format strings which will be substituted before "
-"calling the command (not all are useful for the end-of-playlist command):\n"
-"\n"
-"%F: Frequency (in hertz)\n"
+"You can use the following format codes, which will be replaced before "
+"running the command.\n"
+"Not all are useful though for the song-stopped or end-of-playlist command."
+msgstr ""
+"Sie können die folgenden Format-Codes verwenden, die vor der Ausführung des "
+"Befehls ersetzt werden.\n"
+"Nicht alle sind jedoch sinnvoll für den »Titel gestoppt«- oder »Ende-der-"
+"Wiedergabeliste«-Befehl."
+
+#: src/songchange/song_change.cc:276
+msgid ""
+"%a: Artist\n"
+"%b: Album\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"
+"%F: Frequency (Hertz)\n"
+"%l: Length (milliseconds)\n"
+"%n or %s: Formatted title (see playlist settings)\n"
 "%p: Currently playing (1 or 0)\n"
-"%a: Artist\n"
-"%b: Album\n"
-"%T: Track title"
+"%r: Rate (bits per second)\n"
+"%t: Playlist position\n"
+"%T: Title (unformatted)"
 msgstr ""
-"Verwendbar sind folgende Zeichenketten, die ersetzt\n"
-" werden, bevor ein Befehl aufgerufen wird\n"
-"(nicht alle sind sinnvoll 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: Wiedergabelistenposition (%02d)\n"
-"%p: Wiedergabe momentan aktiv? (1 oder 0)\n"
 "%a: Künstler\n"
 "%b: Album\n"
-"%T: Titelname"
-
-#: src/song-info-qt/song-info.cc:32
-msgid "Song Info (Qt)"
-msgstr "Titelinfo (Qt)"
+"%c: Anzahl der Kanäle\n"
+"%f: Dateiname (vollständiger Pfad)\n"
+"%F: Frequenz (Hertz)\n"
+"%l: Länge (Millisekunden)\n"
+"%n oder %s: Formatierer Titel (siehe Wiedergabelisten Einstellungen)\n"
+"%p: Wiedergabe aktiv (1 oder 0)\n"
+"%r: Bitrate (Bits pro Sekunde)\n"
+"%t: Wiedergabelistenposition\n"
+"%T: Titel (unformatiert)"
+
+#: src/songchange/song_change.cc:287
+msgid ""
+"Parameters passed to the shell should be enclosed in quotation marks.\n"
+"Unquoted parameters may lead to unexpected results."
+msgstr ""
+"Parameter sollten in Anführungszeichen eingeschlossen sein.\n"
+"Keine Anführungszeichen zu verwenden kann zu unerwarteten Ergebnissen führen."
+
+#: src/song-info-qt/song-info.cc:30
+msgid "Song Info"
+msgstr "Titelinfo"
 
-#: src/sox-resampler/sox-resampler.cc:44
+#: src/soxr/sox-resampler.cc:44
 msgid "SoX Resampler"
 msgstr "SoX Resampler"
 
-#: src/sox-resampler/sox-resampler.cc:144
+#: src/soxr/sox-resampler.cc:172
 msgid ""
 "SoX Resampler Plugin for Audacious\n"
 "Copyright 2013 Michał Lipski\n"
@@ -4106,56 +4354,81 @@
 "Basierend auf dem Abtastraten-Konverter Plugin:\n"
 "Copyright 2010-2012 John Lindgren"
 
-#: src/sox-resampler/sox-resampler.cc:150
+#: src/soxr/sox-resampler.cc:178
 msgid "Quick"
 msgstr "Schnell"
 
-#: src/sox-resampler/sox-resampler.cc:151
+#: src/soxr/sox-resampler.cc:179
 msgid "Low"
 msgstr "Niedrig"
 
-#: src/sox-resampler/sox-resampler.cc:153
+#: src/soxr/sox-resampler.cc:181
 msgid "High"
 msgstr "Hoch"
 
-#: src/sox-resampler/sox-resampler.cc:154
+#: src/soxr/sox-resampler.cc:182
 msgid "Very High"
 msgstr "Sehr hoch"
 
-#: src/sox-resampler/sox-resampler.cc:158
+#: src/soxr/sox-resampler.cc:183
+msgid "Ultra High"
+msgstr "Ultra hoch"
+
+#: src/soxr/sox-resampler.cc:187
+msgid "Minimum"
+msgstr "Minimum"
+
+#: src/soxr/sox-resampler.cc:188
+msgid "Intermediate"
+msgstr "Zwischenstufe"
+
+#: src/soxr/sox-resampler.cc:193
 msgid "Quality:"
 msgstr "Qualität:"
 
-#: src/speed-pitch/speed-pitch.cc:51
+#: src/soxr/sox-resampler.cc:196
+msgid "Phase:"
+msgstr "Phase:"
+
+#: src/soxr/sox-resampler.cc:200
+msgid "Allow aliasing"
+msgstr "Aliasing erlauben"
+
+#: src/soxr/sox-resampler.cc:202
+msgid "Use steep filter"
+msgstr "Steep-Filter benutzen"
+
+#: src/speedpitch/speed-pitch.cc:54
 msgid "Speed and Pitch"
 msgstr "Geschwindigkeit und Tonhöhe"
 
-#: src/speed-pitch/speed-pitch.cc:210
-msgid "Speed and Pitch"
-msgstr "Geschwindigkeit und Tonhöhe"
-
-#: src/speed-pitch/speed-pitch.cc:211
-msgid "Speed:"
-msgstr "Geschwindigkeit:"
-
-#: src/speed-pitch/speed-pitch.cc:214
-msgid "Pitch:"
-msgstr "Tonhöhe:"
+#: src/speedpitch/speed-pitch.cc:247
+msgid "Speed"
+msgstr "Geschwindigkeit"
+
+#: src/speedpitch/speed-pitch.cc:248
+msgid "Decouple from pitch"
+msgstr "Von Tonhöhe entkoppeln"
+
+#: src/speedpitch/speed-pitch.cc:250 src/speedpitch/speed-pitch.cc:258
+msgid "Multiplier:"
+msgstr "Multiplikator:"
+
+#: src/speedpitch/speed-pitch.cc:254
+msgid "Pitch"
+msgstr "Tonhöhe"
 
-#: src/statusicon/statusicon.cc:47
+#: src/statusicon-qt/statusicon.cc:45 src/statusicon/statusicon.cc:47
 msgid "Status Icon"
 msgstr "Status-Icon"
 
-#: src/statusicon/statusicon.cc:283
-msgid "Se_ttings ..."
-msgstr "_Einstellungen ..."
-
-#: src/statusicon/statusicon.cc:372
+#: src/statusicon-qt/statusicon.cc:68
 msgid ""
-"Status Icon Plugin\n"
+"Status Icon Plugin (partial port for Qt interface)\n"
 "\n"
 "Copyright 2005-2007 Giacomo Lozito <james@develia.org>\n"
 "Copyright 2010 Michał Lipski <tallica@o2.pl>\n"
+"Copyright 2015 Eugene Paskevich <eugene@raptor.kiev.ua>\n"
 "\n"
 "This plugin provides a status icon, placed in\n"
 "the system tray area of the window manager."
@@ -4164,38 +4437,61 @@
 "\n"
 "Copyright 2005-2007 Giacomo Lozito <james@develia.org>\n"
 "Copyright 2010 Michał Lipski <tallica@o2.pl>\n"
+"Copyright 2015 Eugene Paskevich <eugene@raptor.kiev.ua>\n"
 "\n"
 "Dieses Plugin stellt ein Status-Icon bereit, welches\n"
 "in der Taskleiste des Fenstermanagers angezeigt wird."
 
-#: src/statusicon/statusicon.cc:379
+#: src/statusicon-qt/statusicon.cc:89 src/statusicon/statusicon.cc:384
 msgid "Mouse Scroll Action"
 msgstr "Maus-Scroll-Aktion"
 
-#: src/statusicon/statusicon.cc:380
+#: src/statusicon-qt/statusicon.cc:90 src/statusicon/statusicon.cc:385
 msgid "Change volume"
 msgstr "Lautstärke ändern"
 
-#: src/statusicon/statusicon.cc:383
+#: src/statusicon-qt/statusicon.cc:93 src/statusicon/statusicon.cc:388
 msgid "Change playing song"
 msgstr "Aktiven Titel ändern"
 
-#: src/statusicon/statusicon.cc:386
+#: src/statusicon-qt/statusicon.cc:96 src/statusicon/statusicon.cc:391
 msgid "Other Settings"
 msgstr "Andere Einstellungen"
 
-#: src/statusicon/statusicon.cc:387
+#: src/statusicon-qt/statusicon.cc:97 src/statusicon/statusicon.cc:392
 msgid "Disable the popup window"
 msgstr "Popup-Fenster deaktivieren"
 
-#: src/statusicon/statusicon.cc:389
+#: src/statusicon-qt/statusicon.cc:99 src/statusicon/statusicon.cc:394
 msgid "Close to the system tray"
-msgstr "In die Taskleiste minimieren"
+msgstr "In den Infobereich der Taskleiste schließen"
 
-#: src/statusicon/statusicon.cc:391
+#: src/statusicon-qt/statusicon.cc:101 src/statusicon/statusicon.cc:396
 msgid "Advance in playlist when scrolling upward"
 msgstr "Durch Hochscrollen in Wiedergabeliste fortschreiten"
 
+#: src/statusicon-qt/statusicon.cc:116 src/statusicon/statusicon.cc:287
+msgid "Se_ttings ..."
+msgstr "_Einstellungen ..."
+
+#: src/statusicon/statusicon.cc:377
+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 ""
+"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/stereo_plugin/stereo.cc:19
 msgid "Extra Stereo"
 msgstr "Extra Stereo"
@@ -4214,20 +4510,160 @@
 msgid "Extra Stereo"
 msgstr "Extra Stereo"
 
+#: src/streamtuner/icecast-model.cc:126 src/streamtuner/shoutcast-model.cc:131
+msgid "Type"
+msgstr "Typ"
+
+#: src/streamtuner/icecast-model.cc:132
+msgid "Current Song"
+msgstr "Aktueller Titel"
+
+#: src/streamtuner/icecast-model.cc:164
+msgid "Other"
+msgstr "Andere"
+
+#: src/streamtuner/ihr-model.cc:63
+msgid "Market"
+msgstr "Markt"
+
+#: src/streamtuner/ihr-model.cc:156
+msgid "Call Letters"
+msgstr "Rufzeichen"
+
+#: src/streamtuner/ihr-model.cc:162
+msgid "Description"
+msgstr "Beschreibung"
+
+#: src/streamtuner/shoutcast-model.cc:128
+msgid "Listeners"
+msgstr "Zuhörer"
+
+#: src/streamtuner/shoutcast-model.cc:188
+msgid "Top 500 Stations"
+msgstr "Top 500 Stationen"
+
+#: src/streamtuner/shoutcast-model.cc:189
+msgid "Alternative"
+msgstr "Alternative"
+
+#: src/streamtuner/shoutcast-model.cc:190
+msgid "Blues"
+msgstr "Blues"
+
+#: src/streamtuner/shoutcast-model.cc:191
+msgid "Classical"
+msgstr "Klassisch"
+
+#: src/streamtuner/shoutcast-model.cc:192
+msgid "Country"
+msgstr "Country"
+
+#: src/streamtuner/shoutcast-model.cc:193
+msgid "Decades"
+msgstr "Jahrzehnte"
+
+#: src/streamtuner/shoutcast-model.cc:194
+msgid "Easy Listening"
+msgstr "Easy Listening"
+
+#: src/streamtuner/shoutcast-model.cc:195
+msgid "Electronic"
+msgstr "Elektronische Musik"
+
+#: src/streamtuner/shoutcast-model.cc:196
+msgid "Folk"
+msgstr "Folk"
+
+#: src/streamtuner/shoutcast-model.cc:197
+msgid "Inspirational"
+msgstr "Inspirierend"
+
+#: src/streamtuner/shoutcast-model.cc:198
+msgid "International"
+msgstr "International"
+
+#: src/streamtuner/shoutcast-model.cc:199
+msgid "Jazz"
+msgstr "Jazz"
+
+#: src/streamtuner/shoutcast-model.cc:200
+msgid "Latin"
+msgstr "Latein"
+
+#: src/streamtuner/shoutcast-model.cc:201
+msgid "Metal"
+msgstr "Metal"
+
+#: src/streamtuner/shoutcast-model.cc:203
+msgid "New Age"
+msgstr "New Age"
+
+#: src/streamtuner/shoutcast-model.cc:204
+msgid "Pop"
+msgstr "Pop"
+
+#: src/streamtuner/shoutcast-model.cc:205
+msgid "Public Radio"
+msgstr "Öffentliches Radio"
+
+#: src/streamtuner/shoutcast-model.cc:206
+msgid "R&B and Urban"
+msgstr "R&B und Urban"
+
+#: src/streamtuner/shoutcast-model.cc:207
+msgid "Rap"
+msgstr "Rap"
+
+#: src/streamtuner/shoutcast-model.cc:208
+msgid "Reggae"
+msgstr "Reggae"
+
+#: src/streamtuner/shoutcast-model.cc:209
+msgid "Rock"
+msgstr "Rock"
+
+#: src/streamtuner/shoutcast-model.cc:210
+msgid "Seasonal and Holiday"
+msgstr "Saisonal und Ferien"
+
+#: src/streamtuner/shoutcast-model.cc:211
+msgid "Soundtracks"
+msgstr "Soundtracks"
+
+#: src/streamtuner/shoutcast-model.cc:212
+msgid "Talk"
+msgstr "Gespräche"
+
+#: src/streamtuner/shoutcast-model.cc:213
+msgid "Themes"
+msgstr "Titelmusik"
+
+#: src/streamtuner/streamtuner.cc:59
+msgid "Shoutcast"
+msgstr "Shoutcast"
+
+#: src/streamtuner/streamtuner.cc:60
+msgid "Icecast"
+msgstr "Icecast"
+
+#: src/streamtuner/streamtuner.cc:71
+msgid "Stream Tuner"
+msgstr "Stream Tuner"
+
 #: src/tonegen/tonegen.cc:45
 msgid "Tone Generator"
 msgstr "Ton-Generator"
 
-#: src/tonegen/tonegen.cc:94
+#: src/tonegen/tonegen.cc:92
 #, c-format
 msgid "%s %.1f Hz"
 msgstr "%s %.1f Hz"
 
-#: src/tonegen/tonegen.cc:94
+#: src/tonegen/tonegen.cc:92
 msgid "Tone Generator: "
 msgstr "Ton-Generator: "
 
-#: src/tonegen/tonegen.cc:160
+#: src/tonegen/tonegen.cc:161
 msgid ""
 "Sine tone generator by Håvard Kvålen <havardk@xmms.org>\n"
 "Modified by Daniel J. Peng <danielpeng@bigfoot.com>\n"
@@ -4240,13 +4676,34 @@
 "\n"
 "Um ihn zu benutzen, fügen Sie 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"
+"z. B. tone://2000;2005 für einen Ton mit 2000 Hz und einen mit 2005 Hz"
+
+#: src/ui-common/dialogs-qt.cc:40
+msgid ""
+"\n"
+"(Further messages have been hidden.)"
+msgstr ""
+"\n"
+"(Weitere Meldungen wurden nicht angezeigt.)"
+
+#: src/ui-common/dialogs-qt.cc:52
+msgid "Working ..."
+msgstr "In Bearbeitung ..."
+
+#: src/ui-common/dialogs-qt.cc:73
+msgid "Information"
+msgstr "Information"
+
+#: src/ui-common/menu-ops-gtk.cc:132 src/ui-common/menu-ops-qt.cc:113
+#, c-format
+msgid "%s does not appear to be a valid folder."
+msgstr "%s scheint kein gültiger Ordner zu sein."
 
 #: src/voice_removal/voice_removal.cc:28
 msgid "Voice Removal"
 msgstr "Stimmenaufhebung"
 
-#: src/vorbis/vorbis.cc:465
+#: src/vorbis/vorbis.cc:433
 msgid ""
 "Audacious Ogg Vorbis Decoder\n"
 "\n"
@@ -4288,12 +4745,12 @@
 msgid "Ogg Vorbis Decoder"
 msgstr "Ogg Vorbis Dekodierer"
 
-#: src/vtx/info.cc:22
+#: src/vtx/info.cc:24
 #, c-format
 msgid "Details about %s"
 msgstr "Details über %s"
 
-#: src/vtx/info.cc:24
+#: src/vtx/info.cc:26
 msgid ""
 "Title: %t\n"
 "Author: %a\n"
@@ -4323,7 +4780,7 @@
 msgid "VTX Decoder"
 msgstr "VTX Dekodierer"
 
-#: src/vtx/vtx.cc:184
+#: src/vtx/vtx.cc:178
 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"
@@ -4333,19 +4790,63 @@
 "Basierend auf in_vtx.dll von Roman Sherbakov <v_soft@microfor.ru>\n"
 "Audacious Plugin von Pavel Vymetalek <pvymetalek@seznam.cz>"
 
-#: src/wavpack/wavpack.cc:24
+#: src/vumeter-qt/vumeter_qt.cc:31
+msgid ""
+"VU Meter Plugin for Audacious\n"
+"Copyright 2017-2019 Marc Sánchez Fauste"
+msgstr ""
+"VU-Meter Plugin für Audacious\n"
+"Copyright 2017-2019 Marc Sánchez Fauste"
+
+#: src/vumeter-qt/vumeter_qt.cc:35
+msgid "VU Meter Settings"
+msgstr "VU-Meter-Einstellungen"
+
+#: src/vumeter-qt/vumeter_qt.cc:37
+msgid "Peak hold time:"
+msgstr "Haltezeit für Spitzenwerte:"
+
+#: src/vumeter-qt/vumeter_qt.cc:42
+msgid "Fall-off time:"
+msgstr "Abfallzeit:"
+
+#: src/vumeter-qt/vumeter_qt.cc:44
+msgid "dB/second"
+msgstr "dB/Sekunde"
+
+#: src/vumeter-qt/vumeter_qt.cc:46
+msgid "Display legend"
+msgstr "Legende anzeigen"
+
+#: src/vumeter-qt/vumeter_qt.h:37
+msgid "VU Meter"
+msgstr "VU-Meter"
+
+#: src/waveout/waveout.cc:43
+msgid "Win32 waveOut"
+msgstr "Win32 waveOut"
+
+#: src/waveout/waveout.cc:69
+msgid ""
+"Win32 waveOut Plugin for Audacious\n"
+"Copyright 2016 John Lindgren"
+msgstr ""
+"Win32 waveOut Plugin für Audacious\n"
+"Copyright 2016 John Lindgren"
+
+#: src/wavpack/wavpack.cc:25
 msgid "WavPack Decoder"
 msgstr "WavPack Dekodierer"
 
-#: src/wavpack/wavpack.cc:211
+#: src/wavpack/wavpack.cc:217
 msgid "lossy (hybrid)"
 msgstr "Verlustbehaftet (Hybrid)"
 
-#: src/wavpack/wavpack.cc:213
+#: src/wavpack/wavpack.cc:219
 msgid "lossy"
 msgstr "Verlustbehaftet"
 
-#: src/wavpack/wavpack.cc:255
+#: src/wavpack/wavpack.cc:259
 msgid ""
 "Copyright 2006 William Pitcock <nenolod@nenolod.net>\n"
 "\n"
@@ -4355,18 +4856,38 @@
 "\n"
 "Ein Teil des Plugin-Quelltextes war von Miles Egan."
 
-#: src/xsf/plugin.cc:50
+#: src/xsf/plugin.cc:74
 msgid "2SF Decoder"
 msgstr "2SF Dekodierer"
 
-#: src/xsf/plugin.cc:238
+#: src/xsf/plugin.cc:429
+msgid "32728 Hz"
+msgstr "32728 Hz"
+
+#: src/xsf/plugin.cc:432
+msgid "65456 Hz"
+msgstr "65456 Hz"
+
+#: src/xsf/plugin.cc:438
+msgid "Cosine"
+msgstr "Kosinus"
+
+#: src/xsf/plugin.cc:439
+msgid "Sharp"
+msgstr "Scharf"
+
+#: src/xsf/plugin.cc:443
 msgid "XSF Configuration"
 msgstr "XSF Konfiguration"
 
-#: src/xsf/plugin.cc:239
-msgid "Ignore length from file"
-msgstr "Länge aus Datei ignorieren"
+#: src/xsf/plugin.cc:445
+msgid "Default fade time:"
+msgstr "Standard-Überblendzeit:"
+
+#: src/xsf/plugin.cc:447
+msgid "Interpolation mode:"
+msgstr "Interpolationsmodus:"
 
-#: src/xspf/xspf.cc:89
+#: src/xspf/xspf.cc:95
 msgid "XML Shareable Playlists (XSPF)"
 msgstr "XML Wiedergabelisten (XSPF)"

audacious-plugins-3.6.2-gtk3.tar.bz2/po/el.po -> audacious-plugins-4.4.1.tar.bz2/po/el.po Changed

@@ -3,19 +3,30 @@
 # This file is distributed under the same license as the Audacious Plugins package.
 #
 # Translators:
+# 79353a696ad19dc202b261b3067b7640_bec941e, 2015
+# othon alexandros stamataras <alex.stam2000@gmail.com>, 2021
 # DImitrios Zakas <jim.thomas.zks@gmail.com>, 2013
+# Γιώργος Καρδάμης <kardamisgiorgos@gmail.com>, 2020
 # gis mapps <gismapps@gmail.com>, 2014
+# GreekLUG <info@greeklug.gr>, 2021
+# Ioannis LM, 2018,2020
+# Ioannis LM, 2018,2020-2024
+# Nick Tsakalidis <neorisionick@greeklug.gr>, 2021
 # DImitrios Zakas <jim.thomas.zks@gmail.com>, 2013
+# othon alexandros stamataras <alex.stam2000@gmail.com>, 2021
 # Wasilis Mandratzis-Walz, 2015
-# Γιάννης Ανθυμίδης <yannanth@gmail.com>, 2012-2013
+# 79353a696ad19dc202b261b3067b7640_bec941e, 2015
+# Yannis Anthymidis, 2012-2013
+# Γιώργος Καρδάμης <kardamisgiorgos@gmail.com>, 2020
 msgid ""
 msgstr ""
 "Project-Id-Version: Audacious Plugins\n"
-"Report-Msgid-Bugs-To: http://redmine.audacious-media-player.org/\n"
-"POT-Creation-Date: 2015-05-30 15:51+0200\n"
-"PO-Revision-Date: 2015-04-09 22:43+0000\n"
-"Last-Translator: Wasilis Mandratzis-Walz\n"
-"Language-Team: Greek (http://www.transifex.com/projects/p/audacious/language/"
+"Report-Msgid-Bugs-To: https://github.com/audacious-media-player/audacious/"
+"issues\n"
+"POT-Creation-Date: 2024-09-26 21:54+0200\n"
+"PO-Revision-Date: 2011-10-10 17:43+0000\n"
+"Last-Translator: Ioannis LM, 2018,2020-2024\n"
+"Language-Team: Greek (http://app.transifex.com/audacious/audacious/language/"
 "el/)\n"
 "Language: el\n"
 "MIME-Version: 1.0\n"
@@ -23,286 +34,60 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/aac-raw/aac.cc:18
+#: src/aac/aac.cc:19
 msgid "AAC (Raw) Decoder"
-msgstr "Αποκωδικοποιητής AAC (Raw)"
+msgstr "Αποκωδικοποιητής AAC (Raw) "
 
-#: src/adplug/adplug-xmms.cc:42
+#: src/adplug/adplug-xmms.cc:70
 msgid "AdPlug (AdLib Player)"
 msgstr "AdPlug (Αναπαραγωγή AdLib)"
 
-#: src/adplug/adplug-xmms.cc:156 src/modplug/modplugbmp.cc:335
-#: src/psf/plugin.cc:138 src/vtx/vtx.cc:87 src/xsf/plugin.cc:113
+#: src/adplug/adplug-xmms.cc:167 src/modplug/modplugbmp.cc:321
+#: src/psf/plugin.cc:161 src/vtx/vtx.cc:89 src/xsf/plugin.cc:204
 msgid "sequenced"
 msgstr "αλληλουχία"
 
-#: src/alarm/alarm.cc:55 src/alarm/interface.cc:82
-msgid "Alarm"
-msgstr "Ξυπνητήρι"
-
-#: src/alarm/alarm.cc:782
-msgid "Set Alarm ..."
-msgstr "Ρύθμιση συναγερμού ..."
-
-#: src/alarm/alarm.cc:810
-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 Deakin και τον Daniel Stodden."
-
-#: src/alarm/interface.cc: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"
-
-#: src/alarm/interface.cc: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"
-"\n"
-
-#: src/alarm/interface.cc: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"
-"Η διεύθυνση URL του mp3/ogg ροής\n"
-"μπορεί επίσης να καταγράφεται εδώ.\n"
-"\n"
-"Υπενθύμιση:\n"
-"Εμφανίζει μια υπενθύμιση όταν ηχήσει η ειδοποίηση.\n"
-"Πληκτρολογήστε την υπενθύμιση στο πλαίσιο και ενεργοποιήστε το\n"
-"κουμπί εναλλαγής, αν θέλετε να εμφανίζεται."
-
-#: src/alarm/interface.cc:81
-msgid "This is your wakeup call."
-msgstr "Αυτή είναι η κλήση αφύπνισης."
-
-#: src/alarm/interface.cc:99
-msgid "Your reminder for today is..."
-msgstr "Η υπενθύμιση σας για σήμερα είναι..."
-
-#: src/alarm/interface.cc:101 src/alarm/interface.cc:386
-msgid "Reminder"
-msgstr "Υπενθύμιση"
-
-#: src/alarm/interface.cc:132
-msgid "Monday"
-msgstr "Δευτέρα"
-
-#: src/alarm/interface.cc:132
-msgid "Tuesday"
-msgstr "Τρίτη"
-
-#: src/alarm/interface.cc:132
-msgid "Wednesday"
-msgstr "Τετάρτη"
-
-#: src/alarm/interface.cc:133
-msgid "Thursday"
-msgstr "Πέμπτη"
-
-#: src/alarm/interface.cc:133
-msgid "Friday"
-msgstr "Παρασκευή"
-
-#: src/alarm/interface.cc:133
-msgid "Saturday"
-msgstr "Σάββατο"
-
-#: src/alarm/interface.cc:133
-msgid "Sunday"
-msgstr "Κυριακή"
-
-#: src/alarm/interface.cc:171 src/alarm/interface.cc:230
-#: src/alarm/interface.cc:245
-msgid "Time"
-msgstr "Χρόνος"
-
-#: src/alarm/interface.cc:178
-msgid "Alarm at (default):"
-msgstr "Κτύπα στις (προεπιλογή):"
-
-#: src/alarm/interface.cc:200
-msgid "h"
-msgstr "ώ"
-
-#: src/alarm/interface.cc:203
-msgid "Quiet after:"
-msgstr "Σίγαση μετά από"
-
-#: src/alarm/interface.cc:215
-msgid "hours"
-msgstr "ώρες"
-
-#: src/alarm/interface.cc:226
-msgid "minutes"
-msgstr "λεπτά"
-
-#: src/alarm/interface.cc:235
-msgid "Choose the days for the alarm to come on"
-msgstr "Διαλέξτε τις ημέρες που θα χτυπήσει το ξυπνητήρι"
+#: src/adplug/adplug-xmms.cc:349 src/sid/xs_config.cc:61
+msgid "Output"
+msgstr "'Εξοδος"
 
-#: src/alarm/interface.cc:242
-msgid "Day"
-msgstr "Ημέρα"
+#: src/adplug/adplug-xmms.cc:350
+msgid "OPL Emulator:"
+msgstr "Εξομοιωτής OPL:"
+
+#: src/adplug/adplug-xmms.cc:353 src/amidiplug/i_configure.cc:153
+#: src/console/plugin.cc:45 src/filewriter/filewriter.cc:481
+#: src/sid/xs_config.cc:65 src/xsf/plugin.cc:446
+msgid "Sample rate:"
+msgstr "Ρυθμός δειγματοληψίας:"
 
-#: src/alarm/interface.cc:259 src/bs2b/plugin.cc:130
-#: src/skins/preset-list.cc:434 src/skins/preset-list.cc:440
-msgid "Default"
-msgstr "Προεπιλογή"
+#: src/adplug/adplug-xmms.cc:354 src/amidiplug/i_configure.cc:155
+#: src/bs2b/plugin.cc:141 src/console/plugin.cc:47
+#: src/modplug/plugin_main.cc:77 src/resample/resample.cc:201
+#: src/resample/resample.cc:207 src/resample/resample.cc:211
+#: src/resample/resample.cc:215 src/resample/resample.cc:219
+#: src/resample/resample.cc:223 src/resample/resample.cc:227
+#: src/resample/resample.cc:231 src/resample/resample.cc:235
+#: src/resample/resample.cc:239 src/resample/resample.cc:243
+#: src/sid/xs_config.cc:67 src/soxr/sox-resampler.cc:205
+msgid "Hz"
+msgstr "Hz"
 
-#: src/alarm/interface.cc:288
-msgid "Days"
-msgstr "Ημέρες"
-
-#: src/alarm/interface.cc:297
-msgid "Fading"
-msgstr "Ξεθωριάζει"
-
-#: src/alarm/interface.cc:305 src/console/plugin.cc:41
-#: src/crossfade/crossfade.cc:53 src/crossfade/crossfade.cc:59
-#: src/gtkui/settings.cc:49 src/lirc/lirc.cc:397 src/sid/xs_config.cc:85
-#: src/sid/xs_config.cc:94 src/sid/xs_config.cc:103
-msgid "seconds"
-msgstr "δευτερόλεπτα"
+#: src/adplug/adplug-xmms.cc:355 src/gtkui/settings.cc:55
+#: src/modplug/plugin_main.cc:105 src/qtui/settings.cc:85
+#: src/skins-qt/skins_cfg.cc:302 src/skins/skins_cfg.cc:284
+msgid "Miscellaneous"
+msgstr "Διάφορα"
 
-#: src/alarm/interface.cc:312 src/alarm/interface.cc:353
-msgid "Volume"
-msgstr "Ένταση"
-
-#: src/alarm/interface.cc:317
-msgid "Start at"
-msgstr "Ξεκινάει στις"
-
-#: src/alarm/interface.cc:333
-msgid "Final"
-msgstr "Τελικό"
-
-#: src/alarm/interface.cc:346
-msgid "Current"
-msgstr "Τωρινό"
-
-#: src/alarm/interface.cc:359
-msgid "Additional Command"
-msgstr "Επιπλέον Εντολή"
-
-#: src/alarm/interface.cc:365 src/alarm/interface.cc:391
-msgid "enable"
-msgstr "ενεργοποίηση"
-
-#: src/alarm/interface.cc:372
-msgid "Playlist (optional)"
-msgstr "Λίστα αναπαραγωγής (προαιρετική)"
-
-#: src/alarm/interface.cc:379
-msgid "Select a playlist"
-msgstr "Επιλέξτε μια λίστα αναπαραγωγής"
-
-#: src/alarm/interface.cc:399
-msgid "Options"
-msgstr "Επιλογές"
-
-#: src/alarm/interface.cc:404
-msgid "What do these options mean?"
-msgstr "Τι σημαίνουν αυτές οι επιλογές;"
-
-#: src/alarm/interface.cc:420
-msgid "Help"
-msgstr "Βοήθεια"
+#: src/adplug/adplug-xmms.cc:356
+msgid "Repeat song in endless loop"
+msgstr "Συνεχόμενη επανάληψη του τραγουδιού"
 
-#: src/albumart/albumart.cc:31
+#: src/albumart/albumart.cc:31 src/albumart-qt/albumart.cc:35
 msgid "Album Art"
-msgstr "Εξώφυλλο Άλμπουμ"
+msgstr "Εξώφυλλο άλμπουμ"
 
-#: src/albumart-qt/albumart.cc:33
-msgid "Album Art (Qt)"
-msgstr "Εξώφυλλο Άλμπουμ (Qt)"
-
-#: src/alsa/alsa.h:70
+#: src/alsa/alsa.h:64
 msgid "ALSA Output"
 msgstr "Έξοδος ALSA"
 
@@ -314,11 +99,11 @@
 "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 για το Audacious\n"
-"Πνευματικά δικαιώματα 2009-2012 John Λίντγκρεν\n"
+"Πρόσθετο Έξοδος ALSA για το Audacious\n"
+"Πνευματικά δικαιώματα 2009-2012 John Lindgren\n"
 "\n"
-"Τις ευχαριστίες μου στον William Pitcock, δημιουργο της εξόδου ALSA "
-"Πρόσθετο, της οποίας ο κώδικας υπηρέτησε ως σημείο αναφοράς όταν το "
+"Τις ευχαριστίες μου στον William Pitcock, δημιουργό του πρόσθετου Έξοδος "
+"ALSA NG, του οποίου ο κώδικας υπηρέτησε ως σημείο αναφοράς όταν το "
 "εγχειρίδιο ALSA δεν ήταν αρκετό."
 
 #: src/alsa/config.cc:61
@@ -345,11 +130,11 @@
 msgid "Mixer element:"
 msgstr "Στοιχείο μείκτη:"
 
-#: src/amidi-plug/amidi-plug.cc:41
+#: src/amidiplug/amidi-plug.cc:42
 msgid "AMIDI-Plug (MIDI Player)"
 msgstr "AMIDI-Plug (Αναπαραγωγή MIDI)"
 
-#: src/amidi-plug/amidi-plug.cc:437
+#: src/amidiplug/amidi-plug.cc:445
 msgid ""
 "AMIDI-Plug\n"
 "modular MIDI music player\n"
@@ -371,177 +156,181 @@
 "Tony Vroon\n"
 "for the good help with alpha testing"
 msgstr ""
-"Amidi Τοποθέτησης\n"
-"αρθρωτό MIDI πρόγραμμα αναπαραγωγής μουσικής\n"
+"Πρόσθετο AMIDI-Plug\n"
+"αρθρωτό πρόγραμμα αναπαραγωγής μουσικής MIDI\n"
 "http://www.develia.org/projects.php?p=amidiplug\n"
 "\n"
-"γράφτηκε από τον Giacomo Lozito\n"
+"Γράφτηκε από τον Giacomo Lozito\n"
 "<james@develia.org>\n"
 "\n"
-"Ιδιαίτερες ευχαριστίες προς ...\n"
+"Ιδιαίτερες ευχαριστίες προς τους...\n"
 "\n"
 "Clemens Ladisch και Jaroslav Kysela\n"
-"για συναρπαστικές προγράμματα aplaymidi και amixer τους; εκείνα\n"
-"ήταν πραγματικά χρήσιμα, μαζί με alsa-lib docs, προκειμένου\n"
-"για να μάθετε περισσότερα σχετικά με το ALSA API\n"
+"για τα συναρπαστικά προγράμματα τους aplaymidi και amixer, που πραγματικά "
+"χρησίμευσαν μαζί με τα alsa-lib docs, προκειμένου να μάθουμε περισσότερα "
+"σχετικά με το API ALSA\n"
 "\n"
 "Alfredo Spadafina\n"
-"για το ωραίο λογότυπο midi πληκτρολόγιο\n"
+"για το ωραίο λογότυπο του πληκτρολογίου midi\n"
 "\n"
-"Τόνι Vroon\n"
-"για την καλή βοήθεια με άλφα δοκιμή"
+"Tony Vroon\n"
+"για την βοήθεια του στη δοκιμή άλφα"
 
-#: src/amidi-plug/i_configure.cc:94
+#: src/amidiplug/i_configure.cc:94
 msgid "Override default gain:"
 msgstr "Παράκαμψη προεπιλεγμένης αύξησης:"
 
-#: src/amidi-plug/i_configure.cc:102
+#: src/amidiplug/i_configure.cc:102
 msgid "Override default polyphony:"
 msgstr "Παράκαμψη προεπιλεγμένης πολυφωνίας:"
 
-#: src/amidi-plug/i_configure.cc:110
+#: src/amidiplug/i_configure.cc:110
 msgid "Override default reverb:"
 msgstr "Παράκαμψη προεπιλεγμένης αντήχησης:"
 
-#: src/amidi-plug/i_configure.cc:112 src/amidi-plug/i_configure.cc:120
+#: src/amidiplug/i_configure.cc:112 src/amidiplug/i_configure.cc:120
 msgid "On"
-msgstr "Ενεργοποιηση"
+msgstr "Ενεργοποίηση"
 
-#: src/amidi-plug/i_configure.cc:118
+#: src/amidiplug/i_configure.cc:118
 msgid "Override default chorus:"
 msgstr "Παράκαμψη προεπιλεγμένου ρεφρέν:"
 
-#: src/amidi-plug/i_configure.cc:128 src/console/plugin.cc:29
+#: src/amidiplug/i_configure.cc:128 src/console/plugin.cc:29
 msgid "Playback"
 msgstr "Αναπαραγωγή"
 
-#: src/amidi-plug/i_configure.cc:129
+#: src/amidiplug/i_configure.cc:129
 msgid "Transpose:"
-msgstr "Μεταφορά: "
+msgstr "Μετάθεση:"
 
-#: src/amidi-plug/i_configure.cc:131
+#: src/amidiplug/i_configure.cc:131 src/speedpitch/speed-pitch.cc:257
 msgid "semitones"
 msgstr "ημιτόνια"
 
-#: src/amidi-plug/i_configure.cc:132
+#: src/amidiplug/i_configure.cc:132
 msgid "Drum shift:"
-msgstr "Τύμπανο μετατόπιση:"
+msgstr "Μετακίνηση Drum:"
 
-#: src/amidi-plug/i_configure.cc:134
+#: src/amidiplug/i_configure.cc:134
 msgid "note numbers"
-msgstr "αριθμοί υπό σημείωση"
+msgstr "αριθμοί"
 
-#: src/amidi-plug/i_configure.cc:135
+#: src/amidiplug/i_configure.cc:135
 msgid "Skip leading silence"
-msgstr "Μετάβαση κορυφαίας σιωπής"
+msgstr "Παράληψη κύριας σιωπής"
 
-#: src/amidi-plug/i_configure.cc:137
+#: src/amidiplug/i_configure.cc:137
 msgid "Skip trailing silence"
-msgstr "Μετάβαση κορυφαίας σιωπής"
+msgstr "Παράληψη ακολουθούμενης σιωπής"
 
-#: src/amidi-plug/i_configure.cc:141
+#: src/amidiplug/i_configure.cc:141
 msgid "SoundFont"
 msgstr "SoundFont"
 
-#: src/amidi-plug/i_configure.cc:143
+#: src/amidiplug/i_configure.cc:148
 msgid "Synthesizer"
 msgstr "Synthesizer"
 
-#: src/amidi-plug/i_configure.cc:148 src/console/plugin.cc:45
-#: src/sid/xs_config.cc:65
-msgid "Sample rate:"
-msgstr "ρυθμός δείγματος:"
-
-#: src/amidi-plug/i_configure.cc:150 src/bs2b/plugin.cc:141
-#: src/console/plugin.cc:47 src/modplug/plugin_main.cc:78
-#: src/resample/resample.cc:201 src/resample/resample.cc:207
-#: src/resample/resample.cc:211 src/resample/resample.cc:215
-#: src/resample/resample.cc:219 src/resample/resample.cc:223
-#: src/resample/resample.cc:227 src/resample/resample.cc:231
-#: src/resample/resample.cc:235 src/resample/resample.cc:239
-#: src/resample/resample.cc:243 src/sid/xs_config.cc:67
-#: src/sox-resampler/sox-resampler.cc:163
-msgid "Hz"
-msgstr "Hz"
-
-#: src/amidi-plug/i_configure-fluidsynth.cc:52
+#: src/amidiplug/i_configure-fluidsynth.cc:58
+#: src/amidiplug/i_configure-fluidsynth.cc:527
 msgid "AMIDI-Plug - select SoundFont file"
-msgstr "AMIDI-Plug - επιλέξτε αρχείο SoundFont"
+msgstr "Πρόσθετο AMIDI - επιλέξτε αρχείο SoundFont"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:55 src/filewriter/mp3.cc:658
+#: src/amidiplug/i_configure-fluidsynth.cc:61
 msgid "_Cancel"
-msgstr "_Άκυρο"
+msgstr "Άκ_υρο"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:56
+#: src/amidiplug/i_configure-fluidsynth.cc:62
 msgid "_Open"
-msgstr "_Άνοιγμα"
+msgstr "Άνοι_γμα"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:225 src/gtkui/columns.cc:46
+#: src/amidiplug/i_configure-fluidsynth.cc:233
+#: src/amidiplug/i_configure-fluidsynth.cc:461
 msgid "File name"
 msgstr "Όνομα αρχείου"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:229
+#: src/amidiplug/i_configure-fluidsynth.cc:237
+#: src/amidiplug/i_configure-fluidsynth.cc:464
 msgid "Size (bytes)"
 msgstr "Μέγεθος (byte)"
 
-#: src/amidi-plug/i_fileinfo.cc:163
+#: src/amidiplug/i_fileinfo.cc:184
 msgid "Name:"
 msgstr "Όνομα:"
 
-#: src/amidi-plug/i_fileinfo.cc:181
+#: src/amidiplug/i_fileinfo.cc:202
 msgid " MIDI Info "
 msgstr " Πληροφορίες MIDI "
 
-#: src/amidi-plug/i_fileinfo.cc:195
+#: src/amidiplug/i_fileinfo.cc:216
 msgid "Format:"
 msgstr "Μορφή:"
 
-#: src/amidi-plug/i_fileinfo.cc:198
+#: src/amidiplug/i_fileinfo.cc:219
 msgid "Length (msec):"
-msgstr "Μήκος (ms):"
+msgstr "Διάρκεια (ms):"
 
-#: src/amidi-plug/i_fileinfo.cc:201
+#: src/amidiplug/i_fileinfo.cc:222
 msgid "No. of Tracks:"
-msgstr "Αρ. Κομματιών"
+msgstr "Αρ. κομματιών:"
 
-#: src/amidi-plug/i_fileinfo.cc:207
+#: src/amidiplug/i_fileinfo.cc:228
 msgid "variable"
 msgstr "μεταβλητή"
 
-#: src/amidi-plug/i_fileinfo.cc:209
+#: src/amidiplug/i_fileinfo.cc:230
 msgid "BPM:"
 msgstr "BPM:"
 
-#: src/amidi-plug/i_fileinfo.cc:217
+#: src/amidiplug/i_fileinfo.cc:238
 msgid "BPM (wavg):"
 msgstr "BPM (wavg):"
 
-#: src/amidi-plug/i_fileinfo.cc:220
+#: src/amidiplug/i_fileinfo.cc:241
 msgid "Time Div:"
-msgstr "Χρόνος:"
+msgstr "Χρόνος Div:"
 
-#: src/amidi-plug/i_fileinfo.cc:231
+#: src/amidiplug/i_fileinfo.cc:252
 msgid " MIDI Comments and Lyrics "
 msgstr " Σχόλια και Στοίχοι MIDI "
 
-#: src/amidi-plug/i_fileinfo.cc:278
+#: src/amidiplug/i_fileinfo.cc:299
 msgid "* no comments available in this MIDI file *"
 msgstr "* δεν υπάρχουν σχόλια σε αυτό το αρχείο MIDI *"
 
-#: src/amidi-plug/i_fileinfo.cc:290
+#: src/amidiplug/i_fileinfo.cc:311
 msgid "* no lyrics available in this MIDI file *"
-msgstr "* δεν υπάρχουν στοίχοι σε αυτό το αρχείο MIDI *"
+msgstr "* δεν υπάρχουν στίχοι σε αυτό το αρχείο MIDI *"
 
-#: src/amidi-plug/i_fileinfo.cc:300 src/filewriter/vorbis.cc:197
-#: src/ladspa/plugin.cc:416
+#: src/amidiplug/i_fileinfo.cc:321 src/ladspa/plugin.cc:418
+#: src/ui-common/dialogs-qt.cc:32
 msgid "_Close"
 msgstr "_Κλείσιμο"
 
-#: src/amidi-plug/i_fileinfo.cc:325
+#: src/amidiplug/i_fileinfo.cc:346
 msgid " (invalid UTF-8)"
 msgstr " (μη έγκυρο UTF-8)"
 
-#: src/aosd/aosd.cc:32
+#: src/ampache/ampache.cc:33
+msgid "Ampache Browser"
+msgstr "Ampache Browser"
+
+#: src/ampache/ampache.cc:46
+msgid ""
+"Ampache Browser for Audacious\n"
+"http://ampache-browser.org/\n"
+"\n"
+"Copyright (C) Róbert Čerňanský and John Lindgren\n"
+"License: GNU GPLv3"
+msgstr ""
+"Ampache Browser για το Audacious\n"
+"http://ampache-browser.org/\n"
+"\n"
+"Πνευματικά δικαιώματα (C) Róbert Čerňanský και John Lindgren\n"
+"Άδεια: GNU GPLv3"
+
+#: src/aosd/aosd.cc:31
 msgid ""
 "Audacious OSD\n"
 "http://www.develia.org/projects.php?p=audacious#aosd\n"
@@ -554,14 +343,14 @@
 "Audacious OSD\n"
 "http://www.develia.org/projects.php?p=audacious#aosd\n"
 "\n"
-"Συντάχθηκε απο τον Giacomo Lozito <james@develia.org>\n"
+"Συντάχθηκε από τον Giacomo Lozito <james@develia.org>\n"
 "\n"
-"Βασίζεται εν μέρει στην Ghosd βιβλιοθήκη του Evan Μάρτιν:\n"
+"Βασίζεται εν μέρει στη βιβλιοθήκη Ghosd του Evan Martin:\n"
 "http://neugierig.org/software/ghosd/"
 
 #: src/aosd/aosd.h:37
 msgid "AOSD (On-Screen Display)"
-msgstr "AOSD (Απεικόνιση στην Οθόνη)"
+msgstr "AOSD (Απεικόνιση στην οθόνη)"
 
 #: src/aosd/aosd_style.cc:54
 msgid "Rectangle"
@@ -569,222 +358,311 @@
 
 #: src/aosd/aosd_style.cc:59
 msgid "Rounded Rectangle"
-msgstr "Στρογγυλεμένο Ορθογώνιο"
+msgstr "Στρογγυλεμένο ορθογώνιο"
 
 #: src/aosd/aosd_style.cc:64
 msgid "Concave Rectangle"
-msgstr "Κοίλο Ορθογώνιο"
+msgstr "Κοίλο ορθογώνιο"
 
-#: src/aosd/aosd_style.cc:69
+#: src/aosd/aosd_style.cc:69 src/openmpt/mptwrap.h:50 src/xsf/plugin.cc:436
 msgid "None"
 msgstr "Κανένα"
 
-#: src/aosd/aosd_trigger.cc:50
+#: src/aosd/aosd_trigger.cc:49
 msgid "Playback Start"
 msgstr "Έναρξη αναπαραγωγής"
 
-#: src/aosd/aosd_trigger.cc:51
+#: src/aosd/aosd_trigger.cc:50
 msgid "Triggers OSD when a playlist entry is played."
-msgstr "Αφυπνιση OSD όταν μια καταχώρηση αναπαραγεται."
+msgstr ""
+"Ενεργοποίηση απεικόνισης στην οθόνη (OSD) όταν αναπαράγεται η λίστα "
+"αναπαραγωγής."
 
-#: src/aosd/aosd_trigger.cc:56
+#: src/aosd/aosd_trigger.cc:55
 msgid "Title Change"
-msgstr "Αλλαγή Τίτλου"
+msgstr "Αλλαγή τίτλου"
 
-#: src/aosd/aosd_trigger.cc:57
+#: src/aosd/aosd_trigger.cc:56
 msgid "Triggers OSD when the song title changes (for internet streams)."
 msgstr ""
-"Αφυπνιση OSD όταν αλλαζει ο τίτλος του τραγουδιού (για ροές στο διαδίκτυο)."
+"Ενεργοποίηση απεικόνισης στην οθόνη (OSD) όταν αλλάζει ο τίτλος του "
+"τραγουδιού (για ροές στο διαδίκτυο)."
 
-#: src/aosd/aosd_trigger.cc:62
+#: src/aosd/aosd_trigger.cc:61
 msgid "Pause On"
-msgstr "Παύση Ενεργή"
+msgstr "Παύση ενεργή"
 
-#: src/aosd/aosd_trigger.cc:63
+#: src/aosd/aosd_trigger.cc:62
 msgid "Triggers OSD when playback is paused."
-msgstr "Αφυπνιση OSD όταν γίνεται παύση της αναπαραγωγής."
+msgstr ""
+"Ενεργοποίηση απεικόνισης στην οθόνη (OSD) όταν γίνεται παύση της "
+"αναπαραγωγής."
 
-#: src/aosd/aosd_trigger.cc:68
+#: src/aosd/aosd_trigger.cc:67
 msgid "Pause Off"
-msgstr "Παύση Ανένεργη"
+msgstr "Παύση ανενεργή"
 
-#: src/aosd/aosd_trigger.cc:69
+#: src/aosd/aosd_trigger.cc:68
 msgid "Triggers OSD when playback is unpaused."
-msgstr "Αφυπνιση OSD όταν δεν γίνεται παύση της αναπαραγωγής."
+msgstr ""
+"Ενεργοποίηση απεικόνισης στην οθόνη (OSD) όταν η αναπαραγωγή επανέρχεται από "
+"παύση."
 
-#: src/aosd/aosd_ui.cc:163
+#: src/aosd/aosd_ui.cc:204
 msgid "Placement"
 msgstr "Τοποθέτηση"
 
-#: src/aosd/aosd_ui.cc:196
+#: src/aosd/aosd_ui.cc:241
 msgid "Relative X offset:"
-msgstr "Σχετικό Χ offset:"
+msgstr "Σχετικός οριζόντιος άξονας Χ:"
 
-#: src/aosd/aosd_ui.cc:203
+#: src/aosd/aosd_ui.cc:245
 msgid "Relative Y offset:"
-msgstr "Σχετικό Y offset:"
+msgstr "Σχετικός κάθετος άξονας Y:"
 
-#: src/aosd/aosd_ui.cc:210
+#: src/aosd/aosd_ui.cc:249
 msgid "Max OSD width:"
-msgstr "Πλάτος αφυπνισης OSD:"
+msgstr "Μέγιστο πλάτος απεικόνισης στην οθόνη (OSD):"
 
-#: src/aosd/aosd_ui.cc:221
+#: src/aosd/aosd_ui.cc:281
 msgid "Multi-Monitor options"
 msgstr "Επιλογές για πολλαπλές οθόνες"
 
-#: src/aosd/aosd_ui.cc:225
+#: src/aosd/aosd_ui.cc:285
 msgid "Display OSD using:"
-msgstr "Προβολή OSD με χρήση:"
+msgstr "Προβολή απεικόνισης στην οθόνη (OSD) σε:"
 
-#: src/aosd/aosd_ui.cc:227
+#: src/aosd/aosd_ui.cc:287
 msgid "all monitors"
-msgstr "όλες οι οθόνες"
+msgstr "όλες τις οθόνες"
 
-#: src/aosd/aosd_ui.cc:230
+#: src/aosd/aosd_ui.cc:290
 #, c-format
 msgid "monitor %i"
 msgstr "οθόνη %i"
 
-#: src/aosd/aosd_ui.cc:282
+#: src/aosd/aosd_ui.cc:342
 msgid "Timing (ms)"
 msgstr "Συγχρονισμός (ms)"
 
-#: src/aosd/aosd_ui.cc:287
+#: src/aosd/aosd_ui.cc:347
 msgid "Display:"
 msgstr "Προβολή:"
 
-#: src/aosd/aosd_ui.cc:292
+#: src/aosd/aosd_ui.cc:352
 msgid "Fade in:"
-msgstr "Ομαλή είσοδος:"
+msgstr "Σταδιακή είσοδος:"
 
-#: src/aosd/aosd_ui.cc:297
+#: src/aosd/aosd_ui.cc:357
 msgid "Fade out:"
-msgstr "Ξεθώριασμα:"
+msgstr "Βαθμιαίο σβήσιμο:"
 
-#: src/aosd/aosd_ui.cc:361
+#: src/aosd/aosd_ui.cc:442
 msgid "Fonts"
 msgstr "Γραμματοσειρές"
 
-#: src/aosd/aosd_ui.cc:368
+#: src/aosd/aosd_ui.cc:449
 #, c-format
 msgid "Font %i:"
 msgstr "Γραμματοσειρά %i:"
 
-#: src/aosd/aosd_ui.cc:382
+#: src/aosd/aosd_ui.cc:466
 msgid "Shadow"
 msgstr "Σκιά"
 
-#: src/aosd/aosd_ui.cc:486
+#: src/aosd/aosd_ui.cc:589
 msgid "Render Style"
 msgstr "Απόδοση ύφους"
 
-#: src/aosd/aosd_ui.cc:502
+#: src/aosd/aosd_ui.cc:605
 msgid "Colors"
 msgstr "Χρώματα"
 
-#: src/aosd/aosd_ui.cc:513
+#: src/aosd/aosd_ui.cc:616
 #, c-format
 msgid "Color %i:"
 msgstr "Χρώμα %i:"
 
-#: src/aosd/aosd_ui.cc:600
+#: src/aosd/aosd_ui.cc:714
 msgid "Enable trigger"
-msgstr "Ενεργοποίηση έναυσματος"
+msgstr "Ενεργοποίηση εμφάνισης"
 
-#: src/aosd/aosd_ui.cc:627
+#: src/aosd/aosd_ui.cc:741
 msgid "Event"
 msgstr "Συμβάν"
 
-#: src/aosd/aosd_ui.cc:655
+#: src/aosd/aosd_ui.cc:768
 msgid "Composite manager detected"
-msgstr "Διαχειριστής σύνθετων ανιχνεύθηκε"
+msgstr "Ανιχνεύθηκε διαχειριστής σύνθεσης"
 
-#: src/aosd/aosd_ui.cc:662
+#: src/aosd/aosd_ui.cc:775
 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 δεν θα λειτουργήσει σωστά"
+"Δεν ανιχνεύθηκε διαχειριστής σύνθεσης!\n"
+"αν γνωρίζετε ότι έχετε κάποιον σε λειτουργία παρακαλώ ενεργοποιήστε τον, "
+"διαφορετικά δεν θα λειτουργήσει σωστά η απεικόνιση στην οθόνη (OSD)"
 
-#: src/aosd/aosd_ui.cc:670
+#: src/aosd/aosd_ui.cc:783
 msgid "Composite manager not required for fake transparency"
-msgstr "Σύνθετο διαχειριστής δεν απαιτείται για ψεύτικη διαφάνεια"
+msgstr "Δεν απαιτείται διαχειριστής σύνθεσης για ψεύτικη διαφάνεια"
 
-#: src/aosd/aosd_ui.cc:706
+#: src/aosd/aosd_ui.cc:820
 msgid "Transparency"
 msgstr "Διαφάνεια"
 
-#: src/aosd/aosd_ui.cc:712
+#: src/aosd/aosd_ui.cc:826
 msgid "Fake transparency"
 msgstr "Ψεύτικη διαφάνεια"
 
-#: src/aosd/aosd_ui.cc:714
+#: src/aosd/aosd_ui.cc:828
 msgid "Real transparency (requires X Composite Ext.)"
 msgstr "Πραγματική διαφάνεια (χρειάζεται X Composite Ext.)"
 
-#: src/aosd/aosd_ui.cc:756
+#: src/aosd/aosd_ui.cc:875
 msgid "Composite extension not loaded"
-msgstr "Σύνθετη επέκταση δεν φορτώθηκε"
-
-#: src/aosd/aosd_ui.cc:764
-msgid "Composite extension not available"
-msgstr "Σύνθετη επέκταση δεν είναι διαθέσιμη"
+msgstr "Η επέκταση σύνθεσης δεν φορτώθηκε"
 
-#: src/aosd/aosd_ui.cc:781
+#: src/aosd/aosd_ui.cc:892
 #, c-format
 msgid "Audacious OSD"
 msgstr "Audacious OSD"
 
-#: src/aosd/aosd_ui.cc:844
+#: src/aosd/aosd_ui.cc:955
 msgid "Position"
 msgstr "Θέση"
 
-#: src/aosd/aosd_ui.cc:849
+#: src/aosd/aosd_ui.cc:960
 msgid "Animation"
 msgstr "Κίνηση"
 
-#: src/aosd/aosd_ui.cc:854
+#: src/aosd/aosd_ui.cc:965
 msgid "Text"
 msgstr "Κείμενο"
 
-#: src/aosd/aosd_ui.cc:859
+#: src/aosd/aosd_ui.cc:970
 msgid "Decoration"
-msgstr "Διακοσμήση"
+msgstr "Διακόσμηση"
 
-#: src/aosd/aosd_ui.cc:864
+#: src/aosd/aosd_ui.cc:975
 msgid "Trigger"
-msgstr "Εναυσμα"
+msgstr "Εμφάνιση"
 
-#: src/aosd/aosd_ui.cc:869
+#: src/aosd/aosd_ui.cc:980 src/streamtuner/shoutcast-model.cc:202
 msgid "Misc"
 msgstr "Διάφορα"
 
-#: src/aosd/aosd_ui.cc:878
+#: src/aosd/aosd_ui.cc:989
 msgid "Test"
 msgstr "Δοκιμή"
 
 #: src/asx3/asx3.cc:35
 msgid "ASXv3 Playlists"
-msgstr "Λίστες Αναπαραγωγής ASXv3"
+msgstr "Λίστες αναπαραγωγής ASXv3"
 
 #: src/asx/asx.cc:33
 msgid "ASXv1/ASXv2 Playlists"
-msgstr "Λίστες Αναπαραγωγής ASXv1/ASXv2"
+msgstr "Λίστες αναπαραγωγής ASXv1/ASXv2"
 
 #: src/audpl/audpl.cc:33
 msgid "Audacious Playlists (audpl)"
-msgstr "Λίστες Αναπαραγωγής Audacious (audpl)"
+msgstr "Λίστες αναπαραγωγής Audacious (audpl)"
+
+#: src/background_music/background_music.cc:24
+msgid "Background music"
+msgstr "Υπόβαθρο μουσικής"
+
+#: src/background_music/background_music.cc:25
+msgid "Target level:"
+msgstr "Επίπεδο:"
+
+#: src/background_music/background_music.cc:28
+#: src/background_music/background_music.cc:33
+#: src/silence-removal/silence-removal.cc:70
+msgid "dB"
+msgstr "dB"
+
+#: src/background_music/background_music.cc:29
+msgid "Maximum amplification:"
+msgstr "Μέγιστη ενίσχυση:"
+
+#: src/background_music/background_music.cc:34 src/mpg123/mpg123.cc:81
+msgid "Advanced"
+msgstr "Προχωρημένα"
+
+#: src/background_music/background_music.cc:36
+msgid "Slow detection weight:"
+msgstr "Στάθμιση αργής ανίχνευσης:"
+
+#: src/background_music/background_music.cc:39
+msgid "Hint"
+msgstr "Υπόδειξη"
+
+#: src/background_music/background_music.cc:41
+msgid ""
+"Slow detection weight is the relative weight\n"
+"of a long term average detection when compared\n"
+"to the actual, faster loudness detection.\n"
+"A value of zero gives a more radio-like sound\n"
+"where soft passages get \"pulled up\" more quickly,\n"
+"a value of two makes the sound feel less compressed."
+msgstr ""
+"Η στάθμιση αργής ανίχνευσης της έντασης του ήχου είναι,\n"
+"η σχετική στάθμιση μιας μεγάλης διάρκειας μέσης ανίχνευσης\n"
+"συγκριτικά με την πραγματική, ταχύτερη ανίχνευση.\n"
+"Μια τιμή μηδέν δίνει ήχο που μοιάζει περισσότερο ραδιοφωνικός\n"
+"όπου, τα σιγανά τμήματα \"ανεβαίνουν\" ταχύτερα ενώ, \n"
+"μια τιμή δύο κάνει τον ήχο να μοιάζει λιγότερο πιεσμένος."
+
+#: src/background_music/background_music.cc:52
+msgid ""
+"Background Music Plugin for Audacious\n"
+"Copyright 2023;2024 Michel Fleur\n"
+"\n"
+"Controls the volume to make the sound equally loud within and between "
+"tracks.\n"
+" It uses accurate loudness measurement and tries to make the volume changes "
+"sound natural without audible peaks, yet without lowering the volume before "
+"a peak in advance."
+msgstr ""
+"Πρόσθετο Υπόβαθρο μουσικής για το Audacious\n"
+"Πνευματικά δικαιώματα 2023;2024 Michel Fleur\n"
+"\n"
+"Ελέγχει την ένταση για να είναι ο ήχος εξίσου δυνατός εντός και μεταξύ των "
+"κομματιών.\n"
+" Χρησιμοποιεί ακριβή μέτρηση της έντασης του ήχου και προσπαθεί οι αλλαγές "
+"έντασης να ακούγονται φυσιολογικά χωρίς ηχητικές κορυφώσεις και χωρίς να "
+"μειώνεται προκαταβολικά η ένταση πριν από μια κορυφή."
+
+#: src/background_music/background_music.cc:61
+msgid "Background Music"
+msgstr "Υπόβαθρο μουσικής"
+
+#: src/bitcrusher/bitcrusher.cc:33
+msgid "Bitcrusher"
+msgstr "Bitcrusher"
+
+#: src/bitcrusher/bitcrusher.cc:34
+msgid "Bit Depth:"
+msgstr "Βάθος bit:"
+
+#: src/bitcrusher/bitcrusher.cc:37
+msgid "Downsample ratio:"
+msgstr "Αναλογία υποδειγματοληψίας:"
+
+#: src/bitcrusher/bitcrusher.cc:48
+msgid "Bitcrusher"
+msgstr "Bitcrusher (εφέ ήχου)"
 
-#: src/blur_scope/blur_scope.cc:42
+#: src/blur_scope/blur_scope.cc:40 src/blur_scope-qt/blur_scope.cc:45
 msgid "Color"
 msgstr "Χρώμα"
 
-#: src/blur_scope/blur_scope.cc:58
+#: src/blur_scope/blur_scope.cc:56 src/blur_scope-qt/blur_scope.cc:158
 msgid "Blur Scope"
-msgstr "Εμβέλεια"
+msgstr "Κυματομορφή θόλωσης"
 
 #: src/bs2b/plugin.cc:38
 msgid "Bauer Stereophonic-to-Binaural (BS2B)"
@@ -792,7 +670,11 @@
 
 #: src/bs2b/plugin.cc:129
 msgid "Presets:"
-msgstr "Προεπιλογές:"
+msgstr "Προρυθμίσεις:"
+
+#: src/bs2b/plugin.cc:130
+msgid "Default"
+msgstr "Προεπιλογή"
 
 #: src/bs2b/plugin.cc:136
 msgid "Feed level:"
@@ -806,15 +688,15 @@
 msgid "Cut frequency:"
 msgstr "Αποκοπή συχνότητας:"
 
-#: src/cairo-spectrum/cairo-spectrum.cc:41
+#: src/cairo-spectrum/cairo-spectrum.cc:42 src/qt-spectrum/qt-spectrum.cc:107
 msgid "Spectrum Analyzer"
-msgstr "Αναλυτής Φάσματος"
+msgstr "Αναλυτής φάσματος"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:72
+#: src/cdaudio/cdaudio-ng.cc:74
 msgid "Audio CD Plugin"
-msgstr "Πρόσθετο Μουσικών CD"
+msgstr "Πρόσθετο μουσικών CD"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:121
+#: src/cdaudio/cdaudio-ng.cc:121
 msgid ""
 "Copyright (C) 2007-2012 Calin Crisan <ccrisan@gmail.com> and others.\n"
 "\n"
@@ -825,142 +707,143 @@
 "\n"
 "This was a Google Summer of Code 2007 project."
 msgstr ""
-"Copyright (C) 2007-2012 Calin Crisan <ccrisan@gmail.com> και άλλοι.\n"
+"Πνευματικά δικαιώματα (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"
+"libcdio <http://www.gnu.org/software/libcdio/> και του\n"
+"libcddb <http://libcddb.sourceforge.net/>.\n"
 "\n"
 "Επίσης ευχαριστώ τον Tony Vroon για την καθοδήγησή του.\n"
 "\n"
-"Αυτό το πρόσθετο δημιουργήθηκε κατά το Google Summer of Code 2007."
+"Δημιουργήθηκε κατά το Google Summer of Code 2007."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:137
+#: src/cdaudio/cdaudio-ng.cc:140
 msgid "Device"
 msgstr "Συσκευή"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:138
+#: src/cdaudio/cdaudio-ng.cc:141
 msgid "Read speed:"
 msgstr "Ταχύτητα ανάγνωσης:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:141
+#: src/cdaudio/cdaudio-ng.cc:144
 msgid "Override device:"
 msgstr "Παράκαμψη συσκευής:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:143
+#: src/cdaudio/cdaudio-ng.cc:146
 msgid "Metadata"
 msgstr "Μεταδεδομένα"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:144
+#: src/cdaudio/cdaudio-ng.cc:147
 msgid "Use CD-Text"
 msgstr "Χρήση CD-Text"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:146
+#: src/cdaudio/cdaudio-ng.cc:150
 msgid "Use CDDB"
 msgstr "Χρήση CDDB"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:148
+#: src/cdaudio/cdaudio-ng.cc:152
 msgid "Use HTTP instead of CDDBP"
 msgstr "Χρήση HTTP αντί CDDBP"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:151
+#: src/cdaudio/cdaudio-ng.cc:155
 msgid "Server:"
-msgstr "Εξυπηρετητής:"
+msgstr "Διακομιστής:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:155
+#: src/cdaudio/cdaudio-ng.cc:159
 msgid "Path:"
 msgstr "Διαδρομή:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:159
+#: src/cdaudio/cdaudio-ng.cc:163
 msgid "Port:"
 msgstr "Θύρα:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:246
+#: src/cdaudio/cdaudio-ng.cc:228
 msgid "Failed to initialize cdio subsystem."
-msgstr "Απέτυχε η αρχικοποίηση του υποσυστήματος cdio."
+msgstr "Αποτυχία αρχικοποίησης του υποσυστήματος cdio."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:281
+#: src/cdaudio/cdaudio-ng.cc:260
 #, c-format
 msgid "Invalid URI %s."
 msgstr "Μη έγκυρο URI %s."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:283
+#: src/cdaudio/cdaudio-ng.cc:262
 #, c-format
 msgid "Track %d not found."
 msgstr "Το κομμάτι %d δεν βρέθηκε."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:285
+#: src/cdaudio/cdaudio-ng.cc:264
 #, c-format
 msgid "Track %d is a data track."
-msgstr "Κομμάτι %d είναι ένα κομμάτι δεδομένων."
+msgstr "Το κομμάτι %d είναι κομμάτι δεδομένων."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:360
+#: src/cdaudio/cdaudio-ng.cc:339
 msgid "Error reading audio CD."
 msgstr "Σφάλμα ανάγνωσης CD ήχου."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:429
+#: src/cdaudio/cdaudio-ng.cc:410
 msgid "Audio CD"
 msgstr "Μουσικό CD"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:460 src/cdaudio-ng/cdaudio-ng.cc:469
+#: src/cdaudio/cdaudio-ng.cc:446 src/cdaudio/cdaudio-ng.cc:455
 #, c-format
 msgid "Failed to open CD device %s."
-msgstr "Απέτυχε να ανοίξει τη συσκευή του CD %s."
+msgstr "Αποτυχία ανοίγματος της συσκευή CD %s."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:472
+#: src/cdaudio/cdaudio-ng.cc:458
 msgid "No audio capable CD drive found."
-msgstr "Δεν υπάρχει ήχος ικανής μονάδας CD που βρέθηκε."
+msgstr "Δεν βρέθηκε συσκευή με CD ήχου."
+
+#: src/cdaudio/cdaudio-ng.cc:481
+msgid "Drive is empty."
+msgstr "Η μονάδα δίσκου είναι κενή."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:497
+#: src/cdaudio/cdaudio-ng.cc:483
+msgid "Unsupported disk type."
+msgstr "Μη υποστηριζόμενος τύπος δίσκου."
+
+#: src/cdaudio/cdaudio-ng.cc:507
 msgid "Failed to finish initializing opened CD drive."
-msgstr "Αποτυχία για να ολοκληρωθεί η αρχικοποίηση ανοιχτής μονάδας CD."
+msgstr "Δεν ολοκληρώθηκε η αρχικοποίηση της ανοιχτής μονάδας CD."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:510
+#: src/cdaudio/cdaudio-ng.cc:520
 msgid "Failed to retrieve first/last track number."
-msgstr "Απέτυχε η ανάκτηση πρώτου/τελευταίου κομματιού."
+msgstr "Αποτυχία ανάκτησης του πρώτου/τελευταίου αριθμού κομματιού."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:531
+#: src/cdaudio/cdaudio-ng.cc:541
 #, c-format
 msgid "Cannot read start/end LSN for track %d."
 msgstr "Αδύνατη η ανάγνωση έναρξης/λήξης του LSD για το κομμάτι %d."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:613
-msgid "Failed to create the cddb connection."
-msgstr "Αποτυχία για δημιουργία σύνδεσης CDDB."
+#: src/cdaudio/cdaudio-ng.cc:624
+msgid "Failed to create the CDDB connection."
+msgstr "Αποτυχία σύνδεσης με την CDDB."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:679
+#: src/cdaudio/cdaudio-ng.cc:690
 msgid "Failed to query the CDDB server"
-msgstr "Αποτυχία για την αναζήτηση του διακομιστή CDDB"
+msgstr "Αποτυχία ερώτησης στο διακομιστή CDDB"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:681
+#: src/cdaudio/cdaudio-ng.cc:692
 #, c-format
 msgid "Failed to query the CDDB server: %s"
-msgstr "Αποτυχία για την αναζήτηση του διακομιστή CDDB: %s"
+msgstr "Αποτυχία ερώτησης στο διακομιστή CDDB: %s"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:705
+#: src/cdaudio/cdaudio-ng.cc:716
 #, c-format
-msgid "Failed to read the cddb info: %s"
-msgstr "Αποτυχία για αναγνωση των CDDB πληροφοριων: %s"
+msgid "Failed to read the CDDB info: %s"
+msgstr "Αποτυχία ανάκτησης πληροφοριών από CDDB: %s"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:765
-msgid "Drive is empty."
-msgstr "Η μονάδα δίσκου είναι κενή."
-
-#: src/cdaudio-ng/cdaudio-ng.cc:767
-msgid "Unsupported disk type."
-msgstr "Μη υποστηριζόμενος τύπος δίσκου."
-
-#: src/cd-menu-items/cd-menu-items.cc:35
+#: src/cd-menu-items/cd-menu-items.cc:33
 msgid "Audio CD Menu Items"
-msgstr " Audio CD μενού αντικείμενα"
+msgstr "Μενού αντικειμένων σε Audio CD"
 
-#: src/cd-menu-items/cd-menu-items.cc:47
-msgid "Play CD"
-msgstr "Αναπαραγωγή CD"
-
-#: src/cd-menu-items/cd-menu-items.cc:47
-msgid "Add CD"
-msgstr "Προσθήκη CD"
+#: src/cd-menu-items/cd-menu-items.cc:45
+msgid "Pla_y CD"
+msgstr "_Αναπαραγωγή CD"
+
+#: src/cd-menu-items/cd-menu-items.cc:45
+msgid "_Add CD"
+msgstr "_Προσθήκη CD"
 
 #: src/compressor/compressor.cc:45
 msgid "Compression"
@@ -979,7 +862,7 @@
 "Dynamic Range Compression Plugin for Audacious\n"
 "Copyright 2010-2014 John Lindgren"
 msgstr ""
-"Dynamic Range Compression Πρόσθετο για το Audacious\n"
+"Πρόσθετο Συμπιεστής δυναμικού εύρους για το Audacious\n"
 "Πνευματικά δικαιώματα 2010-2014 John Lindgren"
 
 #: src/compressor/compressor.cc:64
@@ -995,18 +878,18 @@
 "William Pitcock <nenolod@dereferenced.org>\n"
 "Shay Green <gblargg@gmail.com>"
 msgstr ""
-"Η μηχανή αποκωδικοποίησης μουσικής κονσολών βασίστηκε στο Game_Music_Emu "
+"Η μηχανή του Αποκωδικοποιητή μουσικής κονσόλας, βασίστηκε στο Game_Music_Emu "
 "0.5.2\n"
 "Υποστηριζόμενοι τύποι αρχείου: AY, GBS, GYM, HES, KSS, NSF, NSFE, SAP, SPC, "
 "VGM, VGZ\n"
 "\n"
-"Πρόσθετο Audacious από τους:\n"
+"Πρόσθετο για το Audacious από τους:\n"
 "William Pitcock <nenolod@dereferenced.org>\n"
 "Shay Green <gblargg@gmail.com>"
 
 #: src/console/plugin.cc:30
 msgid "Bass:"
-msgstr "Μπάσο:"
+msgstr "Μπάσα:"
 
 #: src/console/plugin.cc:33
 msgid "Treble:"
@@ -1018,9 +901,16 @@
 
 #: src/console/plugin.cc:39
 msgid "Default song length:"
-msgstr "Προεπιλογή μήκους τραγουδιού:"
+msgstr "Προεπιλεγμένη διάρκεια τραγουδιού:"
+
+#: src/console/plugin.cc:41 src/crossfade/crossfade.cc:56
+#: src/crossfade/crossfade.cc:62 src/lirc/lirc.cc:395 src/notify/notify.cc:113
+#: src/sid/xs_config.cc:85 src/sid/xs_config.cc:94 src/sid/xs_config.cc:103
+#: src/vumeter-qt/vumeter_qt.cc:39
+msgid "seconds"
+msgstr "δευτερόλεπτα"
 
-#: src/console/plugin.cc:42 src/modplug/plugin_main.cc:59
+#: src/console/plugin.cc:42 src/modplug/plugin_main.cc:58
 msgid "Resampling"
 msgstr "Αναδειγματοληψία"
 
@@ -1034,94 +924,104 @@
 
 #: src/console/plugin.cc:50
 msgid "Ignore length from SPC tags"
-msgstr "Παράβλεψη μήκους των SPC ετικέτων "
+msgstr "Παράβλεψη διάρκειας από tags SPC"
 
 #: src/console/plugin.cc:52
 msgid "Increase reverb"
-msgstr "Αύξηση αντίχησης"
+msgstr "Αύξηση αντήχησης"
 
 #: src/console/plugin.h:26
 msgid "Game Console Music Decoder"
-msgstr "Αποκωδικοποιητής Μουσικής Κονσόλας Παιχνιδιών"
+msgstr "Αποκωδικοποιητής μουσικής κονσόλας παιχνιδιών"
 
-#: src/coreaudio/coreaudio.cc:50
+#: src/coreaudio/coreaudio.cc:53
 msgid "CoreAudio output"
-msgstr "Έξοδος CoreAudio "
+msgstr "Έξοδος CoreAudio"
 
-#: src/coreaudio/coreaudio.cc:131
+#: src/coreaudio/coreaudio.cc:155
 msgid ""
 "CoreAudio Output Plugin for Audacious\n"
 "Copyright 2014 William Pitcock\n"
+"Copyright 2017,18 René J.V. Bertin\n"
+" (original code and code adapted from\n"
+" Apple examples, (C) Apple 2013)\n"
 "\n"
 "Based on SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
 msgstr ""
-"Core Audio Πρόσθετο για το Audacious\n"
-"Copyright 2014 William Pitcock\n"
-"Με βάση το SDL Output Πρόσθετο για το Audacious\n"
+"Πρόσθετο Έξοδος CoreAudio για το Audacious\n"
+"Πνευματικά δικαιώματα 2014 William Pitcock\n"
+"Πνευματικά δικαιώματα 2017,18 René J.V. Bertin\n"
+"(αρχικός κώδικας και προσαρμογή από\n"
+" Apple examples, (C) Apple 2013)\n"
+"\n"
+"Βασισμένο στο πρόσθετο SDL Output για το Audacious\n"
 "Πνευματικά δικαιώματα 2010 John Lindgren"
 
-#: src/coreaudio/coreaudio.cc:143
+#: src/coreaudio/coreaudio.cc:171
 msgid "Use exclusive mode"
 msgstr "Χρήση αποκλειστικής λειτουργίας"
 
-#: src/crossfade/crossfade.cc:44
+#: src/coreaudio/coreaudio.cc:173
+msgid "Use bit perfect audio (adapt device sampling rate)"
+msgstr ""
+"Χρήση bit για τέλειο ήχο (προσαρμογή του ρυθμού δειγματοληψίας της συσκευής)"
+
+#: src/crossfade/crossfade.cc:47
 msgid ""
 "Crossfade Plugin for Audacious\n"
 "Copyright 2010-2014 John Lindgren"
 msgstr ""
-"Crossfade Πρόσθετο για το Audacious\n"
+"Πρόσθετο Σταδιακής μετάβασης (Crossfade) για το Audacious\n"
 "Πνευματικά δικαιώματα 2010-2014 John Lindgren"
 
-#: src/crossfade/crossfade.cc:48
+#: src/crossfade/crossfade.cc:51
 msgid "Crossfade"
-msgstr "Σταδιακό σβήσιμο"
+msgstr "Σταδιακή μετάβαση"
 
-#: src/crossfade/crossfade.cc:49
+#: src/crossfade/crossfade.cc:52
 msgid "On automatic song change"
 msgstr "Σε αυτόματη αλλαγή τραγουδιού"
 
-#: src/crossfade/crossfade.cc:51 src/crossfade/crossfade.cc:57
+#: src/crossfade/crossfade.cc:54 src/crossfade/crossfade.cc:60
 msgid "Overlap:"
 msgstr "Επικάλυψη:"
 
-#: src/crossfade/crossfade.cc:55
+#: src/crossfade/crossfade.cc:58
 msgid "On seek or manual song change"
-msgstr "Κατα την χειροκίνητη αλλαγή τραγουδιού"
+msgstr "Κατά την αναζήτηση ή χειροκίνητη αλλαγή τραγουδιού"
+
+#: src/crossfade/crossfade.cc:64
+msgid "No fade in"
+msgstr "Χωρίς σταδιακή μετάβαση στο τέλος"
+
+#: src/crossfade/crossfade.cc:66
+msgid "Use S-curve fade"
+msgstr "Χρήση σταδιακής μετάβασης S-curve"
+
+#: src/crossfade/crossfade.cc:68
+msgid "S-curve steepness:"
+msgstr "Κλίση S-curve:"
+
+#: src/crossfade/crossfade.cc:70
+msgid "(higher is steeper)"
+msgstr "(υψηλότερα είναι πιό απότομα)"
 
-#: src/crossfade/crossfade.cc:61
+#: src/crossfade/crossfade.cc:72
 msgid "Tip"
 msgstr "Υπόδειξη"
 
-#: src/crossfade/crossfade.cc:62
+#: src/crossfade/crossfade.cc:73
 msgid ""
 "For better crossfading, enable\n"
 "the Silence Removal effect."
 msgstr ""
-"Για καλύτερο σταδιακό σβήσιμο, ενεργοποιήσετε την επίδραση αφαίρεσης σιωπής."
+"Για καλύτερη σταδιακή μετάβαση, ενεργοποιήσετε την \n"
+"Αφαίρεση σιωπής."
 
-#: src/crossfade/crossfade.cc:72
+#: src/crossfade/crossfade.cc:83
 msgid "Crossfade"
-msgstr "Σταδιακό σβήσιμο"
-
-#: src/crossfade/crossfade.cc:161
-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.cc:168
-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 ""
-"Το σταδιακό σβήσιμο απέτυχε επειδή τα τραγούδια έχουν διαφορετικούς ρυθμούς "
-"δειγματοληψίας. Μπορείτε να χρησιμοποιήσετε το Sample Rate Converter για να "
-"μετατρέψετε τα τραγούδια στον ίδιο ρυθμό δειγματοληψίας."
+msgstr "Σταδιακή μετάβαση (Crossfade)"
 
 #: src/crystalizer/crystalizer.cc:31
 msgid "Crystalizer"
@@ -1135,62 +1035,63 @@
 msgid "Crystalizer"
 msgstr "Crystalizer"
 
-#: src/cue/cue.cc:37
+#: src/cue/cue.cc:42
 msgid "Cue Sheet Plugin"
-msgstr "Cue Sheet Plugin"
+msgstr "Πρόσθετο Cue Sheet"
 
-#: src/delete-files/delete-files.cc:46 src/delete-files/delete-files.cc:146
+#: src/delete-files/delete-files.cc:53 src/delete-files/delete-files.cc:215
+#: src/delete-files/delete-files.cc:230
 msgid "Delete Files"
-msgstr "Διαγραφή Αρχείων"
+msgstr "Διαγραφή αρχείων"
 
-#: src/delete-files/delete-files.cc:75
+#: src/delete-files/delete-files.cc:120
+msgid "No files are selected."
+msgstr "Δεν έχουν επιλεγεί αρχεία."
+
+#: src/delete-files/delete-files.cc:125
 #, c-format
-msgid "Error moving %s to trash: %s."
-msgstr "Σφάλμα κατά την μετακίνηση του %s στα άχρηστα: %s."
+msgid "Do you want to move %s to the trash?"
+msgstr "Θέλετε να μετακινήσετε %s στα απορρίμματα;"
 
-#: src/delete-files/delete-files.cc:86
+#: src/delete-files/delete-files.cc:126
 #, c-format
-msgid "Error deleting %s: %s."
-msgstr "Σφάλμα κατά τη διαγραφή %s: %s."
+msgid "Do you want to permanently delete %s?"
+msgstr "Θέλετε να διαγράψετε οριστικά το %s;"
 
-#: src/delete-files/delete-files.cc:117
+#: src/delete-files/delete-files.cc:133
 #, c-format
-msgid "Error deleting %s: not a local file."
-msgstr "Σφάλμα κατά τη διαγραφή %s: δεν είναι ένα τοπικό αρχείο."
+msgid "Do you want to move %d files to the trash?"
+msgstr "Θέλετε να μετακινήσετε %d αρχεία στα απορρίμματα;"
 
 #: src/delete-files/delete-files.cc:134
-msgid "Do you want to move the selected files to the trash?"
-msgstr "Θέλετε να μεταφέρετε τα επιλεγμένα στον κάδο ανακύκλωσης;"
+#, c-format
+msgid "Do you want to permanently delete %d files?"
+msgstr "Θέλετε να διαγράψετε οριστικά τα %d αρχεία;"
 
-#: src/delete-files/delete-files.cc:135
-msgid "Move to Trash"
-msgstr "Μετακίνηση στον κάδο"
-
-#: src/delete-files/delete-files.cc:140
-msgid "Do you want to permanently delete the selected files?"
-msgstr "Θέλετε να διαγράψετε μόνιμα τα επιλεγμένα αρχεία;"
+#: src/delete-files/delete-files.cc:146
+msgid "Move to trash"
+msgstr "Μετακίνηση στα απορρίμματα"
 
-#: src/delete-files/delete-files.cc:141 src/skins/preset-list.cc:411
-#: src/skins/preset-list.cc:427
+#: src/delete-files/delete-files.cc:146
 msgid "Delete"
 msgstr "Διαγραφή"
 
-#: src/delete-files/delete-files.cc:145 src/skins/preset-browser.cc:56
-#: src/skins/preset-list.cc:307 src/skins/ui_playlist.cc:221
+#: src/delete-files/delete-files.cc:213 src/delete-files/delete-files.cc:235
+#: src/skins-qt/search-select.cc:102 src/skins/search-select.cc:78
 msgid "Cancel"
-msgstr "Ακύρωση"
+msgstr "Άκυρο"
 
-#: src/delete-files/delete-files.cc:166
+#: src/delete-files/delete-files.cc:267
 msgid "Delete Selected Files"
-msgstr "Διαγραφή Επιλεγμένων Αρχείων"
+msgstr "Διαγραφή επιλεγμένων αρχείων"
 
-#: src/delete-files/delete-files.cc:181
+#: src/delete-files/delete-files.cc:287
 msgid "Delete Method"
 msgstr "Μέθοδος διαγραφής"
 
-#: src/delete-files/delete-files.cc:182
+#: src/delete-files/delete-files.cc:288
 msgid "Move to trash instead of deleting immediately"
-msgstr "Μετακίνηση στα απορρίμματα αντί να διαγραφθουν αμέσως"
+msgstr "Μετακίνηση στα απορρίμματα αντί για άμεση διαγραφή"
 
 #: src/echo_plugin/echo.cc:9
 msgid ""
@@ -1199,9 +1100,9 @@
 "Surround echo by Carl van Schaik, 1999\n"
 "Updated for Audacious by William Pitcock and John Lindgren, 2010-2014"
 msgstr ""
-"Echo Πρόσθετο\n"
+"Πρόσθετο Ηχώ\n"
 "Από τον Johan Levin, 1999\n"
-"Surround ηχώ από τον Carl Van Schaik, 1999\n"
+"Ηχώ surround από τον Carl Van Schaik, 1999\n"
 "Ενημέρωση για το Audacious από τους William Pitcock και John Lindgren, "
 "2010-2014"
 
@@ -1209,13 +1110,13 @@
 msgid "Echo"
 msgstr "Ηχώ"
 
-#: src/echo_plugin/echo.cc:22 src/modplug/plugin_main.cc:73
-#: src/modplug/plugin_main.cc:83
+#: src/echo_plugin/echo.cc:22 src/modplug/plugin_main.cc:72
+#: src/modplug/plugin_main.cc:82
 msgid "Delay:"
 msgstr "Καθυστέρηση:"
 
-#: src/echo_plugin/echo.cc:24 src/modplug/plugin_main.cc:73
-#: src/modplug/plugin_main.cc:83
+#: src/echo_plugin/echo.cc:24 src/modplug/plugin_main.cc:72
+#: src/modplug/plugin_main.cc:82 src/xsf/plugin.cc:445
 msgid "ms"
 msgstr "ms"
 
@@ -1223,7 +1124,7 @@
 msgid "Feedback:"
 msgstr "Ανάδραση:"
 
-#: src/echo_plugin/echo.cc:28 src/modplug/plugin_main.cc:87
+#: src/echo_plugin/echo.cc:28 src/modplug/plugin_main.cc:86
 msgid "Volume:"
 msgstr "Ένταση:"
 
@@ -1231,11 +1132,11 @@
 msgid "Echo"
 msgstr "Ηχώ"
 
-#: src/ffaudio/ffaudio-core.cc:41
+#: src/ffaudio/ffaudio-core.cc:50
 msgid "FFmpeg Plugin"
 msgstr "Πρόσθετο FFmpeg"
 
-#: src/ffaudio/ffaudio-core.cc:571
+#: src/ffaudio/ffaudio-core.cc:649
 msgid ""
 "Multi-format audio decoding plugin for Audacious using\n"
 "FFmpeg multimedia framework (http://www.ffmpeg.org/)\n"
@@ -1244,267 +1145,335 @@
 "William Pitcock <nenolod@nenolod.net>\n"
 "Matti Hämäläinen <ccr@tnsp.org>"
 msgstr ""
-"Πολλαπλών μορφων αποκωδικοποίησης ήχου plugin για το Audacious χρήση\n"
-"FFmpeg πλαίσιο πολυμέσων (http://www.ffmpeg.org/)\n"
+"Πρόσθετο πολλαπλών μορφών αποκωδικοποίησης ήχου για το Audacious με χρήση\n"
+"πλαισίου πολυμέσων FFmpeg (http://www.ffmpeg.org/)\n"
 "\n"
-"Audacious plugin από:\n"
+"Πρόσθετο για το Audacious από τους:\n"
 "William Pitcock <nenolod@nenolod.net>\n"
 "Matti Hämäläinen <ccr@tnsp.org>"
 
-#: src/filewriter/filewriter.cc:45
+#: src/filewriter/filewriter.cc:48
 msgid "FileWriter Plugin"
 msgstr "Πρόσθετο FileWriter"
 
-#: src/filewriter/filewriter.cc:386
+#: src/filewriter/filewriter.cc:316
+#, c-format
+msgid ""
+"Error opening %s:\n"
+"%s"
+msgstr ""
+"Σφάλμα ανοίγματος του %s:\n"
+"%s"
+
+#: src/filewriter/filewriter.cc:358
+msgid ""
+"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 ""
+"Το πρόγραμμα αυτό είναι ελεύθερο λογισμικό. Επιτρέπεται η αναδιανομή ή/και η "
+"τροποποίησή του υπό τους όρους της άδειας GNU General Public όπως αυτή "
+"δημοσιεύεται από το Free Software Foundation, είτε την έκδοση 2 είτε (κατά "
+"την επιλογή σας) σε οποιαδήποτε μεταγενέστερη έκδοση της άδειας.\n"
+"\n"
+"Διανέμεται με την ελπίδα ότι θα είναι χρήσιμο, αλλά ΧΩΡΙΣ ΟΠΟΙΑΔΗΠΟΤΕ "
+"ΕΓΓΥΗΣΗ, χωρίς καν την σιωπηρή εγγύηση ΕΜΠΟΡΕΥΣΙΜΟΤΗΤΑΣ ή ΚΑΤΑΛΛΗΛΟΤΗΤΑΣ ΓΙΑ "
+"ΕΝΑ ΣΥΓΚΕΚΡΙΜΕΝΟ ΣΚΟΠΟ. Για περισσότερες λεπτομέρειες δείτε την άδεια GNU "
+"General Public.\n"
+"\n"
+"Μαζί με το πρόγραμμα αυτό θα πρέπει να έχετε λάβει ένα αντίγραφο της άδεια "
+"GNU General Public. Εάν όχι, γράψτε στο Free Software Foundation, Inc., 51 "
+"Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
+
+#: src/filewriter/filewriter.cc:385
 msgid "Output file format:"
 msgstr "Μορφή αρχείου εξόδου:"
 
-#: src/filewriter/filewriter.cc:403
-msgid "Configure"
-msgstr "Διαμόρφωση"
-
-#: src/filewriter/filewriter.cc:413
+#: src/filewriter/filewriter.cc:389
 msgid "Save into original directory"
 msgstr "Αποθήκευση στον αρχικό κατάλογο"
 
-#: src/filewriter/filewriter.cc:417
-msgid "Save into custom directory"
-msgstr "Αποθήκευση στον προσαρμοσμένο κατάλογο"
-
-#: src/filewriter/filewriter.cc:427
-msgid "Output file folder:"
-msgstr "Φάκελος του αρχείου εξόδου:"
+#: src/filewriter/filewriter.cc:392
+msgid "Save into custom directory:"
+msgstr "Αποθήκευση στον προσαρμοσμένο κατάλογο:"
 
-#: src/filewriter/filewriter.cc:431
-msgid "Pick a folder"
-msgstr "Επιλογή φακέλου"
-
-#: src/filewriter/filewriter.cc:444
+#: src/filewriter/filewriter.cc:400
 msgid "Generate file name from:"
 msgstr "Δημιουργία ονόματος αρχείου από:"
 
-#: src/filewriter/filewriter.cc:448
-msgid "Original file tag"
-msgstr "Πρωτότυπη ετικέτα αρχείου"
-
-#: src/filewriter/filewriter.cc:453
+#: src/filewriter/filewriter.cc:401
 msgid "Original file name"
 msgstr "Αρχικό όνομα αρχείου"
 
-#: src/filewriter/filewriter.cc:459
-msgid "Include original file name extension"
-msgstr "Συμπερίληψη αρχικής επέκτασης ονόματος αρχείου"
+#: src/filewriter/filewriter.cc:404
+msgid "Original file name (no suffix)"
+msgstr "Αρχικό όνομα αρχείου (χωρίς την επέκταση)"
 
-#: src/filewriter/filewriter.cc:468
-msgid "Prepend track number to file name"
-msgstr "Προσθέστε το πρόθεμα του αριθμου κομματιού στο όνομα αρχείου"
+#: src/filewriter/filewriter.cc:407
+msgid "Original file tag"
+msgstr "Αρχικό tag αρχείου"
 
-#: src/filewriter/filewriter.cc:484
-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 General Public License όπως αυτή έχει δημοσιευθεί "
-"από\n"
-"το Ίδρυμα Ελεύθερου Λογισμικού? είτε την έκδοση 2 της Άδειας, είτε\n"
-"(κατ 'επιλογή σας) οποιαδήποτε μεταγενέστερη έκδοση.\n"
-"\n"
-"Αυτό το πρόγραμμα διανέμεται με την ελπίδα ότι θα είναι χρήσιμο,\n"
-"αλλά ΧΩΡΙΣ ΚΑΜΙΑ ΕΓΓΥΗΣΗ? χωρίς καν την υπονοούμενη εγγύηση της\n"
-"ΕΜΠΟΡΕΥΣΙΜΟΤΗΤΑΣ ή ΚΑΤΑΛΛΗΛΟΤΗΤΑΣ ΓΙΑ ΕΝΑ ΣΥΓΚΕΚΡΙΜΕΝΟ ΣΚΟΠΟ. Δείτε το\n"
-"GNU General Public License για περισσότερες λεπτομέρειες.\n"
-"\n"
-"Θα πρέπει να έχετε λάβει ένα αντίγραφο της GNU General Άδειας Δημόσιας "
-"Χρήσης\n"
-"μαζί με αυτό το πρόγραμμα? Εάν όχι, γράψτε στο Ελεύθερο Λογισμικό\n"
-"Foundation, Inc., 51 Franklin Street, στον πέμπτο όροφο, Boston, MA "
-"02110-1301,\n"
-"ΗΠΑ."
+#: src/filewriter/filewriter.cc:411
+msgid "Prepend track number to file name"
+msgstr "Προσθήκη του αριθμού κομματιού στο όνομα του αρχείου"
 
-#: src/filewriter/mp3.cc:40 src/filewriter/mp3.cc:717
+#: src/filewriter/filewriter.cc:417 src/filewriter/filewriter.cc:449
 msgid "Auto"
-msgstr "Αυτόματο"
+msgstr "Αυτόματα"
+
+#: src/filewriter/filewriter.cc:418
+msgid "8000 Hz"
+msgstr "8000 Hz"
+
+#: src/filewriter/filewriter.cc:419
+msgid "11025 Hz"
+msgstr "11025 Hz"
+
+#: src/filewriter/filewriter.cc:420
+msgid "12000 Hz"
+msgstr "12000 Hz"
+
+#: src/filewriter/filewriter.cc:421
+msgid "16000 Hz"
+msgstr "16000 Hz"
+
+#: src/filewriter/filewriter.cc:422
+msgid "22050 Hz"
+msgstr "22050 Hz"
+
+#: src/filewriter/filewriter.cc:423
+msgid "24000 Hz"
+msgstr "24000 Hz"
+
+#: src/filewriter/filewriter.cc:424
+msgid "32000 Hz"
+msgstr "32000 Hz"
+
+#: src/filewriter/filewriter.cc:425 src/xsf/plugin.cc:430
+msgid "44100 Hz"
+msgstr "44100 Hz"
+
+#: src/filewriter/filewriter.cc:426 src/xsf/plugin.cc:431
+msgid "48000 Hz"
+msgstr "48000 Hz"
+
+#: src/filewriter/filewriter.cc:430
+msgid "8 kbit/s"
+msgstr "8 kbit/s"
+
+#: src/filewriter/filewriter.cc:431
+msgid "16 kbit/s"
+msgstr "16 kbit/s"
 
-#: src/filewriter/mp3.cc:40
+#: src/filewriter/filewriter.cc:432
+msgid "32 kbit/s"
+msgstr "32 kbit/s"
+
+#: src/filewriter/filewriter.cc:433
+msgid "40 kbit/s"
+msgstr "40 kbit/s"
+
+#: src/filewriter/filewriter.cc:434
+msgid "48 kbit/s"
+msgstr "48 kbit/s"
+
+#: src/filewriter/filewriter.cc:435
+msgid "56 kbit/s"
+msgstr "56 kbit/s"
+
+#: src/filewriter/filewriter.cc:436
+msgid "64 kbit/s"
+msgstr "64 kbit/s"
+
+#: src/filewriter/filewriter.cc:437
+msgid "80 kbit/s"
+msgstr "80 kbit/s"
+
+#: src/filewriter/filewriter.cc:438
+msgid "96 kbit/s"
+msgstr "96 kbit/s"
+
+#: src/filewriter/filewriter.cc:439
+msgid "112 kbit/s"
+msgstr "112 kbit/s"
+
+#: src/filewriter/filewriter.cc:440
+msgid "128 kbit/s"
+msgstr "128 kbit/s"
+
+#: src/filewriter/filewriter.cc:441
+msgid "160 kbit/s"
+msgstr "160 kbit/s"
+
+#: src/filewriter/filewriter.cc:442
+msgid "192 kbit/s"
+msgstr "192 kbit/s"
+
+#: src/filewriter/filewriter.cc:443
+msgid "224 kbit/s"
+msgstr "224 kbit/s"
+
+#: src/filewriter/filewriter.cc:444
+msgid "256 kbit/s"
+msgstr "256 kbit/s"
+
+#: src/filewriter/filewriter.cc:445
+msgid "320 kbit/s"
+msgstr "320 kbit/s"
+
+#: src/filewriter/filewriter.cc:450
 msgid "Joint Stereo"
-msgstr "Πολυπλεγμένο Στερεοφωνικό"
+msgstr "Πολυπλεγμένο στερεοφωνικό"
 
-#: src/filewriter/mp3.cc:41 src/modplug/plugin_main.cc:58
-#: src/mpg123/mpg123.cc:248
+#: src/filewriter/filewriter.cc:451 src/modplug/plugin_main.cc:57
+#: src/mpg123/mpg123.cc:259
 msgid "Stereo"
 msgstr "Στερεοφωνικό"
 
-#: src/filewriter/mp3.cc:41 src/modplug/plugin_main.cc:57
-#: src/mpg123/mpg123.cc:248
+#: src/filewriter/filewriter.cc:452 src/modplug/plugin_main.cc:56
+#: src/mpg123/mpg123.cc:260
 msgid "Mono"
 msgstr "Μονοφωνικό"
 
-#: src/filewriter/mp3.cc:657
-msgid "MP3 Configuration"
-msgstr "Διαμόρφωση MP3"
-
-#: src/filewriter/mp3.cc:658
-msgid "_OK"
-msgstr "_OK"
-
-#: src/filewriter/mp3.cc:681
-msgid "Algorithm Quality:"
-msgstr "Ποιότητα Αλγόριθμου:"
-
-#: src/filewriter/mp3.cc:706
-msgid "Output Sample Rate:"
-msgstr "Έξοδος ρυθμου δείγματος:"
-
-#: src/filewriter/mp3.cc:733
-msgid "(Hz)"
-msgstr "(Hz)"
-
-#: src/filewriter/mp3.cc:740
-msgid "Bitrate / Compression Ratio:"
-msgstr "Αναλογία ρυθμού μετάδοσης/συμπίεσης:"
-
-#: src/filewriter/mp3.cc:764
-msgid "Bitrate (kbps):"
-msgstr "Ρυθμός μετάδοσης δεδομένων (kb/s):"
+#: src/filewriter/filewriter.cc:456
+msgid "VBR"
+msgstr "VBR"
+
+#: src/filewriter/filewriter.cc:457
+msgid "ABR"
+msgstr "ABR"
+
+#: src/filewriter/filewriter.cc:478
+msgid "Algorithm quality:"
+msgstr "Ποιότητα αλγόριθμου:"
 
-#: src/filewriter/mp3.cc:796
-msgid "Compression ratio:"
-msgstr "Λόγος συμπίεσης:"
+#: src/filewriter/filewriter.cc:484
+msgid "Bitrate:"
+msgstr "Ρυθμός μετάδοσης (bitrate):"
 
-#: src/filewriter/mp3.cc:820
-msgid "Audio Mode:"
-msgstr "Λειτουργία Ήχου:"
+#: src/filewriter/filewriter.cc:491
+msgid "Compression ratio:"
+msgstr "Αναλογία συμπίεσης:"
 
-#: src/filewriter/mp3.cc:845
-msgid "Miscellaneous:"
-msgstr "Διάφορα:"
+#: src/filewriter/filewriter.cc:498
+msgid "Audio mode:"
+msgstr "Λειτουργία ήχου:"
 
-#: src/filewriter/mp3.cc:856
+#: src/filewriter/filewriter.cc:501
 msgid "Enforce strict ISO compliance"
 msgstr "Εξαναγκασμός αυστηρής συμμόρφωσης με ISO"
 
-#: src/filewriter/mp3.cc:867
+#: src/filewriter/filewriter.cc:503
 msgid "Error protection"
 msgstr "Προστασία σφαλμάτων"
 
-#: src/filewriter/mp3.cc:879 src/filewriter/vorbis.cc:206
-msgid "Quality"
-msgstr "Ποιότητα"
-
-#: src/filewriter/mp3.cc:888
+#: src/filewriter/filewriter.cc:508
 msgid "Enable VBR/ABR"
 msgstr "Ενεργοποίηση VBR/ABR"
 
-#: src/filewriter/mp3.cc:898
+#: src/filewriter/filewriter.cc:510
 msgid "Type:"
 msgstr "Τύπος:"
 
-#: src/filewriter/mp3.cc:931
-msgid "VBR Options:"
-msgstr "Επιλογές VBR:"
-
-#: src/filewriter/mp3.cc:947
-msgid "Minimum bitrate (kbps):"
-msgstr "Ελάχιστος ρυθμός μετάδοσης (kbps):"
-
-#: src/filewriter/mp3.cc:973
-msgid "Maximum bitrate (kbps):"
-msgstr "Μέγιστος ρυθμός μετάδοσης (kbps):"
-
-#: src/filewriter/mp3.cc:995
-msgid "Strictly enforce minimum bitrate"
-msgstr "Αυστηρά εφάρμοσε ελάχιστο ρυθμό μετάδοσης"
-
-#: src/filewriter/mp3.cc:1007
-msgid "ABR Options:"
-msgstr "Επιλογές ABR:"
+#: src/filewriter/filewriter.cc:514
+msgid "Minimum bitrate:"
+msgstr "Ελάχιστος ρυθμός μετάδοσης:"
+
+#: src/filewriter/filewriter.cc:518
+msgid "Maximum bitrate:"
+msgstr "Μέγιστος ρυθμός μετάδοσης;"
+
+#: src/filewriter/filewriter.cc:522
+msgid "Average bitrate:"
+msgstr "Μέση τιμή ρυθμού μετάδοσης:"
 
-#: src/filewriter/mp3.cc:1017
-msgid "Average bitrate (kbps):"
-msgstr "Μέσος ρυθμός μετάδοσης (kbps):"
-
-#: src/filewriter/mp3.cc:1044
+#: src/filewriter/filewriter.cc:526
 msgid "VBR quality level:"
 msgstr "Επίπεδο ποιότητας VBR:"
 
-#: src/filewriter/mp3.cc:1063
-msgid "Omit Xing VBR header"
-msgstr "Omit Xing VBR header"
+#: src/filewriter/filewriter.cc:530
+msgid "Strictly enforce minimum bitrate"
+msgstr "Αυστηρή εφαρμογή του ελάχιστου ρυθμού μετάδοσης"
 
-#: src/filewriter/mp3.cc:1076
-msgid "VBR/ABR"
-msgstr "VBR/ABR"
+#: src/filewriter/filewriter.cc:533
+msgid "Omit Xing VBR header"
+msgstr "Παράλειψη Xing VBR header"
 
-#: src/filewriter/mp3.cc:1085
-msgid "Frame Parameters:"
-msgstr "Παράμετροι πλαισίου:"
+#: src/filewriter/filewriter.cc:539
+msgid "Frame Headers"
+msgstr "Πλαίσιο επικεφαλίδων"
 
-#: src/filewriter/mp3.cc:1097
+#: src/filewriter/filewriter.cc:540
 msgid "Mark as copyright"
-msgstr "Επισήμανση ως πνευματικά δικαιώματα"
+msgstr "Πνευματικά δικαιώματα"
 
-#: src/filewriter/mp3.cc:1108
+#: src/filewriter/filewriter.cc:542
 msgid "Mark as original"
-msgstr "Επισήμανση ως πρωτότυπο"
+msgstr "Πρωτότυπο"
 
-#: src/filewriter/mp3.cc:1120
-msgid "ID3 Parameters:"
-msgstr "Παραμέτροι ID3:"
+#: src/filewriter/filewriter.cc:544
+msgid "ID3 Tags"
+msgstr "Tags ID3"
 
-#: src/filewriter/mp3.cc:1131
+#: src/filewriter/filewriter.cc:545
 msgid "Force addition of version 2 tag"
-msgstr "Επιπλέον Δύναμη της έκδοσης 2 tag"
+msgstr "Δυναμική προσθήκη tag έκδοσης 2"
 
-#: src/filewriter/mp3.cc:1141
+#: src/filewriter/filewriter.cc:547
 msgid "Only add v1 tag"
-msgstr "Πρόσθεσε μόνο ετικέτα v1"
+msgstr "Προσθήκη μόνο tag v1"
 
-#: src/filewriter/mp3.cc:1148
+#: src/filewriter/filewriter.cc:549
 msgid "Only add v2 tag"
-msgstr "Πρόσθεσε μόνο ετικέτα v2"
+msgstr "Προσθήκη μόνο tag v2"
 
-#: src/filewriter/mp3.cc:1169
+#: src/filewriter/filewriter.cc:554
+msgid "Quality"
+msgstr "Ποιότητα"
+
+#: src/filewriter/filewriter.cc:555
+msgid "VBR/ABR"
+msgstr "VBR/ABR"
+
+#: src/filewriter/filewriter.cc:556
 msgid "Tags"
-msgstr "Ετικέτες"
+msgstr "Tags"
 
-#: src/filewriter/vorbis.cc:196
-msgid "Vorbis Encoder Configuration"
-msgstr "Διαμόρφωση Κωδικοποιητή Vorbis"
+#: src/filewriter/filewriter.cc:566
+msgid "Quality (0-1):"
+msgstr "Ποιότητα (0-1):"
 
-#: src/filewriter/vorbis.cc:219
-msgid "Quality level (0 - 10):"
-msgstr "Επίπεδο ποιότητας (0 - 10):"
+#: src/filewriter/filewriter.cc:573 src/skins-qt/skins_cfg.cc:307
+#: src/skins/skins_cfg.cc:289
+msgid "General"
+msgstr "Γενικά"
 
-#: src/flacng/flacng.h:35
+#: src/flac/flacng.h:36
 msgid "FLAC Decoder"
 msgstr "Αποκωδικοποιητής FLAC"
 
-#: src/flacng/metadata.cc:351 src/wavpack/wavpack.cc:209
+#: src/flac/metadata.cc:296 src/wavpack/wavpack.cc:215
 msgid "lossless"
 msgstr "Χωρίς απώλειες"
 
-#: src/flacng/plugin.cc:169
+#: src/flac/plugin.cc:214
 msgid ""
 "Original code by\n"
 "Ralf Ertzinger <ralf@skytale.net>\n"
 "\n"
 "http://www.skytale.net/projects/bmp-flac2/"
 msgstr ""
-"Πρωτότυπος κώδικας\n"
+"Πρωτότυπος κώδικας από\n"
 "Ralf Ertzinger <ralf@skytale.net>\n"
 "\n"
 "http://www.skytale.net/projects/bmp-flac2/"
@@ -1514,22 +1483,22 @@
 "GIO Plugin for Audacious\n"
 "Copyright 2009-2012 John Lindgren"
 msgstr ""
-"GIO Πρόσθετο για το Audacious\n"
+"Πρόσθετο GIO για το Audacious\n"
 "Πνευματικά δικαιώματα 2009-2012 John Lindgren"
 
 #: src/gio/gio.cc:42
 msgid "GIO Plugin"
 msgstr "Πρόσθετο GIO"
 
-#: src/gio/gio.cc:153
+#: src/gio/gio.cc:152
 msgid "Read-and-append mode not supported"
-msgstr "Αναγνωση-και-προσάρτηση λειτουργίας δεν υποστηρίζονται"
+msgstr "Δεν υποστηρίζεται η λειτουργία ανάγνωση-και-προσάρτηση"
 
-#: src/gio/gio.cc:166
+#: src/gio/gio.cc:165
 msgid "Invalid open mode"
 msgstr "Άκυρη ανοικτή λειτουργία"
 
-#: src/gl-spectrum/gl-spectrum.cc:51
+#: src/glspectrum/gl-spectrum.cc:52
 msgid ""
 "OpenGL Spectrum Analyzer for Audacious\n"
 "Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
@@ -1540,780 +1509,936 @@
 "\n"
 "License: GPLv2+"
 msgstr ""
-"OpenGL Αναλυτής φάσματος για το Audacious\n"
-"Copyright 2013 Christophe Bude, Τζον Lindgren, και ο Carlo Bramini\n"
+"Πρόσθετο Αναλυτής φάσματος OpenGL για το Audacious\n"
+"Πνευματικά δικαιώματα 2013, Christophe Bude, John Lindgren και Carlo "
+"Bramini\n"
 "\n"
 "Με βάση το πρόσθετο XMMS:\n"
-"Πνευματικά δικαιώματα 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas "
-"Nilsson, και 4Front Technologies\n"
+"Πνευματικά δικαιώματα 1998-2000, Peter Alm, Mikael Alm, Olle Hallnas, Thomas "
+"Nilsson και 4Front Technologies\n"
 "\n"
 "Άδεια: GPLv2 +"
 
-#: src/gl-spectrum/gl-spectrum.cc:62
+#: src/glspectrum/gl-spectrum.cc:63 src/qtglspectrum/gl-spectrum.cc:53
 msgid "OpenGL Spectrum Analyzer"
-msgstr "OpenGL Αναλυτής Φάσματος"
-
-#: src/gl-spectrum-qt/gl-spectrum.cc:41
-msgid ""
-"OpenGL Spectrum Analyzer for Audacious\n"
-"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
-"Copyright 2014 William Pitcock\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 Bude, Τζον Lindgren, και ο Carlo Bramini\n"
-"Copyright 2014 William Pitcock\n"
-"\n"
-"Με βάση το πρόσθετο XMMS:\n"
-"Πνευματικά δικαιώματα 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas "
-"Nilsson, και 4Front Technologies\n"
-"\n"
-"Άδεια: GPLv2 +"
-
-#: src/gl-spectrum-qt/gl-spectrum.cc:53
-msgid "OpenGL Spectrum Analyzer (Qt)"
-msgstr "OpenGL Αναλυτής Φάσματος (Qt)"
-
-#: src/gnomeshortcuts/gnomeshortcuts.cc:38
-msgid "GNOME Shortcuts"
-msgstr "Συντομεύσεις GNOME"
+msgstr "Αναλυτής φάσματος OpenGL"
 
-#: src/gnomeshortcuts/gnomeshortcuts.cc:54
-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"
-"Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>"
-
-#: src/gtkui/columns.cc:35
-msgid "Entry number"
-msgstr "Αριθμός εισαγωγής"
-
-#: src/gtkui/columns.cc:36 src/playlist-manager/playlist-manager.cc:225
-#: src/qtui/playlist_model.cc:123
+#: src/gtkui/columns.cc:36 src/moonstone/playlist_model.cc:38
+#: src/qtui/playlist_model.cc:33
+msgid "Entry Number"
+msgstr "Αριθμός εισόδου"
+
+#: src/gtkui/columns.cc:37 src/moonstone/playlist_model.cc:38
+#: src/moonstone/playlist_selection.cc:64
+#: src/playlist-manager/playlist-manager.cc:200
+#: src/playlist-manager-qt/playlist-manager-qt.cc:188
+#: src/qtui/playlist_model.cc:33 src/streamtuner/icecast-model.cc:120
+#: src/streamtuner/ihr-model.cc:159 src/streamtuner/shoutcast-model.cc:122
 msgid "Title"
 msgstr "Τίτλος"
 
-#: src/gtkui/columns.cc:37 src/qtui/playlist_model.cc:125
+#: src/gtkui/columns.cc:38 src/moonstone/playlist_model.cc:39
+#: src/qtui/playlist_model.cc:33
 msgid "Artist"
 msgstr "Καλλιτέχνης"
 
-#: src/gtkui/columns.cc:38
+#: src/gtkui/columns.cc:39 src/moonstone/playlist_model.cc:39
+#: src/qtui/playlist_model.cc:33
 msgid "Year"
 msgstr "Έτος"
 
-#: src/gtkui/columns.cc:39 src/qtui/playlist_model.cc:127
+#: src/gtkui/columns.cc:40 src/moonstone/playlist_model.cc:39
+#: src/qtui/playlist_model.cc:34
 msgid "Album"
 msgstr "Άλμπουμ"
 
-#: src/gtkui/columns.cc:40
-msgid "Album artist"
+#: src/gtkui/columns.cc:41 src/moonstone/playlist_model.cc:40
+#: src/qtui/playlist_model.cc:34
+msgid "Album Artist"
 msgstr "Καλλιτέχνης άλμπουμ"
 
-#: src/gtkui/columns.cc:41
+#: src/gtkui/columns.cc:42 src/moonstone/playlist_model.cc:40
+#: src/qtui/playlist_model.cc:34
 msgid "Track"
 msgstr "Κομμάτι"
 
-#: src/gtkui/columns.cc:42
+#: src/gtkui/columns.cc:43 src/moonstone/playlist_model.cc:40
+#: src/qtui/playlist_model.cc:34 src/streamtuner/icecast-model.cc:123
+#: src/streamtuner/shoutcast-model.cc:125
+#: src/streamtuner/shoutcast-model.cc:236
 msgid "Genre"
 msgstr "Είδος"
 
-#: src/gtkui/columns.cc:43
-msgid "Queue position"
-msgstr "Θέση ουράς"
+#: src/gtkui/columns.cc:44 src/moonstone/playlist_model.cc:41
+#: src/qtui/playlist_model.cc:35
+msgid "Queue Position"
+msgstr "Θέση στην σειρά"
 
-#: src/gtkui/columns.cc:44
+#: src/gtkui/columns.cc:45 src/moonstone/playlist_model.cc:41
+#: src/qtui/playlist_model.cc:35
 msgid "Length"
 msgstr "Διάρκεια"
 
-#: src/gtkui/columns.cc:45
-msgid "File path"
+#: src/gtkui/columns.cc:46 src/moonstone/playlist_model.cc:41
+#: src/qtui/playlist_model.cc:35
+msgid "File Path"
 msgstr "Διαδρομή αρχείου"
 
-#: src/gtkui/columns.cc:47
-msgid "Custom title"
+#: src/gtkui/columns.cc:47 src/moonstone/playlist_model.cc:42
+#: src/qtui/playlist_model.cc:35
+msgid "File Name"
+msgstr "Όνομα αρχείου"
+
+#: src/gtkui/columns.cc:48 src/moonstone/playlist_model.cc:42
+#: src/qtui/playlist_model.cc:36
+msgid "Custom Title"
 msgstr "Προσαρμοσμένος τίτλος"
 
-#: src/gtkui/columns.cc:48
+#: src/gtkui/columns.cc:49 src/moonstone/playlist_model.cc:42
+#: src/qtui/playlist_model.cc:36 src/streamtuner/icecast-model.cc:129
+#: src/streamtuner/shoutcast-model.cc:134
 msgid "Bitrate"
 msgstr "Ρυθμός μετάδοσης (bitrate)"
 
-#: src/gtkui/columns.cc:308
+#: src/gtkui/columns.cc:50 src/moonstone/playlist_model.cc:43
+#: src/qtui/playlist_model.cc:36
+msgid "Comment"
+msgstr "Σχόλιο"
+
+#: src/gtkui/columns.cc:51 src/qtui/playlist_model.cc:36
+msgid "Publisher"
+msgstr "Εκδότης"
+
+#: src/gtkui/columns.cc:52 src/qtui/playlist_model.cc:37
+msgid "Catalog Number"
+msgstr "Αριθμός καταλόγου"
+
+#: src/gtkui/columns.cc:53 src/moonstone/playlist_model.cc:43
+#: src/qtui/playlist_model.cc:37
+msgid "Disc"
+msgstr "Δίσκος"
+
+#: src/gtkui/columns.cc:325
 msgid "Available columns"
 msgstr "Διαθέσιμες στήλες"
 
-#: src/gtkui/columns.cc:334
+#: src/gtkui/columns.cc:351
 msgid "Displayed columns"
 msgstr "Εμφανιζόμενες στήλες"
 
-#: src/gtkui/layout.cc:72 src/search-tool/search-tool.cc:40
+#: src/gtkui/layout.cc:74 src/search-tool-qt/search-tool-qt.cc:58
+#: src/search-tool/search-tool.cc:49
 msgid "Search Tool"
-msgstr "Εργαλέιο Αναζήτησης"
+msgstr "Εργαλείο αναζήτησης"
 
-#: src/gtkui/layout.cc:167
+#: src/gtkui/layout.cc:170
 msgid "Dock at Left"
-msgstr "Βάση σύνδεσης στα Αριστερά"
+msgstr "Βάση σύνδεσης στα αριστερά"
 
-#: src/gtkui/layout.cc:167
+#: src/gtkui/layout.cc:170
 msgid "Dock at Right"
 msgstr "Βάση σύνδεσης στα δεξιά"
 
-#: src/gtkui/layout.cc:168
+#: src/gtkui/layout.cc:171
 msgid "Dock at Top"
-msgstr "Βάση σύνδεσης στην κορυφη"
+msgstr "Βάση σύνδεσης στην κορυφή"
 
-#: src/gtkui/layout.cc:168
+#: src/gtkui/layout.cc:171
 msgid "Dock at Bottom"
 msgstr "Βάση σύνδεσης στην κάτω πλευρά"
 
-#: src/gtkui/layout.cc:168
+#: src/gtkui/layout.cc:171
 msgid "Undock"
-msgstr "Αποσυνδεση"
+msgstr "Αποσύνδεση"
 
-#: src/gtkui/layout.cc:168 src/ladspa/plugin.cc:531
+#: src/gtkui/layout.cc:171 src/ladspa/plugin.cc:540
 msgid "Disable"
 msgstr "Απενεργοποίηση"
 
-#: src/gtkui/menus.cc:126 src/qtui/main_window_actions.cc:93
-#: src/statusicon/statusicon.cc:276
+#: src/gtkui/menus.cc:79 src/qtui/menus.cc:107
+#: src/statusicon-qt/statusicon.cc:115 src/statusicon/statusicon.cc:286
 msgid "_Open Files ..."
-msgstr "_Άνοιγμα Αρχείων..."
+msgstr "Άνοι_γμα αρχείων..."
 
-#: src/gtkui/menus.cc:127
+#: src/gtkui/menus.cc:80 src/qtui/menus.cc:111
 msgid "Open _URL ..."
-msgstr "Άνοιγμα _URL..."
+msgstr "Ά_νοιγμα διεύθυνσης ..."
 
-#: src/gtkui/menus.cc:128 src/qtui/main_window_actions.cc:95
+#: src/gtkui/menus.cc:81 src/qtui/menus.cc:113
 msgid "_Add Files ..."
-msgstr "_Προσθήκη Αρχείων..."
+msgstr "Π_ροσθήκη αρχείων..."
 
-#: src/gtkui/menus.cc:129
+#: src/gtkui/menus.cc:82 src/qtui/menus.cc:118
 msgid "Add U_RL ..."
-msgstr "Προσθήκη U_RL..."
+msgstr "Προσ_θήκη διεύθυνσης ..."
 
-#: src/gtkui/menus.cc:131
+#: src/gtkui/menus.cc:84 src/qtui/menus.cc:120
 msgid "Search _Library"
-msgstr "Αναζήτηση Βιβλιοθήκης"
+msgstr "Έρευνα _δισκοθήκης"
 
-#: src/gtkui/menus.cc:133 src/qtui/main_window_actions.cc:98
+#: src/gtkui/menus.cc:86 src/qtui/menus.cc:123
 msgid "A_bout ..."
 msgstr "Σ_χετικά ..."
 
-#: src/gtkui/menus.cc:134 src/qtui/main_window_actions.cc:99
+#: src/gtkui/menus.cc:87 src/qtui/menus.cc:125
 msgid "_Settings ..."
-msgstr "_Ρυθμίσεις ..."
+msgstr "Ρυθ_μίσεις ..."
 
-#: src/gtkui/menus.cc:135 src/qtui/main_window_actions.cc:103
-#: src/statusicon/statusicon.cc:284
+#: src/gtkui/menus.cc:88 src/qtui/menus.cc:131
+#: src/statusicon-qt/statusicon.cc:117 src/statusicon/statusicon.cc:288
 msgid "_Quit"
-msgstr "_Έξοδος"
+msgstr "Έ_ξοδος"
 
-#: src/gtkui/menus.cc:139 src/gtkui/menus.cc:262
-#: src/qtui/main_window_actions.cc:107 src/search-tool/search-tool.cc:641
-#: src/statusicon/statusicon.cc:278
+#: src/gtkui/menus.cc:92 src/gtkui/menus.cc:226
+#: src/moonstone/playlist_tabs.cc:306 src/qtui/menus.cc:135
+#: src/qtui/playlist_tabs.cc:331 src/search-tool-qt/search-tool-qt.cc:499
+#: src/search-tool/search-tool.cc:339 src/statusicon-qt/statusicon.cc:109
+#: src/statusicon/statusicon.cc:280
 msgid "_Play"
 msgstr "_Αναπαραγωγή"
 
-#: src/gtkui/menus.cc:140 src/qtui/main_window_actions.cc:108
-#: src/statusicon/statusicon.cc:279
+#: src/gtkui/menus.cc:93 src/qtui/menus.cc:137
+#: src/statusicon-qt/statusicon.cc:110 src/statusicon/statusicon.cc:281
 msgid "Paus_e"
 msgstr "Παύσ_η"
 
-#: src/gtkui/menus.cc:141 src/qtui/main_window_actions.cc:109
-#: src/statusicon/statusicon.cc:280
+#: src/gtkui/menus.cc:94 src/qtui/menus.cc:139
+#: src/statusicon-qt/statusicon.cc:111 src/statusicon/statusicon.cc:282
 msgid "_Stop"
 msgstr "_Διακοπή"
 
-#: src/gtkui/menus.cc:142 src/qtui/main_window_actions.cc:110
-#: src/statusicon/statusicon.cc:277
+#: src/gtkui/menus.cc:95 src/qtui/menus.cc:141
+#: src/statusicon-qt/statusicon.cc:112 src/statusicon/statusicon.cc:283
 msgid "Pre_vious"
-msgstr "Προ_ηγούμενο"
+msgstr "Πρ_οηγούμενο"
 
-#: src/gtkui/menus.cc:143 src/qtui/main_window_actions.cc:111
-#: src/statusicon/statusicon.cc:281
+#: src/gtkui/menus.cc:96 src/qtui/menus.cc:143
+#: src/statusicon-qt/statusicon.cc:113 src/statusicon/statusicon.cc:284
 msgid "_Next"
 msgstr "_Επόμενο"
 
-#: src/gtkui/menus.cc:145 src/qtui/main_window_actions.cc:113
+#: src/gtkui/menus.cc:97 src/qtui/menus.cc:145 src/skins/menus.cc:114
+#: src/skins-qt/menus.cc:105
+msgid "Previous Album"
+msgstr "Προηγούμενο άλμπουμ"
+
+#: src/gtkui/menus.cc:98 src/qtui/menus.cc:146 src/skins/menus.cc:115
+#: src/skins-qt/menus.cc:106
+msgid "Next Album"
+msgstr "Επόμενο άλμπουμ"
+
+#: src/gtkui/menus.cc:100 src/qtui/menus.cc:148
 msgid "_Repeat"
-msgstr "_Επανάληψη"
+msgstr "Επα_νάληψη"
 
-#: src/gtkui/menus.cc:146 src/qtui/main_window_actions.cc:114
+#: src/gtkui/menus.cc:101 src/qtui/menus.cc:150
 msgid "S_huffle"
-msgstr "Α_νακάτεμα"
+msgstr "Τυ_χαία εναλλαγή"
+
+#: src/gtkui/menus.cc:102 src/qtui/menus.cc:152
+msgid "Shuffle by Albu_m"
+msgstr "Τυχαία εναλλαγή κατά άλμπου_μ"
 
-#: src/gtkui/menus.cc:147 src/qtui/main_window_actions.cc:115
+#: src/gtkui/menus.cc:103 src/qtui/menus.cc:155
 msgid "N_o Playlist Advance"
-msgstr "Καμία εκ των προτέρων λίστα αναπαραγωγής"
+msgstr "Χωρίς π_ροώθηση στο επόμενο"
 
-#: src/gtkui/menus.cc:148 src/qtui/main_window_actions.cc:116
+#: src/gtkui/menus.cc:104 src/qtui/menus.cc:157
 msgid "Stop A_fter This Song"
-msgstr "Διακοπή στο τέλους του κομματιού."
+msgstr "Διακο_πή στο τέλος του τραγουδιού"
 
-#: src/gtkui/menus.cc:150 src/gtkui/menus.cc:247
-#: src/qtui/main_window_actions.cc:118
+#: src/gtkui/menus.cc:106 src/gtkui/menus.cc:210 src/qtui/menus.cc:162
+#: src/qtui/menus.cc:294
 msgid "Song _Info ..."
-msgstr "Πληροφορίες τραγουδιού ..."
+msgstr "Πληρο_φορίες τραγουδιού ..."
 
-#: src/gtkui/menus.cc:151
+#: src/gtkui/menus.cc:107
 msgid "Jump to _Time ..."
-msgstr "Μετάβαση σε χρόνο ..."
+msgstr "Μετάβαση σε χ_ρόνο ..."
 
-#: src/gtkui/menus.cc:152
+#: src/gtkui/menus.cc:108
 msgid "_Jump to Song ..."
-msgstr "Μετάβαση στο Τραγούδι ..."
+msgstr "Μετάβαση στο _τραγούδι ..."
 
-#: src/gtkui/menus.cc:154
+#: src/gtkui/menus.cc:110 src/qtui/menus.cc:165
 msgid "Set Repeat Point _A"
-msgstr "Ορισμός Επαναληψης του σημείου Α"
+msgstr "Ορισμός σημείου επανάληψης _Α"
 
-#: src/gtkui/menus.cc:155
+#: src/gtkui/menus.cc:111 src/qtui/menus.cc:167
 msgid "Set Repeat Point _B"
-msgstr "Ορισμός Επαναληψης του σημείου Β"
+msgstr "Ορισμός σημείου επανάληψης _Β"
 
-#: src/gtkui/menus.cc:156
+#: src/gtkui/menus.cc:112 src/qtui/menus.cc:169
 msgid "_Clear Repeat Points"
-msgstr "_Απαλοιφή Επανάληψης Σημείων"
+msgstr "Α_φαίρεση σημείων επανάληψης"
 
-#: src/gtkui/menus.cc:160 src/gtkui/menus.cc:167 src/gtkui/menus.cc:183
-#: src/qtui/main_window_actions.cc:122 src/qtui/main_window_actions.cc:129
-#: src/qtui/main_window_actions.cc:145
+#: src/gtkui/menus.cc:116 src/gtkui/menus.cc:123 src/gtkui/menus.cc:141
+#: src/qtui/menus.cc:173 src/qtui/menus.cc:180 src/qtui/menus.cc:198
 msgid "By _Title"
-msgstr "Κατά _Τίτλο"
+msgstr "Κατά _τίτλο"
 
-#: src/gtkui/menus.cc:161 src/qtui/main_window_actions.cc:123
+#: src/gtkui/menus.cc:117 src/qtui/menus.cc:174
 msgid "By _File Name"
-msgstr "Απο ονόμα του αρχείου"
+msgstr "Κατά όνομα _αρχείου"
 
-#: src/gtkui/menus.cc:162 src/qtui/main_window_actions.cc:124
+#: src/gtkui/menus.cc:118 src/qtui/menus.cc:175
 msgid "By File _Path"
-msgstr "Απο διαδρομή αρχείου"
+msgstr "Κατά διαδ_ρομή αρχείου"
 
-#: src/gtkui/menus.cc:166 src/gtkui/menus.cc:182
-#: src/qtui/main_window_actions.cc:128 src/qtui/main_window_actions.cc:144
+#: src/gtkui/menus.cc:122 src/gtkui/menus.cc:140 src/qtui/menus.cc:179
+#: src/qtui/menus.cc:197
 msgid "By Track _Number"
-msgstr "Κατά Αριθμό_Κομματιού:"
+msgstr "Κατά _αριθμό κομματιού"
 
-#: src/gtkui/menus.cc:168 src/gtkui/menus.cc:184
-#: src/qtui/main_window_actions.cc:130 src/qtui/main_window_actions.cc:146
+#: src/gtkui/menus.cc:124 src/gtkui/menus.cc:142 src/qtui/menus.cc:181
+#: src/qtui/menus.cc:199
 msgid "By _Artist"
-msgstr "Κατά _Καλλιτέχνη"
+msgstr "Κατά _καλλιτέχνη"
 
-#: src/gtkui/menus.cc:169 src/gtkui/menus.cc:185
-#: src/qtui/main_window_actions.cc:131 src/qtui/main_window_actions.cc:147
+#: src/gtkui/menus.cc:125 src/gtkui/menus.cc:143 src/qtui/menus.cc:182
+#: src/qtui/menus.cc:200
 msgid "By Al_bum"
-msgstr "Από άλμπουμ"
+msgstr "Κατά ά_λμπουμ"
 
-#: src/gtkui/menus.cc:170 src/gtkui/menus.cc:186
-#: src/qtui/main_window_actions.cc:132 src/qtui/main_window_actions.cc:148
+#: src/gtkui/menus.cc:126 src/gtkui/menus.cc:144 src/qtui/menus.cc:183
+#: src/qtui/menus.cc:201
 msgid "By Albu_m Artist"
-msgstr "Απο καλλιτέχνη άλμπουμ"
+msgstr "Κατά καλλιτέχνη άλ_μπουμ"
 
-#: src/gtkui/menus.cc:171 src/gtkui/menus.cc:187
-#: src/qtui/main_window_actions.cc:133 src/qtui/main_window_actions.cc:149
+#: src/gtkui/menus.cc:127 src/gtkui/menus.cc:145 src/qtui/menus.cc:184
+#: src/qtui/menus.cc:202
 msgid "By Release _Date"
-msgstr "Κατά Ημερομηνία_Έκδοσης"
+msgstr "Κατά _ημερομηνία έκδοσης"
 
-#: src/gtkui/menus.cc:172 src/gtkui/menus.cc:188
-#: src/qtui/main_window_actions.cc:134 src/qtui/main_window_actions.cc:150
+#: src/gtkui/menus.cc:128 src/gtkui/menus.cc:146 src/qtui/menus.cc:185
+#: src/qtui/menus.cc:203
 msgid "By _Genre"
-msgstr "Από είδος μουσικής"
+msgstr "Κατά _είδος μουσικής"
 
-#: src/gtkui/menus.cc:173 src/gtkui/menus.cc:189
-#: src/qtui/main_window_actions.cc:135 src/qtui/main_window_actions.cc:151
+#: src/gtkui/menus.cc:129 src/gtkui/menus.cc:147 src/qtui/menus.cc:186
+#: src/qtui/menus.cc:204
 msgid "By _Length"
-msgstr "Από μήκος"
+msgstr "Κατά _διάρκεια αρχείου"
 
-#: src/gtkui/menus.cc:174 src/gtkui/menus.cc:190
-#: src/qtui/main_window_actions.cc:136 src/qtui/main_window_actions.cc:152
+#: src/gtkui/menus.cc:130 src/gtkui/menus.cc:148 src/qtui/menus.cc:187
+#: src/qtui/menus.cc:205
 msgid "By _File Path"
-msgstr "Κατά _Διαδρομή Αρχείου"
+msgstr "Κατά διαδ_ρομή αρχείου"
 
-#: src/gtkui/menus.cc:175 src/gtkui/menus.cc:191
-#: src/qtui/main_window_actions.cc:137 src/qtui/main_window_actions.cc:153
+#: src/gtkui/menus.cc:131 src/gtkui/menus.cc:149 src/qtui/menus.cc:188
+#: src/qtui/menus.cc:206
 msgid "By _Custom Title"
-msgstr "Κατά _Προσαρμοσμένο Τίτλο"
+msgstr "Κατά _προσαρμοσμένο τίτλο"
+
+#: src/gtkui/menus.cc:132 src/gtkui/menus.cc:150 src/qtui/menus.cc:189
+#: src/qtui/menus.cc:207
+msgid "By C_omment"
+msgstr "Κατά _σχόλιο"
+
+#: src/gtkui/menus.cc:133 src/gtkui/menus.cc:151 src/qtui/menus.cc:190
+#: src/qtui/menus.cc:208
+msgid "By D_isc Number"
+msgstr "Κατά αριθμό δ_ίσκου"
 
-#: src/gtkui/menus.cc:177 src/gtkui/menus.cc:193
-#: src/qtui/main_window_actions.cc:139 src/qtui/main_window_actions.cc:155
+#: src/gtkui/menus.cc:135 src/gtkui/menus.cc:153 src/qtui/menus.cc:192
+#: src/qtui/menus.cc:210
 msgid "R_everse Order"
-msgstr "Α_ντίστροφη Σειρά"
+msgstr "Α_ντίστροφη σειρά"
 
-#: src/gtkui/menus.cc:178 src/gtkui/menus.cc:194
-#: src/qtui/main_window_actions.cc:140 src/qtui/main_window_actions.cc:156
+#: src/gtkui/menus.cc:136 src/gtkui/menus.cc:154 src/qtui/menus.cc:194
+#: src/qtui/menus.cc:212
 msgid "_Random Order"
-msgstr "_Τυχαία Σειρά"
+msgstr "Τυ_χαία σειρά"
 
-#: src/gtkui/menus.cc:198 src/qtui/main_window_actions.cc:160
+#: src/gtkui/menus.cc:158 src/qtui/menus.cc:216
 msgid "_Play/Resume"
 msgstr "_Αναπαραγωγή/Συνέχεια"
 
-#: src/gtkui/menus.cc:199 src/gtkui/menus.cc:251
-#: src/qtui/main_window_actions.cc:161
+#: src/gtkui/menus.cc:159 src/qtui/menus.cc:218
 msgid "_Refresh"
-msgstr "_Ανανέωση"
+msgstr "Ανανέ_ωση"
 
-#: src/gtkui/menus.cc:201 src/qtui/main_window_actions.cc:163
+#: src/gtkui/menus.cc:161 src/qtui/menus.cc:222
 msgid "_Sort"
 msgstr "_Ταξινόμηση"
 
-#: src/gtkui/menus.cc:202 src/qtui/main_window_actions.cc:164
+#: src/gtkui/menus.cc:162 src/qtui/menus.cc:223
 msgid "Sort Se_lected"
-msgstr "Ταξινόμηση Επιλεγμένων"
+msgstr "Ταξινόμηση επιλε_γμένων"
 
-#: src/gtkui/menus.cc:203 src/qtui/main_window_actions.cc:165
+#: src/gtkui/menus.cc:163 src/qtui/menus.cc:225
 msgid "Remove _Duplicates"
-msgstr "Αφαίρεση Διπλών"
+msgstr "Αφαίρεση _διπλότυπων"
 
-#: src/gtkui/menus.cc:204 src/qtui/main_window_actions.cc:166
+#: src/gtkui/menus.cc:164 src/qtui/menus.cc:226
 msgid "Remove _Unavailable Files"
-msgstr "Αφαίρεση Μη Διαθέσιμων Αρχείων"
+msgstr "Αφαίρεση μη δια_θέσιμων αρχείων"
 
-#: src/gtkui/menus.cc:206 src/playlist-manager/playlist-manager.cc:244
-#: src/qtui/main_window_actions.cc:168
+#: src/gtkui/menus.cc:166 src/playlist-manager/playlist-manager.cc:219
+#: src/playlist-manager-qt/playlist-manager-qt.cc:348 src/qtui/menus.cc:229
 msgid "_New"
-msgstr "_Νέο"
+msgstr "_Νέα"
 
-#: src/gtkui/menus.cc:207
+#: src/gtkui/menus.cc:167 src/qtui/menus.cc:230
 msgid "Ren_ame ..."
 msgstr "Μετ_ονομασία ..."
 
-#: src/gtkui/menus.cc:208 src/gtkui/menus.cc:264
-#: src/qtui/main_window_actions.cc:170
+#: src/gtkui/menus.cc:168 src/gtkui/menus.cc:228
+#: src/moonstone/playlist_tabs.cc:311 src/qtui/menus.cc:231
+#: src/qtui/playlist_tabs.cc:336
 msgid "Remo_ve"
-msgstr "Αφαίρεση"
+msgstr "Α_φαίρεση"
 
-#: src/gtkui/menus.cc:210
+#: src/gtkui/menus.cc:170 src/qtui/menus.cc:233
 msgid "_Import ..."
 msgstr "_Εισαγωγή..."
 
-#: src/gtkui/menus.cc:211
+#: src/gtkui/menus.cc:171 src/qtui/menus.cc:234
 msgid "_Export ..."
-msgstr "_Εξαγωγή..."
+msgstr "Ε_ξαγωγή..."
 
-#: src/gtkui/menus.cc:213
+#: src/gtkui/menus.cc:173 src/qtui/menus.cc:237
 msgid "Playlist _Manager ..."
-msgstr "Διαχειριστής Λιστών _Αναπαραγωγής ..."
+msgstr "Διαχειριστής λίστας αναπαρα_γωγής ..."
 
-#: src/gtkui/menus.cc:214 src/qtui/main_window_actions.cc:176
+#: src/gtkui/menus.cc:174 src/qtui/menus.cc:239
 msgid "_Queue Manager ..."
-msgstr "_Διαχειριστής Ουράς Αναμονής ..."
+msgstr "Διαχειριστής σειράς ανα_μονής ..."
 
-#: src/gtkui/menus.cc:218 src/qtui/main_window_actions.cc:180
+#: src/gtkui/menus.cc:178 src/qtui/menus.cc:243
 msgid "Volume _Up"
-msgstr "Αύξηση_Έντασης"
+msgstr "_Αύξηση έντασης"
 
-#: src/gtkui/menus.cc:219 src/qtui/main_window_actions.cc:181
+#: src/gtkui/menus.cc:179 src/qtui/menus.cc:245
 msgid "Volume _Down"
-msgstr "Μείωση_Έντασης"
+msgstr "_Μείωση έντασης"
 
-#: src/gtkui/menus.cc:221 src/qtui/main_window_actions.cc:183
-msgid "_Equalizer"
-msgstr "_Ισοσταθμιστής"
+#: src/gtkui/menus.cc:181 src/qtui/menus.cc:249
+msgid "_Equalizer ..."
+msgstr "_Ισοσταθμιστής ..."
 
-#: src/gtkui/menus.cc:223 src/qtui/main_window_actions.cc:185
+#: src/gtkui/menus.cc:182 src/qtui/menus.cc:251
 msgid "E_ffects ..."
 msgstr "Ε_φέ ..."
 
-#: src/gtkui/menus.cc:227
+#: src/gtkui/menus.cc:184
+msgid "_Record Stream"
+msgstr "_Εγγραφή ροής"
+
+#: src/gtkui/menus.cc:185
+msgid "Audio _Settings ..."
+msgstr "_Ρυθμίσεις ήχου ..."
+
+#: src/gtkui/menus.cc:189 src/qtui/menus.cc:260
 msgid "Show _Menu Bar"
-msgstr "Εμφάνιση _Γραμμής Μενού"
+msgstr "Εμφάνιση _γραμμής μενού"
 
-#: src/gtkui/menus.cc:228
+#: src/gtkui/menus.cc:190 src/qtui/menus.cc:262
 msgid "Show I_nfo Bar"
-msgstr "Εμφάνιση Π_λαισίου Πληροφοριών"
+msgstr "Εμφάνιση _πληροφοριών"
 
-#: src/gtkui/menus.cc:229
+#: src/gtkui/menus.cc:191 src/qtui/menus.cc:264
+msgid "Show Info Bar _Album Art"
+msgstr "Εμφάνιση _εικόνας άλμπουμ"
+
+#: src/gtkui/menus.cc:192 src/qtui/menus.cc:266
 msgid "Show Info Bar Vis_ualization"
-msgstr "Εμφάνιση Απεικόνισης Πλαισίου Πλη_ροφοριών"
+msgstr "Εμφάνιση οπ_τικού εφέ"
 
-#: src/gtkui/menus.cc:230
+#: src/gtkui/menus.cc:193 src/qtui/menus.cc:268
 msgid "Show _Status Bar"
-msgstr "Εμφάνιση _Γραμμής Κατάστασης"
+msgstr "Εμφάνιση γραμμής _κατάστασης"
 
-#: src/gtkui/menus.cc:232
+#: src/gtkui/menus.cc:195 src/qtui/menus.cc:272
 msgid "Show _Remaining Time"
-msgstr "Εμφάνιση χρόνου που απομένει"
+msgstr "Εμφάνιση _χρόνου που απομένει"
 
-#: src/gtkui/menus.cc:234
+#: src/gtkui/menus.cc:197 src/qtui/menus.cc:276 src/skins/menus.cc:157
+#: src/skins-qt/menus.cc:152
 msgid "_Visualizations ..."
-msgstr "_Απεικονίσεις ..."
+msgstr "_Οπτικά εφέ ..."
 
-#: src/gtkui/menus.cc:238 src/qtui/main_window_actions.cc:189
+#: src/gtkui/menus.cc:201 src/qtui/menus.cc:280
 msgid "_File"
-msgstr "_Αρχείο"
+msgstr "Α_ρχείο"
 
-#: src/gtkui/menus.cc:239 src/qtui/main_window_actions.cc:190
+#: src/gtkui/menus.cc:202 src/qtui/menus.cc:281
 msgid "_Playback"
-msgstr "_Αναπαραγωγή"
+msgstr "Α_ναπαραγωγή"
 
-#: src/gtkui/menus.cc:240 src/qtui/main_window_actions.cc:191
+#: src/gtkui/menus.cc:203 src/qtui/menus.cc:282
 msgid "P_laylist"
-msgstr "Λίστα αναπαραγωγής"
+msgstr "_Λίστα αναπαραγωγής"
 
-#: src/gtkui/menus.cc:241 src/gtkui/menus.cc:258
-#: src/qtui/main_window_actions.cc:192
+#: src/gtkui/menus.cc:204 src/gtkui/menus.cc:222 src/qtui/menus.cc:283
+#: src/qtui/menus.cc:312
 msgid "_Services"
 msgstr "_Υπηρεσίες"
 
-#: src/gtkui/menus.cc:242 src/qtui/main_window_actions.cc:193
+#: src/gtkui/menus.cc:205 src/qtui/menus.cc:284
 msgid "_Output"
-msgstr "_Έξοδος"
+msgstr "_Έξοδοι"
 
-#: src/gtkui/menus.cc:243
+#: src/gtkui/menus.cc:206 src/qtui/menus.cc:285
 msgid "_View"
 msgstr "_Προβολή"
 
-#: src/gtkui/menus.cc:248
+#: src/gtkui/menus.cc:211 src/qtui/menus.cc:296
 msgid "_Queue/Unqueue"
-msgstr "_Εισαγωγή/Αφαίρεση στην/από την Ουρά"
+msgstr "Εισα_γωγή/Αφαίρεση στην/από την σειρά"
 
-#: src/gtkui/menus.cc:250
+#: src/gtkui/menus.cc:213 src/qtui/menus.cc:299
 msgid "_Open Containing Folder"
-msgstr "_Ανοιγμα φάκελου που περιέχετε"
+msgstr "Ά_νοιγμα του φακέλου που το περιέχει"
+
+#: src/gtkui/menus.cc:214 src/qtui/menus.cc:301
+msgid "_Refresh Selected"
+msgstr "Ανανέωση επι_λεγμένων"
 
-#: src/gtkui/menus.cc:253
+#: src/gtkui/menus.cc:216 src/qtui/menus.cc:304
 msgid "Cu_t"
 msgstr "Αποκο_πή"
 
-#: src/gtkui/menus.cc:254
+#: src/gtkui/menus.cc:217 src/qtui/menus.cc:305
 msgid "_Copy"
-msgstr "_Αντιγραφή"
+msgstr "Αν_τιγραφή"
 
-#: src/gtkui/menus.cc:255
+#: src/gtkui/menus.cc:218 src/qtui/menus.cc:306
 msgid "_Paste"
-msgstr "_Επικόλληση"
+msgstr "Επικόλλ_ηση"
+
+#: src/gtkui/menus.cc:219 src/qtui/menus.cc:307
+msgid "Paste at _End"
+msgstr "Επικό_λληση στο τέλος"
 
-#: src/gtkui/menus.cc:256
+#: src/gtkui/menus.cc:220 src/qtui/menus.cc:309
 msgid "Select _All"
-msgstr "Επιλογή _Όλων"
+msgstr "Επιλογή _όλων"
 
-#: src/gtkui/menus.cc:263
+#: src/gtkui/menus.cc:227 src/moonstone/playlist_tabs.cc:309
+#: src/qtui/playlist_tabs.cc:334
 msgid "_Rename ..."
 msgstr "_Μετονομασία..."
 
-#: src/gtkui/settings.cc:35
+#: src/gtkui/settings.cc:35 src/qtui/settings.cc:59
+msgid "Always"
+msgstr "Πάντα"
+
+#: src/gtkui/settings.cc:36 src/qtui/settings.cc:60
+msgid "Auto-hide"
+msgstr "Αυτόματη απόκρυψη"
+
+#: src/gtkui/settings.cc:37 src/qtui/settings.cc:61
+msgid "Never"
+msgstr "Ποτέ"
+
+#: src/gtkui/settings.cc:41 src/qtui/settings.cc:64
 msgid "Playlist Tabs"
 msgstr "Καρτέλες λίστας αναπαραγωγής"
 
-#: src/gtkui/settings.cc:36
-msgid "Always show tabs"
-msgstr "Πάντα να παρουσιάζονται οι καρτέλες"
+#: src/gtkui/settings.cc:42 src/qtui/settings.cc:65
+msgid "Show playlist tabs:"
+msgstr "Εμφάνιση καρτέλας στις λίστες αναπαραγωγής:"
 
-#: src/gtkui/settings.cc:38
+#: src/gtkui/settings.cc:45 src/qtui/settings.cc:69
 msgid "Show entry counts"
-msgstr "Εμφάνιση καταχωρησεων"
+msgstr "Εμφάνιση αριθμού περιεχομένων"
 
-#: src/gtkui/settings.cc:40
+#: src/gtkui/settings.cc:47 src/qtui/settings.cc:72
 msgid "Show close buttons"
-msgstr "Εμφάνιση Κουμπιά Κλεισίματος"
+msgstr "Εμφάνιση κουμπιών κλεισίματος"
 
-#: src/gtkui/settings.cc:42
+#: src/gtkui/settings.cc:49 src/qtui/settings.cc:75
 msgid "Playlist Columns"
 msgstr "Στήλες λίστας αναπαραγωγής"
 
-#: src/gtkui/settings.cc:44
+#: src/gtkui/settings.cc:51 src/qtui/settings.cc:77
 msgid "Show column headers"
-msgstr "Εμφάνιση Κεφαλίδων Στηλών"
+msgstr "Εμφάνιση επικεφαλίδας"
 
-#: src/gtkui/settings.cc:46 src/modplug/plugin_main.cc:106
-#: src/skins/skins_cfg.cc:263
-msgid "Miscellaneous"
-msgstr "Διάφορα"
+#: src/gtkui/settings.cc:53 src/qtui/settings.cc:82
+msgid "Make column headers clickable for sorting"
+msgstr "Δυνατότητα ταξινόμησης με κλικ στις επικεφαλίδες"
 
-#: src/gtkui/settings.cc:47
-msgid "Arrow keys seek by:"
-msgstr "Πλήκτρα βέλους επιδιωξη από:"
+#: src/gtkui/settings.cc:56
+msgid "Use symbolic icons in toolbar"
+msgstr "Εμφάνιση συμβολικών εικονιδίων στην εργαλειοθήκη"
 
-#: src/gtkui/settings.cc:50
+#: src/gtkui/settings.cc:58 src/qtui/settings.cc:86
 msgid "Scroll on song change"
-msgstr "Κύλιση στην αλλαγή τραγουδιού "
+msgstr "Μετακίνηση στην αλλαγή τραγουδιού"
 
-#: src/gtkui/ui_gtk.cc:71
+#: src/gtkui/ui_gtk.cc:82
 msgid "GTK Interface"
 msgstr "Διεπαφή GTK"
 
-#: src/gtkui/ui_gtk.cc:222 src/skins/ui_main.cc:232
+#: src/gtkui/ui_gtk.cc:219 src/skins/main.cc:228 src/skins-qt/main.cc:231
 #, c-format
 msgid "%s - Audacious"
 msgstr "%s - Audacious"
 
-#: src/gtkui/ui_gtk.cc:225 src/qtui/main_window.cc:186
+#: src/gtkui/ui_gtk.cc:221 src/moonstone/main_window.cc:184
+#: src/qtui/main_window.cc:385
 msgid "Buffering ..."
 msgstr "Γέμισμα ενδιάμεσης μνήμης..."
 
-#: src/gtkui/ui_gtk.cc:228 src/skins/ui_main.cc:234 src/skins/ui_main.cc:1164
+#: src/gtkui/ui_gtk.cc:224 src/pipewire/pipewire.cc:402 src/skins/main.cc:230
+#: src/skins-qt/main.cc:233
 msgid "Audacious"
 msgstr "Audacious"
 
-#: src/gtkui/ui_statusbar.cc:63 src/qtui/status_bar.cc:67
+#: src/gtkui/ui_gtk.cc:487 src/gtkui/ui_gtk.cc:518 src/gtkui/ui_gtk.cc:882
+#: src/hotkey/gui.cc:72 src/moonstone/main_window.cc:67
+#: src/moonstone/main_window.cc:145 src/moonstone/main_window.cc:146
+#: src/notify/osd.cc:85 src/qthotkey/gui.cc:67 src/qtui/main_window.cc:154
+#: src/qtui/main_window.cc:347 src/qtui/main_window.cc:348
+#: src/skins/menus.cc:109 src/skins-qt/menus.cc:100
+msgid "Play"
+msgstr "Αναπαραγωγή"
+
+#: src/gtkui/ui_gtk.cc:487 src/moonstone/main_window.cc:151
+#: src/moonstone/main_window.cc:152 src/notify/osd.cc:82
+#: src/qtui/main_window.cc:353 src/qtui/main_window.cc:354
+#: src/skins/menus.cc:110 src/skins-qt/menus.cc:101
+msgid "Pause"
+msgstr "Παύση"
+
+#: src/gtkui/ui_gtk.cc:868 src/moonstone/main_window.cc:57
+#: src/qtui/main_window.cc:145 src/skins/menus.cc:86 src/skins-qt/menus.cc:77
+msgid "Search Library"
+msgstr "Έρευνα δισκοθήκης"
+
+#: src/gtkui/ui_gtk.cc:875 src/moonstone/main_window.cc:60
+#: src/qtui/main_window.cc:147
+msgid "Open Files"
+msgstr "Άνοιγμα αρχείων"
+
+#: src/gtkui/ui_gtk.cc:876 src/moonstone/main_window.cc:62
+#: src/qtui/main_window.cc:149
+msgid "Add Files"
+msgstr "Προσθήκη αρχείων"
+
+#: src/gtkui/ui_gtk.cc:881 src/moonstone/main_window.cc:65
+#: src/qtui/main_window.cc:152 src/skins/menus.cc:112 src/skins-qt/menus.cc:103
+msgid "Previous"
+msgstr "Προηγούμενο"
+
+#: src/gtkui/ui_gtk.cc:883 src/hotkey/gui.cc:74 src/moonstone/main_window.cc:69
+#: src/qthotkey/gui.cc:69 src/qtui/main_window.cc:156 src/skins/menus.cc:111
+#: src/skins-qt/menus.cc:102
+msgid "Stop"
+msgstr "Διακοπή"
+
+#: src/gtkui/ui_gtk.cc:884 src/moonstone/main_window.cc:76 src/notify/osd.cc:89
+#: src/qtui/main_window.cc:163 src/skins/menus.cc:113 src/skins-qt/menus.cc:104
+msgid "Next"
+msgstr "Επόμενο"
+
+#: src/gtkui/ui_gtk.cc:886 src/moonstone/main_window.cc:79
+#: src/qtui/main_window.cc:166 src/qtui/menus.cc:254 src/skins/menus.cc:79
+#: src/skins-qt/menus.cc:69
+msgid "Record Stream"
+msgstr "Εγγραφή ροής"
+
+#: src/gtkui/ui_gtk.cc:919 src/moonstone/main_window.cc:86
+#: src/qtui/main_window.cc:173 src/skins/menus.cc:103 src/skins-qt/menus.cc:94
+msgid "Repeat"
+msgstr "Επανάληψη"
+
+#: src/gtkui/ui_gtk.cc:922 src/moonstone/main_window.cc:89
+#: src/qtui/main_window.cc:176 src/skins/menus.cc:104 src/skins-qt/menus.cc:95
+msgid "Shuffle"
+msgstr "Τυχαία εναλλαγή"
+
+#: src/gtkui/ui_gtk.cc:1114 src/qtui/main_window.cc:123
+msgid "Menu"
+msgstr "Μενού"
+
+#: src/gtkui/ui_statusbar.cc:64 src/qtui/status_bar.cc:155
 msgid "mono"
 msgstr "μονοφωνικό"
 
-#: src/gtkui/ui_statusbar.cc:65 src/qtui/status_bar.cc:69
+#: src/gtkui/ui_statusbar.cc:66 src/qtui/status_bar.cc:157
 msgid "stereo"
 msgstr "στερεοφωνικό"
 
-#: src/gtkui/ui_statusbar.cc:67 src/qtui/status_bar.cc:71
+#: src/gtkui/ui_statusbar.cc:68 src/qtui/status_bar.cc:160
 #, c-format
 msgid "%d channel"
 msgid_plural "%d channels"
 msgstr0 "%d κανάλι"
 msgstr1 "%d κανάλια"
 
-#: src/gtkui/ui_statusbar.cc:81 src/qtui/status_bar.cc:85
+#: src/gtkui/ui_statusbar.cc:76 src/qtui/status_bar.cc:168
 #, c-format
-msgid "%d kbps"
-msgstr "%d kb/s"
+msgid "%d kHz"
+msgstr "%d kHz"
 
-#: src/gtkui/ui_statusbar.cc:107 src/skins/ui_main_evlisteners.cc:103
+#: src/gtkui/ui_statusbar.cc:82 src/qtui/status_bar.cc:174
+#, c-format
+msgid "%d kbit/s"
+msgstr "%dkbit/s "
+
+#: src/gtkui/ui_statusbar.cc:108 src/skins/main.cc:478 src/skins-qt/main.cc:461
 msgid "Single mode."
 msgstr "Ενιαία λειτουργία."
 
-#: src/gtkui/ui_statusbar.cc:109 src/skins/ui_main_evlisteners.cc:105
+#: src/gtkui/ui_statusbar.cc:110 src/skins/main.cc:480 src/skins-qt/main.cc:463
 msgid "Playlist mode."
 msgstr "Λειτουργία λίστας αναπαραγωγής."
 
-#: src/gtkui/ui_statusbar.cc:117 src/skins/ui_main_evlisteners.cc:111
+#: src/gtkui/ui_statusbar.cc:118 src/skins/main.cc:486 src/skins-qt/main.cc:469
 msgid "Stopping after song."
-msgstr "Διακοπή στο τέλους του κομματιού."
+msgstr "Διακοπή στο τέλος του κομματιού."
 
-#: src/hotkey/gui.cc:71
+#: src/hotkey/gui.cc:71 src/qthotkey/gui.cc:66
 msgid "Previous track"
-msgstr "Προηγούμενο Κομμάτι"
-
-#: src/hotkey/gui.cc:72 src/notify/osd.cc:69 src/qtui/main_window.cc:69
-#: src/qtui/main_window.cc:172 src/qtui/main_window.cc:173
-#: src/skins/menus.cc:87
-msgid "Play"
-msgstr "Αναπαραγωγή"
+msgstr "Προηγούμενο κομμάτι"
 
-#: src/hotkey/gui.cc:73
+#: src/hotkey/gui.cc:73 src/qthotkey/gui.cc:68
 msgid "Pause/Resume"
 msgstr "Παύση/Συνέχεια"
 
-#: src/hotkey/gui.cc:74 src/qtui/main_window.cc:70 src/skins/menus.cc:89
-msgid "Stop"
-msgstr "Διακοπή"
-
-#: src/hotkey/gui.cc:75
+#: src/hotkey/gui.cc:75 src/qthotkey/gui.cc:70
 msgid "Next track"
-msgstr "Επόμενο Κομμάτι"
+msgstr "Επόμενο κομμάτι"
 
-#: src/hotkey/gui.cc:76
-msgid "Forward 5 seconds"
-msgstr "Μπροστά 5 δευτερόλεπτα"
+#: src/hotkey/gui.cc:76 src/qthotkey/gui.cc:71
+msgid "Step forward"
+msgstr "Βήμα προς τα εμπρός"
 
-#: src/hotkey/gui.cc:77
-msgid "Rewind 5 seconds"
-msgstr "Πίσω 5 δευτερόλεπτα"
+#: src/hotkey/gui.cc:77 src/qthotkey/gui.cc:72
+msgid "Step backward"
+msgstr "Βήμα προς τα πίσω"
 
-#: src/hotkey/gui.cc:78
+#: src/hotkey/gui.cc:78 src/qthotkey/gui.cc:73
 msgid "Mute"
 msgstr "Σίγαση"
 
-#: src/hotkey/gui.cc:79
+#: src/hotkey/gui.cc:79 src/qthotkey/gui.cc:74
 msgid "Volume up"
 msgstr "Αύξηση έντασης"
 
-#: src/hotkey/gui.cc:80
+#: src/hotkey/gui.cc:80 src/qthotkey/gui.cc:75
 msgid "Volume down"
 msgstr "Μείωση έντασης"
 
-#: src/hotkey/gui.cc:81
+#: src/hotkey/gui.cc:81 src/qthotkey/gui.cc:76
 msgid "Jump to file"
 msgstr "Μεταπήδηση στο αρχείο"
 
-#: src/hotkey/gui.cc:82
+#: src/hotkey/gui.cc:82 src/qthotkey/gui.cc:77
 msgid "Toggle player window(s)"
-msgstr "Εναλλαγή παραθύρου(ων) αναπαραγωγής"
+msgstr "Τυχαία εναλλαγή παραθύρου(ων) αναπαραγωγής"
 
-#: src/hotkey/gui.cc:83
+#: src/hotkey/gui.cc:83 src/qthotkey/gui.cc:78
 msgid "Show On-Screen-Display"
 msgstr "Εμφάνιση απεικόνισης στην οθόνη"
 
-#: src/hotkey/gui.cc:84
+#: src/hotkey/gui.cc:84 src/qthotkey/gui.cc:79
 msgid "Toggle repeat"
 msgstr "Εναλλαγή επανάληψης"
 
-#: src/hotkey/gui.cc:85
+#: src/hotkey/gui.cc:85 src/qthotkey/gui.cc:80
 msgid "Toggle shuffle"
-msgstr "Εναλλαγή τυχαίας αναπαραγωγής"
+msgstr "Τυχαία εναλλαγή σειράς"
 
-#: src/hotkey/gui.cc:86
+#: src/hotkey/gui.cc:86 src/qthotkey/gui.cc:81
 msgid "Toggle stop after current"
 msgstr "Εναλλαγή διακοπής μετά την τρέχουσα"
 
-#: src/hotkey/gui.cc:87
+#: src/hotkey/gui.cc:87 src/qthotkey/gui.cc:82
 msgid "Raise player window(s)"
-msgstr "Αύξηση παραθύρου(ων) αναπαραγωγής"
+msgstr "Ανύψωση του παραθύρου(ων) αναπαραγωγής"
 
-#: src/hotkey/gui.cc:97
+#: src/hotkey/gui.cc:98 src/qthotkey/gui.cc:100
 msgid "(none)"
 msgstr "(κανένα)"
 
-#: src/hotkey/gui.cc:234
+#: src/hotkey/gui.cc:261
 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 modifiers.\n"
 "\n"
 "Do you want to continue?"
 msgstr ""
-"Δεν συνιστάται να συνδέονται τα κουμπιά πρωτογενούς ποντικιού χωρίς "
-"τροποποιήσεις. Θέλετε να συνεχίσετε;"
+"Δεν συνιστάται να δεσμεύονται τα κυρίως πλήκτρα του ποντικιού χωρίς "
+"τροποποιήσεις.\n"
+"\n"
+"Θέλετε να συνεχίσετε;"
 
-#: src/hotkey/gui.cc:236
+#: src/hotkey/gui.cc:264
 msgid "Binding mouse buttons"
 msgstr "Δέσμευση κουμπιών του ποντικιού"
 
-#: src/hotkey/gui.cc:391
+#: src/hotkey/gui.cc:434
 msgid ""
 "Press a key combination inside a text field.\n"
 "You can also bind mouse buttons."
 msgstr ""
-"Πατήστε έναν συνδυασμό πλήκτρων μέσα σε ένα πεδίο κειμένου.\n"
+"Πατήστε ένα συνδυασμό πλήκτρων μέσα σε ένα πεδίο κειμένου.\n"
 "Μπορείτε επίσης να δεσμεύσετε τα κουμπιά ποντικιού."
 
-#: src/hotkey/gui.cc:396
+#: src/hotkey/gui.cc:444 src/qthotkey/gui.cc:179
 msgid "Hotkeys:"
 msgstr "Συντομεύσεις:"
 
-#: src/hotkey/gui.cc:413
+#: src/hotkey/gui.cc:457 src/qthotkey/gui.cc:181
 msgid "Action:"
 msgstr "Ενέργεια:"
 
-#: src/hotkey/gui.cc:420
+#: src/hotkey/gui.cc:461 src/qthotkey/gui.cc:182
 msgid "Key Binding:"
-msgstr "Πρόσδεση κλειδιου"
+msgstr " Πλήκτρο δέσμευσης:"
 
-#: src/hotkey/gui.cc:468
+#: src/hotkey/gui.cc:518 src/qthotkey/gui.cc:184
 msgid "_Add"
 msgstr "_Προσθήκη"
 
-#: src/hotkey/plugin.cc:61
+#: src/hotkey/plugin.cc:59 src/qthotkey/plugin.cc:78
 msgid "Global Hotkeys"
-msgstr "Συντομεύσεις"
+msgstr "Γενικές συντομεύσεις"
 
-#: src/hotkey/plugin.cc:79
+#: src/hotkey/plugin.cc:74
 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"
+"Contributors 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"
-"Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n"
-"Συντελεστές περιλαμβάνουν:\n"
-"Copyright (C) 2006-2007 Vladimir Paskov <vlado.paskov@gmail.com>\n"
-"Copyright (C) στην περίοδο 2000-2002 Ville Syrjälä <syrjala@sci.fi>,\n"
+"Πρόσθετο Γενικές συντομεύσεις\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 Davis Α <davis@jdhouse.org>,\n"
+"Jonathan A. Davis <davis@jdhouse.org>,\n"
 "Jeremy Tan <nsx@nsx.homeip.net>"
 
-#: src/jack-ng/jack-ng.cc:49
+#: src/jack/jack-ng.cc:54
 msgid "JACK Output"
 msgstr "Έξοδος JACK"
 
-#: src/jack-ng/jack-ng.cc:114
+#: src/jack/jack-ng.cc:126
+msgid "Client name:"
+msgstr "Όνομα υπηρεσίας:"
+
+#: src/jack/jack-ng.cc:128
 msgid "Automatically connect to output ports"
 msgstr "Αυτόματη σύνδεση σε θύρες εξόδου"
 
-#: src/jack-ng/jack-ng.cc:155
+#: src/jack/jack-ng.cc:130
+msgid "Filter ports (regex, use any port if blank):"
+msgstr "Φίλτρα για τις θύρες (regex, χρήση κάθε θύρας αν μείνει κενό):"
+
+#: src/jack/jack-ng.cc:136
+msgid "Connect to physical ports only"
+msgstr "Σύνδεση μόνο σε φυσικές θύρες"
+
+#: src/jack/jack-ng.cc:139
+msgid "Upmix to"
+msgstr "Upmix σε"
+
+#: src/jack/jack-ng.cc:141
+msgid "ports if input has fewer channels"
+msgstr "πύλες αν η είσοδος έχει λιγότερα κανάλια"
+
+#: src/jack/jack-ng.cc:143
+msgid "Ignore insufficient number of ports"
+msgstr "Αγνόησε ανεπαρκή αριθμό θυρών"
+
+#: src/jack/jack-ng.cc:181
+msgid "No JACK output ports were found. Please check settings."
+msgstr "Δεν βρέθηκε θύρα εξόδου JACK. Παρακαλώ ελέγξτε τις ρυθμίσεις."
+
+#: src/jack/jack-ng.cc:195
 #, c-format
 msgid "Only %d JACK output ports were found but %d are required."
-msgstr "Μόνο %d θύρες εξόδου JACK βρέθηκαν αλλά %d απαιτούνται."
+msgstr "Βρέθηκαν μόνο %d θύρες εξόδου JACK αλλά απαιτούνται %d."
 
-#: src/jack-ng/jack-ng.cc:164
+#: src/jack/jack-ng.cc:210
 #, c-format
 msgid "Failed to connect to JACK port %s."
-msgstr "Απέτυχε να συνδεθεί στην JACK θύρα %s."
+msgstr "Αποτυχία σύνδεσης στην θύρα JACK %s."
 
-#: src/jack-ng/jack-ng.cc:184
+#: src/jack/jack-ng.cc:230
 msgid ""
 "JACK supports only floating-point audio. You must change the output bit "
 "depth to floating-point in Audacious settings."
 msgstr ""
-"Το JACK υποστηρίζει μόνο κινητή υποδιαστολής ήχου. Πρέπει να αλλάξετε το "
-"βάθος bit εξόδου σε κινητή υποδιαστολή στις ρυθμίσεις του Audacity."
+"Το JACK υποστηρίζει μόνο ήχο κινητής υποδιαστολής. Πρέπει ν' αλλάξετε και το "
+"Βάθος bit σε κινητή υποδιαστολή."
 
-#: src/jack-ng/jack-ng.cc:197
+#: src/jack/jack-ng.cc:245
 msgid "Failed to connect to the JACK server; is it running?"
-msgstr "Απέτυχε η σύνδεση με το διακομιστή JACK; είναι σε λειτουργία;"
+msgstr "Αποτυχία σύνδεσης με το διακομιστή JACK; είναι σε λειτουργία;"
 
-#: src/jack-ng/jack-ng.cc:273
+#: src/jack/jack-ng.cc:321
 #, c-format
 msgid ""
 "The JACK server requires a sample rate of %d Hz, but Audacious is playing at "
 "%d Hz. Please use the Sample Rate Converter effect to correct the mismatch."
 msgstr ""
-"Ο διακομιστής JACK απαιτεί ένα ρυθμό δειγματοληψίας %d Hz, αλλά το Audacious "
-"αναπαράγεται σε %d Hz. Παρακαλούμε χρησιμοποιήστε το Sample Rate Converter "
-"για να διορθώσετε την ανισορροπία."
+"Ο διακομιστής JACK απαιτεί ρυθμό δειγματοληψίας %d Hz, αλλά το Audacious "
+"αναπαράγεται σε %d Hz. Παρακαλούμε χρησιμοποιήστε τη Μετατροπή ρυθμού "
+"δειγματοληψίας για να διορθώσετε την αναντιστοιχία."
 
-#: src/ladspa/plugin.cc:414
+#: src/ladspa/plugin.cc:416
 #, c-format
 msgid "%s Settings"
-msgstr "Ρυθμίσεις %s"
+msgstr "%s Ρυθμίσεις"
 
-#: src/ladspa/plugin.cc:478
+#: src/ladspa/plugin.cc:482
 msgid "Module paths:"
 msgstr "Διαδρομές ενότητας:"
 
-#: src/ladspa/plugin.cc:483
+#: src/ladspa/plugin.cc:487
 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 για να ανιχνεύσετε νέα "
+"Διαχωρίστε τις πολλαπλές διαδρομές με άνω και κάτω τελεία.\n"
+"Αυτές οι διαδρομές αναζητούνται επιπροσθέτως στο LADSPA_PATH.\n"
+"Μετά την προσθήκη νέων διαδρομών, πατήστε Enter για να ανιχνεύσετε νέα "
 "πρόσθετα."
 
-#: src/ladspa/plugin.cc:499
+#: src/ladspa/plugin.cc:508
 msgid "Available plugins:"
 msgstr "Διαθέσιμα πρόσθετα:"
 
-#: src/ladspa/plugin.cc:512 src/modplug/plugin_main.cc:92
-#: src/modplug/plugin_main.cc:95 src/modplug/plugin_main.cc:98
-#: src/modplug/plugin_main.cc:101
+#: src/ladspa/plugin.cc:521 src/modplug/plugin_main.cc:91
+#: src/modplug/plugin_main.cc:94 src/modplug/plugin_main.cc:97
+#: src/modplug/plugin_main.cc:100
 msgid "Enable"
 msgstr "Ενεργοποίηση"
 
-#: src/ladspa/plugin.cc:518
+#: src/ladspa/plugin.cc:527
 msgid "Enabled plugins:"
 msgstr "Ενεργοποιημένα πρόσθετα:"
 
-#: src/ladspa/plugin.cc:534
+#: src/ladspa/plugin.cc:543
 msgid "Settings"
 msgstr "Ρυθμίσεις"
 
-#: src/ladspa/plugin.cc:551
+#: src/ladspa/plugin.cc:560
 msgid ""
 "LADSPA Host for Audacious\n"
 "Copyright 2011 John Lindgren"
 msgstr ""
-"LADSPA Host for Audacious\n"
-"Copyright 2011 John Lindgren"
+"LADSPA Host για το Audacious\n"
+"Πνευματικά δικαιώματα 2011 John Lindgren"
 
 #: src/ladspa/plugin.h:78
 msgid "LADSPA Host"
@@ -2323,7 +2448,7 @@
 msgid "LIRC Plugin"
 msgstr "Πρόσθετο LIRC"
 
-#: src/lirc/lirc.cc:381
+#: src/lirc/lirc.cc:379
 msgid ""
 "A simple plugin to control Audacious using the LIRC remote control daemon\n"
 "\n"
@@ -2338,95 +2463,158 @@
 "\n"
 "For more information about LIRC, see http://lirc.org."
 msgstr ""
-"Ένα απλό πρόσθετο για έλεγχο του Audacious χρησιμοποιώντας τον LIRC εξ "
-"αποστάσεως daemon ελέγχου\n"
+"Ένα απλό πρόσθετο για τον έλεγχο του Audacious χρησιμοποιώντας τον εξ "
+"αποστάσεως έλεγχο LIRC\n"
 "\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 Shadoura <bugzilla@tut.by>\n"
+"Με βάση το πρόσθετο XMMS LIRC από τους:\n"
+"Carl Van Schaik <carl@leg.uct.ac.za>\n"
+"Christoph Bartelmus <xmms@bartelmus.de>\n"
+"Andrew Shadoura <bugzilla@tut.by>\n"
 "\n"
-"Για περισσότερες πληροφορίες σχετικά με LIRC, δείτε http://lirc.org."
+"Για περισσότερες πληροφορίες σχετικά με το LIRC, δείτε http://lirc.org."
 
-#: src/lirc/lirc.cc:392
+#: src/lirc/lirc.cc:390
 msgid "Connection"
 msgstr "Σύνδεση"
 
-#: src/lirc/lirc.cc:393
+#: src/lirc/lirc.cc:391
 msgid "Reconnect to LIRC server"
-msgstr "Επανασύνδεση με εξυπηρετητή LIRC"
+msgstr "Επανασύνδεση με το διακομιστή LIRC"
 
-#: src/lirc/lirc.cc:395
+#: src/lirc/lirc.cc:393
 msgid "Wait before reconnecting:"
 msgstr "Αναμονή πριν την επανασύνδεση:"
 
-#: src/lyricwiki/lyricwiki.cc:41
-msgid "LyricWiki Plugin"
-msgstr "Πρόσθετο LyricsWiki"
-
-#: src/lyricwiki/lyricwiki.cc:131 src/lyricwiki-qt/lyricwiki.cc:136
-msgid "No lyrics available"
-msgstr "Δεν υπάρχουν διαθέσιμοι στίχοι"
-
-#: src/lyricwiki/lyricwiki.cc:217 src/lyricwiki/lyricwiki.cc:226
-#: src/lyricwiki/lyricwiki.cc:243 src/lyricwiki/lyricwiki.cc:252
-#: src/lyricwiki/lyricwiki.cc:267 src/lyricwiki-qt/lyricwiki.cc:222
-#: src/lyricwiki-qt/lyricwiki.cc:231 src/lyricwiki-qt/lyricwiki.cc:248
-#: src/lyricwiki-qt/lyricwiki.cc:257 src/lyricwiki-qt/lyricwiki.cc:272
-msgid "Error"
-msgstr "Σφάλμα"
-
-#: src/lyricwiki/lyricwiki.cc:218 src/lyricwiki/lyricwiki.cc:244
-#: src/lyricwiki-qt/lyricwiki.cc:223 src/lyricwiki-qt/lyricwiki.cc:249
+#: src/lyrics-common/chart_lyrics_provider.cc:93
+#: src/lyrics-common/chart_lyrics_provider.cc:150
+#: src/lyrics-common/lyrics_ovh_provider.cc:50
 #, c-format
 msgid "Unable to fetch %s"
-msgstr "Δεν είναι δυνατή η ανάκτηση του %s"
+msgstr "Αδύνατη η λήψη του %s"
 
-#: src/lyricwiki/lyricwiki.cc:227 src/lyricwiki/lyricwiki.cc:253
-#: src/lyricwiki-qt/lyricwiki.cc:232 src/lyricwiki-qt/lyricwiki.cc:258
+#: src/lyrics-common/chart_lyrics_provider.cc:100
+#: src/lyrics-common/chart_lyrics_provider.cc:157
+#: src/lyrics-common/lyrics_ovh_provider.cc:57
 #, c-format
 msgid "Unable to parse %s"
-msgstr "Δεν είναι δυνατή η ανάλυση του %s"
+msgstr "Αδύνατη η ανάλυση του %s"
 
-#: src/lyricwiki/lyricwiki.cc:259 src/lyricwiki-qt/lyricwiki.cc:264
+#: src/lyrics-common/chart_lyrics_provider.cc:121
+#: src/lyrics-common/chart_lyrics_provider.cc:194
+#: src/lyrics-common/lyrics_ovh_provider.cc:88
 msgid "Looking for lyrics ..."
-msgstr "Αναζήτηση για στοίχους ..."
+msgstr "Αναζήτηση για στίχους ..."
+
+#: src/lyrics-common/preferences.h:43
+msgid "Nowhere"
+msgstr "Πουθενά"
+
+#: src/lyrics-common/preferences.h:49
+msgid "Artist is truncated at the start, Title -- at the end"
+msgstr ""
+" Ο καλλιτέχνης περικόπτεται στην αρχή, ο τίτλος -- στο τέλος "
+
+#: src/lyrics-common/preferences.h:50
+msgid "Chars to truncate on:"
+msgstr "Χαρακτήρες για περικοπή: "
+
+#: src/lyrics-common/preferences.h:54
+msgid "Chars are ORed in RegExp, surrounded by whitespace"
+msgstr ""
+" Οι χαρακτήρες είναι ORed στο RegExp, περιτριγυρισμένοι από κενό "
+"διάστημα "
+
+#: src/lyrics-common/preferences.h:55
+msgid "Chars to split on:"
+msgstr "Χαρακτήρες για διαχωρισμό:"
 
-#: src/lyricwiki/lyricwiki.cc:267 src/lyricwiki-qt/lyricwiki.cc:272
-msgid "Missing song metadata"
-msgstr "Λείπουν μεταδεδομένα τραγουδιού"
+#: src/lyrics-common/preferences.h:56
+msgid "Further truncate those on chars"
+msgstr "Πρόσθετη περικοπή αυτών των χαρακτήρων"
 
-#: src/lyricwiki/lyricwiki.cc:278 src/lyricwiki-qt/lyricwiki.cc:283
-msgid "Connecting to lyrics.wikia.com ..."
-msgstr "Σύνδεση με lyrics.wikia.com ..."
+#: src/lyrics-common/preferences.h:62
+msgid "General"
+msgstr "Γενικά"
 
-#: src/lyricwiki-qt/lyricwiki.cc:55
-msgid "LyricWiki Plugin (Qt)"
-msgstr "Πρόσθετο LyricWiki (Qt)"
+#: src/lyrics-common/preferences.h:63
+msgid "Split title into artist and title on chars"
+msgstr "Διαχωρισμός ονόματος καλλιτέχνη και χαρακτήρων τίτλου"
 
-#: src/m3u/m3u.cc:32
+#: src/lyrics-common/preferences.h:66
+msgid "Sources"
+msgstr "Διαδικτυακές πηγές"
+
+#: src/lyrics-common/preferences.h:67
+msgid "Use embedded lyrics (from Lyrics tag)"
+msgstr "Χρήση ενσωματωμένων στίχων (από Lyrics tag)"
+
+#: src/lyrics-common/preferences.h:69
+msgid "Fetch lyrics from internet:"
+msgstr "Κατέβασμα στίχων από το διαδίκτυο:"
+
+#: src/lyrics-common/preferences.h:72
+msgid "Store fetched lyrics in local cache"
+msgstr "Αποθήκευση στίχων σε τοπική μνήμη cache"
+
+#: src/lyrics-common/preferences.h:74
+msgid "Local Storage"
+msgstr "Τοπική αποθήκευση"
+
+#: src/lyrics-common/preferences.h:75
+msgid "Load lyric files (.lrc) from local storage"
+msgstr "Φόρτωση στίχων (.lrc) τοπικά"
+
+#: src/lyrics-common/utils.cc:54 src/ui-common/dialogs-qt.cc:63
+msgid "Error"
+msgstr "Σφάλμα"
+
+#: src/lyrics-common/utils.cc:60
+msgid "Lyrics could not be found."
+msgstr "Δεν βρέθηκαν στίχοι."
+
+#: src/lyrics-common/utils.cc:142
+msgid "Missing title and/or artist."
+msgstr "Λείπει ο τίτλος και/ή ο καλλιτέχνης. "
+
+#: src/lyrics-gtk/lyrics-gtk.cc:37 src/lyrics-qt/lyrics-qt.cc:50
+msgid "Lyrics"
+msgstr "Στίχοι"
+
+#: src/lyrics-gtk/lyrics-gtk.cc:189 src/lyrics-qt/lyrics-qt.cc:171
+msgid "Edit Lyrics ..."
+msgstr "Επεξεργασία στίχων ..."
+
+#: src/lyrics-gtk/lyrics-gtk.cc:195 src/lyrics-qt/lyrics-qt.cc:178
+msgid "Save Locally"
+msgstr "Αποθήκευση τοπικά"
+
+#: src/lyrics-gtk/lyrics-gtk.cc:201 src/lyrics-qt/lyrics-qt.cc:186
+msgid "Refresh"
+msgstr "Ανανέωση"
+
+#: src/m3u/m3u.cc:33
 msgid "M3U Playlists"
-msgstr "Λίστες Αναπαραγωγής M3U"
+msgstr "Λίστες αναπαραγωγής M3U"
 
 #: src/metronom/metronom.cc:44
 msgid "Tact Generator"
 msgstr "Tact Generator"
 
-#: src/metronom/metronom.cc:147
+#: src/metronom/metronom.cc:145
 #, c-format
 msgid "Tact generator: %d bpm"
 msgstr "Tact generator: %d bpm"
 
-#: src/metronom/metronom.cc:149
+#: src/metronom/metronom.cc:147
 #, c-format
 msgid "Tact generator: %d bpm %d/%d"
 msgstr "Tact generator: %d bpm %d/%d"
 
-#: src/metronom/metronom.cc:237
+#: src/metronom/metronom.cc:235
 msgid ""
 "A Tact Generator by Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
 "\n"
@@ -2434,29 +2622,29 @@
 "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"
+"Ένα Tact Generator από τον 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"
+"Για να το χρησιμοποιήσετε, προσθέστε ένα URL: tact://beats*num/den\n"
+"π.χ. tact://77 για να παίξει 77 beats ανά λεπτό\n"
+"ή tact://60*3/4 για να παίξει 60 bpm in 3/4 tacts"
 
-#: src/mixer/mixer.cc:38
+#: src/mixer/mixer.cc:43
 msgid "Channel Mixer"
-msgstr "Μείκτης Καναλιών"
+msgstr "Μείκτης καναλιών"
 
-#: src/mixer/mixer.cc:202
+#: src/mixer/mixer.cc:255
 msgid ""
 "Channel Mixer Plugin for Audacious\n"
 "Copyright 2011-2012 John Lindgren and Michał Lipski"
 msgstr ""
-"Channel Mixer Πρόσθετο για το Audacious\n"
-"Copyright 2011-2012 John Lindgren και Michał Lipski"
+"Πρόσθετο Μείκτης καναλιών για το Audacious\n"
+"Πνευματικά δικαιώματα 2011-2012 John Lindgren και Michał Lipski"
 
-#: src/mixer/mixer.cc:206
+#: src/mixer/mixer.cc:259
 msgid "Channel Mixer"
-msgstr "Μείκτης Καναλιών:"
+msgstr "Μείκτης καναλιών"
 
-#: src/mixer/mixer.cc:207
+#: src/mixer/mixer.cc:260
 msgid "Output channels:"
 msgstr "Κανάλια εξόδου:"
 
@@ -2466,170 +2654,178 @@
 
 #: src/mms/mms.cc:82
 msgid "Error connecting to MMS server"
-msgstr "Σφάλμα κατά τη σύνδεση με τον διακομιστή MMS"
+msgstr "Σφάλμα κατά τη σύνδεση με το διακομιστή MMS"
 
-#: src/modplug/modplugbmp.h:53
+#: src/modplug/modplugbmp.h:57
 msgid "ModPlug (Module Player)"
-msgstr "ModPlug (Module Player)"
-
-#: src/modplug/plugin_main.cc:53
-msgid "Resolution"
-msgstr "Ανάλυση"
-
-#: src/modplug/plugin_main.cc:54
-msgid "8-bit"
-msgstr "8-bit"
+msgstr "ModPlug (Αναπαραγωγή)"
 
 #: src/modplug/plugin_main.cc:55
-msgid "16-bit"
-msgstr "16-bit"
-
-#: src/modplug/plugin_main.cc:56
 msgid "Channels"
 msgstr "Κανάλια"
 
-#: src/modplug/plugin_main.cc:60
+#: src/modplug/plugin_main.cc:59
 msgid "Nearest (fastest)"
 msgstr "Πλησιέστερη (γρηγορότερα)"
 
-#: src/modplug/plugin_main.cc:61
+#: src/modplug/plugin_main.cc:60
 msgid "Linear (fast)"
 msgstr "Γραμμική (γρήγορα)"
 
-#: src/modplug/plugin_main.cc:62
+#: src/modplug/plugin_main.cc:61
 msgid "Spline (good)"
-msgstr "Σφηνός (καλα)"
+msgstr "Spline (καλά)"
 
-#: src/modplug/plugin_main.cc:63
+#: src/modplug/plugin_main.cc:62
 msgid "Polyphase (best)"
-msgstr "Πολυφασικοί (καλύτερη)"
+msgstr "Πολυφασική (καλύτερη)"
 
-#: src/modplug/plugin_main.cc:64
+#: src/modplug/plugin_main.cc:63
 msgid "Sample rate"
 msgstr "Ρυθμός δειγματοληψίας"
 
-#: src/modplug/plugin_main.cc:65
+#: src/modplug/plugin_main.cc:64
 msgid "22 kHz"
 msgstr "22 kHz"
 
-#: src/modplug/plugin_main.cc:66
+#: src/modplug/plugin_main.cc:65
 msgid "44 kHz"
 msgstr "44 kHz"
 
-#: src/modplug/plugin_main.cc:67
+#: src/modplug/plugin_main.cc:66
 msgid "48 kHz"
 msgstr "48 kHz"
 
-#: src/modplug/plugin_main.cc:68
+#: src/modplug/plugin_main.cc:67
 msgid "96 kHz"
 msgstr "96 kHz"
 
-#: src/modplug/plugin_main.cc:72 src/modplug/plugin_main.cc:77
-#: src/modplug/plugin_main.cc:82
+#: src/modplug/plugin_main.cc:71 src/modplug/plugin_main.cc:76
+#: src/modplug/plugin_main.cc:81
 msgid "Level:"
 msgstr "Επίπεδο:"
 
-#: src/modplug/plugin_main.cc:78
+#: src/modplug/plugin_main.cc:77
 msgid "Cutoff:"
-msgstr "Αποκοπη:"
+msgstr "Αποκοπή:"
 
-#: src/modplug/plugin_main.cc:91
+#: src/modplug/plugin_main.cc:90
 msgid "Reverb"
-msgstr "Αντίχηση"
+msgstr "Αντήχηση"
 
-#: src/modplug/plugin_main.cc:94
+#: src/modplug/plugin_main.cc:93
 msgid "Bass Boost"
 msgstr "Ενίσχυση μπάσων"
 
-#: src/modplug/plugin_main.cc:97
+#: src/modplug/plugin_main.cc:96
 msgid "Surround"
-msgstr "Περιφερειακό"
+msgstr "Surround"
 
-#: src/modplug/plugin_main.cc:100
+#: src/modplug/plugin_main.cc:99
 msgid "Preamp"
 msgstr "Προενισχυτής"
 
-#: src/modplug/plugin_main.cc:107
+#: src/modplug/plugin_main.cc:106
 msgid "Oversample"
 msgstr "Oversample"
 
-#: src/modplug/plugin_main.cc:108
+#: src/modplug/plugin_main.cc:107
 msgid "Noise reduction"
 msgstr "Μείωση θορύβου"
 
-#: src/modplug/plugin_main.cc:109
+#: src/modplug/plugin_main.cc:108
 msgid "Play Amiga MODs"
-msgstr "Αναπαραγωγή MOD του Amiga"
+msgstr "Αναπαραγωγή MODs του Amiga"
 
-#: src/modplug/plugin_main.cc:110
+#: src/modplug/plugin_main.cc:109
 msgid "Repeat"
 msgstr "Επανάληψη"
 
-#: src/modplug/plugin_main.cc:111
+#: src/modplug/plugin_main.cc:110
 msgid "Repeat count:"
-msgstr "Μέτρηση επαναλήψεων:"
+msgstr "Αριθμός επαναλήψεων:"
 
-#: src/modplug/plugin_main.cc:112
+#: src/modplug/plugin_main.cc:111
 msgid "To repeat forever, set the repeat count to -1."
-msgstr "Για διαρκεις επαναλυψη, ορίστε την καταμέτρηση επαναλήψεων στο -1."
+msgstr "Για συνεχόμενη επανάληψη, ορίστε το μετρητή επαναλήψεων στο -1."
 
-#: src/modplug/plugin_main.cc:125 src/sid/xs_config.cc:106
+#: src/modplug/plugin_main.cc:124 src/sid/xs_config.cc:106
 msgid "These settings will take effect when Audacious is restarted."
-msgstr "Αυτές οι ρυθμίσεις θα τεθούν σε ισχύ όταν το Audacious επανεκκινηθει."
+msgstr "Αυτές οι ρυθμίσεις θα τεθούν σε ισχύ όταν επανεκκινηθεί το Audacious."
+
+#: src/moonstone/main_window.cc:72 src/moonstone/main_window.cc:73
+#: src/qtui/main_window.cc:159 src/qtui/main_window.cc:160
+#: src/skins/menus.cc:107 src/skins-qt/menus.cc:98
+msgid "Stop After This Song"
+msgstr "Διακοπή στο τέλος του κομματιού"
+
+#: src/moonstone/moonstone.cc:39
+msgid "Moonstone"
+msgstr "Moonstone"
+
+#: src/moonstone/playlist_header.cc:212 src/qtui/playlist_header.cc:258
+msgid "Reset to Defaults"
+msgstr "Επαναφορά προεπιλογών"
+
+#: src/moonstone/playlist_model.cc:38 src/qtui/playlist_header.cc:232
+msgid "Now Playing"
+msgstr "Αναπαράγεται τώρα"
+
+#: src/moonstone/playlist_selection.cc:66
+#: src/playlist-manager/playlist-manager.cc:201
+#: src/playlist-manager-qt/playlist-manager-qt.cc:190
+msgid "Entries"
+msgstr "Καταχωρήσεις"
 
 #: src/mpg123/mpg123.cc:54
 msgid "MPG123 Plugin"
 msgstr "Πρόσθετο MPG123"
 
-#: src/mpg123/mpg123.cc:83
-msgid "Advanced"
-msgstr "Προχωρημένη"
-
-#: src/mpg123/mpg123.cc:84
+#: src/mpg123/mpg123.cc:82
 msgid "Use accurate length calculation (slow)"
-msgstr "Χρήση ακριβή υπολογισμού μήκους (αργή)"
+msgstr "Χρήση υπολογισμού της διάρκειας με ακρίβεια (αργό)"
 
-#: src/mpg123/mpg123.cc:248
+#: src/mpg123/mpg123.cc:260
 msgid "Surround"
-msgstr "Περιφερειακό"
+msgstr "Surround"
 
-#: src/mpris2/plugin.cc:39
+#: src/mpris2/plugin.cc:40
 msgid "MPRIS 2 Server"
-msgstr "Εξυπηρετητής MPRIS 2"
+msgstr "Διακομιστής MPRIS 2"
 
-#: src/neon/neon.cc:97
+#: src/neon/neon.cc:102
 msgid "Neon HTTP/HTTPS Plugin"
 msgstr "Πρόσθετο Neon HTTP/HTTPS"
 
-#: src/neon/neon.cc:521
+#: src/neon/neon.cc:526
 msgid "Error parsing redirect"
 msgstr "Σφάλμα ανάλυσης ανακατεύθυνσης"
 
-#: src/neon/neon.cc:535
+#: src/neon/neon.cc:540
 msgid "Unknown HTTP error"
 msgstr "Άγνωστο σφάλμα HTTP"
 
-#: src/neon/neon.cc:569
+#: src/neon/neon.cc:614
 msgid "Error parsing URL"
 msgstr "Άγνωστο σφάλμα URL"
 
-#: src/neon/neon.cc:632
+#: src/neon/neon.cc:687
 msgid "Too many redirects"
 msgstr "Πάρα πολλές ανακατευθύνσεις"
 
-#: src/notify/event.cc:64
+#: src/notify/event.cc:97
 msgid "Stopped"
 msgstr "Διακόπηκε"
 
-#: src/notify/event.cc:64
+#: src/notify/event.cc:97
 msgid "Audacious is not playing."
 msgstr "Το Audacious δεν αναπαράγει."
 
-#: src/notify/notify.cc:42
+#: src/notify/notify.cc:39
 msgid "Desktop Notifications"
 msgstr "Ειδοποιήσεις στην επιφάνεια εργασίας"
 
-#: src/notify/notify.cc:60
+#: src/notify/notify.cc:57
 msgid ""
 "Desktop Notifications Plugin for Audacious\n"
 "Copyright (C) 2010 Maximilian Bogner\n"
@@ -2648,55 +2844,100 @@
 "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 και ο Jean-Alexandre Anglès d'Auriac\n"
+"Πρόσθετο Ειδοποιήσεις στην επιφάνεια εργασίας, για το Audacious\n"
+"Πνευματικά δικαιώματα (C) 2010 Maximilian Bogner\n"
+"Πνευματικά δικαιώματα (C) 2011-2013 John Lindgren και ο Jean-Alexandre "
+"Anglès d'Auriac\n"
+"\n"
+"Το πρόσθετο αυτό είναι ελεύθερο λογισμικό. Επιτρέπεται η αναδιανομή ή/και η "
+"τροποποίησή του υπό τους όρους της άδειας GNU General Public, όπως αυτή "
+"δημοσιεύεται από το Free Software Foundation είτε την έκδοση 2 είτε (κατά "
+"την επιλογή σας) σε οποιαδήποτε μεταγενέστερη έκδοση της.\n"
+"\n"
+"Διανέμεται με την ελπίδα ότι θα είναι χρήσιμο, αλλά ΧΩΡΙΣ ΟΠΟΙΑΔΗΠΟΤΕ "
+"ΕΓΓΥΗΣΗ, χωρίς καν την σιωπηρή εγγύηση ΕΜΠΟΡΕΥΣΙΜΟΤΗΤΑΣ ή ΚΑΤΑΛΛΗΛΟΤΗΤΑΣ ΓΙΑ "
+"ΕΝΑ ΣΥΓΚΕΚΡΙΜΕΝΟ ΣΚΟΠΟ. Για περισσότερες λεπτομέρειες δείτε την άδεια GNU "
+"General Public.\n"
 "\n"
-"Αυτό το πρόγραμμα είναι ελεύθερο λογισμικό. Επιτρέπεται η αναδιανομή ή / και "
-"τροποποίησή του υπό τους όρους της GNU General Public License όπως αυτή έχει "
-"δημοσιευθεί από το Ίδρυμα Ελεύθερου Λογισμικού είτε την έκδοση 2 της Άδειας, "
-"είτε (κατ 'επιλογή σας) οποιαδήποτε μεταγενέστερη έκδοση.\n"
-"\n"
-"Αυτό το πρόγραμμα διανέμεται με την ελπίδα ότι θα είναι χρήσιμο,\n"
-"αλλά ΧΩΡΙΣ ΚΑΜΙΑ ΕΓΓΥΗΣΗ? χωρίς καν την υπονοούμενη εγγύηση της "
-"ΕΜΠΟΡΕΥΣΙΜΟΤΗΤΑΣ ή ΚΑΤΑΛΛΗΛΟΤΗΤΑΣ ΓΙΑ ΕΝΑ ΣΥΓΚΕΚΡΙΜΕΝΟ ΣΚΟΠΟ. Δείτε το GNU "
-"General Public License για περισσότερες λεπτομέρειες.\n"
-"\n"
-"Θα πρέπει να έχετε λάβει ένα αντίγραφο της GNU General Άδειας Δημόσιας "
-"Χρήσης\n"
-"μαζί με αυτό το πρόγραμμα. Εάν όχι, κοιταξτε εδω <http://www.gnu.org/"
+"Μαζί με το πρόγραμμα αυτό θα πρέπει να έχετε λάβει ένα αντίγραφο της άδειας "
+"δημόσιας χρήσης GNU General. Εάν όχι, κοιτάξτε εδώ <http://www.gnu.org/"
 "licenses/>."
 
-#: src/notify/notify.cc:110
+#: src/notify/notify.cc:104
 msgid "Show playback controls"
-msgstr "Εμφάνιση ελέγχου αναπαραγωγής"
+msgstr "Εμφάνιση κουμπιών αναπαραγωγής"
 
-#: src/notify/notify.cc:112
+#: src/notify/notify.cc:106
 msgid "Always show notification"
-msgstr "Να εμφανίζεται πάντα κοινοποίηση"
+msgstr "Να εμφανίζεται πάντα αναδυόμενη ειδοποίηση"
 
-#: src/notify/notify.cc:114
+#: src/notify/notify.cc:108
 msgid "Include album name in notification"
-msgstr "Συμπερίληψη όνοματος του άλμπουμ στην κοινοποίηση"
+msgstr "Να περιλαμβάνεται το όνομα του άλμπουμ στην ειδοποίηση"
+
+#: src/notify/notify.cc:110
+msgid "Custom notification duration:"
+msgstr "Διάρκεια ειδοποίησης:"
 
-#: src/notify/osd.cc:58
+#: src/notify/osd.cc:74
 msgid "Show"
 msgstr "Εμφάνιση"
 
-#: src/notify/osd.cc:66 src/qtui/main_window.cc:178
-#: src/qtui/main_window.cc:179 src/skins/menus.cc:88
-msgid "Pause"
-msgstr "Παύση"
+#: src/openmpt/mpt.cc:50
+msgid "OpenMPT (Module Player)"
+msgstr "Άνοιγμα MPT (Module Player)"
 
-#: src/notify/osd.cc:73 src/qtui/main_window.cc:72 src/skins/menus.cc:91
-msgid "Next"
-msgstr "Επόμενο"
+#: src/openmpt/mpt.cc:132
+msgid ""
+"Module player based on libopenmpt\n"
+"\n"
+"Written by: Chris Spiegel <cspiegel@gmail.com>"
+msgstr ""
+"Ο Module player βασίζεται στο libopenmpt\n"
+"\n"
+"Γράφτηκε από τον: Chris Spiegel <cspiegel@gmail.com>"
+
+#: src/openmpt/mpt.cc:151
+msgid "Stereo separation:"
+msgstr "Διαχωρισμός στέρεο:"
+
+#: src/openmpt/mpt.cc:153
+msgid "% (0=mono, 100=default, 200=full)"
+msgstr "% (0=μονοφωνικό, 100=προεπιλογή, 200=πλήρες)"
 
-#: src/oss4/oss.h:93
+#: src/openmpt/mpt.cc:157
+msgid "Interpolation:"
+msgstr "Παρεμβολή:"
+
+#: src/openmpt/mptwrap.h:51 src/soxr/sox-resampler.cc:189 src/xsf/plugin.cc:437
+msgid "Linear"
+msgstr "Γραμμική"
+
+#: src/openmpt/mptwrap.h:52
+msgid "Cubic"
+msgstr "Κυβική"
+
+#: src/openmpt/mptwrap.h:53
+msgid "Windowed sinc"
+msgstr "Ημιτονοειδής παρεμβολή κορυφής (windowed)"
+
+#: src/opus/opus.cc:39
+msgid "Opus Decoder"
+msgstr "Αποκωδικοποιητής ήχου Opus"
+
+#: src/opus/opus.cc:336
+msgid ""
+"Opus Decoder Plugin for Audacious\n"
+"Copyright 2022 Thomas Lange"
+msgstr ""
+"Πρόσθετο Αποκωδικοποητής ήχου Opus για το Audacious\n"
+"Πνευματικά δικαιώματα 2022 Thomas Lange"
+
+#: src/oss4/oss.h:70
 msgid "OSS4 Output"
 msgstr "Έξοδος OSS4"
 
-#: src/oss4/oss.h:95
+#: src/oss4/oss.h:72
 msgid "OSS3 Output"
 msgstr "Έξοδος OSS3"
 
@@ -2704,29 +2945,31 @@
 msgid "Default device"
 msgstr "Προεπιλεγμένη συσκευή"
 
-#: src/oss4/plugin.cc:77
+#: src/oss4/plugin.cc:78
 msgid "Audio device:"
 msgstr "Συσκευή ήχου:"
 
-#: src/oss4/plugin.cc:80
+#: src/oss4/plugin.cc:81
 msgid "Use alternate device:"
-msgstr "Χρησιμοποίησε εναλλακτική συσκευή:"
+msgstr "Χρήση εναλλακτικής συσκευής:"
 
-#: src/oss4/plugin.cc:84
+#: src/oss4/plugin.cc:85
 msgid "Save volume between sessions."
-msgstr "Αποθήκευση έντασης μεταξύ των συνεδριών."
+msgstr "Αποθήκευση της έντασης μεταξύ των συνεδριών."
 
-#: src/oss4/plugin.cc:86
+#: src/oss4/plugin.cc:87
 msgid "Enable format conversions made by the OSS software."
 msgstr ""
-"Ενεργοποίηση μετατροπων που πραγματοποιούνται από το λογισμικό του OSS."
+"Ενεργοποίηση των μετατροπών μορφής που πραγματοποιούνται από το λογισμικό "
+"OSS."
 
-#: src/oss4/plugin.cc:88
+#: src/oss4/plugin.cc:89
 msgid "Enable exclusive mode to prevent virtual mixing."
 msgstr ""
-"Ενεργοποίηση αποκλειστικής λειτουργίας για να αποφύγετε την εικονική ανάμιξη."
+"Ενεργοποίηση της αποκλειστικής λειτουργίας για να αποφεύγεται η εικονική "
+"ανάμιξη."
 
-#: src/oss4/plugin.cc:100
+#: src/oss4/plugin.cc:101
 msgid ""
 "OSS4 Output Plugin for Audacious\n"
 "Copyright 2010-2012 Michał Lipski\n"
@@ -2734,82 +2977,117 @@
 "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 για το Audacious\n"
+"Πρόσθετο Έξοδος OSS4 για το Audacious\n"
 "Πνευματικά δικαιώματα 2010-2012 Michał Lipski\n"
 "\n"
 "Θα ήθελα να ευχαριστήσω τους ανθρώπους του #audacious, ειδικά τους Tony "
-"Vroon και John Lindgren και φυσικά τους δημιουργούς του προηγούμενου OSS "
-"πρόσθετου."
+"Vroon και John Lindgren και φυσικά τους δημιουργούς του προηγούμενου "
+"πρόσθετου OSS."
 
-#: src/playlist-manager/playlist-manager.cc:37
-msgid "Playlist Manager"
-msgstr "Διαχείριση Λίστας Τραγουδιών"
+#: src/pipewire/pipewire.cc:44
+msgid "PipeWire Output"
+msgstr "Έξοδος PipeWire"
 
-#: src/playlist-manager/playlist-manager.cc:226
-msgid "Entries"
-msgstr "Καταχωρήσεις"
+#: src/pipewire/pipewire.cc:118
+msgid ""
+"PipeWire Output Plugin for Audacious\n"
+"Copyright 2022 Thomas Lange\n"
+"\n"
+"Based on the PipeWire Output Plugin for Qmmp\n"
+"Copyright 2021 Ilya Kotov"
+msgstr ""
+"Πρόσθετο Έξοδος PipeWire για το Audacious\n"
+"Πνευματικά δικαιώματα 2022 Thomas Lange\n"
+"\n"
+"Βασισμένο στο πρόσθετο Έξοδος PipeWire για το Qmmp\n"
+"Πνευματικά δικαιώματα 2021 Ilya Kotov"
+
+#: src/pipewire/pipewire.cc:408 src/skins/menus.cc:88 src/skins-qt/menus.cc:79
+msgid "Playback"
+msgstr "Αναπαραγωγή"
+
+#: src/playlist-manager/playlist-manager.cc:38
+#: src/playlist-manager-qt/playlist-manager-qt.cc:42
+msgid "Playlist Manager"
+msgstr "Διαχείριση λίστας τραγουδιών"
 
-#: src/playlist-manager/playlist-manager.cc:245
+#: src/playlist-manager/playlist-manager.cc:221
+#: src/playlist-manager-qt/playlist-manager-qt.cc:356
 msgid "_Remove"
-msgstr "Αφαίρεση"
+msgstr "Α_φαίρεση"
 
-#: src/playlist-manager/playlist-manager.cc:246
+#: src/playlist-manager/playlist-manager.cc:222
+#: src/playlist-manager-qt/playlist-manager-qt.cc:351
 msgid "Ren_ame"
-msgstr "Μετονομασία"
+msgstr "Μετ_ονομασία"
 
 #: src/pls/pls.cc:35
 msgid "PLS Playlists"
-msgstr "Λίστες Αναπαραγωγής PLS"
+msgstr "Λίστες αναπαραγωγής PLS"
 
-#: src/psf/plugin.cc:45
+#: src/psf/plugin.cc:53
 msgid "OpenPSF PSF1/PSF2 Decoder"
 msgstr "Αποκωδικοποιητής OpenPSF PSF1/PSF2"
 
-#: src/pulse_audio/pulse_audio.cc:38
+#: src/psf/plugin.cc:270
+msgid "OpenPSF Configuration"
+msgstr "OpenPSF Ρυθμίσεις"
+
+#: src/psf/plugin.cc:271 src/xsf/plugin.cc:444
+msgid "Ignore length from file"
+msgstr "Παράβλεψη διάρκειας αρχείου"
+
+#: src/pulse/pulse_audio.cc:42
 msgid "PulseAudio Output"
 msgstr "Έξοδος PulseAudio"
 
-#: src/pulse_audio/pulse_audio.cc:611
+#: src/pulse/pulse_audio.cc:84
+msgid "Context name:"
+msgstr "Όνομα περιεχομένου:"
+
+#: src/pulse/pulse_audio.cc:86
+msgid "Stream name:"
+msgstr "Όνομα ροής:"
+
+#: src/pulse/pulse_audio.cc:596
 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."
+"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 ""
-"Audacious PulseAudio Output Plugin\n"
+"Πρόσθετο Έξοδος PulseAudio\n"
+"\n"
+"Το πρόσθετο αυτό είναι ελεύθερο λογισμικό. Επιτρέπεται η αναδιανομή ή/και η "
+"τροποποίησή του υπό τους όρους της άδειας GNU General Public, όπως αυτή "
+"δημοσιεύεται από το Free Software Foundation είτε την έκδοση 2 είτε (κατά "
+"την επιλογή σας) σε οποιαδήποτε μεταγενέστερη έκδοση της.\n"
+"\n"
+"Διανέμεται με την ελπίδα ότι θα είναι χρήσιμο, αλλά ΧΩΡΙΣ ΟΠΟΙΑΔΗΠΟΤΕ "
+"ΕΓΓΥΗΣΗ, χωρίς καν την σιωπηρή εγγύηση ΕΜΠΟΡΕΥΣΙΜΟΤΗΤΑΣ ή ΚΑΤΑΛΛΗΛΟΤΗΤΑΣ ΓΙΑ "
+"ΕΝΑ ΣΥΓΚΕΚΡΙΜΕΝΟ ΣΚΟΠΟ. Για περισσότερες λεπτομέρειες δείτε την άδεια GNU "
+"General Public.\n"
 "\n"
-"Αυτό το πρόγραμμα είναι ελεύθερο λογισμικό. Επιτρέπεται η αναδιανομή ή / και "
-"τροποποίησή του υπό τους όρους της GNU General Public License όπως αυτή έχει "
-"δημοσιευθεί από το Ίδρυμα Ελεύθερου Λογισμικού είτε την έκδοση 2 της Άδειας, "
-"είτε (κατ 'επιλογή σας) οποιαδήποτε μεταγενέστερη έκδοση.\n"
-"\n"
-"Αυτό το πρόγραμμα διανέμεται με την ελπίδα ότι θα είναι χρήσιμο,\n"
-"αλλά ΧΩΡΙΣ ΚΑΜΙΑ ΕΓΓΥΗΣΗ? χωρίς καν την υπονοούμενη εγγύηση της "
-"ΕΜΠΟΡΕΥΣΙΜΟΤΗΤΑΣ ή ΚΑΤΑΛΛΗΛΟΤΗΤΑΣ ΓΙΑ ΕΝΑ ΣΥΓΚΕΚΡΙΜΕΝΟ ΣΚΟΠΟ. Δείτε το GNU "
-"General Public License για περισσότερες λεπτομέρειες.\n"
-"\n"
-"Θα πρέπει να έχετε λάβει ένα αντίγραφο της GNU General Άδειας Δημόσιας "
-"Χρήσης μαζί με αυτό το πρόγραμμα. Εάν όχι, γράψτε στο Ελεύθερο Λογισμικό "
-"Foundation, Inc., 51 Franklin Street, στον πέμπτο όροφο, Boston, MA "
-"02110-1301, ΗΠΑ."
+"Μαζί με αυτό το πρόγραμμα θα πρέπει να έχετε λάβει ένα αντίγραφο της άδειας "
+"GNU General Public. Εάν όχι, γράψτε στο Free Software Foundation, Inc., 51 "
+"Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 
-#: src/qtaudio/qtaudio.cc:49
+#: src/qtaudio/qtaudio.cc:53
 msgid "QtMultimedia Output"
-msgstr "Έξοδος QtMultimedia "
+msgstr "Έξοδος QtMultimedia"
 
-#: src/qtaudio/qtaudio.cc:77
+#: src/qtaudio/qtaudio.cc:84
 msgid ""
 "QtMultimedia Audio Output Plugin for Audacious\n"
 "Copyright 2014 William Pitcock\n"
@@ -2817,70 +3095,133 @@
 "Based on SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
 msgstr ""
-"QtMultimedia Audio Output Πρόσθετο για το Audacious\n"
-"Copyright 2014 William Pitcock\n"
-"Με βάση το SDL Output Πρόσθετο για το Audacious\n"
+"Πρόσθετο Έξοδος QtMultimedia Audio για το Audacious\n"
+"Πνευματικά δικαιώματα 2014 William Pitcock\n"
+"\n"
+"Με βάση το Πρόσθετο SDL Output για το Audacious\n"
 "Πνευματικά δικαιώματα 2010 John Lindgren"
 
-#: src/qtui/dialog_windows.cc:31
-msgid "Working ..."
-msgstr "Εργασία ..."
+#: src/qtglspectrum/gl-spectrum.cc:41
+msgid ""
+"OpenGL Spectrum Analyzer for Audacious\n"
+"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
+"Copyright 2014, 2020 Ariadne Conill\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, και Carlo "
+"Bramini\n"
+"Πνευματικά δικαιώματα 2014, 2020 Ariadne Conill\n"
+"\n"
+"Βασισμένο στο πρόσθετο XMMS:\n"
+"Πνευματικά δικαιώματα 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas "
+"Nilsson, και 4Front Technologies\n"
+"\n"
+"Άδεια: GPLv2+"
 
-#: src/qtui/filter_input.cc:44 src/skins/ui_playlist.cc:221
-msgid "Search"
-msgstr "Αναζήτηση"
+#: src/qthotkey/gui.cc:177
+msgid "Press a key combination inside a text field."
+msgstr "Πατήστε έναν συνδυασμό πλήκτρων μέσα σε ένα πεδίο κειμένου."
 
-#: src/qtui/main_window_actions.cc:94
+#: src/qthotkey/plugin.cc:105
+msgid ""
+"Global Hotkey Plugin\n"
+"Control the player with global key combinations or multimedia keys.\n"
+"\n"
+"Copyright (C) 2020 i.Dark_Templar <darktemplar@dark-templar-archives.net>\n"
+"Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n"
+"\n"
+"Contributors 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) 2020 i.Dark_Templar <darktemplar@dark-templar-"
+"archives.net>\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/qtui/menus.cc:109
 msgid "_Open Folder ..."
-msgstr "Άνοιγμα Φακέλου ..."
+msgstr "Άνοι_γμα φακέλου ..."
 
-#: src/qtui/main_window_actions.cc:96
+#: src/qtui/menus.cc:115
 msgid "_Add Folder ..."
-msgstr "Προσθήκη Φακέλου ..."
+msgstr "Πρ_οσθήκη φακέλου ..."
 
-#: src/qtui/main_window_actions.cc:101
+#: src/qtui/menus.cc:128
 msgid "_Log Inspector ..."
-msgstr "Επιθεωρητής σύνδεσης ..."
+msgstr "_Καταγραφές ..."
 
-#: src/qtui/main_window.cc:64
-msgid "Open Files"
-msgstr "Άνοιγμα αρχείων"
+#: src/qtui/menus.cc:220
+msgid "_Find ..."
+msgstr "Ανα_ζήτηση ..."
 
-#: src/qtui/main_window.cc:66
-msgid "Add Files"
-msgstr "Προσθήκη αρχείων"
+#: src/qtui/menus.cc:256 src/skins/menus.cc:80 src/skins-qt/menus.cc:70
+msgid "Audio Settings ..."
+msgstr "Ρυθμίσεις ήχου ..."
 
-#: src/qtui/main_window.cc:71 src/skins/menus.cc:90
-msgid "Previous"
-msgstr "Προηγούμενο"
+#: src/qtui/playlist_model.cc:188
+msgid "Q#"
+msgstr "Σ#"
 
-#: src/qtui/main_window.cc:77 src/skins/menus.cc:82
-msgid "Repeat"
-msgstr "Επανάληψη"
+#: src/qtui/playlist_model.cc:190
+msgid "T#"
+msgstr "Κ#"
 
-#: src/qtui/main_window.cc:79 src/skins/menus.cc:83
-msgid "Shuffle"
-msgstr "Ανακάτεμα"
+#: src/qtui/playlist_model.cc:192
+msgid "C#"
+msgstr "Α#"
+
+#: src/qtui/playlist_model.cc:194
+msgid "D#"
+msgstr "Δ#"
 
-#: src/qtui/qtui.cc:42
+#: src/qtui/qtui.cc:40
 msgid "Qt Interface"
 msgstr "Διεπαφή Qt"
 
+#: src/qtui/search_bar.cc:46
+msgid "Search playlist"
+msgstr "Έρευνα λίστας αναπαραγωγής"
+
+#: src/qtui/settings.cc:79
+msgid "Use bold font for column headers"
+msgstr "Έντονη γραμματοσειρά στις επικεφαλίδες στηλών"
+
 #: src/resample/resample.cc:43
 msgid "Sample Rate Converter"
-msgstr "Sample Rate Converter"
+msgstr "Μετατροπή ρυθμού δειγματοληψίας"
 
 #: src/resample/resample.cc:183
 msgid ""
 "Sample Rate Converter Plugin for Audacious\n"
 "Copyright 2010-2012 John Lindgren"
 msgstr ""
-"Sample Rate Converter Πρόσθετο για το Audacious\n"
+"Πρόσθετο Μετατροπή ρυθμού δειγματοληψίας για το Audacious\n"
 "Πνευματικά δικαιώματα 2010-2012 John Lindgren"
 
 #: src/resample/resample.cc:187
 msgid "Skip/repeat samples"
-msgstr "Μετάβαση/δείγματα επανάληψης"
+msgstr "Δείγματα παράληψης/επανάληψης"
 
 #: src/resample/resample.cc:188
 msgid "Linear interpolation"
@@ -2888,15 +3229,15 @@
 
 #: src/resample/resample.cc:189
 msgid "Fast sinc interpolation"
-msgstr "Γρήγορη ημιτονοειδούς παρεμβολή"
+msgstr "Γρήγορη ημιτονοειδής παρεμβολή"
 
 #: src/resample/resample.cc:190
 msgid "Medium sinc interpolation"
-msgstr "Μεσαία ημιτονοειδούς παρεμβολή"
+msgstr "Μεσαία ημιτονοειδής παρεμβολή"
 
 #: src/resample/resample.cc:191
 msgid "Best sinc interpolation"
-msgstr "Καλύτερη ημιτονοειδούς παρεμβολή"
+msgstr "Καλύτερη ημιτονοειδής παρεμβολή"
 
 #: src/resample/resample.cc:195
 msgid "Conversion"
@@ -2906,17 +3247,17 @@
 msgid "Method:"
 msgstr "Μέθοδος:"
 
-#: src/resample/resample.cc:199 src/sox-resampler/sox-resampler.cc:161
+#: src/resample/resample.cc:199 src/soxr/sox-resampler.cc:203
 msgid "Rate:"
 msgstr "Ρυθμός:"
 
 #: src/resample/resample.cc:202
 msgid "Rate Mappings"
-msgstr "Βαθμολογία αντιστοιχίσεων"
+msgstr "Αντιστοιχίσεις"
 
 #: src/resample/resample.cc:203
 msgid "Use rate mappings"
-msgstr "Χρηση βαθμολογίας αντιστοιχίσεων"
+msgstr "Χρήση αντιστοιχίσεων"
 
 #: src/resample/resample.cc:205
 msgid "8 kHz:"
@@ -2958,192 +3299,173 @@
 msgid "192 kHz:"
 msgstr "192 kHz:"
 
+#: src/scrobbler2/config_window.cc:29
+msgid "Checking Last.fm access ..."
+msgstr "Έλεγχος πρόσβασης στο Last.fm ..."
+
+#: src/scrobbler2/config_window.cc:35
+msgid ""
+"Your scrobbles are being saved on your computer temporarily. They will be "
+"submitted as soon as Audacious is allowed access."
+msgstr ""
+"Αποθηκεύτηκαν προσωρινά οι πληροφορίες του μουσικού προφίλ σας στον "
+"υπολογιστή. Θα υποβληθούν το συντομότερο όταν θα επιτραπεί η πρόσβαση στο "
+"Audacious."
+
 #: src/scrobbler2/config_window.cc:41
 #, c-format
-msgid "OK. Scrobbling for user: %s"
-msgstr "OK. Scrobbling για τους χρήστες: %s"
-
-#: src/scrobbler2/config_window.cc:54
-msgid "Permission Denied"
-msgstr "Άρνηση Πρόσβασης"
-
-#: src/scrobbler2/config_window.cc:56
-msgid "Access the following link to allow Audacious to scrobble your plays:"
+msgid "Permission granted. Scrobbling for user %s."
 msgstr ""
-"Αποκτήσετε πρόσβαση στο παρακάτω σύνδεσμο για να επιτραπεί στο Audacious να "
-"Scrobble έργα σας:"
+"Χορηγείται άδεια. Μεταφορά πληροφοριών για το μουσικό προφίλ του χρήστη %s."
 
-#: src/scrobbler2/config_window.cc:66
-msgid "Keep this window open and click 'Check Permission' again.\n"
-msgstr ""
-"Διατηρείστε αυτό το παράθυρο ανοικτό και κάντε κλικ στην επιλογή «Έλεγχος "
-"άδειας» και πάλι.\n"
-"\n"
-"\n"
-
-#: src/scrobbler2/config_window.cc:69 src/scrobbler2/config_window.cc:80
+#: src/scrobbler2/config_window.cc:44
 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 ""
-"Μην ανησυχείτε. Τα scrobbles σας αποθηκεύονται στον υπολογιστή σας. Οι "
-"προτάσεις θα υποβληθούν το συντομότερο στο Audacious για να το πράξει."
-
-#: src/scrobbler2/config_window.cc:77
-msgid "Network Problem."
-msgstr "Πρόβλημα δικτύου."
-
-#: src/scrobbler2/config_window.cc:78
-msgid "There was a problem contacting Last.fm. Please try again later."
+"Permission denied. Open the following URL in a browser, allow Audacious "
+"access to your account, and then click 'Check Permission' again:"
 msgstr ""
-"Υπήρξε ένα πρόβλημα κατά την επικοινωνία με το LastFM. Παρακαλώ δοκιμάστε "
-"ξανά αργότερα."
+"Απορρίφθηκε η άδεια. Ανοίξτε την ακόλουθη διεύθυνση, επιτρέψτε τη πρόσβαση "
+"του Audacious στον λογαριασμό σας και κάντε πάλι κλικ στο 'Έλεγχος άδειας': "
 
-#: src/scrobbler2/config_window.cc:110
-msgid "Checking..."
-msgstr "Γίνεται έλεγχος..."
+#: src/scrobbler2/config_window.cc:53
+msgid "There was a problem contacting Last.fm."
+msgstr "Υπήρξε ένα πρόβλημα στη σύνδεση με το Last.fm."
 
-#: src/scrobbler2/config_window.cc:176
-msgid "C_heck Permission"
+#: src/scrobbler2/config_window.cc:92
+msgid "Check Permission"
 msgstr "Έλεγχος άδειας"
 
-#: src/scrobbler2/config_window.cc:177
-msgid "_Revoke Permission"
+#: src/scrobbler2/config_window.cc:93
+msgid "Revoke Permission"
 msgstr "Ανάκληση άδειας"
 
-#: src/scrobbler2/config_window.cc:220
-msgid ""
-"You need to allow Audacious to scrobble tracks to your Last.fm account.\n"
+#: src/scrobbler2/config_window.cc:97
+msgid "You need to allow Audacious to scrobble tracks to your Last.fm account."
 msgstr ""
-"Θα πρέπει να επιτραπεί στο Audacious να Scrobble τραγουδια στον Last.fm "
-"λογαριασμό σας.\n"
-"\n"
-"\n"
+"Πρέπει να επιτρέψετε στο Audacious να μεταφέρει τις πληροφορίες του μουσικού "
+"προφίλ σας στο λογαριασμό που διαθέτετε στο Last.fm."
 
 #: src/scrobbler2/scrobbler.cc:29
 msgid "Scrobbler 2.0"
 msgstr "Scrobbler 2.0"
 
-#: src/scrobbler2/scrobbler.cc:224
+#: src/scrobbler2/scrobbler.cc:200
 msgid ""
 "The Scrobbler plugin could not be started.\n"
 "There might be a problem with your installation."
 msgstr ""
-"Το Scrobbler πρόσθετο δεν μπορεί να ξεκινήσει.\n"
-"Μπορεί να υπάρχει πρόβλημα με την εγκατάσταση σας."
+"Το πρόσθετο Scrobbler δεν μπορεί να ξεκινήσει.\n"
+"Μπορεί να υπάρχει πρόβλημα με την εγκατάσταση του."
 
-#: src/scrobbler2/scrobbler.cc:289
+#: src/scrobbler2/scrobbler.cc:245
 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"
+"project."
 msgstr ""
-"Audacious Scrobbler Plugin 2.0 από τον Pitxyoki,\n"
+"Πρόσθετο Audacious Scrobbler 2.0 από τον Pitxyoki,\n"
 "\n"
-"Πνευματικά δικαιώματα © 2012-2013 Luís Μ Picciochi Oliveira <Pitxyoki@Gmail."
+"Πνευματικά δικαιώματα © 2012-2013 Luís Μ. Picciochi Oliveira <Pitxyoki@Gmail."
 "com>\n"
 "\n"
-"Ευχαριστώ τον John Lindgren που με βοηθησε στην αρχή του έργου.\n"
-"\n"
-"\n"
+"Ευχαριστώ τον John Lindgren που με βοήθησε στην αρχή του έργου."
 
-#: src/scrobbler2/scrobbler_communication.cc:642
-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. "
-"Παρακαλούμε ελέγξτε τις Προτιμήσεις για το πρόσθετο Scrobbler."
-
-#: src/sdlout/sdlout.cc:48
+#: src/sdlout/sdlout.cc:43
 msgid "SDL Output"
 msgstr "Έξοδος SDL"
 
-#: src/sdlout/sdlout.cc:77
+#: src/sdlout/sdlout.cc:72
 msgid ""
 "SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
 msgstr ""
 "Πρόσθετο Εξόδου SDL για το Audacious\n"
-"Copyright 2010 John Lindgren"
+"Πνευματικά δικαιώματα 2010 John Lindgren"
 
-#: src/search-tool/search-tool.cc:116 src/search-tool/search-tool.cc:124
+#: src/search-tool/library.cc:35 src/search-tool/library.cc:46
+#: src/search-tool-qt/library.cc:35 src/search-tool-qt/library.cc:46
 msgid "Library"
-msgstr "Βιβλιοθήκη"
+msgstr "Δισκοθήκη"
 
-#: src/search-tool/search-tool.cc:394
-#, c-format
-msgid "%d result"
-msgid_plural "%d results"
-msgstr0 "%d αποτελέσμα"
-msgstr1 "%d αποτελέσματα"
-
-#: src/search-tool/search-tool.cc:400
-#, c-format
-msgid "(%d hidden)"
-msgid_plural "(%d hidden)"
-msgstr0 "(%d κρυφό)"
-msgstr1 "(%d κρυφα)"
-
-#: src/search-tool/search-tool.cc:594
+#: src/search-tool-qt/search-model.cc:44 src/search-tool/search-tool.cc:287
 #, c-format
 msgid "%d song"
 msgid_plural "%d songs"
-msgstr0 "%d τραγούδι"
-msgstr1 "%d τραγούδια"
+msgstr0 "τραγούδι %d"
+msgstr1 "Τραγούδια %d"
 
-#: src/search-tool/search-tool.cc:601
+#: src/search-tool-qt/search-model.cc:53 src/search-tool/search-tool.cc:294
 msgid "of this genre"
 msgstr "αυτού του είδους"
 
-#: src/search-tool/search-tool.cc:607
+#: src/search-tool-qt/search-model.h:47 src/search-tool/search-model.h:45
 msgid "on"
 msgstr "σε"
 
-#: src/search-tool/search-tool.cc:607
+#: src/search-tool-qt/search-model.h:47 src/search-tool/search-model.h:45
 msgid "by"
-msgstr "απο"
+msgstr "από"
 
-#: src/search-tool/search-tool.cc:643
-msgid "_Create Playlist"
-msgstr "_Δημιουργία Λίστας Αναπαραγωγής"
+#: src/search-tool-qt/search-tool-qt.cc:165 src/search-tool/search-tool.cc:74
+msgid "Number of results to show:"
+msgstr "Αριθμός αποτελεσμάτων για εμφάνιση:"
 
-#: src/search-tool/search-tool.cc:645
-msgid "_Add to Playlist"
-msgstr "_Προσθήκη στη Λίστα Αναπαραγωγής"
+#: src/search-tool-qt/search-tool-qt.cc:168 src/search-tool/search-tool.cc:77
+msgid "Rescan library at startup"
+msgstr "Επανέλεγχος δισκοθήκης στην εκκίνηση"
 
-#: src/search-tool/search-tool.cc:684
-msgid "Search library"
-msgstr "Αναζήτηση βιοθήκης"
+#: src/search-tool-qt/search-tool-qt.cc:170
+msgid "Monitor library for changes"
+msgstr "Παρακολούθηση αλλαγών από τη δισκοθήκη"
 
-#: src/search-tool/search-tool.cc:688
+#: src/search-tool-qt/search-tool-qt.cc:193 src/search-tool/search-tool.cc:450
 msgid ""
 "To import your music library into Audacious, choose a folder and then click "
 "the \"refresh\" icon."
 msgstr ""
-"Για να εισάγεται τη συλλογή μουσικής σας στο Audacious, διαλέξτε έναν φάκελο "
-"και κάνετε κλικ στο εικονίδιο «ανανέωση»."
+"Για να εισάγεται τη συλλογή μουσικής σας στο Audacious, διαλέξτε ένα φάκελο "
+"και κάνετε κλικ στο εικονίδιο \"ανανέωση\"."
 
-#: src/search-tool/search-tool.cc:696
+#: src/search-tool-qt/search-tool-qt.cc:195 src/search-tool/search-tool.cc:459
 msgid "Please wait ..."
 msgstr "Παρακαλώ περιμένετε ..."
 
-#: src/search-tool/search-tool.cc:723
+#: src/search-tool-qt/search-tool-qt.cc:197 src/search-tool/search-tool.cc:487
 msgid "Choose Folder"
-msgstr "Επιλογή Φακέλου"
+msgstr "Επιλογή φακέλου"
+
+#: src/search-tool-qt/search-tool-qt.cc:201 src/search-tool/search-tool.cc:445
+msgid "Search library"
+msgstr "Έρευνα δισκοθήκης"
+
+#: src/search-tool-qt/search-tool-qt.cc:327 src/search-tool/search-tool.cc:156
+#, c-format
+msgid "%d of %d result shown"
+msgid_plural "%d of %d results shown"
+msgstr0 "Εμφανίζεται %d από %d"
+msgstr1 "Εμφανίζονται %d από %d"
+
+#: src/search-tool-qt/search-tool-qt.cc:331 src/search-tool/search-tool.cc:160
+#, c-format
+msgid "%d result"
+msgid_plural "%d results"
+msgstr0 "Βρέθηκε %d"
+msgstr1 "Βρέθηκαν %d"
+
+#: src/search-tool-qt/search-tool-qt.cc:501 src/search-tool/search-tool.cc:341
+msgid "_Create Playlist"
+msgstr "_Δημιουργία λίστας αναπαραγωγής"
+
+#: src/search-tool-qt/search-tool-qt.cc:503 src/search-tool/search-tool.cc:343
+msgid "_Add to Playlist"
+msgstr "_Προσθήκη στη λίστα αναπαραγωγής"
 
 #: src/sid/xmms-sid.cc:43
 msgid "SID Player"
 msgstr "SID Πρόγραμμα αναπαραγωγής μουσικής"
 
-#: src/sid/xs_config.cc:61
-msgid "Output"
-msgstr "Εξοδος"
-
 #: src/sid/xs_config.cc:62
 msgid "Channels:"
 msgstr "Κανάλια:"
@@ -3154,11 +3476,11 @@
 
 #: src/sid/xs_config.cc:69
 msgid "Emulate MOS 8580 (default: MOS 6581)"
-msgstr "Εξομοίωση του MOS 8580 (default: MOS 6581)"
+msgstr "Εξομοίωση MOS 8580 (προεπιλεγμένο: MOS 6581)"
 
 #: src/sid/xs_config.cc:71
 msgid "Do not automatically select chip model"
-msgstr "Μην επιλέξετε αυτόματα το μοντέλο του τσιπ"
+msgstr "Να μην επιλέγεται αυτόματα το μοντέλο του επεξεργαστή"
 
 #: src/sid/xs_config.cc:73
 msgid "Emulate filter"
@@ -3170,19 +3492,19 @@
 
 #: src/sid/xs_config.cc:78
 msgid "Do not automatically select clock speed"
-msgstr "Μην επιλέξετε αυτόματα την ταχύτητα χρονισμού"
+msgstr "Να μην επιλέγεται αυτόματα η ταχύτητα χρονισμού"
 
 #: src/sid/xs_config.cc:80
 msgid "Playback time"
-msgstr "Χρόνος αναπαραγωγής"
+msgstr "Διάρκεια αναπαραγωγής"
 
 #: src/sid/xs_config.cc:81
 msgid "Set maximum playback time:"
-msgstr "Ορισμός μέγιστου χρόνου αναπαραγωγής:"
+msgstr "Ρύθμιση μέγιστου χρόνου αναπαραγωγής:"
 
 #: src/sid/xs_config.cc:87
 msgid "Use only when song length is unknown"
-msgstr "Χρησιμοποιείτε μόνο όταν το μήκος του τραγουδιού είναι άγνωστο"
+msgstr "Χρησιμοποιείται μόνο όταν το μήκος του τραγουδιού είναι άγνωστο"
 
 #: src/sid/xs_config.cc:90
 msgid "Set minimum playback time:"
@@ -3190,15 +3512,15 @@
 
 #: src/sid/xs_config.cc:96
 msgid "Subtunes"
-msgstr "Υπο μελωδίες"
+msgstr "Υπο-μελωδίες"
 
 #: src/sid/xs_config.cc:97
 msgid "Enable subtunes"
-msgstr "Ενεργοποίηση Υπο μελωδίων"
+msgstr "Ενεργοποίηση υπο-μελωδιών"
 
 #: src/sid/xs_config.cc:99
 msgid "Ignore subtunes shorter than:"
-msgstr "Αγνόηση Υπο μελωδίων μικρότερες από:"
+msgstr "Αγνόησε υπο-μελωδίες μικρότερες από:"
 
 #: src/sid/xs_config.cc:105
 msgid "Note"
@@ -3206,759 +3528,703 @@
 
 #: src/silence-removal/silence-removal.cc:39
 msgid "Silence Removal"
-msgstr "Αφαίρεση σιωπής "
+msgstr "Αφαίρεση σιωπής"
 
 #: src/silence-removal/silence-removal.cc:58
 msgid ""
 "Silence Removal Plugin for Audacious\n"
 "Copyright 2014 John Lindgren"
 msgstr ""
-"Πρόσθετο Silence Removal για το Audacious\n"
-"Copyright 2014 John Lindgren"
+"Πρόσθετο Αφαίρεση σιωπής για το Audacious\n"
+"Πνευματικά δικαιώματα 2014 John Lindgren"
 
 #: src/silence-removal/silence-removal.cc:67
 msgid "Silence Removal"
-msgstr "Silence Removal"
+msgstr "Αφαίρεση σιωπής"
 
 #: src/silence-removal/silence-removal.cc:68
 msgid "Threshold:"
 msgstr "Όριο:"
 
-#: src/silence-removal/silence-removal.cc:70
-msgid "dB"
-msgstr "dB"
+#: src/skins/actions.cc:45 src/skins-qt/actions.cc:43
+msgid "Repeat points cleared."
+msgstr "Αφαίρεση σημείων επανάληψης."
 
-#: src/skins/menus.cc:64
-msgid "Open Files ..."
-msgstr "Άνοιγμα Aρχείων ..."
+#: src/skins/actions.cc:60 src/skins-qt/actions.cc:58
+msgid "Repeat point A set."
+msgstr "Ορισμός του σημείου επανάληψης Α."
 
-#: src/skins/menus.cc:65
-msgid "Open URL ..."
-msgstr "Άνοιγμα διεύθυνσης URL..."
+#: src/skins/actions.cc:65 src/skins-qt/actions.cc:63
+msgid "Repeat point B set."
+msgstr "Ορισμός του σημείου επανάληψης Β."
 
-#: src/skins/menus.cc:66
-msgid "Search Library"
-msgstr "Αναζήτηση Βιβλιοθήκης"
+#: src/skins/equalizer.cc:223 src/skins-qt/equalizer.cc:223
+msgid "Preamp"
+msgstr "Προενίσχυση"
 
-#: src/skins/menus.cc:68
-msgid "Playback"
-msgstr "Αναπαραγωγή"
+#: src/skins/equalizer.cc:227 src/skins-qt/equalizer.cc:227
+msgid "31 Hz"
+msgstr "31 Hz"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "63 Hz"
+msgstr "63 Hz"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "125 Hz"
+msgstr "125 Hz"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "250 Hz"
+msgstr "250 Hz"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "500 Hz"
+msgstr "500 Hz"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "1 kHz"
+msgstr "1 kHz"
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "2 kHz"
+msgstr "2 kHz"
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "4 kHz"
+msgstr "4 kHz"
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "8 kHz"
+msgstr "8 kHz"
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "16 kHz"
+msgstr "16 kHz"
+
+#: src/skins/equalizer.cc:270 src/skins-qt/equalizer.cc:270
+msgid "Audacious Equalizer"
+msgstr "Ισοσταθμιστής Audacious"
+
+#: src/skins/main.cc:459 src/skins-qt/main.cc:442
+msgid "Recording on"
+msgstr "Ενεργή εγγραφή"
+
+#: src/skins/main.cc:461 src/skins-qt/main.cc:444
+msgid "Recording off"
+msgstr "Ανενεργή εγγραφή"
+
+#: src/skins/main.cc:754 src/skins-qt/main.cc:701
+#, c-format
+msgid "Seek to %d:%-2.2d / %d:%-2.2d"
+msgstr "Αναζήτηση σε %d:%-2.2d / %d:%-2.2d"
+
+#: src/skins/main.cc:771 src/skins-qt/main.cc:718
+#, c-format
+msgid "Volume: %d%%"
+msgstr "Ένταση: %d%%"
+
+#: src/skins/main.cc:784 src/skins-qt/main.cc:731
+#, c-format
+msgid "Balance: %d%% left"
+msgstr "Ισορροπία: %d%% αριστερά"
+
+#: src/skins/main.cc:786 src/skins-qt/main.cc:733
+msgid "Balance: center"
+msgstr "Ισορροπία: κέντρο"
+
+#: src/skins/main.cc:788 src/skins-qt/main.cc:735
+#, c-format
+msgid "Balance: %d%% right"
+msgstr "Ισορροπία: %d%% δεξιά"
+
+#: src/skins/main.cc:880 src/skins-qt/main.cc:827
+msgid "Options Menu"
+msgstr "Μενού επιλογών"
+
+#: src/skins/main.cc:884 src/skins-qt/main.cc:831
+msgid "Disable 'Always On Top'"
+msgstr "Απενεργοποίηση του 'Πάντα στην κορυφή'"
+
+#: src/skins/main.cc:886 src/skins-qt/main.cc:833
+msgid "Enable 'Always On Top'"
+msgstr "Ενεργοποίηση του 'Πάντα στην κορυφή'"
+
+#: src/skins/main.cc:889 src/skins-qt/main.cc:836
+msgid "File Info Box"
+msgstr "Πλαίσιο αρχείου πληροφοριών "
+
+#: src/skins/main.cc:892 src/skins/menus.cc:149 src/skins-qt/main.cc:839
+#: src/skins-qt/menus.cc:142
+msgid "Double Size"
+msgstr "Διπλό μέγεθος"
 
-#: src/skins/menus.cc:69
+#: src/skins/main.cc:895 src/skins-qt/main.cc:842
+msgid "Visualizations"
+msgstr "Οπτικά εφέ"
+
+#: src/skins/menus.cc:74 src/skins-qt/menus.cc:64
+msgid "Volume Up"
+msgstr "Αύξηση έντασης"
+
+#: src/skins/menus.cc:75 src/skins-qt/menus.cc:65
+msgid "Volume Down"
+msgstr "Μείωση έντασης"
+
+#: src/skins/menus.cc:77 src/skins-qt/menus.cc:67
+msgid "Effects ..."
+msgstr "Εφέ ..."
+
+#: src/skins/menus.cc:84 src/skins-qt/menus.cc:74
+msgid "Open Files ..."
+msgstr "Άνοιγμα αρχείων ..."
+
+#: src/skins/menus.cc:85 src/skins-qt/menus.cc:76
+msgid "Open URL ..."
+msgstr "Άνοιγμα διεύθυνσης ..."
+
+#: src/skins/menus.cc:89 src/skins-qt/menus.cc:80
 msgid "Playlist"
-msgstr "Λίστα Αναπαραγωγής"
+msgstr "Λίστα αναπαραγωγής"
 
-#: src/skins/menus.cc:70
+#: src/skins/menus.cc:90 src/skins-qt/menus.cc:81
+msgid "Output"
+msgstr "Έξοδος"
+
+#: src/skins/menus.cc:91 src/skins-qt/menus.cc:82
 msgid "View"
 msgstr "Προβολή"
 
-#: src/skins/menus.cc:72 src/skins/menus.cc:136 src/skins/menus.cc:149
-#: src/skins/menus.cc:214
+#: src/skins/menus.cc:93 src/skins/menus.cc:161 src/skins/menus.cc:174
+#: src/skins/menus.cc:245 src/skins-qt/menus.cc:84 src/skins-qt/menus.cc:156
+#: src/skins-qt/menus.cc:170 src/skins-qt/menus.cc:241
 msgid "Services"
 msgstr "Υπηρεσίες"
 
-#: src/skins/menus.cc:74
+#: src/skins/menus.cc:95 src/skins-qt/menus.cc:86
 msgid "About ..."
 msgstr "Σχετικά με ..."
 
-#: src/skins/menus.cc:75
+#: src/skins/menus.cc:96 src/skins-qt/menus.cc:87
 msgid "Settings ..."
 msgstr "Ρυθμίσεις ..."
 
-#: src/skins/menus.cc:76
+#: src/skins/menus.cc:97 src/skins-qt/menus.cc:88
 msgid "Quit"
 msgstr "Έξοδος"
 
-#: src/skins/menus.cc:80 src/skins/menus.cc:206
+#: src/skins/menus.cc:101 src/skins/menus.cc:235 src/skins-qt/menus.cc:92
+#: src/skins-qt/menus.cc:231
 msgid "Song Info ..."
 msgstr "Πληροφορίες τραγουδιού"
 
-#: src/skins/menus.cc:84
-msgid "No Playlist Advance"
-msgstr "Καμία εκ των προτέρων λίστα αναπαραγωγής"
+#: src/skins/menus.cc:105 src/skins-qt/menus.cc:96
+msgid "Shuffle by Album"
+msgstr "Τυχαία εναλλαγή κατά άλμπουμ"
 
-#: src/skins/menus.cc:85
-msgid "Stop After This Song"
-msgstr "Διακοπή στο τέλους του κομματιού."
+#: src/skins/menus.cc:106 src/skins-qt/menus.cc:97
+msgid "No Playlist Advance"
+msgstr "Χωρίς προώθηση στο επόμενο"
 
-#: src/skins/menus.cc:93
+#: src/skins/menus.cc:117 src/skins-qt/menus.cc:108
 msgid "Set A-B Repeat"
-msgstr "Ορισμός A-B Επαναληψης "
+msgstr "Ορισμός σημείων επανάληψης A-B"
 
-#: src/skins/menus.cc:94
+#: src/skins/menus.cc:118 src/skins-qt/menus.cc:109
 msgid "Clear A-B Repeat"
-msgstr "Απαλοιφή A-B Επανάληψης"
+msgstr "Αφαίρεση σημείων επανάληψης A-B"
 
-#: src/skins/menus.cc:96
+#: src/skins/menus.cc:120 src/skins-qt/menus.cc:111
 msgid "Jump to Song ..."
-msgstr "Μετάβαση στο Τραγούδι"
+msgstr "Μετάβαση στο τραγούδι"
 
-#: src/skins/menus.cc:97
+#: src/skins/menus.cc:121 src/skins-qt/menus.cc:113
 msgid "Jump to Time ..."
 msgstr "Μετάβαση σε χρόνο ..."
 
-#: src/skins/menus.cc:101
+#: src/skins/menus.cc:125 src/skins-qt/menus.cc:118
 msgid "Play/Resume"
 msgstr "Αναπαραγωγή/Συνέχεια"
 
-#: src/skins/menus.cc:103
+#: src/skins/menus.cc:127 src/skins-qt/menus.cc:120
 msgid "New Playlist"
-msgstr "Νέα Λίστα Αναπαραγωγής"
+msgstr "Νέα λίστα αναπαραγωγής"
 
-#: src/skins/menus.cc:104
+#: src/skins/menus.cc:128 src/skins-qt/menus.cc:121
 msgid "Rename Playlist ..."
 msgstr "Μετονομασία λίστας αναπαραγωγής"
 
-#: src/skins/menus.cc:105
+#: src/skins/menus.cc:129 src/skins-qt/menus.cc:122
 msgid "Remove Playlist"
 msgstr "Αφαίρεση λίστας αναπαραγωγής"
 
-#: src/skins/menus.cc:107
+#: src/skins/menus.cc:131 src/skins-qt/menus.cc:124
 msgid "Previous Playlist"
 msgstr "Προηγούμενη λίστα αναπαραγωγής"
 
-#: src/skins/menus.cc:108
+#: src/skins/menus.cc:132 src/skins-qt/menus.cc:125
 msgid "Next Playlist"
-msgstr "Επόμενη Λίστα Αναπαραγωγής"
+msgstr "Επόμενη λίστα αναπαραγωγής"
 
-#: src/skins/menus.cc:110
+#: src/skins/menus.cc:134 src/skins-qt/menus.cc:127
 msgid "Import Playlist ..."
 msgstr "Εισαγωγή λίστας αναπαραγωγής ..."
 
-#: src/skins/menus.cc:111
+#: src/skins/menus.cc:135 src/skins-qt/menus.cc:128
 msgid "Export Playlist ..."
 msgstr "Εξαγωγή λίστας αναπαραγωγής ..."
 
-#: src/skins/menus.cc:113
+#: src/skins/menus.cc:137 src/skins-qt/menus.cc:130
 msgid "Playlist Manager ..."
-msgstr "Διαχειριστής Λιστών Αναπαραγωγής ..."
+msgstr "Διαχειριστής λίστας αναπαραγωγής ..."
 
-#: src/skins/menus.cc:114
+#: src/skins/menus.cc:138 src/skins-qt/menus.cc:131
 msgid "Queue Manager ..."
-msgstr "Διαχειριστής Ουράς Αναμονής ..."
+msgstr "Διαχειριστής σειράς αναμονής ..."
 
-#: src/skins/menus.cc:116
+#: src/skins/menus.cc:140 src/skins-qt/menus.cc:133
 msgid "Refresh Playlist"
 msgstr "Ανανέωση λίστας αναπαραγωγής"
 
-#: src/skins/menus.cc:120
+#: src/skins/menus.cc:144 src/skins-qt/menus.cc:137
 msgid "Show Playlist Editor"
-msgstr "Εμφάνιση Επιμέλειας αναπαραγωγής"
+msgstr "Εμφάνιση πληροφοριών αναπαραγωγής"
 
-#: src/skins/menus.cc:121
+#: src/skins/menus.cc:145 src/skins-qt/menus.cc:138
 msgid "Show Equalizer"
-msgstr "Εμφάνιση Ισοσταθμιστή"
+msgstr "Εμφάνιση ισοσταθμιστή"
 
-#: src/skins/menus.cc:123
+#: src/skins/menus.cc:147 src/skins-qt/menus.cc:140
 msgid "Show Remaining Time"
 msgstr "Εμφάνιση χρόνου που απομένει"
 
-#: src/skins/menus.cc:125
+#: src/skins/menus.cc:150 src/skins-qt/menus.cc:143
 msgid "Always on Top"
 msgstr "Πάντα στην κορυφή"
 
-#: src/skins/menus.cc:126
+#: src/skins/menus.cc:151 src/skins-qt/menus.cc:145
 msgid "On All Workspaces"
 msgstr "Σε όλους τους χώρους εργασίας"
 
-#: src/skins/menus.cc:128
+#: src/skins/menus.cc:153 src/skins-qt/menus.cc:148
 msgid "Roll Up Player"
-msgstr "Roll Up Player"
+msgstr "Αναπαραγωγή σε ελαχιστοποίηση"
 
-#: src/skins/menus.cc:129
+#: src/skins/menus.cc:154 src/skins-qt/menus.cc:149
 msgid "Roll Up Playlist Editor"
-msgstr "Roll Up Επιμέλεια αναπαραγωγής"
+msgstr "Λίστα αναπαραγωγής σε ελαχιστοποίηση"
 
-#: src/skins/menus.cc:130
+#: src/skins/menus.cc:155 src/skins-qt/menus.cc:150
 msgid "Roll Up Equalizer"
-msgstr "Roll Up Ισοσταθμιστής"
+msgstr "Ισοσταθμιστής σε ελαχιστοποίηση"
 
-#: src/skins/menus.cc:132 src/skins/ui_main.cc:854
-msgid "Double Size"
-msgstr "Διπλό Μέγεθος"
-
-#: src/skins/menus.cc:138
+#: src/skins/menus.cc:163 src/skins-qt/menus.cc:158
 msgid "Add URL ..."
-msgstr "Προσθήκη Διεύθυνσης URL ..."
+msgstr "Προσθήκη διεύθυνσης ..."
 
-#: src/skins/menus.cc:139
+#: src/skins/menus.cc:164 src/skins-qt/menus.cc:160
 msgid "Add Files ..."
-msgstr "Προσθήκη Αρχείων..."
+msgstr "Προσθήκη αρχείων..."
 
-#: src/skins/menus.cc:143 src/skins/menus.cc:171 src/skins/menus.cc:185
+#: src/skins/menus.cc:168 src/skins/menus.cc:196 src/skins/menus.cc:212
+#: src/skins-qt/menus.cc:164 src/skins-qt/menus.cc:192
+#: src/skins-qt/menus.cc:208
 msgid "By Title"
-msgstr "Κατά Τίτλο"
+msgstr "Κατά τίτλο"
 
-#: src/skins/menus.cc:144 src/skins/menus.cc:178 src/skins/menus.cc:192
+#: src/skins/menus.cc:169 src/skins/menus.cc:203 src/skins/menus.cc:219
+#: src/skins-qt/menus.cc:165 src/skins-qt/menus.cc:199
+#: src/skins-qt/menus.cc:215
 msgid "By File Name"
-msgstr "Από Όνομα Αρχείου"
+msgstr "Κατά όνομα αρχείου"
 
-#: src/skins/menus.cc:145 src/skins/menus.cc:179 src/skins/menus.cc:193
+#: src/skins/menus.cc:170 src/skins/menus.cc:204 src/skins/menus.cc:220
+#: src/skins-qt/menus.cc:166 src/skins-qt/menus.cc:200
+#: src/skins-qt/menus.cc:216
 msgid "By File Path"
-msgstr "Από διαδρομή αρχείου"
+msgstr "Κατά διαδρομή αρχείου"
 
-#: src/skins/menus.cc:151
+#: src/skins/menus.cc:176 src/skins-qt/menus.cc:172
 msgid "Remove All"
-msgstr "Αφαίρεση Όλων"
+msgstr "Αφαίρεση όλων"
 
-#: src/skins/menus.cc:152
+#: src/skins/menus.cc:177 src/skins-qt/menus.cc:173
 msgid "Clear Queue"
-msgstr "Εκκαθάριση Ουράς"
+msgstr "Εκκαθάριση σειράς"
 
-#: src/skins/menus.cc:154
+#: src/skins/menus.cc:179 src/skins-qt/menus.cc:175
 msgid "Remove Unavailable Files"
-msgstr "Αφαίρεση Μη Διαθέσιμων Αρχείων"
+msgstr "Αφαίρεση μη διαθέσιμων αρχείων"
 
-#: src/skins/menus.cc:155
+#: src/skins/menus.cc:180 src/skins-qt/menus.cc:176
 msgid "Remove Duplicates"
-msgstr "Αφαίρεση Διπλών"
+msgstr "Αφαίρεση διπλότυπων"
 
-#: src/skins/menus.cc:157
+#: src/skins/menus.cc:182 src/skins-qt/menus.cc:178
 msgid "Remove Unselected"
-msgstr "Αφαίρεση Μη Επιλεγμένων"
+msgstr "Αφαίρεση μη επιλεγμένων"
 
-#: src/skins/menus.cc:158
+#: src/skins/menus.cc:183 src/skins-qt/menus.cc:179
 msgid "Remove Selected"
-msgstr "Αφαίρεση Επιλεγμένων"
+msgstr "Αφαίρεση επιλεγμένων"
 
-#: src/skins/menus.cc:162
+#: src/skins/menus.cc:187 src/skins-qt/menus.cc:183
 msgid "Search and Select"
-msgstr "Αναζήτηση και Επιλογή"
+msgstr "Αναζήτηση και επιλογή"
 
-#: src/skins/menus.cc:164
+#: src/skins/menus.cc:189 src/skins-qt/menus.cc:185
 msgid "Invert Selection"
-msgstr "Αντιστροφή Επιλογής"
+msgstr "Αντιστροφή επιλογής"
 
-#: src/skins/menus.cc:165
+#: src/skins/menus.cc:190 src/skins-qt/menus.cc:186
 msgid "Select None"
-msgstr "Επιλογή Κανενός"
+msgstr "Επιλογή κανενός"
 
-#: src/skins/menus.cc:166
+#: src/skins/menus.cc:191 src/skins-qt/menus.cc:187
 msgid "Select All"
-msgstr "Επιλογή Όλων"
+msgstr "Επιλογή όλων"
 
-#: src/skins/menus.cc:170 src/skins/menus.cc:184
+#: src/skins/menus.cc:195 src/skins/menus.cc:211 src/skins-qt/menus.cc:191
+#: src/skins-qt/menus.cc:207
 msgid "By Track Number"
-msgstr "Κατά Αριθμό Κομματιού:"
+msgstr "Κατά αριθμό κομματιού"
 
-#: src/skins/menus.cc:172 src/skins/menus.cc:186
+#: src/skins/menus.cc:197 src/skins/menus.cc:213 src/skins-qt/menus.cc:193
+#: src/skins-qt/menus.cc:209
 msgid "By Artist"
-msgstr "Κατά Καλλιτέχνη"
+msgstr "Κατά καλλιτέχνη"
 
-#: src/skins/menus.cc:173 src/skins/menus.cc:187
+#: src/skins/menus.cc:198 src/skins/menus.cc:214 src/skins-qt/menus.cc:194
+#: src/skins-qt/menus.cc:210
 msgid "By Album"
-msgstr "Κατά Δίσκο"
+msgstr "Κατά άλμπουμ"
 
-#: src/skins/menus.cc:174 src/skins/menus.cc:188
+#: src/skins/menus.cc:199 src/skins/menus.cc:215 src/skins-qt/menus.cc:195
+#: src/skins-qt/menus.cc:211
 msgid "By Album Artist"
-msgstr "Από Καλλιτέχνη άλμπουμ"
+msgstr "Κατά καλλιτέχνη άλμπουμ"
 
-#: src/skins/menus.cc:175 src/skins/menus.cc:190
+#: src/skins/menus.cc:200 src/skins/menus.cc:216 src/skins-qt/menus.cc:196
+#: src/skins-qt/menus.cc:212
 msgid "By Release Date"
-msgstr "Από Ημερομηνία κυκλοφορίας"
+msgstr "Κατά ημερομηνία κυκλοφορίας"
 
-#: src/skins/menus.cc:176 src/skins/menus.cc:189
+#: src/skins/menus.cc:201 src/skins/menus.cc:217 src/skins-qt/menus.cc:197
+#: src/skins-qt/menus.cc:213
 msgid "By Genre"
-msgstr "Από Είδος"
+msgstr "Κατά είδος"
 
-#: src/skins/menus.cc:177 src/skins/menus.cc:191
+#: src/skins/menus.cc:202 src/skins/menus.cc:218 src/skins-qt/menus.cc:198
+#: src/skins-qt/menus.cc:214
 msgid "By Length"
-msgstr "Από Διάρκεια"
+msgstr "Κατά διάρκεια"
 
-#: src/skins/menus.cc:180 src/skins/menus.cc:194
+#: src/skins/menus.cc:205 src/skins/menus.cc:221 src/skins-qt/menus.cc:201
+#: src/skins-qt/menus.cc:217
 msgid "By Custom Title"
-msgstr "Από Προσαρμοσμένο τίτλο"
+msgstr "Κατά προσαρμοσμένο τίτλο"
+
+#: src/skins/menus.cc:206 src/skins/menus.cc:222 src/skins-qt/menus.cc:202
+#: src/skins-qt/menus.cc:218
+msgid "By Comment"
+msgstr "Κατά σχόλιο"
+
+#: src/skins/menus.cc:207 src/skins/menus.cc:223 src/skins-qt/menus.cc:203
+#: src/skins-qt/menus.cc:219
+msgid "By Disc Number"
+msgstr "Κατά αριθμό δίσκου"
 
-#: src/skins/menus.cc:198
+#: src/skins/menus.cc:227 src/skins-qt/menus.cc:223
 msgid "Randomize List"
-msgstr "Τυχαιοποίηση Λίστας"
+msgstr "Τυχαιοποίηση λίστας"
 
-#: src/skins/menus.cc:199
+#: src/skins/menus.cc:228 src/skins-qt/menus.cc:224
 msgid "Reverse List"
-msgstr "Αντίστροφη Λίστας"
+msgstr "Αντίστροφη λίστα"
 
-#: src/skins/menus.cc:201
+#: src/skins/menus.cc:230 src/skins-qt/menus.cc:226
 msgid "Sort Selected"
-msgstr "Ταξινόμηση Επιλεγμένων"
+msgstr "Ταξινόμηση επιλεγμένων"
 
-#: src/skins/menus.cc:202
+#: src/skins/menus.cc:231 src/skins-qt/menus.cc:227
 msgid "Sort List"
-msgstr "Ταξινόμηση Λίστας"
+msgstr "Ταξινόμηση λίστας"
 
-#: src/skins/menus.cc:208
+#: src/skins/menus.cc:236 src/skins-qt/menus.cc:232
+msgid "Open Containing Folder"
+msgstr "Άνοιγμα φακέλου που περιέχεται"
+
+#: src/skins/menus.cc:238 src/skins-qt/menus.cc:234
 msgid "Cut"
 msgstr "Αποκοπή"
 
-#: src/skins/menus.cc:209
+#: src/skins/menus.cc:239 src/skins-qt/menus.cc:235
 msgid "Copy"
 msgstr "Αντιγραφή"
 
-#: src/skins/menus.cc:210
+#: src/skins/menus.cc:240 src/skins-qt/menus.cc:236
 msgid "Paste"
 msgstr "Επικόλληση"
 
-#: src/skins/menus.cc:212
-msgid "Queue/Unqueue"
-msgstr "Σειρά αναμονής"
+#: src/skins/menus.cc:241 src/skins-qt/menus.cc:237
+msgid "Paste at End"
+msgstr "Επικόλληση στο τέλος"
 
-#: src/skins/menus.cc:218
-msgid "Load Preset ..."
-msgstr "Φόρτωση προρύθμισης"
+#: src/skins/menus.cc:243 src/skins-qt/menus.cc:239
+msgid "Queue/Unqueue"
+msgstr "Προσθήκη/Αφαίρεση από την σειρά"
 
-#: src/skins/menus.cc:219
-msgid "Load Auto Preset ..."
-msgstr "Φόρτωση αυτόματης προρύθμισης"
+#: src/skins/playlist-widget.cc:58 src/skins-qt/playlist-widget.cc:58
+#, c-format
+msgid "%s (%d of %d)"
+msgstr "%s (%d από %d)"
 
-#: src/skins/menus.cc:220
-msgid "Load Default"
-msgstr "Φόρτωση προεπιλογής"
+#: src/skins/playlistwin.cc:491 src/skins-qt/playlistwin.cc:478
+msgid "Audacious Playlist Editor"
+msgstr "Επεξεργαστής λίστας αναπαραγωγής Audacious"
 
-#: src/skins/menus.cc:221
-msgid "Load Preset File ..."
-msgstr "Φόρτωση προρύθμισης από αρχείο ..."
+#: src/skins/plugin.cc:53 src/skins-qt/plugin.cc:65
+msgid "Winamp Classic Interface"
+msgstr "Κλασική διεπαφή Winamp"
 
-#: src/skins/menus.cc:222
-msgid "Load EQF File ..."
-msgstr "Φόρτωση EQF αρχείου ..."
+#: src/skins-qt/menus.cc:75
+msgid "Open Folder ..."
+msgstr "Άνοιγμα φακέλου ..."
 
-#: src/skins/menus.cc:224
-msgid "Save Preset ..."
-msgstr "Αποθήκευση προρύθμισης ..."
+#: src/skins-qt/menus.cc:159
+msgid "Add Folder ..."
+msgstr "Προσθήκη φακέλου ..."
 
-#: src/skins/menus.cc:225
-msgid "Save Auto Preset ..."
-msgstr "Αποθήκευση αυτόματης προρύθμισης ..."
+#: src/skins-qt/search-select.cc:62 src/skins/search-select.cc:77
+msgid "Search entries in active playlist"
+msgstr "Αναζήτηση καταχωρήσεων σε ενεργή λίστα αναπαραγωγής"
 
-#: src/skins/menus.cc:226
-msgid "Save Default"
-msgstr "Αποθήκευση προεπιλογής"
+#: src/skins-qt/search-select.cc:70 src/skins/search-select.cc:83
+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/menus.cc:227
-msgid "Save Preset File ..."
-msgstr "Αποθήκευση προρύθμισης σε αρχείο ..."
+#: src/skins-qt/search-select.cc:75 src/skins/search-select.cc:91
+msgid "Title:"
+msgstr "Τίτλος:"
 
-#: src/skins/menus.cc:228
-msgid "Save EQF File ..."
-msgstr "Αποθήκευση αρχείου EQF ..."
+#: src/skins-qt/search-select.cc:79 src/skins/search-select.cc:96
+msgid "Album:"
+msgstr "Αλμπουμ:"
 
-#: src/skins/menus.cc:230
-msgid "Delete Preset ..."
-msgstr "Διαγραφή προρύθμισης"
+#: src/skins-qt/search-select.cc:82 src/skins/search-select.cc:101
+msgid "Artist:"
+msgstr "Καλλιτέχνης:"
 
-#: src/skins/menus.cc:231
-msgid "Delete Auto Preset ..."
-msgstr "Διαγραφή αυτόματης προρύθμισης ..."
+#: src/skins-qt/search-select.cc:85 src/skins/search-select.cc:106
+msgid "File Name:"
+msgstr "Όνομα αρχείου:"
 
-#: src/skins/menus.cc:233
-msgid "Import Winamp Presets ..."
-msgstr "Εισαγωγή προρυθμίσεων WinAMP ..."
+#: src/skins-qt/search-select.cc:88 src/skins/search-select.cc:134
+msgid "Clear previous selection before searching"
+msgstr "Εκκαθάριση προηγούμενων επιλογών πριν από την αναζήτηση"
 
-#: src/skins/menus.cc:235
-msgid "Reset to Zero"
-msgstr "Επαναρυθμιση στο μηδέν"
+#: src/skins-qt/search-select.cc:89 src/skins/search-select.cc:137
+msgid "Automatically toggle queue for matching entries"
+msgstr "Αυτόματη εναλλαγή σειράς αναμονής για τις καταχωρήσεις που ταιριάζουν"
 
-#: src/skins/plugin.cc:48
-msgid "Winamp Classic Interface"
-msgstr "Κλασσική Διεπαφή Winamp"
+#: src/skins-qt/search-select.cc:90 src/skins/search-select.cc:140
+msgid "Create a new playlist with matching entries"
+msgstr "Δημιουργία νέας λίστας αναπαραγωγής με τις καταχωρήσεις που ταιριάζουν"
 
-#: src/skins/preset-browser.cc:57 src/skins/preset-list.cc:371
-#: src/skins/preset-list.cc:386
-msgid "Save"
-msgstr "Αποθήκευση"
-
-#: src/skins/preset-browser.cc:57 src/skins/preset-list.cc:338
-#: src/skins/preset-list.cc:354
-msgid "Load"
-msgstr "Φόρτωση"
-
-#: src/skins/preset-browser.cc:83
-msgid "Load Preset File"
-msgstr "Φόρτωση προρύθμισης από αρχείο"
-
-#: src/skins/preset-browser.cc:100
-msgid "Load EQF File"
-msgstr "Φόρτωση EQF αρχείου"
-
-#: src/skins/preset-browser.cc:119
-msgid "Save Preset File"
-msgstr "Αποθήκευση προρύθμισης σε αρχείο"
-
-#: src/skins/preset-browser.cc:137
-msgid "Save EQF File"
-msgstr "Αποθήκευση αρχείου EQF"
-
-#: src/skins/preset-browser.cc:151
-msgid "Import Winamp Presets"
-msgstr "Εισαγωγή προρυθμίσεων WinAMP"
-
-#: src/skins/preset-list.cc:285
-msgid "Presets"
-msgstr "Προρυθμίσεις"
-
-#: src/skins/preset-list.cc:335
-msgid "Load preset"
-msgstr "Φόρτωση προρύθμισης"
-
-#: src/skins/preset-list.cc:351
-msgid "Load auto-preset"
-msgstr "Φόρτωση αυτόματης προρύθμισης"
-
-#: src/skins/preset-list.cc:367
-msgid "Save preset"
-msgstr "Αποθήκευση προρύθμισης"
-
-#: src/skins/preset-list.cc:382
-msgid "Save auto-preset"
-msgstr "Αποθήκευση αυτόματης προρύθμισης"
-
-#: src/skins/preset-list.cc:408
-msgid "Delete preset"
-msgstr "Διαγραφή προρύθμισης"
-
-#: src/skins/preset-list.cc:424
-msgid "Delete auto-preset"
-msgstr "Διαγραφή αυτόματης προρύθμισης"
+#: src/skins-qt/search-select.cc:101 src/skins/search-select.cc:78
+msgid "Search"
+msgstr "Αναζήτηση"
 
-#: src/skins/skins_cfg.cc:176
+#: src/skins-qt/skins_cfg.cc:198 src/skins/skins_cfg.cc:182
 msgid "Player:"
 msgstr "Πρόγραμμα αναπαραγωγής:"
 
-#: src/skins/skins_cfg.cc:178
+#: src/skins-qt/skins_cfg.cc:200 src/skins/skins_cfg.cc:184
 msgid "Select main player window font:"
-msgstr "Επιλέξτε τη γραμματοσειρά του κύριου παραθύρου:"
+msgstr "Επιλογή γραμματοσειράς του κυρίως παραθύρου αναπαραγωγής:"
 
-#: src/skins/skins_cfg.cc:179
+#: src/skins-qt/skins_cfg.cc:201 src/skins/skins_cfg.cc:185
 msgid "Playlist:"
 msgstr "Λίστα αναπαραγωγής:"
 
-#: src/skins/skins_cfg.cc:181
+#: src/skins-qt/skins_cfg.cc:203 src/skins/skins_cfg.cc:187
 msgid "Select playlist font:"
-msgstr "Επιλέξτε τη γραμματοσειρά της λίστας αναπαραγωγής:"
+msgstr "Επιλογή γραμματοσειράς για τη λίστα αναπαραγωγής:"
 
-#: src/skins/skins_cfg.cc:187
+#: src/skins-qt/skins_cfg.cc:207 src/skins/skins_cfg.cc:191
 msgid "Skin"
-msgstr "Skin"
+msgstr "Εμφάνιση"
+
+#: src/skins-qt/skins_cfg.cc:211 src/skins/skins_cfg.cc:193
+msgid "Display active titlebar when any window is focused"
+msgstr ""
+"Εμφάνιση ενεργής γραμμής τίτλου όταν οποιοδήποτε παράθυρο είναι εστιασμένο"
 
-#: src/skins/skins_cfg.cc:189
+#: src/skins-qt/skins_cfg.cc:213 src/skins/skins_cfg.cc:195
 msgid "Fonts"
 msgstr "Γραμματοσειρές"
 
-#: src/skins/skins_cfg.cc:192
+#: src/skins-qt/skins_cfg.cc:215 src/skins/skins_cfg.cc:197
 msgid "Use bitmap fonts (supports ASCII only)"
 msgstr "Χρήση γραμματοσειρών bitmap (υποστηρίζει μόνο ASCII)"
 
-#: src/skins/skins_cfg.cc:194
+#: src/skins-qt/skins_cfg.cc:217 src/skins/skins_cfg.cc:199
 msgid "Scroll song title"
 msgstr "Κύλιση τίτλου τραγουδιού"
 
-#: src/skins/skins_cfg.cc:196
+#: src/skins-qt/skins_cfg.cc:219 src/skins/skins_cfg.cc:201
 msgid "Scroll song title in both directions"
 msgstr "Κύλιση τίτλου τραγουδιού και στις δύο κατευθύνσεις"
 
-#: src/skins/skins_cfg.cc:201
+#: src/skins-qt/skins_cfg.cc:224 src/skins/skins_cfg.cc:206
 msgid "Analyzer"
 msgstr "Αναλυτής"
 
-#: src/skins/skins_cfg.cc:202
+#: src/skins-qt/skins_cfg.cc:225 src/skins/skins_cfg.cc:207
 msgid "Scope"
-msgstr "Εμβέλεια"
+msgstr "Κυματομορφή"
 
-#: src/skins/skins_cfg.cc:203
+#: src/skins-qt/skins_cfg.cc:226 src/skins/skins_cfg.cc:208
 msgid "Voiceprint / VU meter"
 msgstr "Ηχητικό αποτύπωμα / Μετρητής VU"
 
-#: src/skins/skins_cfg.cc:204
+#: src/skins-qt/skins_cfg.cc:227 src/skins/skins_cfg.cc:209
 msgid "Off"
-msgstr "Μακριά"
+msgstr "Κλειστό"
 
-#: src/skins/skins_cfg.cc:208 src/skins/skins_cfg.cc:233
-#: src/skins/skins_cfg.cc:239
+#: src/skins-qt/skins_cfg.cc:231 src/skins-qt/skins_cfg.cc:256
+#: src/skins-qt/skins_cfg.cc:262 src/skins/skins_cfg.cc:213
+#: src/skins/skins_cfg.cc:238 src/skins/skins_cfg.cc:244
 msgid "Normal"
-msgstr "Κανονικα"
+msgstr "Κανονικά"
 
-#: src/skins/skins_cfg.cc:209 src/skins/skins_cfg.cc:234
+#: src/skins-qt/skins_cfg.cc:232 src/skins-qt/skins_cfg.cc:257
+#: src/skins/skins_cfg.cc:214 src/skins/skins_cfg.cc:239
 msgid "Fire"
-msgstr "Φωτιά"
+msgstr "Φωτεινός"
 
-#: src/skins/skins_cfg.cc:210
+#: src/skins-qt/skins_cfg.cc:233 src/skins/skins_cfg.cc:215
 msgid "Vertical lines"
-msgstr "Κατακόρυφες Γραμμές"
+msgstr "Κατακόρυφες γραμμές"
 
-#: src/skins/skins_cfg.cc:214
+#: src/skins-qt/skins_cfg.cc:237 src/skins/skins_cfg.cc:219
 msgid "Lines"
 msgstr "Γραμμές"
 
-#: src/skins/skins_cfg.cc:215
+#: src/skins-qt/skins_cfg.cc:238 src/skins/skins_cfg.cc:220
 msgid "Bars"
 msgstr "Μπάρες"
 
-#: src/skins/skins_cfg.cc:219
+#: src/skins-qt/skins_cfg.cc:242 src/skins/skins_cfg.cc:224
 msgid "Slowest"
-msgstr "Αργότερο"
+msgstr "Πολύ αργά"
 
-#: src/skins/skins_cfg.cc:220
+#: src/skins-qt/skins_cfg.cc:243 src/skins/skins_cfg.cc:225
 msgid "Slow"
-msgstr "Αργό"
+msgstr "Αργά"
 
-#: src/skins/skins_cfg.cc:221 src/sox-resampler/sox-resampler.cc:152
+#: src/skins-qt/skins_cfg.cc:244 src/skins/skins_cfg.cc:226
+#: src/soxr/sox-resampler.cc:180
 msgid "Medium"
-msgstr "Μεσαίο"
+msgstr "Μεσαία"
 
-#: src/skins/skins_cfg.cc:222
+#: src/skins-qt/skins_cfg.cc:245 src/skins/skins_cfg.cc:227
 msgid "Fast"
-msgstr "Γρήγορο"
+msgstr "Γρήγορα"
 
-#: src/skins/skins_cfg.cc:223
+#: src/skins-qt/skins_cfg.cc:246 src/skins/skins_cfg.cc:228
 msgid "Fastest"
-msgstr "Γρηγορότερο"
+msgstr "Πολύ γρήγορα"
 
-#: src/skins/skins_cfg.cc:227
+#: src/skins-qt/skins_cfg.cc:250 src/skins/skins_cfg.cc:232
 msgid "Dots"
 msgstr "Αποσιωπητικά"
 
-#: src/skins/skins_cfg.cc:228
+#: src/skins-qt/skins_cfg.cc:251 src/skins/skins_cfg.cc:233
 msgid "Line"
 msgstr "Γραμμές"
 
-#: src/skins/skins_cfg.cc:229
+#: src/skins-qt/skins_cfg.cc:252 src/skins/skins_cfg.cc:234
 msgid "Solid"
 msgstr "Συμπαγές"
 
-#: src/skins/skins_cfg.cc:235
+#: src/skins-qt/skins_cfg.cc:258 src/skins/skins_cfg.cc:240
 msgid "Ice"
-msgstr "Πάγος"
+msgstr "Ψυχρός"
 
-#: src/skins/skins_cfg.cc:240
+#: src/skins-qt/skins_cfg.cc:263 src/skins/skins_cfg.cc:245
 msgid "Smooth"
-msgstr "Ομαλό"
+msgstr "Ομαλά"
 
-#: src/skins/skins_cfg.cc:244
-msgid "Type"
-msgstr "Τύπος"
-
-#: src/skins/skins_cfg.cc:245
-msgid "Visualization type:"
-msgstr "Τύπος οπτικοποίησης:"
-
-#: src/skins/skins_cfg.cc:248
-msgid "Analyzer"
-msgstr "Αναλυτής"
-
-#: src/skins/skins_cfg.cc:249
-msgid "Show peaks"
-msgstr "Εμφάνιση κορυφών"
-
-#: src/skins/skins_cfg.cc:251
+#: src/skins-qt/skins_cfg.cc:267 src/skins/skins_cfg.cc:249
 msgid "Coloring:"
 msgstr "Χρωματισμός:"
 
-#: src/skins/skins_cfg.cc:254
+#: src/skins-qt/skins_cfg.cc:270 src/skins/skins_cfg.cc:252
 msgid "Style:"
 msgstr "Στυλ:"
 
-#: src/skins/skins_cfg.cc:257
+#: src/skins-qt/skins_cfg.cc:273 src/skins/skins_cfg.cc:255
 msgid "Falloff:"
-msgstr "Πτώση εκτός:"
+msgstr "Μείωση:"
 
-#: src/skins/skins_cfg.cc:260
+#: src/skins-qt/skins_cfg.cc:276 src/skins/skins_cfg.cc:258
 msgid "Peak falloff:"
-msgstr "Κορυφή εκτός:"
+msgstr "Μείωση κορυφής:"
 
-#: src/skins/skins_cfg.cc:264
+#: src/skins-qt/skins_cfg.cc:282 src/skins/skins_cfg.cc:264
 msgid "Scope Style:"
-msgstr "Πεδίο Στυλ:"
+msgstr "Στυλ κυματομορφής:"
 
-#: src/skins/skins_cfg.cc:267
+#: src/skins-qt/skins_cfg.cc:285 src/skins/skins_cfg.cc:267
 msgid "Voiceprint Coloring:"
-msgstr "Ηχητικό αποτύπωμα χρωματισμού:"
+msgstr "Χρωματισμός ηχητικού αποτυπώματος:"
 
-#: src/skins/skins_cfg.cc:270
+#: src/skins-qt/skins_cfg.cc:288 src/skins/skins_cfg.cc:270
 msgid "VU Meter Style:"
-msgstr "VU Μετρητής Στυλ:"
-
-#: src/skins/skins_cfg.cc:276
-msgid "General"
-msgstr "Γενικά"
-
-#: src/skins/skins_cfg.cc:277
-msgid "Visualization"
-msgstr "Οπτικοποίηση"
-
-#: src/skins/ui_equalizer.cc:282
-msgid "Preamp"
-msgstr "Προενίσχυση"
-
-#: src/skins/ui_equalizer.cc:286
-msgid "31 Hz"
-msgstr "31 Hz"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "63 Hz"
-msgstr "63 Hz"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "125 Hz"
-msgstr "125 Hz"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "250 Hz"
-msgstr "250 Hz"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "500 Hz"
-msgstr "500 Hz"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "1 kHz"
-msgstr "1 kHz"
-
-#: src/skins/ui_equalizer.cc:288
-msgid "2 kHz"
-msgstr "2 kHz"
-
-#: src/skins/ui_equalizer.cc:288
-msgid "4 kHz"
-msgstr "4 kHz"
-
-#: src/skins/ui_equalizer.cc:288
-msgid "8 kHz"
-msgstr "8 kHz"
-
-#: src/skins/ui_equalizer.cc:288
-msgid "16 kHz"
-msgstr "16 kHz"
-
-#: src/skins/ui_equalizer.cc:330
-msgid "Audacious Equalizer"
-msgstr "Ισοσταθμιτής Audacious"
-
-#: src/skins/ui_main.cc:688
-#, c-format
-msgid "Seek to %d:%-2.2d / %d:%-2.2d"
-msgstr "Αναζητηση σε %d:%-2.2d / %d:%-2.2d"
-
-#: src/skins/ui_main.cc:709
-#, c-format
-msgid "Volume: %d%%"
-msgstr "Ένταση: %d%%"
-
-#: src/skins/ui_main.cc:732
-#, c-format
-msgid "Balance: %d%% left"
-msgstr "Ισορροπία: %d%% αριστερά"
-
-#: src/skins/ui_main.cc:734
-msgid "Balance: center"
-msgstr "Ισορροπία: κέντρο"
-
-#: src/skins/ui_main.cc:736
-#, c-format
-msgid "Balance: %d%% right"
-msgstr "Ισορροπία: %d%% δεξιά"
-
-#: src/skins/ui_main.cc:842
-msgid "Options Menu"
-msgstr "Μενού Επιλογών"
-
-#: src/skins/ui_main.cc:846
-msgid "Disable 'Always On Top'"
-msgstr "Απενεργοποίηση του 'Πάντα στην κορυφή'"
-
-#: src/skins/ui_main.cc:848
-msgid "Enable 'Always On Top'"
-msgstr "Ενεργοποίηση του 'Πάντα στην κορυφή'"
-
-#: src/skins/ui_main.cc:851
-msgid "File Info Box"
-msgstr "Πλαίσιο αρχείου πληροφοριών "
-
-#: src/skins/ui_main.cc:857
-msgid "Visualizations"
-msgstr "Οπτικοποιησεις"
-
-#: src/skins/ui_main.cc:1336
-msgid "Repeat point A set."
-msgstr "Επαναληψη του σημείου Α"
-
-#: src/skins/ui_main.cc:1341
-msgid "Repeat point B set."
-msgstr "Επαναληψη του σημείου Β"
-
-#: src/skins/ui_main.cc:1350
-msgid "Repeat points cleared."
-msgstr "Επανάληψη σημείων εκκαθαρισης."
-
-#: src/skins/ui_playlist.cc:219
-msgid "Search entries in active playlist"
-msgstr "Αναζήτηση καταχωρήσεων σε ενεργή λίστα αναπαραγωγής"
-
-#: src/skins/ui_playlist.cc:226
-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 ""
-"Επιλέξτε καταχωρήσεις στην playlist συμπληρώνοντας ένα ή περισσότερα πεδία. "
-"Τα πεδία χρησιμοποιούν την τακτική σύνταξη έκφρασης, διάκριση πεζών-"
-"κεφαλαίων. Αν δεν ξέρετε πώς κανονικές εκφράσεις λειτουργούν, απλά εισάγετε "
-"ένα κυριολεκτικό τμήμα αυτό που αναζητάτε."
-
-#: src/skins/ui_playlist.cc:234
-msgid "Title:"
-msgstr "Τίτλος: "
-
-#: src/skins/ui_playlist.cc:241
-msgid "Album:"
-msgstr "Δίσκος: "
-
-#: src/skins/ui_playlist.cc:248
-msgid "Artist:"
-msgstr "Καλλιτέχνης: "
+msgstr "Στυλ μετρητή VU:"
 
-#: src/skins/ui_playlist.cc:255
-msgid "File Name:"
-msgstr "Όνομα Αρχείου:"
-
-#: src/skins/ui_playlist.cc:263
-msgid "Clear previous selection before searching"
-msgstr "Εκκαθάριση προηγούμενων επιλογων πριν από την αναζήτηση"
+#: src/skins-qt/skins_cfg.cc:294 src/skins/skins_cfg.cc:276
+msgid "Type"
+msgstr "Τύπος"
 
-#: src/skins/ui_playlist.cc:266
-msgid "Automatically toggle queue for matching entries"
-msgstr "Αυτόματη εναλλαγή σειράς αναμονής για τις καταχωρήσεις που ταιριάζουν"
+#: src/skins-qt/skins_cfg.cc:295 src/skins/skins_cfg.cc:277
+msgid "Visualization type:"
+msgstr "Τύπος οπτικού εφέ:"
 
-#: src/skins/ui_playlist.cc:269
-msgid "Create a new playlist with matching entries"
-msgstr "Δημιουργία νέας λίστας αναπαραγωγής με τις καταχωρήσεις που ταιριάζουν"
+#: src/skins-qt/skins_cfg.cc:298 src/skins/skins_cfg.cc:280
+msgid "Analyzer"
+msgstr "Αναλυτής"
 
-#: src/skins/ui_playlist.cc:717
-msgid "Audacious Playlist Editor"
-msgstr "Audacious Επιμέλεια αναπαραγωγής"
+#: src/skins-qt/skins_cfg.cc:299 src/skins/skins_cfg.cc:281
+msgid "Show peaks"
+msgstr "Εμφάνιση κορυφών"
 
-#: src/skins/ui_playlist.cc:752
-#, c-format
-msgid "%s (%d of %d)"
-msgstr "%s (%d από %d)"
+#: src/skins-qt/skins_cfg.cc:308 src/skins/skins_cfg.cc:290
+msgid "Visualization"
+msgstr "Οπτικό εφέ"
 
-#: src/skins/ui_skinselector.cc:167
+#: src/skins-qt/skinselector.cc:98 src/skins/skinselector.cc:111
 msgid "Archived Winamp 2.x skin"
-msgstr "Αρχειοθετημένο Winamp 2.x skin"
+msgstr "Αρχειοθετημένη εμφάνιση Winamp 2.x"
 
-#: src/skins/ui_skinselector.cc:172
+#: src/skins-qt/skinselector.cc:102 src/skins/skinselector.cc:115
 msgid "Unarchived Winamp 2.x skin"
-msgstr "Αποαρχειοθετημένο Winamp 2.x skin"
-
-#: src/skins/util.cc:430
-#, c-format
-msgid "Could not create directory (%s): %s\n"
-msgstr "Δεν ήταν δυνατή η δημιουργία του καταλόγου (%s): %s\n"
+msgstr "Αποαρχειοθετημένη εμφάνιση Winamp 2.x"
 
-#: src/sndfile/plugin.cc:39
+#: src/sndfile/plugin.cc:38
 msgid "Sndfile Plugin"
 msgstr "Πρόσθετο Sndfile"
 
-#: src/sndfile/plugin.cc:336
+#: src/sndfile/plugin.cc:372
 msgid ""
 "Based on the xmms_sndfile plugin:\n"
 "Copyright (C) 2000, 2002 Erik de Castro Lopo\n"
@@ -3979,130 +4245,136 @@
 "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"
+"Βασισμένο στο πρόσθετο xmms_sndfile:\n"
+"Πνευματικά δικαιώματα (C) 2000, 2002, Erik de Castro Lopo\n"
 "\n"
 "Προσαρμοσμένο για το Audacious από τον Tony Vroon <chainsaw@gentoo.org>\n"
 "\n"
-"Αυτό το πρόγραμμα είναι ελεύθερο λογισμικό. Επιτρέπεται η αναδιανομή ή / και "
-"τροποποίησή του υπό τους όρους της GNU General Public License όπως αυτή έχει "
-"δημοσιευθεί από το Ίδρυμα Ελεύθερου Λογισμικού είτε την έκδοση 2 της Άδειας, "
-"είτε (κατ 'επιλογή σας) οποιαδήποτε μεταγενέστερη έκδοση.\n"
-"\n"
-"Αυτό το πρόγραμμα διανέμεται με την ελπίδα ότι θα είναι χρήσιμο,\n"
-"αλλά ΧΩΡΙΣ ΚΑΜΙΑ ΕΓΓΥΗΣΗ? χωρίς καν την υπονοούμενη εγγύηση της "
-"ΕΜΠΟΡΕΥΣΙΜΟΤΗΤΑΣ ή ΚΑΤΑΛΛΗΛΟΤΗΤΑΣ ΓΙΑ ΕΝΑ ΣΥΓΚΕΚΡΙΜΕΝΟ ΣΚΟΠΟ. Δείτε το GNU "
-"General Public License για περισσότερες λεπτομέρειες.\n"
-"\n"
-"Θα πρέπει να έχετε λάβει ένα αντίγραφο της GNU General Άδειας Δημόσιας "
-"Χρήσης μαζί με αυτό το πρόγραμμα. Εάν όχι, γράψτε στο Ελεύθερο Λογισμικό "
-"Foundation, Inc., 51 Franklin Street, στον πέμπτο όροφο, Boston, MA "
-"02110-1301, ΗΠΑ."
+"Το πρόγραμμα αυτό είναι ελεύθερο λογισμικό. Επιτρέπεται η αναδιανομή ή/και "
+"τροποποίησή του υπό τους όρους της άδειας GNU General Public, όπως αυτή έχει "
+"δημοσιευθεί από το Ίδρυμα Ελεύθερου Λογισμικού είτε την έκδοση 2 είτε (κατά "
+"την επιλογή σας) σε οποιαδήποτε μεταγενέστερη έκδοση της.\n"
+"\n"
+"Διανέμεται με την ελπίδα ότι θα είναι χρήσιμο, αλλά ΧΩΡΙΣ ΚΑΜΙΑ ΕΓΓΥΗΣΗ, "
+"χωρίς καν την υπονοούμενη εγγύηση της ΕΜΠΟΡΕΥΣΙΜΟΤΗΤΑΣ ή ΚΑΤΑΛΛΗΛΟΤΗΤΑΣ ΓΙΑ "
+"ΕΝΑ ΣΥΓΚΕΚΡΙΜΕΝΟ ΣΚΟΠΟ. Για περισσότερες λεπτομέρειες δείτε την άδεια GNU "
+"General Public.\n"
+"\n"
+"Θα πρέπει να έχετε λάβει ένα αντίγραφο της άδειας GNU General Public μαζί με "
+"αυτό το πρόγραμμα. Εάν όχι, γράψτε στο Free Software Foundation, Inc., 51 "
+"Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 
-#: src/sndio-ng/sndio.cc:44
+#: src/sndio/sndio.cc:43
 msgid "Sndio Output"
 msgstr "Έξοδος Sndio"
 
-#: src/sndio-ng/sndio.cc:98
+#: src/sndio/sndio.cc:98
 msgid "Device (blank for default):"
 msgstr "Συσκευή (κενό ως προεπιλογή):"
 
-#: src/sndio-ng/sndio.cc:100
+#: src/sndio/sndio.cc:100
 msgid "Save and restore volume:"
-msgstr "Αποθήκευση και επαναφορά του ήχου:"
+msgstr "Αποθήκευση και επαναφορά της έντασης:"
 
-#: src/sndio-ng/sndio.cc:181
+#: src/sndio/sndio.cc:181
 #, c-format
 msgid "Sndio error: Unsupported audio format (%d)"
-msgstr "Sndio σφάλμα: Μη υποστηριζόμενη μορφή ήχου (%d)"
+msgstr "Σφάλμα Sndio: Μη υποστηριζόμενη μορφή ήχου (%d)"
 
-#: src/sndio-ng/sndio.cc:192
+#: src/sndio/sndio.cc:192
 msgid "Sndio error: sio_open() failed"
-msgstr "Sndio σφάλμα: sio_open() απέτυχε"
+msgstr "Σφάλμα Sndio: αποτυχία sio_open()"
 
-#: src/sndio-ng/sndio.cc:222
+#: src/sndio/sndio.cc:221
 msgid "Sndio error: sio_setpar() failed"
-msgstr "Sndio σφάλμα: sio_setpar() απέτυχε"
+msgstr "Σφάλμα Sndio: αποτυχία sio_setpar()"
 
-#: src/sndio-ng/sndio.cc:234
+#: src/sndio/sndio.cc:233
 msgid "Sndio error: sio_start() failed"
-msgstr "Sndio σφάλμα: session_start() απέτυχε"
+msgstr "Σφάλμα Sndio: αποτυχία session_start()"
 
-#: src/song_change/song_change.cc:33
+#: src/songchange/song_change.cc:30
 msgid "Song Change"
-msgstr "Αλλαγή Τραγουδιού"
+msgstr "Αλλαγή τραγουδιού"
 
-#: src/song_change/song_change.cc:342
-msgid ""
-"Parameters passed to the shell should be encapsulated in "
-"quotes. Doing otherwise is a security risk."
-msgstr ""
-"Παράμετροι που πέρασαν στο κέλυφος θα πρέπει να κλειστούν "
-"σε εισαγωγικά. Κάτι άλλο είναι κίνδυνος για την ασφάλεια."
-
-#: src/song_change/song_change.cc:358
+#: src/songchange/song_change.cc:256
 msgid "Commands"
 msgstr "Εντολές"
 
-#: src/song_change/song_change.cc:360
+#: src/songchange/song_change.cc:258
 msgid "Command to run when starting a new song:"
-msgstr "Εντολή για εκτέλεση όταν αρχίζει νέο τραγούδι:"
+msgstr "Εντολή όταν αρχίζει νέο τραγούδι:"
+
+#: src/songchange/song_change.cc:261
+msgid "Command to run when stopping a song:"
+msgstr "Εντολή στη διακοπή ενός τραγουδιού:"
 
-#: src/song_change/song_change.cc:364
+#: src/songchange/song_change.cc:264
 msgid "Command to run at the end of a song:"
-msgstr "Εντολή για εκτέλεση πλησιάζωντας το τέλος ενός τραγουδιού:"
+msgstr "Εντολή στο τέλος ενός τραγουδιού:"
 
-#: src/song_change/song_change.cc:368
+#: src/songchange/song_change.cc:267
 msgid "Command to run at the end of the playlist:"
-msgstr "Εντολή για εκτέλεση στο τέλος της λίστας αναπαραγωγής."
+msgstr "Εντολή στο τέλος της λίστας αναπαραγωγής:"
 
-#: src/song_change/song_change.cc:372
+#: src/songchange/song_change.cc:270
 msgid "Command to run when song title changes (for network streams):"
+msgstr "Εντολή όταν αλλάζει ο τίτλος του τραγουδιού (για ροές στο διαδίκτυο):"
+
+#: src/songchange/song_change.cc:273
+msgid ""
+"You can use the following format codes, which will be replaced before "
+"running the command.\n"
+"Not all are useful though for the song-stopped or end-of-playlist command."
 msgstr ""
-"Εντολή για εκτέλεση όταν αλλαζει ο τίτλος του τραγουδιού (για ροές στο "
-"διαδίκτυο)."
+"Μπορείτε να χρησιμοποιήσετε τους παρακάτω κωδικούς μορφοποίησης, οι οποίοι "
+"θα αντικατασταθούν πριν από την εκτέλεση της εντολής.\n"
+"Ωστόσο, δεν λειτουργούν όλοι για τις εντολές διακοπής ενός τραγουδιού ή "
+"τέλος της λίστας αναπαραγωγής."
 
-#: src/song_change/song_change.cc:376
+#: src/songchange/song_change.cc:276
 msgid ""
-"You can use the following format strings which will be substituted before "
-"calling the command (not all are useful for the end-of-playlist command):\n"
-"\n"
-"%F: Frequency (in hertz)\n"
+"%a: Artist\n"
+"%b: Album\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"
+"%F: Frequency (Hertz)\n"
+"%l: Length (milliseconds)\n"
+"%n or %s: Formatted title (see playlist settings)\n"
 "%p: Currently playing (1 or 0)\n"
-"%a: Artist\n"
-"%b: Album\n"
-"%T: Track title"
+"%r: Rate (bits per second)\n"
+"%t: Playlist position\n"
+"%T: Title (unformatted)"
+msgstr ""
+"%a: Καλλιτέχνης\n"
+"%b: Άλμπουμ\n"
+"%c: Αριθμός καναλιών\n"
+"%f: Όνομα αρχείου (πλήρης διαδρομή)\n"
+"%F: Συχνότητα (Hertz)\n"
+"%l: Διάρκεια (milliseconds)\n"
+"%n ή %s: Μορφοποιημένος τίτλος (βλέπε ρυθμίσεις λίστας αναπαραγωγής)\n"
+"%p: Παίζεται τώρα (1 ή 0)\n"
+"%r: Ρυθμός (bit ανά δευτερόλεπτο)\n"
+"%t: Θέση στη λίστα αναπαραγωγής\n"
+"%T: Τίτλος (μη μορφοποιημένος)"
+
+#: src/songchange/song_change.cc:287
+msgid ""
+"Parameters passed to the shell should be enclosed in quotation marks.\n"
+"Unquoted parameters may lead to unexpected results."
 msgstr ""
-"Μπορείτε να χρησιμοποιήσετε τις ακόλουθες συμβολοσειρές μορφοτύπου που θα "
-"αντικατασταθεί πριν από την κλήση της εντολής (δεν είναι όλα χρήσιμα για την "
-"εντολή στο τέλος της λίστας αναπαραγωγής):\n"
-"% F: Συχνότητα (σε hertz)\n"
-"% c: Αριθμός καναλιών\n"
-"% f: Όνομα αρχείου (πλήρης διαδρομή)\n"
-"% Ε: Μήκος (σε χιλιοστά του δευτερολέπτου)\n"
-"%n η %s: Ονομα τραγουδιου\n"
-"% r: Βαθμολογία (σε bits ανά δευτερόλεπτο)\n"
-"% t: θέση λίστας αναπαραγωγής (%02dp:) \n"
-"% t: Σήμερα παίζουν (1 ή 0)\n"
-"% a: Καλλιτέχνης\n"
-"% b: Άλμπουμ\n"
-"% T: διαδρομή τίτλου"
-
-#: src/song-info-qt/song-info.cc:32
-msgid "Song Info (Qt)"
-msgstr "Πληροφορίες τραγουδιού (Qt)"
+"Οι παράμετροι για το κέλυφος πρέπει να περικλείονται με εισαγωγικά.\n"
+"Παράμετροι χωρίς εισαγωγικά μπορεί να οδηγήσουν σε απρόβλεπτα αποτελέσματα."
+
+#: src/song-info-qt/song-info.cc:30
+msgid "Song Info"
+msgstr "Πληροφορίες τραγουδιού"
 
-#: src/sox-resampler/sox-resampler.cc:44
+#: src/soxr/sox-resampler.cc:44
 msgid "SoX Resampler"
-msgstr "SoX Ανασχεδίαση"
+msgstr "Ανασχεδίαση SoX"
 
-#: src/sox-resampler/sox-resampler.cc:144
+#: src/soxr/sox-resampler.cc:172
 msgid ""
 "SoX Resampler Plugin for Audacious\n"
 "Copyright 2013 Michał Lipski\n"
@@ -4110,105 +4382,153 @@
 "Based on Sample Rate Converter Plugin:\n"
 "Copyright 2010-2012 John Lindgren"
 msgstr ""
-"SoΧ ανασχεδιασμος Πρόσθετο για το Audacious\n"
-"Copyright 2013 Michał Lipski\n"
+"Πρόσθετο Ανασχεδίαση SoΧ για το Audacious\n"
+"Πνευματικά δικαιώματα 2013 Michał Lipski\n"
 "\n"
-"Με βάση την Sample Rate Converter Πρόσθετο:\n"
+"Βασίζεται στο πρόσθετο Μετατροπή ρυθμού δειγματοληψίας\n"
 "Πνευματικά δικαιώματα 2010-2012 John Lindgren"
 
-#: src/sox-resampler/sox-resampler.cc:150
+#: src/soxr/sox-resampler.cc:178
 msgid "Quick"
-msgstr "Γρήγορα"
+msgstr "Γρήγορη"
 
-#: src/sox-resampler/sox-resampler.cc:151
+#: src/soxr/sox-resampler.cc:179
 msgid "Low"
-msgstr "Χαμηλα"
+msgstr "Χαμηλή"
 
-#: src/sox-resampler/sox-resampler.cc:153
+#: src/soxr/sox-resampler.cc:181
 msgid "High"
-msgstr "Υψηλα"
+msgstr "Υψηλή"
 
-#: src/sox-resampler/sox-resampler.cc:154
+#: src/soxr/sox-resampler.cc:182
 msgid "Very High"
-msgstr "Πολύ υψηλα"
+msgstr "Πολύ υψηλή"
+
+#: src/soxr/sox-resampler.cc:183
+msgid "Ultra High"
+msgstr "Υπέρ υψηλή"
 
-#: src/sox-resampler/sox-resampler.cc:158
+#: src/soxr/sox-resampler.cc:187
+msgid "Minimum"
+msgstr "Ελάχιστη"
+
+#: src/soxr/sox-resampler.cc:188
+msgid "Intermediate"
+msgstr "Ενδιάμεση"
+
+#: src/soxr/sox-resampler.cc:193
 msgid "Quality:"
 msgstr "Ποιότητα:"
 
-#: src/speed-pitch/speed-pitch.cc:51
+#: src/soxr/sox-resampler.cc:196
+msgid "Phase:"
+msgstr "Φάση:"
+
+#: src/soxr/sox-resampler.cc:200
+msgid "Allow aliasing"
+msgstr "Να επιτρέπεται η χρήση ψευδώνυμων "
+
+#: src/soxr/sox-resampler.cc:202
+msgid "Use steep filter"
+msgstr "Άμεση χρήση φίλτρου"
+
+#: src/speedpitch/speed-pitch.cc:54
 msgid "Speed and Pitch"
-msgstr "Ταχύτητα και Χροιά:"
+msgstr "Ταχύτητα και Χροιά"
 
-#: src/speed-pitch/speed-pitch.cc:210
-msgid "Speed and Pitch"
-msgstr "Ταχύτητα και Χροιά"
+#: src/speedpitch/speed-pitch.cc:247
+msgid "Speed"
+msgstr "Ταχύτητα"
 
-#: src/speed-pitch/speed-pitch.cc:211
-msgid "Speed:"
-msgstr "Ταχύτητα:"
+#: src/speedpitch/speed-pitch.cc:248
+msgid "Decouple from pitch"
+msgstr "Αποσύνδεση από τη χροιά"
 
-#: src/speed-pitch/speed-pitch.cc:214
-msgid "Pitch:"
-msgstr "Χροιά:"
+#: src/speedpitch/speed-pitch.cc:250 src/speedpitch/speed-pitch.cc:258
+msgid "Multiplier:"
+msgstr "Πολλαπλασιαστής:"
 
-#: src/statusicon/statusicon.cc:47
+#: src/speedpitch/speed-pitch.cc:254
+msgid "Pitch"
+msgstr "Χροιά"
+
+#: src/statusicon-qt/statusicon.cc:45 src/statusicon/statusicon.cc:47
 msgid "Status Icon"
 msgstr "Εικονίδιο κατάστασης"
 
-#: src/statusicon/statusicon.cc:283
-msgid "Se_ttings ..."
-msgstr "Ρυθμίσεις ..."
-
-#: src/statusicon/statusicon.cc:372
+#: src/statusicon-qt/statusicon.cc:68
 msgid ""
-"Status Icon Plugin\n"
+"Status Icon Plugin (partial port for Qt interface)\n"
 "\n"
 "Copyright 2005-2007 Giacomo Lozito <james@develia.org>\n"
 "Copyright 2010 Michał Lipski <tallica@o2.pl>\n"
+"Copyright 2015 Eugene Paskevich <eugene@raptor.kiev.ua>\n"
 "\n"
 "This plugin provides a status icon, placed in\n"
 "the system tray area of the window manager."
 msgstr ""
-"Κατάσταση εικονιδίου Πρόσθετο\n"
+"Πρόσθετο Εικονίδιο κατάστασης (τμήμα της διεπαφής Qt)\n"
 "\n"
 "Πνευματικά δικαιώματα 2005-2007 Giacomo Lozito <james@develia.org>\n"
-"Copyright 2010 Michał Lipski <tallica@o2.pl>\n"
+"Πνευματικά δικαιώματα2010 Michał Lipski <tallica@o2.pl>\n"
+"Πνευματικά δικαιώματα 2015 Eugene Paskevich <eugene@raptor.kiev.ua>\n"
 "\n"
-"Αυτό το πρόσθετο παρέχει ένα εικονίδιο κατάστασης, που τοποθετείται στην "
-"περιοχή του δίσκου συστήματος του διαχειριστή παραθύρων."
+"Το πρόσθετο αυτό παρέχει ένα εικονίδιο κατάστασης σε\n"
+"περιοχή του συστήματος."
 
-#: src/statusicon/statusicon.cc:379
+#: src/statusicon-qt/statusicon.cc:89 src/statusicon/statusicon.cc:384
 msgid "Mouse Scroll Action"
-msgstr "Ποντίκι κύλισης Δράση"
+msgstr "Ενέργεια του δρομέα κύλισης στο ποντίκι"
 
-#: src/statusicon/statusicon.cc:380
+#: src/statusicon-qt/statusicon.cc:90 src/statusicon/statusicon.cc:385
 msgid "Change volume"
 msgstr "Αλλαγή έντασης"
 
-#: src/statusicon/statusicon.cc:383
+#: src/statusicon-qt/statusicon.cc:93 src/statusicon/statusicon.cc:388
 msgid "Change playing song"
-msgstr "Αλλαγή τραγουδιου που αναπαράγεται"
+msgstr "Αλλαγή τραγουδιού που αναπαράγεται"
 
-#: src/statusicon/statusicon.cc:386
+#: src/statusicon-qt/statusicon.cc:96 src/statusicon/statusicon.cc:391
 msgid "Other Settings"
-msgstr "Άλλες Ρυθμίσεις"
+msgstr "Άλλες ρυθμίσεις"
 
-#: src/statusicon/statusicon.cc:387
+#: src/statusicon-qt/statusicon.cc:97 src/statusicon/statusicon.cc:392
 msgid "Disable the popup window"
 msgstr "Απενεργοποίηση του αναδυόμενου παραθύρου"
 
-#: src/statusicon/statusicon.cc:389
+#: src/statusicon-qt/statusicon.cc:99 src/statusicon/statusicon.cc:394
 msgid "Close to the system tray"
-msgstr "Κλείσιμο στο δίσκο του συστήματος"
+msgstr "Κλείσιμο στο εικονίδιο κατάστασης"
 
-#: src/statusicon/statusicon.cc:391
+#: src/statusicon-qt/statusicon.cc:101 src/statusicon/statusicon.cc:396
 msgid "Advance in playlist when scrolling upward"
-msgstr "Προωθήστε στην playlist κατά την κύλιση προς τα πάνω"
+msgstr "Μετακίνηση στη λίστα αναπαραγωγής με κύλιση προς τα επάνω"
+
+#: src/statusicon-qt/statusicon.cc:116 src/statusicon/statusicon.cc:287
+msgid "Se_ttings ..."
+msgstr "Ρυ_θμίσεις ..."
+
+#: src/statusicon/statusicon.cc:377
+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/stereo_plugin/stereo.cc:19
 msgid "Extra Stereo"
-msgstr "Επιπλέον Στερεοφωνικό"
+msgstr "Επιπλέον στερεοφωνικό"
 
 #: src/stereo_plugin/stereo.cc:36
 msgid ""
@@ -4216,28 +4536,168 @@
 "\n"
 "By Johan Levin, 1999"
 msgstr ""
-"Επιπλέον Στερεοφωνικό Πρόσθετο\n"
+"Πρόσθετο Επιπλέον στερεοφωνικό\n"
 "\n"
 "Από τον Johan Levin, 1999"
 
 #: src/stereo_plugin/stereo.cc:44
 msgid "Extra Stereo"
-msgstr "Επιπλέον Στερεοφωνικό"
+msgstr "Επιπλέον στερεοφωνικό"
+
+#: src/streamtuner/icecast-model.cc:126 src/streamtuner/shoutcast-model.cc:131
+msgid "Type"
+msgstr "Τύπος"
+
+#: src/streamtuner/icecast-model.cc:132
+msgid "Current Song"
+msgstr "Τρέχον τραγούδι"
+
+#: src/streamtuner/icecast-model.cc:164
+msgid "Other"
+msgstr "Άλλο"
+
+#: src/streamtuner/ihr-model.cc:63
+msgid "Market"
+msgstr "Αγορά"
+
+#: src/streamtuner/ihr-model.cc:156
+msgid "Call Letters"
+msgstr "Γράμματα κλήσης"
+
+#: src/streamtuner/ihr-model.cc:162
+msgid "Description"
+msgstr "Περιγραφή"
+
+#: src/streamtuner/shoutcast-model.cc:128
+msgid "Listeners"
+msgstr "Ακροατές"
+
+#: src/streamtuner/shoutcast-model.cc:188
+msgid "Top 500 Stations"
+msgstr "500 κορυφαίοι σταθμοί"
+
+#: src/streamtuner/shoutcast-model.cc:189
+msgid "Alternative"
+msgstr "Εναλλακτική"
+
+#: src/streamtuner/shoutcast-model.cc:190
+msgid "Blues"
+msgstr "Blues"
+
+#: src/streamtuner/shoutcast-model.cc:191
+msgid "Classical"
+msgstr "Κλασική Μουσική"
+
+#: src/streamtuner/shoutcast-model.cc:192
+msgid "Country"
+msgstr "Country"
+
+#: src/streamtuner/shoutcast-model.cc:193
+msgid "Decades"
+msgstr "Δεκαετίες"
+
+#: src/streamtuner/shoutcast-model.cc:194
+msgid "Easy Listening"
+msgstr "Easy Listening"
+
+#: src/streamtuner/shoutcast-model.cc:195
+msgid "Electronic"
+msgstr "Ηλεκτρονική"
+
+#: src/streamtuner/shoutcast-model.cc:196
+msgid "Folk"
+msgstr "Folk"
+
+#: src/streamtuner/shoutcast-model.cc:197
+msgid "Inspirational"
+msgstr "Inspirational"
+
+#: src/streamtuner/shoutcast-model.cc:198
+msgid "International"
+msgstr "Διεθνής"
+
+#: src/streamtuner/shoutcast-model.cc:199
+msgid "Jazz"
+msgstr "Jazz"
+
+#: src/streamtuner/shoutcast-model.cc:200
+msgid "Latin"
+msgstr "Λάτιν"
+
+#: src/streamtuner/shoutcast-model.cc:201
+msgid "Metal"
+msgstr "Metal"
+
+#: src/streamtuner/shoutcast-model.cc:203
+msgid "New Age"
+msgstr "New Age"
+
+#: src/streamtuner/shoutcast-model.cc:204
+msgid "Pop"
+msgstr "Pop"
+
+#: src/streamtuner/shoutcast-model.cc:205
+msgid "Public Radio"
+msgstr "Δημόσιο Ράδιο"
+
+#: src/streamtuner/shoutcast-model.cc:206
+msgid "R&B and Urban"
+msgstr "R&B και Urban"
+
+#: src/streamtuner/shoutcast-model.cc:207
+msgid "Rap"
+msgstr "Rap"
+
+#: src/streamtuner/shoutcast-model.cc:208
+msgid "Reggae"
+msgstr "Reggae"
+
+#: src/streamtuner/shoutcast-model.cc:209
+msgid "Rock"
+msgstr "Rock"
+
+#: src/streamtuner/shoutcast-model.cc:210
+msgid "Seasonal and Holiday"
+msgstr "Εποχής και Εορτών"
+
+#: src/streamtuner/shoutcast-model.cc:211
+msgid "Soundtracks"
+msgstr "Κομμάτια τραγουδιών "
+
+#: src/streamtuner/shoutcast-model.cc:212
+msgid "Talk"
+msgstr "Μίλησε"
+
+#: src/streamtuner/shoutcast-model.cc:213
+msgid "Themes"
+msgstr "Θέματα"
+
+#: src/streamtuner/streamtuner.cc:59
+msgid "Shoutcast"
+msgstr "Shoutcast"
+
+#: src/streamtuner/streamtuner.cc:60
+msgid "Icecast"
+msgstr "Icecast"
+
+#: src/streamtuner/streamtuner.cc:71
+msgid "Stream Tuner"
+msgstr "Ρυθμιστής αναμετάδοσης "
 
 #: src/tonegen/tonegen.cc:45
 msgid "Tone Generator"
-msgstr "Γεννήτρια Τόνων"
+msgstr "Γεννήτρια τόνων"
 
-#: src/tonegen/tonegen.cc:94
+#: src/tonegen/tonegen.cc:92
 #, c-format
 msgid "%s %.1f Hz"
 msgstr "%s %.1f Hz"
 
-#: src/tonegen/tonegen.cc:94
+#: src/tonegen/tonegen.cc:92
 msgid "Tone Generator: "
-msgstr "Γεννήτρια Τόνων: "
+msgstr "Γεννήτρια τόνων: "
 
-#: src/tonegen/tonegen.cc:160
+#: src/tonegen/tonegen.cc:161
 msgid ""
 "Sine tone generator by Håvard Kvålen <havardk@xmms.org>\n"
 "Modified by Daniel J. Peng <danielpeng@bigfoot.com>\n"
@@ -4245,17 +4705,39 @@
 "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 <Ντάνιελ peng@bigfoot.com>\n"
-"Για να την χρησιμοποιήσετε, προσθέστε ένα URL: τόνου://συχνότητα 1; "
-"Συχνότητα2; Συχνότητα 3;...\n"
-"π.χ. Ήχος://2000;2005 για να παίξει έναν ήχο Hz 2000 και έναν τόνο 2005 Hz"
+"Γεννήτρια τόνων Sine από τον Håvard Kvålen <havardk@xmms.org>\n"
+"Τροποποιήθηκε από τον Daniel J. Peng <danielpeng@bigfoot.com>\n"
+"\n"
+"Για να την χρησιμοποιήσετε, προσθέστε ένα URL: tone://frequency1;frequency2;"
+"frequency3;..\n"
+"π.χ. τόνος://2000;2005 για να παίξει ένα τόνο 2000 Hz και ένα τόνο 2005 Hz"
+
+#: src/ui-common/dialogs-qt.cc:40
+msgid ""
+"\n"
+"(Further messages have been hidden.)"
+msgstr ""
+"\n"
+"(Έχουν κρυφτεί περισσότερα μηνύματα.)"
+
+#: src/ui-common/dialogs-qt.cc:52
+msgid "Working ..."
+msgstr "Εργασία ..."
+
+#: src/ui-common/dialogs-qt.cc:73
+msgid "Information"
+msgstr "Πληροφόρηση"
+
+#: src/ui-common/menu-ops-gtk.cc:132 src/ui-common/menu-ops-qt.cc:113
+#, c-format
+msgid "%s does not appear to be a valid folder."
+msgstr "Ο φάκελος %s δεν φαίνεται να είναι σωστός."
 
 #: src/voice_removal/voice_removal.cc:28
 msgid "Voice Removal"
-msgstr "Αφαίρεση Φωνής"
+msgstr "Αφαίρεση φωνής"
 
-#: src/vorbis/vorbis.cc:465
+#: src/vorbis/vorbis.cc:433
 msgid ""
 "Audacious Ogg Vorbis Decoder\n"
 "\n"
@@ -4275,11 +4757,11 @@
 "Gian-Carlo Pascutto <gcp@sjeng.org>\n"
 "Eugene Zagidullin <e.asphyx@gmail.com>"
 msgstr ""
-"Αποκωδικοποιητής Ogg Vorbis\n"
+"Αποκωδικοποιητής Ogg Vorbis για το Audacious\n"
 "\n"
-"Βασισμένο στο Πρόσθετο Ogg Vorbis του Ιδρύματος Xiph.org\n"
+"Βασισμένος στο πρόσθετο Ogg Vorbis του Ιδρύματος http://www.xiph.org/\n"
 "\n"
-"Πρωτότυπος κώδικας του:\n"
+"Πρωτότυπος κώδικας από τον:\n"
 "Tony Arcieri <bascule@inferno.tusculum.edu>\n"
 "\n"
 "Συνεισφορές από τους:\n"
@@ -4296,12 +4778,12 @@
 msgid "Ogg Vorbis Decoder"
 msgstr "Αποκωδικοποιητής Ogg Vorbis"
 
-#: src/vtx/info.cc:22
+#: src/vtx/info.cc:24
 #, c-format
 msgid "Details about %s"
 msgstr "Λεπτομέρειες για %s"
 
-#: src/vtx/info.cc:24
+#: src/vtx/info.cc:26
 msgid ""
 "Title: %t\n"
 "Author: %a\n"
@@ -4315,66 +4797,130 @@
 "Player Freq: %P\n"
 "Year: %y"
 msgstr ""
-"Τίτλος:% t\n"
-"Δημιουργος:% α\n"
-"Από:% f\n"
-"Tracker% Τ\n"
-"Σχόλιο:% C\n"
-"Τύπος Chip:% C\n"
-"Στερεοφωνικό:% s\n"
-"Κυκλος:% l\n"
-"Chip συχνοτητα: F%\n"
-"Συσκευή αναπαραγωγής συχνοτήτων:% P\n"
-"Χρονολογία: y%"
+"Τίτλος: % t\n"
+"Δημιουργός: %a\n"
+"Από: %f\n"
+"Tracker: %Τ\n"
+"Σχόλιο: %C\n"
+"Τύπος chip: %c\n"
+"Στερεοφωνικό: %s\n"
+"Κύκλος: %l\n"
+"Συχν. Chip: %F\n"
+"Συχν. αναπαραγωγής: %P\n"
+"Έτος: %y"
 
 #: src/vtx/vtx.cc:38
 msgid "VTX Decoder"
 msgstr "Αποκωδικοποιητής VTX"
 
-#: src/vtx/vtx.cc:184
+#: src/vtx/vtx.cc:178
 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"
+"Αναπαραγωγή αρχείων τύπου VTX του Sashnov Alexander <sashnov@ngs.ru>\n"
 "Βασισμένο στο in_vtx.dll του Roman Sherbakov <v_soft@microfor.ru>\n"
 "Πρόσθετο για το Audacious από τον Pavel Vymetalek <pvymetalek@seznam.cz>"
 
-#: src/wavpack/wavpack.cc:24
+#: src/vumeter-qt/vumeter_qt.cc:31
+msgid ""
+"VU Meter Plugin for Audacious\n"
+"Copyright 2017-2019 Marc Sánchez Fauste"
+msgstr ""
+"Πρόσθετο Μετρητή VU για το Audacious\n"
+"Πνευματικά δικαιώματα 2017-2019 Marc Sánchez Fauste"
+
+#: src/vumeter-qt/vumeter_qt.cc:35
+msgid "VU Meter Settings"
+msgstr "Μετρητής VU Ρυθμίσεις"
+
+#: src/vumeter-qt/vumeter_qt.cc:37
+msgid "Peak hold time:"
+msgstr "Χρόνος κορυφής:"
+
+#: src/vumeter-qt/vumeter_qt.cc:42
+msgid "Fall-off time:"
+msgstr "Χρόνος πτώσης:"
+
+#: src/vumeter-qt/vumeter_qt.cc:44
+msgid "dB/second"
+msgstr "dB/δευτερόλεπτο"
+
+#: src/vumeter-qt/vumeter_qt.cc:46
+msgid "Display legend"
+msgstr "Εμφάνιση μετρητή"
+
+#: src/vumeter-qt/vumeter_qt.h:37
+msgid "VU Meter"
+msgstr "Μετρητής VU"
+
+#: src/waveout/waveout.cc:43
+msgid "Win32 waveOut"
+msgstr "Win32 waveOut"
+
+#: src/waveout/waveout.cc:69
+msgid ""
+"Win32 waveOut Plugin for Audacious\n"
+"Copyright 2016 John Lindgren"
+msgstr ""
+"Πρόσθετο Win32 waveOut για το Audacious\n"
+"Πνευματικά δικαιώματα 2016 John Lindgren"
+
+#: src/wavpack/wavpack.cc:25
 msgid "WavPack Decoder"
 msgstr "Αποκωδικοποιητής WavPack"
 
-#: src/wavpack/wavpack.cc:211
+#: src/wavpack/wavpack.cc:217
 msgid "lossy (hybrid)"
 msgstr "με απώλεια (υβριδικός)"
 
-#: src/wavpack/wavpack.cc:213
+#: src/wavpack/wavpack.cc:219
 msgid "lossy"
 msgstr "με απώλεια"
 
-#: src/wavpack/wavpack.cc:255
+#: src/wavpack/wavpack.cc:259
 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"
+"Πνευματικά δικαιώματα 2006 William Pitcock <nenolod@nenolod.net>\n"
 "\n"
-"Μερικός κώδικας εγγράφει από τον Miles Egan."
+"Μερικός κώδικας από τον Miles Egan."
 
-#: src/xsf/plugin.cc:50
+#: src/xsf/plugin.cc:74
 msgid "2SF Decoder"
 msgstr "Αποκωδικοποιητής 2SF"
 
-#: src/xsf/plugin.cc:238
+#: src/xsf/plugin.cc:429
+msgid "32728 Hz"
+msgstr "32728 Hz"
+
+#: src/xsf/plugin.cc:432
+msgid "65456 Hz"
+msgstr "65456 Hz"
+
+#: src/xsf/plugin.cc:438
+msgid "Cosine"
+msgstr "Συνημιτόνιο"
+
+#: src/xsf/plugin.cc:439
+msgid "Sharp"
+msgstr "Έντονο"
+
+#: src/xsf/plugin.cc:443
 msgid "XSF Configuration"
-msgstr "XSF Ρύθμιση"
+msgstr "Ρύθμιση XSF"
 
-#: src/xsf/plugin.cc:239
-msgid "Ignore length from file"
-msgstr "Παράβλεψη μήκους από το αρχείο"
+#: src/xsf/plugin.cc:445
+msgid "Default fade time:"
+msgstr "Προεπιλεγμένος χρόνος:"
+
+#: src/xsf/plugin.cc:447
+msgid "Interpolation mode:"
+msgstr "Λειτουργία παρεμβολής:"
 
-#: src/xspf/xspf.cc:89
+#: src/xspf/xspf.cc:95
 msgid "XML Shareable Playlists (XSPF)"
-msgstr "Διαμοιραζόμενες Λίστες Αναπαραγωγής ΧΜL (XSPF)"
+msgstr "Διαμοιραζόμενες λίστες αναπαραγωγής ΧΜL (XSPF)"

audacious-plugins-3.6.2-gtk3.tar.bz2/po/en_GB.po -> audacious-plugins-4.4.1.tar.bz2/po/en_GB.po Changed

@@ -3,15 +3,16 @@
 # This file is distributed under the same license as the Audacious Plugins package.
 #
 # Translators:
-# Andi Chandler <andi@gowling.com>, 2013
+# Andi Chandler <andi@gowling.com>, 2013,2016-2019,2022-2024
 msgid ""
 msgstr ""
 "Project-Id-Version: Audacious Plugins\n"
-"Report-Msgid-Bugs-To: http://redmine.audacious-media-player.org/\n"
-"POT-Creation-Date: 2015-02-28 19:18+0100\n"
-"PO-Revision-Date: 2015-02-04 21:21+0000\n"
-"Last-Translator: Thomas Lange <thomas-lange2@gmx.de>\n"
-"Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/"
+"Report-Msgid-Bugs-To: https://github.com/audacious-media-player/audacious/"
+"issues\n"
+"POT-Creation-Date: 2024-09-26 21:54+0200\n"
+"PO-Revision-Date: 2011-10-10 17:43+0000\n"
+"Last-Translator: Andi Chandler <andi@gowling.com>, 2013,2016-2019,2022-2024\n"
+"Language-Team: English (United Kingdom) (http://app.transifex.com/audacious/"
 "audacious/language/en_GB/)\n"
 "Language: en_GB\n"
 "MIME-Version: 1.0\n"
@@ -19,241 +20,62 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/aac-raw/aac.cc:18
+#: src/aac/aac.cc:19
 msgid "AAC (Raw) Decoder"
-msgstr ""
+msgstr "AAC (Raw) Decoder"
 
-#: src/adplug/adplug-xmms.cc:42
+#: src/adplug/adplug-xmms.cc:70
 msgid "AdPlug (AdLib Player)"
-msgstr ""
+msgstr "AdPlug (AdLib Player)"
 
-#: src/adplug/adplug-xmms.cc:156 src/modplug/modplugbmp.cc:335
-#: src/psf/plugin.cc:138 src/vtx/vtx.cc:87 src/xsf/plugin.cc:113
+#: src/adplug/adplug-xmms.cc:167 src/modplug/modplugbmp.cc:321
+#: src/psf/plugin.cc:161 src/vtx/vtx.cc:89 src/xsf/plugin.cc:204
 msgid "sequenced"
-msgstr ""
-
-#: src/alarm/alarm.cc:55 src/alarm/interface.cc:82
-msgid "Alarm"
-msgstr "Alarm"
-
-#: src/alarm/alarm.cc:782
-msgid "Set Alarm ..."
-msgstr ""
-
-#: src/alarm/alarm.cc:810
-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/interface.cc: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.cc: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.cc: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.cc:81
-msgid "This is your wakeup call."
-msgstr "This is your wakeup call."
-
-#: src/alarm/interface.cc:99
-msgid "Your reminder for today is..."
-msgstr ""
-
-#: src/alarm/interface.cc:101 src/alarm/interface.cc:386
-msgid "Reminder"
-msgstr "Reminder"
-
-#: src/alarm/interface.cc:132
-msgid "Monday"
-msgstr "Monday"
-
-#: src/alarm/interface.cc:132
-msgid "Tuesday"
-msgstr "Tuesday"
-
-#: src/alarm/interface.cc:132
-msgid "Wednesday"
-msgstr "Wednesday"
-
-#: src/alarm/interface.cc:133
-msgid "Thursday"
-msgstr "Thursday"
-
-#: src/alarm/interface.cc:133
-msgid "Friday"
-msgstr "Friday"
-
-#: src/alarm/interface.cc:133
-msgid "Saturday"
-msgstr "Saturday"
-
-#: src/alarm/interface.cc:133
-msgid "Sunday"
-msgstr "Sunday"
-
-#: src/alarm/interface.cc:171 src/alarm/interface.cc:230
-#: src/alarm/interface.cc:245
-msgid "Time"
-msgstr "Time"
-
-#: src/alarm/interface.cc:178
-msgid "Alarm at (default):"
-msgstr "Alarm at (default):"
-
-#: src/alarm/interface.cc:200
-msgid "h"
-msgstr "h"
-
-#: src/alarm/interface.cc:203
-msgid "Quiet after:"
-msgstr "Quiet after:"
-
-#: src/alarm/interface.cc:215
-msgid "hours"
-msgstr "hours"
-
-#: src/alarm/interface.cc:226
-msgid "minutes"
-msgstr "minutes"
+msgstr "sequenced"
 
-#: src/alarm/interface.cc:235
-msgid "Choose the days for the alarm to come on"
-msgstr "Choose the days for the alarm to come on"
-
-#: src/alarm/interface.cc:242
-msgid "Day"
-msgstr "Day"
-
-#: src/alarm/interface.cc:259 src/bs2b/plugin.cc:130
-#: src/skins/preset-list.cc:434 src/skins/preset-list.cc:440
-msgid "Default"
-msgstr "Default"
-
-#: src/alarm/interface.cc:288
-msgid "Days"
-msgstr "Days"
-
-#: src/alarm/interface.cc:297
-msgid "Fading"
-msgstr "Fading"
-
-#: src/alarm/interface.cc:305 src/console/plugin.cc:41
-#: src/crossfade/crossfade.cc:53 src/crossfade/crossfade.cc:59
-#: src/gtkui/settings.cc:49 src/lirc/lirc.cc:397 src/sid/xs_config.cc:85
-#: src/sid/xs_config.cc:94 src/sid/xs_config.cc:103
-msgid "seconds"
-msgstr "seconds"
-
-#: src/alarm/interface.cc:312 src/alarm/interface.cc:353
-msgid "Volume"
-msgstr "Volume"
-
-#: src/alarm/interface.cc:317
-msgid "Start at"
-msgstr "Start at"
-
-#: src/alarm/interface.cc:333
-msgid "Final"
-msgstr "Final"
-
-#: src/alarm/interface.cc:346
-msgid "Current"
-msgstr "Current"
-
-#: src/alarm/interface.cc:359
-msgid "Additional Command"
-msgstr "Additional Command"
-
-#: src/alarm/interface.cc:365 src/alarm/interface.cc:391
-msgid "enable"
-msgstr "enable"
-
-#: src/alarm/interface.cc:372
-msgid "Playlist (optional)"
-msgstr "Playlist (optional)"
+#: src/adplug/adplug-xmms.cc:349 src/sid/xs_config.cc:61
+msgid "Output"
+msgstr "Output"
 
-#: src/alarm/interface.cc:379
-msgid "Select a playlist"
-msgstr ""
+#: src/adplug/adplug-xmms.cc:350
+msgid "OPL Emulator:"
+msgstr "OPL Emulator:"
+
+#: src/adplug/adplug-xmms.cc:353 src/amidiplug/i_configure.cc:153
+#: src/console/plugin.cc:45 src/filewriter/filewriter.cc:481
+#: src/sid/xs_config.cc:65 src/xsf/plugin.cc:446
+msgid "Sample rate:"
+msgstr "Sample rate:"
 
-#: src/alarm/interface.cc:399
-msgid "Options"
-msgstr "Options"
+#: src/adplug/adplug-xmms.cc:354 src/amidiplug/i_configure.cc:155
+#: src/bs2b/plugin.cc:141 src/console/plugin.cc:47
+#: src/modplug/plugin_main.cc:77 src/resample/resample.cc:201
+#: src/resample/resample.cc:207 src/resample/resample.cc:211
+#: src/resample/resample.cc:215 src/resample/resample.cc:219
+#: src/resample/resample.cc:223 src/resample/resample.cc:227
+#: src/resample/resample.cc:231 src/resample/resample.cc:235
+#: src/resample/resample.cc:239 src/resample/resample.cc:243
+#: src/sid/xs_config.cc:67 src/soxr/sox-resampler.cc:205
+msgid "Hz"
+msgstr "Hz"
 
-#: src/alarm/interface.cc:404
-msgid "What do these options mean?"
-msgstr "What do these options mean?"
+#: src/adplug/adplug-xmms.cc:355 src/gtkui/settings.cc:55
+#: src/modplug/plugin_main.cc:105 src/qtui/settings.cc:85
+#: src/skins-qt/skins_cfg.cc:302 src/skins/skins_cfg.cc:284
+msgid "Miscellaneous"
+msgstr "Miscellaneous"
 
-#: src/alarm/interface.cc:420
-msgid "Help"
-msgstr "Help"
+#: src/adplug/adplug-xmms.cc:356
+msgid "Repeat song in endless loop"
+msgstr "Repeat song in endless loop"
 
-#: src/albumart/albumart.cc:31
+#: src/albumart/albumart.cc:31 src/albumart-qt/albumart.cc:35
 msgid "Album Art"
-msgstr ""
+msgstr "Album Art"
 
-#: src/albumart-qt/albumart.cc:33
-msgid "Album Art (Qt)"
-msgstr ""
-
-#: src/alsa/alsa.h:70
+#: src/alsa/alsa.h:64
 msgid "ALSA Output"
-msgstr ""
+msgstr "ALSA Output"
 
 #: src/alsa/config.cc:28
 msgid ""
@@ -263,10 +85,15 @@
 "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/config.cc:61
 msgid "(no description)"
-msgstr ""
+msgstr "(no description)"
 
 #: src/alsa/config.cc:166
 msgid "Default PCM device"
@@ -288,11 +115,11 @@
 msgid "Mixer element:"
 msgstr "Mixer element:"
 
-#: src/amidi-plug/amidi-plug.cc:41
+#: src/amidiplug/amidi-plug.cc:42
 msgid "AMIDI-Plug (MIDI Player)"
-msgstr ""
+msgstr "AMIDI-Plug (MIDI Player)"
 
-#: src/amidi-plug/amidi-plug.cc:437
+#: src/amidiplug/amidi-plug.cc:445
 msgid ""
 "AMIDI-Plug\n"
 "modular MIDI music player\n"
@@ -314,158 +141,181 @@
 "Tony Vroon\n"
 "for the good help with alpha testing"
 msgstr ""
+"AMIDI-Plug\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/amidi-plug/i_configure.cc:94
+#: src/amidiplug/i_configure.cc:94
 msgid "Override default gain:"
-msgstr ""
+msgstr "Override default gain:"
 
-#: src/amidi-plug/i_configure.cc:102
+#: src/amidiplug/i_configure.cc:102
 msgid "Override default polyphony:"
-msgstr ""
+msgstr "Override default polyphony:"
 
-#: src/amidi-plug/i_configure.cc:110
+#: src/amidiplug/i_configure.cc:110
 msgid "Override default reverb:"
-msgstr ""
+msgstr "Override default reverb:"
 
-#: src/amidi-plug/i_configure.cc:112 src/amidi-plug/i_configure.cc:120
+#: src/amidiplug/i_configure.cc:112 src/amidiplug/i_configure.cc:120
 msgid "On"
-msgstr ""
+msgstr "On"
 
-#: src/amidi-plug/i_configure.cc:118
+#: src/amidiplug/i_configure.cc:118
 msgid "Override default chorus:"
-msgstr ""
+msgstr "Override default chorus:"
 
-#: src/amidi-plug/i_configure.cc:128 src/console/plugin.cc:29
+#: src/amidiplug/i_configure.cc:128 src/console/plugin.cc:29
 msgid "Playback"
-msgstr ""
+msgstr "Playback"
 
-#: src/amidi-plug/i_configure.cc:129
+#: src/amidiplug/i_configure.cc:129
 msgid "Transpose:"
-msgstr ""
+msgstr "Transpose:"
 
-#: src/amidi-plug/i_configure.cc:131
+#: src/amidiplug/i_configure.cc:131 src/speedpitch/speed-pitch.cc:257
 msgid "semitones"
-msgstr ""
+msgstr "semitones"
 
-#: src/amidi-plug/i_configure.cc:132
+#: src/amidiplug/i_configure.cc:132
 msgid "Drum shift:"
-msgstr ""
+msgstr "Drum shift:"
 
-#: src/amidi-plug/i_configure.cc:134
+#: src/amidiplug/i_configure.cc:134
 msgid "note numbers"
-msgstr ""
+msgstr "note numbers"
 
-#: src/amidi-plug/i_configure.cc:135
+#: src/amidiplug/i_configure.cc:135
 msgid "Skip leading silence"
-msgstr ""
+msgstr "Skip leading silence"
 
-#: src/amidi-plug/i_configure.cc:137
+#: src/amidiplug/i_configure.cc:137
 msgid "Skip trailing silence"
-msgstr ""
+msgstr "Skip trailing silence"
 
-#: src/amidi-plug/i_configure.cc:141
+#: src/amidiplug/i_configure.cc:141
 msgid "SoundFont"
-msgstr ""
+msgstr "SoundFont"
 
-#: src/amidi-plug/i_configure.cc:143
+#: src/amidiplug/i_configure.cc:148
 msgid "Synthesizer"
-msgstr ""
-
-#: src/amidi-plug/i_configure.cc:148 src/console/plugin.cc:45
-#: src/sid/xs_config.cc:65
-msgid "Sample rate:"
-msgstr ""
-
-#: src/amidi-plug/i_configure.cc:150 src/bs2b/plugin.cc:141
-#: src/console/plugin.cc:47 src/modplug/plugin_main.cc:78
-#: src/resample/resample.cc:201 src/resample/resample.cc:207
-#: src/resample/resample.cc:211 src/resample/resample.cc:215
-#: src/resample/resample.cc:219 src/resample/resample.cc:223
-#: src/resample/resample.cc:227 src/resample/resample.cc:231
-#: src/resample/resample.cc:235 src/resample/resample.cc:239
-#: src/resample/resample.cc:243 src/sid/xs_config.cc:67
-#: src/sox-resampler/sox-resampler.cc:163
-msgid "Hz"
-msgstr "Hz"
+msgstr "Synthesizer"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:52
+#: src/amidiplug/i_configure-fluidsynth.cc:58
+#: src/amidiplug/i_configure-fluidsynth.cc:527
 msgid "AMIDI-Plug - select SoundFont file"
 msgstr "AMIDI-Plug - select SoundFont file"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:55 src/filewriter/mp3.cc:658
+#: src/amidiplug/i_configure-fluidsynth.cc:61
 msgid "_Cancel"
-msgstr ""
+msgstr "_Cancel"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:56
+#: src/amidiplug/i_configure-fluidsynth.cc:62
 msgid "_Open"
-msgstr ""
+msgstr "_Open"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:225 src/gtkui/columns.cc:46
+#: src/amidiplug/i_configure-fluidsynth.cc:233
+#: src/amidiplug/i_configure-fluidsynth.cc:461
 msgid "File name"
 msgstr "File name"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:229
+#: src/amidiplug/i_configure-fluidsynth.cc:237
+#: src/amidiplug/i_configure-fluidsynth.cc:464
 msgid "Size (bytes)"
 msgstr "Size (bytes)"
 
-#: src/amidi-plug/i_fileinfo.cc:163
+#: src/amidiplug/i_fileinfo.cc:184
 msgid "Name:"
 msgstr "Name:"
 
-#: src/amidi-plug/i_fileinfo.cc:181
+#: src/amidiplug/i_fileinfo.cc:202
 msgid " MIDI Info "
 msgstr " MIDI Info "
 
-#: src/amidi-plug/i_fileinfo.cc:195
+#: src/amidiplug/i_fileinfo.cc:216
 msgid "Format:"
 msgstr "Format:"
 
-#: src/amidi-plug/i_fileinfo.cc:198
+#: src/amidiplug/i_fileinfo.cc:219
 msgid "Length (msec):"
 msgstr "Length (msec):"
 
-#: src/amidi-plug/i_fileinfo.cc:201
+#: src/amidiplug/i_fileinfo.cc:222
 msgid "No. of Tracks:"
-msgstr ""
+msgstr "No. of Tracks:"
 
-#: src/amidi-plug/i_fileinfo.cc:207
+#: src/amidiplug/i_fileinfo.cc:228
 msgid "variable"
 msgstr "variable"
 
-#: src/amidi-plug/i_fileinfo.cc:209
+#: src/amidiplug/i_fileinfo.cc:230
 msgid "BPM:"
 msgstr "BPM:"
 
-#: src/amidi-plug/i_fileinfo.cc:217
+#: src/amidiplug/i_fileinfo.cc:238
 msgid "BPM (wavg):"
 msgstr "BPM (wavg):"
 
-#: src/amidi-plug/i_fileinfo.cc:220
+#: src/amidiplug/i_fileinfo.cc:241
 msgid "Time Div:"
 msgstr "Time Div:"
 
-#: src/amidi-plug/i_fileinfo.cc:231
+#: src/amidiplug/i_fileinfo.cc:252
 msgid " MIDI Comments and Lyrics "
 msgstr " MIDI Comments and Lyrics "
 
-#: src/amidi-plug/i_fileinfo.cc:278
+#: src/amidiplug/i_fileinfo.cc:299
 msgid "* no comments available in this MIDI file *"
 msgstr "* no comments available in this MIDI file *"
 
-#: src/amidi-plug/i_fileinfo.cc:290
+#: src/amidiplug/i_fileinfo.cc:311
 msgid "* no lyrics available in this MIDI file *"
 msgstr "* no lyrics available in this MIDI file *"
 
-#: src/amidi-plug/i_fileinfo.cc:300 src/filewriter/vorbis.cc:197
-#: src/ladspa/plugin.cc:416
+#: src/amidiplug/i_fileinfo.cc:321 src/ladspa/plugin.cc:418
+#: src/ui-common/dialogs-qt.cc:32
 msgid "_Close"
 msgstr "_Close"
 
-#: src/amidi-plug/i_fileinfo.cc:325
+#: src/amidiplug/i_fileinfo.cc:346
 msgid " (invalid UTF-8)"
 msgstr " (invalid UTF-8)"
 
-#: src/aosd/aosd.cc:32
+#: src/ampache/ampache.cc:33
+msgid "Ampache Browser"
+msgstr "Ampache Browser"
+
+#: src/ampache/ampache.cc:46
+msgid ""
+"Ampache Browser for Audacious\n"
+"http://ampache-browser.org/\n"
+"\n"
+"Copyright (C) Róbert Čerňanský and John Lindgren\n"
+"License: GNU GPLv3"
+msgstr ""
+"Ampache Browser for Audacious\n"
+"http://ampache-browser.org/\n"
+"\n"
+"Copyright (C) Róbert Čerňanský and John Lindgren\n"
+"Licence: GNU GPLv3"
+
+#: src/aosd/aosd.cc:31
 msgid ""
 "Audacious OSD\n"
 "http://www.develia.org/projects.php?p=audacious#aosd\n"
@@ -475,10 +325,17 @@
 "Based in part on Evan Martin's Ghosd library:\n"
 "http://neugierig.org/software/ghosd/"
 msgstr ""
+"Audacious OSD\n"
+"http://www.develia.org/projects.php?p=audacious#aosd\n"
+"\n"
+"Written by Giacomo Lozito <james@develia.org>\n"
+"\n"
+"Based in part on Evan Martin's Ghosd library:\n"
+"http://neugierig.org/software/ghosd/"
 
 #: src/aosd/aosd.h:37
 msgid "AOSD (On-Screen Display)"
-msgstr ""
+msgstr "AOSD (On-Screen Display)"
 
 #: src/aosd/aosd_style.cc:54
 msgid "Rectangle"
@@ -492,130 +349,130 @@
 msgid "Concave Rectangle"
 msgstr "Concave Rectangle"
 
-#: src/aosd/aosd_style.cc:69
+#: src/aosd/aosd_style.cc:69 src/openmpt/mptwrap.h:50 src/xsf/plugin.cc:436
 msgid "None"
 msgstr "None"
 
-#: src/aosd/aosd_trigger.cc:50
+#: src/aosd/aosd_trigger.cc:49
 msgid "Playback Start"
 msgstr "Playback Start"
 
-#: src/aosd/aosd_trigger.cc:51
+#: src/aosd/aosd_trigger.cc:50
 msgid "Triggers OSD when a playlist entry is played."
 msgstr "Triggers OSD when a playlist entry is played."
 
-#: src/aosd/aosd_trigger.cc:56
+#: src/aosd/aosd_trigger.cc:55
 msgid "Title Change"
 msgstr "Title Change"
 
-#: src/aosd/aosd_trigger.cc:57
+#: src/aosd/aosd_trigger.cc:56
 msgid "Triggers OSD when the song title changes (for internet streams)."
-msgstr ""
+msgstr "Triggers OSD when the song title changes (for Internet streams)."
 
-#: src/aosd/aosd_trigger.cc:62
+#: src/aosd/aosd_trigger.cc:61
 msgid "Pause On"
 msgstr "Pause On"
 
-#: src/aosd/aosd_trigger.cc:63
+#: src/aosd/aosd_trigger.cc:62
 msgid "Triggers OSD when playback is paused."
 msgstr "Triggers OSD when playback is paused."
 
-#: src/aosd/aosd_trigger.cc:68
+#: src/aosd/aosd_trigger.cc:67
 msgid "Pause Off"
 msgstr "Pause Off"
 
-#: src/aosd/aosd_trigger.cc:69
+#: src/aosd/aosd_trigger.cc:68
 msgid "Triggers OSD when playback is unpaused."
 msgstr "Triggers OSD when playback is unpaused."
 
-#: src/aosd/aosd_ui.cc:163
+#: src/aosd/aosd_ui.cc:204
 msgid "Placement"
 msgstr "Placement"
 
-#: src/aosd/aosd_ui.cc:196
+#: src/aosd/aosd_ui.cc:241
 msgid "Relative X offset:"
 msgstr "Relative X offset:"
 
-#: src/aosd/aosd_ui.cc:203
+#: src/aosd/aosd_ui.cc:245
 msgid "Relative Y offset:"
 msgstr "Relative Y offset:"
 
-#: src/aosd/aosd_ui.cc:210
+#: src/aosd/aosd_ui.cc:249
 msgid "Max OSD width:"
 msgstr "Max OSD width:"
 
-#: src/aosd/aosd_ui.cc:221
+#: src/aosd/aosd_ui.cc:281
 msgid "Multi-Monitor options"
 msgstr "Multi-Monitor options"
 
-#: src/aosd/aosd_ui.cc:225
+#: src/aosd/aosd_ui.cc:285
 msgid "Display OSD using:"
 msgstr "Display OSD using:"
 
-#: src/aosd/aosd_ui.cc:227
+#: src/aosd/aosd_ui.cc:287
 msgid "all monitors"
 msgstr "all monitors"
 
-#: src/aosd/aosd_ui.cc:230
+#: src/aosd/aosd_ui.cc:290
 #, c-format
 msgid "monitor %i"
 msgstr "monitor %i"
 
-#: src/aosd/aosd_ui.cc:282
+#: src/aosd/aosd_ui.cc:342
 msgid "Timing (ms)"
 msgstr "Timing (ms)"
 
-#: src/aosd/aosd_ui.cc:287
+#: src/aosd/aosd_ui.cc:347
 msgid "Display:"
 msgstr "Display:"
 
-#: src/aosd/aosd_ui.cc:292
+#: src/aosd/aosd_ui.cc:352
 msgid "Fade in:"
 msgstr "Fade in:"
 
-#: src/aosd/aosd_ui.cc:297
+#: src/aosd/aosd_ui.cc:357
 msgid "Fade out:"
 msgstr "Fade out:"
 
-#: src/aosd/aosd_ui.cc:361
+#: src/aosd/aosd_ui.cc:442
 msgid "Fonts"
 msgstr "Fonts"
 
-#: src/aosd/aosd_ui.cc:368
+#: src/aosd/aosd_ui.cc:449
 #, c-format
 msgid "Font %i:"
 msgstr "Font %i:"
 
-#: src/aosd/aosd_ui.cc:382
+#: src/aosd/aosd_ui.cc:466
 msgid "Shadow"
 msgstr "Shadow"
 
-#: src/aosd/aosd_ui.cc:486
+#: src/aosd/aosd_ui.cc:589
 msgid "Render Style"
 msgstr "Render Style"
 
-#: src/aosd/aosd_ui.cc:502
+#: src/aosd/aosd_ui.cc:605
 msgid "Colors"
 msgstr "Colours"
 
-#: src/aosd/aosd_ui.cc:513
+#: src/aosd/aosd_ui.cc:616
 #, c-format
 msgid "Color %i:"
 msgstr "Colour %i:"
 
-#: src/aosd/aosd_ui.cc:600
+#: src/aosd/aosd_ui.cc:714
 msgid "Enable trigger"
 msgstr "Enable trigger"
 
-#: src/aosd/aosd_ui.cc:627
+#: src/aosd/aosd_ui.cc:741
 msgid "Event"
 msgstr "Event"
 
-#: src/aosd/aosd_ui.cc:655
+#: src/aosd/aosd_ui.cc:768
 msgid "Composite manager detected"
 msgstr "Composite manager detected"
 
-#: src/aosd/aosd_ui.cc:662
+#: src/aosd/aosd_ui.cc:775
 msgid ""
 "Composite manager not detected;\n"
 "unless you know that you have one running, please activate a composite "
@@ -625,112 +482,198 @@
 "unless you know that you have one running, please activate a composite "
 "manager otherwise the OSD will not work properly"
 
-#: src/aosd/aosd_ui.cc:670
+#: src/aosd/aosd_ui.cc:783
 msgid "Composite manager not required for fake transparency"
 msgstr "Composite manager not required for fake transparency"
 
-#: src/aosd/aosd_ui.cc:706
+#: src/aosd/aosd_ui.cc:820
 msgid "Transparency"
 msgstr "Transparency"
 
-#: src/aosd/aosd_ui.cc:712
+#: src/aosd/aosd_ui.cc:826
 msgid "Fake transparency"
 msgstr "Fake transparency"
 
-#: src/aosd/aosd_ui.cc:714
+#: src/aosd/aosd_ui.cc:828
 msgid "Real transparency (requires X Composite Ext.)"
 msgstr "Real transparency (requires X Composite Ext.)"
 
-#: src/aosd/aosd_ui.cc:756
+#: src/aosd/aosd_ui.cc:875
 msgid "Composite extension not loaded"
 msgstr "Composite extension not loaded"
 
-#: src/aosd/aosd_ui.cc:764
-msgid "Composite extension not available"
-msgstr "Composite extension not available"
-
-#: src/aosd/aosd_ui.cc:781
+#: src/aosd/aosd_ui.cc:892
 #, c-format
 msgid "Audacious OSD"
 msgstr "Audacious OSD"
 
-#: src/aosd/aosd_ui.cc:844
+#: src/aosd/aosd_ui.cc:955
 msgid "Position"
 msgstr "Position"
 
-#: src/aosd/aosd_ui.cc:849
+#: src/aosd/aosd_ui.cc:960
 msgid "Animation"
 msgstr "Animation"
 
-#: src/aosd/aosd_ui.cc:854
+#: src/aosd/aosd_ui.cc:965
 msgid "Text"
 msgstr "Text"
 
-#: src/aosd/aosd_ui.cc:859
+#: src/aosd/aosd_ui.cc:970
 msgid "Decoration"
 msgstr "Decoration"
 
-#: src/aosd/aosd_ui.cc:864
+#: src/aosd/aosd_ui.cc:975
 msgid "Trigger"
 msgstr "Trigger"
 
-#: src/aosd/aosd_ui.cc:869
+#: src/aosd/aosd_ui.cc:980 src/streamtuner/shoutcast-model.cc:202
 msgid "Misc"
 msgstr "Misc"
 
-#: src/aosd/aosd_ui.cc:878
+#: src/aosd/aosd_ui.cc:989
 msgid "Test"
-msgstr ""
+msgstr "Test"
 
 #: src/asx3/asx3.cc:35
 msgid "ASXv3 Playlists"
-msgstr ""
+msgstr "ASXv3 Playlists"
 
 #: src/asx/asx.cc:33
 msgid "ASXv1/ASXv2 Playlists"
-msgstr ""
+msgstr "ASXv1/ASXv2 Playlists"
 
 #: src/audpl/audpl.cc:33
 msgid "Audacious Playlists (audpl)"
-msgstr ""
+msgstr "Audacious Playlists (audpl)"
+
+#: src/background_music/background_music.cc:24
+msgid "Background music"
+msgstr "Background music"
+
+#: src/background_music/background_music.cc:25
+msgid "Target level:"
+msgstr "Target level:"
+
+#: src/background_music/background_music.cc:28
+#: src/background_music/background_music.cc:33
+#: src/silence-removal/silence-removal.cc:70
+msgid "dB"
+msgstr "dB"
+
+#: src/background_music/background_music.cc:29
+msgid "Maximum amplification:"
+msgstr "Maximum amplification:"
+
+#: src/background_music/background_music.cc:34 src/mpg123/mpg123.cc:81
+msgid "Advanced"
+msgstr "Advanced"
+
+#: src/background_music/background_music.cc:36
+msgid "Slow detection weight:"
+msgstr "Slow detection weight:"
+
+#: src/background_music/background_music.cc:39
+msgid "Hint"
+msgstr "Hint"
+
+#: src/background_music/background_music.cc:41
+msgid ""
+"Slow detection weight is the relative weight\n"
+"of a long term average detection when compared\n"
+"to the actual, faster loudness detection.\n"
+"A value of zero gives a more radio-like sound\n"
+"where soft passages get \"pulled up\" more quickly,\n"
+"a value of two makes the sound feel less compressed."
+msgstr ""
+"Slow detection weight is the relative weight\n"
+"of a long term average detection when compared\n"
+"to the actual, faster loudness detection.\n"
+"A value of zero gives a more radio-like sound\n"
+"where soft passages get \"pulled up\" more quickly,\n"
+"a value of two makes the sound feel less compressed."
+
+#: src/background_music/background_music.cc:52
+msgid ""
+"Background Music Plugin for Audacious\n"
+"Copyright 2023;2024 Michel Fleur\n"
+"\n"
+"Controls the volume to make the sound equally loud within and between "
+"tracks.\n"
+" It uses accurate loudness measurement and tries to make the volume changes "
+"sound natural without audible peaks, yet without lowering the volume before "
+"a peak in advance."
+msgstr ""
+"Background Music Plugin for Audacious\n"
+"Copyright 2023;2024 Michel Fleur\n"
+"\n"
+"Controls the volume to make the sound equally loud within and between "
+"tracks.\n"
+" It uses accurate loudness measurement and tries to make the volume changes "
+"sound natural without audible peaks, yet without lowering the volume before "
+"a peak in advance."
+
+#: src/background_music/background_music.cc:61
+msgid "Background Music"
+msgstr "Background Music"
+
+#: src/bitcrusher/bitcrusher.cc:33
+msgid "Bitcrusher"
+msgstr "Bitcrusher"
+
+#: src/bitcrusher/bitcrusher.cc:34
+msgid "Bit Depth:"
+msgstr "Bit Depth:"
+
+#: src/bitcrusher/bitcrusher.cc:37
+msgid "Downsample ratio:"
+msgstr "Downsample ratio:"
+
+#: src/bitcrusher/bitcrusher.cc:48
+msgid "Bitcrusher"
+msgstr "Bitcrusher"
 
-#: src/blur_scope/blur_scope.cc:42
+#: src/blur_scope/blur_scope.cc:40 src/blur_scope-qt/blur_scope.cc:45
 msgid "Color"
-msgstr ""
+msgstr "Colour"
 
-#: src/blur_scope/blur_scope.cc:58
+#: src/blur_scope/blur_scope.cc:56 src/blur_scope-qt/blur_scope.cc:158
 msgid "Blur Scope"
-msgstr ""
+msgstr "Blur Scope"
 
 #: src/bs2b/plugin.cc:38
 msgid "Bauer Stereophonic-to-Binaural (BS2B)"
-msgstr ""
+msgstr "Bauer Stereophonic-to-Binaural (BS2B)"
 
 #: src/bs2b/plugin.cc:129
 msgid "Presets:"
-msgstr ""
+msgstr "Presets:"
+
+#: src/bs2b/plugin.cc:130
+msgid "Default"
+msgstr "Default"
 
 #: src/bs2b/plugin.cc:136
 msgid "Feed level:"
-msgstr ""
+msgstr "Feed level:"
 
 #: src/bs2b/plugin.cc:138
 msgid "x1/10 dB"
-msgstr ""
+msgstr "x1/10 dB"
 
 #: src/bs2b/plugin.cc:139
 msgid "Cut frequency:"
-msgstr ""
+msgstr "Cut frequency:"
 
-#: src/cairo-spectrum/cairo-spectrum.cc:41
+#: src/cairo-spectrum/cairo-spectrum.cc:42 src/qt-spectrum/qt-spectrum.cc:107
 msgid "Spectrum Analyzer"
-msgstr ""
+msgstr "Spectrum Analyser"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:72
+#: src/cdaudio/cdaudio-ng.cc:74
 msgid "Audio CD Plugin"
-msgstr ""
+msgstr "Audio CD Plugin"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:121
+#: src/cdaudio/cdaudio-ng.cc:121
 msgid ""
 "Copyright (C) 2007-2012 Calin Crisan <ccrisan@gmail.com> and others.\n"
 "\n"
@@ -741,137 +684,145 @@
 "\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.cc:137
+#: src/cdaudio/cdaudio-ng.cc:140
 msgid "Device"
-msgstr ""
+msgstr "Device"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:138
+#: src/cdaudio/cdaudio-ng.cc:141
 msgid "Read speed:"
-msgstr ""
+msgstr "Read speed:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:141
+#: src/cdaudio/cdaudio-ng.cc:144
 msgid "Override device:"
-msgstr ""
+msgstr "Override device:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:143
+#: src/cdaudio/cdaudio-ng.cc:146
 msgid "Metadata"
-msgstr ""
+msgstr "Metadata"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:144
+#: src/cdaudio/cdaudio-ng.cc:147
 msgid "Use CD-Text"
-msgstr ""
+msgstr "Use CD-Text"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:146
+#: src/cdaudio/cdaudio-ng.cc:150
 msgid "Use CDDB"
-msgstr ""
+msgstr "Use CDDB"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:148
+#: src/cdaudio/cdaudio-ng.cc:152
 msgid "Use HTTP instead of CDDBP"
 msgstr "Use HTTP instead of CDDBP"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:151
+#: src/cdaudio/cdaudio-ng.cc:155
 msgid "Server:"
-msgstr ""
+msgstr "Server:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:155
+#: src/cdaudio/cdaudio-ng.cc:159
 msgid "Path:"
-msgstr ""
+msgstr "Path:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:159
+#: src/cdaudio/cdaudio-ng.cc:163
 msgid "Port:"
-msgstr ""
+msgstr "Port:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:246
+#: src/cdaudio/cdaudio-ng.cc:228
 msgid "Failed to initialize cdio subsystem."
-msgstr ""
+msgstr "Failed to initialise cdio subsystem."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:281
+#: src/cdaudio/cdaudio-ng.cc:260
 #, c-format
 msgid "Invalid URI %s."
-msgstr ""
+msgstr "Invalid URI %s."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:283
+#: src/cdaudio/cdaudio-ng.cc:262
 #, c-format
 msgid "Track %d not found."
-msgstr ""
+msgstr "Track %d not found."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:285
+#: src/cdaudio/cdaudio-ng.cc:264
 #, c-format
 msgid "Track %d is a data track."
-msgstr ""
+msgstr "Track %d is a data track."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:360
+#: src/cdaudio/cdaudio-ng.cc:339
 msgid "Error reading audio CD."
-msgstr ""
+msgstr "Error reading audio CD."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:429
+#: src/cdaudio/cdaudio-ng.cc:410
 msgid "Audio CD"
 msgstr "Audio CD"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:460 src/cdaudio-ng/cdaudio-ng.cc:469
+#: src/cdaudio/cdaudio-ng.cc:446 src/cdaudio/cdaudio-ng.cc:455
 #, c-format
 msgid "Failed to open CD device %s."
-msgstr ""
+msgstr "Failed to open CD device %s."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:472
+#: src/cdaudio/cdaudio-ng.cc:458
 msgid "No audio capable CD drive found."
-msgstr ""
+msgstr "No audio capable CD drive found."
+
+#: src/cdaudio/cdaudio-ng.cc:481
+msgid "Drive is empty."
+msgstr "Drive is empty."
+
+#: src/cdaudio/cdaudio-ng.cc:483
+msgid "Unsupported disk type."
+msgstr "Unsupported disk type."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:497
+#: src/cdaudio/cdaudio-ng.cc:507
 msgid "Failed to finish initializing opened CD drive."
-msgstr ""
+msgstr "Failed to finish initialising opened CD drive."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:510
+#: src/cdaudio/cdaudio-ng.cc:520
 msgid "Failed to retrieve first/last track number."
-msgstr ""
+msgstr "Failed to retrieve first/last track number."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:531
+#: src/cdaudio/cdaudio-ng.cc:541
 #, c-format
 msgid "Cannot read start/end LSN for track %d."
-msgstr ""
+msgstr "Cannot read start/end LSN for track %d."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:613
-msgid "Failed to create the cddb connection."
-msgstr ""
+#: src/cdaudio/cdaudio-ng.cc:624
+msgid "Failed to create the CDDB connection."
+msgstr "Failed to create the CDDB connection."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:679
+#: src/cdaudio/cdaudio-ng.cc:690
 msgid "Failed to query the CDDB server"
-msgstr ""
+msgstr "Failed to query the CDDB server"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:681
+#: src/cdaudio/cdaudio-ng.cc:692
 #, c-format
 msgid "Failed to query the CDDB server: %s"
-msgstr ""
+msgstr "Failed to query the CDDB server: %s"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:705
+#: src/cdaudio/cdaudio-ng.cc:716
 #, c-format
-msgid "Failed to read the cddb info: %s"
-msgstr ""
-
-#: src/cdaudio-ng/cdaudio-ng.cc:765
-msgid "Drive is empty."
-msgstr "Drive is empty."
-
-#: src/cdaudio-ng/cdaudio-ng.cc:767
-msgid "Unsupported disk type."
-msgstr "Unsupported disk type."
+msgid "Failed to read the CDDB info: %s"
+msgstr "Failed to read the CDDB info: %s"
 
-#: src/cd-menu-items/cd-menu-items.cc:35
+#: src/cd-menu-items/cd-menu-items.cc:33
 msgid "Audio CD Menu Items"
-msgstr ""
+msgstr "Audio CD Menu Items"
 
-#: src/cd-menu-items/cd-menu-items.cc:47
-msgid "Play CD"
-msgstr "Play CD"
-
-#: src/cd-menu-items/cd-menu-items.cc:47
-msgid "Add CD"
-msgstr "Add CD"
+#: src/cd-menu-items/cd-menu-items.cc:45
+msgid "Pla_y CD"
+msgstr "Pla_y CD"
+
+#: src/cd-menu-items/cd-menu-items.cc:45
+msgid "_Add CD"
+msgstr "_Add CD"
 
 #: src/compressor/compressor.cc:45
 msgid "Compression"
-msgstr ""
+msgstr "Compression"
 
 #: src/compressor/compressor.cc:46
 msgid "Center volume:"
@@ -886,10 +837,12 @@
 "Dynamic Range Compression Plugin for Audacious\n"
 "Copyright 2010-2014 John Lindgren"
 msgstr ""
+"Dynamic Range Compression Plugin for Audacious\n"
+"Copyright 2010-2014 John Lindgren"
 
 #: src/compressor/compressor.cc:64
 msgid "Dynamic Range Compressor"
-msgstr ""
+msgstr "Dynamic Range Compressor"
 
 #: src/console/plugin.cc:15
 msgid ""
@@ -900,6 +853,12 @@
 "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/console/plugin.cc:30
 msgid "Bass:"
@@ -911,15 +870,22 @@
 
 #: src/console/plugin.cc:36
 msgid "Echo:"
-msgstr ""
+msgstr "Echo:"
 
 #: src/console/plugin.cc:39
 msgid "Default song length:"
 msgstr "Default song length:"
 
-#: src/console/plugin.cc:42 src/modplug/plugin_main.cc:59
+#: src/console/plugin.cc:41 src/crossfade/crossfade.cc:56
+#: src/crossfade/crossfade.cc:62 src/lirc/lirc.cc:395 src/notify/notify.cc:113
+#: src/sid/xs_config.cc:85 src/sid/xs_config.cc:94 src/sid/xs_config.cc:103
+#: src/vumeter-qt/vumeter_qt.cc:39
+msgid "seconds"
+msgstr "seconds"
+
+#: src/console/plugin.cc:42 src/modplug/plugin_main.cc:58
 msgid "Resampling"
-msgstr ""
+msgstr "Resampling"
 
 #: src/console/plugin.cc:43
 msgid "Enable audio resampling"
@@ -927,7 +893,7 @@
 
 #: src/console/plugin.cc:49
 msgid "SPC"
-msgstr ""
+msgstr "SPC"
 
 #: src/console/plugin.cc:50
 msgid "Ignore length from SPC tags"
@@ -941,140 +907,163 @@
 msgid "Game Console Music Decoder"
 msgstr "Game Console Music Decoder"
 
-#: src/coreaudio/coreaudio.cc:50
+#: src/coreaudio/coreaudio.cc:53
 msgid "CoreAudio output"
-msgstr ""
+msgstr "CoreAudio output"
 
-#: src/coreaudio/coreaudio.cc:131
+#: src/coreaudio/coreaudio.cc:155
 msgid ""
 "CoreAudio Output Plugin for Audacious\n"
 "Copyright 2014 William Pitcock\n"
+"Copyright 2017,18 René J.V. Bertin\n"
+" (original code and code adapted from\n"
+" Apple examples, (C) Apple 2013)\n"
 "\n"
 "Based on SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
 msgstr ""
+"CoreAudio Output Plugin for Audacious\n"
+"Copyright 2014 William Pitcock\n"
+"Copyright 2017,18 René J.V. Bertin\n"
+" (original code and code adapted from\n"
+" Apple examples, (C) Apple 2013)\n"
+"\n"
+"Based on SDL Output Plugin for Audacious\n"
+"Copyright 2010 John Lindgren"
 
-#: src/coreaudio/coreaudio.cc:143
+#: src/coreaudio/coreaudio.cc:171
 msgid "Use exclusive mode"
-msgstr ""
+msgstr "Use exclusive mode"
+
+#: src/coreaudio/coreaudio.cc:173
+msgid "Use bit perfect audio (adapt device sampling rate)"
+msgstr "Use bit perfect audio (adapt device sampling rate)"
 
-#: src/crossfade/crossfade.cc:44
+#: src/crossfade/crossfade.cc:47
 msgid ""
 "Crossfade Plugin for Audacious\n"
 "Copyright 2010-2014 John Lindgren"
 msgstr ""
+"Crossfade Plugin for Audacious\n"
+"Copyright 2010-2014 John Lindgren"
 
-#: src/crossfade/crossfade.cc:48
+#: src/crossfade/crossfade.cc:51
 msgid "Crossfade"
-msgstr ""
+msgstr "Crossfade"
 
-#: src/crossfade/crossfade.cc:49
+#: src/crossfade/crossfade.cc:52
 msgid "On automatic song change"
-msgstr ""
+msgstr "On automatic song change"
 
-#: src/crossfade/crossfade.cc:51 src/crossfade/crossfade.cc:57
+#: src/crossfade/crossfade.cc:54 src/crossfade/crossfade.cc:60
 msgid "Overlap:"
-msgstr ""
+msgstr "Overlap:"
 
-#: src/crossfade/crossfade.cc:55
+#: src/crossfade/crossfade.cc:58
 msgid "On seek or manual song change"
-msgstr ""
+msgstr "On seek or manual song change"
+
+#: src/crossfade/crossfade.cc:64
+msgid "No fade in"
+msgstr "No fade in"
+
+#: src/crossfade/crossfade.cc:66
+msgid "Use S-curve fade"
+msgstr "Use S-curve fade"
+
+#: src/crossfade/crossfade.cc:68
+msgid "S-curve steepness:"
+msgstr "S-curve steepness:"
+
+#: src/crossfade/crossfade.cc:70
+msgid "(higher is steeper)"
+msgstr "(higher is steeper)"
 
-#: src/crossfade/crossfade.cc:61
+#: src/crossfade/crossfade.cc:72
 msgid "Tip"
-msgstr ""
+msgstr "Tip"
 
-#: src/crossfade/crossfade.cc:62
+#: src/crossfade/crossfade.cc:73
 msgid ""
 "For better crossfading, enable\n"
 "the Silence Removal effect."
 msgstr ""
+"For better crossfading, enable\n"
+"the Silence Removal effect."
 
-#: src/crossfade/crossfade.cc:72
+#: src/crossfade/crossfade.cc:83
 msgid "Crossfade"
-msgstr ""
-
-#: src/crossfade/crossfade.cc:161
-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.cc:168
-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 "Crossfade"
 
 #: src/crystalizer/crystalizer.cc:31
 msgid "Crystalizer"
-msgstr ""
+msgstr "Crystaliser"
 
 #: src/crystalizer/crystalizer.cc:32 src/stereo_plugin/stereo.cc:45
 msgid "Intensity:"
-msgstr ""
+msgstr "Intensity:"
 
 #: src/crystalizer/crystalizer.cc:43
 msgid "Crystalizer"
-msgstr ""
+msgstr "Crystaliser"
 
-#: src/cue/cue.cc:37
+#: src/cue/cue.cc:42
 msgid "Cue Sheet Plugin"
-msgstr ""
+msgstr "Cue Sheet Plugin"
 
-#: src/delete-files/delete-files.cc:46 src/delete-files/delete-files.cc:146
+#: src/delete-files/delete-files.cc:53 src/delete-files/delete-files.cc:215
+#: src/delete-files/delete-files.cc:230
 msgid "Delete Files"
-msgstr ""
+msgstr "Delete Files"
+
+#: src/delete-files/delete-files.cc:120
+msgid "No files are selected."
+msgstr "No files are selected."
 
-#: src/delete-files/delete-files.cc:75
+#: src/delete-files/delete-files.cc:125
 #, c-format
-msgid "Error moving %s to trash: %s."
-msgstr ""
+msgid "Do you want to move %s to the trash?"
+msgstr "Do you want to move %s to the rubbish bin?"
 
-#: src/delete-files/delete-files.cc:86
+#: src/delete-files/delete-files.cc:126
 #, c-format
-msgid "Error deleting %s: %s."
-msgstr ""
+msgid "Do you want to permanently delete %s?"
+msgstr "Do you want to permanently delete %s?"
 
-#: src/delete-files/delete-files.cc:117
+#: src/delete-files/delete-files.cc:133
 #, c-format
-msgid "Error deleting %s: not a local file."
-msgstr ""
+msgid "Do you want to move %d files to the trash?"
+msgstr "Do you want to move %d files to the rubbish bin?"
 
 #: src/delete-files/delete-files.cc:134
-msgid "Do you want to move the selected files to the trash?"
-msgstr ""
-
-#: src/delete-files/delete-files.cc:135
-msgid "Move to Trash"
-msgstr ""
+#, c-format
+msgid "Do you want to permanently delete %d files?"
+msgstr "Do you want to permanently delete %d files?"
 
-#: src/delete-files/delete-files.cc:140
-msgid "Do you want to permanently delete the selected files?"
-msgstr ""
+#: src/delete-files/delete-files.cc:146
+msgid "Move to trash"
+msgstr "Move to Rubbish Bin"
 
-#: src/delete-files/delete-files.cc:141 src/skins/preset-list.cc:411
-#: src/skins/preset-list.cc:427
+#: src/delete-files/delete-files.cc:146
 msgid "Delete"
-msgstr ""
+msgstr "Delete"
 
-#: src/delete-files/delete-files.cc:145 src/skins/preset-browser.cc:56
-#: src/skins/preset-list.cc:307 src/skins/ui_playlist.cc:221
+#: src/delete-files/delete-files.cc:213 src/delete-files/delete-files.cc:235
+#: src/skins-qt/search-select.cc:102 src/skins/search-select.cc:78
 msgid "Cancel"
 msgstr "Cancel"
 
-#: src/delete-files/delete-files.cc:166
+#: src/delete-files/delete-files.cc:267
 msgid "Delete Selected Files"
-msgstr ""
+msgstr "Delete Selected Files"
 
-#: src/delete-files/delete-files.cc:181
+#: src/delete-files/delete-files.cc:287
 msgid "Delete Method"
-msgstr ""
+msgstr "Delete Method"
 
-#: src/delete-files/delete-files.cc:182
+#: src/delete-files/delete-files.cc:288
 msgid "Move to trash instead of deleting immediately"
-msgstr ""
+msgstr "Move to Rubbish Bin instead of deleting immediately"
 
 #: src/echo_plugin/echo.cc:9
 msgid ""
@@ -1083,38 +1072,42 @@
 "Surround echo by Carl van Schaik, 1999\n"
 "Updated for Audacious by William Pitcock and John Lindgren, 2010-2014"
 msgstr ""
+"Echo Plugin\n"
+"By Johan Levin, 1999\n"
+"Surround echo by Carl van Schaik, 1999\n"
+"Updated for Audacious by William Pitcock and John Lindgren, 2010-2014"
 
 #: src/echo_plugin/echo.cc:21
 msgid "Echo"
-msgstr ""
+msgstr "Echo"
 
-#: src/echo_plugin/echo.cc:22 src/modplug/plugin_main.cc:73
-#: src/modplug/plugin_main.cc:83
+#: src/echo_plugin/echo.cc:22 src/modplug/plugin_main.cc:72
+#: src/modplug/plugin_main.cc:82
 msgid "Delay:"
-msgstr ""
+msgstr "Delay:"
 
-#: src/echo_plugin/echo.cc:24 src/modplug/plugin_main.cc:73
-#: src/modplug/plugin_main.cc:83
+#: src/echo_plugin/echo.cc:24 src/modplug/plugin_main.cc:72
+#: src/modplug/plugin_main.cc:82 src/xsf/plugin.cc:445
 msgid "ms"
-msgstr ""
+msgstr "ms"
 
 #: src/echo_plugin/echo.cc:25
 msgid "Feedback:"
-msgstr ""
+msgstr "Feedback:"
 
-#: src/echo_plugin/echo.cc:28 src/modplug/plugin_main.cc:87
+#: src/echo_plugin/echo.cc:28 src/modplug/plugin_main.cc:86
 msgid "Volume:"
-msgstr ""
+msgstr "Volume:"
 
 #: src/echo_plugin/echo.cc:39
 msgid "Echo"
-msgstr ""
+msgstr "Echo"
 
-#: src/ffaudio/ffaudio-core.cc:41
+#: src/ffaudio/ffaudio-core.cc:50
 msgid "FFmpeg Plugin"
-msgstr ""
+msgstr "FFmpeg Plugin"
 
-#: src/ffaudio/ffaudio-core.cc:571
+#: src/ffaudio/ffaudio-core.cc:649
 msgid ""
 "Multi-format audio decoding plugin for Audacious using\n"
 "FFmpeg multimedia framework (http://www.ffmpeg.org/)\n"
@@ -1123,262 +1116,360 @@
 "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/filewriter/filewriter.cc:45
+#: src/filewriter/filewriter.cc:48
 msgid "FileWriter Plugin"
+msgstr "FileWriter Plugin"
+
+#: src/filewriter/filewriter.cc:316
+#, c-format
+msgid ""
+"Error opening %s:\n"
+"%s"
+msgstr ""
+"Error opening %s:\n"
+"%s"
+
+#: src/filewriter/filewriter.cc:358
+msgid ""
+"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 Licence as published by the Free "
+"Software Foundation; either version 2 of the Licence, 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 Licence 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.cc:386
+#: src/filewriter/filewriter.cc:385
 msgid "Output file format:"
 msgstr "Output file format:"
 
-#: src/filewriter/filewriter.cc:403
-msgid "Configure"
-msgstr "Configure"
-
-#: src/filewriter/filewriter.cc:413
+#: src/filewriter/filewriter.cc:389
 msgid "Save into original directory"
 msgstr "Save into original directory"
 
-#: src/filewriter/filewriter.cc:417
-msgid "Save into custom directory"
-msgstr "Save into custom directory"
-
-#: src/filewriter/filewriter.cc:427
-msgid "Output file folder:"
-msgstr "Output file folder:"
+#: src/filewriter/filewriter.cc:392
+msgid "Save into custom directory:"
+msgstr "Save into custom directory:"
 
-#: src/filewriter/filewriter.cc:431
-msgid "Pick a folder"
-msgstr "Pick a folder"
-
-#: src/filewriter/filewriter.cc:444
+#: src/filewriter/filewriter.cc:400
 msgid "Generate file name from:"
-msgstr ""
-
-#: src/filewriter/filewriter.cc:448
-msgid "Original file tag"
-msgstr ""
+msgstr "Generate file name from:"
 
-#: src/filewriter/filewriter.cc:453
+#: src/filewriter/filewriter.cc:401
 msgid "Original file name"
-msgstr ""
+msgstr "Original file name"
 
-#: src/filewriter/filewriter.cc:459
-msgid "Include original file name extension"
-msgstr ""
+#: src/filewriter/filewriter.cc:404
+msgid "Original file name (no suffix)"
+msgstr "Original file name (no suffix)"
 
-#: src/filewriter/filewriter.cc:468
-msgid "Prepend track number to file name"
-msgstr ""
+#: src/filewriter/filewriter.cc:407
+msgid "Original file tag"
+msgstr "Original file tag"
 
-#: src/filewriter/filewriter.cc:484
-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.cc:411
+msgid "Prepend track number to file name"
+msgstr "Prepend track number to file name"
 
-#: src/filewriter/mp3.cc:40 src/filewriter/mp3.cc:717
+#: src/filewriter/filewriter.cc:417 src/filewriter/filewriter.cc:449
 msgid "Auto"
 msgstr "Auto"
 
-#: src/filewriter/mp3.cc:40
+#: src/filewriter/filewriter.cc:418
+msgid "8000 Hz"
+msgstr "8000 Hz"
+
+#: src/filewriter/filewriter.cc:419
+msgid "11025 Hz"
+msgstr "11025 Hz"
+
+#: src/filewriter/filewriter.cc:420
+msgid "12000 Hz"
+msgstr "12000 Hz"
+
+#: src/filewriter/filewriter.cc:421
+msgid "16000 Hz"
+msgstr "16000 Hz"
+
+#: src/filewriter/filewriter.cc:422
+msgid "22050 Hz"
+msgstr "22050 Hz"
+
+#: src/filewriter/filewriter.cc:423
+msgid "24000 Hz"
+msgstr "24000 Hz"
+
+#: src/filewriter/filewriter.cc:424
+msgid "32000 Hz"
+msgstr "32000 Hz"
+
+#: src/filewriter/filewriter.cc:425 src/xsf/plugin.cc:430
+msgid "44100 Hz"
+msgstr "44100 Hz"
+
+#: src/filewriter/filewriter.cc:426 src/xsf/plugin.cc:431
+msgid "48000 Hz"
+msgstr "48000 Hz"
+
+#: src/filewriter/filewriter.cc:430
+msgid "8 kbit/s"
+msgstr "8 kbit/s"
+
+#: src/filewriter/filewriter.cc:431
+msgid "16 kbit/s"
+msgstr "16 kbit/s"
+
+#: src/filewriter/filewriter.cc:432
+msgid "32 kbit/s"
+msgstr "32 kbit/s"
+
+#: src/filewriter/filewriter.cc:433
+msgid "40 kbit/s"
+msgstr "40 kbit/s"
+
+#: src/filewriter/filewriter.cc:434
+msgid "48 kbit/s"
+msgstr "48 kbit/s"
+
+#: src/filewriter/filewriter.cc:435
+msgid "56 kbit/s"
+msgstr "56 kbit/s"
+
+#: src/filewriter/filewriter.cc:436
+msgid "64 kbit/s"
+msgstr "64 kbit/s"
+
+#: src/filewriter/filewriter.cc:437
+msgid "80 kbit/s"
+msgstr "80 kbit/s"
+
+#: src/filewriter/filewriter.cc:438
+msgid "96 kbit/s"
+msgstr "96 kbit/s"
+
+#: src/filewriter/filewriter.cc:439
+msgid "112 kbit/s"
+msgstr "112 kbit/s"
+
+#: src/filewriter/filewriter.cc:440
+msgid "128 kbit/s"
+msgstr "128 kbit/s"
+
+#: src/filewriter/filewriter.cc:441
+msgid "160 kbit/s"
+msgstr "160 kbit/s"
+
+#: src/filewriter/filewriter.cc:442
+msgid "192 kbit/s"
+msgstr "192 kbit/s"
+
+#: src/filewriter/filewriter.cc:443
+msgid "224 kbit/s"
+msgstr "224 kbit/s"
+
+#: src/filewriter/filewriter.cc:444
+msgid "256 kbit/s"
+msgstr "256 kbit/s"
+
+#: src/filewriter/filewriter.cc:445
+msgid "320 kbit/s"
+msgstr "320 kbit/s"
+
+#: src/filewriter/filewriter.cc:450
 msgid "Joint Stereo"
 msgstr "Joint Stereo"
 
-#: src/filewriter/mp3.cc:41 src/modplug/plugin_main.cc:58
-#: src/mpg123/mpg123.cc:248
+#: src/filewriter/filewriter.cc:451 src/modplug/plugin_main.cc:57
+#: src/mpg123/mpg123.cc:259
 msgid "Stereo"
 msgstr "Stereo"
 
-#: src/filewriter/mp3.cc:41 src/modplug/plugin_main.cc:57
-#: src/mpg123/mpg123.cc:248
+#: src/filewriter/filewriter.cc:452 src/modplug/plugin_main.cc:56
+#: src/mpg123/mpg123.cc:260
 msgid "Mono"
 msgstr "Mono"
 
-#: src/filewriter/mp3.cc:657
-msgid "MP3 Configuration"
-msgstr "MP3 Configuration"
-
-#: src/filewriter/mp3.cc:658
-msgid "_OK"
-msgstr ""
-
-#: src/filewriter/mp3.cc:681
-msgid "Algorithm Quality:"
-msgstr "Algorithm Quality:"
-
-#: src/filewriter/mp3.cc:706
-msgid "Output Sample Rate:"
-msgstr ""
-
-#: src/filewriter/mp3.cc:733
-msgid "(Hz)"
-msgstr "(Hz)"
-
-#: src/filewriter/mp3.cc:740
-msgid "Bitrate / Compression Ratio:"
-msgstr ""
+#: src/filewriter/filewriter.cc:456
+msgid "VBR"
+msgstr "VBR"
+
+#: src/filewriter/filewriter.cc:457
+msgid "ABR"
+msgstr "ABR"
+
+#: src/filewriter/filewriter.cc:478
+msgid "Algorithm quality:"
+msgstr "Algorithm quality:"
 
-#: src/filewriter/mp3.cc:764
-msgid "Bitrate (kbps):"
-msgstr "Bitrate (kbps):"
+#: src/filewriter/filewriter.cc:484
+msgid "Bitrate:"
+msgstr "Bitrate:"
 
-#: src/filewriter/mp3.cc:796
+#: src/filewriter/filewriter.cc:491
 msgid "Compression ratio:"
 msgstr "Compression ratio:"
 
-#: src/filewriter/mp3.cc:820
-msgid "Audio Mode:"
-msgstr "Audio Mode:"
+#: src/filewriter/filewriter.cc:498
+msgid "Audio mode:"
+msgstr "Audio mode:"
 
-#: src/filewriter/mp3.cc:845
-msgid "Miscellaneous:"
-msgstr ""
-
-#: src/filewriter/mp3.cc:856
+#: src/filewriter/filewriter.cc:501
 msgid "Enforce strict ISO compliance"
-msgstr ""
+msgstr "Enforce strict ISO compliance"
 
-#: src/filewriter/mp3.cc:867
+#: src/filewriter/filewriter.cc:503
 msgid "Error protection"
 msgstr "Error protection"
 
-#: src/filewriter/mp3.cc:879 src/filewriter/vorbis.cc:206
-msgid "Quality"
-msgstr "Quality"
-
-#: src/filewriter/mp3.cc:888
+#: src/filewriter/filewriter.cc:508
 msgid "Enable VBR/ABR"
 msgstr "Enable VBR/ABR"
 
-#: src/filewriter/mp3.cc:898
+#: src/filewriter/filewriter.cc:510
 msgid "Type:"
 msgstr "Type:"
 
-#: src/filewriter/mp3.cc:931
-msgid "VBR Options:"
-msgstr "VBR Options:"
-
-#: src/filewriter/mp3.cc:947
-msgid "Minimum bitrate (kbps):"
-msgstr "Minimum bitrate (kbps):"
-
-#: src/filewriter/mp3.cc:973
-msgid "Maximum bitrate (kbps):"
-msgstr "Maximum bitrate (kbps):"
-
-#: src/filewriter/mp3.cc:995
-msgid "Strictly enforce minimum bitrate"
-msgstr "Strictly enforce minimum bitrate"
-
-#: src/filewriter/mp3.cc:1007
-msgid "ABR Options:"
-msgstr "ABR Options:"
-
-#: src/filewriter/mp3.cc:1017
-msgid "Average bitrate (kbps):"
-msgstr "Average bitrate (kbps):"
+#: src/filewriter/filewriter.cc:514
+msgid "Minimum bitrate:"
+msgstr "Minimum bitrate:"
+
+#: src/filewriter/filewriter.cc:518
+msgid "Maximum bitrate:"
+msgstr "Maximum bitrate:"
+
+#: src/filewriter/filewriter.cc:522
+msgid "Average bitrate:"
+msgstr "Average bitrate:"
 
-#: src/filewriter/mp3.cc:1044
+#: src/filewriter/filewriter.cc:526
 msgid "VBR quality level:"
 msgstr "VBR quality level:"
 
-#: src/filewriter/mp3.cc:1063
-msgid "Omit Xing VBR header"
-msgstr ""
+#: src/filewriter/filewriter.cc:530
+msgid "Strictly enforce minimum bitrate"
+msgstr "Strictly enforce minimum bitrate"
 
-#: src/filewriter/mp3.cc:1076
-msgid "VBR/ABR"
-msgstr "VBR/ABR"
+#: src/filewriter/filewriter.cc:533
+msgid "Omit Xing VBR header"
+msgstr "Omit Xing VBR header"
 
-#: src/filewriter/mp3.cc:1085
-msgid "Frame Parameters:"
-msgstr ""
+#: src/filewriter/filewriter.cc:539
+msgid "Frame Headers"
+msgstr "Frame Headers"
 
-#: src/filewriter/mp3.cc:1097
+#: src/filewriter/filewriter.cc:540
 msgid "Mark as copyright"
 msgstr "Mark as copyright"
 
-#: src/filewriter/mp3.cc:1108
+#: src/filewriter/filewriter.cc:542
 msgid "Mark as original"
 msgstr "Mark as original"
 
-#: src/filewriter/mp3.cc:1120
-msgid "ID3 Parameters:"
-msgstr ""
+#: src/filewriter/filewriter.cc:544
+msgid "ID3 Tags"
+msgstr "ID3 Tags"
 
-#: src/filewriter/mp3.cc:1131
+#: src/filewriter/filewriter.cc:545
 msgid "Force addition of version 2 tag"
 msgstr "Force addition of version 2 tag"
 
-#: src/filewriter/mp3.cc:1141
+#: src/filewriter/filewriter.cc:547
 msgid "Only add v1 tag"
 msgstr "Only add v1 tag"
 
-#: src/filewriter/mp3.cc:1148
+#: src/filewriter/filewriter.cc:549
 msgid "Only add v2 tag"
 msgstr "Only add v2 tag"
 
-#: src/filewriter/mp3.cc:1169
+#: src/filewriter/filewriter.cc:554
+msgid "Quality"
+msgstr "Quality"
+
+#: src/filewriter/filewriter.cc:555
+msgid "VBR/ABR"
+msgstr "VBR/ABR"
+
+#: src/filewriter/filewriter.cc:556
 msgid "Tags"
 msgstr "Tags"
 
-#: src/filewriter/vorbis.cc:196
-msgid "Vorbis Encoder Configuration"
-msgstr "Vorbis Encoder Configuration"
-
-#: src/filewriter/vorbis.cc:219
-msgid "Quality level (0 - 10):"
-msgstr "Quality level (0 - 10):"
+#: src/filewriter/filewriter.cc:566
+msgid "Quality (0-1):"
+msgstr "Quality (0-1):"
+
+#: src/filewriter/filewriter.cc:573 src/skins-qt/skins_cfg.cc:307
+#: src/skins/skins_cfg.cc:289
+msgid "General"
+msgstr "General"
 
-#: src/flacng/flacng.h:35
+#: src/flac/flacng.h:36
 msgid "FLAC Decoder"
-msgstr ""
+msgstr "FLAC Decoder"
 
-#: src/flacng/metadata.cc:351 src/wavpack/wavpack.cc:209
+#: src/flac/metadata.cc:296 src/wavpack/wavpack.cc:215
 msgid "lossless"
-msgstr ""
+msgstr "lossless"
 
-#: src/flacng/plugin.cc:169
+#: src/flac/plugin.cc:214
 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/gio/gio.cc:34
 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.cc:42
 msgid "GIO Plugin"
-msgstr ""
+msgstr "GIO Plugin"
 
-#: src/gio/gio.cc:153
+#: src/gio/gio.cc:152
 msgid "Read-and-append mode not supported"
-msgstr ""
+msgstr "Read-and-append mode not supported"
 
-#: src/gio/gio.cc:166
+#: src/gio/gio.cc:165
 msgid "Invalid open mode"
-msgstr ""
+msgstr "Invalid open mode"
 
-#: src/gl-spectrum/gl-spectrum.cc:51
+#: src/glspectrum/gl-spectrum.cc:52
 msgid ""
 "OpenGL Spectrum Analyzer for Audacious\n"
 "Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
@@ -1389,624 +1480,766 @@
 "\n"
 "License: GPLv2+"
 msgstr ""
-
-#: src/gl-spectrum/gl-spectrum.cc:62
-msgid "OpenGL Spectrum Analyzer"
-msgstr ""
-
-#: src/gl-spectrum-qt/gl-spectrum.cc:41
-msgid ""
 "OpenGL Spectrum Analyzer for Audacious\n"
 "Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
-"Copyright 2014 William Pitcock\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-qt/gl-spectrum.cc:53
-msgid "OpenGL Spectrum Analyzer (Qt)"
-msgstr ""
-
-#: src/gnomeshortcuts/gnomeshortcuts.cc:38
-msgid "GNOME Shortcuts"
-msgstr ""
-
-#: src/gnomeshortcuts/gnomeshortcuts.cc:54
-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 ""
+"Licence: GPLv2+"
 
-#: src/gtkui/columns.cc:35
-msgid "Entry number"
-msgstr "Entry number"
+#: src/glspectrum/gl-spectrum.cc:63 src/qtglspectrum/gl-spectrum.cc:53
+msgid "OpenGL Spectrum Analyzer"
+msgstr "OpenGL Spectrum Analyser"
 
-#: src/gtkui/columns.cc:36 src/playlist-manager/playlist-manager.cc:225
-#: src/qtui/playlist_model.cc:123
+#: src/gtkui/columns.cc:36 src/moonstone/playlist_model.cc:38
+#: src/qtui/playlist_model.cc:33
+msgid "Entry Number"
+msgstr "Entry Number"
+
+#: src/gtkui/columns.cc:37 src/moonstone/playlist_model.cc:38
+#: src/moonstone/playlist_selection.cc:64
+#: src/playlist-manager/playlist-manager.cc:200
+#: src/playlist-manager-qt/playlist-manager-qt.cc:188
+#: src/qtui/playlist_model.cc:33 src/streamtuner/icecast-model.cc:120
+#: src/streamtuner/ihr-model.cc:159 src/streamtuner/shoutcast-model.cc:122
 msgid "Title"
 msgstr "Title"
 
-#: src/gtkui/columns.cc:37 src/qtui/playlist_model.cc:125
+#: src/gtkui/columns.cc:38 src/moonstone/playlist_model.cc:39
+#: src/qtui/playlist_model.cc:33
 msgid "Artist"
 msgstr "Artist"
 
-#: src/gtkui/columns.cc:38
+#: src/gtkui/columns.cc:39 src/moonstone/playlist_model.cc:39
+#: src/qtui/playlist_model.cc:33
 msgid "Year"
 msgstr "Year"
 
-#: src/gtkui/columns.cc:39 src/qtui/playlist_model.cc:127
+#: src/gtkui/columns.cc:40 src/moonstone/playlist_model.cc:39
+#: src/qtui/playlist_model.cc:34
 msgid "Album"
 msgstr "Album"
 
-#: src/gtkui/columns.cc:40
-msgid "Album artist"
-msgstr ""
+#: src/gtkui/columns.cc:41 src/moonstone/playlist_model.cc:40
+#: src/qtui/playlist_model.cc:34
+msgid "Album Artist"
+msgstr "Album Artist"
 
-#: src/gtkui/columns.cc:41
+#: src/gtkui/columns.cc:42 src/moonstone/playlist_model.cc:40
+#: src/qtui/playlist_model.cc:34
 msgid "Track"
 msgstr "Track"
 
-#: src/gtkui/columns.cc:42
+#: src/gtkui/columns.cc:43 src/moonstone/playlist_model.cc:40
+#: src/qtui/playlist_model.cc:34 src/streamtuner/icecast-model.cc:123
+#: src/streamtuner/shoutcast-model.cc:125
+#: src/streamtuner/shoutcast-model.cc:236
 msgid "Genre"
-msgstr ""
+msgstr "Genre"
 
-#: src/gtkui/columns.cc:43
-msgid "Queue position"
-msgstr "Queue position"
+#: src/gtkui/columns.cc:44 src/moonstone/playlist_model.cc:41
+#: src/qtui/playlist_model.cc:35
+msgid "Queue Position"
+msgstr "Queue Position"
 
-#: src/gtkui/columns.cc:44
+#: src/gtkui/columns.cc:45 src/moonstone/playlist_model.cc:41
+#: src/qtui/playlist_model.cc:35
 msgid "Length"
 msgstr "Length"
 
-#: src/gtkui/columns.cc:45
-msgid "File path"
-msgstr "File path"
-
-#: src/gtkui/columns.cc:47
-msgid "Custom title"
-msgstr "Custom title"
-
-#: src/gtkui/columns.cc:48
+#: src/gtkui/columns.cc:46 src/moonstone/playlist_model.cc:41
+#: src/qtui/playlist_model.cc:35
+msgid "File Path"
+msgstr "File Path"
+
+#: src/gtkui/columns.cc:47 src/moonstone/playlist_model.cc:42
+#: src/qtui/playlist_model.cc:35
+msgid "File Name"
+msgstr "File Name"
+
+#: src/gtkui/columns.cc:48 src/moonstone/playlist_model.cc:42
+#: src/qtui/playlist_model.cc:36
+msgid "Custom Title"
+msgstr "Custom Title"
+
+#: src/gtkui/columns.cc:49 src/moonstone/playlist_model.cc:42
+#: src/qtui/playlist_model.cc:36 src/streamtuner/icecast-model.cc:129
+#: src/streamtuner/shoutcast-model.cc:134
 msgid "Bitrate"
 msgstr "Bitrate"
 
-#: src/gtkui/columns.cc:308
+#: src/gtkui/columns.cc:50 src/moonstone/playlist_model.cc:43
+#: src/qtui/playlist_model.cc:36
+msgid "Comment"
+msgstr "Comment"
+
+#: src/gtkui/columns.cc:51 src/qtui/playlist_model.cc:36
+msgid "Publisher"
+msgstr "Publisher"
+
+#: src/gtkui/columns.cc:52 src/qtui/playlist_model.cc:37
+msgid "Catalog Number"
+msgstr "Catalogue Number"
+
+#: src/gtkui/columns.cc:53 src/moonstone/playlist_model.cc:43
+#: src/qtui/playlist_model.cc:37
+msgid "Disc"
+msgstr "Disc"
+
+#: src/gtkui/columns.cc:325
 msgid "Available columns"
-msgstr ""
+msgstr "Available columns"
 
-#: src/gtkui/columns.cc:334
+#: src/gtkui/columns.cc:351
 msgid "Displayed columns"
-msgstr ""
+msgstr "Displayed columns"
 
-#: src/gtkui/layout.cc:72 src/search-tool/search-tool.cc:40
+#: src/gtkui/layout.cc:74 src/search-tool-qt/search-tool-qt.cc:58
+#: src/search-tool/search-tool.cc:49
 msgid "Search Tool"
-msgstr ""
+msgstr "Search Tool"
 
-#: src/gtkui/layout.cc:167
+#: src/gtkui/layout.cc:170
 msgid "Dock at Left"
 msgstr "Dock at Left"
 
-#: src/gtkui/layout.cc:167
+#: src/gtkui/layout.cc:170
 msgid "Dock at Right"
 msgstr "Dock at Right"
 
-#: src/gtkui/layout.cc:168
+#: src/gtkui/layout.cc:171
 msgid "Dock at Top"
 msgstr "Dock at Top"
 
-#: src/gtkui/layout.cc:168
+#: src/gtkui/layout.cc:171
 msgid "Dock at Bottom"
 msgstr "Dock at Bottom"
 
-#: src/gtkui/layout.cc:168
+#: src/gtkui/layout.cc:171
 msgid "Undock"
 msgstr "Undock"
 
-#: src/gtkui/layout.cc:168 src/ladspa/plugin.cc:531
+#: src/gtkui/layout.cc:171 src/ladspa/plugin.cc:540
 msgid "Disable"
 msgstr "Disable"
 
-#: src/gtkui/menus.cc:126 src/qtui/main_window_actions.cc:93
-#: src/statusicon/statusicon.cc:276
+#: src/gtkui/menus.cc:79 src/qtui/menus.cc:107
+#: src/statusicon-qt/statusicon.cc:115 src/statusicon/statusicon.cc:286
 msgid "_Open Files ..."
 msgstr "_Open Files ..."
 
-#: src/gtkui/menus.cc:127
+#: src/gtkui/menus.cc:80 src/qtui/menus.cc:111
 msgid "Open _URL ..."
 msgstr "Open _URL ..."
 
-#: src/gtkui/menus.cc:128 src/qtui/main_window_actions.cc:95
+#: src/gtkui/menus.cc:81 src/qtui/menus.cc:113
 msgid "_Add Files ..."
-msgstr ""
+msgstr "_Add Files ..."
 
-#: src/gtkui/menus.cc:129
+#: src/gtkui/menus.cc:82 src/qtui/menus.cc:118
 msgid "Add U_RL ..."
 msgstr "Add U_RL ..."
 
-#: src/gtkui/menus.cc:131
+#: src/gtkui/menus.cc:84 src/qtui/menus.cc:120
 msgid "Search _Library"
-msgstr ""
+msgstr "Search _Library"
 
-#: src/gtkui/menus.cc:133 src/qtui/main_window_actions.cc:98
+#: src/gtkui/menus.cc:86 src/qtui/menus.cc:123
 msgid "A_bout ..."
 msgstr "A_bout ..."
 
-#: src/gtkui/menus.cc:134 src/qtui/main_window_actions.cc:99
+#: src/gtkui/menus.cc:87 src/qtui/menus.cc:125
 msgid "_Settings ..."
-msgstr ""
+msgstr "_Settings ..."
 
-#: src/gtkui/menus.cc:135 src/qtui/main_window_actions.cc:103
-#: src/statusicon/statusicon.cc:284
+#: src/gtkui/menus.cc:88 src/qtui/menus.cc:131
+#: src/statusicon-qt/statusicon.cc:117 src/statusicon/statusicon.cc:288
 msgid "_Quit"
 msgstr "_Quit"
 
-#: src/gtkui/menus.cc:139 src/gtkui/menus.cc:262
-#: src/qtui/main_window_actions.cc:107 src/search-tool/search-tool.cc:641
-#: src/statusicon/statusicon.cc:278
+#: src/gtkui/menus.cc:92 src/gtkui/menus.cc:226
+#: src/moonstone/playlist_tabs.cc:306 src/qtui/menus.cc:135
+#: src/qtui/playlist_tabs.cc:331 src/search-tool-qt/search-tool-qt.cc:499
+#: src/search-tool/search-tool.cc:339 src/statusicon-qt/statusicon.cc:109
+#: src/statusicon/statusicon.cc:280
 msgid "_Play"
 msgstr "_Play"
 
-#: src/gtkui/menus.cc:140 src/qtui/main_window_actions.cc:108
-#: src/statusicon/statusicon.cc:279
+#: src/gtkui/menus.cc:93 src/qtui/menus.cc:137
+#: src/statusicon-qt/statusicon.cc:110 src/statusicon/statusicon.cc:281
 msgid "Paus_e"
 msgstr "Paus_e"
 
-#: src/gtkui/menus.cc:141 src/qtui/main_window_actions.cc:109
-#: src/statusicon/statusicon.cc:280
+#: src/gtkui/menus.cc:94 src/qtui/menus.cc:139
+#: src/statusicon-qt/statusicon.cc:111 src/statusicon/statusicon.cc:282
 msgid "_Stop"
 msgstr "_Stop"
 
-#: src/gtkui/menus.cc:142 src/qtui/main_window_actions.cc:110
-#: src/statusicon/statusicon.cc:277
+#: src/gtkui/menus.cc:95 src/qtui/menus.cc:141
+#: src/statusicon-qt/statusicon.cc:112 src/statusicon/statusicon.cc:283
 msgid "Pre_vious"
 msgstr "Pre_vious"
 
-#: src/gtkui/menus.cc:143 src/qtui/main_window_actions.cc:111
-#: src/statusicon/statusicon.cc:281
+#: src/gtkui/menus.cc:96 src/qtui/menus.cc:143
+#: src/statusicon-qt/statusicon.cc:113 src/statusicon/statusicon.cc:284
 msgid "_Next"
 msgstr "_Next"
 
-#: src/gtkui/menus.cc:145 src/qtui/main_window_actions.cc:113
+#: src/gtkui/menus.cc:97 src/qtui/menus.cc:145 src/skins/menus.cc:114
+#: src/skins-qt/menus.cc:105
+msgid "Previous Album"
+msgstr "Previous Album"
+
+#: src/gtkui/menus.cc:98 src/qtui/menus.cc:146 src/skins/menus.cc:115
+#: src/skins-qt/menus.cc:106
+msgid "Next Album"
+msgstr "Next Album"
+
+#: src/gtkui/menus.cc:100 src/qtui/menus.cc:148
 msgid "_Repeat"
 msgstr "_Repeat"
 
-#: src/gtkui/menus.cc:146 src/qtui/main_window_actions.cc:114
+#: src/gtkui/menus.cc:101 src/qtui/menus.cc:150
 msgid "S_huffle"
 msgstr "S_huffle"
 
-#: src/gtkui/menus.cc:147 src/qtui/main_window_actions.cc:115
+#: src/gtkui/menus.cc:102 src/qtui/menus.cc:152
+msgid "Shuffle by Albu_m"
+msgstr "Shuffle by Albu_m"
+
+#: src/gtkui/menus.cc:103 src/qtui/menus.cc:155
 msgid "N_o Playlist Advance"
 msgstr "N_o Playlist Advance"
 
-#: src/gtkui/menus.cc:148 src/qtui/main_window_actions.cc:116
+#: src/gtkui/menus.cc:104 src/qtui/menus.cc:157
 msgid "Stop A_fter This Song"
-msgstr ""
+msgstr "Stop A_fter This Song"
 
-#: src/gtkui/menus.cc:150 src/gtkui/menus.cc:247
-#: src/qtui/main_window_actions.cc:118
+#: src/gtkui/menus.cc:106 src/gtkui/menus.cc:210 src/qtui/menus.cc:162
+#: src/qtui/menus.cc:294
 msgid "Song _Info ..."
 msgstr "Song _Info ..."
 
-#: src/gtkui/menus.cc:151
+#: src/gtkui/menus.cc:107
 msgid "Jump to _Time ..."
 msgstr "Jump to _Time ..."
 
-#: src/gtkui/menus.cc:152
+#: src/gtkui/menus.cc:108
 msgid "_Jump to Song ..."
 msgstr "_Jump to Song ..."
 
-#: src/gtkui/menus.cc:154
+#: src/gtkui/menus.cc:110 src/qtui/menus.cc:165
 msgid "Set Repeat Point _A"
-msgstr ""
+msgstr "Set Repeat Point _A"
 
-#: src/gtkui/menus.cc:155
+#: src/gtkui/menus.cc:111 src/qtui/menus.cc:167
 msgid "Set Repeat Point _B"
-msgstr ""
+msgstr "Set Repeat Point _B"
 
-#: src/gtkui/menus.cc:156
+#: src/gtkui/menus.cc:112 src/qtui/menus.cc:169
 msgid "_Clear Repeat Points"
-msgstr ""
+msgstr "_Clear Repeat Points"
 
-#: src/gtkui/menus.cc:160 src/gtkui/menus.cc:167 src/gtkui/menus.cc:183
-#: src/qtui/main_window_actions.cc:122 src/qtui/main_window_actions.cc:129
-#: src/qtui/main_window_actions.cc:145
+#: src/gtkui/menus.cc:116 src/gtkui/menus.cc:123 src/gtkui/menus.cc:141
+#: src/qtui/menus.cc:173 src/qtui/menus.cc:180 src/qtui/menus.cc:198
 msgid "By _Title"
 msgstr "By _Title"
 
-#: src/gtkui/menus.cc:161 src/qtui/main_window_actions.cc:123
+#: src/gtkui/menus.cc:117 src/qtui/menus.cc:174
 msgid "By _File Name"
-msgstr ""
+msgstr "By _File Name"
 
-#: src/gtkui/menus.cc:162 src/qtui/main_window_actions.cc:124
+#: src/gtkui/menus.cc:118 src/qtui/menus.cc:175
 msgid "By File _Path"
-msgstr ""
+msgstr "By File _Path"
 
-#: src/gtkui/menus.cc:166 src/gtkui/menus.cc:182
-#: src/qtui/main_window_actions.cc:128 src/qtui/main_window_actions.cc:144
+#: src/gtkui/menus.cc:122 src/gtkui/menus.cc:140 src/qtui/menus.cc:179
+#: src/qtui/menus.cc:197
 msgid "By Track _Number"
 msgstr "By Track _Number"
 
-#: src/gtkui/menus.cc:168 src/gtkui/menus.cc:184
-#: src/qtui/main_window_actions.cc:130 src/qtui/main_window_actions.cc:146
+#: src/gtkui/menus.cc:124 src/gtkui/menus.cc:142 src/qtui/menus.cc:181
+#: src/qtui/menus.cc:199
 msgid "By _Artist"
 msgstr "By _Artist"
 
-#: src/gtkui/menus.cc:169 src/gtkui/menus.cc:185
-#: src/qtui/main_window_actions.cc:131 src/qtui/main_window_actions.cc:147
+#: src/gtkui/menus.cc:125 src/gtkui/menus.cc:143 src/qtui/menus.cc:182
+#: src/qtui/menus.cc:200
 msgid "By Al_bum"
-msgstr ""
+msgstr "By Al_bum"
 
-#: src/gtkui/menus.cc:170 src/gtkui/menus.cc:186
-#: src/qtui/main_window_actions.cc:132 src/qtui/main_window_actions.cc:148
+#: src/gtkui/menus.cc:126 src/gtkui/menus.cc:144 src/qtui/menus.cc:183
+#: src/qtui/menus.cc:201
 msgid "By Albu_m Artist"
-msgstr ""
+msgstr "By Albu_m Artist"
 
-#: src/gtkui/menus.cc:171 src/gtkui/menus.cc:187
-#: src/qtui/main_window_actions.cc:133 src/qtui/main_window_actions.cc:149
+#: src/gtkui/menus.cc:127 src/gtkui/menus.cc:145 src/qtui/menus.cc:184
+#: src/qtui/menus.cc:202
 msgid "By Release _Date"
 msgstr "By Release _Date"
 
-#: src/gtkui/menus.cc:172 src/gtkui/menus.cc:188
-#: src/qtui/main_window_actions.cc:134 src/qtui/main_window_actions.cc:150
+#: src/gtkui/menus.cc:128 src/gtkui/menus.cc:146 src/qtui/menus.cc:185
+#: src/qtui/menus.cc:203
 msgid "By _Genre"
-msgstr ""
+msgstr "By _Genre"
 
-#: src/gtkui/menus.cc:173 src/gtkui/menus.cc:189
-#: src/qtui/main_window_actions.cc:135 src/qtui/main_window_actions.cc:151
+#: src/gtkui/menus.cc:129 src/gtkui/menus.cc:147 src/qtui/menus.cc:186
+#: src/qtui/menus.cc:204
 msgid "By _Length"
-msgstr ""
+msgstr "By _Length"
 
-#: src/gtkui/menus.cc:174 src/gtkui/menus.cc:190
-#: src/qtui/main_window_actions.cc:136 src/qtui/main_window_actions.cc:152
+#: src/gtkui/menus.cc:130 src/gtkui/menus.cc:148 src/qtui/menus.cc:187
+#: src/qtui/menus.cc:205
 msgid "By _File Path"
 msgstr "By _File Path"
 
-#: src/gtkui/menus.cc:175 src/gtkui/menus.cc:191
-#: src/qtui/main_window_actions.cc:137 src/qtui/main_window_actions.cc:153
+#: src/gtkui/menus.cc:131 src/gtkui/menus.cc:149 src/qtui/menus.cc:188
+#: src/qtui/menus.cc:206
 msgid "By _Custom Title"
 msgstr "By _Custom Title"
 
-#: src/gtkui/menus.cc:177 src/gtkui/menus.cc:193
-#: src/qtui/main_window_actions.cc:139 src/qtui/main_window_actions.cc:155
+#: src/gtkui/menus.cc:132 src/gtkui/menus.cc:150 src/qtui/menus.cc:189
+#: src/qtui/menus.cc:207
+msgid "By C_omment"
+msgstr "By C_omment"
+
+#: src/gtkui/menus.cc:133 src/gtkui/menus.cc:151 src/qtui/menus.cc:190
+#: src/qtui/menus.cc:208
+msgid "By D_isc Number"
+msgstr "By D_isc Number"
+
+#: src/gtkui/menus.cc:135 src/gtkui/menus.cc:153 src/qtui/menus.cc:192
+#: src/qtui/menus.cc:210
 msgid "R_everse Order"
 msgstr "R_everse Order"
 
-#: src/gtkui/menus.cc:178 src/gtkui/menus.cc:194
-#: src/qtui/main_window_actions.cc:140 src/qtui/main_window_actions.cc:156
+#: src/gtkui/menus.cc:136 src/gtkui/menus.cc:154 src/qtui/menus.cc:194
+#: src/qtui/menus.cc:212
 msgid "_Random Order"
 msgstr "_Random Order"
 
-#: src/gtkui/menus.cc:198 src/qtui/main_window_actions.cc:160
+#: src/gtkui/menus.cc:158 src/qtui/menus.cc:216
 msgid "_Play/Resume"
-msgstr ""
+msgstr "_Play/Resume"
 
-#: src/gtkui/menus.cc:199 src/gtkui/menus.cc:251
-#: src/qtui/main_window_actions.cc:161
+#: src/gtkui/menus.cc:159 src/qtui/menus.cc:218
 msgid "_Refresh"
 msgstr "_Refresh"
 
-#: src/gtkui/menus.cc:201 src/qtui/main_window_actions.cc:163
+#: src/gtkui/menus.cc:161 src/qtui/menus.cc:222
 msgid "_Sort"
 msgstr "_Sort"
 
-#: src/gtkui/menus.cc:202 src/qtui/main_window_actions.cc:164
+#: src/gtkui/menus.cc:162 src/qtui/menus.cc:223
 msgid "Sort Se_lected"
-msgstr ""
+msgstr "Sort Se_lected"
 
-#: src/gtkui/menus.cc:203 src/qtui/main_window_actions.cc:165
+#: src/gtkui/menus.cc:163 src/qtui/menus.cc:225
 msgid "Remove _Duplicates"
-msgstr ""
+msgstr "Remove _Duplicates"
 
-#: src/gtkui/menus.cc:204 src/qtui/main_window_actions.cc:166
+#: src/gtkui/menus.cc:164 src/qtui/menus.cc:226
 msgid "Remove _Unavailable Files"
-msgstr ""
+msgstr "Remove _Unavailable Files"
 
-#: src/gtkui/menus.cc:206 src/playlist-manager/playlist-manager.cc:244
-#: src/qtui/main_window_actions.cc:168
+#: src/gtkui/menus.cc:166 src/playlist-manager/playlist-manager.cc:219
+#: src/playlist-manager-qt/playlist-manager-qt.cc:348 src/qtui/menus.cc:229
 msgid "_New"
 msgstr "_New"
 
-#: src/gtkui/menus.cc:207
+#: src/gtkui/menus.cc:167 src/qtui/menus.cc:230
 msgid "Ren_ame ..."
-msgstr ""
+msgstr "Ren_ame ..."
 
-#: src/gtkui/menus.cc:208 src/gtkui/menus.cc:264
-#: src/qtui/main_window_actions.cc:170
+#: src/gtkui/menus.cc:168 src/gtkui/menus.cc:228
+#: src/moonstone/playlist_tabs.cc:311 src/qtui/menus.cc:231
+#: src/qtui/playlist_tabs.cc:336
 msgid "Remo_ve"
-msgstr ""
+msgstr "Remo_ve"
 
-#: src/gtkui/menus.cc:210
+#: src/gtkui/menus.cc:170 src/qtui/menus.cc:233
 msgid "_Import ..."
 msgstr "_Import ..."
 
-#: src/gtkui/menus.cc:211
+#: src/gtkui/menus.cc:171 src/qtui/menus.cc:234
 msgid "_Export ..."
 msgstr "_Export ..."
 
-#: src/gtkui/menus.cc:213
+#: src/gtkui/menus.cc:173 src/qtui/menus.cc:237
 msgid "Playlist _Manager ..."
-msgstr ""
+msgstr "Playlist _Manager ..."
 
-#: src/gtkui/menus.cc:214 src/qtui/main_window_actions.cc:176
+#: src/gtkui/menus.cc:174 src/qtui/menus.cc:239
 msgid "_Queue Manager ..."
 msgstr "_Queue Manager ..."
 
-#: src/gtkui/menus.cc:218 src/qtui/main_window_actions.cc:180
+#: src/gtkui/menus.cc:178 src/qtui/menus.cc:243
 msgid "Volume _Up"
 msgstr "Volume _Up"
 
-#: src/gtkui/menus.cc:219 src/qtui/main_window_actions.cc:181
+#: src/gtkui/menus.cc:179 src/qtui/menus.cc:245
 msgid "Volume _Down"
 msgstr "Volume _Down"
 
-#: src/gtkui/menus.cc:221 src/qtui/main_window_actions.cc:183
-msgid "_Equalizer"
-msgstr "_Equaliser"
+#: src/gtkui/menus.cc:181 src/qtui/menus.cc:249
+msgid "_Equalizer ..."
+msgstr "_Equaliser ..."
 
-#: src/gtkui/menus.cc:223 src/qtui/main_window_actions.cc:185
+#: src/gtkui/menus.cc:182 src/qtui/menus.cc:251
 msgid "E_ffects ..."
-msgstr ""
+msgstr "E_ffects ..."
+
+#: src/gtkui/menus.cc:184
+msgid "_Record Stream"
+msgstr "_Record Stream"
 
-#: src/gtkui/menus.cc:227
+#: src/gtkui/menus.cc:185
+msgid "Audio _Settings ..."
+msgstr "Audio _Settings ..."
+
+#: src/gtkui/menus.cc:189 src/qtui/menus.cc:260
 msgid "Show _Menu Bar"
 msgstr "Show _Menu Bar"
 
-#: src/gtkui/menus.cc:228
+#: src/gtkui/menus.cc:190 src/qtui/menus.cc:262
 msgid "Show I_nfo Bar"
 msgstr "Show I_nfo Bar"
 
-#: src/gtkui/menus.cc:229
+#: src/gtkui/menus.cc:191 src/qtui/menus.cc:264
+msgid "Show Info Bar _Album Art"
+msgstr "Show Info Bar _Album Art"
+
+#: src/gtkui/menus.cc:192 src/qtui/menus.cc:266
 msgid "Show Info Bar Vis_ualization"
-msgstr ""
+msgstr "Show Info Bar Vis_ualisation"
 
-#: src/gtkui/menus.cc:230
+#: src/gtkui/menus.cc:193 src/qtui/menus.cc:268
 msgid "Show _Status Bar"
 msgstr "Show _Status Bar"
 
-#: src/gtkui/menus.cc:232
+#: src/gtkui/menus.cc:195 src/qtui/menus.cc:272
 msgid "Show _Remaining Time"
-msgstr ""
+msgstr "Show _Remaining Time"
 
-#: src/gtkui/menus.cc:234
+#: src/gtkui/menus.cc:197 src/qtui/menus.cc:276 src/skins/menus.cc:157
+#: src/skins-qt/menus.cc:152
 msgid "_Visualizations ..."
-msgstr ""
+msgstr "_Visualisations ..."
 
-#: src/gtkui/menus.cc:238 src/qtui/main_window_actions.cc:189
+#: src/gtkui/menus.cc:201 src/qtui/menus.cc:280
 msgid "_File"
 msgstr "_File"
 
-#: src/gtkui/menus.cc:239 src/qtui/main_window_actions.cc:190
+#: src/gtkui/menus.cc:202 src/qtui/menus.cc:281
 msgid "_Playback"
 msgstr "_Playback"
 
-#: src/gtkui/menus.cc:240 src/qtui/main_window_actions.cc:191
+#: src/gtkui/menus.cc:203 src/qtui/menus.cc:282
 msgid "P_laylist"
 msgstr "P_laylist"
 
-#: src/gtkui/menus.cc:241 src/gtkui/menus.cc:258
-#: src/qtui/main_window_actions.cc:192
+#: src/gtkui/menus.cc:204 src/gtkui/menus.cc:222 src/qtui/menus.cc:283
+#: src/qtui/menus.cc:312
 msgid "_Services"
 msgstr "_Services"
 
-#: src/gtkui/menus.cc:242 src/qtui/main_window_actions.cc:193
+#: src/gtkui/menus.cc:205 src/qtui/menus.cc:284
 msgid "_Output"
 msgstr "_Output"
 
-#: src/gtkui/menus.cc:243
+#: src/gtkui/menus.cc:206 src/qtui/menus.cc:285
 msgid "_View"
 msgstr "_View"
 
-#: src/gtkui/menus.cc:248
+#: src/gtkui/menus.cc:211 src/qtui/menus.cc:296
 msgid "_Queue/Unqueue"
 msgstr "_Queue/Unqueue"
 
-#: src/gtkui/menus.cc:250
+#: src/gtkui/menus.cc:213 src/qtui/menus.cc:299
 msgid "_Open Containing Folder"
-msgstr ""
+msgstr "_Open Containing Folder"
 
-#: src/gtkui/menus.cc:253
+#: src/gtkui/menus.cc:214 src/qtui/menus.cc:301
+msgid "_Refresh Selected"
+msgstr "_Refresh Selected"
+
+#: src/gtkui/menus.cc:216 src/qtui/menus.cc:304
 msgid "Cu_t"
 msgstr "Cu_t"
 
-#: src/gtkui/menus.cc:254
+#: src/gtkui/menus.cc:217 src/qtui/menus.cc:305
 msgid "_Copy"
 msgstr "_Copy"
 
-#: src/gtkui/menus.cc:255
+#: src/gtkui/menus.cc:218 src/qtui/menus.cc:306
 msgid "_Paste"
 msgstr "_Paste"
 
-#: src/gtkui/menus.cc:256
+#: src/gtkui/menus.cc:219 src/qtui/menus.cc:307
+msgid "Paste at _End"
+msgstr "Paste at _End"
+
+#: src/gtkui/menus.cc:220 src/qtui/menus.cc:309
 msgid "Select _All"
 msgstr "Select _All"
 
-#: src/gtkui/menus.cc:263
+#: src/gtkui/menus.cc:227 src/moonstone/playlist_tabs.cc:309
+#: src/qtui/playlist_tabs.cc:334
 msgid "_Rename ..."
-msgstr ""
+msgstr "_Rename ..."
+
+#: src/gtkui/settings.cc:35 src/qtui/settings.cc:59
+msgid "Always"
+msgstr "Always"
+
+#: src/gtkui/settings.cc:36 src/qtui/settings.cc:60
+msgid "Auto-hide"
+msgstr "Auto-hide"
+
+#: src/gtkui/settings.cc:37 src/qtui/settings.cc:61
+msgid "Never"
+msgstr "Never"
 
-#: src/gtkui/settings.cc:35
+#: src/gtkui/settings.cc:41 src/qtui/settings.cc:64
 msgid "Playlist Tabs"
-msgstr ""
+msgstr "Playlist Tabs"
 
-#: src/gtkui/settings.cc:36
-msgid "Always show tabs"
-msgstr ""
+#: src/gtkui/settings.cc:42 src/qtui/settings.cc:65
+msgid "Show playlist tabs:"
+msgstr "Show playlist tabs:"
 
-#: src/gtkui/settings.cc:38
+#: src/gtkui/settings.cc:45 src/qtui/settings.cc:69
 msgid "Show entry counts"
-msgstr ""
+msgstr "Show entry counts"
 
-#: src/gtkui/settings.cc:40
+#: src/gtkui/settings.cc:47 src/qtui/settings.cc:72
 msgid "Show close buttons"
-msgstr ""
+msgstr "Show close buttons"
 
-#: src/gtkui/settings.cc:42
+#: src/gtkui/settings.cc:49 src/qtui/settings.cc:75
 msgid "Playlist Columns"
-msgstr ""
+msgstr "Playlist Columns"
 
-#: src/gtkui/settings.cc:44
+#: src/gtkui/settings.cc:51 src/qtui/settings.cc:77
 msgid "Show column headers"
-msgstr ""
+msgstr "Show column headers"
 
-#: src/gtkui/settings.cc:46 src/modplug/plugin_main.cc:106
-#: src/skins/skins_cfg.cc:263
-msgid "Miscellaneous"
-msgstr ""
+#: src/gtkui/settings.cc:53 src/qtui/settings.cc:82
+msgid "Make column headers clickable for sorting"
+msgstr "Make column headers clickable for sorting"
 
-#: src/gtkui/settings.cc:47
-msgid "Arrow keys seek by:"
-msgstr ""
+#: src/gtkui/settings.cc:56
+msgid "Use symbolic icons in toolbar"
+msgstr "Use symbolic icons in toolbar"
 
-#: src/gtkui/settings.cc:50
+#: src/gtkui/settings.cc:58 src/qtui/settings.cc:86
 msgid "Scroll on song change"
-msgstr ""
+msgstr "Scroll on song change"
 
-#: src/gtkui/ui_gtk.cc:71
+#: src/gtkui/ui_gtk.cc:82
 msgid "GTK Interface"
 msgstr "GTK Interface"
 
-#: src/gtkui/ui_gtk.cc:222 src/skins/ui_main.cc:232
+#: src/gtkui/ui_gtk.cc:219 src/skins/main.cc:228 src/skins-qt/main.cc:231
 #, c-format
 msgid "%s - Audacious"
 msgstr "%s - Audacious"
 
-#: src/gtkui/ui_gtk.cc:225 src/qtui/main_window.cc:186
+#: src/gtkui/ui_gtk.cc:221 src/moonstone/main_window.cc:184
+#: src/qtui/main_window.cc:385
 msgid "Buffering ..."
-msgstr ""
+msgstr "Buffering ..."
 
-#: src/gtkui/ui_gtk.cc:228 src/skins/ui_main.cc:234 src/skins/ui_main.cc:1164
+#: src/gtkui/ui_gtk.cc:224 src/pipewire/pipewire.cc:402 src/skins/main.cc:230
+#: src/skins-qt/main.cc:233
 msgid "Audacious"
 msgstr "Audacious"
 
-#: src/gtkui/ui_statusbar.cc:63 src/qtui/status_bar.cc:67
+#: src/gtkui/ui_gtk.cc:487 src/gtkui/ui_gtk.cc:518 src/gtkui/ui_gtk.cc:882
+#: src/hotkey/gui.cc:72 src/moonstone/main_window.cc:67
+#: src/moonstone/main_window.cc:145 src/moonstone/main_window.cc:146
+#: src/notify/osd.cc:85 src/qthotkey/gui.cc:67 src/qtui/main_window.cc:154
+#: src/qtui/main_window.cc:347 src/qtui/main_window.cc:348
+#: src/skins/menus.cc:109 src/skins-qt/menus.cc:100
+msgid "Play"
+msgstr "Play"
+
+#: src/gtkui/ui_gtk.cc:487 src/moonstone/main_window.cc:151
+#: src/moonstone/main_window.cc:152 src/notify/osd.cc:82
+#: src/qtui/main_window.cc:353 src/qtui/main_window.cc:354
+#: src/skins/menus.cc:110 src/skins-qt/menus.cc:101
+msgid "Pause"
+msgstr "Pause"
+
+#: src/gtkui/ui_gtk.cc:868 src/moonstone/main_window.cc:57
+#: src/qtui/main_window.cc:145 src/skins/menus.cc:86 src/skins-qt/menus.cc:77
+msgid "Search Library"
+msgstr "Search Library"
+
+#: src/gtkui/ui_gtk.cc:875 src/moonstone/main_window.cc:60
+#: src/qtui/main_window.cc:147
+msgid "Open Files"
+msgstr "Open Files"
+
+#: src/gtkui/ui_gtk.cc:876 src/moonstone/main_window.cc:62
+#: src/qtui/main_window.cc:149
+msgid "Add Files"
+msgstr "Add Files"
+
+#: src/gtkui/ui_gtk.cc:881 src/moonstone/main_window.cc:65
+#: src/qtui/main_window.cc:152 src/skins/menus.cc:112 src/skins-qt/menus.cc:103
+msgid "Previous"
+msgstr "Previous"
+
+#: src/gtkui/ui_gtk.cc:883 src/hotkey/gui.cc:74 src/moonstone/main_window.cc:69
+#: src/qthotkey/gui.cc:69 src/qtui/main_window.cc:156 src/skins/menus.cc:111
+#: src/skins-qt/menus.cc:102
+msgid "Stop"
+msgstr "Stop"
+
+#: src/gtkui/ui_gtk.cc:884 src/moonstone/main_window.cc:76 src/notify/osd.cc:89
+#: src/qtui/main_window.cc:163 src/skins/menus.cc:113 src/skins-qt/menus.cc:104
+msgid "Next"
+msgstr "Next"
+
+#: src/gtkui/ui_gtk.cc:886 src/moonstone/main_window.cc:79
+#: src/qtui/main_window.cc:166 src/qtui/menus.cc:254 src/skins/menus.cc:79
+#: src/skins-qt/menus.cc:69
+msgid "Record Stream"
+msgstr "Record Stream"
+
+#: src/gtkui/ui_gtk.cc:919 src/moonstone/main_window.cc:86
+#: src/qtui/main_window.cc:173 src/skins/menus.cc:103 src/skins-qt/menus.cc:94
+msgid "Repeat"
+msgstr "Repeat"
+
+#: src/gtkui/ui_gtk.cc:922 src/moonstone/main_window.cc:89
+#: src/qtui/main_window.cc:176 src/skins/menus.cc:104 src/skins-qt/menus.cc:95
+msgid "Shuffle"
+msgstr "Shuffle"
+
+#: src/gtkui/ui_gtk.cc:1114 src/qtui/main_window.cc:123
+msgid "Menu"
+msgstr "Menu"
+
+#: src/gtkui/ui_statusbar.cc:64 src/qtui/status_bar.cc:155
 msgid "mono"
 msgstr "mono"
 
-#: src/gtkui/ui_statusbar.cc:65 src/qtui/status_bar.cc:69
+#: src/gtkui/ui_statusbar.cc:66 src/qtui/status_bar.cc:157
 msgid "stereo"
 msgstr "stereo"
 
-#: src/gtkui/ui_statusbar.cc:67 src/qtui/status_bar.cc:71
+#: src/gtkui/ui_statusbar.cc:68 src/qtui/status_bar.cc:160
 #, c-format
 msgid "%d channel"
 msgid_plural "%d channels"
-msgstr0 ""
-msgstr1 ""
+msgstr0 "%d channel"
+msgstr1 "%d channels"
+
+#: src/gtkui/ui_statusbar.cc:76 src/qtui/status_bar.cc:168
+#, c-format
+msgid "%d kHz"
+msgstr "%d kHz"
 
-#: src/gtkui/ui_statusbar.cc:81 src/qtui/status_bar.cc:85
+#: src/gtkui/ui_statusbar.cc:82 src/qtui/status_bar.cc:174
 #, c-format
-msgid "%d kbps"
-msgstr "%d kbps"
+msgid "%d kbit/s"
+msgstr "%d kbit/s"
 
-#: src/gtkui/ui_statusbar.cc:107 src/skins/ui_main_evlisteners.cc:103
+#: src/gtkui/ui_statusbar.cc:108 src/skins/main.cc:478 src/skins-qt/main.cc:461
 msgid "Single mode."
 msgstr "Single mode."
 
-#: src/gtkui/ui_statusbar.cc:109 src/skins/ui_main_evlisteners.cc:105
+#: src/gtkui/ui_statusbar.cc:110 src/skins/main.cc:480 src/skins-qt/main.cc:463
 msgid "Playlist mode."
 msgstr "Playlist mode."
 
-#: src/gtkui/ui_statusbar.cc:117 src/skins/ui_main_evlisteners.cc:111
+#: src/gtkui/ui_statusbar.cc:118 src/skins/main.cc:486 src/skins-qt/main.cc:469
 msgid "Stopping after song."
 msgstr "Stopping after song."
 
-#: src/hotkey/gui.cc:71
+#: src/hotkey/gui.cc:71 src/qthotkey/gui.cc:66
 msgid "Previous track"
-msgstr ""
-
-#: src/hotkey/gui.cc:72 src/notify/osd.cc:69 src/qtui/main_window.cc:69
-#: src/qtui/main_window.cc:172 src/qtui/main_window.cc:173
-#: src/skins/menus.cc:87
-msgid "Play"
-msgstr "Play"
+msgstr "Previous track"
 
-#: src/hotkey/gui.cc:73
+#: src/hotkey/gui.cc:73 src/qthotkey/gui.cc:68
 msgid "Pause/Resume"
 msgstr "Pause/Resume"
 
-#: src/hotkey/gui.cc:74 src/qtui/main_window.cc:70 src/skins/menus.cc:89
-msgid "Stop"
-msgstr "Stop"
-
-#: src/hotkey/gui.cc:75
+#: src/hotkey/gui.cc:75 src/qthotkey/gui.cc:70
 msgid "Next track"
-msgstr ""
+msgstr "Next track"
 
-#: src/hotkey/gui.cc:76
-msgid "Forward 5 seconds"
-msgstr ""
+#: src/hotkey/gui.cc:76 src/qthotkey/gui.cc:71
+msgid "Step forward"
+msgstr "Step forward"
 
-#: src/hotkey/gui.cc:77
-msgid "Rewind 5 seconds"
-msgstr ""
+#: src/hotkey/gui.cc:77 src/qthotkey/gui.cc:72
+msgid "Step backward"
+msgstr "Step backward"
 
-#: src/hotkey/gui.cc:78
+#: src/hotkey/gui.cc:78 src/qthotkey/gui.cc:73
 msgid "Mute"
 msgstr "Mute"
 
-#: src/hotkey/gui.cc:79
+#: src/hotkey/gui.cc:79 src/qthotkey/gui.cc:74
 msgid "Volume up"
-msgstr ""
+msgstr "Volume up"
 
-#: src/hotkey/gui.cc:80
+#: src/hotkey/gui.cc:80 src/qthotkey/gui.cc:75
 msgid "Volume down"
-msgstr ""
+msgstr "Volume down"
 
-#: src/hotkey/gui.cc:81
+#: src/hotkey/gui.cc:81 src/qthotkey/gui.cc:76
 msgid "Jump to file"
-msgstr ""
+msgstr "Jump to file"
 
-#: src/hotkey/gui.cc:82
+#: src/hotkey/gui.cc:82 src/qthotkey/gui.cc:77
 msgid "Toggle player window(s)"
-msgstr ""
+msgstr "Toggle player window(s)"
 
-#: src/hotkey/gui.cc:83
+#: src/hotkey/gui.cc:83 src/qthotkey/gui.cc:78
 msgid "Show On-Screen-Display"
 msgstr "Show On-Screen-Display"
 
-#: src/hotkey/gui.cc:84
+#: src/hotkey/gui.cc:84 src/qthotkey/gui.cc:79
 msgid "Toggle repeat"
-msgstr ""
+msgstr "Toggle repeat"
 
-#: src/hotkey/gui.cc:85
+#: src/hotkey/gui.cc:85 src/qthotkey/gui.cc:80
 msgid "Toggle shuffle"
-msgstr ""
+msgstr "Toggle shuffle"
 
-#: src/hotkey/gui.cc:86
+#: src/hotkey/gui.cc:86 src/qthotkey/gui.cc:81
 msgid "Toggle stop after current"
-msgstr ""
+msgstr "Toggle stop after current"
 
-#: src/hotkey/gui.cc:87
+#: src/hotkey/gui.cc:87 src/qthotkey/gui.cc:82
 msgid "Raise player window(s)"
-msgstr ""
+msgstr "Raise player window(s)"
 
-#: src/hotkey/gui.cc:97
+#: src/hotkey/gui.cc:98 src/qthotkey/gui.cc:100
 msgid "(none)"
 msgstr "(none)"
 
-#: src/hotkey/gui.cc:234
+#: src/hotkey/gui.cc:261
 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 modifiers.\n"
 "\n"
 "Do you want to continue?"
 msgstr ""
-"It is not recommended to bind the primary mouse buttons without "
-"modificators.\n"
+"It is not recommended to bind the primary mouse buttons without modifiers.\n"
 "\n"
 "Do you want to continue?"
 
-#: src/hotkey/gui.cc:236
+#: src/hotkey/gui.cc:264
 msgid "Binding mouse buttons"
 msgstr "Binding mouse buttons"
 
-#: src/hotkey/gui.cc:391
+#: src/hotkey/gui.cc:434
 msgid ""
 "Press a key combination inside a text field.\n"
 "You can also bind mouse buttons."
@@ -2014,86 +2247,129 @@
 "Press a key combination inside a text field.\n"
 "You can also bind mouse buttons."
 
-#: src/hotkey/gui.cc:396
+#: src/hotkey/gui.cc:444 src/qthotkey/gui.cc:179
 msgid "Hotkeys:"
 msgstr "Hotkeys:"
 
-#: src/hotkey/gui.cc:413
+#: src/hotkey/gui.cc:457 src/qthotkey/gui.cc:181
 msgid "Action:"
 msgstr "Action:"
 
-#: src/hotkey/gui.cc:420
+#: src/hotkey/gui.cc:461 src/qthotkey/gui.cc:182
 msgid "Key Binding:"
 msgstr "Key Binding:"
 
-#: src/hotkey/gui.cc:468
+#: src/hotkey/gui.cc:518 src/qthotkey/gui.cc:184
 msgid "_Add"
-msgstr ""
+msgstr "_Add"
 
-#: src/hotkey/plugin.cc:61
+#: src/hotkey/plugin.cc:59 src/qthotkey/plugin.cc:78
 msgid "Global Hotkeys"
-msgstr ""
+msgstr "Global Hotkeys"
 
-#: src/hotkey/plugin.cc:79
+#: src/hotkey/plugin.cc:74
 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"
+"Contributors 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 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"
+"Contributors 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/jack-ng/jack-ng.cc:49
+#: src/jack/jack-ng.cc:54
 msgid "JACK Output"
-msgstr ""
+msgstr "JACK Output"
+
+#: src/jack/jack-ng.cc:126
+msgid "Client name:"
+msgstr "Client name:"
 
-#: src/jack-ng/jack-ng.cc:114
+#: src/jack/jack-ng.cc:128
 msgid "Automatically connect to output ports"
-msgstr ""
+msgstr "Automatically connect to output ports"
+
+#: src/jack/jack-ng.cc:130
+msgid "Filter ports (regex, use any port if blank):"
+msgstr "Filter ports (regex, use any port if blank):"
+
+#: src/jack/jack-ng.cc:136
+msgid "Connect to physical ports only"
+msgstr "Connect to physical ports only"
+
+#: src/jack/jack-ng.cc:139
+msgid "Upmix to"
+msgstr "Upmix to"
+
+#: src/jack/jack-ng.cc:141
+msgid "ports if input has fewer channels"
+msgstr "ports if input has fewer channels"
+
+#: src/jack/jack-ng.cc:143
+msgid "Ignore insufficient number of ports"
+msgstr "Ignore insufficient number of ports"
+
+#: src/jack/jack-ng.cc:181
+msgid "No JACK output ports were found. Please check settings."
+msgstr "No JACK output ports were found. Please check settings."
 
-#: src/jack-ng/jack-ng.cc:155
+#: src/jack/jack-ng.cc:195
 #, c-format
 msgid "Only %d JACK output ports were found but %d are required."
-msgstr ""
+msgstr "Only %d JACK output ports were found but %d are required."
 
-#: src/jack-ng/jack-ng.cc:164
+#: src/jack/jack-ng.cc:210
 #, c-format
 msgid "Failed to connect to JACK port %s."
-msgstr ""
+msgstr "Failed to connect to JACK port %s."
 
-#: src/jack-ng/jack-ng.cc:184
+#: src/jack/jack-ng.cc:230
 msgid ""
 "JACK supports only floating-point audio. You must change the output bit "
 "depth to floating-point in Audacious settings."
 msgstr ""
+"JACK supports only floating-point audio. You must change the output bit "
+"depth to floating-point in Audacious settings."
 
-#: src/jack-ng/jack-ng.cc:197
+#: src/jack/jack-ng.cc:245
 msgid "Failed to connect to the JACK server; is it running?"
-msgstr ""
+msgstr "Failed to connect to the JACK server; is it running?"
 
-#: src/jack-ng/jack-ng.cc:273
+#: src/jack/jack-ng.cc:321
 #, c-format
 msgid ""
 "The JACK server requires a sample rate of %d Hz, but Audacious is playing at "
 "%d Hz. Please use the Sample Rate Converter effect to correct the mismatch."
 msgstr ""
+"The JACK server requires a sample rate of %d Hz, but Audacious is playing at "
+"%d Hz. Please use the Sample Rate Converter effect to correct the mismatch."
 
-#: src/ladspa/plugin.cc:414
+#: src/ladspa/plugin.cc:416
 #, c-format
 msgid "%s Settings"
 msgstr "%s Settings"
 
-#: src/ladspa/plugin.cc:478
+#: src/ladspa/plugin.cc:482
 msgid "Module paths:"
 msgstr "Module paths:"
 
-#: src/ladspa/plugin.cc:483
+#: src/ladspa/plugin.cc:487
 msgid ""
 "Separate multiple paths with a colon.\n"
 "These paths are searched in addition to LADSPA_PATH.\n"
@@ -2103,39 +2379,41 @@
 "These paths are searched in addition to LADSPA_PATH.\n"
 "After adding new paths, press Enter to scan for new plugins."
 
-#: src/ladspa/plugin.cc:499
+#: src/ladspa/plugin.cc:508
 msgid "Available plugins:"
 msgstr "Available plugins:"
 
-#: src/ladspa/plugin.cc:512 src/modplug/plugin_main.cc:92
-#: src/modplug/plugin_main.cc:95 src/modplug/plugin_main.cc:98
-#: src/modplug/plugin_main.cc:101
+#: src/ladspa/plugin.cc:521 src/modplug/plugin_main.cc:91
+#: src/modplug/plugin_main.cc:94 src/modplug/plugin_main.cc:97
+#: src/modplug/plugin_main.cc:100
 msgid "Enable"
 msgstr "Enable"
 
-#: src/ladspa/plugin.cc:518
+#: src/ladspa/plugin.cc:527
 msgid "Enabled plugins:"
 msgstr "Enabled plugins:"
 
-#: src/ladspa/plugin.cc:534
+#: src/ladspa/plugin.cc:543
 msgid "Settings"
 msgstr "Settings"
 
-#: src/ladspa/plugin.cc:551
+#: src/ladspa/plugin.cc:560
 msgid ""
 "LADSPA Host for Audacious\n"
 "Copyright 2011 John Lindgren"
 msgstr ""
+"LADSPA Host for Audacious\n"
+"Copyright 2011 John Lindgren"
 
 #: src/ladspa/plugin.h:78
 msgid "LADSPA Host"
-msgstr ""
+msgstr "LADSPA Host"
 
 #: src/lirc/lirc.cc:55
 msgid "LIRC Plugin"
-msgstr ""
+msgstr "LIRC Plugin"
 
-#: src/lirc/lirc.cc:381
+#: src/lirc/lirc.cc:379
 msgid ""
 "A simple plugin to control Audacious using the LIRC remote control daemon\n"
 "\n"
@@ -2150,82 +2428,154 @@
 "\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.cc:392
+#: src/lirc/lirc.cc:390
 msgid "Connection"
-msgstr ""
+msgstr "Connection"
 
-#: src/lirc/lirc.cc:393
+#: src/lirc/lirc.cc:391
 msgid "Reconnect to LIRC server"
-msgstr ""
+msgstr "Reconnect to LIRC server"
 
-#: src/lirc/lirc.cc:395
+#: src/lirc/lirc.cc:393
 msgid "Wait before reconnecting:"
-msgstr ""
-
-#: src/lyricwiki/lyricwiki.cc:41
-msgid "LyricWiki Plugin"
-msgstr ""
-
-#: src/lyricwiki/lyricwiki.cc:131 src/lyricwiki-qt/lyricwiki.cc:136
-msgid "No lyrics available"
-msgstr ""
-
-#: src/lyricwiki/lyricwiki.cc:217 src/lyricwiki/lyricwiki.cc:226
-#: src/lyricwiki/lyricwiki.cc:243 src/lyricwiki/lyricwiki.cc:252
-#: src/lyricwiki/lyricwiki.cc:267 src/lyricwiki-qt/lyricwiki.cc:222
-#: src/lyricwiki-qt/lyricwiki.cc:231 src/lyricwiki-qt/lyricwiki.cc:248
-#: src/lyricwiki-qt/lyricwiki.cc:257 src/lyricwiki-qt/lyricwiki.cc:272
-msgid "Error"
-msgstr "Error"
+msgstr "Wait before reconnecting:"
 
-#: src/lyricwiki/lyricwiki.cc:218 src/lyricwiki/lyricwiki.cc:244
-#: src/lyricwiki-qt/lyricwiki.cc:223 src/lyricwiki-qt/lyricwiki.cc:249
+#: src/lyrics-common/chart_lyrics_provider.cc:93
+#: src/lyrics-common/chart_lyrics_provider.cc:150
+#: src/lyrics-common/lyrics_ovh_provider.cc:50
 #, c-format
 msgid "Unable to fetch %s"
-msgstr ""
+msgstr "Unable to fetch %s"
 
-#: src/lyricwiki/lyricwiki.cc:227 src/lyricwiki/lyricwiki.cc:253
-#: src/lyricwiki-qt/lyricwiki.cc:232 src/lyricwiki-qt/lyricwiki.cc:258
+#: src/lyrics-common/chart_lyrics_provider.cc:100
+#: src/lyrics-common/chart_lyrics_provider.cc:157
+#: src/lyrics-common/lyrics_ovh_provider.cc:57
 #, c-format
 msgid "Unable to parse %s"
-msgstr ""
+msgstr "Unable to parse %s"
 
-#: src/lyricwiki/lyricwiki.cc:259 src/lyricwiki-qt/lyricwiki.cc:264
+#: src/lyrics-common/chart_lyrics_provider.cc:121
+#: src/lyrics-common/chart_lyrics_provider.cc:194
+#: src/lyrics-common/lyrics_ovh_provider.cc:88
 msgid "Looking for lyrics ..."
-msgstr ""
+msgstr "Looking for lyrics ..."
 
-#: src/lyricwiki/lyricwiki.cc:267 src/lyricwiki-qt/lyricwiki.cc:272
-msgid "Missing song metadata"
-msgstr ""
+#: src/lyrics-common/preferences.h:43
+msgid "Nowhere"
+msgstr "Nowhere"
 
-#: src/lyricwiki/lyricwiki.cc:278 src/lyricwiki-qt/lyricwiki.cc:283
-msgid "Connecting to lyrics.wikia.com ..."
-msgstr ""
+#: src/lyrics-common/preferences.h:49
+msgid "Artist is truncated at the start, Title -- at the end"
+msgstr "Artist is truncated at the start, Title -- at the end"
 
-#: src/lyricwiki-qt/lyricwiki.cc:55
-msgid "LyricWiki Plugin (Qt)"
-msgstr ""
+#: src/lyrics-common/preferences.h:50
+msgid "Chars to truncate on:"
+msgstr "Chars to truncate on:"
+
+#: src/lyrics-common/preferences.h:54
+msgid "Chars are ORed in RegExp, surrounded by whitespace"
+msgstr "Chars are ORed in RegExp, surrounded by whitespace"
+
+#: src/lyrics-common/preferences.h:55
+msgid "Chars to split on:"
+msgstr "Chars to split on:"
+
+#: src/lyrics-common/preferences.h:56
+msgid "Further truncate those on chars"
+msgstr "Further truncate those on chars"
+
+#: src/lyrics-common/preferences.h:62
+msgid "General"
+msgstr "General"
 
-#: src/m3u/m3u.cc:32
+#: src/lyrics-common/preferences.h:63
+msgid "Split title into artist and title on chars"
+msgstr "Split title into artist and title on chars"
+
+#: src/lyrics-common/preferences.h:66
+msgid "Sources"
+msgstr "Sources"
+
+#: src/lyrics-common/preferences.h:67
+msgid "Use embedded lyrics (from Lyrics tag)"
+msgstr "Use embedded lyrics (from Lyrics tag)"
+
+#: src/lyrics-common/preferences.h:69
+msgid "Fetch lyrics from internet:"
+msgstr "Fetch lyrics from Internet:"
+
+#: src/lyrics-common/preferences.h:72
+msgid "Store fetched lyrics in local cache"
+msgstr "Store fetched lyrics in local cache"
+
+#: src/lyrics-common/preferences.h:74
+msgid "Local Storage"
+msgstr "Local Storage"
+
+#: src/lyrics-common/preferences.h:75
+msgid "Load lyric files (.lrc) from local storage"
+msgstr "Load lyric files (.lrc) from local storage"
+
+#: src/lyrics-common/utils.cc:54 src/ui-common/dialogs-qt.cc:63
+msgid "Error"
+msgstr "Error"
+
+#: src/lyrics-common/utils.cc:60
+msgid "Lyrics could not be found."
+msgstr "Lyrics could not be found."
+
+#: src/lyrics-common/utils.cc:142
+msgid "Missing title and/or artist."
+msgstr "Missing title and/or artist."
+
+#: src/lyrics-gtk/lyrics-gtk.cc:37 src/lyrics-qt/lyrics-qt.cc:50
+msgid "Lyrics"
+msgstr "Lyrics"
+
+#: src/lyrics-gtk/lyrics-gtk.cc:189 src/lyrics-qt/lyrics-qt.cc:171
+msgid "Edit Lyrics ..."
+msgstr "Edit Lyrics ..."
+
+#: src/lyrics-gtk/lyrics-gtk.cc:195 src/lyrics-qt/lyrics-qt.cc:178
+msgid "Save Locally"
+msgstr "Save Locally"
+
+#: src/lyrics-gtk/lyrics-gtk.cc:201 src/lyrics-qt/lyrics-qt.cc:186
+msgid "Refresh"
+msgstr "Refresh"
+
+#: src/m3u/m3u.cc:33
 msgid "M3U Playlists"
-msgstr ""
+msgstr "M3U Playlists"
 
 #: src/metronom/metronom.cc:44
 msgid "Tact Generator"
-msgstr ""
+msgstr "Tact Generator"
 
-#: src/metronom/metronom.cc:147
+#: src/metronom/metronom.cc:145
 #, c-format
 msgid "Tact generator: %d bpm"
 msgstr "Tact generator: %d bpm"
 
-#: src/metronom/metronom.cc:149
+#: src/metronom/metronom.cc:147
 #, c-format
 msgid "Tact generator: %d bpm %d/%d"
 msgstr "Tact generator: %d bpm %d/%d"
 
-#: src/metronom/metronom.cc:237
+#: src/metronom/metronom.cc:235
 msgid ""
 "A Tact Generator by Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
 "\n"
@@ -2233,195 +2583,210 @@
 "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"
+"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"
 
-#: src/mixer/mixer.cc:38
+#: src/mixer/mixer.cc:43
 msgid "Channel Mixer"
-msgstr ""
+msgstr "Channel Mixer"
 
-#: src/mixer/mixer.cc:202
+#: src/mixer/mixer.cc:255
 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.cc:206
+#: src/mixer/mixer.cc:259
 msgid "Channel Mixer"
-msgstr ""
+msgstr "Channel Mixer"
 
-#: src/mixer/mixer.cc:207
+#: src/mixer/mixer.cc:260
 msgid "Output channels:"
 msgstr "Output channels:"
 
 #: src/mms/mms.cc:35
 msgid "MMS Plugin"
-msgstr ""
+msgstr "MMS Plugin"
 
 #: src/mms/mms.cc:82
 msgid "Error connecting to MMS server"
-msgstr ""
+msgstr "Error connecting to MMS server"
 
-#: src/modplug/modplugbmp.h:53
+#: src/modplug/modplugbmp.h:57
 msgid "ModPlug (Module Player)"
-msgstr ""
-
-#: src/modplug/plugin_main.cc:53
-msgid "Resolution"
-msgstr ""
-
-#: src/modplug/plugin_main.cc:54
-msgid "8-bit"
-msgstr ""
+msgstr "ModPlug (Module Player)"
 
 #: src/modplug/plugin_main.cc:55
-msgid "16-bit"
-msgstr ""
-
-#: src/modplug/plugin_main.cc:56
 msgid "Channels"
-msgstr ""
+msgstr "Channels"
 
-#: src/modplug/plugin_main.cc:60
+#: src/modplug/plugin_main.cc:59
 msgid "Nearest (fastest)"
-msgstr ""
+msgstr "Nearest (fastest)"
 
-#: src/modplug/plugin_main.cc:61
+#: src/modplug/plugin_main.cc:60
 msgid "Linear (fast)"
-msgstr ""
+msgstr "Linear (fast)"
 
-#: src/modplug/plugin_main.cc:62
+#: src/modplug/plugin_main.cc:61
 msgid "Spline (good)"
-msgstr ""
+msgstr "Spline (good)"
 
-#: src/modplug/plugin_main.cc:63
+#: src/modplug/plugin_main.cc:62
 msgid "Polyphase (best)"
-msgstr ""
+msgstr "Polyphase (best)"
 
-#: src/modplug/plugin_main.cc:64
+#: src/modplug/plugin_main.cc:63
 msgid "Sample rate"
-msgstr ""
+msgstr "Sample rate"
 
-#: src/modplug/plugin_main.cc:65
+#: src/modplug/plugin_main.cc:64
 msgid "22 kHz"
-msgstr ""
+msgstr "22 kHz"
 
-#: src/modplug/plugin_main.cc:66
+#: src/modplug/plugin_main.cc:65
 msgid "44 kHz"
-msgstr ""
+msgstr "44 kHz"
 
-#: src/modplug/plugin_main.cc:67
+#: src/modplug/plugin_main.cc:66
 msgid "48 kHz"
-msgstr ""
+msgstr "48 kHz"
 
-#: src/modplug/plugin_main.cc:68
+#: src/modplug/plugin_main.cc:67
 msgid "96 kHz"
-msgstr ""
+msgstr "96 kHz"
 
-#: src/modplug/plugin_main.cc:72 src/modplug/plugin_main.cc:77
-#: src/modplug/plugin_main.cc:82
+#: src/modplug/plugin_main.cc:71 src/modplug/plugin_main.cc:76
+#: src/modplug/plugin_main.cc:81
 msgid "Level:"
-msgstr ""
+msgstr "Level:"
 
-#: src/modplug/plugin_main.cc:78
+#: src/modplug/plugin_main.cc:77
 msgid "Cutoff:"
-msgstr ""
+msgstr "Cutoff:"
 
-#: src/modplug/plugin_main.cc:91
+#: src/modplug/plugin_main.cc:90
 msgid "Reverb"
-msgstr ""
+msgstr "Reverb"
 
-#: src/modplug/plugin_main.cc:94
+#: src/modplug/plugin_main.cc:93
 msgid "Bass Boost"
-msgstr ""
+msgstr "Bass Boost"
 
-#: src/modplug/plugin_main.cc:97
+#: src/modplug/plugin_main.cc:96
 msgid "Surround"
-msgstr ""
+msgstr "Surround"
 
-#: src/modplug/plugin_main.cc:100
+#: src/modplug/plugin_main.cc:99
 msgid "Preamp"
-msgstr ""
+msgstr "Preamp"
 
-#: src/modplug/plugin_main.cc:107
+#: src/modplug/plugin_main.cc:106
 msgid "Oversample"
-msgstr ""
+msgstr "Oversample"
 
-#: src/modplug/plugin_main.cc:108
+#: src/modplug/plugin_main.cc:107
 msgid "Noise reduction"
-msgstr ""
+msgstr "Noise reduction"
 
-#: src/modplug/plugin_main.cc:109
+#: src/modplug/plugin_main.cc:108
 msgid "Play Amiga MODs"
-msgstr ""
+msgstr "Play Amiga MODs"
 
-#: src/modplug/plugin_main.cc:110
+#: src/modplug/plugin_main.cc:109
 msgid "Repeat"
-msgstr ""
+msgstr "Repeat"
 
-#: src/modplug/plugin_main.cc:111
+#: src/modplug/plugin_main.cc:110
 msgid "Repeat count:"
-msgstr ""
+msgstr "Repeat count:"
 
-#: src/modplug/plugin_main.cc:112
+#: src/modplug/plugin_main.cc:111
 msgid "To repeat forever, set the repeat count to -1."
-msgstr ""
+msgstr "To repeat forever, set the repeat count to -1."
 
-#: src/modplug/plugin_main.cc:125 src/sid/xs_config.cc:106
+#: src/modplug/plugin_main.cc:124 src/sid/xs_config.cc:106
 msgid "These settings will take effect when Audacious is restarted."
-msgstr ""
+msgstr "These settings will take effect when Audacious is restarted."
+
+#: src/moonstone/main_window.cc:72 src/moonstone/main_window.cc:73
+#: src/qtui/main_window.cc:159 src/qtui/main_window.cc:160
+#: src/skins/menus.cc:107 src/skins-qt/menus.cc:98
+msgid "Stop After This Song"
+msgstr "Stop After This Song"
+
+#: src/moonstone/moonstone.cc:39
+msgid "Moonstone"
+msgstr "Moonstone"
+
+#: src/moonstone/playlist_header.cc:212 src/qtui/playlist_header.cc:258
+msgid "Reset to Defaults"
+msgstr "Reset to Defaults"
+
+#: src/moonstone/playlist_model.cc:38 src/qtui/playlist_header.cc:232
+msgid "Now Playing"
+msgstr "Now Playing"
+
+#: src/moonstone/playlist_selection.cc:66
+#: src/playlist-manager/playlist-manager.cc:201
+#: src/playlist-manager-qt/playlist-manager-qt.cc:190
+msgid "Entries"
+msgstr "Entries"
 
 #: src/mpg123/mpg123.cc:54
 msgid "MPG123 Plugin"
-msgstr ""
-
-#: src/mpg123/mpg123.cc:83
-msgid "Advanced"
-msgstr ""
+msgstr "MPG123 Plugin"
 
-#: src/mpg123/mpg123.cc:84
+#: src/mpg123/mpg123.cc:82
 msgid "Use accurate length calculation (slow)"
-msgstr ""
+msgstr "Use accurate length calculation (slow)"
 
-#: src/mpg123/mpg123.cc:248
+#: src/mpg123/mpg123.cc:260
 msgid "Surround"
 msgstr "Surround"
 
-#: src/mpris2/plugin.cc:39
+#: src/mpris2/plugin.cc:40
 msgid "MPRIS 2 Server"
-msgstr ""
+msgstr "MPRIS 2 Server"
 
-#: src/neon/neon.cc:97
+#: src/neon/neon.cc:102
 msgid "Neon HTTP/HTTPS Plugin"
-msgstr ""
+msgstr "Neon HTTP/HTTPS Plugin"
 
-#: src/neon/neon.cc:521
+#: src/neon/neon.cc:526
 msgid "Error parsing redirect"
-msgstr ""
+msgstr "Error parsing redirect"
 
-#: src/neon/neon.cc:535
+#: src/neon/neon.cc:540
 msgid "Unknown HTTP error"
-msgstr ""
+msgstr "Unknown HTTP error"
 
-#: src/neon/neon.cc:569
+#: src/neon/neon.cc:614
 msgid "Error parsing URL"
-msgstr ""
+msgstr "Error parsing URL"
 
-#: src/neon/neon.cc:632
+#: src/neon/neon.cc:687
 msgid "Too many redirects"
-msgstr ""
+msgstr "Too many redirects"
 
-#: src/notify/event.cc:64
+#: src/notify/event.cc:97
 msgid "Stopped"
 msgstr "Stopped"
 
-#: src/notify/event.cc:64
+#: src/notify/event.cc:97
 msgid "Audacious is not playing."
 msgstr "Audacious is not playing."
 
-#: src/notify/notify.cc:42
+#: src/notify/notify.cc:39
 msgid "Desktop Notifications"
-msgstr ""
+msgstr "Desktop Notifications"
 
-#: src/notify/notify.cc:60
+#: src/notify/notify.cc:57
 msgid ""
 "Desktop Notifications Plugin for Audacious\n"
 "Copyright (C) 2010 Maximilian Bogner\n"
@@ -2440,65 +2805,126 @@
 "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 Licence as published by the Free "
+"Software Foundation, either version 3 of the Licence, 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 Licence for "
+"more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public Licence along with "
+"this program. If not, see <https://www.gnu.org/licences/>."
 
-#: src/notify/notify.cc:110
+#: src/notify/notify.cc:104
 msgid "Show playback controls"
-msgstr ""
+msgstr "Show playback controls"
 
-#: src/notify/notify.cc:112
+#: src/notify/notify.cc:106
 msgid "Always show notification"
-msgstr ""
+msgstr "Always show notification"
 
-#: src/notify/notify.cc:114
+#: src/notify/notify.cc:108
 msgid "Include album name in notification"
-msgstr ""
+msgstr "Include album name in notification"
+
+#: src/notify/notify.cc:110
+msgid "Custom notification duration:"
+msgstr "Custom notification duration:"
 
-#: src/notify/osd.cc:58
+#: src/notify/osd.cc:74
 msgid "Show"
-msgstr ""
+msgstr "Show"
 
-#: src/notify/osd.cc:66 src/qtui/main_window.cc:178
-#: src/qtui/main_window.cc:179 src/skins/menus.cc:88
-msgid "Pause"
+#: src/openmpt/mpt.cc:50
+msgid "OpenMPT (Module Player)"
+msgstr "OpenMPT (Module Player)"
+
+#: src/openmpt/mpt.cc:132
+msgid ""
+"Module player based on libopenmpt\n"
+"\n"
+"Written by: Chris Spiegel <cspiegel@gmail.com>"
 msgstr ""
+"Module player based on libopenmpt\n"
+"\n"
+"Written by: Chris Spiegel <cspiegel@gmail.com>"
 
-#: src/notify/osd.cc:73 src/qtui/main_window.cc:72 src/skins/menus.cc:91
-msgid "Next"
+#: src/openmpt/mpt.cc:151
+msgid "Stereo separation:"
+msgstr "Stereo separation:"
+
+#: src/openmpt/mpt.cc:153
+msgid "% (0=mono, 100=default, 200=full)"
+msgstr "% (0=mono, 100=default, 200=full)"
+
+#: src/openmpt/mpt.cc:157
+msgid "Interpolation:"
+msgstr "Interpolation:"
+
+#: src/openmpt/mptwrap.h:51 src/soxr/sox-resampler.cc:189 src/xsf/plugin.cc:437
+msgid "Linear"
+msgstr "Linear"
+
+#: src/openmpt/mptwrap.h:52
+msgid "Cubic"
+msgstr "Cubic"
+
+#: src/openmpt/mptwrap.h:53
+msgid "Windowed sinc"
+msgstr "Windowed sinc"
+
+#: src/opus/opus.cc:39
+msgid "Opus Decoder"
+msgstr "Opus Decoder"
+
+#: src/opus/opus.cc:336
+msgid ""
+"Opus Decoder Plugin for Audacious\n"
+"Copyright 2022 Thomas Lange"
 msgstr ""
+"Opus Decoder Plugin for Audacious\n"
+"Copyright 2022 Thomas Lange"
 
-#: src/oss4/oss.h:93
+#: src/oss4/oss.h:70
 msgid "OSS4 Output"
-msgstr ""
+msgstr "OSS4 Output"
 
-#: src/oss4/oss.h:95
+#: src/oss4/oss.h:72
 msgid "OSS3 Output"
-msgstr ""
+msgstr "OSS3 Output"
 
 #: src/oss4/plugin.cc:35
 msgid "Default device"
-msgstr ""
+msgstr "Default device"
 
-#: src/oss4/plugin.cc:77
+#: src/oss4/plugin.cc:78
 msgid "Audio device:"
 msgstr "Audio device:"
 
-#: src/oss4/plugin.cc:80
+#: src/oss4/plugin.cc:81
 msgid "Use alternate device:"
 msgstr "Use alternate device:"
 
-#: src/oss4/plugin.cc:84
+#: src/oss4/plugin.cc:85
 msgid "Save volume between sessions."
-msgstr ""
+msgstr "Save volume between sessions."
 
-#: src/oss4/plugin.cc:86
+#: src/oss4/plugin.cc:87
 msgid "Enable format conversions made by the OSS software."
 msgstr "Enable format conversions made by the OSS software."
 
-#: src/oss4/plugin.cc:88
+#: src/oss4/plugin.cc:89
 msgid "Enable exclusive mode to prevent virtual mixing."
-msgstr ""
+msgstr "Enable exclusive mode to prevent virtual mixing."
 
-#: src/oss4/plugin.cc:100
+#: src/oss4/plugin.cc:101
 msgid ""
 "OSS4 Output Plugin for Audacious\n"
 "Copyright 2010-2012 Michał Lipski\n"
@@ -2506,60 +2932,116 @@
 "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/playlist-manager/playlist-manager.cc:37
-msgid "Playlist Manager"
-msgstr ""
+#: src/pipewire/pipewire.cc:44
+msgid "PipeWire Output"
+msgstr "PipeWire Output"
 
-#: src/playlist-manager/playlist-manager.cc:226
-msgid "Entries"
+#: src/pipewire/pipewire.cc:118
+msgid ""
+"PipeWire Output Plugin for Audacious\n"
+"Copyright 2022 Thomas Lange\n"
+"\n"
+"Based on the PipeWire Output Plugin for Qmmp\n"
+"Copyright 2021 Ilya Kotov"
 msgstr ""
+"PipeWire Output Plugin for Audacious\n"
+"Copyright 2022 Thomas Lange\n"
+"\n"
+"Based on the PipeWire Output Plugin for Qmmp\n"
+"Copyright 2021 Ilya Kotov"
+
+#: src/pipewire/pipewire.cc:408 src/skins/menus.cc:88 src/skins-qt/menus.cc:79
+msgid "Playback"
+msgstr "Playback"
+
+#: src/playlist-manager/playlist-manager.cc:38
+#: src/playlist-manager-qt/playlist-manager-qt.cc:42
+msgid "Playlist Manager"
+msgstr "Playlist Manager"
 
-#: src/playlist-manager/playlist-manager.cc:245
+#: src/playlist-manager/playlist-manager.cc:221
+#: src/playlist-manager-qt/playlist-manager-qt.cc:356
 msgid "_Remove"
-msgstr ""
+msgstr "_Remove"
 
-#: src/playlist-manager/playlist-manager.cc:246
+#: src/playlist-manager/playlist-manager.cc:222
+#: src/playlist-manager-qt/playlist-manager-qt.cc:351
 msgid "Ren_ame"
-msgstr ""
+msgstr "Ren_ame"
 
 #: src/pls/pls.cc:35
 msgid "PLS Playlists"
-msgstr ""
+msgstr "PLS Playlists"
 
-#: src/psf/plugin.cc:45
+#: src/psf/plugin.cc:53
 msgid "OpenPSF PSF1/PSF2 Decoder"
-msgstr ""
+msgstr "OpenPSF PSF1/PSF2 Decoder"
+
+#: src/psf/plugin.cc:270
+msgid "OpenPSF Configuration"
+msgstr "OpenPSF Configuration"
+
+#: src/psf/plugin.cc:271 src/xsf/plugin.cc:444
+msgid "Ignore length from file"
+msgstr "Ignore length from file"
 
-#: src/pulse_audio/pulse_audio.cc:38
+#: src/pulse/pulse_audio.cc:42
 msgid "PulseAudio Output"
-msgstr ""
+msgstr "PulseAudio Output"
+
+#: src/pulse/pulse_audio.cc:84
+msgid "Context name:"
+msgstr "Context name:"
 
-#: src/pulse_audio/pulse_audio.cc:611
+#: src/pulse/pulse_audio.cc:86
+msgid "Stream name:"
+msgstr "Stream name:"
+
+#: src/pulse/pulse_audio.cc:596
 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."
+"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 ""
+"Audacious PulseAudio Output Plugin\n"
+"\n"
+"This program is free software; you can redistribute it and/or modify it "
+"under the terms of the GNU General Public Licence as published by the Free "
+"Software Foundation; either version 2 of the Licence, 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 Licence for "
+"more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public Licence along with "
+"this program; if not, write to the Free Software Foundation, Inc., 51 "
+"Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 
-#: src/qtaudio/qtaudio.cc:49
+#: src/qtaudio/qtaudio.cc:53
 msgid "QtMultimedia Output"
-msgstr ""
+msgstr "QtMultimedia Output"
 
-#: src/qtaudio/qtaudio.cc:77
+#: src/qtaudio/qtaudio.cc:84
 msgid ""
 "QtMultimedia Audio Output Plugin for Audacious\n"
 "Copyright 2014 William Pitcock\n"
@@ -2567,1106 +3049,1128 @@
 "Based on SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
 msgstr ""
+"QtMultimedia Audio Output Plugin for Audacious\n"
+"Copyright 2014 William Pitcock\n"
+"\n"
+"Based on SDL Output Plugin for Audacious\n"
+"Copyright 2010 John Lindgren"
 
-#: src/qtui/dialog_windows.cc:31
-msgid "Working ..."
+#: src/qtglspectrum/gl-spectrum.cc:41
+msgid ""
+"OpenGL Spectrum Analyzer for Audacious\n"
+"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
+"Copyright 2014, 2020 Ariadne Conill\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 Analyser for Audacious\n"
+"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
+"Copyright 2014, 2020 Ariadne Conill\n"
+"\n"
+"Based on the XMMS plugin:\n"
+"Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson, and "
+"4Front Technologies\n"
+"\n"
+"Licence: GPLv2+"
 
-#: src/qtui/filter_input.cc:44 src/skins/ui_playlist.cc:221
-msgid "Search"
+#: src/qthotkey/gui.cc:177
+msgid "Press a key combination inside a text field."
+msgstr "Press a key combination inside a text field."
+
+#: src/qthotkey/plugin.cc:105
+msgid ""
+"Global Hotkey Plugin\n"
+"Control the player with global key combinations or multimedia keys.\n"
+"\n"
+"Copyright (C) 2020 i.Dark_Templar <darktemplar@dark-templar-archives.net>\n"
+"Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n"
+"\n"
+"Contributors 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 Plugin\n"
+"Control the player with global key combinations or multimedia keys.\n"
+"\n"
+"Copyright (C) 2020 i.Dark_Templar <darktemplar@dark-templar-archives.net>\n"
+"Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n"
+"\n"
+"Contributors 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/qtui/main_window_actions.cc:94
+#: src/qtui/menus.cc:109
 msgid "_Open Folder ..."
-msgstr ""
+msgstr "_Open Folder ..."
 
-#: src/qtui/main_window_actions.cc:96
+#: src/qtui/menus.cc:115
 msgid "_Add Folder ..."
-msgstr ""
+msgstr "_Add Folder ..."
 
-#: src/qtui/main_window_actions.cc:101
+#: src/qtui/menus.cc:128
 msgid "_Log Inspector ..."
-msgstr ""
+msgstr "_Log Inspector ..."
 
-#: src/qtui/main_window.cc:64
-msgid "Open Files"
-msgstr ""
+#: src/qtui/menus.cc:220
+msgid "_Find ..."
+msgstr "_Find ..."
 
-#: src/qtui/main_window.cc:66
-msgid "Add Files"
-msgstr ""
+#: src/qtui/menus.cc:256 src/skins/menus.cc:80 src/skins-qt/menus.cc:70
+msgid "Audio Settings ..."
+msgstr "Audio Settings ..."
 
-#: src/qtui/main_window.cc:71 src/skins/menus.cc:90
-msgid "Previous"
-msgstr ""
+#: src/qtui/playlist_model.cc:188
+msgid "Q#"
+msgstr "Q#"
 
-#: src/qtui/main_window.cc:77 src/skins/menus.cc:82
-msgid "Repeat"
-msgstr "Repeat"
+#: src/qtui/playlist_model.cc:190
+msgid "T#"
+msgstr "T#"
 
-#: src/qtui/main_window.cc:79 src/skins/menus.cc:83
-msgid "Shuffle"
-msgstr "Shuffle"
+#: src/qtui/playlist_model.cc:192
+msgid "C#"
+msgstr "C#"
 
-#: src/qtui/qtui.cc:42
+#: src/qtui/playlist_model.cc:194
+msgid "D#"
+msgstr "D#"
+
+#: src/qtui/qtui.cc:40
 msgid "Qt Interface"
-msgstr ""
+msgstr "Qt Interface"
+
+#: src/qtui/search_bar.cc:46
+msgid "Search playlist"
+msgstr "Search playlist"
+
+#: src/qtui/settings.cc:79
+msgid "Use bold font for column headers"
+msgstr "Use bold font for column headers"
 
 #: src/resample/resample.cc:43
 msgid "Sample Rate Converter"
-msgstr ""
+msgstr "Sample Rate Converter"
 
 #: src/resample/resample.cc:183
 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.cc:187
 msgid "Skip/repeat samples"
-msgstr ""
+msgstr "Skip/repeat samples"
 
 #: src/resample/resample.cc:188
 msgid "Linear interpolation"
-msgstr ""
+msgstr "Linear interpolation"
 
 #: src/resample/resample.cc:189
 msgid "Fast sinc interpolation"
-msgstr ""
+msgstr "Fast sinc interpolation"
 
 #: src/resample/resample.cc:190
 msgid "Medium sinc interpolation"
-msgstr ""
+msgstr "Medium sinc interpolation"
 
 #: src/resample/resample.cc:191
 msgid "Best sinc interpolation"
-msgstr ""
+msgstr "Best sinc interpolation"
 
 #: src/resample/resample.cc:195
 msgid "Conversion"
-msgstr ""
+msgstr "Conversion"
 
 #: src/resample/resample.cc:196
 msgid "Method:"
 msgstr "Method:"
 
-#: src/resample/resample.cc:199 src/sox-resampler/sox-resampler.cc:161
+#: src/resample/resample.cc:199 src/soxr/sox-resampler.cc:203
 msgid "Rate:"
-msgstr ""
+msgstr "Rate:"
 
 #: src/resample/resample.cc:202
 msgid "Rate Mappings"
-msgstr ""
+msgstr "Rate Mappings"
 
 #: src/resample/resample.cc:203
 msgid "Use rate mappings"
-msgstr ""
+msgstr "Use rate mappings"
 
 #: src/resample/resample.cc:205
 msgid "8 kHz:"
-msgstr ""
+msgstr "8 kHz:"
 
 #: src/resample/resample.cc:209
 msgid "16 kHz:"
-msgstr ""
+msgstr "16 kHz:"
 
 #: src/resample/resample.cc:213
 msgid "22.05 kHz:"
-msgstr ""
+msgstr "22.05 kHz:"
 
 #: src/resample/resample.cc:217
 msgid "32.0 kHz:"
-msgstr ""
+msgstr "32.0 kHz:"
 
 #: src/resample/resample.cc:221
 msgid "44.1 kHz:"
-msgstr ""
+msgstr "44.1 kHz:"
 
 #: src/resample/resample.cc:225
 msgid "48 kHz:"
-msgstr ""
+msgstr "48 kHz:"
 
 #: src/resample/resample.cc:229
 msgid "88.2 kHz:"
-msgstr ""
+msgstr "88.2 kHz:"
 
 #: src/resample/resample.cc:233
 msgid "96 kHz:"
-msgstr ""
+msgstr "96 kHz:"
 
 #: src/resample/resample.cc:237
 msgid "176.4 kHz:"
-msgstr ""
+msgstr "176.4 kHz:"
 
 #: src/resample/resample.cc:241
 msgid "192 kHz:"
-msgstr ""
-
-#: src/scrobbler2/config_window.cc:41
-#, c-format
-msgid "OK. Scrobbling for user: %s"
-msgstr ""
+msgstr "192 kHz:"
 
-#: src/scrobbler2/config_window.cc:54
-msgid "Permission Denied"
-msgstr ""
+#: src/scrobbler2/config_window.cc:29
+msgid "Checking Last.fm access ..."
+msgstr "Checking Last.fm access ..."
 
-#: src/scrobbler2/config_window.cc:56
-msgid "Access the following link to allow Audacious to scrobble your plays:"
-msgstr ""
-
-#: src/scrobbler2/config_window.cc:66
-msgid "Keep this window open and click 'Check Permission' again.\n"
-msgstr ""
-
-#: src/scrobbler2/config_window.cc:69 src/scrobbler2/config_window.cc:80
+#: src/scrobbler2/config_window.cc:35
 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."
+"Your scrobbles are being saved on your computer temporarily. They will be "
+"submitted as soon as Audacious is allowed access."
 msgstr ""
+"Your scrobbles are being saved on your computer temporarily. They will be "
+"submitted as soon as Audacious is allowed access."
 
-#: src/scrobbler2/config_window.cc:77
-msgid "Network Problem."
-msgstr ""
+#: src/scrobbler2/config_window.cc:41
+#, c-format
+msgid "Permission granted. Scrobbling for user %s."
+msgstr "Permission granted. Scrobbling for user %s."
 
-#: src/scrobbler2/config_window.cc:78
-msgid "There was a problem contacting Last.fm. Please try again later."
+#: src/scrobbler2/config_window.cc:44
+msgid ""
+"Permission denied. Open the following URL in a browser, allow Audacious "
+"access to your account, and then click 'Check Permission' again:"
 msgstr ""
+"Permission denied. Open the following URL in a browser, allow Audacious "
+"access to your account, and then click 'Check Permission' again:"
 
-#: src/scrobbler2/config_window.cc:110
-msgid "Checking..."
-msgstr ""
+#: src/scrobbler2/config_window.cc:53
+msgid "There was a problem contacting Last.fm."
+msgstr "There was a problem contacting Last.fm."
 
-#: src/scrobbler2/config_window.cc:176
-msgid "C_heck Permission"
-msgstr ""
+#: src/scrobbler2/config_window.cc:92
+msgid "Check Permission"
+msgstr "Check Permission"
 
-#: src/scrobbler2/config_window.cc:177
-msgid "_Revoke Permission"
-msgstr ""
+#: src/scrobbler2/config_window.cc:93
+msgid "Revoke Permission"
+msgstr "Revoke Permission"
 
-#: src/scrobbler2/config_window.cc:220
-msgid ""
-"You need to allow Audacious to scrobble tracks to your Last.fm account.\n"
+#: src/scrobbler2/config_window.cc:97
+msgid "You need to allow Audacious to scrobble tracks to your Last.fm account."
 msgstr ""
+"You need to allow Audacious to scrobble tracks to your Last.fm account."
 
 #: src/scrobbler2/scrobbler.cc:29
 msgid "Scrobbler 2.0"
-msgstr ""
+msgstr "Scrobbler 2.0"
 
-#: src/scrobbler2/scrobbler.cc:224
+#: src/scrobbler2/scrobbler.cc:200
 msgid ""
 "The Scrobbler plugin could not be started.\n"
 "There might be a problem with your installation."
 msgstr ""
+"The Scrobbler plugin could not be started.\n"
+"There might be a problem with your installation."
 
-#: src/scrobbler2/scrobbler.cc:289
+#: src/scrobbler2/scrobbler.cc:245
 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_communication.cc:642
-msgid ""
-"Audacious is now using an improved version of the Last.fm Scrobbler.\n"
-"Please check the Preferences for the Scrobbler plugin."
+"project."
 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."
 
-#: src/sdlout/sdlout.cc:48
+#: src/sdlout/sdlout.cc:43
 msgid "SDL Output"
-msgstr ""
+msgstr "SDL Output"
 
-#: src/sdlout/sdlout.cc:77
+#: src/sdlout/sdlout.cc:72
 msgid ""
 "SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
 msgstr ""
+"SDL Output Plugin for Audacious\n"
+"Copyright 2010 John Lindgren"
 
-#: src/search-tool/search-tool.cc:116 src/search-tool/search-tool.cc:124
+#: src/search-tool/library.cc:35 src/search-tool/library.cc:46
+#: src/search-tool-qt/library.cc:35 src/search-tool-qt/library.cc:46
 msgid "Library"
-msgstr ""
-
-#: src/search-tool/search-tool.cc:394
-#, c-format
-msgid "%d result"
-msgid_plural "%d results"
-msgstr0 ""
-msgstr1 ""
-
-#: src/search-tool/search-tool.cc:400
-#, c-format
-msgid "(%d hidden)"
-msgid_plural "(%d hidden)"
-msgstr0 ""
-msgstr1 ""
+msgstr "Library"
 
-#: src/search-tool/search-tool.cc:594
+#: src/search-tool-qt/search-model.cc:44 src/search-tool/search-tool.cc:287
 #, c-format
 msgid "%d song"
 msgid_plural "%d songs"
-msgstr0 ""
-msgstr1 ""
+msgstr0 "%d song"
+msgstr1 "%d songs"
 
-#: src/search-tool/search-tool.cc:601
+#: src/search-tool-qt/search-model.cc:53 src/search-tool/search-tool.cc:294
 msgid "of this genre"
-msgstr ""
+msgstr "of this genre"
 
-#: src/search-tool/search-tool.cc:607
+#: src/search-tool-qt/search-model.h:47 src/search-tool/search-model.h:45
 msgid "on"
-msgstr ""
+msgstr "on"
 
-#: src/search-tool/search-tool.cc:607
+#: src/search-tool-qt/search-model.h:47 src/search-tool/search-model.h:45
 msgid "by"
-msgstr ""
+msgstr "by"
 
-#: src/search-tool/search-tool.cc:643
-msgid "_Create Playlist"
-msgstr ""
+#: src/search-tool-qt/search-tool-qt.cc:165 src/search-tool/search-tool.cc:74
+msgid "Number of results to show:"
+msgstr "Number of results to show:"
 
-#: src/search-tool/search-tool.cc:645
-msgid "_Add to Playlist"
-msgstr ""
+#: src/search-tool-qt/search-tool-qt.cc:168 src/search-tool/search-tool.cc:77
+msgid "Rescan library at startup"
+msgstr "Rescan library at startup"
 
-#: src/search-tool/search-tool.cc:684
-msgid "Search library"
-msgstr ""
+#: src/search-tool-qt/search-tool-qt.cc:170
+msgid "Monitor library for changes"
+msgstr "Monitor library for changes"
 
-#: src/search-tool/search-tool.cc:688
+#: src/search-tool-qt/search-tool-qt.cc:193 src/search-tool/search-tool.cc:450
 msgid ""
 "To import your music library into Audacious, choose a folder and then click "
 "the \"refresh\" icon."
 msgstr ""
+"To import your music library into Audacious, choose a folder and then click "
+"the \"refresh\" icon."
 
-#: src/search-tool/search-tool.cc:696
+#: src/search-tool-qt/search-tool-qt.cc:195 src/search-tool/search-tool.cc:459
 msgid "Please wait ..."
-msgstr ""
+msgstr "Please wait ..."
 
-#: src/search-tool/search-tool.cc:723
+#: src/search-tool-qt/search-tool-qt.cc:197 src/search-tool/search-tool.cc:487
 msgid "Choose Folder"
-msgstr ""
+msgstr "Choose Folder"
+
+#: src/search-tool-qt/search-tool-qt.cc:201 src/search-tool/search-tool.cc:445
+msgid "Search library"
+msgstr "Search library"
+
+#: src/search-tool-qt/search-tool-qt.cc:327 src/search-tool/search-tool.cc:156
+#, c-format
+msgid "%d of %d result shown"
+msgid_plural "%d of %d results shown"
+msgstr0 "%d of %d result shown"
+msgstr1 "%d of %d results shown"
+
+#: src/search-tool-qt/search-tool-qt.cc:331 src/search-tool/search-tool.cc:160
+#, c-format
+msgid "%d result"
+msgid_plural "%d results"
+msgstr0 "%d result"
+msgstr1 "%d results"
+
+#: src/search-tool-qt/search-tool-qt.cc:501 src/search-tool/search-tool.cc:341
+msgid "_Create Playlist"
+msgstr "_Create Playlist"
+
+#: src/search-tool-qt/search-tool-qt.cc:503 src/search-tool/search-tool.cc:343
+msgid "_Add to Playlist"
+msgstr "_Add to Playlist"
 
 #: src/sid/xmms-sid.cc:43
 msgid "SID Player"
-msgstr ""
-
-#: src/sid/xs_config.cc:61
-msgid "Output"
-msgstr ""
+msgstr "SID Player"
 
 #: src/sid/xs_config.cc:62
 msgid "Channels:"
-msgstr ""
+msgstr "Channels:"
 
 #: src/sid/xs_config.cc:68
 msgid "Emulation"
-msgstr ""
+msgstr "Emulation"
 
 #: src/sid/xs_config.cc:69
 msgid "Emulate MOS 8580 (default: MOS 6581)"
-msgstr ""
+msgstr "Emulate MOS 8580 (default: MOS 6581)"
 
 #: src/sid/xs_config.cc:71
 msgid "Do not automatically select chip model"
-msgstr ""
+msgstr "Do not automatically select chip model"
 
 #: src/sid/xs_config.cc:73
 msgid "Emulate filter"
-msgstr ""
+msgstr "Emulate filter"
 
 #: src/sid/xs_config.cc:75
 msgid "Clock speed:"
-msgstr ""
+msgstr "Clock speed:"
 
 #: src/sid/xs_config.cc:78
 msgid "Do not automatically select clock speed"
-msgstr ""
+msgstr "Do not automatically select clock speed"
 
 #: src/sid/xs_config.cc:80
 msgid "Playback time"
-msgstr ""
+msgstr "Playback time"
 
 #: src/sid/xs_config.cc:81
 msgid "Set maximum playback time:"
-msgstr ""
+msgstr "Set maximum playback time:"
 
 #: src/sid/xs_config.cc:87
 msgid "Use only when song length is unknown"
-msgstr ""
+msgstr "Use only when song length is unknown"
 
 #: src/sid/xs_config.cc:90
 msgid "Set minimum playback time:"
-msgstr ""
+msgstr "Set minimum playback time:"
 
 #: src/sid/xs_config.cc:96
 msgid "Subtunes"
-msgstr ""
+msgstr "Subtunes"
 
 #: src/sid/xs_config.cc:97
 msgid "Enable subtunes"
-msgstr ""
+msgstr "Enable subtunes"
 
 #: src/sid/xs_config.cc:99
 msgid "Ignore subtunes shorter than:"
-msgstr ""
+msgstr "Ignore subtunes shorter than:"
 
 #: src/sid/xs_config.cc:105
 msgid "Note"
-msgstr ""
+msgstr "Note"
 
 #: src/silence-removal/silence-removal.cc:39
 msgid "Silence Removal"
-msgstr ""
+msgstr "Silence Removal"
 
 #: src/silence-removal/silence-removal.cc:58
 msgid ""
 "Silence Removal Plugin for Audacious\n"
 "Copyright 2014 John Lindgren"
 msgstr ""
+"Silence Removal Plugin for Audacious\n"
+"Copyright 2014 John Lindgren"
 
 #: src/silence-removal/silence-removal.cc:67
 msgid "Silence Removal"
-msgstr ""
+msgstr "Silence Removal"
 
 #: src/silence-removal/silence-removal.cc:68
 msgid "Threshold:"
-msgstr ""
+msgstr "Threshold:"
 
-#: src/silence-removal/silence-removal.cc:70
-msgid "dB"
-msgstr ""
+#: src/skins/actions.cc:45 src/skins-qt/actions.cc:43
+msgid "Repeat points cleared."
+msgstr "Repeat points cleared."
 
-#: src/skins/menus.cc:64
-msgid "Open Files ..."
-msgstr ""
+#: src/skins/actions.cc:60 src/skins-qt/actions.cc:58
+msgid "Repeat point A set."
+msgstr "Repeat point A set."
 
-#: src/skins/menus.cc:65
-msgid "Open URL ..."
-msgstr ""
+#: src/skins/actions.cc:65 src/skins-qt/actions.cc:63
+msgid "Repeat point B set."
+msgstr "Repeat point B set."
 
-#: src/skins/menus.cc:66
-msgid "Search Library"
-msgstr ""
+#: src/skins/equalizer.cc:223 src/skins-qt/equalizer.cc:223
+msgid "Preamp"
+msgstr "Preamp"
 
-#: src/skins/menus.cc:68
-msgid "Playback"
-msgstr "Playback"
+#: src/skins/equalizer.cc:227 src/skins-qt/equalizer.cc:227
+msgid "31 Hz"
+msgstr "31 Hz"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "63 Hz"
+msgstr "63 Hz"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "125 Hz"
+msgstr "125 Hz"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "250 Hz"
+msgstr "250 Hz"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "500 Hz"
+msgstr "500 Hz"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "1 kHz"
+msgstr "1 kHz"
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "2 kHz"
+msgstr "2 kHz"
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "4 kHz"
+msgstr "4 kHz"
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "8 kHz"
+msgstr "8 kHz"
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "16 kHz"
+msgstr "16 kHz"
+
+#: src/skins/equalizer.cc:270 src/skins-qt/equalizer.cc:270
+msgid "Audacious Equalizer"
+msgstr "Audacious Equaliser"
+
+#: src/skins/main.cc:459 src/skins-qt/main.cc:442
+msgid "Recording on"
+msgstr "Recording on"
+
+#: src/skins/main.cc:461 src/skins-qt/main.cc:444
+msgid "Recording off"
+msgstr "Recording off"
+
+#: src/skins/main.cc:754 src/skins-qt/main.cc:701
+#, c-format
+msgid "Seek to %d:%-2.2d / %d:%-2.2d"
+msgstr "Seek to %d:%-2.2d / %d:%-2.2d"
+
+#: src/skins/main.cc:771 src/skins-qt/main.cc:718
+#, c-format
+msgid "Volume: %d%%"
+msgstr "Volume: %d%%"
+
+#: src/skins/main.cc:784 src/skins-qt/main.cc:731
+#, c-format
+msgid "Balance: %d%% left"
+msgstr "Balance: %d%% left"
+
+#: src/skins/main.cc:786 src/skins-qt/main.cc:733
+msgid "Balance: center"
+msgstr "Balance: centre"
+
+#: src/skins/main.cc:788 src/skins-qt/main.cc:735
+#, c-format
+msgid "Balance: %d%% right"
+msgstr "Balance: %d%% right"
+
+#: src/skins/main.cc:880 src/skins-qt/main.cc:827
+msgid "Options Menu"
+msgstr "Options Menu"
+
+#: src/skins/main.cc:884 src/skins-qt/main.cc:831
+msgid "Disable 'Always On Top'"
+msgstr "Disable 'Always On Top'"
+
+#: src/skins/main.cc:886 src/skins-qt/main.cc:833
+msgid "Enable 'Always On Top'"
+msgstr "Enable 'Always On Top'"
+
+#: src/skins/main.cc:889 src/skins-qt/main.cc:836
+msgid "File Info Box"
+msgstr "File Info Box"
+
+#: src/skins/main.cc:892 src/skins/menus.cc:149 src/skins-qt/main.cc:839
+#: src/skins-qt/menus.cc:142
+msgid "Double Size"
+msgstr "Double Size"
+
+#: src/skins/main.cc:895 src/skins-qt/main.cc:842
+msgid "Visualizations"
+msgstr "Visualisations"
 
-#: src/skins/menus.cc:69
+#: src/skins/menus.cc:74 src/skins-qt/menus.cc:64
+msgid "Volume Up"
+msgstr "Volume Up"
+
+#: src/skins/menus.cc:75 src/skins-qt/menus.cc:65
+msgid "Volume Down"
+msgstr "Volume Down"
+
+#: src/skins/menus.cc:77 src/skins-qt/menus.cc:67
+msgid "Effects ..."
+msgstr "Effects ..."
+
+#: src/skins/menus.cc:84 src/skins-qt/menus.cc:74
+msgid "Open Files ..."
+msgstr "Open Files ..."
+
+#: src/skins/menus.cc:85 src/skins-qt/menus.cc:76
+msgid "Open URL ..."
+msgstr "Open URL ..."
+
+#: src/skins/menus.cc:89 src/skins-qt/menus.cc:80
 msgid "Playlist"
-msgstr ""
+msgstr "Playlist"
+
+#: src/skins/menus.cc:90 src/skins-qt/menus.cc:81
+msgid "Output"
+msgstr "Output"
 
-#: src/skins/menus.cc:70
+#: src/skins/menus.cc:91 src/skins-qt/menus.cc:82
 msgid "View"
-msgstr ""
+msgstr "View"
 
-#: src/skins/menus.cc:72 src/skins/menus.cc:136 src/skins/menus.cc:149
-#: src/skins/menus.cc:214
+#: src/skins/menus.cc:93 src/skins/menus.cc:161 src/skins/menus.cc:174
+#: src/skins/menus.cc:245 src/skins-qt/menus.cc:84 src/skins-qt/menus.cc:156
+#: src/skins-qt/menus.cc:170 src/skins-qt/menus.cc:241
 msgid "Services"
-msgstr ""
+msgstr "Services"
 
-#: src/skins/menus.cc:74
+#: src/skins/menus.cc:95 src/skins-qt/menus.cc:86
 msgid "About ..."
-msgstr ""
+msgstr "About ..."
 
-#: src/skins/menus.cc:75
+#: src/skins/menus.cc:96 src/skins-qt/menus.cc:87
 msgid "Settings ..."
-msgstr ""
+msgstr "Settings ..."
 
-#: src/skins/menus.cc:76
+#: src/skins/menus.cc:97 src/skins-qt/menus.cc:88
 msgid "Quit"
-msgstr ""
+msgstr "Quit"
 
-#: src/skins/menus.cc:80 src/skins/menus.cc:206
+#: src/skins/menus.cc:101 src/skins/menus.cc:235 src/skins-qt/menus.cc:92
+#: src/skins-qt/menus.cc:231
 msgid "Song Info ..."
-msgstr ""
+msgstr "Song Info ..."
 
-#: src/skins/menus.cc:84
+#: src/skins/menus.cc:105 src/skins-qt/menus.cc:96
+msgid "Shuffle by Album"
+msgstr "Shuffle by Album"
+
+#: src/skins/menus.cc:106 src/skins-qt/menus.cc:97
 msgid "No Playlist Advance"
 msgstr "No Playlist Advance"
 
-#: src/skins/menus.cc:85
-msgid "Stop After This Song"
-msgstr ""
-
-#: src/skins/menus.cc:93
+#: src/skins/menus.cc:117 src/skins-qt/menus.cc:108
 msgid "Set A-B Repeat"
-msgstr ""
+msgstr "Set A-B Repeat"
 
-#: src/skins/menus.cc:94
+#: src/skins/menus.cc:118 src/skins-qt/menus.cc:109
 msgid "Clear A-B Repeat"
-msgstr ""
+msgstr "Clear A-B Repeat"
 
-#: src/skins/menus.cc:96
+#: src/skins/menus.cc:120 src/skins-qt/menus.cc:111
 msgid "Jump to Song ..."
-msgstr ""
+msgstr "Jump to Song ..."
 
-#: src/skins/menus.cc:97
+#: src/skins/menus.cc:121 src/skins-qt/menus.cc:113
 msgid "Jump to Time ..."
-msgstr ""
+msgstr "Jump to Time ..."
 
-#: src/skins/menus.cc:101
+#: src/skins/menus.cc:125 src/skins-qt/menus.cc:118
 msgid "Play/Resume"
-msgstr ""
+msgstr "Play/Resume"
 
-#: src/skins/menus.cc:103
+#: src/skins/menus.cc:127 src/skins-qt/menus.cc:120
 msgid "New Playlist"
-msgstr ""
+msgstr "New Playlist"
 
-#: src/skins/menus.cc:104
+#: src/skins/menus.cc:128 src/skins-qt/menus.cc:121
 msgid "Rename Playlist ..."
-msgstr ""
+msgstr "Rename Playlist ..."
 
-#: src/skins/menus.cc:105
+#: src/skins/menus.cc:129 src/skins-qt/menus.cc:122
 msgid "Remove Playlist"
-msgstr ""
+msgstr "Remove Playlist"
 
-#: src/skins/menus.cc:107
+#: src/skins/menus.cc:131 src/skins-qt/menus.cc:124
 msgid "Previous Playlist"
-msgstr ""
+msgstr "Previous Playlist"
 
-#: src/skins/menus.cc:108
+#: src/skins/menus.cc:132 src/skins-qt/menus.cc:125
 msgid "Next Playlist"
-msgstr ""
+msgstr "Next Playlist"
 
-#: src/skins/menus.cc:110
+#: src/skins/menus.cc:134 src/skins-qt/menus.cc:127
 msgid "Import Playlist ..."
-msgstr ""
+msgstr "Import Playlist ..."
 
-#: src/skins/menus.cc:111
+#: src/skins/menus.cc:135 src/skins-qt/menus.cc:128
 msgid "Export Playlist ..."
-msgstr ""
+msgstr "Export Playlist ..."
 
-#: src/skins/menus.cc:113
+#: src/skins/menus.cc:137 src/skins-qt/menus.cc:130
 msgid "Playlist Manager ..."
-msgstr ""
+msgstr "Playlist Manager ..."
 
-#: src/skins/menus.cc:114
+#: src/skins/menus.cc:138 src/skins-qt/menus.cc:131
 msgid "Queue Manager ..."
-msgstr ""
+msgstr "Queue Manager ..."
 
-#: src/skins/menus.cc:116
+#: src/skins/menus.cc:140 src/skins-qt/menus.cc:133
 msgid "Refresh Playlist"
-msgstr ""
+msgstr "Refresh Playlist"
 
-#: src/skins/menus.cc:120
+#: src/skins/menus.cc:144 src/skins-qt/menus.cc:137
 msgid "Show Playlist Editor"
 msgstr "Show Playlist Editor"
 
-#: src/skins/menus.cc:121
+#: src/skins/menus.cc:145 src/skins-qt/menus.cc:138
 msgid "Show Equalizer"
 msgstr "Show Equaliser"
 
-#: src/skins/menus.cc:123
+#: src/skins/menus.cc:147 src/skins-qt/menus.cc:140
 msgid "Show Remaining Time"
-msgstr ""
+msgstr "Show Remaining Time"
 
-#: src/skins/menus.cc:125
+#: src/skins/menus.cc:150 src/skins-qt/menus.cc:143
 msgid "Always on Top"
-msgstr ""
+msgstr "Always on Top"
 
-#: src/skins/menus.cc:126
+#: src/skins/menus.cc:151 src/skins-qt/menus.cc:145
 msgid "On All Workspaces"
-msgstr ""
+msgstr "On All Workspaces"
 
-#: src/skins/menus.cc:128
+#: src/skins/menus.cc:153 src/skins-qt/menus.cc:148
 msgid "Roll Up Player"
-msgstr ""
+msgstr "Roll Up Player"
 
-#: src/skins/menus.cc:129
+#: src/skins/menus.cc:154 src/skins-qt/menus.cc:149
 msgid "Roll Up Playlist Editor"
-msgstr ""
+msgstr "Roll Up Playlist Editor"
 
-#: src/skins/menus.cc:130
+#: src/skins/menus.cc:155 src/skins-qt/menus.cc:150
 msgid "Roll Up Equalizer"
-msgstr ""
-
-#: src/skins/menus.cc:132 src/skins/ui_main.cc:854
-msgid "Double Size"
-msgstr ""
+msgstr "Roll Up Equaliser"
 
-#: src/skins/menus.cc:138
+#: src/skins/menus.cc:163 src/skins-qt/menus.cc:158
 msgid "Add URL ..."
-msgstr ""
+msgstr "Add URL ..."
 
-#: src/skins/menus.cc:139
+#: src/skins/menus.cc:164 src/skins-qt/menus.cc:160
 msgid "Add Files ..."
-msgstr ""
+msgstr "Add Files ..."
 
-#: src/skins/menus.cc:143 src/skins/menus.cc:171 src/skins/menus.cc:185
+#: src/skins/menus.cc:168 src/skins/menus.cc:196 src/skins/menus.cc:212
+#: src/skins-qt/menus.cc:164 src/skins-qt/menus.cc:192
+#: src/skins-qt/menus.cc:208
 msgid "By Title"
-msgstr ""
+msgstr "By Title"
 
-#: src/skins/menus.cc:144 src/skins/menus.cc:178 src/skins/menus.cc:192
+#: src/skins/menus.cc:169 src/skins/menus.cc:203 src/skins/menus.cc:219
+#: src/skins-qt/menus.cc:165 src/skins-qt/menus.cc:199
+#: src/skins-qt/menus.cc:215
 msgid "By File Name"
-msgstr ""
+msgstr "By File Name"
 
-#: src/skins/menus.cc:145 src/skins/menus.cc:179 src/skins/menus.cc:193
+#: src/skins/menus.cc:170 src/skins/menus.cc:204 src/skins/menus.cc:220
+#: src/skins-qt/menus.cc:166 src/skins-qt/menus.cc:200
+#: src/skins-qt/menus.cc:216
 msgid "By File Path"
-msgstr ""
+msgstr "By File Path"
 
-#: src/skins/menus.cc:151
+#: src/skins/menus.cc:176 src/skins-qt/menus.cc:172
 msgid "Remove All"
-msgstr ""
+msgstr "Remove All"
 
-#: src/skins/menus.cc:152
+#: src/skins/menus.cc:177 src/skins-qt/menus.cc:173
 msgid "Clear Queue"
-msgstr ""
+msgstr "Clear Queue"
 
-#: src/skins/menus.cc:154
+#: src/skins/menus.cc:179 src/skins-qt/menus.cc:175
 msgid "Remove Unavailable Files"
-msgstr ""
+msgstr "Remove Unavailable Files"
 
-#: src/skins/menus.cc:155
+#: src/skins/menus.cc:180 src/skins-qt/menus.cc:176
 msgid "Remove Duplicates"
-msgstr ""
+msgstr "Remove Duplicates"
 
-#: src/skins/menus.cc:157
+#: src/skins/menus.cc:182 src/skins-qt/menus.cc:178
 msgid "Remove Unselected"
-msgstr ""
+msgstr "Remove Unselected"
 
-#: src/skins/menus.cc:158
+#: src/skins/menus.cc:183 src/skins-qt/menus.cc:179
 msgid "Remove Selected"
-msgstr ""
+msgstr "Remove Selected"
 
-#: src/skins/menus.cc:162
+#: src/skins/menus.cc:187 src/skins-qt/menus.cc:183
 msgid "Search and Select"
-msgstr ""
+msgstr "Search and Select"
 
-#: src/skins/menus.cc:164
+#: src/skins/menus.cc:189 src/skins-qt/menus.cc:185
 msgid "Invert Selection"
-msgstr ""
+msgstr "Invert Selection"
 
-#: src/skins/menus.cc:165
+#: src/skins/menus.cc:190 src/skins-qt/menus.cc:186
 msgid "Select None"
-msgstr ""
+msgstr "Select None"
 
-#: src/skins/menus.cc:166
+#: src/skins/menus.cc:191 src/skins-qt/menus.cc:187
 msgid "Select All"
-msgstr ""
+msgstr "Select All"
 
-#: src/skins/menus.cc:170 src/skins/menus.cc:184
+#: src/skins/menus.cc:195 src/skins/menus.cc:211 src/skins-qt/menus.cc:191
+#: src/skins-qt/menus.cc:207
 msgid "By Track Number"
-msgstr ""
+msgstr "By Track Number"
 
-#: src/skins/menus.cc:172 src/skins/menus.cc:186
+#: src/skins/menus.cc:197 src/skins/menus.cc:213 src/skins-qt/menus.cc:193
+#: src/skins-qt/menus.cc:209
 msgid "By Artist"
-msgstr ""
+msgstr "By Artist"
 
-#: src/skins/menus.cc:173 src/skins/menus.cc:187
+#: src/skins/menus.cc:198 src/skins/menus.cc:214 src/skins-qt/menus.cc:194
+#: src/skins-qt/menus.cc:210
 msgid "By Album"
-msgstr ""
+msgstr "By Album"
 
-#: src/skins/menus.cc:174 src/skins/menus.cc:188
+#: src/skins/menus.cc:199 src/skins/menus.cc:215 src/skins-qt/menus.cc:195
+#: src/skins-qt/menus.cc:211
 msgid "By Album Artist"
-msgstr ""
+msgstr "By Album Artist"
 
-#: src/skins/menus.cc:175 src/skins/menus.cc:190
+#: src/skins/menus.cc:200 src/skins/menus.cc:216 src/skins-qt/menus.cc:196
+#: src/skins-qt/menus.cc:212
 msgid "By Release Date"
-msgstr ""
+msgstr "By Release Date"
 
-#: src/skins/menus.cc:176 src/skins/menus.cc:189
+#: src/skins/menus.cc:201 src/skins/menus.cc:217 src/skins-qt/menus.cc:197
+#: src/skins-qt/menus.cc:213
 msgid "By Genre"
-msgstr ""
+msgstr "By Genre"
 
-#: src/skins/menus.cc:177 src/skins/menus.cc:191
+#: src/skins/menus.cc:202 src/skins/menus.cc:218 src/skins-qt/menus.cc:198
+#: src/skins-qt/menus.cc:214
 msgid "By Length"
-msgstr ""
+msgstr "By Length"
 
-#: src/skins/menus.cc:180 src/skins/menus.cc:194
+#: src/skins/menus.cc:205 src/skins/menus.cc:221 src/skins-qt/menus.cc:201
+#: src/skins-qt/menus.cc:217
 msgid "By Custom Title"
-msgstr ""
+msgstr "By Custom Title"
 
-#: src/skins/menus.cc:198
+#: src/skins/menus.cc:206 src/skins/menus.cc:222 src/skins-qt/menus.cc:202
+#: src/skins-qt/menus.cc:218
+msgid "By Comment"
+msgstr "By Comment"
+
+#: src/skins/menus.cc:207 src/skins/menus.cc:223 src/skins-qt/menus.cc:203
+#: src/skins-qt/menus.cc:219
+msgid "By Disc Number"
+msgstr "By Disc Number"
+
+#: src/skins/menus.cc:227 src/skins-qt/menus.cc:223
 msgid "Randomize List"
-msgstr ""
+msgstr "Randomise List"
 
-#: src/skins/menus.cc:199
+#: src/skins/menus.cc:228 src/skins-qt/menus.cc:224
 msgid "Reverse List"
-msgstr ""
+msgstr "Reverse List"
 
-#: src/skins/menus.cc:201
+#: src/skins/menus.cc:230 src/skins-qt/menus.cc:226
 msgid "Sort Selected"
-msgstr ""
+msgstr "Sort Selected"
 
-#: src/skins/menus.cc:202
+#: src/skins/menus.cc:231 src/skins-qt/menus.cc:227
 msgid "Sort List"
-msgstr ""
+msgstr "Sort List"
+
+#: src/skins/menus.cc:236 src/skins-qt/menus.cc:232
+msgid "Open Containing Folder"
+msgstr "Open Containing Folder"
 
-#: src/skins/menus.cc:208
+#: src/skins/menus.cc:238 src/skins-qt/menus.cc:234
 msgid "Cut"
-msgstr ""
+msgstr "Cut"
 
-#: src/skins/menus.cc:209
+#: src/skins/menus.cc:239 src/skins-qt/menus.cc:235
 msgid "Copy"
-msgstr ""
+msgstr "Copy"
 
-#: src/skins/menus.cc:210
+#: src/skins/menus.cc:240 src/skins-qt/menus.cc:236
 msgid "Paste"
-msgstr ""
-
-#: src/skins/menus.cc:212
-msgid "Queue/Unqueue"
-msgstr ""
-
-#: src/skins/menus.cc:218
-msgid "Load Preset ..."
-msgstr ""
-
-#: src/skins/menus.cc:219
-msgid "Load Auto Preset ..."
-msgstr ""
-
-#: src/skins/menus.cc:220
-msgid "Load Default"
-msgstr ""
+msgstr "Paste"
 
-#: src/skins/menus.cc:221
-msgid "Load Preset File ..."
-msgstr ""
-
-#: src/skins/menus.cc:222
-msgid "Load EQF File ..."
-msgstr ""
-
-#: src/skins/menus.cc:224
-msgid "Save Preset ..."
-msgstr ""
-
-#: src/skins/menus.cc:225
-msgid "Save Auto Preset ..."
-msgstr ""
-
-#: src/skins/menus.cc:226
-msgid "Save Default"
-msgstr ""
+#: src/skins/menus.cc:241 src/skins-qt/menus.cc:237
+msgid "Paste at End"
+msgstr "Paste at End"
 
-#: src/skins/menus.cc:227
-msgid "Save Preset File ..."
-msgstr ""
-
-#: src/skins/menus.cc:228
-msgid "Save EQF File ..."
-msgstr ""
-
-#: src/skins/menus.cc:230
-msgid "Delete Preset ..."
-msgstr ""
-
-#: src/skins/menus.cc:231
-msgid "Delete Auto Preset ..."
-msgstr ""
+#: src/skins/menus.cc:243 src/skins-qt/menus.cc:239
+msgid "Queue/Unqueue"
+msgstr "Queue/Unqueue"
 
-#: src/skins/menus.cc:233
-msgid "Import Winamp Presets ..."
-msgstr ""
+#: src/skins/playlist-widget.cc:58 src/skins-qt/playlist-widget.cc:58
+#, c-format
+msgid "%s (%d of %d)"
+msgstr "%s (%d of %d)"
 
-#: src/skins/menus.cc:235
-msgid "Reset to Zero"
-msgstr ""
+#: src/skins/playlistwin.cc:491 src/skins-qt/playlistwin.cc:478
+msgid "Audacious Playlist Editor"
+msgstr "Audacious Playlist Editor"
 
-#: src/skins/plugin.cc:48
+#: src/skins/plugin.cc:53 src/skins-qt/plugin.cc:65
 msgid "Winamp Classic Interface"
-msgstr ""
+msgstr "Winamp Classic Interface"
 
-#: src/skins/preset-browser.cc:57 src/skins/preset-list.cc:371
-#: src/skins/preset-list.cc:386
-msgid "Save"
-msgstr ""
+#: src/skins-qt/menus.cc:75
+msgid "Open Folder ..."
+msgstr "Open Folder ..."
 
-#: src/skins/preset-browser.cc:57 src/skins/preset-list.cc:338
-#: src/skins/preset-list.cc:354
-msgid "Load"
-msgstr ""
-
-#: src/skins/preset-browser.cc:83
-msgid "Load Preset File"
-msgstr ""
+#: src/skins-qt/menus.cc:159
+msgid "Add Folder ..."
+msgstr "Add Folder ..."
 
-#: src/skins/preset-browser.cc:100
-msgid "Load EQF File"
-msgstr ""
-
-#: src/skins/preset-browser.cc:119
-msgid "Save Preset File"
-msgstr ""
+#: src/skins-qt/search-select.cc:62 src/skins/search-select.cc:77
+msgid "Search entries in active playlist"
+msgstr "Search entries in active playlist"
 
-#: src/skins/preset-browser.cc:137
-msgid "Save EQF File"
+#: src/skins-qt/search-select.cc:70 src/skins/search-select.cc:83
+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 ""
+"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."
 
-#: src/skins/preset-browser.cc:151
-msgid "Import Winamp Presets"
-msgstr ""
+#: src/skins-qt/search-select.cc:75 src/skins/search-select.cc:91
+msgid "Title:"
+msgstr "Title:"
 
-#: src/skins/preset-list.cc:285
-msgid "Presets"
-msgstr "Presets"
+#: src/skins-qt/search-select.cc:79 src/skins/search-select.cc:96
+msgid "Album:"
+msgstr "Album:"
 
-#: src/skins/preset-list.cc:335
-msgid "Load preset"
-msgstr ""
+#: src/skins-qt/search-select.cc:82 src/skins/search-select.cc:101
+msgid "Artist:"
+msgstr "Artist:"
 
-#: src/skins/preset-list.cc:351
-msgid "Load auto-preset"
-msgstr ""
+#: src/skins-qt/search-select.cc:85 src/skins/search-select.cc:106
+msgid "File Name:"
+msgstr "File Name:"
 
-#: src/skins/preset-list.cc:367
-msgid "Save preset"
-msgstr ""
+#: src/skins-qt/search-select.cc:88 src/skins/search-select.cc:134
+msgid "Clear previous selection before searching"
+msgstr "Clear previous selection before searching"
 
-#: src/skins/preset-list.cc:382
-msgid "Save auto-preset"
-msgstr ""
+#: src/skins-qt/search-select.cc:89 src/skins/search-select.cc:137
+msgid "Automatically toggle queue for matching entries"
+msgstr "Automatically toggle queue for matching entries"
 
-#: src/skins/preset-list.cc:408
-msgid "Delete preset"
-msgstr ""
+#: src/skins-qt/search-select.cc:90 src/skins/search-select.cc:140
+msgid "Create a new playlist with matching entries"
+msgstr "Create a new playlist with matching entries"
 
-#: src/skins/preset-list.cc:424
-msgid "Delete auto-preset"
-msgstr ""
+#: src/skins-qt/search-select.cc:101 src/skins/search-select.cc:78
+msgid "Search"
+msgstr "Search"
 
-#: src/skins/skins_cfg.cc:176
+#: src/skins-qt/skins_cfg.cc:198 src/skins/skins_cfg.cc:182
 msgid "Player:"
-msgstr ""
+msgstr "Player:"
 
-#: src/skins/skins_cfg.cc:178
+#: src/skins-qt/skins_cfg.cc:200 src/skins/skins_cfg.cc:184
 msgid "Select main player window font:"
 msgstr "Select main player window font:"
 
-#: src/skins/skins_cfg.cc:179
+#: src/skins-qt/skins_cfg.cc:201 src/skins/skins_cfg.cc:185
 msgid "Playlist:"
-msgstr ""
+msgstr "Playlist:"
 
-#: src/skins/skins_cfg.cc:181
+#: src/skins-qt/skins_cfg.cc:203 src/skins/skins_cfg.cc:187
 msgid "Select playlist font:"
 msgstr "Select playlist font:"
 
-#: src/skins/skins_cfg.cc:187
+#: src/skins-qt/skins_cfg.cc:207 src/skins/skins_cfg.cc:191
 msgid "Skin"
-msgstr ""
+msgstr "Skin"
+
+#: src/skins-qt/skins_cfg.cc:211 src/skins/skins_cfg.cc:193
+msgid "Display active titlebar when any window is focused"
+msgstr "Display active titlebar when any window is focused"
 
-#: src/skins/skins_cfg.cc:189
+#: src/skins-qt/skins_cfg.cc:213 src/skins/skins_cfg.cc:195
 msgid "Fonts"
-msgstr ""
+msgstr "Fonts"
 
-#: src/skins/skins_cfg.cc:192
+#: src/skins-qt/skins_cfg.cc:215 src/skins/skins_cfg.cc:197
 msgid "Use bitmap fonts (supports ASCII only)"
 msgstr "Use bitmap fonts (supports ASCII only)"
 
-#: src/skins/skins_cfg.cc:194
+#: src/skins-qt/skins_cfg.cc:217 src/skins/skins_cfg.cc:199
 msgid "Scroll song title"
-msgstr ""
+msgstr "Scroll song title"
 
-#: src/skins/skins_cfg.cc:196
+#: src/skins-qt/skins_cfg.cc:219 src/skins/skins_cfg.cc:201
 msgid "Scroll song title in both directions"
 msgstr "Scroll song title in both directions"
 
-#: src/skins/skins_cfg.cc:201
+#: src/skins-qt/skins_cfg.cc:224 src/skins/skins_cfg.cc:206
 msgid "Analyzer"
-msgstr ""
+msgstr "Analyser"
 
-#: src/skins/skins_cfg.cc:202
+#: src/skins-qt/skins_cfg.cc:225 src/skins/skins_cfg.cc:207
 msgid "Scope"
-msgstr ""
+msgstr "Scope"
 
-#: src/skins/skins_cfg.cc:203
+#: src/skins-qt/skins_cfg.cc:226 src/skins/skins_cfg.cc:208
 msgid "Voiceprint / VU meter"
-msgstr ""
+msgstr "Voiceprint / VU meter"
 
-#: src/skins/skins_cfg.cc:204
+#: src/skins-qt/skins_cfg.cc:227 src/skins/skins_cfg.cc:209
 msgid "Off"
-msgstr ""
+msgstr "Off"
 
-#: src/skins/skins_cfg.cc:208 src/skins/skins_cfg.cc:233
-#: src/skins/skins_cfg.cc:239
+#: src/skins-qt/skins_cfg.cc:231 src/skins-qt/skins_cfg.cc:256
+#: src/skins-qt/skins_cfg.cc:262 src/skins/skins_cfg.cc:213
+#: src/skins/skins_cfg.cc:238 src/skins/skins_cfg.cc:244
 msgid "Normal"
-msgstr ""
+msgstr "Normal"
 
-#: src/skins/skins_cfg.cc:209 src/skins/skins_cfg.cc:234
+#: src/skins-qt/skins_cfg.cc:232 src/skins-qt/skins_cfg.cc:257
+#: src/skins/skins_cfg.cc:214 src/skins/skins_cfg.cc:239
 msgid "Fire"
-msgstr ""
+msgstr "Fire"
 
-#: src/skins/skins_cfg.cc:210
+#: src/skins-qt/skins_cfg.cc:233 src/skins/skins_cfg.cc:215
 msgid "Vertical lines"
-msgstr ""
+msgstr "Vertical lines"
 
-#: src/skins/skins_cfg.cc:214
+#: src/skins-qt/skins_cfg.cc:237 src/skins/skins_cfg.cc:219
 msgid "Lines"
-msgstr ""
+msgstr "Lines"
 
-#: src/skins/skins_cfg.cc:215
+#: src/skins-qt/skins_cfg.cc:238 src/skins/skins_cfg.cc:220
 msgid "Bars"
-msgstr ""
+msgstr "Bars"
 
-#: src/skins/skins_cfg.cc:219
+#: src/skins-qt/skins_cfg.cc:242 src/skins/skins_cfg.cc:224
 msgid "Slowest"
-msgstr ""
+msgstr "Slowest"
 
-#: src/skins/skins_cfg.cc:220
+#: src/skins-qt/skins_cfg.cc:243 src/skins/skins_cfg.cc:225
 msgid "Slow"
-msgstr ""
+msgstr "Slow"
 
-#: src/skins/skins_cfg.cc:221 src/sox-resampler/sox-resampler.cc:152
+#: src/skins-qt/skins_cfg.cc:244 src/skins/skins_cfg.cc:226
+#: src/soxr/sox-resampler.cc:180
 msgid "Medium"
-msgstr ""
+msgstr "Medium"
 
-#: src/skins/skins_cfg.cc:222
+#: src/skins-qt/skins_cfg.cc:245 src/skins/skins_cfg.cc:227
 msgid "Fast"
-msgstr ""
+msgstr "Fast"
 
-#: src/skins/skins_cfg.cc:223
+#: src/skins-qt/skins_cfg.cc:246 src/skins/skins_cfg.cc:228
 msgid "Fastest"
-msgstr ""
+msgstr "Fastest"
 
-#: src/skins/skins_cfg.cc:227
+#: src/skins-qt/skins_cfg.cc:250 src/skins/skins_cfg.cc:232
 msgid "Dots"
-msgstr ""
+msgstr "Dots"
 
-#: src/skins/skins_cfg.cc:228
+#: src/skins-qt/skins_cfg.cc:251 src/skins/skins_cfg.cc:233
 msgid "Line"
-msgstr ""
+msgstr "Line"
 
-#: src/skins/skins_cfg.cc:229
+#: src/skins-qt/skins_cfg.cc:252 src/skins/skins_cfg.cc:234
 msgid "Solid"
-msgstr ""
+msgstr "Solid"
 
-#: src/skins/skins_cfg.cc:235
+#: src/skins-qt/skins_cfg.cc:258 src/skins/skins_cfg.cc:240
 msgid "Ice"
-msgstr ""
+msgstr "Ice"
 
-#: src/skins/skins_cfg.cc:240
+#: src/skins-qt/skins_cfg.cc:263 src/skins/skins_cfg.cc:245
 msgid "Smooth"
-msgstr ""
-
-#: src/skins/skins_cfg.cc:244
-msgid "Type"
-msgstr ""
+msgstr "Smooth"
 
-#: src/skins/skins_cfg.cc:245
-msgid "Visualization type:"
-msgstr ""
-
-#: src/skins/skins_cfg.cc:248
-msgid "Analyzer"
-msgstr ""
-
-#: src/skins/skins_cfg.cc:249
-msgid "Show peaks"
-msgstr ""
-
-#: src/skins/skins_cfg.cc:251
+#: src/skins-qt/skins_cfg.cc:267 src/skins/skins_cfg.cc:249
 msgid "Coloring:"
-msgstr ""
+msgstr "Colouring:"
 
-#: src/skins/skins_cfg.cc:254
+#: src/skins-qt/skins_cfg.cc:270 src/skins/skins_cfg.cc:252
 msgid "Style:"
-msgstr ""
+msgstr "Style:"
 
-#: src/skins/skins_cfg.cc:257
+#: src/skins-qt/skins_cfg.cc:273 src/skins/skins_cfg.cc:255
 msgid "Falloff:"
-msgstr ""
+msgstr "Falloff:"
 
-#: src/skins/skins_cfg.cc:260
+#: src/skins-qt/skins_cfg.cc:276 src/skins/skins_cfg.cc:258
 msgid "Peak falloff:"
-msgstr ""
+msgstr "Peak falloff:"
 
-#: src/skins/skins_cfg.cc:264
+#: src/skins-qt/skins_cfg.cc:282 src/skins/skins_cfg.cc:264
 msgid "Scope Style:"
-msgstr ""
+msgstr "Scope Style:"
 
-#: src/skins/skins_cfg.cc:267
+#: src/skins-qt/skins_cfg.cc:285 src/skins/skins_cfg.cc:267
 msgid "Voiceprint Coloring:"
-msgstr ""
+msgstr "Voiceprint Colouring:"
 
-#: src/skins/skins_cfg.cc:270
+#: src/skins-qt/skins_cfg.cc:288 src/skins/skins_cfg.cc:270
 msgid "VU Meter Style:"
-msgstr ""
-
-#: src/skins/skins_cfg.cc:276
-msgid "General"
-msgstr "General"
-
-#: src/skins/skins_cfg.cc:277
-msgid "Visualization"
-msgstr ""
-
-#: src/skins/ui_equalizer.cc:282
-msgid "Preamp"
-msgstr "Preamp"
-
-#: src/skins/ui_equalizer.cc:286
-msgid "31 Hz"
-msgstr "31 Hz"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "63 Hz"
-msgstr "63 Hz"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "125 Hz"
-msgstr "125 Hz"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "250 Hz"
-msgstr "250 Hz"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "500 Hz"
-msgstr "500 Hz"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "1 kHz"
-msgstr "1 kHz"
-
-#: src/skins/ui_equalizer.cc:288
-msgid "2 kHz"
-msgstr "2 kHz"
+msgstr "VU Meter Style:"
 
-#: src/skins/ui_equalizer.cc:288
-msgid "4 kHz"
-msgstr "4 kHz"
-
-#: src/skins/ui_equalizer.cc:288
-msgid "8 kHz"
-msgstr "8 kHz"
-
-#: src/skins/ui_equalizer.cc:288
-msgid "16 kHz"
-msgstr "16 kHz"
-
-#: src/skins/ui_equalizer.cc:330
-msgid "Audacious Equalizer"
-msgstr "Audacious Equaliser"
-
-#: src/skins/ui_main.cc:688
-#, c-format
-msgid "Seek to %d:%-2.2d / %d:%-2.2d"
-msgstr "Seek to %d:%-2.2d / %d:%-2.2d"
-
-#: src/skins/ui_main.cc:709
-#, c-format
-msgid "Volume: %d%%"
-msgstr "Volume: %d%%"
-
-#: src/skins/ui_main.cc:732
-#, c-format
-msgid "Balance: %d%% left"
-msgstr "Balance: %d%% left"
-
-#: src/skins/ui_main.cc:734
-msgid "Balance: center"
-msgstr "Balance: centre"
-
-#: src/skins/ui_main.cc:736
-#, c-format
-msgid "Balance: %d%% right"
-msgstr "Balance: %d%% right"
-
-#: src/skins/ui_main.cc:842
-msgid "Options Menu"
-msgstr "Options Menu"
-
-#: src/skins/ui_main.cc:846
-msgid "Disable 'Always On Top'"
-msgstr "Disable 'Always On Top'"
-
-#: src/skins/ui_main.cc:848
-msgid "Enable 'Always On Top'"
-msgstr "Enable 'Always On Top'"
-
-#: src/skins/ui_main.cc:851
-msgid "File Info Box"
-msgstr "File Info Box"
-
-#: src/skins/ui_main.cc:857
-msgid "Visualizations"
-msgstr ""
-
-#: src/skins/ui_main.cc:1336
-msgid "Repeat point A set."
-msgstr ""
-
-#: src/skins/ui_main.cc:1341
-msgid "Repeat point B set."
-msgstr ""
-
-#: src/skins/ui_main.cc:1350
-msgid "Repeat points cleared."
-msgstr ""
-
-#: src/skins/ui_playlist.cc:219
-msgid "Search entries in active playlist"
-msgstr ""
-
-#: src/skins/ui_playlist.cc:226
-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.cc:234
-msgid "Title:"
-msgstr ""
-
-#: src/skins/ui_playlist.cc:241
-msgid "Album:"
-msgstr ""
-
-#: src/skins/ui_playlist.cc:248
-msgid "Artist:"
-msgstr ""
-
-#: src/skins/ui_playlist.cc:255
-msgid "File Name:"
-msgstr ""
-
-#: src/skins/ui_playlist.cc:263
-msgid "Clear previous selection before searching"
-msgstr ""
+#: src/skins-qt/skins_cfg.cc:294 src/skins/skins_cfg.cc:276
+msgid "Type"
+msgstr "Type"
 
-#: src/skins/ui_playlist.cc:266
-msgid "Automatically toggle queue for matching entries"
-msgstr ""
+#: src/skins-qt/skins_cfg.cc:295 src/skins/skins_cfg.cc:277
+msgid "Visualization type:"
+msgstr "Visualisation type:"
 
-#: src/skins/ui_playlist.cc:269
-msgid "Create a new playlist with matching entries"
-msgstr ""
+#: src/skins-qt/skins_cfg.cc:298 src/skins/skins_cfg.cc:280
+msgid "Analyzer"
+msgstr "Analyser"
 
-#: src/skins/ui_playlist.cc:717
-msgid "Audacious Playlist Editor"
-msgstr ""
+#: src/skins-qt/skins_cfg.cc:299 src/skins/skins_cfg.cc:281
+msgid "Show peaks"
+msgstr "Show peaks"
 
-#: src/skins/ui_playlist.cc:752
-#, c-format
-msgid "%s (%d of %d)"
-msgstr ""
+#: src/skins-qt/skins_cfg.cc:308 src/skins/skins_cfg.cc:290
+msgid "Visualization"
+msgstr "Visualisation"
 
-#: src/skins/ui_skinselector.cc:167
+#: src/skins-qt/skinselector.cc:98 src/skins/skinselector.cc:111
 msgid "Archived Winamp 2.x skin"
-msgstr ""
+msgstr "Archived Winamp 2.x skin"
 
-#: src/skins/ui_skinselector.cc:172
+#: src/skins-qt/skinselector.cc:102 src/skins/skinselector.cc:115
 msgid "Unarchived Winamp 2.x skin"
-msgstr ""
-
-#: src/skins/util.cc:430
-#, c-format
-msgid "Could not create directory (%s): %s\n"
-msgstr ""
+msgstr "Unarchived Winamp 2.x skin"
 
-#: src/sndfile/plugin.cc:39
+#: src/sndfile/plugin.cc:38
 msgid "Sndfile Plugin"
-msgstr ""
+msgstr "Sndfile Plugin"
 
-#: src/sndfile/plugin.cc:336
+#: src/sndfile/plugin.cc:372
 msgid ""
 "Based on the xmms_sndfile plugin:\n"
 "Copyright (C) 2000, 2002 Erik de Castro Lopo\n"
@@ -3687,93 +4191,135 @@
 "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"
+"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 Licence as published by the Free "
+"Software Foundation; either version 2 of the Licence, 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 Licence for "
+"more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public Licence along with "
+"this program; if not, write to the Free Software Foundation, Inc., 51 "
+"Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 
-#: src/sndio-ng/sndio.cc:44
+#: src/sndio/sndio.cc:43
 msgid "Sndio Output"
-msgstr ""
+msgstr "Sndio Output"
 
-#: src/sndio-ng/sndio.cc:98
+#: src/sndio/sndio.cc:98
 msgid "Device (blank for default):"
-msgstr ""
+msgstr "Device (blank for default):"
 
-#: src/sndio-ng/sndio.cc:100
+#: src/sndio/sndio.cc:100
 msgid "Save and restore volume:"
-msgstr ""
+msgstr "Save and restore volume:"
 
-#: src/sndio-ng/sndio.cc:181
+#: src/sndio/sndio.cc:181
 #, c-format
 msgid "Sndio error: Unsupported audio format (%d)"
-msgstr ""
+msgstr "Sndio error: Unsupported audio format (%d)"
 
-#: src/sndio-ng/sndio.cc:192
+#: src/sndio/sndio.cc:192
 msgid "Sndio error: sio_open() failed"
-msgstr ""
+msgstr "Sndio error: sio_open() failed"
 
-#: src/sndio-ng/sndio.cc:222
+#: src/sndio/sndio.cc:221
 msgid "Sndio error: sio_setpar() failed"
-msgstr ""
+msgstr "Sndio error: sio_setpar() failed"
 
-#: src/sndio-ng/sndio.cc:234
+#: src/sndio/sndio.cc:233
 msgid "Sndio error: sio_start() failed"
-msgstr ""
+msgstr "Sndio error: sio_start() failed"
 
-#: src/song_change/song_change.cc:33
+#: src/songchange/song_change.cc:30
 msgid "Song Change"
-msgstr ""
+msgstr "Song Change"
 
-#: src/song_change/song_change.cc:342
-msgid ""
-"Parameters passed to the shell should be encapsulated in "
-"quotes. Doing otherwise is a security risk."
-msgstr ""
-
-#: src/song_change/song_change.cc:358
+#: src/songchange/song_change.cc:256
 msgid "Commands"
-msgstr ""
+msgstr "Commands"
 
-#: src/song_change/song_change.cc:360
+#: src/songchange/song_change.cc:258
 msgid "Command to run when starting a new song:"
-msgstr ""
+msgstr "Command to run when starting a new song:"
+
+#: src/songchange/song_change.cc:261
+msgid "Command to run when stopping a song:"
+msgstr "Command to run when stopping a song:"
 
-#: src/song_change/song_change.cc:364
+#: src/songchange/song_change.cc:264
 msgid "Command to run at the end of a song:"
-msgstr ""
+msgstr "Command to run at the end of a song:"
 
-#: src/song_change/song_change.cc:368
+#: src/songchange/song_change.cc:267
 msgid "Command to run at the end of the playlist:"
-msgstr ""
+msgstr "Command to run at the end of the playlist:"
 
-#: src/song_change/song_change.cc:372
+#: src/songchange/song_change.cc:270
 msgid "Command to run when song title changes (for network streams):"
+msgstr "Command to run when song title changes (for network streams):"
+
+#: src/songchange/song_change.cc:273
+msgid ""
+"You can use the following format codes, which will be replaced before "
+"running the command.\n"
+"Not all are useful though for the song-stopped or end-of-playlist command."
 msgstr ""
+"You can use the following format codes, which will be replaced before "
+"running the command.\n"
+"Not all are useful though for the song-stopped or end-of-playlist command."
 
-#: src/song_change/song_change.cc:376
+#: src/songchange/song_change.cc:276
 msgid ""
-"You can use the following format strings which will be substituted before "
-"calling the command (not all are useful for the end-of-playlist command):\n"
-"\n"
-"%F: Frequency (in hertz)\n"
+"%a: Artist\n"
+"%b: Album\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"
+"%F: Frequency (Hertz)\n"
+"%l: Length (milliseconds)\n"
+"%n or %s: Formatted title (see playlist settings)\n"
 "%p: Currently playing (1 or 0)\n"
+"%r: Rate (bits per second)\n"
+"%t: Playlist position\n"
+"%T: Title (unformatted)"
+msgstr ""
 "%a: Artist\n"
 "%b: Album\n"
-"%T: Track title"
-msgstr ""
+"%c: Number of channels\n"
+"%f: File name (full path)\n"
+"%F: Frequency (Hertz)\n"
+"%l: Length (milliseconds)\n"
+"%n or %s: Formatted title (see playlist settings)\n"
+"%p: Currently playing (1 or 0)\n"
+"%r: Rate (bits per second)\n"
+"%t: Playlist position\n"
+"%T: Title (unformatted)"
 
-#: src/song-info-qt/song-info.cc:32
-msgid "Song Info (Qt)"
+#: src/songchange/song_change.cc:287
+msgid ""
+"Parameters passed to the shell should be enclosed in quotation marks.\n"
+"Unquoted parameters may lead to unexpected results."
 msgstr ""
+"Parameters passed to the shell should be enclosed in quotation marks.\n"
+"Unquoted parameters may lead to unexpected results."
+
+#: src/song-info-qt/song-info.cc:30
+msgid "Song Info"
+msgstr "Song Info"
 
-#: src/sox-resampler/sox-resampler.cc:44
+#: src/soxr/sox-resampler.cc:44
 msgid "SoX Resampler"
-msgstr ""
+msgstr "SoX Resampler"
 
-#: src/sox-resampler/sox-resampler.cc:144
+#: src/soxr/sox-resampler.cc:172
 msgid ""
 "SoX Resampler Plugin for Audacious\n"
 "Copyright 2013 Michał Lipski\n"
@@ -3781,93 +4327,153 @@
 "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/sox-resampler/sox-resampler.cc:150
+#: src/soxr/sox-resampler.cc:178
 msgid "Quick"
-msgstr ""
+msgstr "Quick"
 
-#: src/sox-resampler/sox-resampler.cc:151
+#: src/soxr/sox-resampler.cc:179
 msgid "Low"
-msgstr ""
+msgstr "Low"
 
-#: src/sox-resampler/sox-resampler.cc:153
+#: src/soxr/sox-resampler.cc:181
 msgid "High"
-msgstr ""
+msgstr "High"
 
-#: src/sox-resampler/sox-resampler.cc:154
+#: src/soxr/sox-resampler.cc:182
 msgid "Very High"
-msgstr ""
+msgstr "Very High"
 
-#: src/sox-resampler/sox-resampler.cc:158
+#: src/soxr/sox-resampler.cc:183
+msgid "Ultra High"
+msgstr "Ultra High"
+
+#: src/soxr/sox-resampler.cc:187
+msgid "Minimum"
+msgstr "Minimum"
+
+#: src/soxr/sox-resampler.cc:188
+msgid "Intermediate"
+msgstr "Intermediate"
+
+#: src/soxr/sox-resampler.cc:193
 msgid "Quality:"
-msgstr ""
+msgstr "Quality:"
+
+#: src/soxr/sox-resampler.cc:196
+msgid "Phase:"
+msgstr "Phase:"
+
+#: src/soxr/sox-resampler.cc:200
+msgid "Allow aliasing"
+msgstr "Allow aliasing"
 
-#: src/speed-pitch/speed-pitch.cc:51
+#: src/soxr/sox-resampler.cc:202
+msgid "Use steep filter"
+msgstr "Use steep filter"
+
+#: src/speedpitch/speed-pitch.cc:54
 msgid "Speed and Pitch"
-msgstr ""
+msgstr "Speed and Pitch"
 
-#: src/speed-pitch/speed-pitch.cc:210
-msgid "Speed and Pitch"
-msgstr ""
+#: src/speedpitch/speed-pitch.cc:247
+msgid "Speed"
+msgstr "Speed"
 
-#: src/speed-pitch/speed-pitch.cc:211
-msgid "Speed:"
-msgstr ""
+#: src/speedpitch/speed-pitch.cc:248
+msgid "Decouple from pitch"
+msgstr "Decouple from pitch"
 
-#: src/speed-pitch/speed-pitch.cc:214
-msgid "Pitch:"
-msgstr ""
+#: src/speedpitch/speed-pitch.cc:250 src/speedpitch/speed-pitch.cc:258
+msgid "Multiplier:"
+msgstr "Multiplier:"
 
-#: src/statusicon/statusicon.cc:47
-msgid "Status Icon"
-msgstr ""
+#: src/speedpitch/speed-pitch.cc:254
+msgid "Pitch"
+msgstr "Pitch"
 
-#: src/statusicon/statusicon.cc:283
-msgid "Se_ttings ..."
-msgstr ""
+#: src/statusicon-qt/statusicon.cc:45 src/statusicon/statusicon.cc:47
+msgid "Status Icon"
+msgstr "Status Icon"
 
-#: src/statusicon/statusicon.cc:372
+#: src/statusicon-qt/statusicon.cc:68
 msgid ""
-"Status Icon Plugin\n"
+"Status Icon Plugin (partial port for Qt interface)\n"
 "\n"
 "Copyright 2005-2007 Giacomo Lozito <james@develia.org>\n"
 "Copyright 2010 Michał Lipski <tallica@o2.pl>\n"
+"Copyright 2015 Eugene Paskevich <eugene@raptor.kiev.ua>\n"
 "\n"
 "This plugin provides a status icon, placed in\n"
 "the system tray area of the window manager."
 msgstr ""
+"Status Icon Plugin (partial port for Qt interface)\n"
+"\n"
+"Copyright 2005-2007 Giacomo Lozito <james@develia.org>\n"
+"Copyright 2010 Michał Lipski <tallica@o2.pl>\n"
+"Copyright 2015 Eugene Paskevich <eugene@raptor.kiev.ua>\n"
+"\n"
+"This plugin provides a status icon, placed in\n"
+"the system tray area of the window manager."
 
-#: src/statusicon/statusicon.cc:379
+#: src/statusicon-qt/statusicon.cc:89 src/statusicon/statusicon.cc:384
 msgid "Mouse Scroll Action"
-msgstr ""
+msgstr "Mouse Scroll Action"
 
-#: src/statusicon/statusicon.cc:380
+#: src/statusicon-qt/statusicon.cc:90 src/statusicon/statusicon.cc:385
 msgid "Change volume"
-msgstr ""
+msgstr "Change volume"
 
-#: src/statusicon/statusicon.cc:383
+#: src/statusicon-qt/statusicon.cc:93 src/statusicon/statusicon.cc:388
 msgid "Change playing song"
-msgstr ""
+msgstr "Change playing song"
 
-#: src/statusicon/statusicon.cc:386
+#: src/statusicon-qt/statusicon.cc:96 src/statusicon/statusicon.cc:391
 msgid "Other Settings"
-msgstr ""
+msgstr "Other Settings"
 
-#: src/statusicon/statusicon.cc:387
+#: src/statusicon-qt/statusicon.cc:97 src/statusicon/statusicon.cc:392
 msgid "Disable the popup window"
-msgstr ""
+msgstr "Disable the popup window"
 
-#: src/statusicon/statusicon.cc:389
+#: src/statusicon-qt/statusicon.cc:99 src/statusicon/statusicon.cc:394
 msgid "Close to the system tray"
-msgstr ""
+msgstr "Close to the system tray"
 
-#: src/statusicon/statusicon.cc:391
+#: src/statusicon-qt/statusicon.cc:101 src/statusicon/statusicon.cc:396
 msgid "Advance in playlist when scrolling upward"
+msgstr "Advance in playlist when scrolling upward"
+
+#: src/statusicon-qt/statusicon.cc:116 src/statusicon/statusicon.cc:287
+msgid "Se_ttings ..."
+msgstr "Se_ttings ..."
+
+#: src/statusicon/statusicon.cc:377
+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 ""
+"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."
 
 #: src/stereo_plugin/stereo.cc:19
 msgid "Extra Stereo"
-msgstr ""
+msgstr "Extra Stereo"
 
 #: src/stereo_plugin/stereo.cc:36
 msgid ""
@@ -3875,25 +4481,168 @@
 "\n"
 "By Johan Levin, 1999"
 msgstr ""
+"Extra Stereo Plugin\n"
+"\n"
+"By Johan Levin, 1999"
 
 #: src/stereo_plugin/stereo.cc:44
 msgid "Extra Stereo"
-msgstr ""
+msgstr "Extra Stereo"
+
+#: src/streamtuner/icecast-model.cc:126 src/streamtuner/shoutcast-model.cc:131
+msgid "Type"
+msgstr "Type"
+
+#: src/streamtuner/icecast-model.cc:132
+msgid "Current Song"
+msgstr "Current Song"
+
+#: src/streamtuner/icecast-model.cc:164
+msgid "Other"
+msgstr "Other"
+
+#: src/streamtuner/ihr-model.cc:63
+msgid "Market"
+msgstr "Market"
+
+#: src/streamtuner/ihr-model.cc:156
+msgid "Call Letters"
+msgstr "Call Letters"
+
+#: src/streamtuner/ihr-model.cc:162
+msgid "Description"
+msgstr "Description"
+
+#: src/streamtuner/shoutcast-model.cc:128
+msgid "Listeners"
+msgstr "Listeners"
+
+#: src/streamtuner/shoutcast-model.cc:188
+msgid "Top 500 Stations"
+msgstr "Top 500 Stations"
+
+#: src/streamtuner/shoutcast-model.cc:189
+msgid "Alternative"
+msgstr "Alternative"
+
+#: src/streamtuner/shoutcast-model.cc:190
+msgid "Blues"
+msgstr "Blues"
+
+#: src/streamtuner/shoutcast-model.cc:191
+msgid "Classical"
+msgstr "Classical"
+
+#: src/streamtuner/shoutcast-model.cc:192
+msgid "Country"
+msgstr "Country"
+
+#: src/streamtuner/shoutcast-model.cc:193
+msgid "Decades"
+msgstr "Decades"
+
+#: src/streamtuner/shoutcast-model.cc:194
+msgid "Easy Listening"
+msgstr "Easy Listening"
+
+#: src/streamtuner/shoutcast-model.cc:195
+msgid "Electronic"
+msgstr "Electronic"
+
+#: src/streamtuner/shoutcast-model.cc:196
+msgid "Folk"
+msgstr "Folk"
+
+#: src/streamtuner/shoutcast-model.cc:197
+msgid "Inspirational"
+msgstr "Inspirational"
+
+#: src/streamtuner/shoutcast-model.cc:198
+msgid "International"
+msgstr "International"
+
+#: src/streamtuner/shoutcast-model.cc:199
+msgid "Jazz"
+msgstr "Jazz"
+
+#: src/streamtuner/shoutcast-model.cc:200
+msgid "Latin"
+msgstr "Latin"
+
+#: src/streamtuner/shoutcast-model.cc:201
+msgid "Metal"
+msgstr "Metal"
+
+#: src/streamtuner/shoutcast-model.cc:203
+msgid "New Age"
+msgstr "New Age"
+
+#: src/streamtuner/shoutcast-model.cc:204
+msgid "Pop"
+msgstr "Pop"
+
+#: src/streamtuner/shoutcast-model.cc:205
+msgid "Public Radio"
+msgstr "Public Radio"
+
+#: src/streamtuner/shoutcast-model.cc:206
+msgid "R&B and Urban"
+msgstr "R&B and Urban"
+
+#: src/streamtuner/shoutcast-model.cc:207
+msgid "Rap"
+msgstr "Rap"
+
+#: src/streamtuner/shoutcast-model.cc:208
+msgid "Reggae"
+msgstr "Reggae"
+
+#: src/streamtuner/shoutcast-model.cc:209
+msgid "Rock"
+msgstr "Rock"
+
+#: src/streamtuner/shoutcast-model.cc:210
+msgid "Seasonal and Holiday"
+msgstr "Seasonal and Holiday"
+
+#: src/streamtuner/shoutcast-model.cc:211
+msgid "Soundtracks"
+msgstr "Soundtracks"
+
+#: src/streamtuner/shoutcast-model.cc:212
+msgid "Talk"
+msgstr "Talk"
+
+#: src/streamtuner/shoutcast-model.cc:213
+msgid "Themes"
+msgstr "Themes"
+
+#: src/streamtuner/streamtuner.cc:59
+msgid "Shoutcast"
+msgstr "Shoutcast"
+
+#: src/streamtuner/streamtuner.cc:60
+msgid "Icecast"
+msgstr "Icecast"
+
+#: src/streamtuner/streamtuner.cc:71
+msgid "Stream Tuner"
+msgstr "Stream Tuner"
 
 #: src/tonegen/tonegen.cc:45
 msgid "Tone Generator"
-msgstr ""
+msgstr "Tone Generator"
 
-#: src/tonegen/tonegen.cc:94
+#: src/tonegen/tonegen.cc:92
 #, c-format
 msgid "%s %.1f Hz"
-msgstr ""
+msgstr "%s %.1f Hz"
 
-#: src/tonegen/tonegen.cc:94
+#: src/tonegen/tonegen.cc:92
 msgid "Tone Generator: "
-msgstr ""
+msgstr "Tone Generator: "
 
-#: src/tonegen/tonegen.cc:160
+#: src/tonegen/tonegen.cc:161
 msgid ""
 "Sine tone generator by Håvard Kvålen <havardk@xmms.org>\n"
 "Modified by Daniel J. Peng <danielpeng@bigfoot.com>\n"
@@ -3901,12 +4650,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 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"
+
+#: src/ui-common/dialogs-qt.cc:40
+msgid ""
+"\n"
+"(Further messages have been hidden.)"
+msgstr ""
+"\n"
+"(Further messages have been hidden.)"
+
+#: src/ui-common/dialogs-qt.cc:52
+msgid "Working ..."
+msgstr "Working ..."
+
+#: src/ui-common/dialogs-qt.cc:73
+msgid "Information"
+msgstr "Information"
+
+#: src/ui-common/menu-ops-gtk.cc:132 src/ui-common/menu-ops-qt.cc:113
+#, c-format
+msgid "%s does not appear to be a valid folder."
+msgstr "%s does not appear to be a valid folder."
 
 #: src/voice_removal/voice_removal.cc:28
 msgid "Voice Removal"
-msgstr ""
+msgstr "Voice Removal"
 
-#: src/vorbis/vorbis.cc:465
+#: src/vorbis/vorbis.cc:433
 msgid ""
 "Audacious Ogg Vorbis Decoder\n"
 "\n"
@@ -3926,17 +4701,34 @@
 "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.h:18
 msgid "Ogg Vorbis Decoder"
-msgstr ""
+msgstr "Ogg Vorbis Decoder"
 
-#: src/vtx/info.cc:22
+#: src/vtx/info.cc:24
 #, c-format
 msgid "Details about %s"
-msgstr ""
+msgstr "Details about %s"
 
-#: src/vtx/info.cc:24
+#: src/vtx/info.cc:26
 msgid ""
 "Title: %t\n"
 "Author: %a\n"
@@ -3950,49 +4742,130 @@
 "Player Freq: %P\n"
 "Year: %y"
 msgstr ""
+"Title: %t\n"
+"Author: %a\n"
+"From: %f\n"
+"Tracker: %T\n"
+"Comment: %C\n"
+"Chip type: %c\n"
+"Stereo: %s\n"
+"Loop: %l\n"
+"Chip freq: %F\n"
+"Player Freq: %P\n"
+"Year: %y"
 
 #: src/vtx/vtx.cc:38
 msgid "VTX Decoder"
-msgstr ""
+msgstr "VTX Decoder"
 
-#: src/vtx/vtx.cc:184
+#: src/vtx/vtx.cc:178
 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/wavpack/wavpack.cc:24
-msgid "WavPack Decoder"
+#: src/vumeter-qt/vumeter_qt.cc:31
+msgid ""
+"VU Meter Plugin for Audacious\n"
+"Copyright 2017-2019 Marc Sánchez Fauste"
 msgstr ""
+"VU Meter Plugin for Audacious\n"
+"Copyright 2017-2019 Marc Sánchez Fauste"
 
-#: src/wavpack/wavpack.cc:211
-msgid "lossy (hybrid)"
+#: src/vumeter-qt/vumeter_qt.cc:35
+msgid "VU Meter Settings"
+msgstr "VU Meter Settings"
+
+#: src/vumeter-qt/vumeter_qt.cc:37
+msgid "Peak hold time:"
+msgstr "Peak hold time:"
+
+#: src/vumeter-qt/vumeter_qt.cc:42
+msgid "Fall-off time:"
+msgstr "Fall-off time:"
+
+#: src/vumeter-qt/vumeter_qt.cc:44
+msgid "dB/second"
+msgstr "dB/second"
+
+#: src/vumeter-qt/vumeter_qt.cc:46
+msgid "Display legend"
+msgstr "Display legend"
+
+#: src/vumeter-qt/vumeter_qt.h:37
+msgid "VU Meter"
+msgstr "VU Meter"
+
+#: src/waveout/waveout.cc:43
+msgid "Win32 waveOut"
+msgstr "Win32 waveOut"
+
+#: src/waveout/waveout.cc:69
+msgid ""
+"Win32 waveOut Plugin for Audacious\n"
+"Copyright 2016 John Lindgren"
 msgstr ""
+"Win32 waveOut Plugin for Audacious\n"
+"Copyright 2016 John Lindgren"
+
+#: src/wavpack/wavpack.cc:25
+msgid "WavPack Decoder"
+msgstr "WavPack Decoder"
+
+#: src/wavpack/wavpack.cc:217
+msgid "lossy (hybrid)"
+msgstr "lossy (hybrid)"
 
-#: src/wavpack/wavpack.cc:213
+#: src/wavpack/wavpack.cc:219
 msgid "lossy"
-msgstr ""
+msgstr "lossy"
 
-#: src/wavpack/wavpack.cc:255
+#: src/wavpack/wavpack.cc:259
 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/xsf/plugin.cc:50
+#: src/xsf/plugin.cc:74
 msgid "2SF Decoder"
-msgstr ""
+msgstr "2SF Decoder"
+
+#: src/xsf/plugin.cc:429
+msgid "32728 Hz"
+msgstr "32728 Hz"
+
+#: src/xsf/plugin.cc:432
+msgid "65456 Hz"
+msgstr "65456 Hz"
+
+#: src/xsf/plugin.cc:438
+msgid "Cosine"
+msgstr "Cosine"
+
+#: src/xsf/plugin.cc:439
+msgid "Sharp"
+msgstr "Sharp"
 
-#: src/xsf/plugin.cc:238
+#: src/xsf/plugin.cc:443
 msgid "XSF Configuration"
-msgstr ""
+msgstr "XSF Configuration"
 
-#: src/xsf/plugin.cc:239
-msgid "Ignore length from file"
-msgstr ""
+#: src/xsf/plugin.cc:445
+msgid "Default fade time:"
+msgstr "Default fade time:"
 
-#: src/xspf/xspf.cc:89
+#: src/xsf/plugin.cc:447
+msgid "Interpolation mode:"
+msgstr "Interpolation mode:"
+
+#: src/xspf/xspf.cc:95
 msgid "XML Shareable Playlists (XSPF)"
-msgstr ""
+msgstr "XML Shareable Playlists (XSPF)"

audacious-plugins-3.6.2-gtk3.tar.bz2/po/es.po -> audacious-plugins-4.4.1.tar.bz2/po/es.po Changed

@@ -5,322 +5,99 @@
 # Translators:
 # Adolfo Jayme Barrientos, 2013
 # Adolfo Jayme Barrientos <fito@libreoffice.org>, 2013-2014
-# Adolfo Jayme Barrientos, 2013
-# Adolfo Jayme Barrientos, 2015
+# Adolfo Jayme Barrientos, 2013
+# Adolfo Jayme Barrientos, 2016
+# Adolfo Jayme Barrientos, 2015
 # Adrián Ramirez Escalante <buried.prophet@gmail.com>, 2012
 # Cosme Domínguez Díaz <cosme.ddiaz@gmail.com>, 2010
 # enjolras <yo@miguelrevilla.com>, 2012
-# Francesc Gordillo i Cortínez <inactive+frangor@transifex.com>, 2013
-# Francesc Gordillo i Cortínez <inactive+frangor@transifex.com>, 2013
+# d396272506fceeee36fb9ecad66ea4ec_9301ee1 <2f2d48fc838758dd413d8847713d8a44_95171>, 2013
+# d396272506fceeee36fb9ecad66ea4ec_9301ee1 <2f2d48fc838758dd413d8847713d8a44_95171>, 2013
 # Jack R. <dny1020@aol.com>, 2013
 # Jorge Andrés <winninglero@gmail.com>, 2011
 # Juan Riquelme González <soulchainer@gmail.com>, 2015
+# fgp <komakino@wanadoo.es>, 2016
 # Lucía Balsa <lucia.balsa.prados@gmail.com>, 2012
-# Marco Antonio Frias Butrón <inactive+smaug@transifex.com>, 2012
-# Marco Antonio Frias Butrón <inactive+smaug@transifex.com>, 2012
+# bb21c722adad611b63dfb48ec99e8350_f97f8ad <d530bc03295e5d0f8a4e05b63e738a76_2025>, 2012
+# bb21c722adad611b63dfb48ec99e8350_f97f8ad <d530bc03295e5d0f8a4e05b63e738a76_2025>, 2012
+# Marc Sánchez <sanchezfauste@gmail.com>, 2020
 # Matias Menich <und34d@gmail.com>, 2012
+# Roberto Rodríguez, 2023
+# Toni Estévez <toni.estevez@gmail.com>, 2019-2020,2022-2023
 # xukosky <xukosky@yahoo.es>, 2011-2012
 # xukosky <xukosky@yahoo.es>, 2011, 2012
 # enjolras <yo@miguelrevilla.com>, 2012
 msgid ""
 msgstr ""
 "Project-Id-Version: Audacious Plugins\n"
-"Report-Msgid-Bugs-To: http://redmine.audacious-media-player.org/\n"
-"POT-Creation-Date: 2015-02-28 19:18+0100\n"
-"PO-Revision-Date: 2015-02-13 07:28+0000\n"
-"Last-Translator: Adolfo Jayme Barrientos\n"
-"Language-Team: Spanish (http://www.transifex.com/projects/p/audacious/"
+"Report-Msgid-Bugs-To: https://github.com/audacious-media-player/audacious/"
+"issues\n"
+"POT-Creation-Date: 2024-09-26 21:54+0200\n"
+"PO-Revision-Date: 2011-10-10 17:43+0000\n"
+"Last-Translator: Roberto Rodríguez, 2023\n"
+"Language-Team: Spanish (http://app.transifex.com/audacious/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"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? "
+"1 : 2;\n"
 
-#: src/aac-raw/aac.cc:18
+#: src/aac/aac.cc:19
 msgid "AAC (Raw) Decoder"
 msgstr "Descodificador ACC (sin procesar)"
 
-#: src/adplug/adplug-xmms.cc:42
+#: src/adplug/adplug-xmms.cc:70
 msgid "AdPlug (AdLib Player)"
-msgstr "AdPlug (Reproductor AdLib)"
+msgstr "AdPlug (reproductor AdLib)"
 
-#: src/adplug/adplug-xmms.cc:156 src/modplug/modplugbmp.cc:335
-#: src/psf/plugin.cc:138 src/vtx/vtx.cc:87 src/xsf/plugin.cc:113
+#: src/adplug/adplug-xmms.cc:167 src/modplug/modplugbmp.cc:321
+#: src/psf/plugin.cc:161 src/vtx/vtx.cc:89 src/xsf/plugin.cc:204
 msgid "sequenced"
 msgstr "secuenciado"
 
-#: src/alarm/alarm.cc:55 src/alarm/interface.cc:82
-msgid "Alarm"
-msgstr "Alarma"
-
-#: src/alarm/alarm.cc:782
-msgid "Set Alarm ..."
-msgstr "Establecer alarma…"
-
-#: src/alarm/alarm.cc:810
-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 complemento para iniciar la reproducción en un momento dado.\n"
-"\n"
-"Escrito originalmente por Adam Feakin y Daniel Stodden."
-
-#: src/alarm/interface.cc: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 ""
-"Tiempo\n"
-" Alarma a:\n"
-" Hora a la que saltará la alarma.\n"
-"\n"
-" Silencio tras:\n"
-" La alarma se detendrá una vez pasado este tiempo.\n"
-" (si no se cierra el diálogo de aviso)\n"
-"\n"
-"\n"
-"Días\n"
-" Día:\n"
-" Selecciona los días en los que saltará la alarma.\n"
-"\n"
-" Tiempo:\n"
-" Escoge cuando sonará la alarma cada día,\n"
-" o marca «Predeterminado» para usar el\n"
-" tiempo por defecto.\n"
-"\n"
-"\n"
-
-#: src/alarm/interface.cc: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"
-" Transición:\n"
-" Tiempo que se invertirá en establecer,\n"
-" gradualmente, el volumen final indicado.\n"
-"\n"
-" Iniciar a:\n"
-" Inicia la transición desde este volumen.\n"
-"\n"
-" Final:\n"
-" Alcanzado este volumen, se detendrá la\n"
-" transición. Si el tiempo para la transición es 0,\n"
-" se establecerá este volumen y se iniciará la\n"
-" reproducción directamente.\n"
-"\n"
-"\n"
-"Opciones:\n"
-" Comando adicional:\n"
-" Ejecuta este comando cuando salte la alarma.\n"
-"\n"
-
-#: src/alarm/interface.cc: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 la lista de reproducción dada.\n"
-" Si no se da ninguna, se usará la lista actual.\n"
-" También puede indicarse aquí el URL de un\n"
-" flujo de audio mp3/ogg.\n"
-"\n"
-" Recordatorio:\n"
-" Muestra un aviso cuando suena la alarma.\n"
-" Escriba el recordatorio en el campo de texto y\n"
-" marque «activar» si quiere que se muestre."
-
-#: src/alarm/interface.cc:81
-msgid "This is your wakeup call."
-msgstr "Este es el aviso de su alarma."
-
-#: src/alarm/interface.cc:99
-msgid "Your reminder for today is..."
-msgstr "Tu recordatorio para hoy es..."
-
-#: src/alarm/interface.cc:101 src/alarm/interface.cc:386
-msgid "Reminder"
-msgstr "Recordatorio"
-
-#: src/alarm/interface.cc:132
-msgid "Monday"
-msgstr "Lunes"
-
-#: src/alarm/interface.cc:132
-msgid "Tuesday"
-msgstr "Martes"
-
-#: src/alarm/interface.cc:132
-msgid "Wednesday"
-msgstr "Miércoles"
-
-#: src/alarm/interface.cc:133
-msgid "Thursday"
-msgstr "Jueves"
-
-#: src/alarm/interface.cc:133
-msgid "Friday"
-msgstr "Viernes"
-
-#: src/alarm/interface.cc:133
-msgid "Saturday"
-msgstr "Sábado"
-
-#: src/alarm/interface.cc:133
-msgid "Sunday"
-msgstr "Domingo"
-
-#: src/alarm/interface.cc:171 src/alarm/interface.cc:230
-#: src/alarm/interface.cc:245
-msgid "Time"
-msgstr "Tiempo"
-
-#: src/alarm/interface.cc:178
-msgid "Alarm at (default):"
-msgstr "Alarma a (predeterminado):"
-
-#: src/alarm/interface.cc:200
-msgid "h"
-msgstr "h"
-
-#: src/alarm/interface.cc:203
-msgid "Quiet after:"
-msgstr "Silencio tras:"
-
-#: src/alarm/interface.cc:215
-msgid "hours"
-msgstr "horas"
-
-#: src/alarm/interface.cc:226
-msgid "minutes"
-msgstr "minutos"
-
-#: src/alarm/interface.cc:235
-msgid "Choose the days for the alarm to come on"
-msgstr "Seleccione los días para que salte la alarma"
+#: src/adplug/adplug-xmms.cc:349 src/sid/xs_config.cc:61
+msgid "Output"
+msgstr "Salida"
 
-#: src/alarm/interface.cc:242
-msgid "Day"
-msgstr "Día"
+#: src/adplug/adplug-xmms.cc:350
+msgid "OPL Emulator:"
+msgstr "Emulador OPL:"
+
+#: src/adplug/adplug-xmms.cc:353 src/amidiplug/i_configure.cc:153
+#: src/console/plugin.cc:45 src/filewriter/filewriter.cc:481
+#: src/sid/xs_config.cc:65 src/xsf/plugin.cc:446
+msgid "Sample rate:"
+msgstr "Tasa de muestreo:"
 
-#: src/alarm/interface.cc:259 src/bs2b/plugin.cc:130
-#: src/skins/preset-list.cc:434 src/skins/preset-list.cc:440
-msgid "Default"
-msgstr "Predeterminado"
+#: src/adplug/adplug-xmms.cc:354 src/amidiplug/i_configure.cc:155
+#: src/bs2b/plugin.cc:141 src/console/plugin.cc:47
+#: src/modplug/plugin_main.cc:77 src/resample/resample.cc:201
+#: src/resample/resample.cc:207 src/resample/resample.cc:211
+#: src/resample/resample.cc:215 src/resample/resample.cc:219
+#: src/resample/resample.cc:223 src/resample/resample.cc:227
+#: src/resample/resample.cc:231 src/resample/resample.cc:235
+#: src/resample/resample.cc:239 src/resample/resample.cc:243
+#: src/sid/xs_config.cc:67 src/soxr/sox-resampler.cc:205
+msgid "Hz"
+msgstr "Hz"
 
-#: src/alarm/interface.cc:288
-msgid "Days"
-msgstr "Días"
-
-#: src/alarm/interface.cc:297
-msgid "Fading"
-msgstr "Transición"
-
-#: src/alarm/interface.cc:305 src/console/plugin.cc:41
-#: src/crossfade/crossfade.cc:53 src/crossfade/crossfade.cc:59
-#: src/gtkui/settings.cc:49 src/lirc/lirc.cc:397 src/sid/xs_config.cc:85
-#: src/sid/xs_config.cc:94 src/sid/xs_config.cc:103
-msgid "seconds"
-msgstr "segundos"
+#: src/adplug/adplug-xmms.cc:355 src/gtkui/settings.cc:55
+#: src/modplug/plugin_main.cc:105 src/qtui/settings.cc:85
+#: src/skins-qt/skins_cfg.cc:302 src/skins/skins_cfg.cc:284
+msgid "Miscellaneous"
+msgstr "Miscelánea"
 
-#: src/alarm/interface.cc:312 src/alarm/interface.cc:353
-msgid "Volume"
-msgstr "Volumen"
-
-#: src/alarm/interface.cc:317
-msgid "Start at"
-msgstr "Iniciar a"
-
-#: src/alarm/interface.cc:333
-msgid "Final"
-msgstr "Final"
-
-#: src/alarm/interface.cc:346
-msgid "Current"
-msgstr "Actual"
-
-#: src/alarm/interface.cc:359
-msgid "Additional Command"
-msgstr "Comando adicional"
-
-#: src/alarm/interface.cc:365 src/alarm/interface.cc:391
-msgid "enable"
-msgstr "activar"
-
-#: src/alarm/interface.cc:372
-msgid "Playlist (optional)"
-msgstr "Lista de reproducción (opcional)"
-
-#: src/alarm/interface.cc:379
-msgid "Select a playlist"
-msgstr "Seleccione una lista de reproducción"
-
-#: src/alarm/interface.cc:399
-msgid "Options"
-msgstr "Opciones"
-
-#: src/alarm/interface.cc:404
-msgid "What do these options mean?"
-msgstr "¿Qué significan estas opciones?"
-
-#: src/alarm/interface.cc:420
-msgid "Help"
-msgstr "Ayuda"
+#: src/adplug/adplug-xmms.cc:356
+msgid "Repeat song in endless loop"
+msgstr "Repetir la canción en un bucle sin fin"
 
-#: src/albumart/albumart.cc:31
+#: src/albumart/albumart.cc:31 src/albumart-qt/albumart.cc:35
 msgid "Album Art"
 msgstr "Carátula del álbum"
 
-#: src/albumart-qt/albumart.cc:33
-msgid "Album Art (Qt)"
-msgstr "Carátula del álbum (Qt)"
-
-#: src/alsa/alsa.h:70
+#: src/alsa/alsa.h:64
 msgid "ALSA Output"
 msgstr "Salida ALSA"
 
@@ -332,12 +109,12 @@
 "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 ""
-"Complemento «Salida ALSA» para Audacious\n"
+"Complemento Salida ALSA para Audacious\n"
 "Copyright 2009-2012 John Lindgren\n"
 "\n"
-"Quiero expresar mi agradecimiento a William Pitcock, autor del complemento "
-"«Salida ALSA NG», cuyo código me sirvió de referencia en esos momentos en "
-"los que el manual de ALSA no era suficiente."
+"Mi agradecimiento a William Pitcock, autor del complemento Salida ALSA NG, "
+"cuyo código me sirvió de referencia cuando el manual de ALSA no fue "
+"suficiente."
 
 #: src/alsa/config.cc:61
 msgid "(no description)"
@@ -345,11 +122,11 @@
 
 #: src/alsa/config.cc:166
 msgid "Default PCM device"
-msgstr "Dispositivo PCM predeterminado"
+msgstr "Dispositivo PCM por defecto"
 
 #: src/alsa/config.cc:188
 msgid "Default mixer device"
-msgstr "Dispositivo mezclador predeterminado"
+msgstr "Dispositivo mezclador por defecto"
 
 #: src/alsa/config.cc:296
 msgid "PCM device:"
@@ -361,13 +138,13 @@
 
 #: src/alsa/config.cc:302
 msgid "Mixer element:"
-msgstr "Elemento mezclador:"
+msgstr "Elemento del mezclador:"
 
-#: src/amidi-plug/amidi-plug.cc:41
+#: src/amidiplug/amidi-plug.cc:42
 msgid "AMIDI-Plug (MIDI Player)"
 msgstr "AMIDI-Plug (reproductor MIDI)"
 
-#: src/amidi-plug/amidi-plug.cc:437
+#: src/amidiplug/amidi-plug.cc:445
 msgid ""
 "AMIDI-Plug\n"
 "modular MIDI music player\n"
@@ -390,176 +167,180 @@
 "for the good help with alpha testing"
 msgstr ""
 "AMIDI-Plug\n"
-"reproductor de música MIDI\n"
+"Reproductor de música MIDI\n"
 "http://www.develia.org/projects.php?p=amidiplug\n"
 "\n"
-"escrito por Giacomo Lozito\n"
+"Escrito por Giacomo Lozito\n"
 "<james@develia.org>\n"
 "\n"
-"agradecimientos especiales...\n"
+"Agradecimientos especiales...\n"
 "\n"
-"a Clemens Ladisch y Jaroslav Kysela\n"
+"A Clemens Ladisch y Jaroslav Kysela\n"
 "por sus estupendos programas aplaymidi y amixer; \n"
 "me resultaron muy útiles, junto con la documentación\n"
-"de alsa-lib, para comprender mejor la API de ALSA\n"
+"de alsa-lib, para comprender mejor la API de ALSA.\n"
 "\n"
-"a Alfredo Spadafina\n"
-"por ese logo tan bonito de un teclado midi\n"
+"A Alfredo Spadafina\n"
+"por ese logo tan bonito de un teclado midi.\n"
 "\n"
-"a Tony Vroon\n"
-"por su inestimable ayuda probando la alfa"
+"A Tony Vroon\n"
+"por su inestimable ayuda probando las versiones alfa."
 
-#: src/amidi-plug/i_configure.cc:94
+#: src/amidiplug/i_configure.cc:94
 msgid "Override default gain:"
-msgstr "Ignorar ganancia predeterminada:"
+msgstr "Anular la ganancia por defecto:"
 
-#: src/amidi-plug/i_configure.cc:102
+#: src/amidiplug/i_configure.cc:102
 msgid "Override default polyphony:"
-msgstr "Ignorar polifonía predeterminada:"
+msgstr "Anular la polifonía por defecto:"
 
-#: src/amidi-plug/i_configure.cc:110
+#: src/amidiplug/i_configure.cc:110
 msgid "Override default reverb:"
-msgstr "Ignorar reverberación predeterminada:"
+msgstr "Anular la reverberación por defecto:"
 
-#: src/amidi-plug/i_configure.cc:112 src/amidi-plug/i_configure.cc:120
+#: src/amidiplug/i_configure.cc:112 src/amidiplug/i_configure.cc:120
 msgid "On"
-msgstr "Activado"
+msgstr "Activar"
 
-#: src/amidi-plug/i_configure.cc:118
+#: src/amidiplug/i_configure.cc:118
 msgid "Override default chorus:"
-msgstr "Ignorar coro predeterminado:"
+msgstr "Anular el coro por defecto:"
 
-#: src/amidi-plug/i_configure.cc:128 src/console/plugin.cc:29
+#: src/amidiplug/i_configure.cc:128 src/console/plugin.cc:29
 msgid "Playback"
 msgstr "Reproducción"
 
-#: src/amidi-plug/i_configure.cc:129
+#: src/amidiplug/i_configure.cc:129
 msgid "Transpose:"
 msgstr "Transponer:"
 
-#: src/amidi-plug/i_configure.cc:131
+#: src/amidiplug/i_configure.cc:131 src/speedpitch/speed-pitch.cc:257
 msgid "semitones"
 msgstr "semitonos"
 
-#: src/amidi-plug/i_configure.cc:132
+#: src/amidiplug/i_configure.cc:132
 msgid "Drum shift:"
-msgstr "Cambio de batería:"
+msgstr "Desplazamiento de la percusión:"
 
-#: src/amidi-plug/i_configure.cc:134
+#: src/amidiplug/i_configure.cc:134
 msgid "note numbers"
 msgstr "números de nota"
 
-#: src/amidi-plug/i_configure.cc:135
+#: src/amidiplug/i_configure.cc:135
 msgid "Skip leading silence"
-msgstr "Omitir silencio del principio"
+msgstr "Omitir el silencio inicial"
 
-#: src/amidi-plug/i_configure.cc:137
+#: src/amidiplug/i_configure.cc:137
 msgid "Skip trailing silence"
-msgstr "Omitir silencio del final"
+msgstr "Omitir el silencio final"
 
-#: src/amidi-plug/i_configure.cc:141
+#: src/amidiplug/i_configure.cc:141
 msgid "SoundFont"
 msgstr "SoundFont"
 
-#: src/amidi-plug/i_configure.cc:143
+#: src/amidiplug/i_configure.cc:148
 msgid "Synthesizer"
 msgstr "Sintetizador"
 
-#: src/amidi-plug/i_configure.cc:148 src/console/plugin.cc:45
-#: src/sid/xs_config.cc:65
-msgid "Sample rate:"
-msgstr "Frecuencia de muestreo:"
-
-#: src/amidi-plug/i_configure.cc:150 src/bs2b/plugin.cc:141
-#: src/console/plugin.cc:47 src/modplug/plugin_main.cc:78
-#: src/resample/resample.cc:201 src/resample/resample.cc:207
-#: src/resample/resample.cc:211 src/resample/resample.cc:215
-#: src/resample/resample.cc:219 src/resample/resample.cc:223
-#: src/resample/resample.cc:227 src/resample/resample.cc:231
-#: src/resample/resample.cc:235 src/resample/resample.cc:239
-#: src/resample/resample.cc:243 src/sid/xs_config.cc:67
-#: src/sox-resampler/sox-resampler.cc:163
-msgid "Hz"
-msgstr "Hz"
-
-#: src/amidi-plug/i_configure-fluidsynth.cc:52
+#: src/amidiplug/i_configure-fluidsynth.cc:58
+#: src/amidiplug/i_configure-fluidsynth.cc:527
 msgid "AMIDI-Plug - select SoundFont file"
-msgstr "Complemento AMIDI - seleccione un archivo SoundFont"
+msgstr "Complemento AMIDI - Seleccione un archivo SoundFont"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:55 src/filewriter/mp3.cc:658
+#: src/amidiplug/i_configure-fluidsynth.cc:61
 msgid "_Cancel"
 msgstr "_Cancelar"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:56
+#: src/amidiplug/i_configure-fluidsynth.cc:62
 msgid "_Open"
 msgstr "_Abrir"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:225 src/gtkui/columns.cc:46
+#: src/amidiplug/i_configure-fluidsynth.cc:233
+#: src/amidiplug/i_configure-fluidsynth.cc:461
 msgid "File name"
 msgstr "Nombre del archivo"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:229
+#: src/amidiplug/i_configure-fluidsynth.cc:237
+#: src/amidiplug/i_configure-fluidsynth.cc:464
 msgid "Size (bytes)"
 msgstr "Tamaño (bytes)"
 
-#: src/amidi-plug/i_fileinfo.cc:163
+#: src/amidiplug/i_fileinfo.cc:184
 msgid "Name:"
 msgstr "Nombre:"
 
-#: src/amidi-plug/i_fileinfo.cc:181
+#: src/amidiplug/i_fileinfo.cc:202
 msgid " MIDI Info "
 msgstr " Información MIDI "
 
-#: src/amidi-plug/i_fileinfo.cc:195
+#: src/amidiplug/i_fileinfo.cc:216
 msgid "Format:"
 msgstr "Formato:"
 
-#: src/amidi-plug/i_fileinfo.cc:198
+#: src/amidiplug/i_fileinfo.cc:219
 msgid "Length (msec):"
 msgstr "Longitud (mseg):"
 
-#: src/amidi-plug/i_fileinfo.cc:201
+#: src/amidiplug/i_fileinfo.cc:222
 msgid "No. of Tracks:"
 msgstr "Núm. de pistas:"
 
-#: src/amidi-plug/i_fileinfo.cc:207
+#: src/amidiplug/i_fileinfo.cc:228
 msgid "variable"
 msgstr "variable"
 
-#: src/amidi-plug/i_fileinfo.cc:209
+#: src/amidiplug/i_fileinfo.cc:230
 msgid "BPM:"
 msgstr "BPM:"
 
-#: src/amidi-plug/i_fileinfo.cc:217
+#: src/amidiplug/i_fileinfo.cc:238
 msgid "BPM (wavg):"
 msgstr "BPM (wavg):"
 
-#: src/amidi-plug/i_fileinfo.cc:220
+#: src/amidiplug/i_fileinfo.cc:241
 msgid "Time Div:"
 msgstr "Div tiempo:"
 
-#: src/amidi-plug/i_fileinfo.cc:231
+#: src/amidiplug/i_fileinfo.cc:252
 msgid " MIDI Comments and Lyrics "
 msgstr " Comentarios y letras MIDI "
 
-#: src/amidi-plug/i_fileinfo.cc:278
+#: src/amidiplug/i_fileinfo.cc:299
 msgid "* no comments available in this MIDI file *"
 msgstr "* no hay comentarios disponibles en este archivo MIDI *"
 
-#: src/amidi-plug/i_fileinfo.cc:290
+#: src/amidiplug/i_fileinfo.cc:311
 msgid "* no lyrics available in this MIDI file *"
 msgstr "* no hay letras disponibles en este archivo MIDI *"
 
-#: src/amidi-plug/i_fileinfo.cc:300 src/filewriter/vorbis.cc:197
-#: src/ladspa/plugin.cc:416
+#: src/amidiplug/i_fileinfo.cc:321 src/ladspa/plugin.cc:418
+#: src/ui-common/dialogs-qt.cc:32
 msgid "_Close"
 msgstr "_Cerrar"
 
-#: src/amidi-plug/i_fileinfo.cc:325
+#: src/amidiplug/i_fileinfo.cc:346
 msgid " (invalid UTF-8)"
 msgstr " (UTF-8 no válido)"
 
-#: src/aosd/aosd.cc:32
+#: src/ampache/ampache.cc:33
+msgid "Ampache Browser"
+msgstr "Navegador Ampache"
+
+#: src/ampache/ampache.cc:46
+msgid ""
+"Ampache Browser for Audacious\n"
+"http://ampache-browser.org/\n"
+"\n"
+"Copyright (C) Róbert Čerňanský and John Lindgren\n"
+"License: GNU GPLv3"
+msgstr ""
+"Navegador Ampache para Audacious\n"
+"http://ampache-browser.org/\n"
+"\n"
+"Copyright (C) Róbert Čerňanský and John Lindgren\n"
+"Licencia: GNU GPLv3"
+
+#: src/aosd/aosd.cc:31
 msgid ""
 "Audacious OSD\n"
 "http://www.develia.org/projects.php?p=audacious#aosd\n"
@@ -569,17 +350,17 @@
 "Based in part on Evan Martin's Ghosd library:\n"
 "http://neugierig.org/software/ghosd/"
 msgstr ""
-"Audacious OSD (información en pantalla)\n"
+"Visualización en pantalla (OSD) de Audacious\n"
 "http://www.develia.org/projects.php?p=audacious#aosd\n"
 "\n"
 "Escrito por Giacomo Lozito <james@develia.org>\n"
 "\n"
-"Basado parcialmente en la librería ghosd de Evan Martin:\n"
+"Basado parcialmente en la librería Ghosd de Evan Martin:\n"
 "http://neugierig.org/software/ghosd/"
 
 #: src/aosd/aosd.h:37
 msgid "AOSD (On-Screen Display)"
-msgstr "AOSD (información en pantalla)"
+msgstr "Visualización en pantalla (OSD) de Audacious"
 
 #: src/aosd/aosd_style.cc:54
 msgid "Rectangle"
@@ -593,196 +374,194 @@
 msgid "Concave Rectangle"
 msgstr "Rectángulo cóncavo"
 
-#: src/aosd/aosd_style.cc:69
+#: src/aosd/aosd_style.cc:69 src/openmpt/mptwrap.h:50 src/xsf/plugin.cc:436
 msgid "None"
 msgstr "Ninguno"
 
-#: src/aosd/aosd_trigger.cc:50
+#: src/aosd/aosd_trigger.cc:49
 msgid "Playback Start"
-msgstr "Inicio de reproducción"
+msgstr "Inicio de la reproducción"
 
-#: src/aosd/aosd_trigger.cc:51
+#: src/aosd/aosd_trigger.cc:50
 msgid "Triggers OSD when a playlist entry is played."
-msgstr "Avisa cuando se reproduce un elemento de la lista de reproducción."
+msgstr ""
+"Dispara la visualización en pantalla cuando se reproduce una entrada de la "
+"lista de reproducción."
 
-#: src/aosd/aosd_trigger.cc:56
+#: src/aosd/aosd_trigger.cc:55
 msgid "Title Change"
 msgstr "Cambio de título"
 
-#: src/aosd/aosd_trigger.cc:57
+#: src/aosd/aosd_trigger.cc:56
 msgid "Triggers OSD when the song title changes (for internet streams)."
 msgstr ""
-"Avisa cuando el título de la canción cambia (para flujos de audio de "
-"Internet)."
+"Dispara la visualización en pantalla cuando cambia el título de la canción "
+"(para transmisiones por internet)."
 
-#: src/aosd/aosd_trigger.cc:62
+#: src/aosd/aosd_trigger.cc:61
 msgid "Pause On"
-msgstr "Pausa"
+msgstr "En pausa"
 
-#: src/aosd/aosd_trigger.cc:63
+#: src/aosd/aosd_trigger.cc:62
 msgid "Triggers OSD when playback is paused."
-msgstr "Avisa cuando se pausa la reproducción."
+msgstr "Dispara la visualización en pantalla cuando se pausa la reproducción."
 
-#: src/aosd/aosd_trigger.cc:68
+#: src/aosd/aosd_trigger.cc:67
 msgid "Pause Off"
 msgstr "Fin de la pausa"
 
-#: src/aosd/aosd_trigger.cc:69
+#: src/aosd/aosd_trigger.cc:68
 msgid "Triggers OSD when playback is unpaused."
-msgstr "Avisa cuando se reanuda la reproducción."
+msgstr ""
+"Dispara la visualización en pantalla cuando se reanuda la reproducción."
 
-#: src/aosd/aosd_ui.cc:163
+#: src/aosd/aosd_ui.cc:204
 msgid "Placement"
-msgstr "Ubicación"
+msgstr "Colocación"
 
-#: src/aosd/aosd_ui.cc:196
+#: src/aosd/aosd_ui.cc:241
 msgid "Relative X offset:"
 msgstr "Desplazamiento horizontal relativo:"
 
-#: src/aosd/aosd_ui.cc:203
+#: src/aosd/aosd_ui.cc:245
 msgid "Relative Y offset:"
 msgstr "Desplazamiento vertical relativo:"
 
-#: src/aosd/aosd_ui.cc:210
+#: src/aosd/aosd_ui.cc:249
 msgid "Max OSD width:"
 msgstr "Anchura máxima:"
 
-#: src/aosd/aosd_ui.cc:221
+#: src/aosd/aosd_ui.cc:281
 msgid "Multi-Monitor options"
-msgstr "Opciones multimonitor"
+msgstr "Opciones para varios monitores"
 
-#: src/aosd/aosd_ui.cc:225
+#: src/aosd/aosd_ui.cc:285
 msgid "Display OSD using:"
-msgstr "Mostrar notificaciones utilizando:"
+msgstr "Mostrar las visualizaciones en pantalla usando:"
 
-#: src/aosd/aosd_ui.cc:227
+#: src/aosd/aosd_ui.cc:287
 msgid "all monitors"
 msgstr "todos los monitores"
 
-#: src/aosd/aosd_ui.cc:230
+#: src/aosd/aosd_ui.cc:290
 #, c-format
 msgid "monitor %i"
 msgstr "monitor %i"
 
-#: src/aosd/aosd_ui.cc:282
+#: src/aosd/aosd_ui.cc:342
 msgid "Timing (ms)"
-msgstr "Tiempo (ms)"
+msgstr "Tiempos (ms)"
 
-#: src/aosd/aosd_ui.cc:287
+#: src/aosd/aosd_ui.cc:347
 msgid "Display:"
-msgstr "Mostrar:"
+msgstr "Visualización:"
 
-#: src/aosd/aosd_ui.cc:292
+#: src/aosd/aosd_ui.cc:352
 msgid "Fade in:"
-msgstr "Aparición suave:"
+msgstr "Fundido de entrada:"
 
-#: src/aosd/aosd_ui.cc:297
+#: src/aosd/aosd_ui.cc:357
 msgid "Fade out:"
-msgstr "Desvanecimiento suave:"
+msgstr "Fundido de salida:"
 
-#: src/aosd/aosd_ui.cc:361
+#: src/aosd/aosd_ui.cc:442
 msgid "Fonts"
 msgstr "Tipografías"
 
-#: src/aosd/aosd_ui.cc:368
+#: src/aosd/aosd_ui.cc:449
 #, c-format
 msgid "Font %i:"
 msgstr "Tipografía %i:"
 
-#: src/aosd/aosd_ui.cc:382
+#: src/aosd/aosd_ui.cc:466
 msgid "Shadow"
 msgstr "Sombra"
 
-#: src/aosd/aosd_ui.cc:486
+#: src/aosd/aosd_ui.cc:589
 msgid "Render Style"
-msgstr "Estilo de renderizado"
+msgstr "Estilo de representación"
 
-#: src/aosd/aosd_ui.cc:502
+#: src/aosd/aosd_ui.cc:605
 msgid "Colors"
 msgstr "Colores"
 
-#: src/aosd/aosd_ui.cc:513
+#: src/aosd/aosd_ui.cc:616
 #, c-format
 msgid "Color %i:"
 msgstr "Color %i:"
 
-#: src/aosd/aosd_ui.cc:600
+#: src/aosd/aosd_ui.cc:714
 msgid "Enable trigger"
-msgstr "Activar disparador"
+msgstr "Activar el disparador"
 
-#: src/aosd/aosd_ui.cc:627
+#: src/aosd/aosd_ui.cc:741
 msgid "Event"
 msgstr "Evento"
 
-#: src/aosd/aosd_ui.cc:655
+#: src/aosd/aosd_ui.cc:768
 msgid "Composite manager detected"
 msgstr "Gestor de composición detectado"
 
-#: src/aosd/aosd_ui.cc:662
+#: src/aosd/aosd_ui.cc:775
 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 ""
-"Gestor de composición no detectado;\n"
-"por favor, a no ser que esté seguro de que ya hay uno ejecutándose, active "
-"un gestor de composición, o las notificaciones no funcionarán correctamente"
+"No se ha detectado ningún gestor de composición;\n"
+"a no ser que haya uno en ejecución, active un gestor de composición o la "
+"visualización en pantalla no funcionará correctamente"
 
-#: src/aosd/aosd_ui.cc:670
+#: src/aosd/aosd_ui.cc:783
 msgid "Composite manager not required for fake transparency"
-msgstr ""
-"No se necesita un gestor de composición para producir seudotransparencias"
+msgstr "No se necesita un gestor de composición para la transparencia simulada"
 
-#: src/aosd/aosd_ui.cc:706
+#: src/aosd/aosd_ui.cc:820
 msgid "Transparency"
 msgstr "Transparencia"
 
-#: src/aosd/aosd_ui.cc:712
+#: src/aosd/aosd_ui.cc:826
 msgid "Fake transparency"
-msgstr "Seudotransparencia"
+msgstr "Transparencia simulada"
 
-#: src/aosd/aosd_ui.cc:714
+#: src/aosd/aosd_ui.cc:828
 msgid "Real transparency (requires X Composite Ext.)"
-msgstr "Transparencia (requiere extensión de composición)"
+msgstr "Transparencia real (requiere la extensión de composición)"
 
-#: src/aosd/aosd_ui.cc:756
+#: src/aosd/aosd_ui.cc:875
 msgid "Composite extension not loaded"
-msgstr "Extensión de composición no cargada"
+msgstr "La extensión de composición no está cargada"
 
-#: src/aosd/aosd_ui.cc:764
-msgid "Composite extension not available"
-msgstr "Extensión de composición no disponible"
-
-#: src/aosd/aosd_ui.cc:781
+#: src/aosd/aosd_ui.cc:892
 #, c-format
 msgid "Audacious OSD"
-msgstr "Notificaciones de Audacious"
+msgstr "Visualización en pantalla de Audacious"
 
-#: src/aosd/aosd_ui.cc:844
+#: src/aosd/aosd_ui.cc:955
 msgid "Position"
 msgstr "Posición"
 
-#: src/aosd/aosd_ui.cc:849
+#: src/aosd/aosd_ui.cc:960
 msgid "Animation"
 msgstr "Animación"
 
-#: src/aosd/aosd_ui.cc:854
+#: src/aosd/aosd_ui.cc:965
 msgid "Text"
 msgstr "Texto"
 
-#: src/aosd/aosd_ui.cc:859
+#: src/aosd/aosd_ui.cc:970
 msgid "Decoration"
 msgstr "Decoración"
 
-#: src/aosd/aosd_ui.cc:864
+#: src/aosd/aosd_ui.cc:975
 msgid "Trigger"
 msgstr "Disparador"
 
-#: src/aosd/aosd_ui.cc:869
+#: src/aosd/aosd_ui.cc:980 src/streamtuner/shoutcast-model.cc:202
 msgid "Misc"
-msgstr "Varios"
+msgstr "Miscelánea"
 
-#: src/aosd/aosd_ui.cc:878
+#: src/aosd/aosd_ui.cc:989
 msgid "Test"
 msgstr "Probar"
 
@@ -798,22 +577,98 @@
 msgid "Audacious Playlists (audpl)"
 msgstr "Listas de reproducción de Audacious (audpl)"
 
-#: src/blur_scope/blur_scope.cc:42
+#: src/background_music/background_music.cc:24
+msgid "Background music"
+msgstr ""
+
+#: src/background_music/background_music.cc:25
+msgid "Target level:"
+msgstr ""
+
+#: src/background_music/background_music.cc:28
+#: src/background_music/background_music.cc:33
+#: src/silence-removal/silence-removal.cc:70
+msgid "dB"
+msgstr "dB"
+
+#: src/background_music/background_music.cc:29
+msgid "Maximum amplification:"
+msgstr ""
+
+#: src/background_music/background_music.cc:34 src/mpg123/mpg123.cc:81
+msgid "Advanced"
+msgstr "Avanzados"
+
+#: src/background_music/background_music.cc:36
+msgid "Slow detection weight:"
+msgstr ""
+
+#: src/background_music/background_music.cc:39
+msgid "Hint"
+msgstr ""
+
+#: src/background_music/background_music.cc:41
+msgid ""
+"Slow detection weight is the relative weight\n"
+"of a long term average detection when compared\n"
+"to the actual, faster loudness detection.\n"
+"A value of zero gives a more radio-like sound\n"
+"where soft passages get \"pulled up\" more quickly,\n"
+"a value of two makes the sound feel less compressed."
+msgstr ""
+
+#: src/background_music/background_music.cc:52
+msgid ""
+"Background Music Plugin for Audacious\n"
+"Copyright 2023;2024 Michel Fleur\n"
+"\n"
+"Controls the volume to make the sound equally loud within and between "
+"tracks.\n"
+" It uses accurate loudness measurement and tries to make the volume changes "
+"sound natural without audible peaks, yet without lowering the volume before "
+"a peak in advance."
+msgstr ""
+
+#: src/background_music/background_music.cc:61
+msgid "Background Music"
+msgstr ""
+
+#: src/bitcrusher/bitcrusher.cc:33
+msgid "Bitcrusher"
+msgstr "Bitcrusher"
+
+#: src/bitcrusher/bitcrusher.cc:34
+msgid "Bit Depth:"
+msgstr "Profundidad de bits:"
+
+#: src/bitcrusher/bitcrusher.cc:37
+msgid "Downsample ratio:"
+msgstr "Tasa de reducción de la muestra:"
+
+#: src/bitcrusher/bitcrusher.cc:48
+msgid "Bitcrusher"
+msgstr "Bitcrusher"
+
+#: src/blur_scope/blur_scope.cc:40 src/blur_scope-qt/blur_scope.cc:45
 msgid "Color"
 msgstr "Color"
 
-#: src/blur_scope/blur_scope.cc:58
+#: src/blur_scope/blur_scope.cc:56 src/blur_scope-qt/blur_scope.cc:158
 msgid "Blur Scope"
-msgstr "Borroso"
+msgstr "Osciloscopio difuminado"
 
 #: src/bs2b/plugin.cc:38
 msgid "Bauer Stereophonic-to-Binaural (BS2B)"
-msgstr "Conversor Bauer de estéreo a binaural(BS2B)"
+msgstr "Conversor Bauer de estéreo a binaural (BS2B)"
 
 #: src/bs2b/plugin.cc:129
 msgid "Presets:"
 msgstr "Preajustes:"
 
+#: src/bs2b/plugin.cc:130
+msgid "Default"
+msgstr "Por defecto"
+
 #: src/bs2b/plugin.cc:136
 msgid "Feed level:"
 msgstr "Nivel de alimentación:"
@@ -826,15 +681,15 @@
 msgid "Cut frequency:"
 msgstr "Frecuencia de corte:"
 
-#: src/cairo-spectrum/cairo-spectrum.cc:41
+#: src/cairo-spectrum/cairo-spectrum.cc:42 src/qt-spectrum/qt-spectrum.cc:107
 msgid "Spectrum Analyzer"
 msgstr "Analizador de espectro"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:72
+#: src/cdaudio/cdaudio-ng.cc:74
 msgid "Audio CD Plugin"
-msgstr "Complemento de Audio CD"
+msgstr "Complemento CD de audio"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:121
+#: src/cdaudio/cdaudio-ng.cc:121
 msgid ""
 "Copyright (C) 2007-2012 Calin Crisan <ccrisan@gmail.com> and others.\n"
 "\n"
@@ -847,140 +702,140 @@
 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/>\n"
+"Muchas gracias a los desarrolladores de:\n"
+"libcdio <http://www.gnu.org/software/libcdio/>\n"
 "y libcddb <http://libcddb.sourceforge.net/>.\n"
 "\n"
-"También quiero dar las gracias a Tony Vroon por ser mi mentor y mi guía.\n"
+"Gracias también a Tony Vroon por ser mi mentor y mi guía.\n"
 "\n"
-"Este fue un proyecto del «Google Summer of Code» de 2007."
+"Este fue un proyecto del Google Summer of Code de 2007."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:137
+#: src/cdaudio/cdaudio-ng.cc:140
 msgid "Device"
 msgstr "Dispositivo"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:138
+#: src/cdaudio/cdaudio-ng.cc:141
 msgid "Read speed:"
 msgstr "Velocidad de lectura:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:141
+#: src/cdaudio/cdaudio-ng.cc:144
 msgid "Override device:"
-msgstr "Reemplazar dispositivo:"
+msgstr "Anular el dispositivo:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:143
+#: src/cdaudio/cdaudio-ng.cc:146
 msgid "Metadata"
 msgstr "Metadatos"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:144
+#: src/cdaudio/cdaudio-ng.cc:147
 msgid "Use CD-Text"
-msgstr "Utilizar CD-Text"
+msgstr "Usar CD-Text"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:146
+#: src/cdaudio/cdaudio-ng.cc:150
 msgid "Use CDDB"
-msgstr "Usar CDDB"
+msgstr "Usar la CDDB"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:148
+#: src/cdaudio/cdaudio-ng.cc:152
 msgid "Use HTTP instead of CDDBP"
-msgstr "Usar HTTP en lugar de CDDBP"
+msgstr "Usar HTTP en vez de CDDBP"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:151
+#: src/cdaudio/cdaudio-ng.cc:155
 msgid "Server:"
-msgstr "Servidor"
+msgstr "Servidor:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:155
+#: src/cdaudio/cdaudio-ng.cc:159
 msgid "Path:"
 msgstr "Dirección:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:159
+#: src/cdaudio/cdaudio-ng.cc:163
 msgid "Port:"
 msgstr "Puerto:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:246
+#: src/cdaudio/cdaudio-ng.cc:228
 msgid "Failed to initialize cdio subsystem."
-msgstr "No se pudo iniciar el subsistema cdio."
+msgstr "No se ha podido iniciar el subsistema cdio."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:281
+#: src/cdaudio/cdaudio-ng.cc:260
 #, c-format
 msgid "Invalid URI %s."
-msgstr "URI %s no válido."
+msgstr "El URI %s no es válido."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:283
+#: src/cdaudio/cdaudio-ng.cc:262
 #, c-format
 msgid "Track %d not found."
-msgstr "Pista %d no encontrada."
+msgstr "No se ha encontrado la pista %d."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:285
+#: src/cdaudio/cdaudio-ng.cc:264
 #, c-format
 msgid "Track %d is a data track."
 msgstr "La pista %d es una pista de datos."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:360
+#: src/cdaudio/cdaudio-ng.cc:339
 msgid "Error reading audio CD."
 msgstr "Error al leer el CD de audio."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:429
+#: src/cdaudio/cdaudio-ng.cc:410
 msgid "Audio CD"
 msgstr "CD de audio"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:460 src/cdaudio-ng/cdaudio-ng.cc:469
+#: src/cdaudio/cdaudio-ng.cc:446 src/cdaudio/cdaudio-ng.cc:455
 #, c-format
 msgid "Failed to open CD device %s."
-msgstr "No se pudo abrir el dispositivo de CD %s."
+msgstr "No se podido abrir el dispositivo de CD %s."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:472
+#: src/cdaudio/cdaudio-ng.cc:458
 msgid "No audio capable CD drive found."
-msgstr "No se encontró ningún lector compatible con CDs de audio."
+msgstr "No se ha encontrado ningún CD de audio."
+
+#: src/cdaudio/cdaudio-ng.cc:481
+msgid "Drive is empty."
+msgstr "La unidad está vacía."
+
+#: src/cdaudio/cdaudio-ng.cc:483
+msgid "Unsupported disk type."
+msgstr "Tipo de disco no compatible."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:497
+#: src/cdaudio/cdaudio-ng.cc:507
 msgid "Failed to finish initializing opened CD drive."
-msgstr "Ocurrió un error tratando de iniciar el lector de CDs."
+msgstr "No se ha podido terminar de inicializar la unidad de CD abierta."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:510
+#: src/cdaudio/cdaudio-ng.cc:520
 msgid "Failed to retrieve first/last track number."
-msgstr "No se pudo recuperar el número de la primera/última pista."
+msgstr "No se ha podido obener el número de la primera/última pista."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:531
+#: src/cdaudio/cdaudio-ng.cc:541
 #, c-format
 msgid "Cannot read start/end LSN for track %d."
 msgstr "No se puede leer el LSN de inicio/fin de la pista %d."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:613
-msgid "Failed to create the cddb connection."
-msgstr "Error de establecimiento de conexión con el servidor CDDB."
+#: src/cdaudio/cdaudio-ng.cc:624
+msgid "Failed to create the CDDB connection."
+msgstr "No se ha podido crear la conexión a la CDDB."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:679
+#: src/cdaudio/cdaudio-ng.cc:690
 msgid "Failed to query the CDDB server"
-msgstr "Error de consulta al servidor CDDB"
+msgstr "No se ha podido consultar al servidor de CDDB"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:681
+#: src/cdaudio/cdaudio-ng.cc:692
 #, c-format
 msgid "Failed to query the CDDB server: %s"
-msgstr "Error de consulta al servidor CDDB: %s"
+msgstr "No se ha podido consultar al servidor de la CDDB: %s"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:705
+#: src/cdaudio/cdaudio-ng.cc:716
 #, c-format
-msgid "Failed to read the cddb info: %s"
-msgstr "Error de lectura de información de la CDDB: %s"
+msgid "Failed to read the CDDB info: %s"
+msgstr "No se ha podido leer la información de la CDDB: %s"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:765
-msgid "Drive is empty."
-msgstr "La unidad está vacía."
-
-#: src/cdaudio-ng/cdaudio-ng.cc:767
-msgid "Unsupported disk type."
-msgstr "Tipo de disco no soportado."
-
-#: src/cd-menu-items/cd-menu-items.cc:35
+#: src/cd-menu-items/cd-menu-items.cc:33
 msgid "Audio CD Menu Items"
-msgstr "Ítems de menú de CD de audio"
+msgstr "Elementos de menú para CD de audio"
 
-#: src/cd-menu-items/cd-menu-items.cc:47
-msgid "Play CD"
-msgstr "Reproducir CD"
-
-#: src/cd-menu-items/cd-menu-items.cc:47
-msgid "Add CD"
-msgstr "Añadir CD"
+#: src/cd-menu-items/cd-menu-items.cc:45
+msgid "Pla_y CD"
+msgstr "_Reproducir CD"
+
+#: src/cd-menu-items/cd-menu-items.cc:45
+msgid "_Add CD"
+msgstr "_Añadir CD"
 
 #: src/compressor/compressor.cc:45
 msgid "Compression"
@@ -988,7 +843,7 @@
 
 #: src/compressor/compressor.cc:46
 msgid "Center volume:"
-msgstr "Centrar volumen:"
+msgstr "Volumen central:"
 
 #: src/compressor/compressor.cc:49
 msgid "Dynamic range:"
@@ -999,7 +854,7 @@
 "Dynamic Range Compression Plugin for Audacious\n"
 "Copyright 2010-2014 John Lindgren"
 msgstr ""
-"Complemento «Compresor de rango dinámico» para Audacious\n"
+"Complemento Compresor de rango dinámico para Audacious\n"
 "Copyright 2010-2014 John Lindgren"
 
 #: src/compressor/compressor.cc:64
@@ -1016,7 +871,9 @@
 "Shay Green <gblargg@gmail.com>"
 msgstr ""
 "Descodificador de música de videoconsola basado en Game_Music_Emu 0.5.2\n"
-"Formatos soportados: AY, GBS, GYM, HES, KSS, NSF, NSFE, SAP, SPC, VGM, VGZ\n"
+"\n"
+"Formatos compatibles: AY, GBS, GYM, HES, KSS, NSF, NSFE, SAP, SPC, VGM, "
+"VGZ.\n"
 "\n"
 "Complemento para Audacious escrito por:\n"
 "William Pitcock <nenolod@dereferenced.org>\n"
@@ -1036,15 +893,22 @@
 
 #: src/console/plugin.cc:39
 msgid "Default song length:"
-msgstr "Duración predeterminada de canción:"
+msgstr "Duración por defecto de la canción:"
 
-#: src/console/plugin.cc:42 src/modplug/plugin_main.cc:59
+#: src/console/plugin.cc:41 src/crossfade/crossfade.cc:56
+#: src/crossfade/crossfade.cc:62 src/lirc/lirc.cc:395 src/notify/notify.cc:113
+#: src/sid/xs_config.cc:85 src/sid/xs_config.cc:94 src/sid/xs_config.cc:103
+#: src/vumeter-qt/vumeter_qt.cc:39
+msgid "seconds"
+msgstr "segundos"
+
+#: src/console/plugin.cc:42 src/modplug/plugin_main.cc:58
 msgid "Resampling"
 msgstr "Remuestreo"
 
 #: src/console/plugin.cc:43
 msgid "Enable audio resampling"
-msgstr "Activar el remuestreo de sonido"
+msgstr "Activar el remuestreo del audio"
 
 #: src/console/plugin.cc:49
 msgid "SPC"
@@ -1052,7 +916,7 @@
 
 #: src/console/plugin.cc:50
 msgid "Ignore length from SPC tags"
-msgstr "Ignorar longitud de etiquetas SPC"
+msgstr "Ignorar la longitud indicada en las etiquetas SPC"
 
 #: src/console/plugin.cc:52
 msgid "Increase reverb"
@@ -1062,86 +926,94 @@
 msgid "Game Console Music Decoder"
 msgstr "Descodificador de música de videoconsola"
 
-#: src/coreaudio/coreaudio.cc:50
+#: src/coreaudio/coreaudio.cc:53
 msgid "CoreAudio output"
-msgstr "Salida Core Audio"
+msgstr "Salida CoreAudio"
 
-#: src/coreaudio/coreaudio.cc:131
+#: src/coreaudio/coreaudio.cc:155
 msgid ""
 "CoreAudio Output Plugin for Audacious\n"
 "Copyright 2014 William Pitcock\n"
+"Copyright 2017,18 René J.V. Bertin\n"
+" (original code and code adapted from\n"
+" Apple examples, (C) Apple 2013)\n"
 "\n"
 "Based on SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
 msgstr ""
-"Complemento «Salida Core Audio» para Audacious\n"
+"Complemento Salida CoreAudio para Audacious\n"
 "Copyright 2014 William Pitcock\n"
+"Copyright 2017-18 René J. V. Bertin\n"
+" (código original y código adaptado de\n"
+" Apple, copyright Apple 2013)\n"
 "\n"
-"Basado en el complemento «Salida SDL» para Audacious\n"
+"Basado en el complemento Salida SDL para Audacious\n"
 "Copyright 2010 John Lindgren"
 
-#: src/coreaudio/coreaudio.cc:143
+#: src/coreaudio/coreaudio.cc:171
 msgid "Use exclusive mode"
-msgstr "Usar modo exclusivo"
+msgstr "Usar el modo exclusivo"
+
+#: src/coreaudio/coreaudio.cc:173
+msgid "Use bit perfect audio (adapt device sampling rate)"
+msgstr ""
+"Usar un audio perfecto en bits (adaptar la tasa de muestreo del dispositivo)"
 
-#: src/crossfade/crossfade.cc:44
+#: src/crossfade/crossfade.cc:47
 msgid ""
 "Crossfade Plugin for Audacious\n"
 "Copyright 2010-2014 John Lindgren"
 msgstr ""
-"Complemento «Fundido de audio» para Audacious\n"
+"Complemento Fundido cruzado para Audacious\n"
 "Copyright 2010-2014 John Lindgren"
 
-#: src/crossfade/crossfade.cc:48
+#: src/crossfade/crossfade.cc:51
 msgid "Crossfade"
-msgstr "Fundido de audio"
+msgstr "Fundido cruzado"
 
-#: src/crossfade/crossfade.cc:49
+#: src/crossfade/crossfade.cc:52
 msgid "On automatic song change"
-msgstr "En cambio de pista automático"
+msgstr "En el cambio de canción automático "
 
-#: src/crossfade/crossfade.cc:51 src/crossfade/crossfade.cc:57
+#: src/crossfade/crossfade.cc:54 src/crossfade/crossfade.cc:60
 msgid "Overlap:"
 msgstr "Solapar:"
 
-#: src/crossfade/crossfade.cc:55
+#: src/crossfade/crossfade.cc:58
 msgid "On seek or manual song change"
-msgstr "En búsqueda o cambio de pista manual"
+msgstr "En la búsqueda o el cambio de canción manual"
 
-#: src/crossfade/crossfade.cc:61
+#: src/crossfade/crossfade.cc:64
+msgid "No fade in"
+msgstr ""
+
+#: src/crossfade/crossfade.cc:66
+msgid "Use S-curve fade"
+msgstr ""
+
+#: src/crossfade/crossfade.cc:68
+msgid "S-curve steepness:"
+msgstr ""
+
+#: src/crossfade/crossfade.cc:70
+msgid "(higher is steeper)"
+msgstr ""
+
+#: src/crossfade/crossfade.cc:72
 msgid "Tip"
 msgstr "Consejo"
 
-#: src/crossfade/crossfade.cc:62
+#: src/crossfade/crossfade.cc:73
 msgid ""
 "For better crossfading, enable\n"
 "the Silence Removal effect."
 msgstr ""
-"Para obtener mejores resultados, active\n"
-"el efecto «Eliminación de silencios»."
+"Para obtener un mejor resultado, active\n"
+"el efecto de eliminación de silencios."
 
-#: src/crossfade/crossfade.cc:72
+#: src/crossfade/crossfade.cc:83
 msgid "Crossfade"
-msgstr "Fundido de audio"
-
-#: src/crossfade/crossfade.cc:161
-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 ""
-"Fundido de audio fallido: las pistas no tienen el mismo número de canales. "
-"Puede usar el «Mezclador de canales» para igualar el número de canales de "
-"las pistas."
-
-#: src/crossfade/crossfade.cc:168
-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 ""
-"Fundido de audio fallido: las pistas tienen distintas frecuencias de "
-"muestreo. Puede usar el «Convertidor de frecuencia de muestreo» para igualar "
-"la frecuencia de muestreo de las pistas."
+msgstr "Fundido cruzado"
 
 #: src/crystalizer/crystalizer.cc:31
 msgid "Crystalizer"
@@ -1155,62 +1027,63 @@
 msgid "Crystalizer"
 msgstr "Cristalizador"
 
-#: src/cue/cue.cc:37
+#: src/cue/cue.cc:42
 msgid "Cue Sheet Plugin"
-msgstr "Complemento «Hojas cue»"
+msgstr "Complemento Hojas cue"
 
-#: src/delete-files/delete-files.cc:46 src/delete-files/delete-files.cc:146
+#: src/delete-files/delete-files.cc:53 src/delete-files/delete-files.cc:215
+#: src/delete-files/delete-files.cc:230
 msgid "Delete Files"
-msgstr "Borrar archivos"
+msgstr "Eliminar archivos"
+
+#: src/delete-files/delete-files.cc:120
+msgid "No files are selected."
+msgstr "No se ha seleccionado ningún archivo."
 
-#: src/delete-files/delete-files.cc:75
+#: src/delete-files/delete-files.cc:125
 #, c-format
-msgid "Error moving %s to trash: %s."
-msgstr "Error moviendo %s a la papelera: %s."
+msgid "Do you want to move %s to the trash?"
+msgstr "¿Quiere mover %s a la papelera?"
 
-#: src/delete-files/delete-files.cc:86
+#: src/delete-files/delete-files.cc:126
 #, c-format
-msgid "Error deleting %s: %s."
-msgstr "Error borrando %s: %s."
+msgid "Do you want to permanently delete %s?"
+msgstr "¿Quiere eliminar permanentemente %s?"
 
-#: src/delete-files/delete-files.cc:117
+#: src/delete-files/delete-files.cc:133
 #, c-format
-msgid "Error deleting %s: not a local file."
-msgstr "Error borrando %s: no es un archivo local."
+msgid "Do you want to move %d files to the trash?"
+msgstr "¿Quiere mover %d archivos a la papelera?"
 
 #: src/delete-files/delete-files.cc:134
-msgid "Do you want to move the selected files to the trash?"
-msgstr "¿Quiere mover los archivos seleccionados a la papelera?"
+#, c-format
+msgid "Do you want to permanently delete %d files?"
+msgstr "¿Quiere eliminar permanentemente %d archivos?"
 
-#: src/delete-files/delete-files.cc:135
-msgid "Move to Trash"
+#: src/delete-files/delete-files.cc:146
+msgid "Move to trash"
 msgstr "Mover a la papelera"
 
-#: src/delete-files/delete-files.cc:140
-msgid "Do you want to permanently delete the selected files?"
-msgstr "¿Quiere borrar de forma permanente los archivos seleccionados?"
-
-#: src/delete-files/delete-files.cc:141 src/skins/preset-list.cc:411
-#: src/skins/preset-list.cc:427
+#: src/delete-files/delete-files.cc:146
 msgid "Delete"
-msgstr "Borrar"
+msgstr "Eliminar"
 
-#: src/delete-files/delete-files.cc:145 src/skins/preset-browser.cc:56
-#: src/skins/preset-list.cc:307 src/skins/ui_playlist.cc:221
+#: src/delete-files/delete-files.cc:213 src/delete-files/delete-files.cc:235
+#: src/skins-qt/search-select.cc:102 src/skins/search-select.cc:78
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: src/delete-files/delete-files.cc:166
+#: src/delete-files/delete-files.cc:267
 msgid "Delete Selected Files"
-msgstr "Borrar archivos seleccionados"
+msgstr "Eliminar archivos seleccionados"
 
-#: src/delete-files/delete-files.cc:181
+#: src/delete-files/delete-files.cc:287
 msgid "Delete Method"
-msgstr "Método de borrado"
+msgstr "Método de eliminación"
 
-#: src/delete-files/delete-files.cc:182
+#: src/delete-files/delete-files.cc:288
 msgid "Move to trash instead of deleting immediately"
-msgstr "Mover a la papelera en vez de borrar inmediatamente"
+msgstr "Mover a la papelera en vez de eliminar inmediatamente"
 
 #: src/echo_plugin/echo.cc:9
 msgid ""
@@ -1219,22 +1092,21 @@
 "Surround echo by Carl van Schaik, 1999\n"
 "Updated for Audacious by William Pitcock and John Lindgren, 2010-2014"
 msgstr ""
-"Complemento «Eco»\n"
-"Creado por Johan Levin, 1999\n"
-"«Eco envolvente» escrito por Carl van Schaik, 1999\n"
-"Actualizado para Audacious por William Pitcock y John Lindgren, 2010-2014"
+"Complemento Eco por Johan Levin, 1999.\n"
+"Eco envolvente por Carl van Schaik, 1999.\n"
+"Actualizado para Audacious por William Pitcock y John Lindgren, 2010-2014."
 
 #: src/echo_plugin/echo.cc:21
 msgid "Echo"
 msgstr "Eco"
 
-#: src/echo_plugin/echo.cc:22 src/modplug/plugin_main.cc:73
-#: src/modplug/plugin_main.cc:83
+#: src/echo_plugin/echo.cc:22 src/modplug/plugin_main.cc:72
+#: src/modplug/plugin_main.cc:82
 msgid "Delay:"
 msgstr "Retraso:"
 
-#: src/echo_plugin/echo.cc:24 src/modplug/plugin_main.cc:73
-#: src/modplug/plugin_main.cc:83
+#: src/echo_plugin/echo.cc:24 src/modplug/plugin_main.cc:72
+#: src/modplug/plugin_main.cc:82 src/xsf/plugin.cc:445
 msgid "ms"
 msgstr "ms"
 
@@ -1242,7 +1114,7 @@
 msgid "Feedback:"
 msgstr "Retorno:"
 
-#: src/echo_plugin/echo.cc:28 src/modplug/plugin_main.cc:87
+#: src/echo_plugin/echo.cc:28 src/modplug/plugin_main.cc:86
 msgid "Volume:"
 msgstr "Volumen:"
 
@@ -1250,11 +1122,11 @@
 msgid "Echo"
 msgstr "Eco"
 
-#: src/ffaudio/ffaudio-core.cc:41
+#: src/ffaudio/ffaudio-core.cc:50
 msgid "FFmpeg Plugin"
-msgstr "Complemento de FFmpeg"
+msgstr "Complemento FFmpeg"
 
-#: src/ffaudio/ffaudio-core.cc:571
+#: src/ffaudio/ffaudio-core.cc:649
 msgid ""
 "Multi-format audio decoding plugin for Audacious using\n"
 "FFmpeg multimedia framework (http://www.ffmpeg.org/)\n"
@@ -1263,258 +1135,329 @@
 "William Pitcock <nenolod@nenolod.net>\n"
 "Matti Hämäläinen <ccr@tnsp.org>"
 msgstr ""
-"Complemento descodificador de múltiples formatos de audio,\n"
-"usando el framework multimedia FFmpeg (http://www.ffmpeg.org/)\n"
+"Complemento de descodificación de Audacious\n"
+"para múltiples formatos de audio que usa el marco de\n"
+"trabajo multimedia FFmpeg (http://www.ffmpeg.org/)\n"
 "\n"
 "Complemento para Audacious creado por:\n"
 "William Pitcock <nenolod@nenolod.net>\n"
 "Matti Hämäläinen <ccr@tnsp.org>"
 
-#: src/filewriter/filewriter.cc:45
+#: src/filewriter/filewriter.cc:48
 msgid "FileWriter Plugin"
-msgstr "Escribir archivo"
+msgstr "Salida FileWriter"
 
-#: src/filewriter/filewriter.cc:386
+#: src/filewriter/filewriter.cc:316
+#, c-format
+msgid ""
+"Error opening %s:\n"
+"%s"
+msgstr ""
+"Error al abrir %s:\n"
+"%s"
+
+#: src/filewriter/filewriter.cc:358
+msgid ""
+"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 ""
+"Este programa es software libre: puede redistribuirlo y/o modificarlo bajo "
+"los términos de la Licencia Pública General de GNU publicada por la Free "
+"Software Foundation; ya sea la versión 2 de la Licencia o (a su elección) "
+"cualquier versión posterior.\n"
+"\n"
+"Este programa se distribuye con la esperanza de que sea útil, pero SIN "
+"NINGUNA GARANTÍA; ni siquiera la garantía implícita de COMERCIALIZACIÓN o "
+"IDONEIDAD PARA UN PROPÓSITO PARTICULAR. Consulte la Licencia Pública General "
+"de GNU para obtener más detalles.\n"
+"\n"
+"Debería haber recibido una copia de la Licencia Pública General de GNU junto "
+"con este programa. Si no es así, escriba a la Free Software Foundation, "
+"Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
+
+#: src/filewriter/filewriter.cc:385
 msgid "Output file format:"
 msgstr "Formato del archivo de salida:"
 
-#: src/filewriter/filewriter.cc:403
-msgid "Configure"
-msgstr "Configurar"
-
-#: src/filewriter/filewriter.cc:413
+#: src/filewriter/filewriter.cc:389
 msgid "Save into original directory"
-msgstr "Guardar dentro del directorio original"
+msgstr "Guardar en la carpeta original"
 
-#: src/filewriter/filewriter.cc:417
-msgid "Save into custom directory"
-msgstr "Guardar dentro de directorio personalizado"
-
-#: src/filewriter/filewriter.cc:427
-msgid "Output file folder:"
-msgstr "Carpeta de archivo de salida:"
-
-#: src/filewriter/filewriter.cc:431
-msgid "Pick a folder"
-msgstr "Elija una carpeta"
+#: src/filewriter/filewriter.cc:392
+msgid "Save into custom directory:"
+msgstr "Guardar en otra carpeta:"
 
-#: src/filewriter/filewriter.cc:444
+#: src/filewriter/filewriter.cc:400
 msgid "Generate file name from:"
-msgstr "Generar nombre a partir de:"
+msgstr "Generar el nombre del archivo a partir de:"
 
-#: src/filewriter/filewriter.cc:448
-msgid "Original file tag"
-msgstr "Etiqueta del archivo original"
-
-#: src/filewriter/filewriter.cc:453
+#: src/filewriter/filewriter.cc:401
 msgid "Original file name"
 msgstr "Nombre del archivo original"
 
-#: src/filewriter/filewriter.cc:459
-msgid "Include original file name extension"
-msgstr "Incluir la extensión del archivo original"
+#: src/filewriter/filewriter.cc:404
+msgid "Original file name (no suffix)"
+msgstr "Nombre del archivo original (sin sufijo)"
 
-#: src/filewriter/filewriter.cc:468
-msgid "Prepend track number to file name"
-msgstr "Anteponer el nº de pista al nombre del archivo"
+#: src/filewriter/filewriter.cc:407
+msgid "Original file tag"
+msgstr "Etiqueta del archivo original"
 
-#: src/filewriter/filewriter.cc:484
-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 ""
-"Este programa es software libre: usted puede redistribuirlo y/o modificarlo\n"
-"bajo los términos de la Licencia Pública General GNU, publicada por\n"
-"la «Free Software Foundation» (Fundación para el software libre), ya\n"
-"sea la versión 2 de la Licencia, o (a su elección) cualquier versión "
-"posterior. \n"
-"\n"
-"Este programa se distribuye con la esperanza de que sea útil,\n"
-"pero SIN GARANTÍA ALGUNA; ni siquiera la garantía implícita de\n"
-"COMERCIALIZACIÓN o IDONEIDAD PARA UN PROPÓSITO DETERMINADO. Consulte los\n"
-"detalles de la Licencia Pública General GNU para obtener una información más "
-"detallada.\n"
-"\n"
-"Debería haber recibido una copia de la Licencia Pública General GNU\n"
-"junto a este programa. En caso contrario, escriba a Free Software\n"
-"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
-"USA."
+#: src/filewriter/filewriter.cc:411
+msgid "Prepend track number to file name"
+msgstr "Anteponer el número de pista al nombre del archivo"
 
-#: src/filewriter/mp3.cc:40 src/filewriter/mp3.cc:717
+#: src/filewriter/filewriter.cc:417 src/filewriter/filewriter.cc:449
 msgid "Auto"
 msgstr "Auto"
 
-#: src/filewriter/mp3.cc:40
+#: src/filewriter/filewriter.cc:418
+msgid "8000 Hz"
+msgstr "8000 Hz"
+
+#: src/filewriter/filewriter.cc:419
+msgid "11025 Hz"
+msgstr "11025 Hz"
+
+#: src/filewriter/filewriter.cc:420
+msgid "12000 Hz"
+msgstr "12000 Hz"
+
+#: src/filewriter/filewriter.cc:421
+msgid "16000 Hz"
+msgstr "16000 Hz"
+
+#: src/filewriter/filewriter.cc:422
+msgid "22050 Hz"
+msgstr "22050 Hz"
+
+#: src/filewriter/filewriter.cc:423
+msgid "24000 Hz"
+msgstr "24000 Hz"
+
+#: src/filewriter/filewriter.cc:424
+msgid "32000 Hz"
+msgstr "32000 Hz"
+
+#: src/filewriter/filewriter.cc:425 src/xsf/plugin.cc:430
+msgid "44100 Hz"
+msgstr "44100 Hz"
+
+#: src/filewriter/filewriter.cc:426 src/xsf/plugin.cc:431
+msgid "48000 Hz"
+msgstr "48000 Hz"
+
+#: src/filewriter/filewriter.cc:430
+msgid "8 kbit/s"
+msgstr "8 kbit/s"
+
+#: src/filewriter/filewriter.cc:431
+msgid "16 kbit/s"
+msgstr "16 kbit/s"
+
+#: src/filewriter/filewriter.cc:432
+msgid "32 kbit/s"
+msgstr "32 kbit/s"
+
+#: src/filewriter/filewriter.cc:433
+msgid "40 kbit/s"
+msgstr "40 kbit/s"
+
+#: src/filewriter/filewriter.cc:434
+msgid "48 kbit/s"
+msgstr "48 kbit/s"
+
+#: src/filewriter/filewriter.cc:435
+msgid "56 kbit/s"
+msgstr "56 kbit/s"
+
+#: src/filewriter/filewriter.cc:436
+msgid "64 kbit/s"
+msgstr "64 kbit/s"
+
+#: src/filewriter/filewriter.cc:437
+msgid "80 kbit/s"
+msgstr "80 kbit/s"
+
+#: src/filewriter/filewriter.cc:438
+msgid "96 kbit/s"
+msgstr "96 kbit/s"
+
+#: src/filewriter/filewriter.cc:439
+msgid "112 kbit/s"
+msgstr "112 kbit/s"
+
+#: src/filewriter/filewriter.cc:440
+msgid "128 kbit/s"
+msgstr "128 kbit/s"
+
+#: src/filewriter/filewriter.cc:441
+msgid "160 kbit/s"
+msgstr "160 kbit/s"
+
+#: src/filewriter/filewriter.cc:442
+msgid "192 kbit/s"
+msgstr "192 kbit/s"
+
+#: src/filewriter/filewriter.cc:443
+msgid "224 kbit/s"
+msgstr "224 kbit/s"
+
+#: src/filewriter/filewriter.cc:444
+msgid "256 kbit/s"
+msgstr "256 kbit/s"
+
+#: src/filewriter/filewriter.cc:445
+msgid "320 kbit/s"
+msgstr "320 kbit/s"
+
+#: src/filewriter/filewriter.cc:450
 msgid "Joint Stereo"
 msgstr "Estéreo conjunto"
 
-#: src/filewriter/mp3.cc:41 src/modplug/plugin_main.cc:58
-#: src/mpg123/mpg123.cc:248
+#: src/filewriter/filewriter.cc:451 src/modplug/plugin_main.cc:57
+#: src/mpg123/mpg123.cc:259
 msgid "Stereo"
 msgstr "Estéreo"
 
-#: src/filewriter/mp3.cc:41 src/modplug/plugin_main.cc:57
-#: src/mpg123/mpg123.cc:248
+#: src/filewriter/filewriter.cc:452 src/modplug/plugin_main.cc:56
+#: src/mpg123/mpg123.cc:260
 msgid "Mono"
 msgstr "Mono"
 
-#: src/filewriter/mp3.cc:657
-msgid "MP3 Configuration"
-msgstr "Configuración MP3"
-
-#: src/filewriter/mp3.cc:658
-msgid "_OK"
-msgstr "_Aceptar"
+#: src/filewriter/filewriter.cc:456
+msgid "VBR"
+msgstr "VBR"
+
+#: src/filewriter/filewriter.cc:457
+msgid "ABR"
+msgstr "ABR"
 
-#: src/filewriter/mp3.cc:681
-msgid "Algorithm Quality:"
+#: src/filewriter/filewriter.cc:478
+msgid "Algorithm quality:"
 msgstr "Calidad del algoritmo:"
 
-#: src/filewriter/mp3.cc:706
-msgid "Output Sample Rate:"
-msgstr "Frecuencia de muestreo:"
-
-#: src/filewriter/mp3.cc:733
-msgid "(Hz)"
-msgstr "(Hz)"
-
-#: src/filewriter/mp3.cc:740
-msgid "Bitrate / Compression Ratio:"
-msgstr "Tasa de bits / Relación de compresión"
-
-#: src/filewriter/mp3.cc:764
-msgid "Bitrate (kbps):"
-msgstr "Tasa de bits (kbps):"
+#: src/filewriter/filewriter.cc:484
+msgid "Bitrate:"
+msgstr "Tasa de bits:"
 
-#: src/filewriter/mp3.cc:796
+#: src/filewriter/filewriter.cc:491
 msgid "Compression ratio:"
-msgstr "Índice de compresión:"
-
-#: src/filewriter/mp3.cc:820
-msgid "Audio Mode:"
-msgstr "Modo de audio:"
+msgstr "Tasa de compresión:"
 
-#: src/filewriter/mp3.cc:845
-msgid "Miscellaneous:"
-msgstr "Miscelánea:"
+#: src/filewriter/filewriter.cc:498
+msgid "Audio mode:"
+msgstr "Modo del audio:"
 
-#: src/filewriter/mp3.cc:856
+#: src/filewriter/filewriter.cc:501
 msgid "Enforce strict ISO compliance"
-msgstr "Forzar conformidad con normas ISO"
+msgstr "Cumplimiento estrito de las normas ISO"
 
-#: src/filewriter/mp3.cc:867
+#: src/filewriter/filewriter.cc:503
 msgid "Error protection"
-msgstr "Error de protección"
+msgstr "Protección contra errores"
 
-#: src/filewriter/mp3.cc:879 src/filewriter/vorbis.cc:206
-msgid "Quality"
-msgstr "Calidad"
-
-#: src/filewriter/mp3.cc:888
+#: src/filewriter/filewriter.cc:508
 msgid "Enable VBR/ABR"
 msgstr "Activar VBR/ABR"
 
-#: src/filewriter/mp3.cc:898
+#: src/filewriter/filewriter.cc:510
 msgid "Type:"
 msgstr "Tipo:"
 
-#: src/filewriter/mp3.cc:931
-msgid "VBR Options:"
-msgstr "Opciones VBR:"
-
-#: src/filewriter/mp3.cc:947
-msgid "Minimum bitrate (kbps):"
-msgstr "Tasa de bits mínima (kbps):"
-
-#: src/filewriter/mp3.cc:973
-msgid "Maximum bitrate (kbps):"
-msgstr "Tasa de bits máxima (kbps):"
-
-#: src/filewriter/mp3.cc:995
-msgid "Strictly enforce minimum bitrate"
-msgstr "Aplicación estricta de la tasa de bits mínima"
+#: src/filewriter/filewriter.cc:514
+msgid "Minimum bitrate:"
+msgstr "Tas de bits mínima:"
+
+#: src/filewriter/filewriter.cc:518
+msgid "Maximum bitrate:"
+msgstr "Tasa de bits máxima:"
+
+#: src/filewriter/filewriter.cc:522
+msgid "Average bitrate:"
+msgstr "Tasa de bits media:"
 
-#: src/filewriter/mp3.cc:1007
-msgid "ABR Options:"
-msgstr "Opciones ABR:"
-
-#: src/filewriter/mp3.cc:1017
-msgid "Average bitrate (kbps):"
-msgstr "Tasa media de bits (kbps):"
-
-#: src/filewriter/mp3.cc:1044
+#: src/filewriter/filewriter.cc:526
 msgid "VBR quality level:"
 msgstr "Nivel de calidad VBR:"
 
-#: src/filewriter/mp3.cc:1063
-msgid "Omit Xing VBR header"
-msgstr "Omitir cabecera VBR Xing"
+#: src/filewriter/filewriter.cc:530
+msgid "Strictly enforce minimum bitrate"
+msgstr "Aplicar estrictamente la tasa de bits mínima"
 
-#: src/filewriter/mp3.cc:1076
-msgid "VBR/ABR"
-msgstr "VBR/ABR"
+#: src/filewriter/filewriter.cc:533
+msgid "Omit Xing VBR header"
+msgstr "Omitir la cabecera VBR de Xing"
 
-#: src/filewriter/mp3.cc:1085
-msgid "Frame Parameters:"
-msgstr "Parámetros de trama:"
+#: src/filewriter/filewriter.cc:539
+msgid "Frame Headers"
+msgstr "Cabeceras de los marcos"
 
-#: src/filewriter/mp3.cc:1097
+#: src/filewriter/filewriter.cc:540
 msgid "Mark as copyright"
-msgstr "Protegido por derechos de autor"
+msgstr "Marcar como con derechos de autor"
 
-#: src/filewriter/mp3.cc:1108
+#: src/filewriter/filewriter.cc:542
 msgid "Mark as original"
-msgstr "Original"
+msgstr "Marcar como original"
 
-#: src/filewriter/mp3.cc:1120
-msgid "ID3 Parameters:"
-msgstr "Parámetros ID3"
+#: src/filewriter/filewriter.cc:544
+msgid "ID3 Tags"
+msgstr "Etiquetas ID3"
 
-#: src/filewriter/mp3.cc:1131
+#: src/filewriter/filewriter.cc:545
 msgid "Force addition of version 2 tag"
-msgstr "Forzar uso de etiquetas de la versión 2"
+msgstr "Forzar la adición de etiquetas de la versión 2"
 
-#: src/filewriter/mp3.cc:1141
+#: src/filewriter/filewriter.cc:547
 msgid "Only add v1 tag"
-msgstr "Solo usar ID3v1"
+msgstr "Añadir solo etiquetas ID3v1"
 
-#: src/filewriter/mp3.cc:1148
+#: src/filewriter/filewriter.cc:549
 msgid "Only add v2 tag"
-msgstr "Solo usar ID3v2"
+msgstr "Añadir solo etiquetas ID3v2"
+
+#: src/filewriter/filewriter.cc:554
+msgid "Quality"
+msgstr "Calidad"
+
+#: src/filewriter/filewriter.cc:555
+msgid "VBR/ABR"
+msgstr "VBR/ABR"
 
-#: src/filewriter/mp3.cc:1169
+#: src/filewriter/filewriter.cc:556
 msgid "Tags"
 msgstr "Etiquetas"
 
-#: src/filewriter/vorbis.cc:196
-msgid "Vorbis Encoder Configuration"
-msgstr "Configuración de codificador Vorbis"
-
-#: src/filewriter/vorbis.cc:219
-msgid "Quality level (0 - 10):"
-msgstr "Nivel de calidad (0 - 10):"
+#: src/filewriter/filewriter.cc:566
+msgid "Quality (0-1):"
+msgstr "Calidad (0-1):"
 
-#: src/flacng/flacng.h:35
+#: src/filewriter/filewriter.cc:573 src/skins-qt/skins_cfg.cc:307
+#: src/skins/skins_cfg.cc:289
+msgid "General"
+msgstr "General"
+
+#: src/flac/flacng.h:36
 msgid "FLAC Decoder"
 msgstr "Descodificador FLAC"
 
-#: src/flacng/metadata.cc:351 src/wavpack/wavpack.cc:209
+#: src/flac/metadata.cc:296 src/wavpack/wavpack.cc:215
 msgid "lossless"
 msgstr "sin pérdida"
 
-#: src/flacng/plugin.cc:169
+#: src/flac/plugin.cc:214
 msgid ""
 "Original code by\n"
 "Ralf Ertzinger <ralf@skytale.net>\n"
@@ -1538,15 +1481,15 @@
 msgid "GIO Plugin"
 msgstr "Complemento GIO"
 
-#: src/gio/gio.cc:153
+#: src/gio/gio.cc:152
 msgid "Read-and-append mode not supported"
-msgstr "Modo leer-y-agregar no soportado"
+msgstr "No se admite el modo leer y añadir"
 
-#: src/gio/gio.cc:166
+#: src/gio/gio.cc:165
 msgid "Invalid open mode"
-msgstr "Modo de acceso a ficheros no válido"
+msgstr "Modo de acceso a archivos no válido"
 
-#: src/gl-spectrum/gl-spectrum.cc:51
+#: src/glspectrum/gl-spectrum.cc:52
 msgid ""
 "OpenGL Spectrum Analyzer for Audacious\n"
 "Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
@@ -1560,791 +1503,946 @@
 "Analizador de espectro OpenGL para Audacious\n"
 "Copyright 2013 Christophe Budé, John Lindgren, y Carlo Bramini\n"
 "\n"
-"Basado en el complemento para XMMS:\n"
+"Basado en el complemento para 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.cc:62
+#: src/glspectrum/gl-spectrum.cc:63 src/qtglspectrum/gl-spectrum.cc:53
 msgid "OpenGL Spectrum Analyzer"
 msgstr "Analizador de espectro OpenGL"
 
-#: src/gl-spectrum-qt/gl-spectrum.cc:41
-msgid ""
-"OpenGL Spectrum Analyzer for Audacious\n"
-"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
-"Copyright 2014 William Pitcock\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é, John Lindgren, y Carlo Bramini\n"
-"Copyright 2014 William Pitcock\n"
-"\n"
-"Basado en el complemento para XMMS:\n"
-"Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson, y "
-"4Front Technologies\n"
-"\n"
-"Licencia: GPLv2+"
-
-#: src/gl-spectrum-qt/gl-spectrum.cc:53
-msgid "OpenGL Spectrum Analyzer (Qt)"
-msgstr "Analizador de espectro OpenGL (Qt)"
-
-#: src/gnomeshortcuts/gnomeshortcuts.cc:38
-msgid "GNOME Shortcuts"
-msgstr "Atajos de teclado GNOME"
-
-#: src/gnomeshortcuts/gnomeshortcuts.cc:54
-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 ""
-"Complemento «Atajos de teclado de GNOME»\n"
-"Le permite controlar el reproductor con atajos de GNOME.\n"
-"\n"
-"Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>"
-
-#: src/gtkui/columns.cc:35
-msgid "Entry number"
+#: src/gtkui/columns.cc:36 src/moonstone/playlist_model.cc:38
+#: src/qtui/playlist_model.cc:33
+msgid "Entry Number"
 msgstr "Número de entrada"
 
-#: src/gtkui/columns.cc:36 src/playlist-manager/playlist-manager.cc:225
-#: src/qtui/playlist_model.cc:123
+#: src/gtkui/columns.cc:37 src/moonstone/playlist_model.cc:38
+#: src/moonstone/playlist_selection.cc:64
+#: src/playlist-manager/playlist-manager.cc:200
+#: src/playlist-manager-qt/playlist-manager-qt.cc:188
+#: src/qtui/playlist_model.cc:33 src/streamtuner/icecast-model.cc:120
+#: src/streamtuner/ihr-model.cc:159 src/streamtuner/shoutcast-model.cc:122
 msgid "Title"
 msgstr "Título"
 
-#: src/gtkui/columns.cc:37 src/qtui/playlist_model.cc:125
+#: src/gtkui/columns.cc:38 src/moonstone/playlist_model.cc:39
+#: src/qtui/playlist_model.cc:33
 msgid "Artist"
 msgstr "Artista"
 
-#: src/gtkui/columns.cc:38
+#: src/gtkui/columns.cc:39 src/moonstone/playlist_model.cc:39
+#: src/qtui/playlist_model.cc:33
 msgid "Year"
 msgstr "Año"
 
-#: src/gtkui/columns.cc:39 src/qtui/playlist_model.cc:127
+#: src/gtkui/columns.cc:40 src/moonstone/playlist_model.cc:39
+#: src/qtui/playlist_model.cc:34
 msgid "Album"
 msgstr "Álbum"
 
-#: src/gtkui/columns.cc:40
-msgid "Album artist"
+#: src/gtkui/columns.cc:41 src/moonstone/playlist_model.cc:40
+#: src/qtui/playlist_model.cc:34
+msgid "Album Artist"
 msgstr "Artista del álbum"
 
-#: src/gtkui/columns.cc:41
+#: src/gtkui/columns.cc:42 src/moonstone/playlist_model.cc:40
+#: src/qtui/playlist_model.cc:34
 msgid "Track"
 msgstr "Pista"
 
-#: src/gtkui/columns.cc:42
+#: src/gtkui/columns.cc:43 src/moonstone/playlist_model.cc:40
+#: src/qtui/playlist_model.cc:34 src/streamtuner/icecast-model.cc:123
+#: src/streamtuner/shoutcast-model.cc:125
+#: src/streamtuner/shoutcast-model.cc:236
 msgid "Genre"
 msgstr "Género"
 
-#: src/gtkui/columns.cc:43
-msgid "Queue position"
-msgstr "Posición de la cola"
+#: src/gtkui/columns.cc:44 src/moonstone/playlist_model.cc:41
+#: src/qtui/playlist_model.cc:35
+msgid "Queue Position"
+msgstr "Posición en la cola"
 
-#: src/gtkui/columns.cc:44
+#: src/gtkui/columns.cc:45 src/moonstone/playlist_model.cc:41
+#: src/qtui/playlist_model.cc:35
 msgid "Length"
 msgstr "Duración"
 
-#: src/gtkui/columns.cc:45
-msgid "File path"
+#: src/gtkui/columns.cc:46 src/moonstone/playlist_model.cc:41
+#: src/qtui/playlist_model.cc:35
+msgid "File Path"
 msgstr "Ruta del archivo"
 
-#: src/gtkui/columns.cc:47
-msgid "Custom title"
+#: src/gtkui/columns.cc:47 src/moonstone/playlist_model.cc:42
+#: src/qtui/playlist_model.cc:35
+msgid "File Name"
+msgstr "Nombre del archivo"
+
+#: src/gtkui/columns.cc:48 src/moonstone/playlist_model.cc:42
+#: src/qtui/playlist_model.cc:36
+msgid "Custom Title"
 msgstr "Título personalizado"
 
-#: src/gtkui/columns.cc:48
+#: src/gtkui/columns.cc:49 src/moonstone/playlist_model.cc:42
+#: src/qtui/playlist_model.cc:36 src/streamtuner/icecast-model.cc:129
+#: src/streamtuner/shoutcast-model.cc:134
 msgid "Bitrate"
 msgstr "Tasa de bits"
 
-#: src/gtkui/columns.cc:308
+#: src/gtkui/columns.cc:50 src/moonstone/playlist_model.cc:43
+#: src/qtui/playlist_model.cc:36
+msgid "Comment"
+msgstr "Comentario"
+
+#: src/gtkui/columns.cc:51 src/qtui/playlist_model.cc:36
+msgid "Publisher"
+msgstr "Editorial"
+
+#: src/gtkui/columns.cc:52 src/qtui/playlist_model.cc:37
+msgid "Catalog Number"
+msgstr "Número de catálogo"
+
+#: src/gtkui/columns.cc:53 src/moonstone/playlist_model.cc:43
+#: src/qtui/playlist_model.cc:37
+msgid "Disc"
+msgstr ""
+
+#: src/gtkui/columns.cc:325
 msgid "Available columns"
 msgstr "Columnas disponibles"
 
-#: src/gtkui/columns.cc:334
+#: src/gtkui/columns.cc:351
 msgid "Displayed columns"
 msgstr "Columnas mostradas"
 
-#: src/gtkui/layout.cc:72 src/search-tool/search-tool.cc:40
+#: src/gtkui/layout.cc:74 src/search-tool-qt/search-tool-qt.cc:58
+#: src/search-tool/search-tool.cc:49
 msgid "Search Tool"
 msgstr "Herramienta de búsqueda"
 
-#: src/gtkui/layout.cc:167
+#: src/gtkui/layout.cc:170
 msgid "Dock at Left"
 msgstr "Acoplar a la izquierda"
 
-#: src/gtkui/layout.cc:167
+#: src/gtkui/layout.cc:170
 msgid "Dock at Right"
 msgstr "Acoplar a la derecha"
 
-#: src/gtkui/layout.cc:168
+#: src/gtkui/layout.cc:171
 msgid "Dock at Top"
 msgstr "Acoplar arriba"
 
-#: src/gtkui/layout.cc:168
+#: src/gtkui/layout.cc:171
 msgid "Dock at Bottom"
 msgstr "Acoplar abajo"
 
-#: src/gtkui/layout.cc:168
+#: src/gtkui/layout.cc:171
 msgid "Undock"
 msgstr "Desacoplar"
 
-#: src/gtkui/layout.cc:168 src/ladspa/plugin.cc:531
+#: src/gtkui/layout.cc:171 src/ladspa/plugin.cc:540
 msgid "Disable"
-msgstr "Deshabilitar"
+msgstr "Desactivar"
 
-#: src/gtkui/menus.cc:126 src/qtui/main_window_actions.cc:93
-#: src/statusicon/statusicon.cc:276
+#: src/gtkui/menus.cc:79 src/qtui/menus.cc:107
+#: src/statusicon-qt/statusicon.cc:115 src/statusicon/statusicon.cc:286
 msgid "_Open Files ..."
-msgstr "_Abrir archivos ..."
+msgstr "_Abrir archivos..."
 
-#: src/gtkui/menus.cc:127
+#: src/gtkui/menus.cc:80 src/qtui/menus.cc:111
 msgid "Open _URL ..."
-msgstr "Abrir _URL ..."
+msgstr "Abrir una _URL..."
 
-#: src/gtkui/menus.cc:128 src/qtui/main_window_actions.cc:95
+#: src/gtkui/menus.cc:81 src/qtui/menus.cc:113
 msgid "_Add Files ..."
-msgstr "Aña_dir archivos ..."
+msgstr "Aña_dir archivos..."
 
-#: src/gtkui/menus.cc:129
+#: src/gtkui/menus.cc:82 src/qtui/menus.cc:118
 msgid "Add U_RL ..."
-msgstr "Añadir U_RL ..."
+msgstr "Añadir una U_RL..."
 
-#: src/gtkui/menus.cc:131
+#: src/gtkui/menus.cc:84 src/qtui/menus.cc:120
 msgid "Search _Library"
-msgstr "Explorar _biblioteca"
+msgstr "_Buscar en la fonoteca"
 
-#: src/gtkui/menus.cc:133 src/qtui/main_window_actions.cc:98
+#: src/gtkui/menus.cc:86 src/qtui/menus.cc:123
 msgid "A_bout ..."
-msgstr "A_cerca de ..."
+msgstr "A_cerca de..."
 
-#: src/gtkui/menus.cc:134 src/qtui/main_window_actions.cc:99
+#: src/gtkui/menus.cc:87 src/qtui/menus.cc:125
 msgid "_Settings ..."
-msgstr "_Preferencias ..."
+msgstr "Ajuste_s..."
 
-#: src/gtkui/menus.cc:135 src/qtui/main_window_actions.cc:103
-#: src/statusicon/statusicon.cc:284
+#: src/gtkui/menus.cc:88 src/qtui/menus.cc:131
+#: src/statusicon-qt/statusicon.cc:117 src/statusicon/statusicon.cc:288
 msgid "_Quit"
 msgstr "_Salir"
 
-#: src/gtkui/menus.cc:139 src/gtkui/menus.cc:262
-#: src/qtui/main_window_actions.cc:107 src/search-tool/search-tool.cc:641
-#: src/statusicon/statusicon.cc:278
+#: src/gtkui/menus.cc:92 src/gtkui/menus.cc:226
+#: src/moonstone/playlist_tabs.cc:306 src/qtui/menus.cc:135
+#: src/qtui/playlist_tabs.cc:331 src/search-tool-qt/search-tool-qt.cc:499
+#: src/search-tool/search-tool.cc:339 src/statusicon-qt/statusicon.cc:109
+#: src/statusicon/statusicon.cc:280
 msgid "_Play"
 msgstr "_Reproducir"
 
-#: src/gtkui/menus.cc:140 src/qtui/main_window_actions.cc:108
-#: src/statusicon/statusicon.cc:279
+#: src/gtkui/menus.cc:93 src/qtui/menus.cc:137
+#: src/statusicon-qt/statusicon.cc:110 src/statusicon/statusicon.cc:281
 msgid "Paus_e"
 msgstr "_Pausar"
 
-#: src/gtkui/menus.cc:141 src/qtui/main_window_actions.cc:109
-#: src/statusicon/statusicon.cc:280
+#: src/gtkui/menus.cc:94 src/qtui/menus.cc:139
+#: src/statusicon-qt/statusicon.cc:111 src/statusicon/statusicon.cc:282
 msgid "_Stop"
 msgstr "_Detener"
 
-#: src/gtkui/menus.cc:142 src/qtui/main_window_actions.cc:110
-#: src/statusicon/statusicon.cc:277
+#: src/gtkui/menus.cc:95 src/qtui/menus.cc:141
+#: src/statusicon-qt/statusicon.cc:112 src/statusicon/statusicon.cc:283
 msgid "Pre_vious"
 msgstr "An_terior"
 
-#: src/gtkui/menus.cc:143 src/qtui/main_window_actions.cc:111
-#: src/statusicon/statusicon.cc:281
+#: src/gtkui/menus.cc:96 src/qtui/menus.cc:143
+#: src/statusicon-qt/statusicon.cc:113 src/statusicon/statusicon.cc:284
 msgid "_Next"
 msgstr "_Siguiente"
 
-#: src/gtkui/menus.cc:145 src/qtui/main_window_actions.cc:113
+#: src/gtkui/menus.cc:97 src/qtui/menus.cc:145 src/skins/menus.cc:114
+#: src/skins-qt/menus.cc:105
+msgid "Previous Album"
+msgstr "Álbum anterior"
+
+#: src/gtkui/menus.cc:98 src/qtui/menus.cc:146 src/skins/menus.cc:115
+#: src/skins-qt/menus.cc:106
+msgid "Next Album"
+msgstr "Álbum siguiente"
+
+#: src/gtkui/menus.cc:100 src/qtui/menus.cc:148
 msgid "_Repeat"
 msgstr "R_epetir"
 
-#: src/gtkui/menus.cc:146 src/qtui/main_window_actions.cc:114
+#: src/gtkui/menus.cc:101 src/qtui/menus.cc:150
 msgid "S_huffle"
 msgstr "_Orden aleatorio"
 
-#: src/gtkui/menus.cc:147 src/qtui/main_window_actions.cc:115
+#: src/gtkui/menus.cc:102 src/qtui/menus.cc:152
+msgid "Shuffle by Albu_m"
+msgstr "Orden _aleatorio por álbum"
+
+#: src/gtkui/menus.cc:103 src/qtui/menus.cc:155
 msgid "N_o Playlist Advance"
 msgstr "No avan_zar la lista de reproducción"
 
-#: src/gtkui/menus.cc:148 src/qtui/main_window_actions.cc:116
+#: src/gtkui/menus.cc:104 src/qtui/menus.cc:157
 msgid "Stop A_fter This Song"
 msgstr "Dete_ner después de esta canción"
 
-#: src/gtkui/menus.cc:150 src/gtkui/menus.cc:247
-#: src/qtui/main_window_actions.cc:118
+#: src/gtkui/menus.cc:106 src/gtkui/menus.cc:210 src/qtui/menus.cc:162
+#: src/qtui/menus.cc:294
 msgid "Song _Info ..."
-msgstr "_Información de la canción ..."
+msgstr "_Información de la canción..."
 
-#: src/gtkui/menus.cc:151
+#: src/gtkui/menus.cc:107
 msgid "Jump to _Time ..."
-msgstr "Ir al _momento ..."
+msgstr "Sa_ltar al instante..."
 
-#: src/gtkui/menus.cc:152
+#: src/gtkui/menus.cc:108
 msgid "_Jump to Song ..."
-msgstr "Ir a la _canción ..."
+msgstr "Saltar a la _canción..."
 
-#: src/gtkui/menus.cc:154
+#: src/gtkui/menus.cc:110 src/qtui/menus.cc:165
 msgid "Set Repeat Point _A"
-msgstr "Crear bucle (punto _A)"
+msgstr "Crear un bucle (punto _A)"
 
-#: src/gtkui/menus.cc:155
+#: src/gtkui/menus.cc:111 src/qtui/menus.cc:167
 msgid "Set Repeat Point _B"
-msgstr "Crear bucle (punto _B)"
+msgstr "Crear un bucle (punto _B)"
 
-#: src/gtkui/menus.cc:156
+#: src/gtkui/menus.cc:112 src/qtui/menus.cc:169
 msgid "_Clear Repeat Points"
-msgstr "Borrar b_ucle"
+msgstr "Borrar el b_ucle de repetición"
 
-#: src/gtkui/menus.cc:160 src/gtkui/menus.cc:167 src/gtkui/menus.cc:183
-#: src/qtui/main_window_actions.cc:122 src/qtui/main_window_actions.cc:129
-#: src/qtui/main_window_actions.cc:145
+#: src/gtkui/menus.cc:116 src/gtkui/menus.cc:123 src/gtkui/menus.cc:141
+#: src/qtui/menus.cc:173 src/qtui/menus.cc:180 src/qtui/menus.cc:198
 msgid "By _Title"
 msgstr "Por _título"
 
-#: src/gtkui/menus.cc:161 src/qtui/main_window_actions.cc:123
+#: src/gtkui/menus.cc:117 src/qtui/menus.cc:174
 msgid "By _File Name"
-msgstr "Por _nombre de archivo"
+msgstr "Por _nombre del archivo"
 
-#: src/gtkui/menus.cc:162 src/qtui/main_window_actions.cc:124
+#: src/gtkui/menus.cc:118 src/qtui/menus.cc:175
 msgid "By File _Path"
-msgstr "Por _ruta de archivo"
+msgstr "Por _ruta del archivo"
 
-#: src/gtkui/menus.cc:166 src/gtkui/menus.cc:182
-#: src/qtui/main_window_actions.cc:128 src/qtui/main_window_actions.cc:144
+#: src/gtkui/menus.cc:122 src/gtkui/menus.cc:140 src/qtui/menus.cc:179
+#: src/qtui/menus.cc:197
 msgid "By Track _Number"
 msgstr "Por _número de pista"
 
-#: src/gtkui/menus.cc:168 src/gtkui/menus.cc:184
-#: src/qtui/main_window_actions.cc:130 src/qtui/main_window_actions.cc:146
+#: src/gtkui/menus.cc:124 src/gtkui/menus.cc:142 src/qtui/menus.cc:181
+#: src/qtui/menus.cc:199
 msgid "By _Artist"
 msgstr "Por _artista"
 
-#: src/gtkui/menus.cc:169 src/gtkui/menus.cc:185
-#: src/qtui/main_window_actions.cc:131 src/qtui/main_window_actions.cc:147
+#: src/gtkui/menus.cc:125 src/gtkui/menus.cc:143 src/qtui/menus.cc:182
+#: src/qtui/menus.cc:200
 msgid "By Al_bum"
 msgstr "Por ál_bum"
 
-#: src/gtkui/menus.cc:170 src/gtkui/menus.cc:186
-#: src/qtui/main_window_actions.cc:132 src/qtui/main_window_actions.cc:148
+#: src/gtkui/menus.cc:126 src/gtkui/menus.cc:144 src/qtui/menus.cc:183
+#: src/qtui/menus.cc:201
 msgid "By Albu_m Artist"
 msgstr "Por artista del álbu_m"
 
-#: src/gtkui/menus.cc:171 src/gtkui/menus.cc:187
-#: src/qtui/main_window_actions.cc:133 src/qtui/main_window_actions.cc:149
+#: src/gtkui/menus.cc:127 src/gtkui/menus.cc:145 src/qtui/menus.cc:184
+#: src/qtui/menus.cc:202
 msgid "By Release _Date"
-msgstr "Por _fecha de lanzamiento"
+msgstr "Por _fecha de publicación"
 
-#: src/gtkui/menus.cc:172 src/gtkui/menus.cc:188
-#: src/qtui/main_window_actions.cc:134 src/qtui/main_window_actions.cc:150
+#: src/gtkui/menus.cc:128 src/gtkui/menus.cc:146 src/qtui/menus.cc:185
+#: src/qtui/menus.cc:203
 msgid "By _Genre"
 msgstr "Por _género"
 
-#: src/gtkui/menus.cc:173 src/gtkui/menus.cc:189
-#: src/qtui/main_window_actions.cc:135 src/qtui/main_window_actions.cc:151
+#: src/gtkui/menus.cc:129 src/gtkui/menus.cc:147 src/qtui/menus.cc:186
+#: src/qtui/menus.cc:204
 msgid "By _Length"
 msgstr "Por _duración"
 
-#: src/gtkui/menus.cc:174 src/gtkui/menus.cc:190
-#: src/qtui/main_window_actions.cc:136 src/qtui/main_window_actions.cc:152
+#: src/gtkui/menus.cc:130 src/gtkui/menus.cc:148 src/qtui/menus.cc:187
+#: src/qtui/menus.cc:205
 msgid "By _File Path"
-msgstr "Por _ruta de archivo"
+msgstr "Por _ruta del archivo"
 
-#: src/gtkui/menus.cc:175 src/gtkui/menus.cc:191
-#: src/qtui/main_window_actions.cc:137 src/qtui/main_window_actions.cc:153
+#: src/gtkui/menus.cc:131 src/gtkui/menus.cc:149 src/qtui/menus.cc:188
+#: src/qtui/menus.cc:206
 msgid "By _Custom Title"
 msgstr "Por título _personalizado"
 
-#: src/gtkui/menus.cc:177 src/gtkui/menus.cc:193
-#: src/qtui/main_window_actions.cc:139 src/qtui/main_window_actions.cc:155
+#: src/gtkui/menus.cc:132 src/gtkui/menus.cc:150 src/qtui/menus.cc:189
+#: src/qtui/menus.cc:207
+msgid "By C_omment"
+msgstr "Por _comentario"
+
+#: src/gtkui/menus.cc:133 src/gtkui/menus.cc:151 src/qtui/menus.cc:190
+#: src/qtui/menus.cc:208
+msgid "By D_isc Number"
+msgstr ""
+
+#: src/gtkui/menus.cc:135 src/gtkui/menus.cc:153 src/qtui/menus.cc:192
+#: src/qtui/menus.cc:210
 msgid "R_everse Order"
 msgstr "Orden _inverso"
 
-#: src/gtkui/menus.cc:178 src/gtkui/menus.cc:194
-#: src/qtui/main_window_actions.cc:140 src/qtui/main_window_actions.cc:156
+#: src/gtkui/menus.cc:136 src/gtkui/menus.cc:154 src/qtui/menus.cc:194
+#: src/qtui/menus.cc:212
 msgid "_Random Order"
 msgstr "_Orden aleatorio"
 
-#: src/gtkui/menus.cc:198 src/qtui/main_window_actions.cc:160
+#: src/gtkui/menus.cc:158 src/qtui/menus.cc:216
 msgid "_Play/Resume"
-msgstr "_Reproducir/Continuar"
+msgstr "_Reproducir/reanudar"
 
-#: src/gtkui/menus.cc:199 src/gtkui/menus.cc:251
-#: src/qtui/main_window_actions.cc:161
+#: src/gtkui/menus.cc:159 src/qtui/menus.cc:218
 msgid "_Refresh"
 msgstr "_Actualizar"
 
-#: src/gtkui/menus.cc:201 src/qtui/main_window_actions.cc:163
+#: src/gtkui/menus.cc:161 src/qtui/menus.cc:222
 msgid "_Sort"
 msgstr "_Ordenar"
 
-#: src/gtkui/menus.cc:202 src/qtui/main_window_actions.cc:164
+#: src/gtkui/menus.cc:162 src/qtui/menus.cc:223
 msgid "Sort Se_lected"
-msgstr "Ordenar _seleccionados"
+msgstr "Ordenar entradas _seleccionadas"
 
-#: src/gtkui/menus.cc:203 src/qtui/main_window_actions.cc:165
+#: src/gtkui/menus.cc:163 src/qtui/menus.cc:225
 msgid "Remove _Duplicates"
-msgstr "Eliminar _duplicados"
+msgstr "Eliminar entradas _duplicadas"
 
-#: src/gtkui/menus.cc:204 src/qtui/main_window_actions.cc:166
+#: src/gtkui/menus.cc:164 src/qtui/menus.cc:226
 msgid "Remove _Unavailable Files"
-msgstr "_Eliminar archivos no disponibles"
+msgstr "_Eliminar entradas de archivos no disponibles"
 
-#: src/gtkui/menus.cc:206 src/playlist-manager/playlist-manager.cc:244
-#: src/qtui/main_window_actions.cc:168
+#: src/gtkui/menus.cc:166 src/playlist-manager/playlist-manager.cc:219
+#: src/playlist-manager-qt/playlist-manager-qt.cc:348 src/qtui/menus.cc:229
 msgid "_New"
-msgstr "_Nuevo"
+msgstr "_Nueva"
 
-#: src/gtkui/menus.cc:207
+#: src/gtkui/menus.cc:167 src/qtui/menus.cc:230
 msgid "Ren_ame ..."
-msgstr "Reno_mbrar …"
+msgstr "Reno_mbrar…"
 
-#: src/gtkui/menus.cc:208 src/gtkui/menus.cc:264
-#: src/qtui/main_window_actions.cc:170
+#: src/gtkui/menus.cc:168 src/gtkui/menus.cc:228
+#: src/moonstone/playlist_tabs.cc:311 src/qtui/menus.cc:231
+#: src/qtui/playlist_tabs.cc:336
 msgid "Remo_ve"
-msgstr "_Borrar"
+msgstr "_Eliminar"
 
-#: src/gtkui/menus.cc:210
+#: src/gtkui/menus.cc:170 src/qtui/menus.cc:233
 msgid "_Import ..."
-msgstr "_Importar ..."
+msgstr "_Importar..."
 
-#: src/gtkui/menus.cc:211
+#: src/gtkui/menus.cc:171 src/qtui/menus.cc:234
 msgid "_Export ..."
-msgstr "E_xportar ..."
+msgstr "E_xportar..."
 
-#: src/gtkui/menus.cc:213
+#: src/gtkui/menus.cc:173 src/qtui/menus.cc:237
 msgid "Playlist _Manager ..."
-msgstr "_Gestor de listas de reproducción …"
+msgstr "_Gestor de listas de reproducción…"
 
-#: src/gtkui/menus.cc:214 src/qtui/main_window_actions.cc:176
+#: src/gtkui/menus.cc:174 src/qtui/menus.cc:239
 msgid "_Queue Manager ..."
-msgstr "Gestor de _cola ..."
+msgstr "Gestor de la _cola..."
 
-#: src/gtkui/menus.cc:218 src/qtui/main_window_actions.cc:180
+#: src/gtkui/menus.cc:178 src/qtui/menus.cc:243
 msgid "Volume _Up"
-msgstr "_Subir volumen"
+msgstr "_Subir el volumen"
 
-#: src/gtkui/menus.cc:219 src/qtui/main_window_actions.cc:181
+#: src/gtkui/menus.cc:179 src/qtui/menus.cc:245
 msgid "Volume _Down"
-msgstr "_Bajar volumen"
+msgstr "_Bajar el volumen"
 
-#: src/gtkui/menus.cc:221 src/qtui/main_window_actions.cc:183
-msgid "_Equalizer"
-msgstr "_Ecualizador"
+#: src/gtkui/menus.cc:181 src/qtui/menus.cc:249
+msgid "_Equalizer ..."
+msgstr "_Ecualizador..."
 
-#: src/gtkui/menus.cc:223 src/qtui/main_window_actions.cc:185
+#: src/gtkui/menus.cc:182 src/qtui/menus.cc:251
 msgid "E_ffects ..."
-msgstr "E_fectos ..."
+msgstr "E_fectos..."
+
+#: src/gtkui/menus.cc:184
+msgid "_Record Stream"
+msgstr "_Grabar la transmisión"
+
+#: src/gtkui/menus.cc:185
+msgid "Audio _Settings ..."
+msgstr "_Ajustes del audio..."
 
-#: src/gtkui/menus.cc:227
+#: src/gtkui/menus.cc:189 src/qtui/menus.cc:260
 msgid "Show _Menu Bar"
-msgstr "_Mostrar barra de menú"
+msgstr "Mostrar la barra de _menú"
 
-#: src/gtkui/menus.cc:228
+#: src/gtkui/menus.cc:190 src/qtui/menus.cc:262
 msgid "Show I_nfo Bar"
-msgstr "Mostrar barra de _información"
+msgstr "Mostrar la barra de _información"
 
-#: src/gtkui/menus.cc:229
+#: src/gtkui/menus.cc:191 src/qtui/menus.cc:264
+msgid "Show Info Bar _Album Art"
+msgstr "Mostrar la _carátula en la barra de información"
+
+#: src/gtkui/menus.cc:192 src/qtui/menus.cc:266
 msgid "Show Info Bar Vis_ualization"
-msgstr "Mostrar barra de información de vis_ualización"
+msgstr "Mostrar la _visualización en la barra de información"
 
-#: src/gtkui/menus.cc:230
+#: src/gtkui/menus.cc:193 src/qtui/menus.cc:268
 msgid "Show _Status Bar"
-msgstr "Mostrar barra de _estado"
+msgstr "Mostrar la barra de _estado"
 
-#: src/gtkui/menus.cc:232
+#: src/gtkui/menus.cc:195 src/qtui/menus.cc:272
 msgid "Show _Remaining Time"
-msgstr "Mostrar _tiempo restante"
+msgstr "Mostrar el _tiempo restante"
 
-#: src/gtkui/menus.cc:234
+#: src/gtkui/menus.cc:197 src/qtui/menus.cc:276 src/skins/menus.cc:157
+#: src/skins-qt/menus.cc:152
 msgid "_Visualizations ..."
-msgstr "Visualizaciones ..."
+msgstr "Visualizaciones..."
 
-#: src/gtkui/menus.cc:238 src/qtui/main_window_actions.cc:189
+#: src/gtkui/menus.cc:201 src/qtui/menus.cc:280
 msgid "_File"
 msgstr "_Archivo"
 
-#: src/gtkui/menus.cc:239 src/qtui/main_window_actions.cc:190
+#: src/gtkui/menus.cc:202 src/qtui/menus.cc:281
 msgid "_Playback"
 msgstr "_Reproducción"
 
-#: src/gtkui/menus.cc:240 src/qtui/main_window_actions.cc:191
+#: src/gtkui/menus.cc:203 src/qtui/menus.cc:282
 msgid "P_laylist"
 msgstr "_Lista de reproducción"
 
-#: src/gtkui/menus.cc:241 src/gtkui/menus.cc:258
-#: src/qtui/main_window_actions.cc:192
+#: src/gtkui/menus.cc:204 src/gtkui/menus.cc:222 src/qtui/menus.cc:283
+#: src/qtui/menus.cc:312
 msgid "_Services"
 msgstr "_Servicios"
 
-#: src/gtkui/menus.cc:242 src/qtui/main_window_actions.cc:193
+#: src/gtkui/menus.cc:205 src/qtui/menus.cc:284
 msgid "_Output"
 msgstr "Sali_da"
 
-#: src/gtkui/menus.cc:243
+#: src/gtkui/menus.cc:206 src/qtui/menus.cc:285
 msgid "_View"
 msgstr "_Ver"
 
-#: src/gtkui/menus.cc:248
+#: src/gtkui/menus.cc:211 src/qtui/menus.cc:296
 msgid "_Queue/Unqueue"
-msgstr "_A_gregar/Quitar de la cola"
+msgstr "_Añadir/quitar de la cola"
 
-#: src/gtkui/menus.cc:250
+#: src/gtkui/menus.cc:213 src/qtui/menus.cc:299
 msgid "_Open Containing Folder"
-msgstr "A_brir carpeta contenedora"
+msgstr "A_brir la carpeta que contiene el archivo"
+
+#: src/gtkui/menus.cc:214 src/qtui/menus.cc:301
+msgid "_Refresh Selected"
+msgstr "_Actualizar entradas seleccionadas"
 
-#: src/gtkui/menus.cc:253
+#: src/gtkui/menus.cc:216 src/qtui/menus.cc:304
 msgid "Cu_t"
 msgstr "C_ortar"
 
-#: src/gtkui/menus.cc:254
+#: src/gtkui/menus.cc:217 src/qtui/menus.cc:305
 msgid "_Copy"
 msgstr "_Copiar"
 
-#: src/gtkui/menus.cc:255
+#: src/gtkui/menus.cc:218 src/qtui/menus.cc:306
 msgid "_Paste"
 msgstr "_Pegar"
 
-#: src/gtkui/menus.cc:256
+#: src/gtkui/menus.cc:219 src/qtui/menus.cc:307
+msgid "Paste at _End"
+msgstr "Pegar al _final"
+
+#: src/gtkui/menus.cc:220 src/qtui/menus.cc:309
 msgid "Select _All"
 msgstr "Seleccionar _todo"
 
-#: src/gtkui/menus.cc:263
+#: src/gtkui/menus.cc:227 src/moonstone/playlist_tabs.cc:309
+#: src/qtui/playlist_tabs.cc:334
 msgid "_Rename ..."
-msgstr "_Renombrar ..."
+msgstr "_Renombrar..."
 
-#: src/gtkui/settings.cc:35
+#: src/gtkui/settings.cc:35 src/qtui/settings.cc:59
+msgid "Always"
+msgstr "Siempre"
+
+#: src/gtkui/settings.cc:36 src/qtui/settings.cc:60
+msgid "Auto-hide"
+msgstr "Ocultar automaticamente"
+
+#: src/gtkui/settings.cc:37 src/qtui/settings.cc:61
+msgid "Never"
+msgstr "Nunca"
+
+#: src/gtkui/settings.cc:41 src/qtui/settings.cc:64
 msgid "Playlist Tabs"
-msgstr "Pestañas de listas de reproducción"
+msgstr "Pestañas de la lista de reproducción"
 
-#: src/gtkui/settings.cc:36
-msgid "Always show tabs"
-msgstr "Mostrar pestañas siempre"
+#: src/gtkui/settings.cc:42 src/qtui/settings.cc:65
+msgid "Show playlist tabs:"
+msgstr "Mostrar las pestañas de la lista de reproducción:"
 
-#: src/gtkui/settings.cc:38
+#: src/gtkui/settings.cc:45 src/qtui/settings.cc:69
 msgid "Show entry counts"
-msgstr "Mostrar número de pista"
+msgstr "Mostrar el número de entradas"
 
-#: src/gtkui/settings.cc:40
+#: src/gtkui/settings.cc:47 src/qtui/settings.cc:72
 msgid "Show close buttons"
 msgstr "Mostrar botón de cierre"
 
-#: src/gtkui/settings.cc:42
+#: src/gtkui/settings.cc:49 src/qtui/settings.cc:75
 msgid "Playlist Columns"
-msgstr "Columnas de lista de reproducción"
+msgstr "Columnas de las listas de reproducción"
 
-#: src/gtkui/settings.cc:44
+#: src/gtkui/settings.cc:51 src/qtui/settings.cc:77
 msgid "Show column headers"
-msgstr "Mostrar cabecera de las columnas"
+msgstr "Mostrar la cabecera de las columnas"
 
-#: src/gtkui/settings.cc:46 src/modplug/plugin_main.cc:106
-#: src/skins/skins_cfg.cc:263
-msgid "Miscellaneous"
-msgstr "Miscelánea"
+#: src/gtkui/settings.cc:53 src/qtui/settings.cc:82
+msgid "Make column headers clickable for sorting"
+msgstr ""
 
-#: src/gtkui/settings.cc:47
-msgid "Arrow keys seek by:"
-msgstr "Las teclas de dirección (flechas) dan saltos de:"
+#: src/gtkui/settings.cc:56
+msgid "Use symbolic icons in toolbar"
+msgstr "Usar iconos simbólicos en la barra de herramientas"
 
-#: src/gtkui/settings.cc:50
+#: src/gtkui/settings.cc:58 src/qtui/settings.cc:86
 msgid "Scroll on song change"
 msgstr "Desplazar al cambiar de canción"
 
-#: src/gtkui/ui_gtk.cc:71
+#: src/gtkui/ui_gtk.cc:82
 msgid "GTK Interface"
 msgstr "Interfaz GTK"
 
-#: src/gtkui/ui_gtk.cc:222 src/skins/ui_main.cc:232
+#: src/gtkui/ui_gtk.cc:219 src/skins/main.cc:228 src/skins-qt/main.cc:231
 #, c-format
 msgid "%s - Audacious"
 msgstr "%s - Audacious"
 
-#: src/gtkui/ui_gtk.cc:225 src/qtui/main_window.cc:186
+#: src/gtkui/ui_gtk.cc:221 src/moonstone/main_window.cc:184
+#: src/qtui/main_window.cc:385
 msgid "Buffering ..."
-msgstr "Gestión de memoria intermedia ..."
+msgstr "Cargando..."
 
-#: src/gtkui/ui_gtk.cc:228 src/skins/ui_main.cc:234 src/skins/ui_main.cc:1164
+#: src/gtkui/ui_gtk.cc:224 src/pipewire/pipewire.cc:402 src/skins/main.cc:230
+#: src/skins-qt/main.cc:233
 msgid "Audacious"
 msgstr "Audacious"
 
-#: src/gtkui/ui_statusbar.cc:63 src/qtui/status_bar.cc:67
+#: src/gtkui/ui_gtk.cc:487 src/gtkui/ui_gtk.cc:518 src/gtkui/ui_gtk.cc:882
+#: src/hotkey/gui.cc:72 src/moonstone/main_window.cc:67
+#: src/moonstone/main_window.cc:145 src/moonstone/main_window.cc:146
+#: src/notify/osd.cc:85 src/qthotkey/gui.cc:67 src/qtui/main_window.cc:154
+#: src/qtui/main_window.cc:347 src/qtui/main_window.cc:348
+#: src/skins/menus.cc:109 src/skins-qt/menus.cc:100
+msgid "Play"
+msgstr "Reproducir"
+
+#: src/gtkui/ui_gtk.cc:487 src/moonstone/main_window.cc:151
+#: src/moonstone/main_window.cc:152 src/notify/osd.cc:82
+#: src/qtui/main_window.cc:353 src/qtui/main_window.cc:354
+#: src/skins/menus.cc:110 src/skins-qt/menus.cc:101
+msgid "Pause"
+msgstr "Pausar"
+
+#: src/gtkui/ui_gtk.cc:868 src/moonstone/main_window.cc:57
+#: src/qtui/main_window.cc:145 src/skins/menus.cc:86 src/skins-qt/menus.cc:77
+msgid "Search Library"
+msgstr "Buscar en la fonoteca"
+
+#: src/gtkui/ui_gtk.cc:875 src/moonstone/main_window.cc:60
+#: src/qtui/main_window.cc:147
+msgid "Open Files"
+msgstr "Abrir archivos"
+
+#: src/gtkui/ui_gtk.cc:876 src/moonstone/main_window.cc:62
+#: src/qtui/main_window.cc:149
+msgid "Add Files"
+msgstr "Añadir archivos"
+
+#: src/gtkui/ui_gtk.cc:881 src/moonstone/main_window.cc:65
+#: src/qtui/main_window.cc:152 src/skins/menus.cc:112 src/skins-qt/menus.cc:103
+msgid "Previous"
+msgstr "Anterior"
+
+#: src/gtkui/ui_gtk.cc:883 src/hotkey/gui.cc:74 src/moonstone/main_window.cc:69
+#: src/qthotkey/gui.cc:69 src/qtui/main_window.cc:156 src/skins/menus.cc:111
+#: src/skins-qt/menus.cc:102
+msgid "Stop"
+msgstr "Detener"
+
+#: src/gtkui/ui_gtk.cc:884 src/moonstone/main_window.cc:76 src/notify/osd.cc:89
+#: src/qtui/main_window.cc:163 src/skins/menus.cc:113 src/skins-qt/menus.cc:104
+msgid "Next"
+msgstr "Siguiente"
+
+#: src/gtkui/ui_gtk.cc:886 src/moonstone/main_window.cc:79
+#: src/qtui/main_window.cc:166 src/qtui/menus.cc:254 src/skins/menus.cc:79
+#: src/skins-qt/menus.cc:69
+msgid "Record Stream"
+msgstr "Grabar la transmisión"
+
+#: src/gtkui/ui_gtk.cc:919 src/moonstone/main_window.cc:86
+#: src/qtui/main_window.cc:173 src/skins/menus.cc:103 src/skins-qt/menus.cc:94
+msgid "Repeat"
+msgstr "Repetir"
+
+#: src/gtkui/ui_gtk.cc:922 src/moonstone/main_window.cc:89
+#: src/qtui/main_window.cc:176 src/skins/menus.cc:104 src/skins-qt/menus.cc:95
+msgid "Shuffle"
+msgstr "Orden aleatorio"
+
+#: src/gtkui/ui_gtk.cc:1114 src/qtui/main_window.cc:123
+msgid "Menu"
+msgstr "Menú"
+
+#: src/gtkui/ui_statusbar.cc:64 src/qtui/status_bar.cc:155
 msgid "mono"
 msgstr "mono"
 
-#: src/gtkui/ui_statusbar.cc:65 src/qtui/status_bar.cc:69
+#: src/gtkui/ui_statusbar.cc:66 src/qtui/status_bar.cc:157
 msgid "stereo"
 msgstr "estéreo"
 
-#: src/gtkui/ui_statusbar.cc:67 src/qtui/status_bar.cc:71
+#: src/gtkui/ui_statusbar.cc:68 src/qtui/status_bar.cc:160
 #, c-format
 msgid "%d channel"
 msgid_plural "%d channels"
 msgstr0 "%d canal"
 msgstr1 "%d canales"
+msgstr2 "%d canales"
+
+#: src/gtkui/ui_statusbar.cc:76 src/qtui/status_bar.cc:168
+#, c-format
+msgid "%d kHz"
+msgstr "%d kHz"
 
-#: src/gtkui/ui_statusbar.cc:81 src/qtui/status_bar.cc:85
+#: src/gtkui/ui_statusbar.cc:82 src/qtui/status_bar.cc:174
 #, c-format
-msgid "%d kbps"
-msgstr "%d kbps"
+msgid "%d kbit/s"
+msgstr "%d kbit/s"
 
-#: src/gtkui/ui_statusbar.cc:107 src/skins/ui_main_evlisteners.cc:103
+#: src/gtkui/ui_statusbar.cc:108 src/skins/main.cc:478 src/skins-qt/main.cc:461
 msgid "Single mode."
 msgstr "Modo único."
 
-#: src/gtkui/ui_statusbar.cc:109 src/skins/ui_main_evlisteners.cc:105
+#: src/gtkui/ui_statusbar.cc:110 src/skins/main.cc:480 src/skins-qt/main.cc:463
 msgid "Playlist mode."
 msgstr "Modo de lista de reproducción."
 
-#: src/gtkui/ui_statusbar.cc:117 src/skins/ui_main_evlisteners.cc:111
+#: src/gtkui/ui_statusbar.cc:118 src/skins/main.cc:486 src/skins-qt/main.cc:469
 msgid "Stopping after song."
-msgstr "Parar después de la canción."
+msgstr "Detener después de la canción."
 
-#: src/hotkey/gui.cc:71
+#: src/hotkey/gui.cc:71 src/qthotkey/gui.cc:66
 msgid "Previous track"
 msgstr "Pista anterior"
 
-#: src/hotkey/gui.cc:72 src/notify/osd.cc:69 src/qtui/main_window.cc:69
-#: src/qtui/main_window.cc:172 src/qtui/main_window.cc:173
-#: src/skins/menus.cc:87
-msgid "Play"
-msgstr "Reproducir"
-
-#: src/hotkey/gui.cc:73
+#: src/hotkey/gui.cc:73 src/qthotkey/gui.cc:68
 msgid "Pause/Resume"
-msgstr "Pausa/Continuar"
+msgstr "Pausar/reanudar"
 
-#: src/hotkey/gui.cc:74 src/qtui/main_window.cc:70 src/skins/menus.cc:89
-msgid "Stop"
-msgstr "Detener"
-
-#: src/hotkey/gui.cc:75
+#: src/hotkey/gui.cc:75 src/qthotkey/gui.cc:70
 msgid "Next track"
 msgstr "Pista siguiente"
 
-#: src/hotkey/gui.cc:76
-msgid "Forward 5 seconds"
-msgstr "Adelantar 5 segundos"
-
-#: src/hotkey/gui.cc:77
-msgid "Rewind 5 seconds"
-msgstr "Atrasar 5 segundos"
+#: src/hotkey/gui.cc:76 src/qthotkey/gui.cc:71
+msgid "Step forward"
+msgstr "Un paso adelante"
+
+#: src/hotkey/gui.cc:77 src/qthotkey/gui.cc:72
+msgid "Step backward"
+msgstr "Un paso atrás"
 
-#: src/hotkey/gui.cc:78
+#: src/hotkey/gui.cc:78 src/qthotkey/gui.cc:73
 msgid "Mute"
 msgstr "Silenciar"
 
-#: src/hotkey/gui.cc:79
+#: src/hotkey/gui.cc:79 src/qthotkey/gui.cc:74
 msgid "Volume up"
-msgstr "Subir volumen"
+msgstr "Subir el volumen"
 
-#: src/hotkey/gui.cc:80
+#: src/hotkey/gui.cc:80 src/qthotkey/gui.cc:75
 msgid "Volume down"
-msgstr "Bajar volumen"
+msgstr "Bajar el volumen"
 
-#: src/hotkey/gui.cc:81
+#: src/hotkey/gui.cc:81 src/qthotkey/gui.cc:76
 msgid "Jump to file"
-msgstr "Ir al archivo"
+msgstr "Saltar al archivo"
 
-#: src/hotkey/gui.cc:82
+#: src/hotkey/gui.cc:82 src/qthotkey/gui.cc:77
 msgid "Toggle player window(s)"
-msgstr "Minimizar/Restaurar ventana(s)"
+msgstr "Minimizar/restaurar ventanas"
 
-#: src/hotkey/gui.cc:83
+#: src/hotkey/gui.cc:83 src/qthotkey/gui.cc:78
 msgid "Show On-Screen-Display"
-msgstr "Mostrar notificaciones"
+msgstr "Activar la visualización en pantalla"
 
-#: src/hotkey/gui.cc:84
+#: src/hotkey/gui.cc:84 src/qthotkey/gui.cc:79
 msgid "Toggle repeat"
-msgstr "Alternar repetir"
+msgstr "Activar/desactivar la repetición"
 
-#: src/hotkey/gui.cc:85
+#: src/hotkey/gui.cc:85 src/qthotkey/gui.cc:80
 msgid "Toggle shuffle"
-msgstr "Alternar modo aleatorio"
+msgstr "Activar/desactivar el orden aleatorio"
 
-#: src/hotkey/gui.cc:86
+#: src/hotkey/gui.cc:86 src/qthotkey/gui.cc:81
 msgid "Toggle stop after current"
-msgstr "Parar/Continuar tras esta canción"
+msgstr "Detener/reanudar después de esta canción"
 
-#: src/hotkey/gui.cc:87
+#: src/hotkey/gui.cc:87 src/qthotkey/gui.cc:82
 msgid "Raise player window(s)"
-msgstr "Elevar la(s) ventana(s)"
+msgstr "Elevar ventanas del reproductor"
 
-#: src/hotkey/gui.cc:97
+#: src/hotkey/gui.cc:98 src/qthotkey/gui.cc:100
 msgid "(none)"
 msgstr "(ninguna)"
 
-#: src/hotkey/gui.cc:234
+#: src/hotkey/gui.cc:261
 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 modifiers.\n"
 "\n"
 "Do you want to continue?"
 msgstr ""
-"No se recomienda asociar los botones principales del ratón sin "
-"modificadores.\n"
+"No se recomienda usar los botones del ratón sin teclas modificadoras.\n"
 "\n"
 "¿Quiere continuar?"
 
-#: src/hotkey/gui.cc:236
+#: src/hotkey/gui.cc:264
 msgid "Binding mouse buttons"
 msgstr "Asociar botones del ratón"
 
-#: src/hotkey/gui.cc:391
+#: src/hotkey/gui.cc:434
 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.\n"
-"También puede asociar botones del ratón."
+"También puede pulsar los botones del ratón."
 
-#: src/hotkey/gui.cc:396
+#: src/hotkey/gui.cc:444 src/qthotkey/gui.cc:179
 msgid "Hotkeys:"
 msgstr "Atajos de teclado:"
 
-#: src/hotkey/gui.cc:413
+#: src/hotkey/gui.cc:457 src/qthotkey/gui.cc:181
 msgid "Action:"
 msgstr "Acción:"
 
-#: src/hotkey/gui.cc:420
+#: src/hotkey/gui.cc:461 src/qthotkey/gui.cc:182
 msgid "Key Binding:"
-msgstr "Teclas asociadas:"
+msgstr "Combinación de teclas:"
 
-#: src/hotkey/gui.cc:468
+#: src/hotkey/gui.cc:518 src/qthotkey/gui.cc:184
 msgid "_Add"
 msgstr "_Añadir"
 
-#: src/hotkey/plugin.cc:61
+#: src/hotkey/plugin.cc:59 src/qthotkey/plugin.cc:78
 msgid "Global Hotkeys"
 msgstr "Atajos de teclado globales"
 
-#: src/hotkey/plugin.cc:79
+#: src/hotkey/plugin.cc:74
 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"
+"Contributors 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 ""
-"Complemento «Atajos de teclado globales»\n"
-"Controla el reproductor con combinaciones de teclado globales o teclas "
+"Complemento Atajos de teclado globales\n"
+"Controla el reproductor con combinaciones de teclas globales o con teclas "
 "multimedia.\n"
 "\n"
 "Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n"
 "\n"
-"Contribuidores:\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/jack-ng/jack-ng.cc:49
+#: src/jack/jack-ng.cc:54
 msgid "JACK Output"
 msgstr "Salida JACK"
 
-#: src/jack-ng/jack-ng.cc:114
+#: src/jack/jack-ng.cc:126
+msgid "Client name:"
+msgstr "Nombre del cliente:"
+
+#: src/jack/jack-ng.cc:128
 msgid "Automatically connect to output ports"
 msgstr "Conectar automáticamente a los puertos de salida"
 
-#: src/jack-ng/jack-ng.cc:155
+#: src/jack/jack-ng.cc:130
+msgid "Filter ports (regex, use any port if blank):"
+msgstr ""
+"Filtrar puertos (expresión regular, usar cualquiera si se deja en blanco):"
+
+#: src/jack/jack-ng.cc:136
+msgid "Connect to physical ports only"
+msgstr "Conectar solo a puertos físicos"
+
+#: src/jack/jack-ng.cc:139
+msgid "Upmix to"
+msgstr "Mezclar en"
+
+#: src/jack/jack-ng.cc:141
+msgid "ports if input has fewer channels"
+msgstr "puertos si la entrada tiene menos canales"
+
+#: src/jack/jack-ng.cc:143
+msgid "Ignore insufficient number of ports"
+msgstr "Ignorar un número insuficiente de puertos"
+
+#: src/jack/jack-ng.cc:181
+msgid "No JACK output ports were found. Please check settings."
+msgstr ""
+"No se han encontrado puertos de salida JACK. Compruebe la configuración."
+
+#: src/jack/jack-ng.cc:195
 #, c-format
 msgid "Only %d JACK output ports were found but %d are required."
-msgstr "Sólo se encontraron %d puertos de salida JACK, pero se necesitan %d."
+msgstr ""
+"Solo se han encontrado %d puertos de salida JACK, pero se necesitan %d."
 
-#: src/jack-ng/jack-ng.cc:164
+#: src/jack/jack-ng.cc:210
 #, c-format
 msgid "Failed to connect to JACK port %s."
-msgstr "Error de conexión al puerto JACK %s."
+msgstr "No se ha podido conectar al puerto JACK %s."
 
-#: src/jack-ng/jack-ng.cc:184
+#: src/jack/jack-ng.cc:230
 msgid ""
 "JACK supports only floating-point audio. You must change the output bit "
 "depth to floating-point in Audacious settings."
 msgstr ""
-"JACK sólo soporta audio en coma flotante . Debe cambiar a «Coma flotante» la "
-"opción «Profundidad de bits» en los ajustes de salida de sonido."
+"JACK solo admite audio en coma flotante. Debe cambiar la profundidad de bits "
+"de salida a coma flotante en los ajustes de Audacious."
 
-#: src/jack-ng/jack-ng.cc:197
+#: src/jack/jack-ng.cc:245
 msgid "Failed to connect to the JACK server; is it running?"
-msgstr "Error de conexión al servidor JACK. ¿Está ejecutándose?"
+msgstr ""
+"No se ha podido conectar al servidor JACK. ¿El servidor JACK está en "
+"ejecución?"
 
-#: src/jack-ng/jack-ng.cc:273
+#: src/jack/jack-ng.cc:321
 #, c-format
 msgid ""
 "The JACK server requires a sample rate of %d Hz, but Audacious is playing at "
 "%d Hz. Please use the Sample Rate Converter effect to correct the mismatch."
 msgstr ""
-"El servidor JACK requiere una frecuencia de muestreo de %d Hz, pero "
-"Audacious está reproduciendo a %d Hz. Por favor, usa el efecto «Convertidor "
-"de frecuencia de muestreo» para corregir este desfase."
+"El servidor JACK requiere una tasa de muestreo de %d Hz, pero Audacious está "
+"reproduciendo a %d Hz. Use el efecto Convertidor de la tasa de muestreo para "
+"corregir este desajuste."
 
-#: src/ladspa/plugin.cc:414
+#: src/ladspa/plugin.cc:416
 #, c-format
 msgid "%s Settings"
-msgstr "Ajustes %s"
+msgstr "Ajustes de %s"
 
-#: src/ladspa/plugin.cc:478
+#: src/ladspa/plugin.cc:482
 msgid "Module paths:"
-msgstr "Rutas de complementos:"
+msgstr "Rutas de los complementos:"
 
-#: src/ladspa/plugin.cc:483
+#: src/ladspa/plugin.cc:487
 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 con dos puntos.\n"
-"El uso de estas rutas se suma al de la variable de entorno LADSPA_PATH.\n"
+"Separe varias rutas con dos puntos.\n"
+"Estas rutas se suman a la de la variable de entorno LADSPA_PATH.\n"
 "Tras añadir nuevas rutas, pulse Intro para buscar complementos nuevos.</"
 "small>"
 
-#: src/ladspa/plugin.cc:499
+#: src/ladspa/plugin.cc:508
 msgid "Available plugins:"
 msgstr "Complementos disponibles:"
 
-#: src/ladspa/plugin.cc:512 src/modplug/plugin_main.cc:92
-#: src/modplug/plugin_main.cc:95 src/modplug/plugin_main.cc:98
-#: src/modplug/plugin_main.cc:101
+#: src/ladspa/plugin.cc:521 src/modplug/plugin_main.cc:91
+#: src/modplug/plugin_main.cc:94 src/modplug/plugin_main.cc:97
+#: src/modplug/plugin_main.cc:100
 msgid "Enable"
 msgstr "Activar"
 
-#: src/ladspa/plugin.cc:518
+#: src/ladspa/plugin.cc:527
 msgid "Enabled plugins:"
-msgstr "Complementos habilitados:"
+msgstr "Complementos activados:"
 
-#: src/ladspa/plugin.cc:534
+#: src/ladspa/plugin.cc:543
 msgid "Settings"
 msgstr "Ajustes"
 
-#: src/ladspa/plugin.cc:551
+#: src/ladspa/plugin.cc:560
 msgid ""
 "LADSPA Host for Audacious\n"
 "Copyright 2011 John Lindgren"
 msgstr ""
-"Host LADSPA para Audacious\n"
+"Servidor LADSPA para Audacious\n"
 "Copyright 2011 John Lindgren"
 
 #: src/ladspa/plugin.h:78
 msgid "LADSPA Host"
-msgstr "Host LADSPA"
+msgstr "Servidor LADSPA"
 
 #: src/lirc/lirc.cc:55
 msgid "LIRC Plugin"
 msgstr "Complemento LIRC"
 
-#: src/lirc/lirc.cc:381
+#: src/lirc/lirc.cc:379
 msgid ""
 "A simple plugin to control Audacious using the LIRC remote control daemon\n"
 "\n"
@@ -2359,95 +2457,160 @@
 "\n"
 "For more information about LIRC, see http://lirc.org."
 msgstr ""
-"Un complemento sencillo para controlar Audacious usando el demonio de "
-"control remoto LIRC\n"
+"Un complemento sencillo para controlar Audacious usando el servicio de "
+"control remoto LIRC.\n"
 "\n"
-"Portado para Audacious por:\n"
+"Adaptado para Audacious por:\n"
 "Tony Vroon <chainsaw@gentoo.org>\n"
 "Joonas Harjumäki <jharjuma@gmail.com>\n"
 "\n"
-"Basado en el complemento «XMMS LIRC», creado por:\n"
+"Basado en el complemento LIRC de XMMS creado 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 obtener más información sobre LIRC, visitar http://lirc.org."
+"Para obtener más información sobre LIRC,\n"
+"visite http://lirc.org."
 
-#: src/lirc/lirc.cc:392
+#: src/lirc/lirc.cc:390
 msgid "Connection"
 msgstr "Conexión"
 
-#: src/lirc/lirc.cc:393
+#: src/lirc/lirc.cc:391
 msgid "Reconnect to LIRC server"
-msgstr "Volver a conectar con el servidor LIRC"
+msgstr "Reconectar con el servidor LIRC"
 
-#: src/lirc/lirc.cc:395
+#: src/lirc/lirc.cc:393
 msgid "Wait before reconnecting:"
-msgstr "Espera antes de reconectar:"
-
-#: src/lyricwiki/lyricwiki.cc:41
-msgid "LyricWiki Plugin"
-msgstr "Complemento de LyricWiki"
-
-#: src/lyricwiki/lyricwiki.cc:131 src/lyricwiki-qt/lyricwiki.cc:136
-msgid "No lyrics available"
-msgstr "No hay letras disponibles."
-
-#: src/lyricwiki/lyricwiki.cc:217 src/lyricwiki/lyricwiki.cc:226
-#: src/lyricwiki/lyricwiki.cc:243 src/lyricwiki/lyricwiki.cc:252
-#: src/lyricwiki/lyricwiki.cc:267 src/lyricwiki-qt/lyricwiki.cc:222
-#: src/lyricwiki-qt/lyricwiki.cc:231 src/lyricwiki-qt/lyricwiki.cc:248
-#: src/lyricwiki-qt/lyricwiki.cc:257 src/lyricwiki-qt/lyricwiki.cc:272
-msgid "Error"
-msgstr "Error"
+msgstr "Esperar antes de reconectar:"
 
-#: src/lyricwiki/lyricwiki.cc:218 src/lyricwiki/lyricwiki.cc:244
-#: src/lyricwiki-qt/lyricwiki.cc:223 src/lyricwiki-qt/lyricwiki.cc:249
+#: src/lyrics-common/chart_lyrics_provider.cc:93
+#: src/lyrics-common/chart_lyrics_provider.cc:150
+#: src/lyrics-common/lyrics_ovh_provider.cc:50
 #, c-format
 msgid "Unable to fetch %s"
-msgstr "No se pudo obtener %s"
+msgstr "No se puede recuperar %s"
 
-#: src/lyricwiki/lyricwiki.cc:227 src/lyricwiki/lyricwiki.cc:253
-#: src/lyricwiki-qt/lyricwiki.cc:232 src/lyricwiki-qt/lyricwiki.cc:258
+#: src/lyrics-common/chart_lyrics_provider.cc:100
+#: src/lyrics-common/chart_lyrics_provider.cc:157
+#: src/lyrics-common/lyrics_ovh_provider.cc:57
 #, c-format
 msgid "Unable to parse %s"
-msgstr "No se pudo interpretar %s"
+msgstr "No se puede analizar %s"
 
-#: src/lyricwiki/lyricwiki.cc:259 src/lyricwiki-qt/lyricwiki.cc:264
+#: src/lyrics-common/chart_lyrics_provider.cc:121
+#: src/lyrics-common/chart_lyrics_provider.cc:194
+#: src/lyrics-common/lyrics_ovh_provider.cc:88
 msgid "Looking for lyrics ..."
-msgstr "Buscando letras ..."
+msgstr "Buscando las letras..."
+
+#: src/lyrics-common/preferences.h:43
+msgid "Nowhere"
+msgstr "En ningún sitio"
+
+#: src/lyrics-common/preferences.h:49
+msgid "Artist is truncated at the start, Title -- at the end"
+msgstr ""
+"El artista está truncado al principio, título -- hasta el final</"
+"small>"
+
+#: src/lyrics-common/preferences.h:50
+msgid "Chars to truncate on:"
+msgstr "Caracteres en los que truncar:"
+
+#: src/lyrics-common/preferences.h:54
+msgid "Chars are ORed in RegExp, surrounded by whitespace"
+msgstr ""
+"Caracteres con OR en una expresión regular, rodeados por espacios</"
+"small>"
 
-#: src/lyricwiki/lyricwiki.cc:267 src/lyricwiki-qt/lyricwiki.cc:272
-msgid "Missing song metadata"
-msgstr "Metadatos de canción ausentes"
+#: src/lyrics-common/preferences.h:55
+msgid "Chars to split on:"
+msgstr "Caracteres a dividir:"
+
+#: src/lyrics-common/preferences.h:56
+msgid "Further truncate those on chars"
+msgstr "Truncar aún más los caracteres"
+
+#: src/lyrics-common/preferences.h:62
+msgid "General"
+msgstr "General"
+
+#: src/lyrics-common/preferences.h:63
+msgid "Split title into artist and title on chars"
+msgstr "Dividir el título en artista y título en caracteres"
+
+#: src/lyrics-common/preferences.h:66
+msgid "Sources"
+msgstr "Fuentes"
 
-#: src/lyricwiki/lyricwiki.cc:278 src/lyricwiki-qt/lyricwiki.cc:283
-msgid "Connecting to lyrics.wikia.com ..."
-msgstr "Conectando con lyrics.wikia.com…"
+#: src/lyrics-common/preferences.h:67
+msgid "Use embedded lyrics (from Lyrics tag)"
+msgstr "Usar las letras incrustadas (de la etiqueta Lyrics)"
+
+#: src/lyrics-common/preferences.h:69
+msgid "Fetch lyrics from internet:"
+msgstr "Obtener la letra de la canción de Internet:"
+
+#: src/lyrics-common/preferences.h:72
+msgid "Store fetched lyrics in local cache"
+msgstr "Almacenar las letras en la caché local"
+
+#: src/lyrics-common/preferences.h:74
+msgid "Local Storage"
+msgstr "Almacenamiento local"
+
+#: src/lyrics-common/preferences.h:75
+msgid "Load lyric files (.lrc) from local storage"
+msgstr "Cargar los archivos de letras (.lrc) desde el almacenamiento local"
+
+#: src/lyrics-common/utils.cc:54 src/ui-common/dialogs-qt.cc:63
+msgid "Error"
+msgstr "Error"
 
-#: src/lyricwiki-qt/lyricwiki.cc:55
-msgid "LyricWiki Plugin (Qt)"
-msgstr "Complemento LyricWiki (Qt)"
+#: src/lyrics-common/utils.cc:60
+msgid "Lyrics could not be found."
+msgstr "No se ha podido encontrar la letra."
+
+#: src/lyrics-common/utils.cc:142
+msgid "Missing title and/or artist."
+msgstr "Falta el título y/o el artista."
+
+#: src/lyrics-gtk/lyrics-gtk.cc:37 src/lyrics-qt/lyrics-qt.cc:50
+msgid "Lyrics"
+msgstr "Letras"
+
+#: src/lyrics-gtk/lyrics-gtk.cc:189 src/lyrics-qt/lyrics-qt.cc:171
+msgid "Edit Lyrics ..."
+msgstr "Editar la letra..."
+
+#: src/lyrics-gtk/lyrics-gtk.cc:195 src/lyrics-qt/lyrics-qt.cc:178
+msgid "Save Locally"
+msgstr "Guardar localmente"
+
+#: src/lyrics-gtk/lyrics-gtk.cc:201 src/lyrics-qt/lyrics-qt.cc:186
+msgid "Refresh"
+msgstr "Actualizar"
 
-#: src/m3u/m3u.cc:32
+#: src/m3u/m3u.cc:33
 msgid "M3U Playlists"
 msgstr "Listas de reproducción M3U"
 
 #: src/metronom/metronom.cc:44
 msgid "Tact Generator"
-msgstr "Marcador de compás"
+msgstr "Marcador del compás"
 
-#: src/metronom/metronom.cc:147
+#: src/metronom/metronom.cc:145
 #, c-format
 msgid "Tact generator: %d bpm"
-msgstr "Marcador de compás: %d ppm"
+msgstr "Marcador del compás: %d ppm"
 
-#: src/metronom/metronom.cc:149
+#: src/metronom/metronom.cc:147
 #, c-format
 msgid "Tact generator: %d bpm %d/%d"
-msgstr "Marcador de compás: %d ppm %d/%d"
+msgstr "Marcador del compás: %d ppm %d/%d"
 
-#: src/metronom/metronom.cc:237
+#: src/metronom/metronom.cc:235
 msgid ""
 "A Tact Generator by Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
 "\n"
@@ -2455,205 +2618,213 @@
 "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 marcador de compás, creado por Martin Strauss <mys@faveve.uni-stuttgart."
+"Un marcador de compás creado por Martin Strauss <mys@faveve.uni-stuttgart."
 "de>\n"
 "\n"
 "Emula un metrónomo. Para usarlo, añada un URL de la forma: tact://"
-"pulsos*numerador/denominador\n"
-"p.ej. tact://77 para generar 77 pulsos por minuto\n"
+"pulsos*numerador/denominador.\n"
+"P. ej., tact://77 para generar 77 pulsos por minuto\n"
 "o tact://60*3/4 para generar 60 ppm con un compás de 3/4"
 
-#: src/mixer/mixer.cc:38
+#: src/mixer/mixer.cc:43
 msgid "Channel Mixer"
 msgstr "Mezclador de canales"
 
-#: src/mixer/mixer.cc:202
+#: src/mixer/mixer.cc:255
 msgid ""
 "Channel Mixer Plugin for Audacious\n"
 "Copyright 2011-2012 John Lindgren and Michał Lipski"
 msgstr ""
-"Complemento «Mezclador de canales» para Audacious\n"
+"Complemento Mezclador de canales para Audacious\n"
 "Copyright 2011-2012 John Lindgren y Michał Lipski"
 
-#: src/mixer/mixer.cc:206
+#: src/mixer/mixer.cc:259
 msgid "Channel Mixer"
 msgstr "Mezclador de canales"
 
-#: src/mixer/mixer.cc:207
+#: src/mixer/mixer.cc:260
 msgid "Output channels:"
 msgstr "Canales de salida:"
 
 #: src/mms/mms.cc:35
 msgid "MMS Plugin"
-msgstr "Complemento para MMS"
+msgstr "Complemento MMS"
 
 #: src/mms/mms.cc:82
 msgid "Error connecting to MMS server"
 msgstr "Error de conexión al servidor MMS"
 
-#: src/modplug/modplugbmp.h:53
+#: src/modplug/modplugbmp.h:57
 msgid "ModPlug (Module Player)"
 msgstr "ModPlug (reproductor MOD)"
 
-#: src/modplug/plugin_main.cc:53
-msgid "Resolution"
-msgstr "Resolución"
-
-#: src/modplug/plugin_main.cc:54
-msgid "8-bit"
-msgstr "8 bits"
-
 #: src/modplug/plugin_main.cc:55
-msgid "16-bit"
-msgstr "16 bits"
-
-#: src/modplug/plugin_main.cc:56
 msgid "Channels"
 msgstr "Canales"
 
-#: src/modplug/plugin_main.cc:60
+#: src/modplug/plugin_main.cc:59
 msgid "Nearest (fastest)"
-msgstr "Más cercano (más rápido)"
+msgstr "Más cercano (el más rápido)"
 
-#: src/modplug/plugin_main.cc:61
+#: src/modplug/plugin_main.cc:60
 msgid "Linear (fast)"
 msgstr "Lineal (rápido)"
 
-#: src/modplug/plugin_main.cc:62
+#: src/modplug/plugin_main.cc:61
 msgid "Spline (good)"
 msgstr "Spline (bueno)"
 
-#: src/modplug/plugin_main.cc:63
+#: src/modplug/plugin_main.cc:62
 msgid "Polyphase (best)"
 msgstr "Polifásico (el mejor)"
 
-#: src/modplug/plugin_main.cc:64
+#: src/modplug/plugin_main.cc:63
 msgid "Sample rate"
-msgstr "Frecuencia de muestreo"
+msgstr "Tasa de muestreo"
 
-#: src/modplug/plugin_main.cc:65
+#: src/modplug/plugin_main.cc:64
 msgid "22 kHz"
 msgstr "22 kHz"
 
-#: src/modplug/plugin_main.cc:66
+#: src/modplug/plugin_main.cc:65
 msgid "44 kHz"
 msgstr "44 kHz"
 
-#: src/modplug/plugin_main.cc:67
+#: src/modplug/plugin_main.cc:66
 msgid "48 kHz"
 msgstr "48 kHz"
 
-#: src/modplug/plugin_main.cc:68
+#: src/modplug/plugin_main.cc:67
 msgid "96 kHz"
 msgstr "96 kHz"
 
-#: src/modplug/plugin_main.cc:72 src/modplug/plugin_main.cc:77
-#: src/modplug/plugin_main.cc:82
+#: src/modplug/plugin_main.cc:71 src/modplug/plugin_main.cc:76
+#: src/modplug/plugin_main.cc:81
 msgid "Level:"
 msgstr "Nivel:"
 
-#: src/modplug/plugin_main.cc:78
+#: src/modplug/plugin_main.cc:77
 msgid "Cutoff:"
 msgstr "Corte:"
 
-#: src/modplug/plugin_main.cc:91
+#: src/modplug/plugin_main.cc:90
 msgid "Reverb"
 msgstr "Reverberación"
 
-#: src/modplug/plugin_main.cc:94
+#: src/modplug/plugin_main.cc:93
 msgid "Bass Boost"
 msgstr "Refuerzo de graves"
 
-#: src/modplug/plugin_main.cc:97
+#: src/modplug/plugin_main.cc:96
 msgid "Surround"
-msgstr "Surround"
+msgstr "Sonido envolvente"
 
-#: src/modplug/plugin_main.cc:100
+#: src/modplug/plugin_main.cc:99
 msgid "Preamp"
 msgstr "Preamplificación"
 
-#: src/modplug/plugin_main.cc:107
+#: src/modplug/plugin_main.cc:106
 msgid "Oversample"
 msgstr "Sobremuestreo"
 
-#: src/modplug/plugin_main.cc:108
+#: src/modplug/plugin_main.cc:107
 msgid "Noise reduction"
 msgstr "Reducción de ruido"
 
-#: src/modplug/plugin_main.cc:109
+#: src/modplug/plugin_main.cc:108
 msgid "Play Amiga MODs"
 msgstr "Reproducir archivos MOD de Amiga"
 
-#: src/modplug/plugin_main.cc:110
+#: src/modplug/plugin_main.cc:109
 msgid "Repeat"
 msgstr "Repetir"
 
-#: src/modplug/plugin_main.cc:111
+#: src/modplug/plugin_main.cc:110
 msgid "Repeat count:"
 msgstr "Número de repeticiones:"
 
-#: src/modplug/plugin_main.cc:112
+#: src/modplug/plugin_main.cc:111
 msgid "To repeat forever, set the repeat count to -1."
 msgstr ""
 "Para repetir infinitamente, establezca el número de repeticiones en -1."
 
-#: src/modplug/plugin_main.cc:125 src/sid/xs_config.cc:106
+#: src/modplug/plugin_main.cc:124 src/sid/xs_config.cc:106
 msgid "These settings will take effect when Audacious is restarted."
-msgstr "Estos ajustes tendrán efecto cuando se reinicie Audacious."
+msgstr "Estos ajustes surtirán efecto cuando se reinicie Audacious."
+
+#: src/moonstone/main_window.cc:72 src/moonstone/main_window.cc:73
+#: src/qtui/main_window.cc:159 src/qtui/main_window.cc:160
+#: src/skins/menus.cc:107 src/skins-qt/menus.cc:98
+msgid "Stop After This Song"
+msgstr "Detener después de esta canción"
+
+#: src/moonstone/moonstone.cc:39
+msgid "Moonstone"
+msgstr "Piedra lunar"
+
+#: src/moonstone/playlist_header.cc:212 src/qtui/playlist_header.cc:258
+msgid "Reset to Defaults"
+msgstr "Restablecer valores por defecto"
+
+#: src/moonstone/playlist_model.cc:38 src/qtui/playlist_header.cc:232
+msgid "Now Playing"
+msgstr "En reproducción"
+
+#: src/moonstone/playlist_selection.cc:66
+#: src/playlist-manager/playlist-manager.cc:201
+#: src/playlist-manager-qt/playlist-manager-qt.cc:190
+msgid "Entries"
+msgstr "Entradas"
 
 #: src/mpg123/mpg123.cc:54
 msgid "MPG123 Plugin"
 msgstr "Complemento MPG123"
 
-#: src/mpg123/mpg123.cc:83
-msgid "Advanced"
-msgstr "Avanzado"
-
-#: src/mpg123/mpg123.cc:84
+#: src/mpg123/mpg123.cc:82
 msgid "Use accurate length calculation (slow)"
-msgstr "Cálculo preciso de duración (lento)"
+msgstr "Usar un cálculo preciso de la duración (lento)"
 
-#: src/mpg123/mpg123.cc:248
+#: src/mpg123/mpg123.cc:260
 msgid "Surround"
-msgstr "Surround"
+msgstr "Sonido envolvente"
 
-#: src/mpris2/plugin.cc:39
+#: src/mpris2/plugin.cc:40
 msgid "MPRIS 2 Server"
 msgstr "Servidor MPRIS 2"
 
-#: src/neon/neon.cc:97
+#: src/neon/neon.cc:102
 msgid "Neon HTTP/HTTPS Plugin"
 msgstr "Complemento Neon HTTP/HTTPS"
 
-#: src/neon/neon.cc:521
+#: src/neon/neon.cc:526
 msgid "Error parsing redirect"
-msgstr "Error procesando redirección"
+msgstr "Error al analizar la redirección"
 
-#: src/neon/neon.cc:535
+#: src/neon/neon.cc:540
 msgid "Unknown HTTP error"
 msgstr "Error HTTP desconocido"
 
-#: src/neon/neon.cc:569
+#: src/neon/neon.cc:614
 msgid "Error parsing URL"
-msgstr "Error procesando URL"
+msgstr "Error al analizar el URL"
 
-#: src/neon/neon.cc:632
+#: src/neon/neon.cc:687
 msgid "Too many redirects"
 msgstr "Demasiadas redirecciones"
 
-#: src/notify/event.cc:64
+#: src/notify/event.cc:97
 msgid "Stopped"
 msgstr "Detenido"
 
-#: src/notify/event.cc:64
+#: src/notify/event.cc:97
 msgid "Audacious is not playing."
 msgstr "Audacious no está reproduciendo."
 
-#: src/notify/notify.cc:42
+#: src/notify/notify.cc:39
 msgid "Desktop Notifications"
 msgstr "Notificaciones de escritorio"
 
-#: src/notify/notify.cc:60
+#: src/notify/notify.cc:57
 msgid ""
 "Desktop Notifications Plugin for Audacious\n"
 "Copyright (C) 2010 Maximilian Bogner\n"
@@ -2672,81 +2843,126 @@
 "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 ""
-"Complemento «Notificaciones de escritorio» para Audacious\n"
+"Complemento 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"
-"Este complemento es software libre: usted puede redistribuirlo y/o "
-"modificarlo bajo los términos de la Licencia Pública General GNU, publicada "
-"por la «Free Software Foundation» (Fundación para el software libre), ya sea "
-"la versión 3 de la Licencia, o (a su elección) cualquier versión posterior.\n"
+"Este complemento es software libre: puede redistribuirlo y/o modificarlo "
+"bajo los términos de la Licencia Pública General de GNU, publicada por la "
+"Free Software Foundation, ya sea la versión 3 de la Licencia o (a su "
+"elección) cualquier versión posterior.\n"
 "\n"
 "Este programa se distribuye con la esperanza de que sea útil, pero SIN "
 "GARANTÍA ALGUNA; ni siquiera la garantía implícita de COMERCIALIZACIÓN o "
-"IDONEIDAD APTITUD PARA UN PROPÓSITO DETERMINADO. Consulte los detalles de la "
-"Licencia Pública General GNU para obtener una información más detallada.\n"
+"IDONEIDAD PARA UN PROPÓSITO PARTICULAR. Consulte los detalles de la Licencia "
+"Pública General GNU para obtener una información más detallada.\n"
 "\n"
-"Debería haber recibido una copia de la Licencia Pública General GNU junto a "
-"este programa. En caso contrario, consulte <http://www.gnu.org/licenses/>."
+"Debería haber recibido una copia de la Licencia Pública General de GNU junto "
+"a este programa. Si no es así, visite <http://www.gnu.org/licenses/>."
 
-#: src/notify/notify.cc:110
+#: src/notify/notify.cc:104
 msgid "Show playback controls"
-msgstr "Mostrar controles de reproductor"
+msgstr "Mostrar los controles de reproducción"
 
-#: src/notify/notify.cc:112
+#: src/notify/notify.cc:106
 msgid "Always show notification"
 msgstr "Mantener siempre visible"
 
-#: src/notify/notify.cc:114
+#: src/notify/notify.cc:108
 msgid "Include album name in notification"
-msgstr "Incluir nombre del álbum"
+msgstr "Incluir el nombre del álbum"
+
+#: src/notify/notify.cc:110
+msgid "Custom notification duration:"
+msgstr "Duración de las notificaciones personalizadas:"
 
-#: src/notify/osd.cc:58
+#: src/notify/osd.cc:74
 msgid "Show"
 msgstr "Mostrar"
 
-#: src/notify/osd.cc:66 src/qtui/main_window.cc:178
-#: src/qtui/main_window.cc:179 src/skins/menus.cc:88
-msgid "Pause"
-msgstr "Pausar"
+#: src/openmpt/mpt.cc:50
+msgid "OpenMPT (Module Player)"
+msgstr "OpenMPT (Reproductor MOD)"
 
-#: src/notify/osd.cc:73 src/qtui/main_window.cc:72 src/skins/menus.cc:91
-msgid "Next"
-msgstr "Siguiente"
+#: src/openmpt/mpt.cc:132
+msgid ""
+"Module player based on libopenmpt\n"
+"\n"
+"Written by: Chris Spiegel <cspiegel@gmail.com>"
+msgstr ""
+"Reproductor MOD basado en libopenmpt\n"
+"\n"
+"Escrito por: Chris Spiegel <cspiegel@gmail.com>"
+
+#: src/openmpt/mpt.cc:151
+msgid "Stereo separation:"
+msgstr "Separación estéreo:"
+
+#: src/openmpt/mpt.cc:153
+msgid "% (0=mono, 100=default, 200=full)"
+msgstr ""
+
+#: src/openmpt/mpt.cc:157
+msgid "Interpolation:"
+msgstr "Interpolación:"
+
+#: src/openmpt/mptwrap.h:51 src/soxr/sox-resampler.cc:189 src/xsf/plugin.cc:437
+msgid "Linear"
+msgstr "Lineal"
 
-#: src/oss4/oss.h:93
+#: src/openmpt/mptwrap.h:52
+msgid "Cubic"
+msgstr "Cúbica"
+
+#: src/openmpt/mptwrap.h:53
+msgid "Windowed sinc"
+msgstr "Sinc con ventanas"
+
+#: src/opus/opus.cc:39
+msgid "Opus Decoder"
+msgstr "Decodificador Opus"
+
+#: src/opus/opus.cc:336
+msgid ""
+"Opus Decoder Plugin for Audacious\n"
+"Copyright 2022 Thomas Lange"
+msgstr ""
+"Complemento decodificador Opus para Audacious\n"
+"Copyright 2022 Thomas Lange"
+
+#: src/oss4/oss.h:70
 msgid "OSS4 Output"
 msgstr "Salida OSS4"
 
-#: src/oss4/oss.h:95
+#: src/oss4/oss.h:72
 msgid "OSS3 Output"
 msgstr "Salida OSS3"
 
 #: src/oss4/plugin.cc:35
 msgid "Default device"
-msgstr "Dispositivo predeterminado"
+msgstr "Dispositivo por defecto"
 
-#: src/oss4/plugin.cc:77
+#: src/oss4/plugin.cc:78
 msgid "Audio device:"
 msgstr "Dispositivo de sonido:"
 
-#: src/oss4/plugin.cc:80
+#: src/oss4/plugin.cc:81
 msgid "Use alternate device:"
-msgstr "Utilizar dispositivo alternativo:"
+msgstr "Usar un dispositivo alternativo:"
 
-#: src/oss4/plugin.cc:84
+#: src/oss4/plugin.cc:85
 msgid "Save volume between sessions."
-msgstr "Preservar la configuración de volumen entre sesiones."
+msgstr "Guardar el volumen entre sesiones."
 
-#: src/oss4/plugin.cc:86
+#: src/oss4/plugin.cc:87
 msgid "Enable format conversions made by the OSS software."
-msgstr "Activar conversiones de formato realizadas por el software OSS."
+msgstr "Activar las conversiones de formato realizadas por el software OSS."
 
-#: src/oss4/plugin.cc:88
+#: src/oss4/plugin.cc:89
 msgid "Enable exclusive mode to prevent virtual mixing."
-msgstr "Activa el modo exclusivo para evitar la mezcla virtual."
+msgstr "Activar el modo exclusivo para evitar la mezcla virtual."
 
-#: src/oss4/plugin.cc:100
+#: src/oss4/plugin.cc:101
 msgid ""
 "OSS4 Output Plugin for Audacious\n"
 "Copyright 2010-2012 Michał Lipski\n"
@@ -2754,26 +2970,47 @@
 "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 ""
-"Complemento «Salida OSS4» para Audacious\n"
+"Complemento Salida OSS4 para Audacious\n"
 "Copyright 2010-2012 Michał Lipski\n"
 "\n"
-"Quiero expresar mi agradecimiento a toda la gente de #audacious, "
-"especialmente a Tony Vroon y John Lindgren, y, por supuesto, a los autores "
-"del anterior complemento OSS."
+"Me gustaría dar las gracias a la gente de #audacious, especialmente a Tony "
+"Vroon y John Lindgren, y, por supuesto, a los autores del anterior "
+"complemento OSS."
+
+#: src/pipewire/pipewire.cc:44
+msgid "PipeWire Output"
+msgstr "Salida PipeWire"
 
-#: src/playlist-manager/playlist-manager.cc:37
+#: src/pipewire/pipewire.cc:118
+msgid ""
+"PipeWire Output Plugin for Audacious\n"
+"Copyright 2022 Thomas Lange\n"
+"\n"
+"Based on the PipeWire Output Plugin for Qmmp\n"
+"Copyright 2021 Ilya Kotov"
+msgstr ""
+"Complemento de salida PipeWire para Audacious\n"
+"Copyright 2022 Thomas Lange\n"
+"\n"
+"Basado en el complemento de salida PipeWire para Qmmp\n"
+"Copyright 2021 Ilya Kotov"
+
+#: src/pipewire/pipewire.cc:408 src/skins/menus.cc:88 src/skins-qt/menus.cc:79
+msgid "Playback"
+msgstr "Reproducción"
+
+#: src/playlist-manager/playlist-manager.cc:38
+#: src/playlist-manager-qt/playlist-manager-qt.cc:42
 msgid "Playlist Manager"
 msgstr "Gestor de listas de reproducción"
 
-#: src/playlist-manager/playlist-manager.cc:226
-msgid "Entries"
-msgstr "Pistas"
-
-#: src/playlist-manager/playlist-manager.cc:245
+#: src/playlist-manager/playlist-manager.cc:221
+#: src/playlist-manager-qt/playlist-manager-qt.cc:356
 msgid "_Remove"
-msgstr "_Borrar"
+msgstr "_Eliminar"
 
-#: src/playlist-manager/playlist-manager.cc:246
+#: src/playlist-manager/playlist-manager.cc:222
+#: src/playlist-manager-qt/playlist-manager-qt.cc:351
 msgid "Ren_ame"
 msgstr "_Renombrar"
 
@@ -2781,56 +3018,69 @@
 msgid "PLS Playlists"
 msgstr "Listas de reproducción PLS"
 
-#: src/psf/plugin.cc:45
+#: src/psf/plugin.cc:53
 msgid "OpenPSF PSF1/PSF2 Decoder"
 msgstr "Descodificador OpenPSF PSF1/PSF2"
 
-#: src/pulse_audio/pulse_audio.cc:38
+#: src/psf/plugin.cc:270
+msgid "OpenPSF Configuration"
+msgstr "Configuración de OpenPSF"
+
+#: src/psf/plugin.cc:271 src/xsf/plugin.cc:444
+msgid "Ignore length from file"
+msgstr "Ignorar la duración del archivo"
+
+#: src/pulse/pulse_audio.cc:42
 msgid "PulseAudio Output"
 msgstr "Salida PulseAudio"
 
-#: src/pulse_audio/pulse_audio.cc:611
+#: src/pulse/pulse_audio.cc:84
+msgid "Context name:"
+msgstr "Nombre del contexto:"
+
+#: src/pulse/pulse_audio.cc:86
+msgid "Stream name:"
+msgstr "Nombre del flujo:"
+
+#: src/pulse/pulse_audio.cc:596
 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 ""
-"Complemento «Salida PulseAudio» para Audacious\n"
-"\n"
-"Este programa es software libre: usted puede redistribuirlo y/o modificarlo\n"
-"bajo los términos de la Licencia Pública General GNU, publicada por la\n"
-"«Free Software Foundation» (Fundación para el software libre), ya sea la\n"
-" versión 2 de la Licencia, o (a su elección) cualquier versión posterior.\n"
-"\n"
-"Este programa se distribuye con la esperanza de que sea útil,\n"
-"pero SIN GARANTÍA ALGUNA; ni siquiera la garantía implícita de\n"
-"COMERCIALIZACIÓN o IDONEIDAD PARA UN PROPÓSITO DETERMINADO.\n"
-"Consulte los detalles de la Licencia Pública General GNU para obtener\n"
-"una información más detallada.\n"
-"\n"
-"Debería haber recibido una copia de la Licencia Pública General GNU\n"
-"junto a este programa. En caso contrario, escriba a Free Software\n"
-"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
-"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 ""
+"Complemento Salida PulseAudio para Audacious\n"
+"\n"
+"Este programa es software libre: puede redistribuirlo y/o modificarlo bajo "
+"los términos de la Licencia Pública General de GNU publicada por la Free "
+"Software Foundation; ya sea la versión 2 de la Licencia o (a su elección) "
+"cualquier versión posterior.\n"
+"\n"
+"Este programa se distribuye con la esperanza de que sea útil, pero SIN "
+"NINGUNA GARANTÍA; ni siquiera la garantía implícita de COMERCIALIZACIÓN o "
+"IDONEIDAD PARA UN PROPÓSITO PARTICULAR. Consulte la Licencia Pública General "
+"de GNU para obtener más detalles.\n"
+"\n"
+"Debería haber recibido una copia de la Licencia Pública General de GNU junto "
+"con este programa. Si no es así, escriba a la Free Software Foundation, Inc. "
+"51, Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 
-#: src/qtaudio/qtaudio.cc:49
+#: src/qtaudio/qtaudio.cc:53
 msgid "QtMultimedia Output"
 msgstr "Salida QtMultimedia"
 
-#: src/qtaudio/qtaudio.cc:77
+#: src/qtaudio/qtaudio.cc:84
 msgid ""
 "QtMultimedia Audio Output Plugin for Audacious\n"
 "Copyright 2014 William Pitcock\n"
@@ -2838,71 +3088,130 @@
 "Based on SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
 msgstr ""
-"Complemento «Salida de audio QtMultimedia» para Audacious\n"
+"Complemento Salida QtMultimedia para Audacious\n"
 "Copyright 2014 William Pitcock\n"
 "\n"
-"Basado en el complemento «Salida SDL» para Audacious\n"
+"Basado en el complemento Salida SDL para Audacious\n"
 "Copyright 2010 John Lindgren"
 
-#: src/qtui/dialog_windows.cc:31
-msgid "Working ..."
-msgstr "Trabajando ..."
+#: src/qtglspectrum/gl-spectrum.cc:41
+msgid ""
+"OpenGL Spectrum Analyzer for Audacious\n"
+"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
+"Copyright 2014, 2020 Ariadne Conill\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é, John Lindgren y Carlo Bramini\n"
+"Copyright 2014, 2020 Ariadne Conill\n"
+"\n"
+"Basado en el complemento XMMS:\n"
+"Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson, y "
+"4Front Technologies\n"
+"\n"
+"Licencia: GPLv2+"
 
-#: src/qtui/filter_input.cc:44 src/skins/ui_playlist.cc:221
-msgid "Search"
-msgstr "Buscar"
+#: src/qthotkey/gui.cc:177
+msgid "Press a key combination inside a text field."
+msgstr "Pulse una combinación de teclas dentro de un campo de texto."
 
-#: src/qtui/main_window_actions.cc:94
+#: src/qthotkey/plugin.cc:105
+msgid ""
+"Global Hotkey Plugin\n"
+"Control the player with global key combinations or multimedia keys.\n"
+"\n"
+"Copyright (C) 2020 i.Dark_Templar <darktemplar@dark-templar-archives.net>\n"
+"Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n"
+"\n"
+"Contributors 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 ""
+"Complemento de atajos globales\n"
+"Controlar el reproductor con combinaciones de teclas globales o teclas "
+"multimedia.\n"
+"\n"
+"Copyright (C) 2020 i.Dark_Templar <darktemplar@dark-templar-archives.net>\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/qtui/menus.cc:109
 msgid "_Open Folder ..."
-msgstr "A_brir carpeta"
+msgstr "A_brir una carpeta..."
 
-#: src/qtui/main_window_actions.cc:96
+#: src/qtui/menus.cc:115
 msgid "_Add Folder ..."
-msgstr "Añadi_r carpeta"
+msgstr "Añadi_r una carpeta..."
 
-#: src/qtui/main_window_actions.cc:101
+#: src/qtui/menus.cc:128
 msgid "_Log Inspector ..."
-msgstr "_Inspector de registro..."
+msgstr "_Inspector de registros..."
 
-#: src/qtui/main_window.cc:64
-msgid "Open Files"
-msgstr "Abrir archivos"
+#: src/qtui/menus.cc:220
+msgid "_Find ..."
+msgstr "_Encontrar..."
 
-#: src/qtui/main_window.cc:66
-msgid "Add Files"
-msgstr "Añadir archivos"
+#: src/qtui/menus.cc:256 src/skins/menus.cc:80 src/skins-qt/menus.cc:70
+msgid "Audio Settings ..."
+msgstr "Ajustes del audio…"
 
-#: src/qtui/main_window.cc:71 src/skins/menus.cc:90
-msgid "Previous"
-msgstr "Anterior"
+#: src/qtui/playlist_model.cc:188
+msgid "Q#"
+msgstr "PC"
 
-#: src/qtui/main_window.cc:77 src/skins/menus.cc:82
-msgid "Repeat"
-msgstr "Repetir"
+#: src/qtui/playlist_model.cc:190
+msgid "T#"
+msgstr "NP"
 
-#: src/qtui/main_window.cc:79 src/skins/menus.cc:83
-msgid "Shuffle"
-msgstr "Orden aleatorio"
+#: src/qtui/playlist_model.cc:192
+msgid "C#"
+msgstr "C#"
+
+#: src/qtui/playlist_model.cc:194
+msgid "D#"
+msgstr ""
 
-#: src/qtui/qtui.cc:42
+#: src/qtui/qtui.cc:40
 msgid "Qt Interface"
 msgstr "Interfaz Qt"
 
+#: src/qtui/search_bar.cc:46
+msgid "Search playlist"
+msgstr "Buscar en la lista de reproducción"
+
+#: src/qtui/settings.cc:79
+msgid "Use bold font for column headers"
+msgstr "Usar letra negrita para los encabezados de las columnas"
+
 #: src/resample/resample.cc:43
 msgid "Sample Rate Converter"
-msgstr "Convertidor de frecuencia de muestreo"
+msgstr "Convertidor de la tasa de muestreo"
 
 #: src/resample/resample.cc:183
 msgid ""
 "Sample Rate Converter Plugin for Audacious\n"
 "Copyright 2010-2012 John Lindgren"
 msgstr ""
-"Complemento «Convertidor de frecuencia de muestreo» para Audacious\n"
+"Complemento Convertidor de la tasa de muestreo para Audacious\n"
 "Copyright 2010-2012 John Lindgren"
 
 #: src/resample/resample.cc:187
 msgid "Skip/repeat samples"
-msgstr "Saltar/Repetir muestras"
+msgstr "Omitir/repetir muestras"
 
 #: src/resample/resample.cc:188
 msgid "Linear interpolation"
@@ -2928,17 +3237,17 @@
 msgid "Method:"
 msgstr "Método:"
 
-#: src/resample/resample.cc:199 src/sox-resampler/sox-resampler.cc:161
+#: src/resample/resample.cc:199 src/soxr/sox-resampler.cc:203
 msgid "Rate:"
 msgstr "Tasa:"
 
 #: src/resample/resample.cc:202
 msgid "Rate Mappings"
-msgstr "Mapeo de frecuencias"
+msgstr "Asignaciones de tasas"
 
 #: src/resample/resample.cc:203
 msgid "Use rate mappings"
-msgstr "Usar mapeo de frecuencias"
+msgstr "Usar las asignaciones de tasas"
 
 #: src/resample/resample.cc:205
 msgid "8 kHz:"
@@ -2950,11 +3259,11 @@
 
 #: src/resample/resample.cc:213
 msgid "22.05 kHz:"
-msgstr "22.05 kHz:"
+msgstr "22,05 kHz:"
 
 #: src/resample/resample.cc:217
 msgid "32.0 kHz:"
-msgstr "32.0 kHz:"
+msgstr "32,0 kHz:"
 
 #: src/resample/resample.cc:221
 msgid "44.1 kHz:"
@@ -2980,185 +3289,169 @@
 msgid "192 kHz:"
 msgstr "192 kHz:"
 
+#: src/scrobbler2/config_window.cc:29
+msgid "Checking Last.fm access ..."
+msgstr "Comprobando el acceso a Last.fm..."
+
+#: src/scrobbler2/config_window.cc:35
+msgid ""
+"Your scrobbles are being saved on your computer temporarily. They will be "
+"submitted as soon as Audacious is allowed access."
+msgstr ""
+"Sus datos para las recomendaciones se están guardando en su equipo "
+"temporalmente. Se enviarán tan pronto como Audacious tenga acceso al "
+"servicio."
+
 #: src/scrobbler2/config_window.cc:41
 #, c-format
-msgid "OK. Scrobbling for user: %s"
-msgstr "Aprobado. Scrobbling para usario: %s"
-
-#: src/scrobbler2/config_window.cc:54
-msgid "Permission Denied"
-msgstr "Permiso denegado"
-
-#: src/scrobbler2/config_window.cc:56
-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.cc:66
-msgid "Keep this window open and click 'Check Permission' again.\n"
+msgid "Permission granted. Scrobbling for user %s."
 msgstr ""
-"Mantenga esta ventana abierta y haga clic en «Comprobar el permiso» otra "
-"vez.\n"
+"Permiso concedido. Se ha activado el servicio Scroobler para el usuario %s."
 
-#: src/scrobbler2/config_window.cc:69 src/scrobbler2/config_window.cc:80
+#: src/scrobbler2/config_window.cc:44
 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: sus scrobbles se guardan en su equipo.\n"
-"Se enviarán tan pronto como Audacious reciba la autorización necesaria."
-
-#: src/scrobbler2/config_window.cc:77
-msgid "Network Problem."
-msgstr "Problema de la red"
-
-#: src/scrobbler2/config_window.cc:78
-msgid "There was a problem contacting Last.fm. Please try again later."
+"Permission denied. Open the following URL in a browser, allow Audacious "
+"access to your account, and then click 'Check Permission' again:"
 msgstr ""
-"Hubo un problema al contactar con Last.fm. Por favor inténtelo de nuevo más "
-"tarde."
+"Permiso denegado. Abra la siguiente URL en un navegador, permita el acceso "
+"de Audacious a su cuenta y, a continuación, haga clic de nuevo en comprobar "
+"el permiso."
 
-#: src/scrobbler2/config_window.cc:110
-msgid "Checking..."
-msgstr "Comprobando..."
+#: src/scrobbler2/config_window.cc:53
+msgid "There was a problem contacting Last.fm."
+msgstr "Hubo un problema al contactar con Last.fm."
 
-#: src/scrobbler2/config_window.cc:176
-msgid "C_heck Permission"
-msgstr "C_omprobar el permiso"
+#: src/scrobbler2/config_window.cc:92
+msgid "Check Permission"
+msgstr "Comprobar el permiso"
 
-#: src/scrobbler2/config_window.cc:177
-msgid "_Revoke Permission"
+#: src/scrobbler2/config_window.cc:93
+msgid "Revoke Permission"
 msgstr "Revocar el permiso"
 
-#: src/scrobbler2/config_window.cc:220
-msgid ""
-"You need to allow Audacious to scrobble tracks to your Last.fm account.\n"
-msgstr ""
-"Necesita autorizar a Audacious para hacer scrobbling a su cuenta de Last."
-"fm.\n"
+#: src/scrobbler2/config_window.cc:97
+msgid "You need to allow Audacious to scrobble tracks to your Last.fm account."
+msgstr "Debe permitir que Audacious rastree pistas en su cuenta de Last.fm."
 
 #: src/scrobbler2/scrobbler.cc:29
 msgid "Scrobbler 2.0"
 msgstr "Scrobbler 2.0"
 
-#: src/scrobbler2/scrobbler.cc:224
+#: src/scrobbler2/scrobbler.cc:200
 msgid ""
 "The Scrobbler plugin could not be started.\n"
 "There might be a problem with your installation."
 msgstr ""
-"No se pudo iniciar el complemento Scrobbler.\n"
+"No se ha podido iniciar el complemento Scrobbler.\n"
 "Puede haber un problema con la instalación."
 
-#: src/scrobbler2/scrobbler.cc:289
+#: src/scrobbler2/scrobbler.cc:245
 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 ""
-"Complemento «Scrobbler 2.0» de Audacious, creado por Pitxyoki,\n"
-"\n"
-"Copyright © 2012-2013 Luís M. Picciochi Oliveira <Pitxyoki@Gmail.com>\n"
-"\n"
-"Muchas gracias a John Lindgren por su ayuda en el comienzo de este "
-"proyecto.\n"
-"\n"
-
-#: src/scrobbler2/scrobbler_communication.cc:642
-msgid ""
-"Audacious is now using an improved version of the Last.fm Scrobbler.\n"
-"Please check the Preferences for the Scrobbler plugin."
+"project."
 msgstr ""
-"Audacious usa ahora una versión mejorada del Scrobbler de Last.fm.\n"
-"Busque «Scrobbler» en la sección de «Complementos» de las «Preferencias»."
 
-#: src/sdlout/sdlout.cc:48
+#: src/sdlout/sdlout.cc:43
 msgid "SDL Output"
 msgstr "Salida SDL"
 
-#: src/sdlout/sdlout.cc:77
+#: src/sdlout/sdlout.cc:72
 msgid ""
 "SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
 msgstr ""
-"Complemento «Salida SDL» para Audacious\n"
+"Complemento Salida SDL para Audacious\n"
 "Copyright 2010 John Lindgren"
 
-#: src/search-tool/search-tool.cc:116 src/search-tool/search-tool.cc:124
+#: src/search-tool/library.cc:35 src/search-tool/library.cc:46
+#: src/search-tool-qt/library.cc:35 src/search-tool-qt/library.cc:46
 msgid "Library"
-msgstr "Biblioteca"
-
-#: src/search-tool/search-tool.cc:394
-#, c-format
-msgid "%d result"
-msgid_plural "%d results"
-msgstr0 "%d resultado"
-msgstr1 "%d resultados"
+msgstr "Fonoteca"
 
-#: src/search-tool/search-tool.cc:400
-#, c-format
-msgid "(%d hidden)"
-msgid_plural "(%d hidden)"
-msgstr0 "(%d oculto)"
-msgstr1 "(%d ocultos)"
-
-#: src/search-tool/search-tool.cc:594
+#: src/search-tool-qt/search-model.cc:44 src/search-tool/search-tool.cc:287
 #, c-format
 msgid "%d song"
 msgid_plural "%d songs"
 msgstr0 "%d canción"
 msgstr1 "%d canciones"
+msgstr2 "%d canciones"
 
-#: src/search-tool/search-tool.cc:601
+#: src/search-tool-qt/search-model.cc:53 src/search-tool/search-tool.cc:294
 msgid "of this genre"
 msgstr "de este género"
 
-#: src/search-tool/search-tool.cc:607
+#: src/search-tool-qt/search-model.h:47 src/search-tool/search-model.h:45
 msgid "on"
 msgstr "en"
 
-#: src/search-tool/search-tool.cc:607
+#: src/search-tool-qt/search-model.h:47 src/search-tool/search-model.h:45
 msgid "by"
 msgstr "por"
 
-#: src/search-tool/search-tool.cc:643
-msgid "_Create Playlist"
-msgstr "_Crear lista de reproducción"
+#: src/search-tool-qt/search-tool-qt.cc:165 src/search-tool/search-tool.cc:74
+msgid "Number of results to show:"
+msgstr "Número de resultados para mostrar:"
+
+#: src/search-tool-qt/search-tool-qt.cc:168 src/search-tool/search-tool.cc:77
+msgid "Rescan library at startup"
+msgstr "Reexplorar la fonoteca al inicio"
+
+#: src/search-tool-qt/search-tool-qt.cc:170
+msgid "Monitor library for changes"
+msgstr "Monitorear los cambios de la biblioteca"
 
-#: src/search-tool/search-tool.cc:645
-msgid "_Add to Playlist"
-msgstr "_Añadir a la lista de reproducción"
-
-#: src/search-tool/search-tool.cc:684
-msgid "Search library"
-msgstr "Explorar biblioteca"
-
-#: src/search-tool/search-tool.cc:688
+#: src/search-tool-qt/search-tool-qt.cc:193 src/search-tool/search-tool.cc:450
 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»."
+"Para importar su fonoteca en Audacious, elija una carpeta y, a continuación, "
+"haga clic en el icono actualizar."
 
-#: src/search-tool/search-tool.cc:696
+#: src/search-tool-qt/search-tool-qt.cc:195 src/search-tool/search-tool.cc:459
 msgid "Please wait ..."
-msgstr "Espere por favor..."
+msgstr "Espere..."
 
-#: src/search-tool/search-tool.cc:723
+#: src/search-tool-qt/search-tool-qt.cc:197 src/search-tool/search-tool.cc:487
 msgid "Choose Folder"
-msgstr "Seleccione un directorio"
+msgstr "Seleccione una carpeta"
+
+#: src/search-tool-qt/search-tool-qt.cc:201 src/search-tool/search-tool.cc:445
+msgid "Search library"
+msgstr "Buscar en la fonoteca"
+
+#: src/search-tool-qt/search-tool-qt.cc:327 src/search-tool/search-tool.cc:156
+#, c-format
+msgid "%d of %d result shown"
+msgid_plural "%d of %d results shown"
+msgstr0 "%d de %d resultado mostrado"
+msgstr1 "%d de %d resultados mostrados"
+msgstr2 "%d de %d resultados mostrados"
+
+#: src/search-tool-qt/search-tool-qt.cc:331 src/search-tool/search-tool.cc:160
+#, c-format
+msgid "%d result"
+msgid_plural "%d results"
+msgstr0 "%d resultado"
+msgstr1 "%d resultados"
+msgstr2 "%d resultados"
+
+#: src/search-tool-qt/search-tool-qt.cc:501 src/search-tool/search-tool.cc:341
+msgid "_Create Playlist"
+msgstr "_Crear una lista de reproducción"
+
+#: src/search-tool-qt/search-tool-qt.cc:503 src/search-tool/search-tool.cc:343
+msgid "_Add to Playlist"
+msgstr "_Añadir a la lista de reproducción"
 
 #: src/sid/xmms-sid.cc:43
 msgid "SID Player"
 msgstr "Reproductor SID"
 
-#: src/sid/xs_config.cc:61
-msgid "Output"
-msgstr "Salida"
-
 #: src/sid/xs_config.cc:62
 msgid "Channels:"
 msgstr "Canales:"
@@ -3169,7 +3462,7 @@
 
 #: src/sid/xs_config.cc:69
 msgid "Emulate MOS 8580 (default: MOS 6581)"
-msgstr "Emular MOS 8580 (predeterminado: MOS 6581)"
+msgstr "Emular MOS 8580 (por defecto: MOS 6581)"
 
 #: src/sid/xs_config.cc:71
 msgid "Do not automatically select chip model"
@@ -3177,7 +3470,7 @@
 
 #: src/sid/xs_config.cc:73
 msgid "Emulate filter"
-msgstr "Emular filtro"
+msgstr "Emular el filtro"
 
 #: src/sid/xs_config.cc:75
 msgid "Clock speed:"
@@ -3193,15 +3486,15 @@
 
 #: src/sid/xs_config.cc:81
 msgid "Set maximum playback time:"
-msgstr "Establecer tiempo máximo de reproducción:"
+msgstr "Configurar el tiempo máximo de reproducción:"
 
 #: src/sid/xs_config.cc:87
 msgid "Use only when song length is unknown"
-msgstr "Sólo con pistas de duración desconocida"
+msgstr "Usar solo cuando la duración de la canción es desconocida"
 
 #: src/sid/xs_config.cc:90
 msgid "Set minimum playback time:"
-msgstr "Establecer tiempo mínimo de reproducción:"
+msgstr "Configurar el tiempo mínimo de reproducción:"
 
 #: src/sid/xs_config.cc:96
 msgid "Subtunes"
@@ -3209,7 +3502,7 @@
 
 #: src/sid/xs_config.cc:97
 msgid "Enable subtunes"
-msgstr "Habilitar subtonos"
+msgstr "Activar los subtonos"
 
 #: src/sid/xs_config.cc:99
 msgid "Ignore subtunes shorter than:"
@@ -3228,7 +3521,7 @@
 "Silence Removal Plugin for Audacious\n"
 "Copyright 2014 John Lindgren"
 msgstr ""
-"Complemento «Eliminación de silencios» para Audacious\n"
+"Complemento Eliminación de silencios para Audacious\n"
 "Copyright 2014 John Lindgren"
 
 #: src/silence-removal/silence-removal.cc:67
@@ -3239,740 +3532,684 @@
 msgid "Threshold:"
 msgstr "Umbral:"
 
-#: src/silence-removal/silence-removal.cc:70
-msgid "dB"
-msgstr "dB"
+#: src/skins/actions.cc:45 src/skins-qt/actions.cc:43
+msgid "Repeat points cleared."
+msgstr "Se ha borrado el bucle."
 
-#: src/skins/menus.cc:64
-msgid "Open Files ..."
-msgstr "Abrir archivos ..."
+#: src/skins/actions.cc:60 src/skins-qt/actions.cc:58
+msgid "Repeat point A set."
+msgstr "Punto A del bucle"
 
-#: src/skins/menus.cc:65
-msgid "Open URL ..."
-msgstr "Abrir URL ..."
+#: src/skins/actions.cc:65 src/skins-qt/actions.cc:63
+msgid "Repeat point B set."
+msgstr "Punto B del bucle."
 
-#: src/skins/menus.cc:66
-msgid "Search Library"
-msgstr "Explorar biblioteca"
+#: src/skins/equalizer.cc:223 src/skins-qt/equalizer.cc:223
+msgid "Preamp"
+msgstr "Preamplificación"
 
-#: src/skins/menus.cc:68
-msgid "Playback"
-msgstr "Reproducción"
+#: src/skins/equalizer.cc:227 src/skins-qt/equalizer.cc:227
+msgid "31 Hz"
+msgstr "31 Hz"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "63 Hz"
+msgstr "63 Hz"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "125 Hz"
+msgstr "125 Hz"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "250 Hz"
+msgstr "250 Hz"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "500 Hz"
+msgstr "500 Hz"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "1 kHz"
+msgstr "1 kHz"
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "2 kHz"
+msgstr "2 kHz"
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "4 kHz"
+msgstr "4 kHz"
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "8 kHz"
+msgstr "8 kHz"
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "16 kHz"
+msgstr "16 kHz"
+
+#: src/skins/equalizer.cc:270 src/skins-qt/equalizer.cc:270
+msgid "Audacious Equalizer"
+msgstr "Ecualizador de Audacious"
+
+#: src/skins/main.cc:459 src/skins-qt/main.cc:442
+msgid "Recording on"
+msgstr "Grabación activada"
+
+#: src/skins/main.cc:461 src/skins-qt/main.cc:444
+msgid "Recording off"
+msgstr "Grabación desactivada"
+
+#: src/skins/main.cc:754 src/skins-qt/main.cc:701
+#, 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/main.cc:771 src/skins-qt/main.cc:718
+#, c-format
+msgid "Volume: %d%%"
+msgstr "Volumen: %d%%"
+
+#: src/skins/main.cc:784 src/skins-qt/main.cc:731
+#, c-format
+msgid "Balance: %d%% left"
+msgstr "Balance: %d%% izquierda"
+
+#: src/skins/main.cc:786 src/skins-qt/main.cc:733
+msgid "Balance: center"
+msgstr "Balance: centrado"
+
+#: src/skins/main.cc:788 src/skins-qt/main.cc:735
+#, c-format
+msgid "Balance: %d%% right"
+msgstr "Balance: %d%% derecha"
+
+#: src/skins/main.cc:880 src/skins-qt/main.cc:827
+msgid "Options Menu"
+msgstr "Menú de opciones"
+
+#: src/skins/main.cc:884 src/skins-qt/main.cc:831
+msgid "Disable 'Always On Top'"
+msgstr "Desactivar la opción de siempre encima"
+
+#: src/skins/main.cc:886 src/skins-qt/main.cc:833
+msgid "Enable 'Always On Top'"
+msgstr "Activar la opción de siempre encima"
+
+#: src/skins/main.cc:889 src/skins-qt/main.cc:836
+msgid "File Info Box"
+msgstr "Cuadro de información del archivo"
+
+#: src/skins/main.cc:892 src/skins/menus.cc:149 src/skins-qt/main.cc:839
+#: src/skins-qt/menus.cc:142
+msgid "Double Size"
+msgstr "Tamaño doble"
+
+#: src/skins/main.cc:895 src/skins-qt/main.cc:842
+msgid "Visualizations"
+msgstr "Visualizaciones"
+
+#: src/skins/menus.cc:74 src/skins-qt/menus.cc:64
+msgid "Volume Up"
+msgstr "Subir el volumen"
+
+#: src/skins/menus.cc:75 src/skins-qt/menus.cc:65
+msgid "Volume Down"
+msgstr "Bajar el volumen"
+
+#: src/skins/menus.cc:77 src/skins-qt/menus.cc:67
+msgid "Effects ..."
+msgstr "Efectos…"
 
-#: src/skins/menus.cc:69
+#: src/skins/menus.cc:84 src/skins-qt/menus.cc:74
+msgid "Open Files ..."
+msgstr "Abrir archivos..."
+
+#: src/skins/menus.cc:85 src/skins-qt/menus.cc:76
+msgid "Open URL ..."
+msgstr "Abrir una URL..."
+
+#: src/skins/menus.cc:89 src/skins-qt/menus.cc:80
 msgid "Playlist"
 msgstr "Lista de reproducción"
 
-#: src/skins/menus.cc:70
+#: src/skins/menus.cc:90 src/skins-qt/menus.cc:81
+msgid "Output"
+msgstr "Salida"
+
+#: src/skins/menus.cc:91 src/skins-qt/menus.cc:82
 msgid "View"
 msgstr "Ver"
 
-#: src/skins/menus.cc:72 src/skins/menus.cc:136 src/skins/menus.cc:149
-#: src/skins/menus.cc:214
+#: src/skins/menus.cc:93 src/skins/menus.cc:161 src/skins/menus.cc:174
+#: src/skins/menus.cc:245 src/skins-qt/menus.cc:84 src/skins-qt/menus.cc:156
+#: src/skins-qt/menus.cc:170 src/skins-qt/menus.cc:241
 msgid "Services"
 msgstr "Servicios"
 
-#: src/skins/menus.cc:74
+#: src/skins/menus.cc:95 src/skins-qt/menus.cc:86
 msgid "About ..."
-msgstr "Acerca de ..."
+msgstr "Acerca de..."
 
-#: src/skins/menus.cc:75
+#: src/skins/menus.cc:96 src/skins-qt/menus.cc:87
 msgid "Settings ..."
-msgstr "Preferencias ... "
+msgstr "Ajustes... "
 
-#: src/skins/menus.cc:76
+#: src/skins/menus.cc:97 src/skins-qt/menus.cc:88
 msgid "Quit"
 msgstr "Salir"
 
-#: src/skins/menus.cc:80 src/skins/menus.cc:206
+#: src/skins/menus.cc:101 src/skins/menus.cc:235 src/skins-qt/menus.cc:92
+#: src/skins-qt/menus.cc:231
 msgid "Song Info ..."
-msgstr "Información de la canción ..."
+msgstr "Información de la canción..."
+
+#: src/skins/menus.cc:105 src/skins-qt/menus.cc:96
+msgid "Shuffle by Album"
+msgstr "Orden aleatorio por álbum"
 
-#: src/skins/menus.cc:84
+#: src/skins/menus.cc:106 src/skins-qt/menus.cc:97
 msgid "No Playlist Advance"
 msgstr "No avanzar la lista de reproducción"
 
-#: src/skins/menus.cc:85
-msgid "Stop After This Song"
-msgstr "Detener después de esta canción"
-
-#: src/skins/menus.cc:93
+#: src/skins/menus.cc:117 src/skins-qt/menus.cc:108
 msgid "Set A-B Repeat"
-msgstr "Crear bucle (puntos A-B)"
+msgstr "Crear un bucle (puntos A-B)"
 
-#: src/skins/menus.cc:94
+#: src/skins/menus.cc:118 src/skins-qt/menus.cc:109
 msgid "Clear A-B Repeat"
-msgstr "Borrar bucle"
+msgstr "Borrar el bucle"
 
-#: src/skins/menus.cc:96
+#: src/skins/menus.cc:120 src/skins-qt/menus.cc:111
 msgid "Jump to Song ..."
-msgstr "Ir a la canción ..."
+msgstr "Saltar a la canción..."
 
-#: src/skins/menus.cc:97
+#: src/skins/menus.cc:121 src/skins-qt/menus.cc:113
 msgid "Jump to Time ..."
-msgstr "Ir al momento ..."
+msgstr "Saltar al instante..."
 
-#: src/skins/menus.cc:101
+#: src/skins/menus.cc:125 src/skins-qt/menus.cc:118
 msgid "Play/Resume"
-msgstr "Reproducir/Continuar"
+msgstr "Reproducir/reanudar"
 
-#: src/skins/menus.cc:103
+#: src/skins/menus.cc:127 src/skins-qt/menus.cc:120
 msgid "New Playlist"
-msgstr "Nueva lista de reproducción"
+msgstr "Lista de reproducción nueva"
 
-#: src/skins/menus.cc:104
+#: src/skins/menus.cc:128 src/skins-qt/menus.cc:121
 msgid "Rename Playlist ..."
-msgstr "Renombrar lista ..."
+msgstr "Renombrar la lista de reproducción..."
 
-#: src/skins/menus.cc:105
+#: src/skins/menus.cc:129 src/skins-qt/menus.cc:122
 msgid "Remove Playlist"
-msgstr "Borrar lista ..."
+msgstr "Eliminar la lista de reproducción"
 
-#: src/skins/menus.cc:107
+#: src/skins/menus.cc:131 src/skins-qt/menus.cc:124
 msgid "Previous Playlist"
-msgstr "Lista anterior"
+msgstr "Lista de reproducción anterior"
 
-#: src/skins/menus.cc:108
+#: src/skins/menus.cc:132 src/skins-qt/menus.cc:125
 msgid "Next Playlist"
-msgstr "Lista siguiente"
+msgstr "Lista de reproducción siguiente"
 
-#: src/skins/menus.cc:110
+#: src/skins/menus.cc:134 src/skins-qt/menus.cc:127
 msgid "Import Playlist ..."
-msgstr "Importar lista ..."
+msgstr "Importar un lista de reproducción..."
 
-#: src/skins/menus.cc:111
+#: src/skins/menus.cc:135 src/skins-qt/menus.cc:128
 msgid "Export Playlist ..."
-msgstr "Exportar lista ..."
+msgstr "Exportar la lista de reproducción..."
 
-#: src/skins/menus.cc:113
+#: src/skins/menus.cc:137 src/skins-qt/menus.cc:130
 msgid "Playlist Manager ..."
-msgstr "Gestor de listas ..."
+msgstr "Gestor de listas de reproducción..."
 
-#: src/skins/menus.cc:114
+#: src/skins/menus.cc:138 src/skins-qt/menus.cc:131
 msgid "Queue Manager ..."
-msgstr "Gestor de cola ..."
+msgstr "Gestor de la cola..."
 
-#: src/skins/menus.cc:116
+#: src/skins/menus.cc:140 src/skins-qt/menus.cc:133
 msgid "Refresh Playlist"
-msgstr "Actualizar lista de reproducción"
+msgstr "Actualizar la lista de reproducción"
 
-#: src/skins/menus.cc:120
+#: src/skins/menus.cc:144 src/skins-qt/menus.cc:137
 msgid "Show Playlist Editor"
 msgstr "Mostrar el editor de listas de reproducción"
 
-#: src/skins/menus.cc:121
+#: src/skins/menus.cc:145 src/skins-qt/menus.cc:138
 msgid "Show Equalizer"
 msgstr "Mostrar el ecualizador"
 
-#: src/skins/menus.cc:123
+#: src/skins/menus.cc:147 src/skins-qt/menus.cc:140
 msgid "Show Remaining Time"
-msgstr "Mostrar tiempo restante"
+msgstr "Mostrar el tiempo restante"
 
-#: src/skins/menus.cc:125
+#: src/skins/menus.cc:150 src/skins-qt/menus.cc:143
 msgid "Always on Top"
 msgstr "Siempre encima"
 
-#: src/skins/menus.cc:126
+#: src/skins/menus.cc:151 src/skins-qt/menus.cc:145
 msgid "On All Workspaces"
-msgstr "En todas las áreas de trabajo "
+msgstr "En todas las áreas de trabajo"
 
-#: src/skins/menus.cc:128
+#: src/skins/menus.cc:153 src/skins-qt/menus.cc:148
 msgid "Roll Up Player"
-msgstr "Enrollar reproductor"
+msgstr "Enrollar el reproductor"
 
-#: src/skins/menus.cc:129
+#: src/skins/menus.cc:154 src/skins-qt/menus.cc:149
 msgid "Roll Up Playlist Editor"
-msgstr "Enrollar editor de lista de reproducción"
+msgstr "Enrollar el editor de lista de reproducción"
 
-#: src/skins/menus.cc:130
+#: src/skins/menus.cc:155 src/skins-qt/menus.cc:150
 msgid "Roll Up Equalizer"
-msgstr "Enrollar ecualizador"
-
-#: src/skins/menus.cc:132 src/skins/ui_main.cc:854
-msgid "Double Size"
-msgstr "Duplicar tamaño"
+msgstr "Enrollar el ecualizador"
 
-#: src/skins/menus.cc:138
+#: src/skins/menus.cc:163 src/skins-qt/menus.cc:158
 msgid "Add URL ..."
-msgstr "Añadir URL ..."
+msgstr "Añadir una URL..."
 
-#: src/skins/menus.cc:139
+#: src/skins/menus.cc:164 src/skins-qt/menus.cc:160
 msgid "Add Files ..."
-msgstr "Añadir archivos ..."
+msgstr "Añadir archivos..."
 
-#: src/skins/menus.cc:143 src/skins/menus.cc:171 src/skins/menus.cc:185
+#: src/skins/menus.cc:168 src/skins/menus.cc:196 src/skins/menus.cc:212
+#: src/skins-qt/menus.cc:164 src/skins-qt/menus.cc:192
+#: src/skins-qt/menus.cc:208
 msgid "By Title"
 msgstr "Por título"
 
-#: src/skins/menus.cc:144 src/skins/menus.cc:178 src/skins/menus.cc:192
+#: src/skins/menus.cc:169 src/skins/menus.cc:203 src/skins/menus.cc:219
+#: src/skins-qt/menus.cc:165 src/skins-qt/menus.cc:199
+#: src/skins-qt/menus.cc:215
 msgid "By File Name"
-msgstr "Por nombre de archivo"
+msgstr "Por nombre del archivo"
 
-#: src/skins/menus.cc:145 src/skins/menus.cc:179 src/skins/menus.cc:193
+#: src/skins/menus.cc:170 src/skins/menus.cc:204 src/skins/menus.cc:220
+#: src/skins-qt/menus.cc:166 src/skins-qt/menus.cc:200
+#: src/skins-qt/menus.cc:216
 msgid "By File Path"
-msgstr "Por ruta de archivo"
+msgstr "Por ruta del archivo"
 
-#: src/skins/menus.cc:151
+#: src/skins/menus.cc:176 src/skins-qt/menus.cc:172
 msgid "Remove All"
 msgstr "Eliminar todo"
 
-#: src/skins/menus.cc:152
+#: src/skins/menus.cc:177 src/skins-qt/menus.cc:173
 msgid "Clear Queue"
-msgstr "Limpiar la cola"
+msgstr "Borrar la cola"
 
-#: src/skins/menus.cc:154
+#: src/skins/menus.cc:179 src/skins-qt/menus.cc:175
 msgid "Remove Unavailable Files"
-msgstr "Eliminar los archivos no disponibles"
+msgstr "Eliminar entradas de archivos no disponibles"
 
-#: src/skins/menus.cc:155
+#: src/skins/menus.cc:180 src/skins-qt/menus.cc:176
 msgid "Remove Duplicates"
-msgstr "Eliminar duplicados"
+msgstr "Eliminar entradas duplicadas"
 
-#: src/skins/menus.cc:157
+#: src/skins/menus.cc:182 src/skins-qt/menus.cc:178
 msgid "Remove Unselected"
-msgstr "Eliminar los no seleccionados"
+msgstr "Eliminar entradas no seleccionadas"
 
-#: src/skins/menus.cc:158
+#: src/skins/menus.cc:183 src/skins-qt/menus.cc:179
 msgid "Remove Selected"
-msgstr "Eliminar los seleccionados"
+msgstr "Eliminar entradas seleccionadas"
 
-#: src/skins/menus.cc:162
+#: src/skins/menus.cc:187 src/skins-qt/menus.cc:183
 msgid "Search and Select"
 msgstr "Buscar y seleccionar"
 
-#: src/skins/menus.cc:164
+#: src/skins/menus.cc:189 src/skins-qt/menus.cc:185
 msgid "Invert Selection"
 msgstr "Invertir la selección"
 
-#: src/skins/menus.cc:165
+#: src/skins/menus.cc:190 src/skins-qt/menus.cc:186
 msgid "Select None"
 msgstr "No seleccionar nada"
 
-#: src/skins/menus.cc:166
+#: src/skins/menus.cc:191 src/skins-qt/menus.cc:187
 msgid "Select All"
 msgstr "Seleccionar todo"
 
-#: src/skins/menus.cc:170 src/skins/menus.cc:184
+#: src/skins/menus.cc:195 src/skins/menus.cc:211 src/skins-qt/menus.cc:191
+#: src/skins-qt/menus.cc:207
 msgid "By Track Number"
 msgstr "Por número de pista"
 
-#: src/skins/menus.cc:172 src/skins/menus.cc:186
+#: src/skins/menus.cc:197 src/skins/menus.cc:213 src/skins-qt/menus.cc:193
+#: src/skins-qt/menus.cc:209
 msgid "By Artist"
 msgstr "Por artista"
 
-#: src/skins/menus.cc:173 src/skins/menus.cc:187
+#: src/skins/menus.cc:198 src/skins/menus.cc:214 src/skins-qt/menus.cc:194
+#: src/skins-qt/menus.cc:210
 msgid "By Album"
 msgstr "Por álbum"
 
-#: src/skins/menus.cc:174 src/skins/menus.cc:188
+#: src/skins/menus.cc:199 src/skins/menus.cc:215 src/skins-qt/menus.cc:195
+#: src/skins-qt/menus.cc:211
 msgid "By Album Artist"
 msgstr "Por artista del álbum"
 
-#: src/skins/menus.cc:175 src/skins/menus.cc:190
+#: src/skins/menus.cc:200 src/skins/menus.cc:216 src/skins-qt/menus.cc:196
+#: src/skins-qt/menus.cc:212
 msgid "By Release Date"
-msgstr "Por fecha de lanzamiento"
+msgstr "Por fecha de publicación"
 
-#: src/skins/menus.cc:176 src/skins/menus.cc:189
+#: src/skins/menus.cc:201 src/skins/menus.cc:217 src/skins-qt/menus.cc:197
+#: src/skins-qt/menus.cc:213
 msgid "By Genre"
 msgstr "Por género"
 
-#: src/skins/menus.cc:177 src/skins/menus.cc:191
+#: src/skins/menus.cc:202 src/skins/menus.cc:218 src/skins-qt/menus.cc:198
+#: src/skins-qt/menus.cc:214
 msgid "By Length"
 msgstr "Por duración"
 
-#: src/skins/menus.cc:180 src/skins/menus.cc:194
+#: src/skins/menus.cc:205 src/skins/menus.cc:221 src/skins-qt/menus.cc:201
+#: src/skins-qt/menus.cc:217
 msgid "By Custom Title"
 msgstr "Por título personalizado"
 
-#: src/skins/menus.cc:198
+#: src/skins/menus.cc:206 src/skins/menus.cc:222 src/skins-qt/menus.cc:202
+#: src/skins-qt/menus.cc:218
+msgid "By Comment"
+msgstr "Por comentario"
+
+#: src/skins/menus.cc:207 src/skins/menus.cc:223 src/skins-qt/menus.cc:203
+#: src/skins-qt/menus.cc:219
+msgid "By Disc Number"
+msgstr ""
+
+#: src/skins/menus.cc:227 src/skins-qt/menus.cc:223
 msgid "Randomize List"
 msgstr "Ordenar aleatoriamente"
 
-#: src/skins/menus.cc:199
+#: src/skins/menus.cc:228 src/skins-qt/menus.cc:224
 msgid "Reverse List"
 msgstr "Invertir la lista"
 
-#: src/skins/menus.cc:201
+#: src/skins/menus.cc:230 src/skins-qt/menus.cc:226
 msgid "Sort Selected"
-msgstr "Ordenar los seleccionados"
+msgstr "Ordenar entradas seleccionadas"
 
-#: src/skins/menus.cc:202
+#: src/skins/menus.cc:231 src/skins-qt/menus.cc:227
 msgid "Sort List"
 msgstr "Ordenar lista"
 
-#: src/skins/menus.cc:208
+#: src/skins/menus.cc:236 src/skins-qt/menus.cc:232
+msgid "Open Containing Folder"
+msgstr "Abrir la carpeta que contiene el archivo"
+
+#: src/skins/menus.cc:238 src/skins-qt/menus.cc:234
 msgid "Cut"
 msgstr "Cortar"
 
-#: src/skins/menus.cc:209
+#: src/skins/menus.cc:239 src/skins-qt/menus.cc:235
 msgid "Copy"
 msgstr "Copiar"
 
-#: src/skins/menus.cc:210
+#: src/skins/menus.cc:240 src/skins-qt/menus.cc:236
 msgid "Paste"
 msgstr "Pegar"
 
-#: src/skins/menus.cc:212
-msgid "Queue/Unqueue"
-msgstr "Agregar/Quitar de la cola"
-
-#: src/skins/menus.cc:218
-msgid "Load Preset ..."
-msgstr "Cargar preajuste ..."
+#: src/skins/menus.cc:241 src/skins-qt/menus.cc:237
+msgid "Paste at End"
+msgstr "Pegar al final"
 
-#: src/skins/menus.cc:219
-msgid "Load Auto Preset ..."
-msgstr "Cargar de Predefinidos ..."
+#: src/skins/menus.cc:243 src/skins-qt/menus.cc:239
+msgid "Queue/Unqueue"
+msgstr "Añadir/quitar de la cola"
 
-#: src/skins/menus.cc:220
-msgid "Load Default"
-msgstr "Cargar predeterminado"
+#: src/skins/playlist-widget.cc:58 src/skins-qt/playlist-widget.cc:58
+#, c-format
+msgid "%s (%d of %d)"
+msgstr "%s (%d de %d)"
 
-#: src/skins/menus.cc:221
-msgid "Load Preset File ..."
-msgstr "Cargar de archivo ..."
+#: src/skins/playlistwin.cc:491 src/skins-qt/playlistwin.cc:478
+msgid "Audacious Playlist Editor"
+msgstr "Editor de listas de reproducción de Audacious"
 
-#: src/skins/menus.cc:222
-msgid "Load EQF File ..."
-msgstr "Cargar EQF ..."
+#: src/skins/plugin.cc:53 src/skins-qt/plugin.cc:65
+msgid "Winamp Classic Interface"
+msgstr "Interfaz clásica de Winamp"
 
-#: src/skins/menus.cc:224
-msgid "Save Preset ..."
-msgstr "Guardar preajuste ..."
+#: src/skins-qt/menus.cc:75
+msgid "Open Folder ..."
+msgstr "Abrir una carpeta…"
+
+#: src/skins-qt/menus.cc:159
+msgid "Add Folder ..."
+msgstr "Añadir una carpeta…"
 
-#: src/skins/menus.cc:225
-msgid "Save Auto Preset ..."
-msgstr "Añadir a Predefinidos ..."
+#: src/skins-qt/search-select.cc:62 src/skins/search-select.cc:77
+msgid "Search entries in active playlist"
+msgstr "Buscar entradas en la lista de reproducción activa"
 
-#: src/skins/menus.cc:226
-msgid "Save Default"
-msgstr "Guardar como predeterminado ..."
+#: src/skins-qt/search-select.cc:70 src/skins/search-select.cc:83
+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 ""
+"Seleccione entradas de la lista de reproducción rellenando uno o más campos. "
+"Estos campos aceptan expresiones regulares. Si no sabe cómo funcionan las "
+"expresiones regulares, tan solo escriba el texto que busca. No se distinguen "
+"mayúsculas de minúsculas."
 
-#: src/skins/menus.cc:227
-msgid "Save Preset File ..."
-msgstr "Guardar a archivo"
+#: src/skins-qt/search-select.cc:75 src/skins/search-select.cc:91
+msgid "Title:"
+msgstr "Título:"
 
-#: src/skins/menus.cc:228
-msgid "Save EQF File ..."
-msgstr "Guardar como EQF ..."
+#: src/skins-qt/search-select.cc:79 src/skins/search-select.cc:96
+msgid "Album:"
+msgstr "Álbum:"
 
-#: src/skins/menus.cc:230
-msgid "Delete Preset ..."
-msgstr "Borrar preajuste ..."
+#: src/skins-qt/search-select.cc:82 src/skins/search-select.cc:101
+msgid "Artist:"
+msgstr "Artista:"
 
-#: src/skins/menus.cc:231
-msgid "Delete Auto Preset ..."
-msgstr "Borrar predefinido ..."
+#: src/skins-qt/search-select.cc:85 src/skins/search-select.cc:106
+msgid "File Name:"
+msgstr "Nombre del archivo:"
 
-#: src/skins/menus.cc:233
-msgid "Import Winamp Presets ..."
-msgstr "Importar de Winamp ..."
+#: src/skins-qt/search-select.cc:88 src/skins/search-select.cc:134
+msgid "Clear previous selection before searching"
+msgstr "Borrar la selección anterior antes de buscar"
 
-#: src/skins/menus.cc:235
-msgid "Reset to Zero"
-msgstr "Reiniciar"
+#: src/skins-qt/search-select.cc:89 src/skins/search-select.cc:137
+msgid "Automatically toggle queue for matching entries"
+msgstr "Reemplazar la cola actual por las entradas coincidentes"
 
-#: src/skins/plugin.cc:48
-msgid "Winamp Classic Interface"
-msgstr "Interfaz clásica de Winamp"
+#: src/skins-qt/search-select.cc:90 src/skins/search-select.cc:140
+msgid "Create a new playlist with matching entries"
+msgstr "Crear una lista de reproducción nueva con las entradas coincidentes"
 
-#: src/skins/preset-browser.cc:57 src/skins/preset-list.cc:371
-#: src/skins/preset-list.cc:386
-msgid "Save"
-msgstr "Guardar"
-
-#: src/skins/preset-browser.cc:57 src/skins/preset-list.cc:338
-#: src/skins/preset-list.cc:354
-msgid "Load"
-msgstr "Cargar"
-
-#: src/skins/preset-browser.cc:83
-msgid "Load Preset File"
-msgstr "Cargar archivo de preajuste"
-
-#: src/skins/preset-browser.cc:100
-msgid "Load EQF File"
-msgstr "Cargar archivo EQF"
-
-#: src/skins/preset-browser.cc:119
-msgid "Save Preset File"
-msgstr "Guardar como archivo de preajuste"
-
-#: src/skins/preset-browser.cc:137
-msgid "Save EQF File"
-msgstr "Guardar como archivo EQF"
-
-#: src/skins/preset-browser.cc:151
-msgid "Import Winamp Presets"
-msgstr "Importar preajustes de Winamp"
-
-#: src/skins/preset-list.cc:285
-msgid "Presets"
-msgstr "Preajustes"
-
-#: src/skins/preset-list.cc:335
-msgid "Load preset"
-msgstr "Cargar preajuste"
-
-#: src/skins/preset-list.cc:351
-msgid "Load auto-preset"
-msgstr "Cargar preajuste predefinido"
-
-#: src/skins/preset-list.cc:367
-msgid "Save preset"
-msgstr "Guardar preajuste"
-
-#: src/skins/preset-list.cc:382
-msgid "Save auto-preset"
-msgstr "Guardar preajuste como predefinido"
-
-#: src/skins/preset-list.cc:408
-msgid "Delete preset"
-msgstr "Borrar preajuste"
-
-#: src/skins/preset-list.cc:424
-msgid "Delete auto-preset"
-msgstr "Borrar preajuste predefinido"
+#: src/skins-qt/search-select.cc:101 src/skins/search-select.cc:78
+msgid "Search"
+msgstr "Buscar"
 
-#: src/skins/skins_cfg.cc:176
+#: src/skins-qt/skins_cfg.cc:198 src/skins/skins_cfg.cc:182
 msgid "Player:"
 msgstr "Reproductor:"
 
-#: src/skins/skins_cfg.cc:178
+#: src/skins-qt/skins_cfg.cc:200 src/skins/skins_cfg.cc:184
 msgid "Select main player window font:"
-msgstr "Seleccione la tipografía para la ventana principal:"
+msgstr "Seleccionar la tipografía para la ventana principal:"
 
-#: src/skins/skins_cfg.cc:179
+#: src/skins-qt/skins_cfg.cc:201 src/skins/skins_cfg.cc:185
 msgid "Playlist:"
-msgstr "Lista:"
+msgstr "Lista de reproducción:"
 
-#: src/skins/skins_cfg.cc:181
+#: src/skins-qt/skins_cfg.cc:203 src/skins/skins_cfg.cc:187
 msgid "Select playlist font:"
-msgstr "Seleccione la tipografía de la lista de reproducción:"
+msgstr "Seleccionar la tipografía de la lista de reproducción:"
 
-#: src/skins/skins_cfg.cc:187
+#: src/skins-qt/skins_cfg.cc:207 src/skins/skins_cfg.cc:191
 msgid "Skin"
 msgstr "Tema"
 
-#: src/skins/skins_cfg.cc:189
+#: src/skins-qt/skins_cfg.cc:211 src/skins/skins_cfg.cc:193
+msgid "Display active titlebar when any window is focused"
+msgstr "Mostrar la barra de título activa al enfocar una ventana"
+
+#: src/skins-qt/skins_cfg.cc:213 src/skins/skins_cfg.cc:195
 msgid "Fonts"
-msgstr "Fuentes"
+msgstr "Tipografías"
 
-#: src/skins/skins_cfg.cc:192
+#: src/skins-qt/skins_cfg.cc:215 src/skins/skins_cfg.cc:197
 msgid "Use bitmap fonts (supports ASCII only)"
-msgstr "Usar fuentes de mapa de bits (sólo soporta ASCII)"
+msgstr "Usar tipografías de mapa de bits (solo admite ASCII)"
 
-#: src/skins/skins_cfg.cc:194
+#: src/skins-qt/skins_cfg.cc:217 src/skins/skins_cfg.cc:199
 msgid "Scroll song title"
 msgstr "Desplazar el título de la canción"
 
-#: src/skins/skins_cfg.cc:196
+#: src/skins-qt/skins_cfg.cc:219 src/skins/skins_cfg.cc:201
 msgid "Scroll song title in both directions"
 msgstr "Desplazar el título de la canción en ambas direcciones"
 
-#: src/skins/skins_cfg.cc:201
+#: src/skins-qt/skins_cfg.cc:224 src/skins/skins_cfg.cc:206
 msgid "Analyzer"
 msgstr "Analizador"
 
-#: src/skins/skins_cfg.cc:202
+#: src/skins-qt/skins_cfg.cc:225 src/skins/skins_cfg.cc:207
 msgid "Scope"
-msgstr "Campo"
+msgstr "Osciloscopio"
 
-#: src/skins/skins_cfg.cc:203
+#: src/skins-qt/skins_cfg.cc:226 src/skins/skins_cfg.cc:208
 msgid "Voiceprint / VU meter"
-msgstr "Impresión vocal / Vúmetro"
+msgstr "Impresión vocal / vúmetro"
 
-#: src/skins/skins_cfg.cc:204
+#: src/skins-qt/skins_cfg.cc:227 src/skins/skins_cfg.cc:209
 msgid "Off"
-msgstr "Apagado"
+msgstr "Desactivada"
 
-#: src/skins/skins_cfg.cc:208 src/skins/skins_cfg.cc:233
-#: src/skins/skins_cfg.cc:239
+#: src/skins-qt/skins_cfg.cc:231 src/skins-qt/skins_cfg.cc:256
+#: src/skins-qt/skins_cfg.cc:262 src/skins/skins_cfg.cc:213
+#: src/skins/skins_cfg.cc:238 src/skins/skins_cfg.cc:244
 msgid "Normal"
 msgstr "Normal"
 
-#: src/skins/skins_cfg.cc:209 src/skins/skins_cfg.cc:234
+#: src/skins-qt/skins_cfg.cc:232 src/skins-qt/skins_cfg.cc:257
+#: src/skins/skins_cfg.cc:214 src/skins/skins_cfg.cc:239
 msgid "Fire"
 msgstr "Fuego"
 
-#: src/skins/skins_cfg.cc:210
+#: src/skins-qt/skins_cfg.cc:233 src/skins/skins_cfg.cc:215
 msgid "Vertical lines"
 msgstr "Líneas verticales"
 
-#: src/skins/skins_cfg.cc:214
+#: src/skins-qt/skins_cfg.cc:237 src/skins/skins_cfg.cc:219
 msgid "Lines"
 msgstr "Líneas"
 
-#: src/skins/skins_cfg.cc:215
+#: src/skins-qt/skins_cfg.cc:238 src/skins/skins_cfg.cc:220
 msgid "Bars"
 msgstr "Barras"
 
-#: src/skins/skins_cfg.cc:219
+#: src/skins-qt/skins_cfg.cc:242 src/skins/skins_cfg.cc:224
 msgid "Slowest"
 msgstr "Muy lento"
 
-#: src/skins/skins_cfg.cc:220
+#: src/skins-qt/skins_cfg.cc:243 src/skins/skins_cfg.cc:225
 msgid "Slow"
 msgstr "Lento"
 
-#: src/skins/skins_cfg.cc:221 src/sox-resampler/sox-resampler.cc:152
+#: src/skins-qt/skins_cfg.cc:244 src/skins/skins_cfg.cc:226
+#: src/soxr/sox-resampler.cc:180
 msgid "Medium"
 msgstr "Medio"
 
-#: src/skins/skins_cfg.cc:222
+#: src/skins-qt/skins_cfg.cc:245 src/skins/skins_cfg.cc:227
 msgid "Fast"
 msgstr "Rápido"
 
-#: src/skins/skins_cfg.cc:223
+#: src/skins-qt/skins_cfg.cc:246 src/skins/skins_cfg.cc:228
 msgid "Fastest"
-msgstr "Muy rápido"
+msgstr "El más rápido"
 
-#: src/skins/skins_cfg.cc:227
+#: src/skins-qt/skins_cfg.cc:250 src/skins/skins_cfg.cc:232
 msgid "Dots"
 msgstr "Puntos"
 
-#: src/skins/skins_cfg.cc:228
+#: src/skins-qt/skins_cfg.cc:251 src/skins/skins_cfg.cc:233
 msgid "Line"
 msgstr "Línea"
 
-#: src/skins/skins_cfg.cc:229
+#: src/skins-qt/skins_cfg.cc:252 src/skins/skins_cfg.cc:234
 msgid "Solid"
 msgstr "Sólido"
 
-#: src/skins/skins_cfg.cc:235
+#: src/skins-qt/skins_cfg.cc:258 src/skins/skins_cfg.cc:240
 msgid "Ice"
 msgstr "Hielo"
 
-#: src/skins/skins_cfg.cc:240
+#: src/skins-qt/skins_cfg.cc:263 src/skins/skins_cfg.cc:245
 msgid "Smooth"
 msgstr "Suave"
 
-#: src/skins/skins_cfg.cc:244
-msgid "Type"
-msgstr "Tipo"
-
-#: src/skins/skins_cfg.cc:245
-msgid "Visualization type:"
-msgstr "Visualización:"
-
-#: src/skins/skins_cfg.cc:248
-msgid "Analyzer"
-msgstr "Analizador"
-
-#: src/skins/skins_cfg.cc:249
-msgid "Show peaks"
-msgstr "Mostrar picos"
-
-#: src/skins/skins_cfg.cc:251
+#: src/skins-qt/skins_cfg.cc:267 src/skins/skins_cfg.cc:249
 msgid "Coloring:"
 msgstr "Coloreado:"
 
-#: src/skins/skins_cfg.cc:254
+#: src/skins-qt/skins_cfg.cc:270 src/skins/skins_cfg.cc:252
 msgid "Style:"
 msgstr "Estilo:"
 
-#: src/skins/skins_cfg.cc:257
+#: src/skins-qt/skins_cfg.cc:273 src/skins/skins_cfg.cc:255
 msgid "Falloff:"
-msgstr "Descenso:"
+msgstr "Caída:"
 
-#: src/skins/skins_cfg.cc:260
+#: src/skins-qt/skins_cfg.cc:276 src/skins/skins_cfg.cc:258
 msgid "Peak falloff:"
-msgstr "Descenso de los picos:"
+msgstr "Caída de los picos:"
 
-#: src/skins/skins_cfg.cc:264
+#: src/skins-qt/skins_cfg.cc:282 src/skins/skins_cfg.cc:264
 msgid "Scope Style:"
-msgstr "Estilo de campo:"
+msgstr "Estilo del osciloscopio:"
 
-#: src/skins/skins_cfg.cc:267
+#: src/skins-qt/skins_cfg.cc:285 src/skins/skins_cfg.cc:267
 msgid "Voiceprint Coloring:"
-msgstr "Coloreado de impresión vocal:"
+msgstr "Coloreado de la impresión vocal:"
 
-#: src/skins/skins_cfg.cc:270
+#: src/skins-qt/skins_cfg.cc:288 src/skins/skins_cfg.cc:270
 msgid "VU Meter Style:"
-msgstr "Estilo de vúmetro:"
-
-#: src/skins/skins_cfg.cc:276
-msgid "General"
-msgstr "General"
-
-#: src/skins/skins_cfg.cc:277
-msgid "Visualization"
-msgstr "Visualización"
-
-#: src/skins/ui_equalizer.cc:282
-msgid "Preamp"
-msgstr "Preamplificador"
-
-#: src/skins/ui_equalizer.cc:286
-msgid "31 Hz"
-msgstr "31 Hz"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "63 Hz"
-msgstr "63 Hz"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "125 Hz"
-msgstr "125 Hz"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "250 Hz"
-msgstr "250 Hz"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "500 Hz"
-msgstr "500 Hz"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "1 kHz"
-msgstr "1 kHz"
-
-#: src/skins/ui_equalizer.cc:288
-msgid "2 kHz"
-msgstr "2 kHz"
-
-#: src/skins/ui_equalizer.cc:288
-msgid "4 kHz"
-msgstr "4 kHz"
-
-#: src/skins/ui_equalizer.cc:288
-msgid "8 kHz"
-msgstr "8 kHz"
-
-#: src/skins/ui_equalizer.cc:288
-msgid "16 kHz"
-msgstr "16 kHz"
-
-#: src/skins/ui_equalizer.cc:330
-msgid "Audacious Equalizer"
-msgstr "Ecualizador de Audacious"
+msgstr "Estilo del vúmetro:"
 
-#: src/skins/ui_main.cc:688
-#, 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.cc:709
-#, c-format
-msgid "Volume: %d%%"
-msgstr "Volumen: %d%%"
-
-#: src/skins/ui_main.cc:732
-#, c-format
-msgid "Balance: %d%% left"
-msgstr "Balance: %d%% izquierda"
-
-#: src/skins/ui_main.cc:734
-msgid "Balance: center"
-msgstr "Balance: centrado"
-
-#: src/skins/ui_main.cc:736
-#, c-format
-msgid "Balance: %d%% right"
-msgstr "Balance: %d%% derecha"
-
-#: src/skins/ui_main.cc:842
-msgid "Options Menu"
-msgstr "Menú de opciones"
-
-#: src/skins/ui_main.cc:846
-msgid "Disable 'Always On Top'"
-msgstr "Desactivar 'Siempre encima'"
-
-#: src/skins/ui_main.cc:848
-msgid "Enable 'Always On Top'"
-msgstr "Activar 'Siempre encima'"
-
-#: src/skins/ui_main.cc:851
-msgid "File Info Box"
-msgstr "Caja de información de archivo"
-
-#: src/skins/ui_main.cc:857
-msgid "Visualizations"
-msgstr "Visualizaciones"
-
-#: src/skins/ui_main.cc:1336
-msgid "Repeat point A set."
-msgstr "Punto A del bucle."
-
-#: src/skins/ui_main.cc:1341
-msgid "Repeat point B set."
-msgstr "Punto B del bucle."
-
-#: src/skins/ui_main.cc:1350
-msgid "Repeat points cleared."
-msgstr "Borrar bucle."
-
-#: src/skins/ui_playlist.cc:219
-msgid "Search entries in active playlist"
-msgstr "Buscar en la lista de reproducción activa"
-
-#: src/skins/ui_playlist.cc:226
-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 ""
-"Seleccione entradas de la lista de reproducción rellenando uno o más campos. "
-"Estos campos aceptan expresiones regulares. Si no comprende esto, tan sólo "
-"escriba el texto que desea buscar. No se distinguen mayúsculas de minúsculas."
-
-#: src/skins/ui_playlist.cc:234
-msgid "Title:"
-msgstr "Título:"
-
-#: src/skins/ui_playlist.cc:241
-msgid "Album:"
-msgstr "Álbum:"
-
-#: src/skins/ui_playlist.cc:248
-msgid "Artist:"
-msgstr "Artista:"
-
-#: src/skins/ui_playlist.cc:255
-msgid "File Name:"
-msgstr "Nombre de archivo:"
-
-#: src/skins/ui_playlist.cc:263
-msgid "Clear previous selection before searching"
-msgstr "Limpiar la selección previa antes de buscar"
+#: src/skins-qt/skins_cfg.cc:294 src/skins/skins_cfg.cc:276
+msgid "Type"
+msgstr "Tipo"
 
-#: src/skins/ui_playlist.cc:266
-msgid "Automatically toggle queue for matching entries"
-msgstr "Reemplazar la cola actual por las entradas coincidentes"
+#: src/skins-qt/skins_cfg.cc:295 src/skins/skins_cfg.cc:277
+msgid "Visualization type:"
+msgstr "Tipo de visualización:"
 
-#: src/skins/ui_playlist.cc:269
-msgid "Create a new playlist with matching entries"
-msgstr "Crear una nueva lista de reproducción con las coincidencias"
+#: src/skins-qt/skins_cfg.cc:298 src/skins/skins_cfg.cc:280
+msgid "Analyzer"
+msgstr "Analizador"
 
-#: src/skins/ui_playlist.cc:717
-msgid "Audacious Playlist Editor"
-msgstr "Editor de listas de reproducción de Audacious"
+#: src/skins-qt/skins_cfg.cc:299 src/skins/skins_cfg.cc:281
+msgid "Show peaks"
+msgstr "Mostrar picos"
 
-#: src/skins/ui_playlist.cc:752
-#, c-format
-msgid "%s (%d of %d)"
-msgstr "%s (%d de %d)"
+#: src/skins-qt/skins_cfg.cc:308 src/skins/skins_cfg.cc:290
+msgid "Visualization"
+msgstr "Visualización"
 
-#: src/skins/ui_skinselector.cc:167
+#: src/skins-qt/skinselector.cc:98 src/skins/skinselector.cc:111
 msgid "Archived Winamp 2.x skin"
 msgstr "Tema para Winamp 2.x archivado"
 
-#: src/skins/ui_skinselector.cc:172
+#: src/skins-qt/skinselector.cc:102 src/skins/skinselector.cc:115
 msgid "Unarchived Winamp 2.x skin"
 msgstr "Tema para Winamp 2.x no archivado"
 
-#: src/skins/util.cc:430
-#, c-format
-msgid "Could not create directory (%s): %s\n"
-msgstr "No se pudo crear el directorio (%s): %s\n"
-
-#: src/sndfile/plugin.cc:39
+#: src/sndfile/plugin.cc:38
 msgid "Sndfile Plugin"
 msgstr "Complemento Sndfile"
 
-#: src/sndfile/plugin.cc:336
+#: src/sndfile/plugin.cc:372
 msgid ""
 "Based on the xmms_sndfile plugin:\n"
 "Copyright (C) 2000, 2002 Erik de Castro Lopo\n"
@@ -3993,130 +4230,133 @@
 "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 complemento xmms_sndfile:\n"
+"Basado en el complemento xmms_sndfile.\n"
 "Copyright (C) 2000, 2002 Erik de Castro Lopo\n"
 "\n"
 "Adaptado para Audacious por Tony Vroon <chainsaw@gentoo.org>\n"
 "\n"
-"Este programa es software libre: usted puede redistribuirlo y/o modificarlo "
-"bajo los términos de la Licencia Pública General GNU, publicada por la «Free "
-"Software Foundation» (Fundación para el software libre), ya sea la versión 2 "
-"de la Licencia, o (a su elección) cualquier versión posterior.\n"
+"Este programa es software libre: puede redistribuirlo y/o modificarlo bajo "
+"los términos de la Licencia Pública General de GNU, publicada por la Free "
+"Software Foundation, ya sea la versión 2 de la Licencia o (a su elección) "
+"cualquier versión posterior.\n"
 "\n"
 "Este programa se distribuye con la esperanza de que sea útil, pero SIN "
 "GARANTÍA ALGUNA; ni siquiera la garantía implícita de COMERCIALIZACIÓN o "
-"IDONEIDAD PARA UN PROPÓSITO DETERMINADO. Consulte los detalles de la "
-"Licencia Pública General GNU para obtener una información más detallada.\n"
+"IDONEIDAD PARA UN PROPÓSITO PARTICULAR. Consulte los detalles de la Licencia "
+"Pública General DE GNU para obtener más detalles.\n"
 "\n"
-"Debería haber recibido una copia de la Licencia Pública General GNU junto a "
-"este programa. En caso contrario, escriba a Free Software Foundation, Inc., "
+"Debería haber recibido una copia de la Licencia Pública General de GNU junto "
+"a este programa. Si no es así, escriba a la Free Software Foundation, Inc., "
 "51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 
-#: src/sndio-ng/sndio.cc:44
+#: src/sndio/sndio.cc:43
 msgid "Sndio Output"
 msgstr "Salida Sndio"
 
-#: src/sndio-ng/sndio.cc:98
+#: src/sndio/sndio.cc:98
 msgid "Device (blank for default):"
 msgstr "Dispositivo (en blanco por defecto):"
 
-#: src/sndio-ng/sndio.cc:100
+#: src/sndio/sndio.cc:100
 msgid "Save and restore volume:"
-msgstr "Guardar y restaurar volumen:"
+msgstr "Guardar y restaurar el volumen:"
 
-#: src/sndio-ng/sndio.cc:181
+#: src/sndio/sndio.cc:181
 #, c-format
 msgid "Sndio error: Unsupported audio format (%d)"
-msgstr "Error de sndio: formato de audio (%d) no soportado"
+msgstr "Error de sndio: formato de audio (%d) no compatible"
 
-#: src/sndio-ng/sndio.cc:192
+#: src/sndio/sndio.cc:192
 msgid "Sndio error: sio_open() failed"
-msgstr "Error de sndio: sio_open() falló"
+msgstr "Error de sndio: ha fallado sio_open()"
 
-#: src/sndio-ng/sndio.cc:222
+#: src/sndio/sndio.cc:221
 msgid "Sndio error: sio_setpar() failed"
-msgstr "Error de sndio: sio_setpar() falló"
+msgstr "Error de sndio: ha fallado sio_setpar()"
 
-#: src/sndio-ng/sndio.cc:234
+#: src/sndio/sndio.cc:233
 msgid "Sndio error: sio_start() failed"
-msgstr "Error de sndio: sio_start() falló"
+msgstr "Error de sndio: ha fallado sio_start()"
 
-#: src/song_change/song_change.cc:33
+#: src/songchange/song_change.cc:30
 msgid "Song Change"
 msgstr "Cambio de canción"
 
-#: src/song_change/song_change.cc:342
-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 deberían encerrarse "
-"entre comillas. Hacer lo contrario supone un riesgo de seguridad."
-
-#: src/song_change/song_change.cc:358
+#: src/songchange/song_change.cc:256
 msgid "Commands"
-msgstr "Comandos"
+msgstr "Órdenes"
 
-#: src/song_change/song_change.cc:360
+#: src/songchange/song_change.cc:258
 msgid "Command to run when starting a new song:"
-msgstr "Comando a ejecutar al empezar una nueva canción:"
+msgstr "Orden que se ejecutará al empezar una canción nueva:"
 
-#: src/song_change/song_change.cc:364
+#: src/songchange/song_change.cc:261
+msgid "Command to run when stopping a song:"
+msgstr ""
+
+#: src/songchange/song_change.cc:264
 msgid "Command to run at the end of a song:"
-msgstr "Comando a ejecutar al acabar una canción:"
+msgstr "Orden que se ejecutará al acabar una canción:"
 
-#: src/song_change/song_change.cc:368
+#: src/songchange/song_change.cc:267
 msgid "Command to run at the end of the playlist:"
-msgstr "Comando a ejecutar al concluir la lista de reproducción:"
+msgstr "Orden que se ejecutará al final de la lista de reproducción:"
 
-#: src/song_change/song_change.cc:372
+#: src/songchange/song_change.cc:270
 msgid "Command to run when song title changes (for network streams):"
 msgstr ""
-"Comando a ejecutar cuando el título de la canción cambie (para flujos de "
-"red):"
+"Orden que se ejecutará cuando cambie el título de la canción (para "
+"transmisiones de red):"
 
-#: src/song_change/song_change.cc:376
+#: src/songchange/song_change.cc:273
 msgid ""
-"You can use the following format strings which will be substituted before "
-"calling the command (not all are useful for the end-of-playlist command):\n"
-"\n"
-"%F: Frequency (in hertz)\n"
+"You can use the following format codes, which will be replaced before "
+"running the command.\n"
+"Not all are useful though for the song-stopped or end-of-playlist command."
+msgstr ""
+
+#: src/songchange/song_change.cc:276
+msgid ""
+"%a: Artist\n"
+"%b: Album\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"
+"%F: Frequency (Hertz)\n"
+"%l: Length (milliseconds)\n"
+"%n or %s: Formatted title (see playlist settings)\n"
 "%p: Currently playing (1 or 0)\n"
-"%a: Artist\n"
-"%b: Album\n"
-"%T: Track title"
+"%r: Rate (bits per second)\n"
+"%t: Playlist position\n"
+"%T: Title (unformatted)"
 msgstr ""
-"Puede usar las siguientes cadenas de formato, que serán sustituidas antes de "
-"invocar los comandos (algunas no son válidas para el comando de fin de lista "
-"de reproducción):\n"
-"\n"
-"%F: Frecuencia (en hercios)\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: Tasa (en bits por segundo)\n"
-"%t: Posición en la lista de reproducción (%02d)\n"
-"%p: Reproduciendo (1 o 0)\n"
 "%a: Artista\n"
 "%b: Álbum\n"
-"%T: Título de pista"
-
-#: src/song-info-qt/song-info.cc:32
-msgid "Song Info (Qt)"
-msgstr "Información de la canción (Qt)"
+"%c: Número de canales\n"
+"%f: Nombre del archivo (ruta completa)\n"
+"%F: Frecuencia (hercios)\n"
+"%l: Duración (milisegundos)\n"
+"%n o %s: Título formateado (consulte los ajustes de la lista de "
+"reproducción)\n"
+"%p: Reproducción en curso (1 o 0)\n"
+"%r: Tasa de bits (bits por segundo)\n"
+"%t: Posición en la lista de reproducción\n"
+"%T: Título (sin formato)"
+
+#: src/songchange/song_change.cc:287
+msgid ""
+"Parameters passed to the shell should be enclosed in quotation marks.\n"
+"Unquoted parameters may lead to unexpected results."
+msgstr ""
+
+#: src/song-info-qt/song-info.cc:30
+msgid "Song Info"
+msgstr "Información de la canción"
 
-#: src/sox-resampler/sox-resampler.cc:44
+#: src/soxr/sox-resampler.cc:44
 msgid "SoX Resampler"
 msgstr "Remuestreador SoX"
 
-#: src/sox-resampler/sox-resampler.cc:144
+#: src/soxr/sox-resampler.cc:172
 msgid ""
 "SoX Resampler Plugin for Audacious\n"
 "Copyright 2013 Michał Lipski\n"
@@ -4124,105 +4364,153 @@
 "Based on Sample Rate Converter Plugin:\n"
 "Copyright 2010-2012 John Lindgren"
 msgstr ""
-"Complemento «Remuestreador SoX» para Audacious\n"
+"Complemento Remuestreador SoX para Audacious\n"
 "Copyright 2013 Michał Lipski\n"
 "\n"
-"Basado en el complemento «Convertidor de frecuencia de muestreo»:\n"
+"Basado en el complemento Convertidor de la tasa de muestreo\n"
 "Copyright 2010-2012 John Lindgren"
 
-#: src/sox-resampler/sox-resampler.cc:150
+#: src/soxr/sox-resampler.cc:178
 msgid "Quick"
-msgstr "Rápido"
+msgstr "Rápida"
 
-#: src/sox-resampler/sox-resampler.cc:151
+#: src/soxr/sox-resampler.cc:179
 msgid "Low"
-msgstr "Bajo"
+msgstr "Baja"
 
-#: src/sox-resampler/sox-resampler.cc:153
+#: src/soxr/sox-resampler.cc:181
 msgid "High"
-msgstr "Alto"
+msgstr "Alta"
 
-#: src/sox-resampler/sox-resampler.cc:154
+#: src/soxr/sox-resampler.cc:182
 msgid "Very High"
-msgstr "Muy Alto"
+msgstr "Muy alta"
+
+#: src/soxr/sox-resampler.cc:183
+msgid "Ultra High"
+msgstr "Ultraalta"
+
+#: src/soxr/sox-resampler.cc:187
+msgid "Minimum"
+msgstr "Mínima"
+
+#: src/soxr/sox-resampler.cc:188
+msgid "Intermediate"
+msgstr "Intermedia"
 
-#: src/sox-resampler/sox-resampler.cc:158
+#: src/soxr/sox-resampler.cc:193
 msgid "Quality:"
 msgstr "Calidad"
 
-#: src/speed-pitch/speed-pitch.cc:51
+#: src/soxr/sox-resampler.cc:196
+msgid "Phase:"
+msgstr "Fase:"
+
+#: src/soxr/sox-resampler.cc:200
+msgid "Allow aliasing"
+msgstr "Permitir el solapamiento"
+
+#: src/soxr/sox-resampler.cc:202
+msgid "Use steep filter"
+msgstr "Usar un filtro pronunciado"
+
+#: src/speedpitch/speed-pitch.cc:54
 msgid "Speed and Pitch"
 msgstr "Velocidad y tono"
 
-#: src/speed-pitch/speed-pitch.cc:210
-msgid "Speed and Pitch"
-msgstr "Velocidad y tono"
-
-#: src/speed-pitch/speed-pitch.cc:211
-msgid "Speed:"
-msgstr "Velocidad:"
-
-#: src/speed-pitch/speed-pitch.cc:214
-msgid "Pitch:"
-msgstr "Tono:"
+#: src/speedpitch/speed-pitch.cc:247
+msgid "Speed"
+msgstr "Velocidad"
+
+#: src/speedpitch/speed-pitch.cc:248
+msgid "Decouple from pitch"
+msgstr "Desacoplar del tono"
+
+#: src/speedpitch/speed-pitch.cc:250 src/speedpitch/speed-pitch.cc:258
+msgid "Multiplier:"
+msgstr "Multiplicador:"
+
+#: src/speedpitch/speed-pitch.cc:254
+msgid "Pitch"
+msgstr "Tono"
 
-#: src/statusicon/statusicon.cc:47
+#: src/statusicon-qt/statusicon.cc:45 src/statusicon/statusicon.cc:47
 msgid "Status Icon"
 msgstr "Icono de estado"
 
-#: src/statusicon/statusicon.cc:283
-msgid "Se_ttings ..."
-msgstr "Pre_ferencias ..."
-
-#: src/statusicon/statusicon.cc:372
+#: src/statusicon-qt/statusicon.cc:68
 msgid ""
-"Status Icon Plugin\n"
+"Status Icon Plugin (partial port for Qt interface)\n"
 "\n"
 "Copyright 2005-2007 Giacomo Lozito <james@develia.org>\n"
 "Copyright 2010 Michał Lipski <tallica@o2.pl>\n"
+"Copyright 2015 Eugene Paskevich <eugene@raptor.kiev.ua>\n"
 "\n"
 "This plugin provides a status icon, placed in\n"
 "the system tray area of the window manager."
 msgstr ""
-"Complemento «Icono de estado»\n"
+"Complemento Icono de estado (adaptación parcial para la interfaz Qt)\n"
 "\n"
 "Copyright 2005-2007 Giacomo Lozito <james@develia.org>\n"
-"Copyright 2010 Michał Lipski <tallica@o2.pl>\n"
+"Copyright 2010 Michał Lipski <tallica@o2.pl>>\n"
+"Copyright 2015 Eugene Paskevich <eugene@raptor.kiev.ua>>\n"
 "\n"
-"Este complemento proporciona un icono de estado, que se muestra\n"
-"en la bandeja del sistema del gestor de ventanas."
+"Este complemento proporciona un icono de estado en la\n"
+"bandeja del sistema del gestor de ventanas."
 
-#: src/statusicon/statusicon.cc:379
+#: src/statusicon-qt/statusicon.cc:89 src/statusicon/statusicon.cc:384
 msgid "Mouse Scroll Action"
-msgstr "Acción al deslizar la rueda del ratón"
+msgstr "Acción al desplazar la rueda del ratón"
 
-#: src/statusicon/statusicon.cc:380
+#: src/statusicon-qt/statusicon.cc:90 src/statusicon/statusicon.cc:385
 msgid "Change volume"
 msgstr "Cambiar el volumen"
 
-#: src/statusicon/statusicon.cc:383
+#: src/statusicon-qt/statusicon.cc:93 src/statusicon/statusicon.cc:388
 msgid "Change playing song"
 msgstr "Cambiar la canción en reproducción"
 
-#: src/statusicon/statusicon.cc:386
+#: src/statusicon-qt/statusicon.cc:96 src/statusicon/statusicon.cc:391
 msgid "Other Settings"
-msgstr "Otros parámetros"
+msgstr "Otros ajustes"
 
-#: src/statusicon/statusicon.cc:387
+#: src/statusicon-qt/statusicon.cc:97 src/statusicon/statusicon.cc:392
 msgid "Disable the popup window"
 msgstr "Desactivar la ventana emergente"
 
-#: src/statusicon/statusicon.cc:389
+#: src/statusicon-qt/statusicon.cc:99 src/statusicon/statusicon.cc:394
 msgid "Close to the system tray"
-msgstr "Cerrar a la bandeja del sistema"
+msgstr "Minimizar en la bandeja del sistema al cerrar"
 
-#: src/statusicon/statusicon.cc:391
+#: src/statusicon-qt/statusicon.cc:101 src/statusicon/statusicon.cc:396
 msgid "Advance in playlist when scrolling upward"
-msgstr "Avanzar en la lista de reproducción al desplazar arriba"
+msgstr "Avanzar en la lista de reproducción al desplazarse hacia arriba"
+
+#: src/statusicon-qt/statusicon.cc:116 src/statusicon/statusicon.cc:287
+msgid "Se_ttings ..."
+msgstr "Aj_ustes..."
+
+#: src/statusicon/statusicon.cc:377
+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 ""
+"Complemento Icono de estado\n"
+"\n"
+"Copyright 2005-2007 Giacomo Lozito <james@develia.org>\n"
+"Copyright 2010 Michał Lipski <tallica@o2.pl>\n"
+"\n"
+"Este complemento proporciona un icono de estado que\n"
+"se muestra en la bandeja del sistema del gestor de ventanas."
 
 #: src/stereo_plugin/stereo.cc:19
 msgid "Extra Stereo"
-msgstr "Extra estéreo"
+msgstr "Estéreo extra"
 
 #: src/stereo_plugin/stereo.cc:36
 msgid ""
@@ -4230,28 +4518,168 @@
 "\n"
 "By Johan Levin, 1999"
 msgstr ""
-"Complemento «Extra estéreo»\n"
+"Complemento Estéreo extra\n"
 "\n"
 "Escrito por Johan Levin, 1999"
 
 #: src/stereo_plugin/stereo.cc:44
 msgid "Extra Stereo"
-msgstr "Extra estéreo"
+msgstr "Estéreo extra"
+
+#: src/streamtuner/icecast-model.cc:126 src/streamtuner/shoutcast-model.cc:131
+msgid "Type"
+msgstr "Tipo"
+
+#: src/streamtuner/icecast-model.cc:132
+msgid "Current Song"
+msgstr "Canción actual"
+
+#: src/streamtuner/icecast-model.cc:164
+msgid "Other"
+msgstr "Otro"
+
+#: src/streamtuner/ihr-model.cc:63
+msgid "Market"
+msgstr "Mercado"
+
+#: src/streamtuner/ihr-model.cc:156
+msgid "Call Letters"
+msgstr "Indicativo"
+
+#: src/streamtuner/ihr-model.cc:162
+msgid "Description"
+msgstr "Descripción"
+
+#: src/streamtuner/shoutcast-model.cc:128
+msgid "Listeners"
+msgstr "Oyentes"
+
+#: src/streamtuner/shoutcast-model.cc:188
+msgid "Top 500 Stations"
+msgstr "Las 500 estaciones más importantes"
+
+#: src/streamtuner/shoutcast-model.cc:189
+msgid "Alternative"
+msgstr "Alternativa"
+
+#: src/streamtuner/shoutcast-model.cc:190
+msgid "Blues"
+msgstr "Blues"
+
+#: src/streamtuner/shoutcast-model.cc:191
+msgid "Classical"
+msgstr "Clásica"
+
+#: src/streamtuner/shoutcast-model.cc:192
+msgid "Country"
+msgstr "Country"
+
+#: src/streamtuner/shoutcast-model.cc:193
+msgid "Decades"
+msgstr "Décadas"
+
+#: src/streamtuner/shoutcast-model.cc:194
+msgid "Easy Listening"
+msgstr "Easy listening"
+
+#: src/streamtuner/shoutcast-model.cc:195
+msgid "Electronic"
+msgstr "Electrónica"
+
+#: src/streamtuner/shoutcast-model.cc:196
+msgid "Folk"
+msgstr "Folk"
+
+#: src/streamtuner/shoutcast-model.cc:197
+msgid "Inspirational"
+msgstr "Inspiradora"
+
+#: src/streamtuner/shoutcast-model.cc:198
+msgid "International"
+msgstr "Internacional"
+
+#: src/streamtuner/shoutcast-model.cc:199
+msgid "Jazz"
+msgstr "Jazz"
+
+#: src/streamtuner/shoutcast-model.cc:200
+msgid "Latin"
+msgstr "Latina"
+
+#: src/streamtuner/shoutcast-model.cc:201
+msgid "Metal"
+msgstr "Metal"
+
+#: src/streamtuner/shoutcast-model.cc:203
+msgid "New Age"
+msgstr "New age"
+
+#: src/streamtuner/shoutcast-model.cc:204
+msgid "Pop"
+msgstr "Pop"
+
+#: src/streamtuner/shoutcast-model.cc:205
+msgid "Public Radio"
+msgstr "Radio pública"
+
+#: src/streamtuner/shoutcast-model.cc:206
+msgid "R&B and Urban"
+msgstr "R&B y urbana"
+
+#: src/streamtuner/shoutcast-model.cc:207
+msgid "Rap"
+msgstr "Rap"
+
+#: src/streamtuner/shoutcast-model.cc:208
+msgid "Reggae"
+msgstr "Reggae"
+
+#: src/streamtuner/shoutcast-model.cc:209
+msgid "Rock"
+msgstr "Rock"
+
+#: src/streamtuner/shoutcast-model.cc:210
+msgid "Seasonal and Holiday"
+msgstr "Estacional y festia"
+
+#: src/streamtuner/shoutcast-model.cc:211
+msgid "Soundtracks"
+msgstr "Bandas sonoras"
+
+#: src/streamtuner/shoutcast-model.cc:212
+msgid "Talk"
+msgstr "Habla"
+
+#: src/streamtuner/shoutcast-model.cc:213
+msgid "Themes"
+msgstr "Temas"
+
+#: src/streamtuner/streamtuner.cc:59
+msgid "Shoutcast"
+msgstr "Shoutcast"
+
+#: src/streamtuner/streamtuner.cc:60
+msgid "Icecast"
+msgstr "Icecast"
+
+#: src/streamtuner/streamtuner.cc:71
+msgid "Stream Tuner"
+msgstr "Stream Tuner"
 
 #: src/tonegen/tonegen.cc:45
 msgid "Tone Generator"
 msgstr "Generador de tonos"
 
-#: src/tonegen/tonegen.cc:94
+#: src/tonegen/tonegen.cc:92
 #, c-format
 msgid "%s %.1f Hz"
 msgstr "%s %.1f Hz"
 
-#: src/tonegen/tonegen.cc:94
+#: src/tonegen/tonegen.cc:92
 msgid "Tone Generator: "
 msgstr "Generador de tonos: "
 
-#: src/tonegen/tonegen.cc:160
+#: src/tonegen/tonegen.cc:161
 msgid ""
 "Sine tone generator by Håvard Kvålen <havardk@xmms.org>\n"
 "Modified by Daniel J. Peng <danielpeng@bigfoot.com>\n"
@@ -4264,13 +4692,35 @@
 "\n"
 "Para usarlo, añada un URL de la forma: tone://frecuencia1;frecuencia2;"
 "frecuencia3;...\n"
-"p.ej. tone://2000;2005 para reproducir un tono de 2000 Hz y otro de 2005 Hz"
+"P. ej., tone://2000;2005 para reproducir un tono de 2000 Hz y otro de 2005 "
+"Hz."
+
+#: src/ui-common/dialogs-qt.cc:40
+msgid ""
+"\n"
+"(Further messages have been hidden.)"
+msgstr ""
+"\n"
+"(Se han ocultado el resto de mensajes.)"
+
+#: src/ui-common/dialogs-qt.cc:52
+msgid "Working ..."
+msgstr "Trabajando..."
+
+#: src/ui-common/dialogs-qt.cc:73
+msgid "Information"
+msgstr "Información"
+
+#: src/ui-common/menu-ops-gtk.cc:132 src/ui-common/menu-ops-qt.cc:113
+#, c-format
+msgid "%s does not appear to be a valid folder."
+msgstr "%s no parece una carpeta válida."
 
 #: src/voice_removal/voice_removal.cc:28
 msgid "Voice Removal"
-msgstr "Eliminación de voz"
+msgstr "Eliminación de la voz"
 
-#: src/vorbis/vorbis.cc:465
+#: src/vorbis/vorbis.cc:433
 msgid ""
 "Audacious Ogg Vorbis Decoder\n"
 "\n"
@@ -4292,7 +4742,8 @@
 msgstr ""
 "Descodificador Ogg Vorbis para Audacious\n"
 "\n"
-"Basado en el complemento «Ogg Vorbis» de la Fundación Xiph.org:\n"
+"Basado en el complemento Ogg Vorbis\n"
+"de la Fundación Xiph.org:\n"
 "http://www.xiph.org/\n"
 "\n"
 "Código original escrito por:\n"
@@ -4312,12 +4763,12 @@
 msgid "Ogg Vorbis Decoder"
 msgstr "Descodificador Ogg Vorbis"
 
-#: src/vtx/info.cc:22
+#: src/vtx/info.cc:24
 #, c-format
 msgid "Details about %s"
 msgstr "Detalles sobre %s"
 
-#: src/vtx/info.cc:24
+#: src/vtx/info.cc:26
 msgid ""
 "Title: %t\n"
 "Author: %a\n"
@@ -4339,15 +4790,15 @@
 "Tipo de chip: %c\n"
 "Estéreo: %s\n"
 "Bucle: %l\n"
-"Chip freq: %F\n"
-"Frecuencia de reproducción: %P\n"
+"Frec. del chip: %F\n"
+"Frec. de reproducción: %P\n"
 "Año: %y"
 
 #: src/vtx/vtx.cc:38
 msgid "VTX Decoder"
 msgstr "Descodificador VTX"
 
-#: src/vtx/vtx.cc:184
+#: src/vtx/vtx.cc:178
 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"
@@ -4357,19 +4808,63 @@
 "Basado en in_vtx.dll, creado por Roman Sherbakov <v_soft@microfor.ru>\n"
 "Complemento para Audacious escrito por Pavel Vymetalek <pvymetalek@seznam.cz>"
 
-#: src/wavpack/wavpack.cc:24
+#: src/vumeter-qt/vumeter_qt.cc:31
+msgid ""
+"VU Meter Plugin for Audacious\n"
+"Copyright 2017-2019 Marc Sánchez Fauste"
+msgstr ""
+"Complemento Vúmetro para Audacious\n"
+"Copyright 2017-2019 Marc Sánchez Fauste"
+
+#: src/vumeter-qt/vumeter_qt.cc:35
+msgid "VU Meter Settings"
+msgstr "Ajustes del vúmetro"
+
+#: src/vumeter-qt/vumeter_qt.cc:37
+msgid "Peak hold time:"
+msgstr "Tiempo de mantenimiento del pico:"
+
+#: src/vumeter-qt/vumeter_qt.cc:42
+msgid "Fall-off time:"
+msgstr "Tiempo de caída:"
+
+#: src/vumeter-qt/vumeter_qt.cc:44
+msgid "dB/second"
+msgstr "dB/s"
+
+#: src/vumeter-qt/vumeter_qt.cc:46
+msgid "Display legend"
+msgstr "Mostrar la leyenda"
+
+#: src/vumeter-qt/vumeter_qt.h:37
+msgid "VU Meter"
+msgstr "Vúmetro"
+
+#: src/waveout/waveout.cc:43
+msgid "Win32 waveOut"
+msgstr "waveOut de Win32"
+
+#: src/waveout/waveout.cc:69
+msgid ""
+"Win32 waveOut Plugin for Audacious\n"
+"Copyright 2016 John Lindgren"
+msgstr ""
+"Complementeo waveOut de Win32 para Audacious\n"
+"Copyright 2016 John Lindgren"
+
+#: src/wavpack/wavpack.cc:25
 msgid "WavPack Decoder"
 msgstr "Descodificador WavPack"
 
-#: src/wavpack/wavpack.cc:211
+#: src/wavpack/wavpack.cc:217
 msgid "lossy (hybrid)"
 msgstr "con pérdida (híbrido)"
 
-#: src/wavpack/wavpack.cc:213
+#: src/wavpack/wavpack.cc:219
 msgid "lossy"
 msgstr "con pérdida"
 
-#: src/wavpack/wavpack.cc:255
+#: src/wavpack/wavpack.cc:259
 msgid ""
 "Copyright 2006 William Pitcock <nenolod@nenolod.net>\n"
 "\n"
@@ -4377,20 +4872,40 @@
 msgstr ""
 "Copyright 2006 William Pitcock <nenolod@nenolod.net>\n"
 "\n"
-"Parte del código del complemento escrita por Miles Egan."
+"Parte del código del complemento es de Miles Egan."
 
-#: src/xsf/plugin.cc:50
+#: src/xsf/plugin.cc:74
 msgid "2SF Decoder"
 msgstr "Descodificador 2SF"
 
-#: src/xsf/plugin.cc:238
+#: src/xsf/plugin.cc:429
+msgid "32728 Hz"
+msgstr "32728 Hz"
+
+#: src/xsf/plugin.cc:432
+msgid "65456 Hz"
+msgstr "65456 Hz"
+
+#: src/xsf/plugin.cc:438
+msgid "Cosine"
+msgstr "Coseno"
+
+#: src/xsf/plugin.cc:439
+msgid "Sharp"
+msgstr "Agudo"
+
+#: src/xsf/plugin.cc:443
 msgid "XSF Configuration"
 msgstr "Configuración XSF"
 
-#: src/xsf/plugin.cc:239
-msgid "Ignore length from file"
-msgstr "Ignorar duración del archivo"
+#: src/xsf/plugin.cc:445
+msgid "Default fade time:"
+msgstr "Tiempo de fundido por defecto:"
+
+#: src/xsf/plugin.cc:447
+msgid "Interpolation mode:"
+msgstr "Modo de interpolación:"
 
-#: src/xspf/xspf.cc:89
+#: src/xspf/xspf.cc:95
 msgid "XML Shareable Playlists (XSPF)"
-msgstr "Listas de reproducción XML (XSPF)"
+msgstr "Listas de reproducción XML para compartir (XSPF)"

audacious-plugins-3.6.2-gtk3.tar.bz2/po/es_AR.po -> audacious-plugins-4.4.1.tar.bz2/po/es_AR.po Changed

@@ -5,260 +5,81 @@
 # Translators:
 # Adrián Ramirez Escalante <buried.prophet@gmail.com>, 2012-2013
 # Cosme Domínguez Díaz <cosme.ddiaz@gmail.com>, 2010
+# Guillermo Cabana, 2022
 # Jorge Andrés <winninglero@gmail.com>, 2011
+# Rodolfo <rodolfo.guagnini@gmail.com>, 2017
 # xukosky <xukosky@yahoo.es>, 2011
 msgid ""
 msgstr ""
 "Project-Id-Version: Audacious Plugins\n"
-"Report-Msgid-Bugs-To: http://redmine.audacious-media-player.org/\n"
-"POT-Creation-Date: 2015-02-28 19:18+0100\n"
-"PO-Revision-Date: 2015-02-04 21:21+0000\n"
-"Last-Translator: Thomas Lange <thomas-lange2@gmx.de>\n"
-"Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/"
+"Report-Msgid-Bugs-To: https://github.com/audacious-media-player/audacious/"
+"issues\n"
+"POT-Creation-Date: 2024-09-26 21:54+0200\n"
+"PO-Revision-Date: 2011-10-10 17:43+0000\n"
+"Last-Translator: Guillermo Cabana, 2022\n"
+"Language-Team: Spanish (Argentina) (http://app.transifex.com/audacious/"
 "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"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? "
+"1 : 2;\n"
 
-#: src/aac-raw/aac.cc:18
+#: src/aac/aac.cc:19
 msgid "AAC (Raw) Decoder"
-msgstr ""
+msgstr "Decodificador (crudo) AAC"
 
-#: src/adplug/adplug-xmms.cc:42
+#: src/adplug/adplug-xmms.cc:70
 msgid "AdPlug (AdLib Player)"
 msgstr "AdPlug (Reproductor AdLib)"
 
-#: src/adplug/adplug-xmms.cc:156 src/modplug/modplugbmp.cc:335
-#: src/psf/plugin.cc:138 src/vtx/vtx.cc:87 src/xsf/plugin.cc:113
+#: src/adplug/adplug-xmms.cc:167 src/modplug/modplugbmp.cc:321
+#: src/psf/plugin.cc:161 src/vtx/vtx.cc:89 src/xsf/plugin.cc:204
 msgid "sequenced"
-msgstr ""
-
-#: src/alarm/alarm.cc:55 src/alarm/interface.cc:82
-msgid "Alarm"
-msgstr "Alarma"
-
-#: src/alarm/alarm.cc:782
-msgid "Set Alarm ..."
-msgstr ""
-
-#: src/alarm/alarm.cc:810
-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/interface.cc: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.cc: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.cc: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.cc:81
-msgid "This is your wakeup call."
-msgstr "Esta es su llamada despertador"
-
-#: src/alarm/interface.cc:99
-msgid "Your reminder for today is..."
-msgstr ""
-
-#: src/alarm/interface.cc:101 src/alarm/interface.cc:386
-msgid "Reminder"
-msgstr "Recordatorio"
-
-#: src/alarm/interface.cc:132
-msgid "Monday"
-msgstr "Lunes"
+msgstr "Secuenciado"
 
-#: src/alarm/interface.cc:132
-msgid "Tuesday"
-msgstr "Martes"
-
-#: src/alarm/interface.cc:132
-msgid "Wednesday"
-msgstr "Miércoles"
-
-#: src/alarm/interface.cc:133
-msgid "Thursday"
-msgstr "Jueves"
-
-#: src/alarm/interface.cc:133
-msgid "Friday"
-msgstr "Viernes"
-
-#: src/alarm/interface.cc:133
-msgid "Saturday"
-msgstr "Sábado"
-
-#: src/alarm/interface.cc:133
-msgid "Sunday"
-msgstr "Domingo"
-
-#: src/alarm/interface.cc:171 src/alarm/interface.cc:230
-#: src/alarm/interface.cc:245
-msgid "Time"
-msgstr "Tiempo"
-
-#: src/alarm/interface.cc:178
-msgid "Alarm at (default):"
-msgstr "Alarma a (predeterminado):"
-
-#: src/alarm/interface.cc:200
-msgid "h"
-msgstr "h"
-
-#: src/alarm/interface.cc:203
-msgid "Quiet after:"
-msgstr "Silencio tras:"
-
-#: src/alarm/interface.cc:215
-msgid "hours"
-msgstr "horas"
-
-#: src/alarm/interface.cc:226
-msgid "minutes"
-msgstr "minutos"
-
-#: src/alarm/interface.cc:235
-msgid "Choose the days for the alarm to come on"
-msgstr "Seleccione los días para que salte la alarma"
+#: src/adplug/adplug-xmms.cc:349 src/sid/xs_config.cc:61
+msgid "Output"
+msgstr "Salida"
 
-#: src/alarm/interface.cc:242
-msgid "Day"
-msgstr "Día"
+#: src/adplug/adplug-xmms.cc:350
+msgid "OPL Emulator:"
+msgstr "Emulador OPL:"
+
+#: src/adplug/adplug-xmms.cc:353 src/amidiplug/i_configure.cc:153
+#: src/console/plugin.cc:45 src/filewriter/filewriter.cc:481
+#: src/sid/xs_config.cc:65 src/xsf/plugin.cc:446
+msgid "Sample rate:"
+msgstr "Frecuencia de muestreo"
 
-#: src/alarm/interface.cc:259 src/bs2b/plugin.cc:130
-#: src/skins/preset-list.cc:434 src/skins/preset-list.cc:440
-msgid "Default"
-msgstr "Predeterminado"
+#: src/adplug/adplug-xmms.cc:354 src/amidiplug/i_configure.cc:155
+#: src/bs2b/plugin.cc:141 src/console/plugin.cc:47
+#: src/modplug/plugin_main.cc:77 src/resample/resample.cc:201
+#: src/resample/resample.cc:207 src/resample/resample.cc:211
+#: src/resample/resample.cc:215 src/resample/resample.cc:219
+#: src/resample/resample.cc:223 src/resample/resample.cc:227
+#: src/resample/resample.cc:231 src/resample/resample.cc:235
+#: src/resample/resample.cc:239 src/resample/resample.cc:243
+#: src/sid/xs_config.cc:67 src/soxr/sox-resampler.cc:205
+msgid "Hz"
+msgstr "Hz"
 
-#: src/alarm/interface.cc:288
-msgid "Days"
-msgstr "Días"
-
-#: src/alarm/interface.cc:297
-msgid "Fading"
-msgstr "Desvanecimiento"
-
-#: src/alarm/interface.cc:305 src/console/plugin.cc:41
-#: src/crossfade/crossfade.cc:53 src/crossfade/crossfade.cc:59
-#: src/gtkui/settings.cc:49 src/lirc/lirc.cc:397 src/sid/xs_config.cc:85
-#: src/sid/xs_config.cc:94 src/sid/xs_config.cc:103
-msgid "seconds"
-msgstr "segundos"
+#: src/adplug/adplug-xmms.cc:355 src/gtkui/settings.cc:55
+#: src/modplug/plugin_main.cc:105 src/qtui/settings.cc:85
+#: src/skins-qt/skins_cfg.cc:302 src/skins/skins_cfg.cc:284
+msgid "Miscellaneous"
+msgstr "Varios"
 
-#: src/alarm/interface.cc:312 src/alarm/interface.cc:353
-msgid "Volume"
-msgstr "Volumen"
-
-#: src/alarm/interface.cc:317
-msgid "Start at"
-msgstr "Iniciar a"
-
-#: src/alarm/interface.cc:333
-msgid "Final"
-msgstr "Final"
-
-#: src/alarm/interface.cc:346
-msgid "Current"
-msgstr "Actual"
-
-#: src/alarm/interface.cc:359
-msgid "Additional Command"
-msgstr "Comando adicional"
-
-#: src/alarm/interface.cc:365 src/alarm/interface.cc:391
-msgid "enable"
-msgstr "activar"
-
-#: src/alarm/interface.cc:372
-msgid "Playlist (optional)"
-msgstr "Lista de reproducción (opcional)"
-
-#: src/alarm/interface.cc:379
-msgid "Select a playlist"
-msgstr "Elegir una lista de reproducción"
-
-#: src/alarm/interface.cc:399
-msgid "Options"
-msgstr "Opciones"
-
-#: src/alarm/interface.cc:404
-msgid "What do these options mean?"
-msgstr "¿Qué significan estas opciones?"
-
-#: src/alarm/interface.cc:420
-msgid "Help"
-msgstr "Ayuda"
+#: src/adplug/adplug-xmms.cc:356
+msgid "Repeat song in endless loop"
+msgstr "Repetir canción en bucle sin fin"
 
-#: src/albumart/albumart.cc:31
+#: src/albumart/albumart.cc:31 src/albumart-qt/albumart.cc:35
 msgid "Album Art"
 msgstr "Arte de tapa"
 
-#: src/albumart-qt/albumart.cc:33
-msgid "Album Art (Qt)"
-msgstr ""
-
-#: src/alsa/alsa.h:70
+#: src/alsa/alsa.h:64
 msgid "ALSA Output"
 msgstr "Salida ALSA"
 
@@ -279,7 +100,7 @@
 
 #: src/alsa/config.cc:61
 msgid "(no description)"
-msgstr ""
+msgstr "(sin descripción)"
 
 #: src/alsa/config.cc:166
 msgid "Default PCM device"
@@ -301,11 +122,11 @@
 msgid "Mixer element:"
 msgstr "Elemento mezclador:"
 
-#: src/amidi-plug/amidi-plug.cc:41
+#: src/amidiplug/amidi-plug.cc:42
 msgid "AMIDI-Plug (MIDI Player)"
 msgstr "Plug-AMIDI (Reproductor MIDI)"
 
-#: src/amidi-plug/amidi-plug.cc:437
+#: src/amidiplug/amidi-plug.cc:445
 msgid ""
 "AMIDI-Plug\n"
 "modular MIDI music player\n"
@@ -327,158 +148,181 @@
 "Tony Vroon\n"
 "for the good help with alpha testing"
 msgstr ""
+"AMIDI-Plug\n"
+"Reproductor de música MIDI\n"
+"http://www.develia.org/projects.php?p=amidiplug\n"
+"\n"
+"Escrito por Giacomo Lozito\n"
+"<james@develia.org>\n"
+"\n"
+"Agradecimientos especiales...\n"
+"\n"
+"A Clemens Ladisch y Jaroslav Kysela\n"
+"por sus estupendos programas aplaymidi y amixer; \n"
+"me resultaron muy útiles, junto con la documentación\n"
+"de alsa-lib, para comprender mejor la API de ALSA.\n"
+"\n"
+"A Alfredo Spadafina\n"
+"por ese logo tan bonito de un teclado midi.\n"
+"\n"
+"A Tony Vroon\n"
+"por su inestimable ayuda probando las versiones alfa."
 
-#: src/amidi-plug/i_configure.cc:94
+#: src/amidiplug/i_configure.cc:94
 msgid "Override default gain:"
-msgstr ""
+msgstr "Anular ganancia predeterminada:"
 
-#: src/amidi-plug/i_configure.cc:102
+#: src/amidiplug/i_configure.cc:102
 msgid "Override default polyphony:"
-msgstr ""
+msgstr "Anular polifonía predeterminada:"
 
-#: src/amidi-plug/i_configure.cc:110
+#: src/amidiplug/i_configure.cc:110
 msgid "Override default reverb:"
-msgstr ""
+msgstr "Anular reverberación predeterminada:"
 
-#: src/amidi-plug/i_configure.cc:112 src/amidi-plug/i_configure.cc:120
+#: src/amidiplug/i_configure.cc:112 src/amidiplug/i_configure.cc:120
 msgid "On"
-msgstr ""
+msgstr "Activar"
 
-#: src/amidi-plug/i_configure.cc:118
+#: src/amidiplug/i_configure.cc:118
 msgid "Override default chorus:"
-msgstr ""
+msgstr "Anular coro predeterminado:"
 
-#: src/amidi-plug/i_configure.cc:128 src/console/plugin.cc:29
+#: src/amidiplug/i_configure.cc:128 src/console/plugin.cc:29
 msgid "Playback"
-msgstr ""
+msgstr "Reproducir"
 
-#: src/amidi-plug/i_configure.cc:129
+#: src/amidiplug/i_configure.cc:129
 msgid "Transpose:"
-msgstr ""
+msgstr "Transponer: "
 
-#: src/amidi-plug/i_configure.cc:131
+#: src/amidiplug/i_configure.cc:131 src/speedpitch/speed-pitch.cc:257
 msgid "semitones"
-msgstr ""
+msgstr "semitonos"
 
-#: src/amidi-plug/i_configure.cc:132
+#: src/amidiplug/i_configure.cc:132
 msgid "Drum shift:"
-msgstr ""
+msgstr "Cambio de batería: "
 
-#: src/amidi-plug/i_configure.cc:134
+#: src/amidiplug/i_configure.cc:134
 msgid "note numbers"
-msgstr ""
+msgstr "números de nota"
 
-#: src/amidi-plug/i_configure.cc:135
+#: src/amidiplug/i_configure.cc:135
 msgid "Skip leading silence"
-msgstr ""
+msgstr "Omitir el silencio inicial"
 
-#: src/amidi-plug/i_configure.cc:137
+#: src/amidiplug/i_configure.cc:137
 msgid "Skip trailing silence"
-msgstr ""
+msgstr "Omitir el silencio final"
 
-#: src/amidi-plug/i_configure.cc:141
+#: src/amidiplug/i_configure.cc:141
 msgid "SoundFont"
-msgstr ""
+msgstr "SoundFont"
 
-#: src/amidi-plug/i_configure.cc:143
+#: src/amidiplug/i_configure.cc:148
 msgid "Synthesizer"
-msgstr ""
-
-#: src/amidi-plug/i_configure.cc:148 src/console/plugin.cc:45
-#: src/sid/xs_config.cc:65
-msgid "Sample rate:"
-msgstr ""
+msgstr "Sintetizador"
 
-#: src/amidi-plug/i_configure.cc:150 src/bs2b/plugin.cc:141
-#: src/console/plugin.cc:47 src/modplug/plugin_main.cc:78
-#: src/resample/resample.cc:201 src/resample/resample.cc:207
-#: src/resample/resample.cc:211 src/resample/resample.cc:215
-#: src/resample/resample.cc:219 src/resample/resample.cc:223
-#: src/resample/resample.cc:227 src/resample/resample.cc:231
-#: src/resample/resample.cc:235 src/resample/resample.cc:239
-#: src/resample/resample.cc:243 src/sid/xs_config.cc:67
-#: src/sox-resampler/sox-resampler.cc:163
-msgid "Hz"
-msgstr "Hz"
-
-#: src/amidi-plug/i_configure-fluidsynth.cc:52
+#: src/amidiplug/i_configure-fluidsynth.cc:58
+#: src/amidiplug/i_configure-fluidsynth.cc:527
 msgid "AMIDI-Plug - select SoundFont file"
 msgstr "Complemento AMIDI - seleccione un archivo SoundFont"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:55 src/filewriter/mp3.cc:658
+#: src/amidiplug/i_configure-fluidsynth.cc:61
 msgid "_Cancel"
-msgstr ""
+msgstr "_Cancelar"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:56
+#: src/amidiplug/i_configure-fluidsynth.cc:62
 msgid "_Open"
-msgstr ""
+msgstr "_Abrir"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:225 src/gtkui/columns.cc:46
+#: src/amidiplug/i_configure-fluidsynth.cc:233
+#: src/amidiplug/i_configure-fluidsynth.cc:461
 msgid "File name"
 msgstr "Nombre del archivo"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:229
+#: src/amidiplug/i_configure-fluidsynth.cc:237
+#: src/amidiplug/i_configure-fluidsynth.cc:464
 msgid "Size (bytes)"
 msgstr "Tamaño (bytes)"
 
-#: src/amidi-plug/i_fileinfo.cc:163
+#: src/amidiplug/i_fileinfo.cc:184
 msgid "Name:"
 msgstr "Nombre:"
 
-#: src/amidi-plug/i_fileinfo.cc:181
+#: src/amidiplug/i_fileinfo.cc:202
 msgid " MIDI Info "
 msgstr " Información MIDI "
 
-#: src/amidi-plug/i_fileinfo.cc:195
+#: src/amidiplug/i_fileinfo.cc:216
 msgid "Format:"
 msgstr "Formato:"
 
-#: src/amidi-plug/i_fileinfo.cc:198
+#: src/amidiplug/i_fileinfo.cc:219
 msgid "Length (msec):"
 msgstr "Longitud (mseg):"
 
-#: src/amidi-plug/i_fileinfo.cc:201
+#: src/amidiplug/i_fileinfo.cc:222
 msgid "No. of Tracks:"
 msgstr "Nro. de Pistas:"
 
-#: src/amidi-plug/i_fileinfo.cc:207
+#: src/amidiplug/i_fileinfo.cc:228
 msgid "variable"
 msgstr "variable"
 
-#: src/amidi-plug/i_fileinfo.cc:209
+#: src/amidiplug/i_fileinfo.cc:230
 msgid "BPM:"
 msgstr "BPM:"
 
-#: src/amidi-plug/i_fileinfo.cc:217
+#: src/amidiplug/i_fileinfo.cc:238
 msgid "BPM (wavg):"
 msgstr "BPM (wavg):"
 
-#: src/amidi-plug/i_fileinfo.cc:220
+#: src/amidiplug/i_fileinfo.cc:241
 msgid "Time Div:"
 msgstr "Div tiempo:"
 
-#: src/amidi-plug/i_fileinfo.cc:231
+#: src/amidiplug/i_fileinfo.cc:252
 msgid " MIDI Comments and Lyrics "
 msgstr " Comentarios y letras MIDI "
 
-#: src/amidi-plug/i_fileinfo.cc:278
+#: src/amidiplug/i_fileinfo.cc:299
 msgid "* no comments available in this MIDI file *"
 msgstr "* no hay comentarios disponibles en este archivo MIDI *"
 
-#: src/amidi-plug/i_fileinfo.cc:290
+#: src/amidiplug/i_fileinfo.cc:311
 msgid "* no lyrics available in this MIDI file *"
 msgstr "* no hay letras disponibles en este archivo MIDI *"
 
-#: src/amidi-plug/i_fileinfo.cc:300 src/filewriter/vorbis.cc:197
-#: src/ladspa/plugin.cc:416
+#: src/amidiplug/i_fileinfo.cc:321 src/ladspa/plugin.cc:418
+#: src/ui-common/dialogs-qt.cc:32
 msgid "_Close"
 msgstr "_Cerrar"
 
-#: src/amidi-plug/i_fileinfo.cc:325
+#: src/amidiplug/i_fileinfo.cc:346
 msgid " (invalid UTF-8)"
 msgstr " (UTF-8 no válido)"
 
-#: src/aosd/aosd.cc:32
+#: src/ampache/ampache.cc:33
+msgid "Ampache Browser"
+msgstr "Navegador Ampache"
+
+#: src/ampache/ampache.cc:46
+msgid ""
+"Ampache Browser for Audacious\n"
+"http://ampache-browser.org/\n"
+"\n"
+"Copyright (C) Róbert Čerňanský and John Lindgren\n"
+"License: GNU GPLv3"
+msgstr ""
+"Ampache Browser para Audacious\n"
+"http://ampache-browser.org/\n"
+"\n"
+"Copyright (C) Róbert Čerňanský y John Lindgren\n"
+"Licencia: GNU GPLv3"
+
+#: src/aosd/aosd.cc:31
 msgid ""
 "Audacious OSD\n"
 "http://www.develia.org/projects.php?p=audacious#aosd\n"
@@ -488,6 +332,13 @@
 "Based in part on Evan Martin's Ghosd library:\n"
 "http://neugierig.org/software/ghosd/"
 msgstr ""
+"OSD Audacious\n"
+"http://www.develia.org/projects.php?p=audacious#aosd\n"
+"\n"
+"Escrito por Giacomo Lozito <james@develia.org>\n"
+"\n"
+"Basado en parte en la librería Ghosd de Evan Martin:\n"
+"http://neugierig.org/software/ghosd/"
 
 #: src/aosd/aosd.h:37
 msgid "AOSD (On-Screen Display)"
@@ -505,130 +356,130 @@
 msgid "Concave Rectangle"
 msgstr "Rectángulo cóncavo"
 
-#: src/aosd/aosd_style.cc:69
+#: src/aosd/aosd_style.cc:69 src/openmpt/mptwrap.h:50 src/xsf/plugin.cc:436
 msgid "None"
 msgstr "Ninguno"
 
-#: src/aosd/aosd_trigger.cc:50
+#: src/aosd/aosd_trigger.cc:49
 msgid "Playback Start"
 msgstr "Reproducción iniciada"
 
-#: src/aosd/aosd_trigger.cc:51
+#: src/aosd/aosd_trigger.cc:50
 msgid "Triggers OSD when a playlist entry is played."
 msgstr "Avisa cuando se reproduce un elemento de la lista de reproducción."
 
-#: src/aosd/aosd_trigger.cc:56
+#: src/aosd/aosd_trigger.cc:55
 msgid "Title Change"
 msgstr "Cambio de título"
 
-#: src/aosd/aosd_trigger.cc:57
+#: src/aosd/aosd_trigger.cc:56
 msgid "Triggers OSD when the song title changes (for internet streams)."
-msgstr ""
+msgstr "Lanza OSD cuando el título de pista cambia (para streams de internet)."
 
-#: src/aosd/aosd_trigger.cc:62
+#: src/aosd/aosd_trigger.cc:61
 msgid "Pause On"
 msgstr "Inicio de pausa"
 
-#: src/aosd/aosd_trigger.cc:63
+#: src/aosd/aosd_trigger.cc:62
 msgid "Triggers OSD when playback is paused."
 msgstr "Avisa cuando la reproducción es pausada."
 
-#: src/aosd/aosd_trigger.cc:68
+#: src/aosd/aosd_trigger.cc:67
 msgid "Pause Off"
 msgstr "Fin de pausa"
 
-#: src/aosd/aosd_trigger.cc:69
+#: src/aosd/aosd_trigger.cc:68
 msgid "Triggers OSD when playback is unpaused."
 msgstr "Avisa cuando la reproducción se reanuda."
 
-#: src/aosd/aosd_ui.cc:163
+#: src/aosd/aosd_ui.cc:204
 msgid "Placement"
 msgstr "Colocación"
 
-#: src/aosd/aosd_ui.cc:196
+#: src/aosd/aosd_ui.cc:241
 msgid "Relative X offset:"
 msgstr "Desplazamiento X relativo:"
 
-#: src/aosd/aosd_ui.cc:203
+#: src/aosd/aosd_ui.cc:245
 msgid "Relative Y offset:"
 msgstr "Desplazamiento Y relativo:"
 
-#: src/aosd/aosd_ui.cc:210
+#: src/aosd/aosd_ui.cc:249
 msgid "Max OSD width:"
 msgstr "Ancho máximo:"
 
-#: src/aosd/aosd_ui.cc:221
+#: src/aosd/aosd_ui.cc:281
 msgid "Multi-Monitor options"
 msgstr "Opciones multi-monitor"
 
-#: src/aosd/aosd_ui.cc:225
+#: src/aosd/aosd_ui.cc:285
 msgid "Display OSD using:"
 msgstr "Mostrar notificaciones utilizando:"
 
-#: src/aosd/aosd_ui.cc:227
+#: src/aosd/aosd_ui.cc:287
 msgid "all monitors"
 msgstr "todos los monitores"
 
-#: src/aosd/aosd_ui.cc:230
+#: src/aosd/aosd_ui.cc:290
 #, c-format
 msgid "monitor %i"
 msgstr "monitor %i"
 
-#: src/aosd/aosd_ui.cc:282
+#: src/aosd/aosd_ui.cc:342
 msgid "Timing (ms)"
 msgstr "Temporización (ms)"
 
-#: src/aosd/aosd_ui.cc:287
+#: src/aosd/aosd_ui.cc:347
 msgid "Display:"
 msgstr "Mostrar:"
 
-#: src/aosd/aosd_ui.cc:292
+#: src/aosd/aosd_ui.cc:352
 msgid "Fade in:"
 msgstr "Desvanecimiento de entrada:"
 
-#: src/aosd/aosd_ui.cc:297
+#: src/aosd/aosd_ui.cc:357
 msgid "Fade out:"
 msgstr "Desvanecimiento de salida:"
 
-#: src/aosd/aosd_ui.cc:361
+#: src/aosd/aosd_ui.cc:442
 msgid "Fonts"
 msgstr "Tipografías"
 
-#: src/aosd/aosd_ui.cc:368
+#: src/aosd/aosd_ui.cc:449
 #, c-format
 msgid "Font %i:"
 msgstr "Tipografía %i:"
 
-#: src/aosd/aosd_ui.cc:382
+#: src/aosd/aosd_ui.cc:466
 msgid "Shadow"
 msgstr "Sombra"
 
-#: src/aosd/aosd_ui.cc:486
+#: src/aosd/aosd_ui.cc:589
 msgid "Render Style"
 msgstr "Estilo de renderizado"
 
-#: src/aosd/aosd_ui.cc:502
+#: src/aosd/aosd_ui.cc:605
 msgid "Colors"
 msgstr "Colores"
 
-#: src/aosd/aosd_ui.cc:513
+#: src/aosd/aosd_ui.cc:616
 #, c-format
 msgid "Color %i:"
 msgstr "Color %i:"
 
-#: src/aosd/aosd_ui.cc:600
+#: src/aosd/aosd_ui.cc:714
 msgid "Enable trigger"
 msgstr "Activar disparador"
 
-#: src/aosd/aosd_ui.cc:627
+#: src/aosd/aosd_ui.cc:741
 msgid "Event"
 msgstr "Evento"
 
-#: src/aosd/aosd_ui.cc:655
+#: src/aosd/aosd_ui.cc:768
 msgid "Composite manager detected"
 msgstr "Administrador de composición detectado"
 
-#: src/aosd/aosd_ui.cc:662
+#: src/aosd/aosd_ui.cc:775
 msgid ""
 "Composite manager not detected;\n"
 "unless you know that you have one running, please activate a composite "
@@ -639,66 +490,62 @@
 "administrador de composición o las notificaciones no funcionarán "
 "correctamente"
 
-#: src/aosd/aosd_ui.cc:670
+#: src/aosd/aosd_ui.cc:783
 msgid "Composite manager not required for fake transparency"
 msgstr "Administrador de composición no necesario para transparencia falsa"
 
-#: src/aosd/aosd_ui.cc:706
+#: src/aosd/aosd_ui.cc:820
 msgid "Transparency"
 msgstr "Transparencia"
 
-#: src/aosd/aosd_ui.cc:712
+#: src/aosd/aosd_ui.cc:826
 msgid "Fake transparency"
 msgstr "Transparencia falsa"
 
-#: src/aosd/aosd_ui.cc:714
+#: src/aosd/aosd_ui.cc:828
 msgid "Real transparency (requires X Composite Ext.)"
 msgstr "Transparencia real (requiere composición 3D)"
 
-#: src/aosd/aosd_ui.cc:756
+#: src/aosd/aosd_ui.cc:875
 msgid "Composite extension not loaded"
 msgstr "Extensión de composición no cargada"
 
-#: src/aosd/aosd_ui.cc:764
-msgid "Composite extension not available"
-msgstr "Extensión de composición no disponible"
-
-#: src/aosd/aosd_ui.cc:781
+#: src/aosd/aosd_ui.cc:892
 #, c-format
 msgid "Audacious OSD"
 msgstr "Notificaciones de Audacious"
 
-#: src/aosd/aosd_ui.cc:844
+#: src/aosd/aosd_ui.cc:955
 msgid "Position"
 msgstr "Posición"
 
-#: src/aosd/aosd_ui.cc:849
+#: src/aosd/aosd_ui.cc:960
 msgid "Animation"
 msgstr "Animación"
 
-#: src/aosd/aosd_ui.cc:854
+#: src/aosd/aosd_ui.cc:965
 msgid "Text"
 msgstr "Texto"
 
-#: src/aosd/aosd_ui.cc:859
+#: src/aosd/aosd_ui.cc:970
 msgid "Decoration"
 msgstr "Decoración"
 
-#: src/aosd/aosd_ui.cc:864
+#: src/aosd/aosd_ui.cc:975
 msgid "Trigger"
 msgstr "Disparador"
 
-#: src/aosd/aosd_ui.cc:869
+#: src/aosd/aosd_ui.cc:980 src/streamtuner/shoutcast-model.cc:202
 msgid "Misc"
 msgstr "Varios"
 
-#: src/aosd/aosd_ui.cc:878
+#: src/aosd/aosd_ui.cc:989
 msgid "Test"
-msgstr ""
+msgstr "Probar"
 
 #: src/asx3/asx3.cc:35
 msgid "ASXv3 Playlists"
-msgstr ""
+msgstr "Listas de reproducción ASXv3"
 
 #: src/asx/asx.cc:33
 msgid "ASXv1/ASXv2 Playlists"
@@ -708,11 +555,83 @@
 msgid "Audacious Playlists (audpl)"
 msgstr "Listas de reproducción Audacious (audpl)"
 
-#: src/blur_scope/blur_scope.cc:42
+#: src/background_music/background_music.cc:24
+msgid "Background music"
+msgstr ""
+
+#: src/background_music/background_music.cc:25
+msgid "Target level:"
+msgstr ""
+
+#: src/background_music/background_music.cc:28
+#: src/background_music/background_music.cc:33
+#: src/silence-removal/silence-removal.cc:70
+msgid "dB"
+msgstr "dB"
+
+#: src/background_music/background_music.cc:29
+msgid "Maximum amplification:"
+msgstr ""
+
+#: src/background_music/background_music.cc:34 src/mpg123/mpg123.cc:81
+msgid "Advanced"
+msgstr "Avanzado"
+
+#: src/background_music/background_music.cc:36
+msgid "Slow detection weight:"
+msgstr ""
+
+#: src/background_music/background_music.cc:39
+msgid "Hint"
+msgstr ""
+
+#: src/background_music/background_music.cc:41
+msgid ""
+"Slow detection weight is the relative weight\n"
+"of a long term average detection when compared\n"
+"to the actual, faster loudness detection.\n"
+"A value of zero gives a more radio-like sound\n"
+"where soft passages get \"pulled up\" more quickly,\n"
+"a value of two makes the sound feel less compressed."
+msgstr ""
+
+#: src/background_music/background_music.cc:52
+msgid ""
+"Background Music Plugin for Audacious\n"
+"Copyright 2023;2024 Michel Fleur\n"
+"\n"
+"Controls the volume to make the sound equally loud within and between "
+"tracks.\n"
+" It uses accurate loudness measurement and tries to make the volume changes "
+"sound natural without audible peaks, yet without lowering the volume before "
+"a peak in advance."
+msgstr ""
+
+#: src/background_music/background_music.cc:61
+msgid "Background Music"
+msgstr ""
+
+#: src/bitcrusher/bitcrusher.cc:33
+msgid "Bitcrusher"
+msgstr "Bitcrusher"
+
+#: src/bitcrusher/bitcrusher.cc:34
+msgid "Bit Depth:"
+msgstr "Profundidad de bit:"
+
+#: src/bitcrusher/bitcrusher.cc:37
+msgid "Downsample ratio:"
+msgstr "Tasa de reducción de la muestra:"
+
+#: src/bitcrusher/bitcrusher.cc:48
+msgid "Bitcrusher"
+msgstr "Bitcrusher"
+
+#: src/blur_scope/blur_scope.cc:40 src/blur_scope-qt/blur_scope.cc:45
 msgid "Color"
 msgstr "Color"
 
-#: src/blur_scope/blur_scope.cc:58
+#: src/blur_scope/blur_scope.cc:56 src/blur_scope-qt/blur_scope.cc:158
 msgid "Blur Scope"
 msgstr "Niebla Borrosa"
 
@@ -724,27 +643,31 @@
 msgid "Presets:"
 msgstr "Predefinidos:"
 
+#: src/bs2b/plugin.cc:130
+msgid "Default"
+msgstr "Predeterminado"
+
 #: src/bs2b/plugin.cc:136
 msgid "Feed level:"
 msgstr "Nivel de alimentación:"
 
 #: src/bs2b/plugin.cc:138
 msgid "x1/10 dB"
-msgstr ""
+msgstr "x1/10 dB"
 
 #: src/bs2b/plugin.cc:139
 msgid "Cut frequency:"
 msgstr "Cortar frecuencia:"
 
-#: src/cairo-spectrum/cairo-spectrum.cc:41
+#: src/cairo-spectrum/cairo-spectrum.cc:42 src/qt-spectrum/qt-spectrum.cc:107
 msgid "Spectrum Analyzer"
 msgstr "Analizador de Espectro"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:72
+#: src/cdaudio/cdaudio-ng.cc:74
 msgid "Audio CD Plugin"
 msgstr "Plugin de CD de audio"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:121
+#: src/cdaudio/cdaudio-ng.cc:121
 msgid ""
 "Copyright (C) 2007-2012 Calin Crisan <ccrisan@gmail.com> and others.\n"
 "\n"
@@ -755,133 +678,142 @@
 "\n"
 "This was a Google Summer of Code 2007 project."
 msgstr ""
+"Copyright (C) 2007-2012 Calin Crisan <ccrisan@gmail.com> y otros.\n"
+"\n"
+"Muchas gracias a los desarrolladores de:\n"
+"libcdio <http://www.gnu.org/software/libcdio/>\n"
+"y libcddb <http://libcddb.sourceforge.net/>.\n"
+"\n"
+"Gracias también a Tony Vroon por ser mi mentor y mi guía.\n"
+"\n"
+"Este fue un proyecto del Google Summer of Code de 2007."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:137
+#: src/cdaudio/cdaudio-ng.cc:140
 msgid "Device"
 msgstr "Dispositivo"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:138
+#: src/cdaudio/cdaudio-ng.cc:141
 msgid "Read speed:"
 msgstr "Leer velocidad:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:141
+#: src/cdaudio/cdaudio-ng.cc:144
 msgid "Override device:"
 msgstr "Anular dispositivo:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:143
+#: src/cdaudio/cdaudio-ng.cc:146
 msgid "Metadata"
 msgstr "Metadatos"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:144
+#: src/cdaudio/cdaudio-ng.cc:147
 msgid "Use CD-Text"
 msgstr "Usar CD-Texto"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:146
+#: src/cdaudio/cdaudio-ng.cc:150
 msgid "Use CDDB"
 msgstr "Usar CDDB"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:148
+#: src/cdaudio/cdaudio-ng.cc:152
 msgid "Use HTTP instead of CDDBP"
 msgstr "Usar HTTP en lugar de CDDBP"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:151
+#: src/cdaudio/cdaudio-ng.cc:155
 msgid "Server:"
 msgstr "Servidor:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:155
+#: src/cdaudio/cdaudio-ng.cc:159
 msgid "Path:"
 msgstr "Ruta:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:159
+#: src/cdaudio/cdaudio-ng.cc:163
 msgid "Port:"
 msgstr "Puerto:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:246
+#: src/cdaudio/cdaudio-ng.cc:228
 msgid "Failed to initialize cdio subsystem."
 msgstr "Error en la inicialización del subsistema cdio."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:281
+#: src/cdaudio/cdaudio-ng.cc:260
 #, c-format
 msgid "Invalid URI %s."
 msgstr "URI inválido %s."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:283
+#: src/cdaudio/cdaudio-ng.cc:262
 #, c-format
 msgid "Track %d not found."
 msgstr "Pista %d no encontrada."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:285
+#: src/cdaudio/cdaudio-ng.cc:264
 #, c-format
 msgid "Track %d is a data track."
-msgstr ""
+msgstr "Pista %d es una pista de datos."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:360
+#: src/cdaudio/cdaudio-ng.cc:339
 msgid "Error reading audio CD."
-msgstr ""
+msgstr "Error al leer CD de audio."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:429
+#: src/cdaudio/cdaudio-ng.cc:410
 msgid "Audio CD"
 msgstr "CD de audio"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:460 src/cdaudio-ng/cdaudio-ng.cc:469
+#: src/cdaudio/cdaudio-ng.cc:446 src/cdaudio/cdaudio-ng.cc:455
 #, c-format
 msgid "Failed to open CD device %s."
 msgstr "Error al abrir la lectora de CD %s."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:472
+#: src/cdaudio/cdaudio-ng.cc:458
 msgid "No audio capable CD drive found."
 msgstr "No hay audio que se pueda reproducir en la lectora de CD localizada."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:497
+#: src/cdaudio/cdaudio-ng.cc:481
+msgid "Drive is empty."
+msgstr "La unidad está vacía."
+
+#: src/cdaudio/cdaudio-ng.cc:483
+msgid "Unsupported disk type."
+msgstr "Tipo de disco no soportado."
+
+#: src/cdaudio/cdaudio-ng.cc:507
 msgid "Failed to finish initializing opened CD drive."
 msgstr "Error al finalizar la lectora de CD inicializada oportunamente."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:510
+#: src/cdaudio/cdaudio-ng.cc:520
 msgid "Failed to retrieve first/last track number."
 msgstr "Error al obtener el primer/último número de pista."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:531
+#: src/cdaudio/cdaudio-ng.cc:541
 #, c-format
 msgid "Cannot read start/end LSN for track %d."
 msgstr "No se puede leer el LSN del comienzo/final de la pista %d."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:613
-msgid "Failed to create the cddb connection."
-msgstr "Error al crear la conexión a cddb."
+#: src/cdaudio/cdaudio-ng.cc:624
+msgid "Failed to create the CDDB connection."
+msgstr "Fallo al crear la conexión a CDDB."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:679
+#: src/cdaudio/cdaudio-ng.cc:690
 msgid "Failed to query the CDDB server"
 msgstr "Error al consultar el servidor CDDB"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:681
+#: src/cdaudio/cdaudio-ng.cc:692
 #, c-format
 msgid "Failed to query the CDDB server: %s"
 msgstr "Error al consultar el servidor CDDB: %s"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:705
+#: src/cdaudio/cdaudio-ng.cc:716
 #, c-format
-msgid "Failed to read the cddb info: %s"
-msgstr "Error al leer la información cddb: %s"
+msgid "Failed to read the CDDB info: %s"
+msgstr "Fallo al leer la info CDDB: %s"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:765
-msgid "Drive is empty."
-msgstr "La unidad está vacía."
-
-#: src/cdaudio-ng/cdaudio-ng.cc:767
-msgid "Unsupported disk type."
-msgstr "Tipo de disco no soportado."
-
-#: src/cd-menu-items/cd-menu-items.cc:35
+#: src/cd-menu-items/cd-menu-items.cc:33
 msgid "Audio CD Menu Items"
 msgstr "Items de menú del CD de audio"
 
-#: src/cd-menu-items/cd-menu-items.cc:47
-msgid "Play CD"
-msgstr "Reproducir CD"
-
-#: src/cd-menu-items/cd-menu-items.cc:47
-msgid "Add CD"
-msgstr "Agregar CD"
+#: src/cd-menu-items/cd-menu-items.cc:45
+msgid "Pla_y CD"
+msgstr "R_eproducir CD"
+
+#: src/cd-menu-items/cd-menu-items.cc:45
+msgid "_Add CD"
+msgstr "_Añadir CD"
 
 #: src/compressor/compressor.cc:45
 msgid "Compression"
@@ -900,6 +832,8 @@
 "Dynamic Range Compression Plugin for Audacious\n"
 "Copyright 2010-2014 John Lindgren"
 msgstr ""
+"Plugin de Compresión de Rango Dinámico para Audacious\n"
+"Copyright 2010-2014 John Lindgren"
 
 #: src/compressor/compressor.cc:64
 msgid "Dynamic Range Compressor"
@@ -931,7 +865,14 @@
 msgid "Default song length:"
 msgstr "Longitud de canción predeterminada:"
 
-#: src/console/plugin.cc:42 src/modplug/plugin_main.cc:59
+#: src/console/plugin.cc:41 src/crossfade/crossfade.cc:56
+#: src/crossfade/crossfade.cc:62 src/lirc/lirc.cc:395 src/notify/notify.cc:113
+#: src/sid/xs_config.cc:85 src/sid/xs_config.cc:94 src/sid/xs_config.cc:103
+#: src/vumeter-qt/vumeter_qt.cc:39
+msgid "seconds"
+msgstr "segundos"
+
+#: src/console/plugin.cc:42 src/modplug/plugin_main.cc:58
 msgid "Resampling"
 msgstr ""
 
@@ -955,77 +896,82 @@
 msgid "Game Console Music Decoder"
 msgstr "Decodificador musical de videoconsola"
 
-#: src/coreaudio/coreaudio.cc:50
+#: src/coreaudio/coreaudio.cc:53
 msgid "CoreAudio output"
 msgstr ""
 
-#: src/coreaudio/coreaudio.cc:131
+#: src/coreaudio/coreaudio.cc:155
 msgid ""
 "CoreAudio Output Plugin for Audacious\n"
 "Copyright 2014 William Pitcock\n"
+"Copyright 2017,18 René J.V. Bertin\n"
+" (original code and code adapted from\n"
+" Apple examples, (C) Apple 2013)\n"
 "\n"
 "Based on SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
 msgstr ""
 
-#: src/coreaudio/coreaudio.cc:143
+#: src/coreaudio/coreaudio.cc:171
 msgid "Use exclusive mode"
 msgstr ""
 
-#: src/crossfade/crossfade.cc:44
+#: src/coreaudio/coreaudio.cc:173
+msgid "Use bit perfect audio (adapt device sampling rate)"
+msgstr ""
+
+#: src/crossfade/crossfade.cc:47
 msgid ""
 "Crossfade Plugin for Audacious\n"
 "Copyright 2010-2014 John Lindgren"
 msgstr ""
 
-#: src/crossfade/crossfade.cc:48
+#: src/crossfade/crossfade.cc:51
 msgid "Crossfade"
 msgstr "Fundido de pistas"
 
-#: src/crossfade/crossfade.cc:49
+#: src/crossfade/crossfade.cc:52
 msgid "On automatic song change"
 msgstr ""
 
-#: src/crossfade/crossfade.cc:51 src/crossfade/crossfade.cc:57
+#: src/crossfade/crossfade.cc:54 src/crossfade/crossfade.cc:60
 msgid "Overlap:"
 msgstr "Superposición:"
 
-#: src/crossfade/crossfade.cc:55
+#: src/crossfade/crossfade.cc:58
 msgid "On seek or manual song change"
 msgstr ""
 
-#: src/crossfade/crossfade.cc:61
+#: src/crossfade/crossfade.cc:64
+msgid "No fade in"
+msgstr ""
+
+#: src/crossfade/crossfade.cc:66
+msgid "Use S-curve fade"
+msgstr ""
+
+#: src/crossfade/crossfade.cc:68
+msgid "S-curve steepness:"
+msgstr ""
+
+#: src/crossfade/crossfade.cc:70
+msgid "(higher is steeper)"
+msgstr ""
+
+#: src/crossfade/crossfade.cc:72
 msgid "Tip"
 msgstr ""
 
-#: src/crossfade/crossfade.cc:62
+#: src/crossfade/crossfade.cc:73
 msgid ""
 "For better crossfading, enable\n"
 "the Silence Removal effect."
 msgstr ""
 
-#: src/crossfade/crossfade.cc:72
+#: src/crossfade/crossfade.cc:83
 msgid "Crossfade"
 msgstr "Fundido de pistas:"
 
-#: src/crossfade/crossfade.cc:161
-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."
-
-#: src/crossfade/crossfade.cc:168
-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."
-
 #: src/crystalizer/crystalizer.cc:31
 msgid "Crystalizer"
 msgstr "Cristalizador"
@@ -1038,60 +984,61 @@
 msgid "Crystalizer"
 msgstr "Cristalizador"
 
-#: src/cue/cue.cc:37
+#: src/cue/cue.cc:42
 msgid "Cue Sheet Plugin"
 msgstr "Plugin para hoja cue"
 
-#: src/delete-files/delete-files.cc:46 src/delete-files/delete-files.cc:146
+#: src/delete-files/delete-files.cc:53 src/delete-files/delete-files.cc:215
+#: src/delete-files/delete-files.cc:230
 msgid "Delete Files"
 msgstr ""
 
-#: src/delete-files/delete-files.cc:75
-#, c-format
-msgid "Error moving %s to trash: %s."
+#: src/delete-files/delete-files.cc:120
+msgid "No files are selected."
 msgstr ""
 
-#: src/delete-files/delete-files.cc:86
+#: src/delete-files/delete-files.cc:125
 #, c-format
-msgid "Error deleting %s: %s."
+msgid "Do you want to move %s to the trash?"
 msgstr ""
 
-#: src/delete-files/delete-files.cc:117
+#: src/delete-files/delete-files.cc:126
 #, c-format
-msgid "Error deleting %s: not a local file."
+msgid "Do you want to permanently delete %s?"
 msgstr ""
 
-#: src/delete-files/delete-files.cc:134
-msgid "Do you want to move the selected files to the trash?"
+#: src/delete-files/delete-files.cc:133
+#, c-format
+msgid "Do you want to move %d files to the trash?"
 msgstr ""
 
-#: src/delete-files/delete-files.cc:135
-msgid "Move to Trash"
+#: src/delete-files/delete-files.cc:134
+#, c-format
+msgid "Do you want to permanently delete %d files?"
 msgstr ""
 
-#: src/delete-files/delete-files.cc:140
-msgid "Do you want to permanently delete the selected files?"
+#: src/delete-files/delete-files.cc:146
+msgid "Move to trash"
 msgstr ""
 
-#: src/delete-files/delete-files.cc:141 src/skins/preset-list.cc:411
-#: src/skins/preset-list.cc:427
+#: src/delete-files/delete-files.cc:146
 msgid "Delete"
 msgstr "Borrar"
 
-#: src/delete-files/delete-files.cc:145 src/skins/preset-browser.cc:56
-#: src/skins/preset-list.cc:307 src/skins/ui_playlist.cc:221
+#: src/delete-files/delete-files.cc:213 src/delete-files/delete-files.cc:235
+#: src/skins-qt/search-select.cc:102 src/skins/search-select.cc:78
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: src/delete-files/delete-files.cc:166
+#: src/delete-files/delete-files.cc:267
 msgid "Delete Selected Files"
 msgstr ""
 
-#: src/delete-files/delete-files.cc:181
+#: src/delete-files/delete-files.cc:287
 msgid "Delete Method"
 msgstr ""
 
-#: src/delete-files/delete-files.cc:182
+#: src/delete-files/delete-files.cc:288
 msgid "Move to trash instead of deleting immediately"
 msgstr ""
 
@@ -1107,13 +1054,13 @@
 msgid "Echo"
 msgstr "Eco"
 
-#: src/echo_plugin/echo.cc:22 src/modplug/plugin_main.cc:73
-#: src/modplug/plugin_main.cc:83
+#: src/echo_plugin/echo.cc:22 src/modplug/plugin_main.cc:72
+#: src/modplug/plugin_main.cc:82
 msgid "Delay:"
 msgstr "Retardo:"
 
-#: src/echo_plugin/echo.cc:24 src/modplug/plugin_main.cc:73
-#: src/modplug/plugin_main.cc:83
+#: src/echo_plugin/echo.cc:24 src/modplug/plugin_main.cc:72
+#: src/modplug/plugin_main.cc:82 src/xsf/plugin.cc:445
 msgid "ms"
 msgstr "ms"
 
@@ -1121,7 +1068,7 @@
 msgid "Feedback:"
 msgstr "Retroalimentación:"
 
-#: src/echo_plugin/echo.cc:28 src/modplug/plugin_main.cc:87
+#: src/echo_plugin/echo.cc:28 src/modplug/plugin_main.cc:86
 msgid "Volume:"
 msgstr "Volumen:"
 
@@ -1129,11 +1076,11 @@
 msgid "Echo"
 msgstr "Eco"
 
-#: src/ffaudio/ffaudio-core.cc:41
+#: src/ffaudio/ffaudio-core.cc:50
 msgid "FFmpeg Plugin"
 msgstr "Plugin FFmpeg"
 
-#: src/ffaudio/ffaudio-core.cc:571
+#: src/ffaudio/ffaudio-core.cc:649
 msgid ""
 "Multi-format audio decoding plugin for Audacious using\n"
 "FFmpeg multimedia framework (http://www.ffmpeg.org/)\n"
@@ -1143,235 +1090,308 @@
 "Matti Hämäläinen <ccr@tnsp.org>"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:45
+#: src/filewriter/filewriter.cc:48
 msgid "FileWriter Plugin"
 msgstr "Plugin FileWriter"
 
-#: src/filewriter/filewriter.cc:386
+#: src/filewriter/filewriter.cc:316
+#, c-format
+msgid ""
+"Error opening %s:\n"
+"%s"
+msgstr ""
+"Error abriendo %s:\n"
+"%s"
+
+#: src/filewriter/filewriter.cc:358
+msgid ""
+"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/filewriter/filewriter.cc:385
 msgid "Output file format:"
 msgstr "Formato del archivo de salida:"
 
-#: src/filewriter/filewriter.cc:403
-msgid "Configure"
-msgstr "Configurar"
-
-#: src/filewriter/filewriter.cc:413
+#: src/filewriter/filewriter.cc:389
 msgid "Save into original directory"
 msgstr "Guardar dentro del directorio original"
 
-#: src/filewriter/filewriter.cc:417
-msgid "Save into custom directory"
-msgstr "Guardar dentro de directorio personalizado"
-
-#: src/filewriter/filewriter.cc:427
-msgid "Output file folder:"
-msgstr "Carpeta de archivo de salida:"
-
-#: src/filewriter/filewriter.cc:431
-msgid "Pick a folder"
-msgstr "Elija una carpeta"
-
-#: src/filewriter/filewriter.cc:444
-msgid "Generate file name from:"
+#: src/filewriter/filewriter.cc:392
+msgid "Save into custom directory:"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:448
-msgid "Original file tag"
+#: src/filewriter/filewriter.cc:400
+msgid "Generate file name from:"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:453
+#: src/filewriter/filewriter.cc:401
 msgid "Original file name"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:459
-msgid "Include original file name extension"
+#: src/filewriter/filewriter.cc:404
+msgid "Original file name (no suffix)"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:468
-msgid "Prepend track number to file name"
+#: src/filewriter/filewriter.cc:407
+msgid "Original file tag"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:484
-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."
+#: src/filewriter/filewriter.cc:411
+msgid "Prepend track number to file name"
 msgstr ""
 
-#: src/filewriter/mp3.cc:40 src/filewriter/mp3.cc:717
+#: src/filewriter/filewriter.cc:417 src/filewriter/filewriter.cc:449
 msgid "Auto"
 msgstr "Auto"
 
-#: src/filewriter/mp3.cc:40
+#: src/filewriter/filewriter.cc:418
+msgid "8000 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:419
+msgid "11025 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:420
+msgid "12000 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:421
+msgid "16000 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:422
+msgid "22050 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:423
+msgid "24000 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:424
+msgid "32000 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:425 src/xsf/plugin.cc:430
+msgid "44100 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:426 src/xsf/plugin.cc:431
+msgid "48000 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:430
+msgid "8 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:431
+msgid "16 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:432
+msgid "32 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:433
+msgid "40 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:434
+msgid "48 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:435
+msgid "56 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:436
+msgid "64 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:437
+msgid "80 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:438
+msgid "96 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:439
+msgid "112 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:440
+msgid "128 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:441
+msgid "160 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:442
+msgid "192 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:443
+msgid "224 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:444
+msgid "256 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:445
+msgid "320 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:450
 msgid "Joint Stereo"
 msgstr "Estéreo conjunto"
 
-#: src/filewriter/mp3.cc:41 src/modplug/plugin_main.cc:58
-#: src/mpg123/mpg123.cc:248
+#: src/filewriter/filewriter.cc:451 src/modplug/plugin_main.cc:57
+#: src/mpg123/mpg123.cc:259
 msgid "Stereo"
 msgstr "Estereo"
 
-#: src/filewriter/mp3.cc:41 src/modplug/plugin_main.cc:57
-#: src/mpg123/mpg123.cc:248
+#: src/filewriter/filewriter.cc:452 src/modplug/plugin_main.cc:56
+#: src/mpg123/mpg123.cc:260
 msgid "Mono"
 msgstr "Mono"
 
-#: src/filewriter/mp3.cc:657
-msgid "MP3 Configuration"
-msgstr "Configuración MP3"
-
-#: src/filewriter/mp3.cc:658
-msgid "_OK"
+#: src/filewriter/filewriter.cc:456
+msgid "VBR"
 msgstr ""
 
-#: src/filewriter/mp3.cc:681
-msgid "Algorithm Quality:"
-msgstr "Calidad del algoritmo:"
-
-#: src/filewriter/mp3.cc:706
-msgid "Output Sample Rate:"
+#: src/filewriter/filewriter.cc:457
+msgid "ABR"
 msgstr ""
 
-#: src/filewriter/mp3.cc:733
-msgid "(Hz)"
-msgstr "(Hz)"
-
-#: src/filewriter/mp3.cc:740
-msgid "Bitrate / Compression Ratio:"
+#: src/filewriter/filewriter.cc:478
+msgid "Algorithm quality:"
 msgstr ""
 
-#: src/filewriter/mp3.cc:764
-msgid "Bitrate (kbps):"
-msgstr "Tasa de bits (kbps):"
+#: src/filewriter/filewriter.cc:484
+msgid "Bitrate:"
+msgstr "Muestreo de bits:"
 
-#: src/filewriter/mp3.cc:796
+#: src/filewriter/filewriter.cc:491
 msgid "Compression ratio:"
 msgstr "Compresión:"
 
-#: src/filewriter/mp3.cc:820
-msgid "Audio Mode:"
-msgstr "Modo de sonido:"
-
-#: src/filewriter/mp3.cc:845
-msgid "Miscellaneous:"
+#: src/filewriter/filewriter.cc:498
+msgid "Audio mode:"
 msgstr ""
 
-#: src/filewriter/mp3.cc:856
+#: src/filewriter/filewriter.cc:501
 msgid "Enforce strict ISO compliance"
 msgstr ""
 
-#: src/filewriter/mp3.cc:867
+#: src/filewriter/filewriter.cc:503
 msgid "Error protection"
 msgstr "Error de protección"
 
-#: src/filewriter/mp3.cc:879 src/filewriter/vorbis.cc:206
-msgid "Quality"
-msgstr "Calidad"
-
-#: src/filewriter/mp3.cc:888
+#: src/filewriter/filewriter.cc:508
 msgid "Enable VBR/ABR"
 msgstr "Activar VBR/ABR"
 
-#: src/filewriter/mp3.cc:898
+#: src/filewriter/filewriter.cc:510
 msgid "Type:"
 msgstr "Tipo:"
 
-#: src/filewriter/mp3.cc:931
-msgid "VBR Options:"
-msgstr "Opciones VBR:"
-
-#: src/filewriter/mp3.cc:947
-msgid "Minimum bitrate (kbps):"
-msgstr "Tasa de bits mínima (kbps):"
-
-#: src/filewriter/mp3.cc:973
-msgid "Maximum bitrate (kbps):"
-msgstr "Tasa de bits máxima (kbps):"
+#: src/filewriter/filewriter.cc:514
+msgid "Minimum bitrate:"
+msgstr ""
 
-#: src/filewriter/mp3.cc:995
-msgid "Strictly enforce minimum bitrate"
-msgstr "Aplicar estrictamente la tasa de bits mínima"
+#: src/filewriter/filewriter.cc:518
+msgid "Maximum bitrate:"
+msgstr ""
 
-#: src/filewriter/mp3.cc:1007
-msgid "ABR Options:"
-msgstr "Opciones ABR:"
-
-#: src/filewriter/mp3.cc:1017
-msgid "Average bitrate (kbps):"
-msgstr "Tasa de bits promedio (kbps):"
+#: src/filewriter/filewriter.cc:522
+msgid "Average bitrate:"
+msgstr ""
 
-#: src/filewriter/mp3.cc:1044
+#: src/filewriter/filewriter.cc:526
 msgid "VBR quality level:"
 msgstr "Nivel de calidad VBR:"
 
-#: src/filewriter/mp3.cc:1063
+#: src/filewriter/filewriter.cc:530
+msgid "Strictly enforce minimum bitrate"
+msgstr "Aplicar estrictamente la tasa de bits mínima"
+
+#: src/filewriter/filewriter.cc:533
 msgid "Omit Xing VBR header"
 msgstr ""
 
-#: src/filewriter/mp3.cc:1076
-msgid "VBR/ABR"
-msgstr "VBR/ABR"
-
-#: src/filewriter/mp3.cc:1085
-msgid "Frame Parameters:"
+#: src/filewriter/filewriter.cc:539
+msgid "Frame Headers"
 msgstr ""
 
-#: src/filewriter/mp3.cc:1097
+#: src/filewriter/filewriter.cc:540
 msgid "Mark as copyright"
 msgstr "Marcar como derechos de autor"
 
-#: src/filewriter/mp3.cc:1108
+#: src/filewriter/filewriter.cc:542
 msgid "Mark as original"
 msgstr "Marcar como original"
 
-#: src/filewriter/mp3.cc:1120
-msgid "ID3 Parameters:"
+#: src/filewriter/filewriter.cc:544
+msgid "ID3 Tags"
 msgstr ""
 
-#: src/filewriter/mp3.cc:1131
+#: src/filewriter/filewriter.cc:545
 msgid "Force addition of version 2 tag"
 msgstr "Forzar adición de etiqueta de la versión 2"
 
-#: src/filewriter/mp3.cc:1141
+#: src/filewriter/filewriter.cc:547
 msgid "Only add v1 tag"
 msgstr "Solo agregar etiqueta v1"
 
-#: src/filewriter/mp3.cc:1148
+#: src/filewriter/filewriter.cc:549
 msgid "Only add v2 tag"
 msgstr "Solo agregar etiqueta v2"
 
-#: src/filewriter/mp3.cc:1169
+#: src/filewriter/filewriter.cc:554
+msgid "Quality"
+msgstr "Calidad"
+
+#: src/filewriter/filewriter.cc:555
+msgid "VBR/ABR"
+msgstr "VBR/ABR"
+
+#: src/filewriter/filewriter.cc:556
 msgid "Tags"
 msgstr "Etiquetas"
 
-#: src/filewriter/vorbis.cc:196
-msgid "Vorbis Encoder Configuration"
-msgstr "Configuración de codificador Vorbis"
-
-#: src/filewriter/vorbis.cc:219
-msgid "Quality level (0 - 10):"
-msgstr "Nivel de calidad (0 - 10):"
+#: src/filewriter/filewriter.cc:566
+msgid "Quality (0-1):"
+msgstr ""
 
-#: src/flacng/flacng.h:35
+#: src/filewriter/filewriter.cc:573 src/skins-qt/skins_cfg.cc:307
+#: src/skins/skins_cfg.cc:289
+msgid "General"
+msgstr "General"
+
+#: src/flac/flacng.h:36
 msgid "FLAC Decoder"
 msgstr "Decodificador FLAC"
 
-#: src/flacng/metadata.cc:351 src/wavpack/wavpack.cc:209
+#: src/flac/metadata.cc:296 src/wavpack/wavpack.cc:215
 msgid "lossless"
 msgstr ""
 
-#: src/flacng/plugin.cc:169
+#: src/flac/plugin.cc:214
 msgid ""
 "Original code by\n"
 "Ralf Ertzinger <ralf@skytale.net>\n"
@@ -1389,15 +1409,15 @@
 msgid "GIO Plugin"
 msgstr "Plugin GIO"
 
-#: src/gio/gio.cc:153
+#: src/gio/gio.cc:152
 msgid "Read-and-append mode not supported"
 msgstr ""
 
-#: src/gio/gio.cc:166
+#: src/gio/gio.cc:165
 msgid "Invalid open mode"
 msgstr ""
 
-#: src/gl-spectrum/gl-spectrum.cc:51
+#: src/glspectrum/gl-spectrum.cc:52
 msgid ""
 "OpenGL Spectrum Analyzer for Audacious\n"
 "Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
@@ -1409,622 +1429,755 @@
 "License: GPLv2+"
 msgstr ""
 
-#: src/gl-spectrum/gl-spectrum.cc:62
+#: src/glspectrum/gl-spectrum.cc:63 src/qtglspectrum/gl-spectrum.cc:53
 msgid "OpenGL Spectrum Analyzer"
 msgstr ""
 
-#: src/gl-spectrum-qt/gl-spectrum.cc:41
-msgid ""
-"OpenGL Spectrum Analyzer for Audacious\n"
-"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
-"Copyright 2014 William Pitcock\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-qt/gl-spectrum.cc:53
-msgid "OpenGL Spectrum Analyzer (Qt)"
+#: src/gtkui/columns.cc:36 src/moonstone/playlist_model.cc:38
+#: src/qtui/playlist_model.cc:33
+msgid "Entry Number"
 msgstr ""
 
-#: src/gnomeshortcuts/gnomeshortcuts.cc:38
-msgid "GNOME Shortcuts"
-msgstr ""
-
-#: src/gnomeshortcuts/gnomeshortcuts.cc:54
-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/gtkui/columns.cc:35
-msgid "Entry number"
-msgstr "Número de entrada"
-
-#: src/gtkui/columns.cc:36 src/playlist-manager/playlist-manager.cc:225
-#: src/qtui/playlist_model.cc:123
+#: src/gtkui/columns.cc:37 src/moonstone/playlist_model.cc:38
+#: src/moonstone/playlist_selection.cc:64
+#: src/playlist-manager/playlist-manager.cc:200
+#: src/playlist-manager-qt/playlist-manager-qt.cc:188
+#: src/qtui/playlist_model.cc:33 src/streamtuner/icecast-model.cc:120
+#: src/streamtuner/ihr-model.cc:159 src/streamtuner/shoutcast-model.cc:122
 msgid "Title"
 msgstr "Título"
 
-#: src/gtkui/columns.cc:37 src/qtui/playlist_model.cc:125
+#: src/gtkui/columns.cc:38 src/moonstone/playlist_model.cc:39
+#: src/qtui/playlist_model.cc:33
 msgid "Artist"
 msgstr "Artista"
 
-#: src/gtkui/columns.cc:38
+#: src/gtkui/columns.cc:39 src/moonstone/playlist_model.cc:39
+#: src/qtui/playlist_model.cc:33
 msgid "Year"
 msgstr "Año"
 
-#: src/gtkui/columns.cc:39 src/qtui/playlist_model.cc:127
+#: src/gtkui/columns.cc:40 src/moonstone/playlist_model.cc:39
+#: src/qtui/playlist_model.cc:34
 msgid "Album"
 msgstr "Album"
 
-#: src/gtkui/columns.cc:40
-msgid "Album artist"
-msgstr ""
+#: src/gtkui/columns.cc:41 src/moonstone/playlist_model.cc:40
+#: src/qtui/playlist_model.cc:34
+msgid "Album Artist"
+msgstr "Artista del Album"
 
-#: src/gtkui/columns.cc:41
+#: src/gtkui/columns.cc:42 src/moonstone/playlist_model.cc:40
+#: src/qtui/playlist_model.cc:34
 msgid "Track"
 msgstr "Pista"
 
-#: src/gtkui/columns.cc:42
+#: src/gtkui/columns.cc:43 src/moonstone/playlist_model.cc:40
+#: src/qtui/playlist_model.cc:34 src/streamtuner/icecast-model.cc:123
+#: src/streamtuner/shoutcast-model.cc:125
+#: src/streamtuner/shoutcast-model.cc:236
 msgid "Genre"
 msgstr "Género"
 
-#: src/gtkui/columns.cc:43
-msgid "Queue position"
-msgstr "Posición de la cola"
+#: src/gtkui/columns.cc:44 src/moonstone/playlist_model.cc:41
+#: src/qtui/playlist_model.cc:35
+msgid "Queue Position"
+msgstr ""
 
-#: src/gtkui/columns.cc:44
+#: src/gtkui/columns.cc:45 src/moonstone/playlist_model.cc:41
+#: src/qtui/playlist_model.cc:35
 msgid "Length"
 msgstr "Longitud"
 
-#: src/gtkui/columns.cc:45
-msgid "File path"
-msgstr "Ruta del archivo"
-
-#: src/gtkui/columns.cc:47
-msgid "Custom title"
-msgstr "Título personalizado"
+#: src/gtkui/columns.cc:46 src/moonstone/playlist_model.cc:41
+#: src/qtui/playlist_model.cc:35
+msgid "File Path"
+msgstr ""
+
+#: src/gtkui/columns.cc:47 src/moonstone/playlist_model.cc:42
+#: src/qtui/playlist_model.cc:35
+msgid "File Name"
+msgstr ""
+
+#: src/gtkui/columns.cc:48 src/moonstone/playlist_model.cc:42
+#: src/qtui/playlist_model.cc:36
+msgid "Custom Title"
+msgstr ""
 
-#: src/gtkui/columns.cc:48
+#: src/gtkui/columns.cc:49 src/moonstone/playlist_model.cc:42
+#: src/qtui/playlist_model.cc:36 src/streamtuner/icecast-model.cc:129
+#: src/streamtuner/shoutcast-model.cc:134
 msgid "Bitrate"
 msgstr "Tasa de bits"
 
-#: src/gtkui/columns.cc:308
+#: src/gtkui/columns.cc:50 src/moonstone/playlist_model.cc:43
+#: src/qtui/playlist_model.cc:36
+msgid "Comment"
+msgstr "Comentario"
+
+#: src/gtkui/columns.cc:51 src/qtui/playlist_model.cc:36
+msgid "Publisher"
+msgstr ""
+
+#: src/gtkui/columns.cc:52 src/qtui/playlist_model.cc:37
+msgid "Catalog Number"
+msgstr ""
+
+#: src/gtkui/columns.cc:53 src/moonstone/playlist_model.cc:43
+#: src/qtui/playlist_model.cc:37
+msgid "Disc"
+msgstr ""
+
+#: src/gtkui/columns.cc:325
 msgid "Available columns"
 msgstr ""
 
-#: src/gtkui/columns.cc:334
+#: src/gtkui/columns.cc:351
 msgid "Displayed columns"
 msgstr ""
 
-#: src/gtkui/layout.cc:72 src/search-tool/search-tool.cc:40
+#: src/gtkui/layout.cc:74 src/search-tool-qt/search-tool-qt.cc:58
+#: src/search-tool/search-tool.cc:49
 msgid "Search Tool"
 msgstr "Herramienta de búsqueda"
 
-#: src/gtkui/layout.cc:167
+#: src/gtkui/layout.cc:170
 msgid "Dock at Left"
 msgstr "Acoplar a la izquierda"
 
-#: src/gtkui/layout.cc:167
+#: src/gtkui/layout.cc:170
 msgid "Dock at Right"
 msgstr "Acoplar a la derecha"
 
-#: src/gtkui/layout.cc:168
+#: src/gtkui/layout.cc:171
 msgid "Dock at Top"
 msgstr "Acoplar arriba"
 
-#: src/gtkui/layout.cc:168
+#: src/gtkui/layout.cc:171
 msgid "Dock at Bottom"
 msgstr "Acoplar abajo"
 
-#: src/gtkui/layout.cc:168
+#: src/gtkui/layout.cc:171
 msgid "Undock"
 msgstr "Desacoplar"
 
-#: src/gtkui/layout.cc:168 src/ladspa/plugin.cc:531
+#: src/gtkui/layout.cc:171 src/ladspa/plugin.cc:540
 msgid "Disable"
 msgstr "Deshabilitar"
 
-#: src/gtkui/menus.cc:126 src/qtui/main_window_actions.cc:93
-#: src/statusicon/statusicon.cc:276
+#: src/gtkui/menus.cc:79 src/qtui/menus.cc:107
+#: src/statusicon-qt/statusicon.cc:115 src/statusicon/statusicon.cc:286
 msgid "_Open Files ..."
 msgstr "_Abrir archivos ..."
 
-#: src/gtkui/menus.cc:127
+#: src/gtkui/menus.cc:80 src/qtui/menus.cc:111
 msgid "Open _URL ..."
 msgstr "Abrir _URL ..."
 
-#: src/gtkui/menus.cc:128 src/qtui/main_window_actions.cc:95
+#: src/gtkui/menus.cc:81 src/qtui/menus.cc:113
 msgid "_Add Files ..."
 msgstr "_Añadir archivos ..."
 
-#: src/gtkui/menus.cc:129
+#: src/gtkui/menus.cc:82 src/qtui/menus.cc:118
 msgid "Add U_RL ..."
 msgstr "Añadir U_RL ..."
 
-#: src/gtkui/menus.cc:131
+#: src/gtkui/menus.cc:84 src/qtui/menus.cc:120
 msgid "Search _Library"
 msgstr ""
 
-#: src/gtkui/menus.cc:133 src/qtui/main_window_actions.cc:98
+#: src/gtkui/menus.cc:86 src/qtui/menus.cc:123
 msgid "A_bout ..."
 msgstr "A_cerca de ..."
 
-#: src/gtkui/menus.cc:134 src/qtui/main_window_actions.cc:99
+#: src/gtkui/menus.cc:87 src/qtui/menus.cc:125
 msgid "_Settings ..."
 msgstr ""
 
-#: src/gtkui/menus.cc:135 src/qtui/main_window_actions.cc:103
-#: src/statusicon/statusicon.cc:284
+#: src/gtkui/menus.cc:88 src/qtui/menus.cc:131
+#: src/statusicon-qt/statusicon.cc:117 src/statusicon/statusicon.cc:288
 msgid "_Quit"
 msgstr "_Salir"
 
-#: src/gtkui/menus.cc:139 src/gtkui/menus.cc:262
-#: src/qtui/main_window_actions.cc:107 src/search-tool/search-tool.cc:641
-#: src/statusicon/statusicon.cc:278
+#: src/gtkui/menus.cc:92 src/gtkui/menus.cc:226
+#: src/moonstone/playlist_tabs.cc:306 src/qtui/menus.cc:135
+#: src/qtui/playlist_tabs.cc:331 src/search-tool-qt/search-tool-qt.cc:499
+#: src/search-tool/search-tool.cc:339 src/statusicon-qt/statusicon.cc:109
+#: src/statusicon/statusicon.cc:280
 msgid "_Play"
 msgstr "_Reproducir"
 
-#: src/gtkui/menus.cc:140 src/qtui/main_window_actions.cc:108
-#: src/statusicon/statusicon.cc:279
+#: src/gtkui/menus.cc:93 src/qtui/menus.cc:137
+#: src/statusicon-qt/statusicon.cc:110 src/statusicon/statusicon.cc:281
 msgid "Paus_e"
 msgstr "Pa_usar"
 
-#: src/gtkui/menus.cc:141 src/qtui/main_window_actions.cc:109
-#: src/statusicon/statusicon.cc:280
+#: src/gtkui/menus.cc:94 src/qtui/menus.cc:139
+#: src/statusicon-qt/statusicon.cc:111 src/statusicon/statusicon.cc:282
 msgid "_Stop"
 msgstr "_Detener"
 
-#: src/gtkui/menus.cc:142 src/qtui/main_window_actions.cc:110
-#: src/statusicon/statusicon.cc:277
+#: src/gtkui/menus.cc:95 src/qtui/menus.cc:141
+#: src/statusicon-qt/statusicon.cc:112 src/statusicon/statusicon.cc:283
 msgid "Pre_vious"
 msgstr "An_terior"
 
-#: src/gtkui/menus.cc:143 src/qtui/main_window_actions.cc:111
-#: src/statusicon/statusicon.cc:281
+#: src/gtkui/menus.cc:96 src/qtui/menus.cc:143
+#: src/statusicon-qt/statusicon.cc:113 src/statusicon/statusicon.cc:284
 msgid "_Next"
 msgstr "Si_guiente"
 
-#: src/gtkui/menus.cc:145 src/qtui/main_window_actions.cc:113
+#: src/gtkui/menus.cc:97 src/qtui/menus.cc:145 src/skins/menus.cc:114
+#: src/skins-qt/menus.cc:105
+msgid "Previous Album"
+msgstr ""
+
+#: src/gtkui/menus.cc:98 src/qtui/menus.cc:146 src/skins/menus.cc:115
+#: src/skins-qt/menus.cc:106
+msgid "Next Album"
+msgstr ""
+
+#: src/gtkui/menus.cc:100 src/qtui/menus.cc:148
 msgid "_Repeat"
 msgstr "R_epetir"
 
-#: src/gtkui/menus.cc:146 src/qtui/main_window_actions.cc:114
+#: src/gtkui/menus.cc:101 src/qtui/menus.cc:150
 msgid "S_huffle"
 msgstr "_Orden aleatorio"
 
-#: src/gtkui/menus.cc:147 src/qtui/main_window_actions.cc:115
+#: src/gtkui/menus.cc:102 src/qtui/menus.cc:152
+msgid "Shuffle by Albu_m"
+msgstr ""
+
+#: src/gtkui/menus.cc:103 src/qtui/menus.cc:155
 msgid "N_o Playlist Advance"
 msgstr "No avan_zar la lista de reproducción"
 
-#: src/gtkui/menus.cc:148 src/qtui/main_window_actions.cc:116
+#: src/gtkui/menus.cc:104 src/qtui/menus.cc:157
 msgid "Stop A_fter This Song"
 msgstr ""
 
-#: src/gtkui/menus.cc:150 src/gtkui/menus.cc:247
-#: src/qtui/main_window_actions.cc:118
+#: src/gtkui/menus.cc:106 src/gtkui/menus.cc:210 src/qtui/menus.cc:162
+#: src/qtui/menus.cc:294
 msgid "Song _Info ..."
 msgstr "_Información de la canción ..."
 
-#: src/gtkui/menus.cc:151
+#: src/gtkui/menus.cc:107
 msgid "Jump to _Time ..."
 msgstr "_Saltar en el tiempo ..."
 
-#: src/gtkui/menus.cc:152
+#: src/gtkui/menus.cc:108
 msgid "_Jump to Song ..."
 msgstr "Saltar a la _canción ..."
 
-#: src/gtkui/menus.cc:154
+#: src/gtkui/menus.cc:110 src/qtui/menus.cc:165
 msgid "Set Repeat Point _A"
 msgstr ""
 
-#: src/gtkui/menus.cc:155
+#: src/gtkui/menus.cc:111 src/qtui/menus.cc:167
 msgid "Set Repeat Point _B"
 msgstr ""
 
-#: src/gtkui/menus.cc:156
+#: src/gtkui/menus.cc:112 src/qtui/menus.cc:169
 msgid "_Clear Repeat Points"
 msgstr ""
 
-#: src/gtkui/menus.cc:160 src/gtkui/menus.cc:167 src/gtkui/menus.cc:183
-#: src/qtui/main_window_actions.cc:122 src/qtui/main_window_actions.cc:129
-#: src/qtui/main_window_actions.cc:145
+#: src/gtkui/menus.cc:116 src/gtkui/menus.cc:123 src/gtkui/menus.cc:141
+#: src/qtui/menus.cc:173 src/qtui/menus.cc:180 src/qtui/menus.cc:198
 msgid "By _Title"
 msgstr "Por _título"
 
-#: src/gtkui/menus.cc:161 src/qtui/main_window_actions.cc:123
+#: src/gtkui/menus.cc:117 src/qtui/menus.cc:174
 msgid "By _File Name"
 msgstr ""
 
-#: src/gtkui/menus.cc:162 src/qtui/main_window_actions.cc:124
+#: src/gtkui/menus.cc:118 src/qtui/menus.cc:175
 msgid "By File _Path"
 msgstr ""
 
-#: src/gtkui/menus.cc:166 src/gtkui/menus.cc:182
-#: src/qtui/main_window_actions.cc:128 src/qtui/main_window_actions.cc:144
+#: src/gtkui/menus.cc:122 src/gtkui/menus.cc:140 src/qtui/menus.cc:179
+#: src/qtui/menus.cc:197
 msgid "By Track _Number"
 msgstr "Por _número de pista"
 
-#: src/gtkui/menus.cc:168 src/gtkui/menus.cc:184
-#: src/qtui/main_window_actions.cc:130 src/qtui/main_window_actions.cc:146
+#: src/gtkui/menus.cc:124 src/gtkui/menus.cc:142 src/qtui/menus.cc:181
+#: src/qtui/menus.cc:199
 msgid "By _Artist"
 msgstr "Por _artista"
 
-#: src/gtkui/menus.cc:169 src/gtkui/menus.cc:185
-#: src/qtui/main_window_actions.cc:131 src/qtui/main_window_actions.cc:147
+#: src/gtkui/menus.cc:125 src/gtkui/menus.cc:143 src/qtui/menus.cc:182
+#: src/qtui/menus.cc:200
 msgid "By Al_bum"
 msgstr ""
 
-#: src/gtkui/menus.cc:170 src/gtkui/menus.cc:186
-#: src/qtui/main_window_actions.cc:132 src/qtui/main_window_actions.cc:148
+#: src/gtkui/menus.cc:126 src/gtkui/menus.cc:144 src/qtui/menus.cc:183
+#: src/qtui/menus.cc:201
 msgid "By Albu_m Artist"
 msgstr ""
 
-#: src/gtkui/menus.cc:171 src/gtkui/menus.cc:187
-#: src/qtui/main_window_actions.cc:133 src/qtui/main_window_actions.cc:149
+#: src/gtkui/menus.cc:127 src/gtkui/menus.cc:145 src/qtui/menus.cc:184
+#: src/qtui/menus.cc:202
 msgid "By Release _Date"
 msgstr "Por _fecha de estreno"
 
-#: src/gtkui/menus.cc:172 src/gtkui/menus.cc:188
-#: src/qtui/main_window_actions.cc:134 src/qtui/main_window_actions.cc:150
+#: src/gtkui/menus.cc:128 src/gtkui/menus.cc:146 src/qtui/menus.cc:185
+#: src/qtui/menus.cc:203
 msgid "By _Genre"
 msgstr ""
 
-#: src/gtkui/menus.cc:173 src/gtkui/menus.cc:189
-#: src/qtui/main_window_actions.cc:135 src/qtui/main_window_actions.cc:151
+#: src/gtkui/menus.cc:129 src/gtkui/menus.cc:147 src/qtui/menus.cc:186
+#: src/qtui/menus.cc:204
 msgid "By _Length"
 msgstr ""
 
-#: src/gtkui/menus.cc:174 src/gtkui/menus.cc:190
-#: src/qtui/main_window_actions.cc:136 src/qtui/main_window_actions.cc:152
+#: src/gtkui/menus.cc:130 src/gtkui/menus.cc:148 src/qtui/menus.cc:187
+#: src/qtui/menus.cc:205
 msgid "By _File Path"
 msgstr "Por _ruta de archivo"
 
-#: src/gtkui/menus.cc:175 src/gtkui/menus.cc:191
-#: src/qtui/main_window_actions.cc:137 src/qtui/main_window_actions.cc:153
+#: src/gtkui/menus.cc:131 src/gtkui/menus.cc:149 src/qtui/menus.cc:188
+#: src/qtui/menus.cc:206
 msgid "By _Custom Title"
 msgstr "Por título _personalizado"
 
-#: src/gtkui/menus.cc:177 src/gtkui/menus.cc:193
-#: src/qtui/main_window_actions.cc:139 src/qtui/main_window_actions.cc:155
+#: src/gtkui/menus.cc:132 src/gtkui/menus.cc:150 src/qtui/menus.cc:189
+#: src/qtui/menus.cc:207
+msgid "By C_omment"
+msgstr ""
+
+#: src/gtkui/menus.cc:133 src/gtkui/menus.cc:151 src/qtui/menus.cc:190
+#: src/qtui/menus.cc:208
+msgid "By D_isc Number"
+msgstr ""
+
+#: src/gtkui/menus.cc:135 src/gtkui/menus.cc:153 src/qtui/menus.cc:192
+#: src/qtui/menus.cc:210
 msgid "R_everse Order"
 msgstr "Orden _inverso"
 
-#: src/gtkui/menus.cc:178 src/gtkui/menus.cc:194
-#: src/qtui/main_window_actions.cc:140 src/qtui/main_window_actions.cc:156
+#: src/gtkui/menus.cc:136 src/gtkui/menus.cc:154 src/qtui/menus.cc:194
+#: src/qtui/menus.cc:212
 msgid "_Random Order"
 msgstr "Orden alea_torio"
 
-#: src/gtkui/menus.cc:198 src/qtui/main_window_actions.cc:160
+#: src/gtkui/menus.cc:158 src/qtui/menus.cc:216
 msgid "_Play/Resume"
 msgstr ""
 
-#: src/gtkui/menus.cc:199 src/gtkui/menus.cc:251
-#: src/qtui/main_window_actions.cc:161
+#: src/gtkui/menus.cc:159 src/qtui/menus.cc:218
 msgid "_Refresh"
 msgstr "A_ctualizar"
 
-#: src/gtkui/menus.cc:201 src/qtui/main_window_actions.cc:163
+#: src/gtkui/menus.cc:161 src/qtui/menus.cc:222
 msgid "_Sort"
 msgstr "_Ordenar"
 
-#: src/gtkui/menus.cc:202 src/qtui/main_window_actions.cc:164
+#: src/gtkui/menus.cc:162 src/qtui/menus.cc:223
 msgid "Sort Se_lected"
 msgstr ""
 
-#: src/gtkui/menus.cc:203 src/qtui/main_window_actions.cc:165
+#: src/gtkui/menus.cc:163 src/qtui/menus.cc:225
 msgid "Remove _Duplicates"
 msgstr ""
 
-#: src/gtkui/menus.cc:204 src/qtui/main_window_actions.cc:166
+#: src/gtkui/menus.cc:164 src/qtui/menus.cc:226
 msgid "Remove _Unavailable Files"
 msgstr "Eliminar archivos _no disponibles"
 
-#: src/gtkui/menus.cc:206 src/playlist-manager/playlist-manager.cc:244
-#: src/qtui/main_window_actions.cc:168
+#: src/gtkui/menus.cc:166 src/playlist-manager/playlist-manager.cc:219
+#: src/playlist-manager-qt/playlist-manager-qt.cc:348 src/qtui/menus.cc:229
 msgid "_New"
 msgstr "_Nuevo"
 
-#: src/gtkui/menus.cc:207
+#: src/gtkui/menus.cc:167 src/qtui/menus.cc:230
 msgid "Ren_ame ..."
 msgstr "Ren_ombrar..."
 
-#: src/gtkui/menus.cc:208 src/gtkui/menus.cc:264
-#: src/qtui/main_window_actions.cc:170
+#: src/gtkui/menus.cc:168 src/gtkui/menus.cc:228
+#: src/moonstone/playlist_tabs.cc:311 src/qtui/menus.cc:231
+#: src/qtui/playlist_tabs.cc:336
 msgid "Remo_ve"
 msgstr ""
 
-#: src/gtkui/menus.cc:210
+#: src/gtkui/menus.cc:170 src/qtui/menus.cc:233
 msgid "_Import ..."
 msgstr "_Importar ..."
 
-#: src/gtkui/menus.cc:211
+#: src/gtkui/menus.cc:171 src/qtui/menus.cc:234
 msgid "_Export ..."
 msgstr "_Exportar ..."
 
-#: src/gtkui/menus.cc:213
+#: src/gtkui/menus.cc:173 src/qtui/menus.cc:237
 msgid "Playlist _Manager ..."
 msgstr "Administrador_de listas de reproducción ..."
 
-#: src/gtkui/menus.cc:214 src/qtui/main_window_actions.cc:176
+#: src/gtkui/menus.cc:174 src/qtui/menus.cc:239
 msgid "_Queue Manager ..."
 msgstr "Gestor de _colas ..."
 
-#: src/gtkui/menus.cc:218 src/qtui/main_window_actions.cc:180
+#: src/gtkui/menus.cc:178 src/qtui/menus.cc:243
 msgid "Volume _Up"
 msgstr "_Subir volumen"
 
-#: src/gtkui/menus.cc:219 src/qtui/main_window_actions.cc:181
+#: src/gtkui/menus.cc:179 src/qtui/menus.cc:245
 msgid "Volume _Down"
 msgstr "_Bajar volumen"
 
-#: src/gtkui/menus.cc:221 src/qtui/main_window_actions.cc:183
-msgid "_Equalizer"
-msgstr "_Ecualizador"
+#: src/gtkui/menus.cc:181 src/qtui/menus.cc:249
+msgid "_Equalizer ..."
+msgstr ""
 
-#: src/gtkui/menus.cc:223 src/qtui/main_window_actions.cc:185
+#: src/gtkui/menus.cc:182 src/qtui/menus.cc:251
 msgid "E_ffects ..."
 msgstr ""
 
-#: src/gtkui/menus.cc:227
+#: src/gtkui/menus.cc:184
+msgid "_Record Stream"
+msgstr ""
+
+#: src/gtkui/menus.cc:185
+msgid "Audio _Settings ..."
+msgstr ""
+
+#: src/gtkui/menus.cc:189 src/qtui/menus.cc:260
 msgid "Show _Menu Bar"
 msgstr "_Mostrar barra de menú"
 
-#: src/gtkui/menus.cc:228
+#: src/gtkui/menus.cc:190 src/qtui/menus.cc:262
 msgid "Show I_nfo Bar"
 msgstr "Mostrar barra de _información"
 
-#: src/gtkui/menus.cc:229
+#: src/gtkui/menus.cc:191 src/qtui/menus.cc:264
+msgid "Show Info Bar _Album Art"
+msgstr ""
+
+#: src/gtkui/menus.cc:192 src/qtui/menus.cc:266
 msgid "Show Info Bar Vis_ualization"
 msgstr "Mostrar la Barra Informativa de Vis_ualización"
 
-#: src/gtkui/menus.cc:230
+#: src/gtkui/menus.cc:193 src/qtui/menus.cc:268
 msgid "Show _Status Bar"
 msgstr "Mostrar barra de _estado"
 
-#: src/gtkui/menus.cc:232
+#: src/gtkui/menus.cc:195 src/qtui/menus.cc:272
 msgid "Show _Remaining Time"
 msgstr ""
 
-#: src/gtkui/menus.cc:234
+#: src/gtkui/menus.cc:197 src/qtui/menus.cc:276 src/skins/menus.cc:157
+#: src/skins-qt/menus.cc:152
 msgid "_Visualizations ..."
 msgstr ""
 
-#: src/gtkui/menus.cc:238 src/qtui/main_window_actions.cc:189
+#: src/gtkui/menus.cc:201 src/qtui/menus.cc:280
 msgid "_File"
 msgstr "_Archivo"
 
-#: src/gtkui/menus.cc:239 src/qtui/main_window_actions.cc:190
+#: src/gtkui/menus.cc:202 src/qtui/menus.cc:281
 msgid "_Playback"
 msgstr "_Reproducción"
 
-#: src/gtkui/menus.cc:240 src/qtui/main_window_actions.cc:191
+#: src/gtkui/menus.cc:203 src/qtui/menus.cc:282
 msgid "P_laylist"
 msgstr "_Lista de reproducción"
 
-#: src/gtkui/menus.cc:241 src/gtkui/menus.cc:258
-#: src/qtui/main_window_actions.cc:192
+#: src/gtkui/menus.cc:204 src/gtkui/menus.cc:222 src/qtui/menus.cc:283
+#: src/qtui/menus.cc:312
 msgid "_Services"
 msgstr "_Servicios"
 
-#: src/gtkui/menus.cc:242 src/qtui/main_window_actions.cc:193
+#: src/gtkui/menus.cc:205 src/qtui/menus.cc:284
 msgid "_Output"
 msgstr "Sali_da"
 
-#: src/gtkui/menus.cc:243
+#: src/gtkui/menus.cc:206 src/qtui/menus.cc:285
 msgid "_View"
 msgstr "_Ver"
 
-#: src/gtkui/menus.cc:248
+#: src/gtkui/menus.cc:211 src/qtui/menus.cc:296
 msgid "_Queue/Unqueue"
 msgstr "_Encolar/desencolar"
 
-#: src/gtkui/menus.cc:250
+#: src/gtkui/menus.cc:213 src/qtui/menus.cc:299
 msgid "_Open Containing Folder"
 msgstr ""
 
-#: src/gtkui/menus.cc:253
+#: src/gtkui/menus.cc:214 src/qtui/menus.cc:301
+msgid "_Refresh Selected"
+msgstr ""
+
+#: src/gtkui/menus.cc:216 src/qtui/menus.cc:304
 msgid "Cu_t"
 msgstr "Cor_tar"
 
-#: src/gtkui/menus.cc:254
+#: src/gtkui/menus.cc:217 src/qtui/menus.cc:305
 msgid "_Copy"
 msgstr "_Copiar"
 
-#: src/gtkui/menus.cc:255
+#: src/gtkui/menus.cc:218 src/qtui/menus.cc:306
 msgid "_Paste"
 msgstr "_Pegar"
 
-#: src/gtkui/menus.cc:256
+#: src/gtkui/menus.cc:219 src/qtui/menus.cc:307
+msgid "Paste at _End"
+msgstr ""
+
+#: src/gtkui/menus.cc:220 src/qtui/menus.cc:309
 msgid "Select _All"
 msgstr "Seleccionar _todo"
 
-#: src/gtkui/menus.cc:263
+#: src/gtkui/menus.cc:227 src/moonstone/playlist_tabs.cc:309
+#: src/qtui/playlist_tabs.cc:334
 msgid "_Rename ..."
 msgstr "_Renombrar ..."
 
-#: src/gtkui/settings.cc:35
+#: src/gtkui/settings.cc:35 src/qtui/settings.cc:59
+msgid "Always"
+msgstr ""
+
+#: src/gtkui/settings.cc:36 src/qtui/settings.cc:60
+msgid "Auto-hide"
+msgstr ""
+
+#: src/gtkui/settings.cc:37 src/qtui/settings.cc:61
+msgid "Never"
+msgstr ""
+
+#: src/gtkui/settings.cc:41 src/qtui/settings.cc:64
 msgid "Playlist Tabs"
 msgstr ""
 
-#: src/gtkui/settings.cc:36
-msgid "Always show tabs"
+#: src/gtkui/settings.cc:42 src/qtui/settings.cc:65
+msgid "Show playlist tabs:"
 msgstr ""
 
-#: src/gtkui/settings.cc:38
+#: src/gtkui/settings.cc:45 src/qtui/settings.cc:69
 msgid "Show entry counts"
 msgstr ""
 
-#: src/gtkui/settings.cc:40
+#: src/gtkui/settings.cc:47 src/qtui/settings.cc:72
 msgid "Show close buttons"
 msgstr ""
 
-#: src/gtkui/settings.cc:42
+#: src/gtkui/settings.cc:49 src/qtui/settings.cc:75
 msgid "Playlist Columns"
 msgstr ""
 
-#: src/gtkui/settings.cc:44
+#: src/gtkui/settings.cc:51 src/qtui/settings.cc:77
 msgid "Show column headers"
 msgstr ""
 
-#: src/gtkui/settings.cc:46 src/modplug/plugin_main.cc:106
-#: src/skins/skins_cfg.cc:263
-msgid "Miscellaneous"
+#: src/gtkui/settings.cc:53 src/qtui/settings.cc:82
+msgid "Make column headers clickable for sorting"
 msgstr ""
 
-#: src/gtkui/settings.cc:47
-msgid "Arrow keys seek by:"
+#: src/gtkui/settings.cc:56
+msgid "Use symbolic icons in toolbar"
 msgstr ""
 
-#: src/gtkui/settings.cc:50
+#: src/gtkui/settings.cc:58 src/qtui/settings.cc:86
 msgid "Scroll on song change"
 msgstr ""
 
-#: src/gtkui/ui_gtk.cc:71
+#: src/gtkui/ui_gtk.cc:82
 msgid "GTK Interface"
 msgstr "Interfaz GTK"
 
-#: src/gtkui/ui_gtk.cc:222 src/skins/ui_main.cc:232
+#: src/gtkui/ui_gtk.cc:219 src/skins/main.cc:228 src/skins-qt/main.cc:231
 #, c-format
 msgid "%s - Audacious"
 msgstr "%s - Audacious"
 
-#: src/gtkui/ui_gtk.cc:225 src/qtui/main_window.cc:186
+#: src/gtkui/ui_gtk.cc:221 src/moonstone/main_window.cc:184
+#: src/qtui/main_window.cc:385
 msgid "Buffering ..."
 msgstr "Gestión de memoria intermedia ..."
 
-#: src/gtkui/ui_gtk.cc:228 src/skins/ui_main.cc:234 src/skins/ui_main.cc:1164
+#: src/gtkui/ui_gtk.cc:224 src/pipewire/pipewire.cc:402 src/skins/main.cc:230
+#: src/skins-qt/main.cc:233
 msgid "Audacious"
 msgstr "Audacious"
 
-#: src/gtkui/ui_statusbar.cc:63 src/qtui/status_bar.cc:67
+#: src/gtkui/ui_gtk.cc:487 src/gtkui/ui_gtk.cc:518 src/gtkui/ui_gtk.cc:882
+#: src/hotkey/gui.cc:72 src/moonstone/main_window.cc:67
+#: src/moonstone/main_window.cc:145 src/moonstone/main_window.cc:146
+#: src/notify/osd.cc:85 src/qthotkey/gui.cc:67 src/qtui/main_window.cc:154
+#: src/qtui/main_window.cc:347 src/qtui/main_window.cc:348
+#: src/skins/menus.cc:109 src/skins-qt/menus.cc:100
+msgid "Play"
+msgstr "Reproducir"
+
+#: src/gtkui/ui_gtk.cc:487 src/moonstone/main_window.cc:151
+#: src/moonstone/main_window.cc:152 src/notify/osd.cc:82
+#: src/qtui/main_window.cc:353 src/qtui/main_window.cc:354
+#: src/skins/menus.cc:110 src/skins-qt/menus.cc:101
+msgid "Pause"
+msgstr "Pausar"
+
+#: src/gtkui/ui_gtk.cc:868 src/moonstone/main_window.cc:57
+#: src/qtui/main_window.cc:145 src/skins/menus.cc:86 src/skins-qt/menus.cc:77
+msgid "Search Library"
+msgstr ""
+
+#: src/gtkui/ui_gtk.cc:875 src/moonstone/main_window.cc:60
+#: src/qtui/main_window.cc:147
+msgid "Open Files"
+msgstr "Abrir archivos"
+
+#: src/gtkui/ui_gtk.cc:876 src/moonstone/main_window.cc:62
+#: src/qtui/main_window.cc:149
+msgid "Add Files"
+msgstr "Añadir archivos..."
+
+#: src/gtkui/ui_gtk.cc:881 src/moonstone/main_window.cc:65
+#: src/qtui/main_window.cc:152 src/skins/menus.cc:112 src/skins-qt/menus.cc:103
+msgid "Previous"
+msgstr "Anterior"
+
+#: src/gtkui/ui_gtk.cc:883 src/hotkey/gui.cc:74 src/moonstone/main_window.cc:69
+#: src/qthotkey/gui.cc:69 src/qtui/main_window.cc:156 src/skins/menus.cc:111
+#: src/skins-qt/menus.cc:102
+msgid "Stop"
+msgstr "Detener"
+
+#: src/gtkui/ui_gtk.cc:884 src/moonstone/main_window.cc:76 src/notify/osd.cc:89
+#: src/qtui/main_window.cc:163 src/skins/menus.cc:113 src/skins-qt/menus.cc:104
+msgid "Next"
+msgstr "Siguiente"
+
+#: src/gtkui/ui_gtk.cc:886 src/moonstone/main_window.cc:79
+#: src/qtui/main_window.cc:166 src/qtui/menus.cc:254 src/skins/menus.cc:79
+#: src/skins-qt/menus.cc:69
+msgid "Record Stream"
+msgstr ""
+
+#: src/gtkui/ui_gtk.cc:919 src/moonstone/main_window.cc:86
+#: src/qtui/main_window.cc:173 src/skins/menus.cc:103 src/skins-qt/menus.cc:94
+msgid "Repeat"
+msgstr "Repetir"
+
+#: src/gtkui/ui_gtk.cc:922 src/moonstone/main_window.cc:89
+#: src/qtui/main_window.cc:176 src/skins/menus.cc:104 src/skins-qt/menus.cc:95
+msgid "Shuffle"
+msgstr "Orden aleatorio"
+
+#: src/gtkui/ui_gtk.cc:1114 src/qtui/main_window.cc:123
+msgid "Menu"
+msgstr ""
+
+#: src/gtkui/ui_statusbar.cc:64 src/qtui/status_bar.cc:155
 msgid "mono"
 msgstr "mono"
 
-#: src/gtkui/ui_statusbar.cc:65 src/qtui/status_bar.cc:69
+#: src/gtkui/ui_statusbar.cc:66 src/qtui/status_bar.cc:157
 msgid "stereo"
 msgstr "estéreo"
 
-#: src/gtkui/ui_statusbar.cc:67 src/qtui/status_bar.cc:71
+#: src/gtkui/ui_statusbar.cc:68 src/qtui/status_bar.cc:160
 #, c-format
 msgid "%d channel"
 msgid_plural "%d channels"
 msgstr0 "%d canal"
 msgstr1 "%d canales"
+msgstr2 "%d canales"
 
-#: src/gtkui/ui_statusbar.cc:81 src/qtui/status_bar.cc:85
+#: src/gtkui/ui_statusbar.cc:76 src/qtui/status_bar.cc:168
 #, c-format
-msgid "%d kbps"
-msgstr "%d kbps"
+msgid "%d kHz"
+msgstr ""
 
-#: src/gtkui/ui_statusbar.cc:107 src/skins/ui_main_evlisteners.cc:103
+#: src/gtkui/ui_statusbar.cc:82 src/qtui/status_bar.cc:174
+#, c-format
+msgid "%d kbit/s"
+msgstr ""
+
+#: src/gtkui/ui_statusbar.cc:108 src/skins/main.cc:478 src/skins-qt/main.cc:461
 msgid "Single mode."
 msgstr "Modo único."
 
-#: src/gtkui/ui_statusbar.cc:109 src/skins/ui_main_evlisteners.cc:105
+#: src/gtkui/ui_statusbar.cc:110 src/skins/main.cc:480 src/skins-qt/main.cc:463
 msgid "Playlist mode."
 msgstr "Modo de lista de reproducción."
 
-#: src/gtkui/ui_statusbar.cc:117 src/skins/ui_main_evlisteners.cc:111
+#: src/gtkui/ui_statusbar.cc:118 src/skins/main.cc:486 src/skins-qt/main.cc:469
 msgid "Stopping after song."
 msgstr "Parar después de la canción."
 
-#: src/hotkey/gui.cc:71
+#: src/hotkey/gui.cc:71 src/qthotkey/gui.cc:66
 msgid "Previous track"
 msgstr ""
 
-#: src/hotkey/gui.cc:72 src/notify/osd.cc:69 src/qtui/main_window.cc:69
-#: src/qtui/main_window.cc:172 src/qtui/main_window.cc:173
-#: src/skins/menus.cc:87
-msgid "Play"
-msgstr "Reproducir"
-
-#: src/hotkey/gui.cc:73
+#: src/hotkey/gui.cc:73 src/qthotkey/gui.cc:68
 msgid "Pause/Resume"
 msgstr "Pausa/continuar"
 
-#: src/hotkey/gui.cc:74 src/qtui/main_window.cc:70 src/skins/menus.cc:89
-msgid "Stop"
-msgstr "Detener"
-
-#: src/hotkey/gui.cc:75
+#: src/hotkey/gui.cc:75 src/qthotkey/gui.cc:70
 msgid "Next track"
 msgstr ""
 
-#: src/hotkey/gui.cc:76
-msgid "Forward 5 seconds"
+#: src/hotkey/gui.cc:76 src/qthotkey/gui.cc:71
+msgid "Step forward"
 msgstr ""
 
-#: src/hotkey/gui.cc:77
-msgid "Rewind 5 seconds"
+#: src/hotkey/gui.cc:77 src/qthotkey/gui.cc:72
+msgid "Step backward"
 msgstr ""
 
-#: src/hotkey/gui.cc:78
+#: src/hotkey/gui.cc:78 src/qthotkey/gui.cc:73
 msgid "Mute"
 msgstr "Silenciar"
 
-#: src/hotkey/gui.cc:79
+#: src/hotkey/gui.cc:79 src/qthotkey/gui.cc:74
 msgid "Volume up"
 msgstr ""
 
-#: src/hotkey/gui.cc:80
+#: src/hotkey/gui.cc:80 src/qthotkey/gui.cc:75
 msgid "Volume down"
 msgstr ""
 
-#: src/hotkey/gui.cc:81
+#: src/hotkey/gui.cc:81 src/qthotkey/gui.cc:76
 msgid "Jump to file"
 msgstr ""
 
-#: src/hotkey/gui.cc:82
+#: src/hotkey/gui.cc:82 src/qthotkey/gui.cc:77
 msgid "Toggle player window(s)"
 msgstr ""
 
-#: src/hotkey/gui.cc:83
+#: src/hotkey/gui.cc:83 src/qthotkey/gui.cc:78
 msgid "Show On-Screen-Display"
 msgstr "Mostrar notificaciones"
 
-#: src/hotkey/gui.cc:84
+#: src/hotkey/gui.cc:84 src/qthotkey/gui.cc:79
 msgid "Toggle repeat"
 msgstr ""
 
-#: src/hotkey/gui.cc:85
+#: src/hotkey/gui.cc:85 src/qthotkey/gui.cc:80
 msgid "Toggle shuffle"
 msgstr ""
 
-#: src/hotkey/gui.cc:86
+#: src/hotkey/gui.cc:86 src/qthotkey/gui.cc:81
 msgid "Toggle stop after current"
 msgstr ""
 
-#: src/hotkey/gui.cc:87
+#: src/hotkey/gui.cc:87 src/qthotkey/gui.cc:82
 msgid "Raise player window(s)"
 msgstr ""
 
-#: src/hotkey/gui.cc:97
+#: src/hotkey/gui.cc:98 src/qthotkey/gui.cc:100
 msgid "(none)"
 msgstr "(ninguno)"
 
-#: src/hotkey/gui.cc:234
+#: src/hotkey/gui.cc:261
 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 modifiers.\n"
 "\n"
 "Do you want to continue?"
 msgstr ""
-"No se recomienda asociar los botones principales del mouse sin cambios.\n"
-"\n"
-"¿Quiere continuar?"
 
-#: src/hotkey/gui.cc:236
+#: src/hotkey/gui.cc:264
 msgid "Binding mouse buttons"
 msgstr "Asociar botones del mouse"
 
-#: src/hotkey/gui.cc:391
+#: src/hotkey/gui.cc:434
 msgid ""
 "Press a key combination inside a text field.\n"
 "You can also bind mouse buttons."
@@ -2032,34 +2185,34 @@
 "Pulse una combinación de teclas dentro del campo de texto.\n"
 "También puede asociar botones del ratón."
 
-#: src/hotkey/gui.cc:396
+#: src/hotkey/gui.cc:444 src/qthotkey/gui.cc:179
 msgid "Hotkeys:"
 msgstr "Atajos de teclado:"
 
-#: src/hotkey/gui.cc:413
+#: src/hotkey/gui.cc:457 src/qthotkey/gui.cc:181
 msgid "Action:"
 msgstr "Acción:"
 
-#: src/hotkey/gui.cc:420
+#: src/hotkey/gui.cc:461 src/qthotkey/gui.cc:182
 msgid "Key Binding:"
 msgstr "Teclas asociadas:"
 
-#: src/hotkey/gui.cc:468
+#: src/hotkey/gui.cc:518 src/qthotkey/gui.cc:184
 msgid "_Add"
-msgstr ""
+msgstr "_Abrir"
 
-#: src/hotkey/plugin.cc:61
+#: src/hotkey/plugin.cc:59 src/qthotkey/plugin.cc:78
 msgid "Global Hotkeys"
 msgstr "Teclas abreviadas globales"
 
-#: src/hotkey/plugin.cc:79
+#: src/hotkey/plugin.cc:74
 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"
+"Contributors 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"
@@ -2067,51 +2220,79 @@
 " Jeremy Tan <nsx@nsx.homeip.net>"
 msgstr ""
 
-#: src/jack-ng/jack-ng.cc:49
+#: src/jack/jack-ng.cc:54
 msgid "JACK Output"
 msgstr "Salida JACK"
 
-#: src/jack-ng/jack-ng.cc:114
+#: src/jack/jack-ng.cc:126
+msgid "Client name:"
+msgstr ""
+
+#: src/jack/jack-ng.cc:128
 msgid "Automatically connect to output ports"
 msgstr ""
 
-#: src/jack-ng/jack-ng.cc:155
+#: src/jack/jack-ng.cc:130
+msgid "Filter ports (regex, use any port if blank):"
+msgstr ""
+
+#: src/jack/jack-ng.cc:136
+msgid "Connect to physical ports only"
+msgstr ""
+
+#: src/jack/jack-ng.cc:139
+msgid "Upmix to"
+msgstr ""
+
+#: src/jack/jack-ng.cc:141
+msgid "ports if input has fewer channels"
+msgstr ""
+
+#: src/jack/jack-ng.cc:143
+msgid "Ignore insufficient number of ports"
+msgstr ""
+
+#: src/jack/jack-ng.cc:181
+msgid "No JACK output ports were found. Please check settings."
+msgstr ""
+
+#: src/jack/jack-ng.cc:195
 #, c-format
 msgid "Only %d JACK output ports were found but %d are required."
 msgstr ""
 
-#: src/jack-ng/jack-ng.cc:164
+#: src/jack/jack-ng.cc:210
 #, c-format
 msgid "Failed to connect to JACK port %s."
 msgstr ""
 
-#: src/jack-ng/jack-ng.cc:184
+#: src/jack/jack-ng.cc:230
 msgid ""
 "JACK supports only floating-point audio. You must change the output bit "
 "depth to floating-point in Audacious settings."
 msgstr ""
 
-#: src/jack-ng/jack-ng.cc:197
+#: src/jack/jack-ng.cc:245
 msgid "Failed to connect to the JACK server; is it running?"
 msgstr ""
 
-#: src/jack-ng/jack-ng.cc:273
+#: src/jack/jack-ng.cc:321
 #, c-format
 msgid ""
 "The JACK server requires a sample rate of %d Hz, but Audacious is playing at "
 "%d Hz. Please use the Sample Rate Converter effect to correct the mismatch."
 msgstr ""
 
-#: src/ladspa/plugin.cc:414
+#: src/ladspa/plugin.cc:416
 #, c-format
 msgid "%s Settings"
 msgstr "Ajustes %s"
 
-#: src/ladspa/plugin.cc:478
+#: src/ladspa/plugin.cc:482
 msgid "Module paths:"
 msgstr "Rutas de complementos:"
 
-#: src/ladspa/plugin.cc:483
+#: src/ladspa/plugin.cc:487
 msgid ""
 "Separate multiple paths with a colon.\n"
 "These paths are searched in addition to LADSPA_PATH.\n"
@@ -2122,25 +2303,25 @@
 "Tras añadir nuevas rutas, pulse Intro para buscar complementos nuevos.</"
 "small>"
 
-#: src/ladspa/plugin.cc:499
+#: src/ladspa/plugin.cc:508
 msgid "Available plugins:"
 msgstr "Complementos disponibles:"
 
-#: src/ladspa/plugin.cc:512 src/modplug/plugin_main.cc:92
-#: src/modplug/plugin_main.cc:95 src/modplug/plugin_main.cc:98
-#: src/modplug/plugin_main.cc:101
+#: src/ladspa/plugin.cc:521 src/modplug/plugin_main.cc:91
+#: src/modplug/plugin_main.cc:94 src/modplug/plugin_main.cc:97
+#: src/modplug/plugin_main.cc:100
 msgid "Enable"
 msgstr "Activar"
 
-#: src/ladspa/plugin.cc:518
+#: src/ladspa/plugin.cc:527
 msgid "Enabled plugins:"
 msgstr "Complementos activos:"
 
-#: src/ladspa/plugin.cc:534
+#: src/ladspa/plugin.cc:543
 msgid "Settings"
 msgstr "Ajustes"
 
-#: src/ladspa/plugin.cc:551
+#: src/ladspa/plugin.cc:560
 msgid ""
 "LADSPA Host for Audacious\n"
 "Copyright 2011 John Lindgren"
@@ -2154,7 +2335,7 @@
 msgid "LIRC Plugin"
 msgstr "Plugin LIRC"
 
-#: src/lirc/lirc.cc:381
+#: src/lirc/lirc.cc:379
 msgid ""
 "A simple plugin to control Audacious using the LIRC remote control daemon\n"
 "\n"
@@ -2170,63 +2351,123 @@
 "For more information about LIRC, see http://lirc.org."
 msgstr ""
 
-#: src/lirc/lirc.cc:392
+#: src/lirc/lirc.cc:390
 msgid "Connection"
 msgstr "Conexión"
 
-#: src/lirc/lirc.cc:393
+#: src/lirc/lirc.cc:391
 msgid "Reconnect to LIRC server"
 msgstr "Reconectar a servidor LIRC"
 
-#: src/lirc/lirc.cc:395
+#: src/lirc/lirc.cc:393
 msgid "Wait before reconnecting:"
 msgstr "Espera antes de reconectar:"
 
-#: src/lyricwiki/lyricwiki.cc:41
-msgid "LyricWiki Plugin"
-msgstr "Plugin LyricWiki"
-
-#: src/lyricwiki/lyricwiki.cc:131 src/lyricwiki-qt/lyricwiki.cc:136
-msgid "No lyrics available"
-msgstr "No se encontraron letras"
-
-#: src/lyricwiki/lyricwiki.cc:217 src/lyricwiki/lyricwiki.cc:226
-#: src/lyricwiki/lyricwiki.cc:243 src/lyricwiki/lyricwiki.cc:252
-#: src/lyricwiki/lyricwiki.cc:267 src/lyricwiki-qt/lyricwiki.cc:222
-#: src/lyricwiki-qt/lyricwiki.cc:231 src/lyricwiki-qt/lyricwiki.cc:248
-#: src/lyricwiki-qt/lyricwiki.cc:257 src/lyricwiki-qt/lyricwiki.cc:272
-msgid "Error"
-msgstr "Error"
-
-#: src/lyricwiki/lyricwiki.cc:218 src/lyricwiki/lyricwiki.cc:244
-#: src/lyricwiki-qt/lyricwiki.cc:223 src/lyricwiki-qt/lyricwiki.cc:249
+#: src/lyrics-common/chart_lyrics_provider.cc:93
+#: src/lyrics-common/chart_lyrics_provider.cc:150
+#: src/lyrics-common/lyrics_ovh_provider.cc:50
 #, c-format
 msgid "Unable to fetch %s"
 msgstr "No se puede obtener %s"
 
-#: src/lyricwiki/lyricwiki.cc:227 src/lyricwiki/lyricwiki.cc:253
-#: src/lyricwiki-qt/lyricwiki.cc:232 src/lyricwiki-qt/lyricwiki.cc:258
+#: src/lyrics-common/chart_lyrics_provider.cc:100
+#: src/lyrics-common/chart_lyrics_provider.cc:157
+#: src/lyrics-common/lyrics_ovh_provider.cc:57
 #, c-format
 msgid "Unable to parse %s"
 msgstr "No se puede analizar %s"
 
-#: src/lyricwiki/lyricwiki.cc:259 src/lyricwiki-qt/lyricwiki.cc:264
+#: src/lyrics-common/chart_lyrics_provider.cc:121
+#: src/lyrics-common/chart_lyrics_provider.cc:194
+#: src/lyrics-common/lyrics_ovh_provider.cc:88
 msgid "Looking for lyrics ..."
 msgstr "Buscando letras de la canción...."
 
-#: src/lyricwiki/lyricwiki.cc:267 src/lyricwiki-qt/lyricwiki.cc:272
-msgid "Missing song metadata"
-msgstr "No hay metadatos de la canción"
+#: src/lyrics-common/preferences.h:43
+msgid "Nowhere"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:49
+msgid "Artist is truncated at the start, Title -- at the end"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:50
+msgid "Chars to truncate on:"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:54
+msgid "Chars are ORed in RegExp, surrounded by whitespace"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:55
+msgid "Chars to split on:"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:56
+msgid "Further truncate those on chars"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:62
+msgid "General"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:63
+msgid "Split title into artist and title on chars"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:66
+msgid "Sources"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:67
+msgid "Use embedded lyrics (from Lyrics tag)"
+msgstr ""
 
-#: src/lyricwiki/lyricwiki.cc:278 src/lyricwiki-qt/lyricwiki.cc:283
-msgid "Connecting to lyrics.wikia.com ..."
-msgstr "Conectándose con lyrics.wikia.com ..."
+#: src/lyrics-common/preferences.h:69
+msgid "Fetch lyrics from internet:"
+msgstr ""
 
-#: src/lyricwiki-qt/lyricwiki.cc:55
-msgid "LyricWiki Plugin (Qt)"
+#: src/lyrics-common/preferences.h:72
+msgid "Store fetched lyrics in local cache"
 msgstr ""
 
-#: src/m3u/m3u.cc:32
+#: src/lyrics-common/preferences.h:74
+msgid "Local Storage"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:75
+msgid "Load lyric files (.lrc) from local storage"
+msgstr ""
+
+#: src/lyrics-common/utils.cc:54 src/ui-common/dialogs-qt.cc:63
+msgid "Error"
+msgstr "Error"
+
+#: src/lyrics-common/utils.cc:60
+msgid "Lyrics could not be found."
+msgstr ""
+
+#: src/lyrics-common/utils.cc:142
+msgid "Missing title and/or artist."
+msgstr ""
+
+#: src/lyrics-gtk/lyrics-gtk.cc:37 src/lyrics-qt/lyrics-qt.cc:50
+msgid "Lyrics"
+msgstr ""
+
+#: src/lyrics-gtk/lyrics-gtk.cc:189 src/lyrics-qt/lyrics-qt.cc:171
+msgid "Edit Lyrics ..."
+msgstr ""
+
+#: src/lyrics-gtk/lyrics-gtk.cc:195 src/lyrics-qt/lyrics-qt.cc:178
+msgid "Save Locally"
+msgstr ""
+
+#: src/lyrics-gtk/lyrics-gtk.cc:201 src/lyrics-qt/lyrics-qt.cc:186
+msgid "Refresh"
+msgstr ""
+
+#: src/m3u/m3u.cc:33
 msgid "M3U Playlists"
 msgstr "Listas de reproducción M3U"
 
@@ -2234,17 +2475,17 @@
 msgid "Tact Generator"
 msgstr "Generador de tacto"
 
-#: src/metronom/metronom.cc:147
+#: src/metronom/metronom.cc:145
 #, c-format
 msgid "Tact generator: %d bpm"
 msgstr "Generador de tacto: %d ppm"
 
-#: src/metronom/metronom.cc:149
+#: src/metronom/metronom.cc:147
 #, c-format
 msgid "Tact generator: %d bpm %d/%d"
 msgstr "Generador de tacto: %d ppm %d/%d"
 
-#: src/metronom/metronom.cc:237
+#: src/metronom/metronom.cc:235
 msgid ""
 "A Tact Generator by Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
 "\n"
@@ -2253,21 +2494,21 @@
 "or tact://60*3/4 to play 60 bpm in 3/4 tacts"
 msgstr ""
 
-#: src/mixer/mixer.cc:38
+#: src/mixer/mixer.cc:43
 msgid "Channel Mixer"
 msgstr "Mezclador de canales"
 
-#: src/mixer/mixer.cc:202
+#: src/mixer/mixer.cc:255
 msgid ""
 "Channel Mixer Plugin for Audacious\n"
 "Copyright 2011-2012 John Lindgren and Michał Lipski"
 msgstr ""
 
-#: src/mixer/mixer.cc:206
+#: src/mixer/mixer.cc:259
 msgid "Channel Mixer"
 msgstr "Mezclador de canales"
 
-#: src/mixer/mixer.cc:207
+#: src/mixer/mixer.cc:260
 msgid "Output channels:"
 msgstr "Canales de salida:"
 
@@ -2279,168 +2520,176 @@
 msgid "Error connecting to MMS server"
 msgstr ""
 
-#: src/modplug/modplugbmp.h:53
+#: src/modplug/modplugbmp.h:57
 msgid "ModPlug (Module Player)"
 msgstr "ModPlug (Módulo de reproducción)"
 
-#: src/modplug/plugin_main.cc:53
-msgid "Resolution"
-msgstr ""
-
-#: src/modplug/plugin_main.cc:54
-msgid "8-bit"
-msgstr ""
-
 #: src/modplug/plugin_main.cc:55
-msgid "16-bit"
-msgstr ""
-
-#: src/modplug/plugin_main.cc:56
 msgid "Channels"
 msgstr ""
 
-#: src/modplug/plugin_main.cc:60
+#: src/modplug/plugin_main.cc:59
 msgid "Nearest (fastest)"
 msgstr ""
 
-#: src/modplug/plugin_main.cc:61
+#: src/modplug/plugin_main.cc:60
 msgid "Linear (fast)"
 msgstr ""
 
-#: src/modplug/plugin_main.cc:62
+#: src/modplug/plugin_main.cc:61
 msgid "Spline (good)"
 msgstr ""
 
-#: src/modplug/plugin_main.cc:63
+#: src/modplug/plugin_main.cc:62
 msgid "Polyphase (best)"
 msgstr ""
 
-#: src/modplug/plugin_main.cc:64
+#: src/modplug/plugin_main.cc:63
 msgid "Sample rate"
 msgstr ""
 
-#: src/modplug/plugin_main.cc:65
+#: src/modplug/plugin_main.cc:64
 msgid "22 kHz"
 msgstr ""
 
-#: src/modplug/plugin_main.cc:66
+#: src/modplug/plugin_main.cc:65
 msgid "44 kHz"
 msgstr ""
 
-#: src/modplug/plugin_main.cc:67
+#: src/modplug/plugin_main.cc:66
 msgid "48 kHz"
 msgstr ""
 
-#: src/modplug/plugin_main.cc:68
+#: src/modplug/plugin_main.cc:67
 msgid "96 kHz"
 msgstr ""
 
-#: src/modplug/plugin_main.cc:72 src/modplug/plugin_main.cc:77
-#: src/modplug/plugin_main.cc:82
+#: src/modplug/plugin_main.cc:71 src/modplug/plugin_main.cc:76
+#: src/modplug/plugin_main.cc:81
 msgid "Level:"
 msgstr ""
 
-#: src/modplug/plugin_main.cc:78
+#: src/modplug/plugin_main.cc:77
 msgid "Cutoff:"
 msgstr ""
 
-#: src/modplug/plugin_main.cc:91
+#: src/modplug/plugin_main.cc:90
 msgid "Reverb"
 msgstr ""
 
-#: src/modplug/plugin_main.cc:94
+#: src/modplug/plugin_main.cc:93
 msgid "Bass Boost"
 msgstr ""
 
-#: src/modplug/plugin_main.cc:97
+#: src/modplug/plugin_main.cc:96
 msgid "Surround"
 msgstr ""
 
-#: src/modplug/plugin_main.cc:100
+#: src/modplug/plugin_main.cc:99
 msgid "Preamp"
 msgstr ""
 
-#: src/modplug/plugin_main.cc:107
+#: src/modplug/plugin_main.cc:106
 msgid "Oversample"
 msgstr ""
 
-#: src/modplug/plugin_main.cc:108
+#: src/modplug/plugin_main.cc:107
 msgid "Noise reduction"
 msgstr ""
 
-#: src/modplug/plugin_main.cc:109
+#: src/modplug/plugin_main.cc:108
 msgid "Play Amiga MODs"
 msgstr ""
 
-#: src/modplug/plugin_main.cc:110
+#: src/modplug/plugin_main.cc:109
 msgid "Repeat"
 msgstr ""
 
-#: src/modplug/plugin_main.cc:111
+#: src/modplug/plugin_main.cc:110
 msgid "Repeat count:"
 msgstr ""
 
-#: src/modplug/plugin_main.cc:112
+#: src/modplug/plugin_main.cc:111
 msgid "To repeat forever, set the repeat count to -1."
 msgstr ""
 
-#: src/modplug/plugin_main.cc:125 src/sid/xs_config.cc:106
+#: src/modplug/plugin_main.cc:124 src/sid/xs_config.cc:106
 msgid "These settings will take effect when Audacious is restarted."
 msgstr ""
 
+#: src/moonstone/main_window.cc:72 src/moonstone/main_window.cc:73
+#: src/qtui/main_window.cc:159 src/qtui/main_window.cc:160
+#: src/skins/menus.cc:107 src/skins-qt/menus.cc:98
+msgid "Stop After This Song"
+msgstr ""
+
+#: src/moonstone/moonstone.cc:39
+msgid "Moonstone"
+msgstr ""
+
+#: src/moonstone/playlist_header.cc:212 src/qtui/playlist_header.cc:258
+msgid "Reset to Defaults"
+msgstr ""
+
+#: src/moonstone/playlist_model.cc:38 src/qtui/playlist_header.cc:232
+msgid "Now Playing"
+msgstr "Reproducción actual"
+
+#: src/moonstone/playlist_selection.cc:66
+#: src/playlist-manager/playlist-manager.cc:201
+#: src/playlist-manager-qt/playlist-manager-qt.cc:190
+msgid "Entries"
+msgstr "Entradas"
+
 #: src/mpg123/mpg123.cc:54
 msgid "MPG123 Plugin"
 msgstr "MPG123 Plugin"
 
-#: src/mpg123/mpg123.cc:83
-msgid "Advanced"
-msgstr ""
-
-#: src/mpg123/mpg123.cc:84
+#: src/mpg123/mpg123.cc:82
 msgid "Use accurate length calculation (slow)"
 msgstr ""
 
-#: src/mpg123/mpg123.cc:248
+#: src/mpg123/mpg123.cc:260
 msgid "Surround"
 msgstr "Envolvente"
 
-#: src/mpris2/plugin.cc:39
+#: src/mpris2/plugin.cc:40
 msgid "MPRIS 2 Server"
 msgstr "MPRIS 2 Server"
 
-#: src/neon/neon.cc:97
+#: src/neon/neon.cc:102
 msgid "Neon HTTP/HTTPS Plugin"
 msgstr "Neon HTTP/HTTPS Plugin"
 
-#: src/neon/neon.cc:521
+#: src/neon/neon.cc:526
 msgid "Error parsing redirect"
 msgstr ""
 
-#: src/neon/neon.cc:535
+#: src/neon/neon.cc:540
 msgid "Unknown HTTP error"
 msgstr ""
 
-#: src/neon/neon.cc:569
+#: src/neon/neon.cc:614
 msgid "Error parsing URL"
 msgstr ""
 
-#: src/neon/neon.cc:632
+#: src/neon/neon.cc:687
 msgid "Too many redirects"
 msgstr ""
 
-#: src/notify/event.cc:64
+#: src/notify/event.cc:97
 msgid "Stopped"
 msgstr "Detenido"
 
-#: src/notify/event.cc:64
+#: src/notify/event.cc:97
 msgid "Audacious is not playing."
 msgstr "Audacious no está reproduciendo."
 
-#: src/notify/notify.cc:42
+#: src/notify/notify.cc:39
 msgid "Desktop Notifications"
 msgstr "Notificaciones de escritorio"
 
-#: src/notify/notify.cc:60
+#: src/notify/notify.cc:57
 msgid ""
 "Desktop Notifications Plugin for Audacious\n"
 "Copyright (C) 2010 Maximilian Bogner\n"
@@ -2460,36 +2709,76 @@
 "this program. If not, see <http://www.gnu.org/licenses/>."
 msgstr ""
 
-#: src/notify/notify.cc:110
+#: src/notify/notify.cc:104
 msgid "Show playback controls"
 msgstr ""
 
-#: src/notify/notify.cc:112
+#: src/notify/notify.cc:106
 msgid "Always show notification"
 msgstr ""
 
-#: src/notify/notify.cc:114
+#: src/notify/notify.cc:108
 msgid "Include album name in notification"
 msgstr ""
 
-#: src/notify/osd.cc:58
+#: src/notify/notify.cc:110
+msgid "Custom notification duration:"
+msgstr ""
+
+#: src/notify/osd.cc:74
 msgid "Show"
 msgstr ""
 
-#: src/notify/osd.cc:66 src/qtui/main_window.cc:178
-#: src/qtui/main_window.cc:179 src/skins/menus.cc:88
-msgid "Pause"
-msgstr "Pausar"
+#: src/openmpt/mpt.cc:50
+msgid "OpenMPT (Module Player)"
+msgstr ""
 
-#: src/notify/osd.cc:73 src/qtui/main_window.cc:72 src/skins/menus.cc:91
-msgid "Next"
-msgstr "Siguiente"
+#: src/openmpt/mpt.cc:132
+msgid ""
+"Module player based on libopenmpt\n"
+"\n"
+"Written by: Chris Spiegel <cspiegel@gmail.com>"
+msgstr ""
+
+#: src/openmpt/mpt.cc:151
+msgid "Stereo separation:"
+msgstr ""
+
+#: src/openmpt/mpt.cc:153
+msgid "% (0=mono, 100=default, 200=full)"
+msgstr ""
+
+#: src/openmpt/mpt.cc:157
+msgid "Interpolation:"
+msgstr ""
+
+#: src/openmpt/mptwrap.h:51 src/soxr/sox-resampler.cc:189 src/xsf/plugin.cc:437
+msgid "Linear"
+msgstr ""
+
+#: src/openmpt/mptwrap.h:52
+msgid "Cubic"
+msgstr ""
+
+#: src/openmpt/mptwrap.h:53
+msgid "Windowed sinc"
+msgstr ""
 
-#: src/oss4/oss.h:93
+#: src/opus/opus.cc:39
+msgid "Opus Decoder"
+msgstr ""
+
+#: src/opus/opus.cc:336
+msgid ""
+"Opus Decoder Plugin for Audacious\n"
+"Copyright 2022 Thomas Lange"
+msgstr ""
+
+#: src/oss4/oss.h:70
 msgid "OSS4 Output"
 msgstr "Salida OSS4"
 
-#: src/oss4/oss.h:95
+#: src/oss4/oss.h:72
 msgid "OSS3 Output"
 msgstr ""
 
@@ -2497,27 +2786,27 @@
 msgid "Default device"
 msgstr ""
 
-#: src/oss4/plugin.cc:77
+#: src/oss4/plugin.cc:78
 msgid "Audio device:"
 msgstr "Dispositivo de sonido:"
 
-#: src/oss4/plugin.cc:80
+#: src/oss4/plugin.cc:81
 msgid "Use alternate device:"
 msgstr "Utilizar dispositivo alternativo:"
 
-#: src/oss4/plugin.cc:84
+#: src/oss4/plugin.cc:85
 msgid "Save volume between sessions."
 msgstr "Guardar volumen entre sesiones."
 
-#: src/oss4/plugin.cc:86
+#: src/oss4/plugin.cc:87
 msgid "Enable format conversions made by the OSS software."
 msgstr "Activar conversiones de formato realizadas por el software OSS."
 
-#: src/oss4/plugin.cc:88
+#: src/oss4/plugin.cc:89
 msgid "Enable exclusive mode to prevent virtual mixing."
 msgstr "Activa el modo exclusivo para evitar la mezcla virtual."
 
-#: src/oss4/plugin.cc:100
+#: src/oss4/plugin.cc:101
 msgid ""
 "OSS4 Output Plugin for Audacious\n"
 "Copyright 2010-2012 Michał Lipski\n"
@@ -2526,19 +2815,35 @@
 "Lindgren and of course the authors of the previous OSS plugin."
 msgstr ""
 
-#: src/playlist-manager/playlist-manager.cc:37
-msgid "Playlist Manager"
+#: src/pipewire/pipewire.cc:44
+msgid "PipeWire Output"
 msgstr ""
 
-#: src/playlist-manager/playlist-manager.cc:226
-msgid "Entries"
+#: src/pipewire/pipewire.cc:118
+msgid ""
+"PipeWire Output Plugin for Audacious\n"
+"Copyright 2022 Thomas Lange\n"
+"\n"
+"Based on the PipeWire Output Plugin for Qmmp\n"
+"Copyright 2021 Ilya Kotov"
 msgstr ""
 
-#: src/playlist-manager/playlist-manager.cc:245
+#: src/pipewire/pipewire.cc:408 src/skins/menus.cc:88 src/skins-qt/menus.cc:79
+msgid "Playback"
+msgstr "Reproducción"
+
+#: src/playlist-manager/playlist-manager.cc:38
+#: src/playlist-manager-qt/playlist-manager-qt.cc:42
+msgid "Playlist Manager"
+msgstr "Gestor de listas de reproducción"
+
+#: src/playlist-manager/playlist-manager.cc:221
+#: src/playlist-manager-qt/playlist-manager-qt.cc:356
 msgid "_Remove"
-msgstr ""
+msgstr "_Remover"
 
-#: src/playlist-manager/playlist-manager.cc:246
+#: src/playlist-manager/playlist-manager.cc:222
+#: src/playlist-manager-qt/playlist-manager-qt.cc:351
 msgid "Ren_ame"
 msgstr ""
 
@@ -2546,39 +2851,54 @@
 msgid "PLS Playlists"
 msgstr "Listas PLS"
 
-#: src/psf/plugin.cc:45
+#: src/psf/plugin.cc:53
 msgid "OpenPSF PSF1/PSF2 Decoder"
 msgstr "Abrir el decodificador PSF PSF1/PSF2"
 
-#: src/pulse_audio/pulse_audio.cc:38
+#: src/psf/plugin.cc:270
+msgid "OpenPSF Configuration"
+msgstr ""
+
+#: src/psf/plugin.cc:271 src/xsf/plugin.cc:444
+msgid "Ignore length from file"
+msgstr ""
+
+#: src/pulse/pulse_audio.cc:42
 msgid "PulseAudio Output"
 msgstr "Salida de PulseAudio"
 
-#: src/pulse_audio/pulse_audio.cc:611
+#: src/pulse/pulse_audio.cc:84
+msgid "Context name:"
+msgstr ""
+
+#: src/pulse/pulse_audio.cc:86
+msgid "Stream name:"
+msgstr ""
+
+#: src/pulse/pulse_audio.cc:596
 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."
+"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/qtaudio/qtaudio.cc:49
+#: src/qtaudio/qtaudio.cc:53
 msgid "QtMultimedia Output"
 msgstr ""
 
-#: src/qtaudio/qtaudio.cc:77
+#: src/qtaudio/qtaudio.cc:84
 msgid ""
 "QtMultimedia Audio Output Plugin for Audacious\n"
 "Copyright 2014 William Pitcock\n"
@@ -2587,50 +2907,87 @@
 "Copyright 2010 John Lindgren"
 msgstr ""
 
-#: src/qtui/dialog_windows.cc:31
-msgid "Working ..."
+#: src/qtglspectrum/gl-spectrum.cc:41
+msgid ""
+"OpenGL Spectrum Analyzer for Audacious\n"
+"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
+"Copyright 2014, 2020 Ariadne Conill\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/qtui/filter_input.cc:44 src/skins/ui_playlist.cc:221
-msgid "Search"
+#: src/qthotkey/gui.cc:177
+msgid "Press a key combination inside a text field."
+msgstr ""
+
+#: src/qthotkey/plugin.cc:105
+msgid ""
+"Global Hotkey Plugin\n"
+"Control the player with global key combinations or multimedia keys.\n"
+"\n"
+"Copyright (C) 2020 i.Dark_Templar <darktemplar@dark-templar-archives.net>\n"
+"Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n"
+"\n"
+"Contributors 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/qtui/main_window_actions.cc:94
+#: src/qtui/menus.cc:109
 msgid "_Open Folder ..."
 msgstr ""
 
-#: src/qtui/main_window_actions.cc:96
+#: src/qtui/menus.cc:115
 msgid "_Add Folder ..."
 msgstr ""
 
-#: src/qtui/main_window_actions.cc:101
+#: src/qtui/menus.cc:128
 msgid "_Log Inspector ..."
 msgstr ""
 
-#: src/qtui/main_window.cc:64
-msgid "Open Files"
+#: src/qtui/menus.cc:220
+msgid "_Find ..."
 msgstr ""
 
-#: src/qtui/main_window.cc:66
-msgid "Add Files"
+#: src/qtui/menus.cc:256 src/skins/menus.cc:80 src/skins-qt/menus.cc:70
+msgid "Audio Settings ..."
 msgstr ""
 
-#: src/qtui/main_window.cc:71 src/skins/menus.cc:90
-msgid "Previous"
-msgstr "Anterior"
+#: src/qtui/playlist_model.cc:188
+msgid "Q#"
+msgstr ""
 
-#: src/qtui/main_window.cc:77 src/skins/menus.cc:82
-msgid "Repeat"
-msgstr "Repetir"
+#: src/qtui/playlist_model.cc:190
+msgid "T#"
+msgstr ""
 
-#: src/qtui/main_window.cc:79 src/skins/menus.cc:83
-msgid "Shuffle"
-msgstr "Orden aleatorio"
+#: src/qtui/playlist_model.cc:192
+msgid "C#"
+msgstr ""
+
+#: src/qtui/playlist_model.cc:194
+msgid "D#"
+msgstr ""
 
-#: src/qtui/qtui.cc:42
+#: src/qtui/qtui.cc:40
 msgid "Qt Interface"
 msgstr ""
 
+#: src/qtui/search_bar.cc:46
+msgid "Search playlist"
+msgstr ""
+
+#: src/qtui/settings.cc:79
+msgid "Use bold font for column headers"
+msgstr ""
+
 #: src/resample/resample.cc:43
 msgid "Sample Rate Converter"
 msgstr "Convertidor de Velocidad de Muestra"
@@ -2669,7 +3026,7 @@
 msgid "Method:"
 msgstr "Método:"
 
-#: src/resample/resample.cc:199 src/sox-resampler/sox-resampler.cc:161
+#: src/resample/resample.cc:199 src/soxr/sox-resampler.cc:203
 msgid "Rate:"
 msgstr "Velocidad:"
 
@@ -2721,141 +3078,111 @@
 msgid "192 kHz:"
 msgstr "192 kHz:"
 
-#: src/scrobbler2/config_window.cc:41
-#, c-format
-msgid "OK. Scrobbling for user: %s"
-msgstr ""
-
-#: src/scrobbler2/config_window.cc:54
-msgid "Permission Denied"
-msgstr ""
-
-#: src/scrobbler2/config_window.cc:56
-msgid "Access the following link to allow Audacious to scrobble your plays:"
+#: src/scrobbler2/config_window.cc:29
+msgid "Checking Last.fm access ..."
 msgstr ""
 
-#: src/scrobbler2/config_window.cc:66
-msgid "Keep this window open and click 'Check Permission' again.\n"
-msgstr ""
-
-#: src/scrobbler2/config_window.cc:69 src/scrobbler2/config_window.cc:80
+#: src/scrobbler2/config_window.cc:35
 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."
+"Your scrobbles are being saved on your computer temporarily. They will be "
+"submitted as soon as Audacious is allowed access."
 msgstr ""
 
-#: src/scrobbler2/config_window.cc:77
-msgid "Network Problem."
+#: src/scrobbler2/config_window.cc:41
+#, c-format
+msgid "Permission granted. Scrobbling for user %s."
 msgstr ""
 
-#: src/scrobbler2/config_window.cc:78
-msgid "There was a problem contacting Last.fm. Please try again later."
+#: src/scrobbler2/config_window.cc:44
+msgid ""
+"Permission denied. Open the following URL in a browser, allow Audacious "
+"access to your account, and then click 'Check Permission' again:"
 msgstr ""
 
-#: src/scrobbler2/config_window.cc:110
-msgid "Checking..."
+#: src/scrobbler2/config_window.cc:53
+msgid "There was a problem contacting Last.fm."
 msgstr ""
 
-#: src/scrobbler2/config_window.cc:176
-msgid "C_heck Permission"
+#: src/scrobbler2/config_window.cc:92
+msgid "Check Permission"
 msgstr ""
 
-#: src/scrobbler2/config_window.cc:177
-msgid "_Revoke Permission"
+#: src/scrobbler2/config_window.cc:93
+msgid "Revoke Permission"
 msgstr ""
 
-#: src/scrobbler2/config_window.cc:220
-msgid ""
-"You need to allow Audacious to scrobble tracks to your Last.fm account.\n"
+#: src/scrobbler2/config_window.cc:97
+msgid "You need to allow Audacious to scrobble tracks to your Last.fm account."
 msgstr ""
 
 #: src/scrobbler2/scrobbler.cc:29
 msgid "Scrobbler 2.0"
 msgstr ""
 
-#: src/scrobbler2/scrobbler.cc:224
+#: src/scrobbler2/scrobbler.cc:200
 msgid ""
 "The Scrobbler plugin could not be started.\n"
 "There might be a problem with your installation."
 msgstr ""
 
-#: src/scrobbler2/scrobbler.cc:289
+#: src/scrobbler2/scrobbler.cc:245
 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"
+"project."
 msgstr ""
 
-#: src/scrobbler2/scrobbler_communication.cc:642
-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/sdlout.cc:48
+#: src/sdlout/sdlout.cc:43
 msgid "SDL Output"
 msgstr "Salida SDL"
 
-#: src/sdlout/sdlout.cc:77
+#: src/sdlout/sdlout.cc:72
 msgid ""
 "SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
 msgstr ""
 
-#: src/search-tool/search-tool.cc:116 src/search-tool/search-tool.cc:124
+#: src/search-tool/library.cc:35 src/search-tool/library.cc:46
+#: src/search-tool-qt/library.cc:35 src/search-tool-qt/library.cc:46
 msgid "Library"
 msgstr "Biblioteca"
 
-#: src/search-tool/search-tool.cc:394
-#, c-format
-msgid "%d result"
-msgid_plural "%d results"
-msgstr0 ""
-msgstr1 ""
-
-#: src/search-tool/search-tool.cc:400
-#, c-format
-msgid "(%d hidden)"
-msgid_plural "(%d hidden)"
-msgstr0 ""
-msgstr1 ""
-
-#: src/search-tool/search-tool.cc:594
+#: src/search-tool-qt/search-model.cc:44 src/search-tool/search-tool.cc:287
 #, c-format
 msgid "%d song"
 msgid_plural "%d songs"
 msgstr0 ""
 msgstr1 ""
+msgstr2 ""
 
-#: src/search-tool/search-tool.cc:601
+#: src/search-tool-qt/search-model.cc:53 src/search-tool/search-tool.cc:294
 msgid "of this genre"
 msgstr ""
 
-#: src/search-tool/search-tool.cc:607
+#: src/search-tool-qt/search-model.h:47 src/search-tool/search-model.h:45
 msgid "on"
 msgstr ""
 
-#: src/search-tool/search-tool.cc:607
+#: src/search-tool-qt/search-model.h:47 src/search-tool/search-model.h:45
 msgid "by"
 msgstr ""
 
-#: src/search-tool/search-tool.cc:643
-msgid "_Create Playlist"
-msgstr "_Crear lista de reproducción"
+#: src/search-tool-qt/search-tool-qt.cc:165 src/search-tool/search-tool.cc:74
+msgid "Number of results to show:"
+msgstr ""
 
-#: src/search-tool/search-tool.cc:645
-msgid "_Add to Playlist"
-msgstr "_Añadir a la lista de reproducción"
+#: src/search-tool-qt/search-tool-qt.cc:168 src/search-tool/search-tool.cc:77
+msgid "Rescan library at startup"
+msgstr ""
 
-#: src/search-tool/search-tool.cc:684
-msgid "Search library"
-msgstr "Buscar biblioteca"
+#: src/search-tool-qt/search-tool-qt.cc:170
+msgid "Monitor library for changes"
+msgstr ""
 
-#: src/search-tool/search-tool.cc:688
+#: src/search-tool-qt/search-tool-qt.cc:193 src/search-tool/search-tool.cc:450
 msgid ""
 "To import your music library into Audacious, choose a folder and then click "
 "the \"refresh\" icon."
@@ -2863,22 +3190,46 @@
 "Para importar su colección musical en Audacious, elija una carpeta y pulse "
 "el botón «actualizar»."
 
-#: src/search-tool/search-tool.cc:696
+#: src/search-tool-qt/search-tool-qt.cc:195 src/search-tool/search-tool.cc:459
 msgid "Please wait ..."
 msgstr "Espere por favor..."
 
-#: src/search-tool/search-tool.cc:723
+#: src/search-tool-qt/search-tool-qt.cc:197 src/search-tool/search-tool.cc:487
 msgid "Choose Folder"
 msgstr "Elija una carpeta"
 
+#: src/search-tool-qt/search-tool-qt.cc:201 src/search-tool/search-tool.cc:445
+msgid "Search library"
+msgstr "Buscar biblioteca"
+
+#: src/search-tool-qt/search-tool-qt.cc:327 src/search-tool/search-tool.cc:156
+#, c-format
+msgid "%d of %d result shown"
+msgid_plural "%d of %d results shown"
+msgstr0 ""
+msgstr1 ""
+msgstr2 ""
+
+#: src/search-tool-qt/search-tool-qt.cc:331 src/search-tool/search-tool.cc:160
+#, c-format
+msgid "%d result"
+msgid_plural "%d results"
+msgstr0 ""
+msgstr1 ""
+msgstr2 ""
+
+#: src/search-tool-qt/search-tool-qt.cc:501 src/search-tool/search-tool.cc:341
+msgid "_Create Playlist"
+msgstr "_Crear lista de reproducción"
+
+#: src/search-tool-qt/search-tool-qt.cc:503 src/search-tool/search-tool.cc:343
+msgid "_Add to Playlist"
+msgstr "_Añadir a la lista de reproducción"
+
 #: src/sid/xmms-sid.cc:43
 msgid "SID Player"
 msgstr ""
 
-#: src/sid/xs_config.cc:61
-msgid "Output"
-msgstr ""
-
 #: src/sid/xs_config.cc:62
 msgid "Channels:"
 msgstr ""
@@ -2957,741 +3308,684 @@
 msgid "Threshold:"
 msgstr ""
 
-#: src/silence-removal/silence-removal.cc:70
-msgid "dB"
+#: src/skins/actions.cc:45 src/skins-qt/actions.cc:43
+msgid "Repeat points cleared."
 msgstr ""
 
-#: src/skins/menus.cc:64
-msgid "Open Files ..."
+#: src/skins/actions.cc:60 src/skins-qt/actions.cc:58
+msgid "Repeat point A set."
 msgstr ""
 
-#: src/skins/menus.cc:65
-msgid "Open URL ..."
+#: src/skins/actions.cc:65 src/skins-qt/actions.cc:63
+msgid "Repeat point B set."
 msgstr ""
 
-#: src/skins/menus.cc:66
-msgid "Search Library"
+#: src/skins/equalizer.cc:223 src/skins-qt/equalizer.cc:223
+msgid "Preamp"
+msgstr "Preamplificador"
+
+#: src/skins/equalizer.cc:227 src/skins-qt/equalizer.cc:227
+msgid "31 Hz"
+msgstr "31 Hz"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "63 Hz"
+msgstr "63 Hz"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "125 Hz"
+msgstr "125 Hz"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "250 Hz"
+msgstr "250 Hz"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "500 Hz"
+msgstr "500 Hz"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "1 kHz"
+msgstr "1 kHz"
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "2 kHz"
+msgstr "2 kHz"
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "4 kHz"
+msgstr "4 kHz"
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "8 kHz"
+msgstr "8 kHz"
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "16 kHz"
+msgstr "16 kHz"
+
+#: src/skins/equalizer.cc:270 src/skins-qt/equalizer.cc:270
+msgid "Audacious Equalizer"
+msgstr "Ecualizador de Audacious"
+
+#: src/skins/main.cc:459 src/skins-qt/main.cc:442
+msgid "Recording on"
 msgstr ""
 
-#: src/skins/menus.cc:68
-msgid "Playback"
-msgstr "Reproducción"
+#: src/skins/main.cc:461 src/skins-qt/main.cc:444
+msgid "Recording off"
+msgstr ""
 
-#: src/skins/menus.cc:69
+#: src/skins/main.cc:754 src/skins-qt/main.cc:701
+#, 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/main.cc:771 src/skins-qt/main.cc:718
+#, c-format
+msgid "Volume: %d%%"
+msgstr "Volumen: %d%%"
+
+#: src/skins/main.cc:784 src/skins-qt/main.cc:731
+#, c-format
+msgid "Balance: %d%% left"
+msgstr "Balance: %d%% izquierda"
+
+#: src/skins/main.cc:786 src/skins-qt/main.cc:733
+msgid "Balance: center"
+msgstr "Balance: centrado"
+
+#: src/skins/main.cc:788 src/skins-qt/main.cc:735
+#, c-format
+msgid "Balance: %d%% right"
+msgstr "Balance: %d%% derecha"
+
+#: src/skins/main.cc:880 src/skins-qt/main.cc:827
+msgid "Options Menu"
+msgstr "Menú de opciones"
+
+#: src/skins/main.cc:884 src/skins-qt/main.cc:831
+msgid "Disable 'Always On Top'"
+msgstr "Desactivar 'Siempre encima'"
+
+#: src/skins/main.cc:886 src/skins-qt/main.cc:833
+msgid "Enable 'Always On Top'"
+msgstr "Activar 'Siempre encima'"
+
+#: src/skins/main.cc:889 src/skins-qt/main.cc:836
+msgid "File Info Box"
+msgstr "Caja de información de archivo"
+
+#: src/skins/main.cc:892 src/skins/menus.cc:149 src/skins-qt/main.cc:839
+#: src/skins-qt/menus.cc:142
+msgid "Double Size"
+msgstr ""
+
+#: src/skins/main.cc:895 src/skins-qt/main.cc:842
+msgid "Visualizations"
+msgstr ""
+
+#: src/skins/menus.cc:74 src/skins-qt/menus.cc:64
+msgid "Volume Up"
+msgstr "Subir volumen"
+
+#: src/skins/menus.cc:75 src/skins-qt/menus.cc:65
+msgid "Volume Down"
+msgstr "Bajar volumen"
+
+#: src/skins/menus.cc:77 src/skins-qt/menus.cc:67
+msgid "Effects ..."
+msgstr ""
+
+#: src/skins/menus.cc:84 src/skins-qt/menus.cc:74
+msgid "Open Files ..."
+msgstr ""
+
+#: src/skins/menus.cc:85 src/skins-qt/menus.cc:76
+msgid "Open URL ..."
+msgstr ""
+
+#: src/skins/menus.cc:89 src/skins-qt/menus.cc:80
 msgid "Playlist"
 msgstr "Lista de reproducción"
 
-#: src/skins/menus.cc:70
+#: src/skins/menus.cc:90 src/skins-qt/menus.cc:81
+msgid "Output"
+msgstr ""
+
+#: src/skins/menus.cc:91 src/skins-qt/menus.cc:82
 msgid "View"
 msgstr "Ver"
 
-#: src/skins/menus.cc:72 src/skins/menus.cc:136 src/skins/menus.cc:149
-#: src/skins/menus.cc:214
+#: src/skins/menus.cc:93 src/skins/menus.cc:161 src/skins/menus.cc:174
+#: src/skins/menus.cc:245 src/skins-qt/menus.cc:84 src/skins-qt/menus.cc:156
+#: src/skins-qt/menus.cc:170 src/skins-qt/menus.cc:241
 msgid "Services"
-msgstr ""
+msgstr "Servicios"
 
-#: src/skins/menus.cc:74
+#: src/skins/menus.cc:95 src/skins-qt/menus.cc:86
 msgid "About ..."
 msgstr ""
 
-#: src/skins/menus.cc:75
+#: src/skins/menus.cc:96 src/skins-qt/menus.cc:87
 msgid "Settings ..."
 msgstr ""
 
-#: src/skins/menus.cc:76
+#: src/skins/menus.cc:97 src/skins-qt/menus.cc:88
 msgid "Quit"
 msgstr ""
 
-#: src/skins/menus.cc:80 src/skins/menus.cc:206
+#: src/skins/menus.cc:101 src/skins/menus.cc:235 src/skins-qt/menus.cc:92
+#: src/skins-qt/menus.cc:231
 msgid "Song Info ..."
 msgstr ""
 
-#: src/skins/menus.cc:84
+#: src/skins/menus.cc:105 src/skins-qt/menus.cc:96
+msgid "Shuffle by Album"
+msgstr ""
+
+#: src/skins/menus.cc:106 src/skins-qt/menus.cc:97
 msgid "No Playlist Advance"
 msgstr "No avanzar la lista de reproducción"
 
-#: src/skins/menus.cc:85
-msgid "Stop After This Song"
-msgstr ""
-
-#: src/skins/menus.cc:93
+#: src/skins/menus.cc:117 src/skins-qt/menus.cc:108
 msgid "Set A-B Repeat"
 msgstr ""
 
-#: src/skins/menus.cc:94
+#: src/skins/menus.cc:118 src/skins-qt/menus.cc:109
 msgid "Clear A-B Repeat"
 msgstr ""
 
-#: src/skins/menus.cc:96
+#: src/skins/menus.cc:120 src/skins-qt/menus.cc:111
 msgid "Jump to Song ..."
 msgstr ""
 
-#: src/skins/menus.cc:97
+#: src/skins/menus.cc:121 src/skins-qt/menus.cc:113
 msgid "Jump to Time ..."
 msgstr ""
 
-#: src/skins/menus.cc:101
+#: src/skins/menus.cc:125 src/skins-qt/menus.cc:118
 msgid "Play/Resume"
 msgstr ""
 
-#: src/skins/menus.cc:103
+#: src/skins/menus.cc:127 src/skins-qt/menus.cc:120
 msgid "New Playlist"
 msgstr "Nueva lista de reproducción"
 
-#: src/skins/menus.cc:104
+#: src/skins/menus.cc:128 src/skins-qt/menus.cc:121
 msgid "Rename Playlist ..."
 msgstr ""
 
-#: src/skins/menus.cc:105
+#: src/skins/menus.cc:129 src/skins-qt/menus.cc:122
 msgid "Remove Playlist"
-msgstr ""
+msgstr "Remover Lista de temas"
 
-#: src/skins/menus.cc:107
+#: src/skins/menus.cc:131 src/skins-qt/menus.cc:124
 msgid "Previous Playlist"
 msgstr ""
 
-#: src/skins/menus.cc:108
+#: src/skins/menus.cc:132 src/skins-qt/menus.cc:125
 msgid "Next Playlist"
 msgstr ""
 
-#: src/skins/menus.cc:110
+#: src/skins/menus.cc:134 src/skins-qt/menus.cc:127
 msgid "Import Playlist ..."
 msgstr ""
 
-#: src/skins/menus.cc:111
+#: src/skins/menus.cc:135 src/skins-qt/menus.cc:128
 msgid "Export Playlist ..."
 msgstr ""
 
-#: src/skins/menus.cc:113
+#: src/skins/menus.cc:137 src/skins-qt/menus.cc:130
 msgid "Playlist Manager ..."
 msgstr ""
 
-#: src/skins/menus.cc:114
+#: src/skins/menus.cc:138 src/skins-qt/menus.cc:131
 msgid "Queue Manager ..."
 msgstr ""
 
-#: src/skins/menus.cc:116
+#: src/skins/menus.cc:140 src/skins-qt/menus.cc:133
 msgid "Refresh Playlist"
 msgstr ""
 
-#: src/skins/menus.cc:120
+#: src/skins/menus.cc:144 src/skins-qt/menus.cc:137
 msgid "Show Playlist Editor"
 msgstr "Mostrar el editor de listas de reproducción"
 
-#: src/skins/menus.cc:121
+#: src/skins/menus.cc:145 src/skins-qt/menus.cc:138
 msgid "Show Equalizer"
 msgstr "Mostrar el ecualizador"
 
-#: src/skins/menus.cc:123
+#: src/skins/menus.cc:147 src/skins-qt/menus.cc:140
 msgid "Show Remaining Time"
 msgstr ""
 
-#: src/skins/menus.cc:125
+#: src/skins/menus.cc:150 src/skins-qt/menus.cc:143
 msgid "Always on Top"
 msgstr "Siempre encima"
 
-#: src/skins/menus.cc:126
+#: src/skins/menus.cc:151 src/skins-qt/menus.cc:145
 msgid "On All Workspaces"
 msgstr ""
 
-#: src/skins/menus.cc:128
+#: src/skins/menus.cc:153 src/skins-qt/menus.cc:148
 msgid "Roll Up Player"
 msgstr ""
 
-#: src/skins/menus.cc:129
+#: src/skins/menus.cc:154 src/skins-qt/menus.cc:149
 msgid "Roll Up Playlist Editor"
 msgstr ""
 
-#: src/skins/menus.cc:130
+#: src/skins/menus.cc:155 src/skins-qt/menus.cc:150
 msgid "Roll Up Equalizer"
 msgstr ""
 
-#: src/skins/menus.cc:132 src/skins/ui_main.cc:854
-msgid "Double Size"
-msgstr ""
-
-#: src/skins/menus.cc:138
+#: src/skins/menus.cc:163 src/skins-qt/menus.cc:158
 msgid "Add URL ..."
 msgstr ""
 
-#: src/skins/menus.cc:139
+#: src/skins/menus.cc:164 src/skins-qt/menus.cc:160
 msgid "Add Files ..."
 msgstr ""
 
-#: src/skins/menus.cc:143 src/skins/menus.cc:171 src/skins/menus.cc:185
+#: src/skins/menus.cc:168 src/skins/menus.cc:196 src/skins/menus.cc:212
+#: src/skins-qt/menus.cc:164 src/skins-qt/menus.cc:192
+#: src/skins-qt/menus.cc:208
 msgid "By Title"
 msgstr "Por título"
 
-#: src/skins/menus.cc:144 src/skins/menus.cc:178 src/skins/menus.cc:192
+#: src/skins/menus.cc:169 src/skins/menus.cc:203 src/skins/menus.cc:219
+#: src/skins-qt/menus.cc:165 src/skins-qt/menus.cc:199
+#: src/skins-qt/menus.cc:215
 msgid "By File Name"
 msgstr ""
 
-#: src/skins/menus.cc:145 src/skins/menus.cc:179 src/skins/menus.cc:193
+#: src/skins/menus.cc:170 src/skins/menus.cc:204 src/skins/menus.cc:220
+#: src/skins-qt/menus.cc:166 src/skins-qt/menus.cc:200
+#: src/skins-qt/menus.cc:216
 msgid "By File Path"
 msgstr ""
 
-#: src/skins/menus.cc:151
+#: src/skins/menus.cc:176 src/skins-qt/menus.cc:172
 msgid "Remove All"
 msgstr "Eliminar todo"
 
-#: src/skins/menus.cc:152
+#: src/skins/menus.cc:177 src/skins-qt/menus.cc:173
 msgid "Clear Queue"
 msgstr "Limpiar la cola"
 
-#: src/skins/menus.cc:154
+#: src/skins/menus.cc:179 src/skins-qt/menus.cc:175
 msgid "Remove Unavailable Files"
 msgstr "Eliminar los archivos no disponibles"
 
-#: src/skins/menus.cc:155
+#: src/skins/menus.cc:180 src/skins-qt/menus.cc:176
 msgid "Remove Duplicates"
 msgstr "Eliminar duplicados"
 
-#: src/skins/menus.cc:157
+#: src/skins/menus.cc:182 src/skins-qt/menus.cc:178
 msgid "Remove Unselected"
 msgstr "Eliminar los no seleccionados"
 
-#: src/skins/menus.cc:158
+#: src/skins/menus.cc:183 src/skins-qt/menus.cc:179
 msgid "Remove Selected"
 msgstr "Eliminar los seleccionados"
 
-#: src/skins/menus.cc:162
+#: src/skins/menus.cc:187 src/skins-qt/menus.cc:183
 msgid "Search and Select"
 msgstr "Buscar y seleccionar"
 
-#: src/skins/menus.cc:164
+#: src/skins/menus.cc:189 src/skins-qt/menus.cc:185
 msgid "Invert Selection"
 msgstr "Invertir la selección"
 
-#: src/skins/menus.cc:165
+#: src/skins/menus.cc:190 src/skins-qt/menus.cc:186
 msgid "Select None"
 msgstr "No seleccionar nada"
 
-#: src/skins/menus.cc:166
+#: src/skins/menus.cc:191 src/skins-qt/menus.cc:187
 msgid "Select All"
 msgstr "Seleccionar todo"
 
-#: src/skins/menus.cc:170 src/skins/menus.cc:184
+#: src/skins/menus.cc:195 src/skins/menus.cc:211 src/skins-qt/menus.cc:191
+#: src/skins-qt/menus.cc:207
 msgid "By Track Number"
 msgstr "Por número de pista"
 
-#: src/skins/menus.cc:172 src/skins/menus.cc:186
+#: src/skins/menus.cc:197 src/skins/menus.cc:213 src/skins-qt/menus.cc:193
+#: src/skins-qt/menus.cc:209
 msgid "By Artist"
 msgstr "Por artista"
 
-#: src/skins/menus.cc:173 src/skins/menus.cc:187
+#: src/skins/menus.cc:198 src/skins/menus.cc:214 src/skins-qt/menus.cc:194
+#: src/skins-qt/menus.cc:210
 msgid "By Album"
 msgstr "Por álbum"
 
-#: src/skins/menus.cc:174 src/skins/menus.cc:188
+#: src/skins/menus.cc:199 src/skins/menus.cc:215 src/skins-qt/menus.cc:195
+#: src/skins-qt/menus.cc:211
 msgid "By Album Artist"
 msgstr ""
 
-#: src/skins/menus.cc:175 src/skins/menus.cc:190
+#: src/skins/menus.cc:200 src/skins/menus.cc:216 src/skins-qt/menus.cc:196
+#: src/skins-qt/menus.cc:212
 msgid "By Release Date"
 msgstr ""
 
-#: src/skins/menus.cc:176 src/skins/menus.cc:189
+#: src/skins/menus.cc:201 src/skins/menus.cc:217 src/skins-qt/menus.cc:197
+#: src/skins-qt/menus.cc:213
 msgid "By Genre"
 msgstr ""
 
-#: src/skins/menus.cc:177 src/skins/menus.cc:191
+#: src/skins/menus.cc:202 src/skins/menus.cc:218 src/skins-qt/menus.cc:198
+#: src/skins-qt/menus.cc:214
 msgid "By Length"
 msgstr ""
 
-#: src/skins/menus.cc:180 src/skins/menus.cc:194
+#: src/skins/menus.cc:205 src/skins/menus.cc:221 src/skins-qt/menus.cc:201
+#: src/skins-qt/menus.cc:217
 msgid "By Custom Title"
 msgstr ""
 
-#: src/skins/menus.cc:198
+#: src/skins/menus.cc:206 src/skins/menus.cc:222 src/skins-qt/menus.cc:202
+#: src/skins-qt/menus.cc:218
+msgid "By Comment"
+msgstr ""
+
+#: src/skins/menus.cc:207 src/skins/menus.cc:223 src/skins-qt/menus.cc:203
+#: src/skins-qt/menus.cc:219
+msgid "By Disc Number"
+msgstr ""
+
+#: src/skins/menus.cc:227 src/skins-qt/menus.cc:223
 msgid "Randomize List"
 msgstr "Ordenar aleatoriamente"
 
-#: src/skins/menus.cc:199
+#: src/skins/menus.cc:228 src/skins-qt/menus.cc:224
 msgid "Reverse List"
 msgstr "Invertir la lista"
 
-#: src/skins/menus.cc:201
+#: src/skins/menus.cc:230 src/skins-qt/menus.cc:226
 msgid "Sort Selected"
 msgstr "Ordenar los seleccionados"
 
-#: src/skins/menus.cc:202
+#: src/skins/menus.cc:231 src/skins-qt/menus.cc:227
 msgid "Sort List"
 msgstr "Ordenar lista"
 
-#: src/skins/menus.cc:208
+#: src/skins/menus.cc:236 src/skins-qt/menus.cc:232
+msgid "Open Containing Folder"
+msgstr ""
+
+#: src/skins/menus.cc:238 src/skins-qt/menus.cc:234
 msgid "Cut"
 msgstr "Cortar"
 
-#: src/skins/menus.cc:209
+#: src/skins/menus.cc:239 src/skins-qt/menus.cc:235
 msgid "Copy"
 msgstr "Copiar"
 
-#: src/skins/menus.cc:210
+#: src/skins/menus.cc:240 src/skins-qt/menus.cc:236
 msgid "Paste"
 msgstr "Pegar"
 
-#: src/skins/menus.cc:212
-msgid "Queue/Unqueue"
-msgstr ""
-
-#: src/skins/menus.cc:218
-msgid "Load Preset ..."
-msgstr ""
-
-#: src/skins/menus.cc:219
-msgid "Load Auto Preset ..."
-msgstr ""
-
-#: src/skins/menus.cc:220
-msgid "Load Default"
+#: src/skins/menus.cc:241 src/skins-qt/menus.cc:237
+msgid "Paste at End"
 msgstr ""
 
-#: src/skins/menus.cc:221
-msgid "Load Preset File ..."
+#: src/skins/menus.cc:243 src/skins-qt/menus.cc:239
+msgid "Queue/Unqueue"
 msgstr ""
 
-#: src/skins/menus.cc:222
-msgid "Load EQF File ..."
-msgstr ""
+#: src/skins/playlist-widget.cc:58 src/skins-qt/playlist-widget.cc:58
+#, c-format
+msgid "%s (%d of %d)"
+msgstr "%s (%d de %d)"
 
-#: src/skins/menus.cc:224
-msgid "Save Preset ..."
-msgstr ""
+#: src/skins/playlistwin.cc:491 src/skins-qt/playlistwin.cc:478
+msgid "Audacious Playlist Editor"
+msgstr "Editor de listas de reproducción de Audacious"
 
-#: src/skins/menus.cc:225
-msgid "Save Auto Preset ..."
-msgstr ""
+#: src/skins/plugin.cc:53 src/skins-qt/plugin.cc:65
+msgid "Winamp Classic Interface"
+msgstr "Interface del Winamp Clásico"
 
-#: src/skins/menus.cc:226
-msgid "Save Default"
+#: src/skins-qt/menus.cc:75
+msgid "Open Folder ..."
 msgstr ""
 
-#: src/skins/menus.cc:227
-msgid "Save Preset File ..."
+#: src/skins-qt/menus.cc:159
+msgid "Add Folder ..."
 msgstr ""
 
-#: src/skins/menus.cc:228
-msgid "Save EQF File ..."
-msgstr ""
+#: src/skins-qt/search-select.cc:62 src/skins/search-select.cc:77
+msgid "Search entries in active playlist"
+msgstr "Buscar entradas en la lista de reproducción activa"
 
-#: src/skins/menus.cc:230
-msgid "Delete Preset ..."
+#: src/skins-qt/search-select.cc:70 src/skins/search-select.cc:83
+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 ""
+"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/menus.cc:231
-msgid "Delete Auto Preset ..."
+#: src/skins-qt/search-select.cc:75 src/skins/search-select.cc:91
+msgid "Title:"
 msgstr ""
 
-#: src/skins/menus.cc:233
-msgid "Import Winamp Presets ..."
+#: src/skins-qt/search-select.cc:79 src/skins/search-select.cc:96
+msgid "Album:"
 msgstr ""
 
-#: src/skins/menus.cc:235
-msgid "Reset to Zero"
+#: src/skins-qt/search-select.cc:82 src/skins/search-select.cc:101
+msgid "Artist:"
 msgstr ""
 
-#: src/skins/plugin.cc:48
-msgid "Winamp Classic Interface"
-msgstr "Interface del Winamp Clásico"
-
-#: src/skins/preset-browser.cc:57 src/skins/preset-list.cc:371
-#: src/skins/preset-list.cc:386
-msgid "Save"
-msgstr "Guardar"
-
-#: src/skins/preset-browser.cc:57 src/skins/preset-list.cc:338
-#: src/skins/preset-list.cc:354
-msgid "Load"
-msgstr "Cargar"
-
-#: src/skins/preset-browser.cc:83
-msgid "Load Preset File"
+#: src/skins-qt/search-select.cc:85 src/skins/search-select.cc:106
+msgid "File Name:"
 msgstr ""
 
-#: src/skins/preset-browser.cc:100
-msgid "Load EQF File"
-msgstr ""
+#: src/skins-qt/search-select.cc:88 src/skins/search-select.cc:134
+msgid "Clear previous selection before searching"
+msgstr "Limpiar la selección previa antes de buscar"
 
-#: src/skins/preset-browser.cc:119
-msgid "Save Preset File"
-msgstr ""
+#: src/skins-qt/search-select.cc:89 src/skins/search-select.cc:137
+msgid "Automatically toggle queue for matching entries"
+msgstr "Conmutar automáticamente la cola para las entradas coincidentes"
 
-#: src/skins/preset-browser.cc:137
-msgid "Save EQF File"
-msgstr ""
+#: src/skins-qt/search-select.cc:90 src/skins/search-select.cc:140
+msgid "Create a new playlist with matching entries"
+msgstr "Crear una nueva lista de reproducción con las entradas coincidentes"
 
-#: src/skins/preset-browser.cc:151
-msgid "Import Winamp Presets"
+#: src/skins-qt/search-select.cc:101 src/skins/search-select.cc:78
+msgid "Search"
 msgstr ""
 
-#: src/skins/preset-list.cc:285
-msgid "Presets"
-msgstr "Predefinidos"
-
-#: src/skins/preset-list.cc:335
-msgid "Load preset"
-msgstr "Cargar predefinido"
-
-#: src/skins/preset-list.cc:351
-msgid "Load auto-preset"
-msgstr "Cargar auto-predefinido"
-
-#: src/skins/preset-list.cc:367
-msgid "Save preset"
-msgstr "Guardar predefinido"
-
-#: src/skins/preset-list.cc:382
-msgid "Save auto-preset"
-msgstr "Guardar auto-predefinido"
-
-#: src/skins/preset-list.cc:408
-msgid "Delete preset"
-msgstr "Borrar predefinido"
-
-#: src/skins/preset-list.cc:424
-msgid "Delete auto-preset"
-msgstr "Borrar auto-predefinido"
-
-#: src/skins/skins_cfg.cc:176
+#: src/skins-qt/skins_cfg.cc:198 src/skins/skins_cfg.cc:182
 msgid "Player:"
 msgstr ""
 
-#: src/skins/skins_cfg.cc:178
+#: src/skins-qt/skins_cfg.cc:200 src/skins/skins_cfg.cc:184
 msgid "Select main player window font:"
 msgstr "Seleccione la tipografía para la ventana principal:"
 
-#: src/skins/skins_cfg.cc:179
+#: src/skins-qt/skins_cfg.cc:201 src/skins/skins_cfg.cc:185
 msgid "Playlist:"
 msgstr ""
 
-#: src/skins/skins_cfg.cc:181
+#: src/skins-qt/skins_cfg.cc:203 src/skins/skins_cfg.cc:187
 msgid "Select playlist font:"
 msgstr "Seleccione la tipografía de la lista de reproducción:"
 
-#: src/skins/skins_cfg.cc:187
+#: src/skins-qt/skins_cfg.cc:207 src/skins/skins_cfg.cc:191
 msgid "Skin"
 msgstr ""
 
-#: src/skins/skins_cfg.cc:189
+#: src/skins-qt/skins_cfg.cc:211 src/skins/skins_cfg.cc:193
+msgid "Display active titlebar when any window is focused"
+msgstr ""
+
+#: src/skins-qt/skins_cfg.cc:213 src/skins/skins_cfg.cc:195
 msgid "Fonts"
 msgstr ""
 
-#: src/skins/skins_cfg.cc:192
+#: src/skins-qt/skins_cfg.cc:215 src/skins/skins_cfg.cc:197
 msgid "Use bitmap fonts (supports ASCII only)"
 msgstr "Usar tipografías de mapa de bits (solo soporta ASCII)"
 
-#: src/skins/skins_cfg.cc:194
+#: src/skins-qt/skins_cfg.cc:217 src/skins/skins_cfg.cc:199
 msgid "Scroll song title"
 msgstr ""
 
-#: src/skins/skins_cfg.cc:196
+#: src/skins-qt/skins_cfg.cc:219 src/skins/skins_cfg.cc:201
 msgid "Scroll song title in both directions"
 msgstr "Desplazar el título de la canción en ambas direcciones"
 
-#: src/skins/skins_cfg.cc:201
+#: src/skins-qt/skins_cfg.cc:224 src/skins/skins_cfg.cc:206
 msgid "Analyzer"
 msgstr "Analizador"
 
-#: src/skins/skins_cfg.cc:202
+#: src/skins-qt/skins_cfg.cc:225 src/skins/skins_cfg.cc:207
 msgid "Scope"
 msgstr "Campo"
 
-#: src/skins/skins_cfg.cc:203
+#: src/skins-qt/skins_cfg.cc:226 src/skins/skins_cfg.cc:208
 msgid "Voiceprint / VU meter"
 msgstr ""
 
-#: src/skins/skins_cfg.cc:204
+#: src/skins-qt/skins_cfg.cc:227 src/skins/skins_cfg.cc:209
 msgid "Off"
 msgstr "Apagado"
 
-#: src/skins/skins_cfg.cc:208 src/skins/skins_cfg.cc:233
-#: src/skins/skins_cfg.cc:239
+#: src/skins-qt/skins_cfg.cc:231 src/skins-qt/skins_cfg.cc:256
+#: src/skins-qt/skins_cfg.cc:262 src/skins/skins_cfg.cc:213
+#: src/skins/skins_cfg.cc:238 src/skins/skins_cfg.cc:244
 msgid "Normal"
 msgstr "Normal"
 
-#: src/skins/skins_cfg.cc:209 src/skins/skins_cfg.cc:234
+#: src/skins-qt/skins_cfg.cc:232 src/skins-qt/skins_cfg.cc:257
+#: src/skins/skins_cfg.cc:214 src/skins/skins_cfg.cc:239
 msgid "Fire"
 msgstr "Fuego"
 
-#: src/skins/skins_cfg.cc:210
+#: src/skins-qt/skins_cfg.cc:233 src/skins/skins_cfg.cc:215
 msgid "Vertical lines"
 msgstr ""
 
-#: src/skins/skins_cfg.cc:214
+#: src/skins-qt/skins_cfg.cc:237 src/skins/skins_cfg.cc:219
 msgid "Lines"
 msgstr "Líneas"
 
-#: src/skins/skins_cfg.cc:215
+#: src/skins-qt/skins_cfg.cc:238 src/skins/skins_cfg.cc:220
 msgid "Bars"
 msgstr "Barras"
 
-#: src/skins/skins_cfg.cc:219
+#: src/skins-qt/skins_cfg.cc:242 src/skins/skins_cfg.cc:224
 msgid "Slowest"
 msgstr "Muy lento"
 
-#: src/skins/skins_cfg.cc:220
+#: src/skins-qt/skins_cfg.cc:243 src/skins/skins_cfg.cc:225
 msgid "Slow"
 msgstr "Lento"
 
-#: src/skins/skins_cfg.cc:221 src/sox-resampler/sox-resampler.cc:152
+#: src/skins-qt/skins_cfg.cc:244 src/skins/skins_cfg.cc:226
+#: src/soxr/sox-resampler.cc:180
 msgid "Medium"
 msgstr "Medio"
 
-#: src/skins/skins_cfg.cc:222
+#: src/skins-qt/skins_cfg.cc:245 src/skins/skins_cfg.cc:227
 msgid "Fast"
 msgstr "Rápido"
 
-#: src/skins/skins_cfg.cc:223
+#: src/skins-qt/skins_cfg.cc:246 src/skins/skins_cfg.cc:228
 msgid "Fastest"
 msgstr "Muy rápido"
 
-#: src/skins/skins_cfg.cc:227
+#: src/skins-qt/skins_cfg.cc:250 src/skins/skins_cfg.cc:232
 msgid "Dots"
 msgstr ""
 
-#: src/skins/skins_cfg.cc:228
+#: src/skins-qt/skins_cfg.cc:251 src/skins/skins_cfg.cc:233
 msgid "Line"
 msgstr ""
 
-#: src/skins/skins_cfg.cc:229
+#: src/skins-qt/skins_cfg.cc:252 src/skins/skins_cfg.cc:234
 msgid "Solid"
 msgstr ""
 
-#: src/skins/skins_cfg.cc:235
+#: src/skins-qt/skins_cfg.cc:258 src/skins/skins_cfg.cc:240
 msgid "Ice"
 msgstr "Hielo"
 
-#: src/skins/skins_cfg.cc:240
+#: src/skins-qt/skins_cfg.cc:263 src/skins/skins_cfg.cc:245
 msgid "Smooth"
 msgstr "Suave"
 
-#: src/skins/skins_cfg.cc:244
-msgid "Type"
-msgstr ""
-
-#: src/skins/skins_cfg.cc:245
-msgid "Visualization type:"
-msgstr ""
-
-#: src/skins/skins_cfg.cc:248
-msgid "Analyzer"
-msgstr ""
-
-#: src/skins/skins_cfg.cc:249
-msgid "Show peaks"
-msgstr ""
-
-#: src/skins/skins_cfg.cc:251
+#: src/skins-qt/skins_cfg.cc:267 src/skins/skins_cfg.cc:249
 msgid "Coloring:"
 msgstr ""
 
-#: src/skins/skins_cfg.cc:254
+#: src/skins-qt/skins_cfg.cc:270 src/skins/skins_cfg.cc:252
 msgid "Style:"
 msgstr ""
 
-#: src/skins/skins_cfg.cc:257
+#: src/skins-qt/skins_cfg.cc:273 src/skins/skins_cfg.cc:255
 msgid "Falloff:"
 msgstr ""
 
-#: src/skins/skins_cfg.cc:260
+#: src/skins-qt/skins_cfg.cc:276 src/skins/skins_cfg.cc:258
 msgid "Peak falloff:"
 msgstr ""
 
-#: src/skins/skins_cfg.cc:264
+#: src/skins-qt/skins_cfg.cc:282 src/skins/skins_cfg.cc:264
 msgid "Scope Style:"
 msgstr ""
 
-#: src/skins/skins_cfg.cc:267
+#: src/skins-qt/skins_cfg.cc:285 src/skins/skins_cfg.cc:267
 msgid "Voiceprint Coloring:"
 msgstr ""
 
-#: src/skins/skins_cfg.cc:270
+#: src/skins-qt/skins_cfg.cc:288 src/skins/skins_cfg.cc:270
 msgid "VU Meter Style:"
 msgstr ""
 
-#: src/skins/skins_cfg.cc:276
-msgid "General"
-msgstr "General"
-
-#: src/skins/skins_cfg.cc:277
-msgid "Visualization"
-msgstr "Visualización"
-
-#: src/skins/ui_equalizer.cc:282
-msgid "Preamp"
-msgstr "Preamplificador"
-
-#: src/skins/ui_equalizer.cc:286
-msgid "31 Hz"
-msgstr "31 Hz"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "63 Hz"
-msgstr "63 Hz"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "125 Hz"
-msgstr "125 Hz"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "250 Hz"
-msgstr "250 Hz"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "500 Hz"
-msgstr "500 Hz"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "1 kHz"
-msgstr "1 kHz"
-
-#: src/skins/ui_equalizer.cc:288
-msgid "2 kHz"
-msgstr "2 kHz"
-
-#: src/skins/ui_equalizer.cc:288
-msgid "4 kHz"
-msgstr "4 kHz"
-
-#: src/skins/ui_equalizer.cc:288
-msgid "8 kHz"
-msgstr "8 kHz"
-
-#: src/skins/ui_equalizer.cc:288
-msgid "16 kHz"
-msgstr "16 kHz"
-
-#: src/skins/ui_equalizer.cc:330
-msgid "Audacious Equalizer"
-msgstr "Ecualizador de Audacious"
-
-#: src/skins/ui_main.cc:688
-#, 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.cc:709
-#, c-format
-msgid "Volume: %d%%"
-msgstr "Volumen: %d%%"
-
-#: src/skins/ui_main.cc:732
-#, c-format
-msgid "Balance: %d%% left"
-msgstr "Balance: %d%% izquierda"
-
-#: src/skins/ui_main.cc:734
-msgid "Balance: center"
-msgstr "Balance: centrado"
-
-#: src/skins/ui_main.cc:736
-#, c-format
-msgid "Balance: %d%% right"
-msgstr "Balance: %d%% derecha"
-
-#: src/skins/ui_main.cc:842
-msgid "Options Menu"
-msgstr "Menú de opciones"
-
-#: src/skins/ui_main.cc:846
-msgid "Disable 'Always On Top'"
-msgstr "Desactivar 'Siempre encima'"
-
-#: src/skins/ui_main.cc:848
-msgid "Enable 'Always On Top'"
-msgstr "Activar 'Siempre encima'"
-
-#: src/skins/ui_main.cc:851
-msgid "File Info Box"
-msgstr "Caja de información de archivo"
-
-#: src/skins/ui_main.cc:857
-msgid "Visualizations"
-msgstr ""
-
-#: src/skins/ui_main.cc:1336
-msgid "Repeat point A set."
-msgstr ""
-
-#: src/skins/ui_main.cc:1341
-msgid "Repeat point B set."
-msgstr ""
-
-#: src/skins/ui_main.cc:1350
-msgid "Repeat points cleared."
-msgstr ""
-
-#: src/skins/ui_playlist.cc:219
-msgid "Search entries in active playlist"
-msgstr "Buscar entradas en la lista de reproducción activa"
-
-#: src/skins/ui_playlist.cc:226
-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 ""
-"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.cc:234
-msgid "Title:"
+#: src/skins-qt/skins_cfg.cc:294 src/skins/skins_cfg.cc:276
+msgid "Type"
 msgstr ""
 
-#: src/skins/ui_playlist.cc:241
-msgid "Album:"
+#: src/skins-qt/skins_cfg.cc:295 src/skins/skins_cfg.cc:277
+msgid "Visualization type:"
 msgstr ""
 
-#: src/skins/ui_playlist.cc:248
-msgid "Artist:"
+#: src/skins-qt/skins_cfg.cc:298 src/skins/skins_cfg.cc:280
+msgid "Analyzer"
 msgstr ""
 
-#: src/skins/ui_playlist.cc:255
-msgid "File Name:"
+#: src/skins-qt/skins_cfg.cc:299 src/skins/skins_cfg.cc:281
+msgid "Show peaks"
 msgstr ""
 
-#: src/skins/ui_playlist.cc:263
-msgid "Clear previous selection before searching"
-msgstr "Limpiar la selección previa antes de buscar"
-
-#: src/skins/ui_playlist.cc:266
-msgid "Automatically toggle queue for matching entries"
-msgstr "Conmutar automáticamente la cola para las entradas coincidentes"
-
-#: src/skins/ui_playlist.cc:269
-msgid "Create a new playlist with matching entries"
-msgstr "Crear una nueva lista de reproducción con las entradas coincidentes"
-
-#: src/skins/ui_playlist.cc:717
-msgid "Audacious Playlist Editor"
-msgstr "Editor de listas de reproducción de Audacious"
-
-#: src/skins/ui_playlist.cc:752
-#, c-format
-msgid "%s (%d of %d)"
-msgstr "%s (%d de %d)"
+#: src/skins-qt/skins_cfg.cc:308 src/skins/skins_cfg.cc:290
+msgid "Visualization"
+msgstr "Visualización"
 
-#: src/skins/ui_skinselector.cc:167
+#: src/skins-qt/skinselector.cc:98 src/skins/skinselector.cc:111
 msgid "Archived Winamp 2.x skin"
 msgstr "Tema para Winamp 2.x archivado"
 
-#: src/skins/ui_skinselector.cc:172
+#: src/skins-qt/skinselector.cc:102 src/skins/skinselector.cc:115
 msgid "Unarchived Winamp 2.x skin"
 msgstr "Tema para Winamp 2.x no archivado"
 
-#: src/skins/util.cc:430
-#, c-format
-msgid "Could not create directory (%s): %s\n"
-msgstr "No se pudo crear el directorio (%s): %s\n"
-
-#: src/sndfile/plugin.cc:39
+#: src/sndfile/plugin.cc:38
 msgid "Sndfile Plugin"
 msgstr "Plugin Sndfile"
 
-#: src/sndfile/plugin.cc:336
+#: src/sndfile/plugin.cc:372
 msgid ""
 "Based on the xmms_sndfile plugin:\n"
 "Copyright (C) 2000, 2002 Erik de Castro Lopo\n"
@@ -3713,94 +4007,100 @@
 "Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:44
+#: src/sndio/sndio.cc:43
 msgid "Sndio Output"
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:98
+#: src/sndio/sndio.cc:98
 msgid "Device (blank for default):"
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:100
+#: src/sndio/sndio.cc:100
 msgid "Save and restore volume:"
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:181
+#: src/sndio/sndio.cc:181
 #, c-format
 msgid "Sndio error: Unsupported audio format (%d)"
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:192
+#: src/sndio/sndio.cc:192
 msgid "Sndio error: sio_open() failed"
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:222
+#: src/sndio/sndio.cc:221
 msgid "Sndio error: sio_setpar() failed"
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:234
+#: src/sndio/sndio.cc:233
 msgid "Sndio error: sio_start() failed"
 msgstr ""
 
-#: src/song_change/song_change.cc:33
+#: src/songchange/song_change.cc:30
 msgid "Song Change"
 msgstr "Cambio de canción"
 
-#: src/song_change/song_change.cc:342
-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."
-
-#: src/song_change/song_change.cc:358
+#: src/songchange/song_change.cc:256
 msgid "Commands"
 msgstr ""
 
-#: src/song_change/song_change.cc:360
+#: src/songchange/song_change.cc:258
 msgid "Command to run when starting a new song:"
 msgstr ""
 
-#: src/song_change/song_change.cc:364
+#: src/songchange/song_change.cc:261
+msgid "Command to run when stopping a song:"
+msgstr ""
+
+#: src/songchange/song_change.cc:264
 msgid "Command to run at the end of a song:"
 msgstr ""
 
-#: src/song_change/song_change.cc:368
+#: src/songchange/song_change.cc:267
 msgid "Command to run at the end of the playlist:"
 msgstr ""
 
-#: src/song_change/song_change.cc:372
+#: src/songchange/song_change.cc:270
 msgid "Command to run when song title changes (for network streams):"
 msgstr ""
 
-#: src/song_change/song_change.cc:376
+#: src/songchange/song_change.cc:273
 msgid ""
-"You can use the following format strings which will be substituted before "
-"calling the command (not all are useful for the end-of-playlist command):\n"
-"\n"
-"%F: Frequency (in hertz)\n"
+"You can use the following format codes, which will be replaced before "
+"running the command.\n"
+"Not all are useful though for the song-stopped or end-of-playlist command."
+msgstr ""
+
+#: src/songchange/song_change.cc:276
+msgid ""
+"%a: Artist\n"
+"%b: Album\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"
+"%F: Frequency (Hertz)\n"
+"%l: Length (milliseconds)\n"
+"%n or %s: Formatted title (see playlist settings)\n"
 "%p: Currently playing (1 or 0)\n"
-"%a: Artist\n"
-"%b: Album\n"
-"%T: Track title"
+"%r: Rate (bits per second)\n"
+"%t: Playlist position\n"
+"%T: Title (unformatted)"
 msgstr ""
 
-#: src/song-info-qt/song-info.cc:32
-msgid "Song Info (Qt)"
+#: src/songchange/song_change.cc:287
+msgid ""
+"Parameters passed to the shell should be enclosed in quotation marks.\n"
+"Unquoted parameters may lead to unexpected results."
 msgstr ""
 
-#: src/sox-resampler/sox-resampler.cc:44
+#: src/song-info-qt/song-info.cc:30
+msgid "Song Info"
+msgstr "Información de la canción"
+
+#: src/soxr/sox-resampler.cc:44
 msgid "SoX Resampler"
 msgstr ""
 
-#: src/sox-resampler/sox-resampler.cc:144
+#: src/soxr/sox-resampler.cc:172
 msgid ""
 "SoX Resampler Plugin for Audacious\n"
 "Copyright 2013 Michał Lipski\n"
@@ -3809,89 +4109,129 @@
 "Copyright 2010-2012 John Lindgren"
 msgstr ""
 
-#: src/sox-resampler/sox-resampler.cc:150
+#: src/soxr/sox-resampler.cc:178
 msgid "Quick"
 msgstr ""
 
-#: src/sox-resampler/sox-resampler.cc:151
+#: src/soxr/sox-resampler.cc:179
 msgid "Low"
 msgstr ""
 
-#: src/sox-resampler/sox-resampler.cc:153
+#: src/soxr/sox-resampler.cc:181
 msgid "High"
 msgstr ""
 
-#: src/sox-resampler/sox-resampler.cc:154
+#: src/soxr/sox-resampler.cc:182
 msgid "Very High"
 msgstr ""
 
-#: src/sox-resampler/sox-resampler.cc:158
+#: src/soxr/sox-resampler.cc:183
+msgid "Ultra High"
+msgstr ""
+
+#: src/soxr/sox-resampler.cc:187
+msgid "Minimum"
+msgstr ""
+
+#: src/soxr/sox-resampler.cc:188
+msgid "Intermediate"
+msgstr ""
+
+#: src/soxr/sox-resampler.cc:193
 msgid "Quality:"
+msgstr "Calidad:"
+
+#: src/soxr/sox-resampler.cc:196
+msgid "Phase:"
+msgstr ""
+
+#: src/soxr/sox-resampler.cc:200
+msgid "Allow aliasing"
 msgstr ""
 
-#: src/speed-pitch/speed-pitch.cc:51
+#: src/soxr/sox-resampler.cc:202
+msgid "Use steep filter"
+msgstr ""
+
+#: src/speedpitch/speed-pitch.cc:54
 msgid "Speed and Pitch"
 msgstr "Velocidad y amplitud"
 
-#: src/speed-pitch/speed-pitch.cc:210
-msgid "Speed and Pitch"
-msgstr "Velocidad y amplitud"
+#: src/speedpitch/speed-pitch.cc:247
+msgid "Speed"
+msgstr ""
 
-#: src/speed-pitch/speed-pitch.cc:211
-msgid "Speed:"
-msgstr "Velocidad:"
+#: src/speedpitch/speed-pitch.cc:248
+msgid "Decouple from pitch"
+msgstr ""
 
-#: src/speed-pitch/speed-pitch.cc:214
-msgid "Pitch:"
-msgstr "Amplitud:"
+#: src/speedpitch/speed-pitch.cc:250 src/speedpitch/speed-pitch.cc:258
+msgid "Multiplier:"
+msgstr ""
+
+#: src/speedpitch/speed-pitch.cc:254
+msgid "Pitch"
+msgstr ""
 
-#: src/statusicon/statusicon.cc:47
+#: src/statusicon-qt/statusicon.cc:45 src/statusicon/statusicon.cc:47
 msgid "Status Icon"
 msgstr "Icono de estado"
 
-#: src/statusicon/statusicon.cc:283
-msgid "Se_ttings ..."
-msgstr ""
-
-#: src/statusicon/statusicon.cc:372
+#: src/statusicon-qt/statusicon.cc:68
 msgid ""
-"Status Icon Plugin\n"
+"Status Icon Plugin (partial port for Qt interface)\n"
 "\n"
 "Copyright 2005-2007 Giacomo Lozito <james@develia.org>\n"
 "Copyright 2010 Michał Lipski <tallica@o2.pl>\n"
+"Copyright 2015 Eugene Paskevich <eugene@raptor.kiev.ua>\n"
 "\n"
 "This plugin provides a status icon, placed in\n"
 "the system tray area of the window manager."
 msgstr ""
 
-#: src/statusicon/statusicon.cc:379
+#: src/statusicon-qt/statusicon.cc:89 src/statusicon/statusicon.cc:384
 msgid "Mouse Scroll Action"
 msgstr "Acción al desplazar rueda del mouse"
 
-#: src/statusicon/statusicon.cc:380
+#: src/statusicon-qt/statusicon.cc:90 src/statusicon/statusicon.cc:385
 msgid "Change volume"
 msgstr "Cambiar el volumen"
 
-#: src/statusicon/statusicon.cc:383
+#: src/statusicon-qt/statusicon.cc:93 src/statusicon/statusicon.cc:388
 msgid "Change playing song"
 msgstr "Cambiar la canción en reproducción"
 
-#: src/statusicon/statusicon.cc:386
+#: src/statusicon-qt/statusicon.cc:96 src/statusicon/statusicon.cc:391
 msgid "Other Settings"
 msgstr "Otras Opciones"
 
-#: src/statusicon/statusicon.cc:387
+#: src/statusicon-qt/statusicon.cc:97 src/statusicon/statusicon.cc:392
 msgid "Disable the popup window"
 msgstr "Desactivar la ventana emergente"
 
-#: src/statusicon/statusicon.cc:389
+#: src/statusicon-qt/statusicon.cc:99 src/statusicon/statusicon.cc:394
 msgid "Close to the system tray"
 msgstr "Cerrar a la barra tray"
 
-#: src/statusicon/statusicon.cc:391
+#: src/statusicon-qt/statusicon.cc:101 src/statusicon/statusicon.cc:396
 msgid "Advance in playlist when scrolling upward"
 msgstr "Avanzar en la lista de reproducción al desplazar arriba"
 
+#: src/statusicon-qt/statusicon.cc:116 src/statusicon/statusicon.cc:287
+msgid "Se_ttings ..."
+msgstr ""
+
+#: src/statusicon/statusicon.cc:377
+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/stereo_plugin/stereo.cc:19
 msgid "Extra Stereo"
 msgstr "Extra Esteréo"
@@ -3907,20 +4247,160 @@
 msgid "Extra Stereo"
 msgstr "Extra Estéreo"
 
+#: src/streamtuner/icecast-model.cc:126 src/streamtuner/shoutcast-model.cc:131
+msgid "Type"
+msgstr ""
+
+#: src/streamtuner/icecast-model.cc:132
+msgid "Current Song"
+msgstr ""
+
+#: src/streamtuner/icecast-model.cc:164
+msgid "Other"
+msgstr ""
+
+#: src/streamtuner/ihr-model.cc:63
+msgid "Market"
+msgstr ""
+
+#: src/streamtuner/ihr-model.cc:156
+msgid "Call Letters"
+msgstr ""
+
+#: src/streamtuner/ihr-model.cc:162
+msgid "Description"
+msgstr "Descripción"
+
+#: src/streamtuner/shoutcast-model.cc:128
+msgid "Listeners"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:188
+msgid "Top 500 Stations"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:189
+msgid "Alternative"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:190
+msgid "Blues"
+msgstr "Blues"
+
+#: src/streamtuner/shoutcast-model.cc:191
+msgid "Classical"
+msgstr "Clásica"
+
+#: src/streamtuner/shoutcast-model.cc:192
+msgid "Country"
+msgstr "Country"
+
+#: src/streamtuner/shoutcast-model.cc:193
+msgid "Decades"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:194
+msgid "Easy Listening"
+msgstr "Easy Listening"
+
+#: src/streamtuner/shoutcast-model.cc:195
+msgid "Electronic"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:196
+msgid "Folk"
+msgstr "Folclore"
+
+#: src/streamtuner/shoutcast-model.cc:197
+msgid "Inspirational"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:198
+msgid "International"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:199
+msgid "Jazz"
+msgstr "Jazz"
+
+#: src/streamtuner/shoutcast-model.cc:200
+msgid "Latin"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:201
+msgid "Metal"
+msgstr "Metal"
+
+#: src/streamtuner/shoutcast-model.cc:203
+msgid "New Age"
+msgstr "New age"
+
+#: src/streamtuner/shoutcast-model.cc:204
+msgid "Pop"
+msgstr "Pop"
+
+#: src/streamtuner/shoutcast-model.cc:205
+msgid "Public Radio"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:206
+msgid "R&B and Urban"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:207
+msgid "Rap"
+msgstr "Rap"
+
+#: src/streamtuner/shoutcast-model.cc:208
+msgid "Reggae"
+msgstr "Reggae"
+
+#: src/streamtuner/shoutcast-model.cc:209
+msgid "Rock"
+msgstr "Rock"
+
+#: src/streamtuner/shoutcast-model.cc:210
+msgid "Seasonal and Holiday"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:211
+msgid "Soundtracks"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:212
+msgid "Talk"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:213
+msgid "Themes"
+msgstr ""
+
+#: src/streamtuner/streamtuner.cc:59
+msgid "Shoutcast"
+msgstr ""
+
+#: src/streamtuner/streamtuner.cc:60
+msgid "Icecast"
+msgstr ""
+
+#: src/streamtuner/streamtuner.cc:71
+msgid "Stream Tuner"
+msgstr ""
+
 #: src/tonegen/tonegen.cc:45
 msgid "Tone Generator"
 msgstr "Generador de Tono"
 
-#: src/tonegen/tonegen.cc:94
+#: src/tonegen/tonegen.cc:92
 #, c-format
 msgid "%s %.1f Hz"
 msgstr "%s %.1f Hz"
 
-#: src/tonegen/tonegen.cc:94
+#: src/tonegen/tonegen.cc:92
 msgid "Tone Generator: "
 msgstr "Generador de tonos: "
 
-#: src/tonegen/tonegen.cc:160
+#: src/tonegen/tonegen.cc:161
 msgid ""
 "Sine tone generator by Håvard Kvålen <havardk@xmms.org>\n"
 "Modified by Daniel J. Peng <danielpeng@bigfoot.com>\n"
@@ -3929,11 +4409,32 @@
 "e.g. tone://2000;2005 to play a 2000 Hz tone and a 2005 Hz tone"
 msgstr ""
 
+#: src/ui-common/dialogs-qt.cc:40
+msgid ""
+"\n"
+"(Further messages have been hidden.)"
+msgstr ""
+"\n"
+"(Se han ocultado el resto de mensajes.)"
+
+#: src/ui-common/dialogs-qt.cc:52
+msgid "Working ..."
+msgstr "Trabajando .."
+
+#: src/ui-common/dialogs-qt.cc:73
+msgid "Information"
+msgstr "Información"
+
+#: src/ui-common/menu-ops-gtk.cc:132 src/ui-common/menu-ops-qt.cc:113
+#, c-format
+msgid "%s does not appear to be a valid folder."
+msgstr ""
+
 #: src/voice_removal/voice_removal.cc:28
 msgid "Voice Removal"
 msgstr "Quitar voz"
 
-#: src/vorbis/vorbis.cc:465
+#: src/vorbis/vorbis.cc:433
 msgid ""
 "Audacious Ogg Vorbis Decoder\n"
 "\n"
@@ -3958,12 +4459,12 @@
 msgid "Ogg Vorbis Decoder"
 msgstr "Decodificador Ogg Vorbis"
 
-#: src/vtx/info.cc:22
+#: src/vtx/info.cc:24
 #, c-format
 msgid "Details about %s"
 msgstr ""
 
-#: src/vtx/info.cc:24
+#: src/vtx/info.cc:26
 msgid ""
 "Title: %t\n"
 "Author: %a\n"
@@ -3982,44 +4483,107 @@
 msgid "VTX Decoder"
 msgstr "Decodificador VTX"
 
-#: src/vtx/vtx.cc:184
+#: src/vtx/vtx.cc:178
 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/wavpack/wavpack.cc:24
+#: src/vumeter-qt/vumeter_qt.cc:31
+msgid ""
+"VU Meter Plugin for Audacious\n"
+"Copyright 2017-2019 Marc Sánchez Fauste"
+msgstr ""
+
+#: src/vumeter-qt/vumeter_qt.cc:35
+msgid "VU Meter Settings"
+msgstr ""
+
+#: src/vumeter-qt/vumeter_qt.cc:37
+msgid "Peak hold time:"
+msgstr ""
+
+#: src/vumeter-qt/vumeter_qt.cc:42
+msgid "Fall-off time:"
+msgstr ""
+
+#: src/vumeter-qt/vumeter_qt.cc:44
+msgid "dB/second"
+msgstr ""
+
+#: src/vumeter-qt/vumeter_qt.cc:46
+msgid "Display legend"
+msgstr ""
+
+#: src/vumeter-qt/vumeter_qt.h:37
+msgid "VU Meter"
+msgstr ""
+
+#: src/waveout/waveout.cc:43
+msgid "Win32 waveOut"
+msgstr ""
+
+#: src/waveout/waveout.cc:69
+msgid ""
+"Win32 waveOut Plugin for Audacious\n"
+"Copyright 2016 John Lindgren"
+msgstr ""
+
+#: src/wavpack/wavpack.cc:25
 msgid "WavPack Decoder"
 msgstr "Decodificador WavPack"
 
-#: src/wavpack/wavpack.cc:211
+#: src/wavpack/wavpack.cc:217
 msgid "lossy (hybrid)"
-msgstr ""
+msgstr "con pérdida (híbrido)"
 
-#: src/wavpack/wavpack.cc:213
+#: src/wavpack/wavpack.cc:219
 msgid "lossy"
-msgstr ""
+msgstr "con pérdida"
 
-#: src/wavpack/wavpack.cc:255
+#: src/wavpack/wavpack.cc:259
 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"
+"Parte del código del complemento es de Miles Egan."
 
-#: src/xsf/plugin.cc:50
+#: src/xsf/plugin.cc:74
 msgid "2SF Decoder"
 msgstr "Decodificador 2SF"
 
-#: src/xsf/plugin.cc:238
+#: src/xsf/plugin.cc:429
+msgid "32728 Hz"
+msgstr "32728 Hz"
+
+#: src/xsf/plugin.cc:432
+msgid "65456 Hz"
+msgstr "65456 Hz"
+
+#: src/xsf/plugin.cc:438
+msgid "Cosine"
+msgstr "Coseno"
+
+#: src/xsf/plugin.cc:439
+msgid "Sharp"
+msgstr "Agudo"
+
+#: src/xsf/plugin.cc:443
 msgid "XSF Configuration"
-msgstr ""
+msgstr "Configuración XSF"
 
-#: src/xsf/plugin.cc:239
-msgid "Ignore length from file"
-msgstr ""
+#: src/xsf/plugin.cc:445
+msgid "Default fade time:"
+msgstr "Tiempo de fundido predeterminado:"
+
+#: src/xsf/plugin.cc:447
+msgid "Interpolation mode:"
+msgstr "Modo de interpolación:"
 
-#: src/xspf/xspf.cc:89
+#: src/xspf/xspf.cc:95
 msgid "XML Shareable Playlists (XSPF)"
 msgstr "Listas de reproducción compartidas XML (XSPF)"

audacious-plugins-3.6.2-gtk3.tar.bz2/po/es_MX.po -> audacious-plugins-4.4.1.tar.bz2/po/es_MX.po Changed

@@ -4,306 +4,79 @@
 #
 # Translators:
 # Jorge A. García Sosa <kamesennin555@icloud.com>, 2012-2014
-# Jorge A. García Sosa <kamesennin555@icloud.com>, 2014-2015
+# Jorge A. García Sosa <kamesennin555@icloud.com>, 2014-2017,2019-2023
 msgid ""
 msgstr ""
 "Project-Id-Version: Audacious Plugins\n"
-"Report-Msgid-Bugs-To: http://redmine.audacious-media-player.org/\n"
-"POT-Creation-Date: 2015-02-28 19:18+0100\n"
-"PO-Revision-Date: 2015-02-08 19:38+0000\n"
-"Last-Translator: Jorge A. García Sosa <kamesennin555@icloud.com>\n"
-"Language-Team: Spanish (Mexico) (http://www.transifex.com/projects/p/"
+"Report-Msgid-Bugs-To: https://github.com/audacious-media-player/audacious/"
+"issues\n"
+"POT-Creation-Date: 2024-09-26 21:54+0200\n"
+"PO-Revision-Date: 2011-10-10 17:43+0000\n"
+"Last-Translator: Jorge A. García Sosa <kamesennin555@icloud.com>, "
+"2014-2017,2019-2023\n"
+"Language-Team: Spanish (Mexico) (http://app.transifex.com/audacious/"
 "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"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? "
+"1 : 2;\n"
 
-#: src/aac-raw/aac.cc:18
+#: src/aac/aac.cc:19
 msgid "AAC (Raw) Decoder"
 msgstr "Decodificador AAC (RAW)"
 
-#: src/adplug/adplug-xmms.cc:42
+#: src/adplug/adplug-xmms.cc:70
 msgid "AdPlug (AdLib Player)"
 msgstr "AdPlug (Reproductor AdLib)"
 
-#: src/adplug/adplug-xmms.cc:156 src/modplug/modplugbmp.cc:335
-#: src/psf/plugin.cc:138 src/vtx/vtx.cc:87 src/xsf/plugin.cc:113
+#: src/adplug/adplug-xmms.cc:167 src/modplug/modplugbmp.cc:321
+#: src/psf/plugin.cc:161 src/vtx/vtx.cc:89 src/xsf/plugin.cc:204
 msgid "sequenced"
 msgstr "secuencializado"
 
-#: src/alarm/alarm.cc:55 src/alarm/interface.cc:82
-msgid "Alarm"
-msgstr "Alarma"
-
-#: src/alarm/alarm.cc:782
-msgid "Set Alarm ..."
-msgstr "Programar Alarma ..."
-
-#: src/alarm/alarm.cc:810
-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"
-"\n"
-"Orignalmente escrito por Adam Feakin y Daniel Stodden."
-
-#: src/alarm/interface.cc: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.cc: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.cc: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.cc:81
-msgid "This is your wakeup call."
-msgstr "Esta es tu llamada despertador."
-
-#: src/alarm/interface.cc:99
-msgid "Your reminder for today is..."
-msgstr "Tu recordatorio para hoy es..."
-
-#: src/alarm/interface.cc:101 src/alarm/interface.cc:386
-msgid "Reminder"
-msgstr "Recordatorio"
-
-#: src/alarm/interface.cc:132
-msgid "Monday"
-msgstr "Lunes"
-
-#: src/alarm/interface.cc:132
-msgid "Tuesday"
-msgstr "Martes"
-
-#: src/alarm/interface.cc:132
-msgid "Wednesday"
-msgstr "Miércoles"
-
-#: src/alarm/interface.cc:133
-msgid "Thursday"
-msgstr "Jueves"
-
-#: src/alarm/interface.cc:133
-msgid "Friday"
-msgstr "Viernes"
-
-#: src/alarm/interface.cc:133
-msgid "Saturday"
-msgstr "Sábado"
-
-#: src/alarm/interface.cc:133
-msgid "Sunday"
-msgstr "Domingo"
-
-#: src/alarm/interface.cc:171 src/alarm/interface.cc:230
-#: src/alarm/interface.cc:245
-msgid "Time"
-msgstr "Tiempo"
-
-#: src/alarm/interface.cc:178
-msgid "Alarm at (default):"
-msgstr "Alarma a las (predeterminado):"
-
-#: src/alarm/interface.cc:200
-msgid "h"
-msgstr "h"
-
-#: src/alarm/interface.cc:203
-msgid "Quiet after:"
-msgstr "Silenciar después de:"
-
-#: src/alarm/interface.cc:215
-msgid "hours"
-msgstr "horas"
-
-#: src/alarm/interface.cc:226
-msgid "minutes"
-msgstr "minutos"
-
-#: src/alarm/interface.cc:235
-msgid "Choose the days for the alarm to come on"
-msgstr "Escoge los días para que suene la alarma"
+#: src/adplug/adplug-xmms.cc:349 src/sid/xs_config.cc:61
+msgid "Output"
+msgstr "Salida"
 
-#: src/alarm/interface.cc:242
-msgid "Day"
-msgstr "Día"
+#: src/adplug/adplug-xmms.cc:350
+msgid "OPL Emulator:"
+msgstr "Emulador OPL:"
+
+#: src/adplug/adplug-xmms.cc:353 src/amidiplug/i_configure.cc:153
+#: src/console/plugin.cc:45 src/filewriter/filewriter.cc:481
+#: src/sid/xs_config.cc:65 src/xsf/plugin.cc:446
+msgid "Sample rate:"
+msgstr "Tasa de bits:"
 
-#: src/alarm/interface.cc:259 src/bs2b/plugin.cc:130
-#: src/skins/preset-list.cc:434 src/skins/preset-list.cc:440
-msgid "Default"
-msgstr "Predeterminado"
+#: src/adplug/adplug-xmms.cc:354 src/amidiplug/i_configure.cc:155
+#: src/bs2b/plugin.cc:141 src/console/plugin.cc:47
+#: src/modplug/plugin_main.cc:77 src/resample/resample.cc:201
+#: src/resample/resample.cc:207 src/resample/resample.cc:211
+#: src/resample/resample.cc:215 src/resample/resample.cc:219
+#: src/resample/resample.cc:223 src/resample/resample.cc:227
+#: src/resample/resample.cc:231 src/resample/resample.cc:235
+#: src/resample/resample.cc:239 src/resample/resample.cc:243
+#: src/sid/xs_config.cc:67 src/soxr/sox-resampler.cc:205
+msgid "Hz"
+msgstr "Hz"
 
-#: src/alarm/interface.cc:288
-msgid "Days"
-msgstr "Días"
-
-#: src/alarm/interface.cc:297
-msgid "Fading"
-msgstr "Desvanecimiento"
-
-#: src/alarm/interface.cc:305 src/console/plugin.cc:41
-#: src/crossfade/crossfade.cc:53 src/crossfade/crossfade.cc:59
-#: src/gtkui/settings.cc:49 src/lirc/lirc.cc:397 src/sid/xs_config.cc:85
-#: src/sid/xs_config.cc:94 src/sid/xs_config.cc:103
-msgid "seconds"
-msgstr "segundos"
+#: src/adplug/adplug-xmms.cc:355 src/gtkui/settings.cc:55
+#: src/modplug/plugin_main.cc:105 src/qtui/settings.cc:85
+#: src/skins-qt/skins_cfg.cc:302 src/skins/skins_cfg.cc:284
+msgid "Miscellaneous"
+msgstr "Misceláneo"
 
-#: src/alarm/interface.cc:312 src/alarm/interface.cc:353
-msgid "Volume"
-msgstr "Volumen"
-
-#: src/alarm/interface.cc:317
-msgid "Start at"
-msgstr "Comenzar a"
-
-#: src/alarm/interface.cc:333
-msgid "Final"
-msgstr "Finalizar a"
-
-#: src/alarm/interface.cc:346
-msgid "Current"
-msgstr "Actual"
-
-#: src/alarm/interface.cc:359
-msgid "Additional Command"
-msgstr "Comando Adicional"
-
-#: src/alarm/interface.cc:365 src/alarm/interface.cc:391
-msgid "enable"
-msgstr "habilitar"
-
-#: src/alarm/interface.cc:372
-msgid "Playlist (optional)"
-msgstr "Lista de Reproducción (opcional)"
-
-#: src/alarm/interface.cc:379
-msgid "Select a playlist"
-msgstr "Selecciona una lista de reproducción"
-
-#: src/alarm/interface.cc:399
-msgid "Options"
-msgstr "Opciones"
-
-#: src/alarm/interface.cc:404
-msgid "What do these options mean?"
-msgstr "¿Qué significan estás opciones?"
-
-#: src/alarm/interface.cc:420
-msgid "Help"
-msgstr "Ayuda"
+#: src/adplug/adplug-xmms.cc:356
+msgid "Repeat song in endless loop"
+msgstr "Repetir canción en círculo infinito"
 
-#: src/albumart/albumart.cc:31
+#: src/albumart/albumart.cc:31 src/albumart-qt/albumart.cc:35
 msgid "Album Art"
 msgstr "Portada de Álbum"
 
-#: src/albumart-qt/albumart.cc:33
-msgid "Album Art (Qt)"
-msgstr "Arte de Álbum (Qt)"
-
-#: src/alsa/alsa.h:70
+#: src/alsa/alsa.h:64
 msgid "ALSA Output"
 msgstr "Salida ALSA"
 
@@ -345,11 +118,11 @@
 msgid "Mixer element:"
 msgstr "Elemento mezclador:"
 
-#: src/amidi-plug/amidi-plug.cc:41
+#: src/amidiplug/amidi-plug.cc:42
 msgid "AMIDI-Plug (MIDI Player)"
 msgstr "AMIDI-Plug (Reproductor MIDI)"
 
-#: src/amidi-plug/amidi-plug.cc:437
+#: src/amidiplug/amidi-plug.cc:445
 msgid ""
 "AMIDI-Plug\n"
 "modular MIDI music player\n"
@@ -391,157 +164,161 @@
 "Tony Vroon\n"
 "for the good help with alpha testing"
 
-#: src/amidi-plug/i_configure.cc:94
+#: src/amidiplug/i_configure.cc:94
 msgid "Override default gain:"
 msgstr "Anular ganancia predeterminada:"
 
-#: src/amidi-plug/i_configure.cc:102
+#: src/amidiplug/i_configure.cc:102
 msgid "Override default polyphony:"
 msgstr "Anular polifonía predeterminada:"
 
-#: src/amidi-plug/i_configure.cc:110
+#: src/amidiplug/i_configure.cc:110
 msgid "Override default reverb:"
 msgstr "Anular reverberación predeterminada:"
 
-#: src/amidi-plug/i_configure.cc:112 src/amidi-plug/i_configure.cc:120
+#: src/amidiplug/i_configure.cc:112 src/amidiplug/i_configure.cc:120
 msgid "On"
 msgstr "Encender"
 
-#: src/amidi-plug/i_configure.cc:118
+#: src/amidiplug/i_configure.cc:118
 msgid "Override default chorus:"
 msgstr "Anular coro predeterminado:"
 
-#: src/amidi-plug/i_configure.cc:128 src/console/plugin.cc:29
+#: src/amidiplug/i_configure.cc:128 src/console/plugin.cc:29
 msgid "Playback"
 msgstr "Reproducir"
 
-#: src/amidi-plug/i_configure.cc:129
+#: src/amidiplug/i_configure.cc:129
 msgid "Transpose:"
 msgstr "Transportar:"
 
-#: src/amidi-plug/i_configure.cc:131
+#: src/amidiplug/i_configure.cc:131 src/speedpitch/speed-pitch.cc:257
 msgid "semitones"
 msgstr "semitonos"
 
-#: src/amidi-plug/i_configure.cc:132
+#: src/amidiplug/i_configure.cc:132
 msgid "Drum shift:"
 msgstr "Cambio de batería:"
 
-#: src/amidi-plug/i_configure.cc:134
+#: src/amidiplug/i_configure.cc:134
 msgid "note numbers"
 msgstr "números de nota"
 
-#: src/amidi-plug/i_configure.cc:135
+#: src/amidiplug/i_configure.cc:135
 msgid "Skip leading silence"
 msgstr "Saltar silencio inicial"
 
-#: src/amidi-plug/i_configure.cc:137
+#: src/amidiplug/i_configure.cc:137
 msgid "Skip trailing silence"
 msgstr "Saltar silencio final"
 
-#: src/amidi-plug/i_configure.cc:141
+#: src/amidiplug/i_configure.cc:141
 msgid "SoundFont"
 msgstr "SoundFont"
 
-#: src/amidi-plug/i_configure.cc:143
+#: src/amidiplug/i_configure.cc:148
 msgid "Synthesizer"
 msgstr "SIntetizador"
 
-#: src/amidi-plug/i_configure.cc:148 src/console/plugin.cc:45
-#: src/sid/xs_config.cc:65
-msgid "Sample rate:"
-msgstr "Tasa de bits:"
-
-#: src/amidi-plug/i_configure.cc:150 src/bs2b/plugin.cc:141
-#: src/console/plugin.cc:47 src/modplug/plugin_main.cc:78
-#: src/resample/resample.cc:201 src/resample/resample.cc:207
-#: src/resample/resample.cc:211 src/resample/resample.cc:215
-#: src/resample/resample.cc:219 src/resample/resample.cc:223
-#: src/resample/resample.cc:227 src/resample/resample.cc:231
-#: src/resample/resample.cc:235 src/resample/resample.cc:239
-#: src/resample/resample.cc:243 src/sid/xs_config.cc:67
-#: src/sox-resampler/sox-resampler.cc:163
-msgid "Hz"
-msgstr "Hz"
-
-#: src/amidi-plug/i_configure-fluidsynth.cc:52
+#: src/amidiplug/i_configure-fluidsynth.cc:58
+#: src/amidiplug/i_configure-fluidsynth.cc:527
 msgid "AMIDI-Plug - select SoundFont file"
 msgstr "AMIDI-Plug - seleccionar archivo SoundFont"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:55 src/filewriter/mp3.cc:658
+#: src/amidiplug/i_configure-fluidsynth.cc:61
 msgid "_Cancel"
 msgstr "_Cancelar"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:56
+#: src/amidiplug/i_configure-fluidsynth.cc:62
 msgid "_Open"
 msgstr "_Abrir"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:225 src/gtkui/columns.cc:46
+#: src/amidiplug/i_configure-fluidsynth.cc:233
+#: src/amidiplug/i_configure-fluidsynth.cc:461
 msgid "File name"
 msgstr "Nombre del archivo"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:229
+#: src/amidiplug/i_configure-fluidsynth.cc:237
+#: src/amidiplug/i_configure-fluidsynth.cc:464
 msgid "Size (bytes)"
 msgstr "Tamaño (bytes)"
 
-#: src/amidi-plug/i_fileinfo.cc:163
+#: src/amidiplug/i_fileinfo.cc:184
 msgid "Name:"
 msgstr "Nombre:"
 
-#: src/amidi-plug/i_fileinfo.cc:181
+#: src/amidiplug/i_fileinfo.cc:202
 msgid " MIDI Info "
 msgstr " Información MIDI "
 
-#: src/amidi-plug/i_fileinfo.cc:195
+#: src/amidiplug/i_fileinfo.cc:216
 msgid "Format:"
 msgstr "Formato:"
 
-#: src/amidi-plug/i_fileinfo.cc:198
+#: src/amidiplug/i_fileinfo.cc:219
 msgid "Length (msec):"
 msgstr "Duración (ms):"
 
-#: src/amidi-plug/i_fileinfo.cc:201
+#: src/amidiplug/i_fileinfo.cc:222
 msgid "No. of Tracks:"
 msgstr "Núm. de Pistas:"
 
-#: src/amidi-plug/i_fileinfo.cc:207
+#: src/amidiplug/i_fileinfo.cc:228
 msgid "variable"
 msgstr "variable"
 
-#: src/amidi-plug/i_fileinfo.cc:209
+#: src/amidiplug/i_fileinfo.cc:230
 msgid "BPM:"
 msgstr "BPM:"
 
-#: src/amidi-plug/i_fileinfo.cc:217
+#: src/amidiplug/i_fileinfo.cc:238
 msgid "BPM (wavg):"
 msgstr "BPM (wavg):"
 
-#: src/amidi-plug/i_fileinfo.cc:220
+#: src/amidiplug/i_fileinfo.cc:241
 msgid "Time Div:"
 msgstr "Div. tiempo:"
 
-#: src/amidi-plug/i_fileinfo.cc:231
+#: src/amidiplug/i_fileinfo.cc:252
 msgid " MIDI Comments and Lyrics "
 msgstr " Comentarios y Letras de canción MIDI "
 
-#: src/amidi-plug/i_fileinfo.cc:278
+#: src/amidiplug/i_fileinfo.cc:299
 msgid "* no comments available in this MIDI file *"
 msgstr "* no hay comentarios disponibles en este archivo MIDI *"
 
-#: src/amidi-plug/i_fileinfo.cc:290
+#: src/amidiplug/i_fileinfo.cc:311
 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.cc:300 src/filewriter/vorbis.cc:197
-#: src/ladspa/plugin.cc:416
+#: src/amidiplug/i_fileinfo.cc:321 src/ladspa/plugin.cc:418
+#: src/ui-common/dialogs-qt.cc:32
 msgid "_Close"
 msgstr "_Cerrar"
 
-#: src/amidi-plug/i_fileinfo.cc:325
+#: src/amidiplug/i_fileinfo.cc:346
 msgid " (invalid UTF-8)"
 msgstr " (UTF-8 inválido)"
 
-#: src/aosd/aosd.cc:32
+#: src/ampache/ampache.cc:33
+msgid "Ampache Browser"
+msgstr "Navegador Ampache"
+
+#: src/ampache/ampache.cc:46
+msgid ""
+"Ampache Browser for Audacious\n"
+"http://ampache-browser.org/\n"
+"\n"
+"Copyright (C) Róbert Čerňanský and John Lindgren\n"
+"License: GNU GPLv3"
+msgstr ""
+"Ampache Browser para Audacious\n"
+"http://ampache-browser.org/\n"
+"\n"
+"Copyright (C) Róbert Čerňanský y John Lindgren\n"
+"Licencia: GNU GPLv3"
+
+#: src/aosd/aosd.cc:31
 msgid ""
 "Audacious OSD\n"
 "http://www.develia.org/projects.php?p=audacious#aosd\n"
@@ -575,132 +352,132 @@
 msgid "Concave Rectangle"
 msgstr "Rectángulo Cóncavo"
 
-#: src/aosd/aosd_style.cc:69
+#: src/aosd/aosd_style.cc:69 src/openmpt/mptwrap.h:50 src/xsf/plugin.cc:436
 msgid "None"
 msgstr "Ninguno"
 
-#: src/aosd/aosd_trigger.cc:50
+#: src/aosd/aosd_trigger.cc:49
 msgid "Playback Start"
 msgstr "Iniciar Reproducción"
 
-#: src/aosd/aosd_trigger.cc:51
+#: src/aosd/aosd_trigger.cc:50
 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"
 
-#: src/aosd/aosd_trigger.cc:56
+#: src/aosd/aosd_trigger.cc:55
 msgid "Title Change"
 msgstr "Cambio de Título"
 
-#: src/aosd/aosd_trigger.cc:57
+#: src/aosd/aosd_trigger.cc:56
 msgid "Triggers OSD when the song title changes (for internet streams)."
 msgstr "Lanza OSD cuando el título de pista cambia (para streams de internet)."
 
-#: src/aosd/aosd_trigger.cc:62
+#: src/aosd/aosd_trigger.cc:61
 msgid "Pause On"
 msgstr "Pausa Encendida"
 
-#: src/aosd/aosd_trigger.cc:63
+#: src/aosd/aosd_trigger.cc:62
 msgid "Triggers OSD when playback is paused."
 msgstr "Muestra Notificación en Pantalla cuando la reproducción está pausada."
 
-#: src/aosd/aosd_trigger.cc:68
+#: src/aosd/aosd_trigger.cc:67
 msgid "Pause Off"
 msgstr "Pausa Apagada"
 
-#: src/aosd/aosd_trigger.cc:69
+#: src/aosd/aosd_trigger.cc:68
 msgid "Triggers OSD when playback is unpaused."
 msgstr "Muestra Notificación en Pantalla cuando la pausa termina."
 
-#: src/aosd/aosd_ui.cc:163
+#: src/aosd/aosd_ui.cc:204
 msgid "Placement"
 msgstr "Colocación"
 
-#: src/aosd/aosd_ui.cc:196
+#: src/aosd/aosd_ui.cc:241
 msgid "Relative X offset:"
 msgstr "Compensación relativa en X:"
 
-#: src/aosd/aosd_ui.cc:203
+#: src/aosd/aosd_ui.cc:245
 msgid "Relative Y offset:"
 msgstr "Compensación relativa en Y:"
 
-#: src/aosd/aosd_ui.cc:210
+#: src/aosd/aosd_ui.cc:249
 msgid "Max OSD width:"
 msgstr "Ancho máximo de OSD:"
 
-#: src/aosd/aosd_ui.cc:221
+#: src/aosd/aosd_ui.cc:281
 msgid "Multi-Monitor options"
 msgstr "Opciones de varios monitores"
 
-#: src/aosd/aosd_ui.cc:225
+#: src/aosd/aosd_ui.cc:285
 msgid "Display OSD using:"
 msgstr "Mostrar OSD utilizando:"
 
-#: src/aosd/aosd_ui.cc:227
+#: src/aosd/aosd_ui.cc:287
 msgid "all monitors"
 msgstr "Todos los monitores"
 
-#: src/aosd/aosd_ui.cc:230
+#: src/aosd/aosd_ui.cc:290
 #, c-format
 msgid "monitor %i"
 msgstr "monitor %i"
 
-#: src/aosd/aosd_ui.cc:282
+#: src/aosd/aosd_ui.cc:342
 msgid "Timing (ms)"
 msgstr "Tiempo (ms)"
 
-#: src/aosd/aosd_ui.cc:287
+#: src/aosd/aosd_ui.cc:347
 msgid "Display:"
 msgstr "Mostrar:"
 
-#: src/aosd/aosd_ui.cc:292
+#: src/aosd/aosd_ui.cc:352
 msgid "Fade in:"
 msgstr "Desvanecimiento al aparecer:"
 
-#: src/aosd/aosd_ui.cc:297
+#: src/aosd/aosd_ui.cc:357
 msgid "Fade out:"
 msgstr "Desvanecimiento al desaparecer:"
 
-#: src/aosd/aosd_ui.cc:361
+#: src/aosd/aosd_ui.cc:442
 msgid "Fonts"
 msgstr "Fuentes"
 
-#: src/aosd/aosd_ui.cc:368
+#: src/aosd/aosd_ui.cc:449
 #, c-format
 msgid "Font %i:"
 msgstr "Fuente %i:"
 
-#: src/aosd/aosd_ui.cc:382
+#: src/aosd/aosd_ui.cc:466
 msgid "Shadow"
 msgstr "Sombra"
 
-#: src/aosd/aosd_ui.cc:486
+#: src/aosd/aosd_ui.cc:589
 msgid "Render Style"
 msgstr "Estilo de Renderización"
 
-#: src/aosd/aosd_ui.cc:502
+#: src/aosd/aosd_ui.cc:605
 msgid "Colors"
 msgstr "Colores"
 
-#: src/aosd/aosd_ui.cc:513
+#: src/aosd/aosd_ui.cc:616
 #, c-format
 msgid "Color %i:"
 msgstr "Color %i:"
 
-#: src/aosd/aosd_ui.cc:600
+#: src/aosd/aosd_ui.cc:714
 msgid "Enable trigger"
 msgstr "Activar Aviso"
 
-#: src/aosd/aosd_ui.cc:627
+#: src/aosd/aosd_ui.cc:741
 msgid "Event"
 msgstr "Evento"
 
-#: src/aosd/aosd_ui.cc:655
+#: src/aosd/aosd_ui.cc:768
 msgid "Composite manager detected"
 msgstr "Administrador de composición detectado"
 
-#: src/aosd/aosd_ui.cc:662
+#: src/aosd/aosd_ui.cc:775
 msgid ""
 "Composite manager not detected;\n"
 "unless you know that you have one running, please activate a composite "
@@ -711,60 +488,56 @@
 "administrador de composición, de otra forma las Notificaciones en Pantalla "
 "no funcionarán apropiadamente"
 
-#: src/aosd/aosd_ui.cc:670
+#: src/aosd/aosd_ui.cc:783
 msgid "Composite manager not required for fake transparency"
 msgstr "Administrador de composición no requerido para transparencia falsa"
 
-#: src/aosd/aosd_ui.cc:706
+#: src/aosd/aosd_ui.cc:820
 msgid "Transparency"
 msgstr "Transparencia"
 
-#: src/aosd/aosd_ui.cc:712
+#: src/aosd/aosd_ui.cc:826
 msgid "Fake transparency"
 msgstr "Transparencia falsa"
 
-#: src/aosd/aosd_ui.cc:714
+#: src/aosd/aosd_ui.cc:828
 msgid "Real transparency (requires X Composite Ext.)"
 msgstr "Transparencia real (requiere X Composite Ext.)"
 
-#: src/aosd/aosd_ui.cc:756
+#: src/aosd/aosd_ui.cc:875
 msgid "Composite extension not loaded"
 msgstr "Extensión de composición no cargada"
 
-#: src/aosd/aosd_ui.cc:764
-msgid "Composite extension not available"
-msgstr "Extensión de composición no disponible"
-
-#: src/aosd/aosd_ui.cc:781
+#: src/aosd/aosd_ui.cc:892
 #, c-format
 msgid "Audacious OSD"
 msgstr "Audacious OSD"
 
-#: src/aosd/aosd_ui.cc:844
+#: src/aosd/aosd_ui.cc:955
 msgid "Position"
 msgstr "Posición"
 
-#: src/aosd/aosd_ui.cc:849
+#: src/aosd/aosd_ui.cc:960
 msgid "Animation"
 msgstr "Animación"
 
-#: src/aosd/aosd_ui.cc:854
+#: src/aosd/aosd_ui.cc:965
 msgid "Text"
 msgstr "Texto"
 
-#: src/aosd/aosd_ui.cc:859
+#: src/aosd/aosd_ui.cc:970
 msgid "Decoration"
 msgstr "Decoración"
 
-#: src/aosd/aosd_ui.cc:864
+#: src/aosd/aosd_ui.cc:975
 msgid "Trigger"
 msgstr "Avisos"
 
-#: src/aosd/aosd_ui.cc:869
+#: src/aosd/aosd_ui.cc:980 src/streamtuner/shoutcast-model.cc:202
 msgid "Misc"
 msgstr "Misc."
 
-#: src/aosd/aosd_ui.cc:878
+#: src/aosd/aosd_ui.cc:989
 msgid "Test"
 msgstr "Probar"
 
@@ -780,11 +553,83 @@
 msgid "Audacious Playlists (audpl)"
 msgstr "Lista de reproducción Audacious (audpl)"
 
-#: src/blur_scope/blur_scope.cc:42
+#: src/background_music/background_music.cc:24
+msgid "Background music"
+msgstr ""
+
+#: src/background_music/background_music.cc:25
+msgid "Target level:"
+msgstr ""
+
+#: src/background_music/background_music.cc:28
+#: src/background_music/background_music.cc:33
+#: src/silence-removal/silence-removal.cc:70
+msgid "dB"
+msgstr "dB"
+
+#: src/background_music/background_music.cc:29
+msgid "Maximum amplification:"
+msgstr ""
+
+#: src/background_music/background_music.cc:34 src/mpg123/mpg123.cc:81
+msgid "Advanced"
+msgstr "Avanzado"
+
+#: src/background_music/background_music.cc:36
+msgid "Slow detection weight:"
+msgstr ""
+
+#: src/background_music/background_music.cc:39
+msgid "Hint"
+msgstr ""
+
+#: src/background_music/background_music.cc:41
+msgid ""
+"Slow detection weight is the relative weight\n"
+"of a long term average detection when compared\n"
+"to the actual, faster loudness detection.\n"
+"A value of zero gives a more radio-like sound\n"
+"where soft passages get \"pulled up\" more quickly,\n"
+"a value of two makes the sound feel less compressed."
+msgstr ""
+
+#: src/background_music/background_music.cc:52
+msgid ""
+"Background Music Plugin for Audacious\n"
+"Copyright 2023;2024 Michel Fleur\n"
+"\n"
+"Controls the volume to make the sound equally loud within and between "
+"tracks.\n"
+" It uses accurate loudness measurement and tries to make the volume changes "
+"sound natural without audible peaks, yet without lowering the volume before "
+"a peak in advance."
+msgstr ""
+
+#: src/background_music/background_music.cc:61
+msgid "Background Music"
+msgstr ""
+
+#: src/bitcrusher/bitcrusher.cc:33
+msgid "Bitcrusher"
+msgstr "Bitcrusher"
+
+#: src/bitcrusher/bitcrusher.cc:34
+msgid "Bit Depth:"
+msgstr "Profundidad de Bit:"
+
+#: src/bitcrusher/bitcrusher.cc:37
+msgid "Downsample ratio:"
+msgstr "Tasa de reducción de la muestra:"
+
+#: src/bitcrusher/bitcrusher.cc:48
+msgid "Bitcrusher"
+msgstr "Bitcrusher"
+
+#: src/blur_scope/blur_scope.cc:40 src/blur_scope-qt/blur_scope.cc:45
 msgid "Color"
 msgstr "Color"
 
-#: src/blur_scope/blur_scope.cc:58
+#: src/blur_scope/blur_scope.cc:56 src/blur_scope-qt/blur_scope.cc:158
 msgid "Blur Scope"
 msgstr "Blur Scope"
 
@@ -796,6 +641,10 @@
 msgid "Presets:"
 msgstr "Predefinidos:"
 
+#: src/bs2b/plugin.cc:130
+msgid "Default"
+msgstr "Predeterminado"
+
 #: src/bs2b/plugin.cc:136
 msgid "Feed level:"
 msgstr "Nivel de alimentación:"
@@ -808,15 +657,15 @@
 msgid "Cut frequency:"
 msgstr "Frecuencia de corte:"
 
-#: src/cairo-spectrum/cairo-spectrum.cc:41
+#: src/cairo-spectrum/cairo-spectrum.cc:42 src/qt-spectrum/qt-spectrum.cc:107
 msgid "Spectrum Analyzer"
 msgstr "Analizador de Espectro"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:72
+#: src/cdaudio/cdaudio-ng.cc:74
 msgid "Audio CD Plugin"
 msgstr "Plugin CD de Audio "
 
-#: src/cdaudio-ng/cdaudio-ng.cc:121
+#: src/cdaudio/cdaudio-ng.cc:121
 msgid ""
 "Copyright (C) 2007-2012 Calin Crisan <ccrisan@gmail.com> and others.\n"
 "\n"
@@ -837,132 +686,132 @@
 "\n"
 "Este fue un proyecto del Google Summer of Code 2007"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:137
+#: src/cdaudio/cdaudio-ng.cc:140
 msgid "Device"
 msgstr "Dispositivo"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:138
+#: src/cdaudio/cdaudio-ng.cc:141
 msgid "Read speed:"
 msgstr "Velocidad de lectura:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:141
+#: src/cdaudio/cdaudio-ng.cc:144
 msgid "Override device:"
 msgstr "Reemplazar dispositivo:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:143
+#: src/cdaudio/cdaudio-ng.cc:146
 msgid "Metadata"
 msgstr "Metadatos"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:144
+#: src/cdaudio/cdaudio-ng.cc:147
 msgid "Use CD-Text"
 msgstr "Usar CD-Text"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:146
+#: src/cdaudio/cdaudio-ng.cc:150
 msgid "Use CDDB"
 msgstr "Usar CDDB"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:148
+#: src/cdaudio/cdaudio-ng.cc:152
 msgid "Use HTTP instead of CDDBP"
 msgstr "Utilizar HTTP en vez de CDDBP"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:151
+#: src/cdaudio/cdaudio-ng.cc:155
 msgid "Server:"
 msgstr "Servidor:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:155
+#: src/cdaudio/cdaudio-ng.cc:159
 msgid "Path:"
 msgstr "Ruta de Acceso:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:159
+#: src/cdaudio/cdaudio-ng.cc:163
 msgid "Port:"
 msgstr "Puerto:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:246
+#: src/cdaudio/cdaudio-ng.cc:228
 msgid "Failed to initialize cdio subsystem."
 msgstr "Falla al iniciar el susbsistema cdio."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:281
+#: src/cdaudio/cdaudio-ng.cc:260
 #, c-format
 msgid "Invalid URI %s."
 msgstr "URI %s no válido."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:283
+#: src/cdaudio/cdaudio-ng.cc:262
 #, c-format
 msgid "Track %d not found."
 msgstr "Pista %d no encontrada."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:285
+#: src/cdaudio/cdaudio-ng.cc:264
 #, c-format
 msgid "Track %d is a data track."
 msgstr "Pista %d es una pista de datos."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:360
+#: src/cdaudio/cdaudio-ng.cc:339
 msgid "Error reading audio CD."
 msgstr "Error al leer CD de audio."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:429
+#: src/cdaudio/cdaudio-ng.cc:410
 msgid "Audio CD"
 msgstr "CD de Audio"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:460 src/cdaudio-ng/cdaudio-ng.cc:469
+#: src/cdaudio/cdaudio-ng.cc:446 src/cdaudio/cdaudio-ng.cc:455
 #, c-format
 msgid "Failed to open CD device %s."
 msgstr "Fallo al abrir el dispositivo de CD %s."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:472
+#: src/cdaudio/cdaudio-ng.cc:458
 msgid "No audio capable CD drive found."
 msgstr "No se encontró drive de CD capaz de reproducir audio."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:497
+#: src/cdaudio/cdaudio-ng.cc:481
+msgid "Drive is empty."
+msgstr "La unidad de disco está vacía."
+
+#: src/cdaudio/cdaudio-ng.cc:483
+msgid "Unsupported disk type."
+msgstr "Tipo de disco no soportado."
+
+#: src/cdaudio/cdaudio-ng.cc:507
 msgid "Failed to finish initializing opened CD drive."
 msgstr "Fallo al terminar de preparar drive de CD abierto."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:510
+#: src/cdaudio/cdaudio-ng.cc:520
 msgid "Failed to retrieve first/last track number."
 msgstr "Fallo al recuperar el primer/último número de pista."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:531
+#: src/cdaudio/cdaudio-ng.cc:541
 #, 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.cc:613
-msgid "Failed to create the cddb connection."
-msgstr "Fallo al crear la conexión cddb."
+#: src/cdaudio/cdaudio-ng.cc:624
+msgid "Failed to create the CDDB connection."
+msgstr "Fallo al crear la conexión CDDB"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:679
+#: src/cdaudio/cdaudio-ng.cc:690
 msgid "Failed to query the CDDB server"
 msgstr "Fallo al consultar el servidor CDDB."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:681
+#: src/cdaudio/cdaudio-ng.cc:692
 #, c-format
 msgid "Failed to query the CDDB server: %s"
 msgstr "Fallo al consultar el servidor CDDB: %s."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:705
+#: src/cdaudio/cdaudio-ng.cc:716
 #, c-format
-msgid "Failed to read the cddb info: %s"
-msgstr "Fallo al leer la nformación cddb: %s"
-
-#: src/cdaudio-ng/cdaudio-ng.cc:765
-msgid "Drive is empty."
-msgstr "La unidad de disco está vacía."
+msgid "Failed to read the CDDB info: %s"
+msgstr "Fallo para leer la info CDDB: %s"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:767
-msgid "Unsupported disk type."
-msgstr "Tipo de disco no soportado."
-
-#: src/cd-menu-items/cd-menu-items.cc:35
+#: src/cd-menu-items/cd-menu-items.cc:33
 msgid "Audio CD Menu Items"
 msgstr "Entradas del Menú del CD de Audio"
 
-#: src/cd-menu-items/cd-menu-items.cc:47
-msgid "Play CD"
-msgstr "Reproducir CD"
-
-#: src/cd-menu-items/cd-menu-items.cc:47
-msgid "Add CD"
-msgstr "Agregar CD"
+#: src/cd-menu-items/cd-menu-items.cc:45
+msgid "Pla_y CD"
+msgstr "R_eproducir CD"
+
+#: src/cd-menu-items/cd-menu-items.cc:45
+msgid "_Add CD"
+msgstr "_Agregar CD"
 
 #: src/compressor/compressor.cc:45
 msgid "Compression"
@@ -1020,7 +869,14 @@
 msgid "Default song length:"
 msgstr "Duración de pista predeterminada:"
 
-#: src/console/plugin.cc:42 src/modplug/plugin_main.cc:59
+#: src/console/plugin.cc:41 src/crossfade/crossfade.cc:56
+#: src/crossfade/crossfade.cc:62 src/lirc/lirc.cc:395 src/notify/notify.cc:113
+#: src/sid/xs_config.cc:85 src/sid/xs_config.cc:94 src/sid/xs_config.cc:103
+#: src/vumeter-qt/vumeter_qt.cc:39
+msgid "seconds"
+msgstr "segundos"
+
+#: src/console/plugin.cc:42 src/modplug/plugin_main.cc:58
 msgid "Resampling"
 msgstr "Resampling"
 
@@ -1044,29 +900,39 @@
 msgid "Game Console Music Decoder"
 msgstr "Decodificador de Música de Consolas de Juego"
 
-#: src/coreaudio/coreaudio.cc:50
+#: src/coreaudio/coreaudio.cc:53
 msgid "CoreAudio output"
 msgstr "Salida CoreAudio"
 
-#: src/coreaudio/coreaudio.cc:131
+#: src/coreaudio/coreaudio.cc:155
 msgid ""
 "CoreAudio Output Plugin for Audacious\n"
 "Copyright 2014 William Pitcock\n"
+"Copyright 2017,18 René J.V. Bertin\n"
+" (original code and code adapted from\n"
+" Apple examples, (C) Apple 2013)\n"
 "\n"
 "Based on SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
 msgstr ""
-"Plugin CoreAudio Output para Audacious\n"
+"Plugin de salida CoreAudio para Audacious\n"
 "Copyright 2014 William Pitcock\n"
+"Copyright 2017,18 René J.V. Bertin\n"
+"(código original y código adaptado de\n"
+"ejemplos Apple, (C) Apple 2013)\n"
 "\n"
-"Basado en el Plugin de Salida SDL para Audacious\n"
+"Basado en el plugin de salida SDL para Audacious\n"
 "Copyright 2010 John Lindgren"
 
-#: src/coreaudio/coreaudio.cc:143
+#: src/coreaudio/coreaudio.cc:171
 msgid "Use exclusive mode"
 msgstr "Usar modo exclusivo"
 
-#: src/crossfade/crossfade.cc:44
+#: src/coreaudio/coreaudio.cc:173
+msgid "Use bit perfect audio (adapt device sampling rate)"
+msgstr "Usar audio de bit perfecto (adapta la tasa de muestra del dispositivo)"
+
+#: src/crossfade/crossfade.cc:47
 msgid ""
 "Crossfade Plugin for Audacious\n"
 "Copyright 2010-2014 John Lindgren"
@@ -1074,27 +940,43 @@
 "Plugin Crossfade para Audacious\n"
 "Copyright 2010-2014 John Lindgren"
 
-#: src/crossfade/crossfade.cc:48
+#: src/crossfade/crossfade.cc:51
 msgid "Crossfade"
 msgstr "Fundido"
 
-#: src/crossfade/crossfade.cc:49
+#: src/crossfade/crossfade.cc:52
 msgid "On automatic song change"
 msgstr "Al cambio automático de pista"
 
-#: src/crossfade/crossfade.cc:51 src/crossfade/crossfade.cc:57
+#: src/crossfade/crossfade.cc:54 src/crossfade/crossfade.cc:60
 msgid "Overlap:"
 msgstr "Encimar:"
 
-#: src/crossfade/crossfade.cc:55
+#: src/crossfade/crossfade.cc:58
 msgid "On seek or manual song change"
 msgstr "Al buscar o cambio manual de pista"
 
-#: src/crossfade/crossfade.cc:61
+#: src/crossfade/crossfade.cc:64
+msgid "No fade in"
+msgstr ""
+
+#: src/crossfade/crossfade.cc:66
+msgid "Use S-curve fade"
+msgstr ""
+
+#: src/crossfade/crossfade.cc:68
+msgid "S-curve steepness:"
+msgstr ""
+
+#: src/crossfade/crossfade.cc:70
+msgid "(higher is steeper)"
+msgstr ""
+
+#: src/crossfade/crossfade.cc:72
 msgid "Tip"
 msgstr "Tip"
 
-#: src/crossfade/crossfade.cc:62
+#: src/crossfade/crossfade.cc:73
 msgid ""
 "For better crossfading, enable\n"
 "the Silence Removal effect."
@@ -1102,29 +984,10 @@
 "Para mejor desvanecimiento, habilita\n"
 "el efecto Remover Silencio."
 
-#: src/crossfade/crossfade.cc:72
+#: src/crossfade/crossfade.cc:83
 msgid "Crossfade"
 msgstr "Fundir"
 
-#: src/crossfade/crossfade.cc:161
-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."
-
-#: src/crossfade/crossfade.cc:168
-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."
-
 #: src/crystalizer/crystalizer.cc:31
 msgid "Crystalizer"
 msgstr "Cristalizador"
@@ -1137,60 +1000,61 @@
 msgid "Crystalizer"
 msgstr "Cristalizador"
 
-#: src/cue/cue.cc:37
+#: src/cue/cue.cc:42
 msgid "Cue Sheet Plugin"
 msgstr "Plugin Cue Sheet"
 
-#: src/delete-files/delete-files.cc:46 src/delete-files/delete-files.cc:146
+#: src/delete-files/delete-files.cc:53 src/delete-files/delete-files.cc:215
+#: src/delete-files/delete-files.cc:230
 msgid "Delete Files"
 msgstr "Borrar Archivos"
 
-#: src/delete-files/delete-files.cc:75
+#: src/delete-files/delete-files.cc:120
+msgid "No files are selected."
+msgstr "Ningún archivo es seleccionado."
+
+#: src/delete-files/delete-files.cc:125
 #, c-format
-msgid "Error moving %s to trash: %s."
-msgstr "Error al mover %s a la bandeja: %s."
+msgid "Do you want to move %s to the trash?"
+msgstr "¿Quieres mover %s a la bandeja?"
 
-#: src/delete-files/delete-files.cc:86
+#: src/delete-files/delete-files.cc:126
 #, c-format
-msgid "Error deleting %s: %s."
-msgstr "Error al borrar %s: %s."
+msgid "Do you want to permanently delete %s?"
+msgstr "¿Quieres borrar permanentemente %s?"
 
-#: src/delete-files/delete-files.cc:117
+#: src/delete-files/delete-files.cc:133
 #, c-format
-msgid "Error deleting %s: not a local file."
-msgstr "Error mientras borraba %s: no es un archivo local."
+msgid "Do you want to move %d files to the trash?"
+msgstr "¿Quieres mover %d archivos a la bandeja?"
 
 #: src/delete-files/delete-files.cc:134
-msgid "Do you want to move the selected files to the trash?"
-msgstr "¿Quieres mover los archivos seleccionados a la bandeja?"
+#, c-format
+msgid "Do you want to permanently delete %d files?"
+msgstr "¿Quieres borrar permanentemente %d archivos?"
 
-#: src/delete-files/delete-files.cc:135
-msgid "Move to Trash"
+#: src/delete-files/delete-files.cc:146
+msgid "Move to trash"
 msgstr "Mover a la bandeja"
 
-#: src/delete-files/delete-files.cc:140
-msgid "Do you want to permanently delete the selected files?"
-msgstr "¿Quieres borrar permanentemente los archivos seleccionados?"
-
-#: src/delete-files/delete-files.cc:141 src/skins/preset-list.cc:411
-#: src/skins/preset-list.cc:427
+#: src/delete-files/delete-files.cc:146
 msgid "Delete"
 msgstr "Borrar"
 
-#: src/delete-files/delete-files.cc:145 src/skins/preset-browser.cc:56
-#: src/skins/preset-list.cc:307 src/skins/ui_playlist.cc:221
+#: src/delete-files/delete-files.cc:213 src/delete-files/delete-files.cc:235
+#: src/skins-qt/search-select.cc:102 src/skins/search-select.cc:78
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: src/delete-files/delete-files.cc:166
+#: src/delete-files/delete-files.cc:267
 msgid "Delete Selected Files"
 msgstr "Borrar Archivos Seleccionados"
 
-#: src/delete-files/delete-files.cc:181
+#: src/delete-files/delete-files.cc:287
 msgid "Delete Method"
 msgstr "Borrar Método"
 
-#: src/delete-files/delete-files.cc:182
+#: src/delete-files/delete-files.cc:288
 msgid "Move to trash instead of deleting immediately"
 msgstr "Mover a la bandeja en vez de borrar inmediatamente"
 
@@ -1210,13 +1074,13 @@
 msgid "Echo"
 msgstr "Eco"
 
-#: src/echo_plugin/echo.cc:22 src/modplug/plugin_main.cc:73
-#: src/modplug/plugin_main.cc:83
+#: src/echo_plugin/echo.cc:22 src/modplug/plugin_main.cc:72
+#: src/modplug/plugin_main.cc:82
 msgid "Delay:"
 msgstr "Retraso:"
 
-#: src/echo_plugin/echo.cc:24 src/modplug/plugin_main.cc:73
-#: src/modplug/plugin_main.cc:83
+#: src/echo_plugin/echo.cc:24 src/modplug/plugin_main.cc:72
+#: src/modplug/plugin_main.cc:82 src/xsf/plugin.cc:445
 msgid "ms"
 msgstr "ms"
 
@@ -1224,7 +1088,7 @@
 msgid "Feedback:"
 msgstr "Retroalimentación:"
 
-#: src/echo_plugin/echo.cc:28 src/modplug/plugin_main.cc:87
+#: src/echo_plugin/echo.cc:28 src/modplug/plugin_main.cc:86
 msgid "Volume:"
 msgstr "Volumen:"
 
@@ -1232,11 +1096,11 @@
 msgid "Echo"
 msgstr "Eco"
 
-#: src/ffaudio/ffaudio-core.cc:41
+#: src/ffaudio/ffaudio-core.cc:50
 msgid "FFmpeg Plugin"
 msgstr "Plugin FFmpeg"
 
-#: src/ffaudio/ffaudio-core.cc:571
+#: src/ffaudio/ffaudio-core.cc:649
 msgid ""
 "Multi-format audio decoding plugin for Audacious using\n"
 "FFmpeg multimedia framework (http://www.ffmpeg.org/)\n"
@@ -1252,249 +1116,321 @@
 "William Pitcock <nenolod@nenolod.net>\n"
 "Matti Hämäläinen <ccr@tnsp.org>"
 
-#: src/filewriter/filewriter.cc:45
+#: src/filewriter/filewriter.cc:48
 msgid "FileWriter Plugin"
 msgstr "Plugin FileWriter"
 
-#: src/filewriter/filewriter.cc:386
+#: src/filewriter/filewriter.cc:316
+#, c-format
+msgid ""
+"Error opening %s:\n"
+"%s"
+msgstr ""
+"Error al abrir %s:\n"
+"%s"
+
+#: src/filewriter/filewriter.cc:358
+msgid ""
+"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 ""
+"Este programa es software libre; puedes redistribuirlo y/o modificarlo bajo "
+"los términaos de la GNU General Public License como es publicada por la Free "
+"Software Foundation; ya sea la versión 2 de la Licencia, o (a tu elección) "
+"cualquier versión posterior.\n"
+"\n"
+"Este programa es distribuido con la esperanza que será útil, pero SIN "
+"GARANTÍA ALGUNA; sin la garantía implícita de MERCANTILIZACIÓN o PROPIA PARA "
+"UN PROPÓSITO EN PARTICULAR. Ve la GNU General Public License para más "
+"detalles.\n"
+"\n"
+"Deberías de recibir una copia de la GNU General Public License junto con "
+"este programa; si no, escribe a la Free Software Foundation, Inc., 51 "
+"Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
+
+#: src/filewriter/filewriter.cc:385
 msgid "Output file format:"
 msgstr "Formato del archivo de salida:"
 
-#: src/filewriter/filewriter.cc:403
-msgid "Configure"
-msgstr "Configurar"
-
-#: src/filewriter/filewriter.cc:413
+#: src/filewriter/filewriter.cc:389
 msgid "Save into original directory"
 msgstr "Guardar en el directorio original"
 
-#: src/filewriter/filewriter.cc:417
-msgid "Save into custom directory"
-msgstr "Guardar en un directorio personalizado"
-
-#: src/filewriter/filewriter.cc:427
-msgid "Output file folder:"
-msgstr "Carpeta del archivo de salida:"
-
-#: src/filewriter/filewriter.cc:431
-msgid "Pick a folder"
-msgstr "Escoge una carpeta"
+#: src/filewriter/filewriter.cc:392
+msgid "Save into custom directory:"
+msgstr "Guardar en directorio personalizado:"
 
-#: src/filewriter/filewriter.cc:444
+#: src/filewriter/filewriter.cc:400
 msgid "Generate file name from:"
 msgstr "Generar nombre de archivo de:"
 
-#: src/filewriter/filewriter.cc:448
-msgid "Original file tag"
-msgstr "Etiqueta original del archivo"
-
-#: src/filewriter/filewriter.cc:453
+#: src/filewriter/filewriter.cc:401
 msgid "Original file name"
 msgstr "Nombre de archivo original"
 
-#: src/filewriter/filewriter.cc:459
-msgid "Include original file name extension"
-msgstr "Incluir extensión original del archivo"
+#: src/filewriter/filewriter.cc:404
+msgid "Original file name (no suffix)"
+msgstr "Nombre original de archivo (sin sufijo)"
 
-#: src/filewriter/filewriter.cc:468
+#: src/filewriter/filewriter.cc:407
+msgid "Original file tag"
+msgstr "Etiqueta original del archivo"
+
+#: src/filewriter/filewriter.cc:411
 msgid "Prepend track number to file name"
 msgstr "Agregar número de pista al nombre de archivo"
 
-#: src/filewriter/filewriter.cc:484
-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 ""
-"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/mp3.cc:40 src/filewriter/mp3.cc:717
+#: src/filewriter/filewriter.cc:417 src/filewriter/filewriter.cc:449
 msgid "Auto"
 msgstr "Auto"
 
-#: src/filewriter/mp3.cc:40
+#: src/filewriter/filewriter.cc:418
+msgid "8000 Hz"
+msgstr "8000 Hz"
+
+#: src/filewriter/filewriter.cc:419
+msgid "11025 Hz"
+msgstr "11025 Hz"
+
+#: src/filewriter/filewriter.cc:420
+msgid "12000 Hz"
+msgstr "12000 Hz"
+
+#: src/filewriter/filewriter.cc:421
+msgid "16000 Hz"
+msgstr "16000 Hz"
+
+#: src/filewriter/filewriter.cc:422
+msgid "22050 Hz"
+msgstr "22050 Hz"
+
+#: src/filewriter/filewriter.cc:423
+msgid "24000 Hz"
+msgstr "24000 Hz"
+
+#: src/filewriter/filewriter.cc:424
+msgid "32000 Hz"
+msgstr "32000 Hz"
+
+#: src/filewriter/filewriter.cc:425 src/xsf/plugin.cc:430
+msgid "44100 Hz"
+msgstr "44100 Hz"
+
+#: src/filewriter/filewriter.cc:426 src/xsf/plugin.cc:431
+msgid "48000 Hz"
+msgstr "48000 Hz"
+
+#: src/filewriter/filewriter.cc:430
+msgid "8 kbit/s"
+msgstr "8 kbit/s"
+
+#: src/filewriter/filewriter.cc:431
+msgid "16 kbit/s"
+msgstr "16 kbit/s"
+
+#: src/filewriter/filewriter.cc:432
+msgid "32 kbit/s"
+msgstr "32 kbit/s"
+
+#: src/filewriter/filewriter.cc:433
+msgid "40 kbit/s"
+msgstr "40 kbit/s"
+
+#: src/filewriter/filewriter.cc:434
+msgid "48 kbit/s"
+msgstr "48 kbit/s"
+
+#: src/filewriter/filewriter.cc:435
+msgid "56 kbit/s"
+msgstr "56 kbit/s"
+
+#: src/filewriter/filewriter.cc:436
+msgid "64 kbit/s"
+msgstr "64 kbit/s"
+
+#: src/filewriter/filewriter.cc:437
+msgid "80 kbit/s"
+msgstr "80 kbit/s"
+
+#: src/filewriter/filewriter.cc:438
+msgid "96 kbit/s"
+msgstr "96 kbit/s"
+
+#: src/filewriter/filewriter.cc:439
+msgid "112 kbit/s"
+msgstr "112 kbit/s"
+
+#: src/filewriter/filewriter.cc:440
+msgid "128 kbit/s"
+msgstr "128 kbit/s"
+
+#: src/filewriter/filewriter.cc:441
+msgid "160 kbit/s"
+msgstr "160 kbit/s"
+
+#: src/filewriter/filewriter.cc:442
+msgid "192 kbit/s"
+msgstr "192 kbit/s"
+
+#: src/filewriter/filewriter.cc:443
+msgid "224 kbit/s"
+msgstr "224 kbit/s"
+
+#: src/filewriter/filewriter.cc:444
+msgid "256 kbit/s"
+msgstr "256 kbit/s"
+
+#: src/filewriter/filewriter.cc:445
+msgid "320 kbit/s"
+msgstr "320 kbit/s"
+
+#: src/filewriter/filewriter.cc:450
 msgid "Joint Stereo"
 msgstr "Estéreo Unido"
 
-#: src/filewriter/mp3.cc:41 src/modplug/plugin_main.cc:58
-#: src/mpg123/mpg123.cc:248
+#: src/filewriter/filewriter.cc:451 src/modplug/plugin_main.cc:57
+#: src/mpg123/mpg123.cc:259
 msgid "Stereo"
 msgstr "Estéreo"
 
-#: src/filewriter/mp3.cc:41 src/modplug/plugin_main.cc:57
-#: src/mpg123/mpg123.cc:248
+#: src/filewriter/filewriter.cc:452 src/modplug/plugin_main.cc:56
+#: src/mpg123/mpg123.cc:260
 msgid "Mono"
 msgstr "Monoaural"
 
-#: src/filewriter/mp3.cc:657
-msgid "MP3 Configuration"
-msgstr "Configuración MP3"
-
-#: src/filewriter/mp3.cc:658
-msgid "_OK"
-msgstr "_OK"
-
-#: src/filewriter/mp3.cc:681
-msgid "Algorithm Quality:"
-msgstr "Calidad del algoritmo:"
-
-#: src/filewriter/mp3.cc:706
-msgid "Output Sample Rate:"
-msgstr "Tasa de Muestreo de Salida:"
-
-#: src/filewriter/mp3.cc:733
-msgid "(Hz)"
-msgstr "(Hz)"
-
-#: src/filewriter/mp3.cc:740
-msgid "Bitrate / Compression Ratio:"
-msgstr "Tasa de Bits / Relación de Compresión:"
-
-#: src/filewriter/mp3.cc:764
-msgid "Bitrate (kbps):"
-msgstr "Tasa de bits (kbps):"
+#: src/filewriter/filewriter.cc:456
+msgid "VBR"
+msgstr "VBR"
+
+#: src/filewriter/filewriter.cc:457
+msgid "ABR"
+msgstr "ABR"
+
+#: src/filewriter/filewriter.cc:478
+msgid "Algorithm quality:"
+msgstr "Calidad del Algoritmo:"
 
-#: src/filewriter/mp3.cc:796
+#: src/filewriter/filewriter.cc:484
+msgid "Bitrate:"
+msgstr "Tasa de bits:"
+
+#: src/filewriter/filewriter.cc:491
 msgid "Compression ratio:"
 msgstr "Tasa de Compresión"
 
-#: src/filewriter/mp3.cc:820
-msgid "Audio Mode:"
-msgstr "Modo de audio:"
-
-#: src/filewriter/mp3.cc:845
-msgid "Miscellaneous:"
-msgstr "Otros:"
+#: src/filewriter/filewriter.cc:498
+msgid "Audio mode:"
+msgstr "Modo de Audio:"
 
-#: src/filewriter/mp3.cc:856
+#: src/filewriter/filewriter.cc:501
 msgid "Enforce strict ISO compliance"
 msgstr "Cumplir normas ISO estrictas"
 
-#: src/filewriter/mp3.cc:867
+#: src/filewriter/filewriter.cc:503
 msgid "Error protection"
 msgstr "Error de protección"
 
-#: src/filewriter/mp3.cc:879 src/filewriter/vorbis.cc:206
-msgid "Quality"
-msgstr "Calidad"
-
-#: src/filewriter/mp3.cc:888
+#: src/filewriter/filewriter.cc:508
 msgid "Enable VBR/ABR"
 msgstr "Habilitar VBR/ABR"
 
-#: src/filewriter/mp3.cc:898
+#: src/filewriter/filewriter.cc:510
 msgid "Type:"
 msgstr "Tipo:"
 
-#: src/filewriter/mp3.cc:931
-msgid "VBR Options:"
-msgstr "Opciones VBR:"
-
-#: src/filewriter/mp3.cc:947
-msgid "Minimum bitrate (kbps):"
-msgstr "Tasa de bits mínima (kbps):"
-
-#: src/filewriter/mp3.cc:973
-msgid "Maximum bitrate (kbps):"
-msgstr "Tasa de bits máxima (kbps):"
-
-#: src/filewriter/mp3.cc:995
-msgid "Strictly enforce minimum bitrate"
-msgstr "Forzar estríctamente tasa de bits mínima"
+#: src/filewriter/filewriter.cc:514
+msgid "Minimum bitrate:"
+msgstr "Tasa de bits mínima:"
+
+#: src/filewriter/filewriter.cc:518
+msgid "Maximum bitrate:"
+msgstr "Tasa de bits máxima:"
+
+#: src/filewriter/filewriter.cc:522
+msgid "Average bitrate:"
+msgstr "Tasa de bits promedio:"
 
-#: src/filewriter/mp3.cc:1007
-msgid "ABR Options:"
-msgstr "Opciones ABR:"
-
-#: src/filewriter/mp3.cc:1017
-msgid "Average bitrate (kbps):"
-msgstr "Promedio de tasa de bits (kbps):"
-
-#: src/filewriter/mp3.cc:1044
+#: src/filewriter/filewriter.cc:526
 msgid "VBR quality level:"
 msgstr "Nivel de calidad VBR:"
 
-#: src/filewriter/mp3.cc:1063
+#: src/filewriter/filewriter.cc:530
+msgid "Strictly enforce minimum bitrate"
+msgstr "Forzar estríctamente tasa de bits mínima"
+
+#: src/filewriter/filewriter.cc:533
 msgid "Omit Xing VBR header"
 msgstr "Omitir encabezado VBR Xing"
 
-#: src/filewriter/mp3.cc:1076
-msgid "VBR/ABR"
-msgstr "VBR/ABR"
-
-#: src/filewriter/mp3.cc:1085
-msgid "Frame Parameters:"
-msgstr "Parámetros de Marco:"
+#: src/filewriter/filewriter.cc:539
+msgid "Frame Headers"
+msgstr "Encabezados del Marco"
 
-#: src/filewriter/mp3.cc:1097
+#: src/filewriter/filewriter.cc:540
 msgid "Mark as copyright"
 msgstr "Marcar como copyright"
 
-#: src/filewriter/mp3.cc:1108
+#: src/filewriter/filewriter.cc:542
 msgid "Mark as original"
 msgstr "Marcar como original"
 
-#: src/filewriter/mp3.cc:1120
-msgid "ID3 Parameters:"
-msgstr "Parámetros ID3:"
+#: src/filewriter/filewriter.cc:544
+msgid "ID3 Tags"
+msgstr "Etiquetas ID3"
 
-#: src/filewriter/mp3.cc:1131
+#: src/filewriter/filewriter.cc:545
 msgid "Force addition of version 2 tag"
 msgstr "Forzar adición de etiquetas versión 2"
 
-#: src/filewriter/mp3.cc:1141
+#: src/filewriter/filewriter.cc:547
 msgid "Only add v1 tag"
 msgstr "Sólo agrega etiqueta v1"
 
-#: src/filewriter/mp3.cc:1148
+#: src/filewriter/filewriter.cc:549
 msgid "Only add v2 tag"
 msgstr "Sólo agrega etiqueta v2"
 
-#: src/filewriter/mp3.cc:1169
+#: src/filewriter/filewriter.cc:554
+msgid "Quality"
+msgstr "Calidad"
+
+#: src/filewriter/filewriter.cc:555
+msgid "VBR/ABR"
+msgstr "VBR/ABR"
+
+#: src/filewriter/filewriter.cc:556
 msgid "Tags"
 msgstr "Etiquetas"
 
-#: src/filewriter/vorbis.cc:196
-msgid "Vorbis Encoder Configuration"
-msgstr "Configuración del codificador Vorbis"
-
-#: src/filewriter/vorbis.cc:219
-msgid "Quality level (0 - 10):"
-msgstr "Nivel de calidad (0-10):"
+#: src/filewriter/filewriter.cc:566
+msgid "Quality (0-1):"
+msgstr "Calidad (0-1):"
 
-#: src/flacng/flacng.h:35
+#: src/filewriter/filewriter.cc:573 src/skins-qt/skins_cfg.cc:307
+#: src/skins/skins_cfg.cc:289
+msgid "General"
+msgstr "General"
+
+#: src/flac/flacng.h:36
 msgid "FLAC Decoder"
 msgstr "Decodificador FLAC"
 
-#: src/flacng/metadata.cc:351 src/wavpack/wavpack.cc:209
+#: src/flac/metadata.cc:296 src/wavpack/wavpack.cc:215
 msgid "lossless"
 msgstr "sin pérdida"
 
-#: src/flacng/plugin.cc:169
+#: src/flac/plugin.cc:214
 msgid ""
 "Original code by\n"
 "Ralf Ertzinger <ralf@skytale.net>\n"
@@ -1518,15 +1454,15 @@
 msgid "GIO Plugin"
 msgstr "Plugin GIO"
 
-#: src/gio/gio.cc:153
+#: src/gio/gio.cc:152
 msgid "Read-and-append mode not supported"
 msgstr "Modo leer-y-anexar no soportado"
 
-#: src/gio/gio.cc:166
+#: src/gio/gio.cc:165
 msgid "Invalid open mode"
 msgstr "modo abierto invalido"
 
-#: src/gl-spectrum/gl-spectrum.cc:51
+#: src/glspectrum/gl-spectrum.cc:52
 msgid ""
 "OpenGL Spectrum Analyzer for Audacious\n"
 "Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
@@ -1546,623 +1482,746 @@
 "\n"
 "Licencia: GPLv2+"
 
-#: src/gl-spectrum/gl-spectrum.cc:62
+#: src/glspectrum/gl-spectrum.cc:63 src/qtglspectrum/gl-spectrum.cc:53
 msgid "OpenGL Spectrum Analyzer"
 msgstr "Analizador de Espectro OpenGL"
 
-#: src/gl-spectrum-qt/gl-spectrum.cc:41
-msgid ""
-"OpenGL Spectrum Analyzer for Audacious\n"
-"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
-"Copyright 2014 William Pitcock\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 para Audacious\n"
-"Copyright 2013 Christophe Budé, John Lindgren, y Carlo Bramini\n"
-"Copyright 2014 William Pitcock\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-qt/gl-spectrum.cc:53
-msgid "OpenGL Spectrum Analyzer (Qt)"
-msgstr "Analizador de Espectro OpenGL (Qt)"
-
-#: src/gnomeshortcuts/gnomeshortcuts.cc:38
-msgid "GNOME Shortcuts"
-msgstr "Atajos GNOME"
-
-#: src/gnomeshortcuts/gnomeshortcuts.cc:54
-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\n"
-"Te permite controlar el reproductor con atajos de GNOME's.\n"
-"\n"
-"Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>"
-
-#: src/gtkui/columns.cc:35
-msgid "Entry number"
+#: src/gtkui/columns.cc:36 src/moonstone/playlist_model.cc:38
+#: src/qtui/playlist_model.cc:33
+msgid "Entry Number"
 msgstr "Número de entrada"
 
-#: src/gtkui/columns.cc:36 src/playlist-manager/playlist-manager.cc:225
-#: src/qtui/playlist_model.cc:123
+#: src/gtkui/columns.cc:37 src/moonstone/playlist_model.cc:38
+#: src/moonstone/playlist_selection.cc:64
+#: src/playlist-manager/playlist-manager.cc:200
+#: src/playlist-manager-qt/playlist-manager-qt.cc:188
+#: src/qtui/playlist_model.cc:33 src/streamtuner/icecast-model.cc:120
+#: src/streamtuner/ihr-model.cc:159 src/streamtuner/shoutcast-model.cc:122
 msgid "Title"
 msgstr "Título"
 
-#: src/gtkui/columns.cc:37 src/qtui/playlist_model.cc:125
+#: src/gtkui/columns.cc:38 src/moonstone/playlist_model.cc:39
+#: src/qtui/playlist_model.cc:33
 msgid "Artist"
 msgstr "Artista"
 
-#: src/gtkui/columns.cc:38
+#: src/gtkui/columns.cc:39 src/moonstone/playlist_model.cc:39
+#: src/qtui/playlist_model.cc:33
 msgid "Year"
 msgstr "Año"
 
-#: src/gtkui/columns.cc:39 src/qtui/playlist_model.cc:127
+#: src/gtkui/columns.cc:40 src/moonstone/playlist_model.cc:39
+#: src/qtui/playlist_model.cc:34
 msgid "Album"
 msgstr "Álbum"
 
-#: src/gtkui/columns.cc:40
-msgid "Album artist"
-msgstr "Artista de Álbum"
+#: src/gtkui/columns.cc:41 src/moonstone/playlist_model.cc:40
+#: src/qtui/playlist_model.cc:34
+msgid "Album Artist"
+msgstr "Artista del Álbum"
 
-#: src/gtkui/columns.cc:41
+#: src/gtkui/columns.cc:42 src/moonstone/playlist_model.cc:40
+#: src/qtui/playlist_model.cc:34
 msgid "Track"
 msgstr "Pista"
 
-#: src/gtkui/columns.cc:42
+#: src/gtkui/columns.cc:43 src/moonstone/playlist_model.cc:40
+#: src/qtui/playlist_model.cc:34 src/streamtuner/icecast-model.cc:123
+#: src/streamtuner/shoutcast-model.cc:125
+#: src/streamtuner/shoutcast-model.cc:236
 msgid "Genre"
 msgstr "Género"
 
-#: src/gtkui/columns.cc:43
-msgid "Queue position"
-msgstr "Posición en cola"
+#: src/gtkui/columns.cc:44 src/moonstone/playlist_model.cc:41
+#: src/qtui/playlist_model.cc:35
+msgid "Queue Position"
+msgstr "Posición en Espera"
 
-#: src/gtkui/columns.cc:44
+#: src/gtkui/columns.cc:45 src/moonstone/playlist_model.cc:41
+#: src/qtui/playlist_model.cc:35
 msgid "Length"
 msgstr "Duración"
 
-#: src/gtkui/columns.cc:45
-msgid "File path"
-msgstr "Ruta del archivo"
-
-#: src/gtkui/columns.cc:47
-msgid "Custom title"
-msgstr "Título personalizado"
-
-#: src/gtkui/columns.cc:48
+#: src/gtkui/columns.cc:46 src/moonstone/playlist_model.cc:41
+#: src/qtui/playlist_model.cc:35
+msgid "File Path"
+msgstr "Ruta de Archivo"
+
+#: src/gtkui/columns.cc:47 src/moonstone/playlist_model.cc:42
+#: src/qtui/playlist_model.cc:35
+msgid "File Name"
+msgstr "Nombre de Archivo"
+
+#: src/gtkui/columns.cc:48 src/moonstone/playlist_model.cc:42
+#: src/qtui/playlist_model.cc:36
+msgid "Custom Title"
+msgstr "Título Customizado"
+
+#: src/gtkui/columns.cc:49 src/moonstone/playlist_model.cc:42
+#: src/qtui/playlist_model.cc:36 src/streamtuner/icecast-model.cc:129
+#: src/streamtuner/shoutcast-model.cc:134
 msgid "Bitrate"
 msgstr "Tasa de bits"
 
-#: src/gtkui/columns.cc:308
+#: src/gtkui/columns.cc:50 src/moonstone/playlist_model.cc:43
+#: src/qtui/playlist_model.cc:36
+msgid "Comment"
+msgstr "Comentario"
+
+#: src/gtkui/columns.cc:51 src/qtui/playlist_model.cc:36
+msgid "Publisher"
+msgstr "Editor"
+
+#: src/gtkui/columns.cc:52 src/qtui/playlist_model.cc:37
+msgid "Catalog Number"
+msgstr "Número de catálogo"
+
+#: src/gtkui/columns.cc:53 src/moonstone/playlist_model.cc:43
+#: src/qtui/playlist_model.cc:37
+msgid "Disc"
+msgstr ""
+
+#: src/gtkui/columns.cc:325
 msgid "Available columns"
 msgstr "Columnas disponibles"
 
-#: src/gtkui/columns.cc:334
+#: src/gtkui/columns.cc:351
 msgid "Displayed columns"
 msgstr "Columnas mostradas"
 
-#: src/gtkui/layout.cc:72 src/search-tool/search-tool.cc:40
+#: src/gtkui/layout.cc:74 src/search-tool-qt/search-tool-qt.cc:58
+#: src/search-tool/search-tool.cc:49
 msgid "Search Tool"
 msgstr "Herramienta de Búsqueda"
 
-#: src/gtkui/layout.cc:167
+#: src/gtkui/layout.cc:170
 msgid "Dock at Left"
 msgstr "Acoplar a la izquierda"
 
-#: src/gtkui/layout.cc:167
+#: src/gtkui/layout.cc:170
 msgid "Dock at Right"
 msgstr "Acoplar a la derecha"
 
-#: src/gtkui/layout.cc:168
+#: src/gtkui/layout.cc:171
 msgid "Dock at Top"
 msgstr "Acoplar arriba"
 
-#: src/gtkui/layout.cc:168
+#: src/gtkui/layout.cc:171
 msgid "Dock at Bottom"
 msgstr "Acoplar abajo"
 
-#: src/gtkui/layout.cc:168
+#: src/gtkui/layout.cc:171
 msgid "Undock"
 msgstr "Desacoplar"
 
-#: src/gtkui/layout.cc:168 src/ladspa/plugin.cc:531
+#: src/gtkui/layout.cc:171 src/ladspa/plugin.cc:540
 msgid "Disable"
 msgstr "Dehabilitar"
 
-#: src/gtkui/menus.cc:126 src/qtui/main_window_actions.cc:93
-#: src/statusicon/statusicon.cc:276
+#: src/gtkui/menus.cc:79 src/qtui/menus.cc:107
+#: src/statusicon-qt/statusicon.cc:115 src/statusicon/statusicon.cc:286
 msgid "_Open Files ..."
 msgstr "_Abrir archivos..."
 
-#: src/gtkui/menus.cc:127
+#: src/gtkui/menus.cc:80 src/qtui/menus.cc:111
 msgid "Open _URL ..."
 msgstr "Abrir _URL..."
 
-#: src/gtkui/menus.cc:128 src/qtui/main_window_actions.cc:95
+#: src/gtkui/menus.cc:81 src/qtui/menus.cc:113
 msgid "_Add Files ..."
 msgstr "A_gregar archivos..."
 
-#: src/gtkui/menus.cc:129
+#: src/gtkui/menus.cc:82 src/qtui/menus.cc:118
 msgid "Add U_RL ..."
 msgstr "Agregar U_RL..."
 
-#: src/gtkui/menus.cc:131
+#: src/gtkui/menus.cc:84 src/qtui/menus.cc:120
 msgid "Search _Library"
 msgstr "Buscar en Bib_lioteca"
 
-#: src/gtkui/menus.cc:133 src/qtui/main_window_actions.cc:98
+#: src/gtkui/menus.cc:86 src/qtui/menus.cc:123
 msgid "A_bout ..."
 msgstr "A_cerca..."
 
-#: src/gtkui/menus.cc:134 src/qtui/main_window_actions.cc:99
+#: src/gtkui/menus.cc:87 src/qtui/menus.cc:125
 msgid "_Settings ..."
 msgstr "_Ajustes"
 
-#: src/gtkui/menus.cc:135 src/qtui/main_window_actions.cc:103
-#: src/statusicon/statusicon.cc:284
+#: src/gtkui/menus.cc:88 src/qtui/menus.cc:131
+#: src/statusicon-qt/statusicon.cc:117 src/statusicon/statusicon.cc:288
 msgid "_Quit"
 msgstr "_Salir"
 
-#: src/gtkui/menus.cc:139 src/gtkui/menus.cc:262
-#: src/qtui/main_window_actions.cc:107 src/search-tool/search-tool.cc:641
-#: src/statusicon/statusicon.cc:278
+#: src/gtkui/menus.cc:92 src/gtkui/menus.cc:226
+#: src/moonstone/playlist_tabs.cc:306 src/qtui/menus.cc:135
+#: src/qtui/playlist_tabs.cc:331 src/search-tool-qt/search-tool-qt.cc:499
+#: src/search-tool/search-tool.cc:339 src/statusicon-qt/statusicon.cc:109
+#: src/statusicon/statusicon.cc:280
 msgid "_Play"
 msgstr "_Reproducir"
 
-#: src/gtkui/menus.cc:140 src/qtui/main_window_actions.cc:108
-#: src/statusicon/statusicon.cc:279
+#: src/gtkui/menus.cc:93 src/qtui/menus.cc:137
+#: src/statusicon-qt/statusicon.cc:110 src/statusicon/statusicon.cc:281
 msgid "Paus_e"
 msgstr "Pa_usa"
 
-#: src/gtkui/menus.cc:141 src/qtui/main_window_actions.cc:109
-#: src/statusicon/statusicon.cc:280
+#: src/gtkui/menus.cc:94 src/qtui/menus.cc:139
+#: src/statusicon-qt/statusicon.cc:111 src/statusicon/statusicon.cc:282
 msgid "_Stop"
 msgstr "_Detener"
 
-#: src/gtkui/menus.cc:142 src/qtui/main_window_actions.cc:110
-#: src/statusicon/statusicon.cc:277
+#: src/gtkui/menus.cc:95 src/qtui/menus.cc:141
+#: src/statusicon-qt/statusicon.cc:112 src/statusicon/statusicon.cc:283
 msgid "Pre_vious"
 msgstr "_Anterior"
 
-#: src/gtkui/menus.cc:143 src/qtui/main_window_actions.cc:111
-#: src/statusicon/statusicon.cc:281
+#: src/gtkui/menus.cc:96 src/qtui/menus.cc:143
+#: src/statusicon-qt/statusicon.cc:113 src/statusicon/statusicon.cc:284
 msgid "_Next"
 msgstr "Siguie_nte"
 
-#: src/gtkui/menus.cc:145 src/qtui/main_window_actions.cc:113
+#: src/gtkui/menus.cc:97 src/qtui/menus.cc:145 src/skins/menus.cc:114
+#: src/skins-qt/menus.cc:105
+msgid "Previous Album"
+msgstr "Álbum Previo"
+
+#: src/gtkui/menus.cc:98 src/qtui/menus.cc:146 src/skins/menus.cc:115
+#: src/skins-qt/menus.cc:106
+msgid "Next Album"
+msgstr "Álbum Siguiente"
+
+#: src/gtkui/menus.cc:100 src/qtui/menus.cc:148
 msgid "_Repeat"
 msgstr "Repe_tir"
 
-#: src/gtkui/menus.cc:146 src/qtui/main_window_actions.cc:114
+#: src/gtkui/menus.cc:101 src/qtui/menus.cc:150
 msgid "S_huffle"
 msgstr "A_leatorio"
 
-#: src/gtkui/menus.cc:147 src/qtui/main_window_actions.cc:115
+#: src/gtkui/menus.cc:102 src/qtui/menus.cc:152
+msgid "Shuffle by Albu_m"
+msgstr "Aleatorio por Albu_m"
+
+#: src/gtkui/menus.cc:103 src/qtui/menus.cc:155
 msgid "N_o Playlist Advance"
 msgstr "_No avanzar Lista de Reprod."
 
-#: src/gtkui/menus.cc:148 src/qtui/main_window_actions.cc:116
+#: src/gtkui/menus.cc:104 src/qtui/menus.cc:157
 msgid "Stop A_fter This Song"
 msgstr "Detener D_espués de Esta Pista"
 
-#: src/gtkui/menus.cc:150 src/gtkui/menus.cc:247
-#: src/qtui/main_window_actions.cc:118
+#: src/gtkui/menus.cc:106 src/gtkui/menus.cc:210 src/qtui/menus.cc:162
+#: src/qtui/menus.cc:294
 msgid "Song _Info ..."
 msgstr "_Información de pista..."
 
-#: src/gtkui/menus.cc:151
+#: src/gtkui/menus.cc:107
 msgid "Jump to _Time ..."
 msgstr "Saltar al _tiempo"
 
-#: src/gtkui/menus.cc:152
+#: src/gtkui/menus.cc:108
 msgid "_Jump to Song ..."
 msgstr "Saltar a la _pista"
 
-#: src/gtkui/menus.cc:154
+#: src/gtkui/menus.cc:110 src/qtui/menus.cc:165
 msgid "Set Repeat Point _A"
 msgstr "Configura Punto _A de Repetición"
 
-#: src/gtkui/menus.cc:155
+#: src/gtkui/menus.cc:111 src/qtui/menus.cc:167
 msgid "Set Repeat Point _B"
 msgstr "Configura Punto _B de Repetición"
 
-#: src/gtkui/menus.cc:156
+#: src/gtkui/menus.cc:112 src/qtui/menus.cc:169
 msgid "_Clear Repeat Points"
 msgstr "_Borrar Puntos de Repetición"
 
-#: src/gtkui/menus.cc:160 src/gtkui/menus.cc:167 src/gtkui/menus.cc:183
-#: src/qtui/main_window_actions.cc:122 src/qtui/main_window_actions.cc:129
-#: src/qtui/main_window_actions.cc:145
+#: src/gtkui/menus.cc:116 src/gtkui/menus.cc:123 src/gtkui/menus.cc:141
+#: src/qtui/menus.cc:173 src/qtui/menus.cc:180 src/qtui/menus.cc:198
 msgid "By _Title"
 msgstr "Por _Título"
 
-#: src/gtkui/menus.cc:161 src/qtui/main_window_actions.cc:123
+#: src/gtkui/menus.cc:117 src/qtui/menus.cc:174
 msgid "By _File Name"
 msgstr "Por _Nombre de Archivo"
 
-#: src/gtkui/menus.cc:162 src/qtui/main_window_actions.cc:124
+#: src/gtkui/menus.cc:118 src/qtui/menus.cc:175
 msgid "By File _Path"
 msgstr "Por _Ruta de Archivo"
 
-#: src/gtkui/menus.cc:166 src/gtkui/menus.cc:182
-#: src/qtui/main_window_actions.cc:128 src/qtui/main_window_actions.cc:144
+#: src/gtkui/menus.cc:122 src/gtkui/menus.cc:140 src/qtui/menus.cc:179
+#: src/qtui/menus.cc:197
 msgid "By Track _Number"
 msgstr "Por _Núm de pista"
 
-#: src/gtkui/menus.cc:168 src/gtkui/menus.cc:184
-#: src/qtui/main_window_actions.cc:130 src/qtui/main_window_actions.cc:146
+#: src/gtkui/menus.cc:124 src/gtkui/menus.cc:142 src/qtui/menus.cc:181
+#: src/qtui/menus.cc:199
 msgid "By _Artist"
 msgstr "Por_Artista"
 
-#: src/gtkui/menus.cc:169 src/gtkui/menus.cc:185
-#: src/qtui/main_window_actions.cc:131 src/qtui/main_window_actions.cc:147
+#: src/gtkui/menus.cc:125 src/gtkui/menus.cc:143 src/qtui/menus.cc:182
+#: src/qtui/menus.cc:200
 msgid "By Al_bum"
 msgstr "Por Al_bum"
 
-#: src/gtkui/menus.cc:170 src/gtkui/menus.cc:186
-#: src/qtui/main_window_actions.cc:132 src/qtui/main_window_actions.cc:148
+#: src/gtkui/menus.cc:126 src/gtkui/menus.cc:144 src/qtui/menus.cc:183
+#: src/qtui/menus.cc:201
 msgid "By Albu_m Artist"
 msgstr "Por Artista de Álbu_m"
 
-#: src/gtkui/menus.cc:171 src/gtkui/menus.cc:187
-#: src/qtui/main_window_actions.cc:133 src/qtui/main_window_actions.cc:149
+#: src/gtkui/menus.cc:127 src/gtkui/menus.cc:145 src/qtui/menus.cc:184
+#: src/qtui/menus.cc:202
 msgid "By Release _Date"
 msgstr "Por _Fecha de Lanzamiento"
 
-#: src/gtkui/menus.cc:172 src/gtkui/menus.cc:188
-#: src/qtui/main_window_actions.cc:134 src/qtui/main_window_actions.cc:150
+#: src/gtkui/menus.cc:128 src/gtkui/menus.cc:146 src/qtui/menus.cc:185
+#: src/qtui/menus.cc:203
 msgid "By _Genre"
 msgstr "Por _Género"
 
-#: src/gtkui/menus.cc:173 src/gtkui/menus.cc:189
-#: src/qtui/main_window_actions.cc:135 src/qtui/main_window_actions.cc:151
+#: src/gtkui/menus.cc:129 src/gtkui/menus.cc:147 src/qtui/menus.cc:186
+#: src/qtui/menus.cc:204
 msgid "By _Length"
 msgstr "Por _Duración"
 
-#: src/gtkui/menus.cc:174 src/gtkui/menus.cc:190
-#: src/qtui/main_window_actions.cc:136 src/qtui/main_window_actions.cc:152
+#: src/gtkui/menus.cc:130 src/gtkui/menus.cc:148 src/qtui/menus.cc:187
+#: src/qtui/menus.cc:205
 msgid "By _File Path"
 msgstr "Por _Ruta del Archivo"
 
-#: src/gtkui/menus.cc:175 src/gtkui/menus.cc:191
-#: src/qtui/main_window_actions.cc:137 src/qtui/main_window_actions.cc:153
+#: src/gtkui/menus.cc:131 src/gtkui/menus.cc:149 src/qtui/menus.cc:188
+#: src/qtui/menus.cc:206
 msgid "By _Custom Title"
 msgstr "Por Título _Personalizado"
 
-#: src/gtkui/menus.cc:177 src/gtkui/menus.cc:193
-#: src/qtui/main_window_actions.cc:139 src/qtui/main_window_actions.cc:155
+#: src/gtkui/menus.cc:132 src/gtkui/menus.cc:150 src/qtui/menus.cc:189
+#: src/qtui/menus.cc:207
+msgid "By C_omment"
+msgstr "Por C_omentario"
+
+#: src/gtkui/menus.cc:133 src/gtkui/menus.cc:151 src/qtui/menus.cc:190
+#: src/qtui/menus.cc:208
+msgid "By D_isc Number"
+msgstr ""
+
+#: src/gtkui/menus.cc:135 src/gtkui/menus.cc:153 src/qtui/menus.cc:192
+#: src/qtui/menus.cc:210
 msgid "R_everse Order"
 msgstr "_Invertir Orden"
 
-#: src/gtkui/menus.cc:178 src/gtkui/menus.cc:194
-#: src/qtui/main_window_actions.cc:140 src/qtui/main_window_actions.cc:156
+#: src/gtkui/menus.cc:136 src/gtkui/menus.cc:154 src/qtui/menus.cc:194
+#: src/qtui/menus.cc:212
 msgid "_Random Order"
 msgstr "O_rden Aleatorio"
 
-#: src/gtkui/menus.cc:198 src/qtui/main_window_actions.cc:160
+#: src/gtkui/menus.cc:158 src/qtui/menus.cc:216
 msgid "_Play/Resume"
 msgstr "_Reproducir/Reanudar"
 
-#: src/gtkui/menus.cc:199 src/gtkui/menus.cc:251
-#: src/qtui/main_window_actions.cc:161
+#: src/gtkui/menus.cc:159 src/qtui/menus.cc:218
 msgid "_Refresh"
 msgstr "A_ctualizar"
 
-#: src/gtkui/menus.cc:201 src/qtui/main_window_actions.cc:163
+#: src/gtkui/menus.cc:161 src/qtui/menus.cc:222
 msgid "_Sort"
 msgstr "_Ordenar"
 
-#: src/gtkui/menus.cc:202 src/qtui/main_window_actions.cc:164
+#: src/gtkui/menus.cc:162 src/qtui/menus.cc:223
 msgid "Sort Se_lected"
 msgstr "Ordenar Se_leccionados"
 
-#: src/gtkui/menus.cc:203 src/qtui/main_window_actions.cc:165
+#: src/gtkui/menus.cc:163 src/qtui/menus.cc:225
 msgid "Remove _Duplicates"
 msgstr "Remover _Duplicados"
 
-#: src/gtkui/menus.cc:204 src/qtui/main_window_actions.cc:166
+#: src/gtkui/menus.cc:164 src/qtui/menus.cc:226
 msgid "Remove _Unavailable Files"
 msgstr "Remover Archivos No _Disponibles"
 
-#: src/gtkui/menus.cc:206 src/playlist-manager/playlist-manager.cc:244
-#: src/qtui/main_window_actions.cc:168
+#: src/gtkui/menus.cc:166 src/playlist-manager/playlist-manager.cc:219
+#: src/playlist-manager-qt/playlist-manager-qt.cc:348 src/qtui/menus.cc:229
 msgid "_New"
 msgstr "_Nuevo"
 
-#: src/gtkui/menus.cc:207
+#: src/gtkui/menus.cc:167 src/qtui/menus.cc:230
 msgid "Ren_ame ..."
 msgstr "Ren_ombrar ..."
 
-#: src/gtkui/menus.cc:208 src/gtkui/menus.cc:264
-#: src/qtui/main_window_actions.cc:170
+#: src/gtkui/menus.cc:168 src/gtkui/menus.cc:228
+#: src/moonstone/playlist_tabs.cc:311 src/qtui/menus.cc:231
+#: src/qtui/playlist_tabs.cc:336
 msgid "Remo_ve"
 msgstr "Remo_ver"
 
-#: src/gtkui/menus.cc:210
+#: src/gtkui/menus.cc:170 src/qtui/menus.cc:233
 msgid "_Import ..."
 msgstr "_Importar..."
 
-#: src/gtkui/menus.cc:211
+#: src/gtkui/menus.cc:171 src/qtui/menus.cc:234
 msgid "_Export ..."
 msgstr "_Exportar..."
 
-#: src/gtkui/menus.cc:213
+#: src/gtkui/menus.cc:173 src/qtui/menus.cc:237
 msgid "Playlist _Manager ..."
 msgstr "Ad_ministrador de Listas de Reproducción ..."
 
-#: src/gtkui/menus.cc:214 src/qtui/main_window_actions.cc:176
+#: src/gtkui/menus.cc:174 src/qtui/menus.cc:239
 msgid "_Queue Manager ..."
 msgstr "Administrador de _Colas ..."
 
-#: src/gtkui/menus.cc:218 src/qtui/main_window_actions.cc:180
+#: src/gtkui/menus.cc:178 src/qtui/menus.cc:243
 msgid "Volume _Up"
 msgstr "_Aumentar Volumen"
 
-#: src/gtkui/menus.cc:219 src/qtui/main_window_actions.cc:181
+#: src/gtkui/menus.cc:179 src/qtui/menus.cc:245
 msgid "Volume _Down"
 msgstr "_Disminuir Volumen"
 
-#: src/gtkui/menus.cc:221 src/qtui/main_window_actions.cc:183
-msgid "_Equalizer"
-msgstr "_Ecualizador"
+#: src/gtkui/menus.cc:181 src/qtui/menus.cc:249
+msgid "_Equalizer ..."
+msgstr "_Ecualizador ..."
 
-#: src/gtkui/menus.cc:223 src/qtui/main_window_actions.cc:185
+#: src/gtkui/menus.cc:182 src/qtui/menus.cc:251
 msgid "E_ffects ..."
 msgstr "E_fectos ..."
 
-#: src/gtkui/menus.cc:227
+#: src/gtkui/menus.cc:184
+msgid "_Record Stream"
+msgstr "G_rabar Stream"
+
+#: src/gtkui/menus.cc:185
+msgid "Audio _Settings ..."
+msgstr "Ajuste_s de Audio ..."
+
+#: src/gtkui/menus.cc:189 src/qtui/menus.cc:260
 msgid "Show _Menu Bar"
 msgstr "Mostrar Barra de _Menú"
 
-#: src/gtkui/menus.cc:228
+#: src/gtkui/menus.cc:190 src/qtui/menus.cc:262
 msgid "Show I_nfo Bar"
 msgstr "Mostrar Barra de I_nformación"
 
-#: src/gtkui/menus.cc:229
+#: src/gtkui/menus.cc:191 src/qtui/menus.cc:264
+msgid "Show Info Bar _Album Art"
+msgstr "Mostrar Barra de Información Portada _Album"
+
+#: src/gtkui/menus.cc:192 src/qtui/menus.cc:266
 msgid "Show Info Bar Vis_ualization"
 msgstr "Mostrar Barra de Información de Vis_ualización"
 
-#: src/gtkui/menus.cc:230
+#: src/gtkui/menus.cc:193 src/qtui/menus.cc:268
 msgid "Show _Status Bar"
 msgstr "Mostrar Barra de E_stado"
 
-#: src/gtkui/menus.cc:232
+#: src/gtkui/menus.cc:195 src/qtui/menus.cc:272
 msgid "Show _Remaining Time"
 msgstr "Mostrar Tiempo _Restante"
 
-#: src/gtkui/menus.cc:234
+#: src/gtkui/menus.cc:197 src/qtui/menus.cc:276 src/skins/menus.cc:157
+#: src/skins-qt/menus.cc:152
 msgid "_Visualizations ..."
 msgstr "_Visualizaciones ..."
 
-#: src/gtkui/menus.cc:238 src/qtui/main_window_actions.cc:189
+#: src/gtkui/menus.cc:201 src/qtui/menus.cc:280
 msgid "_File"
 msgstr "_Archivo"
 
-#: src/gtkui/menus.cc:239 src/qtui/main_window_actions.cc:190
+#: src/gtkui/menus.cc:202 src/qtui/menus.cc:281
 msgid "_Playback"
 msgstr "_Reproducción"
 
-#: src/gtkui/menus.cc:240 src/qtui/main_window_actions.cc:191
+#: src/gtkui/menus.cc:203 src/qtui/menus.cc:282
 msgid "P_laylist"
 msgstr "_Lista de Reproducción"
 
-#: src/gtkui/menus.cc:241 src/gtkui/menus.cc:258
-#: src/qtui/main_window_actions.cc:192
+#: src/gtkui/menus.cc:204 src/gtkui/menus.cc:222 src/qtui/menus.cc:283
+#: src/qtui/menus.cc:312
 msgid "_Services"
 msgstr "_Servicios"
 
-#: src/gtkui/menus.cc:242 src/qtui/main_window_actions.cc:193
+#: src/gtkui/menus.cc:205 src/qtui/menus.cc:284
 msgid "_Output"
 msgstr "_Salida"
 
-#: src/gtkui/menus.cc:243
+#: src/gtkui/menus.cc:206 src/qtui/menus.cc:285
 msgid "_View"
 msgstr "_Ver"
 
-#: src/gtkui/menus.cc:248
+#: src/gtkui/menus.cc:211 src/qtui/menus.cc:296
 msgid "_Queue/Unqueue"
 msgstr "_Formar/Desformar"
 
-#: src/gtkui/menus.cc:250
+#: src/gtkui/menus.cc:213 src/qtui/menus.cc:299
 msgid "_Open Containing Folder"
 msgstr "A_brir Carpeta Contenedora"
 
-#: src/gtkui/menus.cc:253
+#: src/gtkui/menus.cc:214 src/qtui/menus.cc:301
+msgid "_Refresh Selected"
+msgstr "_Recargar Seleccionado"
+
+#: src/gtkui/menus.cc:216 src/qtui/menus.cc:304
 msgid "Cu_t"
 msgstr "Cor_tar"
 
-#: src/gtkui/menus.cc:254
+#: src/gtkui/menus.cc:217 src/qtui/menus.cc:305
 msgid "_Copy"
 msgstr "_Copiar"
 
-#: src/gtkui/menus.cc:255
+#: src/gtkui/menus.cc:218 src/qtui/menus.cc:306
 msgid "_Paste"
 msgstr "_Pegar"
 
-#: src/gtkui/menus.cc:256
+#: src/gtkui/menus.cc:219 src/qtui/menus.cc:307
+msgid "Paste at _End"
+msgstr "Copiar al _Final"
+
+#: src/gtkui/menus.cc:220 src/qtui/menus.cc:309
 msgid "Select _All"
 msgstr "Seleccion_ar todo"
 
-#: src/gtkui/menus.cc:263
+#: src/gtkui/menus.cc:227 src/moonstone/playlist_tabs.cc:309
+#: src/qtui/playlist_tabs.cc:334
 msgid "_Rename ..."
 msgstr "_Renombrar ..."
 
-#: src/gtkui/settings.cc:35
+#: src/gtkui/settings.cc:35 src/qtui/settings.cc:59
+msgid "Always"
+msgstr "Siempre"
+
+#: src/gtkui/settings.cc:36 src/qtui/settings.cc:60
+msgid "Auto-hide"
+msgstr "Auto ocultar"
+
+#: src/gtkui/settings.cc:37 src/qtui/settings.cc:61
+msgid "Never"
+msgstr "Nunca"
+
+#: src/gtkui/settings.cc:41 src/qtui/settings.cc:64
 msgid "Playlist Tabs"
 msgstr "Pestañas de Listas de Reproducción"
 
-#: src/gtkui/settings.cc:36
-msgid "Always show tabs"
-msgstr "Siempre mostrar pestañas"
+#: src/gtkui/settings.cc:42 src/qtui/settings.cc:65
+msgid "Show playlist tabs:"
+msgstr "Muestra pestañas de lista de rep.:"
 
-#: src/gtkui/settings.cc:38
+#: src/gtkui/settings.cc:45 src/qtui/settings.cc:69
 msgid "Show entry counts"
 msgstr "Mostrar total de entradas"
 
-#: src/gtkui/settings.cc:40
+#: src/gtkui/settings.cc:47 src/qtui/settings.cc:72
 msgid "Show close buttons"
 msgstr "Mostrar botones para cerrar"
 
-#: src/gtkui/settings.cc:42
+#: src/gtkui/settings.cc:49 src/qtui/settings.cc:75
 msgid "Playlist Columns"
 msgstr "Columnas de Listas de Reproducción"
 
-#: src/gtkui/settings.cc:44
+#: src/gtkui/settings.cc:51 src/qtui/settings.cc:77
 msgid "Show column headers"
 msgstr "Mostrar encabezados de columna"
 
-#: src/gtkui/settings.cc:46 src/modplug/plugin_main.cc:106
-#: src/skins/skins_cfg.cc:263
-msgid "Miscellaneous"
-msgstr "Misceláneo"
+#: src/gtkui/settings.cc:53 src/qtui/settings.cc:82
+msgid "Make column headers clickable for sorting"
+msgstr ""
 
-#: src/gtkui/settings.cc:47
-msgid "Arrow keys seek by:"
-msgstr "Teclas de flechas buscan por:"
+#: src/gtkui/settings.cc:56
+msgid "Use symbolic icons in toolbar"
+msgstr "Usar iconos simbólicos en barra de herramientas"
 
-#: src/gtkui/settings.cc:50
+#: src/gtkui/settings.cc:58 src/qtui/settings.cc:86
 msgid "Scroll on song change"
 msgstr "Desplazar al cambiar de pista"
 
-#: src/gtkui/ui_gtk.cc:71
+#: src/gtkui/ui_gtk.cc:82
 msgid "GTK Interface"
 msgstr "Interfaz GTK"
 
-#: src/gtkui/ui_gtk.cc:222 src/skins/ui_main.cc:232
+#: src/gtkui/ui_gtk.cc:219 src/skins/main.cc:228 src/skins-qt/main.cc:231
 #, c-format
 msgid "%s - Audacious"
 msgstr "%s - Audacious"
 
-#: src/gtkui/ui_gtk.cc:225 src/qtui/main_window.cc:186
+#: src/gtkui/ui_gtk.cc:221 src/moonstone/main_window.cc:184
+#: src/qtui/main_window.cc:385
 msgid "Buffering ..."
 msgstr "Almacenando en buffer..."
 
-#: src/gtkui/ui_gtk.cc:228 src/skins/ui_main.cc:234 src/skins/ui_main.cc:1164
+#: src/gtkui/ui_gtk.cc:224 src/pipewire/pipewire.cc:402 src/skins/main.cc:230
+#: src/skins-qt/main.cc:233
 msgid "Audacious"
 msgstr "Audacious"
 
-#: src/gtkui/ui_statusbar.cc:63 src/qtui/status_bar.cc:67
+#: src/gtkui/ui_gtk.cc:487 src/gtkui/ui_gtk.cc:518 src/gtkui/ui_gtk.cc:882
+#: src/hotkey/gui.cc:72 src/moonstone/main_window.cc:67
+#: src/moonstone/main_window.cc:145 src/moonstone/main_window.cc:146
+#: src/notify/osd.cc:85 src/qthotkey/gui.cc:67 src/qtui/main_window.cc:154
+#: src/qtui/main_window.cc:347 src/qtui/main_window.cc:348
+#: src/skins/menus.cc:109 src/skins-qt/menus.cc:100
+msgid "Play"
+msgstr "Reproducir"
+
+#: src/gtkui/ui_gtk.cc:487 src/moonstone/main_window.cc:151
+#: src/moonstone/main_window.cc:152 src/notify/osd.cc:82
+#: src/qtui/main_window.cc:353 src/qtui/main_window.cc:354
+#: src/skins/menus.cc:110 src/skins-qt/menus.cc:101
+msgid "Pause"
+msgstr "Pausa"
+
+#: src/gtkui/ui_gtk.cc:868 src/moonstone/main_window.cc:57
+#: src/qtui/main_window.cc:145 src/skins/menus.cc:86 src/skins-qt/menus.cc:77
+msgid "Search Library"
+msgstr "Buscar Librería"
+
+#: src/gtkui/ui_gtk.cc:875 src/moonstone/main_window.cc:60
+#: src/qtui/main_window.cc:147
+msgid "Open Files"
+msgstr "Abrir Archivos"
+
+#: src/gtkui/ui_gtk.cc:876 src/moonstone/main_window.cc:62
+#: src/qtui/main_window.cc:149
+msgid "Add Files"
+msgstr "Agregar Archivos"
+
+#: src/gtkui/ui_gtk.cc:881 src/moonstone/main_window.cc:65
+#: src/qtui/main_window.cc:152 src/skins/menus.cc:112 src/skins-qt/menus.cc:103
+msgid "Previous"
+msgstr "Anterior"
+
+#: src/gtkui/ui_gtk.cc:883 src/hotkey/gui.cc:74 src/moonstone/main_window.cc:69
+#: src/qthotkey/gui.cc:69 src/qtui/main_window.cc:156 src/skins/menus.cc:111
+#: src/skins-qt/menus.cc:102
+msgid "Stop"
+msgstr "Detener"
+
+#: src/gtkui/ui_gtk.cc:884 src/moonstone/main_window.cc:76 src/notify/osd.cc:89
+#: src/qtui/main_window.cc:163 src/skins/menus.cc:113 src/skins-qt/menus.cc:104
+msgid "Next"
+msgstr "Siguiente"
+
+#: src/gtkui/ui_gtk.cc:886 src/moonstone/main_window.cc:79
+#: src/qtui/main_window.cc:166 src/qtui/menus.cc:254 src/skins/menus.cc:79
+#: src/skins-qt/menus.cc:69
+msgid "Record Stream"
+msgstr "Grabar Stream"
+
+#: src/gtkui/ui_gtk.cc:919 src/moonstone/main_window.cc:86
+#: src/qtui/main_window.cc:173 src/skins/menus.cc:103 src/skins-qt/menus.cc:94
+msgid "Repeat"
+msgstr "Repetir"
+
+#: src/gtkui/ui_gtk.cc:922 src/moonstone/main_window.cc:89
+#: src/qtui/main_window.cc:176 src/skins/menus.cc:104 src/skins-qt/menus.cc:95
+msgid "Shuffle"
+msgstr "Aleatorio"
+
+#: src/gtkui/ui_gtk.cc:1114 src/qtui/main_window.cc:123
+msgid "Menu"
+msgstr "Menú"
+
+#: src/gtkui/ui_statusbar.cc:64 src/qtui/status_bar.cc:155
 msgid "mono"
 msgstr "monoaural"
 
-#: src/gtkui/ui_statusbar.cc:65 src/qtui/status_bar.cc:69
+#: src/gtkui/ui_statusbar.cc:66 src/qtui/status_bar.cc:157
 msgid "stereo"
 msgstr "estéreo"
 
-#: src/gtkui/ui_statusbar.cc:67 src/qtui/status_bar.cc:71
+#: src/gtkui/ui_statusbar.cc:68 src/qtui/status_bar.cc:160
 #, c-format
 msgid "%d channel"
 msgid_plural "%d channels"
 msgstr0 "%d canal"
 msgstr1 "%d canales"
+msgstr2 "%d canales"
 
-#: src/gtkui/ui_statusbar.cc:81 src/qtui/status_bar.cc:85
+#: src/gtkui/ui_statusbar.cc:76 src/qtui/status_bar.cc:168
 #, c-format
-msgid "%d kbps"
-msgstr "%d kbps"
+msgid "%d kHz"
+msgstr "%d kHz"
 
-#: src/gtkui/ui_statusbar.cc:107 src/skins/ui_main_evlisteners.cc:103
+#: src/gtkui/ui_statusbar.cc:82 src/qtui/status_bar.cc:174
+#, c-format
+msgid "%d kbit/s"
+msgstr "%d kbit/s"
+
+#: src/gtkui/ui_statusbar.cc:108 src/skins/main.cc:478 src/skins-qt/main.cc:461
 msgid "Single mode."
 msgstr "Modo sencillo."
 
-#: src/gtkui/ui_statusbar.cc:109 src/skins/ui_main_evlisteners.cc:105
+#: src/gtkui/ui_statusbar.cc:110 src/skins/main.cc:480 src/skins-qt/main.cc:463
 msgid "Playlist mode."
 msgstr "Modo Lista de Reproducción."
 
-#: src/gtkui/ui_statusbar.cc:117 src/skins/ui_main_evlisteners.cc:111
+#: src/gtkui/ui_statusbar.cc:118 src/skins/main.cc:486 src/skins-qt/main.cc:469
 msgid "Stopping after song."
 msgstr "Detener después de la pista."
 
-#: src/hotkey/gui.cc:71
+#: src/hotkey/gui.cc:71 src/qthotkey/gui.cc:66
 msgid "Previous track"
 msgstr "Pista previa"
 
-#: src/hotkey/gui.cc:72 src/notify/osd.cc:69 src/qtui/main_window.cc:69
-#: src/qtui/main_window.cc:172 src/qtui/main_window.cc:173
-#: src/skins/menus.cc:87
-msgid "Play"
-msgstr "Reproducir"
-
-#: src/hotkey/gui.cc:73
+#: src/hotkey/gui.cc:73 src/qthotkey/gui.cc:68
 msgid "Pause/Resume"
 msgstr "Pausa/Continuar"
 
-#: src/hotkey/gui.cc:74 src/qtui/main_window.cc:70 src/skins/menus.cc:89
-msgid "Stop"
-msgstr "Detener"
-
-#: src/hotkey/gui.cc:75
+#: src/hotkey/gui.cc:75 src/qthotkey/gui.cc:70
 msgid "Next track"
 msgstr "Pista siguiente"
 
-#: src/hotkey/gui.cc:76
-msgid "Forward 5 seconds"
-msgstr "Avanza 5 segundos"
-
-#: src/hotkey/gui.cc:77
-msgid "Rewind 5 seconds"
-msgstr "Retrocede 5 segundos"
+#: src/hotkey/gui.cc:76 src/qthotkey/gui.cc:71
+msgid "Step forward"
+msgstr "Adelantar"
+
+#: src/hotkey/gui.cc:77 src/qthotkey/gui.cc:72
+msgid "Step backward"
+msgstr "Atrasar"
 
-#: src/hotkey/gui.cc:78
+#: src/hotkey/gui.cc:78 src/qthotkey/gui.cc:73
 msgid "Mute"
 msgstr "Silenciar"
 
-#: src/hotkey/gui.cc:79
+#: src/hotkey/gui.cc:79 src/qthotkey/gui.cc:74
 msgid "Volume up"
 msgstr "Aumentar volumen"
 
-#: src/hotkey/gui.cc:80
+#: src/hotkey/gui.cc:80 src/qthotkey/gui.cc:75
 msgid "Volume down"
 msgstr "Disminuir volumen"
 
-#: src/hotkey/gui.cc:81
+#: src/hotkey/gui.cc:81 src/qthotkey/gui.cc:76
 msgid "Jump to file"
 msgstr "Saltar al archivo"
 
-#: src/hotkey/gui.cc:82
+#: src/hotkey/gui.cc:82 src/qthotkey/gui.cc:77
 msgid "Toggle player window(s)"
 msgstr "Cambiar ventana(s) del reproductor"
 
-#: src/hotkey/gui.cc:83
+#: src/hotkey/gui.cc:83 src/qthotkey/gui.cc:78
 msgid "Show On-Screen-Display"
 msgstr "Mostrar Notificaciones en Pantalla"
 
-#: src/hotkey/gui.cc:84
+#: src/hotkey/gui.cc:84 src/qthotkey/gui.cc:79
 msgid "Toggle repeat"
 msgstr "Repetir"
 
-#: src/hotkey/gui.cc:85
+#: src/hotkey/gui.cc:85 src/qthotkey/gui.cc:80
 msgid "Toggle shuffle"
 msgstr "Aleatorio"
 
-#: src/hotkey/gui.cc:86
+#: src/hotkey/gui.cc:86 src/qthotkey/gui.cc:81
 msgid "Toggle stop after current"
 msgstr "Detener después de actual"
 
-#: src/hotkey/gui.cc:87
+#: src/hotkey/gui.cc:87 src/qthotkey/gui.cc:82
 msgid "Raise player window(s)"
 msgstr "Aumentar ventanas(s) del reproductor"
 
-#: src/hotkey/gui.cc:97
+#: src/hotkey/gui.cc:98 src/qthotkey/gui.cc:100
 msgid "(none)"
 msgstr "(ninguno)"
 
-#: src/hotkey/gui.cc:234
+#: src/hotkey/gui.cc:261
 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 modifiers.\n"
 "\n"
 "Do you want to continue?"
 msgstr ""
@@ -2170,11 +2229,11 @@
 "\n"
 "¿Quieres continuar?"
 
-#: src/hotkey/gui.cc:236
+#: src/hotkey/gui.cc:264
 msgid "Binding mouse buttons"
 msgstr "Asociar botones del ratón"
 
-#: src/hotkey/gui.cc:391
+#: src/hotkey/gui.cc:434
 msgid ""
 "Press a key combination inside a text field.\n"
 "You can also bind mouse buttons."
@@ -2182,73 +2241,100 @@
 "Presiona una combinación de teclas dentro de un campo de texto.\n"
 "También puedes asociar botones del ratón."
 
-#: src/hotkey/gui.cc:396
+#: src/hotkey/gui.cc:444 src/qthotkey/gui.cc:179
 msgid "Hotkeys:"
 msgstr "Atajos del teclado:"
 
-#: src/hotkey/gui.cc:413
+#: src/hotkey/gui.cc:457 src/qthotkey/gui.cc:181
 msgid "Action:"
 msgstr "Acción:"
 
-#: src/hotkey/gui.cc:420
+#: src/hotkey/gui.cc:461 src/qthotkey/gui.cc:182
 msgid "Key Binding:"
 msgstr "Asociación de Teclas:"
 
-#: src/hotkey/gui.cc:468
+#: src/hotkey/gui.cc:518 src/qthotkey/gui.cc:184
 msgid "_Add"
 msgstr "_Agregar"
 
-#: src/hotkey/plugin.cc:61
+#: src/hotkey/plugin.cc:59 src/qthotkey/plugin.cc:78
 msgid "Global Hotkeys"
 msgstr "Hotkeys Globales"
 
-#: src/hotkey/plugin.cc:79
+#: src/hotkey/plugin.cc:74
 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"
+"Contributors 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 ""
-"Plugin Global Hotkey \n"
-"Controla el reproductor con las combinaciones de teclas globales o teclas "
-"multimedia.\n"
+"Global Hotkey Plugin\n"
+"Controla el reproductor con combinaciones de teclas globales o multimedia.\n"
 "\n"
 "Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n"
 "\n"
-"Quines contribuyeron incluyen:\n"
+"Colaboradores 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/jack-ng/jack-ng.cc:49
+#: src/jack/jack-ng.cc:54
 msgid "JACK Output"
 msgstr "Salida JACK"
 
-#: src/jack-ng/jack-ng.cc:114
+#: src/jack/jack-ng.cc:126
+msgid "Client name:"
+msgstr "Nombre del cliente:"
+
+#: src/jack/jack-ng.cc:128
 msgid "Automatically connect to output ports"
 msgstr "Automáticamente conectar a puertos de salida"
 
-#: src/jack-ng/jack-ng.cc:155
+#: src/jack/jack-ng.cc:130
+msgid "Filter ports (regex, use any port if blank):"
+msgstr "Filtrar puertos (regex, usa cualquier puerto si está vacío):"
+
+#: src/jack/jack-ng.cc:136
+msgid "Connect to physical ports only"
+msgstr "Conectar solo a puestos físicos"
+
+#: src/jack/jack-ng.cc:139
+msgid "Upmix to"
+msgstr "mezclar a "
+
+#: src/jack/jack-ng.cc:141
+msgid "ports if input has fewer channels"
+msgstr "puertos si entrada tiene menos canales"
+
+#: src/jack/jack-ng.cc:143
+msgid "Ignore insufficient number of ports"
+msgstr "Ignorar número insuficiente de puertos"
+
+#: src/jack/jack-ng.cc:181
+msgid "No JACK output ports were found. Please check settings."
+msgstr "No se encontraron puertos de salida JACK. Verifica configuración."
+
+#: src/jack/jack-ng.cc:195
 #, c-format
 msgid "Only %d JACK output ports were found but %d are required."
 msgstr ""
 "Solo %d puertos de salida JACK fueron encontrados pero %d son requeridos."
 
-#: src/jack-ng/jack-ng.cc:164
+#: src/jack/jack-ng.cc:210
 #, c-format
 msgid "Failed to connect to JACK port %s."
 msgstr "Falla al conectar al puerto JACK %s."
 
-#: src/jack-ng/jack-ng.cc:184
+#: src/jack/jack-ng.cc:230
 msgid ""
 "JACK supports only floating-point audio. You must change the output bit "
 "depth to floating-point in Audacious settings."
@@ -2256,11 +2342,11 @@
 "JACK solo soporta audio de punto flotante. Debes cambiar la profundidad de "
 "bit de salida a punto flotante en las preferencias de Audacious."
 
-#: src/jack-ng/jack-ng.cc:197
+#: src/jack/jack-ng.cc:245
 msgid "Failed to connect to the JACK server; is it running?"
 msgstr "Falla al conectar al servidor JACK; ¿Se está ejecutando?"
 
-#: src/jack-ng/jack-ng.cc:273
+#: src/jack/jack-ng.cc:321
 #, c-format
 msgid ""
 "The JACK server requires a sample rate of %d Hz, but Audacious is playing at "
@@ -2270,16 +2356,16 @@
 "reproduciendo a %d Hz. Por favor utiliza el efecto de Convertidor de Tasa de "
 "Muestra para corregir la discordancia."
 
-#: src/ladspa/plugin.cc:414
+#: src/ladspa/plugin.cc:416
 #, c-format
 msgid "%s Settings"
 msgstr "Ajustes %s"
 
-#: src/ladspa/plugin.cc:478
+#: src/ladspa/plugin.cc:482
 msgid "Module paths:"
 msgstr "Rutas de Módulos:"
 
-#: src/ladspa/plugin.cc:483
+#: src/ladspa/plugin.cc:487
 msgid ""
 "Separate multiple paths with a colon.\n"
 "These paths are searched in addition to LADSPA_PATH.\n"
@@ -2290,25 +2376,25 @@
 "Después de agregar nuevas rutas, presiona Intro para buscar plugins nuevos.</"
 "small>"
 
-#: src/ladspa/plugin.cc:499
+#: src/ladspa/plugin.cc:508
 msgid "Available plugins:"
 msgstr "Plugins disponibles:"
 
-#: src/ladspa/plugin.cc:512 src/modplug/plugin_main.cc:92
-#: src/modplug/plugin_main.cc:95 src/modplug/plugin_main.cc:98
-#: src/modplug/plugin_main.cc:101
+#: src/ladspa/plugin.cc:521 src/modplug/plugin_main.cc:91
+#: src/modplug/plugin_main.cc:94 src/modplug/plugin_main.cc:97
+#: src/modplug/plugin_main.cc:100
 msgid "Enable"
 msgstr "Habilitar"
 
-#: src/ladspa/plugin.cc:518
+#: src/ladspa/plugin.cc:527
 msgid "Enabled plugins:"
 msgstr "Habilitar plugins:"
 
-#: src/ladspa/plugin.cc:534
+#: src/ladspa/plugin.cc:543
 msgid "Settings"
 msgstr "Ajustes"
 
-#: src/ladspa/plugin.cc:551
+#: src/ladspa/plugin.cc:560
 msgid ""
 "LADSPA Host for Audacious\n"
 "Copyright 2011 John Lindgren"
@@ -2324,7 +2410,7 @@
 msgid "LIRC Plugin"
 msgstr "Plugin LIRC"
 
-#: src/lirc/lirc.cc:381
+#: src/lirc/lirc.cc:379
 msgid ""
 "A simple plugin to control Audacious using the LIRC remote control daemon\n"
 "\n"
@@ -2353,63 +2439,123 @@
 "\n"
 "Para más información acerca de LIRC, ve a http://lirc.org."
 
-#: src/lirc/lirc.cc:392
+#: src/lirc/lirc.cc:390
 msgid "Connection"
 msgstr "Conexión"
 
-#: src/lirc/lirc.cc:393
+#: src/lirc/lirc.cc:391
 msgid "Reconnect to LIRC server"
 msgstr "Reconectar a servidor LIRC"
 
-#: src/lirc/lirc.cc:395
+#: src/lirc/lirc.cc:393
 msgid "Wait before reconnecting:"
 msgstr "Espera entes de reconectar:"
 
-#: src/lyricwiki/lyricwiki.cc:41
-msgid "LyricWiki Plugin"
-msgstr "Plugin LyricWiki"
-
-#: src/lyricwiki/lyricwiki.cc:131 src/lyricwiki-qt/lyricwiki.cc:136
-msgid "No lyrics available"
-msgstr "Letras de canción no disponibles"
-
-#: src/lyricwiki/lyricwiki.cc:217 src/lyricwiki/lyricwiki.cc:226
-#: src/lyricwiki/lyricwiki.cc:243 src/lyricwiki/lyricwiki.cc:252
-#: src/lyricwiki/lyricwiki.cc:267 src/lyricwiki-qt/lyricwiki.cc:222
-#: src/lyricwiki-qt/lyricwiki.cc:231 src/lyricwiki-qt/lyricwiki.cc:248
-#: src/lyricwiki-qt/lyricwiki.cc:257 src/lyricwiki-qt/lyricwiki.cc:272
-msgid "Error"
-msgstr "Error"
-
-#: src/lyricwiki/lyricwiki.cc:218 src/lyricwiki/lyricwiki.cc:244
-#: src/lyricwiki-qt/lyricwiki.cc:223 src/lyricwiki-qt/lyricwiki.cc:249
+#: src/lyrics-common/chart_lyrics_provider.cc:93
+#: src/lyrics-common/chart_lyrics_provider.cc:150
+#: src/lyrics-common/lyrics_ovh_provider.cc:50
 #, c-format
 msgid "Unable to fetch %s"
 msgstr "Incapaz de traer %s"
 
-#: src/lyricwiki/lyricwiki.cc:227 src/lyricwiki/lyricwiki.cc:253
-#: src/lyricwiki-qt/lyricwiki.cc:232 src/lyricwiki-qt/lyricwiki.cc:258
+#: src/lyrics-common/chart_lyrics_provider.cc:100
+#: src/lyrics-common/chart_lyrics_provider.cc:157
+#: src/lyrics-common/lyrics_ovh_provider.cc:57
 #, c-format
 msgid "Unable to parse %s"
 msgstr "Incapaz de analizar %s"
 
-#: src/lyricwiki/lyricwiki.cc:259 src/lyricwiki-qt/lyricwiki.cc:264
+#: src/lyrics-common/chart_lyrics_provider.cc:121
+#: src/lyrics-common/chart_lyrics_provider.cc:194
+#: src/lyrics-common/lyrics_ovh_provider.cc:88
 msgid "Looking for lyrics ..."
 msgstr "Buscando letras de canción ..."
 
-#: src/lyricwiki/lyricwiki.cc:267 src/lyricwiki-qt/lyricwiki.cc:272
-msgid "Missing song metadata"
-msgstr "Sin metadatos de pista"
-
-#: src/lyricwiki/lyricwiki.cc:278 src/lyricwiki-qt/lyricwiki.cc:283
-msgid "Connecting to lyrics.wikia.com ..."
-msgstr "Conectando a lyrics.wikia.com ..."
-
-#: src/lyricwiki-qt/lyricwiki.cc:55
-msgid "LyricWiki Plugin (Qt)"
-msgstr "Plugin LyricWiki (Qt)"
+#: src/lyrics-common/preferences.h:43
+msgid "Nowhere"
+msgstr "Ninguna parte"
+
+#: src/lyrics-common/preferences.h:49
+msgid "Artist is truncated at the start, Title -- at the end"
+msgstr "Artista está recortado al inicio, Título -- al final"
+
+#: src/lyrics-common/preferences.h:50
+msgid "Chars to truncate on:"
+msgstr "Caracteres recortados en:"
+
+#: src/lyrics-common/preferences.h:54
+msgid "Chars are ORed in RegExp, surrounded by whitespace"
+msgstr "Caracteres están ORed en RegExp, rodeados de espacios"
+
+#: src/lyrics-common/preferences.h:55
+msgid "Chars to split on:"
+msgstr "Caracteres a separar en:"
+
+#: src/lyrics-common/preferences.h:56
+msgid "Further truncate those on chars"
+msgstr "Además recortar esos en caracteres"
+
+#: src/lyrics-common/preferences.h:62
+msgid "General"
+msgstr "General"
+
+#: src/lyrics-common/preferences.h:63
+msgid "Split title into artist and title on chars"
+msgstr "Separar título en artista y título en caracteres"
+
+#: src/lyrics-common/preferences.h:66
+msgid "Sources"
+msgstr "Fuentes"
+
+#: src/lyrics-common/preferences.h:67
+msgid "Use embedded lyrics (from Lyrics tag)"
+msgstr "Usar letras incluidas (del tag Lyrics)"
+
+#: src/lyrics-common/preferences.h:69
+msgid "Fetch lyrics from internet:"
+msgstr "Obtener letras de internet"
+
+#: src/lyrics-common/preferences.h:72
+msgid "Store fetched lyrics in local cache"
+msgstr "Almacenar letras en caché local"
+
+#: src/lyrics-common/preferences.h:74
+msgid "Local Storage"
+msgstr "Almacenamiento Local"
+
+#: src/lyrics-common/preferences.h:75
+msgid "Load lyric files (.lrc) from local storage"
+msgstr "Cargar archivos de letras (.lrc) del almacenamiento local"
+
+#: src/lyrics-common/utils.cc:54 src/ui-common/dialogs-qt.cc:63
+msgid "Error"
+msgstr "Error"
+
+#: src/lyrics-common/utils.cc:60
+msgid "Lyrics could not be found."
+msgstr "No se encontraron letras."
+
+#: src/lyrics-common/utils.cc:142
+msgid "Missing title and/or artist."
+msgstr "Falta título y/o artista."
+
+#: src/lyrics-gtk/lyrics-gtk.cc:37 src/lyrics-qt/lyrics-qt.cc:50
+msgid "Lyrics"
+msgstr "Letras"
+
+#: src/lyrics-gtk/lyrics-gtk.cc:189 src/lyrics-qt/lyrics-qt.cc:171
+msgid "Edit Lyrics ..."
+msgstr "Editar Letras..."
+
+#: src/lyrics-gtk/lyrics-gtk.cc:195 src/lyrics-qt/lyrics-qt.cc:178
+msgid "Save Locally"
+msgstr "Guardar Localmente"
+
+#: src/lyrics-gtk/lyrics-gtk.cc:201 src/lyrics-qt/lyrics-qt.cc:186
+msgid "Refresh"
+msgstr "Actualizar"
 
-#: src/m3u/m3u.cc:32
+#: src/m3u/m3u.cc:33
 msgid "M3U Playlists"
 msgstr "Listas de Reproducción M3U"
 
@@ -2417,17 +2563,17 @@
 msgid "Tact Generator"
 msgstr "Generador Tact"
 
-#: src/metronom/metronom.cc:147
+#: src/metronom/metronom.cc:145
 #, c-format
 msgid "Tact generator: %d bpm"
 msgstr "Generador de tact: %d bpm"
 
-#: src/metronom/metronom.cc:149
+#: src/metronom/metronom.cc:147
 #, c-format
 msgid "Tact generator: %d bpm %d/%d"
 msgstr "Generador de tact: %d bpm %d/%d"
 
-#: src/metronom/metronom.cc:237
+#: src/metronom/metronom.cc:235
 msgid ""
 "A Tact Generator by Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
 "\n"
@@ -2441,11 +2587,11 @@
 "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/mixer/mixer.cc:38
+#: src/mixer/mixer.cc:43
 msgid "Channel Mixer"
 msgstr "Mezclador de Canales"
 
-#: src/mixer/mixer.cc:202
+#: src/mixer/mixer.cc:255
 msgid ""
 "Channel Mixer Plugin for Audacious\n"
 "Copyright 2011-2012 John Lindgren and Michał Lipski"
@@ -2453,11 +2599,11 @@
 "Plugin Mezclador de Canales para Audacious.\n"
 "Copyright 2011-2012 John Lindgren and Michał Lipski"
 
-#: src/mixer/mixer.cc:206
+#: src/mixer/mixer.cc:259
 msgid "Channel Mixer"
 msgstr "Mezclador de Canales"
 
-#: src/mixer/mixer.cc:207
+#: src/mixer/mixer.cc:260
 msgid "Output channels:"
 msgstr "Canales de salida:"
 
@@ -2469,168 +2615,176 @@
 msgid "Error connecting to MMS server"
 msgstr "Error al conectar al servidor MMS"
 
-#: src/modplug/modplugbmp.h:53
+#: src/modplug/modplugbmp.h:57
 msgid "ModPlug (Module Player)"
 msgstr "ModPlug (reproducor Module)"
 
-#: src/modplug/plugin_main.cc:53
-msgid "Resolution"
-msgstr "Resolución"
-
-#: src/modplug/plugin_main.cc:54
-msgid "8-bit"
-msgstr "8-bit"
-
 #: src/modplug/plugin_main.cc:55
-msgid "16-bit"
-msgstr "16-bit"
-
-#: src/modplug/plugin_main.cc:56
 msgid "Channels"
 msgstr "Canales"
 
-#: src/modplug/plugin_main.cc:60
+#: src/modplug/plugin_main.cc:59
 msgid "Nearest (fastest)"
 msgstr "Más cercano (más rápido)"
 
-#: src/modplug/plugin_main.cc:61
+#: src/modplug/plugin_main.cc:60
 msgid "Linear (fast)"
 msgstr "Linear (rápido)"
 
-#: src/modplug/plugin_main.cc:62
+#: src/modplug/plugin_main.cc:61
 msgid "Spline (good)"
 msgstr "Ranura (bueno)"
 
-#: src/modplug/plugin_main.cc:63
+#: src/modplug/plugin_main.cc:62
 msgid "Polyphase (best)"
 msgstr "Polifase (mejor)"
 
-#: src/modplug/plugin_main.cc:64
+#: src/modplug/plugin_main.cc:63
 msgid "Sample rate"
 msgstr "Tasa de Muestreo"
 
-#: src/modplug/plugin_main.cc:65
+#: src/modplug/plugin_main.cc:64
 msgid "22 kHz"
 msgstr "22 kHz"
 
-#: src/modplug/plugin_main.cc:66
+#: src/modplug/plugin_main.cc:65
 msgid "44 kHz"
 msgstr "44 kHz"
 
-#: src/modplug/plugin_main.cc:67
+#: src/modplug/plugin_main.cc:66
 msgid "48 kHz"
 msgstr "48 kHz"
 
-#: src/modplug/plugin_main.cc:68
+#: src/modplug/plugin_main.cc:67
 msgid "96 kHz"
 msgstr "96 kHz"
 
-#: src/modplug/plugin_main.cc:72 src/modplug/plugin_main.cc:77
-#: src/modplug/plugin_main.cc:82
+#: src/modplug/plugin_main.cc:71 src/modplug/plugin_main.cc:76
+#: src/modplug/plugin_main.cc:81
 msgid "Level:"
 msgstr "Nivel:"
 
-#: src/modplug/plugin_main.cc:78
+#: src/modplug/plugin_main.cc:77
 msgid "Cutoff:"
 msgstr "Corte:"
 
-#: src/modplug/plugin_main.cc:91
+#: src/modplug/plugin_main.cc:90
 msgid "Reverb"
 msgstr "Reverberación"
 
-#: src/modplug/plugin_main.cc:94
+#: src/modplug/plugin_main.cc:93
 msgid "Bass Boost"
 msgstr "Bass Boost"
 
-#: src/modplug/plugin_main.cc:97
+#: src/modplug/plugin_main.cc:96
 msgid "Surround"
 msgstr "Envolvente"
 
-#: src/modplug/plugin_main.cc:100
+#: src/modplug/plugin_main.cc:99
 msgid "Preamp"
 msgstr "Preamplificador"
 
-#: src/modplug/plugin_main.cc:107
+#: src/modplug/plugin_main.cc:106
 msgid "Oversample"
 msgstr "Sobremuestra"
 
-#: src/modplug/plugin_main.cc:108
+#: src/modplug/plugin_main.cc:107
 msgid "Noise reduction"
 msgstr "Reducción de ruido"
 
-#: src/modplug/plugin_main.cc:109
+#: src/modplug/plugin_main.cc:108
 msgid "Play Amiga MODs"
 msgstr "Reproducir MODs Amiga"
 
-#: src/modplug/plugin_main.cc:110
+#: src/modplug/plugin_main.cc:109
 msgid "Repeat"
 msgstr "Repetir"
 
-#: src/modplug/plugin_main.cc:111
+#: src/modplug/plugin_main.cc:110
 msgid "Repeat count:"
 msgstr "Cuenta de repetición:"
 
-#: src/modplug/plugin_main.cc:112
+#: src/modplug/plugin_main.cc:111
 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.cc:125 src/sid/xs_config.cc:106
+#: src/modplug/plugin_main.cc:124 src/sid/xs_config.cc:106
 msgid "These settings will take effect when Audacious is restarted."
 msgstr "Estos ajustes tomarán efecto cuando Audacious reinicie."
 
+#: src/moonstone/main_window.cc:72 src/moonstone/main_window.cc:73
+#: src/qtui/main_window.cc:159 src/qtui/main_window.cc:160
+#: src/skins/menus.cc:107 src/skins-qt/menus.cc:98
+msgid "Stop After This Song"
+msgstr "Detener Al Terminar Esta Pista"
+
+#: src/moonstone/moonstone.cc:39
+msgid "Moonstone"
+msgstr "Moonstone"
+
+#: src/moonstone/playlist_header.cc:212 src/qtui/playlist_header.cc:258
+msgid "Reset to Defaults"
+msgstr "Resetear a Predeterminados"
+
+#: src/moonstone/playlist_model.cc:38 src/qtui/playlist_header.cc:232
+msgid "Now Playing"
+msgstr "Reproduciendo"
+
+#: src/moonstone/playlist_selection.cc:66
+#: src/playlist-manager/playlist-manager.cc:201
+#: src/playlist-manager-qt/playlist-manager-qt.cc:190
+msgid "Entries"
+msgstr "Entradas"
+
 #: src/mpg123/mpg123.cc:54
 msgid "MPG123 Plugin"
 msgstr "Plugin MPG123"
 
-#: src/mpg123/mpg123.cc:83
-msgid "Advanced"
-msgstr "Avanzado"
-
-#: src/mpg123/mpg123.cc:84
+#: src/mpg123/mpg123.cc:82
 msgid "Use accurate length calculation (slow)"
 msgstr "Usar el cálculo preciso de longitud (lento)"
 
-#: src/mpg123/mpg123.cc:248
+#: src/mpg123/mpg123.cc:260
 msgid "Surround"
 msgstr "Envolvente"
 
-#: src/mpris2/plugin.cc:39
+#: src/mpris2/plugin.cc:40
 msgid "MPRIS 2 Server"
 msgstr "Servidor MPRIS 2"
 
-#: src/neon/neon.cc:97
+#: src/neon/neon.cc:102
 msgid "Neon HTTP/HTTPS Plugin"
 msgstr "Plugin Neon HTTP/HTTPS"
 
-#: src/neon/neon.cc:521
+#: src/neon/neon.cc:526
 msgid "Error parsing redirect"
 msgstr "Error al analizar redirección"
 
-#: src/neon/neon.cc:535
+#: src/neon/neon.cc:540
 msgid "Unknown HTTP error"
 msgstr "Error HTTP desconocido"
 
-#: src/neon/neon.cc:569
+#: src/neon/neon.cc:614
 msgid "Error parsing URL"
 msgstr "Error al analizar URL"
 
-#: src/neon/neon.cc:632
+#: src/neon/neon.cc:687
 msgid "Too many redirects"
 msgstr "Demasiadas redirecciones"
 
-#: src/notify/event.cc:64
+#: src/notify/event.cc:97
 msgid "Stopped"
 msgstr "Detenido"
 
-#: src/notify/event.cc:64
+#: src/notify/event.cc:97
 msgid "Audacious is not playing."
 msgstr "Audacious no está reproduciendo."
 
-#: src/notify/notify.cc:42
+#: src/notify/notify.cc:39
 msgid "Desktop Notifications"
 msgstr "Notificaciones en Escritorio"
 
-#: src/notify/notify.cc:60
+#: src/notify/notify.cc:57
 msgid ""
 "Desktop Notifications Plugin for Audacious\n"
 "Copyright (C) 2010 Maximilian Bogner\n"
@@ -2666,36 +2820,81 @@
 "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.cc:110
+#: src/notify/notify.cc:104
 msgid "Show playback controls"
 msgstr "Mostrar los controles de reproducción"
 
-#: src/notify/notify.cc:112
+#: src/notify/notify.cc:106
 msgid "Always show notification"
 msgstr "Siempre mostrar la notificación"
 
-#: src/notify/notify.cc:114
+#: src/notify/notify.cc:108
 msgid "Include album name in notification"
 msgstr "Incluir nombre del álbum en la notificación"
 
-#: src/notify/osd.cc:58
+#: src/notify/notify.cc:110
+msgid "Custom notification duration:"
+msgstr "Duración de notificación personalizada:"
+
+#: src/notify/osd.cc:74
 msgid "Show"
 msgstr "Mostrar"
 
-#: src/notify/osd.cc:66 src/qtui/main_window.cc:178
-#: src/qtui/main_window.cc:179 src/skins/menus.cc:88
-msgid "Pause"
-msgstr "Pausa"
+#: src/openmpt/mpt.cc:50
+msgid "OpenMPT (Module Player)"
+msgstr "OpenMPT (Module Player)"
 
-#: src/notify/osd.cc:73 src/qtui/main_window.cc:72 src/skins/menus.cc:91
-msgid "Next"
-msgstr "Siguiente"
+#: src/openmpt/mpt.cc:132
+msgid ""
+"Module player based on libopenmpt\n"
+"\n"
+"Written by: Chris Spiegel <cspiegel@gmail.com>"
+msgstr ""
+"Module player basado en libopenmpt\n"
+"\n"
+"Escrito por: Chris Spiegel <cspiegel@gmail.com>"
+
+#: src/openmpt/mpt.cc:151
+msgid "Stereo separation:"
+msgstr "Separación estéreo:"
+
+#: src/openmpt/mpt.cc:153
+msgid "% (0=mono, 100=default, 200=full)"
+msgstr ""
+
+#: src/openmpt/mpt.cc:157
+msgid "Interpolation:"
+msgstr "Interpolación:"
+
+#: src/openmpt/mptwrap.h:51 src/soxr/sox-resampler.cc:189 src/xsf/plugin.cc:437
+msgid "Linear"
+msgstr "Linear"
+
+#: src/openmpt/mptwrap.h:52
+msgid "Cubic"
+msgstr "Cúbica"
 
-#: src/oss4/oss.h:93
+#: src/openmpt/mptwrap.h:53
+msgid "Windowed sinc"
+msgstr "Windowed sinc"
+
+#: src/opus/opus.cc:39
+msgid "Opus Decoder"
+msgstr "Decodificador Opus"
+
+#: src/opus/opus.cc:336
+msgid ""
+"Opus Decoder Plugin for Audacious\n"
+"Copyright 2022 Thomas Lange"
+msgstr ""
+"Plugin decodificador Opus para Audacious\n"
+"Copyright 2022 Thomas Lange"
+
+#: src/oss4/oss.h:70
 msgid "OSS4 Output"
 msgstr "Salida OSS4"
 
-#: src/oss4/oss.h:95
+#: src/oss4/oss.h:72
 msgid "OSS3 Output"
 msgstr "Salida OSS3"
 
@@ -2703,27 +2902,27 @@
 msgid "Default device"
 msgstr "Dispositivo por default"
 
-#: src/oss4/plugin.cc:77
+#: src/oss4/plugin.cc:78
 msgid "Audio device:"
 msgstr "Dispositivo de audio:"
 
-#: src/oss4/plugin.cc:80
+#: src/oss4/plugin.cc:81
 msgid "Use alternate device:"
 msgstr "Usar dispositivo alterno:"
 
-#: src/oss4/plugin.cc:84
+#: src/oss4/plugin.cc:85
 msgid "Save volume between sessions."
 msgstr "Guardar volumen entre sesiones."
 
-#: src/oss4/plugin.cc:86
+#: src/oss4/plugin.cc:87
 msgid "Enable format conversions made by the OSS software."
 msgstr "Habilitar las conversiones de formato hechas por el software OSS."
 
-#: src/oss4/plugin.cc:88
+#: src/oss4/plugin.cc:89
 msgid "Enable exclusive mode to prevent virtual mixing."
 msgstr "Habilitar modo exclusivo para prevenir mezclado virtual."
 
-#: src/oss4/plugin.cc:100
+#: src/oss4/plugin.cc:101
 msgid ""
 "OSS4 Output Plugin for Audacious\n"
 "Copyright 2010-2012 Michał Lipski\n"
@@ -2737,19 +2936,40 @@
 "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/playlist-manager/playlist-manager.cc:37
+#: src/pipewire/pipewire.cc:44
+msgid "PipeWire Output"
+msgstr "Salida PipeWire"
+
+#: src/pipewire/pipewire.cc:118
+msgid ""
+"PipeWire Output Plugin for Audacious\n"
+"Copyright 2022 Thomas Lange\n"
+"\n"
+"Based on the PipeWire Output Plugin for Qmmp\n"
+"Copyright 2021 Ilya Kotov"
+msgstr ""
+"Plugin de salida PipeWire para Audacious\n"
+"Copyright 2022 Thomas Lange\n"
+"\n"
+"Basado en el Plugin de salida PipeWire para Qmmp\n"
+"Copyright 2021 Ilya Kotov"
+
+#: src/pipewire/pipewire.cc:408 src/skins/menus.cc:88 src/skins-qt/menus.cc:79
+msgid "Playback"
+msgstr "Reproducción"
+
+#: src/playlist-manager/playlist-manager.cc:38
+#: src/playlist-manager-qt/playlist-manager-qt.cc:42
 msgid "Playlist Manager"
 msgstr "Administrador de Lista de Reproducción"
 
-#: src/playlist-manager/playlist-manager.cc:226
-msgid "Entries"
-msgstr "Entradas"
-
-#: src/playlist-manager/playlist-manager.cc:245
+#: src/playlist-manager/playlist-manager.cc:221
+#: src/playlist-manager-qt/playlist-manager-qt.cc:356
 msgid "_Remove"
 msgstr "_Remover"
 
-#: src/playlist-manager/playlist-manager.cc:246
+#: src/playlist-manager/playlist-manager.cc:222
+#: src/playlist-manager-qt/playlist-manager-qt.cc:351
 msgid "Ren_ame"
 msgstr "Ren_ombrar"
 
@@ -2757,55 +2977,69 @@
 msgid "PLS Playlists"
 msgstr "Listas de reproducción PLS"
 
-#: src/psf/plugin.cc:45
+#: src/psf/plugin.cc:53
 msgid "OpenPSF PSF1/PSF2 Decoder"
 msgstr "Decodificador OpenPSF PSF1/PSF2"
 
-#: src/pulse_audio/pulse_audio.cc:38
+#: src/psf/plugin.cc:270
+msgid "OpenPSF Configuration"
+msgstr "Configuración OpenPSF"
+
+#: src/psf/plugin.cc:271 src/xsf/plugin.cc:444
+msgid "Ignore length from file"
+msgstr "Ignorar duración del archivo"
+
+#: src/pulse/pulse_audio.cc:42
 msgid "PulseAudio Output"
 msgstr "Salida PulseAudio"
 
-#: src/pulse_audio/pulse_audio.cc:611
+#: src/pulse/pulse_audio.cc:84
+msgid "Context name:"
+msgstr "Nombre de contexto:"
+
+#: src/pulse/pulse_audio.cc:86
+msgid "Stream name:"
+msgstr "Nombre del stream"
+
+#: src/pulse/pulse_audio.cc:596
 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 ""
-"Plugin de Salida Audacious PulseAudio\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"
-"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"
+"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"
-"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"
+"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 ""
+"Plugin de Salida PulseAudio Audacious\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."
+"Este programa es software libre; puedes redistribuirlo y/o modificarlo bajo "
+"los términaos de la GNU General Public License como es publicada por la Free "
+"Software Foundation; ya sea la versión 2 de la Licencia, o (a tu elección) "
+"cualquier versión posterior. \n"
+"\n"
+"Este programa es distribuido con la esperanza que será útil, pero SIN "
+"GARANTÍA ALGUNA; sin la garantía implícita de MERCANTILIZACIÓN o PROPIA PARA "
+"UN PROPÓSITO EN PARTICULAR. Ve la GNU General Public License para más "
+"detalles.\n"
+"\n"
+"Deberías de recibir una copia de la GNU General Public License junto con "
+"este programa; si no, escribe a la Free Software Foundation, Inc., 51 "
+"Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 
-#: src/qtaudio/qtaudio.cc:49
+#: src/qtaudio/qtaudio.cc:53
 msgid "QtMultimedia Output"
 msgstr "Salida QtMultimedia"
 
-#: src/qtaudio/qtaudio.cc:77
+#: src/qtaudio/qtaudio.cc:84
 msgid ""
 "QtMultimedia Audio Output Plugin for Audacious\n"
 "Copyright 2014 William Pitcock\n"
@@ -2819,50 +3053,109 @@
 "Basado en el Plugin de Salida SDL para Audacious\n"
 "Copyright 2010 John Lindgren"
 
-#: src/qtui/dialog_windows.cc:31
-msgid "Working ..."
-msgstr "Trabajando ..."
+#: src/qtglspectrum/gl-spectrum.cc:41
+msgid ""
+"OpenGL Spectrum Analyzer for Audacious\n"
+"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
+"Copyright 2014, 2020 Ariadne Conill\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 para Audacious\n"
+"Copyright 2013 Christophe Budé, John Lindgren y Carlo Bramini\n"
+"Copyright 2014, 2020 Ariadne Conill\n"
+"\n"
+"Basado en el plugin XMMS:\n"
+"Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson y "
+"4Front Technologies\n"
+"\n"
+"License: GPLv2+"
 
-#: src/qtui/filter_input.cc:44 src/skins/ui_playlist.cc:221
-msgid "Search"
-msgstr "Buscar"
+#: src/qthotkey/gui.cc:177
+msgid "Press a key combination inside a text field."
+msgstr "Presiona una combinación de teclas dentro de un campo de texto."
 
-#: src/qtui/main_window_actions.cc:94
+#: src/qthotkey/plugin.cc:105
+msgid ""
+"Global Hotkey Plugin\n"
+"Control the player with global key combinations or multimedia keys.\n"
+"\n"
+"Copyright (C) 2020 i.Dark_Templar <darktemplar@dark-templar-archives.net>\n"
+"Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n"
+"\n"
+"Contributors 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 Plugin\n"
+"Controla el reproductor con combinaciones de teclas globales o tlecas "
+"multimedia.\n"
+"\n"
+"Copyright (C) 2020 i.Dark_Templar <darktemplar@dark-templar-archives.net>\n"
+"Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n"
+"\n"
+"Contribuyeron además:\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/qtui/menus.cc:109
 msgid "_Open Folder ..."
 msgstr "_Abrir Carpeta ..."
 
-#: src/qtui/main_window_actions.cc:96
+#: src/qtui/menus.cc:115
 msgid "_Add Folder ..."
 msgstr "_Agregar Carpeta ..."
 
-#: src/qtui/main_window_actions.cc:101
+#: src/qtui/menus.cc:128
 msgid "_Log Inspector ..."
 msgstr "_Inspector de Registro ..."
 
-#: src/qtui/main_window.cc:64
-msgid "Open Files"
-msgstr "Abrir Archivos"
+#: src/qtui/menus.cc:220
+msgid "_Find ..."
+msgstr "_Buscar .."
 
-#: src/qtui/main_window.cc:66
-msgid "Add Files"
-msgstr "Agregar Archivos"
+#: src/qtui/menus.cc:256 src/skins/menus.cc:80 src/skins-qt/menus.cc:70
+msgid "Audio Settings ..."
+msgstr "Ajustes de Audio ..."
 
-#: src/qtui/main_window.cc:71 src/skins/menus.cc:90
-msgid "Previous"
-msgstr "Anterior"
+#: src/qtui/playlist_model.cc:188
+msgid "Q#"
+msgstr "Q#"
 
-#: src/qtui/main_window.cc:77 src/skins/menus.cc:82
-msgid "Repeat"
-msgstr "Repetir"
+#: src/qtui/playlist_model.cc:190
+msgid "T#"
+msgstr "T#"
 
-#: src/qtui/main_window.cc:79 src/skins/menus.cc:83
-msgid "Shuffle"
-msgstr "Aleatorio"
+#: src/qtui/playlist_model.cc:192
+msgid "C#"
+msgstr "C#"
+
+#: src/qtui/playlist_model.cc:194
+msgid "D#"
+msgstr ""
 
-#: src/qtui/qtui.cc:42
+#: src/qtui/qtui.cc:40
 msgid "Qt Interface"
 msgstr "Interface Qt"
 
+#: src/qtui/search_bar.cc:46
+msgid "Search playlist"
+msgstr "Buscar lista de reproducción"
+
+#: src/qtui/settings.cc:79
+msgid "Use bold font for column headers"
+msgstr "Usa fuente en negritas para encabezados de columna"
+
 #: src/resample/resample.cc:43
 msgid "Sample Rate Converter"
 msgstr "Convertidor de tasa de muestra"
@@ -2903,7 +3196,7 @@
 msgid "Method:"
 msgstr "Método:"
 
-#: src/resample/resample.cc:199 src/sox-resampler/sox-resampler.cc:161
+#: src/resample/resample.cc:199 src/soxr/sox-resampler.cc:203
 msgid "Rate:"
 msgstr "Tasa:"
 
@@ -2955,66 +3248,53 @@
 msgid "192 kHz:"
 msgstr "192 kHz:"
 
-#: src/scrobbler2/config_window.cc:41
-#, c-format
-msgid "OK. Scrobbling for user: %s"
-msgstr "OK. Agregando datos -scrobbling- para usuario: %s"
-
-#: src/scrobbler2/config_window.cc:54
-msgid "Permission Denied"
-msgstr "Permiso Denegado"
+#: src/scrobbler2/config_window.cc:29
+msgid "Checking Last.fm access ..."
+msgstr "Verificando acceso a Last.fm..."
 
-#: src/scrobbler2/config_window.cc:56
-msgid "Access the following link to allow Audacious to scrobble your plays:"
+#: src/scrobbler2/config_window.cc:35
+msgid ""
+"Your scrobbles are being saved on your computer temporarily. They will be "
+"submitted as soon as Audacious is allowed access."
 msgstr ""
-"Accede al siguiente vínculo para permitir que Audacious agregue datos -"
-"scrobble- a tus reproducciones:"
+"Tus scrobbles están siendo guardados temporalmente en tu computadora. Serán "
+"enviados tan pronto como permitas el acceso a Audacious."
 
-#: src/scrobbler2/config_window.cc:66
-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.cc:41
+#, c-format
+msgid "Permission granted. Scrobbling for user %s."
+msgstr "Permiso otorgado. Scrobbling para usuario %s."
 
-#: src/scrobbler2/config_window.cc:69 src/scrobbler2/config_window.cc:80
+#: src/scrobbler2/config_window.cc:44
 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."
+"Permission denied. Open the following URL in a browser, allow Audacious "
+"access to your account, and then click 'Check Permission' again:"
 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.cc:77
-msgid "Network Problem."
-msgstr "Problema de Red."
+"Permiso denegado. Abre el siguiente URL en un navegador, permite a Audacious "
+"acceder a tu cuenta, luego has clic otra vez en \"Verificar Permiso\":"
 
-#: src/scrobbler2/config_window.cc:78
-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/scrobbler2/config_window.cc:53
+msgid "There was a problem contacting Last.fm."
+msgstr "Hubo un problema contactando a Last.fm."
 
-#: src/scrobbler2/config_window.cc:110
-msgid "Checking..."
-msgstr "Verificando..."
+#: src/scrobbler2/config_window.cc:92
+msgid "Check Permission"
+msgstr "Verificar Permiso"
 
-#: src/scrobbler2/config_window.cc:176
-msgid "C_heck Permission"
-msgstr "V_erificar Permiso"
+#: src/scrobbler2/config_window.cc:93
+msgid "Revoke Permission"
+msgstr "Revocar Permiso"
 
-#: src/scrobbler2/config_window.cc:177
-msgid "_Revoke Permission"
-msgstr "_Revocar Permiso"
-
-#: src/scrobbler2/config_window.cc:220
-msgid ""
-"You need to allow Audacious to scrobble tracks to your Last.fm account.\n"
+#: src/scrobbler2/config_window.cc:97
+msgid "You need to allow Audacious to scrobble tracks to your Last.fm account."
 msgstr ""
-"Necesitas permitir que Audacious transfiera los metadatos de las pistas "
-"\"scrobblee\" a tu cuenta Last.fm\n"
+"Necesitas permitir que Audacious scrobblee pistas a tu cuenta de Last.fm."
 
 #: src/scrobbler2/scrobbler.cc:29
 msgid "Scrobbler 2.0"
 msgstr "Scrobbler 2.0"
 
-#: src/scrobbler2/scrobbler.cc:224
+#: src/scrobbler2/scrobbler.cc:200
 msgid ""
 "The Scrobbler plugin could not be started.\n"
 "There might be a problem with your installation."
@@ -3022,36 +3302,21 @@
 "El plugin Scrobbler no pudo ser iniciado.\n"
 "Puede haber un problema con tu instalación."
 
-#: src/scrobbler2/scrobbler.cc:289
+#: src/scrobbler2/scrobbler.cc:245
 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"
-"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_communication.cc:642
-msgid ""
-"Audacious is now using an improved version of the Last.fm Scrobbler.\n"
-"Please check the Preferences for the Scrobbler plugin."
+"project."
 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/sdlout.cc:48
+#: src/sdlout/sdlout.cc:43
 msgid "SDL Output"
 msgstr "Salida SDL"
 
-#: src/sdlout/sdlout.cc:77
+#: src/sdlout/sdlout.cc:72
 msgid ""
 "SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
@@ -3059,56 +3324,44 @@
 "Plugin de salida SDL para Audacious\n"
 "Copyright 2010 John Lindgren"
 
-#: src/search-tool/search-tool.cc:116 src/search-tool/search-tool.cc:124
+#: src/search-tool/library.cc:35 src/search-tool/library.cc:46
+#: src/search-tool-qt/library.cc:35 src/search-tool-qt/library.cc:46
 msgid "Library"
 msgstr "Librería"
 
-#: src/search-tool/search-tool.cc:394
-#, c-format
-msgid "%d result"
-msgid_plural "%d results"
-msgstr0 "%d resultado"
-msgstr1 "%d resultados"
-
-#: src/search-tool/search-tool.cc:400
-#, c-format
-msgid "(%d hidden)"
-msgid_plural "(%d hidden)"
-msgstr0 "(%d oculto)"
-msgstr1 "(%d ocultos)"
-
-#: src/search-tool/search-tool.cc:594
+#: src/search-tool-qt/search-model.cc:44 src/search-tool/search-tool.cc:287
 #, c-format
 msgid "%d song"
 msgid_plural "%d songs"
 msgstr0 "%d pista"
 msgstr1 "%d pistas"
+msgstr2 "%d pistas"
 
-#: src/search-tool/search-tool.cc:601
+#: src/search-tool-qt/search-model.cc:53 src/search-tool/search-tool.cc:294
 msgid "of this genre"
 msgstr "de este género"
 
-#: src/search-tool/search-tool.cc:607
+#: src/search-tool-qt/search-model.h:47 src/search-tool/search-model.h:45
 msgid "on"
 msgstr "en"
 
-#: src/search-tool/search-tool.cc:607
+#: src/search-tool-qt/search-model.h:47 src/search-tool/search-model.h:45
 msgid "by"
 msgstr "por"
 
-#: src/search-tool/search-tool.cc:643
-msgid "_Create Playlist"
-msgstr "_Crear Lista de Reproducción"
-
-#: src/search-tool/search-tool.cc:645
-msgid "_Add to Playlist"
-msgstr "_Agregar a la Lista de Reproducción"
-
-#: src/search-tool/search-tool.cc:684
-msgid "Search library"
-msgstr "Buscar librería"
+#: src/search-tool-qt/search-tool-qt.cc:165 src/search-tool/search-tool.cc:74
+msgid "Number of results to show:"
+msgstr "Número de resultados para mostrar:"
+
+#: src/search-tool-qt/search-tool-qt.cc:168 src/search-tool/search-tool.cc:77
+msgid "Rescan library at startup"
+msgstr "Rescanear biblioteca al inicio"
+
+#: src/search-tool-qt/search-tool-qt.cc:170
+msgid "Monitor library for changes"
+msgstr "Monitorear biblioteca por cambios"
 
-#: src/search-tool/search-tool.cc:688
+#: src/search-tool-qt/search-tool-qt.cc:193 src/search-tool/search-tool.cc:450
 msgid ""
 "To import your music library into Audacious, choose a folder and then click "
 "the \"refresh\" icon."
@@ -3116,22 +3369,46 @@
 "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.cc:696
+#: src/search-tool-qt/search-tool-qt.cc:195 src/search-tool/search-tool.cc:459
 msgid "Please wait ..."
 msgstr "Por favor espere..."
 
-#: src/search-tool/search-tool.cc:723
+#: src/search-tool-qt/search-tool-qt.cc:197 src/search-tool/search-tool.cc:487
 msgid "Choose Folder"
 msgstr "Seleccione Carpeta"
 
+#: src/search-tool-qt/search-tool-qt.cc:201 src/search-tool/search-tool.cc:445
+msgid "Search library"
+msgstr "Buscar librería"
+
+#: src/search-tool-qt/search-tool-qt.cc:327 src/search-tool/search-tool.cc:156
+#, c-format
+msgid "%d of %d result shown"
+msgid_plural "%d of %d results shown"
+msgstr0 "%d de %d resultado mostrado"
+msgstr1 "%d de %d resultados mostrados"
+msgstr2 "%d de %d resultados mostrados"
+
+#: src/search-tool-qt/search-tool-qt.cc:331 src/search-tool/search-tool.cc:160
+#, c-format
+msgid "%d result"
+msgid_plural "%d results"
+msgstr0 "%d resultado"
+msgstr1 "%d resultados"
+msgstr2 "%d resultados"
+
+#: src/search-tool-qt/search-tool-qt.cc:501 src/search-tool/search-tool.cc:341
+msgid "_Create Playlist"
+msgstr "_Crear Lista de Reproducción"
+
+#: src/search-tool-qt/search-tool-qt.cc:503 src/search-tool/search-tool.cc:343
+msgid "_Add to Playlist"
+msgstr "_Agregar a la Lista de Reproducción"
+
 #: src/sid/xmms-sid.cc:43
 msgid "SID Player"
 msgstr "Reproductor SID"
 
-#: src/sid/xs_config.cc:61
-msgid "Output"
-msgstr "Salida"
-
 #: src/sid/xs_config.cc:62
 msgid "Channels:"
 msgstr "Canales:"
@@ -3212,741 +3489,685 @@
 msgid "Threshold:"
 msgstr "Umbral:"
 
-#: src/silence-removal/silence-removal.cc:70
-msgid "dB"
-msgstr "dB"
+#: src/skins/actions.cc:45 src/skins-qt/actions.cc:43
+msgid "Repeat points cleared."
+msgstr "Repite puntos borrados."
+
+#: src/skins/actions.cc:60 src/skins-qt/actions.cc:58
+msgid "Repeat point A set."
+msgstr "Repite punto A configurado."
+
+#: src/skins/actions.cc:65 src/skins-qt/actions.cc:63
+msgid "Repeat point B set."
+msgstr "Repite punto B configurado."
+
+#: src/skins/equalizer.cc:223 src/skins-qt/equalizer.cc:223
+msgid "Preamp"
+msgstr "Preamplificación"
+
+#: src/skins/equalizer.cc:227 src/skins-qt/equalizer.cc:227
+msgid "31 Hz"
+msgstr "31 Hz"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "63 Hz"
+msgstr "63 Hz"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "125 Hz"
+msgstr "125 Hz"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "250 Hz"
+msgstr "250 Hz"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "500 Hz"
+msgstr "500 Hz"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "1 kHz"
+msgstr "1 kHz"
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "2 kHz"
+msgstr "2 kHz"
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "4 kHz"
+msgstr "4 kHz"
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "8 kHz"
+msgstr "8 kHz"
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "16 kHz"
+msgstr "16 kHz"
+
+#: src/skins/equalizer.cc:270 src/skins-qt/equalizer.cc:270
+msgid "Audacious Equalizer"
+msgstr "Ecualizador de Audacious"
+
+#: src/skins/main.cc:459 src/skins-qt/main.cc:442
+msgid "Recording on"
+msgstr "Grabando enc. "
+
+#: src/skins/main.cc:461 src/skins-qt/main.cc:444
+msgid "Recording off"
+msgstr "Grabando apag."
+
+#: src/skins/main.cc:754 src/skins-qt/main.cc:701
+#, c-format
+msgid "Seek to %d:%-2.2d / %d:%-2.2d"
+msgstr "Saltar a %d:%-2.2d / %d:%-2.2d"
+
+#: src/skins/main.cc:771 src/skins-qt/main.cc:718
+#, c-format
+msgid "Volume: %d%%"
+msgstr "Volumen: %d%%"
+
+#: src/skins/main.cc:784 src/skins-qt/main.cc:731
+#, c-format
+msgid "Balance: %d%% left"
+msgstr "Balance: %d%% izquierda"
+
+#: src/skins/main.cc:786 src/skins-qt/main.cc:733
+msgid "Balance: center"
+msgstr "Balance: central"
+
+#: src/skins/main.cc:788 src/skins-qt/main.cc:735
+#, c-format
+msgid "Balance: %d%% right"
+msgstr "Balance: %d%% derecha"
+
+#: src/skins/main.cc:880 src/skins-qt/main.cc:827
+msgid "Options Menu"
+msgstr "Menú de Opciones"
+
+#: src/skins/main.cc:884 src/skins-qt/main.cc:831
+msgid "Disable 'Always On Top'"
+msgstr "Deshabilitar 'Siempre Encima'"
+
+#: src/skins/main.cc:886 src/skins-qt/main.cc:833
+msgid "Enable 'Always On Top'"
+msgstr "Habilitar 'Siempre Encima'"
+
+#: src/skins/main.cc:889 src/skins-qt/main.cc:836
+msgid "File Info Box"
+msgstr "Caja de Información del Archivo"
+
+#: src/skins/main.cc:892 src/skins/menus.cc:149 src/skins-qt/main.cc:839
+#: src/skins-qt/menus.cc:142
+msgid "Double Size"
+msgstr "Tamaño Doble"
+
+#: src/skins/main.cc:895 src/skins-qt/main.cc:842
+msgid "Visualizations"
+msgstr "Visualizaciones"
 
-#: src/skins/menus.cc:64
+#: src/skins/menus.cc:74 src/skins-qt/menus.cc:64
+msgid "Volume Up"
+msgstr "Más Volumen"
+
+#: src/skins/menus.cc:75 src/skins-qt/menus.cc:65
+msgid "Volume Down"
+msgstr "Menos Volumen"
+
+#: src/skins/menus.cc:77 src/skins-qt/menus.cc:67
+msgid "Effects ..."
+msgstr "Efectos ..."
+
+#: src/skins/menus.cc:84 src/skins-qt/menus.cc:74
 msgid "Open Files ..."
 msgstr "Abrir Archivos ..."
 
-#: src/skins/menus.cc:65
+#: src/skins/menus.cc:85 src/skins-qt/menus.cc:76
 msgid "Open URL ..."
 msgstr "Abrir URL ..."
 
-#: src/skins/menus.cc:66
-msgid "Search Library"
-msgstr "Buscar Librería"
-
-#: src/skins/menus.cc:68
-msgid "Playback"
-msgstr "Reproducción"
-
-#: src/skins/menus.cc:69
+#: src/skins/menus.cc:89 src/skins-qt/menus.cc:80
 msgid "Playlist"
 msgstr "Lista de Reproducción"
 
-#: src/skins/menus.cc:70
+#: src/skins/menus.cc:90 src/skins-qt/menus.cc:81
+msgid "Output"
+msgstr "Salida"
+
+#: src/skins/menus.cc:91 src/skins-qt/menus.cc:82
 msgid "View"
 msgstr "Ver"
 
-#: src/skins/menus.cc:72 src/skins/menus.cc:136 src/skins/menus.cc:149
-#: src/skins/menus.cc:214
+#: src/skins/menus.cc:93 src/skins/menus.cc:161 src/skins/menus.cc:174
+#: src/skins/menus.cc:245 src/skins-qt/menus.cc:84 src/skins-qt/menus.cc:156
+#: src/skins-qt/menus.cc:170 src/skins-qt/menus.cc:241
 msgid "Services"
 msgstr "Servicios"
 
-#: src/skins/menus.cc:74
+#: src/skins/menus.cc:95 src/skins-qt/menus.cc:86
 msgid "About ..."
 msgstr "Acerca ..."
 
-#: src/skins/menus.cc:75
+#: src/skins/menus.cc:96 src/skins-qt/menus.cc:87
 msgid "Settings ..."
 msgstr "Ajustes ..."
 
-#: src/skins/menus.cc:76
+#: src/skins/menus.cc:97 src/skins-qt/menus.cc:88
 msgid "Quit"
 msgstr "Salir"
 
-#: src/skins/menus.cc:80 src/skins/menus.cc:206
+#: src/skins/menus.cc:101 src/skins/menus.cc:235 src/skins-qt/menus.cc:92
+#: src/skins-qt/menus.cc:231
 msgid "Song Info ..."
 msgstr "Información de Pista ..."
 
-#: src/skins/menus.cc:84
+#: src/skins/menus.cc:105 src/skins-qt/menus.cc:96
+msgid "Shuffle by Album"
+msgstr "Aleatorio por Álbum"
+
+#: src/skins/menus.cc:106 src/skins-qt/menus.cc:97
 msgid "No Playlist Advance"
 msgstr "No avanzar Lista de Reproducción"
 
-#: src/skins/menus.cc:85
-msgid "Stop After This Song"
-msgstr "Detener Al Terminar Esta Pista"
-
-#: src/skins/menus.cc:93
+#: src/skins/menus.cc:117 src/skins-qt/menus.cc:108
 msgid "Set A-B Repeat"
 msgstr "Establecer Repetición A-B"
 
-#: src/skins/menus.cc:94
+#: src/skins/menus.cc:118 src/skins-qt/menus.cc:109
 msgid "Clear A-B Repeat"
 msgstr "Limpiar Repetición A-B"
 
-#: src/skins/menus.cc:96
+#: src/skins/menus.cc:120 src/skins-qt/menus.cc:111
 msgid "Jump to Song ..."
 msgstr "Saltar a la Pista ..."
 
-#: src/skins/menus.cc:97
+#: src/skins/menus.cc:121 src/skins-qt/menus.cc:113
 msgid "Jump to Time ..."
 msgstr "Saltar al Tiempo ..."
 
-#: src/skins/menus.cc:101
+#: src/skins/menus.cc:125 src/skins-qt/menus.cc:118
 msgid "Play/Resume"
 msgstr "Reproducir/Reanudar"
 
-#: src/skins/menus.cc:103
+#: src/skins/menus.cc:127 src/skins-qt/menus.cc:120
 msgid "New Playlist"
 msgstr "Nueva Lista de Reproducción"
 
-#: src/skins/menus.cc:104
+#: src/skins/menus.cc:128 src/skins-qt/menus.cc:121
 msgid "Rename Playlist ..."
 msgstr "Renombrar Lista de Reproducción"
 
-#: src/skins/menus.cc:105
+#: src/skins/menus.cc:129 src/skins-qt/menus.cc:122
 msgid "Remove Playlist"
 msgstr "Remover Lista de Reproducción"
 
-#: src/skins/menus.cc:107
+#: src/skins/menus.cc:131 src/skins-qt/menus.cc:124
 msgid "Previous Playlist"
 msgstr "Lista de Reproducción Previa"
 
-#: src/skins/menus.cc:108
+#: src/skins/menus.cc:132 src/skins-qt/menus.cc:125
 msgid "Next Playlist"
 msgstr "Siguiente Lista de Reproducción"
 
-#: src/skins/menus.cc:110
+#: src/skins/menus.cc:134 src/skins-qt/menus.cc:127
 msgid "Import Playlist ..."
 msgstr "Importar Lista de Reproducción ..."
 
-#: src/skins/menus.cc:111
+#: src/skins/menus.cc:135 src/skins-qt/menus.cc:128
 msgid "Export Playlist ..."
 msgstr "Exportar Lista de Reproducción ..."
 
-#: src/skins/menus.cc:113
+#: src/skins/menus.cc:137 src/skins-qt/menus.cc:130
 msgid "Playlist Manager ..."
 msgstr "Administrador de Listas de Reproducción ..."
 
-#: src/skins/menus.cc:114
+#: src/skins/menus.cc:138 src/skins-qt/menus.cc:131
 msgid "Queue Manager ..."
 msgstr "Administrador de Fila ..."
 
-#: src/skins/menus.cc:116
+#: src/skins/menus.cc:140 src/skins-qt/menus.cc:133
 msgid "Refresh Playlist"
 msgstr "Refrescar Lista de Reproducción"
 
-#: src/skins/menus.cc:120
+#: src/skins/menus.cc:144 src/skins-qt/menus.cc:137
 msgid "Show Playlist Editor"
 msgstr "Mostrar Editor de Listas de Reproducción"
 
-#: src/skins/menus.cc:121
+#: src/skins/menus.cc:145 src/skins-qt/menus.cc:138
 msgid "Show Equalizer"
 msgstr "Mostrar Ecualizador"
 
-#: src/skins/menus.cc:123
+#: src/skins/menus.cc:147 src/skins-qt/menus.cc:140
 msgid "Show Remaining Time"
 msgstr "Mostrar Tiempo Restante"
 
-#: src/skins/menus.cc:125
+#: src/skins/menus.cc:150 src/skins-qt/menus.cc:143
 msgid "Always on Top"
 msgstr "Siempre Encima"
 
-#: src/skins/menus.cc:126
+#: src/skins/menus.cc:151 src/skins-qt/menus.cc:145
 msgid "On All Workspaces"
 msgstr "En Todas Las Áreas de Trabajo"
 
-#: src/skins/menus.cc:128
+#: src/skins/menus.cc:153 src/skins-qt/menus.cc:148
 msgid "Roll Up Player"
 msgstr "Enrollar Reproductor"
 
-#: src/skins/menus.cc:129
+#: src/skins/menus.cc:154 src/skins-qt/menus.cc:149
 msgid "Roll Up Playlist Editor"
 msgstr "Enrollar Editor de Listas de Reproducción"
 
-#: src/skins/menus.cc:130
+#: src/skins/menus.cc:155 src/skins-qt/menus.cc:150
 msgid "Roll Up Equalizer"
 msgstr "Enrollar Ecualizador"
 
-#: src/skins/menus.cc:132 src/skins/ui_main.cc:854
-msgid "Double Size"
-msgstr "Tamaño Doble"
-
-#: src/skins/menus.cc:138
+#: src/skins/menus.cc:163 src/skins-qt/menus.cc:158
 msgid "Add URL ..."
 msgstr "Agregar URL ..."
 
-#: src/skins/menus.cc:139
+#: src/skins/menus.cc:164 src/skins-qt/menus.cc:160
 msgid "Add Files ..."
 msgstr "Agregar Archivos ..."
 
-#: src/skins/menus.cc:143 src/skins/menus.cc:171 src/skins/menus.cc:185
+#: src/skins/menus.cc:168 src/skins/menus.cc:196 src/skins/menus.cc:212
+#: src/skins-qt/menus.cc:164 src/skins-qt/menus.cc:192
+#: src/skins-qt/menus.cc:208
 msgid "By Title"
 msgstr "Por Título"
 
-#: src/skins/menus.cc:144 src/skins/menus.cc:178 src/skins/menus.cc:192
+#: src/skins/menus.cc:169 src/skins/menus.cc:203 src/skins/menus.cc:219
+#: src/skins-qt/menus.cc:165 src/skins-qt/menus.cc:199
+#: src/skins-qt/menus.cc:215
 msgid "By File Name"
 msgstr "Por Nombre de Archivo"
 
-#: src/skins/menus.cc:145 src/skins/menus.cc:179 src/skins/menus.cc:193
+#: src/skins/menus.cc:170 src/skins/menus.cc:204 src/skins/menus.cc:220
+#: src/skins-qt/menus.cc:166 src/skins-qt/menus.cc:200
+#: src/skins-qt/menus.cc:216
 msgid "By File Path"
 msgstr "Por Ruta de Archivo"
 
-#: src/skins/menus.cc:151
+#: src/skins/menus.cc:176 src/skins-qt/menus.cc:172
 msgid "Remove All"
 msgstr "Quitar Todo"
 
-#: src/skins/menus.cc:152
+#: src/skins/menus.cc:177 src/skins-qt/menus.cc:173
 msgid "Clear Queue"
 msgstr "Limpiar Cola de reproducción"
 
-#: src/skins/menus.cc:154
+#: src/skins/menus.cc:179 src/skins-qt/menus.cc:175
 msgid "Remove Unavailable Files"
 msgstr "Remueve los Archivos No Disponibles"
 
-#: src/skins/menus.cc:155
+#: src/skins/menus.cc:180 src/skins-qt/menus.cc:176
 msgid "Remove Duplicates"
 msgstr "Remover Duplicados"
 
-#: src/skins/menus.cc:157
+#: src/skins/menus.cc:182 src/skins-qt/menus.cc:178
 msgid "Remove Unselected"
 msgstr "Remover No Seleccionados"
 
-#: src/skins/menus.cc:158
+#: src/skins/menus.cc:183 src/skins-qt/menus.cc:179
 msgid "Remove Selected"
 msgstr "Remover Seleccionados"
 
-#: src/skins/menus.cc:162
+#: src/skins/menus.cc:187 src/skins-qt/menus.cc:183
 msgid "Search and Select"
 msgstr "Buscar y Seleccionar"
 
-#: src/skins/menus.cc:164
+#: src/skins/menus.cc:189 src/skins-qt/menus.cc:185
 msgid "Invert Selection"
 msgstr "Invertir Selección"
 
-#: src/skins/menus.cc:165
+#: src/skins/menus.cc:190 src/skins-qt/menus.cc:186
 msgid "Select None"
 msgstr "Selecciona ninguno"
 
-#: src/skins/menus.cc:166
+#: src/skins/menus.cc:191 src/skins-qt/menus.cc:187
 msgid "Select All"
 msgstr "Selecciona Todo"
 
-#: src/skins/menus.cc:170 src/skins/menus.cc:184
+#: src/skins/menus.cc:195 src/skins/menus.cc:211 src/skins-qt/menus.cc:191
+#: src/skins-qt/menus.cc:207
 msgid "By Track Number"
 msgstr "Por Número de Pista"
 
-#: src/skins/menus.cc:172 src/skins/menus.cc:186
+#: src/skins/menus.cc:197 src/skins/menus.cc:213 src/skins-qt/menus.cc:193
+#: src/skins-qt/menus.cc:209
 msgid "By Artist"
 msgstr "Por Artista"
 
-#: src/skins/menus.cc:173 src/skins/menus.cc:187
+#: src/skins/menus.cc:198 src/skins/menus.cc:214 src/skins-qt/menus.cc:194
+#: src/skins-qt/menus.cc:210
 msgid "By Album"
 msgstr "Por Álbum"
 
-#: src/skins/menus.cc:174 src/skins/menus.cc:188
+#: src/skins/menus.cc:199 src/skins/menus.cc:215 src/skins-qt/menus.cc:195
+#: src/skins-qt/menus.cc:211
 msgid "By Album Artist"
 msgstr "Por Artista de Álbum"
 
-#: src/skins/menus.cc:175 src/skins/menus.cc:190
+#: src/skins/menus.cc:200 src/skins/menus.cc:216 src/skins-qt/menus.cc:196
+#: src/skins-qt/menus.cc:212
 msgid "By Release Date"
 msgstr "Por Fecha de Lanzamiento"
 
-#: src/skins/menus.cc:176 src/skins/menus.cc:189
+#: src/skins/menus.cc:201 src/skins/menus.cc:217 src/skins-qt/menus.cc:197
+#: src/skins-qt/menus.cc:213
 msgid "By Genre"
 msgstr "Por Género"
 
-#: src/skins/menus.cc:177 src/skins/menus.cc:191
+#: src/skins/menus.cc:202 src/skins/menus.cc:218 src/skins-qt/menus.cc:198
+#: src/skins-qt/menus.cc:214
 msgid "By Length"
 msgstr "Por Duración"
 
-#: src/skins/menus.cc:180 src/skins/menus.cc:194
+#: src/skins/menus.cc:205 src/skins/menus.cc:221 src/skins-qt/menus.cc:201
+#: src/skins-qt/menus.cc:217
 msgid "By Custom Title"
 msgstr "Por Título Personalizado"
 
-#: src/skins/menus.cc:198
+#: src/skins/menus.cc:206 src/skins/menus.cc:222 src/skins-qt/menus.cc:202
+#: src/skins-qt/menus.cc:218
+msgid "By Comment"
+msgstr "Por Commentario"
+
+#: src/skins/menus.cc:207 src/skins/menus.cc:223 src/skins-qt/menus.cc:203
+#: src/skins-qt/menus.cc:219
+msgid "By Disc Number"
+msgstr ""
+
+#: src/skins/menus.cc:227 src/skins-qt/menus.cc:223
 msgid "Randomize List"
 msgstr "Aleatorizar Lista"
 
-#: src/skins/menus.cc:199
+#: src/skins/menus.cc:228 src/skins-qt/menus.cc:224
 msgid "Reverse List"
 msgstr "Invertir Lista"
 
-#: src/skins/menus.cc:201
+#: src/skins/menus.cc:230 src/skins-qt/menus.cc:226
 msgid "Sort Selected"
 msgstr "Ordenar Seleccionado"
 
-#: src/skins/menus.cc:202
+#: src/skins/menus.cc:231 src/skins-qt/menus.cc:227
 msgid "Sort List"
 msgstr "Ordenar Lista"
 
-#: src/skins/menus.cc:208
+#: src/skins/menus.cc:236 src/skins-qt/menus.cc:232
+msgid "Open Containing Folder"
+msgstr "Abrir Carpeta Contenedora"
+
+#: src/skins/menus.cc:238 src/skins-qt/menus.cc:234
 msgid "Cut"
 msgstr "Cortar"
 
-#: src/skins/menus.cc:209
+#: src/skins/menus.cc:239 src/skins-qt/menus.cc:235
 msgid "Copy"
 msgstr "Copiar"
 
-#: src/skins/menus.cc:210
+#: src/skins/menus.cc:240 src/skins-qt/menus.cc:236
 msgid "Paste"
 msgstr "Pegar"
 
-#: src/skins/menus.cc:212
+#: src/skins/menus.cc:241 src/skins-qt/menus.cc:237
+msgid "Paste at End"
+msgstr "Copiar al Final"
+
+#: src/skins/menus.cc:243 src/skins-qt/menus.cc:239
 msgid "Queue/Unqueue"
 msgstr "A la Fila/Quitar de la Fila"
 
-#: src/skins/menus.cc:218
-msgid "Load Preset ..."
-msgstr "Cargar Preajuste ..."
-
-#: src/skins/menus.cc:219
-msgid "Load Auto Preset ..."
-msgstr "Cargar Preajuste Automático ..."
-
-#: src/skins/menus.cc:220
-msgid "Load Default"
-msgstr "Cargar Predeterminado"
-
-#: src/skins/menus.cc:221
-msgid "Load Preset File ..."
-msgstr "Cargar Archivo de Preajuste ..."
-
-#: src/skins/menus.cc:222
-msgid "Load EQF File ..."
-msgstr "Cargar Archivo EQF ..."
-
-#: src/skins/menus.cc:224
-msgid "Save Preset ..."
-msgstr "Guardar Preajuste ..."
-
-#: src/skins/menus.cc:225
-msgid "Save Auto Preset ..."
-msgstr "Guardar Preajuste Automático ..."
-
-#: src/skins/menus.cc:226
-msgid "Save Default"
-msgstr "Guardar Predeterminado"
-
-#: src/skins/menus.cc:227
-msgid "Save Preset File ..."
-msgstr "Guardar Archivo de Preajuste ..."
-
-#: src/skins/menus.cc:228
-msgid "Save EQF File ..."
-msgstr "Guardar Archivo EQF ..."
-
-#: src/skins/menus.cc:230
-msgid "Delete Preset ..."
-msgstr "Borrar Preajuste ..."
-
-#: src/skins/menus.cc:231
-msgid "Delete Auto Preset ..."
-msgstr "Borrar Preajuste Automático ..."
-
-#: src/skins/menus.cc:233
-msgid "Import Winamp Presets ..."
-msgstr "Importar Preajustes de Winamp ..."
-
-#: src/skins/menus.cc:235
-msgid "Reset to Zero"
-msgstr "Restablecer a Cero"
+#: src/skins/playlist-widget.cc:58 src/skins-qt/playlist-widget.cc:58
+#, c-format
+msgid "%s (%d of %d)"
+msgstr "%s (%d de %d)"
+
+#: src/skins/playlistwin.cc:491 src/skins-qt/playlistwin.cc:478
+msgid "Audacious Playlist Editor"
+msgstr "Editor de Listas de Reproducción de Audacious"
 
-#: src/skins/plugin.cc:48
+#: src/skins/plugin.cc:53 src/skins-qt/plugin.cc:65
 msgid "Winamp Classic Interface"
 msgstr "Interface Clásica de Winamp"
 
-#: src/skins/preset-browser.cc:57 src/skins/preset-list.cc:371
-#: src/skins/preset-list.cc:386
-msgid "Save"
-msgstr "Guardar"
-
-#: src/skins/preset-browser.cc:57 src/skins/preset-list.cc:338
-#: src/skins/preset-list.cc:354
-msgid "Load"
-msgstr "Cargar"
-
-#: src/skins/preset-browser.cc:83
-msgid "Load Preset File"
-msgstr "Cargar Archivo de Preajuste"
-
-#: src/skins/preset-browser.cc:100
-msgid "Load EQF File"
-msgstr "Cargar Archivo EQF"
-
-#: src/skins/preset-browser.cc:119
-msgid "Save Preset File"
-msgstr "Guardar Archivo de Prejuste"
-
-#: src/skins/preset-browser.cc:137
-msgid "Save EQF File"
-msgstr "Guardar Archivo EQF"
-
-#: src/skins/preset-browser.cc:151
-msgid "Import Winamp Presets"
-msgstr "Importar Preajuste de Winamp"
-
-#: src/skins/preset-list.cc:285
-msgid "Presets"
-msgstr "Presets"
-
-#: src/skins/preset-list.cc:335
-msgid "Load preset"
-msgstr "Cargar preset"
-
-#: src/skins/preset-list.cc:351
-msgid "Load auto-preset"
-msgstr "Cargar auto-preset"
-
-#: src/skins/preset-list.cc:367
-msgid "Save preset"
-msgstr "Guardar preset"
-
-#: src/skins/preset-list.cc:382
-msgid "Save auto-preset"
-msgstr "Guardar auto-preset"
-
-#: src/skins/preset-list.cc:408
-msgid "Delete preset"
-msgstr "Borrar preset"
-
-#: src/skins/preset-list.cc:424
-msgid "Delete auto-preset"
-msgstr "Borrar auto-preset"
+#: src/skins-qt/menus.cc:75
+msgid "Open Folder ..."
+msgstr "Abrir Carpeta ..."
+
+#: src/skins-qt/menus.cc:159
+msgid "Add Folder ..."
+msgstr "Agregar Carpeta ..."
+
+#: src/skins-qt/search-select.cc:62 src/skins/search-select.cc:77
+msgid "Search entries in active playlist"
+msgstr "Buscar entradas en la lista de reproducción activa"
+
+#: src/skins-qt/search-select.cc:70 src/skins/search-select.cc:83
+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 ""
+"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-qt/search-select.cc:75 src/skins/search-select.cc:91
+msgid "Title:"
+msgstr "Título:"
+
+#: src/skins-qt/search-select.cc:79 src/skins/search-select.cc:96
+msgid "Album:"
+msgstr "Álbum:"
+
+#: src/skins-qt/search-select.cc:82 src/skins/search-select.cc:101
+msgid "Artist:"
+msgstr "Artista:"
+
+#: src/skins-qt/search-select.cc:85 src/skins/search-select.cc:106
+msgid "File Name:"
+msgstr "Nombre de Archivo:"
+
+#: src/skins-qt/search-select.cc:88 src/skins/search-select.cc:134
+msgid "Clear previous selection before searching"
+msgstr "Limpiar selección previa antes de buscar"
+
+#: src/skins-qt/search-select.cc:89 src/skins/search-select.cc:137
+msgid "Automatically toggle queue for matching entries"
+msgstr "Cambiar automáticamente la cola para las entradas coincidentes"
 
-#: src/skins/skins_cfg.cc:176
+#: src/skins-qt/search-select.cc:90 src/skins/search-select.cc:140
+msgid "Create a new playlist with matching entries"
+msgstr "Crear una nueva lista de reproducción con las entradas coincidentes"
+
+#: src/skins-qt/search-select.cc:101 src/skins/search-select.cc:78
+msgid "Search"
+msgstr "Buscar"
+
+#: src/skins-qt/skins_cfg.cc:198 src/skins/skins_cfg.cc:182
 msgid "Player:"
 msgstr "Reproductor:"
 
-#: src/skins/skins_cfg.cc:178
+#: src/skins-qt/skins_cfg.cc:200 src/skins/skins_cfg.cc:184
 msgid "Select main player window font:"
 msgstr "Selecciona la fuente de la ventana principal del reproductor:"
 
-#: src/skins/skins_cfg.cc:179
+#: src/skins-qt/skins_cfg.cc:201 src/skins/skins_cfg.cc:185
 msgid "Playlist:"
 msgstr "Lista de reproducción:"
 
-#: src/skins/skins_cfg.cc:181
+#: src/skins-qt/skins_cfg.cc:203 src/skins/skins_cfg.cc:187
 msgid "Select playlist font:"
 msgstr "Selecciona la fuenta de la lista de reproducción:"
 
-#: src/skins/skins_cfg.cc:187
+#: src/skins-qt/skins_cfg.cc:207 src/skins/skins_cfg.cc:191
 msgid "Skin"
 msgstr "Piel"
 
-#: src/skins/skins_cfg.cc:189
+#: src/skins-qt/skins_cfg.cc:211 src/skins/skins_cfg.cc:193
+msgid "Display active titlebar when any window is focused"
+msgstr ""
+"Mostrar barra de títulos activa cuando cualquier ventana este al frente"
+
+#: src/skins-qt/skins_cfg.cc:213 src/skins/skins_cfg.cc:195
 msgid "Fonts"
 msgstr "Fuentes"
 
-#: src/skins/skins_cfg.cc:192
+#: src/skins-qt/skins_cfg.cc:215 src/skins/skins_cfg.cc:197
 msgid "Use bitmap fonts (supports ASCII only)"
 msgstr "Usar fuentes de mapa de bits (únicamente soporta ASCII)"
 
-#: src/skins/skins_cfg.cc:194
+#: src/skins-qt/skins_cfg.cc:217 src/skins/skins_cfg.cc:199
 msgid "Scroll song title"
 msgstr "Desplazar título de pista"
 
-#: src/skins/skins_cfg.cc:196
+#: src/skins-qt/skins_cfg.cc:219 src/skins/skins_cfg.cc:201
 msgid "Scroll song title in both directions"
 msgstr "Desplaza el título de la pista en ambas direcciones"
 
-#: src/skins/skins_cfg.cc:201
+#: src/skins-qt/skins_cfg.cc:224 src/skins/skins_cfg.cc:206
 msgid "Analyzer"
 msgstr "Analizador de Espectro"
 
-#: src/skins/skins_cfg.cc:202
+#: src/skins-qt/skins_cfg.cc:225 src/skins/skins_cfg.cc:207
 msgid "Scope"
 msgstr "Osciloscopio"
 
-#: src/skins/skins_cfg.cc:203
+#: src/skins-qt/skins_cfg.cc:226 src/skins/skins_cfg.cc:208
 msgid "Voiceprint / VU meter"
 msgstr "Espectrograma vocal / medidor VU"
 
-#: src/skins/skins_cfg.cc:204
+#: src/skins-qt/skins_cfg.cc:227 src/skins/skins_cfg.cc:209
 msgid "Off"
 msgstr "Apagado"
 
-#: src/skins/skins_cfg.cc:208 src/skins/skins_cfg.cc:233
-#: src/skins/skins_cfg.cc:239
+#: src/skins-qt/skins_cfg.cc:231 src/skins-qt/skins_cfg.cc:256
+#: src/skins-qt/skins_cfg.cc:262 src/skins/skins_cfg.cc:213
+#: src/skins/skins_cfg.cc:238 src/skins/skins_cfg.cc:244
 msgid "Normal"
 msgstr "Normal"
 
-#: src/skins/skins_cfg.cc:209 src/skins/skins_cfg.cc:234
+#: src/skins-qt/skins_cfg.cc:232 src/skins-qt/skins_cfg.cc:257
+#: src/skins/skins_cfg.cc:214 src/skins/skins_cfg.cc:239
 msgid "Fire"
 msgstr "Fuego"
 
-#: src/skins/skins_cfg.cc:210
+#: src/skins-qt/skins_cfg.cc:233 src/skins/skins_cfg.cc:215
 msgid "Vertical lines"
 msgstr "Líneas verticales"
 
-#: src/skins/skins_cfg.cc:214
+#: src/skins-qt/skins_cfg.cc:237 src/skins/skins_cfg.cc:219
 msgid "Lines"
 msgstr "Líneas"
 
-#: src/skins/skins_cfg.cc:215
+#: src/skins-qt/skins_cfg.cc:238 src/skins/skins_cfg.cc:220
 msgid "Bars"
 msgstr "Barras"
 
-#: src/skins/skins_cfg.cc:219
+#: src/skins-qt/skins_cfg.cc:242 src/skins/skins_cfg.cc:224
 msgid "Slowest"
 msgstr "Muy lento"
 
-#: src/skins/skins_cfg.cc:220
+#: src/skins-qt/skins_cfg.cc:243 src/skins/skins_cfg.cc:225
 msgid "Slow"
 msgstr "Lento"
 
-#: src/skins/skins_cfg.cc:221 src/sox-resampler/sox-resampler.cc:152
+#: src/skins-qt/skins_cfg.cc:244 src/skins/skins_cfg.cc:226
+#: src/soxr/sox-resampler.cc:180
 msgid "Medium"
 msgstr "Medio"
 
-#: src/skins/skins_cfg.cc:222
+#: src/skins-qt/skins_cfg.cc:245 src/skins/skins_cfg.cc:227
 msgid "Fast"
 msgstr "Rápido"
 
-#: src/skins/skins_cfg.cc:223
+#: src/skins-qt/skins_cfg.cc:246 src/skins/skins_cfg.cc:228
 msgid "Fastest"
 msgstr "Muy rápido"
 
-#: src/skins/skins_cfg.cc:227
+#: src/skins-qt/skins_cfg.cc:250 src/skins/skins_cfg.cc:232
 msgid "Dots"
 msgstr "Puntos"
 
-#: src/skins/skins_cfg.cc:228
+#: src/skins-qt/skins_cfg.cc:251 src/skins/skins_cfg.cc:233
 msgid "Line"
 msgstr "Línea"
 
-#: src/skins/skins_cfg.cc:229
+#: src/skins-qt/skins_cfg.cc:252 src/skins/skins_cfg.cc:234
 msgid "Solid"
 msgstr "Sólido"
 
-#: src/skins/skins_cfg.cc:235
+#: src/skins-qt/skins_cfg.cc:258 src/skins/skins_cfg.cc:240
 msgid "Ice"
 msgstr "Hielo"
 
-#: src/skins/skins_cfg.cc:240
+#: src/skins-qt/skins_cfg.cc:263 src/skins/skins_cfg.cc:245
 msgid "Smooth"
 msgstr "Suave"
 
-#: src/skins/skins_cfg.cc:244
-msgid "Type"
-msgstr "Tipo"
-
-#: src/skins/skins_cfg.cc:245
-msgid "Visualization type:"
-msgstr "Tipo de visualización:"
-
-#: src/skins/skins_cfg.cc:248
-msgid "Analyzer"
-msgstr "Analizador"
-
-#: src/skins/skins_cfg.cc:249
-msgid "Show peaks"
-msgstr "Mostrar picos"
-
-#: src/skins/skins_cfg.cc:251
+#: src/skins-qt/skins_cfg.cc:267 src/skins/skins_cfg.cc:249
 msgid "Coloring:"
 msgstr "Colorear:"
 
-#: src/skins/skins_cfg.cc:254
+#: src/skins-qt/skins_cfg.cc:270 src/skins/skins_cfg.cc:252
 msgid "Style:"
 msgstr "Estilo:"
 
-#: src/skins/skins_cfg.cc:257
+#: src/skins-qt/skins_cfg.cc:273 src/skins/skins_cfg.cc:255
 msgid "Falloff:"
 msgstr "Caída:"
 
-#: src/skins/skins_cfg.cc:260
+#: src/skins-qt/skins_cfg.cc:276 src/skins/skins_cfg.cc:258
 msgid "Peak falloff:"
 msgstr "Caída de pico:"
 
-#: src/skins/skins_cfg.cc:264
+#: src/skins-qt/skins_cfg.cc:282 src/skins/skins_cfg.cc:264
 msgid "Scope Style:"
 msgstr "Estilo del Analizador de Espectro:"
 
-#: src/skins/skins_cfg.cc:267
+#: src/skins-qt/skins_cfg.cc:285 src/skins/skins_cfg.cc:267
 msgid "Voiceprint Coloring:"
 msgstr "Color del Espectrograma vocal:"
 
-#: src/skins/skins_cfg.cc:270
+#: src/skins-qt/skins_cfg.cc:288 src/skins/skins_cfg.cc:270
 msgid "VU Meter Style:"
 msgstr "Estilo del medidor VU:"
 
-#: src/skins/skins_cfg.cc:276
-msgid "General"
-msgstr "General"
-
-#: src/skins/skins_cfg.cc:277
-msgid "Visualization"
-msgstr "Visualización"
-
-#: src/skins/ui_equalizer.cc:282
-msgid "Preamp"
-msgstr "Preamplificación"
-
-#: src/skins/ui_equalizer.cc:286
-msgid "31 Hz"
-msgstr "31 Hz"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "63 Hz"
-msgstr "63 Hz"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "125 Hz"
-msgstr "125 Hz"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "250 Hz"
-msgstr "250 Hz"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "500 Hz"
-msgstr "500 Hz"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "1 kHz"
-msgstr "1 kHz"
-
-#: src/skins/ui_equalizer.cc:288
-msgid "2 kHz"
-msgstr "2 kHz"
-
-#: src/skins/ui_equalizer.cc:288
-msgid "4 kHz"
-msgstr "4 kHz"
-
-#: src/skins/ui_equalizer.cc:288
-msgid "8 kHz"
-msgstr "8 kHz"
-
-#: src/skins/ui_equalizer.cc:288
-msgid "16 kHz"
-msgstr "16 kHz"
-
-#: src/skins/ui_equalizer.cc:330
-msgid "Audacious Equalizer"
-msgstr "Ecualizador de Audacious"
-
-#: src/skins/ui_main.cc:688
-#, c-format
-msgid "Seek to %d:%-2.2d / %d:%-2.2d"
-msgstr "Saltar a %d:%-2.2d / %d:%-2.2d"
-
-#: src/skins/ui_main.cc:709
-#, c-format
-msgid "Volume: %d%%"
-msgstr "Volumen: %d%%"
-
-#: src/skins/ui_main.cc:732
-#, c-format
-msgid "Balance: %d%% left"
-msgstr "Balance: %d%% izquierda"
-
-#: src/skins/ui_main.cc:734
-msgid "Balance: center"
-msgstr "Balance: central"
-
-#: src/skins/ui_main.cc:736
-#, c-format
-msgid "Balance: %d%% right"
-msgstr "Balance: %d%% derecha"
-
-#: src/skins/ui_main.cc:842
-msgid "Options Menu"
-msgstr "Menú de Opciones"
-
-#: src/skins/ui_main.cc:846
-msgid "Disable 'Always On Top'"
-msgstr "Deshabilitar 'Siempre Encima'"
-
-#: src/skins/ui_main.cc:848
-msgid "Enable 'Always On Top'"
-msgstr "Habilitar 'Siempre Encima'"
-
-#: src/skins/ui_main.cc:851
-msgid "File Info Box"
-msgstr "Caja de Información del Archivo"
-
-#: src/skins/ui_main.cc:857
-msgid "Visualizations"
-msgstr "Visualizaciones"
-
-#: src/skins/ui_main.cc:1336
-msgid "Repeat point A set."
-msgstr "Repite punto A configurado."
-
-#: src/skins/ui_main.cc:1341
-msgid "Repeat point B set."
-msgstr "Repite punto B configurado."
-
-#: src/skins/ui_main.cc:1350
-msgid "Repeat points cleared."
-msgstr "Repite puntos borrados."
-
-#: src/skins/ui_playlist.cc:219
-msgid "Search entries in active playlist"
-msgstr "Buscar entradas en la lista de reproducción activa"
-
-#: src/skins/ui_playlist.cc:226
-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 ""
-"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.cc:234
-msgid "Title:"
-msgstr "Título:"
-
-#: src/skins/ui_playlist.cc:241
-msgid "Album:"
-msgstr "Álbum:"
-
-#: src/skins/ui_playlist.cc:248
-msgid "Artist:"
-msgstr "Artista:"
-
-#: src/skins/ui_playlist.cc:255
-msgid "File Name:"
-msgstr "Nombre de Archivo:"
-
-#: src/skins/ui_playlist.cc:263
-msgid "Clear previous selection before searching"
-msgstr "Limpiar selección previa antes de buscar"
+#: src/skins-qt/skins_cfg.cc:294 src/skins/skins_cfg.cc:276
+msgid "Type"
+msgstr "Tipo"
 
-#: src/skins/ui_playlist.cc:266
-msgid "Automatically toggle queue for matching entries"
-msgstr "Cambiar automáticamente la cola para las entradas coincidentes"
+#: src/skins-qt/skins_cfg.cc:295 src/skins/skins_cfg.cc:277
+msgid "Visualization type:"
+msgstr "Tipo de visualización:"
 
-#: src/skins/ui_playlist.cc:269
-msgid "Create a new playlist with matching entries"
-msgstr "Crear una nueva lista de reproducción con las entradas coincidentes"
+#: src/skins-qt/skins_cfg.cc:298 src/skins/skins_cfg.cc:280
+msgid "Analyzer"
+msgstr "Analizador"
 
-#: src/skins/ui_playlist.cc:717
-msgid "Audacious Playlist Editor"
-msgstr "Editor de Listas de Reproducción de Audacious"
+#: src/skins-qt/skins_cfg.cc:299 src/skins/skins_cfg.cc:281
+msgid "Show peaks"
+msgstr "Mostrar picos"
 
-#: src/skins/ui_playlist.cc:752
-#, c-format
-msgid "%s (%d of %d)"
-msgstr "%s (%d de %d)"
+#: src/skins-qt/skins_cfg.cc:308 src/skins/skins_cfg.cc:290
+msgid "Visualization"
+msgstr "Visualización"
 
-#: src/skins/ui_skinselector.cc:167
+#: src/skins-qt/skinselector.cc:98 src/skins/skinselector.cc:111
 msgid "Archived Winamp 2.x skin"
 msgstr "Skin de Winamp 2.x comprimida"
 
-#: src/skins/ui_skinselector.cc:172
+#: src/skins-qt/skinselector.cc:102 src/skins/skinselector.cc:115
 msgid "Unarchived Winamp 2.x skin"
 msgstr "Skin de winamp 2.x sin comprimir"
 
-#: src/skins/util.cc:430
-#, c-format
-msgid "Could not create directory (%s): %s\n"
-msgstr "No se puede crear el directorio (%s): %s\n"
-
-#: src/sndfile/plugin.cc:39
+#: src/sndfile/plugin.cc:38
 msgid "Sndfile Plugin"
 msgstr "Plugin Sndfile"
 
-#: src/sndfile/plugin.cc:336
+#: src/sndfile/plugin.cc:372
 msgid ""
 "Based on the xmms_sndfile plugin:\n"
 "Copyright (C) 2000, 2002 Erik de Castro Lopo\n"
@@ -3987,111 +4208,113 @@
 "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA \n"
 "02110-1301, USA."
 
-#: src/sndio-ng/sndio.cc:44
+#: src/sndio/sndio.cc:43
 msgid "Sndio Output"
 msgstr "Salida Sndio"
 
-#: src/sndio-ng/sndio.cc:98
+#: src/sndio/sndio.cc:98
 msgid "Device (blank for default):"
 msgstr "Dispositivo (en blanco para predeterminado):"
 
-#: src/sndio-ng/sndio.cc:100
+#: src/sndio/sndio.cc:100
 msgid "Save and restore volume:"
 msgstr "Guardar y restaurar volumen:"
 
-#: src/sndio-ng/sndio.cc:181
+#: src/sndio/sndio.cc:181
 #, c-format
 msgid "Sndio error: Unsupported audio format (%d)"
 msgstr "Error Sndio: Formato de audio no soportado (%d)"
 
-#: src/sndio-ng/sndio.cc:192
+#: src/sndio/sndio.cc:192
 msgid "Sndio error: sio_open() failed"
 msgstr "Error Sndio: falló sio_open()"
 
-#: src/sndio-ng/sndio.cc:222
+#: src/sndio/sndio.cc:221
 msgid "Sndio error: sio_setpar() failed"
 msgstr "Error Sndio: falló sio_setpar()"
 
-#: src/sndio-ng/sndio.cc:234
+#: src/sndio/sndio.cc:233
 msgid "Sndio error: sio_start() failed"
 msgstr "Error Sndio error: falló sio_start()"
 
-#: src/song_change/song_change.cc:33
+#: src/songchange/song_change.cc:30
 msgid "Song Change"
 msgstr "Cambiar Pista"
 
-#: src/song_change/song_change.cc:342
-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."
-
-#: src/song_change/song_change.cc:358
+#: src/songchange/song_change.cc:256
 msgid "Commands"
 msgstr "Comandos"
 
-#: src/song_change/song_change.cc:360
+#: src/songchange/song_change.cc:258
 msgid "Command to run when starting a new song:"
 msgstr "Comando para ejecutar cuando inicie una nueva pista:"
 
-#: src/song_change/song_change.cc:364
+#: src/songchange/song_change.cc:261
+msgid "Command to run when stopping a song:"
+msgstr ""
+
+#: src/songchange/song_change.cc:264
 msgid "Command to run at the end of a song:"
 msgstr "Comando para ejecutar al finalizar una pista:"
 
-#: src/song_change/song_change.cc:368
+#: src/songchange/song_change.cc:267
 msgid "Command to run at the end of the playlist:"
 msgstr "Comando para ejecutar al finalizar una lista de reproducción:"
 
-#: src/song_change/song_change.cc:372
+#: src/songchange/song_change.cc:270
 msgid "Command to run when song title changes (for network streams):"
 msgstr ""
 "Comando para ejecutar cuando el título de pista cambie (para transmisión por "
 "red):"
 
-#: src/song_change/song_change.cc:376
+#: src/songchange/song_change.cc:273
 msgid ""
-"You can use the following format strings which will be substituted before "
-"calling the command (not all are useful for the end-of-playlist command):\n"
-"\n"
-"%F: Frequency (in hertz)\n"
+"You can use the following format codes, which will be replaced before "
+"running the command.\n"
+"Not all are useful though for the song-stopped or end-of-playlist command."
+msgstr ""
+
+#: src/songchange/song_change.cc:276
+msgid ""
+"%a: Artist\n"
+"%b: Album\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"
+"%F: Frequency (Hertz)\n"
+"%l: Length (milliseconds)\n"
+"%n or %s: Formatted title (see playlist settings)\n"
 "%p: Currently playing (1 or 0)\n"
-"%a: Artist\n"
-"%b: Album\n"
-"%T: Track title"
+"%r: Rate (bits per second)\n"
+"%t: Playlist position\n"
+"%T: Title (unformatted)"
 msgstr ""
-"Puedes usar los siguientes formatos de cadena que serán sustituidos antes de "
-"llamar\n"
-"al comando (no todos son útiles para el comando al finalizar lista de "
-"reproducción):\n"
-"%F: Frecuencia (en hertz)\n"
-"%c: Número de canales\n"
-"%f: Nombre del 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 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-info-qt/song-info.cc:32
-msgid "Song Info (Qt)"
-msgstr "Info. de Pista (Qt)"
+"%c: Número de canales\n"
+"%f: Nombre de Archivo (destino completo)\n"
+"%F: Frecuencia (Hertz)\n"
+"%l: Duración (milisegundos)\n"
+"%n or %s: Título formateado (ver ajustes de lista de reprod.)\n"
+"%p: Reproduciendo actualmente (1 ó 0)\n"
+"%r: Tasa (bits por segundo)\n"
+"%t: Posición en lista de Reprod.\n"
+"%T: Título (sin formato)"
+
+#: src/songchange/song_change.cc:287
+msgid ""
+"Parameters passed to the shell should be enclosed in quotation marks.\n"
+"Unquoted parameters may lead to unexpected results."
+msgstr ""
+
+#: src/song-info-qt/song-info.cc:30
+msgid "Song Info"
+msgstr "Información de Pista"
 
-#: src/sox-resampler/sox-resampler.cc:44
+#: src/soxr/sox-resampler.cc:44
 msgid "SoX Resampler"
 msgstr "SoX Resampler"
 
-#: src/sox-resampler/sox-resampler.cc:144
+#: src/soxr/sox-resampler.cc:172
 msgid ""
 "SoX Resampler Plugin for Audacious\n"
 "Copyright 2013 Michał Lipski\n"
@@ -4105,96 +4328,144 @@
 "Basado en el Plugin Sample Rate Coverter\n"
 "Copyright 2010-2012 John Lindgren"
 
-#: src/sox-resampler/sox-resampler.cc:150
+#: src/soxr/sox-resampler.cc:178
 msgid "Quick"
 msgstr "Rápido"
 
-#: src/sox-resampler/sox-resampler.cc:151
+#: src/soxr/sox-resampler.cc:179
 msgid "Low"
 msgstr "Bajo"
 
-#: src/sox-resampler/sox-resampler.cc:153
+#: src/soxr/sox-resampler.cc:181
 msgid "High"
 msgstr "Alto"
 
-#: src/sox-resampler/sox-resampler.cc:154
+#: src/soxr/sox-resampler.cc:182
 msgid "Very High"
 msgstr "Muy Alto"
 
-#: src/sox-resampler/sox-resampler.cc:158
+#: src/soxr/sox-resampler.cc:183
+msgid "Ultra High"
+msgstr "Ultra Alto"
+
+#: src/soxr/sox-resampler.cc:187
+msgid "Minimum"
+msgstr "Mínimo"
+
+#: src/soxr/sox-resampler.cc:188
+msgid "Intermediate"
+msgstr "Intermedio"
+
+#: src/soxr/sox-resampler.cc:193
 msgid "Quality:"
 msgstr "Calidad:"
 
-#: src/speed-pitch/speed-pitch.cc:51
+#: src/soxr/sox-resampler.cc:196
+msgid "Phase:"
+msgstr "Fase:"
+
+#: src/soxr/sox-resampler.cc:200
+msgid "Allow aliasing"
+msgstr "Permitir aliasing"
+
+#: src/soxr/sox-resampler.cc:202
+msgid "Use steep filter"
+msgstr "Usar filtro excesivo"
+
+#: src/speedpitch/speed-pitch.cc:54
 msgid "Speed and Pitch"
 msgstr "Velocidad y Tono"
 
-#: src/speed-pitch/speed-pitch.cc:210
-msgid "Speed and Pitch"
-msgstr "Velocidad y Tono"
-
-#: src/speed-pitch/speed-pitch.cc:211
-msgid "Speed:"
-msgstr "Velocidad:"
-
-#: src/speed-pitch/speed-pitch.cc:214
-msgid "Pitch:"
-msgstr "Tono:"
+#: src/speedpitch/speed-pitch.cc:247
+msgid "Speed"
+msgstr "Velocidad"
+
+#: src/speedpitch/speed-pitch.cc:248
+msgid "Decouple from pitch"
+msgstr "Desacoplar de pitch"
+
+#: src/speedpitch/speed-pitch.cc:250 src/speedpitch/speed-pitch.cc:258
+msgid "Multiplier:"
+msgstr "Multiplicador:"
+
+#: src/speedpitch/speed-pitch.cc:254
+msgid "Pitch"
+msgstr "Pitch"
 
-#: src/statusicon/statusicon.cc:47
+#: src/statusicon-qt/statusicon.cc:45 src/statusicon/statusicon.cc:47
 msgid "Status Icon"
 msgstr "Ícono de Estado"
 
-#: src/statusicon/statusicon.cc:283
-msgid "Se_ttings ..."
-msgstr "Ajus_tes ..."
-
-#: src/statusicon/statusicon.cc:372
+#: src/statusicon-qt/statusicon.cc:68
 msgid ""
-"Status Icon Plugin\n"
+"Status Icon Plugin (partial port for Qt interface)\n"
 "\n"
 "Copyright 2005-2007 Giacomo Lozito <james@develia.org>\n"
 "Copyright 2010 Michał Lipski <tallica@o2.pl>\n"
+"Copyright 2015 Eugene Paskevich <eugene@raptor.kiev.ua>\n"
 "\n"
 "This plugin provides a status icon, placed in\n"
 "the system tray area of the window manager."
 msgstr ""
-"Plugin Status Icon \n"
+"Plugin de Ícono de Estado (puerto parcial para interfaz Qt)\n"
 "\n"
 "Copyright 2005-2007 Giacomo Lozito <james@develia.org>\n"
 "Copyright 2010 Michał Lipski <tallica@o2.pl>\n"
+"Copyright 2015 Eugene Paskevich <eugene@raptor.kiev.ua>\n"
 "\n"
-"Este plugin provee un ícono de estado, colocado en el área \n"
-"de la bandeja del sistema del administrador de la ventana."
+"Este plugin provee un ícono de estado, localizado en\n"
+"el área de bandeja del sistema del administrador de ventana."
 
-#: src/statusicon/statusicon.cc:379
+#: src/statusicon-qt/statusicon.cc:89 src/statusicon/statusicon.cc:384
 msgid "Mouse Scroll Action"
 msgstr "Acción de rueda central del mouse"
 
-#: src/statusicon/statusicon.cc:380
+#: src/statusicon-qt/statusicon.cc:90 src/statusicon/statusicon.cc:385
 msgid "Change volume"
 msgstr "Cambiar volumen"
 
-#: src/statusicon/statusicon.cc:383
+#: src/statusicon-qt/statusicon.cc:93 src/statusicon/statusicon.cc:388
 msgid "Change playing song"
 msgstr "Cambiar pista en reproducción"
 
-#: src/statusicon/statusicon.cc:386
+#: src/statusicon-qt/statusicon.cc:96 src/statusicon/statusicon.cc:391
 msgid "Other Settings"
 msgstr "Otras Configuraciones"
 
-#: src/statusicon/statusicon.cc:387
+#: src/statusicon-qt/statusicon.cc:97 src/statusicon/statusicon.cc:392
 msgid "Disable the popup window"
 msgstr "Deshabilitar la ventana emergente"
 
-#: src/statusicon/statusicon.cc:389
+#: src/statusicon-qt/statusicon.cc:99 src/statusicon/statusicon.cc:394
 msgid "Close to the system tray"
 msgstr "Cerrar a la bandeja del sistema"
 
-#: src/statusicon/statusicon.cc:391
+#: src/statusicon-qt/statusicon.cc:101 src/statusicon/statusicon.cc:396
 msgid "Advance in playlist when scrolling upward"
 msgstr "Avanzar en la lista de reproducción cuando se desplace hacia arriba"
 
+#: src/statusicon-qt/statusicon.cc:116 src/statusicon/statusicon.cc:287
+msgid "Se_ttings ..."
+msgstr "Ajus_tes ..."
+
+#: src/statusicon/statusicon.cc:377
+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 ""
+"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/stereo_plugin/stereo.cc:19
 msgid "Extra Stereo"
 msgstr "Extra Estéreo"
@@ -4213,20 +4484,160 @@
 msgid "Extra Stereo"
 msgstr "Extra Estéreo"
 
+#: src/streamtuner/icecast-model.cc:126 src/streamtuner/shoutcast-model.cc:131
+msgid "Type"
+msgstr "Tipo"
+
+#: src/streamtuner/icecast-model.cc:132
+msgid "Current Song"
+msgstr "Pista Actual"
+
+#: src/streamtuner/icecast-model.cc:164
+msgid "Other"
+msgstr "Otro"
+
+#: src/streamtuner/ihr-model.cc:63
+msgid "Market"
+msgstr "Market"
+
+#: src/streamtuner/ihr-model.cc:156
+msgid "Call Letters"
+msgstr "Call Letters"
+
+#: src/streamtuner/ihr-model.cc:162
+msgid "Description"
+msgstr "Descripción"
+
+#: src/streamtuner/shoutcast-model.cc:128
+msgid "Listeners"
+msgstr "Escuchando"
+
+#: src/streamtuner/shoutcast-model.cc:188
+msgid "Top 500 Stations"
+msgstr "Mejores 500 estaciones"
+
+#: src/streamtuner/shoutcast-model.cc:189
+msgid "Alternative"
+msgstr "Alternativa"
+
+#: src/streamtuner/shoutcast-model.cc:190
+msgid "Blues"
+msgstr "blues"
+
+#: src/streamtuner/shoutcast-model.cc:191
+msgid "Classical"
+msgstr "Clásica"
+
+#: src/streamtuner/shoutcast-model.cc:192
+msgid "Country"
+msgstr "Country"
+
+#: src/streamtuner/shoutcast-model.cc:193
+msgid "Decades"
+msgstr "Décadas"
+
+#: src/streamtuner/shoutcast-model.cc:194
+msgid "Easy Listening"
+msgstr "Easy Listening"
+
+#: src/streamtuner/shoutcast-model.cc:195
+msgid "Electronic"
+msgstr "Electronic"
+
+#: src/streamtuner/shoutcast-model.cc:196
+msgid "Folk"
+msgstr "Folk"
+
+#: src/streamtuner/shoutcast-model.cc:197
+msgid "Inspirational"
+msgstr "Inspiracional"
+
+#: src/streamtuner/shoutcast-model.cc:198
+msgid "International"
+msgstr "Internacional"
+
+#: src/streamtuner/shoutcast-model.cc:199
+msgid "Jazz"
+msgstr "Jazz"
+
+#: src/streamtuner/shoutcast-model.cc:200
+msgid "Latin"
+msgstr "Latina"
+
+#: src/streamtuner/shoutcast-model.cc:201
+msgid "Metal"
+msgstr "Metal"
+
+#: src/streamtuner/shoutcast-model.cc:203
+msgid "New Age"
+msgstr "New Age"
+
+#: src/streamtuner/shoutcast-model.cc:204
+msgid "Pop"
+msgstr "Pop"
+
+#: src/streamtuner/shoutcast-model.cc:205
+msgid "Public Radio"
+msgstr "Radio Pública"
+
+#: src/streamtuner/shoutcast-model.cc:206
+msgid "R&B and Urban"
+msgstr "R&B y Urbana"
+
+#: src/streamtuner/shoutcast-model.cc:207
+msgid "Rap"
+msgstr "Rap"
+
+#: src/streamtuner/shoutcast-model.cc:208
+msgid "Reggae"
+msgstr "Reggae"
+
+#: src/streamtuner/shoutcast-model.cc:209
+msgid "Rock"
+msgstr "Rock"
+
+#: src/streamtuner/shoutcast-model.cc:210
+msgid "Seasonal and Holiday"
+msgstr "Temporada y Festiva"
+
+#: src/streamtuner/shoutcast-model.cc:211
+msgid "Soundtracks"
+msgstr "Soundtracks"
+
+#: src/streamtuner/shoutcast-model.cc:212
+msgid "Talk"
+msgstr "Hablada"
+
+#: src/streamtuner/shoutcast-model.cc:213
+msgid "Themes"
+msgstr "Temas"
+
+#: src/streamtuner/streamtuner.cc:59
+msgid "Shoutcast"
+msgstr "Shoutcast"
+
+#: src/streamtuner/streamtuner.cc:60
+msgid "Icecast"
+msgstr "Icecast"
+
+#: src/streamtuner/streamtuner.cc:71
+msgid "Stream Tuner"
+msgstr "Sintonizador de Streams"
+
 #: src/tonegen/tonegen.cc:45
 msgid "Tone Generator"
 msgstr "Generador de Tonos"
 
-#: src/tonegen/tonegen.cc:94
+#: src/tonegen/tonegen.cc:92
 #, c-format
 msgid "%s %.1f Hz"
 msgstr "%s %.1f Hz"
 
-#: src/tonegen/tonegen.cc:94
+#: src/tonegen/tonegen.cc:92
 msgid "Tone Generator: "
 msgstr "Generador de tonos: "
 
-#: src/tonegen/tonegen.cc:160
+#: src/tonegen/tonegen.cc:161
 msgid ""
 "Sine tone generator by Håvard Kvålen <havardk@xmms.org>\n"
 "Modified by Daniel J. Peng <danielpeng@bigfoot.com>\n"
@@ -4241,11 +4652,32 @@
 "por ejemplo, tone://2000;2005 to reproducir un tono de2000 Hz tone y un tono "
 "de 2005 Hz"
 
+#: src/ui-common/dialogs-qt.cc:40
+msgid ""
+"\n"
+"(Further messages have been hidden.)"
+msgstr ""
+"\n"
+"(Más mensajes han sido ocultados.)"
+
+#: src/ui-common/dialogs-qt.cc:52
+msgid "Working ..."
+msgstr "Trabajando ..."
+
+#: src/ui-common/dialogs-qt.cc:73
+msgid "Information"
+msgstr "Información"
+
+#: src/ui-common/menu-ops-gtk.cc:132 src/ui-common/menu-ops-qt.cc:113
+#, c-format
+msgid "%s does not appear to be a valid folder."
+msgstr "%s no parece ser un folder válido."
+
 #: src/voice_removal/voice_removal.cc:28
 msgid "Voice Removal"
 msgstr "Removedor de Voz"
 
-#: src/vorbis/vorbis.cc:465
+#: src/vorbis/vorbis.cc:433
 msgid ""
 "Audacious Ogg Vorbis Decoder\n"
 "\n"
@@ -4287,12 +4719,12 @@
 msgid "Ogg Vorbis Decoder"
 msgstr "Decodificador Ogg Vorbis"
 
-#: src/vtx/info.cc:22
+#: src/vtx/info.cc:24
 #, c-format
 msgid "Details about %s"
 msgstr "Detalles sobre %s"
 
-#: src/vtx/info.cc:24
+#: src/vtx/info.cc:26
 msgid ""
 "Title: %t\n"
 "Author: %a\n"
@@ -4322,7 +4754,7 @@
 msgid "VTX Decoder"
 msgstr "Decodificador VTX"
 
-#: src/vtx/vtx.cc:184
+#: src/vtx/vtx.cc:178
 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"
@@ -4333,19 +4765,63 @@
 "Basado en in_vtx.dll por Roman Sherbakov <v_soft@microfor.ru>\n"
 "Plugin para Audacious por Pavel Vymetalek <pvymetalek@seznam.cz>"
 
-#: src/wavpack/wavpack.cc:24
+#: src/vumeter-qt/vumeter_qt.cc:31
+msgid ""
+"VU Meter Plugin for Audacious\n"
+"Copyright 2017-2019 Marc Sánchez Fauste"
+msgstr ""
+"VU Meter Plugin para Audacious\n"
+"Copyright 2017-2019 Marc Sánchez Fauste"
+
+#: src/vumeter-qt/vumeter_qt.cc:35
+msgid "VU Meter Settings"
+msgstr "Configuración del VU Meter"
+
+#: src/vumeter-qt/vumeter_qt.cc:37
+msgid "Peak hold time:"
+msgstr "Tiempo de retraso del Pico:"
+
+#: src/vumeter-qt/vumeter_qt.cc:42
+msgid "Fall-off time:"
+msgstr "Tiempo de caida:"
+
+#: src/vumeter-qt/vumeter_qt.cc:44
+msgid "dB/second"
+msgstr "dB/seg"
+
+#: src/vumeter-qt/vumeter_qt.cc:46
+msgid "Display legend"
+msgstr "Mostrar leyenda"
+
+#: src/vumeter-qt/vumeter_qt.h:37
+msgid "VU Meter"
+msgstr "VU Meter"
+
+#: src/waveout/waveout.cc:43
+msgid "Win32 waveOut"
+msgstr "waveOut Win32 "
+
+#: src/waveout/waveout.cc:69
+msgid ""
+"Win32 waveOut Plugin for Audacious\n"
+"Copyright 2016 John Lindgren"
+msgstr ""
+"Plugin para Audacious Win32 waveOut \n"
+"Copyright 2016 John Lindgren"
+
+#: src/wavpack/wavpack.cc:25
 msgid "WavPack Decoder"
 msgstr "Decodificador WavPack"
 
-#: src/wavpack/wavpack.cc:211
+#: src/wavpack/wavpack.cc:217
 msgid "lossy (hybrid)"
 msgstr "con pérdida (híbrido)"
 
-#: src/wavpack/wavpack.cc:213
+#: src/wavpack/wavpack.cc:219
 msgid "lossy"
 msgstr "con pérdida"
 
-#: src/wavpack/wavpack.cc:255
+#: src/wavpack/wavpack.cc:259
 msgid ""
 "Copyright 2006 William Pitcock <nenolod@nenolod.net>\n"
 "\n"
@@ -4355,18 +4831,38 @@
 "\n"
 "Algo del código del plugin era de Miles Egan."
 
-#: src/xsf/plugin.cc:50
+#: src/xsf/plugin.cc:74
 msgid "2SF Decoder"
 msgstr "Decodificador 2SF"
 
-#: src/xsf/plugin.cc:238
+#: src/xsf/plugin.cc:429
+msgid "32728 Hz"
+msgstr "32728 Hz"
+
+#: src/xsf/plugin.cc:432
+msgid "65456 Hz"
+msgstr "65456 Hz"
+
+#: src/xsf/plugin.cc:438
+msgid "Cosine"
+msgstr "Coseno"
+
+#: src/xsf/plugin.cc:439
+msgid "Sharp"
+msgstr "Agudo"
+
+#: src/xsf/plugin.cc:443
 msgid "XSF Configuration"
 msgstr "Configuración XSF"
 
-#: src/xsf/plugin.cc:239
-msgid "Ignore length from file"
-msgstr "Ignorar duración del archivo"
+#: src/xsf/plugin.cc:445
+msgid "Default fade time:"
+msgstr "Tiempo de fundido predeterminado:"
+
+#: src/xsf/plugin.cc:447
+msgid "Interpolation mode:"
+msgstr "Modo de interpolación:"
 
-#: src/xspf/xspf.cc:89
+#: src/xspf/xspf.cc:95
 msgid "XML Shareable Playlists (XSPF)"
 msgstr "Listas de Reprod. XML Compartibles (XSPF)"

audacious-plugins-3.6.2-gtk3.tar.bz2/po/et.po -> audacious-plugins-4.4.1.tar.bz2/po/et.po Changed

@@ -4,15 +4,16 @@
 #
 # Translators:
 # Ivar Smolin <okul at linux ee>, 2007
-# Ivar Smolin <okul@linux.ee>, 2012
+# Ivar Smolin <okul@linux.ee>, 2012,2017-2020,2022
 msgid ""
 msgstr ""
 "Project-Id-Version: Audacious Plugins\n"
-"Report-Msgid-Bugs-To: http://redmine.audacious-media-player.org/\n"
-"POT-Creation-Date: 2015-02-28 19:18+0100\n"
-"PO-Revision-Date: 2015-02-04 21:21+0000\n"
-"Last-Translator: Thomas Lange <thomas-lange2@gmx.de>\n"
-"Language-Team: Estonian (http://www.transifex.com/projects/p/audacious/"
+"Report-Msgid-Bugs-To: https://github.com/audacious-media-player/audacious/"
+"issues\n"
+"POT-Creation-Date: 2024-09-26 21:54+0200\n"
+"PO-Revision-Date: 2011-10-10 17:43+0000\n"
+"Last-Translator: Ivar Smolin <okul@linux.ee>, 2012,2017-2020,2022\n"
+"Language-Team: Estonian (http://app.transifex.com/audacious/audacious/"
 "language/et/)\n"
 "Language: et\n"
 "MIME-Version: 1.0\n"
@@ -20,241 +21,62 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/aac-raw/aac.cc:18
+#: src/aac/aac.cc:19
 msgid "AAC (Raw) Decoder"
 msgstr ""
 
-#: src/adplug/adplug-xmms.cc:42
+#: src/adplug/adplug-xmms.cc:70
 msgid "AdPlug (AdLib Player)"
 msgstr ""
 
-#: src/adplug/adplug-xmms.cc:156 src/modplug/modplugbmp.cc:335
-#: src/psf/plugin.cc:138 src/vtx/vtx.cc:87 src/xsf/plugin.cc:113
+#: src/adplug/adplug-xmms.cc:167 src/modplug/modplugbmp.cc:321
+#: src/psf/plugin.cc:161 src/vtx/vtx.cc:89 src/xsf/plugin.cc:204
 msgid "sequenced"
 msgstr ""
 
-#: src/alarm/alarm.cc:55 src/alarm/interface.cc:82
-msgid "Alarm"
-msgstr "Äratus"
-
-#: src/alarm/alarm.cc:782
-msgid "Set Alarm ..."
-msgstr ""
-
-#: src/alarm/alarm.cc:810
-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/interface.cc: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.cc: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.cc: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.cc:81
-msgid "This is your wakeup call."
-msgstr "See on sinu äratus."
+#: src/adplug/adplug-xmms.cc:349 src/sid/xs_config.cc:61
+msgid "Output"
+msgstr "Väljund"
 
-#: src/alarm/interface.cc:99
-msgid "Your reminder for today is..."
+#: src/adplug/adplug-xmms.cc:350
+msgid "OPL Emulator:"
 msgstr ""
 
-#: src/alarm/interface.cc:101 src/alarm/interface.cc:386
-msgid "Reminder"
-msgstr "Meeldetuletaja"
-
-#: src/alarm/interface.cc:132
-msgid "Monday"
-msgstr "Esmaspäev"
-
-#: src/alarm/interface.cc:132
-msgid "Tuesday"
-msgstr "Teisipäev"
-
-#: src/alarm/interface.cc:132
-msgid "Wednesday"
-msgstr "Kolmapäev"
-
-#: src/alarm/interface.cc:133
-msgid "Thursday"
-msgstr "Neljapäev"
-
-#: src/alarm/interface.cc:133
-msgid "Friday"
-msgstr "Reede"
-
-#: src/alarm/interface.cc:133
-msgid "Saturday"
-msgstr "Laupäev"
-
-#: src/alarm/interface.cc:133
-msgid "Sunday"
-msgstr "Pühapäev"
-
-#: src/alarm/interface.cc:171 src/alarm/interface.cc:230
-#: src/alarm/interface.cc:245
-msgid "Time"
-msgstr "Aeg"
-
-#: src/alarm/interface.cc:178
-msgid "Alarm at (default):"
-msgstr "Vaikimisi äratuskell:"
-
-#: src/alarm/interface.cc:200
-msgid "h"
-msgstr " "
-
-#: src/alarm/interface.cc:203
-msgid "Quiet after:"
-msgstr "Vaigistamine pärast:"
-
-#: src/alarm/interface.cc:215
-msgid "hours"
-msgstr "tundi"
-
-#: src/alarm/interface.cc:226
-msgid "minutes"
-msgstr "minutit"
-
-#: src/alarm/interface.cc:235
-msgid "Choose the days for the alarm to come on"
-msgstr "Vali päevad, mil äratus tööle hakkab"
-
-#: src/alarm/interface.cc:242
-msgid "Day"
-msgstr "Päev"
-
-#: src/alarm/interface.cc:259 src/bs2b/plugin.cc:130
-#: src/skins/preset-list.cc:434 src/skins/preset-list.cc:440
-msgid "Default"
-msgstr "Vaikimisi"
-
-#: src/alarm/interface.cc:288
-msgid "Days"
-msgstr "Päevad"
-
-#: src/alarm/interface.cc:297
-msgid "Fading"
-msgstr "Sumbumine"
-
-#: src/alarm/interface.cc:305 src/console/plugin.cc:41
-#: src/crossfade/crossfade.cc:53 src/crossfade/crossfade.cc:59
-#: src/gtkui/settings.cc:49 src/lirc/lirc.cc:397 src/sid/xs_config.cc:85
-#: src/sid/xs_config.cc:94 src/sid/xs_config.cc:103
-msgid "seconds"
-msgstr "sekundit"
-
-#: src/alarm/interface.cc:312 src/alarm/interface.cc:353
-msgid "Volume"
-msgstr "Valjus"
-
-#: src/alarm/interface.cc:317
-msgid "Start at"
-msgstr "Alguses"
-
-#: src/alarm/interface.cc:333
-msgid "Final"
-msgstr "Lõpuks"
-
-#: src/alarm/interface.cc:346
-msgid "Current"
-msgstr "Praegune"
-
-#: src/alarm/interface.cc:359
-msgid "Additional Command"
-msgstr "Täiendav käsk"
+#: src/adplug/adplug-xmms.cc:353 src/amidiplug/i_configure.cc:153
+#: src/console/plugin.cc:45 src/filewriter/filewriter.cc:481
+#: src/sid/xs_config.cc:65 src/xsf/plugin.cc:446
+msgid "Sample rate:"
+msgstr "Sämplimissagedus:"
 
-#: src/alarm/interface.cc:365 src/alarm/interface.cc:391
-msgid "enable"
-msgstr "lubatud"
+#: src/adplug/adplug-xmms.cc:354 src/amidiplug/i_configure.cc:155
+#: src/bs2b/plugin.cc:141 src/console/plugin.cc:47
+#: src/modplug/plugin_main.cc:77 src/resample/resample.cc:201
+#: src/resample/resample.cc:207 src/resample/resample.cc:211
+#: src/resample/resample.cc:215 src/resample/resample.cc:219
+#: src/resample/resample.cc:223 src/resample/resample.cc:227
+#: src/resample/resample.cc:231 src/resample/resample.cc:235
+#: src/resample/resample.cc:239 src/resample/resample.cc:243
+#: src/sid/xs_config.cc:67 src/soxr/sox-resampler.cc:205
+msgid "Hz"
+msgstr "Hz"
 
-#: src/alarm/interface.cc:372
-msgid "Playlist (optional)"
-msgstr "Esitusnimekiri (valikuline)"
+#: src/adplug/adplug-xmms.cc:355 src/gtkui/settings.cc:55
+#: src/modplug/plugin_main.cc:105 src/qtui/settings.cc:85
+#: src/skins-qt/skins_cfg.cc:302 src/skins/skins_cfg.cc:284
+msgid "Miscellaneous"
+msgstr "Muu"
 
-#: src/alarm/interface.cc:379
-msgid "Select a playlist"
+#: src/adplug/adplug-xmms.cc:356
+msgid "Repeat song in endless loop"
 msgstr ""
 
-#: src/alarm/interface.cc:399
-msgid "Options"
-msgstr "Valikud"
-
-#: src/alarm/interface.cc:404
-msgid "What do these options mean?"
-msgstr "Mida need valikud tähendavad?"
-
-#: src/alarm/interface.cc:420
-msgid "Help"
-msgstr "Abi"
-
-#: src/albumart/albumart.cc:31
+#: src/albumart/albumart.cc:31 src/albumart-qt/albumart.cc:35
 msgid "Album Art"
 msgstr "Albumi graafika"
 
-#: src/albumart-qt/albumart.cc:33
-msgid "Album Art (Qt)"
-msgstr ""
-
-#: src/alsa/alsa.h:70
+#: src/alsa/alsa.h:64
 msgid "ALSA Output"
-msgstr ""
+msgstr "ALSA väljund"
 
 #: src/alsa/config.cc:28
 msgid ""
@@ -264,6 +86,11 @@
 "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äljundplugin Audaciousele\n"
+"Autoriõigus 2009-2012 John Lindgren\n"
+"\n"
+"Minu tänud ALSA väljundplugin NG autorile William Pitcockile, kelle kood "
+"pakkus viiteid olukordades, kus ALSA juhendmaterjalist ei piisand."
 
 #: src/alsa/config.cc:61
 msgid "(no description)"
@@ -289,11 +116,11 @@
 msgid "Mixer element:"
 msgstr "Miksimiselement:"
 
-#: src/amidi-plug/amidi-plug.cc:41
+#: src/amidiplug/amidi-plug.cc:42
 msgid "AMIDI-Plug (MIDI Player)"
 msgstr ""
 
-#: src/amidi-plug/amidi-plug.cc:437
+#: src/amidiplug/amidi-plug.cc:445
 msgid ""
 "AMIDI-Plug\n"
 "modular MIDI music player\n"
@@ -316,157 +143,161 @@
 "for the good help with alpha testing"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:94
+#: src/amidiplug/i_configure.cc:94
 msgid "Override default gain:"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:102
+#: src/amidiplug/i_configure.cc:102
 msgid "Override default polyphony:"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:110
+#: src/amidiplug/i_configure.cc:110
 msgid "Override default reverb:"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:112 src/amidi-plug/i_configure.cc:120
+#: src/amidiplug/i_configure.cc:112 src/amidiplug/i_configure.cc:120
 msgid "On"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:118
+#: src/amidiplug/i_configure.cc:118
 msgid "Override default chorus:"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:128 src/console/plugin.cc:29
+#: src/amidiplug/i_configure.cc:128 src/console/plugin.cc:29
 msgid "Playback"
-msgstr ""
+msgstr "Esitamine"
 
-#: src/amidi-plug/i_configure.cc:129
+#: src/amidiplug/i_configure.cc:129
 msgid "Transpose:"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:131
+#: src/amidiplug/i_configure.cc:131 src/speedpitch/speed-pitch.cc:257
 msgid "semitones"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:132
+#: src/amidiplug/i_configure.cc:132
 msgid "Drum shift:"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:134
+#: src/amidiplug/i_configure.cc:134
 msgid "note numbers"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:135
+#: src/amidiplug/i_configure.cc:135
 msgid "Skip leading silence"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:137
+#: src/amidiplug/i_configure.cc:137
 msgid "Skip trailing silence"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:141
+#: src/amidiplug/i_configure.cc:141
 msgid "SoundFont"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:143
+#: src/amidiplug/i_configure.cc:148
 msgid "Synthesizer"
-msgstr ""
+msgstr "Süntesaator"
 
-#: src/amidi-plug/i_configure.cc:148 src/console/plugin.cc:45
-#: src/sid/xs_config.cc:65
-msgid "Sample rate:"
-msgstr ""
-
-#: src/amidi-plug/i_configure.cc:150 src/bs2b/plugin.cc:141
-#: src/console/plugin.cc:47 src/modplug/plugin_main.cc:78
-#: src/resample/resample.cc:201 src/resample/resample.cc:207
-#: src/resample/resample.cc:211 src/resample/resample.cc:215
-#: src/resample/resample.cc:219 src/resample/resample.cc:223
-#: src/resample/resample.cc:227 src/resample/resample.cc:231
-#: src/resample/resample.cc:235 src/resample/resample.cc:239
-#: src/resample/resample.cc:243 src/sid/xs_config.cc:67
-#: src/sox-resampler/sox-resampler.cc:163
-msgid "Hz"
-msgstr "Hz"
-
-#: src/amidi-plug/i_configure-fluidsynth.cc:52
+#: src/amidiplug/i_configure-fluidsynth.cc:58
+#: src/amidiplug/i_configure-fluidsynth.cc:527
 msgid "AMIDI-Plug - select SoundFont file"
 msgstr "AMIDI-Plug - SoundFont faili valimine"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:55 src/filewriter/mp3.cc:658
+#: src/amidiplug/i_configure-fluidsynth.cc:61
 msgid "_Cancel"
-msgstr ""
+msgstr "Tü_hista"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:56
+#: src/amidiplug/i_configure-fluidsynth.cc:62
 msgid "_Open"
-msgstr ""
+msgstr "_Ava"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:225 src/gtkui/columns.cc:46
+#: src/amidiplug/i_configure-fluidsynth.cc:233
+#: src/amidiplug/i_configure-fluidsynth.cc:461
 msgid "File name"
 msgstr "Faili nimi"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:229
+#: src/amidiplug/i_configure-fluidsynth.cc:237
+#: src/amidiplug/i_configure-fluidsynth.cc:464
 msgid "Size (bytes)"
 msgstr "Suurus (baitides)"
 
-#: src/amidi-plug/i_fileinfo.cc:163
+#: src/amidiplug/i_fileinfo.cc:184
 msgid "Name:"
 msgstr "Nimi:"
 
-#: src/amidi-plug/i_fileinfo.cc:181
+#: src/amidiplug/i_fileinfo.cc:202
 msgid " MIDI Info "
 msgstr " MIDI-andmed "
 
-#: src/amidi-plug/i_fileinfo.cc:195
+#: src/amidiplug/i_fileinfo.cc:216
 msgid "Format:"
 msgstr "Vorming:"
 
-#: src/amidi-plug/i_fileinfo.cc:198
+#: src/amidiplug/i_fileinfo.cc:219
 msgid "Length (msec):"
 msgstr "Kestus (msek):"
 
-#: src/amidi-plug/i_fileinfo.cc:201
+#: src/amidiplug/i_fileinfo.cc:222
 msgid "No. of Tracks:"
 msgstr ""
 
-#: src/amidi-plug/i_fileinfo.cc:207
+#: src/amidiplug/i_fileinfo.cc:228
 msgid "variable"
-msgstr ""
+msgstr "muutuv"
 
-#: src/amidi-plug/i_fileinfo.cc:209
+#: src/amidiplug/i_fileinfo.cc:230
 msgid "BPM:"
 msgstr ""
 
-#: src/amidi-plug/i_fileinfo.cc:217
+#: src/amidiplug/i_fileinfo.cc:238
 msgid "BPM (wavg):"
 msgstr ""
 
-#: src/amidi-plug/i_fileinfo.cc:220
+#: src/amidiplug/i_fileinfo.cc:241
 msgid "Time Div:"
 msgstr ""
 
-#: src/amidi-plug/i_fileinfo.cc:231
+#: src/amidiplug/i_fileinfo.cc:252
 msgid " MIDI Comments and Lyrics "
 msgstr " MIDI kommentaarid ja laulusõnad "
 
-#: src/amidi-plug/i_fileinfo.cc:278
+#: src/amidiplug/i_fileinfo.cc:299
 msgid "* no comments available in this MIDI file *"
 msgstr "* selles MIDI-failis pole kommentaare *"
 
-#: src/amidi-plug/i_fileinfo.cc:290
+#: src/amidiplug/i_fileinfo.cc:311
 msgid "* no lyrics available in this MIDI file *"
 msgstr "* selles MIDI-failis pole laulusõnu *"
 
-#: src/amidi-plug/i_fileinfo.cc:300 src/filewriter/vorbis.cc:197
-#: src/ladspa/plugin.cc:416
+#: src/amidiplug/i_fileinfo.cc:321 src/ladspa/plugin.cc:418
+#: src/ui-common/dialogs-qt.cc:32
 msgid "_Close"
 msgstr "Sul_ge"
 
-#: src/amidi-plug/i_fileinfo.cc:325
+#: src/amidiplug/i_fileinfo.cc:346
 msgid " (invalid UTF-8)"
 msgstr " (vigane UTF-8)"
 
-#: src/aosd/aosd.cc:32
+#: src/ampache/ampache.cc:33
+msgid "Ampache Browser"
+msgstr ""
+
+#: src/ampache/ampache.cc:46
+msgid ""
+"Ampache Browser for Audacious\n"
+"http://ampache-browser.org/\n"
+"\n"
+"Copyright (C) Róbert Čerňanský and John Lindgren\n"
+"License: GNU GPLv3"
+msgstr ""
+"Audaciouse Ampache sirvija\n"
+"http://ampache-browser.org/\n"
+"\n"
+"Autoriõigus (C) Róbert Čerňanský ja John Lindgren\n"
+"Litsents: GNU GPLv3"
+
+#: src/aosd/aosd.cc:31
 msgid ""
 "Audacious OSD\n"
 "http://www.develia.org/projects.php?p=audacious#aosd\n"
@@ -493,196 +324,192 @@
 msgid "Concave Rectangle"
 msgstr "Nõgus ristkülik"
 
-#: src/aosd/aosd_style.cc:69
+#: src/aosd/aosd_style.cc:69 src/openmpt/mptwrap.h:50 src/xsf/plugin.cc:436
 msgid "None"
 msgstr "Puudub"
 
-#: src/aosd/aosd_trigger.cc:50
+#: src/aosd/aosd_trigger.cc:49
 msgid "Playback Start"
 msgstr "Esitamise alustamine"
 
-#: src/aosd/aosd_trigger.cc:51
+#: src/aosd/aosd_trigger.cc:50
 msgid "Triggers OSD when a playlist entry is played."
 msgstr "OSD käivitamine loo esitamisel esitusnimekirjast."
 
-#: src/aosd/aosd_trigger.cc:56
+#: src/aosd/aosd_trigger.cc:55
 msgid "Title Change"
 msgstr "Pealkirja muutumine"
 
-#: src/aosd/aosd_trigger.cc:57
+#: src/aosd/aosd_trigger.cc:56
 msgid "Triggers OSD when the song title changes (for internet streams)."
 msgstr ""
 
-#: src/aosd/aosd_trigger.cc:62
+#: src/aosd/aosd_trigger.cc:61
 msgid "Pause On"
 msgstr "Pausimine"
 
-#: src/aosd/aosd_trigger.cc:63
+#: src/aosd/aosd_trigger.cc:62
 msgid "Triggers OSD when playback is paused."
 msgstr "OSD käivitamine loo pausimisel."
 
-#: src/aosd/aosd_trigger.cc:68
+#: src/aosd/aosd_trigger.cc:67
 msgid "Pause Off"
 msgstr "Pausi lõpetamine"
 
-#: src/aosd/aosd_trigger.cc:69
+#: src/aosd/aosd_trigger.cc:68
 msgid "Triggers OSD when playback is unpaused."
 msgstr "OSD käivitamine pausitud loo jätkamisel."
 
-#: src/aosd/aosd_ui.cc:163
+#: src/aosd/aosd_ui.cc:204
 msgid "Placement"
 msgstr "Paigutus"
 
-#: src/aosd/aosd_ui.cc:196
+#: src/aosd/aosd_ui.cc:241
 msgid "Relative X offset:"
 msgstr "Suhteline nihe X-teljel:"
 
-#: src/aosd/aosd_ui.cc:203
+#: src/aosd/aosd_ui.cc:245
 msgid "Relative Y offset:"
 msgstr "Suhteline nihe Y-teljel:"
 
-#: src/aosd/aosd_ui.cc:210
+#: src/aosd/aosd_ui.cc:249
 msgid "Max OSD width:"
 msgstr "Suurim OSD laius:"
 
-#: src/aosd/aosd_ui.cc:221
+#: src/aosd/aosd_ui.cc:281
 msgid "Multi-Monitor options"
 msgstr "Mitme monitori valikud"
 
-#: src/aosd/aosd_ui.cc:225
+#: src/aosd/aosd_ui.cc:285
 msgid "Display OSD using:"
 msgstr "OSD kuvatakse:"
 
-#: src/aosd/aosd_ui.cc:227
+#: src/aosd/aosd_ui.cc:287
 msgid "all monitors"
 msgstr "kõigil monitoridel"
 
-#: src/aosd/aosd_ui.cc:230
+#: src/aosd/aosd_ui.cc:290
 #, c-format
 msgid "monitor %i"
 msgstr "%i. monitoril"
 
-#: src/aosd/aosd_ui.cc:282
+#: src/aosd/aosd_ui.cc:342
 msgid "Timing (ms)"
 msgstr "Ajastus (millisekundites)"
 
-#: src/aosd/aosd_ui.cc:287
+#: src/aosd/aosd_ui.cc:347
 msgid "Display:"
 msgstr "Kuvamine:"
 
-#: src/aosd/aosd_ui.cc:292
+#: src/aosd/aosd_ui.cc:352
 msgid "Fade in:"
 msgstr "Sujuv näitamine:"
 
-#: src/aosd/aosd_ui.cc:297
+#: src/aosd/aosd_ui.cc:357
 msgid "Fade out:"
 msgstr "Sujuv peitmine:"
 
-#: src/aosd/aosd_ui.cc:361
+#: src/aosd/aosd_ui.cc:442
 msgid "Fonts"
 msgstr "Kirjatüübid"
 
-#: src/aosd/aosd_ui.cc:368
+#: src/aosd/aosd_ui.cc:449
 #, c-format
 msgid "Font %i:"
 msgstr "Kirjatüüp %i:"
 
-#: src/aosd/aosd_ui.cc:382
+#: src/aosd/aosd_ui.cc:466
 msgid "Shadow"
 msgstr "Vari"
 
-#: src/aosd/aosd_ui.cc:486
+#: src/aosd/aosd_ui.cc:589
 msgid "Render Style"
 msgstr "Renderdamise laad"
 
-#: src/aosd/aosd_ui.cc:502
+#: src/aosd/aosd_ui.cc:605
 msgid "Colors"
 msgstr "Värvused"
 
-#: src/aosd/aosd_ui.cc:513
+#: src/aosd/aosd_ui.cc:616
 #, c-format
 msgid "Color %i:"
 msgstr "Värvus %i:"
 
-#: src/aosd/aosd_ui.cc:600
+#: src/aosd/aosd_ui.cc:714
 msgid "Enable trigger"
 msgstr "Päästik on lubatud"
 
-#: src/aosd/aosd_ui.cc:627
+#: src/aosd/aosd_ui.cc:741
 msgid "Event"
 msgstr "Sündmus"
 
-#: src/aosd/aosd_ui.cc:655
+#: src/aosd/aosd_ui.cc:768
 msgid "Composite manager detected"
 msgstr ""
 
-#: src/aosd/aosd_ui.cc:662
+#: src/aosd/aosd_ui.cc:775
 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.cc:670
+#: src/aosd/aosd_ui.cc:783
 msgid "Composite manager not required for fake transparency"
 msgstr ""
 
-#: src/aosd/aosd_ui.cc:706
+#: src/aosd/aosd_ui.cc:820
 msgid "Transparency"
 msgstr "Läbipaistvus"
 
-#: src/aosd/aosd_ui.cc:712
+#: src/aosd/aosd_ui.cc:826
 msgid "Fake transparency"
 msgstr "Võltsitud läbipaistvus"
 
-#: src/aosd/aosd_ui.cc:714
+#: src/aosd/aosd_ui.cc:828
 msgid "Real transparency (requires X Composite Ext.)"
 msgstr "Tegelik läbipaistvus (vajab X Composite laiendust)"
 
-#: src/aosd/aosd_ui.cc:756
+#: src/aosd/aosd_ui.cc:875
 msgid "Composite extension not loaded"
 msgstr ""
 
-#: src/aosd/aosd_ui.cc:764
-msgid "Composite extension not available"
-msgstr ""
-
-#: src/aosd/aosd_ui.cc:781
+#: src/aosd/aosd_ui.cc:892
 #, c-format
 msgid "Audacious OSD"
 msgstr "Audaciouse OSD"
 
-#: src/aosd/aosd_ui.cc:844
+#: src/aosd/aosd_ui.cc:955
 msgid "Position"
 msgstr "Asukoht"
 
-#: src/aosd/aosd_ui.cc:849
+#: src/aosd/aosd_ui.cc:960
 msgid "Animation"
 msgstr "Animatsioon"
 
-#: src/aosd/aosd_ui.cc:854
+#: src/aosd/aosd_ui.cc:965
 msgid "Text"
 msgstr "Tekst"
 
-#: src/aosd/aosd_ui.cc:859
+#: src/aosd/aosd_ui.cc:970
 msgid "Decoration"
 msgstr "Kaunistused"
 
-#: src/aosd/aosd_ui.cc:864
+#: src/aosd/aosd_ui.cc:975
 msgid "Trigger"
 msgstr "Päästikud"
 
-#: src/aosd/aosd_ui.cc:869
+#: src/aosd/aosd_ui.cc:980 src/streamtuner/shoutcast-model.cc:202
 msgid "Misc"
 msgstr "Muu"
 
-#: src/aosd/aosd_ui.cc:878
+#: src/aosd/aosd_ui.cc:989
 msgid "Test"
-msgstr ""
+msgstr "Proovi"
 
 #: src/asx3/asx3.cc:35
 msgid "ASXv3 Playlists"
-msgstr ""
+msgstr "ASXv3-esitusnimekirjad"
 
 #: src/asx/asx.cc:33
 msgid "ASXv1/ASXv2 Playlists"
@@ -692,11 +519,83 @@
 msgid "Audacious Playlists (audpl)"
 msgstr "Audaciouse esitusnimekirjad (audpl)"
 
-#: src/blur_scope/blur_scope.cc:42
-msgid "Color"
+#: src/background_music/background_music.cc:24
+msgid "Background music"
 msgstr ""
 
-#: src/blur_scope/blur_scope.cc:58
+#: src/background_music/background_music.cc:25
+msgid "Target level:"
+msgstr ""
+
+#: src/background_music/background_music.cc:28
+#: src/background_music/background_music.cc:33
+#: src/silence-removal/silence-removal.cc:70
+msgid "dB"
+msgstr "dB"
+
+#: src/background_music/background_music.cc:29
+msgid "Maximum amplification:"
+msgstr ""
+
+#: src/background_music/background_music.cc:34 src/mpg123/mpg123.cc:81
+msgid "Advanced"
+msgstr "Laiendatud"
+
+#: src/background_music/background_music.cc:36
+msgid "Slow detection weight:"
+msgstr ""
+
+#: src/background_music/background_music.cc:39
+msgid "Hint"
+msgstr ""
+
+#: src/background_music/background_music.cc:41
+msgid ""
+"Slow detection weight is the relative weight\n"
+"of a long term average detection when compared\n"
+"to the actual, faster loudness detection.\n"
+"A value of zero gives a more radio-like sound\n"
+"where soft passages get \"pulled up\" more quickly,\n"
+"a value of two makes the sound feel less compressed."
+msgstr ""
+
+#: src/background_music/background_music.cc:52
+msgid ""
+"Background Music Plugin for Audacious\n"
+"Copyright 2023;2024 Michel Fleur\n"
+"\n"
+"Controls the volume to make the sound equally loud within and between "
+"tracks.\n"
+" It uses accurate loudness measurement and tries to make the volume changes "
+"sound natural without audible peaks, yet without lowering the volume before "
+"a peak in advance."
+msgstr ""
+
+#: src/background_music/background_music.cc:61
+msgid "Background Music"
+msgstr ""
+
+#: src/bitcrusher/bitcrusher.cc:33
+msgid "Bitcrusher"
+msgstr ""
+
+#: src/bitcrusher/bitcrusher.cc:34
+msgid "Bit Depth:"
+msgstr ""
+
+#: src/bitcrusher/bitcrusher.cc:37
+msgid "Downsample ratio:"
+msgstr ""
+
+#: src/bitcrusher/bitcrusher.cc:48
+msgid "Bitcrusher"
+msgstr ""
+
+#: src/blur_scope/blur_scope.cc:40 src/blur_scope-qt/blur_scope.cc:45
+msgid "Color"
+msgstr "Värv"
+
+#: src/blur_scope/blur_scope.cc:56 src/blur_scope-qt/blur_scope.cc:158
 msgid "Blur Scope"
 msgstr ""
 
@@ -708,27 +607,31 @@
 msgid "Presets:"
 msgstr "Valmisseadistused:"
 
+#: src/bs2b/plugin.cc:130
+msgid "Default"
+msgstr "Vaikimisi"
+
 #: src/bs2b/plugin.cc:136
 msgid "Feed level:"
 msgstr ""
 
 #: src/bs2b/plugin.cc:138
 msgid "x1/10 dB"
-msgstr ""
+msgstr "x1/10 dB"
 
 #: src/bs2b/plugin.cc:139
 msgid "Cut frequency:"
 msgstr ""
 
-#: src/cairo-spectrum/cairo-spectrum.cc:41
+#: src/cairo-spectrum/cairo-spectrum.cc:42 src/qt-spectrum/qt-spectrum.cc:107
 msgid "Spectrum Analyzer"
-msgstr ""
+msgstr "Spektrianalüüs"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:72
+#: src/cdaudio/cdaudio-ng.cc:74
 msgid "Audio CD Plugin"
-msgstr ""
+msgstr "Audio-CD Plugin"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:121
+#: src/cdaudio/cdaudio-ng.cc:121
 msgid ""
 "Copyright (C) 2007-2012 Calin Crisan <ccrisan@gmail.com> and others.\n"
 "\n"
@@ -739,137 +642,145 @@
 "\n"
 "This was a Google Summer of Code 2007 project."
 msgstr ""
+"Autoriõigus (C) 2007-2012 Calin Crisan <ccrisan@gmail.com> ja teised.\n"
+"\n"
+"Palju tänu libcdio arendajatele <http://www.gnu.org/software/libcdio/>\n"
+"ja libcddb arendajatele <http://libcddb.sourceforge.net/>.\n"
+"\n"
+"Samuti tänan Tony Vroon'i mentoriks olemise ja juhendamise eest.\n"
+"\n"
+"See oli Google Summer of Code 2007 projekt."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:137
+#: src/cdaudio/cdaudio-ng.cc:140
 msgid "Device"
-msgstr ""
+msgstr "Seade"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:138
+#: src/cdaudio/cdaudio-ng.cc:141
 msgid "Read speed:"
-msgstr ""
+msgstr "Lugemise kiirus:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:141
+#: src/cdaudio/cdaudio-ng.cc:144
 msgid "Override device:"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:143
+#: src/cdaudio/cdaudio-ng.cc:146
 msgid "Metadata"
-msgstr ""
+msgstr "Metaandmed"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:144
+#: src/cdaudio/cdaudio-ng.cc:147
 msgid "Use CD-Text"
-msgstr ""
+msgstr "CD-Texti kasutamine"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:146
+#: src/cdaudio/cdaudio-ng.cc:150
 msgid "Use CDDB"
-msgstr ""
+msgstr "CDDB kasutamine"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:148
+#: src/cdaudio/cdaudio-ng.cc:152
 msgid "Use HTTP instead of CDDBP"
-msgstr "CDDBP asemel kasutatakse HTTP-d"
+msgstr "CDDBP asemel HTTP kasutatamine"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:151
+#: src/cdaudio/cdaudio-ng.cc:155
 msgid "Server:"
-msgstr ""
+msgstr "Server:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:155
+#: src/cdaudio/cdaudio-ng.cc:159
 msgid "Path:"
-msgstr ""
+msgstr "Rada:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:159
+#: src/cdaudio/cdaudio-ng.cc:163
 msgid "Port:"
-msgstr ""
+msgstr "Port:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:246
+#: src/cdaudio/cdaudio-ng.cc:228
 msgid "Failed to initialize cdio subsystem."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:281
+#: src/cdaudio/cdaudio-ng.cc:260
 #, c-format
 msgid "Invalid URI %s."
-msgstr ""
+msgstr "Vigane URI %s."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:283
+#: src/cdaudio/cdaudio-ng.cc:262
 #, c-format
 msgid "Track %d not found."
-msgstr ""
+msgstr "Rada nr. %d ei leitud"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:285
+#: src/cdaudio/cdaudio-ng.cc:264
 #, c-format
 msgid "Track %d is a data track."
-msgstr ""
+msgstr "Rada nr. %d on andmerada."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:360
+#: src/cdaudio/cdaudio-ng.cc:339
 msgid "Error reading audio CD."
-msgstr ""
+msgstr "Viga audio-CD lugemisel."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:429
+#: src/cdaudio/cdaudio-ng.cc:410
 msgid "Audio CD"
 msgstr "Audio-CD"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:460 src/cdaudio-ng/cdaudio-ng.cc:469
+#: src/cdaudio/cdaudio-ng.cc:446 src/cdaudio/cdaudio-ng.cc:455
 #, c-format
 msgid "Failed to open CD device %s."
-msgstr ""
+msgstr "Tõrge CD-seadme %s avamisel."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:472
+#: src/cdaudio/cdaudio-ng.cc:458
 msgid "No audio capable CD drive found."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:497
+#: src/cdaudio/cdaudio-ng.cc:481
+msgid "Drive is empty."
+msgstr "Seade on tühi."
+
+#: src/cdaudio/cdaudio-ng.cc:483
+msgid "Unsupported disk type."
+msgstr "Plaadi liik pole toetatud."
+
+#: src/cdaudio/cdaudio-ng.cc:507
 msgid "Failed to finish initializing opened CD drive."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:510
+#: src/cdaudio/cdaudio-ng.cc:520
 msgid "Failed to retrieve first/last track number."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:531
+#: src/cdaudio/cdaudio-ng.cc:541
 #, c-format
 msgid "Cannot read start/end LSN for track %d."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:613
-msgid "Failed to create the cddb connection."
-msgstr ""
+#: src/cdaudio/cdaudio-ng.cc:624
+msgid "Failed to create the CDDB connection."
+msgstr "Tõrge CDDB-ühenduse loomisel."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:679
+#: src/cdaudio/cdaudio-ng.cc:690
 msgid "Failed to query the CDDB server"
-msgstr ""
+msgstr "Tõrge CDDB-serverisse päringu tegemisel"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:681
+#: src/cdaudio/cdaudio-ng.cc:692
 #, c-format
 msgid "Failed to query the CDDB server: %s"
-msgstr ""
+msgstr "Tõrge CDDB-serverisse päringu tegemisel: %s"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:705
+#: src/cdaudio/cdaudio-ng.cc:716
 #, c-format
-msgid "Failed to read the cddb info: %s"
-msgstr ""
-
-#: src/cdaudio-ng/cdaudio-ng.cc:765
-msgid "Drive is empty."
-msgstr "Seade on tühi."
+msgid "Failed to read the CDDB info: %s"
+msgstr "Tõrge CDDB-andmete lugemisel: %s"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:767
-msgid "Unsupported disk type."
-msgstr "Plaadi liik pole toetatud."
-
-#: src/cd-menu-items/cd-menu-items.cc:35
+#: src/cd-menu-items/cd-menu-items.cc:33
 msgid "Audio CD Menu Items"
 msgstr "Audioplaadi menüüvalikud"
 
-#: src/cd-menu-items/cd-menu-items.cc:47
-msgid "Play CD"
-msgstr "Esita CD-lt"
-
-#: src/cd-menu-items/cd-menu-items.cc:47
-msgid "Add CD"
-msgstr "Lisa CD"
+#: src/cd-menu-items/cd-menu-items.cc:45
+msgid "Pla_y CD"
+msgstr ""
+
+#: src/cd-menu-items/cd-menu-items.cc:45
+msgid "_Add CD"
+msgstr ""
 
 #: src/compressor/compressor.cc:45
 msgid "Compression"
-msgstr ""
+msgstr "Pakkimine"
 
 #: src/compressor/compressor.cc:46
 msgid "Center volume:"
@@ -877,7 +788,7 @@
 
 #: src/compressor/compressor.cc:49
 msgid "Dynamic range:"
-msgstr ""
+msgstr "Dünaamiline vahemik:"
 
 #: src/compressor/compressor.cc:57
 msgid ""
@@ -909,13 +820,20 @@
 
 #: src/console/plugin.cc:36
 msgid "Echo:"
-msgstr ""
+msgstr "Kaja:"
 
 #: src/console/plugin.cc:39
 msgid "Default song length:"
 msgstr "Loo vaikimisi kestus:"
 
-#: src/console/plugin.cc:42 src/modplug/plugin_main.cc:59
+#: src/console/plugin.cc:41 src/crossfade/crossfade.cc:56
+#: src/crossfade/crossfade.cc:62 src/lirc/lirc.cc:395 src/notify/notify.cc:113
+#: src/sid/xs_config.cc:85 src/sid/xs_config.cc:94 src/sid/xs_config.cc:103
+#: src/vumeter-qt/vumeter_qt.cc:39
+msgid "seconds"
+msgstr "sekundit"
+
+#: src/console/plugin.cc:42 src/modplug/plugin_main.cc:58
 msgid "Resampling"
 msgstr ""
 
@@ -939,70 +857,80 @@
 msgid "Game Console Music Decoder"
 msgstr "Mängukonsooli muusikadekooder"
 
-#: src/coreaudio/coreaudio.cc:50
+#: src/coreaudio/coreaudio.cc:53
 msgid "CoreAudio output"
-msgstr ""
+msgstr "CoreAudio väljund"
 
-#: src/coreaudio/coreaudio.cc:131
+#: src/coreaudio/coreaudio.cc:155
 msgid ""
 "CoreAudio Output Plugin for Audacious\n"
 "Copyright 2014 William Pitcock\n"
+"Copyright 2017,18 René J.V. Bertin\n"
+" (original code and code adapted from\n"
+" Apple examples, (C) Apple 2013)\n"
 "\n"
 "Based on SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
 msgstr ""
 
-#: src/coreaudio/coreaudio.cc:143
+#: src/coreaudio/coreaudio.cc:171
 msgid "Use exclusive mode"
 msgstr ""
 
-#: src/crossfade/crossfade.cc:44
+#: src/coreaudio/coreaudio.cc:173
+msgid "Use bit perfect audio (adapt device sampling rate)"
+msgstr ""
+
+#: src/crossfade/crossfade.cc:47
 msgid ""
 "Crossfade Plugin for Audacious\n"
 "Copyright 2010-2014 John Lindgren"
 msgstr ""
 
-#: src/crossfade/crossfade.cc:48
+#: src/crossfade/crossfade.cc:51
 msgid "Crossfade"
 msgstr ""
 
-#: src/crossfade/crossfade.cc:49
+#: src/crossfade/crossfade.cc:52
 msgid "On automatic song change"
-msgstr ""
+msgstr "Loo automaatsel vahetumisel"
 
-#: src/crossfade/crossfade.cc:51 src/crossfade/crossfade.cc:57
+#: src/crossfade/crossfade.cc:54 src/crossfade/crossfade.cc:60
 msgid "Overlap:"
 msgstr ""
 
-#: src/crossfade/crossfade.cc:55
+#: src/crossfade/crossfade.cc:58
 msgid "On seek or manual song change"
+msgstr "Kerimisel või loo käsitsivahetamisel"
+
+#: src/crossfade/crossfade.cc:64
+msgid "No fade in"
 msgstr ""
 
-#: src/crossfade/crossfade.cc:61
-msgid "Tip"
+#: src/crossfade/crossfade.cc:66
+msgid "Use S-curve fade"
 msgstr ""
 
-#: src/crossfade/crossfade.cc:62
-msgid ""
-"For better crossfading, enable\n"
-"the Silence Removal effect."
+#: src/crossfade/crossfade.cc:68
+msgid "S-curve steepness:"
+msgstr ""
+
+#: src/crossfade/crossfade.cc:70
+msgid "(higher is steeper)"
 msgstr ""
 
 #: src/crossfade/crossfade.cc:72
-msgid "Crossfade"
+msgid "Tip"
 msgstr ""
 
-#: src/crossfade/crossfade.cc:161
+#: src/crossfade/crossfade.cc:73
 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."
+"For better crossfading, enable\n"
+"the Silence Removal effect."
 msgstr ""
 
-#: src/crossfade/crossfade.cc:168
-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."
+#: src/crossfade/crossfade.cc:83
+msgid "Crossfade"
 msgstr ""
 
 #: src/crystalizer/crystalizer.cc:31
@@ -1011,68 +939,69 @@
 
 #: src/crystalizer/crystalizer.cc:32 src/stereo_plugin/stereo.cc:45
 msgid "Intensity:"
-msgstr ""
+msgstr "Tugevus:"
 
 #: src/crystalizer/crystalizer.cc:43
 msgid "Crystalizer"
 msgstr ""
 
-#: src/cue/cue.cc:37
+#: src/cue/cue.cc:42
 msgid "Cue Sheet Plugin"
 msgstr ""
 
-#: src/delete-files/delete-files.cc:46 src/delete-files/delete-files.cc:146
+#: src/delete-files/delete-files.cc:53 src/delete-files/delete-files.cc:215
+#: src/delete-files/delete-files.cc:230
 msgid "Delete Files"
-msgstr ""
+msgstr "Failide kustutamine"
+
+#: src/delete-files/delete-files.cc:120
+msgid "No files are selected."
+msgstr "Ühtegi faili pole valitud"
 
-#: src/delete-files/delete-files.cc:75
+#: src/delete-files/delete-files.cc:125
 #, c-format
-msgid "Error moving %s to trash: %s."
+msgid "Do you want to move %s to the trash?"
 msgstr ""
 
-#: src/delete-files/delete-files.cc:86
+#: src/delete-files/delete-files.cc:126
 #, c-format
-msgid "Error deleting %s: %s."
+msgid "Do you want to permanently delete %s?"
 msgstr ""
 
-#: src/delete-files/delete-files.cc:117
+#: src/delete-files/delete-files.cc:133
 #, c-format
-msgid "Error deleting %s: not a local file."
+msgid "Do you want to move %d files to the trash?"
 msgstr ""
 
 #: src/delete-files/delete-files.cc:134
-msgid "Do you want to move the selected files to the trash?"
-msgstr ""
-
-#: src/delete-files/delete-files.cc:135
-msgid "Move to Trash"
+#, c-format
+msgid "Do you want to permanently delete %d files?"
 msgstr ""
 
-#: src/delete-files/delete-files.cc:140
-msgid "Do you want to permanently delete the selected files?"
+#: src/delete-files/delete-files.cc:146
+msgid "Move to trash"
 msgstr ""
 
-#: src/delete-files/delete-files.cc:141 src/skins/preset-list.cc:411
-#: src/skins/preset-list.cc:427
+#: src/delete-files/delete-files.cc:146
 msgid "Delete"
 msgstr "Kustuta"
 
-#: src/delete-files/delete-files.cc:145 src/skins/preset-browser.cc:56
-#: src/skins/preset-list.cc:307 src/skins/ui_playlist.cc:221
+#: src/delete-files/delete-files.cc:213 src/delete-files/delete-files.cc:235
+#: src/skins-qt/search-select.cc:102 src/skins/search-select.cc:78
 msgid "Cancel"
 msgstr "Loobu"
 
-#: src/delete-files/delete-files.cc:166
+#: src/delete-files/delete-files.cc:267
 msgid "Delete Selected Files"
-msgstr ""
+msgstr "Kustuta valitud failid"
 
-#: src/delete-files/delete-files.cc:181
+#: src/delete-files/delete-files.cc:287
 msgid "Delete Method"
-msgstr ""
+msgstr "Kustutamise meetod"
 
-#: src/delete-files/delete-files.cc:182
+#: src/delete-files/delete-files.cc:288
 msgid "Move to trash instead of deleting immediately"
-msgstr ""
+msgstr "Prügikasti tõstmine kohese kustutamise asemel"
 
 #: src/echo_plugin/echo.cc:9
 msgid ""
@@ -1086,13 +1015,13 @@
 msgid "Echo"
 msgstr "Kaja"
 
-#: src/echo_plugin/echo.cc:22 src/modplug/plugin_main.cc:73
-#: src/modplug/plugin_main.cc:83
+#: src/echo_plugin/echo.cc:22 src/modplug/plugin_main.cc:72
+#: src/modplug/plugin_main.cc:82
 msgid "Delay:"
 msgstr "Viivitus:"
 
-#: src/echo_plugin/echo.cc:24 src/modplug/plugin_main.cc:73
-#: src/modplug/plugin_main.cc:83
+#: src/echo_plugin/echo.cc:24 src/modplug/plugin_main.cc:72
+#: src/modplug/plugin_main.cc:82 src/xsf/plugin.cc:445
 msgid "ms"
 msgstr "ms"
 
@@ -1100,19 +1029,19 @@
 msgid "Feedback:"
 msgstr ""
 
-#: src/echo_plugin/echo.cc:28 src/modplug/plugin_main.cc:87
+#: src/echo_plugin/echo.cc:28 src/modplug/plugin_main.cc:86
 msgid "Volume:"
-msgstr ""
+msgstr "Valjus:"
 
 #: src/echo_plugin/echo.cc:39
 msgid "Echo"
 msgstr "Kaja"
 
-#: src/ffaudio/ffaudio-core.cc:41
+#: src/ffaudio/ffaudio-core.cc:50
 msgid "FFmpeg Plugin"
-msgstr ""
+msgstr "FFmpeg Plugin"
 
-#: src/ffaudio/ffaudio-core.cc:571
+#: src/ffaudio/ffaudio-core.cc:649
 msgid ""
 "Multi-format audio decoding plugin for Audacious using\n"
 "FFmpeg multimedia framework (http://www.ffmpeg.org/)\n"
@@ -1122,261 +1051,340 @@
 "Matti Hämäläinen <ccr@tnsp.org>"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:45
+#: src/filewriter/filewriter.cc:48
 msgid "FileWriter Plugin"
+msgstr "FailiKirjutaja plugin"
+
+#: src/filewriter/filewriter.cc:316
+#, c-format
+msgid ""
+"Error opening %s:\n"
+"%s"
 msgstr ""
+"Viga %s avamisel:\n"
+"%s"
 
-#: src/filewriter/filewriter.cc:386
+#: src/filewriter/filewriter.cc:358
+msgid ""
+"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/filewriter/filewriter.cc:385
 msgid "Output file format:"
 msgstr "Väljundfaili vorming:"
 
-#: src/filewriter/filewriter.cc:403
-msgid "Configure"
-msgstr "Seadista..."
-
-#: src/filewriter/filewriter.cc:413
+#: src/filewriter/filewriter.cc:389
 msgid "Save into original directory"
-msgstr "Salvestatakse algkataloogi"
+msgstr "Salvestamine algkataloogi"
+
+#: src/filewriter/filewriter.cc:392
+msgid "Save into custom directory:"
+msgstr "Salvestamine kohandatud kataloogi:"
 
-#: src/filewriter/filewriter.cc:417
-msgid "Save into custom directory"
-msgstr "Salvestatakse kohandatud kataloogi"
-
-#: src/filewriter/filewriter.cc:427
-msgid "Output file folder:"
-msgstr "Väljundkataloog:"
+#: src/filewriter/filewriter.cc:400
+msgid "Generate file name from:"
+msgstr "Failinime genereerimine andmetest:"
+
+#: src/filewriter/filewriter.cc:401
+msgid "Original file name"
+msgstr "Algne failinimi"
+
+#: src/filewriter/filewriter.cc:404
+msgid "Original file name (no suffix)"
+msgstr "Algne failinimi (ilma järelliiteta)"
+
+#: src/filewriter/filewriter.cc:407
+msgid "Original file tag"
+msgstr "Algse faili silt"
+
+#: src/filewriter/filewriter.cc:411
+msgid "Prepend track number to file name"
+msgstr "Failinimele raja numbri lisamine"
+
+#: src/filewriter/filewriter.cc:417 src/filewriter/filewriter.cc:449
+msgid "Auto"
+msgstr "Automaatne"
+
+#: src/filewriter/filewriter.cc:418
+msgid "8000 Hz"
+msgstr "8000 Hz"
+
+#: src/filewriter/filewriter.cc:419
+msgid "11025 Hz"
+msgstr "11025 Hz"
+
+#: src/filewriter/filewriter.cc:420
+msgid "12000 Hz"
+msgstr "12000 Hz"
+
+#: src/filewriter/filewriter.cc:421
+msgid "16000 Hz"
+msgstr "16000 Hz"
+
+#: src/filewriter/filewriter.cc:422
+msgid "22050 Hz"
+msgstr "22050 Hz"
+
+#: src/filewriter/filewriter.cc:423
+msgid "24000 Hz"
+msgstr "24000 Hz"
+
+#: src/filewriter/filewriter.cc:424
+msgid "32000 Hz"
+msgstr "32000 Hz"
+
+#: src/filewriter/filewriter.cc:425 src/xsf/plugin.cc:430
+msgid "44100 Hz"
+msgstr "44100 Hz"
+
+#: src/filewriter/filewriter.cc:426 src/xsf/plugin.cc:431
+msgid "48000 Hz"
+msgstr "48000 Hz"
+
+#: src/filewriter/filewriter.cc:430
+msgid "8 kbit/s"
+msgstr ""
 
 #: src/filewriter/filewriter.cc:431
-msgid "Pick a folder"
-msgstr "Kataloogi valimine"
+msgid "16 kbit/s"
+msgstr ""
 
-#: src/filewriter/filewriter.cc:444
-msgid "Generate file name from:"
+#: src/filewriter/filewriter.cc:432
+msgid "32 kbit/s"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:448
-msgid "Original file tag"
+#: src/filewriter/filewriter.cc:433
+msgid "40 kbit/s"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:453
-msgid "Original file name"
+#: src/filewriter/filewriter.cc:434
+msgid "48 kbit/s"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:459
-msgid "Include original file name extension"
+#: src/filewriter/filewriter.cc:435
+msgid "56 kbit/s"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:468
-msgid "Prepend track number to file name"
+#: src/filewriter/filewriter.cc:436
+msgid "64 kbit/s"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:484
-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."
+#: src/filewriter/filewriter.cc:437
+msgid "80 kbit/s"
 msgstr ""
 
-#: src/filewriter/mp3.cc:40 src/filewriter/mp3.cc:717
-msgid "Auto"
-msgstr "Automaatne"
+#: src/filewriter/filewriter.cc:438
+msgid "96 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:439
+msgid "112 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:440
+msgid "128 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:441
+msgid "160 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:442
+msgid "192 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:443
+msgid "224 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:444
+msgid "256 kbit/s"
+msgstr ""
 
-#: src/filewriter/mp3.cc:40
+#: src/filewriter/filewriter.cc:445
+msgid "320 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:450
 msgid "Joint Stereo"
 msgstr ""
 
-#: src/filewriter/mp3.cc:41 src/modplug/plugin_main.cc:58
-#: src/mpg123/mpg123.cc:248
+#: src/filewriter/filewriter.cc:451 src/modplug/plugin_main.cc:57
+#: src/mpg123/mpg123.cc:259
 msgid "Stereo"
 msgstr "Stereo"
 
-#: src/filewriter/mp3.cc:41 src/modplug/plugin_main.cc:57
-#: src/mpg123/mpg123.cc:248
+#: src/filewriter/filewriter.cc:452 src/modplug/plugin_main.cc:56
+#: src/mpg123/mpg123.cc:260
 msgid "Mono"
 msgstr "Mono"
 
-#: src/filewriter/mp3.cc:657
-msgid "MP3 Configuration"
-msgstr "MP3 sätted"
+#: src/filewriter/filewriter.cc:456
+msgid "VBR"
+msgstr "VBR"
 
-#: src/filewriter/mp3.cc:658
-msgid "_OK"
+#: src/filewriter/filewriter.cc:457
+msgid "ABR"
 msgstr ""
 
-#: src/filewriter/mp3.cc:681
-msgid "Algorithm Quality:"
+#: src/filewriter/filewriter.cc:478
+msgid "Algorithm quality:"
 msgstr "Algoritmi kvaliteet:"
 
-#: src/filewriter/mp3.cc:706
-msgid "Output Sample Rate:"
-msgstr ""
-
-#: src/filewriter/mp3.cc:733
-msgid "(Hz)"
-msgstr "(Hz)"
-
-#: src/filewriter/mp3.cc:740
-msgid "Bitrate / Compression Ratio:"
-msgstr ""
-
-#: src/filewriter/mp3.cc:764
-msgid "Bitrate (kbps):"
-msgstr "Bitikiirus (kbps):"
+#: src/filewriter/filewriter.cc:484
+msgid "Bitrate:"
+msgstr "Bitikiirus:"
 
-#: src/filewriter/mp3.cc:796
+#: src/filewriter/filewriter.cc:491
 msgid "Compression ratio:"
 msgstr "Pakkimistihedus"
 
-#: src/filewriter/mp3.cc:820
-msgid "Audio Mode:"
+#: src/filewriter/filewriter.cc:498
+msgid "Audio mode:"
 msgstr "Audiorežiim:"
 
-#: src/filewriter/mp3.cc:845
-msgid "Miscellaneous:"
-msgstr ""
-
-#: src/filewriter/mp3.cc:856
+#: src/filewriter/filewriter.cc:501
 msgid "Enforce strict ISO compliance"
-msgstr ""
+msgstr "Range ISO vastavuse pealesurumine"
 
-#: src/filewriter/mp3.cc:867
+#: src/filewriter/filewriter.cc:503
 msgid "Error protection"
 msgstr "Veakaitse"
 
-#: src/filewriter/mp3.cc:879 src/filewriter/vorbis.cc:206
-msgid "Quality"
-msgstr "Kvaliteet"
-
-#: src/filewriter/mp3.cc:888
+#: src/filewriter/filewriter.cc:508
 msgid "Enable VBR/ABR"
-msgstr ""
+msgstr "VBR/ABR lubamine"
 
-#: src/filewriter/mp3.cc:898
+#: src/filewriter/filewriter.cc:510
 msgid "Type:"
 msgstr "Liik:"
 
-#: src/filewriter/mp3.cc:931
-msgid "VBR Options:"
-msgstr ""
-
-#: src/filewriter/mp3.cc:947
-msgid "Minimum bitrate (kbps):"
-msgstr "Vähim bitikiirus (kbps):"
+#: src/filewriter/filewriter.cc:514
+msgid "Minimum bitrate:"
+msgstr "Vähim bitikiirus:"
+
+#: src/filewriter/filewriter.cc:518
+msgid "Maximum bitrate:"
+msgstr "Suurim bitikiirus:"
+
+#: src/filewriter/filewriter.cc:522
+msgid "Average bitrate:"
+msgstr "Keskmine bitikiirus:"
 
-#: src/filewriter/mp3.cc:973
-msgid "Maximum bitrate (kbps):"
-msgstr "Suurim bitikiirus (kbps):"
+#: src/filewriter/filewriter.cc:526
+msgid "VBR quality level:"
+msgstr "VBR-i kvaliteedi tase:"
 
-#: src/filewriter/mp3.cc:995
+#: src/filewriter/filewriter.cc:530
 msgid "Strictly enforce minimum bitrate"
-msgstr ""
+msgstr "Vähima bitikiiruse range kehtestamine"
 
-#: src/filewriter/mp3.cc:1007
-msgid "ABR Options:"
-msgstr ""
-
-#: src/filewriter/mp3.cc:1017
-msgid "Average bitrate (kbps):"
-msgstr "Keskmine bitikiirus (kbps):"
-
-#: src/filewriter/mp3.cc:1044
-msgid "VBR quality level:"
-msgstr ""
-
-#: src/filewriter/mp3.cc:1063
+#: src/filewriter/filewriter.cc:533
 msgid "Omit Xing VBR header"
 msgstr ""
 
-#: src/filewriter/mp3.cc:1076
-msgid "VBR/ABR"
+#: src/filewriter/filewriter.cc:539
+msgid "Frame Headers"
 msgstr ""
 
-#: src/filewriter/mp3.cc:1085
-msgid "Frame Parameters:"
-msgstr ""
-
-#: src/filewriter/mp3.cc:1097
+#: src/filewriter/filewriter.cc:540
 msgid "Mark as copyright"
 msgstr ""
 
-#: src/filewriter/mp3.cc:1108
+#: src/filewriter/filewriter.cc:542
 msgid "Mark as original"
 msgstr ""
 
-#: src/filewriter/mp3.cc:1120
-msgid "ID3 Parameters:"
-msgstr ""
+#: src/filewriter/filewriter.cc:544
+msgid "ID3 Tags"
+msgstr "ID3-sildid"
 
-#: src/filewriter/mp3.cc:1131
+#: src/filewriter/filewriter.cc:545
 msgid "Force addition of version 2 tag"
-msgstr ""
+msgstr "Versioon 2 sildi lisamine jõuga"
 
-#: src/filewriter/mp3.cc:1141
+#: src/filewriter/filewriter.cc:547
 msgid "Only add v1 tag"
-msgstr "Lisatakse ainult v1 silt"
+msgstr "Ainult v1 sildi lisamine"
 
-#: src/filewriter/mp3.cc:1148
+#: src/filewriter/filewriter.cc:549
 msgid "Only add v2 tag"
-msgstr "Lisatakse ainult v2 silt"
+msgstr "Ainult v2 sildi lisamine"
 
-#: src/filewriter/mp3.cc:1169
+#: src/filewriter/filewriter.cc:554
+msgid "Quality"
+msgstr "Kvaliteet"
+
+#: src/filewriter/filewriter.cc:555
+msgid "VBR/ABR"
+msgstr "VBR/ABR"
+
+#: src/filewriter/filewriter.cc:556
 msgid "Tags"
 msgstr "Sildid"
 
-#: src/filewriter/vorbis.cc:196
-msgid "Vorbis Encoder Configuration"
-msgstr "Vorbis-kodeerija sätted"
-
-#: src/filewriter/vorbis.cc:219
-msgid "Quality level (0 - 10):"
-msgstr "Kvaliteedi tase (0-10):"
+#: src/filewriter/filewriter.cc:566
+msgid "Quality (0-1):"
+msgstr "Kvaliteet (0-1):"
+
+#: src/filewriter/filewriter.cc:573 src/skins-qt/skins_cfg.cc:307
+#: src/skins/skins_cfg.cc:289
+msgid "General"
+msgstr "Üldine"
 
-#: src/flacng/flacng.h:35
+#: src/flac/flacng.h:36
 msgid "FLAC Decoder"
-msgstr ""
+msgstr "FLAC-dekooder"
 
-#: src/flacng/metadata.cc:351 src/wavpack/wavpack.cc:209
+#: src/flac/metadata.cc:296 src/wavpack/wavpack.cc:215
 msgid "lossless"
-msgstr ""
+msgstr "kadudeta"
 
-#: src/flacng/plugin.cc:169
+#: src/flac/plugin.cc:214
 msgid ""
 "Original code by\n"
 "Ralf Ertzinger <ralf@skytale.net>\n"
 "\n"
 "http://www.skytale.net/projects/bmp-flac2/"
 msgstr ""
+"Algse koodi autor on\n"
+"Ralf Ertzinger <ralf@skytale.net>\n"
+"\n"
+"http://www.skytale.net/projects/bmp-flac2/"
 
 #: src/gio/gio.cc:34
 msgid ""
 "GIO Plugin for Audacious\n"
 "Copyright 2009-2012 John Lindgren"
 msgstr ""
+"Audaciouse GIO-plugin\n"
+"Autoriõigus 2009-2012 John Lindgren"
 
 #: src/gio/gio.cc:42
 msgid "GIO Plugin"
 msgstr "GIO-plugin"
 
-#: src/gio/gio.cc:153
+#: src/gio/gio.cc:152
 msgid "Read-and-append mode not supported"
 msgstr ""
 
-#: src/gio/gio.cc:166
+#: src/gio/gio.cc:165
 msgid "Invalid open mode"
 msgstr ""
 
-#: src/gl-spectrum/gl-spectrum.cc:51
+#: src/glspectrum/gl-spectrum.cc:52
 msgid ""
 "OpenGL Spectrum Analyzer for Audacious\n"
 "Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
@@ -1387,623 +1395,763 @@
 "\n"
 "License: GPLv2+"
 msgstr ""
-
-#: src/gl-spectrum/gl-spectrum.cc:62
-msgid "OpenGL Spectrum Analyzer"
-msgstr ""
-
-#: src/gl-spectrum-qt/gl-spectrum.cc:41
-msgid ""
-"OpenGL Spectrum Analyzer for Audacious\n"
-"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
-"Copyright 2014 William Pitcock\n"
+"Audaciouse OpenGL spektrianalüüs\n"
+"Autoriõigus 2013 Christophe Budé, John Lindgren ja Carlo Bramini\n"
 "\n"
-"Based on the XMMS plugin:\n"
-"Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson, and "
+"Põhineb XMMS-pluginal:\n"
+"Autoriõigus 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson ja "
 "4Front Technologies\n"
 "\n"
-"License: GPLv2+"
-msgstr ""
+"Litsents: GPLv2+"
 
-#: src/gl-spectrum-qt/gl-spectrum.cc:53
-msgid "OpenGL Spectrum Analyzer (Qt)"
-msgstr ""
-
-#: src/gnomeshortcuts/gnomeshortcuts.cc:38
-msgid "GNOME Shortcuts"
-msgstr ""
+#: src/glspectrum/gl-spectrum.cc:63 src/qtglspectrum/gl-spectrum.cc:53
+msgid "OpenGL Spectrum Analyzer"
+msgstr "OpenGL spektrianalüüs"
 
-#: src/gnomeshortcuts/gnomeshortcuts.cc:54
-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>"
+#: src/gtkui/columns.cc:36 src/moonstone/playlist_model.cc:38
+#: src/qtui/playlist_model.cc:33
+msgid "Entry Number"
 msgstr ""
 
-#: src/gtkui/columns.cc:35
-msgid "Entry number"
-msgstr "Kirje number"
-
-#: src/gtkui/columns.cc:36 src/playlist-manager/playlist-manager.cc:225
-#: src/qtui/playlist_model.cc:123
+#: src/gtkui/columns.cc:37 src/moonstone/playlist_model.cc:38
+#: src/moonstone/playlist_selection.cc:64
+#: src/playlist-manager/playlist-manager.cc:200
+#: src/playlist-manager-qt/playlist-manager-qt.cc:188
+#: src/qtui/playlist_model.cc:33 src/streamtuner/icecast-model.cc:120
+#: src/streamtuner/ihr-model.cc:159 src/streamtuner/shoutcast-model.cc:122
 msgid "Title"
 msgstr "Pealkiri"
 
-#: src/gtkui/columns.cc:37 src/qtui/playlist_model.cc:125
+#: src/gtkui/columns.cc:38 src/moonstone/playlist_model.cc:39
+#: src/qtui/playlist_model.cc:33
 msgid "Artist"
 msgstr "Esitaja"
 
-#: src/gtkui/columns.cc:38
+#: src/gtkui/columns.cc:39 src/moonstone/playlist_model.cc:39
+#: src/qtui/playlist_model.cc:33
 msgid "Year"
 msgstr "Aasta"
 
-#: src/gtkui/columns.cc:39 src/qtui/playlist_model.cc:127
+#: src/gtkui/columns.cc:40 src/moonstone/playlist_model.cc:39
+#: src/qtui/playlist_model.cc:34
 msgid "Album"
 msgstr "Album"
 
-#: src/gtkui/columns.cc:40
-msgid "Album artist"
-msgstr ""
+#: src/gtkui/columns.cc:41 src/moonstone/playlist_model.cc:40
+#: src/qtui/playlist_model.cc:34
+msgid "Album Artist"
+msgstr "Albumi esitaja"
 
-#: src/gtkui/columns.cc:41
+#: src/gtkui/columns.cc:42 src/moonstone/playlist_model.cc:40
+#: src/qtui/playlist_model.cc:34
 msgid "Track"
 msgstr "Lugu"
 
-#: src/gtkui/columns.cc:42
+#: src/gtkui/columns.cc:43 src/moonstone/playlist_model.cc:40
+#: src/qtui/playlist_model.cc:34 src/streamtuner/icecast-model.cc:123
+#: src/streamtuner/shoutcast-model.cc:125
+#: src/streamtuner/shoutcast-model.cc:236
 msgid "Genre"
 msgstr "Žanr"
 
-#: src/gtkui/columns.cc:43
-msgid "Queue position"
-msgstr "Asukoht järjekorras"
+#: src/gtkui/columns.cc:44 src/moonstone/playlist_model.cc:41
+#: src/qtui/playlist_model.cc:35
+msgid "Queue Position"
+msgstr ""
 
-#: src/gtkui/columns.cc:44
+#: src/gtkui/columns.cc:45 src/moonstone/playlist_model.cc:41
+#: src/qtui/playlist_model.cc:35
 msgid "Length"
 msgstr "Kestus"
 
-#: src/gtkui/columns.cc:45
-msgid "File path"
-msgstr "Faili rada"
-
-#: src/gtkui/columns.cc:47
-msgid "Custom title"
-msgstr "Kohandatud pealkiri"
+#: src/gtkui/columns.cc:46 src/moonstone/playlist_model.cc:41
+#: src/qtui/playlist_model.cc:35
+msgid "File Path"
+msgstr ""
 
-#: src/gtkui/columns.cc:48
+#: src/gtkui/columns.cc:47 src/moonstone/playlist_model.cc:42
+#: src/qtui/playlist_model.cc:35
+msgid "File Name"
+msgstr ""
+
+#: src/gtkui/columns.cc:48 src/moonstone/playlist_model.cc:42
+#: src/qtui/playlist_model.cc:36
+msgid "Custom Title"
+msgstr ""
+
+#: src/gtkui/columns.cc:49 src/moonstone/playlist_model.cc:42
+#: src/qtui/playlist_model.cc:36 src/streamtuner/icecast-model.cc:129
+#: src/streamtuner/shoutcast-model.cc:134
 msgid "Bitrate"
 msgstr "Bitikiirus"
 
-#: src/gtkui/columns.cc:308
-msgid "Available columns"
+#: src/gtkui/columns.cc:50 src/moonstone/playlist_model.cc:43
+#: src/qtui/playlist_model.cc:36
+msgid "Comment"
+msgstr "Kommentaar"
+
+#: src/gtkui/columns.cc:51 src/qtui/playlist_model.cc:36
+msgid "Publisher"
+msgstr "Avaldaja"
+
+#: src/gtkui/columns.cc:52 src/qtui/playlist_model.cc:37
+msgid "Catalog Number"
+msgstr "Kataloogi number"
+
+#: src/gtkui/columns.cc:53 src/moonstone/playlist_model.cc:43
+#: src/qtui/playlist_model.cc:37
+msgid "Disc"
 msgstr ""
 
-#: src/gtkui/columns.cc:334
+#: src/gtkui/columns.cc:325
+msgid "Available columns"
+msgstr "Saadaolevad veerud"
+
+#: src/gtkui/columns.cc:351
 msgid "Displayed columns"
-msgstr ""
+msgstr "Kuvatavad veerud"
 
-#: src/gtkui/layout.cc:72 src/search-tool/search-tool.cc:40
+#: src/gtkui/layout.cc:74 src/search-tool-qt/search-tool-qt.cc:58
+#: src/search-tool/search-tool.cc:49
 msgid "Search Tool"
 msgstr "Otsinguvahend"
 
-#: src/gtkui/layout.cc:167
+#: src/gtkui/layout.cc:170
 msgid "Dock at Left"
 msgstr "Doki vasakule"
 
-#: src/gtkui/layout.cc:167
+#: src/gtkui/layout.cc:170
 msgid "Dock at Right"
 msgstr "Doki paremale"
 
-#: src/gtkui/layout.cc:168
+#: src/gtkui/layout.cc:171
 msgid "Dock at Top"
 msgstr "Doki üles"
 
-#: src/gtkui/layout.cc:168
+#: src/gtkui/layout.cc:171
 msgid "Dock at Bottom"
 msgstr "Doki alla"
 
-#: src/gtkui/layout.cc:168
+#: src/gtkui/layout.cc:171
 msgid "Undock"
 msgstr ""
 
-#: src/gtkui/layout.cc:168 src/ladspa/plugin.cc:531
+#: src/gtkui/layout.cc:171 src/ladspa/plugin.cc:540
 msgid "Disable"
 msgstr "Keela"
 
-#: src/gtkui/menus.cc:126 src/qtui/main_window_actions.cc:93
-#: src/statusicon/statusicon.cc:276
+#: src/gtkui/menus.cc:79 src/qtui/menus.cc:107
+#: src/statusicon-qt/statusicon.cc:115 src/statusicon/statusicon.cc:286
 msgid "_Open Files ..."
 msgstr "_Ava failid ..."
 
-#: src/gtkui/menus.cc:127
+#: src/gtkui/menus.cc:80 src/qtui/menus.cc:111
 msgid "Open _URL ..."
 msgstr "Ava _URL ..."
 
-#: src/gtkui/menus.cc:128 src/qtui/main_window_actions.cc:95
+#: src/gtkui/menus.cc:81 src/qtui/menus.cc:113
 msgid "_Add Files ..."
 msgstr "_Lisa faile ..."
 
-#: src/gtkui/menus.cc:129
+#: src/gtkui/menus.cc:82 src/qtui/menus.cc:118
 msgid "Add U_RL ..."
 msgstr "Lisa U_RL ..."
 
-#: src/gtkui/menus.cc:131
+#: src/gtkui/menus.cc:84 src/qtui/menus.cc:120
 msgid "Search _Library"
-msgstr ""
+msgstr "Otsi _teegist"
 
-#: src/gtkui/menus.cc:133 src/qtui/main_window_actions.cc:98
+#: src/gtkui/menus.cc:86 src/qtui/menus.cc:123
 msgid "A_bout ..."
 msgstr "_Programmist lähemalt"
 
-#: src/gtkui/menus.cc:134 src/qtui/main_window_actions.cc:99
+#: src/gtkui/menus.cc:87 src/qtui/menus.cc:125
 msgid "_Settings ..."
-msgstr ""
+msgstr "_Sätted ..."
 
-#: src/gtkui/menus.cc:135 src/qtui/main_window_actions.cc:103
-#: src/statusicon/statusicon.cc:284
+#: src/gtkui/menus.cc:88 src/qtui/menus.cc:131
+#: src/statusicon-qt/statusicon.cc:117 src/statusicon/statusicon.cc:288
 msgid "_Quit"
 msgstr "_Välju"
 
-#: src/gtkui/menus.cc:139 src/gtkui/menus.cc:262
-#: src/qtui/main_window_actions.cc:107 src/search-tool/search-tool.cc:641
-#: src/statusicon/statusicon.cc:278
+#: src/gtkui/menus.cc:92 src/gtkui/menus.cc:226
+#: src/moonstone/playlist_tabs.cc:306 src/qtui/menus.cc:135
+#: src/qtui/playlist_tabs.cc:331 src/search-tool-qt/search-tool-qt.cc:499
+#: src/search-tool/search-tool.cc:339 src/statusicon-qt/statusicon.cc:109
+#: src/statusicon/statusicon.cc:280
 msgid "_Play"
 msgstr "_Esita"
 
-#: src/gtkui/menus.cc:140 src/qtui/main_window_actions.cc:108
-#: src/statusicon/statusicon.cc:279
+#: src/gtkui/menus.cc:93 src/qtui/menus.cc:137
+#: src/statusicon-qt/statusicon.cc:110 src/statusicon/statusicon.cc:281
 msgid "Paus_e"
 msgstr "_Peata"
 
-#: src/gtkui/menus.cc:141 src/qtui/main_window_actions.cc:109
-#: src/statusicon/statusicon.cc:280
+#: src/gtkui/menus.cc:94 src/qtui/menus.cc:139
+#: src/statusicon-qt/statusicon.cc:111 src/statusicon/statusicon.cc:282
 msgid "_Stop"
 msgstr "_Seiska"
 
-#: src/gtkui/menus.cc:142 src/qtui/main_window_actions.cc:110
-#: src/statusicon/statusicon.cc:277
+#: src/gtkui/menus.cc:95 src/qtui/menus.cc:141
+#: src/statusicon-qt/statusicon.cc:112 src/statusicon/statusicon.cc:283
 msgid "Pre_vious"
 msgstr "Ee_lmine"
 
-#: src/gtkui/menus.cc:143 src/qtui/main_window_actions.cc:111
-#: src/statusicon/statusicon.cc:281
+#: src/gtkui/menus.cc:96 src/qtui/menus.cc:143
+#: src/statusicon-qt/statusicon.cc:113 src/statusicon/statusicon.cc:284
 msgid "_Next"
 msgstr "_Järgmine"
 
-#: src/gtkui/menus.cc:145 src/qtui/main_window_actions.cc:113
+#: src/gtkui/menus.cc:97 src/qtui/menus.cc:145 src/skins/menus.cc:114
+#: src/skins-qt/menus.cc:105
+msgid "Previous Album"
+msgstr "Eelmine album"
+
+#: src/gtkui/menus.cc:98 src/qtui/menus.cc:146 src/skins/menus.cc:115
+#: src/skins-qt/menus.cc:106
+msgid "Next Album"
+msgstr "Järgmine album"
+
+#: src/gtkui/menus.cc:100 src/qtui/menus.cc:148
 msgid "_Repeat"
 msgstr "Ko_rduv"
 
-#: src/gtkui/menus.cc:146 src/qtui/main_window_actions.cc:114
+#: src/gtkui/menus.cc:101 src/qtui/menus.cc:150
 msgid "S_huffle"
 msgstr "Se_gatud"
 
-#: src/gtkui/menus.cc:147 src/qtui/main_window_actions.cc:115
+#: src/gtkui/menus.cc:102 src/qtui/menus.cc:152
+msgid "Shuffle by Albu_m"
+msgstr "Segatud albu_mi kaupa"
+
+#: src/gtkui/menus.cc:103 src/qtui/menus.cc:155
 msgid "N_o Playlist Advance"
 msgstr "Esitusnimekirja ei _kasutata"
 
-#: src/gtkui/menus.cc:148 src/qtui/main_window_actions.cc:116
+#: src/gtkui/menus.cc:104 src/qtui/menus.cc:157
 msgid "Stop A_fter This Song"
-msgstr ""
+msgstr "Se_iskamine selle loo lõppedes"
 
-#: src/gtkui/menus.cc:150 src/gtkui/menus.cc:247
-#: src/qtui/main_window_actions.cc:118
+#: src/gtkui/menus.cc:106 src/gtkui/menus.cc:210 src/qtui/menus.cc:162
+#: src/qtui/menus.cc:294
 msgid "Song _Info ..."
 msgstr "L_oo andmed ..."
 
-#: src/gtkui/menus.cc:151
+#: src/gtkui/menus.cc:107
 msgid "Jump to _Time ..."
 msgstr "_Hüppa määratud ajale..."
 
-#: src/gtkui/menus.cc:152
+#: src/gtkui/menus.cc:108
 msgid "_Jump to Song ..."
 msgstr "_Vaheta lugu ..."
 
-#: src/gtkui/menus.cc:154
+#: src/gtkui/menus.cc:110 src/qtui/menus.cc:165
 msgid "Set Repeat Point _A"
-msgstr ""
+msgstr "Korduspunkti _A määramine"
 
-#: src/gtkui/menus.cc:155
+#: src/gtkui/menus.cc:111 src/qtui/menus.cc:167
 msgid "Set Repeat Point _B"
-msgstr ""
+msgstr "Korduspunkti _B määramine"
 
-#: src/gtkui/menus.cc:156
+#: src/gtkui/menus.cc:112 src/qtui/menus.cc:169
 msgid "_Clear Repeat Points"
-msgstr ""
+msgstr "Puhasta kordamispu_nktid"
 
-#: src/gtkui/menus.cc:160 src/gtkui/menus.cc:167 src/gtkui/menus.cc:183
-#: src/qtui/main_window_actions.cc:122 src/qtui/main_window_actions.cc:129
-#: src/qtui/main_window_actions.cc:145
+#: src/gtkui/menus.cc:116 src/gtkui/menus.cc:123 src/gtkui/menus.cc:141
+#: src/qtui/menus.cc:173 src/qtui/menus.cc:180 src/qtui/menus.cc:198
 msgid "By _Title"
 msgstr "Peal_kirja järgi"
 
-#: src/gtkui/menus.cc:161 src/qtui/main_window_actions.cc:123
+#: src/gtkui/menus.cc:117 src/qtui/menus.cc:174
 msgid "By _File Name"
 msgstr ""
 
-#: src/gtkui/menus.cc:162 src/qtui/main_window_actions.cc:124
+#: src/gtkui/menus.cc:118 src/qtui/menus.cc:175
 msgid "By File _Path"
 msgstr ""
 
-#: src/gtkui/menus.cc:166 src/gtkui/menus.cc:182
-#: src/qtui/main_window_actions.cc:128 src/qtui/main_window_actions.cc:144
+#: src/gtkui/menus.cc:122 src/gtkui/menus.cc:140 src/qtui/menus.cc:179
+#: src/qtui/menus.cc:197
 msgid "By Track _Number"
 msgstr "Loo _numbri järgi"
 
-#: src/gtkui/menus.cc:168 src/gtkui/menus.cc:184
-#: src/qtui/main_window_actions.cc:130 src/qtui/main_window_actions.cc:146
+#: src/gtkui/menus.cc:124 src/gtkui/menus.cc:142 src/qtui/menus.cc:181
+#: src/qtui/menus.cc:199
 msgid "By _Artist"
 msgstr "_Esitaja järgi"
 
-#: src/gtkui/menus.cc:169 src/gtkui/menus.cc:185
-#: src/qtui/main_window_actions.cc:131 src/qtui/main_window_actions.cc:147
+#: src/gtkui/menus.cc:125 src/gtkui/menus.cc:143 src/qtui/menus.cc:182
+#: src/qtui/menus.cc:200
 msgid "By Al_bum"
-msgstr ""
+msgstr "Al_bumi järgi"
 
-#: src/gtkui/menus.cc:170 src/gtkui/menus.cc:186
-#: src/qtui/main_window_actions.cc:132 src/qtui/main_window_actions.cc:148
+#: src/gtkui/menus.cc:126 src/gtkui/menus.cc:144 src/qtui/menus.cc:183
+#: src/qtui/menus.cc:201
 msgid "By Albu_m Artist"
-msgstr ""
+msgstr "Albu_mi esitaja järgi"
 
-#: src/gtkui/menus.cc:171 src/gtkui/menus.cc:187
-#: src/qtui/main_window_actions.cc:133 src/qtui/main_window_actions.cc:149
+#: src/gtkui/menus.cc:127 src/gtkui/menus.cc:145 src/qtui/menus.cc:184
+#: src/qtui/menus.cc:202
 msgid "By Release _Date"
 msgstr "_Väljalaske kuupäeva järgi"
 
-#: src/gtkui/menus.cc:172 src/gtkui/menus.cc:188
-#: src/qtui/main_window_actions.cc:134 src/qtui/main_window_actions.cc:150
+#: src/gtkui/menus.cc:128 src/gtkui/menus.cc:146 src/qtui/menus.cc:185
+#: src/qtui/menus.cc:203
 msgid "By _Genre"
-msgstr ""
+msgstr "_Žanri järgi"
 
-#: src/gtkui/menus.cc:173 src/gtkui/menus.cc:189
-#: src/qtui/main_window_actions.cc:135 src/qtui/main_window_actions.cc:151
+#: src/gtkui/menus.cc:129 src/gtkui/menus.cc:147 src/qtui/menus.cc:186
+#: src/qtui/menus.cc:204
 msgid "By _Length"
-msgstr ""
+msgstr "Ke_stuse järgi"
 
-#: src/gtkui/menus.cc:174 src/gtkui/menus.cc:190
-#: src/qtui/main_window_actions.cc:136 src/qtui/main_window_actions.cc:152
+#: src/gtkui/menus.cc:130 src/gtkui/menus.cc:148 src/qtui/menus.cc:187
+#: src/qtui/menus.cc:205
 msgid "By _File Path"
 msgstr "_Faili raja järgi"
 
-#: src/gtkui/menus.cc:175 src/gtkui/menus.cc:191
-#: src/qtui/main_window_actions.cc:137 src/qtui/main_window_actions.cc:153
+#: src/gtkui/menus.cc:131 src/gtkui/menus.cc:149 src/qtui/menus.cc:188
+#: src/qtui/menus.cc:206
 msgid "By _Custom Title"
 msgstr "Ko_handatud pealkirja järgi"
 
-#: src/gtkui/menus.cc:177 src/gtkui/menus.cc:193
-#: src/qtui/main_window_actions.cc:139 src/qtui/main_window_actions.cc:155
+#: src/gtkui/menus.cc:132 src/gtkui/menus.cc:150 src/qtui/menus.cc:189
+#: src/qtui/menus.cc:207
+msgid "By C_omment"
+msgstr ""
+
+#: src/gtkui/menus.cc:133 src/gtkui/menus.cc:151 src/qtui/menus.cc:190
+#: src/qtui/menus.cc:208
+msgid "By D_isc Number"
+msgstr ""
+
+#: src/gtkui/menus.cc:135 src/gtkui/menus.cc:153 src/qtui/menus.cc:192
+#: src/qtui/menus.cc:210
 msgid "R_everse Order"
 msgstr "_Pööra järjestus tagurpidi"
 
-#: src/gtkui/menus.cc:178 src/gtkui/menus.cc:194
-#: src/qtui/main_window_actions.cc:140 src/qtui/main_window_actions.cc:156
+#: src/gtkui/menus.cc:136 src/gtkui/menus.cc:154 src/qtui/menus.cc:194
+#: src/qtui/menus.cc:212
 msgid "_Random Order"
 msgstr "_Järjestus juhuslikuks"
 
-#: src/gtkui/menus.cc:198 src/qtui/main_window_actions.cc:160
+#: src/gtkui/menus.cc:158 src/qtui/menus.cc:216
 msgid "_Play/Resume"
 msgstr ""
 
-#: src/gtkui/menus.cc:199 src/gtkui/menus.cc:251
-#: src/qtui/main_window_actions.cc:161
+#: src/gtkui/menus.cc:159 src/qtui/menus.cc:218
 msgid "_Refresh"
 msgstr "_Värskenda"
 
-#: src/gtkui/menus.cc:201 src/qtui/main_window_actions.cc:163
+#: src/gtkui/menus.cc:161 src/qtui/menus.cc:222
 msgid "_Sort"
 msgstr "_Sordi"
 
-#: src/gtkui/menus.cc:202 src/qtui/main_window_actions.cc:164
+#: src/gtkui/menus.cc:162 src/qtui/menus.cc:223
 msgid "Sort Se_lected"
-msgstr ""
+msgstr "Sordi va_lik"
 
-#: src/gtkui/menus.cc:203 src/qtui/main_window_actions.cc:165
+#: src/gtkui/menus.cc:163 src/qtui/menus.cc:225
 msgid "Remove _Duplicates"
-msgstr ""
+msgstr "Eemalda _topeltkirjed"
 
-#: src/gtkui/menus.cc:204 src/qtui/main_window_actions.cc:166
+#: src/gtkui/menus.cc:164 src/qtui/menus.cc:226
 msgid "Remove _Unavailable Files"
 msgstr "Ee_malda kättesaamatud failid"
 
-#: src/gtkui/menus.cc:206 src/playlist-manager/playlist-manager.cc:244
-#: src/qtui/main_window_actions.cc:168
+#: src/gtkui/menus.cc:166 src/playlist-manager/playlist-manager.cc:219
+#: src/playlist-manager-qt/playlist-manager-qt.cc:348 src/qtui/menus.cc:229
 msgid "_New"
 msgstr "_Uus"
 
-#: src/gtkui/menus.cc:207
+#: src/gtkui/menus.cc:167 src/qtui/menus.cc:230
 msgid "Ren_ame ..."
 msgstr "Muu_da nime"
 
-#: src/gtkui/menus.cc:208 src/gtkui/menus.cc:264
-#: src/qtui/main_window_actions.cc:170
+#: src/gtkui/menus.cc:168 src/gtkui/menus.cc:228
+#: src/moonstone/playlist_tabs.cc:311 src/qtui/menus.cc:231
+#: src/qtui/playlist_tabs.cc:336
 msgid "Remo_ve"
-msgstr ""
+msgstr "Ee_malda"
 
-#: src/gtkui/menus.cc:210
+#: src/gtkui/menus.cc:170 src/qtui/menus.cc:233
 msgid "_Import ..."
 msgstr "_Impordi ..."
 
-#: src/gtkui/menus.cc:211
+#: src/gtkui/menus.cc:171 src/qtui/menus.cc:234
 msgid "_Export ..."
 msgstr "_Ekspordi ..."
 
-#: src/gtkui/menus.cc:213
+#: src/gtkui/menus.cc:173 src/qtui/menus.cc:237
 msgid "Playlist _Manager ..."
-msgstr "Esitusnimekirjade _haldur.."
+msgstr "Esitusnimekirjade _haldur..."
 
-#: src/gtkui/menus.cc:214 src/qtui/main_window_actions.cc:176
+#: src/gtkui/menus.cc:174 src/qtui/menus.cc:239
 msgid "_Queue Manager ..."
 msgstr "Halda _järjekorda ..."
 
-#: src/gtkui/menus.cc:218 src/qtui/main_window_actions.cc:180
+#: src/gtkui/menus.cc:178 src/qtui/menus.cc:243
 msgid "Volume _Up"
 msgstr "_Valjemaks"
 
-#: src/gtkui/menus.cc:219 src/qtui/main_window_actions.cc:181
+#: src/gtkui/menus.cc:179 src/qtui/menus.cc:245
 msgid "Volume _Down"
 msgstr "Va_iksemaks"
 
-#: src/gtkui/menus.cc:221 src/qtui/main_window_actions.cc:183
-msgid "_Equalizer"
-msgstr "_Ekvalaiser"
+#: src/gtkui/menus.cc:181 src/qtui/menus.cc:249
+msgid "_Equalizer ..."
+msgstr "_Ekvalaiser ..."
 
-#: src/gtkui/menus.cc:223 src/qtui/main_window_actions.cc:185
+#: src/gtkui/menus.cc:182 src/qtui/menus.cc:251
 msgid "E_ffects ..."
-msgstr ""
+msgstr "E_fektid ..."
+
+#: src/gtkui/menus.cc:184
+msgid "_Record Stream"
+msgstr "Salvesta _voogu"
 
-#: src/gtkui/menus.cc:227
+#: src/gtkui/menus.cc:185
+msgid "Audio _Settings ..."
+msgstr "Audio_sätted ..."
+
+#: src/gtkui/menus.cc:189 src/qtui/menus.cc:260
 msgid "Show _Menu Bar"
 msgstr "_Menüüriba on nähtaval"
 
-#: src/gtkui/menus.cc:228
+#: src/gtkui/menus.cc:190 src/qtui/menus.cc:262
 msgid "Show I_nfo Bar"
 msgstr "_Teaberiba on nähtaval"
 
-#: src/gtkui/menus.cc:229
-msgid "Show Info Bar Vis_ualization"
+#: src/gtkui/menus.cc:191 src/qtui/menus.cc:264
+msgid "Show Info Bar _Album Art"
 msgstr ""
 
-#: src/gtkui/menus.cc:230
+#: src/gtkui/menus.cc:192 src/qtui/menus.cc:266
+msgid "Show Info Bar Vis_ualization"
+msgstr "Teaberibal näidatakse vis_ualisatsioone"
+
+#: src/gtkui/menus.cc:193 src/qtui/menus.cc:268
 msgid "Show _Status Bar"
 msgstr "_Olekuriba on nähtaval"
 
-#: src/gtkui/menus.cc:232
+#: src/gtkui/menus.cc:195 src/qtui/menus.cc:272
 msgid "Show _Remaining Time"
-msgstr ""
+msgstr "Näidatakse _järgijäänud aega"
 
-#: src/gtkui/menus.cc:234
+#: src/gtkui/menus.cc:197 src/qtui/menus.cc:276 src/skins/menus.cc:157
+#: src/skins-qt/menus.cc:152
 msgid "_Visualizations ..."
-msgstr ""
+msgstr "_Visualiseerimine ..."
 
-#: src/gtkui/menus.cc:238 src/qtui/main_window_actions.cc:189
+#: src/gtkui/menus.cc:201 src/qtui/menus.cc:280
 msgid "_File"
 msgstr "_Fail"
 
-#: src/gtkui/menus.cc:239 src/qtui/main_window_actions.cc:190
+#: src/gtkui/menus.cc:202 src/qtui/menus.cc:281
 msgid "_Playback"
 msgstr "_Esitamine"
 
-#: src/gtkui/menus.cc:240 src/qtui/main_window_actions.cc:191
+#: src/gtkui/menus.cc:203 src/qtui/menus.cc:282
 msgid "P_laylist"
 msgstr "E_situsnimekiri"
 
-#: src/gtkui/menus.cc:241 src/gtkui/menus.cc:258
-#: src/qtui/main_window_actions.cc:192
+#: src/gtkui/menus.cc:204 src/gtkui/menus.cc:222 src/qtui/menus.cc:283
+#: src/qtui/menus.cc:312
 msgid "_Services"
 msgstr "_Teenused"
 
-#: src/gtkui/menus.cc:242 src/qtui/main_window_actions.cc:193
+#: src/gtkui/menus.cc:205 src/qtui/menus.cc:284
 msgid "_Output"
 msgstr "Väl_jund"
 
-#: src/gtkui/menus.cc:243
+#: src/gtkui/menus.cc:206 src/qtui/menus.cc:285
 msgid "_View"
 msgstr "_Vaade"
 
-#: src/gtkui/menus.cc:248
+#: src/gtkui/menus.cc:211 src/qtui/menus.cc:296
 msgid "_Queue/Unqueue"
 msgstr "_Järjekorda/järjekorrast maha"
 
-#: src/gtkui/menus.cc:250
+#: src/gtkui/menus.cc:213 src/qtui/menus.cc:299
 msgid "_Open Containing Folder"
-msgstr ""
+msgstr "Ava _faili sisaldav kaust"
 
-#: src/gtkui/menus.cc:253
+#: src/gtkui/menus.cc:214 src/qtui/menus.cc:301
+msgid "_Refresh Selected"
+msgstr "_Värskenda valituid"
+
+#: src/gtkui/menus.cc:216 src/qtui/menus.cc:304
 msgid "Cu_t"
 msgstr "_Lõika"
 
-#: src/gtkui/menus.cc:254
+#: src/gtkui/menus.cc:217 src/qtui/menus.cc:305
 msgid "_Copy"
 msgstr "_Kopeeri"
 
-#: src/gtkui/menus.cc:255
+#: src/gtkui/menus.cc:218 src/qtui/menus.cc:306
 msgid "_Paste"
 msgstr "_Aseta"
 
-#: src/gtkui/menus.cc:256
+#: src/gtkui/menus.cc:219 src/qtui/menus.cc:307
+msgid "Paste at _End"
+msgstr "Aseta lõ_ppu"
+
+#: src/gtkui/menus.cc:220 src/qtui/menus.cc:309
 msgid "Select _All"
 msgstr "Val_i kõik"
 
-#: src/gtkui/menus.cc:263
+#: src/gtkui/menus.cc:227 src/moonstone/playlist_tabs.cc:309
+#: src/qtui/playlist_tabs.cc:334
 msgid "_Rename ..."
 msgstr "_Muuda nime..."
 
-#: src/gtkui/settings.cc:35
+#: src/gtkui/settings.cc:35 src/qtui/settings.cc:59
+msgid "Always"
+msgstr "Alati"
+
+#: src/gtkui/settings.cc:36 src/qtui/settings.cc:60
+msgid "Auto-hide"
+msgstr "Automaatpeitmine"
+
+#: src/gtkui/settings.cc:37 src/qtui/settings.cc:61
+msgid "Never"
+msgstr "Ei näidata"
+
+#: src/gtkui/settings.cc:41 src/qtui/settings.cc:64
 msgid "Playlist Tabs"
-msgstr ""
+msgstr "Esitusnimekirja kaardid"
 
-#: src/gtkui/settings.cc:36
-msgid "Always show tabs"
-msgstr ""
+#: src/gtkui/settings.cc:42 src/qtui/settings.cc:65
+msgid "Show playlist tabs:"
+msgstr "Esitusnimekirjade kaartide näitamine:"
 
-#: src/gtkui/settings.cc:38
+#: src/gtkui/settings.cc:45 src/qtui/settings.cc:69
 msgid "Show entry counts"
-msgstr ""
+msgstr "Kirjete arv on nähtaval"
 
-#: src/gtkui/settings.cc:40
+#: src/gtkui/settings.cc:47 src/qtui/settings.cc:72
 msgid "Show close buttons"
-msgstr ""
+msgstr "Sulgemisnupud on nähtaval"
 
-#: src/gtkui/settings.cc:42
+#: src/gtkui/settings.cc:49 src/qtui/settings.cc:75
 msgid "Playlist Columns"
-msgstr ""
+msgstr "Esitusnimekirja veerud"
 
-#: src/gtkui/settings.cc:44
+#: src/gtkui/settings.cc:51 src/qtui/settings.cc:77
 msgid "Show column headers"
-msgstr ""
+msgstr "Veergude päised on nähtaval"
 
-#: src/gtkui/settings.cc:46 src/modplug/plugin_main.cc:106
-#: src/skins/skins_cfg.cc:263
-msgid "Miscellaneous"
+#: src/gtkui/settings.cc:53 src/qtui/settings.cc:82
+msgid "Make column headers clickable for sorting"
 msgstr ""
 
-#: src/gtkui/settings.cc:47
-msgid "Arrow keys seek by:"
+#: src/gtkui/settings.cc:56
+msgid "Use symbolic icons in toolbar"
 msgstr ""
 
-#: src/gtkui/settings.cc:50
+#: src/gtkui/settings.cc:58 src/qtui/settings.cc:86
 msgid "Scroll on song change"
-msgstr ""
+msgstr "Kerimine loo vahetumisel"
 
-#: src/gtkui/ui_gtk.cc:71
+#: src/gtkui/ui_gtk.cc:82
 msgid "GTK Interface"
 msgstr "GTK liides"
 
-#: src/gtkui/ui_gtk.cc:222 src/skins/ui_main.cc:232
+#: src/gtkui/ui_gtk.cc:219 src/skins/main.cc:228 src/skins-qt/main.cc:231
 #, c-format
 msgid "%s - Audacious"
 msgstr "%s - Audacious"
 
-#: src/gtkui/ui_gtk.cc:225 src/qtui/main_window.cc:186
+#: src/gtkui/ui_gtk.cc:221 src/moonstone/main_window.cc:184
+#: src/qtui/main_window.cc:385
 msgid "Buffering ..."
 msgstr "Puhverdamine ..."
 
-#: src/gtkui/ui_gtk.cc:228 src/skins/ui_main.cc:234 src/skins/ui_main.cc:1164
+#: src/gtkui/ui_gtk.cc:224 src/pipewire/pipewire.cc:402 src/skins/main.cc:230
+#: src/skins-qt/main.cc:233
 msgid "Audacious"
 msgstr "Audacious"
 
-#: src/gtkui/ui_statusbar.cc:63 src/qtui/status_bar.cc:67
+#: src/gtkui/ui_gtk.cc:487 src/gtkui/ui_gtk.cc:518 src/gtkui/ui_gtk.cc:882
+#: src/hotkey/gui.cc:72 src/moonstone/main_window.cc:67
+#: src/moonstone/main_window.cc:145 src/moonstone/main_window.cc:146
+#: src/notify/osd.cc:85 src/qthotkey/gui.cc:67 src/qtui/main_window.cc:154
+#: src/qtui/main_window.cc:347 src/qtui/main_window.cc:348
+#: src/skins/menus.cc:109 src/skins-qt/menus.cc:100
+msgid "Play"
+msgstr "Esita"
+
+#: src/gtkui/ui_gtk.cc:487 src/moonstone/main_window.cc:151
+#: src/moonstone/main_window.cc:152 src/notify/osd.cc:82
+#: src/qtui/main_window.cc:353 src/qtui/main_window.cc:354
+#: src/skins/menus.cc:110 src/skins-qt/menus.cc:101
+msgid "Pause"
+msgstr "Pausi"
+
+#: src/gtkui/ui_gtk.cc:868 src/moonstone/main_window.cc:57
+#: src/qtui/main_window.cc:145 src/skins/menus.cc:86 src/skins-qt/menus.cc:77
+msgid "Search Library"
+msgstr "Otsi teegist"
+
+#: src/gtkui/ui_gtk.cc:875 src/moonstone/main_window.cc:60
+#: src/qtui/main_window.cc:147
+msgid "Open Files"
+msgstr "Failide avamine"
+
+#: src/gtkui/ui_gtk.cc:876 src/moonstone/main_window.cc:62
+#: src/qtui/main_window.cc:149
+msgid "Add Files"
+msgstr "Failide lisamine"
+
+#: src/gtkui/ui_gtk.cc:881 src/moonstone/main_window.cc:65
+#: src/qtui/main_window.cc:152 src/skins/menus.cc:112 src/skins-qt/menus.cc:103
+msgid "Previous"
+msgstr "Eelmine"
+
+#: src/gtkui/ui_gtk.cc:883 src/hotkey/gui.cc:74 src/moonstone/main_window.cc:69
+#: src/qthotkey/gui.cc:69 src/qtui/main_window.cc:156 src/skins/menus.cc:111
+#: src/skins-qt/menus.cc:102
+msgid "Stop"
+msgstr "Seiska"
+
+#: src/gtkui/ui_gtk.cc:884 src/moonstone/main_window.cc:76 src/notify/osd.cc:89
+#: src/qtui/main_window.cc:163 src/skins/menus.cc:113 src/skins-qt/menus.cc:104
+msgid "Next"
+msgstr "Järgmine"
+
+#: src/gtkui/ui_gtk.cc:886 src/moonstone/main_window.cc:79
+#: src/qtui/main_window.cc:166 src/qtui/menus.cc:254 src/skins/menus.cc:79
+#: src/skins-qt/menus.cc:69
+msgid "Record Stream"
+msgstr "Salvesta voogu"
+
+#: src/gtkui/ui_gtk.cc:919 src/moonstone/main_window.cc:86
+#: src/qtui/main_window.cc:173 src/skins/menus.cc:103 src/skins-qt/menus.cc:94
+msgid "Repeat"
+msgstr "Korduv"
+
+#: src/gtkui/ui_gtk.cc:922 src/moonstone/main_window.cc:89
+#: src/qtui/main_window.cc:176 src/skins/menus.cc:104 src/skins-qt/menus.cc:95
+msgid "Shuffle"
+msgstr "Segatud"
+
+#: src/gtkui/ui_gtk.cc:1114 src/qtui/main_window.cc:123
+msgid "Menu"
+msgstr ""
+
+#: src/gtkui/ui_statusbar.cc:64 src/qtui/status_bar.cc:155
 msgid "mono"
 msgstr "mono"
 
-#: src/gtkui/ui_statusbar.cc:65 src/qtui/status_bar.cc:69
+#: src/gtkui/ui_statusbar.cc:66 src/qtui/status_bar.cc:157
 msgid "stereo"
 msgstr "stereo"
 
-#: src/gtkui/ui_statusbar.cc:67 src/qtui/status_bar.cc:71
+#: src/gtkui/ui_statusbar.cc:68 src/qtui/status_bar.cc:160
 #, c-format
 msgid "%d channel"
 msgid_plural "%d channels"
 msgstr0 "%d kanal"
 msgstr1 "%d kanalit"
 
-#: src/gtkui/ui_statusbar.cc:81 src/qtui/status_bar.cc:85
+#: src/gtkui/ui_statusbar.cc:76 src/qtui/status_bar.cc:168
 #, c-format
-msgid "%d kbps"
-msgstr "%d kbps"
+msgid "%d kHz"
+msgstr "%d kHz"
 
-#: src/gtkui/ui_statusbar.cc:107 src/skins/ui_main_evlisteners.cc:103
+#: src/gtkui/ui_statusbar.cc:82 src/qtui/status_bar.cc:174
+#, c-format
+msgid "%d kbit/s"
+msgstr "%d kbit/s"
+
+#: src/gtkui/ui_statusbar.cc:108 src/skins/main.cc:478 src/skins-qt/main.cc:461
 msgid "Single mode."
 msgstr "Ühe loo režiim."
 
-#: src/gtkui/ui_statusbar.cc:109 src/skins/ui_main_evlisteners.cc:105
+#: src/gtkui/ui_statusbar.cc:110 src/skins/main.cc:480 src/skins-qt/main.cc:463
 msgid "Playlist mode."
 msgstr "Esitusnimekirja režiim."
 
-#: src/gtkui/ui_statusbar.cc:117 src/skins/ui_main_evlisteners.cc:111
+#: src/gtkui/ui_statusbar.cc:118 src/skins/main.cc:486 src/skins-qt/main.cc:469
 msgid "Stopping after song."
 msgstr "Seiskamine pärast loo lõppu."
 
-#: src/hotkey/gui.cc:71
+#: src/hotkey/gui.cc:71 src/qthotkey/gui.cc:66
 msgid "Previous track"
-msgstr ""
+msgstr "Eelmine rada"
 
-#: src/hotkey/gui.cc:72 src/notify/osd.cc:69 src/qtui/main_window.cc:69
-#: src/qtui/main_window.cc:172 src/qtui/main_window.cc:173
-#: src/skins/menus.cc:87
-msgid "Play"
-msgstr "Esita"
-
-#: src/hotkey/gui.cc:73
+#: src/hotkey/gui.cc:73 src/qthotkey/gui.cc:68
 msgid "Pause/Resume"
 msgstr "Pausimine/pausi lõpetamine"
 
-#: src/hotkey/gui.cc:74 src/qtui/main_window.cc:70 src/skins/menus.cc:89
-msgid "Stop"
-msgstr "Seiska"
-
-#: src/hotkey/gui.cc:75
+#: src/hotkey/gui.cc:75 src/qthotkey/gui.cc:70
 msgid "Next track"
-msgstr ""
+msgstr "Järgmine rada"
 
-#: src/hotkey/gui.cc:76
-msgid "Forward 5 seconds"
+#: src/hotkey/gui.cc:76 src/qthotkey/gui.cc:71
+msgid "Step forward"
 msgstr ""
 
-#: src/hotkey/gui.cc:77
-msgid "Rewind 5 seconds"
+#: src/hotkey/gui.cc:77 src/qthotkey/gui.cc:72
+msgid "Step backward"
 msgstr ""
 
-#: src/hotkey/gui.cc:78
+#: src/hotkey/gui.cc:78 src/qthotkey/gui.cc:73
 msgid "Mute"
 msgstr "Heli tummaks"
 
-#: src/hotkey/gui.cc:79
+#: src/hotkey/gui.cc:79 src/qthotkey/gui.cc:74
 msgid "Volume up"
-msgstr ""
+msgstr "Heli valjemaks"
 
-#: src/hotkey/gui.cc:80
+#: src/hotkey/gui.cc:80 src/qthotkey/gui.cc:75
 msgid "Volume down"
-msgstr ""
+msgstr "Heli vaiksemaks"
 
-#: src/hotkey/gui.cc:81
+#: src/hotkey/gui.cc:81 src/qthotkey/gui.cc:76
 msgid "Jump to file"
-msgstr ""
+msgstr "Failile hüppamine"
 
-#: src/hotkey/gui.cc:82
+#: src/hotkey/gui.cc:82 src/qthotkey/gui.cc:77
 msgid "Toggle player window(s)"
-msgstr ""
+msgstr "Esitamisakende sisse-/väljalülitamine"
 
-#: src/hotkey/gui.cc:83
+#: src/hotkey/gui.cc:83 src/qthotkey/gui.cc:78
 msgid "Show On-Screen-Display"
 msgstr "OSD sisse-/väljalülitamine"
 
-#: src/hotkey/gui.cc:84
+#: src/hotkey/gui.cc:84 src/qthotkey/gui.cc:79
 msgid "Toggle repeat"
-msgstr ""
+msgstr "Korduse sisse-/väljalülitamine"
 
-#: src/hotkey/gui.cc:85
+#: src/hotkey/gui.cc:85 src/qthotkey/gui.cc:80
 msgid "Toggle shuffle"
-msgstr ""
+msgstr "Segatud režiimi sisse-/väljalülitamine"
 
-#: src/hotkey/gui.cc:86
+#: src/hotkey/gui.cc:86 src/qthotkey/gui.cc:81
 msgid "Toggle stop after current"
-msgstr ""
+msgstr "Loo lõpus seiskamise sisse-/väljalülitamine"
 
-#: src/hotkey/gui.cc:87
+#: src/hotkey/gui.cc:87 src/qthotkey/gui.cc:82
 msgid "Raise player window(s)"
-msgstr ""
+msgstr "Esitamisakende esiletõstmine"
 
-#: src/hotkey/gui.cc:97
+#: src/hotkey/gui.cc:98 src/qthotkey/gui.cc:100
 msgid "(none)"
 msgstr ""
 
-#: src/hotkey/gui.cc:234
+#: src/hotkey/gui.cc:261
 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 modifiers.\n"
 "\n"
 "Do you want to continue?"
 msgstr ""
-"Peamisi hiirenuppe pole soovitatav ilma muuteklahvideta siduda.\n"
-"\n"
-"Kas soovid jätkata?"
 
-#: src/hotkey/gui.cc:236
+#: src/hotkey/gui.cc:264
 msgid "Binding mouse buttons"
 msgstr "Hiirenuppude sidumine"
 
-#: src/hotkey/gui.cc:391
+#: src/hotkey/gui.cc:434
 msgid ""
 "Press a key combination inside a text field.\n"
 "You can also bind mouse buttons."
@@ -2011,34 +2159,34 @@
 "Vajuta tekstiväljal soovitud klahvikombinatsiooni.\n"
 "Samamoodi saab siduda ka hiirenuppe."
 
-#: src/hotkey/gui.cc:396
+#: src/hotkey/gui.cc:444 src/qthotkey/gui.cc:179
 msgid "Hotkeys:"
 msgstr "Kiirklahvid:"
 
-#: src/hotkey/gui.cc:413
+#: src/hotkey/gui.cc:457 src/qthotkey/gui.cc:181
 msgid "Action:"
 msgstr "Tegevus:"
 
-#: src/hotkey/gui.cc:420
+#: src/hotkey/gui.cc:461 src/qthotkey/gui.cc:182
 msgid "Key Binding:"
 msgstr "Kiirklahv:"
 
-#: src/hotkey/gui.cc:468
+#: src/hotkey/gui.cc:518 src/qthotkey/gui.cc:184
 msgid "_Add"
-msgstr ""
+msgstr "_Lisa"
 
-#: src/hotkey/plugin.cc:61
+#: src/hotkey/plugin.cc:59 src/qthotkey/plugin.cc:78
 msgid "Global Hotkeys"
 msgstr ""
 
-#: src/hotkey/plugin.cc:79
+#: src/hotkey/plugin.cc:74
 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"
+"Contributors 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"
@@ -2046,51 +2194,81 @@
 " Jeremy Tan <nsx@nsx.homeip.net>"
 msgstr ""
 
-#: src/jack-ng/jack-ng.cc:49
+#: src/jack/jack-ng.cc:54
 msgid "JACK Output"
-msgstr ""
+msgstr "JACK-väljund"
+
+#: src/jack/jack-ng.cc:126
+msgid "Client name:"
+msgstr "Kliendi nimi:"
 
-#: src/jack-ng/jack-ng.cc:114
+#: src/jack/jack-ng.cc:128
 msgid "Automatically connect to output ports"
+msgstr "Automaatne ühendumine väljundportidesse"
+
+#: src/jack/jack-ng.cc:130
+msgid "Filter ports (regex, use any port if blank):"
+msgstr "Portide filter (regex, tühja väärtus = iga port)"
+
+#: src/jack/jack-ng.cc:136
+msgid "Connect to physical ports only"
+msgstr "Ühendumine ainult füüsilistesse portidesse"
+
+#: src/jack/jack-ng.cc:139
+msgid "Upmix to"
+msgstr ""
+
+#: src/jack/jack-ng.cc:141
+msgid "ports if input has fewer channels"
+msgstr ""
+
+#: src/jack/jack-ng.cc:143
+msgid "Ignore insufficient number of ports"
 msgstr ""
 
-#: src/jack-ng/jack-ng.cc:155
+#: src/jack/jack-ng.cc:181
+msgid "No JACK output ports were found. Please check settings."
+msgstr "JACK-väljundi porte ei leitud. Palun kontrolli sätteid."
+
+#: src/jack/jack-ng.cc:195
 #, c-format
 msgid "Only %d JACK output ports were found but %d are required."
-msgstr ""
+msgstr "Leiti %d JACK-väljundporti, kuid vaja on %d."
 
-#: src/jack-ng/jack-ng.cc:164
+#: src/jack/jack-ng.cc:210
 #, c-format
 msgid "Failed to connect to JACK port %s."
-msgstr ""
+msgstr "Tõrge ühendumisel JACK-pordiga %s."
 
-#: src/jack-ng/jack-ng.cc:184
+#: src/jack/jack-ng.cc:230
 msgid ""
 "JACK supports only floating-point audio. You must change the output bit "
 "depth to floating-point in Audacious settings."
 msgstr ""
+"JACK toetab ainult ujukoma-audiot. Selleks pead Sa Audaciouse sätetes muutma "
+"väljundi bitisügavust."
 
-#: src/jack-ng/jack-ng.cc:197
+#: src/jack/jack-ng.cc:245
 msgid "Failed to connect to the JACK server; is it running?"
-msgstr ""
+msgstr "Tõrge ühendumisel JACK-serveriga; kas see üldse töötab?"
 
-#: src/jack-ng/jack-ng.cc:273
+#: src/jack/jack-ng.cc:321
 #, c-format
 msgid ""
 "The JACK server requires a sample rate of %d Hz, but Audacious is playing at "
 "%d Hz. Please use the Sample Rate Converter effect to correct the mismatch."
 msgstr ""
 
-#: src/ladspa/plugin.cc:414
+#: src/ladspa/plugin.cc:416
 #, c-format
 msgid "%s Settings"
 msgstr "%s sätted"
 
-#: src/ladspa/plugin.cc:478
+#: src/ladspa/plugin.cc:482
 msgid "Module paths:"
 msgstr "Moodulite rajad:"
 
-#: src/ladspa/plugin.cc:483
+#: src/ladspa/plugin.cc:487
 msgid ""
 "Separate multiple paths with a colon.\n"
 "These paths are searched in addition to LADSPA_PATH.\n"
@@ -2101,39 +2279,41 @@
 "radadelt.\n"
 "Pärast uute radade lisamist vajuta uute pluginate otsimiseks Enterit."
 
-#: src/ladspa/plugin.cc:499
+#: src/ladspa/plugin.cc:508
 msgid "Available plugins:"
 msgstr "Saadaolevad pluginad:"
 
-#: src/ladspa/plugin.cc:512 src/modplug/plugin_main.cc:92
-#: src/modplug/plugin_main.cc:95 src/modplug/plugin_main.cc:98
-#: src/modplug/plugin_main.cc:101
+#: src/ladspa/plugin.cc:521 src/modplug/plugin_main.cc:91
+#: src/modplug/plugin_main.cc:94 src/modplug/plugin_main.cc:97
+#: src/modplug/plugin_main.cc:100
 msgid "Enable"
-msgstr "Luba"
+msgstr "Lubatud"
 
-#: src/ladspa/plugin.cc:518
+#: src/ladspa/plugin.cc:527
 msgid "Enabled plugins:"
 msgstr "Lubatud pluginad:"
 
-#: src/ladspa/plugin.cc:534
+#: src/ladspa/plugin.cc:543
 msgid "Settings"
 msgstr "Sätted"
 
-#: src/ladspa/plugin.cc:551
+#: src/ladspa/plugin.cc:560
 msgid ""
 "LADSPA Host for Audacious\n"
 "Copyright 2011 John Lindgren"
 msgstr ""
+"Audaciouse LADSPA-host\n"
+"Autoriõigus 2011 John Lindgren"
 
 #: src/ladspa/plugin.h:78
 msgid "LADSPA Host"
-msgstr ""
+msgstr "LADSPA host"
 
 #: src/lirc/lirc.cc:55
 msgid "LIRC Plugin"
 msgstr "LIRC-plugin"
 
-#: src/lirc/lirc.cc:381
+#: src/lirc/lirc.cc:379
 msgid ""
 "A simple plugin to control Audacious using the LIRC remote control daemon\n"
 "\n"
@@ -2149,81 +2329,141 @@
 "For more information about LIRC, see http://lirc.org."
 msgstr ""
 
-#: src/lirc/lirc.cc:392
+#: src/lirc/lirc.cc:390
 msgid "Connection"
 msgstr "Ühendus"
 
-#: src/lirc/lirc.cc:393
+#: src/lirc/lirc.cc:391
 msgid "Reconnect to LIRC server"
 msgstr "Taasühendumine LIRC-serveriga"
 
-#: src/lirc/lirc.cc:395
+#: src/lirc/lirc.cc:393
 msgid "Wait before reconnecting:"
 msgstr "Enne taasühendumist oodatakse"
 
-#: src/lyricwiki/lyricwiki.cc:41
-msgid "LyricWiki Plugin"
+#: src/lyrics-common/chart_lyrics_provider.cc:93
+#: src/lyrics-common/chart_lyrics_provider.cc:150
+#: src/lyrics-common/lyrics_ovh_provider.cc:50
+#, c-format
+msgid "Unable to fetch %s"
+msgstr ""
+
+#: src/lyrics-common/chart_lyrics_provider.cc:100
+#: src/lyrics-common/chart_lyrics_provider.cc:157
+#: src/lyrics-common/lyrics_ovh_provider.cc:57
+#, c-format
+msgid "Unable to parse %s"
+msgstr ""
+
+#: src/lyrics-common/chart_lyrics_provider.cc:121
+#: src/lyrics-common/chart_lyrics_provider.cc:194
+#: src/lyrics-common/lyrics_ovh_provider.cc:88
+msgid "Looking for lyrics ..."
+msgstr ""
+
+#: src/lyrics-common/preferences.h:43
+msgid "Nowhere"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:49
+msgid "Artist is truncated at the start, Title -- at the end"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:50
+msgid "Chars to truncate on:"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:54
+msgid "Chars are ORed in RegExp, surrounded by whitespace"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:55
+msgid "Chars to split on:"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:56
+msgid "Further truncate those on chars"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:62
+msgid "General"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:63
+msgid "Split title into artist and title on chars"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:66
+msgid "Sources"
 msgstr ""
 
-#: src/lyricwiki/lyricwiki.cc:131 src/lyricwiki-qt/lyricwiki.cc:136
-msgid "No lyrics available"
+#: src/lyrics-common/preferences.h:67
+msgid "Use embedded lyrics (from Lyrics tag)"
 msgstr ""
 
-#: src/lyricwiki/lyricwiki.cc:217 src/lyricwiki/lyricwiki.cc:226
-#: src/lyricwiki/lyricwiki.cc:243 src/lyricwiki/lyricwiki.cc:252
-#: src/lyricwiki/lyricwiki.cc:267 src/lyricwiki-qt/lyricwiki.cc:222
-#: src/lyricwiki-qt/lyricwiki.cc:231 src/lyricwiki-qt/lyricwiki.cc:248
-#: src/lyricwiki-qt/lyricwiki.cc:257 src/lyricwiki-qt/lyricwiki.cc:272
+#: src/lyrics-common/preferences.h:69
+msgid "Fetch lyrics from internet:"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:72
+msgid "Store fetched lyrics in local cache"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:74
+msgid "Local Storage"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:75
+msgid "Load lyric files (.lrc) from local storage"
+msgstr ""
+
+#: src/lyrics-common/utils.cc:54 src/ui-common/dialogs-qt.cc:63
 msgid "Error"
 msgstr "Viga"
 
-#: src/lyricwiki/lyricwiki.cc:218 src/lyricwiki/lyricwiki.cc:244
-#: src/lyricwiki-qt/lyricwiki.cc:223 src/lyricwiki-qt/lyricwiki.cc:249
-#, c-format
-msgid "Unable to fetch %s"
+#: src/lyrics-common/utils.cc:60
+msgid "Lyrics could not be found."
 msgstr ""
 
-#: src/lyricwiki/lyricwiki.cc:227 src/lyricwiki/lyricwiki.cc:253
-#: src/lyricwiki-qt/lyricwiki.cc:232 src/lyricwiki-qt/lyricwiki.cc:258
-#, c-format
-msgid "Unable to parse %s"
+#: src/lyrics-common/utils.cc:142
+msgid "Missing title and/or artist."
 msgstr ""
 
-#: src/lyricwiki/lyricwiki.cc:259 src/lyricwiki-qt/lyricwiki.cc:264
-msgid "Looking for lyrics ..."
+#: src/lyrics-gtk/lyrics-gtk.cc:37 src/lyrics-qt/lyrics-qt.cc:50
+msgid "Lyrics"
 msgstr ""
 
-#: src/lyricwiki/lyricwiki.cc:267 src/lyricwiki-qt/lyricwiki.cc:272
-msgid "Missing song metadata"
+#: src/lyrics-gtk/lyrics-gtk.cc:189 src/lyrics-qt/lyrics-qt.cc:171
+msgid "Edit Lyrics ..."
 msgstr ""
 
-#: src/lyricwiki/lyricwiki.cc:278 src/lyricwiki-qt/lyricwiki.cc:283
-msgid "Connecting to lyrics.wikia.com ..."
-msgstr "Ühendumine saidiga lyrics.wikia.com ..."
+#: src/lyrics-gtk/lyrics-gtk.cc:195 src/lyrics-qt/lyrics-qt.cc:178
+msgid "Save Locally"
+msgstr ""
 
-#: src/lyricwiki-qt/lyricwiki.cc:55
-msgid "LyricWiki Plugin (Qt)"
+#: src/lyrics-gtk/lyrics-gtk.cc:201 src/lyrics-qt/lyrics-qt.cc:186
+msgid "Refresh"
 msgstr ""
 
-#: src/m3u/m3u.cc:32
+#: src/m3u/m3u.cc:33
 msgid "M3U Playlists"
 msgstr "M3U-esitusnimekirjad"
 
 #: src/metronom/metronom.cc:44
 msgid "Tact Generator"
-msgstr ""
+msgstr "Taktigeneraator"
 
-#: src/metronom/metronom.cc:147
+#: src/metronom/metronom.cc:145
 #, c-format
 msgid "Tact generator: %d bpm"
 msgstr "Taktigeneraator: %d bpm"
 
-#: src/metronom/metronom.cc:149
+#: src/metronom/metronom.cc:147
 #, c-format
 msgid "Tact generator: %d bpm %d/%d"
 msgstr "Taktigeneraator: %d bpm %d/%d"
 
-#: src/metronom/metronom.cc:237
+#: src/metronom/metronom.cc:235
 msgid ""
 "A Tact Generator by Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
 "\n"
@@ -2232,21 +2472,23 @@
 "or tact://60*3/4 to play 60 bpm in 3/4 tacts"
 msgstr ""
 
-#: src/mixer/mixer.cc:38
+#: src/mixer/mixer.cc:43
 msgid "Channel Mixer"
 msgstr "Kanalimikser"
 
-#: src/mixer/mixer.cc:202
+#: src/mixer/mixer.cc:255
 msgid ""
 "Channel Mixer Plugin for Audacious\n"
 "Copyright 2011-2012 John Lindgren and Michał Lipski"
 msgstr ""
+"Audaciouse kanalimikseri plugin\n"
+"Autoriõigus 2011-2012 John Lindgren ja Michał Lipski"
 
-#: src/mixer/mixer.cc:206
+#: src/mixer/mixer.cc:259
 msgid "Channel Mixer"
 msgstr "Kanalimikser"
 
-#: src/mixer/mixer.cc:207
+#: src/mixer/mixer.cc:260
 msgid "Output channels:"
 msgstr "Väljundkanalite arv:"
 
@@ -2256,170 +2498,178 @@
 
 #: src/mms/mms.cc:82
 msgid "Error connecting to MMS server"
-msgstr ""
+msgstr "Viga MMS-serveriga ühendumisel"
 
-#: src/modplug/modplugbmp.h:53
+#: src/modplug/modplugbmp.h:57
 msgid "ModPlug (Module Player)"
 msgstr ""
 
-#: src/modplug/plugin_main.cc:53
-msgid "Resolution"
-msgstr ""
-
-#: src/modplug/plugin_main.cc:54
-msgid "8-bit"
-msgstr ""
-
 #: src/modplug/plugin_main.cc:55
-msgid "16-bit"
-msgstr ""
-
-#: src/modplug/plugin_main.cc:56
 msgid "Channels"
-msgstr ""
+msgstr "Kanalid"
 
-#: src/modplug/plugin_main.cc:60
+#: src/modplug/plugin_main.cc:59
 msgid "Nearest (fastest)"
 msgstr ""
 
-#: src/modplug/plugin_main.cc:61
+#: src/modplug/plugin_main.cc:60
 msgid "Linear (fast)"
 msgstr ""
 
-#: src/modplug/plugin_main.cc:62
+#: src/modplug/plugin_main.cc:61
 msgid "Spline (good)"
 msgstr ""
 
-#: src/modplug/plugin_main.cc:63
+#: src/modplug/plugin_main.cc:62
 msgid "Polyphase (best)"
 msgstr ""
 
-#: src/modplug/plugin_main.cc:64
+#: src/modplug/plugin_main.cc:63
 msgid "Sample rate"
-msgstr ""
+msgstr "Sämplimissagedus"
 
-#: src/modplug/plugin_main.cc:65
+#: src/modplug/plugin_main.cc:64
 msgid "22 kHz"
-msgstr ""
+msgstr "22 kHz"
 
-#: src/modplug/plugin_main.cc:66
+#: src/modplug/plugin_main.cc:65
 msgid "44 kHz"
-msgstr ""
+msgstr "44 kHz"
 
-#: src/modplug/plugin_main.cc:67
+#: src/modplug/plugin_main.cc:66
 msgid "48 kHz"
-msgstr ""
+msgstr "48 kHz"
 
-#: src/modplug/plugin_main.cc:68
+#: src/modplug/plugin_main.cc:67
 msgid "96 kHz"
-msgstr ""
+msgstr "96 kHz"
 
-#: src/modplug/plugin_main.cc:72 src/modplug/plugin_main.cc:77
-#: src/modplug/plugin_main.cc:82
+#: src/modplug/plugin_main.cc:71 src/modplug/plugin_main.cc:76
+#: src/modplug/plugin_main.cc:81
 msgid "Level:"
 msgstr ""
 
-#: src/modplug/plugin_main.cc:78
+#: src/modplug/plugin_main.cc:77
 msgid "Cutoff:"
 msgstr ""
 
-#: src/modplug/plugin_main.cc:91
+#: src/modplug/plugin_main.cc:90
 msgid "Reverb"
 msgstr ""
 
-#: src/modplug/plugin_main.cc:94
+#: src/modplug/plugin_main.cc:93
 msgid "Bass Boost"
 msgstr ""
 
-#: src/modplug/plugin_main.cc:97
+#: src/modplug/plugin_main.cc:96
 msgid "Surround"
 msgstr ""
 
-#: src/modplug/plugin_main.cc:100
+#: src/modplug/plugin_main.cc:99
 msgid "Preamp"
 msgstr ""
 
-#: src/modplug/plugin_main.cc:107
+#: src/modplug/plugin_main.cc:106
 msgid "Oversample"
 msgstr ""
 
-#: src/modplug/plugin_main.cc:108
+#: src/modplug/plugin_main.cc:107
 msgid "Noise reduction"
 msgstr ""
 
-#: src/modplug/plugin_main.cc:109
+#: src/modplug/plugin_main.cc:108
 msgid "Play Amiga MODs"
 msgstr ""
 
-#: src/modplug/plugin_main.cc:110
+#: src/modplug/plugin_main.cc:109
 msgid "Repeat"
 msgstr ""
 
-#: src/modplug/plugin_main.cc:111
+#: src/modplug/plugin_main.cc:110
 msgid "Repeat count:"
-msgstr ""
+msgstr "Korduste arv:"
 
-#: src/modplug/plugin_main.cc:112
+#: src/modplug/plugin_main.cc:111
 msgid "To repeat forever, set the repeat count to -1."
 msgstr ""
 
-#: src/modplug/plugin_main.cc:125 src/sid/xs_config.cc:106
+#: src/modplug/plugin_main.cc:124 src/sid/xs_config.cc:106
 msgid "These settings will take effect when Audacious is restarted."
-msgstr ""
+msgstr "Need sätted rakendatakse Audaciouse taaskäivitamisel."
 
-#: src/mpg123/mpg123.cc:54
-msgid "MPG123 Plugin"
+#: src/moonstone/main_window.cc:72 src/moonstone/main_window.cc:73
+#: src/qtui/main_window.cc:159 src/qtui/main_window.cc:160
+#: src/skins/menus.cc:107 src/skins-qt/menus.cc:98
+msgid "Stop After This Song"
+msgstr "Seiskamine selle loo lõppedes"
+
+#: src/moonstone/moonstone.cc:39
+msgid "Moonstone"
 msgstr ""
 
-#: src/mpg123/mpg123.cc:83
-msgid "Advanced"
+#: src/moonstone/playlist_header.cc:212 src/qtui/playlist_header.cc:258
+msgid "Reset to Defaults"
 msgstr ""
 
-#: src/mpg123/mpg123.cc:84
+#: src/moonstone/playlist_model.cc:38 src/qtui/playlist_header.cc:232
+msgid "Now Playing"
+msgstr "Praegu esitamisel"
+
+#: src/moonstone/playlist_selection.cc:66
+#: src/playlist-manager/playlist-manager.cc:201
+#: src/playlist-manager-qt/playlist-manager-qt.cc:190
+msgid "Entries"
+msgstr "Kirjeid"
+
+#: src/mpg123/mpg123.cc:54
+msgid "MPG123 Plugin"
+msgstr "MPG123 plugin"
+
+#: src/mpg123/mpg123.cc:82
 msgid "Use accurate length calculation (slow)"
-msgstr ""
+msgstr "Kasutatakse vigadeta pikkusearvutust (aeglane)"
 
-#: src/mpg123/mpg123.cc:248
+#: src/mpg123/mpg123.cc:260
 msgid "Surround"
 msgstr "Ruumiline heli"
 
-#: src/mpris2/plugin.cc:39
+#: src/mpris2/plugin.cc:40
 msgid "MPRIS 2 Server"
-msgstr ""
+msgstr "MPRIS 2 Server"
 
-#: src/neon/neon.cc:97
+#: src/neon/neon.cc:102
 msgid "Neon HTTP/HTTPS Plugin"
 msgstr "Neon HTTP/HTTPS-plugin"
 
-#: src/neon/neon.cc:521
+#: src/neon/neon.cc:526
 msgid "Error parsing redirect"
 msgstr ""
 
-#: src/neon/neon.cc:535
+#: src/neon/neon.cc:540
 msgid "Unknown HTTP error"
-msgstr ""
+msgstr "Tundamatu HTTP-viga"
 
-#: src/neon/neon.cc:569
+#: src/neon/neon.cc:614
 msgid "Error parsing URL"
-msgstr ""
+msgstr "Viga URL-i analüüsimisel"
 
-#: src/neon/neon.cc:632
+#: src/neon/neon.cc:687
 msgid "Too many redirects"
-msgstr ""
+msgstr "Liiga palju ümbersuunamisi"
 
-#: src/notify/event.cc:64
+#: src/notify/event.cc:97
 msgid "Stopped"
 msgstr ""
 
-#: src/notify/event.cc:64
+#: src/notify/event.cc:97
 msgid "Audacious is not playing."
 msgstr ""
 
-#: src/notify/notify.cc:42
+#: src/notify/notify.cc:39
 msgid "Desktop Notifications"
 msgstr "Töölauateavitused"
 
-#: src/notify/notify.cc:60
+#: src/notify/notify.cc:57
 msgid ""
 "Desktop Notifications Plugin for Audacious\n"
 "Copyright (C) 2010 Maximilian Bogner\n"
@@ -2439,64 +2689,104 @@
 "this program. If not, see <http://www.gnu.org/licenses/>."
 msgstr ""
 
-#: src/notify/notify.cc:110
+#: src/notify/notify.cc:104
 msgid "Show playback controls"
-msgstr ""
+msgstr "Näidatakse esitamise juhtimisnuppe"
 
-#: src/notify/notify.cc:112
+#: src/notify/notify.cc:106
 msgid "Always show notification"
-msgstr ""
+msgstr "Teavitust näidatakse alati"
 
-#: src/notify/notify.cc:114
+#: src/notify/notify.cc:108
 msgid "Include album name in notification"
+msgstr "Teavitusele lisatakse albumi nimi"
+
+#: src/notify/notify.cc:110
+msgid "Custom notification duration:"
 msgstr ""
 
-#: src/notify/osd.cc:58
+#: src/notify/osd.cc:74
 msgid "Show"
 msgstr ""
 
-#: src/notify/osd.cc:66 src/qtui/main_window.cc:178
-#: src/qtui/main_window.cc:179 src/skins/menus.cc:88
-msgid "Pause"
-msgstr "Pausi"
+#: src/openmpt/mpt.cc:50
+msgid "OpenMPT (Module Player)"
+msgstr ""
 
-#: src/notify/osd.cc:73 src/qtui/main_window.cc:72 src/skins/menus.cc:91
-msgid "Next"
-msgstr "Järgmine"
+#: src/openmpt/mpt.cc:132
+msgid ""
+"Module player based on libopenmpt\n"
+"\n"
+"Written by: Chris Spiegel <cspiegel@gmail.com>"
+msgstr ""
 
-#: src/oss4/oss.h:93
-msgid "OSS4 Output"
+#: src/openmpt/mpt.cc:151
+msgid "Stereo separation:"
 msgstr ""
 
-#: src/oss4/oss.h:95
-msgid "OSS3 Output"
+#: src/openmpt/mpt.cc:153
+msgid "% (0=mono, 100=default, 200=full)"
 msgstr ""
 
+#: src/openmpt/mpt.cc:157
+msgid "Interpolation:"
+msgstr ""
+
+#: src/openmpt/mptwrap.h:51 src/soxr/sox-resampler.cc:189 src/xsf/plugin.cc:437
+msgid "Linear"
+msgstr ""
+
+#: src/openmpt/mptwrap.h:52
+msgid "Cubic"
+msgstr ""
+
+#: src/openmpt/mptwrap.h:53
+msgid "Windowed sinc"
+msgstr ""
+
+#: src/opus/opus.cc:39
+msgid "Opus Decoder"
+msgstr ""
+
+#: src/opus/opus.cc:336
+msgid ""
+"Opus Decoder Plugin for Audacious\n"
+"Copyright 2022 Thomas Lange"
+msgstr ""
+
+#: src/oss4/oss.h:70
+msgid "OSS4 Output"
+msgstr "OSS4 väljund"
+
+#: src/oss4/oss.h:72
+msgid "OSS3 Output"
+msgstr "OSS3 väljund"
+
 #: src/oss4/plugin.cc:35
 msgid "Default device"
-msgstr ""
+msgstr "Vaikimisi seade"
 
-#: src/oss4/plugin.cc:77
+#: src/oss4/plugin.cc:78
 msgid "Audio device:"
 msgstr "Audioseade:"
 
-#: src/oss4/plugin.cc:80
+#: src/oss4/plugin.cc:81
 msgid "Use alternate device:"
 msgstr "Kasutatakse alternatiivset seadet:"
 
-#: src/oss4/plugin.cc:84
+#: src/oss4/plugin.cc:85
 msgid "Save volume between sessions."
-msgstr ""
+msgstr "Valjuse salvestamine seansside vahel."
 
-#: src/oss4/plugin.cc:86
+#: src/oss4/plugin.cc:87
 msgid "Enable format conversions made by the OSS software."
-msgstr ""
+msgstr "OSS-tarkvara vorminguteisenduste lubamine."
 
-#: src/oss4/plugin.cc:88
+#: src/oss4/plugin.cc:89
 msgid "Enable exclusive mode to prevent virtual mixing."
 msgstr ""
 
-#: src/oss4/plugin.cc:100
+#: src/oss4/plugin.cc:101
 msgid ""
 "OSS4 Output Plugin for Audacious\n"
 "Copyright 2010-2012 Michał Lipski\n"
@@ -2504,60 +2794,96 @@
 "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 ""
+"Audaciouse OSS4 Väljundplugin\n"
+"Autoriõigus 2010-2012 Michał Lipski\n"
+"\n"
+"Soovin tänada inimesi #audacious kanalil, eriti Tony Vrooni ja John "
+"Lindgreni ja loomulikult eelmise OSS-plugina autoreid."
 
-#: src/playlist-manager/playlist-manager.cc:37
-msgid "Playlist Manager"
+#: src/pipewire/pipewire.cc:44
+msgid "PipeWire Output"
 msgstr ""
 
-#: src/playlist-manager/playlist-manager.cc:226
-msgid "Entries"
+#: src/pipewire/pipewire.cc:118
+msgid ""
+"PipeWire Output Plugin for Audacious\n"
+"Copyright 2022 Thomas Lange\n"
+"\n"
+"Based on the PipeWire Output Plugin for Qmmp\n"
+"Copyright 2021 Ilya Kotov"
 msgstr ""
 
-#: src/playlist-manager/playlist-manager.cc:245
+#: src/pipewire/pipewire.cc:408 src/skins/menus.cc:88 src/skins-qt/menus.cc:79
+msgid "Playback"
+msgstr "Esitamine"
+
+#: src/playlist-manager/playlist-manager.cc:38
+#: src/playlist-manager-qt/playlist-manager-qt.cc:42
+msgid "Playlist Manager"
+msgstr "Esitusnimekirja haldur"
+
+#: src/playlist-manager/playlist-manager.cc:221
+#: src/playlist-manager-qt/playlist-manager-qt.cc:356
 msgid "_Remove"
-msgstr ""
+msgstr "_Eemalda"
 
-#: src/playlist-manager/playlist-manager.cc:246
+#: src/playlist-manager/playlist-manager.cc:222
+#: src/playlist-manager-qt/playlist-manager-qt.cc:351
 msgid "Ren_ame"
-msgstr ""
+msgstr "_Muuda nime"
 
 #: src/pls/pls.cc:35
 msgid "PLS Playlists"
 msgstr "PLS-esitusnimekirjad"
 
-#: src/psf/plugin.cc:45
+#: src/psf/plugin.cc:53
 msgid "OpenPSF PSF1/PSF2 Decoder"
 msgstr ""
 
-#: src/pulse_audio/pulse_audio.cc:38
+#: src/psf/plugin.cc:270
+msgid "OpenPSF Configuration"
+msgstr ""
+
+#: src/psf/plugin.cc:271 src/xsf/plugin.cc:444
+msgid "Ignore length from file"
+msgstr "Failist pärit pikkust eiratakse"
+
+#: src/pulse/pulse_audio.cc:42
 msgid "PulseAudio Output"
 msgstr "PulseAudio väljund"
 
-#: src/pulse_audio/pulse_audio.cc:611
+#: src/pulse/pulse_audio.cc:84
+msgid "Context name:"
+msgstr "Konteksti nimi:"
+
+#: src/pulse/pulse_audio.cc:86
+msgid "Stream name:"
+msgstr "Voo nimi:"
+
+#: src/pulse/pulse_audio.cc:596
 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."
+"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/qtaudio/qtaudio.cc:49
+#: src/qtaudio/qtaudio.cc:53
 msgid "QtMultimedia Output"
-msgstr ""
+msgstr "QtMultimedia väljund"
 
-#: src/qtaudio/qtaudio.cc:77
+#: src/qtaudio/qtaudio.cc:84
 msgid ""
 "QtMultimedia Audio Output Plugin for Audacious\n"
 "Copyright 2014 William Pitcock\n"
@@ -2566,50 +2892,87 @@
 "Copyright 2010 John Lindgren"
 msgstr ""
 
-#: src/qtui/dialog_windows.cc:31
-msgid "Working ..."
+#: src/qtglspectrum/gl-spectrum.cc:41
+msgid ""
+"OpenGL Spectrum Analyzer for Audacious\n"
+"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
+"Copyright 2014, 2020 Ariadne Conill\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/qtui/filter_input.cc:44 src/skins/ui_playlist.cc:221
-msgid "Search"
+#: src/qthotkey/gui.cc:177
+msgid "Press a key combination inside a text field."
 msgstr ""
 
-#: src/qtui/main_window_actions.cc:94
+#: src/qthotkey/plugin.cc:105
+msgid ""
+"Global Hotkey Plugin\n"
+"Control the player with global key combinations or multimedia keys.\n"
+"\n"
+"Copyright (C) 2020 i.Dark_Templar <darktemplar@dark-templar-archives.net>\n"
+"Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n"
+"\n"
+"Contributors 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/qtui/menus.cc:109
 msgid "_Open Folder ..."
 msgstr ""
 
-#: src/qtui/main_window_actions.cc:96
+#: src/qtui/menus.cc:115
 msgid "_Add Folder ..."
 msgstr ""
 
-#: src/qtui/main_window_actions.cc:101
+#: src/qtui/menus.cc:128
 msgid "_Log Inspector ..."
 msgstr ""
 
-#: src/qtui/main_window.cc:64
-msgid "Open Files"
+#: src/qtui/menus.cc:220
+msgid "_Find ..."
 msgstr ""
 
-#: src/qtui/main_window.cc:66
-msgid "Add Files"
+#: src/qtui/menus.cc:256 src/skins/menus.cc:80 src/skins-qt/menus.cc:70
+msgid "Audio Settings ..."
+msgstr "Audiosätted ..."
+
+#: src/qtui/playlist_model.cc:188
+msgid "Q#"
 msgstr ""
 
-#: src/qtui/main_window.cc:71 src/skins/menus.cc:90
-msgid "Previous"
-msgstr "Eelmine"
+#: src/qtui/playlist_model.cc:190
+msgid "T#"
+msgstr ""
 
-#: src/qtui/main_window.cc:77 src/skins/menus.cc:82
-msgid "Repeat"
-msgstr "Korduv"
+#: src/qtui/playlist_model.cc:192
+msgid "C#"
+msgstr ""
 
-#: src/qtui/main_window.cc:79 src/skins/menus.cc:83
-msgid "Shuffle"
-msgstr "Segatud"
+#: src/qtui/playlist_model.cc:194
+msgid "D#"
+msgstr ""
 
-#: src/qtui/qtui.cc:42
+#: src/qtui/qtui.cc:40
 msgid "Qt Interface"
+msgstr "Qt liides"
+
+#: src/qtui/search_bar.cc:46
+msgid "Search playlist"
 msgstr ""
 
+#: src/qtui/settings.cc:79
+msgid "Use bold font for column headers"
+msgstr "Rasvase kirja kasutamine tulpade päises"
+
 #: src/resample/resample.cc:43
 msgid "Sample Rate Converter"
 msgstr ""
@@ -2648,7 +3011,7 @@
 msgid "Method:"
 msgstr "Meetod:"
 
-#: src/resample/resample.cc:199 src/sox-resampler/sox-resampler.cc:161
+#: src/resample/resample.cc:199 src/soxr/sox-resampler.cc:203
 msgid "Rate:"
 msgstr ""
 
@@ -2674,7 +3037,7 @@
 
 #: src/resample/resample.cc:217
 msgid "32.0 kHz:"
-msgstr ""
+msgstr "32.0 kHz:"
 
 #: src/resample/resample.cc:221
 msgid "44.1 kHz:"
@@ -2686,7 +3049,7 @@
 
 #: src/resample/resample.cc:229
 msgid "88.2 kHz:"
-msgstr ""
+msgstr "88.2 kHz:"
 
 #: src/resample/resample.cc:233
 msgid "96 kHz:"
@@ -2694,147 +3057,118 @@
 
 #: src/resample/resample.cc:237
 msgid "176.4 kHz:"
-msgstr ""
+msgstr "176.4 kHz:"
 
 #: src/resample/resample.cc:241
 msgid "192 kHz:"
 msgstr "192 kHz:"
 
-#: src/scrobbler2/config_window.cc:41
-#, c-format
-msgid "OK. Scrobbling for user: %s"
-msgstr ""
-
-#: src/scrobbler2/config_window.cc:54
-msgid "Permission Denied"
-msgstr ""
-
-#: src/scrobbler2/config_window.cc:56
-msgid "Access the following link to allow Audacious to scrobble your plays:"
-msgstr ""
-
-#: src/scrobbler2/config_window.cc:66
-msgid "Keep this window open and click 'Check Permission' again.\n"
-msgstr ""
+#: src/scrobbler2/config_window.cc:29
+msgid "Checking Last.fm access ..."
+msgstr "Last.fm ligipääsu kontrollimine ..."
 
-#: src/scrobbler2/config_window.cc:69 src/scrobbler2/config_window.cc:80
+#: src/scrobbler2/config_window.cc:35
 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."
+"Your scrobbles are being saved on your computer temporarily. They will be "
+"submitted as soon as Audacious is allowed access."
 msgstr ""
 
-#: src/scrobbler2/config_window.cc:77
-msgid "Network Problem."
+#: src/scrobbler2/config_window.cc:41
+#, c-format
+msgid "Permission granted. Scrobbling for user %s."
 msgstr ""
 
-#: src/scrobbler2/config_window.cc:78
-msgid "There was a problem contacting Last.fm. Please try again later."
+#: src/scrobbler2/config_window.cc:44
+msgid ""
+"Permission denied. Open the following URL in a browser, allow Audacious "
+"access to your account, and then click 'Check Permission' again:"
 msgstr ""
 
-#: src/scrobbler2/config_window.cc:110
-msgid "Checking..."
+#: src/scrobbler2/config_window.cc:53
+msgid "There was a problem contacting Last.fm."
 msgstr ""
 
-#: src/scrobbler2/config_window.cc:176
-msgid "C_heck Permission"
+#: src/scrobbler2/config_window.cc:92
+msgid "Check Permission"
 msgstr ""
 
-#: src/scrobbler2/config_window.cc:177
-msgid "_Revoke Permission"
+#: src/scrobbler2/config_window.cc:93
+msgid "Revoke Permission"
 msgstr ""
 
-#: src/scrobbler2/config_window.cc:220
-msgid ""
-"You need to allow Audacious to scrobble tracks to your Last.fm account.\n"
+#: src/scrobbler2/config_window.cc:97
+msgid "You need to allow Audacious to scrobble tracks to your Last.fm account."
 msgstr ""
 
 #: src/scrobbler2/scrobbler.cc:29
 msgid "Scrobbler 2.0"
 msgstr ""
 
-#: src/scrobbler2/scrobbler.cc:224
+#: src/scrobbler2/scrobbler.cc:200
 msgid ""
 "The Scrobbler plugin could not be started.\n"
 "There might be a problem with your installation."
 msgstr ""
 
-#: src/scrobbler2/scrobbler.cc:289
+#: src/scrobbler2/scrobbler.cc:245
 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"
+"project."
 msgstr ""
 
-#: src/scrobbler2/scrobbler_communication.cc:642
-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/sdlout.cc:48
+#: src/sdlout/sdlout.cc:43
 msgid "SDL Output"
 msgstr "SDL-väljund"
 
-#: src/sdlout/sdlout.cc:77
+#: src/sdlout/sdlout.cc:72
 msgid ""
 "SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
 msgstr ""
+"Audaciouse SDL-väljundplugin\n"
+"Autoriõigus 2010 John Lindgren"
 
-#: src/search-tool/search-tool.cc:116 src/search-tool/search-tool.cc:124
+#: src/search-tool/library.cc:35 src/search-tool/library.cc:46
+#: src/search-tool-qt/library.cc:35 src/search-tool-qt/library.cc:46
 msgid "Library"
 msgstr "Teek"
 
-#: src/search-tool/search-tool.cc:394
-#, c-format
-msgid "%d result"
-msgid_plural "%d results"
-msgstr0 ""
-msgstr1 ""
-
-#: src/search-tool/search-tool.cc:400
-#, c-format
-msgid "(%d hidden)"
-msgid_plural "(%d hidden)"
-msgstr0 ""
-msgstr1 ""
-
-#: src/search-tool/search-tool.cc:594
+#: src/search-tool-qt/search-model.cc:44 src/search-tool/search-tool.cc:287
 #, c-format
 msgid "%d song"
 msgid_plural "%d songs"
-msgstr0 ""
-msgstr1 ""
+msgstr0 "%d lugu"
+msgstr1 "%d lugu"
 
-#: src/search-tool/search-tool.cc:601
+#: src/search-tool-qt/search-model.cc:53 src/search-tool/search-tool.cc:294
 msgid "of this genre"
-msgstr ""
+msgstr "sellest žanrist"
 
-#: src/search-tool/search-tool.cc:607
+#: src/search-tool-qt/search-model.h:47 src/search-tool/search-model.h:45
 msgid "on"
 msgstr ""
 
-#: src/search-tool/search-tool.cc:607
+#: src/search-tool-qt/search-model.h:47 src/search-tool/search-model.h:45
 msgid "by"
 msgstr ""
 
-#: src/search-tool/search-tool.cc:643
-msgid "_Create Playlist"
-msgstr "Loo _esitusnimekiri"
+#: src/search-tool-qt/search-tool-qt.cc:165 src/search-tool/search-tool.cc:74
+msgid "Number of results to show:"
+msgstr ""
 
-#: src/search-tool/search-tool.cc:645
-msgid "_Add to Playlist"
-msgstr "_Lisa esitusnimekirja"
+#: src/search-tool-qt/search-tool-qt.cc:168 src/search-tool/search-tool.cc:77
+msgid "Rescan library at startup"
+msgstr ""
 
-#: src/search-tool/search-tool.cc:684
-msgid "Search library"
-msgstr "Otsing audiokogust"
+#: src/search-tool-qt/search-tool-qt.cc:170
+msgid "Monitor library for changes"
+msgstr ""
 
-#: src/search-tool/search-tool.cc:688
+#: src/search-tool-qt/search-tool-qt.cc:193 src/search-tool/search-tool.cc:450
 msgid ""
 "To import your music library into Audacious, choose a folder and then click "
 "the \"refresh\" icon."
@@ -2842,25 +3176,47 @@
 "Oma audiokogu importimiseks Audaciousesse vali kataloog ja vajuta "
 "värskendamise ikoonile."
 
-#: src/search-tool/search-tool.cc:696
+#: src/search-tool-qt/search-tool-qt.cc:195 src/search-tool/search-tool.cc:459
 msgid "Please wait ..."
 msgstr "Palun oota..."
 
-#: src/search-tool/search-tool.cc:723
+#: src/search-tool-qt/search-tool-qt.cc:197 src/search-tool/search-tool.cc:487
 msgid "Choose Folder"
 msgstr "Kataloogi valimine"
 
+#: src/search-tool-qt/search-tool-qt.cc:201 src/search-tool/search-tool.cc:445
+msgid "Search library"
+msgstr "Otsing audiokogust"
+
+#: src/search-tool-qt/search-tool-qt.cc:327 src/search-tool/search-tool.cc:156
+#, c-format
+msgid "%d of %d result shown"
+msgid_plural "%d of %d results shown"
+msgstr0 ""
+msgstr1 ""
+
+#: src/search-tool-qt/search-tool-qt.cc:331 src/search-tool/search-tool.cc:160
+#, c-format
+msgid "%d result"
+msgid_plural "%d results"
+msgstr0 "%d tulemus"
+msgstr1 "%d tulemust"
+
+#: src/search-tool-qt/search-tool-qt.cc:501 src/search-tool/search-tool.cc:341
+msgid "_Create Playlist"
+msgstr "Loo _esitusnimekiri"
+
+#: src/search-tool-qt/search-tool-qt.cc:503 src/search-tool/search-tool.cc:343
+msgid "_Add to Playlist"
+msgstr "_Lisa esitusnimekirja"
+
 #: src/sid/xmms-sid.cc:43
 msgid "SID Player"
 msgstr ""
 
-#: src/sid/xs_config.cc:61
-msgid "Output"
-msgstr ""
-
 #: src/sid/xs_config.cc:62
 msgid "Channels:"
-msgstr ""
+msgstr "Kanalid:"
 
 #: src/sid/xs_config.cc:68
 msgid "Emulation"
@@ -2896,7 +3252,7 @@
 
 #: src/sid/xs_config.cc:87
 msgid "Use only when song length is unknown"
-msgstr ""
+msgstr "Kasulik ainult teadmata kestusega lugude korral"
 
 #: src/sid/xs_config.cc:90
 msgid "Set minimum playback time:"
@@ -2920,756 +3276,701 @@
 
 #: src/silence-removal/silence-removal.cc:39
 msgid "Silence Removal"
-msgstr ""
+msgstr "Vaikuse eemaldamine"
 
 #: src/silence-removal/silence-removal.cc:58
 msgid ""
 "Silence Removal Plugin for Audacious\n"
 "Copyright 2014 John Lindgren"
 msgstr ""
+"Audaciouse vaikuse eemaldamise plugin\n"
+"Autoriõigus 2014 John Lindgren"
 
 #: src/silence-removal/silence-removal.cc:67
 msgid "Silence Removal"
-msgstr ""
+msgstr "Vaikuse eemaldamine"
 
 #: src/silence-removal/silence-removal.cc:68
 msgid "Threshold:"
+msgstr "Lävi:"
+
+#: src/skins/actions.cc:45 src/skins-qt/actions.cc:43
+msgid "Repeat points cleared."
+msgstr "Korduspunktid on puhastatud."
+
+#: src/skins/actions.cc:60 src/skins-qt/actions.cc:58
+msgid "Repeat point A set."
+msgstr "Korduspunkt A on määratud."
+
+#: src/skins/actions.cc:65 src/skins-qt/actions.cc:63
+msgid "Repeat point B set."
+msgstr "Korduspunkt B on määratud."
+
+#: src/skins/equalizer.cc:223 src/skins-qt/equalizer.cc:223
+msgid "Preamp"
+msgstr "Eelmoonutus"
+
+#: src/skins/equalizer.cc:227 src/skins-qt/equalizer.cc:227
+msgid "31 Hz"
+msgstr "31 Hz"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "63 Hz"
+msgstr "63 Hz"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "125 Hz"
+msgstr "125 Hz"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "250 Hz"
+msgstr "250 Hz"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "500 Hz"
+msgstr "500 Hz"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "1 kHz"
+msgstr "1 kHz"
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "2 kHz"
+msgstr "2 kHz"
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "4 kHz"
+msgstr "4 kHz"
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "8 kHz"
+msgstr "8 kHz"
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "16 kHz"
+msgstr "16 kHz"
+
+#: src/skins/equalizer.cc:270 src/skins-qt/equalizer.cc:270
+msgid "Audacious Equalizer"
+msgstr "Audaciouse ekvalaiser"
+
+#: src/skins/main.cc:459 src/skins-qt/main.cc:442
+msgid "Recording on"
 msgstr ""
 
-#: src/silence-removal/silence-removal.cc:70
-msgid "dB"
+#: src/skins/main.cc:461 src/skins-qt/main.cc:444
+msgid "Recording off"
 msgstr ""
 
-#: src/skins/menus.cc:64
-msgid "Open Files ..."
+#: src/skins/main.cc:754 src/skins-qt/main.cc:701
+#, c-format
+msgid "Seek to %d:%-2.2d / %d:%-2.2d"
 msgstr ""
 
-#: src/skins/menus.cc:65
-msgid "Open URL ..."
+#: src/skins/main.cc:771 src/skins-qt/main.cc:718
+#, c-format
+msgid "Volume: %d%%"
+msgstr "Valjus: %d%%"
+
+#: src/skins/main.cc:784 src/skins-qt/main.cc:731
+#, c-format
+msgid "Balance: %d%% left"
 msgstr ""
 
-#: src/skins/menus.cc:66
-msgid "Search Library"
+#: src/skins/main.cc:786 src/skins-qt/main.cc:733
+msgid "Balance: center"
 msgstr ""
 
-#: src/skins/menus.cc:68
-msgid "Playback"
-msgstr "Esitamine"
+#: src/skins/main.cc:788 src/skins-qt/main.cc:735
+#, c-format
+msgid "Balance: %d%% right"
+msgstr ""
 
-#: src/skins/menus.cc:69
+#: src/skins/main.cc:880 src/skins-qt/main.cc:827
+msgid "Options Menu"
+msgstr "Valikute menüü"
+
+#: src/skins/main.cc:884 src/skins-qt/main.cc:831
+msgid "Disable 'Always On Top'"
+msgstr ""
+
+#: src/skins/main.cc:886 src/skins-qt/main.cc:833
+msgid "Enable 'Always On Top'"
+msgstr ""
+
+#: src/skins/main.cc:889 src/skins-qt/main.cc:836
+msgid "File Info Box"
+msgstr "Faili infokast"
+
+#: src/skins/main.cc:892 src/skins/menus.cc:149 src/skins-qt/main.cc:839
+#: src/skins-qt/menus.cc:142
+msgid "Double Size"
+msgstr "Topeltsuurus"
+
+#: src/skins/main.cc:895 src/skins-qt/main.cc:842
+msgid "Visualizations"
+msgstr "Visualiseerimine"
+
+#: src/skins/menus.cc:74 src/skins-qt/menus.cc:64
+msgid "Volume Up"
+msgstr "Heli valjemaks"
+
+#: src/skins/menus.cc:75 src/skins-qt/menus.cc:65
+msgid "Volume Down"
+msgstr "Heli vaiksemaks"
+
+#: src/skins/menus.cc:77 src/skins-qt/menus.cc:67
+msgid "Effects ..."
+msgstr "Efektid ..."
+
+#: src/skins/menus.cc:84 src/skins-qt/menus.cc:74
+msgid "Open Files ..."
+msgstr "Ava fail ..."
+
+#: src/skins/menus.cc:85 src/skins-qt/menus.cc:76
+msgid "Open URL ..."
+msgstr "Ava URL ..."
+
+#: src/skins/menus.cc:89 src/skins-qt/menus.cc:80
 msgid "Playlist"
 msgstr "Esitusnimekiri"
 
-#: src/skins/menus.cc:70
+#: src/skins/menus.cc:90 src/skins-qt/menus.cc:81
+msgid "Output"
+msgstr "Väljund"
+
+#: src/skins/menus.cc:91 src/skins-qt/menus.cc:82
 msgid "View"
 msgstr "Vaade"
 
-#: src/skins/menus.cc:72 src/skins/menus.cc:136 src/skins/menus.cc:149
-#: src/skins/menus.cc:214
+#: src/skins/menus.cc:93 src/skins/menus.cc:161 src/skins/menus.cc:174
+#: src/skins/menus.cc:245 src/skins-qt/menus.cc:84 src/skins-qt/menus.cc:156
+#: src/skins-qt/menus.cc:170 src/skins-qt/menus.cc:241
 msgid "Services"
-msgstr ""
+msgstr "Teenused"
 
-#: src/skins/menus.cc:74
+#: src/skins/menus.cc:95 src/skins-qt/menus.cc:86
 msgid "About ..."
-msgstr ""
+msgstr "Programmist lähemalt ..."
 
-#: src/skins/menus.cc:75
+#: src/skins/menus.cc:96 src/skins-qt/menus.cc:87
 msgid "Settings ..."
-msgstr ""
+msgstr "Sätted ..."
 
-#: src/skins/menus.cc:76
+#: src/skins/menus.cc:97 src/skins-qt/menus.cc:88
 msgid "Quit"
-msgstr ""
+msgstr "Välju"
 
-#: src/skins/menus.cc:80 src/skins/menus.cc:206
+#: src/skins/menus.cc:101 src/skins/menus.cc:235 src/skins-qt/menus.cc:92
+#: src/skins-qt/menus.cc:231
 msgid "Song Info ..."
-msgstr ""
+msgstr "Loo andmed ..."
+
+#: src/skins/menus.cc:105 src/skins-qt/menus.cc:96
+msgid "Shuffle by Album"
+msgstr "Segatud albumi kaupa"
 
-#: src/skins/menus.cc:84
+#: src/skins/menus.cc:106 src/skins-qt/menus.cc:97
 msgid "No Playlist Advance"
 msgstr "Esitusnimekirja ei kasutata"
 
-#: src/skins/menus.cc:85
-msgid "Stop After This Song"
-msgstr ""
-
-#: src/skins/menus.cc:93
+#: src/skins/menus.cc:117 src/skins-qt/menus.cc:108
 msgid "Set A-B Repeat"
-msgstr ""
+msgstr "Määra A-B kordus"
 
-#: src/skins/menus.cc:94
+#: src/skins/menus.cc:118 src/skins-qt/menus.cc:109
 msgid "Clear A-B Repeat"
-msgstr ""
+msgstr "Puhasta A-B kordus"
 
-#: src/skins/menus.cc:96
+#: src/skins/menus.cc:120 src/skins-qt/menus.cc:111
 msgid "Jump to Song ..."
 msgstr ""
 
-#: src/skins/menus.cc:97
+#: src/skins/menus.cc:121 src/skins-qt/menus.cc:113
 msgid "Jump to Time ..."
 msgstr ""
 
-#: src/skins/menus.cc:101
+#: src/skins/menus.cc:125 src/skins-qt/menus.cc:118
 msgid "Play/Resume"
-msgstr ""
+msgstr "Esita/Naase"
 
-#: src/skins/menus.cc:103
+#: src/skins/menus.cc:127 src/skins-qt/menus.cc:120
 msgid "New Playlist"
 msgstr "Uus esitusnimekiri"
 
-#: src/skins/menus.cc:104
+#: src/skins/menus.cc:128 src/skins-qt/menus.cc:121
 msgid "Rename Playlist ..."
-msgstr ""
+msgstr "Muuda esitusnimekirja nime ..."
 
-#: src/skins/menus.cc:105
+#: src/skins/menus.cc:129 src/skins-qt/menus.cc:122
 msgid "Remove Playlist"
-msgstr ""
+msgstr "Eemalda esitusnimekiri"
 
-#: src/skins/menus.cc:107
+#: src/skins/menus.cc:131 src/skins-qt/menus.cc:124
 msgid "Previous Playlist"
-msgstr ""
+msgstr "Eelmine esitusnimekiri"
 
-#: src/skins/menus.cc:108
+#: src/skins/menus.cc:132 src/skins-qt/menus.cc:125
 msgid "Next Playlist"
-msgstr ""
+msgstr "Järgmine esitusnimekiri"
 
-#: src/skins/menus.cc:110
+#: src/skins/menus.cc:134 src/skins-qt/menus.cc:127
 msgid "Import Playlist ..."
-msgstr ""
+msgstr "Impordi esitusnimekiri ..."
 
-#: src/skins/menus.cc:111
+#: src/skins/menus.cc:135 src/skins-qt/menus.cc:128
 msgid "Export Playlist ..."
-msgstr ""
+msgstr "Ekspordi esitusnimekiri ..."
 
-#: src/skins/menus.cc:113
+#: src/skins/menus.cc:137 src/skins-qt/menus.cc:130
 msgid "Playlist Manager ..."
-msgstr ""
+msgstr "Esitusnimekirja haldur ..."
 
-#: src/skins/menus.cc:114
+#: src/skins/menus.cc:138 src/skins-qt/menus.cc:131
 msgid "Queue Manager ..."
-msgstr ""
+msgstr "Esitusjärjekorra haldamine ..."
 
-#: src/skins/menus.cc:116
+#: src/skins/menus.cc:140 src/skins-qt/menus.cc:133
 msgid "Refresh Playlist"
-msgstr ""
+msgstr "Värskenda esitusnimekirja"
 
-#: src/skins/menus.cc:120
+#: src/skins/menus.cc:144 src/skins-qt/menus.cc:137
 msgid "Show Playlist Editor"
-msgstr "Näita esitusnimekirja redaktorit"
+msgstr "Esitusnimekirja redaktor on nähtaval"
 
-#: src/skins/menus.cc:121
+#: src/skins/menus.cc:145 src/skins-qt/menus.cc:138
 msgid "Show Equalizer"
 msgstr "Näita ekvalaiserit"
 
-#: src/skins/menus.cc:123
+#: src/skins/menus.cc:147 src/skins-qt/menus.cc:140
 msgid "Show Remaining Time"
-msgstr ""
+msgstr "Näidatakse järgijäänud aega"
 
-#: src/skins/menus.cc:125
+#: src/skins/menus.cc:150 src/skins-qt/menus.cc:143
 msgid "Always on Top"
 msgstr "Alati pealmine"
 
-#: src/skins/menus.cc:126
+#: src/skins/menus.cc:151 src/skins-qt/menus.cc:145
 msgid "On All Workspaces"
-msgstr ""
+msgstr "Nähtav kõikidel tööaladel"
 
-#: src/skins/menus.cc:128
+#: src/skins/menus.cc:153 src/skins-qt/menus.cc:148
 msgid "Roll Up Player"
-msgstr ""
+msgstr "Esitaja on kokku keritud"
 
-#: src/skins/menus.cc:129
+#: src/skins/menus.cc:154 src/skins-qt/menus.cc:149
 msgid "Roll Up Playlist Editor"
-msgstr ""
+msgstr "Esitusnimekirja redaktor on kokku keritud"
 
-#: src/skins/menus.cc:130
+#: src/skins/menus.cc:155 src/skins-qt/menus.cc:150
 msgid "Roll Up Equalizer"
-msgstr ""
+msgstr "Ekvalaiser on kokku keritud"
 
-#: src/skins/menus.cc:132 src/skins/ui_main.cc:854
-msgid "Double Size"
-msgstr ""
-
-#: src/skins/menus.cc:138
+#: src/skins/menus.cc:163 src/skins-qt/menus.cc:158
 msgid "Add URL ..."
 msgstr ""
 
-#: src/skins/menus.cc:139
+#: src/skins/menus.cc:164 src/skins-qt/menus.cc:160
 msgid "Add Files ..."
 msgstr ""
 
-#: src/skins/menus.cc:143 src/skins/menus.cc:171 src/skins/menus.cc:185
+#: src/skins/menus.cc:168 src/skins/menus.cc:196 src/skins/menus.cc:212
+#: src/skins-qt/menus.cc:164 src/skins-qt/menus.cc:192
+#: src/skins-qt/menus.cc:208
 msgid "By Title"
 msgstr "Pealkirja järgi"
 
-#: src/skins/menus.cc:144 src/skins/menus.cc:178 src/skins/menus.cc:192
+#: src/skins/menus.cc:169 src/skins/menus.cc:203 src/skins/menus.cc:219
+#: src/skins-qt/menus.cc:165 src/skins-qt/menus.cc:199
+#: src/skins-qt/menus.cc:215
 msgid "By File Name"
 msgstr ""
 
-#: src/skins/menus.cc:145 src/skins/menus.cc:179 src/skins/menus.cc:193
+#: src/skins/menus.cc:170 src/skins/menus.cc:204 src/skins/menus.cc:220
+#: src/skins-qt/menus.cc:166 src/skins-qt/menus.cc:200
+#: src/skins-qt/menus.cc:216
 msgid "By File Path"
 msgstr ""
 
-#: src/skins/menus.cc:151
+#: src/skins/menus.cc:176 src/skins-qt/menus.cc:172
 msgid "Remove All"
 msgstr "Eemalda kõik"
 
-#: src/skins/menus.cc:152
+#: src/skins/menus.cc:177 src/skins-qt/menus.cc:173
 msgid "Clear Queue"
 msgstr "Puhasta järjekord"
 
-#: src/skins/menus.cc:154
+#: src/skins/menus.cc:179 src/skins-qt/menus.cc:175
 msgid "Remove Unavailable Files"
 msgstr "Eemalda kättesaamatud failid"
 
-#: src/skins/menus.cc:155
+#: src/skins/menus.cc:180 src/skins-qt/menus.cc:176
 msgid "Remove Duplicates"
 msgstr "Eemalda korduvad kirjed"
 
-#: src/skins/menus.cc:157
+#: src/skins/menus.cc:182 src/skins-qt/menus.cc:178
 msgid "Remove Unselected"
 msgstr "Eemalda valimata kirjed"
 
-#: src/skins/menus.cc:158
+#: src/skins/menus.cc:183 src/skins-qt/menus.cc:179
 msgid "Remove Selected"
 msgstr "Eemalda valik"
 
-#: src/skins/menus.cc:162
+#: src/skins/menus.cc:187 src/skins-qt/menus.cc:183
 msgid "Search and Select"
 msgstr "Otsi ja vali"
 
-#: src/skins/menus.cc:164
+#: src/skins/menus.cc:189 src/skins-qt/menus.cc:185
 msgid "Invert Selection"
 msgstr "Vaheta valitud ja valimata"
 
-#: src/skins/menus.cc:165
+#: src/skins/menus.cc:190 src/skins-qt/menus.cc:186
 msgid "Select None"
 msgstr "Tühista valik"
 
-#: src/skins/menus.cc:166
+#: src/skins/menus.cc:191 src/skins-qt/menus.cc:187
 msgid "Select All"
 msgstr "Vali kõik"
 
-#: src/skins/menus.cc:170 src/skins/menus.cc:184
+#: src/skins/menus.cc:195 src/skins/menus.cc:211 src/skins-qt/menus.cc:191
+#: src/skins-qt/menus.cc:207
 msgid "By Track Number"
 msgstr "Loo numbri järgi"
 
-#: src/skins/menus.cc:172 src/skins/menus.cc:186
+#: src/skins/menus.cc:197 src/skins/menus.cc:213 src/skins-qt/menus.cc:193
+#: src/skins-qt/menus.cc:209
 msgid "By Artist"
 msgstr "Esitaja järgi"
 
-#: src/skins/menus.cc:173 src/skins/menus.cc:187
+#: src/skins/menus.cc:198 src/skins/menus.cc:214 src/skins-qt/menus.cc:194
+#: src/skins-qt/menus.cc:210
 msgid "By Album"
 msgstr "Albumi järgi"
 
-#: src/skins/menus.cc:174 src/skins/menus.cc:188
+#: src/skins/menus.cc:199 src/skins/menus.cc:215 src/skins-qt/menus.cc:195
+#: src/skins-qt/menus.cc:211
 msgid "By Album Artist"
-msgstr ""
+msgstr "Albumi esitaja järgi"
 
-#: src/skins/menus.cc:175 src/skins/menus.cc:190
+#: src/skins/menus.cc:200 src/skins/menus.cc:216 src/skins-qt/menus.cc:196
+#: src/skins-qt/menus.cc:212
 msgid "By Release Date"
 msgstr ""
 
-#: src/skins/menus.cc:176 src/skins/menus.cc:189
+#: src/skins/menus.cc:201 src/skins/menus.cc:217 src/skins-qt/menus.cc:197
+#: src/skins-qt/menus.cc:213
 msgid "By Genre"
-msgstr ""
+msgstr "Žanri järgi"
 
-#: src/skins/menus.cc:177 src/skins/menus.cc:191
+#: src/skins/menus.cc:202 src/skins/menus.cc:218 src/skins-qt/menus.cc:198
+#: src/skins-qt/menus.cc:214
 msgid "By Length"
-msgstr ""
+msgstr "Kestuse järgi"
 
-#: src/skins/menus.cc:180 src/skins/menus.cc:194
+#: src/skins/menus.cc:205 src/skins/menus.cc:221 src/skins-qt/menus.cc:201
+#: src/skins-qt/menus.cc:217
 msgid "By Custom Title"
 msgstr ""
 
-#: src/skins/menus.cc:198
+#: src/skins/menus.cc:206 src/skins/menus.cc:222 src/skins-qt/menus.cc:202
+#: src/skins-qt/menus.cc:218
+msgid "By Comment"
+msgstr ""
+
+#: src/skins/menus.cc:207 src/skins/menus.cc:223 src/skins-qt/menus.cc:203
+#: src/skins-qt/menus.cc:219
+msgid "By Disc Number"
+msgstr ""
+
+#: src/skins/menus.cc:227 src/skins-qt/menus.cc:223
 msgid "Randomize List"
 msgstr "Sega nimekiri"
 
-#: src/skins/menus.cc:199
+#: src/skins/menus.cc:228 src/skins-qt/menus.cc:224
 msgid "Reverse List"
 msgstr "Pööra järjestus ümber"
 
-#: src/skins/menus.cc:201
+#: src/skins/menus.cc:230 src/skins-qt/menus.cc:226
 msgid "Sort Selected"
 msgstr "Valiku sortimine"
 
-#: src/skins/menus.cc:202
+#: src/skins/menus.cc:231 src/skins-qt/menus.cc:227
 msgid "Sort List"
 msgstr "Nimekirja sortimine"
 
-#: src/skins/menus.cc:208
+#: src/skins/menus.cc:236 src/skins-qt/menus.cc:232
+msgid "Open Containing Folder"
+msgstr "Ava faili sisaldav kaust"
+
+#: src/skins/menus.cc:238 src/skins-qt/menus.cc:234
 msgid "Cut"
 msgstr "Lõika"
 
-#: src/skins/menus.cc:209
+#: src/skins/menus.cc:239 src/skins-qt/menus.cc:235
 msgid "Copy"
 msgstr "Kopeeri"
 
-#: src/skins/menus.cc:210
+#: src/skins/menus.cc:240 src/skins-qt/menus.cc:236
 msgid "Paste"
 msgstr "Aseta"
 
-#: src/skins/menus.cc:212
-msgid "Queue/Unqueue"
-msgstr ""
-
-#: src/skins/menus.cc:218
-msgid "Load Preset ..."
-msgstr ""
-
-#: src/skins/menus.cc:219
-msgid "Load Auto Preset ..."
-msgstr ""
-
-#: src/skins/menus.cc:220
-msgid "Load Default"
-msgstr ""
-
-#: src/skins/menus.cc:221
-msgid "Load Preset File ..."
-msgstr ""
-
-#: src/skins/menus.cc:222
-msgid "Load EQF File ..."
-msgstr ""
-
-#: src/skins/menus.cc:224
-msgid "Save Preset ..."
-msgstr ""
-
-#: src/skins/menus.cc:225
-msgid "Save Auto Preset ..."
-msgstr ""
-
-#: src/skins/menus.cc:226
-msgid "Save Default"
-msgstr ""
-
-#: src/skins/menus.cc:227
-msgid "Save Preset File ..."
+#: src/skins/menus.cc:241 src/skins-qt/menus.cc:237
+msgid "Paste at End"
 msgstr ""
 
-#: src/skins/menus.cc:228
-msgid "Save EQF File ..."
-msgstr ""
-
-#: src/skins/menus.cc:230
-msgid "Delete Preset ..."
-msgstr ""
-
-#: src/skins/menus.cc:231
-msgid "Delete Auto Preset ..."
+#: src/skins/menus.cc:243 src/skins-qt/menus.cc:239
+msgid "Queue/Unqueue"
 msgstr ""
 
-#: src/skins/menus.cc:233
-msgid "Import Winamp Presets ..."
-msgstr ""
+#: src/skins/playlist-widget.cc:58 src/skins-qt/playlist-widget.cc:58
+#, c-format
+msgid "%s (%d of %d)"
+msgstr "%s (%d/%d-st)"
 
-#: src/skins/menus.cc:235
-msgid "Reset to Zero"
-msgstr ""
+#: src/skins/playlistwin.cc:491 src/skins-qt/playlistwin.cc:478
+msgid "Audacious Playlist Editor"
+msgstr "Audaciouse esitusnimekirja redaktor"
 
-#: src/skins/plugin.cc:48
+#: src/skins/plugin.cc:53 src/skins-qt/plugin.cc:65
 msgid "Winamp Classic Interface"
-msgstr ""
-
-#: src/skins/preset-browser.cc:57 src/skins/preset-list.cc:371
-#: src/skins/preset-list.cc:386
-msgid "Save"
-msgstr "Salvesta"
-
-#: src/skins/preset-browser.cc:57 src/skins/preset-list.cc:338
-#: src/skins/preset-list.cc:354
-msgid "Load"
-msgstr "Laadi"
+msgstr "Winampi klassikaline liides"
 
-#: src/skins/preset-browser.cc:83
-msgid "Load Preset File"
+#: src/skins-qt/menus.cc:75
+msgid "Open Folder ..."
 msgstr ""
 
-#: src/skins/preset-browser.cc:100
-msgid "Load EQF File"
+#: src/skins-qt/menus.cc:159
+msgid "Add Folder ..."
 msgstr ""
 
-#: src/skins/preset-browser.cc:119
-msgid "Save Preset File"
-msgstr ""
+#: src/skins-qt/search-select.cc:62 src/skins/search-select.cc:77
+msgid "Search entries in active playlist"
+msgstr "Otsimine aktiivsest esitusnimekirjast"
 
-#: src/skins/preset-browser.cc:137
-msgid "Save EQF File"
+#: src/skins-qt/search-select.cc:70 src/skins/search-select.cc:83
+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 ""
+"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/preset-browser.cc:151
-msgid "Import Winamp Presets"
-msgstr ""
+#: src/skins-qt/search-select.cc:75 src/skins/search-select.cc:91
+msgid "Title:"
+msgstr "Pealkiri:"
 
-#: src/skins/preset-list.cc:285
-msgid "Presets"
-msgstr "Valmisseadistused"
+#: src/skins-qt/search-select.cc:79 src/skins/search-select.cc:96
+msgid "Album:"
+msgstr "Album:"
 
-#: src/skins/preset-list.cc:335
-msgid "Load preset"
-msgstr "Valmisseadistuste laadimine"
+#: src/skins-qt/search-select.cc:82 src/skins/search-select.cc:101
+msgid "Artist:"
+msgstr "Esitaja:"
 
-#: src/skins/preset-list.cc:351
-msgid "Load auto-preset"
-msgstr ""
+#: src/skins-qt/search-select.cc:85 src/skins/search-select.cc:106
+msgid "File Name:"
+msgstr "Failinimi:"
 
-#: src/skins/preset-list.cc:367
-msgid "Save preset"
-msgstr "Valmisseadistuste salvestamine"
+#: src/skins-qt/search-select.cc:88 src/skins/search-select.cc:134
+msgid "Clear previous selection before searching"
+msgstr "Enne otsimist nullitakse eelmine valik"
 
-#: src/skins/preset-list.cc:382
-msgid "Save auto-preset"
+#: src/skins-qt/search-select.cc:89 src/skins/search-select.cc:137
+msgid "Automatically toggle queue for matching entries"
 msgstr ""
 
-#: src/skins/preset-list.cc:408
-msgid "Delete preset"
-msgstr "Valmisseadistuse kustutamine"
+#: src/skins-qt/search-select.cc:90 src/skins/search-select.cc:140
+msgid "Create a new playlist with matching entries"
+msgstr "Otsingule vastavatest kirjetest luuakse uus esitusnimekiri"
 
-#: src/skins/preset-list.cc:424
-msgid "Delete auto-preset"
+#: src/skins-qt/search-select.cc:101 src/skins/search-select.cc:78
+msgid "Search"
 msgstr ""
 
-#: src/skins/skins_cfg.cc:176
+#: src/skins-qt/skins_cfg.cc:198 src/skins/skins_cfg.cc:182
 msgid "Player:"
-msgstr ""
+msgstr "Esitaja:"
 
-#: src/skins/skins_cfg.cc:178
+#: src/skins-qt/skins_cfg.cc:200 src/skins/skins_cfg.cc:184
 msgid "Select main player window font:"
-msgstr ""
+msgstr "Esitaja põhiakna kirjatüübi valimine:"
 
-#: src/skins/skins_cfg.cc:179
+#: src/skins-qt/skins_cfg.cc:201 src/skins/skins_cfg.cc:185
 msgid "Playlist:"
-msgstr ""
+msgstr "Esitusnimekiri:"
 
-#: src/skins/skins_cfg.cc:181
+#: src/skins-qt/skins_cfg.cc:203 src/skins/skins_cfg.cc:187
 msgid "Select playlist font:"
 msgstr "Esitusnimekirja kirjatüübi valimine:"
 
-#: src/skins/skins_cfg.cc:187
+#: src/skins-qt/skins_cfg.cc:207 src/skins/skins_cfg.cc:191
 msgid "Skin"
+msgstr "Rüü"
+
+#: src/skins-qt/skins_cfg.cc:211 src/skins/skins_cfg.cc:193
+msgid "Display active titlebar when any window is focused"
 msgstr ""
 
-#: src/skins/skins_cfg.cc:189
+#: src/skins-qt/skins_cfg.cc:213 src/skins/skins_cfg.cc:195
 msgid "Fonts"
-msgstr ""
+msgstr "Kirjatüübid"
 
-#: src/skins/skins_cfg.cc:192
+#: src/skins-qt/skins_cfg.cc:215 src/skins/skins_cfg.cc:197
 msgid "Use bitmap fonts (supports ASCII only)"
 msgstr "Kasutatakse rasterkirja (toetab ainult ASCII kooditabelit)"
 
-#: src/skins/skins_cfg.cc:194
+#: src/skins-qt/skins_cfg.cc:217 src/skins/skins_cfg.cc:199
 msgid "Scroll song title"
-msgstr ""
+msgstr "Loo nime keritakse"
 
-#: src/skins/skins_cfg.cc:196
+#: src/skins-qt/skins_cfg.cc:219 src/skins/skins_cfg.cc:201
 msgid "Scroll song title in both directions"
 msgstr "Loo nime keritakse mõlemas suunas"
 
-#: src/skins/skins_cfg.cc:201
+#: src/skins-qt/skins_cfg.cc:224 src/skins/skins_cfg.cc:206
 msgid "Analyzer"
 msgstr "Analüsaator"
 
-#: src/skins/skins_cfg.cc:202
+#: src/skins-qt/skins_cfg.cc:225 src/skins/skins_cfg.cc:207
 msgid "Scope"
 msgstr "Skoop"
 
-#: src/skins/skins_cfg.cc:203
+#: src/skins-qt/skins_cfg.cc:226 src/skins/skins_cfg.cc:208
 msgid "Voiceprint / VU meter"
 msgstr ""
 
-#: src/skins/skins_cfg.cc:204
+#: src/skins-qt/skins_cfg.cc:227 src/skins/skins_cfg.cc:209
 msgid "Off"
 msgstr "Väljas"
 
-#: src/skins/skins_cfg.cc:208 src/skins/skins_cfg.cc:233
-#: src/skins/skins_cfg.cc:239
+#: src/skins-qt/skins_cfg.cc:231 src/skins-qt/skins_cfg.cc:256
+#: src/skins-qt/skins_cfg.cc:262 src/skins/skins_cfg.cc:213
+#: src/skins/skins_cfg.cc:238 src/skins/skins_cfg.cc:244
 msgid "Normal"
 msgstr "Tavaline"
 
-#: src/skins/skins_cfg.cc:209 src/skins/skins_cfg.cc:234
+#: src/skins-qt/skins_cfg.cc:232 src/skins-qt/skins_cfg.cc:257
+#: src/skins/skins_cfg.cc:214 src/skins/skins_cfg.cc:239
 msgid "Fire"
 msgstr "Tuli"
 
-#: src/skins/skins_cfg.cc:210
+#: src/skins-qt/skins_cfg.cc:233 src/skins/skins_cfg.cc:215
 msgid "Vertical lines"
-msgstr ""
+msgstr "Püstjooned"
 
-#: src/skins/skins_cfg.cc:214
+#: src/skins-qt/skins_cfg.cc:237 src/skins/skins_cfg.cc:219
 msgid "Lines"
 msgstr "Jooned"
 
-#: src/skins/skins_cfg.cc:215
+#: src/skins-qt/skins_cfg.cc:238 src/skins/skins_cfg.cc:220
 msgid "Bars"
 msgstr "Tulbad"
 
-#: src/skins/skins_cfg.cc:219
+#: src/skins-qt/skins_cfg.cc:242 src/skins/skins_cfg.cc:224
 msgid "Slowest"
 msgstr "Väga aeglane"
 
-#: src/skins/skins_cfg.cc:220
+#: src/skins-qt/skins_cfg.cc:243 src/skins/skins_cfg.cc:225
 msgid "Slow"
 msgstr "Aeglane"
 
-#: src/skins/skins_cfg.cc:221 src/sox-resampler/sox-resampler.cc:152
+#: src/skins-qt/skins_cfg.cc:244 src/skins/skins_cfg.cc:226
+#: src/soxr/sox-resampler.cc:180
 msgid "Medium"
 msgstr "Keskmine"
 
-#: src/skins/skins_cfg.cc:222
+#: src/skins-qt/skins_cfg.cc:245 src/skins/skins_cfg.cc:227
 msgid "Fast"
 msgstr "Kiire"
 
-#: src/skins/skins_cfg.cc:223
+#: src/skins-qt/skins_cfg.cc:246 src/skins/skins_cfg.cc:228
 msgid "Fastest"
 msgstr "Väga kiire"
 
-#: src/skins/skins_cfg.cc:227
+#: src/skins-qt/skins_cfg.cc:250 src/skins/skins_cfg.cc:232
 msgid "Dots"
-msgstr ""
+msgstr "Punktid"
 
-#: src/skins/skins_cfg.cc:228
+#: src/skins-qt/skins_cfg.cc:251 src/skins/skins_cfg.cc:233
 msgid "Line"
-msgstr ""
+msgstr "Joon"
 
-#: src/skins/skins_cfg.cc:229
+#: src/skins-qt/skins_cfg.cc:252 src/skins/skins_cfg.cc:234
 msgid "Solid"
-msgstr ""
+msgstr "Ühevärviline"
 
-#: src/skins/skins_cfg.cc:235
+#: src/skins-qt/skins_cfg.cc:258 src/skins/skins_cfg.cc:240
 msgid "Ice"
 msgstr "Jää"
 
-#: src/skins/skins_cfg.cc:240
+#: src/skins-qt/skins_cfg.cc:263 src/skins/skins_cfg.cc:245
 msgid "Smooth"
 msgstr "Pehme"
 
-#: src/skins/skins_cfg.cc:244
-msgid "Type"
-msgstr ""
-
-#: src/skins/skins_cfg.cc:245
-msgid "Visualization type:"
-msgstr ""
-
-#: src/skins/skins_cfg.cc:248
-msgid "Analyzer"
-msgstr ""
-
-#: src/skins/skins_cfg.cc:249
-msgid "Show peaks"
-msgstr ""
-
-#: src/skins/skins_cfg.cc:251
+#: src/skins-qt/skins_cfg.cc:267 src/skins/skins_cfg.cc:249
 msgid "Coloring:"
-msgstr ""
+msgstr "Värvimine:"
 
-#: src/skins/skins_cfg.cc:254
+#: src/skins-qt/skins_cfg.cc:270 src/skins/skins_cfg.cc:252
 msgid "Style:"
-msgstr ""
+msgstr "Laad:"
 
-#: src/skins/skins_cfg.cc:257
+#: src/skins-qt/skins_cfg.cc:273 src/skins/skins_cfg.cc:255
 msgid "Falloff:"
-msgstr ""
+msgstr "Langemine:"
 
-#: src/skins/skins_cfg.cc:260
+#: src/skins-qt/skins_cfg.cc:276 src/skins/skins_cfg.cc:258
 msgid "Peak falloff:"
-msgstr ""
+msgstr "Tippude langemine:"
 
-#: src/skins/skins_cfg.cc:264
+#: src/skins-qt/skins_cfg.cc:282 src/skins/skins_cfg.cc:264
 msgid "Scope Style:"
-msgstr ""
+msgstr "Skoobi laad:"
 
-#: src/skins/skins_cfg.cc:267
+#: src/skins-qt/skins_cfg.cc:285 src/skins/skins_cfg.cc:267
 msgid "Voiceprint Coloring:"
 msgstr ""
 
-#: src/skins/skins_cfg.cc:270
+#: src/skins-qt/skins_cfg.cc:288 src/skins/skins_cfg.cc:270
 msgid "VU Meter Style:"
 msgstr ""
 
-#: src/skins/skins_cfg.cc:276
-msgid "General"
-msgstr "Üldine"
-
-#: src/skins/skins_cfg.cc:277
-msgid "Visualization"
-msgstr "Visualiseerimine"
-
-#: src/skins/ui_equalizer.cc:282
-msgid "Preamp"
-msgstr ""
-
-#: src/skins/ui_equalizer.cc:286
-msgid "31 Hz"
-msgstr "31 Hz"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "63 Hz"
-msgstr "63 Hz"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "125 Hz"
-msgstr "125 Hz"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "250 Hz"
-msgstr "250 Hz"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "500 Hz"
-msgstr "500 Hz"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "1 kHz"
-msgstr "1 kHz"
-
-#: src/skins/ui_equalizer.cc:288
-msgid "2 kHz"
-msgstr "2 kHz"
-
-#: src/skins/ui_equalizer.cc:288
-msgid "4 kHz"
-msgstr "4 kHz"
-
-#: src/skins/ui_equalizer.cc:288
-msgid "8 kHz"
-msgstr "8 kHz"
-
-#: src/skins/ui_equalizer.cc:288
-msgid "16 kHz"
-msgstr "16 kHz"
-
-#: src/skins/ui_equalizer.cc:330
-msgid "Audacious Equalizer"
-msgstr "Audaciouse ekvalaiser"
-
-#: src/skins/ui_main.cc:688
-#, c-format
-msgid "Seek to %d:%-2.2d / %d:%-2.2d"
-msgstr ""
-
-#: src/skins/ui_main.cc:709
-#, c-format
-msgid "Volume: %d%%"
-msgstr "Valjus: %d%%"
-
-#: src/skins/ui_main.cc:732
-#, c-format
-msgid "Balance: %d%% left"
-msgstr ""
-
-#: src/skins/ui_main.cc:734
-msgid "Balance: center"
-msgstr ""
-
-#: src/skins/ui_main.cc:736
-#, c-format
-msgid "Balance: %d%% right"
-msgstr ""
-
-#: src/skins/ui_main.cc:842
-msgid "Options Menu"
-msgstr "Valikute menüü"
-
-#: src/skins/ui_main.cc:846
-msgid "Disable 'Always On Top'"
-msgstr ""
-
-#: src/skins/ui_main.cc:848
-msgid "Enable 'Always On Top'"
-msgstr ""
-
-#: src/skins/ui_main.cc:851
-msgid "File Info Box"
-msgstr ""
-
-#: src/skins/ui_main.cc:857
-msgid "Visualizations"
-msgstr ""
-
-#: src/skins/ui_main.cc:1336
-msgid "Repeat point A set."
-msgstr ""
-
-#: src/skins/ui_main.cc:1341
-msgid "Repeat point B set."
-msgstr ""
-
-#: src/skins/ui_main.cc:1350
-msgid "Repeat points cleared."
-msgstr ""
-
-#: src/skins/ui_playlist.cc:219
-msgid "Search entries in active playlist"
-msgstr "Otsimine aktiivsest esitusnimekirjast"
-
-#: src/skins/ui_playlist.cc:226
-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 ""
-"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.cc:234
-msgid "Title:"
-msgstr ""
-
-#: src/skins/ui_playlist.cc:241
-msgid "Album:"
-msgstr ""
-
-#: src/skins/ui_playlist.cc:248
-msgid "Artist:"
-msgstr ""
-
-#: src/skins/ui_playlist.cc:255
-msgid "File Name:"
-msgstr ""
-
-#: src/skins/ui_playlist.cc:263
-msgid "Clear previous selection before searching"
-msgstr "Enne otsimist nullitakse eelmine valik"
+#: src/skins-qt/skins_cfg.cc:294 src/skins/skins_cfg.cc:276
+msgid "Type"
+msgstr "Liik"
 
-#: src/skins/ui_playlist.cc:266
-msgid "Automatically toggle queue for matching entries"
-msgstr ""
+#: src/skins-qt/skins_cfg.cc:295 src/skins/skins_cfg.cc:277
+msgid "Visualization type:"
+msgstr "Visualiseerimise liik:"
 
-#: src/skins/ui_playlist.cc:269
-msgid "Create a new playlist with matching entries"
-msgstr "Otsingule vastavatest kirjetest luuakse uus esitusnimekiri"
+#: src/skins-qt/skins_cfg.cc:298 src/skins/skins_cfg.cc:280
+msgid "Analyzer"
+msgstr "Analüsaator"
 
-#: src/skins/ui_playlist.cc:717
-msgid "Audacious Playlist Editor"
-msgstr "Audaciouse esitusnimekirja redaktor"
+#: src/skins-qt/skins_cfg.cc:299 src/skins/skins_cfg.cc:281
+msgid "Show peaks"
+msgstr "Tippude näitamine"
 
-#: src/skins/ui_playlist.cc:752
-#, c-format
-msgid "%s (%d of %d)"
-msgstr "%s (%d/%d-st)"
+#: src/skins-qt/skins_cfg.cc:308 src/skins/skins_cfg.cc:290
+msgid "Visualization"
+msgstr "Visualiseerimine"
 
-#: src/skins/ui_skinselector.cc:167
+#: src/skins-qt/skinselector.cc:98 src/skins/skinselector.cc:111
 msgid "Archived Winamp 2.x skin"
 msgstr "Arhiveeritud Winamp 2.x rüü"
 
-#: src/skins/ui_skinselector.cc:172
+#: src/skins-qt/skinselector.cc:102 src/skins/skinselector.cc:115
 msgid "Unarchived Winamp 2.x skin"
 msgstr "Arhiveerimata Winamp 2.x rüü"
 
-#: src/skins/util.cc:430
-#, c-format
-msgid "Could not create directory (%s): %s\n"
-msgstr "Kataloogi (%s) pole võimalik luua: %s\n"
-
-#: src/sndfile/plugin.cc:39
+#: src/sndfile/plugin.cc:38
 msgid "Sndfile Plugin"
 msgstr ""
 
-#: src/sndfile/plugin.cc:336
+#: src/sndfile/plugin.cc:372
 msgid ""
 "Based on the xmms_sndfile plugin:\n"
 "Copyright (C) 2000, 2002 Erik de Castro Lopo\n"
@@ -3691,95 +3992,111 @@
 "Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:44
+#: src/sndio/sndio.cc:43
 msgid "Sndio Output"
-msgstr ""
+msgstr "Sndio väljund"
 
-#: src/sndio-ng/sndio.cc:98
+#: src/sndio/sndio.cc:98
 msgid "Device (blank for default):"
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:100
+#: src/sndio/sndio.cc:100
 msgid "Save and restore volume:"
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:181
+#: src/sndio/sndio.cc:181
 #, c-format
 msgid "Sndio error: Unsupported audio format (%d)"
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:192
+#: src/sndio/sndio.cc:192
 msgid "Sndio error: sio_open() failed"
-msgstr ""
+msgstr "Sndio viga: sio_open() tõrge"
 
-#: src/sndio-ng/sndio.cc:222
+#: src/sndio/sndio.cc:221
 msgid "Sndio error: sio_setpar() failed"
-msgstr ""
+msgstr "Sndio viga: tõrge sio_setpar() kasutamisel"
 
-#: src/sndio-ng/sndio.cc:234
+#: src/sndio/sndio.cc:233
 msgid "Sndio error: sio_start() failed"
 msgstr ""
 
-#: src/song_change/song_change.cc:33
+#: src/songchange/song_change.cc:30
 msgid "Song Change"
 msgstr "Loovahetus"
 
-#: src/song_change/song_change.cc:342
-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.</"
-"span>"
-
-#: src/song_change/song_change.cc:358
+#: src/songchange/song_change.cc:256
 msgid "Commands"
-msgstr ""
+msgstr "Käsud"
 
-#: src/song_change/song_change.cc:360
+#: src/songchange/song_change.cc:258
 msgid "Command to run when starting a new song:"
 msgstr ""
 
-#: src/song_change/song_change.cc:364
+#: src/songchange/song_change.cc:261
+msgid "Command to run when stopping a song:"
+msgstr ""
+
+#: src/songchange/song_change.cc:264
 msgid "Command to run at the end of a song:"
 msgstr ""
 
-#: src/song_change/song_change.cc:368
+#: src/songchange/song_change.cc:267
 msgid "Command to run at the end of the playlist:"
 msgstr ""
 
-#: src/song_change/song_change.cc:372
+#: src/songchange/song_change.cc:270
 msgid "Command to run when song title changes (for network streams):"
 msgstr ""
 
-#: src/song_change/song_change.cc:376
+#: src/songchange/song_change.cc:273
 msgid ""
-"You can use the following format strings which will be substituted before "
-"calling the command (not all are useful for the end-of-playlist command):\n"
-"\n"
-"%F: Frequency (in hertz)\n"
+"You can use the following format codes, which will be replaced before "
+"running the command.\n"
+"Not all are useful though for the song-stopped or end-of-playlist command."
+msgstr ""
+
+#: src/songchange/song_change.cc:276
+msgid ""
+"%a: Artist\n"
+"%b: Album\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"
+"%F: Frequency (Hertz)\n"
+"%l: Length (milliseconds)\n"
+"%n or %s: Formatted title (see playlist settings)\n"
 "%p: Currently playing (1 or 0)\n"
-"%a: Artist\n"
-"%b: Album\n"
-"%T: Track title"
-msgstr ""
-
-#: src/song-info-qt/song-info.cc:32
-msgid "Song Info (Qt)"
+"%r: Rate (bits per second)\n"
+"%t: Playlist position\n"
+"%T: Title (unformatted)"
 msgstr ""
+"%a: Esitaja\n"
+"%b: Album\n"
+"%c: Kanalite arv\n"
+"%f: Faili nimi (täisrajaga)\n"
+"%F: Sagedus (Hertsides)\n"
+"%l: Kestus (millisekundites)\n"
+"%n või %s: Vormindatud pealkiri (vaata esitusnimekirja sätteid)\n"
+"%p: Hetkel esitamine (1 või 0)\n"
+"%r: Bitikiirus (bitti sekundi kohta)\n"
+"%t: Asukoht esitusnimekirjas\n"
+"%T: Pealkiri (vormindamata)"
+
+#: src/songchange/song_change.cc:287
+msgid ""
+"Parameters passed to the shell should be enclosed in quotation marks.\n"
+"Unquoted parameters may lead to unexpected results."
+msgstr ""
+
+#: src/song-info-qt/song-info.cc:30
+msgid "Song Info"
+msgstr "Loo andmed"
 
-#: src/sox-resampler/sox-resampler.cc:44
+#: src/soxr/sox-resampler.cc:44
 msgid "SoX Resampler"
 msgstr ""
 
-#: src/sox-resampler/sox-resampler.cc:144
+#: src/soxr/sox-resampler.cc:172
 msgid ""
 "SoX Resampler Plugin for Audacious\n"
 "Copyright 2013 Michał Lipski\n"
@@ -3788,89 +4105,143 @@
 "Copyright 2010-2012 John Lindgren"
 msgstr ""
 
-#: src/sox-resampler/sox-resampler.cc:150
+#: src/soxr/sox-resampler.cc:178
 msgid "Quick"
-msgstr ""
+msgstr "Kiire"
 
-#: src/sox-resampler/sox-resampler.cc:151
+#: src/soxr/sox-resampler.cc:179
 msgid "Low"
-msgstr ""
+msgstr "Madal"
 
-#: src/sox-resampler/sox-resampler.cc:153
+#: src/soxr/sox-resampler.cc:181
 msgid "High"
-msgstr ""
+msgstr "Kõrge"
 
-#: src/sox-resampler/sox-resampler.cc:154
+#: src/soxr/sox-resampler.cc:182
 msgid "Very High"
+msgstr "Väga kõrge"
+
+#: src/soxr/sox-resampler.cc:183
+msgid "Ultra High"
+msgstr ""
+
+#: src/soxr/sox-resampler.cc:187
+msgid "Minimum"
 msgstr ""
 
-#: src/sox-resampler/sox-resampler.cc:158
+#: src/soxr/sox-resampler.cc:188
+msgid "Intermediate"
+msgstr ""
+
+#: src/soxr/sox-resampler.cc:193
 msgid "Quality:"
+msgstr "Kvaliteet:"
+
+#: src/soxr/sox-resampler.cc:196
+msgid "Phase:"
+msgstr ""
+
+#: src/soxr/sox-resampler.cc:200
+msgid "Allow aliasing"
 msgstr ""
 
-#: src/speed-pitch/speed-pitch.cc:51
+#: src/soxr/sox-resampler.cc:202
+msgid "Use steep filter"
+msgstr ""
+
+#: src/speedpitch/speed-pitch.cc:54
 msgid "Speed and Pitch"
 msgstr ""
 
-#: src/speed-pitch/speed-pitch.cc:210
-msgid "Speed and Pitch"
+#: src/speedpitch/speed-pitch.cc:247
+msgid "Speed"
 msgstr ""
 
-#: src/speed-pitch/speed-pitch.cc:211
-msgid "Speed:"
+#: src/speedpitch/speed-pitch.cc:248
+msgid "Decouple from pitch"
 msgstr ""
 
-#: src/speed-pitch/speed-pitch.cc:214
-msgid "Pitch:"
+#: src/speedpitch/speed-pitch.cc:250 src/speedpitch/speed-pitch.cc:258
+msgid "Multiplier:"
 msgstr ""
 
-#: src/statusicon/statusicon.cc:47
+#: src/speedpitch/speed-pitch.cc:254
+msgid "Pitch"
+msgstr ""
+
+#: src/statusicon-qt/statusicon.cc:45 src/statusicon/statusicon.cc:47
 msgid "Status Icon"
 msgstr "Olekuikoon"
 
-#: src/statusicon/statusicon.cc:283
-msgid "Se_ttings ..."
-msgstr ""
-
-#: src/statusicon/statusicon.cc:372
+#: src/statusicon-qt/statusicon.cc:68
 msgid ""
-"Status Icon Plugin\n"
+"Status Icon Plugin (partial port for Qt interface)\n"
 "\n"
 "Copyright 2005-2007 Giacomo Lozito <james@develia.org>\n"
 "Copyright 2010 Michał Lipski <tallica@o2.pl>\n"
+"Copyright 2015 Eugene Paskevich <eugene@raptor.kiev.ua>\n"
 "\n"
 "This plugin provides a status icon, placed in\n"
 "the system tray area of the window manager."
 msgstr ""
+"Olekuikooni plugin (osaliselt porditud Qt liidesele)\n"
+"\n"
+"Autoriõigus 2005-2007 Giacomo Lozito <james@develia.org>\n"
+"Autoriõigus 2010 Michał Lipski <tallica@o2.pl>\n"
+"Autoriõigus 2015 Eugene Paskevich <eugene@raptor.kiev.ua>\n"
+"\n"
+"Seep lugin tagab olekuikooni, mis asub\n"
+"aknahalduri süsteemisalve alal."
 
-#: src/statusicon/statusicon.cc:379
+#: src/statusicon-qt/statusicon.cc:89 src/statusicon/statusicon.cc:384
 msgid "Mouse Scroll Action"
 msgstr "Hiireratta kerimine"
 
-#: src/statusicon/statusicon.cc:380
+#: src/statusicon-qt/statusicon.cc:90 src/statusicon/statusicon.cc:385
 msgid "Change volume"
 msgstr "Muudab valjust"
 
-#: src/statusicon/statusicon.cc:383
+#: src/statusicon-qt/statusicon.cc:93 src/statusicon/statusicon.cc:388
 msgid "Change playing song"
 msgstr "Vahetab esitatavat lugu"
 
-#: src/statusicon/statusicon.cc:386
+#: src/statusicon-qt/statusicon.cc:96 src/statusicon/statusicon.cc:391
 msgid "Other Settings"
 msgstr "Muud sätted"
 
-#: src/statusicon/statusicon.cc:387
+#: src/statusicon-qt/statusicon.cc:97 src/statusicon/statusicon.cc:392
 msgid "Disable the popup window"
 msgstr "Hüpikaken on keelatud"
 
-#: src/statusicon/statusicon.cc:389
+#: src/statusicon-qt/statusicon.cc:99 src/statusicon/statusicon.cc:394
 msgid "Close to the system tray"
 msgstr "Sulgemine süsteemisalve"
 
-#: src/statusicon/statusicon.cc:391
+#: src/statusicon-qt/statusicon.cc:101 src/statusicon/statusicon.cc:396
 msgid "Advance in playlist when scrolling upward"
 msgstr ""
 
+#: src/statusicon-qt/statusicon.cc:116 src/statusicon/statusicon.cc:287
+msgid "Se_ttings ..."
+msgstr ""
+
+#: src/statusicon/statusicon.cc:377
+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 ""
+"Olekuikooni plugin\n"
+"\n"
+"Autoriõigus 2005-2007 Giacomo Lozito <james@develia.org>\n"
+"Autoriõigus 2010 Michał Lipski <tallica@o2.pl>\n"
+"\n"
+"See plugin loob olekuikooni aknahalduri systeemisalve."
+
 #: src/stereo_plugin/stereo.cc:19
 msgid "Extra Stereo"
 msgstr ""
@@ -3886,20 +4257,160 @@
 msgid "Extra Stereo"
 msgstr ""
 
+#: src/streamtuner/icecast-model.cc:126 src/streamtuner/shoutcast-model.cc:131
+msgid "Type"
+msgstr ""
+
+#: src/streamtuner/icecast-model.cc:132
+msgid "Current Song"
+msgstr ""
+
+#: src/streamtuner/icecast-model.cc:164
+msgid "Other"
+msgstr ""
+
+#: src/streamtuner/ihr-model.cc:63
+msgid "Market"
+msgstr ""
+
+#: src/streamtuner/ihr-model.cc:156
+msgid "Call Letters"
+msgstr ""
+
+#: src/streamtuner/ihr-model.cc:162
+msgid "Description"
+msgstr "Kirjeldus"
+
+#: src/streamtuner/shoutcast-model.cc:128
+msgid "Listeners"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:188
+msgid "Top 500 Stations"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:189
+msgid "Alternative"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:190
+msgid "Blues"
+msgstr "Bluus"
+
+#: src/streamtuner/shoutcast-model.cc:191
+msgid "Classical"
+msgstr "Klassikaline"
+
+#: src/streamtuner/shoutcast-model.cc:192
+msgid "Country"
+msgstr "Kantri"
+
+#: src/streamtuner/shoutcast-model.cc:193
+msgid "Decades"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:194
+msgid "Easy Listening"
+msgstr "Ajaviitemuusika"
+
+#: src/streamtuner/shoutcast-model.cc:195
+msgid "Electronic"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:196
+msgid "Folk"
+msgstr "Folk"
+
+#: src/streamtuner/shoutcast-model.cc:197
+msgid "Inspirational"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:198
+msgid "International"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:199
+msgid "Jazz"
+msgstr "Džäss"
+
+#: src/streamtuner/shoutcast-model.cc:200
+msgid "Latin"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:201
+msgid "Metal"
+msgstr "Metal"
+
+#: src/streamtuner/shoutcast-model.cc:203
+msgid "New Age"
+msgstr "New Age"
+
+#: src/streamtuner/shoutcast-model.cc:204
+msgid "Pop"
+msgstr "Pop"
+
+#: src/streamtuner/shoutcast-model.cc:205
+msgid "Public Radio"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:206
+msgid "R&B and Urban"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:207
+msgid "Rap"
+msgstr "Räpp"
+
+#: src/streamtuner/shoutcast-model.cc:208
+msgid "Reggae"
+msgstr "Rege"
+
+#: src/streamtuner/shoutcast-model.cc:209
+msgid "Rock"
+msgstr "Rokk"
+
+#: src/streamtuner/shoutcast-model.cc:210
+msgid "Seasonal and Holiday"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:211
+msgid "Soundtracks"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:212
+msgid "Talk"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:213
+msgid "Themes"
+msgstr ""
+
+#: src/streamtuner/streamtuner.cc:59
+msgid "Shoutcast"
+msgstr ""
+
+#: src/streamtuner/streamtuner.cc:60
+msgid "Icecast"
+msgstr ""
+
+#: src/streamtuner/streamtuner.cc:71
+msgid "Stream Tuner"
+msgstr ""
+
 #: src/tonegen/tonegen.cc:45
 msgid "Tone Generator"
 msgstr "Toonigeneraator"
 
-#: src/tonegen/tonegen.cc:94
+#: src/tonegen/tonegen.cc:92
 #, c-format
 msgid "%s %.1f Hz"
 msgstr "%s %.1f Hz"
 
-#: src/tonegen/tonegen.cc:94
+#: src/tonegen/tonegen.cc:92
 msgid "Tone Generator: "
 msgstr "Toonigeneraator: "
 
-#: src/tonegen/tonegen.cc:160
+#: src/tonegen/tonegen.cc:161
 msgid ""
 "Sine tone generator by Håvard Kvålen <havardk@xmms.org>\n"
 "Modified by Daniel J. Peng <danielpeng@bigfoot.com>\n"
@@ -3908,11 +4419,32 @@
 "e.g. tone://2000;2005 to play a 2000 Hz tone and a 2005 Hz tone"
 msgstr ""
 
+#: src/ui-common/dialogs-qt.cc:40
+msgid ""
+"\n"
+"(Further messages have been hidden.)"
+msgstr ""
+"\n"
+"(Ülejäänud sõnumid peidetakse.)"
+
+#: src/ui-common/dialogs-qt.cc:52
+msgid "Working ..."
+msgstr "Töötamine ..."
+
+#: src/ui-common/dialogs-qt.cc:73
+msgid "Information"
+msgstr "Teave"
+
+#: src/ui-common/menu-ops-gtk.cc:132 src/ui-common/menu-ops-qt.cc:113
+#, c-format
+msgid "%s does not appear to be a valid folder."
+msgstr ""
+
 #: src/voice_removal/voice_removal.cc:28
 msgid "Voice Removal"
 msgstr "Hääle eemaldamine"
 
-#: src/vorbis/vorbis.cc:465
+#: src/vorbis/vorbis.cc:433
 msgid ""
 "Audacious Ogg Vorbis Decoder\n"
 "\n"
@@ -3932,17 +4464,34 @@
 "Gian-Carlo Pascutto <gcp@sjeng.org>\n"
 "Eugene Zagidullin <e.asphyx@gmail.com>"
 msgstr ""
+"Audaciouse Ogg Vorbis dekooder\n"
+"\n"
+"Põhineb Xiph.org Foundationi Ogg Vorbis Pluginal:\n"
+"http://www.xiph.org/\n"
+"\n"
+"Algne kood:\n"
+"Tony Arcieri <bascule@inferno.tusculum.edu>\n"
+"\n"
+"Panustajad:\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.h:18
 msgid "Ogg Vorbis Decoder"
 msgstr "Ogg Vorbis dekooder"
 
-#: src/vtx/info.cc:22
+#: src/vtx/info.cc:24
 #, c-format
 msgid "Details about %s"
 msgstr ""
 
-#: src/vtx/info.cc:24
+#: src/vtx/info.cc:26
 msgid ""
 "Title: %t\n"
 "Author: %a\n"
@@ -3961,44 +4510,109 @@
 msgid "VTX Decoder"
 msgstr "VTX-dekooder"
 
-#: src/vtx/vtx.cc:184
+#: src/vtx/vtx.cc:178
 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/wavpack/wavpack.cc:24
+#: src/vumeter-qt/vumeter_qt.cc:31
+msgid ""
+"VU Meter Plugin for Audacious\n"
+"Copyright 2017-2019 Marc Sánchez Fauste"
+msgstr ""
+
+#: src/vumeter-qt/vumeter_qt.cc:35
+msgid "VU Meter Settings"
+msgstr ""
+
+#: src/vumeter-qt/vumeter_qt.cc:37
+msgid "Peak hold time:"
+msgstr ""
+
+#: src/vumeter-qt/vumeter_qt.cc:42
+msgid "Fall-off time:"
+msgstr ""
+
+#: src/vumeter-qt/vumeter_qt.cc:44
+msgid "dB/second"
+msgstr ""
+
+#: src/vumeter-qt/vumeter_qt.cc:46
+msgid "Display legend"
+msgstr ""
+
+#: src/vumeter-qt/vumeter_qt.h:37
+msgid "VU Meter"
+msgstr ""
+
+#: src/waveout/waveout.cc:43
+msgid "Win32 waveOut"
+msgstr ""
+
+#: src/waveout/waveout.cc:69
+msgid ""
+"Win32 waveOut Plugin for Audacious\n"
+"Copyright 2016 John Lindgren"
+msgstr ""
+"Audaciouse Win32 waveOut plugin\n"
+"Autoriõigus 2016 John Lindgren"
+
+#: src/wavpack/wavpack.cc:25
 msgid "WavPack Decoder"
 msgstr "WavPack dekooder"
 
-#: src/wavpack/wavpack.cc:211
+#: src/wavpack/wavpack.cc:217
 msgid "lossy (hybrid)"
 msgstr ""
 
-#: src/wavpack/wavpack.cc:213
+#: src/wavpack/wavpack.cc:219
 msgid "lossy"
 msgstr ""
 
-#: src/wavpack/wavpack.cc:255
+#: src/wavpack/wavpack.cc:259
 msgid ""
 "Copyright 2006 William Pitcock <nenolod@nenolod.net>\n"
 "\n"
 "Some of the plugin code was by Miles Egan."
 msgstr ""
+"Autoriõigus 2006 William Pitcock <nenolod@nenolod.net>\n"
+"\n"
+"Osa plugina koodi on kirjutanud Miles Egan."
 
-#: src/xsf/plugin.cc:50
+#: src/xsf/plugin.cc:74
 msgid "2SF Decoder"
 msgstr "2SF-dekooder"
 
-#: src/xsf/plugin.cc:238
+#: src/xsf/plugin.cc:429
+msgid "32728 Hz"
+msgstr ""
+
+#: src/xsf/plugin.cc:432
+msgid "65456 Hz"
+msgstr ""
+
+#: src/xsf/plugin.cc:438
+msgid "Cosine"
+msgstr ""
+
+#: src/xsf/plugin.cc:439
+msgid "Sharp"
+msgstr ""
+
+#: src/xsf/plugin.cc:443
 msgid "XSF Configuration"
+msgstr "XSF-seadistus"
+
+#: src/xsf/plugin.cc:445
+msgid "Default fade time:"
 msgstr ""
 
-#: src/xsf/plugin.cc:239
-msgid "Ignore length from file"
+#: src/xsf/plugin.cc:447
+msgid "Interpolation mode:"
 msgstr ""
 
-#: src/xspf/xspf.cc:89
+#: src/xspf/xspf.cc:95
 msgid "XML Shareable Playlists (XSPF)"
 msgstr "Jagatavad XML-esitusnimekirjad (XSPF)"

audacious-plugins-3.6.2-gtk3.tar.bz2/po/eu.po -> audacious-plugins-4.4.1.tar.bz2/po/eu.po Changed

@@ -5,257 +5,82 @@
 # Translators:
 # asier fernandez iribar <asier.fernandez.iribar@gmail.com>, 2013
 # Iñaki Larrañaga Murgoitio <dooteo@euskalgnu.org>, 2009
+# Muitze Zulaika <muitzezulaika@gmail.com>, 2021
+# Muitze Zulaika <muitzezulaika@gmail.com>, 2021
 # Osoitz <oelkoro@gmail.com>, 2012
+# Oihane C, 2021
 msgid ""
 msgstr ""
 "Project-Id-Version: Audacious Plugins\n"
-"Report-Msgid-Bugs-To: http://redmine.audacious-media-player.org/\n"
-"POT-Creation-Date: 2015-02-28 19:18+0100\n"
-"PO-Revision-Date: 2015-02-04 21:21+0000\n"
-"Last-Translator: Thomas Lange <thomas-lange2@gmx.de>\n"
-"Language-Team: Basque (http://www.transifex.com/projects/p/audacious/"
-"language/eu/)\n"
+"Report-Msgid-Bugs-To: https://github.com/audacious-media-player/audacious/"
+"issues\n"
+"POT-Creation-Date: 2024-09-26 21:54+0200\n"
+"PO-Revision-Date: 2011-10-10 17:43+0000\n"
+"Last-Translator: Oihane C, 2021\n"
+"Language-Team: Basque (http://app.transifex.com/audacious/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"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/aac-raw/aac.cc:18
+#: src/aac/aac.cc:19
 msgid "AAC (Raw) Decoder"
-msgstr ""
+msgstr "AAC Deskodetzailea"
 
-#: src/adplug/adplug-xmms.cc:42
+#: src/adplug/adplug-xmms.cc:70
 msgid "AdPlug (AdLib Player)"
 msgstr ""
 
-#: src/adplug/adplug-xmms.cc:156 src/modplug/modplugbmp.cc:335
-#: src/psf/plugin.cc:138 src/vtx/vtx.cc:87 src/xsf/plugin.cc:113
+#: src/adplug/adplug-xmms.cc:167 src/modplug/modplugbmp.cc:321
+#: src/psf/plugin.cc:161 src/vtx/vtx.cc:89 src/xsf/plugin.cc:204
 msgid "sequenced"
-msgstr ""
-
-#: src/alarm/alarm.cc:55 src/alarm/interface.cc:82
-msgid "Alarm"
-msgstr "Alarma"
-
-#: src/alarm/alarm.cc:782
-msgid "Set Alarm ..."
-msgstr ""
-
-#: src/alarm/alarm.cc:810
-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/interface.cc: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.cc: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.cc: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.cc:81
-msgid "This is your wakeup call."
-msgstr "Hau da zure esnatzeko deia:"
-
-#: src/alarm/interface.cc:99
-msgid "Your reminder for today is..."
-msgstr ""
-
-#: src/alarm/interface.cc:101 src/alarm/interface.cc:386
-msgid "Reminder"
-msgstr "Gogorarazlea"
-
-#: src/alarm/interface.cc:132
-msgid "Monday"
-msgstr "Astelehena"
-
-#: src/alarm/interface.cc:132
-msgid "Tuesday"
-msgstr "Asteartea"
-
-#: src/alarm/interface.cc:132
-msgid "Wednesday"
-msgstr "Asteazkena"
-
-#: src/alarm/interface.cc:133
-msgid "Thursday"
-msgstr "Osteguna"
-
-#: src/alarm/interface.cc:133
-msgid "Friday"
-msgstr "Ostirala"
+msgstr "sekuentziatua"
 
-#: src/alarm/interface.cc:133
-msgid "Saturday"
-msgstr "Larunbata"
-
-#: src/alarm/interface.cc:133
-msgid "Sunday"
-msgstr "Igandea"
-
-#: src/alarm/interface.cc:171 src/alarm/interface.cc:230
-#: src/alarm/interface.cc:245
-msgid "Time"
-msgstr "Denbora"
-
-#: src/alarm/interface.cc:178
-msgid "Alarm at (default):"
-msgstr "Alarma noiz (lehenetsia):"
-
-#: src/alarm/interface.cc:200
-msgid "h"
-msgstr "o"
-
-#: src/alarm/interface.cc:203
-msgid "Quiet after:"
-msgstr "Isildu hau eta gero:"
-
-#: src/alarm/interface.cc:215
-msgid "hours"
-msgstr "orduak"
-
-#: src/alarm/interface.cc:226
-msgid "minutes"
-msgstr "minutuak"
-
-#: src/alarm/interface.cc:235
-msgid "Choose the days for the alarm to come on"
-msgstr "Aukeratu alarmak jotzeko egunak"
-
-#: src/alarm/interface.cc:242
-msgid "Day"
-msgstr "Eguna"
-
-#: src/alarm/interface.cc:259 src/bs2b/plugin.cc:130
-#: src/skins/preset-list.cc:434 src/skins/preset-list.cc:440
-msgid "Default"
-msgstr "Lehenetsia"
-
-#: src/alarm/interface.cc:288
-msgid "Days"
-msgstr "Egunak"
-
-#: src/alarm/interface.cc:297
-msgid "Fading"
-msgstr "Progresioa"
-
-#: src/alarm/interface.cc:305 src/console/plugin.cc:41
-#: src/crossfade/crossfade.cc:53 src/crossfade/crossfade.cc:59
-#: src/gtkui/settings.cc:49 src/lirc/lirc.cc:397 src/sid/xs_config.cc:85
-#: src/sid/xs_config.cc:94 src/sid/xs_config.cc:103
-msgid "seconds"
-msgstr "segundo"
-
-#: src/alarm/interface.cc:312 src/alarm/interface.cc:353
-msgid "Volume"
-msgstr "Bolumena"
-
-#: src/alarm/interface.cc:317
-msgid "Start at"
-msgstr "Hasi hemen "
-
-#: src/alarm/interface.cc:333
-msgid "Final"
-msgstr "Bukaeran"
-
-#: src/alarm/interface.cc:346
-msgid "Current"
-msgstr "Oraingoa"
-
-#: src/alarm/interface.cc:359
-msgid "Additional Command"
-msgstr "Komando gehigarria"
-
-#: src/alarm/interface.cc:365 src/alarm/interface.cc:391
-msgid "enable"
-msgstr "gaitu"
-
-#: src/alarm/interface.cc:372
-msgid "Playlist (optional)"
-msgstr "Erreprodukzio-zerrenda (aukerazkoa)"
+#: src/adplug/adplug-xmms.cc:349 src/sid/xs_config.cc:61
+msgid "Output"
+msgstr "Irteera"
 
-#: src/alarm/interface.cc:379
-msgid "Select a playlist"
-msgstr ""
+#: src/adplug/adplug-xmms.cc:350
+msgid "OPL Emulator:"
+msgstr "OPL Emuladorea:"
+
+#: src/adplug/adplug-xmms.cc:353 src/amidiplug/i_configure.cc:153
+#: src/console/plugin.cc:45 src/filewriter/filewriter.cc:481
+#: src/sid/xs_config.cc:65 src/xsf/plugin.cc:446
+msgid "Sample rate:"
+msgstr "lagin-tasa:"
 
-#: src/alarm/interface.cc:399
-msgid "Options"
-msgstr "Aukerak"
+#: src/adplug/adplug-xmms.cc:354 src/amidiplug/i_configure.cc:155
+#: src/bs2b/plugin.cc:141 src/console/plugin.cc:47
+#: src/modplug/plugin_main.cc:77 src/resample/resample.cc:201
+#: src/resample/resample.cc:207 src/resample/resample.cc:211
+#: src/resample/resample.cc:215 src/resample/resample.cc:219
+#: src/resample/resample.cc:223 src/resample/resample.cc:227
+#: src/resample/resample.cc:231 src/resample/resample.cc:235
+#: src/resample/resample.cc:239 src/resample/resample.cc:243
+#: src/sid/xs_config.cc:67 src/soxr/sox-resampler.cc:205
+msgid "Hz"
+msgstr "Hz"
 
-#: src/alarm/interface.cc:404
-msgid "What do these options mean?"
-msgstr "Zer esan nahi dute aukera hauek?"
+#: src/adplug/adplug-xmms.cc:355 src/gtkui/settings.cc:55
+#: src/modplug/plugin_main.cc:105 src/qtui/settings.cc:85
+#: src/skins-qt/skins_cfg.cc:302 src/skins/skins_cfg.cc:284
+msgid "Miscellaneous"
+msgstr "Hainbat"
 
-#: src/alarm/interface.cc:420
-msgid "Help"
-msgstr "Laguntza"
+#: src/adplug/adplug-xmms.cc:356
+msgid "Repeat song in endless loop"
+msgstr "Abestia amaierarik gabeko begizta batean errepikatzea"
 
-#: src/albumart/albumart.cc:31
+#: src/albumart/albumart.cc:31 src/albumart-qt/albumart.cc:35
 msgid "Album Art"
 msgstr "Diskoaren azala"
 
-#: src/albumart-qt/albumart.cc:33
-msgid "Album Art (Qt)"
-msgstr ""
-
-#: src/alsa/alsa.h:70
+#: src/alsa/alsa.h:64
 msgid "ALSA Output"
-msgstr ""
+msgstr "ALSA Irteera"
 
 #: src/alsa/config.cc:28
 msgid ""
@@ -268,7 +93,7 @@
 
 #: src/alsa/config.cc:61
 msgid "(no description)"
-msgstr ""
+msgstr "(deskribapenik ez)"
 
 #: src/alsa/config.cc:166
 msgid "Default PCM device"
@@ -290,11 +115,11 @@
 msgid "Mixer element:"
 msgstr "Nahaslea:"
 
-#: src/amidi-plug/amidi-plug.cc:41
+#: src/amidiplug/amidi-plug.cc:42
 msgid "AMIDI-Plug (MIDI Player)"
 msgstr ""
 
-#: src/amidi-plug/amidi-plug.cc:437
+#: src/amidiplug/amidi-plug.cc:445
 msgid ""
 "AMIDI-Plug\n"
 "modular MIDI music player\n"
@@ -317,157 +142,156 @@
 "for the good help with alpha testing"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:94
+#: src/amidiplug/i_configure.cc:94
 msgid "Override default gain:"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:102
+#: src/amidiplug/i_configure.cc:102
 msgid "Override default polyphony:"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:110
+#: src/amidiplug/i_configure.cc:110
 msgid "Override default reverb:"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:112 src/amidi-plug/i_configure.cc:120
+#: src/amidiplug/i_configure.cc:112 src/amidiplug/i_configure.cc:120
 msgid "On"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:118
+#: src/amidiplug/i_configure.cc:118
 msgid "Override default chorus:"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:128 src/console/plugin.cc:29
+#: src/amidiplug/i_configure.cc:128 src/console/plugin.cc:29
 msgid "Playback"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:129
+#: src/amidiplug/i_configure.cc:129
 msgid "Transpose:"
-msgstr ""
+msgstr "Irauli: "
 
-#: src/amidi-plug/i_configure.cc:131
+#: src/amidiplug/i_configure.cc:131 src/speedpitch/speed-pitch.cc:257
 msgid "semitones"
-msgstr ""
+msgstr "tonuerdiak"
 
-#: src/amidi-plug/i_configure.cc:132
+#: src/amidiplug/i_configure.cc:132
 msgid "Drum shift:"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:134
+#: src/amidiplug/i_configure.cc:134
 msgid "note numbers"
-msgstr ""
+msgstr "nota zenbakiak"
 
-#: src/amidi-plug/i_configure.cc:135
+#: src/amidiplug/i_configure.cc:135
 msgid "Skip leading silence"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:137
+#: src/amidiplug/i_configure.cc:137
 msgid "Skip trailing silence"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:141
+#: src/amidiplug/i_configure.cc:141
 msgid "SoundFont"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:143
+#: src/amidiplug/i_configure.cc:148
 msgid "Synthesizer"
-msgstr ""
+msgstr "Sintetizadorea"
 
-#: src/amidi-plug/i_configure.cc:148 src/console/plugin.cc:45
-#: src/sid/xs_config.cc:65
-msgid "Sample rate:"
-msgstr ""
-
-#: src/amidi-plug/i_configure.cc:150 src/bs2b/plugin.cc:141
-#: src/console/plugin.cc:47 src/modplug/plugin_main.cc:78
-#: src/resample/resample.cc:201 src/resample/resample.cc:207
-#: src/resample/resample.cc:211 src/resample/resample.cc:215
-#: src/resample/resample.cc:219 src/resample/resample.cc:223
-#: src/resample/resample.cc:227 src/resample/resample.cc:231
-#: src/resample/resample.cc:235 src/resample/resample.cc:239
-#: src/resample/resample.cc:243 src/sid/xs_config.cc:67
-#: src/sox-resampler/sox-resampler.cc:163
-msgid "Hz"
-msgstr "Hz"
-
-#: src/amidi-plug/i_configure-fluidsynth.cc:52
+#: src/amidiplug/i_configure-fluidsynth.cc:58
+#: src/amidiplug/i_configure-fluidsynth.cc:527
 msgid "AMIDI-Plug - select SoundFont file"
 msgstr "AMIDI-Plug - hautatu SoundFont fitxategia"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:55 src/filewriter/mp3.cc:658
+#: src/amidiplug/i_configure-fluidsynth.cc:61
 msgid "_Cancel"
-msgstr ""
+msgstr "_Utzi"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:56
+#: src/amidiplug/i_configure-fluidsynth.cc:62
 msgid "_Open"
-msgstr ""
+msgstr "_Ireki"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:225 src/gtkui/columns.cc:46
+#: src/amidiplug/i_configure-fluidsynth.cc:233
+#: src/amidiplug/i_configure-fluidsynth.cc:461
 msgid "File name"
 msgstr "Fitxategi izena"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:229
+#: src/amidiplug/i_configure-fluidsynth.cc:237
+#: src/amidiplug/i_configure-fluidsynth.cc:464
 msgid "Size (bytes)"
 msgstr "Tamaina (byte)"
 
-#: src/amidi-plug/i_fileinfo.cc:163
+#: src/amidiplug/i_fileinfo.cc:184
 msgid "Name:"
 msgstr "Izena:"
 
-#: src/amidi-plug/i_fileinfo.cc:181
+#: src/amidiplug/i_fileinfo.cc:202
 msgid " MIDI Info "
 msgstr " MIDI informazioa "
 
-#: src/amidi-plug/i_fileinfo.cc:195
+#: src/amidiplug/i_fileinfo.cc:216
 msgid "Format:"
 msgstr "Formatua:"
 
-#: src/amidi-plug/i_fileinfo.cc:198
+#: src/amidiplug/i_fileinfo.cc:219
 msgid "Length (msec):"
 msgstr "Luzera (mseg.):"
 
-#: src/amidi-plug/i_fileinfo.cc:201
+#: src/amidiplug/i_fileinfo.cc:222
 msgid "No. of Tracks:"
 msgstr "Pista kopurua:"
 
-#: src/amidi-plug/i_fileinfo.cc:207
+#: src/amidiplug/i_fileinfo.cc:228
 msgid "variable"
 msgstr "aldagaia"
 
-#: src/amidi-plug/i_fileinfo.cc:209
+#: src/amidiplug/i_fileinfo.cc:230
 msgid "BPM:"
 msgstr "BPM:"
 
-#: src/amidi-plug/i_fileinfo.cc:217
+#: src/amidiplug/i_fileinfo.cc:238
 msgid "BPM (wavg):"
 msgstr "BPM (wavg):"
 
-#: src/amidi-plug/i_fileinfo.cc:220
+#: src/amidiplug/i_fileinfo.cc:241
 msgid "Time Div:"
 msgstr "Denbora zat:"
 
-#: src/amidi-plug/i_fileinfo.cc:231
+#: src/amidiplug/i_fileinfo.cc:252
 msgid " MIDI Comments and Lyrics "
 msgstr " MIDI iruzkinak eta letrak "
 
-#: src/amidi-plug/i_fileinfo.cc:278
+#: src/amidiplug/i_fileinfo.cc:299
 msgid "* no comments available in this MIDI file *"
 msgstr "* iruzkinik ez dago erabilgarri MIDI fitxategi honetan *"
 
-#: src/amidi-plug/i_fileinfo.cc:290
+#: src/amidiplug/i_fileinfo.cc:311
 msgid "* no lyrics available in this MIDI file *"
 msgstr "* letrarik ez dago erabilgarri MIDI fitxategi honetan *"
 
-#: src/amidi-plug/i_fileinfo.cc:300 src/filewriter/vorbis.cc:197
-#: src/ladspa/plugin.cc:416
+#: src/amidiplug/i_fileinfo.cc:321 src/ladspa/plugin.cc:418
+#: src/ui-common/dialogs-qt.cc:32
 msgid "_Close"
-msgstr ""
+msgstr "_Itxi"
 
-#: src/amidi-plug/i_fileinfo.cc:325
+#: src/amidiplug/i_fileinfo.cc:346
 msgid " (invalid UTF-8)"
 msgstr " (UTF-8 baliogabea)"
 
-#: src/aosd/aosd.cc:32
+#: src/ampache/ampache.cc:33
+msgid "Ampache Browser"
+msgstr "Ampache nabigatzailea"
+
+#: src/ampache/ampache.cc:46
+msgid ""
+"Ampache Browser for Audacious\n"
+"http://ampache-browser.org/\n"
+"\n"
+"Copyright (C) Róbert Čerňanský and John Lindgren\n"
+"License: GNU GPLv3"
+msgstr ""
+
+#: src/aosd/aosd.cc:31
 msgid ""
 "Audacious OSD\n"
 "http://www.develia.org/projects.php?p=audacious#aosd\n"
@@ -494,131 +318,131 @@
 msgid "Concave Rectangle"
 msgstr "Laukizuzen ahurra"
 
-#: src/aosd/aosd_style.cc:69
+#: src/aosd/aosd_style.cc:69 src/openmpt/mptwrap.h:50 src/xsf/plugin.cc:436
 msgid "None"
 msgstr "Bat ere ez"
 
-#: src/aosd/aosd_trigger.cc:50
+#: src/aosd/aosd_trigger.cc:49
 msgid "Playback Start"
 msgstr "Erreprodukzioa hasi"
 
-#: src/aosd/aosd_trigger.cc:51
+#: src/aosd/aosd_trigger.cc:50
 msgid "Triggers OSD when a playlist entry is played."
 msgstr ""
 "OSDa abiarazten du erreprodukzio-zerrendako sarrera bat erreproduzitzean."
 
-#: src/aosd/aosd_trigger.cc:56
+#: src/aosd/aosd_trigger.cc:55
 msgid "Title Change"
 msgstr "Titulu aldaketa"
 
-#: src/aosd/aosd_trigger.cc:57
+#: src/aosd/aosd_trigger.cc:56
 msgid "Triggers OSD when the song title changes (for internet streams)."
 msgstr ""
 
-#: src/aosd/aosd_trigger.cc:62
+#: src/aosd/aosd_trigger.cc:61
 msgid "Pause On"
 msgstr "Pausatuta"
 
-#: src/aosd/aosd_trigger.cc:63
+#: src/aosd/aosd_trigger.cc:62
 msgid "Triggers OSD when playback is paused."
 msgstr "OSDa abiarazten du erreprodukzioa pausatzean."
 
-#: src/aosd/aosd_trigger.cc:68
+#: src/aosd/aosd_trigger.cc:67
 msgid "Pause Off"
 msgstr "Jarraitu"
 
-#: src/aosd/aosd_trigger.cc:69
+#: src/aosd/aosd_trigger.cc:68
 msgid "Triggers OSD when playback is unpaused."
 msgstr "OSDa abiarazten du erreprodukzioa jarraitzean."
 
-#: src/aosd/aosd_ui.cc:163
+#: src/aosd/aosd_ui.cc:204
 msgid "Placement"
 msgstr "Kokalekua"
 
-#: src/aosd/aosd_ui.cc:196
+#: src/aosd/aosd_ui.cc:241
 msgid "Relative X offset:"
 msgstr "X desplazamendu erlatiboa:"
 
-#: src/aosd/aosd_ui.cc:203
+#: src/aosd/aosd_ui.cc:245
 msgid "Relative Y offset:"
 msgstr "Y desplazamendu erlatiboa:"
 
-#: src/aosd/aosd_ui.cc:210
+#: src/aosd/aosd_ui.cc:249
 msgid "Max OSD width:"
 msgstr "OSDaren gehi. zabalera:"
 
-#: src/aosd/aosd_ui.cc:221
+#: src/aosd/aosd_ui.cc:281
 msgid "Multi-Monitor options"
 msgstr "Pantaila anitzen aukerak"
 
-#: src/aosd/aosd_ui.cc:225
+#: src/aosd/aosd_ui.cc:285
 msgid "Display OSD using:"
 msgstr "Bistaratu OSDa hau erabiliz:"
 
-#: src/aosd/aosd_ui.cc:227
+#: src/aosd/aosd_ui.cc:287
 msgid "all monitors"
 msgstr "pantaila guztiak"
 
-#: src/aosd/aosd_ui.cc:230
+#: src/aosd/aosd_ui.cc:290
 #, c-format
 msgid "monitor %i"
 msgstr "%i. pantaila"
 
-#: src/aosd/aosd_ui.cc:282
+#: src/aosd/aosd_ui.cc:342
 msgid "Timing (ms)"
 msgstr "Tenporizadorea (ms)"
 
-#: src/aosd/aosd_ui.cc:287
+#: src/aosd/aosd_ui.cc:347
 msgid "Display:"
 msgstr "Bistaratu:"
 
-#: src/aosd/aosd_ui.cc:292
+#: src/aosd/aosd_ui.cc:352
 msgid "Fade in:"
 msgstr "Pixkanaka agertu:"
 
-#: src/aosd/aosd_ui.cc:297
+#: src/aosd/aosd_ui.cc:357
 msgid "Fade out:"
 msgstr "Iraungitu:"
 
-#: src/aosd/aosd_ui.cc:361
+#: src/aosd/aosd_ui.cc:442
 msgid "Fonts"
 msgstr "Letra-tipoak"
 
-#: src/aosd/aosd_ui.cc:368
+#: src/aosd/aosd_ui.cc:449
 #, c-format
 msgid "Font %i:"
 msgstr "%i letra-tipoa:"
 
-#: src/aosd/aosd_ui.cc:382
+#: src/aosd/aosd_ui.cc:466
 msgid "Shadow"
 msgstr "Itzala"
 
-#: src/aosd/aosd_ui.cc:486
+#: src/aosd/aosd_ui.cc:589
 msgid "Render Style"
 msgstr "Errendatze estiloa"
 
-#: src/aosd/aosd_ui.cc:502
+#: src/aosd/aosd_ui.cc:605
 msgid "Colors"
 msgstr "Koloreak"
 
-#: src/aosd/aosd_ui.cc:513
+#: src/aosd/aosd_ui.cc:616
 #, c-format
 msgid "Color %i:"
 msgstr "%i kolorea:"
 
-#: src/aosd/aosd_ui.cc:600
+#: src/aosd/aosd_ui.cc:714
 msgid "Enable trigger"
 msgstr "Gaitu abiarazlea"
 
-#: src/aosd/aosd_ui.cc:627
+#: src/aosd/aosd_ui.cc:741
 msgid "Event"
 msgstr "Gertaera"
 
-#: src/aosd/aosd_ui.cc:655
+#: src/aosd/aosd_ui.cc:768
 msgid "Composite manager detected"
 msgstr "Kudeatzaile konposatua detektatuta"
 
-#: src/aosd/aosd_ui.cc:662
+#: src/aosd/aosd_ui.cc:775
 msgid ""
 "Composite manager not detected;\n"
 "unless you know that you have one running, please activate a composite "
@@ -628,80 +452,148 @@
 "Bat exekutatzen dagoela jakin ezean, aktibatu konposaketako kudeatzalea "
 "bestela OSDak ez du ongi funtzionatuko"
 
-#: src/aosd/aosd_ui.cc:670
+#: src/aosd/aosd_ui.cc:783
 msgid "Composite manager not required for fake transparency"
 msgstr "Gardentasun faltsua egiteko ez da konposaketako kudeaketak behar"
 
-#: src/aosd/aosd_ui.cc:706
+#: src/aosd/aosd_ui.cc:820
 msgid "Transparency"
 msgstr "Gardentasuna"
 
-#: src/aosd/aosd_ui.cc:712
+#: src/aosd/aosd_ui.cc:826
 msgid "Fake transparency"
 msgstr "Gardentasun faltsua"
 
-#: src/aosd/aosd_ui.cc:714
+#: src/aosd/aosd_ui.cc:828
 msgid "Real transparency (requires X Composite Ext.)"
 msgstr "Egitako gardentasuna (Xen konposaketa hed. behar da)"
 
-#: src/aosd/aosd_ui.cc:756
+#: src/aosd/aosd_ui.cc:875
 msgid "Composite extension not loaded"
 msgstr "Konposaketako hedapena ez da kargatu"
 
-#: src/aosd/aosd_ui.cc:764
-msgid "Composite extension not available"
-msgstr "Konposaketako hedapena ez dago erabilgarri"
-
-#: src/aosd/aosd_ui.cc:781
+#: src/aosd/aosd_ui.cc:892
 #, c-format
 msgid "Audacious OSD"
 msgstr "Audacious OSDa"
 
-#: src/aosd/aosd_ui.cc:844
+#: src/aosd/aosd_ui.cc:955
 msgid "Position"
 msgstr "Posizioa"
 
-#: src/aosd/aosd_ui.cc:849
+#: src/aosd/aosd_ui.cc:960
 msgid "Animation"
 msgstr "Animazioa"
 
-#: src/aosd/aosd_ui.cc:854
+#: src/aosd/aosd_ui.cc:965
 msgid "Text"
 msgstr "Testua"
 
-#: src/aosd/aosd_ui.cc:859
+#: src/aosd/aosd_ui.cc:970
 msgid "Decoration"
 msgstr "Dekorazioa"
 
-#: src/aosd/aosd_ui.cc:864
+#: src/aosd/aosd_ui.cc:975
 msgid "Trigger"
 msgstr "Abiarazlea"
 
-#: src/aosd/aosd_ui.cc:869
+#: src/aosd/aosd_ui.cc:980 src/streamtuner/shoutcast-model.cc:202
 msgid "Misc"
 msgstr "Hainbat"
 
-#: src/aosd/aosd_ui.cc:878
+#: src/aosd/aosd_ui.cc:989
 msgid "Test"
-msgstr ""
+msgstr "Proba"
 
 #: src/asx3/asx3.cc:35
 msgid "ASXv3 Playlists"
-msgstr ""
+msgstr "ASXv3 Erreprodukzio-zerrenda"
 
 #: src/asx/asx.cc:33
 msgid "ASXv1/ASXv2 Playlists"
-msgstr ""
+msgstr "ASXv1/ASXv2 Erreprodukzio-zerrenda"
 
 #: src/audpl/audpl.cc:33
 msgid "Audacious Playlists (audpl)"
+msgstr "Audacious erreprodukzio-zerrenda (audpl)"
+
+#: src/background_music/background_music.cc:24
+msgid "Background music"
 msgstr ""
 
-#: src/blur_scope/blur_scope.cc:42
-msgid "Color"
+#: src/background_music/background_music.cc:25
+msgid "Target level:"
+msgstr ""
+
+#: src/background_music/background_music.cc:28
+#: src/background_music/background_music.cc:33
+#: src/silence-removal/silence-removal.cc:70
+msgid "dB"
+msgstr "dB"
+
+#: src/background_music/background_music.cc:29
+msgid "Maximum amplification:"
+msgstr ""
+
+#: src/background_music/background_music.cc:34 src/mpg123/mpg123.cc:81
+msgid "Advanced"
+msgstr " Aurreratu "
+
+#: src/background_music/background_music.cc:36
+msgid "Slow detection weight:"
+msgstr ""
+
+#: src/background_music/background_music.cc:39
+msgid "Hint"
+msgstr ""
+
+#: src/background_music/background_music.cc:41
+msgid ""
+"Slow detection weight is the relative weight\n"
+"of a long term average detection when compared\n"
+"to the actual, faster loudness detection.\n"
+"A value of zero gives a more radio-like sound\n"
+"where soft passages get \"pulled up\" more quickly,\n"
+"a value of two makes the sound feel less compressed."
+msgstr ""
+
+#: src/background_music/background_music.cc:52
+msgid ""
+"Background Music Plugin for Audacious\n"
+"Copyright 2023;2024 Michel Fleur\n"
+"\n"
+"Controls the volume to make the sound equally loud within and between "
+"tracks.\n"
+" It uses accurate loudness measurement and tries to make the volume changes "
+"sound natural without audible peaks, yet without lowering the volume before "
+"a peak in advance."
+msgstr ""
+
+#: src/background_music/background_music.cc:61
+msgid "Background Music"
+msgstr ""
+
+#: src/bitcrusher/bitcrusher.cc:33
+msgid "Bitcrusher"
+msgstr ""
+
+#: src/bitcrusher/bitcrusher.cc:34
+msgid "Bit Depth:"
+msgstr ""
+
+#: src/bitcrusher/bitcrusher.cc:37
+msgid "Downsample ratio:"
 msgstr ""
 
-#: src/blur_scope/blur_scope.cc:58
+#: src/bitcrusher/bitcrusher.cc:48
+msgid "Bitcrusher"
+msgstr ""
+
+#: src/blur_scope/blur_scope.cc:40 src/blur_scope-qt/blur_scope.cc:45
+msgid "Color"
+msgstr "Kolore"
+
+#: src/blur_scope/blur_scope.cc:56 src/blur_scope-qt/blur_scope.cc:158
 msgid "Blur Scope"
 msgstr ""
 
@@ -711,29 +603,33 @@
 
 #: src/bs2b/plugin.cc:129
 msgid "Presets:"
-msgstr ""
+msgstr "Aurrezarpenak"
+
+#: src/bs2b/plugin.cc:130
+msgid "Default"
+msgstr "Lehenetsia"
 
 #: src/bs2b/plugin.cc:136
 msgid "Feed level:"
-msgstr ""
+msgstr "Elikadura-maila:"
 
 #: src/bs2b/plugin.cc:138
 msgid "x1/10 dB"
-msgstr ""
+msgstr "x1/10 dB"
 
 #: src/bs2b/plugin.cc:139
 msgid "Cut frequency:"
-msgstr ""
+msgstr "Moztu maiztasuna:"
 
-#: src/cairo-spectrum/cairo-spectrum.cc:41
+#: src/cairo-spectrum/cairo-spectrum.cc:42 src/qt-spectrum/qt-spectrum.cc:107
 msgid "Spectrum Analyzer"
-msgstr ""
+msgstr "Espektro Analizatzailea"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:72
+#: src/cdaudio/cdaudio-ng.cc:74
 msgid "Audio CD Plugin"
 msgstr "Audio CD plugina"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:121
+#: src/cdaudio/cdaudio-ng.cc:121
 msgid ""
 "Copyright (C) 2007-2012 Calin Crisan <ccrisan@gmail.com> and others.\n"
 "\n"
@@ -745,132 +641,132 @@
 "This was a Google Summer of Code 2007 project."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:137
+#: src/cdaudio/cdaudio-ng.cc:140
 msgid "Device"
 msgstr "Gailua"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:138
+#: src/cdaudio/cdaudio-ng.cc:141
 msgid "Read speed:"
-msgstr ""
+msgstr "Irakurketa-abiadura:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:141
+#: src/cdaudio/cdaudio-ng.cc:144
 msgid "Override device:"
-msgstr ""
+msgstr "Gainidatzi gailua:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:143
+#: src/cdaudio/cdaudio-ng.cc:146
 msgid "Metadata"
 msgstr "Metadatuak"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:144
+#: src/cdaudio/cdaudio-ng.cc:147
 msgid "Use CD-Text"
 msgstr "Erabili CD-Text"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:146
+#: src/cdaudio/cdaudio-ng.cc:150
 msgid "Use CDDB"
 msgstr "Erabili CDDB"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:148
+#: src/cdaudio/cdaudio-ng.cc:152
 msgid "Use HTTP instead of CDDBP"
 msgstr "HTTP erabili CDDBP ordez"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:151
+#: src/cdaudio/cdaudio-ng.cc:155
 msgid "Server:"
 msgstr "Zerbitzaria:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:155
+#: src/cdaudio/cdaudio-ng.cc:159
 msgid "Path:"
 msgstr "Bidea:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:159
+#: src/cdaudio/cdaudio-ng.cc:163
 msgid "Port:"
 msgstr "Portua:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:246
+#: src/cdaudio/cdaudio-ng.cc:228
 msgid "Failed to initialize cdio subsystem."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:281
+#: src/cdaudio/cdaudio-ng.cc:260
 #, c-format
 msgid "Invalid URI %s."
-msgstr ""
+msgstr "URI baliogabea: %s"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:283
+#: src/cdaudio/cdaudio-ng.cc:262
 #, c-format
 msgid "Track %d not found."
-msgstr ""
+msgstr "%d pista ez da aurkitu."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:285
+#: src/cdaudio/cdaudio-ng.cc:264
 #, c-format
 msgid "Track %d is a data track."
-msgstr ""
+msgstr "%d pista datu-pista bat da."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:360
+#: src/cdaudio/cdaudio-ng.cc:339
 msgid "Error reading audio CD."
-msgstr ""
+msgstr "Errorea audio CDa irakurtzean."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:429
+#: src/cdaudio/cdaudio-ng.cc:410
 msgid "Audio CD"
 msgstr "Audio CDa"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:460 src/cdaudio-ng/cdaudio-ng.cc:469
+#: src/cdaudio/cdaudio-ng.cc:446 src/cdaudio/cdaudio-ng.cc:455
 #, c-format
 msgid "Failed to open CD device %s."
-msgstr ""
+msgstr "Errorea %s CDa irekitzean."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:472
+#: src/cdaudio/cdaudio-ng.cc:458
 msgid "No audio capable CD drive found."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:497
+#: src/cdaudio/cdaudio-ng.cc:481
+msgid "Drive is empty."
+msgstr "Unitatea hutsik dago"
+
+#: src/cdaudio/cdaudio-ng.cc:483
+msgid "Unsupported disk type."
+msgstr "Onartu gabeko disko mota."
+
+#: src/cdaudio/cdaudio-ng.cc:507
 msgid "Failed to finish initializing opened CD drive."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:510
+#: src/cdaudio/cdaudio-ng.cc:520
 msgid "Failed to retrieve first/last track number."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:531
+#: src/cdaudio/cdaudio-ng.cc:541
 #, c-format
 msgid "Cannot read start/end LSN for track %d."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:613
-msgid "Failed to create the cddb connection."
-msgstr ""
+#: src/cdaudio/cdaudio-ng.cc:624
+msgid "Failed to create the CDDB connection."
+msgstr "CDDB konexioa ezin izan da sortu"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:679
+#: src/cdaudio/cdaudio-ng.cc:690
 msgid "Failed to query the CDDB server"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:681
+#: src/cdaudio/cdaudio-ng.cc:692
 #, c-format
 msgid "Failed to query the CDDB server: %s"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:705
+#: src/cdaudio/cdaudio-ng.cc:716
 #, c-format
-msgid "Failed to read the cddb info: %s"
-msgstr ""
+msgid "Failed to read the CDDB info: %s"
+msgstr "CDDB informazioa ezin izan da irakurri: %s"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:765
-msgid "Drive is empty."
-msgstr "Unitatea hutsik dago"
-
-#: src/cdaudio-ng/cdaudio-ng.cc:767
-msgid "Unsupported disk type."
-msgstr "Onartu gabeko disko mota."
-
-#: src/cd-menu-items/cd-menu-items.cc:35
+#: src/cd-menu-items/cd-menu-items.cc:33
 msgid "Audio CD Menu Items"
 msgstr ""
 
-#: src/cd-menu-items/cd-menu-items.cc:47
-msgid "Play CD"
+#: src/cd-menu-items/cd-menu-items.cc:45
+msgid "Pla_y CD"
 msgstr "Jo CDa"
 
-#: src/cd-menu-items/cd-menu-items.cc:47
-msgid "Add CD"
-msgstr "Gehitu CDa"
+#: src/cd-menu-items/cd-menu-items.cc:45
+msgid "_Add CD"
+msgstr "_Gehitu CDa"
 
 #: src/compressor/compressor.cc:45
 msgid "Compression"
@@ -920,9 +816,16 @@
 msgid "Default song length:"
 msgstr "Abestiaren luzera lehenetsia:"
 
-#: src/console/plugin.cc:42 src/modplug/plugin_main.cc:59
+#: src/console/plugin.cc:41 src/crossfade/crossfade.cc:56
+#: src/crossfade/crossfade.cc:62 src/lirc/lirc.cc:395 src/notify/notify.cc:113
+#: src/sid/xs_config.cc:85 src/sid/xs_config.cc:94 src/sid/xs_config.cc:103
+#: src/vumeter-qt/vumeter_qt.cc:39
+msgid "seconds"
+msgstr "segundo"
+
+#: src/console/plugin.cc:42 src/modplug/plugin_main.cc:58
 msgid "Resampling"
-msgstr ""
+msgstr "Birlagintzea"
 
 #: src/console/plugin.cc:43
 msgid "Enable audio resampling"
@@ -930,7 +833,7 @@
 
 #: src/console/plugin.cc:49
 msgid "SPC"
-msgstr ""
+msgstr "SPC"
 
 #: src/console/plugin.cc:50
 msgid "Ignore length from SPC tags"
@@ -944,70 +847,80 @@
 msgid "Game Console Music Decoder"
 msgstr "Joko Kontsola Musika Deskodetzailea"
 
-#: src/coreaudio/coreaudio.cc:50
+#: src/coreaudio/coreaudio.cc:53
 msgid "CoreAudio output"
 msgstr ""
 
-#: src/coreaudio/coreaudio.cc:131
+#: src/coreaudio/coreaudio.cc:155
 msgid ""
 "CoreAudio Output Plugin for Audacious\n"
 "Copyright 2014 William Pitcock\n"
+"Copyright 2017,18 René J.V. Bertin\n"
+" (original code and code adapted from\n"
+" Apple examples, (C) Apple 2013)\n"
 "\n"
 "Based on SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
 msgstr ""
 
-#: src/coreaudio/coreaudio.cc:143
+#: src/coreaudio/coreaudio.cc:171
 msgid "Use exclusive mode"
+msgstr "Erabili modelo esklusiboa"
+
+#: src/coreaudio/coreaudio.cc:173
+msgid "Use bit perfect audio (adapt device sampling rate)"
 msgstr ""
 
-#: src/crossfade/crossfade.cc:44
+#: src/crossfade/crossfade.cc:47
 msgid ""
 "Crossfade Plugin for Audacious\n"
 "Copyright 2010-2014 John Lindgren"
 msgstr ""
 
-#: src/crossfade/crossfade.cc:48
+#: src/crossfade/crossfade.cc:51
 msgid "Crossfade"
 msgstr ""
 
-#: src/crossfade/crossfade.cc:49
+#: src/crossfade/crossfade.cc:52
 msgid "On automatic song change"
 msgstr ""
 
-#: src/crossfade/crossfade.cc:51 src/crossfade/crossfade.cc:57
+#: src/crossfade/crossfade.cc:54 src/crossfade/crossfade.cc:60
 msgid "Overlap:"
-msgstr ""
+msgstr "Teilakatzea:"
 
-#: src/crossfade/crossfade.cc:55
+#: src/crossfade/crossfade.cc:58
 msgid "On seek or manual song change"
 msgstr ""
 
-#: src/crossfade/crossfade.cc:61
-msgid "Tip"
+#: src/crossfade/crossfade.cc:64
+msgid "No fade in"
 msgstr ""
 
-#: src/crossfade/crossfade.cc:62
-msgid ""
-"For better crossfading, enable\n"
-"the Silence Removal effect."
+#: src/crossfade/crossfade.cc:66
+msgid "Use S-curve fade"
+msgstr ""
+
+#: src/crossfade/crossfade.cc:68
+msgid "S-curve steepness:"
+msgstr ""
+
+#: src/crossfade/crossfade.cc:70
+msgid "(higher is steeper)"
 msgstr ""
 
 #: src/crossfade/crossfade.cc:72
-msgid "Crossfade"
+msgid "Tip"
 msgstr ""
 
-#: src/crossfade/crossfade.cc:161
+#: src/crossfade/crossfade.cc:73
 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."
+"For better crossfading, enable\n"
+"the Silence Removal effect."
 msgstr ""
 
-#: src/crossfade/crossfade.cc:168
-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."
+#: src/crossfade/crossfade.cc:83
+msgid "Crossfade"
 msgstr ""
 
 #: src/crystalizer/crystalizer.cc:31
@@ -1022,62 +935,63 @@
 msgid "Crystalizer"
 msgstr ""
 
-#: src/cue/cue.cc:37
+#: src/cue/cue.cc:42
 msgid "Cue Sheet Plugin"
 msgstr ""
 
-#: src/delete-files/delete-files.cc:46 src/delete-files/delete-files.cc:146
+#: src/delete-files/delete-files.cc:53 src/delete-files/delete-files.cc:215
+#: src/delete-files/delete-files.cc:230
 msgid "Delete Files"
-msgstr ""
+msgstr "Fitxategiak Ezabatu"
+
+#: src/delete-files/delete-files.cc:120
+msgid "No files are selected."
+msgstr "Ez da fitxategirik hautatu."
 
-#: src/delete-files/delete-files.cc:75
+#: src/delete-files/delete-files.cc:125
 #, c-format
-msgid "Error moving %s to trash: %s."
-msgstr ""
+msgid "Do you want to move %s to the trash?"
+msgstr "%s zakarrontzira eraman nahi duzu?"
 
-#: src/delete-files/delete-files.cc:86
+#: src/delete-files/delete-files.cc:126
 #, c-format
-msgid "Error deleting %s: %s."
-msgstr ""
+msgid "Do you want to permanently delete %s?"
+msgstr "%s betiko ezabatu nahi duzu?"
 
-#: src/delete-files/delete-files.cc:117
+#: src/delete-files/delete-files.cc:133
 #, c-format
-msgid "Error deleting %s: not a local file."
-msgstr ""
+msgid "Do you want to move %d files to the trash?"
+msgstr "%d zakarrontzira eraman nahi duzu?"
 
 #: src/delete-files/delete-files.cc:134
-msgid "Do you want to move the selected files to the trash?"
-msgstr ""
-
-#: src/delete-files/delete-files.cc:135
-msgid "Move to Trash"
-msgstr ""
+#, c-format
+msgid "Do you want to permanently delete %d files?"
+msgstr "%d betiko ezabatu nahi duzu?"
 
-#: src/delete-files/delete-files.cc:140
-msgid "Do you want to permanently delete the selected files?"
-msgstr ""
+#: src/delete-files/delete-files.cc:146
+msgid "Move to trash"
+msgstr "Zaborretara eraman"
 
-#: src/delete-files/delete-files.cc:141 src/skins/preset-list.cc:411
-#: src/skins/preset-list.cc:427
+#: src/delete-files/delete-files.cc:146
 msgid "Delete"
 msgstr "Ezabatu"
 
-#: src/delete-files/delete-files.cc:145 src/skins/preset-browser.cc:56
-#: src/skins/preset-list.cc:307 src/skins/ui_playlist.cc:221
+#: src/delete-files/delete-files.cc:213 src/delete-files/delete-files.cc:235
+#: src/skins-qt/search-select.cc:102 src/skins/search-select.cc:78
 msgid "Cancel"
 msgstr "Utzi"
 
-#: src/delete-files/delete-files.cc:166
+#: src/delete-files/delete-files.cc:267
 msgid "Delete Selected Files"
-msgstr ""
+msgstr "Ezabatu hautatutako fitxategiak"
 
-#: src/delete-files/delete-files.cc:181
+#: src/delete-files/delete-files.cc:287
 msgid "Delete Method"
-msgstr ""
+msgstr "Ezabatu metodoa"
 
-#: src/delete-files/delete-files.cc:182
+#: src/delete-files/delete-files.cc:288
 msgid "Move to trash instead of deleting immediately"
-msgstr ""
+msgstr "Zakarrontzira eraman zuzenean ezabatu beharrean"
 
 #: src/echo_plugin/echo.cc:9
 msgid ""
@@ -1091,13 +1005,13 @@
 msgid "Echo"
 msgstr "Ekoa"
 
-#: src/echo_plugin/echo.cc:22 src/modplug/plugin_main.cc:73
-#: src/modplug/plugin_main.cc:83
+#: src/echo_plugin/echo.cc:22 src/modplug/plugin_main.cc:72
+#: src/modplug/plugin_main.cc:82
 msgid "Delay:"
-msgstr ""
+msgstr "Atzerapena: "
 
-#: src/echo_plugin/echo.cc:24 src/modplug/plugin_main.cc:73
-#: src/modplug/plugin_main.cc:83
+#: src/echo_plugin/echo.cc:24 src/modplug/plugin_main.cc:72
+#: src/modplug/plugin_main.cc:82 src/xsf/plugin.cc:445
 msgid "ms"
 msgstr "ms"
 
@@ -1105,7 +1019,7 @@
 msgid "Feedback:"
 msgstr "Berelikatzea:"
 
-#: src/echo_plugin/echo.cc:28 src/modplug/plugin_main.cc:87
+#: src/echo_plugin/echo.cc:28 src/modplug/plugin_main.cc:86
 msgid "Volume:"
 msgstr "Bolumena:"
 
@@ -1113,11 +1027,11 @@
 msgid "Echo"
 msgstr ""
 
-#: src/ffaudio/ffaudio-core.cc:41
+#: src/ffaudio/ffaudio-core.cc:50
 msgid "FFmpeg Plugin"
 msgstr "FFmpeg plugina"
 
-#: src/ffaudio/ffaudio-core.cc:571
+#: src/ffaudio/ffaudio-core.cc:649
 msgid ""
 "Multi-format audio decoding plugin for Audacious using\n"
 "FFmpeg multimedia framework (http://www.ffmpeg.org/)\n"
@@ -1127,235 +1041,308 @@
 "Matti Hämäläinen <ccr@tnsp.org>"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:45
+#: src/filewriter/filewriter.cc:48
 msgid "FileWriter Plugin"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:386
+#: src/filewriter/filewriter.cc:316
+#, c-format
+msgid ""
+"Error opening %s:\n"
+"%s"
+msgstr ""
+"Errorea %s kargatzean:\n"
+"%s"
+
+#: src/filewriter/filewriter.cc:358
+msgid ""
+"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/filewriter/filewriter.cc:385
 msgid "Output file format:"
 msgstr "Irteerako fitxategi-formatua:"
 
-#: src/filewriter/filewriter.cc:403
-msgid "Configure"
-msgstr "Konfiguratu"
-
-#: src/filewriter/filewriter.cc:413
+#: src/filewriter/filewriter.cc:389
 msgid "Save into original directory"
 msgstr "Gorde jatorrizko direktorioan"
 
-#: src/filewriter/filewriter.cc:417
-msgid "Save into custom directory"
-msgstr "Gorde direktorio pertsonalizatuan"
-
-#: src/filewriter/filewriter.cc:427
-msgid "Output file folder:"
-msgstr "Irteerako fitxategiaren karpeta:"
+#: src/filewriter/filewriter.cc:392
+msgid "Save into custom directory:"
+msgstr "Gorde direktorio pertsonalizatuan:"
+
+#: src/filewriter/filewriter.cc:400
+msgid "Generate file name from:"
+msgstr "Sortu fitxategiaren izena hemendik:"
+
+#: src/filewriter/filewriter.cc:401
+msgid "Original file name"
+msgstr "Jatorrizko fitxategi-izena"
+
+#: src/filewriter/filewriter.cc:404
+msgid "Original file name (no suffix)"
+msgstr "Jatorrizko fitxategi-izena (atzizki gabe)"
+
+#: src/filewriter/filewriter.cc:407
+msgid "Original file tag"
+msgstr "Jatorrizko fitxategi-etiketa"
+
+#: src/filewriter/filewriter.cc:411
+msgid "Prepend track number to file name"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:417 src/filewriter/filewriter.cc:449
+msgid "Auto"
+msgstr "Automatikoa"
+
+#: src/filewriter/filewriter.cc:418
+msgid "8000 Hz"
+msgstr "8000 Hz"
+
+#: src/filewriter/filewriter.cc:419
+msgid "11025 Hz"
+msgstr "11025 Hz"
+
+#: src/filewriter/filewriter.cc:420
+msgid "12000 Hz"
+msgstr "12000 Hz"
+
+#: src/filewriter/filewriter.cc:421
+msgid "16000 Hz"
+msgstr "16000 Hz"
+
+#: src/filewriter/filewriter.cc:422
+msgid "22050 Hz"
+msgstr "22050 Hz"
+
+#: src/filewriter/filewriter.cc:423
+msgid "24000 Hz"
+msgstr "24000 Hz"
+
+#: src/filewriter/filewriter.cc:424
+msgid "32000 Hz"
+msgstr "32000 Hz"
+
+#: src/filewriter/filewriter.cc:425 src/xsf/plugin.cc:430
+msgid "44100 Hz"
+msgstr "44100 Hz"
+
+#: src/filewriter/filewriter.cc:426 src/xsf/plugin.cc:431
+msgid "48000 Hz"
+msgstr "48000 Hz"
+
+#: src/filewriter/filewriter.cc:430
+msgid "8 kbit/s"
+msgstr ""
 
 #: src/filewriter/filewriter.cc:431
-msgid "Pick a folder"
-msgstr "Hautatu karpeta"
+msgid "16 kbit/s"
+msgstr ""
 
-#: src/filewriter/filewriter.cc:444
-msgid "Generate file name from:"
+#: src/filewriter/filewriter.cc:432
+msgid "32 kbit/s"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:448
-msgid "Original file tag"
+#: src/filewriter/filewriter.cc:433
+msgid "40 kbit/s"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:453
-msgid "Original file name"
+#: src/filewriter/filewriter.cc:434
+msgid "48 kbit/s"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:459
-msgid "Include original file name extension"
+#: src/filewriter/filewriter.cc:435
+msgid "56 kbit/s"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:468
-msgid "Prepend track number to file name"
+#: src/filewriter/filewriter.cc:436
+msgid "64 kbit/s"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:484
-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."
+#: src/filewriter/filewriter.cc:437
+msgid "80 kbit/s"
 msgstr ""
 
-#: src/filewriter/mp3.cc:40 src/filewriter/mp3.cc:717
-msgid "Auto"
-msgstr "Automatikoa"
+#: src/filewriter/filewriter.cc:438
+msgid "96 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:439
+msgid "112 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:440
+msgid "128 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:441
+msgid "160 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:442
+msgid "192 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:443
+msgid "224 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:444
+msgid "256 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:445
+msgid "320 kbit/s"
+msgstr ""
 
-#: src/filewriter/mp3.cc:40
+#: src/filewriter/filewriter.cc:450
 msgid "Joint Stereo"
 msgstr ""
 
-#: src/filewriter/mp3.cc:41 src/modplug/plugin_main.cc:58
-#: src/mpg123/mpg123.cc:248
+#: src/filewriter/filewriter.cc:451 src/modplug/plugin_main.cc:57
+#: src/mpg123/mpg123.cc:259
 msgid "Stereo"
 msgstr "Estereoa"
 
-#: src/filewriter/mp3.cc:41 src/modplug/plugin_main.cc:57
-#: src/mpg123/mpg123.cc:248
+#: src/filewriter/filewriter.cc:452 src/modplug/plugin_main.cc:56
+#: src/mpg123/mpg123.cc:260
 msgid "Mono"
 msgstr "Monoa"
 
-#: src/filewriter/mp3.cc:657
-msgid "MP3 Configuration"
-msgstr "MP3 konfigurazioa"
-
-#: src/filewriter/mp3.cc:658
-msgid "_OK"
+#: src/filewriter/filewriter.cc:456
+msgid "VBR"
 msgstr ""
 
-#: src/filewriter/mp3.cc:681
-msgid "Algorithm Quality:"
-msgstr "Algoritmoaren kalitatea:"
-
-#: src/filewriter/mp3.cc:706
-msgid "Output Sample Rate:"
+#: src/filewriter/filewriter.cc:457
+msgid "ABR"
 msgstr ""
 
-#: src/filewriter/mp3.cc:733
-msgid "(Hz)"
-msgstr "(Hz)"
-
-#: src/filewriter/mp3.cc:740
-msgid "Bitrate / Compression Ratio:"
-msgstr ""
+#: src/filewriter/filewriter.cc:478
+msgid "Algorithm quality:"
+msgstr "Algoritmoaren kalitatea:"
 
-#: src/filewriter/mp3.cc:764
-msgid "Bitrate (kbps):"
-msgstr "Bit-tasa (kbps):"
+#: src/filewriter/filewriter.cc:484
+msgid "Bitrate:"
+msgstr "Bit-tasa:"
 
-#: src/filewriter/mp3.cc:796
+#: src/filewriter/filewriter.cc:491
 msgid "Compression ratio:"
 msgstr "Konpresio-tasa:"
 
-#: src/filewriter/mp3.cc:820
-msgid "Audio Mode:"
+#: src/filewriter/filewriter.cc:498
+msgid "Audio mode:"
 msgstr "Audio modua:"
 
-#: src/filewriter/mp3.cc:845
-msgid "Miscellaneous:"
-msgstr ""
-
-#: src/filewriter/mp3.cc:856
+#: src/filewriter/filewriter.cc:501
 msgid "Enforce strict ISO compliance"
-msgstr ""
+msgstr "Derrigortu ISOa betetzen duela"
 
-#: src/filewriter/mp3.cc:867
+#: src/filewriter/filewriter.cc:503
 msgid "Error protection"
 msgstr "Erroreen aurkako babesa"
 
-#: src/filewriter/mp3.cc:879 src/filewriter/vorbis.cc:206
-msgid "Quality"
-msgstr "Kalitatea"
-
-#: src/filewriter/mp3.cc:888
+#: src/filewriter/filewriter.cc:508
 msgid "Enable VBR/ABR"
 msgstr "Gaitu VBR/ABR"
 
-#: src/filewriter/mp3.cc:898
+#: src/filewriter/filewriter.cc:510
 msgid "Type:"
 msgstr "Mota:"
 
-#: src/filewriter/mp3.cc:931
-msgid "VBR Options:"
-msgstr "VBR aukerak:"
-
-#: src/filewriter/mp3.cc:947
-msgid "Minimum bitrate (kbps):"
-msgstr "Gutxieneko bit-tasa (kbps):"
-
-#: src/filewriter/mp3.cc:973
-msgid "Maximum bitrate (kbps):"
-msgstr "Gehienezko bit-tasa (kbps):"
+#: src/filewriter/filewriter.cc:514
+msgid "Minimum bitrate:"
+msgstr "Gutxieneko bit-tasa:"
+
+#: src/filewriter/filewriter.cc:518
+msgid "Maximum bitrate:"
+msgstr "Gehienezko bit-tasa:"
+
+#: src/filewriter/filewriter.cc:522
+msgid "Average bitrate:"
+msgstr "Batez besteko bit-tasa:"
 
-#: src/filewriter/mp3.cc:995
-msgid "Strictly enforce minimum bitrate"
-msgstr "Derrigortu gutxieneko bit-tasa"
-
-#: src/filewriter/mp3.cc:1007
-msgid "ABR Options:"
-msgstr "ABR aukerak:"
-
-#: src/filewriter/mp3.cc:1017
-msgid "Average bitrate (kbps):"
-msgstr "Batez besteko bit-tasa (kbps):"
-
-#: src/filewriter/mp3.cc:1044
+#: src/filewriter/filewriter.cc:526
 msgid "VBR quality level:"
 msgstr "VBR kalitate-maila:"
 
-#: src/filewriter/mp3.cc:1063
+#: src/filewriter/filewriter.cc:530
+msgid "Strictly enforce minimum bitrate"
+msgstr "Derrigortu gutxieneko bit-tasa"
+
+#: src/filewriter/filewriter.cc:533
 msgid "Omit Xing VBR header"
 msgstr ""
 
-#: src/filewriter/mp3.cc:1076
-msgid "VBR/ABR"
-msgstr "VBR/ABR"
-
-#: src/filewriter/mp3.cc:1085
-msgid "Frame Parameters:"
+#: src/filewriter/filewriter.cc:539
+msgid "Frame Headers"
 msgstr ""
 
-#: src/filewriter/mp3.cc:1097
+#: src/filewriter/filewriter.cc:540
 msgid "Mark as copyright"
 msgstr "Markatu copyright gisa"
 
-#: src/filewriter/mp3.cc:1108
+#: src/filewriter/filewriter.cc:542
 msgid "Mark as original"
 msgstr "Markatu jatorrizko gisa"
 
-#: src/filewriter/mp3.cc:1120
-msgid "ID3 Parameters:"
+#: src/filewriter/filewriter.cc:544
+msgid "ID3 Tags"
 msgstr ""
 
-#: src/filewriter/mp3.cc:1131
+#: src/filewriter/filewriter.cc:545
 msgid "Force addition of version 2 tag"
 msgstr "Derrigortu v2 etiketa gehitzea"
 
-#: src/filewriter/mp3.cc:1141
+#: src/filewriter/filewriter.cc:547
 msgid "Only add v1 tag"
 msgstr "Gehitu v1 etiketa soilik"
 
-#: src/filewriter/mp3.cc:1148
+#: src/filewriter/filewriter.cc:549
 msgid "Only add v2 tag"
 msgstr "Gehitu v2 etiketa soilik"
 
-#: src/filewriter/mp3.cc:1169
+#: src/filewriter/filewriter.cc:554
+msgid "Quality"
+msgstr "Kalitatea"
+
+#: src/filewriter/filewriter.cc:555
+msgid "VBR/ABR"
+msgstr "VBR/ABR"
+
+#: src/filewriter/filewriter.cc:556
 msgid "Tags"
 msgstr "Etiketak"
 
-#: src/filewriter/vorbis.cc:196
-msgid "Vorbis Encoder Configuration"
-msgstr "Vorbis kodetzailearen konfigurazioa"
-
-#: src/filewriter/vorbis.cc:219
-msgid "Quality level (0 - 10):"
-msgstr "Kalitate maila (0 - 10):"
+#: src/filewriter/filewriter.cc:566
+msgid "Quality (0-1):"
+msgstr "Kalitatea (0-1):"
 
-#: src/flacng/flacng.h:35
+#: src/filewriter/filewriter.cc:573 src/skins-qt/skins_cfg.cc:307
+#: src/skins/skins_cfg.cc:289
+msgid "General"
+msgstr "Orokorra"
+
+#: src/flac/flacng.h:36
 msgid "FLAC Decoder"
 msgstr "FLAC Deskodetzailea"
 
-#: src/flacng/metadata.cc:351 src/wavpack/wavpack.cc:209
+#: src/flac/metadata.cc:296 src/wavpack/wavpack.cc:215
 msgid "lossless"
 msgstr ""
 
-#: src/flacng/plugin.cc:169
+#: src/flac/plugin.cc:214
 msgid ""
 "Original code by\n"
 "Ralf Ertzinger <ralf@skytale.net>\n"
@@ -1373,15 +1360,15 @@
 msgid "GIO Plugin"
 msgstr "GIO plugina"
 
-#: src/gio/gio.cc:153
+#: src/gio/gio.cc:152
 msgid "Read-and-append mode not supported"
 msgstr ""
 
-#: src/gio/gio.cc:166
+#: src/gio/gio.cc:165
 msgid "Invalid open mode"
-msgstr ""
+msgstr "Irekitzeko modua ez da baliozkoa"
 
-#: src/gl-spectrum/gl-spectrum.cc:51
+#: src/glspectrum/gl-spectrum.cc:52
 msgid ""
 "OpenGL Spectrum Analyzer for Audacious\n"
 "Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
@@ -1393,622 +1380,754 @@
 "License: GPLv2+"
 msgstr ""
 
-#: src/gl-spectrum/gl-spectrum.cc:62
+#: src/glspectrum/gl-spectrum.cc:63 src/qtglspectrum/gl-spectrum.cc:53
 msgid "OpenGL Spectrum Analyzer"
-msgstr ""
+msgstr "OpenGL Espektro Analizatzailea"
 
-#: src/gl-spectrum-qt/gl-spectrum.cc:41
-msgid ""
-"OpenGL Spectrum Analyzer for Audacious\n"
-"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
-"Copyright 2014 William Pitcock\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-qt/gl-spectrum.cc:53
-msgid "OpenGL Spectrum Analyzer (Qt)"
-msgstr ""
-
-#: src/gnomeshortcuts/gnomeshortcuts.cc:38
-msgid "GNOME Shortcuts"
-msgstr ""
-
-#: src/gnomeshortcuts/gnomeshortcuts.cc:54
-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/gtkui/columns.cc:35
-msgid "Entry number"
-msgstr "Sarera zenbakia"
-
-#: src/gtkui/columns.cc:36 src/playlist-manager/playlist-manager.cc:225
-#: src/qtui/playlist_model.cc:123
+#: src/gtkui/columns.cc:36 src/moonstone/playlist_model.cc:38
+#: src/qtui/playlist_model.cc:33
+msgid "Entry Number"
+msgstr "Sarrera zenbakia"
+
+#: src/gtkui/columns.cc:37 src/moonstone/playlist_model.cc:38
+#: src/moonstone/playlist_selection.cc:64
+#: src/playlist-manager/playlist-manager.cc:200
+#: src/playlist-manager-qt/playlist-manager-qt.cc:188
+#: src/qtui/playlist_model.cc:33 src/streamtuner/icecast-model.cc:120
+#: src/streamtuner/ihr-model.cc:159 src/streamtuner/shoutcast-model.cc:122
 msgid "Title"
 msgstr "Titulua"
 
-#: src/gtkui/columns.cc:37 src/qtui/playlist_model.cc:125
+#: src/gtkui/columns.cc:38 src/moonstone/playlist_model.cc:39
+#: src/qtui/playlist_model.cc:33
 msgid "Artist"
 msgstr "Artista"
 
-#: src/gtkui/columns.cc:38
+#: src/gtkui/columns.cc:39 src/moonstone/playlist_model.cc:39
+#: src/qtui/playlist_model.cc:33
 msgid "Year"
 msgstr "Urtea"
 
-#: src/gtkui/columns.cc:39 src/qtui/playlist_model.cc:127
+#: src/gtkui/columns.cc:40 src/moonstone/playlist_model.cc:39
+#: src/qtui/playlist_model.cc:34
 msgid "Album"
 msgstr "Diskoa"
 
-#: src/gtkui/columns.cc:40
-msgid "Album artist"
-msgstr ""
+#: src/gtkui/columns.cc:41 src/moonstone/playlist_model.cc:40
+#: src/qtui/playlist_model.cc:34
+msgid "Album Artist"
+msgstr "Albumeko artista"
 
-#: src/gtkui/columns.cc:41
+#: src/gtkui/columns.cc:42 src/moonstone/playlist_model.cc:40
+#: src/qtui/playlist_model.cc:34
 msgid "Track"
 msgstr "Pista"
 
-#: src/gtkui/columns.cc:42
+#: src/gtkui/columns.cc:43 src/moonstone/playlist_model.cc:40
+#: src/qtui/playlist_model.cc:34 src/streamtuner/icecast-model.cc:123
+#: src/streamtuner/shoutcast-model.cc:125
+#: src/streamtuner/shoutcast-model.cc:236
 msgid "Genre"
-msgstr ""
+msgstr "Generoa"
 
-#: src/gtkui/columns.cc:43
-msgid "Queue position"
-msgstr "Ilara posizioa"
+#: src/gtkui/columns.cc:44 src/moonstone/playlist_model.cc:41
+#: src/qtui/playlist_model.cc:35
+msgid "Queue Position"
+msgstr "Ilara Posizioa"
 
-#: src/gtkui/columns.cc:44
+#: src/gtkui/columns.cc:45 src/moonstone/playlist_model.cc:41
+#: src/qtui/playlist_model.cc:35
 msgid "Length"
 msgstr "Iraupena"
 
-#: src/gtkui/columns.cc:45
-msgid "File path"
+#: src/gtkui/columns.cc:46 src/moonstone/playlist_model.cc:41
+#: src/qtui/playlist_model.cc:35
+msgid "File Path"
 msgstr "Fitxategi bidea"
 
-#: src/gtkui/columns.cc:47
-msgid "Custom title"
-msgstr ""
+#: src/gtkui/columns.cc:47 src/moonstone/playlist_model.cc:42
+#: src/qtui/playlist_model.cc:35
+msgid "File Name"
+msgstr "Fitxategi izena"
 
-#: src/gtkui/columns.cc:48
+#: src/gtkui/columns.cc:48 src/moonstone/playlist_model.cc:42
+#: src/qtui/playlist_model.cc:36
+msgid "Custom Title"
+msgstr "Izenburu Pertsonalizatua"
+
+#: src/gtkui/columns.cc:49 src/moonstone/playlist_model.cc:42
+#: src/qtui/playlist_model.cc:36 src/streamtuner/icecast-model.cc:129
+#: src/streamtuner/shoutcast-model.cc:134
 msgid "Bitrate"
 msgstr "Bit-tasa:"
 
-#: src/gtkui/columns.cc:308
-msgid "Available columns"
+#: src/gtkui/columns.cc:50 src/moonstone/playlist_model.cc:43
+#: src/qtui/playlist_model.cc:36
+msgid "Comment"
+msgstr "Iruzkina"
+
+#: src/gtkui/columns.cc:51 src/qtui/playlist_model.cc:36
+msgid "Publisher"
 msgstr ""
 
-#: src/gtkui/columns.cc:334
-msgid "Displayed columns"
+#: src/gtkui/columns.cc:52 src/qtui/playlist_model.cc:37
+msgid "Catalog Number"
 msgstr ""
 
-#: src/gtkui/layout.cc:72 src/search-tool/search-tool.cc:40
-msgid "Search Tool"
+#: src/gtkui/columns.cc:53 src/moonstone/playlist_model.cc:43
+#: src/qtui/playlist_model.cc:37
+msgid "Disc"
 msgstr ""
 
-#: src/gtkui/layout.cc:167
+#: src/gtkui/columns.cc:325
+msgid "Available columns"
+msgstr "Zutabe erabilgarriak"
+
+#: src/gtkui/columns.cc:351
+msgid "Displayed columns"
+msgstr "Erakutsitako zutabeak"
+
+#: src/gtkui/layout.cc:74 src/search-tool-qt/search-tool-qt.cc:58
+#: src/search-tool/search-tool.cc:49
+msgid "Search Tool"
+msgstr "Tresna bilatu"
+
+#: src/gtkui/layout.cc:170
 msgid "Dock at Left"
 msgstr ""
 
-#: src/gtkui/layout.cc:167
+#: src/gtkui/layout.cc:170
 msgid "Dock at Right"
 msgstr ""
 
-#: src/gtkui/layout.cc:168
+#: src/gtkui/layout.cc:171
 msgid "Dock at Top"
 msgstr ""
 
-#: src/gtkui/layout.cc:168
+#: src/gtkui/layout.cc:171
 msgid "Dock at Bottom"
 msgstr ""
 
-#: src/gtkui/layout.cc:168
+#: src/gtkui/layout.cc:171
 msgid "Undock"
 msgstr ""
 
-#: src/gtkui/layout.cc:168 src/ladspa/plugin.cc:531
+#: src/gtkui/layout.cc:171 src/ladspa/plugin.cc:540
 msgid "Disable"
 msgstr "Desgaitu"
 
-#: src/gtkui/menus.cc:126 src/qtui/main_window_actions.cc:93
-#: src/statusicon/statusicon.cc:276
+#: src/gtkui/menus.cc:79 src/qtui/menus.cc:107
+#: src/statusicon-qt/statusicon.cc:115 src/statusicon/statusicon.cc:286
 msgid "_Open Files ..."
 msgstr "Ireki fitxategiak"
 
-#: src/gtkui/menus.cc:127
+#: src/gtkui/menus.cc:80 src/qtui/menus.cc:111
 msgid "Open _URL ..."
 msgstr "Ireki BKU ..."
 
-#: src/gtkui/menus.cc:128 src/qtui/main_window_actions.cc:95
+#: src/gtkui/menus.cc:81 src/qtui/menus.cc:113
 msgid "_Add Files ..."
-msgstr ""
+msgstr "_Gehitu fitxategiak..."
 
-#: src/gtkui/menus.cc:129
+#: src/gtkui/menus.cc:82 src/qtui/menus.cc:118
 msgid "Add U_RL ..."
-msgstr ""
+msgstr "Gehitu U_RL"
 
-#: src/gtkui/menus.cc:131
+#: src/gtkui/menus.cc:84 src/qtui/menus.cc:120
 msgid "Search _Library"
-msgstr ""
+msgstr "Bilatu _Liburutegian"
 
-#: src/gtkui/menus.cc:133 src/qtui/main_window_actions.cc:98
+#: src/gtkui/menus.cc:86 src/qtui/menus.cc:123
 msgid "A_bout ..."
 msgstr ""
 
-#: src/gtkui/menus.cc:134 src/qtui/main_window_actions.cc:99
+#: src/gtkui/menus.cc:87 src/qtui/menus.cc:125
 msgid "_Settings ..."
-msgstr ""
+msgstr "_Ezarpenak ..."
 
-#: src/gtkui/menus.cc:135 src/qtui/main_window_actions.cc:103
-#: src/statusicon/statusicon.cc:284
+#: src/gtkui/menus.cc:88 src/qtui/menus.cc:131
+#: src/statusicon-qt/statusicon.cc:117 src/statusicon/statusicon.cc:288
 msgid "_Quit"
 msgstr "I_rten"
 
-#: src/gtkui/menus.cc:139 src/gtkui/menus.cc:262
-#: src/qtui/main_window_actions.cc:107 src/search-tool/search-tool.cc:641
-#: src/statusicon/statusicon.cc:278
+#: src/gtkui/menus.cc:92 src/gtkui/menus.cc:226
+#: src/moonstone/playlist_tabs.cc:306 src/qtui/menus.cc:135
+#: src/qtui/playlist_tabs.cc:331 src/search-tool-qt/search-tool-qt.cc:499
+#: src/search-tool/search-tool.cc:339 src/statusicon-qt/statusicon.cc:109
+#: src/statusicon/statusicon.cc:280
 msgid "_Play"
 msgstr "Erreproduzitu"
 
-#: src/gtkui/menus.cc:140 src/qtui/main_window_actions.cc:108
-#: src/statusicon/statusicon.cc:279
+#: src/gtkui/menus.cc:93 src/qtui/menus.cc:137
+#: src/statusicon-qt/statusicon.cc:110 src/statusicon/statusicon.cc:281
 msgid "Paus_e"
 msgstr "Pausatu"
 
-#: src/gtkui/menus.cc:141 src/qtui/main_window_actions.cc:109
-#: src/statusicon/statusicon.cc:280
+#: src/gtkui/menus.cc:94 src/qtui/menus.cc:139
+#: src/statusicon-qt/statusicon.cc:111 src/statusicon/statusicon.cc:282
 msgid "_Stop"
 msgstr "Gelditu"
 
-#: src/gtkui/menus.cc:142 src/qtui/main_window_actions.cc:110
-#: src/statusicon/statusicon.cc:277
+#: src/gtkui/menus.cc:95 src/qtui/menus.cc:141
+#: src/statusicon-qt/statusicon.cc:112 src/statusicon/statusicon.cc:283
 msgid "Pre_vious"
 msgstr "Aurrekoa"
 
-#: src/gtkui/menus.cc:143 src/qtui/main_window_actions.cc:111
-#: src/statusicon/statusicon.cc:281
+#: src/gtkui/menus.cc:96 src/qtui/menus.cc:143
+#: src/statusicon-qt/statusicon.cc:113 src/statusicon/statusicon.cc:284
 msgid "_Next"
-msgstr ""
+msgstr "_Hurrengoa"
+
+#: src/gtkui/menus.cc:97 src/qtui/menus.cc:145 src/skins/menus.cc:114
+#: src/skins-qt/menus.cc:105
+msgid "Previous Album"
+msgstr "Aurreko diskoa"
+
+#: src/gtkui/menus.cc:98 src/qtui/menus.cc:146 src/skins/menus.cc:115
+#: src/skins-qt/menus.cc:106
+msgid "Next Album"
+msgstr "Hurrengo diskoa"
 
-#: src/gtkui/menus.cc:145 src/qtui/main_window_actions.cc:113
+#: src/gtkui/menus.cc:100 src/qtui/menus.cc:148
 msgid "_Repeat"
-msgstr ""
+msgstr "_Errepikatu"
 
-#: src/gtkui/menus.cc:146 src/qtui/main_window_actions.cc:114
+#: src/gtkui/menus.cc:101 src/qtui/menus.cc:150
 msgid "S_huffle"
 msgstr ""
 
-#: src/gtkui/menus.cc:147 src/qtui/main_window_actions.cc:115
+#: src/gtkui/menus.cc:102 src/qtui/menus.cc:152
+msgid "Shuffle by Albu_m"
+msgstr ""
+
+#: src/gtkui/menus.cc:103 src/qtui/menus.cc:155
 msgid "N_o Playlist Advance"
 msgstr ""
 
-#: src/gtkui/menus.cc:148 src/qtui/main_window_actions.cc:116
+#: src/gtkui/menus.cc:104 src/qtui/menus.cc:157
 msgid "Stop A_fter This Song"
 msgstr ""
 
-#: src/gtkui/menus.cc:150 src/gtkui/menus.cc:247
-#: src/qtui/main_window_actions.cc:118
+#: src/gtkui/menus.cc:106 src/gtkui/menus.cc:210 src/qtui/menus.cc:162
+#: src/qtui/menus.cc:294
 msgid "Song _Info ..."
-msgstr ""
+msgstr "Kantuaren _Informazioa ..."
 
-#: src/gtkui/menus.cc:151
+#: src/gtkui/menus.cc:107
 msgid "Jump to _Time ..."
-msgstr ""
+msgstr "Joan _Denborara ..."
 
-#: src/gtkui/menus.cc:152
+#: src/gtkui/menus.cc:108
 msgid "_Jump to Song ..."
-msgstr ""
+msgstr "_Joan abestira ..."
 
-#: src/gtkui/menus.cc:154
+#: src/gtkui/menus.cc:110 src/qtui/menus.cc:165
 msgid "Set Repeat Point _A"
 msgstr ""
 
-#: src/gtkui/menus.cc:155
+#: src/gtkui/menus.cc:111 src/qtui/menus.cc:167
 msgid "Set Repeat Point _B"
 msgstr ""
 
-#: src/gtkui/menus.cc:156
+#: src/gtkui/menus.cc:112 src/qtui/menus.cc:169
 msgid "_Clear Repeat Points"
 msgstr ""
 
-#: src/gtkui/menus.cc:160 src/gtkui/menus.cc:167 src/gtkui/menus.cc:183
-#: src/qtui/main_window_actions.cc:122 src/qtui/main_window_actions.cc:129
-#: src/qtui/main_window_actions.cc:145
+#: src/gtkui/menus.cc:116 src/gtkui/menus.cc:123 src/gtkui/menus.cc:141
+#: src/qtui/menus.cc:173 src/qtui/menus.cc:180 src/qtui/menus.cc:198
 msgid "By _Title"
-msgstr ""
+msgstr "_Izenburuaren arabera"
 
-#: src/gtkui/menus.cc:161 src/qtui/main_window_actions.cc:123
+#: src/gtkui/menus.cc:117 src/qtui/menus.cc:174
 msgid "By _File Name"
-msgstr ""
+msgstr "_Fitxategi Izenaren arabera"
 
-#: src/gtkui/menus.cc:162 src/qtui/main_window_actions.cc:124
+#: src/gtkui/menus.cc:118 src/qtui/menus.cc:175
 msgid "By File _Path"
-msgstr ""
+msgstr "Fitxategi _Bidearen arabera"
 
-#: src/gtkui/menus.cc:166 src/gtkui/menus.cc:182
-#: src/qtui/main_window_actions.cc:128 src/qtui/main_window_actions.cc:144
+#: src/gtkui/menus.cc:122 src/gtkui/menus.cc:140 src/qtui/menus.cc:179
+#: src/qtui/menus.cc:197
 msgid "By Track _Number"
 msgstr "Pista zenbakiaren arabera"
 
-#: src/gtkui/menus.cc:168 src/gtkui/menus.cc:184
-#: src/qtui/main_window_actions.cc:130 src/qtui/main_window_actions.cc:146
+#: src/gtkui/menus.cc:124 src/gtkui/menus.cc:142 src/qtui/menus.cc:181
+#: src/qtui/menus.cc:199
 msgid "By _Artist"
-msgstr ""
+msgstr "_Artistaren arabera"
 
-#: src/gtkui/menus.cc:169 src/gtkui/menus.cc:185
-#: src/qtui/main_window_actions.cc:131 src/qtui/main_window_actions.cc:147
+#: src/gtkui/menus.cc:125 src/gtkui/menus.cc:143 src/qtui/menus.cc:182
+#: src/qtui/menus.cc:200
 msgid "By Al_bum"
 msgstr ""
 
-#: src/gtkui/menus.cc:170 src/gtkui/menus.cc:186
-#: src/qtui/main_window_actions.cc:132 src/qtui/main_window_actions.cc:148
+#: src/gtkui/menus.cc:126 src/gtkui/menus.cc:144 src/qtui/menus.cc:183
+#: src/qtui/menus.cc:201
 msgid "By Albu_m Artist"
 msgstr ""
 
-#: src/gtkui/menus.cc:171 src/gtkui/menus.cc:187
-#: src/qtui/main_window_actions.cc:133 src/qtui/main_window_actions.cc:149
+#: src/gtkui/menus.cc:127 src/gtkui/menus.cc:145 src/qtui/menus.cc:184
+#: src/qtui/menus.cc:202
 msgid "By Release _Date"
 msgstr ""
 
-#: src/gtkui/menus.cc:172 src/gtkui/menus.cc:188
-#: src/qtui/main_window_actions.cc:134 src/qtui/main_window_actions.cc:150
+#: src/gtkui/menus.cc:128 src/gtkui/menus.cc:146 src/qtui/menus.cc:185
+#: src/qtui/menus.cc:203
 msgid "By _Genre"
-msgstr ""
+msgstr "_Generoaren arabera"
 
-#: src/gtkui/menus.cc:173 src/gtkui/menus.cc:189
-#: src/qtui/main_window_actions.cc:135 src/qtui/main_window_actions.cc:151
+#: src/gtkui/menus.cc:129 src/gtkui/menus.cc:147 src/qtui/menus.cc:186
+#: src/qtui/menus.cc:204
 msgid "By _Length"
-msgstr ""
+msgstr "_Luzeraren arabera"
 
-#: src/gtkui/menus.cc:174 src/gtkui/menus.cc:190
-#: src/qtui/main_window_actions.cc:136 src/qtui/main_window_actions.cc:152
+#: src/gtkui/menus.cc:130 src/gtkui/menus.cc:148 src/qtui/menus.cc:187
+#: src/qtui/menus.cc:205
 msgid "By _File Path"
-msgstr ""
+msgstr "_Fitxategi Bidearen arabera"
 
-#: src/gtkui/menus.cc:175 src/gtkui/menus.cc:191
-#: src/qtui/main_window_actions.cc:137 src/qtui/main_window_actions.cc:153
+#: src/gtkui/menus.cc:131 src/gtkui/menus.cc:149 src/qtui/menus.cc:188
+#: src/qtui/menus.cc:206
 msgid "By _Custom Title"
+msgstr "Izenburu _Pertsonalizatuen arabera"
+
+#: src/gtkui/menus.cc:132 src/gtkui/menus.cc:150 src/qtui/menus.cc:189
+#: src/qtui/menus.cc:207
+msgid "By C_omment"
+msgstr ""
+
+#: src/gtkui/menus.cc:133 src/gtkui/menus.cc:151 src/qtui/menus.cc:190
+#: src/qtui/menus.cc:208
+msgid "By D_isc Number"
 msgstr ""
 
-#: src/gtkui/menus.cc:177 src/gtkui/menus.cc:193
-#: src/qtui/main_window_actions.cc:139 src/qtui/main_window_actions.cc:155
+#: src/gtkui/menus.cc:135 src/gtkui/menus.cc:153 src/qtui/menus.cc:192
+#: src/qtui/menus.cc:210
 msgid "R_everse Order"
 msgstr ""
 
-#: src/gtkui/menus.cc:178 src/gtkui/menus.cc:194
-#: src/qtui/main_window_actions.cc:140 src/qtui/main_window_actions.cc:156
+#: src/gtkui/menus.cc:136 src/gtkui/menus.cc:154 src/qtui/menus.cc:194
+#: src/qtui/menus.cc:212
 msgid "_Random Order"
-msgstr ""
+msgstr "_Ausazko ordena"
 
-#: src/gtkui/menus.cc:198 src/qtui/main_window_actions.cc:160
+#: src/gtkui/menus.cc:158 src/qtui/menus.cc:216
 msgid "_Play/Resume"
 msgstr ""
 
-#: src/gtkui/menus.cc:199 src/gtkui/menus.cc:251
-#: src/qtui/main_window_actions.cc:161
+#: src/gtkui/menus.cc:159 src/qtui/menus.cc:218
 msgid "_Refresh"
-msgstr ""
+msgstr "_Freskatu"
 
-#: src/gtkui/menus.cc:201 src/qtui/main_window_actions.cc:163
+#: src/gtkui/menus.cc:161 src/qtui/menus.cc:222
 msgid "_Sort"
-msgstr ""
+msgstr "_Ordenatu"
 
-#: src/gtkui/menus.cc:202 src/qtui/main_window_actions.cc:164
+#: src/gtkui/menus.cc:162 src/qtui/menus.cc:223
 msgid "Sort Se_lected"
-msgstr ""
+msgstr "Ordenatu _Hautatutakoak"
 
-#: src/gtkui/menus.cc:203 src/qtui/main_window_actions.cc:165
+#: src/gtkui/menus.cc:163 src/qtui/menus.cc:225
 msgid "Remove _Duplicates"
-msgstr ""
+msgstr "Kendu _Bikoiztuak"
 
-#: src/gtkui/menus.cc:204 src/qtui/main_window_actions.cc:166
+#: src/gtkui/menus.cc:164 src/qtui/menus.cc:226
 msgid "Remove _Unavailable Files"
-msgstr ""
+msgstr "Ezabatu erabilgarri ez dauden fitxategiak"
 
-#: src/gtkui/menus.cc:206 src/playlist-manager/playlist-manager.cc:244
-#: src/qtui/main_window_actions.cc:168
+#: src/gtkui/menus.cc:166 src/playlist-manager/playlist-manager.cc:219
+#: src/playlist-manager-qt/playlist-manager-qt.cc:348 src/qtui/menus.cc:229
 msgid "_New"
-msgstr ""
+msgstr "_Berri"
 
-#: src/gtkui/menus.cc:207
+#: src/gtkui/menus.cc:167 src/qtui/menus.cc:230
 msgid "Ren_ame ..."
-msgstr ""
+msgstr "Izena _aldatu ..."
 
-#: src/gtkui/menus.cc:208 src/gtkui/menus.cc:264
-#: src/qtui/main_window_actions.cc:170
+#: src/gtkui/menus.cc:168 src/gtkui/menus.cc:228
+#: src/moonstone/playlist_tabs.cc:311 src/qtui/menus.cc:231
+#: src/qtui/playlist_tabs.cc:336
 msgid "Remo_ve"
-msgstr ""
+msgstr "Ezabatu"
 
-#: src/gtkui/menus.cc:210
+#: src/gtkui/menus.cc:170 src/qtui/menus.cc:233
 msgid "_Import ..."
-msgstr ""
+msgstr "_Inportatu ..."
 
-#: src/gtkui/menus.cc:211
+#: src/gtkui/menus.cc:171 src/qtui/menus.cc:234
 msgid "_Export ..."
-msgstr ""
+msgstr "_Esportatu ..."
 
-#: src/gtkui/menus.cc:213
+#: src/gtkui/menus.cc:173 src/qtui/menus.cc:237
 msgid "Playlist _Manager ..."
-msgstr ""
+msgstr "Erreprodukzio-zerrenda _Mudeatzailea ..."
 
-#: src/gtkui/menus.cc:214 src/qtui/main_window_actions.cc:176
+#: src/gtkui/menus.cc:174 src/qtui/menus.cc:239
 msgid "_Queue Manager ..."
 msgstr "_Ilara Kudeatzailea..."
 
-#: src/gtkui/menus.cc:218 src/qtui/main_window_actions.cc:180
+#: src/gtkui/menus.cc:178 src/qtui/menus.cc:243
 msgid "Volume _Up"
-msgstr ""
+msgstr "Bolumena _Igo"
 
-#: src/gtkui/menus.cc:219 src/qtui/main_window_actions.cc:181
+#: src/gtkui/menus.cc:179 src/qtui/menus.cc:245
 msgid "Volume _Down"
-msgstr ""
+msgstr "Bolumena _Jaitsi"
 
-#: src/gtkui/menus.cc:221 src/qtui/main_window_actions.cc:183
-msgid "_Equalizer"
+#: src/gtkui/menus.cc:181 src/qtui/menus.cc:249
+msgid "_Equalizer ..."
 msgstr ""
 
-#: src/gtkui/menus.cc:223 src/qtui/main_window_actions.cc:185
+#: src/gtkui/menus.cc:182 src/qtui/menus.cc:251
 msgid "E_ffects ..."
+msgstr "E_fektuak"
+
+#: src/gtkui/menus.cc:184
+msgid "_Record Stream"
 msgstr ""
 
-#: src/gtkui/menus.cc:227
+#: src/gtkui/menus.cc:185
+msgid "Audio _Settings ..."
+msgstr "Audio-ezarpenak ..."
+
+#: src/gtkui/menus.cc:189 src/qtui/menus.cc:260
 msgid "Show _Menu Bar"
 msgstr ""
 
-#: src/gtkui/menus.cc:228
+#: src/gtkui/menus.cc:190 src/qtui/menus.cc:262
 msgid "Show I_nfo Bar"
 msgstr ""
 
-#: src/gtkui/menus.cc:229
+#: src/gtkui/menus.cc:191 src/qtui/menus.cc:264
+msgid "Show Info Bar _Album Art"
+msgstr ""
+
+#: src/gtkui/menus.cc:192 src/qtui/menus.cc:266
 msgid "Show Info Bar Vis_ualization"
 msgstr ""
 
-#: src/gtkui/menus.cc:230
+#: src/gtkui/menus.cc:193 src/qtui/menus.cc:268
 msgid "Show _Status Bar"
 msgstr ""
 
-#: src/gtkui/menus.cc:232
+#: src/gtkui/menus.cc:195 src/qtui/menus.cc:272
 msgid "Show _Remaining Time"
-msgstr ""
+msgstr "Gelditzen den denbora erakutsi"
 
-#: src/gtkui/menus.cc:234
+#: src/gtkui/menus.cc:197 src/qtui/menus.cc:276 src/skins/menus.cc:157
+#: src/skins-qt/menus.cc:152
 msgid "_Visualizations ..."
 msgstr ""
 
-#: src/gtkui/menus.cc:238 src/qtui/main_window_actions.cc:189
+#: src/gtkui/menus.cc:201 src/qtui/menus.cc:280
 msgid "_File"
-msgstr ""
+msgstr "_Fitxategi"
 
-#: src/gtkui/menus.cc:239 src/qtui/main_window_actions.cc:190
+#: src/gtkui/menus.cc:202 src/qtui/menus.cc:281
 msgid "_Playback"
 msgstr ""
 
-#: src/gtkui/menus.cc:240 src/qtui/main_window_actions.cc:191
+#: src/gtkui/menus.cc:203 src/qtui/menus.cc:282
 msgid "P_laylist"
 msgstr ""
 
-#: src/gtkui/menus.cc:241 src/gtkui/menus.cc:258
-#: src/qtui/main_window_actions.cc:192
+#: src/gtkui/menus.cc:204 src/gtkui/menus.cc:222 src/qtui/menus.cc:283
+#: src/qtui/menus.cc:312
 msgid "_Services"
-msgstr ""
+msgstr "_Zerbitzuak"
 
-#: src/gtkui/menus.cc:242 src/qtui/main_window_actions.cc:193
+#: src/gtkui/menus.cc:205 src/qtui/menus.cc:284
 msgid "_Output"
-msgstr ""
+msgstr "_Irteera"
 
-#: src/gtkui/menus.cc:243
+#: src/gtkui/menus.cc:206 src/qtui/menus.cc:285
 msgid "_View"
-msgstr ""
+msgstr "_Ikuspegi"
 
-#: src/gtkui/menus.cc:248
+#: src/gtkui/menus.cc:211 src/qtui/menus.cc:296
 msgid "_Queue/Unqueue"
 msgstr "_Ilararatu/Ilaratik kendu"
 
-#: src/gtkui/menus.cc:250
+#: src/gtkui/menus.cc:213 src/qtui/menus.cc:299
 msgid "_Open Containing Folder"
-msgstr ""
+msgstr "Barruko Karpeta _Ireki"
 
-#: src/gtkui/menus.cc:253
+#: src/gtkui/menus.cc:214 src/qtui/menus.cc:301
+msgid "_Refresh Selected"
+msgstr "Hautatutakoa _Egunertau"
+
+#: src/gtkui/menus.cc:216 src/qtui/menus.cc:304
 msgid "Cu_t"
-msgstr ""
+msgstr "Moztu"
 
-#: src/gtkui/menus.cc:254
+#: src/gtkui/menus.cc:217 src/qtui/menus.cc:305
 msgid "_Copy"
-msgstr ""
+msgstr "_Kopiatu"
 
-#: src/gtkui/menus.cc:255
+#: src/gtkui/menus.cc:218 src/qtui/menus.cc:306
 msgid "_Paste"
-msgstr ""
+msgstr "_Itsatsi"
 
-#: src/gtkui/menus.cc:256
+#: src/gtkui/menus.cc:219 src/qtui/menus.cc:307
+msgid "Paste at _End"
+msgstr "_Bukaeran itsatsi"
+
+#: src/gtkui/menus.cc:220 src/qtui/menus.cc:309
 msgid "Select _All"
-msgstr ""
+msgstr "_Dena hautatu"
 
-#: src/gtkui/menus.cc:263
+#: src/gtkui/menus.cc:227 src/moonstone/playlist_tabs.cc:309
+#: src/qtui/playlist_tabs.cc:334
 msgid "_Rename ..."
+msgstr "_Izena aldatu ..."
+
+#: src/gtkui/settings.cc:35 src/qtui/settings.cc:59
+msgid "Always"
+msgstr "Beti"
+
+#: src/gtkui/settings.cc:36 src/qtui/settings.cc:60
+msgid "Auto-hide"
 msgstr ""
 
-#: src/gtkui/settings.cc:35
+#: src/gtkui/settings.cc:37 src/qtui/settings.cc:61
+msgid "Never"
+msgstr "Inoiz ez"
+
+#: src/gtkui/settings.cc:41 src/qtui/settings.cc:64
 msgid "Playlist Tabs"
 msgstr ""
 
-#: src/gtkui/settings.cc:36
-msgid "Always show tabs"
+#: src/gtkui/settings.cc:42 src/qtui/settings.cc:65
+msgid "Show playlist tabs:"
 msgstr ""
 
-#: src/gtkui/settings.cc:38
+#: src/gtkui/settings.cc:45 src/qtui/settings.cc:69
 msgid "Show entry counts"
-msgstr ""
+msgstr "Erakutsi sarrera-zenbaketak"
 
-#: src/gtkui/settings.cc:40
+#: src/gtkui/settings.cc:47 src/qtui/settings.cc:72
 msgid "Show close buttons"
-msgstr ""
+msgstr "Ixteko botoiak erakutsi."
 
-#: src/gtkui/settings.cc:42
+#: src/gtkui/settings.cc:49 src/qtui/settings.cc:75
 msgid "Playlist Columns"
-msgstr ""
+msgstr "Zutabeen erreprodukzio-zerrenda"
 
-#: src/gtkui/settings.cc:44
+#: src/gtkui/settings.cc:51 src/qtui/settings.cc:77
 msgid "Show column headers"
-msgstr ""
+msgstr "Erakutsi zutabe-goiburuak"
 
-#: src/gtkui/settings.cc:46 src/modplug/plugin_main.cc:106
-#: src/skins/skins_cfg.cc:263
-msgid "Miscellaneous"
+#: src/gtkui/settings.cc:53 src/qtui/settings.cc:82
+msgid "Make column headers clickable for sorting"
 msgstr ""
 
-#: src/gtkui/settings.cc:47
-msgid "Arrow keys seek by:"
+#: src/gtkui/settings.cc:56
+msgid "Use symbolic icons in toolbar"
 msgstr ""
 
-#: src/gtkui/settings.cc:50
+#: src/gtkui/settings.cc:58 src/qtui/settings.cc:86
 msgid "Scroll on song change"
 msgstr ""
 
-#: src/gtkui/ui_gtk.cc:71
+#: src/gtkui/ui_gtk.cc:82
 msgid "GTK Interface"
 msgstr "GTK Interfazea"
 
-#: src/gtkui/ui_gtk.cc:222 src/skins/ui_main.cc:232
+#: src/gtkui/ui_gtk.cc:219 src/skins/main.cc:228 src/skins-qt/main.cc:231
 #, c-format
 msgid "%s - Audacious"
 msgstr "%s - Audacious"
 
-#: src/gtkui/ui_gtk.cc:225 src/qtui/main_window.cc:186
+#: src/gtkui/ui_gtk.cc:221 src/moonstone/main_window.cc:184
+#: src/qtui/main_window.cc:385
 msgid "Buffering ..."
-msgstr ""
+msgstr "Bufferreratzen ..."
 
-#: src/gtkui/ui_gtk.cc:228 src/skins/ui_main.cc:234 src/skins/ui_main.cc:1164
+#: src/gtkui/ui_gtk.cc:224 src/pipewire/pipewire.cc:402 src/skins/main.cc:230
+#: src/skins-qt/main.cc:233
 msgid "Audacious"
 msgstr "Audacious"
 
-#: src/gtkui/ui_statusbar.cc:63 src/qtui/status_bar.cc:67
+#: src/gtkui/ui_gtk.cc:487 src/gtkui/ui_gtk.cc:518 src/gtkui/ui_gtk.cc:882
+#: src/hotkey/gui.cc:72 src/moonstone/main_window.cc:67
+#: src/moonstone/main_window.cc:145 src/moonstone/main_window.cc:146
+#: src/notify/osd.cc:85 src/qthotkey/gui.cc:67 src/qtui/main_window.cc:154
+#: src/qtui/main_window.cc:347 src/qtui/main_window.cc:348
+#: src/skins/menus.cc:109 src/skins-qt/menus.cc:100
+msgid "Play"
+msgstr "Erreproduzitu"
+
+#: src/gtkui/ui_gtk.cc:487 src/moonstone/main_window.cc:151
+#: src/moonstone/main_window.cc:152 src/notify/osd.cc:82
+#: src/qtui/main_window.cc:353 src/qtui/main_window.cc:354
+#: src/skins/menus.cc:110 src/skins-qt/menus.cc:101
+msgid "Pause"
+msgstr "Pausatu"
+
+#: src/gtkui/ui_gtk.cc:868 src/moonstone/main_window.cc:57
+#: src/qtui/main_window.cc:145 src/skins/menus.cc:86 src/skins-qt/menus.cc:77
+msgid "Search Library"
+msgstr "Bilatu Liburutegian"
+
+#: src/gtkui/ui_gtk.cc:875 src/moonstone/main_window.cc:60
+#: src/qtui/main_window.cc:147
+msgid "Open Files"
+msgstr "Ireki fitxategiak"
+
+#: src/gtkui/ui_gtk.cc:876 src/moonstone/main_window.cc:62
+#: src/qtui/main_window.cc:149
+msgid "Add Files"
+msgstr "Gehitu fitxategiak"
+
+#: src/gtkui/ui_gtk.cc:881 src/moonstone/main_window.cc:65
+#: src/qtui/main_window.cc:152 src/skins/menus.cc:112 src/skins-qt/menus.cc:103
+msgid "Previous"
+msgstr "Aurrekoa"
+
+#: src/gtkui/ui_gtk.cc:883 src/hotkey/gui.cc:74 src/moonstone/main_window.cc:69
+#: src/qthotkey/gui.cc:69 src/qtui/main_window.cc:156 src/skins/menus.cc:111
+#: src/skins-qt/menus.cc:102
+msgid "Stop"
+msgstr "Gelditu"
+
+#: src/gtkui/ui_gtk.cc:884 src/moonstone/main_window.cc:76 src/notify/osd.cc:89
+#: src/qtui/main_window.cc:163 src/skins/menus.cc:113 src/skins-qt/menus.cc:104
+msgid "Next"
+msgstr "Hurrengoa"
+
+#: src/gtkui/ui_gtk.cc:886 src/moonstone/main_window.cc:79
+#: src/qtui/main_window.cc:166 src/qtui/menus.cc:254 src/skins/menus.cc:79
+#: src/skins-qt/menus.cc:69
+msgid "Record Stream"
+msgstr ""
+
+#: src/gtkui/ui_gtk.cc:919 src/moonstone/main_window.cc:86
+#: src/qtui/main_window.cc:173 src/skins/menus.cc:103 src/skins-qt/menus.cc:94
+msgid "Repeat"
+msgstr "Errepikatu"
+
+#: src/gtkui/ui_gtk.cc:922 src/moonstone/main_window.cc:89
+#: src/qtui/main_window.cc:176 src/skins/menus.cc:104 src/skins-qt/menus.cc:95
+msgid "Shuffle"
+msgstr "Ausazkoa"
+
+#: src/gtkui/ui_gtk.cc:1114 src/qtui/main_window.cc:123
+msgid "Menu"
+msgstr "Menua"
+
+#: src/gtkui/ui_statusbar.cc:64 src/qtui/status_bar.cc:155
 msgid "mono"
 msgstr "monoa"
 
-#: src/gtkui/ui_statusbar.cc:65 src/qtui/status_bar.cc:69
+#: src/gtkui/ui_statusbar.cc:66 src/qtui/status_bar.cc:157
 msgid "stereo"
 msgstr "estereoa"
 
-#: src/gtkui/ui_statusbar.cc:67 src/qtui/status_bar.cc:71
+#: src/gtkui/ui_statusbar.cc:68 src/qtui/status_bar.cc:160
 #, c-format
 msgid "%d channel"
 msgid_plural "%d channels"
 msgstr0 "kanal %d"
 msgstr1 "%d kanal"
 
-#: src/gtkui/ui_statusbar.cc:81 src/qtui/status_bar.cc:85
+#: src/gtkui/ui_statusbar.cc:76 src/qtui/status_bar.cc:168
 #, c-format
-msgid "%d kbps"
-msgstr "%d kbps"
+msgid "%d kHz"
+msgstr "%d kHz"
 
-#: src/gtkui/ui_statusbar.cc:107 src/skins/ui_main_evlisteners.cc:103
+#: src/gtkui/ui_statusbar.cc:82 src/qtui/status_bar.cc:174
+#, c-format
+msgid "%d kbit/s"
+msgstr ""
+
+#: src/gtkui/ui_statusbar.cc:108 src/skins/main.cc:478 src/skins-qt/main.cc:461
 msgid "Single mode."
 msgstr "Single modua."
 
-#: src/gtkui/ui_statusbar.cc:109 src/skins/ui_main_evlisteners.cc:105
+#: src/gtkui/ui_statusbar.cc:110 src/skins/main.cc:480 src/skins-qt/main.cc:463
 msgid "Playlist mode."
 msgstr "Erreprodukzio-zerrenda modua."
 
-#: src/gtkui/ui_statusbar.cc:117 src/skins/ui_main_evlisteners.cc:111
+#: src/gtkui/ui_statusbar.cc:118 src/skins/main.cc:486 src/skins-qt/main.cc:469
 msgid "Stopping after song."
 msgstr "Kantuaren ostean geldituko da."
 
-#: src/hotkey/gui.cc:71
+#: src/hotkey/gui.cc:71 src/qthotkey/gui.cc:66
 msgid "Previous track"
-msgstr ""
-
-#: src/hotkey/gui.cc:72 src/notify/osd.cc:69 src/qtui/main_window.cc:69
-#: src/qtui/main_window.cc:172 src/qtui/main_window.cc:173
-#: src/skins/menus.cc:87
-msgid "Play"
-msgstr "Erreproduzitu"
+msgstr "Aurreko pista"
 
-#: src/hotkey/gui.cc:73
+#: src/hotkey/gui.cc:73 src/qthotkey/gui.cc:68
 msgid "Pause/Resume"
 msgstr "Pausatu/jarraitu"
 
-#: src/hotkey/gui.cc:74 src/qtui/main_window.cc:70 src/skins/menus.cc:89
-msgid "Stop"
-msgstr "Gelditu"
-
-#: src/hotkey/gui.cc:75
+#: src/hotkey/gui.cc:75 src/qthotkey/gui.cc:70
 msgid "Next track"
-msgstr ""
+msgstr "Hurrengo pista"
 
-#: src/hotkey/gui.cc:76
-msgid "Forward 5 seconds"
-msgstr ""
+#: src/hotkey/gui.cc:76 src/qthotkey/gui.cc:71
+msgid "Step forward"
+msgstr "Pauso bat aurrera egin"
 
-#: src/hotkey/gui.cc:77
-msgid "Rewind 5 seconds"
-msgstr ""
+#: src/hotkey/gui.cc:77 src/qthotkey/gui.cc:72
+msgid "Step backward"
+msgstr "Pauso bat atzera egin"
 
-#: src/hotkey/gui.cc:78
+#: src/hotkey/gui.cc:78 src/qthotkey/gui.cc:73
 msgid "Mute"
 msgstr "Mututu"
 
-#: src/hotkey/gui.cc:79
+#: src/hotkey/gui.cc:79 src/qthotkey/gui.cc:74
 msgid "Volume up"
-msgstr ""
+msgstr "Bolumena igo"
 
-#: src/hotkey/gui.cc:80
+#: src/hotkey/gui.cc:80 src/qthotkey/gui.cc:75
 msgid "Volume down"
-msgstr ""
+msgstr "Bolumena jaitsi"
 
-#: src/hotkey/gui.cc:81
+#: src/hotkey/gui.cc:81 src/qthotkey/gui.cc:76
 msgid "Jump to file"
-msgstr ""
+msgstr "Joan fitxategira"
 
-#: src/hotkey/gui.cc:82
+#: src/hotkey/gui.cc:82 src/qthotkey/gui.cc:77
 msgid "Toggle player window(s)"
-msgstr ""
+msgstr "Txandakatu erreproduzitzailearen leihoa(k)"
 
-#: src/hotkey/gui.cc:83
+#: src/hotkey/gui.cc:83 src/qthotkey/gui.cc:78
 msgid "Show On-Screen-Display"
 msgstr "Erakutsi pantaila gaineko mezuak (OSD)"
 
-#: src/hotkey/gui.cc:84
+#: src/hotkey/gui.cc:84 src/qthotkey/gui.cc:79
 msgid "Toggle repeat"
-msgstr ""
+msgstr "Aldatu errepikapena"
 
-#: src/hotkey/gui.cc:85
+#: src/hotkey/gui.cc:85 src/qthotkey/gui.cc:80
 msgid "Toggle shuffle"
-msgstr ""
+msgstr "Aldatu Ausazkoa"
 
-#: src/hotkey/gui.cc:86
+#: src/hotkey/gui.cc:86 src/qthotkey/gui.cc:81
 msgid "Toggle stop after current"
 msgstr ""
 
-#: src/hotkey/gui.cc:87
+#: src/hotkey/gui.cc:87 src/qthotkey/gui.cc:82
 msgid "Raise player window(s)"
 msgstr ""
 
-#: src/hotkey/gui.cc:97
+#: src/hotkey/gui.cc:98 src/qthotkey/gui.cc:100
 msgid "(none)"
 msgstr "(bat ere ez)"
 
-#: src/hotkey/gui.cc:234
+#: src/hotkey/gui.cc:261
 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 modifiers.\n"
 "\n"
 "Do you want to continue?"
 msgstr ""
-"Saguaren botoi nagusia eraldatzailerik gabe lotzea ez da gomendatzen.\n"
-"\n"
-"Jarraitzea nahi duzu?"
 
-#: src/hotkey/gui.cc:236
+#: src/hotkey/gui.cc:264
 msgid "Binding mouse buttons"
 msgstr "Saguaren botoiak lotzea"
 
-#: src/hotkey/gui.cc:391
+#: src/hotkey/gui.cc:434
 msgid ""
 "Press a key combination inside a text field.\n"
 "You can also bind mouse buttons."
@@ -2016,34 +2135,34 @@
 "Sakatu tekla konbinazioa testu-eremuaren barruan.\n"
 "Saguaren botoiak ere lotu ditzakezu."
 
-#: src/hotkey/gui.cc:396
+#: src/hotkey/gui.cc:444 src/qthotkey/gui.cc:179
 msgid "Hotkeys:"
 msgstr "Laster-teklak"
 
-#: src/hotkey/gui.cc:413
+#: src/hotkey/gui.cc:457 src/qthotkey/gui.cc:181
 msgid "Action:"
 msgstr "Ekintza:"
 
-#: src/hotkey/gui.cc:420
+#: src/hotkey/gui.cc:461 src/qthotkey/gui.cc:182
 msgid "Key Binding:"
 msgstr "Tekla-konbinazioa:"
 
-#: src/hotkey/gui.cc:468
+#: src/hotkey/gui.cc:518 src/qthotkey/gui.cc:184
 msgid "_Add"
-msgstr ""
+msgstr "_Gehitu"
 
-#: src/hotkey/plugin.cc:61
+#: src/hotkey/plugin.cc:59 src/qthotkey/plugin.cc:78
 msgid "Global Hotkeys"
 msgstr ""
 
-#: src/hotkey/plugin.cc:79
+#: src/hotkey/plugin.cc:74
 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"
+"Contributors 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"
@@ -2051,51 +2170,80 @@
 " Jeremy Tan <nsx@nsx.homeip.net>"
 msgstr ""
 
-#: src/jack-ng/jack-ng.cc:49
+#: src/jack/jack-ng.cc:54
 msgid "JACK Output"
-msgstr ""
+msgstr "JACK Irteera"
 
-#: src/jack-ng/jack-ng.cc:114
+#: src/jack/jack-ng.cc:126
+msgid "Client name:"
+msgstr "Bezeroaren izena:"
+
+#: src/jack/jack-ng.cc:128
 msgid "Automatically connect to output ports"
+msgstr "Automatikoki konektatu irteerako ataketara"
+
+#: src/jack/jack-ng.cc:130
+msgid "Filter ports (regex, use any port if blank):"
 msgstr ""
 
-#: src/jack-ng/jack-ng.cc:155
+#: src/jack/jack-ng.cc:136
+msgid "Connect to physical ports only"
+msgstr "Ataka fisikoetara bakarrik konektatu"
+
+#: src/jack/jack-ng.cc:139
+msgid "Upmix to"
+msgstr ""
+
+#: src/jack/jack-ng.cc:141
+msgid "ports if input has fewer channels"
+msgstr ""
+
+#: src/jack/jack-ng.cc:143
+msgid "Ignore insufficient number of ports"
+msgstr ""
+
+#: src/jack/jack-ng.cc:181
+msgid "No JACK output ports were found. Please check settings."
+msgstr ""
+
+#: src/jack/jack-ng.cc:195
 #, c-format
 msgid "Only %d JACK output ports were found but %d are required."
 msgstr ""
+"Bakarrik %d JACK irteera-portu aurkitu dira baina %d beharrezkoak dira."
 
-#: src/jack-ng/jack-ng.cc:164
+#: src/jack/jack-ng.cc:210
 #, c-format
 msgid "Failed to connect to JACK port %s."
-msgstr ""
+msgstr "%s JACK portura ezin izan da konektatu."
 
-#: src/jack-ng/jack-ng.cc:184
+#: src/jack/jack-ng.cc:230
 msgid ""
 "JACK supports only floating-point audio. You must change the output bit "
 "depth to floating-point in Audacious settings."
 msgstr ""
 
-#: src/jack-ng/jack-ng.cc:197
+#: src/jack/jack-ng.cc:245
 msgid "Failed to connect to the JACK server; is it running?"
-msgstr ""
+msgstr "JACK zerbitzarira ezin izan da konektatu; piztuta dago?"
 
-#: src/jack-ng/jack-ng.cc:273
+#: src/jack/jack-ng.cc:321
 #, c-format
 msgid ""
 "The JACK server requires a sample rate of %d Hz, but Audacious is playing at "
 "%d Hz. Please use the Sample Rate Converter effect to correct the mismatch."
 msgstr ""
 
-#: src/ladspa/plugin.cc:414
+#: src/ladspa/plugin.cc:416
 #, c-format
 msgid "%s Settings"
 msgstr "%s Ezarpenak"
 
-#: src/ladspa/plugin.cc:478
+#: src/ladspa/plugin.cc:482
 msgid "Module paths:"
 msgstr "Modulo bideak:"
 
-#: src/ladspa/plugin.cc:483
+#: src/ladspa/plugin.cc:487
 msgid ""
 "Separate multiple paths with a colon.\n"
 "These paths are searched in addition to LADSPA_PATH.\n"
@@ -2105,25 +2253,25 @@
 "LADSPA_PATH bidean eta bide hauetan bilatuko da.\n"
 "Bide berria gehitu eta gero, sakatu Enter Plugin berriak bilatzeko."
 
-#: src/ladspa/plugin.cc:499
+#: src/ladspa/plugin.cc:508
 msgid "Available plugins:"
 msgstr "Plugin eskuragarriak:"
 
-#: src/ladspa/plugin.cc:512 src/modplug/plugin_main.cc:92
-#: src/modplug/plugin_main.cc:95 src/modplug/plugin_main.cc:98
-#: src/modplug/plugin_main.cc:101
+#: src/ladspa/plugin.cc:521 src/modplug/plugin_main.cc:91
+#: src/modplug/plugin_main.cc:94 src/modplug/plugin_main.cc:97
+#: src/modplug/plugin_main.cc:100
 msgid "Enable"
 msgstr "Gaitu"
 
-#: src/ladspa/plugin.cc:518
+#: src/ladspa/plugin.cc:527
 msgid "Enabled plugins:"
 msgstr "Gaitutako pluginak:"
 
-#: src/ladspa/plugin.cc:534
+#: src/ladspa/plugin.cc:543
 msgid "Settings"
 msgstr "Ezarpenak"
 
-#: src/ladspa/plugin.cc:551
+#: src/ladspa/plugin.cc:560
 msgid ""
 "LADSPA Host for Audacious\n"
 "Copyright 2011 John Lindgren"
@@ -2131,13 +2279,13 @@
 
 #: src/ladspa/plugin.h:78
 msgid "LADSPA Host"
-msgstr ""
+msgstr "LADSPA Ostalaria"
 
 #: src/lirc/lirc.cc:55
 msgid "LIRC Plugin"
 msgstr "LIRC plugina"
 
-#: src/lirc/lirc.cc:381
+#: src/lirc/lirc.cc:379
 msgid ""
 "A simple plugin to control Audacious using the LIRC remote control daemon\n"
 "\n"
@@ -2153,63 +2301,123 @@
 "For more information about LIRC, see http://lirc.org."
 msgstr ""
 
-#: src/lirc/lirc.cc:392
+#: src/lirc/lirc.cc:390
 msgid "Connection"
-msgstr ""
+msgstr " Konekxioa "
 
-#: src/lirc/lirc.cc:393
+#: src/lirc/lirc.cc:391
 msgid "Reconnect to LIRC server"
 msgstr "Berkonektatu LIRC zerbitzarira"
 
-#: src/lirc/lirc.cc:395
+#: src/lirc/lirc.cc:393
 msgid "Wait before reconnecting:"
 msgstr "Itxaron berkonektatu aurretik:"
 
-#: src/lyricwiki/lyricwiki.cc:41
-msgid "LyricWiki Plugin"
-msgstr "LyricWiki plugina"
-
-#: src/lyricwiki/lyricwiki.cc:131 src/lyricwiki-qt/lyricwiki.cc:136
-msgid "No lyrics available"
-msgstr ""
-
-#: src/lyricwiki/lyricwiki.cc:217 src/lyricwiki/lyricwiki.cc:226
-#: src/lyricwiki/lyricwiki.cc:243 src/lyricwiki/lyricwiki.cc:252
-#: src/lyricwiki/lyricwiki.cc:267 src/lyricwiki-qt/lyricwiki.cc:222
-#: src/lyricwiki-qt/lyricwiki.cc:231 src/lyricwiki-qt/lyricwiki.cc:248
-#: src/lyricwiki-qt/lyricwiki.cc:257 src/lyricwiki-qt/lyricwiki.cc:272
-msgid "Error"
-msgstr "Errorea"
-
-#: src/lyricwiki/lyricwiki.cc:218 src/lyricwiki/lyricwiki.cc:244
-#: src/lyricwiki-qt/lyricwiki.cc:223 src/lyricwiki-qt/lyricwiki.cc:249
+#: src/lyrics-common/chart_lyrics_provider.cc:93
+#: src/lyrics-common/chart_lyrics_provider.cc:150
+#: src/lyrics-common/lyrics_ovh_provider.cc:50
 #, c-format
 msgid "Unable to fetch %s"
-msgstr ""
+msgstr "%s ekartzea ezinezkoa da."
 
-#: src/lyricwiki/lyricwiki.cc:227 src/lyricwiki/lyricwiki.cc:253
-#: src/lyricwiki-qt/lyricwiki.cc:232 src/lyricwiki-qt/lyricwiki.cc:258
+#: src/lyrics-common/chart_lyrics_provider.cc:100
+#: src/lyrics-common/chart_lyrics_provider.cc:157
+#: src/lyrics-common/lyrics_ovh_provider.cc:57
 #, c-format
 msgid "Unable to parse %s"
 msgstr ""
 
-#: src/lyricwiki/lyricwiki.cc:259 src/lyricwiki-qt/lyricwiki.cc:264
+#: src/lyrics-common/chart_lyrics_provider.cc:121
+#: src/lyrics-common/chart_lyrics_provider.cc:194
+#: src/lyrics-common/lyrics_ovh_provider.cc:88
 msgid "Looking for lyrics ..."
+msgstr "Hitzak bilatzen..."
+
+#: src/lyrics-common/preferences.h:43
+msgid "Nowhere"
+msgstr "Inon ez"
+
+#: src/lyrics-common/preferences.h:49
+msgid "Artist is truncated at the start, Title -- at the end"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:50
+msgid "Chars to truncate on:"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:54
+msgid "Chars are ORed in RegExp, surrounded by whitespace"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:55
+msgid "Chars to split on:"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:56
+msgid "Further truncate those on chars"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:62
+msgid "General"
+msgstr " Orokorra "
+
+#: src/lyrics-common/preferences.h:63
+msgid "Split title into artist and title on chars"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:66
+msgid "Sources"
 msgstr ""
 
-#: src/lyricwiki/lyricwiki.cc:267 src/lyricwiki-qt/lyricwiki.cc:272
-msgid "Missing song metadata"
+#: src/lyrics-common/preferences.h:67
+msgid "Use embedded lyrics (from Lyrics tag)"
 msgstr ""
 
-#: src/lyricwiki/lyricwiki.cc:278 src/lyricwiki-qt/lyricwiki.cc:283
-msgid "Connecting to lyrics.wikia.com ..."
+#: src/lyrics-common/preferences.h:69
+msgid "Fetch lyrics from internet:"
 msgstr ""
 
-#: src/lyricwiki-qt/lyricwiki.cc:55
-msgid "LyricWiki Plugin (Qt)"
+#: src/lyrics-common/preferences.h:72
+msgid "Store fetched lyrics in local cache"
 msgstr ""
 
-#: src/m3u/m3u.cc:32
+#: src/lyrics-common/preferences.h:74
+msgid "Local Storage"
+msgstr " Biltegi lokala "
+
+#: src/lyrics-common/preferences.h:75
+msgid "Load lyric files (.lrc) from local storage"
+msgstr ""
+
+#: src/lyrics-common/utils.cc:54 src/ui-common/dialogs-qt.cc:63
+msgid "Error"
+msgstr "Errorea"
+
+#: src/lyrics-common/utils.cc:60
+msgid "Lyrics could not be found."
+msgstr "Ezin izan da letrarik aurkitu."
+
+#: src/lyrics-common/utils.cc:142
+msgid "Missing title and/or artist."
+msgstr "Titulua edo/eta artista falta da."
+
+#: src/lyrics-gtk/lyrics-gtk.cc:37 src/lyrics-qt/lyrics-qt.cc:50
+msgid "Lyrics"
+msgstr "Hitzak"
+
+#: src/lyrics-gtk/lyrics-gtk.cc:189 src/lyrics-qt/lyrics-qt.cc:171
+msgid "Edit Lyrics ..."
+msgstr ""
+
+#: src/lyrics-gtk/lyrics-gtk.cc:195 src/lyrics-qt/lyrics-qt.cc:178
+msgid "Save Locally"
+msgstr "Lokalean gorde"
+
+#: src/lyrics-gtk/lyrics-gtk.cc:201 src/lyrics-qt/lyrics-qt.cc:186
+msgid "Refresh"
+msgstr "Freskatu"
+
+#: src/m3u/m3u.cc:33
 msgid "M3U Playlists"
 msgstr "M3U Erreprodukzio-zerrendak"
 
@@ -2217,17 +2425,17 @@
 msgid "Tact Generator"
 msgstr ""
 
-#: src/metronom/metronom.cc:147
+#: src/metronom/metronom.cc:145
 #, c-format
 msgid "Tact generator: %d bpm"
 msgstr "Ukimen sortzailea: %d bpm"
 
-#: src/metronom/metronom.cc:149
+#: src/metronom/metronom.cc:147
 #, c-format
 msgid "Tact generator: %d bpm %d/%d"
 msgstr "Ukimen sortzailea: %d bpm %d/%d"
 
-#: src/metronom/metronom.cc:237
+#: src/metronom/metronom.cc:235
 msgid ""
 "A Tact Generator by Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
 "\n"
@@ -2236,21 +2444,21 @@
 "or tact://60*3/4 to play 60 bpm in 3/4 tacts"
 msgstr ""
 
-#: src/mixer/mixer.cc:38
+#: src/mixer/mixer.cc:43
 msgid "Channel Mixer"
-msgstr ""
+msgstr "Kanal-nahasgailua"
 
-#: src/mixer/mixer.cc:202
+#: src/mixer/mixer.cc:255
 msgid ""
 "Channel Mixer Plugin for Audacious\n"
 "Copyright 2011-2012 John Lindgren and Michał Lipski"
 msgstr ""
 
-#: src/mixer/mixer.cc:206
+#: src/mixer/mixer.cc:259
 msgid "Channel Mixer"
-msgstr ""
+msgstr "Kanal-nahasgailua"
 
-#: src/mixer/mixer.cc:207
+#: src/mixer/mixer.cc:260
 msgid "Output channels:"
 msgstr "Irteera kanalak:"
 
@@ -2260,170 +2468,178 @@
 
 #: src/mms/mms.cc:82
 msgid "Error connecting to MMS server"
-msgstr ""
+msgstr "Errorea MMS zerbitzarira konektatzean"
 
-#: src/modplug/modplugbmp.h:53
+#: src/modplug/modplugbmp.h:57
 msgid "ModPlug (Module Player)"
 msgstr ""
 
-#: src/modplug/plugin_main.cc:53
-msgid "Resolution"
-msgstr ""
-
-#: src/modplug/plugin_main.cc:54
-msgid "8-bit"
-msgstr ""
-
 #: src/modplug/plugin_main.cc:55
-msgid "16-bit"
-msgstr ""
-
-#: src/modplug/plugin_main.cc:56
 msgid "Channels"
-msgstr ""
+msgstr "Kanalak"
 
-#: src/modplug/plugin_main.cc:60
+#: src/modplug/plugin_main.cc:59
 msgid "Nearest (fastest)"
-msgstr ""
+msgstr "Hurbilena (azkarrena)"
 
-#: src/modplug/plugin_main.cc:61
+#: src/modplug/plugin_main.cc:60
 msgid "Linear (fast)"
 msgstr ""
 
-#: src/modplug/plugin_main.cc:62
+#: src/modplug/plugin_main.cc:61
 msgid "Spline (good)"
 msgstr ""
 
-#: src/modplug/plugin_main.cc:63
+#: src/modplug/plugin_main.cc:62
 msgid "Polyphase (best)"
 msgstr ""
 
-#: src/modplug/plugin_main.cc:64
+#: src/modplug/plugin_main.cc:63
 msgid "Sample rate"
-msgstr ""
+msgstr "Lagin-tasa"
 
-#: src/modplug/plugin_main.cc:65
+#: src/modplug/plugin_main.cc:64
 msgid "22 kHz"
-msgstr ""
+msgstr "22 kHz"
 
-#: src/modplug/plugin_main.cc:66
+#: src/modplug/plugin_main.cc:65
 msgid "44 kHz"
-msgstr ""
+msgstr "44 kHz"
 
-#: src/modplug/plugin_main.cc:67
+#: src/modplug/plugin_main.cc:66
 msgid "48 kHz"
-msgstr ""
+msgstr "48 kHz"
 
-#: src/modplug/plugin_main.cc:68
+#: src/modplug/plugin_main.cc:67
 msgid "96 kHz"
-msgstr ""
+msgstr "96 kHz"
 
-#: src/modplug/plugin_main.cc:72 src/modplug/plugin_main.cc:77
-#: src/modplug/plugin_main.cc:82
+#: src/modplug/plugin_main.cc:71 src/modplug/plugin_main.cc:76
+#: src/modplug/plugin_main.cc:81
 msgid "Level:"
-msgstr ""
+msgstr "Maila:"
 
-#: src/modplug/plugin_main.cc:78
+#: src/modplug/plugin_main.cc:77
 msgid "Cutoff:"
 msgstr ""
 
-#: src/modplug/plugin_main.cc:91
+#: src/modplug/plugin_main.cc:90
 msgid "Reverb"
 msgstr ""
 
-#: src/modplug/plugin_main.cc:94
+#: src/modplug/plugin_main.cc:93
 msgid "Bass Boost"
 msgstr ""
 
-#: src/modplug/plugin_main.cc:97
+#: src/modplug/plugin_main.cc:96
 msgid "Surround"
 msgstr ""
 
-#: src/modplug/plugin_main.cc:100
+#: src/modplug/plugin_main.cc:99
 msgid "Preamp"
 msgstr ""
 
-#: src/modplug/plugin_main.cc:107
+#: src/modplug/plugin_main.cc:106
 msgid "Oversample"
 msgstr ""
 
-#: src/modplug/plugin_main.cc:108
+#: src/modplug/plugin_main.cc:107
 msgid "Noise reduction"
-msgstr ""
+msgstr "Zarata kentzea"
 
-#: src/modplug/plugin_main.cc:109
+#: src/modplug/plugin_main.cc:108
 msgid "Play Amiga MODs"
 msgstr ""
 
-#: src/modplug/plugin_main.cc:110
+#: src/modplug/plugin_main.cc:109
 msgid "Repeat"
-msgstr ""
+msgstr "Errepikatu"
 
-#: src/modplug/plugin_main.cc:111
+#: src/modplug/plugin_main.cc:110
 msgid "Repeat count:"
 msgstr ""
 
-#: src/modplug/plugin_main.cc:112
+#: src/modplug/plugin_main.cc:111
 msgid "To repeat forever, set the repeat count to -1."
 msgstr ""
 
-#: src/modplug/plugin_main.cc:125 src/sid/xs_config.cc:106
+#: src/modplug/plugin_main.cc:124 src/sid/xs_config.cc:106
 msgid "These settings will take effect when Audacious is restarted."
 msgstr ""
 
+#: src/moonstone/main_window.cc:72 src/moonstone/main_window.cc:73
+#: src/qtui/main_window.cc:159 src/qtui/main_window.cc:160
+#: src/skins/menus.cc:107 src/skins-qt/menus.cc:98
+msgid "Stop After This Song"
+msgstr "Gelditu abesti hau eta gero"
+
+#: src/moonstone/moonstone.cc:39
+msgid "Moonstone"
+msgstr ""
+
+#: src/moonstone/playlist_header.cc:212 src/qtui/playlist_header.cc:258
+msgid "Reset to Defaults"
+msgstr "Balio lehenetsietara berrasieratu"
+
+#: src/moonstone/playlist_model.cc:38 src/qtui/playlist_header.cc:232
+msgid "Now Playing"
+msgstr "Orain erreproduzitzen"
+
+#: src/moonstone/playlist_selection.cc:66
+#: src/playlist-manager/playlist-manager.cc:201
+#: src/playlist-manager-qt/playlist-manager-qt.cc:190
+msgid "Entries"
+msgstr "Sarrerak"
+
 #: src/mpg123/mpg123.cc:54
 msgid "MPG123 Plugin"
 msgstr "MPG123 plugina"
 
-#: src/mpg123/mpg123.cc:83
-msgid "Advanced"
-msgstr ""
-
-#: src/mpg123/mpg123.cc:84
+#: src/mpg123/mpg123.cc:82
 msgid "Use accurate length calculation (slow)"
 msgstr ""
 
-#: src/mpg123/mpg123.cc:248
+#: src/mpg123/mpg123.cc:260
 msgid "Surround"
 msgstr "Surround"
 
-#: src/mpris2/plugin.cc:39
+#: src/mpris2/plugin.cc:40
 msgid "MPRIS 2 Server"
 msgstr ""
 
-#: src/neon/neon.cc:97
+#: src/neon/neon.cc:102
 msgid "Neon HTTP/HTTPS Plugin"
 msgstr "Neon HTTP/HTTPS plugina"
 
-#: src/neon/neon.cc:521
+#: src/neon/neon.cc:526
 msgid "Error parsing redirect"
 msgstr ""
 
-#: src/neon/neon.cc:535
+#: src/neon/neon.cc:540
 msgid "Unknown HTTP error"
-msgstr ""
+msgstr "HTTP errore ezezaguna"
 
-#: src/neon/neon.cc:569
+#: src/neon/neon.cc:614
 msgid "Error parsing URL"
 msgstr ""
 
-#: src/neon/neon.cc:632
+#: src/neon/neon.cc:687
 msgid "Too many redirects"
 msgstr ""
 
-#: src/notify/event.cc:64
+#: src/notify/event.cc:97
 msgid "Stopped"
 msgstr "Geldituta"
 
-#: src/notify/event.cc:64
+#: src/notify/event.cc:97
 msgid "Audacious is not playing."
 msgstr "Audacious ez da jotzen ari."
 
-#: src/notify/notify.cc:42
+#: src/notify/notify.cc:39
 msgid "Desktop Notifications"
 msgstr ""
 
-#: src/notify/notify.cc:60
+#: src/notify/notify.cc:57
 msgid ""
 "Desktop Notifications Plugin for Audacious\n"
 "Copyright (C) 2010 Maximilian Bogner\n"
@@ -2443,64 +2659,104 @@
 "this program. If not, see <http://www.gnu.org/licenses/>."
 msgstr ""
 
-#: src/notify/notify.cc:110
+#: src/notify/notify.cc:104
 msgid "Show playback controls"
 msgstr ""
 
-#: src/notify/notify.cc:112
+#: src/notify/notify.cc:106
 msgid "Always show notification"
-msgstr ""
+msgstr "Jakinarazpenak beti erakutsi"
 
-#: src/notify/notify.cc:114
+#: src/notify/notify.cc:108
 msgid "Include album name in notification"
 msgstr ""
 
-#: src/notify/osd.cc:58
+#: src/notify/notify.cc:110
+msgid "Custom notification duration:"
+msgstr ""
+
+#: src/notify/osd.cc:74
 msgid "Show"
+msgstr "Erakutsi"
+
+#: src/openmpt/mpt.cc:50
+msgid "OpenMPT (Module Player)"
 msgstr ""
 
-#: src/notify/osd.cc:66 src/qtui/main_window.cc:178
-#: src/qtui/main_window.cc:179 src/skins/menus.cc:88
-msgid "Pause"
-msgstr "Pausatu"
+#: src/openmpt/mpt.cc:132
+msgid ""
+"Module player based on libopenmpt\n"
+"\n"
+"Written by: Chris Spiegel <cspiegel@gmail.com>"
+msgstr ""
 
-#: src/notify/osd.cc:73 src/qtui/main_window.cc:72 src/skins/menus.cc:91
-msgid "Next"
-msgstr "Hurrengoa"
+#: src/openmpt/mpt.cc:151
+msgid "Stereo separation:"
+msgstr ""
 
-#: src/oss4/oss.h:93
-msgid "OSS4 Output"
+#: src/openmpt/mpt.cc:153
+msgid "% (0=mono, 100=default, 200=full)"
 msgstr ""
 
-#: src/oss4/oss.h:95
-msgid "OSS3 Output"
+#: src/openmpt/mpt.cc:157
+msgid "Interpolation:"
+msgstr "Interpolazioa:"
+
+#: src/openmpt/mptwrap.h:51 src/soxr/sox-resampler.cc:189 src/xsf/plugin.cc:437
+msgid "Linear"
+msgstr ""
+
+#: src/openmpt/mptwrap.h:52
+msgid "Cubic"
+msgstr "Kubikoa"
+
+#: src/openmpt/mptwrap.h:53
+msgid "Windowed sinc"
+msgstr ""
+
+#: src/opus/opus.cc:39
+msgid "Opus Decoder"
 msgstr ""
 
+#: src/opus/opus.cc:336
+msgid ""
+"Opus Decoder Plugin for Audacious\n"
+"Copyright 2022 Thomas Lange"
+msgstr ""
+
+#: src/oss4/oss.h:70
+msgid "OSS4 Output"
+msgstr "OSS4 Irteera"
+
+#: src/oss4/oss.h:72
+msgid "OSS3 Output"
+msgstr "OSS3 Irteera"
+
 #: src/oss4/plugin.cc:35
 msgid "Default device"
-msgstr ""
+msgstr "Lehenetsitako gailua"
 
-#: src/oss4/plugin.cc:77
+#: src/oss4/plugin.cc:78
 msgid "Audio device:"
 msgstr "Soinu-gailua:"
 
-#: src/oss4/plugin.cc:80
+#: src/oss4/plugin.cc:81
 msgid "Use alternate device:"
 msgstr "Erabili bestelako gailua:"
 
-#: src/oss4/plugin.cc:84
+#: src/oss4/plugin.cc:85
 msgid "Save volume between sessions."
-msgstr ""
+msgstr "Sesioen artean bolumena gorde."
 
-#: src/oss4/plugin.cc:86
+#: src/oss4/plugin.cc:87
 msgid "Enable format conversions made by the OSS software."
 msgstr ""
 
-#: src/oss4/plugin.cc:88
+#: src/oss4/plugin.cc:89
 msgid "Enable exclusive mode to prevent virtual mixing."
 msgstr ""
 
-#: src/oss4/plugin.cc:100
+#: src/oss4/plugin.cc:101
 msgid ""
 "OSS4 Output Plugin for Audacious\n"
 "Copyright 2010-2012 Michał Lipski\n"
@@ -2509,59 +2765,90 @@
 "Lindgren and of course the authors of the previous OSS plugin."
 msgstr ""
 
-#: src/playlist-manager/playlist-manager.cc:37
-msgid "Playlist Manager"
+#: src/pipewire/pipewire.cc:44
+msgid "PipeWire Output"
 msgstr ""
 
-#: src/playlist-manager/playlist-manager.cc:226
-msgid "Entries"
+#: src/pipewire/pipewire.cc:118
+msgid ""
+"PipeWire Output Plugin for Audacious\n"
+"Copyright 2022 Thomas Lange\n"
+"\n"
+"Based on the PipeWire Output Plugin for Qmmp\n"
+"Copyright 2021 Ilya Kotov"
 msgstr ""
 
-#: src/playlist-manager/playlist-manager.cc:245
+#: src/pipewire/pipewire.cc:408 src/skins/menus.cc:88 src/skins-qt/menus.cc:79
+msgid "Playback"
+msgstr "Erreprodukzioa"
+
+#: src/playlist-manager/playlist-manager.cc:38
+#: src/playlist-manager-qt/playlist-manager-qt.cc:42
+msgid "Playlist Manager"
+msgstr "Erreprodukzio-zerrenda kudeatzailea"
+
+#: src/playlist-manager/playlist-manager.cc:221
+#: src/playlist-manager-qt/playlist-manager-qt.cc:356
 msgid "_Remove"
-msgstr ""
+msgstr "_Ezabatu"
 
-#: src/playlist-manager/playlist-manager.cc:246
+#: src/playlist-manager/playlist-manager.cc:222
+#: src/playlist-manager-qt/playlist-manager-qt.cc:351
 msgid "Ren_ame"
-msgstr ""
+msgstr "Izena _aldatu"
 
 #: src/pls/pls.cc:35
 msgid "PLS Playlists"
 msgstr ""
 
-#: src/psf/plugin.cc:45
+#: src/psf/plugin.cc:53
 msgid "OpenPSF PSF1/PSF2 Decoder"
 msgstr "OpenPSF PSF1/PSF2 Deskodetzailea"
 
-#: src/pulse_audio/pulse_audio.cc:38
+#: src/psf/plugin.cc:270
+msgid "OpenPSF Configuration"
+msgstr ""
+
+#: src/psf/plugin.cc:271 src/xsf/plugin.cc:444
+msgid "Ignore length from file"
+msgstr ""
+
+#: src/pulse/pulse_audio.cc:42
 msgid "PulseAudio Output"
 msgstr ""
 
-#: src/pulse_audio/pulse_audio.cc:611
+#: src/pulse/pulse_audio.cc:84
+msgid "Context name:"
+msgstr "Testuinguruaren izena:"
+
+#: src/pulse/pulse_audio.cc:86
+msgid "Stream name:"
+msgstr ""
+
+#: src/pulse/pulse_audio.cc:596
 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."
+"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/qtaudio/qtaudio.cc:49
+#: src/qtaudio/qtaudio.cc:53
 msgid "QtMultimedia Output"
 msgstr ""
 
-#: src/qtaudio/qtaudio.cc:77
+#: src/qtaudio/qtaudio.cc:84
 msgid ""
 "QtMultimedia Audio Output Plugin for Audacious\n"
 "Copyright 2014 William Pitcock\n"
@@ -2570,50 +2857,87 @@
 "Copyright 2010 John Lindgren"
 msgstr ""
 
-#: src/qtui/dialog_windows.cc:31
-msgid "Working ..."
+#: src/qtglspectrum/gl-spectrum.cc:41
+msgid ""
+"OpenGL Spectrum Analyzer for Audacious\n"
+"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
+"Copyright 2014, 2020 Ariadne Conill\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/qtui/filter_input.cc:44 src/skins/ui_playlist.cc:221
-msgid "Search"
+#: src/qthotkey/gui.cc:177
+msgid "Press a key combination inside a text field."
+msgstr "Sakatu tekla konbinazioa testu-eremuaren barruan"
+
+#: src/qthotkey/plugin.cc:105
+msgid ""
+"Global Hotkey Plugin\n"
+"Control the player with global key combinations or multimedia keys.\n"
+"\n"
+"Copyright (C) 2020 i.Dark_Templar <darktemplar@dark-templar-archives.net>\n"
+"Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n"
+"\n"
+"Contributors 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/qtui/main_window_actions.cc:94
+#: src/qtui/menus.cc:109
 msgid "_Open Folder ..."
-msgstr ""
+msgstr "Karpeta _Ireki ..."
 
-#: src/qtui/main_window_actions.cc:96
+#: src/qtui/menus.cc:115
 msgid "_Add Folder ..."
-msgstr ""
+msgstr "Karpeta _Gehitu ..."
 
-#: src/qtui/main_window_actions.cc:101
+#: src/qtui/menus.cc:128
 msgid "_Log Inspector ..."
 msgstr ""
 
-#: src/qtui/main_window.cc:64
-msgid "Open Files"
+#: src/qtui/menus.cc:220
+msgid "_Find ..."
+msgstr "_Bilatu ..."
+
+#: src/qtui/menus.cc:256 src/skins/menus.cc:80 src/skins-qt/menus.cc:70
+msgid "Audio Settings ..."
 msgstr ""
 
-#: src/qtui/main_window.cc:66
-msgid "Add Files"
+#: src/qtui/playlist_model.cc:188
+msgid "Q#"
 msgstr ""
 
-#: src/qtui/main_window.cc:71 src/skins/menus.cc:90
-msgid "Previous"
-msgstr "Aurrekoa"
+#: src/qtui/playlist_model.cc:190
+msgid "T#"
+msgstr ""
 
-#: src/qtui/main_window.cc:77 src/skins/menus.cc:82
-msgid "Repeat"
-msgstr "Errepikatu"
+#: src/qtui/playlist_model.cc:192
+msgid "C#"
+msgstr ""
 
-#: src/qtui/main_window.cc:79 src/skins/menus.cc:83
-msgid "Shuffle"
-msgstr "Ausazkoa"
+#: src/qtui/playlist_model.cc:194
+msgid "D#"
+msgstr ""
 
-#: src/qtui/qtui.cc:42
+#: src/qtui/qtui.cc:40
 msgid "Qt Interface"
 msgstr ""
 
+#: src/qtui/search_bar.cc:46
+msgid "Search playlist"
+msgstr "Erreprodukzio-zerrenda bilatu"
+
+#: src/qtui/settings.cc:79
+msgid "Use bold font for column headers"
+msgstr ""
+
 #: src/resample/resample.cc:43
 msgid "Sample Rate Converter"
 msgstr ""
@@ -2630,7 +2954,7 @@
 
 #: src/resample/resample.cc:188
 msgid "Linear interpolation"
-msgstr ""
+msgstr "Interpolazio lineal"
 
 #: src/resample/resample.cc:189
 msgid "Fast sinc interpolation"
@@ -2650,11 +2974,11 @@
 
 #: src/resample/resample.cc:196
 msgid "Method:"
-msgstr ""
+msgstr "Metodoa:"
 
-#: src/resample/resample.cc:199 src/sox-resampler/sox-resampler.cc:161
+#: src/resample/resample.cc:199 src/soxr/sox-resampler.cc:203
 msgid "Rate:"
-msgstr ""
+msgstr "Tasa:"
 
 #: src/resample/resample.cc:202
 msgid "Rate Mappings"
@@ -2666,203 +2990,194 @@
 
 #: src/resample/resample.cc:205
 msgid "8 kHz:"
-msgstr ""
+msgstr "8 kHz:"
 
 #: src/resample/resample.cc:209
 msgid "16 kHz:"
-msgstr ""
+msgstr "16 kHz:"
 
 #: src/resample/resample.cc:213
 msgid "22.05 kHz:"
-msgstr ""
+msgstr "22.05 kHz:"
 
 #: src/resample/resample.cc:217
 msgid "32.0 kHz:"
-msgstr ""
+msgstr "32.0 kHz:"
 
 #: src/resample/resample.cc:221
 msgid "44.1 kHz:"
-msgstr ""
+msgstr "44.1 kHz:"
 
 #: src/resample/resample.cc:225
 msgid "48 kHz:"
-msgstr ""
+msgstr "48 kHz:"
 
 #: src/resample/resample.cc:229
 msgid "88.2 kHz:"
-msgstr ""
+msgstr "88.2 kHz:"
 
 #: src/resample/resample.cc:233
 msgid "96 kHz:"
-msgstr ""
+msgstr "96 kHz:"
 
 #: src/resample/resample.cc:237
 msgid "176.4 kHz:"
-msgstr ""
+msgstr "176.4 kHz:"
 
 #: src/resample/resample.cc:241
 msgid "192 kHz:"
-msgstr ""
+msgstr "192 kHz:"
 
-#: src/scrobbler2/config_window.cc:41
-#, c-format
-msgid "OK. Scrobbling for user: %s"
-msgstr ""
-
-#: src/scrobbler2/config_window.cc:54
-msgid "Permission Denied"
-msgstr ""
-
-#: src/scrobbler2/config_window.cc:56
-msgid "Access the following link to allow Audacious to scrobble your plays:"
-msgstr ""
-
-#: src/scrobbler2/config_window.cc:66
-msgid "Keep this window open and click 'Check Permission' again.\n"
+#: src/scrobbler2/config_window.cc:29
+msgid "Checking Last.fm access ..."
 msgstr ""
 
-#: src/scrobbler2/config_window.cc:69 src/scrobbler2/config_window.cc:80
+#: src/scrobbler2/config_window.cc:35
 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."
+"Your scrobbles are being saved on your computer temporarily. They will be "
+"submitted as soon as Audacious is allowed access."
 msgstr ""
 
-#: src/scrobbler2/config_window.cc:77
-msgid "Network Problem."
+#: src/scrobbler2/config_window.cc:41
+#, c-format
+msgid "Permission granted. Scrobbling for user %s."
 msgstr ""
 
-#: src/scrobbler2/config_window.cc:78
-msgid "There was a problem contacting Last.fm. Please try again later."
+#: src/scrobbler2/config_window.cc:44
+msgid ""
+"Permission denied. Open the following URL in a browser, allow Audacious "
+"access to your account, and then click 'Check Permission' again:"
 msgstr ""
 
-#: src/scrobbler2/config_window.cc:110
-msgid "Checking..."
+#: src/scrobbler2/config_window.cc:53
+msgid "There was a problem contacting Last.fm."
 msgstr ""
 
-#: src/scrobbler2/config_window.cc:176
-msgid "C_heck Permission"
-msgstr ""
+#: src/scrobbler2/config_window.cc:92
+msgid "Check Permission"
+msgstr "Baimenak kontrolatu"
 
-#: src/scrobbler2/config_window.cc:177
-msgid "_Revoke Permission"
+#: src/scrobbler2/config_window.cc:93
+msgid "Revoke Permission"
 msgstr ""
 
-#: src/scrobbler2/config_window.cc:220
-msgid ""
-"You need to allow Audacious to scrobble tracks to your Last.fm account.\n"
+#: src/scrobbler2/config_window.cc:97
+msgid "You need to allow Audacious to scrobble tracks to your Last.fm account."
 msgstr ""
 
 #: src/scrobbler2/scrobbler.cc:29
 msgid "Scrobbler 2.0"
 msgstr ""
 
-#: src/scrobbler2/scrobbler.cc:224
+#: src/scrobbler2/scrobbler.cc:200
 msgid ""
 "The Scrobbler plugin could not be started.\n"
 "There might be a problem with your installation."
 msgstr ""
 
-#: src/scrobbler2/scrobbler.cc:289
+#: src/scrobbler2/scrobbler.cc:245
 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"
+"project."
 msgstr ""
 
-#: src/scrobbler2/scrobbler_communication.cc:642
-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/sdlout.cc:48
+#: src/sdlout/sdlout.cc:43
 msgid "SDL Output"
 msgstr ""
 
-#: src/sdlout/sdlout.cc:77
+#: src/sdlout/sdlout.cc:72
 msgid ""
 "SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
 msgstr ""
 
-#: src/search-tool/search-tool.cc:116 src/search-tool/search-tool.cc:124
+#: src/search-tool/library.cc:35 src/search-tool/library.cc:46
+#: src/search-tool-qt/library.cc:35 src/search-tool-qt/library.cc:46
 msgid "Library"
-msgstr ""
-
-#: src/search-tool/search-tool.cc:394
-#, c-format
-msgid "%d result"
-msgid_plural "%d results"
-msgstr0 ""
-msgstr1 ""
+msgstr "Liburutegia"
 
-#: src/search-tool/search-tool.cc:400
-#, c-format
-msgid "(%d hidden)"
-msgid_plural "(%d hidden)"
-msgstr0 ""
-msgstr1 ""
-
-#: src/search-tool/search-tool.cc:594
+#: src/search-tool-qt/search-model.cc:44 src/search-tool/search-tool.cc:287
 #, c-format
 msgid "%d song"
 msgid_plural "%d songs"
-msgstr0 ""
-msgstr1 ""
+msgstr0 "%d kantua"
+msgstr1 "%d kantuak"
 
-#: src/search-tool/search-tool.cc:601
+#: src/search-tool-qt/search-model.cc:53 src/search-tool/search-tool.cc:294
 msgid "of this genre"
-msgstr ""
+msgstr "genero honetan"
 
-#: src/search-tool/search-tool.cc:607
+#: src/search-tool-qt/search-model.h:47 src/search-tool/search-model.h:45
 msgid "on"
 msgstr ""
 
-#: src/search-tool/search-tool.cc:607
+#: src/search-tool-qt/search-model.h:47 src/search-tool/search-model.h:45
 msgid "by"
 msgstr ""
 
-#: src/search-tool/search-tool.cc:643
-msgid "_Create Playlist"
+#: src/search-tool-qt/search-tool-qt.cc:165 src/search-tool/search-tool.cc:74
+msgid "Number of results to show:"
 msgstr ""
 
-#: src/search-tool/search-tool.cc:645
-msgid "_Add to Playlist"
+#: src/search-tool-qt/search-tool-qt.cc:168 src/search-tool/search-tool.cc:77
+msgid "Rescan library at startup"
 msgstr ""
 
-#: src/search-tool/search-tool.cc:684
-msgid "Search library"
+#: src/search-tool-qt/search-tool-qt.cc:170
+msgid "Monitor library for changes"
 msgstr ""
 
-#: src/search-tool/search-tool.cc:688
+#: src/search-tool-qt/search-tool-qt.cc:193 src/search-tool/search-tool.cc:450
 msgid ""
 "To import your music library into Audacious, choose a folder and then click "
 "the \"refresh\" icon."
 msgstr ""
 
-#: src/search-tool/search-tool.cc:696
+#: src/search-tool-qt/search-tool-qt.cc:195 src/search-tool/search-tool.cc:459
 msgid "Please wait ..."
-msgstr ""
+msgstr "Mesedez itxaron ..."
 
-#: src/search-tool/search-tool.cc:723
+#: src/search-tool-qt/search-tool-qt.cc:197 src/search-tool/search-tool.cc:487
 msgid "Choose Folder"
-msgstr ""
+msgstr "Aukeratu karpeta"
+
+#: src/search-tool-qt/search-tool-qt.cc:201 src/search-tool/search-tool.cc:445
+msgid "Search library"
+msgstr "Bilatu Liburutegian"
+
+#: src/search-tool-qt/search-tool-qt.cc:327 src/search-tool/search-tool.cc:156
+#, c-format
+msgid "%d of %d result shown"
+msgid_plural "%d of %d results shown"
+msgstr0 ""
+msgstr1 ""
+
+#: src/search-tool-qt/search-tool-qt.cc:331 src/search-tool/search-tool.cc:160
+#, c-format
+msgid "%d result"
+msgid_plural "%d results"
+msgstr0 "%d emaitza"
+msgstr1 "%d emaitzak"
+
+#: src/search-tool-qt/search-tool-qt.cc:501 src/search-tool/search-tool.cc:341
+msgid "_Create Playlist"
+msgstr "_Erreprodukzio-zerrenda sortu"
+
+#: src/search-tool-qt/search-tool-qt.cc:503 src/search-tool/search-tool.cc:343
+msgid "_Add to Playlist"
+msgstr "_Erreprodukzio-zerrendara gehitu"
 
 #: src/sid/xmms-sid.cc:43
 msgid "SID Player"
 msgstr ""
 
-#: src/sid/xs_config.cc:61
-msgid "Output"
-msgstr ""
-
 #: src/sid/xs_config.cc:62
 msgid "Channels:"
-msgstr ""
+msgstr "Kanalak:"
 
 #: src/sid/xs_config.cc:68
 msgid "Emulation"
@@ -2922,7 +3237,7 @@
 
 #: src/silence-removal/silence-removal.cc:39
 msgid "Silence Removal"
-msgstr ""
+msgstr "Isiluneak kendu"
 
 #: src/silence-removal/silence-removal.cc:58
 msgid ""
@@ -2932,747 +3247,690 @@
 
 #: src/silence-removal/silence-removal.cc:67
 msgid "Silence Removal"
-msgstr ""
+msgstr "Isiluneak kendu"
 
 #: src/silence-removal/silence-removal.cc:68
 msgid "Threshold:"
-msgstr ""
+msgstr "Atalasea:"
 
-#: src/silence-removal/silence-removal.cc:70
-msgid "dB"
+#: src/skins/actions.cc:45 src/skins-qt/actions.cc:43
+msgid "Repeat points cleared."
 msgstr ""
 
-#: src/skins/menus.cc:64
-msgid "Open Files ..."
+#: src/skins/actions.cc:60 src/skins-qt/actions.cc:58
+msgid "Repeat point A set."
 msgstr ""
 
-#: src/skins/menus.cc:65
-msgid "Open URL ..."
+#: src/skins/actions.cc:65 src/skins-qt/actions.cc:63
+msgid "Repeat point B set."
 msgstr ""
 
-#: src/skins/menus.cc:66
-msgid "Search Library"
+#: src/skins/equalizer.cc:223 src/skins-qt/equalizer.cc:223
+msgid "Preamp"
+msgstr "Aurre-anp"
+
+#: src/skins/equalizer.cc:227 src/skins-qt/equalizer.cc:227
+msgid "31 Hz"
+msgstr "31 Hz"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "63 Hz"
+msgstr "63 Hz"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "125 Hz"
+msgstr "125 Hz"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "250 Hz"
+msgstr "250 Hz"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "500 Hz"
+msgstr "500 Hz"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "1 kHz"
+msgstr "1 kHz"
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "2 kHz"
+msgstr "2 kHz"
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "4 kHz"
+msgstr "4 kHz"
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "8 kHz"
+msgstr "8 kHz"
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "16 kHz"
+msgstr "16 kHz"
+
+#: src/skins/equalizer.cc:270 src/skins-qt/equalizer.cc:270
+msgid "Audacious Equalizer"
+msgstr "Audacious-en ekualizadorea"
+
+#: src/skins/main.cc:459 src/skins-qt/main.cc:442
+msgid "Recording on"
+msgstr "Grabazioa piztua"
+
+#: src/skins/main.cc:461 src/skins-qt/main.cc:444
+msgid "Recording off"
+msgstr "Grabazioa itzalia"
+
+#: src/skins/main.cc:754 src/skins-qt/main.cc:701
+#, c-format
+msgid "Seek to %d:%-2.2d / %d:%-2.2d"
+msgstr "Bilatu %d:%-2.2d / %d:%-2.2d"
+
+#: src/skins/main.cc:771 src/skins-qt/main.cc:718
+#, c-format
+msgid "Volume: %d%%"
+msgstr "Bolumena: %% %d"
+
+#: src/skins/main.cc:784 src/skins-qt/main.cc:731
+#, c-format
+msgid "Balance: %d%% left"
+msgstr "Balantzea: %% %d ezkerrean"
+
+#: src/skins/main.cc:786 src/skins-qt/main.cc:733
+msgid "Balance: center"
+msgstr "Balantzea: erdian"
+
+#: src/skins/main.cc:788 src/skins-qt/main.cc:735
+#, c-format
+msgid "Balance: %d%% right"
+msgstr "Balantzea: %% %d eskuinean"
+
+#: src/skins/main.cc:880 src/skins-qt/main.cc:827
+msgid "Options Menu"
+msgstr "Aukeren menua"
+
+#: src/skins/main.cc:884 src/skins-qt/main.cc:831
+msgid "Disable 'Always On Top'"
+msgstr "Desgaitu 'Beti gainean'"
+
+#: src/skins/main.cc:886 src/skins-qt/main.cc:833
+msgid "Enable 'Always On Top'"
+msgstr "Gaitu 'Beti gainean'"
+
+#: src/skins/main.cc:889 src/skins-qt/main.cc:836
+msgid "File Info Box"
+msgstr "Fitxategi-informazioaren koadroa"
+
+#: src/skins/main.cc:892 src/skins/menus.cc:149 src/skins-qt/main.cc:839
+#: src/skins-qt/menus.cc:142
+msgid "Double Size"
+msgstr "Tamaina bikoitza"
+
+#: src/skins/main.cc:895 src/skins-qt/main.cc:842
+msgid "Visualizations"
 msgstr ""
 
-#: src/skins/menus.cc:68
-msgid "Playback"
-msgstr "Erreprodukzioa"
+#: src/skins/menus.cc:74 src/skins-qt/menus.cc:64
+msgid "Volume Up"
+msgstr "Igo bolumena"
+
+#: src/skins/menus.cc:75 src/skins-qt/menus.cc:65
+msgid "Volume Down"
+msgstr "Jeitsi bolumena"
+
+#: src/skins/menus.cc:77 src/skins-qt/menus.cc:67
+msgid "Effects ..."
+msgstr "Efektuak ..."
 
-#: src/skins/menus.cc:69
+#: src/skins/menus.cc:84 src/skins-qt/menus.cc:74
+msgid "Open Files ..."
+msgstr "Ireki fitxategiak ..."
+
+#: src/skins/menus.cc:85 src/skins-qt/menus.cc:76
+msgid "Open URL ..."
+msgstr "Ireki URLa ..."
+
+#: src/skins/menus.cc:89 src/skins-qt/menus.cc:80
 msgid "Playlist"
 msgstr "Erreprodukzio-zerrenda"
 
-#: src/skins/menus.cc:70
+#: src/skins/menus.cc:90 src/skins-qt/menus.cc:81
+msgid "Output"
+msgstr "Irteera"
+
+#: src/skins/menus.cc:91 src/skins-qt/menus.cc:82
 msgid "View"
 msgstr "Ikusi"
 
-#: src/skins/menus.cc:72 src/skins/menus.cc:136 src/skins/menus.cc:149
-#: src/skins/menus.cc:214
+#: src/skins/menus.cc:93 src/skins/menus.cc:161 src/skins/menus.cc:174
+#: src/skins/menus.cc:245 src/skins-qt/menus.cc:84 src/skins-qt/menus.cc:156
+#: src/skins-qt/menus.cc:170 src/skins-qt/menus.cc:241
 msgid "Services"
-msgstr ""
+msgstr "Zerbitzuak"
 
-#: src/skins/menus.cc:74
+#: src/skins/menus.cc:95 src/skins-qt/menus.cc:86
 msgid "About ..."
 msgstr ""
 
-#: src/skins/menus.cc:75
+#: src/skins/menus.cc:96 src/skins-qt/menus.cc:87
 msgid "Settings ..."
-msgstr ""
+msgstr "Ezarpenak ..."
 
-#: src/skins/menus.cc:76
+#: src/skins/menus.cc:97 src/skins-qt/menus.cc:88
 msgid "Quit"
-msgstr ""
+msgstr "Irten"
 
-#: src/skins/menus.cc:80 src/skins/menus.cc:206
+#: src/skins/menus.cc:101 src/skins/menus.cc:235 src/skins-qt/menus.cc:92
+#: src/skins-qt/menus.cc:231
 msgid "Song Info ..."
+msgstr "Kantuari buruzko informazioa ..."
+
+#: src/skins/menus.cc:105 src/skins-qt/menus.cc:96
+msgid "Shuffle by Album"
 msgstr ""
 
-#: src/skins/menus.cc:84
+#: src/skins/menus.cc:106 src/skins-qt/menus.cc:97
 msgid "No Playlist Advance"
 msgstr "Erreprodukzio-zerrenda aurreraturik ez"
 
-#: src/skins/menus.cc:85
-msgid "Stop After This Song"
-msgstr ""
-
-#: src/skins/menus.cc:93
+#: src/skins/menus.cc:117 src/skins-qt/menus.cc:108
 msgid "Set A-B Repeat"
 msgstr ""
 
-#: src/skins/menus.cc:94
+#: src/skins/menus.cc:118 src/skins-qt/menus.cc:109
 msgid "Clear A-B Repeat"
 msgstr ""
 
-#: src/skins/menus.cc:96
+#: src/skins/menus.cc:120 src/skins-qt/menus.cc:111
 msgid "Jump to Song ..."
-msgstr ""
+msgstr "Joan abestira ..."
 
-#: src/skins/menus.cc:97
+#: src/skins/menus.cc:121 src/skins-qt/menus.cc:113
 msgid "Jump to Time ..."
-msgstr ""
+msgstr "Joan denborara ..."
 
-#: src/skins/menus.cc:101
+#: src/skins/menus.cc:125 src/skins-qt/menus.cc:118
 msgid "Play/Resume"
 msgstr ""
 
-#: src/skins/menus.cc:103
+#: src/skins/menus.cc:127 src/skins-qt/menus.cc:120
 msgid "New Playlist"
 msgstr "Erreprodukzio-zerrenda berria"
 
-#: src/skins/menus.cc:104
+#: src/skins/menus.cc:128 src/skins-qt/menus.cc:121
 msgid "Rename Playlist ..."
-msgstr ""
+msgstr "Erreprodukzio-zerrendaren izena aldatu ..."
 
-#: src/skins/menus.cc:105
+#: src/skins/menus.cc:129 src/skins-qt/menus.cc:122
 msgid "Remove Playlist"
-msgstr ""
+msgstr "Erreprodukzio-zerrenda ezabatu"
 
-#: src/skins/menus.cc:107
+#: src/skins/menus.cc:131 src/skins-qt/menus.cc:124
 msgid "Previous Playlist"
-msgstr ""
+msgstr "Aurreko erreprodukzio-zerrenda"
 
-#: src/skins/menus.cc:108
+#: src/skins/menus.cc:132 src/skins-qt/menus.cc:125
 msgid "Next Playlist"
-msgstr ""
+msgstr "Hurrengo erreprodukzio-zerrenda"
 
-#: src/skins/menus.cc:110
+#: src/skins/menus.cc:134 src/skins-qt/menus.cc:127
 msgid "Import Playlist ..."
-msgstr ""
+msgstr "Inportatu erreprodukzio-zerrenda ..."
 
-#: src/skins/menus.cc:111
+#: src/skins/menus.cc:135 src/skins-qt/menus.cc:128
 msgid "Export Playlist ..."
-msgstr ""
+msgstr "Esportatu erreprodukzio-zerrenda ..."
 
-#: src/skins/menus.cc:113
+#: src/skins/menus.cc:137 src/skins-qt/menus.cc:130
 msgid "Playlist Manager ..."
-msgstr ""
+msgstr "Erreprodukzio-zerrenda kudeatzailea ..."
 
-#: src/skins/menus.cc:114
+#: src/skins/menus.cc:138 src/skins-qt/menus.cc:131
 msgid "Queue Manager ..."
-msgstr ""
+msgstr "Ilara kudeatzailea ..."
 
-#: src/skins/menus.cc:116
+#: src/skins/menus.cc:140 src/skins-qt/menus.cc:133
 msgid "Refresh Playlist"
-msgstr ""
+msgstr "Freskatu erreprodukzio-zerrenda"
 
-#: src/skins/menus.cc:120
+#: src/skins/menus.cc:144 src/skins-qt/menus.cc:137
 msgid "Show Playlist Editor"
 msgstr "Erakutsi erreprodukzio-zerrendaren editorea"
 
-#: src/skins/menus.cc:121
+#: src/skins/menus.cc:145 src/skins-qt/menus.cc:138
 msgid "Show Equalizer"
 msgstr "Erakutsi ekualizadorea"
 
-#: src/skins/menus.cc:123
+#: src/skins/menus.cc:147 src/skins-qt/menus.cc:140
 msgid "Show Remaining Time"
-msgstr ""
+msgstr "Gelditzen den denbora erakutsi"
 
-#: src/skins/menus.cc:125
+#: src/skins/menus.cc:150 src/skins-qt/menus.cc:143
 msgid "Always on Top"
 msgstr "Beti gainean"
 
-#: src/skins/menus.cc:126
+#: src/skins/menus.cc:151 src/skins-qt/menus.cc:145
 msgid "On All Workspaces"
 msgstr ""
 
-#: src/skins/menus.cc:128
+#: src/skins/menus.cc:153 src/skins-qt/menus.cc:148
 msgid "Roll Up Player"
 msgstr ""
 
-#: src/skins/menus.cc:129
+#: src/skins/menus.cc:154 src/skins-qt/menus.cc:149
 msgid "Roll Up Playlist Editor"
 msgstr ""
 
-#: src/skins/menus.cc:130
+#: src/skins/menus.cc:155 src/skins-qt/menus.cc:150
 msgid "Roll Up Equalizer"
 msgstr ""
 
-#: src/skins/menus.cc:132 src/skins/ui_main.cc:854
-msgid "Double Size"
-msgstr ""
-
-#: src/skins/menus.cc:138
+#: src/skins/menus.cc:163 src/skins-qt/menus.cc:158
 msgid "Add URL ..."
-msgstr ""
+msgstr "Gehitu URLa ..."
 
-#: src/skins/menus.cc:139
+#: src/skins/menus.cc:164 src/skins-qt/menus.cc:160
 msgid "Add Files ..."
-msgstr ""
+msgstr "Gehitu fitxategiak..."
 
-#: src/skins/menus.cc:143 src/skins/menus.cc:171 src/skins/menus.cc:185
+#: src/skins/menus.cc:168 src/skins/menus.cc:196 src/skins/menus.cc:212
+#: src/skins-qt/menus.cc:164 src/skins-qt/menus.cc:192
+#: src/skins-qt/menus.cc:208
 msgid "By Title"
 msgstr "Tituluaren arabera"
 
-#: src/skins/menus.cc:144 src/skins/menus.cc:178 src/skins/menus.cc:192
+#: src/skins/menus.cc:169 src/skins/menus.cc:203 src/skins/menus.cc:219
+#: src/skins-qt/menus.cc:165 src/skins-qt/menus.cc:199
+#: src/skins-qt/menus.cc:215
 msgid "By File Name"
-msgstr ""
+msgstr "Fitxategi izenaren arabera"
 
-#: src/skins/menus.cc:145 src/skins/menus.cc:179 src/skins/menus.cc:193
+#: src/skins/menus.cc:170 src/skins/menus.cc:204 src/skins/menus.cc:220
+#: src/skins-qt/menus.cc:166 src/skins-qt/menus.cc:200
+#: src/skins-qt/menus.cc:216
 msgid "By File Path"
-msgstr ""
+msgstr "Fitxategi bidearen arabera"
 
-#: src/skins/menus.cc:151
+#: src/skins/menus.cc:176 src/skins-qt/menus.cc:172
 msgid "Remove All"
 msgstr "Kendu guztiak"
 
-#: src/skins/menus.cc:152
+#: src/skins/menus.cc:177 src/skins-qt/menus.cc:173
 msgid "Clear Queue"
 msgstr "Garbitu ilara"
 
-#: src/skins/menus.cc:154
+#: src/skins/menus.cc:179 src/skins-qt/menus.cc:175
 msgid "Remove Unavailable Files"
 msgstr "Kendu fitxategi erabilkaitzak"
 
-#: src/skins/menus.cc:155
+#: src/skins/menus.cc:180 src/skins-qt/menus.cc:176
 msgid "Remove Duplicates"
 msgstr "Kendu bikoiztuak"
 
-#: src/skins/menus.cc:157
+#: src/skins/menus.cc:182 src/skins-qt/menus.cc:178
 msgid "Remove Unselected"
 msgstr "Kendu desautatutakoak"
 
-#: src/skins/menus.cc:158
+#: src/skins/menus.cc:183 src/skins-qt/menus.cc:179
 msgid "Remove Selected"
 msgstr "Kendu hautatutakoak"
 
-#: src/skins/menus.cc:162
+#: src/skins/menus.cc:187 src/skins-qt/menus.cc:183
 msgid "Search and Select"
 msgstr "Bilatu eta hautatu"
 
-#: src/skins/menus.cc:164
+#: src/skins/menus.cc:189 src/skins-qt/menus.cc:185
 msgid "Invert Selection"
 msgstr "Alderantzikatu hautapena"
 
-#: src/skins/menus.cc:165
+#: src/skins/menus.cc:190 src/skins-qt/menus.cc:186
 msgid "Select None"
 msgstr "Ez hautatu ezer"
 
-#: src/skins/menus.cc:166
+#: src/skins/menus.cc:191 src/skins-qt/menus.cc:187
 msgid "Select All"
 msgstr "Hautatu denak"
 
-#: src/skins/menus.cc:170 src/skins/menus.cc:184
+#: src/skins/menus.cc:195 src/skins/menus.cc:211 src/skins-qt/menus.cc:191
+#: src/skins-qt/menus.cc:207
 msgid "By Track Number"
 msgstr "Pista zenbakiaren arabera"
 
-#: src/skins/menus.cc:172 src/skins/menus.cc:186
+#: src/skins/menus.cc:197 src/skins/menus.cc:213 src/skins-qt/menus.cc:193
+#: src/skins-qt/menus.cc:209
 msgid "By Artist"
 msgstr "Artistaren arabera"
 
-#: src/skins/menus.cc:173 src/skins/menus.cc:187
+#: src/skins/menus.cc:198 src/skins/menus.cc:214 src/skins-qt/menus.cc:194
+#: src/skins-qt/menus.cc:210
 msgid "By Album"
 msgstr "Diskoaren arabera"
 
-#: src/skins/menus.cc:174 src/skins/menus.cc:188
+#: src/skins/menus.cc:199 src/skins/menus.cc:215 src/skins-qt/menus.cc:195
+#: src/skins-qt/menus.cc:211
 msgid "By Album Artist"
-msgstr ""
+msgstr "Albumeko artistaren arabera"
 
-#: src/skins/menus.cc:175 src/skins/menus.cc:190
+#: src/skins/menus.cc:200 src/skins/menus.cc:216 src/skins-qt/menus.cc:196
+#: src/skins-qt/menus.cc:212
 msgid "By Release Date"
-msgstr ""
+msgstr "Argitaratza dataren arabera"
 
-#: src/skins/menus.cc:176 src/skins/menus.cc:189
+#: src/skins/menus.cc:201 src/skins/menus.cc:217 src/skins-qt/menus.cc:197
+#: src/skins-qt/menus.cc:213
 msgid "By Genre"
-msgstr ""
+msgstr "Generoaren arabera"
 
-#: src/skins/menus.cc:177 src/skins/menus.cc:191
+#: src/skins/menus.cc:202 src/skins/menus.cc:218 src/skins-qt/menus.cc:198
+#: src/skins-qt/menus.cc:214
 msgid "By Length"
-msgstr ""
+msgstr "Luzeraren arabera"
 
-#: src/skins/menus.cc:180 src/skins/menus.cc:194
+#: src/skins/menus.cc:205 src/skins/menus.cc:221 src/skins-qt/menus.cc:201
+#: src/skins-qt/menus.cc:217
 msgid "By Custom Title"
+msgstr "Izenburu pertsonalizatuen arabera"
+
+#: src/skins/menus.cc:206 src/skins/menus.cc:222 src/skins-qt/menus.cc:202
+#: src/skins-qt/menus.cc:218
+msgid "By Comment"
+msgstr "Iruzkinen arabera"
+
+#: src/skins/menus.cc:207 src/skins/menus.cc:223 src/skins-qt/menus.cc:203
+#: src/skins-qt/menus.cc:219
+msgid "By Disc Number"
 msgstr ""
 
-#: src/skins/menus.cc:198
+#: src/skins/menus.cc:227 src/skins-qt/menus.cc:223
 msgid "Randomize List"
 msgstr "Nahastu ausaz zerrenda"
 
-#: src/skins/menus.cc:199
+#: src/skins/menus.cc:228 src/skins-qt/menus.cc:224
 msgid "Reverse List"
 msgstr "Alderantzikatu zerrenda"
 
-#: src/skins/menus.cc:201
+#: src/skins/menus.cc:230 src/skins-qt/menus.cc:226
 msgid "Sort Selected"
 msgstr "Ordenatu hautatutakoak"
 
-#: src/skins/menus.cc:202
+#: src/skins/menus.cc:231 src/skins-qt/menus.cc:227
 msgid "Sort List"
 msgstr "Ordenatu zerrenda"
 
-#: src/skins/menus.cc:208
+#: src/skins/menus.cc:236 src/skins-qt/menus.cc:232
+msgid "Open Containing Folder"
+msgstr "Barruko Karpeta Ireki"
+
+#: src/skins/menus.cc:238 src/skins-qt/menus.cc:234
 msgid "Cut"
 msgstr "Moztu"
 
-#: src/skins/menus.cc:209
+#: src/skins/menus.cc:239 src/skins-qt/menus.cc:235
 msgid "Copy"
 msgstr "Kopiatu"
 
-#: src/skins/menus.cc:210
+#: src/skins/menus.cc:240 src/skins-qt/menus.cc:236
 msgid "Paste"
 msgstr "Itsatsi"
 
-#: src/skins/menus.cc:212
-msgid "Queue/Unqueue"
-msgstr ""
-
-#: src/skins/menus.cc:218
-msgid "Load Preset ..."
-msgstr ""
-
-#: src/skins/menus.cc:219
-msgid "Load Auto Preset ..."
-msgstr ""
-
-#: src/skins/menus.cc:220
-msgid "Load Default"
-msgstr ""
-
-#: src/skins/menus.cc:221
-msgid "Load Preset File ..."
-msgstr ""
-
-#: src/skins/menus.cc:222
-msgid "Load EQF File ..."
-msgstr ""
-
-#: src/skins/menus.cc:224
-msgid "Save Preset ..."
-msgstr ""
-
-#: src/skins/menus.cc:225
-msgid "Save Auto Preset ..."
-msgstr ""
-
-#: src/skins/menus.cc:226
-msgid "Save Default"
-msgstr ""
-
-#: src/skins/menus.cc:227
-msgid "Save Preset File ..."
-msgstr ""
-
-#: src/skins/menus.cc:228
-msgid "Save EQF File ..."
-msgstr ""
-
-#: src/skins/menus.cc:230
-msgid "Delete Preset ..."
-msgstr ""
+#: src/skins/menus.cc:241 src/skins-qt/menus.cc:237
+msgid "Paste at End"
+msgstr "Itsasi bukaeran"
 
-#: src/skins/menus.cc:231
-msgid "Delete Auto Preset ..."
+#: src/skins/menus.cc:243 src/skins-qt/menus.cc:239
+msgid "Queue/Unqueue"
 msgstr ""
 
-#: src/skins/menus.cc:233
-msgid "Import Winamp Presets ..."
-msgstr ""
+#: src/skins/playlist-widget.cc:58 src/skins-qt/playlist-widget.cc:58
+#, c-format
+msgid "%s (%d of %d)"
+msgstr "%s(%dtik%d)"
 
-#: src/skins/menus.cc:235
-msgid "Reset to Zero"
-msgstr ""
+#: src/skins/playlistwin.cc:491 src/skins-qt/playlistwin.cc:478
+msgid "Audacious Playlist Editor"
+msgstr "Audacious erreprodukzio-zerrendaren editorea"
 
-#: src/skins/plugin.cc:48
+#: src/skins/plugin.cc:53 src/skins-qt/plugin.cc:65
 msgid "Winamp Classic Interface"
-msgstr ""
-
-#: src/skins/preset-browser.cc:57 src/skins/preset-list.cc:371
-#: src/skins/preset-list.cc:386
-msgid "Save"
-msgstr "Gorde"
+msgstr "Winamp`Interfaze Klasikoa"
 
-#: src/skins/preset-browser.cc:57 src/skins/preset-list.cc:338
-#: src/skins/preset-list.cc:354
-msgid "Load"
-msgstr "Kargatu"
+#: src/skins-qt/menus.cc:75
+msgid "Open Folder ..."
+msgstr "Ireki Fitxategia ..."
 
-#: src/skins/preset-browser.cc:83
-msgid "Load Preset File"
-msgstr ""
-
-#: src/skins/preset-browser.cc:100
-msgid "Load EQF File"
-msgstr ""
+#: src/skins-qt/menus.cc:159
+msgid "Add Folder ..."
+msgstr "Gehitu Fitxtegia ..."
 
-#: src/skins/preset-browser.cc:119
-msgid "Save Preset File"
-msgstr ""
+#: src/skins-qt/search-select.cc:62 src/skins/search-select.cc:77
+msgid "Search entries in active playlist"
+msgstr "Bilatu sarrerak erreprodukzio-zerrenda aktiboan"
 
-#: src/skins/preset-browser.cc:137
-msgid "Save EQF File"
+#: src/skins-qt/search-select.cc:70 src/skins/search-select.cc:83
+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 ""
+"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/preset-browser.cc:151
-msgid "Import Winamp Presets"
-msgstr ""
+#: src/skins-qt/search-select.cc:75 src/skins/search-select.cc:91
+msgid "Title:"
+msgstr "Izenburua: "
 
-#: src/skins/preset-list.cc:285
-msgid "Presets"
-msgstr "Aurrezarpenak"
+#: src/skins-qt/search-select.cc:79 src/skins/search-select.cc:96
+msgid "Album:"
+msgstr "Diskoa: "
 
-#: src/skins/preset-list.cc:335
-msgid "Load preset"
-msgstr "Kargatu aurrezarpena"
+#: src/skins-qt/search-select.cc:82 src/skins/search-select.cc:101
+msgid "Artist:"
+msgstr "Artista: "
 
-#: src/skins/preset-list.cc:351
-msgid "Load auto-preset"
-msgstr ""
+#: src/skins-qt/search-select.cc:85 src/skins/search-select.cc:106
+msgid "File Name:"
+msgstr "Fitxategi izena"
 
-#: src/skins/preset-list.cc:367
-msgid "Save preset"
-msgstr "Gorde aurrezarpenak"
+#: src/skins-qt/search-select.cc:88 src/skins/search-select.cc:134
+msgid "Clear previous selection before searching"
+msgstr "Garbitu aurreko hautapena bilatu aurretik"
 
-#: src/skins/preset-list.cc:382
-msgid "Save auto-preset"
-msgstr ""
+#: src/skins-qt/search-select.cc:89 src/skins/search-select.cc:137
+msgid "Automatically toggle queue for matching entries"
+msgstr "Txandakatu automatikoki ilara bat datozen sarrerentzako"
 
-#: src/skins/preset-list.cc:408
-msgid "Delete preset"
-msgstr "Ezabatu aurrezarpena"
+#: src/skins-qt/search-select.cc:90 src/skins/search-select.cc:140
+msgid "Create a new playlist with matching entries"
+msgstr "Sortu erreprodukzio-zerrenda berria bat datozen sarrerekin"
 
-#: src/skins/preset-list.cc:424
-msgid "Delete auto-preset"
-msgstr ""
+#: src/skins-qt/search-select.cc:101 src/skins/search-select.cc:78
+msgid "Search"
+msgstr "Bilatu"
 
-#: src/skins/skins_cfg.cc:176
+#: src/skins-qt/skins_cfg.cc:198 src/skins/skins_cfg.cc:182
 msgid "Player:"
-msgstr ""
+msgstr "Erreproduzitzailea:"
 
-#: src/skins/skins_cfg.cc:178
+#: src/skins-qt/skins_cfg.cc:200 src/skins/skins_cfg.cc:184
 msgid "Select main player window font:"
 msgstr "Hautatu erreproduzitzaile nagusiaren leihoko letra-tipoa:"
 
-#: src/skins/skins_cfg.cc:179
+#: src/skins-qt/skins_cfg.cc:201 src/skins/skins_cfg.cc:185
 msgid "Playlist:"
-msgstr ""
+msgstr "Erreprodukzio-zerrenda:"
 
-#: src/skins/skins_cfg.cc:181
+#: src/skins-qt/skins_cfg.cc:203 src/skins/skins_cfg.cc:187
 msgid "Select playlist font:"
 msgstr "Hautatu erreprodukzio-zerrendaren letra-tipoa:"
 
-#: src/skins/skins_cfg.cc:187
+#: src/skins-qt/skins_cfg.cc:207 src/skins/skins_cfg.cc:191
 msgid "Skin"
 msgstr ""
 
-#: src/skins/skins_cfg.cc:189
+#: src/skins-qt/skins_cfg.cc:211 src/skins/skins_cfg.cc:193
+msgid "Display active titlebar when any window is focused"
+msgstr ""
+
+#: src/skins-qt/skins_cfg.cc:213 src/skins/skins_cfg.cc:195
 msgid "Fonts"
 msgstr ""
 
-#: src/skins/skins_cfg.cc:192
+#: src/skins-qt/skins_cfg.cc:215 src/skins/skins_cfg.cc:197
 msgid "Use bitmap fonts (supports ASCII only)"
 msgstr ""
 
-#: src/skins/skins_cfg.cc:194
+#: src/skins-qt/skins_cfg.cc:217 src/skins/skins_cfg.cc:199
 msgid "Scroll song title"
 msgstr ""
 
-#: src/skins/skins_cfg.cc:196
+#: src/skins-qt/skins_cfg.cc:219 src/skins/skins_cfg.cc:201
 msgid "Scroll song title in both directions"
 msgstr ""
 
-#: src/skins/skins_cfg.cc:201
+#: src/skins-qt/skins_cfg.cc:224 src/skins/skins_cfg.cc:206
 msgid "Analyzer"
 msgstr "Analizatzailea"
 
-#: src/skins/skins_cfg.cc:202
+#: src/skins-qt/skins_cfg.cc:225 src/skins/skins_cfg.cc:207
 msgid "Scope"
 msgstr "Esparrua"
 
-#: src/skins/skins_cfg.cc:203
+#: src/skins-qt/skins_cfg.cc:226 src/skins/skins_cfg.cc:208
 msgid "Voiceprint / VU meter"
 msgstr ""
 
-#: src/skins/skins_cfg.cc:204
+#: src/skins-qt/skins_cfg.cc:227 src/skins/skins_cfg.cc:209
 msgid "Off"
 msgstr "Itzalita"
 
-#: src/skins/skins_cfg.cc:208 src/skins/skins_cfg.cc:233
-#: src/skins/skins_cfg.cc:239
+#: src/skins-qt/skins_cfg.cc:231 src/skins-qt/skins_cfg.cc:256
+#: src/skins-qt/skins_cfg.cc:262 src/skins/skins_cfg.cc:213
+#: src/skins/skins_cfg.cc:238 src/skins/skins_cfg.cc:244
 msgid "Normal"
 msgstr "Normala"
 
-#: src/skins/skins_cfg.cc:209 src/skins/skins_cfg.cc:234
+#: src/skins-qt/skins_cfg.cc:232 src/skins-qt/skins_cfg.cc:257
+#: src/skins/skins_cfg.cc:214 src/skins/skins_cfg.cc:239
 msgid "Fire"
 msgstr "Sua"
 
-#: src/skins/skins_cfg.cc:210
+#: src/skins-qt/skins_cfg.cc:233 src/skins/skins_cfg.cc:215
 msgid "Vertical lines"
-msgstr ""
+msgstr "Lerro bertikalak"
 
-#: src/skins/skins_cfg.cc:214
+#: src/skins-qt/skins_cfg.cc:237 src/skins/skins_cfg.cc:219
 msgid "Lines"
 msgstr "Marrak"
 
-#: src/skins/skins_cfg.cc:215
+#: src/skins-qt/skins_cfg.cc:238 src/skins/skins_cfg.cc:220
 msgid "Bars"
 msgstr "Barrak"
 
-#: src/skins/skins_cfg.cc:219
+#: src/skins-qt/skins_cfg.cc:242 src/skins/skins_cfg.cc:224
 msgid "Slowest"
 msgstr "Motelena"
 
-#: src/skins/skins_cfg.cc:220
+#: src/skins-qt/skins_cfg.cc:243 src/skins/skins_cfg.cc:225
 msgid "Slow"
 msgstr "Motela"
 
-#: src/skins/skins_cfg.cc:221 src/sox-resampler/sox-resampler.cc:152
+#: src/skins-qt/skins_cfg.cc:244 src/skins/skins_cfg.cc:226
+#: src/soxr/sox-resampler.cc:180
 msgid "Medium"
 msgstr "Tartekoa"
 
-#: src/skins/skins_cfg.cc:222
+#: src/skins-qt/skins_cfg.cc:245 src/skins/skins_cfg.cc:227
 msgid "Fast"
 msgstr "Azkarra"
 
-#: src/skins/skins_cfg.cc:223
+#: src/skins-qt/skins_cfg.cc:246 src/skins/skins_cfg.cc:228
 msgid "Fastest"
 msgstr "Azkarrena"
 
-#: src/skins/skins_cfg.cc:227
+#: src/skins-qt/skins_cfg.cc:250 src/skins/skins_cfg.cc:232
 msgid "Dots"
-msgstr ""
+msgstr "Puntuak"
 
-#: src/skins/skins_cfg.cc:228
+#: src/skins-qt/skins_cfg.cc:251 src/skins/skins_cfg.cc:233
 msgid "Line"
-msgstr ""
+msgstr "Lerroak"
 
-#: src/skins/skins_cfg.cc:229
+#: src/skins-qt/skins_cfg.cc:252 src/skins/skins_cfg.cc:234
 msgid "Solid"
 msgstr ""
 
-#: src/skins/skins_cfg.cc:235
+#: src/skins-qt/skins_cfg.cc:258 src/skins/skins_cfg.cc:240
 msgid "Ice"
 msgstr "Izotza"
 
-#: src/skins/skins_cfg.cc:240
+#: src/skins-qt/skins_cfg.cc:263 src/skins/skins_cfg.cc:245
 msgid "Smooth"
 msgstr "Leuna"
 
-#: src/skins/skins_cfg.cc:244
-msgid "Type"
-msgstr ""
-
-#: src/skins/skins_cfg.cc:245
-msgid "Visualization type:"
-msgstr ""
-
-#: src/skins/skins_cfg.cc:248
-msgid "Analyzer"
-msgstr ""
-
-#: src/skins/skins_cfg.cc:249
-msgid "Show peaks"
-msgstr ""
-
-#: src/skins/skins_cfg.cc:251
+#: src/skins-qt/skins_cfg.cc:267 src/skins/skins_cfg.cc:249
 msgid "Coloring:"
-msgstr ""
+msgstr "Margotu:"
 
-#: src/skins/skins_cfg.cc:254
+#: src/skins-qt/skins_cfg.cc:270 src/skins/skins_cfg.cc:252
 msgid "Style:"
-msgstr ""
+msgstr "Estiloa:"
 
-#: src/skins/skins_cfg.cc:257
+#: src/skins-qt/skins_cfg.cc:273 src/skins/skins_cfg.cc:255
 msgid "Falloff:"
 msgstr ""
 
-#: src/skins/skins_cfg.cc:260
+#: src/skins-qt/skins_cfg.cc:276 src/skins/skins_cfg.cc:258
 msgid "Peak falloff:"
 msgstr ""
 
-#: src/skins/skins_cfg.cc:264
+#: src/skins-qt/skins_cfg.cc:282 src/skins/skins_cfg.cc:264
 msgid "Scope Style:"
 msgstr ""
 
-#: src/skins/skins_cfg.cc:267
+#: src/skins-qt/skins_cfg.cc:285 src/skins/skins_cfg.cc:267
 msgid "Voiceprint Coloring:"
 msgstr ""
 
-#: src/skins/skins_cfg.cc:270
+#: src/skins-qt/skins_cfg.cc:288 src/skins/skins_cfg.cc:270
 msgid "VU Meter Style:"
 msgstr ""
 
-#: src/skins/skins_cfg.cc:276
-msgid "General"
-msgstr "Orokorra"
-
-#: src/skins/skins_cfg.cc:277
-msgid "Visualization"
-msgstr "Bisualizazioa"
-
-#: src/skins/ui_equalizer.cc:282
-msgid "Preamp"
-msgstr "Aurre-anp"
-
-#: src/skins/ui_equalizer.cc:286
-msgid "31 Hz"
-msgstr "31 Hz"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "63 Hz"
-msgstr "63 Hz"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "125 Hz"
-msgstr "125 Hz"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "250 Hz"
-msgstr "250 Hz"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "500 Hz"
-msgstr "500 Hz"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "1 kHz"
-msgstr "1 kHz"
-
-#: src/skins/ui_equalizer.cc:288
-msgid "2 kHz"
-msgstr "2 kHz"
-
-#: src/skins/ui_equalizer.cc:288
-msgid "4 kHz"
-msgstr "4 kHz"
-
-#: src/skins/ui_equalizer.cc:288
-msgid "8 kHz"
-msgstr "8 kHz"
-
-#: src/skins/ui_equalizer.cc:288
-msgid "16 kHz"
-msgstr "16 kHz"
-
-#: src/skins/ui_equalizer.cc:330
-msgid "Audacious Equalizer"
-msgstr "Audacious-en ekualizadorea"
-
-#: src/skins/ui_main.cc:688
-#, c-format
-msgid "Seek to %d:%-2.2d / %d:%-2.2d"
-msgstr "Bilatu %d:%-2.2d / %d:%-2.2d"
-
-#: src/skins/ui_main.cc:709
-#, c-format
-msgid "Volume: %d%%"
-msgstr "Bolumena: %% %d"
-
-#: src/skins/ui_main.cc:732
-#, c-format
-msgid "Balance: %d%% left"
-msgstr "Balantzea: %% %d ezkerrean"
-
-#: src/skins/ui_main.cc:734
-msgid "Balance: center"
-msgstr "Balantzea: erdian"
-
-#: src/skins/ui_main.cc:736
-#, c-format
-msgid "Balance: %d%% right"
-msgstr "Balantzea: %% %d eskuinean"
-
-#: src/skins/ui_main.cc:842
-msgid "Options Menu"
-msgstr "Aukeren menua"
-
-#: src/skins/ui_main.cc:846
-msgid "Disable 'Always On Top'"
-msgstr "Desgaitu 'Beti gainean'"
-
-#: src/skins/ui_main.cc:848
-msgid "Enable 'Always On Top'"
-msgstr "Gaitu 'Beti gainean'"
-
-#: src/skins/ui_main.cc:851
-msgid "File Info Box"
-msgstr "Fitxategi-informazioaren koadroa"
-
-#: src/skins/ui_main.cc:857
-msgid "Visualizations"
-msgstr ""
-
-#: src/skins/ui_main.cc:1336
-msgid "Repeat point A set."
-msgstr ""
-
-#: src/skins/ui_main.cc:1341
-msgid "Repeat point B set."
-msgstr ""
-
-#: src/skins/ui_main.cc:1350
-msgid "Repeat points cleared."
-msgstr ""
-
-#: src/skins/ui_playlist.cc:219
-msgid "Search entries in active playlist"
-msgstr "Bilatu sarrerak erreprodukzio-zerrenda aktiboan"
-
-#: src/skins/ui_playlist.cc:226
-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 ""
-"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.cc:234
-msgid "Title:"
-msgstr ""
+#: src/skins-qt/skins_cfg.cc:294 src/skins/skins_cfg.cc:276
+msgid "Type"
+msgstr "Mota"
 
-#: src/skins/ui_playlist.cc:241
-msgid "Album:"
+#: src/skins-qt/skins_cfg.cc:295 src/skins/skins_cfg.cc:277
+msgid "Visualization type:"
 msgstr ""
 
-#: src/skins/ui_playlist.cc:248
-msgid "Artist:"
-msgstr ""
+#: src/skins-qt/skins_cfg.cc:298 src/skins/skins_cfg.cc:280
+msgid "Analyzer"
+msgstr "Analizatzailea"
 
-#: src/skins/ui_playlist.cc:255
-msgid "File Name:"
+#: src/skins-qt/skins_cfg.cc:299 src/skins/skins_cfg.cc:281
+msgid "Show peaks"
 msgstr ""
 
-#: src/skins/ui_playlist.cc:263
-msgid "Clear previous selection before searching"
-msgstr "Garbitu aurreko hautapena bilatu aurretik"
-
-#: src/skins/ui_playlist.cc:266
-msgid "Automatically toggle queue for matching entries"
-msgstr "Txandakatu automatikoki ilara bat datozen sarrerentzako"
-
-#: src/skins/ui_playlist.cc:269
-msgid "Create a new playlist with matching entries"
-msgstr "Sortu erreprodukzio-zerrenda berria bat datozen sarrerekin"
-
-#: src/skins/ui_playlist.cc:717
-msgid "Audacious Playlist Editor"
-msgstr "Audacious erreprodukzio-zerrendaren editorea"
-
-#: src/skins/ui_playlist.cc:752
-#, c-format
-msgid "%s (%d of %d)"
-msgstr ""
+#: src/skins-qt/skins_cfg.cc:308 src/skins/skins_cfg.cc:290
+msgid "Visualization"
+msgstr "Bisualizazioa"
 
-#: src/skins/ui_skinselector.cc:167
+#: src/skins-qt/skinselector.cc:98 src/skins/skinselector.cc:111
 msgid "Archived Winamp 2.x skin"
 msgstr "Konprimitutako Winamp 2.x azala"
 
-#: src/skins/ui_skinselector.cc:172
+#: src/skins-qt/skinselector.cc:102 src/skins/skinselector.cc:115
 msgid "Unarchived Winamp 2.x skin"
 msgstr "Deskonprimitutako Winamp 2.x azala"
 
-#: src/skins/util.cc:430
-#, c-format
-msgid "Could not create directory (%s): %s\n"
-msgstr "Ezin izan da direktorioa (%s) sortu: %s\n"
-
-#: src/sndfile/plugin.cc:39
+#: src/sndfile/plugin.cc:38
 msgid "Sndfile Plugin"
 msgstr "Sndfile plugina"
 
-#: src/sndfile/plugin.cc:336
+#: src/sndfile/plugin.cc:372
 msgid ""
 "Based on the xmms_sndfile plugin:\n"
 "Copyright (C) 2000, 2002 Erik de Castro Lopo\n"
@@ -3694,94 +3952,100 @@
 "Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:44
+#: src/sndio/sndio.cc:43
 msgid "Sndio Output"
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:98
+#: src/sndio/sndio.cc:98
 msgid "Device (blank for default):"
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:100
+#: src/sndio/sndio.cc:100
 msgid "Save and restore volume:"
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:181
+#: src/sndio/sndio.cc:181
 #, c-format
 msgid "Sndio error: Unsupported audio format (%d)"
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:192
+#: src/sndio/sndio.cc:192
 msgid "Sndio error: sio_open() failed"
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:222
+#: src/sndio/sndio.cc:221
 msgid "Sndio error: sio_setpar() failed"
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:234
+#: src/sndio/sndio.cc:233
 msgid "Sndio error: sio_start() failed"
 msgstr ""
 
-#: src/song_change/song_change.cc:33
+#: src/songchange/song_change.cc:30
 msgid "Song Change"
 msgstr ""
 
-#: src/song_change/song_change.cc:342
-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."
-
-#: src/song_change/song_change.cc:358
+#: src/songchange/song_change.cc:256
 msgid "Commands"
 msgstr ""
 
-#: src/song_change/song_change.cc:360
+#: src/songchange/song_change.cc:258
 msgid "Command to run when starting a new song:"
 msgstr ""
 
-#: src/song_change/song_change.cc:364
+#: src/songchange/song_change.cc:261
+msgid "Command to run when stopping a song:"
+msgstr ""
+
+#: src/songchange/song_change.cc:264
 msgid "Command to run at the end of a song:"
 msgstr ""
 
-#: src/song_change/song_change.cc:368
+#: src/songchange/song_change.cc:267
 msgid "Command to run at the end of the playlist:"
 msgstr ""
 
-#: src/song_change/song_change.cc:372
+#: src/songchange/song_change.cc:270
 msgid "Command to run when song title changes (for network streams):"
 msgstr ""
 
-#: src/song_change/song_change.cc:376
+#: src/songchange/song_change.cc:273
 msgid ""
-"You can use the following format strings which will be substituted before "
-"calling the command (not all are useful for the end-of-playlist command):\n"
-"\n"
-"%F: Frequency (in hertz)\n"
+"You can use the following format codes, which will be replaced before "
+"running the command.\n"
+"Not all are useful though for the song-stopped or end-of-playlist command."
+msgstr ""
+
+#: src/songchange/song_change.cc:276
+msgid ""
+"%a: Artist\n"
+"%b: Album\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"
+"%F: Frequency (Hertz)\n"
+"%l: Length (milliseconds)\n"
+"%n or %s: Formatted title (see playlist settings)\n"
 "%p: Currently playing (1 or 0)\n"
-"%a: Artist\n"
-"%b: Album\n"
-"%T: Track title"
+"%r: Rate (bits per second)\n"
+"%t: Playlist position\n"
+"%T: Title (unformatted)"
 msgstr ""
 
-#: src/song-info-qt/song-info.cc:32
-msgid "Song Info (Qt)"
+#: src/songchange/song_change.cc:287
+msgid ""
+"Parameters passed to the shell should be enclosed in quotation marks.\n"
+"Unquoted parameters may lead to unexpected results."
 msgstr ""
 
-#: src/sox-resampler/sox-resampler.cc:44
+#: src/song-info-qt/song-info.cc:30
+msgid "Song Info"
+msgstr "Kantu informazioa"
+
+#: src/soxr/sox-resampler.cc:44
 msgid "SoX Resampler"
 msgstr ""
 
-#: src/sox-resampler/sox-resampler.cc:144
+#: src/soxr/sox-resampler.cc:172
 msgid ""
 "SoX Resampler Plugin for Audacious\n"
 "Copyright 2013 Michał Lipski\n"
@@ -3790,89 +4054,129 @@
 "Copyright 2010-2012 John Lindgren"
 msgstr ""
 
-#: src/sox-resampler/sox-resampler.cc:150
+#: src/soxr/sox-resampler.cc:178
 msgid "Quick"
 msgstr ""
 
-#: src/sox-resampler/sox-resampler.cc:151
+#: src/soxr/sox-resampler.cc:179
 msgid "Low"
 msgstr ""
 
-#: src/sox-resampler/sox-resampler.cc:153
+#: src/soxr/sox-resampler.cc:181
 msgid "High"
 msgstr ""
 
-#: src/sox-resampler/sox-resampler.cc:154
+#: src/soxr/sox-resampler.cc:182
 msgid "Very High"
 msgstr ""
 
-#: src/sox-resampler/sox-resampler.cc:158
+#: src/soxr/sox-resampler.cc:183
+msgid "Ultra High"
+msgstr ""
+
+#: src/soxr/sox-resampler.cc:187
+msgid "Minimum"
+msgstr ""
+
+#: src/soxr/sox-resampler.cc:188
+msgid "Intermediate"
+msgstr ""
+
+#: src/soxr/sox-resampler.cc:193
 msgid "Quality:"
+msgstr "Kalitatea:"
+
+#: src/soxr/sox-resampler.cc:196
+msgid "Phase:"
+msgstr ""
+
+#: src/soxr/sox-resampler.cc:200
+msgid "Allow aliasing"
 msgstr ""
 
-#: src/speed-pitch/speed-pitch.cc:51
+#: src/soxr/sox-resampler.cc:202
+msgid "Use steep filter"
+msgstr ""
+
+#: src/speedpitch/speed-pitch.cc:54
 msgid "Speed and Pitch"
 msgstr "Abiadura eta Tonoa"
 
-#: src/speed-pitch/speed-pitch.cc:210
-msgid "Speed and Pitch"
-msgstr "Abiadura eta Tonoa"
-
-#: src/speed-pitch/speed-pitch.cc:211
-msgid "Speed:"
-msgstr "Abiadura:"
-
-#: src/speed-pitch/speed-pitch.cc:214
-msgid "Pitch:"
-msgstr "Tonoa:"
+#: src/speedpitch/speed-pitch.cc:247
+msgid "Speed"
+msgstr ""
 
-#: src/statusicon/statusicon.cc:47
-msgid "Status Icon"
+#: src/speedpitch/speed-pitch.cc:248
+msgid "Decouple from pitch"
 msgstr ""
 
-#: src/statusicon/statusicon.cc:283
-msgid "Se_ttings ..."
+#: src/speedpitch/speed-pitch.cc:250 src/speedpitch/speed-pitch.cc:258
+msgid "Multiplier:"
+msgstr ""
+
+#: src/speedpitch/speed-pitch.cc:254
+msgid "Pitch"
+msgstr ""
+
+#: src/statusicon-qt/statusicon.cc:45 src/statusicon/statusicon.cc:47
+msgid "Status Icon"
 msgstr ""
 
-#: src/statusicon/statusicon.cc:372
+#: src/statusicon-qt/statusicon.cc:68
 msgid ""
-"Status Icon Plugin\n"
+"Status Icon Plugin (partial port for Qt interface)\n"
 "\n"
 "Copyright 2005-2007 Giacomo Lozito <james@develia.org>\n"
 "Copyright 2010 Michał Lipski <tallica@o2.pl>\n"
+"Copyright 2015 Eugene Paskevich <eugene@raptor.kiev.ua>\n"
 "\n"
 "This plugin provides a status icon, placed in\n"
 "the system tray area of the window manager."
 msgstr ""
 
-#: src/statusicon/statusicon.cc:379
+#: src/statusicon-qt/statusicon.cc:89 src/statusicon/statusicon.cc:384
 msgid "Mouse Scroll Action"
 msgstr ""
 
-#: src/statusicon/statusicon.cc:380
+#: src/statusicon-qt/statusicon.cc:90 src/statusicon/statusicon.cc:385
 msgid "Change volume"
 msgstr "Aldatu bolumena"
 
-#: src/statusicon/statusicon.cc:383
+#: src/statusicon-qt/statusicon.cc:93 src/statusicon/statusicon.cc:388
 msgid "Change playing song"
 msgstr "Aldatu erreprodukzioaren abestia"
 
-#: src/statusicon/statusicon.cc:386
+#: src/statusicon-qt/statusicon.cc:96 src/statusicon/statusicon.cc:391
 msgid "Other Settings"
 msgstr "Bestelako Ezarpenak"
 
-#: src/statusicon/statusicon.cc:387
+#: src/statusicon-qt/statusicon.cc:97 src/statusicon/statusicon.cc:392
 msgid "Disable the popup window"
 msgstr ""
 
-#: src/statusicon/statusicon.cc:389
+#: src/statusicon-qt/statusicon.cc:99 src/statusicon/statusicon.cc:394
 msgid "Close to the system tray"
 msgstr ""
 
-#: src/statusicon/statusicon.cc:391
+#: src/statusicon-qt/statusicon.cc:101 src/statusicon/statusicon.cc:396
 msgid "Advance in playlist when scrolling upward"
 msgstr ""
 
+#: src/statusicon-qt/statusicon.cc:116 src/statusicon/statusicon.cc:287
+msgid "Se_ttings ..."
+msgstr ""
+
+#: src/statusicon/statusicon.cc:377
+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/stereo_plugin/stereo.cc:19
 msgid "Extra Stereo"
 msgstr ""
@@ -3888,20 +4192,160 @@
 msgid "Extra Stereo"
 msgstr ""
 
+#: src/streamtuner/icecast-model.cc:126 src/streamtuner/shoutcast-model.cc:131
+msgid "Type"
+msgstr "Mota"
+
+#: src/streamtuner/icecast-model.cc:132
+msgid "Current Song"
+msgstr "Uneko kanta"
+
+#: src/streamtuner/icecast-model.cc:164
+msgid "Other"
+msgstr ""
+
+#: src/streamtuner/ihr-model.cc:63
+msgid "Market"
+msgstr ""
+
+#: src/streamtuner/ihr-model.cc:156
+msgid "Call Letters"
+msgstr ""
+
+#: src/streamtuner/ihr-model.cc:162
+msgid "Description"
+msgstr "Deskribapen"
+
+#: src/streamtuner/shoutcast-model.cc:128
+msgid "Listeners"
+msgstr "Entzuleak"
+
+#: src/streamtuner/shoutcast-model.cc:188
+msgid "Top 500 Stations"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:189
+msgid "Alternative"
+msgstr "Alternatiboa"
+
+#: src/streamtuner/shoutcast-model.cc:190
+msgid "Blues"
+msgstr "Blues-a"
+
+#: src/streamtuner/shoutcast-model.cc:191
+msgid "Classical"
+msgstr "Klasikoa"
+
+#: src/streamtuner/shoutcast-model.cc:192
+msgid "Country"
+msgstr "Country"
+
+#: src/streamtuner/shoutcast-model.cc:193
+msgid "Decades"
+msgstr "Kamarkadak"
+
+#: src/streamtuner/shoutcast-model.cc:194
+msgid "Easy Listening"
+msgstr "Entzuteko erraza"
+
+#: src/streamtuner/shoutcast-model.cc:195
+msgid "Electronic"
+msgstr "Elektroniko"
+
+#: src/streamtuner/shoutcast-model.cc:196
+msgid "Folk"
+msgstr "Folka"
+
+#: src/streamtuner/shoutcast-model.cc:197
+msgid "Inspirational"
+msgstr "Inspirazio lanak"
+
+#: src/streamtuner/shoutcast-model.cc:198
+msgid "International"
+msgstr "Nazioarteko"
+
+#: src/streamtuner/shoutcast-model.cc:199
+msgid "Jazz"
+msgstr "Jazza"
+
+#: src/streamtuner/shoutcast-model.cc:200
+msgid "Latin"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:201
+msgid "Metal"
+msgstr "Metala"
+
+#: src/streamtuner/shoutcast-model.cc:203
+msgid "New Age"
+msgstr "New Age"
+
+#: src/streamtuner/shoutcast-model.cc:204
+msgid "Pop"
+msgstr "Pop-a"
+
+#: src/streamtuner/shoutcast-model.cc:205
+msgid "Public Radio"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:206
+msgid "R&B and Urban"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:207
+msgid "Rap"
+msgstr "Rap-a"
+
+#: src/streamtuner/shoutcast-model.cc:208
+msgid "Reggae"
+msgstr "Reggae"
+
+#: src/streamtuner/shoutcast-model.cc:209
+msgid "Rock"
+msgstr "Rocka"
+
+#: src/streamtuner/shoutcast-model.cc:210
+msgid "Seasonal and Holiday"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:211
+msgid "Soundtracks"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:212
+msgid "Talk"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:213
+msgid "Themes"
+msgstr "Motiboak"
+
+#: src/streamtuner/streamtuner.cc:59
+msgid "Shoutcast"
+msgstr ""
+
+#: src/streamtuner/streamtuner.cc:60
+msgid "Icecast"
+msgstr ""
+
+#: src/streamtuner/streamtuner.cc:71
+msgid "Stream Tuner"
+msgstr ""
+
 #: src/tonegen/tonegen.cc:45
 msgid "Tone Generator"
-msgstr ""
+msgstr "Tonu-sortzailea"
 
-#: src/tonegen/tonegen.cc:94
+#: src/tonegen/tonegen.cc:92
 #, c-format
 msgid "%s %.1f Hz"
 msgstr "%s %.1f Hz"
 
-#: src/tonegen/tonegen.cc:94
+#: src/tonegen/tonegen.cc:92
 msgid "Tone Generator: "
 msgstr "Tonu-sortzailea: "
 
-#: src/tonegen/tonegen.cc:160
+#: src/tonegen/tonegen.cc:161
 msgid ""
 "Sine tone generator by Håvard Kvålen <havardk@xmms.org>\n"
 "Modified by Daniel J. Peng <danielpeng@bigfoot.com>\n"
@@ -3910,11 +4354,32 @@
 "e.g. tone://2000;2005 to play a 2000 Hz tone and a 2005 Hz tone"
 msgstr ""
 
+#: src/ui-common/dialogs-qt.cc:40
+msgid ""
+"\n"
+"(Further messages have been hidden.)"
+msgstr ""
+"\n"
+"(Mezuak ezkutatu dira.)"
+
+#: src/ui-common/dialogs-qt.cc:52
+msgid "Working ..."
+msgstr "Lanean ..."
+
+#: src/ui-common/dialogs-qt.cc:73
+msgid "Information"
+msgstr "Informazio"
+
+#: src/ui-common/menu-ops-gtk.cc:132 src/ui-common/menu-ops-qt.cc:113
+#, c-format
+msgid "%s does not appear to be a valid folder."
+msgstr ""
+
 #: src/voice_removal/voice_removal.cc:28
 msgid "Voice Removal"
-msgstr ""
+msgstr "Ahotsa ezabatzea"
 
-#: src/vorbis/vorbis.cc:465
+#: src/vorbis/vorbis.cc:433
 msgid ""
 "Audacious Ogg Vorbis Decoder\n"
 "\n"
@@ -3939,12 +4404,12 @@
 msgid "Ogg Vorbis Decoder"
 msgstr "Ogg Vorbis Deskodetzailea"
 
-#: src/vtx/info.cc:22
+#: src/vtx/info.cc:24
 #, c-format
 msgid "Details about %s"
 msgstr ""
 
-#: src/vtx/info.cc:24
+#: src/vtx/info.cc:26
 msgid ""
 "Title: %t\n"
 "Author: %a\n"
@@ -3963,44 +4428,104 @@
 msgid "VTX Decoder"
 msgstr "VTX Deskodetzailea"
 
-#: src/vtx/vtx.cc:184
+#: src/vtx/vtx.cc:178
 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/wavpack/wavpack.cc:24
+#: src/vumeter-qt/vumeter_qt.cc:31
+msgid ""
+"VU Meter Plugin for Audacious\n"
+"Copyright 2017-2019 Marc Sánchez Fauste"
+msgstr ""
+
+#: src/vumeter-qt/vumeter_qt.cc:35
+msgid "VU Meter Settings"
+msgstr ""
+
+#: src/vumeter-qt/vumeter_qt.cc:37
+msgid "Peak hold time:"
+msgstr ""
+
+#: src/vumeter-qt/vumeter_qt.cc:42
+msgid "Fall-off time:"
+msgstr ""
+
+#: src/vumeter-qt/vumeter_qt.cc:44
+msgid "dB/second"
+msgstr ""
+
+#: src/vumeter-qt/vumeter_qt.cc:46
+msgid "Display legend"
+msgstr ""
+
+#: src/vumeter-qt/vumeter_qt.h:37
+msgid "VU Meter"
+msgstr ""
+
+#: src/waveout/waveout.cc:43
+msgid "Win32 waveOut"
+msgstr ""
+
+#: src/waveout/waveout.cc:69
+msgid ""
+"Win32 waveOut Plugin for Audacious\n"
+"Copyright 2016 John Lindgren"
+msgstr ""
+
+#: src/wavpack/wavpack.cc:25
 msgid "WavPack Decoder"
 msgstr "WavPack Deskodetzailea"
 
-#: src/wavpack/wavpack.cc:211
+#: src/wavpack/wavpack.cc:217
 msgid "lossy (hybrid)"
 msgstr ""
 
-#: src/wavpack/wavpack.cc:213
+#: src/wavpack/wavpack.cc:219
 msgid "lossy"
 msgstr ""
 
-#: src/wavpack/wavpack.cc:255
+#: src/wavpack/wavpack.cc:259
 msgid ""
 "Copyright 2006 William Pitcock <nenolod@nenolod.net>\n"
 "\n"
 "Some of the plugin code was by Miles Egan."
 msgstr ""
 
-#: src/xsf/plugin.cc:50
+#: src/xsf/plugin.cc:74
 msgid "2SF Decoder"
 msgstr "2SF Deskodetzailea"
 
-#: src/xsf/plugin.cc:238
+#: src/xsf/plugin.cc:429
+msgid "32728 Hz"
+msgstr ""
+
+#: src/xsf/plugin.cc:432
+msgid "65456 Hz"
+msgstr ""
+
+#: src/xsf/plugin.cc:438
+msgid "Cosine"
+msgstr ""
+
+#: src/xsf/plugin.cc:439
+msgid "Sharp"
+msgstr ""
+
+#: src/xsf/plugin.cc:443
 msgid "XSF Configuration"
 msgstr ""
 
-#: src/xsf/plugin.cc:239
-msgid "Ignore length from file"
+#: src/xsf/plugin.cc:445
+msgid "Default fade time:"
+msgstr ""
+
+#: src/xsf/plugin.cc:447
+msgid "Interpolation mode:"
 msgstr ""
 
-#: src/xspf/xspf.cc:89
+#: src/xspf/xspf.cc:95
 msgid "XML Shareable Playlists (XSPF)"
 msgstr ""

audacious-plugins-3.6.2-gtk3.tar.bz2/po/fa_IR.po -> audacious-plugins-4.4.1.tar.bz2/po/fa_IR.po Changed

@@ -3,258 +3,81 @@
 # This file is distributed under the same license as the Audacious Plugins package.
 #
 # Translators:
+# Alireza kia <keyhan32@mail.ru>, 2021
 # Saeed Derakhshan <saeed.love@gmail.com>, 2013
 # vandu <vandusoft@gmail.com>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: Audacious Plugins\n"
-"Report-Msgid-Bugs-To: http://redmine.audacious-media-player.org/\n"
-"POT-Creation-Date: 2015-02-28 19:18+0100\n"
-"PO-Revision-Date: 2015-02-04 21:21+0000\n"
-"Last-Translator: Thomas Lange <thomas-lange2@gmx.de>\n"
-"Language-Team: Persian (Iran) (http://www.transifex.com/projects/p/audacious/"
+"Report-Msgid-Bugs-To: https://github.com/audacious-media-player/audacious/"
+"issues\n"
+"POT-Creation-Date: 2024-09-26 21:54+0200\n"
+"PO-Revision-Date: 2011-10-10 17:43+0000\n"
+"Last-Translator: Alireza kia <keyhan32@mail.ru>, 2021\n"
+"Language-Team: Persian (Iran) (http://app.transifex.com/audacious/audacious/"
 "language/fa_IR/)\n"
 "Language: fa_IR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: src/aac-raw/aac.cc:18
+#: src/aac/aac.cc:19
 msgid "AAC (Raw) Decoder"
 msgstr ""
 
-#: src/adplug/adplug-xmms.cc:42
+#: src/adplug/adplug-xmms.cc:70
 msgid "AdPlug (AdLib Player)"
 msgstr ""
 
-#: src/adplug/adplug-xmms.cc:156 src/modplug/modplugbmp.cc:335
-#: src/psf/plugin.cc:138 src/vtx/vtx.cc:87 src/xsf/plugin.cc:113
+#: src/adplug/adplug-xmms.cc:167 src/modplug/modplugbmp.cc:321
+#: src/psf/plugin.cc:161 src/vtx/vtx.cc:89 src/xsf/plugin.cc:204
 msgid "sequenced"
 msgstr ""
 
-#: src/alarm/alarm.cc:55 src/alarm/interface.cc:82
-msgid "Alarm"
-msgstr "هشدار"
-
-#: src/alarm/alarm.cc:782
-msgid "Set Alarm ..."
-msgstr ""
-
-#: src/alarm/alarm.cc:810
-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/interface.cc: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/adplug/adplug-xmms.cc:349 src/sid/xs_config.cc:61
+msgid "Output"
+msgstr "خروجی"
 
-#: src/alarm/interface.cc: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"
+#: src/adplug/adplug-xmms.cc:350
+msgid "OPL Emulator:"
 msgstr ""
 
-#: src/alarm/interface.cc: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/adplug/adplug-xmms.cc:353 src/amidiplug/i_configure.cc:153
+#: src/console/plugin.cc:45 src/filewriter/filewriter.cc:481
+#: src/sid/xs_config.cc:65 src/xsf/plugin.cc:446
+msgid "Sample rate:"
+msgstr "نرخ نمونه برداری:"
 
-#: src/alarm/interface.cc:81
-msgid "This is your wakeup call."
-msgstr "این تماس بیدارباش شما است."
+#: src/adplug/adplug-xmms.cc:354 src/amidiplug/i_configure.cc:155
+#: src/bs2b/plugin.cc:141 src/console/plugin.cc:47
+#: src/modplug/plugin_main.cc:77 src/resample/resample.cc:201
+#: src/resample/resample.cc:207 src/resample/resample.cc:211
+#: src/resample/resample.cc:215 src/resample/resample.cc:219
+#: src/resample/resample.cc:223 src/resample/resample.cc:227
+#: src/resample/resample.cc:231 src/resample/resample.cc:235
+#: src/resample/resample.cc:239 src/resample/resample.cc:243
+#: src/sid/xs_config.cc:67 src/soxr/sox-resampler.cc:205
+msgid "Hz"
+msgstr "هرتز"
 
-#: src/alarm/interface.cc:99
-msgid "Your reminder for today is..."
+#: src/adplug/adplug-xmms.cc:355 src/gtkui/settings.cc:55
+#: src/modplug/plugin_main.cc:105 src/qtui/settings.cc:85
+#: src/skins-qt/skins_cfg.cc:302 src/skins/skins_cfg.cc:284
+msgid "Miscellaneous"
 msgstr ""
 
-#: src/alarm/interface.cc:101 src/alarm/interface.cc:386
-msgid "Reminder"
-msgstr "یادآوری"
-
-#: src/alarm/interface.cc:132
-msgid "Monday"
-msgstr "دوشنبه"
-
-#: src/alarm/interface.cc:132
-msgid "Tuesday"
-msgstr "سه‌شنبه"
-
-#: src/alarm/interface.cc:132
-msgid "Wednesday"
-msgstr "چهارشنبه"
-
-#: src/alarm/interface.cc:133
-msgid "Thursday"
-msgstr "پنج‌شنبه"
-
-#: src/alarm/interface.cc:133
-msgid "Friday"
-msgstr "جمعه"
-
-#: src/alarm/interface.cc:133
-msgid "Saturday"
-msgstr "شنبه"
-
-#: src/alarm/interface.cc:133
-msgid "Sunday"
-msgstr "یکشنبه"
-
-#: src/alarm/interface.cc:171 src/alarm/interface.cc:230
-#: src/alarm/interface.cc:245
-msgid "Time"
-msgstr "زمان"
-
-#: src/alarm/interface.cc:178
-msgid "Alarm at (default):"
-msgstr "هشدار در (پیش‌فرض):"
-
-#: src/alarm/interface.cc:200
-msgid "h"
-msgstr "س"
-
-#: src/alarm/interface.cc:203
-msgid "Quiet after:"
-msgstr "خاموش شود بعد از:"
-
-#: src/alarm/interface.cc:215
-msgid "hours"
-msgstr "ساعت"
-
-#: src/alarm/interface.cc:226
-msgid "minutes"
-msgstr "دقیقه"
-
-#: src/alarm/interface.cc:235
-msgid "Choose the days for the alarm to come on"
-msgstr "روزهای مورد نظر برای هشدار انتخاب شود"
-
-#: src/alarm/interface.cc:242
-msgid "Day"
-msgstr "روز"
-
-#: src/alarm/interface.cc:259 src/bs2b/plugin.cc:130
-#: src/skins/preset-list.cc:434 src/skins/preset-list.cc:440
-msgid "Default"
-msgstr "پیش‌فرض"
-
-#: src/alarm/interface.cc:288
-msgid "Days"
-msgstr "روزها"
-
-#: src/alarm/interface.cc:297
-msgid "Fading"
-msgstr "محو شدن"
-
-#: src/alarm/interface.cc:305 src/console/plugin.cc:41
-#: src/crossfade/crossfade.cc:53 src/crossfade/crossfade.cc:59
-#: src/gtkui/settings.cc:49 src/lirc/lirc.cc:397 src/sid/xs_config.cc:85
-#: src/sid/xs_config.cc:94 src/sid/xs_config.cc:103
-msgid "seconds"
-msgstr "ثانیه‌ها"
-
-#: src/alarm/interface.cc:312 src/alarm/interface.cc:353
-msgid "Volume"
-msgstr "صدا"
-
-#: src/alarm/interface.cc:317
-msgid "Start at"
-msgstr "شروع از"
-
-#: src/alarm/interface.cc:333
-msgid "Final"
-msgstr "پایان"
-
-#: src/alarm/interface.cc:346
-msgid "Current"
-msgstr "جاری"
-
-#: src/alarm/interface.cc:359
-msgid "Additional Command"
-msgstr "فرمان تکمیلی"
-
-#: src/alarm/interface.cc:365 src/alarm/interface.cc:391
-msgid "enable"
-msgstr "فعال‌سازی"
-
-#: src/alarm/interface.cc:372
-msgid "Playlist (optional)"
-msgstr "لیست پخش (اختیاری)"
-
-#: src/alarm/interface.cc:379
-msgid "Select a playlist"
+#: src/adplug/adplug-xmms.cc:356
+msgid "Repeat song in endless loop"
 msgstr ""
 
-#: src/alarm/interface.cc:399
-msgid "Options"
-msgstr "گزینه‌ها"
-
-#: src/alarm/interface.cc:404
-msgid "What do these options mean?"
-msgstr "معنای این گزینه‌ها چیست؟"
-
-#: src/alarm/interface.cc:420
-msgid "Help"
-msgstr "راهنمایی"
-
-#: src/albumart/albumart.cc:31
+#: src/albumart/albumart.cc:31 src/albumart-qt/albumart.cc:35
 msgid "Album Art"
 msgstr ""
 
-#: src/albumart-qt/albumart.cc:33
-msgid "Album Art (Qt)"
-msgstr ""
-
-#: src/alsa/alsa.h:70
+#: src/alsa/alsa.h:64
 msgid "ALSA Output"
-msgstr ""
+msgstr "خروجی ALSA "
 
 #: src/alsa/config.cc:28
 msgid ""
@@ -267,7 +90,7 @@
 
 #: src/alsa/config.cc:61
 msgid "(no description)"
-msgstr ""
+msgstr "(بدون شرح)"
 
 #: src/alsa/config.cc:166
 msgid "Default PCM device"
@@ -289,11 +112,11 @@
 msgid "Mixer element:"
 msgstr "عنصر میکسر:"
 
-#: src/amidi-plug/amidi-plug.cc:41
+#: src/amidiplug/amidi-plug.cc:42
 msgid "AMIDI-Plug (MIDI Player)"
 msgstr ""
 
-#: src/amidi-plug/amidi-plug.cc:437
+#: src/amidiplug/amidi-plug.cc:445
 msgid ""
 "AMIDI-Plug\n"
 "modular MIDI music player\n"
@@ -316,157 +139,156 @@
 "for the good help with alpha testing"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:94
+#: src/amidiplug/i_configure.cc:94
 msgid "Override default gain:"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:102
+#: src/amidiplug/i_configure.cc:102
 msgid "Override default polyphony:"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:110
+#: src/amidiplug/i_configure.cc:110
 msgid "Override default reverb:"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:112 src/amidi-plug/i_configure.cc:120
+#: src/amidiplug/i_configure.cc:112 src/amidiplug/i_configure.cc:120
 msgid "On"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:118
+#: src/amidiplug/i_configure.cc:118
 msgid "Override default chorus:"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:128 src/console/plugin.cc:29
+#: src/amidiplug/i_configure.cc:128 src/console/plugin.cc:29
 msgid "Playback"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:129
+#: src/amidiplug/i_configure.cc:129
 msgid "Transpose:"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:131
+#: src/amidiplug/i_configure.cc:131 src/speedpitch/speed-pitch.cc:257
 msgid "semitones"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:132
+#: src/amidiplug/i_configure.cc:132
 msgid "Drum shift:"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:134
+#: src/amidiplug/i_configure.cc:134
 msgid "note numbers"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:135
+#: src/amidiplug/i_configure.cc:135
 msgid "Skip leading silence"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:137
+#: src/amidiplug/i_configure.cc:137
 msgid "Skip trailing silence"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:141
+#: src/amidiplug/i_configure.cc:141
 msgid "SoundFont"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:143
+#: src/amidiplug/i_configure.cc:148
 msgid "Synthesizer"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:148 src/console/plugin.cc:45
-#: src/sid/xs_config.cc:65
-msgid "Sample rate:"
-msgstr ""
-
-#: src/amidi-plug/i_configure.cc:150 src/bs2b/plugin.cc:141
-#: src/console/plugin.cc:47 src/modplug/plugin_main.cc:78
-#: src/resample/resample.cc:201 src/resample/resample.cc:207
-#: src/resample/resample.cc:211 src/resample/resample.cc:215
-#: src/resample/resample.cc:219 src/resample/resample.cc:223
-#: src/resample/resample.cc:227 src/resample/resample.cc:231
-#: src/resample/resample.cc:235 src/resample/resample.cc:239
-#: src/resample/resample.cc:243 src/sid/xs_config.cc:67
-#: src/sox-resampler/sox-resampler.cc:163
-msgid "Hz"
-msgstr "هرتز"
-
-#: src/amidi-plug/i_configure-fluidsynth.cc:52
+#: src/amidiplug/i_configure-fluidsynth.cc:58
+#: src/amidiplug/i_configure-fluidsynth.cc:527
 msgid "AMIDI-Plug - select SoundFont file"
 msgstr "AMIDI-Plug - فایل SoundFont انتخاب شود"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:55 src/filewriter/mp3.cc:658
+#: src/amidiplug/i_configure-fluidsynth.cc:61
 msgid "_Cancel"
-msgstr ""
+msgstr "_انصراف"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:56
+#: src/amidiplug/i_configure-fluidsynth.cc:62
 msgid "_Open"
-msgstr ""
+msgstr "_باز کردن"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:225 src/gtkui/columns.cc:46
+#: src/amidiplug/i_configure-fluidsynth.cc:233
+#: src/amidiplug/i_configure-fluidsynth.cc:461
 msgid "File name"
 msgstr "نام فایل"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:229
+#: src/amidiplug/i_configure-fluidsynth.cc:237
+#: src/amidiplug/i_configure-fluidsynth.cc:464
 msgid "Size (bytes)"
 msgstr "اندازه (بایت)"
 
-#: src/amidi-plug/i_fileinfo.cc:163
+#: src/amidiplug/i_fileinfo.cc:184
 msgid "Name:"
 msgstr "نام:"
 
-#: src/amidi-plug/i_fileinfo.cc:181
+#: src/amidiplug/i_fileinfo.cc:202
 msgid " MIDI Info "
 msgstr " ‏اطلاعات MIDI ‏"
 
-#: src/amidi-plug/i_fileinfo.cc:195
+#: src/amidiplug/i_fileinfo.cc:216
 msgid "Format:"
 msgstr "فرمت:"
 
-#: src/amidi-plug/i_fileinfo.cc:198
+#: src/amidiplug/i_fileinfo.cc:219
 msgid "Length (msec):"
 msgstr "مدت زمان (میلی‌ثانیه):"
 
-#: src/amidi-plug/i_fileinfo.cc:201
+#: src/amidiplug/i_fileinfo.cc:222
 msgid "No. of Tracks:"
-msgstr ""
+msgstr "تعداد آهنگ ها:"
 
-#: src/amidi-plug/i_fileinfo.cc:207
+#: src/amidiplug/i_fileinfo.cc:228
 msgid "variable"
 msgstr "متغیر"
 
-#: src/amidi-plug/i_fileinfo.cc:209
+#: src/amidiplug/i_fileinfo.cc:230
 msgid "BPM:"
 msgstr "BPM:"
 
-#: src/amidi-plug/i_fileinfo.cc:217
+#: src/amidiplug/i_fileinfo.cc:238
 msgid "BPM (wavg):"
 msgstr "‎BPM (wavg)‎:"
 
-#: src/amidi-plug/i_fileinfo.cc:220
+#: src/amidiplug/i_fileinfo.cc:241
 msgid "Time Div:"
 msgstr "قسمت زمان:"
 
-#: src/amidi-plug/i_fileinfo.cc:231
+#: src/amidiplug/i_fileinfo.cc:252
 msgid " MIDI Comments and Lyrics "
 msgstr " توضیحات و ترانه‌های MIDI‏ "
 
-#: src/amidi-plug/i_fileinfo.cc:278
+#: src/amidiplug/i_fileinfo.cc:299
 msgid "* no comments available in this MIDI file *"
 msgstr "* توضیحاتی در این فایل MIDI وجود ندارد *"
 
-#: src/amidi-plug/i_fileinfo.cc:290
+#: src/amidiplug/i_fileinfo.cc:311
 msgid "* no lyrics available in this MIDI file *"
 msgstr "* ترانه‌ای در این فایل MIDI وجود ندارد *"
 
-#: src/amidi-plug/i_fileinfo.cc:300 src/filewriter/vorbis.cc:197
-#: src/ladspa/plugin.cc:416
+#: src/amidiplug/i_fileinfo.cc:321 src/ladspa/plugin.cc:418
+#: src/ui-common/dialogs-qt.cc:32
 msgid "_Close"
 msgstr "بستن"
 
-#: src/amidi-plug/i_fileinfo.cc:325
+#: src/amidiplug/i_fileinfo.cc:346
 msgid " (invalid UTF-8)"
 msgstr "(UTF-8 نامعتبر)"
 
-#: src/aosd/aosd.cc:32
+#: src/ampache/ampache.cc:33
+msgid "Ampache Browser"
+msgstr ""
+
+#: src/ampache/ampache.cc:46
+msgid ""
+"Ampache Browser for Audacious\n"
+"http://ampache-browser.org/\n"
+"\n"
+"Copyright (C) Róbert Čerňanský and John Lindgren\n"
+"License: GNU GPLv3"
+msgstr ""
+
+#: src/aosd/aosd.cc:31
 msgid ""
 "Audacious OSD\n"
 "http://www.develia.org/projects.php?p=audacious#aosd\n"
@@ -493,130 +315,130 @@
 msgid "Concave Rectangle"
 msgstr "مستطیل مقعر"
 
-#: src/aosd/aosd_style.cc:69
+#: src/aosd/aosd_style.cc:69 src/openmpt/mptwrap.h:50 src/xsf/plugin.cc:436
 msgid "None"
 msgstr "هیچکدام"
 
-#: src/aosd/aosd_trigger.cc:50
+#: src/aosd/aosd_trigger.cc:49
 msgid "Playback Start"
 msgstr "شروع پخش"
 
-#: src/aosd/aosd_trigger.cc:51
+#: src/aosd/aosd_trigger.cc:50
 msgid "Triggers OSD when a playlist entry is played."
 msgstr "وقتی یکی از گزینه‌های لیست پخش اجرا شد OSD اجرا شود."
 
-#: src/aosd/aosd_trigger.cc:56
+#: src/aosd/aosd_trigger.cc:55
 msgid "Title Change"
 msgstr "تغییر عنوان"
 
-#: src/aosd/aosd_trigger.cc:57
+#: src/aosd/aosd_trigger.cc:56
 msgid "Triggers OSD when the song title changes (for internet streams)."
 msgstr ""
 
-#: src/aosd/aosd_trigger.cc:62
+#: src/aosd/aosd_trigger.cc:61
 msgid "Pause On"
 msgstr "توقف روشن"
 
-#: src/aosd/aosd_trigger.cc:63
+#: src/aosd/aosd_trigger.cc:62
 msgid "Triggers OSD when playback is paused."
 msgstr "وقتی عملیات پخش متوقف شد OSD اجرا شود."
 
-#: src/aosd/aosd_trigger.cc:68
+#: src/aosd/aosd_trigger.cc:67
 msgid "Pause Off"
 msgstr "توقف خاموش"
 
-#: src/aosd/aosd_trigger.cc:69
+#: src/aosd/aosd_trigger.cc:68
 msgid "Triggers OSD when playback is unpaused."
 msgstr "وقتی از پخش از حالت توقف خارج شد OSD اجرا شود."
 
-#: src/aosd/aosd_ui.cc:163
+#: src/aosd/aosd_ui.cc:204
 msgid "Placement"
 msgstr "محل قرارگیری"
 
-#: src/aosd/aosd_ui.cc:196
+#: src/aosd/aosd_ui.cc:241
 msgid "Relative X offset:"
 msgstr "فاصله نسبی از عرض:"
 
-#: src/aosd/aosd_ui.cc:203
+#: src/aosd/aosd_ui.cc:245
 msgid "Relative Y offset:"
 msgstr "فاصله نسبی از ارتفاع:"
 
-#: src/aosd/aosd_ui.cc:210
+#: src/aosd/aosd_ui.cc:249
 msgid "Max OSD width:"
 msgstr "حداکثر طول OSD:"
 
-#: src/aosd/aosd_ui.cc:221
+#: src/aosd/aosd_ui.cc:281
 msgid "Multi-Monitor options"
 msgstr "گزینه‌های حالت چندنمایشگره"
 
-#: src/aosd/aosd_ui.cc:225
+#: src/aosd/aosd_ui.cc:285
 msgid "Display OSD using:"
 msgstr "نمایش OSD بوسیله:"
 
-#: src/aosd/aosd_ui.cc:227
+#: src/aosd/aosd_ui.cc:287
 msgid "all monitors"
 msgstr "همه نمایشگرها"
 
-#: src/aosd/aosd_ui.cc:230
+#: src/aosd/aosd_ui.cc:290
 #, c-format
 msgid "monitor %i"
 msgstr "نمایشگر ‎%i"
 
-#: src/aosd/aosd_ui.cc:282
+#: src/aosd/aosd_ui.cc:342
 msgid "Timing (ms)"
 msgstr "زمان‌بندی (برحسب میلی‌ثانیه)"
 
-#: src/aosd/aosd_ui.cc:287
+#: src/aosd/aosd_ui.cc:347
 msgid "Display:"
 msgstr "نمایش:"
 
-#: src/aosd/aosd_ui.cc:292
+#: src/aosd/aosd_ui.cc:352
 msgid "Fade in:"
 msgstr "نمایش تدریجی:"
 
-#: src/aosd/aosd_ui.cc:297
+#: src/aosd/aosd_ui.cc:357
 msgid "Fade out:"
 msgstr "خروج تدریجی:"
 
-#: src/aosd/aosd_ui.cc:361
+#: src/aosd/aosd_ui.cc:442
 msgid "Fonts"
 msgstr "فونت‌ها"
 
-#: src/aosd/aosd_ui.cc:368
+#: src/aosd/aosd_ui.cc:449
 #, c-format
 msgid "Font %i:"
 msgstr "فونت ‎%i:"
 
-#: src/aosd/aosd_ui.cc:382
+#: src/aosd/aosd_ui.cc:466
 msgid "Shadow"
 msgstr "سایه"
 
-#: src/aosd/aosd_ui.cc:486
+#: src/aosd/aosd_ui.cc:589
 msgid "Render Style"
 msgstr "شیوه رندر"
 
-#: src/aosd/aosd_ui.cc:502
+#: src/aosd/aosd_ui.cc:605
 msgid "Colors"
 msgstr "رنگ‌ها"
 
-#: src/aosd/aosd_ui.cc:513
+#: src/aosd/aosd_ui.cc:616
 #, c-format
 msgid "Color %i:"
 msgstr "رنگ ‎%i:"
 
-#: src/aosd/aosd_ui.cc:600
+#: src/aosd/aosd_ui.cc:714
 msgid "Enable trigger"
 msgstr "فعال‌سازی اجرا"
 
-#: src/aosd/aosd_ui.cc:627
+#: src/aosd/aosd_ui.cc:741
 msgid "Event"
 msgstr "رخداد"
 
-#: src/aosd/aosd_ui.cc:655
+#: src/aosd/aosd_ui.cc:768
 msgid "Composite manager detected"
 msgstr "مدیرکامپوزیت یافت شد"
 
-#: src/aosd/aosd_ui.cc:662
+#: src/aosd/aosd_ui.cc:775
 msgid ""
 "Composite manager not detected;\n"
 "unless you know that you have one running, please activate a composite "
@@ -626,66 +448,62 @@
 "اگر می‌دانید در حال اجراست، لطفا یک مدیر کامپوزیت را فعال کنید، در غیراینصورت "
 "OSD‌ بدرسی نشان داده نمی‌شود"
 
-#: src/aosd/aosd_ui.cc:670
+#: src/aosd/aosd_ui.cc:783
 msgid "Composite manager not required for fake transparency"
 msgstr "برای شفافیت ساختگی نیازی به مدیر کامپوزیت نیست"
 
-#: src/aosd/aosd_ui.cc:706
+#: src/aosd/aosd_ui.cc:820
 msgid "Transparency"
 msgstr "شفافیت"
 
-#: src/aosd/aosd_ui.cc:712
+#: src/aosd/aosd_ui.cc:826
 msgid "Fake transparency"
 msgstr "شفافیت ساختگی"
 
-#: src/aosd/aosd_ui.cc:714
+#: src/aosd/aosd_ui.cc:828
 msgid "Real transparency (requires X Composite Ext.)"
 msgstr "شفافیت واقعی (به افزونه کامپوزیت X نیاز دارد)"
 
-#: src/aosd/aosd_ui.cc:756
+#: src/aosd/aosd_ui.cc:875
 msgid "Composite extension not loaded"
 msgstr "افزونه کامپوزیت بارگذاری نشده است"
 
-#: src/aosd/aosd_ui.cc:764
-msgid "Composite extension not available"
-msgstr "افزونه کامپوزیت در دسترس نیست"
-
-#: src/aosd/aosd_ui.cc:781
+#: src/aosd/aosd_ui.cc:892
 #, c-format
 msgid "Audacious OSD"
 msgstr "Audacious OSD"
 
-#: src/aosd/aosd_ui.cc:844
+#: src/aosd/aosd_ui.cc:955
 msgid "Position"
 msgstr "مکان"
 
-#: src/aosd/aosd_ui.cc:849
+#: src/aosd/aosd_ui.cc:960
 msgid "Animation"
 msgstr "پویانمایی"
 
-#: src/aosd/aosd_ui.cc:854
+#: src/aosd/aosd_ui.cc:965
 msgid "Text"
 msgstr "متن"
 
-#: src/aosd/aosd_ui.cc:859
+#: src/aosd/aosd_ui.cc:970
 msgid "Decoration"
 msgstr "تزیینات"
 
-#: src/aosd/aosd_ui.cc:864
+#: src/aosd/aosd_ui.cc:975
 msgid "Trigger"
 msgstr "تریگر"
 
-#: src/aosd/aosd_ui.cc:869
+#: src/aosd/aosd_ui.cc:980 src/streamtuner/shoutcast-model.cc:202
 msgid "Misc"
 msgstr "متفرقه"
 
-#: src/aosd/aosd_ui.cc:878
+#: src/aosd/aosd_ui.cc:989
 msgid "Test"
-msgstr ""
+msgstr "آزمایش"
 
 #: src/asx3/asx3.cc:35
 msgid "ASXv3 Playlists"
-msgstr ""
+msgstr "لیست پخش های ASXv3"
 
 #: src/asx/asx.cc:33
 msgid "ASXv1/ASXv2 Playlists"
@@ -695,11 +513,83 @@
 msgid "Audacious Playlists (audpl)"
 msgstr ""
 
-#: src/blur_scope/blur_scope.cc:42
-msgid "Color"
+#: src/background_music/background_music.cc:24
+msgid "Background music"
+msgstr ""
+
+#: src/background_music/background_music.cc:25
+msgid "Target level:"
+msgstr ""
+
+#: src/background_music/background_music.cc:28
+#: src/background_music/background_music.cc:33
+#: src/silence-removal/silence-removal.cc:70
+msgid "dB"
+msgstr "دسیبل"
+
+#: src/background_music/background_music.cc:29
+msgid "Maximum amplification:"
+msgstr ""
+
+#: src/background_music/background_music.cc:34 src/mpg123/mpg123.cc:81
+msgid "Advanced"
+msgstr "پیشرفته"
+
+#: src/background_music/background_music.cc:36
+msgid "Slow detection weight:"
 msgstr ""
 
-#: src/blur_scope/blur_scope.cc:58
+#: src/background_music/background_music.cc:39
+msgid "Hint"
+msgstr ""
+
+#: src/background_music/background_music.cc:41
+msgid ""
+"Slow detection weight is the relative weight\n"
+"of a long term average detection when compared\n"
+"to the actual, faster loudness detection.\n"
+"A value of zero gives a more radio-like sound\n"
+"where soft passages get \"pulled up\" more quickly,\n"
+"a value of two makes the sound feel less compressed."
+msgstr ""
+
+#: src/background_music/background_music.cc:52
+msgid ""
+"Background Music Plugin for Audacious\n"
+"Copyright 2023;2024 Michel Fleur\n"
+"\n"
+"Controls the volume to make the sound equally loud within and between "
+"tracks.\n"
+" It uses accurate loudness measurement and tries to make the volume changes "
+"sound natural without audible peaks, yet without lowering the volume before "
+"a peak in advance."
+msgstr ""
+
+#: src/background_music/background_music.cc:61
+msgid "Background Music"
+msgstr ""
+
+#: src/bitcrusher/bitcrusher.cc:33
+msgid "Bitcrusher"
+msgstr ""
+
+#: src/bitcrusher/bitcrusher.cc:34
+msgid "Bit Depth:"
+msgstr ""
+
+#: src/bitcrusher/bitcrusher.cc:37
+msgid "Downsample ratio:"
+msgstr ""
+
+#: src/bitcrusher/bitcrusher.cc:48
+msgid "Bitcrusher"
+msgstr ""
+
+#: src/blur_scope/blur_scope.cc:40 src/blur_scope-qt/blur_scope.cc:45
+msgid "Color"
+msgstr "رنگ"
+
+#: src/blur_scope/blur_scope.cc:56 src/blur_scope-qt/blur_scope.cc:158
 msgid "Blur Scope"
 msgstr ""
 
@@ -711,6 +601,10 @@
 msgid "Presets:"
 msgstr ""
 
+#: src/bs2b/plugin.cc:130
+msgid "Default"
+msgstr "پیش‌فرض"
+
 #: src/bs2b/plugin.cc:136
 msgid "Feed level:"
 msgstr ""
@@ -723,15 +617,15 @@
 msgid "Cut frequency:"
 msgstr ""
 
-#: src/cairo-spectrum/cairo-spectrum.cc:41
+#: src/cairo-spectrum/cairo-spectrum.cc:42 src/qt-spectrum/qt-spectrum.cc:107
 msgid "Spectrum Analyzer"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:72
+#: src/cdaudio/cdaudio-ng.cc:74
 msgid "Audio CD Plugin"
-msgstr ""
+msgstr "پلوگین سی دی صوتی"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:121
+#: src/cdaudio/cdaudio-ng.cc:121
 msgid ""
 "Copyright (C) 2007-2012 Calin Crisan <ccrisan@gmail.com> and others.\n"
 "\n"
@@ -743,132 +637,132 @@
 "This was a Google Summer of Code 2007 project."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:137
+#: src/cdaudio/cdaudio-ng.cc:140
 msgid "Device"
-msgstr ""
+msgstr "وسیله"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:138
+#: src/cdaudio/cdaudio-ng.cc:141
 msgid "Read speed:"
-msgstr ""
+msgstr "سرعت خوانش:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:141
+#: src/cdaudio/cdaudio-ng.cc:144
 msgid "Override device:"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:143
+#: src/cdaudio/cdaudio-ng.cc:146
 msgid "Metadata"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:144
+#: src/cdaudio/cdaudio-ng.cc:147
 msgid "Use CD-Text"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:146
+#: src/cdaudio/cdaudio-ng.cc:150
 msgid "Use CDDB"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:148
+#: src/cdaudio/cdaudio-ng.cc:152
 msgid "Use HTTP instead of CDDBP"
 msgstr "بجای CDDBP از HTTP استفاده کن"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:151
+#: src/cdaudio/cdaudio-ng.cc:155
 msgid "Server:"
-msgstr ""
+msgstr "سرور:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:155
+#: src/cdaudio/cdaudio-ng.cc:159
 msgid "Path:"
-msgstr ""
+msgstr "مسیر:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:159
+#: src/cdaudio/cdaudio-ng.cc:163
 msgid "Port:"
-msgstr ""
+msgstr "پورت:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:246
+#: src/cdaudio/cdaudio-ng.cc:228
 msgid "Failed to initialize cdio subsystem."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:281
+#: src/cdaudio/cdaudio-ng.cc:260
 #, c-format
 msgid "Invalid URI %s."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:283
+#: src/cdaudio/cdaudio-ng.cc:262
 #, c-format
 msgid "Track %d not found."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:285
+#: src/cdaudio/cdaudio-ng.cc:264
 #, c-format
 msgid "Track %d is a data track."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:360
+#: src/cdaudio/cdaudio-ng.cc:339
 msgid "Error reading audio CD."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:429
+#: src/cdaudio/cdaudio-ng.cc:410
 msgid "Audio CD"
 msgstr "سی‌دی صوتی"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:460 src/cdaudio-ng/cdaudio-ng.cc:469
+#: src/cdaudio/cdaudio-ng.cc:446 src/cdaudio/cdaudio-ng.cc:455
 #, c-format
 msgid "Failed to open CD device %s."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:472
+#: src/cdaudio/cdaudio-ng.cc:458
 msgid "No audio capable CD drive found."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:497
+#: src/cdaudio/cdaudio-ng.cc:481
+msgid "Drive is empty."
+msgstr "درایو خالی است."
+
+#: src/cdaudio/cdaudio-ng.cc:483
+msgid "Unsupported disk type."
+msgstr "نوع دیسک پشتیبانی نمی‌شود."
+
+#: src/cdaudio/cdaudio-ng.cc:507
 msgid "Failed to finish initializing opened CD drive."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:510
+#: src/cdaudio/cdaudio-ng.cc:520
 msgid "Failed to retrieve first/last track number."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:531
+#: src/cdaudio/cdaudio-ng.cc:541
 #, c-format
 msgid "Cannot read start/end LSN for track %d."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:613
-msgid "Failed to create the cddb connection."
+#: src/cdaudio/cdaudio-ng.cc:624
+msgid "Failed to create the CDDB connection."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:679
+#: src/cdaudio/cdaudio-ng.cc:690
 msgid "Failed to query the CDDB server"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:681
+#: src/cdaudio/cdaudio-ng.cc:692
 #, c-format
 msgid "Failed to query the CDDB server: %s"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:705
+#: src/cdaudio/cdaudio-ng.cc:716
 #, c-format
-msgid "Failed to read the cddb info: %s"
+msgid "Failed to read the CDDB info: %s"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:765
-msgid "Drive is empty."
-msgstr "درایو خالی است."
-
-#: src/cdaudio-ng/cdaudio-ng.cc:767
-msgid "Unsupported disk type."
-msgstr "نوع دیسک پشتیبانی نمی‌شود."
-
-#: src/cd-menu-items/cd-menu-items.cc:35
+#: src/cd-menu-items/cd-menu-items.cc:33
 msgid "Audio CD Menu Items"
 msgstr ""
 
-#: src/cd-menu-items/cd-menu-items.cc:47
-msgid "Play CD"
-msgstr "اجرای سی‌دی"
-
-#: src/cd-menu-items/cd-menu-items.cc:47
-msgid "Add CD"
-msgstr "اضافه کردن سی‌دی"
+#: src/cd-menu-items/cd-menu-items.cc:45
+msgid "Pla_y CD"
+msgstr ""
+
+#: src/cd-menu-items/cd-menu-items.cc:45
+msgid "_Add CD"
+msgstr ""
 
 #: src/compressor/compressor.cc:45
 msgid "Compression"
@@ -912,13 +806,20 @@
 
 #: src/console/plugin.cc:36
 msgid "Echo:"
-msgstr ""
+msgstr "پژواک:"
 
 #: src/console/plugin.cc:39
 msgid "Default song length:"
 msgstr "طول پیش فرض آهنگ:"
 
-#: src/console/plugin.cc:42 src/modplug/plugin_main.cc:59
+#: src/console/plugin.cc:41 src/crossfade/crossfade.cc:56
+#: src/crossfade/crossfade.cc:62 src/lirc/lirc.cc:395 src/notify/notify.cc:113
+#: src/sid/xs_config.cc:85 src/sid/xs_config.cc:94 src/sid/xs_config.cc:103
+#: src/vumeter-qt/vumeter_qt.cc:39
+msgid "seconds"
+msgstr "ثانیه‌ها"
+
+#: src/console/plugin.cc:42 src/modplug/plugin_main.cc:58
 msgid "Resampling"
 msgstr ""
 
@@ -942,70 +843,80 @@
 msgid "Game Console Music Decoder"
 msgstr "دیکدر موسیقی کنسول بازی"
 
-#: src/coreaudio/coreaudio.cc:50
+#: src/coreaudio/coreaudio.cc:53
 msgid "CoreAudio output"
 msgstr ""
 
-#: src/coreaudio/coreaudio.cc:131
+#: src/coreaudio/coreaudio.cc:155
 msgid ""
 "CoreAudio Output Plugin for Audacious\n"
 "Copyright 2014 William Pitcock\n"
+"Copyright 2017,18 René J.V. Bertin\n"
+" (original code and code adapted from\n"
+" Apple examples, (C) Apple 2013)\n"
 "\n"
 "Based on SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
 msgstr ""
 
-#: src/coreaudio/coreaudio.cc:143
+#: src/coreaudio/coreaudio.cc:171
 msgid "Use exclusive mode"
 msgstr ""
 
-#: src/crossfade/crossfade.cc:44
+#: src/coreaudio/coreaudio.cc:173
+msgid "Use bit perfect audio (adapt device sampling rate)"
+msgstr ""
+
+#: src/crossfade/crossfade.cc:47
 msgid ""
 "Crossfade Plugin for Audacious\n"
 "Copyright 2010-2014 John Lindgren"
 msgstr ""
 
-#: src/crossfade/crossfade.cc:48
+#: src/crossfade/crossfade.cc:51
 msgid "Crossfade"
 msgstr ""
 
-#: src/crossfade/crossfade.cc:49
+#: src/crossfade/crossfade.cc:52
 msgid "On automatic song change"
 msgstr ""
 
-#: src/crossfade/crossfade.cc:51 src/crossfade/crossfade.cc:57
+#: src/crossfade/crossfade.cc:54 src/crossfade/crossfade.cc:60
 msgid "Overlap:"
 msgstr ""
 
-#: src/crossfade/crossfade.cc:55
+#: src/crossfade/crossfade.cc:58
 msgid "On seek or manual song change"
 msgstr ""
 
-#: src/crossfade/crossfade.cc:61
-msgid "Tip"
+#: src/crossfade/crossfade.cc:64
+msgid "No fade in"
 msgstr ""
 
-#: src/crossfade/crossfade.cc:62
-msgid ""
-"For better crossfading, enable\n"
-"the Silence Removal effect."
+#: src/crossfade/crossfade.cc:66
+msgid "Use S-curve fade"
+msgstr ""
+
+#: src/crossfade/crossfade.cc:68
+msgid "S-curve steepness:"
+msgstr ""
+
+#: src/crossfade/crossfade.cc:70
+msgid "(higher is steeper)"
 msgstr ""
 
 #: src/crossfade/crossfade.cc:72
-msgid "Crossfade"
+msgid "Tip"
 msgstr ""
 
-#: src/crossfade/crossfade.cc:161
+#: src/crossfade/crossfade.cc:73
 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."
+"For better crossfading, enable\n"
+"the Silence Removal effect."
 msgstr ""
 
-#: src/crossfade/crossfade.cc:168
-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."
+#: src/crossfade/crossfade.cc:83
+msgid "Crossfade"
 msgstr ""
 
 #: src/crystalizer/crystalizer.cc:31
@@ -1020,62 +931,63 @@
 msgid "Crystalizer"
 msgstr ""
 
-#: src/cue/cue.cc:37
+#: src/cue/cue.cc:42
 msgid "Cue Sheet Plugin"
 msgstr ""
 
-#: src/delete-files/delete-files.cc:46 src/delete-files/delete-files.cc:146
+#: src/delete-files/delete-files.cc:53 src/delete-files/delete-files.cc:215
+#: src/delete-files/delete-files.cc:230
 msgid "Delete Files"
-msgstr ""
+msgstr "حذف فایل"
+
+#: src/delete-files/delete-files.cc:120
+msgid "No files are selected."
+msgstr "فایلی انتخاب نشده است."
 
-#: src/delete-files/delete-files.cc:75
+#: src/delete-files/delete-files.cc:125
 #, c-format
-msgid "Error moving %s to trash: %s."
+msgid "Do you want to move %s to the trash?"
 msgstr ""
 
-#: src/delete-files/delete-files.cc:86
+#: src/delete-files/delete-files.cc:126
 #, c-format
-msgid "Error deleting %s: %s."
+msgid "Do you want to permanently delete %s?"
 msgstr ""
 
-#: src/delete-files/delete-files.cc:117
+#: src/delete-files/delete-files.cc:133
 #, c-format
-msgid "Error deleting %s: not a local file."
+msgid "Do you want to move %d files to the trash?"
 msgstr ""
 
 #: src/delete-files/delete-files.cc:134
-msgid "Do you want to move the selected files to the trash?"
-msgstr ""
-
-#: src/delete-files/delete-files.cc:135
-msgid "Move to Trash"
+#, c-format
+msgid "Do you want to permanently delete %d files?"
 msgstr ""
 
-#: src/delete-files/delete-files.cc:140
-msgid "Do you want to permanently delete the selected files?"
-msgstr ""
+#: src/delete-files/delete-files.cc:146
+msgid "Move to trash"
+msgstr "انتقال به سطل زباله"
 
-#: src/delete-files/delete-files.cc:141 src/skins/preset-list.cc:411
-#: src/skins/preset-list.cc:427
+#: src/delete-files/delete-files.cc:146
 msgid "Delete"
 msgstr "حذف"
 
-#: src/delete-files/delete-files.cc:145 src/skins/preset-browser.cc:56
-#: src/skins/preset-list.cc:307 src/skins/ui_playlist.cc:221
+#: src/delete-files/delete-files.cc:213 src/delete-files/delete-files.cc:235
+#: src/skins-qt/search-select.cc:102 src/skins/search-select.cc:78
 msgid "Cancel"
 msgstr "انصراف"
 
-#: src/delete-files/delete-files.cc:166
+#: src/delete-files/delete-files.cc:267
 msgid "Delete Selected Files"
-msgstr ""
+msgstr "حذف فایل های انتخابی"
 
-#: src/delete-files/delete-files.cc:181
+#: src/delete-files/delete-files.cc:287
 msgid "Delete Method"
 msgstr ""
 
-#: src/delete-files/delete-files.cc:182
+#: src/delete-files/delete-files.cc:288
 msgid "Move to trash instead of deleting immediately"
-msgstr ""
+msgstr "به جای حذف سریع به زباله دانی منتقل شود"
 
 #: src/echo_plugin/echo.cc:9
 msgid ""
@@ -1089,33 +1001,33 @@
 msgid "Echo"
 msgstr ""
 
-#: src/echo_plugin/echo.cc:22 src/modplug/plugin_main.cc:73
-#: src/modplug/plugin_main.cc:83
+#: src/echo_plugin/echo.cc:22 src/modplug/plugin_main.cc:72
+#: src/modplug/plugin_main.cc:82
 msgid "Delay:"
 msgstr ""
 
-#: src/echo_plugin/echo.cc:24 src/modplug/plugin_main.cc:73
-#: src/modplug/plugin_main.cc:83
+#: src/echo_plugin/echo.cc:24 src/modplug/plugin_main.cc:72
+#: src/modplug/plugin_main.cc:82 src/xsf/plugin.cc:445
 msgid "ms"
-msgstr ""
+msgstr "میلی ثانیه"
 
 #: src/echo_plugin/echo.cc:25
 msgid "Feedback:"
-msgstr ""
+msgstr "بازخورد:"
 
-#: src/echo_plugin/echo.cc:28 src/modplug/plugin_main.cc:87
+#: src/echo_plugin/echo.cc:28 src/modplug/plugin_main.cc:86
 msgid "Volume:"
 msgstr ""
 
 #: src/echo_plugin/echo.cc:39
 msgid "Echo"
-msgstr ""
+msgstr "پژواک"
 
-#: src/ffaudio/ffaudio-core.cc:41
+#: src/ffaudio/ffaudio-core.cc:50
 msgid "FFmpeg Plugin"
-msgstr ""
+msgstr "پلوگین FFmpeg"
 
-#: src/ffaudio/ffaudio-core.cc:571
+#: src/ffaudio/ffaudio-core.cc:649
 msgid ""
 "Multi-format audio decoding plugin for Audacious using\n"
 "FFmpeg multimedia framework (http://www.ffmpeg.org/)\n"
@@ -1125,235 +1037,306 @@
 "Matti Hämäläinen <ccr@tnsp.org>"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:45
+#: src/filewriter/filewriter.cc:48
 msgid "FileWriter Plugin"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:386
+#: src/filewriter/filewriter.cc:316
+#, c-format
+msgid ""
+"Error opening %s:\n"
+"%s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:358
+msgid ""
+"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/filewriter/filewriter.cc:385
 msgid "Output file format:"
 msgstr "فرمت فایل خروجی:"
 
-#: src/filewriter/filewriter.cc:403
-msgid "Configure"
-msgstr "پیکربندی"
-
-#: src/filewriter/filewriter.cc:413
+#: src/filewriter/filewriter.cc:389
 msgid "Save into original directory"
 msgstr "ذخیره در پوشه اصلی"
 
-#: src/filewriter/filewriter.cc:417
-msgid "Save into custom directory"
-msgstr "ذخیره در پوشه شخصی"
-
-#: src/filewriter/filewriter.cc:427
-msgid "Output file folder:"
-msgstr "پوشه برای ذخیره‌سازی فایل:"
-
-#: src/filewriter/filewriter.cc:431
-msgid "Pick a folder"
-msgstr "یک پوشه را انتخاب کنید"
+#: src/filewriter/filewriter.cc:392
+msgid "Save into custom directory:"
+msgstr ""
 
-#: src/filewriter/filewriter.cc:444
+#: src/filewriter/filewriter.cc:400
 msgid "Generate file name from:"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:448
+#: src/filewriter/filewriter.cc:401
+msgid "Original file name"
+msgstr "نام اصلی فایل"
+
+#: src/filewriter/filewriter.cc:404
+msgid "Original file name (no suffix)"
+msgstr "نام اصلی فایل (بدون پسوند)"
+
+#: src/filewriter/filewriter.cc:407
 msgid "Original file tag"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:453
-msgid "Original file name"
+#: src/filewriter/filewriter.cc:411
+msgid "Prepend track number to file name"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:459
-msgid "Include original file name extension"
+#: src/filewriter/filewriter.cc:417 src/filewriter/filewriter.cc:449
+msgid "Auto"
+msgstr "خودکار"
+
+#: src/filewriter/filewriter.cc:418
+msgid "8000 Hz"
+msgstr "8000 هرتز"
+
+#: src/filewriter/filewriter.cc:419
+msgid "11025 Hz"
+msgstr "11025 هرتز"
+
+#: src/filewriter/filewriter.cc:420
+msgid "12000 Hz"
+msgstr "12000 هرتز"
+
+#: src/filewriter/filewriter.cc:421
+msgid "16000 Hz"
+msgstr "16000 هرتز"
+
+#: src/filewriter/filewriter.cc:422
+msgid "22050 Hz"
+msgstr "22050 هرتز"
+
+#: src/filewriter/filewriter.cc:423
+msgid "24000 Hz"
+msgstr "24000 هرتز"
+
+#: src/filewriter/filewriter.cc:424
+msgid "32000 Hz"
+msgstr "32000 هرتز"
+
+#: src/filewriter/filewriter.cc:425 src/xsf/plugin.cc:430
+msgid "44100 Hz"
+msgstr "44100 هرتز"
+
+#: src/filewriter/filewriter.cc:426 src/xsf/plugin.cc:431
+msgid "48000 Hz"
+msgstr "48000 هرتز"
+
+#: src/filewriter/filewriter.cc:430
+msgid "8 kbit/s"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:468
-msgid "Prepend track number to file name"
+#: src/filewriter/filewriter.cc:431
+msgid "16 kbit/s"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:484
-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."
+#: src/filewriter/filewriter.cc:432
+msgid "32 kbit/s"
 msgstr ""
 
-#: src/filewriter/mp3.cc:40 src/filewriter/mp3.cc:717
-msgid "Auto"
-msgstr "خودکار"
+#: src/filewriter/filewriter.cc:433
+msgid "40 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:434
+msgid "48 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:435
+msgid "56 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:436
+msgid "64 kbit/s"
+msgstr ""
 
-#: src/filewriter/mp3.cc:40
+#: src/filewriter/filewriter.cc:437
+msgid "80 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:438
+msgid "96 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:439
+msgid "112 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:440
+msgid "128 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:441
+msgid "160 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:442
+msgid "192 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:443
+msgid "224 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:444
+msgid "256 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:445
+msgid "320 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:450
 msgid "Joint Stereo"
 msgstr "یکی کردن دو کانال"
 
-#: src/filewriter/mp3.cc:41 src/modplug/plugin_main.cc:58
-#: src/mpg123/mpg123.cc:248
+#: src/filewriter/filewriter.cc:451 src/modplug/plugin_main.cc:57
+#: src/mpg123/mpg123.cc:259
 msgid "Stereo"
 msgstr "دوکاناله"
 
-#: src/filewriter/mp3.cc:41 src/modplug/plugin_main.cc:57
-#: src/mpg123/mpg123.cc:248
+#: src/filewriter/filewriter.cc:452 src/modplug/plugin_main.cc:56
+#: src/mpg123/mpg123.cc:260
 msgid "Mono"
 msgstr "تک‌کاناله"
 
-#: src/filewriter/mp3.cc:657
-msgid "MP3 Configuration"
-msgstr "پیکربندی MP3"
-
-#: src/filewriter/mp3.cc:658
-msgid "_OK"
+#: src/filewriter/filewriter.cc:456
+msgid "VBR"
 msgstr ""
 
-#: src/filewriter/mp3.cc:681
-msgid "Algorithm Quality:"
-msgstr "کیفیت الگوریتم:"
-
-#: src/filewriter/mp3.cc:706
-msgid "Output Sample Rate:"
+#: src/filewriter/filewriter.cc:457
+msgid "ABR"
 msgstr ""
 
-#: src/filewriter/mp3.cc:733
-msgid "(Hz)"
-msgstr "(هرتز)"
-
-#: src/filewriter/mp3.cc:740
-msgid "Bitrate / Compression Ratio:"
+#: src/filewriter/filewriter.cc:478
+msgid "Algorithm quality:"
 msgstr ""
 
-#: src/filewriter/mp3.cc:764
-msgid "Bitrate (kbps):"
-msgstr "نرخ بیت (کیلوبیت بر ثانیه):"
+#: src/filewriter/filewriter.cc:484
+msgid "Bitrate:"
+msgstr "نرخ بیت:"
 
-#: src/filewriter/mp3.cc:796
+#: src/filewriter/filewriter.cc:491
 msgid "Compression ratio:"
 msgstr "نسبت فشرده‌سازی:"
 
-#: src/filewriter/mp3.cc:820
-msgid "Audio Mode:"
-msgstr "حالت صدا:"
-
-#: src/filewriter/mp3.cc:845
-msgid "Miscellaneous:"
+#: src/filewriter/filewriter.cc:498
+msgid "Audio mode:"
 msgstr ""
 
-#: src/filewriter/mp3.cc:856
+#: src/filewriter/filewriter.cc:501
 msgid "Enforce strict ISO compliance"
 msgstr ""
 
-#: src/filewriter/mp3.cc:867
+#: src/filewriter/filewriter.cc:503
 msgid "Error protection"
 msgstr "محافظت در برابر خطا"
 
-#: src/filewriter/mp3.cc:879 src/filewriter/vorbis.cc:206
-msgid "Quality"
-msgstr "کیفیت"
-
-#: src/filewriter/mp3.cc:888
+#: src/filewriter/filewriter.cc:508
 msgid "Enable VBR/ABR"
 msgstr "فعال‌سازی VBR/ABR"
 
-#: src/filewriter/mp3.cc:898
+#: src/filewriter/filewriter.cc:510
 msgid "Type:"
 msgstr "نوع:"
 
-#: src/filewriter/mp3.cc:931
-msgid "VBR Options:"
-msgstr "گزینه‌های VBR:"
-
-#: src/filewriter/mp3.cc:947
-msgid "Minimum bitrate (kbps):"
-msgstr "حداقل نرخ بیت (کیلوبیت بر ثانیه):"
-
-#: src/filewriter/mp3.cc:973
-msgid "Maximum bitrate (kbps):"
-msgstr "حداکثر نرخ بیت (کیلوبیت بر ثانیه):"
+#: src/filewriter/filewriter.cc:514
+msgid "Minimum bitrate:"
+msgstr ""
 
-#: src/filewriter/mp3.cc:995
-msgid "Strictly enforce minimum bitrate"
-msgstr "حداقل نرخ بیت بشدت اعمال شود"
+#: src/filewriter/filewriter.cc:518
+msgid "Maximum bitrate:"
+msgstr ""
 
-#: src/filewriter/mp3.cc:1007
-msgid "ABR Options:"
-msgstr "گزینه‌های ABR:"
-
-#: src/filewriter/mp3.cc:1017
-msgid "Average bitrate (kbps):"
-msgstr "نرخ بیت میانگین (کیلوبیت بر ثانیه):"
+#: src/filewriter/filewriter.cc:522
+msgid "Average bitrate:"
+msgstr ""
 
-#: src/filewriter/mp3.cc:1044
+#: src/filewriter/filewriter.cc:526
 msgid "VBR quality level:"
 msgstr "سطح کیفیت VBR:"
 
-#: src/filewriter/mp3.cc:1063
+#: src/filewriter/filewriter.cc:530
+msgid "Strictly enforce minimum bitrate"
+msgstr "حداقل نرخ بیت بشدت اعمال شود"
+
+#: src/filewriter/filewriter.cc:533
 msgid "Omit Xing VBR header"
 msgstr ""
 
-#: src/filewriter/mp3.cc:1076
-msgid "VBR/ABR"
-msgstr "VBR/ABR نرخ بیت متغیر/نرخ بیت میانگین"
-
-#: src/filewriter/mp3.cc:1085
-msgid "Frame Parameters:"
+#: src/filewriter/filewriter.cc:539
+msgid "Frame Headers"
 msgstr ""
 
-#: src/filewriter/mp3.cc:1097
+#: src/filewriter/filewriter.cc:540
 msgid "Mark as copyright"
 msgstr "فایل کپی‌رایت دارد"
 
-#: src/filewriter/mp3.cc:1108
+#: src/filewriter/filewriter.cc:542
 msgid "Mark as original"
 msgstr "فایل نسخه اصلی است"
 
-#: src/filewriter/mp3.cc:1120
-msgid "ID3 Parameters:"
+#: src/filewriter/filewriter.cc:544
+msgid "ID3 Tags"
 msgstr ""
 
-#: src/filewriter/mp3.cc:1131
+#: src/filewriter/filewriter.cc:545
 msgid "Force addition of version 2 tag"
 msgstr "برچسب‌های نسخه 2 حتما اضافه شود"
 
-#: src/filewriter/mp3.cc:1141
+#: src/filewriter/filewriter.cc:547
 msgid "Only add v1 tag"
 msgstr "فقط برچسب‌های نسخه 1"
 
-#: src/filewriter/mp3.cc:1148
+#: src/filewriter/filewriter.cc:549
 msgid "Only add v2 tag"
 msgstr "فقط برچسب‌های نسخه 2"
 
-#: src/filewriter/mp3.cc:1169
+#: src/filewriter/filewriter.cc:554
+msgid "Quality"
+msgstr "کیفیت"
+
+#: src/filewriter/filewriter.cc:555
+msgid "VBR/ABR"
+msgstr "VBR/ABR نرخ بیت متغیر/نرخ بیت میانگین"
+
+#: src/filewriter/filewriter.cc:556
 msgid "Tags"
 msgstr "برچسب‌ها"
 
-#: src/filewriter/vorbis.cc:196
-msgid "Vorbis Encoder Configuration"
-msgstr "پیکربندی انکدر Vorbis:"
-
-#: src/filewriter/vorbis.cc:219
-msgid "Quality level (0 - 10):"
-msgstr "سطح کیفیت (0 - 10):"
+#: src/filewriter/filewriter.cc:566
+msgid "Quality (0-1):"
+msgstr "کیفیت (0-1):"
 
-#: src/flacng/flacng.h:35
+#: src/filewriter/filewriter.cc:573 src/skins-qt/skins_cfg.cc:307
+#: src/skins/skins_cfg.cc:289
+msgid "General"
+msgstr "عمومی"
+
+#: src/flac/flacng.h:36
 msgid "FLAC Decoder"
 msgstr ""
 
-#: src/flacng/metadata.cc:351 src/wavpack/wavpack.cc:209
+#: src/flac/metadata.cc:296 src/wavpack/wavpack.cc:215
 msgid "lossless"
 msgstr ""
 
-#: src/flacng/plugin.cc:169
+#: src/flac/plugin.cc:214
 msgid ""
 "Original code by\n"
 "Ralf Ertzinger <ralf@skytale.net>\n"
@@ -1369,17 +1352,17 @@
 
 #: src/gio/gio.cc:42
 msgid "GIO Plugin"
-msgstr ""
+msgstr "پلوگین GIO"
 
-#: src/gio/gio.cc:153
+#: src/gio/gio.cc:152
 msgid "Read-and-append mode not supported"
 msgstr ""
 
-#: src/gio/gio.cc:166
+#: src/gio/gio.cc:165
 msgid "Invalid open mode"
 msgstr ""
 
-#: src/gl-spectrum/gl-spectrum.cc:51
+#: src/glspectrum/gl-spectrum.cc:52
 msgid ""
 "OpenGL Spectrum Analyzer for Audacious\n"
 "Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
@@ -1391,621 +1374,754 @@
 "License: GPLv2+"
 msgstr ""
 
-#: src/gl-spectrum/gl-spectrum.cc:62
+#: src/glspectrum/gl-spectrum.cc:63 src/qtglspectrum/gl-spectrum.cc:53
 msgid "OpenGL Spectrum Analyzer"
 msgstr ""
 
-#: src/gl-spectrum-qt/gl-spectrum.cc:41
-msgid ""
-"OpenGL Spectrum Analyzer for Audacious\n"
-"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
-"Copyright 2014 William Pitcock\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-qt/gl-spectrum.cc:53
-msgid "OpenGL Spectrum Analyzer (Qt)"
-msgstr ""
-
-#: src/gnomeshortcuts/gnomeshortcuts.cc:38
-msgid "GNOME Shortcuts"
+#: src/gtkui/columns.cc:36 src/moonstone/playlist_model.cc:38
+#: src/qtui/playlist_model.cc:33
+msgid "Entry Number"
 msgstr ""
 
-#: src/gnomeshortcuts/gnomeshortcuts.cc:54
-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/gtkui/columns.cc:35
-msgid "Entry number"
-msgstr "شماره گزینه"
-
-#: src/gtkui/columns.cc:36 src/playlist-manager/playlist-manager.cc:225
-#: src/qtui/playlist_model.cc:123
+#: src/gtkui/columns.cc:37 src/moonstone/playlist_model.cc:38
+#: src/moonstone/playlist_selection.cc:64
+#: src/playlist-manager/playlist-manager.cc:200
+#: src/playlist-manager-qt/playlist-manager-qt.cc:188
+#: src/qtui/playlist_model.cc:33 src/streamtuner/icecast-model.cc:120
+#: src/streamtuner/ihr-model.cc:159 src/streamtuner/shoutcast-model.cc:122
 msgid "Title"
 msgstr "عنوان"
 
-#: src/gtkui/columns.cc:37 src/qtui/playlist_model.cc:125
+#: src/gtkui/columns.cc:38 src/moonstone/playlist_model.cc:39
+#: src/qtui/playlist_model.cc:33
 msgid "Artist"
 msgstr "هنرمند"
 
-#: src/gtkui/columns.cc:38
+#: src/gtkui/columns.cc:39 src/moonstone/playlist_model.cc:39
+#: src/qtui/playlist_model.cc:33
 msgid "Year"
 msgstr "سال انتشار"
 
-#: src/gtkui/columns.cc:39 src/qtui/playlist_model.cc:127
+#: src/gtkui/columns.cc:40 src/moonstone/playlist_model.cc:39
+#: src/qtui/playlist_model.cc:34
 msgid "Album"
 msgstr "آلبوم"
 
-#: src/gtkui/columns.cc:40
-msgid "Album artist"
-msgstr ""
+#: src/gtkui/columns.cc:41 src/moonstone/playlist_model.cc:40
+#: src/qtui/playlist_model.cc:34
+msgid "Album Artist"
+msgstr "هنرمند آلبوم"
 
-#: src/gtkui/columns.cc:41
+#: src/gtkui/columns.cc:42 src/moonstone/playlist_model.cc:40
+#: src/qtui/playlist_model.cc:34
 msgid "Track"
 msgstr "آهنگ"
 
-#: src/gtkui/columns.cc:42
+#: src/gtkui/columns.cc:43 src/moonstone/playlist_model.cc:40
+#: src/qtui/playlist_model.cc:34 src/streamtuner/icecast-model.cc:123
+#: src/streamtuner/shoutcast-model.cc:125
+#: src/streamtuner/shoutcast-model.cc:236
 msgid "Genre"
-msgstr ""
+msgstr "سبک"
 
-#: src/gtkui/columns.cc:43
-msgid "Queue position"
-msgstr "مکان در صف"
+#: src/gtkui/columns.cc:44 src/moonstone/playlist_model.cc:41
+#: src/qtui/playlist_model.cc:35
+msgid "Queue Position"
+msgstr ""
 
-#: src/gtkui/columns.cc:44
+#: src/gtkui/columns.cc:45 src/moonstone/playlist_model.cc:41
+#: src/qtui/playlist_model.cc:35
 msgid "Length"
 msgstr "مدت زمان"
 
-#: src/gtkui/columns.cc:45
-msgid "File path"
+#: src/gtkui/columns.cc:46 src/moonstone/playlist_model.cc:41
+#: src/qtui/playlist_model.cc:35
+msgid "File Path"
 msgstr "مسیر فایل"
 
-#: src/gtkui/columns.cc:47
-msgid "Custom title"
-msgstr "عنوان شخصی"
+#: src/gtkui/columns.cc:47 src/moonstone/playlist_model.cc:42
+#: src/qtui/playlist_model.cc:35
+msgid "File Name"
+msgstr "نام فایل"
+
+#: src/gtkui/columns.cc:48 src/moonstone/playlist_model.cc:42
+#: src/qtui/playlist_model.cc:36
+msgid "Custom Title"
+msgstr ""
 
-#: src/gtkui/columns.cc:48
+#: src/gtkui/columns.cc:49 src/moonstone/playlist_model.cc:42
+#: src/qtui/playlist_model.cc:36 src/streamtuner/icecast-model.cc:129
+#: src/streamtuner/shoutcast-model.cc:134
 msgid "Bitrate"
 msgstr "نرخ بیت"
 
-#: src/gtkui/columns.cc:308
+#: src/gtkui/columns.cc:50 src/moonstone/playlist_model.cc:43
+#: src/qtui/playlist_model.cc:36
+msgid "Comment"
+msgstr "توضیحات"
+
+#: src/gtkui/columns.cc:51 src/qtui/playlist_model.cc:36
+msgid "Publisher"
+msgstr ""
+
+#: src/gtkui/columns.cc:52 src/qtui/playlist_model.cc:37
+msgid "Catalog Number"
+msgstr ""
+
+#: src/gtkui/columns.cc:53 src/moonstone/playlist_model.cc:43
+#: src/qtui/playlist_model.cc:37
+msgid "Disc"
+msgstr ""
+
+#: src/gtkui/columns.cc:325
 msgid "Available columns"
 msgstr ""
 
-#: src/gtkui/columns.cc:334
+#: src/gtkui/columns.cc:351
 msgid "Displayed columns"
 msgstr ""
 
-#: src/gtkui/layout.cc:72 src/search-tool/search-tool.cc:40
+#: src/gtkui/layout.cc:74 src/search-tool-qt/search-tool-qt.cc:58
+#: src/search-tool/search-tool.cc:49
 msgid "Search Tool"
 msgstr ""
 
-#: src/gtkui/layout.cc:167
+#: src/gtkui/layout.cc:170
 msgid "Dock at Left"
 msgstr "به سمت چپ بچسبان"
 
-#: src/gtkui/layout.cc:167
+#: src/gtkui/layout.cc:170
 msgid "Dock at Right"
 msgstr "به سمت راست بچسبان"
 
-#: src/gtkui/layout.cc:168
+#: src/gtkui/layout.cc:171
 msgid "Dock at Top"
 msgstr "به بالا بچسبان"
 
-#: src/gtkui/layout.cc:168
+#: src/gtkui/layout.cc:171
 msgid "Dock at Bottom"
 msgstr "به پایین بچسبان"
 
-#: src/gtkui/layout.cc:168
+#: src/gtkui/layout.cc:171
 msgid "Undock"
 msgstr "جدا کردن پنجره"
 
-#: src/gtkui/layout.cc:168 src/ladspa/plugin.cc:531
+#: src/gtkui/layout.cc:171 src/ladspa/plugin.cc:540
 msgid "Disable"
 msgstr "غیرفعال‌سازی"
 
-#: src/gtkui/menus.cc:126 src/qtui/main_window_actions.cc:93
-#: src/statusicon/statusicon.cc:276
+#: src/gtkui/menus.cc:79 src/qtui/menus.cc:107
+#: src/statusicon-qt/statusicon.cc:115 src/statusicon/statusicon.cc:286
 msgid "_Open Files ..."
 msgstr "_بازکردن فایل‌ها ..."
 
-#: src/gtkui/menus.cc:127
+#: src/gtkui/menus.cc:80 src/qtui/menus.cc:111
 msgid "Open _URL ..."
 msgstr "بازکردن _آدرس اینترنتی ..."
 
-#: src/gtkui/menus.cc:128 src/qtui/main_window_actions.cc:95
+#: src/gtkui/menus.cc:81 src/qtui/menus.cc:113
 msgid "_Add Files ..."
 msgstr ""
 
-#: src/gtkui/menus.cc:129
+#: src/gtkui/menus.cc:82 src/qtui/menus.cc:118
 msgid "Add U_RL ..."
 msgstr "اضافه کردن آدرس _اینترنتی ..."
 
-#: src/gtkui/menus.cc:131
+#: src/gtkui/menus.cc:84 src/qtui/menus.cc:120
 msgid "Search _Library"
 msgstr ""
 
-#: src/gtkui/menus.cc:133 src/qtui/main_window_actions.cc:98
+#: src/gtkui/menus.cc:86 src/qtui/menus.cc:123
 msgid "A_bout ..."
 msgstr "د_رباره ..."
 
-#: src/gtkui/menus.cc:134 src/qtui/main_window_actions.cc:99
+#: src/gtkui/menus.cc:87 src/qtui/menus.cc:125
 msgid "_Settings ..."
 msgstr ""
 
-#: src/gtkui/menus.cc:135 src/qtui/main_window_actions.cc:103
-#: src/statusicon/statusicon.cc:284
+#: src/gtkui/menus.cc:88 src/qtui/menus.cc:131
+#: src/statusicon-qt/statusicon.cc:117 src/statusicon/statusicon.cc:288
 msgid "_Quit"
 msgstr "_خروج"
 
-#: src/gtkui/menus.cc:139 src/gtkui/menus.cc:262
-#: src/qtui/main_window_actions.cc:107 src/search-tool/search-tool.cc:641
-#: src/statusicon/statusicon.cc:278
+#: src/gtkui/menus.cc:92 src/gtkui/menus.cc:226
+#: src/moonstone/playlist_tabs.cc:306 src/qtui/menus.cc:135
+#: src/qtui/playlist_tabs.cc:331 src/search-tool-qt/search-tool-qt.cc:499
+#: src/search-tool/search-tool.cc:339 src/statusicon-qt/statusicon.cc:109
+#: src/statusicon/statusicon.cc:280
 msgid "_Play"
 msgstr "_پخش"
 
-#: src/gtkui/menus.cc:140 src/qtui/main_window_actions.cc:108
-#: src/statusicon/statusicon.cc:279
+#: src/gtkui/menus.cc:93 src/qtui/menus.cc:137
+#: src/statusicon-qt/statusicon.cc:110 src/statusicon/statusicon.cc:281
 msgid "Paus_e"
 msgstr "تو_قف"
 
-#: src/gtkui/menus.cc:141 src/qtui/main_window_actions.cc:109
-#: src/statusicon/statusicon.cc:280
+#: src/gtkui/menus.cc:94 src/qtui/menus.cc:139
+#: src/statusicon-qt/statusicon.cc:111 src/statusicon/statusicon.cc:282
 msgid "_Stop"
 msgstr "پا_یان پخش"
 
-#: src/gtkui/menus.cc:142 src/qtui/main_window_actions.cc:110
-#: src/statusicon/statusicon.cc:277
+#: src/gtkui/menus.cc:95 src/qtui/menus.cc:141
+#: src/statusicon-qt/statusicon.cc:112 src/statusicon/statusicon.cc:283
 msgid "Pre_vious"
 msgstr "_قبلی"
 
-#: src/gtkui/menus.cc:143 src/qtui/main_window_actions.cc:111
-#: src/statusicon/statusicon.cc:281
+#: src/gtkui/menus.cc:96 src/qtui/menus.cc:143
+#: src/statusicon-qt/statusicon.cc:113 src/statusicon/statusicon.cc:284
 msgid "_Next"
 msgstr "_بعدی"
 
-#: src/gtkui/menus.cc:145 src/qtui/main_window_actions.cc:113
+#: src/gtkui/menus.cc:97 src/qtui/menus.cc:145 src/skins/menus.cc:114
+#: src/skins-qt/menus.cc:105
+msgid "Previous Album"
+msgstr "آلبوم قبلی"
+
+#: src/gtkui/menus.cc:98 src/qtui/menus.cc:146 src/skins/menus.cc:115
+#: src/skins-qt/menus.cc:106
+msgid "Next Album"
+msgstr "آلبوم بعدی"
+
+#: src/gtkui/menus.cc:100 src/qtui/menus.cc:148
 msgid "_Repeat"
 msgstr "_تکرار"
 
-#: src/gtkui/menus.cc:146 src/qtui/main_window_actions.cc:114
+#: src/gtkui/menus.cc:101 src/qtui/menus.cc:150
 msgid "S_huffle"
 msgstr "_بهم ریخته"
 
-#: src/gtkui/menus.cc:147 src/qtui/main_window_actions.cc:115
+#: src/gtkui/menus.cc:102 src/qtui/menus.cc:152
+msgid "Shuffle by Albu_m"
+msgstr ""
+
+#: src/gtkui/menus.cc:103 src/qtui/menus.cc:155
 msgid "N_o Playlist Advance"
 msgstr ""
 
-#: src/gtkui/menus.cc:148 src/qtui/main_window_actions.cc:116
+#: src/gtkui/menus.cc:104 src/qtui/menus.cc:157
 msgid "Stop A_fter This Song"
 msgstr ""
 
-#: src/gtkui/menus.cc:150 src/gtkui/menus.cc:247
-#: src/qtui/main_window_actions.cc:118
+#: src/gtkui/menus.cc:106 src/gtkui/menus.cc:210 src/qtui/menus.cc:162
+#: src/qtui/menus.cc:294
 msgid "Song _Info ..."
 msgstr "ا_طلاعات آهنگ ..."
 
-#: src/gtkui/menus.cc:151
+#: src/gtkui/menus.cc:107
 msgid "Jump to _Time ..."
 msgstr "پرش به _زمان ..."
 
-#: src/gtkui/menus.cc:152
+#: src/gtkui/menus.cc:108
 msgid "_Jump to Song ..."
 msgstr "پرش به _آهنگ ..."
 
-#: src/gtkui/menus.cc:154
+#: src/gtkui/menus.cc:110 src/qtui/menus.cc:165
 msgid "Set Repeat Point _A"
 msgstr ""
 
-#: src/gtkui/menus.cc:155
+#: src/gtkui/menus.cc:111 src/qtui/menus.cc:167
 msgid "Set Repeat Point _B"
 msgstr ""
 
-#: src/gtkui/menus.cc:156
+#: src/gtkui/menus.cc:112 src/qtui/menus.cc:169
 msgid "_Clear Repeat Points"
 msgstr ""
 
-#: src/gtkui/menus.cc:160 src/gtkui/menus.cc:167 src/gtkui/menus.cc:183
-#: src/qtui/main_window_actions.cc:122 src/qtui/main_window_actions.cc:129
-#: src/qtui/main_window_actions.cc:145
+#: src/gtkui/menus.cc:116 src/gtkui/menus.cc:123 src/gtkui/menus.cc:141
+#: src/qtui/menus.cc:173 src/qtui/menus.cc:180 src/qtui/menus.cc:198
 msgid "By _Title"
 msgstr "براساس _عنوان"
 
-#: src/gtkui/menus.cc:161 src/qtui/main_window_actions.cc:123
+#: src/gtkui/menus.cc:117 src/qtui/menus.cc:174
 msgid "By _File Name"
 msgstr ""
 
-#: src/gtkui/menus.cc:162 src/qtui/main_window_actions.cc:124
+#: src/gtkui/menus.cc:118 src/qtui/menus.cc:175
 msgid "By File _Path"
 msgstr ""
 
-#: src/gtkui/menus.cc:166 src/gtkui/menus.cc:182
-#: src/qtui/main_window_actions.cc:128 src/qtui/main_window_actions.cc:144
+#: src/gtkui/menus.cc:122 src/gtkui/menus.cc:140 src/qtui/menus.cc:179
+#: src/qtui/menus.cc:197
 msgid "By Track _Number"
 msgstr "براساس _شماره آهنگ"
 
-#: src/gtkui/menus.cc:168 src/gtkui/menus.cc:184
-#: src/qtui/main_window_actions.cc:130 src/qtui/main_window_actions.cc:146
+#: src/gtkui/menus.cc:124 src/gtkui/menus.cc:142 src/qtui/menus.cc:181
+#: src/qtui/menus.cc:199
 msgid "By _Artist"
 msgstr "براساس _هنرمند"
 
-#: src/gtkui/menus.cc:169 src/gtkui/menus.cc:185
-#: src/qtui/main_window_actions.cc:131 src/qtui/main_window_actions.cc:147
+#: src/gtkui/menus.cc:125 src/gtkui/menus.cc:143 src/qtui/menus.cc:182
+#: src/qtui/menus.cc:200
 msgid "By Al_bum"
 msgstr ""
 
-#: src/gtkui/menus.cc:170 src/gtkui/menus.cc:186
-#: src/qtui/main_window_actions.cc:132 src/qtui/main_window_actions.cc:148
+#: src/gtkui/menus.cc:126 src/gtkui/menus.cc:144 src/qtui/menus.cc:183
+#: src/qtui/menus.cc:201
 msgid "By Albu_m Artist"
 msgstr ""
 
-#: src/gtkui/menus.cc:171 src/gtkui/menus.cc:187
-#: src/qtui/main_window_actions.cc:133 src/qtui/main_window_actions.cc:149
+#: src/gtkui/menus.cc:127 src/gtkui/menus.cc:145 src/qtui/menus.cc:184
+#: src/qtui/menus.cc:202
 msgid "By Release _Date"
 msgstr "بر اساس _تاریخ انتشار"
 
-#: src/gtkui/menus.cc:172 src/gtkui/menus.cc:188
-#: src/qtui/main_window_actions.cc:134 src/qtui/main_window_actions.cc:150
+#: src/gtkui/menus.cc:128 src/gtkui/menus.cc:146 src/qtui/menus.cc:185
+#: src/qtui/menus.cc:203
 msgid "By _Genre"
 msgstr ""
 
-#: src/gtkui/menus.cc:173 src/gtkui/menus.cc:189
-#: src/qtui/main_window_actions.cc:135 src/qtui/main_window_actions.cc:151
+#: src/gtkui/menus.cc:129 src/gtkui/menus.cc:147 src/qtui/menus.cc:186
+#: src/qtui/menus.cc:204
 msgid "By _Length"
 msgstr ""
 
-#: src/gtkui/menus.cc:174 src/gtkui/menus.cc:190
-#: src/qtui/main_window_actions.cc:136 src/qtui/main_window_actions.cc:152
+#: src/gtkui/menus.cc:130 src/gtkui/menus.cc:148 src/qtui/menus.cc:187
+#: src/qtui/menus.cc:205
 msgid "By _File Path"
 msgstr "براساس _مسیر فایل"
 
-#: src/gtkui/menus.cc:175 src/gtkui/menus.cc:191
-#: src/qtui/main_window_actions.cc:137 src/qtui/main_window_actions.cc:153
+#: src/gtkui/menus.cc:131 src/gtkui/menus.cc:149 src/qtui/menus.cc:188
+#: src/qtui/menus.cc:206
 msgid "By _Custom Title"
 msgstr "براساس عنوان شخصی"
 
-#: src/gtkui/menus.cc:177 src/gtkui/menus.cc:193
-#: src/qtui/main_window_actions.cc:139 src/qtui/main_window_actions.cc:155
+#: src/gtkui/menus.cc:132 src/gtkui/menus.cc:150 src/qtui/menus.cc:189
+#: src/qtui/menus.cc:207
+msgid "By C_omment"
+msgstr ""
+
+#: src/gtkui/menus.cc:133 src/gtkui/menus.cc:151 src/qtui/menus.cc:190
+#: src/qtui/menus.cc:208
+msgid "By D_isc Number"
+msgstr ""
+
+#: src/gtkui/menus.cc:135 src/gtkui/menus.cc:153 src/qtui/menus.cc:192
+#: src/qtui/menus.cc:210
 msgid "R_everse Order"
 msgstr "مرتب سازی معکوس"
 
-#: src/gtkui/menus.cc:178 src/gtkui/menus.cc:194
-#: src/qtui/main_window_actions.cc:140 src/qtui/main_window_actions.cc:156
+#: src/gtkui/menus.cc:136 src/gtkui/menus.cc:154 src/qtui/menus.cc:194
+#: src/qtui/menus.cc:212
 msgid "_Random Order"
 msgstr "بهم ریختن مرتب‌سازی"
 
-#: src/gtkui/menus.cc:198 src/qtui/main_window_actions.cc:160
+#: src/gtkui/menus.cc:158 src/qtui/menus.cc:216
 msgid "_Play/Resume"
 msgstr ""
 
-#: src/gtkui/menus.cc:199 src/gtkui/menus.cc:251
-#: src/qtui/main_window_actions.cc:161
+#: src/gtkui/menus.cc:159 src/qtui/menus.cc:218
 msgid "_Refresh"
 msgstr "تازه‌سازی لیست"
 
-#: src/gtkui/menus.cc:201 src/qtui/main_window_actions.cc:163
+#: src/gtkui/menus.cc:161 src/qtui/menus.cc:222
 msgid "_Sort"
 msgstr "مرتب کردن"
 
-#: src/gtkui/menus.cc:202 src/qtui/main_window_actions.cc:164
+#: src/gtkui/menus.cc:162 src/qtui/menus.cc:223
 msgid "Sort Se_lected"
 msgstr ""
 
-#: src/gtkui/menus.cc:203 src/qtui/main_window_actions.cc:165
+#: src/gtkui/menus.cc:163 src/qtui/menus.cc:225
 msgid "Remove _Duplicates"
 msgstr ""
 
-#: src/gtkui/menus.cc:204 src/qtui/main_window_actions.cc:166
+#: src/gtkui/menus.cc:164 src/qtui/menus.cc:226
 msgid "Remove _Unavailable Files"
 msgstr ""
 
-#: src/gtkui/menus.cc:206 src/playlist-manager/playlist-manager.cc:244
-#: src/qtui/main_window_actions.cc:168
+#: src/gtkui/menus.cc:166 src/playlist-manager/playlist-manager.cc:219
+#: src/playlist-manager-qt/playlist-manager-qt.cc:348 src/qtui/menus.cc:229
 msgid "_New"
 msgstr "جدید"
 
-#: src/gtkui/menus.cc:207
+#: src/gtkui/menus.cc:167 src/qtui/menus.cc:230
 msgid "Ren_ame ..."
-msgstr ""
+msgstr "تغییرنام..."
 
-#: src/gtkui/menus.cc:208 src/gtkui/menus.cc:264
-#: src/qtui/main_window_actions.cc:170
+#: src/gtkui/menus.cc:168 src/gtkui/menus.cc:228
+#: src/moonstone/playlist_tabs.cc:311 src/qtui/menus.cc:231
+#: src/qtui/playlist_tabs.cc:336
 msgid "Remo_ve"
-msgstr ""
+msgstr "حذف"
 
-#: src/gtkui/menus.cc:210
+#: src/gtkui/menus.cc:170 src/qtui/menus.cc:233
 msgid "_Import ..."
 msgstr "وارد کردن ..."
 
-#: src/gtkui/menus.cc:211
+#: src/gtkui/menus.cc:171 src/qtui/menus.cc:234
 msgid "_Export ..."
 msgstr "خروجی گرفتن ..."
 
-#: src/gtkui/menus.cc:213
+#: src/gtkui/menus.cc:173 src/qtui/menus.cc:237
 msgid "Playlist _Manager ..."
 msgstr ""
 
-#: src/gtkui/menus.cc:214 src/qtui/main_window_actions.cc:176
+#: src/gtkui/menus.cc:174 src/qtui/menus.cc:239
 msgid "_Queue Manager ..."
 msgstr "مدیر صف ..."
 
-#: src/gtkui/menus.cc:218 src/qtui/main_window_actions.cc:180
+#: src/gtkui/menus.cc:178 src/qtui/menus.cc:243
 msgid "Volume _Up"
 msgstr "افزایش صدا"
 
-#: src/gtkui/menus.cc:219 src/qtui/main_window_actions.cc:181
+#: src/gtkui/menus.cc:179 src/qtui/menus.cc:245
 msgid "Volume _Down"
 msgstr "کاهش صدا"
 
-#: src/gtkui/menus.cc:221 src/qtui/main_window_actions.cc:183
-msgid "_Equalizer"
-msgstr "اکولایزر"
+#: src/gtkui/menus.cc:181 src/qtui/menus.cc:249
+msgid "_Equalizer ..."
+msgstr "اکولایزر..."
 
-#: src/gtkui/menus.cc:223 src/qtui/main_window_actions.cc:185
+#: src/gtkui/menus.cc:182 src/qtui/menus.cc:251
 msgid "E_ffects ..."
 msgstr ""
 
-#: src/gtkui/menus.cc:227
+#: src/gtkui/menus.cc:184
+msgid "_Record Stream"
+msgstr ""
+
+#: src/gtkui/menus.cc:185
+msgid "Audio _Settings ..."
+msgstr "تنظیمات صدا..."
+
+#: src/gtkui/menus.cc:189 src/qtui/menus.cc:260
 msgid "Show _Menu Bar"
 msgstr "نمایش نوار منو"
 
-#: src/gtkui/menus.cc:228
+#: src/gtkui/menus.cc:190 src/qtui/menus.cc:262
 msgid "Show I_nfo Bar"
 msgstr "نمایش نوار اطلاعات"
 
-#: src/gtkui/menus.cc:229
+#: src/gtkui/menus.cc:191 src/qtui/menus.cc:264
+msgid "Show Info Bar _Album Art"
+msgstr ""
+
+#: src/gtkui/menus.cc:192 src/qtui/menus.cc:266
 msgid "Show Info Bar Vis_ualization"
 msgstr ""
 
-#: src/gtkui/menus.cc:230
+#: src/gtkui/menus.cc:193 src/qtui/menus.cc:268
 msgid "Show _Status Bar"
 msgstr "نمایش نوار وضعیت"
 
-#: src/gtkui/menus.cc:232
+#: src/gtkui/menus.cc:195 src/qtui/menus.cc:272
 msgid "Show _Remaining Time"
 msgstr ""
 
-#: src/gtkui/menus.cc:234
+#: src/gtkui/menus.cc:197 src/qtui/menus.cc:276 src/skins/menus.cc:157
+#: src/skins-qt/menus.cc:152
 msgid "_Visualizations ..."
 msgstr ""
 
-#: src/gtkui/menus.cc:238 src/qtui/main_window_actions.cc:189
+#: src/gtkui/menus.cc:201 src/qtui/menus.cc:280
 msgid "_File"
 msgstr "فایل"
 
-#: src/gtkui/menus.cc:239 src/qtui/main_window_actions.cc:190
+#: src/gtkui/menus.cc:202 src/qtui/menus.cc:281
 msgid "_Playback"
 msgstr "پخش"
 
-#: src/gtkui/menus.cc:240 src/qtui/main_window_actions.cc:191
+#: src/gtkui/menus.cc:203 src/qtui/menus.cc:282
 msgid "P_laylist"
 msgstr "لیست پخش"
 
-#: src/gtkui/menus.cc:241 src/gtkui/menus.cc:258
-#: src/qtui/main_window_actions.cc:192
+#: src/gtkui/menus.cc:204 src/gtkui/menus.cc:222 src/qtui/menus.cc:283
+#: src/qtui/menus.cc:312
 msgid "_Services"
 msgstr "سرویس‌ها"
 
-#: src/gtkui/menus.cc:242 src/qtui/main_window_actions.cc:193
+#: src/gtkui/menus.cc:205 src/qtui/menus.cc:284
 msgid "_Output"
 msgstr "خروجی"
 
-#: src/gtkui/menus.cc:243
+#: src/gtkui/menus.cc:206 src/qtui/menus.cc:285
 msgid "_View"
 msgstr "نما"
 
-#: src/gtkui/menus.cc:248
+#: src/gtkui/menus.cc:211 src/qtui/menus.cc:296
 msgid "_Queue/Unqueue"
 msgstr "وارد کردن به/خارج کردن از صف"
 
-#: src/gtkui/menus.cc:250
+#: src/gtkui/menus.cc:213 src/qtui/menus.cc:299
 msgid "_Open Containing Folder"
 msgstr ""
 
-#: src/gtkui/menus.cc:253
+#: src/gtkui/menus.cc:214 src/qtui/menus.cc:301
+msgid "_Refresh Selected"
+msgstr ""
+
+#: src/gtkui/menus.cc:216 src/qtui/menus.cc:304
 msgid "Cu_t"
 msgstr "برش"
 
-#: src/gtkui/menus.cc:254
+#: src/gtkui/menus.cc:217 src/qtui/menus.cc:305
 msgid "_Copy"
 msgstr "کپی"
 
-#: src/gtkui/menus.cc:255
+#: src/gtkui/menus.cc:218 src/qtui/menus.cc:306
 msgid "_Paste"
 msgstr "چسباندن"
 
-#: src/gtkui/menus.cc:256
+#: src/gtkui/menus.cc:219 src/qtui/menus.cc:307
+msgid "Paste at _End"
+msgstr ""
+
+#: src/gtkui/menus.cc:220 src/qtui/menus.cc:309
 msgid "Select _All"
 msgstr "انتخاب همه"
 
-#: src/gtkui/menus.cc:263
+#: src/gtkui/menus.cc:227 src/moonstone/playlist_tabs.cc:309
+#: src/qtui/playlist_tabs.cc:334
 msgid "_Rename ..."
 msgstr ""
 
-#: src/gtkui/settings.cc:35
+#: src/gtkui/settings.cc:35 src/qtui/settings.cc:59
+msgid "Always"
+msgstr "همیشه"
+
+#: src/gtkui/settings.cc:36 src/qtui/settings.cc:60
+msgid "Auto-hide"
+msgstr "پنهان سازی خودکار"
+
+#: src/gtkui/settings.cc:37 src/qtui/settings.cc:61
+msgid "Never"
+msgstr "هرگز"
+
+#: src/gtkui/settings.cc:41 src/qtui/settings.cc:64
 msgid "Playlist Tabs"
 msgstr ""
 
-#: src/gtkui/settings.cc:36
-msgid "Always show tabs"
-msgstr ""
+#: src/gtkui/settings.cc:42 src/qtui/settings.cc:65
+msgid "Show playlist tabs:"
+msgstr "نمایش تب های لیست پخش:"
 
-#: src/gtkui/settings.cc:38
+#: src/gtkui/settings.cc:45 src/qtui/settings.cc:69
 msgid "Show entry counts"
 msgstr ""
 
-#: src/gtkui/settings.cc:40
+#: src/gtkui/settings.cc:47 src/qtui/settings.cc:72
 msgid "Show close buttons"
 msgstr ""
 
-#: src/gtkui/settings.cc:42
+#: src/gtkui/settings.cc:49 src/qtui/settings.cc:75
 msgid "Playlist Columns"
 msgstr ""
 
-#: src/gtkui/settings.cc:44
+#: src/gtkui/settings.cc:51 src/qtui/settings.cc:77
 msgid "Show column headers"
 msgstr ""
 
-#: src/gtkui/settings.cc:46 src/modplug/plugin_main.cc:106
-#: src/skins/skins_cfg.cc:263
-msgid "Miscellaneous"
+#: src/gtkui/settings.cc:53 src/qtui/settings.cc:82
+msgid "Make column headers clickable for sorting"
 msgstr ""
 
-#: src/gtkui/settings.cc:47
-msgid "Arrow keys seek by:"
+#: src/gtkui/settings.cc:56
+msgid "Use symbolic icons in toolbar"
 msgstr ""
 
-#: src/gtkui/settings.cc:50
+#: src/gtkui/settings.cc:58 src/qtui/settings.cc:86
 msgid "Scroll on song change"
 msgstr ""
 
-#: src/gtkui/ui_gtk.cc:71
+#: src/gtkui/ui_gtk.cc:82
 msgid "GTK Interface"
 msgstr "رابط GTK"
 
-#: src/gtkui/ui_gtk.cc:222 src/skins/ui_main.cc:232
+#: src/gtkui/ui_gtk.cc:219 src/skins/main.cc:228 src/skins-qt/main.cc:231
 #, c-format
 msgid "%s - Audacious"
 msgstr "‎%s - Aduacious"
 
-#: src/gtkui/ui_gtk.cc:225 src/qtui/main_window.cc:186
+#: src/gtkui/ui_gtk.cc:221 src/moonstone/main_window.cc:184
+#: src/qtui/main_window.cc:385
 msgid "Buffering ..."
 msgstr ""
 
-#: src/gtkui/ui_gtk.cc:228 src/skins/ui_main.cc:234 src/skins/ui_main.cc:1164
+#: src/gtkui/ui_gtk.cc:224 src/pipewire/pipewire.cc:402 src/skins/main.cc:230
+#: src/skins-qt/main.cc:233
 msgid "Audacious"
 msgstr "Audacious"
 
-#: src/gtkui/ui_statusbar.cc:63 src/qtui/status_bar.cc:67
+#: src/gtkui/ui_gtk.cc:487 src/gtkui/ui_gtk.cc:518 src/gtkui/ui_gtk.cc:882
+#: src/hotkey/gui.cc:72 src/moonstone/main_window.cc:67
+#: src/moonstone/main_window.cc:145 src/moonstone/main_window.cc:146
+#: src/notify/osd.cc:85 src/qthotkey/gui.cc:67 src/qtui/main_window.cc:154
+#: src/qtui/main_window.cc:347 src/qtui/main_window.cc:348
+#: src/skins/menus.cc:109 src/skins-qt/menus.cc:100
+msgid "Play"
+msgstr "پخش"
+
+#: src/gtkui/ui_gtk.cc:487 src/moonstone/main_window.cc:151
+#: src/moonstone/main_window.cc:152 src/notify/osd.cc:82
+#: src/qtui/main_window.cc:353 src/qtui/main_window.cc:354
+#: src/skins/menus.cc:110 src/skins-qt/menus.cc:101
+msgid "Pause"
+msgstr "متوقف"
+
+#: src/gtkui/ui_gtk.cc:868 src/moonstone/main_window.cc:57
+#: src/qtui/main_window.cc:145 src/skins/menus.cc:86 src/skins-qt/menus.cc:77
+msgid "Search Library"
+msgstr ""
+
+#: src/gtkui/ui_gtk.cc:875 src/moonstone/main_window.cc:60
+#: src/qtui/main_window.cc:147
+msgid "Open Files"
+msgstr "باز کردن فایل‌ها"
+
+#: src/gtkui/ui_gtk.cc:876 src/moonstone/main_window.cc:62
+#: src/qtui/main_window.cc:149
+msgid "Add Files"
+msgstr "اضافه کردن فایل‌ها"
+
+#: src/gtkui/ui_gtk.cc:881 src/moonstone/main_window.cc:65
+#: src/qtui/main_window.cc:152 src/skins/menus.cc:112 src/skins-qt/menus.cc:103
+msgid "Previous"
+msgstr "قبلی"
+
+#: src/gtkui/ui_gtk.cc:883 src/hotkey/gui.cc:74 src/moonstone/main_window.cc:69
+#: src/qthotkey/gui.cc:69 src/qtui/main_window.cc:156 src/skins/menus.cc:111
+#: src/skins-qt/menus.cc:102
+msgid "Stop"
+msgstr "اتمام پخش"
+
+#: src/gtkui/ui_gtk.cc:884 src/moonstone/main_window.cc:76 src/notify/osd.cc:89
+#: src/qtui/main_window.cc:163 src/skins/menus.cc:113 src/skins-qt/menus.cc:104
+msgid "Next"
+msgstr "بعدی"
+
+#: src/gtkui/ui_gtk.cc:886 src/moonstone/main_window.cc:79
+#: src/qtui/main_window.cc:166 src/qtui/menus.cc:254 src/skins/menus.cc:79
+#: src/skins-qt/menus.cc:69
+msgid "Record Stream"
+msgstr ""
+
+#: src/gtkui/ui_gtk.cc:919 src/moonstone/main_window.cc:86
+#: src/qtui/main_window.cc:173 src/skins/menus.cc:103 src/skins-qt/menus.cc:94
+msgid "Repeat"
+msgstr "تکرار"
+
+#: src/gtkui/ui_gtk.cc:922 src/moonstone/main_window.cc:89
+#: src/qtui/main_window.cc:176 src/skins/menus.cc:104 src/skins-qt/menus.cc:95
+msgid "Shuffle"
+msgstr "بهم‌ریختن"
+
+#: src/gtkui/ui_gtk.cc:1114 src/qtui/main_window.cc:123
+msgid "Menu"
+msgstr "منو"
+
+#: src/gtkui/ui_statusbar.cc:64 src/qtui/status_bar.cc:155
 msgid "mono"
 msgstr "تک‌کاناله"
 
-#: src/gtkui/ui_statusbar.cc:65 src/qtui/status_bar.cc:69
+#: src/gtkui/ui_statusbar.cc:66 src/qtui/status_bar.cc:157
 msgid "stereo"
 msgstr "دوکاناله"
 
-#: src/gtkui/ui_statusbar.cc:67 src/qtui/status_bar.cc:71
+#: src/gtkui/ui_statusbar.cc:68 src/qtui/status_bar.cc:160
 #, c-format
 msgid "%d channel"
 msgid_plural "%d channels"
 msgstr0 "‎%d کانال"
+msgstr1 "‎%d کانال"
 
-#: src/gtkui/ui_statusbar.cc:81 src/qtui/status_bar.cc:85
+#: src/gtkui/ui_statusbar.cc:76 src/qtui/status_bar.cc:168
 #, c-format
-msgid "%d kbps"
-msgstr "‎%d کیلوبیت بر ثانیه"
+msgid "%d kHz"
+msgstr "%dکیلوهرتز"
 
-#: src/gtkui/ui_statusbar.cc:107 src/skins/ui_main_evlisteners.cc:103
+#: src/gtkui/ui_statusbar.cc:82 src/qtui/status_bar.cc:174
+#, c-format
+msgid "%d kbit/s"
+msgstr ""
+
+#: src/gtkui/ui_statusbar.cc:108 src/skins/main.cc:478 src/skins-qt/main.cc:461
 msgid "Single mode."
 msgstr "حالت تک‌فایل."
 
-#: src/gtkui/ui_statusbar.cc:109 src/skins/ui_main_evlisteners.cc:105
+#: src/gtkui/ui_statusbar.cc:110 src/skins/main.cc:480 src/skins-qt/main.cc:463
 msgid "Playlist mode."
 msgstr "حالت لیست پخش."
 
-#: src/gtkui/ui_statusbar.cc:117 src/skins/ui_main_evlisteners.cc:111
+#: src/gtkui/ui_statusbar.cc:118 src/skins/main.cc:486 src/skins-qt/main.cc:469
 msgid "Stopping after song."
 msgstr "توقف بعد از آهنگ."
 
-#: src/hotkey/gui.cc:71
+#: src/hotkey/gui.cc:71 src/qthotkey/gui.cc:66
 msgid "Previous track"
-msgstr ""
+msgstr "آهنگ قبلی"
 
-#: src/hotkey/gui.cc:72 src/notify/osd.cc:69 src/qtui/main_window.cc:69
-#: src/qtui/main_window.cc:172 src/qtui/main_window.cc:173
-#: src/skins/menus.cc:87
-msgid "Play"
-msgstr "پخش"
-
-#: src/hotkey/gui.cc:73
+#: src/hotkey/gui.cc:73 src/qthotkey/gui.cc:68
 msgid "Pause/Resume"
 msgstr "توقف/ادامه"
 
-#: src/hotkey/gui.cc:74 src/qtui/main_window.cc:70 src/skins/menus.cc:89
-msgid "Stop"
-msgstr "اتمام پخش"
-
-#: src/hotkey/gui.cc:75
+#: src/hotkey/gui.cc:75 src/qthotkey/gui.cc:70
 msgid "Next track"
-msgstr ""
+msgstr "آهنگ بعدی"
 
-#: src/hotkey/gui.cc:76
-msgid "Forward 5 seconds"
+#: src/hotkey/gui.cc:76 src/qthotkey/gui.cc:71
+msgid "Step forward"
 msgstr ""
 
-#: src/hotkey/gui.cc:77
-msgid "Rewind 5 seconds"
+#: src/hotkey/gui.cc:77 src/qthotkey/gui.cc:72
+msgid "Step backward"
 msgstr ""
 
-#: src/hotkey/gui.cc:78
+#: src/hotkey/gui.cc:78 src/qthotkey/gui.cc:73
 msgid "Mute"
 msgstr "قطع کردن صدا"
 
-#: src/hotkey/gui.cc:79
+#: src/hotkey/gui.cc:79 src/qthotkey/gui.cc:74
 msgid "Volume up"
 msgstr ""
 
-#: src/hotkey/gui.cc:80
+#: src/hotkey/gui.cc:80 src/qthotkey/gui.cc:75
 msgid "Volume down"
 msgstr ""
 
-#: src/hotkey/gui.cc:81
+#: src/hotkey/gui.cc:81 src/qthotkey/gui.cc:76
 msgid "Jump to file"
-msgstr ""
+msgstr "پرش به فایل"
 
-#: src/hotkey/gui.cc:82
+#: src/hotkey/gui.cc:82 src/qthotkey/gui.cc:77
 msgid "Toggle player window(s)"
 msgstr ""
 
-#: src/hotkey/gui.cc:83
+#: src/hotkey/gui.cc:83 src/qthotkey/gui.cc:78
 msgid "Show On-Screen-Display"
 msgstr "نمایش اطلاعات بر روی صفحه"
 
-#: src/hotkey/gui.cc:84
+#: src/hotkey/gui.cc:84 src/qthotkey/gui.cc:79
 msgid "Toggle repeat"
 msgstr ""
 
-#: src/hotkey/gui.cc:85
+#: src/hotkey/gui.cc:85 src/qthotkey/gui.cc:80
 msgid "Toggle shuffle"
 msgstr ""
 
-#: src/hotkey/gui.cc:86
+#: src/hotkey/gui.cc:86 src/qthotkey/gui.cc:81
 msgid "Toggle stop after current"
 msgstr ""
 
-#: src/hotkey/gui.cc:87
+#: src/hotkey/gui.cc:87 src/qthotkey/gui.cc:82
 msgid "Raise player window(s)"
 msgstr ""
 
-#: src/hotkey/gui.cc:97
+#: src/hotkey/gui.cc:98 src/qthotkey/gui.cc:100
 msgid "(none)"
 msgstr "(هیچکدام)"
 
-#: src/hotkey/gui.cc:234
+#: src/hotkey/gui.cc:261
 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 modifiers.\n"
 "\n"
 "Do you want to continue?"
 msgstr ""
-"توصیه نمی‌شود کلیدهای اولیه ماوس را بدون کلیدهای ترکیبی درنظر بگیرید.\n"
-"\n"
-"آیا می‌خواهید ادامه دهید؟"
 
-#: src/hotkey/gui.cc:236
+#: src/hotkey/gui.cc:264
 msgid "Binding mouse buttons"
 msgstr "تعریف گزینه برای کلیدهای ماوس"
 
-#: src/hotkey/gui.cc:391
+#: src/hotkey/gui.cc:434
 msgid ""
 "Press a key combination inside a text field.\n"
 "You can also bind mouse buttons."
@@ -2013,34 +2129,34 @@
 "ترکیب مورد نظر را در جعبه متن از طریق فشردن کلیدها ایجاد کنید.\n"
 "می‌توان از کلیدهای ماوس هم استفاده کنید."
 
-#: src/hotkey/gui.cc:396
+#: src/hotkey/gui.cc:444 src/qthotkey/gui.cc:179
 msgid "Hotkeys:"
 msgstr "کلیدهای میانبر:"
 
-#: src/hotkey/gui.cc:413
+#: src/hotkey/gui.cc:457 src/qthotkey/gui.cc:181
 msgid "Action:"
 msgstr "عمل:"
 
-#: src/hotkey/gui.cc:420
+#: src/hotkey/gui.cc:461 src/qthotkey/gui.cc:182
 msgid "Key Binding:"
 msgstr "کلیدهای تعریف‌شده:"
 
-#: src/hotkey/gui.cc:468
+#: src/hotkey/gui.cc:518 src/qthotkey/gui.cc:184
 msgid "_Add"
-msgstr ""
+msgstr "_اضافه کردن"
 
-#: src/hotkey/plugin.cc:61
+#: src/hotkey/plugin.cc:59 src/qthotkey/plugin.cc:78
 msgid "Global Hotkeys"
 msgstr ""
 
-#: src/hotkey/plugin.cc:79
+#: src/hotkey/plugin.cc:74
 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"
+"Contributors 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"
@@ -2048,51 +2164,79 @@
 " Jeremy Tan <nsx@nsx.homeip.net>"
 msgstr ""
 
-#: src/jack-ng/jack-ng.cc:49
+#: src/jack/jack-ng.cc:54
 msgid "JACK Output"
 msgstr ""
 
-#: src/jack-ng/jack-ng.cc:114
+#: src/jack/jack-ng.cc:126
+msgid "Client name:"
+msgstr ""
+
+#: src/jack/jack-ng.cc:128
 msgid "Automatically connect to output ports"
 msgstr ""
 
-#: src/jack-ng/jack-ng.cc:155
+#: src/jack/jack-ng.cc:130
+msgid "Filter ports (regex, use any port if blank):"
+msgstr ""
+
+#: src/jack/jack-ng.cc:136
+msgid "Connect to physical ports only"
+msgstr ""
+
+#: src/jack/jack-ng.cc:139
+msgid "Upmix to"
+msgstr ""
+
+#: src/jack/jack-ng.cc:141
+msgid "ports if input has fewer channels"
+msgstr ""
+
+#: src/jack/jack-ng.cc:143
+msgid "Ignore insufficient number of ports"
+msgstr ""
+
+#: src/jack/jack-ng.cc:181
+msgid "No JACK output ports were found. Please check settings."
+msgstr ""
+
+#: src/jack/jack-ng.cc:195
 #, c-format
 msgid "Only %d JACK output ports were found but %d are required."
 msgstr ""
 
-#: src/jack-ng/jack-ng.cc:164
+#: src/jack/jack-ng.cc:210
 #, c-format
 msgid "Failed to connect to JACK port %s."
 msgstr ""
 
-#: src/jack-ng/jack-ng.cc:184
+#: src/jack/jack-ng.cc:230
 msgid ""
 "JACK supports only floating-point audio. You must change the output bit "
 "depth to floating-point in Audacious settings."
 msgstr ""
 
-#: src/jack-ng/jack-ng.cc:197
+#: src/jack/jack-ng.cc:245
 msgid "Failed to connect to the JACK server; is it running?"
 msgstr ""
 
-#: src/jack-ng/jack-ng.cc:273
+#: src/jack/jack-ng.cc:321
 #, c-format
 msgid ""
 "The JACK server requires a sample rate of %d Hz, but Audacious is playing at "
 "%d Hz. Please use the Sample Rate Converter effect to correct the mismatch."
 msgstr ""
 
-#: src/ladspa/plugin.cc:414
+#: src/ladspa/plugin.cc:416
 #, c-format
 msgid "%s Settings"
 msgstr "تنظیمات ‎%s"
 
-#: src/ladspa/plugin.cc:478
+#: src/ladspa/plugin.cc:482
 msgid "Module paths:"
 msgstr "مسیرهای ماژول:"
 
-#: src/ladspa/plugin.cc:483
+#: src/ladspa/plugin.cc:487
 msgid ""
 "Separate multiple paths with a colon.\n"
 "These paths are searched in addition to LADSPA_PATH.\n"
@@ -2103,25 +2247,25 @@
 "بعد از وارد کردن هر مسیر کلید اینتر را فشار دهید تا افزونه‌های جدید جستجو "
 "شوند."
 
-#: src/ladspa/plugin.cc:499
+#: src/ladspa/plugin.cc:508
 msgid "Available plugins:"
 msgstr "افزونه‌های موجود:"
 
-#: src/ladspa/plugin.cc:512 src/modplug/plugin_main.cc:92
-#: src/modplug/plugin_main.cc:95 src/modplug/plugin_main.cc:98
-#: src/modplug/plugin_main.cc:101
+#: src/ladspa/plugin.cc:521 src/modplug/plugin_main.cc:91
+#: src/modplug/plugin_main.cc:94 src/modplug/plugin_main.cc:97
+#: src/modplug/plugin_main.cc:100
 msgid "Enable"
 msgstr "فعال کردن"
 
-#: src/ladspa/plugin.cc:518
+#: src/ladspa/plugin.cc:527
 msgid "Enabled plugins:"
 msgstr "افزونه‌های فعال:"
 
-#: src/ladspa/plugin.cc:534
+#: src/ladspa/plugin.cc:543
 msgid "Settings"
 msgstr "تنظیمات"
 
-#: src/ladspa/plugin.cc:551
+#: src/ladspa/plugin.cc:560
 msgid ""
 "LADSPA Host for Audacious\n"
 "Copyright 2011 John Lindgren"
@@ -2135,7 +2279,7 @@
 msgid "LIRC Plugin"
 msgstr ""
 
-#: src/lirc/lirc.cc:381
+#: src/lirc/lirc.cc:379
 msgid ""
 "A simple plugin to control Audacious using the LIRC remote control daemon\n"
 "\n"
@@ -2151,81 +2295,141 @@
 "For more information about LIRC, see http://lirc.org."
 msgstr ""
 
-#: src/lirc/lirc.cc:392
+#: src/lirc/lirc.cc:390
 msgid "Connection"
 msgstr ""
 
-#: src/lirc/lirc.cc:393
+#: src/lirc/lirc.cc:391
 msgid "Reconnect to LIRC server"
 msgstr ""
 
-#: src/lirc/lirc.cc:395
+#: src/lirc/lirc.cc:393
 msgid "Wait before reconnecting:"
 msgstr ""
 
-#: src/lyricwiki/lyricwiki.cc:41
-msgid "LyricWiki Plugin"
+#: src/lyrics-common/chart_lyrics_provider.cc:93
+#: src/lyrics-common/chart_lyrics_provider.cc:150
+#: src/lyrics-common/lyrics_ovh_provider.cc:50
+#, c-format
+msgid "Unable to fetch %s"
+msgstr ""
+
+#: src/lyrics-common/chart_lyrics_provider.cc:100
+#: src/lyrics-common/chart_lyrics_provider.cc:157
+#: src/lyrics-common/lyrics_ovh_provider.cc:57
+#, c-format
+msgid "Unable to parse %s"
+msgstr ""
+
+#: src/lyrics-common/chart_lyrics_provider.cc:121
+#: src/lyrics-common/chart_lyrics_provider.cc:194
+#: src/lyrics-common/lyrics_ovh_provider.cc:88
+msgid "Looking for lyrics ..."
+msgstr ""
+
+#: src/lyrics-common/preferences.h:43
+msgid "Nowhere"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:49
+msgid "Artist is truncated at the start, Title -- at the end"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:50
+msgid "Chars to truncate on:"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:54
+msgid "Chars are ORed in RegExp, surrounded by whitespace"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:55
+msgid "Chars to split on:"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:56
+msgid "Further truncate those on chars"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:62
+msgid "General"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:63
+msgid "Split title into artist and title on chars"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:66
+msgid "Sources"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:67
+msgid "Use embedded lyrics (from Lyrics tag)"
 msgstr ""
 
-#: src/lyricwiki/lyricwiki.cc:131 src/lyricwiki-qt/lyricwiki.cc:136
-msgid "No lyrics available"
+#: src/lyrics-common/preferences.h:69
+msgid "Fetch lyrics from internet:"
 msgstr ""
 
-#: src/lyricwiki/lyricwiki.cc:217 src/lyricwiki/lyricwiki.cc:226
-#: src/lyricwiki/lyricwiki.cc:243 src/lyricwiki/lyricwiki.cc:252
-#: src/lyricwiki/lyricwiki.cc:267 src/lyricwiki-qt/lyricwiki.cc:222
-#: src/lyricwiki-qt/lyricwiki.cc:231 src/lyricwiki-qt/lyricwiki.cc:248
-#: src/lyricwiki-qt/lyricwiki.cc:257 src/lyricwiki-qt/lyricwiki.cc:272
+#: src/lyrics-common/preferences.h:72
+msgid "Store fetched lyrics in local cache"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:74
+msgid "Local Storage"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:75
+msgid "Load lyric files (.lrc) from local storage"
+msgstr ""
+
+#: src/lyrics-common/utils.cc:54 src/ui-common/dialogs-qt.cc:63
 msgid "Error"
 msgstr "خطا"
 
-#: src/lyricwiki/lyricwiki.cc:218 src/lyricwiki/lyricwiki.cc:244
-#: src/lyricwiki-qt/lyricwiki.cc:223 src/lyricwiki-qt/lyricwiki.cc:249
-#, c-format
-msgid "Unable to fetch %s"
+#: src/lyrics-common/utils.cc:60
+msgid "Lyrics could not be found."
 msgstr ""
 
-#: src/lyricwiki/lyricwiki.cc:227 src/lyricwiki/lyricwiki.cc:253
-#: src/lyricwiki-qt/lyricwiki.cc:232 src/lyricwiki-qt/lyricwiki.cc:258
-#, c-format
-msgid "Unable to parse %s"
+#: src/lyrics-common/utils.cc:142
+msgid "Missing title and/or artist."
 msgstr ""
 
-#: src/lyricwiki/lyricwiki.cc:259 src/lyricwiki-qt/lyricwiki.cc:264
-msgid "Looking for lyrics ..."
+#: src/lyrics-gtk/lyrics-gtk.cc:37 src/lyrics-qt/lyrics-qt.cc:50
+msgid "Lyrics"
 msgstr ""
 
-#: src/lyricwiki/lyricwiki.cc:267 src/lyricwiki-qt/lyricwiki.cc:272
-msgid "Missing song metadata"
+#: src/lyrics-gtk/lyrics-gtk.cc:189 src/lyrics-qt/lyrics-qt.cc:171
+msgid "Edit Lyrics ..."
 msgstr ""
 
-#: src/lyricwiki/lyricwiki.cc:278 src/lyricwiki-qt/lyricwiki.cc:283
-msgid "Connecting to lyrics.wikia.com ..."
+#: src/lyrics-gtk/lyrics-gtk.cc:195 src/lyrics-qt/lyrics-qt.cc:178
+msgid "Save Locally"
 msgstr ""
 
-#: src/lyricwiki-qt/lyricwiki.cc:55
-msgid "LyricWiki Plugin (Qt)"
-msgstr ""
+#: src/lyrics-gtk/lyrics-gtk.cc:201 src/lyrics-qt/lyrics-qt.cc:186
+msgid "Refresh"
+msgstr "تازه سازی"
 
-#: src/m3u/m3u.cc:32
+#: src/m3u/m3u.cc:33
 msgid "M3U Playlists"
-msgstr ""
+msgstr "لیست پخش M3U"
 
 #: src/metronom/metronom.cc:44
 msgid "Tact Generator"
 msgstr ""
 
-#: src/metronom/metronom.cc:147
+#: src/metronom/metronom.cc:145
 #, c-format
 msgid "Tact generator: %d bpm"
 msgstr "مولد تکت: ‎%d بیت در دقیقه"
 
-#: src/metronom/metronom.cc:149
+#: src/metronom/metronom.cc:147
 #, c-format
 msgid "Tact generator: %d bpm %d/%d"
 msgstr "مولد تکت: ‎%d بیت در دقیقه ‎%d/%d"
 
-#: src/metronom/metronom.cc:237
+#: src/metronom/metronom.cc:235
 msgid ""
 "A Tact Generator by Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
 "\n"
@@ -2234,21 +2438,21 @@
 "or tact://60*3/4 to play 60 bpm in 3/4 tacts"
 msgstr ""
 
-#: src/mixer/mixer.cc:38
+#: src/mixer/mixer.cc:43
 msgid "Channel Mixer"
 msgstr ""
 
-#: src/mixer/mixer.cc:202
+#: src/mixer/mixer.cc:255
 msgid ""
 "Channel Mixer Plugin for Audacious\n"
 "Copyright 2011-2012 John Lindgren and Michał Lipski"
 msgstr ""
 
-#: src/mixer/mixer.cc:206
+#: src/mixer/mixer.cc:259
 msgid "Channel Mixer"
 msgstr ""
 
-#: src/mixer/mixer.cc:207
+#: src/mixer/mixer.cc:260
 msgid "Output channels:"
 msgstr "کانال‌های خروجی:"
 
@@ -2260,168 +2464,176 @@
 msgid "Error connecting to MMS server"
 msgstr ""
 
-#: src/modplug/modplugbmp.h:53
+#: src/modplug/modplugbmp.h:57
 msgid "ModPlug (Module Player)"
 msgstr ""
 
-#: src/modplug/plugin_main.cc:53
-msgid "Resolution"
-msgstr ""
-
-#: src/modplug/plugin_main.cc:54
-msgid "8-bit"
-msgstr ""
-
 #: src/modplug/plugin_main.cc:55
-msgid "16-bit"
-msgstr ""
-
-#: src/modplug/plugin_main.cc:56
 msgid "Channels"
-msgstr ""
+msgstr "کانال"
 
-#: src/modplug/plugin_main.cc:60
+#: src/modplug/plugin_main.cc:59
 msgid "Nearest (fastest)"
 msgstr ""
 
-#: src/modplug/plugin_main.cc:61
+#: src/modplug/plugin_main.cc:60
 msgid "Linear (fast)"
 msgstr ""
 
-#: src/modplug/plugin_main.cc:62
+#: src/modplug/plugin_main.cc:61
 msgid "Spline (good)"
 msgstr ""
 
-#: src/modplug/plugin_main.cc:63
+#: src/modplug/plugin_main.cc:62
 msgid "Polyphase (best)"
 msgstr ""
 
-#: src/modplug/plugin_main.cc:64
+#: src/modplug/plugin_main.cc:63
 msgid "Sample rate"
-msgstr ""
+msgstr "نرخ نمونه برداری"
 
-#: src/modplug/plugin_main.cc:65
+#: src/modplug/plugin_main.cc:64
 msgid "22 kHz"
-msgstr ""
+msgstr "22 کیلوهرتز"
 
-#: src/modplug/plugin_main.cc:66
+#: src/modplug/plugin_main.cc:65
 msgid "44 kHz"
-msgstr ""
+msgstr "44 کیلوهرتز"
 
-#: src/modplug/plugin_main.cc:67
+#: src/modplug/plugin_main.cc:66
 msgid "48 kHz"
-msgstr ""
+msgstr "48 کیلوهرتز"
 
-#: src/modplug/plugin_main.cc:68
+#: src/modplug/plugin_main.cc:67
 msgid "96 kHz"
-msgstr ""
+msgstr "96 کیلوهرتز"
 
-#: src/modplug/plugin_main.cc:72 src/modplug/plugin_main.cc:77
-#: src/modplug/plugin_main.cc:82
+#: src/modplug/plugin_main.cc:71 src/modplug/plugin_main.cc:76
+#: src/modplug/plugin_main.cc:81
 msgid "Level:"
 msgstr ""
 
-#: src/modplug/plugin_main.cc:78
+#: src/modplug/plugin_main.cc:77
 msgid "Cutoff:"
 msgstr ""
 
-#: src/modplug/plugin_main.cc:91
+#: src/modplug/plugin_main.cc:90
 msgid "Reverb"
 msgstr ""
 
-#: src/modplug/plugin_main.cc:94
+#: src/modplug/plugin_main.cc:93
 msgid "Bass Boost"
 msgstr ""
 
-#: src/modplug/plugin_main.cc:97
+#: src/modplug/plugin_main.cc:96
 msgid "Surround"
 msgstr ""
 
-#: src/modplug/plugin_main.cc:100
+#: src/modplug/plugin_main.cc:99
 msgid "Preamp"
 msgstr ""
 
-#: src/modplug/plugin_main.cc:107
+#: src/modplug/plugin_main.cc:106
 msgid "Oversample"
 msgstr ""
 
-#: src/modplug/plugin_main.cc:108
+#: src/modplug/plugin_main.cc:107
 msgid "Noise reduction"
 msgstr ""
 
-#: src/modplug/plugin_main.cc:109
+#: src/modplug/plugin_main.cc:108
 msgid "Play Amiga MODs"
 msgstr ""
 
-#: src/modplug/plugin_main.cc:110
+#: src/modplug/plugin_main.cc:109
 msgid "Repeat"
-msgstr ""
+msgstr "تکرار"
 
-#: src/modplug/plugin_main.cc:111
+#: src/modplug/plugin_main.cc:110
 msgid "Repeat count:"
 msgstr ""
 
-#: src/modplug/plugin_main.cc:112
+#: src/modplug/plugin_main.cc:111
 msgid "To repeat forever, set the repeat count to -1."
 msgstr ""
 
-#: src/modplug/plugin_main.cc:125 src/sid/xs_config.cc:106
+#: src/modplug/plugin_main.cc:124 src/sid/xs_config.cc:106
 msgid "These settings will take effect when Audacious is restarted."
 msgstr ""
 
-#: src/mpg123/mpg123.cc:54
-msgid "MPG123 Plugin"
+#: src/moonstone/main_window.cc:72 src/moonstone/main_window.cc:73
+#: src/qtui/main_window.cc:159 src/qtui/main_window.cc:160
+#: src/skins/menus.cc:107 src/skins-qt/menus.cc:98
+msgid "Stop After This Song"
 msgstr ""
 
-#: src/mpg123/mpg123.cc:83
-msgid "Advanced"
+#: src/moonstone/moonstone.cc:39
+msgid "Moonstone"
+msgstr ""
+
+#: src/moonstone/playlist_header.cc:212 src/qtui/playlist_header.cc:258
+msgid "Reset to Defaults"
+msgstr "بازنشانی به حالت پیش فرض "
+
+#: src/moonstone/playlist_model.cc:38 src/qtui/playlist_header.cc:232
+msgid "Now Playing"
+msgstr "در حال پخش"
+
+#: src/moonstone/playlist_selection.cc:66
+#: src/playlist-manager/playlist-manager.cc:201
+#: src/playlist-manager-qt/playlist-manager-qt.cc:190
+msgid "Entries"
+msgstr "داده‌ها"
+
+#: src/mpg123/mpg123.cc:54
+msgid "MPG123 Plugin"
 msgstr ""
 
-#: src/mpg123/mpg123.cc:84
+#: src/mpg123/mpg123.cc:82
 msgid "Use accurate length calculation (slow)"
 msgstr ""
 
-#: src/mpg123/mpg123.cc:248
+#: src/mpg123/mpg123.cc:260
 msgid "Surround"
 msgstr "فراگیر"
 
-#: src/mpris2/plugin.cc:39
+#: src/mpris2/plugin.cc:40
 msgid "MPRIS 2 Server"
 msgstr ""
 
-#: src/neon/neon.cc:97
+#: src/neon/neon.cc:102
 msgid "Neon HTTP/HTTPS Plugin"
 msgstr ""
 
-#: src/neon/neon.cc:521
+#: src/neon/neon.cc:526
 msgid "Error parsing redirect"
 msgstr ""
 
-#: src/neon/neon.cc:535
+#: src/neon/neon.cc:540
 msgid "Unknown HTTP error"
 msgstr ""
 
-#: src/neon/neon.cc:569
+#: src/neon/neon.cc:614
 msgid "Error parsing URL"
 msgstr ""
 
-#: src/neon/neon.cc:632
+#: src/neon/neon.cc:687
 msgid "Too many redirects"
 msgstr ""
 
-#: src/notify/event.cc:64
+#: src/notify/event.cc:97
 msgid "Stopped"
 msgstr "متوقف شده"
 
-#: src/notify/event.cc:64
+#: src/notify/event.cc:97
 msgid "Audacious is not playing."
 msgstr "Audacious در حال پخش نیست."
 
-#: src/notify/notify.cc:42
+#: src/notify/notify.cc:39
 msgid "Desktop Notifications"
-msgstr ""
+msgstr "اعلان های دسکتاپ"
 
-#: src/notify/notify.cc:60
+#: src/notify/notify.cc:57
 msgid ""
 "Desktop Notifications Plugin for Audacious\n"
 "Copyright (C) 2010 Maximilian Bogner\n"
@@ -2441,64 +2653,104 @@
 "this program. If not, see <http://www.gnu.org/licenses/>."
 msgstr ""
 
-#: src/notify/notify.cc:110
+#: src/notify/notify.cc:104
 msgid "Show playback controls"
 msgstr ""
 
-#: src/notify/notify.cc:112
+#: src/notify/notify.cc:106
 msgid "Always show notification"
 msgstr ""
 
-#: src/notify/notify.cc:114
+#: src/notify/notify.cc:108
 msgid "Include album name in notification"
 msgstr ""
 
-#: src/notify/osd.cc:58
+#: src/notify/notify.cc:110
+msgid "Custom notification duration:"
+msgstr ""
+
+#: src/notify/osd.cc:74
 msgid "Show"
+msgstr "نمایش"
+
+#: src/openmpt/mpt.cc:50
+msgid "OpenMPT (Module Player)"
 msgstr ""
 
-#: src/notify/osd.cc:66 src/qtui/main_window.cc:178
-#: src/qtui/main_window.cc:179 src/skins/menus.cc:88
-msgid "Pause"
-msgstr "متوقف"
+#: src/openmpt/mpt.cc:132
+msgid ""
+"Module player based on libopenmpt\n"
+"\n"
+"Written by: Chris Spiegel <cspiegel@gmail.com>"
+msgstr ""
 
-#: src/notify/osd.cc:73 src/qtui/main_window.cc:72 src/skins/menus.cc:91
-msgid "Next"
-msgstr "بعدی"
+#: src/openmpt/mpt.cc:151
+msgid "Stereo separation:"
+msgstr ""
 
-#: src/oss4/oss.h:93
-msgid "OSS4 Output"
+#: src/openmpt/mpt.cc:153
+msgid "% (0=mono, 100=default, 200=full)"
 msgstr ""
 
-#: src/oss4/oss.h:95
-msgid "OSS3 Output"
+#: src/openmpt/mpt.cc:157
+msgid "Interpolation:"
+msgstr ""
+
+#: src/openmpt/mptwrap.h:51 src/soxr/sox-resampler.cc:189 src/xsf/plugin.cc:437
+msgid "Linear"
+msgstr ""
+
+#: src/openmpt/mptwrap.h:52
+msgid "Cubic"
+msgstr ""
+
+#: src/openmpt/mptwrap.h:53
+msgid "Windowed sinc"
 msgstr ""
 
+#: src/opus/opus.cc:39
+msgid "Opus Decoder"
+msgstr ""
+
+#: src/opus/opus.cc:336
+msgid ""
+"Opus Decoder Plugin for Audacious\n"
+"Copyright 2022 Thomas Lange"
+msgstr ""
+
+#: src/oss4/oss.h:70
+msgid "OSS4 Output"
+msgstr "خروجی OSS4"
+
+#: src/oss4/oss.h:72
+msgid "OSS3 Output"
+msgstr "خروجی OSS3"
+
 #: src/oss4/plugin.cc:35
 msgid "Default device"
-msgstr ""
+msgstr "ابزار پیش فرض"
 
-#: src/oss4/plugin.cc:77
+#: src/oss4/plugin.cc:78
 msgid "Audio device:"
 msgstr "ابزار صوتی:"
 
-#: src/oss4/plugin.cc:80
+#: src/oss4/plugin.cc:81
 msgid "Use alternate device:"
 msgstr "از ابزار جایگزین استفاده کن:"
 
-#: src/oss4/plugin.cc:84
+#: src/oss4/plugin.cc:85
 msgid "Save volume between sessions."
 msgstr ""
 
-#: src/oss4/plugin.cc:86
+#: src/oss4/plugin.cc:87
 msgid "Enable format conversions made by the OSS software."
 msgstr "تغییر فرمت بوسیله نرم‌افزار نرم‌افزار OSS فعال شود."
 
-#: src/oss4/plugin.cc:88
+#: src/oss4/plugin.cc:89
 msgid "Enable exclusive mode to prevent virtual mixing."
 msgstr ""
 
-#: src/oss4/plugin.cc:100
+#: src/oss4/plugin.cc:101
 msgid ""
 "OSS4 Output Plugin for Audacious\n"
 "Copyright 2010-2012 Michał Lipski\n"
@@ -2507,59 +2759,90 @@
 "Lindgren and of course the authors of the previous OSS plugin."
 msgstr ""
 
-#: src/playlist-manager/playlist-manager.cc:37
-msgid "Playlist Manager"
+#: src/pipewire/pipewire.cc:44
+msgid "PipeWire Output"
 msgstr ""
 
-#: src/playlist-manager/playlist-manager.cc:226
-msgid "Entries"
+#: src/pipewire/pipewire.cc:118
+msgid ""
+"PipeWire Output Plugin for Audacious\n"
+"Copyright 2022 Thomas Lange\n"
+"\n"
+"Based on the PipeWire Output Plugin for Qmmp\n"
+"Copyright 2021 Ilya Kotov"
 msgstr ""
 
-#: src/playlist-manager/playlist-manager.cc:245
+#: src/pipewire/pipewire.cc:408 src/skins/menus.cc:88 src/skins-qt/menus.cc:79
+msgid "Playback"
+msgstr "پخش"
+
+#: src/playlist-manager/playlist-manager.cc:38
+#: src/playlist-manager-qt/playlist-manager-qt.cc:42
+msgid "Playlist Manager"
+msgstr "مدیریت لیست پخش"
+
+#: src/playlist-manager/playlist-manager.cc:221
+#: src/playlist-manager-qt/playlist-manager-qt.cc:356
 msgid "_Remove"
-msgstr ""
+msgstr "_حذف"
 
-#: src/playlist-manager/playlist-manager.cc:246
+#: src/playlist-manager/playlist-manager.cc:222
+#: src/playlist-manager-qt/playlist-manager-qt.cc:351
 msgid "Ren_ame"
-msgstr ""
+msgstr "تغییر_نام"
 
 #: src/pls/pls.cc:35
 msgid "PLS Playlists"
-msgstr ""
+msgstr "لیست پخش های PLS "
 
-#: src/psf/plugin.cc:45
+#: src/psf/plugin.cc:53
 msgid "OpenPSF PSF1/PSF2 Decoder"
 msgstr ""
 
-#: src/pulse_audio/pulse_audio.cc:38
+#: src/psf/plugin.cc:270
+msgid "OpenPSF Configuration"
+msgstr ""
+
+#: src/psf/plugin.cc:271 src/xsf/plugin.cc:444
+msgid "Ignore length from file"
+msgstr ""
+
+#: src/pulse/pulse_audio.cc:42
 msgid "PulseAudio Output"
 msgstr ""
 
-#: src/pulse_audio/pulse_audio.cc:611
+#: src/pulse/pulse_audio.cc:84
+msgid "Context name:"
+msgstr ""
+
+#: src/pulse/pulse_audio.cc:86
+msgid "Stream name:"
+msgstr "نام استریم:"
+
+#: src/pulse/pulse_audio.cc:596
 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."
+"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/qtaudio/qtaudio.cc:49
+#: src/qtaudio/qtaudio.cc:53
 msgid "QtMultimedia Output"
 msgstr ""
 
-#: src/qtaudio/qtaudio.cc:77
+#: src/qtaudio/qtaudio.cc:84
 msgid ""
 "QtMultimedia Audio Output Plugin for Audacious\n"
 "Copyright 2014 William Pitcock\n"
@@ -2568,50 +2851,87 @@
 "Copyright 2010 John Lindgren"
 msgstr ""
 
-#: src/qtui/dialog_windows.cc:31
-msgid "Working ..."
+#: src/qtglspectrum/gl-spectrum.cc:41
+msgid ""
+"OpenGL Spectrum Analyzer for Audacious\n"
+"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
+"Copyright 2014, 2020 Ariadne Conill\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/qtui/filter_input.cc:44 src/skins/ui_playlist.cc:221
-msgid "Search"
+#: src/qthotkey/gui.cc:177
+msgid "Press a key combination inside a text field."
+msgstr ""
+
+#: src/qthotkey/plugin.cc:105
+msgid ""
+"Global Hotkey Plugin\n"
+"Control the player with global key combinations or multimedia keys.\n"
+"\n"
+"Copyright (C) 2020 i.Dark_Templar <darktemplar@dark-templar-archives.net>\n"
+"Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n"
+"\n"
+"Contributors 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/qtui/main_window_actions.cc:94
+#: src/qtui/menus.cc:109
 msgid "_Open Folder ..."
 msgstr ""
 
-#: src/qtui/main_window_actions.cc:96
+#: src/qtui/menus.cc:115
 msgid "_Add Folder ..."
 msgstr ""
 
-#: src/qtui/main_window_actions.cc:101
+#: src/qtui/menus.cc:128
 msgid "_Log Inspector ..."
 msgstr ""
 
-#: src/qtui/main_window.cc:64
-msgid "Open Files"
+#: src/qtui/menus.cc:220
+msgid "_Find ..."
 msgstr ""
 
-#: src/qtui/main_window.cc:66
-msgid "Add Files"
+#: src/qtui/menus.cc:256 src/skins/menus.cc:80 src/skins-qt/menus.cc:70
+msgid "Audio Settings ..."
+msgstr "تنظیمات صدا..."
+
+#: src/qtui/playlist_model.cc:188
+msgid "Q#"
 msgstr ""
 
-#: src/qtui/main_window.cc:71 src/skins/menus.cc:90
-msgid "Previous"
-msgstr "قبلی"
+#: src/qtui/playlist_model.cc:190
+msgid "T#"
+msgstr ""
 
-#: src/qtui/main_window.cc:77 src/skins/menus.cc:82
-msgid "Repeat"
-msgstr "تکرار"
+#: src/qtui/playlist_model.cc:192
+msgid "C#"
+msgstr ""
 
-#: src/qtui/main_window.cc:79 src/skins/menus.cc:83
-msgid "Shuffle"
-msgstr "بهم‌ریختن"
+#: src/qtui/playlist_model.cc:194
+msgid "D#"
+msgstr ""
 
-#: src/qtui/qtui.cc:42
+#: src/qtui/qtui.cc:40
 msgid "Qt Interface"
 msgstr ""
 
+#: src/qtui/search_bar.cc:46
+msgid "Search playlist"
+msgstr ""
+
+#: src/qtui/settings.cc:79
+msgid "Use bold font for column headers"
+msgstr ""
+
 #: src/resample/resample.cc:43
 msgid "Sample Rate Converter"
 msgstr ""
@@ -2650,9 +2970,9 @@
 msgid "Method:"
 msgstr "شیوه:"
 
-#: src/resample/resample.cc:199 src/sox-resampler/sox-resampler.cc:161
+#: src/resample/resample.cc:199 src/soxr/sox-resampler.cc:203
 msgid "Rate:"
-msgstr ""
+msgstr "نرخ:"
 
 #: src/resample/resample.cc:202
 msgid "Rate Mappings"
@@ -2664,200 +2984,194 @@
 
 #: src/resample/resample.cc:205
 msgid "8 kHz:"
-msgstr ""
+msgstr "8 کیلوهرتز:"
 
 #: src/resample/resample.cc:209
 msgid "16 kHz:"
-msgstr ""
+msgstr "16 کیلوهرتز:"
 
 #: src/resample/resample.cc:213
 msgid "22.05 kHz:"
-msgstr ""
+msgstr "22.05 کیلوهرتز:"
 
 #: src/resample/resample.cc:217
 msgid "32.0 kHz:"
-msgstr ""
+msgstr "32.0 کیلوهرتز:"
 
 #: src/resample/resample.cc:221
 msgid "44.1 kHz:"
-msgstr ""
+msgstr "44.1 کیلوهرتز:"
 
 #: src/resample/resample.cc:225
 msgid "48 kHz:"
-msgstr ""
+msgstr "48 کیلوهرتز:"
 
 #: src/resample/resample.cc:229
 msgid "88.2 kHz:"
-msgstr ""
+msgstr "88.2 کیلوهرتز:"
 
 #: src/resample/resample.cc:233
 msgid "96 kHz:"
-msgstr ""
+msgstr "96 کیلوهرتز:"
 
 #: src/resample/resample.cc:237
 msgid "176.4 kHz:"
-msgstr ""
+msgstr "176.4 کیلوهرتز:"
 
 #: src/resample/resample.cc:241
 msgid "192 kHz:"
-msgstr ""
-
-#: src/scrobbler2/config_window.cc:41
-#, c-format
-msgid "OK. Scrobbling for user: %s"
-msgstr ""
+msgstr "192 کیلوهرتز:"
 
-#: src/scrobbler2/config_window.cc:54
-msgid "Permission Denied"
+#: src/scrobbler2/config_window.cc:29
+msgid "Checking Last.fm access ..."
 msgstr ""
 
-#: src/scrobbler2/config_window.cc:56
-msgid "Access the following link to allow Audacious to scrobble your plays:"
-msgstr ""
-
-#: src/scrobbler2/config_window.cc:66
-msgid "Keep this window open and click 'Check Permission' again.\n"
-msgstr ""
-
-#: src/scrobbler2/config_window.cc:69 src/scrobbler2/config_window.cc:80
+#: src/scrobbler2/config_window.cc:35
 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."
+"Your scrobbles are being saved on your computer temporarily. They will be "
+"submitted as soon as Audacious is allowed access."
 msgstr ""
 
-#: src/scrobbler2/config_window.cc:77
-msgid "Network Problem."
+#: src/scrobbler2/config_window.cc:41
+#, c-format
+msgid "Permission granted. Scrobbling for user %s."
 msgstr ""
 
-#: src/scrobbler2/config_window.cc:78
-msgid "There was a problem contacting Last.fm. Please try again later."
+#: src/scrobbler2/config_window.cc:44
+msgid ""
+"Permission denied. Open the following URL in a browser, allow Audacious "
+"access to your account, and then click 'Check Permission' again:"
 msgstr ""
 
-#: src/scrobbler2/config_window.cc:110
-msgid "Checking..."
+#: src/scrobbler2/config_window.cc:53
+msgid "There was a problem contacting Last.fm."
 msgstr ""
 
-#: src/scrobbler2/config_window.cc:176
-msgid "C_heck Permission"
+#: src/scrobbler2/config_window.cc:92
+msgid "Check Permission"
 msgstr ""
 
-#: src/scrobbler2/config_window.cc:177
-msgid "_Revoke Permission"
+#: src/scrobbler2/config_window.cc:93
+msgid "Revoke Permission"
 msgstr ""
 
-#: src/scrobbler2/config_window.cc:220
-msgid ""
-"You need to allow Audacious to scrobble tracks to your Last.fm account.\n"
+#: src/scrobbler2/config_window.cc:97
+msgid "You need to allow Audacious to scrobble tracks to your Last.fm account."
 msgstr ""
 
 #: src/scrobbler2/scrobbler.cc:29
 msgid "Scrobbler 2.0"
 msgstr ""
 
-#: src/scrobbler2/scrobbler.cc:224
+#: src/scrobbler2/scrobbler.cc:200
 msgid ""
 "The Scrobbler plugin could not be started.\n"
 "There might be a problem with your installation."
 msgstr ""
 
-#: src/scrobbler2/scrobbler.cc:289
+#: src/scrobbler2/scrobbler.cc:245
 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"
+"project."
 msgstr ""
 
-#: src/scrobbler2/scrobbler_communication.cc:642
-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/sdlout.cc:48
+#: src/sdlout/sdlout.cc:43
 msgid "SDL Output"
 msgstr ""
 
-#: src/sdlout/sdlout.cc:77
+#: src/sdlout/sdlout.cc:72
 msgid ""
 "SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
 msgstr ""
 
-#: src/search-tool/search-tool.cc:116 src/search-tool/search-tool.cc:124
+#: src/search-tool/library.cc:35 src/search-tool/library.cc:46
+#: src/search-tool-qt/library.cc:35 src/search-tool-qt/library.cc:46
 msgid "Library"
-msgstr ""
-
-#: src/search-tool/search-tool.cc:394
-#, c-format
-msgid "%d result"
-msgid_plural "%d results"
-msgstr0 ""
+msgstr "کتابخانه"
 
-#: src/search-tool/search-tool.cc:400
-#, c-format
-msgid "(%d hidden)"
-msgid_plural "(%d hidden)"
-msgstr0 ""
-
-#: src/search-tool/search-tool.cc:594
+#: src/search-tool-qt/search-model.cc:44 src/search-tool/search-tool.cc:287
 #, c-format
 msgid "%d song"
 msgid_plural "%d songs"
 msgstr0 ""
+msgstr1 ""
 
-#: src/search-tool/search-tool.cc:601
+#: src/search-tool-qt/search-model.cc:53 src/search-tool/search-tool.cc:294
 msgid "of this genre"
 msgstr ""
 
-#: src/search-tool/search-tool.cc:607
+#: src/search-tool-qt/search-model.h:47 src/search-tool/search-model.h:45
 msgid "on"
 msgstr ""
 
-#: src/search-tool/search-tool.cc:607
+#: src/search-tool-qt/search-model.h:47 src/search-tool/search-model.h:45
 msgid "by"
-msgstr ""
+msgstr "بر اساس"
 
-#: src/search-tool/search-tool.cc:643
-msgid "_Create Playlist"
+#: src/search-tool-qt/search-tool-qt.cc:165 src/search-tool/search-tool.cc:74
+msgid "Number of results to show:"
 msgstr ""
 
-#: src/search-tool/search-tool.cc:645
-msgid "_Add to Playlist"
+#: src/search-tool-qt/search-tool-qt.cc:168 src/search-tool/search-tool.cc:77
+msgid "Rescan library at startup"
 msgstr ""
 
-#: src/search-tool/search-tool.cc:684
-msgid "Search library"
+#: src/search-tool-qt/search-tool-qt.cc:170
+msgid "Monitor library for changes"
 msgstr ""
 
-#: src/search-tool/search-tool.cc:688
+#: src/search-tool-qt/search-tool-qt.cc:193 src/search-tool/search-tool.cc:450
 msgid ""
 "To import your music library into Audacious, choose a folder and then click "
 "the \"refresh\" icon."
 msgstr ""
 
-#: src/search-tool/search-tool.cc:696
+#: src/search-tool-qt/search-tool-qt.cc:195 src/search-tool/search-tool.cc:459
 msgid "Please wait ..."
-msgstr ""
+msgstr "لطفا صبر کنید..."
 
-#: src/search-tool/search-tool.cc:723
+#: src/search-tool-qt/search-tool-qt.cc:197 src/search-tool/search-tool.cc:487
 msgid "Choose Folder"
+msgstr "انتخاب پوشه"
+
+#: src/search-tool-qt/search-tool-qt.cc:201 src/search-tool/search-tool.cc:445
+msgid "Search library"
 msgstr ""
 
-#: src/sid/xmms-sid.cc:43
-msgid "SID Player"
+#: src/search-tool-qt/search-tool-qt.cc:327 src/search-tool/search-tool.cc:156
+#, c-format
+msgid "%d of %d result shown"
+msgid_plural "%d of %d results shown"
+msgstr0 ""
+msgstr1 ""
+
+#: src/search-tool-qt/search-tool-qt.cc:331 src/search-tool/search-tool.cc:160
+#, c-format
+msgid "%d result"
+msgid_plural "%d results"
+msgstr0 ""
+msgstr1 ""
+
+#: src/search-tool-qt/search-tool-qt.cc:501 src/search-tool/search-tool.cc:341
+msgid "_Create Playlist"
 msgstr ""
 
-#: src/sid/xs_config.cc:61
-msgid "Output"
+#: src/search-tool-qt/search-tool-qt.cc:503 src/search-tool/search-tool.cc:343
+msgid "_Add to Playlist"
+msgstr ""
+
+#: src/sid/xmms-sid.cc:43
+msgid "SID Player"
 msgstr ""
 
 #: src/sid/xs_config.cc:62
 msgid "Channels:"
-msgstr ""
+msgstr "کانال ها:"
 
 #: src/sid/xs_config.cc:68
 msgid "Emulation"
@@ -2933,740 +3247,683 @@
 msgid "Threshold:"
 msgstr ""
 
-#: src/silence-removal/silence-removal.cc:70
-msgid "dB"
+#: src/skins/actions.cc:45 src/skins-qt/actions.cc:43
+msgid "Repeat points cleared."
 msgstr ""
 
-#: src/skins/menus.cc:64
-msgid "Open Files ..."
+#: src/skins/actions.cc:60 src/skins-qt/actions.cc:58
+msgid "Repeat point A set."
 msgstr ""
 
-#: src/skins/menus.cc:65
-msgid "Open URL ..."
+#: src/skins/actions.cc:65 src/skins-qt/actions.cc:63
+msgid "Repeat point B set."
 msgstr ""
 
-#: src/skins/menus.cc:66
-msgid "Search Library"
+#: src/skins/equalizer.cc:223 src/skins-qt/equalizer.cc:223
+msgid "Preamp"
+msgstr "پیش‌تقویت‌کننده"
+
+#: src/skins/equalizer.cc:227 src/skins-qt/equalizer.cc:227
+msgid "31 Hz"
+msgstr "31 هرتز"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "63 Hz"
+msgstr "63 هرتز"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "125 Hz"
+msgstr "125 هرتز"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "250 Hz"
+msgstr "250 هرتز"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "500 Hz"
+msgstr "500 هرتز"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "1 kHz"
+msgstr "1 کیلوهرتز"
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "2 kHz"
+msgstr "2 کیلوهرتز"
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "4 kHz"
+msgstr "4 کیلوهرتز"
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "8 kHz"
+msgstr "8 کیلوهرتز"
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "16 kHz"
+msgstr "16 کیلوهرتز"
+
+#: src/skins/equalizer.cc:270 src/skins-qt/equalizer.cc:270
+msgid "Audacious Equalizer"
+msgstr "اکولایزر Audacious"
+
+#: src/skins/main.cc:459 src/skins-qt/main.cc:442
+msgid "Recording on"
 msgstr ""
 
-#: src/skins/menus.cc:68
-msgid "Playback"
-msgstr "پخش"
+#: src/skins/main.cc:461 src/skins-qt/main.cc:444
+msgid "Recording off"
+msgstr ""
+
+#: src/skins/main.cc:754 src/skins-qt/main.cc:701
+#, c-format
+msgid "Seek to %d:%-2.2d / %d:%-2.2d"
+msgstr "پیمایش به ‎%d:%-2.2d / %d:%-2.2d"
+
+#: src/skins/main.cc:771 src/skins-qt/main.cc:718
+#, c-format
+msgid "Volume: %d%%"
+msgstr "صدا: ‎%d%%‎"
+
+#: src/skins/main.cc:784 src/skins-qt/main.cc:731
+#, c-format
+msgid "Balance: %d%% left"
+msgstr "بالانس: ‎%d%%‎ چپ"
+
+#: src/skins/main.cc:786 src/skins-qt/main.cc:733
+msgid "Balance: center"
+msgstr "بالانس: مرکز"
+
+#: src/skins/main.cc:788 src/skins-qt/main.cc:735
+#, c-format
+msgid "Balance: %d%% right"
+msgstr "بالانس: ‎%d%%‎ راست"
+
+#: src/skins/main.cc:880 src/skins-qt/main.cc:827
+msgid "Options Menu"
+msgstr "منوی گزینه‌ها"
+
+#: src/skins/main.cc:884 src/skins-qt/main.cc:831
+msgid "Disable 'Always On Top'"
+msgstr "غیرفعال کردن 'همیشه در بالا'"
+
+#: src/skins/main.cc:886 src/skins-qt/main.cc:833
+msgid "Enable 'Always On Top'"
+msgstr "فعال کردن 'همیشه در بالا'"
+
+#: src/skins/main.cc:889 src/skins-qt/main.cc:836
+msgid "File Info Box"
+msgstr "جعبه اطلاعات فایل"
+
+#: src/skins/main.cc:892 src/skins/menus.cc:149 src/skins-qt/main.cc:839
+#: src/skins-qt/menus.cc:142
+msgid "Double Size"
+msgstr ""
+
+#: src/skins/main.cc:895 src/skins-qt/main.cc:842
+msgid "Visualizations"
+msgstr ""
+
+#: src/skins/menus.cc:74 src/skins-qt/menus.cc:64
+msgid "Volume Up"
+msgstr ""
+
+#: src/skins/menus.cc:75 src/skins-qt/menus.cc:65
+msgid "Volume Down"
+msgstr ""
 
-#: src/skins/menus.cc:69
+#: src/skins/menus.cc:77 src/skins-qt/menus.cc:67
+msgid "Effects ..."
+msgstr ""
+
+#: src/skins/menus.cc:84 src/skins-qt/menus.cc:74
+msgid "Open Files ..."
+msgstr ""
+
+#: src/skins/menus.cc:85 src/skins-qt/menus.cc:76
+msgid "Open URL ..."
+msgstr ""
+
+#: src/skins/menus.cc:89 src/skins-qt/menus.cc:80
 msgid "Playlist"
 msgstr "لیست پخش"
 
-#: src/skins/menus.cc:70
+#: src/skins/menus.cc:90 src/skins-qt/menus.cc:81
+msgid "Output"
+msgstr "خروجی"
+
+#: src/skins/menus.cc:91 src/skins-qt/menus.cc:82
 msgid "View"
 msgstr "نما"
 
-#: src/skins/menus.cc:72 src/skins/menus.cc:136 src/skins/menus.cc:149
-#: src/skins/menus.cc:214
+#: src/skins/menus.cc:93 src/skins/menus.cc:161 src/skins/menus.cc:174
+#: src/skins/menus.cc:245 src/skins-qt/menus.cc:84 src/skins-qt/menus.cc:156
+#: src/skins-qt/menus.cc:170 src/skins-qt/menus.cc:241
 msgid "Services"
-msgstr ""
+msgstr "خدمات"
 
-#: src/skins/menus.cc:74
+#: src/skins/menus.cc:95 src/skins-qt/menus.cc:86
 msgid "About ..."
-msgstr ""
+msgstr "درباره..."
 
-#: src/skins/menus.cc:75
+#: src/skins/menus.cc:96 src/skins-qt/menus.cc:87
 msgid "Settings ..."
-msgstr ""
+msgstr "تنظیمات..."
 
-#: src/skins/menus.cc:76
+#: src/skins/menus.cc:97 src/skins-qt/menus.cc:88
 msgid "Quit"
-msgstr ""
+msgstr "خروج"
 
-#: src/skins/menus.cc:80 src/skins/menus.cc:206
+#: src/skins/menus.cc:101 src/skins/menus.cc:235 src/skins-qt/menus.cc:92
+#: src/skins-qt/menus.cc:231
 msgid "Song Info ..."
 msgstr ""
 
-#: src/skins/menus.cc:84
+#: src/skins/menus.cc:105 src/skins-qt/menus.cc:96
+msgid "Shuffle by Album"
+msgstr ""
+
+#: src/skins/menus.cc:106 src/skins-qt/menus.cc:97
 msgid "No Playlist Advance"
 msgstr "لیست پخش به جلو نرود"
 
-#: src/skins/menus.cc:85
-msgid "Stop After This Song"
-msgstr ""
-
-#: src/skins/menus.cc:93
+#: src/skins/menus.cc:117 src/skins-qt/menus.cc:108
 msgid "Set A-B Repeat"
 msgstr ""
 
-#: src/skins/menus.cc:94
+#: src/skins/menus.cc:118 src/skins-qt/menus.cc:109
 msgid "Clear A-B Repeat"
 msgstr ""
 
-#: src/skins/menus.cc:96
+#: src/skins/menus.cc:120 src/skins-qt/menus.cc:111
 msgid "Jump to Song ..."
 msgstr ""
 
-#: src/skins/menus.cc:97
+#: src/skins/menus.cc:121 src/skins-qt/menus.cc:113
 msgid "Jump to Time ..."
-msgstr ""
+msgstr "پرش به زمان..."
 
-#: src/skins/menus.cc:101
+#: src/skins/menus.cc:125 src/skins-qt/menus.cc:118
 msgid "Play/Resume"
-msgstr ""
+msgstr "پخش/ادامه"
 
-#: src/skins/menus.cc:103
+#: src/skins/menus.cc:127 src/skins-qt/menus.cc:120
 msgid "New Playlist"
 msgstr "لیست پخش جدید"
 
-#: src/skins/menus.cc:104
+#: src/skins/menus.cc:128 src/skins-qt/menus.cc:121
 msgid "Rename Playlist ..."
-msgstr ""
+msgstr "تغییرنام لیست پخش..."
 
-#: src/skins/menus.cc:105
+#: src/skins/menus.cc:129 src/skins-qt/menus.cc:122
 msgid "Remove Playlist"
-msgstr ""
+msgstr "حذف لیست پخش"
 
-#: src/skins/menus.cc:107
+#: src/skins/menus.cc:131 src/skins-qt/menus.cc:124
 msgid "Previous Playlist"
-msgstr ""
+msgstr "لیست پخش قبلی"
 
-#: src/skins/menus.cc:108
+#: src/skins/menus.cc:132 src/skins-qt/menus.cc:125
 msgid "Next Playlist"
-msgstr ""
+msgstr "لیست پخش بعدی"
 
-#: src/skins/menus.cc:110
+#: src/skins/menus.cc:134 src/skins-qt/menus.cc:127
 msgid "Import Playlist ..."
 msgstr ""
 
-#: src/skins/menus.cc:111
+#: src/skins/menus.cc:135 src/skins-qt/menus.cc:128
 msgid "Export Playlist ..."
 msgstr ""
 
-#: src/skins/menus.cc:113
+#: src/skins/menus.cc:137 src/skins-qt/menus.cc:130
 msgid "Playlist Manager ..."
 msgstr ""
 
-#: src/skins/menus.cc:114
+#: src/skins/menus.cc:138 src/skins-qt/menus.cc:131
 msgid "Queue Manager ..."
 msgstr ""
 
-#: src/skins/menus.cc:116
+#: src/skins/menus.cc:140 src/skins-qt/menus.cc:133
 msgid "Refresh Playlist"
 msgstr ""
 
-#: src/skins/menus.cc:120
+#: src/skins/menus.cc:144 src/skins-qt/menus.cc:137
 msgid "Show Playlist Editor"
 msgstr "نمایش ویرایشگر لیست پخش"
 
-#: src/skins/menus.cc:121
+#: src/skins/menus.cc:145 src/skins-qt/menus.cc:138
 msgid "Show Equalizer"
 msgstr "نمایش اکولایزر"
 
-#: src/skins/menus.cc:123
+#: src/skins/menus.cc:147 src/skins-qt/menus.cc:140
 msgid "Show Remaining Time"
-msgstr ""
+msgstr "نمایش زمان باقی مانده"
 
-#: src/skins/menus.cc:125
+#: src/skins/menus.cc:150 src/skins-qt/menus.cc:143
 msgid "Always on Top"
 msgstr "همیشه در بالا"
 
-#: src/skins/menus.cc:126
+#: src/skins/menus.cc:151 src/skins-qt/menus.cc:145
 msgid "On All Workspaces"
 msgstr ""
 
-#: src/skins/menus.cc:128
+#: src/skins/menus.cc:153 src/skins-qt/menus.cc:148
 msgid "Roll Up Player"
 msgstr ""
 
-#: src/skins/menus.cc:129
+#: src/skins/menus.cc:154 src/skins-qt/menus.cc:149
 msgid "Roll Up Playlist Editor"
 msgstr ""
 
-#: src/skins/menus.cc:130
+#: src/skins/menus.cc:155 src/skins-qt/menus.cc:150
 msgid "Roll Up Equalizer"
 msgstr ""
 
-#: src/skins/menus.cc:132 src/skins/ui_main.cc:854
-msgid "Double Size"
-msgstr ""
-
-#: src/skins/menus.cc:138
+#: src/skins/menus.cc:163 src/skins-qt/menus.cc:158
 msgid "Add URL ..."
-msgstr ""
+msgstr "افزودن آدرس اینترنتی..."
 
-#: src/skins/menus.cc:139
+#: src/skins/menus.cc:164 src/skins-qt/menus.cc:160
 msgid "Add Files ..."
-msgstr ""
+msgstr "افزودن فایل ها..."
 
-#: src/skins/menus.cc:143 src/skins/menus.cc:171 src/skins/menus.cc:185
+#: src/skins/menus.cc:168 src/skins/menus.cc:196 src/skins/menus.cc:212
+#: src/skins-qt/menus.cc:164 src/skins-qt/menus.cc:192
+#: src/skins-qt/menus.cc:208
 msgid "By Title"
 msgstr "براساس عنوان"
 
-#: src/skins/menus.cc:144 src/skins/menus.cc:178 src/skins/menus.cc:192
+#: src/skins/menus.cc:169 src/skins/menus.cc:203 src/skins/menus.cc:219
+#: src/skins-qt/menus.cc:165 src/skins-qt/menus.cc:199
+#: src/skins-qt/menus.cc:215
 msgid "By File Name"
-msgstr ""
+msgstr "بر اساس نام فایل"
 
-#: src/skins/menus.cc:145 src/skins/menus.cc:179 src/skins/menus.cc:193
+#: src/skins/menus.cc:170 src/skins/menus.cc:204 src/skins/menus.cc:220
+#: src/skins-qt/menus.cc:166 src/skins-qt/menus.cc:200
+#: src/skins-qt/menus.cc:216
 msgid "By File Path"
-msgstr ""
+msgstr "بر اساس مسیر فایل"
 
-#: src/skins/menus.cc:151
+#: src/skins/menus.cc:176 src/skins-qt/menus.cc:172
 msgid "Remove All"
 msgstr "حذف همه"
 
-#: src/skins/menus.cc:152
+#: src/skins/menus.cc:177 src/skins-qt/menus.cc:173
 msgid "Clear Queue"
 msgstr "پاکسازی صف"
 
-#: src/skins/menus.cc:154
+#: src/skins/menus.cc:179 src/skins-qt/menus.cc:175
 msgid "Remove Unavailable Files"
 msgstr "پاک کردن فایل‌های خارج از دسترس"
 
-#: src/skins/menus.cc:155
+#: src/skins/menus.cc:180 src/skins-qt/menus.cc:176
 msgid "Remove Duplicates"
 msgstr "پاک کردن فایل‌های تکراری"
 
-#: src/skins/menus.cc:157
+#: src/skins/menus.cc:182 src/skins-qt/menus.cc:178
 msgid "Remove Unselected"
 msgstr "حذف انتخاب‌نشده‌ها"
 
-#: src/skins/menus.cc:158
+#: src/skins/menus.cc:183 src/skins-qt/menus.cc:179
 msgid "Remove Selected"
 msgstr "حذف انتخاب‌شده‌ها"
 
-#: src/skins/menus.cc:162
+#: src/skins/menus.cc:187 src/skins-qt/menus.cc:183
 msgid "Search and Select"
 msgstr "جستجو و انتخاب"
 
-#: src/skins/menus.cc:164
+#: src/skins/menus.cc:189 src/skins-qt/menus.cc:185
 msgid "Invert Selection"
 msgstr "برعکس کردن انتخاب‌ها"
 
-#: src/skins/menus.cc:165
+#: src/skins/menus.cc:190 src/skins-qt/menus.cc:186
 msgid "Select None"
 msgstr "انتخاب هیچ‌کدام"
 
-#: src/skins/menus.cc:166
+#: src/skins/menus.cc:191 src/skins-qt/menus.cc:187
 msgid "Select All"
 msgstr "انتخاب همه"
 
-#: src/skins/menus.cc:170 src/skins/menus.cc:184
+#: src/skins/menus.cc:195 src/skins/menus.cc:211 src/skins-qt/menus.cc:191
+#: src/skins-qt/menus.cc:207
 msgid "By Track Number"
 msgstr "براساس شماره آهنگ"
 
-#: src/skins/menus.cc:172 src/skins/menus.cc:186
+#: src/skins/menus.cc:197 src/skins/menus.cc:213 src/skins-qt/menus.cc:193
+#: src/skins-qt/menus.cc:209
 msgid "By Artist"
 msgstr "براساس هنرمند"
 
-#: src/skins/menus.cc:173 src/skins/menus.cc:187
+#: src/skins/menus.cc:198 src/skins/menus.cc:214 src/skins-qt/menus.cc:194
+#: src/skins-qt/menus.cc:210
 msgid "By Album"
 msgstr "براساس آلبوم"
 
-#: src/skins/menus.cc:174 src/skins/menus.cc:188
+#: src/skins/menus.cc:199 src/skins/menus.cc:215 src/skins-qt/menus.cc:195
+#: src/skins-qt/menus.cc:211
 msgid "By Album Artist"
-msgstr ""
+msgstr "بر اساس هنرمند آلبوم"
 
-#: src/skins/menus.cc:175 src/skins/menus.cc:190
+#: src/skins/menus.cc:200 src/skins/menus.cc:216 src/skins-qt/menus.cc:196
+#: src/skins-qt/menus.cc:212
 msgid "By Release Date"
-msgstr ""
+msgstr "بر اساس تاریخ انتشار"
 
-#: src/skins/menus.cc:176 src/skins/menus.cc:189
+#: src/skins/menus.cc:201 src/skins/menus.cc:217 src/skins-qt/menus.cc:197
+#: src/skins-qt/menus.cc:213
 msgid "By Genre"
-msgstr ""
+msgstr "بر اساس سبک"
 
-#: src/skins/menus.cc:177 src/skins/menus.cc:191
+#: src/skins/menus.cc:202 src/skins/menus.cc:218 src/skins-qt/menus.cc:198
+#: src/skins-qt/menus.cc:214
 msgid "By Length"
-msgstr ""
+msgstr "بر اساس مدت زمان"
 
-#: src/skins/menus.cc:180 src/skins/menus.cc:194
+#: src/skins/menus.cc:205 src/skins/menus.cc:221 src/skins-qt/menus.cc:201
+#: src/skins-qt/menus.cc:217
 msgid "By Custom Title"
 msgstr ""
 
-#: src/skins/menus.cc:198
+#: src/skins/menus.cc:206 src/skins/menus.cc:222 src/skins-qt/menus.cc:202
+#: src/skins-qt/menus.cc:218
+msgid "By Comment"
+msgstr ""
+
+#: src/skins/menus.cc:207 src/skins/menus.cc:223 src/skins-qt/menus.cc:203
+#: src/skins-qt/menus.cc:219
+msgid "By Disc Number"
+msgstr ""
+
+#: src/skins/menus.cc:227 src/skins-qt/menus.cc:223
 msgid "Randomize List"
 msgstr "بهم‌ریختن لیست"
 
-#: src/skins/menus.cc:199
+#: src/skins/menus.cc:228 src/skins-qt/menus.cc:224
 msgid "Reverse List"
 msgstr "برعکس کردن ترتیب لیست"
 
-#: src/skins/menus.cc:201
+#: src/skins/menus.cc:230 src/skins-qt/menus.cc:226
 msgid "Sort Selected"
 msgstr "مرتب‌سازی انتخاب‌شده‌ها"
 
-#: src/skins/menus.cc:202
+#: src/skins/menus.cc:231 src/skins-qt/menus.cc:227
 msgid "Sort List"
 msgstr "مرتب‌سازی لیست"
 
-#: src/skins/menus.cc:208
+#: src/skins/menus.cc:236 src/skins-qt/menus.cc:232
+msgid "Open Containing Folder"
+msgstr ""
+
+#: src/skins/menus.cc:238 src/skins-qt/menus.cc:234
 msgid "Cut"
 msgstr "برش"
 
-#: src/skins/menus.cc:209
+#: src/skins/menus.cc:239 src/skins-qt/menus.cc:235
 msgid "Copy"
 msgstr "کپی"
 
-#: src/skins/menus.cc:210
+#: src/skins/menus.cc:240 src/skins-qt/menus.cc:236
 msgid "Paste"
 msgstr "چسباندن"
 
-#: src/skins/menus.cc:212
-msgid "Queue/Unqueue"
-msgstr ""
-
-#: src/skins/menus.cc:218
-msgid "Load Preset ..."
-msgstr ""
-
-#: src/skins/menus.cc:219
-msgid "Load Auto Preset ..."
-msgstr ""
-
-#: src/skins/menus.cc:220
-msgid "Load Default"
-msgstr ""
-
-#: src/skins/menus.cc:221
-msgid "Load Preset File ..."
-msgstr ""
-
-#: src/skins/menus.cc:222
-msgid "Load EQF File ..."
+#: src/skins/menus.cc:241 src/skins-qt/menus.cc:237
+msgid "Paste at End"
 msgstr ""
 
-#: src/skins/menus.cc:224
-msgid "Save Preset ..."
-msgstr ""
-
-#: src/skins/menus.cc:225
-msgid "Save Auto Preset ..."
-msgstr ""
-
-#: src/skins/menus.cc:226
-msgid "Save Default"
-msgstr ""
-
-#: src/skins/menus.cc:227
-msgid "Save Preset File ..."
-msgstr ""
-
-#: src/skins/menus.cc:228
-msgid "Save EQF File ..."
-msgstr ""
-
-#: src/skins/menus.cc:230
-msgid "Delete Preset ..."
-msgstr ""
-
-#: src/skins/menus.cc:231
-msgid "Delete Auto Preset ..."
+#: src/skins/menus.cc:243 src/skins-qt/menus.cc:239
+msgid "Queue/Unqueue"
 msgstr ""
 
-#: src/skins/menus.cc:233
-msgid "Import Winamp Presets ..."
-msgstr ""
+#: src/skins/playlist-widget.cc:58 src/skins-qt/playlist-widget.cc:58
+#, c-format
+msgid "%s (%d of %d)"
+msgstr "‎%s (%d of %d)‎"
 
-#: src/skins/menus.cc:235
-msgid "Reset to Zero"
-msgstr ""
+#: src/skins/playlistwin.cc:491 src/skins-qt/playlistwin.cc:478
+msgid "Audacious Playlist Editor"
+msgstr "ویرایشگر لیست پخش Audacious"
 
-#: src/skins/plugin.cc:48
+#: src/skins/plugin.cc:53 src/skins-qt/plugin.cc:65
 msgid "Winamp Classic Interface"
 msgstr ""
 
-#: src/skins/preset-browser.cc:57 src/skins/preset-list.cc:371
-#: src/skins/preset-list.cc:386
-msgid "Save"
-msgstr "ذخیره"
-
-#: src/skins/preset-browser.cc:57 src/skins/preset-list.cc:338
-#: src/skins/preset-list.cc:354
-msgid "Load"
-msgstr "بارگذاری"
-
-#: src/skins/preset-browser.cc:83
-msgid "Load Preset File"
-msgstr ""
+#: src/skins-qt/menus.cc:75
+msgid "Open Folder ..."
+msgstr "بازنمایی پوشه..."
+
+#: src/skins-qt/menus.cc:159
+msgid "Add Folder ..."
+msgstr "افزودن پوشه..."
 
-#: src/skins/preset-browser.cc:100
-msgid "Load EQF File"
-msgstr ""
-
-#: src/skins/preset-browser.cc:119
-msgid "Save Preset File"
-msgstr ""
+#: src/skins-qt/search-select.cc:62 src/skins/search-select.cc:77
+msgid "Search entries in active playlist"
+msgstr "گزینه‌های موجود در لیست پخش فعال را جستجو کن"
 
-#: src/skins/preset-browser.cc:137
-msgid "Save EQF File"
+#: src/skins-qt/search-select.cc:70 src/skins/search-select.cc:83
+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/preset-browser.cc:151
-msgid "Import Winamp Presets"
-msgstr ""
+#: src/skins-qt/search-select.cc:75 src/skins/search-select.cc:91
+msgid "Title:"
+msgstr "عنوان:"
 
-#: src/skins/preset-list.cc:285
-msgid "Presets"
-msgstr "الگوها"
+#: src/skins-qt/search-select.cc:79 src/skins/search-select.cc:96
+msgid "Album:"
+msgstr "آلبوم:"
 
-#: src/skins/preset-list.cc:335
-msgid "Load preset"
-msgstr "بارگذاری الگو"
+#: src/skins-qt/search-select.cc:82 src/skins/search-select.cc:101
+msgid "Artist:"
+msgstr "هنرمند:"
 
-#: src/skins/preset-list.cc:351
-msgid "Load auto-preset"
-msgstr ""
+#: src/skins-qt/search-select.cc:85 src/skins/search-select.cc:106
+msgid "File Name:"
+msgstr "نام فایل:"
 
-#: src/skins/preset-list.cc:367
-msgid "Save preset"
-msgstr "ذخیره الگو"
+#: src/skins-qt/search-select.cc:88 src/skins/search-select.cc:134
+msgid "Clear previous selection before searching"
+msgstr "قبل از جستجو انتخاب قبلی را پاک کن"
 
-#: src/skins/preset-list.cc:382
-msgid "Save auto-preset"
-msgstr ""
+#: src/skins-qt/search-select.cc:89 src/skins/search-select.cc:137
+msgid "Automatically toggle queue for matching entries"
+msgstr "گزینه‌های یافت شده را در صف نشان بده"
 
-#: src/skins/preset-list.cc:408
-msgid "Delete preset"
-msgstr "حذف الگو"
+#: src/skins-qt/search-select.cc:90 src/skins/search-select.cc:140
+msgid "Create a new playlist with matching entries"
+msgstr "لیست پخش براساس گزینه‌های یافت شده ایجاد کن"
 
-#: src/skins/preset-list.cc:424
-msgid "Delete auto-preset"
-msgstr ""
+#: src/skins-qt/search-select.cc:101 src/skins/search-select.cc:78
+msgid "Search"
+msgstr "جستجو"
 
-#: src/skins/skins_cfg.cc:176
+#: src/skins-qt/skins_cfg.cc:198 src/skins/skins_cfg.cc:182
 msgid "Player:"
-msgstr ""
+msgstr "پخش کننده:"
 
-#: src/skins/skins_cfg.cc:178
+#: src/skins-qt/skins_cfg.cc:200 src/skins/skins_cfg.cc:184
 msgid "Select main player window font:"
 msgstr "فونت اصلی پنجره پخش‌کننده را انتخاب کنید:"
 
-#: src/skins/skins_cfg.cc:179
+#: src/skins-qt/skins_cfg.cc:201 src/skins/skins_cfg.cc:185
 msgid "Playlist:"
-msgstr ""
+msgstr "لیست پخش:"
 
-#: src/skins/skins_cfg.cc:181
+#: src/skins-qt/skins_cfg.cc:203 src/skins/skins_cfg.cc:187
 msgid "Select playlist font:"
 msgstr "فونت لیست پخش را انتخاب کنید:"
 
-#: src/skins/skins_cfg.cc:187
+#: src/skins-qt/skins_cfg.cc:207 src/skins/skins_cfg.cc:191
 msgid "Skin"
+msgstr "پوسته"
+
+#: src/skins-qt/skins_cfg.cc:211 src/skins/skins_cfg.cc:193
+msgid "Display active titlebar when any window is focused"
 msgstr ""
 
-#: src/skins/skins_cfg.cc:189
+#: src/skins-qt/skins_cfg.cc:213 src/skins/skins_cfg.cc:195
 msgid "Fonts"
-msgstr ""
+msgstr "فونت"
 
-#: src/skins/skins_cfg.cc:192
+#: src/skins-qt/skins_cfg.cc:215 src/skins/skins_cfg.cc:197
 msgid "Use bitmap fonts (supports ASCII only)"
 msgstr "انتخاب فونت‌های نقشه‌بیتی (فقط از اسکی پشتیبانی می‌شود)"
 
-#: src/skins/skins_cfg.cc:194
+#: src/skins-qt/skins_cfg.cc:217 src/skins/skins_cfg.cc:199
 msgid "Scroll song title"
 msgstr ""
 
-#: src/skins/skins_cfg.cc:196
+#: src/skins-qt/skins_cfg.cc:219 src/skins/skins_cfg.cc:201
 msgid "Scroll song title in both directions"
 msgstr "عنوان آهنگ در هر دو جهت حرکت کند"
 
-#: src/skins/skins_cfg.cc:201
+#: src/skins-qt/skins_cfg.cc:224 src/skins/skins_cfg.cc:206
 msgid "Analyzer"
 msgstr "تحلیل‌کننده"
 
-#: src/skins/skins_cfg.cc:202
+#: src/skins-qt/skins_cfg.cc:225 src/skins/skins_cfg.cc:207
 msgid "Scope"
 msgstr "محدوده"
 
-#: src/skins/skins_cfg.cc:203
+#: src/skins-qt/skins_cfg.cc:226 src/skins/skins_cfg.cc:208
 msgid "Voiceprint / VU meter"
 msgstr ""
 
-#: src/skins/skins_cfg.cc:204
+#: src/skins-qt/skins_cfg.cc:227 src/skins/skins_cfg.cc:209
 msgid "Off"
 msgstr "خاموش"
 
-#: src/skins/skins_cfg.cc:208 src/skins/skins_cfg.cc:233
-#: src/skins/skins_cfg.cc:239
+#: src/skins-qt/skins_cfg.cc:231 src/skins-qt/skins_cfg.cc:256
+#: src/skins-qt/skins_cfg.cc:262 src/skins/skins_cfg.cc:213
+#: src/skins/skins_cfg.cc:238 src/skins/skins_cfg.cc:244
 msgid "Normal"
 msgstr "نرمال"
 
-#: src/skins/skins_cfg.cc:209 src/skins/skins_cfg.cc:234
+#: src/skins-qt/skins_cfg.cc:232 src/skins-qt/skins_cfg.cc:257
+#: src/skins/skins_cfg.cc:214 src/skins/skins_cfg.cc:239
 msgid "Fire"
 msgstr "آتش"
 
-#: src/skins/skins_cfg.cc:210
+#: src/skins-qt/skins_cfg.cc:233 src/skins/skins_cfg.cc:215
 msgid "Vertical lines"
-msgstr ""
+msgstr "خطوط عمودی"
 
-#: src/skins/skins_cfg.cc:214
+#: src/skins-qt/skins_cfg.cc:237 src/skins/skins_cfg.cc:219
 msgid "Lines"
 msgstr "خط ها"
 
-#: src/skins/skins_cfg.cc:215
+#: src/skins-qt/skins_cfg.cc:238 src/skins/skins_cfg.cc:220
 msgid "Bars"
 msgstr "میله‌ها"
 
-#: src/skins/skins_cfg.cc:219
+#: src/skins-qt/skins_cfg.cc:242 src/skins/skins_cfg.cc:224
 msgid "Slowest"
 msgstr "کندترین"
 
-#: src/skins/skins_cfg.cc:220
+#: src/skins-qt/skins_cfg.cc:243 src/skins/skins_cfg.cc:225
 msgid "Slow"
 msgstr "کند"
 
-#: src/skins/skins_cfg.cc:221 src/sox-resampler/sox-resampler.cc:152
+#: src/skins-qt/skins_cfg.cc:244 src/skins/skins_cfg.cc:226
+#: src/soxr/sox-resampler.cc:180
 msgid "Medium"
 msgstr "متوسط"
 
-#: src/skins/skins_cfg.cc:222
+#: src/skins-qt/skins_cfg.cc:245 src/skins/skins_cfg.cc:227
 msgid "Fast"
 msgstr "تند"
 
-#: src/skins/skins_cfg.cc:223
+#: src/skins-qt/skins_cfg.cc:246 src/skins/skins_cfg.cc:228
 msgid "Fastest"
 msgstr "تندترین"
 
-#: src/skins/skins_cfg.cc:227
+#: src/skins-qt/skins_cfg.cc:250 src/skins/skins_cfg.cc:232
 msgid "Dots"
 msgstr ""
 
-#: src/skins/skins_cfg.cc:228
+#: src/skins-qt/skins_cfg.cc:251 src/skins/skins_cfg.cc:233
 msgid "Line"
-msgstr ""
+msgstr "نقطه ای"
 
-#: src/skins/skins_cfg.cc:229
+#: src/skins-qt/skins_cfg.cc:252 src/skins/skins_cfg.cc:234
 msgid "Solid"
 msgstr ""
 
-#: src/skins/skins_cfg.cc:235
+#: src/skins-qt/skins_cfg.cc:258 src/skins/skins_cfg.cc:240
 msgid "Ice"
 msgstr "یخ"
 
-#: src/skins/skins_cfg.cc:240
+#: src/skins-qt/skins_cfg.cc:263 src/skins/skins_cfg.cc:245
 msgid "Smooth"
 msgstr "نرم"
 
-#: src/skins/skins_cfg.cc:244
-msgid "Type"
-msgstr ""
-
-#: src/skins/skins_cfg.cc:245
-msgid "Visualization type:"
-msgstr ""
-
-#: src/skins/skins_cfg.cc:248
-msgid "Analyzer"
-msgstr ""
-
-#: src/skins/skins_cfg.cc:249
-msgid "Show peaks"
-msgstr ""
-
-#: src/skins/skins_cfg.cc:251
+#: src/skins-qt/skins_cfg.cc:267 src/skins/skins_cfg.cc:249
 msgid "Coloring:"
 msgstr ""
 
-#: src/skins/skins_cfg.cc:254
+#: src/skins-qt/skins_cfg.cc:270 src/skins/skins_cfg.cc:252
 msgid "Style:"
 msgstr ""
 
-#: src/skins/skins_cfg.cc:257
+#: src/skins-qt/skins_cfg.cc:273 src/skins/skins_cfg.cc:255
 msgid "Falloff:"
 msgstr ""
 
-#: src/skins/skins_cfg.cc:260
+#: src/skins-qt/skins_cfg.cc:276 src/skins/skins_cfg.cc:258
 msgid "Peak falloff:"
 msgstr ""
 
-#: src/skins/skins_cfg.cc:264
+#: src/skins-qt/skins_cfg.cc:282 src/skins/skins_cfg.cc:264
 msgid "Scope Style:"
 msgstr ""
 
-#: src/skins/skins_cfg.cc:267
+#: src/skins-qt/skins_cfg.cc:285 src/skins/skins_cfg.cc:267
 msgid "Voiceprint Coloring:"
 msgstr ""
 
-#: src/skins/skins_cfg.cc:270
+#: src/skins-qt/skins_cfg.cc:288 src/skins/skins_cfg.cc:270
 msgid "VU Meter Style:"
 msgstr ""
 
-#: src/skins/skins_cfg.cc:276
-msgid "General"
-msgstr "عمومی"
-
-#: src/skins/skins_cfg.cc:277
-msgid "Visualization"
-msgstr "جلوه‌های تصویری"
-
-#: src/skins/ui_equalizer.cc:282
-msgid "Preamp"
-msgstr "پیش‌تقویت‌کننده"
-
-#: src/skins/ui_equalizer.cc:286
-msgid "31 Hz"
-msgstr "31 هرتز"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "63 Hz"
-msgstr "63 هرتز"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "125 Hz"
-msgstr "125 هرتز"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "250 Hz"
-msgstr "250 هرتز"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "500 Hz"
-msgstr "500 هرتز"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "1 kHz"
-msgstr "1 کیلوهرتز"
-
-#: src/skins/ui_equalizer.cc:288
-msgid "2 kHz"
-msgstr "2 کیلوهرتز"
-
-#: src/skins/ui_equalizer.cc:288
-msgid "4 kHz"
-msgstr "4 کیلوهرتز"
-
-#: src/skins/ui_equalizer.cc:288
-msgid "8 kHz"
-msgstr "8 کیلوهرتز"
-
-#: src/skins/ui_equalizer.cc:288
-msgid "16 kHz"
-msgstr "16 کیلوهرتز"
-
-#: src/skins/ui_equalizer.cc:330
-msgid "Audacious Equalizer"
-msgstr "اکولایزر Audacious"
-
-#: src/skins/ui_main.cc:688
-#, c-format
-msgid "Seek to %d:%-2.2d / %d:%-2.2d"
-msgstr "پیمایش به ‎%d:%-2.2d / %d:%-2.2d"
-
-#: src/skins/ui_main.cc:709
-#, c-format
-msgid "Volume: %d%%"
-msgstr "صدا: ‎%d%%‎"
-
-#: src/skins/ui_main.cc:732
-#, c-format
-msgid "Balance: %d%% left"
-msgstr "بالانس: ‎%d%%‎ چپ"
-
-#: src/skins/ui_main.cc:734
-msgid "Balance: center"
-msgstr "بالانس: مرکز"
-
-#: src/skins/ui_main.cc:736
-#, c-format
-msgid "Balance: %d%% right"
-msgstr "بالانس: ‎%d%%‎ راست"
-
-#: src/skins/ui_main.cc:842
-msgid "Options Menu"
-msgstr "منوی گزینه‌ها"
-
-#: src/skins/ui_main.cc:846
-msgid "Disable 'Always On Top'"
-msgstr "غیرفعال کردن 'همیشه در بالا'"
-
-#: src/skins/ui_main.cc:848
-msgid "Enable 'Always On Top'"
-msgstr "فعال کردن 'همیشه در بالا'"
-
-#: src/skins/ui_main.cc:851
-msgid "File Info Box"
-msgstr "جعبه اطلاعات فایل"
-
-#: src/skins/ui_main.cc:857
-msgid "Visualizations"
-msgstr ""
-
-#: src/skins/ui_main.cc:1336
-msgid "Repeat point A set."
-msgstr ""
-
-#: src/skins/ui_main.cc:1341
-msgid "Repeat point B set."
-msgstr ""
-
-#: src/skins/ui_main.cc:1350
-msgid "Repeat points cleared."
-msgstr ""
-
-#: src/skins/ui_playlist.cc:219
-msgid "Search entries in active playlist"
-msgstr "گزینه‌های موجود در لیست پخش فعال را جستجو کن"
-
-#: src/skins/ui_playlist.cc:226
-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.cc:234
-msgid "Title:"
-msgstr ""
+#: src/skins-qt/skins_cfg.cc:294 src/skins/skins_cfg.cc:276
+msgid "Type"
+msgstr "نوع"
 
-#: src/skins/ui_playlist.cc:241
-msgid "Album:"
-msgstr ""
+#: src/skins-qt/skins_cfg.cc:295 src/skins/skins_cfg.cc:277
+msgid "Visualization type:"
+msgstr "نوع جلوه های تصویری:"
 
-#: src/skins/ui_playlist.cc:248
-msgid "Artist:"
+#: src/skins-qt/skins_cfg.cc:298 src/skins/skins_cfg.cc:280
+msgid "Analyzer"
 msgstr ""
 
-#: src/skins/ui_playlist.cc:255
-msgid "File Name:"
+#: src/skins-qt/skins_cfg.cc:299 src/skins/skins_cfg.cc:281
+msgid "Show peaks"
 msgstr ""
 
-#: src/skins/ui_playlist.cc:263
-msgid "Clear previous selection before searching"
-msgstr "قبل از جستجو انتخاب قبلی را پاک کن"
-
-#: src/skins/ui_playlist.cc:266
-msgid "Automatically toggle queue for matching entries"
-msgstr "گزینه‌های یافت شده را در صف نشان بده"
-
-#: src/skins/ui_playlist.cc:269
-msgid "Create a new playlist with matching entries"
-msgstr "لیست پخش براساس گزینه‌های یافت شده ایجاد کن"
-
-#: src/skins/ui_playlist.cc:717
-msgid "Audacious Playlist Editor"
-msgstr "ویرایشگر لیست پخش Audacious"
-
-#: src/skins/ui_playlist.cc:752
-#, c-format
-msgid "%s (%d of %d)"
-msgstr "‎%s (%d of %d)‎"
+#: src/skins-qt/skins_cfg.cc:308 src/skins/skins_cfg.cc:290
+msgid "Visualization"
+msgstr "جلوه‌های تصویری"
 
-#: src/skins/ui_skinselector.cc:167
+#: src/skins-qt/skinselector.cc:98 src/skins/skinselector.cc:111
 msgid "Archived Winamp 2.x skin"
 msgstr "پوسته فشرده Winamp 2.x"
 
-#: src/skins/ui_skinselector.cc:172
+#: src/skins-qt/skinselector.cc:102 src/skins/skinselector.cc:115
 msgid "Unarchived Winamp 2.x skin"
 msgstr "پوسته غیرفشرده Winamp 2.x"
 
-#: src/skins/util.cc:430
-#, c-format
-msgid "Could not create directory (%s): %s\n"
-msgstr ""
-
-#: src/sndfile/plugin.cc:39
+#: src/sndfile/plugin.cc:38
 msgid "Sndfile Plugin"
 msgstr ""
 
-#: src/sndfile/plugin.cc:336
+#: src/sndfile/plugin.cc:372
 msgid ""
 "Based on the xmms_sndfile plugin:\n"
 "Copyright (C) 2000, 2002 Erik de Castro Lopo\n"
@@ -3688,92 +3945,100 @@
 "Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:44
+#: src/sndio/sndio.cc:43
 msgid "Sndio Output"
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:98
+#: src/sndio/sndio.cc:98
 msgid "Device (blank for default):"
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:100
+#: src/sndio/sndio.cc:100
 msgid "Save and restore volume:"
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:181
+#: src/sndio/sndio.cc:181
 #, c-format
 msgid "Sndio error: Unsupported audio format (%d)"
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:192
+#: src/sndio/sndio.cc:192
 msgid "Sndio error: sio_open() failed"
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:222
+#: src/sndio/sndio.cc:221
 msgid "Sndio error: sio_setpar() failed"
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:234
+#: src/sndio/sndio.cc:233
 msgid "Sndio error: sio_start() failed"
 msgstr ""
 
-#: src/song_change/song_change.cc:33
+#: src/songchange/song_change.cc:30
 msgid "Song Change"
 msgstr ""
 
-#: src/song_change/song_change.cc:342
-msgid ""
-"Parameters passed to the shell should be encapsulated in "
-"quotes. Doing otherwise is a security risk."
-msgstr ""
-
-#: src/song_change/song_change.cc:358
+#: src/songchange/song_change.cc:256
 msgid "Commands"
 msgstr ""
 
-#: src/song_change/song_change.cc:360
+#: src/songchange/song_change.cc:258
 msgid "Command to run when starting a new song:"
 msgstr ""
 
-#: src/song_change/song_change.cc:364
+#: src/songchange/song_change.cc:261
+msgid "Command to run when stopping a song:"
+msgstr ""
+
+#: src/songchange/song_change.cc:264
 msgid "Command to run at the end of a song:"
 msgstr ""
 
-#: src/song_change/song_change.cc:368
+#: src/songchange/song_change.cc:267
 msgid "Command to run at the end of the playlist:"
 msgstr ""
 
-#: src/song_change/song_change.cc:372
+#: src/songchange/song_change.cc:270
 msgid "Command to run when song title changes (for network streams):"
 msgstr ""
 
-#: src/song_change/song_change.cc:376
+#: src/songchange/song_change.cc:273
 msgid ""
-"You can use the following format strings which will be substituted before "
-"calling the command (not all are useful for the end-of-playlist command):\n"
-"\n"
-"%F: Frequency (in hertz)\n"
+"You can use the following format codes, which will be replaced before "
+"running the command.\n"
+"Not all are useful though for the song-stopped or end-of-playlist command."
+msgstr ""
+
+#: src/songchange/song_change.cc:276
+msgid ""
+"%a: Artist\n"
+"%b: Album\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"
+"%F: Frequency (Hertz)\n"
+"%l: Length (milliseconds)\n"
+"%n or %s: Formatted title (see playlist settings)\n"
 "%p: Currently playing (1 or 0)\n"
-"%a: Artist\n"
-"%b: Album\n"
-"%T: Track title"
+"%r: Rate (bits per second)\n"
+"%t: Playlist position\n"
+"%T: Title (unformatted)"
 msgstr ""
 
-#: src/song-info-qt/song-info.cc:32
-msgid "Song Info (Qt)"
+#: src/songchange/song_change.cc:287
+msgid ""
+"Parameters passed to the shell should be enclosed in quotation marks.\n"
+"Unquoted parameters may lead to unexpected results."
 msgstr ""
 
-#: src/sox-resampler/sox-resampler.cc:44
+#: src/song-info-qt/song-info.cc:30
+msgid "Song Info"
+msgstr "اطلاعات آهنگ"
+
+#: src/soxr/sox-resampler.cc:44
 msgid "SoX Resampler"
 msgstr ""
 
-#: src/sox-resampler/sox-resampler.cc:144
+#: src/soxr/sox-resampler.cc:172
 msgid ""
 "SoX Resampler Plugin for Audacious\n"
 "Copyright 2013 Michał Lipski\n"
@@ -3782,89 +4047,129 @@
 "Copyright 2010-2012 John Lindgren"
 msgstr ""
 
-#: src/sox-resampler/sox-resampler.cc:150
+#: src/soxr/sox-resampler.cc:178
 msgid "Quick"
-msgstr ""
+msgstr "سریع"
 
-#: src/sox-resampler/sox-resampler.cc:151
+#: src/soxr/sox-resampler.cc:179
 msgid "Low"
-msgstr ""
+msgstr "پایین"
 
-#: src/sox-resampler/sox-resampler.cc:153
+#: src/soxr/sox-resampler.cc:181
 msgid "High"
-msgstr ""
+msgstr "بالا"
 
-#: src/sox-resampler/sox-resampler.cc:154
+#: src/soxr/sox-resampler.cc:182
 msgid "Very High"
+msgstr "خیلی بالا"
+
+#: src/soxr/sox-resampler.cc:183
+msgid "Ultra High"
+msgstr ""
+
+#: src/soxr/sox-resampler.cc:187
+msgid "Minimum"
+msgstr "کمینه"
+
+#: src/soxr/sox-resampler.cc:188
+msgid "Intermediate"
 msgstr ""
 
-#: src/sox-resampler/sox-resampler.cc:158
+#: src/soxr/sox-resampler.cc:193
 msgid "Quality:"
+msgstr "کیفیت:"
+
+#: src/soxr/sox-resampler.cc:196
+msgid "Phase:"
 msgstr ""
 
-#: src/speed-pitch/speed-pitch.cc:51
-msgid "Speed and Pitch"
+#: src/soxr/sox-resampler.cc:200
+msgid "Allow aliasing"
+msgstr ""
+
+#: src/soxr/sox-resampler.cc:202
+msgid "Use steep filter"
 msgstr ""
 
-#: src/speed-pitch/speed-pitch.cc:210
-msgid "Speed and Pitch"
+#: src/speedpitch/speed-pitch.cc:54
+msgid "Speed and Pitch"
 msgstr ""
 
-#: src/speed-pitch/speed-pitch.cc:211
-msgid "Speed:"
+#: src/speedpitch/speed-pitch.cc:247
+msgid "Speed"
+msgstr "سرعت"
+
+#: src/speedpitch/speed-pitch.cc:248
+msgid "Decouple from pitch"
 msgstr ""
 
-#: src/speed-pitch/speed-pitch.cc:214
-msgid "Pitch:"
+#: src/speedpitch/speed-pitch.cc:250 src/speedpitch/speed-pitch.cc:258
+msgid "Multiplier:"
 msgstr ""
 
-#: src/statusicon/statusicon.cc:47
-msgid "Status Icon"
+#: src/speedpitch/speed-pitch.cc:254
+msgid "Pitch"
 msgstr ""
 
-#: src/statusicon/statusicon.cc:283
-msgid "Se_ttings ..."
+#: src/statusicon-qt/statusicon.cc:45 src/statusicon/statusicon.cc:47
+msgid "Status Icon"
 msgstr ""
 
-#: src/statusicon/statusicon.cc:372
+#: src/statusicon-qt/statusicon.cc:68
 msgid ""
-"Status Icon Plugin\n"
+"Status Icon Plugin (partial port for Qt interface)\n"
 "\n"
 "Copyright 2005-2007 Giacomo Lozito <james@develia.org>\n"
 "Copyright 2010 Michał Lipski <tallica@o2.pl>\n"
+"Copyright 2015 Eugene Paskevich <eugene@raptor.kiev.ua>\n"
 "\n"
 "This plugin provides a status icon, placed in\n"
 "the system tray area of the window manager."
 msgstr ""
 
-#: src/statusicon/statusicon.cc:379
+#: src/statusicon-qt/statusicon.cc:89 src/statusicon/statusicon.cc:384
 msgid "Mouse Scroll Action"
 msgstr ""
 
-#: src/statusicon/statusicon.cc:380
+#: src/statusicon-qt/statusicon.cc:90 src/statusicon/statusicon.cc:385
 msgid "Change volume"
 msgstr ""
 
-#: src/statusicon/statusicon.cc:383
+#: src/statusicon-qt/statusicon.cc:93 src/statusicon/statusicon.cc:388
 msgid "Change playing song"
 msgstr ""
 
-#: src/statusicon/statusicon.cc:386
+#: src/statusicon-qt/statusicon.cc:96 src/statusicon/statusicon.cc:391
 msgid "Other Settings"
-msgstr ""
+msgstr "تنظیمات دیگر"
 
-#: src/statusicon/statusicon.cc:387
+#: src/statusicon-qt/statusicon.cc:97 src/statusicon/statusicon.cc:392
 msgid "Disable the popup window"
 msgstr ""
 
-#: src/statusicon/statusicon.cc:389
+#: src/statusicon-qt/statusicon.cc:99 src/statusicon/statusicon.cc:394
 msgid "Close to the system tray"
 msgstr ""
 
-#: src/statusicon/statusicon.cc:391
+#: src/statusicon-qt/statusicon.cc:101 src/statusicon/statusicon.cc:396
 msgid "Advance in playlist when scrolling upward"
 msgstr ""
 
+#: src/statusicon-qt/statusicon.cc:116 src/statusicon/statusicon.cc:287
+msgid "Se_ttings ..."
+msgstr ""
+
+#: src/statusicon/statusicon.cc:377
+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/stereo_plugin/stereo.cc:19
 msgid "Extra Stereo"
 msgstr ""
@@ -3880,20 +4185,160 @@
 msgid "Extra Stereo"
 msgstr ""
 
+#: src/streamtuner/icecast-model.cc:126 src/streamtuner/shoutcast-model.cc:131
+msgid "Type"
+msgstr "نوع"
+
+#: src/streamtuner/icecast-model.cc:132
+msgid "Current Song"
+msgstr "ترانه کنونی"
+
+#: src/streamtuner/icecast-model.cc:164
+msgid "Other"
+msgstr "دیگر"
+
+#: src/streamtuner/ihr-model.cc:63
+msgid "Market"
+msgstr ""
+
+#: src/streamtuner/ihr-model.cc:156
+msgid "Call Letters"
+msgstr ""
+
+#: src/streamtuner/ihr-model.cc:162
+msgid "Description"
+msgstr "شرح"
+
+#: src/streamtuner/shoutcast-model.cc:128
+msgid "Listeners"
+msgstr "شنونده ها"
+
+#: src/streamtuner/shoutcast-model.cc:188
+msgid "Top 500 Stations"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:189
+msgid "Alternative"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:190
+msgid "Blues"
+msgstr "بلوز"
+
+#: src/streamtuner/shoutcast-model.cc:191
+msgid "Classical"
+msgstr "کلاسیک"
+
+#: src/streamtuner/shoutcast-model.cc:192
+msgid "Country"
+msgstr "کانتری"
+
+#: src/streamtuner/shoutcast-model.cc:193
+msgid "Decades"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:194
+msgid "Easy Listening"
+msgstr "موسیقی آرام"
+
+#: src/streamtuner/shoutcast-model.cc:195
+msgid "Electronic"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:196
+msgid "Folk"
+msgstr "فولک"
+
+#: src/streamtuner/shoutcast-model.cc:197
+msgid "Inspirational"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:198
+msgid "International"
+msgstr "بین المللی"
+
+#: src/streamtuner/shoutcast-model.cc:199
+msgid "Jazz"
+msgstr "جاز"
+
+#: src/streamtuner/shoutcast-model.cc:200
+msgid "Latin"
+msgstr "لاتین"
+
+#: src/streamtuner/shoutcast-model.cc:201
+msgid "Metal"
+msgstr "متال"
+
+#: src/streamtuner/shoutcast-model.cc:203
+msgid "New Age"
+msgstr "عصر جدید"
+
+#: src/streamtuner/shoutcast-model.cc:204
+msgid "Pop"
+msgstr "پاپ"
+
+#: src/streamtuner/shoutcast-model.cc:205
+msgid "Public Radio"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:206
+msgid "R&B and Urban"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:207
+msgid "Rap"
+msgstr "رپ"
+
+#: src/streamtuner/shoutcast-model.cc:208
+msgid "Reggae"
+msgstr "رگه"
+
+#: src/streamtuner/shoutcast-model.cc:209
+msgid "Rock"
+msgstr "راک"
+
+#: src/streamtuner/shoutcast-model.cc:210
+msgid "Seasonal and Holiday"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:211
+msgid "Soundtracks"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:212
+msgid "Talk"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:213
+msgid "Themes"
+msgstr ""
+
+#: src/streamtuner/streamtuner.cc:59
+msgid "Shoutcast"
+msgstr ""
+
+#: src/streamtuner/streamtuner.cc:60
+msgid "Icecast"
+msgstr ""
+
+#: src/streamtuner/streamtuner.cc:71
+msgid "Stream Tuner"
+msgstr ""
+
 #: src/tonegen/tonegen.cc:45
 msgid "Tone Generator"
 msgstr ""
 
-#: src/tonegen/tonegen.cc:94
+#: src/tonegen/tonegen.cc:92
 #, c-format
 msgid "%s %.1f Hz"
 msgstr ""
 
-#: src/tonegen/tonegen.cc:94
+#: src/tonegen/tonegen.cc:92
 msgid "Tone Generator: "
 msgstr ""
 
-#: src/tonegen/tonegen.cc:160
+#: src/tonegen/tonegen.cc:161
 msgid ""
 "Sine tone generator by Håvard Kvålen <havardk@xmms.org>\n"
 "Modified by Daniel J. Peng <danielpeng@bigfoot.com>\n"
@@ -3902,11 +4347,32 @@
 "e.g. tone://2000;2005 to play a 2000 Hz tone and a 2005 Hz tone"
 msgstr ""
 
+#: src/ui-common/dialogs-qt.cc:40
+msgid ""
+"\n"
+"(Further messages have been hidden.)"
+msgstr ""
+"\n"
+"(پیام‌های بیشتر مخفی شده‌اند.)"
+
+#: src/ui-common/dialogs-qt.cc:52
+msgid "Working ..."
+msgstr "در حال کار..."
+
+#: src/ui-common/dialogs-qt.cc:73
+msgid "Information"
+msgstr "اطلاعات"
+
+#: src/ui-common/menu-ops-gtk.cc:132 src/ui-common/menu-ops-qt.cc:113
+#, c-format
+msgid "%s does not appear to be a valid folder."
+msgstr ""
+
 #: src/voice_removal/voice_removal.cc:28
 msgid "Voice Removal"
 msgstr ""
 
-#: src/vorbis/vorbis.cc:465
+#: src/vorbis/vorbis.cc:433
 msgid ""
 "Audacious Ogg Vorbis Decoder\n"
 "\n"
@@ -3931,12 +4397,12 @@
 msgid "Ogg Vorbis Decoder"
 msgstr ""
 
-#: src/vtx/info.cc:22
+#: src/vtx/info.cc:24
 #, c-format
 msgid "Details about %s"
 msgstr ""
 
-#: src/vtx/info.cc:24
+#: src/vtx/info.cc:26
 msgid ""
 "Title: %t\n"
 "Author: %a\n"
@@ -3955,44 +4421,104 @@
 msgid "VTX Decoder"
 msgstr ""
 
-#: src/vtx/vtx.cc:184
+#: src/vtx/vtx.cc:178
 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/wavpack/wavpack.cc:24
+#: src/vumeter-qt/vumeter_qt.cc:31
+msgid ""
+"VU Meter Plugin for Audacious\n"
+"Copyright 2017-2019 Marc Sánchez Fauste"
+msgstr ""
+
+#: src/vumeter-qt/vumeter_qt.cc:35
+msgid "VU Meter Settings"
+msgstr ""
+
+#: src/vumeter-qt/vumeter_qt.cc:37
+msgid "Peak hold time:"
+msgstr ""
+
+#: src/vumeter-qt/vumeter_qt.cc:42
+msgid "Fall-off time:"
+msgstr ""
+
+#: src/vumeter-qt/vumeter_qt.cc:44
+msgid "dB/second"
+msgstr ""
+
+#: src/vumeter-qt/vumeter_qt.cc:46
+msgid "Display legend"
+msgstr ""
+
+#: src/vumeter-qt/vumeter_qt.h:37
+msgid "VU Meter"
+msgstr ""
+
+#: src/waveout/waveout.cc:43
+msgid "Win32 waveOut"
+msgstr ""
+
+#: src/waveout/waveout.cc:69
+msgid ""
+"Win32 waveOut Plugin for Audacious\n"
+"Copyright 2016 John Lindgren"
+msgstr ""
+
+#: src/wavpack/wavpack.cc:25
 msgid "WavPack Decoder"
 msgstr ""
 
-#: src/wavpack/wavpack.cc:211
+#: src/wavpack/wavpack.cc:217
 msgid "lossy (hybrid)"
 msgstr ""
 
-#: src/wavpack/wavpack.cc:213
+#: src/wavpack/wavpack.cc:219
 msgid "lossy"
 msgstr ""
 
-#: src/wavpack/wavpack.cc:255
+#: src/wavpack/wavpack.cc:259
 msgid ""
 "Copyright 2006 William Pitcock <nenolod@nenolod.net>\n"
 "\n"
 "Some of the plugin code was by Miles Egan."
 msgstr ""
 
-#: src/xsf/plugin.cc:50
+#: src/xsf/plugin.cc:74
 msgid "2SF Decoder"
 msgstr ""
 
-#: src/xsf/plugin.cc:238
+#: src/xsf/plugin.cc:429
+msgid "32728 Hz"
+msgstr ""
+
+#: src/xsf/plugin.cc:432
+msgid "65456 Hz"
+msgstr ""
+
+#: src/xsf/plugin.cc:438
+msgid "Cosine"
+msgstr ""
+
+#: src/xsf/plugin.cc:439
+msgid "Sharp"
+msgstr ""
+
+#: src/xsf/plugin.cc:443
 msgid "XSF Configuration"
 msgstr ""
 
-#: src/xsf/plugin.cc:239
-msgid "Ignore length from file"
+#: src/xsf/plugin.cc:445
+msgid "Default fade time:"
+msgstr ""
+
+#: src/xsf/plugin.cc:447
+msgid "Interpolation mode:"
 msgstr ""
 
-#: src/xspf/xspf.cc:89
+#: src/xspf/xspf.cc:95
 msgid "XML Shareable Playlists (XSPF)"
 msgstr ""

audacious-plugins-3.6.2-gtk3.tar.bz2/po/fi.po -> audacious-plugins-4.4.1.tar.bz2/po/fi.po Changed

@@ -3,17 +3,19 @@
 # This file is distributed under the same license as the Audacious Plugins package.
 #
 # Translators:
-# Jiri Grönroos <jiri.gronroos@iki.fi>, 2014-2015
+# Jiri Grönroos <jiri.gronroos@iki.fi>, 2014-2016,2018,2020,2022-2023
 # J. S. Tuomisto <jstuomisto@gmail.com>, 2013
 # J. S. Tuomisto <jstuomisto@gmail.com>, 2013
+# Kimmo Kujansuu <mrkujansuu@gmail.com>, 2020,2022-2024
 msgid ""
 msgstr ""
 "Project-Id-Version: Audacious Plugins\n"
-"Report-Msgid-Bugs-To: http://redmine.audacious-media-player.org/\n"
-"POT-Creation-Date: 2015-02-28 19:18+0100\n"
-"PO-Revision-Date: 2015-02-05 07:12+0000\n"
-"Last-Translator: Jiri Grönroos <jiri.gronroos@iki.fi>\n"
-"Language-Team: Finnish (http://www.transifex.com/projects/p/audacious/"
+"Report-Msgid-Bugs-To: https://github.com/audacious-media-player/audacious/"
+"issues\n"
+"POT-Creation-Date: 2024-09-26 21:54+0200\n"
+"PO-Revision-Date: 2011-10-10 17:43+0000\n"
+"Last-Translator: Kimmo Kujansuu <mrkujansuu@gmail.com>, 2020,2022-2024\n"
+"Language-Team: Finnish (http://app.transifex.com/audacious/audacious/"
 "language/fi/)\n"
 "Language: fi\n"
 "MIME-Version: 1.0\n"
@@ -21,287 +23,60 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/aac-raw/aac.cc:18
+#: src/aac/aac.cc:19
 msgid "AAC (Raw) Decoder"
 msgstr "AAC (Raw) -dekooderi"
 
-#: src/adplug/adplug-xmms.cc:42
+#: src/adplug/adplug-xmms.cc:70
 msgid "AdPlug (AdLib Player)"
 msgstr "AdPlug (AdLib-soitin)"
 
-#: src/adplug/adplug-xmms.cc:156 src/modplug/modplugbmp.cc:335
-#: src/psf/plugin.cc:138 src/vtx/vtx.cc:87 src/xsf/plugin.cc:113
+#: src/adplug/adplug-xmms.cc:167 src/modplug/modplugbmp.cc:321
+#: src/psf/plugin.cc:161 src/vtx/vtx.cc:89 src/xsf/plugin.cc:204
 msgid "sequenced"
 msgstr "sarjoitettu"
 
-#: src/alarm/alarm.cc:55 src/alarm/interface.cc:82
-msgid "Alarm"
-msgstr "Herätyskello"
-
-#: src/alarm/alarm.cc:782
-msgid "Set Alarm ..."
-msgstr "Aseta hälytys..."
-
-#: src/alarm/alarm.cc:810
-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/interface.cc: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.cc: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.cc: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.cc:81
-msgid "This is your wakeup call."
-msgstr "Herätys!"
-
-#: src/alarm/interface.cc:99
-msgid "Your reminder for today is..."
-msgstr "Muistutuksesi tälle päivälle on..."
-
-#: src/alarm/interface.cc:101 src/alarm/interface.cc:386
-msgid "Reminder"
-msgstr "Muistutus"
-
-#: src/alarm/interface.cc:132
-msgid "Monday"
-msgstr "Maanantai"
-
-#: src/alarm/interface.cc:132
-msgid "Tuesday"
-msgstr "Tiistai"
-
-#: src/alarm/interface.cc:132
-msgid "Wednesday"
-msgstr "Keskiviikko"
-
-#: src/alarm/interface.cc:133
-msgid "Thursday"
-msgstr "Torstai"
-
-#: src/alarm/interface.cc:133
-msgid "Friday"
-msgstr "Perjantai"
-
-#: src/alarm/interface.cc:133
-msgid "Saturday"
-msgstr "Lauantai"
-
-#: src/alarm/interface.cc:133
-msgid "Sunday"
-msgstr "Sunnuntai"
-
-#: src/alarm/interface.cc:171 src/alarm/interface.cc:230
-#: src/alarm/interface.cc:245
-msgid "Time"
-msgstr "Aika"
-
-#: src/alarm/interface.cc:178
-msgid "Alarm at (default):"
-msgstr "Kellonaika (oletus):"
-
-#: src/alarm/interface.cc:200
-msgid "h"
-msgstr "h"
-
-#: src/alarm/interface.cc:203
-msgid "Quiet after:"
-msgstr "Hiljennä, kun aikaa kulunut:"
-
-#: src/alarm/interface.cc:215
-msgid "hours"
-msgstr "tunnit"
-
-#: src/alarm/interface.cc:226
-msgid "minutes"
-msgstr "minuutit"
-
-#: src/alarm/interface.cc:235
-msgid "Choose the days for the alarm to come on"
-msgstr "Valitse päivät jolloin herätyskello on aktiivinen"
-
-#: src/alarm/interface.cc:242
-msgid "Day"
-msgstr "Päivä"
-
-#: src/alarm/interface.cc:259 src/bs2b/plugin.cc:130
-#: src/skins/preset-list.cc:434 src/skins/preset-list.cc:440
-msgid "Default"
-msgstr "Oletus"
+#: src/adplug/adplug-xmms.cc:349 src/sid/xs_config.cc:61
+msgid "Output"
+msgstr "Ulostulo"
 
-#: src/alarm/interface.cc:288
-msgid "Days"
-msgstr "Päivät"
-
-#: src/alarm/interface.cc:297
-msgid "Fading"
-msgstr "Häivytys"
-
-#: src/alarm/interface.cc:305 src/console/plugin.cc:41
-#: src/crossfade/crossfade.cc:53 src/crossfade/crossfade.cc:59
-#: src/gtkui/settings.cc:49 src/lirc/lirc.cc:397 src/sid/xs_config.cc:85
-#: src/sid/xs_config.cc:94 src/sid/xs_config.cc:103
-msgid "seconds"
-msgstr "sekuntia"
+#: src/adplug/adplug-xmms.cc:350
+msgid "OPL Emulator:"
+msgstr "OPL-emulaattori:"
+
+#: src/adplug/adplug-xmms.cc:353 src/amidiplug/i_configure.cc:153
+#: src/console/plugin.cc:45 src/filewriter/filewriter.cc:481
+#: src/sid/xs_config.cc:65 src/xsf/plugin.cc:446
+msgid "Sample rate:"
+msgstr "Näytteenottotaajuus:"
 
-#: src/alarm/interface.cc:312 src/alarm/interface.cc:353
-msgid "Volume"
-msgstr "Äänenvoimakkuus"
-
-#: src/alarm/interface.cc:317
-msgid "Start at"
-msgstr "Aloita"
-
-#: src/alarm/interface.cc:333
-msgid "Final"
-msgstr "Lopullinen"
-
-#: src/alarm/interface.cc:346
-msgid "Current"
-msgstr "Nykyinen"
-
-#: src/alarm/interface.cc:359
-msgid "Additional Command"
-msgstr "Lisäkomento"
-
-#: src/alarm/interface.cc:365 src/alarm/interface.cc:391
-msgid "enable"
-msgstr "käytä"
-
-#: src/alarm/interface.cc:372
-msgid "Playlist (optional)"
-msgstr "Soittolista (valinnainen)"
-
-#: src/alarm/interface.cc:379
-msgid "Select a playlist"
-msgstr "Valitse soittolista"
+#: src/adplug/adplug-xmms.cc:354 src/amidiplug/i_configure.cc:155
+#: src/bs2b/plugin.cc:141 src/console/plugin.cc:47
+#: src/modplug/plugin_main.cc:77 src/resample/resample.cc:201
+#: src/resample/resample.cc:207 src/resample/resample.cc:211
+#: src/resample/resample.cc:215 src/resample/resample.cc:219
+#: src/resample/resample.cc:223 src/resample/resample.cc:227
+#: src/resample/resample.cc:231 src/resample/resample.cc:235
+#: src/resample/resample.cc:239 src/resample/resample.cc:243
+#: src/sid/xs_config.cc:67 src/soxr/sox-resampler.cc:205
+msgid "Hz"
+msgstr "Hz"
 
-#: src/alarm/interface.cc:399
-msgid "Options"
-msgstr "Asetukset"
+#: src/adplug/adplug-xmms.cc:355 src/gtkui/settings.cc:55
+#: src/modplug/plugin_main.cc:105 src/qtui/settings.cc:85
+#: src/skins-qt/skins_cfg.cc:302 src/skins/skins_cfg.cc:284
+msgid "Miscellaneous"
+msgstr "Sekalaiset"
 
-#: src/alarm/interface.cc:404
-msgid "What do these options mean?"
-msgstr "Mitä nämä asetukset tarkoittavat?"
-
-#: src/alarm/interface.cc:420
-msgid "Help"
-msgstr "Ohje"
+#: src/adplug/adplug-xmms.cc:356
+msgid "Repeat song in endless loop"
+msgstr "Toista kappale loputtomassa silmukassa"
 
-#: src/albumart/albumart.cc:31
+#: src/albumart/albumart.cc:31 src/albumart-qt/albumart.cc:35
 msgid "Album Art"
-msgstr "Albumin kansikuvitus"
-
-#: src/albumart-qt/albumart.cc:33
-msgid "Album Art (Qt)"
-msgstr "Albumikuvitus (Qt)"
+msgstr "Levyn kansikuva"
 
-#: src/alsa/alsa.h:70
+#: src/alsa/alsa.h:64
 msgid "ALSA Output"
 msgstr "ALSA-lähtö"
 
@@ -313,11 +88,11 @@
 "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"
+"ALSA Output Plugin for Audacious\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."
+"Kiitokseni William Pitcock \"ALSA Output Plugin NG\"-kehittäjälle, jonka "
+"koodi toimi referenssinä silloin kun ALSA-manuaali ei riittänyt."
 
 #: src/alsa/config.cc:61
 msgid "(no description)"
@@ -343,11 +118,11 @@
 msgid "Mixer element:"
 msgstr "Miksauskanava:"
 
-#: src/amidi-plug/amidi-plug.cc:41
+#: src/amidiplug/amidi-plug.cc:42
 msgid "AMIDI-Plug (MIDI Player)"
-msgstr "AMIDI-liitännäinen (MIDI-soitin)"
+msgstr "AMIDI-Plug (MIDI Player)"
 
-#: src/amidi-plug/amidi-plug.cc:437
+#: src/amidiplug/amidi-plug.cc:445
 msgid ""
 "AMIDI-Plug\n"
 "modular MIDI music player\n"
@@ -369,158 +144,181 @@
 "Tony Vroon\n"
 "for the good help with alpha testing"
 msgstr ""
+"AMIDI-Plug\n"
+"modulaarinen MIDI musiikkisoitin\n"
+"http://www.develia.org/projects.php?p=amidiplug\n"
+"\n"
+"kirjoittanutu Giacomo Lozito\n"
+"<james@develia.org>\n"
+"\n"
+"erityinen kiitos...\n"
+"\n"
+"Clemens Ladisch ja Jaroslav Kysela\n"
+"heidän tyylikkäille ohjelmille aplaymidi ja amixer; nämä\n"
+"olivat todella hyödyllisiä, yhdessä alsa-lib ohjeiden kanssa,\n"
+"oppimaan ALSA API -toiminta\n"
+"\n"
+"Alfredo Spadafina\n"
+"hienosta midinäppäimistön logosta\n"
+"\n"
+"Tony Vroon\n"
+"kaikesta suuresta avusta testauksessa"
 
-#: src/amidi-plug/i_configure.cc:94
+#: src/amidiplug/i_configure.cc:94
 msgid "Override default gain:"
-msgstr ""
+msgstr "Ohita oletusvahvistus:"
 
-#: src/amidi-plug/i_configure.cc:102
+#: src/amidiplug/i_configure.cc:102
 msgid "Override default polyphony:"
-msgstr ""
+msgstr "Ohita oletus moniääni:"
 
-#: src/amidi-plug/i_configure.cc:110
+#: src/amidiplug/i_configure.cc:110
 msgid "Override default reverb:"
-msgstr ""
+msgstr "Ohita oletuskaiku:"
 
-#: src/amidi-plug/i_configure.cc:112 src/amidi-plug/i_configure.cc:120
+#: src/amidiplug/i_configure.cc:112 src/amidiplug/i_configure.cc:120
 msgid "On"
-msgstr ""
+msgstr "On"
 
-#: src/amidi-plug/i_configure.cc:118
+#: src/amidiplug/i_configure.cc:118
 msgid "Override default chorus:"
-msgstr ""
+msgstr "Ohita oletuskertosäe:"
 
-#: src/amidi-plug/i_configure.cc:128 src/console/plugin.cc:29
+#: src/amidiplug/i_configure.cc:128 src/console/plugin.cc:29
 msgid "Playback"
 msgstr "Toisto"
 
-#: src/amidi-plug/i_configure.cc:129
+#: src/amidiplug/i_configure.cc:129
 msgid "Transpose:"
-msgstr ""
+msgstr "Siirtäminen:"
 
-#: src/amidi-plug/i_configure.cc:131
+#: src/amidiplug/i_configure.cc:131 src/speedpitch/speed-pitch.cc:257
 msgid "semitones"
-msgstr ""
+msgstr "puolisävelaskeleen"
 
-#: src/amidi-plug/i_configure.cc:132
+#: src/amidiplug/i_configure.cc:132
 msgid "Drum shift:"
-msgstr ""
+msgstr "Rummun siirto:"
 
-#: src/amidi-plug/i_configure.cc:134
+#: src/amidiplug/i_configure.cc:134
 msgid "note numbers"
-msgstr ""
+msgstr "sisällysnumerot"
 
-#: src/amidi-plug/i_configure.cc:135
+#: src/amidiplug/i_configure.cc:135
 msgid "Skip leading silence"
 msgstr "Ohita edeltävä hiljaisuus"
 
-#: src/amidi-plug/i_configure.cc:137
+#: src/amidiplug/i_configure.cc:137
 msgid "Skip trailing silence"
 msgstr "Ohita lopussa oleva hiljaisuus"
 
-#: src/amidi-plug/i_configure.cc:141
+#: src/amidiplug/i_configure.cc:141
 msgid "SoundFont"
-msgstr ""
+msgstr "Äänifontti"
 
-#: src/amidi-plug/i_configure.cc:143
+#: src/amidiplug/i_configure.cc:148
 msgid "Synthesizer"
-msgstr ""
+msgstr "Syntetisaattori"
 
-#: src/amidi-plug/i_configure.cc:148 src/console/plugin.cc:45
-#: src/sid/xs_config.cc:65
-msgid "Sample rate:"
-msgstr ""
-
-#: src/amidi-plug/i_configure.cc:150 src/bs2b/plugin.cc:141
-#: src/console/plugin.cc:47 src/modplug/plugin_main.cc:78
-#: src/resample/resample.cc:201 src/resample/resample.cc:207
-#: src/resample/resample.cc:211 src/resample/resample.cc:215
-#: src/resample/resample.cc:219 src/resample/resample.cc:223
-#: src/resample/resample.cc:227 src/resample/resample.cc:231
-#: src/resample/resample.cc:235 src/resample/resample.cc:239
-#: src/resample/resample.cc:243 src/sid/xs_config.cc:67
-#: src/sox-resampler/sox-resampler.cc:163
-msgid "Hz"
-msgstr "Hz"
-
-#: src/amidi-plug/i_configure-fluidsynth.cc:52
+#: src/amidiplug/i_configure-fluidsynth.cc:58
+#: src/amidiplug/i_configure-fluidsynth.cc:527
 msgid "AMIDI-Plug - select SoundFont file"
-msgstr "AMIDI-liitännäinen - valitse SoundFont-tiedosto"
+msgstr "AMIDI-Plug - valitse SoundFont-tiedosto"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:55 src/filewriter/mp3.cc:658
+#: src/amidiplug/i_configure-fluidsynth.cc:61
 msgid "_Cancel"
 msgstr "_Peru"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:56
+#: src/amidiplug/i_configure-fluidsynth.cc:62
 msgid "_Open"
 msgstr "_Avaa"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:225 src/gtkui/columns.cc:46
+#: src/amidiplug/i_configure-fluidsynth.cc:233
+#: src/amidiplug/i_configure-fluidsynth.cc:461
 msgid "File name"
 msgstr "Tiedostonimi"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:229
+#: src/amidiplug/i_configure-fluidsynth.cc:237
+#: src/amidiplug/i_configure-fluidsynth.cc:464
 msgid "Size (bytes)"
 msgstr "Koko (tavuina)"
 
-#: src/amidi-plug/i_fileinfo.cc:163
+#: src/amidiplug/i_fileinfo.cc:184
 msgid "Name:"
 msgstr "Nimi:"
 
-#: src/amidi-plug/i_fileinfo.cc:181
+#: src/amidiplug/i_fileinfo.cc:202
 msgid " MIDI Info "
 msgstr " MIDI-tiedot "
 
-#: src/amidi-plug/i_fileinfo.cc:195
+#: src/amidiplug/i_fileinfo.cc:216
 msgid "Format:"
 msgstr "Muoto:"
 
-#: src/amidi-plug/i_fileinfo.cc:198
+#: src/amidiplug/i_fileinfo.cc:219
 msgid "Length (msec):"
 msgstr "Kesto (ms):"
 
-#: src/amidi-plug/i_fileinfo.cc:201
+#: src/amidiplug/i_fileinfo.cc:222
 msgid "No. of Tracks:"
 msgstr "Raitojen lukumäärä:"
 
-#: src/amidi-plug/i_fileinfo.cc:207
+#: src/amidiplug/i_fileinfo.cc:228
 msgid "variable"
 msgstr "muuttuja"
 
-#: src/amidi-plug/i_fileinfo.cc:209
+#: src/amidiplug/i_fileinfo.cc:230
 msgid "BPM:"
 msgstr "BPM:"
 
-#: src/amidi-plug/i_fileinfo.cc:217
+#: src/amidiplug/i_fileinfo.cc:238
 msgid "BPM (wavg):"
 msgstr "BPM (wavg):"
 
-#: src/amidi-plug/i_fileinfo.cc:220
+#: src/amidiplug/i_fileinfo.cc:241
 msgid "Time Div:"
 msgstr "Aikajako:"
 
-#: src/amidi-plug/i_fileinfo.cc:231
+#: src/amidiplug/i_fileinfo.cc:252
 msgid " MIDI Comments and Lyrics "
 msgstr " MIDI-kommentit ja -lyriikat "
 
-#: src/amidi-plug/i_fileinfo.cc:278
+#: src/amidiplug/i_fileinfo.cc:299
 msgid "* no comments available in this MIDI file *"
 msgstr "* MIDI-tiedostossa ei ollut kommentteja *"
 
-#: src/amidi-plug/i_fileinfo.cc:290
+#: src/amidiplug/i_fileinfo.cc:311
 msgid "* no lyrics available in this MIDI file *"
 msgstr "* MIDI-tiedostossa ei ollut lyriikoita *"
 
-#: src/amidi-plug/i_fileinfo.cc:300 src/filewriter/vorbis.cc:197
-#: src/ladspa/plugin.cc:416
+#: src/amidiplug/i_fileinfo.cc:321 src/ladspa/plugin.cc:418
+#: src/ui-common/dialogs-qt.cc:32
 msgid "_Close"
 msgstr "_Sulje"
 
-#: src/amidi-plug/i_fileinfo.cc:325
+#: src/amidiplug/i_fileinfo.cc:346
 msgid " (invalid UTF-8)"
 msgstr " (virheellinen UTF-8)"
 
-#: src/aosd/aosd.cc:32
+#: src/ampache/ampache.cc:33
+msgid "Ampache Browser"
+msgstr "Ampache-selain"
+
+#: src/ampache/ampache.cc:46
+msgid ""
+"Ampache Browser for Audacious\n"
+"http://ampache-browser.org/\n"
+"\n"
+"Copyright (C) Róbert Čerňanský and John Lindgren\n"
+"License: GNU GPLv3"
+msgstr ""
+"Ampache Browser Audaciousille\n"
+"http://ampache-browser.org/\n"
+"\n"
+"Copyright (C) Róbert Čerňanský ja John Lindgren\n"
+"License: GNU GPLv3"
+
+#: src/aosd/aosd.cc:31
 msgid ""
 "Audacious OSD\n"
 "http://www.develia.org/projects.php?p=audacious#aosd\n"
@@ -530,6 +328,13 @@
 "Based in part on Evan Martin's Ghosd library:\n"
 "http://neugierig.org/software/ghosd/"
 msgstr ""
+"Audacious OSD\n"
+"http://www.develia.org/projects.php?p=audacious#aosd\n"
+"\n"
+"Kirjoittanut Giacomo Lozito <james@develia.org>\n"
+"\n"
+"Perustuu osittain Evan Martin's Ghosd kirjastoon:\n"
+"http://neugierig.org/software/ghosd/"
 
 #: src/aosd/aosd.h:37
 msgid "AOSD (On-Screen Display)"
@@ -547,130 +352,130 @@
 msgid "Concave Rectangle"
 msgstr "Kovera suorakulmio"
 
-#: src/aosd/aosd_style.cc:69
+#: src/aosd/aosd_style.cc:69 src/openmpt/mptwrap.h:50 src/xsf/plugin.cc:436
 msgid "None"
 msgstr "Ei mitään"
 
-#: src/aosd/aosd_trigger.cc:50
+#: src/aosd/aosd_trigger.cc:49
 msgid "Playback Start"
 msgstr "Toiston aloitus"
 
-#: src/aosd/aosd_trigger.cc:51
+#: src/aosd/aosd_trigger.cc:50
 msgid "Triggers OSD when a playlist entry is played."
 msgstr "Näyttää OSD:n kun kappaleen toisto alkaa."
 
-#: src/aosd/aosd_trigger.cc:56
+#: src/aosd/aosd_trigger.cc:55
 msgid "Title Change"
 msgstr "Nimen muutos"
 
-#: src/aosd/aosd_trigger.cc:57
+#: src/aosd/aosd_trigger.cc:56
 msgid "Triggers OSD when the song title changes (for internet streams)."
-msgstr ""
+msgstr "Käynnistää OSD:n kun kappaleen nimi muuttuu (internet suoratoisto)."
 
-#: src/aosd/aosd_trigger.cc:62
+#: src/aosd/aosd_trigger.cc:61
 msgid "Pause On"
 msgstr "Keskeytys"
 
-#: src/aosd/aosd_trigger.cc:63
+#: src/aosd/aosd_trigger.cc:62
 msgid "Triggers OSD when playback is paused."
 msgstr "Näyttää OSD:n kun toisto keskeytetään."
 
-#: src/aosd/aosd_trigger.cc:68
+#: src/aosd/aosd_trigger.cc:67
 msgid "Pause Off"
 msgstr "Toisto jatkuu"
 
-#: src/aosd/aosd_trigger.cc:69
+#: src/aosd/aosd_trigger.cc:68
 msgid "Triggers OSD when playback is unpaused."
 msgstr "Näyttää OSD:n kun toisto jatkuu."
 
-#: src/aosd/aosd_ui.cc:163
+#: src/aosd/aosd_ui.cc:204
 msgid "Placement"
 msgstr "Sijoitus"
 
-#: src/aosd/aosd_ui.cc:196
+#: src/aosd/aosd_ui.cc:241
 msgid "Relative X offset:"
 msgstr "Suhteellinen X:n poikkeama:"
 
-#: src/aosd/aosd_ui.cc:203
+#: src/aosd/aosd_ui.cc:245
 msgid "Relative Y offset:"
 msgstr "Suhteellinen Y:n poikkeama:"
 
-#: src/aosd/aosd_ui.cc:210
+#: src/aosd/aosd_ui.cc:249
 msgid "Max OSD width:"
 msgstr "OSD:n maksimileveys:"
 
-#: src/aosd/aosd_ui.cc:221
+#: src/aosd/aosd_ui.cc:281
 msgid "Multi-Monitor options"
 msgstr "Monen näytön asetukset"
 
-#: src/aosd/aosd_ui.cc:225
+#: src/aosd/aosd_ui.cc:285
 msgid "Display OSD using:"
 msgstr "Näytä OSD käyttäen:"
 
-#: src/aosd/aosd_ui.cc:227
+#: src/aosd/aosd_ui.cc:287
 msgid "all monitors"
 msgstr "kaikki näytöt"
 
-#: src/aosd/aosd_ui.cc:230
+#: src/aosd/aosd_ui.cc:290
 #, c-format
 msgid "monitor %i"
 msgstr "näyttö %i"
 
-#: src/aosd/aosd_ui.cc:282
+#: src/aosd/aosd_ui.cc:342
 msgid "Timing (ms)"
 msgstr "Ajoitus (ms)"
 
-#: src/aosd/aosd_ui.cc:287
+#: src/aosd/aosd_ui.cc:347
 msgid "Display:"
 msgstr "Näytä:"
 
-#: src/aosd/aosd_ui.cc:292
+#: src/aosd/aosd_ui.cc:352
 msgid "Fade in:"
 msgstr "Häivytä sisään:"
 
-#: src/aosd/aosd_ui.cc:297
+#: src/aosd/aosd_ui.cc:357
 msgid "Fade out:"
 msgstr "Häivytä ulos:"
 
-#: src/aosd/aosd_ui.cc:361
+#: src/aosd/aosd_ui.cc:442
 msgid "Fonts"
 msgstr "Kirjasimet"
 
-#: src/aosd/aosd_ui.cc:368
+#: src/aosd/aosd_ui.cc:449
 #, c-format
 msgid "Font %i:"
 msgstr "Kirjasin %i:"
 
-#: src/aosd/aosd_ui.cc:382
+#: src/aosd/aosd_ui.cc:466
 msgid "Shadow"
 msgstr "Varjo"
 
-#: src/aosd/aosd_ui.cc:486
+#: src/aosd/aosd_ui.cc:589
 msgid "Render Style"
 msgstr "Esitystyyli"
 
-#: src/aosd/aosd_ui.cc:502
+#: src/aosd/aosd_ui.cc:605
 msgid "Colors"
 msgstr "Värit"
 
-#: src/aosd/aosd_ui.cc:513
+#: src/aosd/aosd_ui.cc:616
 #, c-format
 msgid "Color %i:"
 msgstr "Väri %i:"
 
-#: src/aosd/aosd_ui.cc:600
+#: src/aosd/aosd_ui.cc:714
 msgid "Enable trigger"
 msgstr "Käytä liipaisinta"
 
-#: src/aosd/aosd_ui.cc:627
+#: src/aosd/aosd_ui.cc:741
 msgid "Event"
 msgstr "Tapahtuma"
 
-#: src/aosd/aosd_ui.cc:655
+#: src/aosd/aosd_ui.cc:768
 msgid "Composite manager detected"
 msgstr "Komposointimanageri havaittu"
 
-#: src/aosd/aosd_ui.cc:662
+#: src/aosd/aosd_ui.cc:775
 msgid ""
 "Composite manager not detected;\n"
 "unless you know that you have one running, please activate a composite "
@@ -680,82 +485,164 @@
 "Jos komposointimanageri ei ole vielä päällä, aktivoi se tai muutoin OSD ei "
 "toimi kunnolla."
 
-#: src/aosd/aosd_ui.cc:670
+#: src/aosd/aosd_ui.cc:783
 msgid "Composite manager not required for fake transparency"
 msgstr "Komposointimanageria ei tarvita jäljiteltyyn läpinäkyvyyteen"
 
-#: src/aosd/aosd_ui.cc:706
+#: src/aosd/aosd_ui.cc:820
 msgid "Transparency"
 msgstr "Läpinäkyvyys"
 
-#: src/aosd/aosd_ui.cc:712
+#: src/aosd/aosd_ui.cc:826
 msgid "Fake transparency"
 msgstr "Jäljitelty läpinäkyvyys"
 
-#: src/aosd/aosd_ui.cc:714
+#: src/aosd/aosd_ui.cc:828
 msgid "Real transparency (requires X Composite Ext.)"
 msgstr "Oikea läpinäkyvyys (vaatii X:n komposointilaajennuksen)"
 
-#: src/aosd/aosd_ui.cc:756
+#: src/aosd/aosd_ui.cc:875
 msgid "Composite extension not loaded"
 msgstr "Komposointilaajennusta ei ole ladattu"
 
-#: src/aosd/aosd_ui.cc:764
-msgid "Composite extension not available"
-msgstr "Komposointilaajennus ei ole saatavilla"
-
-#: src/aosd/aosd_ui.cc:781
+#: src/aosd/aosd_ui.cc:892
 #, c-format
 msgid "Audacious OSD"
 msgstr "Audacious OSD"
 
-#: src/aosd/aosd_ui.cc:844
+#: src/aosd/aosd_ui.cc:955
 msgid "Position"
 msgstr "Sijainti"
 
-#: src/aosd/aosd_ui.cc:849
+#: src/aosd/aosd_ui.cc:960
 msgid "Animation"
 msgstr "Animaatio"
 
-#: src/aosd/aosd_ui.cc:854
+#: src/aosd/aosd_ui.cc:965
 msgid "Text"
 msgstr "Teksti"
 
-#: src/aosd/aosd_ui.cc:859
+#: src/aosd/aosd_ui.cc:970
 msgid "Decoration"
 msgstr "Koristeet"
 
-#: src/aosd/aosd_ui.cc:864
+#: src/aosd/aosd_ui.cc:975
 msgid "Trigger"
 msgstr "Liipaisin"
 
-#: src/aosd/aosd_ui.cc:869
+#: src/aosd/aosd_ui.cc:980 src/streamtuner/shoutcast-model.cc:202
 msgid "Misc"
 msgstr "Muut"
 
-#: src/aosd/aosd_ui.cc:878
+#: src/aosd/aosd_ui.cc:989
 msgid "Test"
-msgstr ""
+msgstr "Testaa"
 
 #: src/asx3/asx3.cc:35
 msgid "ASXv3 Playlists"
-msgstr "ASXv3-soittolistat"
+msgstr "ASXv3-soittolista"
 
 #: src/asx/asx.cc:33
 msgid "ASXv1/ASXv2 Playlists"
-msgstr "ASXv1/ASXv2 -soittolistat"
+msgstr "ASXv1/ASXv2-soittolista"
 
 #: src/audpl/audpl.cc:33
 msgid "Audacious Playlists (audpl)"
-msgstr "Audacious -soittolistat (audpl)"
+msgstr "Audacious soittolista (audpl)"
 
-#: src/blur_scope/blur_scope.cc:42
+#: src/background_music/background_music.cc:24
+msgid "Background music"
+msgstr "Taustamusiikki"
+
+#: src/background_music/background_music.cc:25
+msgid "Target level:"
+msgstr "Tavoitetaso:"
+
+#: src/background_music/background_music.cc:28
+#: src/background_music/background_music.cc:33
+#: src/silence-removal/silence-removal.cc:70
+msgid "dB"
+msgstr "dB"
+
+#: src/background_music/background_music.cc:29
+msgid "Maximum amplification:"
+msgstr "Maksimi vahvistus:"
+
+#: src/background_music/background_music.cc:34 src/mpg123/mpg123.cc:81
+msgid "Advanced"
+msgstr "Lisäasetukset"
+
+#: src/background_music/background_music.cc:36
+msgid "Slow detection weight:"
+msgstr "Hitaan havaitsemisen painotus:"
+
+#: src/background_music/background_music.cc:39
+msgid "Hint"
+msgstr "Vihje"
+
+#: src/background_music/background_music.cc:41
+msgid ""
+"Slow detection weight is the relative weight\n"
+"of a long term average detection when compared\n"
+"to the actual, faster loudness detection.\n"
+"A value of zero gives a more radio-like sound\n"
+"where soft passages get \"pulled up\" more quickly,\n"
+"a value of two makes the sound feel less compressed."
+msgstr ""
+"Hidas painotus on pitkän aikavälin keskimääräisen\n"
+"havaitsemisen suhteellinen painotus verrattuna todelliseen,\n"
+"nopeampaan voimakkuuden tunnistukseen.\n"
+"Nolla antaa radiomaisemman äänen, jossa pehmeät kohdat\n"
+"nopeammin \"vedetään ylös\", arvo kaksi saa äänen\n"
+"kuulostamaan vähemmän pakastetulta."
+
+#: src/background_music/background_music.cc:52
+msgid ""
+"Background Music Plugin for Audacious\n"
+"Copyright 2023;2024 Michel Fleur\n"
+"\n"
+"Controls the volume to make the sound equally loud within and between "
+"tracks.\n"
+" It uses accurate loudness measurement and tries to make the volume changes "
+"sound natural without audible peaks, yet without lowering the volume before "
+"a peak in advance."
+msgstr ""
+"Background Music Plugin for Audacious\n"
+"Copyright 2023;2024 Michel Fleur\n"
+"\n"
+"Säätää voimakkuutta siten, että ääni on yhtä kova raitojen sisällä ja "
+"välillä.\n"
+" Käyttää tarkkaa äänenvoimakkuuden mittausta ja yrittää saada voimakkuuden "
+"muutokset kuulostamaan luonnollisilta ilman kuultavia huippuja, mutta ilman "
+"voimakkuuden alentumista ennen huippua etukäteen."
+
+#: src/background_music/background_music.cc:61
+msgid "Background Music"
+msgstr "Taustamusiikki"
+
+#: src/bitcrusher/bitcrusher.cc:33
+msgid "Bitcrusher"
+msgstr "Bitcrusher"
+
+#: src/bitcrusher/bitcrusher.cc:34
+msgid "Bit Depth:"
+msgstr "Bittisyvyys:"
+
+#: src/bitcrusher/bitcrusher.cc:37
+msgid "Downsample ratio:"
+msgstr "Alataajuus:"
+
+#: src/bitcrusher/bitcrusher.cc:48
+msgid "Bitcrusher"
+msgstr "Bitcrusher"
+
+#: src/blur_scope/blur_scope.cc:40 src/blur_scope-qt/blur_scope.cc:45
 msgid "Color"
 msgstr "Väri"
 
-#: src/blur_scope/blur_scope.cc:58
+#: src/blur_scope/blur_scope.cc:56 src/blur_scope-qt/blur_scope.cc:158
 msgid "Blur Scope"
-msgstr "Blur Scope"
+msgstr "Sumenna alue"
 
 #: src/bs2b/plugin.cc:38
 msgid "Bauer Stereophonic-to-Binaural (BS2B)"
@@ -765,27 +652,31 @@
 msgid "Presets:"
 msgstr "Esiasetukset:"
 
+#: src/bs2b/plugin.cc:130
+msgid "Default"
+msgstr "Oletus"
+
 #: src/bs2b/plugin.cc:136
 msgid "Feed level:"
 msgstr "Syöttötaso:"
 
 #: src/bs2b/plugin.cc:138
 msgid "x1/10 dB"
-msgstr ""
+msgstr "x1/10 dB"
 
 #: src/bs2b/plugin.cc:139
 msgid "Cut frequency:"
 msgstr "Leikkaustaajuus:"
 
-#: src/cairo-spectrum/cairo-spectrum.cc:41
+#: src/cairo-spectrum/cairo-spectrum.cc:42 src/qt-spectrum/qt-spectrum.cc:107
 msgid "Spectrum Analyzer"
-msgstr "Spektrianalysaattori"
+msgstr "Spektri analysaattori"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:72
+#: src/cdaudio/cdaudio-ng.cc:74
 msgid "Audio CD Plugin"
-msgstr "Ääni CD -liitännäinen"
+msgstr "Audio CD Plugin"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:121
+#: src/cdaudio/cdaudio-ng.cc:121
 msgid ""
 "Copyright (C) 2007-2012 Calin Crisan <ccrisan@gmail.com> and others.\n"
 "\n"
@@ -805,132 +696,132 @@
 "\n"
 "Tämä oli Google Summer of Code 2007 -projekti."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:137
+#: src/cdaudio/cdaudio-ng.cc:140
 msgid "Device"
 msgstr "Laite"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:138
+#: src/cdaudio/cdaudio-ng.cc:141
 msgid "Read speed:"
 msgstr "Lukunopeus:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:141
+#: src/cdaudio/cdaudio-ng.cc:144
 msgid "Override device:"
 msgstr "Laite:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:143
+#: src/cdaudio/cdaudio-ng.cc:146
 msgid "Metadata"
 msgstr "Metatiedot"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:144
+#: src/cdaudio/cdaudio-ng.cc:147
 msgid "Use CD-Text"
 msgstr "Käytä CD-tekstiä"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:146
+#: src/cdaudio/cdaudio-ng.cc:150
 msgid "Use CDDB"
 msgstr "Käytä CDDB:tä"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:148
+#: src/cdaudio/cdaudio-ng.cc:152
 msgid "Use HTTP instead of CDDBP"
 msgstr "Käytä HTTP:tä CDDBP:n sijasta"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:151
+#: src/cdaudio/cdaudio-ng.cc:155
 msgid "Server:"
 msgstr "Palvelin:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:155
+#: src/cdaudio/cdaudio-ng.cc:159
 msgid "Path:"
 msgstr "Polku:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:159
+#: src/cdaudio/cdaudio-ng.cc:163
 msgid "Port:"
 msgstr "Portti:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:246
+#: src/cdaudio/cdaudio-ng.cc:228
 msgid "Failed to initialize cdio subsystem."
-msgstr "cdio-alijärjestelmää ei voitu alustaa."
+msgstr "Ei voitu alustaa cdio-alijärjestelmää."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:281
+#: src/cdaudio/cdaudio-ng.cc:260
 #, c-format
 msgid "Invalid URI %s."
 msgstr "Viallinen URI %s."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:283
+#: src/cdaudio/cdaudio-ng.cc:262
 #, c-format
 msgid "Track %d not found."
 msgstr "Raitaa %d ei löydetty."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:285
+#: src/cdaudio/cdaudio-ng.cc:264
 #, c-format
 msgid "Track %d is a data track."
 msgstr "Raita %d on dataraita."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:360
+#: src/cdaudio/cdaudio-ng.cc:339
 msgid "Error reading audio CD."
 msgstr "Virhe luettaessa ääni CD:tä."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:429
+#: src/cdaudio/cdaudio-ng.cc:410
 msgid "Audio CD"
 msgstr "Ääni CD"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:460 src/cdaudio-ng/cdaudio-ng.cc:469
+#: src/cdaudio/cdaudio-ng.cc:446 src/cdaudio/cdaudio-ng.cc:455
 #, c-format
 msgid "Failed to open CD device %s."
 msgstr "Ei voitu avata CD-asemaa %s."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:472
+#: src/cdaudio/cdaudio-ng.cc:458
 msgid "No audio capable CD drive found."
 msgstr "Ääneen kykenevää CD-asemaa ei löydetty."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:497
+#: src/cdaudio/cdaudio-ng.cc:481
+msgid "Drive is empty."
+msgstr "Asema on tyhjä."
+
+#: src/cdaudio/cdaudio-ng.cc:483
+msgid "Unsupported disk type."
+msgstr "Levytyyppiä ei tueta."
+
+#: src/cdaudio/cdaudio-ng.cc:507
 msgid "Failed to finish initializing opened CD drive."
 msgstr "Avatun CD-aseman alustaminen epäonnistui."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:510
+#: src/cdaudio/cdaudio-ng.cc:520
 msgid "Failed to retrieve first/last track number."
 msgstr "Ei voitu lukea ensimmäistä/viimeistä raitaa."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:531
+#: src/cdaudio/cdaudio-ng.cc:541
 #, 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.cc:613
-msgid "Failed to create the cddb connection."
-msgstr "CDDB-yhteyden luonti epäonnistui."
+#: src/cdaudio/cdaudio-ng.cc:624
+msgid "Failed to create the CDDB connection."
+msgstr "CDDB-yhteyden luominen epäonnistui."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:679
+#: src/cdaudio/cdaudio-ng.cc:690
 msgid "Failed to query the CDDB server"
 msgstr "CDDB-palvelimen kysely epäonnistui."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:681
+#: src/cdaudio/cdaudio-ng.cc:692
 #, c-format
 msgid "Failed to query the CDDB server: %s"
 msgstr "CDDB-palvelimen kysely epäonnistui: %s"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:705
+#: src/cdaudio/cdaudio-ng.cc:716
 #, c-format
-msgid "Failed to read the cddb info: %s"
-msgstr "Ei voitu lukea cddb-tietoa: %s"
-
-#: src/cdaudio-ng/cdaudio-ng.cc:765
-msgid "Drive is empty."
-msgstr "Asema on tyhjä."
-
-#: src/cdaudio-ng/cdaudio-ng.cc:767
-msgid "Unsupported disk type."
-msgstr "Levytyyppiä ei tueta."
+msgid "Failed to read the CDDB info: %s"
+msgstr "CDDB-tietojen lukeminen epäonnistui: %s"
 
-#: src/cd-menu-items/cd-menu-items.cc:35
+#: src/cd-menu-items/cd-menu-items.cc:33
 msgid "Audio CD Menu Items"
 msgstr "Ääni CD -valikkonimikkeet"
 
-#: src/cd-menu-items/cd-menu-items.cc:47
-msgid "Play CD"
-msgstr "Toista CD"
-
-#: src/cd-menu-items/cd-menu-items.cc:47
-msgid "Add CD"
-msgstr "Lisää CD"
+#: src/cd-menu-items/cd-menu-items.cc:45
+msgid "Pla_y CD"
+msgstr "Toista _CD"
+
+#: src/cd-menu-items/cd-menu-items.cc:45
+msgid "_Add CD"
+msgstr "Lisää C_D"
 
 #: src/compressor/compressor.cc:45
 msgid "Compression"
@@ -949,6 +840,8 @@
 "Dynamic Range Compression Plugin for Audacious\n"
 "Copyright 2010-2014 John Lindgren"
 msgstr ""
+"Dynamic Range Compression Plugin for Audacious\n"
+"Copyright 2010-2014 John Lindgren"
 
 #: src/compressor/compressor.cc:64
 msgid "Dynamic Range Compressor"
@@ -980,13 +873,20 @@
 
 #: src/console/plugin.cc:36
 msgid "Echo:"
-msgstr ""
+msgstr "Kaiku:"
 
 #: src/console/plugin.cc:39
 msgid "Default song length:"
 msgstr "Kappaleen oletuskesto:"
 
-#: src/console/plugin.cc:42 src/modplug/plugin_main.cc:59
+#: src/console/plugin.cc:41 src/crossfade/crossfade.cc:56
+#: src/crossfade/crossfade.cc:62 src/lirc/lirc.cc:395 src/notify/notify.cc:113
+#: src/sid/xs_config.cc:85 src/sid/xs_config.cc:94 src/sid/xs_config.cc:103
+#: src/vumeter-qt/vumeter_qt.cc:39
+msgid "seconds"
+msgstr "sekuntia"
+
+#: src/console/plugin.cc:42 src/modplug/plugin_main.cc:58
 msgid "Resampling"
 msgstr "Uudelleennäytteistys"
 
@@ -996,7 +896,7 @@
 
 #: src/console/plugin.cc:49
 msgid "SPC"
-msgstr ""
+msgstr "SPC"
 
 #: src/console/plugin.cc:50
 msgid "Ignore length from SPC tags"
@@ -1010,76 +910,93 @@
 msgid "Game Console Music Decoder"
 msgstr "Pelikonsoli-dekooderi"
 
-#: src/coreaudio/coreaudio.cc:50
+#: src/coreaudio/coreaudio.cc:53
 msgid "CoreAudio output"
 msgstr "CoreAudio-lähtö"
 
-#: src/coreaudio/coreaudio.cc:131
+#: src/coreaudio/coreaudio.cc:155
 msgid ""
 "CoreAudio Output Plugin for Audacious\n"
 "Copyright 2014 William Pitcock\n"
+"Copyright 2017,18 René J.V. Bertin\n"
+" (original code and code adapted from\n"
+" Apple examples, (C) Apple 2013)\n"
 "\n"
 "Based on SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
 msgstr ""
+"CoreAudio ulostulon Audacious lisäosa\n"
+"Copyright 2014 William Pitcock\n"
+"Copyright 2017,18 René J.V. Bertin\n"
+" (alkuperäinen koodi on mukautettu\n"
+" Applen esimerkeistä, (C) Apple 2013)\n"
+"\n"
+"Perustuu SDL ulostulon Audacious lisäosaan\n"
+"Copyright 2010 John Lindgren"
 
-#: src/coreaudio/coreaudio.cc:143
+#: src/coreaudio/coreaudio.cc:171
 msgid "Use exclusive mode"
-msgstr ""
+msgstr "Käytä varattua tilaa"
+
+#: src/coreaudio/coreaudio.cc:173
+msgid "Use bit perfect audio (adapt device sampling rate)"
+msgstr "Käytä täydellistä ääntä (mukauta laitteen näytteenottotaajuutta)"
 
-#: src/crossfade/crossfade.cc:44
+#: src/crossfade/crossfade.cc:47
 msgid ""
 "Crossfade Plugin for Audacious\n"
 "Copyright 2010-2014 John Lindgren"
 msgstr ""
+"Crossfade Plugin for Audacious\n"
+"Copyright 2010-2014 John Lindgren"
 
-#: src/crossfade/crossfade.cc:48
+#: src/crossfade/crossfade.cc:51
 msgid "Crossfade"
-msgstr "Ristiinhäivytys"
+msgstr "Ristihäivytys"
 
-#: src/crossfade/crossfade.cc:49
+#: src/crossfade/crossfade.cc:52
 msgid "On automatic song change"
-msgstr ""
+msgstr "Automaattinen kappaleenvaihto"
 
-#: src/crossfade/crossfade.cc:51 src/crossfade/crossfade.cc:57
+#: src/crossfade/crossfade.cc:54 src/crossfade/crossfade.cc:60
 msgid "Overlap:"
 msgstr "Limittäisyys:"
 
-#: src/crossfade/crossfade.cc:55
+#: src/crossfade/crossfade.cc:58
 msgid "On seek or manual song change"
-msgstr ""
+msgstr "Etsittävällä tai manuaalisella kappaleenvaihdolla"
 
-#: src/crossfade/crossfade.cc:61
+#: src/crossfade/crossfade.cc:64
+msgid "No fade in"
+msgstr "Ei häivytystä"
+
+#: src/crossfade/crossfade.cc:66
+msgid "Use S-curve fade"
+msgstr "Käytä S-käyrän häivytystä"
+
+#: src/crossfade/crossfade.cc:68
+msgid "S-curve steepness:"
+msgstr "S-käyrän jyrkkyys:"
+
+#: src/crossfade/crossfade.cc:70
+msgid "(higher is steeper)"
+msgstr "(korkeampi on jyrkempi)"
+
+#: src/crossfade/crossfade.cc:72
 msgid "Tip"
-msgstr ""
+msgstr "Vinkki"
 
-#: src/crossfade/crossfade.cc:62
+#: src/crossfade/crossfade.cc:73
 msgid ""
 "For better crossfading, enable\n"
 "the Silence Removal effect."
 msgstr ""
+"Parantaaksesi ristihäivytystä, ota käyttöön\n"
+"Hiljaisuuden poisto -tehoste."
 
-#: src/crossfade/crossfade.cc:72
+#: src/crossfade/crossfade.cc:83
 msgid "Crossfade"
-msgstr "Ristiinhäivytys"
-
-#: src/crossfade/crossfade.cc:161
-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.cc:168
-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."
+msgstr "Ristihäivytys"
 
 #: src/crystalizer/crystalizer.cc:31
 msgid "Crystalizer"
@@ -1093,60 +1010,61 @@
 msgid "Crystalizer"
 msgstr "Crystalizer"
 
-#: src/cue/cue.cc:37
+#: src/cue/cue.cc:42
 msgid "Cue Sheet Plugin"
-msgstr "Cue Sheet -liitännäinen"
+msgstr "Cue Sheet Plugin"
 
-#: src/delete-files/delete-files.cc:46 src/delete-files/delete-files.cc:146
+#: src/delete-files/delete-files.cc:53 src/delete-files/delete-files.cc:215
+#: src/delete-files/delete-files.cc:230
 msgid "Delete Files"
 msgstr "Poista tiedostot"
 
-#: src/delete-files/delete-files.cc:75
+#: src/delete-files/delete-files.cc:120
+msgid "No files are selected."
+msgstr "Tiedostoja ei ole valittu."
+
+#: src/delete-files/delete-files.cc:125
 #, c-format
-msgid "Error moving %s to trash: %s."
-msgstr "Virhe siirrettäessä kohdetta %s roskakoriin: %s."
+msgid "Do you want to move %s to the trash?"
+msgstr "Haluatko siirtää kohteen %s roskakoriin?"
 
-#: src/delete-files/delete-files.cc:86
+#: src/delete-files/delete-files.cc:126
 #, c-format
-msgid "Error deleting %s: %s."
-msgstr "Virhe poistaessa kohdetta %s: %s."
+msgid "Do you want to permanently delete %s?"
+msgstr "Haluatko varmasti poistaa kohteen %s lopullisesti?"
 
-#: src/delete-files/delete-files.cc:117
+#: src/delete-files/delete-files.cc:133
 #, c-format
-msgid "Error deleting %s: not a local file."
-msgstr "Virhe poistaessa kohdetta %s: ei paikallinen tiedosto."
+msgid "Do you want to move %d files to the trash?"
+msgstr "Haluatko siirtää %d tiedostoa roskakoriin?"
 
 #: src/delete-files/delete-files.cc:134
-msgid "Do you want to move the selected files to the trash?"
-msgstr "Haluatko siirtää valitut tiedostot roskakoriin?"
+#, c-format
+msgid "Do you want to permanently delete %d files?"
+msgstr "Haluatko poistaa pysyvästi %d tiedostoa?"
 
-#: src/delete-files/delete-files.cc:135
-msgid "Move to Trash"
+#: src/delete-files/delete-files.cc:146
+msgid "Move to trash"
 msgstr "Siirrä roskakoriin"
 
-#: src/delete-files/delete-files.cc:140
-msgid "Do you want to permanently delete the selected files?"
-msgstr "Haluatko poistaa seuraavat tiedostot pysyvästi?"
-
-#: src/delete-files/delete-files.cc:141 src/skins/preset-list.cc:411
-#: src/skins/preset-list.cc:427
+#: src/delete-files/delete-files.cc:146
 msgid "Delete"
 msgstr "Poista"
 
-#: src/delete-files/delete-files.cc:145 src/skins/preset-browser.cc:56
-#: src/skins/preset-list.cc:307 src/skins/ui_playlist.cc:221
+#: src/delete-files/delete-files.cc:213 src/delete-files/delete-files.cc:235
+#: src/skins-qt/search-select.cc:102 src/skins/search-select.cc:78
 msgid "Cancel"
 msgstr "Peruuta"
 
-#: src/delete-files/delete-files.cc:166
+#: src/delete-files/delete-files.cc:267
 msgid "Delete Selected Files"
 msgstr "Poista valitut tiedostot"
 
-#: src/delete-files/delete-files.cc:181
+#: src/delete-files/delete-files.cc:287
 msgid "Delete Method"
 msgstr "Poistamistapa"
 
-#: src/delete-files/delete-files.cc:182
+#: src/delete-files/delete-files.cc:288
 msgid "Move to trash instead of deleting immediately"
 msgstr "Siirrä roskakoriin pysyvän poistamisen sijaan"
 
@@ -1157,18 +1075,22 @@
 "Surround echo by Carl van Schaik, 1999\n"
 "Updated for Audacious by William Pitcock and John Lindgren, 2010-2014"
 msgstr ""
+"Kaiku lisäosa\n"
+"Tehnyt Johan Levin, 1999\n"
+"Surround-kaiku Carl van Schaik, 1999\n"
+"Päivitys Audacious:lle William Pitcock ja John Lindgren, 2010-2014"
 
 #: src/echo_plugin/echo.cc:21
 msgid "Echo"
 msgstr "Kaikuefekti"
 
-#: src/echo_plugin/echo.cc:22 src/modplug/plugin_main.cc:73
-#: src/modplug/plugin_main.cc:83
+#: src/echo_plugin/echo.cc:22 src/modplug/plugin_main.cc:72
+#: src/modplug/plugin_main.cc:82
 msgid "Delay:"
 msgstr "Viive:"
 
-#: src/echo_plugin/echo.cc:24 src/modplug/plugin_main.cc:73
-#: src/modplug/plugin_main.cc:83
+#: src/echo_plugin/echo.cc:24 src/modplug/plugin_main.cc:72
+#: src/modplug/plugin_main.cc:82 src/xsf/plugin.cc:445
 msgid "ms"
 msgstr "ms"
 
@@ -1176,7 +1098,7 @@
 msgid "Feedback:"
 msgstr "Feedback:"
 
-#: src/echo_plugin/echo.cc:28 src/modplug/plugin_main.cc:87
+#: src/echo_plugin/echo.cc:28 src/modplug/plugin_main.cc:86
 msgid "Volume:"
 msgstr "Äänenvoimakkuus:"
 
@@ -1184,11 +1106,11 @@
 msgid "Echo"
 msgstr "Kaikuefekti"
 
-#: src/ffaudio/ffaudio-core.cc:41
+#: src/ffaudio/ffaudio-core.cc:50
 msgid "FFmpeg Plugin"
-msgstr "FFmpeg-liitännäinen"
+msgstr "FFmpeg Plugin"
 
-#: src/ffaudio/ffaudio-core.cc:571
+#: src/ffaudio/ffaudio-core.cc:649
 msgid ""
 "Multi-format audio decoding plugin for Audacious using\n"
 "FFmpeg multimedia framework (http://www.ffmpeg.org/)\n"
@@ -1197,256 +1119,329 @@
 "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"
+"Multi-format audio decoding plugin for Audacious using\n"
+"FFmpeg multimedia framework (http://www.ffmpeg.org/)\n"
 "\n"
-"Audacious liitännäisen kehittivät:\n"
+"Audacious lisäosan kehittivät:\n"
 "William Pitcock <nenolod@nenolod.net>\n"
 "Matti Hämäläinen <ccr@tnsp.org>"
 
-#: src/filewriter/filewriter.cc:45
+#: src/filewriter/filewriter.cc:48
 msgid "FileWriter Plugin"
-msgstr "FileWriter-liitännäinen"
+msgstr "FileWriter Plugin"
+
+#: src/filewriter/filewriter.cc:316
+#, c-format
+msgid ""
+"Error opening %s:\n"
+"%s"
+msgstr ""
+"Virhe avattaessa %s:\n"
+"%s"
 
-#: src/filewriter/filewriter.cc:386
+#: src/filewriter/filewriter.cc:358
+msgid ""
+"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 ""
+"Tämä on ilmainen ohjelmisto; voit jakaa sitä edelleen ja/tai muokata\n"
+"GNU General Public License ehtojen mukaisesti, sellaisina kuin\n"
+"Free Software Foundation on ne määrittänyt, joko lisenssin versio 2 tai\n"
+"(sinun valintasi mukaan) minkä tahansa uudempi versio.\n"
+"\n"
+"Tämä ohjelma jaetaan siinä toivossa, että se on hyödyllinen,\n"
+"mutta ILMAN MITÄÄN TAKUUTA; ilman edes oletettua takuuta\n"
+"MYYNTIKELPOISUUTTA tai SOPIVUUTTA TIETTYYN TARKOITUKSEEN.\n"
+"Katso GNU General Public License -ehdot saadaksesi lisätietoja.\n"
+"\n"
+"Sinun olisi pitänyt saada kopio GNU General Public License -tiedostosta\n"
+"tämän ohjelman mukana; Jos et saanut, kirjoita kirje Free Software\n"
+"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
+"USA."
+
+#: src/filewriter/filewriter.cc:385
 msgid "Output file format:"
 msgstr "Tiedostoformaatti:"
 
-#: src/filewriter/filewriter.cc:403
-msgid "Configure"
-msgstr "Muuta asetuksia"
-
-#: src/filewriter/filewriter.cc:413
+#: src/filewriter/filewriter.cc:389
 msgid "Save into original directory"
 msgstr "Tallenna alkuperäiseen kansioon"
 
-#: src/filewriter/filewriter.cc:417
-msgid "Save into custom directory"
-msgstr "Tallenna muuhun kansioon"
-
-#: src/filewriter/filewriter.cc:427
-msgid "Output file folder:"
-msgstr "Tiedoston kohdekansio:"
+#: src/filewriter/filewriter.cc:392
+msgid "Save into custom directory:"
+msgstr "Tallenna omavalintaiseen kansioon:"
 
-#: src/filewriter/filewriter.cc:431
-msgid "Pick a folder"
-msgstr "Valitse kansio"
-
-#: src/filewriter/filewriter.cc:444
+#: src/filewriter/filewriter.cc:400
 msgid "Generate file name from:"
-msgstr ""
-
-#: src/filewriter/filewriter.cc:448
-msgid "Original file tag"
-msgstr ""
+msgstr "Tiedostonimen luomisen peruste:"
 
-#: src/filewriter/filewriter.cc:453
+#: src/filewriter/filewriter.cc:401
 msgid "Original file name"
-msgstr ""
+msgstr "Alkuperäinen tiedostonimi"
 
-#: src/filewriter/filewriter.cc:459
-msgid "Include original file name extension"
-msgstr ""
+#: src/filewriter/filewriter.cc:404
+msgid "Original file name (no suffix)"
+msgstr "Alkuperäinen tiedostonimi (ei jälkiliite)"
 
-#: src/filewriter/filewriter.cc:468
-msgid "Prepend track number to file name"
-msgstr ""
+#: src/filewriter/filewriter.cc:407
+msgid "Original file tag"
+msgstr "Alkuperäinen tiedostotunniste"
 
-#: src/filewriter/filewriter.cc:484
-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.cc:411
+msgid "Prepend track number to file name"
+msgstr "Lisää kappaleen numero tiedostonimeen"
 
-#: src/filewriter/mp3.cc:40 src/filewriter/mp3.cc:717
+#: src/filewriter/filewriter.cc:417 src/filewriter/filewriter.cc:449
 msgid "Auto"
 msgstr "Automaattinen"
 
-#: src/filewriter/mp3.cc:40
+#: src/filewriter/filewriter.cc:418
+msgid "8000 Hz"
+msgstr "8000 Hz"
+
+#: src/filewriter/filewriter.cc:419
+msgid "11025 Hz"
+msgstr "11025 Hz"
+
+#: src/filewriter/filewriter.cc:420
+msgid "12000 Hz"
+msgstr "12000 Hz"
+
+#: src/filewriter/filewriter.cc:421
+msgid "16000 Hz"
+msgstr "16000 Hz"
+
+#: src/filewriter/filewriter.cc:422
+msgid "22050 Hz"
+msgstr "22050 Hz"
+
+#: src/filewriter/filewriter.cc:423
+msgid "24000 Hz"
+msgstr "24000 Hz"
+
+#: src/filewriter/filewriter.cc:424
+msgid "32000 Hz"
+msgstr "32000 Hz"
+
+#: src/filewriter/filewriter.cc:425 src/xsf/plugin.cc:430
+msgid "44100 Hz"
+msgstr "44100 Hz"
+
+#: src/filewriter/filewriter.cc:426 src/xsf/plugin.cc:431
+msgid "48000 Hz"
+msgstr "48000 Hz"
+
+#: src/filewriter/filewriter.cc:430
+msgid "8 kbit/s"
+msgstr "8 kbit/s"
+
+#: src/filewriter/filewriter.cc:431
+msgid "16 kbit/s"
+msgstr "16 kbit/s"
+
+#: src/filewriter/filewriter.cc:432
+msgid "32 kbit/s"
+msgstr "32 kbit/s"
+
+#: src/filewriter/filewriter.cc:433
+msgid "40 kbit/s"
+msgstr "40 kbit/s"
+
+#: src/filewriter/filewriter.cc:434
+msgid "48 kbit/s"
+msgstr "48 kbit/s"
+
+#: src/filewriter/filewriter.cc:435
+msgid "56 kbit/s"
+msgstr "56 kbit/s"
+
+#: src/filewriter/filewriter.cc:436
+msgid "64 kbit/s"
+msgstr "64 kbit/s"
+
+#: src/filewriter/filewriter.cc:437
+msgid "80 kbit/s"
+msgstr "80 kbit/s"
+
+#: src/filewriter/filewriter.cc:438
+msgid "96 kbit/s"
+msgstr "96 kbit/s"
+
+#: src/filewriter/filewriter.cc:439
+msgid "112 kbit/s"
+msgstr "112 kbit/s"
+
+#: src/filewriter/filewriter.cc:440
+msgid "128 kbit/s"
+msgstr "128 kbit/s"
+
+#: src/filewriter/filewriter.cc:441
+msgid "160 kbit/s"
+msgstr "160 kbit/s"
+
+#: src/filewriter/filewriter.cc:442
+msgid "192 kbit/s"
+msgstr "192 kbit/s"
+
+#: src/filewriter/filewriter.cc:443
+msgid "224 kbit/s"
+msgstr "224 kbit/s"
+
+#: src/filewriter/filewriter.cc:444
+msgid "256 kbit/s"
+msgstr "256 kbit/s"
+
+#: src/filewriter/filewriter.cc:445
+msgid "320 kbit/s"
+msgstr "320 kbit/s"
+
+#: src/filewriter/filewriter.cc:450
 msgid "Joint Stereo"
 msgstr "Joint Stereo"
 
-#: src/filewriter/mp3.cc:41 src/modplug/plugin_main.cc:58
-#: src/mpg123/mpg123.cc:248
+#: src/filewriter/filewriter.cc:451 src/modplug/plugin_main.cc:57
+#: src/mpg123/mpg123.cc:259
 msgid "Stereo"
 msgstr "Stereo"
 
-#: src/filewriter/mp3.cc:41 src/modplug/plugin_main.cc:57
-#: src/mpg123/mpg123.cc:248
+#: src/filewriter/filewriter.cc:452 src/modplug/plugin_main.cc:56
+#: src/mpg123/mpg123.cc:260
 msgid "Mono"
 msgstr "Mono"
 
-#: src/filewriter/mp3.cc:657
-msgid "MP3 Configuration"
-msgstr "MP3-asetukset"
-
-#: src/filewriter/mp3.cc:658
-msgid "_OK"
-msgstr "_OK"
+#: src/filewriter/filewriter.cc:456
+msgid "VBR"
+msgstr "VBR"
+
+#: src/filewriter/filewriter.cc:457
+msgid "ABR"
+msgstr "ABR"
 
-#: src/filewriter/mp3.cc:681
-msgid "Algorithm Quality:"
+#: src/filewriter/filewriter.cc:478
+msgid "Algorithm quality:"
 msgstr "Algoritmin laatu:"
 
-#: src/filewriter/mp3.cc:706
-msgid "Output Sample Rate:"
-msgstr ""
-
-#: src/filewriter/mp3.cc:733
-msgid "(Hz)"
-msgstr "(Hz)"
-
-#: src/filewriter/mp3.cc:740
-msgid "Bitrate / Compression Ratio:"
-msgstr ""
-
-#: src/filewriter/mp3.cc:764
-msgid "Bitrate (kbps):"
-msgstr "Bittinopeus (kbps):"
+#: src/filewriter/filewriter.cc:484
+msgid "Bitrate:"
+msgstr "Bittinopeus:"
 
-#: src/filewriter/mp3.cc:796
+#: src/filewriter/filewriter.cc:491
 msgid "Compression ratio:"
 msgstr "Pakkaussuhde:"
 
-#: src/filewriter/mp3.cc:820
-msgid "Audio Mode:"
+#: src/filewriter/filewriter.cc:498
+msgid "Audio mode:"
 msgstr "Äänitila:"
 
-#: src/filewriter/mp3.cc:845
-msgid "Miscellaneous:"
-msgstr ""
-
-#: src/filewriter/mp3.cc:856
+#: src/filewriter/filewriter.cc:501
 msgid "Enforce strict ISO compliance"
-msgstr ""
+msgstr "Pakota tarkka ISO-yhteensopivuus"
 
-#: src/filewriter/mp3.cc:867
+#: src/filewriter/filewriter.cc:503
 msgid "Error protection"
 msgstr "Virhesuojaus"
 
-#: src/filewriter/mp3.cc:879 src/filewriter/vorbis.cc:206
-msgid "Quality"
-msgstr "Laatu"
-
-#: src/filewriter/mp3.cc:888
+#: src/filewriter/filewriter.cc:508
 msgid "Enable VBR/ABR"
 msgstr "Käytä VBR/ABR"
 
-#: src/filewriter/mp3.cc:898
+#: src/filewriter/filewriter.cc:510
 msgid "Type:"
 msgstr "Tyyppi:"
 
-#: src/filewriter/mp3.cc:931
-msgid "VBR Options:"
-msgstr "VBR-asetukset:"
-
-#: src/filewriter/mp3.cc:947
-msgid "Minimum bitrate (kbps):"
-msgstr "Minimi bittinopeus (kbps):"
-
-#: src/filewriter/mp3.cc:973
-msgid "Maximum bitrate (kbps):"
-msgstr "Maksimi bittinopeus (kbps):"
+#: src/filewriter/filewriter.cc:514
+msgid "Minimum bitrate:"
+msgstr "Vähimmäisbittinopeus:"
+
+#: src/filewriter/filewriter.cc:518
+msgid "Maximum bitrate:"
+msgstr "Enimmäisbittinopeus:"
+
+#: src/filewriter/filewriter.cc:522
+msgid "Average bitrate:"
+msgstr "Keskimääräinen bittinopeus:"
 
-#: src/filewriter/mp3.cc:995
-msgid "Strictly enforce minimum bitrate"
-msgstr "Valvo tiukasti minimi bittinopeutta"
-
-#: src/filewriter/mp3.cc:1007
-msgid "ABR Options:"
-msgstr "ABR-asetukset:"
-
-#: src/filewriter/mp3.cc:1017
-msgid "Average bitrate (kbps):"
-msgstr "Bittinopeuden keskiarvo (kbps):"
-
-#: src/filewriter/mp3.cc:1044
+#: src/filewriter/filewriter.cc:526
 msgid "VBR quality level:"
 msgstr "VBR:n laatutaso:"
 
-#: src/filewriter/mp3.cc:1063
-msgid "Omit Xing VBR header"
-msgstr ""
+#: src/filewriter/filewriter.cc:530
+msgid "Strictly enforce minimum bitrate"
+msgstr "Valvo tiukasti minimi bittinopeutta"
 
-#: src/filewriter/mp3.cc:1076
-msgid "VBR/ABR"
-msgstr "VBR/ABR"
+#: src/filewriter/filewriter.cc:533
+msgid "Omit Xing VBR header"
+msgstr "Ohita Xing VBR-otsake"
 
-#: src/filewriter/mp3.cc:1085
-msgid "Frame Parameters:"
-msgstr ""
+#: src/filewriter/filewriter.cc:539
+msgid "Frame Headers"
+msgstr "Kehyksen otsikot"
 
-#: src/filewriter/mp3.cc:1097
+#: src/filewriter/filewriter.cc:540
 msgid "Mark as copyright"
 msgstr "Merkitse tekijänoikeudeksi"
 
-#: src/filewriter/mp3.cc:1108
+#: src/filewriter/filewriter.cc:542
 msgid "Mark as original"
 msgstr "Merkitse alkuperäiseksi"
 
-#: src/filewriter/mp3.cc:1120
-msgid "ID3 Parameters:"
-msgstr "ID3-parametrit:"
+#: src/filewriter/filewriter.cc:544
+msgid "ID3 Tags"
+msgstr "ID3-tunnisteet"
 
-#: src/filewriter/mp3.cc:1131
+#: src/filewriter/filewriter.cc:545
 msgid "Force addition of version 2 tag"
 msgstr "Pakota v2-tagin lisäys"
 
-#: src/filewriter/mp3.cc:1141
+#: src/filewriter/filewriter.cc:547
 msgid "Only add v1 tag"
 msgstr "Lisää vain v1-tagi"
 
-#: src/filewriter/mp3.cc:1148
+#: src/filewriter/filewriter.cc:549
 msgid "Only add v2 tag"
 msgstr "Lisää vain v2-tagi"
 
-#: src/filewriter/mp3.cc:1169
+#: src/filewriter/filewriter.cc:554
+msgid "Quality"
+msgstr "Laatu"
+
+#: src/filewriter/filewriter.cc:555
+msgid "VBR/ABR"
+msgstr "VBR/ABR"
+
+#: src/filewriter/filewriter.cc:556
 msgid "Tags"
 msgstr "Tagit"
 
-#: src/filewriter/vorbis.cc:196
-msgid "Vorbis Encoder Configuration"
-msgstr "Vorbis-enkooderin asetukset"
-
-#: src/filewriter/vorbis.cc:219
-msgid "Quality level (0 - 10):"
-msgstr "Laatutaso (0 - 10):"
+#: src/filewriter/filewriter.cc:566
+msgid "Quality (0-1):"
+msgstr "Laatu (0-1):"
+
+#: src/filewriter/filewriter.cc:573 src/skins-qt/skins_cfg.cc:307
+#: src/skins/skins_cfg.cc:289
+msgid "General"
+msgstr "Yleiset"
 
-#: src/flacng/flacng.h:35
+#: src/flac/flacng.h:36
 msgid "FLAC Decoder"
 msgstr "FLAC-dekooderi"
 
-#: src/flacng/metadata.cc:351 src/wavpack/wavpack.cc:209
+#: src/flac/metadata.cc:296 src/wavpack/wavpack.cc:215
 msgid "lossless"
 msgstr "häviötön"
 
-#: src/flacng/plugin.cc:169
+#: src/flac/plugin.cc:214
 msgid ""
 "Original code by\n"
 "Ralf Ertzinger <ralf@skytale.net>\n"
@@ -1463,22 +1458,22 @@
 "GIO Plugin for Audacious\n"
 "Copyright 2009-2012 John Lindgren"
 msgstr ""
-"GIO-liitännäinen Audacioukselle\n"
+"GIO Plugin for Audacious\n"
 "Copyright 2009-2012 John Lindgren"
 
 #: src/gio/gio.cc:42
 msgid "GIO Plugin"
-msgstr "GIO-liitännäinen"
+msgstr "GIO Plugin"
 
-#: src/gio/gio.cc:153
+#: src/gio/gio.cc:152
 msgid "Read-and-append mode not supported"
-msgstr ""
+msgstr "Luku-/liittämistilaa ei tueta"
 
-#: src/gio/gio.cc:166
+#: src/gio/gio.cc:165
 msgid "Invalid open mode"
-msgstr ""
+msgstr "Virheellinen tila avata"
 
-#: src/gl-spectrum/gl-spectrum.cc:51
+#: src/glspectrum/gl-spectrum.cc:52
 msgid ""
 "OpenGL Spectrum Analyzer for Audacious\n"
 "Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
@@ -1489,611 +1484,754 @@
 "\n"
 "License: GPLv2+"
 msgstr ""
-
-#: src/gl-spectrum/gl-spectrum.cc:62
-msgid "OpenGL Spectrum Analyzer"
-msgstr "OpenGL Spektrianalysaattori"
-
-#: src/gl-spectrum-qt/gl-spectrum.cc:41
-msgid ""
-"OpenGL Spectrum Analyzer for Audacious\n"
-"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
-"Copyright 2014 William Pitcock\n"
+"OpenGL Spectrum Analyzer Audaciousille\n"
+"Copyright 2013 Christophe Budé, John Lindgren ja Carlo Bramini\n"
 "\n"
-"Based on the XMMS plugin:\n"
-"Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson, and "
+"Perustuu XMMS -lisäosaan:\n"
+"Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson ja "
 "4Front Technologies\n"
 "\n"
-"License: GPLv2+"
-msgstr ""
-
-#: src/gl-spectrum-qt/gl-spectrum.cc:53
-msgid "OpenGL Spectrum Analyzer (Qt)"
-msgstr ""
-
-#: src/gnomeshortcuts/gnomeshortcuts.cc:38
-msgid "GNOME Shortcuts"
-msgstr "Gnome-pikanäppäimet"
-
-#: src/gnomeshortcuts/gnomeshortcuts.cc:54
-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 ""
+"Lisenssi: GPLv2+"
 
-#: src/gtkui/columns.cc:35
-msgid "Entry number"
-msgstr "Numero"
+#: src/glspectrum/gl-spectrum.cc:63 src/qtglspectrum/gl-spectrum.cc:53
+msgid "OpenGL Spectrum Analyzer"
+msgstr "Spektri analysaattori OpenGL"
 
-#: src/gtkui/columns.cc:36 src/playlist-manager/playlist-manager.cc:225
-#: src/qtui/playlist_model.cc:123
+#: src/gtkui/columns.cc:36 src/moonstone/playlist_model.cc:38
+#: src/qtui/playlist_model.cc:33
+msgid "Entry Number"
+msgstr "Tapahtuman numero"
+
+#: src/gtkui/columns.cc:37 src/moonstone/playlist_model.cc:38
+#: src/moonstone/playlist_selection.cc:64
+#: src/playlist-manager/playlist-manager.cc:200
+#: src/playlist-manager-qt/playlist-manager-qt.cc:188
+#: src/qtui/playlist_model.cc:33 src/streamtuner/icecast-model.cc:120
+#: src/streamtuner/ihr-model.cc:159 src/streamtuner/shoutcast-model.cc:122
 msgid "Title"
 msgstr "Nimi"
 
-#: src/gtkui/columns.cc:37 src/qtui/playlist_model.cc:125
+#: src/gtkui/columns.cc:38 src/moonstone/playlist_model.cc:39
+#: src/qtui/playlist_model.cc:33
 msgid "Artist"
 msgstr "Esittäjä"
 
-#: src/gtkui/columns.cc:38
+#: src/gtkui/columns.cc:39 src/moonstone/playlist_model.cc:39
+#: src/qtui/playlist_model.cc:33
 msgid "Year"
 msgstr "Vuosi"
 
-#: src/gtkui/columns.cc:39 src/qtui/playlist_model.cc:127
+#: src/gtkui/columns.cc:40 src/moonstone/playlist_model.cc:39
+#: src/qtui/playlist_model.cc:34
 msgid "Album"
-msgstr "Albumi"
+msgstr "Levy"
 
-#: src/gtkui/columns.cc:40
-msgid "Album artist"
-msgstr ""
+#: src/gtkui/columns.cc:41 src/moonstone/playlist_model.cc:40
+#: src/qtui/playlist_model.cc:34
+msgid "Album Artist"
+msgstr "Levyn esittäjä"
 
-#: src/gtkui/columns.cc:41
+#: src/gtkui/columns.cc:42 src/moonstone/playlist_model.cc:40
+#: src/qtui/playlist_model.cc:34
 msgid "Track"
 msgstr "Raita"
 
-#: src/gtkui/columns.cc:42
+#: src/gtkui/columns.cc:43 src/moonstone/playlist_model.cc:40
+#: src/qtui/playlist_model.cc:34 src/streamtuner/icecast-model.cc:123
+#: src/streamtuner/shoutcast-model.cc:125
+#: src/streamtuner/shoutcast-model.cc:236
 msgid "Genre"
 msgstr "Tyylilaji"
 
-#: src/gtkui/columns.cc:43
-msgid "Queue position"
+#: src/gtkui/columns.cc:44 src/moonstone/playlist_model.cc:41
+#: src/qtui/playlist_model.cc:35
+msgid "Queue Position"
 msgstr "Sijainti jonossa"
 
-#: src/gtkui/columns.cc:44
+#: src/gtkui/columns.cc:45 src/moonstone/playlist_model.cc:41
+#: src/qtui/playlist_model.cc:35
 msgid "Length"
 msgstr "Kesto"
 
-#: src/gtkui/columns.cc:45
-msgid "File path"
+#: src/gtkui/columns.cc:46 src/moonstone/playlist_model.cc:41
+#: src/qtui/playlist_model.cc:35
+msgid "File Path"
 msgstr "Tiedostopolku"
 
-#: src/gtkui/columns.cc:47
-msgid "Custom title"
+#: src/gtkui/columns.cc:47 src/moonstone/playlist_model.cc:42
+#: src/qtui/playlist_model.cc:35
+msgid "File Name"
+msgstr "Tiedostonimi"
+
+#: src/gtkui/columns.cc:48 src/moonstone/playlist_model.cc:42
+#: src/qtui/playlist_model.cc:36
+msgid "Custom Title"
 msgstr "Mukautettu nimi"
 
-#: src/gtkui/columns.cc:48
+#: src/gtkui/columns.cc:49 src/moonstone/playlist_model.cc:42
+#: src/qtui/playlist_model.cc:36 src/streamtuner/icecast-model.cc:129
+#: src/streamtuner/shoutcast-model.cc:134
 msgid "Bitrate"
 msgstr "Bittinopeus"
 
-#: src/gtkui/columns.cc:308
+#: src/gtkui/columns.cc:50 src/moonstone/playlist_model.cc:43
+#: src/qtui/playlist_model.cc:36
+msgid "Comment"
+msgstr "Kommentti"
+
+#: src/gtkui/columns.cc:51 src/qtui/playlist_model.cc:36
+msgid "Publisher"
+msgstr "Julkaisija"
+
+#: src/gtkui/columns.cc:52 src/qtui/playlist_model.cc:37
+msgid "Catalog Number"
+msgstr "Kataloginumero"
+
+#: src/gtkui/columns.cc:53 src/moonstone/playlist_model.cc:43
+#: src/qtui/playlist_model.cc:37
+msgid "Disc"
+msgstr "Levy"
+
+#: src/gtkui/columns.cc:325
 msgid "Available columns"
 msgstr "Käytettävissä olevat sarakkeet"
 
-#: src/gtkui/columns.cc:334
+#: src/gtkui/columns.cc:351
 msgid "Displayed columns"
 msgstr "Näytettävät sarakkeet"
 
-#: src/gtkui/layout.cc:72 src/search-tool/search-tool.cc:40
+#: src/gtkui/layout.cc:74 src/search-tool-qt/search-tool-qt.cc:58
+#: src/search-tool/search-tool.cc:49
 msgid "Search Tool"
-msgstr "Etsintätyökalu"
+msgstr "Haku"
 
-#: src/gtkui/layout.cc:167
+#: src/gtkui/layout.cc:170
 msgid "Dock at Left"
 msgstr "Telakoi vasemmalle"
 
-#: src/gtkui/layout.cc:167
+#: src/gtkui/layout.cc:170
 msgid "Dock at Right"
 msgstr "Telakoi oikealle"
 
-#: src/gtkui/layout.cc:168
+#: src/gtkui/layout.cc:171
 msgid "Dock at Top"
 msgstr "Telakoi ylhäälle"
 
-#: src/gtkui/layout.cc:168
+#: src/gtkui/layout.cc:171
 msgid "Dock at Bottom"
 msgstr "Telakoi alhaalle"
 
-#: src/gtkui/layout.cc:168
+#: src/gtkui/layout.cc:171
 msgid "Undock"
 msgstr "Poista telakointi"
 
-#: src/gtkui/layout.cc:168 src/ladspa/plugin.cc:531
+#: src/gtkui/layout.cc:171 src/ladspa/plugin.cc:540
 msgid "Disable"
 msgstr "Poista käytöstä"
 
-#: src/gtkui/menus.cc:126 src/qtui/main_window_actions.cc:93
-#: src/statusicon/statusicon.cc:276
+#: src/gtkui/menus.cc:79 src/qtui/menus.cc:107
+#: src/statusicon-qt/statusicon.cc:115 src/statusicon/statusicon.cc:286
 msgid "_Open Files ..."
 msgstr "Avaa tied_ostot..."
 
-#: src/gtkui/menus.cc:127
+#: src/gtkui/menus.cc:80 src/qtui/menus.cc:111
 msgid "Open _URL ..."
 msgstr "Avaa _URL..."
 
-#: src/gtkui/menus.cc:128 src/qtui/main_window_actions.cc:95
+#: src/gtkui/menus.cc:81 src/qtui/menus.cc:113
 msgid "_Add Files ..."
 msgstr "_Lisää tiedostoja..."
 
-#: src/gtkui/menus.cc:129
+#: src/gtkui/menus.cc:82 src/qtui/menus.cc:118
 msgid "Add U_RL ..."
 msgstr "Lisää U_RL..."
 
-#: src/gtkui/menus.cc:131
+#: src/gtkui/menus.cc:84 src/qtui/menus.cc:120
 msgid "Search _Library"
 msgstr "_Etsi kirjastosta"
 
-#: src/gtkui/menus.cc:133 src/qtui/main_window_actions.cc:98
+#: src/gtkui/menus.cc:86 src/qtui/menus.cc:123
 msgid "A_bout ..."
 msgstr "_Tietoja..."
 
-#: src/gtkui/menus.cc:134 src/qtui/main_window_actions.cc:99
+#: src/gtkui/menus.cc:87 src/qtui/menus.cc:125
 msgid "_Settings ..."
 msgstr "_Asetukset..."
 
-#: src/gtkui/menus.cc:135 src/qtui/main_window_actions.cc:103
-#: src/statusicon/statusicon.cc:284
+#: src/gtkui/menus.cc:88 src/qtui/menus.cc:131
+#: src/statusicon-qt/statusicon.cc:117 src/statusicon/statusicon.cc:288
 msgid "_Quit"
 msgstr "_Sulje"
 
-#: src/gtkui/menus.cc:139 src/gtkui/menus.cc:262
-#: src/qtui/main_window_actions.cc:107 src/search-tool/search-tool.cc:641
-#: src/statusicon/statusicon.cc:278
+#: src/gtkui/menus.cc:92 src/gtkui/menus.cc:226
+#: src/moonstone/playlist_tabs.cc:306 src/qtui/menus.cc:135
+#: src/qtui/playlist_tabs.cc:331 src/search-tool-qt/search-tool-qt.cc:499
+#: src/search-tool/search-tool.cc:339 src/statusicon-qt/statusicon.cc:109
+#: src/statusicon/statusicon.cc:280
 msgid "_Play"
 msgstr "_Toista"
 
-#: src/gtkui/menus.cc:140 src/qtui/main_window_actions.cc:108
-#: src/statusicon/statusicon.cc:279
+#: src/gtkui/menus.cc:93 src/qtui/menus.cc:137
+#: src/statusicon-qt/statusicon.cc:110 src/statusicon/statusicon.cc:281
 msgid "Paus_e"
 msgstr "_Keskeytä"
 
-#: src/gtkui/menus.cc:141 src/qtui/main_window_actions.cc:109
-#: src/statusicon/statusicon.cc:280
+#: src/gtkui/menus.cc:94 src/qtui/menus.cc:139
+#: src/statusicon-qt/statusicon.cc:111 src/statusicon/statusicon.cc:282
 msgid "_Stop"
 msgstr "_Pysäytä"
 
-#: src/gtkui/menus.cc:142 src/qtui/main_window_actions.cc:110
-#: src/statusicon/statusicon.cc:277
+#: src/gtkui/menus.cc:95 src/qtui/menus.cc:141
+#: src/statusicon-qt/statusicon.cc:112 src/statusicon/statusicon.cc:283
 msgid "Pre_vious"
 msgstr "_Edellinen"
 
-#: src/gtkui/menus.cc:143 src/qtui/main_window_actions.cc:111
-#: src/statusicon/statusicon.cc:281
+#: src/gtkui/menus.cc:96 src/qtui/menus.cc:143
+#: src/statusicon-qt/statusicon.cc:113 src/statusicon/statusicon.cc:284
 msgid "_Next"
 msgstr "_Seuraava"
 
-#: src/gtkui/menus.cc:145 src/qtui/main_window_actions.cc:113
+#: src/gtkui/menus.cc:97 src/qtui/menus.cc:145 src/skins/menus.cc:114
+#: src/skins-qt/menus.cc:105
+msgid "Previous Album"
+msgstr "Edellinen levy"
+
+#: src/gtkui/menus.cc:98 src/qtui/menus.cc:146 src/skins/menus.cc:115
+#: src/skins-qt/menus.cc:106
+msgid "Next Album"
+msgstr "Seuraava levy"
+
+#: src/gtkui/menus.cc:100 src/qtui/menus.cc:148
 msgid "_Repeat"
 msgstr "_Kertaus"
 
-#: src/gtkui/menus.cc:146 src/qtui/main_window_actions.cc:114
+#: src/gtkui/menus.cc:101 src/qtui/menus.cc:150
 msgid "S_huffle"
 msgstr "S_ekoitus"
 
-#: src/gtkui/menus.cc:147 src/qtui/main_window_actions.cc:115
+#: src/gtkui/menus.cc:102 src/qtui/menus.cc:152
+msgid "Shuffle by Albu_m"
+msgstr "Sekoita Albu_min mukaan"
+
+#: src/gtkui/menus.cc:103 src/qtui/menus.cc:155
 msgid "N_o Playlist Advance"
 msgstr "Älä _etene soittolistalla"
 
-#: src/gtkui/menus.cc:148 src/qtui/main_window_actions.cc:116
+#: src/gtkui/menus.cc:104 src/qtui/menus.cc:157
 msgid "Stop A_fter This Song"
 msgstr "_Pysäytä tämän kappaleen jälkeen"
 
-#: src/gtkui/menus.cc:150 src/gtkui/menus.cc:247
-#: src/qtui/main_window_actions.cc:118
+#: src/gtkui/menus.cc:106 src/gtkui/menus.cc:210 src/qtui/menus.cc:162
+#: src/qtui/menus.cc:294
 msgid "Song _Info ..."
 msgstr "K_appaleen tiedot..."
 
-#: src/gtkui/menus.cc:151
+#: src/gtkui/menus.cc:107
 msgid "Jump to _Time ..."
 msgstr "Hyppää _aikaan..."
 
-#: src/gtkui/menus.cc:152
+#: src/gtkui/menus.cc:108
 msgid "_Jump to Song ..."
 msgstr "_Hyppää kappaleeseen..."
 
-#: src/gtkui/menus.cc:154
+#: src/gtkui/menus.cc:110 src/qtui/menus.cc:165
 msgid "Set Repeat Point _A"
 msgstr "Aseta kertauksen alkupiste A"
 
-#: src/gtkui/menus.cc:155
+#: src/gtkui/menus.cc:111 src/qtui/menus.cc:167
 msgid "Set Repeat Point _B"
 msgstr "Aseta kertauksen loppupiste B"
 
-#: src/gtkui/menus.cc:156
+#: src/gtkui/menus.cc:112 src/qtui/menus.cc:169
 msgid "_Clear Repeat Points"
 msgstr "_Tyhjennä kertauspisteet"
 
-#: src/gtkui/menus.cc:160 src/gtkui/menus.cc:167 src/gtkui/menus.cc:183
-#: src/qtui/main_window_actions.cc:122 src/qtui/main_window_actions.cc:129
-#: src/qtui/main_window_actions.cc:145
+#: src/gtkui/menus.cc:116 src/gtkui/menus.cc:123 src/gtkui/menus.cc:141
+#: src/qtui/menus.cc:173 src/qtui/menus.cc:180 src/qtui/menus.cc:198
 msgid "By _Title"
 msgstr "_Nimen mukaan"
 
-#: src/gtkui/menus.cc:161 src/qtui/main_window_actions.cc:123
+#: src/gtkui/menus.cc:117 src/qtui/menus.cc:174
 msgid "By _File Name"
-msgstr ""
+msgstr "_Tiedostonimen mukaan"
 
-#: src/gtkui/menus.cc:162 src/qtui/main_window_actions.cc:124
+#: src/gtkui/menus.cc:118 src/qtui/menus.cc:175
 msgid "By File _Path"
 msgstr "Tiedosto_polun mukaan"
 
-#: src/gtkui/menus.cc:166 src/gtkui/menus.cc:182
-#: src/qtui/main_window_actions.cc:128 src/qtui/main_window_actions.cc:144
+#: src/gtkui/menus.cc:122 src/gtkui/menus.cc:140 src/qtui/menus.cc:179
+#: src/qtui/menus.cc:197
 msgid "By Track _Number"
 msgstr "Ka_ppalenumeron mukaan"
 
-#: src/gtkui/menus.cc:168 src/gtkui/menus.cc:184
-#: src/qtui/main_window_actions.cc:130 src/qtui/main_window_actions.cc:146
+#: src/gtkui/menus.cc:124 src/gtkui/menus.cc:142 src/qtui/menus.cc:181
+#: src/qtui/menus.cc:199
 msgid "By _Artist"
 msgstr "_Esittäjän mukaan"
 
-#: src/gtkui/menus.cc:169 src/gtkui/menus.cc:185
-#: src/qtui/main_window_actions.cc:131 src/qtui/main_window_actions.cc:147
+#: src/gtkui/menus.cc:125 src/gtkui/menus.cc:143 src/qtui/menus.cc:182
+#: src/qtui/menus.cc:200
 msgid "By Al_bum"
 msgstr "Al_bumin mukaan"
 
-#: src/gtkui/menus.cc:170 src/gtkui/menus.cc:186
-#: src/qtui/main_window_actions.cc:132 src/qtui/main_window_actions.cc:148
+#: src/gtkui/menus.cc:126 src/gtkui/menus.cc:144 src/qtui/menus.cc:183
+#: src/qtui/menus.cc:201
 msgid "By Albu_m Artist"
-msgstr ""
+msgstr "Albu_min Artistin"
 
-#: src/gtkui/menus.cc:171 src/gtkui/menus.cc:187
-#: src/qtui/main_window_actions.cc:133 src/qtui/main_window_actions.cc:149
+#: src/gtkui/menus.cc:127 src/gtkui/menus.cc:145 src/qtui/menus.cc:184
+#: src/qtui/menus.cc:202
 msgid "By Release _Date"
 msgstr "_Julkaisupäivämäärän mukaan"
 
-#: src/gtkui/menus.cc:172 src/gtkui/menus.cc:188
-#: src/qtui/main_window_actions.cc:134 src/qtui/main_window_actions.cc:150
+#: src/gtkui/menus.cc:128 src/gtkui/menus.cc:146 src/qtui/menus.cc:185
+#: src/qtui/menus.cc:203
 msgid "By _Genre"
-msgstr ""
+msgstr "T_yylilajon mukaan"
 
-#: src/gtkui/menus.cc:173 src/gtkui/menus.cc:189
-#: src/qtui/main_window_actions.cc:135 src/qtui/main_window_actions.cc:151
+#: src/gtkui/menus.cc:129 src/gtkui/menus.cc:147 src/qtui/menus.cc:186
+#: src/qtui/menus.cc:204
 msgid "By _Length"
 msgstr "_Keston mukaan"
 
-#: src/gtkui/menus.cc:174 src/gtkui/menus.cc:190
-#: src/qtui/main_window_actions.cc:136 src/qtui/main_window_actions.cc:152
+#: src/gtkui/menus.cc:130 src/gtkui/menus.cc:148 src/qtui/menus.cc:187
+#: src/qtui/menus.cc:205
 msgid "By _File Path"
 msgstr "_Tiedostopolun mukaan"
 
-#: src/gtkui/menus.cc:175 src/gtkui/menus.cc:191
-#: src/qtui/main_window_actions.cc:137 src/qtui/main_window_actions.cc:153
+#: src/gtkui/menus.cc:131 src/gtkui/menus.cc:149 src/qtui/menus.cc:188
+#: src/qtui/menus.cc:206
 msgid "By _Custom Title"
 msgstr "_Mukautetun nimen mukaan"
 
-#: src/gtkui/menus.cc:177 src/gtkui/menus.cc:193
-#: src/qtui/main_window_actions.cc:139 src/qtui/main_window_actions.cc:155
+#: src/gtkui/menus.cc:132 src/gtkui/menus.cc:150 src/qtui/menus.cc:189
+#: src/qtui/menus.cc:207
+msgid "By C_omment"
+msgstr "_Kommentin mukaan"
+
+#: src/gtkui/menus.cc:133 src/gtkui/menus.cc:151 src/qtui/menus.cc:190
+#: src/qtui/menus.cc:208
+msgid "By D_isc Number"
+msgstr "_Levynumeron mukaan"
+
+#: src/gtkui/menus.cc:135 src/gtkui/menus.cc:153 src/qtui/menus.cc:192
+#: src/qtui/menus.cc:210
 msgid "R_everse Order"
 msgstr "_Käänteinen järjestys"
 
-#: src/gtkui/menus.cc:178 src/gtkui/menus.cc:194
-#: src/qtui/main_window_actions.cc:140 src/qtui/main_window_actions.cc:156
+#: src/gtkui/menus.cc:136 src/gtkui/menus.cc:154 src/qtui/menus.cc:194
+#: src/qtui/menus.cc:212
 msgid "_Random Order"
 msgstr "_Satunnainen järjestys"
 
-#: src/gtkui/menus.cc:198 src/qtui/main_window_actions.cc:160
+#: src/gtkui/menus.cc:158 src/qtui/menus.cc:216
 msgid "_Play/Resume"
 msgstr "_Toista/jatka"
 
-#: src/gtkui/menus.cc:199 src/gtkui/menus.cc:251
-#: src/qtui/main_window_actions.cc:161
+#: src/gtkui/menus.cc:159 src/qtui/menus.cc:218
 msgid "_Refresh"
 msgstr "_Päivitä"
 
-#: src/gtkui/menus.cc:201 src/qtui/main_window_actions.cc:163
+#: src/gtkui/menus.cc:161 src/qtui/menus.cc:222
 msgid "_Sort"
 msgstr "_Lajittele"
 
-#: src/gtkui/menus.cc:202 src/qtui/main_window_actions.cc:164
+#: src/gtkui/menus.cc:162 src/qtui/menus.cc:223
 msgid "Sort Se_lected"
 msgstr "Järjestä _valitut"
 
-#: src/gtkui/menus.cc:203 src/qtui/main_window_actions.cc:165
+#: src/gtkui/menus.cc:163 src/qtui/menus.cc:225
 msgid "Remove _Duplicates"
 msgstr "Poista _kopiot"
 
-#: src/gtkui/menus.cc:204 src/qtui/main_window_actions.cc:166
+#: src/gtkui/menus.cc:164 src/qtui/menus.cc:226
 msgid "Remove _Unavailable Files"
 msgstr "Poista _ei saatavilla olevat tiedostot"
 
-#: src/gtkui/menus.cc:206 src/playlist-manager/playlist-manager.cc:244
-#: src/qtui/main_window_actions.cc:168
+#: src/gtkui/menus.cc:166 src/playlist-manager/playlist-manager.cc:219
+#: src/playlist-manager-qt/playlist-manager-qt.cc:348 src/qtui/menus.cc:229
 msgid "_New"
 msgstr "_Uusi"
 
-#: src/gtkui/menus.cc:207
+#: src/gtkui/menus.cc:167 src/qtui/menus.cc:230
 msgid "Ren_ame ..."
 msgstr "Nimeä _uudelleen..."
 
-#: src/gtkui/menus.cc:208 src/gtkui/menus.cc:264
-#: src/qtui/main_window_actions.cc:170
+#: src/gtkui/menus.cc:168 src/gtkui/menus.cc:228
+#: src/moonstone/playlist_tabs.cc:311 src/qtui/menus.cc:231
+#: src/qtui/playlist_tabs.cc:336
 msgid "Remo_ve"
 msgstr "_Poista"
 
-#: src/gtkui/menus.cc:210
+#: src/gtkui/menus.cc:170 src/qtui/menus.cc:233
 msgid "_Import ..."
 msgstr "_Tuo..."
 
-#: src/gtkui/menus.cc:211
+#: src/gtkui/menus.cc:171 src/qtui/menus.cc:234
 msgid "_Export ..."
 msgstr "_Vie..."
 
-#: src/gtkui/menus.cc:213
+#: src/gtkui/menus.cc:173 src/qtui/menus.cc:237
 msgid "Playlist _Manager ..."
 msgstr "Soittolistojen _hallinta..."
 
-#: src/gtkui/menus.cc:214 src/qtui/main_window_actions.cc:176
+#: src/gtkui/menus.cc:174 src/qtui/menus.cc:239
 msgid "_Queue Manager ..."
 msgstr "_Jonomanageri..."
 
-#: src/gtkui/menus.cc:218 src/qtui/main_window_actions.cc:180
+#: src/gtkui/menus.cc:178 src/qtui/menus.cc:243
 msgid "Volume _Up"
 msgstr "_Nosta äänenvoimakkuutta"
 
-#: src/gtkui/menus.cc:219 src/qtui/main_window_actions.cc:181
+#: src/gtkui/menus.cc:179 src/qtui/menus.cc:245
 msgid "Volume _Down"
 msgstr "_Laske äänenvoimakkuutta"
 
-#: src/gtkui/menus.cc:221 src/qtui/main_window_actions.cc:183
-msgid "_Equalizer"
-msgstr "_Taajuuskorjain"
+#: src/gtkui/menus.cc:181 src/qtui/menus.cc:249
+msgid "_Equalizer ..."
+msgstr "_Taajuuskorjain..."
 
-#: src/gtkui/menus.cc:223 src/qtui/main_window_actions.cc:185
+#: src/gtkui/menus.cc:182 src/qtui/menus.cc:251
 msgid "E_ffects ..."
 msgstr "_Tehosteet..."
 
-#: src/gtkui/menus.cc:227
+#: src/gtkui/menus.cc:184
+msgid "_Record Stream"
+msgstr "_Tallenna suoratoisto"
+
+#: src/gtkui/menus.cc:185
+msgid "Audio _Settings ..."
+msgstr "_Ääniasetukset..."
+
+#: src/gtkui/menus.cc:189 src/qtui/menus.cc:260
 msgid "Show _Menu Bar"
 msgstr "Näytä _valikkopalkki"
 
-#: src/gtkui/menus.cc:228
+#: src/gtkui/menus.cc:190 src/qtui/menus.cc:262
 msgid "Show I_nfo Bar"
 msgstr "Näytä _tietopalkki"
 
-#: src/gtkui/menus.cc:229
+#: src/gtkui/menus.cc:191 src/qtui/menus.cc:264
+msgid "Show Info Bar _Album Art"
+msgstr "Näytä tietopalkki _Levyn kansi"
+
+#: src/gtkui/menus.cc:192 src/qtui/menus.cc:266
 msgid "Show Info Bar Vis_ualization"
 msgstr "Näytä tietopalkin vis_ualisaatio"
 
-#: src/gtkui/menus.cc:230
+#: src/gtkui/menus.cc:193 src/qtui/menus.cc:268
 msgid "Show _Status Bar"
 msgstr "Näytä tila_rivi"
 
-#: src/gtkui/menus.cc:232
+#: src/gtkui/menus.cc:195 src/qtui/menus.cc:272
 msgid "Show _Remaining Time"
 msgstr "Näytä _jäljellä oleva aika"
 
-#: src/gtkui/menus.cc:234
+#: src/gtkui/menus.cc:197 src/qtui/menus.cc:276 src/skins/menus.cc:157
+#: src/skins-qt/menus.cc:152
 msgid "_Visualizations ..."
 msgstr "_Visualisoinnit..."
 
-#: src/gtkui/menus.cc:238 src/qtui/main_window_actions.cc:189
+#: src/gtkui/menus.cc:201 src/qtui/menus.cc:280
 msgid "_File"
 msgstr "_Tiedosto"
 
-#: src/gtkui/menus.cc:239 src/qtui/main_window_actions.cc:190
+#: src/gtkui/menus.cc:202 src/qtui/menus.cc:281
 msgid "_Playback"
 msgstr "T_oisto"
 
-#: src/gtkui/menus.cc:240 src/qtui/main_window_actions.cc:191
+#: src/gtkui/menus.cc:203 src/qtui/menus.cc:282
 msgid "P_laylist"
 msgstr "_Soittolista"
 
-#: src/gtkui/menus.cc:241 src/gtkui/menus.cc:258
-#: src/qtui/main_window_actions.cc:192
+#: src/gtkui/menus.cc:204 src/gtkui/menus.cc:222 src/qtui/menus.cc:283
+#: src/qtui/menus.cc:312
 msgid "_Services"
 msgstr "_Palvelut"
 
-#: src/gtkui/menus.cc:242 src/qtui/main_window_actions.cc:193
+#: src/gtkui/menus.cc:205 src/qtui/menus.cc:284
 msgid "_Output"
 msgstr "_Ääni"
 
-#: src/gtkui/menus.cc:243
+#: src/gtkui/menus.cc:206 src/qtui/menus.cc:285
 msgid "_View"
 msgstr "_Näkymä"
 
-#: src/gtkui/menus.cc:248
+#: src/gtkui/menus.cc:211 src/qtui/menus.cc:296
 msgid "_Queue/Unqueue"
 msgstr "_Lisää jonoon/Poista jonosta"
 
-#: src/gtkui/menus.cc:250
+#: src/gtkui/menus.cc:213 src/qtui/menus.cc:299
 msgid "_Open Containing Folder"
 msgstr "_Avaa sisältävä kansio"
 
-#: src/gtkui/menus.cc:253
+#: src/gtkui/menus.cc:214 src/qtui/menus.cc:301
+msgid "_Refresh Selected"
+msgstr "_Päivitä valittu"
+
+#: src/gtkui/menus.cc:216 src/qtui/menus.cc:304
 msgid "Cu_t"
 msgstr "L_eikkaa"
 
-#: src/gtkui/menus.cc:254
+#: src/gtkui/menus.cc:217 src/qtui/menus.cc:305
 msgid "_Copy"
 msgstr "_Kopioi"
 
-#: src/gtkui/menus.cc:255
+#: src/gtkui/menus.cc:218 src/qtui/menus.cc:306
 msgid "_Paste"
 msgstr "_Liitä"
 
-#: src/gtkui/menus.cc:256
+#: src/gtkui/menus.cc:219 src/qtui/menus.cc:307
+msgid "Paste at _End"
+msgstr "Liitä _loppuun"
+
+#: src/gtkui/menus.cc:220 src/qtui/menus.cc:309
 msgid "Select _All"
 msgstr "Valitse _kaikki"
 
-#: src/gtkui/menus.cc:263
+#: src/gtkui/menus.cc:227 src/moonstone/playlist_tabs.cc:309
+#: src/qtui/playlist_tabs.cc:334
 msgid "_Rename ..."
 msgstr "_Nimeä uudelleen..."
 
-#: src/gtkui/settings.cc:35
+#: src/gtkui/settings.cc:35 src/qtui/settings.cc:59
+msgid "Always"
+msgstr "Aina"
+
+#: src/gtkui/settings.cc:36 src/qtui/settings.cc:60
+msgid "Auto-hide"
+msgstr "Piilota automaattisesti"
+
+#: src/gtkui/settings.cc:37 src/qtui/settings.cc:61
+msgid "Never"
+msgstr "Ei koskaan"
+
+#: src/gtkui/settings.cc:41 src/qtui/settings.cc:64
 msgid "Playlist Tabs"
 msgstr "Soittolistan välilehdet"
 
-#: src/gtkui/settings.cc:36
-msgid "Always show tabs"
-msgstr "Näytä aina välilehdet"
+#: src/gtkui/settings.cc:42 src/qtui/settings.cc:65
+msgid "Show playlist tabs:"
+msgstr "Näytä soittolistan välilehdet:"
 
-#: src/gtkui/settings.cc:38
+#: src/gtkui/settings.cc:45 src/qtui/settings.cc:69
 msgid "Show entry counts"
 msgstr "Näytä esiintymäkerrat"
 
-#: src/gtkui/settings.cc:40
+#: src/gtkui/settings.cc:47 src/qtui/settings.cc:72
 msgid "Show close buttons"
 msgstr "Näytä sulkemispainikkeet"
 
-#: src/gtkui/settings.cc:42
+#: src/gtkui/settings.cc:49 src/qtui/settings.cc:75
 msgid "Playlist Columns"
 msgstr "Soittolistan sarakkeet"
 
-#: src/gtkui/settings.cc:44
+#: src/gtkui/settings.cc:51 src/qtui/settings.cc:77
 msgid "Show column headers"
 msgstr "Näytä sarakkeiden otsakkeet"
 
-#: src/gtkui/settings.cc:46 src/modplug/plugin_main.cc:106
-#: src/skins/skins_cfg.cc:263
-msgid "Miscellaneous"
-msgstr "Sekalaiset"
-
-#: src/gtkui/settings.cc:47
-msgid "Arrow keys seek by:"
-msgstr "Nuolinäppäimet siirtävät:"
+#: src/gtkui/settings.cc:53 src/qtui/settings.cc:82
+msgid "Make column headers clickable for sorting"
+msgstr "Tee sarakeotsikot klikattaviksi lajittelua varten"
+
+#: src/gtkui/settings.cc:56
+msgid "Use symbolic icons in toolbar"
+msgstr "Käytä symbolisia kuvakkeita työkalupalkissa"
 
-#: src/gtkui/settings.cc:50
+#: src/gtkui/settings.cc:58 src/qtui/settings.cc:86
 msgid "Scroll on song change"
 msgstr "Vieritä kappaleen vaihtuessa"
 
-#: src/gtkui/ui_gtk.cc:71
+#: src/gtkui/ui_gtk.cc:82
 msgid "GTK Interface"
 msgstr "GTK-käyttöliittymä"
 
-#: src/gtkui/ui_gtk.cc:222 src/skins/ui_main.cc:232
+#: src/gtkui/ui_gtk.cc:219 src/skins/main.cc:228 src/skins-qt/main.cc:231
 #, c-format
 msgid "%s - Audacious"
 msgstr "%s - Audacious"
 
-#: src/gtkui/ui_gtk.cc:225 src/qtui/main_window.cc:186
+#: src/gtkui/ui_gtk.cc:221 src/moonstone/main_window.cc:184
+#: src/qtui/main_window.cc:385
 msgid "Buffering ..."
 msgstr "Puskuroidaan..."
 
-#: src/gtkui/ui_gtk.cc:228 src/skins/ui_main.cc:234 src/skins/ui_main.cc:1164
+#: src/gtkui/ui_gtk.cc:224 src/pipewire/pipewire.cc:402 src/skins/main.cc:230
+#: src/skins-qt/main.cc:233
 msgid "Audacious"
 msgstr "Audacious"
 
-#: src/gtkui/ui_statusbar.cc:63 src/qtui/status_bar.cc:67
+#: src/gtkui/ui_gtk.cc:487 src/gtkui/ui_gtk.cc:518 src/gtkui/ui_gtk.cc:882
+#: src/hotkey/gui.cc:72 src/moonstone/main_window.cc:67
+#: src/moonstone/main_window.cc:145 src/moonstone/main_window.cc:146
+#: src/notify/osd.cc:85 src/qthotkey/gui.cc:67 src/qtui/main_window.cc:154
+#: src/qtui/main_window.cc:347 src/qtui/main_window.cc:348
+#: src/skins/menus.cc:109 src/skins-qt/menus.cc:100
+msgid "Play"
+msgstr "Toista"
+
+#: src/gtkui/ui_gtk.cc:487 src/moonstone/main_window.cc:151
+#: src/moonstone/main_window.cc:152 src/notify/osd.cc:82
+#: src/qtui/main_window.cc:353 src/qtui/main_window.cc:354
+#: src/skins/menus.cc:110 src/skins-qt/menus.cc:101
+msgid "Pause"
+msgstr "Keskeytä"
+
+#: src/gtkui/ui_gtk.cc:868 src/moonstone/main_window.cc:57
+#: src/qtui/main_window.cc:145 src/skins/menus.cc:86 src/skins-qt/menus.cc:77
+msgid "Search Library"
+msgstr "Etsi kirjastosta"
+
+#: src/gtkui/ui_gtk.cc:875 src/moonstone/main_window.cc:60
+#: src/qtui/main_window.cc:147
+msgid "Open Files"
+msgstr "Avaa tiedostoja"
+
+#: src/gtkui/ui_gtk.cc:876 src/moonstone/main_window.cc:62
+#: src/qtui/main_window.cc:149
+msgid "Add Files"
+msgstr "Lisää tiedostoja"
+
+#: src/gtkui/ui_gtk.cc:881 src/moonstone/main_window.cc:65
+#: src/qtui/main_window.cc:152 src/skins/menus.cc:112 src/skins-qt/menus.cc:103
+msgid "Previous"
+msgstr "Edellinen"
+
+#: src/gtkui/ui_gtk.cc:883 src/hotkey/gui.cc:74 src/moonstone/main_window.cc:69
+#: src/qthotkey/gui.cc:69 src/qtui/main_window.cc:156 src/skins/menus.cc:111
+#: src/skins-qt/menus.cc:102
+msgid "Stop"
+msgstr "Pysäytä"
+
+#: src/gtkui/ui_gtk.cc:884 src/moonstone/main_window.cc:76 src/notify/osd.cc:89
+#: src/qtui/main_window.cc:163 src/skins/menus.cc:113 src/skins-qt/menus.cc:104
+msgid "Next"
+msgstr "Seuraava"
+
+#: src/gtkui/ui_gtk.cc:886 src/moonstone/main_window.cc:79
+#: src/qtui/main_window.cc:166 src/qtui/menus.cc:254 src/skins/menus.cc:79
+#: src/skins-qt/menus.cc:69
+msgid "Record Stream"
+msgstr "Tallenna suoratoisto"
+
+#: src/gtkui/ui_gtk.cc:919 src/moonstone/main_window.cc:86
+#: src/qtui/main_window.cc:173 src/skins/menus.cc:103 src/skins-qt/menus.cc:94
+msgid "Repeat"
+msgstr "Kertaus"
+
+#: src/gtkui/ui_gtk.cc:922 src/moonstone/main_window.cc:89
+#: src/qtui/main_window.cc:176 src/skins/menus.cc:104 src/skins-qt/menus.cc:95
+msgid "Shuffle"
+msgstr "Sekoitus"
+
+#: src/gtkui/ui_gtk.cc:1114 src/qtui/main_window.cc:123
+msgid "Menu"
+msgstr "Valikko"
+
+#: src/gtkui/ui_statusbar.cc:64 src/qtui/status_bar.cc:155
 msgid "mono"
 msgstr "mono"
 
-#: src/gtkui/ui_statusbar.cc:65 src/qtui/status_bar.cc:69
+#: src/gtkui/ui_statusbar.cc:66 src/qtui/status_bar.cc:157
 msgid "stereo"
 msgstr "stereo"
 
-#: src/gtkui/ui_statusbar.cc:67 src/qtui/status_bar.cc:71
+#: src/gtkui/ui_statusbar.cc:68 src/qtui/status_bar.cc:160
 #, c-format
 msgid "%d channel"
 msgid_plural "%d channels"
 msgstr0 "%d kanava"
 msgstr1 "%d kanavaa"
 
-#: src/gtkui/ui_statusbar.cc:81 src/qtui/status_bar.cc:85
+#: src/gtkui/ui_statusbar.cc:76 src/qtui/status_bar.cc:168
+#, c-format
+msgid "%d kHz"
+msgstr "%d kHz"
+
+#: src/gtkui/ui_statusbar.cc:82 src/qtui/status_bar.cc:174
 #, c-format
-msgid "%d kbps"
-msgstr "%d kbps"
+msgid "%d kbit/s"
+msgstr "%d kbit/s"
 
-#: src/gtkui/ui_statusbar.cc:107 src/skins/ui_main_evlisteners.cc:103
+#: src/gtkui/ui_statusbar.cc:108 src/skins/main.cc:478 src/skins-qt/main.cc:461
 msgid "Single mode."
 msgstr "Yksittäinen -tila."
 
-#: src/gtkui/ui_statusbar.cc:109 src/skins/ui_main_evlisteners.cc:105
+#: src/gtkui/ui_statusbar.cc:110 src/skins/main.cc:480 src/skins-qt/main.cc:463
 msgid "Playlist mode."
 msgstr "Soittolista -tila."
 
-#: src/gtkui/ui_statusbar.cc:117 src/skins/ui_main_evlisteners.cc:111
+#: src/gtkui/ui_statusbar.cc:118 src/skins/main.cc:486 src/skins-qt/main.cc:469
 msgid "Stopping after song."
 msgstr "Pysäytä kappaleen jälkeen."
 
-#: src/hotkey/gui.cc:71
+#: src/hotkey/gui.cc:71 src/qthotkey/gui.cc:66
 msgid "Previous track"
 msgstr "Edellinen raita"
 
-#: src/hotkey/gui.cc:72 src/notify/osd.cc:69 src/qtui/main_window.cc:69
-#: src/qtui/main_window.cc:172 src/qtui/main_window.cc:173
-#: src/skins/menus.cc:87
-msgid "Play"
-msgstr "Toista"
-
-#: src/hotkey/gui.cc:73
+#: src/hotkey/gui.cc:73 src/qthotkey/gui.cc:68
 msgid "Pause/Resume"
 msgstr "Keskeytä/Jatka"
 
-#: src/hotkey/gui.cc:74 src/qtui/main_window.cc:70 src/skins/menus.cc:89
-msgid "Stop"
-msgstr "Pysäytä"
-
-#: src/hotkey/gui.cc:75
+#: src/hotkey/gui.cc:75 src/qthotkey/gui.cc:70
 msgid "Next track"
 msgstr "Seuraava raita"
 
-#: src/hotkey/gui.cc:76
-msgid "Forward 5 seconds"
-msgstr "5 sekuntia eteenpäin"
-
-#: src/hotkey/gui.cc:77
-msgid "Rewind 5 seconds"
-msgstr "5 sekuntia taaksepäin"
+#: src/hotkey/gui.cc:76 src/qthotkey/gui.cc:71
+msgid "Step forward"
+msgstr "Askel eteenpäin"
+
+#: src/hotkey/gui.cc:77 src/qthotkey/gui.cc:72
+msgid "Step backward"
+msgstr "Askel taaksepäin"
 
-#: src/hotkey/gui.cc:78
+#: src/hotkey/gui.cc:78 src/qthotkey/gui.cc:73
 msgid "Mute"
 msgstr "Vaimenna"
 
-#: src/hotkey/gui.cc:79
+#: src/hotkey/gui.cc:79 src/qthotkey/gui.cc:74
 msgid "Volume up"
 msgstr "Nosta äänenvoimakkuutta"
 
-#: src/hotkey/gui.cc:80
+#: src/hotkey/gui.cc:80 src/qthotkey/gui.cc:75
 msgid "Volume down"
 msgstr "Laske äänenvoimakkuutta"
 
-#: src/hotkey/gui.cc:81
+#: src/hotkey/gui.cc:81 src/qthotkey/gui.cc:76
 msgid "Jump to file"
 msgstr "Hyppää tiedostoon"
 
-#: src/hotkey/gui.cc:82
+#: src/hotkey/gui.cc:82 src/qthotkey/gui.cc:77
 msgid "Toggle player window(s)"
 msgstr "Näytä/Piilota soittimen ikkunat"
 
-#: src/hotkey/gui.cc:83
+#: src/hotkey/gui.cc:83 src/qthotkey/gui.cc:78
 msgid "Show On-Screen-Display"
 msgstr "Näytä OSD"
 
-#: src/hotkey/gui.cc:84
+#: src/hotkey/gui.cc:84 src/qthotkey/gui.cc:79
 msgid "Toggle repeat"
 msgstr "Kertaus"
 
-#: src/hotkey/gui.cc:85
+#: src/hotkey/gui.cc:85 src/qthotkey/gui.cc:80
 msgid "Toggle shuffle"
 msgstr "Sekoitus"
 
-#: src/hotkey/gui.cc:86
+#: src/hotkey/gui.cc:86 src/qthotkey/gui.cc:81
 msgid "Toggle stop after current"
 msgstr "Pysäytä nykyisen jälkeen"
 
-#: src/hotkey/gui.cc:87
+#: src/hotkey/gui.cc:87 src/qthotkey/gui.cc:82
 msgid "Raise player window(s)"
 msgstr "Nosta soittimen ikkunat"
 
-#: src/hotkey/gui.cc:97
+#: src/hotkey/gui.cc:98 src/qthotkey/gui.cc:100
 msgid "(none)"
 msgstr "(ei mitään)"
 
-#: src/hotkey/gui.cc:234
+#: src/hotkey/gui.cc:261
 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 modifiers.\n"
 "\n"
 "Do you want to continue?"
 msgstr ""
@@ -2101,11 +2239,11 @@
 "\n"
 "Haluatko jatkaa?"
 
-#: src/hotkey/gui.cc:236
+#: src/hotkey/gui.cc:264
 msgid "Binding mouse buttons"
 msgstr "Kytketään hiiren painalluksia"
 
-#: src/hotkey/gui.cc:391
+#: src/hotkey/gui.cc:434
 msgid ""
 "Press a key combination inside a text field.\n"
 "You can also bind mouse buttons."
@@ -2113,142 +2251,173 @@
 "Paina näppäinyhdistelmää tekstikentän sisällä.\n"
 "Voit käyttää myös hiiren nappeja."
 
-#: src/hotkey/gui.cc:396
+#: src/hotkey/gui.cc:444 src/qthotkey/gui.cc:179
 msgid "Hotkeys:"
 msgstr "Pikanäppäimet:"
 
-#: src/hotkey/gui.cc:413
+#: src/hotkey/gui.cc:457 src/qthotkey/gui.cc:181
 msgid "Action:"
 msgstr "Toiminto:"
 
-#: src/hotkey/gui.cc:420
+#: src/hotkey/gui.cc:461 src/qthotkey/gui.cc:182
 msgid "Key Binding:"
 msgstr "Näppäinsidos:"
 
-#: src/hotkey/gui.cc:468
+#: src/hotkey/gui.cc:518 src/qthotkey/gui.cc:184
 msgid "_Add"
 msgstr "_Lisää"
 
-#: src/hotkey/plugin.cc:61
+#: src/hotkey/plugin.cc:59 src/qthotkey/plugin.cc:78
 msgid "Global Hotkeys"
-msgstr "Globaalit pikanäppäimet"
+msgstr "Yleiset pikanäppäimet"
 
-#: src/hotkey/plugin.cc:79
+#: src/hotkey/plugin.cc:74
 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"
+"Contributors 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"
+"Global Hotkey -lisäoasa\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"
+"Osallistujia ovat muun muassa:\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/jack-ng/jack-ng.cc:49
+#: src/jack/jack-ng.cc:54
 msgid "JACK Output"
 msgstr "JACK-lähtö"
 
-#: src/jack-ng/jack-ng.cc:114
+#: src/jack/jack-ng.cc:126
+msgid "Client name:"
+msgstr "Asiakasohjelman nimi:"
+
+#: src/jack/jack-ng.cc:128
 msgid "Automatically connect to output ports"
-msgstr ""
+msgstr "Yhdistä automaattisesti ulostuloportteihin"
+
+#: src/jack/jack-ng.cc:130
+msgid "Filter ports (regex, use any port if blank):"
+msgstr "Suodatinportit (regex, käytä mitä tahansa porttia, jos tyhjä):"
+
+#: src/jack/jack-ng.cc:136
+msgid "Connect to physical ports only"
+msgstr "Yhdistä ainoastaan fyysisiin portteihin"
+
+#: src/jack/jack-ng.cc:139
+msgid "Upmix to"
+msgstr "Sekoita"
+
+#: src/jack/jack-ng.cc:141
+msgid "ports if input has fewer channels"
+msgstr "portteja, jos sisääntulossa on vähemmän kanavia"
 
-#: src/jack-ng/jack-ng.cc:155
+#: src/jack/jack-ng.cc:143
+msgid "Ignore insufficient number of ports"
+msgstr "Ohita riittämätön määrä portteja"
+
+#: src/jack/jack-ng.cc:181
+msgid "No JACK output ports were found. Please check settings."
+msgstr "JACK-lähtöportteja ei löytynyt. Tarkista asetukset."
+
+#: src/jack/jack-ng.cc:195
 #, c-format
 msgid "Only %d JACK output ports were found but %d are required."
-msgstr ""
+msgstr "Vain %d JACK-lähtön portteja löytyi, %d mutta käyttää niitä."
 
-#: src/jack-ng/jack-ng.cc:164
+#: src/jack/jack-ng.cc:210
 #, c-format
 msgid "Failed to connect to JACK port %s."
 msgstr "Yhteys JACK-porttiin %s epäonnistui."
 
-#: src/jack-ng/jack-ng.cc:184
+#: src/jack/jack-ng.cc:230
 msgid ""
 "JACK supports only floating-point audio. You must change the output bit "
 "depth to floating-point in Audacious settings."
 msgstr ""
+"JACK tukee vain liukulukujen ääntä. Lähtöbitin syvyys on vaihdettava "
+"liukulukuun Audacious-asetuksissa."
 
-#: src/jack-ng/jack-ng.cc:197
+#: src/jack/jack-ng.cc:245
 msgid "Failed to connect to the JACK server; is it running?"
 msgstr "Yhteys JACK-palvelimeen epäonnistui. Onhan se käynnissä?"
 
-#: src/jack-ng/jack-ng.cc:273
+#: src/jack/jack-ng.cc:321
 #, c-format
 msgid ""
 "The JACK server requires a sample rate of %d Hz, but Audacious is playing at "
 "%d Hz. Please use the Sample Rate Converter effect to correct the mismatch."
 msgstr ""
+"JACK-palvelin vaatii %d Hz, näytteenottotaajuuden, mutta Audacious käyttää "
+"%d Hz. Käytä Sample Rate Converter -ohjelmaa korjataksesi ongelman."
 
-#: src/ladspa/plugin.cc:414
+#: src/ladspa/plugin.cc:416
 #, c-format
 msgid "%s Settings"
-msgstr "%s asetukset"
+msgstr "%s-asetukset"
 
-#: src/ladspa/plugin.cc:478
+#: src/ladspa/plugin.cc:482
 msgid "Module paths:"
 msgstr "Moduulipolut:"
 
-#: src/ladspa/plugin.cc:483
+#: src/ladspa/plugin.cc:487
 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ä."
-""
+"Erota useita polkuja kaksoispisteellä.\n"
+"Näistä poluista etsitään lisäosia, LADSPA-polun lisäksi.\n"
+"Uuden polun lisäämisen jälkeen paina enter ja etsi uusia lisäosia."
 
-#: src/ladspa/plugin.cc:499
+#: src/ladspa/plugin.cc:508
 msgid "Available plugins:"
 msgstr "Saatavilla olevat liitännäiset:"
 
-#: src/ladspa/plugin.cc:512 src/modplug/plugin_main.cc:92
-#: src/modplug/plugin_main.cc:95 src/modplug/plugin_main.cc:98
-#: src/modplug/plugin_main.cc:101
+#: src/ladspa/plugin.cc:521 src/modplug/plugin_main.cc:91
+#: src/modplug/plugin_main.cc:94 src/modplug/plugin_main.cc:97
+#: src/modplug/plugin_main.cc:100
 msgid "Enable"
 msgstr "Käytä"
 
-#: src/ladspa/plugin.cc:518
+#: src/ladspa/plugin.cc:527
 msgid "Enabled plugins:"
 msgstr "Aktiiviset liitännäiset:"
 
-#: src/ladspa/plugin.cc:534
+#: src/ladspa/plugin.cc:543
 msgid "Settings"
 msgstr "Asetukset"
 
-#: src/ladspa/plugin.cc:551
+#: src/ladspa/plugin.cc:560
 msgid ""
 "LADSPA Host for Audacious\n"
 "Copyright 2011 John Lindgren"
 msgstr ""
-"LADSPA-isäntä Audacioukselle\n"
+"LADSPA Host for Audacious\n"
 "Copyright 2011 John Lindgren"
 
 #: src/ladspa/plugin.h:78
 msgid "LADSPA Host"
-msgstr "LADSPA-isäntä"
+msgstr "Kone LADSPA"
 
 #: src/lirc/lirc.cc:55
 msgid "LIRC Plugin"
-msgstr "LIRC-liitännäinen"
+msgstr "LIRC Plugin"
 
-#: src/lirc/lirc.cc:381
+#: src/lirc/lirc.cc:379
 msgid ""
 "A simple plugin to control Audacious using the LIRC remote control daemon\n"
 "\n"
@@ -2263,94 +2432,154 @@
 "\n"
 "For more information about LIRC, see http://lirc.org."
 msgstr ""
-"Yksinkertainen liitännäinen Audaciouksen ohjaamiseen LIRC:n avulla.\n"
+"Lisäosa 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"
+"Perustuu XMMS LIRC Plugin, 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."
+"Lisätietoja LIRC:stä http://lirc.org."
 
-#: src/lirc/lirc.cc:392
+#: src/lirc/lirc.cc:390
 msgid "Connection"
 msgstr "Yhteys"
 
-#: src/lirc/lirc.cc:393
+#: src/lirc/lirc.cc:391
 msgid "Reconnect to LIRC server"
 msgstr "Yhdistä uudelleen LIRC-palvelimelle"
 
-#: src/lirc/lirc.cc:395
+#: src/lirc/lirc.cc:393
 msgid "Wait before reconnecting:"
 msgstr "Odota ennen uudelleenyhdistämistä:"
 
-#: src/lyricwiki/lyricwiki.cc:41
-msgid "LyricWiki Plugin"
-msgstr "LyricWiki-liitännäinen"
-
-#: src/lyricwiki/lyricwiki.cc:131 src/lyricwiki-qt/lyricwiki.cc:136
-msgid "No lyrics available"
-msgstr "Lyriikoita ei saatavilla"
-
-#: src/lyricwiki/lyricwiki.cc:217 src/lyricwiki/lyricwiki.cc:226
-#: src/lyricwiki/lyricwiki.cc:243 src/lyricwiki/lyricwiki.cc:252
-#: src/lyricwiki/lyricwiki.cc:267 src/lyricwiki-qt/lyricwiki.cc:222
-#: src/lyricwiki-qt/lyricwiki.cc:231 src/lyricwiki-qt/lyricwiki.cc:248
-#: src/lyricwiki-qt/lyricwiki.cc:257 src/lyricwiki-qt/lyricwiki.cc:272
-msgid "Error"
-msgstr "Virhe"
-
-#: src/lyricwiki/lyricwiki.cc:218 src/lyricwiki/lyricwiki.cc:244
-#: src/lyricwiki-qt/lyricwiki.cc:223 src/lyricwiki-qt/lyricwiki.cc:249
+#: src/lyrics-common/chart_lyrics_provider.cc:93
+#: src/lyrics-common/chart_lyrics_provider.cc:150
+#: src/lyrics-common/lyrics_ovh_provider.cc:50
 #, c-format
 msgid "Unable to fetch %s"
 msgstr "Ei voitu hakea %s"
 
-#: src/lyricwiki/lyricwiki.cc:227 src/lyricwiki/lyricwiki.cc:253
-#: src/lyricwiki-qt/lyricwiki.cc:232 src/lyricwiki-qt/lyricwiki.cc:258
+#: src/lyrics-common/chart_lyrics_provider.cc:100
+#: src/lyrics-common/chart_lyrics_provider.cc:157
+#: src/lyrics-common/lyrics_ovh_provider.cc:57
 #, c-format
 msgid "Unable to parse %s"
 msgstr "Ei voida jäsentää %s"
 
-#: src/lyricwiki/lyricwiki.cc:259 src/lyricwiki-qt/lyricwiki.cc:264
+#: src/lyrics-common/chart_lyrics_provider.cc:121
+#: src/lyrics-common/chart_lyrics_provider.cc:194
+#: src/lyrics-common/lyrics_ovh_provider.cc:88
 msgid "Looking for lyrics ..."
 msgstr "Etsitään lyriikoita..."
 
-#: src/lyricwiki/lyricwiki.cc:267 src/lyricwiki-qt/lyricwiki.cc:272
-msgid "Missing song metadata"
-msgstr "Kappaleen metatiedot puuttuvat"
-
-#: src/lyricwiki/lyricwiki.cc:278 src/lyricwiki-qt/lyricwiki.cc:283
-msgid "Connecting to lyrics.wikia.com ..."
-msgstr "Yhdistetään lyrics.wikia.com..."
-
-#: src/lyricwiki-qt/lyricwiki.cc:55
-msgid "LyricWiki Plugin (Qt)"
-msgstr "LyricWiki-liitännäinen (Qt)"
+#: src/lyrics-common/preferences.h:43
+msgid "Nowhere"
+msgstr "Missään"
+
+#: src/lyrics-common/preferences.h:49
+msgid "Artist is truncated at the start, Title -- at the end"
+msgstr "Artisti lyhenteenä alussa, koko nimi -- lopussa"
+
+#: src/lyrics-common/preferences.h:50
+msgid "Chars to truncate on:"
+msgstr "Lyhennettävät sarakkeet:"
+
+#: src/lyrics-common/preferences.h:54
+msgid "Chars are ORed in RegExp, surrounded by whitespace"
+msgstr "Sarakkeet ovat ORed RegExp, jota ympäröi välilyönti"
+
+#: src/lyrics-common/preferences.h:55
+msgid "Chars to split on:"
+msgstr "Sarake jaetaan:"
+
+#: src/lyrics-common/preferences.h:56
+msgid "Further truncate those on chars"
+msgstr "Lyhennä edelleen saraketta"
+
+#: src/lyrics-common/preferences.h:62
+msgid "General"
+msgstr "Yleiset"
+
+#: src/lyrics-common/preferences.h:63
+msgid "Split title into artist and title on chars"
+msgstr "Jaa artistin ja nimikkeen sarake"
+
+#: src/lyrics-common/preferences.h:66
+msgid "Sources"
+msgstr "Lähteet"
+
+#: src/lyrics-common/preferences.h:67
+msgid "Use embedded lyrics (from Lyrics tag)"
+msgstr "Käytä upotettuja sanoituksia (lyrics tagista)"
+
+#: src/lyrics-common/preferences.h:69
+msgid "Fetch lyrics from internet:"
+msgstr "Nouda sanoitukset internetistä:"
+
+#: src/lyrics-common/preferences.h:72
+msgid "Store fetched lyrics in local cache"
+msgstr "Tallenna noudetut sanoitukset paikalliseen välimuistiin"
+
+#: src/lyrics-common/preferences.h:74
+msgid "Local Storage"
+msgstr "Paikallinen tallennustila"
+
+#: src/lyrics-common/preferences.h:75
+msgid "Load lyric files (.lrc) from local storage"
+msgstr "Lataa sanoitukset (.lrc) kiintolevyltä"
+
+#: src/lyrics-common/utils.cc:54 src/ui-common/dialogs-qt.cc:63
+msgid "Error"
+msgstr "Virhe"
+
+#: src/lyrics-common/utils.cc:60
+msgid "Lyrics could not be found."
+msgstr "Sanoituksia ei löytynyt."
+
+#: src/lyrics-common/utils.cc:142
+msgid "Missing title and/or artist."
+msgstr "Puuttuu otsikko tai esittäjä."
+
+#: src/lyrics-gtk/lyrics-gtk.cc:37 src/lyrics-qt/lyrics-qt.cc:50
+msgid "Lyrics"
+msgstr "Sanoitukset"
+
+#: src/lyrics-gtk/lyrics-gtk.cc:189 src/lyrics-qt/lyrics-qt.cc:171
+msgid "Edit Lyrics ..."
+msgstr "Muokkaa sanoituksia..."
+
+#: src/lyrics-gtk/lyrics-gtk.cc:195 src/lyrics-qt/lyrics-qt.cc:178
+msgid "Save Locally"
+msgstr "Tallenna paikallisesti"
+
+#: src/lyrics-gtk/lyrics-gtk.cc:201 src/lyrics-qt/lyrics-qt.cc:186
+msgid "Refresh"
+msgstr "Päivitä"
 
-#: src/m3u/m3u.cc:32
+#: src/m3u/m3u.cc:33
 msgid "M3U Playlists"
-msgstr "M3U-soittolistat"
+msgstr "M3U-soittolista"
 
 #: src/metronom/metronom.cc:44
 msgid "Tact Generator"
 msgstr "Tahtigeneraattori"
 
-#: src/metronom/metronom.cc:147
+#: src/metronom/metronom.cc:145
 #, c-format
 msgid "Tact generator: %d bpm"
 msgstr "Tahtigeneraattori: %d bpm"
 
-#: src/metronom/metronom.cc:149
+#: src/metronom/metronom.cc:147
 #, c-format
 msgid "Tact generator: %d bpm %d/%d"
 msgstr "Tahtigeneraattori: %d bpm %d/%d"
 
-#: src/metronom/metronom.cc:237
+#: src/metronom/metronom.cc:235
 msgid ""
 "A Tact Generator by Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
 "\n"
@@ -2364,196 +2593,204 @@
 "esim. tact://77 soittaaksesi 77 iskua minuutissa.\n"
 "Tai tact://60*3/4 soittaaksesi 60 iskua minuutissa tahdilla 3/4"
 
-#: src/mixer/mixer.cc:38
+#: src/mixer/mixer.cc:43
 msgid "Channel Mixer"
 msgstr "Kanavamikseri"
 
-#: src/mixer/mixer.cc:202
+#: src/mixer/mixer.cc:255
 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"
+"Channel Mixer Plugin for Audacious\n"
+"Copyright 2011-2012 John Lindgren and Michał Lipski"
 
-#: src/mixer/mixer.cc:206
+#: src/mixer/mixer.cc:259
 msgid "Channel Mixer"
 msgstr "Kanavamikseri"
 
-#: src/mixer/mixer.cc:207
+#: src/mixer/mixer.cc:260
 msgid "Output channels:"
 msgstr "Kanavat:"
 
 #: src/mms/mms.cc:35
 msgid "MMS Plugin"
-msgstr "MMS-liitännäinen"
+msgstr "MMS Plugin"
 
 #: src/mms/mms.cc:82
 msgid "Error connecting to MMS server"
 msgstr "Virhe MMS-palvelimeen yhdistäessä"
 
-#: src/modplug/modplugbmp.h:53
+#: src/modplug/modplugbmp.h:57
 msgid "ModPlug (Module Player)"
 msgstr "ModPlug (Module Player)"
 
-#: src/modplug/plugin_main.cc:53
-msgid "Resolution"
-msgstr "Resoluutio"
-
-#: src/modplug/plugin_main.cc:54
-msgid "8-bit"
-msgstr "8-bittiä"
-
 #: src/modplug/plugin_main.cc:55
-msgid "16-bit"
-msgstr "16-bittiä"
-
-#: src/modplug/plugin_main.cc:56
 msgid "Channels"
 msgstr "Kanavat"
 
-#: src/modplug/plugin_main.cc:60
+#: src/modplug/plugin_main.cc:59
 msgid "Nearest (fastest)"
 msgstr "Nearest (nopein)"
 
-#: src/modplug/plugin_main.cc:61
+#: src/modplug/plugin_main.cc:60
 msgid "Linear (fast)"
 msgstr "Linear (nopea)"
 
-#: src/modplug/plugin_main.cc:62
+#: src/modplug/plugin_main.cc:61
 msgid "Spline (good)"
 msgstr "Spline (hyvä)"
 
-#: src/modplug/plugin_main.cc:63
+#: src/modplug/plugin_main.cc:62
 msgid "Polyphase (best)"
 msgstr "Polyphase (paras)"
 
-#: src/modplug/plugin_main.cc:64
+#: src/modplug/plugin_main.cc:63
 msgid "Sample rate"
-msgstr ""
+msgstr "Näytteenottotaajuus"
 
-#: src/modplug/plugin_main.cc:65
+#: src/modplug/plugin_main.cc:64
 msgid "22 kHz"
 msgstr "22 kHz"
 
-#: src/modplug/plugin_main.cc:66
+#: src/modplug/plugin_main.cc:65
 msgid "44 kHz"
 msgstr "44 kHz"
 
-#: src/modplug/plugin_main.cc:67
+#: src/modplug/plugin_main.cc:66
 msgid "48 kHz"
 msgstr "48 kHz"
 
-#: src/modplug/plugin_main.cc:68
+#: src/modplug/plugin_main.cc:67
 msgid "96 kHz"
 msgstr "96 kHz"
 
-#: src/modplug/plugin_main.cc:72 src/modplug/plugin_main.cc:77
-#: src/modplug/plugin_main.cc:82
+#: src/modplug/plugin_main.cc:71 src/modplug/plugin_main.cc:76
+#: src/modplug/plugin_main.cc:81
 msgid "Level:"
 msgstr "Taso:"
 
-#: src/modplug/plugin_main.cc:78
+#: src/modplug/plugin_main.cc:77
 msgid "Cutoff:"
 msgstr "Alaraja:"
 
-#: src/modplug/plugin_main.cc:91
+#: src/modplug/plugin_main.cc:90
 msgid "Reverb"
 msgstr "Reverb"
 
-#: src/modplug/plugin_main.cc:94
+#: src/modplug/plugin_main.cc:93
 msgid "Bass Boost"
 msgstr "Bass Boost"
 
-#: src/modplug/plugin_main.cc:97
+#: src/modplug/plugin_main.cc:96
 msgid "Surround"
 msgstr "Surround"
 
-#: src/modplug/plugin_main.cc:100
+#: src/modplug/plugin_main.cc:99
 msgid "Preamp"
 msgstr "Preamp"
 
-#: src/modplug/plugin_main.cc:107
+#: src/modplug/plugin_main.cc:106
 msgid "Oversample"
 msgstr "Ylinäytteistä"
 
-#: src/modplug/plugin_main.cc:108
+#: src/modplug/plugin_main.cc:107
 msgid "Noise reduction"
 msgstr "Kohinan vähennys"
 
-#: src/modplug/plugin_main.cc:109
+#: src/modplug/plugin_main.cc:108
 msgid "Play Amiga MODs"
 msgstr "Toista Amigan MOD-tiedostoja"
 
-#: src/modplug/plugin_main.cc:110
+#: src/modplug/plugin_main.cc:109
 msgid "Repeat"
 msgstr "Kertaus"
 
-#: src/modplug/plugin_main.cc:111
+#: src/modplug/plugin_main.cc:110
 msgid "Repeat count:"
 msgstr "Kertojen määrä:"
 
-#: src/modplug/plugin_main.cc:112
+#: src/modplug/plugin_main.cc:111
 msgid "To repeat forever, set the repeat count to -1."
 msgstr "Jos haluat kerrata ikuisesti, aseta kertojen määräksi -1."
 
-#: src/modplug/plugin_main.cc:125 src/sid/xs_config.cc:106
+#: src/modplug/plugin_main.cc:124 src/sid/xs_config.cc:106
 msgid "These settings will take effect when Audacious is restarted."
 msgstr "Nämä asetukset tulevat voimaan, kun Audacious käynnistetään uudelleen."
 
+#: src/moonstone/main_window.cc:72 src/moonstone/main_window.cc:73
+#: src/qtui/main_window.cc:159 src/qtui/main_window.cc:160
+#: src/skins/menus.cc:107 src/skins-qt/menus.cc:98
+msgid "Stop After This Song"
+msgstr "Lopeta kappaleen jälkeen"
+
+#: src/moonstone/moonstone.cc:39
+msgid "Moonstone"
+msgstr "Kuukivi"
+
+#: src/moonstone/playlist_header.cc:212 src/qtui/playlist_header.cc:258
+msgid "Reset to Defaults"
+msgstr "Palauta oletusarvoihin"
+
+#: src/moonstone/playlist_model.cc:38 src/qtui/playlist_header.cc:232
+msgid "Now Playing"
+msgstr "Soi nyt"
+
+#: src/moonstone/playlist_selection.cc:66
+#: src/playlist-manager/playlist-manager.cc:201
+#: src/playlist-manager-qt/playlist-manager-qt.cc:190
+msgid "Entries"
+msgstr "Nimikkeitä"
+
 #: src/mpg123/mpg123.cc:54
 msgid "MPG123 Plugin"
-msgstr "MPG123-liitännäinen"
-
-#: src/mpg123/mpg123.cc:83
-msgid "Advanced"
-msgstr "Lisäasetukset"
+msgstr "MPG123 Plugin"
 
-#: src/mpg123/mpg123.cc:84
+#: src/mpg123/mpg123.cc:82
 msgid "Use accurate length calculation (slow)"
 msgstr "Käytä tarkkaa keston laskentaa (hidas)"
 
-#: src/mpg123/mpg123.cc:248
+#: src/mpg123/mpg123.cc:260
 msgid "Surround"
 msgstr "Surround"
 
-#: src/mpris2/plugin.cc:39
+#: src/mpris2/plugin.cc:40
 msgid "MPRIS 2 Server"
 msgstr "MPRIS 2 -palvelin"
 
-#: src/neon/neon.cc:97
+#: src/neon/neon.cc:102
 msgid "Neon HTTP/HTTPS Plugin"
-msgstr "Neon HTTP/HTTPS -liitännäinen"
+msgstr "Neon HTTP/HTTPS Plugin"
 
-#: src/neon/neon.cc:521
+#: src/neon/neon.cc:526
 msgid "Error parsing redirect"
-msgstr ""
+msgstr "Virhe uudelleenohjauksen valmistelussa"
 
-#: src/neon/neon.cc:535
+#: src/neon/neon.cc:540
 msgid "Unknown HTTP error"
 msgstr "Tuntematon HTTP-virhe"
 
-#: src/neon/neon.cc:569
+#: src/neon/neon.cc:614
 msgid "Error parsing URL"
-msgstr ""
+msgstr "Virhe luettaessa URL"
 
-#: src/neon/neon.cc:632
+#: src/neon/neon.cc:687
 msgid "Too many redirects"
 msgstr "Liian monta uudelleenohjausta"
 
-#: src/notify/event.cc:64
+#: src/notify/event.cc:97
 msgid "Stopped"
 msgstr "Pysäytetty"
 
-#: src/notify/event.cc:64
+#: src/notify/event.cc:97
 msgid "Audacious is not playing."
 msgstr "Audacious ei tällä hetkellä soita mitään."
 
-#: src/notify/notify.cc:42
+#: src/notify/notify.cc:39
 msgid "Desktop Notifications"
 msgstr "Työpöytäilmoitukset"
 
-#: src/notify/notify.cc:60
+#: src/notify/notify.cc:57
 msgid ""
 "Desktop Notifications Plugin for Audacious\n"
 "Copyright (C) 2010 Maximilian Bogner\n"
@@ -2572,53 +2809,98 @@
 "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 ""
-"Työpöytäilmoitukset -liitännäinen Audacioukselle\n"
+"Desktop Notifications Plugin for Audacious\n"
 "Copyright (C) 2010 Maximilian Bogner\n"
-"Copyright (C) 2011-2013 John Lindgren sekä 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"
+"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"
+"Tämä lisäosa on ilmainen ohjelma: voit jakaa sen uudelleen ja/tai muokata "
+"sitä Free Software Foundation julkaiseman GNU General Public License -"
+"ehtojen mukaisesti, joko lisenssin version 3 tai (valinnan mukaan) minkä "
+"tahansa myöhemmän version.\n"
+"\n"
+"Tämä lisäosa jaetaan siinä toivossa, että siitä on hyötyä, mutta ILMAN "
+"MITÄÄN TAKUUTA; ilman edes oletettua takuuta MYYNTIKELPOISUUDESTA tai "
+"SOVELTUVUUDESTA TIETTYYN TARKOITUKSEEN. Katso lisätietoja GNU General Public "
+"License.\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/>."
+"Sinun olisi pitänyt saada kopio lisenssistä GNU General Public License tämän "
+"ohjelman mukana. Jos ei, katso <http://www.gnu.org/licenses/>."
 
-#: src/notify/notify.cc:110
+#: src/notify/notify.cc:104
 msgid "Show playback controls"
 msgstr "Näytä toiston kontrollit"
 
-#: src/notify/notify.cc:112
+#: src/notify/notify.cc:106
 msgid "Always show notification"
 msgstr "Näytä ilmoitukset aina"
 
-#: src/notify/notify.cc:114
+#: src/notify/notify.cc:108
 msgid "Include album name in notification"
-msgstr "Sisällytä albumin nimi ilmoitukseen"
+msgstr "Levyn nimi lisätään ilmoitukseen"
+
+#: src/notify/notify.cc:110
+msgid "Custom notification duration:"
+msgstr "Mukautettu ilmoituksen kesto:"
 
-#: src/notify/osd.cc:58
+#: src/notify/osd.cc:74
 msgid "Show"
 msgstr "Näytä"
 
-#: src/notify/osd.cc:66 src/qtui/main_window.cc:178
-#: src/qtui/main_window.cc:179 src/skins/menus.cc:88
-msgid "Pause"
-msgstr "Keskeytä"
+#: src/openmpt/mpt.cc:50
+msgid "OpenMPT (Module Player)"
+msgstr "OpenMPT (moduulisoitin)"
 
-#: src/notify/osd.cc:73 src/qtui/main_window.cc:72 src/skins/menus.cc:91
-msgid "Next"
-msgstr "Seuraava"
+#: src/openmpt/mpt.cc:132
+msgid ""
+"Module player based on libopenmpt\n"
+"\n"
+"Written by: Chris Spiegel <cspiegel@gmail.com>"
+msgstr ""
+"Moduuli soitin perustuen libopenmpt\n"
+"\n"
+"Kirjoittanut: Chris Spiegel <cspiegel@gmail.com>"
+
+#: src/openmpt/mpt.cc:151
+msgid "Stereo separation:"
+msgstr "Stereoerottelu:"
+
+#: src/openmpt/mpt.cc:153
+msgid "% (0=mono, 100=default, 200=full)"
+msgstr "% (0=mono, 100=oletus, 200=täysi)"
+
+#: src/openmpt/mpt.cc:157
+msgid "Interpolation:"
+msgstr "Interpolointi:"
 
-#: src/oss4/oss.h:93
+#: src/openmpt/mptwrap.h:51 src/soxr/sox-resampler.cc:189 src/xsf/plugin.cc:437
+msgid "Linear"
+msgstr "Lineaarinen"
+
+#: src/openmpt/mptwrap.h:52
+msgid "Cubic"
+msgstr "Kuutio"
+
+#: src/openmpt/mptwrap.h:53
+msgid "Windowed sinc"
+msgstr "Ikkunoitu sinc"
+
+#: src/opus/opus.cc:39
+msgid "Opus Decoder"
+msgstr "Opus-dekooderi"
+
+#: src/opus/opus.cc:336
+msgid ""
+"Opus Decoder Plugin for Audacious\n"
+"Copyright 2022 Thomas Lange"
+msgstr ""
+"Opus Decoder lisäosa Audaciousille\n"
+"Copyright 2022 Thomas Lange"
+
+#: src/oss4/oss.h:70
 msgid "OSS4 Output"
 msgstr "OSS4-lähtö"
 
-#: src/oss4/oss.h:95
+#: src/oss4/oss.h:72
 msgid "OSS3 Output"
 msgstr "OSS3-lähtö"
 
@@ -2626,27 +2908,27 @@
 msgid "Default device"
 msgstr "Oletuslaite"
 
-#: src/oss4/plugin.cc:77
+#: src/oss4/plugin.cc:78
 msgid "Audio device:"
 msgstr "Äänilaite:"
 
-#: src/oss4/plugin.cc:80
+#: src/oss4/plugin.cc:81
 msgid "Use alternate device:"
 msgstr "Käytä vaihtoehtoista laitetta:"
 
-#: src/oss4/plugin.cc:84
+#: src/oss4/plugin.cc:85
 msgid "Save volume between sessions."
 msgstr "Tallenna äänenvoimakkuus eri sessioiden välillä."
 
-#: src/oss4/plugin.cc:86
+#: src/oss4/plugin.cc:87
 msgid "Enable format conversions made by the OSS software."
 msgstr "Käytä OSS:n luomia formaatin muutoksia."
 
-#: src/oss4/plugin.cc:88
+#: src/oss4/plugin.cc:89
 msgid "Enable exclusive mode to prevent virtual mixing."
 msgstr "Kytke eksklusiivinen tila päälle virtuaalisen miksauksen estämiseksi."
 
-#: src/oss4/plugin.cc:100
+#: src/oss4/plugin.cc:101
 msgid ""
 "OSS4 Output Plugin for Audacious\n"
 "Copyright 2010-2012 Michał Lipski\n"
@@ -2654,81 +2936,117 @@
 "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"
+"OSS4 Output Plugin for Audacious\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."
+"sekä John Lindgreniä. Kiitokset myös edellisen OSS-lisäosan kehittäjille."
 
-#: src/playlist-manager/playlist-manager.cc:37
-msgid "Playlist Manager"
-msgstr "Soittolistan hallinta"
+#: src/pipewire/pipewire.cc:44
+msgid "PipeWire Output"
+msgstr "PipeWire ulostulo"
 
-#: src/playlist-manager/playlist-manager.cc:226
-msgid "Entries"
+#: src/pipewire/pipewire.cc:118
+msgid ""
+"PipeWire Output Plugin for Audacious\n"
+"Copyright 2022 Thomas Lange\n"
+"\n"
+"Based on the PipeWire Output Plugin for Qmmp\n"
+"Copyright 2021 Ilya Kotov"
 msgstr ""
+"PipeWire Output Plugin for Audacious\n"
+"Copyright 2022 Thomas Lange\n"
+"\n"
+"Based on the PipeWire Output Plugin for Qmmp\n"
+"Copyright 2021 Ilya Kotov"
 
-#: src/playlist-manager/playlist-manager.cc:245
+#: src/pipewire/pipewire.cc:408 src/skins/menus.cc:88 src/skins-qt/menus.cc:79
+msgid "Playback"
+msgstr "Toisto"
+
+#: src/playlist-manager/playlist-manager.cc:38
+#: src/playlist-manager-qt/playlist-manager-qt.cc:42
+msgid "Playlist Manager"
+msgstr "Soittolistan hallinta"
+
+#: src/playlist-manager/playlist-manager.cc:221
+#: src/playlist-manager-qt/playlist-manager-qt.cc:356
 msgid "_Remove"
 msgstr "_Poista"
 
-#: src/playlist-manager/playlist-manager.cc:246
+#: src/playlist-manager/playlist-manager.cc:222
+#: src/playlist-manager-qt/playlist-manager-qt.cc:351
 msgid "Ren_ame"
 msgstr "_Nimeä uudelleen"
 
 #: src/pls/pls.cc:35
 msgid "PLS Playlists"
-msgstr "PLS-soittolistat"
+msgstr "PLS-soittolista"
 
-#: src/psf/plugin.cc:45
+#: src/psf/plugin.cc:53
 msgid "OpenPSF PSF1/PSF2 Decoder"
 msgstr "OpenPSF PSF1/PSF2 -dekooderi"
 
-#: src/pulse_audio/pulse_audio.cc:38
+#: src/psf/plugin.cc:270
+msgid "OpenPSF Configuration"
+msgstr "OpenPSF-asetukset"
+
+#: src/psf/plugin.cc:271 src/xsf/plugin.cc:444
+msgid "Ignore length from file"
+msgstr "Älä huomioi tiedoston ilmoittamaa kestoa"
+
+#: src/pulse/pulse_audio.cc:42
 msgid "PulseAudio Output"
 msgstr "PulseAudio-lähtö"
 
-#: src/pulse_audio/pulse_audio.cc:611
+#: src/pulse/pulse_audio.cc:84
+msgid "Context name:"
+msgstr "Sisällön nimi:"
+
+#: src/pulse/pulse_audio.cc:86
+msgid "Stream name:"
+msgstr "Suoratoiston nimi:"
+
+#: src/pulse/pulse_audio.cc:596
 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"
+"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"
-"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."
+"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 ""
-"Audaciouksen PulseAudio-lähdön liitännäinen\n"
+"Audaciouksen PulseAudio-lähdön lisäosa\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"
+"Tämä on ilmainen ohjelmisto; voit jakaa sitä edelleen ja/tai muokata\n"
+"GNU General Public License ehtojen mukaisesti, sellaisina kuin\n"
+"Free Software Foundation on ne määrittänyt, joko lisenssin versio 2 tai\n"
+"(sinun valintasi mukaan) minkä tahansa uudempi versio.\n"
+"\n"
+"Tämä ohjelma jaetaan siinä toivossa, että se on hyödyllinen,\n"
+"mutta ILMAN MITÄÄN TAKUUTA; ilman edes oletettua takuuta\n"
+"MYYNTIKELPOISUUTTA tai SOPIVUUTTA TIETTYYN TARKOITUKSEEN.\n"
+"Katso GNU General Public License -ehdot saadaksesi lisätietoja.\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"
+"Sinun olisi pitänyt saada kopio GNU General Public License -tiedostosta\n"
+"tämän ohjelman mukana; Jos et saanut, kirjoita kirje Free Software\n"
 "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
 "USA."
 
-#: src/qtaudio/qtaudio.cc:49
+#: src/qtaudio/qtaudio.cc:53
 msgid "QtMultimedia Output"
 msgstr "QtMultimedia-lähtö"
 
-#: src/qtaudio/qtaudio.cc:77
+#: src/qtaudio/qtaudio.cc:84
 msgid ""
 "QtMultimedia Audio Output Plugin for Audacious\n"
 "Copyright 2014 William Pitcock\n"
@@ -2736,61 +3054,124 @@
 "Based on SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
 msgstr ""
+"QtMultimedia Audio Output Plugin Audaciousille\n"
+"Copyright 2014 William Pitcock\n"
+"\n"
+"Perustuu SDL Output -lisäosaan Audaciousille\n"
+"Copyright 2010 John Lindgren"
 
-#: src/qtui/dialog_windows.cc:31
-msgid "Working ..."
+#: src/qtglspectrum/gl-spectrum.cc:41
+msgid ""
+"OpenGL Spectrum Analyzer for Audacious\n"
+"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
+"Copyright 2014, 2020 Ariadne Conill\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 Audacious\n"
+"Copyright 2013 Christophe Budé, John Lindgren ja Carlo Bramini\n"
+"Copyright 2014, 2020 Ariadne Conill\n"
+"\n"
+"Perustuu XMMS lisäosaan:\n"
+"Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson ja "
+"4Front Technologies\n"
+"\n"
+"Lisenssi: GPLv2+"
 
-#: src/qtui/filter_input.cc:44 src/skins/ui_playlist.cc:221
-msgid "Search"
-msgstr "Etsi"
+#: src/qthotkey/gui.cc:177
+msgid "Press a key combination inside a text field."
+msgstr "Paina näppäinyhdistelmää tekstikentän sisällä."
+
+#: src/qthotkey/plugin.cc:105
+msgid ""
+"Global Hotkey Plugin\n"
+"Control the player with global key combinations or multimedia keys.\n"
+"\n"
+"Copyright (C) 2020 i.Dark_Templar <darktemplar@dark-templar-archives.net>\n"
+"Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n"
+"\n"
+"Contributors 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 Plugin\n"
+"Ohjaa soitinta pikanäppäimillä tai multimedia näppäimistä.\n"
+"\n"
+"Copyright (C) 2020 i.Dark_Templar <darktemplar@dark-templar-archives.net>\n"
+"Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n"
+"\n"
+"Avustajat:\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/qtui/main_window_actions.cc:94
+#: src/qtui/menus.cc:109
 msgid "_Open Folder ..."
 msgstr "_Avaa kansio..."
 
-#: src/qtui/main_window_actions.cc:96
+#: src/qtui/menus.cc:115
 msgid "_Add Folder ..."
 msgstr "_Lisää kansio..."
 
-#: src/qtui/main_window_actions.cc:101
+#: src/qtui/menus.cc:128
 msgid "_Log Inspector ..."
-msgstr ""
+msgstr "_Lokin tarkastaja ..."
 
-#: src/qtui/main_window.cc:64
-msgid "Open Files"
-msgstr "Avaa tiedostoja"
+#: src/qtui/menus.cc:220
+msgid "_Find ..."
+msgstr "_Etsi..."
 
-#: src/qtui/main_window.cc:66
-msgid "Add Files"
-msgstr "Lisää tiedostoja"
+#: src/qtui/menus.cc:256 src/skins/menus.cc:80 src/skins-qt/menus.cc:70
+msgid "Audio Settings ..."
+msgstr "Ääniasetukset..."
 
-#: src/qtui/main_window.cc:71 src/skins/menus.cc:90
-msgid "Previous"
-msgstr "Edellinen"
+#: src/qtui/playlist_model.cc:188
+msgid "Q#"
+msgstr "Q#"
 
-#: src/qtui/main_window.cc:77 src/skins/menus.cc:82
-msgid "Repeat"
-msgstr "Kertaus"
+#: src/qtui/playlist_model.cc:190
+msgid "T#"
+msgstr "T#"
 
-#: src/qtui/main_window.cc:79 src/skins/menus.cc:83
-msgid "Shuffle"
-msgstr "Sekoitus"
+#: src/qtui/playlist_model.cc:192
+msgid "C#"
+msgstr "C#"
 
-#: src/qtui/qtui.cc:42
+#: src/qtui/playlist_model.cc:194
+msgid "D#"
+msgstr "L#"
+
+#: src/qtui/qtui.cc:40
 msgid "Qt Interface"
 msgstr "Qt-käyttöliittymä"
 
+#: src/qtui/search_bar.cc:46
+msgid "Search playlist"
+msgstr "Etsi soittolista"
+
+#: src/qtui/settings.cc:79
+msgid "Use bold font for column headers"
+msgstr "Käytä lihavoitua fonttia sarakkeiden otsakkeille"
+
 #: src/resample/resample.cc:43
 msgid "Sample Rate Converter"
-msgstr "Uudelleenäytteistäjä"
+msgstr "Sample Rate -muunnin"
 
 #: src/resample/resample.cc:183
 msgid ""
 "Sample Rate Converter Plugin for Audacious\n"
 "Copyright 2010-2012 John Lindgren"
 msgstr ""
-"Uudelleenäytteistys-liitännäinen Audacioukselle\n"
+"Sample Rate Converter Plugin for Audacious\n"
 "Copyright 2010-2012 John Lindgren"
 
 #: src/resample/resample.cc:187
@@ -2821,7 +3202,7 @@
 msgid "Method:"
 msgstr "Metodi:"
 
-#: src/resample/resample.cc:199 src/sox-resampler/sox-resampler.cc:161
+#: src/resample/resample.cc:199 src/soxr/sox-resampler.cc:203
 msgid "Rate:"
 msgstr "Näytteenottotaajuus:"
 
@@ -2873,64 +3254,53 @@
 msgid "192 kHz:"
 msgstr "192 kHz:"
 
-#: src/scrobbler2/config_window.cc:41
-#, c-format
-msgid "OK. Scrobbling for user: %s"
-msgstr "OK. Päivitetään raitoja käyttäjälle: %s"
-
-#: src/scrobbler2/config_window.cc:54
-msgid "Permission Denied"
-msgstr "Lupa evätty"
+#: src/scrobbler2/config_window.cc:29
+msgid "Checking Last.fm access ..."
+msgstr "Tarkistetaan Last.fm-käyttöoikeutta..."
 
-#: src/scrobbler2/config_window.cc:56
-msgid "Access the following link to allow Audacious to scrobble your plays:"
+#: src/scrobbler2/config_window.cc:35
+msgid ""
+"Your scrobbles are being saved on your computer temporarily. They will be "
+"submitted as soon as Audacious is allowed access."
 msgstr ""
-"Avaa seuraava linkki salliaksesi Audaciouksen päivittää soitettuja raitojasi:"
+"Scrobblet tallennetaan tietokoneellesi väliaikaisesti. Siirretään heti, kun "
+"Audacious saa pääsyn."
 
-#: src/scrobbler2/config_window.cc:66
-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.cc:41
+#, c-format
+msgid "Permission granted. Scrobbling for user %s."
+msgstr "Lupa myönnetty. Scrobbling käyttäjälle %s."
 
-#: src/scrobbler2/config_window.cc:69 src/scrobbler2/config_window.cc:80
+#: src/scrobbler2/config_window.cc:44
 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."
+"Permission denied. Open the following URL in a browser, allow Audacious "
+"access to your account, and then click 'Check Permission' again:"
 msgstr ""
-"Soitettujen kappaleiden tiedot tallennetaan koneellesi.\n"
-"Tiedot lähetetään heti kun mahdollista."
-
-#: src/scrobbler2/config_window.cc:77
-msgid "Network Problem."
-msgstr "Verkko-ongelma."
-
-#: src/scrobbler2/config_window.cc:78
-msgid "There was a problem contacting Last.fm. Please try again later."
-msgstr "Last.fm -palveluun yhdistettäessä ilmeni ongelmia. Yritä uudelleen."
+"Lupa evätty. Avaa seuraava verkko-osoite selaimessa, salli Audacious-tilin "
+"käyttö ja valitse sitten 'Tarkista käyttöoikeus' uudelleen:"
 
-#: src/scrobbler2/config_window.cc:110
-msgid "Checking..."
-msgstr "Tarkistetaan..."
+#: src/scrobbler2/config_window.cc:53
+msgid "There was a problem contacting Last.fm."
+msgstr "Ongelma Last.fm:ään yhdistäessä."
 
-#: src/scrobbler2/config_window.cc:176
-msgid "C_heck Permission"
-msgstr "_Tarkista oikeudet"
+#: src/scrobbler2/config_window.cc:92
+msgid "Check Permission"
+msgstr "Tarkista oikeus"
 
-#: src/scrobbler2/config_window.cc:177
-msgid "_Revoke Permission"
-msgstr "_Kumoa oikeudet"
+#: src/scrobbler2/config_window.cc:93
+msgid "Revoke Permission"
+msgstr "Hylkää oikeus"
 
-#: src/scrobbler2/config_window.cc:220
-msgid ""
-"You need to allow Audacious to scrobble tracks to your Last.fm account.\n"
+#: src/scrobbler2/config_window.cc:97
+msgid "You need to allow Audacious to scrobble tracks to your Last.fm account."
 msgstr ""
-"Sinun pitää sallia Audaciouksen päivittää raitoja Last.fm -tilillesi.\n"
+"Sinun täytyy antaa Audaciouksen päivittää kappaleet Last.fm -tilillesi."
 
 #: src/scrobbler2/scrobbler.cc:29
 msgid "Scrobbler 2.0"
 msgstr "Scrobbler 2.0"
 
-#: src/scrobbler2/scrobbler.cc:224
+#: src/scrobbler2/scrobbler.cc:200
 msgid ""
 "The Scrobbler plugin could not be started.\n"
 "There might be a problem with your installation."
@@ -2938,93 +3308,70 @@
 "Scrobbler -liitännäistä ei voitu käynnistää.\n"
 "Asennuksessasi saattaa olla jotain vikaa."
 
-#: src/scrobbler2/scrobbler.cc:289
+#: src/scrobbler2/scrobbler.cc:245
 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"
+"project."
 msgstr ""
-"Audacious Scrobbler 2.0 -liitännäinen, luonut Pitxyoki,\n"
+"Audacious Scrobbler Plugin 2.0 by Pitxyoki,\n"
 "\n"
 "Copyright © 2012-2013 Luís M. Picciochi Oliveira <Pitxyoki@Gmail.com>\n"
 "\n"
-"Kiitos John Lindgrenille avusta projektin alussa.\n"
-"\n"
+"Kiitos John Lindgrenille, että hän anusti minua tämän projektin alussa."
 
-#: src/scrobbler2/scrobbler_communication.cc:642
-msgid ""
-"Audacious is now using an improved version of the Last.fm Scrobbler.\n"
-"Please check the Preferences for the Scrobbler plugin."
-msgstr ""
-"Audacious käyttää parannettua versiota Last.fm Scrobblerista.\n"
-"Scrobbler -liitännäinen löytyy asetuksista."
-
-#: src/sdlout/sdlout.cc:48
+#: src/sdlout/sdlout.cc:43
 msgid "SDL Output"
 msgstr "SDL-lähtö"
 
-#: src/sdlout/sdlout.cc:77
+#: src/sdlout/sdlout.cc:72
 msgid ""
 "SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
 msgstr ""
-"SDL-lähdön liitännäinen Audacioukselle\n"
+"SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
 
-#: src/search-tool/search-tool.cc:116 src/search-tool/search-tool.cc:124
+#: src/search-tool/library.cc:35 src/search-tool/library.cc:46
+#: src/search-tool-qt/library.cc:35 src/search-tool-qt/library.cc:46
 msgid "Library"
 msgstr "Kirjasto"
 
-#: src/search-tool/search-tool.cc:394
-#, c-format
-msgid "%d result"
-msgid_plural "%d results"
-msgstr0 "%d tulos"
-msgstr1 "%d tulosta"
-
-#: src/search-tool/search-tool.cc:400
-#, c-format
-msgid "(%d hidden)"
-msgid_plural "(%d hidden)"
-msgstr0 "(%d piilotettu)"
-msgstr1 "(%d piilotettua)"
-
-#: src/search-tool/search-tool.cc:594
+#: src/search-tool-qt/search-model.cc:44 src/search-tool/search-tool.cc:287
 #, c-format
 msgid "%d song"
 msgid_plural "%d songs"
 msgstr0 "%d kappale"
 msgstr1 "%d kappaletta"
 
-#: src/search-tool/search-tool.cc:601
+#: src/search-tool-qt/search-model.cc:53 src/search-tool/search-tool.cc:294
 msgid "of this genre"
-msgstr ""
+msgstr "tämän tyylilajin"
 
-#: src/search-tool/search-tool.cc:607
+#: src/search-tool-qt/search-model.h:47 src/search-tool/search-model.h:45
 msgid "on"
-msgstr ""
+msgstr "on"
 
-#: src/search-tool/search-tool.cc:607
+#: src/search-tool-qt/search-model.h:47 src/search-tool/search-model.h:45
 msgid "by"
-msgstr ""
+msgstr "kautta"
 
-#: src/search-tool/search-tool.cc:643
-msgid "_Create Playlist"
-msgstr "_Luo soittolista"
+#: src/search-tool-qt/search-tool-qt.cc:165 src/search-tool/search-tool.cc:74
+msgid "Number of results to show:"
+msgstr "Näytettävien tulosten määrä:"
 
-#: src/search-tool/search-tool.cc:645
-msgid "_Add to Playlist"
-msgstr "L_isää soittolistalle"
+#: src/search-tool-qt/search-tool-qt.cc:168 src/search-tool/search-tool.cc:77
+msgid "Rescan library at startup"
+msgstr "Tutki kirjasto uudelleen käynnistyksen yhteydessä"
 
-#: src/search-tool/search-tool.cc:684
-msgid "Search library"
-msgstr "Etsi kirjastosta"
+#: src/search-tool-qt/search-tool-qt.cc:170
+msgid "Monitor library for changes"
+msgstr "Seuraa kirjaston muutoksia"
 
-#: src/search-tool/search-tool.cc:688
+#: src/search-tool-qt/search-tool-qt.cc:193 src/search-tool/search-tool.cc:450
 msgid ""
 "To import your music library into Audacious, choose a folder and then click "
 "the \"refresh\" icon."
@@ -3032,21 +3379,43 @@
 "Tuodaksesi musiikkikirjastosi Audacioukseen, valitse kansio ja paina sen "
 "jälkeen päivitys painiketta."
 
-#: src/search-tool/search-tool.cc:696
+#: src/search-tool-qt/search-tool-qt.cc:195 src/search-tool/search-tool.cc:459
 msgid "Please wait ..."
 msgstr "Odota..."
 
-#: src/search-tool/search-tool.cc:723
+#: src/search-tool-qt/search-tool-qt.cc:197 src/search-tool/search-tool.cc:487
 msgid "Choose Folder"
 msgstr "Valitse kansio"
 
+#: src/search-tool-qt/search-tool-qt.cc:201 src/search-tool/search-tool.cc:445
+msgid "Search library"
+msgstr "Etsi kirjastosta"
+
+#: src/search-tool-qt/search-tool-qt.cc:327 src/search-tool/search-tool.cc:156
+#, c-format
+msgid "%d of %d result shown"
+msgid_plural "%d of %d results shown"
+msgstr0 "Näytetään %d/%d tulos"
+msgstr1 "Näytetään %d/%d tulosta"
+
+#: src/search-tool-qt/search-tool-qt.cc:331 src/search-tool/search-tool.cc:160
+#, c-format
+msgid "%d result"
+msgid_plural "%d results"
+msgstr0 "%d tulos"
+msgstr1 "%d tulosta"
+
+#: src/search-tool-qt/search-tool-qt.cc:501 src/search-tool/search-tool.cc:341
+msgid "_Create Playlist"
+msgstr "_Luo soittolista"
+
+#: src/search-tool-qt/search-tool-qt.cc:503 src/search-tool/search-tool.cc:343
+msgid "_Add to Playlist"
+msgstr "L_isää soittolistalle"
+
 #: src/sid/xmms-sid.cc:43
 msgid "SID Player"
-msgstr ""
-
-#: src/sid/xs_config.cc:61
-msgid "Output"
-msgstr ""
+msgstr "SID soitin"
 
 #: src/sid/xs_config.cc:62
 msgid "Channels:"
@@ -3054,59 +3423,59 @@
 
 #: src/sid/xs_config.cc:68
 msgid "Emulation"
-msgstr ""
+msgstr "Emulointi"
 
 #: src/sid/xs_config.cc:69
 msgid "Emulate MOS 8580 (default: MOS 6581)"
-msgstr ""
+msgstr "Emuloi MOS 8580 (oletus: MOS 6581)"
 
 #: src/sid/xs_config.cc:71
 msgid "Do not automatically select chip model"
-msgstr ""
+msgstr "Älä valitse äänipiiriä automaattisesti"
 
 #: src/sid/xs_config.cc:73
 msgid "Emulate filter"
-msgstr ""
+msgstr "Emuloi suodatin"
 
 #: src/sid/xs_config.cc:75
 msgid "Clock speed:"
-msgstr ""
+msgstr "Kellon nopeus:"
 
 #: src/sid/xs_config.cc:78
 msgid "Do not automatically select clock speed"
-msgstr ""
+msgstr "Älä valitse kellon nopeutta automaattisesti"
 
 #: src/sid/xs_config.cc:80
 msgid "Playback time"
-msgstr ""
+msgstr "Toistoaika"
 
 #: src/sid/xs_config.cc:81
 msgid "Set maximum playback time:"
-msgstr ""
+msgstr "Aseta enimmäistoistoaika:"
 
 #: src/sid/xs_config.cc:87
 msgid "Use only when song length is unknown"
-msgstr ""
+msgstr "Käytä vain, kun kappaleen pituutta ei tunneta"
 
 #: src/sid/xs_config.cc:90
 msgid "Set minimum playback time:"
-msgstr ""
+msgstr "Aseta minimitoistoaika:"
 
 #: src/sid/xs_config.cc:96
 msgid "Subtunes"
-msgstr ""
+msgstr "Subtunes"
 
 #: src/sid/xs_config.cc:97
 msgid "Enable subtunes"
-msgstr ""
+msgstr "Käytä subtunesia"
 
 #: src/sid/xs_config.cc:99
 msgid "Ignore subtunes shorter than:"
-msgstr ""
+msgstr "Ohita sävelet, jotka ovat lyhyempiä kuin:"
 
 #: src/sid/xs_config.cc:105
 msgid "Note"
-msgstr ""
+msgstr "Nuotti"
 
 #: src/silence-removal/silence-removal.cc:39
 msgid "Silence Removal"
@@ -3117,6 +3486,8 @@
 "Silence Removal Plugin for Audacious\n"
 "Copyright 2014 John Lindgren"
 msgstr ""
+"Hiljaisuuden poiston lisäosa Audaciousille\n"
+"Copyright 2014 John Lindgren"
 
 #: src/silence-removal/silence-removal.cc:67
 msgid "Silence Removal"
@@ -3126,741 +3497,684 @@
 msgid "Threshold:"
 msgstr "Raja-arvo:"
 
-#: src/silence-removal/silence-removal.cc:70
-msgid "dB"
-msgstr "dB"
+#: src/skins/actions.cc:45 src/skins-qt/actions.cc:43
+msgid "Repeat points cleared."
+msgstr "Kertauspisteet tyhjennetty."
+
+#: src/skins/actions.cc:60 src/skins-qt/actions.cc:58
+msgid "Repeat point A set."
+msgstr "Kertauksen alkupiste A asetettu."
+
+#: src/skins/actions.cc:65 src/skins-qt/actions.cc:63
+msgid "Repeat point B set."
+msgstr "Kertauksen loppupiste B asetettu."
+
+#: src/skins/equalizer.cc:223 src/skins-qt/equalizer.cc:223
+msgid "Preamp"
+msgstr "Esivahvistus"
+
+#: src/skins/equalizer.cc:227 src/skins-qt/equalizer.cc:227
+msgid "31 Hz"
+msgstr "31 Hz"
 
-#: src/skins/menus.cc:64
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "63 Hz"
+msgstr "63 Hz"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "125 Hz"
+msgstr "125 Hz"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "250 Hz"
+msgstr "250 Hz"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "500 Hz"
+msgstr "500 Hz"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "1 kHz"
+msgstr "1 kHz"
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "2 kHz"
+msgstr "2 kHz"
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "4 kHz"
+msgstr "4 kHz"
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "8 kHz"
+msgstr "8 kHz"
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "16 kHz"
+msgstr "16 kHz"
+
+#: src/skins/equalizer.cc:270 src/skins-qt/equalizer.cc:270
+msgid "Audacious Equalizer"
+msgstr "Audaciouksen taajuuskorjain"
+
+#: src/skins/main.cc:459 src/skins-qt/main.cc:442
+msgid "Recording on"
+msgstr "Äänitys"
+
+#: src/skins/main.cc:461 src/skins-qt/main.cc:444
+msgid "Recording off"
+msgstr "Äänitys pois"
+
+#: src/skins/main.cc:754 src/skins-qt/main.cc:701
+#, c-format
+msgid "Seek to %d:%-2.2d / %d:%-2.2d"
+msgstr "Siirry kohtaan %d:%-2.2d / %d:%-2.2d"
+
+#: src/skins/main.cc:771 src/skins-qt/main.cc:718
+#, c-format
+msgid "Volume: %d%%"
+msgstr "Äänenvoimakkuus: %d%%"
+
+#: src/skins/main.cc:784 src/skins-qt/main.cc:731
+#, c-format
+msgid "Balance: %d%% left"
+msgstr "Tasapaino: %d%% vasen"
+
+#: src/skins/main.cc:786 src/skins-qt/main.cc:733
+msgid "Balance: center"
+msgstr "Tasapaino: keskellä"
+
+#: src/skins/main.cc:788 src/skins-qt/main.cc:735
+#, c-format
+msgid "Balance: %d%% right"
+msgstr "Tasapaino: %d%% oikea"
+
+#: src/skins/main.cc:880 src/skins-qt/main.cc:827
+msgid "Options Menu"
+msgstr "Asetusvalikko"
+
+#: src/skins/main.cc:884 src/skins-qt/main.cc:831
+msgid "Disable 'Always On Top'"
+msgstr "Poista käytöstä 'Aina päällimmäisenä'"
+
+#: src/skins/main.cc:886 src/skins-qt/main.cc:833
+msgid "Enable 'Always On Top'"
+msgstr "Käytä 'Aina päällimmäisenä'"
+
+#: src/skins/main.cc:889 src/skins-qt/main.cc:836
+msgid "File Info Box"
+msgstr "Tiedoston tietolaatikko"
+
+#: src/skins/main.cc:892 src/skins/menus.cc:149 src/skins-qt/main.cc:839
+#: src/skins-qt/menus.cc:142
+msgid "Double Size"
+msgstr "Tuplakoko"
+
+#: src/skins/main.cc:895 src/skins-qt/main.cc:842
+msgid "Visualizations"
+msgstr "Visualisoinnit"
+
+#: src/skins/menus.cc:74 src/skins-qt/menus.cc:64
+msgid "Volume Up"
+msgstr "Nosta äänenvoimakkuutta"
+
+#: src/skins/menus.cc:75 src/skins-qt/menus.cc:65
+msgid "Volume Down"
+msgstr "Laske äänenvoimakkuutta"
+
+#: src/skins/menus.cc:77 src/skins-qt/menus.cc:67
+msgid "Effects ..."
+msgstr "Tehosteet..."
+
+#: src/skins/menus.cc:84 src/skins-qt/menus.cc:74
 msgid "Open Files ..."
 msgstr "Avaa tiedostoja..."
 
-#: src/skins/menus.cc:65
+#: src/skins/menus.cc:85 src/skins-qt/menus.cc:76
 msgid "Open URL ..."
 msgstr "Avaa URL..."
 
-#: src/skins/menus.cc:66
-msgid "Search Library"
-msgstr "Etsi kirjastosta"
-
-#: src/skins/menus.cc:68
-msgid "Playback"
-msgstr "Toisto"
-
-#: src/skins/menus.cc:69
+#: src/skins/menus.cc:89 src/skins-qt/menus.cc:80
 msgid "Playlist"
 msgstr "Soittolista"
 
-#: src/skins/menus.cc:70
+#: src/skins/menus.cc:90 src/skins-qt/menus.cc:81
+msgid "Output"
+msgstr "Ulostulo"
+
+#: src/skins/menus.cc:91 src/skins-qt/menus.cc:82
 msgid "View"
 msgstr "Näkymä"
 
-#: src/skins/menus.cc:72 src/skins/menus.cc:136 src/skins/menus.cc:149
-#: src/skins/menus.cc:214
+#: src/skins/menus.cc:93 src/skins/menus.cc:161 src/skins/menus.cc:174
+#: src/skins/menus.cc:245 src/skins-qt/menus.cc:84 src/skins-qt/menus.cc:156
+#: src/skins-qt/menus.cc:170 src/skins-qt/menus.cc:241
 msgid "Services"
 msgstr "Palvelut"
 
-#: src/skins/menus.cc:74
+#: src/skins/menus.cc:95 src/skins-qt/menus.cc:86
 msgid "About ..."
 msgstr "Tietoja..."
 
-#: src/skins/menus.cc:75
+#: src/skins/menus.cc:96 src/skins-qt/menus.cc:87
 msgid "Settings ..."
 msgstr "Asetukset..."
 
-#: src/skins/menus.cc:76
+#: src/skins/menus.cc:97 src/skins-qt/menus.cc:88
 msgid "Quit"
 msgstr "Lopeta"
 
-#: src/skins/menus.cc:80 src/skins/menus.cc:206
+#: src/skins/menus.cc:101 src/skins/menus.cc:235 src/skins-qt/menus.cc:92
+#: src/skins-qt/menus.cc:231
 msgid "Song Info ..."
 msgstr "Kappaleen tiedot..."
 
-#: src/skins/menus.cc:84
+#: src/skins/menus.cc:105 src/skins-qt/menus.cc:96
+msgid "Shuffle by Album"
+msgstr "Sekoita levyn mukaan"
+
+#: src/skins/menus.cc:106 src/skins-qt/menus.cc:97
 msgid "No Playlist Advance"
 msgstr "Älä etene soittolistalla"
 
-#: src/skins/menus.cc:85
-msgid "Stop After This Song"
-msgstr "Lopeta tämän kappaleen jälkeen"
-
-#: src/skins/menus.cc:93
+#: src/skins/menus.cc:117 src/skins-qt/menus.cc:108
 msgid "Set A-B Repeat"
-msgstr ""
+msgstr "Aseta A-B-kertaus"
 
-#: src/skins/menus.cc:94
+#: src/skins/menus.cc:118 src/skins-qt/menus.cc:109
 msgid "Clear A-B Repeat"
-msgstr ""
+msgstr "Pyyhi A-B-kertaus"
 
-#: src/skins/menus.cc:96
+#: src/skins/menus.cc:120 src/skins-qt/menus.cc:111
 msgid "Jump to Song ..."
 msgstr "Siirry kappaleeseen..."
 
-#: src/skins/menus.cc:97
+#: src/skins/menus.cc:121 src/skins-qt/menus.cc:113
 msgid "Jump to Time ..."
 msgstr "Siirry kohtaan..."
 
-#: src/skins/menus.cc:101
+#: src/skins/menus.cc:125 src/skins-qt/menus.cc:118
 msgid "Play/Resume"
-msgstr ""
+msgstr "Toista/Jatka"
 
-#: src/skins/menus.cc:103
+#: src/skins/menus.cc:127 src/skins-qt/menus.cc:120
 msgid "New Playlist"
 msgstr "Uusi soittolista"
 
-#: src/skins/menus.cc:104
+#: src/skins/menus.cc:128 src/skins-qt/menus.cc:121
 msgid "Rename Playlist ..."
 msgstr "Nimeä uudelleen soittolista..."
 
-#: src/skins/menus.cc:105
+#: src/skins/menus.cc:129 src/skins-qt/menus.cc:122
 msgid "Remove Playlist"
 msgstr "Poista soittolista"
 
-#: src/skins/menus.cc:107
+#: src/skins/menus.cc:131 src/skins-qt/menus.cc:124
 msgid "Previous Playlist"
 msgstr "Edellinen soittolista"
 
-#: src/skins/menus.cc:108
+#: src/skins/menus.cc:132 src/skins-qt/menus.cc:125
 msgid "Next Playlist"
 msgstr "Seuraava soittolista"
 
-#: src/skins/menus.cc:110
+#: src/skins/menus.cc:134 src/skins-qt/menus.cc:127
 msgid "Import Playlist ..."
 msgstr "Tuo soittolista..."
 
-#: src/skins/menus.cc:111
+#: src/skins/menus.cc:135 src/skins-qt/menus.cc:128
 msgid "Export Playlist ..."
 msgstr "Vie soittolista..."
 
-#: src/skins/menus.cc:113
+#: src/skins/menus.cc:137 src/skins-qt/menus.cc:130
 msgid "Playlist Manager ..."
 msgstr "Soittolistan hallinta..."
 
-#: src/skins/menus.cc:114
+#: src/skins/menus.cc:138 src/skins-qt/menus.cc:131
 msgid "Queue Manager ..."
 msgstr "Jonohallinta..."
 
-#: src/skins/menus.cc:116
+#: src/skins/menus.cc:140 src/skins-qt/menus.cc:133
 msgid "Refresh Playlist"
 msgstr "Päivitä soittolista"
 
-#: src/skins/menus.cc:120
+#: src/skins/menus.cc:144 src/skins-qt/menus.cc:137
 msgid "Show Playlist Editor"
 msgstr "Näytä soittolistan muokkain"
 
-#: src/skins/menus.cc:121
+#: src/skins/menus.cc:145 src/skins-qt/menus.cc:138
 msgid "Show Equalizer"
 msgstr "Näytä taajuuskorjain"
 
-#: src/skins/menus.cc:123
+#: src/skins/menus.cc:147 src/skins-qt/menus.cc:140
 msgid "Show Remaining Time"
 msgstr "Näytä jäljellä oleva aika"
 
-#: src/skins/menus.cc:125
+#: src/skins/menus.cc:150 src/skins-qt/menus.cc:143
 msgid "Always on Top"
 msgstr "Aina päällimmäisenä"
 
-#: src/skins/menus.cc:126
+#: src/skins/menus.cc:151 src/skins-qt/menus.cc:145
 msgid "On All Workspaces"
 msgstr "Kaikissa työtiloissa"
 
-#: src/skins/menus.cc:128
+#: src/skins/menus.cc:153 src/skins-qt/menus.cc:148
 msgid "Roll Up Player"
-msgstr ""
+msgstr "Rullaa soitin ylös"
 
-#: src/skins/menus.cc:129
+#: src/skins/menus.cc:154 src/skins-qt/menus.cc:149
 msgid "Roll Up Playlist Editor"
-msgstr ""
+msgstr "Rullaa soittolistan muokkain ylös"
 
-#: src/skins/menus.cc:130
+#: src/skins/menus.cc:155 src/skins-qt/menus.cc:150
 msgid "Roll Up Equalizer"
-msgstr ""
+msgstr "Rullaa taajuuskorjain ylös"
 
-#: src/skins/menus.cc:132 src/skins/ui_main.cc:854
-msgid "Double Size"
-msgstr ""
-
-#: src/skins/menus.cc:138
+#: src/skins/menus.cc:163 src/skins-qt/menus.cc:158
 msgid "Add URL ..."
 msgstr "Lisää URL..."
 
-#: src/skins/menus.cc:139
+#: src/skins/menus.cc:164 src/skins-qt/menus.cc:160
 msgid "Add Files ..."
 msgstr "Lisää tiedostoja..."
 
-#: src/skins/menus.cc:143 src/skins/menus.cc:171 src/skins/menus.cc:185
+#: src/skins/menus.cc:168 src/skins/menus.cc:196 src/skins/menus.cc:212
+#: src/skins-qt/menus.cc:164 src/skins-qt/menus.cc:192
+#: src/skins-qt/menus.cc:208
 msgid "By Title"
 msgstr "Nimen mukaan"
 
-#: src/skins/menus.cc:144 src/skins/menus.cc:178 src/skins/menus.cc:192
+#: src/skins/menus.cc:169 src/skins/menus.cc:203 src/skins/menus.cc:219
+#: src/skins-qt/menus.cc:165 src/skins-qt/menus.cc:199
+#: src/skins-qt/menus.cc:215
 msgid "By File Name"
-msgstr ""
+msgstr "Tiedostonimen mukaan"
 
-#: src/skins/menus.cc:145 src/skins/menus.cc:179 src/skins/menus.cc:193
+#: src/skins/menus.cc:170 src/skins/menus.cc:204 src/skins/menus.cc:220
+#: src/skins-qt/menus.cc:166 src/skins-qt/menus.cc:200
+#: src/skins-qt/menus.cc:216
 msgid "By File Path"
-msgstr ""
+msgstr "Tiedostopolun mukaan"
 
-#: src/skins/menus.cc:151
+#: src/skins/menus.cc:176 src/skins-qt/menus.cc:172
 msgid "Remove All"
 msgstr "Poista kaikki"
 
-#: src/skins/menus.cc:152
+#: src/skins/menus.cc:177 src/skins-qt/menus.cc:173
 msgid "Clear Queue"
 msgstr "Tyhjennä jono"
 
-#: src/skins/menus.cc:154
+#: src/skins/menus.cc:179 src/skins-qt/menus.cc:175
 msgid "Remove Unavailable Files"
 msgstr "Poista ei saatavilla olevat tiedostot"
 
-#: src/skins/menus.cc:155
+#: src/skins/menus.cc:180 src/skins-qt/menus.cc:176
 msgid "Remove Duplicates"
 msgstr "Poista kopiot"
 
-#: src/skins/menus.cc:157
+#: src/skins/menus.cc:182 src/skins-qt/menus.cc:178
 msgid "Remove Unselected"
 msgstr "Poista ei valitut"
 
-#: src/skins/menus.cc:158
+#: src/skins/menus.cc:183 src/skins-qt/menus.cc:179
 msgid "Remove Selected"
 msgstr "Poista valitut"
 
-#: src/skins/menus.cc:162
+#: src/skins/menus.cc:187 src/skins-qt/menus.cc:183
 msgid "Search and Select"
 msgstr "Etsi ja valitse"
 
-#: src/skins/menus.cc:164
+#: src/skins/menus.cc:189 src/skins-qt/menus.cc:185
 msgid "Invert Selection"
 msgstr "Käänteinen valinta"
 
-#: src/skins/menus.cc:165
+#: src/skins/menus.cc:190 src/skins-qt/menus.cc:186
 msgid "Select None"
 msgstr "Ei mitään"
 
-#: src/skins/menus.cc:166
+#: src/skins/menus.cc:191 src/skins-qt/menus.cc:187
 msgid "Select All"
 msgstr "Valitse kaikki"
 
-#: src/skins/menus.cc:170 src/skins/menus.cc:184
+#: src/skins/menus.cc:195 src/skins/menus.cc:211 src/skins-qt/menus.cc:191
+#: src/skins-qt/menus.cc:207
 msgid "By Track Number"
 msgstr "Raidan mukaan"
 
-#: src/skins/menus.cc:172 src/skins/menus.cc:186
+#: src/skins/menus.cc:197 src/skins/menus.cc:213 src/skins-qt/menus.cc:193
+#: src/skins-qt/menus.cc:209
 msgid "By Artist"
 msgstr "Esittäjän mukaan"
 
-#: src/skins/menus.cc:173 src/skins/menus.cc:187
+#: src/skins/menus.cc:198 src/skins/menus.cc:214 src/skins-qt/menus.cc:194
+#: src/skins-qt/menus.cc:210
 msgid "By Album"
-msgstr "Albumin mukaan"
+msgstr "Levyn mukaan"
 
-#: src/skins/menus.cc:174 src/skins/menus.cc:188
+#: src/skins/menus.cc:199 src/skins/menus.cc:215 src/skins-qt/menus.cc:195
+#: src/skins-qt/menus.cc:211
 msgid "By Album Artist"
-msgstr ""
+msgstr "Levyn esittäjäjän mukaan"
 
-#: src/skins/menus.cc:175 src/skins/menus.cc:190
+#: src/skins/menus.cc:200 src/skins/menus.cc:216 src/skins-qt/menus.cc:196
+#: src/skins-qt/menus.cc:212
 msgid "By Release Date"
-msgstr ""
+msgstr "Julkaisupäivän mukaan"
 
-#: src/skins/menus.cc:176 src/skins/menus.cc:189
+#: src/skins/menus.cc:201 src/skins/menus.cc:217 src/skins-qt/menus.cc:197
+#: src/skins-qt/menus.cc:213
 msgid "By Genre"
-msgstr ""
+msgstr "Tyylilajin mukaan"
 
-#: src/skins/menus.cc:177 src/skins/menus.cc:191
+#: src/skins/menus.cc:202 src/skins/menus.cc:218 src/skins-qt/menus.cc:198
+#: src/skins-qt/menus.cc:214
 msgid "By Length"
-msgstr ""
+msgstr "Keston mukaan"
 
-#: src/skins/menus.cc:180 src/skins/menus.cc:194
+#: src/skins/menus.cc:205 src/skins/menus.cc:221 src/skins-qt/menus.cc:201
+#: src/skins-qt/menus.cc:217
 msgid "By Custom Title"
-msgstr ""
+msgstr "Mukautetun nimen mukaan"
+
+#: src/skins/menus.cc:206 src/skins/menus.cc:222 src/skins-qt/menus.cc:202
+#: src/skins-qt/menus.cc:218
+msgid "By Comment"
+msgstr "Kommentin mukaan"
+
+#: src/skins/menus.cc:207 src/skins/menus.cc:223 src/skins-qt/menus.cc:203
+#: src/skins-qt/menus.cc:219
+msgid "By Disc Number"
+msgstr "Levynumeron mukaan"
 
-#: src/skins/menus.cc:198
+#: src/skins/menus.cc:227 src/skins-qt/menus.cc:223
 msgid "Randomize List"
 msgstr "Sekoita lista"
 
-#: src/skins/menus.cc:199
+#: src/skins/menus.cc:228 src/skins-qt/menus.cc:224
 msgid "Reverse List"
 msgstr "Käännä lista"
 
-#: src/skins/menus.cc:201
+#: src/skins/menus.cc:230 src/skins-qt/menus.cc:226
 msgid "Sort Selected"
 msgstr "Järjestä valitut"
 
-#: src/skins/menus.cc:202
+#: src/skins/menus.cc:231 src/skins-qt/menus.cc:227
 msgid "Sort List"
 msgstr "Lajittele lista"
 
-#: src/skins/menus.cc:208
+#: src/skins/menus.cc:236 src/skins-qt/menus.cc:232
+msgid "Open Containing Folder"
+msgstr "Avaa sisältävä kansio"
+
+#: src/skins/menus.cc:238 src/skins-qt/menus.cc:234
 msgid "Cut"
 msgstr "Leikkaa"
 
-#: src/skins/menus.cc:209
+#: src/skins/menus.cc:239 src/skins-qt/menus.cc:235
 msgid "Copy"
 msgstr "Kopioi"
 
-#: src/skins/menus.cc:210
+#: src/skins/menus.cc:240 src/skins-qt/menus.cc:236
 msgid "Paste"
 msgstr "Liitä"
 
-#: src/skins/menus.cc:212
-msgid "Queue/Unqueue"
-msgstr ""
+#: src/skins/menus.cc:241 src/skins-qt/menus.cc:237
+msgid "Paste at End"
+msgstr "Liitä loppuun"
 
-#: src/skins/menus.cc:218
-msgid "Load Preset ..."
-msgstr "Lataa esiasetus..."
+#: src/skins/menus.cc:243 src/skins-qt/menus.cc:239
+msgid "Queue/Unqueue"
+msgstr "Jonoon/Jonosta"
 
-#: src/skins/menus.cc:219
-msgid "Load Auto Preset ..."
-msgstr ""
+#: src/skins/playlist-widget.cc:58 src/skins-qt/playlist-widget.cc:58
+#, c-format
+msgid "%s (%d of %d)"
+msgstr "%s (%d / %d)"
 
-#: src/skins/menus.cc:220
-msgid "Load Default"
-msgstr "Lataa oletus"
+#: src/skins/playlistwin.cc:491 src/skins-qt/playlistwin.cc:478
+msgid "Audacious Playlist Editor"
+msgstr "Audaciouksen soittolistan muokkain"
 
-#: src/skins/menus.cc:221
-msgid "Load Preset File ..."
-msgstr "Lataa esiasetustiedosto..."
+#: src/skins/plugin.cc:53 src/skins-qt/plugin.cc:65
+msgid "Winamp Classic Interface"
+msgstr "Winampin klassinen käyttöliittymä"
 
-#: src/skins/menus.cc:222
-msgid "Load EQF File ..."
-msgstr "Lataa EQF-tiedosto..."
+#: src/skins-qt/menus.cc:75
+msgid "Open Folder ..."
+msgstr "Avaa kansio..."
+
+#: src/skins-qt/menus.cc:159
+msgid "Add Folder ..."
+msgstr "Lisää kansio..."
 
-#: src/skins/menus.cc:224
-msgid "Save Preset ..."
-msgstr "Tallenna esiasetus..."
+#: src/skins-qt/search-select.cc:62 src/skins/search-select.cc:77
+msgid "Search entries in active playlist"
+msgstr "Etsi kappaleita aktiivisesta soittolistasta"
 
-#: src/skins/menus.cc:225
-msgid "Save Auto Preset ..."
+#: src/skins-qt/search-select.cc:70 src/skins/search-select.cc:83
+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/menus.cc:226
-msgid "Save Default"
-msgstr "Tallenna oletus"
-
-#: src/skins/menus.cc:227
-msgid "Save Preset File ..."
-msgstr "Tallenna esiasetustiedosto..."
+#: src/skins-qt/search-select.cc:75 src/skins/search-select.cc:91
+msgid "Title:"
+msgstr "Nimi:"
 
-#: src/skins/menus.cc:228
-msgid "Save EQF File ..."
-msgstr "Tallenna EQF-tiedosto..."
+#: src/skins-qt/search-select.cc:79 src/skins/search-select.cc:96
+msgid "Album:"
+msgstr "Levy:"
 
-#: src/skins/menus.cc:230
-msgid "Delete Preset ..."
-msgstr "Poista esiasetus..."
+#: src/skins-qt/search-select.cc:82 src/skins/search-select.cc:101
+msgid "Artist:"
+msgstr "Esittäjä:"
 
-#: src/skins/menus.cc:231
-msgid "Delete Auto Preset ..."
-msgstr ""
+#: src/skins-qt/search-select.cc:85 src/skins/search-select.cc:106
+msgid "File Name:"
+msgstr "Tiedostonimi:"
 
-#: src/skins/menus.cc:233
-msgid "Import Winamp Presets ..."
-msgstr "Tuo Winamp-esiasetukset..."
+#: src/skins-qt/search-select.cc:88 src/skins/search-select.cc:134
+msgid "Clear previous selection before searching"
+msgstr "Tyhjennä aiempi valinta ennen hakemista"
 
-#: src/skins/menus.cc:235
-msgid "Reset to Zero"
-msgstr ""
+#: src/skins-qt/search-select.cc:89 src/skins/search-select.cc:137
+msgid "Automatically toggle queue for matching entries"
+msgstr "Lisää tai poista automaattisesti täsmäävät kappaleet jonosta"
 
-#: src/skins/plugin.cc:48
-msgid "Winamp Classic Interface"
-msgstr "Winampin klassinen käyttöliittymä"
+#: src/skins-qt/search-select.cc:90 src/skins/search-select.cc:140
+msgid "Create a new playlist with matching entries"
+msgstr "Luo uusi soittolista täsmäävistä kappaleista"
 
-#: src/skins/preset-browser.cc:57 src/skins/preset-list.cc:371
-#: src/skins/preset-list.cc:386
-msgid "Save"
-msgstr "Tallenna"
-
-#: src/skins/preset-browser.cc:57 src/skins/preset-list.cc:338
-#: src/skins/preset-list.cc:354
-msgid "Load"
-msgstr "Lataa"
-
-#: src/skins/preset-browser.cc:83
-msgid "Load Preset File"
-msgstr "Lataa esiasetustiedosto"
-
-#: src/skins/preset-browser.cc:100
-msgid "Load EQF File"
-msgstr "Lataa EQF-tiedosto"
-
-#: src/skins/preset-browser.cc:119
-msgid "Save Preset File"
-msgstr "Tallenna esiasetustiedosto"
-
-#: src/skins/preset-browser.cc:137
-msgid "Save EQF File"
-msgstr "Tallenna EQF-tiedosto"
-
-#: src/skins/preset-browser.cc:151
-msgid "Import Winamp Presets"
-msgstr "Tuo Winamp-esiasetukset"
-
-#: src/skins/preset-list.cc:285
-msgid "Presets"
-msgstr "Esiasetukset"
-
-#: src/skins/preset-list.cc:335
-msgid "Load preset"
-msgstr "Lataa esiasetus"
-
-#: src/skins/preset-list.cc:351
-msgid "Load auto-preset"
-msgstr "Lataa automaattinen esiasetus"
-
-#: src/skins/preset-list.cc:367
-msgid "Save preset"
-msgstr "Tallenna esiasetukset"
-
-#: src/skins/preset-list.cc:382
-msgid "Save auto-preset"
-msgstr "Tallenna automaattinen esiasetus"
-
-#: src/skins/preset-list.cc:408
-msgid "Delete preset"
-msgstr "Poista esiasetus"
-
-#: src/skins/preset-list.cc:424
-msgid "Delete auto-preset"
-msgstr "Poista automaattisesti ladattava esiasetus"
+#: src/skins-qt/search-select.cc:101 src/skins/search-select.cc:78
+msgid "Search"
+msgstr "Etsi"
 
-#: src/skins/skins_cfg.cc:176
+#: src/skins-qt/skins_cfg.cc:198 src/skins/skins_cfg.cc:182
 msgid "Player:"
 msgstr "Soitin:"
 
-#: src/skins/skins_cfg.cc:178
+#: src/skins-qt/skins_cfg.cc:200 src/skins/skins_cfg.cc:184
 msgid "Select main player window font:"
 msgstr "Valitse pääikkunan kirjasin:"
 
-#: src/skins/skins_cfg.cc:179
+#: src/skins-qt/skins_cfg.cc:201 src/skins/skins_cfg.cc:185
 msgid "Playlist:"
 msgstr "Soittolista:"
 
-#: src/skins/skins_cfg.cc:181
+#: src/skins-qt/skins_cfg.cc:203 src/skins/skins_cfg.cc:187
 msgid "Select playlist font:"
 msgstr "Valitse soittolistan kirjasin:"
 
-#: src/skins/skins_cfg.cc:187
+#: src/skins-qt/skins_cfg.cc:207 src/skins/skins_cfg.cc:191
 msgid "Skin"
-msgstr ""
+msgstr "Ulkoasu"
+
+#: src/skins-qt/skins_cfg.cc:211 src/skins/skins_cfg.cc:193
+msgid "Display active titlebar when any window is focused"
+msgstr "Näytä aktiivinen otsikkopalkki, kun jokin ikkuna on kohdistettu"
 
-#: src/skins/skins_cfg.cc:189
+#: src/skins-qt/skins_cfg.cc:213 src/skins/skins_cfg.cc:195
 msgid "Fonts"
 msgstr "Fontit"
 
-#: src/skins/skins_cfg.cc:192
+#: src/skins-qt/skins_cfg.cc:215 src/skins/skins_cfg.cc:197
 msgid "Use bitmap fonts (supports ASCII only)"
 msgstr "Käytä bittikartta-kirjasimia (vain ASCII)"
 
-#: src/skins/skins_cfg.cc:194
+#: src/skins-qt/skins_cfg.cc:217 src/skins/skins_cfg.cc:199
 msgid "Scroll song title"
-msgstr "Vieritä kappaleen nimeä"
+msgstr "Vieritä nimeä"
 
-#: src/skins/skins_cfg.cc:196
+#: src/skins-qt/skins_cfg.cc:219 src/skins/skins_cfg.cc:201
 msgid "Scroll song title in both directions"
-msgstr "Vieritä kappaleen nimeä kumpaankin suuntaan"
+msgstr "Vieritä nimeä kumpaankin suuntaan"
 
-#: src/skins/skins_cfg.cc:201
+#: src/skins-qt/skins_cfg.cc:224 src/skins/skins_cfg.cc:206
 msgid "Analyzer"
 msgstr "Analyzer"
 
-#: src/skins/skins_cfg.cc:202
+#: src/skins-qt/skins_cfg.cc:225 src/skins/skins_cfg.cc:207
 msgid "Scope"
-msgstr "Scope"
+msgstr "Soveltamisala"
 
-#: src/skins/skins_cfg.cc:203
+#: src/skins-qt/skins_cfg.cc:226 src/skins/skins_cfg.cc:208
 msgid "Voiceprint / VU meter"
-msgstr ""
+msgstr "Äänipainemittari / VU-mittari"
 
-#: src/skins/skins_cfg.cc:204
+#: src/skins-qt/skins_cfg.cc:227 src/skins/skins_cfg.cc:209
 msgid "Off"
 msgstr "Pois"
 
-#: src/skins/skins_cfg.cc:208 src/skins/skins_cfg.cc:233
-#: src/skins/skins_cfg.cc:239
+#: src/skins-qt/skins_cfg.cc:231 src/skins-qt/skins_cfg.cc:256
+#: src/skins-qt/skins_cfg.cc:262 src/skins/skins_cfg.cc:213
+#: src/skins/skins_cfg.cc:238 src/skins/skins_cfg.cc:244
 msgid "Normal"
 msgstr "Normaali"
 
-#: src/skins/skins_cfg.cc:209 src/skins/skins_cfg.cc:234
+#: src/skins-qt/skins_cfg.cc:232 src/skins-qt/skins_cfg.cc:257
+#: src/skins/skins_cfg.cc:214 src/skins/skins_cfg.cc:239
 msgid "Fire"
 msgstr "Tuli"
 
-#: src/skins/skins_cfg.cc:210
+#: src/skins-qt/skins_cfg.cc:233 src/skins/skins_cfg.cc:215
 msgid "Vertical lines"
-msgstr ""
+msgstr "Pystysuorat viivat"
 
-#: src/skins/skins_cfg.cc:214
+#: src/skins-qt/skins_cfg.cc:237 src/skins/skins_cfg.cc:219
 msgid "Lines"
 msgstr "Viivat"
 
-#: src/skins/skins_cfg.cc:215
+#: src/skins-qt/skins_cfg.cc:238 src/skins/skins_cfg.cc:220
 msgid "Bars"
 msgstr "Palkit"
 
-#: src/skins/skins_cfg.cc:219
+#: src/skins-qt/skins_cfg.cc:242 src/skins/skins_cfg.cc:224
 msgid "Slowest"
 msgstr "Hitain"
 
-#: src/skins/skins_cfg.cc:220
+#: src/skins-qt/skins_cfg.cc:243 src/skins/skins_cfg.cc:225
 msgid "Slow"
 msgstr "Hidas"
 
-#: src/skins/skins_cfg.cc:221 src/sox-resampler/sox-resampler.cc:152
+#: src/skins-qt/skins_cfg.cc:244 src/skins/skins_cfg.cc:226
+#: src/soxr/sox-resampler.cc:180
 msgid "Medium"
 msgstr "Keskinkertainen"
 
-#: src/skins/skins_cfg.cc:222
+#: src/skins-qt/skins_cfg.cc:245 src/skins/skins_cfg.cc:227
 msgid "Fast"
 msgstr "Nopea"
 
-#: src/skins/skins_cfg.cc:223
+#: src/skins-qt/skins_cfg.cc:246 src/skins/skins_cfg.cc:228
 msgid "Fastest"
 msgstr "Nopein"
 
-#: src/skins/skins_cfg.cc:227
+#: src/skins-qt/skins_cfg.cc:250 src/skins/skins_cfg.cc:232
 msgid "Dots"
-msgstr ""
+msgstr "Pisteet"
 
-#: src/skins/skins_cfg.cc:228
+#: src/skins-qt/skins_cfg.cc:251 src/skins/skins_cfg.cc:233
 msgid "Line"
-msgstr ""
+msgstr "Viiva"
 
-#: src/skins/skins_cfg.cc:229
+#: src/skins-qt/skins_cfg.cc:252 src/skins/skins_cfg.cc:234
 msgid "Solid"
-msgstr ""
+msgstr "Kiinteä"
 
-#: src/skins/skins_cfg.cc:235
+#: src/skins-qt/skins_cfg.cc:258 src/skins/skins_cfg.cc:240
 msgid "Ice"
 msgstr "Jää"
 
-#: src/skins/skins_cfg.cc:240
+#: src/skins-qt/skins_cfg.cc:263 src/skins/skins_cfg.cc:245
 msgid "Smooth"
 msgstr "Tasainen"
 
-#: src/skins/skins_cfg.cc:244
-msgid "Type"
-msgstr "Tyyppi"
-
-#: src/skins/skins_cfg.cc:245
-msgid "Visualization type:"
-msgstr "Visualisoinnin tyyppi:"
-
-#: src/skins/skins_cfg.cc:248
-msgid "Analyzer"
-msgstr ""
-
-#: src/skins/skins_cfg.cc:249
-msgid "Show peaks"
-msgstr "Näytä piikit"
-
-#: src/skins/skins_cfg.cc:251
+#: src/skins-qt/skins_cfg.cc:267 src/skins/skins_cfg.cc:249
 msgid "Coloring:"
 msgstr "Väritys:"
 
-#: src/skins/skins_cfg.cc:254
+#: src/skins-qt/skins_cfg.cc:270 src/skins/skins_cfg.cc:252
 msgid "Style:"
 msgstr "Tyyli:"
 
-#: src/skins/skins_cfg.cc:257
+#: src/skins-qt/skins_cfg.cc:273 src/skins/skins_cfg.cc:255
 msgid "Falloff:"
-msgstr ""
+msgstr "Pudotus:"
 
-#: src/skins/skins_cfg.cc:260
+#: src/skins-qt/skins_cfg.cc:276 src/skins/skins_cfg.cc:258
 msgid "Peak falloff:"
-msgstr ""
+msgstr "Huippujen pudotus:"
 
-#: src/skins/skins_cfg.cc:264
+#: src/skins-qt/skins_cfg.cc:282 src/skins/skins_cfg.cc:264
 msgid "Scope Style:"
-msgstr ""
+msgstr "Soveltamisala:"
 
-#: src/skins/skins_cfg.cc:267
+#: src/skins-qt/skins_cfg.cc:285 src/skins/skins_cfg.cc:267
 msgid "Voiceprint Coloring:"
-msgstr ""
+msgstr "Äänijäljen väritys:"
 
-#: src/skins/skins_cfg.cc:270
+#: src/skins-qt/skins_cfg.cc:288 src/skins/skins_cfg.cc:270
 msgid "VU Meter Style:"
-msgstr ""
-
-#: src/skins/skins_cfg.cc:276
-msgid "General"
-msgstr "Yleiset"
-
-#: src/skins/skins_cfg.cc:277
-msgid "Visualization"
-msgstr "Visualisaatio"
-
-#: src/skins/ui_equalizer.cc:282
-msgid "Preamp"
-msgstr "Esivahvistus"
-
-#: src/skins/ui_equalizer.cc:286
-msgid "31 Hz"
-msgstr "31 Hz"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "63 Hz"
-msgstr "63 Hz"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "125 Hz"
-msgstr "125 Hz"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "250 Hz"
-msgstr "250 Hz"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "500 Hz"
-msgstr "500 Hz"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "1 kHz"
-msgstr "1 kHz"
-
-#: src/skins/ui_equalizer.cc:288
-msgid "2 kHz"
-msgstr "2 kHz"
-
-#: src/skins/ui_equalizer.cc:288
-msgid "4 kHz"
-msgstr "4 kHz"
-
-#: src/skins/ui_equalizer.cc:288
-msgid "8 kHz"
-msgstr "8 kHz"
-
-#: src/skins/ui_equalizer.cc:288
-msgid "16 kHz"
-msgstr "16 kHz"
-
-#: src/skins/ui_equalizer.cc:330
-msgid "Audacious Equalizer"
-msgstr "Audaciouksen taajuuskorjain"
-
-#: src/skins/ui_main.cc:688
-#, c-format
-msgid "Seek to %d:%-2.2d / %d:%-2.2d"
-msgstr "Siirry kohtaan %d:%-2.2d / %d:%-2.2d"
-
-#: src/skins/ui_main.cc:709
-#, c-format
-msgid "Volume: %d%%"
-msgstr "Äänenvoimakkuus: %d%%"
-
-#: src/skins/ui_main.cc:732
-#, c-format
-msgid "Balance: %d%% left"
-msgstr "Tasapaino: %d%% vasen"
-
-#: src/skins/ui_main.cc:734
-msgid "Balance: center"
-msgstr "Tasapaino: keskellä"
-
-#: src/skins/ui_main.cc:736
-#, c-format
-msgid "Balance: %d%% right"
-msgstr "Tasapaino: %d%% oikea"
-
-#: src/skins/ui_main.cc:842
-msgid "Options Menu"
-msgstr "Asetusvalikko"
-
-#: src/skins/ui_main.cc:846
-msgid "Disable 'Always On Top'"
-msgstr "Poista käytöstä 'Aina päällimmäisenä'"
-
-#: src/skins/ui_main.cc:848
-msgid "Enable 'Always On Top'"
-msgstr "Käytä 'Aina päällimmäisenä'"
-
-#: src/skins/ui_main.cc:851
-msgid "File Info Box"
-msgstr "Tiedoston tietolaatikko"
-
-#: src/skins/ui_main.cc:857
-msgid "Visualizations"
-msgstr ""
-
-#: src/skins/ui_main.cc:1336
-msgid "Repeat point A set."
-msgstr "Kertauksen alkupiste A asetettu."
-
-#: src/skins/ui_main.cc:1341
-msgid "Repeat point B set."
-msgstr "Kertauksen loppupiste B asetettu."
-
-#: src/skins/ui_main.cc:1350
-msgid "Repeat points cleared."
-msgstr "Kertauspisteet tyhjennetty."
+msgstr "VU-mittarin tyyli:"
 
-#: src/skins/ui_playlist.cc:219
-msgid "Search entries in active playlist"
-msgstr "Etsi kappaleita aktiivisesta soittolistasta"
-
-#: src/skins/ui_playlist.cc:226
-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.cc:234
-msgid "Title:"
-msgstr ""
-
-#: src/skins/ui_playlist.cc:241
-msgid "Album:"
-msgstr "Albumi:"
-
-#: src/skins/ui_playlist.cc:248
-msgid "Artist:"
-msgstr "Esittäjä:"
-
-#: src/skins/ui_playlist.cc:255
-msgid "File Name:"
-msgstr "Tiedostonimi:"
-
-#: src/skins/ui_playlist.cc:263
-msgid "Clear previous selection before searching"
-msgstr "Tyhjennä aiempi valinta ennen hakemista"
+#: src/skins-qt/skins_cfg.cc:294 src/skins/skins_cfg.cc:276
+msgid "Type"
+msgstr "Tyyppi"
 
-#: src/skins/ui_playlist.cc:266
-msgid "Automatically toggle queue for matching entries"
-msgstr "Lisää tai poista automaattisesti täsmäävät kappaleet jonosta"
+#: src/skins-qt/skins_cfg.cc:295 src/skins/skins_cfg.cc:277
+msgid "Visualization type:"
+msgstr "Visualisoinnin tyyppi:"
 
-#: src/skins/ui_playlist.cc:269
-msgid "Create a new playlist with matching entries"
-msgstr "Luo uusi soittolista täsmäävistä kappaleista"
+#: src/skins-qt/skins_cfg.cc:298 src/skins/skins_cfg.cc:280
+msgid "Analyzer"
+msgstr "Analysaattori"
 
-#: src/skins/ui_playlist.cc:717
-msgid "Audacious Playlist Editor"
-msgstr "Audaciouksen soittolistan muokkain"
+#: src/skins-qt/skins_cfg.cc:299 src/skins/skins_cfg.cc:281
+msgid "Show peaks"
+msgstr "Näytä piikit"
 
-#: src/skins/ui_playlist.cc:752
-#, c-format
-msgid "%s (%d of %d)"
-msgstr "%s (%d / %d)"
+#: src/skins-qt/skins_cfg.cc:308 src/skins/skins_cfg.cc:290
+msgid "Visualization"
+msgstr "Visualisaatio"
 
-#: src/skins/ui_skinselector.cc:167
+#: src/skins-qt/skinselector.cc:98 src/skins/skinselector.cc:111
 msgid "Archived Winamp 2.x skin"
 msgstr "Pakattu Winamp 2.x skini"
 
-#: src/skins/ui_skinselector.cc:172
+#: src/skins-qt/skinselector.cc:102 src/skins/skinselector.cc:115
 msgid "Unarchived Winamp 2.x skin"
 msgstr "Pakkaamaton Winamp 2.x skini"
 
-#: src/skins/util.cc:430
-#, c-format
-msgid "Could not create directory (%s): %s\n"
-msgstr "Ei voitu luoda kansiota (%s): %s\n"
-
-#: src/sndfile/plugin.cc:39
+#: src/sndfile/plugin.cc:38
 msgid "Sndfile Plugin"
-msgstr "Sndfile-liitännäinen"
+msgstr "Sndfile Plugin"
 
-#: src/sndfile/plugin.cc:336
+#: src/sndfile/plugin.cc:372
 msgid ""
 "Based on the xmms_sndfile plugin:\n"
 "Copyright (C) 2000, 2002 Erik de Castro Lopo\n"
@@ -3900,97 +4214,116 @@
 "this program; if not, write to the Free Software Foundation, Inc., 51 "
 "Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 
-#: src/sndio-ng/sndio.cc:44
+#: src/sndio/sndio.cc:43
 msgid "Sndio Output"
-msgstr ""
+msgstr "Sndio-lähtö"
 
-#: src/sndio-ng/sndio.cc:98
+#: src/sndio/sndio.cc:98
 msgid "Device (blank for default):"
 msgstr "Laite (tyhjä oletusta varten):"
 
-#: src/sndio-ng/sndio.cc:100
+#: src/sndio/sndio.cc:100
 msgid "Save and restore volume:"
-msgstr ""
+msgstr "Tallenna ja palauta voimakkuus:"
 
-#: src/sndio-ng/sndio.cc:181
+#: src/sndio/sndio.cc:181
 #, c-format
 msgid "Sndio error: Unsupported audio format (%d)"
 msgstr "Sndio-virhe: äänimuoto ei ole tuettu (%d)"
 
-#: src/sndio-ng/sndio.cc:192
+#: src/sndio/sndio.cc:192
 msgid "Sndio error: sio_open() failed"
 msgstr "Sndio-virhe: sio_open() epäonnistui"
 
-#: src/sndio-ng/sndio.cc:222
+#: src/sndio/sndio.cc:221
 msgid "Sndio error: sio_setpar() failed"
 msgstr "Sndio-virhe: sio_setpar() epäonnistui"
 
-#: src/sndio-ng/sndio.cc:234
+#: src/sndio/sndio.cc:233
 msgid "Sndio error: sio_start() failed"
 msgstr "Sndio-virhe: sio_start() epäonnistui"
 
-#: src/song_change/song_change.cc:33
+#: src/songchange/song_change.cc:30
 msgid "Song Change"
-msgstr "Kappaleen vaihtuminen"
-
-#: src/song_change/song_change.cc:342
-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."
+msgstr "Kappaleen vaihto"
 
-#: src/song_change/song_change.cc:358
+#: src/songchange/song_change.cc:256
 msgid "Commands"
 msgstr "Komennot"
 
-#: src/song_change/song_change.cc:360
+#: src/songchange/song_change.cc:258
 msgid "Command to run when starting a new song:"
-msgstr "Kappaleen alussa suoritettava komento:"
+msgstr "Komento, kun uusi kappale alkaa:"
 
-#: src/song_change/song_change.cc:364
+#: src/songchange/song_change.cc:261
+msgid "Command to run when stopping a song:"
+msgstr "Komento, kun kappale pysäytetään:"
+
+#: src/songchange/song_change.cc:264
 msgid "Command to run at the end of a song:"
-msgstr "Kappaleen päättyessä suoritettava komento:"
+msgstr "Komento, kun kappale loppuu:"
 
-#: src/song_change/song_change.cc:368
+#: src/songchange/song_change.cc:267
 msgid "Command to run at the end of the playlist:"
 msgstr "Soittolistan päättyessä suoritettava komento:"
 
-#: src/song_change/song_change.cc:372
+#: src/songchange/song_change.cc:270
 msgid "Command to run when song title changes (for network streams):"
+msgstr "Komento suoritetaan, kun kappaleen nimi vaihtuu (toisto verkkosta):"
+
+#: src/songchange/song_change.cc:273
+msgid ""
+"You can use the following format codes, which will be replaced before "
+"running the command.\n"
+"Not all are useful though for the song-stopped or end-of-playlist command."
 msgstr ""
-"Suoritettava komento, kun kappaleen nimi muuttuu (verkon suoratoistoja "
-"varten):"
+"Voit käyttää seuraavia koodeja, jotka korvataan ennen komennon "
+"suorittamista.\n"
+"Kaikki eivät ole käytännöllisiä soittolistan lopetuskomennolle:"
 
-#: src/song_change/song_change.cc:376
+#: src/songchange/song_change.cc:276
 msgid ""
-"You can use the following format strings which will be substituted before "
-"calling the command (not all are useful for the end-of-playlist command):\n"
-"\n"
-"%F: Frequency (in hertz)\n"
+"%a: Artist\n"
+"%b: Album\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"
+"%F: Frequency (Hertz)\n"
+"%l: Length (milliseconds)\n"
+"%n or %s: Formatted title (see playlist settings)\n"
 "%p: Currently playing (1 or 0)\n"
-"%a: Artist\n"
-"%b: Album\n"
-"%T: Track title"
-msgstr ""
-
-#: src/song-info-qt/song-info.cc:32
-msgid "Song Info (Qt)"
-msgstr "Kappaletiedot (Qt)"
+"%r: Rate (bits per second)\n"
+"%t: Playlist position\n"
+"%T: Title (unformatted)"
+msgstr ""
+"%a: Esittäjä\n"
+"%b: Levy\n"
+"%c: Kanavien määrä\n"
+"%f: Tiedoston nimi (täydellinen polku)\n"
+"%F: Taajuus (Hz)\n"
+"%l: Pituus (millisekunneissa)\n"
+"%n tai %s: Alustettu otsikko (katso soittolistan asetukset)\n"
+"%p: Tällä hetkellä soi (1 tai 0)\n"
+"%r: Taajuus (bittiä per sekunti)\n"
+"%t: Soittolistan sijainti\n"
+"%T: Nimi (nimeämätön)"
+
+#: src/songchange/song_change.cc:287
+msgid ""
+"Parameters passed to the shell should be enclosed in quotation marks.\n"
+"Unquoted parameters may lead to unexpected results."
+msgstr ""
+"Parametrit olisi parempi sulkea lainausmerkkeihin. Lainaamattomat\n"
+"parametrit voivat johtaa odottamattomaan tulokseen."
+
+#: src/song-info-qt/song-info.cc:30
+msgid "Song Info"
+msgstr "Kappaletieto"
 
-#: src/sox-resampler/sox-resampler.cc:44
+#: src/soxr/sox-resampler.cc:44
 msgid "SoX Resampler"
 msgstr "SoX Resampler"
 
-#: src/sox-resampler/sox-resampler.cc:144
+#: src/soxr/sox-resampler.cc:172
 msgid ""
 "SoX Resampler Plugin for Audacious\n"
 "Copyright 2013 Michał Lipski\n"
@@ -3998,101 +4331,150 @@
 "Based on Sample Rate Converter Plugin:\n"
 "Copyright 2010-2012 John Lindgren"
 msgstr ""
-"SoX Resampler -liitännäinen Audacioukselle\n"
+"SoX Resampler Plugin for Audacious\n"
 "Copyright 2013 Michał Lipski\n"
 "\n"
-"Perustuu Sample Rate Converter -liitännäiseen:\n"
+"Based on Sample Rate Converter Plugin:\n"
 "Copyright 2010-2012 John Lindgren"
 
-#: src/sox-resampler/sox-resampler.cc:150
+#: src/soxr/sox-resampler.cc:178
 msgid "Quick"
 msgstr "Nopea"
 
-#: src/sox-resampler/sox-resampler.cc:151
+#: src/soxr/sox-resampler.cc:179
 msgid "Low"
 msgstr "Matala"
 
-#: src/sox-resampler/sox-resampler.cc:153
+#: src/soxr/sox-resampler.cc:181
 msgid "High"
 msgstr "Korkea"
 
-#: src/sox-resampler/sox-resampler.cc:154
+#: src/soxr/sox-resampler.cc:182
 msgid "Very High"
 msgstr "Erittäin korkea"
 
-#: src/sox-resampler/sox-resampler.cc:158
+#: src/soxr/sox-resampler.cc:183
+msgid "Ultra High"
+msgstr "Erittäin korkea"
+
+#: src/soxr/sox-resampler.cc:187
+msgid "Minimum"
+msgstr "Minimi"
+
+#: src/soxr/sox-resampler.cc:188
+msgid "Intermediate"
+msgstr "Keskitaso"
+
+#: src/soxr/sox-resampler.cc:193
 msgid "Quality:"
 msgstr "Laatu:"
 
-#: src/speed-pitch/speed-pitch.cc:51
+#: src/soxr/sox-resampler.cc:196
+msgid "Phase:"
+msgstr "Tahti:"
+
+#: src/soxr/sox-resampler.cc:200
+msgid "Allow aliasing"
+msgstr "Salli aliaksia"
+
+#: src/soxr/sox-resampler.cc:202
+msgid "Use steep filter"
+msgstr "Käytä jyrkkää suodatinta"
+
+#: src/speedpitch/speed-pitch.cc:54
 msgid "Speed and Pitch"
 msgstr "Nopeus ja sävelkorkeus"
 
-#: src/speed-pitch/speed-pitch.cc:210
-msgid "Speed and Pitch"
-msgstr "Nopeus ja sävelkorkeus"
-
-#: src/speed-pitch/speed-pitch.cc:211
-msgid "Speed:"
-msgstr "Nopeus:"
-
-#: src/speed-pitch/speed-pitch.cc:214
-msgid "Pitch:"
-msgstr "Sävelkorkeus:"
+#: src/speedpitch/speed-pitch.cc:247
+msgid "Speed"
+msgstr "Nopeus"
+
+#: src/speedpitch/speed-pitch.cc:248
+msgid "Decouple from pitch"
+msgstr "Irrota sävelkorkeudesta"
+
+#: src/speedpitch/speed-pitch.cc:250 src/speedpitch/speed-pitch.cc:258
+msgid "Multiplier:"
+msgstr "Vahvistin:"
+
+#: src/speedpitch/speed-pitch.cc:254
+msgid "Pitch"
+msgstr "Sävelkorkeus"
 
-#: src/statusicon/statusicon.cc:47
+#: src/statusicon-qt/statusicon.cc:45 src/statusicon/statusicon.cc:47
 msgid "Status Icon"
-msgstr "Tilaikoni"
-
-#: src/statusicon/statusicon.cc:283
-msgid "Se_ttings ..."
-msgstr "Ase_tukset..."
+msgstr "Tilakuvake"
 
-#: src/statusicon/statusicon.cc:372
+#: src/statusicon-qt/statusicon.cc:68
 msgid ""
-"Status Icon Plugin\n"
+"Status Icon Plugin (partial port for Qt interface)\n"
 "\n"
 "Copyright 2005-2007 Giacomo Lozito <james@develia.org>\n"
 "Copyright 2010 Michał Lipski <tallica@o2.pl>\n"
+"Copyright 2015 Eugene Paskevich <eugene@raptor.kiev.ua>\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"
+"Status Icon Plugin (Qt-liittymän osittainen portti)\n"
 "\n"
 "Copyright 2005-2007 Giacomo Lozito <james@develia.org>\n"
 "Copyright 2010 Michał Lipski <tallica@o2.pl>\n"
+"Copyright 2015 Eugene Paskevich <eugene@raptor.kiev.ua>\n"
 "\n"
-"Tämä liitännäinen tarjoaa järjestelmäpalkkiin sijoitettavan ikonin."
+"Tämä lisäosa tarjoaa tilakuvakkeen, joka sijoitetaan\n"
+"ikkunanhallinnan ilmoitusalueelle."
 
-#: src/statusicon/statusicon.cc:379
+#: src/statusicon-qt/statusicon.cc:89 src/statusicon/statusicon.cc:384
 msgid "Mouse Scroll Action"
 msgstr "Hiiren rullan vieritystoiminto"
 
-#: src/statusicon/statusicon.cc:380
+#: src/statusicon-qt/statusicon.cc:90 src/statusicon/statusicon.cc:385
 msgid "Change volume"
 msgstr "Muuta äänenvoimakkuutta"
 
-#: src/statusicon/statusicon.cc:383
+#: src/statusicon-qt/statusicon.cc:93 src/statusicon/statusicon.cc:388
 msgid "Change playing song"
 msgstr "Vaihda kappaletta"
 
-#: src/statusicon/statusicon.cc:386
+#: src/statusicon-qt/statusicon.cc:96 src/statusicon/statusicon.cc:391
 msgid "Other Settings"
 msgstr "Muut asetukset"
 
-#: src/statusicon/statusicon.cc:387
+#: src/statusicon-qt/statusicon.cc:97 src/statusicon/statusicon.cc:392
 msgid "Disable the popup window"
 msgstr "Poista ponnahdusikkuna käytöstä"
 
-#: src/statusicon/statusicon.cc:389
+#: src/statusicon-qt/statusicon.cc:99 src/statusicon/statusicon.cc:394
 msgid "Close to the system tray"
 msgstr "Sulje järjestelmäpalkkiin"
 
-#: src/statusicon/statusicon.cc:391
+#: src/statusicon-qt/statusicon.cc:101 src/statusicon/statusicon.cc:396
 msgid "Advance in playlist when scrolling upward"
 msgstr "Etene soittolistassa kun vieritetään ylöspäin"
 
+#: src/statusicon-qt/statusicon.cc:116 src/statusicon/statusicon.cc:287
+msgid "Se_ttings ..."
+msgstr "Ase_tukset..."
+
+#: src/statusicon/statusicon.cc:377
+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 ""
+"Status Icon Plugin\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\n"
+"sijoitettavan ikonin."
+
 #: src/stereo_plugin/stereo.cc:19
 msgid "Extra Stereo"
 msgstr "Extra Stereo"
@@ -4103,7 +4485,7 @@
 "\n"
 "By Johan Levin, 1999"
 msgstr ""
-"Extra Stereo -liitännäinen\n"
+"Extra Stereo Plugin\n"
 "\n"
 "By Johan Levin, 1999"
 
@@ -4111,20 +4493,160 @@
 msgid "Extra Stereo"
 msgstr "Extra Stereo"
 
+#: src/streamtuner/icecast-model.cc:126 src/streamtuner/shoutcast-model.cc:131
+msgid "Type"
+msgstr "Tyyppi"
+
+#: src/streamtuner/icecast-model.cc:132
+msgid "Current Song"
+msgstr "Nykyinen kappale"
+
+#: src/streamtuner/icecast-model.cc:164
+msgid "Other"
+msgstr "Muut"
+
+#: src/streamtuner/ihr-model.cc:63
+msgid "Market"
+msgstr "Markkinat"
+
+#: src/streamtuner/ihr-model.cc:156
+msgid "Call Letters"
+msgstr "Soita kirjaimet"
+
+#: src/streamtuner/ihr-model.cc:162
+msgid "Description"
+msgstr "Kuvaus"
+
+#: src/streamtuner/shoutcast-model.cc:128
+msgid "Listeners"
+msgstr "Kuuntelijoita"
+
+#: src/streamtuner/shoutcast-model.cc:188
+msgid "Top 500 Stations"
+msgstr "Top 500 -asemat"
+
+#: src/streamtuner/shoutcast-model.cc:189
+msgid "Alternative"
+msgstr "Vaihtoehto"
+
+#: src/streamtuner/shoutcast-model.cc:190
+msgid "Blues"
+msgstr "Blues"
+
+#: src/streamtuner/shoutcast-model.cc:191
+msgid "Classical"
+msgstr "Klassinen"
+
+#: src/streamtuner/shoutcast-model.cc:192
+msgid "Country"
+msgstr "Kantri"
+
+#: src/streamtuner/shoutcast-model.cc:193
+msgid "Decades"
+msgstr "Vuosikymmeniä"
+
+#: src/streamtuner/shoutcast-model.cc:194
+msgid "Easy Listening"
+msgstr "Kevyt kuunneltava"
+
+#: src/streamtuner/shoutcast-model.cc:195
+msgid "Electronic"
+msgstr "Elektroninen"
+
+#: src/streamtuner/shoutcast-model.cc:196
+msgid "Folk"
+msgstr "Folk"
+
+#: src/streamtuner/shoutcast-model.cc:197
+msgid "Inspirational"
+msgstr "Inspiroiva"
+
+#: src/streamtuner/shoutcast-model.cc:198
+msgid "International"
+msgstr "Kansainvälinen"
+
+#: src/streamtuner/shoutcast-model.cc:199
+msgid "Jazz"
+msgstr "Jazz"
+
+#: src/streamtuner/shoutcast-model.cc:200
+msgid "Latin"
+msgstr "Latinalainen"
+
+#: src/streamtuner/shoutcast-model.cc:201
+msgid "Metal"
+msgstr "Metalli"
+
+#: src/streamtuner/shoutcast-model.cc:203
+msgid "New Age"
+msgstr "New age"
+
+#: src/streamtuner/shoutcast-model.cc:204
+msgid "Pop"
+msgstr "Pop"
+
+#: src/streamtuner/shoutcast-model.cc:205
+msgid "Public Radio"
+msgstr "Julkinen Radio"
+
+#: src/streamtuner/shoutcast-model.cc:206
+msgid "R&B and Urban"
+msgstr "R&B ja kaupunki"
+
+#: src/streamtuner/shoutcast-model.cc:207
+msgid "Rap"
+msgstr "Rap"
+
+#: src/streamtuner/shoutcast-model.cc:208
+msgid "Reggae"
+msgstr "Reggae"
+
+#: src/streamtuner/shoutcast-model.cc:209
+msgid "Rock"
+msgstr "Rock"
+
+#: src/streamtuner/shoutcast-model.cc:210
+msgid "Seasonal and Holiday"
+msgstr "Kausi ja kesä"
+
+#: src/streamtuner/shoutcast-model.cc:211
+msgid "Soundtracks"
+msgstr "Ääniraidat"
+
+#: src/streamtuner/shoutcast-model.cc:212
+msgid "Talk"
+msgstr "Puhe"
+
+#: src/streamtuner/shoutcast-model.cc:213
+msgid "Themes"
+msgstr "Teemat"
+
+#: src/streamtuner/streamtuner.cc:59
+msgid "Shoutcast"
+msgstr "Shoutcast"
+
+#: src/streamtuner/streamtuner.cc:60
+msgid "Icecast"
+msgstr "Icecast"
+
+#: src/streamtuner/streamtuner.cc:71
+msgid "Stream Tuner"
+msgstr "Stream Tuner"
+
 #: src/tonegen/tonegen.cc:45
 msgid "Tone Generator"
 msgstr "Sointugeneraattori"
 
-#: src/tonegen/tonegen.cc:94
+#: src/tonegen/tonegen.cc:92
 #, c-format
 msgid "%s %.1f Hz"
 msgstr "%s %.1f Hz"
 
-#: src/tonegen/tonegen.cc:94
+#: src/tonegen/tonegen.cc:92
 msgid "Tone Generator: "
-msgstr "Sointugeneraattori:"
+msgstr "Sointugeneraattori: "
 
-#: src/tonegen/tonegen.cc:160
+#: src/tonegen/tonegen.cc:161
 msgid ""
 "Sine tone generator by Håvard Kvålen <havardk@xmms.org>\n"
 "Modified by Daniel J. Peng <danielpeng@bigfoot.com>\n"
@@ -4138,11 +4660,32 @@
 "Käyttääksesi, lisää URL: tone://frequency1;frequency2;frequency3;...\n"
 "esim. tone://2000;2005 toistaaksesi 2000 Hz:n ja 2005 Hz:n soinnun"
 
+#: src/ui-common/dialogs-qt.cc:40
+msgid ""
+"\n"
+"(Further messages have been hidden.)"
+msgstr ""
+"\n"
+"(Seuraavat viestit ovat piilotettu.)"
+
+#: src/ui-common/dialogs-qt.cc:52
+msgid "Working ..."
+msgstr "Työskennellään..."
+
+#: src/ui-common/dialogs-qt.cc:73
+msgid "Information"
+msgstr "Tiedot"
+
+#: src/ui-common/menu-ops-gtk.cc:132 src/ui-common/menu-ops-qt.cc:113
+#, c-format
+msgid "%s does not appear to be a valid folder."
+msgstr "%s ei vaikuta olevan kelvollinen kansio"
+
 #: src/voice_removal/voice_removal.cc:28
 msgid "Voice Removal"
 msgstr "Äänen poisto"
 
-#: src/vorbis/vorbis.cc:465
+#: src/vorbis/vorbis.cc:433
 msgid ""
 "Audacious Ogg Vorbis Decoder\n"
 "\n"
@@ -4184,12 +4727,12 @@
 msgid "Ogg Vorbis Decoder"
 msgstr "Ogg Vorbis -dekooderi"
 
-#: src/vtx/info.cc:22
+#: src/vtx/info.cc:24
 #, c-format
 msgid "Details about %s"
-msgstr ""
+msgstr "Tietoja - %s"
 
-#: src/vtx/info.cc:24
+#: src/vtx/info.cc:26
 msgid ""
 "Title: %t\n"
 "Author: %a\n"
@@ -4203,12 +4746,23 @@
 "Player Freq: %P\n"
 "Year: %y"
 msgstr ""
+"Nimi: %t\n"
+"Julkaisija: %a\n"
+"Alkaen: %f\n"
+"Tunnistin: %T\n"
+"Kommentti: %C\n"
+"Piirin tyypi: %c\n"
+"Stereo: %s\n"
+"Toisto: %l\n"
+"Piirin taajuus: %F\n"
+"Soitin: %P\n"
+"Vuosi: %y"
 
 #: src/vtx/vtx.cc:38
 msgid "VTX Decoder"
 msgstr "VTX-dekooderi"
 
-#: src/vtx/vtx.cc:184
+#: src/vtx/vtx.cc:178
 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"
@@ -4218,19 +4772,63 @@
 "Perustuu in_vtx.dll:ään, luonut Roman Sherbakov <v_soft@microfor.ru>\n"
 "Audacious liitännäisen luonut Pavel Vymetalek <pvymetalek@seznam.cz>"
 
-#: src/wavpack/wavpack.cc:24
+#: src/vumeter-qt/vumeter_qt.cc:31
+msgid ""
+"VU Meter Plugin for Audacious\n"
+"Copyright 2017-2019 Marc Sánchez Fauste"
+msgstr ""
+"VU-mittarin lisäosa Audaciousille\n"
+"Copyright 2017-2019 Marc Sánchez Fauste"
+
+#: src/vumeter-qt/vumeter_qt.cc:35
+msgid "VU Meter Settings"
+msgstr "VU-mittarin asetukset"
+
+#: src/vumeter-qt/vumeter_qt.cc:37
+msgid "Peak hold time:"
+msgstr "Huipun pitoaika:"
+
+#: src/vumeter-qt/vumeter_qt.cc:42
+msgid "Fall-off time:"
+msgstr "Poistumisaika:"
+
+#: src/vumeter-qt/vumeter_qt.cc:44
+msgid "dB/second"
+msgstr "dB/sekunti"
+
+#: src/vumeter-qt/vumeter_qt.cc:46
+msgid "Display legend"
+msgstr "Näytä selite"
+
+#: src/vumeter-qt/vumeter_qt.h:37
+msgid "VU Meter"
+msgstr "VU-mittari"
+
+#: src/waveout/waveout.cc:43
+msgid "Win32 waveOut"
+msgstr "Win32 waveOut"
+
+#: src/waveout/waveout.cc:69
+msgid ""
+"Win32 waveOut Plugin for Audacious\n"
+"Copyright 2016 John Lindgren"
+msgstr ""
+"Win32 waveOut lisäosa Audaciousille\n"
+"Copyright 2016 John Lindgren"
+
+#: src/wavpack/wavpack.cc:25
 msgid "WavPack Decoder"
 msgstr "WavPack-dekooderi"
 
-#: src/wavpack/wavpack.cc:211
+#: src/wavpack/wavpack.cc:217
 msgid "lossy (hybrid)"
 msgstr "häviöllinen (hybridi)"
 
-#: src/wavpack/wavpack.cc:213
+#: src/wavpack/wavpack.cc:219
 msgid "lossy"
 msgstr "häviöllinen"
 
-#: src/wavpack/wavpack.cc:255
+#: src/wavpack/wavpack.cc:259
 msgid ""
 "Copyright 2006 William Pitcock <nenolod@nenolod.net>\n"
 "\n"
@@ -4240,18 +4838,38 @@
 "\n"
 "Osan liitännäisen koodista kirjoittanut Miles Egan."
 
-#: src/xsf/plugin.cc:50
+#: src/xsf/plugin.cc:74
 msgid "2SF Decoder"
 msgstr "2SF-dekooderi"
 
-#: src/xsf/plugin.cc:238
+#: src/xsf/plugin.cc:429
+msgid "32728 Hz"
+msgstr "32728 Hz"
+
+#: src/xsf/plugin.cc:432
+msgid "65456 Hz"
+msgstr "65456 Hz"
+
+#: src/xsf/plugin.cc:438
+msgid "Cosine"
+msgstr "Kosini"
+
+#: src/xsf/plugin.cc:439
+msgid "Sharp"
+msgstr "Tarkka"
+
+#: src/xsf/plugin.cc:443
 msgid "XSF Configuration"
 msgstr "XSF-asetukset"
 
-#: src/xsf/plugin.cc:239
-msgid "Ignore length from file"
-msgstr "Älä huomioi tiedoston ilmoittamaa kestoa"
+#: src/xsf/plugin.cc:445
+msgid "Default fade time:"
+msgstr "Häivytysaika oletus:"
+
+#: src/xsf/plugin.cc:447
+msgid "Interpolation mode:"
+msgstr "Interpolointi moodi:"
 
-#: src/xspf/xspf.cc:89
+#: src/xspf/xspf.cc:95
 msgid "XML Shareable Playlists (XSPF)"
-msgstr "XML jaettavat soittolistat (XSPF)"
+msgstr "XML jaettava soittolista (XSPF)"

audacious-plugins-3.6.2-gtk3.tar.bz2/po/fr.po -> audacious-plugins-4.4.1.tar.bz2/po/fr.po Changed

@@ -3,306 +3,87 @@
 # This file is distributed under the same license as the Audacious Plugins package.
 #
 # Translators:
-# yahoe.001, 2012-2013
-# Oxayotl <jagw40k@free.fr>, 2013-2014
+# AO <ao@localizationlab.org>, 2012-2013
+# AO <ao@localizationlab.org>, 2019-2024
+# AO <ao@localizationlab.org>, 2017-2018
+# AO <ao@localizationlab.org>, 2016
+# Oxayotl <jagw40k@free.fr>, 2013-2014,2020
 # Oxayotl <jagw40k@free.fr>, 2011-2012
 # Jean-Alexandre Anglès d'Auriac <jagw40k@free.fr>, 2011
-# yahoe.001, 2013-2015
+# AO <ao@localizationlab.org>, 2015
+# Wallon Wallon, 2022
+# AO <ao@localizationlab.org>, 2013-2015
 msgid ""
 msgstr ""
 "Project-Id-Version: Audacious Plugins\n"
-"Report-Msgid-Bugs-To: http://redmine.audacious-media-player.org/\n"
-"POT-Creation-Date: 2015-04-03 11:52+0200\n"
-"PO-Revision-Date: 2015-03-15 20:32+0000\n"
-"Last-Translator: yahoe.001\n"
-"Language-Team: French (http://www.transifex.com/projects/p/audacious/"
-"language/fr/)\n"
+"Report-Msgid-Bugs-To: https://github.com/audacious-media-player/audacious/"
+"issues\n"
+"POT-Creation-Date: 2024-09-26 21:54+0200\n"
+"PO-Revision-Date: 2011-10-10 17:43+0000\n"
+"Last-Translator: AO <ao@localizationlab.org>, 2019-2024\n"
+"Language-Team: French (http://app.transifex.com/audacious/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"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"Plural-Forms: nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % "
+"1000000 == 0 ? 1 : 2;\n"
 
-#: src/aac-raw/aac.cc:18
+#: src/aac/aac.cc:19
 msgid "AAC (Raw) Decoder"
 msgstr "Décodeur AAC (brut)"
 
-#: src/adplug/adplug-xmms.cc:42
+#: src/adplug/adplug-xmms.cc:70
 msgid "AdPlug (AdLib Player)"
 msgstr "AdPlug (Lecteur AdLib)"
 
-#: src/adplug/adplug-xmms.cc:156 src/modplug/modplugbmp.cc:335
-#: src/psf/plugin.cc:138 src/vtx/vtx.cc:87 src/xsf/plugin.cc:113
+#: src/adplug/adplug-xmms.cc:167 src/modplug/modplugbmp.cc:321
+#: src/psf/plugin.cc:161 src/vtx/vtx.cc:89 src/xsf/plugin.cc:204
 msgid "sequenced"
 msgstr "séquencé"
 
-#: src/alarm/alarm.cc:55 src/alarm/interface.cc:82
-msgid "Alarm"
-msgstr "Alarme"
-
-#: src/alarm/alarm.cc:782
-msgid "Set Alarm ..."
-msgstr "Définir l'alarme..."
-
-#: src/alarm/alarm.cc:810
-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 à un moment précis.\n"
-"\n"
-"Développé à l'origine par Adam Feakin et Daniel Stodden."
-
-#: src/alarm/interface.cc: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"
-" Choisir les jours d'activité de l'alarme.\n"
-"\n"
-" Heure :\n"
-" Choisir l'heure à laquelle l'alarme se déclenchera\n"
-" chaque jour ou cocher l'utilisation de l'horaire par défaut.\n"
-"\n"
-"\n"
-
-#: src/alarm/interface.cc: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"
-" Commence à :\n"
-" Commence le fondu à ce volume.\n"
-"\n"
-" Fini à :\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.cc: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"
-" Charger cette liste de lecture. Si aucune liste\n"
-" de lecture n'est précisée, la liste de lecture\n"
-" actuelle sera utilisée. L'URL d'un flux mp3/ogg\n"
-" peu aussi être choisie.\n"
-"\n"
-" Pense-bête :\n"
-" Afficher un pense-bête quand l'alarme se déclenche.\n"
-" Saisir le rappel dans le champs de texte et cocher\n"
-" la case pour que le rappel soit affiché."
-
-#: src/alarm/interface.cc:81
-msgid "This is your wakeup call."
-msgstr "Ceci est votre réveil."
-
-#: src/alarm/interface.cc:99
-msgid "Your reminder for today is..."
-msgstr "Votre pense-bête pour aujourd'hui est…"
-
-#: src/alarm/interface.cc:101 src/alarm/interface.cc:386
-msgid "Reminder"
-msgstr "Pense-bête"
-
-#: src/alarm/interface.cc:132
-msgid "Monday"
-msgstr "Lundi"
-
-#: src/alarm/interface.cc:132
-msgid "Tuesday"
-msgstr "Mardi"
-
-#: src/alarm/interface.cc:132
-msgid "Wednesday"
-msgstr "Mercredi"
-
-#: src/alarm/interface.cc:133
-msgid "Thursday"
-msgstr "Jeudi"
-
-#: src/alarm/interface.cc:133
-msgid "Friday"
-msgstr "Vendredi"
-
-#: src/alarm/interface.cc:133
-msgid "Saturday"
-msgstr "Samedi"
-
-#: src/alarm/interface.cc:133
-msgid "Sunday"
-msgstr "Dimanche"
-
-#: src/alarm/interface.cc:171 src/alarm/interface.cc:230
-#: src/alarm/interface.cc:245
-msgid "Time"
-msgstr "Heure"
-
-#: src/alarm/interface.cc:178
-msgid "Alarm at (default):"
-msgstr "Alarme à (par défaut) :"
-
-#: src/alarm/interface.cc:200
-msgid "h"
-msgstr "h"
-
-#: src/alarm/interface.cc:203
-msgid "Quiet after:"
-msgstr "Silencieux après :"
-
-#: src/alarm/interface.cc:215
-msgid "hours"
-msgstr "heures"
-
-#: src/alarm/interface.cc:226
-msgid "minutes"
-msgstr "minutes"
-
-#: src/alarm/interface.cc:235
-msgid "Choose the days for the alarm to come on"
-msgstr "Choisir les jours où l'alarme se déclenche"
+#: src/adplug/adplug-xmms.cc:349 src/sid/xs_config.cc:61
+msgid "Output"
+msgstr "Sortie"
 
-#: src/alarm/interface.cc:242
-msgid "Day"
-msgstr "Jour"
+#: src/adplug/adplug-xmms.cc:350
+msgid "OPL Emulator:"
+msgstr "Émulateur OPL :"
+
+#: src/adplug/adplug-xmms.cc:353 src/amidiplug/i_configure.cc:153
+#: src/console/plugin.cc:45 src/filewriter/filewriter.cc:481
+#: src/sid/xs_config.cc:65 src/xsf/plugin.cc:446
+msgid "Sample rate:"
+msgstr "Fréquence d’échantillonnage :"
 
-#: src/alarm/interface.cc:259 src/bs2b/plugin.cc:130
-#: src/skins/preset-list.cc:434 src/skins/preset-list.cc:440
-msgid "Default"
-msgstr "Par défaut"
+#: src/adplug/adplug-xmms.cc:354 src/amidiplug/i_configure.cc:155
+#: src/bs2b/plugin.cc:141 src/console/plugin.cc:47
+#: src/modplug/plugin_main.cc:77 src/resample/resample.cc:201
+#: src/resample/resample.cc:207 src/resample/resample.cc:211
+#: src/resample/resample.cc:215 src/resample/resample.cc:219
+#: src/resample/resample.cc:223 src/resample/resample.cc:227
+#: src/resample/resample.cc:231 src/resample/resample.cc:235
+#: src/resample/resample.cc:239 src/resample/resample.cc:243
+#: src/sid/xs_config.cc:67 src/soxr/sox-resampler.cc:205
+msgid "Hz"
+msgstr "Hz"
 
-#: src/alarm/interface.cc:288
-msgid "Days"
-msgstr "Jours"
-
-#: src/alarm/interface.cc:297
-msgid "Fading"
-msgstr "Fondu"
-
-#: src/alarm/interface.cc:305 src/console/plugin.cc:41
-#: src/crossfade/crossfade.cc:53 src/crossfade/crossfade.cc:59
-#: src/gtkui/settings.cc:49 src/lirc/lirc.cc:397 src/sid/xs_config.cc:85
-#: src/sid/xs_config.cc:94 src/sid/xs_config.cc:103
-msgid "seconds"
-msgstr "secondes"
+#: src/adplug/adplug-xmms.cc:355 src/gtkui/settings.cc:55
+#: src/modplug/plugin_main.cc:105 src/qtui/settings.cc:85
+#: src/skins-qt/skins_cfg.cc:302 src/skins/skins_cfg.cc:284
+msgid "Miscellaneous"
+msgstr "Divers"
 
-#: src/alarm/interface.cc:312 src/alarm/interface.cc:353
-msgid "Volume"
-msgstr "Volume"
-
-#: src/alarm/interface.cc:317
-msgid "Start at"
-msgstr "Commencer à"
-
-#: src/alarm/interface.cc:333
-msgid "Final"
-msgstr "Finir à"
-
-#: src/alarm/interface.cc:346
-msgid "Current"
-msgstr "Actuel"
-
-#: src/alarm/interface.cc:359
-msgid "Additional Command"
-msgstr "Commande additionnelle"
-
-#: src/alarm/interface.cc:365 src/alarm/interface.cc:391
-msgid "enable"
-msgstr "activer"
-
-#: src/alarm/interface.cc:372
-msgid "Playlist (optional)"
-msgstr "Liste de lecture (optionnelle)"
-
-#: src/alarm/interface.cc:379
-msgid "Select a playlist"
-msgstr "Choisir une liste de lecture"
-
-#: src/alarm/interface.cc:399
-msgid "Options"
-msgstr "Options"
-
-#: src/alarm/interface.cc:404
-msgid "What do these options mean?"
-msgstr "Que signifient ces options ?"
-
-#: src/alarm/interface.cc:420
-msgid "Help"
-msgstr "Aide"
+#: src/adplug/adplug-xmms.cc:356
+msgid "Repeat song in endless loop"
+msgstr "Répéter continuellement la pièce"
 
-#: src/albumart/albumart.cc:31
+#: src/albumart/albumart.cc:31 src/albumart-qt/albumart.cc:35
 msgid "Album Art"
 msgstr "Illustration"
 
-#: src/albumart-qt/albumart.cc:33
-msgid "Album Art (Qt)"
-msgstr "Illustration (Qt)"
-
-#: src/alsa/alsa.h:70
+#: src/alsa/alsa.h:64
 msgid "ALSA Output"
 msgstr "Sortie ALSA"
 
@@ -315,10 +96,11 @@
 "code served as a reference when the ALSA manual was not enough."
 msgstr ""
 "Greffon de sortie ALSA pour Audacious\n"
-"Tous droits réservés © 2009-2012 John Lindgren\n"
+"Tous droits réservés © 2009 à 2012 John Lindgren\n"
+"\n"
 "Mes 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."
+"dont le code a servi de référence quand la documentation d’ALSA n’était pas "
+"suffisante."
 
 #: src/alsa/config.cc:61
 msgid "(no description)"
@@ -330,25 +112,25 @@
 
 #: src/alsa/config.cc:188
 msgid "Default mixer device"
-msgstr "Mélangeur audio par défaut"
+msgstr "Mélangeur de son par défaut"
 
 #: src/alsa/config.cc:296
 msgid "PCM device:"
-msgstr "Périphérique PCM :"
+msgstr "Périphérique PCM :"
 
 #: src/alsa/config.cc:299
 msgid "Mixer device:"
-msgstr "Canal de mélange audio :"
+msgstr "Périphérique de mixage :"
 
 #: src/alsa/config.cc:302
 msgid "Mixer element:"
-msgstr "Mélangeur :"
+msgstr "Élément de mixage :"
 
-#: src/amidi-plug/amidi-plug.cc:41
+#: src/amidiplug/amidi-plug.cc:42
 msgid "AMIDI-Plug (MIDI Player)"
 msgstr "AMIDI-Plug (Lecteur MIDI)"
 
-#: src/amidi-plug/amidi-plug.cc:437
+#: src/amidiplug/amidi-plug.cc:445
 msgid ""
 "AMIDI-Plug\n"
 "modular MIDI music player\n"
@@ -374,15 +156,15 @@
 "lecteur musical modulaire MIDI\n"
 "http://www.develia.org/projects.php?p=amidiplug\n"
 "\n"
-"écrit par Giacomo Lozito\n"
+"développé par Giacomo Lozito\n"
 "<james@develia.org>\n"
 "\n"
-"un grand merci à...\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 sur l'API ALSA\n"
+"pour leurs excellents programmes aplaymidi et amixer ;\n"
+"ils furent très utiles, ainsi que la documentation alsa-lib, pour en "
+"apprendre davantage sur l’API ALSA\n"
 "\n"
 "Alfredo Spadafina\n"
 "pour le beau logo de clavier MIDI\n"
@@ -390,157 +172,161 @@
 "Tony Vroon\n"
 "pour son aide appréciée durant les tests alpha"
 
-#: src/amidi-plug/i_configure.cc:94
+#: src/amidiplug/i_configure.cc:94
 msgid "Override default gain:"
-msgstr "Remplacer le gain par défaut :"
+msgstr "Remplacer le gain par défaut :"
 
-#: src/amidi-plug/i_configure.cc:102
+#: src/amidiplug/i_configure.cc:102
 msgid "Override default polyphony:"
-msgstr "Remplacer la polyphonie par défaut :"
+msgstr "Remplacer la polyphonie par défaut :"
 
-#: src/amidi-plug/i_configure.cc:110
+#: src/amidiplug/i_configure.cc:110
 msgid "Override default reverb:"
-msgstr "Remplacer la réverbération par défaut :"
+msgstr "Remplacer la réverbération par défaut :"
 
-#: src/amidi-plug/i_configure.cc:112 src/amidi-plug/i_configure.cc:120
+#: src/amidiplug/i_configure.cc:112 src/amidiplug/i_configure.cc:120
 msgid "On"
-msgstr "Marche"
+msgstr "Activer"
 
-#: src/amidi-plug/i_configure.cc:118
+#: src/amidiplug/i_configure.cc:118
 msgid "Override default chorus:"
-msgstr "Remplacer le refrain par défaut :"
+msgstr "Remplacer le refrain par défaut :"
 
-#: src/amidi-plug/i_configure.cc:128 src/console/plugin.cc:29
+#: src/amidiplug/i_configure.cc:128 src/console/plugin.cc:29
 msgid "Playback"
 msgstr "Lecture"
 
-#: src/amidi-plug/i_configure.cc:129
+#: src/amidiplug/i_configure.cc:129
 msgid "Transpose:"
-msgstr "Transposer :"
+msgstr "Transposer :"
 
-#: src/amidi-plug/i_configure.cc:131
+#: src/amidiplug/i_configure.cc:131 src/speedpitch/speed-pitch.cc:257
 msgid "semitones"
 msgstr "demi-tons tempérés"
 
-#: src/amidi-plug/i_configure.cc:132
+#: src/amidiplug/i_configure.cc:132
 msgid "Drum shift:"
-msgstr "Décalage des percussions :"
+msgstr "Décalage des percussions :"
 
-#: src/amidi-plug/i_configure.cc:134
+#: src/amidiplug/i_configure.cc:134
 msgid "note numbers"
 msgstr "numéros de note"
 
-#: src/amidi-plug/i_configure.cc:135
+#: src/amidiplug/i_configure.cc:135
 msgid "Skip leading silence"
-msgstr "Ignorer le silence d'ouverture"
+msgstr "Ignorer le silence d’ouverture"
 
-#: src/amidi-plug/i_configure.cc:137
+#: src/amidiplug/i_configure.cc:137
 msgid "Skip trailing silence"
 msgstr "Ignorer le silence de fermeture"
 
-#: src/amidi-plug/i_configure.cc:141
+#: src/amidiplug/i_configure.cc:141
 msgid "SoundFont"
 msgstr "SoundFont"
 
-#: src/amidi-plug/i_configure.cc:143
+#: src/amidiplug/i_configure.cc:148
 msgid "Synthesizer"
 msgstr "Synthétiseur"
 
-#: src/amidi-plug/i_configure.cc:148 src/console/plugin.cc:45
-#: src/sid/xs_config.cc:65
-msgid "Sample rate:"
-msgstr "Fréquence de l'échantillon :"
-
-#: src/amidi-plug/i_configure.cc:150 src/bs2b/plugin.cc:141
-#: src/console/plugin.cc:47 src/modplug/plugin_main.cc:78
-#: src/resample/resample.cc:201 src/resample/resample.cc:207
-#: src/resample/resample.cc:211 src/resample/resample.cc:215
-#: src/resample/resample.cc:219 src/resample/resample.cc:223
-#: src/resample/resample.cc:227 src/resample/resample.cc:231
-#: src/resample/resample.cc:235 src/resample/resample.cc:239
-#: src/resample/resample.cc:243 src/sid/xs_config.cc:67
-#: src/sox-resampler/sox-resampler.cc:163
-msgid "Hz"
-msgstr "Hz"
-
-#: src/amidi-plug/i_configure-fluidsynth.cc:52
+#: src/amidiplug/i_configure-fluidsynth.cc:58
+#: src/amidiplug/i_configure-fluidsynth.cc:527
 msgid "AMIDI-Plug - select SoundFont file"
 msgstr "AMIDI-Plug - choix du fichier SoundFont"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:55 src/filewriter/mp3.cc:658
+#: src/amidiplug/i_configure-fluidsynth.cc:61
 msgid "_Cancel"
 msgstr "_Annuler"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:56
+#: src/amidiplug/i_configure-fluidsynth.cc:62
 msgid "_Open"
 msgstr "_Ouvrir"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:225 src/gtkui/columns.cc:46
+#: src/amidiplug/i_configure-fluidsynth.cc:233
+#: src/amidiplug/i_configure-fluidsynth.cc:461
 msgid "File name"
 msgstr "Nom de fichier"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:229
+#: src/amidiplug/i_configure-fluidsynth.cc:237
+#: src/amidiplug/i_configure-fluidsynth.cc:464
 msgid "Size (bytes)"
 msgstr "Taille (octets)"
 
-#: src/amidi-plug/i_fileinfo.cc:163
+#: src/amidiplug/i_fileinfo.cc:184
 msgid "Name:"
-msgstr "Nom :"
+msgstr "Nom :"
 
-#: src/amidi-plug/i_fileinfo.cc:181
+#: src/amidiplug/i_fileinfo.cc:202
 msgid " MIDI Info "
-msgstr " Infos MIDI "
+msgstr " Renseignements MIDI "
 
-#: src/amidi-plug/i_fileinfo.cc:195
+#: src/amidiplug/i_fileinfo.cc:216
 msgid "Format:"
-msgstr "Format :"
+msgstr "Format :"
 
-#: src/amidi-plug/i_fileinfo.cc:198
+#: src/amidiplug/i_fileinfo.cc:219
 msgid "Length (msec):"
-msgstr "Durée (ms) :"
+msgstr "Durée (ms) :"
 
-#: src/amidi-plug/i_fileinfo.cc:201
+#: src/amidiplug/i_fileinfo.cc:222
 msgid "No. of Tracks:"
-msgstr "Nombre de pistes :"
+msgstr "Nombre de plages :"
 
-#: src/amidi-plug/i_fileinfo.cc:207
+#: src/amidiplug/i_fileinfo.cc:228
 msgid "variable"
 msgstr "variable"
 
-#: src/amidi-plug/i_fileinfo.cc:209
+#: src/amidiplug/i_fileinfo.cc:230
 msgid "BPM:"
-msgstr "BPM :"
+msgstr "BPM :"
 
-#: src/amidi-plug/i_fileinfo.cc:217
+#: src/amidiplug/i_fileinfo.cc:238
 msgid "BPM (wavg):"
-msgstr "BPM (wavg) :"
+msgstr "BPM (wavg) :"
 
-#: src/amidi-plug/i_fileinfo.cc:220
+#: src/amidiplug/i_fileinfo.cc:241
 msgid "Time Div:"
-msgstr "Division du temps :"
+msgstr "Division du temps :"
 
-#: src/amidi-plug/i_fileinfo.cc:231
+#: src/amidiplug/i_fileinfo.cc:252
 msgid " MIDI Comments and Lyrics "
 msgstr " Commentaires et paroles MIDI "
 
-#: src/amidi-plug/i_fileinfo.cc:278
+#: src/amidiplug/i_fileinfo.cc:299
 msgid "* no comments available in this MIDI file *"
 msgstr "* aucun commentaire proposé dans ce fichier MIDI *"
 
-#: src/amidi-plug/i_fileinfo.cc:290
+#: src/amidiplug/i_fileinfo.cc:311
 msgid "* no lyrics available in this MIDI file *"
 msgstr "* aucune parole proposée dans ce fichier MIDI"
 
-#: src/amidi-plug/i_fileinfo.cc:300 src/filewriter/vorbis.cc:197
-#: src/ladspa/plugin.cc:416
+#: src/amidiplug/i_fileinfo.cc:321 src/ladspa/plugin.cc:418
+#: src/ui-common/dialogs-qt.cc:32
 msgid "_Close"
 msgstr "_Fermer"
 
-#: src/amidi-plug/i_fileinfo.cc:325
+#: src/amidiplug/i_fileinfo.cc:346
 msgid " (invalid UTF-8)"
 msgstr " (UTF-8 invalide)"
 
-#: src/aosd/aosd.cc:32
+#: src/ampache/ampache.cc:33
+msgid "Ampache Browser"
+msgstr "Navigateur Ampache"
+
+#: src/ampache/ampache.cc:46
+msgid ""
+"Ampache Browser for Audacious\n"
+"http://ampache-browser.org/\n"
+"\n"
+"Copyright (C) Róbert Čerňanský and John Lindgren\n"
+"License: GNU GPLv3"
+msgstr ""
+"Navigateur Ampache pour Audacious\n"
+"http://ampache-browser.org/\n"
+"\n"
+"Tous droits réservés © Róbert Čerňanský et John Lindgren\n"
+"Licence : GNU GPLv3"
+
+#: src/aosd/aosd.cc:31
 msgid ""
 "Audacious OSD\n"
 "http://www.develia.org/projects.php?p=audacious#aosd\n"
@@ -550,17 +336,17 @@
 "Based in part on Evan Martin's Ghosd library:\n"
 "http://neugierig.org/software/ghosd/"
 msgstr ""
-"Affichage à l'écran Audacious\n"
+"Affichage à l’écran Audacious\n"
 "http://www.develia.org/projects.php?p=audacious#aosd\n"
 "\n"
 "Développé par Giacomo Lozito <james@develia.org>\n"
 "\n"
-"Basé en partie sur la bibliothèque Ghosd de Evan Martin :\n"
+"Fondé en partie sur la bibliothèque Ghosd de Evan Martin :\n"
 "http://neugierig.org/software/ghosd/"
 
 #: src/aosd/aosd.h:37
 msgid "AOSD (On-Screen Display)"
-msgstr "AOSD (Affichage à l'écran)"
+msgstr "AOSD (Affichage à l’écran)"
 
 #: src/aosd/aosd_style.cc:54
 msgid "Rectangle"
@@ -574,199 +360,194 @@
 msgid "Concave Rectangle"
 msgstr "Rectangle concave"
 
-#: src/aosd/aosd_style.cc:69
+#: src/aosd/aosd_style.cc:69 src/openmpt/mptwrap.h:50 src/xsf/plugin.cc:436
 msgid "None"
 msgstr "Aucun"
 
-#: src/aosd/aosd_trigger.cc:50
+#: src/aosd/aosd_trigger.cc:49
 msgid "Playback Start"
 msgstr "Début de la lecture"
 
-#: src/aosd/aosd_trigger.cc:51
+#: src/aosd/aosd_trigger.cc:50
 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 "
+"Déclenche l’affichage à l’écran quand une entrée de la liste de lecture est "
 "jouée."
 
-#: src/aosd/aosd_trigger.cc:56
+#: src/aosd/aosd_trigger.cc:55
 msgid "Title Change"
 msgstr "Changement de titre"
 
-#: src/aosd/aosd_trigger.cc:57
+#: src/aosd/aosd_trigger.cc:56
 msgid "Triggers OSD when the song title changes (for internet streams)."
 msgstr ""
-"Déclenche l'affichage à l'écran lorsque le titre du morceau change (pour les "
-"flux Internet) :"
+"Déclenche l’affichage à l’écran quand le titre de la pièce change (pour les "
+"flux Internet) :"
 
-#: src/aosd/aosd_trigger.cc:62
+#: src/aosd/aosd_trigger.cc:61
 msgid "Pause On"
 msgstr "En pause"
 
-#: src/aosd/aosd_trigger.cc:63
+#: src/aosd/aosd_trigger.cc:62
 msgid "Triggers OSD when playback is paused."
-msgstr "Déclenche l'affichage à l'écran lorsque la lecture est mise en pause."
+msgstr "Déclenche l’affichage à l’écran quand la lecture est mise en pause."
 
-#: src/aosd/aosd_trigger.cc:68
+#: src/aosd/aosd_trigger.cc:67
 msgid "Pause Off"
 msgstr "Pause désactivée"
 
-#: src/aosd/aosd_trigger.cc:69
+#: src/aosd/aosd_trigger.cc:68
 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 quand la lecture est reprise."
 
-#: src/aosd/aosd_ui.cc:163
+#: src/aosd/aosd_ui.cc:204
 msgid "Placement"
 msgstr "Position"
 
-#: src/aosd/aosd_ui.cc:196
+#: src/aosd/aosd_ui.cc:241
 msgid "Relative X offset:"
-msgstr "Décalage horizontal X :"
+msgstr "Décalage horizontal X :"
 
-#: src/aosd/aosd_ui.cc:203
+#: src/aosd/aosd_ui.cc:245
 msgid "Relative Y offset:"
-msgstr "Décalage vertical Y :"
+msgstr "Décalage vertical Y :"
 
-#: src/aosd/aosd_ui.cc:210
+#: src/aosd/aosd_ui.cc:249
 msgid "Max OSD width:"
-msgstr "Largeur maximale d'affichage à l'écran :"
+msgstr "Largeur maximale d’affichage à l’écran :"
 
-#: src/aosd/aosd_ui.cc:221
+#: src/aosd/aosd_ui.cc:281
 msgid "Multi-Monitor options"
 msgstr "Options pour moniteurs multiples"
 
-#: src/aosd/aosd_ui.cc:225
+#: src/aosd/aosd_ui.cc:285
 msgid "Display OSD using:"
-msgstr "Affichage à l'écran avec :"
+msgstr "Affichage à l’écran avec :"
 
-#: src/aosd/aosd_ui.cc:227
+#: src/aosd/aosd_ui.cc:287
 msgid "all monitors"
 msgstr "tous les moniteurs"
 
-#: src/aosd/aosd_ui.cc:230
+#: src/aosd/aosd_ui.cc:290
 #, c-format
 msgid "monitor %i"
 msgstr "le moniteur %i"
 
-#: src/aosd/aosd_ui.cc:282
+#: src/aosd/aosd_ui.cc:342
 msgid "Timing (ms)"
 msgstr "Durée (ms)"
 
-#: src/aosd/aosd_ui.cc:287
+#: src/aosd/aosd_ui.cc:347
 msgid "Display:"
-msgstr "Affichage :"
+msgstr "Affichage :"
 
-#: src/aosd/aosd_ui.cc:292
+#: src/aosd/aosd_ui.cc:352
 msgid "Fade in:"
-msgstr "Fondu d'entrée :"
+msgstr "Fondu d’entrée :"
 
-#: src/aosd/aosd_ui.cc:297
+#: src/aosd/aosd_ui.cc:357
 msgid "Fade out:"
-msgstr "Fondu de sortie :"
+msgstr "Fondu de sortie :"
 
-#: src/aosd/aosd_ui.cc:361
+#: src/aosd/aosd_ui.cc:442
 msgid "Fonts"
 msgstr "Polices"
 
-#: src/aosd/aosd_ui.cc:368
+#: src/aosd/aosd_ui.cc:449
 #, c-format
 msgid "Font %i:"
-msgstr "Police %i :"
+msgstr "Police %i :"
 
-#: src/aosd/aosd_ui.cc:382
+#: src/aosd/aosd_ui.cc:466
 msgid "Shadow"
 msgstr "Ombre"
 
-#: src/aosd/aosd_ui.cc:486
+#: src/aosd/aosd_ui.cc:589
 msgid "Render Style"
 msgstr "Style du rendu"
 
-#: src/aosd/aosd_ui.cc:502
+#: src/aosd/aosd_ui.cc:605
 msgid "Colors"
 msgstr "Couleurs"
 
-#: src/aosd/aosd_ui.cc:513
+#: src/aosd/aosd_ui.cc:616
 #, c-format
 msgid "Color %i:"
-msgstr "Couleur %i :"
+msgstr "Couleur %i :"
 
-#: src/aosd/aosd_ui.cc:600
+#: src/aosd/aosd_ui.cc:714
 msgid "Enable trigger"
 msgstr "Activer le déclencheur"
 
-#: src/aosd/aosd_ui.cc:627
+#: src/aosd/aosd_ui.cc:741
 msgid "Event"
 msgstr "Événement"
 
-#: src/aosd/aosd_ui.cc:655
+#: src/aosd/aosd_ui.cc:768
 msgid "Composite manager detected"
 msgstr "Gestionnaire composite détecté"
 
-#: src/aosd/aosd_ui.cc:662
+#: src/aosd/aosd_ui.cc:775
 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,\n"
-"veuillez activer un gestionnaire composite sinon l'affichage à l'écran ne "
+"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.cc:670
+#: src/aosd/aosd_ui.cc:783
 msgid "Composite manager not required for fake transparency"
 msgstr "La fausse transparence ne nécessite pas de gestionnaire composite."
 
-#: src/aosd/aosd_ui.cc:706
+#: src/aosd/aosd_ui.cc:820
 msgid "Transparency"
 msgstr "Transparence"
 
-#: src/aosd/aosd_ui.cc:712
+#: src/aosd/aosd_ui.cc:826
 msgid "Fake transparency"
 msgstr "Fausse transparence"
 
-#: src/aosd/aosd_ui.cc:714
+#: src/aosd/aosd_ui.cc:828
 msgid "Real transparency (requires X Composite Ext.)"
-msgstr "Véritable transparence (nécessite l'extension composite de X)"
+msgstr "Véritable transparence (nécessite l’extension composite de X)"
 
-#: src/aosd/aosd_ui.cc:756
+#: src/aosd/aosd_ui.cc:875
 msgid "Composite extension not loaded"
-msgstr "L'extension composite n'est pas chargée"
+msgstr "L’extension composite n’est pas chargée"
 
-#: src/aosd/aosd_ui.cc:764
-msgid "Composite extension not available"
-msgstr "L'extension composite n'est pas proposée"
-
-#: src/aosd/aosd_ui.cc:781
+#: src/aosd/aosd_ui.cc:892
 #, c-format
 msgid "Audacious OSD"
-msgstr "Affichage à l'écran Audacious"
+msgstr "Affichage à l’écran d’Audacious"
 
-#: src/aosd/aosd_ui.cc:844
+#: src/aosd/aosd_ui.cc:955
 msgid "Position"
 msgstr "Arrangement"
 
-#: src/aosd/aosd_ui.cc:849
+#: src/aosd/aosd_ui.cc:960
 msgid "Animation"
 msgstr "Animation"
 
-#: src/aosd/aosd_ui.cc:854
+#: src/aosd/aosd_ui.cc:965
 msgid "Text"
 msgstr "Texte"
 
-#: src/aosd/aosd_ui.cc:859
+#: src/aosd/aosd_ui.cc:970
 msgid "Decoration"
 msgstr "Décoration"
 
-#: src/aosd/aosd_ui.cc:864
+#: src/aosd/aosd_ui.cc:975
 msgid "Trigger"
 msgstr "Déclenchement"
 
-#: src/aosd/aosd_ui.cc:869
+#: src/aosd/aosd_ui.cc:980 src/streamtuner/shoutcast-model.cc:202
 msgid "Misc"
-msgstr "Options diverses"
+msgstr "Divers"
 
-#: src/aosd/aosd_ui.cc:878
+#: src/aosd/aosd_ui.cc:989
 msgid "Test"
 msgstr "Test"
 
@@ -782,43 +563,133 @@
 msgid "Audacious Playlists (audpl)"
 msgstr "Listes de lecture au format Audacious (audpl)"
 
-#: src/blur_scope/blur_scope.cc:42
+#: src/background_music/background_music.cc:24
+msgid "Background music"
+msgstr "Musique de fond"
+
+#: src/background_music/background_music.cc:25
+msgid "Target level:"
+msgstr "Niveau cible :"
+
+#: src/background_music/background_music.cc:28
+#: src/background_music/background_music.cc:33
+#: src/silence-removal/silence-removal.cc:70
+msgid "dB"
+msgstr "dB"
+
+#: src/background_music/background_music.cc:29
+msgid "Maximum amplification:"
+msgstr "Amplification maximale :"
+
+#: src/background_music/background_music.cc:34 src/mpg123/mpg123.cc:81
+msgid "Advanced"
+msgstr "Avancé"
+
+#: src/background_music/background_music.cc:36
+msgid "Slow detection weight:"
+msgstr "Poids lent de détection :"
+
+#: src/background_music/background_music.cc:39
+msgid "Hint"
+msgstr "Note"
+
+#: src/background_music/background_music.cc:41
+msgid ""
+"Slow detection weight is the relative weight\n"
+"of a long term average detection when compared\n"
+"to the actual, faster loudness detection.\n"
+"A value of zero gives a more radio-like sound\n"
+"where soft passages get \"pulled up\" more quickly,\n"
+"a value of two makes the sound feel less compressed."
+msgstr ""
+"Le poids lent de détection est le poids relatif d’une détection\n"
+"moyenne à long terme par rapport à la détection effective,\n"
+"plus rapide, de l’intensité sonore.\n"
+"Une valeur de zéro donne un son plus proche de celui d’une radio,\n"
+"dans lequel les passages doux sont « tirés vers le haut » plus rapidement ; "
+"avec une valeur de deux, le son semble moins compressé."
+
+#: src/background_music/background_music.cc:52
+msgid ""
+"Background Music Plugin for Audacious\n"
+"Copyright 2023;2024 Michel Fleur\n"
+"\n"
+"Controls the volume to make the sound equally loud within and between "
+"tracks.\n"
+" It uses accurate loudness measurement and tries to make the volume changes "
+"sound natural without audible peaks, yet without lowering the volume before "
+"a peak in advance."
+msgstr ""
+"Greffon de musique de fond pour Audacious\n"
+"Tous droits réservés 2023, 2024 Michel Fleur\n"
+"\n"
+"Contrôle le volume pour uniformiser l’intensité du son à l’intérieur des "
+"plages et d’une plage à l’autre.\n"
+"Il mesure l’intensité sonore avec précision et tente de rendre les "
+"changements de volume naturels, sans pics audibles et sans pour autant "
+"baisser à l’avance le volume avant un pic."
+
+#: src/background_music/background_music.cc:61
+msgid "Background Music"
+msgstr "Musique de fond"
+
+#: src/bitcrusher/bitcrusher.cc:33
+msgid "Bitcrusher"
+msgstr "Bitcrusher"
+
+#: src/bitcrusher/bitcrusher.cc:34
+msgid "Bit Depth:"
+msgstr "Profondeur du flux :"
+
+#: src/bitcrusher/bitcrusher.cc:37
+msgid "Downsample ratio:"
+msgstr "Ratio de sous-échantillonnage :"
+
+#: src/bitcrusher/bitcrusher.cc:48
+msgid "Bitcrusher"
+msgstr "Bitcrusher"
+
+#: src/blur_scope/blur_scope.cc:40 src/blur_scope-qt/blur_scope.cc:45
 msgid "Color"
 msgstr "Couleur"
 
-#: src/blur_scope/blur_scope.cc:58
+#: src/blur_scope/blur_scope.cc:56 src/blur_scope-qt/blur_scope.cc:158
 msgid "Blur Scope"
 msgstr "Oscilloscope flou"
 
 #: src/bs2b/plugin.cc:38
 msgid "Bauer Stereophonic-to-Binaural (BS2B)"
-msgstr "Stéréophonique-vers-binaural Bauer (BS2B)"
+msgstr "Stéréophonique vers binaural Bauer (BS2B)"
 
 #: src/bs2b/plugin.cc:129
 msgid "Presets:"
-msgstr "Préréglages :"
+msgstr "Préréglages :"
+
+#: src/bs2b/plugin.cc:130
+msgid "Default"
+msgstr "Par défaut"
 
 #: src/bs2b/plugin.cc:136
 msgid "Feed level:"
-msgstr "Niveau d'entrée :"
+msgstr "Niveau d’entrée :"
 
 #: src/bs2b/plugin.cc:138
 msgid "x1/10 dB"
-msgstr "x1/10 dB"
+msgstr "x 1/10 dB"
 
 #: src/bs2b/plugin.cc:139
 msgid "Cut frequency:"
-msgstr "Fréquence de coupure :"
+msgstr "Fréquence de coupure :"
 
-#: src/cairo-spectrum/cairo-spectrum.cc:41
+#: src/cairo-spectrum/cairo-spectrum.cc:42 src/qt-spectrum/qt-spectrum.cc:107
 msgid "Spectrum Analyzer"
 msgstr "Analyseur de spectre"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:72
+#: src/cdaudio/cdaudio-ng.cc:74
 msgid "Audio CD Plugin"
 msgstr "Greffon CD audio"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:121
+#: src/cdaudio/cdaudio-ng.cc:121
 msgid ""
 "Copyright (C) 2007-2012 Calin Crisan <ccrisan@gmail.com> and others.\n"
 "\n"
@@ -829,145 +700,145 @@
 "\n"
 "This was a Google Summer of Code 2007 project."
 msgstr ""
-"Tous droits réservés © 2007-2012 Calin Crisan <ccrisan@gmail.com> et "
+"Tous droits réservés © 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 de m'avoir épaulé et guidé.\n"
+"Merci aussi à Tony Vroon de m’avoir épaulé et guidé.\n"
 "\n"
-"Ceci était un projet Google « Summer of Code » de 2007."
+"C’était un projet Google « Summer of Code » de 2007."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:137
+#: src/cdaudio/cdaudio-ng.cc:140
 msgid "Device"
 msgstr "Lecteur"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:138
+#: src/cdaudio/cdaudio-ng.cc:141
 msgid "Read speed:"
-msgstr "Vitesse de lecture :"
+msgstr "Vitesse de lecture :"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:141
+#: src/cdaudio/cdaudio-ng.cc:144
 msgid "Override device:"
-msgstr "Forcer le lecteur :"
+msgstr "Forcer le lecteur :"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:143
+#: src/cdaudio/cdaudio-ng.cc:146
 msgid "Metadata"
 msgstr "Métadonnées"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:144
+#: src/cdaudio/cdaudio-ng.cc:147
 msgid "Use CD-Text"
 msgstr "Utiliser CD-Text"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:146
+#: src/cdaudio/cdaudio-ng.cc:150
 msgid "Use CDDB"
 msgstr "Utiliser CDDB"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:148
+#: src/cdaudio/cdaudio-ng.cc:152
 msgid "Use HTTP instead of CDDBP"
 msgstr "Utiliser HTTP à la place de CDDBP"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:151
+#: src/cdaudio/cdaudio-ng.cc:155
 msgid "Server:"
-msgstr "Serveur :"
+msgstr "Serveur :"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:155
+#: src/cdaudio/cdaudio-ng.cc:159
 msgid "Path:"
-msgstr "Chemin :"
+msgstr "Chemin :"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:159
+#: src/cdaudio/cdaudio-ng.cc:163
 msgid "Port:"
-msgstr "Port :"
+msgstr "Port :"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:246
+#: src/cdaudio/cdaudio-ng.cc:228
 msgid "Failed to initialize cdio subsystem."
-msgstr "Échec de l'initialisation du sous-système cdio"
+msgstr "Échec d’initialisation du sous-système cdio."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:281
+#: src/cdaudio/cdaudio-ng.cc:260
 #, c-format
 msgid "Invalid URI %s."
 msgstr "URI %s invalide."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:283
+#: src/cdaudio/cdaudio-ng.cc:262
 #, c-format
 msgid "Track %d not found."
-msgstr "Piste %d non trouvée."
+msgstr "La plage %d est introuvable."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:285
+#: src/cdaudio/cdaudio-ng.cc:264
 #, c-format
 msgid "Track %d is a data track."
-msgstr "La piste %d en est une de données."
+msgstr "La plage %d en est une de données."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:360
+#: src/cdaudio/cdaudio-ng.cc:339
 msgid "Error reading audio CD."
 msgstr "Erreur de lecture du CD audio."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:429
+#: src/cdaudio/cdaudio-ng.cc:410
 msgid "Audio CD"
 msgstr "CD audio"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:460 src/cdaudio-ng/cdaudio-ng.cc:469
+#: src/cdaudio/cdaudio-ng.cc:446 src/cdaudio/cdaudio-ng.cc:455
 #, c-format
 msgid "Failed to open CD device %s."
-msgstr "Échec de l'ouverture du lecteur de CD %s."
+msgstr "Échec d’ouverture du lecteur de CD %s."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:472
+#: src/cdaudio/cdaudio-ng.cc:458
 msgid "No audio capable CD drive found."
-msgstr "Aucun lecteur de CD audio n'a été trouvé."
+msgstr "Aucun lecteur de CD audio n’a été trouvé."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:497
+#: src/cdaudio/cdaudio-ng.cc:481
+msgid "Drive is empty."
+msgstr "Le lecteur est vide."
+
+#: src/cdaudio/cdaudio-ng.cc:483
+msgid "Unsupported disk type."
+msgstr "Le type de disque n’est pas pris en charge."
+
+#: src/cdaudio/cdaudio-ng.cc:507
 msgid "Failed to finish initializing opened CD drive."
-msgstr "N'a pu finir d'initialiser le lecteur CD ouvert."
+msgstr "N’a pu finir d’initialiser le lecteur CD ouvert."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:510
+#: src/cdaudio/cdaudio-ng.cc:520
 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"
+msgstr "Échec de récupération du premier ou du dernier numéro de plage."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:531
+#: src/cdaudio/cdaudio-ng.cc:541
 #, 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."
+"Impossible de lire le numéro de secteur logique de début ou de fin pour la "
+"plage %d."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:613
-msgid "Failed to create the cddb connection."
-msgstr "Échec de la connexion à CDDB."
+#: src/cdaudio/cdaudio-ng.cc:624
+msgid "Failed to create the CDDB connection."
+msgstr "Échec de création de la connexion CDDB."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:679
+#: src/cdaudio/cdaudio-ng.cc:690
 msgid "Failed to query the CDDB server"
-msgstr "Échec de la requête auprès du serveur CDDB"
+msgstr "Échec d’interrogation du serveur CDDB"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:681
+#: src/cdaudio/cdaudio-ng.cc:692
 #, c-format
 msgid "Failed to query the CDDB server: %s"
-msgstr "Échec de la requête auprès du serveur CDDB : %s ."
+msgstr "Échec d’interrogation du serveur CDDB : %s ."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:705
+#: src/cdaudio/cdaudio-ng.cc:716
 #, c-format
-msgid "Failed to read the cddb info: %s"
-msgstr "Échec de la lecture des informations cddb : %s"
-
-#: src/cdaudio-ng/cdaudio-ng.cc:765
-msgid "Drive is empty."
-msgstr "Le lecteur est vide"
+msgid "Failed to read the CDDB info: %s"
+msgstr "Échec de lecture des renseignements de CDDB : %s"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:767
-msgid "Unsupported disk type."
-msgstr "Type de disque non pris en charge."
-
-#: src/cd-menu-items/cd-menu-items.cc:35
+#: src/cd-menu-items/cd-menu-items.cc:33
 msgid "Audio CD Menu Items"
 msgstr "Éléments du menu CD Audio"
 
-#: src/cd-menu-items/cd-menu-items.cc:47
-msgid "Play CD"
-msgstr "Lire le CD"
-
-#: src/cd-menu-items/cd-menu-items.cc:47
-msgid "Add CD"
-msgstr "Ajouter un CD"
+#: src/cd-menu-items/cd-menu-items.cc:45
+msgid "Pla_y CD"
+msgstr "_Lire le CD"
+
+#: src/cd-menu-items/cd-menu-items.cc:45
+msgid "_Add CD"
+msgstr "_Ajouter le CD"
 
 #: src/compressor/compressor.cc:45
 msgid "Compression"
@@ -975,19 +846,19 @@
 
 #: src/compressor/compressor.cc:46
 msgid "Center volume:"
-msgstr "Volume central :"
+msgstr "Volume central :"
 
 #: src/compressor/compressor.cc:49
 msgid "Dynamic range:"
-msgstr "Plage dynamique :"
+msgstr "Plage dynamique :"
 
 #: src/compressor/compressor.cc:57
 msgid ""
 "Dynamic Range Compression Plugin for Audacious\n"
 "Copyright 2010-2014 John Lindgren"
 msgstr ""
-"Greffon de compression d'étendue dynamique pour Audacious\n"
-"Tous droits réservés © 2010-2014 John Lindgren"
+"Greffon de compression d’étendue dynamique pour Audacious\n"
+"Tous droits réservés © 2010 à 2014 John Lindgren"
 
 #: src/compressor/compressor.cc:64
 msgid "Dynamic Range Compressor"
@@ -1002,31 +873,38 @@
 "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\n"
-"Formats pris en charge : AY, GBS, GYM, HES, KSS, NSF, NSFE, SAP, SPC, VGM, "
+"Moteur de décodage de musique de console fondé 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"
+"Greffon Audacious par :\n"
 "William Pitcock <nenolod@dereferenced.org>\n"
 "Shay Green <gblargg@gmail.com>"
 
 #: src/console/plugin.cc:30
 msgid "Bass:"
-msgstr "Grave :"
+msgstr "Grave :"
 
 #: src/console/plugin.cc:33
 msgid "Treble:"
-msgstr "Aigu :"
+msgstr "Aigu :"
 
 #: src/console/plugin.cc:36
 msgid "Echo:"
-msgstr "Écho :"
+msgstr "Écho :"
 
 #: src/console/plugin.cc:39
 msgid "Default song length:"
-msgstr "Durée par défaut du morceau :"
+msgstr "Durée par défaut de la pièce :"
 
-#: src/console/plugin.cc:42 src/modplug/plugin_main.cc:59
+#: src/console/plugin.cc:41 src/crossfade/crossfade.cc:56
+#: src/crossfade/crossfade.cc:62 src/lirc/lirc.cc:395 src/notify/notify.cc:113
+#: src/sid/xs_config.cc:85 src/sid/xs_config.cc:94 src/sid/xs_config.cc:103
+#: src/vumeter-qt/vumeter_qt.cc:39
+msgid "seconds"
+msgstr "secondes"
+
+#: src/console/plugin.cc:42 src/modplug/plugin_main.cc:58
 msgid "Resampling"
 msgstr "Rééchantillonnage"
 
@@ -1048,154 +926,165 @@
 
 #: src/console/plugin.h:26
 msgid "Game Console Music Decoder"
-msgstr "Décodeur « Game Console Music »"
+msgstr "Décodeur de musique de console de jeu "
 
-#: src/coreaudio/coreaudio.cc:50
+#: src/coreaudio/coreaudio.cc:53
 msgid "CoreAudio output"
 msgstr "Sortie CoreAudio"
 
-#: src/coreaudio/coreaudio.cc:131
+#: src/coreaudio/coreaudio.cc:155
 msgid ""
 "CoreAudio Output Plugin for Audacious\n"
 "Copyright 2014 William Pitcock\n"
+"Copyright 2017,18 René J.V. Bertin\n"
+" (original code and code adapted from\n"
+" Apple examples, (C) Apple 2013)\n"
 "\n"
 "Based on SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
 msgstr ""
 "Greffon de sortie CoreAudio pour Audacious\n"
 "Tous droits réservés © 2014 William Pitcock\n"
+"Tous droits réservés © 2017, 2018 René J.V. Bertin\n"
+"(code original et code adapté d’exemples d’Apple,\n"
+"© Apple 2013)\n"
 "\n"
-"Basé sur le greffon de sortie SDL pour Audacious\n"
+"Fondé sur le greffon de sortie SDL pour Audacious\n"
 "Tous droits réservés © 2010 John Lindgren"
 
-#: src/coreaudio/coreaudio.cc:143
+#: src/coreaudio/coreaudio.cc:171
 msgid "Use exclusive mode"
 msgstr "Utiliser le mode exclusif"
 
-#: src/crossfade/crossfade.cc:44
+#: src/coreaudio/coreaudio.cc:173
+msgid "Use bit perfect audio (adapt device sampling rate)"
+msgstr ""
+"Utiliser la reproduction du son au bit près (adapter la fréquence "
+"d’échantillonnage du périphérique)"
+
+#: src/crossfade/crossfade.cc:47
 msgid ""
 "Crossfade Plugin for Audacious\n"
 "Copyright 2010-2014 John Lindgren"
 msgstr ""
 "Greffon de fondu enchaîné pour Audacious\n"
-"Tous droits réservés © 2010-2014 John Lindgren"
+"Tous droits réservés © 2010 à 2014 John Lindgren"
 
-#: src/crossfade/crossfade.cc:48
+#: src/crossfade/crossfade.cc:51
 msgid "Crossfade"
 msgstr "Fondu enchaîné"
 
-#: src/crossfade/crossfade.cc:49
+#: src/crossfade/crossfade.cc:52
 msgid "On automatic song change"
-msgstr "Lors d'un changement automatique de morceau"
+msgstr "Lors d’un changement automatique de pièce"
 
-#: src/crossfade/crossfade.cc:51 src/crossfade/crossfade.cc:57
+#: src/crossfade/crossfade.cc:54 src/crossfade/crossfade.cc:60
 msgid "Overlap:"
-msgstr "Recouvrement:"
+msgstr "Recouvrement :"
 
-#: src/crossfade/crossfade.cc:55
+#: src/crossfade/crossfade.cc:58
 msgid "On seek or manual song change"
-msgstr "Lors d'un positionnement ou d'un changement manuel de morceau"
+msgstr "Lors d’un positionnement ou d’un changement manuel de pièce"
 
-#: src/crossfade/crossfade.cc:61
+#: src/crossfade/crossfade.cc:64
+msgid "No fade in"
+msgstr "Pas de fondu d’entrée"
+
+#: src/crossfade/crossfade.cc:66
+msgid "Use S-curve fade"
+msgstr "Fondu avec courbe en S"
+
+#: src/crossfade/crossfade.cc:68
+msgid "S-curve steepness:"
+msgstr "Raideur de la courbe en S :"
+
+#: src/crossfade/crossfade.cc:70
+msgid "(higher is steeper)"
+msgstr "(plus élevé est plus raide)"
+
+#: src/crossfade/crossfade.cc:72
 msgid "Tip"
 msgstr "Astuce"
 
-#: src/crossfade/crossfade.cc:62
+#: src/crossfade/crossfade.cc:73
 msgid ""
 "For better crossfading, enable\n"
 "the Silence Removal effect."
 msgstr ""
-"Pour un meilleur fondu, activer\n"
-"l'effet Suppression des silences."
+"Pour un meilleur fondu, activez\n"
+"l’effet Suppression des silences."
 
-#: src/crossfade/crossfade.cc:72
+#: src/crossfade/crossfade.cc:83
 msgid "Crossfade"
 msgstr "Fondu enchaîné"
 
-#: src/crossfade/crossfade.cc:161
-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. Tu peux utiliser le « Mélangeur de canaux » pour les uniformiser."
-
-#: src/crossfade/crossfade.cc:168
-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. Tu peux utiliser le « Convertisseur de taux "
-"d’échantillonnage » pour les uniformiser."
-
 #: src/crystalizer/crystalizer.cc:31
 msgid "Crystalizer"
 msgstr "Cristalliseur"
 
 #: src/crystalizer/crystalizer.cc:32 src/stereo_plugin/stereo.cc:45
 msgid "Intensity:"
-msgstr "Intensité :"
+msgstr "Intensité :"
 
 #: src/crystalizer/crystalizer.cc:43
 msgid "Crystalizer"
 msgstr "Cristalliseur "
 
-#: src/cue/cue.cc:37
+#: src/cue/cue.cc:42
 msgid "Cue Sheet Plugin"
 msgstr "Greffon des fichiers .cue"
 
-#: src/delete-files/delete-files.cc:46 src/delete-files/delete-files.cc:146
+#: src/delete-files/delete-files.cc:53 src/delete-files/delete-files.cc:215
+#: src/delete-files/delete-files.cc:230
 msgid "Delete Files"
-msgstr "Supprimer les fichiers"
+msgstr "Supprimer des fichiers"
+
+#: src/delete-files/delete-files.cc:120
+msgid "No files are selected."
+msgstr "Aucun fichier n’a été sélectionné."
 
-#: src/delete-files/delete-files.cc:75
+#: src/delete-files/delete-files.cc:125
 #, c-format
-msgid "Error moving %s to trash: %s."
-msgstr "Erreur lors du déplacement de %s vers la corbeille : %s."
+msgid "Do you want to move %s to the trash?"
+msgstr "Souhaitez-vous déplacer %s vers la corbeille ?"
 
-#: src/delete-files/delete-files.cc:86
+#: src/delete-files/delete-files.cc:126
 #, c-format
-msgid "Error deleting %s: %s."
-msgstr "Erreur lors de la suppression de %s : %s."
+msgid "Do you want to permanently delete %s?"
+msgstr "Souhaitez-vous supprimer %s définitivement ?"
 
-#: src/delete-files/delete-files.cc:117
+#: src/delete-files/delete-files.cc:133
 #, c-format
-msgid "Error deleting %s: not a local file."
-msgstr "Erreur lors de la suppression de %s : n'est pas un fichier local."
+msgid "Do you want to move %d files to the trash?"
+msgstr "Souhaitez-vous déplacer %d fichiers vers la corbeille ?"
 
 #: src/delete-files/delete-files.cc:134
-msgid "Do you want to move the selected files to the trash?"
-msgstr "Voulez-vous déplacer les fichiers sélectionnés vers la corbeille ?"
+#, c-format
+msgid "Do you want to permanently delete %d files?"
+msgstr "Souhaitez-vous supprimer %d fichiers définitivement ?"
 
-#: src/delete-files/delete-files.cc:135
-msgid "Move to Trash"
+#: src/delete-files/delete-files.cc:146
+msgid "Move to trash"
 msgstr "Déplacer vers la corbeille"
 
-#: src/delete-files/delete-files.cc:140
-msgid "Do you want to permanently delete the selected files?"
-msgstr "Voulez-vous supprimer définitivement les fichiers sélectionnés ?"
-
-#: src/delete-files/delete-files.cc:141 src/skins/preset-list.cc:411
-#: src/skins/preset-list.cc:427
+#: src/delete-files/delete-files.cc:146
 msgid "Delete"
 msgstr "Supprimer"
 
-#: src/delete-files/delete-files.cc:145 src/skins/preset-browser.cc:56
-#: src/skins/preset-list.cc:307 src/skins/ui_playlist.cc:221
+#: src/delete-files/delete-files.cc:213 src/delete-files/delete-files.cc:235
+#: src/skins-qt/search-select.cc:102 src/skins/search-select.cc:78
 msgid "Cancel"
 msgstr "Annuler"
 
-#: src/delete-files/delete-files.cc:166
+#: src/delete-files/delete-files.cc:267
 msgid "Delete Selected Files"
 msgstr "Supprimer les fichiers sélectionnés"
 
-#: src/delete-files/delete-files.cc:181
+#: src/delete-files/delete-files.cc:287
 msgid "Delete Method"
 msgstr "Méthode de suppression"
 
-#: src/delete-files/delete-files.cc:182
+#: src/delete-files/delete-files.cc:288
 msgid "Move to trash instead of deleting immediately"
 msgstr "Déplacer vers la corbeille au lieu de supprimer immédiatement"
 
@@ -1206,42 +1095,43 @@
 "Surround echo by Carl van Schaik, 1999\n"
 "Updated for Audacious by William Pitcock and John Lindgren, 2010-2014"
 msgstr ""
-"Greffon d'écho\n"
+"Greffon d’écho\n"
 "Par Johan Levin, 1999\n"
 "Écho ambiophonique par Carl van Schaik, 1999\n"
-"Mise à niveau pour Audacious par William Pitcock et John Lindgren, 2010-2014"
+"Mise à niveau pour Audacious par William Pitcock et John Lindgren, 2010 à "
+"2014"
 
 #: src/echo_plugin/echo.cc:21
 msgid "Echo"
 msgstr "Écho"
 
-#: src/echo_plugin/echo.cc:22 src/modplug/plugin_main.cc:73
-#: src/modplug/plugin_main.cc:83
+#: src/echo_plugin/echo.cc:22 src/modplug/plugin_main.cc:72
+#: src/modplug/plugin_main.cc:82
 msgid "Delay:"
-msgstr "Retard :"
+msgstr "Retard :"
 
-#: src/echo_plugin/echo.cc:24 src/modplug/plugin_main.cc:73
-#: src/modplug/plugin_main.cc:83
+#: src/echo_plugin/echo.cc:24 src/modplug/plugin_main.cc:72
+#: src/modplug/plugin_main.cc:82 src/xsf/plugin.cc:445
 msgid "ms"
 msgstr "ms"
 
 #: src/echo_plugin/echo.cc:25
 msgid "Feedback:"
-msgstr "Retour :"
+msgstr "Retour :"
 
-#: src/echo_plugin/echo.cc:28 src/modplug/plugin_main.cc:87
+#: src/echo_plugin/echo.cc:28 src/modplug/plugin_main.cc:86
 msgid "Volume:"
-msgstr "Volume :"
+msgstr "Volume :"
 
 #: src/echo_plugin/echo.cc:39
 msgid "Echo"
 msgstr "Écho"
 
-#: src/ffaudio/ffaudio-core.cc:41
+#: src/ffaudio/ffaudio-core.cc:50
 msgid "FFmpeg Plugin"
 msgstr "Greffon FFmpeg"
 
-#: src/ffaudio/ffaudio-core.cc:571
+#: src/ffaudio/ffaudio-core.cc:649
 msgid ""
 "Multi-format audio decoding plugin for Audacious using\n"
 "FFmpeg multimedia framework (http://www.ffmpeg.org/)\n"
@@ -1250,262 +1140,335 @@
 "William Pitcock <nenolod@nenolod.net>\n"
 "Matti 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"
+"Greffon pour Audacious de décodage multiformat fondé \n"
+"sur le cadre d’applications multimédia FFmpeg (http://www.ffmpeg.org/)\n"
 "\n"
-"Greffon Audacious par :\n"
+"Greffon Audacious par :\n"
 "William Pitcock <nenolod@nenolod.net>\n"
 "Matti Hämäläinen <ccr@tnsp.org>"
 
-#: src/filewriter/filewriter.cc:45
+#: src/filewriter/filewriter.cc:48
 msgid "FileWriter Plugin"
-msgstr "Greffon FileWriter"
+msgstr "greffon FileWriter"
 
-#: src/filewriter/filewriter.cc:386
-msgid "Output file format:"
-msgstr "Format du fichier de sortie :"
+#: src/filewriter/filewriter.cc:316
+#, c-format
+msgid ""
+"Error opening %s:\n"
+"%s"
+msgstr ""
+"Erreur d’ouverture de %s :\n"
+"%s"
 
-#: src/filewriter/filewriter.cc:403
-msgid "Configure"
-msgstr "Configurer"
+#: src/filewriter/filewriter.cc:358
+msgid ""
+"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 ""
+"Ce programme est un logiciel libre ; vous pouvez le redistribuer ou le "
+"modifier selon les termes de la licence publique générale GNU telle que "
+"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é en espérant qu’il sera utile, mais SANS AUCUNE "
+"GARANTIE, ni explicite ni implicite, y compris les garanties de "
+"COMMERCIALISATION ou d’ADAPTATION DANS UN BUT SPÉCIFIQUE. Consultez la "
+"licence publique générale GNU pour plus de détails.\n"
+"\n"
+"Vous devriez avoir reçu une copie de la licence publique générale GNU en "
+"même temps que ce programme ; sinon, écrivez à Free Software Foundation, "
+"Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
 
-#: src/filewriter/filewriter.cc:413
+#: src/filewriter/filewriter.cc:385
+msgid "Output file format:"
+msgstr "Format du fichier de sortie :"
+
+#: src/filewriter/filewriter.cc:389
 msgid "Save into original directory"
-msgstr "Enregistrer dans le répertoire d'origine"
+msgstr "Enregistrer dans le répertoire d’origine"
 
-#: src/filewriter/filewriter.cc:417
-msgid "Save into custom directory"
-msgstr "Enregistrer dans un répertoire personnalisé"
-
-#: src/filewriter/filewriter.cc:427
-msgid "Output file folder:"
-msgstr "Dossier de destination :"
+#: src/filewriter/filewriter.cc:392
+msgid "Save into custom directory:"
+msgstr "Enregistrer dans un répertoire personnalisé :"
 
-#: src/filewriter/filewriter.cc:431
-msgid "Pick a folder"
-msgstr "Choisir un dossier"
-
-#: src/filewriter/filewriter.cc:444
+#: src/filewriter/filewriter.cc:400
 msgid "Generate file name from:"
-msgstr "Générer le nom de fichier à partir de :"
-
-#: src/filewriter/filewriter.cc:448
-msgid "Original file tag"
-msgstr "Balise originale du fichier"
+msgstr "Générer le nom de fichier à partir de :"
 
-#: src/filewriter/filewriter.cc:453
+#: src/filewriter/filewriter.cc:401
 msgid "Original file name"
 msgstr "Nom original du fichier"
 
-#: src/filewriter/filewriter.cc:459
-msgid "Include original file name extension"
-msgstr "Inclure l'extension originale du nom de fichier"
+#: src/filewriter/filewriter.cc:404
+msgid "Original file name (no suffix)"
+msgstr "Nom original du fichier (sans suffixe) "
 
-#: src/filewriter/filewriter.cc:468
-msgid "Prepend track number to file name"
-msgstr "Ajouter le numéro de la piste au début du nom du fichier"
+#: src/filewriter/filewriter.cc:407
+msgid "Original file tag"
+msgstr "Balise originale du fichier"
 
-#: src/filewriter/filewriter.cc:484
-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 ""
-"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é dans l'espoir qu'il vous sera 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.cc:411
+msgid "Prepend track number to file name"
+msgstr "Ajouter le numéro de la plage au début du nom du fichier"
 
-#: src/filewriter/mp3.cc:40 src/filewriter/mp3.cc:717
+#: src/filewriter/filewriter.cc:417 src/filewriter/filewriter.cc:449
 msgid "Auto"
 msgstr "Auto"
 
-#: src/filewriter/mp3.cc:40
+#: src/filewriter/filewriter.cc:418
+msgid "8000 Hz"
+msgstr "8 000 Hz"
+
+#: src/filewriter/filewriter.cc:419
+msgid "11025 Hz"
+msgstr "11 025 Hz"
+
+#: src/filewriter/filewriter.cc:420
+msgid "12000 Hz"
+msgstr "12 000 Hz"
+
+#: src/filewriter/filewriter.cc:421
+msgid "16000 Hz"
+msgstr "16 000 Hz"
+
+#: src/filewriter/filewriter.cc:422
+msgid "22050 Hz"
+msgstr "22 050 Hz"
+
+#: src/filewriter/filewriter.cc:423
+msgid "24000 Hz"
+msgstr "24 000 Hz"
+
+#: src/filewriter/filewriter.cc:424
+msgid "32000 Hz"
+msgstr "32 000 Hz"
+
+#: src/filewriter/filewriter.cc:425 src/xsf/plugin.cc:430
+msgid "44100 Hz"
+msgstr "44 100 Hz"
+
+#: src/filewriter/filewriter.cc:426 src/xsf/plugin.cc:431
+msgid "48000 Hz"
+msgstr "48 000 Hz"
+
+#: src/filewriter/filewriter.cc:430
+msgid "8 kbit/s"
+msgstr "8 kbit/s"
+
+#: src/filewriter/filewriter.cc:431
+msgid "16 kbit/s"
+msgstr "16 kbit/s"
+
+#: src/filewriter/filewriter.cc:432
+msgid "32 kbit/s"
+msgstr "32 kbit/s"
+
+#: src/filewriter/filewriter.cc:433
+msgid "40 kbit/s"
+msgstr "40 kbit/s"
+
+#: src/filewriter/filewriter.cc:434
+msgid "48 kbit/s"
+msgstr "48 kbit/s"
+
+#: src/filewriter/filewriter.cc:435
+msgid "56 kbit/s"
+msgstr "56 kbit/s"
+
+#: src/filewriter/filewriter.cc:436
+msgid "64 kbit/s"
+msgstr "64 kbit/s"
+
+#: src/filewriter/filewriter.cc:437
+msgid "80 kbit/s"
+msgstr "80 kbit/s"
+
+#: src/filewriter/filewriter.cc:438
+msgid "96 kbit/s"
+msgstr "96 kbit/s"
+
+#: src/filewriter/filewriter.cc:439
+msgid "112 kbit/s"
+msgstr "112 kbit/s"
+
+#: src/filewriter/filewriter.cc:440
+msgid "128 kbit/s"
+msgstr "128 kbit/s"
+
+#: src/filewriter/filewriter.cc:441
+msgid "160 kbit/s"
+msgstr "160 kbit/s"
+
+#: src/filewriter/filewriter.cc:442
+msgid "192 kbit/s"
+msgstr "192 kbit/s"
+
+#: src/filewriter/filewriter.cc:443
+msgid "224 kbit/s"
+msgstr "224 kbit/s"
+
+#: src/filewriter/filewriter.cc:444
+msgid "256 kbit/s"
+msgstr "256 kbit/s"
+
+#: src/filewriter/filewriter.cc:445
+msgid "320 kbit/s"
+msgstr "320 kbit/s"
+
+#: src/filewriter/filewriter.cc:450
 msgid "Joint Stereo"
 msgstr "Stéréo combinée"
 
-#: src/filewriter/mp3.cc:41 src/modplug/plugin_main.cc:58
-#: src/mpg123/mpg123.cc:248
+#: src/filewriter/filewriter.cc:451 src/modplug/plugin_main.cc:57
+#: src/mpg123/mpg123.cc:259
 msgid "Stereo"
 msgstr "Stéréo"
 
-#: src/filewriter/mp3.cc:41 src/modplug/plugin_main.cc:57
-#: src/mpg123/mpg123.cc:248
+#: src/filewriter/filewriter.cc:452 src/modplug/plugin_main.cc:56
+#: src/mpg123/mpg123.cc:260
 msgid "Mono"
 msgstr "Mono"
 
-#: src/filewriter/mp3.cc:657
-msgid "MP3 Configuration"
-msgstr "Configuration MP3"
-
-#: src/filewriter/mp3.cc:658
-msgid "_OK"
-msgstr "_OK"
-
-#: src/filewriter/mp3.cc:681
-msgid "Algorithm Quality:"
-msgstr "Qualité de l'algorithme :"
-
-#: src/filewriter/mp3.cc:706
-msgid "Output Sample Rate:"
-msgstr "Fréquence de sortie de l'échantillon :"
-
-#: src/filewriter/mp3.cc:733
-msgid "(Hz)"
-msgstr "(Hz)"
-
-#: src/filewriter/mp3.cc:740
-msgid "Bitrate / Compression Ratio:"
-msgstr "Rapport débit binaire / compression :"
-
-#: src/filewriter/mp3.cc:764
-msgid "Bitrate (kbps):"
-msgstr "Débit binaire (kbps)"
+#: src/filewriter/filewriter.cc:456
+msgid "VBR"
+msgstr "DBV"
+
+#: src/filewriter/filewriter.cc:457
+msgid "ABR"
+msgstr "DBM"
+
+#: src/filewriter/filewriter.cc:478
+msgid "Algorithm quality:"
+msgstr "Qualité de l’algorithme :"
 
-#: src/filewriter/mp3.cc:796
-msgid "Compression ratio:"
-msgstr "Taux de compression :"
+#: src/filewriter/filewriter.cc:484
+msgid "Bitrate:"
+msgstr "Débit binaire :"
 
-#: src/filewriter/mp3.cc:820
-msgid "Audio Mode:"
-msgstr "Mode audio :"
+#: src/filewriter/filewriter.cc:491
+msgid "Compression ratio:"
+msgstr "Taux de compression :"
 
-#: src/filewriter/mp3.cc:845
-msgid "Miscellaneous:"
-msgstr "Divers :"
+#: src/filewriter/filewriter.cc:498
+msgid "Audio mode:"
+msgstr "Mode son :"
 
-#: src/filewriter/mp3.cc:856
+#: src/filewriter/filewriter.cc:501
 msgid "Enforce strict ISO compliance"
 msgstr "Respecter rigoureusement les normes ISO"
 
-#: src/filewriter/mp3.cc:867
+#: src/filewriter/filewriter.cc:503
 msgid "Error protection"
 msgstr "Protection contre les erreurs"
 
-#: src/filewriter/mp3.cc:879 src/filewriter/vorbis.cc:206
-msgid "Quality"
-msgstr "Qualité"
-
-#: src/filewriter/mp3.cc:888
+#: src/filewriter/filewriter.cc:508
 msgid "Enable VBR/ABR"
-msgstr "Activer DBV/DBM (débit binaire variable/débit binaire moyen)"
+msgstr "Activer DBV/DBM"
 
-#: src/filewriter/mp3.cc:898
+#: src/filewriter/filewriter.cc:510
 msgid "Type:"
-msgstr "Type :"
+msgstr "Type :"
+
+#: src/filewriter/filewriter.cc:514
+msgid "Minimum bitrate:"
+msgstr "Débit binaire minimal :"
 
-#: src/filewriter/mp3.cc:931
-msgid "VBR Options:"
-msgstr "Options DBV :"
+#: src/filewriter/filewriter.cc:518
+msgid "Maximum bitrate:"
+msgstr "Débit binaire maximal :"
 
-#: src/filewriter/mp3.cc:947
-msgid "Minimum bitrate (kbps):"
-msgstr "Débit binaire minimal (kbps) :"
+#: src/filewriter/filewriter.cc:522
+msgid "Average bitrate:"
+msgstr "Débit binaire moyen :"
 
-#: src/filewriter/mp3.cc:973
-msgid "Maximum bitrate (kbps):"
-msgstr "Débit binaire maximal (kbps) :"
+#: src/filewriter/filewriter.cc:526
+msgid "VBR quality level:"
+msgstr "Niveau de qualité DBV :"
 
-#: src/filewriter/mp3.cc:995
+#: src/filewriter/filewriter.cc:530
 msgid "Strictly enforce minimum bitrate"
 msgstr "Forcer de manière stricte le débit binaire minimal"
 
-#: src/filewriter/mp3.cc:1007
-msgid "ABR Options:"
-msgstr "Options DBM :"
-
-#: src/filewriter/mp3.cc:1017
-msgid "Average bitrate (kbps):"
-msgstr "Débit binaire moyen (kbps) :"
-
-#: src/filewriter/mp3.cc:1044
-msgid "VBR quality level:"
-msgstr "Niveau de qualité DBV (débit binaire variable) :"
-
-#: src/filewriter/mp3.cc:1063
+#: src/filewriter/filewriter.cc:533
 msgid "Omit Xing VBR header"
-msgstr "Omettre l'en-tête DBV (débit binaire variable) Xing"
-
-#: src/filewriter/mp3.cc:1076
-msgid "VBR/ABR"
-msgstr "DBV/DBM (débit binaire variable/débit binaire moyen)"
+msgstr "Omettre l’en-tête DBV Xing"
 
-#: src/filewriter/mp3.cc:1085
-msgid "Frame Parameters:"
-msgstr "Paramètres de trame :"
+#: src/filewriter/filewriter.cc:539
+msgid "Frame Headers"
+msgstr "En-tête de trame"
 
-#: src/filewriter/mp3.cc:1097
+#: src/filewriter/filewriter.cc:540
 msgid "Mark as copyright"
-msgstr "Marquer comme soumis aux droits d'auteur"
+msgstr "Marquer comme soumis aux droits d’auteur"
 
-#: src/filewriter/mp3.cc:1108
+#: src/filewriter/filewriter.cc:542
 msgid "Mark as original"
 msgstr "Marquer comme originale"
 
-#: src/filewriter/mp3.cc:1120
-msgid "ID3 Parameters:"
-msgstr "Paramètres ID3 :"
+#: src/filewriter/filewriter.cc:544
+msgid "ID3 Tags"
+msgstr "Balises ID3"
 
-#: src/filewriter/mp3.cc:1131
+#: src/filewriter/filewriter.cc:545
 msgid "Force addition of version 2 tag"
-msgstr "Forcer l'ajout de la version 2 des balises"
+msgstr "Forcer l’ajout de la version 2 des balises"
 
-#: src/filewriter/mp3.cc:1141
+#: src/filewriter/filewriter.cc:547
 msgid "Only add v1 tag"
 msgstr "Ajouter uniquement la version 1 des balises"
 
-#: src/filewriter/mp3.cc:1148
+#: src/filewriter/filewriter.cc:549
 msgid "Only add v2 tag"
 msgstr "Ajouter uniquement la version 2 des balises"
 
-#: src/filewriter/mp3.cc:1169
+#: src/filewriter/filewriter.cc:554
+msgid "Quality"
+msgstr "Qualité"
+
+#: src/filewriter/filewriter.cc:555
+msgid "VBR/ABR"
+msgstr "DBV/DBM (débit binaire variable/débit binaire moyen)"
+
+#: src/filewriter/filewriter.cc:556
 msgid "Tags"
 msgstr "Balises"
 
-#: src/filewriter/vorbis.cc:196
-msgid "Vorbis Encoder Configuration"
-msgstr "Configuration de l'encodeur Vorbis"
-
-#: src/filewriter/vorbis.cc:219
-msgid "Quality level (0 - 10):"
-msgstr "Niveau de qualité (0 - 10) :"
+#: src/filewriter/filewriter.cc:566
+msgid "Quality (0-1):"
+msgstr "Qualité (0 à 1) :"
 
-#: src/flacng/flacng.h:35
+#: src/filewriter/filewriter.cc:573 src/skins-qt/skins_cfg.cc:307
+#: src/skins/skins_cfg.cc:289
+msgid "General"
+msgstr "Général"
+
+#: src/flac/flacng.h:36
 msgid "FLAC Decoder"
 msgstr "Décodeur FLAC"
 
-#: src/flacng/metadata.cc:351 src/wavpack/wavpack.cc:209
+#: src/flac/metadata.cc:296 src/wavpack/wavpack.cc:215
 msgid "lossless"
-msgstr "sans perte"
+msgstr "Sans perte"
 
-#: src/flacng/plugin.cc:169
+#: src/flac/plugin.cc:214
 msgid ""
 "Original code by\n"
 "Ralf Ertzinger <ralf@skytale.net>\n"
 "\n"
 "http://www.skytale.net/projects/bmp-flac2/"
 msgstr ""
-"Code d'origine par\n"
+"Code d’origine par\n"
 "Ralf Ertzinger <ralf@skytale.net>\n"
 "\n"
 "http://www.skytale.net/projects/bmp-flac2/"
@@ -1516,21 +1479,21 @@
 "Copyright 2009-2012 John Lindgren"
 msgstr ""
 "Greffon GIO pour Audacious\n"
-"Tous droits réservés © 2009-2012 John Lindgren"
+"Tous droits réservés © 2009 à 2012 John Lindgren"
 
 #: src/gio/gio.cc:42
 msgid "GIO Plugin"
 msgstr "Greffon GIO"
 
-#: src/gio/gio.cc:153
+#: src/gio/gio.cc:152
 msgid "Read-and-append mode not supported"
-msgstr "Le mode lecture-et-ajout n'est pas pris en charge"
+msgstr "Le mode lecture-et-ajout n’est pas pris en charge"
 
-#: src/gio/gio.cc:166
+#: src/gio/gio.cc:165
 msgid "Invalid open mode"
-msgstr "Mode d'ouverture invalide"
+msgstr "Mode d’ouverture invalide"
 
-#: src/gl-spectrum/gl-spectrum.cc:51
+#: src/glspectrum/gl-spectrum.cc:52
 msgid ""
 "OpenGL Spectrum Analyzer for Audacious\n"
 "Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
@@ -1544,779 +1507,933 @@
 "Analyseur de spectre OpenGL pour Audacious \n"
 "Tous droits réservés © 2013 Christophe Budé, John Lindgren et Carlo Bramini\n"
 "\n"
-"Basé sur le greffon XMMS :\n"
+"Fondé sur le greffon XMMS :\n"
 "Tous droits réservés © 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas "
 "Nilsson, et 4Front Technologies\n"
 "\n"
-"Licence : GPLv2+"
+"Licence : GPLv2+"
 
-#: src/gl-spectrum/gl-spectrum.cc:62
+#: src/glspectrum/gl-spectrum.cc:63 src/qtglspectrum/gl-spectrum.cc:53
 msgid "OpenGL Spectrum Analyzer"
 msgstr "Analyseur de spectre utilisant OpenGL"
 
-#: src/gl-spectrum-qt/gl-spectrum.cc:41
-msgid ""
-"OpenGL Spectrum Analyzer for Audacious\n"
-"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
-"Copyright 2014 William Pitcock\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 OpenGL pour Audacious\n"
-"Tous droits réservés © 2013 Christophe Budé, John Lindgren et Carlo Bramini\n"
-"Tous droits réservés © 2014 William Pitcock\n"
-"\n"
-"Basé sur le greffon XMMS :\n"
-"Tous droits réservés © 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas "
-"Nilsson, et 4Front Technologies\n"
-"\n"
-"Licence : GPLv2+"
-
-#: src/gl-spectrum-qt/gl-spectrum.cc:53
-msgid "OpenGL Spectrum Analyzer (Qt)"
-msgstr "Analyseur de spectre OpenGL (Qt)"
-
-#: src/gnomeshortcuts/gnomeshortcuts.cc:38
-msgid "GNOME Shortcuts"
-msgstr "Raccourcis de GNOME"
-
-#: src/gnomeshortcuts/gnomeshortcuts.cc:54
-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 prise en charge des raccourcis de GNOME\n"
-"Vous permet de contrôler le lecteur avec les raccourcis de GNOME\n"
-"\n"
-"Tous droits réservés © 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>"
-
-#: src/gtkui/columns.cc:35
-msgid "Entry number"
-msgstr "Numéro de l'entrée"
-
-#: src/gtkui/columns.cc:36 src/playlist-manager/playlist-manager.cc:225
-#: src/qtui/playlist_model.cc:123
+#: src/gtkui/columns.cc:36 src/moonstone/playlist_model.cc:38
+#: src/qtui/playlist_model.cc:33
+msgid "Entry Number"
+msgstr "Numéro d’entrée"
+
+#: src/gtkui/columns.cc:37 src/moonstone/playlist_model.cc:38
+#: src/moonstone/playlist_selection.cc:64
+#: src/playlist-manager/playlist-manager.cc:200
+#: src/playlist-manager-qt/playlist-manager-qt.cc:188
+#: src/qtui/playlist_model.cc:33 src/streamtuner/icecast-model.cc:120
+#: src/streamtuner/ihr-model.cc:159 src/streamtuner/shoutcast-model.cc:122
 msgid "Title"
 msgstr "Titre"
 
-#: src/gtkui/columns.cc:37 src/qtui/playlist_model.cc:125
+#: src/gtkui/columns.cc:38 src/moonstone/playlist_model.cc:39
+#: src/qtui/playlist_model.cc:33
 msgid "Artist"
 msgstr "Artiste"
 
-#: src/gtkui/columns.cc:38
+#: src/gtkui/columns.cc:39 src/moonstone/playlist_model.cc:39
+#: src/qtui/playlist_model.cc:33
 msgid "Year"
 msgstr "Année"
 
-#: src/gtkui/columns.cc:39 src/qtui/playlist_model.cc:127
+#: src/gtkui/columns.cc:40 src/moonstone/playlist_model.cc:39
+#: src/qtui/playlist_model.cc:34
 msgid "Album"
 msgstr "Album"
 
-#: src/gtkui/columns.cc:40
-msgid "Album artist"
-msgstr "Artiste de l'album"
+#: src/gtkui/columns.cc:41 src/moonstone/playlist_model.cc:40
+#: src/qtui/playlist_model.cc:34
+msgid "Album Artist"
+msgstr "Artiste de l’album"
 
-#: src/gtkui/columns.cc:41
+#: src/gtkui/columns.cc:42 src/moonstone/playlist_model.cc:40
+#: src/qtui/playlist_model.cc:34
 msgid "Track"
-msgstr "Numéro de piste"
+msgstr "Numéro de plage"
 
-#: src/gtkui/columns.cc:42
+#: src/gtkui/columns.cc:43 src/moonstone/playlist_model.cc:40
+#: src/qtui/playlist_model.cc:34 src/streamtuner/icecast-model.cc:123
+#: src/streamtuner/shoutcast-model.cc:125
+#: src/streamtuner/shoutcast-model.cc:236
 msgid "Genre"
 msgstr "Genre"
 
-#: src/gtkui/columns.cc:43
-msgid "Queue position"
+#: src/gtkui/columns.cc:44 src/moonstone/playlist_model.cc:41
+#: src/qtui/playlist_model.cc:35
+msgid "Queue Position"
 msgstr "Position dans la file"
 
-#: src/gtkui/columns.cc:44
+#: src/gtkui/columns.cc:45 src/moonstone/playlist_model.cc:41
+#: src/qtui/playlist_model.cc:35
 msgid "Length"
 msgstr "Durée"
 
-#: src/gtkui/columns.cc:45
-msgid "File path"
+#: src/gtkui/columns.cc:46 src/moonstone/playlist_model.cc:41
+#: src/qtui/playlist_model.cc:35
+msgid "File Path"
 msgstr "Chemin du fichier"
 
-#: src/gtkui/columns.cc:47
-msgid "Custom title"
+#: src/gtkui/columns.cc:47 src/moonstone/playlist_model.cc:42
+#: src/qtui/playlist_model.cc:35
+msgid "File Name"
+msgstr "Nom de fichier"
+
+#: src/gtkui/columns.cc:48 src/moonstone/playlist_model.cc:42
+#: src/qtui/playlist_model.cc:36
+msgid "Custom Title"
 msgstr "Titre personnalisé"
 
-#: src/gtkui/columns.cc:48
+#: src/gtkui/columns.cc:49 src/moonstone/playlist_model.cc:42
+#: src/qtui/playlist_model.cc:36 src/streamtuner/icecast-model.cc:129
+#: src/streamtuner/shoutcast-model.cc:134
 msgid "Bitrate"
 msgstr "Débit binaire"
 
-#: src/gtkui/columns.cc:308
+#: src/gtkui/columns.cc:50 src/moonstone/playlist_model.cc:43
+#: src/qtui/playlist_model.cc:36
+msgid "Comment"
+msgstr "Commentaire"
+
+#: src/gtkui/columns.cc:51 src/qtui/playlist_model.cc:36
+msgid "Publisher"
+msgstr "Éditeur"
+
+#: src/gtkui/columns.cc:52 src/qtui/playlist_model.cc:37
+msgid "Catalog Number"
+msgstr "Numéro de catalogue"
+
+#: src/gtkui/columns.cc:53 src/moonstone/playlist_model.cc:43
+#: src/qtui/playlist_model.cc:37
+msgid "Disc"
+msgstr "Disque"
+
+#: src/gtkui/columns.cc:325
 msgid "Available columns"
-msgstr "Colonnes proposées :"
+msgstr "Colonnes proposées :"
 
-#: src/gtkui/columns.cc:334
+#: src/gtkui/columns.cc:351
 msgid "Displayed columns"
 msgstr "Colonnes affichées"
 
-#: src/gtkui/layout.cc:72 src/search-tool/search-tool.cc:40
+#: src/gtkui/layout.cc:74 src/search-tool-qt/search-tool-qt.cc:58
+#: src/search-tool/search-tool.cc:49
 msgid "Search Tool"
 msgstr "Outil de recherche"
 
-#: src/gtkui/layout.cc:167
+#: src/gtkui/layout.cc:170
 msgid "Dock at Left"
 msgstr "Intégrer à gauche"
 
-#: src/gtkui/layout.cc:167
+#: src/gtkui/layout.cc:170
 msgid "Dock at Right"
 msgstr "Intégrer à droite"
 
-#: src/gtkui/layout.cc:168
+#: src/gtkui/layout.cc:171
 msgid "Dock at Top"
 msgstr "Intègrer en haut"
 
-#: src/gtkui/layout.cc:168
+#: src/gtkui/layout.cc:171
 msgid "Dock at Bottom"
 msgstr "Intègrer en bas"
 
-#: src/gtkui/layout.cc:168
+#: src/gtkui/layout.cc:171
 msgid "Undock"
 msgstr "Séparer"
 
-#: src/gtkui/layout.cc:168 src/ladspa/plugin.cc:531
+#: src/gtkui/layout.cc:171 src/ladspa/plugin.cc:540
 msgid "Disable"
 msgstr "Désactiver"
 
-#: src/gtkui/menus.cc:126 src/qtui/main_window_actions.cc:93
-#: src/statusicon/statusicon.cc:276
+#: src/gtkui/menus.cc:79 src/qtui/menus.cc:107
+#: src/statusicon-qt/statusicon.cc:115 src/statusicon/statusicon.cc:286
 msgid "_Open Files ..."
-msgstr "_Ouvrir des fichiers..."
+msgstr "_Ouvrir des fichiers…"
 
-#: src/gtkui/menus.cc:127
+#: src/gtkui/menus.cc:80 src/qtui/menus.cc:111
 msgid "Open _URL ..."
-msgstr "Ouvrir une _URL..."
+msgstr "Ouvrir une _URL…"
 
-#: src/gtkui/menus.cc:128 src/qtui/main_window_actions.cc:95
+#: src/gtkui/menus.cc:81 src/qtui/menus.cc:113
 msgid "_Add Files ..."
-msgstr "_Ajouter des fichiers..."
+msgstr "_Ajouter des fichiers…"
 
-#: src/gtkui/menus.cc:129
+#: src/gtkui/menus.cc:82 src/qtui/menus.cc:118
 msgid "Add U_RL ..."
-msgstr "Ajouter une U_RL..."
+msgstr "Ajouter une U_RL…"
 
-#: src/gtkui/menus.cc:131
+#: src/gtkui/menus.cc:84 src/qtui/menus.cc:120
 msgid "Search _Library"
-msgstr "Rechercher dans _l'audiothèque"
+msgstr "Chercher dans _l’audiothèque"
 
-#: src/gtkui/menus.cc:133 src/qtui/main_window_actions.cc:98
+#: src/gtkui/menus.cc:86 src/qtui/menus.cc:123
 msgid "A_bout ..."
-msgstr "À propos _de..."
+msgstr "À _propos…"
 
-#: src/gtkui/menus.cc:134 src/qtui/main_window_actions.cc:99
+#: src/gtkui/menus.cc:87 src/qtui/menus.cc:125
 msgid "_Settings ..."
-msgstr "_Paramètres..."
+msgstr "_Paramètres…"
 
-#: src/gtkui/menus.cc:135 src/qtui/main_window_actions.cc:103
-#: src/statusicon/statusicon.cc:284
+#: src/gtkui/menus.cc:88 src/qtui/menus.cc:131
+#: src/statusicon-qt/statusicon.cc:117 src/statusicon/statusicon.cc:288
 msgid "_Quit"
 msgstr "_Quitter"
 
-#: src/gtkui/menus.cc:139 src/gtkui/menus.cc:262
-#: src/qtui/main_window_actions.cc:107 src/search-tool/search-tool.cc:641
-#: src/statusicon/statusicon.cc:278
+#: src/gtkui/menus.cc:92 src/gtkui/menus.cc:226
+#: src/moonstone/playlist_tabs.cc:306 src/qtui/menus.cc:135
+#: src/qtui/playlist_tabs.cc:331 src/search-tool-qt/search-tool-qt.cc:499
+#: src/search-tool/search-tool.cc:339 src/statusicon-qt/statusicon.cc:109
+#: src/statusicon/statusicon.cc:280
 msgid "_Play"
 msgstr "_Lire"
 
-#: src/gtkui/menus.cc:140 src/qtui/main_window_actions.cc:108
-#: src/statusicon/statusicon.cc:279
+#: src/gtkui/menus.cc:93 src/qtui/menus.cc:137
+#: src/statusicon-qt/statusicon.cc:110 src/statusicon/statusicon.cc:281
 msgid "Paus_e"
 msgstr "Paus_e"
 
-#: src/gtkui/menus.cc:141 src/qtui/main_window_actions.cc:109
-#: src/statusicon/statusicon.cc:280
+#: src/gtkui/menus.cc:94 src/qtui/menus.cc:139
+#: src/statusicon-qt/statusicon.cc:111 src/statusicon/statusicon.cc:282
 msgid "_Stop"
-msgstr "_Arrêt"
+msgstr "Arrê_t"
 
-#: src/gtkui/menus.cc:142 src/qtui/main_window_actions.cc:110
-#: src/statusicon/statusicon.cc:277
+#: src/gtkui/menus.cc:95 src/qtui/menus.cc:141
+#: src/statusicon-qt/statusicon.cc:112 src/statusicon/statusicon.cc:283
 msgid "Pre_vious"
 msgstr "Pré_cédent"
 
-#: src/gtkui/menus.cc:143 src/qtui/main_window_actions.cc:111
-#: src/statusicon/statusicon.cc:281
+#: src/gtkui/menus.cc:96 src/qtui/menus.cc:143
+#: src/statusicon-qt/statusicon.cc:113 src/statusicon/statusicon.cc:284
 msgid "_Next"
 msgstr "S_uivant"
 
-#: src/gtkui/menus.cc:145 src/qtui/main_window_actions.cc:113
+#: src/gtkui/menus.cc:97 src/qtui/menus.cc:145 src/skins/menus.cc:114
+#: src/skins-qt/menus.cc:105
+msgid "Previous Album"
+msgstr "Album précédent"
+
+#: src/gtkui/menus.cc:98 src/qtui/menus.cc:146 src/skins/menus.cc:115
+#: src/skins-qt/menus.cc:106
+msgid "Next Album"
+msgstr "Album suivant"
+
+#: src/gtkui/menus.cc:100 src/qtui/menus.cc:148
 msgid "_Repeat"
 msgstr "_Répéter"
 
-#: src/gtkui/menus.cc:146 src/qtui/main_window_actions.cc:114
+#: src/gtkui/menus.cc:101 src/qtui/menus.cc:150
 msgid "S_huffle"
-msgstr "Lecture _aléatoire"
+msgstr "Lecture al_éatoire"
 
-#: src/gtkui/menus.cc:147 src/qtui/main_window_actions.cc:115
+#: src/gtkui/menus.cc:102 src/qtui/menus.cc:152
+msgid "Shuffle by Albu_m"
+msgstr "Lecture aléatoire par albu_m"
+
+#: src/gtkui/menus.cc:103 src/qtui/menus.cc:155
 msgid "N_o Playlist Advance"
 msgstr "_Ne pas avancer dans la liste de lecture"
 
-#: src/gtkui/menus.cc:148 src/qtui/main_window_actions.cc:116
+#: src/gtkui/menus.cc:104 src/qtui/menus.cc:157
 msgid "Stop A_fter This Song"
-msgstr "Arrêter après ce morceau"
+msgstr "Arrêter après cette p_ièce"
 
-#: src/gtkui/menus.cc:150 src/gtkui/menus.cc:247
-#: src/qtui/main_window_actions.cc:118
+#: src/gtkui/menus.cc:106 src/gtkui/menus.cc:210 src/qtui/menus.cc:162
+#: src/qtui/menus.cc:294
 msgid "Song _Info ..."
-msgstr "_Infos sur le morceau..."
+msgstr "Renseignements sur la _pièce…"
 
-#: src/gtkui/menus.cc:151
+#: src/gtkui/menus.cc:107
 msgid "Jump to _Time ..."
-msgstr "Sauter à la _position... (temps)"
+msgstr "Sauter à la _position… (temps)"
 
-#: src/gtkui/menus.cc:152
+#: src/gtkui/menus.cc:108
 msgid "_Jump to Song ..."
-msgstr "Sauter au _morceau..."
+msgstr "Sauter _vers une plage…"
 
-#: src/gtkui/menus.cc:154
+#: src/gtkui/menus.cc:110 src/qtui/menus.cc:165
 msgid "Set Repeat Point _A"
 msgstr "Point de répétition _A"
 
-#: src/gtkui/menus.cc:155
+#: src/gtkui/menus.cc:111 src/qtui/menus.cc:167
 msgid "Set Repeat Point _B"
 msgstr "Point de répétition _B"
 
-#: src/gtkui/menus.cc:156
+#: src/gtkui/menus.cc:112 src/qtui/menus.cc:169
 msgid "_Clear Repeat Points"
-msgstr "_Effacer les points de répétition"
+msgstr "_Supprimer les points de répétition"
 
-#: src/gtkui/menus.cc:160 src/gtkui/menus.cc:167 src/gtkui/menus.cc:183
-#: src/qtui/main_window_actions.cc:122 src/qtui/main_window_actions.cc:129
-#: src/qtui/main_window_actions.cc:145
+#: src/gtkui/menus.cc:116 src/gtkui/menus.cc:123 src/gtkui/menus.cc:141
+#: src/qtui/menus.cc:173 src/qtui/menus.cc:180 src/qtui/menus.cc:198
 msgid "By _Title"
 msgstr "Par _titre"
 
-#: src/gtkui/menus.cc:161 src/qtui/main_window_actions.cc:123
+#: src/gtkui/menus.cc:117 src/qtui/menus.cc:174
 msgid "By _File Name"
 msgstr "Par chemin de _fichier"
 
-#: src/gtkui/menus.cc:162 src/qtui/main_window_actions.cc:124
+#: src/gtkui/menus.cc:118 src/qtui/menus.cc:175
 msgid "By File _Path"
 msgstr "Par _chemin de fichier"
 
-#: src/gtkui/menus.cc:166 src/gtkui/menus.cc:182
-#: src/qtui/main_window_actions.cc:128 src/qtui/main_window_actions.cc:144
+#: src/gtkui/menus.cc:122 src/gtkui/menus.cc:140 src/qtui/menus.cc:179
+#: src/qtui/menus.cc:197
 msgid "By Track _Number"
-msgstr "Par _numéro de piste"
+msgstr "Par _numéro de plage"
 
-#: src/gtkui/menus.cc:168 src/gtkui/menus.cc:184
-#: src/qtui/main_window_actions.cc:130 src/qtui/main_window_actions.cc:146
+#: src/gtkui/menus.cc:124 src/gtkui/menus.cc:142 src/qtui/menus.cc:181
+#: src/qtui/menus.cc:199
 msgid "By _Artist"
 msgstr "Par _artiste"
 
-#: src/gtkui/menus.cc:169 src/gtkui/menus.cc:185
-#: src/qtui/main_window_actions.cc:131 src/qtui/main_window_actions.cc:147
+#: src/gtkui/menus.cc:125 src/gtkui/menus.cc:143 src/qtui/menus.cc:182
+#: src/qtui/menus.cc:200
 msgid "By Al_bum"
 msgstr "Par al_bum"
 
-#: src/gtkui/menus.cc:170 src/gtkui/menus.cc:186
-#: src/qtui/main_window_actions.cc:132 src/qtui/main_window_actions.cc:148
+#: src/gtkui/menus.cc:126 src/gtkui/menus.cc:144 src/qtui/menus.cc:183
+#: src/qtui/menus.cc:201
 msgid "By Albu_m Artist"
-msgstr "Par Artiste de l'albu_m"
+msgstr "Par artiste de l’albu_m"
 
-#: src/gtkui/menus.cc:171 src/gtkui/menus.cc:187
-#: src/qtui/main_window_actions.cc:133 src/qtui/main_window_actions.cc:149
+#: src/gtkui/menus.cc:127 src/gtkui/menus.cc:145 src/qtui/menus.cc:184
+#: src/qtui/menus.cc:202
 msgid "By Release _Date"
 msgstr "Par _date de parution"
 
-#: src/gtkui/menus.cc:172 src/gtkui/menus.cc:188
-#: src/qtui/main_window_actions.cc:134 src/qtui/main_window_actions.cc:150
+#: src/gtkui/menus.cc:128 src/gtkui/menus.cc:146 src/qtui/menus.cc:185
+#: src/qtui/menus.cc:203
 msgid "By _Genre"
-msgstr "Par _Genre"
+msgstr "Par _genre"
 
-#: src/gtkui/menus.cc:173 src/gtkui/menus.cc:189
-#: src/qtui/main_window_actions.cc:135 src/qtui/main_window_actions.cc:151
+#: src/gtkui/menus.cc:129 src/gtkui/menus.cc:147 src/qtui/menus.cc:186
+#: src/qtui/menus.cc:204
 msgid "By _Length"
 msgstr "Par _durée"
 
-#: src/gtkui/menus.cc:174 src/gtkui/menus.cc:190
-#: src/qtui/main_window_actions.cc:136 src/qtui/main_window_actions.cc:152
+#: src/gtkui/menus.cc:130 src/gtkui/menus.cc:148 src/qtui/menus.cc:187
+#: src/qtui/menus.cc:205
 msgid "By _File Path"
 msgstr "Par chemin de _fichier"
 
-#: src/gtkui/menus.cc:175 src/gtkui/menus.cc:191
-#: src/qtui/main_window_actions.cc:137 src/qtui/main_window_actions.cc:153
+#: src/gtkui/menus.cc:131 src/gtkui/menus.cc:149 src/qtui/menus.cc:188
+#: src/qtui/menus.cc:206
 msgid "By _Custom Title"
 msgstr "Par _titre personnalisé"
 
-#: src/gtkui/menus.cc:177 src/gtkui/menus.cc:193
-#: src/qtui/main_window_actions.cc:139 src/qtui/main_window_actions.cc:155
+#: src/gtkui/menus.cc:132 src/gtkui/menus.cc:150 src/qtui/menus.cc:189
+#: src/qtui/menus.cc:207
+msgid "By C_omment"
+msgstr "Par c_ommentaire"
+
+#: src/gtkui/menus.cc:133 src/gtkui/menus.cc:151 src/qtui/menus.cc:190
+#: src/qtui/menus.cc:208
+msgid "By D_isc Number"
+msgstr "Par numéro de d_isque"
+
+#: src/gtkui/menus.cc:135 src/gtkui/menus.cc:153 src/qtui/menus.cc:192
+#: src/qtui/menus.cc:210
 msgid "R_everse Order"
 msgstr "Ordre i_nversé"
 
-#: src/gtkui/menus.cc:178 src/gtkui/menus.cc:194
-#: src/qtui/main_window_actions.cc:140 src/qtui/main_window_actions.cc:156
+#: src/gtkui/menus.cc:136 src/gtkui/menus.cc:154 src/qtui/menus.cc:194
+#: src/qtui/menus.cc:212
 msgid "_Random Order"
 msgstr "Ordre _aléatoire"
 
-#: src/gtkui/menus.cc:198 src/qtui/main_window_actions.cc:160
+#: src/gtkui/menus.cc:158 src/qtui/menus.cc:216
 msgid "_Play/Resume"
 msgstr "_Lire/Reprendre"
 
-#: src/gtkui/menus.cc:199 src/gtkui/menus.cc:251
-#: src/qtui/main_window_actions.cc:161
+#: src/gtkui/menus.cc:159 src/qtui/menus.cc:218
 msgid "_Refresh"
-msgstr "_Rafraîchir"
+msgstr "_Actualiser"
 
-#: src/gtkui/menus.cc:201 src/qtui/main_window_actions.cc:163
+#: src/gtkui/menus.cc:161 src/qtui/menus.cc:222
 msgid "_Sort"
 msgstr "_Trier"
 
-#: src/gtkui/menus.cc:202 src/qtui/main_window_actions.cc:164
+#: src/gtkui/menus.cc:162 src/qtui/menus.cc:223
 msgid "Sort Se_lected"
 msgstr "Trier la sé_lection"
 
-#: src/gtkui/menus.cc:203 src/qtui/main_window_actions.cc:165
+#: src/gtkui/menus.cc:163 src/qtui/menus.cc:225
 msgid "Remove _Duplicates"
-msgstr "Enlever les _doublons"
+msgstr "Supprimer les _doublons"
 
-#: src/gtkui/menus.cc:204 src/qtui/main_window_actions.cc:166
+#: src/gtkui/menus.cc:164 src/qtui/menus.cc:226
 msgid "Remove _Unavailable Files"
-msgstr "Retirer les fichiers _absents"
+msgstr "Supprimer les fichiers _manquants"
 
-#: src/gtkui/menus.cc:206 src/playlist-manager/playlist-manager.cc:244
-#: src/qtui/main_window_actions.cc:168
+#: src/gtkui/menus.cc:166 src/playlist-manager/playlist-manager.cc:219
+#: src/playlist-manager-qt/playlist-manager-qt.cc:348 src/qtui/menus.cc:229
 msgid "_New"
-msgstr "_Nouvelle"
+msgstr "N_ouvelle"
 
-#: src/gtkui/menus.cc:207
+#: src/gtkui/menus.cc:167 src/qtui/menus.cc:230
 msgid "Ren_ame ..."
-msgstr "Re_nommer..."
+msgstr "Re_nommer…"
 
-#: src/gtkui/menus.cc:208 src/gtkui/menus.cc:264
-#: src/qtui/main_window_actions.cc:170
+#: src/gtkui/menus.cc:168 src/gtkui/menus.cc:228
+#: src/moonstone/playlist_tabs.cc:311 src/qtui/menus.cc:231
+#: src/qtui/playlist_tabs.cc:336
 msgid "Remo_ve"
 msgstr "Enle_ver"
 
-#: src/gtkui/menus.cc:210
+#: src/gtkui/menus.cc:170 src/qtui/menus.cc:233
 msgid "_Import ..."
-msgstr "_Importer"
+msgstr "_Importer…"
 
-#: src/gtkui/menus.cc:211
+#: src/gtkui/menus.cc:171 src/qtui/menus.cc:234
 msgid "_Export ..."
-msgstr "_Exporter"
+msgstr "_Exporter…"
 
-#: src/gtkui/menus.cc:213
+#: src/gtkui/menus.cc:173 src/qtui/menus.cc:237
 msgid "Playlist _Manager ..."
-msgstr "_Gestionnaire de listes de lecture..."
+msgstr "_Gestionnaire de listes de lecture…"
 
-#: src/gtkui/menus.cc:214 src/qtui/main_window_actions.cc:176
+#: src/gtkui/menus.cc:174 src/qtui/menus.cc:239
 msgid "_Queue Manager ..."
-msgstr "Gestionnaire de file d'_attente..."
+msgstr "Gestionnaire de la _file d’attente…"
 
-#: src/gtkui/menus.cc:218 src/qtui/main_window_actions.cc:180
+#: src/gtkui/menus.cc:178 src/qtui/menus.cc:243
 msgid "Volume _Up"
 msgstr "Augmenter le _volume"
 
-#: src/gtkui/menus.cc:219 src/qtui/main_window_actions.cc:181
+#: src/gtkui/menus.cc:179 src/qtui/menus.cc:245
 msgid "Volume _Down"
 msgstr "_Réduire le volume"
 
-#: src/gtkui/menus.cc:221 src/qtui/main_window_actions.cc:183
-msgid "_Equalizer"
-msgstr "Éga_liseur"
+#: src/gtkui/menus.cc:181 src/qtui/menus.cc:249
+msgid "_Equalizer ..."
+msgstr "É_galiseur…"
 
-#: src/gtkui/menus.cc:223 src/qtui/main_window_actions.cc:185
+#: src/gtkui/menus.cc:182 src/qtui/menus.cc:251
 msgid "E_ffects ..."
-msgstr "E_ffets..."
+msgstr "E_ffets…"
+
+#: src/gtkui/menus.cc:184
+msgid "_Record Stream"
+msgstr "Enregistrer le flu_x"
 
-#: src/gtkui/menus.cc:227
+#: src/gtkui/menus.cc:185
+msgid "Audio _Settings ..."
+msgstr "_Paramètres du son…"
+
+#: src/gtkui/menus.cc:189 src/qtui/menus.cc:260
 msgid "Show _Menu Bar"
 msgstr "Afficher la barre de _menu"
 
-#: src/gtkui/menus.cc:228
+#: src/gtkui/menus.cc:190 src/qtui/menus.cc:262
 msgid "Show I_nfo Bar"
-msgstr "Afficher la barre d'i_nfos"
+msgstr "Afficher la barre de renseigneme_nts"
+
+#: src/gtkui/menus.cc:191 src/qtui/menus.cc:264
+msgid "Show Info Bar _Album Art"
+msgstr "Afficher l’_illustration de la barre de renseignements "
 
-#: src/gtkui/menus.cc:229
+#: src/gtkui/menus.cc:192 src/qtui/menus.cc:266
 msgid "Show Info Bar Vis_ualization"
-msgstr "Afficher la vis_ualisation « Barre d'infos »"
+msgstr "Afficher la vis_ualisation de la barre de renseignements"
 
-#: src/gtkui/menus.cc:230
+#: src/gtkui/menus.cc:193 src/qtui/menus.cc:268
 msgid "Show _Status Bar"
-msgstr "Afficher la _barre d'état"
+msgstr "Afficher la _barre d’état"
 
-#: src/gtkui/menus.cc:232
+#: src/gtkui/menus.cc:195 src/qtui/menus.cc:272
 msgid "Show _Remaining Time"
 msgstr "Afficher le temps _restant"
 
-#: src/gtkui/menus.cc:234
+#: src/gtkui/menus.cc:197 src/qtui/menus.cc:276 src/skins/menus.cc:157
+#: src/skins-qt/menus.cc:152
 msgid "_Visualizations ..."
-msgstr "_Visualisations..."
+msgstr "_Visualisations…"
 
-#: src/gtkui/menus.cc:238 src/qtui/main_window_actions.cc:189
+#: src/gtkui/menus.cc:201 src/qtui/menus.cc:280
 msgid "_File"
 msgstr "_Fichier"
 
-#: src/gtkui/menus.cc:239 src/qtui/main_window_actions.cc:190
+#: src/gtkui/menus.cc:202 src/qtui/menus.cc:281
 msgid "_Playback"
 msgstr "_Lecture"
 
-#: src/gtkui/menus.cc:240 src/qtui/main_window_actions.cc:191
+#: src/gtkui/menus.cc:203 src/qtui/menus.cc:282
 msgid "P_laylist"
-msgstr "L_iste de lecture"
+msgstr "Lis_te de lecture"
 
-#: src/gtkui/menus.cc:241 src/gtkui/menus.cc:258
-#: src/qtui/main_window_actions.cc:192
+#: src/gtkui/menus.cc:204 src/gtkui/menus.cc:222 src/qtui/menus.cc:283
+#: src/qtui/menus.cc:312
 msgid "_Services"
-msgstr "_Services"
+msgstr "Ser_vices"
 
-#: src/gtkui/menus.cc:242 src/qtui/main_window_actions.cc:193
+#: src/gtkui/menus.cc:205 src/qtui/menus.cc:284
 msgid "_Output"
 msgstr "_Sortie"
 
-#: src/gtkui/menus.cc:243
+#: src/gtkui/menus.cc:206 src/qtui/menus.cc:285
 msgid "_View"
 msgstr "_Affichage"
 
-#: src/gtkui/menus.cc:248
+#: src/gtkui/menus.cc:211 src/qtui/menus.cc:296
 msgid "_Queue/Unqueue"
-msgstr "_Ajouter / retirer de la file d'attente"
+msgstr "_Ajouter/retirer de la file d’attente"
 
-#: src/gtkui/menus.cc:250
+#: src/gtkui/menus.cc:213 src/qtui/menus.cc:299
 msgid "_Open Containing Folder"
 msgstr "_Ouvrir le dossier conteneur"
 
-#: src/gtkui/menus.cc:253
+#: src/gtkui/menus.cc:214 src/qtui/menus.cc:301
+msgid "_Refresh Selected"
+msgstr "Actualiser la _sélection"
+
+#: src/gtkui/menus.cc:216 src/qtui/menus.cc:304
 msgid "Cu_t"
 msgstr "Cou_per"
 
-#: src/gtkui/menus.cc:254
+#: src/gtkui/menus.cc:217 src/qtui/menus.cc:305
 msgid "_Copy"
 msgstr "_Copier"
 
-#: src/gtkui/menus.cc:255
+#: src/gtkui/menus.cc:218 src/qtui/menus.cc:306
 msgid "_Paste"
-msgstr "_Coller"
+msgstr "Co_ller"
 
-#: src/gtkui/menus.cc:256
+#: src/gtkui/menus.cc:219 src/qtui/menus.cc:307
+msgid "Paste at _End"
+msgstr "Coller à la _fin"
+
+#: src/gtkui/menus.cc:220 src/qtui/menus.cc:309
 msgid "Select _All"
 msgstr "Sélectionner _tout"
 
-#: src/gtkui/menus.cc:263
+#: src/gtkui/menus.cc:227 src/moonstone/playlist_tabs.cc:309
+#: src/qtui/playlist_tabs.cc:334
 msgid "_Rename ..."
 msgstr "_Renommer…"
 
-#: src/gtkui/settings.cc:35
+#: src/gtkui/settings.cc:35 src/qtui/settings.cc:59
+msgid "Always"
+msgstr "Toujours"
+
+#: src/gtkui/settings.cc:36 src/qtui/settings.cc:60
+msgid "Auto-hide"
+msgstr "Cacher automatiquement"
+
+#: src/gtkui/settings.cc:37 src/qtui/settings.cc:61
+msgid "Never"
+msgstr "Jamais"
+
+#: src/gtkui/settings.cc:41 src/qtui/settings.cc:64
 msgid "Playlist Tabs"
 msgstr "Onglets de la liste de lecture"
 
-#: src/gtkui/settings.cc:36
-msgid "Always show tabs"
-msgstr "Toujours montrer les onglets"
+#: src/gtkui/settings.cc:42 src/qtui/settings.cc:65
+msgid "Show playlist tabs:"
+msgstr "Afficher les onglets des listes de lecture :"
 
-#: src/gtkui/settings.cc:38
+#: src/gtkui/settings.cc:45 src/qtui/settings.cc:69
 msgid "Show entry counts"
-msgstr "Montrer le nombre d'entrées"
+msgstr "Afficher le nombre d’entrées"
 
-#: src/gtkui/settings.cc:40
+#: src/gtkui/settings.cc:47 src/qtui/settings.cc:72
 msgid "Show close buttons"
-msgstr "Montrer les boutons de fermeture"
+msgstr "Afficher les boutons de fermeture"
 
-#: src/gtkui/settings.cc:42
+#: src/gtkui/settings.cc:49 src/qtui/settings.cc:75
 msgid "Playlist Columns"
 msgstr "Colonnes de la liste de lecture"
 
-#: src/gtkui/settings.cc:44
+#: src/gtkui/settings.cc:51 src/qtui/settings.cc:77
 msgid "Show column headers"
-msgstr "Montrer les en-têtes des colonnes"
+msgstr "Afficher les en-têtes de colonnes"
 
-#: src/gtkui/settings.cc:46 src/modplug/plugin_main.cc:106
-#: src/skins/skins_cfg.cc:263
-msgid "Miscellaneous"
-msgstr "Divers"
+#: src/gtkui/settings.cc:53 src/qtui/settings.cc:82
+msgid "Make column headers clickable for sorting"
+msgstr "Rendre les en-têtes de colonne cliquables pour le tri"
 
-#: src/gtkui/settings.cc:47
-msgid "Arrow keys seek by:"
-msgstr "Positionnement avec les flèches :"
+#: src/gtkui/settings.cc:56
+msgid "Use symbolic icons in toolbar"
+msgstr "Utiliser des icônes symboliques dans la barre d’outils"
 
-#: src/gtkui/settings.cc:50
+#: src/gtkui/settings.cc:58 src/qtui/settings.cc:86
 msgid "Scroll on song change"
-msgstr "Déplacer vers le morceau en cours"
+msgstr "Se déplacer vers la pièce lue"
 
-#: src/gtkui/ui_gtk.cc:71
+#: src/gtkui/ui_gtk.cc:82
 msgid "GTK Interface"
 msgstr "Interface GTK"
 
-#: src/gtkui/ui_gtk.cc:222 src/skins/ui_main.cc:232
+#: src/gtkui/ui_gtk.cc:219 src/skins/main.cc:228 src/skins-qt/main.cc:231
 #, c-format
 msgid "%s - Audacious"
-msgstr "%s - Audacious"
+msgstr "%s – Audacious"
 
-#: src/gtkui/ui_gtk.cc:225 src/qtui/main_window.cc:186
+#: src/gtkui/ui_gtk.cc:221 src/moonstone/main_window.cc:184
+#: src/qtui/main_window.cc:385
 msgid "Buffering ..."
-msgstr "Mise en mémoire tampon..."
+msgstr "Mise en mémoire tampon…"
 
-#: src/gtkui/ui_gtk.cc:228 src/skins/ui_main.cc:234 src/skins/ui_main.cc:1164
+#: src/gtkui/ui_gtk.cc:224 src/pipewire/pipewire.cc:402 src/skins/main.cc:230
+#: src/skins-qt/main.cc:233
 msgid "Audacious"
 msgstr "Audacious"
 
-#: src/gtkui/ui_statusbar.cc:63 src/qtui/status_bar.cc:67
+#: src/gtkui/ui_gtk.cc:487 src/gtkui/ui_gtk.cc:518 src/gtkui/ui_gtk.cc:882
+#: src/hotkey/gui.cc:72 src/moonstone/main_window.cc:67
+#: src/moonstone/main_window.cc:145 src/moonstone/main_window.cc:146
+#: src/notify/osd.cc:85 src/qthotkey/gui.cc:67 src/qtui/main_window.cc:154
+#: src/qtui/main_window.cc:347 src/qtui/main_window.cc:348
+#: src/skins/menus.cc:109 src/skins-qt/menus.cc:100
+msgid "Play"
+msgstr "Lire"
+
+#: src/gtkui/ui_gtk.cc:487 src/moonstone/main_window.cc:151
+#: src/moonstone/main_window.cc:152 src/notify/osd.cc:82
+#: src/qtui/main_window.cc:353 src/qtui/main_window.cc:354
+#: src/skins/menus.cc:110 src/skins-qt/menus.cc:101
+msgid "Pause"
+msgstr "Mettre en pause"
+
+#: src/gtkui/ui_gtk.cc:868 src/moonstone/main_window.cc:57
+#: src/qtui/main_window.cc:145 src/skins/menus.cc:86 src/skins-qt/menus.cc:77
+msgid "Search Library"
+msgstr "Chercher dans l’audiothèque"
+
+#: src/gtkui/ui_gtk.cc:875 src/moonstone/main_window.cc:60
+#: src/qtui/main_window.cc:147
+msgid "Open Files"
+msgstr "Ouvrir des fichiers"
+
+#: src/gtkui/ui_gtk.cc:876 src/moonstone/main_window.cc:62
+#: src/qtui/main_window.cc:149
+msgid "Add Files"
+msgstr "Ajouter des fichiers"
+
+#: src/gtkui/ui_gtk.cc:881 src/moonstone/main_window.cc:65
+#: src/qtui/main_window.cc:152 src/skins/menus.cc:112 src/skins-qt/menus.cc:103
+msgid "Previous"
+msgstr "Précédent"
+
+#: src/gtkui/ui_gtk.cc:883 src/hotkey/gui.cc:74 src/moonstone/main_window.cc:69
+#: src/qthotkey/gui.cc:69 src/qtui/main_window.cc:156 src/skins/menus.cc:111
+#: src/skins-qt/menus.cc:102
+msgid "Stop"
+msgstr "Arrêter"
+
+#: src/gtkui/ui_gtk.cc:884 src/moonstone/main_window.cc:76 src/notify/osd.cc:89
+#: src/qtui/main_window.cc:163 src/skins/menus.cc:113 src/skins-qt/menus.cc:104
+msgid "Next"
+msgstr "Suivant"
+
+#: src/gtkui/ui_gtk.cc:886 src/moonstone/main_window.cc:79
+#: src/qtui/main_window.cc:166 src/qtui/menus.cc:254 src/skins/menus.cc:79
+#: src/skins-qt/menus.cc:69
+msgid "Record Stream"
+msgstr "Enregistrer le flux"
+
+#: src/gtkui/ui_gtk.cc:919 src/moonstone/main_window.cc:86
+#: src/qtui/main_window.cc:173 src/skins/menus.cc:103 src/skins-qt/menus.cc:94
+msgid "Repeat"
+msgstr "Répéter"
+
+#: src/gtkui/ui_gtk.cc:922 src/moonstone/main_window.cc:89
+#: src/qtui/main_window.cc:176 src/skins/menus.cc:104 src/skins-qt/menus.cc:95
+msgid "Shuffle"
+msgstr "Lecture aléatoire"
+
+#: src/gtkui/ui_gtk.cc:1114 src/qtui/main_window.cc:123
+msgid "Menu"
+msgstr "Menu"
+
+#: src/gtkui/ui_statusbar.cc:64 src/qtui/status_bar.cc:155
 msgid "mono"
 msgstr "mono"
 
-#: src/gtkui/ui_statusbar.cc:65 src/qtui/status_bar.cc:69
+#: src/gtkui/ui_statusbar.cc:66 src/qtui/status_bar.cc:157
 msgid "stereo"
 msgstr "stereo"
 
-#: src/gtkui/ui_statusbar.cc:67 src/qtui/status_bar.cc:71
+#: src/gtkui/ui_statusbar.cc:68 src/qtui/status_bar.cc:160
 #, c-format
 msgid "%d channel"
 msgid_plural "%d channels"
 msgstr0 "%d canal"
 msgstr1 "%d canaux"
+msgstr2 "%d canaux"
 
-#: src/gtkui/ui_statusbar.cc:81 src/qtui/status_bar.cc:85
+#: src/gtkui/ui_statusbar.cc:76 src/qtui/status_bar.cc:168
 #, c-format
-msgid "%d kbps"
-msgstr "%d kbps"
+msgid "%d kHz"
+msgstr "%d kHz"
 
-#: src/gtkui/ui_statusbar.cc:107 src/skins/ui_main_evlisteners.cc:103
+#: src/gtkui/ui_statusbar.cc:82 src/qtui/status_bar.cc:174
+#, c-format
+msgid "%d kbit/s"
+msgstr "%d kbit/s"
+
+#: src/gtkui/ui_statusbar.cc:108 src/skins/main.cc:478 src/skins-qt/main.cc:461
 msgid "Single mode."
-msgstr "Mode « Fichier unique »."
+msgstr "Mode simple."
 
-#: src/gtkui/ui_statusbar.cc:109 src/skins/ui_main_evlisteners.cc:105
+#: src/gtkui/ui_statusbar.cc:110 src/skins/main.cc:480 src/skins-qt/main.cc:463
 msgid "Playlist mode."
-msgstr "Mode « Liste de lecture »."
+msgstr "Mode liste de lecture."
 
-#: src/gtkui/ui_statusbar.cc:117 src/skins/ui_main_evlisteners.cc:111
+#: src/gtkui/ui_statusbar.cc:118 src/skins/main.cc:486 src/skins-qt/main.cc:469
 msgid "Stopping after song."
-msgstr "Arrêter après le morceau."
+msgstr "Arrêt après la pièce."
 
-#: src/hotkey/gui.cc:71
+#: src/hotkey/gui.cc:71 src/qthotkey/gui.cc:66
 msgid "Previous track"
-msgstr "Piste précédente"
+msgstr "Plage précédente"
 
-#: src/hotkey/gui.cc:72 src/notify/osd.cc:69 src/qtui/main_window.cc:69
-#: src/qtui/main_window.cc:172 src/qtui/main_window.cc:173
-#: src/skins/menus.cc:87
-msgid "Play"
-msgstr "Lire"
-
-#: src/hotkey/gui.cc:73
+#: src/hotkey/gui.cc:73 src/qthotkey/gui.cc:68
 msgid "Pause/Resume"
-msgstr "Pause/Reprise"
-
-#: src/hotkey/gui.cc:74 src/qtui/main_window.cc:70 src/skins/menus.cc:89
-msgid "Stop"
-msgstr "Arrêt"
+msgstr "Mettre en pause/Reprendre"
 
-#: src/hotkey/gui.cc:75
+#: src/hotkey/gui.cc:75 src/qthotkey/gui.cc:70
 msgid "Next track"
-msgstr "Piste suivante"
+msgstr "Plage suivante"
 
-#: src/hotkey/gui.cc:76
-msgid "Forward 5 seconds"
-msgstr "Avancer de 5 secondes"
+#: src/hotkey/gui.cc:76 src/qthotkey/gui.cc:71
+msgid "Step forward"
+msgstr "En avant"
 
-#: src/hotkey/gui.cc:77
-msgid "Rewind 5 seconds"
-msgstr "Reculer de 5 secondes"
+#: src/hotkey/gui.cc:77 src/qthotkey/gui.cc:72
+msgid "Step backward"
+msgstr "En arrière"
 
-#: src/hotkey/gui.cc:78
+#: src/hotkey/gui.cc:78 src/qthotkey/gui.cc:73
 msgid "Mute"
 msgstr "Muet"
 
-#: src/hotkey/gui.cc:79
+#: src/hotkey/gui.cc:79 src/qthotkey/gui.cc:74
 msgid "Volume up"
 msgstr "Augmenter le volume"
 
-#: src/hotkey/gui.cc:80
+#: src/hotkey/gui.cc:80 src/qthotkey/gui.cc:75
 msgid "Volume down"
 msgstr "Réduire le volume"
 
-#: src/hotkey/gui.cc:81
+#: src/hotkey/gui.cc:81 src/qthotkey/gui.cc:76
 msgid "Jump to file"
 msgstr "Sauter au fichier"
 
-#: src/hotkey/gui.cc:82
+#: src/hotkey/gui.cc:82 src/qthotkey/gui.cc:77
 msgid "Toggle player window(s)"
-msgstr "Montrer/cacher les fenêtres du lecteur"
+msgstr "Afficher/cacher les fenêtres du lecteur"
 
-#: src/hotkey/gui.cc:83
+#: src/hotkey/gui.cc:83 src/qthotkey/gui.cc:78
 msgid "Show On-Screen-Display"
-msgstr "Activer l'affichage à l'écran"
+msgstr "Activer l’affichage à l’écran"
 
-#: src/hotkey/gui.cc:84
+#: src/hotkey/gui.cc:84 src/qthotkey/gui.cc:79
 msgid "Toggle repeat"
 msgstr "Activer/désactiver la répétition"
 
-#: src/hotkey/gui.cc:85
+#: src/hotkey/gui.cc:85 src/qthotkey/gui.cc:80
 msgid "Toggle shuffle"
 msgstr "Activer/désactiver la lecture aléatoire"
 
-#: src/hotkey/gui.cc:86
+#: src/hotkey/gui.cc:86 src/qthotkey/gui.cc:81
 msgid "Toggle stop after current"
-msgstr "Activer/désactiver l'arrêt après le morceau en cours"
+msgstr "Activer/désactiver l’arrêt après la pièce en cours"
 
-#: src/hotkey/gui.cc:87
+#: src/hotkey/gui.cc:87 src/qthotkey/gui.cc:82
 msgid "Raise player window(s)"
 msgstr "Monter les fenêtres du lecteur au premier plan"
 
-#: src/hotkey/gui.cc:97
+#: src/hotkey/gui.cc:98 src/qthotkey/gui.cc:100
 msgid "(none)"
 msgstr "(aucun)"
 
-#: src/hotkey/gui.cc:234
+#: src/hotkey/gui.cc:261
 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 modifiers.\n"
 "\n"
 "Do you want to continue?"
 msgstr ""
-"Il n'est pas recommandé d'associer les boutons de la souris principale sans "
-"touche de modificateurs.\n"
+"Il n’est pas recommandé d’associer les boutons principaux de la souris sans "
+"modificateur.\n"
 "\n"
-"Souhaitez-vous poursuivre ?"
+"Souhaitez-vous poursuivre ?"
 
-#: src/hotkey/gui.cc:236
+#: src/hotkey/gui.cc:264
 msgid "Binding mouse buttons"
 msgstr "Association des boutons de la souris"
 
-#: src/hotkey/gui.cc:391
+#: src/hotkey/gui.cc:434
 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.\n"
+"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.cc:396
+#: src/hotkey/gui.cc:444 src/qthotkey/gui.cc:179
 msgid "Hotkeys:"
-msgstr "Raccourcis clavier :"
+msgstr "Raccourcis-clavier :"
 
-#: src/hotkey/gui.cc:413
+#: src/hotkey/gui.cc:457 src/qthotkey/gui.cc:181
 msgid "Action:"
-msgstr "Action : "
+msgstr "Action :"
 
-#: src/hotkey/gui.cc:420
+#: src/hotkey/gui.cc:461 src/qthotkey/gui.cc:182
 msgid "Key Binding:"
-msgstr "Association de touches :"
+msgstr "Association de touches :"
 
-#: src/hotkey/gui.cc:468
+#: src/hotkey/gui.cc:518 src/qthotkey/gui.cc:184
 msgid "_Add"
 msgstr "_Ajouter"
 
-#: src/hotkey/plugin.cc:61
+#: src/hotkey/plugin.cc:59 src/qthotkey/plugin.cc:78
 msgid "Global Hotkeys"
 msgstr "Raccourcis universels"
 
-#: src/hotkey/plugin.cc:79
+#: src/hotkey/plugin.cc:74
 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"
+"Contributors 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 ""
-"Greffon de raccourcis universels\n"
-"Pour contrôler le lecteur avec des combinaisons de touches ou avec les "
-"touches multimédia\n"
-"\n"
-"Tous droits réservés © 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n"
-"\n"
-"Les contributeurs comprennent :\n"
-"Tous droits réservés © 2006-2007 Vladimir Paskov <vlado.paskov@gmail.com>\n"
-"Tous droits réservés © 2000-2002 Ville Syrjälä <syrjala@sci.fi>,\n"
+"Greffon de raccourcis-clavier universels\n"
+"Contrôler le lecteur avec des combinaisons universelles de touches ou des "
+"touches multimédias.\n"
+"\n"
+"Tous droits réservés © 2007 à 2008 Sascha Hlusiak <contact@saschahlusiak."
+"de>\n"
+"\n"
+"Parmi les contributeurs :\n"
+"Tous droits réservés © 2006 à 2007 Vladimir Paskov <vlado.paskov@gmail.com>\n"
+"Tous droits réservés © 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/jack-ng/jack-ng.cc:49
+#: src/jack/jack-ng.cc:54
 msgid "JACK Output"
 msgstr "Sortie JACK"
 
-#: src/jack-ng/jack-ng.cc:114
+#: src/jack/jack-ng.cc:126
+msgid "Client name:"
+msgstr "Nom du client :"
+
+#: src/jack/jack-ng.cc:128
 msgid "Automatically connect to output ports"
 msgstr "Se connecter automatiquement aux ports de sortie"
 
-#: src/jack-ng/jack-ng.cc:155
+#: src/jack/jack-ng.cc:130
+msgid "Filter ports (regex, use any port if blank):"
+msgstr ""
+"Filtrer les ports (expression rationnelle, utiliser n’importe quel ports si "
+"laissé vide) :"
+
+#: src/jack/jack-ng.cc:136
+msgid "Connect to physical ports only"
+msgstr "Ne se connecter qu’aux ports physiques"
+
+#: src/jack/jack-ng.cc:139
+msgid "Upmix to"
+msgstr "Surmixer en"
+
+#: src/jack/jack-ng.cc:141
+msgid "ports if input has fewer channels"
+msgstr "ports si l’entrée a moins de canaux"
+
+#: src/jack/jack-ng.cc:143
+msgid "Ignore insufficient number of ports"
+msgstr "Ignorer un nombre insuffisant de ports"
+
+#: src/jack/jack-ng.cc:181
+msgid "No JACK output ports were found. Please check settings."
+msgstr ""
+"Aucun port de sortie JACK n’a été trouvé. Veuillez vérifier les paramètres."
+
+#: src/jack/jack-ng.cc:195
 #, c-format
 msgid "Only %d JACK output ports were found but %d are required."
 msgstr ""
 "Seulement %d ports de sortie JACK ont été trouvés mais sont %d sont exigés."
 
-#: src/jack-ng/jack-ng.cc:164
+#: src/jack/jack-ng.cc:210
 #, c-format
 msgid "Failed to connect to JACK port %s."
-msgstr "Erreur lors de la connexion au port JACK %s."
+msgstr "Échec de connexion au port JACK %s."
 
-#: src/jack-ng/jack-ng.cc:184
+#: src/jack/jack-ng.cc:230
 msgid ""
 "JACK supports only floating-point audio. You must change the output bit "
 "depth to floating-point in Audacious settings."
 msgstr ""
-"JACK ne prend en charge que l'audio à virgule flottante. Vous devez changer "
-"la profondeur de sortie binaire pour « virgule flottante » dans les "
-"paramètres d'Audacious."
+"JACK ne prend en charge que le son à virgule flottante. Vous devez changer "
+"la profondeur de sortie binaire à « virgule flottante » dans les paramètres "
+"d’Audacious."
 
-#: src/jack-ng/jack-ng.cc:197
+#: src/jack/jack-ng.cc:245
 msgid "Failed to connect to the JACK server; is it running?"
-msgstr ""
-"Échec lors de la connexion au serveur JACK ; est-il en cours d'exécution ?"
+msgstr "Échec de connexion au serveur JACK ; est-il en cours d’exécution ?"
 
-#: src/jack-ng/jack-ng.cc:273
+#: src/jack/jack-ng.cc:321
 #, c-format
 msgid ""
 "The JACK server requires a sample rate of %d Hz, but Audacious is playing at "
 "%d Hz. Please use the Sample Rate Converter effect to correct the mismatch."
 msgstr ""
-"Le serveur JACK exige un taux d'échantillonnage de %d Hz, mais Audacious lit "
-"à %d Hz. Veuillez utiliser l'effet Convertisseur de taux d’échantillonnage "
-"pour corriger cette discordance."
+"Le serveur JACK exige une fréquence d’échantillonnage de %d Hz, mais "
+"Audacious lit à %d Hz. Veuillez utiliser l’effet Convertisseur de fréquence "
+"d’échantillonnage pour corriger ce décalage."
 
-#: src/ladspa/plugin.cc:414
+#: src/ladspa/plugin.cc:416
 #, c-format
 msgid "%s Settings"
 msgstr "Réglages %s"
 
-#: src/ladspa/plugin.cc:478
+#: src/ladspa/plugin.cc:482
 msgid "Module paths:"
-msgstr "Chemins de recherche des greffons :"
+msgstr "Chemins des modules :"
 
-#: src/ladspa/plugin.cc:483
+#: src/ladspa/plugin.cc:487
 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éparer des chemins différents par : (deux-points).\n"
-"Ces chemins sont recherchés ainsi que LADSPA_PATH.\n"
-"Après avoir ajouté de nouveaux chemins, presser sur Entrée pour rechercher "
-"des nouveaux greffons."
+"Séparer les chemins différents par deux-points.\n"
+"La recherche est effectuée sur ces chemins, ainsi que sur LADSPA_PATH.\n"
+"Après avoir ajouté de nouveaux chemins, appuyer sur Entrée pour rechercher "
+"de nouveaux greffons."
 
-#: src/ladspa/plugin.cc:499
+#: src/ladspa/plugin.cc:508
 msgid "Available plugins:"
-msgstr "Greffons proposés :"
+msgstr "Greffons proposés :"
 
-#: src/ladspa/plugin.cc:512 src/modplug/plugin_main.cc:92
-#: src/modplug/plugin_main.cc:95 src/modplug/plugin_main.cc:98
-#: src/modplug/plugin_main.cc:101
+#: src/ladspa/plugin.cc:521 src/modplug/plugin_main.cc:91
+#: src/modplug/plugin_main.cc:94 src/modplug/plugin_main.cc:97
+#: src/modplug/plugin_main.cc:100
 msgid "Enable"
 msgstr "Activer"
 
-#: src/ladspa/plugin.cc:518
+#: src/ladspa/plugin.cc:527
 msgid "Enabled plugins:"
-msgstr "Greffons activés :"
+msgstr "Greffons activés :"
 
-#: src/ladspa/plugin.cc:534
+#: src/ladspa/plugin.cc:543
 msgid "Settings"
 msgstr "Paramètres"
 
-#: src/ladspa/plugin.cc:551
+#: src/ladspa/plugin.cc:560
 msgid ""
 "LADSPA Host for Audacious\n"
 "Copyright 2011 John Lindgren"
@@ -2332,7 +2449,7 @@
 msgid "LIRC Plugin"
 msgstr "Greffon LIRC"
 
-#: src/lirc/lirc.cc:381
+#: src/lirc/lirc.cc:379
 msgid ""
 "A simple plugin to control Audacious using the LIRC remote control daemon\n"
 "\n"
@@ -2347,77 +2464,139 @@
 "\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"
+"Un greffon simple pour contrôler Audacious grâce au démon de télécommande "
+"LIRC\n"
 "\n"
-"Adapté pour Audacious par :\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"
+"Fondé 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."
+"Pour plus de précisions sur LIRC, consulter http://lirc.org."
 
-#: src/lirc/lirc.cc:392
+#: src/lirc/lirc.cc:390
 msgid "Connection"
 msgstr "Connexion"
 
-#: src/lirc/lirc.cc:393
+#: src/lirc/lirc.cc:391
 msgid "Reconnect to LIRC server"
 msgstr "Se reconnecter automatiquement au serveur LIRC"
 
-#: src/lirc/lirc.cc:395
+#: src/lirc/lirc.cc:393
 msgid "Wait before reconnecting:"
-msgstr "Attendre avant de se reconnecter :"
-
-#: src/lyricwiki/lyricwiki.cc:41
-msgid "LyricWiki Plugin"
-msgstr "Greffon LyricWiki"
-
-#: src/lyricwiki/lyricwiki.cc:131 src/lyricwiki-qt/lyricwiki.cc:136
-msgid "No lyrics available"
-msgstr "Aucune parole proposée"
-
-#: src/lyricwiki/lyricwiki.cc:217 src/lyricwiki/lyricwiki.cc:226
-#: src/lyricwiki/lyricwiki.cc:243 src/lyricwiki/lyricwiki.cc:252
-#: src/lyricwiki/lyricwiki.cc:267 src/lyricwiki-qt/lyricwiki.cc:222
-#: src/lyricwiki-qt/lyricwiki.cc:231 src/lyricwiki-qt/lyricwiki.cc:248
-#: src/lyricwiki-qt/lyricwiki.cc:257 src/lyricwiki-qt/lyricwiki.cc:272
-msgid "Error"
-msgstr "Erreur"
+msgstr "Attendre avant de se reconnecter :"
 
-#: src/lyricwiki/lyricwiki.cc:218 src/lyricwiki/lyricwiki.cc:244
-#: src/lyricwiki-qt/lyricwiki.cc:223 src/lyricwiki-qt/lyricwiki.cc:249
+#: src/lyrics-common/chart_lyrics_provider.cc:93
+#: src/lyrics-common/chart_lyrics_provider.cc:150
+#: src/lyrics-common/lyrics_ovh_provider.cc:50
 #, c-format
 msgid "Unable to fetch %s"
 msgstr "Impossible de récupérer %s"
 
-#: src/lyricwiki/lyricwiki.cc:227 src/lyricwiki/lyricwiki.cc:253
-#: src/lyricwiki-qt/lyricwiki.cc:232 src/lyricwiki-qt/lyricwiki.cc:258
+#: src/lyrics-common/chart_lyrics_provider.cc:100
+#: src/lyrics-common/chart_lyrics_provider.cc:157
+#: src/lyrics-common/lyrics_ovh_provider.cc:57
 #, c-format
 msgid "Unable to parse %s"
-msgstr "Impossible d'analyser %s"
+msgstr "Impossible d’analyser %s"
 
-#: src/lyricwiki/lyricwiki.cc:259 src/lyricwiki-qt/lyricwiki.cc:264
+#: src/lyrics-common/chart_lyrics_provider.cc:121
+#: src/lyrics-common/chart_lyrics_provider.cc:194
+#: src/lyrics-common/lyrics_ovh_provider.cc:88
 msgid "Looking for lyrics ..."
-msgstr "Recherche de paroles …"
+msgstr "Recherche de paroles…"
+
+#: src/lyrics-common/preferences.h:43
+msgid "Nowhere"
+msgstr "Nulle part"
+
+#: src/lyrics-common/preferences.h:49
+msgid "Artist is truncated at the start, Title -- at the end"
+msgstr "Artiste est tronqué au début, Titre -- à la fin"
+
+#: src/lyrics-common/preferences.h:50
+msgid "Chars to truncate on:"
+msgstr "Caractères sur lesquels tronquer :"
+
+#: src/lyrics-common/preferences.h:54
+msgid "Chars are ORed in RegExp, surrounded by whitespace"
+msgstr ""
+"Caractères avec OR dans une expression rationnelle, entourés par des "
+"espaces"
+
+#: src/lyrics-common/preferences.h:55
+msgid "Chars to split on:"
+msgstr "Caractères sur lesquels scinder :"
+
+#: src/lyrics-common/preferences.h:56
+msgid "Further truncate those on chars"
+msgstr "Continuer à les tronquer sur ces caractères"
+
+#: src/lyrics-common/preferences.h:62
+msgid "General"
+msgstr "Général"
+
+#: src/lyrics-common/preferences.h:63
+msgid "Split title into artist and title on chars"
+msgstr "Scinder le titre en artiste et titre sur ces caractères"
+
+#: src/lyrics-common/preferences.h:66
+msgid "Sources"
+msgstr "Sources"
+
+#: src/lyrics-common/preferences.h:67
+msgid "Use embedded lyrics (from Lyrics tag)"
+msgstr "Utiliser des paroles intégrées (de la balise Lyrics)"
+
+#: src/lyrics-common/preferences.h:69
+msgid "Fetch lyrics from internet:"
+msgstr "Obtenir les paroles sur Internet :"
 
-#: src/lyricwiki/lyricwiki.cc:267 src/lyricwiki-qt/lyricwiki.cc:272
-msgid "Missing song metadata"
-msgstr "Métadonnées de morceau manquantes"
+#: src/lyrics-common/preferences.h:72
+msgid "Store fetched lyrics in local cache"
+msgstr "Enregistrer dans le cache local les paroles obtenues"
 
-#: src/lyricwiki/lyricwiki.cc:278 src/lyricwiki-qt/lyricwiki.cc:283
-msgid "Connecting to lyrics.wikia.com ..."
-msgstr "Connexion à lyrics.wikia.com …"
+#: src/lyrics-common/preferences.h:74
+msgid "Local Storage"
+msgstr "Mémoire locale"
 
-#: src/lyricwiki-qt/lyricwiki.cc:55
-msgid "LyricWiki Plugin (Qt)"
-msgstr "Greffon LyricWiki (Qt)"
+#: src/lyrics-common/preferences.h:75
+msgid "Load lyric files (.lrc) from local storage"
+msgstr "Charger les fichiers de parole (.lrc) de la mémoire locale"
 
-#: src/m3u/m3u.cc:32
+#: src/lyrics-common/utils.cc:54 src/ui-common/dialogs-qt.cc:63
+msgid "Error"
+msgstr "Erreur"
+
+#: src/lyrics-common/utils.cc:60
+msgid "Lyrics could not be found."
+msgstr "Les paroles sont introuvables."
+
+#: src/lyrics-common/utils.cc:142
+msgid "Missing title and/or artist."
+msgstr "Titre ou artiste manquant"
+
+#: src/lyrics-gtk/lyrics-gtk.cc:37 src/lyrics-qt/lyrics-qt.cc:50
+msgid "Lyrics"
+msgstr "Paroles"
+
+#: src/lyrics-gtk/lyrics-gtk.cc:189 src/lyrics-qt/lyrics-qt.cc:171
+msgid "Edit Lyrics ..."
+msgstr "Modifier les paroles…"
+
+#: src/lyrics-gtk/lyrics-gtk.cc:195 src/lyrics-qt/lyrics-qt.cc:178
+msgid "Save Locally"
+msgstr "Enregistrer localement"
+
+#: src/lyrics-gtk/lyrics-gtk.cc:201 src/lyrics-qt/lyrics-qt.cc:186
+msgid "Refresh"
+msgstr "Actualiser"
+
+#: src/m3u/m3u.cc:33
 msgid "M3U Playlists"
 msgstr "Listes de lecture M3U"
 
@@ -2425,17 +2604,17 @@
 msgid "Tact Generator"
 msgstr "Métronome"
 
-#: src/metronom/metronom.cc:147
+#: src/metronom/metronom.cc:145
 #, c-format
 msgid "Tact generator: %d bpm"
-msgstr "Métronome : %d bpm"
+msgstr "Métronome : %d bpm"
 
-#: src/metronom/metronom.cc:149
+#: src/metronom/metronom.cc:147
 #, c-format
 msgid "Tact generator: %d bpm %d/%d"
-msgstr "Métronome : %d bpm %d/%d"
+msgstr "Métronome : %d bpm %d/%d"
 
-#: src/metronom/metronom.cc:237
+#: src/metronom/metronom.cc:235
 msgid ""
 "A Tact Generator by Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
 "\n"
@@ -2445,29 +2624,29 @@
 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"
+"Pour l’utiliser, ajoutez une URL : 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 par minute en mesures 3/4"
 
-#: src/mixer/mixer.cc:38
+#: src/mixer/mixer.cc:43
 msgid "Channel Mixer"
 msgstr "Mélangeur de canaux"
 
-#: src/mixer/mixer.cc:202
+#: src/mixer/mixer.cc:255
 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"
-"Tous droits réservés © 2011-2012 John Lindgren et Michał Lipski"
+"Tous droits réservés © 2011 à 2012 John Lindgren et Michał Lipski"
 
-#: src/mixer/mixer.cc:206
+#: src/mixer/mixer.cc:259
 msgid "Channel Mixer"
 msgstr "Mélangeur de canaux"
 
-#: src/mixer/mixer.cc:207
+#: src/mixer/mixer.cc:260
 msgid "Output channels:"
-msgstr "Canaux de sortie :"
+msgstr "Canaux de sortie :"
 
 #: src/mms/mms.cc:35
 msgid "MMS Plugin"
@@ -2477,168 +2656,176 @@
 msgid "Error connecting to MMS server"
 msgstr "Erreur lors de la connexion au serveur MMS"
 
-#: src/modplug/modplugbmp.h:53
+#: src/modplug/modplugbmp.h:57
 msgid "ModPlug (Module Player)"
-msgstr "ModPlug (Lecteur de module)"
-
-#: src/modplug/plugin_main.cc:53
-msgid "Resolution"
-msgstr "Résolution"
-
-#: src/modplug/plugin_main.cc:54
-msgid "8-bit"
-msgstr "8-bits"
+msgstr "ModPlug (Lecteur de modules)"
 
 #: src/modplug/plugin_main.cc:55
-msgid "16-bit"
-msgstr "16-bits"
-
-#: src/modplug/plugin_main.cc:56
 msgid "Channels"
 msgstr "Canaux"
 
-#: src/modplug/plugin_main.cc:60
+#: src/modplug/plugin_main.cc:59
 msgid "Nearest (fastest)"
 msgstr "Le plus proche (le plus rapide)"
 
-#: src/modplug/plugin_main.cc:61
+#: src/modplug/plugin_main.cc:60
 msgid "Linear (fast)"
 msgstr "Linéaire (rapide)"
 
-#: src/modplug/plugin_main.cc:62
+#: src/modplug/plugin_main.cc:61
 msgid "Spline (good)"
 msgstr "Interpolation par segments (bon)"
 
-#: src/modplug/plugin_main.cc:63
+#: src/modplug/plugin_main.cc:62
 msgid "Polyphase (best)"
 msgstr "Polyphasé (le meilleur) "
 
-#: src/modplug/plugin_main.cc:64
+#: src/modplug/plugin_main.cc:63
 msgid "Sample rate"
-msgstr "Taux de l'échantillon"
+msgstr "Fréquence d’échantillonnage"
 
-#: src/modplug/plugin_main.cc:65
+#: src/modplug/plugin_main.cc:64
 msgid "22 kHz"
 msgstr "22 kHz"
 
-#: src/modplug/plugin_main.cc:66
+#: src/modplug/plugin_main.cc:65
 msgid "44 kHz"
 msgstr "44 kHz"
 
-#: src/modplug/plugin_main.cc:67
+#: src/modplug/plugin_main.cc:66
 msgid "48 kHz"
 msgstr "48 kHz"
 
-#: src/modplug/plugin_main.cc:68
+#: src/modplug/plugin_main.cc:67
 msgid "96 kHz"
 msgstr "96 kHz"
 
-#: src/modplug/plugin_main.cc:72 src/modplug/plugin_main.cc:77
-#: src/modplug/plugin_main.cc:82
+#: src/modplug/plugin_main.cc:71 src/modplug/plugin_main.cc:76
+#: src/modplug/plugin_main.cc:81
 msgid "Level:"
-msgstr " Niveau :"
+msgstr " Niveau :"
 
-#: src/modplug/plugin_main.cc:78
+#: src/modplug/plugin_main.cc:77
 msgid "Cutoff:"
-msgstr "Coupure :"
+msgstr "Coupure :"
 
-#: src/modplug/plugin_main.cc:91
+#: src/modplug/plugin_main.cc:90
 msgid "Reverb"
 msgstr "Réverbération"
 
-#: src/modplug/plugin_main.cc:94
+#: src/modplug/plugin_main.cc:93
 msgid "Bass Boost"
 msgstr "Amplificateur de basses"
 
-#: src/modplug/plugin_main.cc:97
+#: src/modplug/plugin_main.cc:96
 msgid "Surround"
 msgstr "Ambiophonique "
 
-#: src/modplug/plugin_main.cc:100
+#: src/modplug/plugin_main.cc:99
 msgid "Preamp"
 msgstr "Préampli"
 
-#: src/modplug/plugin_main.cc:107
+#: src/modplug/plugin_main.cc:106
 msgid "Oversample"
 msgstr "Suréchantillonnage"
 
-#: src/modplug/plugin_main.cc:108
+#: src/modplug/plugin_main.cc:107
 msgid "Noise reduction"
 msgstr "Réduction du bruit"
 
-#: src/modplug/plugin_main.cc:109
+#: src/modplug/plugin_main.cc:108
 msgid "Play Amiga MODs"
-msgstr "Jouer les MODs Amiga"
+msgstr "Lire les MODs Amiga"
 
-#: src/modplug/plugin_main.cc:110
+#: src/modplug/plugin_main.cc:109
 msgid "Repeat"
 msgstr "Répéter"
 
-#: src/modplug/plugin_main.cc:111
+#: src/modplug/plugin_main.cc:110
 msgid "Repeat count:"
-msgstr "Comptage des répétitions :"
+msgstr "Comptage des répétitions :"
 
-#: src/modplug/plugin_main.cc:112
+#: src/modplug/plugin_main.cc:111
 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."
+msgstr "Pour répéter à l’infini, définir le comptage des répétions à -1."
 
-#: src/modplug/plugin_main.cc:125 src/sid/xs_config.cc:106
+#: src/modplug/plugin_main.cc:124 src/sid/xs_config.cc:106
 msgid "These settings will take effect when Audacious is restarted."
-msgstr "Ces paramètres prendront effet lorsque Audacious sera redémarré."
+msgstr "Ces paramètres prendront effet quand Audacious aura redémarré."
+
+#: src/moonstone/main_window.cc:72 src/moonstone/main_window.cc:73
+#: src/qtui/main_window.cc:159 src/qtui/main_window.cc:160
+#: src/skins/menus.cc:107 src/skins-qt/menus.cc:98
+msgid "Stop After This Song"
+msgstr "Arrêter après cette pièce"
+
+#: src/moonstone/moonstone.cc:39
+msgid "Moonstone"
+msgstr "Moonstone"
+
+#: src/moonstone/playlist_header.cc:212 src/qtui/playlist_header.cc:258
+msgid "Reset to Defaults"
+msgstr "Réinitialiser aux valeurs par défaut"
+
+#: src/moonstone/playlist_model.cc:38 src/qtui/playlist_header.cc:232
+msgid "Now Playing"
+msgstr "Lecture en cours"
+
+#: src/moonstone/playlist_selection.cc:66
+#: src/playlist-manager/playlist-manager.cc:201
+#: src/playlist-manager-qt/playlist-manager-qt.cc:190
+msgid "Entries"
+msgstr "Entrées"
 
 #: src/mpg123/mpg123.cc:54
 msgid "MPG123 Plugin"
 msgstr "Greffon MPG123"
 
-#: src/mpg123/mpg123.cc:83
-msgid "Advanced"
-msgstr "Avancé"
-
-#: src/mpg123/mpg123.cc:84
+#: src/mpg123/mpg123.cc:82
 msgid "Use accurate length calculation (slow)"
 msgstr "Utiliser un calcul précis de durée (lent)"
 
-#: src/mpg123/mpg123.cc:248
+#: src/mpg123/mpg123.cc:260
 msgid "Surround"
 msgstr "Son ambiophonique"
 
-#: src/mpris2/plugin.cc:39
+#: src/mpris2/plugin.cc:40
 msgid "MPRIS 2 Server"
 msgstr "Serveur MPRIS 2"
 
-#: src/neon/neon.cc:97
+#: src/neon/neon.cc:102
 msgid "Neon HTTP/HTTPS Plugin"
 msgstr "Greffon HTTP/HTTPS neon"
 
-#: src/neon/neon.cc:521
+#: src/neon/neon.cc:526
 msgid "Error parsing redirect"
-msgstr "Erreur lors de l'analyse de la redirection"
+msgstr "Erreur lors de l’analyse de la redirection"
 
-#: src/neon/neon.cc:535
+#: src/neon/neon.cc:540
 msgid "Unknown HTTP error"
 msgstr "Erreur HTTP inconnue"
 
-#: src/neon/neon.cc:569
+#: src/neon/neon.cc:614
 msgid "Error parsing URL"
-msgstr "Erreur lors de l'analyse de l'URL"
+msgstr "Erreur lors de l’analyse de l’URL"
 
-#: src/neon/neon.cc:632
+#: src/neon/neon.cc:687
 msgid "Too many redirects"
 msgstr "Trop de redirections"
 
-#: src/notify/event.cc:64
+#: src/notify/event.cc:97
 msgid "Stopped"
 msgstr "Arrêté"
 
-#: src/notify/event.cc:64
+#: src/notify/event.cc:97
 msgid "Audacious is not playing."
 msgstr "Audacious est inactif."
 
-#: src/notify/notify.cc:42
+#: src/notify/notify.cc:39
 msgid "Desktop Notifications"
 msgstr "Notifications du bureau"
 
-#: src/notify/notify.cc:60
+#: src/notify/notify.cc:57
 msgid ""
 "Desktop Notifications Plugin for Audacious\n"
 "Copyright (C) 2010 Maximilian Bogner\n"
@@ -2657,83 +2844,127 @@
 "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"
+"Greffon de notifications de bureau pour Audacious\n"
 "Tous droits réservés © 2010 Maximilian Bogner\n"
-"Tous droits réservés © 2011-2013 John Lindgren et Jean-Alexandre Anglès "
-"d'Auriac\n"
+"Tous droits réservés © 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 (à ta discrétion).\n"
+"Ce greffon est un logiciel libre; vous pouvez le redistribuer ou le modifier "
+"selon les termes de la licence publique générale GNU telle que 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 "
+"Ce greffon est distribué en espérant qu’il sera 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"
+"COMMERCIALISATION ou d’ADAPTATION DANS UN BUT SPÉCIFIQUE. Consultez 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."
+"Vous devriez avoir reçu une copie de la licence publique générale GNU en "
+"même temps que ce programme. Sinon, voir <http://www.gnu.org/licenses/>."
 
-#: src/notify/notify.cc:110
+#: src/notify/notify.cc:104
 msgid "Show playback controls"
-msgstr "Permettre le contrôle d'Audacious depuis les notifications."
+msgstr "Permettre le contrôle d’Audacious depuis les notifications."
 
-#: src/notify/notify.cc:112
+#: src/notify/notify.cc:106
 msgid "Always show notification"
 msgstr "Rendre les notifications persistantes."
 
-#: src/notify/notify.cc:114
+#: src/notify/notify.cc:108
 msgid "Include album name in notification"
-msgstr "Inclure le nom de l'album dans la notification"
+msgstr "Inclure le nom de l’album dans la notification"
 
-#: src/notify/osd.cc:58
+#: src/notify/notify.cc:110
+msgid "Custom notification duration:"
+msgstr "Durée des notifications personnalisées :"
+
+#: src/notify/osd.cc:74
 msgid "Show"
 msgstr "Afficher"
 
-#: src/notify/osd.cc:66 src/qtui/main_window.cc:178
-#: src/qtui/main_window.cc:179 src/skins/menus.cc:88
-msgid "Pause"
-msgstr "Pause"
+#: src/openmpt/mpt.cc:50
+msgid "OpenMPT (Module Player)"
+msgstr "OpenMPT (Lecteur de modules)"
 
-#: src/notify/osd.cc:73 src/qtui/main_window.cc:72 src/skins/menus.cc:91
-msgid "Next"
-msgstr "Suivant"
+#: src/openmpt/mpt.cc:132
+msgid ""
+"Module player based on libopenmpt\n"
+"\n"
+"Written by: Chris Spiegel <cspiegel@gmail.com>"
+msgstr ""
+"Lecteur de modules fondés sur libopenmpt\n"
+"\n"
+"Développé par : Chris Spiegel <cspiegel@gmail.com>"
+
+#: src/openmpt/mpt.cc:151
+msgid "Stereo separation:"
+msgstr "Séparation stéréo :"
+
+#: src/openmpt/mpt.cc:153
+msgid "% (0=mono, 100=default, 200=full)"
+msgstr "% (0=mono, 100=valeur par défaut, 200=plein)"
+
+#: src/openmpt/mpt.cc:157
+msgid "Interpolation:"
+msgstr "Interpolation :"
+
+#: src/openmpt/mptwrap.h:51 src/soxr/sox-resampler.cc:189 src/xsf/plugin.cc:437
+msgid "Linear"
+msgstr "Linéaire"
+
+#: src/openmpt/mptwrap.h:52
+msgid "Cubic"
+msgstr "Cubique"
 
-#: src/oss4/oss.h:93
+#: src/openmpt/mptwrap.h:53
+msgid "Windowed sinc"
+msgstr "Sinus cardinal fenêtrée"
+
+#: src/opus/opus.cc:39
+msgid "Opus Decoder"
+msgstr "Décodeur Opus"
+
+#: src/opus/opus.cc:336
+msgid ""
+"Opus Decoder Plugin for Audacious\n"
+"Copyright 2022 Thomas Lange"
+msgstr ""
+"Greffon de décodage Opus pour Audacious\n"
+"Tous droits réservés © 2022 Thomas Lange"
+
+#: src/oss4/oss.h:70
 msgid "OSS4 Output"
 msgstr "Sortie OSS4"
 
-#: src/oss4/oss.h:95
+#: src/oss4/oss.h:72
 msgid "OSS3 Output"
 msgstr "Sortie OSS3"
 
 #: src/oss4/plugin.cc:35
 msgid "Default device"
-msgstr "Dispositif par défaut"
+msgstr "Périphérique par défaut"
 
-#: src/oss4/plugin.cc:77
+#: src/oss4/plugin.cc:78
 msgid "Audio device:"
-msgstr "Périphérique audio :"
+msgstr "Périphérique audio :"
 
-#: src/oss4/plugin.cc:80
+#: src/oss4/plugin.cc:81
 msgid "Use alternate device:"
-msgstr "Utiliser un autre périphérique :"
+msgstr "Utiliser un autre périphérique :"
 
-#: src/oss4/plugin.cc:84
+#: src/oss4/plugin.cc:85
 msgid "Save volume between sessions."
-msgstr "Conserver le volume d'une session à l'autre"
+msgstr "Conserver le volume d’une session à l’autre."
 
-#: src/oss4/plugin.cc:86
+#: src/oss4/plugin.cc:87
 msgid "Enable format conversions made by the OSS software."
 msgstr "Activer les conversions de format du logiciel OSS."
 
-#: src/oss4/plugin.cc:88
+#: src/oss4/plugin.cc:89
 msgid "Enable exclusive mode to prevent virtual mixing."
 msgstr "Activer le mode exclusif pour empêcher le mixage virtuel."
 
-#: src/oss4/plugin.cc:100
+#: src/oss4/plugin.cc:101
 msgid ""
 "OSS4 Output Plugin for Audacious\n"
 "Copyright 2010-2012 Michał Lipski\n"
@@ -2742,25 +2973,46 @@
 "Lindgren and of course the authors of the previous OSS plugin."
 msgstr ""
 "Greffon de sortie OSS4 pour Audacious\n"
-"Tous droits réservés © 2010-2012 Michał Lipski\n"
+"Tous droits réservés © 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/playlist-manager/playlist-manager.cc:37
+#: src/pipewire/pipewire.cc:44
+msgid "PipeWire Output"
+msgstr "Sortie PipeWire"
+
+#: src/pipewire/pipewire.cc:118
+msgid ""
+"PipeWire Output Plugin for Audacious\n"
+"Copyright 2022 Thomas Lange\n"
+"\n"
+"Based on the PipeWire Output Plugin for Qmmp\n"
+"Copyright 2021 Ilya Kotov"
+msgstr ""
+"Greffon de sortie PipeWire pour Audacious\n"
+"Tous droits réservés © 2022 Thomas Lange\n"
+"\n"
+"Fondé sur le greffon de sortie PipeWire pour Qmmp\n"
+"Tous droits réservés © Ilya Kotov"
+
+#: src/pipewire/pipewire.cc:408 src/skins/menus.cc:88 src/skins-qt/menus.cc:79
+msgid "Playback"
+msgstr "Lecture"
+
+#: src/playlist-manager/playlist-manager.cc:38
+#: src/playlist-manager-qt/playlist-manager-qt.cc:42
 msgid "Playlist Manager"
 msgstr "Gestionnaire de listes de lecture"
 
-#: src/playlist-manager/playlist-manager.cc:226
-msgid "Entries"
-msgstr "Entrées"
-
-#: src/playlist-manager/playlist-manager.cc:245
+#: src/playlist-manager/playlist-manager.cc:221
+#: src/playlist-manager-qt/playlist-manager-qt.cc:356
 msgid "_Remove"
-msgstr "_Enlever"
+msgstr "_Supprimer"
 
-#: src/playlist-manager/playlist-manager.cc:246
+#: src/playlist-manager/playlist-manager.cc:222
+#: src/playlist-manager-qt/playlist-manager-qt.cc:351
 msgid "Ren_ame"
 msgstr "Ren_ommer"
 
@@ -2768,54 +3020,69 @@
 msgid "PLS Playlists"
 msgstr "Listes de lecture PLS"
 
-#: src/psf/plugin.cc:45
+#: src/psf/plugin.cc:53
 msgid "OpenPSF PSF1/PSF2 Decoder"
 msgstr "Décodeur OpenPSF PSF1/PSF2"
 
-#: src/pulse_audio/pulse_audio.cc:38
+#: src/psf/plugin.cc:270
+msgid "OpenPSF Configuration"
+msgstr "Configuration d’OpenPSF"
+
+#: src/psf/plugin.cc:271 src/xsf/plugin.cc:444
+msgid "Ignore length from file"
+msgstr "Ignorer la durée donnée par le fichier"
+
+#: src/pulse/pulse_audio.cc:42
 msgid "PulseAudio Output"
 msgstr "Sortie PulseAudio"
 
-#: src/pulse_audio/pulse_audio.cc:611
+#: src/pulse/pulse_audio.cc:84
+msgid "Context name:"
+msgstr "Nom du contexte :"
+
+#: src/pulse/pulse_audio.cc:86
+msgid "Stream name:"
+msgstr "Nom du flux :"
+
+#: src/pulse/pulse_audio.cc:596
 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 ""
-"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"
+"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"
-"Ce programme est distribué car potentiellement utile, mais SANS AUCUNE "
+"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 ""
+"Greffon de sortie PulseAudio d’Audacious\n"
+"\n"
+"Ce programme est un logiciel libre ; vous pouvez le redistribuer ou le "
+"modifier selon les termes de la licence publique générale GNU telle que "
+"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é en espérant qu’il sera utile, mais SANS AUCUNE "
 "GARANTIE, ni explicite ni implicite, y compris les garanties de "
-"COMMERCIALISATION ou d'ADÉQUATION À UN BUT SPÉCIFIQUE. \n"
-"Reportez-vous à la Licence Publique Générale GNU pour plus de détails.\n"
+"COMMERCIALISATION ou d’ADAPTATION DANS UN BUT SPÉCIFIQUE. Consultez 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."
+"Vous devriez avoir reçu une copie de la licence publique générale GNU en "
+"même temps que ce programme ; sinon, écrivez à Free Software Foundation, "
+"Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
 
-#: src/qtaudio/qtaudio.cc:49
+#: src/qtaudio/qtaudio.cc:53
 msgid "QtMultimedia Output"
 msgstr "Sortie QtMultimédia"
 
-#: src/qtaudio/qtaudio.cc:77
+#: src/qtaudio/qtaudio.cc:84
 msgid ""
 "QtMultimedia Audio Output Plugin for Audacious\n"
 "Copyright 2014 William Pitcock\n"
@@ -2823,67 +3090,128 @@
 "Based on SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
 msgstr ""
-"Sortie Audio QtMultimédia pour Audacious\n"
+"Sortie son QtMultimédia pour Audacious\n"
 "Tous droits réservés © 2014 Willian Pitcock\n"
 "\n"
-"Basé sur le greffon de sortie SDL pour Audacious\n"
+"Fondé sur le greffon de sortie SDL pour Audacious\n"
 "Tous droits réservés © 2010 John Lindgren"
 
-#: src/qtui/dialog_windows.cc:31
-msgid "Working ..."
-msgstr "Je travaille..."
+#: src/qtglspectrum/gl-spectrum.cc:41
+msgid ""
+"OpenGL Spectrum Analyzer for Audacious\n"
+"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
+"Copyright 2014, 2020 Ariadne Conill\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 OpenGL pour Audacious\n"
+"Tous droits réservés © 2013 Christophe Budé, John Lindgren et Carlo Bramini\n"
+"\n"
+"Fondé sur le greffon XMMS :\n"
+"Tous droits réservés © 1998 à 2000 Peter Alm, Mikael Alm, Olle Hallnas, "
+"Thomas Nilsson, et 4Front Technologies\n"
+"\n"
+"Licence : GPLv2+"
 
-#: src/qtui/filter_input.cc:44 src/skins/ui_playlist.cc:221
-msgid "Search"
-msgstr "Rechercher"
+#: src/qthotkey/gui.cc:177
+msgid "Press a key combination inside a text field."
+msgstr ""
+"Appuyez sur une combinaison de touches à l’intérieur d’un champ textuel."
+
+#: src/qthotkey/plugin.cc:105
+msgid ""
+"Global Hotkey Plugin\n"
+"Control the player with global key combinations or multimedia keys.\n"
+"\n"
+"Copyright (C) 2020 i.Dark_Templar <darktemplar@dark-templar-archives.net>\n"
+"Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n"
+"\n"
+"Contributors 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 ""
+"Greffon de raccourcis-clavier universels\n"
+"Contrôler le lecteur avec des combinaisons universelles de touches ou des "
+"touches multimédias.\n"
+"\n"
+"Tous droits réservés © 2020 i.Dark_Templar <darktemplar@dark-templar-"
+"archives.net>\n"
+"Tous droits réservés © 2007 à 2008 Sascha Hlusiak <contact@saschahlusiak."
+"de>\n"
+"\n"
+"Parmi les contributeurs :\n"
+"Tous droits réservés © 2006 à 2007 Vladimir Paskov <vlado.paskov@gmail.com>\n"
+"Tous droits réservés © 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/qtui/main_window_actions.cc:94
+#: src/qtui/menus.cc:109
 msgid "_Open Folder ..."
-msgstr "_Ouvrir un dossier..."
+msgstr "_Ouvrir un dossier…"
 
-#: src/qtui/main_window_actions.cc:96
+#: src/qtui/menus.cc:115
 msgid "_Add Folder ..."
-msgstr "_Ajouter un dossier..."
+msgstr "_Ajouter un dossier…"
 
-#: src/qtui/main_window_actions.cc:101
+#: src/qtui/menus.cc:128
 msgid "_Log Inspector ..."
-msgstr "_Inspecteur de journaux..."
+msgstr "_Inspecteur de journaux…"
 
-#: src/qtui/main_window.cc:64
-msgid "Open Files"
-msgstr "Fichiers ouverts"
+#: src/qtui/menus.cc:220
+msgid "_Find ..."
+msgstr "_Trouver…"
 
-#: src/qtui/main_window.cc:66
-msgid "Add Files"
-msgstr "Ajouter des fichiers"
+#: src/qtui/menus.cc:256 src/skins/menus.cc:80 src/skins-qt/menus.cc:70
+msgid "Audio Settings ..."
+msgstr "Paramètres du son…"
 
-#: src/qtui/main_window.cc:71 src/skins/menus.cc:90
-msgid "Previous"
-msgstr "Précédent"
+#: src/qtui/playlist_model.cc:188
+msgid "Q#"
+msgstr "Nfile"
 
-#: src/qtui/main_window.cc:77 src/skins/menus.cc:82
-msgid "Repeat"
-msgstr "Répéter"
+#: src/qtui/playlist_model.cc:190
+msgid "T#"
+msgstr "Nplage"
 
-#: src/qtui/main_window.cc:79 src/skins/menus.cc:83
-msgid "Shuffle"
-msgstr "Lecture aléatoire"
+#: src/qtui/playlist_model.cc:192
+msgid "C#"
+msgstr "Ncat"
+
+#: src/qtui/playlist_model.cc:194
+msgid "D#"
+msgstr "Ndisq"
 
-#: src/qtui/qtui.cc:42
+#: src/qtui/qtui.cc:40
 msgid "Qt Interface"
 msgstr "Interface Qt"
 
+#: src/qtui/search_bar.cc:46
+msgid "Search playlist"
+msgstr "Chercher dans la liste de lecture"
+
+#: src/qtui/settings.cc:79
+msgid "Use bold font for column headers"
+msgstr "Utiliser une police grasse pour les en-têtes de colonne"
+
 #: src/resample/resample.cc:43
 msgid "Sample Rate Converter"
-msgstr "Convertisseur de taux d’échantillonnage"
+msgstr "Convertisseur de fréquence d’échantillonnage"
 
 #: src/resample/resample.cc:183
 msgid ""
 "Sample Rate Converter Plugin for Audacious\n"
 "Copyright 2010-2012 John Lindgren"
 msgstr ""
-"Greffon de convertisseur de taux d’échantillonnage pour Audacious\n"
-"Tous droits réservés © 2010-2012 John Lindgren"
+"Greffon de convertisseur de fréquence d’échantillonnage pour Audacious\n"
+"Tous droits réservés © 2010 à 2012 John Lindgren"
 
 #: src/resample/resample.cc:187
 msgid "Skip/repeat samples"
@@ -2911,161 +3239,137 @@
 
 #: src/resample/resample.cc:196
 msgid "Method:"
-msgstr "Méthode :"
+msgstr "Méthode :"
 
-#: src/resample/resample.cc:199 src/sox-resampler/sox-resampler.cc:161
+#: src/resample/resample.cc:199 src/soxr/sox-resampler.cc:203
 msgid "Rate:"
-msgstr "Taux :"
+msgstr "Fréquence :"
 
 #: src/resample/resample.cc:202
 msgid "Rate Mappings"
-msgstr "Mappage de taux"
+msgstr "Mappages des fréquences"
 
 #: src/resample/resample.cc:203
 msgid "Use rate mappings"
-msgstr "Utiliser les mappages de taux"
+msgstr "Utiliser les mappages des fréquences"
 
 #: src/resample/resample.cc:205
 msgid "8 kHz:"
-msgstr "8 kHz :"
+msgstr "8 kHz :"
 
 #: src/resample/resample.cc:209
 msgid "16 kHz:"
-msgstr "16 kHz :"
+msgstr "16 kHz :"
 
 #: src/resample/resample.cc:213
 msgid "22.05 kHz:"
-msgstr "22,05 kHz :"
+msgstr "22,05 kHz :"
 
 #: src/resample/resample.cc:217
 msgid "32.0 kHz:"
-msgstr "32,0 kHz :"
+msgstr "32,0 kHz :"
 
 #: src/resample/resample.cc:221
 msgid "44.1 kHz:"
-msgstr "44.1 kHz :"
+msgstr "44.1 kHz :"
 
 #: src/resample/resample.cc:225
 msgid "48 kHz:"
-msgstr "48 kHz :"
+msgstr "48 kHz :"
 
 #: src/resample/resample.cc:229
 msgid "88.2 kHz:"
-msgstr "88,2 kHz :"
+msgstr "88,2 kHz :"
 
 #: src/resample/resample.cc:233
 msgid "96 kHz:"
-msgstr "96 kHz :"
+msgstr "96 kHz :"
 
 #: src/resample/resample.cc:237
 msgid "176.4 kHz:"
-msgstr "176,4 kHz :"
+msgstr "176,4 kHz :"
 
 #: src/resample/resample.cc:241
 msgid "192 kHz:"
-msgstr "192 kHz :"
-
-#: src/scrobbler2/config_window.cc:41
-#, c-format
-msgid "OK. Scrobbling for user: %s"
-msgstr "OK. Scrobble pour l'utilisateur : %s"
+msgstr "192 kHz :"
 
-#: src/scrobbler2/config_window.cc:54
-msgid "Permission Denied"
-msgstr "Permission refusée."
+#: src/scrobbler2/config_window.cc:29
+msgid "Checking Last.fm access ..."
+msgstr "Vérification de l’accès à Last.fm…"
 
-#: src/scrobbler2/config_window.cc:56
-msgid "Access the following link to allow Audacious to scrobble your plays:"
+#: src/scrobbler2/config_window.cc:35
+msgid ""
+"Your scrobbles are being saved on your computer temporarily. They will be "
+"submitted as soon as Audacious is allowed access."
 msgstr ""
-"Accéder au lien suivant pour permettre à Audacious de scrobbler vos "
-"lectures :"
+"Vos scrobbles sont enregistrés temporairement sur votre ordinateur. Ils "
+"seront transmis dès qu’Audacious sera autorisé à accéder au service."
 
-#: src/scrobbler2/config_window.cc:66
-msgid "Keep this window open and click 'Check Permission' again.\n"
-msgstr ""
-"Garder cette fenêtre ouverte et cliquer sur « Vérifier les permissions » de "
-"nouveau.\n"
+#: src/scrobbler2/config_window.cc:41
+#, c-format
+msgid "Permission granted. Scrobbling for user %s."
+msgstr "Permission accordée. Scrobblage pour l’utilisateur %s."
 
-#: src/scrobbler2/config_window.cc:69 src/scrobbler2/config_window.cc:80
+#: src/scrobbler2/config_window.cc:44
 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."
+"Permission denied. Open the following URL in a browser, allow Audacious "
+"access to your account, and then click 'Check Permission' again:"
 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/scrobbler2/config_window.cc:77
-msgid "Network Problem."
-msgstr "Problème de réseau."
-
-#: src/scrobbler2/config_window.cc:78
-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 plus tard."
+"La permission a été refusée. Ouvrez l’URL suivante dans un navigateur, "
+"autorisez l’accès à votre compte à Audacious, puis cliquez de nouveau sur "
+"« Vérifier la permission » :"
 
-#: src/scrobbler2/config_window.cc:110
-msgid "Checking..."
-msgstr "Vérification..."
+#: src/scrobbler2/config_window.cc:53
+msgid "There was a problem contacting Last.fm."
+msgstr "Contacter Last.fm a posé un problème."
 
-#: src/scrobbler2/config_window.cc:176
-msgid "C_heck Permission"
-msgstr "Véri_fier les permissions"
+#: src/scrobbler2/config_window.cc:92
+msgid "Check Permission"
+msgstr "Vérifier la permission"
 
-#: src/scrobbler2/config_window.cc:177
-msgid "_Revoke Permission"
-msgstr "_Révoquer les permissions"
+#: src/scrobbler2/config_window.cc:93
+msgid "Revoke Permission"
+msgstr "Révoquer la permission"
 
-#: src/scrobbler2/config_window.cc:220
-msgid ""
-"You need to allow Audacious to scrobble tracks to your Last.fm account.\n"
+#: src/scrobbler2/config_window.cc:97
+msgid "You need to allow Audacious to scrobble tracks to your Last.fm account."
 msgstr ""
-"Vous devez autoriser Audacious à scrobbler vos pistes vers votre compte Last."
-"fm.\n"
+"Vous devez autoriser Audacious à scrobbler des plages vers votre compte Last."
+"fm."
 
 #: src/scrobbler2/scrobbler.cc:29
 msgid "Scrobbler 2.0"
 msgstr "Scrobbler 2.0"
 
-#: src/scrobbler2/scrobbler.cc:224
+#: src/scrobbler2/scrobbler.cc:200
 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"
+"Le greffon scrobbler n’a pu être démarré.\n"
 "Il y a peut-être un problème avec votre installation."
 
-#: src/scrobbler2/scrobbler.cc:289
+#: src/scrobbler2/scrobbler.cc:245
 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"
+"project."
 msgstr ""
-"Greffon Scrobbler 2.0 pour Audacious par Pitxyoki,\n"
-"\n"
-"Tous droits réservés © 2012-2013 Luís M. Picciochi Oliveira <Pitxyoki@Gmail."
-"com>\n"
+"Greffon Scrobbler 2.0 pour Audacious par Pitxyoki,\n"
 "\n"
-"Remerciements à John Lindgren pour m'avoir donné un coup de main au début de "
-"ce projet.\n"
+"Tous droits réservés © 2012 à 2013 Luís M. Picciochi Oliveira "
+"<Pitxyoki@Gmail.com>\n"
 "\n"
+"Remerciements à John Lindgren pour m’avoir aidé au début de ce projet."
 
-#: src/scrobbler2/scrobbler_communication.cc:642
-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/sdlout.cc:48
+#: src/sdlout/sdlout.cc:43
 msgid "SDL Output"
 msgstr "Sortie SDL"
 
-#: src/sdlout/sdlout.cc:77
+#: src/sdlout/sdlout.cc:72
 msgid ""
 "SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
@@ -3073,82 +3377,94 @@
 "Greffon de sortie SDL pour Audacious\n"
 "Tous droits réservés © 2010 John Lindgren"
 
-#: src/search-tool/search-tool.cc:116 src/search-tool/search-tool.cc:124
+#: src/search-tool/library.cc:35 src/search-tool/library.cc:46
+#: src/search-tool-qt/library.cc:35 src/search-tool-qt/library.cc:46
 msgid "Library"
 msgstr "Audiothèque"
 
-#: src/search-tool/search-tool.cc:394
-#, c-format
-msgid "%d result"
-msgid_plural "%d results"
-msgstr0 "%d résultat"
-msgstr1 "%d résultats"
-
-#: src/search-tool/search-tool.cc:400
-#, c-format
-msgid "(%d hidden)"
-msgid_plural "(%d hidden)"
-msgstr0 "(%d caché)"
-msgstr1 "(%d cachés)"
-
-#: src/search-tool/search-tool.cc:594
+#: src/search-tool-qt/search-model.cc:44 src/search-tool/search-tool.cc:287
 #, c-format
 msgid "%d song"
 msgid_plural "%d songs"
-msgstr0 "%d morceau"
-msgstr1 "%d morceaux"
+msgstr0 "%d pièce"
+msgstr1 "%d pièces"
+msgstr2 "%d pièces"
 
-#: src/search-tool/search-tool.cc:601
+#: src/search-tool-qt/search-model.cc:53 src/search-tool/search-tool.cc:294
 msgid "of this genre"
 msgstr "de ce genre"
 
-#: src/search-tool/search-tool.cc:607
+#: src/search-tool-qt/search-model.h:47 src/search-tool/search-model.h:45
 msgid "on"
 msgstr "sur"
 
-#: src/search-tool/search-tool.cc:607
+#: src/search-tool-qt/search-model.h:47 src/search-tool/search-model.h:45
 msgid "by"
 msgstr "par"
 
-#: src/search-tool/search-tool.cc:643
-msgid "_Create Playlist"
-msgstr "_Créer une liste de lecture"
-
-#: src/search-tool/search-tool.cc:645
-msgid "_Add to Playlist"
-msgstr "_Ajouter à la liste de lecture"
-
-#: src/search-tool/search-tool.cc:684
-msgid "Search library"
-msgstr "Rechercher dans l'audiothèque"
+#: src/search-tool-qt/search-tool-qt.cc:165 src/search-tool/search-tool.cc:74
+msgid "Number of results to show:"
+msgstr "Nombre de résultats à afficher :"
+
+#: src/search-tool-qt/search-tool-qt.cc:168 src/search-tool/search-tool.cc:77
+msgid "Rescan library at startup"
+msgstr "Réanalyser l’audiothèque au démarrage"
+
+#: src/search-tool-qt/search-tool-qt.cc:170
+msgid "Monitor library for changes"
+msgstr "Surveiller les changements dans l’audiothèque"
 
-#: src/search-tool/search-tool.cc:688
+#: src/search-tool-qt/search-tool-qt.cc:193 src/search-tool/search-tool.cc:450
 msgid ""
 "To import your music library into Audacious, choose a folder and then click "
 "the \"refresh\" icon."
 msgstr ""
 "Pour importer votre audiothèque dans Audacious, choisissez un dossier et "
-"cliquez ensuite sur l'icône de rafraîchissement."
+"cliquez ensuite sur l’icône d’actualisation."
 
-#: src/search-tool/search-tool.cc:696
+#: src/search-tool-qt/search-tool-qt.cc:195 src/search-tool/search-tool.cc:459
 msgid "Please wait ..."
 msgstr "Veuillez patienter…"
 
-#: src/search-tool/search-tool.cc:723
+#: src/search-tool-qt/search-tool-qt.cc:197 src/search-tool/search-tool.cc:487
 msgid "Choose Folder"
 msgstr "Choisir un dossier"
 
+#: src/search-tool-qt/search-tool-qt.cc:201 src/search-tool/search-tool.cc:445
+msgid "Search library"
+msgstr "Chercher dans l’audiothèque"
+
+#: src/search-tool-qt/search-tool-qt.cc:327 src/search-tool/search-tool.cc:156
+#, c-format
+msgid "%d of %d result shown"
+msgid_plural "%d of %d results shown"
+msgstr0 "%d résultat affiché sur %d"
+msgstr1 "%d résultats affichés sur %d"
+msgstr2 "%d résultats affichés sur %d"
+
+#: src/search-tool-qt/search-tool-qt.cc:331 src/search-tool/search-tool.cc:160
+#, c-format
+msgid "%d result"
+msgid_plural "%d results"
+msgstr0 "%d résultat"
+msgstr1 "%d résultats"
+msgstr2 "%d résultats"
+
+#: src/search-tool-qt/search-tool-qt.cc:501 src/search-tool/search-tool.cc:341
+msgid "_Create Playlist"
+msgstr "_Créer une liste de lecture"
+
+#: src/search-tool-qt/search-tool-qt.cc:503 src/search-tool/search-tool.cc:343
+msgid "_Add to Playlist"
+msgstr "_Ajouter à la liste de lecture"
+
 #: src/sid/xmms-sid.cc:43
 msgid "SID Player"
 msgstr "Lecteur SID"
 
-#: src/sid/xs_config.cc:61
-msgid "Output"
-msgstr "Sortie"
-
 #: src/sid/xs_config.cc:62
 msgid "Channels:"
-msgstr "Canaux :"
+msgstr "Canaux :"
 
 #: src/sid/xs_config.cc:68
 msgid "Emulation"
@@ -3156,7 +3472,7 @@
 
 #: src/sid/xs_config.cc:69
 msgid "Emulate MOS 8580 (default: MOS 6581)"
-msgstr "Émuler MOS 8580 (par défaut : MOS 6581)"
+msgstr "Émuler MOS 8580 (par défaut : MOS 6581)"
 
 #: src/sid/xs_config.cc:71
 msgid "Do not automatically select chip model"
@@ -3168,11 +3484,11 @@
 
 #: src/sid/xs_config.cc:75
 msgid "Clock speed:"
-msgstr "Vitesse d'horloge : "
+msgstr "Vitesse d’horloge :"
 
 #: src/sid/xs_config.cc:78
 msgid "Do not automatically select clock speed"
-msgstr "Ne pas choisir automatiquement la vitesse d'horloge"
+msgstr "Ne pas choisir automatiquement la vitesse d’horloge"
 
 #: src/sid/xs_config.cc:80
 msgid "Playback time"
@@ -3180,27 +3496,27 @@
 
 #: src/sid/xs_config.cc:81
 msgid "Set maximum playback time:"
-msgstr "Définir une durée maximale de lecture :"
+msgstr "Définir une durée maximale de lecture :"
 
 #: src/sid/xs_config.cc:87
 msgid "Use only when song length is unknown"
-msgstr "À n'utiliser que si la longueur du morceau est inconnue"
+msgstr "À n’utiliser que si la longueur de la pièce est inconnue"
 
 #: src/sid/xs_config.cc:90
 msgid "Set minimum playback time:"
-msgstr "Définir une durée minimum de lecture :"
+msgstr "Définir une durée minimum de lecture :"
 
 #: src/sid/xs_config.cc:96
 msgid "Subtunes"
-msgstr "Sous-morceaux"
+msgstr "Sous-pièces"
 
 #: src/sid/xs_config.cc:97
 msgid "Enable subtunes"
-msgstr "Activer les sous-morceaux"
+msgstr "Activer les sous-pièces"
 
 #: src/sid/xs_config.cc:99
 msgid "Ignore subtunes shorter than:"
-msgstr "Ignorer les sous-morceaux plus courts que :"
+msgstr "Ignorer les sous-pièces inférieurs à :"
 
 #: src/sid/xs_config.cc:105
 msgid "Note"
@@ -3224,745 +3540,689 @@
 
 #: src/silence-removal/silence-removal.cc:68
 msgid "Threshold:"
-msgstr "Seuil :"
+msgstr "Seuil :"
 
-#: src/silence-removal/silence-removal.cc:70
-msgid "dB"
-msgstr "dB"
+#: src/skins/actions.cc:45 src/skins-qt/actions.cc:43
+msgid "Repeat points cleared."
+msgstr "Les points de répétition ont été supprimés."
 
-#: src/skins/menus.cc:64
-msgid "Open Files ..."
-msgstr "Ouvrir les fichiers..."
+#: src/skins/actions.cc:60 src/skins-qt/actions.cc:58
+msgid "Repeat point A set."
+msgstr "Point de répétition A activé."
 
-#: src/skins/menus.cc:65
-msgid "Open URL ..."
-msgstr "Ouvrir l'URL..."
+#: src/skins/actions.cc:65 src/skins-qt/actions.cc:63
+msgid "Repeat point B set."
+msgstr "Point de répétition B activé."
 
-#: src/skins/menus.cc:66
-msgid "Search Library"
-msgstr "Rechercher dans l'audiothèque"
+#: src/skins/equalizer.cc:223 src/skins-qt/equalizer.cc:223
+msgid "Preamp"
+msgstr "Préampli"
 
-#: src/skins/menus.cc:68
-msgid "Playback"
-msgstr "Lecture"
+#: src/skins/equalizer.cc:227 src/skins-qt/equalizer.cc:227
+msgid "31 Hz"
+msgstr "31 Hz"
 
-#: src/skins/menus.cc:69
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "63 Hz"
+msgstr "63 Hz"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "125 Hz"
+msgstr "125 Hz"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "250 Hz"
+msgstr "250 Hz"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "500 Hz"
+msgstr "500 Hz"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "1 kHz"
+msgstr "1 kHz"
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "2 kHz"
+msgstr "2 kHz"
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "4 kHz"
+msgstr "4 kHz"
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "8 kHz"
+msgstr "8 kHz"
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "16 kHz"
+msgstr "16 kHz"
+
+#: src/skins/equalizer.cc:270 src/skins-qt/equalizer.cc:270
+msgid "Audacious Equalizer"
+msgstr "Égaliseur d’Audacious"
+
+#: src/skins/main.cc:459 src/skins-qt/main.cc:442
+msgid "Recording on"
+msgstr "Enregistrement activé"
+
+#: src/skins/main.cc:461 src/skins-qt/main.cc:444
+msgid "Recording off"
+msgstr "Enregistrement désactivé"
+
+#: src/skins/main.cc:754 src/skins-qt/main.cc:701
+#, c-format
+msgid "Seek to %d:%-2.2d / %d:%-2.2d"
+msgstr "Se positionner à %d:%-2.2d/%d:%-2.2d"
+
+#: src/skins/main.cc:771 src/skins-qt/main.cc:718
+#, c-format
+msgid "Volume: %d%%"
+msgstr "Volume : %d%%"
+
+#: src/skins/main.cc:784 src/skins-qt/main.cc:731
+#, c-format
+msgid "Balance: %d%% left"
+msgstr "Balance : %d%% gauche"
+
+#: src/skins/main.cc:786 src/skins-qt/main.cc:733
+msgid "Balance: center"
+msgstr "Balance : centre"
+
+#: src/skins/main.cc:788 src/skins-qt/main.cc:735
+#, c-format
+msgid "Balance: %d%% right"
+msgstr "Balance : %d%% droite"
+
+#: src/skins/main.cc:880 src/skins-qt/main.cc:827
+msgid "Options Menu"
+msgstr "Menu des options"
+
+#: src/skins/main.cc:884 src/skins-qt/main.cc:831
+msgid "Disable 'Always On Top'"
+msgstr "Désactiver « Toujours au premier plan »"
+
+#: src/skins/main.cc:886 src/skins-qt/main.cc:833
+msgid "Enable 'Always On Top'"
+msgstr "Activer « Toujours au premier plan »"
+
+#: src/skins/main.cc:889 src/skins-qt/main.cc:836
+msgid "File Info Box"
+msgstr "Boîte de renseignements sur le fichier"
+
+#: src/skins/main.cc:892 src/skins/menus.cc:149 src/skins-qt/main.cc:839
+#: src/skins-qt/menus.cc:142
+msgid "Double Size"
+msgstr "Taille double"
+
+#: src/skins/main.cc:895 src/skins-qt/main.cc:842
+msgid "Visualizations"
+msgstr "Visualisations"
+
+#: src/skins/menus.cc:74 src/skins-qt/menus.cc:64
+msgid "Volume Up"
+msgstr "Augmenter le volume"
+
+#: src/skins/menus.cc:75 src/skins-qt/menus.cc:65
+msgid "Volume Down"
+msgstr "Réduire le volume"
+
+#: src/skins/menus.cc:77 src/skins-qt/menus.cc:67
+msgid "Effects ..."
+msgstr "Effets…"
+
+#: src/skins/menus.cc:84 src/skins-qt/menus.cc:74
+msgid "Open Files ..."
+msgstr "Ouvrir les fichiers…"
+
+#: src/skins/menus.cc:85 src/skins-qt/menus.cc:76
+msgid "Open URL ..."
+msgstr "Ouvrir une URL…"
+
+#: src/skins/menus.cc:89 src/skins-qt/menus.cc:80
 msgid "Playlist"
 msgstr "Liste de lecture"
 
-#: src/skins/menus.cc:70
+#: src/skins/menus.cc:90 src/skins-qt/menus.cc:81
+msgid "Output"
+msgstr "Sortie"
+
+#: src/skins/menus.cc:91 src/skins-qt/menus.cc:82
 msgid "View"
 msgstr "Affichage"
 
-#: src/skins/menus.cc:72 src/skins/menus.cc:136 src/skins/menus.cc:149
-#: src/skins/menus.cc:214
+#: src/skins/menus.cc:93 src/skins/menus.cc:161 src/skins/menus.cc:174
+#: src/skins/menus.cc:245 src/skins-qt/menus.cc:84 src/skins-qt/menus.cc:156
+#: src/skins-qt/menus.cc:170 src/skins-qt/menus.cc:241
 msgid "Services"
 msgstr "Services"
 
-#: src/skins/menus.cc:74
+#: src/skins/menus.cc:95 src/skins-qt/menus.cc:86
 msgid "About ..."
-msgstr "À propos..."
+msgstr "À propos…"
 
-#: src/skins/menus.cc:75
+#: src/skins/menus.cc:96 src/skins-qt/menus.cc:87
 msgid "Settings ..."
-msgstr "Paramètres..."
+msgstr "Paramètres…"
 
-#: src/skins/menus.cc:76
+#: src/skins/menus.cc:97 src/skins-qt/menus.cc:88
 msgid "Quit"
 msgstr "Quitter"
 
-#: src/skins/menus.cc:80 src/skins/menus.cc:206
+#: src/skins/menus.cc:101 src/skins/menus.cc:235 src/skins-qt/menus.cc:92
+#: src/skins-qt/menus.cc:231
 msgid "Song Info ..."
-msgstr "Infos sur le morceau..."
+msgstr "Renseignements sur la pièce…"
+
+#: src/skins/menus.cc:105 src/skins-qt/menus.cc:96
+msgid "Shuffle by Album"
+msgstr "Lecture aléatoire par album"
 
-#: src/skins/menus.cc:84
+#: src/skins/menus.cc:106 src/skins-qt/menus.cc:97
 msgid "No Playlist Advance"
 msgstr "Ne pas avancer dans la liste de lecture"
 
-#: src/skins/menus.cc:85
-msgid "Stop After This Song"
-msgstr "Arrêter après ce morceau"
-
-#: src/skins/menus.cc:93
+#: src/skins/menus.cc:117 src/skins-qt/menus.cc:108
 msgid "Set A-B Repeat"
-msgstr "Définir une répétition A-B"
+msgstr "Définir une répétition A à B"
 
-#: src/skins/menus.cc:94
+#: src/skins/menus.cc:118 src/skins-qt/menus.cc:109
 msgid "Clear A-B Repeat"
-msgstr "Effacer la répétition A-B"
+msgstr "Supprimer la répétition A à B"
 
-#: src/skins/menus.cc:96
+#: src/skins/menus.cc:120 src/skins-qt/menus.cc:111
 msgid "Jump to Song ..."
-msgstr "Sauter au morceau..."
+msgstr "Sauter vers une plage…"
 
-#: src/skins/menus.cc:97
+#: src/skins/menus.cc:121 src/skins-qt/menus.cc:113
 msgid "Jump to Time ..."
 msgstr "Sauter à la positon (temps)…"
 
-#: src/skins/menus.cc:101
+#: src/skins/menus.cc:125 src/skins-qt/menus.cc:118
 msgid "Play/Resume"
 msgstr "Lire/Reprendre"
 
-#: src/skins/menus.cc:103
+#: src/skins/menus.cc:127 src/skins-qt/menus.cc:120
 msgid "New Playlist"
 msgstr "Nouvelle liste de lecture"
 
-#: src/skins/menus.cc:104
+#: src/skins/menus.cc:128 src/skins-qt/menus.cc:121
 msgid "Rename Playlist ..."
-msgstr "Renommer la liste de lecture..."
+msgstr "Renommer la liste de lecture…"
 
-#: src/skins/menus.cc:105
+#: src/skins/menus.cc:129 src/skins-qt/menus.cc:122
 msgid "Remove Playlist"
-msgstr "Enlever la liste de lecture"
+msgstr "Supprimer la liste de lecture"
 
-#: src/skins/menus.cc:107
+#: src/skins/menus.cc:131 src/skins-qt/menus.cc:124
 msgid "Previous Playlist"
 msgstr "Liste de lecture précédente"
 
-#: src/skins/menus.cc:108
+#: src/skins/menus.cc:132 src/skins-qt/menus.cc:125
 msgid "Next Playlist"
 msgstr "Liste de lecture suivante"
 
-#: src/skins/menus.cc:110
+#: src/skins/menus.cc:134 src/skins-qt/menus.cc:127
 msgid "Import Playlist ..."
-msgstr "Importer la piste de lecture..."
+msgstr "Importer une plage de lecture…"
 
-#: src/skins/menus.cc:111
+#: src/skins/menus.cc:135 src/skins-qt/menus.cc:128
 msgid "Export Playlist ..."
-msgstr "Exporter la liste de lecture..."
+msgstr "Exporter la liste de lecture…"
 
-#: src/skins/menus.cc:113
+#: src/skins/menus.cc:137 src/skins-qt/menus.cc:130
 msgid "Playlist Manager ..."
-msgstr "Gestionnaire de listes de lecture..."
+msgstr "Gestionnaire de listes de lecture…"
 
-#: src/skins/menus.cc:114
+#: src/skins/menus.cc:138 src/skins-qt/menus.cc:131
 msgid "Queue Manager ..."
-msgstr "Gestionnaire de file d'attente..."
+msgstr "Gestionnaire de la file d’attente…"
 
-#: src/skins/menus.cc:116
+#: src/skins/menus.cc:140 src/skins-qt/menus.cc:133
 msgid "Refresh Playlist"
-msgstr "Rafraîchir la liste de lecture"
+msgstr "Actualiser la liste de lecture"
 
-#: src/skins/menus.cc:120
+#: src/skins/menus.cc:144 src/skins-qt/menus.cc:137
 msgid "Show Playlist Editor"
-msgstr "Montrer l'éditeur de liste de lecture"
+msgstr "Afficher l’éditeur de liste de lecture"
 
-#: src/skins/menus.cc:121
+#: src/skins/menus.cc:145 src/skins-qt/menus.cc:138
 msgid "Show Equalizer"
-msgstr "Montrer l'égaliseur"
+msgstr "Afficher l’égaliseur"
 
-#: src/skins/menus.cc:123
+#: src/skins/menus.cc:147 src/skins-qt/menus.cc:140
 msgid "Show Remaining Time"
 msgstr "Afficher le temps restant"
 
-#: src/skins/menus.cc:125
+#: src/skins/menus.cc:150 src/skins-qt/menus.cc:143
 msgid "Always on Top"
 msgstr "Toujours au premier plan"
 
-#: src/skins/menus.cc:126
+#: src/skins/menus.cc:151 src/skins-qt/menus.cc:145
 msgid "On All Workspaces"
 msgstr "Sur tous les espaces de travail"
 
-#: src/skins/menus.cc:128
+#: src/skins/menus.cc:153 src/skins-qt/menus.cc:148
 msgid "Roll Up Player"
 msgstr "Enrouler le lecteur"
 
-#: src/skins/menus.cc:129
+#: src/skins/menus.cc:154 src/skins-qt/menus.cc:149
 msgid "Roll Up Playlist Editor"
-msgstr "Enrouler l'éditeur de listes de lecture"
+msgstr "Enrouler l’éditeur de listes de lecture"
 
-#: src/skins/menus.cc:130
+#: src/skins/menus.cc:155 src/skins-qt/menus.cc:150
 msgid "Roll Up Equalizer"
-msgstr "Enrouler l'égaliseur"
-
-#: src/skins/menus.cc:132 src/skins/ui_main.cc:854
-msgid "Double Size"
-msgstr "Taille double"
+msgstr "Enrouler l’égaliseur"
 
-#: src/skins/menus.cc:138
+#: src/skins/menus.cc:163 src/skins-qt/menus.cc:158
 msgid "Add URL ..."
-msgstr "Ajouter une URL..."
+msgstr "Ajouter une URL…"
 
-#: src/skins/menus.cc:139
+#: src/skins/menus.cc:164 src/skins-qt/menus.cc:160
 msgid "Add Files ..."
-msgstr "Ajouter des fichiers..."
+msgstr "Ajouter des fichiers…"
 
-#: src/skins/menus.cc:143 src/skins/menus.cc:171 src/skins/menus.cc:185
+#: src/skins/menus.cc:168 src/skins/menus.cc:196 src/skins/menus.cc:212
+#: src/skins-qt/menus.cc:164 src/skins-qt/menus.cc:192
+#: src/skins-qt/menus.cc:208
 msgid "By Title"
 msgstr "Par titre"
 
-#: src/skins/menus.cc:144 src/skins/menus.cc:178 src/skins/menus.cc:192
+#: src/skins/menus.cc:169 src/skins/menus.cc:203 src/skins/menus.cc:219
+#: src/skins-qt/menus.cc:165 src/skins-qt/menus.cc:199
+#: src/skins-qt/menus.cc:215
 msgid "By File Name"
 msgstr "Par nom de fichier"
 
-#: src/skins/menus.cc:145 src/skins/menus.cc:179 src/skins/menus.cc:193
+#: src/skins/menus.cc:170 src/skins/menus.cc:204 src/skins/menus.cc:220
+#: src/skins-qt/menus.cc:166 src/skins-qt/menus.cc:200
+#: src/skins-qt/menus.cc:216
 msgid "By File Path"
 msgstr "Par chemin de fichier"
 
-#: src/skins/menus.cc:151
+#: src/skins/menus.cc:176 src/skins-qt/menus.cc:172
 msgid "Remove All"
-msgstr "Tout enlever"
+msgstr "Tout supprimer"
 
-#: src/skins/menus.cc:152
+#: src/skins/menus.cc:177 src/skins-qt/menus.cc:173
 msgid "Clear Queue"
-msgstr "Vider la file d'attente"
+msgstr "Vider la file d’attente"
 
-#: src/skins/menus.cc:154
+#: src/skins/menus.cc:179 src/skins-qt/menus.cc:175
 msgid "Remove Unavailable Files"
-msgstr "Effacer les fichiers absents"
+msgstr "Retirer les fichiers manquants"
 
-#: src/skins/menus.cc:155
+#: src/skins/menus.cc:180 src/skins-qt/menus.cc:176
 msgid "Remove Duplicates"
-msgstr "Enlever les doublons"
+msgstr "Supprimer les doublons"
 
-#: src/skins/menus.cc:157
+#: src/skins/menus.cc:182 src/skins-qt/menus.cc:178
 msgid "Remove Unselected"
 msgstr "Ne garder que la sélection"
 
-#: src/skins/menus.cc:158
+#: src/skins/menus.cc:183 src/skins-qt/menus.cc:179
 msgid "Remove Selected"
-msgstr "Enlever la sélection"
+msgstr "Supprimer la sélection"
 
-#: src/skins/menus.cc:162
+#: src/skins/menus.cc:187 src/skins-qt/menus.cc:183
 msgid "Search and Select"
 msgstr "Chercher et sélectionner"
 
-#: src/skins/menus.cc:164
+#: src/skins/menus.cc:189 src/skins-qt/menus.cc:185
 msgid "Invert Selection"
 msgstr "Inverser la sélection"
 
-#: src/skins/menus.cc:165
+#: src/skins/menus.cc:190 src/skins-qt/menus.cc:186
 msgid "Select None"
 msgstr "Ne rien sélectionner"
 
-#: src/skins/menus.cc:166
+#: src/skins/menus.cc:191 src/skins-qt/menus.cc:187
 msgid "Select All"
 msgstr "Tout sélectionner"
 
-#: src/skins/menus.cc:170 src/skins/menus.cc:184
+#: src/skins/menus.cc:195 src/skins/menus.cc:211 src/skins-qt/menus.cc:191
+#: src/skins-qt/menus.cc:207
 msgid "By Track Number"
-msgstr "Par numéro de piste"
+msgstr "Par numéro de plage"
 
-#: src/skins/menus.cc:172 src/skins/menus.cc:186
+#: src/skins/menus.cc:197 src/skins/menus.cc:213 src/skins-qt/menus.cc:193
+#: src/skins-qt/menus.cc:209
 msgid "By Artist"
 msgstr "Par artiste"
 
-#: src/skins/menus.cc:173 src/skins/menus.cc:187
+#: src/skins/menus.cc:198 src/skins/menus.cc:214 src/skins-qt/menus.cc:194
+#: src/skins-qt/menus.cc:210
 msgid "By Album"
 msgstr "Par album"
 
-#: src/skins/menus.cc:174 src/skins/menus.cc:188
+#: src/skins/menus.cc:199 src/skins/menus.cc:215 src/skins-qt/menus.cc:195
+#: src/skins-qt/menus.cc:211
 msgid "By Album Artist"
-msgstr "Par artiste de l'album"
+msgstr "Par artiste de l’album"
 
-#: src/skins/menus.cc:175 src/skins/menus.cc:190
+#: src/skins/menus.cc:200 src/skins/menus.cc:216 src/skins-qt/menus.cc:196
+#: src/skins-qt/menus.cc:212
 msgid "By Release Date"
 msgstr "Par date de parution"
 
-#: src/skins/menus.cc:176 src/skins/menus.cc:189
+#: src/skins/menus.cc:201 src/skins/menus.cc:217 src/skins-qt/menus.cc:197
+#: src/skins-qt/menus.cc:213
 msgid "By Genre"
 msgstr "Par Genre"
 
-#: src/skins/menus.cc:177 src/skins/menus.cc:191
+#: src/skins/menus.cc:202 src/skins/menus.cc:218 src/skins-qt/menus.cc:198
+#: src/skins-qt/menus.cc:214
 msgid "By Length"
 msgstr "Par durée"
 
-#: src/skins/menus.cc:180 src/skins/menus.cc:194
+#: src/skins/menus.cc:205 src/skins/menus.cc:221 src/skins-qt/menus.cc:201
+#: src/skins-qt/menus.cc:217
 msgid "By Custom Title"
 msgstr "Par titre personnalisé"
 
-#: src/skins/menus.cc:198
+#: src/skins/menus.cc:206 src/skins/menus.cc:222 src/skins-qt/menus.cc:202
+#: src/skins-qt/menus.cc:218
+msgid "By Comment"
+msgstr "Par commentaire"
+
+#: src/skins/menus.cc:207 src/skins/menus.cc:223 src/skins-qt/menus.cc:203
+#: src/skins-qt/menus.cc:219
+msgid "By Disc Number"
+msgstr "Par numéro de disque"
+
+#: src/skins/menus.cc:227 src/skins-qt/menus.cc:223
 msgid "Randomize List"
-msgstr "Mélange aléatoirement la liste"
+msgstr "Mélange aléatoire de la liste"
 
-#: src/skins/menus.cc:199
+#: src/skins/menus.cc:228 src/skins-qt/menus.cc:224
 msgid "Reverse List"
 msgstr "Inverser la liste"
 
-#: src/skins/menus.cc:201
+#: src/skins/menus.cc:230 src/skins-qt/menus.cc:226
 msgid "Sort Selected"
 msgstr "Trier la sélection"
 
-#: src/skins/menus.cc:202
+#: src/skins/menus.cc:231 src/skins-qt/menus.cc:227
 msgid "Sort List"
 msgstr "Trier la liste"
 
-#: src/skins/menus.cc:208
+#: src/skins/menus.cc:236 src/skins-qt/menus.cc:232
+msgid "Open Containing Folder"
+msgstr "Ouvrir le dossier conteneur"
+
+#: src/skins/menus.cc:238 src/skins-qt/menus.cc:234
 msgid "Cut"
 msgstr "Couper"
 
-#: src/skins/menus.cc:209
+#: src/skins/menus.cc:239 src/skins-qt/menus.cc:235
 msgid "Copy"
 msgstr "Copier"
 
-#: src/skins/menus.cc:210
+#: src/skins/menus.cc:240 src/skins-qt/menus.cc:236
 msgid "Paste"
 msgstr "Coller"
 
-#: src/skins/menus.cc:212
-msgid "Queue/Unqueue"
-msgstr "Mettre/enlever de la file d'attente"
-
-#: src/skins/menus.cc:218
-msgid "Load Preset ..."
-msgstr "Charger un préréglage..."
+#: src/skins/menus.cc:241 src/skins-qt/menus.cc:237
+msgid "Paste at End"
+msgstr "Coller à la fin"
 
-#: src/skins/menus.cc:219
-msgid "Load Auto Preset ..."
-msgstr "Charger un préréglage automatique..."
+#: src/skins/menus.cc:243 src/skins-qt/menus.cc:239
+msgid "Queue/Unqueue"
+msgstr "Ajouter/retirer de la file d’attente"
 
-#: src/skins/menus.cc:220
-msgid "Load Default"
-msgstr "Charger la valeur par défaut"
+#: src/skins/playlist-widget.cc:58 src/skins-qt/playlist-widget.cc:58
+#, c-format
+msgid "%s (%d of %d)"
+msgstr "%s (%d sur %d)"
 
-#: src/skins/menus.cc:221
-msgid "Load Preset File ..."
-msgstr "Charger un fichier de préréglage..."
+#: src/skins/playlistwin.cc:491 src/skins-qt/playlistwin.cc:478
+msgid "Audacious Playlist Editor"
+msgstr "Éditeur de liste de lecture d’Audacious"
 
-#: src/skins/menus.cc:222
-msgid "Load EQF File ..."
-msgstr "Charger un fichier EQF..."
+#: src/skins/plugin.cc:53 src/skins-qt/plugin.cc:65
+msgid "Winamp Classic Interface"
+msgstr "Interface Winamp Classic"
 
-#: src/skins/menus.cc:224
-msgid "Save Preset ..."
-msgstr "Enregistrer le préréglage..."
+#: src/skins-qt/menus.cc:75
+msgid "Open Folder ..."
+msgstr "Ouvrir un dossier…"
+
+#: src/skins-qt/menus.cc:159
+msgid "Add Folder ..."
+msgstr "Ajouter un dossier…"
 
-#: src/skins/menus.cc:225
-msgid "Save Auto Preset ..."
-msgstr "Enregistrer le préréglage automatique..."
+#: src/skins-qt/search-select.cc:62 src/skins/search-select.cc:77
+msgid "Search entries in active playlist"
+msgstr "Chercher des entrées dans la liste de lecture active"
 
-#: src/skins/menus.cc:226
-msgid "Save Default"
-msgstr "Enregistrer la valeur par défaut"
+#: src/skins-qt/search-select.cc:70 src/skins/search-select.cc:83
+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 ""
+"Choisir des entrées de la liste de lecture en remplissant un oou plusieurs "
+"champs. \n"
+"La syntaxe utilisée est celle des expressions rationnelles et est sensible à "
+"la casse. \n"
+"Si vous ne savez pas comment fonctionnent les expressions rationnelles, vous "
+"pouvez simplement indiquer une expression littérale de ce que vous cherchez."
 
-#: src/skins/menus.cc:227
-msgid "Save Preset File ..."
-msgstr "Enregistrer le fichier de préréglage..."
+#: src/skins-qt/search-select.cc:75 src/skins/search-select.cc:91
+msgid "Title:"
+msgstr "Titre :"
 
-#: src/skins/menus.cc:228
-msgid "Save EQF File ..."
-msgstr "Enregistrer le fichier EQF..."
+#: src/skins-qt/search-select.cc:79 src/skins/search-select.cc:96
+msgid "Album:"
+msgstr "Album :"
 
-#: src/skins/menus.cc:230
-msgid "Delete Preset ..."
-msgstr "Supprimer le préréglage..."
+#: src/skins-qt/search-select.cc:82 src/skins/search-select.cc:101
+msgid "Artist:"
+msgstr "Artiste :"
 
-#: src/skins/menus.cc:231
-msgid "Delete Auto Preset ..."
-msgstr "Supprimer le préréglage automatique..."
+#: src/skins-qt/search-select.cc:85 src/skins/search-select.cc:106
+msgid "File Name:"
+msgstr "Nom de fichier :"
 
-#: src/skins/menus.cc:233
-msgid "Import Winamp Presets ..."
-msgstr "Importer les préréglages WinAMP..."
+#: src/skins-qt/search-select.cc:88 src/skins/search-select.cc:134
+msgid "Clear previous selection before searching"
+msgstr "Effacer la sélection précédente avant d’effectuer la recherche"
 
-#: src/skins/menus.cc:235
-msgid "Reset to Zero"
-msgstr "Réinitialiser à zéro"
+#: src/skins-qt/search-select.cc:89 src/skins/search-select.cc:137
+msgid "Automatically toggle queue for matching entries"
+msgstr "Mettre automatiquement dans la file d’attente les entrées trouvées"
 
-#: src/skins/plugin.cc:48
-msgid "Winamp Classic Interface"
-msgstr "Interface Winamp Classic"
+#: src/skins-qt/search-select.cc:90 src/skins/search-select.cc:140
+msgid "Create a new playlist with matching entries"
+msgstr "Créer une nouvelle liste de lecture à partir des entrées trouvées"
 
-#: src/skins/preset-browser.cc:57 src/skins/preset-list.cc:371
-#: src/skins/preset-list.cc:386
-msgid "Save"
-msgstr "Enregistrer"
-
-#: src/skins/preset-browser.cc:57 src/skins/preset-list.cc:338
-#: src/skins/preset-list.cc:354
-msgid "Load"
-msgstr "Charger"
-
-#: src/skins/preset-browser.cc:83
-msgid "Load Preset File"
-msgstr "Charger un fichier de préréglage"
-
-#: src/skins/preset-browser.cc:100
-msgid "Load EQF File"
-msgstr "Charger un fichier EQF"
-
-#: src/skins/preset-browser.cc:119
-msgid "Save Preset File"
-msgstr "Enregistrer un fichier de préréglage"
-
-#: src/skins/preset-browser.cc:137
-msgid "Save EQF File"
-msgstr "Enregistrer un fichier EQF"
-
-#: src/skins/preset-browser.cc:151
-msgid "Import Winamp Presets"
-msgstr "Importer les préréglages de WinAMP"
-
-#: src/skins/preset-list.cc:285
-msgid "Presets"
-msgstr "Préréglages"
-
-#: src/skins/preset-list.cc:335
-msgid "Load preset"
-msgstr "Charger un préréglage"
-
-#: src/skins/preset-list.cc:351
-msgid "Load auto-preset"
-msgstr "Charger le réglage automatique"
-
-#: src/skins/preset-list.cc:367
-msgid "Save preset"
-msgstr "Enregistrer le préréglage"
-
-#: src/skins/preset-list.cc:382
-msgid "Save auto-preset"
-msgstr "Enregistrer le réglage automatique"
-
-#: src/skins/preset-list.cc:408
-msgid "Delete preset"
-msgstr "Supprimer un préréglage."
-
-#: src/skins/preset-list.cc:424
-msgid "Delete auto-preset"
-msgstr "Supprimer le réglage automatique"
+#: src/skins-qt/search-select.cc:101 src/skins/search-select.cc:78
+msgid "Search"
+msgstr "Chercher"
 
-#: src/skins/skins_cfg.cc:176
+#: src/skins-qt/skins_cfg.cc:198 src/skins/skins_cfg.cc:182
 msgid "Player:"
-msgstr "Lecteur :"
+msgstr "Lecteur :"
 
-#: src/skins/skins_cfg.cc:178
+#: src/skins-qt/skins_cfg.cc:200 src/skins/skins_cfg.cc:184
 msgid "Select main player window font:"
-msgstr "Choisir la police de la fenêtre principale du lecteur :"
+msgstr "Choisir la police de la fenêtre principale du lecteur :"
 
-#: src/skins/skins_cfg.cc:179
+#: src/skins-qt/skins_cfg.cc:201 src/skins/skins_cfg.cc:185
 msgid "Playlist:"
-msgstr "Liste de lecture :"
+msgstr "Liste de lecture :"
 
-#: src/skins/skins_cfg.cc:181
+#: src/skins-qt/skins_cfg.cc:203 src/skins/skins_cfg.cc:187
 msgid "Select playlist font:"
-msgstr "Choisir la police de la liste de lecture :"
+msgstr "Choisir la police de la liste de lecture :"
 
-#: src/skins/skins_cfg.cc:187
+#: src/skins-qt/skins_cfg.cc:207 src/skins/skins_cfg.cc:191
 msgid "Skin"
 msgstr "Habillage"
 
-#: src/skins/skins_cfg.cc:189
+#: src/skins-qt/skins_cfg.cc:211 src/skins/skins_cfg.cc:193
+msgid "Display active titlebar when any window is focused"
+msgstr ""
+"Afficher la barre de titre active quand une fenêtre est en premier plan"
+
+#: src/skins-qt/skins_cfg.cc:213 src/skins/skins_cfg.cc:195
 msgid "Fonts"
 msgstr "Polices"
 
-#: src/skins/skins_cfg.cc:192
+#: src/skins-qt/skins_cfg.cc:215 src/skins/skins_cfg.cc:197
 msgid "Use bitmap fonts (supports ASCII only)"
 msgstr "Utiliser des polices bitmap (seul ASCII est pris en charge)"
 
-#: src/skins/skins_cfg.cc:194
+#: src/skins-qt/skins_cfg.cc:217 src/skins/skins_cfg.cc:199
 msgid "Scroll song title"
-msgstr "Faire défiler le titre du morceau"
+msgstr "Faire défiler le titre de la pièce"
 
-#: src/skins/skins_cfg.cc:196
+#: src/skins-qt/skins_cfg.cc:219 src/skins/skins_cfg.cc:201
 msgid "Scroll song title in both directions"
-msgstr "Faire défiler le titre dans les deux sens"
+msgstr "Faire défiler le titre de la pièce dans les deux sens"
 
-#: src/skins/skins_cfg.cc:201
+#: src/skins-qt/skins_cfg.cc:224 src/skins/skins_cfg.cc:206
 msgid "Analyzer"
 msgstr "Analyseur"
 
-#: src/skins/skins_cfg.cc:202
+#: src/skins-qt/skins_cfg.cc:225 src/skins/skins_cfg.cc:207
 msgid "Scope"
 msgstr "Oscilloscope"
 
-#: src/skins/skins_cfg.cc:203
+#: src/skins-qt/skins_cfg.cc:226 src/skins/skins_cfg.cc:208
 msgid "Voiceprint / VU meter"
 msgstr "Spectrogramme/vumètre"
 
-#: src/skins/skins_cfg.cc:204
+#: src/skins-qt/skins_cfg.cc:227 src/skins/skins_cfg.cc:209
 msgid "Off"
-msgstr "Arrêt"
+msgstr "Désactiver"
 
-#: src/skins/skins_cfg.cc:208 src/skins/skins_cfg.cc:233
-#: src/skins/skins_cfg.cc:239
+#: src/skins-qt/skins_cfg.cc:231 src/skins-qt/skins_cfg.cc:256
+#: src/skins-qt/skins_cfg.cc:262 src/skins/skins_cfg.cc:213
+#: src/skins/skins_cfg.cc:238 src/skins/skins_cfg.cc:244
 msgid "Normal"
 msgstr "Normal"
 
-#: src/skins/skins_cfg.cc:209 src/skins/skins_cfg.cc:234
+#: src/skins-qt/skins_cfg.cc:232 src/skins-qt/skins_cfg.cc:257
+#: src/skins/skins_cfg.cc:214 src/skins/skins_cfg.cc:239
 msgid "Fire"
 msgstr "Feu"
 
-#: src/skins/skins_cfg.cc:210
+#: src/skins-qt/skins_cfg.cc:233 src/skins/skins_cfg.cc:215
 msgid "Vertical lines"
 msgstr "Lignes verticales"
 
-#: src/skins/skins_cfg.cc:214
+#: src/skins-qt/skins_cfg.cc:237 src/skins/skins_cfg.cc:219
 msgid "Lines"
 msgstr "Lignes"
 
-#: src/skins/skins_cfg.cc:215
+#: src/skins-qt/skins_cfg.cc:238 src/skins/skins_cfg.cc:220
 msgid "Bars"
 msgstr "Barres"
 
-#: src/skins/skins_cfg.cc:219
+#: src/skins-qt/skins_cfg.cc:242 src/skins/skins_cfg.cc:224
 msgid "Slowest"
 msgstr "La plus lente"
 
-#: src/skins/skins_cfg.cc:220
+#: src/skins-qt/skins_cfg.cc:243 src/skins/skins_cfg.cc:225
 msgid "Slow"
 msgstr "Lente"
 
-#: src/skins/skins_cfg.cc:221 src/sox-resampler/sox-resampler.cc:152
+#: src/skins-qt/skins_cfg.cc:244 src/skins/skins_cfg.cc:226
+#: src/soxr/sox-resampler.cc:180
 msgid "Medium"
 msgstr "Moyenne"
 
-#: src/skins/skins_cfg.cc:222
+#: src/skins-qt/skins_cfg.cc:245 src/skins/skins_cfg.cc:227
 msgid "Fast"
 msgstr "Rapide"
 
-#: src/skins/skins_cfg.cc:223
+#: src/skins-qt/skins_cfg.cc:246 src/skins/skins_cfg.cc:228
 msgid "Fastest"
 msgstr "La plus rapide"
 
-#: src/skins/skins_cfg.cc:227
+#: src/skins-qt/skins_cfg.cc:250 src/skins/skins_cfg.cc:232
 msgid "Dots"
 msgstr "Points"
 
-#: src/skins/skins_cfg.cc:228
+#: src/skins-qt/skins_cfg.cc:251 src/skins/skins_cfg.cc:233
 msgid "Line"
 msgstr "Lignes"
 
-#: src/skins/skins_cfg.cc:229
+#: src/skins-qt/skins_cfg.cc:252 src/skins/skins_cfg.cc:234
 msgid "Solid"
 msgstr "Plein"
 
-#: src/skins/skins_cfg.cc:235
+#: src/skins-qt/skins_cfg.cc:258 src/skins/skins_cfg.cc:240
 msgid "Ice"
 msgstr "Glace"
 
-#: src/skins/skins_cfg.cc:240
+#: src/skins-qt/skins_cfg.cc:263 src/skins/skins_cfg.cc:245
 msgid "Smooth"
 msgstr "Lissé"
 
-#: src/skins/skins_cfg.cc:244
-msgid "Type"
-msgstr "Type"
-
-#: src/skins/skins_cfg.cc:245
-msgid "Visualization type:"
-msgstr "Type de visualisation :"
-
-#: src/skins/skins_cfg.cc:248
-msgid "Analyzer"
-msgstr "Analyseur"
-
-#: src/skins/skins_cfg.cc:249
-msgid "Show peaks"
-msgstr "Afficher les crêtes"
-
-#: src/skins/skins_cfg.cc:251
+#: src/skins-qt/skins_cfg.cc:267 src/skins/skins_cfg.cc:249
 msgid "Coloring:"
-msgstr "Coloration :"
+msgstr "Coloration :"
 
-#: src/skins/skins_cfg.cc:254
+#: src/skins-qt/skins_cfg.cc:270 src/skins/skins_cfg.cc:252
 msgid "Style:"
-msgstr "Style :"
+msgstr "Style :"
 
-#: src/skins/skins_cfg.cc:257
+#: src/skins-qt/skins_cfg.cc:273 src/skins/skins_cfg.cc:255
 msgid "Falloff:"
-msgstr "Retombée :"
+msgstr "Retombée :"
 
-#: src/skins/skins_cfg.cc:260
+#: src/skins-qt/skins_cfg.cc:276 src/skins/skins_cfg.cc:258
 msgid "Peak falloff:"
-msgstr "Retombée des crêtes :"
+msgstr "Retombée des crêtes :"
 
-#: src/skins/skins_cfg.cc:264
+#: src/skins-qt/skins_cfg.cc:282 src/skins/skins_cfg.cc:264
 msgid "Scope Style:"
-msgstr "Style oscilloscope :"
+msgstr "Style oscilloscope :"
 
-#: src/skins/skins_cfg.cc:267
+#: src/skins-qt/skins_cfg.cc:285 src/skins/skins_cfg.cc:267
 msgid "Voiceprint Coloring:"
-msgstr "Coloration du spectrogramme :"
+msgstr "Coloration du spectrogramme :"
 
-#: src/skins/skins_cfg.cc:270
+#: src/skins-qt/skins_cfg.cc:288 src/skins/skins_cfg.cc:270
 msgid "VU Meter Style:"
-msgstr "Style vumètre :"
-
-#: src/skins/skins_cfg.cc:276
-msgid "General"
-msgstr "Général"
-
-#: src/skins/skins_cfg.cc:277
-msgid "Visualization"
-msgstr "Visualisations"
-
-#: src/skins/ui_equalizer.cc:282
-msgid "Preamp"
-msgstr "Préampli"
-
-#: src/skins/ui_equalizer.cc:286
-msgid "31 Hz"
-msgstr "31 Hz"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "63 Hz"
-msgstr "63 Hz"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "125 Hz"
-msgstr "125 Hz"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "250 Hz"
-msgstr "250 Hz"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "500 Hz"
-msgstr "500 Hz"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "1 kHz"
-msgstr "1 kHz"
-
-#: src/skins/ui_equalizer.cc:288
-msgid "2 kHz"
-msgstr "2 kHz"
-
-#: src/skins/ui_equalizer.cc:288
-msgid "4 kHz"
-msgstr "4 kHz"
-
-#: src/skins/ui_equalizer.cc:288
-msgid "8 kHz"
-msgstr "8 kHz"
-
-#: src/skins/ui_equalizer.cc:288
-msgid "16 kHz"
-msgstr "16 kHz"
-
-#: src/skins/ui_equalizer.cc:330
-msgid "Audacious Equalizer"
-msgstr "Égaliseur d'Audacious"
-
-#: src/skins/ui_main.cc:688
-#, c-format
-msgid "Seek to %d:%-2.2d / %d:%-2.2d"
-msgstr "Se positionner à %d:%-2.2d/%d:%-2.2d"
-
-#: src/skins/ui_main.cc:709
-#, c-format
-msgid "Volume: %d%%"
-msgstr "Volume : %d%%"
-
-#: src/skins/ui_main.cc:732
-#, c-format
-msgid "Balance: %d%% left"
-msgstr "Balance : %d%% gauche"
-
-#: src/skins/ui_main.cc:734
-msgid "Balance: center"
-msgstr "Balance : centre"
-
-#: src/skins/ui_main.cc:736
-#, c-format
-msgid "Balance: %d%% right"
-msgstr "Balance : %d%% droite"
-
-#: src/skins/ui_main.cc:842
-msgid "Options Menu"
-msgstr "Menu des options"
-
-#: src/skins/ui_main.cc:846
-msgid "Disable 'Always On Top'"
-msgstr "Désactiver « Toujours au premier plan »"
-
-#: src/skins/ui_main.cc:848
-msgid "Enable 'Always On Top'"
-msgstr "Activer « Toujours au premier plan »"
-
-#: src/skins/ui_main.cc:851
-msgid "File Info Box"
-msgstr "Boîte d'Infos sur le fichier"
-
-#: src/skins/ui_main.cc:857
-msgid "Visualizations"
-msgstr "Visualisations"
-
-#: src/skins/ui_main.cc:1336
-msgid "Repeat point A set."
-msgstr "Point de répétition A activé."
-
-#: src/skins/ui_main.cc:1341
-msgid "Repeat point B set."
-msgstr "Point de répétition B activé."
-
-#: src/skins/ui_main.cc:1350
-msgid "Repeat points cleared."
-msgstr "Points de répétition effacés."
-
-#: src/skins/ui_playlist.cc:219
-msgid "Search entries in active playlist"
-msgstr "Chercher des entrées dans la liste de lecture active"
-
-#: src/skins/ui_playlist.cc:226
-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 ""
-"Choisir des entrées de la liste de lecture en remplissant un oou plusieurs "
-"champs. \n"
-"La syntaxe utilisée est celle des expressions rationnelles et est sensible à "
-"la casse. \n"
-"Si vous ne savez pas comment fonctionnent les expressions rationnelles, vous "
-"pouvez simplement indiquer une expression littérale de ce que vous cherchez."
-
-#: src/skins/ui_playlist.cc:234
-msgid "Title:"
-msgstr "Titre :"
-
-#: src/skins/ui_playlist.cc:241
-msgid "Album:"
-msgstr "Album :"
-
-#: src/skins/ui_playlist.cc:248
-msgid "Artist:"
-msgstr "Artiste :"
-
-#: src/skins/ui_playlist.cc:255
-msgid "File Name:"
-msgstr "Nom de fichier :"
+msgstr "Style vumètre :"
 
-#: src/skins/ui_playlist.cc:263
-msgid "Clear previous selection before searching"
-msgstr "Effacer la sélection précédente avant d'effectuer la recherche"
+#: src/skins-qt/skins_cfg.cc:294 src/skins/skins_cfg.cc:276
+msgid "Type"
+msgstr "Type"
 
-#: src/skins/ui_playlist.cc:266
-msgid "Automatically toggle queue for matching entries"
-msgstr "Mettre automatiquement dans la file d'attente les entrées trouvées"
+#: src/skins-qt/skins_cfg.cc:295 src/skins/skins_cfg.cc:277
+msgid "Visualization type:"
+msgstr "Type de visualisation :"
 
-#: src/skins/ui_playlist.cc:269
-msgid "Create a new playlist with matching entries"
-msgstr "Créer une nouvelle liste de lecture à partir des entrées trouvées"
+#: src/skins-qt/skins_cfg.cc:298 src/skins/skins_cfg.cc:280
+msgid "Analyzer"
+msgstr "Analyseur"
 
-#: src/skins/ui_playlist.cc:717
-msgid "Audacious Playlist Editor"
-msgstr "Éditeur de liste de lecture d'Audacious"
+#: src/skins-qt/skins_cfg.cc:299 src/skins/skins_cfg.cc:281
+msgid "Show peaks"
+msgstr "Afficher les crêtes"
 
-#: src/skins/ui_playlist.cc:752
-#, c-format
-msgid "%s (%d of %d)"
-msgstr "%s (%d sur %d)"
+#: src/skins-qt/skins_cfg.cc:308 src/skins/skins_cfg.cc:290
+msgid "Visualization"
+msgstr "Visualisation"
 
-#: src/skins/ui_skinselector.cc:167
+#: src/skins-qt/skinselector.cc:98 src/skins/skinselector.cc:111
 msgid "Archived Winamp 2.x skin"
 msgstr "Habillage Winamp 2.x archivé"
 
-#: src/skins/ui_skinselector.cc:172
+#: src/skins-qt/skinselector.cc:102 src/skins/skinselector.cc:115
 msgid "Unarchived Winamp 2.x skin"
 msgstr "Habillage Winamp 2.x non archivé"
 
-#: src/skins/util.cc:430
-#, c-format
-msgid "Could not create directory (%s): %s\n"
-msgstr "Impossible de créer le répertoire (%s) : %s\n"
-
-#: src/sndfile/plugin.cc:39
+#: src/sndfile/plugin.cc:38
 msgid "Sndfile Plugin"
 msgstr "Greffon Sndfile"
 
-#: src/sndfile/plugin.cc:336
+#: src/sndfile/plugin.cc:372
 msgid ""
 "Based on the xmms_sndfile plugin:\n"
 "Copyright (C) 2000, 2002 Erik de Castro Lopo\n"
@@ -3983,130 +4243,140 @@
 "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"
+"Fondé sur le greffon xmms_sndfile :\n"
 "Tous droits réservés © 2000, 2002 Erik de Castro Lopo\n"
 "\n"
 "Adapté pour Audacious par Tony Vroon <chainsaw@gentoo.org>\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"
+"Ce programme est un logiciel libre ; vous pouvez le redistribuer ou le "
+"modifier selon les termes de la licence publique générale GNU telle que "
+"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 "
+"Ce programme est distribué en espérant qu’il sera 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"
+"COMMERCIALISATION ou d’ADAPTATION DANS UN BUT SPÉCIFIQUE. Consultez 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."
+"Vous devriez avoir reçu une copie de la licence publique générale GNU en "
+"même temps que ce programme ; sinon, écrivez à Free Software Foundation, "
+"Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
 
-#: src/sndio-ng/sndio.cc:44
+#: src/sndio/sndio.cc:43
 msgid "Sndio Output"
 msgstr "Sortie sndio"
 
-#: src/sndio-ng/sndio.cc:98
+#: src/sndio/sndio.cc:98
 msgid "Device (blank for default):"
-msgstr "Périphérique (vide pour celui par défaut) :"
+msgstr "Périphérique (laisser vide pour celui par défaut) :"
 
-#: src/sndio-ng/sndio.cc:100
+#: src/sndio/sndio.cc:100
 msgid "Save and restore volume:"
-msgstr "Enregistrer et restaurer le volume :"
+msgstr "Enregistrer et restaurer le volume :"
 
-#: src/sndio-ng/sndio.cc:181
+#: src/sndio/sndio.cc:181
 #, c-format
 msgid "Sndio error: Unsupported audio format (%d)"
-msgstr "Erreur sndio : format audio non pris en charge (%d)"
+msgstr "Erreur sndio : le format son n’est pas pris en charge (%d)"
 
-#: src/sndio-ng/sndio.cc:192
+#: src/sndio/sndio.cc:192
 msgid "Sndio error: sio_open() failed"
-msgstr "Erreur sndio : échec de sio_open()"
+msgstr "Erreur sndio : échec de sio_open()"
 
-#: src/sndio-ng/sndio.cc:222
+#: src/sndio/sndio.cc:221
 msgid "Sndio error: sio_setpar() failed"
-msgstr "Erreur sndio : échec de sio_setpar()"
+msgstr "Erreur sndio : échec de sio_setpar()"
 
-#: src/sndio-ng/sndio.cc:234
+#: src/sndio/sndio.cc:233
 msgid "Sndio error: sio_start() failed"
-msgstr "Erreur sndio : échec de sio_start()"
+msgstr "Erreur sndio : échec de sio_start()"
 
-#: src/song_change/song_change.cc:33
+#: src/songchange/song_change.cc:30
 msgid "Song Change"
-msgstr "Changement de morceau"
-
-#: src/song_change/song_change.cc:342
-msgid ""
-"Parameters passed to the shell should be encapsulated in "
-"quotes. Doing otherwise is a security risk."
-msgstr ""
-"Les arguments passés à la ligne de commande doivent être "
-"mis entre \" \". Ne pas le faire entraîne un risque de sécurité."
+msgstr "Changement de pièce"
 
-#: src/song_change/song_change.cc:358
+#: src/songchange/song_change.cc:256
 msgid "Commands"
 msgstr "Commandes"
 
-#: src/song_change/song_change.cc:360
+#: src/songchange/song_change.cc:258
 msgid "Command to run when starting a new song:"
-msgstr "Commande à exécuter lorsqu'un nouveau morceau commence :"
+msgstr "Commande à exécuter au lancement d’une nouvelle pièce :"
 
-#: src/song_change/song_change.cc:364
+#: src/songchange/song_change.cc:261
+msgid "Command to run when stopping a song:"
+msgstr "Commande à exécuter lors de l’arrêt d’une pièce :"
+
+#: src/songchange/song_change.cc:264
 msgid "Command to run at the end of a song:"
-msgstr "Commande à exécuter lorsqu'un morceau se termine :"
+msgstr "Commande à exécuter à la fin d’une pièce :"
 
-#: src/song_change/song_change.cc:368
+#: src/songchange/song_change.cc:267
 msgid "Command to run at the end of the playlist:"
-msgstr "Commande à exécuter à la fin de la liste de lecture :"
+msgstr "Commande à exécuter à la fin de la liste de lecture :"
 
-#: src/song_change/song_change.cc:372
+#: src/songchange/song_change.cc:270
 msgid "Command to run when song title changes (for network streams):"
 msgstr ""
-"Commande à exécuter lorsque le titre d'un morceau change (pour les flux "
-"réseau) :"
+"Commande à exécuter quand le titre d’une pièce change (pour les flux "
+"réseau) :"
 
-#: src/song_change/song_change.cc:376
+#: src/songchange/song_change.cc:273
 msgid ""
-"You can use the following format strings which will be substituted before "
-"calling the command (not all are useful for the end-of-playlist command):\n"
-"\n"
-"%F: Frequency (in hertz)\n"
+"You can use the following format codes, which will be replaced before "
+"running the command.\n"
+"Not all are useful though for the song-stopped or end-of-playlist command."
+msgstr ""
+"Vous pouvez utiliser les codes de format suivants qui seront remplacés avant "
+"d’exécuter la commande.\n"
+"Ils ne sont toutefois pas tous utiles pour la commande d’arrêt d’une pièce "
+"ou de fin de liste de lecture."
+
+#: src/songchange/song_change.cc:276
+msgid ""
+"%a: Artist\n"
+"%b: Album\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"
+"%F: Frequency (Hertz)\n"
+"%l: Length (milliseconds)\n"
+"%n or %s: Formatted title (see playlist settings)\n"
 "%p: Currently playing (1 or 0)\n"
-"%a: Artist\n"
-"%b: Album\n"
-"%T: Track title"
-msgstr ""
-"Vous pouvez utiliser les chaînes de formatage suivantes qui seront\n"
-"remplacées avant l'appel de la commande (toutes ne sont pas utiles pour la "
-"commande fin-de-liste-de-lecture) :\n"
-"\n"
-"%F : fréquence (en hertz)\n"
-"%c : nombre de canaux\n"
-"%f : nom de fichier (chemin complet)\n"
-"%l : durée (en millisecondes)\n"
-"%n ou %s : nom du morceau\n"
-"%r : taux (en bits 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-info-qt/song-info.cc:32
-msgid "Song Info (Qt)"
-msgstr "Infos sur le morceau (Qt)"
+"%r: Rate (bits per second)\n"
+"%t: Playlist position\n"
+"%T: Title (unformatted)"
+msgstr ""
+"%a : Artiste\n"
+"%b : Album\n"
+"%c : Nombre de canaux\n"
+"%f : Nom de fichier (chemin complet)\n"
+"%F : Fréquence (en Hertz)\n"
+"%l : Durée (en millisecondes)\n"
+"%n ou %s : Titre formaté (voir les paramètres de la liste de lecture)\n"
+"%p : Lecture en cours (1 ou 0)\n"
+"%r  (bits par seconde)\n"
+"%t : Position de la liste de lecture\n"
+"%T : Titre (non formaté)"
+
+#: src/songchange/song_change.cc:287
+msgid ""
+"Parameters passed to the shell should be enclosed in quotation marks.\n"
+"Unquoted parameters may lead to unexpected results."
+msgstr ""
+"Les paramètres passés à la ligne de commande doivent être entre guillemets "
+"droits anglais \" \"\n"
+"L’absence de guillemets droits anglais pourrait entraîner des résultats "
+"inattendus."
+
+#: src/song-info-qt/song-info.cc:30
+msgid "Song Info"
+msgstr "Renseignements sur la pièce"
 
-#: src/sox-resampler/sox-resampler.cc:44
+#: src/soxr/sox-resampler.cc:44
 msgid "SoX Resampler"
-msgstr "Ré-échantillonneur SoX"
+msgstr "Rééchantillonneur SoX"
 
-#: src/sox-resampler/sox-resampler.cc:144
+#: src/soxr/sox-resampler.cc:172
 msgid ""
 "SoX Resampler Plugin for Audacious\n"
 "Copyright 2013 Michał Lipski\n"
@@ -4114,102 +4384,150 @@
 "Based on Sample Rate Converter Plugin:\n"
 "Copyright 2010-2012 John Lindgren"
 msgstr ""
-"Greffon de ré-échantillonnage SoX pour Audacious\n"
+"Greffon rééchantillonneur SoX pour Audacious\n"
 "Tous droits réservés © 2013 Michał Lipski\n"
 "\n"
-"Basé sur le greffon de conversion du taux d'échantillonnage :\n"
-"Tous droits réservés © 2010-2012 John Lindgren"
+"Fondé sur le greffon de conversion de la fréquence d’échantillonnage :\n"
+"Tous droits réservés © 2010 à 2012 John Lindgren"
 
-#: src/sox-resampler/sox-resampler.cc:150
+#: src/soxr/sox-resampler.cc:178
 msgid "Quick"
 msgstr "Rapide"
 
-#: src/sox-resampler/sox-resampler.cc:151
+#: src/soxr/sox-resampler.cc:179
 msgid "Low"
 msgstr "Bas"
 
-#: src/sox-resampler/sox-resampler.cc:153
+#: src/soxr/sox-resampler.cc:181
 msgid "High"
 msgstr "Haut"
 
-#: src/sox-resampler/sox-resampler.cc:154
+#: src/soxr/sox-resampler.cc:182
 msgid "Very High"
 msgstr "Très haut"
 
-#: src/sox-resampler/sox-resampler.cc:158
+#: src/soxr/sox-resampler.cc:183
+msgid "Ultra High"
+msgstr "Ultra haute"
+
+#: src/soxr/sox-resampler.cc:187
+msgid "Minimum"
+msgstr "Minimale"
+
+#: src/soxr/sox-resampler.cc:188
+msgid "Intermediate"
+msgstr "Intermédiaire"
+
+#: src/soxr/sox-resampler.cc:193
 msgid "Quality:"
-msgstr "Qualité :"
+msgstr "Qualité :"
 
-#: src/speed-pitch/speed-pitch.cc:51
+#: src/soxr/sox-resampler.cc:196
+msgid "Phase:"
+msgstr "Phase :"
+
+#: src/soxr/sox-resampler.cc:200
+msgid "Allow aliasing"
+msgstr "Permettre une distorsion"
+
+#: src/soxr/sox-resampler.cc:202
+msgid "Use steep filter"
+msgstr "Utiliser un filtre abrupte"
+
+#: src/speedpitch/speed-pitch.cc:54
 msgid "Speed and Pitch"
 msgstr "Vitesse et hauteur"
 
-#: src/speed-pitch/speed-pitch.cc:210
-msgid "Speed and Pitch"
-msgstr "Vitesse et hauteur"
-
-#: src/speed-pitch/speed-pitch.cc:211
-msgid "Speed:"
-msgstr "Vitesse :"
-
-#: src/speed-pitch/speed-pitch.cc:214
-msgid "Pitch:"
-msgstr "Hauteur :"
+#: src/speedpitch/speed-pitch.cc:247
+msgid "Speed"
+msgstr "Vitesse"
+
+#: src/speedpitch/speed-pitch.cc:248
+msgid "Decouple from pitch"
+msgstr "Découpler de la hauteur"
+
+#: src/speedpitch/speed-pitch.cc:250 src/speedpitch/speed-pitch.cc:258
+msgid "Multiplier:"
+msgstr "Multiplicateur :"
+
+#: src/speedpitch/speed-pitch.cc:254
+msgid "Pitch"
+msgstr "Hauteur"
 
-#: src/statusicon/statusicon.cc:47
+#: src/statusicon-qt/statusicon.cc:45 src/statusicon/statusicon.cc:47
 msgid "Status Icon"
-msgstr "Icône d'état"
+msgstr "Icône d’état"
 
-#: src/statusicon/statusicon.cc:283
-msgid "Se_ttings ..."
-msgstr "Pa_ramètres..."
-
-#: src/statusicon/statusicon.cc:372
+#: src/statusicon-qt/statusicon.cc:68
 msgid ""
-"Status Icon Plugin\n"
+"Status Icon Plugin (partial port for Qt interface)\n"
 "\n"
 "Copyright 2005-2007 Giacomo Lozito <james@develia.org>\n"
 "Copyright 2010 Michał Lipski <tallica@o2.pl>\n"
+"Copyright 2015 Eugene Paskevich <eugene@raptor.kiev.ua>\n"
 "\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"
+"Greffon d’icône d’état (port partiel pour l’interface Qt)\n"
 "\n"
-"Tous droits réservés © 2005-2007 Giacomo Lozito <james@develia.org>\n"
+"Tous droits réservés © 2005 à 2007 Giacomo Lozito <james@develia.org>\n"
 "Tous droits réservés © 2010 Michał Lipski <tallica@o2.pl>\n"
+"Tous droits réservés © 2015 Eugene Paskevich <eugene@raptor.kiev.ua>\n"
 "\n"
-"Ce greffon ajoute une icône de contrôle d'Audacious dans la zone de "
-"notification de votre gestionnaire de fenêtre."
+"Ce greffon ajoute une icône d’état dans la zone\n"
+"de notification du gestionnaire de fenêtre."
 
-#: src/statusicon/statusicon.cc:379
+#: src/statusicon-qt/statusicon.cc:89 src/statusicon/statusicon.cc:384
 msgid "Mouse Scroll Action"
-msgstr "Action lors du défilement à la molette"
+msgstr "Action de défilement avec la molette"
 
-#: src/statusicon/statusicon.cc:380
+#: src/statusicon-qt/statusicon.cc:90 src/statusicon/statusicon.cc:385
 msgid "Change volume"
 msgstr "Changer le volume"
 
-#: src/statusicon/statusicon.cc:383
+#: src/statusicon-qt/statusicon.cc:93 src/statusicon/statusicon.cc:388
 msgid "Change playing song"
-msgstr "Changer le morceau en cours"
+msgstr "Changer la pièce en cours"
 
-#: src/statusicon/statusicon.cc:386
+#: src/statusicon-qt/statusicon.cc:96 src/statusicon/statusicon.cc:391
 msgid "Other Settings"
 msgstr "Autres paramètres"
 
-#: src/statusicon/statusicon.cc:387
+#: src/statusicon-qt/statusicon.cc:97 src/statusicon/statusicon.cc:392
 msgid "Disable the popup window"
-msgstr "Désactiver la fenêtre contextuelle"
+msgstr "Désactiver la fenêtre contextuelle"
 
-#: src/statusicon/statusicon.cc:389
+#: src/statusicon-qt/statusicon.cc:99 src/statusicon/statusicon.cc:394
 msgid "Close to the system tray"
 msgstr "Réduire dans la zone de notification"
 
-#: src/statusicon/statusicon.cc:391
+#: src/statusicon-qt/statusicon.cc:101 src/statusicon/statusicon.cc:396
 msgid "Advance in playlist when scrolling upward"
 msgstr "Avancer dans la liste de lecture en roulant la molette vers le haut"
 
+#: src/statusicon-qt/statusicon.cc:116 src/statusicon/statusicon.cc:287
+msgid "Se_ttings ..."
+msgstr "Pa_ramètres…"
+
+#: src/statusicon/statusicon.cc:377
+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 ""
+"Greffon d’icône d’état\n"
+"\n"
+"Tous droits réservés © 2005 à 2007 Giacomo Lozito <james@develia.org>\n"
+"Tous droits réservés © 2010 Michał Lipski <tallica@o2.pl>\n"
+"\n"
+"Ce greffon ajoute une icône d’état dans la zone\n"
+"de notification du gestionnaire de fenêtre."
+
 #: src/stereo_plugin/stereo.cc:19
 msgid "Extra Stereo"
 msgstr "Stéréo additionnelle"
@@ -4228,20 +4546,160 @@
 msgid "Extra Stereo"
 msgstr "Stéréo additionnelle"
 
+#: src/streamtuner/icecast-model.cc:126 src/streamtuner/shoutcast-model.cc:131
+msgid "Type"
+msgstr "Type"
+
+#: src/streamtuner/icecast-model.cc:132
+msgid "Current Song"
+msgstr "Pièce actuel"
+
+#: src/streamtuner/icecast-model.cc:164
+msgid "Other"
+msgstr "Autre"
+
+#: src/streamtuner/ihr-model.cc:63
+msgid "Market"
+msgstr "Boutique"
+
+#: src/streamtuner/ihr-model.cc:156
+msgid "Call Letters"
+msgstr "Indicatif de station"
+
+#: src/streamtuner/ihr-model.cc:162
+msgid "Description"
+msgstr "Description"
+
+#: src/streamtuner/shoutcast-model.cc:128
+msgid "Listeners"
+msgstr "Auditeurs"
+
+#: src/streamtuner/shoutcast-model.cc:188
+msgid "Top 500 Stations"
+msgstr "Les 500 premières stations"
+
+#: src/streamtuner/shoutcast-model.cc:189
+msgid "Alternative"
+msgstr "Alternative"
+
+#: src/streamtuner/shoutcast-model.cc:190
+msgid "Blues"
+msgstr "Blues"
+
+#: src/streamtuner/shoutcast-model.cc:191
+msgid "Classical"
+msgstr "Classique"
+
+#: src/streamtuner/shoutcast-model.cc:192
+msgid "Country"
+msgstr "Country"
+
+#: src/streamtuner/shoutcast-model.cc:193
+msgid "Decades"
+msgstr "Décennies"
+
+#: src/streamtuner/shoutcast-model.cc:194
+msgid "Easy Listening"
+msgstr "Facile à écouter"
+
+#: src/streamtuner/shoutcast-model.cc:195
+msgid "Electronic"
+msgstr "Électronique"
+
+#: src/streamtuner/shoutcast-model.cc:196
+msgid "Folk"
+msgstr "Folk"
+
+#: src/streamtuner/shoutcast-model.cc:197
+msgid "Inspirational"
+msgstr "Inspirante"
+
+#: src/streamtuner/shoutcast-model.cc:198
+msgid "International"
+msgstr "Internationale"
+
+#: src/streamtuner/shoutcast-model.cc:199
+msgid "Jazz"
+msgstr "Jazz"
+
+#: src/streamtuner/shoutcast-model.cc:200
+msgid "Latin"
+msgstr "Latino-américaine"
+
+#: src/streamtuner/shoutcast-model.cc:201
+msgid "Metal"
+msgstr "Métal"
+
+#: src/streamtuner/shoutcast-model.cc:203
+msgid "New Age"
+msgstr "Nouvel âge"
+
+#: src/streamtuner/shoutcast-model.cc:204
+msgid "Pop"
+msgstr "Pop"
+
+#: src/streamtuner/shoutcast-model.cc:205
+msgid "Public Radio"
+msgstr "Radio publique"
+
+#: src/streamtuner/shoutcast-model.cc:206
+msgid "R&B and Urban"
+msgstr "R&B et urbaine"
+
+#: src/streamtuner/shoutcast-model.cc:207
+msgid "Rap"
+msgstr "Rap"
+
+#: src/streamtuner/shoutcast-model.cc:208
+msgid "Reggae"
+msgstr "Reggae"
+
+#: src/streamtuner/shoutcast-model.cc:209
+msgid "Rock"
+msgstr "Rock"
+
+#: src/streamtuner/shoutcast-model.cc:210
+msgid "Seasonal and Holiday"
+msgstr "Temps des fêtes"
+
+#: src/streamtuner/shoutcast-model.cc:211
+msgid "Soundtracks"
+msgstr "Bandes originales de film"
+
+#: src/streamtuner/shoutcast-model.cc:212
+msgid "Talk"
+msgstr "Discussion"
+
+#: src/streamtuner/shoutcast-model.cc:213
+msgid "Themes"
+msgstr "Thèmes"
+
+#: src/streamtuner/streamtuner.cc:59
+msgid "Shoutcast"
+msgstr "Shoutcast"
+
+#: src/streamtuner/streamtuner.cc:60
+msgid "Icecast"
+msgstr "Icecast"
+
+#: src/streamtuner/streamtuner.cc:71
+msgid "Stream Tuner"
+msgstr "streamtuner"
+
 #: src/tonegen/tonegen.cc:45
 msgid "Tone Generator"
 msgstr "Générateur de fréquences musicales"
 
-#: src/tonegen/tonegen.cc:94
+#: src/tonegen/tonegen.cc:92
 #, c-format
 msgid "%s %.1f Hz"
 msgstr "%s %.1f Hz"
 
-#: src/tonegen/tonegen.cc:94
+#: src/tonegen/tonegen.cc:92
 msgid "Tone Generator: "
-msgstr "Générateur de tonalités : "
+msgstr "Générateur de tonalités :"
 
-#: src/tonegen/tonegen.cc:160
+#: src/tonegen/tonegen.cc:161
 msgid ""
 "Sine tone generator by Håvard Kvålen <havardk@xmms.org>\n"
 "Modified by Daniel J. Peng <danielpeng@bigfoot.com>\n"
@@ -4252,16 +4710,37 @@
 "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"
+"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"
+"qu’une note à 2 005 Hz"
+
+#: src/ui-common/dialogs-qt.cc:40
+msgid ""
+"\n"
+"(Further messages have been hidden.)"
+msgstr ""
+"\n"
+"(Les messages à venir ont été cachés.)"
+
+#: src/ui-common/dialogs-qt.cc:52
+msgid "Working ..."
+msgstr "Traitement en cours…"
+
+#: src/ui-common/dialogs-qt.cc:73
+msgid "Information"
+msgstr "Renseignements"
+
+#: src/ui-common/menu-ops-gtk.cc:132 src/ui-common/menu-ops-qt.cc:113
+#, c-format
+msgid "%s does not appear to be a valid folder."
+msgstr "%s ne semble pas être un dossier valide."
 
 #: src/voice_removal/voice_removal.cc:28
 msgid "Voice Removal"
 msgstr "Suppression des voix"
 
-#: src/vorbis/vorbis.cc:465
+#: src/vorbis/vorbis.cc:433
 msgid ""
 "Audacious Ogg Vorbis Decoder\n"
 "\n"
@@ -4281,15 +4760,15 @@
 "Gian-Carlo Pascutto <gcp@sjeng.org>\n"
 "Eugene Zagidullin <e.asphyx@gmail.com>"
 msgstr ""
-"Greffon de décodage Ogg Vorbis d'Audacious\n"
+"Greffon de décodage Ogg Vorbis d’Audacious\n"
 "\n"
-"Basé sur le greffon Ogg Vorbis de la fondation Xiph.org\n"
+"Fondé sur le greffon Ogg Vorbis de la fondation Xiph.org\n"
 "http://www.xiph.org/\n"
 "\n"
-"Code d'origine par :\n"
+"Code d’origine par :\n"
 "Tony Arcieri <bascule@inferno.tusculum.edu>\n"
 "\n"
-"Avec les contributions de :\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"
@@ -4303,12 +4782,12 @@
 msgid "Ogg Vorbis Decoder"
 msgstr "Décodeur Ogg Vorbis"
 
-#: src/vtx/info.cc:22
+#: src/vtx/info.cc:24
 #, c-format
 msgid "Details about %s"
 msgstr "Détails à propos de %s"
 
-#: src/vtx/info.cc:24
+#: src/vtx/info.cc:26
 msgid ""
 "Title: %t\n"
 "Author: %a\n"
@@ -4322,45 +4801,89 @@
 "Player Freq: %P\n"
 "Year: %y"
 msgstr ""
-"Titre : %t\n"
-"Auteur : %a\n"
-"De : %f\n"
-"Tracker : %T\n"
-"Commentaire : %C\n"
-"Type de puce : %c\n"
-"Stéréo : %s\n"
-"Boucle : %l\n"
-"Fréq. de la puce : %F\n"
-"Fréq. du lecteur : %P\n"
-"Année : %y"
+"Titre : %t\n"
+"Auteur : %a\n"
+"De : %f\n"
+"Traqueur : %T\n"
+"Commentaire \n"
+"Type de puce : %c\n"
+"Stéréo : %s\n"
+"Boucle : %l\n"
+"Fréq. de la puce : %F\n"
+"Fréq. du lecteur : %P\n"
+"Année : %y"
 
 #: src/vtx/vtx.cc:38
 msgid "VTX Decoder"
 msgstr "Décodeur VTX"
 
-#: src/vtx/vtx.cc:184
+#: src/vtx/vtx.cc:178
 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>\n"
-"Basé sur in_vtx.dll par Roman Sherbakov <v_soft@microfor.ru>\n"
+"Fondé sur in_vtx.dll par Roman Sherbakov <v_soft@microfor.ru>\n"
 "Greffon Audacious par Pavel Vymetalek <pvymetalek@seznam.cz>"
 
-#: src/wavpack/wavpack.cc:24
+#: src/vumeter-qt/vumeter_qt.cc:31
+msgid ""
+"VU Meter Plugin for Audacious\n"
+"Copyright 2017-2019 Marc Sánchez Fauste"
+msgstr ""
+"Greffon de vumètre pour Audacious\n"
+"Tous droits réservés © 2017 à 2019 Marc Sánchez Fauste"
+
+#: src/vumeter-qt/vumeter_qt.cc:35
+msgid "VU Meter Settings"
+msgstr "Paramètres du vumètre"
+
+#: src/vumeter-qt/vumeter_qt.cc:37
+msgid "Peak hold time:"
+msgstr "Délai de retenue de crête :"
+
+#: src/vumeter-qt/vumeter_qt.cc:42
+msgid "Fall-off time:"
+msgstr "Délai d’affaiblissement :"
+
+#: src/vumeter-qt/vumeter_qt.cc:44
+msgid "dB/second"
+msgstr "dB/seconde"
+
+#: src/vumeter-qt/vumeter_qt.cc:46
+msgid "Display legend"
+msgstr "Afficher la légende"
+
+#: src/vumeter-qt/vumeter_qt.h:37
+msgid "VU Meter"
+msgstr "Vumètre"
+
+#: src/waveout/waveout.cc:43
+msgid "Win32 waveOut"
+msgstr "Win32 waveOut"
+
+#: src/waveout/waveout.cc:69
+msgid ""
+"Win32 waveOut Plugin for Audacious\n"
+"Copyright 2016 John Lindgren"
+msgstr ""
+"Greffon win32 waveOut pour Audacious\n"
+"Tous droits réservés © 2016 John Lindgren"
+
+#: src/wavpack/wavpack.cc:25
 msgid "WavPack Decoder"
 msgstr "Décodeur WavPack"
 
-#: src/wavpack/wavpack.cc:211
+#: src/wavpack/wavpack.cc:217
 msgid "lossy (hybrid)"
 msgstr " avec perte (hybride)"
 
-#: src/wavpack/wavpack.cc:213
+#: src/wavpack/wavpack.cc:219
 msgid "lossy"
 msgstr "avec perte"
 
-#: src/wavpack/wavpack.cc:255
+#: src/wavpack/wavpack.cc:259
 msgid ""
 "Copyright 2006 William Pitcock <nenolod@nenolod.net>\n"
 "\n"
@@ -4370,18 +4893,38 @@
 "\n"
 "Une partie du code du greffon a été développé par Miles Egan"
 
-#: src/xsf/plugin.cc:50
+#: src/xsf/plugin.cc:74
 msgid "2SF Decoder"
 msgstr "Décodeur 2SF"
 
-#: src/xsf/plugin.cc:238
+#: src/xsf/plugin.cc:429
+msgid "32728 Hz"
+msgstr "32 728 Hz"
+
+#: src/xsf/plugin.cc:432
+msgid "65456 Hz"
+msgstr "65 456 Hz"
+
+#: src/xsf/plugin.cc:438
+msgid "Cosine"
+msgstr "Cosinus"
+
+#: src/xsf/plugin.cc:439
+msgid "Sharp"
+msgstr "Nette"
+
+#: src/xsf/plugin.cc:443
 msgid "XSF Configuration"
-msgstr "Configuration XFS"
+msgstr "Configuration de XFS"
 
-#: src/xsf/plugin.cc:239
-msgid "Ignore length from file"
-msgstr "Ignorer la durée donnée par le fichier"
+#: src/xsf/plugin.cc:445
+msgid "Default fade time:"
+msgstr "Durée de fondu par défaut :"
+
+#: src/xsf/plugin.cc:447
+msgid "Interpolation mode:"
+msgstr "Mode interpolation :"
 
-#: src/xspf/xspf.cc:89
+#: src/xspf/xspf.cc:95
 msgid "XML Shareable Playlists (XSPF)"
 msgstr "Listes de lecture XSPF"

audacious-plugins-3.6.2-gtk3.tar.bz2/po/gl.po -> audacious-plugins-4.4.1.tar.bz2/po/gl.po Changed

@@ -3,7 +3,9 @@
 # This file is distributed under the same license as the Audacious Plugins package.
 #
 # Translators:
-# antiparvos <marcoslansgarza@gmail.com>, 2014-2015
+# antiparvos, 2022
+# antiparvos, 2014-2018,2020
+# David Rebolo Magariños <drgaga345@gmail.com>, 2021
 # Miguel Anxo Bouzada <mbouzada@gmail.com>, 2012
 # Miguel Anxo Bouzada <mbouzada@gmail.com>, 2013
 # Miguel Anxo Bouzada <mbouzada@gmail.com>, 2012
@@ -11,11 +13,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Audacious Plugins\n"
-"Report-Msgid-Bugs-To: http://redmine.audacious-media-player.org/\n"
-"POT-Creation-Date: 2015-02-28 19:18+0100\n"
-"PO-Revision-Date: 2015-02-05 07:36+0000\n"
-"Last-Translator: Miguel Anxo Bouzada <mbouzada@gmail.com>\n"
-"Language-Team: Galician (http://www.transifex.com/projects/p/audacious/"
+"Report-Msgid-Bugs-To: https://github.com/audacious-media-player/audacious/"
+"issues\n"
+"POT-Creation-Date: 2024-09-26 21:54+0200\n"
+"PO-Revision-Date: 2011-10-10 17:43+0000\n"
+"Last-Translator: antiparvos, 2022\n"
+"Language-Team: Galician (http://app.transifex.com/audacious/audacious/"
 "language/gl/)\n"
 "Language: gl\n"
 "MIME-Version: 1.0\n"
@@ -23,290 +26,60 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/aac-raw/aac.cc:18
+#: src/aac/aac.cc:19
 msgid "AAC (Raw) Decoder"
-msgstr "Decodificador AAC (en bruto)"
+msgstr "Descodificador AAC (en bruto)"
 
-#: src/adplug/adplug-xmms.cc:42
+#: src/adplug/adplug-xmms.cc:70
 msgid "AdPlug (AdLib Player)"
 msgstr "AdPlug (reprodutor AdLib)"
 
-#: src/adplug/adplug-xmms.cc:156 src/modplug/modplugbmp.cc:335
-#: src/psf/plugin.cc:138 src/vtx/vtx.cc:87 src/xsf/plugin.cc:113
+#: src/adplug/adplug-xmms.cc:167 src/modplug/modplugbmp.cc:321
+#: src/psf/plugin.cc:161 src/vtx/vtx.cc:89 src/xsf/plugin.cc:204
 msgid "sequenced"
 msgstr "secuenciado"
 
-#: src/alarm/alarm.cc:55 src/alarm/interface.cc:82
-msgid "Alarm"
-msgstr "Alarma"
-
-#: src/alarm/alarm.cc:782
-msgid "Set Alarm ..."
-msgstr "Estabelecer a alarma ..."
-
-#: src/alarm/alarm.cc:810
-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"
-"\n"
-"Escrito orixinalmente por Adam Feakin e Stodden Daniel."
-
-#: src/alarm/interface.cc: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.cc: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.cc: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.cc:81
-msgid "This is your wakeup call."
-msgstr "Esta é a súa chamada de atención."
-
-#: src/alarm/interface.cc:99
-msgid "Your reminder for today is..."
-msgstr "O seu recordatorio para hoxe é..."
-
-#: src/alarm/interface.cc:101 src/alarm/interface.cc:386
-msgid "Reminder"
-msgstr "Lembranza"
-
-#: src/alarm/interface.cc:132
-msgid "Monday"
-msgstr "luns"
-
-#: src/alarm/interface.cc:132
-msgid "Tuesday"
-msgstr "martes"
-
-#: src/alarm/interface.cc:132
-msgid "Wednesday"
-msgstr "mércores"
-
-#: src/alarm/interface.cc:133
-msgid "Thursday"
-msgstr "xoves"
-
-#: src/alarm/interface.cc:133
-msgid "Friday"
-msgstr "venres"
-
-#: src/alarm/interface.cc:133
-msgid "Saturday"
-msgstr "sábado"
-
-#: src/alarm/interface.cc:133
-msgid "Sunday"
-msgstr "domingo"
-
-#: src/alarm/interface.cc:171 src/alarm/interface.cc:230
-#: src/alarm/interface.cc:245
-msgid "Time"
-msgstr "Hora"
-
-#: src/alarm/interface.cc:178
-msgid "Alarm at (default):"
-msgstr "Alarma as (predeterminado):"
-
-#: src/alarm/interface.cc:200
-msgid "h"
-msgstr "h"
-
-#: src/alarm/interface.cc:203
-msgid "Quiet after:"
-msgstr "Silencio despois de:"
-
-#: src/alarm/interface.cc:215
-msgid "hours"
-msgstr "horas"
-
-#: src/alarm/interface.cc:226
-msgid "minutes"
-msgstr "minutos"
-
-#: src/alarm/interface.cc:235
-msgid "Choose the days for the alarm to come on"
-msgstr "Seleccione os días para que salte a alarma"
+#: src/adplug/adplug-xmms.cc:349 src/sid/xs_config.cc:61
+msgid "Output"
+msgstr "Saída"
 
-#: src/alarm/interface.cc:242
-msgid "Day"
-msgstr "Día"
+#: src/adplug/adplug-xmms.cc:350
+msgid "OPL Emulator:"
+msgstr "Emulador OPL:"
+
+#: src/adplug/adplug-xmms.cc:353 src/amidiplug/i_configure.cc:153
+#: src/console/plugin.cc:45 src/filewriter/filewriter.cc:481
+#: src/sid/xs_config.cc:65 src/xsf/plugin.cc:446
+msgid "Sample rate:"
+msgstr "Taxa da mostraxe:"
 
-#: src/alarm/interface.cc:259 src/bs2b/plugin.cc:130
-#: src/skins/preset-list.cc:434 src/skins/preset-list.cc:440
-msgid "Default"
-msgstr "Predeterminado"
+#: src/adplug/adplug-xmms.cc:354 src/amidiplug/i_configure.cc:155
+#: src/bs2b/plugin.cc:141 src/console/plugin.cc:47
+#: src/modplug/plugin_main.cc:77 src/resample/resample.cc:201
+#: src/resample/resample.cc:207 src/resample/resample.cc:211
+#: src/resample/resample.cc:215 src/resample/resample.cc:219
+#: src/resample/resample.cc:223 src/resample/resample.cc:227
+#: src/resample/resample.cc:231 src/resample/resample.cc:235
+#: src/resample/resample.cc:239 src/resample/resample.cc:243
+#: src/sid/xs_config.cc:67 src/soxr/sox-resampler.cc:205
+msgid "Hz"
+msgstr "Hz"
 
-#: src/alarm/interface.cc:288
-msgid "Days"
-msgstr "Dias"
-
-#: src/alarm/interface.cc:297
-msgid "Fading"
-msgstr "Esvaecemento"
-
-#: src/alarm/interface.cc:305 src/console/plugin.cc:41
-#: src/crossfade/crossfade.cc:53 src/crossfade/crossfade.cc:59
-#: src/gtkui/settings.cc:49 src/lirc/lirc.cc:397 src/sid/xs_config.cc:85
-#: src/sid/xs_config.cc:94 src/sid/xs_config.cc:103
-msgid "seconds"
-msgstr "segundos"
+#: src/adplug/adplug-xmms.cc:355 src/gtkui/settings.cc:55
+#: src/modplug/plugin_main.cc:105 src/qtui/settings.cc:85
+#: src/skins-qt/skins_cfg.cc:302 src/skins/skins_cfg.cc:284
+msgid "Miscellaneous"
+msgstr "Varios"
 
-#: src/alarm/interface.cc:312 src/alarm/interface.cc:353
-msgid "Volume"
-msgstr "Volume"
-
-#: src/alarm/interface.cc:317
-msgid "Start at"
-msgstr "Inicial"
-
-#: src/alarm/interface.cc:333
-msgid "Final"
-msgstr "Final"
-
-#: src/alarm/interface.cc:346
-msgid "Current"
-msgstr "Actual"
-
-#: src/alarm/interface.cc:359
-msgid "Additional Command"
-msgstr "Orde adicional"
-
-#: src/alarm/interface.cc:365 src/alarm/interface.cc:391
-msgid "enable"
-msgstr "activar"
-
-#: src/alarm/interface.cc:372
-msgid "Playlist (optional)"
-msgstr "Lista de reprodución (opcional)"
-
-#: src/alarm/interface.cc:379
-msgid "Select a playlist"
-msgstr "Escolla a lista de reprodución"
-
-#: src/alarm/interface.cc:399
-msgid "Options"
-msgstr "Opcións"
-
-#: src/alarm/interface.cc:404
-msgid "What do these options mean?"
-msgstr "Que significan estas opcións?"
-
-#: src/alarm/interface.cc:420
-msgid "Help"
-msgstr "Axuda"
+#: src/adplug/adplug-xmms.cc:356
+msgid "Repeat song in endless loop"
+msgstr "Repetir a canción en bucle"
 
-#: src/albumart/albumart.cc:31
+#: src/albumart/albumart.cc:31 src/albumart-qt/albumart.cc:35
 msgid "Album Art"
 msgstr "Portada"
 
-#: src/albumart-qt/albumart.cc:33
-msgid "Album Art (Qt)"
-msgstr "Portada (Qt)"
-
-#: src/alsa/alsa.h:70
+#: src/alsa/alsa.h:64
 msgid "ALSA Output"
 msgstr "Saída ALSA"
 
@@ -348,11 +121,11 @@
 msgid "Mixer element:"
 msgstr "Elemento mesturador:"
 
-#: src/amidi-plug/amidi-plug.cc:41
+#: src/amidiplug/amidi-plug.cc:42
 msgid "AMIDI-Plug (MIDI Player)"
 msgstr "Engadido AMIDI (Reprodutor MIDI)"
 
-#: src/amidi-plug/amidi-plug.cc:437
+#: src/amidiplug/amidi-plug.cc:445
 msgid ""
 "AMIDI-Plug\n"
 "modular MIDI music player\n"
@@ -394,157 +167,161 @@
 "Tony Vroon\n"
 "pola gran axuda coas probas da alfa"
 
-#: src/amidi-plug/i_configure.cc:94
+#: src/amidiplug/i_configure.cc:94
 msgid "Override default gain:"
 msgstr "Anular a ganancia predeterminada:"
 
-#: src/amidi-plug/i_configure.cc:102
+#: src/amidiplug/i_configure.cc:102
 msgid "Override default polyphony:"
 msgstr "Anular a polifonía predeterminada:"
 
-#: src/amidi-plug/i_configure.cc:110
+#: src/amidiplug/i_configure.cc:110
 msgid "Override default reverb:"
 msgstr "Anular a reverberación predeterminada:"
 
-#: src/amidi-plug/i_configure.cc:112 src/amidi-plug/i_configure.cc:120
+#: src/amidiplug/i_configure.cc:112 src/amidiplug/i_configure.cc:120
 msgid "On"
 msgstr "Acender"
 
-#: src/amidi-plug/i_configure.cc:118
+#: src/amidiplug/i_configure.cc:118
 msgid "Override default chorus:"
 msgstr "Anular o coro predeterminado:"
 
-#: src/amidi-plug/i_configure.cc:128 src/console/plugin.cc:29
+#: src/amidiplug/i_configure.cc:128 src/console/plugin.cc:29
 msgid "Playback"
 msgstr "Reprodución"
 
-#: src/amidi-plug/i_configure.cc:129
+#: src/amidiplug/i_configure.cc:129
 msgid "Transpose:"
 msgstr "Transposición:"
 
-#: src/amidi-plug/i_configure.cc:131
+#: src/amidiplug/i_configure.cc:131 src/speedpitch/speed-pitch.cc:257
 msgid "semitones"
 msgstr "semitóns"
 
-#: src/amidi-plug/i_configure.cc:132
+#: src/amidiplug/i_configure.cc:132
 msgid "Drum shift:"
 msgstr "Cambio de batería:"
 
-#: src/amidi-plug/i_configure.cc:134
+#: src/amidiplug/i_configure.cc:134
 msgid "note numbers"
 msgstr "números de nota"
 
-#: src/amidi-plug/i_configure.cc:135
+#: src/amidiplug/i_configure.cc:135
 msgid "Skip leading silence"
 msgstr "Omitir o silencio principal"
 
-#: src/amidi-plug/i_configure.cc:137
+#: src/amidiplug/i_configure.cc:137
 msgid "Skip trailing silence"
 msgstr "Omitir o silencio posterior"
 
-#: src/amidi-plug/i_configure.cc:141
+#: src/amidiplug/i_configure.cc:141
 msgid "SoundFont"
 msgstr "Fonte de son"
 
-#: src/amidi-plug/i_configure.cc:143
+#: src/amidiplug/i_configure.cc:148
 msgid "Synthesizer"
 msgstr "Sintetizador"
 
-#: src/amidi-plug/i_configure.cc:148 src/console/plugin.cc:45
-#: src/sid/xs_config.cc:65
-msgid "Sample rate:"
-msgstr "Taxa da mostraxe:"
-
-#: src/amidi-plug/i_configure.cc:150 src/bs2b/plugin.cc:141
-#: src/console/plugin.cc:47 src/modplug/plugin_main.cc:78
-#: src/resample/resample.cc:201 src/resample/resample.cc:207
-#: src/resample/resample.cc:211 src/resample/resample.cc:215
-#: src/resample/resample.cc:219 src/resample/resample.cc:223
-#: src/resample/resample.cc:227 src/resample/resample.cc:231
-#: src/resample/resample.cc:235 src/resample/resample.cc:239
-#: src/resample/resample.cc:243 src/sid/xs_config.cc:67
-#: src/sox-resampler/sox-resampler.cc:163
-msgid "Hz"
-msgstr "Hz"
-
-#: src/amidi-plug/i_configure-fluidsynth.cc:52
+#: src/amidiplug/i_configure-fluidsynth.cc:58
+#: src/amidiplug/i_configure-fluidsynth.cc:527
 msgid "AMIDI-Plug - select SoundFont file"
 msgstr "Engadido AMIDI - seleccione un ficheiro SoundFont"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:55 src/filewriter/mp3.cc:658
+#: src/amidiplug/i_configure-fluidsynth.cc:61
 msgid "_Cancel"
 msgstr "_Cancelar"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:56
+#: src/amidiplug/i_configure-fluidsynth.cc:62
 msgid "_Open"
 msgstr "_Abrir"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:225 src/gtkui/columns.cc:46
+#: src/amidiplug/i_configure-fluidsynth.cc:233
+#: src/amidiplug/i_configure-fluidsynth.cc:461
 msgid "File name"
 msgstr "Nome de ficheiro"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:229
+#: src/amidiplug/i_configure-fluidsynth.cc:237
+#: src/amidiplug/i_configure-fluidsynth.cc:464
 msgid "Size (bytes)"
 msgstr "Tamaño (bytes)"
 
-#: src/amidi-plug/i_fileinfo.cc:163
+#: src/amidiplug/i_fileinfo.cc:184
 msgid "Name:"
 msgstr "Nome:"
 
-#: src/amidi-plug/i_fileinfo.cc:181
+#: src/amidiplug/i_fileinfo.cc:202
 msgid " MIDI Info "
 msgstr " Información MIDI "
 
-#: src/amidi-plug/i_fileinfo.cc:195
+#: src/amidiplug/i_fileinfo.cc:216
 msgid "Format:"
 msgstr "Formato:"
 
-#: src/amidi-plug/i_fileinfo.cc:198
+#: src/amidiplug/i_fileinfo.cc:219
 msgid "Length (msec):"
 msgstr "Duración (mseg.):"
 
-#: src/amidi-plug/i_fileinfo.cc:201
+#: src/amidiplug/i_fileinfo.cc:222
 msgid "No. of Tracks:"
 msgstr "Num. de pistas"
 
-#: src/amidi-plug/i_fileinfo.cc:207
+#: src/amidiplug/i_fileinfo.cc:228
 msgid "variable"
 msgstr "variábel"
 
-#: src/amidi-plug/i_fileinfo.cc:209
+#: src/amidiplug/i_fileinfo.cc:230
 msgid "BPM:"
 msgstr "BPM:"
 
-#: src/amidi-plug/i_fileinfo.cc:217
+#: src/amidiplug/i_fileinfo.cc:238
 msgid "BPM (wavg):"
 msgstr "BPM (wavg):"
 
-#: src/amidi-plug/i_fileinfo.cc:220
+#: src/amidiplug/i_fileinfo.cc:241
 msgid "Time Div:"
 msgstr "Div. tempo:"
 
-#: src/amidi-plug/i_fileinfo.cc:231
+#: src/amidiplug/i_fileinfo.cc:252
 msgid " MIDI Comments and Lyrics "
 msgstr " Comentarios e letras MIDI "
 
-#: src/amidi-plug/i_fileinfo.cc:278
+#: src/amidiplug/i_fileinfo.cc:299
 msgid "* no comments available in this MIDI file *"
 msgstr "* non hai comentarios dispoñíbeis neste ficheiro MIDI *"
 
-#: src/amidi-plug/i_fileinfo.cc:290
+#: src/amidiplug/i_fileinfo.cc:311
 msgid "* no lyrics available in this MIDI file *"
 msgstr "* non hai letras dispoñíbeis neste ficheiro MIDI *"
 
-#: src/amidi-plug/i_fileinfo.cc:300 src/filewriter/vorbis.cc:197
-#: src/ladspa/plugin.cc:416
+#: src/amidiplug/i_fileinfo.cc:321 src/ladspa/plugin.cc:418
+#: src/ui-common/dialogs-qt.cc:32
 msgid "_Close"
 msgstr "_Pechar"
 
-#: src/amidi-plug/i_fileinfo.cc:325
+#: src/amidiplug/i_fileinfo.cc:346
 msgid " (invalid UTF-8)"
 msgstr " (UTF-8 incorrecto)"
 
-#: src/aosd/aosd.cc:32
+#: src/ampache/ampache.cc:33
+msgid "Ampache Browser"
+msgstr "Navegador Ampache"
+
+#: src/ampache/ampache.cc:46
+msgid ""
+"Ampache Browser for Audacious\n"
+"http://ampache-browser.org/\n"
+"\n"
+"Copyright (C) Róbert Čerňanský and John Lindgren\n"
+"License: GNU GPLv3"
+msgstr ""
+"Navegador Ampache para Audacious\n"
+"http://ampache-browser.org/\n"
+"\n"
+"Dereitos de autor (C) Róbert Čerňanský and John Lindgren\n"
+"Licenza: GNU GPLv3"
+
+#: src/aosd/aosd.cc:31
 msgid ""
 "Audacious OSD\n"
 "http://www.develia.org/projects.php?p=audacious#aosd\n"
@@ -578,135 +355,135 @@
 msgid "Concave Rectangle"
 msgstr "Rectángulo cóncavo"
 
-#: src/aosd/aosd_style.cc:69
+#: src/aosd/aosd_style.cc:69 src/openmpt/mptwrap.h:50 src/xsf/plugin.cc:436
 msgid "None"
 msgstr "Ningún"
 
-#: src/aosd/aosd_trigger.cc:50
+#: src/aosd/aosd_trigger.cc:49
 msgid "Playback Start"
 msgstr "Reprodución iniciada"
 
-#: src/aosd/aosd_trigger.cc:51
+#: src/aosd/aosd_trigger.cc:50
 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."
 
-#: src/aosd/aosd_trigger.cc:56
+#: src/aosd/aosd_trigger.cc:55
 msgid "Title Change"
 msgstr "Cambio de título"
 
-#: src/aosd/aosd_trigger.cc:57
+#: src/aosd/aosd_trigger.cc:56
 msgid "Triggers OSD when the song title changes (for internet streams)."
 msgstr ""
 "Disparar OSD cando cambia o título da canción (para fluxos da Internet)."
 
-#: src/aosd/aosd_trigger.cc:62
+#: src/aosd/aosd_trigger.cc:61
 msgid "Pause On"
 msgstr "Inicio da pausa"
 
-#: src/aosd/aosd_trigger.cc:63
+#: src/aosd/aosd_trigger.cc:62
 msgid "Triggers OSD when playback is paused."
 msgstr "Activa as notificacións OSD cando a reprodución e posta en pausa"
 
-#: src/aosd/aosd_trigger.cc:68
+#: src/aosd/aosd_trigger.cc:67
 msgid "Pause Off"
 msgstr "Fin da pausa"
 
-#: src/aosd/aosd_trigger.cc:69
+#: src/aosd/aosd_trigger.cc:68
 msgid "Triggers OSD when playback is unpaused."
 msgstr ""
 "Activa as notificacións OSD cando a reinicia a reprodución despois dunha "
 "pausa"
 
-#: src/aosd/aosd_ui.cc:163
+#: src/aosd/aosd_ui.cc:204
 msgid "Placement"
 msgstr "Colocación"
 
-#: src/aosd/aosd_ui.cc:196
+#: src/aosd/aosd_ui.cc:241
 msgid "Relative X offset:"
 msgstr "Desprazamento X relativo:"
 
-#: src/aosd/aosd_ui.cc:203
+#: src/aosd/aosd_ui.cc:245
 msgid "Relative Y offset:"
 msgstr "Desprazamento Y relativo:"
 
-#: src/aosd/aosd_ui.cc:210
+#: src/aosd/aosd_ui.cc:249
 msgid "Max OSD width:"
 msgstr "Largura máx. do OSD"
 
-#: src/aosd/aosd_ui.cc:221
+#: src/aosd/aosd_ui.cc:281
 msgid "Multi-Monitor options"
 msgstr "Opcións de múltiple monitor"
 
-#: src/aosd/aosd_ui.cc:225
+#: src/aosd/aosd_ui.cc:285
 msgid "Display OSD using:"
 msgstr "Amosar as notificacións OSD utilizando:"
 
-#: src/aosd/aosd_ui.cc:227
+#: src/aosd/aosd_ui.cc:287
 msgid "all monitors"
 msgstr "todos os monitores"
 
-#: src/aosd/aosd_ui.cc:230
+#: src/aosd/aosd_ui.cc:290
 #, c-format
 msgid "monitor %i"
 msgstr "monitor %i"
 
-#: src/aosd/aosd_ui.cc:282
+#: src/aosd/aosd_ui.cc:342
 msgid "Timing (ms)"
 msgstr "Temporización (ms)"
 
-#: src/aosd/aosd_ui.cc:287
+#: src/aosd/aosd_ui.cc:347
 msgid "Display:"
 msgstr "Mostrar:"
 
-#: src/aosd/aosd_ui.cc:292
+#: src/aosd/aosd_ui.cc:352
 msgid "Fade in:"
 msgstr "Esvaecemento de entrada:"
 
-#: src/aosd/aosd_ui.cc:297
+#: src/aosd/aosd_ui.cc:357
 msgid "Fade out:"
 msgstr "Esvaecemento de saída:"
 
-#: src/aosd/aosd_ui.cc:361
+#: src/aosd/aosd_ui.cc:442
 msgid "Fonts"
 msgstr "Tipos de letra"
 
-#: src/aosd/aosd_ui.cc:368
+#: src/aosd/aosd_ui.cc:449
 #, c-format
 msgid "Font %i:"
 msgstr "Tipo de letra %i:"
 
-#: src/aosd/aosd_ui.cc:382
+#: src/aosd/aosd_ui.cc:466
 msgid "Shadow"
 msgstr "Sombra"
 
-#: src/aosd/aosd_ui.cc:486
+#: src/aosd/aosd_ui.cc:589
 msgid "Render Style"
 msgstr "Estilo de debuxado"
 
-#: src/aosd/aosd_ui.cc:502
+#: src/aosd/aosd_ui.cc:605
 msgid "Colors"
 msgstr "Cores"
 
-#: src/aosd/aosd_ui.cc:513
+#: src/aosd/aosd_ui.cc:616
 #, c-format
 msgid "Color %i:"
 msgstr "Cor %i:"
 
-#: src/aosd/aosd_ui.cc:600
+#: src/aosd/aosd_ui.cc:714
 msgid "Enable trigger"
 msgstr "Activar disparador"
 
-#: src/aosd/aosd_ui.cc:627
+#: src/aosd/aosd_ui.cc:741
 msgid "Event"
 msgstr "Actividade"
 
-#: src/aosd/aosd_ui.cc:655
+#: src/aosd/aosd_ui.cc:768
 msgid "Composite manager detected"
 msgstr "Detectouse un administrador de composición"
 
-#: src/aosd/aosd_ui.cc:662
+#: src/aosd/aosd_ui.cc:775
 msgid ""
 "Composite manager not detected;\n"
 "unless you know that you have one running, please activate a composite "
@@ -716,61 +493,57 @@
 "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.cc:670
+#: src/aosd/aosd_ui.cc:783
 msgid "Composite manager not required for fake transparency"
 msgstr ""
 "Para a falsa transparencia non fai falta un administrador de compòsición"
 
-#: src/aosd/aosd_ui.cc:706
+#: src/aosd/aosd_ui.cc:820
 msgid "Transparency"
 msgstr "Transparencia"
 
-#: src/aosd/aosd_ui.cc:712
+#: src/aosd/aosd_ui.cc:826
 msgid "Fake transparency"
 msgstr "Transparencia falsa"
 
-#: src/aosd/aosd_ui.cc:714
+#: src/aosd/aosd_ui.cc:828
 msgid "Real transparency (requires X Composite Ext.)"
 msgstr "Transparencia real (require composición 3D)"
 
-#: src/aosd/aosd_ui.cc:756
+#: src/aosd/aosd_ui.cc:875
 msgid "Composite extension not loaded"
 msgstr "A extensión de composición non está cargada"
 
-#: src/aosd/aosd_ui.cc:764
-msgid "Composite extension not available"
-msgstr "A extensión de composición non está dispoñíbel"
-
-#: src/aosd/aosd_ui.cc:781
+#: src/aosd/aosd_ui.cc:892
 #, c-format
 msgid "Audacious OSD"
 msgstr "Notificacións OSD de Audacious"
 
-#: src/aosd/aosd_ui.cc:844
+#: src/aosd/aosd_ui.cc:955
 msgid "Position"
 msgstr "Posición"
 
-#: src/aosd/aosd_ui.cc:849
+#: src/aosd/aosd_ui.cc:960
 msgid "Animation"
 msgstr "Animación"
 
-#: src/aosd/aosd_ui.cc:854
+#: src/aosd/aosd_ui.cc:965
 msgid "Text"
 msgstr "Texto"
 
-#: src/aosd/aosd_ui.cc:859
+#: src/aosd/aosd_ui.cc:970
 msgid "Decoration"
 msgstr "Decoración"
 
-#: src/aosd/aosd_ui.cc:864
+#: src/aosd/aosd_ui.cc:975
 msgid "Trigger"
 msgstr "Disparador"
 
-#: src/aosd/aosd_ui.cc:869
+#: src/aosd/aosd_ui.cc:980 src/streamtuner/shoutcast-model.cc:202
 msgid "Misc"
 msgstr "Miscelánea"
 
-#: src/aosd/aosd_ui.cc:878
+#: src/aosd/aosd_ui.cc:989
 msgid "Test"
 msgstr "Proba"
 
@@ -786,11 +559,83 @@
 msgid "Audacious Playlists (audpl)"
 msgstr "Listas de reprodución do Audacious (audpl)"
 
-#: src/blur_scope/blur_scope.cc:42
+#: src/background_music/background_music.cc:24
+msgid "Background music"
+msgstr ""
+
+#: src/background_music/background_music.cc:25
+msgid "Target level:"
+msgstr ""
+
+#: src/background_music/background_music.cc:28
+#: src/background_music/background_music.cc:33
+#: src/silence-removal/silence-removal.cc:70
+msgid "dB"
+msgstr "dB"
+
+#: src/background_music/background_music.cc:29
+msgid "Maximum amplification:"
+msgstr ""
+
+#: src/background_music/background_music.cc:34 src/mpg123/mpg123.cc:81
+msgid "Advanced"
+msgstr "Avanzado"
+
+#: src/background_music/background_music.cc:36
+msgid "Slow detection weight:"
+msgstr ""
+
+#: src/background_music/background_music.cc:39
+msgid "Hint"
+msgstr ""
+
+#: src/background_music/background_music.cc:41
+msgid ""
+"Slow detection weight is the relative weight\n"
+"of a long term average detection when compared\n"
+"to the actual, faster loudness detection.\n"
+"A value of zero gives a more radio-like sound\n"
+"where soft passages get \"pulled up\" more quickly,\n"
+"a value of two makes the sound feel less compressed."
+msgstr ""
+
+#: src/background_music/background_music.cc:52
+msgid ""
+"Background Music Plugin for Audacious\n"
+"Copyright 2023;2024 Michel Fleur\n"
+"\n"
+"Controls the volume to make the sound equally loud within and between "
+"tracks.\n"
+" It uses accurate loudness measurement and tries to make the volume changes "
+"sound natural without audible peaks, yet without lowering the volume before "
+"a peak in advance."
+msgstr ""
+
+#: src/background_music/background_music.cc:61
+msgid "Background Music"
+msgstr ""
+
+#: src/bitcrusher/bitcrusher.cc:33
+msgid "Bitcrusher"
+msgstr ""
+
+#: src/bitcrusher/bitcrusher.cc:34
+msgid "Bit Depth:"
+msgstr "Profundidade de bit:"
+
+#: src/bitcrusher/bitcrusher.cc:37
+msgid "Downsample ratio:"
+msgstr ""
+
+#: src/bitcrusher/bitcrusher.cc:48
+msgid "Bitcrusher"
+msgstr ""
+
+#: src/blur_scope/blur_scope.cc:40 src/blur_scope-qt/blur_scope.cc:45
 msgid "Color"
 msgstr "Cor"
 
-#: src/blur_scope/blur_scope.cc:58
+#: src/blur_scope/blur_scope.cc:56 src/blur_scope-qt/blur_scope.cc:158
 msgid "Blur Scope"
 msgstr "Alcance do desenfoque"
 
@@ -802,6 +647,10 @@
 msgid "Presets:"
 msgstr "Predefinicións:"
 
+#: src/bs2b/plugin.cc:130
+msgid "Default"
+msgstr "Predeterminado"
+
 #: src/bs2b/plugin.cc:136
 msgid "Feed level:"
 msgstr "Nivel de alimentación:"
@@ -814,15 +663,15 @@
 msgid "Cut frequency:"
 msgstr "Cortar frecuencia:"
 
-#: src/cairo-spectrum/cairo-spectrum.cc:41
+#: src/cairo-spectrum/cairo-spectrum.cc:42 src/qt-spectrum/qt-spectrum.cc:107
 msgid "Spectrum Analyzer"
 msgstr "Analizador de espectro"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:72
+#: src/cdaudio/cdaudio-ng.cc:74
 msgid "Audio CD Plugin"
 msgstr "Engadido de CD de son"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:121
+#: src/cdaudio/cdaudio-ng.cc:121
 msgid ""
 "Copyright (C) 2007-2012 Calin Crisan <ccrisan@gmail.com> and others.\n"
 "\n"
@@ -843,132 +692,132 @@
 "\n"
 "Este foi un proxecto do Google Summer of Code 2007."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:137
+#: src/cdaudio/cdaudio-ng.cc:140
 msgid "Device"
 msgstr "Dispositivo"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:138
+#: src/cdaudio/cdaudio-ng.cc:141
 msgid "Read speed:"
 msgstr "Velocidade de lectura:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:141
+#: src/cdaudio/cdaudio-ng.cc:144
 msgid "Override device:"
 msgstr "Anular o dispositivo:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:143
+#: src/cdaudio/cdaudio-ng.cc:146
 msgid "Metadata"
 msgstr "Metadatos"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:144
+#: src/cdaudio/cdaudio-ng.cc:147
 msgid "Use CD-Text"
 msgstr "Empregar o CD-Text"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:146
+#: src/cdaudio/cdaudio-ng.cc:150
 msgid "Use CDDB"
 msgstr "Empregar a CDDB"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:148
+#: src/cdaudio/cdaudio-ng.cc:152
 msgid "Use HTTP instead of CDDBP"
 msgstr "Empregar HTTP no canto de CDDBP"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:151
+#: src/cdaudio/cdaudio-ng.cc:155
 msgid "Server:"
 msgstr "Servidor:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:155
+#: src/cdaudio/cdaudio-ng.cc:159
 msgid "Path:"
 msgstr "Ruta:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:159
+#: src/cdaudio/cdaudio-ng.cc:163
 msgid "Port:"
 msgstr "Porto:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:246
+#: src/cdaudio/cdaudio-ng.cc:228
 msgid "Failed to initialize cdio subsystem."
 msgstr "Non foi posíbel iniciar o subsistema cdio"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:281
+#: src/cdaudio/cdaudio-ng.cc:260
 #, c-format
 msgid "Invalid URI %s."
 msgstr "URI incorrecto %s."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:283
+#: src/cdaudio/cdaudio-ng.cc:262
 #, c-format
 msgid "Track %d not found."
 msgstr "Non se atopa a pista %d"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:285
+#: src/cdaudio/cdaudio-ng.cc:264
 #, c-format
 msgid "Track %d is a data track."
 msgstr "A pista %d é unha pista de datos"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:360
+#: src/cdaudio/cdaudio-ng.cc:339
 msgid "Error reading audio CD."
 msgstr "Produciuse un erro ao ler o CD de son"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:429
+#: src/cdaudio/cdaudio-ng.cc:410
 msgid "Audio CD"
 msgstr "CD de son"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:460 src/cdaudio-ng/cdaudio-ng.cc:469
+#: src/cdaudio/cdaudio-ng.cc:446 src/cdaudio/cdaudio-ng.cc:455
 #, 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.cc:472
+#: src/cdaudio/cdaudio-ng.cc:458
 msgid "No audio capable CD drive found."
 msgstr "Non foi posíbel atopar unha unidade de CD de son."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:497
+#: src/cdaudio/cdaudio-ng.cc:481
+msgid "Drive is empty."
+msgstr "A unidade está baleira."
+
+#: src/cdaudio/cdaudio-ng.cc:483
+msgid "Unsupported disk type."
+msgstr "Tipo de disco non admitido."
+
+#: src/cdaudio/cdaudio-ng.cc:507
 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.cc:510
+#: src/cdaudio/cdaudio-ng.cc:520
 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.cc:531
+#: src/cdaudio/cdaudio-ng.cc:541
 #, 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.cc:613
-msgid "Failed to create the cddb connection."
-msgstr "Non foi posíbel crear a conexión coa CDDB"
+#: src/cdaudio/cdaudio-ng.cc:624
+msgid "Failed to create the CDDB connection."
+msgstr "Produciuse un fallo creando a conexión coa CDDB."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:679
+#: src/cdaudio/cdaudio-ng.cc:690
 msgid "Failed to query the CDDB server"
 msgstr "Produciuse un erro ao consultar o servidor CDDB"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:681
+#: src/cdaudio/cdaudio-ng.cc:692
 #, 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.cc:705
+#: src/cdaudio/cdaudio-ng.cc:716
 #, 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.cc:765
-msgid "Drive is empty."
-msgstr "A unidade está baleira."
+msgid "Failed to read the CDDB info: %s"
+msgstr "Produciuse un fallo lendo a información da CDDB: %s"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:767
-msgid "Unsupported disk type."
-msgstr "Tipo de disco non admitido."
-
-#: src/cd-menu-items/cd-menu-items.cc:35
+#: src/cd-menu-items/cd-menu-items.cc:33
 msgid "Audio CD Menu Items"
 msgstr "Elementos do menú do CD de son"
 
-#: src/cd-menu-items/cd-menu-items.cc:47
-msgid "Play CD"
-msgstr "Reproducir o CD"
-
-#: src/cd-menu-items/cd-menu-items.cc:47
-msgid "Add CD"
-msgstr "Engadir un CD"
+#: src/cd-menu-items/cd-menu-items.cc:45
+msgid "Pla_y CD"
+msgstr "Reproduc_ir CD"
+
+#: src/cd-menu-items/cd-menu-items.cc:45
+msgid "_Add CD"
+msgstr "Eng_adir CD"
 
 #: src/compressor/compressor.cc:45
 msgid "Compression"
@@ -1003,7 +852,7 @@
 "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\n"
+"Motor descodificador 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"
@@ -1026,13 +875,20 @@
 msgid "Default song length:"
 msgstr "Duración predeterminada da canción:"
 
-#: src/console/plugin.cc:42 src/modplug/plugin_main.cc:59
+#: src/console/plugin.cc:41 src/crossfade/crossfade.cc:56
+#: src/crossfade/crossfade.cc:62 src/lirc/lirc.cc:395 src/notify/notify.cc:113
+#: src/sid/xs_config.cc:85 src/sid/xs_config.cc:94 src/sid/xs_config.cc:103
+#: src/vumeter-qt/vumeter_qt.cc:39
+msgid "seconds"
+msgstr "segundos"
+
+#: src/console/plugin.cc:42 src/modplug/plugin_main.cc:58
 msgid "Resampling"
 msgstr "Mostraxe múltipla"
 
 #: src/console/plugin.cc:43
 msgid "Enable audio resampling"
-msgstr "Activar a múltipla mostraxe de son"
+msgstr "Activar a mostraxe múltiple de son"
 
 #: src/console/plugin.cc:49
 msgid "SPC"
@@ -1050,29 +906,39 @@
 msgid "Game Console Music Decoder"
 msgstr "Descodificador de música dunha consola de xogos"
 
-#: src/coreaudio/coreaudio.cc:50
+#: src/coreaudio/coreaudio.cc:53
 msgid "CoreAudio output"
 msgstr "Saída CoreAudio"
 
-#: src/coreaudio/coreaudio.cc:131
+#: src/coreaudio/coreaudio.cc:155
 msgid ""
 "CoreAudio Output Plugin for Audacious\n"
 "Copyright 2014 William Pitcock\n"
+"Copyright 2017,18 René J.V. Bertin\n"
+" (original code and code adapted from\n"
+" Apple examples, (C) Apple 2013)\n"
 "\n"
 "Based on SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
 msgstr ""
 "Engadido de saída CoreAudio para Audacious\n"
 "Copyright 2014 William Pitcock\n"
+"Copyright 2017,18 René J.V. Berti\n"
+"(o código orixinal e o adaptado son de\n"
+"exemplos de Apple, (C) Apple 2013)\n"
 "\n"
 "Baseado no engadido de saída SDL para Audacious\n"
 "Copyright 2010 John Lindgren"
 
-#: src/coreaudio/coreaudio.cc:143
+#: src/coreaudio/coreaudio.cc:171
 msgid "Use exclusive mode"
 msgstr "Usar o modo exclusivo"
 
-#: src/crossfade/crossfade.cc:44
+#: src/coreaudio/coreaudio.cc:173
+msgid "Use bit perfect audio (adapt device sampling rate)"
+msgstr "Use o son bit perfect (adapte a taxa de mostraxe do dispositivo)"
+
+#: src/crossfade/crossfade.cc:47
 msgid ""
 "Crossfade Plugin for Audacious\n"
 "Copyright 2010-2014 John Lindgren"
@@ -1080,27 +946,43 @@
 "Engadido Crossfade para Audacious\n"
 "Copyright 2010-2014 John Lindgren"
 
-#: src/crossfade/crossfade.cc:48
+#: src/crossfade/crossfade.cc:51
 msgid "Crossfade"
 msgstr "Atenuación cruzada"
 
-#: src/crossfade/crossfade.cc:49
+#: src/crossfade/crossfade.cc:52
 msgid "On automatic song change"
 msgstr "No cambio automático de canción"
 
-#: src/crossfade/crossfade.cc:51 src/crossfade/crossfade.cc:57
+#: src/crossfade/crossfade.cc:54 src/crossfade/crossfade.cc:60
 msgid "Overlap:"
 msgstr "Sobreposición:"
 
-#: src/crossfade/crossfade.cc:55
+#: src/crossfade/crossfade.cc:58
 msgid "On seek or manual song change"
 msgstr "No cambio manual, ou nas buscas, de canción"
 
-#: src/crossfade/crossfade.cc:61
+#: src/crossfade/crossfade.cc:64
+msgid "No fade in"
+msgstr ""
+
+#: src/crossfade/crossfade.cc:66
+msgid "Use S-curve fade"
+msgstr ""
+
+#: src/crossfade/crossfade.cc:68
+msgid "S-curve steepness:"
+msgstr ""
+
+#: src/crossfade/crossfade.cc:70
+msgid "(higher is steeper)"
+msgstr ""
+
+#: src/crossfade/crossfade.cc:72
 msgid "Tip"
 msgstr "Consello"
 
-#: src/crossfade/crossfade.cc:62
+#: src/crossfade/crossfade.cc:73
 msgid ""
 "For better crossfading, enable\n"
 "the Silence Removal effect."
@@ -1108,29 +990,10 @@
 "Para un mellor efecto de fundido, active\n"
 "o efecto de supresión do silencio."
 
-#: src/crossfade/crossfade.cc:72
+#: src/crossfade/crossfade.cc:83
 msgid "Crossfade"
 msgstr "Atenuación cruzada"
 
-#: src/crossfade/crossfade.cc:161
-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."
-
-#: src/crossfade/crossfade.cc:168
-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."
-
 #: src/crystalizer/crystalizer.cc:31
 msgid "Crystalizer"
 msgstr "Cristalizador"
@@ -1143,61 +1006,61 @@
 msgid "Crystalizer"
 msgstr "Cristalizador"
 
-#: src/cue/cue.cc:37
+#: src/cue/cue.cc:42
 msgid "Cue Sheet Plugin"
 msgstr "Engadido de plano de referencia"
 
-#: src/delete-files/delete-files.cc:46 src/delete-files/delete-files.cc:146
+#: src/delete-files/delete-files.cc:53 src/delete-files/delete-files.cc:215
+#: src/delete-files/delete-files.cc:230
 msgid "Delete Files"
 msgstr "Eliminar ficheiros"
 
-#: src/delete-files/delete-files.cc:75
+#: src/delete-files/delete-files.cc:120
+msgid "No files are selected."
+msgstr "Non se seleccionou ningún ficheiro."
+
+#: src/delete-files/delete-files.cc:125
 #, c-format
-msgid "Error moving %s to trash: %s."
-msgstr "Produciuse un erro ao enviar %s ao lixo: %s."
+msgid "Do you want to move %s to the trash?"
+msgstr "Desexa mover %s ao lixo?"
 
-#: src/delete-files/delete-files.cc:86
+#: src/delete-files/delete-files.cc:126
 #, c-format
-msgid "Error deleting %s: %s."
-msgstr "Produciuse un erro ao eliminar %s: %s."
+msgid "Do you want to permanently delete %s?"
+msgstr "Desexa eliminar permanentemente %s?"
 
-#: src/delete-files/delete-files.cc:117
+#: src/delete-files/delete-files.cc:133
 #, c-format
-msgid "Error deleting %s: not a local file."
-msgstr "Produciuse un erro ao eliminar %s: non é un ficheiro local."
+msgid "Do you want to move %d files to the trash?"
+msgstr "Desexa mover %d ficheiros ao lixo?"
 
 #: src/delete-files/delete-files.cc:134
-msgid "Do you want to move the selected files to the trash?"
-msgstr "Confirma que quere enviar ao lixo os ficheiros seleccionados?"
-
-#: src/delete-files/delete-files.cc:135
-msgid "Move to Trash"
-msgstr "Enviar ao lixo"
+#, c-format
+msgid "Do you want to permanently delete %d files?"
+msgstr "Desexa eliminar permanentemente %d ficheiros?"
 
-#: src/delete-files/delete-files.cc:140
-msgid "Do you want to permanently delete the selected files?"
-msgstr ""
-"Confirma que quere eliminar permanentemente os ficheiros seleccionados?"
+#: src/delete-files/delete-files.cc:146
+msgid "Move to trash"
+msgstr "Mover ao lixo"
 
-#: src/delete-files/delete-files.cc:141 src/skins/preset-list.cc:411
-#: src/skins/preset-list.cc:427
+#: src/delete-files/delete-files.cc:146
 msgid "Delete"
 msgstr "Eliminar"
 
-#: src/delete-files/delete-files.cc:145 src/skins/preset-browser.cc:56
-#: src/skins/preset-list.cc:307 src/skins/ui_playlist.cc:221
+#: src/delete-files/delete-files.cc:213 src/delete-files/delete-files.cc:235
+#: src/skins-qt/search-select.cc:102 src/skins/search-select.cc:78
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: src/delete-files/delete-files.cc:166
+#: src/delete-files/delete-files.cc:267
 msgid "Delete Selected Files"
 msgstr "Eliminar os ficheiros seleccionados"
 
-#: src/delete-files/delete-files.cc:181
+#: src/delete-files/delete-files.cc:287
 msgid "Delete Method"
 msgstr "Eliminar o método"
 
-#: src/delete-files/delete-files.cc:182
+#: src/delete-files/delete-files.cc:288
 msgid "Move to trash instead of deleting immediately"
 msgstr "Enviar ao lixo no canto de eliminar inmediatamente"
 
@@ -1218,13 +1081,13 @@
 msgid "Echo"
 msgstr "Eco"
 
-#: src/echo_plugin/echo.cc:22 src/modplug/plugin_main.cc:73
-#: src/modplug/plugin_main.cc:83
+#: src/echo_plugin/echo.cc:22 src/modplug/plugin_main.cc:72
+#: src/modplug/plugin_main.cc:82
 msgid "Delay:"
 msgstr "Atraso:"
 
-#: src/echo_plugin/echo.cc:24 src/modplug/plugin_main.cc:73
-#: src/modplug/plugin_main.cc:83
+#: src/echo_plugin/echo.cc:24 src/modplug/plugin_main.cc:72
+#: src/modplug/plugin_main.cc:82 src/xsf/plugin.cc:445
 msgid "ms"
 msgstr "ms"
 
@@ -1232,7 +1095,7 @@
 msgid "Feedback:"
 msgstr "Realimentación"
 
-#: src/echo_plugin/echo.cc:28 src/modplug/plugin_main.cc:87
+#: src/echo_plugin/echo.cc:28 src/modplug/plugin_main.cc:86
 msgid "Volume:"
 msgstr "Volume:"
 
@@ -1240,11 +1103,11 @@
 msgid "Echo"
 msgstr "Eco"
 
-#: src/ffaudio/ffaudio-core.cc:41
+#: src/ffaudio/ffaudio-core.cc:50
 msgid "FFmpeg Plugin"
 msgstr "Engadido FFmpeg"
 
-#: src/ffaudio/ffaudio-core.cc:571
+#: src/ffaudio/ffaudio-core.cc:649
 msgid ""
 "Multi-format audio decoding plugin for Audacious using\n"
 "FFmpeg multimedia framework (http://www.ffmpeg.org/)\n"
@@ -1253,77 +1116,41 @@
 "William Pitcock <nenolod@nenolod.net>\n"
 "Matti Hämäläinen <ccr@tnsp.org>"
 msgstr ""
-"Engadido de decodificación multi-formato do son empregando\n"
+"Engadido de descodificació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/filewriter/filewriter.cc:45
+#: src/filewriter/filewriter.cc:48
 msgid "FileWriter Plugin"
 msgstr "Engadido FileWrite"
 
-#: src/filewriter/filewriter.cc:386
-msgid "Output file format:"
-msgstr "Formato do ficheiro de saída:"
-
-#: src/filewriter/filewriter.cc:403
-msgid "Configure"
-msgstr "Configurar"
-
-#: src/filewriter/filewriter.cc:413
-msgid "Save into original directory"
-msgstr "Gardar no directorio orixinal"
-
-#: src/filewriter/filewriter.cc:417
-msgid "Save into custom directory"
-msgstr "Gardar nun directorio personalizado"
-
-#: src/filewriter/filewriter.cc:427
-msgid "Output file folder:"
-msgstr "Cartafol do ficheiro de saída:"
-
-#: src/filewriter/filewriter.cc:431
-msgid "Pick a folder"
-msgstr "Escolla un cartafol"
-
-#: src/filewriter/filewriter.cc:444
-msgid "Generate file name from:"
-msgstr "Xerar o nome de ficheiro desde:"
-
-#: src/filewriter/filewriter.cc:448
-msgid "Original file tag"
-msgstr "Etiqueta do ficheiro orixinal"
-
-#: src/filewriter/filewriter.cc:453
-msgid "Original file name"
-msgstr "Nome do ficheiro orixinal"
-
-#: src/filewriter/filewriter.cc:459
-msgid "Include original file name extension"
-msgstr "Incluír a extensión do nome do ficheiro orixinañ"
-
-#: src/filewriter/filewriter.cc:468
-msgid "Prepend track number to file name"
-msgstr "Antepor o número de pista ao nome de ficheiro"
+#: src/filewriter/filewriter.cc:316
+#, c-format
+msgid ""
+"Error opening %s:\n"
+"%s"
+msgstr ""
+"Erro abrindo %s:\n"
+"%s"
 
-#: src/filewriter/filewriter.cc:484
+#: src/filewriter/filewriter.cc:358
 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"
+"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"
-"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."
+"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 ""
 "Este programa é software libre, pode redistribuílo e/ou modificalo\n"
 "baixo os termos da Licenza Pública Xeral de GNU segundo é publicada\n"
@@ -1335,174 +1162,283 @@
 "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"
+"Debería recibir 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/mp3.cc:40 src/filewriter/mp3.cc:717
+#: src/filewriter/filewriter.cc:385
+msgid "Output file format:"
+msgstr "Formato do ficheiro de saída:"
+
+#: src/filewriter/filewriter.cc:389
+msgid "Save into original directory"
+msgstr "Gardar no directorio orixinal"
+
+#: src/filewriter/filewriter.cc:392
+msgid "Save into custom directory:"
+msgstr "Gardar nun cartafol personalizado:"
+
+#: src/filewriter/filewriter.cc:400
+msgid "Generate file name from:"
+msgstr "Xerar o nome de ficheiro desde:"
+
+#: src/filewriter/filewriter.cc:401
+msgid "Original file name"
+msgstr "Nome do ficheiro orixinal"
+
+#: src/filewriter/filewriter.cc:404
+msgid "Original file name (no suffix)"
+msgstr "Nome do ficheiro orixinal (sen sufixo)"
+
+#: src/filewriter/filewriter.cc:407
+msgid "Original file tag"
+msgstr "Etiqueta do ficheiro orixinal"
+
+#: src/filewriter/filewriter.cc:411
+msgid "Prepend track number to file name"
+msgstr "Antepor o número de pista ao nome de ficheiro"
+
+#: src/filewriter/filewriter.cc:417 src/filewriter/filewriter.cc:449
 msgid "Auto"
 msgstr "Auto"
 
-#: src/filewriter/mp3.cc:40
+#: src/filewriter/filewriter.cc:418
+msgid "8000 Hz"
+msgstr "8000 Hz"
+
+#: src/filewriter/filewriter.cc:419
+msgid "11025 Hz"
+msgstr "11025 Hz"
+
+#: src/filewriter/filewriter.cc:420
+msgid "12000 Hz"
+msgstr "12000 Hz"
+
+#: src/filewriter/filewriter.cc:421
+msgid "16000 Hz"
+msgstr "16000 Hz"
+
+#: src/filewriter/filewriter.cc:422
+msgid "22050 Hz"
+msgstr "22050 Hz"
+
+#: src/filewriter/filewriter.cc:423
+msgid "24000 Hz"
+msgstr "24000 Hz"
+
+#: src/filewriter/filewriter.cc:424
+msgid "32000 Hz"
+msgstr "32000 Hz"
+
+#: src/filewriter/filewriter.cc:425 src/xsf/plugin.cc:430
+msgid "44100 Hz"
+msgstr "44100 Hz"
+
+#: src/filewriter/filewriter.cc:426 src/xsf/plugin.cc:431
+msgid "48000 Hz"
+msgstr "48000 Hz"
+
+#: src/filewriter/filewriter.cc:430
+msgid "8 kbit/s"
+msgstr "8 kbit/s"
+
+#: src/filewriter/filewriter.cc:431
+msgid "16 kbit/s"
+msgstr "16 kbit/s"
+
+#: src/filewriter/filewriter.cc:432
+msgid "32 kbit/s"
+msgstr "32 kbit/s"
+
+#: src/filewriter/filewriter.cc:433
+msgid "40 kbit/s"
+msgstr "40 kbit/s"
+
+#: src/filewriter/filewriter.cc:434
+msgid "48 kbit/s"
+msgstr "48 kbit/s"
+
+#: src/filewriter/filewriter.cc:435
+msgid "56 kbit/s"
+msgstr "56 kbit/s"
+
+#: src/filewriter/filewriter.cc:436
+msgid "64 kbit/s"
+msgstr "64 kbit/s"
+
+#: src/filewriter/filewriter.cc:437
+msgid "80 kbit/s"
+msgstr "80 kbit/s"
+
+#: src/filewriter/filewriter.cc:438
+msgid "96 kbit/s"
+msgstr "96 kbit/s"
+
+#: src/filewriter/filewriter.cc:439
+msgid "112 kbit/s"
+msgstr "112 kbit/s"
+
+#: src/filewriter/filewriter.cc:440
+msgid "128 kbit/s"
+msgstr "128 kbit/s"
+
+#: src/filewriter/filewriter.cc:441
+msgid "160 kbit/s"
+msgstr "160 kbit/s"
+
+#: src/filewriter/filewriter.cc:442
+msgid "192 kbit/s"
+msgstr "192 kbit/s"
+
+#: src/filewriter/filewriter.cc:443
+msgid "224 kbit/s"
+msgstr "224 kbit/s"
+
+#: src/filewriter/filewriter.cc:444
+msgid "256 kbit/s"
+msgstr "256 kbit/s"
+
+#: src/filewriter/filewriter.cc:445
+msgid "320 kbit/s"
+msgstr "320 kbit/s"
+
+#: src/filewriter/filewriter.cc:450
 msgid "Joint Stereo"
 msgstr "Estéreo solapado"
 
-#: src/filewriter/mp3.cc:41 src/modplug/plugin_main.cc:58
-#: src/mpg123/mpg123.cc:248
+#: src/filewriter/filewriter.cc:451 src/modplug/plugin_main.cc:57
+#: src/mpg123/mpg123.cc:259
 msgid "Stereo"
 msgstr "Estéreo"
 
-#: src/filewriter/mp3.cc:41 src/modplug/plugin_main.cc:57
-#: src/mpg123/mpg123.cc:248
+#: src/filewriter/filewriter.cc:452 src/modplug/plugin_main.cc:56
+#: src/mpg123/mpg123.cc:260
 msgid "Mono"
 msgstr "Mono"
 
-#: src/filewriter/mp3.cc:657
-msgid "MP3 Configuration"
-msgstr "Configuración de MP3"
-
-#: src/filewriter/mp3.cc:658
-msgid "_OK"
-msgstr "_Aceptar"
+#: src/filewriter/filewriter.cc:456
+msgid "VBR"
+msgstr "VBR"
+
+#: src/filewriter/filewriter.cc:457
+msgid "ABR"
+msgstr "ABR"
 
-#: src/filewriter/mp3.cc:681
-msgid "Algorithm Quality:"
+#: src/filewriter/filewriter.cc:478
+msgid "Algorithm quality:"
 msgstr "Calidade do algoritmo:"
 
-#: src/filewriter/mp3.cc:706
-msgid "Output Sample Rate:"
-msgstr "Frecuencia de mostraxe de saída:"
-
-#: src/filewriter/mp3.cc:733
-msgid "(Hz)"
-msgstr "(Hz)"
-
-#: src/filewriter/mp3.cc:740
-msgid "Bitrate / Compression Ratio:"
-msgstr "Taxa de bits / Relación de compresión:"
-
-#: src/filewriter/mp3.cc:764
-msgid "Bitrate (kbps):"
-msgstr "Taxa de bits (kbps):"
+#: src/filewriter/filewriter.cc:484
+msgid "Bitrate:"
+msgstr "Taxa de bits:"
 
-#: src/filewriter/mp3.cc:796
+#: src/filewriter/filewriter.cc:491
 msgid "Compression ratio:"
 msgstr "Relación de compresión:"
 
-#: src/filewriter/mp3.cc:820
-msgid "Audio Mode:"
+#: src/filewriter/filewriter.cc:498
+msgid "Audio mode:"
 msgstr "Modo do son:"
 
-#: src/filewriter/mp3.cc:845
-msgid "Miscellaneous:"
-msgstr "Varios:"
-
-#: src/filewriter/mp3.cc:856
+#: src/filewriter/filewriter.cc:501
 msgid "Enforce strict ISO compliance"
 msgstr "Forzar o cumprimento estrito da norma ISO"
 
-#: src/filewriter/mp3.cc:867
+#: src/filewriter/filewriter.cc:503
 msgid "Error protection"
 msgstr "Protección contra erros"
 
-#: src/filewriter/mp3.cc:879 src/filewriter/vorbis.cc:206
-msgid "Quality"
-msgstr "Calidade"
-
-#: src/filewriter/mp3.cc:888
+#: src/filewriter/filewriter.cc:508
 msgid "Enable VBR/ABR"
 msgstr "Activar VBR/ABR"
 
-#: src/filewriter/mp3.cc:898
+#: src/filewriter/filewriter.cc:510
 msgid "Type:"
 msgstr "Tipo:"
 
-#: src/filewriter/mp3.cc:931
-msgid "VBR Options:"
-msgstr "Opcións VBR:"
-
-#: src/filewriter/mp3.cc:947
-msgid "Minimum bitrate (kbps):"
-msgstr "Taxa de bits mínima (kbps)"
-
-#: src/filewriter/mp3.cc:973
-msgid "Maximum bitrate (kbps):"
-msgstr "Taxa de bits máxima (kbps)"
-
-#: src/filewriter/mp3.cc:995
-msgid "Strictly enforce minimum bitrate"
-msgstr "Aplicar estritamente a taxa de bits mínima"
-
-#: src/filewriter/mp3.cc:1007
-msgid "ABR Options:"
-msgstr "Opcións ABR:"
-
-#: src/filewriter/mp3.cc:1017
-msgid "Average bitrate (kbps):"
-msgstr "Taxa media de bits (kbps)"
+#: src/filewriter/filewriter.cc:514
+msgid "Minimum bitrate:"
+msgstr "Taxa de bits mínima :"
+
+#: src/filewriter/filewriter.cc:518
+msgid "Maximum bitrate:"
+msgstr "Taxa de bits máxima:"
+
+#: src/filewriter/filewriter.cc:522
+msgid "Average bitrate:"
+msgstr "Taxa media de bits:"
 
-#: src/filewriter/mp3.cc:1044
+#: src/filewriter/filewriter.cc:526
 msgid "VBR quality level:"
 msgstr "Nivel de calidade VBR:"
 
-#: src/filewriter/mp3.cc:1063
+#: src/filewriter/filewriter.cc:530
+msgid "Strictly enforce minimum bitrate"
+msgstr "Aplicar estritamente a taxa de bits mínima"
+
+#: src/filewriter/filewriter.cc:533
 msgid "Omit Xing VBR header"
 msgstr "Omitir a cabeceira VBR Xing"
 
-#: src/filewriter/mp3.cc:1076
-msgid "VBR/ABR"
-msgstr "VBR/ABR"
-
-#: src/filewriter/mp3.cc:1085
-msgid "Frame Parameters:"
-msgstr "Parámetros do cadro:"
+#: src/filewriter/filewriter.cc:539
+msgid "Frame Headers"
+msgstr "Cabeceiras das partes"
 
-#: src/filewriter/mp3.cc:1097
+#: src/filewriter/filewriter.cc:540
 msgid "Mark as copyright"
 msgstr "Marcar con Dereitos de autoría"
 
-#: src/filewriter/mp3.cc:1108
+#: src/filewriter/filewriter.cc:542
 msgid "Mark as original"
 msgstr "Marcar como orixinal"
 
-#: src/filewriter/mp3.cc:1120
-msgid "ID3 Parameters:"
-msgstr "Parámetros ID3:"
+#: src/filewriter/filewriter.cc:544
+msgid "ID3 Tags"
+msgstr "Etiquetas ID3"
 
-#: src/filewriter/mp3.cc:1131
+#: src/filewriter/filewriter.cc:545
 msgid "Force addition of version 2 tag"
 msgstr "Forzar o engadido da etiqueta da versión 2"
 
-#: src/filewriter/mp3.cc:1141
+#: src/filewriter/filewriter.cc:547
 msgid "Only add v1 tag"
 msgstr "Engadir só a etiqueta v1"
 
-#: src/filewriter/mp3.cc:1148
+#: src/filewriter/filewriter.cc:549
 msgid "Only add v2 tag"
 msgstr "Engadir só a etiqueta v2"
 
-#: src/filewriter/mp3.cc:1169
+#: src/filewriter/filewriter.cc:554
+msgid "Quality"
+msgstr "Calidade"
+
+#: src/filewriter/filewriter.cc:555
+msgid "VBR/ABR"
+msgstr "VBR/ABR"
+
+#: src/filewriter/filewriter.cc:556
 msgid "Tags"
 msgstr "Etiquetas"
 
-#: src/filewriter/vorbis.cc:196
-msgid "Vorbis Encoder Configuration"
-msgstr "Configuración do codificador Vorbis"
-
-#: src/filewriter/vorbis.cc:219
-msgid "Quality level (0 - 10):"
-msgstr "Nivel de calidade (0 - 10):"
+#: src/filewriter/filewriter.cc:566
+msgid "Quality (0-1):"
+msgstr "Calidade (0-1):"
+
+#: src/filewriter/filewriter.cc:573 src/skins-qt/skins_cfg.cc:307
+#: src/skins/skins_cfg.cc:289
+msgid "General"
+msgstr "Xeral"
 
-#: src/flacng/flacng.h:35
+#: src/flac/flacng.h:36
 msgid "FLAC Decoder"
 msgstr "Descodificador FLAC"
 
-#: src/flacng/metadata.cc:351 src/wavpack/wavpack.cc:209
+#: src/flac/metadata.cc:296 src/wavpack/wavpack.cc:215
 msgid "lossless"
 msgstr "sen perdas"
 
-#: src/flacng/plugin.cc:169
+#: src/flac/plugin.cc:214
 msgid ""
 "Original code by\n"
 "Ralf Ertzinger <ralf@skytale.net>\n"
@@ -1526,15 +1462,15 @@
 msgid "GIO Plugin"
 msgstr "Engadido GIO"
 
-#: src/gio/gio.cc:153
+#: src/gio/gio.cc:152
 msgid "Read-and-append mode not supported"
 msgstr "O modo ler e engadir non está admitido"
 
-#: src/gio/gio.cc:166
+#: src/gio/gio.cc:165
 msgid "Invalid open mode"
 msgstr "Modo incorrecto de apertura"
 
-#: src/gl-spectrum/gl-spectrum.cc:51
+#: src/glspectrum/gl-spectrum.cc:52
 msgid ""
 "OpenGL Spectrum Analyzer for Audacious\n"
 "Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
@@ -1554,623 +1490,745 @@
 "\n"
 "Liceza: GPLv2+"
 
-#: src/gl-spectrum/gl-spectrum.cc:62
+#: src/glspectrum/gl-spectrum.cc:63 src/qtglspectrum/gl-spectrum.cc:53
 msgid "OpenGL Spectrum Analyzer"
 msgstr "Analizador de espectro OpenGL"
 
-#: src/gl-spectrum-qt/gl-spectrum.cc:41
-msgid ""
-"OpenGL Spectrum Analyzer for Audacious\n"
-"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
-"Copyright 2014 William Pitcock\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é, John Lindgren e Carlo Bramini\n"
-"Copyright 2014 William Pitcock\n"
-"\n"
-"Baseado no engadido de XMMS:\n"
-"Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson, e "
-"4Front Technologies\n"
-"\n"
-"Licencia: GPLv2+"
-
-#: src/gl-spectrum-qt/gl-spectrum.cc:53
-msgid "OpenGL Spectrum Analyzer (Qt)"
-msgstr "Analizador de espectro OpenGL (Qt)"
-
-#: src/gnomeshortcuts/gnomeshortcuts.cc:38
-msgid "GNOME Shortcuts"
-msgstr "Atallos do GNOME"
-
-#: src/gnomeshortcuts/gnomeshortcuts.cc:54
-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\n"
-"Permite controlar o reprodutor cos atallos do GNOME.\n"
-"\n"
-"Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>"
-
-#: src/gtkui/columns.cc:35
-msgid "Entry number"
+#: src/gtkui/columns.cc:36 src/moonstone/playlist_model.cc:38
+#: src/qtui/playlist_model.cc:33
+msgid "Entry Number"
 msgstr "Número de entrada"
 
-#: src/gtkui/columns.cc:36 src/playlist-manager/playlist-manager.cc:225
-#: src/qtui/playlist_model.cc:123
+#: src/gtkui/columns.cc:37 src/moonstone/playlist_model.cc:38
+#: src/moonstone/playlist_selection.cc:64
+#: src/playlist-manager/playlist-manager.cc:200
+#: src/playlist-manager-qt/playlist-manager-qt.cc:188
+#: src/qtui/playlist_model.cc:33 src/streamtuner/icecast-model.cc:120
+#: src/streamtuner/ihr-model.cc:159 src/streamtuner/shoutcast-model.cc:122
 msgid "Title"
 msgstr "Título"
 
-#: src/gtkui/columns.cc:37 src/qtui/playlist_model.cc:125
+#: src/gtkui/columns.cc:38 src/moonstone/playlist_model.cc:39
+#: src/qtui/playlist_model.cc:33
 msgid "Artist"
 msgstr "Interprete"
 
-#: src/gtkui/columns.cc:38
+#: src/gtkui/columns.cc:39 src/moonstone/playlist_model.cc:39
+#: src/qtui/playlist_model.cc:33
 msgid "Year"
 msgstr "Ano"
 
-#: src/gtkui/columns.cc:39 src/qtui/playlist_model.cc:127
+#: src/gtkui/columns.cc:40 src/moonstone/playlist_model.cc:39
+#: src/qtui/playlist_model.cc:34
 msgid "Album"
 msgstr "Álbum"
 
-#: src/gtkui/columns.cc:40
-msgid "Album artist"
-msgstr "Interprete do álbum"
+#: src/gtkui/columns.cc:41 src/moonstone/playlist_model.cc:40
+#: src/qtui/playlist_model.cc:34
+msgid "Album Artist"
+msgstr "Álbum Artista"
 
-#: src/gtkui/columns.cc:41
+#: src/gtkui/columns.cc:42 src/moonstone/playlist_model.cc:40
+#: src/qtui/playlist_model.cc:34
 msgid "Track"
 msgstr "Pista"
 
-#: src/gtkui/columns.cc:42
+#: src/gtkui/columns.cc:43 src/moonstone/playlist_model.cc:40
+#: src/qtui/playlist_model.cc:34 src/streamtuner/icecast-model.cc:123
+#: src/streamtuner/shoutcast-model.cc:125
+#: src/streamtuner/shoutcast-model.cc:236
 msgid "Genre"
 msgstr "Xénero"
 
-#: src/gtkui/columns.cc:43
-msgid "Queue position"
+#: src/gtkui/columns.cc:44 src/moonstone/playlist_model.cc:41
+#: src/qtui/playlist_model.cc:35
+msgid "Queue Position"
 msgstr "Posición na cola"
 
-#: src/gtkui/columns.cc:44
+#: src/gtkui/columns.cc:45 src/moonstone/playlist_model.cc:41
+#: src/qtui/playlist_model.cc:35
 msgid "Length"
 msgstr "Duración"
 
-#: src/gtkui/columns.cc:45
-msgid "File path"
+#: src/gtkui/columns.cc:46 src/moonstone/playlist_model.cc:41
+#: src/qtui/playlist_model.cc:35
+msgid "File Path"
 msgstr "Ruta ao ficheiro"
 
-#: src/gtkui/columns.cc:47
-msgid "Custom title"
+#: src/gtkui/columns.cc:47 src/moonstone/playlist_model.cc:42
+#: src/qtui/playlist_model.cc:35
+msgid "File Name"
+msgstr "Nome do ficheiro"
+
+#: src/gtkui/columns.cc:48 src/moonstone/playlist_model.cc:42
+#: src/qtui/playlist_model.cc:36
+msgid "Custom Title"
 msgstr "Título personalizado"
 
-#: src/gtkui/columns.cc:48
+#: src/gtkui/columns.cc:49 src/moonstone/playlist_model.cc:42
+#: src/qtui/playlist_model.cc:36 src/streamtuner/icecast-model.cc:129
+#: src/streamtuner/shoutcast-model.cc:134
 msgid "Bitrate"
 msgstr "Taxa de bits"
 
-#: src/gtkui/columns.cc:308
+#: src/gtkui/columns.cc:50 src/moonstone/playlist_model.cc:43
+#: src/qtui/playlist_model.cc:36
+msgid "Comment"
+msgstr "Comentario"
+
+#: src/gtkui/columns.cc:51 src/qtui/playlist_model.cc:36
+msgid "Publisher"
+msgstr ""
+
+#: src/gtkui/columns.cc:52 src/qtui/playlist_model.cc:37
+msgid "Catalog Number"
+msgstr ""
+
+#: src/gtkui/columns.cc:53 src/moonstone/playlist_model.cc:43
+#: src/qtui/playlist_model.cc:37
+msgid "Disc"
+msgstr ""
+
+#: src/gtkui/columns.cc:325
 msgid "Available columns"
 msgstr "Columnas dispoñíbeis"
 
-#: src/gtkui/columns.cc:334
+#: src/gtkui/columns.cc:351
 msgid "Displayed columns"
 msgstr "Columnas amosadas"
 
-#: src/gtkui/layout.cc:72 src/search-tool/search-tool.cc:40
+#: src/gtkui/layout.cc:74 src/search-tool-qt/search-tool-qt.cc:58
+#: src/search-tool/search-tool.cc:49
 msgid "Search Tool"
 msgstr "Ferramenta de buscas"
 
-#: src/gtkui/layout.cc:167
+#: src/gtkui/layout.cc:170
 msgid "Dock at Left"
 msgstr "Ancorar á esquerda"
 
-#: src/gtkui/layout.cc:167
+#: src/gtkui/layout.cc:170
 msgid "Dock at Right"
 msgstr "Ancorar á dereita"
 
-#: src/gtkui/layout.cc:168
+#: src/gtkui/layout.cc:171
 msgid "Dock at Top"
 msgstr "Ancorar enriba"
 
-#: src/gtkui/layout.cc:168
+#: src/gtkui/layout.cc:171
 msgid "Dock at Bottom"
 msgstr "Ancorar abaixo"
 
-#: src/gtkui/layout.cc:168
+#: src/gtkui/layout.cc:171
 msgid "Undock"
 msgstr "Desancorar"
 
-#: src/gtkui/layout.cc:168 src/ladspa/plugin.cc:531
+#: src/gtkui/layout.cc:171 src/ladspa/plugin.cc:540
 msgid "Disable"
 msgstr "Desactivar"
 
-#: src/gtkui/menus.cc:126 src/qtui/main_window_actions.cc:93
-#: src/statusicon/statusicon.cc:276
+#: src/gtkui/menus.cc:79 src/qtui/menus.cc:107
+#: src/statusicon-qt/statusicon.cc:115 src/statusicon/statusicon.cc:286
 msgid "_Open Files ..."
 msgstr "_Abrir ficheiros..."
 
-#: src/gtkui/menus.cc:127
+#: src/gtkui/menus.cc:80 src/qtui/menus.cc:111
 msgid "Open _URL ..."
 msgstr "Abrir un _URL..."
 
-#: src/gtkui/menus.cc:128 src/qtui/main_window_actions.cc:95
+#: src/gtkui/menus.cc:81 src/qtui/menus.cc:113
 msgid "_Add Files ..."
 msgstr "_Engadir ficheiros..."
 
-#: src/gtkui/menus.cc:129
+#: src/gtkui/menus.cc:82 src/qtui/menus.cc:118
 msgid "Add U_RL ..."
 msgstr "Engadir un U_RL..."
 
-#: src/gtkui/menus.cc:131
+#: src/gtkui/menus.cc:84 src/qtui/menus.cc:120
 msgid "Search _Library"
 msgstr "Buscar unha _fonoteca"
 
-#: src/gtkui/menus.cc:133 src/qtui/main_window_actions.cc:98
+#: src/gtkui/menus.cc:86 src/qtui/menus.cc:123
 msgid "A_bout ..."
 msgstr "So_bre..."
 
-#: src/gtkui/menus.cc:134 src/qtui/main_window_actions.cc:99
+#: src/gtkui/menus.cc:87 src/qtui/menus.cc:125
 msgid "_Settings ..."
 msgstr "_Axustes ..."
 
-#: src/gtkui/menus.cc:135 src/qtui/main_window_actions.cc:103
-#: src/statusicon/statusicon.cc:284
+#: src/gtkui/menus.cc:88 src/qtui/menus.cc:131
+#: src/statusicon-qt/statusicon.cc:117 src/statusicon/statusicon.cc:288
 msgid "_Quit"
 msgstr "_Saír"
 
-#: src/gtkui/menus.cc:139 src/gtkui/menus.cc:262
-#: src/qtui/main_window_actions.cc:107 src/search-tool/search-tool.cc:641
-#: src/statusicon/statusicon.cc:278
+#: src/gtkui/menus.cc:92 src/gtkui/menus.cc:226
+#: src/moonstone/playlist_tabs.cc:306 src/qtui/menus.cc:135
+#: src/qtui/playlist_tabs.cc:331 src/search-tool-qt/search-tool-qt.cc:499
+#: src/search-tool/search-tool.cc:339 src/statusicon-qt/statusicon.cc:109
+#: src/statusicon/statusicon.cc:280
 msgid "_Play"
 msgstr "_Reproducir"
 
-#: src/gtkui/menus.cc:140 src/qtui/main_window_actions.cc:108
-#: src/statusicon/statusicon.cc:279
+#: src/gtkui/menus.cc:93 src/qtui/menus.cc:137
+#: src/statusicon-qt/statusicon.cc:110 src/statusicon/statusicon.cc:281
 msgid "Paus_e"
 msgstr "_Pausa"
 
-#: src/gtkui/menus.cc:141 src/qtui/main_window_actions.cc:109
-#: src/statusicon/statusicon.cc:280
+#: src/gtkui/menus.cc:94 src/qtui/menus.cc:139
+#: src/statusicon-qt/statusicon.cc:111 src/statusicon/statusicon.cc:282
 msgid "_Stop"
 msgstr "_Deter"
 
-#: src/gtkui/menus.cc:142 src/qtui/main_window_actions.cc:110
-#: src/statusicon/statusicon.cc:277
+#: src/gtkui/menus.cc:95 src/qtui/menus.cc:141
+#: src/statusicon-qt/statusicon.cc:112 src/statusicon/statusicon.cc:283
 msgid "Pre_vious"
 msgstr "A_nterior"
 
-#: src/gtkui/menus.cc:143 src/qtui/main_window_actions.cc:111
-#: src/statusicon/statusicon.cc:281
+#: src/gtkui/menus.cc:96 src/qtui/menus.cc:143
+#: src/statusicon-qt/statusicon.cc:113 src/statusicon/statusicon.cc:284
 msgid "_Next"
 msgstr "Se_guinte"
 
-#: src/gtkui/menus.cc:145 src/qtui/main_window_actions.cc:113
+#: src/gtkui/menus.cc:97 src/qtui/menus.cc:145 src/skins/menus.cc:114
+#: src/skins-qt/menus.cc:105
+msgid "Previous Album"
+msgstr "Álbum anterior"
+
+#: src/gtkui/menus.cc:98 src/qtui/menus.cc:146 src/skins/menus.cc:115
+#: src/skins-qt/menus.cc:106
+msgid "Next Album"
+msgstr "Álbum seguinte"
+
+#: src/gtkui/menus.cc:100 src/qtui/menus.cc:148
 msgid "_Repeat"
 msgstr "Repe_tir"
 
-#: src/gtkui/menus.cc:146 src/qtui/main_window_actions.cc:114
+#: src/gtkui/menus.cc:101 src/qtui/menus.cc:150
 msgid "S_huffle"
 msgstr "Ao c_hou"
 
-#: src/gtkui/menus.cc:147 src/qtui/main_window_actions.cc:115
+#: src/gtkui/menus.cc:102 src/qtui/menus.cc:152
+msgid "Shuffle by Albu_m"
+msgstr "Ao chou por álbu_m"
+
+#: src/gtkui/menus.cc:103 src/qtui/menus.cc:155
 msgid "N_o Playlist Advance"
 msgstr "N_on avanzar na lista de reprodución"
 
-#: src/gtkui/menus.cc:148 src/qtui/main_window_actions.cc:116
+#: src/gtkui/menus.cc:104 src/qtui/menus.cc:157
 msgid "Stop A_fter This Song"
 msgstr "Parar _despois desta canción"
 
-#: src/gtkui/menus.cc:150 src/gtkui/menus.cc:247
-#: src/qtui/main_window_actions.cc:118
+#: src/gtkui/menus.cc:106 src/gtkui/menus.cc:210 src/qtui/menus.cc:162
+#: src/qtui/menus.cc:294
 msgid "Song _Info ..."
 msgstr "_Información da canción"
 
-#: src/gtkui/menus.cc:151
+#: src/gtkui/menus.cc:107
 msgid "Jump to _Time ..."
 msgstr "Saltar no _tempo"
 
-#: src/gtkui/menus.cc:152
+#: src/gtkui/menus.cc:108
 msgid "_Jump to Song ..."
 msgstr "Saltar á _canción"
 
-#: src/gtkui/menus.cc:154
+#: src/gtkui/menus.cc:110 src/qtui/menus.cc:165
 msgid "Set Repeat Point _A"
 msgstr "Estabelecer o punto de repetición _A"
 
-#: src/gtkui/menus.cc:155
+#: src/gtkui/menus.cc:111 src/qtui/menus.cc:167
 msgid "Set Repeat Point _B"
 msgstr "Estabelecer o punto de repetición _B"
 
-#: src/gtkui/menus.cc:156
+#: src/gtkui/menus.cc:112 src/qtui/menus.cc:169
 msgid "_Clear Repeat Points"
 msgstr "_Limpar os puntos de repetición"
 
-#: src/gtkui/menus.cc:160 src/gtkui/menus.cc:167 src/gtkui/menus.cc:183
-#: src/qtui/main_window_actions.cc:122 src/qtui/main_window_actions.cc:129
-#: src/qtui/main_window_actions.cc:145
+#: src/gtkui/menus.cc:116 src/gtkui/menus.cc:123 src/gtkui/menus.cc:141
+#: src/qtui/menus.cc:173 src/qtui/menus.cc:180 src/qtui/menus.cc:198
 msgid "By _Title"
 msgstr "Polo _título"
 
-#: src/gtkui/menus.cc:161 src/qtui/main_window_actions.cc:123
+#: src/gtkui/menus.cc:117 src/qtui/menus.cc:174
 msgid "By _File Name"
 msgstr "Pola nome do _ficheiro"
 
-#: src/gtkui/menus.cc:162 src/qtui/main_window_actions.cc:124
+#: src/gtkui/menus.cc:118 src/qtui/menus.cc:175
 msgid "By File _Path"
 msgstr "Por _ruta do ficheiro"
 
-#: src/gtkui/menus.cc:166 src/gtkui/menus.cc:182
-#: src/qtui/main_window_actions.cc:128 src/qtui/main_window_actions.cc:144
+#: src/gtkui/menus.cc:122 src/gtkui/menus.cc:140 src/qtui/menus.cc:179
+#: src/qtui/menus.cc:197
 msgid "By Track _Number"
 msgstr "Polo _número de pista"
 
-#: src/gtkui/menus.cc:168 src/gtkui/menus.cc:184
-#: src/qtui/main_window_actions.cc:130 src/qtui/main_window_actions.cc:146
+#: src/gtkui/menus.cc:124 src/gtkui/menus.cc:142 src/qtui/menus.cc:181
+#: src/qtui/menus.cc:199
 msgid "By _Artist"
 msgstr "Polo _interprete"
 
-#: src/gtkui/menus.cc:169 src/gtkui/menus.cc:185
-#: src/qtui/main_window_actions.cc:131 src/qtui/main_window_actions.cc:147
+#: src/gtkui/menus.cc:125 src/gtkui/menus.cc:143 src/qtui/menus.cc:182
+#: src/qtui/menus.cc:200
 msgid "By Al_bum"
 msgstr "Por ál_bum"
 
-#: src/gtkui/menus.cc:170 src/gtkui/menus.cc:186
-#: src/qtui/main_window_actions.cc:132 src/qtui/main_window_actions.cc:148
+#: src/gtkui/menus.cc:126 src/gtkui/menus.cc:144 src/qtui/menus.cc:183
+#: src/qtui/menus.cc:201
 msgid "By Albu_m Artist"
 msgstr "Polo interprete do álbu_m"
 
-#: src/gtkui/menus.cc:171 src/gtkui/menus.cc:187
-#: src/qtui/main_window_actions.cc:133 src/qtui/main_window_actions.cc:149
+#: src/gtkui/menus.cc:127 src/gtkui/menus.cc:145 src/qtui/menus.cc:184
+#: src/qtui/menus.cc:202
 msgid "By Release _Date"
 msgstr "Pola _data de publicación"
 
-#: src/gtkui/menus.cc:172 src/gtkui/menus.cc:188
-#: src/qtui/main_window_actions.cc:134 src/qtui/main_window_actions.cc:150
+#: src/gtkui/menus.cc:128 src/gtkui/menus.cc:146 src/qtui/menus.cc:185
+#: src/qtui/menus.cc:203
 msgid "By _Genre"
 msgstr "Por _xénero"
 
-#: src/gtkui/menus.cc:173 src/gtkui/menus.cc:189
-#: src/qtui/main_window_actions.cc:135 src/qtui/main_window_actions.cc:151
+#: src/gtkui/menus.cc:129 src/gtkui/menus.cc:147 src/qtui/menus.cc:186
+#: src/qtui/menus.cc:204
 msgid "By _Length"
 msgstr "Por _duración"
 
-#: src/gtkui/menus.cc:174 src/gtkui/menus.cc:190
-#: src/qtui/main_window_actions.cc:136 src/qtui/main_window_actions.cc:152
+#: src/gtkui/menus.cc:130 src/gtkui/menus.cc:148 src/qtui/menus.cc:187
+#: src/qtui/menus.cc:205
 msgid "By _File Path"
 msgstr "Pola _ruta do ficheiro"
 
-#: src/gtkui/menus.cc:175 src/gtkui/menus.cc:191
-#: src/qtui/main_window_actions.cc:137 src/qtui/main_window_actions.cc:153
+#: src/gtkui/menus.cc:131 src/gtkui/menus.cc:149 src/qtui/menus.cc:188
+#: src/qtui/menus.cc:206
 msgid "By _Custom Title"
 msgstr "Polo título _personalizado"
 
-#: src/gtkui/menus.cc:177 src/gtkui/menus.cc:193
-#: src/qtui/main_window_actions.cc:139 src/qtui/main_window_actions.cc:155
+#: src/gtkui/menus.cc:132 src/gtkui/menus.cc:150 src/qtui/menus.cc:189
+#: src/qtui/menus.cc:207
+msgid "By C_omment"
+msgstr "Por c_omentario"
+
+#: src/gtkui/menus.cc:133 src/gtkui/menus.cc:151 src/qtui/menus.cc:190
+#: src/qtui/menus.cc:208
+msgid "By D_isc Number"
+msgstr ""
+
+#: src/gtkui/menus.cc:135 src/gtkui/menus.cc:153 src/qtui/menus.cc:192
+#: src/qtui/menus.cc:210
 msgid "R_everse Order"
 msgstr "Orden _inversa"
 
-#: src/gtkui/menus.cc:178 src/gtkui/menus.cc:194
-#: src/qtui/main_window_actions.cc:140 src/qtui/main_window_actions.cc:156
+#: src/gtkui/menus.cc:136 src/gtkui/menus.cc:154 src/qtui/menus.cc:194
+#: src/qtui/menus.cc:212
 msgid "_Random Order"
 msgstr "Ao c_hou"
 
-#: src/gtkui/menus.cc:198 src/qtui/main_window_actions.cc:160
+#: src/gtkui/menus.cc:158 src/qtui/menus.cc:216
 msgid "_Play/Resume"
 msgstr "Re_producir/Continuar"
 
-#: src/gtkui/menus.cc:199 src/gtkui/menus.cc:251
-#: src/qtui/main_window_actions.cc:161
+#: src/gtkui/menus.cc:159 src/qtui/menus.cc:218
 msgid "_Refresh"
 msgstr "_Actualizar"
 
-#: src/gtkui/menus.cc:201 src/qtui/main_window_actions.cc:163
+#: src/gtkui/menus.cc:161 src/qtui/menus.cc:222
 msgid "_Sort"
 msgstr "_Ordenar"
 
-#: src/gtkui/menus.cc:202 src/qtui/main_window_actions.cc:164
+#: src/gtkui/menus.cc:162 src/qtui/menus.cc:223
 msgid "Sort Se_lected"
 msgstr "Ordenar a s_elección"
 
-#: src/gtkui/menus.cc:203 src/qtui/main_window_actions.cc:165
+#: src/gtkui/menus.cc:163 src/qtui/menus.cc:225
 msgid "Remove _Duplicates"
 msgstr "Retirar _duplicados"
 
-#: src/gtkui/menus.cc:204 src/qtui/main_window_actions.cc:166
+#: src/gtkui/menus.cc:164 src/qtui/menus.cc:226
 msgid "Remove _Unavailable Files"
 msgstr "Eliminar os ficheiros _non dispoñíbeis"
 
-#: src/gtkui/menus.cc:206 src/playlist-manager/playlist-manager.cc:244
-#: src/qtui/main_window_actions.cc:168
+#: src/gtkui/menus.cc:166 src/playlist-manager/playlist-manager.cc:219
+#: src/playlist-manager-qt/playlist-manager-qt.cc:348 src/qtui/menus.cc:229
 msgid "_New"
 msgstr "_Novo"
 
-#: src/gtkui/menus.cc:207
+#: src/gtkui/menus.cc:167 src/qtui/menus.cc:230
 msgid "Ren_ame ..."
 msgstr "Cambiar o _nome..."
 
-#: src/gtkui/menus.cc:208 src/gtkui/menus.cc:264
-#: src/qtui/main_window_actions.cc:170
+#: src/gtkui/menus.cc:168 src/gtkui/menus.cc:228
+#: src/moonstone/playlist_tabs.cc:311 src/qtui/menus.cc:231
+#: src/qtui/playlist_tabs.cc:336
 msgid "Remo_ve"
 msgstr "Re_tirar"
 
-#: src/gtkui/menus.cc:210
+#: src/gtkui/menus.cc:170 src/qtui/menus.cc:233
 msgid "_Import ..."
 msgstr "_Importar..."
 
-#: src/gtkui/menus.cc:211
+#: src/gtkui/menus.cc:171 src/qtui/menus.cc:234
 msgid "_Export ..."
 msgstr "_Exportar..."
 
-#: src/gtkui/menus.cc:213
+#: src/gtkui/menus.cc:173 src/qtui/menus.cc:237
 msgid "Playlist _Manager ..."
 msgstr "Xestor da _lista de reprodución:"
 
-#: src/gtkui/menus.cc:214 src/qtui/main_window_actions.cc:176
+#: src/gtkui/menus.cc:174 src/qtui/menus.cc:239
 msgid "_Queue Manager ..."
 msgstr "Xestor da _cola"
 
-#: src/gtkui/menus.cc:218 src/qtui/main_window_actions.cc:180
+#: src/gtkui/menus.cc:178 src/qtui/menus.cc:243
 msgid "Volume _Up"
 msgstr "_Subir o volume"
 
-#: src/gtkui/menus.cc:219 src/qtui/main_window_actions.cc:181
+#: src/gtkui/menus.cc:179 src/qtui/menus.cc:245
 msgid "Volume _Down"
 msgstr "_Baixar o volume"
 
-#: src/gtkui/menus.cc:221 src/qtui/main_window_actions.cc:183
-msgid "_Equalizer"
-msgstr "_Ecualizador"
+#: src/gtkui/menus.cc:181 src/qtui/menus.cc:249
+msgid "_Equalizer ..."
+msgstr "_Ecualizador ..."
 
-#: src/gtkui/menus.cc:223 src/qtui/main_window_actions.cc:185
+#: src/gtkui/menus.cc:182 src/qtui/menus.cc:251
 msgid "E_ffects ..."
 msgstr "E_fectos ..."
 
-#: src/gtkui/menus.cc:227
+#: src/gtkui/menus.cc:184
+msgid "_Record Stream"
+msgstr "_Gravar fluxo"
+
+#: src/gtkui/menus.cc:185
+msgid "Audio _Settings ..."
+msgstr "Axu_stes de son ..."
+
+#: src/gtkui/menus.cc:189 src/qtui/menus.cc:260
 msgid "Show _Menu Bar"
 msgstr "Amosar a barra de _menú"
 
-#: src/gtkui/menus.cc:228
+#: src/gtkui/menus.cc:190 src/qtui/menus.cc:262
 msgid "Show I_nfo Bar"
 msgstr "Amosar a barra de i_nformación"
 
-#: src/gtkui/menus.cc:229
+#: src/gtkui/menus.cc:191 src/qtui/menus.cc:264
+msgid "Show Info Bar _Album Art"
+msgstr "Mostrar barra de información _Arte do álbum"
+
+#: src/gtkui/menus.cc:192 src/qtui/menus.cc:266
 msgid "Show Info Bar Vis_ualization"
 msgstr "Amosar a barra de vis_ualización"
 
-#: src/gtkui/menus.cc:230
+#: src/gtkui/menus.cc:193 src/qtui/menus.cc:268
 msgid "Show _Status Bar"
 msgstr "Amosar a barra de e_stado"
 
-#: src/gtkui/menus.cc:232
+#: src/gtkui/menus.cc:195 src/qtui/menus.cc:272
 msgid "Show _Remaining Time"
 msgstr "Amosar o tempo _restante"
 
-#: src/gtkui/menus.cc:234
+#: src/gtkui/menus.cc:197 src/qtui/menus.cc:276 src/skins/menus.cc:157
+#: src/skins-qt/menus.cc:152
 msgid "_Visualizations ..."
 msgstr "_Visualizacións ..."
 
-#: src/gtkui/menus.cc:238 src/qtui/main_window_actions.cc:189
+#: src/gtkui/menus.cc:201 src/qtui/menus.cc:280
 msgid "_File"
 msgstr "_Ficheiro"
 
-#: src/gtkui/menus.cc:239 src/qtui/main_window_actions.cc:190
+#: src/gtkui/menus.cc:202 src/qtui/menus.cc:281
 msgid "_Playback"
 msgstr "_Reproducir"
 
-#: src/gtkui/menus.cc:240 src/qtui/main_window_actions.cc:191
+#: src/gtkui/menus.cc:203 src/qtui/menus.cc:282
 msgid "P_laylist"
 msgstr "_Lista de reprodución"
 
-#: src/gtkui/menus.cc:241 src/gtkui/menus.cc:258
-#: src/qtui/main_window_actions.cc:192
+#: src/gtkui/menus.cc:204 src/gtkui/menus.cc:222 src/qtui/menus.cc:283
+#: src/qtui/menus.cc:312
 msgid "_Services"
 msgstr "_Servicios"
 
-#: src/gtkui/menus.cc:242 src/qtui/main_window_actions.cc:193
+#: src/gtkui/menus.cc:205 src/qtui/menus.cc:284
 msgid "_Output"
 msgstr "Saí_da"
 
-#: src/gtkui/menus.cc:243
+#: src/gtkui/menus.cc:206 src/qtui/menus.cc:285
 msgid "_View"
 msgstr "_Ver"
 
-#: src/gtkui/menus.cc:248
+#: src/gtkui/menus.cc:211 src/qtui/menus.cc:296
 msgid "_Queue/Unqueue"
 msgstr "_Por na cola/retirar da cola"
 
-#: src/gtkui/menus.cc:250
+#: src/gtkui/menus.cc:213 src/qtui/menus.cc:299
 msgid "_Open Containing Folder"
 msgstr "Abrir o cartafol _contedor"
 
-#: src/gtkui/menus.cc:253
+#: src/gtkui/menus.cc:214 src/qtui/menus.cc:301
+msgid "_Refresh Selected"
+msgstr "_Actualizar seleccionados"
+
+#: src/gtkui/menus.cc:216 src/qtui/menus.cc:304
 msgid "Cu_t"
 msgstr "C_ortar"
 
-#: src/gtkui/menus.cc:254
+#: src/gtkui/menus.cc:217 src/qtui/menus.cc:305
 msgid "_Copy"
 msgstr "_Copiar"
 
-#: src/gtkui/menus.cc:255
+#: src/gtkui/menus.cc:218 src/qtui/menus.cc:306
 msgid "_Paste"
 msgstr "_Pegar"
 
-#: src/gtkui/menus.cc:256
+#: src/gtkui/menus.cc:219 src/qtui/menus.cc:307
+msgid "Paste at _End"
+msgstr "P_egar ao final"
+
+#: src/gtkui/menus.cc:220 src/qtui/menus.cc:309
 msgid "Select _All"
 msgstr "Seleccionar _todo"
 
-#: src/gtkui/menus.cc:263
+#: src/gtkui/menus.cc:227 src/moonstone/playlist_tabs.cc:309
+#: src/qtui/playlist_tabs.cc:334
 msgid "_Rename ..."
 msgstr "Cambiar o _nome..."
 
-#: src/gtkui/settings.cc:35
+#: src/gtkui/settings.cc:35 src/qtui/settings.cc:59
+msgid "Always"
+msgstr "Sempre"
+
+#: src/gtkui/settings.cc:36 src/qtui/settings.cc:60
+msgid "Auto-hide"
+msgstr "Ocultar automaticamente"
+
+#: src/gtkui/settings.cc:37 src/qtui/settings.cc:61
+msgid "Never"
+msgstr "Nunca"
+
+#: src/gtkui/settings.cc:41 src/qtui/settings.cc:64
 msgid "Playlist Tabs"
 msgstr "Lapelas da lista de reprodución"
 
-#: src/gtkui/settings.cc:36
-msgid "Always show tabs"
-msgstr "Amosar sempre as lapelas"
+#: src/gtkui/settings.cc:42 src/qtui/settings.cc:65
+msgid "Show playlist tabs:"
+msgstr "Amosar as lapelas das listas de reprodución:"
 
-#: src/gtkui/settings.cc:38
+#: src/gtkui/settings.cc:45 src/qtui/settings.cc:69
 msgid "Show entry counts"
 msgstr "Amosar os contadores da entrada"
 
-#: src/gtkui/settings.cc:40
+#: src/gtkui/settings.cc:47 src/qtui/settings.cc:72
 msgid "Show close buttons"
 msgstr "Amosar os botóns de peche"
 
-#: src/gtkui/settings.cc:42
+#: src/gtkui/settings.cc:49 src/qtui/settings.cc:75
 msgid "Playlist Columns"
 msgstr "Columnas da lista de reprodución"
 
-#: src/gtkui/settings.cc:44
+#: src/gtkui/settings.cc:51 src/qtui/settings.cc:77
 msgid "Show column headers"
 msgstr "Amosar as cabeceiras de columna"
 
-#: src/gtkui/settings.cc:46 src/modplug/plugin_main.cc:106
-#: src/skins/skins_cfg.cc:263
-msgid "Miscellaneous"
-msgstr "Varios"
+#: src/gtkui/settings.cc:53 src/qtui/settings.cc:82
+msgid "Make column headers clickable for sorting"
+msgstr ""
 
-#: src/gtkui/settings.cc:47
-msgid "Arrow keys seek by:"
-msgstr "As teclas de frecha buscan a través de:"
+#: src/gtkui/settings.cc:56
+msgid "Use symbolic icons in toolbar"
+msgstr ""
 
-#: src/gtkui/settings.cc:50
+#: src/gtkui/settings.cc:58 src/qtui/settings.cc:86
 msgid "Scroll on song change"
 msgstr "Avanzar ao cambiar de canción"
 
-#: src/gtkui/ui_gtk.cc:71
+#: src/gtkui/ui_gtk.cc:82
 msgid "GTK Interface"
 msgstr "Interface GTK"
 
-#: src/gtkui/ui_gtk.cc:222 src/skins/ui_main.cc:232
+#: src/gtkui/ui_gtk.cc:219 src/skins/main.cc:228 src/skins-qt/main.cc:231
 #, c-format
 msgid "%s - Audacious"
 msgstr "%s - Audacious"
 
-#: src/gtkui/ui_gtk.cc:225 src/qtui/main_window.cc:186
+#: src/gtkui/ui_gtk.cc:221 src/moonstone/main_window.cc:184
+#: src/qtui/main_window.cc:385
 msgid "Buffering ..."
 msgstr "Almacenando no búfer..."
 
-#: src/gtkui/ui_gtk.cc:228 src/skins/ui_main.cc:234 src/skins/ui_main.cc:1164
+#: src/gtkui/ui_gtk.cc:224 src/pipewire/pipewire.cc:402 src/skins/main.cc:230
+#: src/skins-qt/main.cc:233
 msgid "Audacious"
 msgstr "Audacious"
 
-#: src/gtkui/ui_statusbar.cc:63 src/qtui/status_bar.cc:67
+#: src/gtkui/ui_gtk.cc:487 src/gtkui/ui_gtk.cc:518 src/gtkui/ui_gtk.cc:882
+#: src/hotkey/gui.cc:72 src/moonstone/main_window.cc:67
+#: src/moonstone/main_window.cc:145 src/moonstone/main_window.cc:146
+#: src/notify/osd.cc:85 src/qthotkey/gui.cc:67 src/qtui/main_window.cc:154
+#: src/qtui/main_window.cc:347 src/qtui/main_window.cc:348
+#: src/skins/menus.cc:109 src/skins-qt/menus.cc:100
+msgid "Play"
+msgstr "Reproducir"
+
+#: src/gtkui/ui_gtk.cc:487 src/moonstone/main_window.cc:151
+#: src/moonstone/main_window.cc:152 src/notify/osd.cc:82
+#: src/qtui/main_window.cc:353 src/qtui/main_window.cc:354
+#: src/skins/menus.cc:110 src/skins-qt/menus.cc:101
+msgid "Pause"
+msgstr "Pausa"
+
+#: src/gtkui/ui_gtk.cc:868 src/moonstone/main_window.cc:57
+#: src/qtui/main_window.cc:145 src/skins/menus.cc:86 src/skins-qt/menus.cc:77
+msgid "Search Library"
+msgstr "Buscar unha fonoteca"
+
+#: src/gtkui/ui_gtk.cc:875 src/moonstone/main_window.cc:60
+#: src/qtui/main_window.cc:147
+msgid "Open Files"
+msgstr "Abrir ficheiros"
+
+#: src/gtkui/ui_gtk.cc:876 src/moonstone/main_window.cc:62
+#: src/qtui/main_window.cc:149
+msgid "Add Files"
+msgstr "Engadir ficheiros"
+
+#: src/gtkui/ui_gtk.cc:881 src/moonstone/main_window.cc:65
+#: src/qtui/main_window.cc:152 src/skins/menus.cc:112 src/skins-qt/menus.cc:103
+msgid "Previous"
+msgstr "Anterior"
+
+#: src/gtkui/ui_gtk.cc:883 src/hotkey/gui.cc:74 src/moonstone/main_window.cc:69
+#: src/qthotkey/gui.cc:69 src/qtui/main_window.cc:156 src/skins/menus.cc:111
+#: src/skins-qt/menus.cc:102
+msgid "Stop"
+msgstr "Parar"
+
+#: src/gtkui/ui_gtk.cc:884 src/moonstone/main_window.cc:76 src/notify/osd.cc:89
+#: src/qtui/main_window.cc:163 src/skins/menus.cc:113 src/skins-qt/menus.cc:104
+msgid "Next"
+msgstr "Seguinte"
+
+#: src/gtkui/ui_gtk.cc:886 src/moonstone/main_window.cc:79
+#: src/qtui/main_window.cc:166 src/qtui/menus.cc:254 src/skins/menus.cc:79
+#: src/skins-qt/menus.cc:69
+msgid "Record Stream"
+msgstr "Gravar fluxo"
+
+#: src/gtkui/ui_gtk.cc:919 src/moonstone/main_window.cc:86
+#: src/qtui/main_window.cc:173 src/skins/menus.cc:103 src/skins-qt/menus.cc:94
+msgid "Repeat"
+msgstr "Repetir"
+
+#: src/gtkui/ui_gtk.cc:922 src/moonstone/main_window.cc:89
+#: src/qtui/main_window.cc:176 src/skins/menus.cc:104 src/skins-qt/menus.cc:95
+msgid "Shuffle"
+msgstr "Ao chou"
+
+#: src/gtkui/ui_gtk.cc:1114 src/qtui/main_window.cc:123
+msgid "Menu"
+msgstr "Menú"
+
+#: src/gtkui/ui_statusbar.cc:64 src/qtui/status_bar.cc:155
 msgid "mono"
 msgstr "mono"
 
-#: src/gtkui/ui_statusbar.cc:65 src/qtui/status_bar.cc:69
+#: src/gtkui/ui_statusbar.cc:66 src/qtui/status_bar.cc:157
 msgid "stereo"
 msgstr "estéreo"
 
-#: src/gtkui/ui_statusbar.cc:67 src/qtui/status_bar.cc:71
+#: src/gtkui/ui_statusbar.cc:68 src/qtui/status_bar.cc:160
 #, c-format
 msgid "%d channel"
 msgid_plural "%d channels"
 msgstr0 "%d canle"
 msgstr1 "%d canles"
 
-#: src/gtkui/ui_statusbar.cc:81 src/qtui/status_bar.cc:85
+#: src/gtkui/ui_statusbar.cc:76 src/qtui/status_bar.cc:168
 #, c-format
-msgid "%d kbps"
-msgstr "%d kbps"
+msgid "%d kHz"
+msgstr "%d kHz"
 
-#: src/gtkui/ui_statusbar.cc:107 src/skins/ui_main_evlisteners.cc:103
+#: src/gtkui/ui_statusbar.cc:82 src/qtui/status_bar.cc:174
+#, c-format
+msgid "%d kbit/s"
+msgstr "%d kbit/s"
+
+#: src/gtkui/ui_statusbar.cc:108 src/skins/main.cc:478 src/skins-qt/main.cc:461
 msgid "Single mode."
 msgstr "Modo único."
 
-#: src/gtkui/ui_statusbar.cc:109 src/skins/ui_main_evlisteners.cc:105
+#: src/gtkui/ui_statusbar.cc:110 src/skins/main.cc:480 src/skins-qt/main.cc:463
 msgid "Playlist mode."
 msgstr "Modo da lista de reprodución"
 
-#: src/gtkui/ui_statusbar.cc:117 src/skins/ui_main_evlisteners.cc:111
+#: src/gtkui/ui_statusbar.cc:118 src/skins/main.cc:486 src/skins-qt/main.cc:469
 msgid "Stopping after song."
 msgstr "Parar despois da canción."
 
-#: src/hotkey/gui.cc:71
+#: src/hotkey/gui.cc:71 src/qthotkey/gui.cc:66
 msgid "Previous track"
 msgstr "Pista anterior"
 
-#: src/hotkey/gui.cc:72 src/notify/osd.cc:69 src/qtui/main_window.cc:69
-#: src/qtui/main_window.cc:172 src/qtui/main_window.cc:173
-#: src/skins/menus.cc:87
-msgid "Play"
-msgstr "Reproducir"
-
-#: src/hotkey/gui.cc:73
+#: src/hotkey/gui.cc:73 src/qthotkey/gui.cc:68
 msgid "Pause/Resume"
 msgstr "Pausar/Reiniciar"
 
-#: src/hotkey/gui.cc:74 src/qtui/main_window.cc:70 src/skins/menus.cc:89
-msgid "Stop"
-msgstr "Parar"
-
-#: src/hotkey/gui.cc:75
+#: src/hotkey/gui.cc:75 src/qthotkey/gui.cc:70
 msgid "Next track"
 msgstr "Pista seguinte"
 
-#: src/hotkey/gui.cc:76
-msgid "Forward 5 seconds"
-msgstr "Avanzar 5 segundos"
-
-#: src/hotkey/gui.cc:77
-msgid "Rewind 5 seconds"
-msgstr "Retroceder 5 segundos"
+#: src/hotkey/gui.cc:76 src/qthotkey/gui.cc:71
+msgid "Step forward"
+msgstr "Avanzar"
+
+#: src/hotkey/gui.cc:77 src/qthotkey/gui.cc:72
+msgid "Step backward"
+msgstr "Retroceder"
 
-#: src/hotkey/gui.cc:78
+#: src/hotkey/gui.cc:78 src/qthotkey/gui.cc:73
 msgid "Mute"
 msgstr "Silenciar"
 
-#: src/hotkey/gui.cc:79
+#: src/hotkey/gui.cc:79 src/qthotkey/gui.cc:74
 msgid "Volume up"
 msgstr "Subir o volume"
 
-#: src/hotkey/gui.cc:80
+#: src/hotkey/gui.cc:80 src/qthotkey/gui.cc:75
 msgid "Volume down"
 msgstr "Baixar o volume"
 
-#: src/hotkey/gui.cc:81
+#: src/hotkey/gui.cc:81 src/qthotkey/gui.cc:76
 msgid "Jump to file"
 msgstr "Ir ao ficheiro"
 
-#: src/hotkey/gui.cc:82
+#: src/hotkey/gui.cc:82 src/qthotkey/gui.cc:77
 msgid "Toggle player window(s)"
 msgstr "Cambiar a(s) xanela(s) de reprodución"
 
-#: src/hotkey/gui.cc:83
+#: src/hotkey/gui.cc:83 src/qthotkey/gui.cc:78
 msgid "Show On-Screen-Display"
 msgstr "Mostrar as notificacións OSD"
 
-#: src/hotkey/gui.cc:84
+#: src/hotkey/gui.cc:84 src/qthotkey/gui.cc:79
 msgid "Toggle repeat"
 msgstr "Cambiar a repetición"
 
-#: src/hotkey/gui.cc:85
+#: src/hotkey/gui.cc:85 src/qthotkey/gui.cc:80
 msgid "Toggle shuffle"
 msgstr "Cambiar a reprodución ao chou"
 
-#: src/hotkey/gui.cc:86
+#: src/hotkey/gui.cc:86 src/qthotkey/gui.cc:81
 msgid "Toggle stop after current"
 msgstr "Cambiar a parada despois da actual"
 
-#: src/hotkey/gui.cc:87
+#: src/hotkey/gui.cc:87 src/qthotkey/gui.cc:82
 msgid "Raise player window(s)"
 msgstr "Elevar as xanelas do reprodutor"
 
-#: src/hotkey/gui.cc:97
+#: src/hotkey/gui.cc:98 src/qthotkey/gui.cc:100
 msgid "(none)"
 msgstr "(ningún)"
 
-#: src/hotkey/gui.cc:234
+#: src/hotkey/gui.cc:261
 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 modifiers.\n"
 "\n"
 "Do you want to continue?"
 msgstr ""
@@ -2178,11 +2236,11 @@
 "\n"
 "Quere continuar?"
 
-#: src/hotkey/gui.cc:236
+#: src/hotkey/gui.cc:264
 msgid "Binding mouse buttons"
 msgstr "Asociar botóns do rato"
 
-#: src/hotkey/gui.cc:391
+#: src/hotkey/gui.cc:434
 msgid ""
 "Press a key combination inside a text field.\n"
 "You can also bind mouse buttons."
@@ -2190,72 +2248,100 @@
 "Prema unha combinación de teclas dentro do campo de texto.\n"
 "Tamén pode asociar botóns do rato."
 
-#: src/hotkey/gui.cc:396
+#: src/hotkey/gui.cc:444 src/qthotkey/gui.cc:179
 msgid "Hotkeys:"
 msgstr "Teclas rápidas:"
 
-#: src/hotkey/gui.cc:413
+#: src/hotkey/gui.cc:457 src/qthotkey/gui.cc:181
 msgid "Action:"
 msgstr "Acción"
 
-#: src/hotkey/gui.cc:420
+#: src/hotkey/gui.cc:461 src/qthotkey/gui.cc:182
 msgid "Key Binding:"
 msgstr "Teclas asociadas:"
 
-#: src/hotkey/gui.cc:468
+#: src/hotkey/gui.cc:518 src/qthotkey/gui.cc:184
 msgid "_Add"
 msgstr "_Engadir"
 
-#: src/hotkey/plugin.cc:61
+#: src/hotkey/plugin.cc:59 src/qthotkey/plugin.cc:78
 msgid "Global Hotkeys"
 msgstr "Teclas rápidas globais"
 
-#: src/hotkey/plugin.cc:79
+#: src/hotkey/plugin.cc:74
 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"
+"Contributors 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 ""
-"Engadido de atallos globais\n"
-"Controlar o reproductor con combinacións de teclas globais ou con teclas "
+"Engadido global de teclas de acceso rápido\n"
+"Controle o reprodutor con combinacións de teclas globais ou teclas "
 "multimedia.\n"
 "\n"
-"Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n"
+"Dereitos de autoría (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"
+"Contribuidores:\n"
+"Dereitos de autoría (C) 2006-2007 Vladimir Paskov <vlado.paskov@gmail.com>\n"
+"Dereitos de autoría (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/jack-ng/jack-ng.cc:49
+#: src/jack/jack-ng.cc:54
 msgid "JACK Output"
 msgstr "Saída JACK"
 
-#: src/jack-ng/jack-ng.cc:114
+#: src/jack/jack-ng.cc:126
+msgid "Client name:"
+msgstr "Nome do cliente:"
+
+#: src/jack/jack-ng.cc:128
 msgid "Automatically connect to output ports"
 msgstr "Conectar automaticamente os portos de saída"
 
-#: src/jack-ng/jack-ng.cc:155
+#: src/jack/jack-ng.cc:130
+msgid "Filter ports (regex, use any port if blank):"
+msgstr "Filtrar portos (regex, usar calquera porto baleiro):"
+
+#: src/jack/jack-ng.cc:136
+msgid "Connect to physical ports only"
+msgstr "Conectar só a portos físicos"
+
+#: src/jack/jack-ng.cc:139
+msgid "Upmix to"
+msgstr "Mesturar para"
+
+#: src/jack/jack-ng.cc:141
+msgid "ports if input has fewer channels"
+msgstr "portos se a entrada ten menos canles"
+
+#: src/jack/jack-ng.cc:143
+msgid "Ignore insufficient number of ports"
+msgstr "Ignorar número insuficiente de portos"
+
+#: src/jack/jack-ng.cc:181
+msgid "No JACK output ports were found. Please check settings."
+msgstr "Non se atoparon portos de saída para JACK. Comprobe os axustes."
+
+#: src/jack/jack-ng.cc:195
 #, c-format
 msgid "Only %d JACK output ports were found but %d are required."
 msgstr "Só se atoparon %d portos de saída de JACK, son necesarios %d."
 
-#: src/jack-ng/jack-ng.cc:164
+#: src/jack/jack-ng.cc:210
 #, c-format
 msgid "Failed to connect to JACK port %s."
 msgstr "Produciuse un fallo ao conectar co porto JACK %s."
 
-#: src/jack-ng/jack-ng.cc:184
+#: src/jack/jack-ng.cc:230
 msgid ""
 "JACK supports only floating-point audio. You must change the output bit "
 "depth to floating-point in Audacious settings."
@@ -2263,11 +2349,11 @@
 "JACK só acepta son en punto flotante. Ten que cambiar o bit de profundidade "
 "da saída a punto flotante nos axustes do Audacious."
 
-#: src/jack-ng/jack-ng.cc:197
+#: src/jack/jack-ng.cc:245
 msgid "Failed to connect to the JACK server; is it running?"
 msgstr "Produciuse un fallo ao conectar co servidor JACK; está en execución?"
 
-#: src/jack-ng/jack-ng.cc:273
+#: src/jack/jack-ng.cc:321
 #, c-format
 msgid ""
 "The JACK server requires a sample rate of %d Hz, but Audacious is playing at "
@@ -2277,16 +2363,16 @@
 "está a reproducir cunha taxa de %d Hz. Use o efecto «Convertedor de taxa de "
 "mostraxe» para corrixir esta discordancia."
 
-#: src/ladspa/plugin.cc:414
+#: src/ladspa/plugin.cc:416
 #, c-format
 msgid "%s Settings"
 msgstr "Configuración de %s"
 
-#: src/ladspa/plugin.cc:478
+#: src/ladspa/plugin.cc:482
 msgid "Module paths:"
 msgstr "Rutas dos módulos:"
 
-#: src/ladspa/plugin.cc:483
+#: src/ladspa/plugin.cc:487
 msgid ""
 "Separate multiple paths with a colon.\n"
 "These paths are searched in addition to LADSPA_PATH.\n"
@@ -2296,25 +2382,25 @@
 "Estas rutas empréganse ademais de LADSPA_PATH.\n"
 "Tras engadir as novas rutas, prema Intro para buscar novos engadidos."
 
-#: src/ladspa/plugin.cc:499
+#: src/ladspa/plugin.cc:508
 msgid "Available plugins:"
 msgstr "Engadidos dispoñíbeis:"
 
-#: src/ladspa/plugin.cc:512 src/modplug/plugin_main.cc:92
-#: src/modplug/plugin_main.cc:95 src/modplug/plugin_main.cc:98
-#: src/modplug/plugin_main.cc:101
+#: src/ladspa/plugin.cc:521 src/modplug/plugin_main.cc:91
+#: src/modplug/plugin_main.cc:94 src/modplug/plugin_main.cc:97
+#: src/modplug/plugin_main.cc:100
 msgid "Enable"
 msgstr "Activar"
 
-#: src/ladspa/plugin.cc:518
+#: src/ladspa/plugin.cc:527
 msgid "Enabled plugins:"
 msgstr "Engadidos activados:"
 
-#: src/ladspa/plugin.cc:534
+#: src/ladspa/plugin.cc:543
 msgid "Settings"
 msgstr "Configuración"
 
-#: src/ladspa/plugin.cc:551
+#: src/ladspa/plugin.cc:560
 msgid ""
 "LADSPA Host for Audacious\n"
 "Copyright 2011 John Lindgren"
@@ -2330,7 +2416,7 @@
 msgid "LIRC Plugin"
 msgstr "Engadido LIRC"
 
-#: src/lirc/lirc.cc:381
+#: src/lirc/lirc.cc:379
 msgid ""
 "A simple plugin to control Audacious using the LIRC remote control daemon\n"
 "\n"
@@ -2359,63 +2445,125 @@
 "\n"
 "Para obter máis información sobre LIRC, consulte http://lirc.org."
 
-#: src/lirc/lirc.cc:392
+#: src/lirc/lirc.cc:390
 msgid "Connection"
 msgstr "Conexión"
 
-#: src/lirc/lirc.cc:393
+#: src/lirc/lirc.cc:391
 msgid "Reconnect to LIRC server"
 msgstr "Volver conectar co servidor LIRC"
 
-#: src/lirc/lirc.cc:395
+#: src/lirc/lirc.cc:393
 msgid "Wait before reconnecting:"
 msgstr "Agardar antes de volver conectar:"
 
-#: src/lyricwiki/lyricwiki.cc:41
-msgid "LyricWiki Plugin"
-msgstr "Engadido LyricWiki"
-
-#: src/lyricwiki/lyricwiki.cc:131 src/lyricwiki-qt/lyricwiki.cc:136
-msgid "No lyrics available"
-msgstr "Non hai letras dispoñíbeis"
-
-#: src/lyricwiki/lyricwiki.cc:217 src/lyricwiki/lyricwiki.cc:226
-#: src/lyricwiki/lyricwiki.cc:243 src/lyricwiki/lyricwiki.cc:252
-#: src/lyricwiki/lyricwiki.cc:267 src/lyricwiki-qt/lyricwiki.cc:222
-#: src/lyricwiki-qt/lyricwiki.cc:231 src/lyricwiki-qt/lyricwiki.cc:248
-#: src/lyricwiki-qt/lyricwiki.cc:257 src/lyricwiki-qt/lyricwiki.cc:272
-msgid "Error"
-msgstr "Erro"
-
-#: src/lyricwiki/lyricwiki.cc:218 src/lyricwiki/lyricwiki.cc:244
-#: src/lyricwiki-qt/lyricwiki.cc:223 src/lyricwiki-qt/lyricwiki.cc:249
+#: src/lyrics-common/chart_lyrics_provider.cc:93
+#: src/lyrics-common/chart_lyrics_provider.cc:150
+#: src/lyrics-common/lyrics_ovh_provider.cc:50
 #, c-format
 msgid "Unable to fetch %s"
 msgstr "Non é posibel obter %s"
 
-#: src/lyricwiki/lyricwiki.cc:227 src/lyricwiki/lyricwiki.cc:253
-#: src/lyricwiki-qt/lyricwiki.cc:232 src/lyricwiki-qt/lyricwiki.cc:258
+#: src/lyrics-common/chart_lyrics_provider.cc:100
+#: src/lyrics-common/chart_lyrics_provider.cc:157
+#: src/lyrics-common/lyrics_ovh_provider.cc:57
 #, c-format
 msgid "Unable to parse %s"
 msgstr "Non é posíbel analizar %s"
 
-#: src/lyricwiki/lyricwiki.cc:259 src/lyricwiki-qt/lyricwiki.cc:264
+#: src/lyrics-common/chart_lyrics_provider.cc:121
+#: src/lyrics-common/chart_lyrics_provider.cc:194
+#: src/lyrics-common/lyrics_ovh_provider.cc:88
 msgid "Looking for lyrics ..."
 msgstr "Buscando letras ..."
 
-#: src/lyricwiki/lyricwiki.cc:267 src/lyricwiki-qt/lyricwiki.cc:272
-msgid "Missing song metadata"
-msgstr "Faltan os metadatos da canción"
-
-#: src/lyricwiki/lyricwiki.cc:278 src/lyricwiki-qt/lyricwiki.cc:283
-msgid "Connecting to lyrics.wikia.com ..."
-msgstr "Conectando con lyrics.wikia.com ..."
-
-#: src/lyricwiki-qt/lyricwiki.cc:55
-msgid "LyricWiki Plugin (Qt)"
-msgstr "Engadido LyricWiki (Qt)"
+#: src/lyrics-common/preferences.h:43
+msgid "Nowhere"
+msgstr "Ningún sitio"
+
+#: src/lyrics-common/preferences.h:49
+msgid "Artist is truncated at the start, Title -- at the end"
+msgstr "O artista está truncado ao principio, o título -- á fin"
+
+#: src/lyrics-common/preferences.h:50
+msgid "Chars to truncate on:"
+msgstr "Caracteres para truncar:"
+
+#: src/lyrics-common/preferences.h:54
+msgid "Chars are ORed in RegExp, surrounded by whitespace"
+msgstr ""
+"Os caracteres son ORed en RegExp, rodeados de espazos en branco</"
+"small>"
+
+#: src/lyrics-common/preferences.h:55
+msgid "Chars to split on:"
+msgstr "Caracteres para dividir:"
+
+#: src/lyrics-common/preferences.h:56
+msgid "Further truncate those on chars"
+msgstr "Trunque aínda máis os dos caracteres"
+
+#: src/lyrics-common/preferences.h:62
+msgid "General"
+msgstr "Xeral"
+
+#: src/lyrics-common/preferences.h:63
+msgid "Split title into artist and title on chars"
+msgstr "Divide o título en artista e o título en caracteres"
+
+#: src/lyrics-common/preferences.h:66
+msgid "Sources"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:67
+msgid "Use embedded lyrics (from Lyrics tag)"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:69
+msgid "Fetch lyrics from internet:"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:72
+msgid "Store fetched lyrics in local cache"
+msgstr "Gardar na caché local as letras obtidas"
+
+#: src/lyrics-common/preferences.h:74
+msgid "Local Storage"
+msgstr "Almacenamento local"
+
+#: src/lyrics-common/preferences.h:75
+msgid "Load lyric files (.lrc) from local storage"
+msgstr "Cargar os ficheiros de letras (.lrc) desde o almacenamento local"
+
+#: src/lyrics-common/utils.cc:54 src/ui-common/dialogs-qt.cc:63
+msgid "Error"
+msgstr "Erro"
+
+#: src/lyrics-common/utils.cc:60
+msgid "Lyrics could not be found."
+msgstr "Non foi posíbel atopar a letra."
+
+#: src/lyrics-common/utils.cc:142
+msgid "Missing title and/or artist."
+msgstr "Falta o título e/ou o artista."
+
+#: src/lyrics-gtk/lyrics-gtk.cc:37 src/lyrics-qt/lyrics-qt.cc:50
+msgid "Lyrics"
+msgstr "Letras"
+
+#: src/lyrics-gtk/lyrics-gtk.cc:189 src/lyrics-qt/lyrics-qt.cc:171
+msgid "Edit Lyrics ..."
+msgstr "Editar letra ..."
+
+#: src/lyrics-gtk/lyrics-gtk.cc:195 src/lyrics-qt/lyrics-qt.cc:178
+msgid "Save Locally"
+msgstr "Gardar localmente"
+
+#: src/lyrics-gtk/lyrics-gtk.cc:201 src/lyrics-qt/lyrics-qt.cc:186
+msgid "Refresh"
+msgstr "Actualizar"
 
-#: src/m3u/m3u.cc:32
+#: src/m3u/m3u.cc:33
 msgid "M3U Playlists"
 msgstr "Listas de reprodución M3U"
 
@@ -2423,17 +2571,17 @@
 msgid "Tact Generator"
 msgstr "Xerador de tacto"
 
-#: src/metronom/metronom.cc:147
+#: src/metronom/metronom.cc:145
 #, c-format
 msgid "Tact generator: %d bpm"
 msgstr "Xerador de tacto: %d ppm"
 
-#: src/metronom/metronom.cc:149
+#: src/metronom/metronom.cc:147
 #, c-format
 msgid "Tact generator: %d bpm %d/%d"
 msgstr "Xerador de tacto: %d ppm %d/%d"
 
-#: src/metronom/metronom.cc:237
+#: src/metronom/metronom.cc:235
 msgid ""
 "A Tact Generator by Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
 "\n"
@@ -2447,11 +2595,11 @@
 "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/mixer/mixer.cc:38
+#: src/mixer/mixer.cc:43
 msgid "Channel Mixer"
 msgstr "Mesturador de canles"
 
-#: src/mixer/mixer.cc:202
+#: src/mixer/mixer.cc:255
 msgid ""
 "Channel Mixer Plugin for Audacious\n"
 "Copyright 2011-2012 John Lindgren and Michał Lipski"
@@ -2459,11 +2607,11 @@
 "Engadido Channel Mixer para Audacious\n"
 "Copyright 2011-2012 John Lindgren and Michał Lipski"
 
-#: src/mixer/mixer.cc:206
+#: src/mixer/mixer.cc:259
 msgid "Channel Mixer"
 msgstr "Mesturador de canles"
 
-#: src/mixer/mixer.cc:207
+#: src/mixer/mixer.cc:260
 msgid "Output channels:"
 msgstr "Canles de saída:"
 
@@ -2475,168 +2623,176 @@
 msgid "Error connecting to MMS server"
 msgstr "Produciuse un erro ao conectar co servidor MMS"
 
-#: src/modplug/modplugbmp.h:53
+#: src/modplug/modplugbmp.h:57
 msgid "ModPlug (Module Player)"
 msgstr "ModPlug (modulo reprodutor)"
 
-#: src/modplug/plugin_main.cc:53
-msgid "Resolution"
-msgstr "Resolución"
-
-#: src/modplug/plugin_main.cc:54
-msgid "8-bit"
-msgstr "8-bit"
-
 #: src/modplug/plugin_main.cc:55
-msgid "16-bit"
-msgstr "16-bit"
-
-#: src/modplug/plugin_main.cc:56
 msgid "Channels"
 msgstr "Canles"
 
-#: src/modplug/plugin_main.cc:60
+#: src/modplug/plugin_main.cc:59
 msgid "Nearest (fastest)"
 msgstr "Máis próximo (o máis rápido)"
 
-#: src/modplug/plugin_main.cc:61
+#: src/modplug/plugin_main.cc:60
 msgid "Linear (fast)"
 msgstr "Lineal (rápido)"
 
-#: src/modplug/plugin_main.cc:62
+#: src/modplug/plugin_main.cc:61
 msgid "Spline (good)"
 msgstr "Spline (bo)"
 
-#: src/modplug/plugin_main.cc:63
+#: src/modplug/plugin_main.cc:62
 msgid "Polyphase (best)"
 msgstr "Polifase (o mellor)"
 
-#: src/modplug/plugin_main.cc:64
+#: src/modplug/plugin_main.cc:63
 msgid "Sample rate"
 msgstr "Taxa da mostraxe"
 
-#: src/modplug/plugin_main.cc:65
+#: src/modplug/plugin_main.cc:64
 msgid "22 kHz"
 msgstr "22 kHz"
 
-#: src/modplug/plugin_main.cc:66
+#: src/modplug/plugin_main.cc:65
 msgid "44 kHz"
 msgstr "44 kHz"
 
-#: src/modplug/plugin_main.cc:67
+#: src/modplug/plugin_main.cc:66
 msgid "48 kHz"
 msgstr "48 kHz"
 
-#: src/modplug/plugin_main.cc:68
+#: src/modplug/plugin_main.cc:67
 msgid "96 kHz"
 msgstr "96 kHz"
 
-#: src/modplug/plugin_main.cc:72 src/modplug/plugin_main.cc:77
-#: src/modplug/plugin_main.cc:82
+#: src/modplug/plugin_main.cc:71 src/modplug/plugin_main.cc:76
+#: src/modplug/plugin_main.cc:81
 msgid "Level:"
 msgstr "Nivel:"
 
-#: src/modplug/plugin_main.cc:78
+#: src/modplug/plugin_main.cc:77
 msgid "Cutoff:"
 msgstr "límite de corte:"
 
-#: src/modplug/plugin_main.cc:91
+#: src/modplug/plugin_main.cc:90
 msgid "Reverb"
 msgstr "Reverberación"
 
-#: src/modplug/plugin_main.cc:94
+#: src/modplug/plugin_main.cc:93
 msgid "Bass Boost"
 msgstr "Énfase de graves"
 
-#: src/modplug/plugin_main.cc:97
+#: src/modplug/plugin_main.cc:96
 msgid "Surround"
 msgstr "Son envolvente"
 
-#: src/modplug/plugin_main.cc:100
+#: src/modplug/plugin_main.cc:99
 msgid "Preamp"
 msgstr "Preamplificación"
 
-#: src/modplug/plugin_main.cc:107
+#: src/modplug/plugin_main.cc:106
 msgid "Oversample"
 msgstr "Sobremostraxe"
 
-#: src/modplug/plugin_main.cc:108
+#: src/modplug/plugin_main.cc:107
 msgid "Noise reduction"
 msgstr "Redución de ruído"
 
-#: src/modplug/plugin_main.cc:109
+#: src/modplug/plugin_main.cc:108
 msgid "Play Amiga MODs"
 msgstr "Reproducir os MOD de Amiga"
 
-#: src/modplug/plugin_main.cc:110
+#: src/modplug/plugin_main.cc:109
 msgid "Repeat"
 msgstr "Repetir"
 
-#: src/modplug/plugin_main.cc:111
+#: src/modplug/plugin_main.cc:110
 msgid "Repeat count:"
 msgstr "Contador de repeticións:"
 
-#: src/modplug/plugin_main.cc:112
+#: src/modplug/plugin_main.cc:111
 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.cc:125 src/sid/xs_config.cc:106
+#: src/modplug/plugin_main.cc:124 src/sid/xs_config.cc:106
 msgid "These settings will take effect when Audacious is restarted."
 msgstr "Estes axustes terán efecto após que Audacious sexa reiniciado."
 
+#: src/moonstone/main_window.cc:72 src/moonstone/main_window.cc:73
+#: src/qtui/main_window.cc:159 src/qtui/main_window.cc:160
+#: src/skins/menus.cc:107 src/skins-qt/menus.cc:98
+msgid "Stop After This Song"
+msgstr "Deter despois desta canción"
+
+#: src/moonstone/moonstone.cc:39
+msgid "Moonstone"
+msgstr "Pedra da lúa"
+
+#: src/moonstone/playlist_header.cc:212 src/qtui/playlist_header.cc:258
+msgid "Reset to Defaults"
+msgstr "Restabelecer predeterminados"
+
+#: src/moonstone/playlist_model.cc:38 src/qtui/playlist_header.cc:232
+msgid "Now Playing"
+msgstr "Estase a reproducir"
+
+#: src/moonstone/playlist_selection.cc:66
+#: src/playlist-manager/playlist-manager.cc:201
+#: src/playlist-manager-qt/playlist-manager-qt.cc:190
+msgid "Entries"
+msgstr "Entradas"
+
 #: src/mpg123/mpg123.cc:54
 msgid "MPG123 Plugin"
 msgstr "Engadido MPG123"
 
-#: src/mpg123/mpg123.cc:83
-msgid "Advanced"
-msgstr "Avanzado"
-
-#: src/mpg123/mpg123.cc:84
+#: src/mpg123/mpg123.cc:82
 msgid "Use accurate length calculation (slow)"
 msgstr "Utilizar o cálculo de duración exacta (lento)"
 
-#: src/mpg123/mpg123.cc:248
+#: src/mpg123/mpg123.cc:260
 msgid "Surround"
 msgstr "Son envolvente"
 
-#: src/mpris2/plugin.cc:39
+#: src/mpris2/plugin.cc:40
 msgid "MPRIS 2 Server"
 msgstr "Servidor MPRIS 2"
 
-#: src/neon/neon.cc:97
+#: src/neon/neon.cc:102
 msgid "Neon HTTP/HTTPS Plugin"
 msgstr "Engadido Neon HTTP/HTTPS"
 
-#: src/neon/neon.cc:521
+#: src/neon/neon.cc:526
 msgid "Error parsing redirect"
 msgstr "Erro de análise de redireccionamento"
 
-#: src/neon/neon.cc:535
+#: src/neon/neon.cc:540
 msgid "Unknown HTTP error"
 msgstr "Erro HTTP descoñecido"
 
-#: src/neon/neon.cc:569
+#: src/neon/neon.cc:614
 msgid "Error parsing URL"
 msgstr "Erro de análise de URL"
 
-#: src/neon/neon.cc:632
+#: src/neon/neon.cc:687
 msgid "Too many redirects"
 msgstr "Demasiadas redireccións"
 
-#: src/notify/event.cc:64
+#: src/notify/event.cc:97
 msgid "Stopped"
 msgstr "Parado"
 
-#: src/notify/event.cc:64
+#: src/notify/event.cc:97
 msgid "Audacious is not playing."
 msgstr "Audacious non está a reproducir nada."
 
-#: src/notify/notify.cc:42
+#: src/notify/notify.cc:39
 msgid "Desktop Notifications"
 msgstr "Notificacións de escritorio"
 
-#: src/notify/notify.cc:60
+#: src/notify/notify.cc:57
 msgid ""
 "Desktop Notifications Plugin for Audacious\n"
 "Copyright (C) 2010 Maximilian Bogner\n"
@@ -2672,36 +2828,79 @@
 "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.cc:110
+#: src/notify/notify.cc:104
 msgid "Show playback controls"
 msgstr "Amosar os controis de reprodución"
 
-#: src/notify/notify.cc:112
+#: src/notify/notify.cc:106
 msgid "Always show notification"
 msgstr "Amosar sempre a notificación"
 
-#: src/notify/notify.cc:114
+#: src/notify/notify.cc:108
 msgid "Include album name in notification"
 msgstr "Incluír o nome do álbum na notificación"
 
-#: src/notify/osd.cc:58
+#: src/notify/notify.cc:110
+msgid "Custom notification duration:"
+msgstr "Personalizar a duración da notificación:"
+
+#: src/notify/osd.cc:74
 msgid "Show"
 msgstr "Amosar"
 
-#: src/notify/osd.cc:66 src/qtui/main_window.cc:178
-#: src/qtui/main_window.cc:179 src/skins/menus.cc:88
-msgid "Pause"
-msgstr "Pausa"
+#: src/openmpt/mpt.cc:50
+msgid "OpenMPT (Module Player)"
+msgstr "OpenMPT (reprodutor de módulos)"
 
-#: src/notify/osd.cc:73 src/qtui/main_window.cc:72 src/skins/menus.cc:91
-msgid "Next"
-msgstr "Seguinte"
+#: src/openmpt/mpt.cc:132
+msgid ""
+"Module player based on libopenmpt\n"
+"\n"
+"Written by: Chris Spiegel <cspiegel@gmail.com>"
+msgstr ""
+"Reprodutor de módulos baseado en libopenmpt\n"
+"\n"
+"Escrito por: Chris Spiegel <cspiegel@gmail.com>"
 
-#: src/oss4/oss.h:93
+#: src/openmpt/mpt.cc:151
+msgid "Stereo separation:"
+msgstr "Separación estéreo:"
+
+#: src/openmpt/mpt.cc:153
+msgid "% (0=mono, 100=default, 200=full)"
+msgstr ""
+
+#: src/openmpt/mpt.cc:157
+msgid "Interpolation:"
+msgstr "Interpolación"
+
+#: src/openmpt/mptwrap.h:51 src/soxr/sox-resampler.cc:189 src/xsf/plugin.cc:437
+msgid "Linear"
+msgstr "Lineal"
+
+#: src/openmpt/mptwrap.h:52
+msgid "Cubic"
+msgstr "Cúbico"
+
+#: src/openmpt/mptwrap.h:53
+msgid "Windowed sinc"
+msgstr "Sincronización de xanelas"
+
+#: src/opus/opus.cc:39
+msgid "Opus Decoder"
+msgstr ""
+
+#: src/opus/opus.cc:336
+msgid ""
+"Opus Decoder Plugin for Audacious\n"
+"Copyright 2022 Thomas Lange"
+msgstr ""
+
+#: src/oss4/oss.h:70
 msgid "OSS4 Output"
 msgstr "Saída OSS4"
 
-#: src/oss4/oss.h:95
+#: src/oss4/oss.h:72
 msgid "OSS3 Output"
 msgstr "Saída OSS3"
 
@@ -2709,27 +2908,27 @@
 msgid "Default device"
 msgstr "Dispositivo predeterminado"
 
-#: src/oss4/plugin.cc:77
+#: src/oss4/plugin.cc:78
 msgid "Audio device:"
 msgstr "Dispositivo de son:"
 
-#: src/oss4/plugin.cc:80
+#: src/oss4/plugin.cc:81
 msgid "Use alternate device:"
 msgstr "Empregar un dispositivo alternativo:"
 
-#: src/oss4/plugin.cc:84
+#: src/oss4/plugin.cc:85
 msgid "Save volume between sessions."
 msgstr "Gardar o volume entre sesións."
 
-#: src/oss4/plugin.cc:86
+#: src/oss4/plugin.cc:87
 msgid "Enable format conversions made by the OSS software."
 msgstr "Activar as conversións de formato realizadas plo software OSS."
 
-#: src/oss4/plugin.cc:88
+#: src/oss4/plugin.cc:89
 msgid "Enable exclusive mode to prevent virtual mixing."
 msgstr "Activar o modo exclusivo para impedir a mestura virtual."
 
-#: src/oss4/plugin.cc:100
+#: src/oss4/plugin.cc:101
 msgid ""
 "OSS4 Output Plugin for Audacious\n"
 "Copyright 2010-2012 Michał Lipski\n"
@@ -2743,19 +2942,35 @@
 "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/playlist-manager/playlist-manager.cc:37
+#: src/pipewire/pipewire.cc:44
+msgid "PipeWire Output"
+msgstr ""
+
+#: src/pipewire/pipewire.cc:118
+msgid ""
+"PipeWire Output Plugin for Audacious\n"
+"Copyright 2022 Thomas Lange\n"
+"\n"
+"Based on the PipeWire Output Plugin for Qmmp\n"
+"Copyright 2021 Ilya Kotov"
+msgstr ""
+
+#: src/pipewire/pipewire.cc:408 src/skins/menus.cc:88 src/skins-qt/menus.cc:79
+msgid "Playback"
+msgstr "Reprodución"
+
+#: src/playlist-manager/playlist-manager.cc:38
+#: src/playlist-manager-qt/playlist-manager-qt.cc:42
 msgid "Playlist Manager"
 msgstr "Xestor da lista de reprodución:"
 
-#: src/playlist-manager/playlist-manager.cc:226
-msgid "Entries"
-msgstr "Entradas"
-
-#: src/playlist-manager/playlist-manager.cc:245
+#: src/playlist-manager/playlist-manager.cc:221
+#: src/playlist-manager-qt/playlist-manager-qt.cc:356
 msgid "_Remove"
 msgstr "_Retirar"
 
-#: src/playlist-manager/playlist-manager.cc:246
+#: src/playlist-manager/playlist-manager.cc:222
+#: src/playlist-manager-qt/playlist-manager-qt.cc:351
 msgid "Ren_ame"
 msgstr "Re_nomear"
 
@@ -2763,32 +2978,47 @@
 msgid "PLS Playlists"
 msgstr "Listas de reprodución PLS"
 
-#: src/psf/plugin.cc:45
+#: src/psf/plugin.cc:53
 msgid "OpenPSF PSF1/PSF2 Decoder"
 msgstr "Descodificador OpenPSF PSF1/PSF2"
 
-#: src/pulse_audio/pulse_audio.cc:38
+#: src/psf/plugin.cc:270
+msgid "OpenPSF Configuration"
+msgstr "Axustes do OpenPSF"
+
+#: src/psf/plugin.cc:271 src/xsf/plugin.cc:444
+msgid "Ignore length from file"
+msgstr "Ignorar a duración do ficheiro"
+
+#: src/pulse/pulse_audio.cc:42
 msgid "PulseAudio Output"
 msgstr "Saída PulseAudio"
 
-#: src/pulse_audio/pulse_audio.cc:611
+#: src/pulse/pulse_audio.cc:84
+msgid "Context name:"
+msgstr "Nome de contexto:"
+
+#: src/pulse/pulse_audio.cc:86
+msgid "Stream name:"
+msgstr "Nome do fluxo:"
+
+#: src/pulse/pulse_audio.cc:596
 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"
+"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\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."
+"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 de saída PulseAudio para Audacious\n"
 "\n"
@@ -2807,11 +3037,11 @@
 "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
 "USA."
 
-#: src/qtaudio/qtaudio.cc:49
+#: src/qtaudio/qtaudio.cc:53
 msgid "QtMultimedia Output"
 msgstr "Saída QtMultimedia"
 
-#: src/qtaudio/qtaudio.cc:77
+#: src/qtaudio/qtaudio.cc:84
 msgid ""
 "QtMultimedia Audio Output Plugin for Audacious\n"
 "Copyright 2014 William Pitcock\n"
@@ -2825,50 +3055,109 @@
 "Baseado no engadido de saída SDL para Audacious\n"
 "Copyright 2010 John Lindgren"
 
-#: src/qtui/dialog_windows.cc:31
-msgid "Working ..."
-msgstr "Traballando..."
+#: src/qtglspectrum/gl-spectrum.cc:41
+msgid ""
+"OpenGL Spectrum Analyzer for Audacious\n"
+"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
+"Copyright 2014, 2020 Ariadne Conill\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é, John Lindgren e Carlo Bramini\n"
+"Copyright 2014, 2020 Ariadne Conill\n"
+"\n"
+"Baseado no complemento XMMS:\n"
+"Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson e "
+"4Front Technologies\n"
+"\n"
+"Licenza: GPLv2+"
 
-#: src/qtui/filter_input.cc:44 src/skins/ui_playlist.cc:221
-msgid "Search"
-msgstr "Busca"
+#: src/qthotkey/gui.cc:177
+msgid "Press a key combination inside a text field."
+msgstr "Prema unha combinación de teclas dentro dun campo de texto."
 
-#: src/qtui/main_window_actions.cc:94
+#: src/qthotkey/plugin.cc:105
+msgid ""
+"Global Hotkey Plugin\n"
+"Control the player with global key combinations or multimedia keys.\n"
+"\n"
+"Copyright (C) 2020 i.Dark_Templar <darktemplar@dark-templar-archives.net>\n"
+"Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n"
+"\n"
+"Contributors 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 ""
+"Complemento global de teclas rápidas\n"
+"Controla o reprodutor con combinacións de teclas globais ou teclas "
+"multimedia.\n"
+"\n"
+"Copyright (C) 2020 i.Dark_Templar <darktemplar@dark-templar-archives.net>\n"
+"Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n"
+"\n"
+"Os colaboradores inclúen:\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/qtui/menus.cc:109
 msgid "_Open Folder ..."
 msgstr "_Abrir o cartafol ..."
 
-#: src/qtui/main_window_actions.cc:96
+#: src/qtui/menus.cc:115
 msgid "_Add Folder ..."
 msgstr "_Engadir un cartafol ..."
 
-#: src/qtui/main_window_actions.cc:101
+#: src/qtui/menus.cc:128
 msgid "_Log Inspector ..."
 msgstr "Inspector do _rexistro ..."
 
-#: src/qtui/main_window.cc:64
-msgid "Open Files"
-msgstr "Abrir ficheiros"
+#: src/qtui/menus.cc:220
+msgid "_Find ..."
+msgstr "_Buscar ..."
 
-#: src/qtui/main_window.cc:66
-msgid "Add Files"
-msgstr "Engadir ficheiros"
+#: src/qtui/menus.cc:256 src/skins/menus.cc:80 src/skins-qt/menus.cc:70
+msgid "Audio Settings ..."
+msgstr "Axustes de son ..."
 
-#: src/qtui/main_window.cc:71 src/skins/menus.cc:90
-msgid "Previous"
-msgstr "Anterior"
+#: src/qtui/playlist_model.cc:188
+msgid "Q#"
+msgstr "Q#"
 
-#: src/qtui/main_window.cc:77 src/skins/menus.cc:82
-msgid "Repeat"
-msgstr "Repetir"
+#: src/qtui/playlist_model.cc:190
+msgid "T#"
+msgstr "T#"
 
-#: src/qtui/main_window.cc:79 src/skins/menus.cc:83
-msgid "Shuffle"
-msgstr "Ao chou"
+#: src/qtui/playlist_model.cc:192
+msgid "C#"
+msgstr ""
+
+#: src/qtui/playlist_model.cc:194
+msgid "D#"
+msgstr ""
 
-#: src/qtui/qtui.cc:42
+#: src/qtui/qtui.cc:40
 msgid "Qt Interface"
 msgstr "Interface Qt"
 
+#: src/qtui/search_bar.cc:46
+msgid "Search playlist"
+msgstr "Buscar na lista"
+
+#: src/qtui/settings.cc:79
+msgid "Use bold font for column headers"
+msgstr "Use o tipo de letra en grosa para os encabezados das columnas"
+
 #: src/resample/resample.cc:43
 msgid "Sample Rate Converter"
 msgstr "Convertedor de taxa de mostraxe"
@@ -2909,7 +3198,7 @@
 msgid "Method:"
 msgstr "Método:"
 
-#: src/resample/resample.cc:199 src/sox-resampler/sox-resampler.cc:161
+#: src/resample/resample.cc:199 src/soxr/sox-resampler.cc:203
 msgid "Rate:"
 msgstr "Taxa:"
 
@@ -2961,66 +3250,53 @@
 msgid "192 kHz:"
 msgstr "192 kHz:"
 
-#: src/scrobbler2/config_window.cc:41
-#, c-format
-msgid "OK. Scrobbling for user: %s"
-msgstr "Aceptar. Scrobbling para o usuario: %s"
+#: src/scrobbler2/config_window.cc:29
+msgid "Checking Last.fm access ..."
+msgstr "Comprobando o acceso a Last.fm..."
 
-#: src/scrobbler2/config_window.cc:54
-msgid "Permission Denied"
-msgstr "Permiso denegado"
-
-#: src/scrobbler2/config_window.cc:56
-msgid "Access the following link to allow Audacious to scrobble your plays:"
+#: src/scrobbler2/config_window.cc:35
+msgid ""
+"Your scrobbles are being saved on your computer temporarily. They will be "
+"submitted as soon as Audacious is allowed access."
 msgstr ""
-"Acceda á seguinte ligazón para permitirlle a Audacious enviar o rexistro das "
-"súas escoitas:"
+"Os seus «scrobbles» estanse gardando no computador temporalmente. Serán "
+"enviados tan pronto como o Audacious teña permitido o acceso."
 
-#: src/scrobbler2/config_window.cc:66
-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.cc:41
+#, c-format
+msgid "Permission granted. Scrobbling for user %s."
+msgstr "Permiso concedido. Facendo «scrobbling» para o usuario %s."
 
-#: src/scrobbler2/config_window.cc:69 src/scrobbler2/config_window.cc:80
+#: src/scrobbler2/config_window.cc:44
 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."
+"Permission denied. Open the following URL in a browser, allow Audacious "
+"access to your account, and then click 'Check Permission' again:"
 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.cc:77
-msgid "Network Problem."
-msgstr "Problema na rede."
+"Permiso rexeitado. Abra a seguinte URL nun navegador, permita que o "
+"Audacious teña acceso á súa conta e prema en «Comprobar permiso» de novo:"
 
-#: src/scrobbler2/config_window.cc:78
-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/scrobbler2/config_window.cc:53
+msgid "There was a problem contacting Last.fm."
+msgstr "Produciuse un problema contactando con Last.fm"
 
-#: src/scrobbler2/config_window.cc:110
-msgid "Checking..."
-msgstr "Comprobando..."
+#: src/scrobbler2/config_window.cc:92
+msgid "Check Permission"
+msgstr "Comprobar permiso"
 
-#: src/scrobbler2/config_window.cc:176
-msgid "C_heck Permission"
-msgstr "C_omprobación de permisos"
+#: src/scrobbler2/config_window.cc:93
+msgid "Revoke Permission"
+msgstr "Revogar permiso"
 
-#: src/scrobbler2/config_window.cc:177
-msgid "_Revoke Permission"
-msgstr "_Revogar o permiso"
-
-#: src/scrobbler2/config_window.cc:220
-msgid ""
-"You need to allow Audacious to scrobble tracks to your Last.fm account.\n"
+#: src/scrobbler2/config_window.cc:97
+msgid "You need to allow Audacious to scrobble tracks to your Last.fm account."
 msgstr ""
-"Ten que autorizar a súa conta en Last.fm para que poida seguir (scrobble) as "
-"súas pistas.\n"
+"Debe permitir a Audacious facer «scrobble» ás pistas na conta de Last.fm."
 
 #: src/scrobbler2/scrobbler.cc:29
 msgid "Scrobbler 2.0"
 msgstr "Scrobbler 2.0"
 
-#: src/scrobbler2/scrobbler.cc:224
+#: src/scrobbler2/scrobbler.cc:200
 msgid ""
 "The Scrobbler plugin could not be started.\n"
 "There might be a problem with your installation."
@@ -3028,36 +3304,21 @@
 "Non foi posíbel iniciar o engadido de Scrobbler.\n"
 "Semella que hai un problema de instalación."
 
-#: src/scrobbler2/scrobbler.cc:289
+#: src/scrobbler2/scrobbler.cc:245
 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"
+"project."
 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"
 
-#: src/scrobbler2/scrobbler_communication.cc:642
-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/sdlout.cc:48
+#: src/sdlout/sdlout.cc:43
 msgid "SDL Output"
 msgstr "Saída SDL"
 
-#: src/sdlout/sdlout.cc:77
+#: src/sdlout/sdlout.cc:72
 msgid ""
 "SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
@@ -3065,56 +3326,43 @@
 "Engadido SDL Output para Audacious\n"
 "Copyright 2010 John Lindgren"
 
-#: src/search-tool/search-tool.cc:116 src/search-tool/search-tool.cc:124
+#: src/search-tool/library.cc:35 src/search-tool/library.cc:46
+#: src/search-tool-qt/library.cc:35 src/search-tool-qt/library.cc:46
 msgid "Library"
 msgstr "Biblioteca"
 
-#: src/search-tool/search-tool.cc:394
-#, c-format
-msgid "%d result"
-msgid_plural "%d results"
-msgstr0 "%d resultado"
-msgstr1 "%d resultados"
-
-#: src/search-tool/search-tool.cc:400
-#, c-format
-msgid "(%d hidden)"
-msgid_plural "(%d hidden)"
-msgstr0 "(%d agochado)"
-msgstr1 "(%d agochados)"
-
-#: src/search-tool/search-tool.cc:594
+#: src/search-tool-qt/search-model.cc:44 src/search-tool/search-tool.cc:287
 #, c-format
 msgid "%d song"
 msgid_plural "%d songs"
 msgstr0 "%d canción"
 msgstr1 "%d cancións"
 
-#: src/search-tool/search-tool.cc:601
+#: src/search-tool-qt/search-model.cc:53 src/search-tool/search-tool.cc:294
 msgid "of this genre"
 msgstr "deste xénero"
 
-#: src/search-tool/search-tool.cc:607
+#: src/search-tool-qt/search-model.h:47 src/search-tool/search-model.h:45
 msgid "on"
 msgstr "en"
 
-#: src/search-tool/search-tool.cc:607
+#: src/search-tool-qt/search-model.h:47 src/search-tool/search-model.h:45
 msgid "by"
 msgstr "por"
 
-#: src/search-tool/search-tool.cc:643
-msgid "_Create Playlist"
-msgstr "_Crear unha lista de reprodución"
-
-#: src/search-tool/search-tool.cc:645
-msgid "_Add to Playlist"
-msgstr "_Engadir á lista de reprodución"
-
-#: src/search-tool/search-tool.cc:684
-msgid "Search library"
-msgstr "Buscar unha fonoteca"
+#: src/search-tool-qt/search-tool-qt.cc:165 src/search-tool/search-tool.cc:74
+msgid "Number of results to show:"
+msgstr "Número de resultados a mostrar:"
+
+#: src/search-tool-qt/search-tool-qt.cc:168 src/search-tool/search-tool.cc:77
+msgid "Rescan library at startup"
+msgstr "Revisar a biblioteca ao iniciar"
+
+#: src/search-tool-qt/search-tool-qt.cc:170
+msgid "Monitor library for changes"
+msgstr "Vixiar se hai cambios na biblioteca"
 
-#: src/search-tool/search-tool.cc:688
+#: src/search-tool-qt/search-tool-qt.cc:193 src/search-tool/search-tool.cc:450
 msgid ""
 "To import your music library into Audacious, choose a folder and then click "
 "the \"refresh\" icon."
@@ -3122,22 +3370,44 @@
 "Para importar a súa fonoteca en Audacious, escolla un cartafol e prema na "
 "icona «Actualizar»."
 
-#: src/search-tool/search-tool.cc:696
+#: src/search-tool-qt/search-tool-qt.cc:195 src/search-tool/search-tool.cc:459
 msgid "Please wait ..."
 msgstr "Agarde..."
 
-#: src/search-tool/search-tool.cc:723
+#: src/search-tool-qt/search-tool-qt.cc:197 src/search-tool/search-tool.cc:487
 msgid "Choose Folder"
 msgstr "Escolla un cartafol"
 
+#: src/search-tool-qt/search-tool-qt.cc:201 src/search-tool/search-tool.cc:445
+msgid "Search library"
+msgstr "Buscar unha fonoteca"
+
+#: src/search-tool-qt/search-tool-qt.cc:327 src/search-tool/search-tool.cc:156
+#, c-format
+msgid "%d of %d result shown"
+msgid_plural "%d of %d results shown"
+msgstr0 "%d de %d resultado mostrado"
+msgstr1 "%d de %d resultados mostrados"
+
+#: src/search-tool-qt/search-tool-qt.cc:331 src/search-tool/search-tool.cc:160
+#, c-format
+msgid "%d result"
+msgid_plural "%d results"
+msgstr0 "%d resultado"
+msgstr1 "%d resultados"
+
+#: src/search-tool-qt/search-tool-qt.cc:501 src/search-tool/search-tool.cc:341
+msgid "_Create Playlist"
+msgstr "_Crear unha lista de reprodución"
+
+#: src/search-tool-qt/search-tool-qt.cc:503 src/search-tool/search-tool.cc:343
+msgid "_Add to Playlist"
+msgstr "_Engadir á lista de reprodución"
+
 #: src/sid/xmms-sid.cc:43
 msgid "SID Player"
 msgstr "Reprodutor SID"
 
-#: src/sid/xs_config.cc:61
-msgid "Output"
-msgstr "Saída"
-
 #: src/sid/xs_config.cc:62
 msgid "Channels:"
 msgstr "Canles:"
@@ -3218,741 +3488,684 @@
 msgid "Threshold:"
 msgstr "Limiar:"
 
-#: src/silence-removal/silence-removal.cc:70
-msgid "dB"
-msgstr "dB"
+#: src/skins/actions.cc:45 src/skins-qt/actions.cc:43
+msgid "Repeat points cleared."
+msgstr "Repetir os puntos limpados"
+
+#: src/skins/actions.cc:60 src/skins-qt/actions.cc:58
+msgid "Repeat point A set."
+msgstr "Repetir o punto de axuste A."
+
+#: src/skins/actions.cc:65 src/skins-qt/actions.cc:63
+msgid "Repeat point B set."
+msgstr "Repetir o punto de axuste B."
+
+#: src/skins/equalizer.cc:223 src/skins-qt/equalizer.cc:223
+msgid "Preamp"
+msgstr "Preamplificador"
+
+#: src/skins/equalizer.cc:227 src/skins-qt/equalizer.cc:227
+msgid "31 Hz"
+msgstr "31 Hz"
 
-#: src/skins/menus.cc:64
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "63 Hz"
+msgstr "63 Hz"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "125 Hz"
+msgstr "125 Hz"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "250 Hz"
+msgstr "250 Hz"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "500 Hz"
+msgstr "500 Hz"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "1 kHz"
+msgstr "1 kHz"
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "2 kHz"
+msgstr "2 kHz"
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "4 kHz"
+msgstr "4 kHz"
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "8 kHz"
+msgstr "8 kHz"
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "16 kHz"
+msgstr "16 kHz"
+
+#: src/skins/equalizer.cc:270 src/skins-qt/equalizer.cc:270
+msgid "Audacious Equalizer"
+msgstr "Ecualizador do Audacious"
+
+#: src/skins/main.cc:459 src/skins-qt/main.cc:442
+msgid "Recording on"
+msgstr "Iniciar gravación"
+
+#: src/skins/main.cc:461 src/skins-qt/main.cc:444
+msgid "Recording off"
+msgstr "Parar gravación"
+
+#: src/skins/main.cc:754 src/skins-qt/main.cc:701
+#, c-format
+msgid "Seek to %d:%-2.2d / %d:%-2.2d"
+msgstr "Ir a %d:%-2.2d / %d:%-2.2d"
+
+#: src/skins/main.cc:771 src/skins-qt/main.cc:718
+#, c-format
+msgid "Volume: %d%%"
+msgstr "Volume: %d%%"
+
+#: src/skins/main.cc:784 src/skins-qt/main.cc:731
+#, c-format
+msgid "Balance: %d%% left"
+msgstr "Balance: %d%% esquerda"
+
+#: src/skins/main.cc:786 src/skins-qt/main.cc:733
+msgid "Balance: center"
+msgstr "Balance: centro"
+
+#: src/skins/main.cc:788 src/skins-qt/main.cc:735
+#, c-format
+msgid "Balance: %d%% right"
+msgstr "Balance: %d%% dereita"
+
+#: src/skins/main.cc:880 src/skins-qt/main.cc:827
+msgid "Options Menu"
+msgstr "Menú de opcións"
+
+#: src/skins/main.cc:884 src/skins-qt/main.cc:831
+msgid "Disable 'Always On Top'"
+msgstr "Desactivar «Sempre enriba»"
+
+#: src/skins/main.cc:886 src/skins-qt/main.cc:833
+msgid "Enable 'Always On Top'"
+msgstr "Activar «Sempre enriba»"
+
+#: src/skins/main.cc:889 src/skins-qt/main.cc:836
+msgid "File Info Box"
+msgstr "Caixa de información do ficheiro"
+
+#: src/skins/main.cc:892 src/skins/menus.cc:149 src/skins-qt/main.cc:839
+#: src/skins-qt/menus.cc:142
+msgid "Double Size"
+msgstr "Tamaño dobre"
+
+#: src/skins/main.cc:895 src/skins-qt/main.cc:842
+msgid "Visualizations"
+msgstr "Vistas"
+
+#: src/skins/menus.cc:74 src/skins-qt/menus.cc:64
+msgid "Volume Up"
+msgstr "Subir volume"
+
+#: src/skins/menus.cc:75 src/skins-qt/menus.cc:65
+msgid "Volume Down"
+msgstr "Baixar volume"
+
+#: src/skins/menus.cc:77 src/skins-qt/menus.cc:67
+msgid "Effects ..."
+msgstr "Efectos ..."
+
+#: src/skins/menus.cc:84 src/skins-qt/menus.cc:74
 msgid "Open Files ..."
 msgstr "Abrir ficheiros ..."
 
-#: src/skins/menus.cc:65
+#: src/skins/menus.cc:85 src/skins-qt/menus.cc:76
 msgid "Open URL ..."
 msgstr "Abrir un URL ..."
 
-#: src/skins/menus.cc:66
-msgid "Search Library"
-msgstr "Buscar unha fonoteca"
-
-#: src/skins/menus.cc:68
-msgid "Playback"
-msgstr "Reprodución"
-
-#: src/skins/menus.cc:69
+#: src/skins/menus.cc:89 src/skins-qt/menus.cc:80
 msgid "Playlist"
 msgstr "Lista de reprodución"
 
-#: src/skins/menus.cc:70
+#: src/skins/menus.cc:90 src/skins-qt/menus.cc:81
+msgid "Output"
+msgstr "Saída"
+
+#: src/skins/menus.cc:91 src/skins-qt/menus.cc:82
 msgid "View"
 msgstr "Ver"
 
-#: src/skins/menus.cc:72 src/skins/menus.cc:136 src/skins/menus.cc:149
-#: src/skins/menus.cc:214
+#: src/skins/menus.cc:93 src/skins/menus.cc:161 src/skins/menus.cc:174
+#: src/skins/menus.cc:245 src/skins-qt/menus.cc:84 src/skins-qt/menus.cc:156
+#: src/skins-qt/menus.cc:170 src/skins-qt/menus.cc:241
 msgid "Services"
 msgstr "Servizos"
 
-#: src/skins/menus.cc:74
+#: src/skins/menus.cc:95 src/skins-qt/menus.cc:86
 msgid "About ..."
 msgstr "Sobre ..."
 
-#: src/skins/menus.cc:75
+#: src/skins/menus.cc:96 src/skins-qt/menus.cc:87
 msgid "Settings ..."
 msgstr "Axustes ..."
 
-#: src/skins/menus.cc:76
+#: src/skins/menus.cc:97 src/skins-qt/menus.cc:88
 msgid "Quit"
 msgstr "Saír"
 
-#: src/skins/menus.cc:80 src/skins/menus.cc:206
+#: src/skins/menus.cc:101 src/skins/menus.cc:235 src/skins-qt/menus.cc:92
+#: src/skins-qt/menus.cc:231
 msgid "Song Info ..."
 msgstr "Información da canción ..."
 
-#: src/skins/menus.cc:84
+#: src/skins/menus.cc:105 src/skins-qt/menus.cc:96
+msgid "Shuffle by Album"
+msgstr "Ao chou por álbum"
+
+#: src/skins/menus.cc:106 src/skins-qt/menus.cc:97
 msgid "No Playlist Advance"
 msgstr "Non avanzar na lista de reprodución"
 
-#: src/skins/menus.cc:85
-msgid "Stop After This Song"
-msgstr "Deter despois desta canción"
-
-#: src/skins/menus.cc:93
+#: src/skins/menus.cc:117 src/skins-qt/menus.cc:108
 msgid "Set A-B Repeat"
 msgstr "Estabelecer a repetición A-B"
 
-#: src/skins/menus.cc:94
+#: src/skins/menus.cc:118 src/skins-qt/menus.cc:109
 msgid "Clear A-B Repeat"
 msgstr "Limpar a repetición A-B"
 
-#: src/skins/menus.cc:96
+#: src/skins/menus.cc:120 src/skins-qt/menus.cc:111
 msgid "Jump to Song ..."
 msgstr "Saltar á canción ..."
 
-#: src/skins/menus.cc:97
+#: src/skins/menus.cc:121 src/skins-qt/menus.cc:113
 msgid "Jump to Time ..."
 msgstr "Saltar no tempo ..."
 
-#: src/skins/menus.cc:101
+#: src/skins/menus.cc:125 src/skins-qt/menus.cc:118
 msgid "Play/Resume"
 msgstr "Reproducir/Continuar"
 
-#: src/skins/menus.cc:103
+#: src/skins/menus.cc:127 src/skins-qt/menus.cc:120
 msgid "New Playlist"
 msgstr "Nova lista de reprodución"
 
-#: src/skins/menus.cc:104
+#: src/skins/menus.cc:128 src/skins-qt/menus.cc:121
 msgid "Rename Playlist ..."
 msgstr "Renomear a lista de reprodución ..."
 
-#: src/skins/menus.cc:105
+#: src/skins/menus.cc:129 src/skins-qt/menus.cc:122
 msgid "Remove Playlist"
 msgstr "Retirar a lista de reprodución"
 
-#: src/skins/menus.cc:107
+#: src/skins/menus.cc:131 src/skins-qt/menus.cc:124
 msgid "Previous Playlist"
 msgstr "Lista de reprodución anterior"
 
-#: src/skins/menus.cc:108
+#: src/skins/menus.cc:132 src/skins-qt/menus.cc:125
 msgid "Next Playlist"
 msgstr "Seguinte lista de reprodución"
 
-#: src/skins/menus.cc:110
+#: src/skins/menus.cc:134 src/skins-qt/menus.cc:127
 msgid "Import Playlist ..."
 msgstr "Importar lista de reprodución ..."
 
-#: src/skins/menus.cc:111
+#: src/skins/menus.cc:135 src/skins-qt/menus.cc:128
 msgid "Export Playlist ..."
 msgstr "Exportar lista de reprodución ..."
 
-#: src/skins/menus.cc:113
+#: src/skins/menus.cc:137 src/skins-qt/menus.cc:130
 msgid "Playlist Manager ..."
 msgstr "Xestor da lista de reprodución ..."
 
-#: src/skins/menus.cc:114
+#: src/skins/menus.cc:138 src/skins-qt/menus.cc:131
 msgid "Queue Manager ..."
 msgstr "Xestor da cola ..."
 
-#: src/skins/menus.cc:116
+#: src/skins/menus.cc:140 src/skins-qt/menus.cc:133
 msgid "Refresh Playlist"
 msgstr "Actualizar a lista"
 
-#: src/skins/menus.cc:120
+#: src/skins/menus.cc:144 src/skins-qt/menus.cc:137
 msgid "Show Playlist Editor"
 msgstr "Amosar o editor de listas de reprodución"
 
-#: src/skins/menus.cc:121
+#: src/skins/menus.cc:145 src/skins-qt/menus.cc:138
 msgid "Show Equalizer"
 msgstr "Amosar o ecualizador"
 
-#: src/skins/menus.cc:123
+#: src/skins/menus.cc:147 src/skins-qt/menus.cc:140
 msgid "Show Remaining Time"
 msgstr "Amosar o tempo restante"
 
-#: src/skins/menus.cc:125
+#: src/skins/menus.cc:150 src/skins-qt/menus.cc:143
 msgid "Always on Top"
 msgstr "Sempre enriba"
 
-#: src/skins/menus.cc:126
+#: src/skins/menus.cc:151 src/skins-qt/menus.cc:145
 msgid "On All Workspaces"
 msgstr "En todos os espazos de traballo"
 
-#: src/skins/menus.cc:128
+#: src/skins/menus.cc:153 src/skins-qt/menus.cc:148
 msgid "Roll Up Player"
 msgstr "Enrolar o reprodutor"
 
-#: src/skins/menus.cc:129
+#: src/skins/menus.cc:154 src/skins-qt/menus.cc:149
 msgid "Roll Up Playlist Editor"
 msgstr "Enrolar o editor de listas de reprodución"
 
-#: src/skins/menus.cc:130
+#: src/skins/menus.cc:155 src/skins-qt/menus.cc:150
 msgid "Roll Up Equalizer"
 msgstr "Enrolar o ecualizador"
 
-#: src/skins/menus.cc:132 src/skins/ui_main.cc:854
-msgid "Double Size"
-msgstr "Dobre tamaño"
-
-#: src/skins/menus.cc:138
+#: src/skins/menus.cc:163 src/skins-qt/menus.cc:158
 msgid "Add URL ..."
 msgstr "Engadir un URL ..."
 
-#: src/skins/menus.cc:139
+#: src/skins/menus.cc:164 src/skins-qt/menus.cc:160
 msgid "Add Files ..."
 msgstr "Engadir ficheiros ..."
 
-#: src/skins/menus.cc:143 src/skins/menus.cc:171 src/skins/menus.cc:185
+#: src/skins/menus.cc:168 src/skins/menus.cc:196 src/skins/menus.cc:212
+#: src/skins-qt/menus.cc:164 src/skins-qt/menus.cc:192
+#: src/skins-qt/menus.cc:208
 msgid "By Title"
 msgstr "Polo título"
 
-#: src/skins/menus.cc:144 src/skins/menus.cc:178 src/skins/menus.cc:192
+#: src/skins/menus.cc:169 src/skins/menus.cc:203 src/skins/menus.cc:219
+#: src/skins-qt/menus.cc:165 src/skins-qt/menus.cc:199
+#: src/skins-qt/menus.cc:215
 msgid "By File Name"
 msgstr "Polo nome de ficheiro"
 
-#: src/skins/menus.cc:145 src/skins/menus.cc:179 src/skins/menus.cc:193
+#: src/skins/menus.cc:170 src/skins/menus.cc:204 src/skins/menus.cc:220
+#: src/skins-qt/menus.cc:166 src/skins-qt/menus.cc:200
+#: src/skins-qt/menus.cc:216
 msgid "By File Path"
 msgstr "Pola ruta do ficheiro"
 
-#: src/skins/menus.cc:151
+#: src/skins/menus.cc:176 src/skins-qt/menus.cc:172
 msgid "Remove All"
 msgstr "Retirar todo"
 
-#: src/skins/menus.cc:152
+#: src/skins/menus.cc:177 src/skins-qt/menus.cc:173
 msgid "Clear Queue"
 msgstr "Limpar a cola"
 
-#: src/skins/menus.cc:154
+#: src/skins/menus.cc:179 src/skins-qt/menus.cc:175
 msgid "Remove Unavailable Files"
 msgstr "Retirar os ficheiros non dispoñíbeis"
 
-#: src/skins/menus.cc:155
+#: src/skins/menus.cc:180 src/skins-qt/menus.cc:176
 msgid "Remove Duplicates"
 msgstr "Retirar os duplicados"
 
-#: src/skins/menus.cc:157
+#: src/skins/menus.cc:182 src/skins-qt/menus.cc:178
 msgid "Remove Unselected"
 msgstr "Retirar os NON seleccionados"
 
-#: src/skins/menus.cc:158
+#: src/skins/menus.cc:183 src/skins-qt/menus.cc:179
 msgid "Remove Selected"
 msgstr "Retirar os seleccionados"
 
-#: src/skins/menus.cc:162
+#: src/skins/menus.cc:187 src/skins-qt/menus.cc:183
 msgid "Search and Select"
 msgstr "Buscar e seleccionar"
 
-#: src/skins/menus.cc:164
+#: src/skins/menus.cc:189 src/skins-qt/menus.cc:185
 msgid "Invert Selection"
 msgstr "Inverter a selección"
 
-#: src/skins/menus.cc:165
+#: src/skins/menus.cc:190 src/skins-qt/menus.cc:186
 msgid "Select None"
 msgstr "Non seleccionar nada"
 
-#: src/skins/menus.cc:166
+#: src/skins/menus.cc:191 src/skins-qt/menus.cc:187
 msgid "Select All"
 msgstr "Seleccionar todo"
 
-#: src/skins/menus.cc:170 src/skins/menus.cc:184
+#: src/skins/menus.cc:195 src/skins/menus.cc:211 src/skins-qt/menus.cc:191
+#: src/skins-qt/menus.cc:207
 msgid "By Track Number"
 msgstr "Polo número de pista"
 
-#: src/skins/menus.cc:172 src/skins/menus.cc:186
+#: src/skins/menus.cc:197 src/skins/menus.cc:213 src/skins-qt/menus.cc:193
+#: src/skins-qt/menus.cc:209
 msgid "By Artist"
 msgstr "Polo interprete"
 
-#: src/skins/menus.cc:173 src/skins/menus.cc:187
+#: src/skins/menus.cc:198 src/skins/menus.cc:214 src/skins-qt/menus.cc:194
+#: src/skins-qt/menus.cc:210
 msgid "By Album"
 msgstr "Polo álbum"
 
-#: src/skins/menus.cc:174 src/skins/menus.cc:188
+#: src/skins/menus.cc:199 src/skins/menus.cc:215 src/skins-qt/menus.cc:195
+#: src/skins-qt/menus.cc:211
 msgid "By Album Artist"
 msgstr "Polo interprete do álbum"
 
-#: src/skins/menus.cc:175 src/skins/menus.cc:190
+#: src/skins/menus.cc:200 src/skins/menus.cc:216 src/skins-qt/menus.cc:196
+#: src/skins-qt/menus.cc:212
 msgid "By Release Date"
 msgstr "Pola data de publicación"
 
-#: src/skins/menus.cc:176 src/skins/menus.cc:189
+#: src/skins/menus.cc:201 src/skins/menus.cc:217 src/skins-qt/menus.cc:197
+#: src/skins-qt/menus.cc:213
 msgid "By Genre"
 msgstr "Por xénero"
 
-#: src/skins/menus.cc:177 src/skins/menus.cc:191
+#: src/skins/menus.cc:202 src/skins/menus.cc:218 src/skins-qt/menus.cc:198
+#: src/skins-qt/menus.cc:214
 msgid "By Length"
 msgstr "Por duración"
 
-#: src/skins/menus.cc:180 src/skins/menus.cc:194
+#: src/skins/menus.cc:205 src/skins/menus.cc:221 src/skins-qt/menus.cc:201
+#: src/skins-qt/menus.cc:217
 msgid "By Custom Title"
 msgstr "Por título personalizado"
 
-#: src/skins/menus.cc:198
+#: src/skins/menus.cc:206 src/skins/menus.cc:222 src/skins-qt/menus.cc:202
+#: src/skins-qt/menus.cc:218
+msgid "By Comment"
+msgstr "Por comentario"
+
+#: src/skins/menus.cc:207 src/skins/menus.cc:223 src/skins-qt/menus.cc:203
+#: src/skins-qt/menus.cc:219
+msgid "By Disc Number"
+msgstr ""
+
+#: src/skins/menus.cc:227 src/skins-qt/menus.cc:223
 msgid "Randomize List"
 msgstr "Lista ao chou"
 
-#: src/skins/menus.cc:199
+#: src/skins/menus.cc:228 src/skins-qt/menus.cc:224
 msgid "Reverse List"
 msgstr "Lista inversa"
 
-#: src/skins/menus.cc:201
+#: src/skins/menus.cc:230 src/skins-qt/menus.cc:226
 msgid "Sort Selected"
 msgstr "Ordenar os seleccionados"
 
-#: src/skins/menus.cc:202
+#: src/skins/menus.cc:231 src/skins-qt/menus.cc:227
 msgid "Sort List"
 msgstr "Ordenar a lista"
 
-#: src/skins/menus.cc:208
+#: src/skins/menus.cc:236 src/skins-qt/menus.cc:232
+msgid "Open Containing Folder"
+msgstr "Abrir o cartafol contedor"
+
+#: src/skins/menus.cc:238 src/skins-qt/menus.cc:234
 msgid "Cut"
 msgstr "Cortar"
 
-#: src/skins/menus.cc:209
+#: src/skins/menus.cc:239 src/skins-qt/menus.cc:235
 msgid "Copy"
 msgstr "Copiar"
 
-#: src/skins/menus.cc:210
+#: src/skins/menus.cc:240 src/skins-qt/menus.cc:236
 msgid "Paste"
 msgstr "Pegar"
 
-#: src/skins/menus.cc:212
+#: src/skins/menus.cc:241 src/skins-qt/menus.cc:237
+msgid "Paste at End"
+msgstr "Pegar ao final"
+
+#: src/skins/menus.cc:243 src/skins-qt/menus.cc:239
 msgid "Queue/Unqueue"
 msgstr "Poñer na cola/Quitar da cola"
 
-#: src/skins/menus.cc:218
-msgid "Load Preset ..."
-msgstr "Cargar o axuste ..."
-
-#: src/skins/menus.cc:219
-msgid "Load Auto Preset ..."
-msgstr "Cargar o axuste automático ..."
-
-#: src/skins/menus.cc:220
-msgid "Load Default"
-msgstr "Cargar o predeterminado"
-
-#: src/skins/menus.cc:221
-msgid "Load Preset File ..."
-msgstr "Cargar o ficheiro de axustes ..."
-
-#: src/skins/menus.cc:222
-msgid "Load EQF File ..."
-msgstr "Cargar o ficheiro EQF ..."
-
-#: src/skins/menus.cc:224
-msgid "Save Preset ..."
-msgstr "Gardar os axustes ..."
-
-#: src/skins/menus.cc:225
-msgid "Save Auto Preset ..."
-msgstr "Gardar o axuste automático ..."
-
-#: src/skins/menus.cc:226
-msgid "Save Default"
-msgstr "Gardar o axuste predeterminado"
-
-#: src/skins/menus.cc:227
-msgid "Save Preset File ..."
-msgstr "Gardar o ficheiro de axustes ..."
-
-#: src/skins/menus.cc:228
-msgid "Save EQF File ..."
-msgstr "Gardar o ficheiro EQF ..."
-
-#: src/skins/menus.cc:230
-msgid "Delete Preset ..."
-msgstr "Eliminar o axuste ..."
-
-#: src/skins/menus.cc:231
-msgid "Delete Auto Preset ..."
-msgstr "Eliminar o axuste automático ..."
-
-#: src/skins/menus.cc:233
-msgid "Import Winamp Presets ..."
-msgstr "Importar os axustes do WinAMP ..."
-
-#: src/skins/menus.cc:235
-msgid "Reset to Zero"
-msgstr "Poñer a cero"
+#: src/skins/playlist-widget.cc:58 src/skins-qt/playlist-widget.cc:58
+#, c-format
+msgid "%s (%d of %d)"
+msgstr "%s (%d de %d)"
+
+#: src/skins/playlistwin.cc:491 src/skins-qt/playlistwin.cc:478
+msgid "Audacious Playlist Editor"
+msgstr "Editor de listas de reprodución do Audacious"
 
-#: src/skins/plugin.cc:48
+#: src/skins/plugin.cc:53 src/skins-qt/plugin.cc:65
 msgid "Winamp Classic Interface"
 msgstr "Interface clásica do Winamp"
 
-#: src/skins/preset-browser.cc:57 src/skins/preset-list.cc:371
-#: src/skins/preset-list.cc:386
-msgid "Save"
-msgstr "Gardar"
-
-#: src/skins/preset-browser.cc:57 src/skins/preset-list.cc:338
-#: src/skins/preset-list.cc:354
-msgid "Load"
-msgstr "Cargar"
-
-#: src/skins/preset-browser.cc:83
-msgid "Load Preset File"
-msgstr "Cargar o ficheiro de axustes"
-
-#: src/skins/preset-browser.cc:100
-msgid "Load EQF File"
-msgstr "Cargar o ficheiro EQF"
-
-#: src/skins/preset-browser.cc:119
-msgid "Save Preset File"
-msgstr "Gardar o ficheiro de axustes"
-
-#: src/skins/preset-browser.cc:137
-msgid "Save EQF File"
-msgstr "Gardar o ficheiro EQF"
-
-#: src/skins/preset-browser.cc:151
-msgid "Import Winamp Presets"
-msgstr "Importar os axustes do WinAMP"
-
-#: src/skins/preset-list.cc:285
-msgid "Presets"
-msgstr "Axustes"
-
-#: src/skins/preset-list.cc:335
-msgid "Load preset"
-msgstr "Cargar o axustes"
-
-#: src/skins/preset-list.cc:351
-msgid "Load auto-preset"
-msgstr "Cargar o axuste automático"
-
-#: src/skins/preset-list.cc:367
-msgid "Save preset"
-msgstr "Gardar o axustes"
-
-#: src/skins/preset-list.cc:382
-msgid "Save auto-preset"
-msgstr "Gardar o axuste automático"
-
-#: src/skins/preset-list.cc:408
-msgid "Delete preset"
-msgstr "Eliminar o axuste"
-
-#: src/skins/preset-list.cc:424
-msgid "Delete auto-preset"
-msgstr "Eliminar o axuste automático"
+#: src/skins-qt/menus.cc:75
+msgid "Open Folder ..."
+msgstr "_Abrir o cartafol ..."
+
+#: src/skins-qt/menus.cc:159
+msgid "Add Folder ..."
+msgstr "_Engadir un cartafol ..."
+
+#: src/skins-qt/search-select.cc:62 src/skins/search-select.cc:77
+msgid "Search entries in active playlist"
+msgstr "Buscar entradas na lista de reprodución activa"
+
+#: src/skins-qt/search-select.cc:70 src/skins/search-select.cc:83
+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 ""
+"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-qt/search-select.cc:75 src/skins/search-select.cc:91
+msgid "Title:"
+msgstr "Título: "
 
-#: src/skins/skins_cfg.cc:176
+#: src/skins-qt/search-select.cc:79 src/skins/search-select.cc:96
+msgid "Album:"
+msgstr "Álbum: "
+
+#: src/skins-qt/search-select.cc:82 src/skins/search-select.cc:101
+msgid "Artist:"
+msgstr "Interprete: "
+
+#: src/skins-qt/search-select.cc:85 src/skins/search-select.cc:106
+msgid "File Name:"
+msgstr "Nome de ficheiro:"
+
+#: src/skins-qt/search-select.cc:88 src/skins/search-select.cc:134
+msgid "Clear previous selection before searching"
+msgstr "Limpar a selección previa antes de buscar"
+
+#: src/skins-qt/search-select.cc:89 src/skins/search-select.cc:137
+msgid "Automatically toggle queue for matching entries"
+msgstr "Cambiar automaticamente a cola para as entradas coincidentes"
+
+#: src/skins-qt/search-select.cc:90 src/skins/search-select.cc:140
+msgid "Create a new playlist with matching entries"
+msgstr "Crear unha nova lista de reprodución coas entradas coincidentes"
+
+#: src/skins-qt/search-select.cc:101 src/skins/search-select.cc:78
+msgid "Search"
+msgstr "Busca"
+
+#: src/skins-qt/skins_cfg.cc:198 src/skins/skins_cfg.cc:182
 msgid "Player:"
 msgstr "Reprodutor:"
 
-#: src/skins/skins_cfg.cc:178
+#: src/skins-qt/skins_cfg.cc:200 src/skins/skins_cfg.cc:184
 msgid "Select main player window font:"
 msgstr "Seleccione o tipo de letra da xanela principal do reprodutor:"
 
-#: src/skins/skins_cfg.cc:179
+#: src/skins-qt/skins_cfg.cc:201 src/skins/skins_cfg.cc:185
 msgid "Playlist:"
 msgstr "Lista de reprodución:"
 
-#: src/skins/skins_cfg.cc:181
+#: src/skins-qt/skins_cfg.cc:203 src/skins/skins_cfg.cc:187
 msgid "Select playlist font:"
 msgstr "Seleccione o tipo de letra da lista de reprodución:"
 
-#: src/skins/skins_cfg.cc:187
+#: src/skins-qt/skins_cfg.cc:207 src/skins/skins_cfg.cc:191
 msgid "Skin"
 msgstr "Tema"
 
-#: src/skins/skins_cfg.cc:189
+#: src/skins-qt/skins_cfg.cc:211 src/skins/skins_cfg.cc:193
+msgid "Display active titlebar when any window is focused"
+msgstr "Mostrar a barra de título activa ao enfocar unha xanela"
+
+#: src/skins-qt/skins_cfg.cc:213 src/skins/skins_cfg.cc:195
 msgid "Fonts"
 msgstr "Tipos de letra"
 
-#: src/skins/skins_cfg.cc:192
+#: src/skins-qt/skins_cfg.cc:215 src/skins/skins_cfg.cc:197
 msgid "Use bitmap fonts (supports ASCII only)"
 msgstr "Empregar tipos de letra de mapa de bits (só admiten ASCII)"
 
-#: src/skins/skins_cfg.cc:194
+#: src/skins-qt/skins_cfg.cc:217 src/skins/skins_cfg.cc:199
 msgid "Scroll song title"
 msgstr "Desprazar o título da canción"
 
-#: src/skins/skins_cfg.cc:196
+#: src/skins-qt/skins_cfg.cc:219 src/skins/skins_cfg.cc:201
 msgid "Scroll song title in both directions"
 msgstr "Desprazar o título da canción en ambas direccións"
 
-#: src/skins/skins_cfg.cc:201
+#: src/skins-qt/skins_cfg.cc:224 src/skins/skins_cfg.cc:206
 msgid "Analyzer"
 msgstr "Analizador"
 
-#: src/skins/skins_cfg.cc:202
+#: src/skins-qt/skins_cfg.cc:225 src/skins/skins_cfg.cc:207
 msgid "Scope"
 msgstr "Campo"
 
-#: src/skins/skins_cfg.cc:203
+#: src/skins-qt/skins_cfg.cc:226 src/skins/skins_cfg.cc:208
 msgid "Voiceprint / VU meter"
-msgstr "Impresión vocal / Medidor de unidades de volume"
+msgstr "Impresión vocal / Vúmetro"
 
-#: src/skins/skins_cfg.cc:204
+#: src/skins-qt/skins_cfg.cc:227 src/skins/skins_cfg.cc:209
 msgid "Off"
 msgstr "Apagado"
 
-#: src/skins/skins_cfg.cc:208 src/skins/skins_cfg.cc:233
-#: src/skins/skins_cfg.cc:239
+#: src/skins-qt/skins_cfg.cc:231 src/skins-qt/skins_cfg.cc:256
+#: src/skins-qt/skins_cfg.cc:262 src/skins/skins_cfg.cc:213
+#: src/skins/skins_cfg.cc:238 src/skins/skins_cfg.cc:244
 msgid "Normal"
 msgstr "Normal"
 
-#: src/skins/skins_cfg.cc:209 src/skins/skins_cfg.cc:234
+#: src/skins-qt/skins_cfg.cc:232 src/skins-qt/skins_cfg.cc:257
+#: src/skins/skins_cfg.cc:214 src/skins/skins_cfg.cc:239
 msgid "Fire"
 msgstr "Lume"
 
-#: src/skins/skins_cfg.cc:210
+#: src/skins-qt/skins_cfg.cc:233 src/skins/skins_cfg.cc:215
 msgid "Vertical lines"
 msgstr "Liñas verticais"
 
-#: src/skins/skins_cfg.cc:214
+#: src/skins-qt/skins_cfg.cc:237 src/skins/skins_cfg.cc:219
 msgid "Lines"
 msgstr "Liñas"
 
-#: src/skins/skins_cfg.cc:215
+#: src/skins-qt/skins_cfg.cc:238 src/skins/skins_cfg.cc:220
 msgid "Bars"
 msgstr "Barras"
 
-#: src/skins/skins_cfg.cc:219
+#: src/skins-qt/skins_cfg.cc:242 src/skins/skins_cfg.cc:224
 msgid "Slowest"
 msgstr "Máis lento"
 
-#: src/skins/skins_cfg.cc:220
+#: src/skins-qt/skins_cfg.cc:243 src/skins/skins_cfg.cc:225
 msgid "Slow"
 msgstr "Lento"
 
-#: src/skins/skins_cfg.cc:221 src/sox-resampler/sox-resampler.cc:152
+#: src/skins-qt/skins_cfg.cc:244 src/skins/skins_cfg.cc:226
+#: src/soxr/sox-resampler.cc:180
 msgid "Medium"
 msgstr "Medio"
 
-#: src/skins/skins_cfg.cc:222
+#: src/skins-qt/skins_cfg.cc:245 src/skins/skins_cfg.cc:227
 msgid "Fast"
 msgstr "Rápido"
 
-#: src/skins/skins_cfg.cc:223
+#: src/skins-qt/skins_cfg.cc:246 src/skins/skins_cfg.cc:228
 msgid "Fastest"
 msgstr "Máis rápido"
 
-#: src/skins/skins_cfg.cc:227
+#: src/skins-qt/skins_cfg.cc:250 src/skins/skins_cfg.cc:232
 msgid "Dots"
 msgstr "Puntos"
 
-#: src/skins/skins_cfg.cc:228
+#: src/skins-qt/skins_cfg.cc:251 src/skins/skins_cfg.cc:233
 msgid "Line"
 msgstr "Liña"
 
-#: src/skins/skins_cfg.cc:229
+#: src/skins-qt/skins_cfg.cc:252 src/skins/skins_cfg.cc:234
 msgid "Solid"
 msgstr "Sólido"
 
-#: src/skins/skins_cfg.cc:235
+#: src/skins-qt/skins_cfg.cc:258 src/skins/skins_cfg.cc:240
 msgid "Ice"
 msgstr "Xeo"
 
-#: src/skins/skins_cfg.cc:240
+#: src/skins-qt/skins_cfg.cc:263 src/skins/skins_cfg.cc:245
 msgid "Smooth"
 msgstr "Suave"
 
-#: src/skins/skins_cfg.cc:244
-msgid "Type"
-msgstr "Tipo"
-
-#: src/skins/skins_cfg.cc:245
-msgid "Visualization type:"
-msgstr "Tipo de visualización:"
-
-#: src/skins/skins_cfg.cc:248
-msgid "Analyzer"
-msgstr "Analizador"
-
-#: src/skins/skins_cfg.cc:249
-msgid "Show peaks"
-msgstr "Amosar os picos"
-
-#: src/skins/skins_cfg.cc:251
+#: src/skins-qt/skins_cfg.cc:267 src/skins/skins_cfg.cc:249
 msgid "Coloring:"
 msgstr "Colorear:"
 
-#: src/skins/skins_cfg.cc:254
+#: src/skins-qt/skins_cfg.cc:270 src/skins/skins_cfg.cc:252
 msgid "Style:"
 msgstr "Estilo:"
 
-#: src/skins/skins_cfg.cc:257
+#: src/skins-qt/skins_cfg.cc:273 src/skins/skins_cfg.cc:255
 msgid "Falloff:"
 msgstr "Caída:"
 
-#: src/skins/skins_cfg.cc:260
+#: src/skins-qt/skins_cfg.cc:276 src/skins/skins_cfg.cc:258
 msgid "Peak falloff:"
 msgstr "Caída dos picos:"
 
-#: src/skins/skins_cfg.cc:264
+#: src/skins-qt/skins_cfg.cc:282 src/skins/skins_cfg.cc:264
 msgid "Scope Style:"
 msgstr "Estilo de campo:"
 
-#: src/skins/skins_cfg.cc:267
+#: src/skins-qt/skins_cfg.cc:285 src/skins/skins_cfg.cc:267
 msgid "Voiceprint Coloring:"
 msgstr "Coloreado da impresión vocal"
 
-#: src/skins/skins_cfg.cc:270
+#: src/skins-qt/skins_cfg.cc:288 src/skins/skins_cfg.cc:270
 msgid "VU Meter Style:"
-msgstr "Estilo do medidor de UV:"
-
-#: src/skins/skins_cfg.cc:276
-msgid "General"
-msgstr "Xeral"
-
-#: src/skins/skins_cfg.cc:277
-msgid "Visualization"
-msgstr "Visualización"
-
-#: src/skins/ui_equalizer.cc:282
-msgid "Preamp"
-msgstr "Preamplificador"
-
-#: src/skins/ui_equalizer.cc:286
-msgid "31 Hz"
-msgstr "31 Hz"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "63 Hz"
-msgstr "63 Hz"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "125 Hz"
-msgstr "125 Hz"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "250 Hz"
-msgstr "250 Hz"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "500 Hz"
-msgstr "500 Hz"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "1 kHz"
-msgstr "1 kHz"
-
-#: src/skins/ui_equalizer.cc:288
-msgid "2 kHz"
-msgstr "2 kHz"
-
-#: src/skins/ui_equalizer.cc:288
-msgid "4 kHz"
-msgstr "4 kHz"
-
-#: src/skins/ui_equalizer.cc:288
-msgid "8 kHz"
-msgstr "8 kHz"
-
-#: src/skins/ui_equalizer.cc:288
-msgid "16 kHz"
-msgstr "16 kHz"
-
-#: src/skins/ui_equalizer.cc:330
-msgid "Audacious Equalizer"
-msgstr "Ecualizador do Audacious"
-
-#: src/skins/ui_main.cc:688
-#, c-format
-msgid "Seek to %d:%-2.2d / %d:%-2.2d"
-msgstr "Ir a %d:%-2.2d / %d:%-2.2d"
-
-#: src/skins/ui_main.cc:709
-#, c-format
-msgid "Volume: %d%%"
-msgstr "Volume: %d%%"
-
-#: src/skins/ui_main.cc:732
-#, c-format
-msgid "Balance: %d%% left"
-msgstr "Balance: %d%% esquerda"
-
-#: src/skins/ui_main.cc:734
-msgid "Balance: center"
-msgstr "Balance: centro"
-
-#: src/skins/ui_main.cc:736
-#, c-format
-msgid "Balance: %d%% right"
-msgstr "Balance: %d%% dereita"
-
-#: src/skins/ui_main.cc:842
-msgid "Options Menu"
-msgstr "Menú de opcións"
-
-#: src/skins/ui_main.cc:846
-msgid "Disable 'Always On Top'"
-msgstr "Desactivar «Sempre enriba»"
-
-#: src/skins/ui_main.cc:848
-msgid "Enable 'Always On Top'"
-msgstr "Activar «Sempre enriba»"
-
-#: src/skins/ui_main.cc:851
-msgid "File Info Box"
-msgstr "Caixa de información do ficheiro"
-
-#: src/skins/ui_main.cc:857
-msgid "Visualizations"
-msgstr "Vistas"
-
-#: src/skins/ui_main.cc:1336
-msgid "Repeat point A set."
-msgstr "Repetir o punto de axuste A."
-
-#: src/skins/ui_main.cc:1341
-msgid "Repeat point B set."
-msgstr "Repetir o punto de axuste B."
-
-#: src/skins/ui_main.cc:1350
-msgid "Repeat points cleared."
-msgstr "Repetir os puntos limpados"
-
-#: src/skins/ui_playlist.cc:219
-msgid "Search entries in active playlist"
-msgstr "Buscar entradas na lista de reprodución activa"
-
-#: src/skins/ui_playlist.cc:226
-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 ""
-"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.cc:234
-msgid "Title:"
-msgstr "Título: "
-
-#: src/skins/ui_playlist.cc:241
-msgid "Album:"
-msgstr "Álbum: "
-
-#: src/skins/ui_playlist.cc:248
-msgid "Artist:"
-msgstr "Interprete: "
-
-#: src/skins/ui_playlist.cc:255
-msgid "File Name:"
-msgstr "Nome de ficheiro:"
+msgstr "Estilo do vúmetro:"
 
-#: src/skins/ui_playlist.cc:263
-msgid "Clear previous selection before searching"
-msgstr "Limpar a selección previa antes de buscar"
+#: src/skins-qt/skins_cfg.cc:294 src/skins/skins_cfg.cc:276
+msgid "Type"
+msgstr "Tipo"
 
-#: src/skins/ui_playlist.cc:266
-msgid "Automatically toggle queue for matching entries"
-msgstr "Cambiar automaticamente a cola para as entradas coincidentes"
+#: src/skins-qt/skins_cfg.cc:295 src/skins/skins_cfg.cc:277
+msgid "Visualization type:"
+msgstr "Tipo de visualización:"
 
-#: src/skins/ui_playlist.cc:269
-msgid "Create a new playlist with matching entries"
-msgstr "Crear unha nova lista de reprodución coas entradas coincidentes"
+#: src/skins-qt/skins_cfg.cc:298 src/skins/skins_cfg.cc:280
+msgid "Analyzer"
+msgstr "Analizador"
 
-#: src/skins/ui_playlist.cc:717
-msgid "Audacious Playlist Editor"
-msgstr "Editor de listas de reprodución do Audacious"
+#: src/skins-qt/skins_cfg.cc:299 src/skins/skins_cfg.cc:281
+msgid "Show peaks"
+msgstr "Amosar os picos"
 
-#: src/skins/ui_playlist.cc:752
-#, c-format
-msgid "%s (%d of %d)"
-msgstr "%s (%d de %d)"
+#: src/skins-qt/skins_cfg.cc:308 src/skins/skins_cfg.cc:290
+msgid "Visualization"
+msgstr "Visualización"
 
-#: src/skins/ui_skinselector.cc:167
+#: src/skins-qt/skinselector.cc:98 src/skins/skinselector.cc:111
 msgid "Archived Winamp 2.x skin"
 msgstr "Tema para Winamp 2.x arquivado"
 
-#: src/skins/ui_skinselector.cc:172
+#: src/skins-qt/skinselector.cc:102 src/skins/skinselector.cc:115
 msgid "Unarchived Winamp 2.x skin"
 msgstr "Tema para Winamp 2.x sen arquivar"
 
-#: src/skins/util.cc:430
-#, c-format
-msgid "Could not create directory (%s): %s\n"
-msgstr "Non foi posíbel crear o directorio (%s): %s\n"
-
-#: src/sndfile/plugin.cc:39
+#: src/sndfile/plugin.cc:38
 msgid "Sndfile Plugin"
 msgstr "Engadido Sndfile"
 
-#: src/sndfile/plugin.cc:336
+#: src/sndfile/plugin.cc:372
 msgid ""
 "Based on the xmms_sndfile plugin:\n"
 "Copyright (C) 2000, 2002 Erik de Castro Lopo\n"
@@ -3993,110 +4206,112 @@
 "Inc.,\n"
 "51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 
-#: src/sndio-ng/sndio.cc:44
+#: src/sndio/sndio.cc:43
 msgid "Sndio Output"
 msgstr "Saída Sndio"
 
-#: src/sndio-ng/sndio.cc:98
+#: src/sndio/sndio.cc:98
 msgid "Device (blank for default):"
 msgstr "Dispositivo (baleiro como predeterminado):"
 
-#: src/sndio-ng/sndio.cc:100
+#: src/sndio/sndio.cc:100
 msgid "Save and restore volume:"
 msgstr "Gardar e restaurar o volume:"
 
-#: src/sndio-ng/sndio.cc:181
+#: src/sndio/sndio.cc:181
 #, c-format
 msgid "Sndio error: Unsupported audio format (%d)"
 msgstr "Produciuse un erro de Sndio: Formato de son non admitido (%d)"
 
-#: src/sndio-ng/sndio.cc:192
+#: src/sndio/sndio.cc:192
 msgid "Sndio error: sio_open() failed"
 msgstr "Produciuse un erro de Sndio: fallou sio_open()"
 
-#: src/sndio-ng/sndio.cc:222
+#: src/sndio/sndio.cc:221
 msgid "Sndio error: sio_setpar() failed"
 msgstr "Produciuse un erro de Sndio: fallou sio_setpar()"
 
-#: src/sndio-ng/sndio.cc:234
+#: src/sndio/sndio.cc:233
 msgid "Sndio error: sio_start() failed"
 msgstr "Produciuse un erro de Sndio: fallou sio_start()"
 
-#: src/song_change/song_change.cc:33
+#: src/songchange/song_change.cc:30
 msgid "Song Change"
 msgstr "Cambio de canción"
 
-#: src/song_change/song_change.cc:342
-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."
-
-#: src/song_change/song_change.cc:358
+#: src/songchange/song_change.cc:256
 msgid "Commands"
 msgstr "Ordes"
 
-#: src/song_change/song_change.cc:360
+#: src/songchange/song_change.cc:258
 msgid "Command to run when starting a new song:"
 msgstr "Orde que executar cando comece unha nova canción:"
 
-#: src/song_change/song_change.cc:364
+#: src/songchange/song_change.cc:261
+msgid "Command to run when stopping a song:"
+msgstr ""
+
+#: src/songchange/song_change.cc:264
 msgid "Command to run at the end of a song:"
 msgstr "Orde que executar na fin dunha canción:"
 
-#: src/song_change/song_change.cc:368
+#: src/songchange/song_change.cc:267
 msgid "Command to run at the end of the playlist:"
 msgstr "Orde que executar na fin dunha lista de reprodución:"
 
-#: src/song_change/song_change.cc:372
+#: src/songchange/song_change.cc:270
 msgid "Command to run when song title changes (for network streams):"
 msgstr ""
 "Orde que executar cando cambia o título dunha canción (para fluxos da rede):"
 
-#: src/song_change/song_change.cc:376
+#: src/songchange/song_change.cc:273
 msgid ""
-"You can use the following format strings which will be substituted before "
-"calling the command (not all are useful for the end-of-playlist command):\n"
-"\n"
-"%F: Frequency (in hertz)\n"
+"You can use the following format codes, which will be replaced before "
+"running the command.\n"
+"Not all are useful though for the song-stopped or end-of-playlist command."
+msgstr ""
+
+#: src/songchange/song_change.cc:276
+msgid ""
+"%a: Artist\n"
+"%b: Album\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"
+"%F: Frequency (Hertz)\n"
+"%l: Length (milliseconds)\n"
+"%n or %s: Formatted title (see playlist settings)\n"
 "%p: Currently playing (1 or 0)\n"
-"%a: Artist\n"
-"%b: Album\n"
-"%T: Track title"
+"%r: Rate (bits per second)\n"
+"%t: Playlist position\n"
+"%T: Title (unformatted)"
 msgstr ""
-"Pode utilizar as seguintes cadeas de formato que serán substituídas antes de "
-"chamar a orde (non todas son útiles para a orde de fin de lista de "
-"reprodución)\n"
-"\n"
-"%F: Frecuencia (en hercios)\n"
-"%c: Número de canles\n"
-"%f: Nome de ficheiro (ruta completa)\n"
-"%l: Duración (en milisegundos)\n"
-"%n ou %s: Nome da canción\n"
-"%r: Taxa (en bits por segundo)\n"
-"%t: Posición da lista de reprodución (%02d)\n"
-"%p: Reproducíndose actualmente (1 ou 0)\n"
-"%a: Artista\n"
+"%a: Interprete\n"
 "%b: Álbum\n"
-"%T: Título da pista"
-
-#: src/song-info-qt/song-info.cc:32
-msgid "Song Info (Qt)"
-msgstr "Información da canción (Qt)"
+"%c: Número de canles\n"
+"%f: Nome do ficheiro (ruta completa)\n"
+"%F: Frecuencia (Hertz)\n"
+"%l: Duración (milisegundos)\n"
+"%n ou %s: Título formatado (ver os axustes de lista de reprodución)\n"
+"%p: Actualmente en reprodución (1 ou 0)\n"
+"%r: Taxa (bits por segundo)\n"
+"%t: Posición da lista de reprodución\n"
+"%T: Título (sen formatar)"
+
+#: src/songchange/song_change.cc:287
+msgid ""
+"Parameters passed to the shell should be enclosed in quotation marks.\n"
+"Unquoted parameters may lead to unexpected results."
+msgstr ""
+
+#: src/song-info-qt/song-info.cc:30
+msgid "Song Info"
+msgstr "Información da canción"
 
-#: src/sox-resampler/sox-resampler.cc:44
+#: src/soxr/sox-resampler.cc:44
 msgid "SoX Resampler"
 msgstr "SoX Resampler"
 
-#: src/sox-resampler/sox-resampler.cc:144
+#: src/soxr/sox-resampler.cc:172
 msgid ""
 "SoX Resampler Plugin for Audacious\n"
 "Copyright 2013 Michał Lipski\n"
@@ -4110,96 +4325,144 @@
 "Baseado no engadido Sample Rate Converter:\n"
 "Copyright 2010-2012 John Lindgren"
 
-#: src/sox-resampler/sox-resampler.cc:150
+#: src/soxr/sox-resampler.cc:178
 msgid "Quick"
 msgstr "Rápido"
 
-#: src/sox-resampler/sox-resampler.cc:151
+#: src/soxr/sox-resampler.cc:179
 msgid "Low"
 msgstr "Baixa"
 
-#: src/sox-resampler/sox-resampler.cc:153
+#: src/soxr/sox-resampler.cc:181
 msgid "High"
 msgstr "Alta"
 
-#: src/sox-resampler/sox-resampler.cc:154
+#: src/soxr/sox-resampler.cc:182
 msgid "Very High"
 msgstr "Moi alta"
 
-#: src/sox-resampler/sox-resampler.cc:158
+#: src/soxr/sox-resampler.cc:183
+msgid "Ultra High"
+msgstr "Máxima"
+
+#: src/soxr/sox-resampler.cc:187
+msgid "Minimum"
+msgstr "Mínima"
+
+#: src/soxr/sox-resampler.cc:188
+msgid "Intermediate"
+msgstr "Intermedia"
+
+#: src/soxr/sox-resampler.cc:193
 msgid "Quality:"
 msgstr "Calidade:"
 
-#: src/speed-pitch/speed-pitch.cc:51
+#: src/soxr/sox-resampler.cc:196
+msgid "Phase:"
+msgstr "Fase:"
+
+#: src/soxr/sox-resampler.cc:200
+msgid "Allow aliasing"
+msgstr "Permitir suavizado"
+
+#: src/soxr/sox-resampler.cc:202
+msgid "Use steep filter"
+msgstr "Usar o filtro de inclinación"
+
+#: src/speedpitch/speed-pitch.cc:54
 msgid "Speed and Pitch"
 msgstr "Velocidade e ton"
 
-#: src/speed-pitch/speed-pitch.cc:210
-msgid "Speed and Pitch"
-msgstr "Velocidade e ton"
-
-#: src/speed-pitch/speed-pitch.cc:211
-msgid "Speed:"
-msgstr "Velocidade:"
-
-#: src/speed-pitch/speed-pitch.cc:214
-msgid "Pitch:"
-msgstr "Ton:"
+#: src/speedpitch/speed-pitch.cc:247
+msgid "Speed"
+msgstr "Velocidade"
+
+#: src/speedpitch/speed-pitch.cc:248
+msgid "Decouple from pitch"
+msgstr "Desacoplar do ton"
+
+#: src/speedpitch/speed-pitch.cc:250 src/speedpitch/speed-pitch.cc:258
+msgid "Multiplier:"
+msgstr "Multiplicador:"
+
+#: src/speedpitch/speed-pitch.cc:254
+msgid "Pitch"
+msgstr "Ton"
 
-#: src/statusicon/statusicon.cc:47
+#: src/statusicon-qt/statusicon.cc:45 src/statusicon/statusicon.cc:47
 msgid "Status Icon"
 msgstr "Icona de estado"
 
-#: src/statusicon/statusicon.cc:283
-msgid "Se_ttings ..."
-msgstr "A_xustes ..."
-
-#: src/statusicon/statusicon.cc:372
+#: src/statusicon-qt/statusicon.cc:68
 msgid ""
-"Status Icon Plugin\n"
+"Status Icon Plugin (partial port for Qt interface)\n"
 "\n"
 "Copyright 2005-2007 Giacomo Lozito <james@develia.org>\n"
 "Copyright 2010 Michał Lipski <tallica@o2.pl>\n"
+"Copyright 2015 Eugene Paskevich <eugene@raptor.kiev.ua>\n"
 "\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"
+"Engadido da icona de estado (porto parcial para a interface Qt)\n"
 "\n"
-"Copyright 2005-2007 Giacomo Lozito <james@develia.org>\n"
-"Copyright 2010 Michał Lipski <tallica@o2.pl>\n"
+"Dereitos de autor 2005-2007 Giacomo Lozito <james@develia.org>\n"
+"Dereitos de autor 2010 Michał Lipski <tallica@o2.pl>\n"
+"Dereitos de autor 2015 Eugene Paskevich <eugene@raptor.kiev.ua>\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.cc:379
+#: src/statusicon-qt/statusicon.cc:89 src/statusicon/statusicon.cc:384
 msgid "Mouse Scroll Action"
 msgstr "Acción coa roda do rato"
 
-#: src/statusicon/statusicon.cc:380
+#: src/statusicon-qt/statusicon.cc:90 src/statusicon/statusicon.cc:385
 msgid "Change volume"
 msgstr "Cambiar o volume"
 
-#: src/statusicon/statusicon.cc:383
+#: src/statusicon-qt/statusicon.cc:93 src/statusicon/statusicon.cc:388
 msgid "Change playing song"
 msgstr "Cambiar a cancion que se está a reproducir"
 
-#: src/statusicon/statusicon.cc:386
+#: src/statusicon-qt/statusicon.cc:96 src/statusicon/statusicon.cc:391
 msgid "Other Settings"
-msgstr "Outras configuracións"
+msgstr "Outros axustes"
 
-#: src/statusicon/statusicon.cc:387
+#: src/statusicon-qt/statusicon.cc:97 src/statusicon/statusicon.cc:392
 msgid "Disable the popup window"
 msgstr "Desactivar a xanela emerxente"
 
-#: src/statusicon/statusicon.cc:389
+#: src/statusicon-qt/statusicon.cc:99 src/statusicon/statusicon.cc:394
 msgid "Close to the system tray"
 msgstr "Pechar na área de notificación"
 
-#: src/statusicon/statusicon.cc:391
+#: src/statusicon-qt/statusicon.cc:101 src/statusicon/statusicon.cc:396
 msgid "Advance in playlist when scrolling upward"
 msgstr "Avanzar na lista de reprodución ao desprazar cara arriba"
 
+#: src/statusicon-qt/statusicon.cc:116 src/statusicon/statusicon.cc:287
+msgid "Se_ttings ..."
+msgstr "A_xustes ..."
+
+#: src/statusicon/statusicon.cc:377
+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 ""
+"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/stereo_plugin/stereo.cc:19
 msgid "Extra Stereo"
 msgstr "Extra estéreo"
@@ -4218,20 +4481,160 @@
 msgid "Extra Stereo"
 msgstr "Extra estéreo"
 
+#: src/streamtuner/icecast-model.cc:126 src/streamtuner/shoutcast-model.cc:131
+msgid "Type"
+msgstr "TIpo"
+
+#: src/streamtuner/icecast-model.cc:132
+msgid "Current Song"
+msgstr "Canción actual"
+
+#: src/streamtuner/icecast-model.cc:164
+msgid "Other"
+msgstr "Outro"
+
+#: src/streamtuner/ihr-model.cc:63
+msgid "Market"
+msgstr "Tenda"
+
+#: src/streamtuner/ihr-model.cc:156
+msgid "Call Letters"
+msgstr "Indicativos"
+
+#: src/streamtuner/ihr-model.cc:162
+msgid "Description"
+msgstr "Descrición"
+
+#: src/streamtuner/shoutcast-model.cc:128
+msgid "Listeners"
+msgstr "Oíntes"
+
+#: src/streamtuner/shoutcast-model.cc:188
+msgid "Top 500 Stations"
+msgstr "500 mellores emisoras"
+
+#: src/streamtuner/shoutcast-model.cc:189
+msgid "Alternative"
+msgstr "Alternativa"
+
+#: src/streamtuner/shoutcast-model.cc:190
+msgid "Blues"
+msgstr "Blues"
+
+#: src/streamtuner/shoutcast-model.cc:191
+msgid "Classical"
+msgstr "Clásica"
+
+#: src/streamtuner/shoutcast-model.cc:192
+msgid "Country"
+msgstr "Country"
+
+#: src/streamtuner/shoutcast-model.cc:193
+msgid "Decades"
+msgstr "Décadas"
+
+#: src/streamtuner/shoutcast-model.cc:194
+msgid "Easy Listening"
+msgstr "Escoita doada"
+
+#: src/streamtuner/shoutcast-model.cc:195
+msgid "Electronic"
+msgstr "Electrónica"
+
+#: src/streamtuner/shoutcast-model.cc:196
+msgid "Folk"
+msgstr "Folc"
+
+#: src/streamtuner/shoutcast-model.cc:197
+msgid "Inspirational"
+msgstr "Inspiracional"
+
+#: src/streamtuner/shoutcast-model.cc:198
+msgid "International"
+msgstr "Internacional"
+
+#: src/streamtuner/shoutcast-model.cc:199
+msgid "Jazz"
+msgstr "Jazz"
+
+#: src/streamtuner/shoutcast-model.cc:200
+msgid "Latin"
+msgstr "Latina"
+
+#: src/streamtuner/shoutcast-model.cc:201
+msgid "Metal"
+msgstr "Metal"
+
+#: src/streamtuner/shoutcast-model.cc:203
+msgid "New Age"
+msgstr "New Age"
+
+#: src/streamtuner/shoutcast-model.cc:204
+msgid "Pop"
+msgstr "Pop"
+
+#: src/streamtuner/shoutcast-model.cc:205
+msgid "Public Radio"
+msgstr "Radio pública"
+
+#: src/streamtuner/shoutcast-model.cc:206
+msgid "R&B and Urban"
+msgstr "R&B e urbana"
+
+#: src/streamtuner/shoutcast-model.cc:207
+msgid "Rap"
+msgstr "Rap"
+
+#: src/streamtuner/shoutcast-model.cc:208
+msgid "Reggae"
+msgstr "Reggae"
+
+#: src/streamtuner/shoutcast-model.cc:209
+msgid "Rock"
+msgstr "Rock"
+
+#: src/streamtuner/shoutcast-model.cc:210
+msgid "Seasonal and Holiday"
+msgstr "Tempada e vacacións"
+
+#: src/streamtuner/shoutcast-model.cc:211
+msgid "Soundtracks"
+msgstr "Bandas sonoras"
+
+#: src/streamtuner/shoutcast-model.cc:212
+msgid "Talk"
+msgstr "Faladoiro"
+
+#: src/streamtuner/shoutcast-model.cc:213
+msgid "Themes"
+msgstr "Temas"
+
+#: src/streamtuner/streamtuner.cc:59
+msgid "Shoutcast"
+msgstr "Shoutcast"
+
+#: src/streamtuner/streamtuner.cc:60
+msgid "Icecast"
+msgstr "Icecast"
+
+#: src/streamtuner/streamtuner.cc:71
+msgid "Stream Tuner"
+msgstr "Stream Tuner"
+
 #: src/tonegen/tonegen.cc:45
 msgid "Tone Generator"
 msgstr "Xerador de tons"
 
-#: src/tonegen/tonegen.cc:94
+#: src/tonegen/tonegen.cc:92
 #, c-format
 msgid "%s %.1f Hz"
 msgstr "%s %.1f Hz"
 
-#: src/tonegen/tonegen.cc:94
+#: src/tonegen/tonegen.cc:92
 msgid "Tone Generator: "
 msgstr "Xerador de tons: "
 
-#: src/tonegen/tonegen.cc:160
+#: src/tonegen/tonegen.cc:161
 msgid ""
 "Sine tone generator by Håvard Kvålen <havardk@xmms.org>\n"
 "Modified by Daniel J. Peng <danielpeng@bigfoot.com>\n"
@@ -4246,11 +4649,32 @@
 "frecuencia3;...\n"
 "p.ex. tone://2000;2005 para reproducir un ton de 2000 Hz e un ton de 2005 Hz"
 
+#: src/ui-common/dialogs-qt.cc:40
+msgid ""
+"\n"
+"(Further messages have been hidden.)"
+msgstr ""
+"\n"
+"(O resto de mensaxes foron agochados.)"
+
+#: src/ui-common/dialogs-qt.cc:52
+msgid "Working ..."
+msgstr "Traballando..."
+
+#: src/ui-common/dialogs-qt.cc:73
+msgid "Information"
+msgstr "Información"
+
+#: src/ui-common/menu-ops-gtk.cc:132 src/ui-common/menu-ops-qt.cc:113
+#, c-format
+msgid "%s does not appear to be a valid folder."
+msgstr "%s non parece un cartafol correcto."
+
 #: src/voice_removal/voice_removal.cc:28
 msgid "Voice Removal"
 msgstr "Supresión de voz"
 
-#: src/vorbis/vorbis.cc:465
+#: src/vorbis/vorbis.cc:433
 msgid ""
 "Audacious Ogg Vorbis Decoder\n"
 "\n"
@@ -4270,7 +4694,7 @@
 "Gian-Carlo Pascutto <gcp@sjeng.org>\n"
 "Eugene Zagidullin <e.asphyx@gmail.com>"
 msgstr ""
-"Decodificador Ogg Vorbis de Audacious\n"
+"Descodificador Ogg Vorbis de Audacious\n"
 "\n"
 "Basado no engadido Ogg Vorbis da Xiph.org Foundation:\n"
 "http://www.xiph.org/\n"
@@ -4292,12 +4716,12 @@
 msgid "Ogg Vorbis Decoder"
 msgstr "Descodificador de Ogg Vorbis"
 
-#: src/vtx/info.cc:22
+#: src/vtx/info.cc:24
 #, c-format
 msgid "Details about %s"
 msgstr "Detalles sobre %s"
 
-#: src/vtx/info.cc:24
+#: src/vtx/info.cc:26
 msgid ""
 "Title: %t\n"
 "Author: %a\n"
@@ -4327,7 +4751,7 @@
 msgid "VTX Decoder"
 msgstr "Descodificador VTX"
 
-#: src/vtx/vtx.cc:184
+#: src/vtx/vtx.cc:178
 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"
@@ -4338,19 +4762,63 @@
 "Baseado no in_vtx.dll by Roman Sherbakov <v_soft@microfor.ru>\n"
 "Engadido de Audacious por Pavel Vymetalek <pvymetalek@seznam.cz>"
 
-#: src/wavpack/wavpack.cc:24
+#: src/vumeter-qt/vumeter_qt.cc:31
+msgid ""
+"VU Meter Plugin for Audacious\n"
+"Copyright 2017-2019 Marc Sánchez Fauste"
+msgstr ""
+"Engadido de vúmetro para Audacious\n"
+"Dereitos de autor 2017-2019 Marc Sánchez Fauste"
+
+#: src/vumeter-qt/vumeter_qt.cc:35
+msgid "VU Meter Settings"
+msgstr "Axustes do vúmetro"
+
+#: src/vumeter-qt/vumeter_qt.cc:37
+msgid "Peak hold time:"
+msgstr "Duración do pico:"
+
+#: src/vumeter-qt/vumeter_qt.cc:42
+msgid "Fall-off time:"
+msgstr "Duración do descenso:"
+
+#: src/vumeter-qt/vumeter_qt.cc:44
+msgid "dB/second"
+msgstr "dB/segundo"
+
+#: src/vumeter-qt/vumeter_qt.cc:46
+msgid "Display legend"
+msgstr "Amosar lenda"
+
+#: src/vumeter-qt/vumeter_qt.h:37
+msgid "VU Meter"
+msgstr "Vúmetro"
+
+#: src/waveout/waveout.cc:43
+msgid "Win32 waveOut"
+msgstr "waveOut de Win32 "
+
+#: src/waveout/waveout.cc:69
+msgid ""
+"Win32 waveOut Plugin for Audacious\n"
+"Copyright 2016 John Lindgren"
+msgstr ""
+"Engadido waveOut de Win32 para Audacious\n"
+"Dereitos de autor 2016 John Lindgren"
+
+#: src/wavpack/wavpack.cc:25
 msgid "WavPack Decoder"
 msgstr "Descodificador WavPack"
 
-#: src/wavpack/wavpack.cc:211
+#: src/wavpack/wavpack.cc:217
 msgid "lossy (hybrid)"
 msgstr "con perdas (híbrido)"
 
-#: src/wavpack/wavpack.cc:213
+#: src/wavpack/wavpack.cc:219
 msgid "lossy"
 msgstr "con perdas"
 
-#: src/wavpack/wavpack.cc:255
+#: src/wavpack/wavpack.cc:259
 msgid ""
 "Copyright 2006 William Pitcock <nenolod@nenolod.net>\n"
 "\n"
@@ -4360,18 +4828,38 @@
 "\n"
 "Unah parte do código do engadido foi feita por Miles Egan."
 
-#: src/xsf/plugin.cc:50
+#: src/xsf/plugin.cc:74
 msgid "2SF Decoder"
 msgstr "Descodificador 2SF"
 
-#: src/xsf/plugin.cc:238
+#: src/xsf/plugin.cc:429
+msgid "32728 Hz"
+msgstr "32728 Hz"
+
+#: src/xsf/plugin.cc:432
+msgid "65456 Hz"
+msgstr "65456 Hz"
+
+#: src/xsf/plugin.cc:438
+msgid "Cosine"
+msgstr "Coseno "
+
+#: src/xsf/plugin.cc:439
+msgid "Sharp"
+msgstr ""
+
+#: src/xsf/plugin.cc:443
 msgid "XSF Configuration"
 msgstr "Configuración XSF"
 
-#: src/xsf/plugin.cc:239
-msgid "Ignore length from file"
-msgstr "Ignorar a duración do ficheiro"
+#: src/xsf/plugin.cc:445
+msgid "Default fade time:"
+msgstr "Tempo predet. do escaecemento:"
+
+#: src/xsf/plugin.cc:447
+msgid "Interpolation mode:"
+msgstr "Modo interpolación:"
 
-#: src/xspf/xspf.cc:89
+#: src/xspf/xspf.cc:95
 msgid "XML Shareable Playlists (XSPF)"
 msgstr "Lista de reprodución XML compartíbel (XSPF)"

audacious-plugins-3.6.2-gtk3.tar.bz2/po/hu.po -> audacious-plugins-4.4.1.tar.bz2/po/hu.po Changed

@@ -3,18 +3,27 @@
 # This file is distributed under the same license as the Audacious Plugins package.
 #
 # Translators:
+# Agócs Dániel <agocsdaniel@gmail.com>, 2015
+# Balázs Glatz <glatz.balazs@gmail.com>, 2015
+# Balázs Meskó <meskobalazs@mailbox.org>, 2018
+# Balázs Meskó <meskobalazs@mailbox.org>, 2022-2023
+# ec1a2cece4ae9ae9a5aaf1b635c7d633_05cc932 <4d0fe008c62e3981ff6f0c2cb58f2e06_113291>, 2018
 # Ferenc Szabo <szaboferee@gmail.com>, 2015
+# Gábor Sávolyi, 2016
 # Gergely Békési <bekesi.gergely@gmail.com>, 2014
+# Kris Aku, 2024
+# Nyul Csoki <csokinyul@i2pmail.org>, 2021
 # Péter Polonkai <polesz@nedudu.hu>, 2010
-# Péter Polonkai <polesz@nedudu.hu>, 2011-2012,2014-2015
+# Péter Polonkai <polesz@nedudu.hu>, 2011-2012,2014-2016
 msgid ""
 msgstr ""
 "Project-Id-Version: Audacious Plugins\n"
-"Report-Msgid-Bugs-To: http://redmine.audacious-media-player.org/\n"
-"POT-Creation-Date: 2015-04-03 11:52+0200\n"
-"PO-Revision-Date: 2015-03-04 13:41+0000\n"
-"Last-Translator: Péter Polonkai <polesz@nedudu.hu>\n"
-"Language-Team: Hungarian (http://www.transifex.com/projects/p/audacious/"
+"Report-Msgid-Bugs-To: https://github.com/audacious-media-player/audacious/"
+"issues\n"
+"POT-Creation-Date: 2024-09-26 21:54+0200\n"
+"PO-Revision-Date: 2011-10-10 17:43+0000\n"
+"Last-Translator: Kris Aku, 2024\n"
+"Language-Team: Hungarian (http://app.transifex.com/audacious/audacious/"
 "language/hu/)\n"
 "Language: hu\n"
 "MIME-Version: 1.0\n"
@@ -22,242 +31,60 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/aac-raw/aac.cc:18
+#: src/aac/aac.cc:19
 msgid "AAC (Raw) Decoder"
-msgstr "AAC (Nyers) Dekóder"
+msgstr "AAC (nyers) dekódoló"
 
-#: src/adplug/adplug-xmms.cc:42
+#: src/adplug/adplug-xmms.cc:70
 msgid "AdPlug (AdLib Player)"
-msgstr "AdPlug (AdLib Lejátszó)"
+msgstr "AdPlug (AdLib lejátszó)"
 
-#: src/adplug/adplug-xmms.cc:156 src/modplug/modplugbmp.cc:335
-#: src/psf/plugin.cc:138 src/vtx/vtx.cc:87 src/xsf/plugin.cc:113
+#: src/adplug/adplug-xmms.cc:167 src/modplug/modplugbmp.cc:321
+#: src/psf/plugin.cc:161 src/vtx/vtx.cc:89 src/xsf/plugin.cc:204
 msgid "sequenced"
 msgstr "soros"
 
-#: src/alarm/alarm.cc:55 src/alarm/interface.cc:82
-msgid "Alarm"
-msgstr "Riasztás"
-
-#: src/alarm/alarm.cc:782
-msgid "Set Alarm ..."
-msgstr "Riasztás beállítása ..."
-
-#: src/alarm/alarm.cc:810
-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 ""
-"Bővítmény a lejátszás időzített elindításához\n"
-"\n"
-"Eredetileg Adam Feakin és Daniel Stodden írta."
-
-#: src/alarm/interface.cc: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.cc: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.cc: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.cc:81
-msgid "This is your wakeup call."
-msgstr "Ez egy ébresztési hívás."
-
-#: src/alarm/interface.cc:99
-msgid "Your reminder for today is..."
-msgstr "A mai emlékeztető.."
-
-#: src/alarm/interface.cc:101 src/alarm/interface.cc:386
-msgid "Reminder"
-msgstr "Emlékeztető"
-
-#: src/alarm/interface.cc:132
-msgid "Monday"
-msgstr "Hétfő"
-
-#: src/alarm/interface.cc:132
-msgid "Tuesday"
-msgstr "Kedd"
-
-#: src/alarm/interface.cc:132
-msgid "Wednesday"
-msgstr "Szerda"
-
-#: src/alarm/interface.cc:133
-msgid "Thursday"
-msgstr "Csütörtök"
-
-#: src/alarm/interface.cc:133
-msgid "Friday"
-msgstr "Péntek"
-
-#: src/alarm/interface.cc:133
-msgid "Saturday"
-msgstr "Szombat"
-
-#: src/alarm/interface.cc:133
-msgid "Sunday"
-msgstr "Vasárnap"
-
-#: src/alarm/interface.cc:171 src/alarm/interface.cc:230
-#: src/alarm/interface.cc:245
-msgid "Time"
-msgstr "Idő"
-
-#: src/alarm/interface.cc:178
-msgid "Alarm at (default):"
-msgstr "Riasztás (alapértelmezett):"
-
-#: src/alarm/interface.cc:200
-msgid "h"
-msgstr "h"
-
-#: src/alarm/interface.cc:203
-msgid "Quiet after:"
-msgstr "Csendes ezután:"
-
-#: src/alarm/interface.cc:215
-msgid "hours"
-msgstr "óra"
-
-#: src/alarm/interface.cc:226
-msgid "minutes"
-msgstr "perc"
-
-#: src/alarm/interface.cc:235
-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/adplug/adplug-xmms.cc:349 src/sid/xs_config.cc:61
+msgid "Output"
+msgstr "Kimenet"
 
-#: src/alarm/interface.cc:242
-msgid "Day"
-msgstr "Nap"
+#: src/adplug/adplug-xmms.cc:350
+msgid "OPL Emulator:"
+msgstr "OPL emulátor:"
+
+#: src/adplug/adplug-xmms.cc:353 src/amidiplug/i_configure.cc:153
+#: src/console/plugin.cc:45 src/filewriter/filewriter.cc:481
+#: src/sid/xs_config.cc:65 src/xsf/plugin.cc:446
+msgid "Sample rate:"
+msgstr "Mintavételi frekvencia:"
 
-#: src/alarm/interface.cc:259 src/bs2b/plugin.cc:130
-#: src/skins/preset-list.cc:434 src/skins/preset-list.cc:440
-msgid "Default"
-msgstr "Alapértelmezett"
+#: src/adplug/adplug-xmms.cc:354 src/amidiplug/i_configure.cc:155
+#: src/bs2b/plugin.cc:141 src/console/plugin.cc:47
+#: src/modplug/plugin_main.cc:77 src/resample/resample.cc:201
+#: src/resample/resample.cc:207 src/resample/resample.cc:211
+#: src/resample/resample.cc:215 src/resample/resample.cc:219
+#: src/resample/resample.cc:223 src/resample/resample.cc:227
+#: src/resample/resample.cc:231 src/resample/resample.cc:235
+#: src/resample/resample.cc:239 src/resample/resample.cc:243
+#: src/sid/xs_config.cc:67 src/soxr/sox-resampler.cc:205
+msgid "Hz"
+msgstr "Hz"
 
-#: src/alarm/interface.cc:288
-msgid "Days"
-msgstr "Napok"
-
-#: src/alarm/interface.cc:297
-msgid "Fading"
-msgstr "Elhalványulás"
-
-#: src/alarm/interface.cc:305 src/console/plugin.cc:41
-#: src/crossfade/crossfade.cc:53 src/crossfade/crossfade.cc:59
-#: src/gtkui/settings.cc:49 src/lirc/lirc.cc:397 src/sid/xs_config.cc:85
-#: src/sid/xs_config.cc:94 src/sid/xs_config.cc:103
-msgid "seconds"
-msgstr "másodperc"
+#: src/adplug/adplug-xmms.cc:355 src/gtkui/settings.cc:55
+#: src/modplug/plugin_main.cc:105 src/qtui/settings.cc:85
+#: src/skins-qt/skins_cfg.cc:302 src/skins/skins_cfg.cc:284
+msgid "Miscellaneous"
+msgstr "Egyéb"
 
-#: src/alarm/interface.cc:312 src/alarm/interface.cc:353
-msgid "Volume"
-msgstr "Hangerő"
-
-#: src/alarm/interface.cc:317
-msgid "Start at"
-msgstr "Kezdjük a"
-
-#: src/alarm/interface.cc:333
-msgid "Final"
-msgstr "Vége"
-
-#: src/alarm/interface.cc:346
-msgid "Current"
-msgstr "Jelenlegi"
-
-#: src/alarm/interface.cc:359
-msgid "Additional Command"
-msgstr "További parancs"
-
-#: src/alarm/interface.cc:365 src/alarm/interface.cc:391
-msgid "enable"
-msgstr "engedélyez"
-
-#: src/alarm/interface.cc:372
-msgid "Playlist (optional)"
-msgstr "Lejátszólista (opcionális)"
-
-#: src/alarm/interface.cc:379
-msgid "Select a playlist"
-msgstr "Lejátszólista választása"
-
-#: src/alarm/interface.cc:399
-msgid "Options"
-msgstr "Opciók"
-
-#: src/alarm/interface.cc:404
-msgid "What do these options mean?"
-msgstr "Mit jelentenek ezek a lehetőségek?"
-
-#: src/alarm/interface.cc:420
-msgid "Help"
-msgstr "Súgó"
+#: src/adplug/adplug-xmms.cc:356
+msgid "Repeat song in endless loop"
+msgstr "A szám ismétlése végtelen ciklusban"
 
-#: src/albumart/albumart.cc:31
+#: src/albumart/albumart.cc:31 src/albumart-qt/albumart.cc:35
 msgid "Album Art"
 msgstr "Album borító"
 
-#: src/albumart-qt/albumart.cc:33
-msgid "Album Art (Qt)"
-msgstr "Album borító (Qt)"
-
-#: src/alsa/alsa.h:70
+#: src/alsa/alsa.h:64
 msgid "ALSA Output"
 msgstr "ALSA kimenet"
 
@@ -269,6 +96,12 @@
 "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 Kimeneti Bővítmény az Audacious-hoz\n"
+"Copyright 2009-2012 John Lindgren\n"
+"\n"
+"Köszönet William Pitcock-nak, az ALSA Output Plugin NG alkotójának, akinek "
+"kódjai referenciaként szolgáltak, amikor az ALSA kézikönyve kevésnek "
+"bizonyult."
 
 #: src/alsa/config.cc:61
 msgid "(no description)"
@@ -294,11 +127,11 @@
 msgid "Mixer element:"
 msgstr "Mixer elem:"
 
-#: src/amidi-plug/amidi-plug.cc:41
+#: src/amidiplug/amidi-plug.cc:42
 msgid "AMIDI-Plug (MIDI Player)"
 msgstr "AMIDI-Plug (MIDI Lejátszó)"
 
-#: src/amidi-plug/amidi-plug.cc:437
+#: src/amidiplug/amidi-plug.cc:445
 msgid ""
 "AMIDI-Plug\n"
 "modular MIDI music player\n"
@@ -320,158 +153,181 @@
 "Tony Vroon\n"
 "for the good help with alpha testing"
 msgstr ""
+"AMIDI-Plug\n"
+"moduláris MIDI lejátszó bővítmény\n"
+"http://www.develia.org/projects.php?p=amidiplug\n"
+"\n"
+"írta Giacomo Lozito\n"
+"<james@develia.org>\n"
+"\n"
+"köszönet...\n"
+"\n"
+"Clemens Ladisch-nek és Jaroslav Kysela-nak\n"
+"a menő aplaymidi és amixer programokért, amik\n"
+"nagyon kasznosak voltak, az alsa-lib leírással együtt\n"
+"az ALSA API megértéséhez\n"
+"\n"
+"Alfredo Spadafina-nak\n"
+"a szép Midi Zongora logóért\n"
+"\n"
+"Tony Vroon-nak\n"
+"a sok segítségért a tesztelésben"
 
-#: src/amidi-plug/i_configure.cc:94
+#: src/amidiplug/i_configure.cc:94
 msgid "Override default gain:"
-msgstr ""
+msgstr "Alapértelmezett erősítés felülbírálása:"
 
-#: src/amidi-plug/i_configure.cc:102
+#: src/amidiplug/i_configure.cc:102
 msgid "Override default polyphony:"
-msgstr ""
+msgstr "Alapértelmezett polifónia felülbírálása:"
 
-#: src/amidi-plug/i_configure.cc:110
+#: src/amidiplug/i_configure.cc:110
 msgid "Override default reverb:"
-msgstr ""
+msgstr "Alapértelmezett visszhang felülbírálása:"
 
-#: src/amidi-plug/i_configure.cc:112 src/amidi-plug/i_configure.cc:120
+#: src/amidiplug/i_configure.cc:112 src/amidiplug/i_configure.cc:120
 msgid "On"
 msgstr "Be"
 
-#: src/amidi-plug/i_configure.cc:118
+#: src/amidiplug/i_configure.cc:118
 msgid "Override default chorus:"
-msgstr ""
+msgstr "Alapértelmezett kórus hatás felülbírálása:"
 
-#: src/amidi-plug/i_configure.cc:128 src/console/plugin.cc:29
+#: src/amidiplug/i_configure.cc:128 src/console/plugin.cc:29
 msgid "Playback"
 msgstr "Lejátszás"
 
-#: src/amidi-plug/i_configure.cc:129
+#: src/amidiplug/i_configure.cc:129
 msgid "Transpose:"
 msgstr "Transzponálás:"
 
-#: src/amidi-plug/i_configure.cc:131
+#: src/amidiplug/i_configure.cc:131 src/speedpitch/speed-pitch.cc:257
 msgid "semitones"
-msgstr ""
+msgstr "félhangok"
 
-#: src/amidi-plug/i_configure.cc:132
+#: src/amidiplug/i_configure.cc:132
 msgid "Drum shift:"
-msgstr ""
+msgstr "Dob eltolás:"
 
-#: src/amidi-plug/i_configure.cc:134
+#: src/amidiplug/i_configure.cc:134
 msgid "note numbers"
-msgstr ""
+msgstr "hangjegy számok"
 
-#: src/amidi-plug/i_configure.cc:135
+#: src/amidiplug/i_configure.cc:135
 msgid "Skip leading silence"
-msgstr ""
+msgstr "Csend levágása az elején"
 
-#: src/amidi-plug/i_configure.cc:137
+#: src/amidiplug/i_configure.cc:137
 msgid "Skip trailing silence"
-msgstr ""
+msgstr "Csend levágása a végén"
 
-#: src/amidi-plug/i_configure.cc:141
+#: src/amidiplug/i_configure.cc:141
 msgid "SoundFont"
-msgstr ""
+msgstr "SoundFont köyvtárak"
 
-#: src/amidi-plug/i_configure.cc:143
+#: src/amidiplug/i_configure.cc:148
 msgid "Synthesizer"
-msgstr ""
-
-#: src/amidi-plug/i_configure.cc:148 src/console/plugin.cc:45
-#: src/sid/xs_config.cc:65
-msgid "Sample rate:"
-msgstr "Mintavételi frekvencia:"
+msgstr "Szintetizátor"
 
-#: src/amidi-plug/i_configure.cc:150 src/bs2b/plugin.cc:141
-#: src/console/plugin.cc:47 src/modplug/plugin_main.cc:78
-#: src/resample/resample.cc:201 src/resample/resample.cc:207
-#: src/resample/resample.cc:211 src/resample/resample.cc:215
-#: src/resample/resample.cc:219 src/resample/resample.cc:223
-#: src/resample/resample.cc:227 src/resample/resample.cc:231
-#: src/resample/resample.cc:235 src/resample/resample.cc:239
-#: src/resample/resample.cc:243 src/sid/xs_config.cc:67
-#: src/sox-resampler/sox-resampler.cc:163
-msgid "Hz"
-msgstr "Hz"
-
-#: src/amidi-plug/i_configure-fluidsynth.cc:52
+#: src/amidiplug/i_configure-fluidsynth.cc:58
+#: src/amidiplug/i_configure-fluidsynth.cc:527
 msgid "AMIDI-Plug - select SoundFont file"
 msgstr "AMIDI-Plug - SoundFont fájl választás"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:55 src/filewriter/mp3.cc:658
+#: src/amidiplug/i_configure-fluidsynth.cc:61
 msgid "_Cancel"
 msgstr "_Mégsem"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:56
+#: src/amidiplug/i_configure-fluidsynth.cc:62
 msgid "_Open"
 msgstr "_Megnyitás"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:225 src/gtkui/columns.cc:46
+#: src/amidiplug/i_configure-fluidsynth.cc:233
+#: src/amidiplug/i_configure-fluidsynth.cc:461
 msgid "File name"
 msgstr "Fájlnév"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:229
+#: src/amidiplug/i_configure-fluidsynth.cc:237
+#: src/amidiplug/i_configure-fluidsynth.cc:464
 msgid "Size (bytes)"
 msgstr "Méret (byte)"
 
-#: src/amidi-plug/i_fileinfo.cc:163
+#: src/amidiplug/i_fileinfo.cc:184
 msgid "Name:"
 msgstr "Név"
 
-#: src/amidi-plug/i_fileinfo.cc:181
+#: src/amidiplug/i_fileinfo.cc:202
 msgid " MIDI Info "
 msgstr " MIDI Információ "
 
-#: src/amidi-plug/i_fileinfo.cc:195
+#: src/amidiplug/i_fileinfo.cc:216
 msgid "Format:"
 msgstr "Formátum:"
 
-#: src/amidi-plug/i_fileinfo.cc:198
+#: src/amidiplug/i_fileinfo.cc:219
 msgid "Length (msec):"
 msgstr "Hossz (msec):"
 
-#: src/amidi-plug/i_fileinfo.cc:201
+#: src/amidiplug/i_fileinfo.cc:222
 msgid "No. of Tracks:"
 msgstr "Sáv sorszáma:"
 
-#: src/amidi-plug/i_fileinfo.cc:207
+#: src/amidiplug/i_fileinfo.cc:228
 msgid "variable"
 msgstr "változó"
 
-#: src/amidi-plug/i_fileinfo.cc:209
+#: src/amidiplug/i_fileinfo.cc:230
 msgid "BPM:"
 msgstr "BPM:"
 
-#: src/amidi-plug/i_fileinfo.cc:217
+#: src/amidiplug/i_fileinfo.cc:238
 msgid "BPM (wavg):"
 msgstr "BPM (wavg):"
 
-#: src/amidi-plug/i_fileinfo.cc:220
+#: src/amidiplug/i_fileinfo.cc:241
 msgid "Time Div:"
 msgstr "Kezdeti idő"
 
-#: src/amidi-plug/i_fileinfo.cc:231
+#: src/amidiplug/i_fileinfo.cc:252
 msgid " MIDI Comments and Lyrics "
-msgstr " MIDI Megjegyzések és Dalszövegek "
+msgstr " MIDI megjegyzések és dalszövegek "
 
-#: src/amidi-plug/i_fileinfo.cc:278
+#: src/amidiplug/i_fileinfo.cc:299
 msgid "* no comments available in this MIDI file *"
-msgstr "* nem található megjegyzés ehhez a MIDI fájlhoz *"
+msgstr "* nem található megjegyzés ehhez a MIDI-fájlhoz *"
 
-#: src/amidi-plug/i_fileinfo.cc:290
+#: src/amidiplug/i_fileinfo.cc:311
 msgid "* no lyrics available in this MIDI file *"
-msgstr "* nem található dalszöveg ehhez a MIDI fájlhoz *"
+msgstr "* nem található dalszöveg ehhez a MIDI-fájlhoz *"
 
-#: src/amidi-plug/i_fileinfo.cc:300 src/filewriter/vorbis.cc:197
-#: src/ladspa/plugin.cc:416
+#: src/amidiplug/i_fileinfo.cc:321 src/ladspa/plugin.cc:418
+#: src/ui-common/dialogs-qt.cc:32
 msgid "_Close"
-msgstr "_Bezár"
+msgstr "_Bezárás"
 
-#: src/amidi-plug/i_fileinfo.cc:325
+#: src/amidiplug/i_fileinfo.cc:346
 msgid " (invalid UTF-8)"
 msgstr " (érvénytelen UTF-8)"
 
-#: src/aosd/aosd.cc:32
+#: src/ampache/ampache.cc:33
+msgid "Ampache Browser"
+msgstr "Ampache Böngésző"
+
+#: src/ampache/ampache.cc:46
+msgid ""
+"Ampache Browser for Audacious\n"
+"http://ampache-browser.org/\n"
+"\n"
+"Copyright (C) Róbert Čerňanský and John Lindgren\n"
+"License: GNU GPLv3"
+msgstr ""
+"Ampache böngésző az Audacioushoz.\n"
+"http://ampache-browser.org/\n"
+"\n"
+"Copyright (C) Róbert Čerňanský és John Lindgren\n"
+"Licenc: GNU GPLv3"
+
+#: src/aosd/aosd.cc:31
 msgid ""
 "Audacious OSD\n"
 "http://www.develia.org/projects.php?p=audacious#aosd\n"
@@ -481,10 +337,16 @@
 "Based in part on Evan Martin's Ghosd library:\n"
 "http://neugierig.org/software/ghosd/"
 msgstr ""
+"Audacious OSD\n"
+"http://www.develia.org/projects.php?p=audacious#aosd\n"
+"Írta Giacomo Lozito <james@develia.org>\n"
+"\n"
+"Részben Evan Martin Ghosd könyvtára alapján:\n"
+"http://neugierig.org/software/ghosd/"
 
 #: src/aosd/aosd.h:37
 msgid "AOSD (On-Screen Display)"
-msgstr ""
+msgstr "AOSD (On-Screen Display)"
 
 #: src/aosd/aosd_style.cc:54
 msgid "Rectangle"
@@ -498,193 +360,189 @@
 msgid "Concave Rectangle"
 msgstr "Konkáv téglalap"
 
-#: src/aosd/aosd_style.cc:69
+#: src/aosd/aosd_style.cc:69 src/openmpt/mptwrap.h:50 src/xsf/plugin.cc:436
 msgid "None"
 msgstr "Nincs"
 
-#: src/aosd/aosd_trigger.cc:50
+#: src/aosd/aosd_trigger.cc:49
 msgid "Playback Start"
 msgstr "Lejátszás kezdete"
 
-#: src/aosd/aosd_trigger.cc:51
+#: src/aosd/aosd_trigger.cc:50
 msgid "Triggers OSD when a playlist entry is played."
 msgstr "OSD használata ha a lejátszólista egy eleme elindul."
 
-#: src/aosd/aosd_trigger.cc:56
+#: src/aosd/aosd_trigger.cc:55
 msgid "Title Change"
-msgstr "Cím váltás"
+msgstr "Címváltás"
 
-#: src/aosd/aosd_trigger.cc:57
+#: src/aosd/aosd_trigger.cc:56
 msgid "Triggers OSD when the song title changes (for internet streams)."
-msgstr ""
+msgstr "Szám címének változásáról értesíti az OSD-t (internetes stream-nél)"
 
-#: src/aosd/aosd_trigger.cc:62
+#: src/aosd/aosd_trigger.cc:61
 msgid "Pause On"
-msgstr "Szünet Be"
+msgstr "Szünet be"
 
-#: src/aosd/aosd_trigger.cc:63
+#: src/aosd/aosd_trigger.cc:62
 msgid "Triggers OSD when playback is paused."
-msgstr "OSD használata ha megállítják a lejátszást."
+msgstr "OSD használata a lejátszás szüneteltetésekor."
 
-#: src/aosd/aosd_trigger.cc:68
+#: src/aosd/aosd_trigger.cc:67
 msgid "Pause Off"
-msgstr "Szünet Ki"
+msgstr "Szünet ki"
 
-#: src/aosd/aosd_trigger.cc:69
+#: src/aosd/aosd_trigger.cc:68
 msgid "Triggers OSD when playback is unpaused."
-msgstr "OSD használata ha elindítják a lejátszást."
+msgstr "OSD használata a lejátszás folytatásakor."
 
-#: src/aosd/aosd_ui.cc:163
+#: src/aosd/aosd_ui.cc:204
 msgid "Placement"
 msgstr "Elhelyezés"
 
-#: src/aosd/aosd_ui.cc:196
+#: src/aosd/aosd_ui.cc:241
 msgid "Relative X offset:"
 msgstr "Relatív X pozíció:"
 
-#: src/aosd/aosd_ui.cc:203
+#: src/aosd/aosd_ui.cc:245
 msgid "Relative Y offset:"
 msgstr "Relatív Y pozíció:"
 
-#: src/aosd/aosd_ui.cc:210
+#: src/aosd/aosd_ui.cc:249
 msgid "Max OSD width:"
-msgstr "Max OSD szélesség:"
+msgstr "OSD legnagyobb szélessége:"
 
-#: src/aosd/aosd_ui.cc:221
+#: src/aosd/aosd_ui.cc:281
 msgid "Multi-Monitor options"
-msgstr "Több monitoros opciók"
+msgstr "Több monitoros lehetőségek"
 
-#: src/aosd/aosd_ui.cc:225
+#: src/aosd/aosd_ui.cc:285
 msgid "Display OSD using:"
-msgstr "OSD képernyők használata:"
+msgstr "OSD megjelenítése:"
 
-#: src/aosd/aosd_ui.cc:227
+#: src/aosd/aosd_ui.cc:287
 msgid "all monitors"
-msgstr "minden monitoron"
+msgstr "az összes monitoron"
 
-#: src/aosd/aosd_ui.cc:230
+#: src/aosd/aosd_ui.cc:290
 #, c-format
 msgid "monitor %i"
-msgstr "monitor %i"
+msgstr "%i. monitor"
 
-#: src/aosd/aosd_ui.cc:282
+#: src/aosd/aosd_ui.cc:342
 msgid "Timing (ms)"
 msgstr "Időtartam (mp)"
 
-#: src/aosd/aosd_ui.cc:287
+#: src/aosd/aosd_ui.cc:347
 msgid "Display:"
 msgstr "Képernyő:"
 
-#: src/aosd/aosd_ui.cc:292
+#: src/aosd/aosd_ui.cc:352
 msgid "Fade in:"
 msgstr "Áttűnés be:"
 
-#: src/aosd/aosd_ui.cc:297
+#: src/aosd/aosd_ui.cc:357
 msgid "Fade out:"
 msgstr "Áttűnés ki:"
 
-#: src/aosd/aosd_ui.cc:361
+#: src/aosd/aosd_ui.cc:442
 msgid "Fonts"
 msgstr "Betűkészletek"
 
-#: src/aosd/aosd_ui.cc:368
+#: src/aosd/aosd_ui.cc:449
 #, c-format
 msgid "Font %i:"
 msgstr "Betűkészlet %i:"
 
-#: src/aosd/aosd_ui.cc:382
+#: src/aosd/aosd_ui.cc:466
 msgid "Shadow"
 msgstr "Árnyék"
 
-#: src/aosd/aosd_ui.cc:486
+#: src/aosd/aosd_ui.cc:589
 msgid "Render Style"
 msgstr "Renderelési stílus"
 
-#: src/aosd/aosd_ui.cc:502
+#: src/aosd/aosd_ui.cc:605
 msgid "Colors"
 msgstr "Színek"
 
-#: src/aosd/aosd_ui.cc:513
+#: src/aosd/aosd_ui.cc:616
 #, c-format
 msgid "Color %i:"
 msgstr "Szín %i:"
 
-#: src/aosd/aosd_ui.cc:600
+#: src/aosd/aosd_ui.cc:714
 msgid "Enable trigger"
 msgstr "Esemény engedélyezése"
 
-#: src/aosd/aosd_ui.cc:627
+#: src/aosd/aosd_ui.cc:741
 msgid "Event"
 msgstr "Esemény"
 
-#: src/aosd/aosd_ui.cc:655
+#: src/aosd/aosd_ui.cc:768
 msgid "Composite manager detected"
-msgstr "Kompozit kezelő detektálva"
+msgstr "Kompozitkezelő észlelve"
 
-#: src/aosd/aosd_ui.cc:662
+#: src/aosd/aosd_ui.cc:775
 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ő;\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"
+"Nem észlelhető kompozitkezelő;\n"
+"ha tudja, hogy fut, akkor aktiválja, egyébként az OSD nem fog megfelelően "
+"működni"
 
-#: src/aosd/aosd_ui.cc:670
+#: src/aosd/aosd_ui.cc:783
 msgid "Composite manager not required for fake transparency"
-msgstr "Kompozít kezelő nem szükséges a nem valódi átlátszósághoz"
+msgstr "Nem szükséges kompozitkezelő a nem valódi átlátszósághoz"
 
-#: src/aosd/aosd_ui.cc:706
+#: src/aosd/aosd_ui.cc:820
 msgid "Transparency"
 msgstr "Átlátszóság"
 
-#: src/aosd/aosd_ui.cc:712
+#: src/aosd/aosd_ui.cc:826
 msgid "Fake transparency"
 msgstr "Nem valódi átlátszóság"
 
-#: src/aosd/aosd_ui.cc:714
+#: src/aosd/aosd_ui.cc:828
 msgid "Real transparency (requires X Composite Ext.)"
-msgstr "Valódi átlászóság (szükséges X Composite Ext.)"
+msgstr "Valódi átlátszóság (X kompozitálási kiterjesztés szükséges)"
 
-#: src/aosd/aosd_ui.cc:756
+#: src/aosd/aosd_ui.cc:875
 msgid "Composite extension not loaded"
-msgstr "Kompozit kiterjesztés nem tölthető be"
-
-#: src/aosd/aosd_ui.cc:764
-msgid "Composite extension not available"
-msgstr "Kompozit kiterjesztés nem érhető el"
+msgstr "A kompozitálási kiterjesztés nem tölthető be"
 
-#: src/aosd/aosd_ui.cc:781
+#: src/aosd/aosd_ui.cc:892
 #, c-format
 msgid "Audacious OSD"
 msgstr "Audacious OSD"
 
-#: src/aosd/aosd_ui.cc:844
+#: src/aosd/aosd_ui.cc:955
 msgid "Position"
 msgstr "Pozíció"
 
-#: src/aosd/aosd_ui.cc:849
+#: src/aosd/aosd_ui.cc:960
 msgid "Animation"
 msgstr "Animáció"
 
-#: src/aosd/aosd_ui.cc:854
+#: src/aosd/aosd_ui.cc:965
 msgid "Text"
 msgstr "Szöveg"
 
-#: src/aosd/aosd_ui.cc:859
+#: src/aosd/aosd_ui.cc:970
 msgid "Decoration"
 msgstr "Dekoráció"
 
-#: src/aosd/aosd_ui.cc:864
+#: src/aosd/aosd_ui.cc:975
 msgid "Trigger"
 msgstr "Esemény"
 
-#: src/aosd/aosd_ui.cc:869
+#: src/aosd/aosd_ui.cc:980 src/streamtuner/shoutcast-model.cc:202
 msgid "Misc"
 msgstr "Egyéb"
 
-#: src/aosd/aosd_ui.cc:878
+#: src/aosd/aosd_ui.cc:989
 msgid "Test"
 msgstr "Teszt"
 
@@ -700,25 +558,101 @@
 msgid "Audacious Playlists (audpl)"
 msgstr "Audacious lejátszólisták (audpl)"
 
-#: src/blur_scope/blur_scope.cc:42
+#: src/background_music/background_music.cc:24
+msgid "Background music"
+msgstr "Háttér zene"
+
+#: src/background_music/background_music.cc:25
+msgid "Target level:"
+msgstr "Célszint:"
+
+#: src/background_music/background_music.cc:28
+#: src/background_music/background_music.cc:33
+#: src/silence-removal/silence-removal.cc:70
+msgid "dB"
+msgstr "dB"
+
+#: src/background_music/background_music.cc:29
+msgid "Maximum amplification:"
+msgstr "Maximális erősítés:"
+
+#: src/background_music/background_music.cc:34 src/mpg123/mpg123.cc:81
+msgid "Advanced"
+msgstr "Haladó"
+
+#: src/background_music/background_music.cc:36
+msgid "Slow detection weight:"
+msgstr "Lassú észlelési súly:"
+
+#: src/background_music/background_music.cc:39
+msgid "Hint"
+msgstr "Tipp"
+
+#: src/background_music/background_music.cc:41
+msgid ""
+"Slow detection weight is the relative weight\n"
+"of a long term average detection when compared\n"
+"to the actual, faster loudness detection.\n"
+"A value of zero gives a more radio-like sound\n"
+"where soft passages get \"pulled up\" more quickly,\n"
+"a value of two makes the sound feel less compressed."
+msgstr ""
+
+#: src/background_music/background_music.cc:52
+msgid ""
+"Background Music Plugin for Audacious\n"
+"Copyright 2023;2024 Michel Fleur\n"
+"\n"
+"Controls the volume to make the sound equally loud within and between "
+"tracks.\n"
+" It uses accurate loudness measurement and tries to make the volume changes "
+"sound natural without audible peaks, yet without lowering the volume before "
+"a peak in advance."
+msgstr ""
+
+#: src/background_music/background_music.cc:61
+msgid "Background Music"
+msgstr "Háttér Zene"
+
+#: src/bitcrusher/bitcrusher.cc:33
+msgid "Bitcrusher"
+msgstr "Bitcrusher"
+
+#: src/bitcrusher/bitcrusher.cc:34
+msgid "Bit Depth:"
+msgstr "Bitmélység:"
+
+#: src/bitcrusher/bitcrusher.cc:37
+msgid "Downsample ratio:"
+msgstr "Alulmintavételezési arány:"
+
+#: src/bitcrusher/bitcrusher.cc:48
+msgid "Bitcrusher"
+msgstr "Bitcrusher"
+
+#: src/blur_scope/blur_scope.cc:40 src/blur_scope-qt/blur_scope.cc:45
 msgid "Color"
 msgstr "Szín"
 
-#: src/blur_scope/blur_scope.cc:58
+#: src/blur_scope/blur_scope.cc:56 src/blur_scope-qt/blur_scope.cc:158
 msgid "Blur Scope"
 msgstr "Szolid szkóp"
 
 #: src/bs2b/plugin.cc:38
 msgid "Bauer Stereophonic-to-Binaural (BS2B)"
-msgstr ""
+msgstr "Bauer Stereophonic -> Binaural (BS2B)"
 
 #: src/bs2b/plugin.cc:129
 msgid "Presets:"
-msgstr ""
+msgstr "Előbeállítások:"
+
+#: src/bs2b/plugin.cc:130
+msgid "Default"
+msgstr "Alapértelmezett"
 
 #: src/bs2b/plugin.cc:136
 msgid "Feed level:"
-msgstr ""
+msgstr "Bemenő szint:"
 
 #: src/bs2b/plugin.cc:138
 msgid "x1/10 dB"
@@ -728,15 +662,15 @@
 msgid "Cut frequency:"
 msgstr "Vágási frekvencia:"
 
-#: src/cairo-spectrum/cairo-spectrum.cc:41
+#: src/cairo-spectrum/cairo-spectrum.cc:42 src/qt-spectrum/qt-spectrum.cc:107
 msgid "Spectrum Analyzer"
 msgstr "Spektrum analizátor"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:72
+#: src/cdaudio/cdaudio-ng.cc:74
 msgid "Audio CD Plugin"
 msgstr "Audio CD bővítmény"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:121
+#: src/cdaudio/cdaudio-ng.cc:121
 msgid ""
 "Copyright (C) 2007-2012 Calin Crisan <ccrisan@gmail.com> and others.\n"
 "\n"
@@ -759,132 +693,132 @@
 "\n"
 "Copyright 2009 John Lindgren"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:137
+#: src/cdaudio/cdaudio-ng.cc:140
 msgid "Device"
 msgstr "Eszköz"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:138
+#: src/cdaudio/cdaudio-ng.cc:141
 msgid "Read speed:"
 msgstr "Olvasási sebesség:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:141
+#: src/cdaudio/cdaudio-ng.cc:144
 msgid "Override device:"
 msgstr "Eszköz felülírása:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:143
+#: src/cdaudio/cdaudio-ng.cc:146
 msgid "Metadata"
 msgstr "Metaadat"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:144
+#: src/cdaudio/cdaudio-ng.cc:147
 msgid "Use CD-Text"
 msgstr "CD-Text használata"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:146
+#: src/cdaudio/cdaudio-ng.cc:150
 msgid "Use CDDB"
 msgstr "CDDB használata"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:148
+#: src/cdaudio/cdaudio-ng.cc:152
 msgid "Use HTTP instead of CDDBP"
-msgstr "Hasznájon HTTP helyett CDDBP protokollt"
+msgstr "HTTP használata a CDDBP helyett"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:151
+#: src/cdaudio/cdaudio-ng.cc:155
 msgid "Server:"
 msgstr "Szerver:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:155
+#: src/cdaudio/cdaudio-ng.cc:159
 msgid "Path:"
 msgstr "Elérési út:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:159
+#: src/cdaudio/cdaudio-ng.cc:163
 msgid "Port:"
 msgstr "Port:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:246
+#: src/cdaudio/cdaudio-ng.cc:228
 msgid "Failed to initialize cdio subsystem."
 msgstr "A cdio alrendszer inicializálása sikertelen."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:281
+#: src/cdaudio/cdaudio-ng.cc:260
 #, c-format
 msgid "Invalid URI %s."
 msgstr "Érvénytelen URI: %s."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:283
+#: src/cdaudio/cdaudio-ng.cc:262
 #, c-format
 msgid "Track %d not found."
 msgstr "%d sáv nem található."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:285
+#: src/cdaudio/cdaudio-ng.cc:264
 #, c-format
 msgid "Track %d is a data track."
 msgstr "Ez adatsáv: %d."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:360
+#: src/cdaudio/cdaudio-ng.cc:339
 msgid "Error reading audio CD."
 msgstr "Hiba az audio CD olvasásakor."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:429
+#: src/cdaudio/cdaudio-ng.cc:410
 msgid "Audio CD"
 msgstr "Audio CD"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:460 src/cdaudio-ng/cdaudio-ng.cc:469
+#: src/cdaudio/cdaudio-ng.cc:446 src/cdaudio/cdaudio-ng.cc:455
 #, c-format
 msgid "Failed to open CD device %s."
 msgstr "A CD eszköz %s megnyitása sikertelen."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:472
+#: src/cdaudio/cdaudio-ng.cc:458
 msgid "No audio capable CD drive found."
-msgstr ""
+msgstr "Nincs hanglemez-képes CD maghajtó."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:497
+#: src/cdaudio/cdaudio-ng.cc:481
+msgid "Drive is empty."
+msgstr "A meghajtó üres."
+
+#: src/cdaudio/cdaudio-ng.cc:483
+msgid "Unsupported disk type."
+msgstr "Nem támogatott lemeztípus."
+
+#: src/cdaudio/cdaudio-ng.cc:507
 msgid "Failed to finish initializing opened CD drive."
-msgstr ""
+msgstr "A megnyitott CD meghajtó inicializálása sikertelen."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:510
+#: src/cdaudio/cdaudio-ng.cc:520
 msgid "Failed to retrieve first/last track number."
-msgstr ""
+msgstr "Az első/utolsó sáv számának lekérdezése sikertelen."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:531
+#: src/cdaudio/cdaudio-ng.cc:541
 #, c-format
 msgid "Cannot read start/end LSN for track %d."
-msgstr ""
+msgstr "Az LSN eleje/vége nem olvasható a %d. sávon."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:613
-msgid "Failed to create the cddb connection."
-msgstr "Sikertelen a cddb kapcsolat létrehozása."
+#: src/cdaudio/cdaudio-ng.cc:624
+msgid "Failed to create the CDDB connection."
+msgstr "A CDDB kapcsolat létrehozása meghiúsult."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:679
+#: src/cdaudio/cdaudio-ng.cc:690
 msgid "Failed to query the CDDB server"
-msgstr ""
+msgstr "A CDDB kiszolgáló lekérdezése sikertelen."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:681
+#: src/cdaudio/cdaudio-ng.cc:692
 #, c-format
 msgid "Failed to query the CDDB server: %s"
-msgstr ""
+msgstr "A CDDB kiszolgáló lekérdezése sikertelen: %s"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:705
+#: src/cdaudio/cdaudio-ng.cc:716
 #, c-format
-msgid "Failed to read the cddb info: %s"
-msgstr ""
-
-#: src/cdaudio-ng/cdaudio-ng.cc:765
-msgid "Drive is empty."
-msgstr "A meghajtó üres."
-
-#: src/cdaudio-ng/cdaudio-ng.cc:767
-msgid "Unsupported disk type."
-msgstr "Nem támogatott lemez típus."
+msgid "Failed to read the CDDB info: %s"
+msgstr "A CDDB információ kiolvasása meghiúsult: %s"
 
-#: src/cd-menu-items/cd-menu-items.cc:35
+#: src/cd-menu-items/cd-menu-items.cc:33
 msgid "Audio CD Menu Items"
 msgstr "Audio CD menüelemek"
 
-#: src/cd-menu-items/cd-menu-items.cc:47
-msgid "Play CD"
-msgstr "CD lejátszása"
-
-#: src/cd-menu-items/cd-menu-items.cc:47
-msgid "Add CD"
-msgstr "CD Hozzáadása"
+#: src/cd-menu-items/cd-menu-items.cc:45
+msgid "Pla_y CD"
+msgstr "CD _lejátszása"
+
+#: src/cd-menu-items/cd-menu-items.cc:45
+msgid "_Add CD"
+msgstr "CD _hozzáadása"
 
 #: src/compressor/compressor.cc:45
 msgid "Compression"
@@ -892,7 +826,7 @@
 
 #: src/compressor/compressor.cc:46
 msgid "Center volume:"
-msgstr "Közép hangerő:"
+msgstr "Középső hangereje:"
 
 #: src/compressor/compressor.cc:49
 msgid "Dynamic range:"
@@ -903,6 +837,8 @@
 "Dynamic Range Compression Plugin for Audacious\n"
 "Copyright 2010-2014 John Lindgren"
 msgstr ""
+"Dinamikatartomány Kompresszió Bővítmény az Audacious-hoz\n"
+"Copyright 2010-2014 John Lindgren"
 
 #: src/compressor/compressor.cc:64
 msgid "Dynamic Range Compressor"
@@ -917,6 +853,13 @@
 "William Pitcock <nenolod@dereferenced.org>\n"
 "Shay Green <gblargg@gmail.com>"
 msgstr ""
+"Játékkonzol zene dekódoló a Game_Music_Emu 0.5.2 alapján az Audacioushoz\n"
+"Támogatott formátumok: AY, GBS, GYM, HES, KSS, NSF, NSFE, SAP, SPC, VGM, "
+"VGZ\n"
+"\n"
+"Audacious bővítmény szerzői:\n"
+"William Pitcock <nenolod@dereferenced.org>\n"
+"Shay Green <gblargg@gmail.com>"
 
 #: src/console/plugin.cc:30
 msgid "Bass:"
@@ -932,23 +875,30 @@
 
 #: src/console/plugin.cc:39
 msgid "Default song length:"
-msgstr "Alapértelmezett szám hossz:"
+msgstr "Alapértelmezett számhossz:"
 
-#: src/console/plugin.cc:42 src/modplug/plugin_main.cc:59
+#: src/console/plugin.cc:41 src/crossfade/crossfade.cc:56
+#: src/crossfade/crossfade.cc:62 src/lirc/lirc.cc:395 src/notify/notify.cc:113
+#: src/sid/xs_config.cc:85 src/sid/xs_config.cc:94 src/sid/xs_config.cc:103
+#: src/vumeter-qt/vumeter_qt.cc:39
+msgid "seconds"
+msgstr "másodperc"
+
+#: src/console/plugin.cc:42 src/modplug/plugin_main.cc:58
 msgid "Resampling"
-msgstr ""
+msgstr "Újramintavételezés"
 
 #: src/console/plugin.cc:43
 msgid "Enable audio resampling"
-msgstr "Engedélyezi az audio újra mintavételezést"
+msgstr "Hang újramintavételezésének engedélyezése"
 
 #: src/console/plugin.cc:49
 msgid "SPC"
-msgstr ""
+msgstr "SPC"
 
 #: src/console/plugin.cc:50
 msgid "Ignore length from SPC tags"
-msgstr ""
+msgstr "Tárolt hossz figyelmen kívül hagyása"
 
 #: src/console/plugin.cc:52
 msgid "Increase reverb"
@@ -956,77 +906,99 @@
 
 #: src/console/plugin.h:26
 msgid "Game Console Music Decoder"
-msgstr "Játék Konzol Zene Dekóder"
+msgstr "Játékkonzol-zenedekódoló"
 
-#: src/coreaudio/coreaudio.cc:50
+#: src/coreaudio/coreaudio.cc:53
 msgid "CoreAudio output"
 msgstr "CoreAudio kimenet"
 
-#: src/coreaudio/coreaudio.cc:131
+#: src/coreaudio/coreaudio.cc:155
 msgid ""
 "CoreAudio Output Plugin for Audacious\n"
 "Copyright 2014 William Pitcock\n"
+"Copyright 2017,18 René J.V. Bertin\n"
+" (original code and code adapted from\n"
+" Apple examples, (C) Apple 2013)\n"
 "\n"
 "Based on SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
 msgstr ""
+"CoreAudio kimeneti bővítmény az Audacious-hoz\n"
+"Copyright 2014 William Pitcock\n"
+"Copyright 2017,18 René J.V. Bertin\n"
+" (eredeti kód, és az Apple mintákból\n"
+" átvett példák, (C) Apple 2013)\n"
+"\n"
+"Az SDL kimeneti bővítmény alapján\n"
+"Copyright 2010 John Lindgren"
 
-#: src/coreaudio/coreaudio.cc:143
+#: src/coreaudio/coreaudio.cc:171
 msgid "Use exclusive mode"
-msgstr ""
+msgstr "Exkluzív mód használata"
+
+#: src/coreaudio/coreaudio.cc:173
+msgid "Use bit perfect audio (adapt device sampling rate)"
+msgstr "Bitpontos hang használata (eszköz mintavételi arányának igazítása)"
 
-#: src/crossfade/crossfade.cc:44
+#: src/crossfade/crossfade.cc:47
 msgid ""
 "Crossfade Plugin for Audacious\n"
 "Copyright 2010-2014 John Lindgren"
 msgstr ""
+"Átkeverés Plugin az Audacioushoz\n"
+"Copyright 2010--2014 John Lindgren"
 
-#: src/crossfade/crossfade.cc:48
+#: src/crossfade/crossfade.cc:51
 msgid "Crossfade"
 msgstr "Átfedés"
 
-#: src/crossfade/crossfade.cc:49
+#: src/crossfade/crossfade.cc:52
 msgid "On automatic song change"
 msgstr "Automatikus számváltáskor"
 
-#: src/crossfade/crossfade.cc:51 src/crossfade/crossfade.cc:57
+#: src/crossfade/crossfade.cc:54 src/crossfade/crossfade.cc:60
 msgid "Overlap:"
 msgstr "Átfedés:"
 
-#: src/crossfade/crossfade.cc:55
+#: src/crossfade/crossfade.cc:58
 msgid "On seek or manual song change"
 msgstr "Tekeréskor vagy kézi számváltáskor"
 
-#: src/crossfade/crossfade.cc:61
+#: src/crossfade/crossfade.cc:64
+msgid "No fade in"
+msgstr ""
+
+#: src/crossfade/crossfade.cc:66
+msgid "Use S-curve fade"
+msgstr ""
+
+#: src/crossfade/crossfade.cc:68
+msgid "S-curve steepness:"
+msgstr ""
+
+#: src/crossfade/crossfade.cc:70
+msgid "(higher is steeper)"
+msgstr ""
+
+#: src/crossfade/crossfade.cc:72
 msgid "Tip"
 msgstr "Tipp"
 
-#: src/crossfade/crossfade.cc:62
+#: src/crossfade/crossfade.cc:73
 msgid ""
 "For better crossfading, enable\n"
 "the Silence Removal effect."
 msgstr ""
+"A jobb átkeverés érdekében\n"
+"engedélyezd a Csend levágását"
 
-#: src/crossfade/crossfade.cc:72
+#: src/crossfade/crossfade.cc:83
 msgid "Crossfade"
 msgstr "Átfedés"
 
-#: src/crossfade/crossfade.cc:161
-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.cc:168
-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/crystalizer/crystalizer.cc:31
 msgid "Crystalizer"
-msgstr ""
+msgstr "Kristályosító"
 
 #: src/crystalizer/crystalizer.cc:32 src/stereo_plugin/stereo.cc:45
 msgid "Intensity:"
@@ -1034,64 +1006,65 @@
 
 #: src/crystalizer/crystalizer.cc:43
 msgid "Crystalizer"
-msgstr ""
+msgstr "Kristályosító"
 
-#: src/cue/cue.cc:37
+#: src/cue/cue.cc:42
 msgid "Cue Sheet Plugin"
-msgstr ""
+msgstr "Cue Lista Bővítmény"
 
-#: src/delete-files/delete-files.cc:46 src/delete-files/delete-files.cc:146
+#: src/delete-files/delete-files.cc:53 src/delete-files/delete-files.cc:215
+#: src/delete-files/delete-files.cc:230
 msgid "Delete Files"
 msgstr "Fájlok törlése"
 
-#: src/delete-files/delete-files.cc:75
+#: src/delete-files/delete-files.cc:120
+msgid "No files are selected."
+msgstr "Nincs fájl kiválasztva."
+
+#: src/delete-files/delete-files.cc:125
 #, c-format
-msgid "Error moving %s to trash: %s."
-msgstr ""
+msgid "Do you want to move %s to the trash?"
+msgstr "Kukába helyezi: %s?"
 
-#: src/delete-files/delete-files.cc:86
+#: src/delete-files/delete-files.cc:126
 #, c-format
-msgid "Error deleting %s: %s."
-msgstr "Hiba a törléskor %s: %s."
+msgid "Do you want to permanently delete %s?"
+msgstr "Véglegesen törli: %s?"
 
-#: src/delete-files/delete-files.cc:117
+#: src/delete-files/delete-files.cc:133
 #, c-format
-msgid "Error deleting %s: not a local file."
-msgstr ""
+msgid "Do you want to move %d files to the trash?"
+msgstr "Kukába helyez %d fájlt?"
 
 #: src/delete-files/delete-files.cc:134
-msgid "Do you want to move the selected files to the trash?"
-msgstr ""
-
-#: src/delete-files/delete-files.cc:135
-msgid "Move to Trash"
-msgstr "Kukába helyez"
+#, c-format
+msgid "Do you want to permanently delete %d files?"
+msgstr "Véglegesen töröl %d fájlt?"
 
-#: src/delete-files/delete-files.cc:140
-msgid "Do you want to permanently delete the selected files?"
-msgstr "Véglegesen törli a kiválasztott fájlokat?"
+#: src/delete-files/delete-files.cc:146
+msgid "Move to trash"
+msgstr "Kukába helyezés"
 
-#: src/delete-files/delete-files.cc:141 src/skins/preset-list.cc:411
-#: src/skins/preset-list.cc:427
+#: src/delete-files/delete-files.cc:146
 msgid "Delete"
 msgstr "Törlés"
 
-#: src/delete-files/delete-files.cc:145 src/skins/preset-browser.cc:56
-#: src/skins/preset-list.cc:307 src/skins/ui_playlist.cc:221
+#: src/delete-files/delete-files.cc:213 src/delete-files/delete-files.cc:235
+#: src/skins-qt/search-select.cc:102 src/skins/search-select.cc:78
 msgid "Cancel"
-msgstr "Mégsem"
+msgstr "Mégse"
 
-#: src/delete-files/delete-files.cc:166
+#: src/delete-files/delete-files.cc:267
 msgid "Delete Selected Files"
 msgstr "Kijelölt fájlok törlése"
 
-#: src/delete-files/delete-files.cc:181
+#: src/delete-files/delete-files.cc:287
 msgid "Delete Method"
 msgstr "Törlési mód"
 
-#: src/delete-files/delete-files.cc:182
+#: src/delete-files/delete-files.cc:288
 msgid "Move to trash instead of deleting immediately"
-msgstr ""
+msgstr "Lomtárba dob törlés helyett"
 
 #: src/echo_plugin/echo.cc:9
 msgid ""
@@ -1100,18 +1073,26 @@
 "Surround echo by Carl van Schaik, 1999\n"
 "Updated for Audacious by William Pitcock and John Lindgren, 2010-2014"
 msgstr ""
+"Visszhangosítás Bővítmény\n"
+"Johan Levin, 1999\n"
+"\n"
+"Térhatású visszhang\n"
+"Carl van Schaik, 1999\n"
+"\n"
+"Frissítve az Audacious-hoz\n"
+"William Pitcock, John Lindgren, 2010-2014"
 
 #: src/echo_plugin/echo.cc:21
 msgid "Echo"
 msgstr "Visszhang"
 
-#: src/echo_plugin/echo.cc:22 src/modplug/plugin_main.cc:73
-#: src/modplug/plugin_main.cc:83
+#: src/echo_plugin/echo.cc:22 src/modplug/plugin_main.cc:72
+#: src/modplug/plugin_main.cc:82
 msgid "Delay:"
 msgstr "Késleltetés:"
 
-#: src/echo_plugin/echo.cc:24 src/modplug/plugin_main.cc:73
-#: src/modplug/plugin_main.cc:83
+#: src/echo_plugin/echo.cc:24 src/modplug/plugin_main.cc:72
+#: src/modplug/plugin_main.cc:82 src/xsf/plugin.cc:445
 msgid "ms"
 msgstr "ms"
 
@@ -1119,7 +1100,7 @@
 msgid "Feedback:"
 msgstr "Visszajelzés:"
 
-#: src/echo_plugin/echo.cc:28 src/modplug/plugin_main.cc:87
+#: src/echo_plugin/echo.cc:28 src/modplug/plugin_main.cc:86
 msgid "Volume:"
 msgstr "Hangerő:"
 
@@ -1127,11 +1108,11 @@
 msgid "Echo"
 msgstr "Visszhang"
 
-#: src/ffaudio/ffaudio-core.cc:41
+#: src/ffaudio/ffaudio-core.cc:50
 msgid "FFmpeg Plugin"
 msgstr "FFmpeg bővítméyn"
 
-#: src/ffaudio/ffaudio-core.cc:571
+#: src/ffaudio/ffaudio-core.cc:649
 msgid ""
 "Multi-format audio decoding plugin for Audacious using\n"
 "FFmpeg multimedia framework (http://www.ffmpeg.org/)\n"
@@ -1140,236 +1121,328 @@
 "William Pitcock <nenolod@nenolod.net>\n"
 "Matti Hämäläinen <ccr@tnsp.org>"
 msgstr ""
+"Több formátumú hang dekóder az Audacious-hoz az\n"
+"FFmpeg multimedia framework (http://www.ffmpeg.org/)\n"
+"használatával.\n"
+"\n"
+"Készítők:\n"
+"William Pitcock <nenolod@nenolod.net>\n"
+"Matti Hämäläinen <ccr@tnsp.org>"
 
-#: src/filewriter/filewriter.cc:45
+#: src/filewriter/filewriter.cc:48
 msgid "FileWriter Plugin"
 msgstr "Fájlíró bővítmény"
 
-#: src/filewriter/filewriter.cc:386
-msgid "Output file format:"
-msgstr "Kimeneti fájl formátum:"
+#: src/filewriter/filewriter.cc:316
+#, c-format
+msgid ""
+"Error opening %s:\n"
+"%s"
+msgstr ""
+"Hiba a(z) %s megnyitáskor:\n"
+"%s"
 
-#: src/filewriter/filewriter.cc:403
-msgid "Configure"
-msgstr "Beállítás"
+#: src/filewriter/filewriter.cc:358
+msgid ""
+"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 ""
+"Ez a program szabad szoftver; terjeszthető illetve módosítható a Free "
+"Software Foundation által kiadott GNU General Public License dokumentumában "
+"leírtak alapján; a 2-es licenc, vagy bármely (későbbi) változata szerint. Ez "
+"a program abban a reményben kerül közreadásra, hogy hasznos lesz, de minden "
+"egyéb GARANCIA NÉLKÜL, az ELADHATÓSÁGRA vagy VALAMELY CÉLRA VALÓ "
+"ALKALMAZHATÓSÁGRA való származtatott garanciát is beleértve. További "
+"részleteket a GNU General Public License tartalmaz. A felhasználónak a "
+"programmal együtt meg kell kapnia a GNU General Public License egy "
+"példányát; ha mégsem kapta meg, akkor ezt a Free Software Foundationnak "
+"küldött levélben jelezze Free Software Foundation, Inc. 51 Franklin Street, "
+"Fifth Floor Boston, MA 02110-1301, USA. http://www.gnu.org/licenses/ http://"
+"gnu.hu/gpl.html"
+
+#: src/filewriter/filewriter.cc:385
+msgid "Output file format:"
+msgstr "Kimeneti fájlformátum:"
 
-#: src/filewriter/filewriter.cc:413
+#: src/filewriter/filewriter.cc:389
 msgid "Save into original directory"
 msgstr "Mentés az eredeti könyvtárba"
 
-#: src/filewriter/filewriter.cc:417
-msgid "Save into custom directory"
-msgstr "Mentés egyéb könyvtárba"
-
-#: src/filewriter/filewriter.cc:427
-msgid "Output file folder:"
-msgstr "Kimeneti fájl könyvtára:"
-
-#: src/filewriter/filewriter.cc:431
-msgid "Pick a folder"
-msgstr "Válasszon egy mappát"
+#: src/filewriter/filewriter.cc:392
+msgid "Save into custom directory:"
+msgstr "Mentés egyéni könyvtárba:"
 
-#: src/filewriter/filewriter.cc:444
+#: src/filewriter/filewriter.cc:400
 msgid "Generate file name from:"
-msgstr ""
+msgstr "Fájlnév generálása innen:"
 
-#: src/filewriter/filewriter.cc:448
-msgid "Original file tag"
-msgstr "Eredeti fájl kiterjesztés"
-
-#: src/filewriter/filewriter.cc:453
+#: src/filewriter/filewriter.cc:401
 msgid "Original file name"
 msgstr "Eredeti fájlnév"
 
-#: src/filewriter/filewriter.cc:459
-msgid "Include original file name extension"
-msgstr "Az eredeti fájl kiterjesztés használata"
+#: src/filewriter/filewriter.cc:404
+msgid "Original file name (no suffix)"
+msgstr "Eredeti fájlnév ( kiterjesztés nélkül)"
 
-#: src/filewriter/filewriter.cc:468
-msgid "Prepend track number to file name"
-msgstr ""
+#: src/filewriter/filewriter.cc:407
+msgid "Original file tag"
+msgstr "Eredeti fájl kiterjesztés"
 
-#: src/filewriter/filewriter.cc:484
-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.cc:411
+msgid "Prepend track number to file name"
+msgstr "A szám sorszámának beszúrása a fájlnév elé"
 
-#: src/filewriter/mp3.cc:40 src/filewriter/mp3.cc:717
+#: src/filewriter/filewriter.cc:417 src/filewriter/filewriter.cc:449
 msgid "Auto"
 msgstr "Automatikus"
 
-#: src/filewriter/mp3.cc:40
+#: src/filewriter/filewriter.cc:418
+msgid "8000 Hz"
+msgstr "8000 Hz"
+
+#: src/filewriter/filewriter.cc:419
+msgid "11025 Hz"
+msgstr "11025 Hz"
+
+#: src/filewriter/filewriter.cc:420
+msgid "12000 Hz"
+msgstr "12000 Hz"
+
+#: src/filewriter/filewriter.cc:421
+msgid "16000 Hz"
+msgstr "16000 Hz"
+
+#: src/filewriter/filewriter.cc:422
+msgid "22050 Hz"
+msgstr "22050 Hz"
+
+#: src/filewriter/filewriter.cc:423
+msgid "24000 Hz"
+msgstr "24000 Hz"
+
+#: src/filewriter/filewriter.cc:424
+msgid "32000 Hz"
+msgstr "32000 Hz"
+
+#: src/filewriter/filewriter.cc:425 src/xsf/plugin.cc:430
+msgid "44100 Hz"
+msgstr "44100 Hz"
+
+#: src/filewriter/filewriter.cc:426 src/xsf/plugin.cc:431
+msgid "48000 Hz"
+msgstr "48000 Hz"
+
+#: src/filewriter/filewriter.cc:430
+msgid "8 kbit/s"
+msgstr "8 kbit/s"
+
+#: src/filewriter/filewriter.cc:431
+msgid "16 kbit/s"
+msgstr "16 kbit/s"
+
+#: src/filewriter/filewriter.cc:432
+msgid "32 kbit/s"
+msgstr "32 kbit/s"
+
+#: src/filewriter/filewriter.cc:433
+msgid "40 kbit/s"
+msgstr "40 kbit/s"
+
+#: src/filewriter/filewriter.cc:434
+msgid "48 kbit/s"
+msgstr "48 kbit/s"
+
+#: src/filewriter/filewriter.cc:435
+msgid "56 kbit/s"
+msgstr "56 kbit/s"
+
+#: src/filewriter/filewriter.cc:436
+msgid "64 kbit/s"
+msgstr "64 kbit/s"
+
+#: src/filewriter/filewriter.cc:437
+msgid "80 kbit/s"
+msgstr "80 kbit/s"
+
+#: src/filewriter/filewriter.cc:438
+msgid "96 kbit/s"
+msgstr "96 kbit/s"
+
+#: src/filewriter/filewriter.cc:439
+msgid "112 kbit/s"
+msgstr "112 kbit/s"
+
+#: src/filewriter/filewriter.cc:440
+msgid "128 kbit/s"
+msgstr "128 kbit/s"
+
+#: src/filewriter/filewriter.cc:441
+msgid "160 kbit/s"
+msgstr "160 kbit/s"
+
+#: src/filewriter/filewriter.cc:442
+msgid "192 kbit/s"
+msgstr "192 kbit/s"
+
+#: src/filewriter/filewriter.cc:443
+msgid "224 kbit/s"
+msgstr "224 kbit/s"
+
+#: src/filewriter/filewriter.cc:444
+msgid "256 kbit/s"
+msgstr "256 kbit/s"
+
+#: src/filewriter/filewriter.cc:445
+msgid "320 kbit/s"
+msgstr "320 kbit/s"
+
+#: src/filewriter/filewriter.cc:450
 msgid "Joint Stereo"
 msgstr "Joint Stereo"
 
-#: src/filewriter/mp3.cc:41 src/modplug/plugin_main.cc:58
-#: src/mpg123/mpg123.cc:248
+#: src/filewriter/filewriter.cc:451 src/modplug/plugin_main.cc:57
+#: src/mpg123/mpg123.cc:259
 msgid "Stereo"
 msgstr "Sztereó"
 
-#: src/filewriter/mp3.cc:41 src/modplug/plugin_main.cc:57
-#: src/mpg123/mpg123.cc:248
+#: src/filewriter/filewriter.cc:452 src/modplug/plugin_main.cc:56
+#: src/mpg123/mpg123.cc:260
 msgid "Mono"
 msgstr "Monó"
 
-#: src/filewriter/mp3.cc:657
-msgid "MP3 Configuration"
-msgstr "MP3 Beállítás"
-
-#: src/filewriter/mp3.cc:658
-msgid "_OK"
-msgstr "_Rendben"
+#: src/filewriter/filewriter.cc:456
+msgid "VBR"
+msgstr "VBR"
+
+#: src/filewriter/filewriter.cc:457
+msgid "ABR"
+msgstr "ABR"
 
-#: src/filewriter/mp3.cc:681
-msgid "Algorithm Quality:"
+#: src/filewriter/filewriter.cc:478
+msgid "Algorithm quality:"
 msgstr "Algoritmus minősége:"
 
-#: src/filewriter/mp3.cc:706
-msgid "Output Sample Rate:"
-msgstr "Kimenet mintavétele:"
-
-#: src/filewriter/mp3.cc:733
-msgid "(Hz)"
-msgstr "(Hz)"
-
-#: src/filewriter/mp3.cc:740
-msgid "Bitrate / Compression Ratio:"
-msgstr "Bitráta / Tömörítési arány:"
-
-#: src/filewriter/mp3.cc:764
-msgid "Bitrate (kbps):"
-msgstr "Bitráta (kbps):"
+#: src/filewriter/filewriter.cc:484
+msgid "Bitrate:"
+msgstr "Bitráta:"
 
-#: src/filewriter/mp3.cc:796
+#: src/filewriter/filewriter.cc:491
 msgid "Compression ratio:"
 msgstr "Tömörítési arány:"
 
-#: src/filewriter/mp3.cc:820
-msgid "Audio Mode:"
+#: src/filewriter/filewriter.cc:498
+msgid "Audio mode:"
 msgstr "Audio mód:"
 
-#: src/filewriter/mp3.cc:845
-msgid "Miscellaneous:"
-msgstr "Egyéb:"
-
-#: src/filewriter/mp3.cc:856
+#: src/filewriter/filewriter.cc:501
 msgid "Enforce strict ISO compliance"
-msgstr ""
+msgstr "Erőltesse a szigorú ISO megfelelés"
 
-#: src/filewriter/mp3.cc:867
+#: src/filewriter/filewriter.cc:503
 msgid "Error protection"
-msgstr "Hiba védelem"
+msgstr "Hibavédelem"
 
-#: src/filewriter/mp3.cc:879 src/filewriter/vorbis.cc:206
-msgid "Quality"
-msgstr "Minőség"
-
-#: src/filewriter/mp3.cc:888
+#: src/filewriter/filewriter.cc:508
 msgid "Enable VBR/ABR"
 msgstr "VBR/ABR engedélyezése"
 
-#: src/filewriter/mp3.cc:898
+#: src/filewriter/filewriter.cc:510
 msgid "Type:"
 msgstr "Típus:"
 
-#: src/filewriter/mp3.cc:931
-msgid "VBR Options:"
-msgstr "VBR beállítások:"
-
-#: src/filewriter/mp3.cc:947
-msgid "Minimum bitrate (kbps):"
-msgstr "Minimális bitsebesség (kbps):"
-
-#: src/filewriter/mp3.cc:973
-msgid "Maximum bitrate (kbps):"
-msgstr "Maximális bitsebesség (kbps):"
-
-#: src/filewriter/mp3.cc:995
-msgid "Strictly enforce minimum bitrate"
-msgstr ""
+#: src/filewriter/filewriter.cc:514
+msgid "Minimum bitrate:"
+msgstr "Minimális bitráta:"
+
+#: src/filewriter/filewriter.cc:518
+msgid "Maximum bitrate:"
+msgstr "Maximális bitráta:"
+
+#: src/filewriter/filewriter.cc:522
+msgid "Average bitrate:"
+msgstr "Átlagos bitráta:"
 
-#: src/filewriter/mp3.cc:1007
-msgid "ABR Options:"
-msgstr "ABR beállítások:"
-
-#: src/filewriter/mp3.cc:1017
-msgid "Average bitrate (kbps):"
-msgstr "Átlagos bitráta (kbps):"
-
-#: src/filewriter/mp3.cc:1044
+#: src/filewriter/filewriter.cc:526
 msgid "VBR quality level:"
 msgstr "VBR minőségi szint:"
 
-#: src/filewriter/mp3.cc:1063
+#: src/filewriter/filewriter.cc:530
+msgid "Strictly enforce minimum bitrate"
+msgstr "Minimális bitráta szigorú betartatása"
+
+#: src/filewriter/filewriter.cc:533
 msgid "Omit Xing VBR header"
 msgstr "Xing VBR fejléc elhagyása"
 
-#: src/filewriter/mp3.cc:1076
-msgid "VBR/ABR"
-msgstr "VBR/ABR"
-
-#: src/filewriter/mp3.cc:1085
-msgid "Frame Parameters:"
-msgstr ""
+#: src/filewriter/filewriter.cc:539
+msgid "Frame Headers"
+msgstr "Keret fejlécek"
 
-#: src/filewriter/mp3.cc:1097
+#: src/filewriter/filewriter.cc:540
 msgid "Mark as copyright"
 msgstr "Megjelölés jogvédettként"
 
-#: src/filewriter/mp3.cc:1108
+#: src/filewriter/filewriter.cc:542
 msgid "Mark as original"
 msgstr "Megjelölés eredetiként"
 
-#: src/filewriter/mp3.cc:1120
-msgid "ID3 Parameters:"
-msgstr "ID3 paraméterek:"
+#: src/filewriter/filewriter.cc:544
+msgid "ID3 Tags"
+msgstr "ID3 tagek"
 
-#: src/filewriter/mp3.cc:1131
+#: src/filewriter/filewriter.cc:545
 msgid "Force addition of version 2 tag"
-msgstr "Mindig adja hozzá a 2-es verzió címkéit"
+msgstr "2-es verziócímke hozzáadásának betartatása"
 
-#: src/filewriter/mp3.cc:1141
+#: src/filewriter/filewriter.cc:547
 msgid "Only add v1 tag"
 msgstr "Csak v1 címkék hozzáadása"
 
-#: src/filewriter/mp3.cc:1148
+#: src/filewriter/filewriter.cc:549
 msgid "Only add v2 tag"
 msgstr "Csak v2 címkék hozzáadása"
 
-#: src/filewriter/mp3.cc:1169
+#: src/filewriter/filewriter.cc:554
+msgid "Quality"
+msgstr "Minőség"
+
+#: src/filewriter/filewriter.cc:555
+msgid "VBR/ABR"
+msgstr "VBR/ABR"
+
+#: src/filewriter/filewriter.cc:556
 msgid "Tags"
 msgstr "Címkék"
 
-#: src/filewriter/vorbis.cc:196
-msgid "Vorbis Encoder Configuration"
-msgstr "Vorbis kódoló beállítások"
-
-#: src/filewriter/vorbis.cc:219
-msgid "Quality level (0 - 10):"
-msgstr "Minőségi szint (0-10):"
+#: src/filewriter/filewriter.cc:566
+msgid "Quality (0-1):"
+msgstr "Minőség (0-1):"
 
-#: src/flacng/flacng.h:35
+#: src/filewriter/filewriter.cc:573 src/skins-qt/skins_cfg.cc:307
+#: src/skins/skins_cfg.cc:289
+msgid "General"
+msgstr "Általános"
+
+#: src/flac/flacng.h:36
 msgid "FLAC Decoder"
 msgstr "FLAC dekódoló"
 
-#: src/flacng/metadata.cc:351 src/wavpack/wavpack.cc:209
+#: src/flac/metadata.cc:296 src/wavpack/wavpack.cc:215
 msgid "lossless"
 msgstr "veszteségmentes"
 
-#: src/flacng/plugin.cc:169
+#: src/flac/plugin.cc:214
 msgid ""
 "Original code by\n"
 "Ralf Ertzinger <ralf@skytale.net>\n"
@@ -1393,15 +1466,15 @@
 msgid "GIO Plugin"
 msgstr "GIO bővítmény"
 
-#: src/gio/gio.cc:153
+#: src/gio/gio.cc:152
 msgid "Read-and-append mode not supported"
 msgstr "Olvas-és-hozzáad mód nem támogatott"
 
-#: src/gio/gio.cc:166
+#: src/gio/gio.cc:165
 msgid "Invalid open mode"
 msgstr "Érvénytelen megnyitási mód"
 
-#: src/gl-spectrum/gl-spectrum.cc:51
+#: src/glspectrum/gl-spectrum.cc:52
 msgid ""
 "OpenGL Spectrum Analyzer for Audacious\n"
 "Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
@@ -1412,620 +1485,766 @@
 "\n"
 "License: GPLv2+"
 msgstr ""
-
-#: src/gl-spectrum/gl-spectrum.cc:62
-msgid "OpenGL Spectrum Analyzer"
-msgstr "OpenGL spektrum analizátor"
-
-#: src/gl-spectrum-qt/gl-spectrum.cc:41
-msgid ""
-"OpenGL Spectrum Analyzer for Audacious\n"
-"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
-"Copyright 2014 William Pitcock\n"
+"OpenGL Spectrum Analizátor Audacious-hoz\n"
+"Copyright 2013 Christophe Budé, John Lindgren, és Carlo Bramini\n"
 "\n"
-"Based on the XMMS plugin:\n"
-"Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson, and "
+"Az XMMS beépülő alapján:\n"
+"Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson, és "
 "4Front Technologies\n"
 "\n"
-"License: GPLv2+"
-msgstr ""
-
-#: src/gl-spectrum-qt/gl-spectrum.cc:53
-msgid "OpenGL Spectrum Analyzer (Qt)"
-msgstr ""
-
-#: src/gnomeshortcuts/gnomeshortcuts.cc:38
-msgid "GNOME Shortcuts"
-msgstr "Gnome rövidítések"
+"Licensz: GPLv2+"
 
-#: src/gnomeshortcuts/gnomeshortcuts.cc:54
-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/glspectrum/gl-spectrum.cc:63 src/qtglspectrum/gl-spectrum.cc:53
+msgid "OpenGL Spectrum Analyzer"
+msgstr "OpenGL spektrum analizátor"
 
-#: src/gtkui/columns.cc:35
-msgid "Entry number"
+#: src/gtkui/columns.cc:36 src/moonstone/playlist_model.cc:38
+#: src/qtui/playlist_model.cc:33
+msgid "Entry Number"
 msgstr "Bejegyzés száma"
 
-#: src/gtkui/columns.cc:36 src/playlist-manager/playlist-manager.cc:225
-#: src/qtui/playlist_model.cc:123
+#: src/gtkui/columns.cc:37 src/moonstone/playlist_model.cc:38
+#: src/moonstone/playlist_selection.cc:64
+#: src/playlist-manager/playlist-manager.cc:200
+#: src/playlist-manager-qt/playlist-manager-qt.cc:188
+#: src/qtui/playlist_model.cc:33 src/streamtuner/icecast-model.cc:120
+#: src/streamtuner/ihr-model.cc:159 src/streamtuner/shoutcast-model.cc:122
 msgid "Title"
 msgstr "Cím"
 
-#: src/gtkui/columns.cc:37 src/qtui/playlist_model.cc:125
+#: src/gtkui/columns.cc:38 src/moonstone/playlist_model.cc:39
+#: src/qtui/playlist_model.cc:33
 msgid "Artist"
 msgstr "Előadó"
 
-#: src/gtkui/columns.cc:38
+#: src/gtkui/columns.cc:39 src/moonstone/playlist_model.cc:39
+#: src/qtui/playlist_model.cc:33
 msgid "Year"
 msgstr "Év"
 
-#: src/gtkui/columns.cc:39 src/qtui/playlist_model.cc:127
+#: src/gtkui/columns.cc:40 src/moonstone/playlist_model.cc:39
+#: src/qtui/playlist_model.cc:34
 msgid "Album"
 msgstr "Album"
 
-#: src/gtkui/columns.cc:40
-msgid "Album artist"
+#: src/gtkui/columns.cc:41 src/moonstone/playlist_model.cc:40
+#: src/qtui/playlist_model.cc:34
+msgid "Album Artist"
 msgstr "Album előadó"
 
-#: src/gtkui/columns.cc:41
+#: src/gtkui/columns.cc:42 src/moonstone/playlist_model.cc:40
+#: src/qtui/playlist_model.cc:34
 msgid "Track"
 msgstr "Sáv"
 
-#: src/gtkui/columns.cc:42
+#: src/gtkui/columns.cc:43 src/moonstone/playlist_model.cc:40
+#: src/qtui/playlist_model.cc:34 src/streamtuner/icecast-model.cc:123
+#: src/streamtuner/shoutcast-model.cc:125
+#: src/streamtuner/shoutcast-model.cc:236
 msgid "Genre"
 msgstr "Műfaj"
 
-#: src/gtkui/columns.cc:43
-msgid "Queue position"
-msgstr "Várakozási sor pozíció"
+#: src/gtkui/columns.cc:44 src/moonstone/playlist_model.cc:41
+#: src/qtui/playlist_model.cc:35
+msgid "Queue Position"
+msgstr "Sorban elfoglalt pozíció"
 
-#: src/gtkui/columns.cc:44
+#: src/gtkui/columns.cc:45 src/moonstone/playlist_model.cc:41
+#: src/qtui/playlist_model.cc:35
 msgid "Length"
 msgstr "Hossz"
 
-#: src/gtkui/columns.cc:45
-msgid "File path"
+#: src/gtkui/columns.cc:46 src/moonstone/playlist_model.cc:41
+#: src/qtui/playlist_model.cc:35
+msgid "File Path"
 msgstr "Fájl elérési útja"
 
-#: src/gtkui/columns.cc:47
-msgid "Custom title"
+#: src/gtkui/columns.cc:47 src/moonstone/playlist_model.cc:42
+#: src/qtui/playlist_model.cc:35
+msgid "File Name"
+msgstr "Fájlnév"
+
+#: src/gtkui/columns.cc:48 src/moonstone/playlist_model.cc:42
+#: src/qtui/playlist_model.cc:36
+msgid "Custom Title"
 msgstr "Egyéni cím"
 
-#: src/gtkui/columns.cc:48
+#: src/gtkui/columns.cc:49 src/moonstone/playlist_model.cc:42
+#: src/qtui/playlist_model.cc:36 src/streamtuner/icecast-model.cc:129
+#: src/streamtuner/shoutcast-model.cc:134
 msgid "Bitrate"
 msgstr "Bitráta"
 
-#: src/gtkui/columns.cc:308
+#: src/gtkui/columns.cc:50 src/moonstone/playlist_model.cc:43
+#: src/qtui/playlist_model.cc:36
+msgid "Comment"
+msgstr "Megjegyzés"
+
+#: src/gtkui/columns.cc:51 src/qtui/playlist_model.cc:36
+msgid "Publisher"
+msgstr "Kiadó"
+
+#: src/gtkui/columns.cc:52 src/qtui/playlist_model.cc:37
+msgid "Catalog Number"
+msgstr "Katalógusszám"
+
+#: src/gtkui/columns.cc:53 src/moonstone/playlist_model.cc:43
+#: src/qtui/playlist_model.cc:37
+msgid "Disc"
+msgstr "Lemez"
+
+#: src/gtkui/columns.cc:325
 msgid "Available columns"
 msgstr "Elérhető oszlopok"
 
-#: src/gtkui/columns.cc:334
+#: src/gtkui/columns.cc:351
 msgid "Displayed columns"
 msgstr "Megjelenített oszlopok"
 
-#: src/gtkui/layout.cc:72 src/search-tool/search-tool.cc:40
+#: src/gtkui/layout.cc:74 src/search-tool-qt/search-tool-qt.cc:58
+#: src/search-tool/search-tool.cc:49
 msgid "Search Tool"
 msgstr "Kereső eszköz"
 
-#: src/gtkui/layout.cc:167
+#: src/gtkui/layout.cc:170
 msgid "Dock at Left"
-msgstr "Balra rögzít"
+msgstr "Rögzítés balra"
 
-#: src/gtkui/layout.cc:167
+#: src/gtkui/layout.cc:170
 msgid "Dock at Right"
-msgstr "Jobbra rögzít"
+msgstr "Rögzítés jobbra"
 
-#: src/gtkui/layout.cc:168
+#: src/gtkui/layout.cc:171
 msgid "Dock at Top"
-msgstr "Felülre rögzít"
+msgstr "Rögzítés felülre"
 
-#: src/gtkui/layout.cc:168
+#: src/gtkui/layout.cc:171
 msgid "Dock at Bottom"
-msgstr "Alulra rögzít"
+msgstr "Rögzítés alulra"
 
-#: src/gtkui/layout.cc:168
+#: src/gtkui/layout.cc:171
 msgid "Undock"
 msgstr "Rögzítés feloldása"
 
-#: src/gtkui/layout.cc:168 src/ladspa/plugin.cc:531
+#: src/gtkui/layout.cc:171 src/ladspa/plugin.cc:540
 msgid "Disable"
 msgstr "Letiltás"
 
-#: src/gtkui/menus.cc:126 src/qtui/main_window_actions.cc:93
-#: src/statusicon/statusicon.cc:276
+#: src/gtkui/menus.cc:79 src/qtui/menus.cc:107
+#: src/statusicon-qt/statusicon.cc:115 src/statusicon/statusicon.cc:286
 msgid "_Open Files ..."
-msgstr "Fájl_ok megnyitása ..."
+msgstr "Fájl_ok megnyitása…"
 
-#: src/gtkui/menus.cc:127
+#: src/gtkui/menus.cc:80 src/qtui/menus.cc:111
 msgid "Open _URL ..."
-msgstr "_URL megnyitása ..."
+msgstr "_URL megnyitása…"
 
-#: src/gtkui/menus.cc:128 src/qtui/main_window_actions.cc:95
+#: src/gtkui/menus.cc:81 src/qtui/menus.cc:113
 msgid "_Add Files ..."
 msgstr "Fájlok hozzá_adása ..."
 
-#: src/gtkui/menus.cc:129
+#: src/gtkui/menus.cc:82 src/qtui/menus.cc:118
 msgid "Add U_RL ..."
-msgstr "U_RL hozzáadása ..."
+msgstr "U_RL hozzáadása…"
 
-#: src/gtkui/menus.cc:131
+#: src/gtkui/menus.cc:84 src/qtui/menus.cc:120
 msgid "Search _Library"
 msgstr "_Keresés a gyűjteményben"
 
-#: src/gtkui/menus.cc:133 src/qtui/main_window_actions.cc:98
+#: src/gtkui/menus.cc:86 src/qtui/menus.cc:123
 msgid "A_bout ..."
-msgstr "_Névjegy ..."
+msgstr "_Névjegy…"
 
-#: src/gtkui/menus.cc:134 src/qtui/main_window_actions.cc:99
+#: src/gtkui/menus.cc:87 src/qtui/menus.cc:125
 msgid "_Settings ..."
 msgstr "_Beállítások ..."
 
-#: src/gtkui/menus.cc:135 src/qtui/main_window_actions.cc:103
-#: src/statusicon/statusicon.cc:284
+#: src/gtkui/menus.cc:88 src/qtui/menus.cc:131
+#: src/statusicon-qt/statusicon.cc:117 src/statusicon/statusicon.cc:288
 msgid "_Quit"
 msgstr "_Kilépés"
 
-#: src/gtkui/menus.cc:139 src/gtkui/menus.cc:262
-#: src/qtui/main_window_actions.cc:107 src/search-tool/search-tool.cc:641
-#: src/statusicon/statusicon.cc:278
+#: src/gtkui/menus.cc:92 src/gtkui/menus.cc:226
+#: src/moonstone/playlist_tabs.cc:306 src/qtui/menus.cc:135
+#: src/qtui/playlist_tabs.cc:331 src/search-tool-qt/search-tool-qt.cc:499
+#: src/search-tool/search-tool.cc:339 src/statusicon-qt/statusicon.cc:109
+#: src/statusicon/statusicon.cc:280
 msgid "_Play"
 msgstr "_Lejátszás"
 
-#: src/gtkui/menus.cc:140 src/qtui/main_window_actions.cc:108
-#: src/statusicon/statusicon.cc:279
+#: src/gtkui/menus.cc:93 src/qtui/menus.cc:137
+#: src/statusicon-qt/statusicon.cc:110 src/statusicon/statusicon.cc:281
 msgid "Paus_e"
 msgstr "_Szünet"
 
-#: src/gtkui/menus.cc:141 src/qtui/main_window_actions.cc:109
-#: src/statusicon/statusicon.cc:280
+#: src/gtkui/menus.cc:94 src/qtui/menus.cc:139
+#: src/statusicon-qt/statusicon.cc:111 src/statusicon/statusicon.cc:282
 msgid "_Stop"
-msgstr "_Megállítás"
+msgstr "L_eállítás"
 
-#: src/gtkui/menus.cc:142 src/qtui/main_window_actions.cc:110
-#: src/statusicon/statusicon.cc:277
+#: src/gtkui/menus.cc:95 src/qtui/menus.cc:141
+#: src/statusicon-qt/statusicon.cc:112 src/statusicon/statusicon.cc:283
 msgid "Pre_vious"
 msgstr "Elő_ző"
 
-#: src/gtkui/menus.cc:143 src/qtui/main_window_actions.cc:111
-#: src/statusicon/statusicon.cc:281
+#: src/gtkui/menus.cc:96 src/qtui/menus.cc:143
+#: src/statusicon-qt/statusicon.cc:113 src/statusicon/statusicon.cc:284
 msgid "_Next"
 msgstr "_Következő"
 
-#: src/gtkui/menus.cc:145 src/qtui/main_window_actions.cc:113
+#: src/gtkui/menus.cc:97 src/qtui/menus.cc:145 src/skins/menus.cc:114
+#: src/skins-qt/menus.cc:105
+msgid "Previous Album"
+msgstr "Előző Album"
+
+#: src/gtkui/menus.cc:98 src/qtui/menus.cc:146 src/skins/menus.cc:115
+#: src/skins-qt/menus.cc:106
+msgid "Next Album"
+msgstr "Következő Album"
+
+#: src/gtkui/menus.cc:100 src/qtui/menus.cc:148
 msgid "_Repeat"
 msgstr "_Ismétlés"
 
-#: src/gtkui/menus.cc:146 src/qtui/main_window_actions.cc:114
+#: src/gtkui/menus.cc:101 src/qtui/menus.cc:150
 msgid "S_huffle"
 msgstr "_Véletlenszerű"
 
-#: src/gtkui/menus.cc:147 src/qtui/main_window_actions.cc:115
+#: src/gtkui/menus.cc:102 src/qtui/menus.cc:152
+msgid "Shuffle by Albu_m"
+msgstr "Keverés Album szerint"
+
+#: src/gtkui/menus.cc:103 src/qtui/menus.cc:155
 msgid "N_o Playlist Advance"
-msgstr "_Ne legyen léptetés a lejátszólistában"
+msgstr "_Nincs léptetés a lejátszólistában"
 
-#: src/gtkui/menus.cc:148 src/qtui/main_window_actions.cc:116
+#: src/gtkui/menus.cc:104 src/qtui/menus.cc:157
 msgid "Stop A_fter This Song"
 msgstr "L_eállítás az aktuális dal után"
 
-#: src/gtkui/menus.cc:150 src/gtkui/menus.cc:247
-#: src/qtui/main_window_actions.cc:118
+#: src/gtkui/menus.cc:106 src/gtkui/menus.cc:210 src/qtui/menus.cc:162
+#: src/qtui/menus.cc:294
 msgid "Song _Info ..."
-msgstr "Dal _információ ..."
+msgstr "Dal _információi…"
 
-#: src/gtkui/menus.cc:151
+#: src/gtkui/menus.cc:107
 msgid "Jump to _Time ..."
-msgstr "Ugrás _időre ..."
+msgstr "Ugrás _időre…"
 
-#: src/gtkui/menus.cc:152
+#: src/gtkui/menus.cc:108
 msgid "_Jump to Song ..."
-msgstr "Ugrás _dalra ..."
+msgstr "Ugrás _számra…"
 
-#: src/gtkui/menus.cc:154
+#: src/gtkui/menus.cc:110 src/qtui/menus.cc:165
 msgid "Set Repeat Point _A"
-msgstr ""
+msgstr "Az 'A' Ismétlési pont beállítása"
 
-#: src/gtkui/menus.cc:155
+#: src/gtkui/menus.cc:111 src/qtui/menus.cc:167
 msgid "Set Repeat Point _B"
-msgstr ""
+msgstr "A 'B' ismétlési pont beállítása"
 
-#: src/gtkui/menus.cc:156
+#: src/gtkui/menus.cc:112 src/qtui/menus.cc:169
 msgid "_Clear Repeat Points"
 msgstr "_Ismétlési pontok törlése"
 
-#: src/gtkui/menus.cc:160 src/gtkui/menus.cc:167 src/gtkui/menus.cc:183
-#: src/qtui/main_window_actions.cc:122 src/qtui/main_window_actions.cc:129
-#: src/qtui/main_window_actions.cc:145
+#: src/gtkui/menus.cc:116 src/gtkui/menus.cc:123 src/gtkui/menus.cc:141
+#: src/qtui/menus.cc:173 src/qtui/menus.cc:180 src/qtui/menus.cc:198
 msgid "By _Title"
 msgstr "Cím szerin_t"
 
-#: src/gtkui/menus.cc:161 src/qtui/main_window_actions.cc:123
+#: src/gtkui/menus.cc:117 src/qtui/menus.cc:174
 msgid "By _File Name"
 msgstr "_Fájlnév szerint"
 
-#: src/gtkui/menus.cc:162 src/qtui/main_window_actions.cc:124
+#: src/gtkui/menus.cc:118 src/qtui/menus.cc:175
 msgid "By File _Path"
 msgstr "Fájl _elérési útja szerint"
 
-#: src/gtkui/menus.cc:166 src/gtkui/menus.cc:182
-#: src/qtui/main_window_actions.cc:128 src/qtui/main_window_actions.cc:144
+#: src/gtkui/menus.cc:122 src/gtkui/menus.cc:140 src/qtui/menus.cc:179
+#: src/qtui/menus.cc:197
 msgid "By Track _Number"
 msgstr "Sáv szeri_nt"
 
-#: src/gtkui/menus.cc:168 src/gtkui/menus.cc:184
-#: src/qtui/main_window_actions.cc:130 src/qtui/main_window_actions.cc:146
+#: src/gtkui/menus.cc:124 src/gtkui/menus.cc:142 src/qtui/menus.cc:181
+#: src/qtui/menus.cc:199
 msgid "By _Artist"
 msgstr "Elő_adó szerint"
 
-#: src/gtkui/menus.cc:169 src/gtkui/menus.cc:185
-#: src/qtui/main_window_actions.cc:131 src/qtui/main_window_actions.cc:147
+#: src/gtkui/menus.cc:125 src/gtkui/menus.cc:143 src/qtui/menus.cc:182
+#: src/qtui/menus.cc:200
 msgid "By Al_bum"
 msgstr "Al_bum szerint"
 
-#: src/gtkui/menus.cc:170 src/gtkui/menus.cc:186
-#: src/qtui/main_window_actions.cc:132 src/qtui/main_window_actions.cc:148
+#: src/gtkui/menus.cc:126 src/gtkui/menus.cc:144 src/qtui/menus.cc:183
+#: src/qtui/menus.cc:201
 msgid "By Albu_m Artist"
 msgstr "Albu_m előadó szerint"
 
-#: src/gtkui/menus.cc:171 src/gtkui/menus.cc:187
-#: src/qtui/main_window_actions.cc:133 src/qtui/main_window_actions.cc:149
+#: src/gtkui/menus.cc:127 src/gtkui/menus.cc:145 src/qtui/menus.cc:184
+#: src/qtui/menus.cc:202
 msgid "By Release _Date"
 msgstr "_Dátum szerint"
 
-#: src/gtkui/menus.cc:172 src/gtkui/menus.cc:188
-#: src/qtui/main_window_actions.cc:134 src/qtui/main_window_actions.cc:150
+#: src/gtkui/menus.cc:128 src/gtkui/menus.cc:146 src/qtui/menus.cc:185
+#: src/qtui/menus.cc:203
 msgid "By _Genre"
 msgstr "_Műfaj szerint"
 
-#: src/gtkui/menus.cc:173 src/gtkui/menus.cc:189
-#: src/qtui/main_window_actions.cc:135 src/qtui/main_window_actions.cc:151
+#: src/gtkui/menus.cc:129 src/gtkui/menus.cc:147 src/qtui/menus.cc:186
+#: src/qtui/menus.cc:204
 msgid "By _Length"
 msgstr "_Hossz szerint"
 
-#: src/gtkui/menus.cc:174 src/gtkui/menus.cc:190
-#: src/qtui/main_window_actions.cc:136 src/qtui/main_window_actions.cc:152
+#: src/gtkui/menus.cc:130 src/gtkui/menus.cc:148 src/qtui/menus.cc:187
+#: src/qtui/menus.cc:205
 msgid "By _File Path"
-msgstr "_Fájl útvonal szerint"
+msgstr "_Fájlútvonal szerint"
 
-#: src/gtkui/menus.cc:175 src/gtkui/menus.cc:191
-#: src/qtui/main_window_actions.cc:137 src/qtui/main_window_actions.cc:153
+#: src/gtkui/menus.cc:131 src/gtkui/menus.cc:149 src/qtui/menus.cc:188
+#: src/qtui/menus.cc:206
 msgid "By _Custom Title"
-msgstr "_Egyedi cím szerint"
+msgstr "_Egyéni cím szerint"
+
+#: src/gtkui/menus.cc:132 src/gtkui/menus.cc:150 src/qtui/menus.cc:189
+#: src/qtui/menus.cc:207
+msgid "By C_omment"
+msgstr "_Megjegyzés szerint"
+
+#: src/gtkui/menus.cc:133 src/gtkui/menus.cc:151 src/qtui/menus.cc:190
+#: src/qtui/menus.cc:208
+msgid "By D_isc Number"
+msgstr ""
 
-#: src/gtkui/menus.cc:177 src/gtkui/menus.cc:193
-#: src/qtui/main_window_actions.cc:139 src/qtui/main_window_actions.cc:155
+#: src/gtkui/menus.cc:135 src/gtkui/menus.cc:153 src/qtui/menus.cc:192
+#: src/qtui/menus.cc:210
 msgid "R_everse Order"
 msgstr "Fo_rdított sorrend"
 
-#: src/gtkui/menus.cc:178 src/gtkui/menus.cc:194
-#: src/qtui/main_window_actions.cc:140 src/qtui/main_window_actions.cc:156
+#: src/gtkui/menus.cc:136 src/gtkui/menus.cc:154 src/qtui/menus.cc:194
+#: src/qtui/menus.cc:212
 msgid "_Random Order"
 msgstr "Véletlensze_rű sorrend"
 
-#: src/gtkui/menus.cc:198 src/qtui/main_window_actions.cc:160
+#: src/gtkui/menus.cc:158 src/qtui/menus.cc:216
 msgid "_Play/Resume"
 msgstr "_Lejátszás/Szünet"
 
-#: src/gtkui/menus.cc:199 src/gtkui/menus.cc:251
-#: src/qtui/main_window_actions.cc:161
+#: src/gtkui/menus.cc:159 src/qtui/menus.cc:218
 msgid "_Refresh"
 msgstr "_Frissítés"
 
-#: src/gtkui/menus.cc:201 src/qtui/main_window_actions.cc:163
+#: src/gtkui/menus.cc:161 src/qtui/menus.cc:222
 msgid "_Sort"
 msgstr "Rendezé_s"
 
-#: src/gtkui/menus.cc:202 src/qtui/main_window_actions.cc:164
+#: src/gtkui/menus.cc:162 src/qtui/menus.cc:223
 msgid "Sort Se_lected"
 msgstr "Kije_löltek rendezése"
 
-#: src/gtkui/menus.cc:203 src/qtui/main_window_actions.cc:165
+#: src/gtkui/menus.cc:163 src/qtui/menus.cc:225
 msgid "Remove _Duplicates"
 msgstr "Kettőzöttek eltávolítása"
 
-#: src/gtkui/menus.cc:204 src/qtui/main_window_actions.cc:166
+#: src/gtkui/menus.cc:164 src/qtui/menus.cc:226
 msgid "Remove _Unavailable Files"
 msgstr "_Nem elérhető fájlok törlése"
 
-#: src/gtkui/menus.cc:206 src/playlist-manager/playlist-manager.cc:244
-#: src/qtui/main_window_actions.cc:168
+#: src/gtkui/menus.cc:166 src/playlist-manager/playlist-manager.cc:219
+#: src/playlist-manager-qt/playlist-manager-qt.cc:348 src/qtui/menus.cc:229
 msgid "_New"
 msgstr "_Új"
 
-#: src/gtkui/menus.cc:207
+#: src/gtkui/menus.cc:167 src/qtui/menus.cc:230
 msgid "Ren_ame ..."
 msgstr "Át_nevezés ..."
 
-#: src/gtkui/menus.cc:208 src/gtkui/menus.cc:264
-#: src/qtui/main_window_actions.cc:170
+#: src/gtkui/menus.cc:168 src/gtkui/menus.cc:228
+#: src/moonstone/playlist_tabs.cc:311 src/qtui/menus.cc:231
+#: src/qtui/playlist_tabs.cc:336
 msgid "Remo_ve"
 msgstr "Tö_rlés"
 
-#: src/gtkui/menus.cc:210
+#: src/gtkui/menus.cc:170 src/qtui/menus.cc:233
 msgid "_Import ..."
-msgstr "_Importálás ..."
+msgstr "_Importálás…"
 
-#: src/gtkui/menus.cc:211
+#: src/gtkui/menus.cc:171 src/qtui/menus.cc:234
 msgid "_Export ..."
-msgstr "_Exportálás ..."
+msgstr "_Exportálás…"
 
-#: src/gtkui/menus.cc:213
+#: src/gtkui/menus.cc:173 src/qtui/menus.cc:237
 msgid "Playlist _Manager ..."
 msgstr "_Lejátszólista kezelő ..."
 
-#: src/gtkui/menus.cc:214 src/qtui/main_window_actions.cc:176
+#: src/gtkui/menus.cc:174 src/qtui/menus.cc:239
 msgid "_Queue Manager ..."
-msgstr "_Várakozási sor kezelő ..."
+msgstr "So_rkezelő…"
 
-#: src/gtkui/menus.cc:218 src/qtui/main_window_actions.cc:180
+#: src/gtkui/menus.cc:178 src/qtui/menus.cc:243
 msgid "Volume _Up"
 msgstr "Hangerő _fel"
 
-#: src/gtkui/menus.cc:219 src/qtui/main_window_actions.cc:181
+#: src/gtkui/menus.cc:179 src/qtui/menus.cc:245
 msgid "Volume _Down"
 msgstr "Hangerő _le"
 
-#: src/gtkui/menus.cc:221 src/qtui/main_window_actions.cc:183
-msgid "_Equalizer"
-msgstr "_Hangszínszabályzó"
+#: src/gtkui/menus.cc:181 src/qtui/menus.cc:249
+msgid "_Equalizer ..."
+msgstr "_Hangszínszabályzó ..."
 
-#: src/gtkui/menus.cc:223 src/qtui/main_window_actions.cc:185
+#: src/gtkui/menus.cc:182 src/qtui/menus.cc:251
 msgid "E_ffects ..."
 msgstr "E_ffektusok ..."
 
-#: src/gtkui/menus.cc:227
+#: src/gtkui/menus.cc:184
+msgid "_Record Stream"
+msgstr "_Közvetítés rögzítése"
+
+#: src/gtkui/menus.cc:185
+msgid "Audio _Settings ..."
+msgstr "Hang _Beállítások ..."
+
+#: src/gtkui/menus.cc:189 src/qtui/menus.cc:260
 msgid "Show _Menu Bar"
-msgstr "_Menü sor mutatása"
+msgstr "_Menüsáv megjelenítése"
 
-#: src/gtkui/menus.cc:228
+#: src/gtkui/menus.cc:190 src/qtui/menus.cc:262
 msgid "Show I_nfo Bar"
-msgstr "I_nfo sor mutatása"
+msgstr "I_nformációs sáv megjelenítése"
+
+#: src/gtkui/menus.cc:191 src/qtui/menus.cc:264
+msgid "Show Info Bar _Album Art"
+msgstr "Információs sáv mutatása _Album borító"
 
-#: src/gtkui/menus.cc:229
+#: src/gtkui/menus.cc:192 src/qtui/menus.cc:266
 msgid "Show Info Bar Vis_ualization"
 msgstr "Inf_ormációs sáv mutatása"
 
-#: src/gtkui/menus.cc:230
+#: src/gtkui/menus.cc:193 src/qtui/menus.cc:268
 msgid "Show _Status Bar"
-msgstr "_Státusz sor mutatása"
+msgstr "Álla_potsáv megjelenítése"
 
-#: src/gtkui/menus.cc:232
+#: src/gtkui/menus.cc:195 src/qtui/menus.cc:272
 msgid "Show _Remaining Time"
 msgstr "Hát_ralévő idő mutatása"
 
-#: src/gtkui/menus.cc:234
+#: src/gtkui/menus.cc:197 src/qtui/menus.cc:276 src/skins/menus.cc:157
+#: src/skins-qt/menus.cc:152
 msgid "_Visualizations ..."
 msgstr "_Megjelenítés ..."
 
-#: src/gtkui/menus.cc:238 src/qtui/main_window_actions.cc:189
+#: src/gtkui/menus.cc:201 src/qtui/menus.cc:280
 msgid "_File"
 msgstr "_Fájl"
 
-#: src/gtkui/menus.cc:239 src/qtui/main_window_actions.cc:190
+#: src/gtkui/menus.cc:202 src/qtui/menus.cc:281
 msgid "_Playback"
 msgstr "L_ejátszás"
 
-#: src/gtkui/menus.cc:240 src/qtui/main_window_actions.cc:191
+#: src/gtkui/menus.cc:203 src/qtui/menus.cc:282
 msgid "P_laylist"
 msgstr "_Lejátszólista"
 
-#: src/gtkui/menus.cc:241 src/gtkui/menus.cc:258
-#: src/qtui/main_window_actions.cc:192
+#: src/gtkui/menus.cc:204 src/gtkui/menus.cc:222 src/qtui/menus.cc:283
+#: src/qtui/menus.cc:312
 msgid "_Services"
-msgstr "_Szervizek"
+msgstr "_Szolgáltatások"
 
-#: src/gtkui/menus.cc:242 src/qtui/main_window_actions.cc:193
+#: src/gtkui/menus.cc:205 src/qtui/menus.cc:284
 msgid "_Output"
 msgstr "_Kimenet"
 
-#: src/gtkui/menus.cc:243
+#: src/gtkui/menus.cc:206 src/qtui/menus.cc:285
 msgid "_View"
 msgstr "_Nézet"
 
-#: src/gtkui/menus.cc:248
+#: src/gtkui/menus.cc:211 src/qtui/menus.cc:296
 msgid "_Queue/Unqueue"
-msgstr "_Várólistára/Várólistáról ki"
+msgstr "_Sorba állítás/kivétel a sorból"
 
-#: src/gtkui/menus.cc:250
+#: src/gtkui/menus.cc:213 src/qtui/menus.cc:299
 msgid "_Open Containing Folder"
 msgstr "_Tartalmazó mappa megnyitása"
 
-#: src/gtkui/menus.cc:253
+#: src/gtkui/menus.cc:214 src/qtui/menus.cc:301
+msgid "_Refresh Selected"
+msgstr "Kiválasztott f_rissítése"
+
+#: src/gtkui/menus.cc:216 src/qtui/menus.cc:304
 msgid "Cu_t"
 msgstr "_Kivágás"
 
-#: src/gtkui/menus.cc:254
+#: src/gtkui/menus.cc:217 src/qtui/menus.cc:305
 msgid "_Copy"
 msgstr "_Másolás"
 
-#: src/gtkui/menus.cc:255
+#: src/gtkui/menus.cc:218 src/qtui/menus.cc:306
 msgid "_Paste"
 msgstr "_Beillesztés"
 
-#: src/gtkui/menus.cc:256
+#: src/gtkui/menus.cc:219 src/qtui/menus.cc:307
+msgid "Paste at _End"
+msgstr "B_eillesztés a végére"
+
+#: src/gtkui/menus.cc:220 src/qtui/menus.cc:309
 msgid "Select _All"
-msgstr "Mind kivál_aszt"
+msgstr "Összes kivál_asztása"
 
-#: src/gtkui/menus.cc:263
+#: src/gtkui/menus.cc:227 src/moonstone/playlist_tabs.cc:309
+#: src/qtui/playlist_tabs.cc:334
 msgid "_Rename ..."
 msgstr "Átneve_zés ..."
 
-#: src/gtkui/settings.cc:35
+#: src/gtkui/settings.cc:35 src/qtui/settings.cc:59
+msgid "Always"
+msgstr "Mindig"
+
+#: src/gtkui/settings.cc:36 src/qtui/settings.cc:60
+msgid "Auto-hide"
+msgstr "Automatikus elrejtés"
+
+#: src/gtkui/settings.cc:37 src/qtui/settings.cc:61
+msgid "Never"
+msgstr "Soha"
+
+#: src/gtkui/settings.cc:41 src/qtui/settings.cc:64
 msgid "Playlist Tabs"
 msgstr "Lejátszólista fülek"
 
-#: src/gtkui/settings.cc:36
-msgid "Always show tabs"
-msgstr "Mindig mutassa a füleket"
+#: src/gtkui/settings.cc:42 src/qtui/settings.cc:65
+msgid "Show playlist tabs:"
+msgstr "Lejátszólista fülek megjelenítése:"
 
-#: src/gtkui/settings.cc:38
+#: src/gtkui/settings.cc:45 src/qtui/settings.cc:69
 msgid "Show entry counts"
 msgstr "Elemek számának mutatása"
 
-#: src/gtkui/settings.cc:40
+#: src/gtkui/settings.cc:47 src/qtui/settings.cc:72
 msgid "Show close buttons"
 msgstr "Bezárás gomb mutatása"
 
-#: src/gtkui/settings.cc:42
+#: src/gtkui/settings.cc:49 src/qtui/settings.cc:75
 msgid "Playlist Columns"
 msgstr "Lejátszólista oszlopok"
 
-#: src/gtkui/settings.cc:44
+#: src/gtkui/settings.cc:51 src/qtui/settings.cc:77
 msgid "Show column headers"
 msgstr "Oszlop fejlécek mutatása"
 
-#: src/gtkui/settings.cc:46 src/modplug/plugin_main.cc:106
-#: src/skins/skins_cfg.cc:263
-msgid "Miscellaneous"
-msgstr "Egyéb"
+#: src/gtkui/settings.cc:53 src/qtui/settings.cc:82
+msgid "Make column headers clickable for sorting"
+msgstr ""
 
-#: src/gtkui/settings.cc:47
-msgid "Arrow keys seek by:"
-msgstr "Nyíl billentyűk a tekeréshez:"
+#: src/gtkui/settings.cc:56
+msgid "Use symbolic icons in toolbar"
+msgstr "Szimbolikus ikonok használata az eszköztáron"
 
-#: src/gtkui/settings.cc:50
+#: src/gtkui/settings.cc:58 src/qtui/settings.cc:86
 msgid "Scroll on song change"
 msgstr "Számváltáskor gördül"
 
-#: src/gtkui/ui_gtk.cc:71
+#: src/gtkui/ui_gtk.cc:82
 msgid "GTK Interface"
-msgstr "GTK+ felület"
+msgstr "GTK felület"
 
-#: src/gtkui/ui_gtk.cc:222 src/skins/ui_main.cc:232
+#: src/gtkui/ui_gtk.cc:219 src/skins/main.cc:228 src/skins-qt/main.cc:231
 #, c-format
 msgid "%s - Audacious"
-msgstr "%s - Audacious"
+msgstr "%s – Audacious"
 
-#: src/gtkui/ui_gtk.cc:225 src/qtui/main_window.cc:186
+#: src/gtkui/ui_gtk.cc:221 src/moonstone/main_window.cc:184
+#: src/qtui/main_window.cc:385
 msgid "Buffering ..."
 msgstr "Pufferelés ..."
 
-#: src/gtkui/ui_gtk.cc:228 src/skins/ui_main.cc:234 src/skins/ui_main.cc:1164
+#: src/gtkui/ui_gtk.cc:224 src/pipewire/pipewire.cc:402 src/skins/main.cc:230
+#: src/skins-qt/main.cc:233
 msgid "Audacious"
 msgstr "Audacious"
 
-#: src/gtkui/ui_statusbar.cc:63 src/qtui/status_bar.cc:67
+#: src/gtkui/ui_gtk.cc:487 src/gtkui/ui_gtk.cc:518 src/gtkui/ui_gtk.cc:882
+#: src/hotkey/gui.cc:72 src/moonstone/main_window.cc:67
+#: src/moonstone/main_window.cc:145 src/moonstone/main_window.cc:146
+#: src/notify/osd.cc:85 src/qthotkey/gui.cc:67 src/qtui/main_window.cc:154
+#: src/qtui/main_window.cc:347 src/qtui/main_window.cc:348
+#: src/skins/menus.cc:109 src/skins-qt/menus.cc:100
+msgid "Play"
+msgstr "Lejátszás"
+
+#: src/gtkui/ui_gtk.cc:487 src/moonstone/main_window.cc:151
+#: src/moonstone/main_window.cc:152 src/notify/osd.cc:82
+#: src/qtui/main_window.cc:353 src/qtui/main_window.cc:354
+#: src/skins/menus.cc:110 src/skins-qt/menus.cc:101
+msgid "Pause"
+msgstr "Szünet"
+
+#: src/gtkui/ui_gtk.cc:868 src/moonstone/main_window.cc:57
+#: src/qtui/main_window.cc:145 src/skins/menus.cc:86 src/skins-qt/menus.cc:77
+msgid "Search Library"
+msgstr "Keresés a gyűjteményben"
+
+#: src/gtkui/ui_gtk.cc:875 src/moonstone/main_window.cc:60
+#: src/qtui/main_window.cc:147
+msgid "Open Files"
+msgstr "Fájlok megnyitása"
+
+#: src/gtkui/ui_gtk.cc:876 src/moonstone/main_window.cc:62
+#: src/qtui/main_window.cc:149
+msgid "Add Files"
+msgstr "Fájlok hozzáadása"
+
+#: src/gtkui/ui_gtk.cc:881 src/moonstone/main_window.cc:65
+#: src/qtui/main_window.cc:152 src/skins/menus.cc:112 src/skins-qt/menus.cc:103
+msgid "Previous"
+msgstr "Előző"
+
+#: src/gtkui/ui_gtk.cc:883 src/hotkey/gui.cc:74 src/moonstone/main_window.cc:69
+#: src/qthotkey/gui.cc:69 src/qtui/main_window.cc:156 src/skins/menus.cc:111
+#: src/skins-qt/menus.cc:102
+msgid "Stop"
+msgstr "Leállítás"
+
+#: src/gtkui/ui_gtk.cc:884 src/moonstone/main_window.cc:76 src/notify/osd.cc:89
+#: src/qtui/main_window.cc:163 src/skins/menus.cc:113 src/skins-qt/menus.cc:104
+msgid "Next"
+msgstr "Következő"
+
+#: src/gtkui/ui_gtk.cc:886 src/moonstone/main_window.cc:79
+#: src/qtui/main_window.cc:166 src/qtui/menus.cc:254 src/skins/menus.cc:79
+#: src/skins-qt/menus.cc:69
+msgid "Record Stream"
+msgstr "Közvetítés rögzítése"
+
+#: src/gtkui/ui_gtk.cc:919 src/moonstone/main_window.cc:86
+#: src/qtui/main_window.cc:173 src/skins/menus.cc:103 src/skins-qt/menus.cc:94
+msgid "Repeat"
+msgstr "Ismétlés"
+
+#: src/gtkui/ui_gtk.cc:922 src/moonstone/main_window.cc:89
+#: src/qtui/main_window.cc:176 src/skins/menus.cc:104 src/skins-qt/menus.cc:95
+msgid "Shuffle"
+msgstr "Véletlenszerű"
+
+#: src/gtkui/ui_gtk.cc:1114 src/qtui/main_window.cc:123
+msgid "Menu"
+msgstr "Menü"
+
+#: src/gtkui/ui_statusbar.cc:64 src/qtui/status_bar.cc:155
 msgid "mono"
 msgstr "mono"
 
-#: src/gtkui/ui_statusbar.cc:65 src/qtui/status_bar.cc:69
+#: src/gtkui/ui_statusbar.cc:66 src/qtui/status_bar.cc:157
 msgid "stereo"
 msgstr "sztereó"
 
-#: src/gtkui/ui_statusbar.cc:67 src/qtui/status_bar.cc:71
+#: src/gtkui/ui_statusbar.cc:68 src/qtui/status_bar.cc:160
 #, c-format
 msgid "%d channel"
 msgid_plural "%d channels"
 msgstr0 "%d csatorna"
 msgstr1 "%d csatorna"
 
-#: src/gtkui/ui_statusbar.cc:81 src/qtui/status_bar.cc:85
+#: src/gtkui/ui_statusbar.cc:76 src/qtui/status_bar.cc:168
+#, c-format
+msgid "%d kHz"
+msgstr "%d kHz"
+
+#: src/gtkui/ui_statusbar.cc:82 src/qtui/status_bar.cc:174
 #, c-format
-msgid "%d kbps"
-msgstr "%d kbps"
+msgid "%d kbit/s"
+msgstr "%d kbit/s"
 
-#: src/gtkui/ui_statusbar.cc:107 src/skins/ui_main_evlisteners.cc:103
+#: src/gtkui/ui_statusbar.cc:108 src/skins/main.cc:478 src/skins-qt/main.cc:461
 msgid "Single mode."
 msgstr "Egyszerű mód."
 
-#: src/gtkui/ui_statusbar.cc:109 src/skins/ui_main_evlisteners.cc:105
+#: src/gtkui/ui_statusbar.cc:110 src/skins/main.cc:480 src/skins-qt/main.cc:463
 msgid "Playlist mode."
 msgstr "Lejátszólista mód."
 
-#: src/gtkui/ui_statusbar.cc:117 src/skins/ui_main_evlisteners.cc:111
+#: src/gtkui/ui_statusbar.cc:118 src/skins/main.cc:486 src/skins-qt/main.cc:469
 msgid "Stopping after song."
 msgstr "Leállítás az aktuális dal után."
 
-#: src/hotkey/gui.cc:71
+#: src/hotkey/gui.cc:71 src/qthotkey/gui.cc:66
 msgid "Previous track"
 msgstr "Előző szám"
 
-#: src/hotkey/gui.cc:72 src/notify/osd.cc:69 src/qtui/main_window.cc:69
-#: src/qtui/main_window.cc:172 src/qtui/main_window.cc:173
-#: src/skins/menus.cc:87
-msgid "Play"
-msgstr "Lejátszás"
-
-#: src/hotkey/gui.cc:73
+#: src/hotkey/gui.cc:73 src/qthotkey/gui.cc:68
 msgid "Pause/Resume"
-msgstr "Szünet/Folytatás"
-
-#: src/hotkey/gui.cc:74 src/qtui/main_window.cc:70 src/skins/menus.cc:89
-msgid "Stop"
-msgstr "Leállít"
+msgstr "Szünet/folytatás"
 
-#: src/hotkey/gui.cc:75
+#: src/hotkey/gui.cc:75 src/qthotkey/gui.cc:70
 msgid "Next track"
 msgstr "Következő szám"
 
-#: src/hotkey/gui.cc:76
-msgid "Forward 5 seconds"
-msgstr "5 mp előre"
-
-#: src/hotkey/gui.cc:77
-msgid "Rewind 5 seconds"
-msgstr "5 mp vissza"
+#: src/hotkey/gui.cc:76 src/qthotkey/gui.cc:71
+msgid "Step forward"
+msgstr "Előrelépés"
+
+#: src/hotkey/gui.cc:77 src/qthotkey/gui.cc:72
+msgid "Step backward"
+msgstr "Visszalépés"
 
-#: src/hotkey/gui.cc:78
+#: src/hotkey/gui.cc:78 src/qthotkey/gui.cc:73
 msgid "Mute"
 msgstr "Némítás"
 
-#: src/hotkey/gui.cc:79
+#: src/hotkey/gui.cc:79 src/qthotkey/gui.cc:74
 msgid "Volume up"
 msgstr "Hangerő növelése"
 
-#: src/hotkey/gui.cc:80
+#: src/hotkey/gui.cc:80 src/qthotkey/gui.cc:75
 msgid "Volume down"
 msgstr "Hangerő csökkentése"
 
-#: src/hotkey/gui.cc:81
+#: src/hotkey/gui.cc:81 src/qthotkey/gui.cc:76
 msgid "Jump to file"
 msgstr "Ugrás fájlhoz"
 
-#: src/hotkey/gui.cc:82
+#: src/hotkey/gui.cc:82 src/qthotkey/gui.cc:77
 msgid "Toggle player window(s)"
 msgstr "Lejátszó ablak(ok) váltása"
 
-#: src/hotkey/gui.cc:83
+#: src/hotkey/gui.cc:83 src/qthotkey/gui.cc:78
 msgid "Show On-Screen-Display"
 msgstr "On-Screen-Display mutatása"
 
-#: src/hotkey/gui.cc:84
+#: src/hotkey/gui.cc:84 src/qthotkey/gui.cc:79
 msgid "Toggle repeat"
 msgstr "Ismétlés bekapcsolása"
 
-#: src/hotkey/gui.cc:85
+#: src/hotkey/gui.cc:85 src/qthotkey/gui.cc:80
 msgid "Toggle shuffle"
 msgstr "Véletlenszerű lejátszás be"
 
-#: src/hotkey/gui.cc:86
+#: src/hotkey/gui.cc:86 src/qthotkey/gui.cc:81
 msgid "Toggle stop after current"
 msgstr "Játszott szám után állj"
 
-#: src/hotkey/gui.cc:87
+#: src/hotkey/gui.cc:87 src/qthotkey/gui.cc:82
 msgid "Raise player window(s)"
 msgstr "Lejátszó ablak(ok) kiemelése"
 
-#: src/hotkey/gui.cc:97
+#: src/hotkey/gui.cc:98 src/qthotkey/gui.cc:100
 msgid "(none)"
 msgstr "(nincs)"
 
-#: src/hotkey/gui.cc:234
+#: src/hotkey/gui.cc:261
 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 modifiers.\n"
 "\n"
 "Do you want to continue?"
 msgstr ""
+"Nem ajánlott az elsődleges egérgombokat módosítók nélkül társítani.\n"
+"\n"
+"Biztos, hogy folytatja?"
 
-#: src/hotkey/gui.cc:236
+#: src/hotkey/gui.cc:264
 msgid "Binding mouse buttons"
-msgstr "Egér gombok hozzárendelése"
+msgstr "Egérgombok hozzárendelése"
 
-#: src/hotkey/gui.cc:391
+#: src/hotkey/gui.cc:434
 msgid ""
 "Press a key combination inside a text field.\n"
 "You can also bind mouse buttons."
@@ -2033,60 +2252,100 @@
 "Adjon meg egy billentyűkombinációt a beviteli mezőben.\n"
 "Ez fog az egér gombjaihoz kötődni."
 
-#: src/hotkey/gui.cc:396
+#: src/hotkey/gui.cc:444 src/qthotkey/gui.cc:179
 msgid "Hotkeys:"
 msgstr "Gyorsbillentyűk:"
 
-#: src/hotkey/gui.cc:413
+#: src/hotkey/gui.cc:457 src/qthotkey/gui.cc:181
 msgid "Action:"
 msgstr "Művelet:"
 
-#: src/hotkey/gui.cc:420
+#: src/hotkey/gui.cc:461 src/qthotkey/gui.cc:182
 msgid "Key Binding:"
 msgstr "Billentyű kötések:"
 
-#: src/hotkey/gui.cc:468
+#: src/hotkey/gui.cc:518 src/qthotkey/gui.cc:184
 msgid "_Add"
 msgstr "_Hozzáadás"
 
-#: src/hotkey/plugin.cc:61
+#: src/hotkey/plugin.cc:59 src/qthotkey/plugin.cc:78
 msgid "Global Hotkeys"
 msgstr "Általános gyorsbillentyűk"
 
-#: src/hotkey/plugin.cc:79
+#: src/hotkey/plugin.cc:74
 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"
+"Contributors 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 ""
+"Általános Gyorsbillentyűk Bővítmény\n"
+"A lejátszó irányítása általános billentyűkombinációkkal vagy multimédia "
+"billentyűkkel.\n"
+"\n"
+"Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n"
+"\n"
+"Hozzájárult többek között:\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/jack-ng/jack-ng.cc:49
+#: src/jack/jack-ng.cc:54
 msgid "JACK Output"
 msgstr "JACK kimenet"
 
-#: src/jack-ng/jack-ng.cc:114
+#: src/jack/jack-ng.cc:126
+msgid "Client name:"
+msgstr "Kliens neve:"
+
+#: src/jack/jack-ng.cc:128
 msgid "Automatically connect to output ports"
 msgstr "Automatikus csatlakozás a kimeneti portokhoz"
 
-#: src/jack-ng/jack-ng.cc:155
+#: src/jack/jack-ng.cc:130
+msgid "Filter ports (regex, use any port if blank):"
+msgstr "Portok szűrése (regex, bármelyik port használata, ha üres):"
+
+#: src/jack/jack-ng.cc:136
+msgid "Connect to physical ports only"
+msgstr "Csatlakozás csak fizikai portokhoz"
+
+#: src/jack/jack-ng.cc:139
+msgid "Upmix to"
+msgstr "Felkeverés ide"
+
+#: src/jack/jack-ng.cc:141
+msgid "ports if input has fewer channels"
+msgstr "port(ok), ha a bemenetnek kevesebb csatornája van"
+
+#: src/jack/jack-ng.cc:143
+msgid "Ignore insufficient number of ports"
+msgstr "Nem elégséges számú port figyelmen kívül hagyása"
+
+#: src/jack/jack-ng.cc:181
+msgid "No JACK output ports were found. Please check settings."
+msgstr "Nem találtam JACK kimeneti portot. Kérem ellenőrizze a beállításokat."
+
+#: src/jack/jack-ng.cc:195
 #, c-format
 msgid "Only %d JACK output ports were found but %d are required."
-msgstr ""
+msgstr "Csak %d darab JACK kimeneti portot találtam, de %d darab kellene."
 
-#: src/jack-ng/jack-ng.cc:164
+#: src/jack/jack-ng.cc:210
 #, c-format
 msgid "Failed to connect to JACK port %s."
 msgstr "Sikertelen kapcsolódás a JACK porthoz: %s."
 
-#: src/jack-ng/jack-ng.cc:184
+#: src/jack/jack-ng.cc:230
 msgid ""
 "JACK supports only floating-point audio. You must change the output bit "
 "depth to floating-point in Audacious settings."
@@ -2094,11 +2353,11 @@
 "A JACK csak a lebegőpontos audiót támogatja. Kérem állítsa át a kimeneti bit "
 "mélységet lebegőpontosra az Audacious beállításaiban."
 
-#: src/jack-ng/jack-ng.cc:197
+#: src/jack/jack-ng.cc:245
 msgid "Failed to connect to the JACK server; is it running?"
 msgstr "Sikertelen kapcsolódás a JACK szerverhez; valóban fut?"
 
-#: src/jack-ng/jack-ng.cc:273
+#: src/jack/jack-ng.cc:321
 #, c-format
 msgid ""
 "The JACK server requires a sample rate of %d Hz, but Audacious is playing at "
@@ -2108,41 +2367,44 @@
 "csa %d Hz-en játszik le. Kérem használja a Mintavételi Frekvencia Konverter "
 "modult a hibák elkerülése érdekében."
 
-#: src/ladspa/plugin.cc:414
+#: src/ladspa/plugin.cc:416
 #, c-format
 msgid "%s Settings"
 msgstr "%s Beállítások"
 
-#: src/ladspa/plugin.cc:478
+#: src/ladspa/plugin.cc:482
 msgid "Module paths:"
 msgstr "Modul útvonalak:"
 
-#: src/ladspa/plugin.cc:483
+#: src/ladspa/plugin.cc:487
 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 ""
+"Több elérési utat kettősponttal válasszon el.\n"
+"Ezek a helyek a LADSPA_PATH-on kivül is kereshetők.\n"
+"Új helyek hozzáadása után nyomjon entert az új beépülők kereséséhez."
 
-#: src/ladspa/plugin.cc:499
+#: src/ladspa/plugin.cc:508
 msgid "Available plugins:"
 msgstr "Elérhető bővítmények:"
 
-#: src/ladspa/plugin.cc:512 src/modplug/plugin_main.cc:92
-#: src/modplug/plugin_main.cc:95 src/modplug/plugin_main.cc:98
-#: src/modplug/plugin_main.cc:101
+#: src/ladspa/plugin.cc:521 src/modplug/plugin_main.cc:91
+#: src/modplug/plugin_main.cc:94 src/modplug/plugin_main.cc:97
+#: src/modplug/plugin_main.cc:100
 msgid "Enable"
 msgstr "Engedélyez"
 
-#: src/ladspa/plugin.cc:518
+#: src/ladspa/plugin.cc:527
 msgid "Enabled plugins:"
 msgstr "Engedélyezett modulok:"
 
-#: src/ladspa/plugin.cc:534
+#: src/ladspa/plugin.cc:543
 msgid "Settings"
 msgstr "Beállítások"
 
-#: src/ladspa/plugin.cc:551
+#: src/ladspa/plugin.cc:560
 msgid ""
 "LADSPA Host for Audacious\n"
 "Copyright 2011 John Lindgren"
@@ -2158,7 +2420,7 @@
 msgid "LIRC Plugin"
 msgstr "LIRC bővítmény"
 
-#: src/lirc/lirc.cc:381
+#: src/lirc/lirc.cc:379
 msgid ""
 "A simple plugin to control Audacious using the LIRC remote control daemon\n"
 "\n"
@@ -2186,63 +2448,125 @@
 "\n"
 "További információkért nézze meg a LIRC honlapját, http://lirc.org."
 
-#: src/lirc/lirc.cc:392
+#: src/lirc/lirc.cc:390
 msgid "Connection"
 msgstr "Kapcsolat"
 
-#: src/lirc/lirc.cc:393
+#: src/lirc/lirc.cc:391
 msgid "Reconnect to LIRC server"
 msgstr "Újracsatlakozás a LIRC szerverhez"
 
-#: src/lirc/lirc.cc:395
+#: src/lirc/lirc.cc:393
 msgid "Wait before reconnecting:"
 msgstr "Várjon az újracsatlakozás előtt:"
 
-#: src/lyricwiki/lyricwiki.cc:41
-msgid "LyricWiki Plugin"
-msgstr "LyricWiki bővítmény"
-
-#: src/lyricwiki/lyricwiki.cc:131 src/lyricwiki-qt/lyricwiki.cc:136
-msgid "No lyrics available"
-msgstr "Nincs elérhető zeneszöveg"
-
-#: src/lyricwiki/lyricwiki.cc:217 src/lyricwiki/lyricwiki.cc:226
-#: src/lyricwiki/lyricwiki.cc:243 src/lyricwiki/lyricwiki.cc:252
-#: src/lyricwiki/lyricwiki.cc:267 src/lyricwiki-qt/lyricwiki.cc:222
-#: src/lyricwiki-qt/lyricwiki.cc:231 src/lyricwiki-qt/lyricwiki.cc:248
-#: src/lyricwiki-qt/lyricwiki.cc:257 src/lyricwiki-qt/lyricwiki.cc:272
-msgid "Error"
-msgstr "Hiba"
-
-#: src/lyricwiki/lyricwiki.cc:218 src/lyricwiki/lyricwiki.cc:244
-#: src/lyricwiki-qt/lyricwiki.cc:223 src/lyricwiki-qt/lyricwiki.cc:249
+#: src/lyrics-common/chart_lyrics_provider.cc:93
+#: src/lyrics-common/chart_lyrics_provider.cc:150
+#: src/lyrics-common/lyrics_ovh_provider.cc:50
 #, c-format
 msgid "Unable to fetch %s"
 msgstr "Nem sikerült letölteni: %s"
 
-#: src/lyricwiki/lyricwiki.cc:227 src/lyricwiki/lyricwiki.cc:253
-#: src/lyricwiki-qt/lyricwiki.cc:232 src/lyricwiki-qt/lyricwiki.cc:258
+#: src/lyrics-common/chart_lyrics_provider.cc:100
+#: src/lyrics-common/chart_lyrics_provider.cc:157
+#: src/lyrics-common/lyrics_ovh_provider.cc:57
 #, c-format
 msgid "Unable to parse %s"
 msgstr "Nem sikerült értelmezni: %s"
 
-#: src/lyricwiki/lyricwiki.cc:259 src/lyricwiki-qt/lyricwiki.cc:264
+#: src/lyrics-common/chart_lyrics_provider.cc:121
+#: src/lyrics-common/chart_lyrics_provider.cc:194
+#: src/lyrics-common/lyrics_ovh_provider.cc:88
 msgid "Looking for lyrics ..."
 msgstr "Zeneszöveg keresése ..."
 
-#: src/lyricwiki/lyricwiki.cc:267 src/lyricwiki-qt/lyricwiki.cc:272
-msgid "Missing song metadata"
-msgstr "Érvénytelen a dal metaadata"
+#: src/lyrics-common/preferences.h:43
+msgid "Nowhere"
+msgstr "Sehol"
+
+#: src/lyrics-common/preferences.h:49
+msgid "Artist is truncated at the start, Title -- at the end"
+msgstr "Előadó mező csonka az elején, Cím -- a végén"
 
-#: src/lyricwiki/lyricwiki.cc:278 src/lyricwiki-qt/lyricwiki.cc:283
-msgid "Connecting to lyrics.wikia.com ..."
-msgstr "Kapcsolódás a lyrics.wikia.com helyhez ..."
+#: src/lyrics-common/preferences.h:50
+msgid "Chars to truncate on:"
+msgstr "Csonkolandó karakterek:"
 
-#: src/lyricwiki-qt/lyricwiki.cc:55
-msgid "LyricWiki Plugin (Qt)"
+#: src/lyrics-common/preferences.h:54
+msgid "Chars are ORed in RegExp, surrounded by whitespace"
 msgstr ""
+"Karakterek ORed színnel a kifejezésben, előtte és utána szóköz</"
+"small>"
+
+#: src/lyrics-common/preferences.h:55
+msgid "Chars to split on:"
+msgstr "Elválasztandó karakterek:"
+
+#: src/lyrics-common/preferences.h:56
+msgid "Further truncate those on chars"
+msgstr "További csonkolás azokon a karaktereken"
+
+#: src/lyrics-common/preferences.h:62
+msgid "General"
+msgstr "Általános"
+
+#: src/lyrics-common/preferences.h:63
+msgid "Split title into artist and title on chars"
+msgstr "Cím szétválasztása szerző és címmé a karaktereknél"
+
+#: src/lyrics-common/preferences.h:66
+msgid "Sources"
+msgstr "Források"
+
+#: src/lyrics-common/preferences.h:67
+msgid "Use embedded lyrics (from Lyrics tag)"
+msgstr "Beágyazott dalszövegek használata (a Dalszöveg címkéből)"
+
+#: src/lyrics-common/preferences.h:69
+msgid "Fetch lyrics from internet:"
+msgstr "Dalszöveg letöltése az internetről:"
+
+#: src/lyrics-common/preferences.h:72
+msgid "Store fetched lyrics in local cache"
+msgstr "Letöltött dalszövegeket mentse helyi tárban"
 
-#: src/m3u/m3u.cc:32
+#: src/lyrics-common/preferences.h:74
+msgid "Local Storage"
+msgstr "Helyi Tároló"
+
+#: src/lyrics-common/preferences.h:75
+msgid "Load lyric files (.lrc) from local storage"
+msgstr "Dalszöveg fájlok (.lrc) betöltése helyi tárból"
+
+#: src/lyrics-common/utils.cc:54 src/ui-common/dialogs-qt.cc:63
+msgid "Error"
+msgstr "Hiba"
+
+#: src/lyrics-common/utils.cc:60
+msgid "Lyrics could not be found."
+msgstr "Dalszöveg nem található."
+
+#: src/lyrics-common/utils.cc:142
+msgid "Missing title and/or artist."
+msgstr "Hiányzó cím és/vagy előadó."
+
+#: src/lyrics-gtk/lyrics-gtk.cc:37 src/lyrics-qt/lyrics-qt.cc:50
+msgid "Lyrics"
+msgstr "Dalszöveg"
+
+#: src/lyrics-gtk/lyrics-gtk.cc:189 src/lyrics-qt/lyrics-qt.cc:171
+msgid "Edit Lyrics ..."
+msgstr "Dalszöveg Szerkesztése ..."
+
+#: src/lyrics-gtk/lyrics-gtk.cc:195 src/lyrics-qt/lyrics-qt.cc:178
+msgid "Save Locally"
+msgstr "Mentés Helyben"
+
+#: src/lyrics-gtk/lyrics-gtk.cc:201 src/lyrics-qt/lyrics-qt.cc:186
+msgid "Refresh"
+msgstr "Frissítés"
+
+#: src/m3u/m3u.cc:33
 msgid "M3U Playlists"
 msgstr "M3U lejátszólisták"
 
@@ -2250,17 +2574,17 @@
 msgid "Tact Generator"
 msgstr "Tact generátor"
 
-#: src/metronom/metronom.cc:147
+#: src/metronom/metronom.cc:145
 #, c-format
 msgid "Tact generator: %d bpm"
 msgstr "Tact generátor: %d bpm"
 
-#: src/metronom/metronom.cc:149
+#: src/metronom/metronom.cc:147
 #, c-format
 msgid "Tact generator: %d bpm %d/%d"
 msgstr "Tact generátor: %d bpm %d/%d"
 
-#: src/metronom/metronom.cc:237
+#: src/metronom/metronom.cc:235
 msgid ""
 "A Tact Generator by Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
 "\n"
@@ -2268,22 +2592,33 @@
 "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 ""
+"Üten Generátor Martin Strauss <mys@faveve.uni-stuttgart.de> által\n"
+"\n"
+"Használat:\n"
+"tact://beats*num/den\n"
+"tact://ütemszám*x/y\n"
+"\n"
+"Például:\n"
+"tact://77 -> 77 ütem percenként\n"
+"tact://60*3/4 -> 60 bpm 3/4-es taktusokban"
 
-#: src/mixer/mixer.cc:38
+#: src/mixer/mixer.cc:43
 msgid "Channel Mixer"
 msgstr "Csatorna keverő"
 
-#: src/mixer/mixer.cc:202
+#: src/mixer/mixer.cc:255
 msgid ""
 "Channel Mixer Plugin for Audacious\n"
 "Copyright 2011-2012 John Lindgren and Michał Lipski"
 msgstr ""
+"Csatornakeverő bővítmény az Audacious-hoz\n"
+"Copyright 2011-2012 John Lindgren és Michał Lipski"
 
-#: src/mixer/mixer.cc:206
+#: src/mixer/mixer.cc:259
 msgid "Channel Mixer"
 msgstr "Csatorna keverő"
 
-#: src/mixer/mixer.cc:207
+#: src/mixer/mixer.cc:260
 msgid "Output channels:"
 msgstr "Kimeneti csatornák:"
 
@@ -2293,170 +2628,178 @@
 
 #: src/mms/mms.cc:82
 msgid "Error connecting to MMS server"
-msgstr ""
+msgstr "Hiba az MMS szerverhez való csatlakozás során"
 
-#: src/modplug/modplugbmp.h:53
+#: src/modplug/modplugbmp.h:57
 msgid "ModPlug (Module Player)"
 msgstr "ModPlug (Modul lejátszó)"
 
-#: src/modplug/plugin_main.cc:53
-msgid "Resolution"
-msgstr "Felbontás"
-
-#: src/modplug/plugin_main.cc:54
-msgid "8-bit"
-msgstr "8-bit"
-
 #: src/modplug/plugin_main.cc:55
-msgid "16-bit"
-msgstr "16 bit"
-
-#: src/modplug/plugin_main.cc:56
 msgid "Channels"
 msgstr "Csatornák"
 
-#: src/modplug/plugin_main.cc:60
+#: src/modplug/plugin_main.cc:59
 msgid "Nearest (fastest)"
-msgstr ""
+msgstr "Legközelebbi szomszéd (leggyorsabb)"
 
-#: src/modplug/plugin_main.cc:61
+#: src/modplug/plugin_main.cc:60
 msgid "Linear (fast)"
-msgstr ""
+msgstr "Lineáris (gyors)"
 
-#: src/modplug/plugin_main.cc:62
+#: src/modplug/plugin_main.cc:61
 msgid "Spline (good)"
-msgstr ""
+msgstr "Spline (jó)"
 
-#: src/modplug/plugin_main.cc:63
+#: src/modplug/plugin_main.cc:62
 msgid "Polyphase (best)"
-msgstr ""
+msgstr "Polifázis (legjobb)"
 
-#: src/modplug/plugin_main.cc:64
+#: src/modplug/plugin_main.cc:63
 msgid "Sample rate"
 msgstr "Mintavételi ráta"
 
-#: src/modplug/plugin_main.cc:65
+#: src/modplug/plugin_main.cc:64
 msgid "22 kHz"
 msgstr "22 kHz"
 
-#: src/modplug/plugin_main.cc:66
+#: src/modplug/plugin_main.cc:65
 msgid "44 kHz"
 msgstr "44 kHz"
 
-#: src/modplug/plugin_main.cc:67
+#: src/modplug/plugin_main.cc:66
 msgid "48 kHz"
 msgstr "48 kHz"
 
-#: src/modplug/plugin_main.cc:68
+#: src/modplug/plugin_main.cc:67
 msgid "96 kHz"
 msgstr "96 kHz"
 
-#: src/modplug/plugin_main.cc:72 src/modplug/plugin_main.cc:77
-#: src/modplug/plugin_main.cc:82
+#: src/modplug/plugin_main.cc:71 src/modplug/plugin_main.cc:76
+#: src/modplug/plugin_main.cc:81
 msgid "Level:"
 msgstr "Szint:"
 
-#: src/modplug/plugin_main.cc:78
+#: src/modplug/plugin_main.cc:77
 msgid "Cutoff:"
-msgstr ""
+msgstr "Levágás:"
 
-#: src/modplug/plugin_main.cc:91
+#: src/modplug/plugin_main.cc:90
 msgid "Reverb"
-msgstr ""
+msgstr "Visszhang"
 
-#: src/modplug/plugin_main.cc:94
+#: src/modplug/plugin_main.cc:93
 msgid "Bass Boost"
 msgstr "Basszus erősítés"
 
-#: src/modplug/plugin_main.cc:97
+#: src/modplug/plugin_main.cc:96
 msgid "Surround"
 msgstr "Surround"
 
-#: src/modplug/plugin_main.cc:100
+#: src/modplug/plugin_main.cc:99
 msgid "Preamp"
-msgstr ""
+msgstr "Előerősítés"
 
-#: src/modplug/plugin_main.cc:107
+#: src/modplug/plugin_main.cc:106
 msgid "Oversample"
 msgstr "Túlvételezés"
 
-#: src/modplug/plugin_main.cc:108
+#: src/modplug/plugin_main.cc:107
 msgid "Noise reduction"
 msgstr "Zajcsökkentés"
 
-#: src/modplug/plugin_main.cc:109
+#: src/modplug/plugin_main.cc:108
 msgid "Play Amiga MODs"
 msgstr "AMIGA MOD fájlok lejátszása"
 
-#: src/modplug/plugin_main.cc:110
+#: src/modplug/plugin_main.cc:109
 msgid "Repeat"
 msgstr "Ismétlés"
 
-#: src/modplug/plugin_main.cc:111
+#: src/modplug/plugin_main.cc:110
 msgid "Repeat count:"
 msgstr "Ismétlés száma:"
 
-#: src/modplug/plugin_main.cc:112
+#: src/modplug/plugin_main.cc:111
 msgid "To repeat forever, set the repeat count to -1."
 msgstr "Ismétlés örökké, állítsd be az ismétlés számát -1-re"
 
-#: src/modplug/plugin_main.cc:125 src/sid/xs_config.cc:106
+#: src/modplug/plugin_main.cc:124 src/sid/xs_config.cc:106
 msgid "These settings will take effect when Audacious is restarted."
 msgstr "A beállítások csak az Audacious újraindítása után érvényesülnek."
 
+#: src/moonstone/main_window.cc:72 src/moonstone/main_window.cc:73
+#: src/qtui/main_window.cc:159 src/qtui/main_window.cc:160
+#: src/skins/menus.cc:107 src/skins-qt/menus.cc:98
+msgid "Stop After This Song"
+msgstr "Leállítás az aktuális dal után"
+
+#: src/moonstone/moonstone.cc:39
+msgid "Moonstone"
+msgstr "Moonstone"
+
+#: src/moonstone/playlist_header.cc:212 src/qtui/playlist_header.cc:258
+msgid "Reset to Defaults"
+msgstr "Visszaállítás alapértelmezettre"
+
+#: src/moonstone/playlist_model.cc:38 src/qtui/playlist_header.cc:232
+msgid "Now Playing"
+msgstr "Most játszott"
+
+#: src/moonstone/playlist_selection.cc:66
+#: src/playlist-manager/playlist-manager.cc:201
+#: src/playlist-manager-qt/playlist-manager-qt.cc:190
+msgid "Entries"
+msgstr "Elemek"
+
 #: src/mpg123/mpg123.cc:54
 msgid "MPG123 Plugin"
 msgstr "MPG123 bővítmény"
 
-#: src/mpg123/mpg123.cc:83
-msgid "Advanced"
-msgstr "Haladó"
-
-#: src/mpg123/mpg123.cc:84
+#: src/mpg123/mpg123.cc:82
 msgid "Use accurate length calculation (slow)"
-msgstr ""
+msgstr "Pontos hossz számítás (lassú)"
 
-#: src/mpg123/mpg123.cc:248
+#: src/mpg123/mpg123.cc:260
 msgid "Surround"
 msgstr "Térhatású"
 
-#: src/mpris2/plugin.cc:39
+#: src/mpris2/plugin.cc:40
 msgid "MPRIS 2 Server"
 msgstr "MPRIS 2 szerver"
 
-#: src/neon/neon.cc:97
+#: src/neon/neon.cc:102
 msgid "Neon HTTP/HTTPS Plugin"
 msgstr "Neon HTTP/HTTPS bővítmény"
 
-#: src/neon/neon.cc:521
+#: src/neon/neon.cc:526
 msgid "Error parsing redirect"
-msgstr ""
+msgstr "Hiba az átirányítás elemzésekor"
 
-#: src/neon/neon.cc:535
+#: src/neon/neon.cc:540
 msgid "Unknown HTTP error"
 msgstr "Ismeretlen HTTP hiba"
 
-#: src/neon/neon.cc:569
+#: src/neon/neon.cc:614
 msgid "Error parsing URL"
 msgstr "Hiba az URL elemzésekor"
 
-#: src/neon/neon.cc:632
+#: src/neon/neon.cc:687
 msgid "Too many redirects"
 msgstr "Túl sok átirányítás"
 
-#: src/notify/event.cc:64
+#: src/notify/event.cc:97
 msgid "Stopped"
 msgstr "Leállítva"
 
-#: src/notify/event.cc:64
+#: src/notify/event.cc:97
 msgid "Audacious is not playing."
 msgstr "Az Audacious nem játszik."
 
-#: src/notify/notify.cc:42
+#: src/notify/notify.cc:39
 msgid "Desktop Notifications"
 msgstr "Asztali értesítések"
 
-#: src/notify/notify.cc:60
+#: src/notify/notify.cc:57
 msgid ""
 "Desktop Notifications Plugin for Audacious\n"
 "Copyright (C) 2010 Maximilian Bogner\n"
@@ -2475,37 +2818,106 @@
 "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 ""
+"Asztali értesítések beépülő az Audacious-hoz\n"
+"Copyright (C) 2010 Maximilian Bogner\n"
+"Copyright (C) 2011-2013 John Lindgren és Jean-Alexandre Anglès d'Auriac\n"
+" \n"
+"Ez a program szabad szoftver; terjeszthető illetve módosítható a \n"
+"Free Software Foundation által kiadott GNU General Public License\n"
+"dokumentumában leírtak; akár a licenc 2-es, akár (tetszőleges) későbbi \n"
+"változata szerint.\n"
+"\n"
+"Ez a program abban a reményben kerül közreadásra, hogy hasznos lesz, \n"
+"de minden egyéb GARANCIA NÉLKÜL, az ELADHATÓSÁGRA vagy VALAMELY CÉLRA VALÓ "
+"ALKALMAZHATÓSÁGRA való származtatott garanciát is beleértve. \n"
+"További részleteket a GNU General Public License tartalmaz.\n"
+"\n"
+"A felhasználónak a programmal együtt meg kell kapnia a GNU General \n"
+"Public License egy példányát; ha mégsem kapta meg, akkor\n"
+"ezt a Free Software Foundationnak küldött levélben jelezze \n"
+" \n"
+"Free Software Foundation, Inc.\n"
+"51 Franklin Street, Fifth Floor\n"
+"Boston, MA 02110-1301, USA.\n"
+"\n"
+"http://www.gnu.org/licenses/\n"
+"http://gnu.hu/gpl.html"
 
-#: src/notify/notify.cc:110
+#: src/notify/notify.cc:104
 msgid "Show playback controls"
 msgstr "Lejátszó vezérlők mutatása"
 
-#: src/notify/notify.cc:112
+#: src/notify/notify.cc:106
 msgid "Always show notification"
 msgstr "Mindig mutasson értesítést"
 
-#: src/notify/notify.cc:114
+#: src/notify/notify.cc:108
 msgid "Include album name in notification"
 msgstr "Az album nevének megjelenítése az értesítésben"
 
-#: src/notify/osd.cc:58
+#: src/notify/notify.cc:110
+msgid "Custom notification duration:"
+msgstr "Egyéni értesítés időtartam:"
+
+#: src/notify/osd.cc:74
 msgid "Show"
 msgstr "Mutat"
 
-#: src/notify/osd.cc:66 src/qtui/main_window.cc:178
-#: src/qtui/main_window.cc:179 src/skins/menus.cc:88
-msgid "Pause"
-msgstr "Szünet"
+#: src/openmpt/mpt.cc:50
+msgid "OpenMPT (Module Player)"
+msgstr "OpenMPT (Modul Lejátszó)"
 
-#: src/notify/osd.cc:73 src/qtui/main_window.cc:72 src/skins/menus.cc:91
-msgid "Next"
-msgstr "Következő"
+#: src/openmpt/mpt.cc:132
+msgid ""
+"Module player based on libopenmpt\n"
+"\n"
+"Written by: Chris Spiegel <cspiegel@gmail.com>"
+msgstr ""
+"libopenmpt alapuló Modul Lejátszó\n"
+"\n"
+"Írta: Chris Spiegel <cspiegel@gmail.com>"
+
+#: src/openmpt/mpt.cc:151
+msgid "Stereo separation:"
+msgstr "Sztereó szétválasztás:"
 
-#: src/oss4/oss.h:93
+#: src/openmpt/mpt.cc:153
+msgid "% (0=mono, 100=default, 200=full)"
+msgstr ""
+
+#: src/openmpt/mpt.cc:157
+msgid "Interpolation:"
+msgstr "Interpoláció:"
+
+#: src/openmpt/mptwrap.h:51 src/soxr/sox-resampler.cc:189 src/xsf/plugin.cc:437
+msgid "Linear"
+msgstr "Lineáris"
+
+#: src/openmpt/mptwrap.h:52
+msgid "Cubic"
+msgstr "Harmadfokú"
+
+#: src/openmpt/mptwrap.h:53
+msgid "Windowed sinc"
+msgstr "Ablak-sinc-szűrő"
+
+#: src/opus/opus.cc:39
+msgid "Opus Decoder"
+msgstr "Opus dekódoló"
+
+#: src/opus/opus.cc:336
+msgid ""
+"Opus Decoder Plugin for Audacious\n"
+"Copyright 2022 Thomas Lange"
+msgstr ""
+"Opus dekódoló bővítmény az Audacioushoz\n"
+"Copyright 2022 Thomas Lange"
+
+#: src/oss4/oss.h:70
 msgid "OSS4 Output"
 msgstr "OSS4 kimenet"
 
-#: src/oss4/oss.h:95
+#: src/oss4/oss.h:72
 msgid "OSS3 Output"
 msgstr "OSS3 kimenet"
 
@@ -2513,27 +2925,27 @@
 msgid "Default device"
 msgstr "Alapértelmezett eszköz"
 
-#: src/oss4/plugin.cc:77
+#: src/oss4/plugin.cc:78
 msgid "Audio device:"
 msgstr "Audio eszköz:"
 
-#: src/oss4/plugin.cc:80
+#: src/oss4/plugin.cc:81
 msgid "Use alternate device:"
 msgstr "Alternatív eszköz használata:"
 
-#: src/oss4/plugin.cc:84
+#: src/oss4/plugin.cc:85
 msgid "Save volume between sessions."
 msgstr "Hangerő mentése munkamentek között"
 
-#: src/oss4/plugin.cc:86
+#: src/oss4/plugin.cc:87
 msgid "Enable format conversions made by the OSS software."
 msgstr "Formátum konverzió engedélyezése az OSS szoftverben."
 
-#: src/oss4/plugin.cc:88
+#: src/oss4/plugin.cc:89
 msgid "Enable exclusive mode to prevent virtual mixing."
-msgstr ""
+msgstr "Engedélyezd az exkluzív módot a virtuális keverés ellen."
 
-#: src/oss4/plugin.cc:100
+#: src/oss4/plugin.cc:101
 msgid ""
 "OSS4 Output Plugin for Audacious\n"
 "Copyright 2010-2012 Michał Lipski\n"
@@ -2541,20 +2953,46 @@
 "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 Kimeneti Bővítmény az Audacious-hoz\n"
+"Copyright 2010-2012 Michał Lipski\n"
+"\n"
+"Köszönet mindenkinek az #audacious-on, különösen Tony Vroon-nak és John "
+"Lindgren-nek, és persze az előző OSS beépülő készítőinek."
 
-#: src/playlist-manager/playlist-manager.cc:37
+#: src/pipewire/pipewire.cc:44
+msgid "PipeWire Output"
+msgstr "PipeWire kimenet"
+
+#: src/pipewire/pipewire.cc:118
+msgid ""
+"PipeWire Output Plugin for Audacious\n"
+"Copyright 2022 Thomas Lange\n"
+"\n"
+"Based on the PipeWire Output Plugin for Qmmp\n"
+"Copyright 2021 Ilya Kotov"
+msgstr ""
+"PipeWire kimeneti bővítmény az Audacioushoz\n"
+"Copyright 2022 Thomas Lange\n"
+"\n"
+"A Qmpp-hez készült PipeWire kimeneti bővítmény alapján\n"
+"Copyright 2021 Ilya Kotov"
+
+#: src/pipewire/pipewire.cc:408 src/skins/menus.cc:88 src/skins-qt/menus.cc:79
+msgid "Playback"
+msgstr "Lejátszás"
+
+#: src/playlist-manager/playlist-manager.cc:38
+#: src/playlist-manager-qt/playlist-manager-qt.cc:42
 msgid "Playlist Manager"
 msgstr "Lejátszólista kezelő"
 
-#: src/playlist-manager/playlist-manager.cc:226
-msgid "Entries"
-msgstr "Elemek"
-
-#: src/playlist-manager/playlist-manager.cc:245
+#: src/playlist-manager/playlist-manager.cc:221
+#: src/playlist-manager-qt/playlist-manager-qt.cc:356
 msgid "_Remove"
 msgstr "_Eltávolítás"
 
-#: src/playlist-manager/playlist-manager.cc:246
+#: src/playlist-manager/playlist-manager.cc:222
+#: src/playlist-manager-qt/playlist-manager-qt.cc:351
 msgid "Ren_ame"
 msgstr "Át_nevezés"
 
@@ -2562,39 +3000,73 @@
 msgid "PLS Playlists"
 msgstr "PLS lejásztólisták"
 
-#: src/psf/plugin.cc:45
+#: src/psf/plugin.cc:53
 msgid "OpenPSF PSF1/PSF2 Decoder"
-msgstr ""
+msgstr "OpenPSF PSF1/PSF2 dekódoló"
+
+#: src/psf/plugin.cc:270
+msgid "OpenPSF Configuration"
+msgstr "OpenPSF Beállítások"
+
+#: src/psf/plugin.cc:271 src/xsf/plugin.cc:444
+msgid "Ignore length from file"
+msgstr "Tárolt hossz mellőzése"
 
-#: src/pulse_audio/pulse_audio.cc:38
+#: src/pulse/pulse_audio.cc:42
 msgid "PulseAudio Output"
 msgstr "PulseAudio kimenet"
 
-#: src/pulse_audio/pulse_audio.cc:611
+#: src/pulse/pulse_audio.cc:84
+msgid "Context name:"
+msgstr "Környezet neve:"
+
+#: src/pulse/pulse_audio.cc:86
+msgid "Stream name:"
+msgstr "Folyam neve:"
+
+#: src/pulse/pulse_audio.cc:596
 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."
+"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 ""
+"Audacious PulseAudio Kimeneti Bővítmény\n"
+"\n"
+"Ez a program szabad szoftver; terjeszthető illetve módosítható a \n"
+"Free Software Foundation által kiadott GNU General Public License\n"
+"dokumentumában leírtak; akár a licenc 2-es, akár (tetszőleges) későbbi \n"
+"változata szerint.\n"
+"\n"
+"Ez a program abban a reményben kerül közreadásra, hogy hasznos lesz, \n"
+"de minden egyéb GARANCIA NÉLKÜL, az ELADHATÓSÁGRA vagy VALAMELY CÉLRA VALÓ "
+"ALKALMAZHATÓSÁGRA való származtatott garanciát is beleértve. \n"
+"További részleteket a GNU General Public License tartalmaz.\n"
+"\n"
+"A felhasználónak a programmal együtt meg kell kapnia a GNU General \n"
+"Public License egy példányát; ha mégsem kapta meg, akkor\n"
+"ezt a Free Software Foundationnak küldött levélben jelezze.\n"
+"\n"
+"Free Software Foundation, Inc.\n"
+"51 Franklin Street, Fifth Floor, \n"
+"Boston, MA 02110-1301, USA"
 
-#: src/qtaudio/qtaudio.cc:49
+#: src/qtaudio/qtaudio.cc:53
 msgid "QtMultimedia Output"
 msgstr "QtMultimedia Kimenet"
 
-#: src/qtaudio/qtaudio.cc:77
+#: src/qtaudio/qtaudio.cc:84
 msgid ""
 "QtMultimedia Audio Output Plugin for Audacious\n"
 "Copyright 2014 William Pitcock\n"
@@ -2602,51 +3074,115 @@
 "Based on SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
 msgstr ""
+"QtMultimedia Audio Kimeneti Bővítmény Audacioushoz\n"
+"Copyright 2014 William Pitcock\n"
+"\n"
+"Az SDL Kimeneti Bővítmény Audacioushoz alapján\n"
+"Copyright 2010 John Lindgren"
 
-#: src/qtui/dialog_windows.cc:31
-msgid "Working ..."
-msgstr "Dolgozom ..."
+#: src/qtglspectrum/gl-spectrum.cc:41
+msgid ""
+"OpenGL Spectrum Analyzer for Audacious\n"
+"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
+"Copyright 2014, 2020 Ariadne Conill\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 Színképelemző Audacioushoz\n"
+"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
+"Copyright 2014, 2020 Ariadne Conill\n"
+"\n"
+"Az XMMS bővítményen alapul:\n"
+"Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson, and "
+"4Front Technologies\n"
+"\n"
+"Licensz: GPLv2+"
 
-#: src/qtui/filter_input.cc:44 src/skins/ui_playlist.cc:221
-msgid "Search"
-msgstr "Keresés"
+#: src/qthotkey/gui.cc:177
+msgid "Press a key combination inside a text field."
+msgstr "Nyomjon egy billentyűkombinációt a szövegdobozban."
+
+#: src/qthotkey/plugin.cc:105
+msgid ""
+"Global Hotkey Plugin\n"
+"Control the player with global key combinations or multimedia keys.\n"
+"\n"
+"Copyright (C) 2020 i.Dark_Templar <darktemplar@dark-templar-archives.net>\n"
+"Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n"
+"\n"
+"Contributors 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 ""
+"Általános Gyorsbillentyűk Bővítmény\n"
+"A lejátszó irányítása általános billentyűkombinációkkal vagy multimédia "
+"billentyűkkel.\n"
+"\n"
+"Copyright (C) 2020 i.Dark_Templar <darktemplar@dark-templar-archives.net>\n"
+"Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n"
+"\n"
+"Hozzájárult többek között:\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/qtui/main_window_actions.cc:94
+#: src/qtui/menus.cc:109
 msgid "_Open Folder ..."
 msgstr "_Mappa megnyitása ..."
 
-#: src/qtui/main_window_actions.cc:96
+#: src/qtui/menus.cc:115
 msgid "_Add Folder ..."
 msgstr "M_appa hozzáadása ..."
 
-#: src/qtui/main_window_actions.cc:101
+#: src/qtui/menus.cc:128
 msgid "_Log Inspector ..."
 msgstr "_Napló ellenőr ..."
 
-#: src/qtui/main_window.cc:64
-msgid "Open Files"
-msgstr "Fájlok megnyitása"
+#: src/qtui/menus.cc:220
+msgid "_Find ..."
+msgstr "_Keresés…"
 
-#: src/qtui/main_window.cc:66
-msgid "Add Files"
-msgstr "Fájlok hozzáadása"
+#: src/qtui/menus.cc:256 src/skins/menus.cc:80 src/skins-qt/menus.cc:70
+msgid "Audio Settings ..."
+msgstr "Hangbeállítások ..."
 
-#: src/qtui/main_window.cc:71 src/skins/menus.cc:90
-msgid "Previous"
-msgstr "Előző"
+#: src/qtui/playlist_model.cc:188
+msgid "Q#"
+msgstr "S#"
 
-#: src/qtui/main_window.cc:77 src/skins/menus.cc:82
-msgid "Repeat"
-msgstr "Ismétlés"
+#: src/qtui/playlist_model.cc:190
+msgid "T#"
+msgstr "Sz#"
 
-#: src/qtui/main_window.cc:79 src/skins/menus.cc:83
-msgid "Shuffle"
-msgstr "Véletlenszerű"
+#: src/qtui/playlist_model.cc:192
+msgid "C#"
+msgstr "C#"
+
+#: src/qtui/playlist_model.cc:194
+msgid "D#"
+msgstr ""
 
-#: src/qtui/qtui.cc:42
+#: src/qtui/qtui.cc:40
 msgid "Qt Interface"
 msgstr "Qt felület"
 
+#: src/qtui/search_bar.cc:46
+msgid "Search playlist"
+msgstr "Lejátszólista keresése"
+
+#: src/qtui/settings.cc:79
+msgid "Use bold font for column headers"
+msgstr "Vastag betűk használata oszlop fejlécekhez"
+
 #: src/resample/resample.cc:43
 msgid "Sample Rate Converter"
 msgstr "Mintavételi konverter"
@@ -2661,7 +3197,7 @@
 
 #: src/resample/resample.cc:187
 msgid "Skip/repeat samples"
-msgstr ""
+msgstr "Minták ismétlése, átugrása"
 
 #: src/resample/resample.cc:188
 msgid "Linear interpolation"
@@ -2669,15 +3205,15 @@
 
 #: src/resample/resample.cc:189
 msgid "Fast sinc interpolation"
-msgstr ""
+msgstr "Gyors sinc interpoláció"
 
 #: src/resample/resample.cc:190
 msgid "Medium sinc interpolation"
-msgstr ""
+msgstr "Közepes sinc interpoláció"
 
 #: src/resample/resample.cc:191
 msgid "Best sinc interpolation"
-msgstr ""
+msgstr "Legjobb sinc interpoláció"
 
 #: src/resample/resample.cc:195
 msgid "Conversion"
@@ -2687,17 +3223,17 @@
 msgid "Method:"
 msgstr "Módszer: "
 
-#: src/resample/resample.cc:199 src/sox-resampler/sox-resampler.cc:161
+#: src/resample/resample.cc:199 src/soxr/sox-resampler.cc:203
 msgid "Rate:"
 msgstr "Ráta:"
 
 #: src/resample/resample.cc:202
 msgid "Rate Mappings"
-msgstr ""
+msgstr "Ráta leképezések"
 
 #: src/resample/resample.cc:203
 msgid "Use rate mappings"
-msgstr ""
+msgstr "Ráta leképezések használata"
 
 #: src/resample/resample.cc:205
 msgid "8 kHz:"
@@ -2739,141 +3275,119 @@
 msgid "192 kHz:"
 msgstr "192 kHz:"
 
-#: src/scrobbler2/config_window.cc:41
-#, c-format
-msgid "OK. Scrobbling for user: %s"
-msgstr ""
-
-#: src/scrobbler2/config_window.cc:54
-msgid "Permission Denied"
-msgstr "Hozzáférés megtagadva"
-
-#: src/scrobbler2/config_window.cc:56
-msgid "Access the following link to allow Audacious to scrobble your plays:"
-msgstr ""
+#: src/scrobbler2/config_window.cc:29
+msgid "Checking Last.fm access ..."
+msgstr "Last.fm elérés ellenőrzése ..."
 
-#: src/scrobbler2/config_window.cc:66
-msgid "Keep this window open and click 'Check Permission' again.\n"
-msgstr ""
-
-#: src/scrobbler2/config_window.cc:69 src/scrobbler2/config_window.cc:80
+#: src/scrobbler2/config_window.cc:35
 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."
+"Your scrobbles are being saved on your computer temporarily. They will be "
+"submitted as soon as Audacious is allowed access."
 msgstr ""
+"Ne aggódj. A scrobble-jeid a számítógépen vannak tárolva\n"
+"El lesznek küldve amint az Audacious engedélyt kap rá."
 
-#: src/scrobbler2/config_window.cc:77
-msgid "Network Problem."
-msgstr "Hálózati probléma."
+#: src/scrobbler2/config_window.cc:41
+#, c-format
+msgid "Permission granted. Scrobbling for user %s."
+msgstr "Hozzáférés megtagadva. Scrobbling felhasználó %s."
 
-#: src/scrobbler2/config_window.cc:78
-msgid "There was a problem contacting Last.fm. Please try again later."
+#: src/scrobbler2/config_window.cc:44
+msgid ""
+"Permission denied. Open the following URL in a browser, allow Audacious "
+"access to your account, and then click 'Check Permission' again:"
 msgstr ""
+"Hozzáférés nem engedélyezett. Nyisd meg a következő URL-t a böngészőben és "
+"add hozzá az Audacious hozzáférését a te beállításaidban és kattints újra az "
+"'Engedélyek Ellenőrzésére\":"
 
-#: src/scrobbler2/config_window.cc:110
-msgid "Checking..."
-msgstr "Ellenőrzés..."
+#: src/scrobbler2/config_window.cc:53
+msgid "There was a problem contacting Last.fm."
+msgstr "Hiba történt a Last.fm-hez való csatlakozás közben."
 
-#: src/scrobbler2/config_window.cc:176
-msgid "C_heck Permission"
-msgstr "_Jogosultságok ellenőrzése"
+#: src/scrobbler2/config_window.cc:92
+msgid "Check Permission"
+msgstr "Jogosultságok ellenőrzése"
 
-#: src/scrobbler2/config_window.cc:177
-msgid "_Revoke Permission"
-msgstr ""
+#: src/scrobbler2/config_window.cc:93
+msgid "Revoke Permission"
+msgstr "Jogosultság megvonása"
 
-#: src/scrobbler2/config_window.cc:220
-msgid ""
-"You need to allow Audacious to scrobble tracks to your Last.fm account.\n"
-msgstr ""
+#: src/scrobbler2/config_window.cc:97
+msgid "You need to allow Audacious to scrobble tracks to your Last.fm account."
+msgstr "Szükséges, hogy az Audacious hozzáférjen a te Last.fm fiókodhoz."
 
 #: src/scrobbler2/scrobbler.cc:29
 msgid "Scrobbler 2.0"
 msgstr "Scrobbler 2.0"
 
-#: src/scrobbler2/scrobbler.cc:224
+#: src/scrobbler2/scrobbler.cc:200
 msgid ""
 "The Scrobbler plugin could not be started.\n"
 "There might be a problem with your installation."
 msgstr ""
+"A Scrobbler Bővítmény nem indítató el.\n"
+"A telepítéssel lehet gond."
 
-#: src/scrobbler2/scrobbler.cc:289
+#: src/scrobbler2/scrobbler.cc:245
 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_communication.cc:642
-msgid ""
-"Audacious is now using an improved version of the Last.fm Scrobbler.\n"
-"Please check the Preferences for the Scrobbler plugin."
+"project."
 msgstr ""
 
-#: src/sdlout/sdlout.cc:48
+#: src/sdlout/sdlout.cc:43
 msgid "SDL Output"
 msgstr "SDL kimenet"
 
-#: src/sdlout/sdlout.cc:77
+#: src/sdlout/sdlout.cc:72
 msgid ""
 "SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
 msgstr ""
+"SDL Kimeneti Bővítmény az Audacious-hoz\n"
+"Copyright 2010 John Lindgren"
 
-#: src/search-tool/search-tool.cc:116 src/search-tool/search-tool.cc:124
+#: src/search-tool/library.cc:35 src/search-tool/library.cc:46
+#: src/search-tool-qt/library.cc:35 src/search-tool-qt/library.cc:46
 msgid "Library"
 msgstr "Gyűjtemény"
 
-#: src/search-tool/search-tool.cc:394
-#, c-format
-msgid "%d result"
-msgid_plural "%d results"
-msgstr0 "%d találat"
-msgstr1 "%d találat"
-
-#: src/search-tool/search-tool.cc:400
-#, c-format
-msgid "(%d hidden)"
-msgid_plural "(%d hidden)"
-msgstr0 "(%d rejtett)"
-msgstr1 "(%d rejtett)"
-
-#: src/search-tool/search-tool.cc:594
+#: src/search-tool-qt/search-model.cc:44 src/search-tool/search-tool.cc:287
 #, c-format
 msgid "%d song"
 msgid_plural "%d songs"
 msgstr0 "%d zeneszám"
 msgstr1 "%d zeneszám"
 
-#: src/search-tool/search-tool.cc:601
+#: src/search-tool-qt/search-model.cc:53 src/search-tool/search-tool.cc:294
 msgid "of this genre"
 msgstr "műfaj szerint"
 
-#: src/search-tool/search-tool.cc:607
+#: src/search-tool-qt/search-model.h:47 src/search-tool/search-model.h:45
 msgid "on"
 msgstr "be"
 
-#: src/search-tool/search-tool.cc:607
+#: src/search-tool-qt/search-model.h:47 src/search-tool/search-model.h:45
 msgid "by"
 msgstr "írta"
 
-#: src/search-tool/search-tool.cc:643
-msgid "_Create Playlist"
-msgstr "_Lejátszólista létrehozása"
-
-#: src/search-tool/search-tool.cc:645
-msgid "_Add to Playlist"
-msgstr "Lejátszólistához hozzá_ad"
-
-#: src/search-tool/search-tool.cc:684
-msgid "Search library"
-msgstr "Keresés a gyűjteményben"
+#: src/search-tool-qt/search-tool-qt.cc:165 src/search-tool/search-tool.cc:74
+msgid "Number of results to show:"
+msgstr "Megjelenítendő találatok:"
+
+#: src/search-tool-qt/search-tool-qt.cc:168 src/search-tool/search-tool.cc:77
+msgid "Rescan library at startup"
+msgstr "Gyűjtemény átvizsgálása indításkor"
+
+#: src/search-tool-qt/search-tool-qt.cc:170
+msgid "Monitor library for changes"
+msgstr "Gyűjtemény változásainak figyelése"
 
-#: src/search-tool/search-tool.cc:688
+#: src/search-tool-qt/search-tool-qt.cc:193 src/search-tool/search-tool.cc:450
 msgid ""
 "To import your music library into Audacious, choose a folder and then click "
 "the \"refresh\" icon."
@@ -2881,22 +3395,44 @@
 "Az Audacious zenekönyvtárába importáláshoz válaszd ki a mappát majd kattints "
 "a \"Frissítés\" ikonra."
 
-#: src/search-tool/search-tool.cc:696
+#: src/search-tool-qt/search-tool-qt.cc:195 src/search-tool/search-tool.cc:459
 msgid "Please wait ..."
 msgstr "Kérem várjon ..."
 
-#: src/search-tool/search-tool.cc:723
+#: src/search-tool-qt/search-tool-qt.cc:197 src/search-tool/search-tool.cc:487
 msgid "Choose Folder"
 msgstr "Mappa választás"
 
+#: src/search-tool-qt/search-tool-qt.cc:201 src/search-tool/search-tool.cc:445
+msgid "Search library"
+msgstr "Keresés a gyűjteményben"
+
+#: src/search-tool-qt/search-tool-qt.cc:327 src/search-tool/search-tool.cc:156
+#, c-format
+msgid "%d of %d result shown"
+msgid_plural "%d of %d results shown"
+msgstr0 "%d / %d találat megjelenítve"
+msgstr1 "%d / %d találat megjelenítve"
+
+#: src/search-tool-qt/search-tool-qt.cc:331 src/search-tool/search-tool.cc:160
+#, c-format
+msgid "%d result"
+msgid_plural "%d results"
+msgstr0 "%d találat"
+msgstr1 "%d találat"
+
+#: src/search-tool-qt/search-tool-qt.cc:501 src/search-tool/search-tool.cc:341
+msgid "_Create Playlist"
+msgstr "_Lejátszólista létrehozása"
+
+#: src/search-tool-qt/search-tool-qt.cc:503 src/search-tool/search-tool.cc:343
+msgid "_Add to Playlist"
+msgstr "Lejátszólistához hozzá_ad"
+
 #: src/sid/xmms-sid.cc:43
 msgid "SID Player"
 msgstr "SID lejátszó"
 
-#: src/sid/xs_config.cc:61
-msgid "Output"
-msgstr "Kimenet"
-
 #: src/sid/xs_config.cc:62
 msgid "Channels:"
 msgstr "Csatornák:"
@@ -2911,7 +3447,7 @@
 
 #: src/sid/xs_config.cc:71
 msgid "Do not automatically select chip model"
-msgstr ""
+msgstr "Ne válassza ki automatikusan a chip típusát"
 
 #: src/sid/xs_config.cc:73
 msgid "Emulate filter"
@@ -2943,15 +3479,15 @@
 
 #: src/sid/xs_config.cc:96
 msgid "Subtunes"
-msgstr ""
+msgstr "Alzenék"
 
 #: src/sid/xs_config.cc:97
 msgid "Enable subtunes"
-msgstr ""
+msgstr "Alzenék engedélyezése"
 
 #: src/sid/xs_config.cc:99
 msgid "Ignore subtunes shorter than:"
-msgstr ""
+msgstr "Hagyja ki az ennél rövidebb alzenéket:"
 
 #: src/sid/xs_config.cc:105
 msgid "Note"
@@ -2966,6 +3502,8 @@
 "Silence Removal Plugin for Audacious\n"
 "Copyright 2014 John Lindgren"
 msgstr ""
+"Csend eltávolitó Bővítmény az Audacioushoz\n"
+"Copyright 2014 John Lindgren"
 
 #: src/silence-removal/silence-removal.cc:67
 msgid "Silence Removal"
@@ -2973,739 +3511,686 @@
 
 #: src/silence-removal/silence-removal.cc:68
 msgid "Threshold:"
-msgstr ""
+msgstr "Küszöb:"
 
-#: src/silence-removal/silence-removal.cc:70
-msgid "dB"
-msgstr "dB"
+#: src/skins/actions.cc:45 src/skins-qt/actions.cc:43
+msgid "Repeat points cleared."
+msgstr "Ismétlési pontok törölve."
+
+#: src/skins/actions.cc:60 src/skins-qt/actions.cc:58
+msgid "Repeat point A set."
+msgstr "Az 'A' pont beállítva"
 
-#: src/skins/menus.cc:64
+#: src/skins/actions.cc:65 src/skins-qt/actions.cc:63
+msgid "Repeat point B set."
+msgstr "A 'B' pont beállítva"
+
+#: src/skins/equalizer.cc:223 src/skins-qt/equalizer.cc:223
+msgid "Preamp"
+msgstr "Preamp"
+
+#: src/skins/equalizer.cc:227 src/skins-qt/equalizer.cc:227
+msgid "31 Hz"
+msgstr "31 Hz"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "63 Hz"
+msgstr "63 Hz"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "125 Hz"
+msgstr "125 Hz"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "250 Hz"
+msgstr "250 Hz"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "500 Hz"
+msgstr "500 Hz"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "1 kHz"
+msgstr "1 kHz"
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "2 kHz"
+msgstr "2 kHz"
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "4 kHz"
+msgstr "4 kHz"
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "8 kHz"
+msgstr "8 kHz"
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "16 kHz"
+msgstr "16 kHz"
+
+#: src/skins/equalizer.cc:270 src/skins-qt/equalizer.cc:270
+msgid "Audacious Equalizer"
+msgstr "Audacious Equalizer"
+
+#: src/skins/main.cc:459 src/skins-qt/main.cc:442
+msgid "Recording on"
+msgstr "Rögzítés folyamatban"
+
+#: src/skins/main.cc:461 src/skins-qt/main.cc:444
+msgid "Recording off"
+msgstr "Rögzítés leállítva"
+
+#: src/skins/main.cc:754 src/skins-qt/main.cc:701
+#, c-format
+msgid "Seek to %d:%-2.2d / %d:%-2.2d"
+msgstr "Tekerés %d:%-2.2d / %d:%-2.2d"
+
+#: src/skins/main.cc:771 src/skins-qt/main.cc:718
+#, c-format
+msgid "Volume: %d%%"
+msgstr "Hangerő: %d%%"
+
+#: src/skins/main.cc:784 src/skins-qt/main.cc:731
+#, c-format
+msgid "Balance: %d%% left"
+msgstr "Balansz: %d%% bal"
+
+#: src/skins/main.cc:786 src/skins-qt/main.cc:733
+msgid "Balance: center"
+msgstr "Balansz: közép"
+
+#: src/skins/main.cc:788 src/skins-qt/main.cc:735
+#, c-format
+msgid "Balance: %d%% right"
+msgstr "Balansz: %d%% jobb"
+
+#: src/skins/main.cc:880 src/skins-qt/main.cc:827
+msgid "Options Menu"
+msgstr "Beállítások menü"
+
+#: src/skins/main.cc:884 src/skins-qt/main.cc:831
+msgid "Disable 'Always On Top'"
+msgstr "Tiltja a 'Mindig felül' opciót"
+
+#: src/skins/main.cc:886 src/skins-qt/main.cc:833
+msgid "Enable 'Always On Top'"
+msgstr "Engedélyezi a 'Mindig felül' opciót"
+
+#: src/skins/main.cc:889 src/skins-qt/main.cc:836
+msgid "File Info Box"
+msgstr "Fájl Információs doboz"
+
+#: src/skins/main.cc:892 src/skins/menus.cc:149 src/skins-qt/main.cc:839
+#: src/skins-qt/menus.cc:142
+msgid "Double Size"
+msgstr "Dupla méret"
+
+#: src/skins/main.cc:895 src/skins-qt/main.cc:842
+msgid "Visualizations"
+msgstr "Megjelenítés"
+
+#: src/skins/menus.cc:74 src/skins-qt/menus.cc:64
+msgid "Volume Up"
+msgstr "Hangerő növelése"
+
+#: src/skins/menus.cc:75 src/skins-qt/menus.cc:65
+msgid "Volume Down"
+msgstr "Hangerő csökkentése"
+
+#: src/skins/menus.cc:77 src/skins-qt/menus.cc:67
+msgid "Effects ..."
+msgstr "Hatások ..."
+
+#: src/skins/menus.cc:84 src/skins-qt/menus.cc:74
 msgid "Open Files ..."
 msgstr "Fájlok megnyitása ..."
 
-#: src/skins/menus.cc:65
+#: src/skins/menus.cc:85 src/skins-qt/menus.cc:76
 msgid "Open URL ..."
 msgstr "URL megnyitása ..."
 
-#: src/skins/menus.cc:66
-msgid "Search Library"
-msgstr "Keresés a gyűjteményben"
-
-#: src/skins/menus.cc:68
-msgid "Playback"
-msgstr "Lejátszás"
-
-#: src/skins/menus.cc:69
+#: src/skins/menus.cc:89 src/skins-qt/menus.cc:80
 msgid "Playlist"
 msgstr "Lejátszólista"
 
-#: src/skins/menus.cc:70
+#: src/skins/menus.cc:90 src/skins-qt/menus.cc:81
+msgid "Output"
+msgstr "Kimenet"
+
+#: src/skins/menus.cc:91 src/skins-qt/menus.cc:82
 msgid "View"
 msgstr "Nézet"
 
-#: src/skins/menus.cc:72 src/skins/menus.cc:136 src/skins/menus.cc:149
-#: src/skins/menus.cc:214
+#: src/skins/menus.cc:93 src/skins/menus.cc:161 src/skins/menus.cc:174
+#: src/skins/menus.cc:245 src/skins-qt/menus.cc:84 src/skins-qt/menus.cc:156
+#: src/skins-qt/menus.cc:170 src/skins-qt/menus.cc:241
 msgid "Services"
 msgstr "Szolgáltatások"
 
-#: src/skins/menus.cc:74
+#: src/skins/menus.cc:95 src/skins-qt/menus.cc:86
 msgid "About ..."
 msgstr "Névjegy ..."
 
-#: src/skins/menus.cc:75
+#: src/skins/menus.cc:96 src/skins-qt/menus.cc:87
 msgid "Settings ..."
 msgstr "Beállítások ..."
 
-#: src/skins/menus.cc:76
+#: src/skins/menus.cc:97 src/skins-qt/menus.cc:88
 msgid "Quit"
 msgstr "Kilépés"
 
-#: src/skins/menus.cc:80 src/skins/menus.cc:206
+#: src/skins/menus.cc:101 src/skins/menus.cc:235 src/skins-qt/menus.cc:92
+#: src/skins-qt/menus.cc:231
 msgid "Song Info ..."
 msgstr "Dal információ ..."
 
-#: src/skins/menus.cc:84
+#: src/skins/menus.cc:105 src/skins-qt/menus.cc:96
+msgid "Shuffle by Album"
+msgstr "Keverés Album szerint"
+
+#: src/skins/menus.cc:106 src/skins-qt/menus.cc:97
 msgid "No Playlist Advance"
 msgstr "Ne legyen léptetés a lejátszólistában"
 
-#: src/skins/menus.cc:85
-msgid "Stop After This Song"
-msgstr "Leállítás az aktuális dal után"
-
-#: src/skins/menus.cc:93
+#: src/skins/menus.cc:117 src/skins-qt/menus.cc:108
 msgid "Set A-B Repeat"
-msgstr ""
+msgstr "A-B Ismétlés beállítása"
 
-#: src/skins/menus.cc:94
+#: src/skins/menus.cc:118 src/skins-qt/menus.cc:109
 msgid "Clear A-B Repeat"
-msgstr ""
+msgstr "A-B ismétlés törlése"
 
-#: src/skins/menus.cc:96
+#: src/skins/menus.cc:120 src/skins-qt/menus.cc:111
 msgid "Jump to Song ..."
 msgstr "Ugrás a dalra ..."
 
-#: src/skins/menus.cc:97
+#: src/skins/menus.cc:121 src/skins-qt/menus.cc:113
 msgid "Jump to Time ..."
 msgstr "Ugrás időpontra ..."
 
-#: src/skins/menus.cc:101
+#: src/skins/menus.cc:125 src/skins-qt/menus.cc:118
 msgid "Play/Resume"
-msgstr ""
+msgstr "Lejátszás/Szünet"
 
-#: src/skins/menus.cc:103
+#: src/skins/menus.cc:127 src/skins-qt/menus.cc:120
 msgid "New Playlist"
 msgstr "Új lejátszólista"
 
-#: src/skins/menus.cc:104
+#: src/skins/menus.cc:128 src/skins-qt/menus.cc:121
 msgid "Rename Playlist ..."
 msgstr "Lejátszólista átnevezése ..."
 
-#: src/skins/menus.cc:105
+#: src/skins/menus.cc:129 src/skins-qt/menus.cc:122
 msgid "Remove Playlist"
 msgstr "Lejátszólista törlése"
 
-#: src/skins/menus.cc:107
+#: src/skins/menus.cc:131 src/skins-qt/menus.cc:124
 msgid "Previous Playlist"
 msgstr "Előző lejátszólista"
 
-#: src/skins/menus.cc:108
+#: src/skins/menus.cc:132 src/skins-qt/menus.cc:125
 msgid "Next Playlist"
 msgstr "Következő lejátszólista"
 
-#: src/skins/menus.cc:110
+#: src/skins/menus.cc:134 src/skins-qt/menus.cc:127
 msgid "Import Playlist ..."
 msgstr "Lejátszólista importálása"
 
-#: src/skins/menus.cc:111
+#: src/skins/menus.cc:135 src/skins-qt/menus.cc:128
 msgid "Export Playlist ..."
 msgstr "Lejátszólista exportálása"
 
-#: src/skins/menus.cc:113
+#: src/skins/menus.cc:137 src/skins-qt/menus.cc:130
 msgid "Playlist Manager ..."
 msgstr "Lejátszólista kezelő ..."
 
-#: src/skins/menus.cc:114
+#: src/skins/menus.cc:138 src/skins-qt/menus.cc:131
 msgid "Queue Manager ..."
 msgstr "Várakozási sor kezelő ..."
 
-#: src/skins/menus.cc:116
+#: src/skins/menus.cc:140 src/skins-qt/menus.cc:133
 msgid "Refresh Playlist"
 msgstr "Lejátszólista frissítése"
 
-#: src/skins/menus.cc:120
+#: src/skins/menus.cc:144 src/skins-qt/menus.cc:137
 msgid "Show Playlist Editor"
 msgstr "Lejátszólista szerkesztő mutatása"
 
-#: src/skins/menus.cc:121
+#: src/skins/menus.cc:145 src/skins-qt/menus.cc:138
 msgid "Show Equalizer"
 msgstr "Hangszínszabályzó mutatása"
 
-#: src/skins/menus.cc:123
+#: src/skins/menus.cc:147 src/skins-qt/menus.cc:140
 msgid "Show Remaining Time"
 msgstr "Hátralévő idő mutatása"
 
-#: src/skins/menus.cc:125
+#: src/skins/menus.cc:150 src/skins-qt/menus.cc:143
 msgid "Always on Top"
 msgstr "Mindig felül"
 
-#: src/skins/menus.cc:126
+#: src/skins/menus.cc:151 src/skins-qt/menus.cc:145
 msgid "On All Workspaces"
 msgstr "Minden munkaterületen"
 
-#: src/skins/menus.cc:128
+#: src/skins/menus.cc:153 src/skins-qt/menus.cc:148
 msgid "Roll Up Player"
 msgstr "Lejátszó felgördítése"
 
-#: src/skins/menus.cc:129
+#: src/skins/menus.cc:154 src/skins-qt/menus.cc:149
 msgid "Roll Up Playlist Editor"
 msgstr "Lejátszólista szerkesztő felgördítése"
 
-#: src/skins/menus.cc:130
+#: src/skins/menus.cc:155 src/skins-qt/menus.cc:150
 msgid "Roll Up Equalizer"
 msgstr "Hangszínszabályzó felgördítése"
 
-#: src/skins/menus.cc:132 src/skins/ui_main.cc:854
-msgid "Double Size"
-msgstr "Dupla méret"
-
-#: src/skins/menus.cc:138
+#: src/skins/menus.cc:163 src/skins-qt/menus.cc:158
 msgid "Add URL ..."
 msgstr "URL hozzáadása ..."
 
-#: src/skins/menus.cc:139
+#: src/skins/menus.cc:164 src/skins-qt/menus.cc:160
 msgid "Add Files ..."
 msgstr "Fájlok hozzáadása ..."
 
-#: src/skins/menus.cc:143 src/skins/menus.cc:171 src/skins/menus.cc:185
+#: src/skins/menus.cc:168 src/skins/menus.cc:196 src/skins/menus.cc:212
+#: src/skins-qt/menus.cc:164 src/skins-qt/menus.cc:192
+#: src/skins-qt/menus.cc:208
 msgid "By Title"
 msgstr "Cím szerint"
 
-#: src/skins/menus.cc:144 src/skins/menus.cc:178 src/skins/menus.cc:192
+#: src/skins/menus.cc:169 src/skins/menus.cc:203 src/skins/menus.cc:219
+#: src/skins-qt/menus.cc:165 src/skins-qt/menus.cc:199
+#: src/skins-qt/menus.cc:215
 msgid "By File Name"
 msgstr "Fájlnév szerint"
 
-#: src/skins/menus.cc:145 src/skins/menus.cc:179 src/skins/menus.cc:193
+#: src/skins/menus.cc:170 src/skins/menus.cc:204 src/skins/menus.cc:220
+#: src/skins-qt/menus.cc:166 src/skins-qt/menus.cc:200
+#: src/skins-qt/menus.cc:216
 msgid "By File Path"
 msgstr "Fájl útvonal szerint"
 
-#: src/skins/menus.cc:151
+#: src/skins/menus.cc:176 src/skins-qt/menus.cc:172
 msgid "Remove All"
 msgstr "Összes törlése"
 
-#: src/skins/menus.cc:152
+#: src/skins/menus.cc:177 src/skins-qt/menus.cc:173
 msgid "Clear Queue"
 msgstr "Várólista törlése"
 
-#: src/skins/menus.cc:154
+#: src/skins/menus.cc:179 src/skins-qt/menus.cc:175
 msgid "Remove Unavailable Files"
 msgstr "Elérhetetlen fájlok törlése"
 
-#: src/skins/menus.cc:155
+#: src/skins/menus.cc:180 src/skins-qt/menus.cc:176
 msgid "Remove Duplicates"
 msgstr "Kettőzöttek eltávolítása"
 
-#: src/skins/menus.cc:157
+#: src/skins/menus.cc:182 src/skins-qt/menus.cc:178
 msgid "Remove Unselected"
 msgstr "Nem kiválasztottak törlése"
 
-#: src/skins/menus.cc:158
+#: src/skins/menus.cc:183 src/skins-qt/menus.cc:179
 msgid "Remove Selected"
 msgstr "Kijelölt törlése"
 
-#: src/skins/menus.cc:162
+#: src/skins/menus.cc:187 src/skins-qt/menus.cc:183
 msgid "Search and Select"
 msgstr "Keresés és választ"
 
-#: src/skins/menus.cc:164
+#: src/skins/menus.cc:189 src/skins-qt/menus.cc:185
 msgid "Invert Selection"
 msgstr "Kijelölés megfordítása"
 
-#: src/skins/menus.cc:165
+#: src/skins/menus.cc:190 src/skins-qt/menus.cc:186
 msgid "Select None"
 msgstr "Nincs kijelölés"
 
-#: src/skins/menus.cc:166
+#: src/skins/menus.cc:191 src/skins-qt/menus.cc:187
 msgid "Select All"
 msgstr "Mindet kijelöl"
 
-#: src/skins/menus.cc:170 src/skins/menus.cc:184
+#: src/skins/menus.cc:195 src/skins/menus.cc:211 src/skins-qt/menus.cc:191
+#: src/skins-qt/menus.cc:207
 msgid "By Track Number"
 msgstr "A dal sorszáma szerint"
 
-#: src/skins/menus.cc:172 src/skins/menus.cc:186
+#: src/skins/menus.cc:197 src/skins/menus.cc:213 src/skins-qt/menus.cc:193
+#: src/skins-qt/menus.cc:209
 msgid "By Artist"
 msgstr "Előadó szerint"
 
-#: src/skins/menus.cc:173 src/skins/menus.cc:187
+#: src/skins/menus.cc:198 src/skins/menus.cc:214 src/skins-qt/menus.cc:194
+#: src/skins-qt/menus.cc:210
 msgid "By Album"
 msgstr "Album szerint"
 
-#: src/skins/menus.cc:174 src/skins/menus.cc:188
+#: src/skins/menus.cc:199 src/skins/menus.cc:215 src/skins-qt/menus.cc:195
+#: src/skins-qt/menus.cc:211
 msgid "By Album Artist"
 msgstr "Album előadó szerint"
 
-#: src/skins/menus.cc:175 src/skins/menus.cc:190
+#: src/skins/menus.cc:200 src/skins/menus.cc:216 src/skins-qt/menus.cc:196
+#: src/skins-qt/menus.cc:212
 msgid "By Release Date"
 msgstr "Kiadás dátuma szerint"
 
-#: src/skins/menus.cc:176 src/skins/menus.cc:189
+#: src/skins/menus.cc:201 src/skins/menus.cc:217 src/skins-qt/menus.cc:197
+#: src/skins-qt/menus.cc:213
 msgid "By Genre"
 msgstr "Műfaj szerint"
 
-#: src/skins/menus.cc:177 src/skins/menus.cc:191
+#: src/skins/menus.cc:202 src/skins/menus.cc:218 src/skins-qt/menus.cc:198
+#: src/skins-qt/menus.cc:214
 msgid "By Length"
 msgstr "Hossz szerint"
 
-#: src/skins/menus.cc:180 src/skins/menus.cc:194
+#: src/skins/menus.cc:205 src/skins/menus.cc:221 src/skins-qt/menus.cc:201
+#: src/skins-qt/menus.cc:217
 msgid "By Custom Title"
 msgstr "Egyéb cím szerint"
 
-#: src/skins/menus.cc:198
+#: src/skins/menus.cc:206 src/skins/menus.cc:222 src/skins-qt/menus.cc:202
+#: src/skins-qt/menus.cc:218
+msgid "By Comment"
+msgstr "Megjegyzés szerint"
+
+#: src/skins/menus.cc:207 src/skins/menus.cc:223 src/skins-qt/menus.cc:203
+#: src/skins-qt/menus.cc:219
+msgid "By Disc Number"
+msgstr "Lemez Szám Szerint"
+
+#: src/skins/menus.cc:227 src/skins-qt/menus.cc:223
 msgid "Randomize List"
 msgstr "Véletlenszerű lista"
 
-#: src/skins/menus.cc:199
+#: src/skins/menus.cc:228 src/skins-qt/menus.cc:224
 msgid "Reverse List"
 msgstr "Fordított lista"
 
-#: src/skins/menus.cc:201
+#: src/skins/menus.cc:230 src/skins-qt/menus.cc:226
 msgid "Sort Selected"
 msgstr "Kijelöltek rendezése"
 
-#: src/skins/menus.cc:202
+#: src/skins/menus.cc:231 src/skins-qt/menus.cc:227
 msgid "Sort List"
 msgstr "Lista rendezése"
 
-#: src/skins/menus.cc:208
+#: src/skins/menus.cc:236 src/skins-qt/menus.cc:232
+msgid "Open Containing Folder"
+msgstr "Tartalmazó mappa megnyitása"
+
+#: src/skins/menus.cc:238 src/skins-qt/menus.cc:234
 msgid "Cut"
 msgstr "Kivágás"
 
-#: src/skins/menus.cc:209
+#: src/skins/menus.cc:239 src/skins-qt/menus.cc:235
 msgid "Copy"
 msgstr "Másolás"
 
-#: src/skins/menus.cc:210
+#: src/skins/menus.cc:240 src/skins-qt/menus.cc:236
 msgid "Paste"
 msgstr "Beillesztés"
 
-#: src/skins/menus.cc:212
+#: src/skins/menus.cc:241 src/skins-qt/menus.cc:237
+msgid "Paste at End"
+msgstr "Beillesztés a végére"
+
+#: src/skins/menus.cc:243 src/skins-qt/menus.cc:239
 msgid "Queue/Unqueue"
 msgstr "Várólistára/Várólistáról ki"
 
-#: src/skins/menus.cc:218
-msgid "Load Preset ..."
-msgstr "Előre beállított betöltése"
-
-#: src/skins/menus.cc:219
-msgid "Load Auto Preset ..."
-msgstr ""
-
-#: src/skins/menus.cc:220
-msgid "Load Default"
-msgstr "Alapértelmezett betöltése"
-
-#: src/skins/menus.cc:221
-msgid "Load Preset File ..."
-msgstr ""
-
-#: src/skins/menus.cc:222
-msgid "Load EQF File ..."
-msgstr "EQF fájl betöltése ..."
-
-#: src/skins/menus.cc:224
-msgid "Save Preset ..."
-msgstr "Előre beállított mentése ..."
-
-#: src/skins/menus.cc:225
-msgid "Save Auto Preset ..."
-msgstr ""
-
-#: src/skins/menus.cc:226
-msgid "Save Default"
-msgstr "Alapértelmezettként ment"
-
-#: src/skins/menus.cc:227
-msgid "Save Preset File ..."
-msgstr ""
-
-#: src/skins/menus.cc:228
-msgid "Save EQF File ..."
-msgstr ""
-
-#: src/skins/menus.cc:230
-msgid "Delete Preset ..."
-msgstr ""
-
-#: src/skins/menus.cc:231
-msgid "Delete Auto Preset ..."
-msgstr ""
-
-#: src/skins/menus.cc:233
-msgid "Import Winamp Presets ..."
-msgstr ""
+#: src/skins/playlist-widget.cc:58 src/skins-qt/playlist-widget.cc:58
+#, c-format
+msgid "%s (%d of %d)"
+msgstr "%s (%d / %d)"
 
-#: src/skins/menus.cc:235
-msgid "Reset to Zero"
-msgstr "Minden érték nulla"
+#: src/skins/playlistwin.cc:491 src/skins-qt/playlistwin.cc:478
+msgid "Audacious Playlist Editor"
+msgstr "Audacious lejátszólista szerkesztő"
 
-#: src/skins/plugin.cc:48
+#: src/skins/plugin.cc:53 src/skins-qt/plugin.cc:65
 msgid "Winamp Classic Interface"
-msgstr ""
-
-#: src/skins/preset-browser.cc:57 src/skins/preset-list.cc:371
-#: src/skins/preset-list.cc:386
-msgid "Save"
-msgstr "Mentés"
+msgstr "Klasszikus Winamp Kinézet"
 
-#: src/skins/preset-browser.cc:57 src/skins/preset-list.cc:338
-#: src/skins/preset-list.cc:354
-msgid "Load"
-msgstr "Betöltés"
+#: src/skins-qt/menus.cc:75
+msgid "Open Folder ..."
+msgstr "Mappa megnyitása..."
 
-#: src/skins/preset-browser.cc:83
-msgid "Load Preset File"
-msgstr ""
-
-#: src/skins/preset-browser.cc:100
-msgid "Load EQF File"
-msgstr ""
+#: src/skins-qt/menus.cc:159
+msgid "Add Folder ..."
+msgstr "Mappa hozzáadása..."
 
-#: src/skins/preset-browser.cc:119
-msgid "Save Preset File"
-msgstr ""
+#: src/skins-qt/search-select.cc:62 src/skins/search-select.cc:77
+msgid "Search entries in active playlist"
+msgstr "Elemek keresése az aktív lejátszólistában"
 
-#: src/skins/preset-browser.cc:137
-msgid "Save EQF File"
+#: src/skins-qt/search-select.cc:70 src/skins/search-select.cc:83
+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álasszon ki bejegyzéseket egy vagy több mező kijelölésével. A mezők "
+"általános kifejezéseket használnak, a kis-nagybetűkre viszont nem érzékeny. "
+"Ha nem tudod, hogyan működnek a reguláris kifejezések, egyszerűen írj be egy "
+"részletet arról amit keresel."
 
-#: src/skins/preset-browser.cc:151
-msgid "Import Winamp Presets"
-msgstr ""
+#: src/skins-qt/search-select.cc:75 src/skins/search-select.cc:91
+msgid "Title:"
+msgstr "Cím:"
 
-#: src/skins/preset-list.cc:285
-msgid "Presets"
-msgstr "Profilok"
+#: src/skins-qt/search-select.cc:79 src/skins/search-select.cc:96
+msgid "Album:"
+msgstr "Album:"
 
-#: src/skins/preset-list.cc:335
-msgid "Load preset"
-msgstr "Előre beállított betöltése"
+#: src/skins-qt/search-select.cc:82 src/skins/search-select.cc:101
+msgid "Artist:"
+msgstr "Előadó:"
 
-#: src/skins/preset-list.cc:351
-msgid "Load auto-preset"
-msgstr ""
+#: src/skins-qt/search-select.cc:85 src/skins/search-select.cc:106
+msgid "File Name:"
+msgstr "Fájlnév:"
 
-#: src/skins/preset-list.cc:367
-msgid "Save preset"
-msgstr ""
+#: src/skins-qt/search-select.cc:88 src/skins/search-select.cc:134
+msgid "Clear previous selection before searching"
+msgstr "Az előző kiválasztások törlése keresés előtt"
 
-#: src/skins/preset-list.cc:382
-msgid "Save auto-preset"
-msgstr ""
+#: src/skins-qt/search-select.cc:89 src/skins/search-select.cc:137
+msgid "Automatically toggle queue for matching entries"
+msgstr "Automatikusan várólistára kerülnek a talált elemek"
 
-#: src/skins/preset-list.cc:408
-msgid "Delete preset"
-msgstr ""
+#: src/skins-qt/search-select.cc:90 src/skins/search-select.cc:140
+msgid "Create a new playlist with matching entries"
+msgstr "Hozzon létre új lejátszólistát az egyező elemekből"
 
-#: src/skins/preset-list.cc:424
-msgid "Delete auto-preset"
-msgstr ""
+#: src/skins-qt/search-select.cc:101 src/skins/search-select.cc:78
+msgid "Search"
+msgstr "Keresés"
 
-#: src/skins/skins_cfg.cc:176
+#: src/skins-qt/skins_cfg.cc:198 src/skins/skins_cfg.cc:182
 msgid "Player:"
 msgstr "Lejátszó:"
 
-#: src/skins/skins_cfg.cc:178
+#: src/skins-qt/skins_cfg.cc:200 src/skins/skins_cfg.cc:184
 msgid "Select main player window font:"
 msgstr "Főablak betűtípus kiválasztás:"
 
-#: src/skins/skins_cfg.cc:179
+#: src/skins-qt/skins_cfg.cc:201 src/skins/skins_cfg.cc:185
 msgid "Playlist:"
 msgstr "Lejátszólista:"
 
-#: src/skins/skins_cfg.cc:181
+#: src/skins-qt/skins_cfg.cc:203 src/skins/skins_cfg.cc:187
 msgid "Select playlist font:"
 msgstr "Válassza ki a lejátszólista betűkészletét:"
 
-#: src/skins/skins_cfg.cc:187
+#: src/skins-qt/skins_cfg.cc:207 src/skins/skins_cfg.cc:191
 msgid "Skin"
 msgstr "Felület"
 
-#: src/skins/skins_cfg.cc:189
+#: src/skins-qt/skins_cfg.cc:211 src/skins/skins_cfg.cc:193
+msgid "Display active titlebar when any window is focused"
+msgstr "Aktív címsor megjelenítése, ha bármelyik ablak fókuszban van"
+
+#: src/skins-qt/skins_cfg.cc:213 src/skins/skins_cfg.cc:195
 msgid "Fonts"
 msgstr "Betűtípusok"
 
-#: src/skins/skins_cfg.cc:192
+#: src/skins-qt/skins_cfg.cc:215 src/skins/skins_cfg.cc:197
 msgid "Use bitmap fonts (supports ASCII only)"
 msgstr "Bitmap fontok használata (csak ASCII támogatása)"
 
-#: src/skins/skins_cfg.cc:194
+#: src/skins-qt/skins_cfg.cc:217 src/skins/skins_cfg.cc:199
 msgid "Scroll song title"
-msgstr ""
+msgstr "Szám címének görgetése"
 
-#: src/skins/skins_cfg.cc:196
+#: src/skins-qt/skins_cfg.cc:219 src/skins/skins_cfg.cc:201
 msgid "Scroll song title in both directions"
 msgstr "A dal címe mindkét irányba mozog"
 
-#: src/skins/skins_cfg.cc:201
+#: src/skins-qt/skins_cfg.cc:224 src/skins/skins_cfg.cc:206
 msgid "Analyzer"
 msgstr "Analizátor"
 
-#: src/skins/skins_cfg.cc:202
+#: src/skins-qt/skins_cfg.cc:225 src/skins/skins_cfg.cc:207
 msgid "Scope"
 msgstr "Szkóp"
 
-#: src/skins/skins_cfg.cc:203
+#: src/skins-qt/skins_cfg.cc:226 src/skins/skins_cfg.cc:208
 msgid "Voiceprint / VU meter"
-msgstr ""
+msgstr "Spektrogram / Kivezérlésmérő"
 
-#: src/skins/skins_cfg.cc:204
+#: src/skins-qt/skins_cfg.cc:227 src/skins/skins_cfg.cc:209
 msgid "Off"
 msgstr "Kikapcsolva"
 
-#: src/skins/skins_cfg.cc:208 src/skins/skins_cfg.cc:233
-#: src/skins/skins_cfg.cc:239
+#: src/skins-qt/skins_cfg.cc:231 src/skins-qt/skins_cfg.cc:256
+#: src/skins-qt/skins_cfg.cc:262 src/skins/skins_cfg.cc:213
+#: src/skins/skins_cfg.cc:238 src/skins/skins_cfg.cc:244
 msgid "Normal"
 msgstr "Szokásos"
 
-#: src/skins/skins_cfg.cc:209 src/skins/skins_cfg.cc:234
+#: src/skins-qt/skins_cfg.cc:232 src/skins-qt/skins_cfg.cc:257
+#: src/skins/skins_cfg.cc:214 src/skins/skins_cfg.cc:239
 msgid "Fire"
 msgstr "Tűz"
 
-#: src/skins/skins_cfg.cc:210
+#: src/skins-qt/skins_cfg.cc:233 src/skins/skins_cfg.cc:215
 msgid "Vertical lines"
-msgstr ""
+msgstr "Függőleges vonalak"
 
-#: src/skins/skins_cfg.cc:214
+#: src/skins-qt/skins_cfg.cc:237 src/skins/skins_cfg.cc:219
 msgid "Lines"
 msgstr "Vonalak"
 
-#: src/skins/skins_cfg.cc:215
+#: src/skins-qt/skins_cfg.cc:238 src/skins/skins_cfg.cc:220
 msgid "Bars"
 msgstr "Csíkok"
 
-#: src/skins/skins_cfg.cc:219
+#: src/skins-qt/skins_cfg.cc:242 src/skins/skins_cfg.cc:224
 msgid "Slowest"
-msgstr "Lasabb"
+msgstr "Lassabb"
 
-#: src/skins/skins_cfg.cc:220
+#: src/skins-qt/skins_cfg.cc:243 src/skins/skins_cfg.cc:225
 msgid "Slow"
 msgstr "Lassú"
 
-#: src/skins/skins_cfg.cc:221 src/sox-resampler/sox-resampler.cc:152
+#: src/skins-qt/skins_cfg.cc:244 src/skins/skins_cfg.cc:226
+#: src/soxr/sox-resampler.cc:180
 msgid "Medium"
 msgstr "Közepes"
 
-#: src/skins/skins_cfg.cc:222
+#: src/skins-qt/skins_cfg.cc:245 src/skins/skins_cfg.cc:227
 msgid "Fast"
 msgstr "Gyors"
 
-#: src/skins/skins_cfg.cc:223
+#: src/skins-qt/skins_cfg.cc:246 src/skins/skins_cfg.cc:228
 msgid "Fastest"
 msgstr "Leggyorsabb"
 
-#: src/skins/skins_cfg.cc:227
+#: src/skins-qt/skins_cfg.cc:250 src/skins/skins_cfg.cc:232
 msgid "Dots"
 msgstr "Pontok"
 
-#: src/skins/skins_cfg.cc:228
+#: src/skins-qt/skins_cfg.cc:251 src/skins/skins_cfg.cc:233
 msgid "Line"
 msgstr "Vonal"
 
-#: src/skins/skins_cfg.cc:229
+#: src/skins-qt/skins_cfg.cc:252 src/skins/skins_cfg.cc:234
 msgid "Solid"
-msgstr "Szolid"
+msgstr "Tömör"
 
-#: src/skins/skins_cfg.cc:235
+#: src/skins-qt/skins_cfg.cc:258 src/skins/skins_cfg.cc:240
 msgid "Ice"
 msgstr "Jég"
 
-#: src/skins/skins_cfg.cc:240
+#: src/skins-qt/skins_cfg.cc:263 src/skins/skins_cfg.cc:245
 msgid "Smooth"
 msgstr "Sima"
 
-#: src/skins/skins_cfg.cc:244
-msgid "Type"
-msgstr "Típus"
-
-#: src/skins/skins_cfg.cc:245
-msgid "Visualization type:"
-msgstr "Megjelenítés típusa:"
-
-#: src/skins/skins_cfg.cc:248
-msgid "Analyzer"
-msgstr "Analizátor"
-
-#: src/skins/skins_cfg.cc:249
-msgid "Show peaks"
-msgstr "Csúcsok mutatása"
-
-#: src/skins/skins_cfg.cc:251
+#: src/skins-qt/skins_cfg.cc:267 src/skins/skins_cfg.cc:249
 msgid "Coloring:"
 msgstr "Színezés:"
 
-#: src/skins/skins_cfg.cc:254
+#: src/skins-qt/skins_cfg.cc:270 src/skins/skins_cfg.cc:252
 msgid "Style:"
 msgstr "Stílus:"
 
-#: src/skins/skins_cfg.cc:257
+#: src/skins-qt/skins_cfg.cc:273 src/skins/skins_cfg.cc:255
 msgid "Falloff:"
-msgstr ""
+msgstr "Esés:"
 
-#: src/skins/skins_cfg.cc:260
+#: src/skins-qt/skins_cfg.cc:276 src/skins/skins_cfg.cc:258
 msgid "Peak falloff:"
-msgstr ""
+msgstr "Csúcs esése:"
 
-#: src/skins/skins_cfg.cc:264
+#: src/skins-qt/skins_cfg.cc:282 src/skins/skins_cfg.cc:264
 msgid "Scope Style:"
 msgstr "Szkóp stílusa:"
 
-#: src/skins/skins_cfg.cc:267
+#: src/skins-qt/skins_cfg.cc:285 src/skins/skins_cfg.cc:267
 msgid "Voiceprint Coloring:"
-msgstr ""
+msgstr "Spektrogram"
 
-#: src/skins/skins_cfg.cc:270
+#: src/skins-qt/skins_cfg.cc:288 src/skins/skins_cfg.cc:270
 msgid "VU Meter Style:"
-msgstr ""
-
-#: src/skins/skins_cfg.cc:276
-msgid "General"
-msgstr "Általános"
-
-#: src/skins/skins_cfg.cc:277
-msgid "Visualization"
-msgstr "Megjelenítés"
-
-#: src/skins/ui_equalizer.cc:282
-msgid "Preamp"
-msgstr "Preamp"
-
-#: src/skins/ui_equalizer.cc:286
-msgid "31 Hz"
-msgstr "31 Hz"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "63 Hz"
-msgstr "63 Hz"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "125 Hz"
-msgstr "125 Hz"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "250 Hz"
-msgstr "250 Hz"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "500 Hz"
-msgstr "500 Hz"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "1 kHz"
-msgstr "1 kHz"
-
-#: src/skins/ui_equalizer.cc:288
-msgid "2 kHz"
-msgstr "2 kHz"
-
-#: src/skins/ui_equalizer.cc:288
-msgid "4 kHz"
-msgstr "4 kHz"
-
-#: src/skins/ui_equalizer.cc:288
-msgid "8 kHz"
-msgstr "8 kHz"
-
-#: src/skins/ui_equalizer.cc:288
-msgid "16 kHz"
-msgstr "16 kHz"
-
-#: src/skins/ui_equalizer.cc:330
-msgid "Audacious Equalizer"
-msgstr "Audacious Equalizer"
-
-#: src/skins/ui_main.cc:688
-#, c-format
-msgid "Seek to %d:%-2.2d / %d:%-2.2d"
-msgstr "Tekerés %d:%-2.2d / %d:%-2.2d"
-
-#: src/skins/ui_main.cc:709
-#, c-format
-msgid "Volume: %d%%"
-msgstr "Hangerő: %d%%"
-
-#: src/skins/ui_main.cc:732
-#, c-format
-msgid "Balance: %d%% left"
-msgstr "Balansz: %d%% bal"
+msgstr "Kivezérlésmérő stílusa:"
 
-#: src/skins/ui_main.cc:734
-msgid "Balance: center"
-msgstr "Balansz: közép"
-
-#: src/skins/ui_main.cc:736
-#, c-format
-msgid "Balance: %d%% right"
-msgstr "Balansz: %d%% jobb"
-
-#: src/skins/ui_main.cc:842
-msgid "Options Menu"
-msgstr "Beállítások menü"
+#: src/skins-qt/skins_cfg.cc:294 src/skins/skins_cfg.cc:276
+msgid "Type"
+msgstr "Típus"
 
-#: src/skins/ui_main.cc:846
-msgid "Disable 'Always On Top'"
-msgstr "Tiltja a 'Mindig felül' opciót"
+#: src/skins-qt/skins_cfg.cc:295 src/skins/skins_cfg.cc:277
+msgid "Visualization type:"
+msgstr "Megjelenítés típusa:"
 
-#: src/skins/ui_main.cc:848
-msgid "Enable 'Always On Top'"
-msgstr "Engedélyezi a 'Mindig felül' opciót"
+#: src/skins-qt/skins_cfg.cc:298 src/skins/skins_cfg.cc:280
+msgid "Analyzer"
+msgstr "Analizátor"
 
-#: src/skins/ui_main.cc:851
-msgid "File Info Box"
-msgstr "Fájl Információs doboz"
+#: src/skins-qt/skins_cfg.cc:299 src/skins/skins_cfg.cc:281
+msgid "Show peaks"
+msgstr "Csúcsok mutatása"
 
-#: src/skins/ui_main.cc:857
-msgid "Visualizations"
+#: src/skins-qt/skins_cfg.cc:308 src/skins/skins_cfg.cc:290
+msgid "Visualization"
 msgstr "Megjelenítés"
 
-#: src/skins/ui_main.cc:1336
-msgid "Repeat point A set."
-msgstr ""
-
-#: src/skins/ui_main.cc:1341
-msgid "Repeat point B set."
-msgstr ""
-
-#: src/skins/ui_main.cc:1350
-msgid "Repeat points cleared."
-msgstr ""
-
-#: src/skins/ui_playlist.cc:219
-msgid "Search entries in active playlist"
-msgstr "Elemek keresése az aktív lejátszólistában"
-
-#: src/skins/ui_playlist.cc:226
-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.cc:234
-msgid "Title:"
-msgstr "Cím:"
-
-#: src/skins/ui_playlist.cc:241
-msgid "Album:"
-msgstr "Album:"
-
-#: src/skins/ui_playlist.cc:248
-msgid "Artist:"
-msgstr "Előadó:"
-
-#: src/skins/ui_playlist.cc:255
-msgid "File Name:"
-msgstr "Fájlnév:"
-
-#: src/skins/ui_playlist.cc:263
-msgid "Clear previous selection before searching"
-msgstr "Az előző kiválasztások törlése keresés előtt"
-
-#: src/skins/ui_playlist.cc:266
-msgid "Automatically toggle queue for matching entries"
-msgstr "Automatikusan várólistára kerülnek a talált elemek"
-
-#: src/skins/ui_playlist.cc:269
-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.cc:717
-msgid "Audacious Playlist Editor"
-msgstr "Audacious lejátszólista szerkesztő"
-
-#: src/skins/ui_playlist.cc:752
-#, c-format
-msgid "%s (%d of %d)"
-msgstr "%s (%d / %d)"
-
-#: src/skins/ui_skinselector.cc:167
+#: src/skins-qt/skinselector.cc:98 src/skins/skinselector.cc:111
 msgid "Archived Winamp 2.x skin"
 msgstr "Régi Winamp 2.x bőr"
 
-#: src/skins/ui_skinselector.cc:172
+#: src/skins-qt/skinselector.cc:102 src/skins/skinselector.cc:115
 msgid "Unarchived Winamp 2.x skin"
 msgstr "Nem régi Winamp 2.x bőr"
 
-#: src/skins/util.cc:430
-#, c-format
-msgid "Could not create directory (%s): %s\n"
-msgstr "Nem lehet létrehozni a könyvtárat (%s): %s\n"
-
-#: src/sndfile/plugin.cc:39
+#: src/sndfile/plugin.cc:38
 msgid "Sndfile Plugin"
 msgstr "Sndfile bővítmény"
 
-#: src/sndfile/plugin.cc:336
+#: src/sndfile/plugin.cc:372
 msgid ""
 "Based on the xmms_sndfile plugin:\n"
 "Copyright (C) 2000, 2002 Erik de Castro Lopo\n"
@@ -3726,93 +4211,143 @@
 "this program; if not, write to the Free Software Foundation, Inc., 51 "
 "Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 msgstr ""
+"Az xmms_sndfile plugin alapán:\n"
+"Copyright (C) 2000, 2002 Erik de Castro Lopo\n"
+"\n"
+"Audacious-hoz illesztés Tony Vroon <chainsaw@gentoo.org> által\n"
+"\n"
+"Ez a program szabad szoftver; terjeszthető illetve módosítható a \n"
+"Free Software Foundation által kiadott GNU General Public License\n"
+"dokumentumában leírtak; akár a licenc 2-es, akár (tetszőleges) későbbi \n"
+"változata szerint.\n"
+"\n"
+"Ez a program abban a reményben kerül közreadásra, hogy hasznos lesz, \n"
+"de minden egyéb GARANCIA NÉLKÜL, az ELADHATÓSÁGRA vagy VALAMELY CÉLRA VALÓ "
+"ALKALMAZHATÓSÁGRA való származtatott garanciát is beleértve. \n"
+"További részleteket a GNU General Public License tartalmaz.\n"
+"\n"
+"A felhasználónak a programmal együtt meg kell kapnia a GNU General \n"
+"Public License egy példányát; ha mégsem kapta meg, akkor\n"
+"ezt a Free Software Foundationnak küldött levélben jelezze \n"
+" \n"
+"Free Software Foundation, Inc.\n"
+"51 Franklin Street, Fifth Floor\n"
+"Boston, MA 02110-1301, USA.\n"
+"\n"
+"http://www.gnu.org/licenses/\n"
+"http://gnu.hu/gpl.html"
 
-#: src/sndio-ng/sndio.cc:44
+#: src/sndio/sndio.cc:43
 msgid "Sndio Output"
 msgstr "Sndio kimenet"
 
-#: src/sndio-ng/sndio.cc:98
+#: src/sndio/sndio.cc:98
 msgid "Device (blank for default):"
-msgstr ""
+msgstr "Eszköz (alapértelmezetthez hagyd üresen)"
 
-#: src/sndio-ng/sndio.cc:100
+#: src/sndio/sndio.cc:100
 msgid "Save and restore volume:"
 msgstr "Menti és helyreállítja a hangerőt:"
 
-#: src/sndio-ng/sndio.cc:181
+#: src/sndio/sndio.cc:181
 #, c-format
 msgid "Sndio error: Unsupported audio format (%d)"
 msgstr "Sndio hiba: Ismeretlen audió formátum (%d)"
 
-#: src/sndio-ng/sndio.cc:192
+#: src/sndio/sndio.cc:192
 msgid "Sndio error: sio_open() failed"
 msgstr "Sndio hiba: sio_open() sikertelen"
 
-#: src/sndio-ng/sndio.cc:222
+#: src/sndio/sndio.cc:221
 msgid "Sndio error: sio_setpar() failed"
 msgstr "Sndio hiba: sio_setpart() sikertelen"
 
-#: src/sndio-ng/sndio.cc:234
+#: src/sndio/sndio.cc:233
 msgid "Sndio error: sio_start() failed"
 msgstr "Sndio hiba: sio_start() sikertelen"
 
-#: src/song_change/song_change.cc:33
+#: src/songchange/song_change.cc:30
 msgid "Song Change"
 msgstr "Szám váltás"
 
-#: src/song_change/song_change.cc:342
-msgid ""
-"Parameters passed to the shell should be encapsulated in "
-"quotes. Doing otherwise is a security risk."
-msgstr ""
-
-#: src/song_change/song_change.cc:358
+#: src/songchange/song_change.cc:256
 msgid "Commands"
 msgstr "Parancsok"
 
-#: src/song_change/song_change.cc:360
+#: src/songchange/song_change.cc:258
 msgid "Command to run when starting a new song:"
 msgstr "Parancs ami lefut az új zeneszám indításakor:"
 
-#: src/song_change/song_change.cc:364
+#: src/songchange/song_change.cc:261
+msgid "Command to run when stopping a song:"
+msgstr "Parancs futtatása egy dal leállításakor:"
+
+#: src/songchange/song_change.cc:264
 msgid "Command to run at the end of a song:"
 msgstr "Parancs ami lefut amikor vége a zeneszámnak:"
 
-#: src/song_change/song_change.cc:368
+#: src/songchange/song_change.cc:267
 msgid "Command to run at the end of the playlist:"
 msgstr "Parancs ami lefut ha a lejátszólistának vége:"
 
-#: src/song_change/song_change.cc:372
+#: src/songchange/song_change.cc:270
 msgid "Command to run when song title changes (for network streams):"
 msgstr "Parancs ami lefut a szám címének változásakor (hálózati folyamhoz):"
 
-#: src/song_change/song_change.cc:376
+#: src/songchange/song_change.cc:273
 msgid ""
-"You can use the following format strings which will be substituted before "
-"calling the command (not all are useful for the end-of-playlist command):\n"
-"\n"
-"%F: Frequency (in hertz)\n"
+"You can use the following format codes, which will be replaced before "
+"running the command.\n"
+"Not all are useful though for the song-stopped or end-of-playlist command."
+msgstr ""
+"A következő formátumkódokat használhatja, amelyek kicserélődnek a parancs "
+"futtatása előtt.\n"
+"Nem mindegyik hasznos a dal leállítása vagy a lejátszási lista végének "
+"parancsához."
+
+#: src/songchange/song_change.cc:276
+msgid ""
+"%a: Artist\n"
+"%b: Album\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"
+"%F: Frequency (Hertz)\n"
+"%l: Length (milliseconds)\n"
+"%n or %s: Formatted title (see playlist settings)\n"
 "%p: Currently playing (1 or 0)\n"
-"%a: Artist\n"
-"%b: Album\n"
-"%T: Track title"
-msgstr ""
-
-#: src/song-info-qt/song-info.cc:32
-msgid "Song Info (Qt)"
+"%r: Rate (bits per second)\n"
+"%t: Playlist position\n"
+"%T: Title (unformatted)"
 msgstr ""
+"%a: Előadó\n"
+"%b: Album\n"
+"%c: Csatornák száma\n"
+"%f: Fájlnév (teljes elérési út)\n"
+"%F: Frekvencia (Hertz)\n"
+"%l: Hossz (milliszekondum)\n"
+"%n vagy %s: Formázott cím (ahogy a lej.lista beállításainál van)\n"
+"%p: Lejátszás állapota (1 vagy 0)\n"
+"%r: Bitráta (bit/másodperc)\n"
+"%t: Lejátszási lista pozíciója\n"
+"%T: Cím (formázatlan)"
+
+#: src/songchange/song_change.cc:287
+msgid ""
+"Parameters passed to the shell should be enclosed in quotation marks.\n"
+"Unquoted parameters may lead to unexpected results."
+msgstr ""
+"A parancssoron átadott paramétereket idézőjelek közé kell tenni. Idézőjelek "
+"elhagyása a paraméterek körül váratlan eredményekhez vezethetnek."
+
+#: src/song-info-qt/song-info.cc:30
+msgid "Song Info"
+msgstr "Dal információ"
 
-#: src/sox-resampler/sox-resampler.cc:44
+#: src/soxr/sox-resampler.cc:44
 msgid "SoX Resampler"
-msgstr ""
+msgstr "SoX Újramintavételező"
 
-#: src/sox-resampler/sox-resampler.cc:144
+#: src/soxr/sox-resampler.cc:172
 msgid ""
 "SoX Resampler Plugin for Audacious\n"
 "Copyright 2013 Michał Lipski\n"
@@ -3820,89 +4355,149 @@
 "Based on Sample Rate Converter Plugin:\n"
 "Copyright 2010-2012 John Lindgren"
 msgstr ""
+"SoX újramintavételező bővítmény az Audacioushoz\n"
+"Copyright 2013 Michał Lipski\n"
+"\n"
+"Az újramintavételező bővítmény alapján:\n"
+"Copyright 2010-2012 John Lindgren"
 
-#: src/sox-resampler/sox-resampler.cc:150
+#: src/soxr/sox-resampler.cc:178
 msgid "Quick"
 msgstr "Gyors"
 
-#: src/sox-resampler/sox-resampler.cc:151
+#: src/soxr/sox-resampler.cc:179
 msgid "Low"
 msgstr "Alacsony"
 
-#: src/sox-resampler/sox-resampler.cc:153
+#: src/soxr/sox-resampler.cc:181
 msgid "High"
 msgstr "Magas"
 
-#: src/sox-resampler/sox-resampler.cc:154
+#: src/soxr/sox-resampler.cc:182
 msgid "Very High"
 msgstr "Nagyon magas"
 
-#: src/sox-resampler/sox-resampler.cc:158
+#: src/soxr/sox-resampler.cc:183
+msgid "Ultra High"
+msgstr "Nagyon magas"
+
+#: src/soxr/sox-resampler.cc:187
+msgid "Minimum"
+msgstr "Legalacsonyabb"
+
+#: src/soxr/sox-resampler.cc:188
+msgid "Intermediate"
+msgstr "Közepes"
+
+#: src/soxr/sox-resampler.cc:193
 msgid "Quality:"
 msgstr "Minőség:"
 
-#: src/speed-pitch/speed-pitch.cc:51
+#: src/soxr/sox-resampler.cc:196
+msgid "Phase:"
+msgstr "Fázis:"
+
+#: src/soxr/sox-resampler.cc:200
+msgid "Allow aliasing"
+msgstr "Alul-mintavételezés engedélyezése"
+
+#: src/soxr/sox-resampler.cc:202
+msgid "Use steep filter"
+msgstr "Meredek szűrő"
+
+#: src/speedpitch/speed-pitch.cc:54
 msgid "Speed and Pitch"
-msgstr ""
+msgstr "Sebesség és hangszín"
 
-#: src/speed-pitch/speed-pitch.cc:210
-msgid "Speed and Pitch"
-msgstr ""
+#: src/speedpitch/speed-pitch.cc:247
+msgid "Speed"
+msgstr "Sebesség"
 
-#: src/speed-pitch/speed-pitch.cc:211
-msgid "Speed:"
-msgstr "Sebesség:"
+#: src/speedpitch/speed-pitch.cc:248
+msgid "Decouple from pitch"
+msgstr "Leválasztás a hangszínről"
 
-#: src/speed-pitch/speed-pitch.cc:214
-msgid "Pitch:"
-msgstr "Hangmagasság:"
+#: src/speedpitch/speed-pitch.cc:250 src/speedpitch/speed-pitch.cc:258
+msgid "Multiplier:"
+msgstr "Szorzó:"
 
-#: src/statusicon/statusicon.cc:47
+#: src/speedpitch/speed-pitch.cc:254
+msgid "Pitch"
+msgstr "Hangszín"
+
+#: src/statusicon-qt/statusicon.cc:45 src/statusicon/statusicon.cc:47
 msgid "Status Icon"
 msgstr "Státusz ikon"
 
-#: src/statusicon/statusicon.cc:283
-msgid "Se_ttings ..."
-msgstr "Beállí_tások ...."
-
-#: src/statusicon/statusicon.cc:372
+#: src/statusicon-qt/statusicon.cc:68
 msgid ""
-"Status Icon Plugin\n"
+"Status Icon Plugin (partial port for Qt interface)\n"
 "\n"
 "Copyright 2005-2007 Giacomo Lozito <james@develia.org>\n"
 "Copyright 2010 Michał Lipski <tallica@o2.pl>\n"
+"Copyright 2015 Eugene Paskevich <eugene@raptor.kiev.ua>\n"
 "\n"
 "This plugin provides a status icon, placed in\n"
 "the system tray area of the window manager."
 msgstr ""
+"Állapotikon bővítmény (részleges port a Qt felülethez)\n"
+"\n"
+"Copyright 2005-2007 Giacomo Lozito <james@develia.org>\n"
+"Copyright 2010 Michał Lipski <tallica@o2.pl>\n"
+"Copyright 2015 Eugene Paskevich <eugene@raptor.kiev.ua>\n"
+"\n"
+"Ez a bővítmény egy ikont helyez el az ablakkezelő\n"
+"értesítési sávján."
 
-#: src/statusicon/statusicon.cc:379
+#: src/statusicon-qt/statusicon.cc:89 src/statusicon/statusicon.cc:384
 msgid "Mouse Scroll Action"
-msgstr ""
+msgstr "Egér görgetés hatása"
 
-#: src/statusicon/statusicon.cc:380
+#: src/statusicon-qt/statusicon.cc:90 src/statusicon/statusicon.cc:385
 msgid "Change volume"
 msgstr "Hangerő váltás"
 
-#: src/statusicon/statusicon.cc:383
+#: src/statusicon-qt/statusicon.cc:93 src/statusicon/statusicon.cc:388
 msgid "Change playing song"
 msgstr "Váltja a lejátszott dalt"
 
-#: src/statusicon/statusicon.cc:386
+#: src/statusicon-qt/statusicon.cc:96 src/statusicon/statusicon.cc:391
 msgid "Other Settings"
 msgstr "Egyéb beállítások"
 
-#: src/statusicon/statusicon.cc:387
+#: src/statusicon-qt/statusicon.cc:97 src/statusicon/statusicon.cc:392
 msgid "Disable the popup window"
 msgstr "Felugró ablakok tiltása"
 
-#: src/statusicon/statusicon.cc:389
+#: src/statusicon-qt/statusicon.cc:99 src/statusicon/statusicon.cc:394
 msgid "Close to the system tray"
 msgstr "Bezáráskor az értesítési területen marad (a tálcán)"
 
-#: src/statusicon/statusicon.cc:391
+#: src/statusicon-qt/statusicon.cc:101 src/statusicon/statusicon.cc:396
 msgid "Advance in playlist when scrolling upward"
+msgstr "Előrelép a lejátszási listában, amikor felfelé görget"
+
+#: src/statusicon-qt/statusicon.cc:116 src/statusicon/statusicon.cc:287
+msgid "Se_ttings ..."
+msgstr "Beállí_tások ...."
+
+#: src/statusicon/statusicon.cc:377
+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 ""
+"Állapotikon bővítmény\n"
+"\n"
+"Copyright 2005-2007 Giacomo Lozito <james@develia.org>\n"
+"Copyright 2010 Michał Lipski <tallica@o2.pl>\n"
+"\n"
+"Ez a bővítmény egy ikont helyez el az ablakkezelő\n"
+"értesítési sávján."
 
 #: src/stereo_plugin/stereo.cc:19
 msgid "Extra Stereo"
@@ -3914,28 +4509,168 @@
 "\n"
 "By Johan Levin, 1999"
 msgstr ""
-"Extra Sztereó bővítmény\n"
+"Extra sztereó bővítmény\n"
 "\n"
-"Írta: Johan Levin 1999."
+"Írta: Johan Levin, 1999."
 
 #: src/stereo_plugin/stereo.cc:44
 msgid "Extra Stereo"
-msgstr "Extra Sztereó"
+msgstr "Extra sztereó"
+
+#: src/streamtuner/icecast-model.cc:126 src/streamtuner/shoutcast-model.cc:131
+msgid "Type"
+msgstr "Típus"
+
+#: src/streamtuner/icecast-model.cc:132
+msgid "Current Song"
+msgstr "Jelenlegi Dal"
+
+#: src/streamtuner/icecast-model.cc:164
+msgid "Other"
+msgstr "Más"
+
+#: src/streamtuner/ihr-model.cc:63
+msgid "Market"
+msgstr "Forgalmazó"
+
+#: src/streamtuner/ihr-model.cc:156
+msgid "Call Letters"
+msgstr "Hívóbetűk"
+
+#: src/streamtuner/ihr-model.cc:162
+msgid "Description"
+msgstr "Leírás"
+
+#: src/streamtuner/shoutcast-model.cc:128
+msgid "Listeners"
+msgstr "Hallgatók"
+
+#: src/streamtuner/shoutcast-model.cc:188
+msgid "Top 500 Stations"
+msgstr "Az Első 500 Állomás"
+
+#: src/streamtuner/shoutcast-model.cc:189
+msgid "Alternative"
+msgstr "Alternatív"
+
+#: src/streamtuner/shoutcast-model.cc:190
+msgid "Blues"
+msgstr "Blues"
+
+#: src/streamtuner/shoutcast-model.cc:191
+msgid "Classical"
+msgstr "Klasszikus"
+
+#: src/streamtuner/shoutcast-model.cc:192
+msgid "Country"
+msgstr "Country"
+
+#: src/streamtuner/shoutcast-model.cc:193
+msgid "Decades"
+msgstr "Évtizedek"
+
+#: src/streamtuner/shoutcast-model.cc:194
+msgid "Easy Listening"
+msgstr "Easy listening"
+
+#: src/streamtuner/shoutcast-model.cc:195
+msgid "Electronic"
+msgstr "Elektronikus"
+
+#: src/streamtuner/shoutcast-model.cc:196
+msgid "Folk"
+msgstr "Folk"
+
+#: src/streamtuner/shoutcast-model.cc:197
+msgid "Inspirational"
+msgstr "Inspiráló"
+
+#: src/streamtuner/shoutcast-model.cc:198
+msgid "International"
+msgstr "Nemzetközi"
+
+#: src/streamtuner/shoutcast-model.cc:199
+msgid "Jazz"
+msgstr "Jazz"
+
+#: src/streamtuner/shoutcast-model.cc:200
+msgid "Latin"
+msgstr "Latin"
+
+#: src/streamtuner/shoutcast-model.cc:201
+msgid "Metal"
+msgstr "Metal"
+
+#: src/streamtuner/shoutcast-model.cc:203
+msgid "New Age"
+msgstr "New age"
+
+#: src/streamtuner/shoutcast-model.cc:204
+msgid "Pop"
+msgstr "Pop"
+
+#: src/streamtuner/shoutcast-model.cc:205
+msgid "Public Radio"
+msgstr "Közrádiók"
+
+#: src/streamtuner/shoutcast-model.cc:206
+msgid "R&B and Urban"
+msgstr "R&B és Urban"
+
+#: src/streamtuner/shoutcast-model.cc:207
+msgid "Rap"
+msgstr "Rap"
+
+#: src/streamtuner/shoutcast-model.cc:208
+msgid "Reggae"
+msgstr "Reggae"
+
+#: src/streamtuner/shoutcast-model.cc:209
+msgid "Rock"
+msgstr "Rock"
+
+#: src/streamtuner/shoutcast-model.cc:210
+msgid "Seasonal and Holiday"
+msgstr "Szezonális és Ünnepi"
+
+#: src/streamtuner/shoutcast-model.cc:211
+msgid "Soundtracks"
+msgstr "Filmzenék"
+
+#: src/streamtuner/shoutcast-model.cc:212
+msgid "Talk"
+msgstr "Beszéd"
+
+#: src/streamtuner/shoutcast-model.cc:213
+msgid "Themes"
+msgstr "Főcímdalok"
+
+#: src/streamtuner/streamtuner.cc:59
+msgid "Shoutcast"
+msgstr "Shoutcast"
+
+#: src/streamtuner/streamtuner.cc:60
+msgid "Icecast"
+msgstr "Icecast"
+
+#: src/streamtuner/streamtuner.cc:71
+msgid "Stream Tuner"
+msgstr "Folyamállító (Stream Tuner)"
 
 #: src/tonegen/tonegen.cc:45
 msgid "Tone Generator"
-msgstr ""
+msgstr "Hanggenerátor"
 
-#: src/tonegen/tonegen.cc:94
+#: src/tonegen/tonegen.cc:92
 #, c-format
 msgid "%s %.1f Hz"
 msgstr "%s %.1f Hz"
 
-#: src/tonegen/tonegen.cc:94
+#: src/tonegen/tonegen.cc:92
 msgid "Tone Generator: "
-msgstr "Hang generátor:"
+msgstr "Hanggenerátor:"
 
-#: src/tonegen/tonegen.cc:160
+#: src/tonegen/tonegen.cc:161
 msgid ""
 "Sine tone generator by Håvard Kvålen <havardk@xmms.org>\n"
 "Modified by Daniel J. Peng <danielpeng@bigfoot.com>\n"
@@ -3943,12 +4678,41 @@
 "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 ""
+"Szinuszjel-generátor, írta: Håvard Kvålen <havardk@xmms.org>\n"
+"Módosította: Daniel J. Peng <danielpeng@bigfoot.com>\n"
+"\n"
+"A használatához adjon hozzá egy URL-t: \n"
+"tone://frequency1;frequency2;frequency3;...\n"
+"tone://frekvencia1;frekvencia2;frekvencia3;...\n"
+"\n"
+"pl.: tone://2000;2005 -> 2000 Hz-es és 2005 Hz-es hangot modulál"
+
+#: src/ui-common/dialogs-qt.cc:40
+msgid ""
+"\n"
+"(Further messages have been hidden.)"
+msgstr ""
+"\n"
+"(További üzenetek vannak elrejtve.)"
+
+#: src/ui-common/dialogs-qt.cc:52
+msgid "Working ..."
+msgstr "Dolgozom…"
+
+#: src/ui-common/dialogs-qt.cc:73
+msgid "Information"
+msgstr "Információ"
+
+#: src/ui-common/menu-ops-gtk.cc:132 src/ui-common/menu-ops-qt.cc:113
+#, c-format
+msgid "%s does not appear to be a valid folder."
+msgstr "A(z) %s nem tűnik érvényes mappának."
 
 #: src/voice_removal/voice_removal.cc:28
 msgid "Voice Removal"
-msgstr ""
+msgstr "Ének eltávolítás"
 
-#: src/vorbis/vorbis.cc:465
+#: src/vorbis/vorbis.cc:433
 msgid ""
 "Audacious Ogg Vorbis Decoder\n"
 "\n"
@@ -3968,17 +4732,34 @@
 "Gian-Carlo Pascutto <gcp@sjeng.org>\n"
 "Eugene Zagidullin <e.asphyx@gmail.com>"
 msgstr ""
+"Audacious Ogg Vorbis dekódoló\n"
+"\n"
+"A Xiph.org Foundation Ogg Vorbis bővítménye alapján:\n"
+"http://www.xiph.org/\n"
+"\n"
+"Eredeti kód:\n"
+"Tony Arcieri <bascule@inferno.tusculum.edu>\n"
+"\n"
+"Közreműködők:\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.h:18
 msgid "Ogg Vorbis Decoder"
-msgstr ""
+msgstr "Ogg Vorbis dekódoló"
 
-#: src/vtx/info.cc:22
+#: src/vtx/info.cc:24
 #, c-format
 msgid "Details about %s"
-msgstr ""
+msgstr "%s részletei"
 
-#: src/vtx/info.cc:24
+#: src/vtx/info.cc:26
 msgid ""
 "Title: %t\n"
 "Author: %a\n"
@@ -3992,49 +4773,130 @@
 "Player Freq: %P\n"
 "Year: %y"
 msgstr ""
+"Cím: %t\n"
+"Előadó: %a\n"
+"Tőle: %f\n"
+"Követő: %T\n"
+"Megjegyzés: %C\n"
+"Chip típusa: %c\n"
+"Sztereó: %s\n"
+"Ismétlés: %l\n"
+"Chip frekv.: %F\n"
+"Lejátszó frekv.: %P\n"
+"Év: %y"
 
 #: src/vtx/vtx.cc:38
 msgid "VTX Decoder"
-msgstr ""
+msgstr "VTX dekódoló"
 
-#: src/vtx/vtx.cc:184
+#: src/vtx/vtx.cc:178
 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 lejátszó, írta: Sashnov Alexander <sashnov@ngs.ru>\n"
+"Az in_vtx.dll alapján, amit írt: Roman Sherbakov <v_soft@microfor.ru>\n"
+"Audacious bővítmény, írta: Pavel Vymetalek <pvymetalek@seznam.cz> által"
 
-#: src/wavpack/wavpack.cc:24
-msgid "WavPack Decoder"
+#: src/vumeter-qt/vumeter_qt.cc:31
+msgid ""
+"VU Meter Plugin for Audacious\n"
+"Copyright 2017-2019 Marc Sánchez Fauste"
 msgstr ""
+"Jelerősség mérő bővítmény Audacioushoz\n"
+"Copyright 2017-2019 Marc Sánchez Fauste"
 
-#: src/wavpack/wavpack.cc:211
-msgid "lossy (hybrid)"
+#: src/vumeter-qt/vumeter_qt.cc:35
+msgid "VU Meter Settings"
+msgstr "Jelerősség mérő beállításai"
+
+#: src/vumeter-qt/vumeter_qt.cc:37
+msgid "Peak hold time:"
+msgstr "Csúcs tartás ideje:"
+
+#: src/vumeter-qt/vumeter_qt.cc:42
+msgid "Fall-off time:"
+msgstr "Esés ideje:"
+
+#: src/vumeter-qt/vumeter_qt.cc:44
+msgid "dB/second"
+msgstr "dB/másodperc"
+
+#: src/vumeter-qt/vumeter_qt.cc:46
+msgid "Display legend"
+msgstr "Jelmagyarázat megjelenítése"
+
+#: src/vumeter-qt/vumeter_qt.h:37
+msgid "VU Meter"
+msgstr "Jelerősség Mérő"
+
+#: src/waveout/waveout.cc:43
+msgid "Win32 waveOut"
+msgstr "Win32 waveOut"
+
+#: src/waveout/waveout.cc:69
+msgid ""
+"Win32 waveOut Plugin for Audacious\n"
+"Copyright 2016 John Lindgren"
 msgstr ""
+"Win32 waveOut bővítmény az Audacioushoz\n"
+"Copyright 2016 John Lindgren"
+
+#: src/wavpack/wavpack.cc:25
+msgid "WavPack Decoder"
+msgstr "WavPack dekódoló"
+
+#: src/wavpack/wavpack.cc:217
+msgid "lossy (hybrid)"
+msgstr "veszteséges (hibrid)"
 
-#: src/wavpack/wavpack.cc:213
+#: src/wavpack/wavpack.cc:219
 msgid "lossy"
-msgstr ""
+msgstr "veszteséges"
 
-#: src/wavpack/wavpack.cc:255
+#: src/wavpack/wavpack.cc:259
 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"
+"A kód egy részét Miles Egan írta."
 
-#: src/xsf/plugin.cc:50
+#: src/xsf/plugin.cc:74
 msgid "2SF Decoder"
-msgstr ""
+msgstr "2SF dekódoló"
+
+#: src/xsf/plugin.cc:429
+msgid "32728 Hz"
+msgstr "32728 Hz"
 
-#: src/xsf/plugin.cc:238
+#: src/xsf/plugin.cc:432
+msgid "65456 Hz"
+msgstr "65456 Hz"
+
+#: src/xsf/plugin.cc:438
+msgid "Cosine"
+msgstr "Koszinusz"
+
+#: src/xsf/plugin.cc:439
+msgid "Sharp"
+msgstr "Éles"
+
+#: src/xsf/plugin.cc:443
 msgid "XSF Configuration"
-msgstr ""
+msgstr "XSF Konfiguráció"
 
-#: src/xsf/plugin.cc:239
-msgid "Ignore length from file"
-msgstr ""
+#: src/xsf/plugin.cc:445
+msgid "Default fade time:"
+msgstr "Alapértelmezett elhalkulási idő:"
 
-#: src/xspf/xspf.cc:89
+#: src/xsf/plugin.cc:447
+msgid "Interpolation mode:"
+msgstr "Interpolációs mód:"
+
+#: src/xspf/xspf.cc:95
 msgid "XML Shareable Playlists (XSPF)"
-msgstr ""
+msgstr "XML Shareable Playlists File (XSPF)"

audacious-plugins-3.6.2-gtk3.tar.bz2/po/id_ID.po -> audacious-plugins-4.4.1.tar.bz2/po/id_ID.po Changed

@@ -8,26 +8,31 @@
 # Ardjuna <Asyura.x@gmail.com>, 2013,2015
 # Ardjuna <Asyura.x@gmail.com>, 2012
 # abd azis ws <astrojim.blankon@gmail.com>, 2012
+# Bervianto Leo Pratama <bervianto.leo@gmail.com>, 2016
 # <bu0ncu3@yahoo.com>, 2012
 # Catur Susetyo <satyafree@gmail.com>, 2013
+# IMAM MUJAHIDIN <amangimam@hotmail.com>, 2018
 # <kokabiel9@gmail.com>, 2012
 # Liffindra Angga Zaaldian <findrakecil@gmail.com>, 2015
 # martadinata666 <martadinata666@gmail.com>, 2012
-# Hasan Al Banna, 2012-2013
+# Matt Johnson, 2021
+# se7entime <se7entime@disroot.org>, 2012-2013
 # <pri_yess@yahoo.com>, 2012
 # Rahman Yusri Aftian <aftian@yahoo.com>, 2012-2014
 # Rizki Aulia Rachman <rizkiaulia.r@gmail.com>, 2013
+# solo battle <jualb3900@gmail.com>, 2021
 # xunilresu <xunilresu@gmail.com>, 2012
 # <yudi.al@gmail.com>, 2012
 # <yustrizal24@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: 2015-04-03 11:52+0200\n"
-"PO-Revision-Date: 2015-03-05 11:08+0000\n"
-"Last-Translator: Ardjuna <Asyura.x@gmail.com>\n"
-"Language-Team: Indonesian (Indonesia) (http://www.transifex.com/projects/p/"
+"Report-Msgid-Bugs-To: https://github.com/audacious-media-player/audacious/"
+"issues\n"
+"POT-Creation-Date: 2024-09-26 21:54+0200\n"
+"PO-Revision-Date: 2011-10-10 17:43+0000\n"
+"Last-Translator: Matt Johnson, 2021\n"
+"Language-Team: Indonesian (Indonesia) (http://app.transifex.com/audacious/"
 "audacious/language/id_ID/)\n"
 "Language: id_ID\n"
 "MIME-Version: 1.0\n"
@@ -35,264 +40,62 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: src/aac-raw/aac.cc:18
+#: src/aac/aac.cc:19
 msgid "AAC (Raw) Decoder"
 msgstr "Dekoder AAC (orisinal)"
 
-#: src/adplug/adplug-xmms.cc:42
+#: src/adplug/adplug-xmms.cc:70
 msgid "AdPlug (AdLib Player)"
 msgstr "AdPlug (Pemutar AdLib)"
 
-#: src/adplug/adplug-xmms.cc:156 src/modplug/modplugbmp.cc:335
-#: src/psf/plugin.cc:138 src/vtx/vtx.cc:87 src/xsf/plugin.cc:113
+#: src/adplug/adplug-xmms.cc:167 src/modplug/modplugbmp.cc:321
+#: src/psf/plugin.cc:161 src/vtx/vtx.cc:89 src/xsf/plugin.cc:204
 msgid "sequenced"
 msgstr "telah diurutkan"
 
-#: src/alarm/alarm.cc:55 src/alarm/interface.cc:82
-msgid "Alarm"
-msgstr "Alarm"
-
-#: src/alarm/alarm.cc:782
-msgid "Set Alarm ..."
-msgstr "Setel Alarm..."
-
-#: src/alarm/alarm.cc:810
-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 ""
-"Sebuah plugin yang dapat digunakan untuk mulai bermain pada waktu tertentu\n"
-"\n"
-"Awalnya ditulis oleh Adam Feakin dan Daniel Stodden."
-
-#: src/alarm/interface.cc: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 ""
-"Waktu\n"
-" Alarm pada:\n"
-" Waktu saat alarm aktif.\n"
-"\n"
-" Diam saat:\n"
-" Hentikan alarm saat waktu ini tiba.\n"
-" (jika dialog pengingat tidak ditutup)\n"
-"\n"
-"\n"
-"Hari\n"
-" Hari aktif:\n"
-" Pilih hari saat alarm akan aktif.\n"
-"\n"
-" Waktu:\n"
-" Pilih waktu aktif alarm pada hari H,\n"
-" atau tekan tombol untuk menggunakan\n"
-" waktu standar.\n"
-"\n"
-"\n"
-"\n"
-
-#: src/alarm/interface.cc: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.cc: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.cc:81
-msgid "This is your wakeup call."
-msgstr "Ini adalah panggilan bangun Anda."
-
-#: src/alarm/interface.cc:99
-msgid "Your reminder for today is..."
-msgstr "Pengingat Anda untuk hari ini adalah..."
-
-#: src/alarm/interface.cc:101 src/alarm/interface.cc:386
-msgid "Reminder"
-msgstr "Pengingat"
-
-#: src/alarm/interface.cc:132
-msgid "Monday"
-msgstr "Senin"
-
-#: src/alarm/interface.cc:132
-msgid "Tuesday"
-msgstr "Selasa"
-
-#: src/alarm/interface.cc:132
-msgid "Wednesday"
-msgstr "Rabu"
-
-#: src/alarm/interface.cc:133
-msgid "Thursday"
-msgstr "Kamis"
-
-#: src/alarm/interface.cc:133
-msgid "Friday"
-msgstr "Jumat"
-
-#: src/alarm/interface.cc:133
-msgid "Saturday"
-msgstr "Sabtu"
-
-#: src/alarm/interface.cc:133
-msgid "Sunday"
-msgstr "Minggu"
-
-#: src/alarm/interface.cc:171 src/alarm/interface.cc:230
-#: src/alarm/interface.cc:245
-msgid "Time"
-msgstr "Waktu"
-
-#: src/alarm/interface.cc:178
-msgid "Alarm at (default):"
-msgstr "Bunyikan alarm pada (bawaan):"
-
-#: src/alarm/interface.cc:200
-msgid "h"
-msgstr "j"
-
-#: src/alarm/interface.cc:203
-msgid "Quiet after:"
-msgstr "Diam setelah:"
-
-#: src/alarm/interface.cc:215
-msgid "hours"
-msgstr "jam"
-
-#: src/alarm/interface.cc:226
-msgid "minutes"
-msgstr "menit"
-
-#: src/alarm/interface.cc:235
-msgid "Choose the days for the alarm to come on"
-msgstr "Pilih hari aktivasi alarm"
-
-#: src/alarm/interface.cc:242
-msgid "Day"
-msgstr "Hari"
+#: src/adplug/adplug-xmms.cc:349 src/sid/xs_config.cc:61
+msgid "Output"
+msgstr "Keluaran"
 
-#: src/alarm/interface.cc:259 src/bs2b/plugin.cc:130
-#: src/skins/preset-list.cc:434 src/skins/preset-list.cc:440
-msgid "Default"
-msgstr "Bawaan"
+#: src/adplug/adplug-xmms.cc:350
+msgid "OPL Emulator:"
+msgstr "Emulator OPL:"
+
+#: src/adplug/adplug-xmms.cc:353 src/amidiplug/i_configure.cc:153
+#: src/console/plugin.cc:45 src/filewriter/filewriter.cc:481
+#: src/sid/xs_config.cc:65 src/xsf/plugin.cc:446
+msgid "Sample rate:"
+msgstr "Kadar contoh:"
 
-#: src/alarm/interface.cc:288
-msgid "Days"
-msgstr "Hari"
-
-#: src/alarm/interface.cc:297
-msgid "Fading"
-msgstr "Memudar"
-
-#: src/alarm/interface.cc:305 src/console/plugin.cc:41
-#: src/crossfade/crossfade.cc:53 src/crossfade/crossfade.cc:59
-#: src/gtkui/settings.cc:49 src/lirc/lirc.cc:397 src/sid/xs_config.cc:85
-#: src/sid/xs_config.cc:94 src/sid/xs_config.cc:103
-msgid "seconds"
-msgstr "detik"
+#: src/adplug/adplug-xmms.cc:354 src/amidiplug/i_configure.cc:155
+#: src/bs2b/plugin.cc:141 src/console/plugin.cc:47
+#: src/modplug/plugin_main.cc:77 src/resample/resample.cc:201
+#: src/resample/resample.cc:207 src/resample/resample.cc:211
+#: src/resample/resample.cc:215 src/resample/resample.cc:219
+#: src/resample/resample.cc:223 src/resample/resample.cc:227
+#: src/resample/resample.cc:231 src/resample/resample.cc:235
+#: src/resample/resample.cc:239 src/resample/resample.cc:243
+#: src/sid/xs_config.cc:67 src/soxr/sox-resampler.cc:205
+msgid "Hz"
+msgstr "Hz"
 
-#: src/alarm/interface.cc:312 src/alarm/interface.cc:353
-msgid "Volume"
-msgstr "Volume"
+#: src/adplug/adplug-xmms.cc:355 src/gtkui/settings.cc:55
+#: src/modplug/plugin_main.cc:105 src/qtui/settings.cc:85
+#: src/skins-qt/skins_cfg.cc:302 src/skins/skins_cfg.cc:284
+msgid "Miscellaneous"
+msgstr "Miscellaneous"
 
-#: src/alarm/interface.cc:317
-msgid "Start at"
-msgstr "Dimulai dari"
-
-#: src/alarm/interface.cc:333
-msgid "Final"
-msgstr "Paripurna"
-
-#: src/alarm/interface.cc:346
-msgid "Current"
-msgstr "Sekarang"
-
-#: src/alarm/interface.cc:359
-msgid "Additional Command"
-msgstr "Perintah Tambahan"
-
-#: src/alarm/interface.cc:365 src/alarm/interface.cc:391
-msgid "enable"
-msgstr "gunakan"
-
-#: src/alarm/interface.cc:372
-msgid "Playlist (optional)"
-msgstr "Daftar lagu (pilihan)"
-
-#: src/alarm/interface.cc:379
-msgid "Select a playlist"
-msgstr "Pilih daftar lagu"
-
-#: src/alarm/interface.cc:399
-msgid "Options"
-msgstr "Pilihan"
-
-#: src/alarm/interface.cc:404
-msgid "What do these options mean?"
-msgstr "Apa yang dimaksud dengan opsi ini?"
-
-#: src/alarm/interface.cc:420
-msgid "Help"
-msgstr "Bantuan"
+#: src/adplug/adplug-xmms.cc:356
+msgid "Repeat song in endless loop"
+msgstr "Ulangi lagu terus menerus"
 
-#: src/albumart/albumart.cc:31
+#: src/albumart/albumart.cc:31 src/albumart-qt/albumart.cc:35
 msgid "Album Art"
 msgstr "Sampul Album"
 
-#: src/albumart-qt/albumart.cc:33
-msgid "Album Art (Qt)"
-msgstr "Gambar Album (Qt)"
-
-#: src/alsa/alsa.h:70
+#: src/alsa/alsa.h:64
 msgid "ALSA Output"
-msgstr "Keluaran ALSA"
+msgstr "Output ALSA"
 
 #: src/alsa/config.cc:28
 msgid ""
@@ -333,11 +136,11 @@
 msgid "Mixer element:"
 msgstr "Elemen mixer:"
 
-#: src/amidi-plug/amidi-plug.cc:41
+#: src/amidiplug/amidi-plug.cc:42
 msgid "AMIDI-Plug (MIDI Player)"
 msgstr "AMIDI-Plug (Pemutar MIDI)"
 
-#: src/amidi-plug/amidi-plug.cc:437
+#: src/amidiplug/amidi-plug.cc:445
 msgid ""
 "AMIDI-Plug\n"
 "modular MIDI music player\n"
@@ -359,158 +162,181 @@
 "Tony Vroon\n"
 "for the good help with alpha testing"
 msgstr ""
+"AMIDI-Plug\n"
+"pemutar musik MIDI modular\n"
+"http://www.develia.org/projects.php?p=amidiplug\n"
+"\n"
+" ditulis oleh Giacomo Lozito\n"
+"<james@develia.org>\n"
+"\n"
+"terima kasih khusus kepada...\n"
+"\n"
+"Clemens Ladisch dan Jaroslav Kysela\n"
+"untuk program keren mereka aplaymidi dan amixer; itu\n"
+"benar-benar berguna, bersama dengan dokumen alsa-lib, secara berurutan\n"
+"untuk mempelajari lebih lanjut tentang ALSA API\n"
+"\n"
+"Alfredo Spadafina\n"
+"untuk logo keyboard midi yang bagus\n"
+"\n"
+"Tony Vroon\n"
+"untuk bantuan yang baik dengan pengujian alfa "
 
-#: src/amidi-plug/i_configure.cc:94
+#: src/amidiplug/i_configure.cc:94
 msgid "Override default gain:"
 msgstr "Timpa peningkatan bawaan:"
 
-#: src/amidi-plug/i_configure.cc:102
+#: src/amidiplug/i_configure.cc:102
 msgid "Override default polyphony:"
 msgstr "Timpa polyphony bawaan:"
 
-#: src/amidi-plug/i_configure.cc:110
+#: src/amidiplug/i_configure.cc:110
 msgid "Override default reverb:"
 msgstr "Timpa gema bawaan:"
 
-#: src/amidi-plug/i_configure.cc:112 src/amidi-plug/i_configure.cc:120
+#: src/amidiplug/i_configure.cc:112 src/amidiplug/i_configure.cc:120
 msgid "On"
 msgstr "Nyala"
 
-#: src/amidi-plug/i_configure.cc:118
+#: src/amidiplug/i_configure.cc:118
 msgid "Override default chorus:"
 msgstr "Timpa paduan suara bawaan:"
 
-#: src/amidi-plug/i_configure.cc:128 src/console/plugin.cc:29
+#: src/amidiplug/i_configure.cc:128 src/console/plugin.cc:29
 msgid "Playback"
 msgstr "Putar lagu"
 
-#: src/amidi-plug/i_configure.cc:129
+#: src/amidiplug/i_configure.cc:129
 msgid "Transpose:"
-msgstr "Tukar tempat"
+msgstr "Meukar tempat:"
 
-#: src/amidi-plug/i_configure.cc:131
+#: src/amidiplug/i_configure.cc:131 src/speedpitch/speed-pitch.cc:257
 msgid "semitones"
 msgstr "nada setengah"
 
-#: src/amidi-plug/i_configure.cc:132
+#: src/amidiplug/i_configure.cc:132
 msgid "Drum shift:"
 msgstr "Perpindahan drum: "
 
-#: src/amidi-plug/i_configure.cc:134
+#: src/amidiplug/i_configure.cc:134
 msgid "note numbers"
-msgstr "angka not"
+msgstr "nomer catatan"
 
-#: src/amidi-plug/i_configure.cc:135
+#: src/amidiplug/i_configure.cc:135
 msgid "Skip leading silence"
 msgstr "Lompati hening di awal"
 
-#: src/amidi-plug/i_configure.cc:137
+#: src/amidiplug/i_configure.cc:137
 msgid "Skip trailing silence"
 msgstr "Lompati hening yang mengikuti"
 
-#: src/amidi-plug/i_configure.cc:141
+#: src/amidiplug/i_configure.cc:141
 msgid "SoundFont"
 msgstr "SoundFont"
 
-#: src/amidi-plug/i_configure.cc:143
+#: src/amidiplug/i_configure.cc:148
 msgid "Synthesizer"
 msgstr "Synthesizer"
 
-#: src/amidi-plug/i_configure.cc:148 src/console/plugin.cc:45
-#: src/sid/xs_config.cc:65
-msgid "Sample rate:"
-msgstr "Kadar contoh:"
-
-#: src/amidi-plug/i_configure.cc:150 src/bs2b/plugin.cc:141
-#: src/console/plugin.cc:47 src/modplug/plugin_main.cc:78
-#: src/resample/resample.cc:201 src/resample/resample.cc:207
-#: src/resample/resample.cc:211 src/resample/resample.cc:215
-#: src/resample/resample.cc:219 src/resample/resample.cc:223
-#: src/resample/resample.cc:227 src/resample/resample.cc:231
-#: src/resample/resample.cc:235 src/resample/resample.cc:239
-#: src/resample/resample.cc:243 src/sid/xs_config.cc:67
-#: src/sox-resampler/sox-resampler.cc:163
-msgid "Hz"
-msgstr "Hz"
-
-#: src/amidi-plug/i_configure-fluidsynth.cc:52
+#: src/amidiplug/i_configure-fluidsynth.cc:58
+#: src/amidiplug/i_configure-fluidsynth.cc:527
 msgid "AMIDI-Plug - select SoundFont file"
 msgstr "AMIDI-Plug - pilih berkas SoundFont"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:55 src/filewriter/mp3.cc:658
+#: src/amidiplug/i_configure-fluidsynth.cc:61
 msgid "_Cancel"
 msgstr "_Batal"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:56
+#: src/amidiplug/i_configure-fluidsynth.cc:62
 msgid "_Open"
 msgstr "Bu_ka"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:225 src/gtkui/columns.cc:46
+#: src/amidiplug/i_configure-fluidsynth.cc:233
+#: src/amidiplug/i_configure-fluidsynth.cc:461
 msgid "File name"
 msgstr "Nama berkas"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:229
+#: src/amidiplug/i_configure-fluidsynth.cc:237
+#: src/amidiplug/i_configure-fluidsynth.cc:464
 msgid "Size (bytes)"
 msgstr "Ukuran (bytes)"
 
-#: src/amidi-plug/i_fileinfo.cc:163
+#: src/amidiplug/i_fileinfo.cc:184
 msgid "Name:"
 msgstr "Nama:"
 
-#: src/amidi-plug/i_fileinfo.cc:181
+#: src/amidiplug/i_fileinfo.cc:202
 msgid " MIDI Info "
-msgstr " MIDI Info "
+msgstr " Info MIDI "
 
-#: src/amidi-plug/i_fileinfo.cc:195
+#: src/amidiplug/i_fileinfo.cc:216
 msgid "Format:"
 msgstr "Format:"
 
-#: src/amidi-plug/i_fileinfo.cc:198
+#: src/amidiplug/i_fileinfo.cc:219
 msgid "Length (msec):"
-msgstr "Panjang(milidetik)"
+msgstr "Panjang (milidetik)"
 
-#: src/amidi-plug/i_fileinfo.cc:201
+#: src/amidiplug/i_fileinfo.cc:222
 msgid "No. of Tracks:"
 msgstr "Jumlah trek:"
 
-#: src/amidi-plug/i_fileinfo.cc:207
+#: src/amidiplug/i_fileinfo.cc:228
 msgid "variable"
-msgstr "variable"
+msgstr "variabel"
 
-#: src/amidi-plug/i_fileinfo.cc:209
+#: src/amidiplug/i_fileinfo.cc:230
 msgid "BPM:"
 msgstr "BPM:"
 
-#: src/amidi-plug/i_fileinfo.cc:217
+#: src/amidiplug/i_fileinfo.cc:238
 msgid "BPM (wavg):"
 msgstr "BPM (wavg):"
 
-#: src/amidi-plug/i_fileinfo.cc:220
+#: src/amidiplug/i_fileinfo.cc:241
 msgid "Time Div:"
 msgstr "Waktu Div:"
 
-#: src/amidi-plug/i_fileinfo.cc:231
+#: src/amidiplug/i_fileinfo.cc:252
 msgid " MIDI Comments and Lyrics "
 msgstr " Info dan Lirik MIDI "
 
-#: src/amidi-plug/i_fileinfo.cc:278
+#: src/amidiplug/i_fileinfo.cc:299
 msgid "* no comments available in this MIDI file *"
 msgstr "* tidak ada komentar yang tersedia di berkas MIDI ini *"
 
-#: src/amidi-plug/i_fileinfo.cc:290
+#: src/amidiplug/i_fileinfo.cc:311
 msgid "* no lyrics available in this MIDI file *"
 msgstr "* tidak ada lirik yang tersedia di berkas MIDI ini *"
 
-#: src/amidi-plug/i_fileinfo.cc:300 src/filewriter/vorbis.cc:197
-#: src/ladspa/plugin.cc:416
+#: src/amidiplug/i_fileinfo.cc:321 src/ladspa/plugin.cc:418
+#: src/ui-common/dialogs-qt.cc:32
 msgid "_Close"
 msgstr "_Keluar"
 
-#: src/amidi-plug/i_fileinfo.cc:325
+#: src/amidiplug/i_fileinfo.cc:346
 msgid " (invalid UTF-8)"
 msgstr " (UTF-8 tidak cocok)"
 
-#: src/aosd/aosd.cc:32
+#: src/ampache/ampache.cc:33
+msgid "Ampache Browser"
+msgstr "Browser Ampache "
+
+#: src/ampache/ampache.cc:46
+msgid ""
+"Ampache Browser for Audacious\n"
+"http://ampache-browser.org/\n"
+"\n"
+"Copyright (C) Róbert Čerňanský and John Lindgren\n"
+"License: GNU GPLv3"
+msgstr ""
+"Ampache Browser untuk Audacious\n"
+"http://ampache-browser.org/\n"
+"\n"
+"Hak Cipta : Róbert Čerňanský dan John Lindgren\n"
+"Lisensi: GNU GPLv3"
+
+#: src/aosd/aosd.cc:31
 msgid ""
 "Audacious OSD\n"
 "http://www.develia.org/projects.php?p=audacious#aosd\n"
@@ -520,6 +346,13 @@
 "Based in part on Evan Martin's Ghosd library:\n"
 "http://neugierig.org/software/ghosd/"
 msgstr ""
+"Audacious OSD\n"
+"http://www.develia.org/projects.php?p=audacious#aosd\n"
+"\n"
+"Ditulis oleh Giacomo Lozito <james@develia.org>\n"
+"\n"
+"Sebagian didasarkan pada perpustakaan Ghosd Evan Martin:\n"
+"http://neugierig.org/software/ghosd/"
 
 #: src/aosd/aosd.h:37
 msgid "AOSD (On-Screen Display)"
@@ -537,130 +370,130 @@
 msgid "Concave Rectangle"
 msgstr "Persegi Bersudut Cekung"
 
-#: src/aosd/aosd_style.cc:69
+#: src/aosd/aosd_style.cc:69 src/openmpt/mptwrap.h:50 src/xsf/plugin.cc:436
 msgid "None"
 msgstr "Tidak ada"
 
-#: src/aosd/aosd_trigger.cc:50
+#: src/aosd/aosd_trigger.cc:49
 msgid "Playback Start"
 msgstr "Mulai putar kembali"
 
-#: src/aosd/aosd_trigger.cc:51
+#: src/aosd/aosd_trigger.cc:50
 msgid "Triggers OSD when a playlist entry is played."
 msgstr "Tampilkan OSD saat awalan lagu dimainkan."
 
-#: src/aosd/aosd_trigger.cc:56
+#: src/aosd/aosd_trigger.cc:55
 msgid "Title Change"
 msgstr "Ubah judul"
 
-#: src/aosd/aosd_trigger.cc:57
+#: src/aosd/aosd_trigger.cc:56
 msgid "Triggers OSD when the song title changes (for internet streams)."
-msgstr ""
+msgstr "Pemicu OSD ketika perubahan judul lagu (untuk stream internet)."
 
-#: src/aosd/aosd_trigger.cc:62
+#: src/aosd/aosd_trigger.cc:61
 msgid "Pause On"
-msgstr "Jedah hidup"
+msgstr "Jedah"
 
-#: src/aosd/aosd_trigger.cc:63
+#: src/aosd/aosd_trigger.cc:62
 msgid "Triggers OSD when playback is paused."
 msgstr "Tampilkan OSD saat lagu dihentikan."
 
-#: src/aosd/aosd_trigger.cc:68
+#: src/aosd/aosd_trigger.cc:67
 msgid "Pause Off"
 msgstr "Jedah mati"
 
-#: src/aosd/aosd_trigger.cc:69
+#: src/aosd/aosd_trigger.cc:68
 msgid "Triggers OSD when playback is unpaused."
 msgstr "Tampilkan OSD saat lagu diputar kembali."
 
-#: src/aosd/aosd_ui.cc:163
+#: src/aosd/aosd_ui.cc:204
 msgid "Placement"
 msgstr "Penempatan"
 
-#: src/aosd/aosd_ui.cc:196
+#: src/aosd/aosd_ui.cc:241
 msgid "Relative X offset:"
 msgstr "Mengimbangi X relatif:"
 
-#: src/aosd/aosd_ui.cc:203
+#: src/aosd/aosd_ui.cc:245
 msgid "Relative Y offset:"
 msgstr "Mengimbangi Y relatif:"
 
-#: src/aosd/aosd_ui.cc:210
+#: src/aosd/aosd_ui.cc:249
 msgid "Max OSD width:"
 msgstr "Lebar tampilan destop"
 
-#: src/aosd/aosd_ui.cc:221
+#: src/aosd/aosd_ui.cc:281
 msgid "Multi-Monitor options"
 msgstr "Opsi Multi Monitor"
 
-#: src/aosd/aosd_ui.cc:225
+#: src/aosd/aosd_ui.cc:285
 msgid "Display OSD using:"
 msgstr "Menggunakan tampilan destop"
 
-#: src/aosd/aosd_ui.cc:227
+#: src/aosd/aosd_ui.cc:287
 msgid "all monitors"
 msgstr "Semua monitor"
 
-#: src/aosd/aosd_ui.cc:230
+#: src/aosd/aosd_ui.cc:290
 #, c-format
 msgid "monitor %i"
 msgstr "monitor %i"
 
-#: src/aosd/aosd_ui.cc:282
+#: src/aosd/aosd_ui.cc:342
 msgid "Timing (ms)"
 msgstr "waktu (milidetik)"
 
-#: src/aosd/aosd_ui.cc:287
+#: src/aosd/aosd_ui.cc:347
 msgid "Display:"
 msgstr "Tampilan:"
 
-#: src/aosd/aosd_ui.cc:292
+#: src/aosd/aosd_ui.cc:352
 msgid "Fade in:"
 msgstr "Menghilang secara cepat:"
 
-#: src/aosd/aosd_ui.cc:297
+#: src/aosd/aosd_ui.cc:357
 msgid "Fade out:"
 msgstr "Menghilang secara perlahan:"
 
-#: src/aosd/aosd_ui.cc:361
+#: src/aosd/aosd_ui.cc:442
 msgid "Fonts"
 msgstr "Huruf"
 
-#: src/aosd/aosd_ui.cc:368
+#: src/aosd/aosd_ui.cc:449
 #, c-format
 msgid "Font %i:"
 msgstr "Huruf %i"
 
-#: src/aosd/aosd_ui.cc:382
+#: src/aosd/aosd_ui.cc:466
 msgid "Shadow"
 msgstr "Bayangan"
 
-#: src/aosd/aosd_ui.cc:486
+#: src/aosd/aosd_ui.cc:589
 msgid "Render Style"
 msgstr "Gaya Penggambaran"
 
-#: src/aosd/aosd_ui.cc:502
+#: src/aosd/aosd_ui.cc:605
 msgid "Colors"
 msgstr "Warna"
 
-#: src/aosd/aosd_ui.cc:513
+#: src/aosd/aosd_ui.cc:616
 #, c-format
 msgid "Color %i:"
 msgstr "Warna %i:"
 
-#: src/aosd/aosd_ui.cc:600
+#: src/aosd/aosd_ui.cc:714
 msgid "Enable trigger"
 msgstr "Aktifkan pemicu"
 
-#: src/aosd/aosd_ui.cc:627
+#: src/aosd/aosd_ui.cc:741
 msgid "Event"
 msgstr "Peristiwa"
 
-#: src/aosd/aosd_ui.cc:655
+#: src/aosd/aosd_ui.cc:768
 msgid "Composite manager detected"
 msgstr "Manajer komposisi terdeteksi"
 
-#: src/aosd/aosd_ui.cc:662
+#: src/aosd/aosd_ui.cc:775
 msgid ""
 "Composite manager not detected;\n"
 "unless you know that you have one running, please activate a composite "
@@ -670,60 +503,56 @@
 "kecuali kalau kamu tahu bahwa kamu punya satu yang berjalan, harap "
 "diaktifkan sebaliknya OSD tidak akan bekerja dengan baik"
 
-#: src/aosd/aosd_ui.cc:670
+#: src/aosd/aosd_ui.cc:783
 msgid "Composite manager not required for fake transparency"
 msgstr "Manajer komposisi tidak dibutuhkan untuk transparansi semu"
 
-#: src/aosd/aosd_ui.cc:706
+#: src/aosd/aosd_ui.cc:820
 msgid "Transparency"
 msgstr "Transparansi"
 
-#: src/aosd/aosd_ui.cc:712
+#: src/aosd/aosd_ui.cc:826
 msgid "Fake transparency"
 msgstr "Transparansi palsu"
 
-#: src/aosd/aosd_ui.cc:714
+#: src/aosd/aosd_ui.cc:828
 msgid "Real transparency (requires X Composite Ext.)"
 msgstr "Transparansi penuh (dibutuhkan Kompositor X)"
 
-#: src/aosd/aosd_ui.cc:756
+#: src/aosd/aosd_ui.cc:875
 msgid "Composite extension not loaded"
 msgstr "Ekstensi komposisi tidak digunakan"
 
-#: src/aosd/aosd_ui.cc:764
-msgid "Composite extension not available"
-msgstr "Ekstensi komposisi tidak tersedia"
-
-#: src/aosd/aosd_ui.cc:781
+#: src/aosd/aosd_ui.cc:892
 #, c-format
 msgid "Audacious OSD"
 msgstr "OSD Audacious"
 
-#: src/aosd/aosd_ui.cc:844
+#: src/aosd/aosd_ui.cc:955
 msgid "Position"
 msgstr "Posisi"
 
-#: src/aosd/aosd_ui.cc:849
+#: src/aosd/aosd_ui.cc:960
 msgid "Animation"
 msgstr "Animasi"
 
-#: src/aosd/aosd_ui.cc:854
+#: src/aosd/aosd_ui.cc:965
 msgid "Text"
 msgstr "teks"
 
-#: src/aosd/aosd_ui.cc:859
+#: src/aosd/aosd_ui.cc:970
 msgid "Decoration"
 msgstr "Dekorasi"
 
-#: src/aosd/aosd_ui.cc:864
+#: src/aosd/aosd_ui.cc:975
 msgid "Trigger"
 msgstr "Pemicu"
 
-#: src/aosd/aosd_ui.cc:869
+#: src/aosd/aosd_ui.cc:980 src/streamtuner/shoutcast-model.cc:202
 msgid "Misc"
 msgstr "Misc"
 
-#: src/aosd/aosd_ui.cc:878
+#: src/aosd/aosd_ui.cc:989
 msgid "Test"
 msgstr "Uji coba"
 
@@ -739,11 +568,83 @@
 msgid "Audacious Playlists (audpl)"
 msgstr "Daftar Putar Audacious (audpl)"
 
-#: src/blur_scope/blur_scope.cc:42
+#: src/background_music/background_music.cc:24
+msgid "Background music"
+msgstr ""
+
+#: src/background_music/background_music.cc:25
+msgid "Target level:"
+msgstr ""
+
+#: src/background_music/background_music.cc:28
+#: src/background_music/background_music.cc:33
+#: src/silence-removal/silence-removal.cc:70
+msgid "dB"
+msgstr "dB"
+
+#: src/background_music/background_music.cc:29
+msgid "Maximum amplification:"
+msgstr ""
+
+#: src/background_music/background_music.cc:34 src/mpg123/mpg123.cc:81
+msgid "Advanced"
+msgstr "Lanjutan"
+
+#: src/background_music/background_music.cc:36
+msgid "Slow detection weight:"
+msgstr ""
+
+#: src/background_music/background_music.cc:39
+msgid "Hint"
+msgstr ""
+
+#: src/background_music/background_music.cc:41
+msgid ""
+"Slow detection weight is the relative weight\n"
+"of a long term average detection when compared\n"
+"to the actual, faster loudness detection.\n"
+"A value of zero gives a more radio-like sound\n"
+"where soft passages get \"pulled up\" more quickly,\n"
+"a value of two makes the sound feel less compressed."
+msgstr ""
+
+#: src/background_music/background_music.cc:52
+msgid ""
+"Background Music Plugin for Audacious\n"
+"Copyright 2023;2024 Michel Fleur\n"
+"\n"
+"Controls the volume to make the sound equally loud within and between "
+"tracks.\n"
+" It uses accurate loudness measurement and tries to make the volume changes "
+"sound natural without audible peaks, yet without lowering the volume before "
+"a peak in advance."
+msgstr ""
+
+#: src/background_music/background_music.cc:61
+msgid "Background Music"
+msgstr ""
+
+#: src/bitcrusher/bitcrusher.cc:33
+msgid "Bitcrusher"
+msgstr ""
+
+#: src/bitcrusher/bitcrusher.cc:34
+msgid "Bit Depth:"
+msgstr ""
+
+#: src/bitcrusher/bitcrusher.cc:37
+msgid "Downsample ratio:"
+msgstr ""
+
+#: src/bitcrusher/bitcrusher.cc:48
+msgid "Bitcrusher"
+msgstr ""
+
+#: src/blur_scope/blur_scope.cc:40 src/blur_scope-qt/blur_scope.cc:45
 msgid "Color"
 msgstr "Warna"
 
-#: src/blur_scope/blur_scope.cc:58
+#: src/blur_scope/blur_scope.cc:56 src/blur_scope-qt/blur_scope.cc:158
 msgid "Blur Scope"
 msgstr "Blur Scope"
 
@@ -755,6 +656,10 @@
 msgid "Presets:"
 msgstr "Aturan baku:"
 
+#: src/bs2b/plugin.cc:130
+msgid "Default"
+msgstr "Bawaan"
+
 #: src/bs2b/plugin.cc:136
 msgid "Feed level:"
 msgstr "Tingkat suapan:"
@@ -767,15 +672,15 @@
 msgid "Cut frequency:"
 msgstr "Frekuensi potong:"
 
-#: src/cairo-spectrum/cairo-spectrum.cc:41
+#: src/cairo-spectrum/cairo-spectrum.cc:42 src/qt-spectrum/qt-spectrum.cc:107
 msgid "Spectrum Analyzer"
 msgstr "Penelaah spektrum"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:72
+#: src/cdaudio/cdaudio-ng.cc:74
 msgid "Audio CD Plugin"
 msgstr "Pengaya Audio CD"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:121
+#: src/cdaudio/cdaudio-ng.cc:121
 msgid ""
 "Copyright (C) 2007-2012 Calin Crisan <ccrisan@gmail.com> and others.\n"
 "\n"
@@ -797,136 +702,136 @@
 "\n"
 "Ini adalah sebuah proyek Google Summer of Code 2007."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:137
+#: src/cdaudio/cdaudio-ng.cc:140
 msgid "Device"
 msgstr "Perangkat"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:138
+#: src/cdaudio/cdaudio-ng.cc:141
 msgid "Read speed:"
 msgstr "Kecepatan membaca:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:141
+#: src/cdaudio/cdaudio-ng.cc:144
 msgid "Override device:"
 msgstr "Timpa perangkat:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:143
+#: src/cdaudio/cdaudio-ng.cc:146
 msgid "Metadata"
 msgstr "Metadata"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:144
+#: src/cdaudio/cdaudio-ng.cc:147
 msgid "Use CD-Text"
 msgstr "Gunakan CD-Teks"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:146
+#: src/cdaudio/cdaudio-ng.cc:150
 msgid "Use CDDB"
 msgstr "Gunakan CDDB"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:148
+#: src/cdaudio/cdaudio-ng.cc:152
 msgid "Use HTTP instead of CDDBP"
 msgstr "Gunakan HTTP daripada CDDBP"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:151
+#: src/cdaudio/cdaudio-ng.cc:155
 msgid "Server:"
 msgstr "Server:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:155
+#: src/cdaudio/cdaudio-ng.cc:159
 msgid "Path:"
 msgstr "Jalur:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:159
+#: src/cdaudio/cdaudio-ng.cc:163
 msgid "Port:"
 msgstr "Port:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:246
+#: src/cdaudio/cdaudio-ng.cc:228
 msgid "Failed to initialize cdio subsystem."
 msgstr "Gagal memulai subsistem cdio."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:281
+#: src/cdaudio/cdaudio-ng.cc:260
 #, c-format
 msgid "Invalid URI %s."
 msgstr "URI Tidak Valid %s."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:283
+#: src/cdaudio/cdaudio-ng.cc:262
 #, c-format
 msgid "Track %d not found."
 msgstr "Tidak menemukan trek %d."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:285
+#: src/cdaudio/cdaudio-ng.cc:264
 #, c-format
 msgid "Track %d is a data track."
 msgstr "Trek %d adalah sebuah trek data."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:360
+#: src/cdaudio/cdaudio-ng.cc:339
 msgid "Error reading audio CD."
 msgstr "Galat saat membaca audio CD."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:429
+#: src/cdaudio/cdaudio-ng.cc:410
 msgid "Audio CD"
 msgstr "Audio CD"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:460 src/cdaudio-ng/cdaudio-ng.cc:469
+#: src/cdaudio/cdaudio-ng.cc:446 src/cdaudio/cdaudio-ng.cc:455
 #, c-format
 msgid "Failed to open CD device %s."
 msgstr "Gagal membuka perangkat CD %s."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:472
+#: src/cdaudio/cdaudio-ng.cc:458
 msgid "No audio capable CD drive found."
-msgstr ""
+msgstr "Tidak ditemukan drive CD berkemampuan audio."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:497
+#: src/cdaudio/cdaudio-ng.cc:481
+msgid "Drive is empty."
+msgstr "Penggerak kosong."
+
+#: src/cdaudio/cdaudio-ng.cc:483
+msgid "Unsupported disk type."
+msgstr "Tipe diska tidak didukung."
+
+#: src/cdaudio/cdaudio-ng.cc:507
 msgid "Failed to finish initializing opened CD drive."
-msgstr ""
+msgstr "Gagal menyelesaikan inisialisasi drive CD yang dibuka."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:510
+#: src/cdaudio/cdaudio-ng.cc:520
 msgid "Failed to retrieve first/last track number."
-msgstr ""
+msgstr "Gagal mengambil nomor trek pertama / terakhir. "
 
-#: src/cdaudio-ng/cdaudio-ng.cc:531
+#: src/cdaudio/cdaudio-ng.cc:541
 #, c-format
 msgid "Cannot read start/end LSN for track %d."
-msgstr ""
+msgstr "Tidak dapat membaca LSN awal / akhir untuk trek 1%d."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:613
-msgid "Failed to create the cddb connection."
-msgstr ""
+#: src/cdaudio/cdaudio-ng.cc:624
+msgid "Failed to create the CDDB connection."
+msgstr "Gagal membuat koneksi CDDB."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:679
+#: src/cdaudio/cdaudio-ng.cc:690
 msgid "Failed to query the CDDB server"
-msgstr ""
+msgstr "Gagal membuat kueri ke server CDDB"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:681
+#: src/cdaudio/cdaudio-ng.cc:692
 #, c-format
 msgid "Failed to query the CDDB server: %s"
-msgstr ""
+msgstr "Gagal untuk query server CDDB:%s"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:705
+#: src/cdaudio/cdaudio-ng.cc:716
 #, c-format
-msgid "Failed to read the cddb info: %s"
-msgstr ""
-
-#: src/cdaudio-ng/cdaudio-ng.cc:765
-msgid "Drive is empty."
-msgstr "Penggerak kosong."
+msgid "Failed to read the CDDB info: %s"
+msgstr "Gagal membaca info CDDB: %s"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:767
-msgid "Unsupported disk type."
-msgstr "Tipe diska tidak didukung."
-
-#: src/cd-menu-items/cd-menu-items.cc:35
+#: src/cd-menu-items/cd-menu-items.cc:33
 msgid "Audio CD Menu Items"
-msgstr ""
+msgstr "Item Menu CD Audio "
 
-#: src/cd-menu-items/cd-menu-items.cc:47
-msgid "Play CD"
-msgstr "Putar CD"
-
-#: src/cd-menu-items/cd-menu-items.cc:47
-msgid "Add CD"
-msgstr "Tambah CD"
+#: src/cd-menu-items/cd-menu-items.cc:45
+msgid "Pla_y CD"
+msgstr "Putar CD "
+
+#: src/cd-menu-items/cd-menu-items.cc:45
+msgid "_Add CD"
+msgstr "_Tambahkan CD"
 
 #: src/compressor/compressor.cc:45
 msgid "Compression"
-msgstr ""
+msgstr "Compression"
 
 #: src/compressor/compressor.cc:46
 msgid "Center volume:"
@@ -941,10 +846,12 @@
 "Dynamic Range Compression Plugin for Audacious\n"
 "Copyright 2010-2014 John Lindgren"
 msgstr ""
+"Pengaya Dynamic Range Compression untuk Audacious\n"
+"Hak cipta 2010-2014 John Lindgren"
 
 #: src/compressor/compressor.cc:64
 msgid "Dynamic Range Compressor"
-msgstr ""
+msgstr "Dynamic Range Compressor"
 
 #: src/console/plugin.cc:15
 msgid ""
@@ -955,6 +862,12 @@
 "William Pitcock <nenolod@dereferenced.org>\n"
 "Shay Green <gblargg@gmail.com>"
 msgstr ""
+"Mesin dekoder musik konsol berdasarkan Game_Music_Emu 0.5.2\n"
+"Format didukung: AY, GBS, GYM, HES, KSS, NSF, NSFE, SAP, SPC, VGM, VGZ\n"
+"\n"
+"Pengaya Audacious oleh:\n"
+"William Pitcock <nenolod@dereferenced.org>\n"
+"Shay Green <gblargg@gmail.com>"
 
 #: src/console/plugin.cc:30
 msgid "Bass:"
@@ -966,15 +879,22 @@
 
 #: src/console/plugin.cc:36
 msgid "Echo:"
-msgstr ""
+msgstr "Echo:"
 
 #: src/console/plugin.cc:39
 msgid "Default song length:"
 msgstr "Panjang standar lagu:"
 
-#: src/console/plugin.cc:42 src/modplug/plugin_main.cc:59
+#: src/console/plugin.cc:41 src/crossfade/crossfade.cc:56
+#: src/crossfade/crossfade.cc:62 src/lirc/lirc.cc:395 src/notify/notify.cc:113
+#: src/sid/xs_config.cc:85 src/sid/xs_config.cc:94 src/sid/xs_config.cc:103
+#: src/vumeter-qt/vumeter_qt.cc:39
+msgid "seconds"
+msgstr "detik"
+
+#: src/console/plugin.cc:42 src/modplug/plugin_main.cc:58
 msgid "Resampling"
-msgstr ""
+msgstr "Resampling"
 
 #: src/console/plugin.cc:43
 msgid "Enable audio resampling"
@@ -996,140 +916,165 @@
 msgid "Game Console Music Decoder"
 msgstr "Dekoder Musik Konsol Game"
 
-#: src/coreaudio/coreaudio.cc:50
+#: src/coreaudio/coreaudio.cc:53
 msgid "CoreAudio output"
-msgstr ""
+msgstr "Keluaran CoreAudio"
 
-#: src/coreaudio/coreaudio.cc:131
+#: src/coreaudio/coreaudio.cc:155
 msgid ""
 "CoreAudio Output Plugin for Audacious\n"
 "Copyright 2014 William Pitcock\n"
+"Copyright 2017,18 René J.V. Bertin\n"
+" (original code and code adapted from\n"
+" Apple examples, (C) Apple 2013)\n"
 "\n"
 "Based on SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
 msgstr ""
+"CoreAudio Output Plugin untuk Audacious\n"
+"Hak Cipta 2014 William Pitcock\n"
+"Hak Cipta 2017,18 René J.V. Bertin\n"
+"(Kode asli dan kode yang diadaptasi dari\n"
+"Apple examples, (C) Apple 2013)\n"
+"\n"
+"Berdasarkan Plugin Output SDL untuk Audacious\n"
+"Hak Cipta 2010 John Lindgren"
 
-#: src/coreaudio/coreaudio.cc:143
+#: src/coreaudio/coreaudio.cc:171
 msgid "Use exclusive mode"
+msgstr "Gunakan mode eksklusif"
+
+#: src/coreaudio/coreaudio.cc:173
+msgid "Use bit perfect audio (adapt device sampling rate)"
 msgstr ""
+"Gunakan audio yang sedikit sempurna (sesuaikan laju pengambilan sampel "
+"perangkat)"
 
-#: src/crossfade/crossfade.cc:44
+#: src/crossfade/crossfade.cc:47
 msgid ""
 "Crossfade Plugin for Audacious\n"
 "Copyright 2010-2014 John Lindgren"
 msgstr ""
+"Pengaya Crossfade untuk Audacious\n"
+"Hak cipta 2010-2014 John Lindgren"
 
-#: src/crossfade/crossfade.cc:48
+#: src/crossfade/crossfade.cc:51
 msgid "Crossfade"
-msgstr ""
+msgstr "Crossfade"
 
-#: src/crossfade/crossfade.cc:49
+#: src/crossfade/crossfade.cc:52
 msgid "On automatic song change"
-msgstr ""
+msgstr "Perubahan lagu otomatis"
 
-#: src/crossfade/crossfade.cc:51 src/crossfade/crossfade.cc:57
+#: src/crossfade/crossfade.cc:54 src/crossfade/crossfade.cc:60
 msgid "Overlap:"
-msgstr ""
+msgstr "Overlap:"
 
-#: src/crossfade/crossfade.cc:55
+#: src/crossfade/crossfade.cc:58
 msgid "On seek or manual song change"
-msgstr ""
+msgstr "Saat mencari atau mengubah lagu manual"
 
-#: src/crossfade/crossfade.cc:61
-msgid "Tip"
+#: src/crossfade/crossfade.cc:64
+msgid "No fade in"
 msgstr ""
 
-#: src/crossfade/crossfade.cc:62
-msgid ""
-"For better crossfading, enable\n"
-"the Silence Removal effect."
+#: src/crossfade/crossfade.cc:66
+msgid "Use S-curve fade"
 msgstr ""
 
-#: src/crossfade/crossfade.cc:72
-msgid "Crossfade"
+#: src/crossfade/crossfade.cc:68
+msgid "S-curve steepness:"
 msgstr ""
 
-#: src/crossfade/crossfade.cc:161
-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."
+#: src/crossfade/crossfade.cc:70
+msgid "(higher is steeper)"
 msgstr ""
 
-#: src/crossfade/crossfade.cc:168
+#: src/crossfade/crossfade.cc:72
+msgid "Tip"
+msgstr "Tip"
+
+#: src/crossfade/crossfade.cc:73
 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."
+"For better crossfading, enable\n"
+"the Silence Removal effect."
 msgstr ""
+"Untuk crossfading yang lebih baik, aktifkan \n"
+"efek Penghapusan Diam. "
+
+#: src/crossfade/crossfade.cc:83
+msgid "Crossfade"
+msgstr "Crossfade"
 
 #: src/crystalizer/crystalizer.cc:31
 msgid "Crystalizer"
-msgstr ""
+msgstr "Crystalizer"
 
 #: src/crystalizer/crystalizer.cc:32 src/stereo_plugin/stereo.cc:45
 msgid "Intensity:"
-msgstr ""
+msgstr "Intensitas:"
 
 #: src/crystalizer/crystalizer.cc:43
 msgid "Crystalizer"
-msgstr ""
+msgstr "Crystalizer"
 
-#: src/cue/cue.cc:37
+#: src/cue/cue.cc:42
 msgid "Cue Sheet Plugin"
-msgstr ""
+msgstr "Cue Sheet Plugin"
 
-#: src/delete-files/delete-files.cc:46 src/delete-files/delete-files.cc:146
+#: src/delete-files/delete-files.cc:53 src/delete-files/delete-files.cc:215
+#: src/delete-files/delete-files.cc:230
 msgid "Delete Files"
 msgstr "Hapus Berkas"
 
-#: src/delete-files/delete-files.cc:75
+#: src/delete-files/delete-files.cc:120
+msgid "No files are selected."
+msgstr "Tidak ada berkas yang dipilih"
+
+#: src/delete-files/delete-files.cc:125
 #, c-format
-msgid "Error moving %s to trash: %s."
-msgstr ""
+msgid "Do you want to move %s to the trash?"
+msgstr "Anda ingin memindahkan %sberkas ke keranjang sampah?"
 
-#: src/delete-files/delete-files.cc:86
+#: src/delete-files/delete-files.cc:126
 #, c-format
-msgid "Error deleting %s: %s."
-msgstr ""
+msgid "Do you want to permanently delete %s?"
+msgstr "Anda ingin menghapus %sberkas secara permanen?"
 
-#: src/delete-files/delete-files.cc:117
+#: src/delete-files/delete-files.cc:133
 #, c-format
-msgid "Error deleting %s: not a local file."
-msgstr ""
+msgid "Do you want to move %d files to the trash?"
+msgstr "Anda ingin memindahkan %dberkas ke tempat sampah?"
 
 #: src/delete-files/delete-files.cc:134
-msgid "Do you want to move the selected files to the trash?"
-msgstr ""
+#, c-format
+msgid "Do you want to permanently delete %d files?"
+msgstr "Anda ingin menghapus %dberkas secara permanen?"
 
-#: src/delete-files/delete-files.cc:135
-msgid "Move to Trash"
-msgstr "Pindah ke Tong Sampah"
+#: src/delete-files/delete-files.cc:146
+msgid "Move to trash"
+msgstr "Pindahkan ke keranjang sampah"
 
-#: src/delete-files/delete-files.cc:140
-msgid "Do you want to permanently delete the selected files?"
-msgstr ""
-
-#: src/delete-files/delete-files.cc:141 src/skins/preset-list.cc:411
-#: src/skins/preset-list.cc:427
+#: src/delete-files/delete-files.cc:146
 msgid "Delete"
 msgstr "Hapus"
 
-#: src/delete-files/delete-files.cc:145 src/skins/preset-browser.cc:56
-#: src/skins/preset-list.cc:307 src/skins/ui_playlist.cc:221
+#: src/delete-files/delete-files.cc:213 src/delete-files/delete-files.cc:235
+#: src/skins-qt/search-select.cc:102 src/skins/search-select.cc:78
 msgid "Cancel"
 msgstr "Batal"
 
-#: src/delete-files/delete-files.cc:166
+#: src/delete-files/delete-files.cc:267
 msgid "Delete Selected Files"
 msgstr "Hapus Berkas Dipilih"
 
-#: src/delete-files/delete-files.cc:181
+#: src/delete-files/delete-files.cc:287
 msgid "Delete Method"
-msgstr ""
+msgstr "Metode Menghapus"
 
-#: src/delete-files/delete-files.cc:182
+#: src/delete-files/delete-files.cc:288
 msgid "Move to trash instead of deleting immediately"
-msgstr ""
+msgstr "Pindahkan ke sampah alih-alih segera menghapus"
 
 #: src/echo_plugin/echo.cc:9
 msgid ""
@@ -1138,26 +1083,30 @@
 "Surround echo by Carl van Schaik, 1999\n"
 "Updated for Audacious by William Pitcock and John Lindgren, 2010-2014"
 msgstr ""
+"Echo Plugin\n"
+"Oleh Johan Levin, 1999\n"
+"Surround echo oleh Carl van Schaik, 1999\n"
+"Diperbarui untuk Audacious oleh William Pitcock and John Lindgren, 2010-2014"
 
 #: src/echo_plugin/echo.cc:21
 msgid "Echo"
 msgstr "Echo"
 
-#: src/echo_plugin/echo.cc:22 src/modplug/plugin_main.cc:73
-#: src/modplug/plugin_main.cc:83
+#: src/echo_plugin/echo.cc:22 src/modplug/plugin_main.cc:72
+#: src/modplug/plugin_main.cc:82
 msgid "Delay:"
 msgstr "Penundaan"
 
-#: src/echo_plugin/echo.cc:24 src/modplug/plugin_main.cc:73
-#: src/modplug/plugin_main.cc:83
+#: src/echo_plugin/echo.cc:24 src/modplug/plugin_main.cc:72
+#: src/modplug/plugin_main.cc:82 src/xsf/plugin.cc:445
 msgid "ms"
 msgstr "ms"
 
 #: src/echo_plugin/echo.cc:25
 msgid "Feedback:"
-msgstr ""
+msgstr "Umpan balik:"
 
-#: src/echo_plugin/echo.cc:28 src/modplug/plugin_main.cc:87
+#: src/echo_plugin/echo.cc:28 src/modplug/plugin_main.cc:86
 msgid "Volume:"
 msgstr "Volume"
 
@@ -1165,11 +1114,11 @@
 msgid "Echo"
 msgstr "Echo"
 
-#: src/ffaudio/ffaudio-core.cc:41
+#: src/ffaudio/ffaudio-core.cc:50
 msgid "FFmpeg Plugin"
 msgstr "Pengaya FFmpeg"
 
-#: src/ffaudio/ffaudio-core.cc:571
+#: src/ffaudio/ffaudio-core.cc:649
 msgid ""
 "Multi-format audio decoding plugin for Audacious using\n"
 "FFmpeg multimedia framework (http://www.ffmpeg.org/)\n"
@@ -1178,262 +1127,360 @@
 "William Pitcock <nenolod@nenolod.net>\n"
 "Matti Hämäläinen <ccr@tnsp.org>"
 msgstr ""
+"Pengaya decoding audio multi-format untuk Audacious menggunakan\n"
+"kerangka kerja multimedia FFmpeg (http://www.ffmpeg.org/)\n"
+"\n"
+"Pengaya Audacious oleh:\n"
+"William Pitcock <nenolod@nenolod.net>\n"
+"Matti Hämäläinen <ccr@tnsp.org>"
 
-#: src/filewriter/filewriter.cc:45
+#: src/filewriter/filewriter.cc:48
 msgid "FileWriter Plugin"
+msgstr "Pengaya FileWriter"
+
+#: src/filewriter/filewriter.cc:316
+#, c-format
+msgid ""
+"Error opening %s:\n"
+"%s"
+msgstr ""
+"Gagal membuka %s:\n"
+"%s"
+
+#: src/filewriter/filewriter.cc:358
+msgid ""
+"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 ""
+"Program ini adalah perangkat lunak gratis; Anda dapat mendistribusikan ulang "
+"dan/atau memodifikasinya di bawah ketentuan Lisensi Publik Umum GNU yang "
+"diterbitkan oleh Free Software Foundation; baik versi 2 dari Lisensi, atau "
+"(sesuai pilihan Anda) versi yang lebih baru.\n"
+"\n"
+"Program ini disebarluaskan dengan harapan dapat bermanfaat, namun TANPA "
+"JAMINAN APAPUN; bahkan tanpa jaminan tersirat tentang KELAYAKAN "
+"DIPERDAGANGKAN atau KESESUAIAN UNTUK TUJUAN TERTENTU. Lihat Lisensi Publik "
+"Umum GNU untuk info lebih lanjut.\n"
+"\n"
+"Anda seharusnya telah menerima salinan GNU General Public License bersama "
+"dengan program ini; jika tidak, kirim surat ke Free Software Foundation, "
+"Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 
-#: src/filewriter/filewriter.cc:386
+#: src/filewriter/filewriter.cc:385
 msgid "Output file format:"
 msgstr "Format berkas keluaran:"
 
-#: src/filewriter/filewriter.cc:403
-msgid "Configure"
-msgstr "Konfigurasi"
-
-#: src/filewriter/filewriter.cc:413
+#: src/filewriter/filewriter.cc:389
 msgid "Save into original directory"
-msgstr "Simpan didalam original direktori"
-
-#: src/filewriter/filewriter.cc:417
-msgid "Save into custom directory"
-msgstr "Simpan dalam direktori tertentu"
-
-#: src/filewriter/filewriter.cc:427
-msgid "Output file folder:"
-msgstr "Direktori berkas keluaran:"
+msgstr "Simpan di dalam direktori asli"
 
-#: src/filewriter/filewriter.cc:431
-msgid "Pick a folder"
-msgstr "Ambil folder"
+#: src/filewriter/filewriter.cc:392
+msgid "Save into custom directory:"
+msgstr "Simpan ke direktori kustom: "
 
-#: src/filewriter/filewriter.cc:444
+#: src/filewriter/filewriter.cc:400
 msgid "Generate file name from:"
-msgstr ""
+msgstr "Buat nama file dari:"
+
+#: src/filewriter/filewriter.cc:401
+msgid "Original file name"
+msgstr "Nama file asli"
 
-#: src/filewriter/filewriter.cc:448
+#: src/filewriter/filewriter.cc:404
+msgid "Original file name (no suffix)"
+msgstr "Nama file asli (tanpa suffiks)"
+
+#: src/filewriter/filewriter.cc:407
 msgid "Original file tag"
+msgstr "Berkas tag asli"
+
+#: src/filewriter/filewriter.cc:411
+msgid "Prepend track number to file name"
+msgstr "Tambahkan nomor trek ke nama file"
+
+#: src/filewriter/filewriter.cc:417 src/filewriter/filewriter.cc:449
+msgid "Auto"
+msgstr "Otomatis"
+
+#: src/filewriter/filewriter.cc:418
+msgid "8000 Hz"
+msgstr "8000 Hz"
+
+#: src/filewriter/filewriter.cc:419
+msgid "11025 Hz"
+msgstr "11025 Hz"
+
+#: src/filewriter/filewriter.cc:420
+msgid "12000 Hz"
+msgstr "12000 Hz"
+
+#: src/filewriter/filewriter.cc:421
+msgid "16000 Hz"
+msgstr "16000 Hz"
+
+#: src/filewriter/filewriter.cc:422
+msgid "22050 Hz"
+msgstr "22050 Hz"
+
+#: src/filewriter/filewriter.cc:423
+msgid "24000 Hz"
+msgstr "24000 Hz"
+
+#: src/filewriter/filewriter.cc:424
+msgid "32000 Hz"
+msgstr "32000 Hz"
+
+#: src/filewriter/filewriter.cc:425 src/xsf/plugin.cc:430
+msgid "44100 Hz"
+msgstr "44100 Hz"
+
+#: src/filewriter/filewriter.cc:426 src/xsf/plugin.cc:431
+msgid "48000 Hz"
+msgstr "48000 Hz"
+
+#: src/filewriter/filewriter.cc:430
+msgid "8 kbit/s"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:453
-msgid "Original file name"
+#: src/filewriter/filewriter.cc:431
+msgid "16 kbit/s"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:459
-msgid "Include original file name extension"
+#: src/filewriter/filewriter.cc:432
+msgid "32 kbit/s"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:468
-msgid "Prepend track number to file name"
+#: src/filewriter/filewriter.cc:433
+msgid "40 kbit/s"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:484
-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."
+#: src/filewriter/filewriter.cc:434
+msgid "48 kbit/s"
 msgstr ""
 
-#: src/filewriter/mp3.cc:40 src/filewriter/mp3.cc:717
-msgid "Auto"
-msgstr "Otomatis"
+#: src/filewriter/filewriter.cc:435
+msgid "56 kbit/s"
+msgstr ""
 
-#: src/filewriter/mp3.cc:40
-msgid "Joint Stereo"
-msgstr "Gabung stereo"
+#: src/filewriter/filewriter.cc:436
+msgid "64 kbit/s"
+msgstr ""
 
-#: src/filewriter/mp3.cc:41 src/modplug/plugin_main.cc:58
-#: src/mpg123/mpg123.cc:248
-msgid "Stereo"
-msgstr "Stereo"
+#: src/filewriter/filewriter.cc:437
+msgid "80 kbit/s"
+msgstr ""
 
-#: src/filewriter/mp3.cc:41 src/modplug/plugin_main.cc:57
-#: src/mpg123/mpg123.cc:248
-msgid "Mono"
-msgstr "Mono"
+#: src/filewriter/filewriter.cc:438
+msgid "96 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:439
+msgid "112 kbit/s"
+msgstr ""
 
-#: src/filewriter/mp3.cc:657
-msgid "MP3 Configuration"
-msgstr "Konfigurasi MP3"
+#: src/filewriter/filewriter.cc:440
+msgid "128 kbit/s"
+msgstr ""
 
-#: src/filewriter/mp3.cc:658
-msgid "_OK"
-msgstr "_OK"
+#: src/filewriter/filewriter.cc:441
+msgid "160 kbit/s"
+msgstr ""
 
-#: src/filewriter/mp3.cc:681
-msgid "Algorithm Quality:"
-msgstr "Kualitas Algoritma"
+#: src/filewriter/filewriter.cc:442
+msgid "192 kbit/s"
+msgstr ""
 
-#: src/filewriter/mp3.cc:706
-msgid "Output Sample Rate:"
+#: src/filewriter/filewriter.cc:443
+msgid "224 kbit/s"
 msgstr ""
 
-#: src/filewriter/mp3.cc:733
-msgid "(Hz)"
-msgstr "(Hz)"
+#: src/filewriter/filewriter.cc:444
+msgid "256 kbit/s"
+msgstr ""
 
-#: src/filewriter/mp3.cc:740
-msgid "Bitrate / Compression Ratio:"
+#: src/filewriter/filewriter.cc:445
+msgid "320 kbit/s"
 msgstr ""
 
-#: src/filewriter/mp3.cc:764
-msgid "Bitrate (kbps):"
-msgstr "Bitrate (kbps):"
+#: src/filewriter/filewriter.cc:450
+msgid "Joint Stereo"
+msgstr "Gabung stereo"
+
+#: src/filewriter/filewriter.cc:451 src/modplug/plugin_main.cc:57
+#: src/mpg123/mpg123.cc:259
+msgid "Stereo"
+msgstr "Stereo"
 
-#: src/filewriter/mp3.cc:796
+#: src/filewriter/filewriter.cc:452 src/modplug/plugin_main.cc:56
+#: src/mpg123/mpg123.cc:260
+msgid "Mono"
+msgstr "Mono"
+
+#: src/filewriter/filewriter.cc:456
+msgid "VBR"
+msgstr "VBR"
+
+#: src/filewriter/filewriter.cc:457
+msgid "ABR"
+msgstr "ABR"
+
+#: src/filewriter/filewriter.cc:478
+msgid "Algorithm quality:"
+msgstr "Kualitas algoritma: "
+
+#: src/filewriter/filewriter.cc:484
+msgid "Bitrate:"
+msgstr "Bitrate:"
+
+#: src/filewriter/filewriter.cc:491
 msgid "Compression ratio:"
 msgstr "Rasio kompresi:"
 
-#: src/filewriter/mp3.cc:820
-msgid "Audio Mode:"
-msgstr "Mode Otomatis:"
+#: src/filewriter/filewriter.cc:498
+msgid "Audio mode:"
+msgstr "Mode suara:"
 
-#: src/filewriter/mp3.cc:845
-msgid "Miscellaneous:"
-msgstr ""
-
-#: src/filewriter/mp3.cc:856
+#: src/filewriter/filewriter.cc:501
 msgid "Enforce strict ISO compliance"
-msgstr ""
+msgstr "Terapkan penyesuaian ISO yang ketat "
 
-#: src/filewriter/mp3.cc:867
+#: src/filewriter/filewriter.cc:503
 msgid "Error protection"
 msgstr "Pengaman kesalahan"
 
-#: src/filewriter/mp3.cc:879 src/filewriter/vorbis.cc:206
-msgid "Quality"
-msgstr "Kualitas"
-
-#: src/filewriter/mp3.cc:888
+#: src/filewriter/filewriter.cc:508
 msgid "Enable VBR/ABR"
 msgstr "Aktifkan VBR/ABR"
 
-#: src/filewriter/mp3.cc:898
+#: src/filewriter/filewriter.cc:510
 msgid "Type:"
 msgstr "Tipe:"
 
-#: src/filewriter/mp3.cc:931
-msgid "VBR Options:"
-msgstr "Opsi VBR"
-
-#: src/filewriter/mp3.cc:947
-msgid "Minimum bitrate (kbps):"
-msgstr "Minimum bitrate (kbps):"
-
-#: src/filewriter/mp3.cc:973
-msgid "Maximum bitrate (kbps):"
-msgstr "Maksimal bitrate (kbps):"
-
-#: src/filewriter/mp3.cc:995
-msgid "Strictly enforce minimum bitrate"
-msgstr "Memaksakan dengan ketat bitrate terendah"
-
-#: src/filewriter/mp3.cc:1007
-msgid "ABR Options:"
-msgstr "Opsi ABR:"
-
-#: src/filewriter/mp3.cc:1017
-msgid "Average bitrate (kbps):"
-msgstr "bitrate rata-rata (kbps):"
+#: src/filewriter/filewriter.cc:514
+msgid "Minimum bitrate:"
+msgstr "Bitrate minimum:"
+
+#: src/filewriter/filewriter.cc:518
+msgid "Maximum bitrate:"
+msgstr "Bitrate maksimum:"
+
+#: src/filewriter/filewriter.cc:522
+msgid "Average bitrate:"
+msgstr "Bitrate rata-rata:"
 
-#: src/filewriter/mp3.cc:1044
+#: src/filewriter/filewriter.cc:526
 msgid "VBR quality level:"
 msgstr "Tingkat kualitas VBR:"
 
-#: src/filewriter/mp3.cc:1063
-msgid "Omit Xing VBR header"
-msgstr ""
+#: src/filewriter/filewriter.cc:530
+msgid "Strictly enforce minimum bitrate"
+msgstr "Memaksakan dengan ketat bitrate terendah"
 
-#: src/filewriter/mp3.cc:1076
-msgid "VBR/ABR"
-msgstr "VBR/ABR"
+#: src/filewriter/filewriter.cc:533
+msgid "Omit Xing VBR header"
+msgstr "Abaikan header Xing VBR"
 
-#: src/filewriter/mp3.cc:1085
-msgid "Frame Parameters:"
-msgstr ""
+#: src/filewriter/filewriter.cc:539
+msgid "Frame Headers"
+msgstr "Frame Header"
 
-#: src/filewriter/mp3.cc:1097
+#: src/filewriter/filewriter.cc:540
 msgid "Mark as copyright"
 msgstr "Tandai sebagai hak cipta"
 
-#: src/filewriter/mp3.cc:1108
+#: src/filewriter/filewriter.cc:542
 msgid "Mark as original"
 msgstr "Tandai sebagai orisinil"
 
-#: src/filewriter/mp3.cc:1120
-msgid "ID3 Parameters:"
-msgstr ""
+#: src/filewriter/filewriter.cc:544
+msgid "ID3 Tags"
+msgstr "Tag ID3"
 
-#: src/filewriter/mp3.cc:1131
+#: src/filewriter/filewriter.cc:545
 msgid "Force addition of version 2 tag"
 msgstr "Memaksa tambahan tag versi 2"
 
-#: src/filewriter/mp3.cc:1141
+#: src/filewriter/filewriter.cc:547
 msgid "Only add v1 tag"
 msgstr "Hanya tambahkan tag v1"
 
-#: src/filewriter/mp3.cc:1148
+#: src/filewriter/filewriter.cc:549
 msgid "Only add v2 tag"
 msgstr "Hanya tambahkan tag v2"
 
-#: src/filewriter/mp3.cc:1169
+#: src/filewriter/filewriter.cc:554
+msgid "Quality"
+msgstr "Kualitas"
+
+#: src/filewriter/filewriter.cc:555
+msgid "VBR/ABR"
+msgstr "VBR/ABR"
+
+#: src/filewriter/filewriter.cc:556
 msgid "Tags"
 msgstr "Tags"
 
-#: src/filewriter/vorbis.cc:196
-msgid "Vorbis Encoder Configuration"
-msgstr "Pengaturan Enkoder Vorbis"
-
-#: src/filewriter/vorbis.cc:219
-msgid "Quality level (0 - 10):"
-msgstr "Tingkat kualitas (0-10):"
+#: src/filewriter/filewriter.cc:566
+msgid "Quality (0-1):"
+msgstr "Kualitas (0-1):"
+
+#: src/filewriter/filewriter.cc:573 src/skins-qt/skins_cfg.cc:307
+#: src/skins/skins_cfg.cc:289
+msgid "General"
+msgstr "Umum"
 
-#: src/flacng/flacng.h:35
+#: src/flac/flacng.h:36
 msgid "FLAC Decoder"
 msgstr "Dekoder FLAC"
 
-#: src/flacng/metadata.cc:351 src/wavpack/wavpack.cc:209
+#: src/flac/metadata.cc:296 src/wavpack/wavpack.cc:215
 msgid "lossless"
-msgstr ""
+msgstr "lossless"
 
-#: src/flacng/plugin.cc:169
+#: src/flac/plugin.cc:214
 msgid ""
 "Original code by\n"
 "Ralf Ertzinger <ralf@skytale.net>\n"
 "\n"
 "http://www.skytale.net/projects/bmp-flac2/"
 msgstr ""
+"Kode asli oleh\n"
+"Ralf Ertzinger <ralf@skytale.net>\n"
+"\n"
+"http://www.skytale.net/projects/bmp-flac2/"
 
 #: src/gio/gio.cc:34
 msgid ""
 "GIO Plugin for Audacious\n"
 "Copyright 2009-2012 John Lindgren"
 msgstr ""
+"GIO Plugin untuk Audacious\n"
+"Hak Cipta 2009-2012 John Lindgren"
 
 #: src/gio/gio.cc:42
 msgid "GIO Plugin"
 msgstr "Pengaya GIO"
 
-#: src/gio/gio.cc:153
+#: src/gio/gio.cc:152
 msgid "Read-and-append mode not supported"
-msgstr ""
+msgstr "Mode baca-dan-tambahkan tidak didukung"
 
-#: src/gio/gio.cc:166
+#: src/gio/gio.cc:165
 msgid "Invalid open mode"
-msgstr ""
+msgstr "Mode terbuka tidak valid "
 
-#: src/gl-spectrum/gl-spectrum.cc:51
+#: src/glspectrum/gl-spectrum.cc:52
 msgid ""
 "OpenGL Spectrum Analyzer for Audacious\n"
 "Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
@@ -1444,610 +1491,753 @@
 "\n"
 "License: GPLv2+"
 msgstr ""
-
-#: src/gl-spectrum/gl-spectrum.cc:62
-msgid "OpenGL Spectrum Analyzer"
-msgstr ""
-
-#: src/gl-spectrum-qt/gl-spectrum.cc:41
-msgid ""
-"OpenGL Spectrum Analyzer for Audacious\n"
-"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
-"Copyright 2014 William Pitcock\n"
+"OpenGL Spectrum Analyzer untuk Audacious \n"
+"Hak Cipta 2013 Christophe Budé, John Lindgren, dan Carlo Bramini\n"
 "\n"
-"Based on the XMMS plugin:\n"
-"Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson, and "
-"4Front Technologies\n"
+"Berdasarkan plugin XMMS:\n"
+"Hak Cipta 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson, dan "
+"4Front Teknologi\n"
 "\n"
-"License: GPLv2+"
-msgstr ""
-
-#: src/gl-spectrum-qt/gl-spectrum.cc:53
-msgid "OpenGL Spectrum Analyzer (Qt)"
-msgstr ""
-
-#: src/gnomeshortcuts/gnomeshortcuts.cc:38
-msgid "GNOME Shortcuts"
-msgstr ""
+"Lisensi: GPLv2+"
 
-#: src/gnomeshortcuts/gnomeshortcuts.cc:54
-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/gtkui/columns.cc:35
-msgid "Entry number"
-msgstr "Masukkan angka"
+#: src/glspectrum/gl-spectrum.cc:63 src/qtglspectrum/gl-spectrum.cc:53
+msgid "OpenGL Spectrum Analyzer"
+msgstr "OpenGL Spectrum Analyzer"
 
-#: src/gtkui/columns.cc:36 src/playlist-manager/playlist-manager.cc:225
-#: src/qtui/playlist_model.cc:123
+#: src/gtkui/columns.cc:36 src/moonstone/playlist_model.cc:38
+#: src/qtui/playlist_model.cc:33
+msgid "Entry Number"
+msgstr "Nomor Masuk"
+
+#: src/gtkui/columns.cc:37 src/moonstone/playlist_model.cc:38
+#: src/moonstone/playlist_selection.cc:64
+#: src/playlist-manager/playlist-manager.cc:200
+#: src/playlist-manager-qt/playlist-manager-qt.cc:188
+#: src/qtui/playlist_model.cc:33 src/streamtuner/icecast-model.cc:120
+#: src/streamtuner/ihr-model.cc:159 src/streamtuner/shoutcast-model.cc:122
 msgid "Title"
 msgstr "Judul"
 
-#: src/gtkui/columns.cc:37 src/qtui/playlist_model.cc:125
+#: src/gtkui/columns.cc:38 src/moonstone/playlist_model.cc:39
+#: src/qtui/playlist_model.cc:33
 msgid "Artist"
 msgstr "Artis"
 
-#: src/gtkui/columns.cc:38
+#: src/gtkui/columns.cc:39 src/moonstone/playlist_model.cc:39
+#: src/qtui/playlist_model.cc:33
 msgid "Year"
 msgstr "Tahun"
 
-#: src/gtkui/columns.cc:39 src/qtui/playlist_model.cc:127
+#: src/gtkui/columns.cc:40 src/moonstone/playlist_model.cc:39
+#: src/qtui/playlist_model.cc:34
 msgid "Album"
 msgstr "Album"
 
-#: src/gtkui/columns.cc:40
-msgid "Album artist"
-msgstr ""
+#: src/gtkui/columns.cc:41 src/moonstone/playlist_model.cc:40
+#: src/qtui/playlist_model.cc:34
+msgid "Album Artist"
+msgstr "Album Artis"
 
-#: src/gtkui/columns.cc:41
+#: src/gtkui/columns.cc:42 src/moonstone/playlist_model.cc:40
+#: src/qtui/playlist_model.cc:34
 msgid "Track"
 msgstr "Track"
 
-#: src/gtkui/columns.cc:42
+#: src/gtkui/columns.cc:43 src/moonstone/playlist_model.cc:40
+#: src/qtui/playlist_model.cc:34 src/streamtuner/icecast-model.cc:123
+#: src/streamtuner/shoutcast-model.cc:125
+#: src/streamtuner/shoutcast-model.cc:236
 msgid "Genre"
 msgstr "Aliran"
 
-#: src/gtkui/columns.cc:43
-msgid "Queue position"
-msgstr "Posisi antri"
+#: src/gtkui/columns.cc:44 src/moonstone/playlist_model.cc:41
+#: src/qtui/playlist_model.cc:35
+msgid "Queue Position"
+msgstr "Posisi Antrian"
 
-#: src/gtkui/columns.cc:44
+#: src/gtkui/columns.cc:45 src/moonstone/playlist_model.cc:41
+#: src/qtui/playlist_model.cc:35
 msgid "Length"
 msgstr "Panjang"
 
-#: src/gtkui/columns.cc:45
-msgid "File path"
-msgstr "Tempat Berkas"
-
-#: src/gtkui/columns.cc:47
-msgid "Custom title"
-msgstr "Title pilihan"
-
-#: src/gtkui/columns.cc:48
+#: src/gtkui/columns.cc:46 src/moonstone/playlist_model.cc:41
+#: src/qtui/playlist_model.cc:35
+msgid "File Path"
+msgstr "Lokasi File"
+
+#: src/gtkui/columns.cc:47 src/moonstone/playlist_model.cc:42
+#: src/qtui/playlist_model.cc:35
+msgid "File Name"
+msgstr "Nama File"
+
+#: src/gtkui/columns.cc:48 src/moonstone/playlist_model.cc:42
+#: src/qtui/playlist_model.cc:36
+msgid "Custom Title"
+msgstr "Title Pilihan"
+
+#: src/gtkui/columns.cc:49 src/moonstone/playlist_model.cc:42
+#: src/qtui/playlist_model.cc:36 src/streamtuner/icecast-model.cc:129
+#: src/streamtuner/shoutcast-model.cc:134
 msgid "Bitrate"
 msgstr "Bitrate"
 
-#: src/gtkui/columns.cc:308
+#: src/gtkui/columns.cc:50 src/moonstone/playlist_model.cc:43
+#: src/qtui/playlist_model.cc:36
+msgid "Comment"
+msgstr "Komentar"
+
+#: src/gtkui/columns.cc:51 src/qtui/playlist_model.cc:36
+msgid "Publisher"
+msgstr "Penerbit"
+
+#: src/gtkui/columns.cc:52 src/qtui/playlist_model.cc:37
+msgid "Catalog Number"
+msgstr "Nomor katalog"
+
+#: src/gtkui/columns.cc:53 src/moonstone/playlist_model.cc:43
+#: src/qtui/playlist_model.cc:37
+msgid "Disc"
+msgstr ""
+
+#: src/gtkui/columns.cc:325
 msgid "Available columns"
 msgstr "Kolom tersedia"
 
-#: src/gtkui/columns.cc:334
+#: src/gtkui/columns.cc:351
 msgid "Displayed columns"
 msgstr "Tampilan kolom"
 
-#: src/gtkui/layout.cc:72 src/search-tool/search-tool.cc:40
+#: src/gtkui/layout.cc:74 src/search-tool-qt/search-tool-qt.cc:58
+#: src/search-tool/search-tool.cc:49
 msgid "Search Tool"
 msgstr "Alat Pencari"
 
-#: src/gtkui/layout.cc:167
+#: src/gtkui/layout.cc:170
 msgid "Dock at Left"
 msgstr "Dok dikiri"
 
-#: src/gtkui/layout.cc:167
+#: src/gtkui/layout.cc:170
 msgid "Dock at Right"
 msgstr "Dok dikanan"
 
-#: src/gtkui/layout.cc:168
+#: src/gtkui/layout.cc:171
 msgid "Dock at Top"
 msgstr "Dok diatas"
 
-#: src/gtkui/layout.cc:168
+#: src/gtkui/layout.cc:171
 msgid "Dock at Bottom"
 msgstr "Dok dibawah"
 
-#: src/gtkui/layout.cc:168
+#: src/gtkui/layout.cc:171
 msgid "Undock"
 msgstr "Tidak didok"
 
-#: src/gtkui/layout.cc:168 src/ladspa/plugin.cc:531
+#: src/gtkui/layout.cc:171 src/ladspa/plugin.cc:540
 msgid "Disable"
 msgstr "Nonaktifkan"
 
-#: src/gtkui/menus.cc:126 src/qtui/main_window_actions.cc:93
-#: src/statusicon/statusicon.cc:276
+#: src/gtkui/menus.cc:79 src/qtui/menus.cc:107
+#: src/statusicon-qt/statusicon.cc:115 src/statusicon/statusicon.cc:286
 msgid "_Open Files ..."
 msgstr "_Buka Berkas..."
 
-#: src/gtkui/menus.cc:127
+#: src/gtkui/menus.cc:80 src/qtui/menus.cc:111
 msgid "Open _URL ..."
 msgstr "Buka _URL..."
 
-#: src/gtkui/menus.cc:128 src/qtui/main_window_actions.cc:95
+#: src/gtkui/menus.cc:81 src/qtui/menus.cc:113
 msgid "_Add Files ..."
 msgstr "_Tambah Berkas ..."
 
-#: src/gtkui/menus.cc:129
+#: src/gtkui/menus.cc:82 src/qtui/menus.cc:118
 msgid "Add U_RL ..."
 msgstr "Tambah U_RL..."
 
-#: src/gtkui/menus.cc:131
+#: src/gtkui/menus.cc:84 src/qtui/menus.cc:120
 msgid "Search _Library"
 msgstr "Cari _Pustaka"
 
-#: src/gtkui/menus.cc:133 src/qtui/main_window_actions.cc:98
+#: src/gtkui/menus.cc:86 src/qtui/menus.cc:123
 msgid "A_bout ..."
 msgstr "Te_ntang..."
 
-#: src/gtkui/menus.cc:134 src/qtui/main_window_actions.cc:99
+#: src/gtkui/menus.cc:87 src/qtui/menus.cc:125
 msgid "_Settings ..."
 msgstr "_Pengaturan...."
 
-#: src/gtkui/menus.cc:135 src/qtui/main_window_actions.cc:103
-#: src/statusicon/statusicon.cc:284
+#: src/gtkui/menus.cc:88 src/qtui/menus.cc:131
+#: src/statusicon-qt/statusicon.cc:117 src/statusicon/statusicon.cc:288
 msgid "_Quit"
 msgstr "_Keluar"
 
-#: src/gtkui/menus.cc:139 src/gtkui/menus.cc:262
-#: src/qtui/main_window_actions.cc:107 src/search-tool/search-tool.cc:641
-#: src/statusicon/statusicon.cc:278
+#: src/gtkui/menus.cc:92 src/gtkui/menus.cc:226
+#: src/moonstone/playlist_tabs.cc:306 src/qtui/menus.cc:135
+#: src/qtui/playlist_tabs.cc:331 src/search-tool-qt/search-tool-qt.cc:499
+#: src/search-tool/search-tool.cc:339 src/statusicon-qt/statusicon.cc:109
+#: src/statusicon/statusicon.cc:280
 msgid "_Play"
 msgstr "_Putar"
 
-#: src/gtkui/menus.cc:140 src/qtui/main_window_actions.cc:108
-#: src/statusicon/statusicon.cc:279
+#: src/gtkui/menus.cc:93 src/qtui/menus.cc:137
+#: src/statusicon-qt/statusicon.cc:110 src/statusicon/statusicon.cc:281
 msgid "Paus_e"
 msgstr "Paus_e"
 
-#: src/gtkui/menus.cc:141 src/qtui/main_window_actions.cc:109
-#: src/statusicon/statusicon.cc:280
+#: src/gtkui/menus.cc:94 src/qtui/menus.cc:139
+#: src/statusicon-qt/statusicon.cc:111 src/statusicon/statusicon.cc:282
 msgid "_Stop"
 msgstr "_Stop"
 
-#: src/gtkui/menus.cc:142 src/qtui/main_window_actions.cc:110
-#: src/statusicon/statusicon.cc:277
+#: src/gtkui/menus.cc:95 src/qtui/menus.cc:141
+#: src/statusicon-qt/statusicon.cc:112 src/statusicon/statusicon.cc:283
 msgid "Pre_vious"
 msgstr "Se_belumnya"
 
-#: src/gtkui/menus.cc:143 src/qtui/main_window_actions.cc:111
-#: src/statusicon/statusicon.cc:281
+#: src/gtkui/menus.cc:96 src/qtui/menus.cc:143
+#: src/statusicon-qt/statusicon.cc:113 src/statusicon/statusicon.cc:284
 msgid "_Next"
 msgstr "Sela_njutnya"
 
-#: src/gtkui/menus.cc:145 src/qtui/main_window_actions.cc:113
+#: src/gtkui/menus.cc:97 src/qtui/menus.cc:145 src/skins/menus.cc:114
+#: src/skins-qt/menus.cc:105
+msgid "Previous Album"
+msgstr "Album Sebelumnya"
+
+#: src/gtkui/menus.cc:98 src/qtui/menus.cc:146 src/skins/menus.cc:115
+#: src/skins-qt/menus.cc:106
+msgid "Next Album"
+msgstr "Album Berikutnya "
+
+#: src/gtkui/menus.cc:100 src/qtui/menus.cc:148
 msgid "_Repeat"
 msgstr "_Ulangi"
 
-#: src/gtkui/menus.cc:146 src/qtui/main_window_actions.cc:114
+#: src/gtkui/menus.cc:101 src/qtui/menus.cc:150
 msgid "S_huffle"
 msgstr "_Acak"
 
-#: src/gtkui/menus.cc:147 src/qtui/main_window_actions.cc:115
+#: src/gtkui/menus.cc:102 src/qtui/menus.cc:152
+msgid "Shuffle by Albu_m"
+msgstr "Acak berdasarkan Albu_m"
+
+#: src/gtkui/menus.cc:103 src/qtui/menus.cc:155
 msgid "N_o Playlist Advance"
 msgstr "N_o Kemajuan Playlist"
 
-#: src/gtkui/menus.cc:148 src/qtui/main_window_actions.cc:116
+#: src/gtkui/menus.cc:104 src/qtui/menus.cc:157
 msgid "Stop A_fter This Song"
-msgstr ""
+msgstr "Berhenti Setela_h Lagu Ini"
 
-#: src/gtkui/menus.cc:150 src/gtkui/menus.cc:247
-#: src/qtui/main_window_actions.cc:118
+#: src/gtkui/menus.cc:106 src/gtkui/menus.cc:210 src/qtui/menus.cc:162
+#: src/qtui/menus.cc:294
 msgid "Song _Info ..."
-msgstr "Informasi_Lagu..."
+msgstr "Informasi _Lagu..."
 
-#: src/gtkui/menus.cc:151
+#: src/gtkui/menus.cc:107
 msgid "Jump to _Time ..."
 msgstr "Loncat ke _Waktu..."
 
-#: src/gtkui/menus.cc:152
+#: src/gtkui/menus.cc:108
 msgid "_Jump to Song ..."
 msgstr "_Loncat ke Lagu..."
 
-#: src/gtkui/menus.cc:154
+#: src/gtkui/menus.cc:110 src/qtui/menus.cc:165
 msgid "Set Repeat Point _A"
-msgstr ""
+msgstr "Set Ulangi Titik _A"
 
-#: src/gtkui/menus.cc:155
+#: src/gtkui/menus.cc:111 src/qtui/menus.cc:167
 msgid "Set Repeat Point _B"
-msgstr ""
+msgstr "Set Ulangi Titik _B"
 
-#: src/gtkui/menus.cc:156
+#: src/gtkui/menus.cc:112 src/qtui/menus.cc:169
 msgid "_Clear Repeat Points"
-msgstr ""
+msgstr "_Hapus Poin Pengulangan"
 
-#: src/gtkui/menus.cc:160 src/gtkui/menus.cc:167 src/gtkui/menus.cc:183
-#: src/qtui/main_window_actions.cc:122 src/qtui/main_window_actions.cc:129
-#: src/qtui/main_window_actions.cc:145
+#: src/gtkui/menus.cc:116 src/gtkui/menus.cc:123 src/gtkui/menus.cc:141
+#: src/qtui/menus.cc:173 src/qtui/menus.cc:180 src/qtui/menus.cc:198
 msgid "By _Title"
-msgstr "Oleh_Judul"
+msgstr "Oleh _Judul"
 
-#: src/gtkui/menus.cc:161 src/qtui/main_window_actions.cc:123
+#: src/gtkui/menus.cc:117 src/qtui/menus.cc:174
 msgid "By _File Name"
-msgstr ""
+msgstr "Oleh Nama _Berkas"
 
-#: src/gtkui/menus.cc:162 src/qtui/main_window_actions.cc:124
+#: src/gtkui/menus.cc:118 src/qtui/menus.cc:175
 msgid "By File _Path"
-msgstr ""
+msgstr "Menurut Jalur File"
 
-#: src/gtkui/menus.cc:166 src/gtkui/menus.cc:182
-#: src/qtui/main_window_actions.cc:128 src/qtui/main_window_actions.cc:144
+#: src/gtkui/menus.cc:122 src/gtkui/menus.cc:140 src/qtui/menus.cc:179
+#: src/qtui/menus.cc:197
 msgid "By Track _Number"
 msgstr "Oleh No_Track"
 
-#: src/gtkui/menus.cc:168 src/gtkui/menus.cc:184
-#: src/qtui/main_window_actions.cc:130 src/qtui/main_window_actions.cc:146
+#: src/gtkui/menus.cc:124 src/gtkui/menus.cc:142 src/qtui/menus.cc:181
+#: src/qtui/menus.cc:199
 msgid "By _Artist"
 msgstr "Oleh_Artis"
 
-#: src/gtkui/menus.cc:169 src/gtkui/menus.cc:185
-#: src/qtui/main_window_actions.cc:131 src/qtui/main_window_actions.cc:147
+#: src/gtkui/menus.cc:125 src/gtkui/menus.cc:143 src/qtui/menus.cc:182
+#: src/qtui/menus.cc:200
 msgid "By Al_bum"
-msgstr ""
+msgstr "Menurut Album"
 
-#: src/gtkui/menus.cc:170 src/gtkui/menus.cc:186
-#: src/qtui/main_window_actions.cc:132 src/qtui/main_window_actions.cc:148
+#: src/gtkui/menus.cc:126 src/gtkui/menus.cc:144 src/qtui/menus.cc:183
+#: src/qtui/menus.cc:201
 msgid "By Albu_m Artist"
-msgstr ""
+msgstr "Oleh Artis Album"
 
-#: src/gtkui/menus.cc:171 src/gtkui/menus.cc:187
-#: src/qtui/main_window_actions.cc:133 src/qtui/main_window_actions.cc:149
+#: src/gtkui/menus.cc:127 src/gtkui/menus.cc:145 src/qtui/menus.cc:184
+#: src/qtui/menus.cc:202
 msgid "By Release _Date"
 msgstr "Oleh _Tanggal Release"
 
-#: src/gtkui/menus.cc:172 src/gtkui/menus.cc:188
-#: src/qtui/main_window_actions.cc:134 src/qtui/main_window_actions.cc:150
+#: src/gtkui/menus.cc:128 src/gtkui/menus.cc:146 src/qtui/menus.cc:185
+#: src/qtui/menus.cc:203
 msgid "By _Genre"
-msgstr ""
+msgstr "Menurut_Genre"
 
-#: src/gtkui/menus.cc:173 src/gtkui/menus.cc:189
-#: src/qtui/main_window_actions.cc:135 src/qtui/main_window_actions.cc:151
+#: src/gtkui/menus.cc:129 src/gtkui/menus.cc:147 src/qtui/menus.cc:186
+#: src/qtui/menus.cc:204
 msgid "By _Length"
-msgstr ""
+msgstr "Menurut _ Panjang "
 
-#: src/gtkui/menus.cc:174 src/gtkui/menus.cc:190
-#: src/qtui/main_window_actions.cc:136 src/qtui/main_window_actions.cc:152
+#: src/gtkui/menus.cc:130 src/gtkui/menus.cc:148 src/qtui/menus.cc:187
+#: src/qtui/menus.cc:205
 msgid "By _File Path"
 msgstr "Berdasarkan tempat"
 
-#: src/gtkui/menus.cc:175 src/gtkui/menus.cc:191
-#: src/qtui/main_window_actions.cc:137 src/qtui/main_window_actions.cc:153
+#: src/gtkui/menus.cc:131 src/gtkui/menus.cc:149 src/qtui/menus.cc:188
+#: src/qtui/menus.cc:206
 msgid "By _Custom Title"
 msgstr "By _Judul Terkustomisasi"
 
-#: src/gtkui/menus.cc:177 src/gtkui/menus.cc:193
-#: src/qtui/main_window_actions.cc:139 src/qtui/main_window_actions.cc:155
+#: src/gtkui/menus.cc:132 src/gtkui/menus.cc:150 src/qtui/menus.cc:189
+#: src/qtui/menus.cc:207
+msgid "By C_omment"
+msgstr "Menurut Komen"
+
+#: src/gtkui/menus.cc:133 src/gtkui/menus.cc:151 src/qtui/menus.cc:190
+#: src/qtui/menus.cc:208
+msgid "By D_isc Number"
+msgstr ""
+
+#: src/gtkui/menus.cc:135 src/gtkui/menus.cc:153 src/qtui/menus.cc:192
+#: src/qtui/menus.cc:210
 msgid "R_everse Order"
 msgstr "B_alik Urutan"
 
-#: src/gtkui/menus.cc:178 src/gtkui/menus.cc:194
-#: src/qtui/main_window_actions.cc:140 src/qtui/main_window_actions.cc:156
+#: src/gtkui/menus.cc:136 src/gtkui/menus.cc:154 src/qtui/menus.cc:194
+#: src/qtui/menus.cc:212
 msgid "_Random Order"
 msgstr "_Acak Urutan"
 
-#: src/gtkui/menus.cc:198 src/qtui/main_window_actions.cc:160
+#: src/gtkui/menus.cc:158 src/qtui/menus.cc:216
 msgid "_Play/Resume"
-msgstr ""
+msgstr "Mainkan/Teruskan"
 
-#: src/gtkui/menus.cc:199 src/gtkui/menus.cc:251
-#: src/qtui/main_window_actions.cc:161
+#: src/gtkui/menus.cc:159 src/qtui/menus.cc:218
 msgid "_Refresh"
 msgstr "Sega_rkan"
 
-#: src/gtkui/menus.cc:201 src/qtui/main_window_actions.cc:163
+#: src/gtkui/menus.cc:161 src/qtui/menus.cc:222
 msgid "_Sort"
 msgstr "Uru_tkan"
 
-#: src/gtkui/menus.cc:202 src/qtui/main_window_actions.cc:164
+#: src/gtkui/menus.cc:162 src/qtui/menus.cc:223
 msgid "Sort Se_lected"
-msgstr ""
+msgstr "Sortir yang Dipilih "
 
-#: src/gtkui/menus.cc:203 src/qtui/main_window_actions.cc:165
+#: src/gtkui/menus.cc:163 src/qtui/menus.cc:225
 msgid "Remove _Duplicates"
-msgstr ""
+msgstr "Hapus_Duplikat "
 
-#: src/gtkui/menus.cc:204 src/qtui/main_window_actions.cc:166
+#: src/gtkui/menus.cc:164 src/qtui/menus.cc:226
 msgid "Remove _Unavailable Files"
-msgstr ""
+msgstr "Hapus File _Tidak Tersedia"
 
-#: src/gtkui/menus.cc:206 src/playlist-manager/playlist-manager.cc:244
-#: src/qtui/main_window_actions.cc:168
+#: src/gtkui/menus.cc:166 src/playlist-manager/playlist-manager.cc:219
+#: src/playlist-manager-qt/playlist-manager-qt.cc:348 src/qtui/menus.cc:229
 msgid "_New"
 msgstr "_Baru"
 
-#: src/gtkui/menus.cc:207
+#: src/gtkui/menus.cc:167 src/qtui/menus.cc:230
 msgid "Ren_ame ..."
-msgstr ""
+msgstr "Ganti nama ..."
 
-#: src/gtkui/menus.cc:208 src/gtkui/menus.cc:264
-#: src/qtui/main_window_actions.cc:170
+#: src/gtkui/menus.cc:168 src/gtkui/menus.cc:228
+#: src/moonstone/playlist_tabs.cc:311 src/qtui/menus.cc:231
+#: src/qtui/playlist_tabs.cc:336
 msgid "Remo_ve"
 msgstr "Hap_us"
 
-#: src/gtkui/menus.cc:210
+#: src/gtkui/menus.cc:170 src/qtui/menus.cc:233
 msgid "_Import ..."
 msgstr "_Import..."
 
-#: src/gtkui/menus.cc:211
+#: src/gtkui/menus.cc:171 src/qtui/menus.cc:234
 msgid "_Export ..."
 msgstr "_Export..."
 
-#: src/gtkui/menus.cc:213
+#: src/gtkui/menus.cc:173 src/qtui/menus.cc:237
 msgid "Playlist _Manager ..."
-msgstr ""
+msgstr "Daftar Putar ... "
 
-#: src/gtkui/menus.cc:214 src/qtui/main_window_actions.cc:176
+#: src/gtkui/menus.cc:174 src/qtui/menus.cc:239
 msgid "_Queue Manager ..."
 msgstr "_Manajer Antrian ..."
 
-#: src/gtkui/menus.cc:218 src/qtui/main_window_actions.cc:180
+#: src/gtkui/menus.cc:178 src/qtui/menus.cc:243
 msgid "Volume _Up"
 msgstr "Volume _Naik"
 
-#: src/gtkui/menus.cc:219 src/qtui/main_window_actions.cc:181
+#: src/gtkui/menus.cc:179 src/qtui/menus.cc:245
 msgid "Volume _Down"
 msgstr "Volume _Turun"
 
-#: src/gtkui/menus.cc:221 src/qtui/main_window_actions.cc:183
-msgid "_Equalizer"
-msgstr "_Equalizer"
+#: src/gtkui/menus.cc:181 src/qtui/menus.cc:249
+msgid "_Equalizer ..."
+msgstr "_Ekualiser ... "
 
-#: src/gtkui/menus.cc:223 src/qtui/main_window_actions.cc:185
+#: src/gtkui/menus.cc:182 src/qtui/menus.cc:251
 msgid "E_ffects ..."
-msgstr ""
+msgstr "Efek ... "
 
-#: src/gtkui/menus.cc:227
+#: src/gtkui/menus.cc:184
+msgid "_Record Stream"
+msgstr "Rekam Stream "
+
+#: src/gtkui/menus.cc:185
+msgid "Audio _Settings ..."
+msgstr "Pengaturan Audio ..."
+
+#: src/gtkui/menus.cc:189 src/qtui/menus.cc:260
 msgid "Show _Menu Bar"
 msgstr "Perlihatkan Bar _Menu"
 
-#: src/gtkui/menus.cc:228
+#: src/gtkui/menus.cc:190 src/qtui/menus.cc:262
 msgid "Show I_nfo Bar"
 msgstr "Perlihatkan _Bar Info"
 
-#: src/gtkui/menus.cc:229
+#: src/gtkui/menus.cc:191 src/qtui/menus.cc:264
+msgid "Show Info Bar _Album Art"
+msgstr "Tampilkan Bilah Keterangan _Sampul Album"
+
+#: src/gtkui/menus.cc:192 src/qtui/menus.cc:266
 msgid "Show Info Bar Vis_ualization"
-msgstr ""
+msgstr "Tampilkan Bilah Info Vis_ualisasi"
 
-#: src/gtkui/menus.cc:230
+#: src/gtkui/menus.cc:193 src/qtui/menus.cc:268
 msgid "Show _Status Bar"
 msgstr "Perlihatkan Bar _Status"
 
-#: src/gtkui/menus.cc:232
+#: src/gtkui/menus.cc:195 src/qtui/menus.cc:272
 msgid "Show _Remaining Time"
-msgstr ""
+msgstr "Tampilkan _Waktu Tersisa"
 
-#: src/gtkui/menus.cc:234
+#: src/gtkui/menus.cc:197 src/qtui/menus.cc:276 src/skins/menus.cc:157
+#: src/skins-qt/menus.cc:152
 msgid "_Visualizations ..."
 msgstr "_Visualisasi"
 
-#: src/gtkui/menus.cc:238 src/qtui/main_window_actions.cc:189
+#: src/gtkui/menus.cc:201 src/qtui/menus.cc:280
 msgid "_File"
 msgstr "_Berkas"
 
-#: src/gtkui/menus.cc:239 src/qtui/main_window_actions.cc:190
+#: src/gtkui/menus.cc:202 src/qtui/menus.cc:281
 msgid "_Playback"
 msgstr "_Pemutaran"
 
-#: src/gtkui/menus.cc:240 src/qtui/main_window_actions.cc:191
+#: src/gtkui/menus.cc:203 src/qtui/menus.cc:282
 msgid "P_laylist"
 msgstr "Daftar P_utar"
 
-#: src/gtkui/menus.cc:241 src/gtkui/menus.cc:258
-#: src/qtui/main_window_actions.cc:192
+#: src/gtkui/menus.cc:204 src/gtkui/menus.cc:222 src/qtui/menus.cc:283
+#: src/qtui/menus.cc:312
 msgid "_Services"
 msgstr "_Layanan"
 
-#: src/gtkui/menus.cc:242 src/qtui/main_window_actions.cc:193
+#: src/gtkui/menus.cc:205 src/qtui/menus.cc:284
 msgid "_Output"
 msgstr "_Keluaran"
 
-#: src/gtkui/menus.cc:243
+#: src/gtkui/menus.cc:206 src/qtui/menus.cc:285
 msgid "_View"
 msgstr "_Lihat"
 
-#: src/gtkui/menus.cc:248
+#: src/gtkui/menus.cc:211 src/qtui/menus.cc:296
 msgid "_Queue/Unqueue"
 msgstr "_Antre/Tidak Antre"
 
-#: src/gtkui/menus.cc:250
+#: src/gtkui/menus.cc:213 src/qtui/menus.cc:299
 msgid "_Open Containing Folder"
-msgstr ""
+msgstr "_Buka Isi Folder"
+
+#: src/gtkui/menus.cc:214 src/qtui/menus.cc:301
+msgid "_Refresh Selected"
+msgstr "_Segarkan Terpilih"
 
-#: src/gtkui/menus.cc:253
+#: src/gtkui/menus.cc:216 src/qtui/menus.cc:304
 msgid "Cu_t"
 msgstr "Potong"
 
-#: src/gtkui/menus.cc:254
+#: src/gtkui/menus.cc:217 src/qtui/menus.cc:305
 msgid "_Copy"
 msgstr "_Salin"
 
-#: src/gtkui/menus.cc:255
+#: src/gtkui/menus.cc:218 src/qtui/menus.cc:306
 msgid "_Paste"
 msgstr "_Tempel"
 
-#: src/gtkui/menus.cc:256
+#: src/gtkui/menus.cc:219 src/qtui/menus.cc:307
+msgid "Paste at _End"
+msgstr "Tempelkan di _Akhir"
+
+#: src/gtkui/menus.cc:220 src/qtui/menus.cc:309
 msgid "Select _All"
 msgstr "Pilih _Semua"
 
-#: src/gtkui/menus.cc:263
+#: src/gtkui/menus.cc:227 src/moonstone/playlist_tabs.cc:309
+#: src/qtui/playlist_tabs.cc:334
 msgid "_Rename ..."
 msgstr "_Ubah nama ..."
 
-#: src/gtkui/settings.cc:35
+#: src/gtkui/settings.cc:35 src/qtui/settings.cc:59
+msgid "Always"
+msgstr "Selalu"
+
+#: src/gtkui/settings.cc:36 src/qtui/settings.cc:60
+msgid "Auto-hide"
+msgstr "Sembunyikan otomatis"
+
+#: src/gtkui/settings.cc:37 src/qtui/settings.cc:61
+msgid "Never"
+msgstr "Tidak pernah"
+
+#: src/gtkui/settings.cc:41 src/qtui/settings.cc:64
 msgid "Playlist Tabs"
-msgstr ""
+msgstr "Tabs Daftar Putar"
 
-#: src/gtkui/settings.cc:36
-msgid "Always show tabs"
-msgstr ""
+#: src/gtkui/settings.cc:42 src/qtui/settings.cc:65
+msgid "Show playlist tabs:"
+msgstr "Tampilkan tab daftar lagu:"
 
-#: src/gtkui/settings.cc:38
+#: src/gtkui/settings.cc:45 src/qtui/settings.cc:69
 msgid "Show entry counts"
-msgstr ""
+msgstr "Tampilkan jumlah masukan"
 
-#: src/gtkui/settings.cc:40
+#: src/gtkui/settings.cc:47 src/qtui/settings.cc:72
 msgid "Show close buttons"
-msgstr ""
+msgstr "Tampilkan tombol keluar"
 
-#: src/gtkui/settings.cc:42
+#: src/gtkui/settings.cc:49 src/qtui/settings.cc:75
 msgid "Playlist Columns"
-msgstr ""
+msgstr "Kolom Daftar Putar"
 
-#: src/gtkui/settings.cc:44
+#: src/gtkui/settings.cc:51 src/qtui/settings.cc:77
 msgid "Show column headers"
-msgstr ""
+msgstr "Tampilkan judul kolom"
 
-#: src/gtkui/settings.cc:46 src/modplug/plugin_main.cc:106
-#: src/skins/skins_cfg.cc:263
-msgid "Miscellaneous"
+#: src/gtkui/settings.cc:53 src/qtui/settings.cc:82
+msgid "Make column headers clickable for sorting"
 msgstr ""
 
-#: src/gtkui/settings.cc:47
-msgid "Arrow keys seek by:"
+#: src/gtkui/settings.cc:56
+msgid "Use symbolic icons in toolbar"
 msgstr ""
 
-#: src/gtkui/settings.cc:50
+#: src/gtkui/settings.cc:58 src/qtui/settings.cc:86
 msgid "Scroll on song change"
-msgstr ""
+msgstr "Gulir saat perubahan lagu"
 
-#: src/gtkui/ui_gtk.cc:71
+#: src/gtkui/ui_gtk.cc:82
 msgid "GTK Interface"
 msgstr "Tampilan GTK"
 
-#: src/gtkui/ui_gtk.cc:222 src/skins/ui_main.cc:232
+#: src/gtkui/ui_gtk.cc:219 src/skins/main.cc:228 src/skins-qt/main.cc:231
 #, c-format
 msgid "%s - Audacious"
 msgstr "%s - Audacious"
 
-#: src/gtkui/ui_gtk.cc:225 src/qtui/main_window.cc:186
+#: src/gtkui/ui_gtk.cc:221 src/moonstone/main_window.cc:184
+#: src/qtui/main_window.cc:385
 msgid "Buffering ..."
-msgstr ""
+msgstr "Memuat ..."
 
-#: src/gtkui/ui_gtk.cc:228 src/skins/ui_main.cc:234 src/skins/ui_main.cc:1164
+#: src/gtkui/ui_gtk.cc:224 src/pipewire/pipewire.cc:402 src/skins/main.cc:230
+#: src/skins-qt/main.cc:233
 msgid "Audacious"
 msgstr "Audacious"
 
-#: src/gtkui/ui_statusbar.cc:63 src/qtui/status_bar.cc:67
+#: src/gtkui/ui_gtk.cc:487 src/gtkui/ui_gtk.cc:518 src/gtkui/ui_gtk.cc:882
+#: src/hotkey/gui.cc:72 src/moonstone/main_window.cc:67
+#: src/moonstone/main_window.cc:145 src/moonstone/main_window.cc:146
+#: src/notify/osd.cc:85 src/qthotkey/gui.cc:67 src/qtui/main_window.cc:154
+#: src/qtui/main_window.cc:347 src/qtui/main_window.cc:348
+#: src/skins/menus.cc:109 src/skins-qt/menus.cc:100
+msgid "Play"
+msgstr "Putar"
+
+#: src/gtkui/ui_gtk.cc:487 src/moonstone/main_window.cc:151
+#: src/moonstone/main_window.cc:152 src/notify/osd.cc:82
+#: src/qtui/main_window.cc:353 src/qtui/main_window.cc:354
+#: src/skins/menus.cc:110 src/skins-qt/menus.cc:101
+msgid "Pause"
+msgstr "Istirahat"
+
+#: src/gtkui/ui_gtk.cc:868 src/moonstone/main_window.cc:57
+#: src/qtui/main_window.cc:145 src/skins/menus.cc:86 src/skins-qt/menus.cc:77
+msgid "Search Library"
+msgstr "Cari Pustaka"
+
+#: src/gtkui/ui_gtk.cc:875 src/moonstone/main_window.cc:60
+#: src/qtui/main_window.cc:147
+msgid "Open Files"
+msgstr "Buka Berkas"
+
+#: src/gtkui/ui_gtk.cc:876 src/moonstone/main_window.cc:62
+#: src/qtui/main_window.cc:149
+msgid "Add Files"
+msgstr "Tambah Berkas"
+
+#: src/gtkui/ui_gtk.cc:881 src/moonstone/main_window.cc:65
+#: src/qtui/main_window.cc:152 src/skins/menus.cc:112 src/skins-qt/menus.cc:103
+msgid "Previous"
+msgstr "Sebelumnya"
+
+#: src/gtkui/ui_gtk.cc:883 src/hotkey/gui.cc:74 src/moonstone/main_window.cc:69
+#: src/qthotkey/gui.cc:69 src/qtui/main_window.cc:156 src/skins/menus.cc:111
+#: src/skins-qt/menus.cc:102
+msgid "Stop"
+msgstr "Berhenti"
+
+#: src/gtkui/ui_gtk.cc:884 src/moonstone/main_window.cc:76 src/notify/osd.cc:89
+#: src/qtui/main_window.cc:163 src/skins/menus.cc:113 src/skins-qt/menus.cc:104
+msgid "Next"
+msgstr "Selanjutnya"
+
+#: src/gtkui/ui_gtk.cc:886 src/moonstone/main_window.cc:79
+#: src/qtui/main_window.cc:166 src/qtui/menus.cc:254 src/skins/menus.cc:79
+#: src/skins-qt/menus.cc:69
+msgid "Record Stream"
+msgstr "Rekam Stream"
+
+#: src/gtkui/ui_gtk.cc:919 src/moonstone/main_window.cc:86
+#: src/qtui/main_window.cc:173 src/skins/menus.cc:103 src/skins-qt/menus.cc:94
+msgid "Repeat"
+msgstr "Ulang"
+
+#: src/gtkui/ui_gtk.cc:922 src/moonstone/main_window.cc:89
+#: src/qtui/main_window.cc:176 src/skins/menus.cc:104 src/skins-qt/menus.cc:95
+msgid "Shuffle"
+msgstr "Acak"
+
+#: src/gtkui/ui_gtk.cc:1114 src/qtui/main_window.cc:123
+msgid "Menu"
+msgstr "Menu"
+
+#: src/gtkui/ui_statusbar.cc:64 src/qtui/status_bar.cc:155
 msgid "mono"
 msgstr "mono"
 
-#: src/gtkui/ui_statusbar.cc:65 src/qtui/status_bar.cc:69
+#: src/gtkui/ui_statusbar.cc:66 src/qtui/status_bar.cc:157
 msgid "stereo"
 msgstr "stereo"
 
-#: src/gtkui/ui_statusbar.cc:67 src/qtui/status_bar.cc:71
+#: src/gtkui/ui_statusbar.cc:68 src/qtui/status_bar.cc:160
 #, c-format
 msgid "%d channel"
 msgid_plural "%d channels"
 msgstr0 "%d kanal"
 
-#: src/gtkui/ui_statusbar.cc:81 src/qtui/status_bar.cc:85
+#: src/gtkui/ui_statusbar.cc:76 src/qtui/status_bar.cc:168
 #, c-format
-msgid "%d kbps"
-msgstr "%d kbps"
+msgid "%d kHz"
+msgstr "%d kHz"
 
-#: src/gtkui/ui_statusbar.cc:107 src/skins/ui_main_evlisteners.cc:103
+#: src/gtkui/ui_statusbar.cc:82 src/qtui/status_bar.cc:174
+#, c-format
+msgid "%d kbit/s"
+msgstr "%dkbit/s"
+
+#: src/gtkui/ui_statusbar.cc:108 src/skins/main.cc:478 src/skins-qt/main.cc:461
 msgid "Single mode."
 msgstr "mode Single."
 
-#: src/gtkui/ui_statusbar.cc:109 src/skins/ui_main_evlisteners.cc:105
+#: src/gtkui/ui_statusbar.cc:110 src/skins/main.cc:480 src/skins-qt/main.cc:463
 msgid "Playlist mode."
 msgstr "mode Playlist."
 
-#: src/gtkui/ui_statusbar.cc:117 src/skins/ui_main_evlisteners.cc:111
+#: src/gtkui/ui_statusbar.cc:118 src/skins/main.cc:486 src/skins-qt/main.cc:469
 msgid "Stopping after song."
 msgstr "Berhenti setelah lagu"
 
-#: src/hotkey/gui.cc:71
+#: src/hotkey/gui.cc:71 src/qthotkey/gui.cc:66
 msgid "Previous track"
-msgstr ""
-
-#: src/hotkey/gui.cc:72 src/notify/osd.cc:69 src/qtui/main_window.cc:69
-#: src/qtui/main_window.cc:172 src/qtui/main_window.cc:173
-#: src/skins/menus.cc:87
-msgid "Play"
-msgstr "Putar"
+msgstr "Trek sebelumnya"
 
-#: src/hotkey/gui.cc:73
+#: src/hotkey/gui.cc:73 src/qthotkey/gui.cc:68
 msgid "Pause/Resume"
 msgstr "Jeda/Mulai Lagi"
 
-#: src/hotkey/gui.cc:74 src/qtui/main_window.cc:70 src/skins/menus.cc:89
-msgid "Stop"
-msgstr "Berhenti"
-
-#: src/hotkey/gui.cc:75
+#: src/hotkey/gui.cc:75 src/qthotkey/gui.cc:70
 msgid "Next track"
-msgstr ""
+msgstr "Trek selanjutnya"
 
-#: src/hotkey/gui.cc:76
-msgid "Forward 5 seconds"
-msgstr ""
+#: src/hotkey/gui.cc:76 src/qthotkey/gui.cc:71
+msgid "Step forward"
+msgstr "Melangkah maju"
 
-#: src/hotkey/gui.cc:77
-msgid "Rewind 5 seconds"
-msgstr ""
+#: src/hotkey/gui.cc:77 src/qthotkey/gui.cc:72
+msgid "Step backward"
+msgstr "Melangkah mundur"
 
-#: src/hotkey/gui.cc:78
+#: src/hotkey/gui.cc:78 src/qthotkey/gui.cc:73
 msgid "Mute"
 msgstr "Diam"
 
-#: src/hotkey/gui.cc:79
+#: src/hotkey/gui.cc:79 src/qthotkey/gui.cc:74
 msgid "Volume up"
-msgstr ""
+msgstr "Volume naik"
 
-#: src/hotkey/gui.cc:80
+#: src/hotkey/gui.cc:80 src/qthotkey/gui.cc:75
 msgid "Volume down"
-msgstr ""
+msgstr "Volume turun"
 
-#: src/hotkey/gui.cc:81
+#: src/hotkey/gui.cc:81 src/qthotkey/gui.cc:76
 msgid "Jump to file"
 msgstr "Loncat ke berkas"
 
-#: src/hotkey/gui.cc:82
+#: src/hotkey/gui.cc:82 src/qthotkey/gui.cc:77
 msgid "Toggle player window(s)"
-msgstr ""
+msgstr "Beralih jendela pemutar"
 
-#: src/hotkey/gui.cc:83
+#: src/hotkey/gui.cc:83 src/qthotkey/gui.cc:78
 msgid "Show On-Screen-Display"
 msgstr "Tunjukkan On-Screen-Display"
 
-#: src/hotkey/gui.cc:84
+#: src/hotkey/gui.cc:84 src/qthotkey/gui.cc:79
 msgid "Toggle repeat"
-msgstr ""
+msgstr "Beralih ulangi"
 
-#: src/hotkey/gui.cc:85
+#: src/hotkey/gui.cc:85 src/qthotkey/gui.cc:80
 msgid "Toggle shuffle"
-msgstr ""
+msgstr "Beralih acak"
 
-#: src/hotkey/gui.cc:86
+#: src/hotkey/gui.cc:86 src/qthotkey/gui.cc:81
 msgid "Toggle stop after current"
-msgstr ""
+msgstr "Beralih berhenti setelah ini"
 
-#: src/hotkey/gui.cc:87
+#: src/hotkey/gui.cc:87 src/qthotkey/gui.cc:82
 msgid "Raise player window(s)"
-msgstr ""
+msgstr "Naikkan jendela pemutar"
 
-#: src/hotkey/gui.cc:97
+#: src/hotkey/gui.cc:98 src/qthotkey/gui.cc:100
 msgid "(none)"
 msgstr "(kosong)"
 
-#: src/hotkey/gui.cc:234
+#: src/hotkey/gui.cc:261
 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 modifiers.\n"
 "\n"
 "Do you want to continue?"
 msgstr ""
@@ -2055,11 +2245,11 @@
 "\n"
 "Apakah anda ingin meneruskan?"
 
-#: src/hotkey/gui.cc:236
+#: src/hotkey/gui.cc:264
 msgid "Binding mouse buttons"
 msgstr "Mengikat tombol mouse"
 
-#: src/hotkey/gui.cc:391
+#: src/hotkey/gui.cc:434
 msgid ""
 "Press a key combination inside a text field.\n"
 "You can also bind mouse buttons."
@@ -2067,86 +2257,130 @@
 "Tekan kombinasi tombol didalam bidang teks.\n"
 "Kamu juga dapat mengikat tombol mouse."
 
-#: src/hotkey/gui.cc:396
+#: src/hotkey/gui.cc:444 src/qthotkey/gui.cc:179
 msgid "Hotkeys:"
 msgstr "Hotkeys:"
 
-#: src/hotkey/gui.cc:413
+#: src/hotkey/gui.cc:457 src/qthotkey/gui.cc:181
 msgid "Action:"
 msgstr "Aksi:"
 
-#: src/hotkey/gui.cc:420
+#: src/hotkey/gui.cc:461 src/qthotkey/gui.cc:182
 msgid "Key Binding:"
 msgstr "Kunci Pengikat:"
 
-#: src/hotkey/gui.cc:468
+#: src/hotkey/gui.cc:518 src/qthotkey/gui.cc:184
 msgid "_Add"
 msgstr "T_ambah"
 
-#: src/hotkey/plugin.cc:61
+#: src/hotkey/plugin.cc:59 src/qthotkey/plugin.cc:78
 msgid "Global Hotkeys"
-msgstr ""
+msgstr "Hotkey Global"
 
-#: src/hotkey/plugin.cc:79
+#: src/hotkey/plugin.cc:74
 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"
+"Contributors 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 ""
+"Pengaya Hotkey Global\n"
+"Kontrol pemutar dengan kombinasi tombol global atau tombol multimedia.\n"
+"\n"
+"Hak Cipta (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n"
+"\n"
+"Kontributor termasuk:\n"
+"Hak Cipta (C) 2006-2007 Vladimir Paskov <vlado.paskov@gmail.com>\n"
+"Hak Cipta (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/jack-ng/jack-ng.cc:49
+#: src/jack/jack-ng.cc:54
 msgid "JACK Output"
 msgstr "Keluaran Jack"
 
-#: src/jack-ng/jack-ng.cc:114
+#: src/jack/jack-ng.cc:126
+msgid "Client name:"
+msgstr "Nama klien:"
+
+#: src/jack/jack-ng.cc:128
 msgid "Automatically connect to output ports"
-msgstr ""
+msgstr "Sambungkan port keluaran secara otomatis"
+
+#: src/jack/jack-ng.cc:130
+msgid "Filter ports (regex, use any port if blank):"
+msgstr "Port filter (regex, gunakan port apapun bila kosong)"
+
+#: src/jack/jack-ng.cc:136
+msgid "Connect to physical ports only"
+msgstr "Hanya sambungkan ke port fisik"
 
-#: src/jack-ng/jack-ng.cc:155
+#: src/jack/jack-ng.cc:139
+msgid "Upmix to"
+msgstr "Upmix ke"
+
+#: src/jack/jack-ng.cc:141
+msgid "ports if input has fewer channels"
+msgstr "port apabila masukan memiliki saluran lebih sedikit"
+
+#: src/jack/jack-ng.cc:143
+msgid "Ignore insufficient number of ports"
+msgstr "Abaikan jumlah port yang tidak mencukupi"
+
+#: src/jack/jack-ng.cc:181
+msgid "No JACK output ports were found. Please check settings."
+msgstr "Keluaran port JACK tidak ditemukan. Mohon cek pengaturan."
+
+#: src/jack/jack-ng.cc:195
 #, c-format
 msgid "Only %d JACK output ports were found but %d are required."
-msgstr ""
+msgstr "Hanya %d keluaran JACK ditemukan tapi %d dibutuhkan."
 
-#: src/jack-ng/jack-ng.cc:164
+#: src/jack/jack-ng.cc:210
 #, c-format
 msgid "Failed to connect to JACK port %s."
-msgstr ""
+msgstr "Gagal menyambung ke port JACK %s."
 
-#: src/jack-ng/jack-ng.cc:184
+#: src/jack/jack-ng.cc:230
 msgid ""
 "JACK supports only floating-point audio. You must change the output bit "
 "depth to floating-point in Audacious settings."
 msgstr ""
+"JACK hanya mendukung suara titik-mengambang. Anda harus mengubah kedalaman "
+"bit keluaran menjadi titik-mengambang di pengaturan Audacious."
 
-#: src/jack-ng/jack-ng.cc:197
+#: src/jack/jack-ng.cc:245
 msgid "Failed to connect to the JACK server; is it running?"
-msgstr ""
+msgstr "Gagal menyambung ke server JACK; apakah berjalan?"
 
-#: src/jack-ng/jack-ng.cc:273
+#: src/jack/jack-ng.cc:321
 #, c-format
 msgid ""
 "The JACK server requires a sample rate of %d Hz, but Audacious is playing at "
 "%d Hz. Please use the Sample Rate Converter effect to correct the mismatch."
 msgstr ""
+"Server JACK memerlukan tingkat sampel %d Hz, tapi Audacious memainkan pada "
+"%d Hz. Mohon gunakan efek konversi tingkat sampel untuk memperbaiki "
+"ketidakcocokan."
 
-#: src/ladspa/plugin.cc:414
+#: src/ladspa/plugin.cc:416
 #, c-format
 msgid "%s Settings"
 msgstr "%s Pengaturan"
 
-#: src/ladspa/plugin.cc:478
+#: src/ladspa/plugin.cc:482
 msgid "Module paths:"
 msgstr "Modul path:"
 
-#: src/ladspa/plugin.cc:483
+#: src/ladspa/plugin.cc:487
 msgid ""
 "Separate multiple paths with a colon.\n"
 "These paths are searched in addition to LADSPA_PATH.\n"
@@ -2157,39 +2391,41 @@
 "Setelah menambahkan path baru, tekan Enter untuk mengamati plugin baru.</"
 "small>"
 
-#: src/ladspa/plugin.cc:499
+#: src/ladspa/plugin.cc:508
 msgid "Available plugins:"
 msgstr "Pengaya tersedia:"
 
-#: src/ladspa/plugin.cc:512 src/modplug/plugin_main.cc:92
-#: src/modplug/plugin_main.cc:95 src/modplug/plugin_main.cc:98
-#: src/modplug/plugin_main.cc:101
+#: src/ladspa/plugin.cc:521 src/modplug/plugin_main.cc:91
+#: src/modplug/plugin_main.cc:94 src/modplug/plugin_main.cc:97
+#: src/modplug/plugin_main.cc:100
 msgid "Enable"
 msgstr "Gunakan"
 
-#: src/ladspa/plugin.cc:518
+#: src/ladspa/plugin.cc:527
 msgid "Enabled plugins:"
 msgstr "Pengaya digunakan:"
 
-#: src/ladspa/plugin.cc:534
+#: src/ladspa/plugin.cc:543
 msgid "Settings"
 msgstr "Pengaturan"
 
-#: src/ladspa/plugin.cc:551
+#: src/ladspa/plugin.cc:560
 msgid ""
 "LADSPA Host for Audacious\n"
 "Copyright 2011 John Lindgren"
 msgstr ""
+"Host LADSPA untuk Audacious\n"
+"Hak Cipta 2011 John Lindgren"
 
 #: src/ladspa/plugin.h:78
 msgid "LADSPA Host"
-msgstr ""
+msgstr "Host LADSPA"
 
 #: src/lirc/lirc.cc:55
 msgid "LIRC Plugin"
 msgstr "Pengaya LIRC"
 
-#: src/lirc/lirc.cc:381
+#: src/lirc/lirc.cc:379
 msgid ""
 "A simple plugin to control Audacious using the LIRC remote control daemon\n"
 "\n"
@@ -2204,82 +2440,157 @@
 "\n"
 "For more information about LIRC, see http://lirc.org."
 msgstr ""
+"Pengaya sederhana untuk mengontrol audacious menggunakan daemon pengendali "
+"jarak jauh LIRC\n"
+"\n"
+"Disesuaikan untuk Audacious oleh:\n"
+"Tony Vroon <chainsaw@gentoo.org>\n"
+"Joonas Harjumäki <jharjuma@gmail.com>\n"
+"\n"
+"Berdasarkan pengaya XMMS LIRC oleh:\n"
+"Carl van Schaik <carl@leg.uct.ac.za>\n"
+"Christoph Bartelmus <xmms@bartelmus.de>\n"
+"Andrew O. Shadoura <bugzilla@tut.by>\n"
+"\n"
+"Untuk informasi lanjut tentang LIRC, lihat http://lirc.org."
 
-#: src/lirc/lirc.cc:392
+#: src/lirc/lirc.cc:390
 msgid "Connection"
 msgstr "Sambungan"
 
-#: src/lirc/lirc.cc:393
+#: src/lirc/lirc.cc:391
 msgid "Reconnect to LIRC server"
 msgstr "Menyambung kembali ke server LIRC"
 
-#: src/lirc/lirc.cc:395
+#: src/lirc/lirc.cc:393
 msgid "Wait before reconnecting:"
 msgstr "Tunggu sebelum menyambung kembali:"
 
-#: src/lyricwiki/lyricwiki.cc:41
-msgid "LyricWiki Plugin"
-msgstr ""
-
-#: src/lyricwiki/lyricwiki.cc:131 src/lyricwiki-qt/lyricwiki.cc:136
-msgid "No lyrics available"
-msgstr "Tidak ada lirik tersedia"
-
-#: src/lyricwiki/lyricwiki.cc:217 src/lyricwiki/lyricwiki.cc:226
-#: src/lyricwiki/lyricwiki.cc:243 src/lyricwiki/lyricwiki.cc:252
-#: src/lyricwiki/lyricwiki.cc:267 src/lyricwiki-qt/lyricwiki.cc:222
-#: src/lyricwiki-qt/lyricwiki.cc:231 src/lyricwiki-qt/lyricwiki.cc:248
-#: src/lyricwiki-qt/lyricwiki.cc:257 src/lyricwiki-qt/lyricwiki.cc:272
-msgid "Error"
-msgstr "Kesalahan"
-
-#: src/lyricwiki/lyricwiki.cc:218 src/lyricwiki/lyricwiki.cc:244
-#: src/lyricwiki-qt/lyricwiki.cc:223 src/lyricwiki-qt/lyricwiki.cc:249
+#: src/lyrics-common/chart_lyrics_provider.cc:93
+#: src/lyrics-common/chart_lyrics_provider.cc:150
+#: src/lyrics-common/lyrics_ovh_provider.cc:50
 #, c-format
 msgid "Unable to fetch %s"
-msgstr ""
+msgstr "Tidak dapat mengambil %s"
 
-#: src/lyricwiki/lyricwiki.cc:227 src/lyricwiki/lyricwiki.cc:253
-#: src/lyricwiki-qt/lyricwiki.cc:232 src/lyricwiki-qt/lyricwiki.cc:258
+#: src/lyrics-common/chart_lyrics_provider.cc:100
+#: src/lyrics-common/chart_lyrics_provider.cc:157
+#: src/lyrics-common/lyrics_ovh_provider.cc:57
 #, c-format
 msgid "Unable to parse %s"
-msgstr ""
+msgstr "Tidak dapat menguraikan %s"
 
-#: src/lyricwiki/lyricwiki.cc:259 src/lyricwiki-qt/lyricwiki.cc:264
+#: src/lyrics-common/chart_lyrics_provider.cc:121
+#: src/lyrics-common/chart_lyrics_provider.cc:194
+#: src/lyrics-common/lyrics_ovh_provider.cc:88
 msgid "Looking for lyrics ..."
 msgstr "Mencari lirik ..."
 
-#: src/lyricwiki/lyricwiki.cc:267 src/lyricwiki-qt/lyricwiki.cc:272
-msgid "Missing song metadata"
+#: src/lyrics-common/preferences.h:43
+msgid "Nowhere"
+msgstr "Tidak kemana - mana"
+
+#: src/lyrics-common/preferences.h:49
+msgid "Artist is truncated at the start, Title -- at the end"
+msgstr "Artis terpotong di awal, Judul -- di akhir"
+
+#: src/lyrics-common/preferences.h:50
+msgid "Chars to truncate on:"
+msgstr "Karakter yang akan dipotong:"
+
+#: src/lyrics-common/preferences.h:54
+msgid "Chars are ORed in RegExp, surrounded by whitespace"
+msgstr ""
+"Karakternya adalah ORed di RegExp, dikelilingi oleh spasi putih</"
+"small>"
+
+#: src/lyrics-common/preferences.h:55
+msgid "Chars to split on:"
+msgstr "Karakter yang akan dipisah:"
+
+#: src/lyrics-common/preferences.h:56
+msgid "Further truncate those on chars"
+msgstr "Potong lebih lanjut yang ada di karakter"
+
+#: src/lyrics-common/preferences.h:62
+msgid "General"
+msgstr "Umum"
+
+#: src/lyrics-common/preferences.h:63
+msgid "Split title into artist and title on chars"
+msgstr "Pisahkan judul menjadi artis dan judul pada karakter"
+
+#: src/lyrics-common/preferences.h:66
+msgid "Sources"
 msgstr ""
 
-#: src/lyricwiki/lyricwiki.cc:278 src/lyricwiki-qt/lyricwiki.cc:283
-msgid "Connecting to lyrics.wikia.com ..."
-msgstr "Menyambungkan ke lyrics.wikia.com ..."
+#: src/lyrics-common/preferences.h:67
+msgid "Use embedded lyrics (from Lyrics tag)"
+msgstr ""
 
-#: src/lyricwiki-qt/lyricwiki.cc:55
-msgid "LyricWiki Plugin (Qt)"
+#: src/lyrics-common/preferences.h:69
+msgid "Fetch lyrics from internet:"
 msgstr ""
 
-#: src/m3u/m3u.cc:32
+#: src/lyrics-common/preferences.h:72
+msgid "Store fetched lyrics in local cache"
+msgstr "Simpan lirik yang diambil dari cache lokal"
+
+#: src/lyrics-common/preferences.h:74
+msgid "Local Storage"
+msgstr "Penyimpanan lokal"
+
+#: src/lyrics-common/preferences.h:75
+msgid "Load lyric files (.lrc) from local storage"
+msgstr "Muat file lirik (.lrc) dari penyimpanan lokal"
+
+#: src/lyrics-common/utils.cc:54 src/ui-common/dialogs-qt.cc:63
+msgid "Error"
+msgstr "Kesalahan"
+
+#: src/lyrics-common/utils.cc:60
+msgid "Lyrics could not be found."
+msgstr "Lirik tidak dapat ditemukan."
+
+#: src/lyrics-common/utils.cc:142
+msgid "Missing title and/or artist."
+msgstr "Judul dan/atau artis tidak ada."
+
+#: src/lyrics-gtk/lyrics-gtk.cc:37 src/lyrics-qt/lyrics-qt.cc:50
+msgid "Lyrics"
+msgstr "Lirik"
+
+#: src/lyrics-gtk/lyrics-gtk.cc:189 src/lyrics-qt/lyrics-qt.cc:171
+msgid "Edit Lyrics ..."
+msgstr ""
+
+#: src/lyrics-gtk/lyrics-gtk.cc:195 src/lyrics-qt/lyrics-qt.cc:178
+msgid "Save Locally"
+msgstr "Simpan Secara Lokal."
+
+#: src/lyrics-gtk/lyrics-gtk.cc:201 src/lyrics-qt/lyrics-qt.cc:186
+msgid "Refresh"
+msgstr "Segarkan"
+
+#: src/m3u/m3u.cc:33
 msgid "M3U Playlists"
 msgstr "Daftar Putar M3U"
 
 #: src/metronom/metronom.cc:44
 msgid "Tact Generator"
-msgstr ""
+msgstr "Generator Tact"
 
-#: src/metronom/metronom.cc:147
+#: src/metronom/metronom.cc:145
 #, c-format
 msgid "Tact generator: %d bpm"
 msgstr "Penghasil Tact: %d bpm"
 
-#: src/metronom/metronom.cc:149
+#: src/metronom/metronom.cc:147
 #, c-format
 msgid "Tact generator: %d bpm %d/%d"
 msgstr "Penghasil Tact: %d bpm %d%d"
 
-#: src/metronom/metronom.cc:237
+#: src/metronom/metronom.cc:235
 msgid ""
 "A Tact Generator by Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
 "\n"
@@ -2287,22 +2598,29 @@
 "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 ""
+"Generator Tact oleh Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
+"\n"
+"Untuk menggunakan, tambah URL: tact://beats*num/den\n"
+"e.g. tact://77 untuk memainkan 77 ketukan per menit\n"
+"or tact://60*3/4 untuk memainkan 60 ketukan di 3/4 tacts"
 
-#: src/mixer/mixer.cc:38
+#: src/mixer/mixer.cc:43
 msgid "Channel Mixer"
-msgstr ""
+msgstr "Pencampur Saluran"
 
-#: src/mixer/mixer.cc:202
+#: src/mixer/mixer.cc:255
 msgid ""
 "Channel Mixer Plugin for Audacious\n"
 "Copyright 2011-2012 John Lindgren and Michał Lipski"
 msgstr ""
+"Pengaya Pencampur Saluran untuk Audacious\n"
+"Hak Cipta 2011-2012 John Lindgren dan Michał Lipski"
 
-#: src/mixer/mixer.cc:206
+#: src/mixer/mixer.cc:259
 msgid "Channel Mixer"
-msgstr ""
+msgstr "Pencampur Saluran"
 
-#: src/mixer/mixer.cc:207
+#: src/mixer/mixer.cc:260
 msgid "Output channels:"
 msgstr "Keluaran kanal:"
 
@@ -2312,170 +2630,178 @@
 
 #: src/mms/mms.cc:82
 msgid "Error connecting to MMS server"
-msgstr ""
+msgstr "Kesalahan saat menyambung ke server MMS"
 
-#: src/modplug/modplugbmp.h:53
+#: src/modplug/modplugbmp.h:57
 msgid "ModPlug (Module Player)"
-msgstr ""
-
-#: src/modplug/plugin_main.cc:53
-msgid "Resolution"
-msgstr "Resolusi"
-
-#: src/modplug/plugin_main.cc:54
-msgid "8-bit"
-msgstr "8-bit"
+msgstr "ModPlug (Pemutar Modul)"
 
 #: src/modplug/plugin_main.cc:55
-msgid "16-bit"
-msgstr "16-bit"
-
-#: src/modplug/plugin_main.cc:56
 msgid "Channels"
 msgstr "Cennel"
 
-#: src/modplug/plugin_main.cc:60
+#: src/modplug/plugin_main.cc:59
 msgid "Nearest (fastest)"
-msgstr ""
+msgstr "Terdekat (tercepat)"
 
-#: src/modplug/plugin_main.cc:61
+#: src/modplug/plugin_main.cc:60
 msgid "Linear (fast)"
-msgstr ""
+msgstr "Linier (cepat)"
 
-#: src/modplug/plugin_main.cc:62
+#: src/modplug/plugin_main.cc:61
 msgid "Spline (good)"
-msgstr ""
+msgstr "Splin (baik)"
 
-#: src/modplug/plugin_main.cc:63
+#: src/modplug/plugin_main.cc:62
 msgid "Polyphase (best)"
-msgstr ""
+msgstr "Polifase (terbaik)"
 
-#: src/modplug/plugin_main.cc:64
+#: src/modplug/plugin_main.cc:63
 msgid "Sample rate"
-msgstr ""
+msgstr "Tingkat sampel"
 
-#: src/modplug/plugin_main.cc:65
+#: src/modplug/plugin_main.cc:64
 msgid "22 kHz"
-msgstr ""
+msgstr "22 kHz"
 
-#: src/modplug/plugin_main.cc:66
+#: src/modplug/plugin_main.cc:65
 msgid "44 kHz"
-msgstr ""
+msgstr "44 kHz"
 
-#: src/modplug/plugin_main.cc:67
+#: src/modplug/plugin_main.cc:66
 msgid "48 kHz"
-msgstr ""
+msgstr "48 kHz"
 
-#: src/modplug/plugin_main.cc:68
+#: src/modplug/plugin_main.cc:67
 msgid "96 kHz"
-msgstr ""
+msgstr "96 kHz"
 
-#: src/modplug/plugin_main.cc:72 src/modplug/plugin_main.cc:77
-#: src/modplug/plugin_main.cc:82
+#: src/modplug/plugin_main.cc:71 src/modplug/plugin_main.cc:76
+#: src/modplug/plugin_main.cc:81
 msgid "Level:"
-msgstr ""
+msgstr "Tingkat:"
 
-#: src/modplug/plugin_main.cc:78
+#: src/modplug/plugin_main.cc:77
 msgid "Cutoff:"
-msgstr ""
+msgstr "Memotong:"
 
-#: src/modplug/plugin_main.cc:91
+#: src/modplug/plugin_main.cc:90
 msgid "Reverb"
-msgstr ""
+msgstr "Berkumandang"
 
-#: src/modplug/plugin_main.cc:94
+#: src/modplug/plugin_main.cc:93
 msgid "Bass Boost"
-msgstr ""
+msgstr "Peningkatan Bass"
 
-#: src/modplug/plugin_main.cc:97
+#: src/modplug/plugin_main.cc:96
 msgid "Surround"
-msgstr ""
+msgstr "Mengelilingi"
 
-#: src/modplug/plugin_main.cc:100
+#: src/modplug/plugin_main.cc:99
 msgid "Preamp"
-msgstr ""
+msgstr "Preamp"
 
-#: src/modplug/plugin_main.cc:107
+#: src/modplug/plugin_main.cc:106
 msgid "Oversample"
-msgstr ""
+msgstr "Sampel berlebih"
 
-#: src/modplug/plugin_main.cc:108
+#: src/modplug/plugin_main.cc:107
 msgid "Noise reduction"
-msgstr ""
+msgstr "Pengurangan kebisingan"
 
-#: src/modplug/plugin_main.cc:109
+#: src/modplug/plugin_main.cc:108
 msgid "Play Amiga MODs"
-msgstr ""
+msgstr "Mainkan MODs Amiga"
 
-#: src/modplug/plugin_main.cc:110
+#: src/modplug/plugin_main.cc:109
 msgid "Repeat"
-msgstr ""
+msgstr "Ulang"
 
-#: src/modplug/plugin_main.cc:111
+#: src/modplug/plugin_main.cc:110
 msgid "Repeat count:"
-msgstr ""
+msgstr "Jumlah pengulangan:"
 
-#: src/modplug/plugin_main.cc:112
+#: src/modplug/plugin_main.cc:111
 msgid "To repeat forever, set the repeat count to -1."
-msgstr ""
+msgstr "Untuk mengulang selamanya, setel hitungan pengulangan ke -1."
 
-#: src/modplug/plugin_main.cc:125 src/sid/xs_config.cc:106
+#: src/modplug/plugin_main.cc:124 src/sid/xs_config.cc:106
 msgid "These settings will take effect when Audacious is restarted."
-msgstr ""
+msgstr "Pengaturan ini akan berlaku saat Audacious dimulai ulang."
+
+#: src/moonstone/main_window.cc:72 src/moonstone/main_window.cc:73
+#: src/qtui/main_window.cc:159 src/qtui/main_window.cc:160
+#: src/skins/menus.cc:107 src/skins-qt/menus.cc:98
+msgid "Stop After This Song"
+msgstr "Stop Setelah Lagu Ini"
+
+#: src/moonstone/moonstone.cc:39
+msgid "Moonstone"
+msgstr "Moonstone"
+
+#: src/moonstone/playlist_header.cc:212 src/qtui/playlist_header.cc:258
+msgid "Reset to Defaults"
+msgstr "Setel ulang ke Bawaan"
+
+#: src/moonstone/playlist_model.cc:38 src/qtui/playlist_header.cc:232
+msgid "Now Playing"
+msgstr "Sedang Diputar"
+
+#: src/moonstone/playlist_selection.cc:66
+#: src/playlist-manager/playlist-manager.cc:201
+#: src/playlist-manager-qt/playlist-manager-qt.cc:190
+msgid "Entries"
+msgstr "Masukan"
 
 #: src/mpg123/mpg123.cc:54
 msgid "MPG123 Plugin"
 msgstr "Pengaya MPG123"
 
-#: src/mpg123/mpg123.cc:83
-msgid "Advanced"
-msgstr ""
-
-#: src/mpg123/mpg123.cc:84
+#: src/mpg123/mpg123.cc:82
 msgid "Use accurate length calculation (slow)"
-msgstr ""
+msgstr "Gunakan perhitungan panjang yang akurat (lambat)"
 
-#: src/mpg123/mpg123.cc:248
+#: src/mpg123/mpg123.cc:260
 msgid "Surround"
 msgstr "Surround"
 
-#: src/mpris2/plugin.cc:39
+#: src/mpris2/plugin.cc:40
 msgid "MPRIS 2 Server"
 msgstr "Server MPRIS 2"
 
-#: src/neon/neon.cc:97
+#: src/neon/neon.cc:102
 msgid "Neon HTTP/HTTPS Plugin"
 msgstr "Pengaya Neon HTTP/HTTPS"
 
-#: src/neon/neon.cc:521
+#: src/neon/neon.cc:526
 msgid "Error parsing redirect"
-msgstr ""
+msgstr "Kesalahan penguraian pengalihan"
 
-#: src/neon/neon.cc:535
+#: src/neon/neon.cc:540
 msgid "Unknown HTTP error"
-msgstr ""
+msgstr "Kesalahan HTTP tidak diketahui"
 
-#: src/neon/neon.cc:569
+#: src/neon/neon.cc:614
 msgid "Error parsing URL"
-msgstr ""
+msgstr "Kesalahan saat menguraikan URL"
 
-#: src/neon/neon.cc:632
+#: src/neon/neon.cc:687
 msgid "Too many redirects"
-msgstr ""
+msgstr "Terlalu banyak pengalihan"
 
-#: src/notify/event.cc:64
+#: src/notify/event.cc:97
 msgid "Stopped"
 msgstr "Berhenti"
 
-#: src/notify/event.cc:64
+#: src/notify/event.cc:97
 msgid "Audacious is not playing."
 msgstr "Audacious berhenti"
 
-#: src/notify/notify.cc:42
+#: src/notify/notify.cc:39
 msgid "Desktop Notifications"
 msgstr "Pemberitahuan Destop"
 
-#: src/notify/notify.cc:60
+#: src/notify/notify.cc:57
 msgid ""
 "Desktop Notifications Plugin for Audacious\n"
 "Copyright (C) 2010 Maximilian Bogner\n"
@@ -2494,65 +2820,124 @@
 "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 ""
+"Pengaya Pemberitahuan Desktop Untuk Audacious\n"
+"Hak Cipta (C) 2010 Maximilian Bogner\n"
+"Hak Cipta (C) 2011-2013 John Lindgren dan Jean-Alexandre Anglès d'Auriac\n"
+"\n"
+"Plugin ini adalah perangkat lunak gratis: Anda dapat mendistribusikannya "
+"kembali dan/atau memodifikasinya di bawah ketentuan Lisensi Publik Umum GNU "
+"yang diterbitkan oleh Free Software Foundation, baik versi 3 dari Lisensi, "
+"atau (sesuai pilihan Anda) versi yang lebih baru.\n"
+"\n"
+"Plugin ini disebarluaskan dengan harapan dapat bermanfaat, tapi TANPA "
+"JAMINAN APAPUN; bahkan tanpa jaminan tersirat tentang KELAYAKAN "
+"DIPERDAGANGKAN atau KESESUAIAN UNTUK TUJUAN TERTENTU. Lihat Lisensi Publik "
+"Umum GNU untuk keterangan lebih lanjut.\n"
+"\n"
+"Anda seharusnya telah menerima salinan Lisensi Publik Umum GNU bersama "
+"dengan program ini. Jika tidak, lihat <http://www.gnu.org/licenses/>. "
 
-#: src/notify/notify.cc:110
+#: src/notify/notify.cc:104
 msgid "Show playback controls"
-msgstr ""
+msgstr "Tampilkan kontrol pemutaran"
 
-#: src/notify/notify.cc:112
+#: src/notify/notify.cc:106
 msgid "Always show notification"
-msgstr ""
+msgstr "Selalu tampilkan notifikasi"
 
-#: src/notify/notify.cc:114
+#: src/notify/notify.cc:108
 msgid "Include album name in notification"
-msgstr ""
+msgstr "Sertakan nama album di notifikasi"
+
+#: src/notify/notify.cc:110
+msgid "Custom notification duration:"
+msgstr "Durasi pemberitahuan khusus:"
 
-#: src/notify/osd.cc:58
+#: src/notify/osd.cc:74
 msgid "Show"
+msgstr "Tunjukkan"
+
+#: src/openmpt/mpt.cc:50
+msgid "OpenMPT (Module Player)"
+msgstr "OpenMPT (Pemutar Modul)"
+
+#: src/openmpt/mpt.cc:132
+msgid ""
+"Module player based on libopenmpt\n"
+"\n"
+"Written by: Chris Spiegel <cspiegel@gmail.com>"
 msgstr ""
+"Pemutar modul berdasarkan libopenmpt\n"
+"\n"
+"Ditulis oleh: Chris Spiegel <cspiegel@gmail.com>"
 
-#: src/notify/osd.cc:66 src/qtui/main_window.cc:178
-#: src/qtui/main_window.cc:179 src/skins/menus.cc:88
-msgid "Pause"
-msgstr "Istirahat"
+#: src/openmpt/mpt.cc:151
+msgid "Stereo separation:"
+msgstr "Pemisahan stereo:"
 
-#: src/notify/osd.cc:73 src/qtui/main_window.cc:72 src/skins/menus.cc:91
-msgid "Next"
-msgstr "Selanjutnya"
+#: src/openmpt/mpt.cc:153
+msgid "% (0=mono, 100=default, 200=full)"
+msgstr ""
+
+#: src/openmpt/mpt.cc:157
+msgid "Interpolation:"
+msgstr "Interpolasi:"
+
+#: src/openmpt/mptwrap.h:51 src/soxr/sox-resampler.cc:189 src/xsf/plugin.cc:437
+msgid "Linear"
+msgstr "Linier"
+
+#: src/openmpt/mptwrap.h:52
+msgid "Cubic"
+msgstr "Kubik"
+
+#: src/openmpt/mptwrap.h:53
+msgid "Windowed sinc"
+msgstr "Berjendela sinc"
+
+#: src/opus/opus.cc:39
+msgid "Opus Decoder"
+msgstr ""
+
+#: src/opus/opus.cc:336
+msgid ""
+"Opus Decoder Plugin for Audacious\n"
+"Copyright 2022 Thomas Lange"
+msgstr ""
 
-#: src/oss4/oss.h:93
+#: src/oss4/oss.h:70
 msgid "OSS4 Output"
 msgstr "Keluaran OSS4"
 
-#: src/oss4/oss.h:95
+#: src/oss4/oss.h:72
 msgid "OSS3 Output"
-msgstr ""
+msgstr "Keluaran OSS3"
 
 #: src/oss4/plugin.cc:35
 msgid "Default device"
-msgstr ""
+msgstr "Perangkat bawaan"
 
-#: src/oss4/plugin.cc:77
+#: src/oss4/plugin.cc:78
 msgid "Audio device:"
 msgstr "Perangkat suara:"
 
-#: src/oss4/plugin.cc:80
+#: src/oss4/plugin.cc:81
 msgid "Use alternate device:"
 msgstr "Gunakan alat alternatif"
 
-#: src/oss4/plugin.cc:84
+#: src/oss4/plugin.cc:85
 msgid "Save volume between sessions."
-msgstr ""
+msgstr "Simpan volume antar sesi."
 
-#: src/oss4/plugin.cc:86
+#: src/oss4/plugin.cc:87
 msgid "Enable format conversions made by the OSS software."
 msgstr "Izinkan pembuatan konversi format oleh perangkat lunak OSS"
 
-#: src/oss4/plugin.cc:88
+#: src/oss4/plugin.cc:89
 msgid "Enable exclusive mode to prevent virtual mixing."
-msgstr ""
+msgstr "Aktifkan mode eksklusif untuk mencegah pencampuran virtual."
 
-#: src/oss4/plugin.cc:100
+#: src/oss4/plugin.cc:101
 msgid ""
 "OSS4 Output Plugin for Audacious\n"
 "Copyright 2010-2012 Michał Lipski\n"
@@ -2560,60 +2945,112 @@
 "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 ""
+"Pengaya Keluaran OSS4 untuk Audacious\n"
+"Hak Cipta 2010-2012 Michał Lipski\n"
+"\n"
+"Saya ingin mengucapkan terima kasih kepada orang-orang di #audacious, "
+"terutama Tony Vroon dan John Lindgren dan tentu saja penulis plugin OSS "
+"sebelumnya."
 
-#: src/playlist-manager/playlist-manager.cc:37
-msgid "Playlist Manager"
+#: src/pipewire/pipewire.cc:44
+msgid "PipeWire Output"
 msgstr ""
 
-#: src/playlist-manager/playlist-manager.cc:226
-msgid "Entries"
+#: src/pipewire/pipewire.cc:118
+msgid ""
+"PipeWire Output Plugin for Audacious\n"
+"Copyright 2022 Thomas Lange\n"
+"\n"
+"Based on the PipeWire Output Plugin for Qmmp\n"
+"Copyright 2021 Ilya Kotov"
 msgstr ""
 
-#: src/playlist-manager/playlist-manager.cc:245
+#: src/pipewire/pipewire.cc:408 src/skins/menus.cc:88 src/skins-qt/menus.cc:79
+msgid "Playback"
+msgstr "Putar Lagu"
+
+#: src/playlist-manager/playlist-manager.cc:38
+#: src/playlist-manager-qt/playlist-manager-qt.cc:42
+msgid "Playlist Manager"
+msgstr "Manajer Daftar Main"
+
+#: src/playlist-manager/playlist-manager.cc:221
+#: src/playlist-manager-qt/playlist-manager-qt.cc:356
 msgid "_Remove"
-msgstr ""
+msgstr "_Hapus"
 
-#: src/playlist-manager/playlist-manager.cc:246
+#: src/playlist-manager/playlist-manager.cc:222
+#: src/playlist-manager-qt/playlist-manager-qt.cc:351
 msgid "Ren_ame"
-msgstr ""
+msgstr "Ganti N_ama"
 
 #: src/pls/pls.cc:35
 msgid "PLS Playlists"
-msgstr ""
+msgstr "Daftar Putar PLS"
 
-#: src/psf/plugin.cc:45
+#: src/psf/plugin.cc:53
 msgid "OpenPSF PSF1/PSF2 Decoder"
-msgstr ""
+msgstr "OpenPSF PSF1/PSF2 Decoder"
 
-#: src/pulse_audio/pulse_audio.cc:38
+#: src/psf/plugin.cc:270
+msgid "OpenPSF Configuration"
+msgstr "Konfigurasi OpenPSF"
+
+#: src/psf/plugin.cc:271 src/xsf/plugin.cc:444
+msgid "Ignore length from file"
+msgstr "Abaikan panjang dari berkas"
+
+#: src/pulse/pulse_audio.cc:42
 msgid "PulseAudio Output"
-msgstr ""
+msgstr "Keluaran PulseAudio"
 
-#: src/pulse_audio/pulse_audio.cc:611
+#: src/pulse/pulse_audio.cc:84
+msgid "Context name:"
+msgstr "Nama konteks:"
+
+#: src/pulse/pulse_audio.cc:86
+msgid "Stream name:"
+msgstr "Nama aliran:"
+
+#: src/pulse/pulse_audio.cc:596
 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."
+"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 ""
+"Pengaya Audacious Keluaran PulseAudio\n"
+"\n"
+"Program ini adalah perangkat lunak gratis; Anda dapat mendistribusikan ulang "
+"dan/atau memodifikasinya di bawah ketentuan Lisensi Publik Umum GNU yang "
+"diterbitkan oleh Free Software Foundation; baik versi 2 dari Lisensi, atau "
+"(sesuai pilihan Anda) versi yang lebih baru.\n"
+"\n"
+"Program ini disebarluaskan dengan harapan dapat bermanfaat, namun TANPA "
+"JAMINAN APAPUN; bahkan tanpa jaminan tersirat tentang KELAYAKAN "
+"DIPERDAGANGKAN atau KESESUAIAN UNTUK TUJUAN TERTENTU. Lihat Lisensi Publik "
+"Umum GNU untuk info lebih lanjut.\n"
+"\n"
+"Anda seharusnya telah menerima salinan GNU General Public License bersama "
+"dengan program ini; jika tidak, kirim surat ke Free Software Foundation, "
+"Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 
-#: src/qtaudio/qtaudio.cc:49
+#: src/qtaudio/qtaudio.cc:53
 msgid "QtMultimedia Output"
-msgstr ""
+msgstr "Keluaran QtMultimedia"
 
-#: src/qtaudio/qtaudio.cc:77
+#: src/qtaudio/qtaudio.cc:84
 msgid ""
 "QtMultimedia Audio Output Plugin for Audacious\n"
 "Copyright 2014 William Pitcock\n"
@@ -2621,100 +3058,165 @@
 "Based on SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
 msgstr ""
+"Pengaya Keluaran QtMultimedia Audio untuk Audacious\n"
+"Hak Cipta 2014 William Pitcock\n"
+"\n"
+"Berdasarkan Pengaya Keluaran SDL untuk Audacious\n"
+"Hak Cipta 2010 John Lindgren"
 
-#: src/qtui/dialog_windows.cc:31
-msgid "Working ..."
+#: src/qtglspectrum/gl-spectrum.cc:41
+msgid ""
+"OpenGL Spectrum Analyzer for Audacious\n"
+"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
+"Copyright 2014, 2020 Ariadne Conill\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 untuk Audacious\n"
+"Hak Cipta 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
+"Hak Cipta 2014, 2020 Ariadne Conill\n"
+"\n"
+"Berdasarkan Pengaya XMMS:\n"
+"Hak Cipta 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson, and "
+"4Front Technologies\n"
+"\n"
+"Lisensi: GPLv2+"
 
-#: src/qtui/filter_input.cc:44 src/skins/ui_playlist.cc:221
-msgid "Search"
-msgstr "Cari"
+#: src/qthotkey/gui.cc:177
+msgid "Press a key combination inside a text field."
+msgstr "Tekan kombinasi tombol di dalam bidang teks."
 
-#: src/qtui/main_window_actions.cc:94
-msgid "_Open Folder ..."
+#: src/qthotkey/plugin.cc:105
+msgid ""
+"Global Hotkey Plugin\n"
+"Control the player with global key combinations or multimedia keys.\n"
+"\n"
+"Copyright (C) 2020 i.Dark_Templar <darktemplar@dark-templar-archives.net>\n"
+"Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n"
+"\n"
+"Contributors 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 ""
+"Pengaya Hotkey Global\n"
+"Kontrol pemutar dengan kombinasi tombol global atau tombol multimedia.\n"
+"\n"
+"Hak Cipta (C) 2020 i.Dark_Templar <darktemplar@dark-templar-archives.net>\n"
+"Hak Cipta (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n"
+"\n"
+"Kontributor termasuk:\n"
+"Hak Cipta (C) 2006-2007 Vladimir Paskov <vlado.paskov@gmail.com>\n"
+"Hak Cipta (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/qtui/menus.cc:109
+msgid "_Open Folder ..."
+msgstr "_Buka Folder ..."
 
-#: src/qtui/main_window_actions.cc:96
+#: src/qtui/menus.cc:115
 msgid "_Add Folder ..."
-msgstr ""
+msgstr "_Tambah Folder ..."
 
-#: src/qtui/main_window_actions.cc:101
+#: src/qtui/menus.cc:128
 msgid "_Log Inspector ..."
-msgstr ""
+msgstr "_Pemantau log ..."
 
-#: src/qtui/main_window.cc:64
-msgid "Open Files"
-msgstr ""
+#: src/qtui/menus.cc:220
+msgid "_Find ..."
+msgstr "_Cari ..."
 
-#: src/qtui/main_window.cc:66
-msgid "Add Files"
-msgstr ""
+#: src/qtui/menus.cc:256 src/skins/menus.cc:80 src/skins-qt/menus.cc:70
+msgid "Audio Settings ..."
+msgstr "Pengaturan Audio ..."
 
-#: src/qtui/main_window.cc:71 src/skins/menus.cc:90
-msgid "Previous"
-msgstr "Sebelumnya"
+#: src/qtui/playlist_model.cc:188
+msgid "Q#"
+msgstr "Q#"
 
-#: src/qtui/main_window.cc:77 src/skins/menus.cc:82
-msgid "Repeat"
-msgstr "Ulang"
+#: src/qtui/playlist_model.cc:190
+msgid "T#"
+msgstr "T#"
 
-#: src/qtui/main_window.cc:79 src/skins/menus.cc:83
-msgid "Shuffle"
-msgstr "Acak"
+#: src/qtui/playlist_model.cc:192
+msgid "C#"
+msgstr ""
 
-#: src/qtui/qtui.cc:42
-msgid "Qt Interface"
+#: src/qtui/playlist_model.cc:194
+msgid "D#"
 msgstr ""
 
+#: src/qtui/qtui.cc:40
+msgid "Qt Interface"
+msgstr "Tampilan Qt"
+
+#: src/qtui/search_bar.cc:46
+msgid "Search playlist"
+msgstr "Cari daftar lagu"
+
+#: src/qtui/settings.cc:79
+msgid "Use bold font for column headers"
+msgstr "Gunakan font tebal untuk judul kolom"
+
 #: src/resample/resample.cc:43
 msgid "Sample Rate Converter"
-msgstr ""
+msgstr "Konverter Tingkat Sampel"
 
 #: src/resample/resample.cc:183
 msgid ""
 "Sample Rate Converter Plugin for Audacious\n"
 "Copyright 2010-2012 John Lindgren"
 msgstr ""
+"Pengaya Konverter Tingkat Sampel untuk Audacious\n"
+"Hak Cipta 2010-2012 John Lindgren"
 
 #: src/resample/resample.cc:187
 msgid "Skip/repeat samples"
-msgstr ""
+msgstr "Lewati/ulangi sampel"
 
 #: src/resample/resample.cc:188
 msgid "Linear interpolation"
-msgstr ""
+msgstr "Interpolasi linier"
 
 #: src/resample/resample.cc:189
 msgid "Fast sinc interpolation"
-msgstr ""
+msgstr "Interpolasi sinc cepat"
 
 #: src/resample/resample.cc:190
 msgid "Medium sinc interpolation"
-msgstr ""
+msgstr "Interpolasi sinkronisasi menengah"
 
 #: src/resample/resample.cc:191
 msgid "Best sinc interpolation"
-msgstr ""
+msgstr "Interpolasi sinkronisasi terbaik"
 
 #: src/resample/resample.cc:195
 msgid "Conversion"
-msgstr ""
+msgstr "Konversi"
 
 #: src/resample/resample.cc:196
 msgid "Method:"
 msgstr "Metode"
 
-#: src/resample/resample.cc:199 src/sox-resampler/sox-resampler.cc:161
+#: src/resample/resample.cc:199 src/soxr/sox-resampler.cc:203
 msgid "Rate:"
-msgstr ""
+msgstr "Kecepatan:"
 
 #: src/resample/resample.cc:202
 msgid "Rate Mappings"
-msgstr ""
+msgstr "Pemetaan Kecepatan"
 
 #: src/resample/resample.cc:203
 msgid "Use rate mappings"
-msgstr ""
+msgstr "Gunakan pemetaan kecepatan"
 
 #: src/resample/resample.cc:205
 msgid "8 kHz:"
@@ -2756,972 +3258,920 @@
 msgid "192 kHz:"
 msgstr "192 kHz:"
 
-#: src/scrobbler2/config_window.cc:41
-#, c-format
-msgid "OK. Scrobbling for user: %s"
-msgstr ""
+#: src/scrobbler2/config_window.cc:29
+msgid "Checking Last.fm access ..."
+msgstr "Memeriksa akses Last.fm ..."
 
-#: src/scrobbler2/config_window.cc:54
-msgid "Permission Denied"
-msgstr ""
-
-#: src/scrobbler2/config_window.cc:56
-msgid "Access the following link to allow Audacious to scrobble your plays:"
-msgstr ""
-
-#: src/scrobbler2/config_window.cc:66
-msgid "Keep this window open and click 'Check Permission' again.\n"
-msgstr ""
-
-#: src/scrobbler2/config_window.cc:69 src/scrobbler2/config_window.cc:80
+#: src/scrobbler2/config_window.cc:35
 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."
+"Your scrobbles are being saved on your computer temporarily. They will be "
+"submitted as soon as Audacious is allowed access."
 msgstr ""
+"Scrobble Anda sedang disimpan di komputer Anda untuk sementara. Mereka akan "
+"dikirimkan setelah Audacious diizinkan akses."
 
-#: src/scrobbler2/config_window.cc:77
-msgid "Network Problem."
-msgstr ""
+#: src/scrobbler2/config_window.cc:41
+#, c-format
+msgid "Permission granted. Scrobbling for user %s."
+msgstr "Izin diberikan. Scrobbling untuk pengguna %s."
 
-#: src/scrobbler2/config_window.cc:78
-msgid "There was a problem contacting Last.fm. Please try again later."
+#: src/scrobbler2/config_window.cc:44
+msgid ""
+"Permission denied. Open the following URL in a browser, allow Audacious "
+"access to your account, and then click 'Check Permission' again:"
 msgstr ""
+"Izin ditolak. Buka URL berikut di peramban, izinkan Audacious untuk "
+"mengakses akun Anda, lalu klik 'Periksa Izin' lagi:"
 
-#: src/scrobbler2/config_window.cc:110
-msgid "Checking..."
-msgstr ""
+#: src/scrobbler2/config_window.cc:53
+msgid "There was a problem contacting Last.fm."
+msgstr "Terjadi masalah saat menghubungi Last.fm."
 
-#: src/scrobbler2/config_window.cc:176
-msgid "C_heck Permission"
-msgstr ""
+#: src/scrobbler2/config_window.cc:92
+msgid "Check Permission"
+msgstr "Cek Izin"
 
-#: src/scrobbler2/config_window.cc:177
-msgid "_Revoke Permission"
-msgstr ""
+#: src/scrobbler2/config_window.cc:93
+msgid "Revoke Permission"
+msgstr "Cabut Izin"
 
-#: src/scrobbler2/config_window.cc:220
-msgid ""
-"You need to allow Audacious to scrobble tracks to your Last.fm account.\n"
+#: src/scrobbler2/config_window.cc:97
+msgid "You need to allow Audacious to scrobble tracks to your Last.fm account."
 msgstr ""
+"Anda harus mengizinkan Audacious untuk mengscrobble trek ke akun Last.fm "
+"Anda."
 
 #: src/scrobbler2/scrobbler.cc:29
 msgid "Scrobbler 2.0"
 msgstr "Scrobbler 2.0"
 
-#: src/scrobbler2/scrobbler.cc:224
+#: src/scrobbler2/scrobbler.cc:200
 msgid ""
 "The Scrobbler plugin could not be started.\n"
 "There might be a problem with your installation."
 msgstr ""
+"Pengaya Scrobbler tidak dapat dimulai.\n"
+"Mungkin ada masalah dengan instalasi Anda."
 
-#: src/scrobbler2/scrobbler.cc:289
+#: src/scrobbler2/scrobbler.cc:245
 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"
+"project."
 msgstr ""
 
-#: src/scrobbler2/scrobbler_communication.cc:642
-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/sdlout.cc:48
+#: src/sdlout/sdlout.cc:43
 msgid "SDL Output"
-msgstr ""
+msgstr "Keluaran SDL"
 
-#: src/sdlout/sdlout.cc:77
+#: src/sdlout/sdlout.cc:72
 msgid ""
 "SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
 msgstr ""
+"Pengaya Keluaran SDL untuk Audacious\n"
+"Hak Cipta 2010 John Lindgren"
 
-#: src/search-tool/search-tool.cc:116 src/search-tool/search-tool.cc:124
+#: src/search-tool/library.cc:35 src/search-tool/library.cc:46
+#: src/search-tool-qt/library.cc:35 src/search-tool-qt/library.cc:46
 msgid "Library"
 msgstr "Pustaka"
 
-#: src/search-tool/search-tool.cc:394
-#, c-format
-msgid "%d result"
-msgid_plural "%d results"
-msgstr0 ""
-
-#: src/search-tool/search-tool.cc:400
-#, c-format
-msgid "(%d hidden)"
-msgid_plural "(%d hidden)"
-msgstr0 ""
-
-#: src/search-tool/search-tool.cc:594
+#: src/search-tool-qt/search-model.cc:44 src/search-tool/search-tool.cc:287
 #, c-format
 msgid "%d song"
 msgid_plural "%d songs"
-msgstr0 ""
+msgstr0 "%d lagu"
 
-#: src/search-tool/search-tool.cc:601
+#: src/search-tool-qt/search-model.cc:53 src/search-tool/search-tool.cc:294
 msgid "of this genre"
-msgstr ""
+msgstr "dari aliran ini"
 
-#: src/search-tool/search-tool.cc:607
+#: src/search-tool-qt/search-model.h:47 src/search-tool/search-model.h:45
 msgid "on"
-msgstr ""
+msgstr "di"
 
-#: src/search-tool/search-tool.cc:607
+#: src/search-tool-qt/search-model.h:47 src/search-tool/search-model.h:45
 msgid "by"
-msgstr ""
+msgstr "oleh"
 
-#: src/search-tool/search-tool.cc:643
-msgid "_Create Playlist"
-msgstr "_Buat Daftar Putar"
+#: src/search-tool-qt/search-tool-qt.cc:165 src/search-tool/search-tool.cc:74
+msgid "Number of results to show:"
+msgstr "Jumlah hasil untuk ditampilkan:"
 
-#: src/search-tool/search-tool.cc:645
-msgid "_Add to Playlist"
-msgstr "_Tambah ke Daftar Putar"
+#: src/search-tool-qt/search-tool-qt.cc:168 src/search-tool/search-tool.cc:77
+msgid "Rescan library at startup"
+msgstr "Pindai ulang pustaka saat aplikasi dimulai"
 
-#: src/search-tool/search-tool.cc:684
-msgid "Search library"
-msgstr "Cari pustaka"
+#: src/search-tool-qt/search-tool-qt.cc:170
+msgid "Monitor library for changes"
+msgstr "Pantau pustaka untuk perubahan"
 
-#: src/search-tool/search-tool.cc:688
+#: src/search-tool-qt/search-tool-qt.cc:193 src/search-tool/search-tool.cc:450
 msgid ""
 "To import your music library into Audacious, choose a folder and then click "
 "the \"refresh\" icon."
 msgstr ""
+"Untuk mengimpor pusaka musik Anda ke Audacious, pilih folder, lalu klik ikon "
+"\"segarkan\"."
 
-#: src/search-tool/search-tool.cc:696
+#: src/search-tool-qt/search-tool-qt.cc:195 src/search-tool/search-tool.cc:459
 msgid "Please wait ..."
 msgstr "Mohon tunggu ..."
 
-#: src/search-tool/search-tool.cc:723
+#: src/search-tool-qt/search-tool-qt.cc:197 src/search-tool/search-tool.cc:487
 msgid "Choose Folder"
 msgstr "Pilih Folder"
 
+#: src/search-tool-qt/search-tool-qt.cc:201 src/search-tool/search-tool.cc:445
+msgid "Search library"
+msgstr "Cari pustaka"
+
+#: src/search-tool-qt/search-tool-qt.cc:327 src/search-tool/search-tool.cc:156
+#, c-format
+msgid "%d of %d result shown"
+msgid_plural "%d of %d results shown"
+msgstr0 "%d dari %d hasil ditampilkan"
+
+#: src/search-tool-qt/search-tool-qt.cc:331 src/search-tool/search-tool.cc:160
+#, c-format
+msgid "%d result"
+msgid_plural "%d results"
+msgstr0 "%d hasil"
+
+#: src/search-tool-qt/search-tool-qt.cc:501 src/search-tool/search-tool.cc:341
+msgid "_Create Playlist"
+msgstr "_Buat Daftar Putar"
+
+#: src/search-tool-qt/search-tool-qt.cc:503 src/search-tool/search-tool.cc:343
+msgid "_Add to Playlist"
+msgstr "_Tambah ke Daftar Putar"
+
 #: src/sid/xmms-sid.cc:43
 msgid "SID Player"
-msgstr ""
-
-#: src/sid/xs_config.cc:61
-msgid "Output"
-msgstr ""
+msgstr "Pemutar SID"
 
 #: src/sid/xs_config.cc:62
 msgid "Channels:"
-msgstr ""
+msgstr "Saluran:"
 
 #: src/sid/xs_config.cc:68
 msgid "Emulation"
-msgstr ""
+msgstr "Emulasi"
 
 #: src/sid/xs_config.cc:69
 msgid "Emulate MOS 8580 (default: MOS 6581)"
-msgstr ""
+msgstr "Emulasi MOS 8580 (bawaan: MOS 6581)"
 
 #: src/sid/xs_config.cc:71
 msgid "Do not automatically select chip model"
-msgstr ""
+msgstr "Jangan pilih model chip secara otomatis"
 
 #: src/sid/xs_config.cc:73
 msgid "Emulate filter"
-msgstr ""
+msgstr "Emulasi filter"
 
 #: src/sid/xs_config.cc:75
 msgid "Clock speed:"
-msgstr ""
+msgstr "Kecepatan jam:"
 
 #: src/sid/xs_config.cc:78
 msgid "Do not automatically select clock speed"
-msgstr ""
+msgstr "Jangan pilih kecepatan jam secara otomatis"
 
 #: src/sid/xs_config.cc:80
 msgid "Playback time"
-msgstr ""
+msgstr "Waktu Pemutaran"
 
 #: src/sid/xs_config.cc:81
 msgid "Set maximum playback time:"
-msgstr ""
+msgstr "Setel waktu pemutaran maksimum:"
 
 #: src/sid/xs_config.cc:87
 msgid "Use only when song length is unknown"
-msgstr ""
+msgstr "Gunakan hanya ketika panjang lagu tidak diketahui"
 
 #: src/sid/xs_config.cc:90
 msgid "Set minimum playback time:"
-msgstr ""
+msgstr "Setel waktu pemutaran minimum:"
 
 #: src/sid/xs_config.cc:96
 msgid "Subtunes"
-msgstr ""
+msgstr "Subtunes"
 
 #: src/sid/xs_config.cc:97
 msgid "Enable subtunes"
-msgstr ""
+msgstr "Aktifkan subtunes"
 
 #: src/sid/xs_config.cc:99
 msgid "Ignore subtunes shorter than:"
-msgstr ""
+msgstr "Abaikan subtunes yang lebih pendek dari:"
 
 #: src/sid/xs_config.cc:105
 msgid "Note"
-msgstr ""
+msgstr "Catatan"
 
 #: src/silence-removal/silence-removal.cc:39
 msgid "Silence Removal"
-msgstr ""
+msgstr "Penghapusan Keheningan"
 
 #: src/silence-removal/silence-removal.cc:58
 msgid ""
 "Silence Removal Plugin for Audacious\n"
 "Copyright 2014 John Lindgren"
 msgstr ""
+"Pengaya Penghapusan Keheningan untuk Audacious\n"
+"Hak Cipta 2014 John Lindgren"
 
 #: src/silence-removal/silence-removal.cc:67
 msgid "Silence Removal"
-msgstr ""
+msgstr "Penghapusan Keheningan"
 
 #: src/silence-removal/silence-removal.cc:68
 msgid "Threshold:"
-msgstr ""
+msgstr "Ambang:"
 
-#: src/silence-removal/silence-removal.cc:70
-msgid "dB"
-msgstr ""
+#: src/skins/actions.cc:45 src/skins-qt/actions.cc:43
+msgid "Repeat points cleared."
+msgstr "Titik ulangi dihapus."
+
+#: src/skins/actions.cc:60 src/skins-qt/actions.cc:58
+msgid "Repeat point A set."
+msgstr "Ulangi titik A set."
+
+#: src/skins/actions.cc:65 src/skins-qt/actions.cc:63
+msgid "Repeat point B set."
+msgstr "Ulangi titik B set."
+
+#: src/skins/equalizer.cc:223 src/skins-qt/equalizer.cc:223
+msgid "Preamp"
+msgstr "Preamp"
+
+#: src/skins/equalizer.cc:227 src/skins-qt/equalizer.cc:227
+msgid "31 Hz"
+msgstr "31 Hz"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "63 Hz"
+msgstr "63 Hz"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "125 Hz"
+msgstr "125 Hz"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "250 Hz"
+msgstr "250 Hz"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "500 Hz"
+msgstr "500 Hz"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "1 kHz"
+msgstr "1 kHz"
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "2 kHz"
+msgstr "2 kHz"
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "4 kHz"
+msgstr "4 kHz"
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "8 kHz"
+msgstr "8 kHz"
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "16 kHz"
+msgstr "16 kHz"
+
+#: src/skins/equalizer.cc:270 src/skins-qt/equalizer.cc:270
+msgid "Audacious Equalizer"
+msgstr "Audacious Equalizer"
+
+#: src/skins/main.cc:459 src/skins-qt/main.cc:442
+msgid "Recording on"
+msgstr "Rekaman aktif"
+
+#: src/skins/main.cc:461 src/skins-qt/main.cc:444
+msgid "Recording off"
+msgstr "Rekaman mati"
+
+#: src/skins/main.cc:754 src/skins-qt/main.cc:701
+#, c-format
+msgid "Seek to %d:%-2.2d / %d:%-2.2d"
+msgstr "Berusaha untuk %d:%-2.2d / %d:%-2.2d"
+
+#: src/skins/main.cc:771 src/skins-qt/main.cc:718
+#, c-format
+msgid "Volume: %d%%"
+msgstr "Volume: %d%%"
+
+#: src/skins/main.cc:784 src/skins-qt/main.cc:731
+#, c-format
+msgid "Balance: %d%% left"
+msgstr "Keseimbangan: %d%% left"
+
+#: src/skins/main.cc:786 src/skins-qt/main.cc:733
+msgid "Balance: center"
+msgstr "Keseimbangan: tengah"
+
+#: src/skins/main.cc:788 src/skins-qt/main.cc:735
+#, c-format
+msgid "Balance: %d%% right"
+msgstr "Keseimbangan: %d%% kanan"
+
+#: src/skins/main.cc:880 src/skins-qt/main.cc:827
+msgid "Options Menu"
+msgstr "Menu Opsi"
+
+#: src/skins/main.cc:884 src/skins-qt/main.cc:831
+msgid "Disable 'Always On Top'"
+msgstr "Nonaktifkan 'Always On Top'"
+
+#: src/skins/main.cc:886 src/skins-qt/main.cc:833
+msgid "Enable 'Always On Top'"
+msgstr "Bolehkan 'Always On Top'"
+
+#: src/skins/main.cc:889 src/skins-qt/main.cc:836
+msgid "File Info Box"
+msgstr "Kotak Info Berkas"
+
+#: src/skins/main.cc:892 src/skins/menus.cc:149 src/skins-qt/main.cc:839
+#: src/skins-qt/menus.cc:142
+msgid "Double Size"
+msgstr "Ukuran ganda"
+
+#: src/skins/main.cc:895 src/skins-qt/main.cc:842
+msgid "Visualizations"
+msgstr "Visualisasi"
 
-#: src/skins/menus.cc:64
+#: src/skins/menus.cc:74 src/skins-qt/menus.cc:64
+msgid "Volume Up"
+msgstr "Volume Naik"
+
+#: src/skins/menus.cc:75 src/skins-qt/menus.cc:65
+msgid "Volume Down"
+msgstr "Volume Turun"
+
+#: src/skins/menus.cc:77 src/skins-qt/menus.cc:67
+msgid "Effects ..."
+msgstr "Efek ..."
+
+#: src/skins/menus.cc:84 src/skins-qt/menus.cc:74
 msgid "Open Files ..."
 msgstr "Buka Berkas ..."
 
-#: src/skins/menus.cc:65
+#: src/skins/menus.cc:85 src/skins-qt/menus.cc:76
 msgid "Open URL ..."
 msgstr "Buka URL...."
 
-#: src/skins/menus.cc:66
-msgid "Search Library"
-msgstr ""
-
-#: src/skins/menus.cc:68
-msgid "Playback"
-msgstr "Putar Lagu"
-
-#: src/skins/menus.cc:69
+#: src/skins/menus.cc:89 src/skins-qt/menus.cc:80
 msgid "Playlist"
 msgstr "Daftar Putar"
 
-#: src/skins/menus.cc:70
+#: src/skins/menus.cc:90 src/skins-qt/menus.cc:81
+msgid "Output"
+msgstr "Keluaran"
+
+#: src/skins/menus.cc:91 src/skins-qt/menus.cc:82
 msgid "View"
 msgstr "Lihat"
 
-#: src/skins/menus.cc:72 src/skins/menus.cc:136 src/skins/menus.cc:149
-#: src/skins/menus.cc:214
+#: src/skins/menus.cc:93 src/skins/menus.cc:161 src/skins/menus.cc:174
+#: src/skins/menus.cc:245 src/skins-qt/menus.cc:84 src/skins-qt/menus.cc:156
+#: src/skins-qt/menus.cc:170 src/skins-qt/menus.cc:241
 msgid "Services"
 msgstr "Servis"
 
-#: src/skins/menus.cc:74
+#: src/skins/menus.cc:95 src/skins-qt/menus.cc:86
 msgid "About ..."
 msgstr "Tentang"
 
-#: src/skins/menus.cc:75
+#: src/skins/menus.cc:96 src/skins-qt/menus.cc:87
 msgid "Settings ..."
 msgstr "Pengaturan"
 
-#: src/skins/menus.cc:76
+#: src/skins/menus.cc:97 src/skins-qt/menus.cc:88
 msgid "Quit"
 msgstr "Keluar"
 
-#: src/skins/menus.cc:80 src/skins/menus.cc:206
+#: src/skins/menus.cc:101 src/skins/menus.cc:235 src/skins-qt/menus.cc:92
+#: src/skins-qt/menus.cc:231
 msgid "Song Info ..."
 msgstr "Info Lagu"
 
-#: src/skins/menus.cc:84
+#: src/skins/menus.cc:105 src/skins-qt/menus.cc:96
+msgid "Shuffle by Album"
+msgstr "Acak sebagai Album"
+
+#: src/skins/menus.cc:106 src/skins-qt/menus.cc:97
 msgid "No Playlist Advance"
 msgstr "Tidak ada kemajuan Playlist"
 
-#: src/skins/menus.cc:85
-msgid "Stop After This Song"
-msgstr "Stop Setelah Lagu Ini"
-
-#: src/skins/menus.cc:93
+#: src/skins/menus.cc:117 src/skins-qt/menus.cc:108
 msgid "Set A-B Repeat"
-msgstr ""
+msgstr "Atur Ulangan A-B"
 
-#: src/skins/menus.cc:94
+#: src/skins/menus.cc:118 src/skins-qt/menus.cc:109
 msgid "Clear A-B Repeat"
-msgstr ""
+msgstr "Hapus Ulangan A-B"
 
-#: src/skins/menus.cc:96
+#: src/skins/menus.cc:120 src/skins-qt/menus.cc:111
 msgid "Jump to Song ..."
 msgstr "Lompat ke Lagu ..."
 
-#: src/skins/menus.cc:97
+#: src/skins/menus.cc:121 src/skins-qt/menus.cc:113
 msgid "Jump to Time ..."
 msgstr "Lompat ke Waktu ..."
 
-#: src/skins/menus.cc:101
+#: src/skins/menus.cc:125 src/skins-qt/menus.cc:118
 msgid "Play/Resume"
-msgstr ""
+msgstr "Mainkan/Lanjutkan"
 
-#: src/skins/menus.cc:103
+#: src/skins/menus.cc:127 src/skins-qt/menus.cc:120
 msgid "New Playlist"
 msgstr "Daftar Lagu Baru"
 
-#: src/skins/menus.cc:104
+#: src/skins/menus.cc:128 src/skins-qt/menus.cc:121
 msgid "Rename Playlist ..."
 msgstr "Ganti Nama Daftar Putar ..."
 
-#: src/skins/menus.cc:105
+#: src/skins/menus.cc:129 src/skins-qt/menus.cc:122
 msgid "Remove Playlist"
 msgstr "Hapus Daftar Putar"
 
-#: src/skins/menus.cc:107
+#: src/skins/menus.cc:131 src/skins-qt/menus.cc:124
 msgid "Previous Playlist"
 msgstr "Daftar Putar Sebelumnya"
 
-#: src/skins/menus.cc:108
+#: src/skins/menus.cc:132 src/skins-qt/menus.cc:125
 msgid "Next Playlist"
 msgstr "Daftar Putar Selanjutnya"
 
-#: src/skins/menus.cc:110
+#: src/skins/menus.cc:134 src/skins-qt/menus.cc:127
 msgid "Import Playlist ..."
 msgstr "Impor Daftar Putar ..."
 
-#: src/skins/menus.cc:111
+#: src/skins/menus.cc:135 src/skins-qt/menus.cc:128
 msgid "Export Playlist ..."
 msgstr "Ekspor Daftar Putar ..."
 
-#: src/skins/menus.cc:113
+#: src/skins/menus.cc:137 src/skins-qt/menus.cc:130
 msgid "Playlist Manager ..."
 msgstr "Manager Daftar Putar ..."
 
-#: src/skins/menus.cc:114
+#: src/skins/menus.cc:138 src/skins-qt/menus.cc:131
 msgid "Queue Manager ..."
-msgstr ""
+msgstr "Manajer antrian ..."
 
-#: src/skins/menus.cc:116
+#: src/skins/menus.cc:140 src/skins-qt/menus.cc:133
 msgid "Refresh Playlist"
 msgstr "Segarkan Daftar Putar"
 
-#: src/skins/menus.cc:120
+#: src/skins/menus.cc:144 src/skins-qt/menus.cc:137
 msgid "Show Playlist Editor"
 msgstr "Munculkan Perubah Daftar Lagu"
 
-#: src/skins/menus.cc:121
+#: src/skins/menus.cc:145 src/skins-qt/menus.cc:138
 msgid "Show Equalizer"
 msgstr "Munculkan Equalizer"
 
-#: src/skins/menus.cc:123
+#: src/skins/menus.cc:147 src/skins-qt/menus.cc:140
 msgid "Show Remaining Time"
-msgstr ""
+msgstr "Tampilkan Waktu Tersisa"
 
-#: src/skins/menus.cc:125
+#: src/skins/menus.cc:150 src/skins-qt/menus.cc:143
 msgid "Always on Top"
 msgstr "Selalu di Atas"
 
-#: src/skins/menus.cc:126
+#: src/skins/menus.cc:151 src/skins-qt/menus.cc:145
 msgid "On All Workspaces"
-msgstr ""
+msgstr "Di Semua Ruang Kerja"
 
-#: src/skins/menus.cc:128
+#: src/skins/menus.cc:153 src/skins-qt/menus.cc:148
 msgid "Roll Up Player"
-msgstr ""
+msgstr "Gulung Player keatas"
 
-#: src/skins/menus.cc:129
+#: src/skins/menus.cc:154 src/skins-qt/menus.cc:149
 msgid "Roll Up Playlist Editor"
-msgstr ""
+msgstr "Gulung Editor Daftar Putar keatas"
 
-#: src/skins/menus.cc:130
+#: src/skins/menus.cc:155 src/skins-qt/menus.cc:150
 msgid "Roll Up Equalizer"
-msgstr ""
-
-#: src/skins/menus.cc:132 src/skins/ui_main.cc:854
-msgid "Double Size"
-msgstr ""
+msgstr "Gulung Equalizer keatas"
 
-#: src/skins/menus.cc:138
+#: src/skins/menus.cc:163 src/skins-qt/menus.cc:158
 msgid "Add URL ..."
 msgstr "Tambah URL"
 
-#: src/skins/menus.cc:139
+#: src/skins/menus.cc:164 src/skins-qt/menus.cc:160
 msgid "Add Files ..."
 msgstr "Tambah Berkas ..."
 
-#: src/skins/menus.cc:143 src/skins/menus.cc:171 src/skins/menus.cc:185
+#: src/skins/menus.cc:168 src/skins/menus.cc:196 src/skins/menus.cc:212
+#: src/skins-qt/menus.cc:164 src/skins-qt/menus.cc:192
+#: src/skins-qt/menus.cc:208
 msgid "By Title"
 msgstr "Dari Judul"
 
-#: src/skins/menus.cc:144 src/skins/menus.cc:178 src/skins/menus.cc:192
+#: src/skins/menus.cc:169 src/skins/menus.cc:203 src/skins/menus.cc:219
+#: src/skins-qt/menus.cc:165 src/skins-qt/menus.cc:199
+#: src/skins-qt/menus.cc:215
 msgid "By File Name"
-msgstr ""
+msgstr "Menurut Nama File"
 
-#: src/skins/menus.cc:145 src/skins/menus.cc:179 src/skins/menus.cc:193
+#: src/skins/menus.cc:170 src/skins/menus.cc:204 src/skins/menus.cc:220
+#: src/skins-qt/menus.cc:166 src/skins-qt/menus.cc:200
+#: src/skins-qt/menus.cc:216
 msgid "By File Path"
 msgstr "Oleh Path Berkas"
 
-#: src/skins/menus.cc:151
+#: src/skins/menus.cc:176 src/skins-qt/menus.cc:172
 msgid "Remove All"
 msgstr "Hapus Semua"
 
-#: src/skins/menus.cc:152
+#: src/skins/menus.cc:177 src/skins-qt/menus.cc:173
 msgid "Clear Queue"
 msgstr "Bersihkan Antrian"
 
-#: src/skins/menus.cc:154
+#: src/skins/menus.cc:179 src/skins-qt/menus.cc:175
 msgid "Remove Unavailable Files"
 msgstr "Hapus File yang Tidak Tersedia"
 
-#: src/skins/menus.cc:155
+#: src/skins/menus.cc:180 src/skins-qt/menus.cc:176
 msgid "Remove Duplicates"
 msgstr "Hapus Duplikat"
 
-#: src/skins/menus.cc:157
+#: src/skins/menus.cc:182 src/skins-qt/menus.cc:178
 msgid "Remove Unselected"
 msgstr "Hapus yang tidak Terpilih"
 
-#: src/skins/menus.cc:158
+#: src/skins/menus.cc:183 src/skins-qt/menus.cc:179
 msgid "Remove Selected"
 msgstr "Hapus Yang Dipilih"
 
-#: src/skins/menus.cc:162
+#: src/skins/menus.cc:187 src/skins-qt/menus.cc:183
 msgid "Search and Select"
 msgstr "Cari dan Pilih"
 
-#: src/skins/menus.cc:164
+#: src/skins/menus.cc:189 src/skins-qt/menus.cc:185
 msgid "Invert Selection"
 msgstr "Balik Pilihan"
 
-#: src/skins/menus.cc:165
+#: src/skins/menus.cc:190 src/skins-qt/menus.cc:186
 msgid "Select None"
 msgstr "Jangan Pilih Apapun"
 
-#: src/skins/menus.cc:166
+#: src/skins/menus.cc:191 src/skins-qt/menus.cc:187
 msgid "Select All"
 msgstr "Pilih Semua"
 
-#: src/skins/menus.cc:170 src/skins/menus.cc:184
+#: src/skins/menus.cc:195 src/skins/menus.cc:211 src/skins-qt/menus.cc:191
+#: src/skins-qt/menus.cc:207
 msgid "By Track Number"
 msgstr "Oleh Nomor Trek"
 
-#: src/skins/menus.cc:172 src/skins/menus.cc:186
+#: src/skins/menus.cc:197 src/skins/menus.cc:213 src/skins-qt/menus.cc:193
+#: src/skins-qt/menus.cc:209
 msgid "By Artist"
 msgstr "Dari Artis"
 
-#: src/skins/menus.cc:173 src/skins/menus.cc:187
+#: src/skins/menus.cc:198 src/skins/menus.cc:214 src/skins-qt/menus.cc:194
+#: src/skins-qt/menus.cc:210
 msgid "By Album"
 msgstr "Dari Album"
 
-#: src/skins/menus.cc:174 src/skins/menus.cc:188
+#: src/skins/menus.cc:199 src/skins/menus.cc:215 src/skins-qt/menus.cc:195
+#: src/skins-qt/menus.cc:211
 msgid "By Album Artist"
-msgstr ""
+msgstr "Menurut Artis album"
 
-#: src/skins/menus.cc:175 src/skins/menus.cc:190
+#: src/skins/menus.cc:200 src/skins/menus.cc:216 src/skins-qt/menus.cc:196
+#: src/skins-qt/menus.cc:212
 msgid "By Release Date"
 msgstr "Oleh Tanggal Rilis"
 
-#: src/skins/menus.cc:176 src/skins/menus.cc:189
+#: src/skins/menus.cc:201 src/skins/menus.cc:217 src/skins-qt/menus.cc:197
+#: src/skins-qt/menus.cc:213
 msgid "By Genre"
-msgstr ""
+msgstr "Menurut Genre"
 
-#: src/skins/menus.cc:177 src/skins/menus.cc:191
+#: src/skins/menus.cc:202 src/skins/menus.cc:218 src/skins-qt/menus.cc:198
+#: src/skins-qt/menus.cc:214
 msgid "By Length"
-msgstr ""
+msgstr "Menurut Panjang"
 
-#: src/skins/menus.cc:180 src/skins/menus.cc:194
+#: src/skins/menus.cc:205 src/skins/menus.cc:221 src/skins-qt/menus.cc:201
+#: src/skins-qt/menus.cc:217
 msgid "By Custom Title"
+msgstr "Menurut Judul Pilihan"
+
+#: src/skins/menus.cc:206 src/skins/menus.cc:222 src/skins-qt/menus.cc:202
+#: src/skins-qt/menus.cc:218
+msgid "By Comment"
+msgstr "Menurut Komen"
+
+#: src/skins/menus.cc:207 src/skins/menus.cc:223 src/skins-qt/menus.cc:203
+#: src/skins-qt/menus.cc:219
+msgid "By Disc Number"
 msgstr ""
 
-#: src/skins/menus.cc:198
+#: src/skins/menus.cc:227 src/skins-qt/menus.cc:223
 msgid "Randomize List"
 msgstr "Acak Daftar"
 
-#: src/skins/menus.cc:199
+#: src/skins/menus.cc:228 src/skins-qt/menus.cc:224
 msgid "Reverse List"
 msgstr "Balikkan Daftar"
 
-#: src/skins/menus.cc:201
+#: src/skins/menus.cc:230 src/skins-qt/menus.cc:226
 msgid "Sort Selected"
 msgstr "Urutkan yang Terpilih"
 
-#: src/skins/menus.cc:202
+#: src/skins/menus.cc:231 src/skins-qt/menus.cc:227
 msgid "Sort List"
 msgstr "Urutkan Daftar"
 
-#: src/skins/menus.cc:208
+#: src/skins/menus.cc:236 src/skins-qt/menus.cc:232
+msgid "Open Containing Folder"
+msgstr "Buka Isi Folder"
+
+#: src/skins/menus.cc:238 src/skins-qt/menus.cc:234
 msgid "Cut"
 msgstr "Potong"
 
-#: src/skins/menus.cc:209
+#: src/skins/menus.cc:239 src/skins-qt/menus.cc:235
 msgid "Copy"
 msgstr "Salin"
 
-#: src/skins/menus.cc:210
+#: src/skins/menus.cc:240 src/skins-qt/menus.cc:236
 msgid "Paste"
 msgstr "Tempel"
 
-#: src/skins/menus.cc:212
-msgid "Queue/Unqueue"
-msgstr ""
-
-#: src/skins/menus.cc:218
-msgid "Load Preset ..."
-msgstr ""
-
-#: src/skins/menus.cc:219
-msgid "Load Auto Preset ..."
-msgstr ""
-
-#: src/skins/menus.cc:220
-msgid "Load Default"
-msgstr ""
-
-#: src/skins/menus.cc:221
-msgid "Load Preset File ..."
-msgstr ""
-
-#: src/skins/menus.cc:222
-msgid "Load EQF File ..."
-msgstr ""
-
-#: src/skins/menus.cc:224
-msgid "Save Preset ..."
-msgstr ""
-
-#: src/skins/menus.cc:225
-msgid "Save Auto Preset ..."
-msgstr ""
-
-#: src/skins/menus.cc:226
-msgid "Save Default"
-msgstr ""
-
-#: src/skins/menus.cc:227
-msgid "Save Preset File ..."
-msgstr ""
-
-#: src/skins/menus.cc:228
-msgid "Save EQF File ..."
-msgstr "Simpan Berkas EQF ..."
+#: src/skins/menus.cc:241 src/skins-qt/menus.cc:237
+msgid "Paste at End"
+msgstr "Tempelkan di Akhir"
 
-#: src/skins/menus.cc:230
-msgid "Delete Preset ..."
-msgstr ""
-
-#: src/skins/menus.cc:231
-msgid "Delete Auto Preset ..."
-msgstr ""
+#: src/skins/menus.cc:243 src/skins-qt/menus.cc:239
+msgid "Queue/Unqueue"
+msgstr "Antre/Tidak Antre"
 
-#: src/skins/menus.cc:233
-msgid "Import Winamp Presets ..."
-msgstr "Impor Preset-preset Winamp ..."
+#: src/skins/playlist-widget.cc:58 src/skins-qt/playlist-widget.cc:58
+#, c-format
+msgid "%s (%d of %d)"
+msgstr "%s (%d of %d)"
 
-#: src/skins/menus.cc:235
-msgid "Reset to Zero"
-msgstr ""
+#: src/skins/playlistwin.cc:491 src/skins-qt/playlistwin.cc:478
+msgid "Audacious Playlist Editor"
+msgstr "Audacious Daftar Putar Editor"
 
-#: src/skins/plugin.cc:48
+#: src/skins/plugin.cc:53 src/skins-qt/plugin.cc:65
 msgid "Winamp Classic Interface"
 msgstr "Tampilan Winamp Klasik"
 
-#: src/skins/preset-browser.cc:57 src/skins/preset-list.cc:371
-#: src/skins/preset-list.cc:386
-msgid "Save"
-msgstr "Simpan"
+#: src/skins-qt/menus.cc:75
+msgid "Open Folder ..."
+msgstr "Buka Folder ..."
+
+#: src/skins-qt/menus.cc:159
+msgid "Add Folder ..."
+msgstr "Tambah Folder ..."
 
-#: src/skins/preset-browser.cc:57 src/skins/preset-list.cc:338
-#: src/skins/preset-list.cc:354
-msgid "Load"
-msgstr "Buka"
-
-#: src/skins/preset-browser.cc:83
-msgid "Load Preset File"
-msgstr ""
-
-#: src/skins/preset-browser.cc:100
-msgid "Load EQF File"
-msgstr ""
-
-#: src/skins/preset-browser.cc:119
-msgid "Save Preset File"
-msgstr ""
+#: src/skins-qt/search-select.cc:62 src/skins/search-select.cc:77
+msgid "Search entries in active playlist"
+msgstr "Cari catatan di daftar putar aktif"
 
-#: src/skins/preset-browser.cc:137
-msgid "Save EQF File"
+#: src/skins-qt/search-select.cc:70 src/skins/search-select.cc:83
+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 ""
+"Pilih entri dalam daftar putar dengan mengisi satu atau lebih bidang. Fields "
+"menggunakan ekspresi reguler sintaks, case-insensitive. Jika Anda tidak tahu "
+"bagaimana ekspresi reguler bekerja, cukup memasukkan sebagian literal dari "
+"apa yang Anda cari."
 
-#: src/skins/preset-browser.cc:151
-msgid "Import Winamp Presets"
-msgstr ""
+#: src/skins-qt/search-select.cc:75 src/skins/search-select.cc:91
+msgid "Title:"
+msgstr "Judul:"
 
-#: src/skins/preset-list.cc:285
-msgid "Presets"
-msgstr "Presets"
+#: src/skins-qt/search-select.cc:79 src/skins/search-select.cc:96
+msgid "Album:"
+msgstr "Album: "
 
-#: src/skins/preset-list.cc:335
-msgid "Load preset"
-msgstr "Muat preset"
+#: src/skins-qt/search-select.cc:82 src/skins/search-select.cc:101
+msgid "Artist:"
+msgstr "Artis: "
 
-#: src/skins/preset-list.cc:351
-msgid "Load auto-preset"
-msgstr ""
+#: src/skins-qt/search-select.cc:85 src/skins/search-select.cc:106
+msgid "File Name:"
+msgstr "Nama File:"
 
-#: src/skins/preset-list.cc:367
-msgid "Save preset"
-msgstr "Simpan preset"
+#: src/skins-qt/search-select.cc:88 src/skins/search-select.cc:134
+msgid "Clear previous selection before searching"
+msgstr "Hapus pilihan sebelumnya sebelum mencari"
 
-#: src/skins/preset-list.cc:382
-msgid "Save auto-preset"
-msgstr ""
+#: src/skins-qt/search-select.cc:89 src/skins/search-select.cc:137
+msgid "Automatically toggle queue for matching entries"
+msgstr "Beralih antrean secara otomatis untuk entri yang cocok"
 
-#: src/skins/preset-list.cc:408
-msgid "Delete preset"
-msgstr "Hapus preset"
+#: src/skins-qt/search-select.cc:90 src/skins/search-select.cc:140
+msgid "Create a new playlist with matching entries"
+msgstr "Buat daftar putar baru dengan mencocokan entri"
 
-#: src/skins/preset-list.cc:424
-msgid "Delete auto-preset"
-msgstr ""
+#: src/skins-qt/search-select.cc:101 src/skins/search-select.cc:78
+msgid "Search"
+msgstr "Cari"
 
-#: src/skins/skins_cfg.cc:176
+#: src/skins-qt/skins_cfg.cc:198 src/skins/skins_cfg.cc:182
 msgid "Player:"
-msgstr ""
+msgstr "Pemain:"
 
-#: src/skins/skins_cfg.cc:178
+#: src/skins-qt/skins_cfg.cc:200 src/skins/skins_cfg.cc:184
 msgid "Select main player window font:"
 msgstr "Pilih font jendela player utama:"
 
-#: src/skins/skins_cfg.cc:179
+#: src/skins-qt/skins_cfg.cc:201 src/skins/skins_cfg.cc:185
 msgid "Playlist:"
-msgstr ""
+msgstr "Daftar Putar:"
 
-#: src/skins/skins_cfg.cc:181
+#: src/skins-qt/skins_cfg.cc:203 src/skins/skins_cfg.cc:187
 msgid "Select playlist font:"
 msgstr "Pilih huruf daftar putar"
 
-#: src/skins/skins_cfg.cc:187
+#: src/skins-qt/skins_cfg.cc:207 src/skins/skins_cfg.cc:191
 msgid "Skin"
 msgstr "Kulit"
 
-#: src/skins/skins_cfg.cc:189
+#: src/skins-qt/skins_cfg.cc:211 src/skins/skins_cfg.cc:193
+msgid "Display active titlebar when any window is focused"
+msgstr ""
+
+#: src/skins-qt/skins_cfg.cc:213 src/skins/skins_cfg.cc:195
 msgid "Fonts"
 msgstr "Fonts"
 
-#: src/skins/skins_cfg.cc:192
+#: src/skins-qt/skins_cfg.cc:215 src/skins/skins_cfg.cc:197
 msgid "Use bitmap fonts (supports ASCII only)"
 msgstr "Gunakan huruf bitmap (hanya dukungan ASCII)"
 
-#: src/skins/skins_cfg.cc:194
+#: src/skins-qt/skins_cfg.cc:217 src/skins/skins_cfg.cc:199
 msgid "Scroll song title"
-msgstr ""
+msgstr "Gulir judul lagu"
 
-#: src/skins/skins_cfg.cc:196
+#: src/skins-qt/skins_cfg.cc:219 src/skins/skins_cfg.cc:201
 msgid "Scroll song title in both directions"
 msgstr "Gulir judul lagu dalam kedua arah"
 
-#: src/skins/skins_cfg.cc:201
+#: src/skins-qt/skins_cfg.cc:224 src/skins/skins_cfg.cc:206
 msgid "Analyzer"
 msgstr "Analyzer"
 
-#: src/skins/skins_cfg.cc:202
+#: src/skins-qt/skins_cfg.cc:225 src/skins/skins_cfg.cc:207
 msgid "Scope"
 msgstr "Cakupan"
 
-#: src/skins/skins_cfg.cc:203
+#: src/skins-qt/skins_cfg.cc:226 src/skins/skins_cfg.cc:208
 msgid "Voiceprint / VU meter"
-msgstr ""
+msgstr "Cetak suara / VU meter"
 
-#: src/skins/skins_cfg.cc:204
+#: src/skins-qt/skins_cfg.cc:227 src/skins/skins_cfg.cc:209
 msgid "Off"
 msgstr "Mati"
 
-#: src/skins/skins_cfg.cc:208 src/skins/skins_cfg.cc:233
-#: src/skins/skins_cfg.cc:239
+#: src/skins-qt/skins_cfg.cc:231 src/skins-qt/skins_cfg.cc:256
+#: src/skins-qt/skins_cfg.cc:262 src/skins/skins_cfg.cc:213
+#: src/skins/skins_cfg.cc:238 src/skins/skins_cfg.cc:244
 msgid "Normal"
 msgstr "Normal"
 
-#: src/skins/skins_cfg.cc:209 src/skins/skins_cfg.cc:234
+#: src/skins-qt/skins_cfg.cc:232 src/skins-qt/skins_cfg.cc:257
+#: src/skins/skins_cfg.cc:214 src/skins/skins_cfg.cc:239
 msgid "Fire"
 msgstr "Api"
 
-#: src/skins/skins_cfg.cc:210
+#: src/skins-qt/skins_cfg.cc:233 src/skins/skins_cfg.cc:215
 msgid "Vertical lines"
-msgstr ""
+msgstr "Garis Vertikal"
 
-#: src/skins/skins_cfg.cc:214
+#: src/skins-qt/skins_cfg.cc:237 src/skins/skins_cfg.cc:219
 msgid "Lines"
 msgstr "Garis"
 
-#: src/skins/skins_cfg.cc:215
+#: src/skins-qt/skins_cfg.cc:238 src/skins/skins_cfg.cc:220
 msgid "Bars"
 msgstr "Batang"
 
-#: src/skins/skins_cfg.cc:219
+#: src/skins-qt/skins_cfg.cc:242 src/skins/skins_cfg.cc:224
 msgid "Slowest"
 msgstr "Paling Lambat"
 
-#: src/skins/skins_cfg.cc:220
+#: src/skins-qt/skins_cfg.cc:243 src/skins/skins_cfg.cc:225
 msgid "Slow"
 msgstr "Lambat"
 
-#: src/skins/skins_cfg.cc:221 src/sox-resampler/sox-resampler.cc:152
+#: src/skins-qt/skins_cfg.cc:244 src/skins/skins_cfg.cc:226
+#: src/soxr/sox-resampler.cc:180
 msgid "Medium"
 msgstr "Sedang"
 
-#: src/skins/skins_cfg.cc:222
+#: src/skins-qt/skins_cfg.cc:245 src/skins/skins_cfg.cc:227
 msgid "Fast"
 msgstr "Cepat"
 
-#: src/skins/skins_cfg.cc:223
+#: src/skins-qt/skins_cfg.cc:246 src/skins/skins_cfg.cc:228
 msgid "Fastest"
 msgstr "Paling Cepat"
 
-#: src/skins/skins_cfg.cc:227
+#: src/skins-qt/skins_cfg.cc:250 src/skins/skins_cfg.cc:232
 msgid "Dots"
-msgstr ""
+msgstr "Titik"
 
-#: src/skins/skins_cfg.cc:228
+#: src/skins-qt/skins_cfg.cc:251 src/skins/skins_cfg.cc:233
 msgid "Line"
 msgstr "Garis"
 
-#: src/skins/skins_cfg.cc:229
+#: src/skins-qt/skins_cfg.cc:252 src/skins/skins_cfg.cc:234
 msgid "Solid"
-msgstr ""
+msgstr "Keras"
 
-#: src/skins/skins_cfg.cc:235
+#: src/skins-qt/skins_cfg.cc:258 src/skins/skins_cfg.cc:240
 msgid "Ice"
 msgstr "Es"
 
-#: src/skins/skins_cfg.cc:240
+#: src/skins-qt/skins_cfg.cc:263 src/skins/skins_cfg.cc:245
 msgid "Smooth"
 msgstr "Halus"
 
-#: src/skins/skins_cfg.cc:244
-msgid "Type"
-msgstr "Tipe"
-
-#: src/skins/skins_cfg.cc:245
-msgid "Visualization type:"
-msgstr ""
-
-#: src/skins/skins_cfg.cc:248
-msgid "Analyzer"
-msgstr ""
-
-#: src/skins/skins_cfg.cc:249
-msgid "Show peaks"
-msgstr ""
-
-#: src/skins/skins_cfg.cc:251
+#: src/skins-qt/skins_cfg.cc:267 src/skins/skins_cfg.cc:249
 msgid "Coloring:"
-msgstr ""
+msgstr "Mewarnai:"
 
-#: src/skins/skins_cfg.cc:254
+#: src/skins-qt/skins_cfg.cc:270 src/skins/skins_cfg.cc:252
 msgid "Style:"
 msgstr "Gaya"
 
-#: src/skins/skins_cfg.cc:257
+#: src/skins-qt/skins_cfg.cc:273 src/skins/skins_cfg.cc:255
 msgid "Falloff:"
-msgstr ""
+msgstr "Jatuh:"
 
-#: src/skins/skins_cfg.cc:260
+#: src/skins-qt/skins_cfg.cc:276 src/skins/skins_cfg.cc:258
 msgid "Peak falloff:"
-msgstr ""
+msgstr "Puncak Jatuh:"
 
-#: src/skins/skins_cfg.cc:264
+#: src/skins-qt/skins_cfg.cc:282 src/skins/skins_cfg.cc:264
 msgid "Scope Style:"
-msgstr ""
+msgstr "Gaya Lingkup:"
 
-#: src/skins/skins_cfg.cc:267
+#: src/skins-qt/skins_cfg.cc:285 src/skins/skins_cfg.cc:267
 msgid "Voiceprint Coloring:"
-msgstr ""
+msgstr "Pewarnaan Cetak Suara:"
 
-#: src/skins/skins_cfg.cc:270
+#: src/skins-qt/skins_cfg.cc:288 src/skins/skins_cfg.cc:270
 msgid "VU Meter Style:"
-msgstr ""
-
-#: src/skins/skins_cfg.cc:276
-msgid "General"
-msgstr "Umum"
-
-#: src/skins/skins_cfg.cc:277
-msgid "Visualization"
-msgstr "Visualisasi"
-
-#: src/skins/ui_equalizer.cc:282
-msgid "Preamp"
-msgstr "Preamp"
-
-#: src/skins/ui_equalizer.cc:286
-msgid "31 Hz"
-msgstr "31 Hz"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "63 Hz"
-msgstr "63 Hz"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "125 Hz"
-msgstr "125 Hz"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "250 Hz"
-msgstr "250 Hz"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "500 Hz"
-msgstr "500 Hz"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "1 kHz"
-msgstr "1 kHz"
-
-#: src/skins/ui_equalizer.cc:288
-msgid "2 kHz"
-msgstr "2 kHz"
-
-#: src/skins/ui_equalizer.cc:288
-msgid "4 kHz"
-msgstr "4 kHz"
-
-#: src/skins/ui_equalizer.cc:288
-msgid "8 kHz"
-msgstr "8 kHz"
-
-#: src/skins/ui_equalizer.cc:288
-msgid "16 kHz"
-msgstr "16 kHz"
-
-#: src/skins/ui_equalizer.cc:330
-msgid "Audacious Equalizer"
-msgstr "Audacious Equalizer"
-
-#: src/skins/ui_main.cc:688
-#, c-format
-msgid "Seek to %d:%-2.2d / %d:%-2.2d"
-msgstr "Berusaha untuk %d:%-2.2d / %d:%-2.2d"
-
-#: src/skins/ui_main.cc:709
-#, c-format
-msgid "Volume: %d%%"
-msgstr "Volume: %d%%"
-
-#: src/skins/ui_main.cc:732
-#, c-format
-msgid "Balance: %d%% left"
-msgstr "Keseimbangan: %d%% left"
-
-#: src/skins/ui_main.cc:734
-msgid "Balance: center"
-msgstr "Keseimbangan: tengah"
-
-#: src/skins/ui_main.cc:736
-#, c-format
-msgid "Balance: %d%% right"
-msgstr "Keseimbangan: %d%% kanan"
-
-#: src/skins/ui_main.cc:842
-msgid "Options Menu"
-msgstr "Menu Opsi"
-
-#: src/skins/ui_main.cc:846
-msgid "Disable 'Always On Top'"
-msgstr "Nonaktifkan 'Always On Top'"
-
-#: src/skins/ui_main.cc:848
-msgid "Enable 'Always On Top'"
-msgstr "Bolehkan 'Always On Top'"
-
-#: src/skins/ui_main.cc:851
-msgid "File Info Box"
-msgstr "Kotak Info Berkas"
-
-#: src/skins/ui_main.cc:857
-msgid "Visualizations"
-msgstr ""
-
-#: src/skins/ui_main.cc:1336
-msgid "Repeat point A set."
-msgstr ""
-
-#: src/skins/ui_main.cc:1341
-msgid "Repeat point B set."
-msgstr ""
-
-#: src/skins/ui_main.cc:1350
-msgid "Repeat points cleared."
-msgstr ""
-
-#: src/skins/ui_playlist.cc:219
-msgid "Search entries in active playlist"
-msgstr "Cari catatan di daftar putar aktif"
-
-#: src/skins/ui_playlist.cc:226
-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 ""
-"Pilih entri dalam daftar putar dengan mengisi satu atau lebih bidang. Fields "
-"menggunakan ekspresi reguler sintaks, case-insensitive. Jika Anda tidak tahu "
-"bagaimana ekspresi reguler bekerja, cukup memasukkan sebagian literal dari "
-"apa yang Anda cari."
-
-#: src/skins/ui_playlist.cc:234
-msgid "Title:"
-msgstr ""
-
-#: src/skins/ui_playlist.cc:241
-msgid "Album:"
-msgstr ""
-
-#: src/skins/ui_playlist.cc:248
-msgid "Artist:"
-msgstr ""
+msgstr "Gaya VU Meter:"
 
-#: src/skins/ui_playlist.cc:255
-msgid "File Name:"
-msgstr ""
-
-#: src/skins/ui_playlist.cc:263
-msgid "Clear previous selection before searching"
-msgstr ""
+#: src/skins-qt/skins_cfg.cc:294 src/skins/skins_cfg.cc:276
+msgid "Type"
+msgstr "Tipe"
 
-#: src/skins/ui_playlist.cc:266
-msgid "Automatically toggle queue for matching entries"
-msgstr ""
+#: src/skins-qt/skins_cfg.cc:295 src/skins/skins_cfg.cc:277
+msgid "Visualization type:"
+msgstr "Tipe Visualisasi:"
 
-#: src/skins/ui_playlist.cc:269
-msgid "Create a new playlist with matching entries"
-msgstr "Buat daftar putar baru dengan mencocokan entri"
+#: src/skins-qt/skins_cfg.cc:298 src/skins/skins_cfg.cc:280
+msgid "Analyzer"
+msgstr "Penganalisis"
 
-#: src/skins/ui_playlist.cc:717
-msgid "Audacious Playlist Editor"
-msgstr "Audacious Daftar Putar Editor"
+#: src/skins-qt/skins_cfg.cc:299 src/skins/skins_cfg.cc:281
+msgid "Show peaks"
+msgstr "Tampilkan Puncak:"
 
-#: src/skins/ui_playlist.cc:752
-#, c-format
-msgid "%s (%d of %d)"
-msgstr "%s (%d of %d)"
+#: src/skins-qt/skins_cfg.cc:308 src/skins/skins_cfg.cc:290
+msgid "Visualization"
+msgstr "Visualisasi"
 
-#: src/skins/ui_skinselector.cc:167
+#: src/skins-qt/skinselector.cc:98 src/skins/skinselector.cc:111
 msgid "Archived Winamp 2.x skin"
 msgstr "Arsipkan Kulit Winamp 2.x "
 
-#: src/skins/ui_skinselector.cc:172
+#: src/skins-qt/skinselector.cc:102 src/skins/skinselector.cc:115
 msgid "Unarchived Winamp 2.x skin"
 msgstr "Jangan Arsipkan Kulit Winam 2.x "
 
-#: src/skins/util.cc:430
-#, c-format
-msgid "Could not create directory (%s): %s\n"
-msgstr "Tidak dapat membuat folder (%s): %s\n"
-
-#: src/sndfile/plugin.cc:39
+#: src/sndfile/plugin.cc:38
 msgid "Sndfile Plugin"
-msgstr ""
+msgstr "Pengaya Sndfile"
 
-#: src/sndfile/plugin.cc:336
+#: src/sndfile/plugin.cc:372
 msgid ""
 "Based on the xmms_sndfile plugin:\n"
 "Copyright (C) 2000, 2002 Erik de Castro Lopo\n"
@@ -3742,93 +4192,131 @@
 "this program; if not, write to the Free Software Foundation, Inc., 51 "
 "Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 msgstr ""
+"Berdasarkan pengaya xmms_sndfile:\n"
+"Hak Cipta (C) 2000, 2002 Erik de Castro Lopo\n"
+"\n"
+"Diadaptasi untuk Audacious oleh Tony Vroon <chainsaw@gentoo.org>\n"
+"\n"
+"Program ini adalah perangkat lunak gratis; Anda dapat mendistribusikan ulang "
+"dan/atau memodifikasinya di bawah ketentuan Lisensi Publik Umum GNU yang "
+"diterbitkan oleh Free Software Foundation; baik versi 2 dari Lisensi, atau "
+"(sesuai pilihan Anda) versi yang lebih baru.\n"
+"\n"
+"Program ini disebarluaskan dengan harapan dapat bermanfaat, namun TANPA "
+"JAMINAN APAPUN; bahkan tanpa jaminan tersirat tentang KELAYAKAN "
+"DIPERDAGANGKAN atau KESESUAIAN UNTUK TUJUAN TERTENTU. Lihat Lisensi Publik "
+"Umum GNU untuk info lebih lanjut.\n"
+"\n"
+"Anda seharusnya telah menerima salinan GNU General Public License bersama "
+"dengan program ini; jika tidak, kirim surat ke Free Software Foundation, "
+"Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 
-#: src/sndio-ng/sndio.cc:44
+#: src/sndio/sndio.cc:43
 msgid "Sndio Output"
-msgstr ""
+msgstr "Keluaran Sndio"
 
-#: src/sndio-ng/sndio.cc:98
+#: src/sndio/sndio.cc:98
 msgid "Device (blank for default):"
-msgstr ""
+msgstr "Alat (kosongkan untuk bawaan)"
 
-#: src/sndio-ng/sndio.cc:100
+#: src/sndio/sndio.cc:100
 msgid "Save and restore volume:"
-msgstr ""
+msgstr "Simpan dan pulihkan volume:"
 
-#: src/sndio-ng/sndio.cc:181
+#: src/sndio/sndio.cc:181
 #, c-format
 msgid "Sndio error: Unsupported audio format (%d)"
-msgstr ""
+msgstr "Kesalahan Sndio: Format audio tidak didukung (%d)"
 
-#: src/sndio-ng/sndio.cc:192
+#: src/sndio/sndio.cc:192
 msgid "Sndio error: sio_open() failed"
-msgstr ""
+msgstr "Kesalahan Sndio: sio_open() gagal"
 
-#: src/sndio-ng/sndio.cc:222
+#: src/sndio/sndio.cc:221
 msgid "Sndio error: sio_setpar() failed"
-msgstr ""
+msgstr "Kesalahan Sndio: sio_setpar() gagal"
 
-#: src/sndio-ng/sndio.cc:234
+#: src/sndio/sndio.cc:233
 msgid "Sndio error: sio_start() failed"
-msgstr ""
+msgstr "Kesalahan Sndio: sio_start() gagal"
 
-#: src/song_change/song_change.cc:33
+#: src/songchange/song_change.cc:30
 msgid "Song Change"
 msgstr "Ubah Lagu"
 
-#: src/song_change/song_change.cc:342
-msgid ""
-"Parameters passed to the shell should be encapsulated in "
-"quotes. Doing otherwise is a security risk."
-msgstr ""
-
-#: src/song_change/song_change.cc:358
+#: src/songchange/song_change.cc:256
 msgid "Commands"
-msgstr ""
+msgstr "Perintah"
 
-#: src/song_change/song_change.cc:360
+#: src/songchange/song_change.cc:258
 msgid "Command to run when starting a new song:"
+msgstr "Perintah untuk dijalankan saat memulai lagu baru:"
+
+#: src/songchange/song_change.cc:261
+msgid "Command to run when stopping a song:"
 msgstr ""
 
-#: src/song_change/song_change.cc:364
+#: src/songchange/song_change.cc:264
 msgid "Command to run at the end of a song:"
-msgstr ""
+msgstr "Perintah untuk dijalankan di akhir lagu:"
 
-#: src/song_change/song_change.cc:368
+#: src/songchange/song_change.cc:267
 msgid "Command to run at the end of the playlist:"
-msgstr ""
+msgstr "Perintah untuk dijalankan di akhir daftar putar:"
 
-#: src/song_change/song_change.cc:372
+#: src/songchange/song_change.cc:270
 msgid "Command to run when song title changes (for network streams):"
 msgstr ""
+"Perintah untuk dijalankan saat judul lagu berubah (untuk aliran jaringan):"
 
-#: src/song_change/song_change.cc:376
+#: src/songchange/song_change.cc:273
 msgid ""
-"You can use the following format strings which will be substituted before "
-"calling the command (not all are useful for the end-of-playlist command):\n"
-"\n"
-"%F: Frequency (in hertz)\n"
+"You can use the following format codes, which will be replaced before "
+"running the command.\n"
+"Not all are useful though for the song-stopped or end-of-playlist command."
+msgstr ""
+
+#: src/songchange/song_change.cc:276
+msgid ""
+"%a: Artist\n"
+"%b: Album\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"
+"%F: Frequency (Hertz)\n"
+"%l: Length (milliseconds)\n"
+"%n or %s: Formatted title (see playlist settings)\n"
 "%p: Currently playing (1 or 0)\n"
-"%a: Artist\n"
-"%b: Album\n"
-"%T: Track title"
+"%r: Rate (bits per second)\n"
+"%t: Playlist position\n"
+"%T: Title (unformatted)"
 msgstr ""
+"%a: Artia\n"
+"%b: Album\n"
+"%c: Jumlah saluran\n"
+"%f: Nama File (lokasi penuh)\n"
+"%F: Frekuensi (Hertz)\n"
+"%l: Panjang (millisekon)\n"
+"%n atau %s: Judul berformat (lihat setelan daftar putar)\n"
+"%p: Sedang diputar (1 atau 0)\n"
+"%r: Kecepatan (bit per sekon)\n"
+"%t: Posisi daftar putar\n"
+"%T: Judul (tidak berformat)"
 
-#: src/song-info-qt/song-info.cc:32
-msgid "Song Info (Qt)"
+#: src/songchange/song_change.cc:287
+msgid ""
+"Parameters passed to the shell should be enclosed in quotation marks.\n"
+"Unquoted parameters may lead to unexpected results."
 msgstr ""
 
-#: src/sox-resampler/sox-resampler.cc:44
+#: src/song-info-qt/song-info.cc:30
+msgid "Song Info"
+msgstr "Info Lagu"
+
+#: src/soxr/sox-resampler.cc:44
 msgid "SoX Resampler"
-msgstr ""
+msgstr "SoX Resampler"
 
-#: src/sox-resampler/sox-resampler.cc:144
+#: src/soxr/sox-resampler.cc:172
 msgid ""
 "SoX Resampler Plugin for Audacious\n"
 "Copyright 2013 Michał Lipski\n"
@@ -3836,89 +4324,149 @@
 "Based on Sample Rate Converter Plugin:\n"
 "Copyright 2010-2012 John Lindgren"
 msgstr ""
+"Pengaya SoX Resampler untuk Audacious\n"
+"Hak Cipta 2013 Michał Lipski\n"
+"\n"
+"Berdasarkan Pengaya Pengkonversi Tingkat Sampel:\n"
+"Hak Cipta 2010-2012 John Lindgren"
 
-#: src/sox-resampler/sox-resampler.cc:150
+#: src/soxr/sox-resampler.cc:178
 msgid "Quick"
 msgstr "Cepat"
 
-#: src/sox-resampler/sox-resampler.cc:151
+#: src/soxr/sox-resampler.cc:179
 msgid "Low"
 msgstr "Rendah"
 
-#: src/sox-resampler/sox-resampler.cc:153
+#: src/soxr/sox-resampler.cc:181
 msgid "High"
 msgstr "Tinggi"
 
-#: src/sox-resampler/sox-resampler.cc:154
+#: src/soxr/sox-resampler.cc:182
 msgid "Very High"
 msgstr "Sangat Tinggi"
 
-#: src/sox-resampler/sox-resampler.cc:158
+#: src/soxr/sox-resampler.cc:183
+msgid "Ultra High"
+msgstr "Sangat tinggi"
+
+#: src/soxr/sox-resampler.cc:187
+msgid "Minimum"
+msgstr "Minimum"
+
+#: src/soxr/sox-resampler.cc:188
+msgid "Intermediate"
+msgstr "Menengah"
+
+#: src/soxr/sox-resampler.cc:193
 msgid "Quality:"
 msgstr "Kualitas"
 
-#: src/speed-pitch/speed-pitch.cc:51
+#: src/soxr/sox-resampler.cc:196
+msgid "Phase:"
+msgstr "Fase:"
+
+#: src/soxr/sox-resampler.cc:200
+msgid "Allow aliasing"
+msgstr "Izinkan alias"
+
+#: src/soxr/sox-resampler.cc:202
+msgid "Use steep filter"
+msgstr "Gunakan filter curam"
+
+#: src/speedpitch/speed-pitch.cc:54
 msgid "Speed and Pitch"
 msgstr "Kecepatan dan Nada"
 
-#: src/speed-pitch/speed-pitch.cc:210
-msgid "Speed and Pitch"
-msgstr ""
+#: src/speedpitch/speed-pitch.cc:247
+msgid "Speed"
+msgstr "Kecepatan"
+
+#: src/speedpitch/speed-pitch.cc:248
+msgid "Decouple from pitch"
+msgstr "Pisahkan dari nada"
+
+#: src/speedpitch/speed-pitch.cc:250 src/speedpitch/speed-pitch.cc:258
+msgid "Multiplier:"
+msgstr "Pengali:"
+
+#: src/speedpitch/speed-pitch.cc:254
+msgid "Pitch"
+msgstr "Nada"
 
-#: src/speed-pitch/speed-pitch.cc:211
-msgid "Speed:"
-msgstr "Kecepatan"
-
-#: src/speed-pitch/speed-pitch.cc:214
-msgid "Pitch:"
-msgstr "Nada"
-
-#: src/statusicon/statusicon.cc:47
+#: src/statusicon-qt/statusicon.cc:45 src/statusicon/statusicon.cc:47
 msgid "Status Icon"
 msgstr "Ikon Status"
 
-#: src/statusicon/statusicon.cc:283
-msgid "Se_ttings ..."
-msgstr "Se_ttings ..."
-
-#: src/statusicon/statusicon.cc:372
+#: src/statusicon-qt/statusicon.cc:68
 msgid ""
-"Status Icon Plugin\n"
+"Status Icon Plugin (partial port for Qt interface)\n"
 "\n"
 "Copyright 2005-2007 Giacomo Lozito <james@develia.org>\n"
 "Copyright 2010 Michał Lipski <tallica@o2.pl>\n"
+"Copyright 2015 Eugene Paskevich <eugene@raptor.kiev.ua>\n"
 "\n"
 "This plugin provides a status icon, placed in\n"
 "the system tray area of the window manager."
 msgstr ""
+"Pengaya Ikon Status (port parsial untuk antarmuka Qt)\n"
+"\n"
+"Hak Cipta 2005-2007 Giacomo Lozito <james@develia.org>\n"
+"Hak Cipta 2010 Michał Lipski <tallica@o2.pl>\n"
+"Hak Cipta 2015 Eugene Paskevich <eugene@raptor.kiev.ua>\n"
+"\n"
+"Pengaya ini menyediakan ikon status, ditempatkan di\n"
+"area baki jendela sistem manajer."
 
-#: src/statusicon/statusicon.cc:379
+#: src/statusicon-qt/statusicon.cc:89 src/statusicon/statusicon.cc:384
 msgid "Mouse Scroll Action"
-msgstr ""
+msgstr "Aksi Gulir Mouse"
 
-#: src/statusicon/statusicon.cc:380
+#: src/statusicon-qt/statusicon.cc:90 src/statusicon/statusicon.cc:385
 msgid "Change volume"
 msgstr "Ubah volume"
 
-#: src/statusicon/statusicon.cc:383
+#: src/statusicon-qt/statusicon.cc:93 src/statusicon/statusicon.cc:388
 msgid "Change playing song"
 msgstr "Ubah lagu yang sedang diputar"
 
-#: src/statusicon/statusicon.cc:386
+#: src/statusicon-qt/statusicon.cc:96 src/statusicon/statusicon.cc:391
 msgid "Other Settings"
 msgstr "Pengaturan Lain"
 
-#: src/statusicon/statusicon.cc:387
+#: src/statusicon-qt/statusicon.cc:97 src/statusicon/statusicon.cc:392
 msgid "Disable the popup window"
-msgstr ""
+msgstr "Matikan jendela popup"
 
-#: src/statusicon/statusicon.cc:389
+#: src/statusicon-qt/statusicon.cc:99 src/statusicon/statusicon.cc:394
 msgid "Close to the system tray"
-msgstr ""
+msgstr "Tutup ke baki sistem"
 
-#: src/statusicon/statusicon.cc:391
+#: src/statusicon-qt/statusicon.cc:101 src/statusicon/statusicon.cc:396
 msgid "Advance in playlist when scrolling upward"
+msgstr "Maju dalam daftar putar saat menggulir ke atas"
+
+#: src/statusicon-qt/statusicon.cc:116 src/statusicon/statusicon.cc:287
+msgid "Se_ttings ..."
+msgstr "Se_ttings ..."
+
+#: src/statusicon/statusicon.cc:377
+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 ""
+"Pengaya Ikon Status\n"
+"\n"
+"Hak Cipta 2005-2007 Giacomo Lozito <james@develia.org>\n"
+"Hak Cipta 2010 Michał Lipski <tallica@o2.pl>\n"
+"\n"
+"Pengaya ini menyediakan ikon status, ditempatkan di\n"
+"area baki jendela sistem manajer."
 
 #: src/stereo_plugin/stereo.cc:19
 msgid "Extra Stereo"
@@ -3930,25 +4478,168 @@
 "\n"
 "By Johan Levin, 1999"
 msgstr ""
+"Pengaya Stereo Ekstra\n"
+"\n"
+"Oleh Johan Levin, 1999"
 
 #: src/stereo_plugin/stereo.cc:44
 msgid "Extra Stereo"
 msgstr "Extra Stereo"
 
+#: src/streamtuner/icecast-model.cc:126 src/streamtuner/shoutcast-model.cc:131
+msgid "Type"
+msgstr "Tipe"
+
+#: src/streamtuner/icecast-model.cc:132
+msgid "Current Song"
+msgstr "Lagu saat ini"
+
+#: src/streamtuner/icecast-model.cc:164
+msgid "Other"
+msgstr "Lainnya"
+
+#: src/streamtuner/ihr-model.cc:63
+msgid "Market"
+msgstr "Pasar"
+
+#: src/streamtuner/ihr-model.cc:156
+msgid "Call Letters"
+msgstr "Huruf Panggil"
+
+#: src/streamtuner/ihr-model.cc:162
+msgid "Description"
+msgstr "Deskripsi"
+
+#: src/streamtuner/shoutcast-model.cc:128
+msgid "Listeners"
+msgstr "Pendengar"
+
+#: src/streamtuner/shoutcast-model.cc:188
+msgid "Top 500 Stations"
+msgstr "500 Stasiun Teratas"
+
+#: src/streamtuner/shoutcast-model.cc:189
+msgid "Alternative"
+msgstr "Alternatif"
+
+#: src/streamtuner/shoutcast-model.cc:190
+msgid "Blues"
+msgstr "Blues"
+
+#: src/streamtuner/shoutcast-model.cc:191
+msgid "Classical"
+msgstr "Klasik"
+
+#: src/streamtuner/shoutcast-model.cc:192
+msgid "Country"
+msgstr "Country"
+
+#: src/streamtuner/shoutcast-model.cc:193
+msgid "Decades"
+msgstr "Dekade"
+
+#: src/streamtuner/shoutcast-model.cc:194
+msgid "Easy Listening"
+msgstr "Mudah Didengarkan"
+
+#: src/streamtuner/shoutcast-model.cc:195
+msgid "Electronic"
+msgstr "Elektronik"
+
+#: src/streamtuner/shoutcast-model.cc:196
+msgid "Folk"
+msgstr "Folk"
+
+#: src/streamtuner/shoutcast-model.cc:197
+msgid "Inspirational"
+msgstr "Inspirasional"
+
+#: src/streamtuner/shoutcast-model.cc:198
+msgid "International"
+msgstr "Internasional"
+
+#: src/streamtuner/shoutcast-model.cc:199
+msgid "Jazz"
+msgstr "Jazz"
+
+#: src/streamtuner/shoutcast-model.cc:200
+msgid "Latin"
+msgstr "Latin"
+
+#: src/streamtuner/shoutcast-model.cc:201
+msgid "Metal"
+msgstr "Metal"
+
+#: src/streamtuner/shoutcast-model.cc:203
+msgid "New Age"
+msgstr "New Age"
+
+#: src/streamtuner/shoutcast-model.cc:204
+msgid "Pop"
+msgstr "Pop"
+
+#: src/streamtuner/shoutcast-model.cc:205
+msgid "Public Radio"
+msgstr "Radio Publik"
+
+#: src/streamtuner/shoutcast-model.cc:206
+msgid "R&B and Urban"
+msgstr "R&B dan Perkotaan"
+
+#: src/streamtuner/shoutcast-model.cc:207
+msgid "Rap"
+msgstr "Rap"
+
+#: src/streamtuner/shoutcast-model.cc:208
+msgid "Reggae"
+msgstr "Reggae"
+
+#: src/streamtuner/shoutcast-model.cc:209
+msgid "Rock"
+msgstr "Rock"
+
+#: src/streamtuner/shoutcast-model.cc:210
+msgid "Seasonal and Holiday"
+msgstr "Musiman dan Hari Libur"
+
+#: src/streamtuner/shoutcast-model.cc:211
+msgid "Soundtracks"
+msgstr "Soundtrack"
+
+#: src/streamtuner/shoutcast-model.cc:212
+msgid "Talk"
+msgstr "Bicara"
+
+#: src/streamtuner/shoutcast-model.cc:213
+msgid "Themes"
+msgstr "Tema"
+
+#: src/streamtuner/streamtuner.cc:59
+msgid "Shoutcast"
+msgstr "Shoutcast"
+
+#: src/streamtuner/streamtuner.cc:60
+msgid "Icecast"
+msgstr "Icecast"
+
+#: src/streamtuner/streamtuner.cc:71
+msgid "Stream Tuner"
+msgstr "Penyetel Aliran"
+
 #: src/tonegen/tonegen.cc:45
 msgid "Tone Generator"
-msgstr ""
+msgstr "Penghasil Nada"
 
-#: src/tonegen/tonegen.cc:94
+#: src/tonegen/tonegen.cc:92
 #, c-format
 msgid "%s %.1f Hz"
 msgstr "%s %.1f Hz"
 
-#: src/tonegen/tonegen.cc:94
+#: src/tonegen/tonegen.cc:92
 msgid "Tone Generator: "
-msgstr ""
+msgstr "Penghasil Nada:"
 
-#: src/tonegen/tonegen.cc:160
+#: src/tonegen/tonegen.cc:161
 msgid ""
 "Sine tone generator by Håvard Kvålen <havardk@xmms.org>\n"
 "Modified by Daniel J. Peng <danielpeng@bigfoot.com>\n"
@@ -3956,12 +4647,39 @@
 "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 ""
+"Generator nada sinus oleh Håvard Kvålen <havardk@xmms.org>\n"
+"Dimodifikasi oleh Daniel J. Peng <danielpeng@bigfoot.com>\n"
+"\n"
+"Untuk menggunakannya, tambahkan URL: tone://frequency1;frequency2;"
+"frequency3;...\n"
+"e.g. tone://2000;2005 untuk memainkan nada 2000 Hz dan nada 2005 Hz"
+
+#: src/ui-common/dialogs-qt.cc:40
+msgid ""
+"\n"
+"(Further messages have been hidden.)"
+msgstr ""
+"\n"
+"(Pesan lebih lanjut telah disembunyikan.)"
+
+#: src/ui-common/dialogs-qt.cc:52
+msgid "Working ..."
+msgstr "Sedang bekerja ..."
+
+#: src/ui-common/dialogs-qt.cc:73
+msgid "Information"
+msgstr "Informasi"
+
+#: src/ui-common/menu-ops-gtk.cc:132 src/ui-common/menu-ops-qt.cc:113
+#, c-format
+msgid "%s does not appear to be a valid folder."
+msgstr ""
 
 #: src/voice_removal/voice_removal.cc:28
 msgid "Voice Removal"
-msgstr ""
+msgstr "Penghapusan Suara"
 
-#: src/vorbis/vorbis.cc:465
+#: src/vorbis/vorbis.cc:433
 msgid ""
 "Audacious Ogg Vorbis Decoder\n"
 "\n"
@@ -3981,17 +4699,34 @@
 "Gian-Carlo Pascutto <gcp@sjeng.org>\n"
 "Eugene Zagidullin <e.asphyx@gmail.com>"
 msgstr ""
+"Dekoder Ogg Vorbis Audacious\n"
+"\n"
+"Berdasarkan Pengaya Ogg Vorbis dari Xiph.org Foundation:\n"
+"http://www.xiph.org/\n"
+"\n"
+"Kode asli oleh:\n"
+"Tony Arcieri <bascule@inferno.tusculum.edu>\n"
+"\n"
+"Kontribusi dari:\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.h:18
 msgid "Ogg Vorbis Decoder"
 msgstr "Dekoder Ogg Vorbis"
 
-#: src/vtx/info.cc:22
+#: src/vtx/info.cc:24
 #, c-format
 msgid "Details about %s"
-msgstr ""
+msgstr "Detail tentang %s"
 
-#: src/vtx/info.cc:24
+#: src/vtx/info.cc:26
 msgid ""
 "Title: %t\n"
 "Author: %a\n"
@@ -4005,31 +4740,89 @@
 "Player Freq: %P\n"
 "Year: %y"
 msgstr ""
+"Judul: %t\n"
+"Pembuat: %a\n"
+"Dari: %f\n"
+"Pelacak: %T\n"
+"Komen: %C\n"
+"Tipe chip: %c\n"
+"Stereo: %s\n"
+"Lingkaran: %l\n"
+"Frekuensi chip: %F\n"
+"Frekuensi Pemutar: %P\n"
+"Tahun: %y"
 
 #: src/vtx/vtx.cc:38
 msgid "VTX Decoder"
 msgstr "Dekoder VTX"
 
-#: src/vtx/vtx.cc:184
+#: src/vtx/vtx.cc:178
 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 ""
+"Pemutar format file Vortex oleh Sashnov Alexander <sashnov@ngs.ru>\n"
+"Berdasarkan dari in_vtx.dll oleh Roman Sherbakov <v_soft@microfor.ru>\n"
+"Pengaya Audacious oleh Pavel Vymetalek <pvymetalek@seznam.cz>"
+
+#: src/vumeter-qt/vumeter_qt.cc:31
+msgid ""
+"VU Meter Plugin for Audacious\n"
+"Copyright 2017-2019 Marc Sánchez Fauste"
+msgstr ""
+"Pengaya VU Meter untuk Audacious\n"
+"Hak Cipta 2017-2019 Marc Sánchez Fauste"
+
+#: src/vumeter-qt/vumeter_qt.cc:35
+msgid "VU Meter Settings"
+msgstr "Pengaturan VU Meter"
+
+#: src/vumeter-qt/vumeter_qt.cc:37
+msgid "Peak hold time:"
+msgstr "Waktu tunggu puncak:"
+
+#: src/vumeter-qt/vumeter_qt.cc:42
+msgid "Fall-off time:"
+msgstr "Waktu jatuh:"
+
+#: src/vumeter-qt/vumeter_qt.cc:44
+msgid "dB/second"
+msgstr "dB/detik"
+
+#: src/vumeter-qt/vumeter_qt.cc:46
+msgid "Display legend"
+msgstr "Legenda tampilan"
+
+#: src/vumeter-qt/vumeter_qt.h:37
+msgid "VU Meter"
+msgstr "VU Meter"
+
+#: src/waveout/waveout.cc:43
+msgid "Win32 waveOut"
+msgstr "Win32 waveOut"
+
+#: src/waveout/waveout.cc:69
+msgid ""
+"Win32 waveOut Plugin for Audacious\n"
+"Copyright 2016 John Lindgren"
+msgstr ""
+"Plugin Win32 waveOut untuk Audacious \n"
+"Hak Cipta 2016 John Lindgren "
 
-#: src/wavpack/wavpack.cc:24
+#: src/wavpack/wavpack.cc:25
 msgid "WavPack Decoder"
 msgstr "Dekoder WavPack"
 
-#: src/wavpack/wavpack.cc:211
+#: src/wavpack/wavpack.cc:217
 msgid "lossy (hybrid)"
 msgstr "yang berkurang (gabungan)"
 
-#: src/wavpack/wavpack.cc:213
+#: src/wavpack/wavpack.cc:219
 msgid "lossy"
 msgstr "yang berkurang"
 
-#: src/wavpack/wavpack.cc:255
+#: src/wavpack/wavpack.cc:259
 msgid ""
 "Copyright 2006 William Pitcock <nenolod@nenolod.net>\n"
 "\n"
@@ -4039,18 +4832,38 @@
 "\n"
 "Beberapa kode pengaya ditulis oleh Miles Egan."
 
-#: src/xsf/plugin.cc:50
+#: src/xsf/plugin.cc:74
 msgid "2SF Decoder"
 msgstr "Dekoder 2SF"
 
-#: src/xsf/plugin.cc:238
+#: src/xsf/plugin.cc:429
+msgid "32728 Hz"
+msgstr ""
+
+#: src/xsf/plugin.cc:432
+msgid "65456 Hz"
+msgstr ""
+
+#: src/xsf/plugin.cc:438
+msgid "Cosine"
+msgstr ""
+
+#: src/xsf/plugin.cc:439
+msgid "Sharp"
+msgstr ""
+
+#: src/xsf/plugin.cc:443
 msgid "XSF Configuration"
 msgstr "Pengaturan XSF"
 
-#: src/xsf/plugin.cc:239
-msgid "Ignore length from file"
-msgstr "Abaikan panjang dari berkas"
+#: src/xsf/plugin.cc:445
+msgid "Default fade time:"
+msgstr ""
+
+#: src/xsf/plugin.cc:447
+msgid "Interpolation mode:"
+msgstr ""
 
-#: src/xspf/xspf.cc:89
+#: src/xspf/xspf.cc:95
 msgid "XML Shareable Playlists (XSPF)"
 msgstr "XML Shareable Playlists (XSPF)"

audacious-plugins-3.6.2-gtk3.tar.bz2/po/it.po -> audacious-plugins-4.4.1.tar.bz2/po/it.po Changed

@@ -3,9 +3,11 @@
 # This file is distributed under the same license as the Audacious Plugins package.
 #
 # Translators:
+# Daniele Porumboiu <daniele.porumboiu@gmail.com>, 2021
 # David Rossi <davros74@gmail.com>, 2012
 # Federico <federico421@hotmail.it>, 2013-2014
 # minderz <franketti@gmail.com>, 2014
+# eagleman <giacomomargarito@yahoo.it>, 2020-2021,2023
 # Jacopo Lorenzetti <jacopo.jl@gmail.com>, 2011-2012
 # Jacopo Lorenzetti <jacopol@cyan.xubiq.com>, 2012-2013
 # Marco Mangiacavalli, 2013
@@ -15,301 +17,74 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Audacious Plugins\n"
-"Report-Msgid-Bugs-To: http://redmine.audacious-media-player.org/\n"
-"POT-Creation-Date: 2015-02-28 19:18+0100\n"
-"PO-Revision-Date: 2015-02-12 21:08+0000\n"
-"Last-Translator: Nicola Manini <nicola.manini@fisica.unimi.it>\n"
-"Language-Team: Italian (http://www.transifex.com/projects/p/audacious/"
+"Report-Msgid-Bugs-To: https://github.com/audacious-media-player/audacious/"
+"issues\n"
+"POT-Creation-Date: 2024-09-26 21:54+0200\n"
+"PO-Revision-Date: 2011-10-10 17:43+0000\n"
+"Last-Translator: eagleman <giacomomargarito@yahoo.it>, 2020-2021,2023\n"
+"Language-Team: Italian (http://app.transifex.com/audacious/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"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? "
+"1 : 2;\n"
 
-#: src/aac-raw/aac.cc:18
+#: src/aac/aac.cc:19
 msgid "AAC (Raw) Decoder"
 msgstr "Decoder AAC (Raw)"
 
-#: src/adplug/adplug-xmms.cc:42
+#: src/adplug/adplug-xmms.cc:70
 msgid "AdPlug (AdLib Player)"
 msgstr "AdPlug (Riproduttore AdLib)"
 
-#: src/adplug/adplug-xmms.cc:156 src/modplug/modplugbmp.cc:335
-#: src/psf/plugin.cc:138 src/vtx/vtx.cc:87 src/xsf/plugin.cc:113
+#: src/adplug/adplug-xmms.cc:167 src/modplug/modplugbmp.cc:321
+#: src/psf/plugin.cc:161 src/vtx/vtx.cc:89 src/xsf/plugin.cc:204
 msgid "sequenced"
 msgstr "sequenziato"
 
-#: src/alarm/alarm.cc:55 src/alarm/interface.cc:82
-msgid "Alarm"
-msgstr "Allarme"
-
-#: src/alarm/alarm.cc:782
-msgid "Set Alarm ..."
-msgstr "Regola la sveglia ..."
-
-#: src/alarm/alarm.cc:810
-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/interface.cc: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.cc: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.cc: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.cc:81
-msgid "This is your wakeup call."
-msgstr "Questa è la tua sveglia."
-
-#: src/alarm/interface.cc:99
-msgid "Your reminder for today is..."
-msgstr "Il tuo promemoria per oggi è..."
-
-#: src/alarm/interface.cc:101 src/alarm/interface.cc:386
-msgid "Reminder"
-msgstr "Promemoria"
-
-#: src/alarm/interface.cc:132
-msgid "Monday"
-msgstr "Lunedì"
-
-#: src/alarm/interface.cc:132
-msgid "Tuesday"
-msgstr "Martedì"
-
-#: src/alarm/interface.cc:132
-msgid "Wednesday"
-msgstr "Mercoledì"
-
-#: src/alarm/interface.cc:133
-msgid "Thursday"
-msgstr "Giovedì"
-
-#: src/alarm/interface.cc:133
-msgid "Friday"
-msgstr "Venerdì"
-
-#: src/alarm/interface.cc:133
-msgid "Saturday"
-msgstr "Sabato"
-
-#: src/alarm/interface.cc:133
-msgid "Sunday"
-msgstr "Domenica"
-
-#: src/alarm/interface.cc:171 src/alarm/interface.cc:230
-#: src/alarm/interface.cc:245
-msgid "Time"
-msgstr "Ora"
-
-#: src/alarm/interface.cc:178
-msgid "Alarm at (default):"
-msgstr "Sveglia alle (predefinita):"
-
-#: src/alarm/interface.cc:200
-msgid "h"
-msgstr "h"
-
-#: src/alarm/interface.cc:203
-msgid "Quiet after:"
-msgstr "Ferma dopo:"
-
-#: src/alarm/interface.cc:215
-msgid "hours"
-msgstr "ore"
-
-#: src/alarm/interface.cc:226
-msgid "minutes"
-msgstr "minuti"
-
-#: src/alarm/interface.cc:235
-msgid "Choose the days for the alarm to come on"
-msgstr "Scegliere i giorni in cui attivare la sveglia"
+#: src/adplug/adplug-xmms.cc:349 src/sid/xs_config.cc:61
+msgid "Output"
+msgstr "Uscita"
 
-#: src/alarm/interface.cc:242
-msgid "Day"
-msgstr "Giorno"
+#: src/adplug/adplug-xmms.cc:350
+msgid "OPL Emulator:"
+msgstr "Emulatore OPL:"
+
+#: src/adplug/adplug-xmms.cc:353 src/amidiplug/i_configure.cc:153
+#: src/console/plugin.cc:45 src/filewriter/filewriter.cc:481
+#: src/sid/xs_config.cc:65 src/xsf/plugin.cc:446
+msgid "Sample rate:"
+msgstr "Frequenza di campionamento:"
 
-#: src/alarm/interface.cc:259 src/bs2b/plugin.cc:130
-#: src/skins/preset-list.cc:434 src/skins/preset-list.cc:440
-msgid "Default"
-msgstr "Predefinita"
+#: src/adplug/adplug-xmms.cc:354 src/amidiplug/i_configure.cc:155
+#: src/bs2b/plugin.cc:141 src/console/plugin.cc:47
+#: src/modplug/plugin_main.cc:77 src/resample/resample.cc:201
+#: src/resample/resample.cc:207 src/resample/resample.cc:211
+#: src/resample/resample.cc:215 src/resample/resample.cc:219
+#: src/resample/resample.cc:223 src/resample/resample.cc:227
+#: src/resample/resample.cc:231 src/resample/resample.cc:235
+#: src/resample/resample.cc:239 src/resample/resample.cc:243
+#: src/sid/xs_config.cc:67 src/soxr/sox-resampler.cc:205
+msgid "Hz"
+msgstr "Hz"
 
-#: src/alarm/interface.cc:288
-msgid "Days"
-msgstr "Giorni"
-
-#: src/alarm/interface.cc:297
-msgid "Fading"
-msgstr "Dissolvenza"
-
-#: src/alarm/interface.cc:305 src/console/plugin.cc:41
-#: src/crossfade/crossfade.cc:53 src/crossfade/crossfade.cc:59
-#: src/gtkui/settings.cc:49 src/lirc/lirc.cc:397 src/sid/xs_config.cc:85
-#: src/sid/xs_config.cc:94 src/sid/xs_config.cc:103
-msgid "seconds"
-msgstr "secondi"
+#: src/adplug/adplug-xmms.cc:355 src/gtkui/settings.cc:55
+#: src/modplug/plugin_main.cc:105 src/qtui/settings.cc:85
+#: src/skins-qt/skins_cfg.cc:302 src/skins/skins_cfg.cc:284
+msgid "Miscellaneous"
+msgstr "Varie"
 
-#: src/alarm/interface.cc:312 src/alarm/interface.cc:353
-msgid "Volume"
-msgstr "Volume"
-
-#: src/alarm/interface.cc:317
-msgid "Start at"
-msgstr "Inizia a"
-
-#: src/alarm/interface.cc:333
-msgid "Final"
-msgstr "Finale"
-
-#: src/alarm/interface.cc:346
-msgid "Current"
-msgstr "Attuale"
-
-#: src/alarm/interface.cc:359
-msgid "Additional Command"
-msgstr "Comando aggiuntivo"
-
-#: src/alarm/interface.cc:365 src/alarm/interface.cc:391
-msgid "enable"
-msgstr "abilita"
-
-#: src/alarm/interface.cc:372
-msgid "Playlist (optional)"
-msgstr "Playlist (opzionale)"
-
-#: src/alarm/interface.cc:379
-msgid "Select a playlist"
-msgstr "Seleziona una lista di riproduzione"
-
-#: src/alarm/interface.cc:399
-msgid "Options"
-msgstr "Opzioni"
-
-#: src/alarm/interface.cc:404
-msgid "What do these options mean?"
-msgstr "Cosa significano queste opzioni?"
-
-#: src/alarm/interface.cc:420
-msgid "Help"
-msgstr "Aiuto"
+#: src/adplug/adplug-xmms.cc:356
+msgid "Repeat song in endless loop"
+msgstr "Ripeti canzone all'infinito"
 
-#: src/albumart/albumart.cc:31
+#: src/albumart/albumart.cc:31 src/albumart-qt/albumart.cc:35
 msgid "Album Art"
 msgstr "Copertina Album"
 
-#: src/albumart-qt/albumart.cc:33
-msgid "Album Art (Qt)"
-msgstr "Copertina dell'album (Qt)"
-
-#: src/alsa/alsa.h:70
+#: src/alsa/alsa.h:64
 msgid "ALSA Output"
 msgstr "Uscita ALSA"
 
@@ -352,11 +127,11 @@
 msgid "Mixer element:"
 msgstr "Elemento mixer:"
 
-#: src/amidi-plug/amidi-plug.cc:41
+#: src/amidiplug/amidi-plug.cc:42
 msgid "AMIDI-Plug (MIDI Player)"
 msgstr "Plug-in AMIDI (Riproduttore MIDI)"
 
-#: src/amidi-plug/amidi-plug.cc:437
+#: src/amidiplug/amidi-plug.cc:445
 msgid ""
 "AMIDI-Plug\n"
 "modular MIDI music player\n"
@@ -396,157 +171,161 @@
 "Tony Vroon\n"
 "per l'aiuto fornito durante l'alpha testing"
 
-#: src/amidi-plug/i_configure.cc:94
+#: src/amidiplug/i_configure.cc:94
 msgid "Override default gain:"
 msgstr "Sovrascrivi l'amplificazione di default"
 
-#: src/amidi-plug/i_configure.cc:102
+#: src/amidiplug/i_configure.cc:102
 msgid "Override default polyphony:"
 msgstr "Sovrascrivi la polifonia di default"
 
-#: src/amidi-plug/i_configure.cc:110
+#: src/amidiplug/i_configure.cc:110
 msgid "Override default reverb:"
 msgstr "Sovrascrivi il riverbero di default"
 
-#: src/amidi-plug/i_configure.cc:112 src/amidi-plug/i_configure.cc:120
+#: src/amidiplug/i_configure.cc:112 src/amidiplug/i_configure.cc:120
 msgid "On"
 msgstr "Acceso"
 
-#: src/amidi-plug/i_configure.cc:118
+#: src/amidiplug/i_configure.cc:118
 msgid "Override default chorus:"
 msgstr "Sovrascrivi il chorus di default"
 
-#: src/amidi-plug/i_configure.cc:128 src/console/plugin.cc:29
+#: src/amidiplug/i_configure.cc:128 src/console/plugin.cc:29
 msgid "Playback"
 msgstr "PlaybackRiproduzione"
 
-#: src/amidi-plug/i_configure.cc:129
+#: src/amidiplug/i_configure.cc:129
 msgid "Transpose:"
 msgstr "Trasponi:"
 
-#: src/amidi-plug/i_configure.cc:131
+#: src/amidiplug/i_configure.cc:131 src/speedpitch/speed-pitch.cc:257
 msgid "semitones"
 msgstr "semitoni"
 
-#: src/amidi-plug/i_configure.cc:132
+#: src/amidiplug/i_configure.cc:132
 msgid "Drum shift:"
 msgstr "Trasla la batteria:"
 
-#: src/amidi-plug/i_configure.cc:134
+#: src/amidiplug/i_configure.cc:134
 msgid "note numbers"
 msgstr "numeri di note"
 
-#: src/amidi-plug/i_configure.cc:135
+#: src/amidiplug/i_configure.cc:135
 msgid "Skip leading silence"
 msgstr "Salta il silenzio iniziale"
 
-#: src/amidi-plug/i_configure.cc:137
+#: src/amidiplug/i_configure.cc:137
 msgid "Skip trailing silence"
 msgstr "Salta il silenzio finale"
 
-#: src/amidi-plug/i_configure.cc:141
+#: src/amidiplug/i_configure.cc:141
 msgid "SoundFont"
 msgstr "SoundFont"
 
-#: src/amidi-plug/i_configure.cc:143
+#: src/amidiplug/i_configure.cc:148
 msgid "Synthesizer"
 msgstr "Sintetizzatore"
 
-#: src/amidi-plug/i_configure.cc:148 src/console/plugin.cc:45
-#: src/sid/xs_config.cc:65
-msgid "Sample rate:"
-msgstr "Frequenza di campionamento:"
-
-#: src/amidi-plug/i_configure.cc:150 src/bs2b/plugin.cc:141
-#: src/console/plugin.cc:47 src/modplug/plugin_main.cc:78
-#: src/resample/resample.cc:201 src/resample/resample.cc:207
-#: src/resample/resample.cc:211 src/resample/resample.cc:215
-#: src/resample/resample.cc:219 src/resample/resample.cc:223
-#: src/resample/resample.cc:227 src/resample/resample.cc:231
-#: src/resample/resample.cc:235 src/resample/resample.cc:239
-#: src/resample/resample.cc:243 src/sid/xs_config.cc:67
-#: src/sox-resampler/sox-resampler.cc:163
-msgid "Hz"
-msgstr "Hz"
-
-#: src/amidi-plug/i_configure-fluidsynth.cc:52
+#: src/amidiplug/i_configure-fluidsynth.cc:58
+#: src/amidiplug/i_configure-fluidsynth.cc:527
 msgid "AMIDI-Plug - select SoundFont file"
 msgstr "AMIDI-Plug - seleziona file SoundFont"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:55 src/filewriter/mp3.cc:658
+#: src/amidiplug/i_configure-fluidsynth.cc:61
 msgid "_Cancel"
-msgstr "_Cancella"
+msgstr "_Annulla"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:56
+#: src/amidiplug/i_configure-fluidsynth.cc:62
 msgid "_Open"
 msgstr "_Apri"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:225 src/gtkui/columns.cc:46
+#: src/amidiplug/i_configure-fluidsynth.cc:233
+#: src/amidiplug/i_configure-fluidsynth.cc:461
 msgid "File name"
 msgstr "Nome del file"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:229
+#: src/amidiplug/i_configure-fluidsynth.cc:237
+#: src/amidiplug/i_configure-fluidsynth.cc:464
 msgid "Size (bytes)"
 msgstr "Dimensioni (byte)"
 
-#: src/amidi-plug/i_fileinfo.cc:163
+#: src/amidiplug/i_fileinfo.cc:184
 msgid "Name:"
 msgstr "Nome:"
 
-#: src/amidi-plug/i_fileinfo.cc:181
+#: src/amidiplug/i_fileinfo.cc:202
 msgid " MIDI Info "
 msgstr " Informazioni MIDI "
 
-#: src/amidi-plug/i_fileinfo.cc:195
+#: src/amidiplug/i_fileinfo.cc:216
 msgid "Format:"
 msgstr "Formato:"
 
-#: src/amidi-plug/i_fileinfo.cc:198
+#: src/amidiplug/i_fileinfo.cc:219
 msgid "Length (msec):"
 msgstr "Durata (msec):"
 
-#: src/amidi-plug/i_fileinfo.cc:201
+#: src/amidiplug/i_fileinfo.cc:222
 msgid "No. of Tracks:"
 msgstr "Numero di tracce: "
 
-#: src/amidi-plug/i_fileinfo.cc:207
+#: src/amidiplug/i_fileinfo.cc:228
 msgid "variable"
 msgstr "variabile"
 
-#: src/amidi-plug/i_fileinfo.cc:209
+#: src/amidiplug/i_fileinfo.cc:230
 msgid "BPM:"
 msgstr "BPM:"
 
-#: src/amidi-plug/i_fileinfo.cc:217
+#: src/amidiplug/i_fileinfo.cc:238
 msgid "BPM (wavg):"
 msgstr "BPM (wavg):"
 
-#: src/amidi-plug/i_fileinfo.cc:220
+#: src/amidiplug/i_fileinfo.cc:241
 msgid "Time Div:"
 msgstr "Suddivisione temporale:"
 
-#: src/amidi-plug/i_fileinfo.cc:231
+#: src/amidiplug/i_fileinfo.cc:252
 msgid " MIDI Comments and Lyrics "
 msgstr " Commenti e testi MIDI "
 
-#: src/amidi-plug/i_fileinfo.cc:278
+#: src/amidiplug/i_fileinfo.cc:299
 msgid "* no comments available in this MIDI file *"
 msgstr "* nessun commento disponibile in questo file MIDI *"
 
-#: src/amidi-plug/i_fileinfo.cc:290
+#: src/amidiplug/i_fileinfo.cc:311
 msgid "* no lyrics available in this MIDI file *"
 msgstr "* nessun testo disponibile in questo file MIDI *"
 
-#: src/amidi-plug/i_fileinfo.cc:300 src/filewriter/vorbis.cc:197
-#: src/ladspa/plugin.cc:416
+#: src/amidiplug/i_fileinfo.cc:321 src/ladspa/plugin.cc:418
+#: src/ui-common/dialogs-qt.cc:32
 msgid "_Close"
 msgstr "_Chiudi"
 
-#: src/amidi-plug/i_fileinfo.cc:325
+#: src/amidiplug/i_fileinfo.cc:346
 msgid " (invalid UTF-8)"
 msgstr " (UTF-8 non valido)"
 
-#: src/aosd/aosd.cc:32
+#: src/ampache/ampache.cc:33
+msgid "Ampache Browser"
+msgstr "Ampache Browser"
+
+#: src/ampache/ampache.cc:46
+msgid ""
+"Ampache Browser for Audacious\n"
+"http://ampache-browser.org/\n"
+"\n"
+"Copyright (C) Róbert Čerňanský and John Lindgren\n"
+"License: GNU GPLv3"
+msgstr ""
+"Ampache Browser for Audacious\n"
+"http://ampache-browser.org/\n"
+"\n"
+"Copyright (C) Róbert Čerňanský and John Lindgren\n"
+"License: GNU GPLv3"
+
+#: src/aosd/aosd.cc:31
 msgid ""
 "Audacious OSD\n"
 "http://www.develia.org/projects.php?p=audacious#aosd\n"
@@ -580,131 +359,131 @@
 msgid "Concave Rectangle"
 msgstr "Rettangolo concavo"
 
-#: src/aosd/aosd_style.cc:69
+#: src/aosd/aosd_style.cc:69 src/openmpt/mptwrap.h:50 src/xsf/plugin.cc:436
 msgid "None"
 msgstr "Nessuno"
 
-#: src/aosd/aosd_trigger.cc:50
+#: src/aosd/aosd_trigger.cc:49
 msgid "Playback Start"
 msgstr "Avvio della riproduzione"
 
-#: src/aosd/aosd_trigger.cc:51
+#: src/aosd/aosd_trigger.cc:50
 msgid "Triggers OSD when a playlist entry is played."
 msgstr "Visualizza l'OSD quando viene riprodotto un elemento della playlist."
 
-#: src/aosd/aosd_trigger.cc:56
+#: src/aosd/aosd_trigger.cc:55
 msgid "Title Change"
 msgstr "Cambio titolo"
 
-#: src/aosd/aosd_trigger.cc:57
+#: src/aosd/aosd_trigger.cc:56
 msgid "Triggers OSD when the song title changes (for internet streams)."
 msgstr ""
 "Attiva OSD quando cambia il titolo di una canzone (per gli stream in rete)."
 
-#: src/aosd/aosd_trigger.cc:62
+#: src/aosd/aosd_trigger.cc:61
 msgid "Pause On"
 msgstr "Attivazione pausa"
 
-#: src/aosd/aosd_trigger.cc:63
+#: src/aosd/aosd_trigger.cc:62
 msgid "Triggers OSD when playback is paused."
 msgstr "Visualizza l'OSD quando viene interrotta la riproduzione."
 
-#: src/aosd/aosd_trigger.cc:68
+#: src/aosd/aosd_trigger.cc:67
 msgid "Pause Off"
 msgstr "Disattivazione pausa"
 
-#: src/aosd/aosd_trigger.cc:69
+#: src/aosd/aosd_trigger.cc:68
 msgid "Triggers OSD when playback is unpaused."
 msgstr "Visualizza l'OSD quando viene ripresa la riproduzione."
 
-#: src/aosd/aosd_ui.cc:163
+#: src/aosd/aosd_ui.cc:204
 msgid "Placement"
 msgstr "Posizionamento"
 
-#: src/aosd/aosd_ui.cc:196
+#: src/aosd/aosd_ui.cc:241
 msgid "Relative X offset:"
 msgstr "Offset X relativo:"
 
-#: src/aosd/aosd_ui.cc:203
+#: src/aosd/aosd_ui.cc:245
 msgid "Relative Y offset:"
 msgstr "Offset Y relativo:"
 
-#: src/aosd/aosd_ui.cc:210
+#: src/aosd/aosd_ui.cc:249
 msgid "Max OSD width:"
 msgstr "Larghezza massima OSD:"
 
-#: src/aosd/aosd_ui.cc:221
+#: src/aosd/aosd_ui.cc:281
 msgid "Multi-Monitor options"
 msgstr "Opzioni multi-monitor"
 
-#: src/aosd/aosd_ui.cc:225
+#: src/aosd/aosd_ui.cc:285
 msgid "Display OSD using:"
 msgstr "Visualizza OSD su:"
 
-#: src/aosd/aosd_ui.cc:227
+#: src/aosd/aosd_ui.cc:287
 msgid "all monitors"
 msgstr "tutti i monitor"
 
-#: src/aosd/aosd_ui.cc:230
+#: src/aosd/aosd_ui.cc:290
 #, c-format
 msgid "monitor %i"
 msgstr "monitor %i"
 
-#: src/aosd/aosd_ui.cc:282
+#: src/aosd/aosd_ui.cc:342
 msgid "Timing (ms)"
 msgstr "Temporizzazione (ms)"
 
-#: src/aosd/aosd_ui.cc:287
+#: src/aosd/aosd_ui.cc:347
 msgid "Display:"
 msgstr "Visualizza:"
 
-#: src/aosd/aosd_ui.cc:292
+#: src/aosd/aosd_ui.cc:352
 msgid "Fade in:"
 msgstr "Dissolvi in ingresso:"
 
-#: src/aosd/aosd_ui.cc:297
+#: src/aosd/aosd_ui.cc:357
 msgid "Fade out:"
 msgstr "Dissolvi in uscita:"
 
-#: src/aosd/aosd_ui.cc:361
+#: src/aosd/aosd_ui.cc:442
 msgid "Fonts"
 msgstr "Caratteri"
 
-#: src/aosd/aosd_ui.cc:368
+#: src/aosd/aosd_ui.cc:449
 #, c-format
 msgid "Font %i:"
 msgstr "Carattere %i:"
 
-#: src/aosd/aosd_ui.cc:382
+#: src/aosd/aosd_ui.cc:466
 msgid "Shadow"
 msgstr "Ombra"
 
-#: src/aosd/aosd_ui.cc:486
+#: src/aosd/aosd_ui.cc:589
 msgid "Render Style"
 msgstr "Stile di resa grafica"
 
-#: src/aosd/aosd_ui.cc:502
+#: src/aosd/aosd_ui.cc:605
 msgid "Colors"
 msgstr "Colori"
 
-#: src/aosd/aosd_ui.cc:513
+#: src/aosd/aosd_ui.cc:616
 #, c-format
 msgid "Color %i:"
 msgstr "Colore %i:"
 
-#: src/aosd/aosd_ui.cc:600
+#: src/aosd/aosd_ui.cc:714
 msgid "Enable trigger"
 msgstr "Abilita visualizzazione in seguito all'evento"
 
-#: src/aosd/aosd_ui.cc:627
+#: src/aosd/aosd_ui.cc:741
 msgid "Event"
 msgstr "Evento"
 
-#: src/aosd/aosd_ui.cc:655
+#: src/aosd/aosd_ui.cc:768
 msgid "Composite manager detected"
 msgstr "Rilevato compositing manager"
 
-#: src/aosd/aosd_ui.cc:662
+#: src/aosd/aosd_ui.cc:775
 msgid ""
 "Composite manager not detected;\n"
 "unless you know that you have one running, please activate a composite "
@@ -714,66 +493,62 @@
 "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.cc:670
+#: src/aosd/aosd_ui.cc:783
 msgid "Composite manager not required for fake transparency"
 msgstr "Compositing manager non richiesto per la falsa trasparenza"
 
-#: src/aosd/aosd_ui.cc:706
+#: src/aosd/aosd_ui.cc:820
 msgid "Transparency"
 msgstr "Trasparenza"
 
-#: src/aosd/aosd_ui.cc:712
+#: src/aosd/aosd_ui.cc:826
 msgid "Fake transparency"
 msgstr "Falsa trasparenza"
 
-#: src/aosd/aosd_ui.cc:714
+#: src/aosd/aosd_ui.cc:828
 msgid "Real transparency (requires X Composite Ext.)"
 msgstr "Trasparenza reale (richiede est. Composite di X)"
 
-#: src/aosd/aosd_ui.cc:756
+#: src/aosd/aosd_ui.cc:875
 msgid "Composite extension not loaded"
 msgstr "Estensione Composite non caricata"
 
-#: src/aosd/aosd_ui.cc:764
-msgid "Composite extension not available"
-msgstr "Estensione Composite non disponibile"
-
-#: src/aosd/aosd_ui.cc:781
+#: src/aosd/aosd_ui.cc:892
 #, c-format
 msgid "Audacious OSD"
 msgstr "Audacious OSD"
 
-#: src/aosd/aosd_ui.cc:844
+#: src/aosd/aosd_ui.cc:955
 msgid "Position"
 msgstr "Posizione"
 
-#: src/aosd/aosd_ui.cc:849
+#: src/aosd/aosd_ui.cc:960
 msgid "Animation"
 msgstr "Animazione"
 
-#: src/aosd/aosd_ui.cc:854
+#: src/aosd/aosd_ui.cc:965
 msgid "Text"
 msgstr "Testo"
 
-#: src/aosd/aosd_ui.cc:859
+#: src/aosd/aosd_ui.cc:970
 msgid "Decoration"
 msgstr "Decorazione"
 
-#: src/aosd/aosd_ui.cc:864
+#: src/aosd/aosd_ui.cc:975
 msgid "Trigger"
 msgstr "Eventi"
 
-#: src/aosd/aosd_ui.cc:869
+#: src/aosd/aosd_ui.cc:980 src/streamtuner/shoutcast-model.cc:202
 msgid "Misc"
 msgstr "Varie"
 
-#: src/aosd/aosd_ui.cc:878
+#: src/aosd/aosd_ui.cc:989
 msgid "Test"
 msgstr "Test"
 
 #: src/asx3/asx3.cc:35
 msgid "ASXv3 Playlists"
-msgstr "Playlists "
+msgstr "Liste di riproduzione ASXv3"
 
 #: src/asx/asx.cc:33
 msgid "ASXv1/ASXv2 Playlists"
@@ -783,11 +558,83 @@
 msgid "Audacious Playlists (audpl)"
 msgstr "Lista di riproduzione Audacious (audpl)"
 
-#: src/blur_scope/blur_scope.cc:42
+#: src/background_music/background_music.cc:24
+msgid "Background music"
+msgstr ""
+
+#: src/background_music/background_music.cc:25
+msgid "Target level:"
+msgstr ""
+
+#: src/background_music/background_music.cc:28
+#: src/background_music/background_music.cc:33
+#: src/silence-removal/silence-removal.cc:70
+msgid "dB"
+msgstr "dB"
+
+#: src/background_music/background_music.cc:29
+msgid "Maximum amplification:"
+msgstr ""
+
+#: src/background_music/background_music.cc:34 src/mpg123/mpg123.cc:81
+msgid "Advanced"
+msgstr "Opzioni avanzate"
+
+#: src/background_music/background_music.cc:36
+msgid "Slow detection weight:"
+msgstr ""
+
+#: src/background_music/background_music.cc:39
+msgid "Hint"
+msgstr ""
+
+#: src/background_music/background_music.cc:41
+msgid ""
+"Slow detection weight is the relative weight\n"
+"of a long term average detection when compared\n"
+"to the actual, faster loudness detection.\n"
+"A value of zero gives a more radio-like sound\n"
+"where soft passages get \"pulled up\" more quickly,\n"
+"a value of two makes the sound feel less compressed."
+msgstr ""
+
+#: src/background_music/background_music.cc:52
+msgid ""
+"Background Music Plugin for Audacious\n"
+"Copyright 2023;2024 Michel Fleur\n"
+"\n"
+"Controls the volume to make the sound equally loud within and between "
+"tracks.\n"
+" It uses accurate loudness measurement and tries to make the volume changes "
+"sound natural without audible peaks, yet without lowering the volume before "
+"a peak in advance."
+msgstr ""
+
+#: src/background_music/background_music.cc:61
+msgid "Background Music"
+msgstr ""
+
+#: src/bitcrusher/bitcrusher.cc:33
+msgid "Bitcrusher"
+msgstr "Bitcrusher"
+
+#: src/bitcrusher/bitcrusher.cc:34
+msgid "Bit Depth:"
+msgstr "Profondità dei bit:"
+
+#: src/bitcrusher/bitcrusher.cc:37
+msgid "Downsample ratio:"
+msgstr "Percentuale Downsample:"
+
+#: src/bitcrusher/bitcrusher.cc:48
+msgid "Bitcrusher"
+msgstr "Bitcrusher"
+
+#: src/blur_scope/blur_scope.cc:40 src/blur_scope-qt/blur_scope.cc:45
 msgid "Color"
 msgstr "Colore"
 
-#: src/blur_scope/blur_scope.cc:58
+#: src/blur_scope/blur_scope.cc:56 src/blur_scope-qt/blur_scope.cc:158
 msgid "Blur Scope"
 msgstr "Blur Scope"
 
@@ -799,6 +646,10 @@
 msgid "Presets:"
 msgstr "Preimpostazioni:"
 
+#: src/bs2b/plugin.cc:130
+msgid "Default"
+msgstr "Predefinita"
+
 #: src/bs2b/plugin.cc:136
 msgid "Feed level:"
 msgstr "Livello di alimentazione:"
@@ -811,15 +662,15 @@
 msgid "Cut frequency:"
 msgstr "Frequenza di taglio:"
 
-#: src/cairo-spectrum/cairo-spectrum.cc:41
+#: src/cairo-spectrum/cairo-spectrum.cc:42 src/qt-spectrum/qt-spectrum.cc:107
 msgid "Spectrum Analyzer"
 msgstr "Analizzatore di spettro"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:72
+#: src/cdaudio/cdaudio-ng.cc:74
 msgid "Audio CD Plugin"
 msgstr "Plugin CD Audio"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:121
+#: src/cdaudio/cdaudio-ng.cc:121
 msgid ""
 "Copyright (C) 2007-2012 Calin Crisan <ccrisan@gmail.com> and others.\n"
 "\n"
@@ -840,132 +691,132 @@
 "\n"
 "Questo era un progetto Google Summer of Code 2007."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:137
+#: src/cdaudio/cdaudio-ng.cc:140
 msgid "Device"
 msgstr "Dispositivo"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:138
+#: src/cdaudio/cdaudio-ng.cc:141
 msgid "Read speed:"
 msgstr "Velocità di lettura: "
 
-#: src/cdaudio-ng/cdaudio-ng.cc:141
+#: src/cdaudio/cdaudio-ng.cc:144
 msgid "Override device:"
 msgstr "Ignora dispositivo: "
 
-#: src/cdaudio-ng/cdaudio-ng.cc:143
+#: src/cdaudio/cdaudio-ng.cc:146
 msgid "Metadata"
 msgstr "Metadati"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:144
+#: src/cdaudio/cdaudio-ng.cc:147
 msgid "Use CD-Text"
 msgstr "Usa CD-Text"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:146
+#: src/cdaudio/cdaudio-ng.cc:150
 msgid "Use CDDB"
 msgstr "Usa CDDB"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:148
+#: src/cdaudio/cdaudio-ng.cc:152
 msgid "Use HTTP instead of CDDBP"
 msgstr "Usa HTTP invece di CDDBP"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:151
+#: src/cdaudio/cdaudio-ng.cc:155
 msgid "Server:"
 msgstr "Server: "
 
-#: src/cdaudio-ng/cdaudio-ng.cc:155
+#: src/cdaudio/cdaudio-ng.cc:159
 msgid "Path:"
 msgstr "Percorso: "
 
-#: src/cdaudio-ng/cdaudio-ng.cc:159
+#: src/cdaudio/cdaudio-ng.cc:163
 msgid "Port:"
 msgstr "Porta: "
 
-#: src/cdaudio-ng/cdaudio-ng.cc:246
+#: src/cdaudio/cdaudio-ng.cc:228
 msgid "Failed to initialize cdio subsystem."
 msgstr "Errore nell'inizializzazione del sottosistema cdio."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:281
+#: src/cdaudio/cdaudio-ng.cc:260
 #, c-format
 msgid "Invalid URI %s."
 msgstr "URI %s non valido."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:283
+#: src/cdaudio/cdaudio-ng.cc:262
 #, c-format
 msgid "Track %d not found."
 msgstr "Traccia %d non trovata."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:285
+#: src/cdaudio/cdaudio-ng.cc:264
 #, c-format
 msgid "Track %d is a data track."
 msgstr "La traccia %d è una traccia dati."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:360
+#: src/cdaudio/cdaudio-ng.cc:339
 msgid "Error reading audio CD."
 msgstr "Errore durante la lettura del CD Audio."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:429
+#: src/cdaudio/cdaudio-ng.cc:410
 msgid "Audio CD"
 msgstr "CD Audio"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:460 src/cdaudio-ng/cdaudio-ng.cc:469
+#: src/cdaudio/cdaudio-ng.cc:446 src/cdaudio/cdaudio-ng.cc:455
 #, c-format
 msgid "Failed to open CD device %s."
 msgstr "Errore nell'apertura del lettore CD %s."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:472
+#: src/cdaudio/cdaudio-ng.cc:458
 msgid "No audio capable CD drive found."
 msgstr "Nessuna unità CD audio adatta trovata."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:497
+#: src/cdaudio/cdaudio-ng.cc:481
+msgid "Drive is empty."
+msgstr "Il drive è vuoto."
+
+#: src/cdaudio/cdaudio-ng.cc:483
+msgid "Unsupported disk type."
+msgstr "Tipo di disco non supportato."
+
+#: src/cdaudio/cdaudio-ng.cc:507
 msgid "Failed to finish initializing opened CD drive."
 msgstr "Errore alla fine dell'inizializzazione dell'unità CD aperta."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:510
+#: src/cdaudio/cdaudio-ng.cc:520
 msgid "Failed to retrieve first/last track number."
 msgstr "Errore nella ricerca del primo/ultimo numero della traccia."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:531
+#: src/cdaudio/cdaudio-ng.cc:541
 #, c-format
 msgid "Cannot read start/end LSN for track %d."
 msgstr "Impossibile leggere inizio/fine dell'LNS per la traccia %d."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:613
-msgid "Failed to create the cddb connection."
-msgstr "Errore nella creazione della connessione al cddb."
+#: src/cdaudio/cdaudio-ng.cc:624
+msgid "Failed to create the CDDB connection."
+msgstr "Errore nella creazione della connessione al CDDB."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:679
+#: src/cdaudio/cdaudio-ng.cc:690
 msgid "Failed to query the CDDB server"
 msgstr "Errore nella richiesta al server CDDB."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:681
+#: src/cdaudio/cdaudio-ng.cc:692
 #, c-format
 msgid "Failed to query the CDDB server: %s"
 msgstr "Errore nella richiesta al server CDDB: %s"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:705
+#: src/cdaudio/cdaudio-ng.cc:716
 #, c-format
-msgid "Failed to read the cddb info: %s"
-msgstr "Errore nella lettura delle informazioni del cddb: %s"
-
-#: src/cdaudio-ng/cdaudio-ng.cc:765
-msgid "Drive is empty."
-msgstr "Il drive è vuoto."
-
-#: src/cdaudio-ng/cdaudio-ng.cc:767
-msgid "Unsupported disk type."
-msgstr "Tipo di disco non supportato."
+msgid "Failed to read the CDDB info: %s"
+msgstr "Errore nella lettura delle informazioni del CDDB: %s"
 
-#: src/cd-menu-items/cd-menu-items.cc:35
+#: src/cd-menu-items/cd-menu-items.cc:33
 msgid "Audio CD Menu Items"
 msgstr "Voci di menu CD Audio"
 
-#: src/cd-menu-items/cd-menu-items.cc:47
-msgid "Play CD"
-msgstr "Riproduci CD"
-
-#: src/cd-menu-items/cd-menu-items.cc:47
-msgid "Add CD"
-msgstr "Aggiungi CD"
+#: src/cd-menu-items/cd-menu-items.cc:45
+msgid "Pla_y CD"
+msgstr "Ripro_duci CD"
+
+#: src/cd-menu-items/cd-menu-items.cc:45
+msgid "_Add CD"
+msgstr "_Aggiungi CD"
 
 #: src/compressor/compressor.cc:45
 msgid "Compression"
@@ -1023,7 +874,14 @@
 msgid "Default song length:"
 msgstr "Durata brano predefinita:"
 
-#: src/console/plugin.cc:42 src/modplug/plugin_main.cc:59
+#: src/console/plugin.cc:41 src/crossfade/crossfade.cc:56
+#: src/crossfade/crossfade.cc:62 src/lirc/lirc.cc:395 src/notify/notify.cc:113
+#: src/sid/xs_config.cc:85 src/sid/xs_config.cc:94 src/sid/xs_config.cc:103
+#: src/vumeter-qt/vumeter_qt.cc:39
+msgid "seconds"
+msgstr "secondi"
+
+#: src/console/plugin.cc:42 src/modplug/plugin_main.cc:58
 msgid "Resampling"
 msgstr "Resampling"
 
@@ -1047,29 +905,40 @@
 msgid "Game Console Music Decoder"
 msgstr "Decodificatore musica console giochi"
 
-#: src/coreaudio/coreaudio.cc:50
+#: src/coreaudio/coreaudio.cc:53
 msgid "CoreAudio output"
 msgstr "Uscita CoreAudio"
 
-#: src/coreaudio/coreaudio.cc:131
+#: src/coreaudio/coreaudio.cc:155
 msgid ""
 "CoreAudio Output Plugin for Audacious\n"
 "Copyright 2014 William Pitcock\n"
+"Copyright 2017,18 René J.V. Bertin\n"
+" (original code and code adapted from\n"
+" Apple examples, (C) Apple 2013)\n"
 "\n"
 "Based on SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
 msgstr ""
-"Plugin CoreAudio Output per Audacious\n"
+"CoreAudio Output Plugin for Audacious\n"
 "Copyright 2014 William Pitcock\n"
+"Copyright 2017,18 René J.V. Bertin\n"
+"(original code and code adapted from\n"
+"Apple examples, (C) Apple 2013)\n"
 "\n"
-"Basato sul plugin SDL Output per Audacious\n"
+"Based on SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
 
-#: src/coreaudio/coreaudio.cc:143
+#: src/coreaudio/coreaudio.cc:171
 msgid "Use exclusive mode"
 msgstr "Usa la modalità esclusiva"
 
-#: src/crossfade/crossfade.cc:44
+#: src/coreaudio/coreaudio.cc:173
+msgid "Use bit perfect audio (adapt device sampling rate)"
+msgstr ""
+"Usa il perfetto bit audio (adatta il tasso di campionamento della periferica)"
+
+#: src/crossfade/crossfade.cc:47
 msgid ""
 "Crossfade Plugin for Audacious\n"
 "Copyright 2010-2014 John Lindgren"
@@ -1077,27 +946,43 @@
 "Plugin Crossfade per Audacious\n"
 "Copyright 2010-2014 John Lindgren"
 
-#: src/crossfade/crossfade.cc:48
+#: src/crossfade/crossfade.cc:51
 msgid "Crossfade"
 msgstr "Dissolvenza incrociata"
 
-#: src/crossfade/crossfade.cc:49
+#: src/crossfade/crossfade.cc:52
 msgid "On automatic song change"
 msgstr "Su cambiamento automatico della canzone"
 
-#: src/crossfade/crossfade.cc:51 src/crossfade/crossfade.cc:57
+#: src/crossfade/crossfade.cc:54 src/crossfade/crossfade.cc:60
 msgid "Overlap:"
 msgstr "Sovrapposizione:"
 
-#: src/crossfade/crossfade.cc:55
+#: src/crossfade/crossfade.cc:58
 msgid "On seek or manual song change"
 msgstr "Sulla ricerca o cambiamento manuale della canzone"
 
-#: src/crossfade/crossfade.cc:61
+#: src/crossfade/crossfade.cc:64
+msgid "No fade in"
+msgstr ""
+
+#: src/crossfade/crossfade.cc:66
+msgid "Use S-curve fade"
+msgstr ""
+
+#: src/crossfade/crossfade.cc:68
+msgid "S-curve steepness:"
+msgstr ""
+
+#: src/crossfade/crossfade.cc:70
+msgid "(higher is steeper)"
+msgstr ""
+
+#: src/crossfade/crossfade.cc:72
 msgid "Tip"
 msgstr "Suggerimento"
 
-#: src/crossfade/crossfade.cc:62
+#: src/crossfade/crossfade.cc:73
 msgid ""
 "For better crossfading, enable\n"
 "the Silence Removal effect."
@@ -1105,29 +990,10 @@
 "Per una dissolvenza migliore, abilitare\n"
 "l'effetto Rimozione del Silenzio"
 
-#: src/crossfade/crossfade.cc:72
+#: src/crossfade/crossfade.cc:83
 msgid "Crossfade"
 msgstr "Dissolvenza incrociata"
 
-#: src/crossfade/crossfade.cc:161
-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.cc:168
-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/crystalizer/crystalizer.cc:31
 msgid "Crystalizer"
 msgstr "Crystalizer"
@@ -1140,60 +1006,61 @@
 msgid "Crystalizer"
 msgstr "Crystalizer"
 
-#: src/cue/cue.cc:37
+#: src/cue/cue.cc:42
 msgid "Cue Sheet Plugin"
 msgstr "Plugin Cue Sheet"
 
-#: src/delete-files/delete-files.cc:46 src/delete-files/delete-files.cc:146
+#: src/delete-files/delete-files.cc:53 src/delete-files/delete-files.cc:215
+#: src/delete-files/delete-files.cc:230
 msgid "Delete Files"
 msgstr "Cancella files"
 
-#: src/delete-files/delete-files.cc:75
+#: src/delete-files/delete-files.cc:120
+msgid "No files are selected."
+msgstr "Nessun file selezionato"
+
+#: src/delete-files/delete-files.cc:125
 #, c-format
-msgid "Error moving %s to trash: %s."
-msgstr "Si è verificato un errore spostando %s nel cestino: %s"
+msgid "Do you want to move %s to the trash?"
+msgstr "Vuoi spostare %s nel cestino?"
 
-#: src/delete-files/delete-files.cc:86
+#: src/delete-files/delete-files.cc:126
 #, c-format
-msgid "Error deleting %s: %s."
-msgstr "Si è verificato un errore eliminando %s: %s"
+msgid "Do you want to permanently delete %s?"
+msgstr "Vuoi cancellare %s definitivamente?"
 
-#: src/delete-files/delete-files.cc:117
+#: src/delete-files/delete-files.cc:133
 #, c-format
-msgid "Error deleting %s: not a local file."
-msgstr "Si è verificato un errore eliminando %s: file non locale"
+msgid "Do you want to move %d files to the trash?"
+msgstr "Vuoi spostare %d file nel cestino?"
 
 #: src/delete-files/delete-files.cc:134
-msgid "Do you want to move the selected files to the trash?"
-msgstr "Vuoi spostare i files selezionati nel cestino?"
+#, c-format
+msgid "Do you want to permanently delete %d files?"
+msgstr "Vuoi eliminare definitivamente%d file?"
 
-#: src/delete-files/delete-files.cc:135
-msgid "Move to Trash"
+#: src/delete-files/delete-files.cc:146
+msgid "Move to trash"
 msgstr "Sposta nel cestino"
 
-#: src/delete-files/delete-files.cc:140
-msgid "Do you want to permanently delete the selected files?"
-msgstr "Vuoi cancellare permanentemente i files selezionati?"
-
-#: src/delete-files/delete-files.cc:141 src/skins/preset-list.cc:411
-#: src/skins/preset-list.cc:427
+#: src/delete-files/delete-files.cc:146
 msgid "Delete"
 msgstr "Elimina"
 
-#: src/delete-files/delete-files.cc:145 src/skins/preset-browser.cc:56
-#: src/skins/preset-list.cc:307 src/skins/ui_playlist.cc:221
+#: src/delete-files/delete-files.cc:213 src/delete-files/delete-files.cc:235
+#: src/skins-qt/search-select.cc:102 src/skins/search-select.cc:78
 msgid "Cancel"
 msgstr "Annulla"
 
-#: src/delete-files/delete-files.cc:166
+#: src/delete-files/delete-files.cc:267
 msgid "Delete Selected Files"
 msgstr "Cancella files selezionati"
 
-#: src/delete-files/delete-files.cc:181
+#: src/delete-files/delete-files.cc:287
 msgid "Delete Method"
 msgstr "Metodo di cancellazione"
 
-#: src/delete-files/delete-files.cc:182
+#: src/delete-files/delete-files.cc:288
 msgid "Move to trash instead of deleting immediately"
 msgstr "Sposta nel cestino invece di cancellare immediatamente"
 
@@ -1213,13 +1080,13 @@
 msgid "Echo"
 msgstr "Eco"
 
-#: src/echo_plugin/echo.cc:22 src/modplug/plugin_main.cc:73
-#: src/modplug/plugin_main.cc:83
+#: src/echo_plugin/echo.cc:22 src/modplug/plugin_main.cc:72
+#: src/modplug/plugin_main.cc:82
 msgid "Delay:"
 msgstr "Ritardo: "
 
-#: src/echo_plugin/echo.cc:24 src/modplug/plugin_main.cc:73
-#: src/modplug/plugin_main.cc:83
+#: src/echo_plugin/echo.cc:24 src/modplug/plugin_main.cc:72
+#: src/modplug/plugin_main.cc:82 src/xsf/plugin.cc:445
 msgid "ms"
 msgstr "ms"
 
@@ -1227,7 +1094,7 @@
 msgid "Feedback:"
 msgstr "Feedback: "
 
-#: src/echo_plugin/echo.cc:28 src/modplug/plugin_main.cc:87
+#: src/echo_plugin/echo.cc:28 src/modplug/plugin_main.cc:86
 msgid "Volume:"
 msgstr "Volume: "
 
@@ -1235,11 +1102,11 @@
 msgid "Echo"
 msgstr "Echo"
 
-#: src/ffaudio/ffaudio-core.cc:41
+#: src/ffaudio/ffaudio-core.cc:50
 msgid "FFmpeg Plugin"
 msgstr "Plugin FFmpeg"
 
-#: src/ffaudio/ffaudio-core.cc:571
+#: src/ffaudio/ffaudio-core.cc:649
 msgid ""
 "Multi-format audio decoding plugin for Audacious using\n"
 "FFmpeg multimedia framework (http://www.ffmpeg.org/)\n"
@@ -1255,72 +1122,37 @@
 "William Pitcock <nenolod@nenolod.net>\n"
 "Matti Hämäläinen <ccr@tnsp.org>"
 
-#: src/filewriter/filewriter.cc:45
+#: src/filewriter/filewriter.cc:48
 msgid "FileWriter Plugin"
 msgstr "Plugin FileWriter"
 
-#: src/filewriter/filewriter.cc:386
-msgid "Output file format:"
-msgstr "Formato del file in uscita:"
-
-#: src/filewriter/filewriter.cc:403
-msgid "Configure"
-msgstr "Configura"
-
-#: src/filewriter/filewriter.cc:413
-msgid "Save into original directory"
-msgstr "Salva nella directory originale"
-
-#: src/filewriter/filewriter.cc:417
-msgid "Save into custom directory"
-msgstr "Salva in directory personalizzata"
-
-#: src/filewriter/filewriter.cc:427
-msgid "Output file folder:"
-msgstr "Cartella del file in uscita:"
-
-#: src/filewriter/filewriter.cc:431
-msgid "Pick a folder"
-msgstr "Seleziona una cartella"
-
-#: src/filewriter/filewriter.cc:444
-msgid "Generate file name from:"
-msgstr "Genera il nome del file da:"
-
-#: src/filewriter/filewriter.cc:448
-msgid "Original file tag"
-msgstr "Tag del file originale"
-
-#: src/filewriter/filewriter.cc:453
-msgid "Original file name"
-msgstr "Nome del file originale"
-
-#: src/filewriter/filewriter.cc:459
-msgid "Include original file name extension"
-msgstr "Tieni l'estensione del nome originale del file"
-
-#: src/filewriter/filewriter.cc:468
-msgid "Prepend track number to file name"
-msgstr "Anteponi numero di traccia al nome del file"
+#: src/filewriter/filewriter.cc:316
+#, c-format
+msgid ""
+"Error opening %s:\n"
+"%s"
+msgstr ""
+"Errore durante l'apertura di %s:\n"
+"%s"
 
-#: src/filewriter/filewriter.cc:484
+#: src/filewriter/filewriter.cc:358
 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"
+"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"
-"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."
+"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 ""
-"Il programma è un software gratuito; puoi ridistribuirlo e/o modificarlo\n"
+"Questo 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"
@@ -1336,169 +1168,278 @@
 "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
 "USA."
 
-#: src/filewriter/mp3.cc:40 src/filewriter/mp3.cc:717
+#: src/filewriter/filewriter.cc:385
+msgid "Output file format:"
+msgstr "Formato del file in uscita:"
+
+#: src/filewriter/filewriter.cc:389
+msgid "Save into original directory"
+msgstr "Salva nella directory originale"
+
+#: src/filewriter/filewriter.cc:392
+msgid "Save into custom directory:"
+msgstr "Salva nella directory personalizzata:"
+
+#: src/filewriter/filewriter.cc:400
+msgid "Generate file name from:"
+msgstr "Genera il nome del file da:"
+
+#: src/filewriter/filewriter.cc:401
+msgid "Original file name"
+msgstr "Nome del file originale"
+
+#: src/filewriter/filewriter.cc:404
+msgid "Original file name (no suffix)"
+msgstr "Nome del file originale (senza suffisso)"
+
+#: src/filewriter/filewriter.cc:407
+msgid "Original file tag"
+msgstr "Tag del file originale"
+
+#: src/filewriter/filewriter.cc:411
+msgid "Prepend track number to file name"
+msgstr "Anteponi numero di traccia al nome del file"
+
+#: src/filewriter/filewriter.cc:417 src/filewriter/filewriter.cc:449
 msgid "Auto"
 msgstr "Auto"
 
-#: src/filewriter/mp3.cc:40
+#: src/filewriter/filewriter.cc:418
+msgid "8000 Hz"
+msgstr "8000 Hz"
+
+#: src/filewriter/filewriter.cc:419
+msgid "11025 Hz"
+msgstr "11025 Hz"
+
+#: src/filewriter/filewriter.cc:420
+msgid "12000 Hz"
+msgstr "12000 Hz"
+
+#: src/filewriter/filewriter.cc:421
+msgid "16000 Hz"
+msgstr "16000 Hz"
+
+#: src/filewriter/filewriter.cc:422
+msgid "22050 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:423
+msgid "24000 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:424
+msgid "32000 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:425 src/xsf/plugin.cc:430
+msgid "44100 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:426 src/xsf/plugin.cc:431
+msgid "48000 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:430
+msgid "8 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:431
+msgid "16 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:432
+msgid "32 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:433
+msgid "40 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:434
+msgid "48 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:435
+msgid "56 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:436
+msgid "64 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:437
+msgid "80 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:438
+msgid "96 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:439
+msgid "112 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:440
+msgid "128 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:441
+msgid "160 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:442
+msgid "192 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:443
+msgid "224 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:444
+msgid "256 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:445
+msgid "320 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:450
 msgid "Joint Stereo"
 msgstr "Joint stereo"
 
-#: src/filewriter/mp3.cc:41 src/modplug/plugin_main.cc:58
-#: src/mpg123/mpg123.cc:248
+#: src/filewriter/filewriter.cc:451 src/modplug/plugin_main.cc:57
+#: src/mpg123/mpg123.cc:259
 msgid "Stereo"
 msgstr "Stereo"
 
-#: src/filewriter/mp3.cc:41 src/modplug/plugin_main.cc:57
-#: src/mpg123/mpg123.cc:248
+#: src/filewriter/filewriter.cc:452 src/modplug/plugin_main.cc:56
+#: src/mpg123/mpg123.cc:260
 msgid "Mono"
 msgstr "Mono"
 
-#: src/filewriter/mp3.cc:657
-msgid "MP3 Configuration"
-msgstr "Configurazione MP3"
-
-#: src/filewriter/mp3.cc:658
-msgid "_OK"
-msgstr "_OK"
-
-#: src/filewriter/mp3.cc:681
-msgid "Algorithm Quality:"
-msgstr "Qualità dell'algoritmo:"
-
-#: src/filewriter/mp3.cc:706
-msgid "Output Sample Rate:"
-msgstr "Frequenza di campionamento in uscita:"
-
-#: src/filewriter/mp3.cc:733
-msgid "(Hz)"
-msgstr "(Hz)"
-
-#: src/filewriter/mp3.cc:740
-msgid "Bitrate / Compression Ratio:"
-msgstr "Rapporto bitrate / compressione:"
-
-#: src/filewriter/mp3.cc:764
-msgid "Bitrate (kbps):"
-msgstr "Bitrate (kbps):"
+#: src/filewriter/filewriter.cc:456
+msgid "VBR"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:457
+msgid "ABR"
+msgstr ""
 
-#: src/filewriter/mp3.cc:796
+#: src/filewriter/filewriter.cc:478
+msgid "Algorithm quality:"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:484
+msgid "Bitrate:"
+msgstr "Bitrate:"
+
+#: src/filewriter/filewriter.cc:491
 msgid "Compression ratio:"
 msgstr "Fattore di compressione:"
 
-#: src/filewriter/mp3.cc:820
-msgid "Audio Mode:"
+#: src/filewriter/filewriter.cc:498
+msgid "Audio mode:"
 msgstr "Modalità audio:"
 
-#: src/filewriter/mp3.cc:845
-msgid "Miscellaneous:"
-msgstr "Varie:"
-
-#: src/filewriter/mp3.cc:856
+#: src/filewriter/filewriter.cc:501
 msgid "Enforce strict ISO compliance"
 msgstr "Imponi rispetto rigoroso conformità ISO"
 
-#: src/filewriter/mp3.cc:867
+#: src/filewriter/filewriter.cc:503
 msgid "Error protection"
 msgstr "Protezione dagli errori"
 
-#: src/filewriter/mp3.cc:879 src/filewriter/vorbis.cc:206
-msgid "Quality"
-msgstr "Qualità"
-
-#: src/filewriter/mp3.cc:888
+#: src/filewriter/filewriter.cc:508
 msgid "Enable VBR/ABR"
 msgstr "Abilita VBR/ABR"
 
-#: src/filewriter/mp3.cc:898
+#: src/filewriter/filewriter.cc:510
 msgid "Type:"
 msgstr "Tipo:"
 
-#: src/filewriter/mp3.cc:931
-msgid "VBR Options:"
-msgstr "Opzioni VBR:"
-
-#: src/filewriter/mp3.cc:947
-msgid "Minimum bitrate (kbps):"
-msgstr "Bitrate minima (kbps):"
-
-#: src/filewriter/mp3.cc:973
-msgid "Maximum bitrate (kbps):"
-msgstr "Bitrate massima (kbps):"
+#: src/filewriter/filewriter.cc:514
+msgid "Minimum bitrate:"
+msgstr ""
 
-#: src/filewriter/mp3.cc:995
-msgid "Strictly enforce minimum bitrate"
-msgstr "Rispetta rigorosamente bitrate minima"
+#: src/filewriter/filewriter.cc:518
+msgid "Maximum bitrate:"
+msgstr ""
 
-#: src/filewriter/mp3.cc:1007
-msgid "ABR Options:"
-msgstr "Opzioni ABR:"
-
-#: src/filewriter/mp3.cc:1017
-msgid "Average bitrate (kbps):"
-msgstr "Bitrate media (kbps):"
+#: src/filewriter/filewriter.cc:522
+msgid "Average bitrate:"
+msgstr ""
 
-#: src/filewriter/mp3.cc:1044
+#: src/filewriter/filewriter.cc:526
 msgid "VBR quality level:"
 msgstr "Livello di qualità VBR:"
 
-#: src/filewriter/mp3.cc:1063
+#: src/filewriter/filewriter.cc:530
+msgid "Strictly enforce minimum bitrate"
+msgstr "Rispetta rigorosamente bitrate minima"
+
+#: src/filewriter/filewriter.cc:533
 msgid "Omit Xing VBR header"
 msgstr "Ometti l'intestazione VBR Xing"
 
-#: src/filewriter/mp3.cc:1076
-msgid "VBR/ABR"
-msgstr "VBR/ABR"
-
-#: src/filewriter/mp3.cc:1085
-msgid "Frame Parameters:"
-msgstr "Parametri del frame:"
+#: src/filewriter/filewriter.cc:539
+msgid "Frame Headers"
+msgstr ""
 
-#: src/filewriter/mp3.cc:1097
+#: src/filewriter/filewriter.cc:540
 msgid "Mark as copyright"
 msgstr "Contrassegna come coperto da copyright"
 
-#: src/filewriter/mp3.cc:1108
+#: src/filewriter/filewriter.cc:542
 msgid "Mark as original"
 msgstr "Contrassegna come originale"
 
-#: src/filewriter/mp3.cc:1120
-msgid "ID3 Parameters:"
-msgstr "Parametri ID3:"
+#: src/filewriter/filewriter.cc:544
+msgid "ID3 Tags"
+msgstr ""
 
-#: src/filewriter/mp3.cc:1131
+#: src/filewriter/filewriter.cc:545
 msgid "Force addition of version 2 tag"
 msgstr "Forza aggiunta del tag versione 2"
 
-#: src/filewriter/mp3.cc:1141
+#: src/filewriter/filewriter.cc:547
 msgid "Only add v1 tag"
 msgstr "Aggiungi solo tag v1"
 
-#: src/filewriter/mp3.cc:1148
+#: src/filewriter/filewriter.cc:549
 msgid "Only add v2 tag"
 msgstr "Aggiungi solo tag v2"
 
-#: src/filewriter/mp3.cc:1169
+#: src/filewriter/filewriter.cc:554
+msgid "Quality"
+msgstr "Qualità"
+
+#: src/filewriter/filewriter.cc:555
+msgid "VBR/ABR"
+msgstr "VBR/ABR"
+
+#: src/filewriter/filewriter.cc:556
 msgid "Tags"
 msgstr "Tag"
 
-#: src/filewriter/vorbis.cc:196
-msgid "Vorbis Encoder Configuration"
-msgstr "Configurazione del codificatore Vorbis"
-
-#: src/filewriter/vorbis.cc:219
-msgid "Quality level (0 - 10):"
-msgstr "Livello di qualità (0 - 10):"
+#: src/filewriter/filewriter.cc:566
+msgid "Quality (0-1):"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:573 src/skins-qt/skins_cfg.cc:307
+#: src/skins/skins_cfg.cc:289
+msgid "General"
+msgstr "Generale"
 
-#: src/flacng/flacng.h:35
+#: src/flac/flacng.h:36
 msgid "FLAC Decoder"
 msgstr "Decodificatore FLAC"
 
-#: src/flacng/metadata.cc:351 src/wavpack/wavpack.cc:209
+#: src/flac/metadata.cc:296 src/wavpack/wavpack.cc:215
 msgid "lossless"
 msgstr "senza perdita"
 
-#: src/flacng/plugin.cc:169
+#: src/flac/plugin.cc:214
 msgid ""
 "Original code by\n"
 "Ralf Ertzinger <ralf@skytale.net>\n"
@@ -1522,15 +1463,15 @@
 msgid "GIO Plugin"
 msgstr "Plugin GIO"
 
-#: src/gio/gio.cc:153
+#: src/gio/gio.cc:152
 msgid "Read-and-append mode not supported"
 msgstr "Modalità Leggi-e-aggiungi non supportata"
 
-#: src/gio/gio.cc:166
+#: src/gio/gio.cc:165
 msgid "Invalid open mode"
 msgstr "Modalità di apertura non valida"
 
-#: src/gl-spectrum/gl-spectrum.cc:51
+#: src/glspectrum/gl-spectrum.cc:52
 msgid ""
 "OpenGL Spectrum Analyzer for Audacious\n"
 "Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
@@ -1550,636 +1491,755 @@
 "\n"
 "Licenza: GPLv2+"
 
-#: src/gl-spectrum/gl-spectrum.cc:62
+#: src/glspectrum/gl-spectrum.cc:63 src/qtglspectrum/gl-spectrum.cc:53
 msgid "OpenGL Spectrum Analyzer"
 msgstr "OpenGL Spectrum Analyzer"
 
-#: src/gl-spectrum-qt/gl-spectrum.cc:41
-msgid ""
-"OpenGL Spectrum Analyzer for Audacious\n"
-"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
-"Copyright 2014 William Pitcock\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 ""
-"Analizzatore di Spettro OpenGL per Audacious\n"
-"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
-"Copyright 2014 William Pitcock\n"
-"\n"
-"Basato sul plugin di XMMS\n"
-"Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson, \n"
-"e 4Front Technologies\n"
-"\n"
-"Licenza: GPLv2+"
-
-#: src/gl-spectrum-qt/gl-spectrum.cc:53
-msgid "OpenGL Spectrum Analyzer (Qt)"
-msgstr "Analizzatore di Spettro OpenGL (Qt)"
-
-#: src/gnomeshortcuts/gnomeshortcuts.cc:38
-msgid "GNOME Shortcuts"
-msgstr "Scorciatoie di GNOME"
-
-#: src/gnomeshortcuts/gnomeshortcuts.cc:54
-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>"
+#: src/gtkui/columns.cc:36 src/moonstone/playlist_model.cc:38
+#: src/qtui/playlist_model.cc:33
+msgid "Entry Number"
 msgstr ""
-"Plugin GNOME Shortcut\n"
-"Permette di controllare il lettore con le scorciatoie di GNOME.\n"
-"\n"
-"Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>"
 
-#: src/gtkui/columns.cc:35
-msgid "Entry number"
-msgstr "Numero elemento"
-
-#: src/gtkui/columns.cc:36 src/playlist-manager/playlist-manager.cc:225
-#: src/qtui/playlist_model.cc:123
+#: src/gtkui/columns.cc:37 src/moonstone/playlist_model.cc:38
+#: src/moonstone/playlist_selection.cc:64
+#: src/playlist-manager/playlist-manager.cc:200
+#: src/playlist-manager-qt/playlist-manager-qt.cc:188
+#: src/qtui/playlist_model.cc:33 src/streamtuner/icecast-model.cc:120
+#: src/streamtuner/ihr-model.cc:159 src/streamtuner/shoutcast-model.cc:122
 msgid "Title"
 msgstr "Titolo"
 
-#: src/gtkui/columns.cc:37 src/qtui/playlist_model.cc:125
+#: src/gtkui/columns.cc:38 src/moonstone/playlist_model.cc:39
+#: src/qtui/playlist_model.cc:33
 msgid "Artist"
 msgstr "Artista"
 
-#: src/gtkui/columns.cc:38
+#: src/gtkui/columns.cc:39 src/moonstone/playlist_model.cc:39
+#: src/qtui/playlist_model.cc:33
 msgid "Year"
 msgstr "Anno"
 
-#: src/gtkui/columns.cc:39 src/qtui/playlist_model.cc:127
+#: src/gtkui/columns.cc:40 src/moonstone/playlist_model.cc:39
+#: src/qtui/playlist_model.cc:34
 msgid "Album"
 msgstr "Album"
 
-#: src/gtkui/columns.cc:40
-msgid "Album artist"
-msgstr "Artista"
+#: src/gtkui/columns.cc:41 src/moonstone/playlist_model.cc:40
+#: src/qtui/playlist_model.cc:34
+msgid "Album Artist"
+msgstr "Album Artista"
 
-#: src/gtkui/columns.cc:41
+#: src/gtkui/columns.cc:42 src/moonstone/playlist_model.cc:40
+#: src/qtui/playlist_model.cc:34
 msgid "Track"
 msgstr "Traccia"
 
-#: src/gtkui/columns.cc:42
+#: src/gtkui/columns.cc:43 src/moonstone/playlist_model.cc:40
+#: src/qtui/playlist_model.cc:34 src/streamtuner/icecast-model.cc:123
+#: src/streamtuner/shoutcast-model.cc:125
+#: src/streamtuner/shoutcast-model.cc:236
 msgid "Genre"
 msgstr "Genere"
 
-#: src/gtkui/columns.cc:43
-msgid "Queue position"
+#: src/gtkui/columns.cc:44 src/moonstone/playlist_model.cc:41
+#: src/qtui/playlist_model.cc:35
+msgid "Queue Position"
 msgstr "Posizione nella coda"
 
-#: src/gtkui/columns.cc:44
+#: src/gtkui/columns.cc:45 src/moonstone/playlist_model.cc:41
+#: src/qtui/playlist_model.cc:35
 msgid "Length"
 msgstr "Durata"
 
-#: src/gtkui/columns.cc:45
-msgid "File path"
-msgstr "Percorso del file"
-
-#: src/gtkui/columns.cc:47
-msgid "Custom title"
-msgstr "Titolo personalizzato"
+#: src/gtkui/columns.cc:46 src/moonstone/playlist_model.cc:41
+#: src/qtui/playlist_model.cc:35
+msgid "File Path"
+msgstr ""
+
+#: src/gtkui/columns.cc:47 src/moonstone/playlist_model.cc:42
+#: src/qtui/playlist_model.cc:35
+msgid "File Name"
+msgstr "Nome del file"
+
+#: src/gtkui/columns.cc:48 src/moonstone/playlist_model.cc:42
+#: src/qtui/playlist_model.cc:36
+msgid "Custom Title"
+msgstr ""
 
-#: src/gtkui/columns.cc:48
+#: src/gtkui/columns.cc:49 src/moonstone/playlist_model.cc:42
+#: src/qtui/playlist_model.cc:36 src/streamtuner/icecast-model.cc:129
+#: src/streamtuner/shoutcast-model.cc:134
 msgid "Bitrate"
 msgstr "Bitrate"
 
-#: src/gtkui/columns.cc:308
+#: src/gtkui/columns.cc:50 src/moonstone/playlist_model.cc:43
+#: src/qtui/playlist_model.cc:36
+msgid "Comment"
+msgstr "Commento"
+
+#: src/gtkui/columns.cc:51 src/qtui/playlist_model.cc:36
+msgid "Publisher"
+msgstr ""
+
+#: src/gtkui/columns.cc:52 src/qtui/playlist_model.cc:37
+msgid "Catalog Number"
+msgstr ""
+
+#: src/gtkui/columns.cc:53 src/moonstone/playlist_model.cc:43
+#: src/qtui/playlist_model.cc:37
+msgid "Disc"
+msgstr ""
+
+#: src/gtkui/columns.cc:325
 msgid "Available columns"
 msgstr "Colonne disponibili"
 
-#: src/gtkui/columns.cc:334
+#: src/gtkui/columns.cc:351
 msgid "Displayed columns"
 msgstr "Colonne visualizzate"
 
-#: src/gtkui/layout.cc:72 src/search-tool/search-tool.cc:40
+#: src/gtkui/layout.cc:74 src/search-tool-qt/search-tool-qt.cc:58
+#: src/search-tool/search-tool.cc:49
 msgid "Search Tool"
 msgstr "Tool di ricerca"
 
-#: src/gtkui/layout.cc:167
+#: src/gtkui/layout.cc:170
 msgid "Dock at Left"
 msgstr "Aggancia a sinistra"
 
-#: src/gtkui/layout.cc:167
+#: src/gtkui/layout.cc:170
 msgid "Dock at Right"
 msgstr "Aggancia a destra"
 
-#: src/gtkui/layout.cc:168
+#: src/gtkui/layout.cc:171
 msgid "Dock at Top"
 msgstr "Aggancia in alto"
 
-#: src/gtkui/layout.cc:168
+#: src/gtkui/layout.cc:171
 msgid "Dock at Bottom"
 msgstr "Aggancia in basso"
 
-#: src/gtkui/layout.cc:168
+#: src/gtkui/layout.cc:171
 msgid "Undock"
 msgstr "Sgancia"
 
-#: src/gtkui/layout.cc:168 src/ladspa/plugin.cc:531
+#: src/gtkui/layout.cc:171 src/ladspa/plugin.cc:540
 msgid "Disable"
 msgstr "Disabilita"
 
-#: src/gtkui/menus.cc:126 src/qtui/main_window_actions.cc:93
-#: src/statusicon/statusicon.cc:276
+#: src/gtkui/menus.cc:79 src/qtui/menus.cc:107
+#: src/statusicon-qt/statusicon.cc:115 src/statusicon/statusicon.cc:286
 msgid "_Open Files ..."
 msgstr "_Apri file…"
 
-#: src/gtkui/menus.cc:127
+#: src/gtkui/menus.cc:80 src/qtui/menus.cc:111
 msgid "Open _URL ..."
 msgstr "Apri _URL…"
 
-#: src/gtkui/menus.cc:128 src/qtui/main_window_actions.cc:95
+#: src/gtkui/menus.cc:81 src/qtui/menus.cc:113
 msgid "_Add Files ..."
 msgstr "A_ggiungi file…"
 
-#: src/gtkui/menus.cc:129
+#: src/gtkui/menus.cc:82 src/qtui/menus.cc:118
 msgid "Add U_RL ..."
 msgstr "Aggiungi U_RL…"
 
-#: src/gtkui/menus.cc:131
+#: src/gtkui/menus.cc:84 src/qtui/menus.cc:120
 msgid "Search _Library"
 msgstr "Cerca nella _Libreria"
 
-#: src/gtkui/menus.cc:133 src/qtui/main_window_actions.cc:98
+#: src/gtkui/menus.cc:86 src/qtui/menus.cc:123
 msgid "A_bout ..."
 msgstr "I_nformazioni su…"
 
-#: src/gtkui/menus.cc:134 src/qtui/main_window_actions.cc:99
+#: src/gtkui/menus.cc:87 src/qtui/menus.cc:125
 msgid "_Settings ..."
 msgstr "_Configurazione ..."
 
-#: src/gtkui/menus.cc:135 src/qtui/main_window_actions.cc:103
-#: src/statusicon/statusicon.cc:284
+#: src/gtkui/menus.cc:88 src/qtui/menus.cc:131
+#: src/statusicon-qt/statusicon.cc:117 src/statusicon/statusicon.cc:288
 msgid "_Quit"
 msgstr "_Esci"
 
-#: src/gtkui/menus.cc:139 src/gtkui/menus.cc:262
-#: src/qtui/main_window_actions.cc:107 src/search-tool/search-tool.cc:641
-#: src/statusicon/statusicon.cc:278
+#: src/gtkui/menus.cc:92 src/gtkui/menus.cc:226
+#: src/moonstone/playlist_tabs.cc:306 src/qtui/menus.cc:135
+#: src/qtui/playlist_tabs.cc:331 src/search-tool-qt/search-tool-qt.cc:499
+#: src/search-tool/search-tool.cc:339 src/statusicon-qt/statusicon.cc:109
+#: src/statusicon/statusicon.cc:280
 msgid "_Play"
 msgstr "_Riproduci"
 
-#: src/gtkui/menus.cc:140 src/qtui/main_window_actions.cc:108
-#: src/statusicon/statusicon.cc:279
+#: src/gtkui/menus.cc:93 src/qtui/menus.cc:137
+#: src/statusicon-qt/statusicon.cc:110 src/statusicon/statusicon.cc:281
 msgid "Paus_e"
 msgstr "Interro_mpi"
 
-#: src/gtkui/menus.cc:141 src/qtui/main_window_actions.cc:109
-#: src/statusicon/statusicon.cc:280
+#: src/gtkui/menus.cc:94 src/qtui/menus.cc:139
+#: src/statusicon-qt/statusicon.cc:111 src/statusicon/statusicon.cc:282
 msgid "_Stop"
 msgstr "_Ferma"
 
-#: src/gtkui/menus.cc:142 src/qtui/main_window_actions.cc:110
-#: src/statusicon/statusicon.cc:277
+#: src/gtkui/menus.cc:95 src/qtui/menus.cc:141
+#: src/statusicon-qt/statusicon.cc:112 src/statusicon/statusicon.cc:283
 msgid "Pre_vious"
 msgstr "Pre_cedente"
 
-#: src/gtkui/menus.cc:143 src/qtui/main_window_actions.cc:111
-#: src/statusicon/statusicon.cc:281
+#: src/gtkui/menus.cc:96 src/qtui/menus.cc:143
+#: src/statusicon-qt/statusicon.cc:113 src/statusicon/statusicon.cc:284
 msgid "_Next"
 msgstr "_Successiva"
 
-#: src/gtkui/menus.cc:145 src/qtui/main_window_actions.cc:113
+#: src/gtkui/menus.cc:97 src/qtui/menus.cc:145 src/skins/menus.cc:114
+#: src/skins-qt/menus.cc:105
+msgid "Previous Album"
+msgstr "Album precedente"
+
+#: src/gtkui/menus.cc:98 src/qtui/menus.cc:146 src/skins/menus.cc:115
+#: src/skins-qt/menus.cc:106
+msgid "Next Album"
+msgstr "Prossimo Album"
+
+#: src/gtkui/menus.cc:100 src/qtui/menus.cc:148
 msgid "_Repeat"
 msgstr "Ripe_ti"
 
-#: src/gtkui/menus.cc:146 src/qtui/main_window_actions.cc:114
+#: src/gtkui/menus.cc:101 src/qtui/menus.cc:150
 msgid "S_huffle"
 msgstr "C_asuale"
 
-#: src/gtkui/menus.cc:147 src/qtui/main_window_actions.cc:115
+#: src/gtkui/menus.cc:102 src/qtui/menus.cc:152
+msgid "Shuffle by Albu_m"
+msgstr ""
+
+#: src/gtkui/menus.cc:103 src/qtui/menus.cc:155
 msgid "N_o Playlist Advance"
 msgstr "N_on avanzare nella playlist"
 
-#: src/gtkui/menus.cc:148 src/qtui/main_window_actions.cc:116
+#: src/gtkui/menus.cc:104 src/qtui/menus.cc:157
 msgid "Stop A_fter This Song"
 msgstr "Ferma _dopo questo brano"
 
-#: src/gtkui/menus.cc:150 src/gtkui/menus.cc:247
-#: src/qtui/main_window_actions.cc:118
+#: src/gtkui/menus.cc:106 src/gtkui/menus.cc:210 src/qtui/menus.cc:162
+#: src/qtui/menus.cc:294
 msgid "Song _Info ..."
 msgstr "Informazioni sul _brano…"
 
-#: src/gtkui/menus.cc:151
+#: src/gtkui/menus.cc:107
 msgid "Jump to _Time ..."
 msgstr "Salta alla _posizione…"
 
-#: src/gtkui/menus.cc:152
+#: src/gtkui/menus.cc:108
 msgid "_Jump to Song ..."
 msgstr "Sa_lta al brano…"
 
-#: src/gtkui/menus.cc:154
+#: src/gtkui/menus.cc:110 src/qtui/menus.cc:165
 msgid "Set Repeat Point _A"
 msgstr "Imposta Punto di Ripetizione _A"
 
-#: src/gtkui/menus.cc:155
+#: src/gtkui/menus.cc:111 src/qtui/menus.cc:167
 msgid "Set Repeat Point _B"
 msgstr "Imposta Punto di Ripetizione _B"
 
-#: src/gtkui/menus.cc:156
+#: src/gtkui/menus.cc:112 src/qtui/menus.cc:169
 msgid "_Clear Repeat Points"
 msgstr "_Cancella Punti di Ripetizione"
 
-#: src/gtkui/menus.cc:160 src/gtkui/menus.cc:167 src/gtkui/menus.cc:183
-#: src/qtui/main_window_actions.cc:122 src/qtui/main_window_actions.cc:129
-#: src/qtui/main_window_actions.cc:145
+#: src/gtkui/menus.cc:116 src/gtkui/menus.cc:123 src/gtkui/menus.cc:141
+#: src/qtui/menus.cc:173 src/qtui/menus.cc:180 src/qtui/menus.cc:198
 msgid "By _Title"
 msgstr "Per _titolo"
 
-#: src/gtkui/menus.cc:161 src/qtui/main_window_actions.cc:123
+#: src/gtkui/menus.cc:117 src/qtui/menus.cc:174
 msgid "By _File Name"
 msgstr "Per nome _File"
 
-#: src/gtkui/menus.cc:162 src/qtui/main_window_actions.cc:124
+#: src/gtkui/menus.cc:118 src/qtui/menus.cc:175
 msgid "By File _Path"
 msgstr "Da _Percorso del File"
 
-#: src/gtkui/menus.cc:166 src/gtkui/menus.cc:182
-#: src/qtui/main_window_actions.cc:128 src/qtui/main_window_actions.cc:144
+#: src/gtkui/menus.cc:122 src/gtkui/menus.cc:140 src/qtui/menus.cc:179
+#: src/qtui/menus.cc:197
 msgid "By Track _Number"
 msgstr "Per _numero di traccia"
 
-#: src/gtkui/menus.cc:168 src/gtkui/menus.cc:184
-#: src/qtui/main_window_actions.cc:130 src/qtui/main_window_actions.cc:146
+#: src/gtkui/menus.cc:124 src/gtkui/menus.cc:142 src/qtui/menus.cc:181
+#: src/qtui/menus.cc:199
 msgid "By _Artist"
 msgstr "Per _artista"
 
-#: src/gtkui/menus.cc:169 src/gtkui/menus.cc:185
-#: src/qtui/main_window_actions.cc:131 src/qtui/main_window_actions.cc:147
+#: src/gtkui/menus.cc:125 src/gtkui/menus.cc:143 src/qtui/menus.cc:182
+#: src/qtui/menus.cc:200
 msgid "By Al_bum"
 msgstr "Da Al_bum"
 
-#: src/gtkui/menus.cc:170 src/gtkui/menus.cc:186
-#: src/qtui/main_window_actions.cc:132 src/qtui/main_window_actions.cc:148
+#: src/gtkui/menus.cc:126 src/gtkui/menus.cc:144 src/qtui/menus.cc:183
+#: src/qtui/menus.cc:201
 msgid "By Albu_m Artist"
 msgstr "Per Albu_m artista"
 
-#: src/gtkui/menus.cc:171 src/gtkui/menus.cc:187
-#: src/qtui/main_window_actions.cc:133 src/qtui/main_window_actions.cc:149
+#: src/gtkui/menus.cc:127 src/gtkui/menus.cc:145 src/qtui/menus.cc:184
+#: src/qtui/menus.cc:202
 msgid "By Release _Date"
 msgstr "Per _data di pubblicazione"
 
-#: src/gtkui/menus.cc:172 src/gtkui/menus.cc:188
-#: src/qtui/main_window_actions.cc:134 src/qtui/main_window_actions.cc:150
+#: src/gtkui/menus.cc:128 src/gtkui/menus.cc:146 src/qtui/menus.cc:185
+#: src/qtui/menus.cc:203
 msgid "By _Genre"
 msgstr "Per _Genere"
 
-#: src/gtkui/menus.cc:173 src/gtkui/menus.cc:189
-#: src/qtui/main_window_actions.cc:135 src/qtui/main_window_actions.cc:151
+#: src/gtkui/menus.cc:129 src/gtkui/menus.cc:147 src/qtui/menus.cc:186
+#: src/qtui/menus.cc:204
 msgid "By _Length"
 msgstr "Da _Lunghezza"
 
-#: src/gtkui/menus.cc:174 src/gtkui/menus.cc:190
-#: src/qtui/main_window_actions.cc:136 src/qtui/main_window_actions.cc:152
+#: src/gtkui/menus.cc:130 src/gtkui/menus.cc:148 src/qtui/menus.cc:187
+#: src/qtui/menus.cc:205
 msgid "By _File Path"
 msgstr "Per percorso del _file"
 
-#: src/gtkui/menus.cc:175 src/gtkui/menus.cc:191
-#: src/qtui/main_window_actions.cc:137 src/qtui/main_window_actions.cc:153
+#: src/gtkui/menus.cc:131 src/gtkui/menus.cc:149 src/qtui/menus.cc:188
+#: src/qtui/menus.cc:206
 msgid "By _Custom Title"
 msgstr "Per titolo _personalizzato"
 
-#: src/gtkui/menus.cc:177 src/gtkui/menus.cc:193
-#: src/qtui/main_window_actions.cc:139 src/qtui/main_window_actions.cc:155
+#: src/gtkui/menus.cc:132 src/gtkui/menus.cc:150 src/qtui/menus.cc:189
+#: src/qtui/menus.cc:207
+msgid "By C_omment"
+msgstr ""
+
+#: src/gtkui/menus.cc:133 src/gtkui/menus.cc:151 src/qtui/menus.cc:190
+#: src/qtui/menus.cc:208
+msgid "By D_isc Number"
+msgstr ""
+
+#: src/gtkui/menus.cc:135 src/gtkui/menus.cc:153 src/qtui/menus.cc:192
+#: src/qtui/menus.cc:210
 msgid "R_everse Order"
 msgstr "Ordine in_verso"
 
-#: src/gtkui/menus.cc:178 src/gtkui/menus.cc:194
-#: src/qtui/main_window_actions.cc:140 src/qtui/main_window_actions.cc:156
+#: src/gtkui/menus.cc:136 src/gtkui/menus.cc:154 src/qtui/menus.cc:194
+#: src/qtui/menus.cc:212
 msgid "_Random Order"
 msgstr "Ordine _casuale"
 
-#: src/gtkui/menus.cc:198 src/qtui/main_window_actions.cc:160
+#: src/gtkui/menus.cc:158 src/qtui/menus.cc:216
 msgid "_Play/Resume"
 msgstr "Ri_produci/Riparti"
 
-#: src/gtkui/menus.cc:199 src/gtkui/menus.cc:251
-#: src/qtui/main_window_actions.cc:161
+#: src/gtkui/menus.cc:159 src/qtui/menus.cc:218
 msgid "_Refresh"
 msgstr "A_ggiorna"
 
-#: src/gtkui/menus.cc:201 src/qtui/main_window_actions.cc:163
+#: src/gtkui/menus.cc:161 src/qtui/menus.cc:222
 msgid "_Sort"
 msgstr "_Ordina"
 
-#: src/gtkui/menus.cc:202 src/qtui/main_window_actions.cc:164
+#: src/gtkui/menus.cc:162 src/qtui/menus.cc:223
 msgid "Sort Se_lected"
 msgstr "Ordina i selezionati"
 
-#: src/gtkui/menus.cc:203 src/qtui/main_window_actions.cc:165
+#: src/gtkui/menus.cc:163 src/qtui/menus.cc:225
 msgid "Remove _Duplicates"
 msgstr "Rimuovi _Duplicati"
 
-#: src/gtkui/menus.cc:204 src/qtui/main_window_actions.cc:166
+#: src/gtkui/menus.cc:164 src/qtui/menus.cc:226
 msgid "Remove _Unavailable Files"
 msgstr "Ri_muovi file non disponibili"
 
-#: src/gtkui/menus.cc:206 src/playlist-manager/playlist-manager.cc:244
-#: src/qtui/main_window_actions.cc:168
+#: src/gtkui/menus.cc:166 src/playlist-manager/playlist-manager.cc:219
+#: src/playlist-manager-qt/playlist-manager-qt.cc:348 src/qtui/menus.cc:229
 msgid "_New"
 msgstr "_Nuova"
 
-#: src/gtkui/menus.cc:207
+#: src/gtkui/menus.cc:167 src/qtui/menus.cc:230
 msgid "Ren_ame ..."
 msgstr "Rin_omina ..."
 
-#: src/gtkui/menus.cc:208 src/gtkui/menus.cc:264
-#: src/qtui/main_window_actions.cc:170
+#: src/gtkui/menus.cc:168 src/gtkui/menus.cc:228
+#: src/moonstone/playlist_tabs.cc:311 src/qtui/menus.cc:231
+#: src/qtui/playlist_tabs.cc:336
 msgid "Remo_ve"
 msgstr "Elimina"
 
-#: src/gtkui/menus.cc:210
+#: src/gtkui/menus.cc:170 src/qtui/menus.cc:233
 msgid "_Import ..."
 msgstr "_Importa…"
 
-#: src/gtkui/menus.cc:211
+#: src/gtkui/menus.cc:171 src/qtui/menus.cc:234
 msgid "_Export ..."
 msgstr "_Esporta…"
 
-#: src/gtkui/menus.cc:213
+#: src/gtkui/menus.cc:173 src/qtui/menus.cc:237
 msgid "Playlist _Manager ..."
 msgstr "Gestione_Liste di riproduzione ..."
 
-#: src/gtkui/menus.cc:214 src/qtui/main_window_actions.cc:176
+#: src/gtkui/menus.cc:174 src/qtui/menus.cc:239
 msgid "_Queue Manager ..."
 msgstr "Gestione co_da…"
 
-#: src/gtkui/menus.cc:218 src/qtui/main_window_actions.cc:180
+#: src/gtkui/menus.cc:178 src/qtui/menus.cc:243
 msgid "Volume _Up"
 msgstr "_Alza volume"
 
-#: src/gtkui/menus.cc:219 src/qtui/main_window_actions.cc:181
+#: src/gtkui/menus.cc:179 src/qtui/menus.cc:245
 msgid "Volume _Down"
 msgstr "A_bbassa volume"
 
-#: src/gtkui/menus.cc:221 src/qtui/main_window_actions.cc:183
-msgid "_Equalizer"
-msgstr "_Equalizzatore"
+#: src/gtkui/menus.cc:181 src/qtui/menus.cc:249
+msgid "_Equalizer ..."
+msgstr "_Equalizzatore ..."
 
-#: src/gtkui/menus.cc:223 src/qtui/main_window_actions.cc:185
+#: src/gtkui/menus.cc:182 src/qtui/menus.cc:251
 msgid "E_ffects ..."
 msgstr "Effetti ..."
 
-#: src/gtkui/menus.cc:227
+#: src/gtkui/menus.cc:184
+msgid "_Record Stream"
+msgstr ""
+
+#: src/gtkui/menus.cc:185
+msgid "Audio _Settings ..."
+msgstr ""
+
+#: src/gtkui/menus.cc:189 src/qtui/menus.cc:260
 msgid "Show _Menu Bar"
 msgstr "Mostra barra dei _menu"
 
-#: src/gtkui/menus.cc:228
+#: src/gtkui/menus.cc:190 src/qtui/menus.cc:262
 msgid "Show I_nfo Bar"
 msgstr "Mostra barra i_nformazioni"
 
-#: src/gtkui/menus.cc:229
+#: src/gtkui/menus.cc:191 src/qtui/menus.cc:264
+msgid "Show Info Bar _Album Art"
+msgstr ""
+
+#: src/gtkui/menus.cc:192 src/qtui/menus.cc:266
 msgid "Show Info Bar Vis_ualization"
 msgstr "Mostra barra di vis_ualizzazione informazioni"
 
-#: src/gtkui/menus.cc:230
+#: src/gtkui/menus.cc:193 src/qtui/menus.cc:268
 msgid "Show _Status Bar"
 msgstr "Mostra barra di _stato"
 
-#: src/gtkui/menus.cc:232
+#: src/gtkui/menus.cc:195 src/qtui/menus.cc:272
 msgid "Show _Remaining Time"
 msgstr "Mostra Tempo _Rimasto"
 
-#: src/gtkui/menus.cc:234
+#: src/gtkui/menus.cc:197 src/qtui/menus.cc:276 src/skins/menus.cc:157
+#: src/skins-qt/menus.cc:152
 msgid "_Visualizations ..."
 msgstr "_Visualizzazioni ..."
 
-#: src/gtkui/menus.cc:238 src/qtui/main_window_actions.cc:189
+#: src/gtkui/menus.cc:201 src/qtui/menus.cc:280
 msgid "_File"
 msgstr "_File"
 
-#: src/gtkui/menus.cc:239 src/qtui/main_window_actions.cc:190
+#: src/gtkui/menus.cc:202 src/qtui/menus.cc:281
 msgid "_Playback"
 msgstr "_Riproduzione"
 
-#: src/gtkui/menus.cc:240 src/qtui/main_window_actions.cc:191
+#: src/gtkui/menus.cc:203 src/qtui/menus.cc:282
 msgid "P_laylist"
 msgstr "_Playlist"
 
-#: src/gtkui/menus.cc:241 src/gtkui/menus.cc:258
-#: src/qtui/main_window_actions.cc:192
+#: src/gtkui/menus.cc:204 src/gtkui/menus.cc:222 src/qtui/menus.cc:283
+#: src/qtui/menus.cc:312
 msgid "_Services"
 msgstr "_Servizi"
 
-#: src/gtkui/menus.cc:242 src/qtui/main_window_actions.cc:193
+#: src/gtkui/menus.cc:205 src/qtui/menus.cc:284
 msgid "_Output"
 msgstr "_Uscita"
 
-#: src/gtkui/menus.cc:243
+#: src/gtkui/menus.cc:206 src/qtui/menus.cc:285
 msgid "_View"
 msgstr "_Visualizza"
 
-#: src/gtkui/menus.cc:248
+#: src/gtkui/menus.cc:211 src/qtui/menus.cc:296
 msgid "_Queue/Unqueue"
 msgstr "Inserisci/rimuovi dalla _coda"
 
-#: src/gtkui/menus.cc:250
+#: src/gtkui/menus.cc:213 src/qtui/menus.cc:299
 msgid "_Open Containing Folder"
 msgstr "Apri cartella"
 
-#: src/gtkui/menus.cc:253
+#: src/gtkui/menus.cc:214 src/qtui/menus.cc:301
+msgid "_Refresh Selected"
+msgstr ""
+
+#: src/gtkui/menus.cc:216 src/qtui/menus.cc:304
 msgid "Cu_t"
 msgstr "T_aglia"
 
-#: src/gtkui/menus.cc:254
+#: src/gtkui/menus.cc:217 src/qtui/menus.cc:305
 msgid "_Copy"
 msgstr "C_opia"
 
-#: src/gtkui/menus.cc:255
+#: src/gtkui/menus.cc:218 src/qtui/menus.cc:306
 msgid "_Paste"
 msgstr "_Incolla"
 
-#: src/gtkui/menus.cc:256
+#: src/gtkui/menus.cc:219 src/qtui/menus.cc:307
+msgid "Paste at _End"
+msgstr ""
+
+#: src/gtkui/menus.cc:220 src/qtui/menus.cc:309
 msgid "Select _All"
 msgstr "Seleziona _tutti"
 
-#: src/gtkui/menus.cc:263
+#: src/gtkui/menus.cc:227 src/moonstone/playlist_tabs.cc:309
+#: src/qtui/playlist_tabs.cc:334
 msgid "_Rename ..."
 msgstr "_Rinomina ..."
 
-#: src/gtkui/settings.cc:35
+#: src/gtkui/settings.cc:35 src/qtui/settings.cc:59
+msgid "Always"
+msgstr "Sempre"
+
+#: src/gtkui/settings.cc:36 src/qtui/settings.cc:60
+msgid "Auto-hide"
+msgstr "Nascondi automaticamente"
+
+#: src/gtkui/settings.cc:37 src/qtui/settings.cc:61
+msgid "Never"
+msgstr "Mai"
+
+#: src/gtkui/settings.cc:41 src/qtui/settings.cc:64
 msgid "Playlist Tabs"
 msgstr "Schede di playlist"
 
-#: src/gtkui/settings.cc:36
-msgid "Always show tabs"
-msgstr "Mostra sempre le schede"
+#: src/gtkui/settings.cc:42 src/qtui/settings.cc:65
+msgid "Show playlist tabs:"
+msgstr ""
 
-#: src/gtkui/settings.cc:38
+#: src/gtkui/settings.cc:45 src/qtui/settings.cc:69
 msgid "Show entry counts"
 msgstr "Mostra i conteggi"
 
-#: src/gtkui/settings.cc:40
+#: src/gtkui/settings.cc:47 src/qtui/settings.cc:72
 msgid "Show close buttons"
 msgstr "Mostra i bottoni di chiusura"
 
-#: src/gtkui/settings.cc:42
+#: src/gtkui/settings.cc:49 src/qtui/settings.cc:75
 msgid "Playlist Columns"
 msgstr "Colonne di playlist"
 
-#: src/gtkui/settings.cc:44
+#: src/gtkui/settings.cc:51 src/qtui/settings.cc:77
 msgid "Show column headers"
 msgstr "Mostra le intestazioni delle colonne"
 
-#: src/gtkui/settings.cc:46 src/modplug/plugin_main.cc:106
-#: src/skins/skins_cfg.cc:263
-msgid "Miscellaneous"
-msgstr "Varie"
+#: src/gtkui/settings.cc:53 src/qtui/settings.cc:82
+msgid "Make column headers clickable for sorting"
+msgstr ""
 
-#: src/gtkui/settings.cc:47
-msgid "Arrow keys seek by:"
-msgstr "Tasti freccia cercano per:"
+#: src/gtkui/settings.cc:56
+msgid "Use symbolic icons in toolbar"
+msgstr ""
 
-#: src/gtkui/settings.cc:50
+#: src/gtkui/settings.cc:58 src/qtui/settings.cc:86
 msgid "Scroll on song change"
 msgstr "Fa avanzare la lista quando cambia brano"
 
-#: src/gtkui/ui_gtk.cc:71
+#: src/gtkui/ui_gtk.cc:82
 msgid "GTK Interface"
 msgstr "Interfaccia GTK"
 
-#: src/gtkui/ui_gtk.cc:222 src/skins/ui_main.cc:232
+#: src/gtkui/ui_gtk.cc:219 src/skins/main.cc:228 src/skins-qt/main.cc:231
 #, c-format
 msgid "%s - Audacious"
 msgstr "%s - Audacious"
 
-#: src/gtkui/ui_gtk.cc:225 src/qtui/main_window.cc:186
+#: src/gtkui/ui_gtk.cc:221 src/moonstone/main_window.cc:184
+#: src/qtui/main_window.cc:385
 msgid "Buffering ..."
 msgstr "Buffering…"
 
-#: src/gtkui/ui_gtk.cc:228 src/skins/ui_main.cc:234 src/skins/ui_main.cc:1164
+#: src/gtkui/ui_gtk.cc:224 src/pipewire/pipewire.cc:402 src/skins/main.cc:230
+#: src/skins-qt/main.cc:233
 msgid "Audacious"
 msgstr "Audacious"
 
-#: src/gtkui/ui_statusbar.cc:63 src/qtui/status_bar.cc:67
+#: src/gtkui/ui_gtk.cc:487 src/gtkui/ui_gtk.cc:518 src/gtkui/ui_gtk.cc:882
+#: src/hotkey/gui.cc:72 src/moonstone/main_window.cc:67
+#: src/moonstone/main_window.cc:145 src/moonstone/main_window.cc:146
+#: src/notify/osd.cc:85 src/qthotkey/gui.cc:67 src/qtui/main_window.cc:154
+#: src/qtui/main_window.cc:347 src/qtui/main_window.cc:348
+#: src/skins/menus.cc:109 src/skins-qt/menus.cc:100
+msgid "Play"
+msgstr "Riproduci"
+
+#: src/gtkui/ui_gtk.cc:487 src/moonstone/main_window.cc:151
+#: src/moonstone/main_window.cc:152 src/notify/osd.cc:82
+#: src/qtui/main_window.cc:353 src/qtui/main_window.cc:354
+#: src/skins/menus.cc:110 src/skins-qt/menus.cc:101
+msgid "Pause"
+msgstr "Interrompi"
+
+#: src/gtkui/ui_gtk.cc:868 src/moonstone/main_window.cc:57
+#: src/qtui/main_window.cc:145 src/skins/menus.cc:86 src/skins-qt/menus.cc:77
+msgid "Search Library"
+msgstr "Cerca nella libreria"
+
+#: src/gtkui/ui_gtk.cc:875 src/moonstone/main_window.cc:60
+#: src/qtui/main_window.cc:147
+msgid "Open Files"
+msgstr "Apri file"
+
+#: src/gtkui/ui_gtk.cc:876 src/moonstone/main_window.cc:62
+#: src/qtui/main_window.cc:149
+msgid "Add Files"
+msgstr "Aggiungi file"
+
+#: src/gtkui/ui_gtk.cc:881 src/moonstone/main_window.cc:65
+#: src/qtui/main_window.cc:152 src/skins/menus.cc:112 src/skins-qt/menus.cc:103
+msgid "Previous"
+msgstr "Precedente"
+
+#: src/gtkui/ui_gtk.cc:883 src/hotkey/gui.cc:74 src/moonstone/main_window.cc:69
+#: src/qthotkey/gui.cc:69 src/qtui/main_window.cc:156 src/skins/menus.cc:111
+#: src/skins-qt/menus.cc:102
+msgid "Stop"
+msgstr "Ferma"
+
+#: src/gtkui/ui_gtk.cc:884 src/moonstone/main_window.cc:76 src/notify/osd.cc:89
+#: src/qtui/main_window.cc:163 src/skins/menus.cc:113 src/skins-qt/menus.cc:104
+msgid "Next"
+msgstr "Successivo"
+
+#: src/gtkui/ui_gtk.cc:886 src/moonstone/main_window.cc:79
+#: src/qtui/main_window.cc:166 src/qtui/menus.cc:254 src/skins/menus.cc:79
+#: src/skins-qt/menus.cc:69
+msgid "Record Stream"
+msgstr ""
+
+#: src/gtkui/ui_gtk.cc:919 src/moonstone/main_window.cc:86
+#: src/qtui/main_window.cc:173 src/skins/menus.cc:103 src/skins-qt/menus.cc:94
+msgid "Repeat"
+msgstr "Ripeti"
+
+#: src/gtkui/ui_gtk.cc:922 src/moonstone/main_window.cc:89
+#: src/qtui/main_window.cc:176 src/skins/menus.cc:104 src/skins-qt/menus.cc:95
+msgid "Shuffle"
+msgstr "Casuale"
+
+#: src/gtkui/ui_gtk.cc:1114 src/qtui/main_window.cc:123
+msgid "Menu"
+msgstr "Menu"
+
+#: src/gtkui/ui_statusbar.cc:64 src/qtui/status_bar.cc:155
 msgid "mono"
 msgstr "mono"
 
-#: src/gtkui/ui_statusbar.cc:65 src/qtui/status_bar.cc:69
+#: src/gtkui/ui_statusbar.cc:66 src/qtui/status_bar.cc:157
 msgid "stereo"
 msgstr "stereo"
 
-#: src/gtkui/ui_statusbar.cc:67 src/qtui/status_bar.cc:71
+#: src/gtkui/ui_statusbar.cc:68 src/qtui/status_bar.cc:160
 #, c-format
 msgid "%d channel"
 msgid_plural "%d channels"
 msgstr0 "%d canale"
 msgstr1 "%d canali"
+msgstr2 "%d canali"
 
-#: src/gtkui/ui_statusbar.cc:81 src/qtui/status_bar.cc:85
+#: src/gtkui/ui_statusbar.cc:76 src/qtui/status_bar.cc:168
 #, c-format
-msgid "%d kbps"
-msgstr "%d kbps"
+msgid "%d kHz"
+msgstr ""
 
-#: src/gtkui/ui_statusbar.cc:107 src/skins/ui_main_evlisteners.cc:103
+#: src/gtkui/ui_statusbar.cc:82 src/qtui/status_bar.cc:174
+#, c-format
+msgid "%d kbit/s"
+msgstr ""
+
+#: src/gtkui/ui_statusbar.cc:108 src/skins/main.cc:478 src/skins-qt/main.cc:461
 msgid "Single mode."
 msgstr "Modalità singolo."
 
-#: src/gtkui/ui_statusbar.cc:109 src/skins/ui_main_evlisteners.cc:105
+#: src/gtkui/ui_statusbar.cc:110 src/skins/main.cc:480 src/skins-qt/main.cc:463
 msgid "Playlist mode."
 msgstr "Modalità playlist."
 
-#: src/gtkui/ui_statusbar.cc:117 src/skins/ui_main_evlisteners.cc:111
+#: src/gtkui/ui_statusbar.cc:118 src/skins/main.cc:486 src/skins-qt/main.cc:469
 msgid "Stopping after song."
 msgstr "La riproduzione si fermerà alla fine del brano."
 
-#: src/hotkey/gui.cc:71
+#: src/hotkey/gui.cc:71 src/qthotkey/gui.cc:66
 msgid "Previous track"
 msgstr "Traccia precedente"
 
-#: src/hotkey/gui.cc:72 src/notify/osd.cc:69 src/qtui/main_window.cc:69
-#: src/qtui/main_window.cc:172 src/qtui/main_window.cc:173
-#: src/skins/menus.cc:87
-msgid "Play"
-msgstr "Riproduci"
-
-#: src/hotkey/gui.cc:73
+#: src/hotkey/gui.cc:73 src/qthotkey/gui.cc:68
 msgid "Pause/Resume"
 msgstr "Interrompi/riprendi"
 
-#: src/hotkey/gui.cc:74 src/qtui/main_window.cc:70 src/skins/menus.cc:89
-msgid "Stop"
-msgstr "Ferma"
-
-#: src/hotkey/gui.cc:75
+#: src/hotkey/gui.cc:75 src/qthotkey/gui.cc:70
 msgid "Next track"
 msgstr "Traccia successiva"
 
-#: src/hotkey/gui.cc:76
-msgid "Forward 5 seconds"
-msgstr "Avanza di 5 secondi"
-
-#: src/hotkey/gui.cc:77
-msgid "Rewind 5 seconds"
-msgstr "Riavvolgi di 5 secondi"
+#: src/hotkey/gui.cc:76 src/qthotkey/gui.cc:71
+msgid "Step forward"
+msgstr ""
+
+#: src/hotkey/gui.cc:77 src/qthotkey/gui.cc:72
+msgid "Step backward"
+msgstr ""
 
-#: src/hotkey/gui.cc:78
+#: src/hotkey/gui.cc:78 src/qthotkey/gui.cc:73
 msgid "Mute"
 msgstr "Silenzia"
 
-#: src/hotkey/gui.cc:79
+#: src/hotkey/gui.cc:79 src/qthotkey/gui.cc:74
 msgid "Volume up"
 msgstr "Alza volume"
 
-#: src/hotkey/gui.cc:80
+#: src/hotkey/gui.cc:80 src/qthotkey/gui.cc:75
 msgid "Volume down"
 msgstr "Abbassa volume"
 
-#: src/hotkey/gui.cc:81
+#: src/hotkey/gui.cc:81 src/qthotkey/gui.cc:76
 msgid "Jump to file"
 msgstr "Salta al file"
 
-#: src/hotkey/gui.cc:82
+#: src/hotkey/gui.cc:82 src/qthotkey/gui.cc:77
 msgid "Toggle player window(s)"
 msgstr "Mostra/nascondi finestra(e) di riproduzione"
 
-#: src/hotkey/gui.cc:83
+#: src/hotkey/gui.cc:83 src/qthotkey/gui.cc:78
 msgid "Show On-Screen-Display"
 msgstr "Mostra On-screen-display"
 
-#: src/hotkey/gui.cc:84
+#: src/hotkey/gui.cc:84 src/qthotkey/gui.cc:79
 msgid "Toggle repeat"
 msgstr "Attiva/disattiva ripetizione"
 
-#: src/hotkey/gui.cc:85
+#: src/hotkey/gui.cc:85 src/qthotkey/gui.cc:80
 msgid "Toggle shuffle"
 msgstr "Attiva/disattiva shuffle"
 
-#: src/hotkey/gui.cc:86
+#: src/hotkey/gui.cc:86 src/qthotkey/gui.cc:81
 msgid "Toggle stop after current"
 msgstr "Attiva/Disattiva lo stop dopo la corrente"
 
-#: src/hotkey/gui.cc:87
+#: src/hotkey/gui.cc:87 src/qthotkey/gui.cc:82
 msgid "Raise player window(s)"
 msgstr "Mostra finestra(e) di riproduzione"
 
-#: src/hotkey/gui.cc:97
+#: src/hotkey/gui.cc:98 src/qthotkey/gui.cc:100
 msgid "(none)"
 msgstr "(nessuno)"
 
-#: src/hotkey/gui.cc:234
+#: src/hotkey/gui.cc:261
 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 modifiers.\n"
 "\n"
 "Do you want to continue?"
 msgstr ""
-"Non è consigliabile associare i pulsanti primari del mouse senza "
-"modificatori.\n"
-"\n"
-"Vuoi continuare?"
 
-#: src/hotkey/gui.cc:236
+#: src/hotkey/gui.cc:264
 msgid "Binding mouse buttons"
 msgstr "Associazione pulsanti del mouse"
 
-#: src/hotkey/gui.cc:391
+#: src/hotkey/gui.cc:434
 msgid ""
 "Press a key combination inside a text field.\n"
 "You can also bind mouse buttons."
@@ -2187,73 +2247,89 @@
 "Premi una combinazione di tasti all'interno di un campo di testo.\n"
 "Puoi anche associare i pulsanti del mouse."
 
-#: src/hotkey/gui.cc:396
+#: src/hotkey/gui.cc:444 src/qthotkey/gui.cc:179
 msgid "Hotkeys:"
 msgstr "Tasti di scelta rapida:"
 
-#: src/hotkey/gui.cc:413
+#: src/hotkey/gui.cc:457 src/qthotkey/gui.cc:181
 msgid "Action:"
 msgstr "Azione:"
 
-#: src/hotkey/gui.cc:420
+#: src/hotkey/gui.cc:461 src/qthotkey/gui.cc:182
 msgid "Key Binding:"
 msgstr "Tasto associato:"
 
-#: src/hotkey/gui.cc:468
+#: src/hotkey/gui.cc:518 src/qthotkey/gui.cc:184
 msgid "_Add"
 msgstr "_Aggiungi"
 
-#: src/hotkey/plugin.cc:61
+#: src/hotkey/plugin.cc:59 src/qthotkey/plugin.cc:78
 msgid "Global Hotkeys"
 msgstr "Hotkeys globali"
 
-#: src/hotkey/plugin.cc:79
+#: src/hotkey/plugin.cc:74
 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"
+"Contributors 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 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/jack-ng/jack-ng.cc:49
+#: src/jack/jack-ng.cc:54
 msgid "JACK Output"
 msgstr "Uscita JACK"
 
-#: src/jack-ng/jack-ng.cc:114
+#: src/jack/jack-ng.cc:126
+msgid "Client name:"
+msgstr ""
+
+#: src/jack/jack-ng.cc:128
 msgid "Automatically connect to output ports"
 msgstr "Connetti automaticamente alle porte di uscita"
 
-#: src/jack-ng/jack-ng.cc:155
+#: src/jack/jack-ng.cc:130
+msgid "Filter ports (regex, use any port if blank):"
+msgstr ""
+
+#: src/jack/jack-ng.cc:136
+msgid "Connect to physical ports only"
+msgstr ""
+
+#: src/jack/jack-ng.cc:139
+msgid "Upmix to"
+msgstr ""
+
+#: src/jack/jack-ng.cc:141
+msgid "ports if input has fewer channels"
+msgstr ""
+
+#: src/jack/jack-ng.cc:143
+msgid "Ignore insufficient number of ports"
+msgstr ""
+
+#: src/jack/jack-ng.cc:181
+msgid "No JACK output ports were found. Please check settings."
+msgstr ""
+
+#: src/jack/jack-ng.cc:195
 #, c-format
 msgid "Only %d JACK output ports were found but %d are required."
 msgstr ""
 "Sono state rilevate solo le porte di uscita %d JACK ma sono richieste le %d."
 
-#: src/jack-ng/jack-ng.cc:164
+#: src/jack/jack-ng.cc:210
 #, c-format
 msgid "Failed to connect to JACK port %s."
 msgstr "Impossibile connettersi alla porta JACK %s"
 
-#: src/jack-ng/jack-ng.cc:184
+#: src/jack/jack-ng.cc:230
 msgid ""
 "JACK supports only floating-point audio. You must change the output bit "
 "depth to floating-point in Audacious settings."
@@ -2262,11 +2338,11 @@
 "cambiare la codifica di uscita nelle impostazioni di Audacious, alla voce "
 "profondità di bit: virgola mobile."
 
-#: src/jack-ng/jack-ng.cc:197
+#: src/jack/jack-ng.cc:245
 msgid "Failed to connect to the JACK server; is it running?"
 msgstr "Impossibile connettersi al server JACK; è in esecuzione?"
 
-#: src/jack-ng/jack-ng.cc:273
+#: src/jack/jack-ng.cc:321
 #, c-format
 msgid ""
 "The JACK server requires a sample rate of %d Hz, but Audacious is playing at "
@@ -2276,16 +2352,16 @@
 "Audacious sta riproducendo a %d Hz. Si prega di usare l'effetto convertitore "
 "della frequenza di campionamento per correggere la discrepanza."
 
-#: src/ladspa/plugin.cc:414
+#: src/ladspa/plugin.cc:416
 #, c-format
 msgid "%s Settings"
 msgstr "Impostazioni %s"
 
-#: src/ladspa/plugin.cc:478
+#: src/ladspa/plugin.cc:482
 msgid "Module paths:"
 msgstr "Percorsi dei moduli:"
 
-#: src/ladspa/plugin.cc:483
+#: src/ladspa/plugin.cc:487
 msgid ""
 "Separate multiple paths with a colon.\n"
 "These paths are searched in addition to LADSPA_PATH.\n"
@@ -2296,25 +2372,25 @@
 "Dopo aver aggiunto nuovi percorsi, premi Invio per ricercare nuovi plugin.</"
 "small>"
 
-#: src/ladspa/plugin.cc:499
+#: src/ladspa/plugin.cc:508
 msgid "Available plugins:"
 msgstr "Plugin disponibili:"
 
-#: src/ladspa/plugin.cc:512 src/modplug/plugin_main.cc:92
-#: src/modplug/plugin_main.cc:95 src/modplug/plugin_main.cc:98
-#: src/modplug/plugin_main.cc:101
+#: src/ladspa/plugin.cc:521 src/modplug/plugin_main.cc:91
+#: src/modplug/plugin_main.cc:94 src/modplug/plugin_main.cc:97
+#: src/modplug/plugin_main.cc:100
 msgid "Enable"
 msgstr "Abilita"
 
-#: src/ladspa/plugin.cc:518
+#: src/ladspa/plugin.cc:527
 msgid "Enabled plugins:"
 msgstr "Plugin abilitati:"
 
-#: src/ladspa/plugin.cc:534
+#: src/ladspa/plugin.cc:543
 msgid "Settings"
 msgstr "Impostazioni"
 
-#: src/ladspa/plugin.cc:551
+#: src/ladspa/plugin.cc:560
 msgid ""
 "LADSPA Host for Audacious\n"
 "Copyright 2011 John Lindgren"
@@ -2330,7 +2406,7 @@
 msgid "LIRC Plugin"
 msgstr "Plugin LIRC"
 
-#: src/lirc/lirc.cc:381
+#: src/lirc/lirc.cc:379
 msgid ""
 "A simple plugin to control Audacious using the LIRC remote control daemon\n"
 "\n"
@@ -2359,63 +2435,123 @@
 "\n"
 "Per maggiori informazioni su LIRC, vedi http://lirc.org."
 
-#: src/lirc/lirc.cc:392
+#: src/lirc/lirc.cc:390
 msgid "Connection"
 msgstr "Connessione"
 
-#: src/lirc/lirc.cc:393
+#: src/lirc/lirc.cc:391
 msgid "Reconnect to LIRC server"
 msgstr "Riconnetti al server LIRC"
 
-#: src/lirc/lirc.cc:395
+#: src/lirc/lirc.cc:393
 msgid "Wait before reconnecting:"
 msgstr "Attesa prima della riconnessione:"
 
-#: src/lyricwiki/lyricwiki.cc:41
-msgid "LyricWiki Plugin"
-msgstr "Plugin LyricWiki"
-
-#: src/lyricwiki/lyricwiki.cc:131 src/lyricwiki-qt/lyricwiki.cc:136
-msgid "No lyrics available"
-msgstr "Nessun testo disponibile"
-
-#: src/lyricwiki/lyricwiki.cc:217 src/lyricwiki/lyricwiki.cc:226
-#: src/lyricwiki/lyricwiki.cc:243 src/lyricwiki/lyricwiki.cc:252
-#: src/lyricwiki/lyricwiki.cc:267 src/lyricwiki-qt/lyricwiki.cc:222
-#: src/lyricwiki-qt/lyricwiki.cc:231 src/lyricwiki-qt/lyricwiki.cc:248
-#: src/lyricwiki-qt/lyricwiki.cc:257 src/lyricwiki-qt/lyricwiki.cc:272
-msgid "Error"
-msgstr "Errore"
-
-#: src/lyricwiki/lyricwiki.cc:218 src/lyricwiki/lyricwiki.cc:244
-#: src/lyricwiki-qt/lyricwiki.cc:223 src/lyricwiki-qt/lyricwiki.cc:249
+#: src/lyrics-common/chart_lyrics_provider.cc:93
+#: src/lyrics-common/chart_lyrics_provider.cc:150
+#: src/lyrics-common/lyrics_ovh_provider.cc:50
 #, c-format
 msgid "Unable to fetch %s"
 msgstr "Impossibile recuperare %s"
 
-#: src/lyricwiki/lyricwiki.cc:227 src/lyricwiki/lyricwiki.cc:253
-#: src/lyricwiki-qt/lyricwiki.cc:232 src/lyricwiki-qt/lyricwiki.cc:258
+#: src/lyrics-common/chart_lyrics_provider.cc:100
+#: src/lyrics-common/chart_lyrics_provider.cc:157
+#: src/lyrics-common/lyrics_ovh_provider.cc:57
 #, c-format
 msgid "Unable to parse %s"
 msgstr "Impossibile analizzare %s"
 
-#: src/lyricwiki/lyricwiki.cc:259 src/lyricwiki-qt/lyricwiki.cc:264
+#: src/lyrics-common/chart_lyrics_provider.cc:121
+#: src/lyrics-common/chart_lyrics_provider.cc:194
+#: src/lyrics-common/lyrics_ovh_provider.cc:88
 msgid "Looking for lyrics ..."
 msgstr "Ricerca testi ..."
 
-#: src/lyricwiki/lyricwiki.cc:267 src/lyricwiki-qt/lyricwiki.cc:272
-msgid "Missing song metadata"
-msgstr "Metadata brano mancante"
-
-#: src/lyricwiki/lyricwiki.cc:278 src/lyricwiki-qt/lyricwiki.cc:283
-msgid "Connecting to lyrics.wikia.com ..."
-msgstr "Connessione a lyrics.wikia.com ..."
-
-#: src/lyricwiki-qt/lyricwiki.cc:55
-msgid "LyricWiki Plugin (Qt)"
-msgstr "Plugin LyricWiki (Qt)"
+#: src/lyrics-common/preferences.h:43
+msgid "Nowhere"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:49
+msgid "Artist is truncated at the start, Title -- at the end"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:50
+msgid "Chars to truncate on:"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:54
+msgid "Chars are ORed in RegExp, surrounded by whitespace"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:55
+msgid "Chars to split on:"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:56
+msgid "Further truncate those on chars"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:62
+msgid "General"
+msgstr "Generale"
+
+#: src/lyrics-common/preferences.h:63
+msgid "Split title into artist and title on chars"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:66
+msgid "Sources"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:67
+msgid "Use embedded lyrics (from Lyrics tag)"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:69
+msgid "Fetch lyrics from internet:"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:72
+msgid "Store fetched lyrics in local cache"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:74
+msgid "Local Storage"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:75
+msgid "Load lyric files (.lrc) from local storage"
+msgstr ""
+
+#: src/lyrics-common/utils.cc:54 src/ui-common/dialogs-qt.cc:63
+msgid "Error"
+msgstr "Errore"
+
+#: src/lyrics-common/utils.cc:60
+msgid "Lyrics could not be found."
+msgstr ""
+
+#: src/lyrics-common/utils.cc:142
+msgid "Missing title and/or artist."
+msgstr ""
+
+#: src/lyrics-gtk/lyrics-gtk.cc:37 src/lyrics-qt/lyrics-qt.cc:50
+msgid "Lyrics"
+msgstr "Testo"
+
+#: src/lyrics-gtk/lyrics-gtk.cc:189 src/lyrics-qt/lyrics-qt.cc:171
+msgid "Edit Lyrics ..."
+msgstr ""
+
+#: src/lyrics-gtk/lyrics-gtk.cc:195 src/lyrics-qt/lyrics-qt.cc:178
+msgid "Save Locally"
+msgstr "Salva in locale"
+
+#: src/lyrics-gtk/lyrics-gtk.cc:201 src/lyrics-qt/lyrics-qt.cc:186
+msgid "Refresh"
+msgstr "Aggiorna"
 
-#: src/m3u/m3u.cc:32
+#: src/m3u/m3u.cc:33
 msgid "M3U Playlists"
 msgstr "Playlists M3U"
 
@@ -2423,17 +2559,17 @@
 msgid "Tact Generator"
 msgstr "Generatore Tact"
 
-#: src/metronom/metronom.cc:147
+#: src/metronom/metronom.cc:145
 #, c-format
 msgid "Tact generator: %d bpm"
 msgstr "Metronomo: %d bpm"
 
-#: src/metronom/metronom.cc:149
+#: src/metronom/metronom.cc:147
 #, c-format
 msgid "Tact generator: %d bpm %d/%d"
 msgstr "Metronomo: %d bpm %d/%d"
 
-#: src/metronom/metronom.cc:237
+#: src/metronom/metronom.cc:235
 msgid ""
 "A Tact Generator by Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
 "\n"
@@ -2448,11 +2584,11 @@
 "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/mixer/mixer.cc:38
+#: src/mixer/mixer.cc:43
 msgid "Channel Mixer"
 msgstr "Mixer Canale"
 
-#: src/mixer/mixer.cc:202
+#: src/mixer/mixer.cc:255
 msgid ""
 "Channel Mixer Plugin for Audacious\n"
 "Copyright 2011-2012 John Lindgren and Michał Lipski"
@@ -2460,11 +2596,11 @@
 "Channel Mixer Plugin per Audacious⏎\n"
 "Copyright 2011-2012 John Lindgren e Michał Lipski"
 
-#: src/mixer/mixer.cc:206
+#: src/mixer/mixer.cc:259
 msgid "Channel Mixer"
 msgstr "Mixer Canale"
 
-#: src/mixer/mixer.cc:207
+#: src/mixer/mixer.cc:260
 msgid "Output channels:"
 msgstr "Canali in uscita:"
 
@@ -2476,168 +2612,176 @@
 msgid "Error connecting to MMS server"
 msgstr "Impossibile connettersi al server MMS"
 
-#: src/modplug/modplugbmp.h:53
+#: src/modplug/modplugbmp.h:57
 msgid "ModPlug (Module Player)"
 msgstr "ModPlug (Riproduttore del Modulo)"
 
-#: src/modplug/plugin_main.cc:53
-msgid "Resolution"
-msgstr "Risoluzione"
-
-#: src/modplug/plugin_main.cc:54
-msgid "8-bit"
-msgstr "8-bit"
-
 #: src/modplug/plugin_main.cc:55
-msgid "16-bit"
-msgstr "16-bit"
-
-#: src/modplug/plugin_main.cc:56
 msgid "Channels"
 msgstr "Canali"
 
-#: src/modplug/plugin_main.cc:60
+#: src/modplug/plugin_main.cc:59
 msgid "Nearest (fastest)"
 msgstr "Più vicino (più veloce)"
 
-#: src/modplug/plugin_main.cc:61
+#: src/modplug/plugin_main.cc:60
 msgid "Linear (fast)"
 msgstr "Lineare (veloce)"
 
-#: src/modplug/plugin_main.cc:62
+#: src/modplug/plugin_main.cc:61
 msgid "Spline (good)"
 msgstr "Spline (buono)"
 
-#: src/modplug/plugin_main.cc:63
+#: src/modplug/plugin_main.cc:62
 msgid "Polyphase (best)"
 msgstr "Polifase (il migliore)"
 
-#: src/modplug/plugin_main.cc:64
+#: src/modplug/plugin_main.cc:63
 msgid "Sample rate"
 msgstr "Frequenza di campionamento"
 
-#: src/modplug/plugin_main.cc:65
+#: src/modplug/plugin_main.cc:64
 msgid "22 kHz"
 msgstr "22 kHz"
 
-#: src/modplug/plugin_main.cc:66
+#: src/modplug/plugin_main.cc:65
 msgid "44 kHz"
 msgstr "44 kHz"
 
-#: src/modplug/plugin_main.cc:67
+#: src/modplug/plugin_main.cc:66
 msgid "48 kHz"
 msgstr "48 kHz:"
 
-#: src/modplug/plugin_main.cc:68
+#: src/modplug/plugin_main.cc:67
 msgid "96 kHz"
 msgstr "96 kHz:"
 
-#: src/modplug/plugin_main.cc:72 src/modplug/plugin_main.cc:77
-#: src/modplug/plugin_main.cc:82
+#: src/modplug/plugin_main.cc:71 src/modplug/plugin_main.cc:76
+#: src/modplug/plugin_main.cc:81
 msgid "Level:"
 msgstr "Livello:"
 
-#: src/modplug/plugin_main.cc:78
+#: src/modplug/plugin_main.cc:77
 msgid "Cutoff:"
 msgstr "Taglio:"
 
-#: src/modplug/plugin_main.cc:91
+#: src/modplug/plugin_main.cc:90
 msgid "Reverb"
 msgstr "Riverbero"
 
-#: src/modplug/plugin_main.cc:94
+#: src/modplug/plugin_main.cc:93
 msgid "Bass Boost"
 msgstr "Aumento del Basso"
 
-#: src/modplug/plugin_main.cc:97
+#: src/modplug/plugin_main.cc:96
 msgid "Surround"
 msgstr "Surround"
 
-#: src/modplug/plugin_main.cc:100
+#: src/modplug/plugin_main.cc:99
 msgid "Preamp"
 msgstr "Preamplificatore"
 
-#: src/modplug/plugin_main.cc:107
+#: src/modplug/plugin_main.cc:106
 msgid "Oversample"
 msgstr "Sovracampionamento"
 
-#: src/modplug/plugin_main.cc:108
+#: src/modplug/plugin_main.cc:107
 msgid "Noise reduction"
 msgstr "Riduzione del rumore"
 
-#: src/modplug/plugin_main.cc:109
+#: src/modplug/plugin_main.cc:108
 msgid "Play Amiga MODs"
 msgstr "Avvia MOD Amiga"
 
-#: src/modplug/plugin_main.cc:110
+#: src/modplug/plugin_main.cc:109
 msgid "Repeat"
 msgstr "Ripeti"
 
-#: src/modplug/plugin_main.cc:111
+#: src/modplug/plugin_main.cc:110
 msgid "Repeat count:"
 msgstr "Contatore di ripetizioni:"
 
-#: src/modplug/plugin_main.cc:112
+#: src/modplug/plugin_main.cc:111
 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.cc:125 src/sid/xs_config.cc:106
+#: src/modplug/plugin_main.cc:124 src/sid/xs_config.cc:106
 msgid "These settings will take effect when Audacious is restarted."
 msgstr "Queste impostazioni avranno effetto al prossimo riavvio di Audacious."
 
+#: src/moonstone/main_window.cc:72 src/moonstone/main_window.cc:73
+#: src/qtui/main_window.cc:159 src/qtui/main_window.cc:160
+#: src/skins/menus.cc:107 src/skins-qt/menus.cc:98
+msgid "Stop After This Song"
+msgstr "Interrompi al termine di questo brano"
+
+#: src/moonstone/moonstone.cc:39
+msgid "Moonstone"
+msgstr ""
+
+#: src/moonstone/playlist_header.cc:212 src/qtui/playlist_header.cc:258
+msgid "Reset to Defaults"
+msgstr ""
+
+#: src/moonstone/playlist_model.cc:38 src/qtui/playlist_header.cc:232
+msgid "Now Playing"
+msgstr "In riproduzione"
+
+#: src/moonstone/playlist_selection.cc:66
+#: src/playlist-manager/playlist-manager.cc:201
+#: src/playlist-manager-qt/playlist-manager-qt.cc:190
+msgid "Entries"
+msgstr "Voci"
+
 #: src/mpg123/mpg123.cc:54
 msgid "MPG123 Plugin"
 msgstr "Plugin MPG123"
 
-#: src/mpg123/mpg123.cc:83
-msgid "Advanced"
-msgstr "Opzioni avanzate"
-
-#: src/mpg123/mpg123.cc:84
+#: src/mpg123/mpg123.cc:82
 msgid "Use accurate length calculation (slow)"
 msgstr "Utilizza il calcolo della lunghezza accurata (lento)"
 
-#: src/mpg123/mpg123.cc:248
+#: src/mpg123/mpg123.cc:260
 msgid "Surround"
 msgstr "Surround"
 
-#: src/mpris2/plugin.cc:39
+#: src/mpris2/plugin.cc:40
 msgid "MPRIS 2 Server"
 msgstr "Server MPRIS 2"
 
-#: src/neon/neon.cc:97
+#: src/neon/neon.cc:102
 msgid "Neon HTTP/HTTPS Plugin"
 msgstr "Plugin Neon HTTP/HTTPS"
 
-#: src/neon/neon.cc:521
+#: src/neon/neon.cc:526
 msgid "Error parsing redirect"
 msgstr "Impossibile elaborare la ridirezione"
 
-#: src/neon/neon.cc:535
+#: src/neon/neon.cc:540
 msgid "Unknown HTTP error"
 msgstr "Errore HTTP sconosciuto"
 
-#: src/neon/neon.cc:569
+#: src/neon/neon.cc:614
 msgid "Error parsing URL"
 msgstr "Impossibile elaborare l'URL"
 
-#: src/neon/neon.cc:632
+#: src/neon/neon.cc:687
 msgid "Too many redirects"
 msgstr "Troppe ridirezioni"
 
-#: src/notify/event.cc:64
+#: src/notify/event.cc:97
 msgid "Stopped"
 msgstr "Fermato"
 
-#: src/notify/event.cc:64
+#: src/notify/event.cc:97
 msgid "Audacious is not playing."
 msgstr "Audacious non sta riproducendo."
 
-#: src/notify/notify.cc:42
+#: src/notify/notify.cc:39
 msgid "Desktop Notifications"
 msgstr "Notifiche Desktop"
 
-#: src/notify/notify.cc:60
+#: src/notify/notify.cc:57
 msgid ""
 "Desktop Notifications Plugin for Audacious\n"
 "Copyright (C) 2010 Maximilian Bogner\n"
@@ -2673,36 +2817,76 @@
 "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.cc:110
+#: src/notify/notify.cc:104
 msgid "Show playback controls"
 msgstr "Mostra controlli di riproduzione"
 
-#: src/notify/notify.cc:112
+#: src/notify/notify.cc:106
 msgid "Always show notification"
 msgstr "Permette di mostrare le notifiche"
 
-#: src/notify/notify.cc:114
+#: src/notify/notify.cc:108
 msgid "Include album name in notification"
 msgstr "Includi il nome dell'album nella notifica"
 
-#: src/notify/osd.cc:58
+#: src/notify/notify.cc:110
+msgid "Custom notification duration:"
+msgstr ""
+
+#: src/notify/osd.cc:74
 msgid "Show"
 msgstr "Mostra"
 
-#: src/notify/osd.cc:66 src/qtui/main_window.cc:178
-#: src/qtui/main_window.cc:179 src/skins/menus.cc:88
-msgid "Pause"
-msgstr "Interrompi"
+#: src/openmpt/mpt.cc:50
+msgid "OpenMPT (Module Player)"
+msgstr ""
 
-#: src/notify/osd.cc:73 src/qtui/main_window.cc:72 src/skins/menus.cc:91
-msgid "Next"
-msgstr "Successivo"
+#: src/openmpt/mpt.cc:132
+msgid ""
+"Module player based on libopenmpt\n"
+"\n"
+"Written by: Chris Spiegel <cspiegel@gmail.com>"
+msgstr ""
+
+#: src/openmpt/mpt.cc:151
+msgid "Stereo separation:"
+msgstr ""
 
-#: src/oss4/oss.h:93
+#: src/openmpt/mpt.cc:153
+msgid "% (0=mono, 100=default, 200=full)"
+msgstr ""
+
+#: src/openmpt/mpt.cc:157
+msgid "Interpolation:"
+msgstr ""
+
+#: src/openmpt/mptwrap.h:51 src/soxr/sox-resampler.cc:189 src/xsf/plugin.cc:437
+msgid "Linear"
+msgstr ""
+
+#: src/openmpt/mptwrap.h:52
+msgid "Cubic"
+msgstr ""
+
+#: src/openmpt/mptwrap.h:53
+msgid "Windowed sinc"
+msgstr ""
+
+#: src/opus/opus.cc:39
+msgid "Opus Decoder"
+msgstr ""
+
+#: src/opus/opus.cc:336
+msgid ""
+"Opus Decoder Plugin for Audacious\n"
+"Copyright 2022 Thomas Lange"
+msgstr ""
+
+#: src/oss4/oss.h:70
 msgid "OSS4 Output"
 msgstr "Uscita OSS4"
 
-#: src/oss4/oss.h:95
+#: src/oss4/oss.h:72
 msgid "OSS3 Output"
 msgstr "Uscita OSS3"
 
@@ -2710,27 +2894,27 @@
 msgid "Default device"
 msgstr "Dispositivo predefinito"
 
-#: src/oss4/plugin.cc:77
+#: src/oss4/plugin.cc:78
 msgid "Audio device:"
 msgstr "Dispositivo audio:"
 
-#: src/oss4/plugin.cc:80
+#: src/oss4/plugin.cc:81
 msgid "Use alternate device:"
 msgstr "Usa dispositivo alternativo:"
 
-#: src/oss4/plugin.cc:84
+#: src/oss4/plugin.cc:85
 msgid "Save volume between sessions."
 msgstr "Mantieni volume tra le sessioni"
 
-#: src/oss4/plugin.cc:86
+#: src/oss4/plugin.cc:87
 msgid "Enable format conversions made by the OSS software."
 msgstr "Abilita conversioni di formato effettuate dal software OSS."
 
-#: src/oss4/plugin.cc:88
+#: src/oss4/plugin.cc:89
 msgid "Enable exclusive mode to prevent virtual mixing."
 msgstr "Abilita la modalità esclusiva per prevenire il missaggio virtuale."
 
-#: src/oss4/plugin.cc:100
+#: src/oss4/plugin.cc:101
 msgid ""
 "OSS4 Output Plugin for Audacious\n"
 "Copyright 2010-2012 Michał Lipski\n"
@@ -2744,19 +2928,35 @@
 "Vorrei ringrazire le persone su #audacious, specialmente Tony Vroon e John "
 "Lindgren e sicuramente gli autori del precedente OSS plugin."
 
-#: src/playlist-manager/playlist-manager.cc:37
+#: src/pipewire/pipewire.cc:44
+msgid "PipeWire Output"
+msgstr ""
+
+#: src/pipewire/pipewire.cc:118
+msgid ""
+"PipeWire Output Plugin for Audacious\n"
+"Copyright 2022 Thomas Lange\n"
+"\n"
+"Based on the PipeWire Output Plugin for Qmmp\n"
+"Copyright 2021 Ilya Kotov"
+msgstr ""
+
+#: src/pipewire/pipewire.cc:408 src/skins/menus.cc:88 src/skins-qt/menus.cc:79
+msgid "Playback"
+msgstr "Riproduzione"
+
+#: src/playlist-manager/playlist-manager.cc:38
+#: src/playlist-manager-qt/playlist-manager-qt.cc:42
 msgid "Playlist Manager"
 msgstr "Gestore delle playlist"
 
-#: src/playlist-manager/playlist-manager.cc:226
-msgid "Entries"
-msgstr "Voci"
-
-#: src/playlist-manager/playlist-manager.cc:245
+#: src/playlist-manager/playlist-manager.cc:221
+#: src/playlist-manager-qt/playlist-manager-qt.cc:356
 msgid "_Remove"
 msgstr "_Rimuovi"
 
-#: src/playlist-manager/playlist-manager.cc:246
+#: src/playlist-manager/playlist-manager.cc:222
+#: src/playlist-manager-qt/playlist-manager-qt.cc:351
 msgid "Ren_ame"
 msgstr "Rin_omina"
 
@@ -2764,56 +2964,54 @@
 msgid "PLS Playlists"
 msgstr "Playlist PLS"
 
-#: src/psf/plugin.cc:45
+#: src/psf/plugin.cc:53
 msgid "OpenPSF PSF1/PSF2 Decoder"
 msgstr "Decodificatore OpenPSF PSF1/PSF2"
 
-#: src/pulse_audio/pulse_audio.cc:38
+#: src/psf/plugin.cc:270
+msgid "OpenPSF Configuration"
+msgstr ""
+
+#: src/psf/plugin.cc:271 src/xsf/plugin.cc:444
+msgid "Ignore length from file"
+msgstr "Ignora la lunghezza dal file"
+
+#: src/pulse/pulse_audio.cc:42
 msgid "PulseAudio Output"
 msgstr "Uscita PulseAudio"
 
-#: src/pulse_audio/pulse_audio.cc:611
+#: src/pulse/pulse_audio.cc:84
+msgid "Context name:"
+msgstr ""
+
+#: src/pulse/pulse_audio.cc:86
+msgid "Stream name:"
+msgstr ""
+
+#: src/pulse/pulse_audio.cc:596
 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 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"
+"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"
-"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"
+"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"
-"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."
+"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/qtaudio/qtaudio.cc:49
+#: src/qtaudio/qtaudio.cc:53
 msgid "QtMultimedia Output"
 msgstr "Uscita QtMultimedia"
 
-#: src/qtaudio/qtaudio.cc:77
+#: src/qtaudio/qtaudio.cc:84
 msgid ""
 "QtMultimedia Audio Output Plugin for Audacious\n"
 "Copyright 2014 William Pitcock\n"
@@ -2827,50 +3025,87 @@
 "Basato sul plugin SDL Output per Audacious\n"
 "Copyright 2010 John Lindgren"
 
-#: src/qtui/dialog_windows.cc:31
-msgid "Working ..."
-msgstr "In elaborazione ..."
+#: src/qtglspectrum/gl-spectrum.cc:41
+msgid ""
+"OpenGL Spectrum Analyzer for Audacious\n"
+"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
+"Copyright 2014, 2020 Ariadne Conill\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/qtui/filter_input.cc:44 src/skins/ui_playlist.cc:221
-msgid "Search"
-msgstr "Cerca"
+#: src/qthotkey/gui.cc:177
+msgid "Press a key combination inside a text field."
+msgstr ""
+
+#: src/qthotkey/plugin.cc:105
+msgid ""
+"Global Hotkey Plugin\n"
+"Control the player with global key combinations or multimedia keys.\n"
+"\n"
+"Copyright (C) 2020 i.Dark_Templar <darktemplar@dark-templar-archives.net>\n"
+"Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n"
+"\n"
+"Contributors 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/qtui/main_window_actions.cc:94
+#: src/qtui/menus.cc:109
 msgid "_Open Folder ..."
 msgstr "Apri cartella ..."
 
-#: src/qtui/main_window_actions.cc:96
+#: src/qtui/menus.cc:115
 msgid "_Add Folder ..."
 msgstr "_Aggiungi cartella ..."
 
-#: src/qtui/main_window_actions.cc:101
+#: src/qtui/menus.cc:128
 msgid "_Log Inspector ..."
 msgstr "_Ispettore dei log ..."
 
-#: src/qtui/main_window.cc:64
-msgid "Open Files"
-msgstr "Apri file"
+#: src/qtui/menus.cc:220
+msgid "_Find ..."
+msgstr "_Cerca ..."
 
-#: src/qtui/main_window.cc:66
-msgid "Add Files"
-msgstr "Aggiungi file"
+#: src/qtui/menus.cc:256 src/skins/menus.cc:80 src/skins-qt/menus.cc:70
+msgid "Audio Settings ..."
+msgstr "Impostazioni Audio ..."
 
-#: src/qtui/main_window.cc:71 src/skins/menus.cc:90
-msgid "Previous"
-msgstr "Precedente"
+#: src/qtui/playlist_model.cc:188
+msgid "Q#"
+msgstr ""
 
-#: src/qtui/main_window.cc:77 src/skins/menus.cc:82
-msgid "Repeat"
-msgstr "Ripeti"
+#: src/qtui/playlist_model.cc:190
+msgid "T#"
+msgstr ""
 
-#: src/qtui/main_window.cc:79 src/skins/menus.cc:83
-msgid "Shuffle"
-msgstr "Casuale"
+#: src/qtui/playlist_model.cc:192
+msgid "C#"
+msgstr ""
 
-#: src/qtui/qtui.cc:42
+#: src/qtui/playlist_model.cc:194
+msgid "D#"
+msgstr ""
+
+#: src/qtui/qtui.cc:40
 msgid "Qt Interface"
 msgstr "Interfaccia Qt"
 
+#: src/qtui/search_bar.cc:46
+msgid "Search playlist"
+msgstr "Cerca playlist"
+
+#: src/qtui/settings.cc:79
+msgid "Use bold font for column headers"
+msgstr ""
+
 #: src/resample/resample.cc:43
 msgid "Sample Rate Converter"
 msgstr "Convertitore Sample Rate"
@@ -2911,7 +3146,7 @@
 msgid "Method:"
 msgstr "Metodo:"
 
-#: src/resample/resample.cc:199 src/sox-resampler/sox-resampler.cc:161
+#: src/resample/resample.cc:199 src/soxr/sox-resampler.cc:203
 msgid "Rate:"
 msgstr "Frequenza:"
 
@@ -2963,67 +3198,48 @@
 msgid "192 kHz:"
 msgstr "192 kHz:"
 
-#: src/scrobbler2/config_window.cc:41
-#, c-format
-msgid "OK. Scrobbling for user: %s"
-msgstr "OK. Processo di scrobbling per l'utente: %s"
+#: src/scrobbler2/config_window.cc:29
+msgid "Checking Last.fm access ..."
+msgstr "Controllando accesso a Last.fm ..."
 
-#: src/scrobbler2/config_window.cc:54
-msgid "Permission Denied"
-msgstr "Permesso Negato."
-
-#: src/scrobbler2/config_window.cc:56
-msgid "Access the following link to allow Audacious to scrobble your plays:"
+#: src/scrobbler2/config_window.cc:35
+msgid ""
+"Your scrobbles are being saved on your computer temporarily. They will be "
+"submitted as soon as Audacious is allowed access."
 msgstr ""
-"Accedi al seguente link per permettere ad Audacious di eseguire lo "
-"scrobbling dei tuoi avvii:"
 
-#: src/scrobbler2/config_window.cc:66
-msgid "Keep this window open and click 'Check Permission' again.\n"
+#: src/scrobbler2/config_window.cc:41
+#, c-format
+msgid "Permission granted. Scrobbling for user %s."
 msgstr ""
-"Mantieni aperta questa finestra e clicca ancora su 'Controlla Permesso'.\n"
 
-#: src/scrobbler2/config_window.cc:69 src/scrobbler2/config_window.cc:80
+#: src/scrobbler2/config_window.cc:44
 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."
+"Permission denied. Open the following URL in a browser, allow Audacious "
+"access to your account, and then click 'Check Permission' again:"
 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.cc:77
-msgid "Network Problem."
-msgstr "Problema di Rete."
-
-#: src/scrobbler2/config_window.cc:78
-msgid "There was a problem contacting Last.fm. Please try again later."
+#: src/scrobbler2/config_window.cc:53
+msgid "There was a problem contacting Last.fm."
 msgstr ""
-"C'era un problema nel contattare Last.fm. Per favore riprova più tardi."
-
-#: src/scrobbler2/config_window.cc:110
-msgid "Checking..."
-msgstr "In controllo..."
 
-#: src/scrobbler2/config_window.cc:176
-msgid "C_heck Permission"
-msgstr "C_ontrolla Permesso"
+#: src/scrobbler2/config_window.cc:92
+msgid "Check Permission"
+msgstr ""
 
-#: src/scrobbler2/config_window.cc:177
-msgid "_Revoke Permission"
-msgstr "_Revoca Permesso"
+#: src/scrobbler2/config_window.cc:93
+msgid "Revoke Permission"
+msgstr "Revoca permesso"
 
-#: src/scrobbler2/config_window.cc:220
-msgid ""
-"You need to allow Audacious to scrobble tracks to your Last.fm account.\n"
+#: src/scrobbler2/config_window.cc:97
+msgid "You need to allow Audacious to scrobble tracks to your Last.fm account."
 msgstr ""
-"Hai bisogno di permettere ad Audacious di eseguire lo scrobbling delle "
-"tracce al tuo account Last.fm.\n"
 
 #: src/scrobbler2/scrobbler.cc:29
 msgid "Scrobbler 2.0"
 msgstr "Scrobbler 2.0"
 
-#: src/scrobbler2/scrobbler.cc:224
+#: src/scrobbler2/scrobbler.cc:200
 msgid ""
 "The Scrobbler plugin could not be started.\n"
 "There might be a problem with your installation."
@@ -3031,36 +3247,21 @@
 "Lo Scrobbler plugin non può essere avviato.\n"
 "Ci potrebbe essere un problema con l'installazione."
 
-#: src/scrobbler2/scrobbler.cc:289
+#: src/scrobbler2/scrobbler.cc:245
 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 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/scrobbler2/scrobbler_communication.cc:642
-msgid ""
-"Audacious is now using an improved version of the Last.fm Scrobbler.\n"
-"Please check the Preferences for the Scrobbler plugin."
+"project."
 msgstr ""
-"Audacious adesso sta usando una versione migliorata dello Scrobbler Last."
-"fm.\n"
-"Per favore controlla le impostazioni per il plugin Scrobbler."
 
-#: src/sdlout/sdlout.cc:48
+#: src/sdlout/sdlout.cc:43
 msgid "SDL Output"
 msgstr "Uscita SDL"
 
-#: src/sdlout/sdlout.cc:77
+#: src/sdlout/sdlout.cc:72
 msgid ""
 "SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
@@ -3068,56 +3269,44 @@
 "SDL Output Plugin per Audacious\n"
 "Copyright 2010 John Lindgren"
 
-#: src/search-tool/search-tool.cc:116 src/search-tool/search-tool.cc:124
+#: src/search-tool/library.cc:35 src/search-tool/library.cc:46
+#: src/search-tool-qt/library.cc:35 src/search-tool-qt/library.cc:46
 msgid "Library"
 msgstr "Libreria"
 
-#: src/search-tool/search-tool.cc:394
-#, c-format
-msgid "%d result"
-msgid_plural "%d results"
-msgstr0 "%d risultato"
-msgstr1 "%d risultati"
-
-#: src/search-tool/search-tool.cc:400
-#, c-format
-msgid "(%d hidden)"
-msgid_plural "(%d hidden)"
-msgstr0 "(%d nascosto)"
-msgstr1 "(%d nascosti)"
-
-#: src/search-tool/search-tool.cc:594
+#: src/search-tool-qt/search-model.cc:44 src/search-tool/search-tool.cc:287
 #, c-format
 msgid "%d song"
 msgid_plural "%d songs"
 msgstr0 "%d canzone"
 msgstr1 "%d canzoni"
+msgstr2 "%d canzoni"
 
-#: src/search-tool/search-tool.cc:601
+#: src/search-tool-qt/search-model.cc:53 src/search-tool/search-tool.cc:294
 msgid "of this genre"
 msgstr "di questo genere"
 
-#: src/search-tool/search-tool.cc:607
+#: src/search-tool-qt/search-model.h:47 src/search-tool/search-model.h:45
 msgid "on"
 msgstr "in funzione"
 
-#: src/search-tool/search-tool.cc:607
+#: src/search-tool-qt/search-model.h:47 src/search-tool/search-model.h:45
 msgid "by"
 msgstr "di"
 
-#: src/search-tool/search-tool.cc:643
-msgid "_Create Playlist"
-msgstr "_Crea playlist"
+#: src/search-tool-qt/search-tool-qt.cc:165 src/search-tool/search-tool.cc:74
+msgid "Number of results to show:"
+msgstr "Numero di risultati da mostrare:"
 
-#: src/search-tool/search-tool.cc:645
-msgid "_Add to Playlist"
-msgstr "_Aggiungi alla playlist"
+#: src/search-tool-qt/search-tool-qt.cc:168 src/search-tool/search-tool.cc:77
+msgid "Rescan library at startup"
+msgstr "Aggiorna libreria all'avvio"
 
-#: src/search-tool/search-tool.cc:684
-msgid "Search library"
-msgstr "Cerca nella libreria"
+#: src/search-tool-qt/search-tool-qt.cc:170
+msgid "Monitor library for changes"
+msgstr ""
 
-#: src/search-tool/search-tool.cc:688
+#: src/search-tool-qt/search-tool-qt.cc:193 src/search-tool/search-tool.cc:450
 msgid ""
 "To import your music library into Audacious, choose a folder and then click "
 "the \"refresh\" icon."
@@ -3125,22 +3314,46 @@
 "Per importare la tua musica in Audacious, scegli una cartella e clicca "
 "sull'icona \"aggiorna\"."
 
-#: src/search-tool/search-tool.cc:696
+#: src/search-tool-qt/search-tool-qt.cc:195 src/search-tool/search-tool.cc:459
 msgid "Please wait ..."
 msgstr "Attendi per favore…"
 
-#: src/search-tool/search-tool.cc:723
+#: src/search-tool-qt/search-tool-qt.cc:197 src/search-tool/search-tool.cc:487
 msgid "Choose Folder"
 msgstr "Scegli una cartella"
 
+#: src/search-tool-qt/search-tool-qt.cc:201 src/search-tool/search-tool.cc:445
+msgid "Search library"
+msgstr "Cerca nella libreria"
+
+#: src/search-tool-qt/search-tool-qt.cc:327 src/search-tool/search-tool.cc:156
+#, c-format
+msgid "%d of %d result shown"
+msgid_plural "%d of %d results shown"
+msgstr0 ""
+msgstr1 ""
+msgstr2 ""
+
+#: src/search-tool-qt/search-tool-qt.cc:331 src/search-tool/search-tool.cc:160
+#, c-format
+msgid "%d result"
+msgid_plural "%d results"
+msgstr0 "%d risultato"
+msgstr1 "%d risultati"
+msgstr2 "%d risultati"
+
+#: src/search-tool-qt/search-tool-qt.cc:501 src/search-tool/search-tool.cc:341
+msgid "_Create Playlist"
+msgstr "_Crea playlist"
+
+#: src/search-tool-qt/search-tool-qt.cc:503 src/search-tool/search-tool.cc:343
+msgid "_Add to Playlist"
+msgstr "_Aggiungi alla playlist"
+
 #: src/sid/xmms-sid.cc:43
 msgid "SID Player"
 msgstr "Player SID"
 
-#: src/sid/xs_config.cc:61
-msgid "Output"
-msgstr "Uscita"
-
 #: src/sid/xs_config.cc:62
 msgid "Channels:"
 msgstr "Canali:"
@@ -3221,741 +3434,684 @@
 msgid "Threshold:"
 msgstr "Soglia:"
 
-#: src/silence-removal/silence-removal.cc:70
-msgid "dB"
-msgstr "dB"
+#: src/skins/actions.cc:45 src/skins-qt/actions.cc:43
+msgid "Repeat points cleared."
+msgstr "Punti di Ripetizione Cancellati"
+
+#: src/skins/actions.cc:60 src/skins-qt/actions.cc:58
+msgid "Repeat point A set."
+msgstr "Punto di Ripetizione _A impostato"
 
-#: src/skins/menus.cc:64
+#: src/skins/actions.cc:65 src/skins-qt/actions.cc:63
+msgid "Repeat point B set."
+msgstr "Punto di Ripetizione _B impostato"
+
+#: src/skins/equalizer.cc:223 src/skins-qt/equalizer.cc:223
+msgid "Preamp"
+msgstr "Preamplificazione"
+
+#: src/skins/equalizer.cc:227 src/skins-qt/equalizer.cc:227
+msgid "31 Hz"
+msgstr "31 Hz"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "63 Hz"
+msgstr "63 Hz"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "125 Hz"
+msgstr "125 Hz"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "250 Hz"
+msgstr "250 Hz"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "500 Hz"
+msgstr "500 Hz"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "1 kHz"
+msgstr "1 kHz"
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "2 kHz"
+msgstr "2 kHz"
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "4 kHz"
+msgstr "4 kHz"
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "8 kHz"
+msgstr "8 kHz"
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "16 kHz"
+msgstr "16 kHz"
+
+#: src/skins/equalizer.cc:270 src/skins-qt/equalizer.cc:270
+msgid "Audacious Equalizer"
+msgstr "Equalizzatore di Audacious"
+
+#: src/skins/main.cc:459 src/skins-qt/main.cc:442
+msgid "Recording on"
+msgstr ""
+
+#: src/skins/main.cc:461 src/skins-qt/main.cc:444
+msgid "Recording off"
+msgstr ""
+
+#: src/skins/main.cc:754 src/skins-qt/main.cc:701
+#, c-format
+msgid "Seek to %d:%-2.2d / %d:%-2.2d"
+msgstr "Vai a %d:%-2.2d / %d:%-2.2d"
+
+#: src/skins/main.cc:771 src/skins-qt/main.cc:718
+#, c-format
+msgid "Volume: %d%%"
+msgstr "Volume: %d%%"
+
+#: src/skins/main.cc:784 src/skins-qt/main.cc:731
+#, c-format
+msgid "Balance: %d%% left"
+msgstr "Bilanciamento: sinistra %d%%"
+
+#: src/skins/main.cc:786 src/skins-qt/main.cc:733
+msgid "Balance: center"
+msgstr "Bilanciamento: centro"
+
+#: src/skins/main.cc:788 src/skins-qt/main.cc:735
+#, c-format
+msgid "Balance: %d%% right"
+msgstr "Bilanciamento: destra %d%%"
+
+#: src/skins/main.cc:880 src/skins-qt/main.cc:827
+msgid "Options Menu"
+msgstr "Menu opzioni"
+
+#: src/skins/main.cc:884 src/skins-qt/main.cc:831
+msgid "Disable 'Always On Top'"
+msgstr "Disabilita 'Sempre in primo piano'"
+
+#: src/skins/main.cc:886 src/skins-qt/main.cc:833
+msgid "Enable 'Always On Top'"
+msgstr "Abilita 'Sempre in primo piano'"
+
+#: src/skins/main.cc:889 src/skins-qt/main.cc:836
+msgid "File Info Box"
+msgstr "Finestra informazioni file"
+
+#: src/skins/main.cc:892 src/skins/menus.cc:149 src/skins-qt/main.cc:839
+#: src/skins-qt/menus.cc:142
+msgid "Double Size"
+msgstr "Doppia grandezza"
+
+#: src/skins/main.cc:895 src/skins-qt/main.cc:842
+msgid "Visualizations"
+msgstr "Visualizzazioni"
+
+#: src/skins/menus.cc:74 src/skins-qt/menus.cc:64
+msgid "Volume Up"
+msgstr "Alza volume"
+
+#: src/skins/menus.cc:75 src/skins-qt/menus.cc:65
+msgid "Volume Down"
+msgstr "Abbassa volume"
+
+#: src/skins/menus.cc:77 src/skins-qt/menus.cc:67
+msgid "Effects ..."
+msgstr ""
+
+#: src/skins/menus.cc:84 src/skins-qt/menus.cc:74
 msgid "Open Files ..."
 msgstr "Apri files ..."
 
-#: src/skins/menus.cc:65
+#: src/skins/menus.cc:85 src/skins-qt/menus.cc:76
 msgid "Open URL ..."
 msgstr "Apri URL ..."
 
-#: src/skins/menus.cc:66
-msgid "Search Library"
-msgstr "Cerca nella libreria"
-
-#: src/skins/menus.cc:68
-msgid "Playback"
-msgstr "Riproduzione"
-
-#: src/skins/menus.cc:69
+#: src/skins/menus.cc:89 src/skins-qt/menus.cc:80
 msgid "Playlist"
 msgstr "Playlist"
 
-#: src/skins/menus.cc:70
+#: src/skins/menus.cc:90 src/skins-qt/menus.cc:81
+msgid "Output"
+msgstr "Uscita"
+
+#: src/skins/menus.cc:91 src/skins-qt/menus.cc:82
 msgid "View"
 msgstr "Visualizza"
 
-#: src/skins/menus.cc:72 src/skins/menus.cc:136 src/skins/menus.cc:149
-#: src/skins/menus.cc:214
+#: src/skins/menus.cc:93 src/skins/menus.cc:161 src/skins/menus.cc:174
+#: src/skins/menus.cc:245 src/skins-qt/menus.cc:84 src/skins-qt/menus.cc:156
+#: src/skins-qt/menus.cc:170 src/skins-qt/menus.cc:241
 msgid "Services"
 msgstr "Servizi"
 
-#: src/skins/menus.cc:74
+#: src/skins/menus.cc:95 src/skins-qt/menus.cc:86
 msgid "About ..."
 msgstr "Informazioni ..."
 
-#: src/skins/menus.cc:75
+#: src/skins/menus.cc:96 src/skins-qt/menus.cc:87
 msgid "Settings ..."
 msgstr "Impostazioni ..."
 
-#: src/skins/menus.cc:76
+#: src/skins/menus.cc:97 src/skins-qt/menus.cc:88
 msgid "Quit"
 msgstr "Esci"
 
-#: src/skins/menus.cc:80 src/skins/menus.cc:206
+#: src/skins/menus.cc:101 src/skins/menus.cc:235 src/skins-qt/menus.cc:92
+#: src/skins-qt/menus.cc:231
 msgid "Song Info ..."
 msgstr "Informazioni sul brano"
 
-#: src/skins/menus.cc:84
+#: src/skins/menus.cc:105 src/skins-qt/menus.cc:96
+msgid "Shuffle by Album"
+msgstr ""
+
+#: src/skins/menus.cc:106 src/skins-qt/menus.cc:97
 msgid "No Playlist Advance"
 msgstr "Non avanzare nella playlist"
 
-#: src/skins/menus.cc:85
-msgid "Stop After This Song"
-msgstr "Interrompi al termine di questo brano"
-
-#: src/skins/menus.cc:93
+#: src/skins/menus.cc:117 src/skins-qt/menus.cc:108
 msgid "Set A-B Repeat"
 msgstr "Setta ripetizione A-B"
 
-#: src/skins/menus.cc:94
+#: src/skins/menus.cc:118 src/skins-qt/menus.cc:109
 msgid "Clear A-B Repeat"
 msgstr "Elimina ripetizione A-B"
 
-#: src/skins/menus.cc:96
+#: src/skins/menus.cc:120 src/skins-qt/menus.cc:111
 msgid "Jump to Song ..."
 msgstr "Vai a brano ..."
 
-#: src/skins/menus.cc:97
+#: src/skins/menus.cc:121 src/skins-qt/menus.cc:113
 msgid "Jump to Time ..."
 msgstr "Vai a istante di tempo ..."
 
-#: src/skins/menus.cc:101
+#: src/skins/menus.cc:125 src/skins-qt/menus.cc:118
 msgid "Play/Resume"
 msgstr "Riproduci/Riparti"
 
-#: src/skins/menus.cc:103
+#: src/skins/menus.cc:127 src/skins-qt/menus.cc:120
 msgid "New Playlist"
 msgstr "Nuova playlist"
 
-#: src/skins/menus.cc:104
+#: src/skins/menus.cc:128 src/skins-qt/menus.cc:121
 msgid "Rename Playlist ..."
 msgstr "Cambia nome a Playlist"
 
-#: src/skins/menus.cc:105
+#: src/skins/menus.cc:129 src/skins-qt/menus.cc:122
 msgid "Remove Playlist"
 msgstr "Elimina Playlist"
 
-#: src/skins/menus.cc:107
+#: src/skins/menus.cc:131 src/skins-qt/menus.cc:124
 msgid "Previous Playlist"
 msgstr "Playlist precedente"
 
-#: src/skins/menus.cc:108
+#: src/skins/menus.cc:132 src/skins-qt/menus.cc:125
 msgid "Next Playlist"
 msgstr "Playlist successiva"
 
-#: src/skins/menus.cc:110
+#: src/skins/menus.cc:134 src/skins-qt/menus.cc:127
 msgid "Import Playlist ..."
 msgstr "Importazione Playlist ..."
 
-#: src/skins/menus.cc:111
+#: src/skins/menus.cc:135 src/skins-qt/menus.cc:128
 msgid "Export Playlist ..."
 msgstr "Esportazione Playlist ..."
 
-#: src/skins/menus.cc:113
+#: src/skins/menus.cc:137 src/skins-qt/menus.cc:130
 msgid "Playlist Manager ..."
 msgstr "Organizza Playlist ..."
 
-#: src/skins/menus.cc:114
+#: src/skins/menus.cc:138 src/skins-qt/menus.cc:131
 msgid "Queue Manager ..."
 msgstr "Organizza Coda ..."
 
-#: src/skins/menus.cc:116
+#: src/skins/menus.cc:140 src/skins-qt/menus.cc:133
 msgid "Refresh Playlist"
 msgstr "Aggiorna Playlist"
 
-#: src/skins/menus.cc:120
+#: src/skins/menus.cc:144 src/skins-qt/menus.cc:137
 msgid "Show Playlist Editor"
 msgstr "Mostra editor della playlist"
 
-#: src/skins/menus.cc:121
+#: src/skins/menus.cc:145 src/skins-qt/menus.cc:138
 msgid "Show Equalizer"
 msgstr "Mostra equalizzatore"
 
-#: src/skins/menus.cc:123
+#: src/skins/menus.cc:147 src/skins-qt/menus.cc:140
 msgid "Show Remaining Time"
 msgstr "Mostra tempo rimanente"
 
-#: src/skins/menus.cc:125
+#: src/skins/menus.cc:150 src/skins-qt/menus.cc:143
 msgid "Always on Top"
 msgstr "Sempre in primo piano"
 
-#: src/skins/menus.cc:126
+#: src/skins/menus.cc:151 src/skins-qt/menus.cc:145
 msgid "On All Workspaces"
 msgstr "Su tutti gli spazi di lavoro"
 
-#: src/skins/menus.cc:128
+#: src/skins/menus.cc:153 src/skins-qt/menus.cc:148
 msgid "Roll Up Player"
 msgstr "Arrotola il Player"
 
-#: src/skins/menus.cc:129
+#: src/skins/menus.cc:154 src/skins-qt/menus.cc:149
 msgid "Roll Up Playlist Editor"
 msgstr "Arrotola l'editor di Playlist"
 
-#: src/skins/menus.cc:130
+#: src/skins/menus.cc:155 src/skins-qt/menus.cc:150
 msgid "Roll Up Equalizer"
 msgstr "Arrotola l'equalizzatore"
 
-#: src/skins/menus.cc:132 src/skins/ui_main.cc:854
-msgid "Double Size"
-msgstr "Doppia grandezza"
-
-#: src/skins/menus.cc:138
+#: src/skins/menus.cc:163 src/skins-qt/menus.cc:158
 msgid "Add URL ..."
 msgstr "Aggiungi URL ..."
 
-#: src/skins/menus.cc:139
+#: src/skins/menus.cc:164 src/skins-qt/menus.cc:160
 msgid "Add Files ..."
 msgstr "Aggiungi files ..."
 
-#: src/skins/menus.cc:143 src/skins/menus.cc:171 src/skins/menus.cc:185
+#: src/skins/menus.cc:168 src/skins/menus.cc:196 src/skins/menus.cc:212
+#: src/skins-qt/menus.cc:164 src/skins-qt/menus.cc:192
+#: src/skins-qt/menus.cc:208
 msgid "By Title"
 msgstr "Per titolo"
 
-#: src/skins/menus.cc:144 src/skins/menus.cc:178 src/skins/menus.cc:192
+#: src/skins/menus.cc:169 src/skins/menus.cc:203 src/skins/menus.cc:219
+#: src/skins-qt/menus.cc:165 src/skins-qt/menus.cc:199
+#: src/skins-qt/menus.cc:215
 msgid "By File Name"
 msgstr "Per nome File"
 
-#: src/skins/menus.cc:145 src/skins/menus.cc:179 src/skins/menus.cc:193
+#: src/skins/menus.cc:170 src/skins/menus.cc:204 src/skins/menus.cc:220
+#: src/skins-qt/menus.cc:166 src/skins-qt/menus.cc:200
+#: src/skins-qt/menus.cc:216
 msgid "By File Path"
 msgstr "Per percorso file"
 
-#: src/skins/menus.cc:151
+#: src/skins/menus.cc:176 src/skins-qt/menus.cc:172
 msgid "Remove All"
 msgstr "Rimuovi tutti"
 
-#: src/skins/menus.cc:152
+#: src/skins/menus.cc:177 src/skins-qt/menus.cc:173
 msgid "Clear Queue"
 msgstr "Cancella coda"
 
-#: src/skins/menus.cc:154
+#: src/skins/menus.cc:179 src/skins-qt/menus.cc:175
 msgid "Remove Unavailable Files"
 msgstr "Rimuovi i file non disponibili"
 
-#: src/skins/menus.cc:155
+#: src/skins/menus.cc:180 src/skins-qt/menus.cc:176
 msgid "Remove Duplicates"
 msgstr "Rimuovi i duplicati"
 
-#: src/skins/menus.cc:157
+#: src/skins/menus.cc:182 src/skins-qt/menus.cc:178
 msgid "Remove Unselected"
 msgstr "Rimuovi deselezionati"
 
-#: src/skins/menus.cc:158
+#: src/skins/menus.cc:183 src/skins-qt/menus.cc:179
 msgid "Remove Selected"
 msgstr "Rimuovi selezionati"
 
-#: src/skins/menus.cc:162
+#: src/skins/menus.cc:187 src/skins-qt/menus.cc:183
 msgid "Search and Select"
 msgstr "Cerca e seleziona"
 
-#: src/skins/menus.cc:164
+#: src/skins/menus.cc:189 src/skins-qt/menus.cc:185
 msgid "Invert Selection"
 msgstr "Inverti selezione"
 
-#: src/skins/menus.cc:165
+#: src/skins/menus.cc:190 src/skins-qt/menus.cc:186
 msgid "Select None"
 msgstr "Deseleziona tutti"
 
-#: src/skins/menus.cc:166
+#: src/skins/menus.cc:191 src/skins-qt/menus.cc:187
 msgid "Select All"
 msgstr "Seleziona tutti"
 
-#: src/skins/menus.cc:170 src/skins/menus.cc:184
+#: src/skins/menus.cc:195 src/skins/menus.cc:211 src/skins-qt/menus.cc:191
+#: src/skins-qt/menus.cc:207
 msgid "By Track Number"
 msgstr "Per numero di traccia"
 
-#: src/skins/menus.cc:172 src/skins/menus.cc:186
+#: src/skins/menus.cc:197 src/skins/menus.cc:213 src/skins-qt/menus.cc:193
+#: src/skins-qt/menus.cc:209
 msgid "By Artist"
 msgstr "Per artista"
 
-#: src/skins/menus.cc:173 src/skins/menus.cc:187
+#: src/skins/menus.cc:198 src/skins/menus.cc:214 src/skins-qt/menus.cc:194
+#: src/skins-qt/menus.cc:210
 msgid "By Album"
 msgstr "Per album"
 
-#: src/skins/menus.cc:174 src/skins/menus.cc:188
+#: src/skins/menus.cc:199 src/skins/menus.cc:215 src/skins-qt/menus.cc:195
+#: src/skins-qt/menus.cc:211
 msgid "By Album Artist"
 msgstr "Per album artista"
 
-#: src/skins/menus.cc:175 src/skins/menus.cc:190
+#: src/skins/menus.cc:200 src/skins/menus.cc:216 src/skins-qt/menus.cc:196
+#: src/skins-qt/menus.cc:212
 msgid "By Release Date"
 msgstr "Per data di pubblicazione"
 
-#: src/skins/menus.cc:176 src/skins/menus.cc:189
+#: src/skins/menus.cc:201 src/skins/menus.cc:217 src/skins-qt/menus.cc:197
+#: src/skins-qt/menus.cc:213
 msgid "By Genre"
 msgstr "Per Genere"
 
-#: src/skins/menus.cc:177 src/skins/menus.cc:191
+#: src/skins/menus.cc:202 src/skins/menus.cc:218 src/skins-qt/menus.cc:198
+#: src/skins-qt/menus.cc:214
 msgid "By Length"
 msgstr "Per Durata"
 
-#: src/skins/menus.cc:180 src/skins/menus.cc:194
+#: src/skins/menus.cc:205 src/skins/menus.cc:221 src/skins-qt/menus.cc:201
+#: src/skins-qt/menus.cc:217
 msgid "By Custom Title"
 msgstr "Per titolo personalizzato"
 
-#: src/skins/menus.cc:198
+#: src/skins/menus.cc:206 src/skins/menus.cc:222 src/skins-qt/menus.cc:202
+#: src/skins-qt/menus.cc:218
+msgid "By Comment"
+msgstr ""
+
+#: src/skins/menus.cc:207 src/skins/menus.cc:223 src/skins-qt/menus.cc:203
+#: src/skins-qt/menus.cc:219
+msgid "By Disc Number"
+msgstr ""
+
+#: src/skins/menus.cc:227 src/skins-qt/menus.cc:223
 msgid "Randomize List"
 msgstr "Riordina casualmente la lista"
 
-#: src/skins/menus.cc:199
+#: src/skins/menus.cc:228 src/skins-qt/menus.cc:224
 msgid "Reverse List"
 msgstr "Inverti lista"
 
-#: src/skins/menus.cc:201
+#: src/skins/menus.cc:230 src/skins-qt/menus.cc:226
 msgid "Sort Selected"
 msgstr "Ordina selezionati"
 
-#: src/skins/menus.cc:202
+#: src/skins/menus.cc:231 src/skins-qt/menus.cc:227
 msgid "Sort List"
 msgstr "Ordina lista"
 
-#: src/skins/menus.cc:208
+#: src/skins/menus.cc:236 src/skins-qt/menus.cc:232
+msgid "Open Containing Folder"
+msgstr ""
+
+#: src/skins/menus.cc:238 src/skins-qt/menus.cc:234
 msgid "Cut"
 msgstr "Taglia"
 
-#: src/skins/menus.cc:209
+#: src/skins/menus.cc:239 src/skins-qt/menus.cc:235
 msgid "Copy"
 msgstr "Copia"
 
-#: src/skins/menus.cc:210
+#: src/skins/menus.cc:240 src/skins-qt/menus.cc:236
 msgid "Paste"
 msgstr "Incolla"
 
-#: src/skins/menus.cc:212
+#: src/skins/menus.cc:241 src/skins-qt/menus.cc:237
+msgid "Paste at End"
+msgstr "Incolla alla fine"
+
+#: src/skins/menus.cc:243 src/skins-qt/menus.cc:239
 msgid "Queue/Unqueue"
 msgstr "Metti in/togli da coda"
 
-#: src/skins/menus.cc:218
-msgid "Load Preset ..."
-msgstr "Carica predefiniti ..."
-
-#: src/skins/menus.cc:219
-msgid "Load Auto Preset ..."
-msgstr "Carica predefiniti automatici ..."
-
-#: src/skins/menus.cc:220
-msgid "Load Default"
-msgstr "Carica i default"
-
-#: src/skins/menus.cc:221
-msgid "Load Preset File ..."
-msgstr "Carica un file di predefiniti ..."
-
-#: src/skins/menus.cc:222
-msgid "Load EQF File ..."
-msgstr "Carica file EQF"
-
-#: src/skins/menus.cc:224
-msgid "Save Preset ..."
-msgstr "Salva predefiniti"
-
-#: src/skins/menus.cc:225
-msgid "Save Auto Preset ..."
-msgstr "Salva predefiniti automatici"
-
-#: src/skins/menus.cc:226
-msgid "Save Default"
-msgstr "Salva default"
-
-#: src/skins/menus.cc:227
-msgid "Save Preset File ..."
-msgstr "Salva file di predefiniti"
-
-#: src/skins/menus.cc:228
-msgid "Save EQF File ..."
-msgstr "Salva file EQF"
-
-#: src/skins/menus.cc:230
-msgid "Delete Preset ..."
-msgstr "Cancella predefiniti"
-
-#: src/skins/menus.cc:231
-msgid "Delete Auto Preset ..."
-msgstr "Cancella predefiniti automatici"
-
-#: src/skins/menus.cc:233
-msgid "Import Winamp Presets ..."
-msgstr "Importa i predefiniti di Winamp"
-
-#: src/skins/menus.cc:235
-msgid "Reset to Zero"
-msgstr "Resetta a zero"
+#: src/skins/playlist-widget.cc:58 src/skins-qt/playlist-widget.cc:58
+#, c-format
+msgid "%s (%d of %d)"
+msgstr "%s (%d di %d)"
 
-#: src/skins/plugin.cc:48
+#: src/skins/playlistwin.cc:491 src/skins-qt/playlistwin.cc:478
+msgid "Audacious Playlist Editor"
+msgstr "Editor della playlist di Audacious"
+
+#: src/skins/plugin.cc:53 src/skins-qt/plugin.cc:65
 msgid "Winamp Classic Interface"
 msgstr "Interfaccia classica di Winamp"
 
-#: src/skins/preset-browser.cc:57 src/skins/preset-list.cc:371
-#: src/skins/preset-list.cc:386
-msgid "Save"
-msgstr "Salva"
-
-#: src/skins/preset-browser.cc:57 src/skins/preset-list.cc:338
-#: src/skins/preset-list.cc:354
-msgid "Load"
-msgstr "Carica"
-
-#: src/skins/preset-browser.cc:83
-msgid "Load Preset File"
-msgstr "Carica file di predefiniti"
-
-#: src/skins/preset-browser.cc:100
-msgid "Load EQF File"
-msgstr "Carica file EQF"
-
-#: src/skins/preset-browser.cc:119
-msgid "Save Preset File"
-msgstr "Salva file di predefiniti"
-
-#: src/skins/preset-browser.cc:137
-msgid "Save EQF File"
-msgstr "Salva file EQF"
-
-#: src/skins/preset-browser.cc:151
-msgid "Import Winamp Presets"
-msgstr "Importa i predefiniti di Winamp"
-
-#: src/skins/preset-list.cc:285
-msgid "Presets"
-msgstr "Preimpostazioni"
-
-#: src/skins/preset-list.cc:335
-msgid "Load preset"
-msgstr "Carica preimpostazione"
-
-#: src/skins/preset-list.cc:351
-msgid "Load auto-preset"
-msgstr "Carica preimpostazione a caricamento automatico"
-
-#: src/skins/preset-list.cc:367
-msgid "Save preset"
-msgstr "Salva preimpostazione"
-
-#: src/skins/preset-list.cc:382
-msgid "Save auto-preset"
-msgstr "Salva preimpostazione a caricamento automatico"
-
-#: src/skins/preset-list.cc:408
-msgid "Delete preset"
-msgstr "Elimina preimpostazione"
-
-#: src/skins/preset-list.cc:424
-msgid "Delete auto-preset"
-msgstr "Elimina preimpostazione a caricamento automatico"
+#: src/skins-qt/menus.cc:75
+msgid "Open Folder ..."
+msgstr "Apri cartella..."
+
+#: src/skins-qt/menus.cc:159
+msgid "Add Folder ..."
+msgstr "Aggiungi cartella..."
 
-#: src/skins/skins_cfg.cc:176
+#: src/skins-qt/search-select.cc:62 src/skins/search-select.cc:77
+msgid "Search entries in active playlist"
+msgstr "Cerca elementi nella playlist attiva"
+
+#: src/skins-qt/search-select.cc:70 src/skins/search-select.cc:83
+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 ""
+"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-qt/search-select.cc:75 src/skins/search-select.cc:91
+msgid "Title:"
+msgstr "Titolo:"
+
+#: src/skins-qt/search-select.cc:79 src/skins/search-select.cc:96
+msgid "Album:"
+msgstr "Album:"
+
+#: src/skins-qt/search-select.cc:82 src/skins/search-select.cc:101
+msgid "Artist:"
+msgstr "Artista:"
+
+#: src/skins-qt/search-select.cc:85 src/skins/search-select.cc:106
+msgid "File Name:"
+msgstr "Nome del file:"
+
+#: src/skins-qt/search-select.cc:88 src/skins/search-select.cc:134
+msgid "Clear previous selection before searching"
+msgstr "Cancella la selezione precedente prima di effettuare la ricerca"
+
+#: src/skins-qt/search-select.cc:89 src/skins/search-select.cc:137
+msgid "Automatically toggle queue for matching entries"
+msgstr "Inserisci automaticamente in coda gli elementi trovati"
+
+#: src/skins-qt/search-select.cc:90 src/skins/search-select.cc:140
+msgid "Create a new playlist with matching entries"
+msgstr "Crea una nuova playlist con gli elementi trovati"
+
+#: src/skins-qt/search-select.cc:101 src/skins/search-select.cc:78
+msgid "Search"
+msgstr "Cerca"
+
+#: src/skins-qt/skins_cfg.cc:198 src/skins/skins_cfg.cc:182
 msgid "Player:"
 msgstr "Lettore:"
 
-#: src/skins/skins_cfg.cc:178
+#: src/skins-qt/skins_cfg.cc:200 src/skins/skins_cfg.cc:184
 msgid "Select main player window font:"
 msgstr "Seleziona il carattere della finestra principale del lettore:"
 
-#: src/skins/skins_cfg.cc:179
+#: src/skins-qt/skins_cfg.cc:201 src/skins/skins_cfg.cc:185
 msgid "Playlist:"
 msgstr "Playlist:"
 
-#: src/skins/skins_cfg.cc:181
+#: src/skins-qt/skins_cfg.cc:203 src/skins/skins_cfg.cc:187
 msgid "Select playlist font:"
 msgstr "Seleziona il carattere della playlist:"
 
-#: src/skins/skins_cfg.cc:187
+#: src/skins-qt/skins_cfg.cc:207 src/skins/skins_cfg.cc:191
 msgid "Skin"
 msgstr "Pelle"
 
-#: src/skins/skins_cfg.cc:189
+#: src/skins-qt/skins_cfg.cc:211 src/skins/skins_cfg.cc:193
+msgid "Display active titlebar when any window is focused"
+msgstr ""
+
+#: src/skins-qt/skins_cfg.cc:213 src/skins/skins_cfg.cc:195
 msgid "Fonts"
 msgstr "Caratteri"
 
-#: src/skins/skins_cfg.cc:192
+#: src/skins-qt/skins_cfg.cc:215 src/skins/skins_cfg.cc:197
 msgid "Use bitmap fonts (supports ASCII only)"
 msgstr "Usa caratteri bitmap (supporta solo ASCII)"
 
-#: src/skins/skins_cfg.cc:194
+#: src/skins-qt/skins_cfg.cc:217 src/skins/skins_cfg.cc:199
 msgid "Scroll song title"
 msgstr "Fai sfilare il titolo del brano"
 
-#: src/skins/skins_cfg.cc:196
+#: src/skins-qt/skins_cfg.cc:219 src/skins/skins_cfg.cc:201
 msgid "Scroll song title in both directions"
 msgstr "Scorri titolo brano in entrambe le direzioni"
 
-#: src/skins/skins_cfg.cc:201
+#: src/skins-qt/skins_cfg.cc:224 src/skins/skins_cfg.cc:206
 msgid "Analyzer"
 msgstr "Analizzatore"
 
-#: src/skins/skins_cfg.cc:202
+#: src/skins-qt/skins_cfg.cc:225 src/skins/skins_cfg.cc:207
 msgid "Scope"
 msgstr "Oscilloscopio"
 
-#: src/skins/skins_cfg.cc:203
+#: src/skins-qt/skins_cfg.cc:226 src/skins/skins_cfg.cc:208
 msgid "Voiceprint / VU meter"
 msgstr "Impronta vocale/VU meter"
 
-#: src/skins/skins_cfg.cc:204
+#: src/skins-qt/skins_cfg.cc:227 src/skins/skins_cfg.cc:209
 msgid "Off"
 msgstr "Spento"
 
-#: src/skins/skins_cfg.cc:208 src/skins/skins_cfg.cc:233
-#: src/skins/skins_cfg.cc:239
+#: src/skins-qt/skins_cfg.cc:231 src/skins-qt/skins_cfg.cc:256
+#: src/skins-qt/skins_cfg.cc:262 src/skins/skins_cfg.cc:213
+#: src/skins/skins_cfg.cc:238 src/skins/skins_cfg.cc:244
 msgid "Normal"
 msgstr "Normale"
 
-#: src/skins/skins_cfg.cc:209 src/skins/skins_cfg.cc:234
+#: src/skins-qt/skins_cfg.cc:232 src/skins-qt/skins_cfg.cc:257
+#: src/skins/skins_cfg.cc:214 src/skins/skins_cfg.cc:239
 msgid "Fire"
 msgstr "Fuoco"
 
-#: src/skins/skins_cfg.cc:210
+#: src/skins-qt/skins_cfg.cc:233 src/skins/skins_cfg.cc:215
 msgid "Vertical lines"
 msgstr "Linee verticali"
 
-#: src/skins/skins_cfg.cc:214
+#: src/skins-qt/skins_cfg.cc:237 src/skins/skins_cfg.cc:219
 msgid "Lines"
 msgstr "Linee"
 
-#: src/skins/skins_cfg.cc:215
+#: src/skins-qt/skins_cfg.cc:238 src/skins/skins_cfg.cc:220
 msgid "Bars"
 msgstr "Barre"
 
-#: src/skins/skins_cfg.cc:219
+#: src/skins-qt/skins_cfg.cc:242 src/skins/skins_cfg.cc:224
 msgid "Slowest"
 msgstr "Molto lenta"
 
-#: src/skins/skins_cfg.cc:220
+#: src/skins-qt/skins_cfg.cc:243 src/skins/skins_cfg.cc:225
 msgid "Slow"
 msgstr "Lenta"
 
-#: src/skins/skins_cfg.cc:221 src/sox-resampler/sox-resampler.cc:152
+#: src/skins-qt/skins_cfg.cc:244 src/skins/skins_cfg.cc:226
+#: src/soxr/sox-resampler.cc:180
 msgid "Medium"
 msgstr "Media"
 
-#: src/skins/skins_cfg.cc:222
+#: src/skins-qt/skins_cfg.cc:245 src/skins/skins_cfg.cc:227
 msgid "Fast"
 msgstr "Veloce"
 
-#: src/skins/skins_cfg.cc:223
+#: src/skins-qt/skins_cfg.cc:246 src/skins/skins_cfg.cc:228
 msgid "Fastest"
 msgstr "Molto veloce"
 
-#: src/skins/skins_cfg.cc:227
+#: src/skins-qt/skins_cfg.cc:250 src/skins/skins_cfg.cc:232
 msgid "Dots"
 msgstr "Puntini"
 
-#: src/skins/skins_cfg.cc:228
+#: src/skins-qt/skins_cfg.cc:251 src/skins/skins_cfg.cc:233
 msgid "Line"
 msgstr "Linea"
 
-#: src/skins/skins_cfg.cc:229
+#: src/skins-qt/skins_cfg.cc:252 src/skins/skins_cfg.cc:234
 msgid "Solid"
 msgstr "Solido"
 
-#: src/skins/skins_cfg.cc:235
+#: src/skins-qt/skins_cfg.cc:258 src/skins/skins_cfg.cc:240
 msgid "Ice"
 msgstr "Ghiaccio"
 
-#: src/skins/skins_cfg.cc:240
+#: src/skins-qt/skins_cfg.cc:263 src/skins/skins_cfg.cc:245
 msgid "Smooth"
 msgstr "Morbida"
 
-#: src/skins/skins_cfg.cc:244
-msgid "Type"
-msgstr "Scrivi"
-
-#: src/skins/skins_cfg.cc:245
-msgid "Visualization type:"
-msgstr "Tipo di visualizzazione:"
-
-#: src/skins/skins_cfg.cc:248
-msgid "Analyzer"
-msgstr "Analizzatore"
-
-#: src/skins/skins_cfg.cc:249
-msgid "Show peaks"
-msgstr "Mostra picchi"
-
-#: src/skins/skins_cfg.cc:251
+#: src/skins-qt/skins_cfg.cc:267 src/skins/skins_cfg.cc:249
 msgid "Coloring:"
 msgstr "Colori:"
 
-#: src/skins/skins_cfg.cc:254
+#: src/skins-qt/skins_cfg.cc:270 src/skins/skins_cfg.cc:252
 msgid "Style:"
 msgstr "Stile:"
 
-#: src/skins/skins_cfg.cc:257
+#: src/skins-qt/skins_cfg.cc:273 src/skins/skins_cfg.cc:255
 msgid "Falloff:"
 msgstr "Decadimento:"
 
-#: src/skins/skins_cfg.cc:260
+#: src/skins-qt/skins_cfg.cc:276 src/skins/skins_cfg.cc:258
 msgid "Peak falloff:"
 msgstr "Decadimento dei picchi:"
 
-#: src/skins/skins_cfg.cc:264
+#: src/skins-qt/skins_cfg.cc:282 src/skins/skins_cfg.cc:264
 msgid "Scope Style:"
 msgstr "Stile di oscilloscopio:"
 
-#: src/skins/skins_cfg.cc:267
+#: src/skins-qt/skins_cfg.cc:285 src/skins/skins_cfg.cc:267
 msgid "Voiceprint Coloring:"
 msgstr "Colori dell'impronta vocale:"
 
-#: src/skins/skins_cfg.cc:270
+#: src/skins-qt/skins_cfg.cc:288 src/skins/skins_cfg.cc:270
 msgid "VU Meter Style:"
 msgstr "Stile del VU meter:"
 
-#: src/skins/skins_cfg.cc:276
-msgid "General"
-msgstr "Generale"
-
-#: src/skins/skins_cfg.cc:277
-msgid "Visualization"
-msgstr "Visualizzazione"
-
-#: src/skins/ui_equalizer.cc:282
-msgid "Preamp"
-msgstr "Preamplificazione"
-
-#: src/skins/ui_equalizer.cc:286
-msgid "31 Hz"
-msgstr "31 Hz"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "63 Hz"
-msgstr "63 Hz"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "125 Hz"
-msgstr "125 Hz"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "250 Hz"
-msgstr "250 Hz"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "500 Hz"
-msgstr "500 Hz"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "1 kHz"
-msgstr "1 kHz"
-
-#: src/skins/ui_equalizer.cc:288
-msgid "2 kHz"
-msgstr "2 kHz"
-
-#: src/skins/ui_equalizer.cc:288
-msgid "4 kHz"
-msgstr "4 kHz"
-
-#: src/skins/ui_equalizer.cc:288
-msgid "8 kHz"
-msgstr "8 kHz"
-
-#: src/skins/ui_equalizer.cc:288
-msgid "16 kHz"
-msgstr "16 kHz"
-
-#: src/skins/ui_equalizer.cc:330
-msgid "Audacious Equalizer"
-msgstr "Equalizzatore di Audacious"
-
-#: src/skins/ui_main.cc:688
-#, c-format
-msgid "Seek to %d:%-2.2d / %d:%-2.2d"
-msgstr "Vai a %d:%-2.2d / %d:%-2.2d"
-
-#: src/skins/ui_main.cc:709
-#, c-format
-msgid "Volume: %d%%"
-msgstr "Volume: %d%%"
-
-#: src/skins/ui_main.cc:732
-#, c-format
-msgid "Balance: %d%% left"
-msgstr "Bilanciamento: sinistra %d%%"
-
-#: src/skins/ui_main.cc:734
-msgid "Balance: center"
-msgstr "Bilanciamento: centro"
-
-#: src/skins/ui_main.cc:736
-#, c-format
-msgid "Balance: %d%% right"
-msgstr "Bilanciamento: destra %d%%"
-
-#: src/skins/ui_main.cc:842
-msgid "Options Menu"
-msgstr "Menu opzioni"
-
-#: src/skins/ui_main.cc:846
-msgid "Disable 'Always On Top'"
-msgstr "Disabilita 'Sempre in primo piano'"
-
-#: src/skins/ui_main.cc:848
-msgid "Enable 'Always On Top'"
-msgstr "Abilita 'Sempre in primo piano'"
-
-#: src/skins/ui_main.cc:851
-msgid "File Info Box"
-msgstr "Finestra informazioni file"
-
-#: src/skins/ui_main.cc:857
-msgid "Visualizations"
-msgstr "Visualizzazioni"
-
-#: src/skins/ui_main.cc:1336
-msgid "Repeat point A set."
-msgstr "Punto di Ripetizione _A impostato"
-
-#: src/skins/ui_main.cc:1341
-msgid "Repeat point B set."
-msgstr "Punto di Ripetizione _B impostato"
-
-#: src/skins/ui_main.cc:1350
-msgid "Repeat points cleared."
-msgstr "Punti di Ripetizione Cancellati"
-
-#: src/skins/ui_playlist.cc:219
-msgid "Search entries in active playlist"
-msgstr "Cerca elementi nella playlist attiva"
-
-#: src/skins/ui_playlist.cc:226
-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 ""
-"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.cc:234
-msgid "Title:"
-msgstr "Titolo:"
-
-#: src/skins/ui_playlist.cc:241
-msgid "Album:"
-msgstr "Album:"
-
-#: src/skins/ui_playlist.cc:248
-msgid "Artist:"
-msgstr "Artista:"
-
-#: src/skins/ui_playlist.cc:255
-msgid "File Name:"
-msgstr "Nome del file:"
-
-#: src/skins/ui_playlist.cc:263
-msgid "Clear previous selection before searching"
-msgstr "Cancella la selezione precedente prima di effettuare la ricerca"
+#: src/skins-qt/skins_cfg.cc:294 src/skins/skins_cfg.cc:276
+msgid "Type"
+msgstr "Scrivi"
 
-#: src/skins/ui_playlist.cc:266
-msgid "Automatically toggle queue for matching entries"
-msgstr "Inserisci automaticamente in coda gli elementi trovati"
+#: src/skins-qt/skins_cfg.cc:295 src/skins/skins_cfg.cc:277
+msgid "Visualization type:"
+msgstr "Tipo di visualizzazione:"
 
-#: src/skins/ui_playlist.cc:269
-msgid "Create a new playlist with matching entries"
-msgstr "Crea una nuova playlist con gli elementi trovati"
+#: src/skins-qt/skins_cfg.cc:298 src/skins/skins_cfg.cc:280
+msgid "Analyzer"
+msgstr "Analizzatore"
 
-#: src/skins/ui_playlist.cc:717
-msgid "Audacious Playlist Editor"
-msgstr "Editor della playlist di Audacious"
+#: src/skins-qt/skins_cfg.cc:299 src/skins/skins_cfg.cc:281
+msgid "Show peaks"
+msgstr "Mostra picchi"
 
-#: src/skins/ui_playlist.cc:752
-#, c-format
-msgid "%s (%d of %d)"
-msgstr "%s (%d di %d)"
+#: src/skins-qt/skins_cfg.cc:308 src/skins/skins_cfg.cc:290
+msgid "Visualization"
+msgstr "Visualizzazione"
 
-#: src/skins/ui_skinselector.cc:167
+#: src/skins-qt/skinselector.cc:98 src/skins/skinselector.cc:111
 msgid "Archived Winamp 2.x skin"
 msgstr "Skin Winamp 2.x archiviata"
 
-#: src/skins/ui_skinselector.cc:172
+#: src/skins-qt/skinselector.cc:102 src/skins/skinselector.cc:115
 msgid "Unarchived Winamp 2.x skin"
 msgstr "Skin Winamp 2.x non archiviata"
 
-#: src/skins/util.cc:430
-#, c-format
-msgid "Could not create directory (%s): %s\n"
-msgstr "Impossibile creare la directory (%s): %s\n"
-
-#: src/sndfile/plugin.cc:39
+#: src/sndfile/plugin.cc:38
 msgid "Sndfile Plugin"
 msgstr "Plugin Sndfile"
 
-#: src/sndfile/plugin.cc:336
+#: src/sndfile/plugin.cc:372
 msgid ""
 "Based on the xmms_sndfile plugin:\n"
 "Copyright (C) 2000, 2002 Erik de Castro Lopo\n"
@@ -3996,112 +4152,113 @@
 "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, "
 "USA."
 
-#: src/sndio-ng/sndio.cc:44
+#: src/sndio/sndio.cc:43
 msgid "Sndio Output"
 msgstr "Uscita Sndio"
 
-#: src/sndio-ng/sndio.cc:98
+#: src/sndio/sndio.cc:98
 msgid "Device (blank for default):"
 msgstr "Dispositivo (lasciare vuoto per usare quello predefinito):"
 
-#: src/sndio-ng/sndio.cc:100
+#: src/sndio/sndio.cc:100
 msgid "Save and restore volume:"
 msgstr "Salva e ripristina il volume:"
 
-#: src/sndio-ng/sndio.cc:181
+#: src/sndio/sndio.cc:181
 #, c-format
 msgid "Sndio error: Unsupported audio format (%d)"
 msgstr "Errore Sndio: Formato audio non supportato (%d)"
 
-#: src/sndio-ng/sndio.cc:192
+#: src/sndio/sndio.cc:192
 msgid "Sndio error: sio_open() failed"
 msgstr "Errore Sndio: sio_open() fallito"
 
-#: src/sndio-ng/sndio.cc:222
+#: src/sndio/sndio.cc:221
 msgid "Sndio error: sio_setpar() failed"
 msgstr "Errore Sndio: sio_setpar() fallito"
 
-#: src/sndio-ng/sndio.cc:234
+#: src/sndio/sndio.cc:233
 msgid "Sndio error: sio_start() failed"
 msgstr "Errore Sndio: sio_start() fallito"
 
-#: src/song_change/song_change.cc:33
+#: src/songchange/song_change.cc:30
 msgid "Song Change"
 msgstr "Cambio brano"
 
-#: src/song_change/song_change.cc:342
-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."
-
-#: src/song_change/song_change.cc:358
+#: src/songchange/song_change.cc:256
 msgid "Commands"
 msgstr "Comandi"
 
-#: src/song_change/song_change.cc:360
+#: src/songchange/song_change.cc:258
 msgid "Command to run when starting a new song:"
 msgstr "Comando da lanciare quando si avvia una nuova canzone:"
 
-#: src/song_change/song_change.cc:364
+#: src/songchange/song_change.cc:261
+msgid "Command to run when stopping a song:"
+msgstr ""
+
+#: src/songchange/song_change.cc:264
 msgid "Command to run at the end of a song:"
 msgstr "Comando da lanciare al termine di una canzone:"
 
-#: src/song_change/song_change.cc:368
+#: src/songchange/song_change.cc:267
 msgid "Command to run at the end of the playlist:"
 msgstr "Comando da lanciare alla fine di una playlist:"
 
-#: src/song_change/song_change.cc:372
+#: src/songchange/song_change.cc:270
 msgid "Command to run when song title changes (for network streams):"
 msgstr ""
 "Comando da lanciare quando cambia il titolo di una canzone (per gli stream "
 "in rete):"
 
-#: src/song_change/song_change.cc:376
+#: src/songchange/song_change.cc:273
 msgid ""
-"You can use the following format strings which will be substituted before "
-"calling the command (not all are useful for the end-of-playlist command):\n"
-"\n"
-"%F: Frequency (in hertz)\n"
+"You can use the following format codes, which will be replaced before "
+"running the command.\n"
+"Not all are useful though for the song-stopped or end-of-playlist command."
+msgstr ""
+
+#: src/songchange/song_change.cc:276
+msgid ""
+"%a: Artist\n"
+"%b: Album\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"
+"%F: Frequency (Hertz)\n"
+"%l: Length (milliseconds)\n"
+"%n or %s: Formatted title (see playlist settings)\n"
 "%p: Currently playing (1 or 0)\n"
-"%a: Artist\n"
-"%b: Album\n"
-"%T: Track title"
+"%r: Rate (bits per second)\n"
+"%t: Playlist position\n"
+"%T: Title (unformatted)"
 msgstr ""
-"Si possono usare i seguenti formati che verranno sostituiti prima di "
-"chiamare il comando (non tutti sono utili per il comando eseguibile alla "
-"fine della playlist):\n"
-"\n"
-"%F: Frequenza (in hertz)\n"
-"%c: Numero di canali\n"
-"%f: Nome del file (path completo)\n"
-"%l: Lunghezza (in millisecondi)\n"
-"%n o %s: Nome della canzone\n"
-"%r: Rapporto (in bits al secondo)\n"
-"%t: Posizione nella playlist (%02d)\n"
-"%p: Attualmente in esecuzione (1 or 0)\n"
 "%a: Artista\n"
 "%b: Album\n"
-"%T: Titolo del brano"
-
-#: src/song-info-qt/song-info.cc:32
-msgid "Song Info (Qt)"
-msgstr "Informazioni sul brano (Qt)"
+"%c: Numero di canali\n"
+"%f: Nome del file (con percorso completo)\n"
+"%F: Frequenza (Hertz)\n"
+"%l: Durata (milliseconds)\n"
+"%n o %s: Titolo Formattato (vedi configurazione della playlist)\n"
+"%p: Attualmente in esecutione (1 o 0)\n"
+"%r: Rate (bit al secondo)\n"
+"%t: Posizione nella playlist\n"
+"%T: Titolo (non formattato)"
+
+#: src/songchange/song_change.cc:287
+msgid ""
+"Parameters passed to the shell should be enclosed in quotation marks.\n"
+"Unquoted parameters may lead to unexpected results."
+msgstr ""
+
+#: src/song-info-qt/song-info.cc:30
+msgid "Song Info"
+msgstr "Informazioni sulla canzone"
 
-#: src/sox-resampler/sox-resampler.cc:44
+#: src/soxr/sox-resampler.cc:44
 msgid "SoX Resampler"
 msgstr "SoX Resampler"
 
-#: src/sox-resampler/sox-resampler.cc:144
+#: src/soxr/sox-resampler.cc:172
 msgid ""
 "SoX Resampler Plugin for Audacious\n"
 "Copyright 2013 Michał Lipski\n"
@@ -4115,96 +4272,136 @@
 "Basato sul Plugin Sample Rate Converter:\n"
 "Copyright 2010-2012 John Lindgren"
 
-#: src/sox-resampler/sox-resampler.cc:150
+#: src/soxr/sox-resampler.cc:178
 msgid "Quick"
 msgstr "Veloce"
 
-#: src/sox-resampler/sox-resampler.cc:151
+#: src/soxr/sox-resampler.cc:179
 msgid "Low"
 msgstr "Basso"
 
-#: src/sox-resampler/sox-resampler.cc:153
+#: src/soxr/sox-resampler.cc:181
 msgid "High"
 msgstr "Alto"
 
-#: src/sox-resampler/sox-resampler.cc:154
+#: src/soxr/sox-resampler.cc:182
 msgid "Very High"
 msgstr "Molto Alto"
 
-#: src/sox-resampler/sox-resampler.cc:158
+#: src/soxr/sox-resampler.cc:183
+msgid "Ultra High"
+msgstr ""
+
+#: src/soxr/sox-resampler.cc:187
+msgid "Minimum"
+msgstr "Minimo"
+
+#: src/soxr/sox-resampler.cc:188
+msgid "Intermediate"
+msgstr ""
+
+#: src/soxr/sox-resampler.cc:193
 msgid "Quality:"
 msgstr "Qualità:"
 
-#: src/speed-pitch/speed-pitch.cc:51
+#: src/soxr/sox-resampler.cc:196
+msgid "Phase:"
+msgstr ""
+
+#: src/soxr/sox-resampler.cc:200
+msgid "Allow aliasing"
+msgstr ""
+
+#: src/soxr/sox-resampler.cc:202
+msgid "Use steep filter"
+msgstr ""
+
+#: src/speedpitch/speed-pitch.cc:54
 msgid "Speed and Pitch"
 msgstr "Velocità e Tono"
 
-#: src/speed-pitch/speed-pitch.cc:210
-msgid "Speed and Pitch"
-msgstr "Velocità e Tono"
-
-#: src/speed-pitch/speed-pitch.cc:211
-msgid "Speed:"
-msgstr "Velocità: "
-
-#: src/speed-pitch/speed-pitch.cc:214
-msgid "Pitch:"
-msgstr "Tono:"
+#: src/speedpitch/speed-pitch.cc:247
+msgid "Speed"
+msgstr ""
+
+#: src/speedpitch/speed-pitch.cc:248
+msgid "Decouple from pitch"
+msgstr ""
+
+#: src/speedpitch/speed-pitch.cc:250 src/speedpitch/speed-pitch.cc:258
+msgid "Multiplier:"
+msgstr ""
+
+#: src/speedpitch/speed-pitch.cc:254
+msgid "Pitch"
+msgstr ""
 
-#: src/statusicon/statusicon.cc:47
+#: src/statusicon-qt/statusicon.cc:45 src/statusicon/statusicon.cc:47
 msgid "Status Icon"
 msgstr "Icona di stato"
 
-#: src/statusicon/statusicon.cc:283
-msgid "Se_ttings ..."
-msgstr "Impostazioni ..."
-
-#: src/statusicon/statusicon.cc:372
+#: src/statusicon-qt/statusicon.cc:68
 msgid ""
-"Status Icon Plugin\n"
+"Status Icon Plugin (partial port for Qt interface)\n"
 "\n"
 "Copyright 2005-2007 Giacomo Lozito <james@develia.org>\n"
 "Copyright 2010 Michał Lipski <tallica@o2.pl>\n"
+"Copyright 2015 Eugene Paskevich <eugene@raptor.kiev.ua>\n"
 "\n"
 "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.cc:379
+#: src/statusicon-qt/statusicon.cc:89 src/statusicon/statusicon.cc:384
 msgid "Mouse Scroll Action"
 msgstr "Azione Scroll Mouse"
 
-#: src/statusicon/statusicon.cc:380
+#: src/statusicon-qt/statusicon.cc:90 src/statusicon/statusicon.cc:385
 msgid "Change volume"
 msgstr "Cambia volume"
 
-#: src/statusicon/statusicon.cc:383
+#: src/statusicon-qt/statusicon.cc:93 src/statusicon/statusicon.cc:388
 msgid "Change playing song"
 msgstr "Cambia brano in riproduzione"
 
-#: src/statusicon/statusicon.cc:386
+#: src/statusicon-qt/statusicon.cc:96 src/statusicon/statusicon.cc:391
 msgid "Other Settings"
 msgstr "Altre impostazioni"
 
-#: src/statusicon/statusicon.cc:387
+#: src/statusicon-qt/statusicon.cc:97 src/statusicon/statusicon.cc:392
 msgid "Disable the popup window"
 msgstr "Disabilita la finestra popup"
 
-#: src/statusicon/statusicon.cc:389
+#: src/statusicon-qt/statusicon.cc:99 src/statusicon/statusicon.cc:394
 msgid "Close to the system tray"
 msgstr "Chiudi nell'area di notifica (system tray)"
 
-#: src/statusicon/statusicon.cc:391
+#: src/statusicon-qt/statusicon.cc:101 src/statusicon/statusicon.cc:396
 msgid "Advance in playlist when scrolling upward"
 msgstr "Avanza nella playlist quando si scorre verso l'alto"
 
+#: src/statusicon-qt/statusicon.cc:116 src/statusicon/statusicon.cc:287
+msgid "Se_ttings ..."
+msgstr "Impostazioni ..."
+
+#: src/statusicon/statusicon.cc:377
+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 ""
+"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/stereo_plugin/stereo.cc:19
 msgid "Extra Stereo"
 msgstr "Extra Stereo"
@@ -4223,20 +4420,160 @@
 msgid "Extra Stereo"
 msgstr "Extra Stereo"
 
+#: src/streamtuner/icecast-model.cc:126 src/streamtuner/shoutcast-model.cc:131
+msgid "Type"
+msgstr "Tipo"
+
+#: src/streamtuner/icecast-model.cc:132
+msgid "Current Song"
+msgstr ""
+
+#: src/streamtuner/icecast-model.cc:164
+msgid "Other"
+msgstr "Altro"
+
+#: src/streamtuner/ihr-model.cc:63
+msgid "Market"
+msgstr ""
+
+#: src/streamtuner/ihr-model.cc:156
+msgid "Call Letters"
+msgstr ""
+
+#: src/streamtuner/ihr-model.cc:162
+msgid "Description"
+msgstr "Descrizione"
+
+#: src/streamtuner/shoutcast-model.cc:128
+msgid "Listeners"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:188
+msgid "Top 500 Stations"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:189
+msgid "Alternative"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:190
+msgid "Blues"
+msgstr "Blues"
+
+#: src/streamtuner/shoutcast-model.cc:191
+msgid "Classical"
+msgstr "Classica"
+
+#: src/streamtuner/shoutcast-model.cc:192
+msgid "Country"
+msgstr "Country"
+
+#: src/streamtuner/shoutcast-model.cc:193
+msgid "Decades"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:194
+msgid "Easy Listening"
+msgstr "Easy Listening"
+
+#: src/streamtuner/shoutcast-model.cc:195
+msgid "Electronic"
+msgstr "Elettronica"
+
+#: src/streamtuner/shoutcast-model.cc:196
+msgid "Folk"
+msgstr "Folk"
+
+#: src/streamtuner/shoutcast-model.cc:197
+msgid "Inspirational"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:198
+msgid "International"
+msgstr "Internazionale"
+
+#: src/streamtuner/shoutcast-model.cc:199
+msgid "Jazz"
+msgstr "Jazz"
+
+#: src/streamtuner/shoutcast-model.cc:200
+msgid "Latin"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:201
+msgid "Metal"
+msgstr "Metal"
+
+#: src/streamtuner/shoutcast-model.cc:203
+msgid "New Age"
+msgstr "New Age"
+
+#: src/streamtuner/shoutcast-model.cc:204
+msgid "Pop"
+msgstr "Pop"
+
+#: src/streamtuner/shoutcast-model.cc:205
+msgid "Public Radio"
+msgstr "Radio Pubblica"
+
+#: src/streamtuner/shoutcast-model.cc:206
+msgid "R&B and Urban"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:207
+msgid "Rap"
+msgstr "Rap"
+
+#: src/streamtuner/shoutcast-model.cc:208
+msgid "Reggae"
+msgstr "Reggae"
+
+#: src/streamtuner/shoutcast-model.cc:209
+msgid "Rock"
+msgstr "Rock"
+
+#: src/streamtuner/shoutcast-model.cc:210
+msgid "Seasonal and Holiday"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:211
+msgid "Soundtracks"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:212
+msgid "Talk"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:213
+msgid "Themes"
+msgstr "Temi"
+
+#: src/streamtuner/streamtuner.cc:59
+msgid "Shoutcast"
+msgstr ""
+
+#: src/streamtuner/streamtuner.cc:60
+msgid "Icecast"
+msgstr ""
+
+#: src/streamtuner/streamtuner.cc:71
+msgid "Stream Tuner"
+msgstr ""
+
 #: src/tonegen/tonegen.cc:45
 msgid "Tone Generator"
 msgstr "Generatore di toni"
 
-#: src/tonegen/tonegen.cc:94
+#: src/tonegen/tonegen.cc:92
 #, c-format
 msgid "%s %.1f Hz"
 msgstr "%s %.1f Hz"
 
-#: src/tonegen/tonegen.cc:94
+#: src/tonegen/tonegen.cc:92
 msgid "Tone Generator: "
 msgstr "Generatore di toni: "
 
-#: src/tonegen/tonegen.cc:160
+#: src/tonegen/tonegen.cc:161
 msgid ""
 "Sine tone generator by Håvard Kvålen <havardk@xmms.org>\n"
 "Modified by Daniel J. Peng <danielpeng@bigfoot.com>\n"
@@ -4251,11 +4588,32 @@
 "ad esempio tone://2000;2005 per avviare un tono di 2000 Hz e un tono di 2005 "
 "Hz"
 
+#: src/ui-common/dialogs-qt.cc:40
+msgid ""
+"\n"
+"(Further messages have been hidden.)"
+msgstr ""
+"\n"
+"(Ulteriori messaggi sono stati nascosti.)"
+
+#: src/ui-common/dialogs-qt.cc:52
+msgid "Working ..."
+msgstr "In elaborazione ..."
+
+#: src/ui-common/dialogs-qt.cc:73
+msgid "Information"
+msgstr "Informazioni"
+
+#: src/ui-common/menu-ops-gtk.cc:132 src/ui-common/menu-ops-qt.cc:113
+#, c-format
+msgid "%s does not appear to be a valid folder."
+msgstr ""
+
 #: src/voice_removal/voice_removal.cc:28
 msgid "Voice Removal"
 msgstr "Rimozione voce"
 
-#: src/vorbis/vorbis.cc:465
+#: src/vorbis/vorbis.cc:433
 msgid ""
 "Audacious Ogg Vorbis Decoder\n"
 "\n"
@@ -4297,12 +4655,12 @@
 msgid "Ogg Vorbis Decoder"
 msgstr "Decodificatore Ogg Vorbis"
 
-#: src/vtx/info.cc:22
+#: src/vtx/info.cc:24
 #, c-format
 msgid "Details about %s"
 msgstr "Dettagli su %s"
 
-#: src/vtx/info.cc:24
+#: src/vtx/info.cc:26
 msgid ""
 "Title: %t\n"
 "Author: %a\n"
@@ -4332,7 +4690,7 @@
 msgid "VTX Decoder"
 msgstr "Decodificatore VTX"
 
-#: src/vtx/vtx.cc:184
+#: src/vtx/vtx.cc:178
 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"
@@ -4343,19 +4701,59 @@
 "Basato su in_vtx.dll realizzato da Roman Sherbakov <v_soft@microfor.ru>\n"
 "Plugin Audacious realizzato da Pavel Vymetalek <pvymetalek@seznam.cz>"
 
-#: src/wavpack/wavpack.cc:24
+#: src/vumeter-qt/vumeter_qt.cc:31
+msgid ""
+"VU Meter Plugin for Audacious\n"
+"Copyright 2017-2019 Marc Sánchez Fauste"
+msgstr ""
+
+#: src/vumeter-qt/vumeter_qt.cc:35
+msgid "VU Meter Settings"
+msgstr ""
+
+#: src/vumeter-qt/vumeter_qt.cc:37
+msgid "Peak hold time:"
+msgstr ""
+
+#: src/vumeter-qt/vumeter_qt.cc:42
+msgid "Fall-off time:"
+msgstr ""
+
+#: src/vumeter-qt/vumeter_qt.cc:44
+msgid "dB/second"
+msgstr ""
+
+#: src/vumeter-qt/vumeter_qt.cc:46
+msgid "Display legend"
+msgstr "Mostra legenda"
+
+#: src/vumeter-qt/vumeter_qt.h:37
+msgid "VU Meter"
+msgstr ""
+
+#: src/waveout/waveout.cc:43
+msgid "Win32 waveOut"
+msgstr ""
+
+#: src/waveout/waveout.cc:69
+msgid ""
+"Win32 waveOut Plugin for Audacious\n"
+"Copyright 2016 John Lindgren"
+msgstr ""
+
+#: src/wavpack/wavpack.cc:25
 msgid "WavPack Decoder"
 msgstr "Decodificatore WavPack"
 
-#: src/wavpack/wavpack.cc:211
+#: src/wavpack/wavpack.cc:217
 msgid "lossy (hybrid)"
 msgstr "senza perdita (ibrido)"
 
-#: src/wavpack/wavpack.cc:213
+#: src/wavpack/wavpack.cc:219
 msgid "lossy"
 msgstr "con perdita"
 
-#: src/wavpack/wavpack.cc:255
+#: src/wavpack/wavpack.cc:259
 msgid ""
 "Copyright 2006 William Pitcock <nenolod@nenolod.net>\n"
 "\n"
@@ -4365,18 +4763,38 @@
 "\n"
 "Una parte del codice del plugin era di Miles Egan."
 
-#: src/xsf/plugin.cc:50
+#: src/xsf/plugin.cc:74
 msgid "2SF Decoder"
 msgstr "Decodificatore 2SF"
 
-#: src/xsf/plugin.cc:238
+#: src/xsf/plugin.cc:429
+msgid "32728 Hz"
+msgstr ""
+
+#: src/xsf/plugin.cc:432
+msgid "65456 Hz"
+msgstr ""
+
+#: src/xsf/plugin.cc:438
+msgid "Cosine"
+msgstr ""
+
+#: src/xsf/plugin.cc:439
+msgid "Sharp"
+msgstr ""
+
+#: src/xsf/plugin.cc:443
 msgid "XSF Configuration"
 msgstr "Configurazione XSF"
 
-#: src/xsf/plugin.cc:239
-msgid "Ignore length from file"
-msgstr "Ignora la lunghezza dal file"
+#: src/xsf/plugin.cc:445
+msgid "Default fade time:"
+msgstr ""
+
+#: src/xsf/plugin.cc:447
+msgid "Interpolation mode:"
+msgstr ""
 
-#: src/xspf/xspf.cc:89
+#: src/xspf/xspf.cc:95
 msgid "XML Shareable Playlists (XSPF)"
 msgstr "Liste di riproduzione condivisibili XML (XSPF)"

audacious-plugins-3.6.2-gtk3.tar.bz2/po/ja.po -> audacious-plugins-4.4.1.tar.bz2/po/ja.po Changed

@@ -3,23 +3,26 @@
 # This file is distributed under the same license as the Audacious Plugins package.
 #
 # Translators:
-# ABE Tsunehiko, 2015
+# ABE Tsunehiko, 2015-2018
 # natird zoto <dritan86@gmail.com>, 2012
 # ABE Tsunehiko, 2013
 # ABE Tsunehiko, 2012
-# Mika Kobayashi, 2014-2015
+# fbc955180bc2b956cb4ef52d00eb80a0_91487f8, 2014-2015
+# NipponGo, 2020
 # TAKAHASHI Shuuji <shuuji3@gmail.com>, 2012-2014
+# TAKAHASHI Shuuji <shuuji3@gmail.com>, 2015
 # Warui-chan <>, 2012
 # ABE Tsunehiko, 2012
 # ABE Tsunehiko, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: Audacious Plugins\n"
-"Report-Msgid-Bugs-To: http://redmine.audacious-media-player.org/\n"
-"POT-Creation-Date: 2015-05-30 15:51+0200\n"
-"PO-Revision-Date: 2015-05-27 14:24+0000\n"
-"Last-Translator: ABE Tsunehiko\n"
-"Language-Team: Japanese (http://www.transifex.com/projects/p/audacious/"
+"Report-Msgid-Bugs-To: https://github.com/audacious-media-player/audacious/"
+"issues\n"
+"POT-Creation-Date: 2024-09-26 21:54+0200\n"
+"PO-Revision-Date: 2011-10-10 17:43+0000\n"
+"Last-Translator: NipponGo, 2020\n"
+"Language-Team: Japanese (http://app.transifex.com/audacious/audacious/"
 "language/ja/)\n"
 "Language: ja\n"
 "MIME-Version: 1.0\n"
@@ -27,285 +30,60 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: src/aac-raw/aac.cc:18
+#: src/aac/aac.cc:19
 msgid "AAC (Raw) Decoder"
 msgstr "AAC (Raw) デコーダー"
 
-#: src/adplug/adplug-xmms.cc:42
+#: src/adplug/adplug-xmms.cc:70
 msgid "AdPlug (AdLib Player)"
 msgstr "AdPlug (AdLib プレイヤー)"
 
-#: src/adplug/adplug-xmms.cc:156 src/modplug/modplugbmp.cc:335
-#: src/psf/plugin.cc:138 src/vtx/vtx.cc:87 src/xsf/plugin.cc:113
+#: src/adplug/adplug-xmms.cc:167 src/modplug/modplugbmp.cc:321
+#: src/psf/plugin.cc:161 src/vtx/vtx.cc:89 src/xsf/plugin.cc:204
 msgid "sequenced"
 msgstr "シーケンス"
 
-#: src/alarm/alarm.cc:55 src/alarm/interface.cc:82
-msgid "Alarm"
-msgstr "アラーム"
-
-#: src/alarm/alarm.cc:782
-msgid "Set Alarm ..."
-msgstr "アラームをセット"
-
-#: src/alarm/alarm.cc:810
-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/interface.cc: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.cc: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"
-" フェード終了時の音量を設定します。フェード時間が0の場合、始めからこの音量"
-"で再生します。\n"
-"\n"
-"\n"
-"オプション:\n"
-" 追加コマンド:\n"
-" アラームの時刻にこのコマンドを実行します。\n"
-"\n"
+#: src/adplug/adplug-xmms.cc:349 src/sid/xs_config.cc:61
+msgid "Output"
+msgstr "出力"
 
-#: src/alarm/interface.cc: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."
+#: src/adplug/adplug-xmms.cc:350
+msgid "OPL Emulator:"
 msgstr ""
-" プレイリスト:\n"
-" このプレイリストをロードします。\n"
-" プレイリストが指定されなかった場合には、\n"
-" 現在使用しているものが使われます。\n"
-" mp3/ogg のストリームのURL を入力することもできます。\n"
-"\n"
-" リマインダー:\n"
-" アラーム再生時にリマインダを表示します。\n"
-" 表示したい場合には、テキストボックスにリマインダーを入力し、\n"
-" トグルボタンをオンにしてください。"
-
-#: src/alarm/interface.cc:81
-msgid "This is your wakeup call."
-msgstr "目覚ましです。"
-
-#: src/alarm/interface.cc:99
-msgid "Your reminder for today is..."
-msgstr "今日のリマインダー:"
-
-#: src/alarm/interface.cc:101 src/alarm/interface.cc:386
-msgid "Reminder"
-msgstr "リマインダー"
-
-#: src/alarm/interface.cc:132
-msgid "Monday"
-msgstr "月曜日"
-
-#: src/alarm/interface.cc:132
-msgid "Tuesday"
-msgstr "火曜日"
-
-#: src/alarm/interface.cc:132
-msgid "Wednesday"
-msgstr "水曜日"
-
-#: src/alarm/interface.cc:133
-msgid "Thursday"
-msgstr "木曜日"
-
-#: src/alarm/interface.cc:133
-msgid "Friday"
-msgstr "金曜日"
-
-#: src/alarm/interface.cc:133
-msgid "Saturday"
-msgstr "土曜日"
-
-#: src/alarm/interface.cc:133
-msgid "Sunday"
-msgstr "日曜日"
-
-#: src/alarm/interface.cc:171 src/alarm/interface.cc:230
-#: src/alarm/interface.cc:245
-msgid "Time"
-msgstr "時刻"
-
-#: src/alarm/interface.cc:178
-msgid "Alarm at (default):"
-msgstr "アラーム時刻 (デフォルト)"
-
-#: src/alarm/interface.cc:200
-msgid "h"
-msgstr " "
-
-#: src/alarm/interface.cc:203
-msgid "Quiet after:"
-msgstr "静かになるまでの時間:"
-
-#: src/alarm/interface.cc:215
-msgid "hours"
-msgstr "時間"
 
-#: src/alarm/interface.cc:226
-msgid "minutes"
-msgstr "分"
-
-#: src/alarm/interface.cc:235
-msgid "Choose the days for the alarm to come on"
-msgstr "アラームが鳴る曜日を選んでください"
-
-#: src/alarm/interface.cc:242
-msgid "Day"
-msgstr "曜日"
-
-#: src/alarm/interface.cc:259 src/bs2b/plugin.cc:130
-#: src/skins/preset-list.cc:434 src/skins/preset-list.cc:440
-msgid "Default"
-msgstr "デフォルト"
-
-#: src/alarm/interface.cc:288
-msgid "Days"
-msgstr "曜日"
-
-#: src/alarm/interface.cc:297
-msgid "Fading"
-msgstr "フェード"
-
-#: src/alarm/interface.cc:305 src/console/plugin.cc:41
-#: src/crossfade/crossfade.cc:53 src/crossfade/crossfade.cc:59
-#: src/gtkui/settings.cc:49 src/lirc/lirc.cc:397 src/sid/xs_config.cc:85
-#: src/sid/xs_config.cc:94 src/sid/xs_config.cc:103
-msgid "seconds"
-msgstr "秒"
+#: src/adplug/adplug-xmms.cc:353 src/amidiplug/i_configure.cc:153
+#: src/console/plugin.cc:45 src/filewriter/filewriter.cc:481
+#: src/sid/xs_config.cc:65 src/xsf/plugin.cc:446
+msgid "Sample rate:"
+msgstr "サンプリングレート:"
 
-#: src/alarm/interface.cc:312 src/alarm/interface.cc:353
-msgid "Volume"
-msgstr "音量"
-
-#: src/alarm/interface.cc:317
-msgid "Start at"
-msgstr "フェード開始音量"
-
-#: src/alarm/interface.cc:333
-msgid "Final"
-msgstr "フェード終了音量"
-
-#: src/alarm/interface.cc:346
-msgid "Current"
-msgstr "現在の音量"
-
-#: src/alarm/interface.cc:359
-msgid "Additional Command"
-msgstr "追加コマンド"
+#: src/adplug/adplug-xmms.cc:354 src/amidiplug/i_configure.cc:155
+#: src/bs2b/plugin.cc:141 src/console/plugin.cc:47
+#: src/modplug/plugin_main.cc:77 src/resample/resample.cc:201
+#: src/resample/resample.cc:207 src/resample/resample.cc:211
+#: src/resample/resample.cc:215 src/resample/resample.cc:219
+#: src/resample/resample.cc:223 src/resample/resample.cc:227
+#: src/resample/resample.cc:231 src/resample/resample.cc:235
+#: src/resample/resample.cc:239 src/resample/resample.cc:243
+#: src/sid/xs_config.cc:67 src/soxr/sox-resampler.cc:205
+msgid "Hz"
+msgstr "Hz"
 
-#: src/alarm/interface.cc:365 src/alarm/interface.cc:391
-msgid "enable"
-msgstr "有効"
+#: src/adplug/adplug-xmms.cc:355 src/gtkui/settings.cc:55
+#: src/modplug/plugin_main.cc:105 src/qtui/settings.cc:85
+#: src/skins-qt/skins_cfg.cc:302 src/skins/skins_cfg.cc:284
+msgid "Miscellaneous"
+msgstr "その他"
 
-#: src/alarm/interface.cc:372
-msgid "Playlist (optional)"
-msgstr "プレイリスト (オプション)"
-
-#: src/alarm/interface.cc:379
-msgid "Select a playlist"
-msgstr "プレイリストを選択"
-
-#: src/alarm/interface.cc:399
-msgid "Options"
-msgstr "オプション"
-
-#: src/alarm/interface.cc:404
-msgid "What do these options mean?"
-msgstr "オプションの説明"
-
-#: src/alarm/interface.cc:420
-msgid "Help"
-msgstr "ヘルプ"
+#: src/adplug/adplug-xmms.cc:356
+msgid "Repeat song in endless loop"
+msgstr "曲を無限に繰り返す"
 
-#: src/albumart/albumart.cc:31
+#: src/albumart/albumart.cc:31 src/albumart-qt/albumart.cc:35
 msgid "Album Art"
 msgstr "アルバムアート"
 
-#: src/albumart-qt/albumart.cc:33
-msgid "Album Art (Qt)"
-msgstr "アルバムアート (Qt)"
-
-#: src/alsa/alsa.h:70
+#: src/alsa/alsa.h:64
 msgid "ALSA Output"
 msgstr "ALSA 出力"
 
@@ -347,11 +125,11 @@
 msgid "Mixer element:"
 msgstr "ミキサーエレメント"
 
-#: src/amidi-plug/amidi-plug.cc:41
+#: src/amidiplug/amidi-plug.cc:42
 msgid "AMIDI-Plug (MIDI Player)"
 msgstr "AMIDI-Plug (MIDI プレイヤー)"
 
-#: src/amidi-plug/amidi-plug.cc:437
+#: src/amidiplug/amidi-plug.cc:445
 msgid ""
 "AMIDI-Plug\n"
 "modular MIDI music player\n"
@@ -383,167 +161,172 @@
 "スペシャルサンクス...\n"
 "\n"
 "Clemens Ladisch および Jaroslav Kysela\n"
-"（彼らの創った素晴らしいプログラム aplaymidi amixerについて。\n"
-"実に便利で、alsa-lib の文書に沿っており、\n"
-"ALSA API の習得に適っている）\n"
+"　彼らの創った素晴らしいプログラム\n"
+"　aplaymidi amixerについて。\n"
+"　実に便利で、alsa-lib の文書に沿っており、\n"
+"　ALSA API の習得に適っている。\n"
 "\n"
 "Alfredo Spadafina\n"
-"（彼の、素敵な MIDI キーボードのロゴについて）\n"
+"　彼の、素敵な MIDI キーボードのロゴについて。\n"
 "\n"
 "Tony Vroon\n"
-"（アルファテスト時にとてもよく手伝ってくれた）"
+"　アルファテスト時にとてもよく手伝ってくれた。"
 
-#: src/amidi-plug/i_configure.cc:94
+#: src/amidiplug/i_configure.cc:94
 msgid "Override default gain:"
 msgstr "デフォルトのゲインを上書き:"
 
-#: src/amidi-plug/i_configure.cc:102
+#: src/amidiplug/i_configure.cc:102
 msgid "Override default polyphony:"
 msgstr "デフォルトのポリフォニーを上書き:"
 
-#: src/amidi-plug/i_configure.cc:110
+#: src/amidiplug/i_configure.cc:110
 msgid "Override default reverb:"
 msgstr "デフォルトのリバーブを上書き:"
 
-#: src/amidi-plug/i_configure.cc:112 src/amidi-plug/i_configure.cc:120
+#: src/amidiplug/i_configure.cc:112 src/amidiplug/i_configure.cc:120
 msgid "On"
 msgstr "オン"
 
-#: src/amidi-plug/i_configure.cc:118
+#: src/amidiplug/i_configure.cc:118
 msgid "Override default chorus:"
 msgstr "デフォルトのコーラスを上書き:"
 
-#: src/amidi-plug/i_configure.cc:128 src/console/plugin.cc:29
+#: src/amidiplug/i_configure.cc:128 src/console/plugin.cc:29
 msgid "Playback"
 msgstr "再生"
 
-#: src/amidi-plug/i_configure.cc:129
+#: src/amidiplug/i_configure.cc:129
 msgid "Transpose:"
 msgstr "トランスポーズ: "
 
-#: src/amidi-plug/i_configure.cc:131
+#: src/amidiplug/i_configure.cc:131 src/speedpitch/speed-pitch.cc:257
 msgid "semitones"
 msgstr "半音"
 
-#: src/amidi-plug/i_configure.cc:132
+#: src/amidiplug/i_configure.cc:132
 msgid "Drum shift:"
 msgstr "ドラムシフト: "
 
-#: src/amidi-plug/i_configure.cc:134
+#: src/amidiplug/i_configure.cc:134
 msgid "note numbers"
 msgstr "ノートナンバー"
 
-#: src/amidi-plug/i_configure.cc:135
+#: src/amidiplug/i_configure.cc:135
 msgid "Skip leading silence"
 msgstr "先頭の無音をスキップ"
 
-#: src/amidi-plug/i_configure.cc:137
+#: src/amidiplug/i_configure.cc:137
 msgid "Skip trailing silence"
 msgstr "末尾の無音をスキップ"
 
-#: src/amidi-plug/i_configure.cc:141
+#: src/amidiplug/i_configure.cc:141
 msgid "SoundFont"
 msgstr "サウンドフォント"
 
-#: src/amidi-plug/i_configure.cc:143
+#: src/amidiplug/i_configure.cc:148
 msgid "Synthesizer"
 msgstr "シンセサイザー"
 
-#: src/amidi-plug/i_configure.cc:148 src/console/plugin.cc:45
-#: src/sid/xs_config.cc:65
-msgid "Sample rate:"
-msgstr "サンプリングレート:"
-
-#: src/amidi-plug/i_configure.cc:150 src/bs2b/plugin.cc:141
-#: src/console/plugin.cc:47 src/modplug/plugin_main.cc:78
-#: src/resample/resample.cc:201 src/resample/resample.cc:207
-#: src/resample/resample.cc:211 src/resample/resample.cc:215
-#: src/resample/resample.cc:219 src/resample/resample.cc:223
-#: src/resample/resample.cc:227 src/resample/resample.cc:231
-#: src/resample/resample.cc:235 src/resample/resample.cc:239
-#: src/resample/resample.cc:243 src/sid/xs_config.cc:67
-#: src/sox-resampler/sox-resampler.cc:163
-msgid "Hz"
-msgstr "Hz"
-
-#: src/amidi-plug/i_configure-fluidsynth.cc:52
+#: src/amidiplug/i_configure-fluidsynth.cc:58
+#: src/amidiplug/i_configure-fluidsynth.cc:527
 msgid "AMIDI-Plug - select SoundFont file"
 msgstr "AMIDI-Plug - サウンドフォント ファイルの選択"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:55 src/filewriter/mp3.cc:658
+#: src/amidiplug/i_configure-fluidsynth.cc:61
 msgid "_Cancel"
 msgstr "キャンセル(_C)"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:56
+#: src/amidiplug/i_configure-fluidsynth.cc:62
 msgid "_Open"
 msgstr "開く(_O)"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:225 src/gtkui/columns.cc:46
+#: src/amidiplug/i_configure-fluidsynth.cc:233
+#: src/amidiplug/i_configure-fluidsynth.cc:461
 msgid "File name"
 msgstr "ファイル名"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:229
+#: src/amidiplug/i_configure-fluidsynth.cc:237
+#: src/amidiplug/i_configure-fluidsynth.cc:464
 msgid "Size (bytes)"
 msgstr "サイズ (バイト)"
 
-#: src/amidi-plug/i_fileinfo.cc:163
+#: src/amidiplug/i_fileinfo.cc:184
 msgid "Name:"
 msgstr "名前:"
 
-#: src/amidi-plug/i_fileinfo.cc:181
+#: src/amidiplug/i_fileinfo.cc:202
 msgid " MIDI Info "
 msgstr " MIDI 情報 "
 
-#: src/amidi-plug/i_fileinfo.cc:195
+#: src/amidiplug/i_fileinfo.cc:216
 msgid "Format:"
 msgstr "形式:"
 
-#: src/amidi-plug/i_fileinfo.cc:198
+#: src/amidiplug/i_fileinfo.cc:219
 msgid "Length (msec):"
 msgstr "長さ (ミリ秒):"
 
-#: src/amidi-plug/i_fileinfo.cc:201
+#: src/amidiplug/i_fileinfo.cc:222
 msgid "No. of Tracks:"
-msgstr "トラック数:"
+msgstr "トラック番号:"
 
-#: src/amidi-plug/i_fileinfo.cc:207
+#: src/amidiplug/i_fileinfo.cc:228
 msgid "variable"
 msgstr "可変"
 
-#: src/amidi-plug/i_fileinfo.cc:209
+#: src/amidiplug/i_fileinfo.cc:230
 msgid "BPM:"
 msgstr "BPM:"
 
-#: src/amidi-plug/i_fileinfo.cc:217
+#: src/amidiplug/i_fileinfo.cc:238
 msgid "BPM (wavg):"
 msgstr "BPM (wavg):"
 
-#: src/amidi-plug/i_fileinfo.cc:220
+#: src/amidiplug/i_fileinfo.cc:241
 msgid "Time Div:"
 msgstr "時間軸:"
 
-#: src/amidi-plug/i_fileinfo.cc:231
+#: src/amidiplug/i_fileinfo.cc:252
 msgid " MIDI Comments and Lyrics "
 msgstr " MIDI コメントと歌詞 "
 
-#: src/amidi-plug/i_fileinfo.cc:278
+#: src/amidiplug/i_fileinfo.cc:299
 msgid "* no comments available in this MIDI file *"
 msgstr "* MIDI ファイル中に有効なコメントがありません *"
 
-#: src/amidi-plug/i_fileinfo.cc:290
+#: src/amidiplug/i_fileinfo.cc:311
 msgid "* no lyrics available in this MIDI file *"
 msgstr "* MIDI ファイル中に有効な歌詞がありません *"
 
-#: src/amidi-plug/i_fileinfo.cc:300 src/filewriter/vorbis.cc:197
-#: src/ladspa/plugin.cc:416
+#: src/amidiplug/i_fileinfo.cc:321 src/ladspa/plugin.cc:418
+#: src/ui-common/dialogs-qt.cc:32
 msgid "_Close"
 msgstr "プレイリストを閉じる(_C)"
 
-#: src/amidi-plug/i_fileinfo.cc:325
+#: src/amidiplug/i_fileinfo.cc:346
 msgid " (invalid UTF-8)"
 msgstr " (不正な UTF-8)"
 
-#: src/aosd/aosd.cc:32
+#: src/ampache/ampache.cc:33
+msgid "Ampache Browser"
+msgstr "Ampache ブラウザー"
+
+#: src/ampache/ampache.cc:46
+msgid ""
+"Ampache Browser for Audacious\n"
+"http://ampache-browser.org/\n"
+"\n"
+"Copyright (C) Róbert Čerňanský and John Lindgren\n"
+"License: GNU GPLv3"
+msgstr ""
+"Ampache Browser for Audacious\n"
+"http://ampache-browser.org/\n"
+"\n"
+"Copyright (C) Róbert Čerňanský and John Lindgren\n"
+"License: GNU GPLv3"
+
+#: src/aosd/aosd.cc:31
 msgid ""
 "Audacious OSD\n"
 "http://www.develia.org/projects.php?p=audacious#aosd\n"
@@ -558,7 +341,7 @@
 "\n"
 "作者 Giacomo Lozito <james@develia.org>\n"
 "\n"
-"一部は Evan Martin 作の Ghosd ライブラリに基づきます:\n"
+"一部は Evan Martin 作の Ghosd ライブラリーに基づきます:\n"
 "http://neugierig.org/software/ghosd/"
 
 #: src/aosd/aosd.h:37
@@ -577,194 +360,189 @@
 msgid "Concave Rectangle"
 msgstr "凹矩形"
 
-#: src/aosd/aosd_style.cc:69
+#: src/aosd/aosd_style.cc:69 src/openmpt/mptwrap.h:50 src/xsf/plugin.cc:436
 msgid "None"
 msgstr "なし"
 
-#: src/aosd/aosd_trigger.cc:50
+#: src/aosd/aosd_trigger.cc:49
 msgid "Playback Start"
 msgstr "再生開始"
 
-#: src/aosd/aosd_trigger.cc:51
+#: src/aosd/aosd_trigger.cc:50
 msgid "Triggers OSD when a playlist entry is played."
 msgstr "プレイリストの曲が再生されたときに OSD を表示します。"
 
-#: src/aosd/aosd_trigger.cc:56
+#: src/aosd/aosd_trigger.cc:55
 msgid "Title Change"
 msgstr "タイトル変更"
 
-#: src/aosd/aosd_trigger.cc:57
+#: src/aosd/aosd_trigger.cc:56
 msgid "Triggers OSD when the song title changes (for internet streams)."
-msgstr ""
-"曲タイトルが替わったら OSD を表示します (インターネットストリーミング用)。"
+msgstr "曲タイトルが替わったら OSD を表示します (ネットストリーミング向け)。"
 
-#: src/aosd/aosd_trigger.cc:62
+#: src/aosd/aosd_trigger.cc:61
 msgid "Pause On"
 msgstr "一時停止"
 
-#: src/aosd/aosd_trigger.cc:63
+#: src/aosd/aosd_trigger.cc:62
 msgid "Triggers OSD when playback is paused."
 msgstr "再生が停止したときに OSD を表示します。"
 
-#: src/aosd/aosd_trigger.cc:68
+#: src/aosd/aosd_trigger.cc:67
 msgid "Pause Off"
 msgstr "再生の再開"
 
-#: src/aosd/aosd_trigger.cc:69
+#: src/aosd/aosd_trigger.cc:68
 msgid "Triggers OSD when playback is unpaused."
 msgstr "再生が再開したときに OSD を表示します。"
 
-#: src/aosd/aosd_ui.cc:163
+#: src/aosd/aosd_ui.cc:204
 msgid "Placement"
 msgstr "位置"
 
-#: src/aosd/aosd_ui.cc:196
+#: src/aosd/aosd_ui.cc:241
 msgid "Relative X offset:"
 msgstr "相対 X オフセット:"
 
-#: src/aosd/aosd_ui.cc:203
+#: src/aosd/aosd_ui.cc:245
 msgid "Relative Y offset:"
 msgstr "相対 Y オフセット:"
 
-#: src/aosd/aosd_ui.cc:210
+#: src/aosd/aosd_ui.cc:249
 msgid "Max OSD width:"
 msgstr "最大 OSD 幅:"
 
-#: src/aosd/aosd_ui.cc:221
+#: src/aosd/aosd_ui.cc:281
 msgid "Multi-Monitor options"
 msgstr "マルチモニターオプション"
 
-#: src/aosd/aosd_ui.cc:225
+#: src/aosd/aosd_ui.cc:285
 msgid "Display OSD using:"
 msgstr "OSD を表示するモニター:"
 
-#: src/aosd/aosd_ui.cc:227
+#: src/aosd/aosd_ui.cc:287
 msgid "all monitors"
 msgstr "全てのモニター"
 
-#: src/aosd/aosd_ui.cc:230
+#: src/aosd/aosd_ui.cc:290
 #, c-format
 msgid "monitor %i"
 msgstr "モニター %i"
 
-#: src/aosd/aosd_ui.cc:282
+#: src/aosd/aosd_ui.cc:342
 msgid "Timing (ms)"
 msgstr "タイミング (ミリ秒)"
 
-#: src/aosd/aosd_ui.cc:287
+#: src/aosd/aosd_ui.cc:347
 msgid "Display:"
 msgstr "表示:"
 
-#: src/aosd/aosd_ui.cc:292
+#: src/aosd/aosd_ui.cc:352
 msgid "Fade in:"
 msgstr "フェードイン:"
 
-#: src/aosd/aosd_ui.cc:297
+#: src/aosd/aosd_ui.cc:357
 msgid "Fade out:"
 msgstr "フェードアウト:"
 
-#: src/aosd/aosd_ui.cc:361
+#: src/aosd/aosd_ui.cc:442
 msgid "Fonts"
 msgstr "フォント"
 
-#: src/aosd/aosd_ui.cc:368
+#: src/aosd/aosd_ui.cc:449
 #, c-format
 msgid "Font %i:"
 msgstr "フォント %i:"
 
-#: src/aosd/aosd_ui.cc:382
+#: src/aosd/aosd_ui.cc:466
 msgid "Shadow"
 msgstr "影"
 
-#: src/aosd/aosd_ui.cc:486
+#: src/aosd/aosd_ui.cc:589
 msgid "Render Style"
 msgstr "描画形式"
 
-#: src/aosd/aosd_ui.cc:502
+#: src/aosd/aosd_ui.cc:605
 msgid "Colors"
 msgstr "色"
 
-#: src/aosd/aosd_ui.cc:513
+#: src/aosd/aosd_ui.cc:616
 #, c-format
 msgid "Color %i:"
 msgstr "色 %i:"
 
-#: src/aosd/aosd_ui.cc:600
+#: src/aosd/aosd_ui.cc:714
 msgid "Enable trigger"
-msgstr "トリガー有効"
+msgstr "有効にする"
 
-#: src/aosd/aosd_ui.cc:627
+#: src/aosd/aosd_ui.cc:741
 msgid "Event"
 msgstr "イベント"
 
-#: src/aosd/aosd_ui.cc:655
+#: src/aosd/aosd_ui.cc:768
 msgid "Composite manager detected"
-msgstr "Composite マネージャーが検出されました"
+msgstr "コンポジットマネージャーが検出されました"
 
-#: src/aosd/aosd_ui.cc:662
+#: src/aosd/aosd_ui.cc:775
 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 は正常に動作しないでしょう."
+"コンポジットマネージャーが検出されませんでした。\n"
+"動作させているかわからなければ、Composite マネージャーを有効にしてください。"
+"そうしなければ OSD は正常に動作しないでしょう。"
 
-#: src/aosd/aosd_ui.cc:670
+#: src/aosd/aosd_ui.cc:783
 msgid "Composite manager not required for fake transparency"
-msgstr "擬似的な透明化の場合 Composite マネージャーは不要です"
+msgstr "擬似的な透明化の場合コンポジットマネージャーは不要です"
 
-#: src/aosd/aosd_ui.cc:706
+#: src/aosd/aosd_ui.cc:820
 msgid "Transparency"
 msgstr "透明化"
 
-#: src/aosd/aosd_ui.cc:712
+#: src/aosd/aosd_ui.cc:826
 msgid "Fake transparency"
 msgstr "擬似的な透明化"
 
-#: src/aosd/aosd_ui.cc:714
+#: src/aosd/aosd_ui.cc:828
 msgid "Real transparency (requires X Composite Ext.)"
-msgstr "真の透明化 (X Composite 拡張が必要)"
+msgstr "真の透明化 (X コンポジット拡張が必要)"
 
-#: src/aosd/aosd_ui.cc:756
+#: src/aosd/aosd_ui.cc:875
 msgid "Composite extension not loaded"
-msgstr "Composite 拡張が読み込まれていません"
+msgstr "コンポジット拡張が読み込まれていません"
 
-#: src/aosd/aosd_ui.cc:764
-msgid "Composite extension not available"
-msgstr "Composite 拡張が有効ではありません"
-
-#: src/aosd/aosd_ui.cc:781
+#: src/aosd/aosd_ui.cc:892
 #, c-format
 msgid "Audacious OSD"
 msgstr "Audacious OSD"
 
-#: src/aosd/aosd_ui.cc:844
+#: src/aosd/aosd_ui.cc:955
 msgid "Position"
 msgstr "位置"
 
-#: src/aosd/aosd_ui.cc:849
+#: src/aosd/aosd_ui.cc:960
 msgid "Animation"
 msgstr "アニメーション"
 
-#: src/aosd/aosd_ui.cc:854
+#: src/aosd/aosd_ui.cc:965
 msgid "Text"
 msgstr "文字"
 
-#: src/aosd/aosd_ui.cc:859
+#: src/aosd/aosd_ui.cc:970
 msgid "Decoration"
 msgstr "装飾"
 
-#: src/aosd/aosd_ui.cc:864
+#: src/aosd/aosd_ui.cc:975
 msgid "Trigger"
 msgstr "トリガー"
 
-#: src/aosd/aosd_ui.cc:869
+#: src/aosd/aosd_ui.cc:980 src/streamtuner/shoutcast-model.cc:202
 msgid "Misc"
 msgstr "その他"
 
-#: src/aosd/aosd_ui.cc:878
+#: src/aosd/aosd_ui.cc:989
 msgid "Test"
 msgstr "テスト"
 
@@ -780,11 +558,83 @@
 msgid "Audacious Playlists (audpl)"
 msgstr "Audacious プレイリスト (audpl)"
 
-#: src/blur_scope/blur_scope.cc:42
+#: src/background_music/background_music.cc:24
+msgid "Background music"
+msgstr ""
+
+#: src/background_music/background_music.cc:25
+msgid "Target level:"
+msgstr ""
+
+#: src/background_music/background_music.cc:28
+#: src/background_music/background_music.cc:33
+#: src/silence-removal/silence-removal.cc:70
+msgid "dB"
+msgstr "dB"
+
+#: src/background_music/background_music.cc:29
+msgid "Maximum amplification:"
+msgstr ""
+
+#: src/background_music/background_music.cc:34 src/mpg123/mpg123.cc:81
+msgid "Advanced"
+msgstr "高度な設定"
+
+#: src/background_music/background_music.cc:36
+msgid "Slow detection weight:"
+msgstr ""
+
+#: src/background_music/background_music.cc:39
+msgid "Hint"
+msgstr ""
+
+#: src/background_music/background_music.cc:41
+msgid ""
+"Slow detection weight is the relative weight\n"
+"of a long term average detection when compared\n"
+"to the actual, faster loudness detection.\n"
+"A value of zero gives a more radio-like sound\n"
+"where soft passages get \"pulled up\" more quickly,\n"
+"a value of two makes the sound feel less compressed."
+msgstr ""
+
+#: src/background_music/background_music.cc:52
+msgid ""
+"Background Music Plugin for Audacious\n"
+"Copyright 2023;2024 Michel Fleur\n"
+"\n"
+"Controls the volume to make the sound equally loud within and between "
+"tracks.\n"
+" It uses accurate loudness measurement and tries to make the volume changes "
+"sound natural without audible peaks, yet without lowering the volume before "
+"a peak in advance."
+msgstr ""
+
+#: src/background_music/background_music.cc:61
+msgid "Background Music"
+msgstr ""
+
+#: src/bitcrusher/bitcrusher.cc:33
+msgid "Bitcrusher"
+msgstr ""
+
+#: src/bitcrusher/bitcrusher.cc:34
+msgid "Bit Depth:"
+msgstr ""
+
+#: src/bitcrusher/bitcrusher.cc:37
+msgid "Downsample ratio:"
+msgstr ""
+
+#: src/bitcrusher/bitcrusher.cc:48
+msgid "Bitcrusher"
+msgstr ""
+
+#: src/blur_scope/blur_scope.cc:40 src/blur_scope-qt/blur_scope.cc:45
 msgid "Color"
 msgstr "色"
 
-#: src/blur_scope/blur_scope.cc:58
+#: src/blur_scope/blur_scope.cc:56 src/blur_scope-qt/blur_scope.cc:158
 msgid "Blur Scope"
 msgstr "ブラースコープ"
 
@@ -796,6 +646,10 @@
 msgid "Presets:"
 msgstr "プリセット:"
 
+#: src/bs2b/plugin.cc:130
+msgid "Default"
+msgstr "デフォルト"
+
 #: src/bs2b/plugin.cc:136
 msgid "Feed level:"
 msgstr "フェードレベル:"
@@ -808,15 +662,15 @@
 msgid "Cut frequency:"
 msgstr "カット周波数"
 
-#: src/cairo-spectrum/cairo-spectrum.cc:41
+#: src/cairo-spectrum/cairo-spectrum.cc:42 src/qt-spectrum/qt-spectrum.cc:107
 msgid "Spectrum Analyzer"
 msgstr "スペクトラムアナライザー"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:72
+#: src/cdaudio/cdaudio-ng.cc:74
 msgid "Audio CD Plugin"
 msgstr "オーディオ CD プラグイン"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:121
+#: src/cdaudio/cdaudio-ng.cc:121
 msgid ""
 "Copyright (C) 2007-2012 Calin Crisan <ccrisan@gmail.com> and others.\n"
 "\n"
@@ -829,141 +683,140 @@
 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"
+"libcdio developers <http://www.gnu.org/software/libcdio/>と\n"
+"libcddb developers <http://libcddb.sourceforge.net/>に感謝します。\n"
 "\n"
 "メンターとして導いてくれた Tony Vroon にも感謝します。\n"
 "\n"
 "このプラグインは、Google Summer of Code 2007 のプロジェクトです。"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:137
+#: src/cdaudio/cdaudio-ng.cc:140
 msgid "Device"
 msgstr "デバイス"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:138
+#: src/cdaudio/cdaudio-ng.cc:141
 msgid "Read speed:"
 msgstr "読み込み速度:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:141
+#: src/cdaudio/cdaudio-ng.cc:144
 msgid "Override device:"
 msgstr "上書きデバイス"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:143
+#: src/cdaudio/cdaudio-ng.cc:146
 msgid "Metadata"
 msgstr "メタデータ"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:144
+#: src/cdaudio/cdaudio-ng.cc:147
 msgid "Use CD-Text"
 msgstr "CD-Text を使用する"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:146
+#: src/cdaudio/cdaudio-ng.cc:150
 msgid "Use CDDB"
 msgstr "CDDB を使用する"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:148
+#: src/cdaudio/cdaudio-ng.cc:152
 msgid "Use HTTP instead of CDDBP"
 msgstr "CDDBP の代わりに HTTP を使う"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:151
+#: src/cdaudio/cdaudio-ng.cc:155
 msgid "Server:"
 msgstr "サーバー:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:155
+#: src/cdaudio/cdaudio-ng.cc:159
 msgid "Path:"
 msgstr "パス:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:159
+#: src/cdaudio/cdaudio-ng.cc:163
 msgid "Port:"
 msgstr "ポート:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:246
+#: src/cdaudio/cdaudio-ng.cc:228
 msgid "Failed to initialize cdio subsystem."
 msgstr "cdio サブシステムの初期化に失敗しました。"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:281
+#: src/cdaudio/cdaudio-ng.cc:260
 #, c-format
 msgid "Invalid URI %s."
 msgstr "次の URI は無効です。%s"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:283
+#: src/cdaudio/cdaudio-ng.cc:262
 #, c-format
 msgid "Track %d not found."
 msgstr "トラック %d が見つかりません。"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:285
+#: src/cdaudio/cdaudio-ng.cc:264
 #, c-format
 msgid "Track %d is a data track."
 msgstr "トラック %d はデータトラックです。"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:360
+#: src/cdaudio/cdaudio-ng.cc:339
 msgid "Error reading audio CD."
 msgstr " オーディオ CD の読み込み中にエラーが発生しました。"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:429
+#: src/cdaudio/cdaudio-ng.cc:410
 msgid "Audio CD"
 msgstr "オーディオ CD"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:460 src/cdaudio-ng/cdaudio-ng.cc:469
+#: src/cdaudio/cdaudio-ng.cc:446 src/cdaudio/cdaudio-ng.cc:455
 #, c-format
 msgid "Failed to open CD device %s."
 msgstr "CD デバイス %s のオープンに失敗しました。"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:472
+#: src/cdaudio/cdaudio-ng.cc:458
 msgid "No audio capable CD drive found."
 msgstr "オーディオが利用可能な CD ドライブが見つかりません。"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:497
+#: src/cdaudio/cdaudio-ng.cc:481
+msgid "Drive is empty."
+msgstr "ドライブにディスクがありません。"
+
+#: src/cdaudio/cdaudio-ng.cc:483
+msgid "Unsupported disk type."
+msgstr "非対応のディスクです。"
+
+#: src/cdaudio/cdaudio-ng.cc:507
 msgid "Failed to finish initializing opened CD drive."
 msgstr "オープンされた CD ドライブの初期化が完了できませんでした。"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:510
+#: src/cdaudio/cdaudio-ng.cc:520
 msgid "Failed to retrieve first/last track number."
 msgstr "最初または最後のトラックナンバーを取得できませんでした。"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:531
+#: src/cdaudio/cdaudio-ng.cc:541
 #, c-format
 msgid "Cannot read start/end LSN for track %d."
 msgstr ""
-"トラック %d の LSN(論理セクタ番号) の開始または終了が読み取れませんでした。"
+"トラック %d の LSN (論理セクタ番号) の開始または終了が読み取れませんでした。"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:613
-msgid "Failed to create the cddb connection."
-msgstr "cddb コネクションの作成に失敗しました。"
+#: src/cdaudio/cdaudio-ng.cc:624
+msgid "Failed to create the CDDB connection."
+msgstr "CDDB コネクションの作成に失敗しました。"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:679
+#: src/cdaudio/cdaudio-ng.cc:690
 msgid "Failed to query the CDDB server"
 msgstr "CDDB サーバへのクエリに失敗しました。"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:681
+#: src/cdaudio/cdaudio-ng.cc:692
 #, c-format
 msgid "Failed to query the CDDB server: %s"
 msgstr "CDDB サーバへのクエリに失敗しました: %s"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:705
+#: src/cdaudio/cdaudio-ng.cc:716
 #, c-format
-msgid "Failed to read the cddb info: %s"
-msgstr "cddb 情報の読み取りに失敗しました: %s"
+msgid "Failed to read the CDDB info: %s"
+msgstr "CDDB 情報の読み取りに失敗しました: %s"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:765
-msgid "Drive is empty."
-msgstr "ドライブにディスクがありません。"
-
-#: src/cdaudio-ng/cdaudio-ng.cc:767
-msgid "Unsupported disk type."
-msgstr "非対応のディスクです。"
-
-#: src/cd-menu-items/cd-menu-items.cc:35
+#: src/cd-menu-items/cd-menu-items.cc:33
 msgid "Audio CD Menu Items"
 msgstr "オーディオ CD メニュー項目"
 
-#: src/cd-menu-items/cd-menu-items.cc:47
-msgid "Play CD"
-msgstr "CD を再生"
-
-#: src/cd-menu-items/cd-menu-items.cc:47
-msgid "Add CD"
-msgstr "プレイリストに CD を追加"
+#: src/cd-menu-items/cd-menu-items.cc:45
+msgid "Pla_y CD"
+msgstr "CD を再生 (_Y)"
+
+#: src/cd-menu-items/cd-menu-items.cc:45
+msgid "_Add CD"
+msgstr "CD を追加 (_A)"
 
 #: src/compressor/compressor.cc:45
 msgid "Compression"
@@ -999,7 +852,7 @@
 "Shay 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"
+"対応形式: AY, GBS, GYM, HES, KSS, NSF, NSFE, SAP, SPC, VGM, VGZ\n"
 "\n"
 "Audacious plugin by:\n"
 "William Pitcock <nenolod@dereferenced.org>\n"
@@ -1021,7 +874,14 @@
 msgid "Default song length:"
 msgstr "デフォルトの曲の長さ:"
 
-#: src/console/plugin.cc:42 src/modplug/plugin_main.cc:59
+#: src/console/plugin.cc:41 src/crossfade/crossfade.cc:56
+#: src/crossfade/crossfade.cc:62 src/lirc/lirc.cc:395 src/notify/notify.cc:113
+#: src/sid/xs_config.cc:85 src/sid/xs_config.cc:94 src/sid/xs_config.cc:103
+#: src/vumeter-qt/vumeter_qt.cc:39
+msgid "seconds"
+msgstr "秒"
+
+#: src/console/plugin.cc:42 src/modplug/plugin_main.cc:58
 msgid "Resampling"
 msgstr "リサンプリング"
 
@@ -1045,29 +905,41 @@
 msgid "Game Console Music Decoder"
 msgstr "ゲームコンソール音楽デコーダー"
 
-#: src/coreaudio/coreaudio.cc:50
+#: src/coreaudio/coreaudio.cc:53
 msgid "CoreAudio output"
 msgstr "CoreAudio 出力"
 
-#: src/coreaudio/coreaudio.cc:131
+#: src/coreaudio/coreaudio.cc:155
 msgid ""
 "CoreAudio Output Plugin for Audacious\n"
 "Copyright 2014 William Pitcock\n"
+"Copyright 2017,18 René J.V. Bertin\n"
+" (original code and code adapted from\n"
+" Apple examples, (C) Apple 2013)\n"
 "\n"
 "Based on SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
 msgstr ""
 "CoreAudio 出力プラグイン for Audacious\n"
 "Copyright 2014 William Pitcock\n"
+"Copyright 2017,18 René J.V. Bertin\n"
+" (original code and code adapted from\n"
+" Apple examples, (C) Apple 2013)\n"
 "\n"
-"派生元: SDL 出力プラグイン for Audacious\n"
+"Based on SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
 
-#: src/coreaudio/coreaudio.cc:143
+#: src/coreaudio/coreaudio.cc:171
 msgid "Use exclusive mode"
 msgstr "排他モードを用いる"
 
-#: src/crossfade/crossfade.cc:44
+#: src/coreaudio/coreaudio.cc:173
+msgid "Use bit perfect audio (adapt device sampling rate)"
+msgstr ""
+"ビットパーフェクトオーディオを使用する (デバイスのサンプリングレートを適合さ"
+"せる)"
+
+#: src/crossfade/crossfade.cc:47
 msgid ""
 "Crossfade Plugin for Audacious\n"
 "Copyright 2010-2014 John Lindgren"
@@ -1075,27 +947,43 @@
 "クロスフェードプラグイン for Audacious\n"
 "Copyright 2010-2014 John Lindgren"
 
-#: src/crossfade/crossfade.cc:48
+#: src/crossfade/crossfade.cc:51
 msgid "Crossfade"
 msgstr "クロスフェード"
 
-#: src/crossfade/crossfade.cc:49
+#: src/crossfade/crossfade.cc:52
 msgid "On automatic song change"
 msgstr "曲が自動的に替わったとき"
 
-#: src/crossfade/crossfade.cc:51 src/crossfade/crossfade.cc:57
+#: src/crossfade/crossfade.cc:54 src/crossfade/crossfade.cc:60
 msgid "Overlap:"
 msgstr "オーバーラップ:"
 
-#: src/crossfade/crossfade.cc:55
+#: src/crossfade/crossfade.cc:58
 msgid "On seek or manual song change"
 msgstr "シークや任意に曲を替えたとき"
 
-#: src/crossfade/crossfade.cc:61
+#: src/crossfade/crossfade.cc:64
+msgid "No fade in"
+msgstr ""
+
+#: src/crossfade/crossfade.cc:66
+msgid "Use S-curve fade"
+msgstr ""
+
+#: src/crossfade/crossfade.cc:68
+msgid "S-curve steepness:"
+msgstr ""
+
+#: src/crossfade/crossfade.cc:70
+msgid "(higher is steeper)"
+msgstr ""
+
+#: src/crossfade/crossfade.cc:72
 msgid "Tip"
 msgstr "参考"
 
-#: src/crossfade/crossfade.cc:62
+#: src/crossfade/crossfade.cc:73
 msgid ""
 "For better crossfading, enable\n"
 "the Silence Removal effect."
@@ -1103,27 +991,10 @@
 "より効果的なクロスフェードのために\n"
 "無音部の除去プラグインも有効にしてください。"
 
-#: src/crossfade/crossfade.cc:72
+#: src/crossfade/crossfade.cc:83
 msgid "Crossfade"
 msgstr "クロスフェード"
 
-#: src/crossfade/crossfade.cc:161
-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.cc:168
-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/crystalizer/crystalizer.cc:31
 msgid "Crystalizer"
 msgstr "クリスタライザー"
@@ -1136,63 +1007,63 @@
 msgid "Crystalizer"
 msgstr "クリスタライザー"
 
-#: src/cue/cue.cc:37
+#: src/cue/cue.cc:42
 msgid "Cue Sheet Plugin"
 msgstr "Cue シートプラグイン"
 
-#: src/delete-files/delete-files.cc:46 src/delete-files/delete-files.cc:146
+#: src/delete-files/delete-files.cc:53 src/delete-files/delete-files.cc:215
+#: src/delete-files/delete-files.cc:230
 msgid "Delete Files"
 msgstr "ファイルの削除"
 
-#: src/delete-files/delete-files.cc:75
+#: src/delete-files/delete-files.cc:120
+msgid "No files are selected."
+msgstr "ファイルが選択されていません。"
+
+#: src/delete-files/delete-files.cc:125
 #, c-format
-msgid "Error moving %s to trash: %s."
-msgstr "%s をゴミ箱に移動中に次のエラーが発生しました。%s。"
+msgid "Do you want to move %s to the trash?"
+msgstr "%s をゴミ箱に移動しますか？"
 
-#: src/delete-files/delete-files.cc:86
+#: src/delete-files/delete-files.cc:126
 #, c-format
-msgid "Error deleting %s: %s."
-msgstr "%s の削除中に次のエラーが発生しました。%s。"
+msgid "Do you want to permanently delete %s?"
+msgstr "%s を完全に削除しますか？"
 
-#: src/delete-files/delete-files.cc:117
+#: src/delete-files/delete-files.cc:133
 #, c-format
-msgid "Error deleting %s: not a local file."
-msgstr ""
-"%s の削除中に次のエラーが発生しました。ローカルなファイルではありません。"
+msgid "Do you want to move %d files to the trash?"
+msgstr "%d 個のファイルをゴミ箱に移動しますか？"
 
 #: src/delete-files/delete-files.cc:134
-msgid "Do you want to move the selected files to the trash?"
-msgstr "選択したファイルをゴミ箱に移動しますか？"
+#, c-format
+msgid "Do you want to permanently delete %d files?"
+msgstr "%d 個のファイルを完全に削除しますか？"
 
-#: src/delete-files/delete-files.cc:135
-msgid "Move to Trash"
+#: src/delete-files/delete-files.cc:146
+msgid "Move to trash"
 msgstr "ゴミ箱に移動する"
 
-#: src/delete-files/delete-files.cc:140
-msgid "Do you want to permanently delete the selected files?"
-msgstr "選択したファイルを完全に削除しますか？"
-
-#: src/delete-files/delete-files.cc:141 src/skins/preset-list.cc:411
-#: src/skins/preset-list.cc:427
+#: src/delete-files/delete-files.cc:146
 msgid "Delete"
 msgstr "削除"
 
-#: src/delete-files/delete-files.cc:145 src/skins/preset-browser.cc:56
-#: src/skins/preset-list.cc:307 src/skins/ui_playlist.cc:221
+#: src/delete-files/delete-files.cc:213 src/delete-files/delete-files.cc:235
+#: src/skins-qt/search-select.cc:102 src/skins/search-select.cc:78
 msgid "Cancel"
 msgstr "キャンセル"
 
-#: src/delete-files/delete-files.cc:166
+#: src/delete-files/delete-files.cc:267
 msgid "Delete Selected Files"
 msgstr "選択したファイルの削除"
 
-#: src/delete-files/delete-files.cc:181
+#: src/delete-files/delete-files.cc:287
 msgid "Delete Method"
 msgstr "削除の方法"
 
-#: src/delete-files/delete-files.cc:182
+#: src/delete-files/delete-files.cc:288
 msgid "Move to trash instead of deleting immediately"
-msgstr "直ちに削除するかわりにゴミ箱に移動"
+msgstr "ただちに削除するかわりにゴミ箱に移動"
 
 #: src/echo_plugin/echo.cc:9
 msgid ""
@@ -1210,13 +1081,13 @@
 msgid "Echo"
 msgstr "エコー"
 
-#: src/echo_plugin/echo.cc:22 src/modplug/plugin_main.cc:73
-#: src/modplug/plugin_main.cc:83
+#: src/echo_plugin/echo.cc:22 src/modplug/plugin_main.cc:72
+#: src/modplug/plugin_main.cc:82
 msgid "Delay:"
 msgstr "遅延:"
 
-#: src/echo_plugin/echo.cc:24 src/modplug/plugin_main.cc:73
-#: src/modplug/plugin_main.cc:83
+#: src/echo_plugin/echo.cc:24 src/modplug/plugin_main.cc:72
+#: src/modplug/plugin_main.cc:82 src/xsf/plugin.cc:445
 msgid "ms"
 msgstr "ms"
 
@@ -1224,7 +1095,7 @@
 msgid "Feedback:"
 msgstr "フィードバック:"
 
-#: src/echo_plugin/echo.cc:28 src/modplug/plugin_main.cc:87
+#: src/echo_plugin/echo.cc:28 src/modplug/plugin_main.cc:86
 msgid "Volume:"
 msgstr "音量:"
 
@@ -1232,11 +1103,11 @@
 msgid "Echo"
 msgstr "エコー"
 
-#: src/ffaudio/ffaudio-core.cc:41
+#: src/ffaudio/ffaudio-core.cc:50
 msgid "FFmpeg Plugin"
 msgstr "FFmpeg プラグイン"
 
-#: src/ffaudio/ffaudio-core.cc:571
+#: src/ffaudio/ffaudio-core.cc:649
 msgid ""
 "Multi-format audio decoding plugin for Audacious using\n"
 "FFmpeg multimedia framework (http://www.ffmpeg.org/)\n"
@@ -1252,248 +1123,321 @@
 "William Pitcock <nenolod@nenolod.net>\n"
 "Matti Hämäläinen <ccr@tnsp.org>"
 
-#: src/filewriter/filewriter.cc:45
+#: src/filewriter/filewriter.cc:48
 msgid "FileWriter Plugin"
 msgstr "ファイル出力プラグイン"
 
-#: src/filewriter/filewriter.cc:386
+#: src/filewriter/filewriter.cc:316
+#, c-format
+msgid ""
+"Error opening %s:\n"
+"%s"
+msgstr ""
+"%s を開く際にエラー:\n"
+"%s"
+
+#: src/filewriter/filewriter.cc:358
+msgid ""
+"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."
+
+#: src/filewriter/filewriter.cc:385
 msgid "Output file format:"
 msgstr "出力ファイルフォーマット:"
 
-#: src/filewriter/filewriter.cc:403
-msgid "Configure"
-msgstr "設定"
-
-#: src/filewriter/filewriter.cc:413
+#: src/filewriter/filewriter.cc:389
 msgid "Save into original directory"
 msgstr "元のディレクトリーに保存する"
 
-#: src/filewriter/filewriter.cc:417
-msgid "Save into custom directory"
-msgstr "指定のディレクトリーに保存する"
-
-#: src/filewriter/filewriter.cc:427
-msgid "Output file folder:"
-msgstr "ファイル出力先フォルダー:"
+#: src/filewriter/filewriter.cc:392
+msgid "Save into custom directory:"
+msgstr "カスタムディレクトリーに保存:"
 
-#: src/filewriter/filewriter.cc:431
-msgid "Pick a folder"
-msgstr "フォルダーの選択"
-
-#: src/filewriter/filewriter.cc:444
+#: src/filewriter/filewriter.cc:400
 msgid "Generate file name from:"
 msgstr "ファイルネームを次から生成:"
 
-#: src/filewriter/filewriter.cc:448
-msgid "Original file tag"
-msgstr "元のファイルタグ"
-
-#: src/filewriter/filewriter.cc:453
+#: src/filewriter/filewriter.cc:401
 msgid "Original file name"
 msgstr "元のファイル名"
 
-#: src/filewriter/filewriter.cc:459
-msgid "Include original file name extension"
-msgstr "元のファイル拡張子を含める"
+#: src/filewriter/filewriter.cc:404
+msgid "Original file name (no suffix)"
+msgstr "オリジナルのファイル名 (拡張子なし)"
 
-#: src/filewriter/filewriter.cc:468
+#: src/filewriter/filewriter.cc:407
+msgid "Original file tag"
+msgstr "元のファイルのタグ"
+
+#: src/filewriter/filewriter.cc:411
 msgid "Prepend track number to file name"
 msgstr "ファイル名の前にトラック番号を付ける"
 
-#: src/filewriter/filewriter.cc:484
-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 一般公衆利用許諾契約書\n"
-"(バージョン2か、希望によってはそれ以降のバージョンのうちどれか)の\n"
-"定める条件の下で再頒布または改変することができます。\n"
-"\n"
-"このプログラムは有用であることを願って頒布されますが、*全くの無保証* \n"
-"です。商業可能性の保証や特定の目的への適合性は、言外に示されたものも\n"
-"含め全く存在しません。詳しくはGNU 一般公衆利用許諾契約書をご覧ください。\n"
-" \n"
-"あなたはこのプログラムと共に、GNU 一般公衆利用許諾契約書の複製物を\n"
-"１部受け取ったはずです。もし受け取っていなければ、フリーソフトウェア財団\n"
-"まで請求してください(宛先は the Free Software Foundation, Inc., \n"
-"51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,USA)。"
-
-#: src/filewriter/mp3.cc:40 src/filewriter/mp3.cc:717
+#: src/filewriter/filewriter.cc:417 src/filewriter/filewriter.cc:449
 msgid "Auto"
 msgstr "自動"
 
-#: src/filewriter/mp3.cc:40
+#: src/filewriter/filewriter.cc:418
+msgid "8000 Hz"
+msgstr "8000 Hz"
+
+#: src/filewriter/filewriter.cc:419
+msgid "11025 Hz"
+msgstr "11025 Hz"
+
+#: src/filewriter/filewriter.cc:420
+msgid "12000 Hz"
+msgstr "12000 Hz"
+
+#: src/filewriter/filewriter.cc:421
+msgid "16000 Hz"
+msgstr "16000 Hz"
+
+#: src/filewriter/filewriter.cc:422
+msgid "22050 Hz"
+msgstr "22050 Hz"
+
+#: src/filewriter/filewriter.cc:423
+msgid "24000 Hz"
+msgstr "24000 Hz"
+
+#: src/filewriter/filewriter.cc:424
+msgid "32000 Hz"
+msgstr "32000 Hz"
+
+#: src/filewriter/filewriter.cc:425 src/xsf/plugin.cc:430
+msgid "44100 Hz"
+msgstr "44100 Hz"
+
+#: src/filewriter/filewriter.cc:426 src/xsf/plugin.cc:431
+msgid "48000 Hz"
+msgstr "48000 Hz"
+
+#: src/filewriter/filewriter.cc:430
+msgid "8 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:431
+msgid "16 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:432
+msgid "32 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:433
+msgid "40 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:434
+msgid "48 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:435
+msgid "56 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:436
+msgid "64 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:437
+msgid "80 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:438
+msgid "96 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:439
+msgid "112 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:440
+msgid "128 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:441
+msgid "160 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:442
+msgid "192 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:443
+msgid "224 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:444
+msgid "256 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:445
+msgid "320 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:450
 msgid "Joint Stereo"
 msgstr "ジョイントステレオ"
 
-#: src/filewriter/mp3.cc:41 src/modplug/plugin_main.cc:58
-#: src/mpg123/mpg123.cc:248
+#: src/filewriter/filewriter.cc:451 src/modplug/plugin_main.cc:57
+#: src/mpg123/mpg123.cc:259
 msgid "Stereo"
 msgstr "ステレオ"
 
-#: src/filewriter/mp3.cc:41 src/modplug/plugin_main.cc:57
-#: src/mpg123/mpg123.cc:248
+#: src/filewriter/filewriter.cc:452 src/modplug/plugin_main.cc:56
+#: src/mpg123/mpg123.cc:260
 msgid "Mono"
 msgstr "モノラル"
 
-#: src/filewriter/mp3.cc:657
-msgid "MP3 Configuration"
-msgstr "MP3 設定"
-
-#: src/filewriter/mp3.cc:658
-msgid "_OK"
-msgstr "OK(_O)"
+#: src/filewriter/filewriter.cc:456
+msgid "VBR"
+msgstr "VBR"
+
+#: src/filewriter/filewriter.cc:457
+msgid "ABR"
+msgstr "ABR"
 
-#: src/filewriter/mp3.cc:681
-msgid "Algorithm Quality:"
+#: src/filewriter/filewriter.cc:478
+msgid "Algorithm quality:"
 msgstr "アルゴリズム品質:"
 
-#: src/filewriter/mp3.cc:706
-msgid "Output Sample Rate:"
-msgstr "出力サンプリングレート:"
-
-#: src/filewriter/mp3.cc:733
-msgid "(Hz)"
-msgstr "(Hz)"
-
-#: src/filewriter/mp3.cc:740
-msgid "Bitrate / Compression Ratio:"
-msgstr "ビットレート / 圧縮率:"
-
-#: src/filewriter/mp3.cc:764
-msgid "Bitrate (kbps):"
-msgstr "ビットレート (kbps):"
+#: src/filewriter/filewriter.cc:484
+msgid "Bitrate:"
+msgstr "ビットレート:"
 
-#: src/filewriter/mp3.cc:796
+#: src/filewriter/filewriter.cc:491
 msgid "Compression ratio:"
 msgstr "圧縮率:"
 
-#: src/filewriter/mp3.cc:820
-msgid "Audio Mode:"
-msgstr "オーディオ モード:"
-
-#: src/filewriter/mp3.cc:845
-msgid "Miscellaneous:"
-msgstr "その他:"
+#: src/filewriter/filewriter.cc:498
+msgid "Audio mode:"
+msgstr "オーディオモード:"
 
-#: src/filewriter/mp3.cc:856
+#: src/filewriter/filewriter.cc:501
 msgid "Enforce strict ISO compliance"
 msgstr "厳格な ISO 遵守を強制する"
 
-#: src/filewriter/mp3.cc:867
+#: src/filewriter/filewriter.cc:503
 msgid "Error protection"
 msgstr "エラー保護"
 
-#: src/filewriter/mp3.cc:879 src/filewriter/vorbis.cc:206
-msgid "Quality"
-msgstr "音質"
-
-#: src/filewriter/mp3.cc:888
+#: src/filewriter/filewriter.cc:508
 msgid "Enable VBR/ABR"
 msgstr "VBR/ABR を有効にする"
 
-#: src/filewriter/mp3.cc:898
+#: src/filewriter/filewriter.cc:510
 msgid "Type:"
 msgstr "タイプ:"
 
-#: src/filewriter/mp3.cc:931
-msgid "VBR Options:"
-msgstr "VBR オプション:"
-
-#: src/filewriter/mp3.cc:947
-msgid "Minimum bitrate (kbps):"
-msgstr "最小ビットレート (kbps):"
-
-#: src/filewriter/mp3.cc:973
-msgid "Maximum bitrate (kbps):"
-msgstr "最大ビットレート (kbps):"
-
-#: src/filewriter/mp3.cc:995
-msgid "Strictly enforce minimum bitrate"
-msgstr "最小ビットレートを厳格に強制する"
-
-#: src/filewriter/mp3.cc:1007
-msgid "ABR Options:"
-msgstr "ABR オプション:"
-
-#: src/filewriter/mp3.cc:1017
-msgid "Average bitrate (kbps):"
-msgstr "平均ビットレート (kbps):"
+#: src/filewriter/filewriter.cc:514
+msgid "Minimum bitrate:"
+msgstr "最小ビットレート:"
+
+#: src/filewriter/filewriter.cc:518
+msgid "Maximum bitrate:"
+msgstr "最大ビットレート:"
+
+#: src/filewriter/filewriter.cc:522
+msgid "Average bitrate:"
+msgstr "平均ビットレート:"
 
-#: src/filewriter/mp3.cc:1044
+#: src/filewriter/filewriter.cc:526
 msgid "VBR quality level:"
 msgstr "VBR 品質レベル:"
 
-#: src/filewriter/mp3.cc:1063
+#: src/filewriter/filewriter.cc:530
+msgid "Strictly enforce minimum bitrate"
+msgstr "最小ビットレートを厳格に強制する"
+
+#: src/filewriter/filewriter.cc:533
 msgid "Omit Xing VBR header"
 msgstr "Xing VBR ヘッダを除く"
 
-#: src/filewriter/mp3.cc:1076
-msgid "VBR/ABR"
-msgstr "VBR/ABR"
+#: src/filewriter/filewriter.cc:539
+msgid "Frame Headers"
+msgstr "フレームヘッダー"
 
-#: src/filewriter/mp3.cc:1085
-msgid "Frame Parameters:"
-msgstr "フレームパラメーター:"
-
-#: src/filewriter/mp3.cc:1097
+#: src/filewriter/filewriter.cc:540
 msgid "Mark as copyright"
 msgstr "著作権物としてマーク"
 
-#: src/filewriter/mp3.cc:1108
+#: src/filewriter/filewriter.cc:542
 msgid "Mark as original"
 msgstr "オリジナルとしてマーク"
 
-#: src/filewriter/mp3.cc:1120
-msgid "ID3 Parameters:"
-msgstr "ID3 パラメーター:"
+#: src/filewriter/filewriter.cc:544
+msgid "ID3 Tags"
+msgstr "ID3 タグ"
 
-#: src/filewriter/mp3.cc:1131
+#: src/filewriter/filewriter.cc:545
 msgid "Force addition of version 2 tag"
 msgstr "v2 タグを強制的に付加する"
 
-#: src/filewriter/mp3.cc:1141
+#: src/filewriter/filewriter.cc:547
 msgid "Only add v1 tag"
 msgstr "v1 タグのみ付加する"
 
-#: src/filewriter/mp3.cc:1148
+#: src/filewriter/filewriter.cc:549
 msgid "Only add v2 tag"
 msgstr "v2 タグのみ付加する"
 
-#: src/filewriter/mp3.cc:1169
+#: src/filewriter/filewriter.cc:554
+msgid "Quality"
+msgstr "音質"
+
+#: src/filewriter/filewriter.cc:555
+msgid "VBR/ABR"
+msgstr "VBR/ABR"
+
+#: src/filewriter/filewriter.cc:556
 msgid "Tags"
 msgstr "タグ"
 
-#: src/filewriter/vorbis.cc:196
-msgid "Vorbis Encoder Configuration"
-msgstr "Vorbis エンコーダーの設定"
-
-#: src/filewriter/vorbis.cc:219
-msgid "Quality level (0 - 10):"
-msgstr "品質レベル (0 - 10):"
+#: src/filewriter/filewriter.cc:566
+msgid "Quality (0-1):"
+msgstr "品質 (0-1):"
+
+#: src/filewriter/filewriter.cc:573 src/skins-qt/skins_cfg.cc:307
+#: src/skins/skins_cfg.cc:289
+msgid "General"
+msgstr "一般"
 
-#: src/flacng/flacng.h:35
+#: src/flac/flacng.h:36
 msgid "FLAC Decoder"
 msgstr "FLAC デコーダー"
 
-#: src/flacng/metadata.cc:351 src/wavpack/wavpack.cc:209
+#: src/flac/metadata.cc:296 src/wavpack/wavpack.cc:215
 msgid "lossless"
 msgstr "可逆"
 
-#: src/flacng/plugin.cc:169
+#: src/flac/plugin.cc:214
 msgid ""
 "Original code by\n"
 "Ralf Ertzinger <ralf@skytale.net>\n"
@@ -1517,15 +1461,15 @@
 msgid "GIO Plugin"
 msgstr "GIO プラグイン"
 
-#: src/gio/gio.cc:153
+#: src/gio/gio.cc:152
 msgid "Read-and-append mode not supported"
 msgstr "リードアンドアペンドモードには対応していません"
 
-#: src/gio/gio.cc:166
+#: src/gio/gio.cc:165
 msgid "Invalid open mode"
 msgstr "無効なオープンモード"
 
-#: src/gl-spectrum/gl-spectrum.cc:51
+#: src/glspectrum/gl-spectrum.cc:52
 msgid ""
 "OpenGL Spectrum Analyzer for Audacious\n"
 "Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
@@ -1545,622 +1489,744 @@
 "\n"
 "ライセンス: GPLv2+"
 
-#: src/gl-spectrum/gl-spectrum.cc:62
+#: src/glspectrum/gl-spectrum.cc:63 src/qtglspectrum/gl-spectrum.cc:53
 msgid "OpenGL Spectrum Analyzer"
 msgstr "OpenGL スペクトラムアナライザー"
 
-#: src/gl-spectrum-qt/gl-spectrum.cc:41
-msgid ""
-"OpenGL Spectrum Analyzer for Audacious\n"
-"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
-"Copyright 2014 William Pitcock\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 スペクトラムアナライザー for Audacious\n"
-"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
-"Copyright 2014 William Pitcock\n"
-"\n"
-"派生元: XMMS プラグイン:\n"
-"Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson, and "
-"4Front Technologies\n"
-"\n"
-"ライセンス: GPLv2+"
-
-#: src/gl-spectrum-qt/gl-spectrum.cc:53
-msgid "OpenGL Spectrum Analyzer (Qt)"
-msgstr "OpenGL スペクトラムアナライザー (Qt)"
-
-#: src/gnomeshortcuts/gnomeshortcuts.cc:38
-msgid "GNOME Shortcuts"
-msgstr "GNOME ショートカット"
-
-#: src/gnomeshortcuts/gnomeshortcuts.cc:54
-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"
-"Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>"
-
-#: src/gtkui/columns.cc:35
-msgid "Entry number"
-msgstr "リスト番号"
+#: src/gtkui/columns.cc:36 src/moonstone/playlist_model.cc:38
+#: src/qtui/playlist_model.cc:33
+msgid "Entry Number"
+msgstr "項目数"
 
-#: src/gtkui/columns.cc:36 src/playlist-manager/playlist-manager.cc:225
-#: src/qtui/playlist_model.cc:123
+#: src/gtkui/columns.cc:37 src/moonstone/playlist_model.cc:38
+#: src/moonstone/playlist_selection.cc:64
+#: src/playlist-manager/playlist-manager.cc:200
+#: src/playlist-manager-qt/playlist-manager-qt.cc:188
+#: src/qtui/playlist_model.cc:33 src/streamtuner/icecast-model.cc:120
+#: src/streamtuner/ihr-model.cc:159 src/streamtuner/shoutcast-model.cc:122
 msgid "Title"
 msgstr "タイトル"
 
-#: src/gtkui/columns.cc:37 src/qtui/playlist_model.cc:125
+#: src/gtkui/columns.cc:38 src/moonstone/playlist_model.cc:39
+#: src/qtui/playlist_model.cc:33
 msgid "Artist"
 msgstr "アーティスト"
 
-#: src/gtkui/columns.cc:38
+#: src/gtkui/columns.cc:39 src/moonstone/playlist_model.cc:39
+#: src/qtui/playlist_model.cc:33
 msgid "Year"
 msgstr "年"
 
-#: src/gtkui/columns.cc:39 src/qtui/playlist_model.cc:127
+#: src/gtkui/columns.cc:40 src/moonstone/playlist_model.cc:39
+#: src/qtui/playlist_model.cc:34
 msgid "Album"
 msgstr "アルバム"
 
-#: src/gtkui/columns.cc:40
-msgid "Album artist"
+#: src/gtkui/columns.cc:41 src/moonstone/playlist_model.cc:40
+#: src/qtui/playlist_model.cc:34
+msgid "Album Artist"
 msgstr "アルバムアーティスト"
 
-#: src/gtkui/columns.cc:41
+#: src/gtkui/columns.cc:42 src/moonstone/playlist_model.cc:40
+#: src/qtui/playlist_model.cc:34
 msgid "Track"
 msgstr "トラック"
 
-#: src/gtkui/columns.cc:42
+#: src/gtkui/columns.cc:43 src/moonstone/playlist_model.cc:40
+#: src/qtui/playlist_model.cc:34 src/streamtuner/icecast-model.cc:123
+#: src/streamtuner/shoutcast-model.cc:125
+#: src/streamtuner/shoutcast-model.cc:236
 msgid "Genre"
 msgstr "ジャンル"
 
-#: src/gtkui/columns.cc:43
-msgid "Queue position"
+#: src/gtkui/columns.cc:44 src/moonstone/playlist_model.cc:41
+#: src/qtui/playlist_model.cc:35
+msgid "Queue Position"
 msgstr "キューの位置"
 
-#: src/gtkui/columns.cc:44
+#: src/gtkui/columns.cc:45 src/moonstone/playlist_model.cc:41
+#: src/qtui/playlist_model.cc:35
 msgid "Length"
 msgstr "長さ"
 
-#: src/gtkui/columns.cc:45
-msgid "File path"
+#: src/gtkui/columns.cc:46 src/moonstone/playlist_model.cc:41
+#: src/qtui/playlist_model.cc:35
+msgid "File Path"
 msgstr "ファイルパス"
 
-#: src/gtkui/columns.cc:47
-msgid "Custom title"
+#: src/gtkui/columns.cc:47 src/moonstone/playlist_model.cc:42
+#: src/qtui/playlist_model.cc:35
+msgid "File Name"
+msgstr "ファイル名"
+
+#: src/gtkui/columns.cc:48 src/moonstone/playlist_model.cc:42
+#: src/qtui/playlist_model.cc:36
+msgid "Custom Title"
 msgstr "カスタムタイトル"
 
-#: src/gtkui/columns.cc:48
+#: src/gtkui/columns.cc:49 src/moonstone/playlist_model.cc:42
+#: src/qtui/playlist_model.cc:36 src/streamtuner/icecast-model.cc:129
+#: src/streamtuner/shoutcast-model.cc:134
 msgid "Bitrate"
 msgstr "ビットレート"
 
-#: src/gtkui/columns.cc:308
+#: src/gtkui/columns.cc:50 src/moonstone/playlist_model.cc:43
+#: src/qtui/playlist_model.cc:36
+msgid "Comment"
+msgstr "コメント"
+
+#: src/gtkui/columns.cc:51 src/qtui/playlist_model.cc:36
+msgid "Publisher"
+msgstr ""
+
+#: src/gtkui/columns.cc:52 src/qtui/playlist_model.cc:37
+msgid "Catalog Number"
+msgstr ""
+
+#: src/gtkui/columns.cc:53 src/moonstone/playlist_model.cc:43
+#: src/qtui/playlist_model.cc:37
+msgid "Disc"
+msgstr ""
+
+#: src/gtkui/columns.cc:325
 msgid "Available columns"
 msgstr "利用できる列"
 
-#: src/gtkui/columns.cc:334
+#: src/gtkui/columns.cc:351
 msgid "Displayed columns"
 msgstr "表示された列"
 
-#: src/gtkui/layout.cc:72 src/search-tool/search-tool.cc:40
+#: src/gtkui/layout.cc:74 src/search-tool-qt/search-tool-qt.cc:58
+#: src/search-tool/search-tool.cc:49
 msgid "Search Tool"
 msgstr "検索ツール"
 
-#: src/gtkui/layout.cc:167
+#: src/gtkui/layout.cc:170
 msgid "Dock at Left"
 msgstr "左側にドッキング"
 
-#: src/gtkui/layout.cc:167
+#: src/gtkui/layout.cc:170
 msgid "Dock at Right"
 msgstr "右側にドッキング"
 
-#: src/gtkui/layout.cc:168
+#: src/gtkui/layout.cc:171
 msgid "Dock at Top"
 msgstr "上部にドッキング"
 
-#: src/gtkui/layout.cc:168
+#: src/gtkui/layout.cc:171
 msgid "Dock at Bottom"
 msgstr "下部にドッキング"
 
-#: src/gtkui/layout.cc:168
+#: src/gtkui/layout.cc:171
 msgid "Undock"
 msgstr "ドッキングを解く"
 
-#: src/gtkui/layout.cc:168 src/ladspa/plugin.cc:531
+#: src/gtkui/layout.cc:171 src/ladspa/plugin.cc:540
 msgid "Disable"
 msgstr "無効"
 
-#: src/gtkui/menus.cc:126 src/qtui/main_window_actions.cc:93
-#: src/statusicon/statusicon.cc:276
+#: src/gtkui/menus.cc:79 src/qtui/menus.cc:107
+#: src/statusicon-qt/statusicon.cc:115 src/statusicon/statusicon.cc:286
 msgid "_Open Files ..."
 msgstr "ファイルを開く(_O)"
 
-#: src/gtkui/menus.cc:127
+#: src/gtkui/menus.cc:80 src/qtui/menus.cc:111
 msgid "Open _URL ..."
 msgstr "URL を開く(_U)"
 
-#: src/gtkui/menus.cc:128 src/qtui/main_window_actions.cc:95
+#: src/gtkui/menus.cc:81 src/qtui/menus.cc:113
 msgid "_Add Files ..."
 msgstr "ファイルを追加(_A)"
 
-#: src/gtkui/menus.cc:129
+#: src/gtkui/menus.cc:82 src/qtui/menus.cc:118
 msgid "Add U_RL ..."
 msgstr "URL を追加(_R)"
 
-#: src/gtkui/menus.cc:131
+#: src/gtkui/menus.cc:84 src/qtui/menus.cc:120
 msgid "Search _Library"
-msgstr "ライブラリを検索(_L)"
+msgstr "ライブラリーを検索(_L)"
 
-#: src/gtkui/menus.cc:133 src/qtui/main_window_actions.cc:98
+#: src/gtkui/menus.cc:86 src/qtui/menus.cc:123
 msgid "A_bout ..."
 msgstr "プログラムの情報(_B)"
 
-#: src/gtkui/menus.cc:134 src/qtui/main_window_actions.cc:99
+#: src/gtkui/menus.cc:87 src/qtui/menus.cc:125
 msgid "_Settings ..."
 msgstr "設定(_S)"
 
-#: src/gtkui/menus.cc:135 src/qtui/main_window_actions.cc:103
-#: src/statusicon/statusicon.cc:284
+#: src/gtkui/menus.cc:88 src/qtui/menus.cc:131
+#: src/statusicon-qt/statusicon.cc:117 src/statusicon/statusicon.cc:288
 msgid "_Quit"
 msgstr "終了(_Q)"
 
-#: src/gtkui/menus.cc:139 src/gtkui/menus.cc:262
-#: src/qtui/main_window_actions.cc:107 src/search-tool/search-tool.cc:641
-#: src/statusicon/statusicon.cc:278
+#: src/gtkui/menus.cc:92 src/gtkui/menus.cc:226
+#: src/moonstone/playlist_tabs.cc:306 src/qtui/menus.cc:135
+#: src/qtui/playlist_tabs.cc:331 src/search-tool-qt/search-tool-qt.cc:499
+#: src/search-tool/search-tool.cc:339 src/statusicon-qt/statusicon.cc:109
+#: src/statusicon/statusicon.cc:280
 msgid "_Play"
 msgstr "再生(_P)"
 
-#: src/gtkui/menus.cc:140 src/qtui/main_window_actions.cc:108
-#: src/statusicon/statusicon.cc:279
+#: src/gtkui/menus.cc:93 src/qtui/menus.cc:137
+#: src/statusicon-qt/statusicon.cc:110 src/statusicon/statusicon.cc:281
 msgid "Paus_e"
 msgstr "一時停止(_E)"
 
-#: src/gtkui/menus.cc:141 src/qtui/main_window_actions.cc:109
-#: src/statusicon/statusicon.cc:280
+#: src/gtkui/menus.cc:94 src/qtui/menus.cc:139
+#: src/statusicon-qt/statusicon.cc:111 src/statusicon/statusicon.cc:282
 msgid "_Stop"
 msgstr "停止(_S)"
 
-#: src/gtkui/menus.cc:142 src/qtui/main_window_actions.cc:110
-#: src/statusicon/statusicon.cc:277
+#: src/gtkui/menus.cc:95 src/qtui/menus.cc:141
+#: src/statusicon-qt/statusicon.cc:112 src/statusicon/statusicon.cc:283
 msgid "Pre_vious"
 msgstr "前の曲へ(_V)"
 
-#: src/gtkui/menus.cc:143 src/qtui/main_window_actions.cc:111
-#: src/statusicon/statusicon.cc:281
+#: src/gtkui/menus.cc:96 src/qtui/menus.cc:143
+#: src/statusicon-qt/statusicon.cc:113 src/statusicon/statusicon.cc:284
 msgid "_Next"
-msgstr "次の曲へ(_N)"
+msgstr "次へ(_N)"
 
-#: src/gtkui/menus.cc:145 src/qtui/main_window_actions.cc:113
+#: src/gtkui/menus.cc:97 src/qtui/menus.cc:145 src/skins/menus.cc:114
+#: src/skins-qt/menus.cc:105
+msgid "Previous Album"
+msgstr "前のアルバム"
+
+#: src/gtkui/menus.cc:98 src/qtui/menus.cc:146 src/skins/menus.cc:115
+#: src/skins-qt/menus.cc:106
+msgid "Next Album"
+msgstr "次のアルバム"
+
+#: src/gtkui/menus.cc:100 src/qtui/menus.cc:148
 msgid "_Repeat"
 msgstr "リピート(_R)"
 
-#: src/gtkui/menus.cc:146 src/qtui/main_window_actions.cc:114
+#: src/gtkui/menus.cc:101 src/qtui/menus.cc:150
 msgid "S_huffle"
 msgstr "シャッフル(_H)"
 
-#: src/gtkui/menus.cc:147 src/qtui/main_window_actions.cc:115
+#: src/gtkui/menus.cc:102 src/qtui/menus.cc:152
+msgid "Shuffle by Albu_m"
+msgstr "アルバムごとにシャッフル (_M)"
+
+#: src/gtkui/menus.cc:103 src/qtui/menus.cc:155
 msgid "N_o Playlist Advance"
-msgstr "1曲リピート(_O)"
+msgstr "1 曲リピート(_O)"
 
-#: src/gtkui/menus.cc:148 src/qtui/main_window_actions.cc:116
+#: src/gtkui/menus.cc:104 src/qtui/menus.cc:157
 msgid "Stop A_fter This Song"
 msgstr "曲の再生後に停止(_A)"
 
-#: src/gtkui/menus.cc:150 src/gtkui/menus.cc:247
-#: src/qtui/main_window_actions.cc:118
+#: src/gtkui/menus.cc:106 src/gtkui/menus.cc:210 src/qtui/menus.cc:162
+#: src/qtui/menus.cc:294
 msgid "Song _Info ..."
 msgstr "曲の情報(_I)"
 
-#: src/gtkui/menus.cc:151
+#: src/gtkui/menus.cc:107
 msgid "Jump to _Time ..."
 msgstr "指定した時間にジャンプ(_T)"
 
-#: src/gtkui/menus.cc:152
+#: src/gtkui/menus.cc:108
 msgid "_Jump to Song ..."
 msgstr "指定した曲にジャンプ(_J)"
 
-#: src/gtkui/menus.cc:154
+#: src/gtkui/menus.cc:110 src/qtui/menus.cc:165
 msgid "Set Repeat Point _A"
 msgstr "リピートポイントAを設定(_A)"
 
-#: src/gtkui/menus.cc:155
+#: src/gtkui/menus.cc:111 src/qtui/menus.cc:167
 msgid "Set Repeat Point _B"
 msgstr "リピートポイントBを設定(_B)"
 
-#: src/gtkui/menus.cc:156
+#: src/gtkui/menus.cc:112 src/qtui/menus.cc:169
 msgid "_Clear Repeat Points"
-msgstr "リピートポイントを解除する(_C)"
+msgstr "リピートポイントを解除(_C)"
 
-#: src/gtkui/menus.cc:160 src/gtkui/menus.cc:167 src/gtkui/menus.cc:183
-#: src/qtui/main_window_actions.cc:122 src/qtui/main_window_actions.cc:129
-#: src/qtui/main_window_actions.cc:145
+#: src/gtkui/menus.cc:116 src/gtkui/menus.cc:123 src/gtkui/menus.cc:141
+#: src/qtui/menus.cc:173 src/qtui/menus.cc:180 src/qtui/menus.cc:198
 msgid "By _Title"
 msgstr "タイトル(_T)"
 
-#: src/gtkui/menus.cc:161 src/qtui/main_window_actions.cc:123
+#: src/gtkui/menus.cc:117 src/qtui/menus.cc:174
 msgid "By _File Name"
 msgstr "ファイル名(_F)"
 
-#: src/gtkui/menus.cc:162 src/qtui/main_window_actions.cc:124
+#: src/gtkui/menus.cc:118 src/qtui/menus.cc:175
 msgid "By File _Path"
 msgstr "パス(_P)"
 
-#: src/gtkui/menus.cc:166 src/gtkui/menus.cc:182
-#: src/qtui/main_window_actions.cc:128 src/qtui/main_window_actions.cc:144
+#: src/gtkui/menus.cc:122 src/gtkui/menus.cc:140 src/qtui/menus.cc:179
+#: src/qtui/menus.cc:197
 msgid "By Track _Number"
 msgstr "トラックナンバー(_N)"
 
-#: src/gtkui/menus.cc:168 src/gtkui/menus.cc:184
-#: src/qtui/main_window_actions.cc:130 src/qtui/main_window_actions.cc:146
+#: src/gtkui/menus.cc:124 src/gtkui/menus.cc:142 src/qtui/menus.cc:181
+#: src/qtui/menus.cc:199
 msgid "By _Artist"
 msgstr "アーティスト(_A)"
 
-#: src/gtkui/menus.cc:169 src/gtkui/menus.cc:185
-#: src/qtui/main_window_actions.cc:131 src/qtui/main_window_actions.cc:147
+#: src/gtkui/menus.cc:125 src/gtkui/menus.cc:143 src/qtui/menus.cc:182
+#: src/qtui/menus.cc:200
 msgid "By Al_bum"
 msgstr "アルバム(_L)"
 
-#: src/gtkui/menus.cc:170 src/gtkui/menus.cc:186
-#: src/qtui/main_window_actions.cc:132 src/qtui/main_window_actions.cc:148
+#: src/gtkui/menus.cc:126 src/gtkui/menus.cc:144 src/qtui/menus.cc:183
+#: src/qtui/menus.cc:201
 msgid "By Albu_m Artist"
 msgstr "アルバムアーティスト(_M)"
 
-#: src/gtkui/menus.cc:171 src/gtkui/menus.cc:187
-#: src/qtui/main_window_actions.cc:133 src/qtui/main_window_actions.cc:149
+#: src/gtkui/menus.cc:127 src/gtkui/menus.cc:145 src/qtui/menus.cc:184
+#: src/qtui/menus.cc:202
 msgid "By Release _Date"
 msgstr "リリース日(_D)"
 
-#: src/gtkui/menus.cc:172 src/gtkui/menus.cc:188
-#: src/qtui/main_window_actions.cc:134 src/qtui/main_window_actions.cc:150
+#: src/gtkui/menus.cc:128 src/gtkui/menus.cc:146 src/qtui/menus.cc:185
+#: src/qtui/menus.cc:203
 msgid "By _Genre"
 msgstr "ジャンル(_G)"
 
-#: src/gtkui/menus.cc:173 src/gtkui/menus.cc:189
-#: src/qtui/main_window_actions.cc:135 src/qtui/main_window_actions.cc:151
+#: src/gtkui/menus.cc:129 src/gtkui/menus.cc:147 src/qtui/menus.cc:186
+#: src/qtui/menus.cc:204
 msgid "By _Length"
 msgstr "曲の長さ(_L)"
 
-#: src/gtkui/menus.cc:174 src/gtkui/menus.cc:190
-#: src/qtui/main_window_actions.cc:136 src/qtui/main_window_actions.cc:152
+#: src/gtkui/menus.cc:130 src/gtkui/menus.cc:148 src/qtui/menus.cc:187
+#: src/qtui/menus.cc:205
 msgid "By _File Path"
 msgstr "ファイルパス(_F)"
 
-#: src/gtkui/menus.cc:175 src/gtkui/menus.cc:191
-#: src/qtui/main_window_actions.cc:137 src/qtui/main_window_actions.cc:153
+#: src/gtkui/menus.cc:131 src/gtkui/menus.cc:149 src/qtui/menus.cc:188
+#: src/qtui/menus.cc:206
 msgid "By _Custom Title"
 msgstr "カスタムタイトル(_C)"
 
-#: src/gtkui/menus.cc:177 src/gtkui/menus.cc:193
-#: src/qtui/main_window_actions.cc:139 src/qtui/main_window_actions.cc:155
+#: src/gtkui/menus.cc:132 src/gtkui/menus.cc:150 src/qtui/menus.cc:189
+#: src/qtui/menus.cc:207
+msgid "By C_omment"
+msgstr "コメント(_O)"
+
+#: src/gtkui/menus.cc:133 src/gtkui/menus.cc:151 src/qtui/menus.cc:190
+#: src/qtui/menus.cc:208
+msgid "By D_isc Number"
+msgstr ""
+
+#: src/gtkui/menus.cc:135 src/gtkui/menus.cc:153 src/qtui/menus.cc:192
+#: src/qtui/menus.cc:210
 msgid "R_everse Order"
 msgstr "逆順にする(_E)"
 
-#: src/gtkui/menus.cc:178 src/gtkui/menus.cc:194
-#: src/qtui/main_window_actions.cc:140 src/qtui/main_window_actions.cc:156
+#: src/gtkui/menus.cc:136 src/gtkui/menus.cc:154 src/qtui/menus.cc:194
+#: src/qtui/menus.cc:212
 msgid "_Random Order"
 msgstr "ランダムに並べる(_R)"
 
-#: src/gtkui/menus.cc:198 src/qtui/main_window_actions.cc:160
+#: src/gtkui/menus.cc:158 src/qtui/menus.cc:216
 msgid "_Play/Resume"
 msgstr "再生/再開(_P)"
 
-#: src/gtkui/menus.cc:199 src/gtkui/menus.cc:251
-#: src/qtui/main_window_actions.cc:161
+#: src/gtkui/menus.cc:159 src/qtui/menus.cc:218
 msgid "_Refresh"
 msgstr "再読み込み(_R)"
 
-#: src/gtkui/menus.cc:201 src/qtui/main_window_actions.cc:163
+#: src/gtkui/menus.cc:161 src/qtui/menus.cc:222
 msgid "_Sort"
 msgstr "ソート(_S)"
 
-#: src/gtkui/menus.cc:202 src/qtui/main_window_actions.cc:164
+#: src/gtkui/menus.cc:162 src/qtui/menus.cc:223
 msgid "Sort Se_lected"
-msgstr "選択したトラックをソートする(_L)"
+msgstr "選択したトラックをソート(_L)"
 
-#: src/gtkui/menus.cc:203 src/qtui/main_window_actions.cc:165
+#: src/gtkui/menus.cc:163 src/qtui/menus.cc:225
 msgid "Remove _Duplicates"
 msgstr "重複している曲を削除(_D)"
 
-#: src/gtkui/menus.cc:204 src/qtui/main_window_actions.cc:166
+#: src/gtkui/menus.cc:164 src/qtui/menus.cc:226
 msgid "Remove _Unavailable Files"
-msgstr "再生できないファイルを削除する(_U)"
+msgstr "再生できないファイルを削除(_U)"
 
-#: src/gtkui/menus.cc:206 src/playlist-manager/playlist-manager.cc:244
-#: src/qtui/main_window_actions.cc:168
+#: src/gtkui/menus.cc:166 src/playlist-manager/playlist-manager.cc:219
+#: src/playlist-manager-qt/playlist-manager-qt.cc:348 src/qtui/menus.cc:229
 msgid "_New"
 msgstr "新しいプレイリスト(_N)"
 
-#: src/gtkui/menus.cc:207
+#: src/gtkui/menus.cc:167 src/qtui/menus.cc:230
 msgid "Ren_ame ..."
 msgstr "名前の変更(_A)"
 
-#: src/gtkui/menus.cc:208 src/gtkui/menus.cc:264
-#: src/qtui/main_window_actions.cc:170
+#: src/gtkui/menus.cc:168 src/gtkui/menus.cc:228
+#: src/moonstone/playlist_tabs.cc:311 src/qtui/menus.cc:231
+#: src/qtui/playlist_tabs.cc:336
 msgid "Remo_ve"
 msgstr "削除(_V)"
 
-#: src/gtkui/menus.cc:210
+#: src/gtkui/menus.cc:170 src/qtui/menus.cc:233
 msgid "_Import ..."
 msgstr "インポート(_I)"
 
-#: src/gtkui/menus.cc:211
+#: src/gtkui/menus.cc:171 src/qtui/menus.cc:234
 msgid "_Export ..."
 msgstr "エクスポート(_E)"
 
-#: src/gtkui/menus.cc:213
+#: src/gtkui/menus.cc:173 src/qtui/menus.cc:237
 msgid "Playlist _Manager ..."
 msgstr "プレイリストマネージャー(_M)"
 
-#: src/gtkui/menus.cc:214 src/qtui/main_window_actions.cc:176
+#: src/gtkui/menus.cc:174 src/qtui/menus.cc:239
 msgid "_Queue Manager ..."
 msgstr "キューマネージャー(_Q)"
 
-#: src/gtkui/menus.cc:218 src/qtui/main_window_actions.cc:180
+#: src/gtkui/menus.cc:178 src/qtui/menus.cc:243
 msgid "Volume _Up"
 msgstr "音量を上げる(_U)"
 
-#: src/gtkui/menus.cc:219 src/qtui/main_window_actions.cc:181
+#: src/gtkui/menus.cc:179 src/qtui/menus.cc:245
 msgid "Volume _Down"
 msgstr "音量を下げる(_D)"
 
-#: src/gtkui/menus.cc:221 src/qtui/main_window_actions.cc:183
-msgid "_Equalizer"
-msgstr "イコライザー(_E)"
+#: src/gtkui/menus.cc:181 src/qtui/menus.cc:249
+msgid "_Equalizer ..."
+msgstr "イコライザー... (_E)"
 
-#: src/gtkui/menus.cc:223 src/qtui/main_window_actions.cc:185
+#: src/gtkui/menus.cc:182 src/qtui/menus.cc:251
 msgid "E_ffects ..."
 msgstr "エフェクト(_E)"
 
-#: src/gtkui/menus.cc:227
+#: src/gtkui/menus.cc:184
+msgid "_Record Stream"
+msgstr "ストリームの録音 (_R)"
+
+#: src/gtkui/menus.cc:185
+msgid "Audio _Settings ..."
+msgstr "オーディオの設定... (_S)"
+
+#: src/gtkui/menus.cc:189 src/qtui/menus.cc:260
 msgid "Show _Menu Bar"
-msgstr "メニューバーを表示する(_M)"
+msgstr "メニューバーを表示(_M)"
 
-#: src/gtkui/menus.cc:228
+#: src/gtkui/menus.cc:190 src/qtui/menus.cc:262
 msgid "Show I_nfo Bar"
-msgstr "情報バーを表示する(_N)"
+msgstr "情報バーを表示(_N)"
+
+#: src/gtkui/menus.cc:191 src/qtui/menus.cc:264
+msgid "Show Info Bar _Album Art"
+msgstr ""
 
-#: src/gtkui/menus.cc:229
+#: src/gtkui/menus.cc:192 src/qtui/menus.cc:266
 msgid "Show Info Bar Vis_ualization"
 msgstr "情報バーに視覚効果を表示(_U)"
 
-#: src/gtkui/menus.cc:230
+#: src/gtkui/menus.cc:193 src/qtui/menus.cc:268
 msgid "Show _Status Bar"
-msgstr "ステータスバーを表示する(_S)"
+msgstr "ステータスバーを表示(_S)"
 
-#: src/gtkui/menus.cc:232
+#: src/gtkui/menus.cc:195 src/qtui/menus.cc:272
 msgid "Show _Remaining Time"
-msgstr "残り時間を表示する(_R)"
+msgstr "残り時間を表示(_R)"
 
-#: src/gtkui/menus.cc:234
+#: src/gtkui/menus.cc:197 src/qtui/menus.cc:276 src/skins/menus.cc:157
+#: src/skins-qt/menus.cc:152
 msgid "_Visualizations ..."
 msgstr "視覚化(_V)"
 
-#: src/gtkui/menus.cc:238 src/qtui/main_window_actions.cc:189
+#: src/gtkui/menus.cc:201 src/qtui/menus.cc:280
 msgid "_File"
 msgstr "ファイル(_F)"
 
-#: src/gtkui/menus.cc:239 src/qtui/main_window_actions.cc:190
+#: src/gtkui/menus.cc:202 src/qtui/menus.cc:281
 msgid "_Playback"
 msgstr "再生(_P)"
 
-#: src/gtkui/menus.cc:240 src/qtui/main_window_actions.cc:191
+#: src/gtkui/menus.cc:203 src/qtui/menus.cc:282
 msgid "P_laylist"
 msgstr "プレイリスト(_L)"
 
-#: src/gtkui/menus.cc:241 src/gtkui/menus.cc:258
-#: src/qtui/main_window_actions.cc:192
+#: src/gtkui/menus.cc:204 src/gtkui/menus.cc:222 src/qtui/menus.cc:283
+#: src/qtui/menus.cc:312
 msgid "_Services"
 msgstr "サービス(_S)"
 
-#: src/gtkui/menus.cc:242 src/qtui/main_window_actions.cc:193
+#: src/gtkui/menus.cc:205 src/qtui/menus.cc:284
 msgid "_Output"
 msgstr "出力(_O)"
 
-#: src/gtkui/menus.cc:243
+#: src/gtkui/menus.cc:206 src/qtui/menus.cc:285
 msgid "_View"
 msgstr "表示(_V)"
 
-#: src/gtkui/menus.cc:248
+#: src/gtkui/menus.cc:211 src/qtui/menus.cc:296
 msgid "_Queue/Unqueue"
 msgstr "キュー/アンキュー (_Q)"
 
-#: src/gtkui/menus.cc:250
+#: src/gtkui/menus.cc:213 src/qtui/menus.cc:299
 msgid "_Open Containing Folder"
-msgstr "このファイルを含むフォルダを追加(_O)"
+msgstr "保存先フォルダーを開く(_O)"
+
+#: src/gtkui/menus.cc:214 src/qtui/menus.cc:301
+msgid "_Refresh Selected"
+msgstr "選択された項目を再読み込み(_R)"
 
-#: src/gtkui/menus.cc:253
+#: src/gtkui/menus.cc:216 src/qtui/menus.cc:304
 msgid "Cu_t"
 msgstr "切り取り(_T)"
 
-#: src/gtkui/menus.cc:254
+#: src/gtkui/menus.cc:217 src/qtui/menus.cc:305
 msgid "_Copy"
 msgstr "コピー(_C)"
 
-#: src/gtkui/menus.cc:255
+#: src/gtkui/menus.cc:218 src/qtui/menus.cc:306
 msgid "_Paste"
 msgstr "貼り付け(_P)"
 
-#: src/gtkui/menus.cc:256
+#: src/gtkui/menus.cc:219 src/qtui/menus.cc:307
+msgid "Paste at _End"
+msgstr "末尾に貼り付け(_E)"
+
+#: src/gtkui/menus.cc:220 src/qtui/menus.cc:309
 msgid "Select _All"
 msgstr "すべて選択(_A)"
 
-#: src/gtkui/menus.cc:263
+#: src/gtkui/menus.cc:227 src/moonstone/playlist_tabs.cc:309
+#: src/qtui/playlist_tabs.cc:334
 msgid "_Rename ..."
 msgstr "名前の変更(_R)"
 
-#: src/gtkui/settings.cc:35
+#: src/gtkui/settings.cc:35 src/qtui/settings.cc:59
+msgid "Always"
+msgstr ""
+
+#: src/gtkui/settings.cc:36 src/qtui/settings.cc:60
+msgid "Auto-hide"
+msgstr ""
+
+#: src/gtkui/settings.cc:37 src/qtui/settings.cc:61
+msgid "Never"
+msgstr ""
+
+#: src/gtkui/settings.cc:41 src/qtui/settings.cc:64
 msgid "Playlist Tabs"
 msgstr "プレイリストタブ"
 
-#: src/gtkui/settings.cc:36
-msgid "Always show tabs"
-msgstr "常にタブを表示する"
+#: src/gtkui/settings.cc:42 src/qtui/settings.cc:65
+msgid "Show playlist tabs:"
+msgstr ""
 
-#: src/gtkui/settings.cc:38
+#: src/gtkui/settings.cc:45 src/qtui/settings.cc:69
 msgid "Show entry counts"
 msgstr "項目の総数を表示する"
 
-#: src/gtkui/settings.cc:40
+#: src/gtkui/settings.cc:47 src/qtui/settings.cc:72
 msgid "Show close buttons"
 msgstr "閉じるボタンを表示する"
 
-#: src/gtkui/settings.cc:42
+#: src/gtkui/settings.cc:49 src/qtui/settings.cc:75
 msgid "Playlist Columns"
 msgstr "プレイリスト列"
 
-#: src/gtkui/settings.cc:44
+#: src/gtkui/settings.cc:51 src/qtui/settings.cc:77
 msgid "Show column headers"
 msgstr "列のヘッダーを表示する"
 
-#: src/gtkui/settings.cc:46 src/modplug/plugin_main.cc:106
-#: src/skins/skins_cfg.cc:263
-msgid "Miscellaneous"
-msgstr "その他"
+#: src/gtkui/settings.cc:53 src/qtui/settings.cc:82
+msgid "Make column headers clickable for sorting"
+msgstr ""
 
-#: src/gtkui/settings.cc:47
-msgid "Arrow keys seek by:"
-msgstr "矢印キーでシークする時間:"
+#: src/gtkui/settings.cc:56
+msgid "Use symbolic icons in toolbar"
+msgstr ""
 
-#: src/gtkui/settings.cc:50
+#: src/gtkui/settings.cc:58 src/qtui/settings.cc:86
 msgid "Scroll on song change"
 msgstr "曲が変わったらスクロールする"
 
-#: src/gtkui/ui_gtk.cc:71
+#: src/gtkui/ui_gtk.cc:82
 msgid "GTK Interface"
 msgstr "GTK インターフェイス"
 
-#: src/gtkui/ui_gtk.cc:222 src/skins/ui_main.cc:232
+#: src/gtkui/ui_gtk.cc:219 src/skins/main.cc:228 src/skins-qt/main.cc:231
 #, c-format
 msgid "%s - Audacious"
 msgstr "%s - Audacious"
 
-#: src/gtkui/ui_gtk.cc:225 src/qtui/main_window.cc:186
+#: src/gtkui/ui_gtk.cc:221 src/moonstone/main_window.cc:184
+#: src/qtui/main_window.cc:385
 msgid "Buffering ..."
 msgstr "バッファ中 ..."
 
-#: src/gtkui/ui_gtk.cc:228 src/skins/ui_main.cc:234 src/skins/ui_main.cc:1164
+#: src/gtkui/ui_gtk.cc:224 src/pipewire/pipewire.cc:402 src/skins/main.cc:230
+#: src/skins-qt/main.cc:233
 msgid "Audacious"
 msgstr "Audacious"
 
-#: src/gtkui/ui_statusbar.cc:63 src/qtui/status_bar.cc:67
+#: src/gtkui/ui_gtk.cc:487 src/gtkui/ui_gtk.cc:518 src/gtkui/ui_gtk.cc:882
+#: src/hotkey/gui.cc:72 src/moonstone/main_window.cc:67
+#: src/moonstone/main_window.cc:145 src/moonstone/main_window.cc:146
+#: src/notify/osd.cc:85 src/qthotkey/gui.cc:67 src/qtui/main_window.cc:154
+#: src/qtui/main_window.cc:347 src/qtui/main_window.cc:348
+#: src/skins/menus.cc:109 src/skins-qt/menus.cc:100
+msgid "Play"
+msgstr "再生"
+
+#: src/gtkui/ui_gtk.cc:487 src/moonstone/main_window.cc:151
+#: src/moonstone/main_window.cc:152 src/notify/osd.cc:82
+#: src/qtui/main_window.cc:353 src/qtui/main_window.cc:354
+#: src/skins/menus.cc:110 src/skins-qt/menus.cc:101
+msgid "Pause"
+msgstr "一時停止"
+
+#: src/gtkui/ui_gtk.cc:868 src/moonstone/main_window.cc:57
+#: src/qtui/main_window.cc:145 src/skins/menus.cc:86 src/skins-qt/menus.cc:77
+msgid "Search Library"
+msgstr "ライブラリーを検索"
+
+#: src/gtkui/ui_gtk.cc:875 src/moonstone/main_window.cc:60
+#: src/qtui/main_window.cc:147
+msgid "Open Files"
+msgstr "ファイルを開く"
+
+#: src/gtkui/ui_gtk.cc:876 src/moonstone/main_window.cc:62
+#: src/qtui/main_window.cc:149
+msgid "Add Files"
+msgstr "ファイルを追加"
+
+#: src/gtkui/ui_gtk.cc:881 src/moonstone/main_window.cc:65
+#: src/qtui/main_window.cc:152 src/skins/menus.cc:112 src/skins-qt/menus.cc:103
+msgid "Previous"
+msgstr "前へ"
+
+#: src/gtkui/ui_gtk.cc:883 src/hotkey/gui.cc:74 src/moonstone/main_window.cc:69
+#: src/qthotkey/gui.cc:69 src/qtui/main_window.cc:156 src/skins/menus.cc:111
+#: src/skins-qt/menus.cc:102
+msgid "Stop"
+msgstr "停止"
+
+#: src/gtkui/ui_gtk.cc:884 src/moonstone/main_window.cc:76 src/notify/osd.cc:89
+#: src/qtui/main_window.cc:163 src/skins/menus.cc:113 src/skins-qt/menus.cc:104
+msgid "Next"
+msgstr "次へ"
+
+#: src/gtkui/ui_gtk.cc:886 src/moonstone/main_window.cc:79
+#: src/qtui/main_window.cc:166 src/qtui/menus.cc:254 src/skins/menus.cc:79
+#: src/skins-qt/menus.cc:69
+msgid "Record Stream"
+msgstr "ストリームの録音"
+
+#: src/gtkui/ui_gtk.cc:919 src/moonstone/main_window.cc:86
+#: src/qtui/main_window.cc:173 src/skins/menus.cc:103 src/skins-qt/menus.cc:94
+msgid "Repeat"
+msgstr "リピート"
+
+#: src/gtkui/ui_gtk.cc:922 src/moonstone/main_window.cc:89
+#: src/qtui/main_window.cc:176 src/skins/menus.cc:104 src/skins-qt/menus.cc:95
+msgid "Shuffle"
+msgstr "シャッフル"
+
+#: src/gtkui/ui_gtk.cc:1114 src/qtui/main_window.cc:123
+msgid "Menu"
+msgstr ""
+
+#: src/gtkui/ui_statusbar.cc:64 src/qtui/status_bar.cc:155
 msgid "mono"
 msgstr "モノラル"
 
-#: src/gtkui/ui_statusbar.cc:65 src/qtui/status_bar.cc:69
+#: src/gtkui/ui_statusbar.cc:66 src/qtui/status_bar.cc:157
 msgid "stereo"
 msgstr "ステレオ"
 
-#: src/gtkui/ui_statusbar.cc:67 src/qtui/status_bar.cc:71
+#: src/gtkui/ui_statusbar.cc:68 src/qtui/status_bar.cc:160
 #, c-format
 msgid "%d channel"
 msgid_plural "%d channels"
 msgstr0 "%d チャンネル"
 
-#: src/gtkui/ui_statusbar.cc:81 src/qtui/status_bar.cc:85
+#: src/gtkui/ui_statusbar.cc:76 src/qtui/status_bar.cc:168
 #, c-format
-msgid "%d kbps"
-msgstr "%d kbps"
+msgid "%d kHz"
+msgstr "%d kHz"
 
-#: src/gtkui/ui_statusbar.cc:107 src/skins/ui_main_evlisteners.cc:103
+#: src/gtkui/ui_statusbar.cc:82 src/qtui/status_bar.cc:174
+#, c-format
+msgid "%d kbit/s"
+msgstr ""
+
+#: src/gtkui/ui_statusbar.cc:108 src/skins/main.cc:478 src/skins-qt/main.cc:461
 msgid "Single mode."
 msgstr "シングルモード"
 
-#: src/gtkui/ui_statusbar.cc:109 src/skins/ui_main_evlisteners.cc:105
+#: src/gtkui/ui_statusbar.cc:110 src/skins/main.cc:480 src/skins-qt/main.cc:463
 msgid "Playlist mode."
 msgstr "プレイリストモード"
 
-#: src/gtkui/ui_statusbar.cc:117 src/skins/ui_main_evlisteners.cc:111
+#: src/gtkui/ui_statusbar.cc:118 src/skins/main.cc:486 src/skins-qt/main.cc:469
 msgid "Stopping after song."
 msgstr "曲の再生後に停止する"
 
-#: src/hotkey/gui.cc:71
+#: src/hotkey/gui.cc:71 src/qthotkey/gui.cc:66
 msgid "Previous track"
 msgstr "前のトラック"
 
-#: src/hotkey/gui.cc:72 src/notify/osd.cc:69 src/qtui/main_window.cc:69
-#: src/qtui/main_window.cc:172 src/qtui/main_window.cc:173
-#: src/skins/menus.cc:87
-msgid "Play"
-msgstr "再生"
-
-#: src/hotkey/gui.cc:73
+#: src/hotkey/gui.cc:73 src/qthotkey/gui.cc:68
 msgid "Pause/Resume"
 msgstr "一時停止/再開"
 
-#: src/hotkey/gui.cc:74 src/qtui/main_window.cc:70 src/skins/menus.cc:89
-msgid "Stop"
-msgstr "停止"
-
-#: src/hotkey/gui.cc:75
+#: src/hotkey/gui.cc:75 src/qthotkey/gui.cc:70
 msgid "Next track"
 msgstr "次のトラック"
 
-#: src/hotkey/gui.cc:76
-msgid "Forward 5 seconds"
-msgstr "5秒進める"
-
-#: src/hotkey/gui.cc:77
-msgid "Rewind 5 seconds"
-msgstr "5秒戻す"
+#: src/hotkey/gui.cc:76 src/qthotkey/gui.cc:71
+msgid "Step forward"
+msgstr ""
+
+#: src/hotkey/gui.cc:77 src/qthotkey/gui.cc:72
+msgid "Step backward"
+msgstr ""
 
-#: src/hotkey/gui.cc:78
+#: src/hotkey/gui.cc:78 src/qthotkey/gui.cc:73
 msgid "Mute"
 msgstr "ミュート"
 
-#: src/hotkey/gui.cc:79
+#: src/hotkey/gui.cc:79 src/qthotkey/gui.cc:74
 msgid "Volume up"
 msgstr "音量を上げる"
 
-#: src/hotkey/gui.cc:80
+#: src/hotkey/gui.cc:80 src/qthotkey/gui.cc:75
 msgid "Volume down"
 msgstr "音量を下げる"
 
-#: src/hotkey/gui.cc:81
+#: src/hotkey/gui.cc:81 src/qthotkey/gui.cc:76
 msgid "Jump to file"
 msgstr "指定したファイルへ移動"
 
-#: src/hotkey/gui.cc:82
+#: src/hotkey/gui.cc:82 src/qthotkey/gui.cc:77
 msgid "Toggle player window(s)"
 msgstr "プレイヤーウィンドウをトグル"
 
-#: src/hotkey/gui.cc:83
+#: src/hotkey/gui.cc:83 src/qthotkey/gui.cc:78
 msgid "Show On-Screen-Display"
 msgstr "On-Screen-Display を表示する"
 
-#: src/hotkey/gui.cc:84
+#: src/hotkey/gui.cc:84 src/qthotkey/gui.cc:79
 msgid "Toggle repeat"
 msgstr "リピートをトグル"
 
-#: src/hotkey/gui.cc:85
+#: src/hotkey/gui.cc:85 src/qthotkey/gui.cc:80
 msgid "Toggle shuffle"
 msgstr "シャッフルをトグル"
 
-#: src/hotkey/gui.cc:86
+#: src/hotkey/gui.cc:86 src/qthotkey/gui.cc:81
 msgid "Toggle stop after current"
 msgstr "現在の曲の再生後に停止する"
 
-#: src/hotkey/gui.cc:87
+#: src/hotkey/gui.cc:87 src/qthotkey/gui.cc:82
 msgid "Raise player window(s)"
 msgstr "プレイヤウィンドウを表示する"
 
-#: src/hotkey/gui.cc:97
+#: src/hotkey/gui.cc:98 src/qthotkey/gui.cc:100
 msgid "(none)"
 msgstr "(なし)"
 
-#: src/hotkey/gui.cc:234
+#: src/hotkey/gui.cc:261
 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 modifiers.\n"
 "\n"
 "Do you want to continue?"
 msgstr ""
@@ -2168,11 +2234,11 @@
 "\n"
 "本当によろしいですか？"
 
-#: src/hotkey/gui.cc:236
+#: src/hotkey/gui.cc:264
 msgid "Binding mouse buttons"
 msgstr "マウスボタンの割り当て"
 
-#: src/hotkey/gui.cc:391
+#: src/hotkey/gui.cc:434
 msgid ""
 "Press a key combination inside a text field.\n"
 "You can also bind mouse buttons."
@@ -2180,102 +2246,119 @@
 "テキストフィールド内でキーコンビネーションを押してください。\n"
 "マウスボタンを組み合わせることもできます。"
 
-#: src/hotkey/gui.cc:396
+#: src/hotkey/gui.cc:444 src/qthotkey/gui.cc:179
 msgid "Hotkeys:"
 msgstr "ホットキー:"
 
-#: src/hotkey/gui.cc:413
+#: src/hotkey/gui.cc:457 src/qthotkey/gui.cc:181
 msgid "Action:"
 msgstr "動作:"
 
-#: src/hotkey/gui.cc:420
+#: src/hotkey/gui.cc:461 src/qthotkey/gui.cc:182
 msgid "Key Binding:"
 msgstr "キーバインド:"
 
-#: src/hotkey/gui.cc:468
+#: src/hotkey/gui.cc:518 src/qthotkey/gui.cc:184
 msgid "_Add"
 msgstr "追加 (_A)"
 
-#: src/hotkey/plugin.cc:61
+#: src/hotkey/plugin.cc:59 src/qthotkey/plugin.cc:78
 msgid "Global Hotkeys"
 msgstr "グローバルホットキー"
 
-#: src/hotkey/plugin.cc:79
+#: src/hotkey/plugin.cc:74
 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"
+"Contributors 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"
-"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/jack-ng/jack-ng.cc:49
+#: src/jack/jack-ng.cc:54
 msgid "JACK Output"
 msgstr "JACK 出力"
 
-#: src/jack-ng/jack-ng.cc:114
+#: src/jack/jack-ng.cc:126
+msgid "Client name:"
+msgstr ""
+
+#: src/jack/jack-ng.cc:128
 msgid "Automatically connect to output ports"
 msgstr "出力ポートに自動接続する"
 
-#: src/jack-ng/jack-ng.cc:155
+#: src/jack/jack-ng.cc:130
+msgid "Filter ports (regex, use any port if blank):"
+msgstr ""
+
+#: src/jack/jack-ng.cc:136
+msgid "Connect to physical ports only"
+msgstr ""
+
+#: src/jack/jack-ng.cc:139
+msgid "Upmix to"
+msgstr ""
+
+#: src/jack/jack-ng.cc:141
+msgid "ports if input has fewer channels"
+msgstr ""
+
+#: src/jack/jack-ng.cc:143
+msgid "Ignore insufficient number of ports"
+msgstr ""
+
+#: src/jack/jack-ng.cc:181
+msgid "No JACK output ports were found. Please check settings."
+msgstr ""
+
+#: src/jack/jack-ng.cc:195
 #, c-format
 msgid "Only %d JACK output ports were found but %d are required."
-msgstr "%d 個の JACK 出力ポートが見つかりましたが、 %d 個が必要です。"
+msgstr "%d 個の JACK 出力ポートが見つかりましたが、 %d 個必要です。"
 
-#: src/jack-ng/jack-ng.cc:164
+#: src/jack/jack-ng.cc:210
 #, c-format
 msgid "Failed to connect to JACK port %s."
 msgstr "JACK ポート %s への接続に失敗"
 
-#: src/jack-ng/jack-ng.cc:184
+#: src/jack/jack-ng.cc:230
 msgid ""
 "JACK supports only floating-point audio. You must change the output bit "
 "depth to floating-point in Audacious settings."
 msgstr ""
-"JACK は浮動小数点のオーディオにしか対応していません。Audacious のオーディオ出"
-"力の設定で、ビット深度を浮動小数点に変更する必要があります。"
+"JACK は浮動小数点のオーディオにのみ対応しています。Audacious のオーディオ出力"
+"の設定で、ビット深度を浮動小数点に変更する必要があります。"
 
-#: src/jack-ng/jack-ng.cc:197
+#: src/jack/jack-ng.cc:245
 msgid "Failed to connect to the JACK server; is it running?"
 msgstr "JACK サーバへの接続に失敗しました。JACK サーバは本当に動いていますか?"
 
-#: src/jack-ng/jack-ng.cc:273
+#: src/jack/jack-ng.cc:321
 #, c-format
 msgid ""
 "The JACK server requires a sample rate of %d Hz, but Audacious is playing at "
 "%d Hz. Please use the Sample Rate Converter effect to correct the mismatch."
 msgstr ""
-"JACK サーバには%d Hzのサンプリング周波数が必要ですが、 Audacious は %d Hz で"
+"JACK サーバには %d Hzのサンプリング周波数が必要ですが、 Audacious は %d Hz で"
 "再生しています。サンプリング周波数コンバーターを用いて周波数を合わせてくださ"
 "い。"
 
-#: src/ladspa/plugin.cc:414
+#: src/ladspa/plugin.cc:416
 #, c-format
 msgid "%s Settings"
 msgstr "%s の設定"
 
-#: src/ladspa/plugin.cc:478
+#: src/ladspa/plugin.cc:482
 msgid "Module paths:"
 msgstr "モジュールのパス:"
 
-#: src/ladspa/plugin.cc:483
+#: src/ladspa/plugin.cc:487
 msgid ""
 "Separate multiple paths with a colon.\n"
 "These paths are searched in addition to LADSPA_PATH.\n"
@@ -2286,25 +2369,25 @@
 "パスを追加した後は、新しいプラグインをスキャンするためにEnter キーを押してく"
 "ださい。"
 
-#: src/ladspa/plugin.cc:499
+#: src/ladspa/plugin.cc:508
 msgid "Available plugins:"
 msgstr "利用可能なプラグイン:"
 
-#: src/ladspa/plugin.cc:512 src/modplug/plugin_main.cc:92
-#: src/modplug/plugin_main.cc:95 src/modplug/plugin_main.cc:98
-#: src/modplug/plugin_main.cc:101
+#: src/ladspa/plugin.cc:521 src/modplug/plugin_main.cc:91
+#: src/modplug/plugin_main.cc:94 src/modplug/plugin_main.cc:97
+#: src/modplug/plugin_main.cc:100
 msgid "Enable"
 msgstr "有効"
 
-#: src/ladspa/plugin.cc:518
+#: src/ladspa/plugin.cc:527
 msgid "Enabled plugins:"
 msgstr "有効なプラグイン:"
 
-#: src/ladspa/plugin.cc:534
+#: src/ladspa/plugin.cc:543
 msgid "Settings"
 msgstr "設定:"
 
-#: src/ladspa/plugin.cc:551
+#: src/ladspa/plugin.cc:560
 msgid ""
 "LADSPA Host for Audacious\n"
 "Copyright 2011 John Lindgren"
@@ -2320,7 +2403,7 @@
 msgid "LIRC Plugin"
 msgstr "LIRC プラグイン"
 
-#: src/lirc/lirc.cc:381
+#: src/lirc/lirc.cc:379
 msgid ""
 "A simple plugin to control Audacious using the LIRC remote control daemon\n"
 "\n"
@@ -2348,63 +2431,123 @@
 "\n"
 "LIRC についての詳細は http://lirc.org を参照"
 
-#: src/lirc/lirc.cc:392
+#: src/lirc/lirc.cc:390
 msgid "Connection"
 msgstr "接続"
 
-#: src/lirc/lirc.cc:393
+#: src/lirc/lirc.cc:391
 msgid "Reconnect to LIRC server"
 msgstr "LIRC サーバーへ再接続する"
 
-#: src/lirc/lirc.cc:395
+#: src/lirc/lirc.cc:393
 msgid "Wait before reconnecting:"
 msgstr "再接続の待機時間:"
 
-#: src/lyricwiki/lyricwiki.cc:41
-msgid "LyricWiki Plugin"
-msgstr "LyricWiki プラグイン"
-
-#: src/lyricwiki/lyricwiki.cc:131 src/lyricwiki-qt/lyricwiki.cc:136
-msgid "No lyrics available"
-msgstr "歌詞が見つかりません"
-
-#: src/lyricwiki/lyricwiki.cc:217 src/lyricwiki/lyricwiki.cc:226
-#: src/lyricwiki/lyricwiki.cc:243 src/lyricwiki/lyricwiki.cc:252
-#: src/lyricwiki/lyricwiki.cc:267 src/lyricwiki-qt/lyricwiki.cc:222
-#: src/lyricwiki-qt/lyricwiki.cc:231 src/lyricwiki-qt/lyricwiki.cc:248
-#: src/lyricwiki-qt/lyricwiki.cc:257 src/lyricwiki-qt/lyricwiki.cc:272
-msgid "Error"
-msgstr "エラー"
-
-#: src/lyricwiki/lyricwiki.cc:218 src/lyricwiki/lyricwiki.cc:244
-#: src/lyricwiki-qt/lyricwiki.cc:223 src/lyricwiki-qt/lyricwiki.cc:249
+#: src/lyrics-common/chart_lyrics_provider.cc:93
+#: src/lyrics-common/chart_lyrics_provider.cc:150
+#: src/lyrics-common/lyrics_ovh_provider.cc:50
 #, c-format
 msgid "Unable to fetch %s"
 msgstr "%s が取得できません"
 
-#: src/lyricwiki/lyricwiki.cc:227 src/lyricwiki/lyricwiki.cc:253
-#: src/lyricwiki-qt/lyricwiki.cc:232 src/lyricwiki-qt/lyricwiki.cc:258
+#: src/lyrics-common/chart_lyrics_provider.cc:100
+#: src/lyrics-common/chart_lyrics_provider.cc:157
+#: src/lyrics-common/lyrics_ovh_provider.cc:57
 #, c-format
 msgid "Unable to parse %s"
 msgstr "%s が解析できません"
 
-#: src/lyricwiki/lyricwiki.cc:259 src/lyricwiki-qt/lyricwiki.cc:264
+#: src/lyrics-common/chart_lyrics_provider.cc:121
+#: src/lyrics-common/chart_lyrics_provider.cc:194
+#: src/lyrics-common/lyrics_ovh_provider.cc:88
 msgid "Looking for lyrics ..."
 msgstr "歌詞を検索しています ..."
 
-#: src/lyricwiki/lyricwiki.cc:267 src/lyricwiki-qt/lyricwiki.cc:272
-msgid "Missing song metadata"
-msgstr "曲のメタデータが見つかりません"
-
-#: src/lyricwiki/lyricwiki.cc:278 src/lyricwiki-qt/lyricwiki.cc:283
-msgid "Connecting to lyrics.wikia.com ..."
-msgstr "lyrics.wikia.com に接続しています ..."
-
-#: src/lyricwiki-qt/lyricwiki.cc:55
-msgid "LyricWiki Plugin (Qt)"
-msgstr "LyricWiki プラグイン (Qt)"
+#: src/lyrics-common/preferences.h:43
+msgid "Nowhere"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:49
+msgid "Artist is truncated at the start, Title -- at the end"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:50
+msgid "Chars to truncate on:"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:54
+msgid "Chars are ORed in RegExp, surrounded by whitespace"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:55
+msgid "Chars to split on:"
+msgstr ""
 
-#: src/m3u/m3u.cc:32
+#: src/lyrics-common/preferences.h:56
+msgid "Further truncate those on chars"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:62
+msgid "General"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:63
+msgid "Split title into artist and title on chars"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:66
+msgid "Sources"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:67
+msgid "Use embedded lyrics (from Lyrics tag)"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:69
+msgid "Fetch lyrics from internet:"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:72
+msgid "Store fetched lyrics in local cache"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:74
+msgid "Local Storage"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:75
+msgid "Load lyric files (.lrc) from local storage"
+msgstr ""
+
+#: src/lyrics-common/utils.cc:54 src/ui-common/dialogs-qt.cc:63
+msgid "Error"
+msgstr "エラー"
+
+#: src/lyrics-common/utils.cc:60
+msgid "Lyrics could not be found."
+msgstr ""
+
+#: src/lyrics-common/utils.cc:142
+msgid "Missing title and/or artist."
+msgstr ""
+
+#: src/lyrics-gtk/lyrics-gtk.cc:37 src/lyrics-qt/lyrics-qt.cc:50
+msgid "Lyrics"
+msgstr ""
+
+#: src/lyrics-gtk/lyrics-gtk.cc:189 src/lyrics-qt/lyrics-qt.cc:171
+msgid "Edit Lyrics ..."
+msgstr ""
+
+#: src/lyrics-gtk/lyrics-gtk.cc:195 src/lyrics-qt/lyrics-qt.cc:178
+msgid "Save Locally"
+msgstr ""
+
+#: src/lyrics-gtk/lyrics-gtk.cc:201 src/lyrics-qt/lyrics-qt.cc:186
+msgid "Refresh"
+msgstr ""
+
+#: src/m3u/m3u.cc:33
 msgid "M3U Playlists"
 msgstr "M3U プラグイン"
 
@@ -2412,17 +2555,17 @@
 msgid "Tact Generator"
 msgstr "タクトジェネレーター"
 
-#: src/metronom/metronom.cc:147
+#: src/metronom/metronom.cc:145
 #, c-format
 msgid "Tact generator: %d bpm"
 msgstr "タクトジェネレーター: %d bpm"
 
-#: src/metronom/metronom.cc:149
+#: src/metronom/metronom.cc:147
 #, c-format
 msgid "Tact generator: %d bpm %d/%d"
 msgstr "タクトジェネレーター: %d bpm %d/%d"
 
-#: src/metronom/metronom.cc:237
+#: src/metronom/metronom.cc:235
 msgid ""
 "A Tact Generator by Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
 "\n"
@@ -2441,11 +2584,11 @@
 "tact://77 (77bpmのビートを作る)\n"
 "tact://60*3/4 (3/4 拍子で 60 bpmのビートを作る)"
 
-#: src/mixer/mixer.cc:38
+#: src/mixer/mixer.cc:43
 msgid "Channel Mixer"
 msgstr "チャンネルミキサー"
 
-#: src/mixer/mixer.cc:202
+#: src/mixer/mixer.cc:255
 msgid ""
 "Channel Mixer Plugin for Audacious\n"
 "Copyright 2011-2012 John Lindgren and Michał Lipski"
@@ -2453,11 +2596,11 @@
 "チャンネルミキサープラグイン for Audacious\n"
 "Copyright 2011-2012 John Lindgren and Michał Lipski"
 
-#: src/mixer/mixer.cc:206
+#: src/mixer/mixer.cc:259
 msgid "Channel Mixer"
 msgstr "チャンネルミキサー"
 
-#: src/mixer/mixer.cc:207
+#: src/mixer/mixer.cc:260
 msgid "Output channels:"
 msgstr "出力チャンネル:"
 
@@ -2469,168 +2612,176 @@
 msgid "Error connecting to MMS server"
 msgstr "MMS サーバーへの接続エラー"
 
-#: src/modplug/modplugbmp.h:53
+#: src/modplug/modplugbmp.h:57
 msgid "ModPlug (Module Player)"
 msgstr "ModPlug (Module Player)"
 
-#: src/modplug/plugin_main.cc:53
-msgid "Resolution"
-msgstr "解像度"
-
-#: src/modplug/plugin_main.cc:54
-msgid "8-bit"
-msgstr "8-bit"
-
 #: src/modplug/plugin_main.cc:55
-msgid "16-bit"
-msgstr "16-bit"
-
-#: src/modplug/plugin_main.cc:56
 msgid "Channels"
 msgstr "チャンネル"
 
-#: src/modplug/plugin_main.cc:60
+#: src/modplug/plugin_main.cc:59
 msgid "Nearest (fastest)"
 msgstr "近傍 (最高速)"
 
-#: src/modplug/plugin_main.cc:61
+#: src/modplug/plugin_main.cc:60
 msgid "Linear (fast)"
 msgstr "リニア (高速)"
 
-#: src/modplug/plugin_main.cc:62
+#: src/modplug/plugin_main.cc:61
 msgid "Spline (good)"
 msgstr "スプライン曲線 (高品質)"
 
-#: src/modplug/plugin_main.cc:63
+#: src/modplug/plugin_main.cc:62
 msgid "Polyphase (best)"
 msgstr "ポリフェーズ (最高品質)"
 
-#: src/modplug/plugin_main.cc:64
+#: src/modplug/plugin_main.cc:63
 msgid "Sample rate"
 msgstr "サンプリングレート"
 
-#: src/modplug/plugin_main.cc:65
+#: src/modplug/plugin_main.cc:64
 msgid "22 kHz"
 msgstr "22 kHz"
 
-#: src/modplug/plugin_main.cc:66
+#: src/modplug/plugin_main.cc:65
 msgid "44 kHz"
 msgstr "44 kHz"
 
-#: src/modplug/plugin_main.cc:67
+#: src/modplug/plugin_main.cc:66
 msgid "48 kHz"
 msgstr "48 kHz"
 
-#: src/modplug/plugin_main.cc:68
+#: src/modplug/plugin_main.cc:67
 msgid "96 kHz"
 msgstr "96 kHz"
 
-#: src/modplug/plugin_main.cc:72 src/modplug/plugin_main.cc:77
-#: src/modplug/plugin_main.cc:82
+#: src/modplug/plugin_main.cc:71 src/modplug/plugin_main.cc:76
+#: src/modplug/plugin_main.cc:81
 msgid "Level:"
 msgstr "レベル:"
 
-#: src/modplug/plugin_main.cc:78
+#: src/modplug/plugin_main.cc:77
 msgid "Cutoff:"
 msgstr "カットオフ:"
 
-#: src/modplug/plugin_main.cc:91
+#: src/modplug/plugin_main.cc:90
 msgid "Reverb"
 msgstr "リバーブ"
 
-#: src/modplug/plugin_main.cc:94
+#: src/modplug/plugin_main.cc:93
 msgid "Bass Boost"
 msgstr "バスブースト"
 
-#: src/modplug/plugin_main.cc:97
+#: src/modplug/plugin_main.cc:96
 msgid "Surround"
 msgstr "サラウンド"
 
-#: src/modplug/plugin_main.cc:100
+#: src/modplug/plugin_main.cc:99
 msgid "Preamp"
 msgstr "プリアンプ"
 
-#: src/modplug/plugin_main.cc:107
+#: src/modplug/plugin_main.cc:106
 msgid "Oversample"
 msgstr "オーバーサンプリング"
 
-#: src/modplug/plugin_main.cc:108
+#: src/modplug/plugin_main.cc:107
 msgid "Noise reduction"
 msgstr "ノイズリダクション"
 
-#: src/modplug/plugin_main.cc:109
+#: src/modplug/plugin_main.cc:108
 msgid "Play Amiga MODs"
 msgstr "Amiga MOD を再生する"
 
-#: src/modplug/plugin_main.cc:110
+#: src/modplug/plugin_main.cc:109
 msgid "Repeat"
 msgstr "リピート"
 
-#: src/modplug/plugin_main.cc:111
+#: src/modplug/plugin_main.cc:110
 msgid "Repeat count:"
 msgstr "リピート回数:"
 
-#: src/modplug/plugin_main.cc:112
+#: src/modplug/plugin_main.cc:111
 msgid "To repeat forever, set the repeat count to -1."
 msgstr "ずっとリピートするにはリピート回数を-1にしてください。"
 
-#: src/modplug/plugin_main.cc:125 src/sid/xs_config.cc:106
+#: src/modplug/plugin_main.cc:124 src/sid/xs_config.cc:106
 msgid "These settings will take effect when Audacious is restarted."
 msgstr "これらの設定は、Audacious の再起動後に反映されます。"
 
+#: src/moonstone/main_window.cc:72 src/moonstone/main_window.cc:73
+#: src/qtui/main_window.cc:159 src/qtui/main_window.cc:160
+#: src/skins/menus.cc:107 src/skins-qt/menus.cc:98
+msgid "Stop After This Song"
+msgstr "曲の再生後に停止"
+
+#: src/moonstone/moonstone.cc:39
+msgid "Moonstone"
+msgstr ""
+
+#: src/moonstone/playlist_header.cc:212 src/qtui/playlist_header.cc:258
+msgid "Reset to Defaults"
+msgstr "デフォルトに戻す"
+
+#: src/moonstone/playlist_model.cc:38 src/qtui/playlist_header.cc:232
+msgid "Now Playing"
+msgstr "再生中"
+
+#: src/moonstone/playlist_selection.cc:66
+#: src/playlist-manager/playlist-manager.cc:201
+#: src/playlist-manager-qt/playlist-manager-qt.cc:190
+msgid "Entries"
+msgstr "項目数"
+
 #: src/mpg123/mpg123.cc:54
 msgid "MPG123 Plugin"
 msgstr "MPG123 プラグイン"
 
-#: src/mpg123/mpg123.cc:83
-msgid "Advanced"
-msgstr "高度な設定"
-
-#: src/mpg123/mpg123.cc:84
+#: src/mpg123/mpg123.cc:82
 msgid "Use accurate length calculation (slow)"
 msgstr "正確な長さを計算する(遅い)"
 
-#: src/mpg123/mpg123.cc:248
+#: src/mpg123/mpg123.cc:260
 msgid "Surround"
 msgstr "サラウンド"
 
-#: src/mpris2/plugin.cc:39
+#: src/mpris2/plugin.cc:40
 msgid "MPRIS 2 Server"
 msgstr "MPRIS 2 サーバー"
 
-#: src/neon/neon.cc:97
+#: src/neon/neon.cc:102
 msgid "Neon HTTP/HTTPS Plugin"
 msgstr "Neon HTTP/HTTPS プラグイン"
 
-#: src/neon/neon.cc:521
+#: src/neon/neon.cc:526
 msgid "Error parsing redirect"
 msgstr "リダイレクト処理のエラー"
 
-#: src/neon/neon.cc:535
+#: src/neon/neon.cc:540
 msgid "Unknown HTTP error"
 msgstr "不明な HTTP エラー"
 
-#: src/neon/neon.cc:569
+#: src/neon/neon.cc:614
 msgid "Error parsing URL"
 msgstr "URL 処理のエラー"
 
-#: src/neon/neon.cc:632
+#: src/neon/neon.cc:687
 msgid "Too many redirects"
 msgstr "リダイレクトの過剰な繰返し"
 
-#: src/notify/event.cc:64
+#: src/notify/event.cc:97
 msgid "Stopped"
 msgstr "停止しました"
 
-#: src/notify/event.cc:64
+#: src/notify/event.cc:97
 msgid "Audacious is not playing."
 msgstr "Audacious は曲を再生していません。"
 
-#: src/notify/notify.cc:42
+#: src/notify/notify.cc:39
 msgid "Desktop Notifications"
 msgstr "デスクトップ通知"
 
-#: src/notify/notify.cc:60
+#: src/notify/notify.cc:57
 msgid ""
 "Desktop Notifications Plugin for Audacious\n"
 "Copyright (C) 2010 Maximilian Bogner\n"
@@ -2669,36 +2820,76 @@
 "法的効力があると承認されたものではありません。何が許可されているか厳密に確認"
 "するためには、(英語で書かれた)オリジナルのGPLを参照してください。）"
 
-#: src/notify/notify.cc:110
+#: src/notify/notify.cc:104
 msgid "Show playback controls"
 msgstr "再生コントロールを表示する"
 
-#: src/notify/notify.cc:112
+#: src/notify/notify.cc:106
 msgid "Always show notification"
 msgstr "常に通知を表示する"
 
-#: src/notify/notify.cc:114
+#: src/notify/notify.cc:108
 msgid "Include album name in notification"
 msgstr "アルバムの名前も通知に含める"
 
-#: src/notify/osd.cc:58
+#: src/notify/notify.cc:110
+msgid "Custom notification duration:"
+msgstr ""
+
+#: src/notify/osd.cc:74
 msgid "Show"
 msgstr "表示する"
 
-#: src/notify/osd.cc:66 src/qtui/main_window.cc:178
-#: src/qtui/main_window.cc:179 src/skins/menus.cc:88
-msgid "Pause"
-msgstr "一時停止"
+#: src/openmpt/mpt.cc:50
+msgid "OpenMPT (Module Player)"
+msgstr ""
 
-#: src/notify/osd.cc:73 src/qtui/main_window.cc:72 src/skins/menus.cc:91
-msgid "Next"
-msgstr "次の曲"
+#: src/openmpt/mpt.cc:132
+msgid ""
+"Module player based on libopenmpt\n"
+"\n"
+"Written by: Chris Spiegel <cspiegel@gmail.com>"
+msgstr ""
+
+#: src/openmpt/mpt.cc:151
+msgid "Stereo separation:"
+msgstr ""
+
+#: src/openmpt/mpt.cc:153
+msgid "% (0=mono, 100=default, 200=full)"
+msgstr ""
+
+#: src/openmpt/mpt.cc:157
+msgid "Interpolation:"
+msgstr ""
+
+#: src/openmpt/mptwrap.h:51 src/soxr/sox-resampler.cc:189 src/xsf/plugin.cc:437
+msgid "Linear"
+msgstr "線形"
 
-#: src/oss4/oss.h:93
+#: src/openmpt/mptwrap.h:52
+msgid "Cubic"
+msgstr ""
+
+#: src/openmpt/mptwrap.h:53
+msgid "Windowed sinc"
+msgstr ""
+
+#: src/opus/opus.cc:39
+msgid "Opus Decoder"
+msgstr ""
+
+#: src/opus/opus.cc:336
+msgid ""
+"Opus Decoder Plugin for Audacious\n"
+"Copyright 2022 Thomas Lange"
+msgstr ""
+
+#: src/oss4/oss.h:70
 msgid "OSS4 Output"
 msgstr "OSS4 出力"
 
-#: src/oss4/oss.h:95
+#: src/oss4/oss.h:72
 msgid "OSS3 Output"
 msgstr "OSS3 出力"
 
@@ -2706,28 +2897,28 @@
 msgid "Default device"
 msgstr "デフォルトデバイス"
 
-#: src/oss4/plugin.cc:77
+#: src/oss4/plugin.cc:78
 msgid "Audio device:"
 msgstr "オーディオデバイス:"
 
-#: src/oss4/plugin.cc:80
+#: src/oss4/plugin.cc:81
 msgid "Use alternate device:"
 msgstr "代替デバイスを使用する:"
 
-#: src/oss4/plugin.cc:84
+#: src/oss4/plugin.cc:85
 msgid "Save volume between sessions."
 msgstr "セッション間で音量を保存する"
 
-#: src/oss4/plugin.cc:86
+#: src/oss4/plugin.cc:87
 msgid "Enable format conversions made by the OSS software."
 msgstr "OSS ソフトウェアのフォーマット変換を有効にする"
 
-#: src/oss4/plugin.cc:88
+#: src/oss4/plugin.cc:89
 msgid "Enable exclusive mode to prevent virtual mixing."
 msgstr ""
 "バーチャルミキシングを防ぐために排他的モード (exclusive mode) を有効にする"
 
-#: src/oss4/plugin.cc:100
+#: src/oss4/plugin.cc:101
 msgid ""
 "OSS4 Output Plugin for Audacious\n"
 "Copyright 2010-2012 Michał Lipski\n"
@@ -2741,19 +2932,35 @@
 "#audacious の人々、特に Tony Vroon および John Lindgren、そしてもちろん、OSS "
 "plugin の前作者に感謝します。"
 
-#: src/playlist-manager/playlist-manager.cc:37
+#: src/pipewire/pipewire.cc:44
+msgid "PipeWire Output"
+msgstr ""
+
+#: src/pipewire/pipewire.cc:118
+msgid ""
+"PipeWire Output Plugin for Audacious\n"
+"Copyright 2022 Thomas Lange\n"
+"\n"
+"Based on the PipeWire Output Plugin for Qmmp\n"
+"Copyright 2021 Ilya Kotov"
+msgstr ""
+
+#: src/pipewire/pipewire.cc:408 src/skins/menus.cc:88 src/skins-qt/menus.cc:79
+msgid "Playback"
+msgstr "演奏"
+
+#: src/playlist-manager/playlist-manager.cc:38
+#: src/playlist-manager-qt/playlist-manager-qt.cc:42
 msgid "Playlist Manager"
 msgstr "プレイリストマネージャー"
 
-#: src/playlist-manager/playlist-manager.cc:226
-msgid "Entries"
-msgstr "項目数"
-
-#: src/playlist-manager/playlist-manager.cc:245
+#: src/playlist-manager/playlist-manager.cc:221
+#: src/playlist-manager-qt/playlist-manager-qt.cc:356
 msgid "_Remove"
 msgstr "削除(_R)"
 
-#: src/playlist-manager/playlist-manager.cc:246
+#: src/playlist-manager/playlist-manager.cc:222
+#: src/playlist-manager-qt/playlist-manager-qt.cc:351
 msgid "Ren_ame"
 msgstr "名前の変更(_A)"
 
@@ -2761,55 +2968,69 @@
 msgid "PLS Playlists"
 msgstr "PLS プレイリスト"
 
-#: src/psf/plugin.cc:45
+#: src/psf/plugin.cc:53
 msgid "OpenPSF PSF1/PSF2 Decoder"
-msgstr "OpenPSF PSF1/PSF2 デコーダ"
+msgstr "OpenPSF PSF1/PSF2 デコーダー"
+
+#: src/psf/plugin.cc:270
+msgid "OpenPSF Configuration"
+msgstr ""
+
+#: src/psf/plugin.cc:271 src/xsf/plugin.cc:444
+msgid "Ignore length from file"
+msgstr "ファイルに記録されている再生時間を無視"
 
-#: src/pulse_audio/pulse_audio.cc:38
+#: src/pulse/pulse_audio.cc:42
 msgid "PulseAudio Output"
 msgstr "PulseAudio 出力"
 
-#: src/pulse_audio/pulse_audio.cc:611
+#: src/pulse/pulse_audio.cc:84
+msgid "Context name:"
+msgstr ""
+
+#: src/pulse/pulse_audio.cc:86
+msgid "Stream name:"
+msgstr ""
+
+#: src/pulse/pulse_audio.cc:596
 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"
-"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."
+"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 ""
+"Audacious PulseAudio Output Plugin\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/qtaudio/qtaudio.cc:49
+#: src/qtaudio/qtaudio.cc:53
 msgid "QtMultimedia Output"
 msgstr "QtMultimedia 出力"
 
-#: src/qtaudio/qtaudio.cc:77
+#: src/qtaudio/qtaudio.cc:84
 msgid ""
 "QtMultimedia Audio Output Plugin for Audacious\n"
 "Copyright 2014 William Pitcock\n"
@@ -2823,50 +3044,87 @@
 "派生元: SDL 出力プラグイン for Audacious\n"
 "Copyright 2010 John Lindgren"
 
-#: src/qtui/dialog_windows.cc:31
-msgid "Working ..."
-msgstr "処理中 ..."
+#: src/qtglspectrum/gl-spectrum.cc:41
+msgid ""
+"OpenGL Spectrum Analyzer for Audacious\n"
+"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
+"Copyright 2014, 2020 Ariadne Conill\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/qtui/filter_input.cc:44 src/skins/ui_playlist.cc:221
-msgid "Search"
-msgstr "検索"
+#: src/qthotkey/gui.cc:177
+msgid "Press a key combination inside a text field."
+msgstr ""
+
+#: src/qthotkey/plugin.cc:105
+msgid ""
+"Global Hotkey Plugin\n"
+"Control the player with global key combinations or multimedia keys.\n"
+"\n"
+"Copyright (C) 2020 i.Dark_Templar <darktemplar@dark-templar-archives.net>\n"
+"Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n"
+"\n"
+"Contributors 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/qtui/main_window_actions.cc:94
+#: src/qtui/menus.cc:109
 msgid "_Open Folder ..."
 msgstr "フォルダを開く(_O)"
 
-#: src/qtui/main_window_actions.cc:96
+#: src/qtui/menus.cc:115
 msgid "_Add Folder ..."
-msgstr "フォルダを追加(_A)"
+msgstr "フォルダーを追加(_A)"
 
-#: src/qtui/main_window_actions.cc:101
+#: src/qtui/menus.cc:128
 msgid "_Log Inspector ..."
 msgstr "ログ検査(_L)"
 
-#: src/qtui/main_window.cc:64
-msgid "Open Files"
-msgstr "ファイルを開く"
+#: src/qtui/menus.cc:220
+msgid "_Find ..."
+msgstr "検索(_F)"
 
-#: src/qtui/main_window.cc:66
-msgid "Add Files"
-msgstr "ファイルを追加"
+#: src/qtui/menus.cc:256 src/skins/menus.cc:80 src/skins-qt/menus.cc:70
+msgid "Audio Settings ..."
+msgstr "オーディオの設定..."
 
-#: src/qtui/main_window.cc:71 src/skins/menus.cc:90
-msgid "Previous"
-msgstr "前の曲"
+#: src/qtui/playlist_model.cc:188
+msgid "Q#"
+msgstr ""
 
-#: src/qtui/main_window.cc:77 src/skins/menus.cc:82
-msgid "Repeat"
-msgstr "リピート"
+#: src/qtui/playlist_model.cc:190
+msgid "T#"
+msgstr ""
 
-#: src/qtui/main_window.cc:79 src/skins/menus.cc:83
-msgid "Shuffle"
-msgstr "シャッフル"
+#: src/qtui/playlist_model.cc:192
+msgid "C#"
+msgstr ""
+
+#: src/qtui/playlist_model.cc:194
+msgid "D#"
+msgstr ""
 
-#: src/qtui/qtui.cc:42
+#: src/qtui/qtui.cc:40
 msgid "Qt Interface"
 msgstr "Qt インターフェイス"
 
+#: src/qtui/search_bar.cc:46
+msgid "Search playlist"
+msgstr "プレイリストを検索"
+
+#: src/qtui/settings.cc:79
+msgid "Use bold font for column headers"
+msgstr ""
+
 #: src/resample/resample.cc:43
 msgid "Sample Rate Converter"
 msgstr "サンプリング周波数コンバーター"
@@ -2907,7 +3165,7 @@
 msgid "Method:"
 msgstr "方法"
 
-#: src/resample/resample.cc:199 src/sox-resampler/sox-resampler.cc:161
+#: src/resample/resample.cc:199 src/soxr/sox-resampler.cc:203
 msgid "Rate:"
 msgstr "レート:"
 
@@ -2959,66 +3217,52 @@
 msgid "192 kHz:"
 msgstr "192 kHz:"
 
-#: src/scrobbler2/config_window.cc:41
-#, c-format
-msgid "OK. Scrobbling for user: %s"
-msgstr "ユーザー %s の Scrobble に成功しました。"
-
-#: src/scrobbler2/config_window.cc:54
-msgid "Permission Denied"
-msgstr "アクセス許可がありません"
+#: src/scrobbler2/config_window.cc:29
+msgid "Checking Last.fm access ..."
+msgstr "Last.fm に接続しています…"
 
-#: src/scrobbler2/config_window.cc:56
-msgid "Access the following link to allow Audacious to scrobble your plays:"
+#: src/scrobbler2/config_window.cc:35
+msgid ""
+"Your scrobbles are being saved on your computer temporarily. They will be "
+"submitted as soon as Audacious is allowed access."
 msgstr ""
-"Audacious に scrobble する許可を与えるには、以下のリンクにアクセスしてくださ"
-"い。"
+"scrobble を一時的にコンピューター内に保存しました。Audacious がアクセス可能に"
+"なり次第投稿されます。"
 
-#: src/scrobbler2/config_window.cc:66
-msgid "Keep this window open and click 'Check Permission' again.\n"
-msgstr ""
-"このウィンドウを開いたまま、もう一度「認証確認」をクリックしてください。\n"
+#: src/scrobbler2/config_window.cc:41
+#, c-format
+msgid "Permission granted. Scrobbling for user %s."
+msgstr "許可が与えられました。ユーザー %s に scrobble しています。"
 
-#: src/scrobbler2/config_window.cc:69 src/scrobbler2/config_window.cc:80
+#: src/scrobbler2/config_window.cc:44
 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."
+"Permission denied. Open the following URL in a browser, allow Audacious "
+"access to your account, and then click 'Check Permission' again:"
 msgstr ""
-"あなたの Scrobble はコンピュータに保存されています。\\n\n"
-"Audacious は投稿が可能になり次第、すぐに Scrobble を投稿します。"
-
-#: src/scrobbler2/config_window.cc:77
-msgid "Network Problem."
-msgstr "ネットワークに問題があります。"
+"許可がありません。以下の URL をブラウザーで開いて Audacious にアクセス権を与"
+"えた後、再度 '許可を確認' をクリックしてください。"
 
-#: src/scrobbler2/config_window.cc:78
-msgid "There was a problem contacting Last.fm. Please try again later."
-msgstr "Last.fm への接続に問題が発生しました。あとでもう一度試してください。"
+#: src/scrobbler2/config_window.cc:53
+msgid "There was a problem contacting Last.fm."
+msgstr "Last.fm へ接続中にエラーが発生しました。"
 
-#: src/scrobbler2/config_window.cc:110
-msgid "Checking..."
-msgstr "チェックしています..."
+#: src/scrobbler2/config_window.cc:92
+msgid "Check Permission"
+msgstr "許可を確認"
 
-#: src/scrobbler2/config_window.cc:176
-msgid "C_heck Permission"
-msgstr "認証確認(_H)"
+#: src/scrobbler2/config_window.cc:93
+msgid "Revoke Permission"
+msgstr "許可を取り消す"
 
-#: src/scrobbler2/config_window.cc:177
-msgid "_Revoke Permission"
-msgstr "認証取消(_R)"
-
-#: src/scrobbler2/config_window.cc:220
-msgid ""
-"You need to allow Audacious to scrobble tracks to your Last.fm account.\n"
-msgstr ""
-"Audacious があなたの Last.fm アカウントにトラックを scrobble できるように設定"
-"する必要があります。\n"
+#: src/scrobbler2/config_window.cc:97
+msgid "You need to allow Audacious to scrobble tracks to your Last.fm account."
+msgstr "Audacious に Last.fm へ曲を scrobble する許可を与える必要があります。"
 
 #: src/scrobbler2/scrobbler.cc:29
 msgid "Scrobbler 2.0"
 msgstr "Scrobbler 2.0"
 
-#: src/scrobbler2/scrobbler.cc:224
+#: src/scrobbler2/scrobbler.cc:200
 msgid ""
 "The Scrobbler plugin could not be started.\n"
 "There might be a problem with your installation."
@@ -3026,33 +3270,21 @@
 "Scrobbler プラグインを起動できませんでした。\\n\n"
 "インストール方法に問題がある可能性があります。"
 
-#: src/scrobbler2/scrobbler.cc:289
+#: src/scrobbler2/scrobbler.cc:245
 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"
+"project."
 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_communication.cc:642
-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/sdlout.cc:48
+#: src/sdlout/sdlout.cc:43
 msgid "SDL Output"
 msgstr "SDL 出力"
 
-#: src/sdlout/sdlout.cc:77
+#: src/sdlout/sdlout.cc:72
 msgid ""
 "SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
@@ -3060,53 +3292,42 @@
 "SDL 出力プラグイン for Audacious\n"
 "Copyright 2010 John Lindgren"
 
-#: src/search-tool/search-tool.cc:116 src/search-tool/search-tool.cc:124
+#: src/search-tool/library.cc:35 src/search-tool/library.cc:46
+#: src/search-tool-qt/library.cc:35 src/search-tool-qt/library.cc:46
 msgid "Library"
 msgstr "ライブラリー"
 
-#: src/search-tool/search-tool.cc:394
-#, c-format
-msgid "%d result"
-msgid_plural "%d results"
-msgstr0 "%d 件"
-
-#: src/search-tool/search-tool.cc:400
-#, c-format
-msgid "(%d hidden)"
-msgid_plural "(%d hidden)"
-msgstr0 "(%d の隠し)"
-
-#: src/search-tool/search-tool.cc:594
+#: src/search-tool-qt/search-model.cc:44 src/search-tool/search-tool.cc:287
 #, c-format
 msgid "%d song"
 msgid_plural "%d songs"
 msgstr0 "%d 曲"
 
-#: src/search-tool/search-tool.cc:601
+#: src/search-tool-qt/search-model.cc:53 src/search-tool/search-tool.cc:294
 msgid "of this genre"
 msgstr "（このジャンル中で）"
 
-#: src/search-tool/search-tool.cc:607
+#: src/search-tool-qt/search-model.h:47 src/search-tool/search-model.h:45
 msgid "on"
 msgstr "アルバム:"
 
-#: src/search-tool/search-tool.cc:607
+#: src/search-tool-qt/search-model.h:47 src/search-tool/search-model.h:45
 msgid "by"
 msgstr "アーティスト:"
 
-#: src/search-tool/search-tool.cc:643
-msgid "_Create Playlist"
-msgstr "プレイリストを作成(_C)"
+#: src/search-tool-qt/search-tool-qt.cc:165 src/search-tool/search-tool.cc:74
+msgid "Number of results to show:"
+msgstr "検索結果の表示件数:"
 
-#: src/search-tool/search-tool.cc:645
-msgid "_Add to Playlist"
-msgstr "プレイリストに追加(_A)"
+#: src/search-tool-qt/search-tool-qt.cc:168 src/search-tool/search-tool.cc:77
+msgid "Rescan library at startup"
+msgstr "起動時にライブラリーを再スキャンする"
 
-#: src/search-tool/search-tool.cc:684
-msgid "Search library"
-msgstr "ライブラリーを検索"
+#: src/search-tool-qt/search-tool-qt.cc:170
+msgid "Monitor library for changes"
+msgstr ""
 
-#: src/search-tool/search-tool.cc:688
+#: src/search-tool-qt/search-tool-qt.cc:193 src/search-tool/search-tool.cc:450
 msgid ""
 "To import your music library into Audacious, choose a folder and then click "
 "the \"refresh\" icon."
@@ -3114,22 +3335,42 @@
 "音楽ライブラリーを Audacious へインポートするには、フォルダを選択し、\"再読み"
 "込み\" アイコンをクリックしてください。"
 
-#: src/search-tool/search-tool.cc:696
+#: src/search-tool-qt/search-tool-qt.cc:195 src/search-tool/search-tool.cc:459
 msgid "Please wait ..."
 msgstr "お待ちください..."
 
-#: src/search-tool/search-tool.cc:723
+#: src/search-tool-qt/search-tool-qt.cc:197 src/search-tool/search-tool.cc:487
 msgid "Choose Folder"
 msgstr "フォルダーを選択"
 
+#: src/search-tool-qt/search-tool-qt.cc:201 src/search-tool/search-tool.cc:445
+msgid "Search library"
+msgstr "ライブラリーを検索"
+
+#: src/search-tool-qt/search-tool-qt.cc:327 src/search-tool/search-tool.cc:156
+#, c-format
+msgid "%d of %d result shown"
+msgid_plural "%d of %d results shown"
+msgstr0 "%d / %d の結果を表示中"
+
+#: src/search-tool-qt/search-tool-qt.cc:331 src/search-tool/search-tool.cc:160
+#, c-format
+msgid "%d result"
+msgid_plural "%d results"
+msgstr0 "%d 件"
+
+#: src/search-tool-qt/search-tool-qt.cc:501 src/search-tool/search-tool.cc:341
+msgid "_Create Playlist"
+msgstr "プレイリストを作成(_C)"
+
+#: src/search-tool-qt/search-tool-qt.cc:503 src/search-tool/search-tool.cc:343
+msgid "_Add to Playlist"
+msgstr "プレイリストに追加(_A)"
+
 #: src/sid/xmms-sid.cc:43
 msgid "SID Player"
 msgstr "SID プレイヤー"
 
-#: src/sid/xs_config.cc:61
-msgid "Output"
-msgstr "出力"
-
 #: src/sid/xs_config.cc:62
 msgid "Channels:"
 msgstr "チャンネル:"
@@ -3210,740 +3451,683 @@
 msgid "Threshold:"
 msgstr "しきい値:"
 
-#: src/silence-removal/silence-removal.cc:70
-msgid "dB"
-msgstr "dB"
+#: src/skins/actions.cc:45 src/skins-qt/actions.cc:43
+msgid "Repeat points cleared."
+msgstr "リピートポイントがクリアされました。"
+
+#: src/skins/actions.cc:60 src/skins-qt/actions.cc:58
+msgid "Repeat point A set."
+msgstr "リピートポイントAを設定します。"
+
+#: src/skins/actions.cc:65 src/skins-qt/actions.cc:63
+msgid "Repeat point B set."
+msgstr "リピートポイントBを設定します。"
+
+#: src/skins/equalizer.cc:223 src/skins-qt/equalizer.cc:223
+msgid "Preamp"
+msgstr "プリアンプ"
+
+#: src/skins/equalizer.cc:227 src/skins-qt/equalizer.cc:227
+msgid "31 Hz"
+msgstr "31 Hz"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "63 Hz"
+msgstr "63 Hz"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "125 Hz"
+msgstr "125 Hz"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "250 Hz"
+msgstr "250 Hz"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "500 Hz"
+msgstr "500 Hz"
 
-#: src/skins/menus.cc:64
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "1 kHz"
+msgstr "1 kHz"
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "2 kHz"
+msgstr "2 kHz"
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "4 kHz"
+msgstr "4 kHz"
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "8 kHz"
+msgstr "8 kHz"
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "16 kHz"
+msgstr "16 kHz"
+
+#: src/skins/equalizer.cc:270 src/skins-qt/equalizer.cc:270
+msgid "Audacious Equalizer"
+msgstr "Audacious イコライザー"
+
+#: src/skins/main.cc:459 src/skins-qt/main.cc:442
+msgid "Recording on"
+msgstr "録音中"
+
+#: src/skins/main.cc:461 src/skins-qt/main.cc:444
+msgid "Recording off"
+msgstr "録音停止"
+
+#: src/skins/main.cc:754 src/skins-qt/main.cc:701
+#, c-format
+msgid "Seek to %d:%-2.2d / %d:%-2.2d"
+msgstr "%d:%-2.2d / %d:%-2.2d へシークする"
+
+#: src/skins/main.cc:771 src/skins-qt/main.cc:718
+#, c-format
+msgid "Volume: %d%%"
+msgstr "音量: %d%%"
+
+#: src/skins/main.cc:784 src/skins-qt/main.cc:731
+#, c-format
+msgid "Balance: %d%% left"
+msgstr "バランス: %d%% 左"
+
+#: src/skins/main.cc:786 src/skins-qt/main.cc:733
+msgid "Balance: center"
+msgstr "バランス: 中央"
+
+#: src/skins/main.cc:788 src/skins-qt/main.cc:735
+#, c-format
+msgid "Balance: %d%% right"
+msgstr "バランス: %d%% 右"
+
+#: src/skins/main.cc:880 src/skins-qt/main.cc:827
+msgid "Options Menu"
+msgstr "オプションメニュー"
+
+#: src/skins/main.cc:884 src/skins-qt/main.cc:831
+msgid "Disable 'Always On Top'"
+msgstr "「常に最前面に配置」無効"
+
+#: src/skins/main.cc:886 src/skins-qt/main.cc:833
+msgid "Enable 'Always On Top'"
+msgstr "「常に最前面に配置」有効"
+
+#: src/skins/main.cc:889 src/skins-qt/main.cc:836
+msgid "File Info Box"
+msgstr "ファイル情報ボックス"
+
+#: src/skins/main.cc:892 src/skins/menus.cc:149 src/skins-qt/main.cc:839
+#: src/skins-qt/menus.cc:142
+msgid "Double Size"
+msgstr "2倍の大きさで表示"
+
+#: src/skins/main.cc:895 src/skins-qt/main.cc:842
+msgid "Visualizations"
+msgstr "視覚化"
+
+#: src/skins/menus.cc:74 src/skins-qt/menus.cc:64
+msgid "Volume Up"
+msgstr "音量を上げる"
+
+#: src/skins/menus.cc:75 src/skins-qt/menus.cc:65
+msgid "Volume Down"
+msgstr "音量を下げる"
+
+#: src/skins/menus.cc:77 src/skins-qt/menus.cc:67
+msgid "Effects ..."
+msgstr "エフェクト..."
+
+#: src/skins/menus.cc:84 src/skins-qt/menus.cc:74
 msgid "Open Files ..."
 msgstr "ファイルを開く"
 
-#: src/skins/menus.cc:65
+#: src/skins/menus.cc:85 src/skins-qt/menus.cc:76
 msgid "Open URL ..."
 msgstr "URLを開く"
 
-#: src/skins/menus.cc:66
-msgid "Search Library"
-msgstr "ライブラリを検索"
-
-#: src/skins/menus.cc:68
-msgid "Playback"
-msgstr "演奏"
-
-#: src/skins/menus.cc:69
+#: src/skins/menus.cc:89 src/skins-qt/menus.cc:80
 msgid "Playlist"
 msgstr "プレイリスト"
 
-#: src/skins/menus.cc:70
+#: src/skins/menus.cc:90 src/skins-qt/menus.cc:81
+msgid "Output"
+msgstr "出力"
+
+#: src/skins/menus.cc:91 src/skins-qt/menus.cc:82
 msgid "View"
 msgstr "表示"
 
-#: src/skins/menus.cc:72 src/skins/menus.cc:136 src/skins/menus.cc:149
-#: src/skins/menus.cc:214
+#: src/skins/menus.cc:93 src/skins/menus.cc:161 src/skins/menus.cc:174
+#: src/skins/menus.cc:245 src/skins-qt/menus.cc:84 src/skins-qt/menus.cc:156
+#: src/skins-qt/menus.cc:170 src/skins-qt/menus.cc:241
 msgid "Services"
 msgstr "サービス"
 
-#: src/skins/menus.cc:74
+#: src/skins/menus.cc:95 src/skins-qt/menus.cc:86
 msgid "About ..."
 msgstr "情報"
 
-#: src/skins/menus.cc:75
+#: src/skins/menus.cc:96 src/skins-qt/menus.cc:87
 msgid "Settings ..."
 msgstr "設定"
 
-#: src/skins/menus.cc:76
+#: src/skins/menus.cc:97 src/skins-qt/menus.cc:88
 msgid "Quit"
 msgstr "終了"
 
-#: src/skins/menus.cc:80 src/skins/menus.cc:206
+#: src/skins/menus.cc:101 src/skins/menus.cc:235 src/skins-qt/menus.cc:92
+#: src/skins-qt/menus.cc:231
 msgid "Song Info ..."
 msgstr "曲の情報"
 
-#: src/skins/menus.cc:84
+#: src/skins/menus.cc:105 src/skins-qt/menus.cc:96
+msgid "Shuffle by Album"
+msgstr "アルバムごとにシャッフル"
+
+#: src/skins/menus.cc:106 src/skins-qt/menus.cc:97
 msgid "No Playlist Advance"
 msgstr "次の曲に進まない"
 
-#: src/skins/menus.cc:85
-msgid "Stop After This Song"
-msgstr "曲の再生後に停止"
-
-#: src/skins/menus.cc:93
+#: src/skins/menus.cc:117 src/skins-qt/menus.cc:108
 msgid "Set A-B Repeat"
 msgstr "A-B リピートをセット"
 
-#: src/skins/menus.cc:94
+#: src/skins/menus.cc:118 src/skins-qt/menus.cc:109
 msgid "Clear A-B Repeat"
 msgstr "A-B リピートをクリア"
 
-#: src/skins/menus.cc:96
+#: src/skins/menus.cc:120 src/skins-qt/menus.cc:111
 msgid "Jump to Song ..."
 msgstr "指定した曲にジャンプ"
 
-#: src/skins/menus.cc:97
+#: src/skins/menus.cc:121 src/skins-qt/menus.cc:113
 msgid "Jump to Time ..."
 msgstr "指定した時間へジャンプ"
 
-#: src/skins/menus.cc:101
+#: src/skins/menus.cc:125 src/skins-qt/menus.cc:118
 msgid "Play/Resume"
 msgstr "再生/再開"
 
-#: src/skins/menus.cc:103
+#: src/skins/menus.cc:127 src/skins-qt/menus.cc:120
 msgid "New Playlist"
 msgstr "新しいプレイリスト"
 
-#: src/skins/menus.cc:104
+#: src/skins/menus.cc:128 src/skins-qt/menus.cc:121
 msgid "Rename Playlist ..."
 msgstr "プレイリストの名前を変更"
 
-#: src/skins/menus.cc:105
+#: src/skins/menus.cc:129 src/skins-qt/menus.cc:122
 msgid "Remove Playlist"
 msgstr "プレイリストを削除"
 
-#: src/skins/menus.cc:107
+#: src/skins/menus.cc:131 src/skins-qt/menus.cc:124
 msgid "Previous Playlist"
 msgstr "前のプレイリスト"
 
-#: src/skins/menus.cc:108
+#: src/skins/menus.cc:132 src/skins-qt/menus.cc:125
 msgid "Next Playlist"
 msgstr "次のプレイリスト"
 
-#: src/skins/menus.cc:110
+#: src/skins/menus.cc:134 src/skins-qt/menus.cc:127
 msgid "Import Playlist ..."
 msgstr "プレイリストのインポート"
 
-#: src/skins/menus.cc:111
+#: src/skins/menus.cc:135 src/skins-qt/menus.cc:128
 msgid "Export Playlist ..."
 msgstr "プレイリストのエクスポート"
 
-#: src/skins/menus.cc:113
+#: src/skins/menus.cc:137 src/skins-qt/menus.cc:130
 msgid "Playlist Manager ..."
 msgstr "プレイリストマネージャー"
 
-#: src/skins/menus.cc:114
+#: src/skins/menus.cc:138 src/skins-qt/menus.cc:131
 msgid "Queue Manager ..."
 msgstr "キューマネージャー"
 
-#: src/skins/menus.cc:116
+#: src/skins/menus.cc:140 src/skins-qt/menus.cc:133
 msgid "Refresh Playlist"
 msgstr "プレイリストの更新"
 
-#: src/skins/menus.cc:120
+#: src/skins/menus.cc:144 src/skins-qt/menus.cc:137
 msgid "Show Playlist Editor"
 msgstr "プレイリストエディターを表示する"
 
-#: src/skins/menus.cc:121
+#: src/skins/menus.cc:145 src/skins-qt/menus.cc:138
 msgid "Show Equalizer"
 msgstr "イコライザーを表示する"
 
-#: src/skins/menus.cc:123
+#: src/skins/menus.cc:147 src/skins-qt/menus.cc:140
 msgid "Show Remaining Time"
 msgstr "残り時間を表示する"
 
-#: src/skins/menus.cc:125
+#: src/skins/menus.cc:150 src/skins-qt/menus.cc:143
 msgid "Always on Top"
 msgstr "常に最前面に配置する"
 
-#: src/skins/menus.cc:126
+#: src/skins/menus.cc:151 src/skins-qt/menus.cc:145
 msgid "On All Workspaces"
 msgstr "全ワークスペースに配置する"
 
-#: src/skins/menus.cc:128
+#: src/skins/menus.cc:153 src/skins-qt/menus.cc:148
 msgid "Roll Up Player"
 msgstr "プレイヤーをたたむ"
 
-#: src/skins/menus.cc:129
+#: src/skins/menus.cc:154 src/skins-qt/menus.cc:149
 msgid "Roll Up Playlist Editor"
 msgstr "プレイリストエディターをたたむ"
 
-#: src/skins/menus.cc:130
+#: src/skins/menus.cc:155 src/skins-qt/menus.cc:150
 msgid "Roll Up Equalizer"
 msgstr "イコライザーをたたむ"
 
-#: src/skins/menus.cc:132 src/skins/ui_main.cc:854
-msgid "Double Size"
-msgstr "2倍の大きさで表示"
-
-#: src/skins/menus.cc:138
+#: src/skins/menus.cc:163 src/skins-qt/menus.cc:158
 msgid "Add URL ..."
 msgstr "URLを追加"
 
-#: src/skins/menus.cc:139
+#: src/skins/menus.cc:164 src/skins-qt/menus.cc:160
 msgid "Add Files ..."
 msgstr "ファイルを追加"
 
-#: src/skins/menus.cc:143 src/skins/menus.cc:171 src/skins/menus.cc:185
+#: src/skins/menus.cc:168 src/skins/menus.cc:196 src/skins/menus.cc:212
+#: src/skins-qt/menus.cc:164 src/skins-qt/menus.cc:192
+#: src/skins-qt/menus.cc:208
 msgid "By Title"
 msgstr "タイトル"
 
-#: src/skins/menus.cc:144 src/skins/menus.cc:178 src/skins/menus.cc:192
+#: src/skins/menus.cc:169 src/skins/menus.cc:203 src/skins/menus.cc:219
+#: src/skins-qt/menus.cc:165 src/skins-qt/menus.cc:199
+#: src/skins-qt/menus.cc:215
 msgid "By File Name"
 msgstr "ファイル名"
 
-#: src/skins/menus.cc:145 src/skins/menus.cc:179 src/skins/menus.cc:193
+#: src/skins/menus.cc:170 src/skins/menus.cc:204 src/skins/menus.cc:220
+#: src/skins-qt/menus.cc:166 src/skins-qt/menus.cc:200
+#: src/skins-qt/menus.cc:216
 msgid "By File Path"
 msgstr "ファイルパス"
 
-#: src/skins/menus.cc:151
+#: src/skins/menus.cc:176 src/skins-qt/menus.cc:172
 msgid "Remove All"
 msgstr "全て削除"
 
-#: src/skins/menus.cc:152
+#: src/skins/menus.cc:177 src/skins-qt/menus.cc:173
 msgid "Clear Queue"
 msgstr "キューのクリア"
 
-#: src/skins/menus.cc:154
+#: src/skins/menus.cc:179 src/skins-qt/menus.cc:175
 msgid "Remove Unavailable Files"
 msgstr "利用できないファイルの削除"
 
-#: src/skins/menus.cc:155
+#: src/skins/menus.cc:180 src/skins-qt/menus.cc:176
 msgid "Remove Duplicates"
 msgstr "重複エントリの削除"
 
-#: src/skins/menus.cc:157
+#: src/skins/menus.cc:182 src/skins-qt/menus.cc:178
 msgid "Remove Unselected"
 msgstr "選択していないエントリの削除"
 
-#: src/skins/menus.cc:158
+#: src/skins/menus.cc:183 src/skins-qt/menus.cc:179
 msgid "Remove Selected"
 msgstr "選択したエントリの削除"
 
-#: src/skins/menus.cc:162
+#: src/skins/menus.cc:187 src/skins-qt/menus.cc:183
 msgid "Search and Select"
 msgstr "検索と選択"
 
-#: src/skins/menus.cc:164
+#: src/skins/menus.cc:189 src/skins-qt/menus.cc:185
 msgid "Invert Selection"
 msgstr "選択範囲の反転"
 
-#: src/skins/menus.cc:165
+#: src/skins/menus.cc:190 src/skins-qt/menus.cc:186
 msgid "Select None"
 msgstr "未選択にする"
 
-#: src/skins/menus.cc:166
+#: src/skins/menus.cc:191 src/skins-qt/menus.cc:187
 msgid "Select All"
 msgstr "全て選択"
 
-#: src/skins/menus.cc:170 src/skins/menus.cc:184
+#: src/skins/menus.cc:195 src/skins/menus.cc:211 src/skins-qt/menus.cc:191
+#: src/skins-qt/menus.cc:207
 msgid "By Track Number"
 msgstr "トラック番号"
 
-#: src/skins/menus.cc:172 src/skins/menus.cc:186
+#: src/skins/menus.cc:197 src/skins/menus.cc:213 src/skins-qt/menus.cc:193
+#: src/skins-qt/menus.cc:209
 msgid "By Artist"
 msgstr "アーティスト"
 
-#: src/skins/menus.cc:173 src/skins/menus.cc:187
+#: src/skins/menus.cc:198 src/skins/menus.cc:214 src/skins-qt/menus.cc:194
+#: src/skins-qt/menus.cc:210
 msgid "By Album"
 msgstr "アルバム"
 
-#: src/skins/menus.cc:174 src/skins/menus.cc:188
+#: src/skins/menus.cc:199 src/skins/menus.cc:215 src/skins-qt/menus.cc:195
+#: src/skins-qt/menus.cc:211
 msgid "By Album Artist"
 msgstr "アルバムアーティスト"
 
-#: src/skins/menus.cc:175 src/skins/menus.cc:190
+#: src/skins/menus.cc:200 src/skins/menus.cc:216 src/skins-qt/menus.cc:196
+#: src/skins-qt/menus.cc:212
 msgid "By Release Date"
 msgstr "リリース日"
 
-#: src/skins/menus.cc:176 src/skins/menus.cc:189
+#: src/skins/menus.cc:201 src/skins/menus.cc:217 src/skins-qt/menus.cc:197
+#: src/skins-qt/menus.cc:213
 msgid "By Genre"
 msgstr "ジャンル"
 
-#: src/skins/menus.cc:177 src/skins/menus.cc:191
+#: src/skins/menus.cc:202 src/skins/menus.cc:218 src/skins-qt/menus.cc:198
+#: src/skins-qt/menus.cc:214
 msgid "By Length"
 msgstr "長さ"
 
-#: src/skins/menus.cc:180 src/skins/menus.cc:194
+#: src/skins/menus.cc:205 src/skins/menus.cc:221 src/skins-qt/menus.cc:201
+#: src/skins-qt/menus.cc:217
 msgid "By Custom Title"
 msgstr "カスタムタイトル"
 
-#: src/skins/menus.cc:198
+#: src/skins/menus.cc:206 src/skins/menus.cc:222 src/skins-qt/menus.cc:202
+#: src/skins-qt/menus.cc:218
+msgid "By Comment"
+msgstr "コメント"
+
+#: src/skins/menus.cc:207 src/skins/menus.cc:223 src/skins-qt/menus.cc:203
+#: src/skins-qt/menus.cc:219
+msgid "By Disc Number"
+msgstr ""
+
+#: src/skins/menus.cc:227 src/skins-qt/menus.cc:223
 msgid "Randomize List"
 msgstr "プレイリストをランダムにする"
 
-#: src/skins/menus.cc:199
+#: src/skins/menus.cc:228 src/skins-qt/menus.cc:224
 msgid "Reverse List"
 msgstr "プレイリストを逆順にする"
 
-#: src/skins/menus.cc:201
+#: src/skins/menus.cc:230 src/skins-qt/menus.cc:226
 msgid "Sort Selected"
 msgstr "選択範囲をソート"
 
-#: src/skins/menus.cc:202
+#: src/skins/menus.cc:231 src/skins-qt/menus.cc:227
 msgid "Sort List"
 msgstr "プレイリストをソート"
 
-#: src/skins/menus.cc:208
+#: src/skins/menus.cc:236 src/skins-qt/menus.cc:232
+msgid "Open Containing Folder"
+msgstr "この項目を含むフォルダーを開く"
+
+#: src/skins/menus.cc:238 src/skins-qt/menus.cc:234
 msgid "Cut"
 msgstr "切り取り"
 
-#: src/skins/menus.cc:209
+#: src/skins/menus.cc:239 src/skins-qt/menus.cc:235
 msgid "Copy"
 msgstr "コピー"
 
-#: src/skins/menus.cc:210
+#: src/skins/menus.cc:240 src/skins-qt/menus.cc:236
 msgid "Paste"
 msgstr "貼り付け"
 
-#: src/skins/menus.cc:212
+#: src/skins/menus.cc:241 src/skins-qt/menus.cc:237
+msgid "Paste at End"
+msgstr "末尾に貼り付け"
+
+#: src/skins/menus.cc:243 src/skins-qt/menus.cc:239
 msgid "Queue/Unqueue"
 msgstr "キュー/アンキュー"
 
-#: src/skins/menus.cc:218
-msgid "Load Preset ..."
-msgstr "プリセットの読み込み"
-
-#: src/skins/menus.cc:219
-msgid "Load Auto Preset ..."
-msgstr "自動プリセットの読み込み"
-
-#: src/skins/menus.cc:220
-msgid "Load Default"
-msgstr "デフォルトの読み込み"
-
-#: src/skins/menus.cc:221
-msgid "Load Preset File ..."
-msgstr "プリセットファイルの読み込み"
-
-#: src/skins/menus.cc:222
-msgid "Load EQF File ..."
-msgstr "EQF ファイルの読み込み"
-
-#: src/skins/menus.cc:224
-msgid "Save Preset ..."
-msgstr "プリセットの保存"
-
-#: src/skins/menus.cc:225
-msgid "Save Auto Preset ..."
-msgstr "自動プリセットの保存"
-
-#: src/skins/menus.cc:226
-msgid "Save Default"
-msgstr "デフォルトを保存"
-
-#: src/skins/menus.cc:227
-msgid "Save Preset File ..."
-msgstr "プリセットファイルを保存"
-
-#: src/skins/menus.cc:228
-msgid "Save EQF File ..."
-msgstr "EQF ファイルの保存"
-
-#: src/skins/menus.cc:230
-msgid "Delete Preset ..."
-msgstr "プリセットを削除"
-
-#: src/skins/menus.cc:231
-msgid "Delete Auto Preset ..."
-msgstr "自動プリセットを削除"
-
-#: src/skins/menus.cc:233
-msgid "Import Winamp Presets ..."
-msgstr "Winamp プリセットのインポート"
-
-#: src/skins/menus.cc:235
-msgid "Reset to Zero"
-msgstr "ゼロにリセット"
+#: src/skins/playlist-widget.cc:58 src/skins-qt/playlist-widget.cc:58
+#, c-format
+msgid "%s (%d of %d)"
+msgstr "%s (%d / %d)"
 
-#: src/skins/plugin.cc:48
+#: src/skins/playlistwin.cc:491 src/skins-qt/playlistwin.cc:478
+msgid "Audacious Playlist Editor"
+msgstr "Audacious プレイリストエディター"
+
+#: src/skins/plugin.cc:53 src/skins-qt/plugin.cc:65
 msgid "Winamp Classic Interface"
 msgstr "Winamp クラシックインターフェイス"
 
-#: src/skins/preset-browser.cc:57 src/skins/preset-list.cc:371
-#: src/skins/preset-list.cc:386
-msgid "Save"
-msgstr "保存"
-
-#: src/skins/preset-browser.cc:57 src/skins/preset-list.cc:338
-#: src/skins/preset-list.cc:354
-msgid "Load"
-msgstr "読み込み"
-
-#: src/skins/preset-browser.cc:83
-msgid "Load Preset File"
-msgstr "プリセットファイルを読込む"
-
-#: src/skins/preset-browser.cc:100
-msgid "Load EQF File"
-msgstr "EQF ファイルをロード"
-
-#: src/skins/preset-browser.cc:119
-msgid "Save Preset File"
-msgstr "プリセットファイルを保存"
-
-#: src/skins/preset-browser.cc:137
-msgid "Save EQF File"
-msgstr "EQF ファイルを保存"
-
-#: src/skins/preset-browser.cc:151
-msgid "Import Winamp Presets"
-msgstr "Winamp のプリセットをインポート"
-
-#: src/skins/preset-list.cc:285
-msgid "Presets"
-msgstr "プリセット"
-
-#: src/skins/preset-list.cc:335
-msgid "Load preset"
-msgstr "プリセットの読み込み"
-
-#: src/skins/preset-list.cc:351
-msgid "Load auto-preset"
-msgstr "自動プリセットの読み込み"
-
-#: src/skins/preset-list.cc:367
-msgid "Save preset"
-msgstr "プリセットの保存"
-
-#: src/skins/preset-list.cc:382
-msgid "Save auto-preset"
-msgstr "自動プリセットの保存"
-
-#: src/skins/preset-list.cc:408
-msgid "Delete preset"
-msgstr "プリセットの削除"
-
-#: src/skins/preset-list.cc:424
-msgid "Delete auto-preset"
-msgstr "自動プリセットの削除"
+#: src/skins-qt/menus.cc:75
+msgid "Open Folder ..."
+msgstr "フォルダを開く"
+
+#: src/skins-qt/menus.cc:159
+msgid "Add Folder ..."
+msgstr "フォルダーを追加"
+
+#: src/skins-qt/search-select.cc:62 src/skins/search-select.cc:77
+msgid "Search entries in active playlist"
+msgstr "有効になっているプレイリストのエントリを検索"
 
-#: src/skins/skins_cfg.cc:176
+#: src/skins-qt/search-select.cc:70 src/skins/search-select.cc:83
+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 ""
+"1 つ以上の項目を入力すると、プレイリストのエントリーが選択できます。項目には"
+"正規表現が使え、大文字と小文字を区別しません。正規表現の動作がわからない場合"
+"は、検索したい文字をそのまま入力してください。"
+
+#: src/skins-qt/search-select.cc:75 src/skins/search-select.cc:91
+msgid "Title:"
+msgstr "タイトル: "
+
+#: src/skins-qt/search-select.cc:79 src/skins/search-select.cc:96
+msgid "Album:"
+msgstr "アルバム: "
+
+#: src/skins-qt/search-select.cc:82 src/skins/search-select.cc:101
+msgid "Artist:"
+msgstr "アーティスト: "
+
+#: src/skins-qt/search-select.cc:85 src/skins/search-select.cc:106
+msgid "File Name:"
+msgstr "ファイル名:"
+
+#: src/skins-qt/search-select.cc:88 src/skins/search-select.cc:134
+msgid "Clear previous selection before searching"
+msgstr "検索前に前回の選択をクリアする"
+
+#: src/skins-qt/search-select.cc:89 src/skins/search-select.cc:137
+msgid "Automatically toggle queue for matching entries"
+msgstr "マッチした項目のキューを自動的にトグルする"
+
+#: src/skins-qt/search-select.cc:90 src/skins/search-select.cc:140
+msgid "Create a new playlist with matching entries"
+msgstr "マッチした項目で新しいプレイリストを作成する"
+
+#: src/skins-qt/search-select.cc:101 src/skins/search-select.cc:78
+msgid "Search"
+msgstr "検索"
+
+#: src/skins-qt/skins_cfg.cc:198 src/skins/skins_cfg.cc:182
 msgid "Player:"
 msgstr "プレイヤー:"
 
-#: src/skins/skins_cfg.cc:178
+#: src/skins-qt/skins_cfg.cc:200 src/skins/skins_cfg.cc:184
 msgid "Select main player window font:"
 msgstr "メインウィンドウで使用するフォントの選択"
 
-#: src/skins/skins_cfg.cc:179
+#: src/skins-qt/skins_cfg.cc:201 src/skins/skins_cfg.cc:185
 msgid "Playlist:"
 msgstr "プレイリスト:"
 
-#: src/skins/skins_cfg.cc:181
+#: src/skins-qt/skins_cfg.cc:203 src/skins/skins_cfg.cc:187
 msgid "Select playlist font:"
 msgstr "プレイリストで使用するフォントの選択"
 
-#: src/skins/skins_cfg.cc:187
+#: src/skins-qt/skins_cfg.cc:207 src/skins/skins_cfg.cc:191
 msgid "Skin"
 msgstr "スキン"
 
-#: src/skins/skins_cfg.cc:189
+#: src/skins-qt/skins_cfg.cc:211 src/skins/skins_cfg.cc:193
+msgid "Display active titlebar when any window is focused"
+msgstr ""
+
+#: src/skins-qt/skins_cfg.cc:213 src/skins/skins_cfg.cc:195
 msgid "Fonts"
 msgstr "フォント"
 
-#: src/skins/skins_cfg.cc:192
+#: src/skins-qt/skins_cfg.cc:215 src/skins/skins_cfg.cc:197
 msgid "Use bitmap fonts (supports ASCII only)"
 msgstr "ビットマップフォントを使用する (ASCII のみ対応)"
 
-#: src/skins/skins_cfg.cc:194
+#: src/skins-qt/skins_cfg.cc:217 src/skins/skins_cfg.cc:199
 msgid "Scroll song title"
 msgstr "曲のタイトルをスクロール"
 
-#: src/skins/skins_cfg.cc:196
+#: src/skins-qt/skins_cfg.cc:219 src/skins/skins_cfg.cc:201
 msgid "Scroll song title in both directions"
 msgstr "曲のタイトルを両方向にスクロールする"
 
-#: src/skins/skins_cfg.cc:201
+#: src/skins-qt/skins_cfg.cc:224 src/skins/skins_cfg.cc:206
 msgid "Analyzer"
 msgstr "アナライザー"
 
-#: src/skins/skins_cfg.cc:202
+#: src/skins-qt/skins_cfg.cc:225 src/skins/skins_cfg.cc:207
 msgid "Scope"
 msgstr "スコープ"
 
-#: src/skins/skins_cfg.cc:203
+#: src/skins-qt/skins_cfg.cc:226 src/skins/skins_cfg.cc:208
 msgid "Voiceprint / VU meter"
 msgstr "声紋 / VU メーター"
 
-#: src/skins/skins_cfg.cc:204
+#: src/skins-qt/skins_cfg.cc:227 src/skins/skins_cfg.cc:209
 msgid "Off"
 msgstr "オフ"
 
-#: src/skins/skins_cfg.cc:208 src/skins/skins_cfg.cc:233
-#: src/skins/skins_cfg.cc:239
+#: src/skins-qt/skins_cfg.cc:231 src/skins-qt/skins_cfg.cc:256
+#: src/skins-qt/skins_cfg.cc:262 src/skins/skins_cfg.cc:213
+#: src/skins/skins_cfg.cc:238 src/skins/skins_cfg.cc:244
 msgid "Normal"
 msgstr "標準"
 
-#: src/skins/skins_cfg.cc:209 src/skins/skins_cfg.cc:234
+#: src/skins-qt/skins_cfg.cc:232 src/skins-qt/skins_cfg.cc:257
+#: src/skins/skins_cfg.cc:214 src/skins/skins_cfg.cc:239
 msgid "Fire"
 msgstr "ファイア"
 
-#: src/skins/skins_cfg.cc:210
+#: src/skins-qt/skins_cfg.cc:233 src/skins/skins_cfg.cc:215
 msgid "Vertical lines"
 msgstr "垂直線"
 
-#: src/skins/skins_cfg.cc:214
+#: src/skins-qt/skins_cfg.cc:237 src/skins/skins_cfg.cc:219
 msgid "Lines"
 msgstr "ライン"
 
-#: src/skins/skins_cfg.cc:215
+#: src/skins-qt/skins_cfg.cc:238 src/skins/skins_cfg.cc:220
 msgid "Bars"
 msgstr "バー"
 
-#: src/skins/skins_cfg.cc:219
+#: src/skins-qt/skins_cfg.cc:242 src/skins/skins_cfg.cc:224
 msgid "Slowest"
 msgstr "最も遅い"
 
-#: src/skins/skins_cfg.cc:220
+#: src/skins-qt/skins_cfg.cc:243 src/skins/skins_cfg.cc:225
 msgid "Slow"
 msgstr "遅い"
 
-#: src/skins/skins_cfg.cc:221 src/sox-resampler/sox-resampler.cc:152
+#: src/skins-qt/skins_cfg.cc:244 src/skins/skins_cfg.cc:226
+#: src/soxr/sox-resampler.cc:180
 msgid "Medium"
 msgstr "中"
 
-#: src/skins/skins_cfg.cc:222
+#: src/skins-qt/skins_cfg.cc:245 src/skins/skins_cfg.cc:227
 msgid "Fast"
 msgstr "早い"
 
-#: src/skins/skins_cfg.cc:223
+#: src/skins-qt/skins_cfg.cc:246 src/skins/skins_cfg.cc:228
 msgid "Fastest"
 msgstr "最も早い"
 
-#: src/skins/skins_cfg.cc:227
+#: src/skins-qt/skins_cfg.cc:250 src/skins/skins_cfg.cc:232
 msgid "Dots"
 msgstr "点"
 
-#: src/skins/skins_cfg.cc:228
+#: src/skins-qt/skins_cfg.cc:251 src/skins/skins_cfg.cc:233
 msgid "Line"
 msgstr "線"
 
-#: src/skins/skins_cfg.cc:229
+#: src/skins-qt/skins_cfg.cc:252 src/skins/skins_cfg.cc:234
 msgid "Solid"
 msgstr "ソリッド"
 
-#: src/skins/skins_cfg.cc:235
+#: src/skins-qt/skins_cfg.cc:258 src/skins/skins_cfg.cc:240
 msgid "Ice"
 msgstr "アイス"
 
-#: src/skins/skins_cfg.cc:240
+#: src/skins-qt/skins_cfg.cc:263 src/skins/skins_cfg.cc:245
 msgid "Smooth"
 msgstr "スムーズ"
 
-#: src/skins/skins_cfg.cc:244
-msgid "Type"
-msgstr "タイプ"
-
-#: src/skins/skins_cfg.cc:245
-msgid "Visualization type:"
-msgstr "視覚化タイプ:"
-
-#: src/skins/skins_cfg.cc:248
-msgid "Analyzer"
-msgstr "アナライザー"
-
-#: src/skins/skins_cfg.cc:249
-msgid "Show peaks"
-msgstr "ピークを表示"
-
-#: src/skins/skins_cfg.cc:251
+#: src/skins-qt/skins_cfg.cc:267 src/skins/skins_cfg.cc:249
 msgid "Coloring:"
 msgstr "色付け:"
 
-#: src/skins/skins_cfg.cc:254
+#: src/skins-qt/skins_cfg.cc:270 src/skins/skins_cfg.cc:252
 msgid "Style:"
 msgstr "スタイル:"
 
-#: src/skins/skins_cfg.cc:257
+#: src/skins-qt/skins_cfg.cc:273 src/skins/skins_cfg.cc:255
 msgid "Falloff:"
 msgstr "降下速度:"
 
-#: src/skins/skins_cfg.cc:260
+#: src/skins-qt/skins_cfg.cc:276 src/skins/skins_cfg.cc:258
 msgid "Peak falloff:"
 msgstr "ピークの降下速度:"
 
-#: src/skins/skins_cfg.cc:264
+#: src/skins-qt/skins_cfg.cc:282 src/skins/skins_cfg.cc:264
 msgid "Scope Style:"
 msgstr "スコープのスタイル:"
 
-#: src/skins/skins_cfg.cc:267
+#: src/skins-qt/skins_cfg.cc:285 src/skins/skins_cfg.cc:267
 msgid "Voiceprint Coloring:"
 msgstr "声紋の色付け:"
 
-#: src/skins/skins_cfg.cc:270
+#: src/skins-qt/skins_cfg.cc:288 src/skins/skins_cfg.cc:270
 msgid "VU Meter Style:"
 msgstr "VU メーターのスタイル:"
 
-#: src/skins/skins_cfg.cc:276
-msgid "General"
-msgstr "一般"
-
-#: src/skins/skins_cfg.cc:277
-msgid "Visualization"
-msgstr "視覚化"
-
-#: src/skins/ui_equalizer.cc:282
-msgid "Preamp"
-msgstr "プリアンプ"
-
-#: src/skins/ui_equalizer.cc:286
-msgid "31 Hz"
-msgstr "31 Hz"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "63 Hz"
-msgstr "63 Hz"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "125 Hz"
-msgstr "125 Hz"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "250 Hz"
-msgstr "250 Hz"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "500 Hz"
-msgstr "500 Hz"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "1 kHz"
-msgstr "1 kHz"
-
-#: src/skins/ui_equalizer.cc:288
-msgid "2 kHz"
-msgstr "2 kHz"
-
-#: src/skins/ui_equalizer.cc:288
-msgid "4 kHz"
-msgstr "4 kHz"
-
-#: src/skins/ui_equalizer.cc:288
-msgid "8 kHz"
-msgstr "8 kHz"
-
-#: src/skins/ui_equalizer.cc:288
-msgid "16 kHz"
-msgstr "16 kHz"
-
-#: src/skins/ui_equalizer.cc:330
-msgid "Audacious Equalizer"
-msgstr "Audacious イコライザー"
-
-#: src/skins/ui_main.cc:688
-#, c-format
-msgid "Seek to %d:%-2.2d / %d:%-2.2d"
-msgstr "%d:%-2.2d / %d:%-2.2d へシークする"
-
-#: src/skins/ui_main.cc:709
-#, c-format
-msgid "Volume: %d%%"
-msgstr "音量: %d%%"
-
-#: src/skins/ui_main.cc:732
-#, c-format
-msgid "Balance: %d%% left"
-msgstr "バランス: %d%% 左"
-
-#: src/skins/ui_main.cc:734
-msgid "Balance: center"
-msgstr "バランス: 中央"
-
-#: src/skins/ui_main.cc:736
-#, c-format
-msgid "Balance: %d%% right"
-msgstr "バランス: %d%% 右"
-
-#: src/skins/ui_main.cc:842
-msgid "Options Menu"
-msgstr "オプションメニュー"
+#: src/skins-qt/skins_cfg.cc:294 src/skins/skins_cfg.cc:276
+msgid "Type"
+msgstr "タイプ"
 
-#: src/skins/ui_main.cc:846
-msgid "Disable 'Always On Top'"
-msgstr "「常に最前面に配置」無効"
+#: src/skins-qt/skins_cfg.cc:295 src/skins/skins_cfg.cc:277
+msgid "Visualization type:"
+msgstr "視覚化タイプ:"
 
-#: src/skins/ui_main.cc:848
-msgid "Enable 'Always On Top'"
-msgstr "「常に最前面に配置」有効"
+#: src/skins-qt/skins_cfg.cc:298 src/skins/skins_cfg.cc:280
+msgid "Analyzer"
+msgstr "アナライザー"
 
-#: src/skins/ui_main.cc:851
-msgid "File Info Box"
-msgstr "ファイル情報ボックス"
+#: src/skins-qt/skins_cfg.cc:299 src/skins/skins_cfg.cc:281
+msgid "Show peaks"
+msgstr "ピークを表示"
 
-#: src/skins/ui_main.cc:857
-msgid "Visualizations"
+#: src/skins-qt/skins_cfg.cc:308 src/skins/skins_cfg.cc:290
+msgid "Visualization"
 msgstr "視覚化"
 
-#: src/skins/ui_main.cc:1336
-msgid "Repeat point A set."
-msgstr "リピートポイントAを設定します。"
-
-#: src/skins/ui_main.cc:1341
-msgid "Repeat point B set."
-msgstr "リピートポイントBを設定します。"
-
-#: src/skins/ui_main.cc:1350
-msgid "Repeat points cleared."
-msgstr "リピートポイントがクリアされました。"
-
-#: src/skins/ui_playlist.cc:219
-msgid "Search entries in active playlist"
-msgstr "有効になっているプレイリストのエントリを検索"
-
-#: src/skins/ui_playlist.cc:226
-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 ""
-"1つ以上の項目を入力すると、プレイリストのエントリが選択できます。項目には正規"
-"表現が使え、大文字と小文字を区別しません。正規表現の動作がわからない場合は、"
-"検索したい文字をそのまま入力してください。"
-
-#: src/skins/ui_playlist.cc:234
-msgid "Title:"
-msgstr "タイトル: "
-
-#: src/skins/ui_playlist.cc:241
-msgid "Album:"
-msgstr "アルバム: "
-
-#: src/skins/ui_playlist.cc:248
-msgid "Artist:"
-msgstr "アーティスト: "
-
-#: src/skins/ui_playlist.cc:255
-msgid "File Name:"
-msgstr "ファイル名:"
-
-#: src/skins/ui_playlist.cc:263
-msgid "Clear previous selection before searching"
-msgstr "検索前に前回の選択をクリアする"
-
-#: src/skins/ui_playlist.cc:266
-msgid "Automatically toggle queue for matching entries"
-msgstr "マッチした項目のキューを自動的にトグルする"
-
-#: src/skins/ui_playlist.cc:269
-msgid "Create a new playlist with matching entries"
-msgstr "マッチした項目で新しいプレイリストを作成する"
-
-#: src/skins/ui_playlist.cc:717
-msgid "Audacious Playlist Editor"
-msgstr "Audacious プレイリストエディター"
-
-#: src/skins/ui_playlist.cc:752
-#, c-format
-msgid "%s (%d of %d)"
-msgstr "%s (%d / %d)"
-
-#: src/skins/ui_skinselector.cc:167
+#: src/skins-qt/skinselector.cc:98 src/skins/skinselector.cc:111
 msgid "Archived Winamp 2.x skin"
 msgstr "Archived Winamp 2.x スキン"
 
-#: src/skins/ui_skinselector.cc:172
+#: src/skins-qt/skinselector.cc:102 src/skins/skinselector.cc:115
 msgid "Unarchived Winamp 2.x skin"
 msgstr "Unarchived Winamp 2.x スキン"
 
-#: src/skins/util.cc:430
-#, c-format
-msgid "Could not create directory (%s): %s\n"
-msgstr "ディレクトリー (%s) を作成できませんでした: %s\n"
-
-#: src/sndfile/plugin.cc:39
+#: src/sndfile/plugin.cc:38
 msgid "Sndfile Plugin"
 msgstr "Sndfile プラグイン"
 
-#: src/sndfile/plugin.cc:336
+#: src/sndfile/plugin.cc:372
 msgid ""
 "Based on the xmms_sndfile plugin:\n"
 "Copyright (C) 2000, 2002 Erik de Castro Lopo\n"
@@ -3983,109 +4167,112 @@
 "this program; if not, write to the Free Software Foundation, Inc., 51 "
 "Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 
-#: src/sndio-ng/sndio.cc:44
+#: src/sndio/sndio.cc:43
 msgid "Sndio Output"
 msgstr "Sndio 出力"
 
-#: src/sndio-ng/sndio.cc:98
+#: src/sndio/sndio.cc:98
 msgid "Device (blank for default):"
 msgstr "デバイス (空白の場合はデフォルト)"
 
-#: src/sndio-ng/sndio.cc:100
+#: src/sndio/sndio.cc:100
 msgid "Save and restore volume:"
 msgstr "音量を保存し復元:"
 
-#: src/sndio-ng/sndio.cc:181
+#: src/sndio/sndio.cc:181
 #, c-format
 msgid "Sndio error: Unsupported audio format (%d)"
 msgstr "Sndio エラー: サポートしていないオーディオ形式 (%d)"
 
-#: src/sndio-ng/sndio.cc:192
+#: src/sndio/sndio.cc:192
 msgid "Sndio error: sio_open() failed"
 msgstr "Sndio エラー: sio_open() に失敗"
 
-#: src/sndio-ng/sndio.cc:222
+#: src/sndio/sndio.cc:221
 msgid "Sndio error: sio_setpar() failed"
 msgstr "Sndio エラー: sio_setpar() に失敗"
 
-#: src/sndio-ng/sndio.cc:234
+#: src/sndio/sndio.cc:233
 msgid "Sndio error: sio_start() failed"
 msgstr "Sndio エラー: sio_start() に失敗"
 
-#: src/song_change/song_change.cc:33
+#: src/songchange/song_change.cc:30
 msgid "Song Change"
 msgstr "楽曲の変更通知"
 
-#: src/song_change/song_change.cc:342
-msgid ""
-"Parameters passed to the shell should be encapsulated in "
-"quotes. Doing otherwise is a security risk."
-msgstr ""
-"シェルに渡されるパラメータはクォートでくくってください。そ"
-"うしない場合、セキュリティ上の危険があります。"
-
-#: src/song_change/song_change.cc:358
+#: src/songchange/song_change.cc:256
 msgid "Commands"
 msgstr "コマンド"
 
-#: src/song_change/song_change.cc:360
+#: src/songchange/song_change.cc:258
 msgid "Command to run when starting a new song:"
 msgstr "新しい曲の再生時に実行するコマンド:"
 
-#: src/song_change/song_change.cc:364
+#: src/songchange/song_change.cc:261
+msgid "Command to run when stopping a song:"
+msgstr ""
+
+#: src/songchange/song_change.cc:264
 msgid "Command to run at the end of a song:"
 msgstr "曲の終了時に実行するコマンド:"
 
-#: src/song_change/song_change.cc:368
+#: src/songchange/song_change.cc:267
 msgid "Command to run at the end of the playlist:"
 msgstr "プレイリストの終了時に実行するコマンド:"
 
-#: src/song_change/song_change.cc:372
+#: src/songchange/song_change.cc:270
 msgid "Command to run when song title changes (for network streams):"
 msgstr ""
 "曲タイトルが替わったときに実行するコマンド (ネットワークストリーミング用):"
 
-#: src/song_change/song_change.cc:376
+#: src/songchange/song_change.cc:273
 msgid ""
-"You can use the following format strings which will be substituted before "
-"calling the command (not all are useful for the end-of-playlist command):\n"
-"\n"
-"%F: Frequency (in hertz)\n"
+"You can use the following format codes, which will be replaced before "
+"running the command.\n"
+"Not all are useful though for the song-stopped or end-of-playlist command."
+msgstr ""
+
+#: src/songchange/song_change.cc:276
+msgid ""
+"%a: Artist\n"
+"%b: Album\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"
+"%F: Frequency (Hertz)\n"
+"%l: Length (milliseconds)\n"
+"%n or %s: Formatted title (see playlist settings)\n"
 "%p: Currently playing (1 or 0)\n"
-"%a: Artist\n"
-"%b: Album\n"
-"%T: Track title"
+"%r: Rate (bits per second)\n"
+"%t: Playlist position\n"
+"%T: Title (unformatted)"
 msgstr ""
-"次の形式の文字列を使うことで、コマンド実行前に値を置き換えることができます。"
-"（プレイリストの終了時に実行するコマンドでは意味のない項目もあります）:\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: トラックのタイトル"
+"%c: チャンネル数\n"
+"%f: ファイル名 (フルパス)\n"
+"%F: 周波数 (Hz)\n"
+"%l: 長さ (milliseconds)\n"
+"%n または %s: フォーマット化したタイトル (プレイリストの設定を参照)\n"
+"%p: 再生中かどうか (1 または 0)\n"
+"%r: ビットレート (bps)\n"
+"%t: プレイリストの位置\n"
+"%T: タイトル (フォーマット化していないもの)"
 
-#: src/song-info-qt/song-info.cc:32
-msgid "Song Info (Qt)"
-msgstr "曲の情報 (Qt)"
+#: src/songchange/song_change.cc:287
+msgid ""
+"Parameters passed to the shell should be enclosed in quotation marks.\n"
+"Unquoted parameters may lead to unexpected results."
+msgstr ""
+
+#: src/song-info-qt/song-info.cc:30
+msgid "Song Info"
+msgstr "曲の情報"
 
-#: src/sox-resampler/sox-resampler.cc:44
+#: src/soxr/sox-resampler.cc:44
 msgid "SoX Resampler"
 msgstr "SoX リサンプラー"
 
-#: src/sox-resampler/sox-resampler.cc:144
+#: src/soxr/sox-resampler.cc:172
 msgid ""
 "SoX Resampler Plugin for Audacious\n"
 "Copyright 2013 Michał Lipski\n"
@@ -4099,96 +4286,144 @@
 "派生元: サンプリング周波数コンバータプラグイン\n"
 "Copyright 2010-2012 John Lindgren"
 
-#: src/sox-resampler/sox-resampler.cc:150
+#: src/soxr/sox-resampler.cc:178
 msgid "Quick"
 msgstr "高速"
 
-#: src/sox-resampler/sox-resampler.cc:151
+#: src/soxr/sox-resampler.cc:179
 msgid "Low"
 msgstr "低品質"
 
-#: src/sox-resampler/sox-resampler.cc:153
+#: src/soxr/sox-resampler.cc:181
 msgid "High"
 msgstr "高品質"
 
-#: src/sox-resampler/sox-resampler.cc:154
+#: src/soxr/sox-resampler.cc:182
 msgid "Very High"
 msgstr "最高品質"
 
-#: src/sox-resampler/sox-resampler.cc:158
+#: src/soxr/sox-resampler.cc:183
+msgid "Ultra High"
+msgstr "究極品質"
+
+#: src/soxr/sox-resampler.cc:187
+msgid "Minimum"
+msgstr "最小限"
+
+#: src/soxr/sox-resampler.cc:188
+msgid "Intermediate"
+msgstr "中間"
+
+#: src/soxr/sox-resampler.cc:193
 msgid "Quality:"
 msgstr "品質:"
 
-#: src/speed-pitch/speed-pitch.cc:51
+#: src/soxr/sox-resampler.cc:196
+msgid "Phase:"
+msgstr "位相応答:"
+
+#: src/soxr/sox-resampler.cc:200
+msgid "Allow aliasing"
+msgstr "エイリアシングを許可"
+
+#: src/soxr/sox-resampler.cc:202
+msgid "Use steep filter"
+msgstr "急峻なフィルターを使う"
+
+#: src/speedpitch/speed-pitch.cc:54
 msgid "Speed and Pitch"
 msgstr "テンポとピッチ"
 
-#: src/speed-pitch/speed-pitch.cc:210
-msgid "Speed and Pitch"
-msgstr "テンポとピッチ"
-
-#: src/speed-pitch/speed-pitch.cc:211
-msgid "Speed:"
-msgstr "テンポ:"
-
-#: src/speed-pitch/speed-pitch.cc:214
-msgid "Pitch:"
-msgstr "ピッチ:"
+#: src/speedpitch/speed-pitch.cc:247
+msgid "Speed"
+msgstr "テンポ"
+
+#: src/speedpitch/speed-pitch.cc:248
+msgid "Decouple from pitch"
+msgstr "ピッチと別々に指定"
+
+#: src/speedpitch/speed-pitch.cc:250 src/speedpitch/speed-pitch.cc:258
+msgid "Multiplier:"
+msgstr "倍率"
+
+#: src/speedpitch/speed-pitch.cc:254
+msgid "Pitch"
+msgstr "ピッチ"
 
-#: src/statusicon/statusicon.cc:47
+#: src/statusicon-qt/statusicon.cc:45 src/statusicon/statusicon.cc:47
 msgid "Status Icon"
 msgstr "ステータスアイコン"
 
-#: src/statusicon/statusicon.cc:283
-msgid "Se_ttings ..."
-msgstr "設定(_T)"
-
-#: src/statusicon/statusicon.cc:372
+#: src/statusicon-qt/statusicon.cc:68
 msgid ""
-"Status Icon Plugin\n"
+"Status Icon Plugin (partial port for Qt interface)\n"
 "\n"
 "Copyright 2005-2007 Giacomo Lozito <james@develia.org>\n"
 "Copyright 2010 Michał Lipski <tallica@o2.pl>\n"
+"Copyright 2015 Eugene Paskevich <eugene@raptor.kiev.ua>\n"
 "\n"
 "This plugin provides a status icon, placed in\n"
 "the system tray area of the window manager."
 msgstr ""
-"ステータスアイコンプラグイン\n"
+"ステータスアイコンプラグイン (partial port for Qt interface)\n"
 "\n"
 "Copyright 2005-2007 Giacomo Lozito <james@develia.org>\n"
 "Copyright 2010 Michał Lipski <tallica@o2.pl>\n"
+"Copyright 2015 Eugene Paskevich <eugene@raptor.kiev.ua>\n"
 "\n"
-"このプラグインはステータスアイコンを\n"
-"ウインドウマネージャが定めるシステムトレイ内に表示する"
+"このプラグインはウィンドウマネージャーの\n"
+"システムトレイにアイコンを表示します。"
 
-#: src/statusicon/statusicon.cc:379
+#: src/statusicon-qt/statusicon.cc:89 src/statusicon/statusicon.cc:384
 msgid "Mouse Scroll Action"
 msgstr "マウススクロールアクション"
 
-#: src/statusicon/statusicon.cc:380
+#: src/statusicon-qt/statusicon.cc:90 src/statusicon/statusicon.cc:385
 msgid "Change volume"
 msgstr "音量の変更"
 
-#: src/statusicon/statusicon.cc:383
+#: src/statusicon-qt/statusicon.cc:93 src/statusicon/statusicon.cc:388
 msgid "Change playing song"
 msgstr "再生曲の変更"
 
-#: src/statusicon/statusicon.cc:386
+#: src/statusicon-qt/statusicon.cc:96 src/statusicon/statusicon.cc:391
 msgid "Other Settings"
 msgstr "その他の設定"
 
-#: src/statusicon/statusicon.cc:387
+#: src/statusicon-qt/statusicon.cc:97 src/statusicon/statusicon.cc:392
 msgid "Disable the popup window"
 msgstr "ポップアップウィンドウを無効にする"
 
-#: src/statusicon/statusicon.cc:389
+#: src/statusicon-qt/statusicon.cc:99 src/statusicon/statusicon.cc:394
 msgid "Close to the system tray"
 msgstr "システムトレイに収納する"
 
-#: src/statusicon/statusicon.cc:391
+#: src/statusicon-qt/statusicon.cc:101 src/statusicon/statusicon.cc:396
 msgid "Advance in playlist when scrolling upward"
 msgstr "上にスクロールしたらプレイリストを進める"
 
+#: src/statusicon-qt/statusicon.cc:116 src/statusicon/statusicon.cc:287
+msgid "Se_ttings ..."
+msgstr "設定(_T)"
+
+#: src/statusicon/statusicon.cc:377
+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"
+"Copyright 2005-2007 Giacomo Lozito <james@develia.org>\n"
+"Copyright 2010 Michał Lipski <tallica@o2.pl>\n"
+"\n"
+"このプラグインはステータスアイコンを\n"
+"ウインドウマネージャが定めるシステムトレイ内に表示する"
+
 #: src/stereo_plugin/stereo.cc:19
 msgid "Extra Stereo"
 msgstr "エクストラステレオ"
@@ -4199,7 +4434,7 @@
 "\n"
 "By Johan Levin, 1999"
 msgstr ""
-"Extra Stereo プラグイン\n"
+"エクストラステレオプラグイン\n"
 "\n"
 "By Johan Levin, 1999"
 
@@ -4207,20 +4442,160 @@
 msgid "Extra Stereo"
 msgstr "エクストラステレオ"
 
+#: src/streamtuner/icecast-model.cc:126 src/streamtuner/shoutcast-model.cc:131
+msgid "Type"
+msgstr ""
+
+#: src/streamtuner/icecast-model.cc:132
+msgid "Current Song"
+msgstr ""
+
+#: src/streamtuner/icecast-model.cc:164
+msgid "Other"
+msgstr ""
+
+#: src/streamtuner/ihr-model.cc:63
+msgid "Market"
+msgstr ""
+
+#: src/streamtuner/ihr-model.cc:156
+msgid "Call Letters"
+msgstr ""
+
+#: src/streamtuner/ihr-model.cc:162
+msgid "Description"
+msgstr "説明"
+
+#: src/streamtuner/shoutcast-model.cc:128
+msgid "Listeners"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:188
+msgid "Top 500 Stations"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:189
+msgid "Alternative"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:190
+msgid "Blues"
+msgstr "ブルース"
+
+#: src/streamtuner/shoutcast-model.cc:191
+msgid "Classical"
+msgstr "クラシカル"
+
+#: src/streamtuner/shoutcast-model.cc:192
+msgid "Country"
+msgstr "カントリー"
+
+#: src/streamtuner/shoutcast-model.cc:193
+msgid "Decades"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:194
+msgid "Easy Listening"
+msgstr "イージーリスニング"
+
+#: src/streamtuner/shoutcast-model.cc:195
+msgid "Electronic"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:196
+msgid "Folk"
+msgstr "フォーク"
+
+#: src/streamtuner/shoutcast-model.cc:197
+msgid "Inspirational"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:198
+msgid "International"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:199
+msgid "Jazz"
+msgstr "ジャズ"
+
+#: src/streamtuner/shoutcast-model.cc:200
+msgid "Latin"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:201
+msgid "Metal"
+msgstr "メタル"
+
+#: src/streamtuner/shoutcast-model.cc:203
+msgid "New Age"
+msgstr "ニューエイジ"
+
+#: src/streamtuner/shoutcast-model.cc:204
+msgid "Pop"
+msgstr "ポップ"
+
+#: src/streamtuner/shoutcast-model.cc:205
+msgid "Public Radio"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:206
+msgid "R&B and Urban"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:207
+msgid "Rap"
+msgstr "ラップ"
+
+#: src/streamtuner/shoutcast-model.cc:208
+msgid "Reggae"
+msgstr "レゲエ"
+
+#: src/streamtuner/shoutcast-model.cc:209
+msgid "Rock"
+msgstr "ロック"
+
+#: src/streamtuner/shoutcast-model.cc:210
+msgid "Seasonal and Holiday"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:211
+msgid "Soundtracks"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:212
+msgid "Talk"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:213
+msgid "Themes"
+msgstr ""
+
+#: src/streamtuner/streamtuner.cc:59
+msgid "Shoutcast"
+msgstr ""
+
+#: src/streamtuner/streamtuner.cc:60
+msgid "Icecast"
+msgstr ""
+
+#: src/streamtuner/streamtuner.cc:71
+msgid "Stream Tuner"
+msgstr ""
+
 #: src/tonegen/tonegen.cc:45
 msgid "Tone Generator"
 msgstr "トーンジェネレーター"
 
-#: src/tonegen/tonegen.cc:94
+#: src/tonegen/tonegen.cc:92
 #, c-format
 msgid "%s %.1f Hz"
 msgstr "%s %.1f Hz"
 
-#: src/tonegen/tonegen.cc:94
+#: src/tonegen/tonegen.cc:92
 msgid "Tone Generator: "
 msgstr "トーンジェネレーター: "
 
-#: src/tonegen/tonegen.cc:160
+#: src/tonegen/tonegen.cc:161
 msgid ""
 "Sine tone generator by Håvard Kvålen <havardk@xmms.org>\n"
 "Modified by Daniel J. Peng <danielpeng@bigfoot.com>\n"
@@ -4239,11 +4614,32 @@
 "例:\n"
 "tone://2000;2005 (2000Hz と 2005Hz のトーンを再生する)"
 
+#: src/ui-common/dialogs-qt.cc:40
+msgid ""
+"\n"
+"(Further messages have been hidden.)"
+msgstr ""
+"\n"
+"(追加のメッセージが隠れているかもしれません。)"
+
+#: src/ui-common/dialogs-qt.cc:52
+msgid "Working ..."
+msgstr "処理中 ..."
+
+#: src/ui-common/dialogs-qt.cc:73
+msgid "Information"
+msgstr "情報"
+
+#: src/ui-common/menu-ops-gtk.cc:132 src/ui-common/menu-ops-qt.cc:113
+#, c-format
+msgid "%s does not appear to be a valid folder."
+msgstr ""
+
 #: src/voice_removal/voice_removal.cc:28
 msgid "Voice Removal"
 msgstr "ボーカルの除去"
 
-#: src/vorbis/vorbis.cc:465
+#: src/vorbis/vorbis.cc:433
 msgid ""
 "Audacious Ogg Vorbis Decoder\n"
 "\n"
@@ -4285,12 +4681,12 @@
 msgid "Ogg Vorbis Decoder"
 msgstr "Ogg Vorbis デコーダー"
 
-#: src/vtx/info.cc:22
+#: src/vtx/info.cc:24
 #, c-format
 msgid "Details about %s"
 msgstr "%s の詳細"
 
-#: src/vtx/info.cc:24
+#: src/vtx/info.cc:26
 msgid ""
 "Title: %t\n"
 "Author: %a\n"
@@ -4320,7 +4716,7 @@
 msgid "VTX Decoder"
 msgstr "VTX デコーダー"
 
-#: src/vtx/vtx.cc:184
+#: src/vtx/vtx.cc:178
 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"
@@ -4331,19 +4727,61 @@
 "Roman Sherbakov <v_soft@microfor.ru> の in_vtx.dll を基にしています。\n"
 "Audacious への実装は、Pavel Vymetalek <pvymetalek@seznam.cz> が行いました。"
 
-#: src/wavpack/wavpack.cc:24
+#: src/vumeter-qt/vumeter_qt.cc:31
+msgid ""
+"VU Meter Plugin for Audacious\n"
+"Copyright 2017-2019 Marc Sánchez Fauste"
+msgstr ""
+
+#: src/vumeter-qt/vumeter_qt.cc:35
+msgid "VU Meter Settings"
+msgstr ""
+
+#: src/vumeter-qt/vumeter_qt.cc:37
+msgid "Peak hold time:"
+msgstr ""
+
+#: src/vumeter-qt/vumeter_qt.cc:42
+msgid "Fall-off time:"
+msgstr ""
+
+#: src/vumeter-qt/vumeter_qt.cc:44
+msgid "dB/second"
+msgstr ""
+
+#: src/vumeter-qt/vumeter_qt.cc:46
+msgid "Display legend"
+msgstr ""
+
+#: src/vumeter-qt/vumeter_qt.h:37
+msgid "VU Meter"
+msgstr ""
+
+#: src/waveout/waveout.cc:43
+msgid "Win32 waveOut"
+msgstr "Win32 waveOut"
+
+#: src/waveout/waveout.cc:69
+msgid ""
+"Win32 waveOut Plugin for Audacious\n"
+"Copyright 2016 John Lindgren"
+msgstr ""
+"Win32 waveOut Plugin for Audacious\n"
+"Copyright 2016 John Lindgren"
+
+#: src/wavpack/wavpack.cc:25
 msgid "WavPack Decoder"
 msgstr "WavPack デコーダー"
 
-#: src/wavpack/wavpack.cc:211
+#: src/wavpack/wavpack.cc:217
 msgid "lossy (hybrid)"
 msgstr "非可逆 (ハイブリッド)"
 
-#: src/wavpack/wavpack.cc:213
+#: src/wavpack/wavpack.cc:219
 msgid "lossy"
 msgstr "非可逆"
 
-#: src/wavpack/wavpack.cc:255
+#: src/wavpack/wavpack.cc:259
 msgid ""
 "Copyright 2006 William Pitcock <nenolod@nenolod.net>\n"
 "\n"
@@ -4353,18 +4791,38 @@
 "\n"
 "プラグインのコードの一部は Miles Egan によるものです。"
 
-#: src/xsf/plugin.cc:50
+#: src/xsf/plugin.cc:74
 msgid "2SF Decoder"
 msgstr "2SF デコーダー"
 
-#: src/xsf/plugin.cc:238
+#: src/xsf/plugin.cc:429
+msgid "32728 Hz"
+msgstr ""
+
+#: src/xsf/plugin.cc:432
+msgid "65456 Hz"
+msgstr ""
+
+#: src/xsf/plugin.cc:438
+msgid "Cosine"
+msgstr ""
+
+#: src/xsf/plugin.cc:439
+msgid "Sharp"
+msgstr ""
+
+#: src/xsf/plugin.cc:443
 msgid "XSF Configuration"
 msgstr "XSF の設定"
 
-#: src/xsf/plugin.cc:239
-msgid "Ignore length from file"
-msgstr "ファイルに記録されている再生時間を無視"
+#: src/xsf/plugin.cc:445
+msgid "Default fade time:"
+msgstr ""
+
+#: src/xsf/plugin.cc:447
+msgid "Interpolation mode:"
+msgstr ""
 
-#: src/xspf/xspf.cc:89
+#: src/xspf/xspf.cc:95
 msgid "XML Shareable Playlists (XSPF)"
 msgstr "共有可能な XML プレイリスト (XSPF)"

audacious-plugins-3.6.2-gtk3.tar.bz2/po/ko.po -> audacious-plugins-4.4.1.tar.bz2/po/ko.po Changed

@@ -4,312 +4,90 @@
 #
 # Translators:
 # 		ChoSeongWoo <syn333@gmail.com>, 2008
+# Junghee Lee <daemul72@gmail.com>, 2021
 # Seong-ho Cho <darkcircle.0426@gmail.com>, 2013
 # Seong-ho Cho <darkcircle.0426@gmail.com>, 2012-2013
 # Jaegeum Choe <baedaron@hananet.net>, 2001
+# Junghee Lee <daemul72@gmail.com>, 2022-2023
+# Junghee Lee <daemul72@gmail.com>, 2022
+# Junghee Lee <daemul72@gmail.com>, 2021,2024
+# Kim ju-gwang <hhs4272@naver.com>, 2015
+# kim suhyun <jane.sh.jihye@gmail.com>, 2019
 # 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
-# Seong-ho Cho <darkcircle.0426@gmail.com>, 2012-2015
+# Seong-ho Cho <darkcircle.0426@gmail.com>, 2012-2015,2017
 msgid ""
 msgstr ""
 "Project-Id-Version: Audacious Plugins\n"
-"Report-Msgid-Bugs-To: http://redmine.audacious-media-player.org/\n"
-"POT-Creation-Date: 2015-02-28 19:18+0100\n"
-"PO-Revision-Date: 2015-02-14 15:07+0000\n"
-"Last-Translator: Seong-ho Cho <darkcircle.0426@gmail.com>\n"
-"Language-Team: Korean (http://www.transifex.com/projects/p/audacious/"
-"language/ko/)\n"
+"Report-Msgid-Bugs-To: https://github.com/audacious-media-player/audacious/"
+"issues\n"
+"POT-Creation-Date: 2024-09-26 21:54+0200\n"
+"PO-Revision-Date: 2011-10-10 17:43+0000\n"
+"Last-Translator: Junghee Lee <daemul72@gmail.com>, 2021,2024\n"
+"Language-Team: Korean (http://app.transifex.com/audacious/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"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: src/aac-raw/aac.cc:18
+#: src/aac/aac.cc:19
 msgid "AAC (Raw) Decoder"
 msgstr "AAC (Raw) 디코더"
 
-#: src/adplug/adplug-xmms.cc:42
+#: src/adplug/adplug-xmms.cc:70
 msgid "AdPlug (AdLib Player)"
 msgstr "AdPlug (AdLib 재생기)"
 
-#: src/adplug/adplug-xmms.cc:156 src/modplug/modplugbmp.cc:335
-#: src/psf/plugin.cc:138 src/vtx/vtx.cc:87 src/xsf/plugin.cc:113
+#: src/adplug/adplug-xmms.cc:167 src/modplug/modplugbmp.cc:321
+#: src/psf/plugin.cc:161 src/vtx/vtx.cc:89 src/xsf/plugin.cc:204
 msgid "sequenced"
 msgstr "순차"
 
-#: src/alarm/alarm.cc:55 src/alarm/interface.cc:82
-msgid "Alarm"
-msgstr "알림"
-
-#: src/alarm/alarm.cc:782
-msgid "Set Alarm ..."
-msgstr "알림 설정..."
-
-#: src/alarm/alarm.cc:810
-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/interface.cc: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.cc: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.cc: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.cc:81
-msgid "This is your wakeup call."
-msgstr "기상 알림입니다."
-
-#: src/alarm/interface.cc:99
-msgid "Your reminder for today is..."
-msgstr "오늘 약속은..."
-
-#: src/alarm/interface.cc:101 src/alarm/interface.cc:386
-msgid "Reminder"
-msgstr "약속 알리미"
-
-#: src/alarm/interface.cc:132
-msgid "Monday"
-msgstr "월요일"
-
-#: src/alarm/interface.cc:132
-msgid "Tuesday"
-msgstr "화요일"
-
-#: src/alarm/interface.cc:132
-msgid "Wednesday"
-msgstr "수요일"
-
-#: src/alarm/interface.cc:133
-msgid "Thursday"
-msgstr "목요일"
-
-#: src/alarm/interface.cc:133
-msgid "Friday"
-msgstr "금요일"
-
-#: src/alarm/interface.cc:133
-msgid "Saturday"
-msgstr "토요일"
-
-#: src/alarm/interface.cc:133
-msgid "Sunday"
-msgstr "일요일"
-
-#: src/alarm/interface.cc:171 src/alarm/interface.cc:230
-#: src/alarm/interface.cc:245
-msgid "Time"
-msgstr "시계"
-
-#: src/alarm/interface.cc:178
-msgid "Alarm at (default):"
-msgstr "다음 시간에 알림(기본):"
-
-#: src/alarm/interface.cc:200
-msgid "h"
-msgstr "시"
-
-#: src/alarm/interface.cc:203
-msgid "Quiet after:"
-msgstr "다음 시간후 조용히:"
-
-#: src/alarm/interface.cc:215
-msgid "hours"
-msgstr "시간"
-
-#: src/alarm/interface.cc:226
-msgid "minutes"
-msgstr "분"
-
-#: src/alarm/interface.cc:235
-msgid "Choose the days for the alarm to come on"
-msgstr "알림을 울릴 날짜를 선택합니다"
-
-#: src/alarm/interface.cc:242
-msgid "Day"
-msgstr "요일"
-
-#: src/alarm/interface.cc:259 src/bs2b/plugin.cc:130
-#: src/skins/preset-list.cc:434 src/skins/preset-list.cc:440
-msgid "Default"
-msgstr "기본값"
+#: src/adplug/adplug-xmms.cc:349 src/sid/xs_config.cc:61
+msgid "Output"
+msgstr "출력"
 
-#: src/alarm/interface.cc:288
-msgid "Days"
-msgstr "일"
-
-#: src/alarm/interface.cc:297
-msgid "Fading"
-msgstr "점진적 음량 변화 시간"
-
-#: src/alarm/interface.cc:305 src/console/plugin.cc:41
-#: src/crossfade/crossfade.cc:53 src/crossfade/crossfade.cc:59
-#: src/gtkui/settings.cc:49 src/lirc/lirc.cc:397 src/sid/xs_config.cc:85
-#: src/sid/xs_config.cc:94 src/sid/xs_config.cc:103
-msgid "seconds"
-msgstr "초"
+#: src/adplug/adplug-xmms.cc:350
+msgid "OPL Emulator:"
+msgstr "OPL 에뮬레이터:"
+
+#: src/adplug/adplug-xmms.cc:353 src/amidiplug/i_configure.cc:153
+#: src/console/plugin.cc:45 src/filewriter/filewriter.cc:481
+#: src/sid/xs_config.cc:65 src/xsf/plugin.cc:446
+msgid "Sample rate:"
+msgstr "샘플 레이트:"
 
-#: src/alarm/interface.cc:312 src/alarm/interface.cc:353
-msgid "Volume"
-msgstr "음량"
-
-#: src/alarm/interface.cc:317
-msgid "Start at"
-msgstr "시작"
-
-#: src/alarm/interface.cc:333
-msgid "Final"
-msgstr "끝"
-
-#: src/alarm/interface.cc:346
-msgid "Current"
-msgstr "현재"
-
-#: src/alarm/interface.cc:359
-msgid "Additional Command"
-msgstr "추가 명령"
+#: src/adplug/adplug-xmms.cc:354 src/amidiplug/i_configure.cc:155
+#: src/bs2b/plugin.cc:141 src/console/plugin.cc:47
+#: src/modplug/plugin_main.cc:77 src/resample/resample.cc:201
+#: src/resample/resample.cc:207 src/resample/resample.cc:211
+#: src/resample/resample.cc:215 src/resample/resample.cc:219
+#: src/resample/resample.cc:223 src/resample/resample.cc:227
+#: src/resample/resample.cc:231 src/resample/resample.cc:235
+#: src/resample/resample.cc:239 src/resample/resample.cc:243
+#: src/sid/xs_config.cc:67 src/soxr/sox-resampler.cc:205
+msgid "Hz"
+msgstr "Hz"
 
-#: src/alarm/interface.cc:365 src/alarm/interface.cc:391
-msgid "enable"
-msgstr "활성화"
+#: src/adplug/adplug-xmms.cc:355 src/gtkui/settings.cc:55
+#: src/modplug/plugin_main.cc:105 src/qtui/settings.cc:85
+#: src/skins-qt/skins_cfg.cc:302 src/skins/skins_cfg.cc:284
+msgid "Miscellaneous"
+msgstr "기타"
 
-#: src/alarm/interface.cc:372
-msgid "Playlist (optional)"
-msgstr "재생 목록(선택)"
-
-#: src/alarm/interface.cc:379
-msgid "Select a playlist"
-msgstr "재생 목록 선택하기"
-
-#: src/alarm/interface.cc:399
-msgid "Options"
-msgstr "옵션"
-
-#: src/alarm/interface.cc:404
-msgid "What do these options mean?"
-msgstr "이 옵션은 무엇을 의미하나요?"
-
-#: src/alarm/interface.cc:420
-msgid "Help"
-msgstr "도움말"
+#: src/adplug/adplug-xmms.cc:356
+msgid "Repeat song in endless loop"
+msgstr "무한 루프에서 노래 반복"
 
-#: src/albumart/albumart.cc:31
+#: src/albumart/albumart.cc:31 src/albumart-qt/albumart.cc:35
 msgid "Album Art"
 msgstr "앨범 표지"
 
-#: src/albumart-qt/albumart.cc:33
-msgid "Album Art (Qt)"
-msgstr "앨범 아트(Qt)"
-
-#: src/alsa/alsa.h:70
+#: src/alsa/alsa.h:64
 msgid "ALSA Output"
 msgstr "ALSA 출력"
 
@@ -321,15 +99,15 @@
 "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"
+"Audacious용 ALSA 출력 플러그인\n"
+"저작권 2009-2012 John Lindgren\n"
 "\n"
-"ALSA 메뉴얼이 충분히 도움이 되지 않았을 때, 코드 참고서가 되어준 ALSA 출력 플"
-"러그인 NG의 저작자인 William Pitcock에게 감사드립니다."
+"ALSA 매뉴얼이 충분하지 않을 때 코드가 참조 역할을 한 ALSA Output Plugin NG의 "
+"작성자인 William Pitcock에게 감사드립니다."
 
 #: src/alsa/config.cc:61
 msgid "(no description)"
-msgstr ""
+msgstr "(설명 없음)"
 
 #: src/alsa/config.cc:166
 msgid "Default PCM device"
@@ -351,11 +129,11 @@
 msgid "Mixer element:"
 msgstr "음량 조절기 요소:"
 
-#: src/amidi-plug/amidi-plug.cc:41
+#: src/amidiplug/amidi-plug.cc:42
 msgid "AMIDI-Plug (MIDI Player)"
 msgstr "AMIDI-Plug (MIDI 재생기)"
 
-#: src/amidi-plug/amidi-plug.cc:437
+#: src/amidiplug/amidi-plug.cc:445
 msgid ""
 "AMIDI-Plug\n"
 "modular MIDI music player\n"
@@ -377,158 +155,181 @@
 "Tony Vroon\n"
 "for the good help with alpha testing"
 msgstr ""
+"AMIDI-Plug\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"
+"ALSA API에 대해 자세히 알아보기 위해 alsa-lib\n"
+"문서들과 함께 정말 유용했습니다.\n"
+"\n"
+"Alfredo Spadafina\n"
+"멋진 미디 키보드 로고\n"
+"\n"
+"Tony Vroon\n"
+"알파 테스트에 대한 충분한 도움"
 
-#: src/amidi-plug/i_configure.cc:94
+#: src/amidiplug/i_configure.cc:94
 msgid "Override default gain:"
 msgstr "기본 게인 값 중복 적용:"
 
-#: src/amidi-plug/i_configure.cc:102
+#: src/amidiplug/i_configure.cc:102
 msgid "Override default polyphony:"
 msgstr "기본 화성 중복 적용:"
 
-#: src/amidi-plug/i_configure.cc:110
+#: src/amidiplug/i_configure.cc:110
 msgid "Override default reverb:"
 msgstr "기본 리버브 중복 적용:"
 
-#: src/amidi-plug/i_configure.cc:112 src/amidi-plug/i_configure.cc:120
+#: src/amidiplug/i_configure.cc:112 src/amidiplug/i_configure.cc:120
 msgid "On"
 msgstr "켬"
 
-#: src/amidi-plug/i_configure.cc:118
+#: src/amidiplug/i_configure.cc:118
 msgid "Override default chorus:"
 msgstr "기본 코러스 중복 적용:"
 
-#: src/amidi-plug/i_configure.cc:128 src/console/plugin.cc:29
+#: src/amidiplug/i_configure.cc:128 src/console/plugin.cc:29
 msgid "Playback"
-msgstr "재생"
+msgstr "플레이백"
 
-#: src/amidi-plug/i_configure.cc:129
+#: src/amidiplug/i_configure.cc:129
 msgid "Transpose:"
 msgstr "트랜스포스:"
 
-#: src/amidi-plug/i_configure.cc:131
+#: src/amidiplug/i_configure.cc:131 src/speedpitch/speed-pitch.cc:257
 msgid "semitones"
-msgstr ""
+msgstr "반음"
 
-#: src/amidi-plug/i_configure.cc:132
+#: src/amidiplug/i_configure.cc:132
 msgid "Drum shift:"
 msgstr "드럼 쉬프트:"
 
-#: src/amidi-plug/i_configure.cc:134
+#: src/amidiplug/i_configure.cc:134
 msgid "note numbers"
-msgstr ""
+msgstr "메모 번호"
 
-#: src/amidi-plug/i_configure.cc:135
+#: src/amidiplug/i_configure.cc:135
 msgid "Skip leading silence"
-msgstr ""
+msgstr "앞부분 무음 부분 건너뛰기"
 
-#: src/amidi-plug/i_configure.cc:137
+#: src/amidiplug/i_configure.cc:137
 msgid "Skip trailing silence"
-msgstr ""
+msgstr "뒷부분 무음 부분 건너뛰기"
 
-#: src/amidi-plug/i_configure.cc:141
+#: src/amidiplug/i_configure.cc:141
 msgid "SoundFont"
 msgstr "사운드 폰트"
 
-#: src/amidi-plug/i_configure.cc:143
+#: src/amidiplug/i_configure.cc:148
 msgid "Synthesizer"
 msgstr "신디사이저"
 
-#: src/amidi-plug/i_configure.cc:148 src/console/plugin.cc:45
-#: src/sid/xs_config.cc:65
-msgid "Sample rate:"
-msgstr ""
-
-#: src/amidi-plug/i_configure.cc:150 src/bs2b/plugin.cc:141
-#: src/console/plugin.cc:47 src/modplug/plugin_main.cc:78
-#: src/resample/resample.cc:201 src/resample/resample.cc:207
-#: src/resample/resample.cc:211 src/resample/resample.cc:215
-#: src/resample/resample.cc:219 src/resample/resample.cc:223
-#: src/resample/resample.cc:227 src/resample/resample.cc:231
-#: src/resample/resample.cc:235 src/resample/resample.cc:239
-#: src/resample/resample.cc:243 src/sid/xs_config.cc:67
-#: src/sox-resampler/sox-resampler.cc:163
-msgid "Hz"
-msgstr "Hz"
-
-#: src/amidi-plug/i_configure-fluidsynth.cc:52
+#: src/amidiplug/i_configure-fluidsynth.cc:58
+#: src/amidiplug/i_configure-fluidsynth.cc:527
 msgid "AMIDI-Plug - select SoundFont file"
 msgstr "AMIDI-Plug - 사운드 폰트 파일 선택"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:55 src/filewriter/mp3.cc:658
+#: src/amidiplug/i_configure-fluidsynth.cc:61
 msgid "_Cancel"
 msgstr "취소(_C)"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:56
+#: src/amidiplug/i_configure-fluidsynth.cc:62
 msgid "_Open"
 msgstr "열기(_O)"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:225 src/gtkui/columns.cc:46
+#: src/amidiplug/i_configure-fluidsynth.cc:233
+#: src/amidiplug/i_configure-fluidsynth.cc:461
 msgid "File name"
 msgstr "파일 이름"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:229
+#: src/amidiplug/i_configure-fluidsynth.cc:237
+#: src/amidiplug/i_configure-fluidsynth.cc:464
 msgid "Size (bytes)"
 msgstr "크기(바이트)"
 
-#: src/amidi-plug/i_fileinfo.cc:163
+#: src/amidiplug/i_fileinfo.cc:184
 msgid "Name:"
 msgstr "이름:"
 
-#: src/amidi-plug/i_fileinfo.cc:181
+#: src/amidiplug/i_fileinfo.cc:202
 msgid " MIDI Info "
 msgstr " 미디 정보 "
 
-#: src/amidi-plug/i_fileinfo.cc:195
+#: src/amidiplug/i_fileinfo.cc:216
 msgid "Format:"
 msgstr "형식:"
 
-#: src/amidi-plug/i_fileinfo.cc:198
+#: src/amidiplug/i_fileinfo.cc:219
 msgid "Length (msec):"
 msgstr "길이(밀리초):"
 
-#: src/amidi-plug/i_fileinfo.cc:201
+#: src/amidiplug/i_fileinfo.cc:222
 msgid "No. of Tracks:"
 msgstr "트랙 번호:"
 
-#: src/amidi-plug/i_fileinfo.cc:207
+#: src/amidiplug/i_fileinfo.cc:228
 msgid "variable"
 msgstr "가변"
 
-#: src/amidi-plug/i_fileinfo.cc:209
+#: src/amidiplug/i_fileinfo.cc:230
 msgid "BPM:"
 msgstr "빠르기(BPM):"
 
-#: src/amidi-plug/i_fileinfo.cc:217
+#: src/amidiplug/i_fileinfo.cc:238
 msgid "BPM (wavg):"
 msgstr "빠르기(BPM, wavg):"
 
-#: src/amidi-plug/i_fileinfo.cc:220
+#: src/amidiplug/i_fileinfo.cc:241
 msgid "Time Div:"
 msgstr "박자:"
 
-#: src/amidi-plug/i_fileinfo.cc:231
+#: src/amidiplug/i_fileinfo.cc:252
 msgid " MIDI Comments and Lyrics "
-msgstr " 미디 주석과 가사 "
+msgstr " 미디 주석 및 가사 "
 
-#: src/amidi-plug/i_fileinfo.cc:278
+#: src/amidiplug/i_fileinfo.cc:299
 msgid "* no comments available in this MIDI file *"
 msgstr "* 이 미디 파일에는 주석이 없습니다 *"
 
-#: src/amidi-plug/i_fileinfo.cc:290
+#: src/amidiplug/i_fileinfo.cc:311
 msgid "* no lyrics available in this MIDI file *"
 msgstr "* 이 미디 파일에는 가사가 없습니다 *"
 
-#: src/amidi-plug/i_fileinfo.cc:300 src/filewriter/vorbis.cc:197
-#: src/ladspa/plugin.cc:416
+#: src/amidiplug/i_fileinfo.cc:321 src/ladspa/plugin.cc:418
+#: src/ui-common/dialogs-qt.cc:32
 msgid "_Close"
 msgstr "닫기(_C)"
 
-#: src/amidi-plug/i_fileinfo.cc:325
+#: src/amidiplug/i_fileinfo.cc:346
 msgid " (invalid UTF-8)"
 msgstr " (잘못된 UTF-8)"
 
-#: src/aosd/aosd.cc:32
+#: src/ampache/ampache.cc:33
+msgid "Ampache Browser"
+msgstr "Ampache 브라우저"
+
+#: src/ampache/ampache.cc:46
+msgid ""
+"Ampache Browser for Audacious\n"
+"http://ampache-browser.org/\n"
+"\n"
+"Copyright (C) Róbert Čerňanský and John Lindgren\n"
+"License: GNU GPLv3"
+msgstr ""
+"Audacious용 Ampache 브라우저\n"
+"http://ampache-browser.org/\n"
+"\n"
+"저작권 (C) Róbert Čerňanský 및 John Lindgren\n"
+"라이선스: GNU GPLv3"
+
+#: src/aosd/aosd.cc:31
 msgid ""
 "Audacious OSD\n"
 "http://www.develia.org/projects.php?p=audacious#aosd\n"
@@ -538,7 +339,7 @@
 "Based in part on Evan Martin's Ghosd library:\n"
 "http://neugierig.org/software/ghosd/"
 msgstr ""
-"오데이셔스 OSD\n"
+"Audacious OSD\n"
 "http://www.develia.org/projects.php?p=audacious#aosd\n"
 "\n"
 "Giacomo Lozito <james@develia.org>가 작성\n"
@@ -548,7 +349,7 @@
 
 #: src/aosd/aosd.h:37
 msgid "AOSD (On-Screen Display)"
-msgstr "AOSD (화면에 표시)"
+msgstr "AOSD (화면 디스플레이)"
 
 #: src/aosd/aosd_style.cc:54
 msgid "Rectangle"
@@ -556,136 +357,136 @@
 
 #: src/aosd/aosd_style.cc:59
 msgid "Rounded Rectangle"
-msgstr "모서리가 둥근 사각형"
+msgstr "둥근 사각형"
 
 #: src/aosd/aosd_style.cc:64
 msgid "Concave Rectangle"
 msgstr "오목한 사각형"
 
-#: src/aosd/aosd_style.cc:69
+#: src/aosd/aosd_style.cc:69 src/openmpt/mptwrap.h:50 src/xsf/plugin.cc:436
 msgid "None"
 msgstr "없음"
 
-#: src/aosd/aosd_trigger.cc:50
+#: src/aosd/aosd_trigger.cc:49
 msgid "Playback Start"
-msgstr "재생 시작"
+msgstr "플레이백 시작"
 
-#: src/aosd/aosd_trigger.cc:51
+#: src/aosd/aosd_trigger.cc:50
 msgid "Triggers OSD when a playlist entry is played."
-msgstr "재생 목록의 항목을 재생할 때 OSD를 시작합니다."
+msgstr "재생목록의 항목을 재생할 때 OSD를 시작합니다."
 
-#: src/aosd/aosd_trigger.cc:56
+#: src/aosd/aosd_trigger.cc:55
 msgid "Title Change"
-msgstr "제목 바꾸기"
+msgstr "제목 변경"
 
-#: src/aosd/aosd_trigger.cc:57
+#: src/aosd/aosd_trigger.cc:56
 msgid "Triggers OSD when the song title changes (for internet streams)."
-msgstr ""
+msgstr "노래 제목이 변경되면 OSD를 트리거합니다(인터넷 스트림의 경우)."
 
-#: src/aosd/aosd_trigger.cc:62
+#: src/aosd/aosd_trigger.cc:61
 msgid "Pause On"
-msgstr "일시 정지 활성화"
+msgstr "일시정지 켜기"
 
-#: src/aosd/aosd_trigger.cc:63
+#: src/aosd/aosd_trigger.cc:62
 msgid "Triggers OSD when playback is paused."
-msgstr "재생을 멈추었을 때 OSD를 시작합니다."
+msgstr "플레이백이 일시정지되면 OSD를 트리거합니다."
 
-#: src/aosd/aosd_trigger.cc:68
+#: src/aosd/aosd_trigger.cc:67
 msgid "Pause Off"
-msgstr "일시 정지 활성화"
+msgstr "일시정지 끄기"
 
-#: src/aosd/aosd_trigger.cc:69
+#: src/aosd/aosd_trigger.cc:68
 msgid "Triggers OSD when playback is unpaused."
-msgstr "멈춰진 재생 상태에서 복귀할 때 OSD를 시작합니다."
+msgstr "플레이백이 일시정지 해제되면 OSD를 트리거합니다."
 
-#: src/aosd/aosd_ui.cc:163
+#: src/aosd/aosd_ui.cc:204
 msgid "Placement"
 msgstr "위치"
 
-#: src/aosd/aosd_ui.cc:196
+#: src/aosd/aosd_ui.cc:241
 msgid "Relative X offset:"
 msgstr "상대 X 오프셋:"
 
-#: src/aosd/aosd_ui.cc:203
+#: src/aosd/aosd_ui.cc:245
 msgid "Relative Y offset:"
 msgstr "상대 Y 오프셋:"
 
-#: src/aosd/aosd_ui.cc:210
+#: src/aosd/aosd_ui.cc:249
 msgid "Max OSD width:"
-msgstr "최대 OSD 폭:"
+msgstr "최대 OSD 너비:"
 
-#: src/aosd/aosd_ui.cc:221
+#: src/aosd/aosd_ui.cc:281
 msgid "Multi-Monitor options"
 msgstr "다중 모니터 옵션"
 
-#: src/aosd/aosd_ui.cc:225
+#: src/aosd/aosd_ui.cc:285
 msgid "Display OSD using:"
-msgstr "OSD 사용중 표시:"
+msgstr "OSD 사용중 보이기:"
 
-#: src/aosd/aosd_ui.cc:227
+#: src/aosd/aosd_ui.cc:287
 msgid "all monitors"
 msgstr "모든 모니터"
 
-#: src/aosd/aosd_ui.cc:230
+#: src/aosd/aosd_ui.cc:290
 #, c-format
 msgid "monitor %i"
 msgstr "%i번 모니터 "
 
-#: src/aosd/aosd_ui.cc:282
+#: src/aosd/aosd_ui.cc:342
 msgid "Timing (ms)"
 msgstr "타이밍(밀리초)"
 
-#: src/aosd/aosd_ui.cc:287
+#: src/aosd/aosd_ui.cc:347
 msgid "Display:"
 msgstr "디스플레이:"
 
-#: src/aosd/aosd_ui.cc:292
+#: src/aosd/aosd_ui.cc:352
 msgid "Fade in:"
 msgstr "나타내기 시간:"
 
-#: src/aosd/aosd_ui.cc:297
+#: src/aosd/aosd_ui.cc:357
 msgid "Fade out:"
 msgstr "사라지기 시간:"
 
-#: src/aosd/aosd_ui.cc:361
+#: src/aosd/aosd_ui.cc:442
 msgid "Fonts"
 msgstr "글꼴"
 
-#: src/aosd/aosd_ui.cc:368
+#: src/aosd/aosd_ui.cc:449
 #, c-format
 msgid "Font %i:"
 msgstr "%i번 글꼴:"
 
-#: src/aosd/aosd_ui.cc:382
+#: src/aosd/aosd_ui.cc:466
 msgid "Shadow"
 msgstr "섀도우"
 
-#: src/aosd/aosd_ui.cc:486
+#: src/aosd/aosd_ui.cc:589
 msgid "Render Style"
 msgstr "표현 방식"
 
-#: src/aosd/aosd_ui.cc:502
+#: src/aosd/aosd_ui.cc:605
 msgid "Colors"
 msgstr "색"
 
-#: src/aosd/aosd_ui.cc:513
+#: src/aosd/aosd_ui.cc:616
 #, c-format
 msgid "Color %i:"
 msgstr "%i번 색:"
 
-#: src/aosd/aosd_ui.cc:600
+#: src/aosd/aosd_ui.cc:714
 msgid "Enable trigger"
 msgstr "트리거 활성화"
 
-#: src/aosd/aosd_ui.cc:627
+#: src/aosd/aosd_ui.cc:741
 msgid "Event"
 msgstr "이벤드"
 
-#: src/aosd/aosd_ui.cc:655
+#: src/aosd/aosd_ui.cc:768
 msgid "Composite manager detected"
 msgstr "합성 관리자를 삭제했습니다"
 
-#: src/aosd/aosd_ui.cc:662
+#: src/aosd/aosd_ui.cc:775
 msgid ""
 "Composite manager not detected;\n"
 "unless you know that you have one running, please activate a composite "
@@ -695,80 +496,159 @@
 "적어도 하나가 실행중인지 알지 못한다면, 합성 관리자를 활성화 해 주십시오. 그"
 "렇지 않으면 OSD가 제대로 동작하지 않습니다"
 
-#: src/aosd/aosd_ui.cc:670
+#: src/aosd/aosd_ui.cc:783
 msgid "Composite manager not required for fake transparency"
 msgstr "투명도 속이기에 합성 관리자가 필요하지 않습니다"
 
-#: src/aosd/aosd_ui.cc:706
+#: src/aosd/aosd_ui.cc:820
 msgid "Transparency"
 msgstr "투명도"
 
-#: src/aosd/aosd_ui.cc:712
+#: src/aosd/aosd_ui.cc:826
 msgid "Fake transparency"
 msgstr "투명도 속이기"
 
-#: src/aosd/aosd_ui.cc:714
+#: src/aosd/aosd_ui.cc:828
 msgid "Real transparency (requires X Composite Ext.)"
 msgstr "실제 투명도 ( X 합성 확장이 필요합니다 )"
 
-#: src/aosd/aosd_ui.cc:756
+#: src/aosd/aosd_ui.cc:875
 msgid "Composite extension not loaded"
 msgstr "합성 확장을 불러오지 않았습니다"
 
-#: src/aosd/aosd_ui.cc:764
-msgid "Composite extension not available"
-msgstr "합성 확장을 사용할 수 없습니다"
-
-#: src/aosd/aosd_ui.cc:781
+#: src/aosd/aosd_ui.cc:892
 #, c-format
 msgid "Audacious OSD"
-msgstr "오데이셔스 OSD"
+msgstr "Audacious OSD"
 
-#: src/aosd/aosd_ui.cc:844
+#: src/aosd/aosd_ui.cc:955
 msgid "Position"
 msgstr "위치"
 
-#: src/aosd/aosd_ui.cc:849
+#: src/aosd/aosd_ui.cc:960
 msgid "Animation"
 msgstr "애니메이션"
 
-#: src/aosd/aosd_ui.cc:854
+#: src/aosd/aosd_ui.cc:965
 msgid "Text"
 msgstr "글자"
 
-#: src/aosd/aosd_ui.cc:859
+#: src/aosd/aosd_ui.cc:970
 msgid "Decoration"
 msgstr "장식"
 
-#: src/aosd/aosd_ui.cc:864
+#: src/aosd/aosd_ui.cc:975
 msgid "Trigger"
 msgstr "트리거"
 
-#: src/aosd/aosd_ui.cc:869
+#: src/aosd/aosd_ui.cc:980 src/streamtuner/shoutcast-model.cc:202
 msgid "Misc"
 msgstr "기타"
 
-#: src/aosd/aosd_ui.cc:878
+#: src/aosd/aosd_ui.cc:989
 msgid "Test"
-msgstr ""
+msgstr "시험"
 
 #: src/asx3/asx3.cc:35
 msgid "ASXv3 Playlists"
-msgstr "ASXv3 재생 목록"
+msgstr "ASXv3 재생목록"
 
 #: src/asx/asx.cc:33
 msgid "ASXv1/ASXv2 Playlists"
-msgstr "ASXv1/ASXv2 재생 목록"
+msgstr "ASXv1/ASXv2 재생목록"
 
 #: src/audpl/audpl.cc:33
 msgid "Audacious Playlists (audpl)"
-msgstr "오데이셔스 재생 목록(audpl)"
+msgstr "Audacious 재생목록(audpl)"
 
-#: src/blur_scope/blur_scope.cc:42
+#: src/background_music/background_music.cc:24
+msgid "Background music"
+msgstr "배경 음악"
+
+#: src/background_music/background_music.cc:25
+msgid "Target level:"
+msgstr "목표 레벨:"
+
+#: src/background_music/background_music.cc:28
+#: src/background_music/background_music.cc:33
+#: src/silence-removal/silence-removal.cc:70
+msgid "dB"
+msgstr "dB"
+
+#: src/background_music/background_music.cc:29
+msgid "Maximum amplification:"
+msgstr "최대 증폭:"
+
+#: src/background_music/background_music.cc:34 src/mpg123/mpg123.cc:81
+msgid "Advanced"
+msgstr "고급"
+
+#: src/background_music/background_music.cc:36
+msgid "Slow detection weight:"
+msgstr "느린 감지 가중치:"
+
+#: src/background_music/background_music.cc:39
+msgid "Hint"
+msgstr "힌트"
+
+#: src/background_music/background_music.cc:41
+msgid ""
+"Slow detection weight is the relative weight\n"
+"of a long term average detection when compared\n"
+"to the actual, faster loudness detection.\n"
+"A value of zero gives a more radio-like sound\n"
+"where soft passages get \"pulled up\" more quickly,\n"
+"a value of two makes the sound feel less compressed."
+msgstr ""
+"느린 감지 가중치는 실제보다 더 빠른 음량 감지와\n"
+"비교했을 때 장기 평균 감지의 상대적 가중치입니다.\n"
+"값이 0이면 부드러운 부분이 더 빨리 \"급상승되는\"\n"
+"라디오 같은 사운드를 제공하고, 값이 2이면 사운드가\n"
+"덜 압축된 느낌을 줍니다."
+
+#: src/background_music/background_music.cc:52
+msgid ""
+"Background Music Plugin for Audacious\n"
+"Copyright 2023;2024 Michel Fleur\n"
+"\n"
+"Controls the volume to make the sound equally loud within and between "
+"tracks.\n"
+" It uses accurate loudness measurement and tries to make the volume changes "
+"sound natural without audible peaks, yet without lowering the volume before "
+"a peak in advance."
+msgstr ""
+"Audacious용 배경 음악 플러그인\n"
+"Copyright 2023;2024 Michel Fleur\n"
+"\n"
+"트랙 안과 트랙 사이에서 소리가 균일하게 커지도록 볼륨을 제어합니다.\n"
+" 정확한 음량 측정을 사용하고 피크가 발생하기 전에 미리 볼륨을 낮추지 않으면"
+"서 볼륨 변화가 자연스럽게 들리도록 시도합니다."
+
+#: src/background_music/background_music.cc:61
+msgid "Background Music"
+msgstr "배경 음악"
+
+#: src/bitcrusher/bitcrusher.cc:33
+msgid "Bitcrusher"
+msgstr "비트크러셔"
+
+#: src/bitcrusher/bitcrusher.cc:34
+msgid "Bit Depth:"
+msgstr "비트 깊이:"
+
+#: src/bitcrusher/bitcrusher.cc:37
+msgid "Downsample ratio:"
+msgstr "다운샘플 비율:"
+
+#: src/bitcrusher/bitcrusher.cc:48
+msgid "Bitcrusher"
+msgstr "비트크러셔"
+
+#: src/blur_scope/blur_scope.cc:40 src/blur_scope-qt/blur_scope.cc:45
 msgid "Color"
 msgstr "색"
 
-#: src/blur_scope/blur_scope.cc:58
+#: src/blur_scope/blur_scope.cc:56 src/blur_scope-qt/blur_scope.cc:158
 msgid "Blur Scope"
 msgstr "흐림처리 스코프"
 
@@ -780,9 +660,13 @@
 msgid "Presets:"
 msgstr "설정 목록:"
 
+#: src/bs2b/plugin.cc:130
+msgid "Default"
+msgstr "기본값"
+
 #: src/bs2b/plugin.cc:136
 msgid "Feed level:"
-msgstr "피드 수준:"
+msgstr "피드 레벨:"
 
 #: src/bs2b/plugin.cc:138
 msgid "x1/10 dB"
@@ -792,15 +676,15 @@
 msgid "Cut frequency:"
 msgstr "주파수 잘라내기:"
 
-#: src/cairo-spectrum/cairo-spectrum.cc:41
+#: src/cairo-spectrum/cairo-spectrum.cc:42 src/qt-spectrum/qt-spectrum.cc:107
 msgid "Spectrum Analyzer"
 msgstr "스펙트럼 분석기"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:72
+#: src/cdaudio/cdaudio-ng.cc:74
 msgid "Audio CD Plugin"
 msgstr "오디오 CD 플러그인"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:121
+#: src/cdaudio/cdaudio-ng.cc:121
 msgid ""
 "Copyright (C) 2007-2012 Calin Crisan <ccrisan@gmail.com> and others.\n"
 "\n"
@@ -811,141 +695,141 @@
 "\n"
 "This was a Google Summer of Code 2007 project."
 msgstr ""
-"Copyright (C) 2007-2012 Calin Crisan <ccrisan@gmail.com> and others.\n"
+"저작권 (C) 2007-2012 Calin Crisan <ccrisan@gmail.com> 및 다른 분들.\n"
 "\n"
-"libcdio 개발자 <http://www.gnu.org/software/libcdio/>과\n"
+"libcdio 개발자 <http://www.gnu.org/software/libcdio/>와\n"
 "libcddb 개발자 <http://libcddb.sourceforge.net/> 여러분께 감사드립니다.\n"
 "\n"
-"또한 저를 지도해준 Tony Vroon 에게 감사드립니다.\n"
+"또한 저를 멘토링하고 안내해 주신 Tony Vroon에게도 감사드립니다.\n"
 "\n"
-"이 프로젝트는 GSoC 2007에서 만들었습니다."
+"이것은 Google Summer of Code 2007 프로젝트였습니다."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:137
+#: src/cdaudio/cdaudio-ng.cc:140
 msgid "Device"
 msgstr "장치"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:138
+#: src/cdaudio/cdaudio-ng.cc:141
 msgid "Read speed:"
 msgstr "읽기 속도:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:141
+#: src/cdaudio/cdaudio-ng.cc:144
 msgid "Override device:"
 msgstr "장치 대체:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:143
+#: src/cdaudio/cdaudio-ng.cc:146
 msgid "Metadata"
 msgstr "메타데이터"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:144
+#: src/cdaudio/cdaudio-ng.cc:147
 msgid "Use CD-Text"
 msgstr "CD-Text 사용하기"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:146
+#: src/cdaudio/cdaudio-ng.cc:150
 msgid "Use CDDB"
 msgstr "CDDB 사용하기"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:148
+#: src/cdaudio/cdaudio-ng.cc:152
 msgid "Use HTTP instead of CDDBP"
 msgstr "CDDBP 대신 HTTP 사용하기"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:151
+#: src/cdaudio/cdaudio-ng.cc:155
 msgid "Server:"
 msgstr "서버:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:155
+#: src/cdaudio/cdaudio-ng.cc:159
 msgid "Path:"
 msgstr "경로:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:159
+#: src/cdaudio/cdaudio-ng.cc:163
 msgid "Port:"
 msgstr "포트:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:246
+#: src/cdaudio/cdaudio-ng.cc:228
 msgid "Failed to initialize cdio subsystem."
 msgstr "cdio 하위 시스템을 초기화하는데 실패했습니다."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:281
+#: src/cdaudio/cdaudio-ng.cc:260
 #, c-format
 msgid "Invalid URI %s."
 msgstr "잘못된 %s URI 입니다."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:283
+#: src/cdaudio/cdaudio-ng.cc:262
 #, c-format
 msgid "Track %d not found."
 msgstr "%d 트랙이 없습니다."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:285
+#: src/cdaudio/cdaudio-ng.cc:264
 #, c-format
 msgid "Track %d is a data track."
 msgstr "%d 트랙은 데이터 트랙입니다."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:360
+#: src/cdaudio/cdaudio-ng.cc:339
 msgid "Error reading audio CD."
 msgstr "오디오 CD 읽는중 오류가 발생했습니다."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:429
+#: src/cdaudio/cdaudio-ng.cc:410
 msgid "Audio CD"
 msgstr "오디오 CD"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:460 src/cdaudio-ng/cdaudio-ng.cc:469
+#: src/cdaudio/cdaudio-ng.cc:446 src/cdaudio/cdaudio-ng.cc:455
 #, c-format
 msgid "Failed to open CD device %s."
 msgstr "%s CD 장치를 여는데 실패했습니다."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:472
+#: src/cdaudio/cdaudio-ng.cc:458
 msgid "No audio capable CD drive found."
 msgstr "오디오를 재생할 수 있는 CD 드라이브가 없습니다."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:497
+#: src/cdaudio/cdaudio-ng.cc:481
+msgid "Drive is empty."
+msgstr "드라이브가 비어 있습니다."
+
+#: src/cdaudio/cdaudio-ng.cc:483
+msgid "Unsupported disk type."
+msgstr "지원하지 않는 디스크 형식입니다."
+
+#: src/cdaudio/cdaudio-ng.cc:507
 msgid "Failed to finish initializing opened CD drive."
 msgstr "열려 있는 CD 드라이브 초기화를 끝내는데 실패했습니다."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:510
+#: src/cdaudio/cdaudio-ng.cc:520
 msgid "Failed to retrieve first/last track number."
 msgstr "첫번째/마지막 트랙 번호를 검색하는데 실패했습니다."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:531
+#: src/cdaudio/cdaudio-ng.cc:541
 #, c-format
 msgid "Cannot read start/end LSN for track %d."
 msgstr "%d번 트랙에 대한 시작/끝 LSN을 읽을 수 없습니다."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:613
-msgid "Failed to create the cddb connection."
-msgstr "cddb 연결을 만드는데 실패했습니다."
+#: src/cdaudio/cdaudio-ng.cc:624
+msgid "Failed to create the CDDB connection."
+msgstr "CDDB 연결을 만들지 못했습니다."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:679
+#: src/cdaudio/cdaudio-ng.cc:690
 msgid "Failed to query the CDDB server"
 msgstr "CDDB 서버에 요청하는데 실패했습니다."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:681
+#: src/cdaudio/cdaudio-ng.cc:692
 #, c-format
 msgid "Failed to query the CDDB server: %s"
 msgstr "CDDB 서버에 요청하는데 실패했습니다: %s"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:705
+#: src/cdaudio/cdaudio-ng.cc:716
 #, c-format
-msgid "Failed to read the cddb info: %s"
-msgstr "cddb 정보를 읽는데 실패했습니다: %s"
-
-#: src/cdaudio-ng/cdaudio-ng.cc:765
-msgid "Drive is empty."
-msgstr "드라이브가 비어 있습니다."
+msgid "Failed to read the CDDB info: %s"
+msgstr "CDDB 정보를 읽지 못했습니다: %s"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:767
-msgid "Unsupported disk type."
-msgstr "지원하지 않는 디스크 형식입니다."
-
-#: src/cd-menu-items/cd-menu-items.cc:35
+#: src/cd-menu-items/cd-menu-items.cc:33
 msgid "Audio CD Menu Items"
 msgstr "오디오 CD 메뉴 항목"
 
-#: src/cd-menu-items/cd-menu-items.cc:47
-msgid "Play CD"
-msgstr "CD 재생"
-
-#: src/cd-menu-items/cd-menu-items.cc:47
-msgid "Add CD"
-msgstr "CD 추가"
+#: src/cd-menu-items/cd-menu-items.cc:45
+msgid "Pla_y CD"
+msgstr "CD 재생(_Y)"
+
+#: src/cd-menu-items/cd-menu-items.cc:45
+msgid "_Add CD"
+msgstr "CD 추가하기(_A)"
 
 #: src/compressor/compressor.cc:45
 msgid "Compression"
@@ -964,6 +848,8 @@
 "Dynamic Range Compression Plugin for Audacious\n"
 "Copyright 2010-2014 John Lindgren"
 msgstr ""
+"Audacious용 다이나믹레인지 플러그인\n"
+"저작권 2010-2014 John Lindgren"
 
 #: src/compressor/compressor.cc:64
 msgid "Dynamic Range Compressor"
@@ -981,7 +867,7 @@
 " Game_Music_Emu 0.5.2 기반 콘솔 음악 디코더 플러그인\n"
 "지원 형식: AY, GBS, GYM, HES, KSS, NSF, NSFE, SAP, SPC, VGM, VGZ\n"
 "\n"
-"오데이셔스 플러그인 작성:\n"
+"Audacious 플러그인 작성:\n"
 "William Pitcock <nenolod@dereferenced.org>\n"
 "Shay Green <gblargg@gmail.com>"
 
@@ -1001,7 +887,14 @@
 msgid "Default song length:"
 msgstr "기본 곡 길이:"
 
-#: src/console/plugin.cc:42 src/modplug/plugin_main.cc:59
+#: src/console/plugin.cc:41 src/crossfade/crossfade.cc:56
+#: src/crossfade/crossfade.cc:62 src/lirc/lirc.cc:395 src/notify/notify.cc:113
+#: src/sid/xs_config.cc:85 src/sid/xs_config.cc:94 src/sid/xs_config.cc:103
+#: src/vumeter-qt/vumeter_qt.cc:39
+msgid "seconds"
+msgstr "초"
+
+#: src/console/plugin.cc:42 src/modplug/plugin_main.cc:58
 msgid "Resampling"
 msgstr "리샘플링"
 
@@ -1025,76 +918,94 @@
 msgid "Game Console Music Decoder"
 msgstr "게임 콘솔 음악 디코더"
 
-#: src/coreaudio/coreaudio.cc:50
+#: src/coreaudio/coreaudio.cc:53
 msgid "CoreAudio output"
-msgstr ""
+msgstr "PulseAudio 출력"
 
-#: src/coreaudio/coreaudio.cc:131
+#: src/coreaudio/coreaudio.cc:155
 msgid ""
 "CoreAudio Output Plugin for Audacious\n"
 "Copyright 2014 William Pitcock\n"
+"Copyright 2017,18 René J.V. Bertin\n"
+" (original code and code adapted from\n"
+" Apple examples, (C) Apple 2013)\n"
 "\n"
 "Based on SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
 msgstr ""
+"Audacious용 CoreAudio 출력 플러그인\n"
+"저작권 2014 William Pitcock\n"
+"저작권 2017,18 René J.V. Bertin\n"
+" (Apple 예제에서 수정한 원본 코드 및 코드, \n"
+" (C) Apple 2013)\n"
+"\n"
+"Audacious용 SDL 출력 플러그인 기반\n"
+"저작권 2010 John Lindgren"
 
-#: src/coreaudio/coreaudio.cc:143
+#: src/coreaudio/coreaudio.cc:171
 msgid "Use exclusive mode"
-msgstr ""
+msgstr "전문가모드 사용하기"
+
+#: src/coreaudio/coreaudio.cc:173
+msgid "Use bit perfect audio (adapt device sampling rate)"
+msgstr "비트 퍼펙트 오디오 사용(장치 샘플링 속도 조정)"
 
-#: src/crossfade/crossfade.cc:44
+#: src/crossfade/crossfade.cc:47
 msgid ""
 "Crossfade Plugin for Audacious\n"
 "Copyright 2010-2014 John Lindgren"
 msgstr ""
+"Audacious용 크로스페이드 플러그인\n"
+"저작권 2010-2014 John Lindgren"
 
-#: src/crossfade/crossfade.cc:48
+#: src/crossfade/crossfade.cc:51
 msgid "Crossfade"
 msgstr "크로스페이드"
 
-#: src/crossfade/crossfade.cc:49
+#: src/crossfade/crossfade.cc:52
 msgid "On automatic song change"
-msgstr ""
+msgstr "자동 곡 변경 시"
 
-#: src/crossfade/crossfade.cc:51 src/crossfade/crossfade.cc:57
+#: src/crossfade/crossfade.cc:54 src/crossfade/crossfade.cc:60
 msgid "Overlap:"
 msgstr "오버랩:"
 
-#: src/crossfade/crossfade.cc:55
+#: src/crossfade/crossfade.cc:58
 msgid "On seek or manual song change"
-msgstr ""
+msgstr "탐색 또는 수동 노래 변경 시"
 
-#: src/crossfade/crossfade.cc:61
+#: src/crossfade/crossfade.cc:64
+msgid "No fade in"
+msgstr "페이드 인 없음"
+
+#: src/crossfade/crossfade.cc:66
+msgid "Use S-curve fade"
+msgstr "S-curve 페이드 사용하기"
+
+#: src/crossfade/crossfade.cc:68
+msgid "S-curve steepness:"
+msgstr "S-curve 가파름:"
+
+#: src/crossfade/crossfade.cc:70
+msgid "(higher is steeper)"
+msgstr "(높을수록 가파름)"
+
+#: src/crossfade/crossfade.cc:72
 msgid "Tip"
-msgstr ""
+msgstr "조언"
 
-#: src/crossfade/crossfade.cc:62
+#: src/crossfade/crossfade.cc:73
 msgid ""
 "For better crossfading, enable\n"
 "the Silence Removal effect."
 msgstr ""
+"더 좋은 크로스 페이딩\n"
+"무음부분 제거"
 
-#: src/crossfade/crossfade.cc:72
+#: src/crossfade/crossfade.cc:83
 msgid "Crossfade"
 msgstr "크로스페이드"
 
-#: src/crossfade/crossfade.cc:161
-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.cc:168
-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/crystalizer/crystalizer.cc:31
 msgid "Crystalizer"
 msgstr "크리스털라이저"
@@ -1107,60 +1018,61 @@
 msgid "Crystalizer"
 msgstr "크리스털라이저"
 
-#: src/cue/cue.cc:37
+#: src/cue/cue.cc:42
 msgid "Cue Sheet Plugin"
 msgstr "큐 시트 플러그인"
 
-#: src/delete-files/delete-files.cc:46 src/delete-files/delete-files.cc:146
+#: src/delete-files/delete-files.cc:53 src/delete-files/delete-files.cc:215
+#: src/delete-files/delete-files.cc:230
 msgid "Delete Files"
-msgstr "파일 삭제"
+msgstr "파일 삭제하기"
+
+#: src/delete-files/delete-files.cc:120
+msgid "No files are selected."
+msgstr "파일이 선택되지 않았습니다."
 
-#: src/delete-files/delete-files.cc:75
+#: src/delete-files/delete-files.cc:125
 #, c-format
-msgid "Error moving %s to trash: %s."
-msgstr "%s을(를) 휴지통으로 이동하는 중 오류: %s."
+msgid "Do you want to move %s to the trash?"
+msgstr "%s을(를) 휴지통으로 이동하시겠습니까?"
 
-#: src/delete-files/delete-files.cc:86
+#: src/delete-files/delete-files.cc:126
 #, c-format
-msgid "Error deleting %s: %s."
-msgstr "%s을(를) 삭제하는 중 오류: %s."
+msgid "Do you want to permanently delete %s?"
+msgstr "%s을(를) 완전히 삭제하시겠습니까?"
 
-#: src/delete-files/delete-files.cc:117
+#: src/delete-files/delete-files.cc:133
 #, c-format
-msgid "Error deleting %s: not a local file."
-msgstr "%s을(를) 삭제하는 중 오류: 로컬 파일이 아닙니다."
+msgid "Do you want to move %d files to the trash?"
+msgstr "%d 파일을 휴지통으로 이동하시겠습니까?"
 
 #: src/delete-files/delete-files.cc:134
-msgid "Do you want to move the selected files to the trash?"
-msgstr "선택한 파일을 휴지통으로 이동하시겠습니까?"
+#, c-format
+msgid "Do you want to permanently delete %d files?"
+msgstr "%d 파일을 완전히 삭제하시겠습니까?"
 
-#: src/delete-files/delete-files.cc:135
-msgid "Move to Trash"
+#: src/delete-files/delete-files.cc:146
+msgid "Move to trash"
 msgstr "휴지통으로 이동"
 
-#: src/delete-files/delete-files.cc:140
-msgid "Do you want to permanently delete the selected files?"
-msgstr "선택한 파일을 완전히 삭제하시겠습니까?"
-
-#: src/delete-files/delete-files.cc:141 src/skins/preset-list.cc:411
-#: src/skins/preset-list.cc:427
+#: src/delete-files/delete-files.cc:146
 msgid "Delete"
-msgstr "삭제"
+msgstr "삭제하기"
 
-#: src/delete-files/delete-files.cc:145 src/skins/preset-browser.cc:56
-#: src/skins/preset-list.cc:307 src/skins/ui_playlist.cc:221
+#: src/delete-files/delete-files.cc:213 src/delete-files/delete-files.cc:235
+#: src/skins-qt/search-select.cc:102 src/skins/search-select.cc:78
 msgid "Cancel"
 msgstr "취소"
 
-#: src/delete-files/delete-files.cc:166
+#: src/delete-files/delete-files.cc:267
 msgid "Delete Selected Files"
-msgstr "선택한 파일 삭제"
+msgstr "선택한 파일 삭제하기"
 
-#: src/delete-files/delete-files.cc:181
+#: src/delete-files/delete-files.cc:287
 msgid "Delete Method"
 msgstr "삭제 방식"
 
-#: src/delete-files/delete-files.cc:182
+#: src/delete-files/delete-files.cc:288
 msgid "Move to trash instead of deleting immediately"
 msgstr "즉시 삭제하는 대신 휴지통으로 이동"
 
@@ -1171,18 +1083,22 @@
 "Surround echo by Carl van Schaik, 1999\n"
 "Updated for Audacious by William Pitcock and John Lindgren, 2010-2014"
 msgstr ""
+"에코 플러그인 \n"
+"By Johan Levin, 1999\n"
+"서라운드 에코 by Carl van Schaik, 1999\n"
+"Audacious용 업데이트 by William Pitcock and John Lindgren, 2010-2014"
 
 #: src/echo_plugin/echo.cc:21
 msgid "Echo"
 msgstr "울림"
 
-#: src/echo_plugin/echo.cc:22 src/modplug/plugin_main.cc:73
-#: src/modplug/plugin_main.cc:83
+#: src/echo_plugin/echo.cc:22 src/modplug/plugin_main.cc:72
+#: src/modplug/plugin_main.cc:82
 msgid "Delay:"
 msgstr "지연:"
 
-#: src/echo_plugin/echo.cc:24 src/modplug/plugin_main.cc:73
-#: src/modplug/plugin_main.cc:83
+#: src/echo_plugin/echo.cc:24 src/modplug/plugin_main.cc:72
+#: src/modplug/plugin_main.cc:82 src/xsf/plugin.cc:445
 msgid "ms"
 msgstr "ms"
 
@@ -1190,7 +1106,7 @@
 msgid "Feedback:"
 msgstr "반향:"
 
-#: src/echo_plugin/echo.cc:28 src/modplug/plugin_main.cc:87
+#: src/echo_plugin/echo.cc:28 src/modplug/plugin_main.cc:86
 msgid "Volume:"
 msgstr "음량:"
 
@@ -1198,11 +1114,11 @@
 msgid "Echo"
 msgstr "울림"
 
-#: src/ffaudio/ffaudio-core.cc:41
+#: src/ffaudio/ffaudio-core.cc:50
 msgid "FFmpeg Plugin"
 msgstr "FFmpeg 플러그인"
 
-#: src/ffaudio/ffaudio-core.cc:571
+#: src/ffaudio/ffaudio-core.cc:649
 msgid ""
 "Multi-format audio decoding plugin for Audacious using\n"
 "FFmpeg multimedia framework (http://www.ffmpeg.org/)\n"
@@ -1212,252 +1128,325 @@
 "Matti Hämäläinen <ccr@tnsp.org>"
 msgstr ""
 "FFmpeg 멀티미디어 프레임워크를 사용한\n"
-"오데이셔스용 다중 형식 오디오 디코딩 플러그인\n"
+"Audacious용 다중 형식 오디오 디코딩 플러그인\n"
 "\n"
 "오다셔서 플러그인 작성:\n"
 "William Pitcock <nenolod@nenolod.net>\n"
 "Matti Hämäläinen <ccr@tnsp.org>"
 
-#: src/filewriter/filewriter.cc:45
+#: src/filewriter/filewriter.cc:48
 msgid "FileWriter Plugin"
 msgstr "FileWriter 플러그인"
 
-#: src/filewriter/filewriter.cc:386
+#: src/filewriter/filewriter.cc:316
+#, c-format
+msgid ""
+"Error opening %s:\n"
+"%s"
+msgstr ""
+"%s 열기 오류:\n"
+"%s"
+
+#: src/filewriter/filewriter.cc:358
+msgid ""
+"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 ""
+"이 프로그램은 자유 소프트웨어입니다. 자유 소프트웨어 재단에서 발행한 GNU 일"
+"반 일반 공중 라이선스의 조건에 따라 이를 재배포 및/또는 수정할 수 있습니다; "
+"라이선스 버전 2 또는 (귀하의 선택에 따라) 이후 버전.\n"
+"\n"
+"이 프로그램은 유용하기를 바라며 배포되지만 어떠한 보증도 없으며 상품성 또는 "
+"특정 목적에 대한 적합성에 대한 암묵적인 보증도 없습니다. 자세한 내용은 GNU 일"
+"반 공중 라이선스를 참조하십시오.\n"
+"\n"
+"이 프로그램과 함께 GNU 일반 공중 라이선스를 받았어야 합니다. 그렇지 않은 경"
+"우 Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, "
+"MA 02110-1301, USA에 문의하십시오."
+
+#: src/filewriter/filewriter.cc:385
 msgid "Output file format:"
 msgstr "출력 파일 형식:"
 
-#: src/filewriter/filewriter.cc:403
-msgid "Configure"
-msgstr "설정하기"
-
-#: src/filewriter/filewriter.cc:413
+#: src/filewriter/filewriter.cc:389
 msgid "Save into original directory"
 msgstr "원본 디렉터리에 저장"
 
-#: src/filewriter/filewriter.cc:417
-msgid "Save into custom directory"
-msgstr "사용자 정의 디렉터리에 저장"
-
-#: src/filewriter/filewriter.cc:427
-msgid "Output file folder:"
-msgstr "출력 파일 폴더:"
-
-#: src/filewriter/filewriter.cc:431
-msgid "Pick a folder"
-msgstr "폴더 선택하기"
+#: src/filewriter/filewriter.cc:392
+msgid "Save into custom directory:"
+msgstr "개별 디렉터리에저 장:"
 
-#: src/filewriter/filewriter.cc:444
+#: src/filewriter/filewriter.cc:400
 msgid "Generate file name from:"
-msgstr ""
+msgstr "다음에서 파일 이름 생성:"
 
-#: src/filewriter/filewriter.cc:448
-msgid "Original file tag"
-msgstr ""
-
-#: src/filewriter/filewriter.cc:453
+#: src/filewriter/filewriter.cc:401
 msgid "Original file name"
-msgstr ""
+msgstr "원본 파일 이름"
 
-#: src/filewriter/filewriter.cc:459
-msgid "Include original file name extension"
-msgstr ""
+#: src/filewriter/filewriter.cc:404
+msgid "Original file name (no suffix)"
+msgstr "원본 파일명( 접미사 제외)"
 
-#: src/filewriter/filewriter.cc:468
-msgid "Prepend track number to file name"
-msgstr ""
+#: src/filewriter/filewriter.cc:407
+msgid "Original file tag"
+msgstr "원본 파일 태그"
 
-#: src/filewriter/filewriter.cc:484
-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 일반 공중 사용 허가서 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.cc:411
+msgid "Prepend track number to file name"
+msgstr "파일 이름 앞에 트랙 번호 추가"
 
-#: src/filewriter/mp3.cc:40 src/filewriter/mp3.cc:717
+#: src/filewriter/filewriter.cc:417 src/filewriter/filewriter.cc:449
 msgid "Auto"
 msgstr "자동"
 
-#: src/filewriter/mp3.cc:40
+#: src/filewriter/filewriter.cc:418
+msgid "8000 Hz"
+msgstr "8000 Hz"
+
+#: src/filewriter/filewriter.cc:419
+msgid "11025 Hz"
+msgstr "11025 Hz"
+
+#: src/filewriter/filewriter.cc:420
+msgid "12000 Hz"
+msgstr "12000 Hz"
+
+#: src/filewriter/filewriter.cc:421
+msgid "16000 Hz"
+msgstr "16000 Hz"
+
+#: src/filewriter/filewriter.cc:422
+msgid "22050 Hz"
+msgstr "22050 Hz"
+
+#: src/filewriter/filewriter.cc:423
+msgid "24000 Hz"
+msgstr "24000 Hz"
+
+#: src/filewriter/filewriter.cc:424
+msgid "32000 Hz"
+msgstr "32000 Hz"
+
+#: src/filewriter/filewriter.cc:425 src/xsf/plugin.cc:430
+msgid "44100 Hz"
+msgstr "44100 Hz"
+
+#: src/filewriter/filewriter.cc:426 src/xsf/plugin.cc:431
+msgid "48000 Hz"
+msgstr "48000 Hz"
+
+#: src/filewriter/filewriter.cc:430
+msgid "8 kbit/s"
+msgstr "8 kbit/s"
+
+#: src/filewriter/filewriter.cc:431
+msgid "16 kbit/s"
+msgstr "16 kbit/s"
+
+#: src/filewriter/filewriter.cc:432
+msgid "32 kbit/s"
+msgstr "32 kbit/s"
+
+#: src/filewriter/filewriter.cc:433
+msgid "40 kbit/s"
+msgstr "40 kbit/s"
+
+#: src/filewriter/filewriter.cc:434
+msgid "48 kbit/s"
+msgstr "48 kbit/s"
+
+#: src/filewriter/filewriter.cc:435
+msgid "56 kbit/s"
+msgstr "56 kbit/s"
+
+#: src/filewriter/filewriter.cc:436
+msgid "64 kbit/s"
+msgstr "64 kbit/s"
+
+#: src/filewriter/filewriter.cc:437
+msgid "80 kbit/s"
+msgstr "80 kbit/s"
+
+#: src/filewriter/filewriter.cc:438
+msgid "96 kbit/s"
+msgstr "96 kbit/s"
+
+#: src/filewriter/filewriter.cc:439
+msgid "112 kbit/s"
+msgstr "112 kbit/s"
+
+#: src/filewriter/filewriter.cc:440
+msgid "128 kbit/s"
+msgstr "128 kbit/s"
+
+#: src/filewriter/filewriter.cc:441
+msgid "160 kbit/s"
+msgstr "160 kbit/s"
+
+#: src/filewriter/filewriter.cc:442
+msgid "192 kbit/s"
+msgstr "192 kbit/s"
+
+#: src/filewriter/filewriter.cc:443
+msgid "224 kbit/s"
+msgstr "224 kbit/s"
+
+#: src/filewriter/filewriter.cc:444
+msgid "256 kbit/s"
+msgstr "256 kbit/s"
+
+#: src/filewriter/filewriter.cc:445
+msgid "320 kbit/s"
+msgstr "320 kbit/s"
+
+#: src/filewriter/filewriter.cc:450
 msgid "Joint Stereo"
 msgstr "통합 스테레오"
 
-#: src/filewriter/mp3.cc:41 src/modplug/plugin_main.cc:58
-#: src/mpg123/mpg123.cc:248
+#: src/filewriter/filewriter.cc:451 src/modplug/plugin_main.cc:57
+#: src/mpg123/mpg123.cc:259
 msgid "Stereo"
 msgstr "스테레오"
 
-#: src/filewriter/mp3.cc:41 src/modplug/plugin_main.cc:57
-#: src/mpg123/mpg123.cc:248
+#: src/filewriter/filewriter.cc:452 src/modplug/plugin_main.cc:56
+#: src/mpg123/mpg123.cc:260
 msgid "Mono"
 msgstr "모도"
 
-#: src/filewriter/mp3.cc:657
-msgid "MP3 Configuration"
-msgstr "MP3 설정"
-
-#: src/filewriter/mp3.cc:658
-msgid "_OK"
-msgstr "확인(_O)"
-
-#: src/filewriter/mp3.cc:681
-msgid "Algorithm Quality:"
-msgstr "알고리즘 품질:"
-
-#: src/filewriter/mp3.cc:706
-msgid "Output Sample Rate:"
-msgstr "출력 샘플 주파수:"
-
-#: src/filewriter/mp3.cc:733
-msgid "(Hz)"
-msgstr "(Hz)"
-
-#: src/filewriter/mp3.cc:740
-msgid "Bitrate / Compression Ratio:"
-msgstr "비트 전송률/압축율:"
-
-#: src/filewriter/mp3.cc:764
-msgid "Bitrate (kbps):"
-msgstr "비트전송율(kbps):"
+#: src/filewriter/filewriter.cc:456
+msgid "VBR"
+msgstr "가변 비트레이트"
+
+#: src/filewriter/filewriter.cc:457
+msgid "ABR"
+msgstr "ABR"
+
+#: src/filewriter/filewriter.cc:478
+msgid "Algorithm quality:"
+msgstr "알고리즘 성능:"
+
+#: src/filewriter/filewriter.cc:484
+msgid "Bitrate:"
+msgstr "비트 전송속도:"
 
-#: src/filewriter/mp3.cc:796
+#: src/filewriter/filewriter.cc:491
 msgid "Compression ratio:"
 msgstr "압축율:"
 
-#: src/filewriter/mp3.cc:820
-msgid "Audio Mode:"
+#: src/filewriter/filewriter.cc:498
+msgid "Audio mode:"
 msgstr "오디오 모드:"
 
-#: src/filewriter/mp3.cc:845
-msgid "Miscellaneous:"
-msgstr "기타:"
-
-#: src/filewriter/mp3.cc:856
+#: src/filewriter/filewriter.cc:501
 msgid "Enforce strict ISO compliance"
 msgstr "엄격한 ISO 규격 강제"
 
-#: src/filewriter/mp3.cc:867
+#: src/filewriter/filewriter.cc:503
 msgid "Error protection"
 msgstr "오류 방지"
 
-#: src/filewriter/mp3.cc:879 src/filewriter/vorbis.cc:206
-msgid "Quality"
-msgstr "음질"
-
-#: src/filewriter/mp3.cc:888
+#: src/filewriter/filewriter.cc:508
 msgid "Enable VBR/ABR"
 msgstr "VBR/ABR 활성화"
 
-#: src/filewriter/mp3.cc:898
+#: src/filewriter/filewriter.cc:510
 msgid "Type:"
 msgstr "형식:"
 
-#: src/filewriter/mp3.cc:931
-msgid "VBR Options:"
-msgstr "VBR 옵션:"
-
-#: src/filewriter/mp3.cc:947
-msgid "Minimum bitrate (kbps):"
-msgstr "최소 비트레이트(kbps):"
-
-#: src/filewriter/mp3.cc:973
-msgid "Maximum bitrate (kbps):"
-msgstr "최대 비트레이트(kbps):"
-
-#: src/filewriter/mp3.cc:995
-msgid "Strictly enforce minimum bitrate"
-msgstr "최소 비트전송율을 철저하게 강제"
-
-#: src/filewriter/mp3.cc:1007
-msgid "ABR Options:"
-msgstr "ABR 옵션:"
+#: src/filewriter/filewriter.cc:514
+msgid "Minimum bitrate:"
+msgstr "최소 비트 전송속도:"
+
+#: src/filewriter/filewriter.cc:518
+msgid "Maximum bitrate:"
+msgstr "최대 비트 전송속도:"
+
+#: src/filewriter/filewriter.cc:522
+msgid "Average bitrate:"
+msgstr "평균 비트 전송속도:"
 
-#: src/filewriter/mp3.cc:1017
-msgid "Average bitrate (kbps):"
-msgstr "평균 비트전송율(kbps):"
-
-#: src/filewriter/mp3.cc:1044
+#: src/filewriter/filewriter.cc:526
 msgid "VBR quality level:"
-msgstr "VBR 음질 수준:"
+msgstr "VBR 음질 레벨:"
 
-#: src/filewriter/mp3.cc:1063
-msgid "Omit Xing VBR header"
-msgstr ""
+#: src/filewriter/filewriter.cc:530
+msgid "Strictly enforce minimum bitrate"
+msgstr "최소 비트 전송속도를 엄격히 적용"
 
-#: src/filewriter/mp3.cc:1076
-msgid "VBR/ABR"
-msgstr "VBR/ABR"
+#: src/filewriter/filewriter.cc:533
+msgid "Omit Xing VBR header"
+msgstr "Xing VBR 헤더 생략"
 
-#: src/filewriter/mp3.cc:1085
-msgid "Frame Parameters:"
-msgstr "프레임 매개변수:"
+#: src/filewriter/filewriter.cc:539
+msgid "Frame Headers"
+msgstr "프레임 헤더"
 
-#: src/filewriter/mp3.cc:1097
+#: src/filewriter/filewriter.cc:540
 msgid "Mark as copyright"
-msgstr "Copyright로 표시"
+msgstr "저작권으로 표시"
 
-#: src/filewriter/mp3.cc:1108
+#: src/filewriter/filewriter.cc:542
 msgid "Mark as original"
 msgstr "원본으로 표시"
 
-#: src/filewriter/mp3.cc:1120
-msgid "ID3 Parameters:"
-msgstr "ID3 매개변수:"
+#: src/filewriter/filewriter.cc:544
+msgid "ID3 Tags"
+msgstr "ID3 태그"
 
-#: src/filewriter/mp3.cc:1131
+#: src/filewriter/filewriter.cc:545
 msgid "Force addition of version 2 tag"
 msgstr "버전 2 태그 추가사항 강제"
 
-#: src/filewriter/mp3.cc:1141
+#: src/filewriter/filewriter.cc:547
 msgid "Only add v1 tag"
-msgstr "v1 태그만 추가"
+msgstr "v1 태그만 추가하기"
 
-#: src/filewriter/mp3.cc:1148
+#: src/filewriter/filewriter.cc:549
 msgid "Only add v2 tag"
-msgstr "v2 태그만 추가"
+msgstr "v2 태그만 추가하기"
 
-#: src/filewriter/mp3.cc:1169
+#: src/filewriter/filewriter.cc:554
+msgid "Quality"
+msgstr "음질"
+
+#: src/filewriter/filewriter.cc:555
+msgid "VBR/ABR"
+msgstr "VBR/ABR"
+
+#: src/filewriter/filewriter.cc:556
 msgid "Tags"
 msgstr "태그"
 
-#: src/filewriter/vorbis.cc:196
-msgid "Vorbis Encoder Configuration"
-msgstr "Vorbis 인코더 설정"
-
-#: src/filewriter/vorbis.cc:219
-msgid "Quality level (0 - 10):"
-msgstr "음질 수준(0-10):"
+#: src/filewriter/filewriter.cc:566
+msgid "Quality (0-1):"
+msgstr "음질 (0-1):"
+
+#: src/filewriter/filewriter.cc:573 src/skins-qt/skins_cfg.cc:307
+#: src/skins/skins_cfg.cc:289
+msgid "General"
+msgstr "일반"
 
-#: src/flacng/flacng.h:35
+#: src/flac/flacng.h:36
 msgid "FLAC Decoder"
 msgstr "FLAC 디코더"
 
-#: src/flacng/metadata.cc:351 src/wavpack/wavpack.cc:209
+#: src/flac/metadata.cc:296 src/wavpack/wavpack.cc:215
 msgid "lossless"
 msgstr "무손실"
 
-#: src/flacng/plugin.cc:169
+#: src/flac/plugin.cc:214
 msgid ""
 "Original code by\n"
 "Ralf Ertzinger <ralf@skytale.net>\n"
@@ -1474,22 +1463,22 @@
 "GIO Plugin for Audacious\n"
 "Copyright 2009-2012 John Lindgren"
 msgstr ""
-"오데이셔스용 GIO 플러그인\n"
-"Copyright 2009-2012 John Lindgren"
+"Audacious용 GIO 플러그인\n"
+"저작권 2009-2012 John Lindgren"
 
 #: src/gio/gio.cc:42
 msgid "GIO Plugin"
 msgstr "GIO 플러그인"
 
-#: src/gio/gio.cc:153
+#: src/gio/gio.cc:152
 msgid "Read-and-append mode not supported"
-msgstr ""
+msgstr "읽기 및 쓰기 모드를 사용할수 없습니다."
 
-#: src/gio/gio.cc:166
+#: src/gio/gio.cc:165
 msgid "Invalid open mode"
 msgstr "잘못된 열기 모드"
 
-#: src/gl-spectrum/gl-spectrum.cc:51
+#: src/glspectrum/gl-spectrum.cc:52
 msgid ""
 "OpenGL Spectrum Analyzer for Audacious\n"
 "Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
@@ -1500,634 +1489,765 @@
 "\n"
 "License: GPLv2+"
 msgstr ""
-"오데이셔스용 OpenGL 스펙트럼 분석 프로그램\n"
-"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
+"Audacious용 OpenGL 스펙트럼 분석 프로그램\n"
+"저작권 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
 "\n"
 "XMMS 플러그인 기반:\n"
-"Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson, and "
+"저작권 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson, and "
 "4Front Technologies\n"
 "\n"
 "라이선스: GPLv2+"
 
-#: src/gl-spectrum/gl-spectrum.cc:62
+#: src/glspectrum/gl-spectrum.cc:63 src/qtglspectrum/gl-spectrum.cc:53
 msgid "OpenGL Spectrum Analyzer"
 msgstr "OpenGL 스펙트럼 분석기"
 
-#: src/gl-spectrum-qt/gl-spectrum.cc:41
-msgid ""
-"OpenGL Spectrum Analyzer for Audacious\n"
-"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
-"Copyright 2014 William Pitcock\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-qt/gl-spectrum.cc:53
-msgid "OpenGL Spectrum Analyzer (Qt)"
-msgstr ""
-
-#: src/gnomeshortcuts/gnomeshortcuts.cc:38
-msgid "GNOME Shortcuts"
-msgstr "그놈 바로가기"
-
-#: src/gnomeshortcuts/gnomeshortcuts.cc:54
-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/gtkui/columns.cc:35
-msgid "Entry number"
+#: src/gtkui/columns.cc:36 src/moonstone/playlist_model.cc:38
+#: src/qtui/playlist_model.cc:33
+msgid "Entry Number"
 msgstr "항목 번호"
 
-#: src/gtkui/columns.cc:36 src/playlist-manager/playlist-manager.cc:225
-#: src/qtui/playlist_model.cc:123
+#: src/gtkui/columns.cc:37 src/moonstone/playlist_model.cc:38
+#: src/moonstone/playlist_selection.cc:64
+#: src/playlist-manager/playlist-manager.cc:200
+#: src/playlist-manager-qt/playlist-manager-qt.cc:188
+#: src/qtui/playlist_model.cc:33 src/streamtuner/icecast-model.cc:120
+#: src/streamtuner/ihr-model.cc:159 src/streamtuner/shoutcast-model.cc:122
 msgid "Title"
 msgstr "제목"
 
-#: src/gtkui/columns.cc:37 src/qtui/playlist_model.cc:125
+#: src/gtkui/columns.cc:38 src/moonstone/playlist_model.cc:39
+#: src/qtui/playlist_model.cc:33
 msgid "Artist"
-msgstr "음악가"
+msgstr "아티스트"
 
-#: src/gtkui/columns.cc:38
+#: src/gtkui/columns.cc:39 src/moonstone/playlist_model.cc:39
+#: src/qtui/playlist_model.cc:33
 msgid "Year"
 msgstr "연도"
 
-#: src/gtkui/columns.cc:39 src/qtui/playlist_model.cc:127
+#: src/gtkui/columns.cc:40 src/moonstone/playlist_model.cc:39
+#: src/qtui/playlist_model.cc:34
 msgid "Album"
 msgstr "앨범"
 
-#: src/gtkui/columns.cc:40
-msgid "Album artist"
-msgstr "앨범 음악가"
+#: src/gtkui/columns.cc:41 src/moonstone/playlist_model.cc:40
+#: src/qtui/playlist_model.cc:34
+msgid "Album Artist"
+msgstr "앨범 아티스트"
 
-#: src/gtkui/columns.cc:41
+#: src/gtkui/columns.cc:42 src/moonstone/playlist_model.cc:40
+#: src/qtui/playlist_model.cc:34
 msgid "Track"
 msgstr "트랙"
 
-#: src/gtkui/columns.cc:42
+#: src/gtkui/columns.cc:43 src/moonstone/playlist_model.cc:40
+#: src/qtui/playlist_model.cc:34 src/streamtuner/icecast-model.cc:123
+#: src/streamtuner/shoutcast-model.cc:125
+#: src/streamtuner/shoutcast-model.cc:236
 msgid "Genre"
 msgstr "장르"
 
-#: src/gtkui/columns.cc:43
-msgid "Queue position"
-msgstr "대기 목록 위치"
+#: src/gtkui/columns.cc:44 src/moonstone/playlist_model.cc:41
+#: src/qtui/playlist_model.cc:35
+msgid "Queue Position"
+msgstr "큐 위치"
 
-#: src/gtkui/columns.cc:44
+#: src/gtkui/columns.cc:45 src/moonstone/playlist_model.cc:41
+#: src/qtui/playlist_model.cc:35
 msgid "Length"
 msgstr "길이"
 
-#: src/gtkui/columns.cc:45
-msgid "File path"
+#: src/gtkui/columns.cc:46 src/moonstone/playlist_model.cc:41
+#: src/qtui/playlist_model.cc:35
+msgid "File Path"
 msgstr "파일 경로"
 
-#: src/gtkui/columns.cc:47
-msgid "Custom title"
+#: src/gtkui/columns.cc:47 src/moonstone/playlist_model.cc:42
+#: src/qtui/playlist_model.cc:35
+msgid "File Name"
+msgstr "파일 이름"
+
+#: src/gtkui/columns.cc:48 src/moonstone/playlist_model.cc:42
+#: src/qtui/playlist_model.cc:36
+msgid "Custom Title"
 msgstr "사용자 정의 제목"
 
-#: src/gtkui/columns.cc:48
+#: src/gtkui/columns.cc:49 src/moonstone/playlist_model.cc:42
+#: src/qtui/playlist_model.cc:36 src/streamtuner/icecast-model.cc:129
+#: src/streamtuner/shoutcast-model.cc:134
 msgid "Bitrate"
-msgstr "비트 전송율"
+msgstr "비트 전송속도"
+
+#: src/gtkui/columns.cc:50 src/moonstone/playlist_model.cc:43
+#: src/qtui/playlist_model.cc:36
+msgid "Comment"
+msgstr "주석"
+
+#: src/gtkui/columns.cc:51 src/qtui/playlist_model.cc:36
+msgid "Publisher"
+msgstr "게시자"
+
+#: src/gtkui/columns.cc:52 src/qtui/playlist_model.cc:37
+msgid "Catalog Number"
+msgstr "범주 번호"
+
+#: src/gtkui/columns.cc:53 src/moonstone/playlist_model.cc:43
+#: src/qtui/playlist_model.cc:37
+msgid "Disc"
+msgstr "디스크"
 
-#: src/gtkui/columns.cc:308
+#: src/gtkui/columns.cc:325
 msgid "Available columns"
 msgstr "존재하는 내용"
 
-#: src/gtkui/columns.cc:334
+#: src/gtkui/columns.cc:351
 msgid "Displayed columns"
 msgstr "표시한 내용"
 
-#: src/gtkui/layout.cc:72 src/search-tool/search-tool.cc:40
+#: src/gtkui/layout.cc:74 src/search-tool-qt/search-tool-qt.cc:58
+#: src/search-tool/search-tool.cc:49
 msgid "Search Tool"
 msgstr "검색 도구"
 
-#: src/gtkui/layout.cc:167
+#: src/gtkui/layout.cc:170
 msgid "Dock at Left"
 msgstr "왼편에 붙이기"
 
-#: src/gtkui/layout.cc:167
+#: src/gtkui/layout.cc:170
 msgid "Dock at Right"
 msgstr "오른편에 붙이기"
 
-#: src/gtkui/layout.cc:168
+#: src/gtkui/layout.cc:171
 msgid "Dock at Top"
 msgstr "상단에 붙이기"
 
-#: src/gtkui/layout.cc:168
+#: src/gtkui/layout.cc:171
 msgid "Dock at Bottom"
 msgstr "하단에 붙이기"
 
-#: src/gtkui/layout.cc:168
+#: src/gtkui/layout.cc:171
 msgid "Undock"
 msgstr "떼어내기"
 
-#: src/gtkui/layout.cc:168 src/ladspa/plugin.cc:531
+#: src/gtkui/layout.cc:171 src/ladspa/plugin.cc:540
 msgid "Disable"
 msgstr "비활성화"
 
-#: src/gtkui/menus.cc:126 src/qtui/main_window_actions.cc:93
-#: src/statusicon/statusicon.cc:276
+#: src/gtkui/menus.cc:79 src/qtui/menus.cc:107
+#: src/statusicon-qt/statusicon.cc:115 src/statusicon/statusicon.cc:286
 msgid "_Open Files ..."
 msgstr "파일 열기(_O) ..."
 
-#: src/gtkui/menus.cc:127
+#: src/gtkui/menus.cc:80 src/qtui/menus.cc:111
 msgid "Open _URL ..."
 msgstr "URL 열기(_U) ..."
 
-#: src/gtkui/menus.cc:128 src/qtui/main_window_actions.cc:95
+#: src/gtkui/menus.cc:81 src/qtui/menus.cc:113
 msgid "_Add Files ..."
-msgstr "파일 추가(_A) ..."
+msgstr "파일 추가하기(_A) ..."
 
-#: src/gtkui/menus.cc:129
+#: src/gtkui/menus.cc:82 src/qtui/menus.cc:118
 msgid "Add U_RL ..."
-msgstr "URL 추가(_R) ..."
+msgstr "URL 추가하기(_R) ..."
 
-#: src/gtkui/menus.cc:131
+#: src/gtkui/menus.cc:84 src/qtui/menus.cc:120
 msgid "Search _Library"
 msgstr "라이브러리 검색(_L)"
 
-#: src/gtkui/menus.cc:133 src/qtui/main_window_actions.cc:98
+#: src/gtkui/menus.cc:86 src/qtui/menus.cc:123
 msgid "A_bout ..."
 msgstr "정보(_B) ..."
 
-#: src/gtkui/menus.cc:134 src/qtui/main_window_actions.cc:99
+#: src/gtkui/menus.cc:87 src/qtui/menus.cc:125
 msgid "_Settings ..."
 msgstr "설정(_S)..."
 
-#: src/gtkui/menus.cc:135 src/qtui/main_window_actions.cc:103
-#: src/statusicon/statusicon.cc:284
+#: src/gtkui/menus.cc:88 src/qtui/menus.cc:131
+#: src/statusicon-qt/statusicon.cc:117 src/statusicon/statusicon.cc:288
 msgid "_Quit"
 msgstr "끝내기(_Q)"
 
-#: src/gtkui/menus.cc:139 src/gtkui/menus.cc:262
-#: src/qtui/main_window_actions.cc:107 src/search-tool/search-tool.cc:641
-#: src/statusicon/statusicon.cc:278
+#: src/gtkui/menus.cc:92 src/gtkui/menus.cc:226
+#: src/moonstone/playlist_tabs.cc:306 src/qtui/menus.cc:135
+#: src/qtui/playlist_tabs.cc:331 src/search-tool-qt/search-tool-qt.cc:499
+#: src/search-tool/search-tool.cc:339 src/statusicon-qt/statusicon.cc:109
+#: src/statusicon/statusicon.cc:280
 msgid "_Play"
 msgstr "재생(_P)"
 
-#: src/gtkui/menus.cc:140 src/qtui/main_window_actions.cc:108
-#: src/statusicon/statusicon.cc:279
+#: src/gtkui/menus.cc:93 src/qtui/menus.cc:137
+#: src/statusicon-qt/statusicon.cc:110 src/statusicon/statusicon.cc:281
 msgid "Paus_e"
 msgstr "일시정지(_E)"
 
-#: src/gtkui/menus.cc:141 src/qtui/main_window_actions.cc:109
-#: src/statusicon/statusicon.cc:280
+#: src/gtkui/menus.cc:94 src/qtui/menus.cc:139
+#: src/statusicon-qt/statusicon.cc:111 src/statusicon/statusicon.cc:282
 msgid "_Stop"
-msgstr "정지(_S)"
+msgstr "중지(_S)"
 
-#: src/gtkui/menus.cc:142 src/qtui/main_window_actions.cc:110
-#: src/statusicon/statusicon.cc:277
+#: src/gtkui/menus.cc:95 src/qtui/menus.cc:141
+#: src/statusicon-qt/statusicon.cc:112 src/statusicon/statusicon.cc:283
 msgid "Pre_vious"
 msgstr "이전(_V)"
 
-#: src/gtkui/menus.cc:143 src/qtui/main_window_actions.cc:111
-#: src/statusicon/statusicon.cc:281
+#: src/gtkui/menus.cc:96 src/qtui/menus.cc:143
+#: src/statusicon-qt/statusicon.cc:113 src/statusicon/statusicon.cc:284
 msgid "_Next"
 msgstr "다음(_N)"
 
-#: src/gtkui/menus.cc:145 src/qtui/main_window_actions.cc:113
+#: src/gtkui/menus.cc:97 src/qtui/menus.cc:145 src/skins/menus.cc:114
+#: src/skins-qt/menus.cc:105
+msgid "Previous Album"
+msgstr "이전 앨범"
+
+#: src/gtkui/menus.cc:98 src/qtui/menus.cc:146 src/skins/menus.cc:115
+#: src/skins-qt/menus.cc:106
+msgid "Next Album"
+msgstr "다음 앨범"
+
+#: src/gtkui/menus.cc:100 src/qtui/menus.cc:148
 msgid "_Repeat"
 msgstr "반복(_R)"
 
-#: src/gtkui/menus.cc:146 src/qtui/main_window_actions.cc:114
+#: src/gtkui/menus.cc:101 src/qtui/menus.cc:150
 msgid "S_huffle"
-msgstr "뒤섞기(_H)"
+msgstr "순서섞기(_H)"
+
+#: src/gtkui/menus.cc:102 src/qtui/menus.cc:152
+msgid "Shuffle by Albu_m"
+msgstr "앨범별로 순서섞기(_M)"
 
-#: src/gtkui/menus.cc:147 src/qtui/main_window_actions.cc:115
+#: src/gtkui/menus.cc:103 src/qtui/menus.cc:155
 msgid "N_o Playlist Advance"
-msgstr "재생 목록 미리 알리지 않음(_O)"
+msgstr "재생목록 진행 없음(_O)"
 
-#: src/gtkui/menus.cc:148 src/qtui/main_window_actions.cc:116
+#: src/gtkui/menus.cc:104 src/qtui/menus.cc:157
 msgid "Stop A_fter This Song"
-msgstr "이 노래 다음 멈춤(_F)"
+msgstr "이 곡 재생 후 중지(_F)"
 
-#: src/gtkui/menus.cc:150 src/gtkui/menus.cc:247
-#: src/qtui/main_window_actions.cc:118
+#: src/gtkui/menus.cc:106 src/gtkui/menus.cc:210 src/qtui/menus.cc:162
+#: src/qtui/menus.cc:294
 msgid "Song _Info ..."
 msgstr "곡 정보(_I) ..."
 
-#: src/gtkui/menus.cc:151
+#: src/gtkui/menus.cc:107
 msgid "Jump to _Time ..."
 msgstr "시간 건너뛰기(_T) ..."
 
-#: src/gtkui/menus.cc:152
+#: src/gtkui/menus.cc:108
 msgid "_Jump to Song ..."
 msgstr "곡 건너뛰기(_J) ..."
 
-#: src/gtkui/menus.cc:154
+#: src/gtkui/menus.cc:110 src/qtui/menus.cc:165
 msgid "Set Repeat Point _A"
 msgstr "반복 시점 A 설정(_A)"
 
-#: src/gtkui/menus.cc:155
+#: src/gtkui/menus.cc:111 src/qtui/menus.cc:167
 msgid "Set Repeat Point _B"
 msgstr "반복 시점 B 설정(_B)"
 
-#: src/gtkui/menus.cc:156
+#: src/gtkui/menus.cc:112 src/qtui/menus.cc:169
 msgid "_Clear Repeat Points"
 msgstr "반복 시점 지우기(_C)"
 
-#: src/gtkui/menus.cc:160 src/gtkui/menus.cc:167 src/gtkui/menus.cc:183
-#: src/qtui/main_window_actions.cc:122 src/qtui/main_window_actions.cc:129
-#: src/qtui/main_window_actions.cc:145
+#: src/gtkui/menus.cc:116 src/gtkui/menus.cc:123 src/gtkui/menus.cc:141
+#: src/qtui/menus.cc:173 src/qtui/menus.cc:180 src/qtui/menus.cc:198
 msgid "By _Title"
 msgstr "제목순(_T)"
 
-#: src/gtkui/menus.cc:161 src/qtui/main_window_actions.cc:123
+#: src/gtkui/menus.cc:117 src/qtui/menus.cc:174
 msgid "By _File Name"
 msgstr "파일 이름순(_F)"
 
-#: src/gtkui/menus.cc:162 src/qtui/main_window_actions.cc:124
+#: src/gtkui/menus.cc:118 src/qtui/menus.cc:175
 msgid "By File _Path"
-msgstr "파일 경로 순(_P)"
+msgstr "파일 경로순(_P)"
 
-#: src/gtkui/menus.cc:166 src/gtkui/menus.cc:182
-#: src/qtui/main_window_actions.cc:128 src/qtui/main_window_actions.cc:144
+#: src/gtkui/menus.cc:122 src/gtkui/menus.cc:140 src/qtui/menus.cc:179
+#: src/qtui/menus.cc:197
 msgid "By Track _Number"
 msgstr "트랙 번호순(_N)"
 
-#: src/gtkui/menus.cc:168 src/gtkui/menus.cc:184
-#: src/qtui/main_window_actions.cc:130 src/qtui/main_window_actions.cc:146
+#: src/gtkui/menus.cc:124 src/gtkui/menus.cc:142 src/qtui/menus.cc:181
+#: src/qtui/menus.cc:199
 msgid "By _Artist"
-msgstr "음악가 이름순(_A)"
+msgstr "아티스트순(_A)"
 
-#: src/gtkui/menus.cc:169 src/gtkui/menus.cc:185
-#: src/qtui/main_window_actions.cc:131 src/qtui/main_window_actions.cc:147
+#: src/gtkui/menus.cc:125 src/gtkui/menus.cc:143 src/qtui/menus.cc:182
+#: src/qtui/menus.cc:200
 msgid "By Al_bum"
-msgstr "앨범 이름순(_B)"
+msgstr "앨범순(_B)"
 
-#: src/gtkui/menus.cc:170 src/gtkui/menus.cc:186
-#: src/qtui/main_window_actions.cc:132 src/qtui/main_window_actions.cc:148
+#: src/gtkui/menus.cc:126 src/gtkui/menus.cc:144 src/qtui/menus.cc:183
+#: src/qtui/menus.cc:201
 msgid "By Albu_m Artist"
-msgstr "앨범 작곡가순(_M)"
+msgstr "앨범 아티스트순(_M)"
 
-#: src/gtkui/menus.cc:171 src/gtkui/menus.cc:187
-#: src/qtui/main_window_actions.cc:133 src/qtui/main_window_actions.cc:149
+#: src/gtkui/menus.cc:127 src/gtkui/menus.cc:145 src/qtui/menus.cc:184
+#: src/qtui/menus.cc:202
 msgid "By Release _Date"
-msgstr "출시 일자순(_D)"
+msgstr "출시일순(_D)"
 
-#: src/gtkui/menus.cc:172 src/gtkui/menus.cc:188
-#: src/qtui/main_window_actions.cc:134 src/qtui/main_window_actions.cc:150
+#: src/gtkui/menus.cc:128 src/gtkui/menus.cc:146 src/qtui/menus.cc:185
+#: src/qtui/menus.cc:203
 msgid "By _Genre"
 msgstr "장르순(_G)"
 
-#: src/gtkui/menus.cc:173 src/gtkui/menus.cc:189
-#: src/qtui/main_window_actions.cc:135 src/qtui/main_window_actions.cc:151
+#: src/gtkui/menus.cc:129 src/gtkui/menus.cc:147 src/qtui/menus.cc:186
+#: src/qtui/menus.cc:204
 msgid "By _Length"
 msgstr "길이순(_L)"
 
-#: src/gtkui/menus.cc:174 src/gtkui/menus.cc:190
-#: src/qtui/main_window_actions.cc:136 src/qtui/main_window_actions.cc:152
+#: src/gtkui/menus.cc:130 src/gtkui/menus.cc:148 src/qtui/menus.cc:187
+#: src/qtui/menus.cc:205
 msgid "By _File Path"
 msgstr "파일 경로순(_F)"
 
-#: src/gtkui/menus.cc:175 src/gtkui/menus.cc:191
-#: src/qtui/main_window_actions.cc:137 src/qtui/main_window_actions.cc:153
+#: src/gtkui/menus.cc:131 src/gtkui/menus.cc:149 src/qtui/menus.cc:188
+#: src/qtui/menus.cc:206
 msgid "By _Custom Title"
 msgstr "사용자 정의 제목순(_C)"
 
-#: src/gtkui/menus.cc:177 src/gtkui/menus.cc:193
-#: src/qtui/main_window_actions.cc:139 src/qtui/main_window_actions.cc:155
+#: src/gtkui/menus.cc:132 src/gtkui/menus.cc:150 src/qtui/menus.cc:189
+#: src/qtui/menus.cc:207
+msgid "By C_omment"
+msgstr "주석순(_O)"
+
+#: src/gtkui/menus.cc:133 src/gtkui/menus.cc:151 src/qtui/menus.cc:190
+#: src/qtui/menus.cc:208
+msgid "By D_isc Number"
+msgstr "디스크 번호순(_I)"
+
+#: src/gtkui/menus.cc:135 src/gtkui/menus.cc:153 src/qtui/menus.cc:192
+#: src/qtui/menus.cc:210
 msgid "R_everse Order"
 msgstr "순서 뒤집기(_E)"
 
-#: src/gtkui/menus.cc:178 src/gtkui/menus.cc:194
-#: src/qtui/main_window_actions.cc:140 src/qtui/main_window_actions.cc:156
+#: src/gtkui/menus.cc:136 src/gtkui/menus.cc:154 src/qtui/menus.cc:194
+#: src/qtui/menus.cc:212
 msgid "_Random Order"
 msgstr "임의 순서(_R)"
 
-#: src/gtkui/menus.cc:198 src/qtui/main_window_actions.cc:160
+#: src/gtkui/menus.cc:158 src/qtui/menus.cc:216
 msgid "_Play/Resume"
-msgstr "재생/복귀(_P)"
+msgstr "재생하기/이어듣기(_P)"
 
-#: src/gtkui/menus.cc:199 src/gtkui/menus.cc:251
-#: src/qtui/main_window_actions.cc:161
+#: src/gtkui/menus.cc:159 src/qtui/menus.cc:218
 msgid "_Refresh"
 msgstr "새로 고침(_R)"
 
-#: src/gtkui/menus.cc:201 src/qtui/main_window_actions.cc:163
+#: src/gtkui/menus.cc:161 src/qtui/menus.cc:222
 msgid "_Sort"
 msgstr "정렬(_S)"
 
-#: src/gtkui/menus.cc:202 src/qtui/main_window_actions.cc:164
+#: src/gtkui/menus.cc:162 src/qtui/menus.cc:223
 msgid "Sort Se_lected"
 msgstr "선택한 항목 정렬(_L)"
 
-#: src/gtkui/menus.cc:203 src/qtui/main_window_actions.cc:165
+#: src/gtkui/menus.cc:163 src/qtui/menus.cc:225
 msgid "Remove _Duplicates"
 msgstr "중복 제거(_D)"
 
-#: src/gtkui/menus.cc:204 src/qtui/main_window_actions.cc:166
+#: src/gtkui/menus.cc:164 src/qtui/menus.cc:226
 msgid "Remove _Unavailable Files"
 msgstr "사용할 수 없는 파일 제거(_U)"
 
-#: src/gtkui/menus.cc:206 src/playlist-manager/playlist-manager.cc:244
-#: src/qtui/main_window_actions.cc:168
+#: src/gtkui/menus.cc:166 src/playlist-manager/playlist-manager.cc:219
+#: src/playlist-manager-qt/playlist-manager-qt.cc:348 src/qtui/menus.cc:229
 msgid "_New"
 msgstr "새 파일(_N)"
 
-#: src/gtkui/menus.cc:207
+#: src/gtkui/menus.cc:167 src/qtui/menus.cc:230
 msgid "Ren_ame ..."
 msgstr "이름 바꾸기(_A)..."
 
-#: src/gtkui/menus.cc:208 src/gtkui/menus.cc:264
-#: src/qtui/main_window_actions.cc:170
+#: src/gtkui/menus.cc:168 src/gtkui/menus.cc:228
+#: src/moonstone/playlist_tabs.cc:311 src/qtui/menus.cc:231
+#: src/qtui/playlist_tabs.cc:336
 msgid "Remo_ve"
 msgstr "제거(_V)"
 
-#: src/gtkui/menus.cc:210
+#: src/gtkui/menus.cc:170 src/qtui/menus.cc:233
 msgid "_Import ..."
 msgstr "가져오기(_I) ..."
 
-#: src/gtkui/menus.cc:211
+#: src/gtkui/menus.cc:171 src/qtui/menus.cc:234
 msgid "_Export ..."
 msgstr "내보내기(_E) ..."
 
-#: src/gtkui/menus.cc:213
+#: src/gtkui/menus.cc:173 src/qtui/menus.cc:237
 msgid "Playlist _Manager ..."
-msgstr "재생 목록 관리자(_M) ..."
+msgstr "재생목록 관리자(_M) ..."
 
-#: src/gtkui/menus.cc:214 src/qtui/main_window_actions.cc:176
+#: src/gtkui/menus.cc:174 src/qtui/menus.cc:239
 msgid "_Queue Manager ..."
 msgstr "대기 목록 관리자(_Q) ..."
 
-#: src/gtkui/menus.cc:218 src/qtui/main_window_actions.cc:180
+#: src/gtkui/menus.cc:178 src/qtui/menus.cc:243
 msgid "Volume _Up"
 msgstr "음량 크게(_U)"
 
-#: src/gtkui/menus.cc:219 src/qtui/main_window_actions.cc:181
+#: src/gtkui/menus.cc:179 src/qtui/menus.cc:245
 msgid "Volume _Down"
 msgstr "음량 작게(_D)"
 
-#: src/gtkui/menus.cc:221 src/qtui/main_window_actions.cc:183
-msgid "_Equalizer"
-msgstr "이퀄라이저(_E)"
+#: src/gtkui/menus.cc:181 src/qtui/menus.cc:249
+msgid "_Equalizer ..."
+msgstr "이퀄라이저(_E)..."
 
-#: src/gtkui/menus.cc:223 src/qtui/main_window_actions.cc:185
+#: src/gtkui/menus.cc:182 src/qtui/menus.cc:251
 msgid "E_ffects ..."
 msgstr "효과(_F)..."
 
-#: src/gtkui/menus.cc:227
+#: src/gtkui/menus.cc:184
+msgid "_Record Stream"
+msgstr "녹음 스트림(_R)"
+
+#: src/gtkui/menus.cc:185
+msgid "Audio _Settings ..."
+msgstr "오디오 설정(_S)..."
+
+#: src/gtkui/menus.cc:189 src/qtui/menus.cc:260
 msgid "Show _Menu Bar"
 msgstr "메뉴 표시줄 표시(_M)"
 
-#: src/gtkui/menus.cc:228
+#: src/gtkui/menus.cc:190 src/qtui/menus.cc:262
 msgid "Show I_nfo Bar"
 msgstr "정보 표시줄 표시(_N)"
 
-#: src/gtkui/menus.cc:229
+#: src/gtkui/menus.cc:191 src/qtui/menus.cc:264
+msgid "Show Info Bar _Album Art"
+msgstr "정보 표시줄 앨범 표지 표시(_A)"
+
+#: src/gtkui/menus.cc:192 src/qtui/menus.cc:266
 msgid "Show Info Bar Vis_ualization"
 msgstr "정보 표시줄 시각화 표시(_U)"
 
-#: src/gtkui/menus.cc:230
+#: src/gtkui/menus.cc:193 src/qtui/menus.cc:268
 msgid "Show _Status Bar"
 msgstr "상태 표시줄 표시(_S)"
 
-#: src/gtkui/menus.cc:232
+#: src/gtkui/menus.cc:195 src/qtui/menus.cc:272
 msgid "Show _Remaining Time"
 msgstr "남은 시간 표시(_R)"
 
-#: src/gtkui/menus.cc:234
+#: src/gtkui/menus.cc:197 src/qtui/menus.cc:276 src/skins/menus.cc:157
+#: src/skins-qt/menus.cc:152
 msgid "_Visualizations ..."
 msgstr "시각화(_V)..."
 
-#: src/gtkui/menus.cc:238 src/qtui/main_window_actions.cc:189
+#: src/gtkui/menus.cc:201 src/qtui/menus.cc:280
 msgid "_File"
 msgstr "파일(_F)"
 
-#: src/gtkui/menus.cc:239 src/qtui/main_window_actions.cc:190
+#: src/gtkui/menus.cc:202 src/qtui/menus.cc:281
 msgid "_Playback"
-msgstr "재생(_P)"
+msgstr "플레이백(_P)"
 
-#: src/gtkui/menus.cc:240 src/qtui/main_window_actions.cc:191
+#: src/gtkui/menus.cc:203 src/qtui/menus.cc:282
 msgid "P_laylist"
-msgstr "재생 목록(_L)"
+msgstr "재생목록(_L)"
 
-#: src/gtkui/menus.cc:241 src/gtkui/menus.cc:258
-#: src/qtui/main_window_actions.cc:192
+#: src/gtkui/menus.cc:204 src/gtkui/menus.cc:222 src/qtui/menus.cc:283
+#: src/qtui/menus.cc:312
 msgid "_Services"
 msgstr "서비스(_S)"
 
-#: src/gtkui/menus.cc:242 src/qtui/main_window_actions.cc:193
+#: src/gtkui/menus.cc:205 src/qtui/menus.cc:284
 msgid "_Output"
 msgstr "출력(_O)"
 
-#: src/gtkui/menus.cc:243
+#: src/gtkui/menus.cc:206 src/qtui/menus.cc:285
 msgid "_View"
 msgstr "보기(_V)"
 
-#: src/gtkui/menus.cc:248
+#: src/gtkui/menus.cc:211 src/qtui/menus.cc:296
 msgid "_Queue/Unqueue"
 msgstr "대기 목록에 넣기/빼기(_Q)"
 
-#: src/gtkui/menus.cc:250
+#: src/gtkui/menus.cc:213 src/qtui/menus.cc:299
 msgid "_Open Containing Folder"
 msgstr "음악 포함 폴더 열기(_O)"
 
-#: src/gtkui/menus.cc:253
+#: src/gtkui/menus.cc:214 src/qtui/menus.cc:301
+msgid "_Refresh Selected"
+msgstr "선택 영역 새로 고침(_R)"
+
+#: src/gtkui/menus.cc:216 src/qtui/menus.cc:304
 msgid "Cu_t"
 msgstr "잘라내기(_T)"
 
-#: src/gtkui/menus.cc:254
+#: src/gtkui/menus.cc:217 src/qtui/menus.cc:305
 msgid "_Copy"
 msgstr "복사(_C)"
 
-#: src/gtkui/menus.cc:255
+#: src/gtkui/menus.cc:218 src/qtui/menus.cc:306
 msgid "_Paste"
 msgstr "붙여넣기(_P)"
 
-#: src/gtkui/menus.cc:256
+#: src/gtkui/menus.cc:219 src/qtui/menus.cc:307
+msgid "Paste at _End"
+msgstr "마지막 부분에 붙여넣기(_E)"
+
+#: src/gtkui/menus.cc:220 src/qtui/menus.cc:309
 msgid "Select _All"
 msgstr "모두 선택(_A)"
 
-#: src/gtkui/menus.cc:263
+#: src/gtkui/menus.cc:227 src/moonstone/playlist_tabs.cc:309
+#: src/qtui/playlist_tabs.cc:334
 msgid "_Rename ..."
 msgstr "이름 바꾸기(_R) ..."
 
-#: src/gtkui/settings.cc:35
+#: src/gtkui/settings.cc:35 src/qtui/settings.cc:59
+msgid "Always"
+msgstr "항상"
+
+#: src/gtkui/settings.cc:36 src/qtui/settings.cc:60
+msgid "Auto-hide"
+msgstr "자동 숨김"
+
+#: src/gtkui/settings.cc:37 src/qtui/settings.cc:61
+msgid "Never"
+msgstr "없음"
+
+#: src/gtkui/settings.cc:41 src/qtui/settings.cc:64
 msgid "Playlist Tabs"
-msgstr "재생 목록 탭"
+msgstr "재생목록 탭"
 
-#: src/gtkui/settings.cc:36
-msgid "Always show tabs"
-msgstr "항상 탭 표시"
+#: src/gtkui/settings.cc:42 src/qtui/settings.cc:65
+msgid "Show playlist tabs:"
+msgstr "재생목록 탭 표시:"
 
-#: src/gtkui/settings.cc:38
+#: src/gtkui/settings.cc:45 src/qtui/settings.cc:69
 msgid "Show entry counts"
-msgstr "항목 갯수 표시"
+msgstr "항목 갯수 표시하기"
 
-#: src/gtkui/settings.cc:40
+#: src/gtkui/settings.cc:47 src/qtui/settings.cc:72
 msgid "Show close buttons"
-msgstr "닫기 단추 표시"
+msgstr "닫기 단추 표시하기"
 
-#: src/gtkui/settings.cc:42
+#: src/gtkui/settings.cc:49 src/qtui/settings.cc:75
 msgid "Playlist Columns"
-msgstr "재생 목록 내용"
+msgstr "재생목록 내용"
 
-#: src/gtkui/settings.cc:44
+#: src/gtkui/settings.cc:51 src/qtui/settings.cc:77
 msgid "Show column headers"
-msgstr "내용 헤더 표시"
+msgstr "내용 헤더 표시하기"
 
-#: src/gtkui/settings.cc:46 src/modplug/plugin_main.cc:106
-#: src/skins/skins_cfg.cc:263
-msgid "Miscellaneous"
-msgstr "기타"
+#: src/gtkui/settings.cc:53 src/qtui/settings.cc:82
+msgid "Make column headers clickable for sorting"
+msgstr "열 헤더를 클릭하여 정렬할 수 있도록 설정"
 
-#: src/gtkui/settings.cc:47
-msgid "Arrow keys seek by:"
-msgstr "화살표 키로 탐색:"
+#: src/gtkui/settings.cc:56
+msgid "Use symbolic icons in toolbar"
+msgstr "도구모음에서 기호 아이콘 사용하기"
 
-#: src/gtkui/settings.cc:50
+#: src/gtkui/settings.cc:58 src/qtui/settings.cc:86
 msgid "Scroll on song change"
-msgstr "곡 바뀔 때 스크롤"
+msgstr "곡 변경 시 스크롤"
 
-#: src/gtkui/ui_gtk.cc:71
+#: src/gtkui/ui_gtk.cc:82
 msgid "GTK Interface"
 msgstr "GTK 인터페이스"
 
-#: src/gtkui/ui_gtk.cc:222 src/skins/ui_main.cc:232
+#: src/gtkui/ui_gtk.cc:219 src/skins/main.cc:228 src/skins-qt/main.cc:231
 #, c-format
 msgid "%s - Audacious"
-msgstr "%s - 오데이셔스"
+msgstr "%s - Audacious"
 
-#: src/gtkui/ui_gtk.cc:225 src/qtui/main_window.cc:186
+#: src/gtkui/ui_gtk.cc:221 src/moonstone/main_window.cc:184
+#: src/qtui/main_window.cc:385
 msgid "Buffering ..."
 msgstr "버퍼링 ..."
 
-#: src/gtkui/ui_gtk.cc:228 src/skins/ui_main.cc:234 src/skins/ui_main.cc:1164
+#: src/gtkui/ui_gtk.cc:224 src/pipewire/pipewire.cc:402 src/skins/main.cc:230
+#: src/skins-qt/main.cc:233
 msgid "Audacious"
-msgstr "오데이셔스"
+msgstr "Audacious"
+
+#: src/gtkui/ui_gtk.cc:487 src/gtkui/ui_gtk.cc:518 src/gtkui/ui_gtk.cc:882
+#: src/hotkey/gui.cc:72 src/moonstone/main_window.cc:67
+#: src/moonstone/main_window.cc:145 src/moonstone/main_window.cc:146
+#: src/notify/osd.cc:85 src/qthotkey/gui.cc:67 src/qtui/main_window.cc:154
+#: src/qtui/main_window.cc:347 src/qtui/main_window.cc:348
+#: src/skins/menus.cc:109 src/skins-qt/menus.cc:100
+msgid "Play"
+msgstr "재생"
+
+#: src/gtkui/ui_gtk.cc:487 src/moonstone/main_window.cc:151
+#: src/moonstone/main_window.cc:152 src/notify/osd.cc:82
+#: src/qtui/main_window.cc:353 src/qtui/main_window.cc:354
+#: src/skins/menus.cc:110 src/skins-qt/menus.cc:101
+msgid "Pause"
+msgstr "일시정지"
+
+#: src/gtkui/ui_gtk.cc:868 src/moonstone/main_window.cc:57
+#: src/qtui/main_window.cc:145 src/skins/menus.cc:86 src/skins-qt/menus.cc:77
+msgid "Search Library"
+msgstr "라이브러리 검색"
+
+#: src/gtkui/ui_gtk.cc:875 src/moonstone/main_window.cc:60
+#: src/qtui/main_window.cc:147
+msgid "Open Files"
+msgstr "파일 열기"
+
+#: src/gtkui/ui_gtk.cc:876 src/moonstone/main_window.cc:62
+#: src/qtui/main_window.cc:149
+msgid "Add Files"
+msgstr "파일 추가하기"
+
+#: src/gtkui/ui_gtk.cc:881 src/moonstone/main_window.cc:65
+#: src/qtui/main_window.cc:152 src/skins/menus.cc:112 src/skins-qt/menus.cc:103
+msgid "Previous"
+msgstr "이전"
+
+#: src/gtkui/ui_gtk.cc:883 src/hotkey/gui.cc:74 src/moonstone/main_window.cc:69
+#: src/qthotkey/gui.cc:69 src/qtui/main_window.cc:156 src/skins/menus.cc:111
+#: src/skins-qt/menus.cc:102
+msgid "Stop"
+msgstr "중지"
+
+#: src/gtkui/ui_gtk.cc:884 src/moonstone/main_window.cc:76 src/notify/osd.cc:89
+#: src/qtui/main_window.cc:163 src/skins/menus.cc:113 src/skins-qt/menus.cc:104
+msgid "Next"
+msgstr "다음"
+
+#: src/gtkui/ui_gtk.cc:886 src/moonstone/main_window.cc:79
+#: src/qtui/main_window.cc:166 src/qtui/menus.cc:254 src/skins/menus.cc:79
+#: src/skins-qt/menus.cc:69
+msgid "Record Stream"
+msgstr "스트림 녹음"
+
+#: src/gtkui/ui_gtk.cc:919 src/moonstone/main_window.cc:86
+#: src/qtui/main_window.cc:173 src/skins/menus.cc:103 src/skins-qt/menus.cc:94
+msgid "Repeat"
+msgstr "반복"
+
+#: src/gtkui/ui_gtk.cc:922 src/moonstone/main_window.cc:89
+#: src/qtui/main_window.cc:176 src/skins/menus.cc:104 src/skins-qt/menus.cc:95
+msgid "Shuffle"
+msgstr "뒤섞기"
+
+#: src/gtkui/ui_gtk.cc:1114 src/qtui/main_window.cc:123
+msgid "Menu"
+msgstr "메뉴"
 
-#: src/gtkui/ui_statusbar.cc:63 src/qtui/status_bar.cc:67
+#: src/gtkui/ui_statusbar.cc:64 src/qtui/status_bar.cc:155
 msgid "mono"
 msgstr "모노"
 
-#: src/gtkui/ui_statusbar.cc:65 src/qtui/status_bar.cc:69
+#: src/gtkui/ui_statusbar.cc:66 src/qtui/status_bar.cc:157
 msgid "stereo"
 msgstr "스테레오"
 
-#: src/gtkui/ui_statusbar.cc:67 src/qtui/status_bar.cc:71
+#: src/gtkui/ui_statusbar.cc:68 src/qtui/status_bar.cc:160
 #, c-format
 msgid "%d channel"
 msgid_plural "%d channels"
 msgstr0 "채널 %d개"
 
-#: src/gtkui/ui_statusbar.cc:81 src/qtui/status_bar.cc:85
+#: src/gtkui/ui_statusbar.cc:76 src/qtui/status_bar.cc:168
 #, c-format
-msgid "%d kbps"
-msgstr "%d kbps"
+msgid "%d kHz"
+msgstr "%d kHz"
 
-#: src/gtkui/ui_statusbar.cc:107 src/skins/ui_main_evlisteners.cc:103
+#: src/gtkui/ui_statusbar.cc:82 src/qtui/status_bar.cc:174
+#, c-format
+msgid "%d kbit/s"
+msgstr "%d kbit/s"
+
+#: src/gtkui/ui_statusbar.cc:108 src/skins/main.cc:478 src/skins-qt/main.cc:461
 msgid "Single mode."
 msgstr "싱글 모드입니다."
 
-#: src/gtkui/ui_statusbar.cc:109 src/skins/ui_main_evlisteners.cc:105
+#: src/gtkui/ui_statusbar.cc:110 src/skins/main.cc:480 src/skins-qt/main.cc:463
 msgid "Playlist mode."
-msgstr "재생 목록 모드입니다."
+msgstr "재생목록 모드입니다."
 
-#: src/gtkui/ui_statusbar.cc:117 src/skins/ui_main_evlisteners.cc:111
+#: src/gtkui/ui_statusbar.cc:118 src/skins/main.cc:486 src/skins-qt/main.cc:469
 msgid "Stopping after song."
-msgstr "곡 재생 후 멈추는 중입니다."
+msgstr "곡이 끝나면 멈춥니다."
 
-#: src/hotkey/gui.cc:71
+#: src/hotkey/gui.cc:71 src/qthotkey/gui.cc:66
 msgid "Previous track"
 msgstr "이전 트랙"
 
-#: src/hotkey/gui.cc:72 src/notify/osd.cc:69 src/qtui/main_window.cc:69
-#: src/qtui/main_window.cc:172 src/qtui/main_window.cc:173
-#: src/skins/menus.cc:87
-msgid "Play"
-msgstr "재생"
-
-#: src/hotkey/gui.cc:73
+#: src/hotkey/gui.cc:73 src/qthotkey/gui.cc:68
 msgid "Pause/Resume"
-msgstr "일시 정지/재개"
-
-#: src/hotkey/gui.cc:74 src/qtui/main_window.cc:70 src/skins/menus.cc:89
-msgid "Stop"
-msgstr "정지"
+msgstr "일시정지/이어듣기"
 
-#: src/hotkey/gui.cc:75
+#: src/hotkey/gui.cc:75 src/qthotkey/gui.cc:70
 msgid "Next track"
 msgstr "다음 트랙"
 
-#: src/hotkey/gui.cc:76
-msgid "Forward 5 seconds"
-msgstr "5초 빨리감기"
-
-#: src/hotkey/gui.cc:77
-msgid "Rewind 5 seconds"
-msgstr "5초 되감기"
+#: src/hotkey/gui.cc:76 src/qthotkey/gui.cc:71
+msgid "Step forward"
+msgstr "빨리감기"
+
+#: src/hotkey/gui.cc:77 src/qthotkey/gui.cc:72
+msgid "Step backward"
+msgstr "되감기"
 
-#: src/hotkey/gui.cc:78
+#: src/hotkey/gui.cc:78 src/qthotkey/gui.cc:73
 msgid "Mute"
 msgstr "음소거"
 
-#: src/hotkey/gui.cc:79
+#: src/hotkey/gui.cc:79 src/qthotkey/gui.cc:74
 msgid "Volume up"
 msgstr "음량 증가"
 
-#: src/hotkey/gui.cc:80
+#: src/hotkey/gui.cc:80 src/qthotkey/gui.cc:75
 msgid "Volume down"
 msgstr "음량 감소"
 
-#: src/hotkey/gui.cc:81
+#: src/hotkey/gui.cc:81 src/qthotkey/gui.cc:76
 msgid "Jump to file"
 msgstr "파일로 건너뛰기"
 
-#: src/hotkey/gui.cc:82
+#: src/hotkey/gui.cc:82 src/qthotkey/gui.cc:77
 msgid "Toggle player window(s)"
 msgstr "재생 창 전환"
 
-#: src/hotkey/gui.cc:83
+#: src/hotkey/gui.cc:83 src/qthotkey/gui.cc:78
 msgid "Show On-Screen-Display"
-msgstr "화면에 표시 보이기"
+msgstr "화면 디스플레이 표시하기"
 
-#: src/hotkey/gui.cc:84
+#: src/hotkey/gui.cc:84 src/qthotkey/gui.cc:79
 msgid "Toggle repeat"
 msgstr "반복 전환"
 
-#: src/hotkey/gui.cc:85
+#: src/hotkey/gui.cc:85 src/qthotkey/gui.cc:80
 msgid "Toggle shuffle"
 msgstr "임의재생 전환"
 
-#: src/hotkey/gui.cc:86
+#: src/hotkey/gui.cc:86 src/qthotkey/gui.cc:81
 msgid "Toggle stop after current"
-msgstr "현재 곡 이후 멈춤여부 전환"
+msgstr "현재 곡 이후 중지상태 전환"
 
-#: src/hotkey/gui.cc:87
+#: src/hotkey/gui.cc:87 src/qthotkey/gui.cc:82
 msgid "Raise player window(s)"
 msgstr "재생 창 복귀"
 
-#: src/hotkey/gui.cc:97
+#: src/hotkey/gui.cc:98 src/qthotkey/gui.cc:100
 msgid "(none)"
 msgstr "(없음)"
 
-#: src/hotkey/gui.cc:234
+#: src/hotkey/gui.cc:261
 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 modifiers.\n"
 "\n"
 "Do you want to continue?"
 msgstr ""
-"수정자 없이 주 마우스 단추를 할당 하는것은 추천하지 않습니다.\n"
+"수정자 없이 기본 마우스 단추를 바인드하지 않는 것이 좋습니다.\n"
 "\n"
-"계속 진행하시겠습니까?"
+"계속하시겠습니까?"
 
-#: src/hotkey/gui.cc:236
+#: src/hotkey/gui.cc:264
 msgid "Binding mouse buttons"
 msgstr "마우스 단추 바인딩하기"
 
-#: src/hotkey/gui.cc:391
+#: src/hotkey/gui.cc:434
 msgid ""
 "Press a key combination inside a text field.\n"
 "You can also bind mouse buttons."
@@ -2135,34 +2255,34 @@
 "텍스트 필드에서 키 조합을 누르십시오.\n"
 "마우스 단추도 넣을 수 있습니다."
 
-#: src/hotkey/gui.cc:396
+#: src/hotkey/gui.cc:444 src/qthotkey/gui.cc:179
 msgid "Hotkeys:"
 msgstr "단축키:"
 
-#: src/hotkey/gui.cc:413
+#: src/hotkey/gui.cc:457 src/qthotkey/gui.cc:181
 msgid "Action:"
 msgstr "동작:"
 
-#: src/hotkey/gui.cc:420
+#: src/hotkey/gui.cc:461 src/qthotkey/gui.cc:182
 msgid "Key Binding:"
 msgstr "키 바인딩:"
 
-#: src/hotkey/gui.cc:468
+#: src/hotkey/gui.cc:518 src/qthotkey/gui.cc:184
 msgid "_Add"
-msgstr "추가(_A)"
+msgstr "추가하기(_A)"
 
-#: src/hotkey/plugin.cc:61
+#: src/hotkey/plugin.cc:59 src/qthotkey/plugin.cc:78
 msgid "Global Hotkeys"
 msgstr "전역 단축키"
 
-#: src/hotkey/plugin.cc:79
+#: src/hotkey/plugin.cc:74
 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"
+"Contributors 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"
@@ -2170,62 +2290,94 @@
 " Jeremy Tan <nsx@nsx.homeip.net>"
 msgstr ""
 "전역 단축키 플러그인\n"
-"전역 키 조합 또는 멀티미디어 키를 사용하여 플레이어를 제어합니다.\n"
+"전역 키 조합 또는 멀티미디어 키로 플레이어를 제어합니다.\n"
 "\n"
-"Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n"
+"저작권 (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"
+"기여자는 다음과 같습니다:\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/jack-ng/jack-ng.cc:49
+#: src/jack/jack-ng.cc:54
 msgid "JACK Output"
 msgstr "JACK 출력"
 
-#: src/jack-ng/jack-ng.cc:114
+#: src/jack/jack-ng.cc:126
+msgid "Client name:"
+msgstr "클라이언트 이름:"
+
+#: src/jack/jack-ng.cc:128
 msgid "Automatically connect to output ports"
 msgstr "출력 포트로 자동 연결"
 
-#: src/jack-ng/jack-ng.cc:155
+#: src/jack/jack-ng.cc:130
+msgid "Filter ports (regex, use any port if blank):"
+msgstr "필터 포트(정규식, 비어 있는 경우 아무 포트나 사용):"
+
+#: src/jack/jack-ng.cc:136
+msgid "Connect to physical ports only"
+msgstr "물리적 포트에만 연결"
+
+#: src/jack/jack-ng.cc:139
+msgid "Upmix to"
+msgstr "업믹스 사용"
+
+#: src/jack/jack-ng.cc:141
+msgid "ports if input has fewer channels"
+msgstr "입력에 더 적은 수의 채널이 있는 경우 왼쪽으로 향함"
+
+#: src/jack/jack-ng.cc:143
+msgid "Ignore insufficient number of ports"
+msgstr "포트 수 부족 무시"
+
+#: src/jack/jack-ng.cc:181
+msgid "No JACK output ports were found. Please check settings."
+msgstr "JACK 출력 포트를 찾을 수 없습니다. 설정을 확인하십시오."
+
+#: src/jack/jack-ng.cc:195
 #, c-format
 msgid "Only %d JACK output ports were found but %d are required."
-msgstr ""
+msgstr "%d JACK 출력 포트만 발견되었지만 %d가 필요합니다."
 
-#: src/jack-ng/jack-ng.cc:164
+#: src/jack/jack-ng.cc:210
 #, c-format
 msgid "Failed to connect to JACK port %s."
-msgstr ""
+msgstr "오디오 단자 연결에 실패하였습니다%s."
 
-#: src/jack-ng/jack-ng.cc:184
+#: src/jack/jack-ng.cc:230
 msgid ""
 "JACK supports only floating-point audio. You must change the output bit "
 "depth to floating-point in Audacious settings."
 msgstr ""
+"오디오 단자가 부동 소수점 오디오만 지원합니다. Auditive 설정에서 출력 비트 "
+"깊이를 부동 소수점으로 변경해야 한다."
 
-#: src/jack-ng/jack-ng.cc:197
+#: src/jack/jack-ng.cc:245
 msgid "Failed to connect to the JACK server; is it running?"
-msgstr ""
+msgstr "JACK 서버에 연결하지 못했습니다. 실행 중입니까?"
 
-#: src/jack-ng/jack-ng.cc:273
+#: src/jack/jack-ng.cc:321
 #, c-format
 msgid ""
 "The JACK server requires a sample rate of %d Hz, but Audacious is playing at "
 "%d Hz. Please use the Sample Rate Converter effect to correct the mismatch."
 msgstr ""
+"JACK 서버에는 %dHz의 샘플 레이트가 필요하지만 Audacious는 %dHz에서 재생됩니"
+"다. 불일치를 수정하려면 샘플 레이트 변환기 효과를 사용하십시오."
 
-#: src/ladspa/plugin.cc:414
+#: src/ladspa/plugin.cc:416
 #, c-format
 msgid "%s Settings"
 msgstr "%s 설정"
 
-#: src/ladspa/plugin.cc:478
+#: src/ladspa/plugin.cc:482
 msgid "Module paths:"
 msgstr "모듈 경로:"
 
-#: src/ladspa/plugin.cc:483
+#: src/ladspa/plugin.cc:487
 msgid ""
 "Separate multiple paths with a colon.\n"
 "These paths are searched in addition to LADSPA_PATH.\n"
@@ -2235,31 +2387,31 @@
 "이 경로를 LADSPA_PATH에서도 찾았습니다.\n"
 "새 플러그인을 검색하려면 새 경로를 추가하고 Enter 키를 누르십시오."
 
-#: src/ladspa/plugin.cc:499
+#: src/ladspa/plugin.cc:508
 msgid "Available plugins:"
 msgstr "사용할 수 있는 플러그인:"
 
-#: src/ladspa/plugin.cc:512 src/modplug/plugin_main.cc:92
-#: src/modplug/plugin_main.cc:95 src/modplug/plugin_main.cc:98
-#: src/modplug/plugin_main.cc:101
+#: src/ladspa/plugin.cc:521 src/modplug/plugin_main.cc:91
+#: src/modplug/plugin_main.cc:94 src/modplug/plugin_main.cc:97
+#: src/modplug/plugin_main.cc:100
 msgid "Enable"
 msgstr "활성화"
 
-#: src/ladspa/plugin.cc:518
+#: src/ladspa/plugin.cc:527
 msgid "Enabled plugins:"
 msgstr "활성화한 플러그인:"
 
-#: src/ladspa/plugin.cc:534
+#: src/ladspa/plugin.cc:543
 msgid "Settings"
 msgstr "설정"
 
-#: src/ladspa/plugin.cc:551
+#: src/ladspa/plugin.cc:560
 msgid ""
 "LADSPA Host for Audacious\n"
 "Copyright 2011 John Lindgren"
 msgstr ""
-"오데이셔스용 LADSPA 호스트\n"
-"Copyright 2011 John Lindgren"
+"Audacious용 LADSPA 호스트\n"
+"저작권 2011 John Lindgren"
 
 #: src/ladspa/plugin.h:78
 msgid "LADSPA Host"
@@ -2269,7 +2421,7 @@
 msgid "LIRC Plugin"
 msgstr "LIRC 플러그인"
 
-#: src/lirc/lirc.cc:381
+#: src/lirc/lirc.cc:379
 msgid ""
 "A simple plugin to control Audacious using the LIRC remote control daemon\n"
 "\n"
@@ -2284,93 +2436,156 @@
 "\n"
 "For more information about LIRC, see http://lirc.org."
 msgstr ""
-"LIRC 원격 제어 데몬을 사용하여 오데이셔스를 제어하기 위한 간단한 플러그인\n"
+"LIRC 원격 제어 데몬을 사용하여 Audacious를 제어하는 간단한 플러그인\n"
 "\n"
-"오데이셔스에 적용함:Tony Vroon <chainsaw@gentoo.org>\n"
+"Audacious에 맞게 조정됨:\n"
+"Tony Vroon <chainsaw@gentoo.org>\n"
 "Joonas Harjumäki <jharjuma@gmail.com>\n"
 "\n"
-"XMMS LIRC 플러그인 기반 작성:\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를 보십시오."
+"LIRC에 대한 자세한 내용은, http://lirc.org 를 참조하십시오."
 
-#: src/lirc/lirc.cc:392
+#: src/lirc/lirc.cc:390
 msgid "Connection"
 msgstr "연결"
 
-#: src/lirc/lirc.cc:393
+#: src/lirc/lirc.cc:391
 msgid "Reconnect to LIRC server"
 msgstr "LIRC 서버에 다시 연결"
 
-#: src/lirc/lirc.cc:395
+#: src/lirc/lirc.cc:393
 msgid "Wait before reconnecting:"
 msgstr "다시 연결하기 전에 대기중:"
 
-#: src/lyricwiki/lyricwiki.cc:41
-msgid "LyricWiki Plugin"
-msgstr "LyricWiki 플러그인"
-
-#: src/lyricwiki/lyricwiki.cc:131 src/lyricwiki-qt/lyricwiki.cc:136
-msgid "No lyrics available"
-msgstr "가사가 없습니다."
-
-#: src/lyricwiki/lyricwiki.cc:217 src/lyricwiki/lyricwiki.cc:226
-#: src/lyricwiki/lyricwiki.cc:243 src/lyricwiki/lyricwiki.cc:252
-#: src/lyricwiki/lyricwiki.cc:267 src/lyricwiki-qt/lyricwiki.cc:222
-#: src/lyricwiki-qt/lyricwiki.cc:231 src/lyricwiki-qt/lyricwiki.cc:248
-#: src/lyricwiki-qt/lyricwiki.cc:257 src/lyricwiki-qt/lyricwiki.cc:272
-msgid "Error"
-msgstr "오류"
-
-#: src/lyricwiki/lyricwiki.cc:218 src/lyricwiki/lyricwiki.cc:244
-#: src/lyricwiki-qt/lyricwiki.cc:223 src/lyricwiki-qt/lyricwiki.cc:249
+#: src/lyrics-common/chart_lyrics_provider.cc:93
+#: src/lyrics-common/chart_lyrics_provider.cc:150
+#: src/lyrics-common/lyrics_ovh_provider.cc:50
 #, c-format
 msgid "Unable to fetch %s"
 msgstr "%s을(를) 가져올 수 없습니다"
 
-#: src/lyricwiki/lyricwiki.cc:227 src/lyricwiki/lyricwiki.cc:253
-#: src/lyricwiki-qt/lyricwiki.cc:232 src/lyricwiki-qt/lyricwiki.cc:258
+#: src/lyrics-common/chart_lyrics_provider.cc:100
+#: src/lyrics-common/chart_lyrics_provider.cc:157
+#: src/lyrics-common/lyrics_ovh_provider.cc:57
 #, c-format
 msgid "Unable to parse %s"
 msgstr "%s을(를) 해석할 수 없습니다"
 
-#: src/lyricwiki/lyricwiki.cc:259 src/lyricwiki-qt/lyricwiki.cc:264
+#: src/lyrics-common/chart_lyrics_provider.cc:121
+#: src/lyrics-common/chart_lyrics_provider.cc:194
+#: src/lyrics-common/lyrics_ovh_provider.cc:88
 msgid "Looking for lyrics ..."
 msgstr "가사 검색중..."
 
-#: src/lyricwiki/lyricwiki.cc:267 src/lyricwiki-qt/lyricwiki.cc:272
-msgid "Missing song metadata"
-msgstr "곡 메타데이터가 빠졌습니다"
+#: src/lyrics-common/preferences.h:43
+msgid "Nowhere"
+msgstr "아무데도"
 
-#: src/lyricwiki/lyricwiki.cc:278 src/lyricwiki-qt/lyricwiki.cc:283
-msgid "Connecting to lyrics.wikia.com ..."
-msgstr "lyrics.wikia.com에 연결 중..."
-
-#: src/lyricwiki-qt/lyricwiki.cc:55
-msgid "LyricWiki Plugin (Qt)"
+#: src/lyrics-common/preferences.h:49
+msgid "Artist is truncated at the start, Title -- at the end"
 msgstr ""
+"아티스트는 시작 부분에서 잘리고 제목은 -- 끝 부분에서 잘립니다.</"
+"small>"
+
+#: src/lyrics-common/preferences.h:50
+msgid "Chars to truncate on:"
+msgstr "잘라낼 문자:"
+
+#: src/lyrics-common/preferences.h:54
+msgid "Chars are ORed in RegExp, surrounded by whitespace"
+msgstr "문자는 공백으로 둘러싸인 정규 표현식에서 OR 처리됩니다"
+
+#: src/lyrics-common/preferences.h:55
+msgid "Chars to split on:"
+msgstr "분할할 문자:"
+
+#: src/lyrics-common/preferences.h:56
+msgid "Further truncate those on chars"
+msgstr "문자에서 해당 문자를 추가로 잘라냅니다"
 
-#: src/m3u/m3u.cc:32
+#: src/lyrics-common/preferences.h:62
+msgid "General"
+msgstr "일반"
+
+#: src/lyrics-common/preferences.h:63
+msgid "Split title into artist and title on chars"
+msgstr "제목을 아티스트와 문자 제목으로 분할"
+
+#: src/lyrics-common/preferences.h:66
+msgid "Sources"
+msgstr "소스"
+
+#: src/lyrics-common/preferences.h:67
+msgid "Use embedded lyrics (from Lyrics tag)"
+msgstr "삽입된 가사 사용하기 (가사 태그에서)"
+
+#: src/lyrics-common/preferences.h:69
+msgid "Fetch lyrics from internet:"
+msgstr "인터넷에서 가사 가져오기:"
+
+#: src/lyrics-common/preferences.h:72
+msgid "Store fetched lyrics in local cache"
+msgstr "가져온 가사를 로컬 캐시에 저장"
+
+#: src/lyrics-common/preferences.h:74
+msgid "Local Storage"
+msgstr "로컬 저장소"
+
+#: src/lyrics-common/preferences.h:75
+msgid "Load lyric files (.lrc) from local storage"
+msgstr "로컬 저장소에서 가사 파일(.lrc) 불러오기"
+
+#: src/lyrics-common/utils.cc:54 src/ui-common/dialogs-qt.cc:63
+msgid "Error"
+msgstr "오류"
+
+#: src/lyrics-common/utils.cc:60
+msgid "Lyrics could not be found."
+msgstr "가사를 찾을 수 없습니다."
+
+#: src/lyrics-common/utils.cc:142
+msgid "Missing title and/or artist."
+msgstr "제목 및/또는 아티스트가 누락되었습니다."
+
+#: src/lyrics-gtk/lyrics-gtk.cc:37 src/lyrics-qt/lyrics-qt.cc:50
+msgid "Lyrics"
+msgstr "가사"
+
+#: src/lyrics-gtk/lyrics-gtk.cc:189 src/lyrics-qt/lyrics-qt.cc:171
+msgid "Edit Lyrics ..."
+msgstr "가사 편집하기 ..."
+
+#: src/lyrics-gtk/lyrics-gtk.cc:195 src/lyrics-qt/lyrics-qt.cc:178
+msgid "Save Locally"
+msgstr "로컬에 저장"
+
+#: src/lyrics-gtk/lyrics-gtk.cc:201 src/lyrics-qt/lyrics-qt.cc:186
+msgid "Refresh"
+msgstr "새로 고침"
+
+#: src/m3u/m3u.cc:33
 msgid "M3U Playlists"
-msgstr "M3U 재생 목록"
+msgstr "M3U 재생목록"
 
 #: src/metronom/metronom.cc:44
 msgid "Tact Generator"
 msgstr "Tact 생성기"
 
-#: src/metronom/metronom.cc:147
+#: src/metronom/metronom.cc:145
 #, c-format
 msgid "Tact generator: %d bpm"
 msgstr "Tact 생성기: %d bpm"
 
-#: src/metronom/metronom.cc:149
+#: src/metronom/metronom.cc:147
 #, c-format
 msgid "Tact generator: %d bpm %d/%d"
 msgstr "Tact 생성기: %d bpm %d/%d"
 
-#: src/metronom/metronom.cc:237
+#: src/metronom/metronom.cc:235
 msgid ""
 "A Tact Generator by Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
 "\n"
@@ -2384,23 +2599,23 @@
 "사용 예) tact://77은 분당 77 비트\n"
 "또는 tact://60*3/4는 3/4 tact에서 분당 60 bpm"
 
-#: src/mixer/mixer.cc:38
+#: src/mixer/mixer.cc:43
 msgid "Channel Mixer"
 msgstr "채널 믹서"
 
-#: src/mixer/mixer.cc:202
+#: src/mixer/mixer.cc:255
 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"
+"Audacious용 채널 음량 조절기 플러그인\n"
+"저작권 2011-2012 John Lindgren and Michał Lipski"
 
-#: src/mixer/mixer.cc:206
+#: src/mixer/mixer.cc:259
 msgid "Channel Mixer"
 msgstr "채널 믹서"
 
-#: src/mixer/mixer.cc:207
+#: src/mixer/mixer.cc:260
 msgid "Output channels:"
 msgstr "출력 채널:"
 
@@ -2410,170 +2625,178 @@
 
 #: src/mms/mms.cc:82
 msgid "Error connecting to MMS server"
-msgstr ""
+msgstr "MMS 서버 연결 오류"
 
-#: src/modplug/modplugbmp.h:53
+#: src/modplug/modplugbmp.h:57
 msgid "ModPlug (Module Player)"
 msgstr "ModPlug (모듈 재생기)"
 
-#: src/modplug/plugin_main.cc:53
-msgid "Resolution"
-msgstr "레졸루션"
-
-#: src/modplug/plugin_main.cc:54
-msgid "8-bit"
-msgstr "8비트"
-
 #: src/modplug/plugin_main.cc:55
-msgid "16-bit"
-msgstr "16비트"
-
-#: src/modplug/plugin_main.cc:56
 msgid "Channels"
 msgstr "채널"
 
-#: src/modplug/plugin_main.cc:60
+#: src/modplug/plugin_main.cc:59
 msgid "Nearest (fastest)"
 msgstr "근접(가장 빠름)"
 
-#: src/modplug/plugin_main.cc:61
+#: src/modplug/plugin_main.cc:60
 msgid "Linear (fast)"
 msgstr "선형(빠름)"
 
-#: src/modplug/plugin_main.cc:62
+#: src/modplug/plugin_main.cc:61
 msgid "Spline (good)"
 msgstr "스플라인(좋음)"
 
-#: src/modplug/plugin_main.cc:63
+#: src/modplug/plugin_main.cc:62
 msgid "Polyphase (best)"
 msgstr "다중 페이스(최상)"
 
-#: src/modplug/plugin_main.cc:64
+#: src/modplug/plugin_main.cc:63
 msgid "Sample rate"
-msgstr ""
+msgstr "샘플 레이트:"
 
-#: src/modplug/plugin_main.cc:65
+#: src/modplug/plugin_main.cc:64
 msgid "22 kHz"
 msgstr "22 kHz"
 
-#: src/modplug/plugin_main.cc:66
+#: src/modplug/plugin_main.cc:65
 msgid "44 kHz"
 msgstr "44 kHz"
 
-#: src/modplug/plugin_main.cc:67
+#: src/modplug/plugin_main.cc:66
 msgid "48 kHz"
 msgstr "48 kHz"
 
-#: src/modplug/plugin_main.cc:68
+#: src/modplug/plugin_main.cc:67
 msgid "96 kHz"
 msgstr "96 kHz"
 
-#: src/modplug/plugin_main.cc:72 src/modplug/plugin_main.cc:77
-#: src/modplug/plugin_main.cc:82
+#: src/modplug/plugin_main.cc:71 src/modplug/plugin_main.cc:76
+#: src/modplug/plugin_main.cc:81
 msgid "Level:"
 msgstr "레벨:"
 
-#: src/modplug/plugin_main.cc:78
+#: src/modplug/plugin_main.cc:77
 msgid "Cutoff:"
 msgstr "컷-오프:"
 
-#: src/modplug/plugin_main.cc:91
+#: src/modplug/plugin_main.cc:90
 msgid "Reverb"
 msgstr "리버브"
 
-#: src/modplug/plugin_main.cc:94
+#: src/modplug/plugin_main.cc:93
 msgid "Bass Boost"
 msgstr "저음 증폭"
 
-#: src/modplug/plugin_main.cc:97
+#: src/modplug/plugin_main.cc:96
 msgid "Surround"
 msgstr "서라운드"
 
-#: src/modplug/plugin_main.cc:100
+#: src/modplug/plugin_main.cc:99
 msgid "Preamp"
 msgstr "프리앰프"
 
-#: src/modplug/plugin_main.cc:107
+#: src/modplug/plugin_main.cc:106
 msgid "Oversample"
 msgstr "오버샘플링"
 
-#: src/modplug/plugin_main.cc:108
+#: src/modplug/plugin_main.cc:107
 msgid "Noise reduction"
 msgstr "노이즈 감쇄"
 
-#: src/modplug/plugin_main.cc:109
+#: src/modplug/plugin_main.cc:108
 msgid "Play Amiga MODs"
 msgstr "Amiga MOD 재생"
 
-#: src/modplug/plugin_main.cc:110
+#: src/modplug/plugin_main.cc:109
 msgid "Repeat"
 msgstr "반복"
 
-#: src/modplug/plugin_main.cc:111
+#: src/modplug/plugin_main.cc:110
 msgid "Repeat count:"
 msgstr "반복 횟수:"
 
-#: src/modplug/plugin_main.cc:112
+#: src/modplug/plugin_main.cc:111
 msgid "To repeat forever, set the repeat count to -1."
 msgstr "계속 반복하려면 반복 횟수를 -1로 설정하십시오."
 
-#: src/modplug/plugin_main.cc:125 src/sid/xs_config.cc:106
+#: src/modplug/plugin_main.cc:124 src/sid/xs_config.cc:106
 msgid "These settings will take effect when Audacious is restarted."
-msgstr ""
+msgstr "이 설정은 Audacious가 다시 시작할때 적용됩니다."
+
+#: src/moonstone/main_window.cc:72 src/moonstone/main_window.cc:73
+#: src/qtui/main_window.cc:159 src/qtui/main_window.cc:160
+#: src/skins/menus.cc:107 src/skins-qt/menus.cc:98
+msgid "Stop After This Song"
+msgstr "이 곡 재생 후 중지"
+
+#: src/moonstone/moonstone.cc:39
+msgid "Moonstone"
+msgstr "월장석"
+
+#: src/moonstone/playlist_header.cc:212 src/qtui/playlist_header.cc:258
+msgid "Reset to Defaults"
+msgstr "기본 값으로 재설정"
+
+#: src/moonstone/playlist_model.cc:38 src/qtui/playlist_header.cc:232
+msgid "Now Playing"
+msgstr "재생 중"
+
+#: src/moonstone/playlist_selection.cc:66
+#: src/playlist-manager/playlist-manager.cc:201
+#: src/playlist-manager-qt/playlist-manager-qt.cc:190
+msgid "Entries"
+msgstr "항목"
 
 #: src/mpg123/mpg123.cc:54
 msgid "MPG123 Plugin"
 msgstr "MPG123 플러그인"
 
-#: src/mpg123/mpg123.cc:83
-msgid "Advanced"
-msgstr "고급"
-
-#: src/mpg123/mpg123.cc:84
+#: src/mpg123/mpg123.cc:82
 msgid "Use accurate length calculation (slow)"
-msgstr ""
+msgstr "정확한 길이 계산 사용(느림)"
 
-#: src/mpg123/mpg123.cc:248
+#: src/mpg123/mpg123.cc:260
 msgid "Surround"
 msgstr "서라운드"
 
-#: src/mpris2/plugin.cc:39
+#: src/mpris2/plugin.cc:40
 msgid "MPRIS 2 Server"
 msgstr "MPRIS 2 서버"
 
-#: src/neon/neon.cc:97
+#: src/neon/neon.cc:102
 msgid "Neon HTTP/HTTPS Plugin"
 msgstr "Neon HTTP/HTTPS 플러그인"
 
-#: src/neon/neon.cc:521
+#: src/neon/neon.cc:526
 msgid "Error parsing redirect"
-msgstr ""
+msgstr "리디렉션 오류"
 
-#: src/neon/neon.cc:535
+#: src/neon/neon.cc:540
 msgid "Unknown HTTP error"
 msgstr "알 수 없는 HTTP 오류"
 
-#: src/neon/neon.cc:569
+#: src/neon/neon.cc:614
 msgid "Error parsing URL"
 msgstr "URL 해석 오류"
 
-#: src/neon/neon.cc:632
+#: src/neon/neon.cc:687
 msgid "Too many redirects"
-msgstr ""
+msgstr "너무 많은 리디렉션"
 
-#: src/notify/event.cc:64
+#: src/notify/event.cc:97
 msgid "Stopped"
-msgstr "정지함"
+msgstr "중지됨"
 
-#: src/notify/event.cc:64
+#: src/notify/event.cc:97
 msgid "Audacious is not playing."
-msgstr "오데이셔스가 재생중이 아닙니다."
+msgstr "Audacious가 재생중이 아닙니다."
 
-#: src/notify/notify.cc:42
+#: src/notify/notify.cc:39
 msgid "Desktop Notifications"
 msgstr "데스크톱 알림"
 
-#: src/notify/notify.cc:60
+#: src/notify/notify.cc:57
 msgid ""
 "Desktop Notifications Plugin for Audacious\n"
 "Copyright (C) 2010 Maximilian Bogner\n"
@@ -2593,50 +2816,95 @@
 "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"
+"저작권 (C) 2010 Maximilian Bogner\n"
+"저작권 (C) 2011-2013 John Lindgren 및 Jean-Alexandre Anglès d'Auriac\n"
+"\n"
+"이 플러그인은 자유 소프트웨어입니다; 자유 소프트웨어 재단에서 발행한 GNU 일"
+"반 공중 라이선스, 라이선스 버전 3 또는 (귀하의 선택에 따라) 이후 버전의 조건"
+"에 따라 이를 재배포 및/또는 수정할 수 있습니다.\n"
 "\n"
-"이 플러그인은 자유 소프트웨어입니다; 자유 소프트웨어 재단이 발표한 GNU 일반 "
-"공중 사용허가서 3판(또는 여러분의 선택에 따라) 이상의 조항에 따라 재배포 또"
-"는 수정할 수 있습니다.\n"
-"\n"
-"이 프로그램이 유용하게 사용되길 바라지만 그 어떤 보증도 없으며 심지어는 상업"
-"적 보증이나 일부 목적의 적합성에 대한 암시적 보증도 하지 않습니다. 자세한 내"
-"용은 GNU 일반 공중 사용허가서를 보십시오.\n"
+"이 플러그인은 유용할 것이라는 희망으로 배포되지만 어떠한 보증도 하지 않습니"
+"다. 상품성 또는 특정 목적에의 적합성에 대한 묵시적 보증도 없이. 자세한 내용"
+"은 GNU 일반 공중 라이선스를 참조하십시오.\n"
 "\n"
-"이 프로그램과 함께 GNU 일반 공중 사용 허가서 사본을 받아야 합니다. 만약 사본"
-"이 없다면 <http://www.gnu.org/licenses/> 링크를 참조하십시오."
+"이 프로그램과 함께 GNU 일반 공중 라이선스를 받았어야 합니다. 그렇지 않은 경"
+"우 <http://www.gnu.org/licenses/>를 참조하십시오."
 
-#: src/notify/notify.cc:110
+#: src/notify/notify.cc:104
 msgid "Show playback controls"
-msgstr "재생 컨트롤 표시"
+msgstr "플레이백 컨트롤 표시하기"
 
-#: src/notify/notify.cc:112
+#: src/notify/notify.cc:106
 msgid "Always show notification"
-msgstr "항상 알림 표시"
+msgstr "항상 알림 표시하기"
 
-#: src/notify/notify.cc:114
+#: src/notify/notify.cc:108
 msgid "Include album name in notification"
-msgstr ""
+msgstr "알림에 앨범 이름 포함"
+
+#: src/notify/notify.cc:110
+msgid "Custom notification duration:"
+msgstr "사용자 지정 알림 기간:"
 
-#: src/notify/osd.cc:58
+#: src/notify/osd.cc:74
 msgid "Show"
-msgstr "보이기"
+msgstr "표시하기"
 
-#: src/notify/osd.cc:66 src/qtui/main_window.cc:178
-#: src/qtui/main_window.cc:179 src/skins/menus.cc:88
-msgid "Pause"
-msgstr "일시 정지"
+#: src/openmpt/mpt.cc:50
+msgid "OpenMPT (Module Player)"
+msgstr "OpenMPT (모듈 재생기)"
 
-#: src/notify/osd.cc:73 src/qtui/main_window.cc:72 src/skins/menus.cc:91
-msgid "Next"
-msgstr "다음"
+#: src/openmpt/mpt.cc:132
+msgid ""
+"Module player based on libopenmpt\n"
+"\n"
+"Written by: Chris Spiegel <cspiegel@gmail.com>"
+msgstr ""
+"libopenmpt 기반 모듈 재생기\n"
+"\n"
+"작성자: Chris Spiegel <cspiegel@gmail.com>"
+
+#: src/openmpt/mpt.cc:151
+msgid "Stereo separation:"
+msgstr "스테레오 분리:"
+
+#: src/openmpt/mpt.cc:153
+msgid "% (0=mono, 100=default, 200=full)"
+msgstr "% (0=모노, 100=기본값, 200=전체)"
+
+#: src/openmpt/mpt.cc:157
+msgid "Interpolation:"
+msgstr "보간:"
+
+#: src/openmpt/mptwrap.h:51 src/soxr/sox-resampler.cc:189 src/xsf/plugin.cc:437
+msgid "Linear"
+msgstr "선형"
+
+#: src/openmpt/mptwrap.h:52
+msgid "Cubic"
+msgstr "큐빅"
+
+#: src/openmpt/mptwrap.h:53
+msgid "Windowed sinc"
+msgstr "창으로 된 싱크"
+
+#: src/opus/opus.cc:39
+msgid "Opus Decoder"
+msgstr "Opus 디코더"
 
-#: src/oss4/oss.h:93
+#: src/opus/opus.cc:336
+msgid ""
+"Opus Decoder Plugin for Audacious\n"
+"Copyright 2022 Thomas Lange"
+msgstr ""
+"Audacious용 Opus 디코더 플러그인\n"
+"Copyright 2022 Thomas Lange"
+
+#: src/oss4/oss.h:70
 msgid "OSS4 Output"
 msgstr "OSS4 출력"
 
-#: src/oss4/oss.h:95
+#: src/oss4/oss.h:72
 msgid "OSS3 Output"
 msgstr "OSS3 출력"
 
@@ -2644,27 +2912,27 @@
 msgid "Default device"
 msgstr "기본 장치"
 
-#: src/oss4/plugin.cc:77
+#: src/oss4/plugin.cc:78
 msgid "Audio device:"
 msgstr "오디오 장치:"
 
-#: src/oss4/plugin.cc:80
+#: src/oss4/plugin.cc:81
 msgid "Use alternate device:"
 msgstr "대체 장치 사용:"
 
-#: src/oss4/plugin.cc:84
+#: src/oss4/plugin.cc:85
 msgid "Save volume between sessions."
 msgstr "각 세션의 볼륨을 저장합니다."
 
-#: src/oss4/plugin.cc:86
+#: src/oss4/plugin.cc:87
 msgid "Enable format conversions made by the OSS software."
-msgstr "OSS 소프트웨어가 만드는 형 변환을 활성화 합니다."
+msgstr "OSS 소프트웨어에서 만든 형식 변환을 활성화합니다."
 
-#: src/oss4/plugin.cc:88
+#: src/oss4/plugin.cc:89
 msgid "Enable exclusive mode to prevent virtual mixing."
 msgstr "가상 믹싱을 막는 베타적 모드를 활성화 합니다."
 
-#: src/oss4/plugin.cc:100
+#: src/oss4/plugin.cc:101
 msgid ""
 "OSS4 Output Plugin for Audacious\n"
 "Copyright 2010-2012 Michał Lipski\n"
@@ -2672,78 +2940,114 @@
 "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"
+"Audacious용 OSS4 출력 플러그인\n"
+"저작권 2010-2012 Michał Lipski\n"
 "\n"
-"#audacious 채널 사람, 특히 Tony Vroon, John Lindgren, 이전에 OSS 플러그인을 "
-"만든 저작자분께 감사드리고 싶습니다."
+"저는 #audacious 채널의 사람들, 특히 Tony Vroon과 John Lindgren, 그리고 물론 "
+"이전 OSS 플러그인의 작성자분들께 감사드리고 싶습니다."
 
-#: src/playlist-manager/playlist-manager.cc:37
-msgid "Playlist Manager"
-msgstr "재생 목록 관리자"
+#: src/pipewire/pipewire.cc:44
+msgid "PipeWire Output"
+msgstr "PipeWire 출력"
 
-#: src/playlist-manager/playlist-manager.cc:226
-msgid "Entries"
-msgstr "항목"
+#: src/pipewire/pipewire.cc:118
+msgid ""
+"PipeWire Output Plugin for Audacious\n"
+"Copyright 2022 Thomas Lange\n"
+"\n"
+"Based on the PipeWire Output Plugin for Qmmp\n"
+"Copyright 2021 Ilya Kotov"
+msgstr ""
+"Audacious용 PipeWire 출력 플러그인\n"
+"Copyright 2022 Thomas Lange\n"
+"\n"
+"Qmmp용 PipeWire 출력 플러그인 기반\n"
+"Copyright 2021 Ilya Kotov"
+
+#: src/pipewire/pipewire.cc:408 src/skins/menus.cc:88 src/skins-qt/menus.cc:79
+msgid "Playback"
+msgstr "플레이백"
+
+#: src/playlist-manager/playlist-manager.cc:38
+#: src/playlist-manager-qt/playlist-manager-qt.cc:42
+msgid "Playlist Manager"
+msgstr "재생목록 관리자"
 
-#: src/playlist-manager/playlist-manager.cc:245
+#: src/playlist-manager/playlist-manager.cc:221
+#: src/playlist-manager-qt/playlist-manager-qt.cc:356
 msgid "_Remove"
 msgstr "제거(_R)"
 
-#: src/playlist-manager/playlist-manager.cc:246
+#: src/playlist-manager/playlist-manager.cc:222
+#: src/playlist-manager-qt/playlist-manager-qt.cc:351
 msgid "Ren_ame"
 msgstr "이름 바꾸기(_A)"
 
 #: src/pls/pls.cc:35
 msgid "PLS Playlists"
-msgstr "PLS 재생 목록"
+msgstr "PLS 재생목록"
 
-#: src/psf/plugin.cc:45
+#: src/psf/plugin.cc:53
 msgid "OpenPSF PSF1/PSF2 Decoder"
 msgstr "OpenPSF PSF1/PSF2 디코더"
 
-#: src/pulse_audio/pulse_audio.cc:38
+#: src/psf/plugin.cc:270
+msgid "OpenPSF Configuration"
+msgstr "OpenPSF 구성"
+
+#: src/psf/plugin.cc:271 src/xsf/plugin.cc:444
+msgid "Ignore length from file"
+msgstr "파일의 길이 무시"
+
+#: src/pulse/pulse_audio.cc:42
 msgid "PulseAudio Output"
 msgstr "PulseAudio 출력"
 
-#: src/pulse_audio/pulse_audio.cc:611
+#: src/pulse/pulse_audio.cc:84
+msgid "Context name:"
+msgstr "컨텍스트 이름:"
+
+#: src/pulse/pulse_audio.cc:86
+msgid "Stream name:"
+msgstr "스트림 이름:"
+
+#: src/pulse/pulse_audio.cc:596
 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 ""
-"오데이셔스 펄스오디오 출력 플러그인\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."
+"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 ""
+"Audacious PulseAudio 출력 플러그인\n"
+"\n"
+"이 프로그램은 자유 소프트웨어입니다. 자유 소프트웨어 재단에서 발행한 GNU 일"
+"반 공중 라이선스의 조건에 따라 이를 재배포 및/또는 수정할 수 있습니다; 라이선"
+"스 버전 2 또는 (귀하의 선택에 따라) 이후 버전.\n"
+"\n"
+"이 프로그램은 유용할 것이라는 희망으로 배포되지만 어떠한 보증도 하지 않습니"
+"다. 상품성 또는 특정 목적에의 적합성에 대한 묵시적 보증도 없이. 자세한 내용"
+"은 GNU 일반 공중 라이선스를 참조하십시오.\n"
+"\n"
+"이 프로그램과 함께 GNU 일반 공중 라이선스를 받았어야 합니다. 그렇지 않은 경"
+"우 Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, "
+"MA 02110-1301, USA에 문의하십시오."
 
-#: src/qtaudio/qtaudio.cc:49
+#: src/qtaudio/qtaudio.cc:53
 msgid "QtMultimedia Output"
 msgstr "QtMultimedia 출력"
 
-#: src/qtaudio/qtaudio.cc:77
+#: src/qtaudio/qtaudio.cc:84
 msgid ""
 "QtMultimedia Audio Output Plugin for Audacious\n"
 "Copyright 2014 William Pitcock\n"
@@ -2751,67 +3055,125 @@
 "Based on SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
 msgstr ""
-"오데이셔스용 QtMultimedia 음성 출력 플러그인\n"
-"Copyright 2014 William Pitcock\n"
+"Audacious용 QtMultimedia 음성 출력 플러그인\n"
+"저작권 2014 William Pitcock\n"
 "\n"
-"오데이셔스용 SDL 출력 플러그인 기반임\n"
-"Copyright 2010 John Lindgren"
+"Audacious용 SDL 출력 플러그인 기반임\n"
+"저작권 2010 John Lindgren"
 
-#: src/qtui/dialog_windows.cc:31
-msgid "Working ..."
-msgstr "동작중 ..."
+#: src/qtglspectrum/gl-spectrum.cc:41
+msgid ""
+"OpenGL Spectrum Analyzer for Audacious\n"
+"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
+"Copyright 2014, 2020 Ariadne Conill\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"
+"저작권 2013 Christophe Budé, John Lindgren, 및 Carlo Bramini\n"
+"저작권 2014, 2020 Ariadne Conill\n"
+"\n"
+"XMMS 플러그인 기반:\n"
+"저작권 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson, 및 "
+"4Front Technologies\n"
+"\n"
+"라이선스: GPLv2+"
 
-#: src/qtui/filter_input.cc:44 src/skins/ui_playlist.cc:221
-msgid "Search"
-msgstr "검색"
+#: src/qthotkey/gui.cc:177
+msgid "Press a key combination inside a text field."
+msgstr "텍스트 필드 내에서 키 조합을 누르십시오."
 
-#: src/qtui/main_window_actions.cc:94
+#: src/qthotkey/plugin.cc:105
+msgid ""
+"Global Hotkey Plugin\n"
+"Control the player with global key combinations or multimedia keys.\n"
+"\n"
+"Copyright (C) 2020 i.Dark_Templar <darktemplar@dark-templar-archives.net>\n"
+"Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n"
+"\n"
+"Contributors 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) 2020 i.Dark_Templar <darktemplar@dark-templar-archives.net>\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/qtui/menus.cc:109
 msgid "_Open Folder ..."
 msgstr "폴더 열기(_O)..."
 
-#: src/qtui/main_window_actions.cc:96
+#: src/qtui/menus.cc:115
 msgid "_Add Folder ..."
-msgstr "폴더 추가(_A)..."
+msgstr "폴더 추가하기(_A) ..."
 
-#: src/qtui/main_window_actions.cc:101
+#: src/qtui/menus.cc:128
 msgid "_Log Inspector ..."
 msgstr "로그 감시기(_L)..."
 
-#: src/qtui/main_window.cc:64
-msgid "Open Files"
-msgstr "파일 열기"
-
-#: src/qtui/main_window.cc:66
-msgid "Add Files"
-msgstr "파일 추가"
-
-#: src/qtui/main_window.cc:71 src/skins/menus.cc:90
-msgid "Previous"
-msgstr "이전"
+#: src/qtui/menus.cc:220
+msgid "_Find ..."
+msgstr "찾기(_F)..."
+
+#: src/qtui/menus.cc:256 src/skins/menus.cc:80 src/skins-qt/menus.cc:70
+msgid "Audio Settings ..."
+msgstr "오디오 설정..."
+
+#: src/qtui/playlist_model.cc:188
+msgid "Q#"
+msgstr "Q#"
+
+#: src/qtui/playlist_model.cc:190
+msgid "T#"
+msgstr "T#"
+
+#: src/qtui/playlist_model.cc:192
+msgid "C#"
+msgstr "C#"
+
+#: src/qtui/playlist_model.cc:194
+msgid "D#"
+msgstr "D#"
 
-#: src/qtui/main_window.cc:77 src/skins/menus.cc:82
-msgid "Repeat"
-msgstr "반복"
-
-#: src/qtui/main_window.cc:79 src/skins/menus.cc:83
-msgid "Shuffle"
-msgstr "뒤섞기"
-
-#: src/qtui/qtui.cc:42
+#: src/qtui/qtui.cc:40
 msgid "Qt Interface"
 msgstr "Qt 인터페이스"
 
+#: src/qtui/search_bar.cc:46
+msgid "Search playlist"
+msgstr "재생목록 검색"
+
+#: src/qtui/settings.cc:79
+msgid "Use bold font for column headers"
+msgstr "열 헤더에 굵은 글꼴 사용"
+
 #: src/resample/resample.cc:43
 msgid "Sample Rate Converter"
-msgstr "샘플 주파수 변환기"
+msgstr "샘플 레이트 변환기"
 
 #: src/resample/resample.cc:183
 msgid ""
 "Sample Rate Converter Plugin for Audacious\n"
 "Copyright 2010-2012 John Lindgren"
 msgstr ""
-"오데이셔스용 샘플 주파수 변환 플러그인\n"
-"Copyright 2010-2012 John Lindgren"
+"Audacious용 샘플 레이트 변환기 플러그인\n"
+"저작권 2010-2012 John Lindgren"
 
 #: src/resample/resample.cc:187
 msgid "Skip/repeat samples"
@@ -2841,7 +3203,7 @@
 msgid "Method:"
 msgstr "방식:"
 
-#: src/resample/resample.cc:199 src/sox-resampler/sox-resampler.cc:161
+#: src/resample/resample.cc:199 src/soxr/sox-resampler.cc:203
 msgid "Rate:"
 msgstr "주파수:"
 
@@ -2893,62 +3255,54 @@
 msgid "192 kHz:"
 msgstr "192 kHz:"
 
-#: src/scrobbler2/config_window.cc:41
-#, c-format
-msgid "OK. Scrobbling for user: %s"
-msgstr "네. %s 사용자의 스크로블링을 진행합니다"
-
-#: src/scrobbler2/config_window.cc:54
-msgid "Permission Denied"
-msgstr "권한이 거부되었습니다"
+#: src/scrobbler2/config_window.cc:29
+msgid "Checking Last.fm access ..."
+msgstr "Last.fm 접근 가능 확인 중 ..."
 
-#: src/scrobbler2/config_window.cc:56
-msgid "Access the following link to allow Audacious to scrobble your plays:"
+#: src/scrobbler2/config_window.cc:35
+msgid ""
+"Your scrobbles are being saved on your computer temporarily. They will be "
+"submitted as soon as Audacious is allowed access."
 msgstr ""
-"재생 항목을 오데이셔스에서 스크롤 하도록 하려면 다음 연결을 방문하십시오:"
+"사용자의 스크러블이 컴퓨터에 일시적으로 저장되고 있습니다. Audious의 접근이 "
+"허락되는 대로 제출될 것입니다."
 
-#: src/scrobbler2/config_window.cc:66
-msgid "Keep this window open and click 'Check Permission' again.\n"
-msgstr "이 창을 연 상태로 다시 '권한 확인'을 누르십시오.\n"
+#: src/scrobbler2/config_window.cc:41
+#, c-format
+msgid "Permission granted. Scrobbling for user %s."
+msgstr "권한이 부여되었습니다. 사용자 %s에 대한 스크러블링입니다."
 
-#: src/scrobbler2/config_window.cc:69 src/scrobbler2/config_window.cc:80
+#: src/scrobbler2/config_window.cc:44
 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."
+"Permission denied. Open the following URL in a browser, allow Audacious "
+"access to your account, and then click 'Check Permission' again:"
 msgstr ""
-"걱정하지 마십시오. 스크로블을 컴퓨터에 저장했습니다.\n"
-"오데이셔스가 동작할 수 있는대로 바로 제출합니다."
-
-#: src/scrobbler2/config_window.cc:77
-msgid "Network Problem."
-msgstr "네트워크에 문제가 있습니다."
+"권한이 거부되었습니다. 브라우저에서 다음 URL을 열고 계정에 대한 Audacious 액"
+"세스를 허용한 다음 '권한 확인'을 다시 클릭합니다:"
 
-#: src/scrobbler2/config_window.cc:78
-msgid "There was a problem contacting Last.fm. Please try again later."
-msgstr "Last.fm에 연결하는데 문제가 있습니다. 다시 시도해 주십시오."
+#: src/scrobbler2/config_window.cc:53
+msgid "There was a problem contacting Last.fm."
+msgstr "Last.fm에 접속하는 동안 문제가 발생했습니다."
 
-#: src/scrobbler2/config_window.cc:110
-msgid "Checking..."
-msgstr "확인중..."
+#: src/scrobbler2/config_window.cc:92
+msgid "Check Permission"
+msgstr "권한 확인"
 
-#: src/scrobbler2/config_window.cc:176
-msgid "C_heck Permission"
-msgstr "권한 확인(_H)"
+#: src/scrobbler2/config_window.cc:93
+msgid "Revoke Permission"
+msgstr "권한 거절"
 
-#: src/scrobbler2/config_window.cc:177
-msgid "_Revoke Permission"
-msgstr "권한 취소(_R)"
-
-#: src/scrobbler2/config_window.cc:220
-msgid ""
-"You need to allow Audacious to scrobble tracks to your Last.fm account.\n"
-msgstr "오데이셔스가 Last.fm 계정에 트랙을 추출할 수 있게 해야 합니다.\n"
+#: src/scrobbler2/config_window.cc:97
+msgid "You need to allow Audacious to scrobble tracks to your Last.fm account."
+msgstr ""
+"Audacious가 사용자의 Last.fm 계정으로 트랙을 스크롤할 수 있도록 허용해야 합니"
+"다."
 
 #: src/scrobbler2/scrobbler.cc:29
 msgid "Scrobbler 2.0"
 msgstr "스크로블러 2.0"
 
-#: src/scrobbler2/scrobbler.cc:224
+#: src/scrobbler2/scrobbler.cc:200
 msgid ""
 "The Scrobbler plugin could not be started.\n"
 "There might be a problem with your installation."
@@ -2956,113 +3310,112 @@
 "스크로블러 플러그인을 시작할 수 없습니다.\n"
 "설치에 문제가 있는 것 같습니다."
 
-#: src/scrobbler2/scrobbler.cc:289
+#: src/scrobbler2/scrobbler.cc:245
 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"
+"project."
 msgstr ""
-"Audacious Scrobbler Plugin 2.0 by Pitxyoki,\n"
+"Pitxyoki의 Audacious Scrobbler 플러그인 2.0,\n"
 "\n"
 "Copyright © 2012-2013 Luís M. Picciochi Oliveira <Pitxyoki@Gmail.com>\n"
 "\n"
-"이 프로젝트를 시작하는데 도움을 준 John Lindgren에게 감사드립니다.\n"
-"\n"
+"이 프로젝트를 시작할 때 도움을 주신 John Lindgren님께 감사드립니다."
 
-#: src/scrobbler2/scrobbler_communication.cc:642
-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/sdlout.cc:48
+#: src/sdlout/sdlout.cc:43
 msgid "SDL Output"
 msgstr "SDL 출력"
 
-#: src/sdlout/sdlout.cc:77
+#: src/sdlout/sdlout.cc:72
 msgid ""
 "SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
 msgstr ""
-"오데이셔스용 SDL 출력 플러그인\n"
-"Copyright 2010 John Lindgren"
+"Audacious용 SDL 출력 플러그인\n"
+"저작권 2010 John Lindgren"
 
-#: src/search-tool/search-tool.cc:116 src/search-tool/search-tool.cc:124
+#: src/search-tool/library.cc:35 src/search-tool/library.cc:46
+#: src/search-tool-qt/library.cc:35 src/search-tool-qt/library.cc:46
 msgid "Library"
 msgstr "라이브러리"
 
-#: src/search-tool/search-tool.cc:394
-#, c-format
-msgid "%d result"
-msgid_plural "%d results"
-msgstr0 "결과 %d개"
-
-#: src/search-tool/search-tool.cc:400
-#, c-format
-msgid "(%d hidden)"
-msgid_plural "(%d hidden)"
-msgstr0 "(숨긴 항목 %d개)"
-
-#: src/search-tool/search-tool.cc:594
+#: src/search-tool-qt/search-model.cc:44 src/search-tool/search-tool.cc:287
 #, c-format
 msgid "%d song"
 msgid_plural "%d songs"
 msgstr0 "노래 %d곡"
 
-#: src/search-tool/search-tool.cc:601
+#: src/search-tool-qt/search-model.cc:53 src/search-tool/search-tool.cc:294
 msgid "of this genre"
 msgstr ": 이 장르에 해당"
 
-#: src/search-tool/search-tool.cc:607
+#: src/search-tool-qt/search-model.h:47 src/search-tool/search-model.h:45
 msgid "on"
-msgstr ""
+msgstr "앨범:"
 
-#: src/search-tool/search-tool.cc:607
+#: src/search-tool-qt/search-model.h:47 src/search-tool/search-model.h:45
 msgid "by"
-msgstr ""
+msgstr "아티스트:"
 
-#: src/search-tool/search-tool.cc:643
-msgid "_Create Playlist"
-msgstr "재생 목록 만들기(_C)"
+#: src/search-tool-qt/search-tool-qt.cc:165 src/search-tool/search-tool.cc:74
+msgid "Number of results to show:"
+msgstr "표시할 결과 수:"
 
-#: src/search-tool/search-tool.cc:645
-msgid "_Add to Playlist"
-msgstr "재생 목록 추가하기(_A)"
+#: src/search-tool-qt/search-tool-qt.cc:168 src/search-tool/search-tool.cc:77
+msgid "Rescan library at startup"
+msgstr "시작 시 라이브러리 다시 스캔"
 
-#: src/search-tool/search-tool.cc:684
-msgid "Search library"
-msgstr "라이브러리 검색"
+#: src/search-tool-qt/search-tool-qt.cc:170
+msgid "Monitor library for changes"
+msgstr "변경사항에 대한 라이브러리 모니터링"
 
-#: src/search-tool/search-tool.cc:688
+#: src/search-tool-qt/search-tool-qt.cc:193 src/search-tool/search-tool.cc:450
 msgid ""
 "To import your music library into Audacious, choose a folder and then click "
 "the \"refresh\" icon."
 msgstr ""
-"음악 라이브러리를 오데이셔스로 가져오려면 폴더를 선택하고 \"새로고침\"아이콘"
+"음악 라이브러리를 Audacious로 가져오려면 폴더를 선택하고 \"새로고침\"아이콘"
 "을 누르십시오."
 
-#: src/search-tool/search-tool.cc:696
+#: src/search-tool-qt/search-tool-qt.cc:195 src/search-tool/search-tool.cc:459
 msgid "Please wait ..."
 msgstr "기다려 주십시오 ..."
 
-#: src/search-tool/search-tool.cc:723
+#: src/search-tool-qt/search-tool-qt.cc:197 src/search-tool/search-tool.cc:487
 msgid "Choose Folder"
 msgstr "폴더 선택"
 
+#: src/search-tool-qt/search-tool-qt.cc:201 src/search-tool/search-tool.cc:445
+msgid "Search library"
+msgstr "라이브러리 검색"
+
+#: src/search-tool-qt/search-tool-qt.cc:327 src/search-tool/search-tool.cc:156
+#, c-format
+msgid "%d of %d result shown"
+msgid_plural "%d of %d results shown"
+msgstr0 "%d / %d의 결과 표시됨"
+
+#: src/search-tool-qt/search-tool-qt.cc:331 src/search-tool/search-tool.cc:160
+#, c-format
+msgid "%d result"
+msgid_plural "%d results"
+msgstr0 "결과 %d개"
+
+#: src/search-tool-qt/search-tool-qt.cc:501 src/search-tool/search-tool.cc:341
+msgid "_Create Playlist"
+msgstr "재생목록 만들기(_C)"
+
+#: src/search-tool-qt/search-tool-qt.cc:503 src/search-tool/search-tool.cc:343
+msgid "_Add to Playlist"
+msgstr "재생목록 추가하기(_A)"
+
 #: src/sid/xmms-sid.cc:43
 msgid "SID Player"
 msgstr "SID 재생기"
 
-#: src/sid/xs_config.cc:61
-msgid "Output"
-msgstr "출력"
-
 #: src/sid/xs_config.cc:62
 msgid "Channels:"
 msgstr "채널:"
@@ -3093,11 +3446,11 @@
 
 #: src/sid/xs_config.cc:80
 msgid "Playback time"
-msgstr "재생 시간"
+msgstr "플레이백 시간"
 
 #: src/sid/xs_config.cc:81
 msgid "Set maximum playback time:"
-msgstr "최대 재생 시간 설정:"
+msgstr "최대 플레이백 시간 설정:"
 
 #: src/sid/xs_config.cc:87
 msgid "Use only when song length is unknown"
@@ -3105,776 +3458,721 @@
 
 #: src/sid/xs_config.cc:90
 msgid "Set minimum playback time:"
-msgstr "최소 재생 시간 설정:"
+msgstr "최소 플레이백 시간 설정:"
 
 #: src/sid/xs_config.cc:96
 msgid "Subtunes"
-msgstr ""
+msgstr "서브튠스"
 
 #: src/sid/xs_config.cc:97
 msgid "Enable subtunes"
-msgstr ""
+msgstr "subtunes 사용하기"
 
 #: src/sid/xs_config.cc:99
 msgid "Ignore subtunes shorter than:"
-msgstr ""
+msgstr "다음보다 짧은 하위 튜닝 무시"
 
 #: src/sid/xs_config.cc:105
 msgid "Note"
-msgstr ""
+msgstr "메모"
 
 #: src/silence-removal/silence-removal.cc:39
 msgid "Silence Removal"
-msgstr ""
+msgstr "무음 제거"
 
 #: src/silence-removal/silence-removal.cc:58
 msgid ""
 "Silence Removal Plugin for Audacious\n"
 "Copyright 2014 John Lindgren"
 msgstr ""
+"Audacious용 무음 제거 플러그인\n"
+"저작권 2014 John Lindgren"
 
 #: src/silence-removal/silence-removal.cc:67
 msgid "Silence Removal"
-msgstr ""
+msgstr "무음 제거"
 
 #: src/silence-removal/silence-removal.cc:68
 msgid "Threshold:"
-msgstr ""
+msgstr "임계치:"
 
-#: src/silence-removal/silence-removal.cc:70
-msgid "dB"
-msgstr ""
+#: src/skins/actions.cc:45 src/skins-qt/actions.cc:43
+msgid "Repeat points cleared."
+msgstr "반복 시점을 지웠습니다."
+
+#: src/skins/actions.cc:60 src/skins-qt/actions.cc:58
+msgid "Repeat point A set."
+msgstr "A 반복 시점을 설정했습니다."
+
+#: src/skins/actions.cc:65 src/skins-qt/actions.cc:63
+msgid "Repeat point B set."
+msgstr "B 반복 시점을 설정했습니다."
+
+#: src/skins/equalizer.cc:223 src/skins-qt/equalizer.cc:223
+msgid "Preamp"
+msgstr "프리앰프"
+
+#: src/skins/equalizer.cc:227 src/skins-qt/equalizer.cc:227
+msgid "31 Hz"
+msgstr "31 Hz"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "63 Hz"
+msgstr "63 Hz"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "125 Hz"
+msgstr "125 Hz"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "250 Hz"
+msgstr "250 Hz"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "500 Hz"
+msgstr "500 Hz"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "1 kHz"
+msgstr "1 kHz"
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "2 kHz"
+msgstr "2 kHz"
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "4 kHz"
+msgstr "4 kHz"
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "8 kHz"
+msgstr "8 kHz"
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "16 kHz"
+msgstr "16 kHz"
+
+#: src/skins/equalizer.cc:270 src/skins-qt/equalizer.cc:270
+msgid "Audacious Equalizer"
+msgstr "Audacious 이퀄라이저"
+
+#: src/skins/main.cc:459 src/skins-qt/main.cc:442
+msgid "Recording on"
+msgstr "녹음 켜기"
+
+#: src/skins/main.cc:461 src/skins-qt/main.cc:444
+msgid "Recording off"
+msgstr "녹음 끄기"
+
+#: src/skins/main.cc:754 src/skins-qt/main.cc:701
+#, c-format
+msgid "Seek to %d:%-2.2d / %d:%-2.2d"
+msgstr "%d 탐색:%-2.2d / %d:%-2.2d"
+
+#: src/skins/main.cc:771 src/skins-qt/main.cc:718
+#, c-format
+msgid "Volume: %d%%"
+msgstr "음량: %d%%"
+
+#: src/skins/main.cc:784 src/skins-qt/main.cc:731
+#, c-format
+msgid "Balance: %d%% left"
+msgstr "균형: %d%% 왼쪽"
+
+#: src/skins/main.cc:786 src/skins-qt/main.cc:733
+msgid "Balance: center"
+msgstr "균형: 가운데"
+
+#: src/skins/main.cc:788 src/skins-qt/main.cc:735
+#, c-format
+msgid "Balance: %d%% right"
+msgstr "균형: %d%% 오른쪽"
+
+#: src/skins/main.cc:880 src/skins-qt/main.cc:827
+msgid "Options Menu"
+msgstr "옵션 메뉴"
+
+#: src/skins/main.cc:884 src/skins-qt/main.cc:831
+msgid "Disable 'Always On Top'"
+msgstr "'항상 위' 비활성화"
+
+#: src/skins/main.cc:886 src/skins-qt/main.cc:833
+msgid "Enable 'Always On Top'"
+msgstr "'항상 위' 활성화"
+
+#: src/skins/main.cc:889 src/skins-qt/main.cc:836
+msgid "File Info Box"
+msgstr "파일 정보 상자"
 
-#: src/skins/menus.cc:64
+#: src/skins/main.cc:892 src/skins/menus.cc:149 src/skins-qt/main.cc:839
+#: src/skins-qt/menus.cc:142
+msgid "Double Size"
+msgstr "두배 길이"
+
+#: src/skins/main.cc:895 src/skins-qt/main.cc:842
+msgid "Visualizations"
+msgstr "시각화"
+
+#: src/skins/menus.cc:74 src/skins-qt/menus.cc:64
+msgid "Volume Up"
+msgstr "음량 크게"
+
+#: src/skins/menus.cc:75 src/skins-qt/menus.cc:65
+msgid "Volume Down"
+msgstr "음량 작게"
+
+#: src/skins/menus.cc:77 src/skins-qt/menus.cc:67
+msgid "Effects ..."
+msgstr "효과..."
+
+#: src/skins/menus.cc:84 src/skins-qt/menus.cc:74
 msgid "Open Files ..."
 msgstr "파일 열기..."
 
-#: src/skins/menus.cc:65
+#: src/skins/menus.cc:85 src/skins-qt/menus.cc:76
 msgid "Open URL ..."
 msgstr "URL 열기..."
 
-#: src/skins/menus.cc:66
-msgid "Search Library"
-msgstr "라이브러리 검색"
-
-#: src/skins/menus.cc:68
-msgid "Playback"
-msgstr "재생"
-
-#: src/skins/menus.cc:69
+#: src/skins/menus.cc:89 src/skins-qt/menus.cc:80
 msgid "Playlist"
-msgstr "재생 목록"
+msgstr "재생목록"
+
+#: src/skins/menus.cc:90 src/skins-qt/menus.cc:81
+msgid "Output"
+msgstr "출력"
 
-#: src/skins/menus.cc:70
+#: src/skins/menus.cc:91 src/skins-qt/menus.cc:82
 msgid "View"
 msgstr "보기"
 
-#: src/skins/menus.cc:72 src/skins/menus.cc:136 src/skins/menus.cc:149
-#: src/skins/menus.cc:214
+#: src/skins/menus.cc:93 src/skins/menus.cc:161 src/skins/menus.cc:174
+#: src/skins/menus.cc:245 src/skins-qt/menus.cc:84 src/skins-qt/menus.cc:156
+#: src/skins-qt/menus.cc:170 src/skins-qt/menus.cc:241
 msgid "Services"
 msgstr "서비스"
 
-#: src/skins/menus.cc:74
+#: src/skins/menus.cc:95 src/skins-qt/menus.cc:86
 msgid "About ..."
 msgstr "정보..."
 
-#: src/skins/menus.cc:75
+#: src/skins/menus.cc:96 src/skins-qt/menus.cc:87
 msgid "Settings ..."
 msgstr "설정..."
 
-#: src/skins/menus.cc:76
+#: src/skins/menus.cc:97 src/skins-qt/menus.cc:88
 msgid "Quit"
 msgstr "끝내기"
 
-#: src/skins/menus.cc:80 src/skins/menus.cc:206
+#: src/skins/menus.cc:101 src/skins/menus.cc:235 src/skins-qt/menus.cc:92
+#: src/skins-qt/menus.cc:231
 msgid "Song Info ..."
 msgstr "곡 정보..."
 
-#: src/skins/menus.cc:84
-msgid "No Playlist Advance"
-msgstr "이전 재생목록이 없습니다"
+#: src/skins/menus.cc:105 src/skins-qt/menus.cc:96
+msgid "Shuffle by Album"
+msgstr "앨범별로 순서섞기"
 
-#: src/skins/menus.cc:85
-msgid "Stop After This Song"
-msgstr "이 곡 다음 멈춤"
+#: src/skins/menus.cc:106 src/skins-qt/menus.cc:97
+msgid "No Playlist Advance"
+msgstr "재생목록 진행 없음"
 
-#: src/skins/menus.cc:93
+#: src/skins/menus.cc:117 src/skins-qt/menus.cc:108
 msgid "Set A-B Repeat"
 msgstr "A-B 반복 설정"
 
-#: src/skins/menus.cc:94
+#: src/skins/menus.cc:118 src/skins-qt/menus.cc:109
 msgid "Clear A-B Repeat"
 msgstr "A-B 반복 지우기"
 
-#: src/skins/menus.cc:96
+#: src/skins/menus.cc:120 src/skins-qt/menus.cc:111
 msgid "Jump to Song ..."
 msgstr "지정 곡으로 건너뛰기..."
 
-#: src/skins/menus.cc:97
+#: src/skins/menus.cc:121 src/skins-qt/menus.cc:113
 msgid "Jump to Time ..."
 msgstr "지정 시간으로 건너뛰기..."
 
-#: src/skins/menus.cc:101
+#: src/skins/menus.cc:125 src/skins-qt/menus.cc:118
 msgid "Play/Resume"
-msgstr "재생/재개"
+msgstr "재생하기/이어듣기"
 
-#: src/skins/menus.cc:103
+#: src/skins/menus.cc:127 src/skins-qt/menus.cc:120
 msgid "New Playlist"
-msgstr "새 재생 목록"
+msgstr "새 재생목록"
 
-#: src/skins/menus.cc:104
+#: src/skins/menus.cc:128 src/skins-qt/menus.cc:121
 msgid "Rename Playlist ..."
-msgstr "재생 목록 제거..."
+msgstr "재생목록 제거..."
 
-#: src/skins/menus.cc:105
+#: src/skins/menus.cc:129 src/skins-qt/menus.cc:122
 msgid "Remove Playlist"
-msgstr "재생 목록 제거"
+msgstr "재생목록 제거"
 
-#: src/skins/menus.cc:107
+#: src/skins/menus.cc:131 src/skins-qt/menus.cc:124
 msgid "Previous Playlist"
-msgstr "이전 재생 목록"
+msgstr "이전 재생목록"
 
-#: src/skins/menus.cc:108
+#: src/skins/menus.cc:132 src/skins-qt/menus.cc:125
 msgid "Next Playlist"
-msgstr "다음 재생 목록"
+msgstr "다음 재생목록"
 
-#: src/skins/menus.cc:110
+#: src/skins/menus.cc:134 src/skins-qt/menus.cc:127
 msgid "Import Playlist ..."
-msgstr "재생 목록 가져오기..."
+msgstr "재생목록 가져오기..."
 
-#: src/skins/menus.cc:111
+#: src/skins/menus.cc:135 src/skins-qt/menus.cc:128
 msgid "Export Playlist ..."
-msgstr "재생 목록 내보내기..."
+msgstr "재생목록 내보내기..."
 
-#: src/skins/menus.cc:113
+#: src/skins/menus.cc:137 src/skins-qt/menus.cc:130
 msgid "Playlist Manager ..."
-msgstr "재생 목록 관리자..."
+msgstr "재생목록 관리자..."
 
-#: src/skins/menus.cc:114
+#: src/skins/menus.cc:138 src/skins-qt/menus.cc:131
 msgid "Queue Manager ..."
 msgstr "큐 관리자..."
 
-#: src/skins/menus.cc:116
+#: src/skins/menus.cc:140 src/skins-qt/menus.cc:133
 msgid "Refresh Playlist"
-msgstr "재생 목록 새로 고침"
+msgstr "재생목록 새로 고침"
 
-#: src/skins/menus.cc:120
+#: src/skins/menus.cc:144 src/skins-qt/menus.cc:137
 msgid "Show Playlist Editor"
-msgstr "재생 목록 편집기 표시"
+msgstr "재생목록 편집기 표시하기"
 
-#: src/skins/menus.cc:121
+#: src/skins/menus.cc:145 src/skins-qt/menus.cc:138
 msgid "Show Equalizer"
-msgstr "이퀄라이저 표시"
+msgstr "이퀄라이저 표시하기"
 
-#: src/skins/menus.cc:123
+#: src/skins/menus.cc:147 src/skins-qt/menus.cc:140
 msgid "Show Remaining Time"
-msgstr "남은 시간 표시"
+msgstr "남은 시간 표시하기"
 
-#: src/skins/menus.cc:125
+#: src/skins/menus.cc:150 src/skins-qt/menus.cc:143
 msgid "Always on Top"
 msgstr "항상 위"
 
-#: src/skins/menus.cc:126
+#: src/skins/menus.cc:151 src/skins-qt/menus.cc:145
 msgid "On All Workspaces"
 msgstr "모든 작업 공간에 표시"
 
-#: src/skins/menus.cc:128
+#: src/skins/menus.cc:153 src/skins-qt/menus.cc:148
 msgid "Roll Up Player"
 msgstr "재생 프로그램 말아 올리기"
 
-#: src/skins/menus.cc:129
+#: src/skins/menus.cc:154 src/skins-qt/menus.cc:149
 msgid "Roll Up Playlist Editor"
-msgstr "재생 목록 편집기 말아 올리기"
+msgstr "재생목록 편집기 말아 올리기"
 
-#: src/skins/menus.cc:130
+#: src/skins/menus.cc:155 src/skins-qt/menus.cc:150
 msgid "Roll Up Equalizer"
 msgstr "이퀄라이저 말아 올리기"
 
-#: src/skins/menus.cc:132 src/skins/ui_main.cc:854
-msgid "Double Size"
-msgstr "두배 길이"
-
-#: src/skins/menus.cc:138
+#: src/skins/menus.cc:163 src/skins-qt/menus.cc:158
 msgid "Add URL ..."
-msgstr "URL 추가..."
+msgstr "URL 추가하기 ..."
 
-#: src/skins/menus.cc:139
+#: src/skins/menus.cc:164 src/skins-qt/menus.cc:160
 msgid "Add Files ..."
-msgstr "파일 추가..."
+msgstr "파일 추가하기 ..."
 
-#: src/skins/menus.cc:143 src/skins/menus.cc:171 src/skins/menus.cc:185
+#: src/skins/menus.cc:168 src/skins/menus.cc:196 src/skins/menus.cc:212
+#: src/skins-qt/menus.cc:164 src/skins-qt/menus.cc:192
+#: src/skins-qt/menus.cc:208
 msgid "By Title"
-msgstr "제목별"
+msgstr "제목순"
 
-#: src/skins/menus.cc:144 src/skins/menus.cc:178 src/skins/menus.cc:192
+#: src/skins/menus.cc:169 src/skins/menus.cc:203 src/skins/menus.cc:219
+#: src/skins-qt/menus.cc:165 src/skins-qt/menus.cc:199
+#: src/skins-qt/menus.cc:215
 msgid "By File Name"
-msgstr "파일 이름별"
+msgstr "파일 이름순"
 
-#: src/skins/menus.cc:145 src/skins/menus.cc:179 src/skins/menus.cc:193
+#: src/skins/menus.cc:170 src/skins/menus.cc:204 src/skins/menus.cc:220
+#: src/skins-qt/menus.cc:166 src/skins-qt/menus.cc:200
+#: src/skins-qt/menus.cc:216
 msgid "By File Path"
 msgstr "파일 경로순"
 
-#: src/skins/menus.cc:151
+#: src/skins/menus.cc:176 src/skins-qt/menus.cc:172
 msgid "Remove All"
 msgstr "모두 제거"
 
-#: src/skins/menus.cc:152
+#: src/skins/menus.cc:177 src/skins-qt/menus.cc:173
 msgid "Clear Queue"
 msgstr "대기 목록 지우기"
 
-#: src/skins/menus.cc:154
+#: src/skins/menus.cc:179 src/skins-qt/menus.cc:175
 msgid "Remove Unavailable Files"
 msgstr "사용할 수 없는 파일 제거"
 
-#: src/skins/menus.cc:155
+#: src/skins/menus.cc:180 src/skins-qt/menus.cc:176
 msgid "Remove Duplicates"
 msgstr "복제본 제거"
 
-#: src/skins/menus.cc:157
+#: src/skins/menus.cc:182 src/skins-qt/menus.cc:178
 msgid "Remove Unselected"
 msgstr "선택하지 않은 항목 제거"
 
-#: src/skins/menus.cc:158
+#: src/skins/menus.cc:183 src/skins-qt/menus.cc:179
 msgid "Remove Selected"
 msgstr "선택한 항목 제거"
 
-#: src/skins/menus.cc:162
+#: src/skins/menus.cc:187 src/skins-qt/menus.cc:183
 msgid "Search and Select"
 msgstr "검색하고 선택"
 
-#: src/skins/menus.cc:164
+#: src/skins/menus.cc:189 src/skins-qt/menus.cc:185
 msgid "Invert Selection"
 msgstr "선택 반전"
 
-#: src/skins/menus.cc:165
+#: src/skins/menus.cc:190 src/skins-qt/menus.cc:186
 msgid "Select None"
 msgstr "선택하지 않음"
 
-#: src/skins/menus.cc:166
+#: src/skins/menus.cc:191 src/skins-qt/menus.cc:187
 msgid "Select All"
 msgstr "모두 선택"
 
-#: src/skins/menus.cc:170 src/skins/menus.cc:184
+#: src/skins/menus.cc:195 src/skins/menus.cc:211 src/skins-qt/menus.cc:191
+#: src/skins-qt/menus.cc:207
 msgid "By Track Number"
 msgstr "트랙 번호순"
 
-#: src/skins/menus.cc:172 src/skins/menus.cc:186
+#: src/skins/menus.cc:197 src/skins/menus.cc:213 src/skins-qt/menus.cc:193
+#: src/skins-qt/menus.cc:209
 msgid "By Artist"
-msgstr "음악가순"
+msgstr "아티스트순"
 
-#: src/skins/menus.cc:173 src/skins/menus.cc:187
+#: src/skins/menus.cc:198 src/skins/menus.cc:214 src/skins-qt/menus.cc:194
+#: src/skins-qt/menus.cc:210
 msgid "By Album"
-msgstr "앨범 제목순"
+msgstr "앨범순"
 
-#: src/skins/menus.cc:174 src/skins/menus.cc:188
+#: src/skins/menus.cc:199 src/skins/menus.cc:215 src/skins-qt/menus.cc:195
+#: src/skins-qt/menus.cc:211
 msgid "By Album Artist"
-msgstr "앨범 음악가별"
+msgstr "앨범 아티스트순"
 
-#: src/skins/menus.cc:175 src/skins/menus.cc:190
+#: src/skins/menus.cc:200 src/skins/menus.cc:216 src/skins-qt/menus.cc:196
+#: src/skins-qt/menus.cc:212
 msgid "By Release Date"
-msgstr "출시일자순"
+msgstr "출시 일자순"
 
-#: src/skins/menus.cc:176 src/skins/menus.cc:189
+#: src/skins/menus.cc:201 src/skins/menus.cc:217 src/skins-qt/menus.cc:197
+#: src/skins-qt/menus.cc:213
 msgid "By Genre"
-msgstr "장르별"
+msgstr "장르순"
 
-#: src/skins/menus.cc:177 src/skins/menus.cc:191
+#: src/skins/menus.cc:202 src/skins/menus.cc:218 src/skins-qt/menus.cc:198
+#: src/skins-qt/menus.cc:214
 msgid "By Length"
-msgstr "길이별"
+msgstr "길이순"
 
-#: src/skins/menus.cc:180 src/skins/menus.cc:194
+#: src/skins/menus.cc:205 src/skins/menus.cc:221 src/skins-qt/menus.cc:201
+#: src/skins-qt/menus.cc:217
 msgid "By Custom Title"
-msgstr "지정 제목별"
+msgstr "사용자 지정 제목순"
+
+#: src/skins/menus.cc:206 src/skins/menus.cc:222 src/skins-qt/menus.cc:202
+#: src/skins-qt/menus.cc:218
+msgid "By Comment"
+msgstr "주석순"
+
+#: src/skins/menus.cc:207 src/skins/menus.cc:223 src/skins-qt/menus.cc:203
+#: src/skins-qt/menus.cc:219
+msgid "By Disc Number"
+msgstr "디스크 번호순"
 
-#: src/skins/menus.cc:198
+#: src/skins/menus.cc:227 src/skins-qt/menus.cc:223
 msgid "Randomize List"
 msgstr "목록 순서 뒤섞기"
 
-#: src/skins/menus.cc:199
+#: src/skins/menus.cc:228 src/skins-qt/menus.cc:224
 msgid "Reverse List"
 msgstr "목록 순서 뒤집기"
 
-#: src/skins/menus.cc:201
+#: src/skins/menus.cc:230 src/skins-qt/menus.cc:226
 msgid "Sort Selected"
 msgstr "선택한 항목 정렬"
 
-#: src/skins/menus.cc:202
+#: src/skins/menus.cc:231 src/skins-qt/menus.cc:227
 msgid "Sort List"
 msgstr "목록 정렬"
 
-#: src/skins/menus.cc:208
+#: src/skins/menus.cc:236 src/skins-qt/menus.cc:232
+msgid "Open Containing Folder"
+msgstr "포함하는 폴더 열기"
+
+#: src/skins/menus.cc:238 src/skins-qt/menus.cc:234
 msgid "Cut"
 msgstr "잘라내기"
 
-#: src/skins/menus.cc:209
+#: src/skins/menus.cc:239 src/skins-qt/menus.cc:235
 msgid "Copy"
 msgstr "복사"
 
-#: src/skins/menus.cc:210
+#: src/skins/menus.cc:240 src/skins-qt/menus.cc:236
 msgid "Paste"
 msgstr "붙여넣기"
 
-#: src/skins/menus.cc:212
+#: src/skins/menus.cc:241 src/skins-qt/menus.cc:237
+msgid "Paste at End"
+msgstr "마지막 부분에 붙여넣기"
+
+#: src/skins/menus.cc:243 src/skins-qt/menus.cc:239
 msgid "Queue/Unqueue"
 msgstr "큐에 넣기/큐에서 빼기"
 
-#: src/skins/menus.cc:218
-msgid "Load Preset ..."
-msgstr "설정 목록 불러오기..."
-
-#: src/skins/menus.cc:219
-msgid "Load Auto Preset ..."
-msgstr "자동 설정 목록 불러오기..."
-
-#: src/skins/menus.cc:220
-msgid "Load Default"
-msgstr "기본 설정 불러오기"
-
-#: src/skins/menus.cc:221
-msgid "Load Preset File ..."
-msgstr "설정 목록 파일 불러오기..."
-
-#: src/skins/menus.cc:222
-msgid "Load EQF File ..."
-msgstr "EQF 파일 불러오기..."
-
-#: src/skins/menus.cc:224
-msgid "Save Preset ..."
-msgstr "설정 목록 저장..."
-
-#: src/skins/menus.cc:225
-msgid "Save Auto Preset ..."
-msgstr "자동 설정 목록 저장..."
-
-#: src/skins/menus.cc:226
-msgid "Save Default"
-msgstr "기본 설정 저장"
-
-#: src/skins/menus.cc:227
-msgid "Save Preset File ..."
-msgstr "설정 목록 파일 저장..."
-
-#: src/skins/menus.cc:228
-msgid "Save EQF File ..."
-msgstr "EQF 파일 저장..."
-
-#: src/skins/menus.cc:230
-msgid "Delete Preset ..."
-msgstr "설정 목록 삭제..."
-
-#: src/skins/menus.cc:231
-msgid "Delete Auto Preset ..."
-msgstr "자동 설정 목록 삭제..."
-
-#: src/skins/menus.cc:233
-msgid "Import Winamp Presets ..."
-msgstr "윈앰프 설정 목록 가져오기..."
-
-#: src/skins/menus.cc:235
-msgid "Reset to Zero"
-msgstr "0 값으로 초기화"
+#: src/skins/playlist-widget.cc:58 src/skins-qt/playlist-widget.cc:58
+#, c-format
+msgid "%s (%d of %d)"
+msgstr "%1$s (%3$d중 %2$d)"
 
-#: src/skins/plugin.cc:48
+#: src/skins/playlistwin.cc:491 src/skins-qt/playlistwin.cc:478
+msgid "Audacious Playlist Editor"
+msgstr "Audacious 재생목록 편집기"
+
+#: src/skins/plugin.cc:53 src/skins-qt/plugin.cc:65
 msgid "Winamp Classic Interface"
 msgstr "Winamp 클래식 인터페이스"
 
-#: src/skins/preset-browser.cc:57 src/skins/preset-list.cc:371
-#: src/skins/preset-list.cc:386
-msgid "Save"
-msgstr "저장"
-
-#: src/skins/preset-browser.cc:57 src/skins/preset-list.cc:338
-#: src/skins/preset-list.cc:354
-msgid "Load"
-msgstr "불러오기"
-
-#: src/skins/preset-browser.cc:83
-msgid "Load Preset File"
-msgstr "설정 목록 파일 불러오기"
-
-#: src/skins/preset-browser.cc:100
-msgid "Load EQF File"
-msgstr "EQF 파일 불러오기"
-
-#: src/skins/preset-browser.cc:119
-msgid "Save Preset File"
-msgstr "설정 목록 파일 저장"
-
-#: src/skins/preset-browser.cc:137
-msgid "Save EQF File"
-msgstr "EQF 파일 저장"
-
-#: src/skins/preset-browser.cc:151
-msgid "Import Winamp Presets"
-msgstr "윈앰프 설정 목록 불러오기"
-
-#: src/skins/preset-list.cc:285
-msgid "Presets"
-msgstr "설정 목록"
-
-#: src/skins/preset-list.cc:335
-msgid "Load preset"
-msgstr "설정 목록 불러오기"
-
-#: src/skins/preset-list.cc:351
-msgid "Load auto-preset"
-msgstr "자동 설정 목록 불러오기"
-
-#: src/skins/preset-list.cc:367
-msgid "Save preset"
-msgstr "설정 목록 저장"
-
-#: src/skins/preset-list.cc:382
-msgid "Save auto-preset"
-msgstr "자동 설정 목록 저장"
-
-#: src/skins/preset-list.cc:408
-msgid "Delete preset"
-msgstr "설정 목록 삭제"
-
-#: src/skins/preset-list.cc:424
-msgid "Delete auto-preset"
-msgstr "자동 설정 목록 삭제"
+#: src/skins-qt/menus.cc:75
+msgid "Open Folder ..."
+msgstr "폴더 열기..."
+
+#: src/skins-qt/menus.cc:159
+msgid "Add Folder ..."
+msgstr "폴더 추가하기 ..."
+
+#: src/skins-qt/search-select.cc:62 src/skins/search-select.cc:77
+msgid "Search entries in active playlist"
+msgstr "활성 재생목록에서 항목 검색"
+
+#: src/skins-qt/search-select.cc:70 src/skins/search-select.cc:83
+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/skins_cfg.cc:176
+#: src/skins-qt/search-select.cc:75 src/skins/search-select.cc:91
+msgid "Title:"
+msgstr "제목:"
+
+#: src/skins-qt/search-select.cc:79 src/skins/search-select.cc:96
+msgid "Album:"
+msgstr "앨범:"
+
+#: src/skins-qt/search-select.cc:82 src/skins/search-select.cc:101
+msgid "Artist:"
+msgstr "아티스트:"
+
+#: src/skins-qt/search-select.cc:85 src/skins/search-select.cc:106
+msgid "File Name:"
+msgstr "파일 이름:"
+
+#: src/skins-qt/search-select.cc:88 src/skins/search-select.cc:134
+msgid "Clear previous selection before searching"
+msgstr "검색하기 전에 이전 선택항목 지우기"
+
+#: src/skins-qt/search-select.cc:89 src/skins/search-select.cc:137
+msgid "Automatically toggle queue for matching entries"
+msgstr "일치하는 항목에 대해 자동으로 대기 목록을 전환하기"
+
+#: src/skins-qt/search-select.cc:90 src/skins/search-select.cc:140
+msgid "Create a new playlist with matching entries"
+msgstr "일치하는 항목에 대해 새 재생목록 만들기"
+
+#: src/skins-qt/search-select.cc:101 src/skins/search-select.cc:78
+msgid "Search"
+msgstr "검색"
+
+#: src/skins-qt/skins_cfg.cc:198 src/skins/skins_cfg.cc:182
 msgid "Player:"
 msgstr "연주자:"
 
-#: src/skins/skins_cfg.cc:178
+#: src/skins-qt/skins_cfg.cc:200 src/skins/skins_cfg.cc:184
 msgid "Select main player window font:"
 msgstr "주 재생기 창 글꼴 선택:"
 
-#: src/skins/skins_cfg.cc:179
+#: src/skins-qt/skins_cfg.cc:201 src/skins/skins_cfg.cc:185
 msgid "Playlist:"
 msgstr "재생목록:"
 
-#: src/skins/skins_cfg.cc:181
+#: src/skins-qt/skins_cfg.cc:203 src/skins/skins_cfg.cc:187
 msgid "Select playlist font:"
-msgstr "재생 목록 글꼴 선택:"
+msgstr "재생목록 글꼴 선택:"
 
-#: src/skins/skins_cfg.cc:187
+#: src/skins-qt/skins_cfg.cc:207 src/skins/skins_cfg.cc:191
 msgid "Skin"
 msgstr "스킨"
 
-#: src/skins/skins_cfg.cc:189
+#: src/skins-qt/skins_cfg.cc:211 src/skins/skins_cfg.cc:193
+msgid "Display active titlebar when any window is focused"
+msgstr "창에 초점을 맞출 때 활성 제목 보이기"
+
+#: src/skins-qt/skins_cfg.cc:213 src/skins/skins_cfg.cc:195
 msgid "Fonts"
 msgstr "글꼴"
 
-#: src/skins/skins_cfg.cc:192
+#: src/skins-qt/skins_cfg.cc:215 src/skins/skins_cfg.cc:197
 msgid "Use bitmap fonts (supports ASCII only)"
-msgstr "비트맵 글꼴 사용(아스키 전용 지원)"
+msgstr "비트맵 글꼴 사용(ASCII만 지원)"
 
-#: src/skins/skins_cfg.cc:194
+#: src/skins-qt/skins_cfg.cc:217 src/skins/skins_cfg.cc:199
 msgid "Scroll song title"
 msgstr "곡 제목 스크롤"
 
-#: src/skins/skins_cfg.cc:196
+#: src/skins-qt/skins_cfg.cc:219 src/skins/skins_cfg.cc:201
 msgid "Scroll song title in both directions"
 msgstr "양방향으로 곡 제목 스크롤"
 
-#: src/skins/skins_cfg.cc:201
+#: src/skins-qt/skins_cfg.cc:224 src/skins/skins_cfg.cc:206
 msgid "Analyzer"
 msgstr "분석기"
 
-#: src/skins/skins_cfg.cc:202
+#: src/skins-qt/skins_cfg.cc:225 src/skins/skins_cfg.cc:207
 msgid "Scope"
 msgstr "표시기"
 
-#: src/skins/skins_cfg.cc:203
+#: src/skins-qt/skins_cfg.cc:226 src/skins/skins_cfg.cc:208
 msgid "Voiceprint / VU meter"
 msgstr "보이스출력 / VU 메터"
 
-#: src/skins/skins_cfg.cc:204
+#: src/skins-qt/skins_cfg.cc:227 src/skins/skins_cfg.cc:209
 msgid "Off"
 msgstr "끄기"
 
-#: src/skins/skins_cfg.cc:208 src/skins/skins_cfg.cc:233
-#: src/skins/skins_cfg.cc:239
+#: src/skins-qt/skins_cfg.cc:231 src/skins-qt/skins_cfg.cc:256
+#: src/skins-qt/skins_cfg.cc:262 src/skins/skins_cfg.cc:213
+#: src/skins/skins_cfg.cc:238 src/skins/skins_cfg.cc:244
 msgid "Normal"
 msgstr "보통"
 
-#: src/skins/skins_cfg.cc:209 src/skins/skins_cfg.cc:234
+#: src/skins-qt/skins_cfg.cc:232 src/skins-qt/skins_cfg.cc:257
+#: src/skins/skins_cfg.cc:214 src/skins/skins_cfg.cc:239
 msgid "Fire"
 msgstr "불"
 
-#: src/skins/skins_cfg.cc:210
+#: src/skins-qt/skins_cfg.cc:233 src/skins/skins_cfg.cc:215
 msgid "Vertical lines"
 msgstr "수평선"
 
-#: src/skins/skins_cfg.cc:214
+#: src/skins-qt/skins_cfg.cc:237 src/skins/skins_cfg.cc:219
 msgid "Lines"
 msgstr "선"
 
-#: src/skins/skins_cfg.cc:215
+#: src/skins-qt/skins_cfg.cc:238 src/skins/skins_cfg.cc:220
 msgid "Bars"
 msgstr "막대"
 
-#: src/skins/skins_cfg.cc:219
+#: src/skins-qt/skins_cfg.cc:242 src/skins/skins_cfg.cc:224
 msgid "Slowest"
 msgstr "가장 느리게"
 
-#: src/skins/skins_cfg.cc:220
+#: src/skins-qt/skins_cfg.cc:243 src/skins/skins_cfg.cc:225
 msgid "Slow"
 msgstr "느리게"
 
-#: src/skins/skins_cfg.cc:221 src/sox-resampler/sox-resampler.cc:152
+#: src/skins-qt/skins_cfg.cc:244 src/skins/skins_cfg.cc:226
+#: src/soxr/sox-resampler.cc:180
 msgid "Medium"
 msgstr "중간"
 
-#: src/skins/skins_cfg.cc:222
+#: src/skins-qt/skins_cfg.cc:245 src/skins/skins_cfg.cc:227
 msgid "Fast"
 msgstr "빠르게"
 
-#: src/skins/skins_cfg.cc:223
+#: src/skins-qt/skins_cfg.cc:246 src/skins/skins_cfg.cc:228
 msgid "Fastest"
 msgstr "가장 빠르게"
 
-#: src/skins/skins_cfg.cc:227
+#: src/skins-qt/skins_cfg.cc:250 src/skins/skins_cfg.cc:232
 msgid "Dots"
 msgstr "점"
 
-#: src/skins/skins_cfg.cc:228
+#: src/skins-qt/skins_cfg.cc:251 src/skins/skins_cfg.cc:233
 msgid "Line"
 msgstr "선"
 
-#: src/skins/skins_cfg.cc:229
+#: src/skins-qt/skins_cfg.cc:252 src/skins/skins_cfg.cc:234
 msgid "Solid"
-msgstr "면"
+msgstr "솔리드"
 
-#: src/skins/skins_cfg.cc:235
+#: src/skins-qt/skins_cfg.cc:258 src/skins/skins_cfg.cc:240
 msgid "Ice"
 msgstr "얼음"
 
-#: src/skins/skins_cfg.cc:240
+#: src/skins-qt/skins_cfg.cc:263 src/skins/skins_cfg.cc:245
 msgid "Smooth"
 msgstr "부드럽게"
 
-#: src/skins/skins_cfg.cc:244
-msgid "Type"
-msgstr "방식"
-
-#: src/skins/skins_cfg.cc:245
-msgid "Visualization type:"
-msgstr "시각화 방식:"
-
-#: src/skins/skins_cfg.cc:248
-msgid "Analyzer"
-msgstr "분석 프로그램"
-
-#: src/skins/skins_cfg.cc:249
-msgid "Show peaks"
-msgstr "피크 표시"
-
-#: src/skins/skins_cfg.cc:251
+#: src/skins-qt/skins_cfg.cc:267 src/skins/skins_cfg.cc:249
 msgid "Coloring:"
 msgstr "색상 적용:"
 
-#: src/skins/skins_cfg.cc:254
+#: src/skins-qt/skins_cfg.cc:270 src/skins/skins_cfg.cc:252
 msgid "Style:"
 msgstr "방식:"
 
-#: src/skins/skins_cfg.cc:257
+#: src/skins-qt/skins_cfg.cc:273 src/skins/skins_cfg.cc:255
 msgid "Falloff:"
 msgstr "폴 오프:"
 
-#: src/skins/skins_cfg.cc:260
+#: src/skins-qt/skins_cfg.cc:276 src/skins/skins_cfg.cc:258
 msgid "Peak falloff:"
 msgstr "최대 폴 오프:"
 
-#: src/skins/skins_cfg.cc:264
+#: src/skins-qt/skins_cfg.cc:282 src/skins/skins_cfg.cc:264
 msgid "Scope Style:"
 msgstr "스코프 모양새:"
 
-#: src/skins/skins_cfg.cc:267
+#: src/skins-qt/skins_cfg.cc:285 src/skins/skins_cfg.cc:267
 msgid "Voiceprint Coloring:"
 msgstr "보이스 출력 색상 적용:"
 
-#: src/skins/skins_cfg.cc:270
+#: src/skins-qt/skins_cfg.cc:288 src/skins/skins_cfg.cc:270
 msgid "VU Meter Style:"
 msgstr "VU 메터 모양새:"
 
-#: src/skins/skins_cfg.cc:276
-msgid "General"
-msgstr "일반"
-
-#: src/skins/skins_cfg.cc:277
-msgid "Visualization"
-msgstr "시각화"
-
-#: src/skins/ui_equalizer.cc:282
-msgid "Preamp"
-msgstr "프리앰프"
-
-#: src/skins/ui_equalizer.cc:286
-msgid "31 Hz"
-msgstr "31 Hz"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "63 Hz"
-msgstr "63 Hz"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "125 Hz"
-msgstr "125 Hz"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "250 Hz"
-msgstr "250 Hz"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "500 Hz"
-msgstr "500 Hz"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "1 kHz"
-msgstr "1 kHz"
-
-#: src/skins/ui_equalizer.cc:288
-msgid "2 kHz"
-msgstr "2 kHz"
-
-#: src/skins/ui_equalizer.cc:288
-msgid "4 kHz"
-msgstr "4 kHz"
-
-#: src/skins/ui_equalizer.cc:288
-msgid "8 kHz"
-msgstr "8 kHz"
-
-#: src/skins/ui_equalizer.cc:288
-msgid "16 kHz"
-msgstr "16 kHz"
-
-#: src/skins/ui_equalizer.cc:330
-msgid "Audacious Equalizer"
-msgstr "오데이셔스 이퀄라이저"
-
-#: src/skins/ui_main.cc:688
-#, c-format
-msgid "Seek to %d:%-2.2d / %d:%-2.2d"
-msgstr "%d 탐색:%-2.2d / %d:%-2.2d"
-
-#: src/skins/ui_main.cc:709
-#, c-format
-msgid "Volume: %d%%"
-msgstr "음량: %d%%"
-
-#: src/skins/ui_main.cc:732
-#, c-format
-msgid "Balance: %d%% left"
-msgstr "균형: %d%% 왼쪽"
-
-#: src/skins/ui_main.cc:734
-msgid "Balance: center"
-msgstr "균형: 가운데"
-
-#: src/skins/ui_main.cc:736
-#, c-format
-msgid "Balance: %d%% right"
-msgstr "균형: %d%% 오른쪽"
-
-#: src/skins/ui_main.cc:842
-msgid "Options Menu"
-msgstr "옵션 메뉴"
-
-#: src/skins/ui_main.cc:846
-msgid "Disable 'Always On Top'"
-msgstr "'항상 위' 비활성화"
-
-#: src/skins/ui_main.cc:848
-msgid "Enable 'Always On Top'"
-msgstr "'항상 위' 활성화"
-
-#: src/skins/ui_main.cc:851
-msgid "File Info Box"
-msgstr "파일 정보 상자"
-
-#: src/skins/ui_main.cc:857
-msgid "Visualizations"
-msgstr ""
-
-#: src/skins/ui_main.cc:1336
-msgid "Repeat point A set."
-msgstr "A 반복 시점을 설정했습니다."
-
-#: src/skins/ui_main.cc:1341
-msgid "Repeat point B set."
-msgstr "B 반복 시점을 설정했습니다."
-
-#: src/skins/ui_main.cc:1350
-msgid "Repeat points cleared."
-msgstr "반복 시점을 지웠습니다."
-
-#: src/skins/ui_playlist.cc:219
-msgid "Search entries in active playlist"
-msgstr "활성 재생 목록에서 항목 검색"
-
-#: src/skins/ui_playlist.cc:226
-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.cc:234
-msgid "Title:"
-msgstr ""
-
-#: src/skins/ui_playlist.cc:241
-msgid "Album:"
-msgstr ""
-
-#: src/skins/ui_playlist.cc:248
-msgid "Artist:"
-msgstr ""
-
-#: src/skins/ui_playlist.cc:255
-msgid "File Name:"
-msgstr ""
-
-#: src/skins/ui_playlist.cc:263
-msgid "Clear previous selection before searching"
-msgstr "검색하기 전에 이전 선택항목 지우기"
+#: src/skins-qt/skins_cfg.cc:294 src/skins/skins_cfg.cc:276
+msgid "Type"
+msgstr "방식"
 
-#: src/skins/ui_playlist.cc:266
-msgid "Automatically toggle queue for matching entries"
-msgstr "일치하는 항목에 대해 자동으로 대기 목록을 전환하기"
+#: src/skins-qt/skins_cfg.cc:295 src/skins/skins_cfg.cc:277
+msgid "Visualization type:"
+msgstr "시각화 방식:"
 
-#: src/skins/ui_playlist.cc:269
-msgid "Create a new playlist with matching entries"
-msgstr "일치하는 항목에 대해 새 재생 목록 만들기"
+#: src/skins-qt/skins_cfg.cc:298 src/skins/skins_cfg.cc:280
+msgid "Analyzer"
+msgstr "분석 프로그램"
 
-#: src/skins/ui_playlist.cc:717
-msgid "Audacious Playlist Editor"
-msgstr "오데이셔스 재생 목록 편집기"
+#: src/skins-qt/skins_cfg.cc:299 src/skins/skins_cfg.cc:281
+msgid "Show peaks"
+msgstr "피크 표시하기"
 
-#: src/skins/ui_playlist.cc:752
-#, c-format
-msgid "%s (%d of %d)"
-msgstr "%1$s (%3$d중 %2$d)"
+#: src/skins-qt/skins_cfg.cc:308 src/skins/skins_cfg.cc:290
+msgid "Visualization"
+msgstr "시각화"
 
-#: src/skins/ui_skinselector.cc:167
+#: src/skins-qt/skinselector.cc:98 src/skins/skinselector.cc:111
 msgid "Archived Winamp 2.x skin"
 msgstr "압축한 Winamp 2.x 스킨"
 
-#: src/skins/ui_skinselector.cc:172
+#: src/skins-qt/skinselector.cc:102 src/skins/skinselector.cc:115
 msgid "Unarchived Winamp 2.x skin"
 msgstr "압축하지 않은 Winamp 2.x 스킨"
 
-#: src/skins/util.cc:430
-#, c-format
-msgid "Could not create directory (%s): %s\n"
-msgstr "(%s) 디렉터리를 만들 수 없습니다: %s\n"
-
-#: src/sndfile/plugin.cc:39
+#: src/sndfile/plugin.cc:38
 msgid "Sndfile Plugin"
 msgstr "Sndfile 플러그인"
 
-#: src/sndfile/plugin.cc:336
+#: src/sndfile/plugin.cc:372
 msgid ""
 "Based on the xmms_sndfile plugin:\n"
 "Copyright (C) 2000, 2002 Erik de Castro Lopo\n"
@@ -3896,111 +4194,128 @@
 "Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 msgstr ""
 "xmms_sndfile 플러그인 기반.\n"
-"Copyright (C) 2000, 2002 Erik de Castro Lopo\n"
+"저작권 (C) 2000, 2002 Erik de Castro Lopo\n"
 "\n"
 "Adapted for Audacious by Tony Vroon <chainsaw@gentoo.org>\n"
 "\n"
 "\n"
-"이 프로그램은 자유 소프트웨어입니다; 자유 소프트웨어 재단이 발표한 GNU 일반 "
-"공중 사용허가서 2판(또는 여러분의 선택에 따라) 이상의 조항에 따라 재배포 또"
-"는 수정할 수 있습니다.\n"
-"\n"
-"이 프로그램이 유용하게 사용되길 바라지만 그 어떤 보증도 없으며 심지어는 상업"
-"적 보증이나 일부 목적의 적합성에 대한 암시적 보증도 하지 않습니다. 자세한 내"
-"용은 GNU 일반 공중 사용허가서를 보십시오.\n"
-"\n"
-"이 프로그램과 함께 GNU 일반 공중 사용 허가서 사본을 받아야 합니다. 만약 사본"
-"이 없다면 자유 소프트웨어 재단에 요청하십시오. 51 Franklin Street, Fifth "
-"Floor, Boston, MA 02110-1301, USA."
+"이 프로그램은 자유 소프트웨어입니다; 자유 소프트웨어 재단에서 발행한 GNU 일"
+"반 공중 라이선스의 조건에 따라 이를 재배포 및/또는 수정할 수 있습니다; 라이선"
+"스 버전 2 또는 (귀하의 선택에 따라) 이후 버전.\n"
+"\n"
+"이 프로그램은 유용할 것이라는 희망으로 배포되지만 어떠한 보증도 하지 않습니"
+"다. 상품성 또는 특정 목적에의 적합성에 대한 묵시적 보증도 없이. 자세한 내용"
+"은 GNU 일반 공중 라이선스를 참조하십시오.\n"
+"\n"
+"이 프로그램과 함께 GNU 일반 공중 라이선스를 받았어야 합니다. 그렇지 않은 경"
+"우 Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, "
+"MA 02110-1301, USA에 문의하십시오."
 
-#: src/sndio-ng/sndio.cc:44
+#: src/sndio/sndio.cc:43
 msgid "Sndio Output"
-msgstr ""
+msgstr "sndio 출력"
 
-#: src/sndio-ng/sndio.cc:98
+#: src/sndio/sndio.cc:98
 msgid "Device (blank for default):"
-msgstr ""
+msgstr "장치(빈 값이 기본값):"
 
-#: src/sndio-ng/sndio.cc:100
+#: src/sndio/sndio.cc:100
 msgid "Save and restore volume:"
-msgstr ""
+msgstr "저장하고 되돌릴 음량:"
 
-#: src/sndio-ng/sndio.cc:181
+#: src/sndio/sndio.cc:181
 #, c-format
 msgid "Sndio error: Unsupported audio format (%d)"
-msgstr ""
+msgstr "Sndio error: 지원하지 않는 오디오포맷 입니다.(%d)"
 
-#: src/sndio-ng/sndio.cc:192
+#: src/sndio/sndio.cc:192
 msgid "Sndio error: sio_open() failed"
-msgstr ""
+msgstr "Sndio 오류: sio_open() 실패"
 
-#: src/sndio-ng/sndio.cc:222
+#: src/sndio/sndio.cc:221
 msgid "Sndio error: sio_setpar() failed"
-msgstr ""
+msgstr "Sndio 오류: sio_setpar() 실패"
 
-#: src/sndio-ng/sndio.cc:234
+#: src/sndio/sndio.cc:233
 msgid "Sndio error: sio_start() failed"
-msgstr ""
+msgstr "Sndio 오류: sio_start() 실패"
 
-#: src/song_change/song_change.cc:33
+#: src/songchange/song_change.cc:30
 msgid "Song Change"
-msgstr "곡 바꾸기"
-
-#: src/song_change/song_change.cc:342
-msgid ""
-"Parameters passed to the shell should be encapsulated in "
-"quotes. Doing otherwise is a security risk."
-msgstr ""
-"쉘에 전달하는 인자는 따옴표로 감싸야 합니다. 그렇게 하지 "
-"않으면 보안 문제가 생깁니다."
+msgstr "곡 변경"
 
-#: src/song_change/song_change.cc:358
+#: src/songchange/song_change.cc:256
 msgid "Commands"
-msgstr ""
+msgstr "명령"
 
-#: src/song_change/song_change.cc:360
+#: src/songchange/song_change.cc:258
 msgid "Command to run when starting a new song:"
+msgstr "새 노래를 시작할때 실행될 명령:"
+
+#: src/songchange/song_change.cc:261
+msgid "Command to run when stopping a song:"
 msgstr ""
 
-#: src/song_change/song_change.cc:364
+#: src/songchange/song_change.cc:264
 msgid "Command to run at the end of a song:"
-msgstr ""
+msgstr "노래가 끝날때 실행될 명령:"
 
-#: src/song_change/song_change.cc:368
+#: src/songchange/song_change.cc:267
 msgid "Command to run at the end of the playlist:"
-msgstr ""
+msgstr "재생목록이 끝나갈때 실행될 명령:"
 
-#: src/song_change/song_change.cc:372
+#: src/songchange/song_change.cc:270
 msgid "Command to run when song title changes (for network streams):"
+msgstr "노래 제목이 변경될 때 실행할 명령(네트워크 스트림의 경우):"
+
+#: src/songchange/song_change.cc:273
+msgid ""
+"You can use the following format codes, which will be replaced before "
+"running the command.\n"
+"Not all are useful though for the song-stopped or end-of-playlist command."
 msgstr ""
 
-#: src/song_change/song_change.cc:376
+#: src/songchange/song_change.cc:276
 msgid ""
-"You can use the following format strings which will be substituted before "
-"calling the command (not all are useful for the end-of-playlist command):\n"
-"\n"
-"%F: Frequency (in hertz)\n"
+"%a: Artist\n"
+"%b: Album\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"
+"%F: Frequency (Hertz)\n"
+"%l: Length (milliseconds)\n"
+"%n or %s: Formatted title (see playlist settings)\n"
 "%p: Currently playing (1 or 0)\n"
-"%a: Artist\n"
-"%b: Album\n"
-"%T: Track title"
-msgstr ""
-
-#: src/song-info-qt/song-info.cc:32
-msgid "Song Info (Qt)"
-msgstr ""
+"%r: Rate (bits per second)\n"
+"%t: Playlist position\n"
+"%T: Title (unformatted)"
+msgstr ""
+"%a: 아티스트\n"
+"%b: 앨범\n"
+"%c: 채널 수\n"
+"%f: 파일 이름(전체 경로)\n"
+"%F: 주파수(헤르츠)\n"
+"%l: 길이(밀리초)\n"
+"%n 또는 %s: 형식이 지정된 제목(재생목록 설정 참조)\n"
+"%p: 현재 재생 중(1 또는 0)\n"
+"%r: 속도(초당 비트 수)\n"
+"%t: 재생목록 위치\n"
+"%T: 제목(형식 없음)"
+
+#: src/songchange/song_change.cc:287
+msgid ""
+"Parameters passed to the shell should be enclosed in quotation marks.\n"
+"Unquoted parameters may lead to unexpected results."
+msgstr ""
+
+#: src/song-info-qt/song-info.cc:30
+msgid "Song Info"
+msgstr "곡 정보"
 
-#: src/sox-resampler/sox-resampler.cc:44
+#: src/soxr/sox-resampler.cc:44
 msgid "SoX Resampler"
 msgstr "SoX 리샘플러"
 
-#: src/sox-resampler/sox-resampler.cc:144
+#: src/soxr/sox-resampler.cc:172
 msgid ""
 "SoX Resampler Plugin for Audacious\n"
 "Copyright 2013 Michał Lipski\n"
@@ -4008,102 +4323,150 @@
 "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"
+"Audacious용 SoX 리샘플러 플러그인\n"
+"저작권 2013 Michał Lipski\n"
+"\n"
+"샘플 레이트 변환기 플러그인 기반:\n"
+"저작권 2010-2012 John Lindgren"
 
-#: src/sox-resampler/sox-resampler.cc:150
+#: src/soxr/sox-resampler.cc:178
 msgid "Quick"
 msgstr "빠름"
 
-#: src/sox-resampler/sox-resampler.cc:151
+#: src/soxr/sox-resampler.cc:179
 msgid "Low"
 msgstr "낮음"
 
-#: src/sox-resampler/sox-resampler.cc:153
+#: src/soxr/sox-resampler.cc:181
 msgid "High"
 msgstr "높음"
 
-#: src/sox-resampler/sox-resampler.cc:154
+#: src/soxr/sox-resampler.cc:182
 msgid "Very High"
 msgstr "매우 높음"
 
-#: src/sox-resampler/sox-resampler.cc:158
+#: src/soxr/sox-resampler.cc:183
+msgid "Ultra High"
+msgstr "매우 좋은 "
+
+#: src/soxr/sox-resampler.cc:187
+msgid "Minimum"
+msgstr "최소"
+
+#: src/soxr/sox-resampler.cc:188
+msgid "Intermediate"
+msgstr "중간"
+
+#: src/soxr/sox-resampler.cc:193
 msgid "Quality:"
 msgstr "음질:"
 
-#: src/speed-pitch/speed-pitch.cc:51
+#: src/soxr/sox-resampler.cc:196
+msgid "Phase:"
+msgstr "위상:"
+
+#: src/soxr/sox-resampler.cc:200
+msgid "Allow aliasing"
+msgstr "앨리어싱 허용"
+
+#: src/soxr/sox-resampler.cc:202
+msgid "Use steep filter"
+msgstr "가파른 필터 사용"
+
+#: src/speedpitch/speed-pitch.cc:54
 msgid "Speed and Pitch"
 msgstr "속도와 피치"
 
-#: src/speed-pitch/speed-pitch.cc:210
-msgid "Speed and Pitch"
-msgstr "속도와 피치"
-
-#: src/speed-pitch/speed-pitch.cc:211
-msgid "Speed:"
-msgstr "속도:"
-
-#: src/speed-pitch/speed-pitch.cc:214
-msgid "Pitch:"
-msgstr "피치:"
+#: src/speedpitch/speed-pitch.cc:247
+msgid "Speed"
+msgstr "속도"
+
+#: src/speedpitch/speed-pitch.cc:248
+msgid "Decouple from pitch"
+msgstr "피치에서 분리"
+
+#: src/speedpitch/speed-pitch.cc:250 src/speedpitch/speed-pitch.cc:258
+msgid "Multiplier:"
+msgstr "증폭기:"
+
+#: src/speedpitch/speed-pitch.cc:254
+msgid "Pitch"
+msgstr "피치"
 
-#: src/statusicon/statusicon.cc:47
+#: src/statusicon-qt/statusicon.cc:45 src/statusicon/statusicon.cc:47
 msgid "Status Icon"
 msgstr "상태 아이콘"
 
-#: src/statusicon/statusicon.cc:283
-msgid "Se_ttings ..."
-msgstr "설정(_T)..."
-
-#: src/statusicon/statusicon.cc:372
+#: src/statusicon-qt/statusicon.cc:68
 msgid ""
-"Status Icon Plugin\n"
+"Status Icon Plugin (partial port for Qt interface)\n"
 "\n"
 "Copyright 2005-2007 Giacomo Lozito <james@develia.org>\n"
 "Copyright 2010 Michał Lipski <tallica@o2.pl>\n"
+"Copyright 2015 Eugene Paskevich <eugene@raptor.kiev.ua>\n"
 "\n"
 "This plugin provides a status icon, placed in\n"
 "the system tray area of the window manager."
 msgstr ""
-"상태 아이콘 플러그인\n"
+"상태 아이콘 플러그인 (Qt 인터페이스용 부분 포트)\n"
 "\n"
-"Copyright 2005-2007 Giacomo Lozito <james@develia.org>\n"
-"Copyright 2010 Michał Lipski <tallica@o2.pl>\n"
+"저작권 2005-2007 Giacomo Lozito <james@develia.org>\n"
+"저작권 2010 Michał Lipski <tallica@o2.pl>\n"
+"저작권 2015 Eugene Paskevich <eugene@raptor.kiev.ua>\n"
 "\n"
-"이 플러그인은 창 관리자의 시스템 표시줄 영역에\n"
-"뜨는 상태 아이콘을 제공합니다."
+"이 플러그인은 창 관리자의 시스템 트레이 영역에\n"
+"있는 상태 아이콘을 제공합니다."
 
-#: src/statusicon/statusicon.cc:379
+#: src/statusicon-qt/statusicon.cc:89 src/statusicon/statusicon.cc:384
 msgid "Mouse Scroll Action"
 msgstr "마우스 스크롤 동작"
 
-#: src/statusicon/statusicon.cc:380
+#: src/statusicon-qt/statusicon.cc:90 src/statusicon/statusicon.cc:385
 msgid "Change volume"
-msgstr "음량 조절하기"
+msgstr "음량 변경"
 
-#: src/statusicon/statusicon.cc:383
+#: src/statusicon-qt/statusicon.cc:93 src/statusicon/statusicon.cc:388
 msgid "Change playing song"
-msgstr "재생중인 곡 바꾸기"
+msgstr "재생중인 곡 변경"
 
-#: src/statusicon/statusicon.cc:386
+#: src/statusicon-qt/statusicon.cc:96 src/statusicon/statusicon.cc:391
 msgid "Other Settings"
 msgstr "기타 설정"
 
-#: src/statusicon/statusicon.cc:387
+#: src/statusicon-qt/statusicon.cc:97 src/statusicon/statusicon.cc:392
 msgid "Disable the popup window"
 msgstr "풍선 도움말 창 비활성화"
 
-#: src/statusicon/statusicon.cc:389
+#: src/statusicon-qt/statusicon.cc:99 src/statusicon/statusicon.cc:394
 msgid "Close to the system tray"
 msgstr "시스템 트레이로 전환"
 
-#: src/statusicon/statusicon.cc:391
+#: src/statusicon-qt/statusicon.cc:101 src/statusicon/statusicon.cc:396
 msgid "Advance in playlist when scrolling upward"
 msgstr "재생목록을 위로 스크롤 할 때 미리 알림"
 
+#: src/statusicon-qt/statusicon.cc:116 src/statusicon/statusicon.cc:287
+msgid "Se_ttings ..."
+msgstr "설정(_T)..."
+
+#: src/statusicon/statusicon.cc:377
+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/stereo_plugin/stereo.cc:19
 msgid "Extra Stereo"
 msgstr "엑스트라 스테레오"
@@ -4122,20 +4485,160 @@
 msgid "Extra Stereo"
 msgstr "엑스트라 스테레오"
 
+#: src/streamtuner/icecast-model.cc:126 src/streamtuner/shoutcast-model.cc:131
+msgid "Type"
+msgstr "유형"
+
+#: src/streamtuner/icecast-model.cc:132
+msgid "Current Song"
+msgstr "현재 노래"
+
+#: src/streamtuner/icecast-model.cc:164
+msgid "Other"
+msgstr "기타"
+
+#: src/streamtuner/ihr-model.cc:63
+msgid "Market"
+msgstr "장터"
+
+#: src/streamtuner/ihr-model.cc:156
+msgid "Call Letters"
+msgstr "호출 부호"
+
+#: src/streamtuner/ihr-model.cc:162
+msgid "Description"
+msgstr "설명"
+
+#: src/streamtuner/shoutcast-model.cc:128
+msgid "Listeners"
+msgstr "청취자"
+
+#: src/streamtuner/shoutcast-model.cc:188
+msgid "Top 500 Stations"
+msgstr "상위 500개 방송국"
+
+#: src/streamtuner/shoutcast-model.cc:189
+msgid "Alternative"
+msgstr "대체"
+
+#: src/streamtuner/shoutcast-model.cc:190
+msgid "Blues"
+msgstr "블루스"
+
+#: src/streamtuner/shoutcast-model.cc:191
+msgid "Classical"
+msgstr "클래식"
+
+#: src/streamtuner/shoutcast-model.cc:192
+msgid "Country"
+msgstr "컨트리"
+
+#: src/streamtuner/shoutcast-model.cc:193
+msgid "Decades"
+msgstr "년대"
+
+#: src/streamtuner/shoutcast-model.cc:194
+msgid "Easy Listening"
+msgstr "쉬운 듣기"
+
+#: src/streamtuner/shoutcast-model.cc:195
+msgid "Electronic"
+msgstr "일렉트로닉"
+
+#: src/streamtuner/shoutcast-model.cc:196
+msgid "Folk"
+msgstr "포크"
+
+#: src/streamtuner/shoutcast-model.cc:197
+msgid "Inspirational"
+msgstr "영감"
+
+#: src/streamtuner/shoutcast-model.cc:198
+msgid "International"
+msgstr "국가별"
+
+#: src/streamtuner/shoutcast-model.cc:199
+msgid "Jazz"
+msgstr "재즈"
+
+#: src/streamtuner/shoutcast-model.cc:200
+msgid "Latin"
+msgstr "라틴어"
+
+#: src/streamtuner/shoutcast-model.cc:201
+msgid "Metal"
+msgstr "메탈"
+
+#: src/streamtuner/shoutcast-model.cc:203
+msgid "New Age"
+msgstr "뉴 에이지"
+
+#: src/streamtuner/shoutcast-model.cc:204
+msgid "Pop"
+msgstr "팝"
+
+#: src/streamtuner/shoutcast-model.cc:205
+msgid "Public Radio"
+msgstr "공공 라디오"
+
+#: src/streamtuner/shoutcast-model.cc:206
+msgid "R&B and Urban"
+msgstr "R&B 및 어반"
+
+#: src/streamtuner/shoutcast-model.cc:207
+msgid "Rap"
+msgstr "랩"
+
+#: src/streamtuner/shoutcast-model.cc:208
+msgid "Reggae"
+msgstr "레게"
+
+#: src/streamtuner/shoutcast-model.cc:209
+msgid "Rock"
+msgstr "락"
+
+#: src/streamtuner/shoutcast-model.cc:210
+msgid "Seasonal and Holiday"
+msgstr "계절 및 휴일"
+
+#: src/streamtuner/shoutcast-model.cc:211
+msgid "Soundtracks"
+msgstr "사운드트랙"
+
+#: src/streamtuner/shoutcast-model.cc:212
+msgid "Talk"
+msgstr "말하기"
+
+#: src/streamtuner/shoutcast-model.cc:213
+msgid "Themes"
+msgstr "테마"
+
+#: src/streamtuner/streamtuner.cc:59
+msgid "Shoutcast"
+msgstr "샤우트캐스트"
+
+#: src/streamtuner/streamtuner.cc:60
+msgid "Icecast"
+msgstr "아이스캐스트"
+
+#: src/streamtuner/streamtuner.cc:71
+msgid "Stream Tuner"
+msgstr "스트림 튜너"
+
 #: src/tonegen/tonegen.cc:45
 msgid "Tone Generator"
 msgstr "톤 생성기"
 
-#: src/tonegen/tonegen.cc:94
+#: src/tonegen/tonegen.cc:92
 #, c-format
 msgid "%s %.1f Hz"
 msgstr "%s %.1f Hz"
 
-#: src/tonegen/tonegen.cc:94
+#: src/tonegen/tonegen.cc:92
 msgid "Tone Generator: "
 msgstr "톤 생성기:"
 
-#: src/tonegen/tonegen.cc:160
+#: src/tonegen/tonegen.cc:161
 msgid ""
 "Sine tone generator by Håvard Kvålen <havardk@xmms.org>\n"
 "Modified by Daniel J. Peng <danielpeng@bigfoot.com>\n"
@@ -4143,18 +4646,39 @@
 "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"
+"사인 톤 생성기: 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 톤으로 재생합니다."
+"예를 들어, tone://2000;2005는 2000 Hz 톤과 a 2005 Hz 톤으로 재생합니다."
+
+#: src/ui-common/dialogs-qt.cc:40
+msgid ""
+"\n"
+"(Further messages have been hidden.)"
+msgstr ""
+"\n"
+"(이하 메시지는 숨겨져 있습니다.)"
+
+#: src/ui-common/dialogs-qt.cc:52
+msgid "Working ..."
+msgstr "동작중 ..."
+
+#: src/ui-common/dialogs-qt.cc:73
+msgid "Information"
+msgstr "wjdqh"
+
+#: src/ui-common/menu-ops-gtk.cc:132 src/ui-common/menu-ops-qt.cc:113
+#, c-format
+msgid "%s does not appear to be a valid folder."
+msgstr "%s은(는) 올바른 폴더가 아닌 것 같습니다."
 
 #: src/voice_removal/voice_removal.cc:28
 msgid "Voice Removal"
 msgstr "육성 제거"
 
-#: src/vorbis/vorbis.cc:465
+#: src/vorbis/vorbis.cc:433
 msgid ""
 "Audacious Ogg Vorbis Decoder\n"
 "\n"
@@ -4174,15 +4698,15 @@
 "Gian-Carlo Pascutto <gcp@sjeng.org>\n"
 "Eugene Zagidullin <e.asphyx@gmail.com>"
 msgstr ""
-"오데이셔스 Ogg Vorbis 디코더\n"
+"Audacious Ogg Vorbis 디코더\n"
 "\n"
-"Xiph.org 재단의 Ogg Vorbis 플러그인을 기반으로 합니다:\n"
+"Xiph.org 재단의 Ogg Vorbis 플러그인 기반:\n"
 "http://www.xiph.org/\n"
 "\n"
 "초기 코드 작성자:\n"
 "Tony Arcieri <bascule@inferno.tusculum.edu>\n"
 "\n"
-"공헌자:\n"
+"기여자:\n"
 "Chris Montgomery <monty@xiph.org>\n"
 "Peter Alm <peter@xmms.org>\n"
 "Michael Smith <msmith@labyrinth.edu.au>\n"
@@ -4196,12 +4720,12 @@
 msgid "Ogg Vorbis Decoder"
 msgstr "Ogg Vorbis "
 
-#: src/vtx/info.cc:22
+#: src/vtx/info.cc:24
 #, c-format
 msgid "Details about %s"
-msgstr ""
+msgstr "%s 세부 정보"
 
-#: src/vtx/info.cc:24
+#: src/vtx/info.cc:26
 msgid ""
 "Title: %t\n"
 "Author: %a\n"
@@ -4215,12 +4739,23 @@
 "Player Freq: %P\n"
 "Year: %y"
 msgstr ""
+"제목: %t\n"
+"작성자: %a\n"
+"From: %f\n"
+"트래커: %T\n"
+"주석: %C\n"
+"칩 유형: %c\n"
+"스테레오: %s\n"
+"루프: %l\n"
+"칩 주파수: %F\n"
+"재생기 주파수: %P\n"
+"연도: %y"
 
 #: src/vtx/vtx.cc:38
 msgid "VTX Decoder"
 msgstr "VTX 디코더"
 
-#: src/vtx/vtx.cc:184
+#: src/vtx/vtx.cc:178
 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"
@@ -4228,42 +4763,106 @@
 msgstr ""
 "Vortex 파일 형식 재생기 by Sashnov Alexander <sashnov@ngs.ru>\n"
 "Roman Sherbakov <v_soft@microfor.ru>의 in_vtx.dll을 기반으로 함\n"
-"Pavel Vymetalek <pvymetalek@seznam.cz>이 오데이셔스 플러그인 제작"
+"Pavel Vymetalek <pvymetalek@seznam.cz>이 Audacious 플러그인 제작"
+
+#: src/vumeter-qt/vumeter_qt.cc:31
+msgid ""
+"VU Meter Plugin for Audacious\n"
+"Copyright 2017-2019 Marc Sánchez Fauste"
+msgstr ""
+"Audacious용 VU 미터 플러그인\n"
+"저작권 2017-2019 Marc Sánchez Fauste"
+
+#: src/vumeter-qt/vumeter_qt.cc:35
+msgid "VU Meter Settings"
+msgstr "VU 미터 설정"
+
+#: src/vumeter-qt/vumeter_qt.cc:37
+msgid "Peak hold time:"
+msgstr "피크 홀드 시간:"
 
-#: src/wavpack/wavpack.cc:24
+#: src/vumeter-qt/vumeter_qt.cc:42
+msgid "Fall-off time:"
+msgstr "감소 시간:"
+
+#: src/vumeter-qt/vumeter_qt.cc:44
+msgid "dB/second"
+msgstr "dB/초"
+
+#: src/vumeter-qt/vumeter_qt.cc:46
+msgid "Display legend"
+msgstr "범례 보이기"
+
+#: src/vumeter-qt/vumeter_qt.h:37
+msgid "VU Meter"
+msgstr "VU 미터"
+
+#: src/waveout/waveout.cc:43
+msgid "Win32 waveOut"
+msgstr "Win32 waveOut"
+
+#: src/waveout/waveout.cc:69
+msgid ""
+"Win32 waveOut Plugin for Audacious\n"
+"Copyright 2016 John Lindgren"
+msgstr ""
+"Audacious용 Win32 waveOut 플러그인\n"
+"저작권 2016 John Lindgren"
+
+#: src/wavpack/wavpack.cc:25
 msgid "WavPack Decoder"
 msgstr "WavPack 디코더"
 
-#: src/wavpack/wavpack.cc:211
+#: src/wavpack/wavpack.cc:217
 msgid "lossy (hybrid)"
 msgstr "손실(혼성)"
 
-#: src/wavpack/wavpack.cc:213
+#: src/wavpack/wavpack.cc:219
 msgid "lossy"
 msgstr "손실"
 
-#: src/wavpack/wavpack.cc:255
+#: src/wavpack/wavpack.cc:259
 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"
+"저작권 2006 William Pitcock <nenolod@nenolod.net>\n"
 "\n"
 "플러그인 코드 일부는 Miles Egan이 작성했습니다."
 
-#: src/xsf/plugin.cc:50
+#: src/xsf/plugin.cc:74
 msgid "2SF Decoder"
 msgstr "2SF 디코더"
 
-#: src/xsf/plugin.cc:238
+#: src/xsf/plugin.cc:429
+msgid "32728 Hz"
+msgstr "32728 Hz"
+
+#: src/xsf/plugin.cc:432
+msgid "65456 Hz"
+msgstr "65456 Hz"
+
+#: src/xsf/plugin.cc:438
+msgid "Cosine"
+msgstr "코사인"
+
+#: src/xsf/plugin.cc:439
+msgid "Sharp"
+msgstr "급격한"
+
+#: src/xsf/plugin.cc:443
 msgid "XSF Configuration"
-msgstr ""
+msgstr "XSF 구성"
 
-#: src/xsf/plugin.cc:239
-msgid "Ignore length from file"
-msgstr ""
+#: src/xsf/plugin.cc:445
+msgid "Default fade time:"
+msgstr "기본 페이드 시간:"
+
+#: src/xsf/plugin.cc:447
+msgid "Interpolation mode:"
+msgstr "보간 모드:"
 
-#: src/xspf/xspf.cc:89
+#: src/xspf/xspf.cc:95
 msgid "XML Shareable Playlists (XSPF)"
-msgstr "XML 공유 가능 재생 목록(XSPF)"
+msgstr "XML 공유 가능 재생목록(XSPF)"

audacious-plugins-3.6.2-gtk3.tar.bz2/po/lt.po -> audacious-plugins-4.4.1.tar.bz2/po/lt.po Changed

@@ -3,306 +3,84 @@
 # This file is distributed under the same license as the Audacious Plugins package.
 #
 # Translators:
-# Algimantas Margevičius <gymka@archlinux.lt>, 2011-2014
-# Algimantas Margevičius <gymka@archlinux.lt>, 2011
+# Algimantas Margevičius <algimantas@margevicius.lt>, 2011-2014
+# Algimantas Margevičius <algimantas@margevicius.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
+# Tadas Masiulionis, 2022-2023
 msgid ""
 msgstr ""
 "Project-Id-Version: Audacious Plugins\n"
-"Report-Msgid-Bugs-To: http://redmine.audacious-media-player.org/\n"
-"POT-Creation-Date: 2015-02-28 19:18+0100\n"
-"PO-Revision-Date: 2015-02-04 21:21+0000\n"
-"Last-Translator: Thomas Lange <thomas-lange2@gmx.de>\n"
-"Language-Team: Lithuanian (http://www.transifex.com/projects/p/audacious/"
+"Report-Msgid-Bugs-To: https://github.com/audacious-media-player/audacious/"
+"issues\n"
+"POT-Creation-Date: 2024-09-26 21:54+0200\n"
+"PO-Revision-Date: 2011-10-10 17:43+0000\n"
+"Last-Translator: Tadas Masiulionis, 2022-2023\n"
+"Language-Team: Lithuanian (http://app.transifex.com/audacious/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"
-"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=4; plural=(n % 10 == 1 && (n % 100 > 19 || n % 100 < "
+"11) ? 0 : (n % 10 >= 2 && n % 10 <=9) && (n % 100 > 19 || n % 100 < 11) ? "
+"1 : n % 1 != 0 ? 2: 3);\n"
 
-#: src/aac-raw/aac.cc:18
+#: src/aac/aac.cc:19
 msgid "AAC (Raw) Decoder"
-msgstr "AAC (Raw) Dekoderis"
+msgstr "AAC (Raw) iškoduotuvas"
 
-#: src/adplug/adplug-xmms.cc:42
+#: src/adplug/adplug-xmms.cc:70
 msgid "AdPlug (AdLib Player)"
 msgstr "AdPlug (AdLib grotuvas)"
 
-#: src/adplug/adplug-xmms.cc:156 src/modplug/modplugbmp.cc:335
-#: src/psf/plugin.cc:138 src/vtx/vtx.cc:87 src/xsf/plugin.cc:113
+#: src/adplug/adplug-xmms.cc:167 src/modplug/modplugbmp.cc:321
+#: src/psf/plugin.cc:161 src/vtx/vtx.cc:89 src/xsf/plugin.cc:204
 msgid "sequenced"
 msgstr "nuoseklus"
 
-#: src/alarm/alarm.cc:55 src/alarm/interface.cc:82
-msgid "Alarm"
-msgstr "Žadintuvas"
-
-#: src/alarm/alarm.cc:782
-msgid "Set Alarm ..."
-msgstr "Nustatyti perspėjimą..."
-
-#: src/alarm/alarm.cc:810
-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"
-"\n"
-"Originaliai parašė Adam Feakin ir Daniel Stodden."
-
-#: src/alarm/interface.cc: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.cc: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.cc: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.cc:81
-msgid "This is your wakeup call."
-msgstr "Tai pabudimo skambutis."
-
-#: src/alarm/interface.cc:99
-msgid "Your reminder for today is..."
-msgstr "Šiandienos priminimas..."
-
-#: src/alarm/interface.cc:101 src/alarm/interface.cc:386
-msgid "Reminder"
-msgstr "Priminimas"
-
-#: src/alarm/interface.cc:132
-msgid "Monday"
-msgstr "Pirmadienis"
-
-#: src/alarm/interface.cc:132
-msgid "Tuesday"
-msgstr "Antradienis"
-
-#: src/alarm/interface.cc:132
-msgid "Wednesday"
-msgstr "Trečiadienis"
-
-#: src/alarm/interface.cc:133
-msgid "Thursday"
-msgstr "Ketvirtadienis"
-
-#: src/alarm/interface.cc:133
-msgid "Friday"
-msgstr "Penktadienis"
-
-#: src/alarm/interface.cc:133
-msgid "Saturday"
-msgstr "Šeštadienis"
-
-#: src/alarm/interface.cc:133
-msgid "Sunday"
-msgstr "Sekmadienis"
-
-#: src/alarm/interface.cc:171 src/alarm/interface.cc:230
-#: src/alarm/interface.cc:245
-msgid "Time"
-msgstr "Laikas"
-
-#: src/alarm/interface.cc:178
-msgid "Alarm at (default):"
-msgstr "Žadinti (numatyta):"
-
-#: src/alarm/interface.cc:200
-msgid "h"
-msgstr "v"
-
-#: src/alarm/interface.cc:203
-msgid "Quiet after:"
-msgstr "Nutildyti po:"
-
-#: src/alarm/interface.cc:215
-msgid "hours"
-msgstr "valandos"
-
-#: src/alarm/interface.cc:226
-msgid "minutes"
-msgstr "minutės"
-
-#: src/alarm/interface.cc:235
-msgid "Choose the days for the alarm to come on"
-msgstr "Pasirinkite dienas kuriomis žadinti"
-
-#: src/alarm/interface.cc:242
-msgid "Day"
-msgstr "Diena"
-
-#: src/alarm/interface.cc:259 src/bs2b/plugin.cc:130
-#: src/skins/preset-list.cc:434 src/skins/preset-list.cc:440
-msgid "Default"
-msgstr "Numatytosios"
-
-#: src/alarm/interface.cc:288
-msgid "Days"
-msgstr "Dienos"
-
-#: src/alarm/interface.cc:297
-msgid "Fading"
-msgstr "Išblukimas"
-
-#: src/alarm/interface.cc:305 src/console/plugin.cc:41
-#: src/crossfade/crossfade.cc:53 src/crossfade/crossfade.cc:59
-#: src/gtkui/settings.cc:49 src/lirc/lirc.cc:397 src/sid/xs_config.cc:85
-#: src/sid/xs_config.cc:94 src/sid/xs_config.cc:103
-msgid "seconds"
-msgstr "sekundės"
-
-#: src/alarm/interface.cc:312 src/alarm/interface.cc:353
-msgid "Volume"
-msgstr "Garsas"
-
-#: src/alarm/interface.cc:317
-msgid "Start at"
-msgstr "Pradėti nuo"
+#: src/adplug/adplug-xmms.cc:349 src/sid/xs_config.cc:61
+msgid "Output"
+msgstr "Išvestis"
 
-#: src/alarm/interface.cc:333
-msgid "Final"
-msgstr "Baigti"
+#: src/adplug/adplug-xmms.cc:350
+msgid "OPL Emulator:"
+msgstr "OPL emuliatorius:"
+
+#: src/adplug/adplug-xmms.cc:353 src/amidiplug/i_configure.cc:153
+#: src/console/plugin.cc:45 src/filewriter/filewriter.cc:481
+#: src/sid/xs_config.cc:65 src/xsf/plugin.cc:446
+msgid "Sample rate:"
+msgstr "Ėminių sparta:"
 
-#: src/alarm/interface.cc:346
-msgid "Current"
-msgstr "Dabartinis"
-
-#: src/alarm/interface.cc:359
-msgid "Additional Command"
-msgstr "Papildoma komanda"
+#: src/adplug/adplug-xmms.cc:354 src/amidiplug/i_configure.cc:155
+#: src/bs2b/plugin.cc:141 src/console/plugin.cc:47
+#: src/modplug/plugin_main.cc:77 src/resample/resample.cc:201
+#: src/resample/resample.cc:207 src/resample/resample.cc:211
+#: src/resample/resample.cc:215 src/resample/resample.cc:219
+#: src/resample/resample.cc:223 src/resample/resample.cc:227
+#: src/resample/resample.cc:231 src/resample/resample.cc:235
+#: src/resample/resample.cc:239 src/resample/resample.cc:243
+#: src/sid/xs_config.cc:67 src/soxr/sox-resampler.cc:205
+msgid "Hz"
+msgstr "Hz"
 
-#: src/alarm/interface.cc:365 src/alarm/interface.cc:391
-msgid "enable"
-msgstr "Įjungti"
+#: src/adplug/adplug-xmms.cc:355 src/gtkui/settings.cc:55
+#: src/modplug/plugin_main.cc:105 src/qtui/settings.cc:85
+#: src/skins-qt/skins_cfg.cc:302 src/skins/skins_cfg.cc:284
+msgid "Miscellaneous"
+msgstr "Kita"
 
-#: src/alarm/interface.cc:372
-msgid "Playlist (optional)"
-msgstr "Grojaraštis (nebūtina)"
-
-#: src/alarm/interface.cc:379
-msgid "Select a playlist"
-msgstr "Pasirinkite grojaraštį"
-
-#: src/alarm/interface.cc:399
-msgid "Options"
-msgstr "Pasirinktys"
-
-#: src/alarm/interface.cc:404
-msgid "What do these options mean?"
-msgstr "Ką šios pasirinktys reiškia?"
-
-#: src/alarm/interface.cc:420
-msgid "Help"
-msgstr "Žinynas"
+#: src/adplug/adplug-xmms.cc:356
+msgid "Repeat song in endless loop"
+msgstr "Kartoti dainą begaliniu ciklu"
 
-#: src/albumart/albumart.cc:31
+#: src/albumart/albumart.cc:31 src/albumart-qt/albumart.cc:35
 msgid "Album Art"
 msgstr "Albumo apipavadalinimas"
 
-#: src/albumart-qt/albumart.cc:33
-msgid "Album Art (Qt)"
-msgstr ""
-
-#: src/alsa/alsa.h:70
+#: src/alsa/alsa.h:64
 msgid "ALSA Output"
 msgstr "ALSA išvestis"
 
@@ -322,7 +100,7 @@
 
 #: src/alsa/config.cc:61
 msgid "(no description)"
-msgstr ""
+msgstr "(nėra aprašymo)"
 
 #: src/alsa/config.cc:166
 msgid "Default PCM device"
@@ -344,11 +122,11 @@
 msgid "Mixer element:"
 msgstr "Mikšerio elementas:"
 
-#: src/amidi-plug/amidi-plug.cc:41
+#: src/amidiplug/amidi-plug.cc:42
 msgid "AMIDI-Plug (MIDI Player)"
 msgstr "AMIDI-Plug (MIDI grotuvas)"
 
-#: src/amidi-plug/amidi-plug.cc:437
+#: src/amidiplug/amidi-plug.cc:445
 msgid ""
 "AMIDI-Plug\n"
 "modular MIDI music player\n"
@@ -370,158 +148,181 @@
 "Tony Vroon\n"
 "for the good help with alpha testing"
 msgstr ""
+"AMIDI-Plug\n"
+"modulinis MIDI muzikos grotuvas\n"
+"http://www.develia.org/projects.php?p=amidiplug\n"
+"\n"
+"suprogramuotas Giacomo Lozito\n"
+"<james@develia.org>\n"
+"\n"
+"išskirtinai ačiū...\n"
+"\n"
+"Clemens Ladisch ir Jaroslav Kysela\n"
+"už jų šaunias aplaymidi ir amixer programas; jos\n"
+"buvo išties naudingos kartu su alsa-lib dokumentais, siekiant\n"
+"sužinoti daugiau apie ALSA API\n"
+"\n"
+"Alfredo Spadafina\n"
+"už puikų midi klaviatūros logotipą\n"
+"\n"
+"Tony Vroon\n"
+"už gerą pagalbą atliekant alfa testavimą"
 
-#: src/amidi-plug/i_configure.cc:94
+#: src/amidiplug/i_configure.cc:94
 msgid "Override default gain:"
 msgstr "Perrašyti numatytąjį garsą:"
 
-#: src/amidi-plug/i_configure.cc:102
+#: src/amidiplug/i_configure.cc:102
 msgid "Override default polyphony:"
 msgstr "Perrašyti numatytąją polifoniją:"
 
-#: src/amidi-plug/i_configure.cc:110
+#: src/amidiplug/i_configure.cc:110
 msgid "Override default reverb:"
 msgstr "Perrašyti numatytąjį aidą:"
 
-#: src/amidi-plug/i_configure.cc:112 src/amidi-plug/i_configure.cc:120
+#: src/amidiplug/i_configure.cc:112 src/amidiplug/i_configure.cc:120
 msgid "On"
 msgstr "Įjungta"
 
-#: src/amidi-plug/i_configure.cc:118
+#: src/amidiplug/i_configure.cc:118
 msgid "Override default chorus:"
 msgstr "Perrašyti numatytąjį chorą:"
 
-#: src/amidi-plug/i_configure.cc:128 src/console/plugin.cc:29
+#: src/amidiplug/i_configure.cc:128 src/console/plugin.cc:29
 msgid "Playback"
 msgstr "Atkūrimas"
 
-#: src/amidi-plug/i_configure.cc:129
+#: src/amidiplug/i_configure.cc:129
 msgid "Transpose:"
 msgstr "Perkėlimas:"
 
-#: src/amidi-plug/i_configure.cc:131
+#: src/amidiplug/i_configure.cc:131 src/speedpitch/speed-pitch.cc:257
 msgid "semitones"
-msgstr ""
+msgstr "pustoniai"
 
-#: src/amidi-plug/i_configure.cc:132
+#: src/amidiplug/i_configure.cc:132
 msgid "Drum shift:"
 msgstr "Būgnų poslinkis:"
 
-#: src/amidi-plug/i_configure.cc:134
+#: src/amidiplug/i_configure.cc:134
 msgid "note numbers"
-msgstr ""
+msgstr "pastabų skaičius"
 
-#: src/amidi-plug/i_configure.cc:135
+#: src/amidiplug/i_configure.cc:135
 msgid "Skip leading silence"
-msgstr ""
+msgstr "Praleisti sekančią tylą"
 
-#: src/amidi-plug/i_configure.cc:137
+#: src/amidiplug/i_configure.cc:137
 msgid "Skip trailing silence"
-msgstr ""
+msgstr "Praleisti vedančią tylą"
 
-#: src/amidi-plug/i_configure.cc:141
+#: src/amidiplug/i_configure.cc:141
 msgid "SoundFont"
 msgstr "SoundFont"
 
-#: src/amidi-plug/i_configure.cc:143
+#: src/amidiplug/i_configure.cc:148
 msgid "Synthesizer"
 msgstr "Sintezatorius"
 
-#: src/amidi-plug/i_configure.cc:148 src/console/plugin.cc:45
-#: src/sid/xs_config.cc:65
-msgid "Sample rate:"
-msgstr ""
-
-#: src/amidi-plug/i_configure.cc:150 src/bs2b/plugin.cc:141
-#: src/console/plugin.cc:47 src/modplug/plugin_main.cc:78
-#: src/resample/resample.cc:201 src/resample/resample.cc:207
-#: src/resample/resample.cc:211 src/resample/resample.cc:215
-#: src/resample/resample.cc:219 src/resample/resample.cc:223
-#: src/resample/resample.cc:227 src/resample/resample.cc:231
-#: src/resample/resample.cc:235 src/resample/resample.cc:239
-#: src/resample/resample.cc:243 src/sid/xs_config.cc:67
-#: src/sox-resampler/sox-resampler.cc:163
-msgid "Hz"
-msgstr "Hz"
-
-#: src/amidi-plug/i_configure-fluidsynth.cc:52
+#: src/amidiplug/i_configure-fluidsynth.cc:58
+#: src/amidiplug/i_configure-fluidsynth.cc:527
 msgid "AMIDI-Plug - select SoundFont file"
 msgstr "AMIDI-Plug - pasirinkite SoundFont failą"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:55 src/filewriter/mp3.cc:658
+#: src/amidiplug/i_configure-fluidsynth.cc:61
 msgid "_Cancel"
 msgstr "_Atsisakyti"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:56
+#: src/amidiplug/i_configure-fluidsynth.cc:62
 msgid "_Open"
 msgstr "_Atverti"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:225 src/gtkui/columns.cc:46
+#: src/amidiplug/i_configure-fluidsynth.cc:233
+#: src/amidiplug/i_configure-fluidsynth.cc:461
 msgid "File name"
-msgstr "Bylos vardas"
+msgstr "Rinkmenos pavadinimas"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:229
+#: src/amidiplug/i_configure-fluidsynth.cc:237
+#: src/amidiplug/i_configure-fluidsynth.cc:464
 msgid "Size (bytes)"
-msgstr "Dydis (bitais)"
+msgstr "Dydis (baitais)"
 
-#: src/amidi-plug/i_fileinfo.cc:163
+#: src/amidiplug/i_fileinfo.cc:184
 msgid "Name:"
 msgstr "Pavadinimas:"
 
-#: src/amidi-plug/i_fileinfo.cc:181
+#: src/amidiplug/i_fileinfo.cc:202
 msgid " MIDI Info "
 msgstr " MIDI Info "
 
-#: src/amidi-plug/i_fileinfo.cc:195
+#: src/amidiplug/i_fileinfo.cc:216
 msgid "Format:"
 msgstr "Formatas:"
 
-#: src/amidi-plug/i_fileinfo.cc:198
+#: src/amidiplug/i_fileinfo.cc:219
 msgid "Length (msec):"
 msgstr "Trukmė (ms):"
 
-#: src/amidi-plug/i_fileinfo.cc:201
+#: src/amidiplug/i_fileinfo.cc:222
 msgid "No. of Tracks:"
 msgstr "Takelių:"
 
-#: src/amidi-plug/i_fileinfo.cc:207
+#: src/amidiplug/i_fileinfo.cc:228
 msgid "variable"
 msgstr "kintamasis"
 
-#: src/amidi-plug/i_fileinfo.cc:209
+#: src/amidiplug/i_fileinfo.cc:230
 msgid "BPM:"
 msgstr "BPM:"
 
-#: src/amidi-plug/i_fileinfo.cc:217
+#: src/amidiplug/i_fileinfo.cc:238
 msgid "BPM (wavg):"
 msgstr "BPM (wavg):"
 
-#: src/amidi-plug/i_fileinfo.cc:220
+#: src/amidiplug/i_fileinfo.cc:241
 msgid "Time Div:"
 msgstr "Laiko div:"
 
-#: src/amidi-plug/i_fileinfo.cc:231
+#: src/amidiplug/i_fileinfo.cc:252
 msgid " MIDI Comments and Lyrics "
 msgstr " MIDI komentarai ir žodžiai"
 
-#: src/amidi-plug/i_fileinfo.cc:278
+#: src/amidiplug/i_fileinfo.cc:299
 msgid "* no comments available in this MIDI file *"
-msgstr "* Šiame MIDI faile nėra komentarų *"
+msgstr "* Šioje MIDI rinkmenoje nėra komentarų *"
 
-#: src/amidi-plug/i_fileinfo.cc:290
+#: src/amidiplug/i_fileinfo.cc:311
 msgid "* no lyrics available in this MIDI file *"
-msgstr "* Šiame MIDI faile nėra žodžių *"
+msgstr "* Šioje MIDI rinkmenoje nėra žodžių *"
 
-#: src/amidi-plug/i_fileinfo.cc:300 src/filewriter/vorbis.cc:197
-#: src/ladspa/plugin.cc:416
+#: src/amidiplug/i_fileinfo.cc:321 src/ladspa/plugin.cc:418
+#: src/ui-common/dialogs-qt.cc:32
 msgid "_Close"
-msgstr "_Uždaryti"
+msgstr "_Užverti"
 
-#: src/amidi-plug/i_fileinfo.cc:325
+#: src/amidiplug/i_fileinfo.cc:346
 msgid " (invalid UTF-8)"
 msgstr " (neteisingas UTF-8)"
 
-#: src/aosd/aosd.cc:32
+#: src/ampache/ampache.cc:33
+msgid "Ampache Browser"
+msgstr "Ampache naršyklė"
+
+#: src/ampache/ampache.cc:46
+msgid ""
+"Ampache Browser for Audacious\n"
+"http://ampache-browser.org/\n"
+"\n"
+"Copyright (C) Róbert Čerňanský and John Lindgren\n"
+"License: GNU GPLv3"
+msgstr ""
+"Ampache naršyklė, skirta Audacious\n"
+"http://ampache-browser.org/\n"
+"\n"
+"Autorių teisės (C) Róbert Čerňanský ir John Lindgren\n"
+"Licencija: GNU GPLv3"
+
+#: src/aosd/aosd.cc:31
 msgid ""
 "Audacious OSD\n"
 "http://www.develia.org/projects.php?p=audacious#aosd\n"
@@ -541,7 +342,7 @@
 
 #: src/aosd/aosd.h:37
 msgid "AOSD (On-Screen Display)"
-msgstr "AOSD (Rodymas ekrane)"
+msgstr "AOSD (rodymas ekrane)"
 
 #: src/aosd/aosd_style.cc:54
 msgid "Rectangle"
@@ -555,130 +356,130 @@
 msgid "Concave Rectangle"
 msgstr "Įgaubtas stačiakampis"
 
-#: src/aosd/aosd_style.cc:69
+#: src/aosd/aosd_style.cc:69 src/openmpt/mptwrap.h:50 src/xsf/plugin.cc:436
 msgid "None"
 msgstr "Joks"
 
-#: src/aosd/aosd_trigger.cc:50
+#: src/aosd/aosd_trigger.cc:49
 msgid "Playback Start"
 msgstr "Atkūrimo pradžia"
 
-#: src/aosd/aosd_trigger.cc:51
+#: src/aosd/aosd_trigger.cc:50
 msgid "Triggers OSD when a playlist entry is played."
-msgstr "Sužadina OSD kai grojaraščio elementas grojamas."
+msgstr "Suaktyvina OSD, kai grojamas grojaraščio įrašas."
 
-#: src/aosd/aosd_trigger.cc:56
+#: src/aosd/aosd_trigger.cc:55
 msgid "Title Change"
 msgstr "Pavadinimo keitimas"
 
-#: src/aosd/aosd_trigger.cc:57
+#: src/aosd/aosd_trigger.cc:56
 msgid "Triggers OSD when the song title changes (for internet streams)."
-msgstr ""
+msgstr "Suaktyvina OSD, kai keičiasi dainos pavadinimas (interneto srautams)."
 
-#: src/aosd/aosd_trigger.cc:62
+#: src/aosd/aosd_trigger.cc:61
 msgid "Pause On"
-msgstr "Pauzė"
+msgstr "Pristabdyti"
 
-#: src/aosd/aosd_trigger.cc:63
+#: src/aosd/aosd_trigger.cc:62
 msgid "Triggers OSD when playback is paused."
 msgstr "Sužadina OSD kai atkūrimas sustabdomas"
 
-#: src/aosd/aosd_trigger.cc:68
+#: src/aosd/aosd_trigger.cc:67
 msgid "Pause Off"
 msgstr "Pauzė išjungiama"
 
-#: src/aosd/aosd_trigger.cc:69
+#: src/aosd/aosd_trigger.cc:68
 msgid "Triggers OSD when playback is unpaused."
-msgstr "Sužadina OSD kai atkūrimas atkuriamas po pauzės."
+msgstr "Suaktyvina OSD, kai po pristabdymo tęsiamas atkūrimas."
 
-#: src/aosd/aosd_ui.cc:163
+#: src/aosd/aosd_ui.cc:204
 msgid "Placement"
 msgstr "Padėtis"
 
-#: src/aosd/aosd_ui.cc:196
+#: src/aosd/aosd_ui.cc:241
 msgid "Relative X offset:"
 msgstr "Reliatyvus X poslinkis:"
 
-#: src/aosd/aosd_ui.cc:203
+#: src/aosd/aosd_ui.cc:245
 msgid "Relative Y offset:"
 msgstr "Reliatyvus Y poslinkis:"
 
-#: src/aosd/aosd_ui.cc:210
+#: src/aosd/aosd_ui.cc:249
 msgid "Max OSD width:"
 msgstr "Didžiausias OSD plotis:"
 
-#: src/aosd/aosd_ui.cc:221
+#: src/aosd/aosd_ui.cc:281
 msgid "Multi-Monitor options"
 msgstr "Kelių vaizduoklių pasirinktys"
 
-#: src/aosd/aosd_ui.cc:225
+#: src/aosd/aosd_ui.cc:285
 msgid "Display OSD using:"
 msgstr "Vaizduoklis naudoja OSD:"
 
-#: src/aosd/aosd_ui.cc:227
+#: src/aosd/aosd_ui.cc:287
 msgid "all monitors"
 msgstr "visi vaizduokliai"
 
-#: src/aosd/aosd_ui.cc:230
+#: src/aosd/aosd_ui.cc:290
 #, c-format
 msgid "monitor %i"
 msgstr "vaizduoklis %i"
 
-#: src/aosd/aosd_ui.cc:282
+#: src/aosd/aosd_ui.cc:342
 msgid "Timing (ms)"
 msgstr "Laiko derinimas (ms)"
 
-#: src/aosd/aosd_ui.cc:287
+#: src/aosd/aosd_ui.cc:347
 msgid "Display:"
 msgstr "Monitorius:"
 
-#: src/aosd/aosd_ui.cc:292
+#: src/aosd/aosd_ui.cc:352
 msgid "Fade in:"
 msgstr "Nustelbti:"
 
-#: src/aosd/aosd_ui.cc:297
+#: src/aosd/aosd_ui.cc:357
 msgid "Fade out:"
 msgstr "Išblukti:"
 
-#: src/aosd/aosd_ui.cc:361
+#: src/aosd/aosd_ui.cc:442
 msgid "Fonts"
 msgstr "Šriftai"
 
-#: src/aosd/aosd_ui.cc:368
+#: src/aosd/aosd_ui.cc:449
 #, c-format
 msgid "Font %i:"
 msgstr "Šriftas %i:"
 
-#: src/aosd/aosd_ui.cc:382
+#: src/aosd/aosd_ui.cc:466
 msgid "Shadow"
 msgstr "Šešėlis"
 
-#: src/aosd/aosd_ui.cc:486
+#: src/aosd/aosd_ui.cc:589
 msgid "Render Style"
 msgstr "Atvaizdavimo stilius"
 
-#: src/aosd/aosd_ui.cc:502
+#: src/aosd/aosd_ui.cc:605
 msgid "Colors"
 msgstr "Spalvos"
 
-#: src/aosd/aosd_ui.cc:513
+#: src/aosd/aosd_ui.cc:616
 #, c-format
 msgid "Color %i:"
 msgstr "Spalva %i:"
 
-#: src/aosd/aosd_ui.cc:600
+#: src/aosd/aosd_ui.cc:714
 msgid "Enable trigger"
 msgstr "Sužadinti"
 
-#: src/aosd/aosd_ui.cc:627
+#: src/aosd/aosd_ui.cc:741
 msgid "Event"
 msgstr "Įvykis"
 
-#: src/aosd/aosd_ui.cc:655
+#: src/aosd/aosd_ui.cc:768
 msgid "Composite manager detected"
 msgstr "Kompozicionavimo tvarkyklė aptikta"
 
-#: src/aosd/aosd_ui.cc:662
+#: src/aosd/aosd_ui.cc:775
 msgid ""
 "Composite manager not detected;\n"
 "unless you know that you have one running, please activate a composite "
@@ -687,66 +488,62 @@
 "Kompozicionavimo tvarkyklė nerasta;\n"
 "įjunkite kompozicionavimo tvarkyklę, nes OSD neveiks taip kaip priklauso"
 
-#: src/aosd/aosd_ui.cc:670
+#: src/aosd/aosd_ui.cc:783
 msgid "Composite manager not required for fake transparency"
 msgstr "Netikram permatomumui kompozicionavimo tvarkyklė nebūtina"
 
-#: src/aosd/aosd_ui.cc:706
+#: src/aosd/aosd_ui.cc:820
 msgid "Transparency"
 msgstr "Permatomumas"
 
-#: src/aosd/aosd_ui.cc:712
+#: src/aosd/aosd_ui.cc:826
 msgid "Fake transparency"
 msgstr "Netikras permatomumas"
 
-#: src/aosd/aosd_ui.cc:714
+#: src/aosd/aosd_ui.cc:828
 msgid "Real transparency (requires X Composite Ext.)"
 msgstr "Tikras permatomumas (reikalinga X kompozicionavimo plėtinys)"
 
-#: src/aosd/aosd_ui.cc:756
+#: src/aosd/aosd_ui.cc:875
 msgid "Composite extension not loaded"
-msgstr "Kompozicionavimo plėtinys neįkrautas"
+msgstr "Kompozicionavimo plėtinys neįkeltas"
 
-#: src/aosd/aosd_ui.cc:764
-msgid "Composite extension not available"
-msgstr "Kompozicionavimo plėtinys neprieinamas"
-
-#: src/aosd/aosd_ui.cc:781
+#: src/aosd/aosd_ui.cc:892
 #, c-format
 msgid "Audacious OSD"
 msgstr "Audacious OSD"
 
-#: src/aosd/aosd_ui.cc:844
+#: src/aosd/aosd_ui.cc:955
 msgid "Position"
-msgstr "Pozicija"
+msgstr "Padėtis"
 
-#: src/aosd/aosd_ui.cc:849
+#: src/aosd/aosd_ui.cc:960
 msgid "Animation"
 msgstr "Animacija"
 
-#: src/aosd/aosd_ui.cc:854
+#: src/aosd/aosd_ui.cc:965
 msgid "Text"
 msgstr "Tekstas"
 
-#: src/aosd/aosd_ui.cc:859
+#: src/aosd/aosd_ui.cc:970
 msgid "Decoration"
 msgstr "Dekoracijos"
 
-#: src/aosd/aosd_ui.cc:864
+#: src/aosd/aosd_ui.cc:975
 msgid "Trigger"
-msgstr "Sužadintojas"
+msgstr "Paleidiklis"
 
-#: src/aosd/aosd_ui.cc:869
+#: src/aosd/aosd_ui.cc:980 src/streamtuner/shoutcast-model.cc:202
 msgid "Misc"
 msgstr "Kita"
 
-#: src/aosd/aosd_ui.cc:878
+#: src/aosd/aosd_ui.cc:989
 msgid "Test"
-msgstr ""
+msgstr "Testas"
 
 #: src/asx3/asx3.cc:35
 msgid "ASXv3 Playlists"
-msgstr "ASXv3 Grojaraščiai"
+msgstr "ASXv3 grojaraščiai"
 
 #: src/asx/asx.cc:33
 msgid "ASXv1/ASXv2 Playlists"
@@ -756,11 +553,83 @@
 msgid "Audacious Playlists (audpl)"
 msgstr "Audacious grojaraščiai (audpl)"
 
-#: src/blur_scope/blur_scope.cc:42
+#: src/background_music/background_music.cc:24
+msgid "Background music"
+msgstr ""
+
+#: src/background_music/background_music.cc:25
+msgid "Target level:"
+msgstr ""
+
+#: src/background_music/background_music.cc:28
+#: src/background_music/background_music.cc:33
+#: src/silence-removal/silence-removal.cc:70
+msgid "dB"
+msgstr "dB"
+
+#: src/background_music/background_music.cc:29
+msgid "Maximum amplification:"
+msgstr ""
+
+#: src/background_music/background_music.cc:34 src/mpg123/mpg123.cc:81
+msgid "Advanced"
+msgstr "Sudėtingesni"
+
+#: src/background_music/background_music.cc:36
+msgid "Slow detection weight:"
+msgstr ""
+
+#: src/background_music/background_music.cc:39
+msgid "Hint"
+msgstr ""
+
+#: src/background_music/background_music.cc:41
+msgid ""
+"Slow detection weight is the relative weight\n"
+"of a long term average detection when compared\n"
+"to the actual, faster loudness detection.\n"
+"A value of zero gives a more radio-like sound\n"
+"where soft passages get \"pulled up\" more quickly,\n"
+"a value of two makes the sound feel less compressed."
+msgstr ""
+
+#: src/background_music/background_music.cc:52
+msgid ""
+"Background Music Plugin for Audacious\n"
+"Copyright 2023;2024 Michel Fleur\n"
+"\n"
+"Controls the volume to make the sound equally loud within and between "
+"tracks.\n"
+" It uses accurate loudness measurement and tries to make the volume changes "
+"sound natural without audible peaks, yet without lowering the volume before "
+"a peak in advance."
+msgstr ""
+
+#: src/background_music/background_music.cc:61
+msgid "Background Music"
+msgstr ""
+
+#: src/bitcrusher/bitcrusher.cc:33
+msgid "Bitcrusher"
+msgstr ""
+
+#: src/bitcrusher/bitcrusher.cc:34
+msgid "Bit Depth:"
+msgstr "Bitų gylis:"
+
+#: src/bitcrusher/bitcrusher.cc:37
+msgid "Downsample ratio:"
+msgstr "Sumažinto ėminio koeficientas:"
+
+#: src/bitcrusher/bitcrusher.cc:48
+msgid "Bitcrusher"
+msgstr ""
+
+#: src/blur_scope/blur_scope.cc:40 src/blur_scope-qt/blur_scope.cc:45
 msgid "Color"
 msgstr "Spalva"
 
-#: src/blur_scope/blur_scope.cc:58
+#: src/blur_scope/blur_scope.cc:56 src/blur_scope-qt/blur_scope.cc:158
 msgid "Blur Scope"
 msgstr "Išsiliejimo sritis"
 
@@ -770,7 +639,11 @@
 
 #: src/bs2b/plugin.cc:129
 msgid "Presets:"
-msgstr "Profiliai:"
+msgstr "Ruošiniai:"
+
+#: src/bs2b/plugin.cc:130
+msgid "Default"
+msgstr "Numatytosios"
 
 #: src/bs2b/plugin.cc:136
 msgid "Feed level:"
@@ -778,21 +651,21 @@
 
 #: src/bs2b/plugin.cc:138
 msgid "x1/10 dB"
-msgstr ""
+msgstr "x1/10 dB"
 
 #: src/bs2b/plugin.cc:139
 msgid "Cut frequency:"
 msgstr "Nukirpti dažnius:"
 
-#: src/cairo-spectrum/cairo-spectrum.cc:41
+#: src/cairo-spectrum/cairo-spectrum.cc:42 src/qt-spectrum/qt-spectrum.cc:107
 msgid "Spectrum Analyzer"
 msgstr "Spektro analizatorius"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:72
+#: src/cdaudio/cdaudio-ng.cc:74
 msgid "Audio CD Plugin"
 msgstr "Audio CD įskiepis"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:121
+#: src/cdaudio/cdaudio-ng.cc:121
 msgid ""
 "Copyright (C) 2007-2012 Calin Crisan <ccrisan@gmail.com> and others.\n"
 "\n"
@@ -812,132 +685,132 @@
 "\n"
 "Tai buvo Google Summer Code 2007 projektas."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:137
+#: src/cdaudio/cdaudio-ng.cc:140
 msgid "Device"
 msgstr "Įrenginys"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:138
+#: src/cdaudio/cdaudio-ng.cc:141
 msgid "Read speed:"
-msgstr "Skaitymo greitis:"
+msgstr "Skaitymo sparta:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:141
+#: src/cdaudio/cdaudio-ng.cc:144
 msgid "Override device:"
 msgstr "Perrašyti įrenginį:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:143
+#: src/cdaudio/cdaudio-ng.cc:146
 msgid "Metadata"
 msgstr "Meta duomenys"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:144
+#: src/cdaudio/cdaudio-ng.cc:147
 msgid "Use CD-Text"
 msgstr "Naudoti CD-Text"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:146
+#: src/cdaudio/cdaudio-ng.cc:150
 msgid "Use CDDB"
 msgstr "Naudoti CDDB"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:148
+#: src/cdaudio/cdaudio-ng.cc:152
 msgid "Use HTTP instead of CDDBP"
 msgstr "Naudoti HTTP vietoj CDDBP"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:151
+#: src/cdaudio/cdaudio-ng.cc:155
 msgid "Server:"
 msgstr "Serveris:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:155
+#: src/cdaudio/cdaudio-ng.cc:159
 msgid "Path:"
 msgstr "Kelias:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:159
+#: src/cdaudio/cdaudio-ng.cc:163
 msgid "Port:"
 msgstr "Prievadas:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:246
+#: src/cdaudio/cdaudio-ng.cc:228
 msgid "Failed to initialize cdio subsystem."
-msgstr "Inicijuoti cdio posistemės nepavyko."
+msgstr "Įkelti cdio posistemės nepavyko."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:281
+#: src/cdaudio/cdaudio-ng.cc:260
 #, c-format
 msgid "Invalid URI %s."
 msgstr "Netinkamas URI %s."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:283
+#: src/cdaudio/cdaudio-ng.cc:262
 #, c-format
 msgid "Track %d not found."
 msgstr "Takelis %d nerastas."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:285
+#: src/cdaudio/cdaudio-ng.cc:264
 #, c-format
 msgid "Track %d is a data track."
 msgstr "Takelis %d yra duomenų takelis."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:360
+#: src/cdaudio/cdaudio-ng.cc:339
 msgid "Error reading audio CD."
-msgstr "Klaida skaitant audio CD."
+msgstr "Klaida skaitant garso CD."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:429
+#: src/cdaudio/cdaudio-ng.cc:410
 msgid "Audio CD"
-msgstr "Audio CD"
+msgstr "Garso CD"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:460 src/cdaudio-ng/cdaudio-ng.cc:469
+#: src/cdaudio/cdaudio-ng.cc:446 src/cdaudio/cdaudio-ng.cc:455
 #, c-format
 msgid "Failed to open CD device %s."
 msgstr "Atverti CD įrenginio %s nepavyko."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:472
+#: src/cdaudio/cdaudio-ng.cc:458
 msgid "No audio capable CD drive found."
 msgstr "CD įrenginio suderinamo su audio nerasta."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:497
+#: src/cdaudio/cdaudio-ng.cc:481
+msgid "Drive is empty."
+msgstr "Diskasukis tuščias."
+
+#: src/cdaudio/cdaudio-ng.cc:483
+msgid "Unsupported disk type."
+msgstr "Nepalaikoma disko rūšis."
+
+#: src/cdaudio/cdaudio-ng.cc:507
 msgid "Failed to finish initializing opened CD drive."
 msgstr "Nepavyko užbaigti inicijuoto atverto CD įrenginio."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:510
+#: src/cdaudio/cdaudio-ng.cc:520
 msgid "Failed to retrieve first/last track number."
-msgstr "Gauti pirmo/paskutinio takelio numerio nepavyko."
+msgstr "Gauti pirmo arba paskutinio takelio numerio nepavyko."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:531
+#: src/cdaudio/cdaudio-ng.cc:541
 #, 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.cc:613
-msgid "Failed to create the cddb connection."
-msgstr "Sukurti cddb sujungimo nepavyko."
+#: src/cdaudio/cdaudio-ng.cc:624
+msgid "Failed to create the CDDB connection."
+msgstr "Nepavyko sukurti CDDB ryšio."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:679
+#: src/cdaudio/cdaudio-ng.cc:690
 msgid "Failed to query the CDDB server"
-msgstr "Užlausti CDDB serverio nepavyko"
+msgstr "Užklausti CDDB serverio nepavyko"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:681
+#: src/cdaudio/cdaudio-ng.cc:692
 #, c-format
 msgid "Failed to query the CDDB server: %s"
-msgstr "Užlausti CDDB serverio nepavyko: %s"
+msgstr "Užklausti CDDB serverio nepavyko: %s"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:705
+#: src/cdaudio/cdaudio-ng.cc:716
 #, c-format
-msgid "Failed to read the cddb info: %s"
-msgstr "Perskaityti cddb informaciją nepavyko: %s"
+msgid "Failed to read the CDDB info: %s"
+msgstr "Nepavyko nuskaityti CDDB informacijos: %s"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:765
-msgid "Drive is empty."
-msgstr "Diskasukis tuščias."
-
-#: src/cdaudio-ng/cdaudio-ng.cc:767
-msgid "Unsupported disk type."
-msgstr "Nepalaikomas disko tipas."
-
-#: src/cd-menu-items/cd-menu-items.cc:35
+#: src/cd-menu-items/cd-menu-items.cc:33
 msgid "Audio CD Menu Items"
-msgstr "Audio CD Meniu elementai"
+msgstr "Garso CD Meniu elementai"
 
-#: src/cd-menu-items/cd-menu-items.cc:47
-msgid "Play CD"
-msgstr "Groti CD"
-
-#: src/cd-menu-items/cd-menu-items.cc:47
-msgid "Add CD"
-msgstr "Pridėti CD"
+#: src/cd-menu-items/cd-menu-items.cc:45
+msgid "Pla_y CD"
+msgstr "_Groti CD"
+
+#: src/cd-menu-items/cd-menu-items.cc:45
+msgid "_Add CD"
+msgstr "_Pridėti CD"
 
 #: src/compressor/compressor.cc:45
 msgid "Compression"
@@ -956,10 +829,12 @@
 "Dynamic Range Compression Plugin for Audacious\n"
 "Copyright 2010-2014 John Lindgren"
 msgstr ""
+"Audacious dinaminio diapazono glaudinimo įskiepis\n"
+"Autoriaus teisės 2010-2014 John Lindgren"
 
 #: src/compressor/compressor.cc:64
 msgid "Dynamic Range Compressor"
-msgstr "Dynamic Range Compressor"
+msgstr "Dinaminio diapazono glaudintuvas"
 
 #: src/console/plugin.cc:15
 msgid ""
@@ -971,7 +846,7 @@
 "Shay 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"
+"Palaikomi plėtiniai: AY, GBS, GYM, HES, KSS, NSF, NSFE, SAP, SPC, VGM, VGZ\n"
 "\n"
 "Audacious įskiepį sukūrė:\n"
 "William Pitcock <nenolod@dereferenced.org>\n"
@@ -979,7 +854,7 @@
 
 #: src/console/plugin.cc:30
 msgid "Bass:"
-msgstr "Bosas:"
+msgstr "Žemi:"
 
 #: src/console/plugin.cc:33
 msgid "Treble:"
@@ -993,7 +868,14 @@
 msgid "Default song length:"
 msgstr "Numatyta dainos trukmė:"
 
-#: src/console/plugin.cc:42 src/modplug/plugin_main.cc:59
+#: src/console/plugin.cc:41 src/crossfade/crossfade.cc:56
+#: src/crossfade/crossfade.cc:62 src/lirc/lirc.cc:395 src/notify/notify.cc:113
+#: src/sid/xs_config.cc:85 src/sid/xs_config.cc:94 src/sid/xs_config.cc:103
+#: src/vumeter-qt/vumeter_qt.cc:39
+msgid "seconds"
+msgstr "sekundės"
+
+#: src/console/plugin.cc:42 src/modplug/plugin_main.cc:58
 msgid "Resampling"
 msgstr "Perdarymas (resampling)"
 
@@ -1011,86 +893,104 @@
 
 #: src/console/plugin.cc:52
 msgid "Increase reverb"
-msgstr "Padidinti reverb"
+msgstr "Padidinti aidą"
 
 #: src/console/plugin.h:26
 msgid "Game Console Music Decoder"
 msgstr "Žaidimų konsolės muzikos dekoderis"
 
-#: src/coreaudio/coreaudio.cc:50
+#: src/coreaudio/coreaudio.cc:53
 msgid "CoreAudio output"
-msgstr ""
+msgstr "CoreAudio išvestis"
 
-#: src/coreaudio/coreaudio.cc:131
+#: src/coreaudio/coreaudio.cc:155
 msgid ""
 "CoreAudio Output Plugin for Audacious\n"
 "Copyright 2014 William Pitcock\n"
+"Copyright 2017,18 René J.V. Bertin\n"
+" (original code and code adapted from\n"
+" Apple examples, (C) Apple 2013)\n"
 "\n"
 "Based on SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
 msgstr ""
+"Audacious CoreAudio išvesties įskiepis \n"
+"Autoriaus teisės 2014 William Pitcock\n"
+"Autoriaus teisės 2017,18 René J.V. Bertin\n"
+" (pradinis kodas ir kodas pritaikytas iš\n"
+" Apple pavyzdžių, (C) Apple 2013)\n"
+"\n"
+"Remiantis Audacious SDL išvesties įskiepiu\n"
+"Autoriaus teisės 2010 John Lindgren"
 
-#: src/coreaudio/coreaudio.cc:143
+#: src/coreaudio/coreaudio.cc:171
 msgid "Use exclusive mode"
+msgstr "Naudoti išskirtinę veikseną"
+
+#: src/coreaudio/coreaudio.cc:173
+msgid "Use bit perfect audio (adapt device sampling rate)"
 msgstr ""
+"Naudokite šiek tiek tobulesnį garsą (pritaikykite įrenginio ėminio dažnį)"
 
-#: src/crossfade/crossfade.cc:44
+#: src/crossfade/crossfade.cc:47
 msgid ""
 "Crossfade Plugin for Audacious\n"
 "Copyright 2010-2014 John Lindgren"
 msgstr ""
+"Audacious Crossfade įskiepis\n"
+"Autoriaus teisės 2010-2014 John Lindgren"
 
-#: src/crossfade/crossfade.cc:48
+#: src/crossfade/crossfade.cc:51
 msgid "Crossfade"
 msgstr "Persidengimas"
 
-#: src/crossfade/crossfade.cc:49
+#: src/crossfade/crossfade.cc:52
 msgid "On automatic song change"
-msgstr ""
+msgstr "Esant automatiniam dainos keitimui"
 
-#: src/crossfade/crossfade.cc:51 src/crossfade/crossfade.cc:57
+#: src/crossfade/crossfade.cc:54 src/crossfade/crossfade.cc:60
 msgid "Overlap:"
 msgstr "Perdengti:"
 
-#: src/crossfade/crossfade.cc:55
+#: src/crossfade/crossfade.cc:58
 msgid "On seek or manual song change"
+msgstr "Ieškant arba rankiniu būdu keičiant dainą"
+
+#: src/crossfade/crossfade.cc:64
+msgid "No fade in"
 msgstr ""
 
-#: src/crossfade/crossfade.cc:61
-msgid "Tip"
+#: src/crossfade/crossfade.cc:66
+msgid "Use S-curve fade"
 msgstr ""
 
-#: src/crossfade/crossfade.cc:62
-msgid ""
-"For better crossfading, enable\n"
-"the Silence Removal effect."
+#: src/crossfade/crossfade.cc:68
+msgid "S-curve steepness:"
+msgstr ""
+
+#: src/crossfade/crossfade.cc:70
+msgid "(higher is steeper)"
 msgstr ""
 
 #: src/crossfade/crossfade.cc:72
-msgid "Crossfade"
-msgstr "Perdengimas"
+msgid "Tip"
+msgstr "Patarimas"
 
-#: src/crossfade/crossfade.cc:161
+#: src/crossfade/crossfade.cc:73
 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."
+"For better crossfading, enable\n"
+"the Silence Removal effect."
 msgstr ""
-"Garso perėjimo efektas nepavyko, nes dainos turi skirtingą skaičių kanalų. "
-"Galite panaudoti kanalų mikšerio įrankį ir suvienodinti kanalų skaičių."
+"Geresniam perėjimui tarp dainų, įjunkite\n"
+"tylos pašalinimo efektą."
 
-#: src/crossfade/crossfade.cc:168
-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į."
+#: src/crossfade/crossfade.cc:83
+msgid "Crossfade"
+msgstr "Perdengimas"
 
 #: src/crystalizer/crystalizer.cc:31
 msgid "Crystalizer"
-msgstr "Crystalizer"
+msgstr "Kristalizatorius"
 
 #: src/crystalizer/crystalizer.cc:32 src/stereo_plugin/stereo.cc:45
 msgid "Intensity:"
@@ -1098,62 +998,63 @@
 
 #: src/crystalizer/crystalizer.cc:43
 msgid "Crystalizer"
-msgstr "Crystalizer"
+msgstr "Kristalizatorius"
 
-#: src/cue/cue.cc:37
+#: src/cue/cue.cc:42
 msgid "Cue Sheet Plugin"
 msgstr "Cue Sheet įskiepis"
 
-#: src/delete-files/delete-files.cc:46 src/delete-files/delete-files.cc:146
+#: src/delete-files/delete-files.cc:53 src/delete-files/delete-files.cc:215
+#: src/delete-files/delete-files.cc:230
 msgid "Delete Files"
-msgstr "Pašalinti failus"
+msgstr "Pašalinti rinkmenas"
 
-#: src/delete-files/delete-files.cc:75
+#: src/delete-files/delete-files.cc:120
+msgid "No files are selected."
+msgstr "Nepasirinkta rinkmena."
+
+#: src/delete-files/delete-files.cc:125
 #, c-format
-msgid "Error moving %s to trash: %s."
-msgstr "Klaida perkeliant %s į šiukšlinę: %s"
+msgid "Do you want to move %s to the trash?"
+msgstr "Ar norite perkelti %s į šiukšlinę?"
 
-#: src/delete-files/delete-files.cc:86
+#: src/delete-files/delete-files.cc:126
 #, c-format
-msgid "Error deleting %s: %s."
-msgstr "Klaida šalinant %s: %s."
+msgid "Do you want to permanently delete %s?"
+msgstr "Ar norite ištrinti visam laikui %s?"
 
-#: src/delete-files/delete-files.cc:117
+#: src/delete-files/delete-files.cc:133
 #, c-format
-msgid "Error deleting %s: not a local file."
-msgstr "Klaida šalinant %s: ne vietinis failas."
+msgid "Do you want to move %d files to the trash?"
+msgstr "Ar norite perkelti %d rinkmenas į šiukšlinę?"
 
 #: src/delete-files/delete-files.cc:134
-msgid "Do you want to move the selected files to the trash?"
-msgstr "Ar tikrai norite perkelti pasirinktus failus į šiukšliadėžę?"
+#, c-format
+msgid "Do you want to permanently delete %d files?"
+msgstr "Ar norite visam laikui ištrinti %d rinkmenas?"
 
-#: src/delete-files/delete-files.cc:135
-msgid "Move to Trash"
+#: src/delete-files/delete-files.cc:146
+msgid "Move to trash"
 msgstr "Perkelti į šiukšlinę"
 
-#: src/delete-files/delete-files.cc:140
-msgid "Do you want to permanently delete the selected files?"
-msgstr "Ar tikrai norite negrįžtamai ištrinti pasirinktus failus?"
-
-#: src/delete-files/delete-files.cc:141 src/skins/preset-list.cc:411
-#: src/skins/preset-list.cc:427
+#: src/delete-files/delete-files.cc:146
 msgid "Delete"
 msgstr "Ištrinti"
 
-#: src/delete-files/delete-files.cc:145 src/skins/preset-browser.cc:56
-#: src/skins/preset-list.cc:307 src/skins/ui_playlist.cc:221
+#: src/delete-files/delete-files.cc:213 src/delete-files/delete-files.cc:235
+#: src/skins-qt/search-select.cc:102 src/skins/search-select.cc:78
 msgid "Cancel"
 msgstr "Atšaukti"
 
-#: src/delete-files/delete-files.cc:166
+#: src/delete-files/delete-files.cc:267
 msgid "Delete Selected Files"
-msgstr "Pašalinti pasirinktus failus"
+msgstr "Pašalinti pasirinktas rinkmenas"
 
-#: src/delete-files/delete-files.cc:181
+#: src/delete-files/delete-files.cc:287
 msgid "Delete Method"
 msgstr "Šalinimo metodas"
 
-#: src/delete-files/delete-files.cc:182
+#: src/delete-files/delete-files.cc:288
 msgid "Move to trash instead of deleting immediately"
 msgstr "Perkelti į šiukšlinę, iškart nepašalinti"
 
@@ -1164,18 +1065,22 @@
 "Surround echo by Carl van Schaik, 1999\n"
 "Updated for Audacious by William Pitcock and John Lindgren, 2010-2014"
 msgstr ""
+"Aido įskiepis\n"
+"Sukūrė Johan Levin, 1999\n"
+"Erdvinį aidą sukūrė Carl van Schaik, 1999\n"
+"Audacious pritaikė William Pitcock ir John Lindgren, 2010-2014"
 
 #: src/echo_plugin/echo.cc:21
 msgid "Echo"
 msgstr "Aidas"
 
-#: src/echo_plugin/echo.cc:22 src/modplug/plugin_main.cc:73
-#: src/modplug/plugin_main.cc:83
+#: src/echo_plugin/echo.cc:22 src/modplug/plugin_main.cc:72
+#: src/modplug/plugin_main.cc:82
 msgid "Delay:"
 msgstr "Delsa:"
 
-#: src/echo_plugin/echo.cc:24 src/modplug/plugin_main.cc:73
-#: src/modplug/plugin_main.cc:83
+#: src/echo_plugin/echo.cc:24 src/modplug/plugin_main.cc:72
+#: src/modplug/plugin_main.cc:82 src/xsf/plugin.cc:445
 msgid "ms"
 msgstr "ms"
 
@@ -1183,7 +1088,7 @@
 msgid "Feedback:"
 msgstr "Garsinis atsakas:"
 
-#: src/echo_plugin/echo.cc:28 src/modplug/plugin_main.cc:87
+#: src/echo_plugin/echo.cc:28 src/modplug/plugin_main.cc:86
 msgid "Volume:"
 msgstr "Garsumas:"
 
@@ -1191,11 +1096,11 @@
 msgid "Echo"
 msgstr "Aidas"
 
-#: src/ffaudio/ffaudio-core.cc:41
+#: src/ffaudio/ffaudio-core.cc:50
 msgid "FFmpeg Plugin"
 msgstr "FFmpeg įskiepis"
 
-#: src/ffaudio/ffaudio-core.cc:571
+#: src/ffaudio/ffaudio-core.cc:649
 msgid ""
 "Multi-format audio decoding plugin for Audacious using\n"
 "FFmpeg multimedia framework (http://www.ffmpeg.org/)\n"
@@ -1211,249 +1116,322 @@
 "William Pitcock <nenolod@nenolod.net>\n"
 "Matti Hämäläinen <ccr@tnsp.org>"
 
-#: src/filewriter/filewriter.cc:45
+#: src/filewriter/filewriter.cc:48
 msgid "FileWriter Plugin"
 msgstr "FileWriter įskiepis"
 
-#: src/filewriter/filewriter.cc:386
-msgid "Output file format:"
-msgstr "Išvesties failo formatas:"
+#: src/filewriter/filewriter.cc:316
+#, c-format
+msgid ""
+"Error opening %s:\n"
+"%s"
+msgstr ""
+"Klaida atveriant %s:\n"
+"%s"
 
-#: src/filewriter/filewriter.cc:403
-msgid "Configure"
-msgstr "Konfigūruoti"
+#: src/filewriter/filewriter.cc:358
+msgid ""
+"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 ""
+"Ši programa yra nemokama programinė įranga; galite ją platinti ir (arba) "
+"keisti pagal GNU bendrosios viešosios licencijos sąlygas, kurias paskelbtė "
+"Laisvosios programinės įrangos fondas (angl. Free Software "
+"Foundation); 2 licencijos versija arba (jūsų pasirinkimu) bet kuri "
+"vėlesnė versija.\n"
+"\n"
+"Ši programa platinama tikintis, kad ji bus naudinga, bet BE JOKIOS "
+"GARANTIJOS; net be numanomos TINKAMUMO PARDUOTI ar TINKAMUMO KONKREČIAM "
+"TIKSLUI garantijos. Daugiau informacijos rasite GNU bendrojoje viešojoje "
+"licencijoje.\n"
+"\n"
+"Kartu su šia programa turėjote gauti GNU bendrosios viešosios licencijos "
+"kopiją; jei ne, rašykite Free Software Foundation, Inc., 51 Franklin Street, "
+"Fifth Floor, Boston, MA 02110-1301, USA."
 
-#: src/filewriter/filewriter.cc:413
-msgid "Save into original directory"
-msgstr "Išsaugoti originalo aplanke"
+#: src/filewriter/filewriter.cc:385
+msgid "Output file format:"
+msgstr "Išvesties rinkmenos plėtinys:"
 
-#: src/filewriter/filewriter.cc:417
-msgid "Save into custom directory"
-msgstr "Išsaugoti pasirinktame aplanke"
-
-#: src/filewriter/filewriter.cc:427
-msgid "Output file folder:"
-msgstr "Paskirties aplankas:"
+#: src/filewriter/filewriter.cc:389
+msgid "Save into original directory"
+msgstr "Išsaugoti pirminiame aplanke"
 
-#: src/filewriter/filewriter.cc:431
-msgid "Pick a folder"
-msgstr "Pasirinkite aplanką"
+#: src/filewriter/filewriter.cc:392
+msgid "Save into custom directory:"
+msgstr "Išsaugoti pasirinktame aplanke:"
 
-#: src/filewriter/filewriter.cc:444
+#: src/filewriter/filewriter.cc:400
 msgid "Generate file name from:"
-msgstr ""
-
-#: src/filewriter/filewriter.cc:448
-msgid "Original file tag"
-msgstr ""
+msgstr "Sukurti rinkmenos pavadinimą iš:"
 
-#: src/filewriter/filewriter.cc:453
+#: src/filewriter/filewriter.cc:401
 msgid "Original file name"
-msgstr ""
+msgstr "Pradinis rinkmenos pavadinimas"
 
-#: src/filewriter/filewriter.cc:459
-msgid "Include original file name extension"
-msgstr ""
+#: src/filewriter/filewriter.cc:404
+msgid "Original file name (no suffix)"
+msgstr "Pradinis rinkmenos pavadinimas (be priesagos)"
 
-#: src/filewriter/filewriter.cc:468
-msgid "Prepend track number to file name"
-msgstr ""
+#: src/filewriter/filewriter.cc:407
+msgid "Original file tag"
+msgstr "Pradinė rinkmenos žyma"
 
-#: src/filewriter/filewriter.cc:484
-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.cc:411
+msgid "Prepend track number to file name"
+msgstr "Pridėti takelio numerį prie rinkmenos pavadinimo"
 
-#: src/filewriter/mp3.cc:40 src/filewriter/mp3.cc:717
+#: src/filewriter/filewriter.cc:417 src/filewriter/filewriter.cc:449
 msgid "Auto"
 msgstr "Auto"
 
-#: src/filewriter/mp3.cc:40
+#: src/filewriter/filewriter.cc:418
+msgid "8000 Hz"
+msgstr "8000 Hz"
+
+#: src/filewriter/filewriter.cc:419
+msgid "11025 Hz"
+msgstr "11025 Hz"
+
+#: src/filewriter/filewriter.cc:420
+msgid "12000 Hz"
+msgstr "12000 Hz"
+
+#: src/filewriter/filewriter.cc:421
+msgid "16000 Hz"
+msgstr "16000 Hz"
+
+#: src/filewriter/filewriter.cc:422
+msgid "22050 Hz"
+msgstr "22050 Hz"
+
+#: src/filewriter/filewriter.cc:423
+msgid "24000 Hz"
+msgstr "24000 Hz"
+
+#: src/filewriter/filewriter.cc:424
+msgid "32000 Hz"
+msgstr "32000 Hz"
+
+#: src/filewriter/filewriter.cc:425 src/xsf/plugin.cc:430
+msgid "44100 Hz"
+msgstr "44100 Hz"
+
+#: src/filewriter/filewriter.cc:426 src/xsf/plugin.cc:431
+msgid "48000 Hz"
+msgstr "48000 Hz"
+
+#: src/filewriter/filewriter.cc:430
+msgid "8 kbit/s"
+msgstr "8 kb/s"
+
+#: src/filewriter/filewriter.cc:431
+msgid "16 kbit/s"
+msgstr "16 kb/s"
+
+#: src/filewriter/filewriter.cc:432
+msgid "32 kbit/s"
+msgstr "32 kb/s"
+
+#: src/filewriter/filewriter.cc:433
+msgid "40 kbit/s"
+msgstr "40 kb/s"
+
+#: src/filewriter/filewriter.cc:434
+msgid "48 kbit/s"
+msgstr "48 kb/s"
+
+#: src/filewriter/filewriter.cc:435
+msgid "56 kbit/s"
+msgstr "56 kb/s"
+
+#: src/filewriter/filewriter.cc:436
+msgid "64 kbit/s"
+msgstr "64 kb/s"
+
+#: src/filewriter/filewriter.cc:437
+msgid "80 kbit/s"
+msgstr "80 kb/s"
+
+#: src/filewriter/filewriter.cc:438
+msgid "96 kbit/s"
+msgstr "96 kb/s"
+
+#: src/filewriter/filewriter.cc:439
+msgid "112 kbit/s"
+msgstr "112 kb/s"
+
+#: src/filewriter/filewriter.cc:440
+msgid "128 kbit/s"
+msgstr "128 kb/s"
+
+#: src/filewriter/filewriter.cc:441
+msgid "160 kbit/s"
+msgstr "160 kb/s"
+
+#: src/filewriter/filewriter.cc:442
+msgid "192 kbit/s"
+msgstr "192 kb/s"
+
+#: src/filewriter/filewriter.cc:443
+msgid "224 kbit/s"
+msgstr "224 kb/s"
+
+#: src/filewriter/filewriter.cc:444
+msgid "256 kbit/s"
+msgstr "256 kb/s"
+
+#: src/filewriter/filewriter.cc:445
+msgid "320 kbit/s"
+msgstr "320 kb/s"
+
+#: src/filewriter/filewriter.cc:450
 msgid "Joint Stereo"
 msgstr "Sujungtas stereo"
 
-#: src/filewriter/mp3.cc:41 src/modplug/plugin_main.cc:58
-#: src/mpg123/mpg123.cc:248
+#: src/filewriter/filewriter.cc:451 src/modplug/plugin_main.cc:57
+#: src/mpg123/mpg123.cc:259
 msgid "Stereo"
 msgstr "Stereo"
 
-#: src/filewriter/mp3.cc:41 src/modplug/plugin_main.cc:57
-#: src/mpg123/mpg123.cc:248
+#: src/filewriter/filewriter.cc:452 src/modplug/plugin_main.cc:56
+#: src/mpg123/mpg123.cc:260
 msgid "Mono"
 msgstr "Mono"
 
-#: src/filewriter/mp3.cc:657
-msgid "MP3 Configuration"
-msgstr "MP3 konfigūravimas"
-
-#: src/filewriter/mp3.cc:658
-msgid "_OK"
-msgstr "_Gerai"
+#: src/filewriter/filewriter.cc:456
+msgid "VBR"
+msgstr "VBR"
+
+#: src/filewriter/filewriter.cc:457
+msgid "ABR"
+msgstr "ABR"
 
-#: src/filewriter/mp3.cc:681
-msgid "Algorithm Quality:"
+#: src/filewriter/filewriter.cc:478
+msgid "Algorithm quality:"
 msgstr "Algoritmo kokybė:"
 
-#: src/filewriter/mp3.cc:706
-msgid "Output Sample Rate:"
-msgstr ""
-
-#: src/filewriter/mp3.cc:733
-msgid "(Hz)"
-msgstr "(Hz)"
-
-#: src/filewriter/mp3.cc:740
-msgid "Bitrate / Compression Ratio:"
-msgstr ""
-
-#: src/filewriter/mp3.cc:764
-msgid "Bitrate (kbps):"
-msgstr "Bitų dažnis(kbps):"
+#: src/filewriter/filewriter.cc:484
+msgid "Bitrate:"
+msgstr "Bitų sparta:"
 
-#: src/filewriter/mp3.cc:796
+#: src/filewriter/filewriter.cc:491
 msgid "Compression ratio:"
-msgstr "Kompresijos santykis:"
+msgstr "Glaudinimo santykis:"
 
-#: src/filewriter/mp3.cc:820
-msgid "Audio Mode:"
-msgstr "Audio režimas:"
-
-#: src/filewriter/mp3.cc:845
-msgid "Miscellaneous:"
-msgstr ""
+#: src/filewriter/filewriter.cc:498
+msgid "Audio mode:"
+msgstr "Garso veiksena:"
 
-#: src/filewriter/mp3.cc:856
+#: src/filewriter/filewriter.cc:501
 msgid "Enforce strict ISO compliance"
-msgstr ""
+msgstr "Vykdyti griežtą ISO atitiktį"
 
-#: src/filewriter/mp3.cc:867
+#: src/filewriter/filewriter.cc:503
 msgid "Error protection"
 msgstr "Apsauga nuo klaidų"
 
-#: src/filewriter/mp3.cc:879 src/filewriter/vorbis.cc:206
-msgid "Quality"
-msgstr "Kokybė"
-
-#: src/filewriter/mp3.cc:888
+#: src/filewriter/filewriter.cc:508
 msgid "Enable VBR/ABR"
 msgstr "Įjungti VBR/ABR"
 
-#: src/filewriter/mp3.cc:898
+#: src/filewriter/filewriter.cc:510
 msgid "Type:"
-msgstr "Tipas:"
+msgstr "Rūšis:"
 
-#: src/filewriter/mp3.cc:931
-msgid "VBR Options:"
-msgstr "VBR pasirinktys:"
+#: src/filewriter/filewriter.cc:514
+msgid "Minimum bitrate:"
+msgstr "Minimali bitų sparta:"
 
-#: src/filewriter/mp3.cc:947
-msgid "Minimum bitrate (kbps):"
-msgstr "Minimalus bitų dažnis (kbps):"
-
-#: src/filewriter/mp3.cc:973
-msgid "Maximum bitrate (kbps):"
-msgstr "Maksimalus bitų dažnis (kbps):"
-
-#: src/filewriter/mp3.cc:995
-msgid "Strictly enforce minimum bitrate"
-msgstr "Griežtai laikytis minimalaus bitų dažnio"
+#: src/filewriter/filewriter.cc:518
+msgid "Maximum bitrate:"
+msgstr "Maksimali bitų sparta:"
 
-#: src/filewriter/mp3.cc:1007
-msgid "ABR Options:"
-msgstr "ABR pasirinktys:"
-
-#: src/filewriter/mp3.cc:1017
-msgid "Average bitrate (kbps):"
-msgstr "Vidutinis bitų dažnis (kbps):"
+#: src/filewriter/filewriter.cc:522
+msgid "Average bitrate:"
+msgstr "Vidutinė bitų sparta:"
 
-#: src/filewriter/mp3.cc:1044
+#: src/filewriter/filewriter.cc:526
 msgid "VBR quality level:"
 msgstr "VBR kokybės lygis:"
 
-#: src/filewriter/mp3.cc:1063
-msgid "Omit Xing VBR header"
-msgstr ""
+#: src/filewriter/filewriter.cc:530
+msgid "Strictly enforce minimum bitrate"
+msgstr "Griežtai laikytis minimalaus bitų dažnio"
 
-#: src/filewriter/mp3.cc:1076
-msgid "VBR/ABR"
-msgstr "VBR/ABR"
+#: src/filewriter/filewriter.cc:533
+msgid "Omit Xing VBR header"
+msgstr "Omit Xing VBR antraštė"
 
-#: src/filewriter/mp3.cc:1085
-msgid "Frame Parameters:"
-msgstr ""
+#: src/filewriter/filewriter.cc:539
+msgid "Frame Headers"
+msgstr "Kadro antraštės"
 
-#: src/filewriter/mp3.cc:1097
+#: src/filewriter/filewriter.cc:540
 msgid "Mark as copyright"
 msgstr "Pažymėti kaip saugomą autorinių teisių"
 
-#: src/filewriter/mp3.cc:1108
+#: src/filewriter/filewriter.cc:542
 msgid "Mark as original"
 msgstr "Pažymėti kaip originalą"
 
-#: src/filewriter/mp3.cc:1120
-msgid "ID3 Parameters:"
-msgstr ""
+#: src/filewriter/filewriter.cc:544
+msgid "ID3 Tags"
+msgstr "ID3 žymės"
 
-#: src/filewriter/mp3.cc:1131
+#: src/filewriter/filewriter.cc:545
 msgid "Force addition of version 2 tag"
 msgstr "Priverstinai pridėti 2 versijos žymą"
 
-#: src/filewriter/mp3.cc:1141
+#: src/filewriter/filewriter.cc:547
 msgid "Only add v1 tag"
 msgstr "Pridėti tik v1 žymą"
 
-#: src/filewriter/mp3.cc:1148
+#: src/filewriter/filewriter.cc:549
 msgid "Only add v2 tag"
 msgstr "Pridėti tik v2 žymą"
 
-#: src/filewriter/mp3.cc:1169
+#: src/filewriter/filewriter.cc:554
+msgid "Quality"
+msgstr "Kokybė"
+
+#: src/filewriter/filewriter.cc:555
+msgid "VBR/ABR"
+msgstr "VBR/ABR"
+
+#: src/filewriter/filewriter.cc:556
 msgid "Tags"
 msgstr "Žymos"
 
-#: src/filewriter/vorbis.cc:196
-msgid "Vorbis Encoder Configuration"
-msgstr "Vorbis koduotojo konfigūracija"
-
-#: src/filewriter/vorbis.cc:219
-msgid "Quality level (0 - 10):"
-msgstr "Kokybės lygis (0 - 10):"
+#: src/filewriter/filewriter.cc:566
+msgid "Quality (0-1):"
+msgstr "Kokybė (0-1):"
 
-#: src/flacng/flacng.h:35
+#: src/filewriter/filewriter.cc:573 src/skins-qt/skins_cfg.cc:307
+#: src/skins/skins_cfg.cc:289
+msgid "General"
+msgstr "Pagrindinės"
+
+#: src/flac/flacng.h:36
 msgid "FLAC Decoder"
-msgstr "FLAC dekoderis"
+msgstr "FLAC iškoduotuvas"
 
-#: src/flacng/metadata.cc:351 src/wavpack/wavpack.cc:209
+#: src/flac/metadata.cc:296 src/wavpack/wavpack.cc:215
 msgid "lossless"
 msgstr "lossless"
 
-#: src/flacng/plugin.cc:169
+#: src/flac/plugin.cc:214
 msgid ""
 "Original code by\n"
 "Ralf Ertzinger <ralf@skytale.net>\n"
@@ -1477,15 +1455,15 @@
 msgid "GIO Plugin"
 msgstr "GIO įskiepis"
 
-#: src/gio/gio.cc:153
+#: src/gio/gio.cc:152
 msgid "Read-and-append mode not supported"
-msgstr ""
+msgstr "Skaitymo ir papildymo veiksena nepalaikoma"
 
-#: src/gio/gio.cc:166
+#: src/gio/gio.cc:165
 msgid "Invalid open mode"
-msgstr ""
+msgstr "Netinkama atverimo veiksena"
 
-#: src/gl-spectrum/gl-spectrum.cc:51
+#: src/glspectrum/gl-spectrum.cc:52
 msgid ""
 "OpenGL Spectrum Analyzer for Audacious\n"
 "Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
@@ -1505,623 +1483,759 @@
 "\n"
 "License: GPLv2+"
 
-#: src/gl-spectrum/gl-spectrum.cc:62
+#: src/glspectrum/gl-spectrum.cc:63 src/qtglspectrum/gl-spectrum.cc:53
 msgid "OpenGL Spectrum Analyzer"
 msgstr "OpenGL spektro analizatorius"
 
-#: src/gl-spectrum-qt/gl-spectrum.cc:41
-msgid ""
-"OpenGL Spectrum Analyzer for Audacious\n"
-"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
-"Copyright 2014 William Pitcock\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-qt/gl-spectrum.cc:53
-msgid "OpenGL Spectrum Analyzer (Qt)"
-msgstr ""
-
-#: src/gnomeshortcuts/gnomeshortcuts.cc:38
-msgid "GNOME Shortcuts"
-msgstr ""
-
-#: src/gnomeshortcuts/gnomeshortcuts.cc:54
-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/gtkui/columns.cc:35
-msgid "Entry number"
-msgstr "Įrašo numeris"
-
-#: src/gtkui/columns.cc:36 src/playlist-manager/playlist-manager.cc:225
-#: src/qtui/playlist_model.cc:123
+#: src/gtkui/columns.cc:36 src/moonstone/playlist_model.cc:38
+#: src/qtui/playlist_model.cc:33
+msgid "Entry Number"
+msgstr "Elemento numeris"
+
+#: src/gtkui/columns.cc:37 src/moonstone/playlist_model.cc:38
+#: src/moonstone/playlist_selection.cc:64
+#: src/playlist-manager/playlist-manager.cc:200
+#: src/playlist-manager-qt/playlist-manager-qt.cc:188
+#: src/qtui/playlist_model.cc:33 src/streamtuner/icecast-model.cc:120
+#: src/streamtuner/ihr-model.cc:159 src/streamtuner/shoutcast-model.cc:122
 msgid "Title"
 msgstr "Pavadinimas"
 
-#: src/gtkui/columns.cc:37 src/qtui/playlist_model.cc:125
+#: src/gtkui/columns.cc:38 src/moonstone/playlist_model.cc:39
+#: src/qtui/playlist_model.cc:33
 msgid "Artist"
 msgstr "Atlikėjas"
 
-#: src/gtkui/columns.cc:38
+#: src/gtkui/columns.cc:39 src/moonstone/playlist_model.cc:39
+#: src/qtui/playlist_model.cc:33
 msgid "Year"
 msgstr "Metai"
 
-#: src/gtkui/columns.cc:39 src/qtui/playlist_model.cc:127
+#: src/gtkui/columns.cc:40 src/moonstone/playlist_model.cc:39
+#: src/qtui/playlist_model.cc:34
 msgid "Album"
 msgstr "Albumas"
 
-#: src/gtkui/columns.cc:40
-msgid "Album artist"
-msgstr ""
+#: src/gtkui/columns.cc:41 src/moonstone/playlist_model.cc:40
+#: src/qtui/playlist_model.cc:34
+msgid "Album Artist"
+msgstr "Albumo atlikėjas"
 
-#: src/gtkui/columns.cc:41
+#: src/gtkui/columns.cc:42 src/moonstone/playlist_model.cc:40
+#: src/qtui/playlist_model.cc:34
 msgid "Track"
 msgstr "Takelis"
 
-#: src/gtkui/columns.cc:42
+#: src/gtkui/columns.cc:43 src/moonstone/playlist_model.cc:40
+#: src/qtui/playlist_model.cc:34 src/streamtuner/icecast-model.cc:123
+#: src/streamtuner/shoutcast-model.cc:125
+#: src/streamtuner/shoutcast-model.cc:236
 msgid "Genre"
 msgstr "Žanras"
 
-#: src/gtkui/columns.cc:43
-msgid "Queue position"
-msgstr "Vieta eilėje"
+#: src/gtkui/columns.cc:44 src/moonstone/playlist_model.cc:41
+#: src/qtui/playlist_model.cc:35
+msgid "Queue Position"
+msgstr "Eilės padėtis"
 
-#: src/gtkui/columns.cc:44
+#: src/gtkui/columns.cc:45 src/moonstone/playlist_model.cc:41
+#: src/qtui/playlist_model.cc:35
 msgid "Length"
 msgstr "Trukmė"
 
-#: src/gtkui/columns.cc:45
-msgid "File path"
-msgstr "Bylos kelias"
-
-#: src/gtkui/columns.cc:47
-msgid "Custom title"
-msgstr "Derintas pavadinimas"
-
-#: src/gtkui/columns.cc:48
+#: src/gtkui/columns.cc:46 src/moonstone/playlist_model.cc:41
+#: src/qtui/playlist_model.cc:35
+msgid "File Path"
+msgstr "Rinkmenos kelias"
+
+#: src/gtkui/columns.cc:47 src/moonstone/playlist_model.cc:42
+#: src/qtui/playlist_model.cc:35
+msgid "File Name"
+msgstr "Rinkmenos pavadinimas"
+
+#: src/gtkui/columns.cc:48 src/moonstone/playlist_model.cc:42
+#: src/qtui/playlist_model.cc:36
+msgid "Custom Title"
+msgstr "Pasirinktas pavadinimas"
+
+#: src/gtkui/columns.cc:49 src/moonstone/playlist_model.cc:42
+#: src/qtui/playlist_model.cc:36 src/streamtuner/icecast-model.cc:129
+#: src/streamtuner/shoutcast-model.cc:134
 msgid "Bitrate"
 msgstr "Bitų seka"
 
-#: src/gtkui/columns.cc:308
+#: src/gtkui/columns.cc:50 src/moonstone/playlist_model.cc:43
+#: src/qtui/playlist_model.cc:36
+msgid "Comment"
+msgstr "Komentaras"
+
+#: src/gtkui/columns.cc:51 src/qtui/playlist_model.cc:36
+msgid "Publisher"
+msgstr ""
+
+#: src/gtkui/columns.cc:52 src/qtui/playlist_model.cc:37
+msgid "Catalog Number"
+msgstr ""
+
+#: src/gtkui/columns.cc:53 src/moonstone/playlist_model.cc:43
+#: src/qtui/playlist_model.cc:37
+msgid "Disc"
+msgstr ""
+
+#: src/gtkui/columns.cc:325
 msgid "Available columns"
 msgstr "Prieinami stulpeliai"
 
-#: src/gtkui/columns.cc:334
+#: src/gtkui/columns.cc:351
 msgid "Displayed columns"
 msgstr "Rodomų stulpelių sąrašas"
 
-#: src/gtkui/layout.cc:72 src/search-tool/search-tool.cc:40
+#: src/gtkui/layout.cc:74 src/search-tool-qt/search-tool-qt.cc:58
+#: src/search-tool/search-tool.cc:49
 msgid "Search Tool"
 msgstr "Paieškos įrankis"
 
-#: src/gtkui/layout.cc:167
+#: src/gtkui/layout.cc:170
 msgid "Dock at Left"
 msgstr "Sumažinti į kairę"
 
-#: src/gtkui/layout.cc:167
+#: src/gtkui/layout.cc:170
 msgid "Dock at Right"
 msgstr "Sumažinti į dešinę"
 
-#: src/gtkui/layout.cc:168
+#: src/gtkui/layout.cc:171
 msgid "Dock at Top"
 msgstr "Sumažinti į viršų"
 
-#: src/gtkui/layout.cc:168
+#: src/gtkui/layout.cc:171
 msgid "Dock at Bottom"
 msgstr "Sumažinti apačioje"
 
-#: src/gtkui/layout.cc:168
+#: src/gtkui/layout.cc:171
 msgid "Undock"
 msgstr "Padidinti"
 
-#: src/gtkui/layout.cc:168 src/ladspa/plugin.cc:531
+#: src/gtkui/layout.cc:171 src/ladspa/plugin.cc:540
 msgid "Disable"
 msgstr "Išjungti"
 
-#: src/gtkui/menus.cc:126 src/qtui/main_window_actions.cc:93
-#: src/statusicon/statusicon.cc:276
+#: src/gtkui/menus.cc:79 src/qtui/menus.cc:107
+#: src/statusicon-qt/statusicon.cc:115 src/statusicon/statusicon.cc:286
 msgid "_Open Files ..."
-msgstr "_Atverti failus ..."
+msgstr "_Atverti rinkmenas..."
 
-#: src/gtkui/menus.cc:127
+#: src/gtkui/menus.cc:80 src/qtui/menus.cc:111
 msgid "Open _URL ..."
 msgstr "Atverti _URL ..."
 
-#: src/gtkui/menus.cc:128 src/qtui/main_window_actions.cc:95
+#: src/gtkui/menus.cc:81 src/qtui/menus.cc:113
 msgid "_Add Files ..."
-msgstr "_Pridėti failus..."
+msgstr "_Pridėti rinkmenas..."
 
-#: src/gtkui/menus.cc:129
+#: src/gtkui/menus.cc:82 src/qtui/menus.cc:118
 msgid "Add U_RL ..."
 msgstr "Pridėti U_RL ..."
 
-#: src/gtkui/menus.cc:131
+#: src/gtkui/menus.cc:84 src/qtui/menus.cc:120
 msgid "Search _Library"
 msgstr "Ieškoti _bibliotekoje"
 
-#: src/gtkui/menus.cc:133 src/qtui/main_window_actions.cc:98
+#: src/gtkui/menus.cc:86 src/qtui/menus.cc:123
 msgid "A_bout ..."
 msgstr "A_pie"
 
-#: src/gtkui/menus.cc:134 src/qtui/main_window_actions.cc:99
+#: src/gtkui/menus.cc:87 src/qtui/menus.cc:125
 msgid "_Settings ..."
 msgstr "_Nustatymai..."
 
-#: src/gtkui/menus.cc:135 src/qtui/main_window_actions.cc:103
-#: src/statusicon/statusicon.cc:284
+#: src/gtkui/menus.cc:88 src/qtui/menus.cc:131
+#: src/statusicon-qt/statusicon.cc:117 src/statusicon/statusicon.cc:288
 msgid "_Quit"
 msgstr "_Išeiti"
 
-#: src/gtkui/menus.cc:139 src/gtkui/menus.cc:262
-#: src/qtui/main_window_actions.cc:107 src/search-tool/search-tool.cc:641
-#: src/statusicon/statusicon.cc:278
+#: src/gtkui/menus.cc:92 src/gtkui/menus.cc:226
+#: src/moonstone/playlist_tabs.cc:306 src/qtui/menus.cc:135
+#: src/qtui/playlist_tabs.cc:331 src/search-tool-qt/search-tool-qt.cc:499
+#: src/search-tool/search-tool.cc:339 src/statusicon-qt/statusicon.cc:109
+#: src/statusicon/statusicon.cc:280
 msgid "_Play"
 msgstr "_Groti"
 
-#: src/gtkui/menus.cc:140 src/qtui/main_window_actions.cc:108
-#: src/statusicon/statusicon.cc:279
+#: src/gtkui/menus.cc:93 src/qtui/menus.cc:137
+#: src/statusicon-qt/statusicon.cc:110 src/statusicon/statusicon.cc:281
 msgid "Paus_e"
 msgstr "Pauz_ė"
 
-#: src/gtkui/menus.cc:141 src/qtui/main_window_actions.cc:109
-#: src/statusicon/statusicon.cc:280
+#: src/gtkui/menus.cc:94 src/qtui/menus.cc:139
+#: src/statusicon-qt/statusicon.cc:111 src/statusicon/statusicon.cc:282
 msgid "_Stop"
 msgstr "_Sustabdyti"
 
-#: src/gtkui/menus.cc:142 src/qtui/main_window_actions.cc:110
-#: src/statusicon/statusicon.cc:277
+#: src/gtkui/menus.cc:95 src/qtui/menus.cc:141
+#: src/statusicon-qt/statusicon.cc:112 src/statusicon/statusicon.cc:283
 msgid "Pre_vious"
 msgstr "Ankste_snis"
 
-#: src/gtkui/menus.cc:143 src/qtui/main_window_actions.cc:111
-#: src/statusicon/statusicon.cc:281
+#: src/gtkui/menus.cc:96 src/qtui/menus.cc:143
+#: src/statusicon-qt/statusicon.cc:113 src/statusicon/statusicon.cc:284
 msgid "_Next"
 msgstr "_Sekantis"
 
-#: src/gtkui/menus.cc:145 src/qtui/main_window_actions.cc:113
+#: src/gtkui/menus.cc:97 src/qtui/menus.cc:145 src/skins/menus.cc:114
+#: src/skins-qt/menus.cc:105
+msgid "Previous Album"
+msgstr "Ankstesnis albumas"
+
+#: src/gtkui/menus.cc:98 src/qtui/menus.cc:146 src/skins/menus.cc:115
+#: src/skins-qt/menus.cc:106
+msgid "Next Album"
+msgstr "Kitas albumas"
+
+#: src/gtkui/menus.cc:100 src/qtui/menus.cc:148
 msgid "_Repeat"
 msgstr "_Kartoti"
 
-#: src/gtkui/menus.cc:146 src/qtui/main_window_actions.cc:114
+#: src/gtkui/menus.cc:101 src/qtui/menus.cc:150
 msgid "S_huffle"
 msgstr "S_umaišyti"
 
-#: src/gtkui/menus.cc:147 src/qtui/main_window_actions.cc:115
+#: src/gtkui/menus.cc:102 src/qtui/menus.cc:152
+msgid "Shuffle by Albu_m"
+msgstr "Maišyti pagal _albumus"
+
+#: src/gtkui/menus.cc:103 src/qtui/menus.cc:155
 msgid "N_o Playlist Advance"
 msgstr "N_esislinkti grojaraščiu"
 
-#: src/gtkui/menus.cc:148 src/qtui/main_window_actions.cc:116
+#: src/gtkui/menus.cc:104 src/qtui/menus.cc:157
 msgid "Stop A_fter This Song"
 msgstr "Sustabdyti _po šios dainos"
 
-#: src/gtkui/menus.cc:150 src/gtkui/menus.cc:247
-#: src/qtui/main_window_actions.cc:118
+#: src/gtkui/menus.cc:106 src/gtkui/menus.cc:210 src/qtui/menus.cc:162
+#: src/qtui/menus.cc:294
 msgid "Song _Info ..."
 msgstr "Dainos _informacija ..."
 
-#: src/gtkui/menus.cc:151
+#: src/gtkui/menus.cc:107
 msgid "Jump to _Time ..."
 msgstr "Šokti į _laiką"
 
-#: src/gtkui/menus.cc:152
+#: src/gtkui/menus.cc:108
 msgid "_Jump to Song ..."
 msgstr "_Pereiti prie dainos ..."
 
-#: src/gtkui/menus.cc:154
+#: src/gtkui/menus.cc:110 src/qtui/menus.cc:165
 msgid "Set Repeat Point _A"
 msgstr "Nustatyti kartojimo tašką _A"
 
-#: src/gtkui/menus.cc:155
+#: src/gtkui/menus.cc:111 src/qtui/menus.cc:167
 msgid "Set Repeat Point _B"
 msgstr "Nustatyti kartojimo tašką _B"
 
-#: src/gtkui/menus.cc:156
+#: src/gtkui/menus.cc:112 src/qtui/menus.cc:169
 msgid "_Clear Repeat Points"
 msgstr "_Išvalyti kartojimo taškus"
 
-#: src/gtkui/menus.cc:160 src/gtkui/menus.cc:167 src/gtkui/menus.cc:183
-#: src/qtui/main_window_actions.cc:122 src/qtui/main_window_actions.cc:129
-#: src/qtui/main_window_actions.cc:145
+#: src/gtkui/menus.cc:116 src/gtkui/menus.cc:123 src/gtkui/menus.cc:141
+#: src/qtui/menus.cc:173 src/qtui/menus.cc:180 src/qtui/menus.cc:198
 msgid "By _Title"
 msgstr "Pagal _pavadinimą"
 
-#: src/gtkui/menus.cc:161 src/qtui/main_window_actions.cc:123
+#: src/gtkui/menus.cc:117 src/qtui/menus.cc:174
 msgid "By _File Name"
-msgstr ""
+msgstr "Pagal _Rinkmenos pavadinimą"
 
-#: src/gtkui/menus.cc:162 src/qtui/main_window_actions.cc:124
+#: src/gtkui/menus.cc:118 src/qtui/menus.cc:175
 msgid "By File _Path"
 msgstr "Pagal failo _kelią"
 
-#: src/gtkui/menus.cc:166 src/gtkui/menus.cc:182
-#: src/qtui/main_window_actions.cc:128 src/qtui/main_window_actions.cc:144
+#: src/gtkui/menus.cc:122 src/gtkui/menus.cc:140 src/qtui/menus.cc:179
+#: src/qtui/menus.cc:197
 msgid "By Track _Number"
 msgstr "Pagal takelio _numerį"
 
-#: src/gtkui/menus.cc:168 src/gtkui/menus.cc:184
-#: src/qtui/main_window_actions.cc:130 src/qtui/main_window_actions.cc:146
+#: src/gtkui/menus.cc:124 src/gtkui/menus.cc:142 src/qtui/menus.cc:181
+#: src/qtui/menus.cc:199
 msgid "By _Artist"
 msgstr "Pagal _atlikėją"
 
-#: src/gtkui/menus.cc:169 src/gtkui/menus.cc:185
-#: src/qtui/main_window_actions.cc:131 src/qtui/main_window_actions.cc:147
+#: src/gtkui/menus.cc:125 src/gtkui/menus.cc:143 src/qtui/menus.cc:182
+#: src/qtui/menus.cc:200
 msgid "By Al_bum"
 msgstr "Pagal _albumą"
 
-#: src/gtkui/menus.cc:170 src/gtkui/menus.cc:186
-#: src/qtui/main_window_actions.cc:132 src/qtui/main_window_actions.cc:148
+#: src/gtkui/menus.cc:126 src/gtkui/menus.cc:144 src/qtui/menus.cc:183
+#: src/qtui/menus.cc:201
 msgid "By Albu_m Artist"
-msgstr ""
+msgstr "Pagal _albumo atlikėją"
 
-#: src/gtkui/menus.cc:171 src/gtkui/menus.cc:187
-#: src/qtui/main_window_actions.cc:133 src/qtui/main_window_actions.cc:149
+#: src/gtkui/menus.cc:127 src/gtkui/menus.cc:145 src/qtui/menus.cc:184
+#: src/qtui/menus.cc:202
 msgid "By Release _Date"
 msgstr "Pagal išleidimo _datą"
 
-#: src/gtkui/menus.cc:172 src/gtkui/menus.cc:188
-#: src/qtui/main_window_actions.cc:134 src/qtui/main_window_actions.cc:150
+#: src/gtkui/menus.cc:128 src/gtkui/menus.cc:146 src/qtui/menus.cc:185
+#: src/qtui/menus.cc:203
 msgid "By _Genre"
-msgstr ""
+msgstr "Pagal ž_anrą"
 
-#: src/gtkui/menus.cc:173 src/gtkui/menus.cc:189
-#: src/qtui/main_window_actions.cc:135 src/qtui/main_window_actions.cc:151
+#: src/gtkui/menus.cc:129 src/gtkui/menus.cc:147 src/qtui/menus.cc:186
+#: src/qtui/menus.cc:204
 msgid "By _Length"
 msgstr "Pagal _trukmę"
 
-#: src/gtkui/menus.cc:174 src/gtkui/menus.cc:190
-#: src/qtui/main_window_actions.cc:136 src/qtui/main_window_actions.cc:152
+#: src/gtkui/menus.cc:130 src/gtkui/menus.cc:148 src/qtui/menus.cc:187
+#: src/qtui/menus.cc:205
 msgid "By _File Path"
-msgstr "Pagal _failo kelią"
+msgstr "Pagal _rinkmenos kelią"
 
-#: src/gtkui/menus.cc:175 src/gtkui/menus.cc:191
-#: src/qtui/main_window_actions.cc:137 src/qtui/main_window_actions.cc:153
+#: src/gtkui/menus.cc:131 src/gtkui/menus.cc:149 src/qtui/menus.cc:188
+#: src/qtui/menus.cc:206
 msgid "By _Custom Title"
 msgstr "Pagal _derintą eilutę"
 
-#: src/gtkui/menus.cc:177 src/gtkui/menus.cc:193
-#: src/qtui/main_window_actions.cc:139 src/qtui/main_window_actions.cc:155
+#: src/gtkui/menus.cc:132 src/gtkui/menus.cc:150 src/qtui/menus.cc:189
+#: src/qtui/menus.cc:207
+msgid "By C_omment"
+msgstr "Pagak _komentarus"
+
+#: src/gtkui/menus.cc:133 src/gtkui/menus.cc:151 src/qtui/menus.cc:190
+#: src/qtui/menus.cc:208
+msgid "By D_isc Number"
+msgstr ""
+
+#: src/gtkui/menus.cc:135 src/gtkui/menus.cc:153 src/qtui/menus.cc:192
+#: src/qtui/menus.cc:210
 msgid "R_everse Order"
 msgstr "A_tvirkštine tvarka"
 
-#: src/gtkui/menus.cc:178 src/gtkui/menus.cc:194
-#: src/qtui/main_window_actions.cc:140 src/qtui/main_window_actions.cc:156
+#: src/gtkui/menus.cc:136 src/gtkui/menus.cc:154 src/qtui/menus.cc:194
+#: src/qtui/menus.cc:212
 msgid "_Random Order"
 msgstr "_Atsitiktine tvarka"
 
-#: src/gtkui/menus.cc:198 src/qtui/main_window_actions.cc:160
+#: src/gtkui/menus.cc:158 src/qtui/menus.cc:216
 msgid "_Play/Resume"
-msgstr ""
+msgstr "_Groti / Tęsti"
 
-#: src/gtkui/menus.cc:199 src/gtkui/menus.cc:251
-#: src/qtui/main_window_actions.cc:161
+#: src/gtkui/menus.cc:159 src/qtui/menus.cc:218
 msgid "_Refresh"
 msgstr "_Atnaujinti"
 
-#: src/gtkui/menus.cc:201 src/qtui/main_window_actions.cc:163
+#: src/gtkui/menus.cc:161 src/qtui/menus.cc:222
 msgid "_Sort"
 msgstr "_Rikiuoti"
 
-#: src/gtkui/menus.cc:202 src/qtui/main_window_actions.cc:164
+#: src/gtkui/menus.cc:162 src/qtui/menus.cc:223
 msgid "Sort Se_lected"
 msgstr "Rikuoti _pasirinktus"
 
-#: src/gtkui/menus.cc:203 src/qtui/main_window_actions.cc:165
+#: src/gtkui/menus.cc:163 src/qtui/menus.cc:225
 msgid "Remove _Duplicates"
 msgstr "Pašalinti _dubliuotus"
 
-#: src/gtkui/menus.cc:204 src/qtui/main_window_actions.cc:166
+#: src/gtkui/menus.cc:164 src/qtui/menus.cc:226
 msgid "Remove _Unavailable Files"
 msgstr "Pašalinti _neprieinamus failus"
 
-#: src/gtkui/menus.cc:206 src/playlist-manager/playlist-manager.cc:244
-#: src/qtui/main_window_actions.cc:168
+#: src/gtkui/menus.cc:166 src/playlist-manager/playlist-manager.cc:219
+#: src/playlist-manager-qt/playlist-manager-qt.cc:348 src/qtui/menus.cc:229
 msgid "_New"
 msgstr "_Naujas"
 
-#: src/gtkui/menus.cc:207
+#: src/gtkui/menus.cc:167 src/qtui/menus.cc:230
 msgid "Ren_ame ..."
 msgstr "_Pervadinti"
 
-#: src/gtkui/menus.cc:208 src/gtkui/menus.cc:264
-#: src/qtui/main_window_actions.cc:170
+#: src/gtkui/menus.cc:168 src/gtkui/menus.cc:228
+#: src/moonstone/playlist_tabs.cc:311 src/qtui/menus.cc:231
+#: src/qtui/playlist_tabs.cc:336
 msgid "Remo_ve"
 msgstr "_Šalinti"
 
-#: src/gtkui/menus.cc:210
+#: src/gtkui/menus.cc:170 src/qtui/menus.cc:233
 msgid "_Import ..."
 msgstr "_Įkelti ..."
 
-#: src/gtkui/menus.cc:211
+#: src/gtkui/menus.cc:171 src/qtui/menus.cc:234
 msgid "_Export ..."
 msgstr "_Eksportuoti ..."
 
-#: src/gtkui/menus.cc:213
+#: src/gtkui/menus.cc:173 src/qtui/menus.cc:237
 msgid "Playlist _Manager ..."
 msgstr "Grojaraščio _redaktorius"
 
-#: src/gtkui/menus.cc:214 src/qtui/main_window_actions.cc:176
+#: src/gtkui/menus.cc:174 src/qtui/menus.cc:239
 msgid "_Queue Manager ..."
 msgstr "_Eilės redaktorius ..."
 
-#: src/gtkui/menus.cc:218 src/qtui/main_window_actions.cc:180
+#: src/gtkui/menus.cc:178 src/qtui/menus.cc:243
 msgid "Volume _Up"
 msgstr "Pagarsi_nti"
 
-#: src/gtkui/menus.cc:219 src/qtui/main_window_actions.cc:181
+#: src/gtkui/menus.cc:179 src/qtui/menus.cc:245
 msgid "Volume _Down"
 msgstr "Patil_dyti"
 
-#: src/gtkui/menus.cc:221 src/qtui/main_window_actions.cc:183
-msgid "_Equalizer"
-msgstr "_Ekvalaizeris"
+#: src/gtkui/menus.cc:181 src/qtui/menus.cc:249
+msgid "_Equalizer ..."
+msgstr "_Vienodintuvas..."
 
-#: src/gtkui/menus.cc:223 src/qtui/main_window_actions.cc:185
+#: src/gtkui/menus.cc:182 src/qtui/menus.cc:251
 msgid "E_ffects ..."
 msgstr "E_fektai..."
 
-#: src/gtkui/menus.cc:227
+#: src/gtkui/menus.cc:184
+msgid "_Record Stream"
+msgstr "Į_rašymo srautas"
+
+#: src/gtkui/menus.cc:185
+msgid "Audio _Settings ..."
+msgstr "_Garso nustatymai..."
+
+#: src/gtkui/menus.cc:189 src/qtui/menus.cc:260
 msgid "Show _Menu Bar"
 msgstr "Rodyti _meniu juostą"
 
-#: src/gtkui/menus.cc:228
+#: src/gtkui/menus.cc:190 src/qtui/menus.cc:262
 msgid "Show I_nfo Bar"
 msgstr "Rodyti i_nfo juostą"
 
-#: src/gtkui/menus.cc:229
+#: src/gtkui/menus.cc:191 src/qtui/menus.cc:264
+msgid "Show Info Bar _Album Art"
+msgstr "Rodyti informacijos juostą _Albumo viršelis"
+
+#: src/gtkui/menus.cc:192 src/qtui/menus.cc:266
 msgid "Show Info Bar Vis_ualization"
 msgstr "Rodyti informacijos juostos _vizualizaciją"
 
-#: src/gtkui/menus.cc:230
+#: src/gtkui/menus.cc:193 src/qtui/menus.cc:268
 msgid "Show _Status Bar"
 msgstr "Rodyti _būsenos juostą"
 
-#: src/gtkui/menus.cc:232
+#: src/gtkui/menus.cc:195 src/qtui/menus.cc:272
 msgid "Show _Remaining Time"
 msgstr "_Rodyti likusį laiką"
 
-#: src/gtkui/menus.cc:234
+#: src/gtkui/menus.cc:197 src/qtui/menus.cc:276 src/skins/menus.cc:157
+#: src/skins-qt/menus.cc:152
 msgid "_Visualizations ..."
 msgstr "_Vaizdiniai..."
 
-#: src/gtkui/menus.cc:238 src/qtui/main_window_actions.cc:189
+#: src/gtkui/menus.cc:201 src/qtui/menus.cc:280
 msgid "_File"
 msgstr "_Failas"
 
-#: src/gtkui/menus.cc:239 src/qtui/main_window_actions.cc:190
+#: src/gtkui/menus.cc:202 src/qtui/menus.cc:281
 msgid "_Playback"
 msgstr "_Atkūrimas"
 
-#: src/gtkui/menus.cc:240 src/qtui/main_window_actions.cc:191
+#: src/gtkui/menus.cc:203 src/qtui/menus.cc:282
 msgid "P_laylist"
 msgstr "G_rojaraštis"
 
-#: src/gtkui/menus.cc:241 src/gtkui/menus.cc:258
-#: src/qtui/main_window_actions.cc:192
+#: src/gtkui/menus.cc:204 src/gtkui/menus.cc:222 src/qtui/menus.cc:283
+#: src/qtui/menus.cc:312
 msgid "_Services"
 msgstr "_Tarnybos"
 
-#: src/gtkui/menus.cc:242 src/qtui/main_window_actions.cc:193
+#: src/gtkui/menus.cc:205 src/qtui/menus.cc:284
 msgid "_Output"
 msgstr "_Išvestis"
 
-#: src/gtkui/menus.cc:243
+#: src/gtkui/menus.cc:206 src/qtui/menus.cc:285
 msgid "_View"
 msgstr "_Rodymas"
 
-#: src/gtkui/menus.cc:248
+#: src/gtkui/menus.cc:211 src/qtui/menus.cc:296
 msgid "_Queue/Unqueue"
 msgstr "_Į eilę/Iš eilės"
 
-#: src/gtkui/menus.cc:250
+#: src/gtkui/menus.cc:213 src/qtui/menus.cc:299
 msgid "_Open Containing Folder"
-msgstr ""
+msgstr "_Atverti esamą aplanką"
 
-#: src/gtkui/menus.cc:253
+#: src/gtkui/menus.cc:214 src/qtui/menus.cc:301
+msgid "_Refresh Selected"
+msgstr "_Atnaujinti pasirinktus"
+
+#: src/gtkui/menus.cc:216 src/qtui/menus.cc:304
 msgid "Cu_t"
 msgstr "Iškirpt_i"
 
-#: src/gtkui/menus.cc:254
+#: src/gtkui/menus.cc:217 src/qtui/menus.cc:305
 msgid "_Copy"
 msgstr "_Kopijuoti"
 
-#: src/gtkui/menus.cc:255
+#: src/gtkui/menus.cc:218 src/qtui/menus.cc:306
 msgid "_Paste"
 msgstr "_Įklijuoti"
 
-#: src/gtkui/menus.cc:256
+#: src/gtkui/menus.cc:219 src/qtui/menus.cc:307
+msgid "Paste at _End"
+msgstr "Įklijuoti _gale"
+
+#: src/gtkui/menus.cc:220 src/qtui/menus.cc:309
 msgid "Select _All"
 msgstr "Pasirinkti _viską"
 
-#: src/gtkui/menus.cc:263
+#: src/gtkui/menus.cc:227 src/moonstone/playlist_tabs.cc:309
+#: src/qtui/playlist_tabs.cc:334
 msgid "_Rename ..."
 msgstr "_Pervadinti..."
 
-#: src/gtkui/settings.cc:35
+#: src/gtkui/settings.cc:35 src/qtui/settings.cc:59
+msgid "Always"
+msgstr "Visada"
+
+#: src/gtkui/settings.cc:36 src/qtui/settings.cc:60
+msgid "Auto-hide"
+msgstr "Autoslėpimas"
+
+#: src/gtkui/settings.cc:37 src/qtui/settings.cc:61
+msgid "Never"
+msgstr "Niekada"
+
+#: src/gtkui/settings.cc:41 src/qtui/settings.cc:64
 msgid "Playlist Tabs"
 msgstr "Grojaraščio kortelės"
 
-#: src/gtkui/settings.cc:36
-msgid "Always show tabs"
-msgstr "Visada rodyti korteles"
+#: src/gtkui/settings.cc:42 src/qtui/settings.cc:65
+msgid "Show playlist tabs:"
+msgstr "Rodyti grojaraščių skyrelius:"
 
-#: src/gtkui/settings.cc:38
+#: src/gtkui/settings.cc:45 src/qtui/settings.cc:69
 msgid "Show entry counts"
 msgstr "Rodyti įvesčių skaičių"
 
-#: src/gtkui/settings.cc:40
+#: src/gtkui/settings.cc:47 src/qtui/settings.cc:72
 msgid "Show close buttons"
 msgstr "Rodyti uždarymo mygtukus"
 
-#: src/gtkui/settings.cc:42
+#: src/gtkui/settings.cc:49 src/qtui/settings.cc:75
 msgid "Playlist Columns"
 msgstr "Grojaračio stulpeliai"
 
-#: src/gtkui/settings.cc:44
+#: src/gtkui/settings.cc:51 src/qtui/settings.cc:77
 msgid "Show column headers"
 msgstr "Rodyti stulpelio antraštes"
 
-#: src/gtkui/settings.cc:46 src/modplug/plugin_main.cc:106
-#: src/skins/skins_cfg.cc:263
-msgid "Miscellaneous"
-msgstr "Kita"
+#: src/gtkui/settings.cc:53 src/qtui/settings.cc:82
+msgid "Make column headers clickable for sorting"
+msgstr ""
 
-#: src/gtkui/settings.cc:47
-msgid "Arrow keys seek by:"
-msgstr "Krypčių klavišai persuka:"
+#: src/gtkui/settings.cc:56
+msgid "Use symbolic icons in toolbar"
+msgstr ""
 
-#: src/gtkui/settings.cc:50
+#: src/gtkui/settings.cc:58 src/qtui/settings.cc:86
 msgid "Scroll on song change"
 msgstr "Keičiantis dainai slinkti"
 
-#: src/gtkui/ui_gtk.cc:71
+#: src/gtkui/ui_gtk.cc:82
 msgid "GTK Interface"
 msgstr "GTK naudotojo sąsaja"
 
-#: src/gtkui/ui_gtk.cc:222 src/skins/ui_main.cc:232
+#: src/gtkui/ui_gtk.cc:219 src/skins/main.cc:228 src/skins-qt/main.cc:231
 #, c-format
 msgid "%s - Audacious"
 msgstr "%s - Audacious"
 
-#: src/gtkui/ui_gtk.cc:225 src/qtui/main_window.cc:186
+#: src/gtkui/ui_gtk.cc:221 src/moonstone/main_window.cc:184
+#: src/qtui/main_window.cc:385
 msgid "Buffering ..."
-msgstr "Įkraunama į atmintį ..."
+msgstr "Įkeliama į atmintį ..."
 
-#: src/gtkui/ui_gtk.cc:228 src/skins/ui_main.cc:234 src/skins/ui_main.cc:1164
+#: src/gtkui/ui_gtk.cc:224 src/pipewire/pipewire.cc:402 src/skins/main.cc:230
+#: src/skins-qt/main.cc:233
 msgid "Audacious"
 msgstr "Audacious"
 
-#: src/gtkui/ui_statusbar.cc:63 src/qtui/status_bar.cc:67
+#: src/gtkui/ui_gtk.cc:487 src/gtkui/ui_gtk.cc:518 src/gtkui/ui_gtk.cc:882
+#: src/hotkey/gui.cc:72 src/moonstone/main_window.cc:67
+#: src/moonstone/main_window.cc:145 src/moonstone/main_window.cc:146
+#: src/notify/osd.cc:85 src/qthotkey/gui.cc:67 src/qtui/main_window.cc:154
+#: src/qtui/main_window.cc:347 src/qtui/main_window.cc:348
+#: src/skins/menus.cc:109 src/skins-qt/menus.cc:100
+msgid "Play"
+msgstr "Groti"
+
+#: src/gtkui/ui_gtk.cc:487 src/moonstone/main_window.cc:151
+#: src/moonstone/main_window.cc:152 src/notify/osd.cc:82
+#: src/qtui/main_window.cc:353 src/qtui/main_window.cc:354
+#: src/skins/menus.cc:110 src/skins-qt/menus.cc:101
+msgid "Pause"
+msgstr "Pauzė"
+
+#: src/gtkui/ui_gtk.cc:868 src/moonstone/main_window.cc:57
+#: src/qtui/main_window.cc:145 src/skins/menus.cc:86 src/skins-qt/menus.cc:77
+msgid "Search Library"
+msgstr "Paieška bibliotekoje"
+
+#: src/gtkui/ui_gtk.cc:875 src/moonstone/main_window.cc:60
+#: src/qtui/main_window.cc:147
+msgid "Open Files"
+msgstr "Atverti rinkmenas"
+
+#: src/gtkui/ui_gtk.cc:876 src/moonstone/main_window.cc:62
+#: src/qtui/main_window.cc:149
+msgid "Add Files"
+msgstr "Pridėti rinkmenas"
+
+#: src/gtkui/ui_gtk.cc:881 src/moonstone/main_window.cc:65
+#: src/qtui/main_window.cc:152 src/skins/menus.cc:112 src/skins-qt/menus.cc:103
+msgid "Previous"
+msgstr "Ankstesnis"
+
+#: src/gtkui/ui_gtk.cc:883 src/hotkey/gui.cc:74 src/moonstone/main_window.cc:69
+#: src/qthotkey/gui.cc:69 src/qtui/main_window.cc:156 src/skins/menus.cc:111
+#: src/skins-qt/menus.cc:102
+msgid "Stop"
+msgstr "Stabdyti"
+
+#: src/gtkui/ui_gtk.cc:884 src/moonstone/main_window.cc:76 src/notify/osd.cc:89
+#: src/qtui/main_window.cc:163 src/skins/menus.cc:113 src/skins-qt/menus.cc:104
+msgid "Next"
+msgstr "Sekantis"
+
+#: src/gtkui/ui_gtk.cc:886 src/moonstone/main_window.cc:79
+#: src/qtui/main_window.cc:166 src/qtui/menus.cc:254 src/skins/menus.cc:79
+#: src/skins-qt/menus.cc:69
+msgid "Record Stream"
+msgstr "Įrašo srautas"
+
+#: src/gtkui/ui_gtk.cc:919 src/moonstone/main_window.cc:86
+#: src/qtui/main_window.cc:173 src/skins/menus.cc:103 src/skins-qt/menus.cc:94
+msgid "Repeat"
+msgstr "Kartoti"
+
+#: src/gtkui/ui_gtk.cc:922 src/moonstone/main_window.cc:89
+#: src/qtui/main_window.cc:176 src/skins/menus.cc:104 src/skins-qt/menus.cc:95
+msgid "Shuffle"
+msgstr "Maišyti"
+
+#: src/gtkui/ui_gtk.cc:1114 src/qtui/main_window.cc:123
+msgid "Menu"
+msgstr "Meniu"
+
+#: src/gtkui/ui_statusbar.cc:64 src/qtui/status_bar.cc:155
 msgid "mono"
 msgstr "mono"
 
-#: src/gtkui/ui_statusbar.cc:65 src/qtui/status_bar.cc:69
+#: src/gtkui/ui_statusbar.cc:66 src/qtui/status_bar.cc:157
 msgid "stereo"
 msgstr "stereo"
 
-#: src/gtkui/ui_statusbar.cc:67 src/qtui/status_bar.cc:71
+#: src/gtkui/ui_statusbar.cc:68 src/qtui/status_bar.cc:160
 #, c-format
 msgid "%d channel"
 msgid_plural "%d channels"
 msgstr0 "%d kanalas"
 msgstr1 "%d kanalai"
 msgstr2 "%d kanalų"
+msgstr3 "%d kanalų"
+
+#: src/gtkui/ui_statusbar.cc:76 src/qtui/status_bar.cc:168
+#, c-format
+msgid "%d kHz"
+msgstr "%d kHz"
 
-#: src/gtkui/ui_statusbar.cc:81 src/qtui/status_bar.cc:85
+#: src/gtkui/ui_statusbar.cc:82 src/qtui/status_bar.cc:174
 #, c-format
-msgid "%d kbps"
-msgstr "%d kbps"
+msgid "%d kbit/s"
+msgstr "%d kb/s"
 
-#: src/gtkui/ui_statusbar.cc:107 src/skins/ui_main_evlisteners.cc:103
+#: src/gtkui/ui_statusbar.cc:108 src/skins/main.cc:478 src/skins-qt/main.cc:461
 msgid "Single mode."
 msgstr "Vieno režimas."
 
-#: src/gtkui/ui_statusbar.cc:109 src/skins/ui_main_evlisteners.cc:105
+#: src/gtkui/ui_statusbar.cc:110 src/skins/main.cc:480 src/skins-qt/main.cc:463
 msgid "Playlist mode."
 msgstr "Grojaraščio režimas."
 
-#: src/gtkui/ui_statusbar.cc:117 src/skins/ui_main_evlisteners.cc:111
+#: src/gtkui/ui_statusbar.cc:118 src/skins/main.cc:486 src/skins-qt/main.cc:469
 msgid "Stopping after song."
 msgstr "Sustabdymas po dainos."
 
-#: src/hotkey/gui.cc:71
+#: src/hotkey/gui.cc:71 src/qthotkey/gui.cc:66
 msgid "Previous track"
 msgstr "Ankstesnis takelis"
 
-#: src/hotkey/gui.cc:72 src/notify/osd.cc:69 src/qtui/main_window.cc:69
-#: src/qtui/main_window.cc:172 src/qtui/main_window.cc:173
-#: src/skins/menus.cc:87
-msgid "Play"
-msgstr "Groti"
-
-#: src/hotkey/gui.cc:73
+#: src/hotkey/gui.cc:73 src/qthotkey/gui.cc:68
 msgid "Pause/Resume"
 msgstr "Sustabdyti/Paleisti"
 
-#: src/hotkey/gui.cc:74 src/qtui/main_window.cc:70 src/skins/menus.cc:89
-msgid "Stop"
-msgstr "Stabdyti"
-
-#: src/hotkey/gui.cc:75
+#: src/hotkey/gui.cc:75 src/qthotkey/gui.cc:70
 msgid "Next track"
 msgstr "Kitas takelis"
 
-#: src/hotkey/gui.cc:76
-msgid "Forward 5 seconds"
-msgstr "5 sekundes į priekį"
-
-#: src/hotkey/gui.cc:77
-msgid "Rewind 5 seconds"
-msgstr "5 sekundes atgal"
+#: src/hotkey/gui.cc:76 src/qthotkey/gui.cc:71
+msgid "Step forward"
+msgstr "Žingsnis į priekį"
+
+#: src/hotkey/gui.cc:77 src/qthotkey/gui.cc:72
+msgid "Step backward"
+msgstr "Žingsnis atgal"
 
-#: src/hotkey/gui.cc:78
+#: src/hotkey/gui.cc:78 src/qthotkey/gui.cc:73
 msgid "Mute"
 msgstr "Nutildyti"
 
-#: src/hotkey/gui.cc:79
+#: src/hotkey/gui.cc:79 src/qthotkey/gui.cc:74
 msgid "Volume up"
 msgstr "Pagarsinti"
 
-#: src/hotkey/gui.cc:80
+#: src/hotkey/gui.cc:80 src/qthotkey/gui.cc:75
 msgid "Volume down"
 msgstr "Pritildyti"
 
-#: src/hotkey/gui.cc:81
+#: src/hotkey/gui.cc:81 src/qthotkey/gui.cc:76
 msgid "Jump to file"
-msgstr "Peršokti į failą"
+msgstr "Peršokti į rinkmeną"
 
-#: src/hotkey/gui.cc:82
+#: src/hotkey/gui.cc:82 src/qthotkey/gui.cc:77
 msgid "Toggle player window(s)"
 msgstr "Perjungti grotuvo langą (-us)"
 
-#: src/hotkey/gui.cc:83
+#: src/hotkey/gui.cc:83 src/qthotkey/gui.cc:78
 msgid "Show On-Screen-Display"
 msgstr "Rodyti On-Screen-Display"
 
-#: src/hotkey/gui.cc:84
+#: src/hotkey/gui.cc:84 src/qthotkey/gui.cc:79
 msgid "Toggle repeat"
 msgstr "Perjungti kartojimą"
 
-#: src/hotkey/gui.cc:85
+#: src/hotkey/gui.cc:85 src/qthotkey/gui.cc:80
 msgid "Toggle shuffle"
 msgstr "Perjungti maišymą"
 
-#: src/hotkey/gui.cc:86
+#: src/hotkey/gui.cc:86 src/qthotkey/gui.cc:81
 msgid "Toggle stop after current"
 msgstr "Perjungti sustabdymą po dabartinės"
 
-#: src/hotkey/gui.cc:87
+#: src/hotkey/gui.cc:87 src/qthotkey/gui.cc:82
 msgid "Raise player window(s)"
 msgstr "Pakelti grotuvą langą (-us)"
 
-#: src/hotkey/gui.cc:97
+#: src/hotkey/gui.cc:98 src/qthotkey/gui.cc:100
 msgid "(none)"
 msgstr "(joks)"
 
-#: src/hotkey/gui.cc:234
+#: src/hotkey/gui.cc:261
 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 modifiers.\n"
 "\n"
 "Do you want to continue?"
 msgstr ""
-"Nerekomenduojama susieti pagrindinius pelės mygtukus be prižiūrėtojų.\n"
+"Nerekomenduojama susieti pagrindinių pelės mygtukų be modifikatorių.\n"
 "\n"
-"Tęsti?"
+"Ar norite tęsti?"
 
-#: src/hotkey/gui.cc:236
+#: src/hotkey/gui.cc:264
 msgid "Binding mouse buttons"
 msgstr "Saistyti pelės mygtukus"
 
-#: src/hotkey/gui.cc:391
+#: src/hotkey/gui.cc:434
 msgid ""
 "Press a key combination inside a text field.\n"
 "You can also bind mouse buttons."
@@ -2129,97 +2243,132 @@
 "Paspauskite klavišų kombinaciją teksto lauke.\n"
 "Taip pat galima sieti ir pelės mygtukus."
 
-#: src/hotkey/gui.cc:396
+#: src/hotkey/gui.cc:444 src/qthotkey/gui.cc:179
 msgid "Hotkeys:"
 msgstr "Spartieji klavišai:"
 
-#: src/hotkey/gui.cc:413
+#: src/hotkey/gui.cc:457 src/qthotkey/gui.cc:181
 msgid "Action:"
 msgstr "Veiksmas:"
 
-#: src/hotkey/gui.cc:420
+#: src/hotkey/gui.cc:461 src/qthotkey/gui.cc:182
 msgid "Key Binding:"
 msgstr "Klavišo susiejimas:"
 
-#: src/hotkey/gui.cc:468
+#: src/hotkey/gui.cc:518 src/qthotkey/gui.cc:184
 msgid "_Add"
 msgstr "_Pridėti"
 
-#: src/hotkey/plugin.cc:61
+#: src/hotkey/plugin.cc:59 src/qthotkey/plugin.cc:78
 msgid "Global Hotkeys"
 msgstr "Bendri karštieji klavišai"
 
-#: src/hotkey/plugin.cc:79
+#: src/hotkey/plugin.cc:74
 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"
+"Contributors 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 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"
+"Bendrųjų sparčiųjų klavišų įskiepis\n"
+"Valdo grotuvą bendraisiais klavišų deriniais arba daugialypės terpės "
+"klavišais.\n"
+"\n"
+"Autoriaus teisės (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n"
+"\n"
+"Prisidėjusieji:\n"
+"Autoriaus teisės (C) 2006-2007 Vladimir Paskov <vlado.paskov@gmail.com>\n"
+"Autoriaus 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/jack-ng/jack-ng.cc:49
+#: src/jack/jack-ng.cc:54
 msgid "JACK Output"
 msgstr "JACK išvestis"
 
-#: src/jack-ng/jack-ng.cc:114
+#: src/jack/jack-ng.cc:126
+msgid "Client name:"
+msgstr "Kliento vardas:"
+
+#: src/jack/jack-ng.cc:128
 msgid "Automatically connect to output ports"
+msgstr "Automatiškai prisijungti prie išvesties prievadų"
+
+#: src/jack/jack-ng.cc:130
+msgid "Filter ports (regex, use any port if blank):"
+msgstr ""
+"Filtruoti prievadus (regex, naudokite bet kurį prievadą, jei jis tuščias):"
+
+#: src/jack/jack-ng.cc:136
+msgid "Connect to physical ports only"
+msgstr "Prisijungti tik prie fizinių prievadų"
+
+#: src/jack/jack-ng.cc:139
+msgid "Upmix to"
 msgstr ""
 
-#: src/jack-ng/jack-ng.cc:155
+#: src/jack/jack-ng.cc:141
+msgid "ports if input has fewer channels"
+msgstr "prievadai, jei įvestyje yra mažiau kanalų"
+
+#: src/jack/jack-ng.cc:143
+msgid "Ignore insufficient number of ports"
+msgstr "Nepaisyti nepakankamo prievadų skaičiaus"
+
+#: src/jack/jack-ng.cc:181
+msgid "No JACK output ports were found. Please check settings."
+msgstr "Nerasti JACK išvesties prievadai. Patikrinkite nustatymus."
+
+#: src/jack/jack-ng.cc:195
 #, c-format
 msgid "Only %d JACK output ports were found but %d are required."
-msgstr ""
+msgstr "Rasti tik %d JACK išvesties portai, tačiau reikalingi - %d."
 
-#: src/jack-ng/jack-ng.cc:164
+#: src/jack/jack-ng.cc:210
 #, c-format
 msgid "Failed to connect to JACK port %s."
-msgstr ""
+msgstr "Nepavyko prisijungti prie JACK prievado %s."
 
-#: src/jack-ng/jack-ng.cc:184
+#: src/jack/jack-ng.cc:230
 msgid ""
 "JACK supports only floating-point audio. You must change the output bit "
 "depth to floating-point in Audacious settings."
 msgstr ""
+"JACK palaiko tik slankiojo kablelio garsą. Audacious nustatymuose turite "
+"pakeisti išvesties bitų gylį į slankiojo kablelio."
 
-#: src/jack-ng/jack-ng.cc:197
+#: src/jack/jack-ng.cc:245
 msgid "Failed to connect to the JACK server; is it running?"
-msgstr ""
+msgstr "Nepavyko prisijungti prie JACK serverio. Ar jis veikia?"
 
-#: src/jack-ng/jack-ng.cc:273
+#: src/jack/jack-ng.cc:321
 #, c-format
 msgid ""
 "The JACK server requires a sample rate of %d Hz, but Audacious is playing at "
 "%d Hz. Please use the Sample Rate Converter effect to correct the mismatch."
 msgstr ""
+"JACK serveris reikalauja %d Hz ėminio spartos, tačiau Audacious veikia%d "
+"Hz. Norėdami ištaisyti neatitikimą, naudokite Ėminių spartos keitiklio "
+"efektą."
 
-#: src/ladspa/plugin.cc:414
+#: src/ladspa/plugin.cc:416
 #, c-format
 msgid "%s Settings"
 msgstr "%s nustatymai:"
 
-#: src/ladspa/plugin.cc:478
+#: src/ladspa/plugin.cc:482
 msgid "Module paths:"
 msgstr "Modulio kelias:"
 
-#: src/ladspa/plugin.cc:483
+#: src/ladspa/plugin.cc:487
 msgid ""
 "Separate multiple paths with a colon.\n"
 "These paths are searched in addition to LADSPA_PATH.\n"
@@ -2230,25 +2379,25 @@
 "Kai pridedami nauji keliai, paspauskite ENTER naujų įskiepių paieškai.</"
 "small>"
 
-#: src/ladspa/plugin.cc:499
+#: src/ladspa/plugin.cc:508
 msgid "Available plugins:"
 msgstr "Prieinami įskiepiai:"
 
-#: src/ladspa/plugin.cc:512 src/modplug/plugin_main.cc:92
-#: src/modplug/plugin_main.cc:95 src/modplug/plugin_main.cc:98
-#: src/modplug/plugin_main.cc:101
+#: src/ladspa/plugin.cc:521 src/modplug/plugin_main.cc:91
+#: src/modplug/plugin_main.cc:94 src/modplug/plugin_main.cc:97
+#: src/modplug/plugin_main.cc:100
 msgid "Enable"
 msgstr "Įjungti"
 
-#: src/ladspa/plugin.cc:518
+#: src/ladspa/plugin.cc:527
 msgid "Enabled plugins:"
 msgstr "Įjungti įskiepiai:"
 
-#: src/ladspa/plugin.cc:534
+#: src/ladspa/plugin.cc:543
 msgid "Settings"
 msgstr "Nustatymai"
 
-#: src/ladspa/plugin.cc:551
+#: src/ladspa/plugin.cc:560
 msgid ""
 "LADSPA Host for Audacious\n"
 "Copyright 2011 John Lindgren"
@@ -2264,7 +2413,7 @@
 msgid "LIRC Plugin"
 msgstr "LIRC įskiepis"
 
-#: src/lirc/lirc.cc:381
+#: src/lirc/lirc.cc:379
 msgid ""
 "A simple plugin to control Audacious using the LIRC remote control daemon\n"
 "\n"
@@ -2292,63 +2441,124 @@
 "\n"
 "Apie LIRC galite sužinoti tinklalapy http://lirc.org."
 
-#: src/lirc/lirc.cc:392
+#: src/lirc/lirc.cc:390
 msgid "Connection"
 msgstr "Prisijungimas"
 
-#: src/lirc/lirc.cc:393
+#: src/lirc/lirc.cc:391
 msgid "Reconnect to LIRC server"
 msgstr "Iš naujo prisijungti prie LIRC serverio"
 
-#: src/lirc/lirc.cc:395
+#: src/lirc/lirc.cc:393
 msgid "Wait before reconnecting:"
 msgstr "Prieš jungiantis iš naujo palaukti:"
 
-#: src/lyricwiki/lyricwiki.cc:41
-msgid "LyricWiki Plugin"
-msgstr "LyricWiki įskiepis"
-
-#: src/lyricwiki/lyricwiki.cc:131 src/lyricwiki-qt/lyricwiki.cc:136
-msgid "No lyrics available"
-msgstr "Nėra prieinamų dainų žodžių"
-
-#: src/lyricwiki/lyricwiki.cc:217 src/lyricwiki/lyricwiki.cc:226
-#: src/lyricwiki/lyricwiki.cc:243 src/lyricwiki/lyricwiki.cc:252
-#: src/lyricwiki/lyricwiki.cc:267 src/lyricwiki-qt/lyricwiki.cc:222
-#: src/lyricwiki-qt/lyricwiki.cc:231 src/lyricwiki-qt/lyricwiki.cc:248
-#: src/lyricwiki-qt/lyricwiki.cc:257 src/lyricwiki-qt/lyricwiki.cc:272
-msgid "Error"
-msgstr "Klaida"
-
-#: src/lyricwiki/lyricwiki.cc:218 src/lyricwiki/lyricwiki.cc:244
-#: src/lyricwiki-qt/lyricwiki.cc:223 src/lyricwiki-qt/lyricwiki.cc:249
+#: src/lyrics-common/chart_lyrics_provider.cc:93
+#: src/lyrics-common/chart_lyrics_provider.cc:150
+#: src/lyrics-common/lyrics_ovh_provider.cc:50
 #, c-format
 msgid "Unable to fetch %s"
 msgstr "Gauti %s nepavyko"
 
-#: src/lyricwiki/lyricwiki.cc:227 src/lyricwiki/lyricwiki.cc:253
-#: src/lyricwiki-qt/lyricwiki.cc:232 src/lyricwiki-qt/lyricwiki.cc:258
+#: src/lyrics-common/chart_lyrics_provider.cc:100
+#: src/lyrics-common/chart_lyrics_provider.cc:157
+#: src/lyrics-common/lyrics_ovh_provider.cc:57
 #, c-format
 msgid "Unable to parse %s"
 msgstr "Apdoroti %s nepavyko"
 
-#: src/lyricwiki/lyricwiki.cc:259 src/lyricwiki-qt/lyricwiki.cc:264
+#: src/lyrics-common/chart_lyrics_provider.cc:121
+#: src/lyrics-common/chart_lyrics_provider.cc:194
+#: src/lyrics-common/lyrics_ovh_provider.cc:88
 msgid "Looking for lyrics ..."
 msgstr "Ieškoma dainų žodžių"
 
-#: src/lyricwiki/lyricwiki.cc:267 src/lyricwiki-qt/lyricwiki.cc:272
-msgid "Missing song metadata"
-msgstr "Trūksta dainos metaduomenų"
+#: src/lyrics-common/preferences.h:43
+msgid "Nowhere"
+msgstr "Niekur"
+
+#: src/lyrics-common/preferences.h:49
+msgid "Artist is truncated at the start, Title -- at the end"
+msgstr ""
+"Atlikėjas sutrumpinamas nuo pradžios, Pavadinimas -- nuo galo"
+
+#: src/lyrics-common/preferences.h:50
+msgid "Chars to truncate on:"
+msgstr "Simboliai, pagal kuriuos sutrumpinti:"
+
+#: src/lyrics-common/preferences.h:54
+msgid "Chars are ORed in RegExp, surrounded by whitespace"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:55
+msgid "Chars to split on:"
+msgstr "Simboliai, pagal kuriuos padalinti:"
 
-#: src/lyricwiki/lyricwiki.cc:278 src/lyricwiki-qt/lyricwiki.cc:283
-msgid "Connecting to lyrics.wikia.com ..."
-msgstr "Jungiamasi prie lyrics.wikia.com ..."
+#: src/lyrics-common/preferences.h:56
+msgid "Further truncate those on chars"
+msgstr "Toliau sutrumpinkite pagal šiuos simbolius"
+
+#: src/lyrics-common/preferences.h:62
+msgid "General"
+msgstr "Bendri"
+
+#: src/lyrics-common/preferences.h:63
+msgid "Split title into artist and title on chars"
+msgstr "Padalinkite pavadinimą į atlikėją ir pavadinimą pagal simbolius"
+
+#: src/lyrics-common/preferences.h:66
+msgid "Sources"
+msgstr ""
 
-#: src/lyricwiki-qt/lyricwiki.cc:55
-msgid "LyricWiki Plugin (Qt)"
+#: src/lyrics-common/preferences.h:67
+msgid "Use embedded lyrics (from Lyrics tag)"
 msgstr ""
 
-#: src/m3u/m3u.cc:32
+#: src/lyrics-common/preferences.h:69
+msgid "Fetch lyrics from internet:"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:72
+msgid "Store fetched lyrics in local cache"
+msgstr "Išsaugokite gautus dainų tekstus vietinėje talpykloje"
+
+#: src/lyrics-common/preferences.h:74
+msgid "Local Storage"
+msgstr "Vietinė saugykla"
+
+#: src/lyrics-common/preferences.h:75
+msgid "Load lyric files (.lrc) from local storage"
+msgstr "Įkelti dainų tekstus (.lrc) iš vietinės saugyklos"
+
+#: src/lyrics-common/utils.cc:54 src/ui-common/dialogs-qt.cc:63
+msgid "Error"
+msgstr "Klaida"
+
+#: src/lyrics-common/utils.cc:60
+msgid "Lyrics could not be found."
+msgstr "Žodžiai nerasti."
+
+#: src/lyrics-common/utils.cc:142
+msgid "Missing title and/or artist."
+msgstr "Trūksta pavadinimo arba atlikėjo."
+
+#: src/lyrics-gtk/lyrics-gtk.cc:37 src/lyrics-qt/lyrics-qt.cc:50
+msgid "Lyrics"
+msgstr "Žodžiai"
+
+#: src/lyrics-gtk/lyrics-gtk.cc:189 src/lyrics-qt/lyrics-qt.cc:171
+msgid "Edit Lyrics ..."
+msgstr ""
+
+#: src/lyrics-gtk/lyrics-gtk.cc:195 src/lyrics-qt/lyrics-qt.cc:178
+msgid "Save Locally"
+msgstr "Išsaugoti vietiškai"
+
+#: src/lyrics-gtk/lyrics-gtk.cc:201 src/lyrics-qt/lyrics-qt.cc:186
+msgid "Refresh"
+msgstr "Atnaujinti"
+
+#: src/m3u/m3u.cc:33
 msgid "M3U Playlists"
 msgstr "M3U grojaraščiai"
 
@@ -2356,17 +2566,17 @@
 msgid "Tact Generator"
 msgstr "Takto generatorius"
 
-#: src/metronom/metronom.cc:147
+#: src/metronom/metronom.cc:145
 #, c-format
 msgid "Tact generator: %d bpm"
 msgstr "Takto generatorius: %d bpm"
 
-#: src/metronom/metronom.cc:149
+#: src/metronom/metronom.cc:147
 #, c-format
 msgid "Tact generator: %d bpm %d/%d"
 msgstr "Takto generatorius: %d bpm %d/%d"
 
-#: src/metronom/metronom.cc:237
+#: src/metronom/metronom.cc:235
 msgid ""
 "A Tact Generator by Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
 "\n"
@@ -2379,11 +2589,11 @@
 "pvz. tact://77 norint atkurt 77 dūžius per minutę\n"
 "ar tact://60*3/4 norint atkurti 60 bpm 3/4 taktu"
 
-#: src/mixer/mixer.cc:38
+#: src/mixer/mixer.cc:43
 msgid "Channel Mixer"
 msgstr "Kanalų mikšeris"
 
-#: src/mixer/mixer.cc:202
+#: src/mixer/mixer.cc:255
 msgid ""
 "Channel Mixer Plugin for Audacious\n"
 "Copyright 2011-2012 John Lindgren and Michał Lipski"
@@ -2391,11 +2601,11 @@
 "Channel Mixer įskiepis skirtas Audacious\n"
 "Autorinės teisės 2011-2012 John Lindgren ir Michał Lipski"
 
-#: src/mixer/mixer.cc:206
+#: src/mixer/mixer.cc:259
 msgid "Channel Mixer"
 msgstr "Kanalų mikšeris"
 
-#: src/mixer/mixer.cc:207
+#: src/mixer/mixer.cc:260
 msgid "Output channels:"
 msgstr "Išvesties kanalai:"
 
@@ -2405,170 +2615,178 @@
 
 #: src/mms/mms.cc:82
 msgid "Error connecting to MMS server"
-msgstr ""
+msgstr "Klaida jungiantis prie MMS serverio"
 
-#: src/modplug/modplugbmp.h:53
+#: src/modplug/modplugbmp.h:57
 msgid "ModPlug (Module Player)"
 msgstr "ModPlug (Module grotuvas)"
 
-#: src/modplug/plugin_main.cc:53
-msgid "Resolution"
-msgstr "Raiška"
-
-#: src/modplug/plugin_main.cc:54
-msgid "8-bit"
-msgstr "8-bitai"
-
 #: src/modplug/plugin_main.cc:55
-msgid "16-bit"
-msgstr "16-bitų"
-
-#: src/modplug/plugin_main.cc:56
 msgid "Channels"
 msgstr "Kanalai"
 
-#: src/modplug/plugin_main.cc:60
+#: src/modplug/plugin_main.cc:59
 msgid "Nearest (fastest)"
 msgstr "Arčiausias (greičiausia)"
 
-#: src/modplug/plugin_main.cc:61
+#: src/modplug/plugin_main.cc:60
 msgid "Linear (fast)"
-msgstr "Linijinis (greitas)"
+msgstr "Tiesinis (greitas)"
 
-#: src/modplug/plugin_main.cc:62
+#: src/modplug/plugin_main.cc:61
 msgid "Spline (good)"
 msgstr "Spline (gerai)"
 
-#: src/modplug/plugin_main.cc:63
+#: src/modplug/plugin_main.cc:62
 msgid "Polyphase (best)"
 msgstr "Polifazinis (geriausiai)"
 
-#: src/modplug/plugin_main.cc:64
+#: src/modplug/plugin_main.cc:63
 msgid "Sample rate"
-msgstr ""
+msgstr "Ėminio sparta"
 
-#: src/modplug/plugin_main.cc:65
+#: src/modplug/plugin_main.cc:64
 msgid "22 kHz"
 msgstr "22 kHz"
 
-#: src/modplug/plugin_main.cc:66
+#: src/modplug/plugin_main.cc:65
 msgid "44 kHz"
 msgstr "44 kHz"
 
-#: src/modplug/plugin_main.cc:67
+#: src/modplug/plugin_main.cc:66
 msgid "48 kHz"
 msgstr "48 kHz"
 
-#: src/modplug/plugin_main.cc:68
+#: src/modplug/plugin_main.cc:67
 msgid "96 kHz"
 msgstr "96 kHz"
 
-#: src/modplug/plugin_main.cc:72 src/modplug/plugin_main.cc:77
-#: src/modplug/plugin_main.cc:82
+#: src/modplug/plugin_main.cc:71 src/modplug/plugin_main.cc:76
+#: src/modplug/plugin_main.cc:81
 msgid "Level:"
 msgstr "Lygis:"
 
-#: src/modplug/plugin_main.cc:78
+#: src/modplug/plugin_main.cc:77
 msgid "Cutoff:"
 msgstr "Nukirpimas:"
 
-#: src/modplug/plugin_main.cc:91
+#: src/modplug/plugin_main.cc:90
 msgid "Reverb"
-msgstr "Reverb"
+msgstr "Aidas"
 
-#: src/modplug/plugin_main.cc:94
+#: src/modplug/plugin_main.cc:93
 msgid "Bass Boost"
-msgstr "Boso garsinimas"
+msgstr "Žemų stiprinimas"
 
-#: src/modplug/plugin_main.cc:97
+#: src/modplug/plugin_main.cc:96
 msgid "Surround"
 msgstr "Erdvinis"
 
-#: src/modplug/plugin_main.cc:100
+#: src/modplug/plugin_main.cc:99
 msgid "Preamp"
 msgstr "Stiprinimas"
 
-#: src/modplug/plugin_main.cc:107
+#: src/modplug/plugin_main.cc:106
 msgid "Oversample"
 msgstr "Oversample"
 
-#: src/modplug/plugin_main.cc:108
+#: src/modplug/plugin_main.cc:107
 msgid "Noise reduction"
 msgstr "Triukšmo mažinimas"
 
-#: src/modplug/plugin_main.cc:109
+#: src/modplug/plugin_main.cc:108
 msgid "Play Amiga MODs"
 msgstr "Groti Amiga MOD"
 
-#: src/modplug/plugin_main.cc:110
+#: src/modplug/plugin_main.cc:109
 msgid "Repeat"
 msgstr "Kartoti"
 
-#: src/modplug/plugin_main.cc:111
+#: src/modplug/plugin_main.cc:110
 msgid "Repeat count:"
 msgstr "Kartojimų skaičius:"
 
-#: src/modplug/plugin_main.cc:112
+#: src/modplug/plugin_main.cc:111
 msgid "To repeat forever, set the repeat count to -1."
 msgstr "Norėdami kartoti amžinai, nustatykite „-1“."
 
-#: src/modplug/plugin_main.cc:125 src/sid/xs_config.cc:106
+#: src/modplug/plugin_main.cc:124 src/sid/xs_config.cc:106
 msgid "These settings will take effect when Audacious is restarted."
+msgstr "Šie nustatymai įsigalios, kai Audacious bus paleistas iš naujo."
+
+#: src/moonstone/main_window.cc:72 src/moonstone/main_window.cc:73
+#: src/qtui/main_window.cc:159 src/qtui/main_window.cc:160
+#: src/skins/menus.cc:107 src/skins-qt/menus.cc:98
+msgid "Stop After This Song"
+msgstr "Sustabdyti po šios dainos"
+
+#: src/moonstone/moonstone.cc:39
+msgid "Moonstone"
 msgstr ""
 
+#: src/moonstone/playlist_header.cc:212 src/qtui/playlist_header.cc:258
+msgid "Reset to Defaults"
+msgstr "Atstatyti numatytuosius"
+
+#: src/moonstone/playlist_model.cc:38 src/qtui/playlist_header.cc:232
+msgid "Now Playing"
+msgstr "Dabar grojama"
+
+#: src/moonstone/playlist_selection.cc:66
+#: src/playlist-manager/playlist-manager.cc:201
+#: src/playlist-manager-qt/playlist-manager-qt.cc:190
+msgid "Entries"
+msgstr "Elementai"
+
 #: src/mpg123/mpg123.cc:54
 msgid "MPG123 Plugin"
 msgstr "MPG123 įskiepis"
 
-#: src/mpg123/mpg123.cc:83
-msgid "Advanced"
-msgstr "Sudėtingesni"
-
-#: src/mpg123/mpg123.cc:84
+#: src/mpg123/mpg123.cc:82
 msgid "Use accurate length calculation (slow)"
-msgstr ""
+msgstr "Naudoti tikslų trukmės skaičiavimą (lėtas)"
 
-#: src/mpg123/mpg123.cc:248
+#: src/mpg123/mpg123.cc:260
 msgid "Surround"
 msgstr "Erdvinis garsas"
 
-#: src/mpris2/plugin.cc:39
+#: src/mpris2/plugin.cc:40
 msgid "MPRIS 2 Server"
-msgstr "MPRIS 2 Serveris"
+msgstr "MPRIS 2 serveris"
 
-#: src/neon/neon.cc:97
+#: src/neon/neon.cc:102
 msgid "Neon HTTP/HTTPS Plugin"
 msgstr "Neon HTTP/HTTPS įskiepis"
 
-#: src/neon/neon.cc:521
+#: src/neon/neon.cc:526
 msgid "Error parsing redirect"
-msgstr ""
+msgstr "Klaida analizuojant nukreipimą"
 
-#: src/neon/neon.cc:535
+#: src/neon/neon.cc:540
 msgid "Unknown HTTP error"
-msgstr ""
+msgstr "Nežinoma HTTP klaida"
 
-#: src/neon/neon.cc:569
+#: src/neon/neon.cc:614
 msgid "Error parsing URL"
-msgstr ""
+msgstr "Klaida analizuojant URL"
 
-#: src/neon/neon.cc:632
+#: src/neon/neon.cc:687
 msgid "Too many redirects"
-msgstr ""
+msgstr "Per daug nukreipimų"
 
-#: src/notify/event.cc:64
+#: src/notify/event.cc:97
 msgid "Stopped"
 msgstr "Sustabdyta"
 
-#: src/notify/event.cc:64
+#: src/notify/event.cc:97
 msgid "Audacious is not playing."
 msgstr "Audacious negroja."
 
-#: src/notify/notify.cc:42
+#: src/notify/notify.cc:39
 msgid "Desktop Notifications"
 msgstr "Darbastalio pranešimai"
 
-#: src/notify/notify.cc:60
+#: src/notify/notify.cc:57
 msgid ""
 "Desktop Notifications Plugin for Audacious\n"
 "Copyright (C) 2010 Maximilian Bogner\n"
@@ -2587,81 +2805,125 @@
 "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"
+"Audacious darbalaukio pranešimų įskiepis\n"
+"Autorių teisės (C) 2010 Maximilian Bogner\n"
+"Autorių teisės (C) 2011–2013 John Lindgren ir Jean-Alexandre Anglès "
+"d'Auriac\n"
+"\n"
+"Šis įskiepis yra nemokama programinė įranga: ją galite platinti ir (arba) "
+"keisti pagal GNU bendrosios viešosios licencijos sąlygas, paskelbtas "
+"Laisvosios programinės įrangos fondo (angl. Free Software Foundation), arba "
+"3 licencijos versiją, arba (jūsų pasirinkimu) bet kurią vėlesnę versiją.\n"
+"\n"
+"Šis įskiepis platinamas tikintis, kad jis bus naudingas, bet BE JOKIOS "
+"GARANTIJOS; net be numanomos TINKAMUMO PARDUOTI ar TINKAMUMO KONKREČIAM "
+"TIKSLUI garantijos. Daugiau informacijos rasite GNU bendrojoje viešojoje "
+"licencijoje.\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/>."
+"Kartu su šia programa turėjote gauti GNU bendrosios viešosios licencijos "
+"kopiją. Jei ne, žr. <http://www.gnu.org/licenses/>."
 
-#: src/notify/notify.cc:110
+#: src/notify/notify.cc:104
 msgid "Show playback controls"
 msgstr "Rodyti atkūrimo valdymą"
 
-#: src/notify/notify.cc:112
+#: src/notify/notify.cc:106
 msgid "Always show notification"
 msgstr "Visada rodyti pranešimą"
 
-#: src/notify/notify.cc:114
+#: src/notify/notify.cc:108
 msgid "Include album name in notification"
-msgstr ""
+msgstr "Įterpti albumo pavadinimą pranešime"
+
+#: src/notify/notify.cc:110
+msgid "Custom notification duration:"
+msgstr "Priskirto pranešimo trukmė:"
 
-#: src/notify/osd.cc:58
+#: src/notify/osd.cc:74
 msgid "Show"
 msgstr "Rodyti"
 
-#: src/notify/osd.cc:66 src/qtui/main_window.cc:178
-#: src/qtui/main_window.cc:179 src/skins/menus.cc:88
-msgid "Pause"
-msgstr "Pauzė"
+#: src/openmpt/mpt.cc:50
+msgid "OpenMPT (Module Player)"
+msgstr "OpenMPT (modulinis grotuvas)"
 
-#: src/notify/osd.cc:73 src/qtui/main_window.cc:72 src/skins/menus.cc:91
-msgid "Next"
-msgstr "Sekantis"
+#: src/openmpt/mpt.cc:132
+msgid ""
+"Module player based on libopenmpt\n"
+"\n"
+"Written by: Chris Spiegel <cspiegel@gmail.com>"
+msgstr ""
+"Modulinis grotuvas sukurtas pagal libopenmpt\n"
+"\n"
+"Suprogramavo: Chris Spiegel <cspiegel@gmail.com>"
+
+#: src/openmpt/mpt.cc:151
+msgid "Stereo separation:"
+msgstr "Stereo atskyrimas:"
+
+#: src/openmpt/mpt.cc:153
+msgid "% (0=mono, 100=default, 200=full)"
+msgstr ""
+
+#: src/openmpt/mpt.cc:157
+msgid "Interpolation:"
+msgstr "Interpoliavimas:"
 
-#: src/oss4/oss.h:93
+#: src/openmpt/mptwrap.h:51 src/soxr/sox-resampler.cc:189 src/xsf/plugin.cc:437
+msgid "Linear"
+msgstr "Tiesinis"
+
+#: src/openmpt/mptwrap.h:52
+msgid "Cubic"
+msgstr "Kubinis"
+
+#: src/openmpt/mptwrap.h:53
+msgid "Windowed sinc"
+msgstr "Langų sinchronizacija"
+
+#: src/opus/opus.cc:39
+msgid "Opus Decoder"
+msgstr ""
+
+#: src/opus/opus.cc:336
+msgid ""
+"Opus Decoder Plugin for Audacious\n"
+"Copyright 2022 Thomas Lange"
+msgstr ""
+
+#: src/oss4/oss.h:70
 msgid "OSS4 Output"
 msgstr "OSS4 išvestis"
 
-#: src/oss4/oss.h:95
+#: src/oss4/oss.h:72
 msgid "OSS3 Output"
-msgstr ""
+msgstr "OSS3 išvestis"
 
 #: src/oss4/plugin.cc:35
 msgid "Default device"
-msgstr ""
+msgstr "Numatytasis įrenginys"
 
-#: src/oss4/plugin.cc:77
+#: src/oss4/plugin.cc:78
 msgid "Audio device:"
 msgstr "Audio įrenginys:"
 
-#: src/oss4/plugin.cc:80
+#: src/oss4/plugin.cc:81
 msgid "Use alternate device:"
 msgstr "Naudoti alternatyvų įrenginį:"
 
-#: src/oss4/plugin.cc:84
+#: src/oss4/plugin.cc:85
 msgid "Save volume between sessions."
 msgstr "Išsaugoti garsą tarp sesijų"
 
-#: src/oss4/plugin.cc:86
+#: src/oss4/plugin.cc:87
 msgid "Enable format conversions made by the OSS software."
 msgstr "Įgalinti formato keitimą kurį padarė OSS programinė įranga."
 
-#: src/oss4/plugin.cc:88
+#: src/oss4/plugin.cc:89
 msgid "Enable exclusive mode to prevent virtual mixing."
 msgstr "Įgalinti išskirtinį režimą, siekiant išvengti virtualaus maišymosi."
 
-#: src/oss4/plugin.cc:100
+#: src/oss4/plugin.cc:101
 msgid ""
 "OSS4 Output Plugin for Audacious\n"
 "Copyright 2010-2012 Michał Lipski\n"
@@ -2669,81 +2931,112 @@
 "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"
+"Audacious OSS4 išvesties įskiepis \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/playlist-manager/playlist-manager.cc:37
-msgid "Playlist Manager"
+#: src/pipewire/pipewire.cc:44
+msgid "PipeWire Output"
 msgstr ""
 
-#: src/playlist-manager/playlist-manager.cc:226
-msgid "Entries"
+#: src/pipewire/pipewire.cc:118
+msgid ""
+"PipeWire Output Plugin for Audacious\n"
+"Copyright 2022 Thomas Lange\n"
+"\n"
+"Based on the PipeWire Output Plugin for Qmmp\n"
+"Copyright 2021 Ilya Kotov"
 msgstr ""
 
-#: src/playlist-manager/playlist-manager.cc:245
+#: src/pipewire/pipewire.cc:408 src/skins/menus.cc:88 src/skins-qt/menus.cc:79
+msgid "Playback"
+msgstr "Atkūrimas"
+
+#: src/playlist-manager/playlist-manager.cc:38
+#: src/playlist-manager-qt/playlist-manager-qt.cc:42
+msgid "Playlist Manager"
+msgstr "Grojaraščio redaktorius"
+
+#: src/playlist-manager/playlist-manager.cc:221
+#: src/playlist-manager-qt/playlist-manager-qt.cc:356
 msgid "_Remove"
-msgstr ""
+msgstr "_Pašalinti"
 
-#: src/playlist-manager/playlist-manager.cc:246
+#: src/playlist-manager/playlist-manager.cc:222
+#: src/playlist-manager-qt/playlist-manager-qt.cc:351
 msgid "Ren_ame"
-msgstr ""
+msgstr "_Pervadinti"
 
 #: src/pls/pls.cc:35
 msgid "PLS Playlists"
 msgstr "PLS grojaraščiai"
 
-#: src/psf/plugin.cc:45
+#: src/psf/plugin.cc:53
 msgid "OpenPSF PSF1/PSF2 Decoder"
-msgstr "OpenPSF PSF1/PSF2 dekoderis"
+msgstr "OpenPSF PSF1/PSF2 iškoduotuvas"
+
+#: src/psf/plugin.cc:270
+msgid "OpenPSF Configuration"
+msgstr "OpenPSF nustatymai"
+
+#: src/psf/plugin.cc:271 src/xsf/plugin.cc:444
+msgid "Ignore length from file"
+msgstr "Nepaisyti rinkmenos trukmės"
 
-#: src/pulse_audio/pulse_audio.cc:38
+#: src/pulse/pulse_audio.cc:42
 msgid "PulseAudio Output"
 msgstr "PulseAudio išvestis"
 
-#: src/pulse_audio/pulse_audio.cc:611
+#: src/pulse/pulse_audio.cc:84
+msgid "Context name:"
+msgstr "Konteksto pavadinimas:"
+
+#: src/pulse/pulse_audio.cc:86
+msgid "Stream name:"
+msgstr "Srauto pavadinimas:"
+
+#: src/pulse/pulse_audio.cc:596
 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."
+"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 ""
-"Audacious PulseAudio Output Plugin\n"
+"Audacious PulseAudio išvesties įskiepis\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."
+"Ši programa yra nemokama programinė įranga; galite ją platinti ir (arba) "
+"keisti pagal GNU bendrosios viešosios licencijos sąlygas, paskelbtas "
+"Laisvosios programinės įrangos fondo (angl. Free Software "
+"Foundation); 2 licencijos versija arba (jūsų pasirinkimu) bet kuri "
+"vėlesnė versija.\n"
+"\n"
+"Ši programa platinama tikintis, kad ji bus naudinga, bet BE JOKIOS "
+"GARANTIJOS; net be numanomos TINKAMUMO PARDUOTI ar TINKAMUMO KONKREČIAM "
+"TIKSLUI garantijos. Daugiau informacijos rasite GNU bendrojoje viešojoje "
+"licencijoje.\n"
+"\n"
+"Kartu su šia programa turėjote gauti GNU bendrosios viešosios licencijos "
+"kopiją; jei ne, rašykite Free Software Foundation, Inc., 51 Franklin Street, "
+"Fifth Floor, Boston, MA 02110-1301, USA."
 
-#: src/qtaudio/qtaudio.cc:49
+#: src/qtaudio/qtaudio.cc:53
 msgid "QtMultimedia Output"
-msgstr ""
+msgstr "QtMultimedia išvestis"
 
-#: src/qtaudio/qtaudio.cc:77
+#: src/qtaudio/qtaudio.cc:84
 msgid ""
 "QtMultimedia Audio Output Plugin for Audacious\n"
 "Copyright 2014 William Pitcock\n"
@@ -2751,70 +3044,134 @@
 "Based on SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
 msgstr ""
+"Audacious QtMultimedia garso išvesties įskiepis\n"
+"Autoriaus teisės 2014 William Pitcock\n"
+"\n"
+"Sukurtas pagal Audacious SDL išvesties įskiepį\n"
+"Autoriaus teisės 2010 John Lindgren"
 
-#: src/qtui/dialog_windows.cc:31
-msgid "Working ..."
+#: src/qtglspectrum/gl-spectrum.cc:41
+msgid ""
+"OpenGL Spectrum Analyzer for Audacious\n"
+"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
+"Copyright 2014, 2020 Ariadne Conill\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 spektro analizatorius\n"
+"Autorių teisės 2013 Christophe Budé, John Lindgren, ir Carlo Bramini\n"
+"Autoriaus teisės 2014, 2020 Ariadne Conill\n"
+"\n"
+"Remiantis XMMS įskiepiu:\n"
+"Autorių teisės 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas "
+"Nilsson, ir 4Front Technologies\n"
+"\n"
+"Licencija: GPLv2+"
 
-#: src/qtui/filter_input.cc:44 src/skins/ui_playlist.cc:221
-msgid "Search"
-msgstr "Ieškoti"
+#: src/qthotkey/gui.cc:177
+msgid "Press a key combination inside a text field."
+msgstr "Paspauskite klavišų kombinaciją teksto lauke."
 
-#: src/qtui/main_window_actions.cc:94
-msgid "_Open Folder ..."
+#: src/qthotkey/plugin.cc:105
+msgid ""
+"Global Hotkey Plugin\n"
+"Control the player with global key combinations or multimedia keys.\n"
+"\n"
+"Copyright (C) 2020 i.Dark_Templar <darktemplar@dark-templar-archives.net>\n"
+"Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n"
+"\n"
+"Contributors 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 ""
+"Bendrųjų sparčiųjų klavišų įskiepis\n"
+"Valdo grotuvą bendrųjų klavišų deriniais arba daugialypės terpės klavišais.\n"
+"\n"
+"Autoriaus teisės (C) 2020 i.Dark_Templar <darktemplar@dark-templar-archives."
+"net>\n"
+"Autoriaus teisės (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n"
+"\n"
+"Prisidėjusieji:\n"
+"Autoriaus teisės (C) 2006-2007 Vladimir Paskov <vlado.paskov@gmail.com>\n"
+"Autoriaus 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/qtui/menus.cc:109
+msgid "_Open Folder ..."
+msgstr "_Atverti aplanką..."
 
-#: src/qtui/main_window_actions.cc:96
+#: src/qtui/menus.cc:115
 msgid "_Add Folder ..."
-msgstr ""
+msgstr "_Pridėti aplanką..."
 
-#: src/qtui/main_window_actions.cc:101
+#: src/qtui/menus.cc:128
 msgid "_Log Inspector ..."
-msgstr ""
+msgstr "Žurnalo _inspektavimas"
 
-#: src/qtui/main_window.cc:64
-msgid "Open Files"
-msgstr ""
+#: src/qtui/menus.cc:220
+msgid "_Find ..."
+msgstr "_Rasti..."
 
-#: src/qtui/main_window.cc:66
-msgid "Add Files"
-msgstr ""
+#: src/qtui/menus.cc:256 src/skins/menus.cc:80 src/skins-qt/menus.cc:70
+msgid "Audio Settings ..."
+msgstr "Garso nustatymai..."
 
-#: src/qtui/main_window.cc:71 src/skins/menus.cc:90
-msgid "Previous"
-msgstr "Ankstesnis"
+#: src/qtui/playlist_model.cc:188
+msgid "Q#"
+msgstr "Q#"
 
-#: src/qtui/main_window.cc:77 src/skins/menus.cc:82
-msgid "Repeat"
-msgstr "Kartoti"
+#: src/qtui/playlist_model.cc:190
+msgid "T#"
+msgstr "T#"
 
-#: src/qtui/main_window.cc:79 src/skins/menus.cc:83
-msgid "Shuffle"
-msgstr "Maišyti"
+#: src/qtui/playlist_model.cc:192
+msgid "C#"
+msgstr ""
 
-#: src/qtui/qtui.cc:42
-msgid "Qt Interface"
+#: src/qtui/playlist_model.cc:194
+msgid "D#"
 msgstr ""
 
+#: src/qtui/qtui.cc:40
+msgid "Qt Interface"
+msgstr "Qt sąsaja"
+
+#: src/qtui/search_bar.cc:46
+msgid "Search playlist"
+msgstr "Ieškoti grojaraščio"
+
+#: src/qtui/settings.cc:79
+msgid "Use bold font for column headers"
+msgstr "Naudoti paryškintą šriftą stulpelių antraštėse"
+
 #: src/resample/resample.cc:43
 msgid "Sample Rate Converter"
-msgstr "Diskretizavimo dažnio keitėjas"
+msgstr "Ėminių dažnio keitiklis"
 
 #: src/resample/resample.cc:183
 msgid ""
 "Sample Rate Converter Plugin for Audacious\n"
 "Copyright 2010-2012 John Lindgren"
 msgstr ""
-"Sample Rate Converter Plugin for Audacious\n"
+"Audacious ėminių spartos keitiklio įskiepis \n"
 "Autorinės teisės 2010-2012 John Lindgren"
 
 #: src/resample/resample.cc:187
 msgid "Skip/repeat samples"
-msgstr "Praleisti/kartoti pavyzdžius"
+msgstr "Praleisti / kartoti ėminius"
 
 #: src/resample/resample.cc:188
 msgid "Linear interpolation"
-msgstr "Linijinė interpoliacija"
+msgstr "Tiesinė interpoliacija"
 
 #: src/resample/resample.cc:189
 msgid "Fast sinc interpolation"
@@ -2836,7 +3193,7 @@
 msgid "Method:"
 msgstr "Metodas:"
 
-#: src/resample/resample.cc:199 src/sox-resampler/sox-resampler.cc:161
+#: src/resample/resample.cc:199 src/soxr/sox-resampler.cc:203
 msgid "Rate:"
 msgstr "Dažnis:"
 
@@ -2888,161 +3245,120 @@
 msgid "192 kHz:"
 msgstr "192 kHz:"
 
-#: src/scrobbler2/config_window.cc:41
-#, c-format
-msgid "OK. Scrobbling for user: %s"
-msgstr "Gerai. Ieškoma informacijos naudotojui: %s"
-
-#: src/scrobbler2/config_window.cc:54
-msgid "Permission Denied"
-msgstr "Neleidžiama"
+#: src/scrobbler2/config_window.cc:29
+msgid "Checking Last.fm access ..."
+msgstr "Tikrinama Last.fm prieiga..."
 
-#: src/scrobbler2/config_window.cc:56
-msgid "Access the following link to allow Audacious to scrobble your plays:"
+#: src/scrobbler2/config_window.cc:35
+msgid ""
+"Your scrobbles are being saved on your computer temporarily. They will be "
+"submitted as soon as Audacious is allowed access."
 msgstr ""
-"Nueikite šia nuoroda ir leiskite Audacious gauti informaciją apie dainas:"
+"Jūsų scrobbles laikinai išsaugomi jūsų kompiuteryje. Jie bus pateikti, kai "
+"tik Audacious bus suteikta prieiga."
 
-#: src/scrobbler2/config_window.cc:66
-msgid "Keep this window open and click 'Check Permission' again.\n"
-msgstr ""
-"Palikite šį langą atvertą ir paspauskite „Tikrinti leidimus“ dar kartą.\n"
+#: src/scrobbler2/config_window.cc:41
+#, c-format
+msgid "Permission granted. Scrobbling for user %s."
+msgstr "Leidimas suteiktas. Scrobbling vartotojui%s."
 
-#: src/scrobbler2/config_window.cc:69 src/scrobbler2/config_window.cc:80
+#: src/scrobbler2/config_window.cc:44
 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."
+"Permission denied. Open the following URL in a browser, allow Audacious "
+"access to your account, and then click 'Check Permission' again:"
 msgstr ""
-"Nesijaudinkite. Jūsų informacija saugoma kompiuteryje.\n"
-"Ji bus išsiųsta kai tik Audacious leis tai padaryti."
-
-#: src/scrobbler2/config_window.cc:77
-msgid "Network Problem."
-msgstr "Tinklo problema."
+"Leidimas nesuteiktas. Naršyklėje atidarykite šį URL, leiskite Audacious "
+"pasiekti savo paskyrą, tada dar kartą paspauskite „Tikrinti leidimą“:"
 
-#: src/scrobbler2/config_window.cc:78
-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.cc:53
+msgid "There was a problem contacting Last.fm."
+msgstr "Atsirado problema susisiekiant su Last.fm."
 
-#: src/scrobbler2/config_window.cc:110
-msgid "Checking..."
-msgstr "Tikrinama..."
+#: src/scrobbler2/config_window.cc:92
+msgid "Check Permission"
+msgstr "Patikrinti leidimą"
 
-#: src/scrobbler2/config_window.cc:176
-msgid "C_heck Permission"
-msgstr "_Tikrinti leidimus"
+#: src/scrobbler2/config_window.cc:93
+msgid "Revoke Permission"
+msgstr "Atšaukti leidimą"
 
-#: src/scrobbler2/config_window.cc:177
-msgid "_Revoke Permission"
-msgstr "_Atšaukti leidimą"
-
-#: src/scrobbler2/config_window.cc:220
-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/scrobbler2/config_window.cc:97
+msgid "You need to allow Audacious to scrobble tracks to your Last.fm account."
+msgstr "Turite leisti Audacious įkelti takelius į jūsų Last.fm paskyrą."
 
 #: src/scrobbler2/scrobbler.cc:29
 msgid "Scrobbler 2.0"
 msgstr "Scrobbler 2.0"
 
-#: src/scrobbler2/scrobbler.cc:224
+#: src/scrobbler2/scrobbler.cc:200
 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."
+"Gali būti, kad yra problemų su jūsų įdiegimu."
 
-#: src/scrobbler2/scrobbler.cc:289
+#: src/scrobbler2/scrobbler.cc:245
 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"
+"project."
 msgstr ""
-"Audacious Scrobbler įskiepis 2.0 autorius Pitxyoki,\n"
-"\n"
-"Copyright © 2012-2013 Luís M. Picciochi Oliveira <Pitxyoki@Gmail.com>\n"
-"\n"
-"Dėkojame John Lindgren už pagalbą.\n"
-"\n"
-
-#: src/scrobbler2/scrobbler_communication.cc:642
-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/sdlout.cc:48
+#: src/sdlout/sdlout.cc:43
 msgid "SDL Output"
 msgstr "SDL išvestis"
 
-#: src/sdlout/sdlout.cc:77
+#: src/sdlout/sdlout.cc:72
 msgid ""
 "SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
 msgstr ""
-"SDL Output Plugin skirtas Audacious\n"
+"Audacious SDL išvesties įskiepis \n"
 "Autorinės teisės 2010 John Lindgren"
 
-#: src/search-tool/search-tool.cc:116 src/search-tool/search-tool.cc:124
+#: src/search-tool/library.cc:35 src/search-tool/library.cc:46
+#: src/search-tool-qt/library.cc:35 src/search-tool-qt/library.cc:46
 msgid "Library"
 msgstr "Fonoteka"
 
-#: src/search-tool/search-tool.cc:394
-#, c-format
-msgid "%d result"
-msgid_plural "%d results"
-msgstr0 ""
-msgstr1 ""
-msgstr2 ""
-
-#: src/search-tool/search-tool.cc:400
-#, c-format
-msgid "(%d hidden)"
-msgid_plural "(%d hidden)"
-msgstr0 ""
-msgstr1 ""
-msgstr2 ""
-
-#: src/search-tool/search-tool.cc:594
+#: src/search-tool-qt/search-model.cc:44 src/search-tool/search-tool.cc:287
 #, c-format
 msgid "%d song"
 msgid_plural "%d songs"
-msgstr0 ""
-msgstr1 ""
-msgstr2 ""
+msgstr0 "%d daina"
+msgstr1 "%d dainos"
+msgstr2 "%d dainų"
+msgstr3 "%d dainų"
 
-#: src/search-tool/search-tool.cc:601
+#: src/search-tool-qt/search-model.cc:53 src/search-tool/search-tool.cc:294
 msgid "of this genre"
-msgstr ""
+msgstr "pagal šį žanrą"
 
-#: src/search-tool/search-tool.cc:607
+#: src/search-tool-qt/search-model.h:47 src/search-tool/search-model.h:45
 msgid "on"
 msgstr ""
 
-#: src/search-tool/search-tool.cc:607
+#: src/search-tool-qt/search-model.h:47 src/search-tool/search-model.h:45
 msgid "by"
-msgstr ""
+msgstr "pagal"
 
-#: src/search-tool/search-tool.cc:643
-msgid "_Create Playlist"
-msgstr "_Sukurti grojaraštį"
+#: src/search-tool-qt/search-tool-qt.cc:165 src/search-tool/search-tool.cc:74
+msgid "Number of results to show:"
+msgstr "Rezultatų skaičius:"
 
-#: src/search-tool/search-tool.cc:645
-msgid "_Add to Playlist"
-msgstr "_Pridėti į grojaraštį"
+#: src/search-tool-qt/search-tool-qt.cc:168 src/search-tool/search-tool.cc:77
+msgid "Rescan library at startup"
+msgstr "Nuskaityti biblioteką paleidimo metu"
 
-#: src/search-tool/search-tool.cc:684
-msgid "Search library"
-msgstr "Ieškoti fonotekoje"
+#: src/search-tool-qt/search-tool-qt.cc:170
+msgid "Monitor library for changes"
+msgstr "Stebėti fonotekos pokyčius"
 
-#: src/search-tool/search-tool.cc:688
+#: src/search-tool-qt/search-tool-qt.cc:193 src/search-tool/search-tool.cc:450
 msgid ""
 "To import your music library into Audacious, choose a folder and then click "
 "the \"refresh\" icon."
@@ -3050,65 +3366,91 @@
 "Norėdami importuoti muziką į Audacious fonoteką, pasirinkite aplanką ir "
 "paspauskite „atnaujinti“ piktogramą."
 
-#: src/search-tool/search-tool.cc:696
+#: src/search-tool-qt/search-tool-qt.cc:195 src/search-tool/search-tool.cc:459
 msgid "Please wait ..."
 msgstr "Palaukite..."
 
-#: src/search-tool/search-tool.cc:723
+#: src/search-tool-qt/search-tool-qt.cc:197 src/search-tool/search-tool.cc:487
 msgid "Choose Folder"
 msgstr "Pasirinkite aplanką"
 
+#: src/search-tool-qt/search-tool-qt.cc:201 src/search-tool/search-tool.cc:445
+msgid "Search library"
+msgstr "Ieškoti fonotekoje"
+
+#: src/search-tool-qt/search-tool-qt.cc:327 src/search-tool/search-tool.cc:156
+#, c-format
+msgid "%d of %d result shown"
+msgid_plural "%d of %d results shown"
+msgstr0 "Rodomas %d iš %d rezultato"
+msgstr1 "Rodomas %d iš %d rezultatų"
+msgstr2 "Rodomas %d iš %d rezultatų"
+msgstr3 "Rodomas %d iš %d rezultatų"
+
+#: src/search-tool-qt/search-tool-qt.cc:331 src/search-tool/search-tool.cc:160
+#, c-format
+msgid "%d result"
+msgid_plural "%d results"
+msgstr0 "%d rezultatas"
+msgstr1 "%d rezultatai"
+msgstr2 "%d rezultatų"
+msgstr3 "%d rezultatų"
+
+#: src/search-tool-qt/search-tool-qt.cc:501 src/search-tool/search-tool.cc:341
+msgid "_Create Playlist"
+msgstr "_Sukurti grojaraštį"
+
+#: src/search-tool-qt/search-tool-qt.cc:503 src/search-tool/search-tool.cc:343
+msgid "_Add to Playlist"
+msgstr "_Pridėti į grojaraštį"
+
 #: src/sid/xmms-sid.cc:43
 msgid "SID Player"
-msgstr ""
-
-#: src/sid/xs_config.cc:61
-msgid "Output"
-msgstr ""
+msgstr "SID grotuvas"
 
 #: src/sid/xs_config.cc:62
 msgid "Channels:"
-msgstr ""
+msgstr "Kanalai:"
 
 #: src/sid/xs_config.cc:68
 msgid "Emulation"
-msgstr ""
+msgstr "Emuliavimas"
 
 #: src/sid/xs_config.cc:69
 msgid "Emulate MOS 8580 (default: MOS 6581)"
-msgstr ""
+msgstr "Emuliavimas MOS 8580 (numatytasis: MOS 6581)"
 
 #: src/sid/xs_config.cc:71
 msgid "Do not automatically select chip model"
-msgstr ""
+msgstr "Automatiškai neparinkti lusto modelio"
 
 #: src/sid/xs_config.cc:73
 msgid "Emulate filter"
-msgstr ""
+msgstr "Emuliavimo filtras"
 
 #: src/sid/xs_config.cc:75
 msgid "Clock speed:"
-msgstr ""
+msgstr "Takto sparta:"
 
 #: src/sid/xs_config.cc:78
 msgid "Do not automatically select clock speed"
-msgstr ""
+msgstr "Automatiškai neparinkti takto spartos"
 
 #: src/sid/xs_config.cc:80
 msgid "Playback time"
-msgstr ""
+msgstr "Atkūrimo laikas"
 
 #: src/sid/xs_config.cc:81
 msgid "Set maximum playback time:"
-msgstr ""
+msgstr "Nustatyti maksimalų atkūrimo laiką"
 
 #: src/sid/xs_config.cc:87
 msgid "Use only when song length is unknown"
-msgstr ""
+msgstr "Naudoti tik tada, kai dainos trukmė nežinoma"
 
 #: src/sid/xs_config.cc:90
 msgid "Set minimum playback time:"
-msgstr ""
+msgstr "Nustatyti minimalų atkūrimo laiką"
 
 #: src/sid/xs_config.cc:96
 msgid "Subtunes"
@@ -3124,761 +3466,706 @@
 
 #: src/sid/xs_config.cc:105
 msgid "Note"
-msgstr ""
+msgstr "Pastaba"
 
 #: src/silence-removal/silence-removal.cc:39
 msgid "Silence Removal"
-msgstr ""
+msgstr "Tylos pašalinimas"
 
 #: src/silence-removal/silence-removal.cc:58
 msgid ""
 "Silence Removal Plugin for Audacious\n"
 "Copyright 2014 John Lindgren"
 msgstr ""
+"Audacious tylos pašalinimo įskiepis\n"
+"Autoriaus teisės 2014 John Lindgren"
 
 #: src/silence-removal/silence-removal.cc:67
 msgid "Silence Removal"
-msgstr ""
+msgstr "Tylos pašalinimas"
 
 #: src/silence-removal/silence-removal.cc:68
 msgid "Threshold:"
-msgstr ""
+msgstr "Slenkstis:"
 
-#: src/silence-removal/silence-removal.cc:70
-msgid "dB"
-msgstr ""
+#: src/skins/actions.cc:45 src/skins-qt/actions.cc:43
+msgid "Repeat points cleared."
+msgstr "Kartojimo taškai išvalyti."
 
-#: src/skins/menus.cc:64
+#: src/skins/actions.cc:60 src/skins-qt/actions.cc:58
+msgid "Repeat point A set."
+msgstr "Kartojimo taškas A nustatytas."
+
+#: src/skins/actions.cc:65 src/skins-qt/actions.cc:63
+msgid "Repeat point B set."
+msgstr "Kartojimo taškas B nustatytas."
+
+#: src/skins/equalizer.cc:223 src/skins-qt/equalizer.cc:223
+msgid "Preamp"
+msgstr "Priešstiprintuvis"
+
+#: src/skins/equalizer.cc:227 src/skins-qt/equalizer.cc:227
+msgid "31 Hz"
+msgstr "31 Hz"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "63 Hz"
+msgstr "63 Hz"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "125 Hz"
+msgstr "125 Hz"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "250 Hz"
+msgstr "250 Hz"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "500 Hz"
+msgstr "500 Hz"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "1 kHz"
+msgstr "1 kHz"
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "2 kHz"
+msgstr "2 kHz"
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "4 kHz"
+msgstr "4 kHz"
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "8 kHz"
+msgstr "8 kHz"
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "16 kHz"
+msgstr "16 kHz"
+
+#: src/skins/equalizer.cc:270 src/skins-qt/equalizer.cc:270
+msgid "Audacious Equalizer"
+msgstr "Audacious vienodintuvas"
+
+#: src/skins/main.cc:459 src/skins-qt/main.cc:442
+msgid "Recording on"
+msgstr "Įrašymas įjungtas"
+
+#: src/skins/main.cc:461 src/skins-qt/main.cc:444
+msgid "Recording off"
+msgstr "Įrašymas išjungtas"
+
+#: src/skins/main.cc:754 src/skins-qt/main.cc:701
+#, c-format
+msgid "Seek to %d:%-2.2d / %d:%-2.2d"
+msgstr "Eiti į %d:%-2.2d / %d:%-2.2d"
+
+#: src/skins/main.cc:771 src/skins-qt/main.cc:718
+#, c-format
+msgid "Volume: %d%%"
+msgstr "Garsumas: %d%%"
+
+#: src/skins/main.cc:784 src/skins-qt/main.cc:731
+#, c-format
+msgid "Balance: %d%% left"
+msgstr "Balansas: %d%% kairė"
+
+#: src/skins/main.cc:786 src/skins-qt/main.cc:733
+msgid "Balance: center"
+msgstr "Balansas: centras"
+
+#: src/skins/main.cc:788 src/skins-qt/main.cc:735
+#, c-format
+msgid "Balance: %d%% right"
+msgstr "Balansas: %d%% dešinė"
+
+#: src/skins/main.cc:880 src/skins-qt/main.cc:827
+msgid "Options Menu"
+msgstr "Parinkčių meniu"
+
+#: src/skins/main.cc:884 src/skins-qt/main.cc:831
+msgid "Disable 'Always On Top'"
+msgstr "Išjungti „Visada viršuje“"
+
+#: src/skins/main.cc:886 src/skins-qt/main.cc:833
+msgid "Enable 'Always On Top'"
+msgstr "Įjungti „Visada viršuje“"
+
+#: src/skins/main.cc:889 src/skins-qt/main.cc:836
+msgid "File Info Box"
+msgstr "Rinkmenos informacijos langas"
+
+#: src/skins/main.cc:892 src/skins/menus.cc:149 src/skins-qt/main.cc:839
+#: src/skins-qt/menus.cc:142
+msgid "Double Size"
+msgstr "Dvigubas dydis"
+
+#: src/skins/main.cc:895 src/skins-qt/main.cc:842
+msgid "Visualizations"
+msgstr "Vizualizacijos"
+
+#: src/skins/menus.cc:74 src/skins-qt/menus.cc:64
+msgid "Volume Up"
+msgstr "Pagarsinti"
+
+#: src/skins/menus.cc:75 src/skins-qt/menus.cc:65
+msgid "Volume Down"
+msgstr "Patildyti"
+
+#: src/skins/menus.cc:77 src/skins-qt/menus.cc:67
+msgid "Effects ..."
+msgstr "Efektai..."
+
+#: src/skins/menus.cc:84 src/skins-qt/menus.cc:74
 msgid "Open Files ..."
-msgstr "Atverti failus..."
+msgstr "Atverti rinkmenas..."
 
-#: src/skins/menus.cc:65
+#: src/skins/menus.cc:85 src/skins-qt/menus.cc:76
 msgid "Open URL ..."
 msgstr "Atverti URL..."
 
-#: src/skins/menus.cc:66
-msgid "Search Library"
-msgstr ""
-
-#: src/skins/menus.cc:68
-msgid "Playback"
-msgstr "Atkūrimas"
-
-#: src/skins/menus.cc:69
+#: src/skins/menus.cc:89 src/skins-qt/menus.cc:80
 msgid "Playlist"
 msgstr "Grojaraštis"
 
-#: src/skins/menus.cc:70
+#: src/skins/menus.cc:90 src/skins-qt/menus.cc:81
+msgid "Output"
+msgstr "Išvestis"
+
+#: src/skins/menus.cc:91 src/skins-qt/menus.cc:82
 msgid "View"
 msgstr "Rodymas"
 
-#: src/skins/menus.cc:72 src/skins/menus.cc:136 src/skins/menus.cc:149
-#: src/skins/menus.cc:214
+#: src/skins/menus.cc:93 src/skins/menus.cc:161 src/skins/menus.cc:174
+#: src/skins/menus.cc:245 src/skins-qt/menus.cc:84 src/skins-qt/menus.cc:156
+#: src/skins-qt/menus.cc:170 src/skins-qt/menus.cc:241
 msgid "Services"
 msgstr "Tarnybos"
 
-#: src/skins/menus.cc:74
+#: src/skins/menus.cc:95 src/skins-qt/menus.cc:86
 msgid "About ..."
 msgstr "Apie..."
 
-#: src/skins/menus.cc:75
+#: src/skins/menus.cc:96 src/skins-qt/menus.cc:87
 msgid "Settings ..."
 msgstr "Nustatymai..."
 
-#: src/skins/menus.cc:76
+#: src/skins/menus.cc:97 src/skins-qt/menus.cc:88
 msgid "Quit"
 msgstr "Baigti"
 
-#: src/skins/menus.cc:80 src/skins/menus.cc:206
+#: src/skins/menus.cc:101 src/skins/menus.cc:235 src/skins-qt/menus.cc:92
+#: src/skins-qt/menus.cc:231
 msgid "Song Info ..."
 msgstr "Dainos informacija..."
 
-#: src/skins/menus.cc:84
+#: src/skins/menus.cc:105 src/skins-qt/menus.cc:96
+msgid "Shuffle by Album"
+msgstr "Maišyti pagal albumus"
+
+#: src/skins/menus.cc:106 src/skins-qt/menus.cc:97
 msgid "No Playlist Advance"
 msgstr "Nesislinkti grojaraščiu"
 
-#: src/skins/menus.cc:85
-msgid "Stop After This Song"
-msgstr "Sustabdyti po šios dainos"
-
-#: src/skins/menus.cc:93
+#: src/skins/menus.cc:117 src/skins-qt/menus.cc:108
 msgid "Set A-B Repeat"
 msgstr "Nustatyti A-B kartojimą"
 
-#: src/skins/menus.cc:94
+#: src/skins/menus.cc:118 src/skins-qt/menus.cc:109
 msgid "Clear A-B Repeat"
 msgstr "Išvalyti A-B kartojimą"
 
-#: src/skins/menus.cc:96
+#: src/skins/menus.cc:120 src/skins-qt/menus.cc:111
 msgid "Jump to Song ..."
 msgstr "Pereiti prie dainos ..."
 
-#: src/skins/menus.cc:97
+#: src/skins/menus.cc:121 src/skins-qt/menus.cc:113
 msgid "Jump to Time ..."
 msgstr "Šokti į laiką..."
 
-#: src/skins/menus.cc:101
+#: src/skins/menus.cc:125 src/skins-qt/menus.cc:118
 msgid "Play/Resume"
-msgstr ""
+msgstr "Groti / Tęsti"
 
-#: src/skins/menus.cc:103
+#: src/skins/menus.cc:127 src/skins-qt/menus.cc:120
 msgid "New Playlist"
 msgstr "Naujas grojaraštis"
 
-#: src/skins/menus.cc:104
+#: src/skins/menus.cc:128 src/skins-qt/menus.cc:121
 msgid "Rename Playlist ..."
 msgstr "Pervadinti grojaraštį..."
 
-#: src/skins/menus.cc:105
+#: src/skins/menus.cc:129 src/skins-qt/menus.cc:122
 msgid "Remove Playlist"
 msgstr "Pašalinti grojaraštį"
 
-#: src/skins/menus.cc:107
+#: src/skins/menus.cc:131 src/skins-qt/menus.cc:124
 msgid "Previous Playlist"
 msgstr "Ankstesnis grojaraštis"
 
-#: src/skins/menus.cc:108
+#: src/skins/menus.cc:132 src/skins-qt/menus.cc:125
 msgid "Next Playlist"
 msgstr "Sekantis grojaraštis"
 
-#: src/skins/menus.cc:110
+#: src/skins/menus.cc:134 src/skins-qt/menus.cc:127
 msgid "Import Playlist ..."
 msgstr "Įkelti grojaraštį..."
 
-#: src/skins/menus.cc:111
+#: src/skins/menus.cc:135 src/skins-qt/menus.cc:128
 msgid "Export Playlist ..."
-msgstr "Eksportuoti grojaraštį..."
+msgstr "Iškelti grojaraštį..."
 
-#: src/skins/menus.cc:113
+#: src/skins/menus.cc:137 src/skins-qt/menus.cc:130
 msgid "Playlist Manager ..."
 msgstr "Grojaraščių redaktorius..."
 
-#: src/skins/menus.cc:114
+#: src/skins/menus.cc:138 src/skins-qt/menus.cc:131
 msgid "Queue Manager ..."
 msgstr "Eilės redaktorius ..."
 
-#: src/skins/menus.cc:116
+#: src/skins/menus.cc:140 src/skins-qt/menus.cc:133
 msgid "Refresh Playlist"
 msgstr "Atnaujinti grojaraštį"
 
-#: src/skins/menus.cc:120
+#: src/skins/menus.cc:144 src/skins-qt/menus.cc:137
 msgid "Show Playlist Editor"
 msgstr "Rodyti grojaraščio redaktorių"
 
-#: src/skins/menus.cc:121
+#: src/skins/menus.cc:145 src/skins-qt/menus.cc:138
 msgid "Show Equalizer"
-msgstr "Rodyti ekvalaizerį"
+msgstr "Rodyti vienodintuvą"
 
-#: src/skins/menus.cc:123
+#: src/skins/menus.cc:147 src/skins-qt/menus.cc:140
 msgid "Show Remaining Time"
 msgstr "Rodyti likusį laiką"
 
-#: src/skins/menus.cc:125
+#: src/skins/menus.cc:150 src/skins-qt/menus.cc:143
 msgid "Always on Top"
 msgstr "Visada viršuje"
 
-#: src/skins/menus.cc:126
+#: src/skins/menus.cc:151 src/skins-qt/menus.cc:145
 msgid "On All Workspaces"
 msgstr "Visuose darbalaukiuose"
 
-#: src/skins/menus.cc:128
+#: src/skins/menus.cc:153 src/skins-qt/menus.cc:148
 msgid "Roll Up Player"
 msgstr "Sustumti grotuvą"
 
-#: src/skins/menus.cc:129
+#: src/skins/menus.cc:154 src/skins-qt/menus.cc:149
 msgid "Roll Up Playlist Editor"
 msgstr "Sustumti grojaraščio redaktorių"
 
-#: src/skins/menus.cc:130
+#: src/skins/menus.cc:155 src/skins-qt/menus.cc:150
 msgid "Roll Up Equalizer"
-msgstr "Sustumti ekvalaizerį"
-
-#: src/skins/menus.cc:132 src/skins/ui_main.cc:854
-msgid "Double Size"
-msgstr ""
+msgstr "Sustumti vienodintuvą"
 
-#: src/skins/menus.cc:138
+#: src/skins/menus.cc:163 src/skins-qt/menus.cc:158
 msgid "Add URL ..."
 msgstr "Pridėti URL..."
 
-#: src/skins/menus.cc:139
+#: src/skins/menus.cc:164 src/skins-qt/menus.cc:160
 msgid "Add Files ..."
-msgstr "Pridėti failus..."
+msgstr "Pridėti rinkmenas..."
 
-#: src/skins/menus.cc:143 src/skins/menus.cc:171 src/skins/menus.cc:185
+#: src/skins/menus.cc:168 src/skins/menus.cc:196 src/skins/menus.cc:212
+#: src/skins-qt/menus.cc:164 src/skins-qt/menus.cc:192
+#: src/skins-qt/menus.cc:208
 msgid "By Title"
 msgstr "Pagal pavadinimą"
 
-#: src/skins/menus.cc:144 src/skins/menus.cc:178 src/skins/menus.cc:192
+#: src/skins/menus.cc:169 src/skins/menus.cc:203 src/skins/menus.cc:219
+#: src/skins-qt/menus.cc:165 src/skins-qt/menus.cc:199
+#: src/skins-qt/menus.cc:215
 msgid "By File Name"
-msgstr ""
+msgstr "Pagal rinkmenos pavadinimą"
 
-#: src/skins/menus.cc:145 src/skins/menus.cc:179 src/skins/menus.cc:193
+#: src/skins/menus.cc:170 src/skins/menus.cc:204 src/skins/menus.cc:220
+#: src/skins-qt/menus.cc:166 src/skins-qt/menus.cc:200
+#: src/skins-qt/menus.cc:216
 msgid "By File Path"
-msgstr "Pagal failo kelią"
+msgstr "Pagal rinkmenos kelią"
 
-#: src/skins/menus.cc:151
+#: src/skins/menus.cc:176 src/skins-qt/menus.cc:172
 msgid "Remove All"
 msgstr "Pašalinti visus"
 
-#: src/skins/menus.cc:152
+#: src/skins/menus.cc:177 src/skins-qt/menus.cc:173
 msgid "Clear Queue"
 msgstr "Išvalyti eilę"
 
-#: src/skins/menus.cc:154
+#: src/skins/menus.cc:179 src/skins-qt/menus.cc:175
 msgid "Remove Unavailable Files"
-msgstr "Pašalina neprieinamus failus"
+msgstr "Pašalinti neprieinamas rinkmenas"
 
-#: src/skins/menus.cc:155
+#: src/skins/menus.cc:180 src/skins-qt/menus.cc:176
 msgid "Remove Duplicates"
-msgstr "Pašalinti dubliuotus"
+msgstr "Pašalinti pasikartojančias"
 
-#: src/skins/menus.cc:157
+#: src/skins/menus.cc:182 src/skins-qt/menus.cc:178
 msgid "Remove Unselected"
 msgstr "Pašalint nepažymėtus"
 
-#: src/skins/menus.cc:158
+#: src/skins/menus.cc:183 src/skins-qt/menus.cc:179
 msgid "Remove Selected"
 msgstr "Pašalint pažymėtus"
 
-#: src/skins/menus.cc:162
+#: src/skins/menus.cc:187 src/skins-qt/menus.cc:183
 msgid "Search and Select"
 msgstr "Ieškoti ir pasirinkti"
 
-#: src/skins/menus.cc:164
+#: src/skins/menus.cc:189 src/skins-qt/menus.cc:185
 msgid "Invert Selection"
 msgstr "Invertuoti pažymėjimą"
 
-#: src/skins/menus.cc:165
+#: src/skins/menus.cc:190 src/skins-qt/menus.cc:186
 msgid "Select None"
 msgstr "Nieko nepasirinkti"
 
-#: src/skins/menus.cc:166
+#: src/skins/menus.cc:191 src/skins-qt/menus.cc:187
 msgid "Select All"
 msgstr "Pasirinkti viską"
 
-#: src/skins/menus.cc:170 src/skins/menus.cc:184
+#: src/skins/menus.cc:195 src/skins/menus.cc:211 src/skins-qt/menus.cc:191
+#: src/skins-qt/menus.cc:207
 msgid "By Track Number"
 msgstr "Pagal takelio numerį"
 
-#: src/skins/menus.cc:172 src/skins/menus.cc:186
+#: src/skins/menus.cc:197 src/skins/menus.cc:213 src/skins-qt/menus.cc:193
+#: src/skins-qt/menus.cc:209
 msgid "By Artist"
 msgstr "Pagal atlikėją"
 
-#: src/skins/menus.cc:173 src/skins/menus.cc:187
+#: src/skins/menus.cc:198 src/skins/menus.cc:214 src/skins-qt/menus.cc:194
+#: src/skins-qt/menus.cc:210
 msgid "By Album"
 msgstr "Pagal albumą"
 
-#: src/skins/menus.cc:174 src/skins/menus.cc:188
+#: src/skins/menus.cc:199 src/skins/menus.cc:215 src/skins-qt/menus.cc:195
+#: src/skins-qt/menus.cc:211
 msgid "By Album Artist"
-msgstr ""
+msgstr "Pagal albumo atlikėją"
 
-#: src/skins/menus.cc:175 src/skins/menus.cc:190
+#: src/skins/menus.cc:200 src/skins/menus.cc:216 src/skins-qt/menus.cc:196
+#: src/skins-qt/menus.cc:212
 msgid "By Release Date"
 msgstr "Pagal išleidimo datą"
 
-#: src/skins/menus.cc:176 src/skins/menus.cc:189
+#: src/skins/menus.cc:201 src/skins/menus.cc:217 src/skins-qt/menus.cc:197
+#: src/skins-qt/menus.cc:213
 msgid "By Genre"
-msgstr ""
+msgstr "Pagal žanrą"
 
-#: src/skins/menus.cc:177 src/skins/menus.cc:191
+#: src/skins/menus.cc:202 src/skins/menus.cc:218 src/skins-qt/menus.cc:198
+#: src/skins-qt/menus.cc:214
 msgid "By Length"
-msgstr ""
+msgstr "Pagal trukmę"
 
-#: src/skins/menus.cc:180 src/skins/menus.cc:194
+#: src/skins/menus.cc:205 src/skins/menus.cc:221 src/skins-qt/menus.cc:201
+#: src/skins-qt/menus.cc:217
 msgid "By Custom Title"
+msgstr "Pagal pavadinimą"
+
+#: src/skins/menus.cc:206 src/skins/menus.cc:222 src/skins-qt/menus.cc:202
+#: src/skins-qt/menus.cc:218
+msgid "By Comment"
+msgstr "Pagal komentarus"
+
+#: src/skins/menus.cc:207 src/skins/menus.cc:223 src/skins-qt/menus.cc:203
+#: src/skins-qt/menus.cc:219
+msgid "By Disc Number"
 msgstr ""
 
-#: src/skins/menus.cc:198
+#: src/skins/menus.cc:227 src/skins-qt/menus.cc:223
 msgid "Randomize List"
 msgstr "Sumaišyti sąrašą"
 
-#: src/skins/menus.cc:199
+#: src/skins/menus.cc:228 src/skins-qt/menus.cc:224
 msgid "Reverse List"
 msgstr "Apversti sąrašą"
 
-#: src/skins/menus.cc:201
+#: src/skins/menus.cc:230 src/skins-qt/menus.cc:226
 msgid "Sort Selected"
 msgstr "Rikuoti pasirinktus"
 
-#: src/skins/menus.cc:202
+#: src/skins/menus.cc:231 src/skins-qt/menus.cc:227
 msgid "Sort List"
 msgstr "Rikiuoti sąrašą"
 
-#: src/skins/menus.cc:208
+#: src/skins/menus.cc:236 src/skins-qt/menus.cc:232
+msgid "Open Containing Folder"
+msgstr "Atverti esamą aplanką"
+
+#: src/skins/menus.cc:238 src/skins-qt/menus.cc:234
 msgid "Cut"
 msgstr "Iškirpti"
 
-#: src/skins/menus.cc:209
+#: src/skins/menus.cc:239 src/skins-qt/menus.cc:235
 msgid "Copy"
 msgstr "Kopijuoti"
 
-#: src/skins/menus.cc:210
+#: src/skins/menus.cc:240 src/skins-qt/menus.cc:236
 msgid "Paste"
 msgstr "Įklijuoti"
 
-#: src/skins/menus.cc:212
-msgid "Queue/Unqueue"
-msgstr "Į eilę/Iš eilės"
-
-#: src/skins/menus.cc:218
-msgid "Load Preset ..."
-msgstr "Įkrauti šabloną..."
+#: src/skins/menus.cc:241 src/skins-qt/menus.cc:237
+msgid "Paste at End"
+msgstr "Įklijuoti gale"
 
-#: src/skins/menus.cc:219
-msgid "Load Auto Preset ..."
-msgstr "Įkrauti savaime įsikraunantį šabloną..."
+#: src/skins/menus.cc:243 src/skins-qt/menus.cc:239
+msgid "Queue/Unqueue"
+msgstr "Į eilę / Iš eilės"
 
-#: src/skins/menus.cc:220
-msgid "Load Default"
-msgstr "Įkelti numatytus"
+#: src/skins/playlist-widget.cc:58 src/skins-qt/playlist-widget.cc:58
+#, c-format
+msgid "%s (%d of %d)"
+msgstr "%s (%d iš %d)"
 
-#: src/skins/menus.cc:221
-msgid "Load Preset File ..."
-msgstr "Įkrauti šabloną iš failo..."
+#: src/skins/playlistwin.cc:491 src/skins-qt/playlistwin.cc:478
+msgid "Audacious Playlist Editor"
+msgstr "Audacious grojaraščio redaktorius"
 
-#: src/skins/menus.cc:222
-msgid "Load EQF File ..."
-msgstr "Įkelti EQF failą..."
+#: src/skins/plugin.cc:53 src/skins-qt/plugin.cc:65
+msgid "Winamp Classic Interface"
+msgstr "Klasikinė Winamp sąsaja"
 
-#: src/skins/menus.cc:224
-msgid "Save Preset ..."
-msgstr "Išsaugoti šabloną..."
+#: src/skins-qt/menus.cc:75
+msgid "Open Folder ..."
+msgstr "Atverti aplanką..."
+
+#: src/skins-qt/menus.cc:159
+msgid "Add Folder ..."
+msgstr "Pridėti aplanką..."
 
-#: src/skins/menus.cc:225
-msgid "Save Auto Preset ..."
-msgstr "Išsaugoti savaime įsikraunantį šabloną..."
+#: src/skins-qt/search-select.cc:62 src/skins/search-select.cc:77
+msgid "Search entries in active playlist"
+msgstr "Ieškoti įrašų aktyviame grojaraštyje"
 
-#: src/skins/menus.cc:226
-msgid "Save Default"
-msgstr "Įrašyti numatytuosius"
+#: src/skins-qt/search-select.cc:70 src/skins/search-select.cc:83
+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 ""
+"Surasti ir pasirinkti įrašus grojaraštyje užpildant vieną ar kelis "
+"laukelius. Laukeliuose naudojama reguliariųjų išraiškų sintaksė, raidžių "
+"dydis nesvarbus. Jei nežinote, kaip veikia reguliariosios išraiškos, "
+"paprasčiausiai įrašykite paraidžiui tai, ką norite surasti."
 
-#: src/skins/menus.cc:227
-msgid "Save Preset File ..."
-msgstr "Išsaugoti šabloną į failą..."
+#: src/skins-qt/search-select.cc:75 src/skins/search-select.cc:91
+msgid "Title:"
+msgstr "Pavadinimas:"
 
-#: src/skins/menus.cc:228
-msgid "Save EQF File ..."
-msgstr "Išsaugoti šabloną į EQF failą..."
+#: src/skins-qt/search-select.cc:79 src/skins/search-select.cc:96
+msgid "Album:"
+msgstr "Albumas:"
 
-#: src/skins/menus.cc:230
-msgid "Delete Preset ..."
-msgstr "Pašalinti šabloną..."
+#: src/skins-qt/search-select.cc:82 src/skins/search-select.cc:101
+msgid "Artist:"
+msgstr "Atlikėjas:"
 
-#: src/skins/menus.cc:231
-msgid "Delete Auto Preset ..."
-msgstr "Ištrinti savaime įsikraunantį šabloną..."
+#: src/skins-qt/search-select.cc:85 src/skins/search-select.cc:106
+msgid "File Name:"
+msgstr "Rinkmenos pavadinimas:"
 
-#: src/skins/menus.cc:233
-msgid "Import Winamp Presets ..."
-msgstr "Importuoti WinAMP šablonus..."
+#: src/skins-qt/search-select.cc:88 src/skins/search-select.cc:134
+msgid "Clear previous selection before searching"
+msgstr "Prie ieškant, išvalyti buvusius pasirinkimus"
 
-#: src/skins/menus.cc:235
-msgid "Reset to Zero"
-msgstr "Atstatyti nulį"
+#: src/skins-qt/search-select.cc:89 src/skins/search-select.cc:137
+msgid "Automatically toggle queue for matching entries"
+msgstr "Atitinkantiems įrašams automatiškai perjungti eilę"
 
-#: src/skins/plugin.cc:48
-msgid "Winamp Classic Interface"
-msgstr "Klasikinė Winamp sąsaja"
+#: src/skins-qt/search-select.cc:90 src/skins/search-select.cc:140
+msgid "Create a new playlist with matching entries"
+msgstr "Iš surastų įrašų sukurti naują grojaraštį"
 
-#: src/skins/preset-browser.cc:57 src/skins/preset-list.cc:371
-#: src/skins/preset-list.cc:386
-msgid "Save"
-msgstr "Išsaugoti"
-
-#: src/skins/preset-browser.cc:57 src/skins/preset-list.cc:338
-#: src/skins/preset-list.cc:354
-msgid "Load"
-msgstr "Įkrauti"
-
-#: src/skins/preset-browser.cc:83
-msgid "Load Preset File"
-msgstr "Įkrauti šabloną iš failo"
-
-#: src/skins/preset-browser.cc:100
-msgid "Load EQF File"
-msgstr "Įkelti EQF failą"
-
-#: src/skins/preset-browser.cc:119
-msgid "Save Preset File"
-msgstr "Išsaugoti šabloną į failą"
-
-#: src/skins/preset-browser.cc:137
-msgid "Save EQF File"
-msgstr "Išsaugoti šabloną į EQF failą"
-
-#: src/skins/preset-browser.cc:151
-msgid "Import Winamp Presets"
-msgstr "Importuoti WinAMP šablonus"
-
-#: src/skins/preset-list.cc:285
-msgid "Presets"
-msgstr "Šablonai"
-
-#: src/skins/preset-list.cc:335
-msgid "Load preset"
-msgstr "Įkrauti šabloną"
-
-#: src/skins/preset-list.cc:351
-msgid "Load auto-preset"
-msgstr "Įkrauti auto išankstinius nustatymus"
-
-#: src/skins/preset-list.cc:367
-msgid "Save preset"
-msgstr "Išsaugoti šablonus"
-
-#: src/skins/preset-list.cc:382
-msgid "Save auto-preset"
-msgstr "Išsaugoti auto išankstinius nustatymus"
-
-#: src/skins/preset-list.cc:408
-msgid "Delete preset"
-msgstr "Ištrinti šabloną"
-
-#: src/skins/preset-list.cc:424
-msgid "Delete auto-preset"
-msgstr "Ištrinti auto išankstinius nustatymus"
+#: src/skins-qt/search-select.cc:101 src/skins/search-select.cc:78
+msgid "Search"
+msgstr "Ieškoti"
 
-#: src/skins/skins_cfg.cc:176
+#: src/skins-qt/skins_cfg.cc:198 src/skins/skins_cfg.cc:182
 msgid "Player:"
-msgstr ""
+msgstr "Grotuvas:"
 
-#: src/skins/skins_cfg.cc:178
+#: src/skins-qt/skins_cfg.cc:200 src/skins/skins_cfg.cc:184
 msgid "Select main player window font:"
 msgstr "Pasirinkti pagrindinį lango šriftą:"
 
-#: src/skins/skins_cfg.cc:179
+#: src/skins-qt/skins_cfg.cc:201 src/skins/skins_cfg.cc:185
 msgid "Playlist:"
-msgstr ""
+msgstr "Grojaraštis:"
 
-#: src/skins/skins_cfg.cc:181
+#: src/skins-qt/skins_cfg.cc:203 src/skins/skins_cfg.cc:187
 msgid "Select playlist font:"
 msgstr "Pasirinkti grojaraščio šriftą:"
 
-#: src/skins/skins_cfg.cc:187
+#: src/skins-qt/skins_cfg.cc:207 src/skins/skins_cfg.cc:191
 msgid "Skin"
 msgstr "Išvaizda"
 
-#: src/skins/skins_cfg.cc:189
+#: src/skins-qt/skins_cfg.cc:211 src/skins/skins_cfg.cc:193
+msgid "Display active titlebar when any window is focused"
+msgstr "Rodyti aktyvią pavadinimo juostą, kai sufokusuotas bet kuris langas"
+
+#: src/skins-qt/skins_cfg.cc:213 src/skins/skins_cfg.cc:195
 msgid "Fonts"
 msgstr "Šriftai"
 
-#: src/skins/skins_cfg.cc:192
+#: src/skins-qt/skins_cfg.cc:215 src/skins/skins_cfg.cc:197
 msgid "Use bitmap fonts (supports ASCII only)"
 msgstr "Naudoti bitmap šriftus (palaiko tik ASCII)"
 
-#: src/skins/skins_cfg.cc:194
+#: src/skins-qt/skins_cfg.cc:217 src/skins/skins_cfg.cc:199
 msgid "Scroll song title"
 msgstr "Slinkti pavadinimą"
 
-#: src/skins/skins_cfg.cc:196
+#: src/skins-qt/skins_cfg.cc:219 src/skins/skins_cfg.cc:201
 msgid "Scroll song title in both directions"
 msgstr "Slinkti pavadinimą į abi puses"
 
-#: src/skins/skins_cfg.cc:201
+#: src/skins-qt/skins_cfg.cc:224 src/skins/skins_cfg.cc:206
 msgid "Analyzer"
 msgstr "Analizatorius"
 
-#: src/skins/skins_cfg.cc:202
+#: src/skins-qt/skins_cfg.cc:225 src/skins/skins_cfg.cc:207
 msgid "Scope"
 msgstr "Sritis"
 
-#: src/skins/skins_cfg.cc:203
+#: src/skins-qt/skins_cfg.cc:226 src/skins/skins_cfg.cc:208
 msgid "Voiceprint / VU meter"
-msgstr "Voiceprint / VU meter"
+msgstr "Balso anspaudas / VU matuoklis"
 
-#: src/skins/skins_cfg.cc:204
+#: src/skins-qt/skins_cfg.cc:227 src/skins/skins_cfg.cc:209
 msgid "Off"
 msgstr "Išjungta"
 
-#: src/skins/skins_cfg.cc:208 src/skins/skins_cfg.cc:233
-#: src/skins/skins_cfg.cc:239
+#: src/skins-qt/skins_cfg.cc:231 src/skins-qt/skins_cfg.cc:256
+#: src/skins-qt/skins_cfg.cc:262 src/skins/skins_cfg.cc:213
+#: src/skins/skins_cfg.cc:238 src/skins/skins_cfg.cc:244
 msgid "Normal"
 msgstr "Normalus"
 
-#: src/skins/skins_cfg.cc:209 src/skins/skins_cfg.cc:234
+#: src/skins-qt/skins_cfg.cc:232 src/skins-qt/skins_cfg.cc:257
+#: src/skins/skins_cfg.cc:214 src/skins/skins_cfg.cc:239
 msgid "Fire"
 msgstr "Ugnis"
 
-#: src/skins/skins_cfg.cc:210
+#: src/skins-qt/skins_cfg.cc:233 src/skins/skins_cfg.cc:215
 msgid "Vertical lines"
 msgstr "Vertikalios linijos"
 
-#: src/skins/skins_cfg.cc:214
+#: src/skins-qt/skins_cfg.cc:237 src/skins/skins_cfg.cc:219
 msgid "Lines"
 msgstr "Linijos"
 
-#: src/skins/skins_cfg.cc:215
+#: src/skins-qt/skins_cfg.cc:238 src/skins/skins_cfg.cc:220
 msgid "Bars"
 msgstr "Juostos"
 
-#: src/skins/skins_cfg.cc:219
+#: src/skins-qt/skins_cfg.cc:242 src/skins/skins_cfg.cc:224
 msgid "Slowest"
 msgstr "Lėčiausias"
 
-#: src/skins/skins_cfg.cc:220
+#: src/skins-qt/skins_cfg.cc:243 src/skins/skins_cfg.cc:225
 msgid "Slow"
 msgstr "Lėtas"
 
-#: src/skins/skins_cfg.cc:221 src/sox-resampler/sox-resampler.cc:152
+#: src/skins-qt/skins_cfg.cc:244 src/skins/skins_cfg.cc:226
+#: src/soxr/sox-resampler.cc:180
 msgid "Medium"
 msgstr "Vidutinis"
 
-#: src/skins/skins_cfg.cc:222
+#: src/skins-qt/skins_cfg.cc:245 src/skins/skins_cfg.cc:227
 msgid "Fast"
 msgstr "Greitas"
 
-#: src/skins/skins_cfg.cc:223
+#: src/skins-qt/skins_cfg.cc:246 src/skins/skins_cfg.cc:228
 msgid "Fastest"
 msgstr "Greičiausias"
 
-#: src/skins/skins_cfg.cc:227
+#: src/skins-qt/skins_cfg.cc:250 src/skins/skins_cfg.cc:232
 msgid "Dots"
 msgstr "Taškai"
 
-#: src/skins/skins_cfg.cc:228
+#: src/skins-qt/skins_cfg.cc:251 src/skins/skins_cfg.cc:233
 msgid "Line"
 msgstr "Eilutė "
 
-#: src/skins/skins_cfg.cc:229
+#: src/skins-qt/skins_cfg.cc:252 src/skins/skins_cfg.cc:234
 msgid "Solid"
 msgstr "Vientisa"
 
-#: src/skins/skins_cfg.cc:235
+#: src/skins-qt/skins_cfg.cc:258 src/skins/skins_cfg.cc:240
 msgid "Ice"
 msgstr "Ledas"
 
-#: src/skins/skins_cfg.cc:240
+#: src/skins-qt/skins_cfg.cc:263 src/skins/skins_cfg.cc:245
 msgid "Smooth"
 msgstr "Tolygus"
 
-#: src/skins/skins_cfg.cc:244
-msgid "Type"
-msgstr "Tipas"
-
-#: src/skins/skins_cfg.cc:245
-msgid "Visualization type:"
-msgstr "Vaizdo efektų tipas:"
-
-#: src/skins/skins_cfg.cc:248
-msgid "Analyzer"
-msgstr "Analizatorius"
-
-#: src/skins/skins_cfg.cc:249
-msgid "Show peaks"
-msgstr "Rodyti pikus"
-
-#: src/skins/skins_cfg.cc:251
+#: src/skins-qt/skins_cfg.cc:267 src/skins/skins_cfg.cc:249
 msgid "Coloring:"
-msgstr "Spalvinimas:"
+msgstr "Spalvos:"
 
-#: src/skins/skins_cfg.cc:254
+#: src/skins-qt/skins_cfg.cc:270 src/skins/skins_cfg.cc:252
 msgid "Style:"
-msgstr "Stilius:"
+msgstr "Išvaizda:"
 
-#: src/skins/skins_cfg.cc:257
+#: src/skins-qt/skins_cfg.cc:273 src/skins/skins_cfg.cc:255
 msgid "Falloff:"
 msgstr "Pikų krytis:"
 
-#: src/skins/skins_cfg.cc:260
+#: src/skins-qt/skins_cfg.cc:276 src/skins/skins_cfg.cc:258
 msgid "Peak falloff:"
 msgstr "Pikų krytis:"
 
-#: src/skins/skins_cfg.cc:264
+#: src/skins-qt/skins_cfg.cc:282 src/skins/skins_cfg.cc:264
 msgid "Scope Style:"
-msgstr "Srities stilius:"
+msgstr "Srities išvaizda:"
 
-#: src/skins/skins_cfg.cc:267
+#: src/skins-qt/skins_cfg.cc:285 src/skins/skins_cfg.cc:267
 msgid "Voiceprint Coloring:"
-msgstr "Voiceprint spalvojimas:"
+msgstr "Balso antspaudo spalvos:"
 
-#: src/skins/skins_cfg.cc:270
+#: src/skins-qt/skins_cfg.cc:288 src/skins/skins_cfg.cc:270
 msgid "VU Meter Style:"
-msgstr "VU Meter stilius:"
-
-#: src/skins/skins_cfg.cc:276
-msgid "General"
-msgstr "Pagrindinės"
-
-#: src/skins/skins_cfg.cc:277
-msgid "Visualization"
-msgstr "Vizualizacija"
-
-#: src/skins/ui_equalizer.cc:282
-msgid "Preamp"
-msgstr "Preamp"
-
-#: src/skins/ui_equalizer.cc:286
-msgid "31 Hz"
-msgstr "31 Hz"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "63 Hz"
-msgstr "63 Hz"
+msgstr "VU matuoklio išvaizda:"
 
-#: src/skins/ui_equalizer.cc:287
-msgid "125 Hz"
-msgstr "125 Hz"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "250 Hz"
-msgstr "250 Hz"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "500 Hz"
-msgstr "500 Hz"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "1 kHz"
-msgstr "1 kHz"
-
-#: src/skins/ui_equalizer.cc:288
-msgid "2 kHz"
-msgstr "2 kHz"
-
-#: src/skins/ui_equalizer.cc:288
-msgid "4 kHz"
-msgstr "4 kHz"
-
-#: src/skins/ui_equalizer.cc:288
-msgid "8 kHz"
-msgstr "8 kHz"
-
-#: src/skins/ui_equalizer.cc:288
-msgid "16 kHz"
-msgstr "16 kHz"
-
-#: src/skins/ui_equalizer.cc:330
-msgid "Audacious Equalizer"
-msgstr "Audacious ekvalaizeris"
-
-#: src/skins/ui_main.cc:688
-#, c-format
-msgid "Seek to %d:%-2.2d / %d:%-2.2d"
-msgstr "Eiti į %d:%-2.2d / %d:%-2.2d"
-
-#: src/skins/ui_main.cc:709
-#, c-format
-msgid "Volume: %d%%"
-msgstr "Garsumas: %d%%"
-
-#: src/skins/ui_main.cc:732
-#, c-format
-msgid "Balance: %d%% left"
-msgstr "Balansas: %d%% kairė"
-
-#: src/skins/ui_main.cc:734
-msgid "Balance: center"
-msgstr "Balansas: centras"
-
-#: src/skins/ui_main.cc:736
-#, c-format
-msgid "Balance: %d%% right"
-msgstr "Balansas: %d%% dešinė"
-
-#: src/skins/ui_main.cc:842
-msgid "Options Menu"
-msgstr "Pasirinkčių meniu"
-
-#: src/skins/ui_main.cc:846
-msgid "Disable 'Always On Top'"
-msgstr "Išjungti „Visada viršuje“"
-
-#: src/skins/ui_main.cc:848
-msgid "Enable 'Always On Top'"
-msgstr "Įjungti „Visada viršuje“"
-
-#: src/skins/ui_main.cc:851
-msgid "File Info Box"
-msgstr "Failo informacijos langas"
-
-#: src/skins/ui_main.cc:857
-msgid "Visualizations"
-msgstr ""
-
-#: src/skins/ui_main.cc:1336
-msgid "Repeat point A set."
-msgstr "Kartojimo taškas A nustatytas."
-
-#: src/skins/ui_main.cc:1341
-msgid "Repeat point B set."
-msgstr "Kartojimo taškas B nustatytas."
-
-#: src/skins/ui_main.cc:1350
-msgid "Repeat points cleared."
-msgstr "Kartojimo taškai išvalyti."
-
-#: src/skins/ui_playlist.cc:219
-msgid "Search entries in active playlist"
-msgstr "Ieškoti įrašų aktyviame grojaraštyje"
-
-#: src/skins/ui_playlist.cc:226
-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 ""
-"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.cc:234
-msgid "Title:"
-msgstr ""
-
-#: src/skins/ui_playlist.cc:241
-msgid "Album:"
-msgstr ""
-
-#: src/skins/ui_playlist.cc:248
-msgid "Artist:"
-msgstr ""
-
-#: src/skins/ui_playlist.cc:255
-msgid "File Name:"
-msgstr ""
-
-#: src/skins/ui_playlist.cc:263
-msgid "Clear previous selection before searching"
-msgstr "Prie ieškant, išvalyti buvusius pasirinkimus"
+#: src/skins-qt/skins_cfg.cc:294 src/skins/skins_cfg.cc:276
+msgid "Type"
+msgstr "Rūšis"
 
-#: src/skins/ui_playlist.cc:266
-msgid "Automatically toggle queue for matching entries"
-msgstr "Atitinkantiems įrašams automatiškai perjungti eilę"
+#: src/skins-qt/skins_cfg.cc:295 src/skins/skins_cfg.cc:277
+msgid "Visualization type:"
+msgstr "Vaizdo efektų tipas:"
 
-#: src/skins/ui_playlist.cc:269
-msgid "Create a new playlist with matching entries"
-msgstr "Iš surastų įrašų sukurti naują grojaraštį"
+#: src/skins-qt/skins_cfg.cc:298 src/skins/skins_cfg.cc:280
+msgid "Analyzer"
+msgstr "Analizatorius"
 
-#: src/skins/ui_playlist.cc:717
-msgid "Audacious Playlist Editor"
-msgstr "Audacious grojaraščio redaktorius"
+#: src/skins-qt/skins_cfg.cc:299 src/skins/skins_cfg.cc:281
+msgid "Show peaks"
+msgstr "Rodyti pikus"
 
-#: src/skins/ui_playlist.cc:752
-#, c-format
-msgid "%s (%d of %d)"
-msgstr "%s (%d iš %d)"
+#: src/skins-qt/skins_cfg.cc:308 src/skins/skins_cfg.cc:290
+msgid "Visualization"
+msgstr "Vizualizacija"
 
-#: src/skins/ui_skinselector.cc:167
+#: src/skins-qt/skinselector.cc:98 src/skins/skinselector.cc:111
 msgid "Archived Winamp 2.x skin"
-msgstr "Archyvuotas Winamp 2.x skin"
+msgstr "Archyvuotas Winamp 2.x apvalkalas"
 
-#: src/skins/ui_skinselector.cc:172
+#: src/skins-qt/skinselector.cc:102 src/skins/skinselector.cc:115
 msgid "Unarchived Winamp 2.x skin"
-msgstr "Išarchyvuotas Winamp 2.x skin"
+msgstr "Išarchyvuotas Winamp 2.x apvalkalas"
 
-#: src/skins/util.cc:430
-#, c-format
-msgid "Could not create directory (%s): %s\n"
-msgstr "Negaliu sukurti aplanko (%s): %s\n"
-
-#: src/sndfile/plugin.cc:39
+#: src/sndfile/plugin.cc:38
 msgid "Sndfile Plugin"
 msgstr "Sndfile įskiepis"
 
-#: src/sndfile/plugin.cc:336
+#: src/sndfile/plugin.cc:372
 msgid ""
 "Based on the xmms_sndfile plugin:\n"
 "Copyright (C) 2000, 2002 Erik de Castro Lopo\n"
@@ -3899,113 +4186,132 @@
 "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"
+"Pagal xmms_sndfile įskiepį:\n"
+"Autorių teisės (C) 2000, 2002 Erik de Castro Lopo\n"
 "\n"
-"Adapted for Audacious by Tony Vroon <chainsaw@gentoo.org>\n"
+"Audacious pritaikė 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."
+"Ši programa yra nemokama programinė įranga; ją galite platinti ir (arba) "
+"keisti pagal GNU bendrosios viešosios licencijos sąlygas, paskelbtas "
+"Laisvosios programinės įrangos fondo (angl. Free Software "
+"Foundation); 2 licencijos versija arba (jūsų pasirinkimu) bet kuri "
+"vėlesnė versija.\n"
+"\n"
+"Ši programa platinama tikintis, kad ji bus naudinga, bet BE JOKIOS "
+"GARANTIJOS; net be numanomos TINKAMUMO PARDUOTI ar TINKAMUMO KONKREČIAM "
+"TIKSLUI garantijos. Daugiau informacijos rasite GNU bendrojoje viešojoje "
+"licencijoje.\n"
+"\n"
+"Kartu su šia programa turėjote gauti GNU bendrosios viešosios licencijos "
+"kopiją; jei ne, rašykite Free Software Foundation, Inc., 51 Franklin Street, "
+"Fifth Floor, Boston, MA 02110-1301, USA."
 
-#: src/sndio-ng/sndio.cc:44
+#: src/sndio/sndio.cc:43
 msgid "Sndio Output"
-msgstr ""
+msgstr "Sndio išvestis"
 
-#: src/sndio-ng/sndio.cc:98
+#: src/sndio/sndio.cc:98
 msgid "Device (blank for default):"
-msgstr ""
+msgstr "Įrenginys (nepasirinkus bus naudojamas numatytasis)"
 
-#: src/sndio-ng/sndio.cc:100
+#: src/sndio/sndio.cc:100
 msgid "Save and restore volume:"
-msgstr ""
+msgstr "Išsaugoti ir atkurti garsumą:"
 
-#: src/sndio-ng/sndio.cc:181
+#: src/sndio/sndio.cc:181
 #, c-format
 msgid "Sndio error: Unsupported audio format (%d)"
-msgstr ""
+msgstr "Sndio klaida: nepalaikomas garso plėtinys (%d)"
 
-#: src/sndio-ng/sndio.cc:192
+#: src/sndio/sndio.cc:192
 msgid "Sndio error: sio_open() failed"
-msgstr ""
+msgstr "Sndio klaida: nepavyko paleisti sio_open()"
 
-#: src/sndio-ng/sndio.cc:222
+#: src/sndio/sndio.cc:221
 msgid "Sndio error: sio_setpar() failed"
-msgstr ""
+msgstr "Sndio klaida: nepavyko paleisti sio_setpar()"
 
-#: src/sndio-ng/sndio.cc:234
+#: src/sndio/sndio.cc:233
 msgid "Sndio error: sio_start() failed"
-msgstr ""
+msgstr "Sndio klaida: nepavyko paleisti sio_start()"
 
-#: src/song_change/song_change.cc:33
+#: src/songchange/song_change.cc:30
 msgid "Song Change"
 msgstr "Dainos keitimas"
 
-#: src/song_change/song_change.cc:342
-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."
-
-#: src/song_change/song_change.cc:358
+#: src/songchange/song_change.cc:256
 msgid "Commands"
-msgstr ""
+msgstr "Komandos"
 
-#: src/song_change/song_change.cc:360
+#: src/songchange/song_change.cc:258
 msgid "Command to run when starting a new song:"
+msgstr "Paleisti komandą dainos pradžioje:"
+
+#: src/songchange/song_change.cc:261
+msgid "Command to run when stopping a song:"
 msgstr ""
 
-#: src/song_change/song_change.cc:364
+#: src/songchange/song_change.cc:264
 msgid "Command to run at the end of a song:"
-msgstr ""
+msgstr "Paleisti komandą dainos pabaigoje"
 
-#: src/song_change/song_change.cc:368
+#: src/songchange/song_change.cc:267
 msgid "Command to run at the end of the playlist:"
-msgstr ""
+msgstr "Komanda paleidimas grojaraščio pabaigoje:"
 
-#: src/song_change/song_change.cc:372
+#: src/songchange/song_change.cc:270
 msgid "Command to run when song title changes (for network streams):"
 msgstr ""
+"Komanda paleidimas, kai pasikeičia dainos pavadinimas (tinklo srautams):"
 
-#: src/song_change/song_change.cc:376
+#: src/songchange/song_change.cc:273
 msgid ""
-"You can use the following format strings which will be substituted before "
-"calling the command (not all are useful for the end-of-playlist command):\n"
-"\n"
-"%F: Frequency (in hertz)\n"
+"You can use the following format codes, which will be replaced before "
+"running the command.\n"
+"Not all are useful though for the song-stopped or end-of-playlist command."
+msgstr ""
+
+#: src/songchange/song_change.cc:276
+msgid ""
+"%a: Artist\n"
+"%b: Album\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"
+"%F: Frequency (Hertz)\n"
+"%l: Length (milliseconds)\n"
+"%n or %s: Formatted title (see playlist settings)\n"
 "%p: Currently playing (1 or 0)\n"
-"%a: Artist\n"
-"%b: Album\n"
-"%T: Track title"
-msgstr ""
-
-#: src/song-info-qt/song-info.cc:32
-msgid "Song Info (Qt)"
-msgstr ""
+"%r: Rate (bits per second)\n"
+"%t: Playlist position\n"
+"%T: Title (unformatted)"
+msgstr ""
+"%a: Atlikėjas\n"
+"%b: Albumas\n"
+"%c: Kanalų skaičius\n"
+"%f: Rinkmenos pavadinimas (visas kelias)\n"
+"%F: Dažnis (Hz)\n"
+"%l: Trukmė (ms)\n"
+"%n arba %s: Suformuotas pavadinimas (žr. grojaraščio nustatymus)\n"
+"%p: Šiuo metu groja (1 arba 0)\n"
+"%r: Sparta (bitai/s)\n"
+"%t: Grojaraščio padėtis\n"
+"%T: Pavadinimas (nesuformuotas)"
+
+#: src/songchange/song_change.cc:287
+msgid ""
+"Parameters passed to the shell should be enclosed in quotation marks.\n"
+"Unquoted parameters may lead to unexpected results."
+msgstr ""
+
+#: src/song-info-qt/song-info.cc:30
+msgid "Song Info"
+msgstr "Dainos informacija"
 
-#: src/sox-resampler/sox-resampler.cc:44
+#: src/soxr/sox-resampler.cc:44
 msgid "SoX Resampler"
-msgstr "SoX Resampler"
+msgstr "SoX pakartotinis ėminys"
 
-#: src/sox-resampler/sox-resampler.cc:144
+#: src/soxr/sox-resampler.cc:172
 msgid ""
 "SoX Resampler Plugin for Audacious\n"
 "Copyright 2013 Michał Lipski\n"
@@ -4016,96 +4322,144 @@
 "SoX Resampler įskiepis skirtas Audacious⏎ Copyright 2013 Michał Lipski⏎ ⏎ "
 "Paremta Sample Rate Converter įskiepiu:⏎ Copyright 2010-2012 John Lindgren"
 
-#: src/sox-resampler/sox-resampler.cc:150
+#: src/soxr/sox-resampler.cc:178
 msgid "Quick"
 msgstr "Greita"
 
-#: src/sox-resampler/sox-resampler.cc:151
+#: src/soxr/sox-resampler.cc:179
 msgid "Low"
 msgstr "Žema"
 
-#: src/sox-resampler/sox-resampler.cc:153
+#: src/soxr/sox-resampler.cc:181
 msgid "High"
 msgstr "Aukšta"
 
-#: src/sox-resampler/sox-resampler.cc:154
+#: src/soxr/sox-resampler.cc:182
 msgid "Very High"
 msgstr "Labai aukšta"
 
-#: src/sox-resampler/sox-resampler.cc:158
+#: src/soxr/sox-resampler.cc:183
+msgid "Ultra High"
+msgstr "Ypač aukštas"
+
+#: src/soxr/sox-resampler.cc:187
+msgid "Minimum"
+msgstr "Minimalus"
+
+#: src/soxr/sox-resampler.cc:188
+msgid "Intermediate"
+msgstr "Vidutinis"
+
+#: src/soxr/sox-resampler.cc:193
 msgid "Quality:"
 msgstr "Kokybė:"
 
-#: src/speed-pitch/speed-pitch.cc:51
+#: src/soxr/sox-resampler.cc:196
+msgid "Phase:"
+msgstr "Fazė:"
+
+#: src/soxr/sox-resampler.cc:200
+msgid "Allow aliasing"
+msgstr "Leisti naudoti slapyvardį"
+
+#: src/soxr/sox-resampler.cc:202
+msgid "Use steep filter"
+msgstr "Naudoti statų filtrą"
+
+#: src/speedpitch/speed-pitch.cc:54
 msgid "Speed and Pitch"
-msgstr "Greitis ir žingsnis"
+msgstr "Sparta ir žingsnis"
+
+#: src/speedpitch/speed-pitch.cc:247
+msgid "Speed"
+msgstr "Sparta"
 
-#: src/speed-pitch/speed-pitch.cc:210
-msgid "Speed and Pitch"
-msgstr "Greitis ir žingsnis"
+#: src/speedpitch/speed-pitch.cc:248
+msgid "Decouple from pitch"
+msgstr ""
 
-#: src/speed-pitch/speed-pitch.cc:211
-msgid "Speed:"
-msgstr "Greitis:"
+#: src/speedpitch/speed-pitch.cc:250 src/speedpitch/speed-pitch.cc:258
+msgid "Multiplier:"
+msgstr "Daugiklis:"
 
-#: src/speed-pitch/speed-pitch.cc:214
-msgid "Pitch:"
-msgstr "Žingsnis:"
+#: src/speedpitch/speed-pitch.cc:254
+msgid "Pitch"
+msgstr "Žingsnis"
 
-#: src/statusicon/statusicon.cc:47
+#: src/statusicon-qt/statusicon.cc:45 src/statusicon/statusicon.cc:47
 msgid "Status Icon"
 msgstr "Būsenos piktograma"
 
-#: src/statusicon/statusicon.cc:283
-msgid "Se_ttings ..."
-msgstr "Nus_tatymai..."
-
-#: src/statusicon/statusicon.cc:372
+#: src/statusicon-qt/statusicon.cc:68
 msgid ""
-"Status Icon Plugin\n"
+"Status Icon Plugin (partial port for Qt interface)\n"
 "\n"
 "Copyright 2005-2007 Giacomo Lozito <james@develia.org>\n"
 "Copyright 2010 Michał Lipski <tallica@o2.pl>\n"
+"Copyright 2015 Eugene Paskevich <eugene@raptor.kiev.ua>\n"
 "\n"
 "This plugin provides a status icon, placed in\n"
 "the system tray area of the window manager."
 msgstr ""
-"Status Icon Plugin\n"
+"Būsenos piktogramos įskiepis (dalinis prievadas Qt sąsajai)\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"
+"Autoriaus teisės 2005-2007 Giacomo Lozito <james@develia.org>\n"
+"Autoriaus teisės 2010 Michał Lipski <tallica@o2.pl>\n"
+"Autoriaus teisės 2015 Eugene Paskevich <eugene@raptor.kiev.ua>\n"
 "\n"
-"Šis įskiepis suteikia būsenos piktogramą, kuri\n"
-"rodoma sistemos dėkle."
+"Šis įskiepis sukuria būsenos piktogramą, kuri matoma\n"
+"langų valdiklio sistemos dėklo zonoje."
 
-#: src/statusicon/statusicon.cc:379
+#: src/statusicon-qt/statusicon.cc:89 src/statusicon/statusicon.cc:384
 msgid "Mouse Scroll Action"
 msgstr "Pelės slinkimo veiksmas"
 
-#: src/statusicon/statusicon.cc:380
+#: src/statusicon-qt/statusicon.cc:90 src/statusicon/statusicon.cc:385
 msgid "Change volume"
 msgstr "Keisti garsą"
 
-#: src/statusicon/statusicon.cc:383
+#: src/statusicon-qt/statusicon.cc:93 src/statusicon/statusicon.cc:388
 msgid "Change playing song"
 msgstr "Keisti grojančią dainą"
 
-#: src/statusicon/statusicon.cc:386
+#: src/statusicon-qt/statusicon.cc:96 src/statusicon/statusicon.cc:391
 msgid "Other Settings"
 msgstr "Kiti nustatymai"
 
-#: src/statusicon/statusicon.cc:387
+#: src/statusicon-qt/statusicon.cc:97 src/statusicon/statusicon.cc:392
 msgid "Disable the popup window"
 msgstr "Išjungti iššokantį langą"
 
-#: src/statusicon/statusicon.cc:389
+#: src/statusicon-qt/statusicon.cc:99 src/statusicon/statusicon.cc:394
 msgid "Close to the system tray"
 msgstr "Užverti į sistemos dėklą"
 
-#: src/statusicon/statusicon.cc:391
+#: src/statusicon-qt/statusicon.cc:101 src/statusicon/statusicon.cc:396
 msgid "Advance in playlist when scrolling upward"
 msgstr "Slenkant aukštyn, žengti grojaraščiu"
 
+#: src/statusicon-qt/statusicon.cc:116 src/statusicon/statusicon.cc:287
+msgid "Se_ttings ..."
+msgstr "Nus_tatymai..."
+
+#: src/statusicon/statusicon.cc:377
+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 ""
+"Status Icon įskiepis\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/stereo_plugin/stereo.cc:19
 msgid "Extra Stereo"
 msgstr "Extra Stereo"
@@ -4116,7 +4470,7 @@
 "\n"
 "By Johan Levin, 1999"
 msgstr ""
-"Extra Stereo Plugin\n"
+"Extra Stereo įskiepis\n"
 "\n"
 "Sukūrė Johan Levin, 1999"
 
@@ -4124,20 +4478,160 @@
 msgid "Extra Stereo"
 msgstr "Extra Stereo"
 
+#: src/streamtuner/icecast-model.cc:126 src/streamtuner/shoutcast-model.cc:131
+msgid "Type"
+msgstr "Rūšis"
+
+#: src/streamtuner/icecast-model.cc:132
+msgid "Current Song"
+msgstr "Dabar groja"
+
+#: src/streamtuner/icecast-model.cc:164
+msgid "Other"
+msgstr "Kita"
+
+#: src/streamtuner/ihr-model.cc:63
+msgid "Market"
+msgstr "Prekyba"
+
+#: src/streamtuner/ihr-model.cc:156
+msgid "Call Letters"
+msgstr "Šaukinio raidės"
+
+#: src/streamtuner/ihr-model.cc:162
+msgid "Description"
+msgstr "Aprašymas"
+
+#: src/streamtuner/shoutcast-model.cc:128
+msgid "Listeners"
+msgstr "Klausytojai"
+
+#: src/streamtuner/shoutcast-model.cc:188
+msgid "Top 500 Stations"
+msgstr "Top 500 stočių"
+
+#: src/streamtuner/shoutcast-model.cc:189
+msgid "Alternative"
+msgstr "Alternatyvioji"
+
+#: src/streamtuner/shoutcast-model.cc:190
+msgid "Blues"
+msgstr "Bliuzas"
+
+#: src/streamtuner/shoutcast-model.cc:191
+msgid "Classical"
+msgstr "Klasikinė"
+
+#: src/streamtuner/shoutcast-model.cc:192
+msgid "Country"
+msgstr "Kaimiška"
+
+#: src/streamtuner/shoutcast-model.cc:193
+msgid "Decades"
+msgstr "Dešimtmečiai"
+
+#: src/streamtuner/shoutcast-model.cc:194
+msgid "Easy Listening"
+msgstr "Lengvo klausymo"
+
+#: src/streamtuner/shoutcast-model.cc:195
+msgid "Electronic"
+msgstr "Elektroninė"
+
+#: src/streamtuner/shoutcast-model.cc:196
+msgid "Folk"
+msgstr "Liaudies"
+
+#: src/streamtuner/shoutcast-model.cc:197
+msgid "Inspirational"
+msgstr "Įkvepianti"
+
+#: src/streamtuner/shoutcast-model.cc:198
+msgid "International"
+msgstr "Tarptautinė"
+
+#: src/streamtuner/shoutcast-model.cc:199
+msgid "Jazz"
+msgstr "Džiazas"
+
+#: src/streamtuner/shoutcast-model.cc:200
+msgid "Latin"
+msgstr "Lotynų"
+
+#: src/streamtuner/shoutcast-model.cc:201
+msgid "Metal"
+msgstr "Metalas"
+
+#: src/streamtuner/shoutcast-model.cc:203
+msgid "New Age"
+msgstr "Naujasis amžius"
+
+#: src/streamtuner/shoutcast-model.cc:204
+msgid "Pop"
+msgstr "Popsas"
+
+#: src/streamtuner/shoutcast-model.cc:205
+msgid "Public Radio"
+msgstr "Visuomeninis radijas"
+
+#: src/streamtuner/shoutcast-model.cc:206
+msgid "R&B and Urban"
+msgstr "R&B ir urbanistinis"
+
+#: src/streamtuner/shoutcast-model.cc:207
+msgid "Rap"
+msgstr "Repas"
+
+#: src/streamtuner/shoutcast-model.cc:208
+msgid "Reggae"
+msgstr "Regis"
+
+#: src/streamtuner/shoutcast-model.cc:209
+msgid "Rock"
+msgstr "Rokas"
+
+#: src/streamtuner/shoutcast-model.cc:210
+msgid "Seasonal and Holiday"
+msgstr "Sezonas ir atostogos"
+
+#: src/streamtuner/shoutcast-model.cc:211
+msgid "Soundtracks"
+msgstr "Garso takeliai"
+
+#: src/streamtuner/shoutcast-model.cc:212
+msgid "Talk"
+msgstr "Pokalbiai"
+
+#: src/streamtuner/shoutcast-model.cc:213
+msgid "Themes"
+msgstr "Temos"
+
+#: src/streamtuner/streamtuner.cc:59
+msgid "Shoutcast"
+msgstr "Shoutcast"
+
+#: src/streamtuner/streamtuner.cc:60
+msgid "Icecast"
+msgstr "Icecast"
+
+#: src/streamtuner/streamtuner.cc:71
+msgid "Stream Tuner"
+msgstr "Srauto derintuvas"
+
 #: src/tonegen/tonegen.cc:45
 msgid "Tone Generator"
 msgstr "Tono generatorius"
 
-#: src/tonegen/tonegen.cc:94
+#: src/tonegen/tonegen.cc:92
 #, c-format
 msgid "%s %.1f Hz"
 msgstr "%s %.1f Hz"
 
-#: src/tonegen/tonegen.cc:94
+#: src/tonegen/tonegen.cc:92
 msgid "Tone Generator: "
 msgstr "Tono generatorius: "
 
-#: src/tonegen/tonegen.cc:160
+#: src/tonegen/tonegen.cc:161
 msgid ""
 "Sine tone generator by Håvard Kvålen <havardk@xmms.org>\n"
 "Modified by Daniel J. Peng <danielpeng@bigfoot.com>\n"
@@ -4145,17 +4639,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 tono generatorius, sukūrė Håvard Kvålen <havardk@xmms.org>\n"
+"Sinuso 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ą"
+"pvz., tone://2000;2005 norint atkurti 2000 Hz toną ir 2005 Hz toną"
+
+#: src/ui-common/dialogs-qt.cc:40
+msgid ""
+"\n"
+"(Further messages have been hidden.)"
+msgstr ""
+"\n"
+"(Sekantys pranešimai paslėpti)"
+
+#: src/ui-common/dialogs-qt.cc:52
+msgid "Working ..."
+msgstr "Veikia..."
+
+#: src/ui-common/dialogs-qt.cc:73
+msgid "Information"
+msgstr "Informacija"
+
+#: src/ui-common/menu-ops-gtk.cc:132 src/ui-common/menu-ops-qt.cc:113
+#, c-format
+msgid "%s does not appear to be a valid folder."
+msgstr "%s neatrodo tinkamu aplanku."
 
 #: src/voice_removal/voice_removal.cc:28
 msgid "Voice Removal"
 msgstr "Balso pašalinimas"
 
-#: src/vorbis/vorbis.cc:465
+#: src/vorbis/vorbis.cc:433
 msgid ""
 "Audacious Ogg Vorbis Decoder\n"
 "\n"
@@ -4195,14 +4710,14 @@
 
 #: src/vorbis/vorbis.h:18
 msgid "Ogg Vorbis Decoder"
-msgstr "Ogg Vorbis dekoderis"
+msgstr "Ogg Vorbis iškoduotuvas"
 
-#: src/vtx/info.cc:22
+#: src/vtx/info.cc:24
 #, c-format
 msgid "Details about %s"
-msgstr ""
+msgstr "Išsamiau apie %s"
 
-#: src/vtx/info.cc:24
+#: src/vtx/info.cc:26
 msgid ""
 "Title: %t\n"
 "Author: %a\n"
@@ -4216,12 +4731,22 @@
 "Player Freq: %P\n"
 "Year: %y"
 msgstr ""
+"Pavadinimas: %t\n"
+"Autorius: %aIš: %f\n"
+"Tracker: %T\n"
+"Komentaras: %C\n"
+"Lusto rūšis: %c\n"
+"Stereo: %s\n"
+"Kartojimas: %l\n"
+"Lusto dažnis: %F\n"
+"Grotuvo dažnis: %P\n"
+"Metai: %y"
 
 #: src/vtx/vtx.cc:38
 msgid "VTX Decoder"
-msgstr "VTX Decoder"
+msgstr "VTX iškoduotuvas"
 
-#: src/vtx/vtx.cc:184
+#: src/vtx/vtx.cc:178
 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"
@@ -4231,19 +4756,63 @@
 "Paremta in_vtx.dll kurį sukūrė Roman Sherbakov <v_soft@microfor.ru>\n"
 "Audacious įskiepį sukūrė Pavel Vymetalek <pvymetalek@seznam.cz>"
 
-#: src/wavpack/wavpack.cc:24
+#: src/vumeter-qt/vumeter_qt.cc:31
+msgid ""
+"VU Meter Plugin for Audacious\n"
+"Copyright 2017-2019 Marc Sánchez Fauste"
+msgstr ""
+"Audacious VU matuoklio įskiepis\n"
+"Autoriaus teisės 2017-2019 Marc Sánchez Fauste"
+
+#: src/vumeter-qt/vumeter_qt.cc:35
+msgid "VU Meter Settings"
+msgstr "VU matuoklio nustatymai"
+
+#: src/vumeter-qt/vumeter_qt.cc:37
+msgid "Peak hold time:"
+msgstr "Smailės išlaikymo trukmė:"
+
+#: src/vumeter-qt/vumeter_qt.cc:42
+msgid "Fall-off time:"
+msgstr "Kryčio trukmė:"
+
+#: src/vumeter-qt/vumeter_qt.cc:44
+msgid "dB/second"
+msgstr "dB/sekundę"
+
+#: src/vumeter-qt/vumeter_qt.cc:46
+msgid "Display legend"
+msgstr "Rodyti legendą"
+
+#: src/vumeter-qt/vumeter_qt.h:37
+msgid "VU Meter"
+msgstr "VU matuoklis"
+
+#: src/waveout/waveout.cc:43
+msgid "Win32 waveOut"
+msgstr "Win32 waveOut"
+
+#: src/waveout/waveout.cc:69
+msgid ""
+"Win32 waveOut Plugin for Audacious\n"
+"Copyright 2016 John Lindgren"
+msgstr ""
+"Audacious Win32 waveOut įskiepis\n"
+"Autoriaus teisės 2016 John Lindgren"
+
+#: src/wavpack/wavpack.cc:25
 msgid "WavPack Decoder"
-msgstr "WavPack dekoderis"
+msgstr "WavPack iškoduotuvas"
 
-#: src/wavpack/wavpack.cc:211
+#: src/wavpack/wavpack.cc:217
 msgid "lossy (hybrid)"
 msgstr "lossy (hibridinis)"
 
-#: src/wavpack/wavpack.cc:213
+#: src/wavpack/wavpack.cc:219
 msgid "lossy"
 msgstr "lossy"
 
-#: src/wavpack/wavpack.cc:255
+#: src/wavpack/wavpack.cc:259
 msgid ""
 "Copyright 2006 William Pitcock <nenolod@nenolod.net>\n"
 "\n"
@@ -4253,18 +4822,38 @@
 "\n"
 "Dalį kodo parašė Miles Egan."
 
-#: src/xsf/plugin.cc:50
+#: src/xsf/plugin.cc:74
 msgid "2SF Decoder"
-msgstr "2SF dekoderis"
+msgstr "2SF iškoduotuvas"
 
-#: src/xsf/plugin.cc:238
+#: src/xsf/plugin.cc:429
+msgid "32728 Hz"
+msgstr "32728 Hz"
+
+#: src/xsf/plugin.cc:432
+msgid "65456 Hz"
+msgstr "65456 Hz"
+
+#: src/xsf/plugin.cc:438
+msgid "Cosine"
+msgstr "Kosinusas"
+
+#: src/xsf/plugin.cc:439
+msgid "Sharp"
+msgstr "Aštrus"
+
+#: src/xsf/plugin.cc:443
 msgid "XSF Configuration"
-msgstr ""
+msgstr "XSF nustatymai"
 
-#: src/xsf/plugin.cc:239
-msgid "Ignore length from file"
-msgstr ""
+#: src/xsf/plugin.cc:445
+msgid "Default fade time:"
+msgstr "Numatyta perėjimo trukmė:"
+
+#: src/xsf/plugin.cc:447
+msgid "Interpolation mode:"
+msgstr "Interpoliavimo veiksena:"
 
-#: src/xspf/xspf.cc:89
+#: src/xspf/xspf.cc:95
 msgid "XML Shareable Playlists (XSPF)"
 msgstr "XML viešinami grojaraščiai (XSPF)"

audacious-plugins-3.6.2-gtk3.tar.bz2/po/lv.po -> audacious-plugins-4.4.1.tar.bz2/po/lv.po Changed

@@ -3,16 +3,18 @@
 # This file is distributed under the same license as the Audacious Plugins package.
 #
 # Translators:
-# hairy_latvian <einars8@gmail.com>, 2013-2015
+# hairy_latvian <einars8@gmail.com>, 2013-2016,2018
 # hairy_latvian <einars8@gmail.com>, 2009,2011-2013
+# Oskars Galanders <oskars@alumni.lu.lv>, 2020
 msgid ""
 msgstr ""
 "Project-Id-Version: Audacious Plugins\n"
-"Report-Msgid-Bugs-To: http://redmine.audacious-media-player.org/\n"
-"POT-Creation-Date: 2015-04-03 11:52+0200\n"
-"PO-Revision-Date: 2015-03-24 10:07+0000\n"
-"Last-Translator: hairy_latvian <einars8@gmail.com>\n"
-"Language-Team: Latvian (http://www.transifex.com/projects/p/audacious/"
+"Report-Msgid-Bugs-To: https://github.com/audacious-media-player/audacious/"
+"issues\n"
+"POT-Creation-Date: 2024-09-26 21:54+0200\n"
+"PO-Revision-Date: 2011-10-10 17:43+0000\n"
+"Last-Translator: Oskars Galanders <oskars@alumni.lu.lv>, 2020\n"
+"Language-Team: Latvian (http://app.transifex.com/audacious/audacious/"
 "language/lv/)\n"
 "Language: lv\n"
 "MIME-Version: 1.0\n"
@@ -21,287 +23,60 @@
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : "
 "2);\n"
 
-#: src/aac-raw/aac.cc:18
+#: src/aac/aac.cc:19
 msgid "AAC (Raw) Decoder"
 msgstr "AAC (jēldati) dekodētājs"
 
-#: src/adplug/adplug-xmms.cc:42
+#: src/adplug/adplug-xmms.cc:70
 msgid "AdPlug (AdLib Player)"
 msgstr "AdPlug (AdLib atskaņotājs)"
 
-#: src/adplug/adplug-xmms.cc:156 src/modplug/modplugbmp.cc:335
-#: src/psf/plugin.cc:138 src/vtx/vtx.cc:87 src/xsf/plugin.cc:113
+#: src/adplug/adplug-xmms.cc:167 src/modplug/modplugbmp.cc:321
+#: src/psf/plugin.cc:161 src/vtx/vtx.cc:89 src/xsf/plugin.cc:204
 msgid "sequenced"
 msgstr "sekvencēts"
 
-#: src/alarm/alarm.cc:55 src/alarm/interface.cc:82
-msgid "Alarm"
-msgstr "Modinātājs"
-
-#: src/alarm/alarm.cc:782
-msgid "Set Alarm ..."
-msgstr "Iestatīt signālu ..."
-
-#: src/alarm/alarm.cc:810
-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"
-"\n"
-"Sākotnējie autori: Adam Feakin un Daniel Stodden."
-
-#: src/alarm/interface.cc: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.cc: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.cc: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.cc:81
-msgid "This is your wakeup call."
-msgstr "Šis ir jūsu mošanās zvans."
-
-#: src/alarm/interface.cc:99
-msgid "Your reminder for today is..."
-msgstr "Jūsu atgādinājums šodienai ir..."
-
-#: src/alarm/interface.cc:101 src/alarm/interface.cc:386
-msgid "Reminder"
-msgstr "Atgādinājums"
-
-#: src/alarm/interface.cc:132
-msgid "Monday"
-msgstr "Pirmdiena"
-
-#: src/alarm/interface.cc:132
-msgid "Tuesday"
-msgstr "Otrdiena"
-
-#: src/alarm/interface.cc:132
-msgid "Wednesday"
-msgstr "Trešdiena"
-
-#: src/alarm/interface.cc:133
-msgid "Thursday"
-msgstr "Ceturtdiena"
-
-#: src/alarm/interface.cc:133
-msgid "Friday"
-msgstr "Piektdiena"
-
-#: src/alarm/interface.cc:133
-msgid "Saturday"
-msgstr "Sestdiena"
-
-#: src/alarm/interface.cc:133
-msgid "Sunday"
-msgstr "Svētdiena"
-
-#: src/alarm/interface.cc:171 src/alarm/interface.cc:230
-#: src/alarm/interface.cc:245
-msgid "Time"
-msgstr "Laiks"
-
-#: src/alarm/interface.cc:178
-msgid "Alarm at (default):"
-msgstr "Modināt (noklusējums):"
-
-#: src/alarm/interface.cc:200
-msgid "h"
-msgstr "h"
-
-#: src/alarm/interface.cc:203
-msgid "Quiet after:"
-msgstr "Kluss pēc:"
-
-#: src/alarm/interface.cc:215
-msgid "hours"
-msgstr "stundas"
-
-#: src/alarm/interface.cc:226
-msgid "minutes"
-msgstr "minūtes"
-
-#: src/alarm/interface.cc:235
-msgid "Choose the days for the alarm to come on"
-msgstr "Izvēlieties dienas, kurās ieslēgsies modinātājs"
+#: src/adplug/adplug-xmms.cc:349 src/sid/xs_config.cc:61
+msgid "Output"
+msgstr "Izvade"
 
-#: src/alarm/interface.cc:242
-msgid "Day"
-msgstr "Diena"
+#: src/adplug/adplug-xmms.cc:350
+msgid "OPL Emulator:"
+msgstr "OPL emulators:"
+
+#: src/adplug/adplug-xmms.cc:353 src/amidiplug/i_configure.cc:153
+#: src/console/plugin.cc:45 src/filewriter/filewriter.cc:481
+#: src/sid/xs_config.cc:65 src/xsf/plugin.cc:446
+msgid "Sample rate:"
+msgstr "Iztveršanas temps:"
 
-#: src/alarm/interface.cc:259 src/bs2b/plugin.cc:130
-#: src/skins/preset-list.cc:434 src/skins/preset-list.cc:440
-msgid "Default"
-msgstr "Noklusētais"
+#: src/adplug/adplug-xmms.cc:354 src/amidiplug/i_configure.cc:155
+#: src/bs2b/plugin.cc:141 src/console/plugin.cc:47
+#: src/modplug/plugin_main.cc:77 src/resample/resample.cc:201
+#: src/resample/resample.cc:207 src/resample/resample.cc:211
+#: src/resample/resample.cc:215 src/resample/resample.cc:219
+#: src/resample/resample.cc:223 src/resample/resample.cc:227
+#: src/resample/resample.cc:231 src/resample/resample.cc:235
+#: src/resample/resample.cc:239 src/resample/resample.cc:243
+#: src/sid/xs_config.cc:67 src/soxr/sox-resampler.cc:205
+msgid "Hz"
+msgstr "Hz"
 
-#: src/alarm/interface.cc:288
-msgid "Days"
-msgstr "Dienas"
-
-#: src/alarm/interface.cc:297
-msgid "Fading"
-msgstr "Izdzišana"
-
-#: src/alarm/interface.cc:305 src/console/plugin.cc:41
-#: src/crossfade/crossfade.cc:53 src/crossfade/crossfade.cc:59
-#: src/gtkui/settings.cc:49 src/lirc/lirc.cc:397 src/sid/xs_config.cc:85
-#: src/sid/xs_config.cc:94 src/sid/xs_config.cc:103
-msgid "seconds"
-msgstr "sekundes"
+#: src/adplug/adplug-xmms.cc:355 src/gtkui/settings.cc:55
+#: src/modplug/plugin_main.cc:105 src/qtui/settings.cc:85
+#: src/skins-qt/skins_cfg.cc:302 src/skins/skins_cfg.cc:284
+msgid "Miscellaneous"
+msgstr "Dažādi"
 
-#: src/alarm/interface.cc:312 src/alarm/interface.cc:353
-msgid "Volume"
-msgstr "Skaļums"
-
-#: src/alarm/interface.cc:317
-msgid "Start at"
-msgstr "Sākumā"
-
-#: src/alarm/interface.cc:333
-msgid "Final"
-msgstr "Beigās"
-
-#: src/alarm/interface.cc:346
-msgid "Current"
-msgstr "Pašreizējais"
-
-#: src/alarm/interface.cc:359
-msgid "Additional Command"
-msgstr "Papildu komanda"
-
-#: src/alarm/interface.cc:365 src/alarm/interface.cc:391
-msgid "enable"
-msgstr "ieslēgt"
-
-#: src/alarm/interface.cc:372
-msgid "Playlist (optional)"
-msgstr "Repertuārs (neobligāts)"
-
-#: src/alarm/interface.cc:379
-msgid "Select a playlist"
-msgstr "Izvēlieties repertuāru"
-
-#: src/alarm/interface.cc:399
-msgid "Options"
-msgstr "Opcijas"
-
-#: src/alarm/interface.cc:404
-msgid "What do these options mean?"
-msgstr "Ko šīs opcijas nozīmē?"
-
-#: src/alarm/interface.cc:420
-msgid "Help"
-msgstr "Palīdzība"
+#: src/adplug/adplug-xmms.cc:356
+msgid "Repeat song in endless loop"
+msgstr "Atkārtot dziesmu bezgalīgā ciklā"
 
-#: src/albumart/albumart.cc:31
+#: src/albumart/albumart.cc:31 src/albumart-qt/albumart.cc:35
 msgid "Album Art"
 msgstr "Albuma vāks"
 
-#: src/albumart-qt/albumart.cc:33
-msgid "Album Art (Qt)"
-msgstr "Albuma vāks (Qt)"
-
-#: src/alsa/alsa.h:70
+#: src/alsa/alsa.h:64
 msgid "ALSA Output"
 msgstr "ALSA izvade"
 
@@ -343,11 +118,11 @@
 msgid "Mixer element:"
 msgstr "Miksera elements:"
 
-#: src/amidi-plug/amidi-plug.cc:41
+#: src/amidiplug/amidi-plug.cc:42
 msgid "AMIDI-Plug (MIDI Player)"
 msgstr "AMIDI-Plug (MIDI atskaņotājs)"
 
-#: src/amidi-plug/amidi-plug.cc:437
+#: src/amidiplug/amidi-plug.cc:445
 msgid ""
 "AMIDI-Plug\n"
 "modular MIDI music player\n"
@@ -388,157 +163,161 @@
 "Tony Vroon\n"
 "par palīdzību alfa testēšanā"
 
-#: src/amidi-plug/i_configure.cc:94
+#: src/amidiplug/i_configure.cc:94
 msgid "Override default gain:"
 msgstr "Aizstāt noklusēto pastiprinājumu:"
 
-#: src/amidi-plug/i_configure.cc:102
+#: src/amidiplug/i_configure.cc:102
 msgid "Override default polyphony:"
 msgstr "Aizstāt noklusēto polifoniju:"
 
-#: src/amidi-plug/i_configure.cc:110
+#: src/amidiplug/i_configure.cc:110
 msgid "Override default reverb:"
 msgstr "Aizstāt noklusēto atbalsi: "
 
-#: src/amidi-plug/i_configure.cc:112 src/amidi-plug/i_configure.cc:120
+#: src/amidiplug/i_configure.cc:112 src/amidiplug/i_configure.cc:120
 msgid "On"
 msgstr "Ieslēgts"
 
-#: src/amidi-plug/i_configure.cc:118
+#: src/amidiplug/i_configure.cc:118
 msgid "Override default chorus:"
 msgstr "Aizstāt noklusēto kori:"
 
-#: src/amidi-plug/i_configure.cc:128 src/console/plugin.cc:29
+#: src/amidiplug/i_configure.cc:128 src/console/plugin.cc:29
 msgid "Playback"
 msgstr "Atskaņošana"
 
-#: src/amidi-plug/i_configure.cc:129
+#: src/amidiplug/i_configure.cc:129
 msgid "Transpose:"
-msgstr "Pārlikt:"
+msgstr "Transponēt/pārlikt:"
 
-#: src/amidi-plug/i_configure.cc:131
+#: src/amidiplug/i_configure.cc:131 src/speedpitch/speed-pitch.cc:257
 msgid "semitones"
 msgstr "pustoņi"
 
-#: src/amidi-plug/i_configure.cc:132
+#: src/amidiplug/i_configure.cc:132
 msgid "Drum shift:"
 msgstr "Bungu pārbīde:"
 
-#: src/amidi-plug/i_configure.cc:134
+#: src/amidiplug/i_configure.cc:134
 msgid "note numbers"
 msgstr "nošu numuri"
 
-#: src/amidi-plug/i_configure.cc:135
+#: src/amidiplug/i_configure.cc:135
 msgid "Skip leading silence"
 msgstr "Izlaist klusumu sākumā"
 
-#: src/amidi-plug/i_configure.cc:137
+#: src/amidiplug/i_configure.cc:137
 msgid "Skip trailing silence"
 msgstr "Izlaist klusumu beigās"
 
-#: src/amidi-plug/i_configure.cc:141
+#: src/amidiplug/i_configure.cc:141
 msgid "SoundFont"
 msgstr "SoundFont"
 
-#: src/amidi-plug/i_configure.cc:143
+#: src/amidiplug/i_configure.cc:148
 msgid "Synthesizer"
 msgstr "Sintezators"
 
-#: src/amidi-plug/i_configure.cc:148 src/console/plugin.cc:45
-#: src/sid/xs_config.cc:65
-msgid "Sample rate:"
-msgstr "Iztveršanas temps:"
-
-#: src/amidi-plug/i_configure.cc:150 src/bs2b/plugin.cc:141
-#: src/console/plugin.cc:47 src/modplug/plugin_main.cc:78
-#: src/resample/resample.cc:201 src/resample/resample.cc:207
-#: src/resample/resample.cc:211 src/resample/resample.cc:215
-#: src/resample/resample.cc:219 src/resample/resample.cc:223
-#: src/resample/resample.cc:227 src/resample/resample.cc:231
-#: src/resample/resample.cc:235 src/resample/resample.cc:239
-#: src/resample/resample.cc:243 src/sid/xs_config.cc:67
-#: src/sox-resampler/sox-resampler.cc:163
-msgid "Hz"
-msgstr "Hz"
-
-#: src/amidi-plug/i_configure-fluidsynth.cc:52
+#: src/amidiplug/i_configure-fluidsynth.cc:58
+#: src/amidiplug/i_configure-fluidsynth.cc:527
 msgid "AMIDI-Plug - select SoundFont file"
 msgstr "AMIDI-Plug — izvēlieties SoundFont failu"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:55 src/filewriter/mp3.cc:658
+#: src/amidiplug/i_configure-fluidsynth.cc:61
 msgid "_Cancel"
-msgstr "_Atcelt"
+msgstr "At_celt"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:56
+#: src/amidiplug/i_configure-fluidsynth.cc:62
 msgid "_Open"
 msgstr "_Atvērt"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:225 src/gtkui/columns.cc:46
+#: src/amidiplug/i_configure-fluidsynth.cc:233
+#: src/amidiplug/i_configure-fluidsynth.cc:461
 msgid "File name"
 msgstr "Faila nosaukums"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:229
+#: src/amidiplug/i_configure-fluidsynth.cc:237
+#: src/amidiplug/i_configure-fluidsynth.cc:464
 msgid "Size (bytes)"
 msgstr "Izmērs (baitos)"
 
-#: src/amidi-plug/i_fileinfo.cc:163
+#: src/amidiplug/i_fileinfo.cc:184
 msgid "Name:"
 msgstr "Nosaukums:"
 
-#: src/amidi-plug/i_fileinfo.cc:181
+#: src/amidiplug/i_fileinfo.cc:202
 msgid " MIDI Info "
 msgstr " MIDI informācija "
 
-#: src/amidi-plug/i_fileinfo.cc:195
+#: src/amidiplug/i_fileinfo.cc:216
 msgid "Format:"
 msgstr "Formāts:"
 
-#: src/amidi-plug/i_fileinfo.cc:198
+#: src/amidiplug/i_fileinfo.cc:219
 msgid "Length (msec):"
 msgstr "Garums (ms):"
 
-#: src/amidi-plug/i_fileinfo.cc:201
+#: src/amidiplug/i_fileinfo.cc:222
 msgid "No. of Tracks:"
 msgstr "Celiņu skaits:"
 
-#: src/amidi-plug/i_fileinfo.cc:207
+#: src/amidiplug/i_fileinfo.cc:228
 msgid "variable"
-msgstr "mainīgais"
+msgstr "mainīgs"
 
-#: src/amidi-plug/i_fileinfo.cc:209
+#: src/amidiplug/i_fileinfo.cc:230
 msgid "BPM:"
 msgstr "BPM:"
 
-#: src/amidi-plug/i_fileinfo.cc:217
+#: src/amidiplug/i_fileinfo.cc:238
 msgid "BPM (wavg):"
 msgstr "BPM (wavg):"
 
-#: src/amidi-plug/i_fileinfo.cc:220
+#: src/amidiplug/i_fileinfo.cc:241
 msgid "Time Div:"
 msgstr "Laika dalītājs:"
 
-#: src/amidi-plug/i_fileinfo.cc:231
+#: src/amidiplug/i_fileinfo.cc:252
 msgid " MIDI Comments and Lyrics "
 msgstr " MIDI Komentāri un dziesmu vārdu teksti "
 
-#: src/amidi-plug/i_fileinfo.cc:278
+#: src/amidiplug/i_fileinfo.cc:299
 msgid "* no comments available in this MIDI file *"
 msgstr "* komentāri šajā MIDI failā nav pieejami *"
 
-#: src/amidi-plug/i_fileinfo.cc:290
+#: src/amidiplug/i_fileinfo.cc:311
 msgid "* no lyrics available in this MIDI file *"
 msgstr "* dziesmu vārdu teksti šajā MIDI failā nav pieejami *"
 
-#: src/amidi-plug/i_fileinfo.cc:300 src/filewriter/vorbis.cc:197
-#: src/ladspa/plugin.cc:416
+#: src/amidiplug/i_fileinfo.cc:321 src/ladspa/plugin.cc:418
+#: src/ui-common/dialogs-qt.cc:32
 msgid "_Close"
 msgstr "Ai_zvērt"
 
-#: src/amidi-plug/i_fileinfo.cc:325
+#: src/amidiplug/i_fileinfo.cc:346
 msgid " (invalid UTF-8)"
 msgstr " (nederīgs UTF-8)"
 
-#: src/aosd/aosd.cc:32
+#: src/ampache/ampache.cc:33
+msgid "Ampache Browser"
+msgstr "Ampache pārlūks"
+
+#: src/ampache/ampache.cc:46
+msgid ""
+"Ampache Browser for Audacious\n"
+"http://ampache-browser.org/\n"
+"\n"
+"Copyright (C) Róbert Čerňanský and John Lindgren\n"
+"License: GNU GPLv3"
+msgstr ""
+"Ampache klients atskaņotājam Audacious.\n"
+"http://ampache-browser.org/\n"
+"\n"
+"Autortiesības (C) Róbert Čerňanský un John Lindgren\n"
+"Licence: GNU GPLv3"
+
+#: src/aosd/aosd.cc:31
 msgid ""
 "Audacious OSD\n"
 "http://www.develia.org/projects.php?p=audacious#aosd\n"
@@ -572,130 +351,130 @@
 msgid "Concave Rectangle"
 msgstr "Ieliekts taisnstrūris"
 
-#: src/aosd/aosd_style.cc:69
+#: src/aosd/aosd_style.cc:69 src/openmpt/mptwrap.h:50 src/xsf/plugin.cc:436
 msgid "None"
 msgstr "Neviens"
 
-#: src/aosd/aosd_trigger.cc:50
+#: src/aosd/aosd_trigger.cc:49
 msgid "Playback Start"
 msgstr "Atskaņošanas sākums"
 
-#: src/aosd/aosd_trigger.cc:51
+#: src/aosd/aosd_trigger.cc:50
 msgid "Triggers OSD when a playlist entry is played."
 msgstr "Palaiž OSD, kad tiek atskaņots repertuāra ieraksts."
 
-#: src/aosd/aosd_trigger.cc:56
+#: src/aosd/aosd_trigger.cc:55
 msgid "Title Change"
 msgstr "Nosaukuma maiņa"
 
-#: src/aosd/aosd_trigger.cc:57
+#: src/aosd/aosd_trigger.cc:56
 msgid "Triggers OSD when the song title changes (for internet streams)."
 msgstr "Palaiž OSD, izmainoties dziesmas nosaukumam (interneta straumēm)."
 
-#: src/aosd/aosd_trigger.cc:62
+#: src/aosd/aosd_trigger.cc:61
 msgid "Pause On"
 msgstr "Pauze ieslēgta"
 
-#: src/aosd/aosd_trigger.cc:63
+#: src/aosd/aosd_trigger.cc:62
 msgid "Triggers OSD when playback is paused."
 msgstr "Palaiž OSD, kad tiek nopauzēta atskaņošana."
 
-#: src/aosd/aosd_trigger.cc:68
+#: src/aosd/aosd_trigger.cc:67
 msgid "Pause Off"
 msgstr "Pauze izslēgta"
 
-#: src/aosd/aosd_trigger.cc:69
+#: src/aosd/aosd_trigger.cc:68
 msgid "Triggers OSD when playback is unpaused."
 msgstr "Palaiž OSD, kad tiek atjaunota atskaņošana pēc pauzes."
 
-#: src/aosd/aosd_ui.cc:163
+#: src/aosd/aosd_ui.cc:204
 msgid "Placement"
 msgstr "Novietojums"
 
-#: src/aosd/aosd_ui.cc:196
+#: src/aosd/aosd_ui.cc:241
 msgid "Relative X offset:"
 msgstr "Relatīvā X nobīde:"
 
-#: src/aosd/aosd_ui.cc:203
+#: src/aosd/aosd_ui.cc:245
 msgid "Relative Y offset:"
 msgstr "Relatīvā Y nobīde:"
 
-#: src/aosd/aosd_ui.cc:210
+#: src/aosd/aosd_ui.cc:249
 msgid "Max OSD width:"
 msgstr "Maksimālais OSD platums:"
 
-#: src/aosd/aosd_ui.cc:221
+#: src/aosd/aosd_ui.cc:281
 msgid "Multi-Monitor options"
 msgstr "Daudzmonitoru opcijas"
 
-#: src/aosd/aosd_ui.cc:225
+#: src/aosd/aosd_ui.cc:285
 msgid "Display OSD using:"
 msgstr "Rādīt OSD izmantojot:"
 
-#: src/aosd/aosd_ui.cc:227
+#: src/aosd/aosd_ui.cc:287
 msgid "all monitors"
 msgstr "visi monitori"
 
-#: src/aosd/aosd_ui.cc:230
+#: src/aosd/aosd_ui.cc:290
 #, c-format
 msgid "monitor %i"
 msgstr "%i. monitors"
 
-#: src/aosd/aosd_ui.cc:282
+#: src/aosd/aosd_ui.cc:342
 msgid "Timing (ms)"
 msgstr "Ilgums (ms)"
 
-#: src/aosd/aosd_ui.cc:287
+#: src/aosd/aosd_ui.cc:347
 msgid "Display:"
 msgstr "Rādīt:"
 
-#: src/aosd/aosd_ui.cc:292
+#: src/aosd/aosd_ui.cc:352
 msgid "Fade in:"
-msgstr "Parādīties:"
+msgstr "Pakāpeniski parādīties:"
 
-#: src/aosd/aosd_ui.cc:297
+#: src/aosd/aosd_ui.cc:357
 msgid "Fade out:"
-msgstr "Izgaist:"
+msgstr "Pakāpeniski izgaist/izbalēt:"
 
-#: src/aosd/aosd_ui.cc:361
+#: src/aosd/aosd_ui.cc:442
 msgid "Fonts"
-msgstr "Fonti"
+msgstr "Šrifti"
 
-#: src/aosd/aosd_ui.cc:368
+#: src/aosd/aosd_ui.cc:449
 #, c-format
 msgid "Font %i:"
 msgstr "%i. fonts:"
 
-#: src/aosd/aosd_ui.cc:382
+#: src/aosd/aosd_ui.cc:466
 msgid "Shadow"
 msgstr "Ēna"
 
-#: src/aosd/aosd_ui.cc:486
+#: src/aosd/aosd_ui.cc:589
 msgid "Render Style"
 msgstr "Renderēšanas stils"
 
-#: src/aosd/aosd_ui.cc:502
+#: src/aosd/aosd_ui.cc:605
 msgid "Colors"
 msgstr "Krāsas"
 
-#: src/aosd/aosd_ui.cc:513
+#: src/aosd/aosd_ui.cc:616
 #, c-format
 msgid "Color %i:"
 msgstr "%i. krāsa:"
 
-#: src/aosd/aosd_ui.cc:600
+#: src/aosd/aosd_ui.cc:714
 msgid "Enable trigger"
-msgstr "Ieslēgt palaidēju"
+msgstr "Ieslēgt palaidēju/tirgeri"
 
-#: src/aosd/aosd_ui.cc:627
+#: src/aosd/aosd_ui.cc:741
 msgid "Event"
 msgstr "Notikums"
 
-#: src/aosd/aosd_ui.cc:655
+#: src/aosd/aosd_ui.cc:768
 msgid "Composite manager detected"
 msgstr "Kompozitēšanas pārvaldnieks atrasts"
 
-#: src/aosd/aosd_ui.cc:662
+#: src/aosd/aosd_ui.cc:775
 msgid ""
 "Composite manager not detected;\n"
 "unless you know that you have one running, please activate a composite "
@@ -705,60 +484,56 @@
 "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.cc:670
+#: src/aosd/aosd_ui.cc:783
 msgid "Composite manager not required for fake transparency"
 msgstr "Viltus caurspīdībai kompozitēšanas pārvaldnieks nav nepieciešams"
 
-#: src/aosd/aosd_ui.cc:706
+#: src/aosd/aosd_ui.cc:820
 msgid "Transparency"
 msgstr "Caurspīdība"
 
-#: src/aosd/aosd_ui.cc:712
+#: src/aosd/aosd_ui.cc:826
 msgid "Fake transparency"
 msgstr "Viltus caurspīdība"
 
-#: src/aosd/aosd_ui.cc:714
+#: src/aosd/aosd_ui.cc:828
 msgid "Real transparency (requires X Composite Ext.)"
 msgstr "Īsta caurspīdība (nepieciešams X Composite paplašin.)"
 
-#: src/aosd/aosd_ui.cc:756
+#: src/aosd/aosd_ui.cc:875
 msgid "Composite extension not loaded"
 msgstr "Composite paplašinājums nav ielādēts"
 
-#: src/aosd/aosd_ui.cc:764
-msgid "Composite extension not available"
-msgstr "Composite paplašinājums nav pieejams"
-
-#: src/aosd/aosd_ui.cc:781
+#: src/aosd/aosd_ui.cc:892
 #, c-format
 msgid "Audacious OSD"
 msgstr "Audacious OSD"
 
-#: src/aosd/aosd_ui.cc:844
+#: src/aosd/aosd_ui.cc:955
 msgid "Position"
 msgstr "Novietojums"
 
-#: src/aosd/aosd_ui.cc:849
+#: src/aosd/aosd_ui.cc:960
 msgid "Animation"
 msgstr "Animācija"
 
-#: src/aosd/aosd_ui.cc:854
+#: src/aosd/aosd_ui.cc:965
 msgid "Text"
 msgstr "Teksts"
 
-#: src/aosd/aosd_ui.cc:859
+#: src/aosd/aosd_ui.cc:970
 msgid "Decoration"
 msgstr "Noformējums"
 
-#: src/aosd/aosd_ui.cc:864
+#: src/aosd/aosd_ui.cc:975
 msgid "Trigger"
 msgstr "Palaidējs"
 
-#: src/aosd/aosd_ui.cc:869
+#: src/aosd/aosd_ui.cc:980 src/streamtuner/shoutcast-model.cc:202
 msgid "Misc"
 msgstr "Dažādi"
 
-#: src/aosd/aosd_ui.cc:878
+#: src/aosd/aosd_ui.cc:989
 msgid "Test"
 msgstr "Testēt"
 
@@ -774,11 +549,83 @@
 msgid "Audacious Playlists (audpl)"
 msgstr "Audacious repertuāri (audpl)"
 
-#: src/blur_scope/blur_scope.cc:42
+#: src/background_music/background_music.cc:24
+msgid "Background music"
+msgstr ""
+
+#: src/background_music/background_music.cc:25
+msgid "Target level:"
+msgstr ""
+
+#: src/background_music/background_music.cc:28
+#: src/background_music/background_music.cc:33
+#: src/silence-removal/silence-removal.cc:70
+msgid "dB"
+msgstr "dB"
+
+#: src/background_music/background_music.cc:29
+msgid "Maximum amplification:"
+msgstr ""
+
+#: src/background_music/background_music.cc:34 src/mpg123/mpg123.cc:81
+msgid "Advanced"
+msgstr "Paplašināti"
+
+#: src/background_music/background_music.cc:36
+msgid "Slow detection weight:"
+msgstr ""
+
+#: src/background_music/background_music.cc:39
+msgid "Hint"
+msgstr ""
+
+#: src/background_music/background_music.cc:41
+msgid ""
+"Slow detection weight is the relative weight\n"
+"of a long term average detection when compared\n"
+"to the actual, faster loudness detection.\n"
+"A value of zero gives a more radio-like sound\n"
+"where soft passages get \"pulled up\" more quickly,\n"
+"a value of two makes the sound feel less compressed."
+msgstr ""
+
+#: src/background_music/background_music.cc:52
+msgid ""
+"Background Music Plugin for Audacious\n"
+"Copyright 2023;2024 Michel Fleur\n"
+"\n"
+"Controls the volume to make the sound equally loud within and between "
+"tracks.\n"
+" It uses accurate loudness measurement and tries to make the volume changes "
+"sound natural without audible peaks, yet without lowering the volume before "
+"a peak in advance."
+msgstr ""
+
+#: src/background_music/background_music.cc:61
+msgid "Background Music"
+msgstr ""
+
+#: src/bitcrusher/bitcrusher.cc:33
+msgid "Bitcrusher"
+msgstr ""
+
+#: src/bitcrusher/bitcrusher.cc:34
+msgid "Bit Depth:"
+msgstr ""
+
+#: src/bitcrusher/bitcrusher.cc:37
+msgid "Downsample ratio:"
+msgstr ""
+
+#: src/bitcrusher/bitcrusher.cc:48
+msgid "Bitcrusher"
+msgstr ""
+
+#: src/blur_scope/blur_scope.cc:40 src/blur_scope-qt/blur_scope.cc:45
 msgid "Color"
 msgstr "Krāsa"
 
-#: src/blur_scope/blur_scope.cc:58
+#: src/blur_scope/blur_scope.cc:56 src/blur_scope-qt/blur_scope.cc:158
 msgid "Blur Scope"
 msgstr "Blur Scope"
 
@@ -788,11 +635,15 @@
 
 #: src/bs2b/plugin.cc:129
 msgid "Presets:"
-msgstr "Gatavie regulējumi:"
+msgstr "Gatavie regulējumi/iestatījumi:"
+
+#: src/bs2b/plugin.cc:130
+msgid "Default"
+msgstr "Noklusētais"
 
 #: src/bs2b/plugin.cc:136
 msgid "Feed level:"
-msgstr "Barošanas līmenis:"
+msgstr "Ievades līmenis:"
 
 #: src/bs2b/plugin.cc:138
 msgid "x1/10 dB"
@@ -802,15 +653,15 @@
 msgid "Cut frequency:"
 msgstr "Nogriešanas frekvence:"
 
-#: src/cairo-spectrum/cairo-spectrum.cc:41
+#: src/cairo-spectrum/cairo-spectrum.cc:42 src/qt-spectrum/qt-spectrum.cc:107
 msgid "Spectrum Analyzer"
 msgstr "Spektra analizators"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:72
+#: src/cdaudio/cdaudio-ng.cc:74
 msgid "Audio CD Plugin"
 msgstr "Audio CD spraudnis"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:121
+#: src/cdaudio/cdaudio-ng.cc:121
 msgid ""
 "Copyright (C) 2007-2012 Calin Crisan <ccrisan@gmail.com> and others.\n"
 "\n"
@@ -830,132 +681,132 @@
 "\n"
 "Šis bija Google Summer of Code 2007 projekts."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:137
+#: src/cdaudio/cdaudio-ng.cc:140
 msgid "Device"
 msgstr "Ierīce"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:138
+#: src/cdaudio/cdaudio-ng.cc:141
 msgid "Read speed:"
 msgstr "Lasīšanas ātrums:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:141
+#: src/cdaudio/cdaudio-ng.cc:144
 msgid "Override device:"
-msgstr "Aizstāt ierīci:"
+msgstr "Nomākt/aizstāt ierīci:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:143
+#: src/cdaudio/cdaudio-ng.cc:146
 msgid "Metadata"
 msgstr "Metadati"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:144
+#: src/cdaudio/cdaudio-ng.cc:147
 msgid "Use CD-Text"
 msgstr "Lietot CD-text"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:146
+#: src/cdaudio/cdaudio-ng.cc:150
 msgid "Use CDDB"
 msgstr "Lietot CDDB"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:148
+#: src/cdaudio/cdaudio-ng.cc:152
 msgid "Use HTTP instead of CDDBP"
 msgstr "Lietot HTTP nevis CDDBP"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:151
+#: src/cdaudio/cdaudio-ng.cc:155
 msgid "Server:"
 msgstr "Serveris:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:155
+#: src/cdaudio/cdaudio-ng.cc:159
 msgid "Path:"
 msgstr "Ceļš:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:159
+#: src/cdaudio/cdaudio-ng.cc:163
 msgid "Port:"
 msgstr "Ports:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:246
+#: src/cdaudio/cdaudio-ng.cc:228
 msgid "Failed to initialize cdio subsystem."
 msgstr "Neizdevās inicializēt cdio apakšsistēmu."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:281
+#: src/cdaudio/cdaudio-ng.cc:260
 #, c-format
 msgid "Invalid URI %s."
 msgstr "Nederīgs URI %s."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:283
+#: src/cdaudio/cdaudio-ng.cc:262
 #, c-format
 msgid "Track %d not found."
 msgstr "Celiņš %d netika atrasts."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:285
+#: src/cdaudio/cdaudio-ng.cc:264
 #, c-format
 msgid "Track %d is a data track."
 msgstr "Celiņš %d ir datu celiņš."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:360
+#: src/cdaudio/cdaudio-ng.cc:339
 msgid "Error reading audio CD."
 msgstr "Kļūda nolasot audio CD."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:429
+#: src/cdaudio/cdaudio-ng.cc:410
 msgid "Audio CD"
 msgstr "Audio CD"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:460 src/cdaudio-ng/cdaudio-ng.cc:469
+#: src/cdaudio/cdaudio-ng.cc:446 src/cdaudio/cdaudio-ng.cc:455
 #, c-format
 msgid "Failed to open CD device %s."
 msgstr "Neizdevās atvērt CD ierīci %s."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:472
+#: src/cdaudio/cdaudio-ng.cc:458
 msgid "No audio capable CD drive found."
 msgstr "Netika atrasts CD dzinis ar audio atskaņošanas iespēju."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:497
+#: src/cdaudio/cdaudio-ng.cc:481
+msgid "Drive is empty."
+msgstr "Dzinis ir tukšs."
+
+#: src/cdaudio/cdaudio-ng.cc:483
+msgid "Unsupported disk type."
+msgstr "Neatbalstīts diska tips."
+
+#: src/cdaudio/cdaudio-ng.cc:507
 msgid "Failed to finish initializing opened CD drive."
 msgstr "Neizdevās pabeigt inicializēt atvērtu CD dzini."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:510
+#: src/cdaudio/cdaudio-ng.cc:520
 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.cc:531
+#: src/cdaudio/cdaudio-ng.cc:541
 #, 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.cc:613
-msgid "Failed to create the cddb connection."
-msgstr "Neizdevās izveidot cddb savienojumu."
+#: src/cdaudio/cdaudio-ng.cc:624
+msgid "Failed to create the CDDB connection."
+msgstr "Neizdevās izveidot CDDB savienojumu."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:679
+#: src/cdaudio/cdaudio-ng.cc:690
 msgid "Failed to query the CDDB server"
 msgstr "Neizdevās aptaujāt CDDB serveri."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:681
+#: src/cdaudio/cdaudio-ng.cc:692
 #, c-format
 msgid "Failed to query the CDDB server: %s"
 msgstr "Neizdevās aptaujāt CDDB serveri: %s"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:705
+#: src/cdaudio/cdaudio-ng.cc:716
 #, c-format
-msgid "Failed to read the cddb info: %s"
-msgstr "Neizdevās nolasīt cddb informāciju: %s"
-
-#: src/cdaudio-ng/cdaudio-ng.cc:765
-msgid "Drive is empty."
-msgstr "Dzinis ir tukšs."
+msgid "Failed to read the CDDB info: %s"
+msgstr "Neizdevās nolasīt CDDB informāciju: %s"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:767
-msgid "Unsupported disk type."
-msgstr "Neatbalstīts diska tips."
-
-#: src/cd-menu-items/cd-menu-items.cc:35
+#: src/cd-menu-items/cd-menu-items.cc:33
 msgid "Audio CD Menu Items"
 msgstr "Audio CD izvēlnes elementi"
 
-#: src/cd-menu-items/cd-menu-items.cc:47
-msgid "Play CD"
-msgstr "Atskaņot CD"
-
-#: src/cd-menu-items/cd-menu-items.cc:47
-msgid "Add CD"
-msgstr "Pievienot CD"
+#: src/cd-menu-items/cd-menu-items.cc:45
+msgid "Pla_y CD"
+msgstr "_Atskaņot CD"
+
+#: src/cd-menu-items/cd-menu-items.cc:45
+msgid "_Add CD"
+msgstr "Pi_evienot CD"
 
 #: src/compressor/compressor.cc:45
 msgid "Compression"
@@ -1014,7 +865,14 @@
 msgid "Default song length:"
 msgstr "Noklusētais dziesmas garums:"
 
-#: src/console/plugin.cc:42 src/modplug/plugin_main.cc:59
+#: src/console/plugin.cc:41 src/crossfade/crossfade.cc:56
+#: src/crossfade/crossfade.cc:62 src/lirc/lirc.cc:395 src/notify/notify.cc:113
+#: src/sid/xs_config.cc:85 src/sid/xs_config.cc:94 src/sid/xs_config.cc:103
+#: src/vumeter-qt/vumeter_qt.cc:39
+msgid "seconds"
+msgstr "sekundes"
+
+#: src/console/plugin.cc:42 src/modplug/plugin_main.cc:58
 msgid "Resampling"
 msgstr "Iztveršanas tempa pārveidošana"
 
@@ -1028,7 +886,7 @@
 
 #: src/console/plugin.cc:50
 msgid "Ignore length from SPC tags"
-msgstr "Ignorēt garums no SPC tagiem"
+msgstr "Ignorēt garumu no SPC birkām(tagiem)"
 
 #: src/console/plugin.cc:52
 msgid "Increase reverb"
@@ -1038,29 +896,39 @@
 msgid "Game Console Music Decoder"
 msgstr "Spēļu konsoles mūzikas dekodētājs"
 
-#: src/coreaudio/coreaudio.cc:50
+#: src/coreaudio/coreaudio.cc:53
 msgid "CoreAudio output"
 msgstr "CoreAudio izvade"
 
-#: src/coreaudio/coreaudio.cc:131
+#: src/coreaudio/coreaudio.cc:155
 msgid ""
 "CoreAudio Output Plugin for Audacious\n"
 "Copyright 2014 William Pitcock\n"
+"Copyright 2017,18 René J.V. Bertin\n"
+" (original code and code adapted from\n"
+" Apple examples, (C) Apple 2013)\n"
 "\n"
 "Based on SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
 msgstr ""
-"CoreAudio izvades spraudnis atskaņotājam Audacious\n"
-"Autortiesības 2014 William Pitcock\n"
+"CoreAudio Audacious izvades spraudnis\n"
+"Copyright 2014 William Pitcock\n"
+"Copyright 2017,18 René J.V. Bertin\n"
+" (oriģinālais kods un pielāgotais kods no\n"
+" Apple piemēriem, (C) Apple 2013)\n"
 "\n"
-"Bāzēts uz Audacious SDL izvades spraudņa\n"
-"Autortiesības 2010 John Lindgren"
+"Balstīts uz SDL Audacious izvades spraudni\n"
+"Copyright 2010 John Lindgren"
 
-#: src/coreaudio/coreaudio.cc:143
+#: src/coreaudio/coreaudio.cc:171
 msgid "Use exclusive mode"
 msgstr "Izmantot ekskluzīvo režīmu"
 
-#: src/crossfade/crossfade.cc:44
+#: src/coreaudio/coreaudio.cc:173
+msgid "Use bit perfect audio (adapt device sampling rate)"
+msgstr "Izmantot bitu perfektu audio (pielāgot ierīces sampling rate)"
+
+#: src/crossfade/crossfade.cc:47
 msgid ""
 "Crossfade Plugin for Audacious\n"
 "Copyright 2010-2014 John Lindgren"
@@ -1068,27 +936,43 @@
 "Sapludināšanas spraudnis atskaņotājam Audacious\n"
 "Autortiesības 2010-2014 John Lindgren"
 
-#: src/crossfade/crossfade.cc:48
+#: src/crossfade/crossfade.cc:51
 msgid "Crossfade"
 msgstr "Sapludināšana"
 
-#: src/crossfade/crossfade.cc:49
+#: src/crossfade/crossfade.cc:52
 msgid "On automatic song change"
 msgstr "Automātiski mainoties dziesmai"
 
-#: src/crossfade/crossfade.cc:51 src/crossfade/crossfade.cc:57
+#: src/crossfade/crossfade.cc:54 src/crossfade/crossfade.cc:60
 msgid "Overlap:"
 msgstr "Pārklāšanās:"
 
-#: src/crossfade/crossfade.cc:55
+#: src/crossfade/crossfade.cc:58
 msgid "On seek or manual song change"
 msgstr "Meklējot vai pašrocīgi mainot dziesmu"
 
-#: src/crossfade/crossfade.cc:61
+#: src/crossfade/crossfade.cc:64
+msgid "No fade in"
+msgstr ""
+
+#: src/crossfade/crossfade.cc:66
+msgid "Use S-curve fade"
+msgstr ""
+
+#: src/crossfade/crossfade.cc:68
+msgid "S-curve steepness:"
+msgstr ""
+
+#: src/crossfade/crossfade.cc:70
+msgid "(higher is steeper)"
+msgstr ""
+
+#: src/crossfade/crossfade.cc:72
 msgid "Tip"
 msgstr "Padoms"
 
-#: src/crossfade/crossfade.cc:62
+#: src/crossfade/crossfade.cc:73
 msgid ""
 "For better crossfading, enable\n"
 "the Silence Removal effect."
@@ -1096,27 +980,9 @@
 "Labākai sapludināšanai, ieslēdziet\n"
 "klusuma izņemšanas efektu."
 
-#: src/crossfade/crossfade.cc:72
+#: src/crossfade/crossfade.cc:83
 msgid "Crossfade"
-msgstr "Sapludināšana"
-
-#: src/crossfade/crossfade.cc:161
-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."
-
-#: src/crossfade/crossfade.cc:168
-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 diskretizācijas frekvences. "
-"Varat izmantot diskretizācijas frekvenču pārveidotāju, lai pārveidotu "
-"dziesmas uz vienu diskretizācijas frekvenci."
+msgstr "Sapludināšana (pārejas)"
 
 #: src/crystalizer/crystalizer.cc:31
 msgid "Crystalizer"
@@ -1130,62 +996,63 @@
 msgid "Crystalizer"
 msgstr "Kristalizators"
 
-#: src/cue/cue.cc:37
+#: src/cue/cue.cc:42
 msgid "Cue Sheet Plugin"
 msgstr "Cue lapas spraudnis"
 
-#: src/delete-files/delete-files.cc:46 src/delete-files/delete-files.cc:146
+#: src/delete-files/delete-files.cc:53 src/delete-files/delete-files.cc:215
+#: src/delete-files/delete-files.cc:230
 msgid "Delete Files"
 msgstr "Dzēst failus"
 
-#: src/delete-files/delete-files.cc:75
+#: src/delete-files/delete-files.cc:120
+msgid "No files are selected."
+msgstr "Faili nav izvēlēti."
+
+#: src/delete-files/delete-files.cc:125
 #, c-format
-msgid "Error moving %s to trash: %s."
-msgstr "Kļūda pārvietojot %s uz miskasti: %s."
+msgid "Do you want to move %s to the trash?"
+msgstr "Vai vēlaties pārvietot %s uz miskasti?"
 
-#: src/delete-files/delete-files.cc:86
+#: src/delete-files/delete-files.cc:126
 #, c-format
-msgid "Error deleting %s: %s."
-msgstr "Kļūda dzēšot %s: %s."
+msgid "Do you want to permanently delete %s?"
+msgstr "Vai vēlaties neatgriezeniski dzēst %s?"
 
-#: src/delete-files/delete-files.cc:117
+#: src/delete-files/delete-files.cc:133
 #, c-format
-msgid "Error deleting %s: not a local file."
-msgstr "Kļūda dzēšot %s: nav vietējais fails."
+msgid "Do you want to move %d files to the trash?"
+msgstr "Vai vēlaties pārvietot %d failus uz miskasti?"
 
 #: src/delete-files/delete-files.cc:134
-msgid "Do you want to move the selected files to the trash?"
-msgstr "Vai vēlaties izvēlētos failus pārvietot uz miskasti?"
+#, c-format
+msgid "Do you want to permanently delete %d files?"
+msgstr "Vai vēlaties neatgriezeniski dzēst %d failus?"
 
-#: src/delete-files/delete-files.cc:135
-msgid "Move to Trash"
+#: src/delete-files/delete-files.cc:146
+msgid "Move to trash"
 msgstr "Pārvietot uz miskasti"
 
-#: src/delete-files/delete-files.cc:140
-msgid "Do you want to permanently delete the selected files?"
-msgstr "Vai vēlaties izvēlētos failus dzēst uz visiem laikiem?"
-
-#: src/delete-files/delete-files.cc:141 src/skins/preset-list.cc:411
-#: src/skins/preset-list.cc:427
+#: src/delete-files/delete-files.cc:146
 msgid "Delete"
 msgstr "Dzēst"
 
-#: src/delete-files/delete-files.cc:145 src/skins/preset-browser.cc:56
-#: src/skins/preset-list.cc:307 src/skins/ui_playlist.cc:221
+#: src/delete-files/delete-files.cc:213 src/delete-files/delete-files.cc:235
+#: src/skins-qt/search-select.cc:102 src/skins/search-select.cc:78
 msgid "Cancel"
 msgstr "Atcelt"
 
-#: src/delete-files/delete-files.cc:166
+#: src/delete-files/delete-files.cc:267
 msgid "Delete Selected Files"
 msgstr "Dzēst izvēlētos failus"
 
-#: src/delete-files/delete-files.cc:181
+#: src/delete-files/delete-files.cc:287
 msgid "Delete Method"
 msgstr "Dzēšanas metode"
 
-#: src/delete-files/delete-files.cc:182
+#: src/delete-files/delete-files.cc:288
 msgid "Move to trash instead of deleting immediately"
-msgstr "Pārvietot uz miskasti nevis dzēst nekavējoties"
+msgstr "Pārvietot uz miskasti, nevis dzēst nekavējoties"
 
 #: src/echo_plugin/echo.cc:9
 msgid ""
@@ -1204,21 +1071,21 @@
 msgid "Echo"
 msgstr "Atbalss"
 
-#: src/echo_plugin/echo.cc:22 src/modplug/plugin_main.cc:73
-#: src/modplug/plugin_main.cc:83
+#: src/echo_plugin/echo.cc:22 src/modplug/plugin_main.cc:72
+#: src/modplug/plugin_main.cc:82
 msgid "Delay:"
-msgstr "Aizture:"
+msgstr "Aizture/aizkave:"
 
-#: src/echo_plugin/echo.cc:24 src/modplug/plugin_main.cc:73
-#: src/modplug/plugin_main.cc:83
+#: src/echo_plugin/echo.cc:24 src/modplug/plugin_main.cc:72
+#: src/modplug/plugin_main.cc:82 src/xsf/plugin.cc:445
 msgid "ms"
 msgstr "ms"
 
 #: src/echo_plugin/echo.cc:25
 msgid "Feedback:"
-msgstr "Atbilde:"
+msgstr "Atbilde (atgriezeniskā saite):"
 
-#: src/echo_plugin/echo.cc:28 src/modplug/plugin_main.cc:87
+#: src/echo_plugin/echo.cc:28 src/modplug/plugin_main.cc:86
 msgid "Volume:"
 msgstr "Skaļums:"
 
@@ -1226,11 +1093,11 @@
 msgid "Echo"
 msgstr "Atbalss"
 
-#: src/ffaudio/ffaudio-core.cc:41
+#: src/ffaudio/ffaudio-core.cc:50
 msgid "FFmpeg Plugin"
 msgstr "FFmpeg spraudnis"
 
-#: src/ffaudio/ffaudio-core.cc:571
+#: src/ffaudio/ffaudio-core.cc:649
 msgid ""
 "Multi-format audio decoding plugin for Audacious using\n"
 "FFmpeg multimedia framework (http://www.ffmpeg.org/)\n"
@@ -1246,247 +1113,320 @@
 "William Pitcock <nenolod@nenolod.net>\n"
 "Matti Hämäläinen <ccr@tnsp.org>"
 
-#: src/filewriter/filewriter.cc:45
+#: src/filewriter/filewriter.cc:48
 msgid "FileWriter Plugin"
 msgstr "Failu rakstītāja spraudnis"
 
-#: src/filewriter/filewriter.cc:386
+#: src/filewriter/filewriter.cc:316
+#, c-format
+msgid ""
+"Error opening %s:\n"
+"%s"
+msgstr ""
+"Kļūda atverot %s:\n"
+"%s"
+
+#: src/filewriter/filewriter.cc:358
+msgid ""
+"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 ""
+"Šī 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.cc:385
 msgid "Output file format:"
 msgstr "Izvades faila formāts:"
 
-#: src/filewriter/filewriter.cc:403
-msgid "Configure"
-msgstr "Konfigurēt"
-
-#: src/filewriter/filewriter.cc:413
+#: src/filewriter/filewriter.cc:389
 msgid "Save into original directory"
 msgstr "Saglabāt oriģinālajā mapē"
 
-#: src/filewriter/filewriter.cc:417
-msgid "Save into custom directory"
-msgstr "Saglabāt pielāgotā mapē"
-
-#: src/filewriter/filewriter.cc:427
-msgid "Output file folder:"
-msgstr "Izvades faila mape:"
-
-#: src/filewriter/filewriter.cc:431
-msgid "Pick a folder"
-msgstr "Izvēlieties mapi"
+#: src/filewriter/filewriter.cc:392
+msgid "Save into custom directory:"
+msgstr "Saglabāt pielāgotā mapē:"
 
-#: src/filewriter/filewriter.cc:444
+#: src/filewriter/filewriter.cc:400
 msgid "Generate file name from:"
 msgstr "Ģenerēt faila nosaukumu no:"
 
-#: src/filewriter/filewriter.cc:448
-msgid "Original file tag"
-msgstr "Oriģinālais faila tags"
-
-#: src/filewriter/filewriter.cc:453
+#: src/filewriter/filewriter.cc:401
 msgid "Original file name"
 msgstr "Oriģinālais faila nosaukums"
 
-#: src/filewriter/filewriter.cc:459
-msgid "Include original file name extension"
-msgstr "Iekļaut oriģinālo faila nosaukuma paplašinājumu"
+#: src/filewriter/filewriter.cc:404
+msgid "Original file name (no suffix)"
+msgstr "Oriģinālais faila nosaukums (bez sufiksa)"
+
+#: src/filewriter/filewriter.cc:407
+msgid "Original file tag"
+msgstr "Oriģinālais faila tags"
 
-#: src/filewriter/filewriter.cc:468
+#: src/filewriter/filewriter.cc:411
 msgid "Prepend track number to file name"
 msgstr "Pievienot celiņa numuru faila nosaukumam"
 
-#: src/filewriter/filewriter.cc:484
-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 ""
-"Šī 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/mp3.cc:40 src/filewriter/mp3.cc:717
+#: src/filewriter/filewriter.cc:417 src/filewriter/filewriter.cc:449
 msgid "Auto"
 msgstr "Automātiski"
 
-#: src/filewriter/mp3.cc:40
+#: src/filewriter/filewriter.cc:418
+msgid "8000 Hz"
+msgstr "8000 Hz"
+
+#: src/filewriter/filewriter.cc:419
+msgid "11025 Hz"
+msgstr "11025 Hz"
+
+#: src/filewriter/filewriter.cc:420
+msgid "12000 Hz"
+msgstr "12000 Hz"
+
+#: src/filewriter/filewriter.cc:421
+msgid "16000 Hz"
+msgstr "16000 Hz"
+
+#: src/filewriter/filewriter.cc:422
+msgid "22050 Hz"
+msgstr "22050 Hz"
+
+#: src/filewriter/filewriter.cc:423
+msgid "24000 Hz"
+msgstr "24000 Hz"
+
+#: src/filewriter/filewriter.cc:424
+msgid "32000 Hz"
+msgstr "32000 Hz"
+
+#: src/filewriter/filewriter.cc:425 src/xsf/plugin.cc:430
+msgid "44100 Hz"
+msgstr "44100 Hz"
+
+#: src/filewriter/filewriter.cc:426 src/xsf/plugin.cc:431
+msgid "48000 Hz"
+msgstr "48000 Hz"
+
+#: src/filewriter/filewriter.cc:430
+msgid "8 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:431
+msgid "16 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:432
+msgid "32 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:433
+msgid "40 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:434
+msgid "48 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:435
+msgid "56 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:436
+msgid "64 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:437
+msgid "80 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:438
+msgid "96 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:439
+msgid "112 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:440
+msgid "128 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:441
+msgid "160 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:442
+msgid "192 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:443
+msgid "224 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:444
+msgid "256 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:445
+msgid "320 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:450
 msgid "Joint Stereo"
 msgstr "Joint Stereo"
 
-#: src/filewriter/mp3.cc:41 src/modplug/plugin_main.cc:58
-#: src/mpg123/mpg123.cc:248
+#: src/filewriter/filewriter.cc:451 src/modplug/plugin_main.cc:57
+#: src/mpg123/mpg123.cc:259
 msgid "Stereo"
 msgstr "Stereo"
 
-#: src/filewriter/mp3.cc:41 src/modplug/plugin_main.cc:57
-#: src/mpg123/mpg123.cc:248
+#: src/filewriter/filewriter.cc:452 src/modplug/plugin_main.cc:56
+#: src/mpg123/mpg123.cc:260
 msgid "Mono"
 msgstr "Mono"
 
-#: src/filewriter/mp3.cc:657
-msgid "MP3 Configuration"
-msgstr "MP3 konfigurācija"
-
-#: src/filewriter/mp3.cc:658
-msgid "_OK"
-msgstr "_Labi"
+#: src/filewriter/filewriter.cc:456
+msgid "VBR"
+msgstr "VBR"
+
+#: src/filewriter/filewriter.cc:457
+msgid "ABR"
+msgstr "ABR"
 
-#: src/filewriter/mp3.cc:681
-msgid "Algorithm Quality:"
+#: src/filewriter/filewriter.cc:478
+msgid "Algorithm quality:"
 msgstr "Algoritma kvalitāte:"
 
-#: src/filewriter/mp3.cc:706
-msgid "Output Sample Rate:"
-msgstr "Izvades iztveršanas temps:"
-
-#: src/filewriter/mp3.cc:733
-msgid "(Hz)"
-msgstr "(Hz)"
-
-#: src/filewriter/mp3.cc:740
-msgid "Bitrate / Compression Ratio:"
-msgstr "Bitātrums/Kompresijas attiecība:"
-
-#: src/filewriter/mp3.cc:764
-msgid "Bitrate (kbps):"
-msgstr "Bitātrums (kbps):"
+#: src/filewriter/filewriter.cc:484
+msgid "Bitrate:"
+msgstr "Bitreits:"
 
-#: src/filewriter/mp3.cc:796
+#: src/filewriter/filewriter.cc:491
 msgid "Compression ratio:"
-msgstr "Kompresijas attiecība:"
+msgstr "Kompresijas/saspiešanas attiecība:"
 
-#: src/filewriter/mp3.cc:820
-msgid "Audio Mode:"
+#: src/filewriter/filewriter.cc:498
+msgid "Audio mode:"
 msgstr "Audio režīms:"
 
-#: src/filewriter/mp3.cc:845
-msgid "Miscellaneous:"
-msgstr "Dažādi:"
-
-#: src/filewriter/mp3.cc:856
+#: src/filewriter/filewriter.cc:501
 msgid "Enforce strict ISO compliance"
 msgstr "Uzspiest stingru ISO savietojamību"
 
-#: src/filewriter/mp3.cc:867
+#: src/filewriter/filewriter.cc:503
 msgid "Error protection"
-msgstr "Kļūdu aizsardzība"
-
-#: src/filewriter/mp3.cc:879 src/filewriter/vorbis.cc:206
-msgid "Quality"
-msgstr "Kvalitāte"
+msgstr "Aizsardzība pret kļūdām"
 
-#: src/filewriter/mp3.cc:888
+#: src/filewriter/filewriter.cc:508
 msgid "Enable VBR/ABR"
-msgstr "Ieslēgt VBR/ABR"
+msgstr "Iespējot VBR/ABR"
 
-#: src/filewriter/mp3.cc:898
+#: src/filewriter/filewriter.cc:510
 msgid "Type:"
 msgstr "Tips:"
 
-#: src/filewriter/mp3.cc:931
-msgid "VBR Options:"
-msgstr "VBR opcijas:"
-
-#: src/filewriter/mp3.cc:947
-msgid "Minimum bitrate (kbps):"
-msgstr "Minimālais bitātrums (kbps):"
-
-#: src/filewriter/mp3.cc:973
-msgid "Maximum bitrate (kbps):"
-msgstr "Maksimālais bitātrums (kbps):"
-
-#: src/filewriter/mp3.cc:995
-msgid "Strictly enforce minimum bitrate"
-msgstr "Stingri uzspiest minimālo bitātrumu"
-
-#: src/filewriter/mp3.cc:1007
-msgid "ABR Options:"
-msgstr "ABR opcijas:"
-
-#: src/filewriter/mp3.cc:1017
-msgid "Average bitrate (kbps):"
-msgstr "Vidējais bitātrums (kbps):"
+#: src/filewriter/filewriter.cc:514
+msgid "Minimum bitrate:"
+msgstr "Minimālais bitātrums:"
+
+#: src/filewriter/filewriter.cc:518
+msgid "Maximum bitrate:"
+msgstr "Maksimālais bitātrums:"
+
+#: src/filewriter/filewriter.cc:522
+msgid "Average bitrate:"
+msgstr "Vidējais bitātrums:"
 
-#: src/filewriter/mp3.cc:1044
+#: src/filewriter/filewriter.cc:526
 msgid "VBR quality level:"
 msgstr "VBR kvalitātes līmenis:"
 
-#: src/filewriter/mp3.cc:1063
-msgid "Omit Xing VBR header"
-msgstr "Atmest Xing VBR galveni"
+#: src/filewriter/filewriter.cc:530
+msgid "Strictly enforce minimum bitrate"
+msgstr "Stingri uzspiest minimālo bitātrumu"
 
-#: src/filewriter/mp3.cc:1076
-msgid "VBR/ABR"
-msgstr "VBR/ABR"
+#: src/filewriter/filewriter.cc:533
+msgid "Omit Xing VBR header"
+msgstr "Atmest/izlaist Xing VBR galveni"
 
-#: src/filewriter/mp3.cc:1085
-msgid "Frame Parameters:"
-msgstr "Kadra parametri:"
+#: src/filewriter/filewriter.cc:539
+msgid "Frame Headers"
+msgstr "Kadru galvenes"
 
-#: src/filewriter/mp3.cc:1097
+#: src/filewriter/filewriter.cc:540
 msgid "Mark as copyright"
 msgstr "Atzīmēt kā autortiesībām aizsargātu"
 
-#: src/filewriter/mp3.cc:1108
+#: src/filewriter/filewriter.cc:542
 msgid "Mark as original"
 msgstr "Atzīmēt kā oriģinālu"
 
-#: src/filewriter/mp3.cc:1120
-msgid "ID3 Parameters:"
-msgstr "ID3 parametri:"
+#: src/filewriter/filewriter.cc:544
+msgid "ID3 Tags"
+msgstr "ID3 birkas/tagi"
 
-#: src/filewriter/mp3.cc:1131
+#: src/filewriter/filewriter.cc:545
 msgid "Force addition of version 2 tag"
-msgstr "Uzspiest 2. versijas tagu pievienošanu"
+msgstr "Uzspiest 2.versijas birku/tagu pievienošanu"
 
-#: src/filewriter/mp3.cc:1141
+#: src/filewriter/filewriter.cc:547
 msgid "Only add v1 tag"
-msgstr "Pievienot tikai 1. versijas tagu"
+msgstr "Pievienot tikai 1.versijas birku/tagu"
 
-#: src/filewriter/mp3.cc:1148
+#: src/filewriter/filewriter.cc:549
 msgid "Only add v2 tag"
-msgstr "Pievienot tikai 2. versijas tagu"
+msgstr "Pievienot tikai 2.versijas birku/tagu"
 
-#: src/filewriter/mp3.cc:1169
+#: src/filewriter/filewriter.cc:554
+msgid "Quality"
+msgstr "Kvalitāte"
+
+#: src/filewriter/filewriter.cc:555
+msgid "VBR/ABR"
+msgstr "VBR/ABR"
+
+#: src/filewriter/filewriter.cc:556
 msgid "Tags"
-msgstr "Tagi"
+msgstr "Birkas/tagi"
 
-#: src/filewriter/vorbis.cc:196
-msgid "Vorbis Encoder Configuration"
-msgstr "Vorbis kodētāja konfigurācija"
+#: src/filewriter/filewriter.cc:566
+msgid "Quality (0-1):"
+msgstr "Kvalitātes līmenis (0-1):"
 
-#: src/filewriter/vorbis.cc:219
-msgid "Quality level (0 - 10):"
-msgstr "Kvalitātes līmenis (0 - 10):"
+#: src/filewriter/filewriter.cc:573 src/skins-qt/skins_cfg.cc:307
+#: src/skins/skins_cfg.cc:289
+msgid "General"
+msgstr "Vispārīgi"
 
-#: src/flacng/flacng.h:35
+#: src/flac/flacng.h:36
 msgid "FLAC Decoder"
 msgstr "FLAC dekodētājs"
 
-#: src/flacng/metadata.cc:351 src/wavpack/wavpack.cc:209
+#: src/flac/metadata.cc:296 src/wavpack/wavpack.cc:215
 msgid "lossless"
 msgstr "bezzudumu"
 
-#: src/flacng/plugin.cc:169
+#: src/flac/plugin.cc:214
 msgid ""
 "Original code by\n"
 "Ralf Ertzinger <ralf@skytale.net>\n"
@@ -1510,15 +1450,15 @@
 msgid "GIO Plugin"
 msgstr "GIO spraudnis"
 
-#: src/gio/gio.cc:153
+#: src/gio/gio.cc:152
 msgid "Read-and-append mode not supported"
 msgstr "Režīms lasīt-un-pievienot nav atbalstīts"
 
-#: src/gio/gio.cc:166
+#: src/gio/gio.cc:165
 msgid "Invalid open mode"
 msgstr "Neatļauts atvēršanas režīms"
 
-#: src/gl-spectrum/gl-spectrum.cc:51
+#: src/glspectrum/gl-spectrum.cc:52
 msgid ""
 "OpenGL Spectrum Analyzer for Audacious\n"
 "Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
@@ -1538,522 +1478,650 @@
 "\n"
 "Licence: GPLv2+"
 
-#: src/gl-spectrum/gl-spectrum.cc:62
+#: src/glspectrum/gl-spectrum.cc:63 src/qtglspectrum/gl-spectrum.cc:53
 msgid "OpenGL Spectrum Analyzer"
 msgstr "OpenGL spektra analizators"
 
-#: src/gl-spectrum-qt/gl-spectrum.cc:41
-msgid ""
-"OpenGL Spectrum Analyzer for Audacious\n"
-"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
-"Copyright 2014 William Pitcock\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é, John Lindgren un Carlo Bramini\n"
-"Autortiesības 2014 William Pitcock\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-qt/gl-spectrum.cc:53
-msgid "OpenGL Spectrum Analyzer (Qt)"
-msgstr "OpenGL spektra analizators (Qt)"
-
-#: src/gnomeshortcuts/gnomeshortcuts.cc:38
-msgid "GNOME Shortcuts"
-msgstr "GNOME īsceļi"
-
-#: src/gnomeshortcuts/gnomeshortcuts.cc:54
-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"
-"\n"
-"Autortiesības (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>"
-
-#: src/gtkui/columns.cc:35
-msgid "Entry number"
+#: src/gtkui/columns.cc:36 src/moonstone/playlist_model.cc:38
+#: src/qtui/playlist_model.cc:33
+msgid "Entry Number"
 msgstr "Ieraksta numurs"
 
-#: src/gtkui/columns.cc:36 src/playlist-manager/playlist-manager.cc:225
-#: src/qtui/playlist_model.cc:123
+#: src/gtkui/columns.cc:37 src/moonstone/playlist_model.cc:38
+#: src/moonstone/playlist_selection.cc:64
+#: src/playlist-manager/playlist-manager.cc:200
+#: src/playlist-manager-qt/playlist-manager-qt.cc:188
+#: src/qtui/playlist_model.cc:33 src/streamtuner/icecast-model.cc:120
+#: src/streamtuner/ihr-model.cc:159 src/streamtuner/shoutcast-model.cc:122
 msgid "Title"
 msgstr "Nosaukums"
 
-#: src/gtkui/columns.cc:37 src/qtui/playlist_model.cc:125
+#: src/gtkui/columns.cc:38 src/moonstone/playlist_model.cc:39
+#: src/qtui/playlist_model.cc:33
 msgid "Artist"
 msgstr "Izpildītājs"
 
-#: src/gtkui/columns.cc:38
+#: src/gtkui/columns.cc:39 src/moonstone/playlist_model.cc:39
+#: src/qtui/playlist_model.cc:33
 msgid "Year"
 msgstr "Gads"
 
-#: src/gtkui/columns.cc:39 src/qtui/playlist_model.cc:127
+#: src/gtkui/columns.cc:40 src/moonstone/playlist_model.cc:39
+#: src/qtui/playlist_model.cc:34
 msgid "Album"
 msgstr "Albums"
 
-#: src/gtkui/columns.cc:40
-msgid "Album artist"
+#: src/gtkui/columns.cc:41 src/moonstone/playlist_model.cc:40
+#: src/qtui/playlist_model.cc:34
+msgid "Album Artist"
 msgstr "Albuma izpildītājs"
 
-#: src/gtkui/columns.cc:41
+#: src/gtkui/columns.cc:42 src/moonstone/playlist_model.cc:40
+#: src/qtui/playlist_model.cc:34
 msgid "Track"
 msgstr "Celiņš"
 
-#: src/gtkui/columns.cc:42
+#: src/gtkui/columns.cc:43 src/moonstone/playlist_model.cc:40
+#: src/qtui/playlist_model.cc:34 src/streamtuner/icecast-model.cc:123
+#: src/streamtuner/shoutcast-model.cc:125
+#: src/streamtuner/shoutcast-model.cc:236
 msgid "Genre"
 msgstr "Žanrs"
 
-#: src/gtkui/columns.cc:43
-msgid "Queue position"
-msgstr "Novietojums rindā"
+#: src/gtkui/columns.cc:44 src/moonstone/playlist_model.cc:41
+#: src/qtui/playlist_model.cc:35
+msgid "Queue Position"
+msgstr "Vieta rindā"
 
-#: src/gtkui/columns.cc:44
+#: src/gtkui/columns.cc:45 src/moonstone/playlist_model.cc:41
+#: src/qtui/playlist_model.cc:35
 msgid "Length"
 msgstr "Ilgums"
 
-#: src/gtkui/columns.cc:45
-msgid "File path"
+#: src/gtkui/columns.cc:46 src/moonstone/playlist_model.cc:41
+#: src/qtui/playlist_model.cc:35
+msgid "File Path"
 msgstr "Faila ceļš"
 
-#: src/gtkui/columns.cc:47
-msgid "Custom title"
-msgstr "Pielāgots nosaukums"
+#: src/gtkui/columns.cc:47 src/moonstone/playlist_model.cc:42
+#: src/qtui/playlist_model.cc:35
+msgid "File Name"
+msgstr "Faila nosaukums"
 
-#: src/gtkui/columns.cc:48
+#: src/gtkui/columns.cc:48 src/moonstone/playlist_model.cc:42
+#: src/qtui/playlist_model.cc:36
+msgid "Custom Title"
+msgstr "Pielāgotais nosaukums"
+
+#: src/gtkui/columns.cc:49 src/moonstone/playlist_model.cc:42
+#: src/qtui/playlist_model.cc:36 src/streamtuner/icecast-model.cc:129
+#: src/streamtuner/shoutcast-model.cc:134
 msgid "Bitrate"
 msgstr "Bitātrums"
 
-#: src/gtkui/columns.cc:308
+#: src/gtkui/columns.cc:50 src/moonstone/playlist_model.cc:43
+#: src/qtui/playlist_model.cc:36
+msgid "Comment"
+msgstr "Komentārs"
+
+#: src/gtkui/columns.cc:51 src/qtui/playlist_model.cc:36
+msgid "Publisher"
+msgstr "Izdevējs"
+
+#: src/gtkui/columns.cc:52 src/qtui/playlist_model.cc:37
+msgid "Catalog Number"
+msgstr "Kataloga #"
+
+#: src/gtkui/columns.cc:53 src/moonstone/playlist_model.cc:43
+#: src/qtui/playlist_model.cc:37
+msgid "Disc"
+msgstr ""
+
+#: src/gtkui/columns.cc:325
 msgid "Available columns"
 msgstr "Pieejamās kolonnas"
 
-#: src/gtkui/columns.cc:334
+#: src/gtkui/columns.cc:351
 msgid "Displayed columns"
 msgstr "Parādītās kolonnas"
 
-#: src/gtkui/layout.cc:72 src/search-tool/search-tool.cc:40
+#: src/gtkui/layout.cc:74 src/search-tool-qt/search-tool-qt.cc:58
+#: src/search-tool/search-tool.cc:49
 msgid "Search Tool"
 msgstr "Meklēšanas rīks"
 
-#: src/gtkui/layout.cc:167
+#: src/gtkui/layout.cc:170
 msgid "Dock at Left"
 msgstr "Pietauvot pa kreisi"
 
-#: src/gtkui/layout.cc:167
+#: src/gtkui/layout.cc:170
 msgid "Dock at Right"
 msgstr "Pietauvot pa labi"
 
-#: src/gtkui/layout.cc:168
+#: src/gtkui/layout.cc:171
 msgid "Dock at Top"
 msgstr "Pietauvot augšā"
 
-#: src/gtkui/layout.cc:168
+#: src/gtkui/layout.cc:171
 msgid "Dock at Bottom"
 msgstr "Pietauvot apakšā"
 
-#: src/gtkui/layout.cc:168
+#: src/gtkui/layout.cc:171
 msgid "Undock"
 msgstr "Attauvot"
 
-#: src/gtkui/layout.cc:168 src/ladspa/plugin.cc:531
+#: src/gtkui/layout.cc:171 src/ladspa/plugin.cc:540
 msgid "Disable"
 msgstr "Atslēgt"
 
-#: src/gtkui/menus.cc:126 src/qtui/main_window_actions.cc:93
-#: src/statusicon/statusicon.cc:276
+#: src/gtkui/menus.cc:79 src/qtui/menus.cc:107
+#: src/statusicon-qt/statusicon.cc:115 src/statusicon/statusicon.cc:286
 msgid "_Open Files ..."
 msgstr "Atvērt _failus ..."
 
-#: src/gtkui/menus.cc:127
+#: src/gtkui/menus.cc:80 src/qtui/menus.cc:111
 msgid "Open _URL ..."
 msgstr "Atvērt _URL ..."
 
-#: src/gtkui/menus.cc:128 src/qtui/main_window_actions.cc:95
+#: src/gtkui/menus.cc:81 src/qtui/menus.cc:113
 msgid "_Add Files ..."
 msgstr "Pievienot f_ailus ..."
 
-#: src/gtkui/menus.cc:129
+#: src/gtkui/menus.cc:82 src/qtui/menus.cc:118
 msgid "Add U_RL ..."
 msgstr "Pievienot U_RL ..."
 
-#: src/gtkui/menus.cc:131
+#: src/gtkui/menus.cc:84 src/qtui/menus.cc:120
 msgid "Search _Library"
 msgstr "Meklēt _bibliotēkā"
 
-#: src/gtkui/menus.cc:133 src/qtui/main_window_actions.cc:98
+#: src/gtkui/menus.cc:86 src/qtui/menus.cc:123
 msgid "A_bout ..."
 msgstr "_Par ..."
 
-#: src/gtkui/menus.cc:134 src/qtui/main_window_actions.cc:99
+#: src/gtkui/menus.cc:87 src/qtui/menus.cc:125
 msgid "_Settings ..."
 msgstr "I_estatījumi ..."
 
-#: src/gtkui/menus.cc:135 src/qtui/main_window_actions.cc:103
-#: src/statusicon/statusicon.cc:284
+#: src/gtkui/menus.cc:88 src/qtui/menus.cc:131
+#: src/statusicon-qt/statusicon.cc:117 src/statusicon/statusicon.cc:288
 msgid "_Quit"
 msgstr "I_ziet"
 
-#: src/gtkui/menus.cc:139 src/gtkui/menus.cc:262
-#: src/qtui/main_window_actions.cc:107 src/search-tool/search-tool.cc:641
-#: src/statusicon/statusicon.cc:278
+#: src/gtkui/menus.cc:92 src/gtkui/menus.cc:226
+#: src/moonstone/playlist_tabs.cc:306 src/qtui/menus.cc:135
+#: src/qtui/playlist_tabs.cc:331 src/search-tool-qt/search-tool-qt.cc:499
+#: src/search-tool/search-tool.cc:339 src/statusicon-qt/statusicon.cc:109
+#: src/statusicon/statusicon.cc:280
 msgid "_Play"
 msgstr "A_tskaņot"
 
-#: src/gtkui/menus.cc:140 src/qtui/main_window_actions.cc:108
-#: src/statusicon/statusicon.cc:279
+#: src/gtkui/menus.cc:93 src/qtui/menus.cc:137
+#: src/statusicon-qt/statusicon.cc:110 src/statusicon/statusicon.cc:281
 msgid "Paus_e"
 msgstr "Pauz_e"
 
-#: src/gtkui/menus.cc:141 src/qtui/main_window_actions.cc:109
-#: src/statusicon/statusicon.cc:280
+#: src/gtkui/menus.cc:94 src/qtui/menus.cc:139
+#: src/statusicon-qt/statusicon.cc:111 src/statusicon/statusicon.cc:282
 msgid "_Stop"
 msgstr "_Stop"
 
-#: src/gtkui/menus.cc:142 src/qtui/main_window_actions.cc:110
-#: src/statusicon/statusicon.cc:277
+#: src/gtkui/menus.cc:95 src/qtui/menus.cc:141
+#: src/statusicon-qt/statusicon.cc:112 src/statusicon/statusicon.cc:283
 msgid "Pre_vious"
 msgstr "_Iepriekšējais"
 
-#: src/gtkui/menus.cc:143 src/qtui/main_window_actions.cc:111
-#: src/statusicon/statusicon.cc:281
+#: src/gtkui/menus.cc:96 src/qtui/menus.cc:143
+#: src/statusicon-qt/statusicon.cc:113 src/statusicon/statusicon.cc:284
 msgid "_Next"
-msgstr "_Nākamais"
+msgstr "_Nākošais"
+
+#: src/gtkui/menus.cc:97 src/qtui/menus.cc:145 src/skins/menus.cc:114
+#: src/skins-qt/menus.cc:105
+msgid "Previous Album"
+msgstr "Iepriekšējais albūms"
+
+#: src/gtkui/menus.cc:98 src/qtui/menus.cc:146 src/skins/menus.cc:115
+#: src/skins-qt/menus.cc:106
+msgid "Next Album"
+msgstr "Nākošais albūms"
 
-#: src/gtkui/menus.cc:145 src/qtui/main_window_actions.cc:113
+#: src/gtkui/menus.cc:100 src/qtui/menus.cc:148
 msgid "_Repeat"
 msgstr "_Atkārtot"
 
-#: src/gtkui/menus.cc:146 src/qtui/main_window_actions.cc:114
+#: src/gtkui/menus.cc:101 src/qtui/menus.cc:150
 msgid "S_huffle"
 msgstr "_Jaukt"
 
-#: src/gtkui/menus.cc:147 src/qtui/main_window_actions.cc:115
+#: src/gtkui/menus.cc:102 src/qtui/menus.cc:152
+msgid "Shuffle by Albu_m"
+msgstr "Sajaukt pēc albu_ma"
+
+#: src/gtkui/menus.cc:103 src/qtui/menus.cc:155
 msgid "N_o Playlist Advance"
 msgstr "Ne_virzīties uz priekšu repertuārā"
 
-#: src/gtkui/menus.cc:148 src/qtui/main_window_actions.cc:116
+#: src/gtkui/menus.cc:104 src/qtui/menus.cc:157
 msgid "Stop A_fter This Song"
 msgstr "Apt_urēt pēc šīs dziesmas"
 
-#: src/gtkui/menus.cc:150 src/gtkui/menus.cc:247
-#: src/qtui/main_window_actions.cc:118
+#: src/gtkui/menus.cc:106 src/gtkui/menus.cc:210 src/qtui/menus.cc:162
+#: src/qtui/menus.cc:294
 msgid "Song _Info ..."
 msgstr "Dziesmas _info ..."
 
-#: src/gtkui/menus.cc:151
+#: src/gtkui/menus.cc:107
 msgid "Jump to _Time ..."
 msgstr "Pāriet uz _laiku ..."
 
-#: src/gtkui/menus.cc:152
+#: src/gtkui/menus.cc:108
 msgid "_Jump to Song ..."
 msgstr "Pāriet uz _dziesmu ..."
 
-#: src/gtkui/menus.cc:154
+#: src/gtkui/menus.cc:110 src/qtui/menus.cc:165
 msgid "Set Repeat Point _A"
 msgstr "Iestatīt atkārtojuma punktu _A"
 
-#: src/gtkui/menus.cc:155
+#: src/gtkui/menus.cc:111 src/qtui/menus.cc:167
 msgid "Set Repeat Point _B"
 msgstr "Iestatīt atkārtojuma punktu _B"
 
-#: src/gtkui/menus.cc:156
+#: src/gtkui/menus.cc:112 src/qtui/menus.cc:169
 msgid "_Clear Repeat Points"
 msgstr "_Notīrīt atkārtojuma punktus"
 
-#: src/gtkui/menus.cc:160 src/gtkui/menus.cc:167 src/gtkui/menus.cc:183
-#: src/qtui/main_window_actions.cc:122 src/qtui/main_window_actions.cc:129
-#: src/qtui/main_window_actions.cc:145
+#: src/gtkui/menus.cc:116 src/gtkui/menus.cc:123 src/gtkui/menus.cc:141
+#: src/qtui/menus.cc:173 src/qtui/menus.cc:180 src/qtui/menus.cc:198
 msgid "By _Title"
 msgstr "Pēc n_osaukuma"
 
-#: src/gtkui/menus.cc:161 src/qtui/main_window_actions.cc:123
+#: src/gtkui/menus.cc:117 src/qtui/menus.cc:174
 msgid "By _File Name"
 msgstr "Pēc _faila ceļa"
 
-#: src/gtkui/menus.cc:162 src/qtui/main_window_actions.cc:124
+#: src/gtkui/menus.cc:118 src/qtui/menus.cc:175
 msgid "By File _Path"
 msgstr "Pēc faila _ceļa"
 
-#: src/gtkui/menus.cc:166 src/gtkui/menus.cc:182
-#: src/qtui/main_window_actions.cc:128 src/qtui/main_window_actions.cc:144
+#: src/gtkui/menus.cc:122 src/gtkui/menus.cc:140 src/qtui/menus.cc:179
+#: src/qtui/menus.cc:197
 msgid "By Track _Number"
 msgstr "Pēc celiņa _numura"
 
-#: src/gtkui/menus.cc:168 src/gtkui/menus.cc:184
-#: src/qtui/main_window_actions.cc:130 src/qtui/main_window_actions.cc:146
+#: src/gtkui/menus.cc:124 src/gtkui/menus.cc:142 src/qtui/menus.cc:181
+#: src/qtui/menus.cc:199
 msgid "By _Artist"
 msgstr "Pēc _izpildītāja"
 
-#: src/gtkui/menus.cc:169 src/gtkui/menus.cc:185
-#: src/qtui/main_window_actions.cc:131 src/qtui/main_window_actions.cc:147
+#: src/gtkui/menus.cc:125 src/gtkui/menus.cc:143 src/qtui/menus.cc:182
+#: src/qtui/menus.cc:200
 msgid "By Al_bum"
 msgstr "Pēc a_lbuma"
 
-#: src/gtkui/menus.cc:170 src/gtkui/menus.cc:186
-#: src/qtui/main_window_actions.cc:132 src/qtui/main_window_actions.cc:148
+#: src/gtkui/menus.cc:126 src/gtkui/menus.cc:144 src/qtui/menus.cc:183
+#: src/qtui/menus.cc:201
 msgid "By Albu_m Artist"
 msgstr "Pēc albu_ma izpildītāja"
 
-#: src/gtkui/menus.cc:171 src/gtkui/menus.cc:187
-#: src/qtui/main_window_actions.cc:133 src/qtui/main_window_actions.cc:149
+#: src/gtkui/menus.cc:127 src/gtkui/menus.cc:145 src/qtui/menus.cc:184
+#: src/qtui/menus.cc:202
 msgid "By Release _Date"
 msgstr "Pēc izlaišanas _datuma"
 
-#: src/gtkui/menus.cc:172 src/gtkui/menus.cc:188
-#: src/qtui/main_window_actions.cc:134 src/qtui/main_window_actions.cc:150
+#: src/gtkui/menus.cc:128 src/gtkui/menus.cc:146 src/qtui/menus.cc:185
+#: src/qtui/menus.cc:203
 msgid "By _Genre"
 msgstr "Pē_c žanra"
 
-#: src/gtkui/menus.cc:173 src/gtkui/menus.cc:189
-#: src/qtui/main_window_actions.cc:135 src/qtui/main_window_actions.cc:151
+#: src/gtkui/menus.cc:129 src/gtkui/menus.cc:147 src/qtui/menus.cc:186
+#: src/qtui/menus.cc:204
 msgid "By _Length"
 msgstr "Pēc _ilguma"
 
-#: src/gtkui/menus.cc:174 src/gtkui/menus.cc:190
-#: src/qtui/main_window_actions.cc:136 src/qtui/main_window_actions.cc:152
+#: src/gtkui/menus.cc:130 src/gtkui/menus.cc:148 src/qtui/menus.cc:187
+#: src/qtui/menus.cc:205
 msgid "By _File Path"
 msgstr "Pēc _faila ceļa"
 
-#: src/gtkui/menus.cc:175 src/gtkui/menus.cc:191
-#: src/qtui/main_window_actions.cc:137 src/qtui/main_window_actions.cc:153
+#: src/gtkui/menus.cc:131 src/gtkui/menus.cc:149 src/qtui/menus.cc:188
+#: src/qtui/menus.cc:206
 msgid "By _Custom Title"
 msgstr "Pēc _pielāgota nosaukuma"
 
-#: src/gtkui/menus.cc:177 src/gtkui/menus.cc:193
-#: src/qtui/main_window_actions.cc:139 src/qtui/main_window_actions.cc:155
+#: src/gtkui/menus.cc:132 src/gtkui/menus.cc:150 src/qtui/menus.cc:189
+#: src/qtui/menus.cc:207
+msgid "By C_omment"
+msgstr "Pēc _komentāra"
+
+#: src/gtkui/menus.cc:133 src/gtkui/menus.cc:151 src/qtui/menus.cc:190
+#: src/qtui/menus.cc:208
+msgid "By D_isc Number"
+msgstr ""
+
+#: src/gtkui/menus.cc:135 src/gtkui/menus.cc:153 src/qtui/menus.cc:192
+#: src/qtui/menus.cc:210
 msgid "R_everse Order"
 msgstr "Apgri_eztā kārtībā"
 
-#: src/gtkui/menus.cc:178 src/gtkui/menus.cc:194
-#: src/qtui/main_window_actions.cc:140 src/qtui/main_window_actions.cc:156
+#: src/gtkui/menus.cc:136 src/gtkui/menus.cc:154 src/qtui/menus.cc:194
+#: src/qtui/menus.cc:212
 msgid "_Random Order"
 msgstr "Nejaušā _kārtībā"
 
-#: src/gtkui/menus.cc:198 src/qtui/main_window_actions.cc:160
+#: src/gtkui/menus.cc:158 src/qtui/menus.cc:216
 msgid "_Play/Resume"
 msgstr "_Atskaņot/Atsākt"
 
-#: src/gtkui/menus.cc:199 src/gtkui/menus.cc:251
-#: src/qtui/main_window_actions.cc:161
+#: src/gtkui/menus.cc:159 src/qtui/menus.cc:218
 msgid "_Refresh"
 msgstr "A_tsvaidzināt"
 
-#: src/gtkui/menus.cc:201 src/qtui/main_window_actions.cc:163
+#: src/gtkui/menus.cc:161 src/qtui/menus.cc:222
 msgid "_Sort"
 msgstr "_Kārtot"
 
-#: src/gtkui/menus.cc:202 src/qtui/main_window_actions.cc:164
+#: src/gtkui/menus.cc:162 src/qtui/menus.cc:223
 msgid "Sort Se_lected"
 msgstr "Kārtot izvē_lētos"
 
-#: src/gtkui/menus.cc:203 src/qtui/main_window_actions.cc:165
+#: src/gtkui/menus.cc:163 src/qtui/menus.cc:225
 msgid "Remove _Duplicates"
 msgstr "Izņemt _dublikātus"
 
-#: src/gtkui/menus.cc:204 src/qtui/main_window_actions.cc:166
+#: src/gtkui/menus.cc:164 src/qtui/menus.cc:226
 msgid "Remove _Unavailable Files"
 msgstr "Izņemt _nepieejamos failus"
 
-#: src/gtkui/menus.cc:206 src/playlist-manager/playlist-manager.cc:244
-#: src/qtui/main_window_actions.cc:168
+#: src/gtkui/menus.cc:166 src/playlist-manager/playlist-manager.cc:219
+#: src/playlist-manager-qt/playlist-manager-qt.cc:348 src/qtui/menus.cc:229
 msgid "_New"
 msgstr "_Jauns"
 
-#: src/gtkui/menus.cc:207
+#: src/gtkui/menus.cc:167 src/qtui/menus.cc:230
 msgid "Ren_ame ..."
 msgstr "Pā_rdēvēt ..."
 
-#: src/gtkui/menus.cc:208 src/gtkui/menus.cc:264
-#: src/qtui/main_window_actions.cc:170
+#: src/gtkui/menus.cc:168 src/gtkui/menus.cc:228
+#: src/moonstone/playlist_tabs.cc:311 src/qtui/menus.cc:231
+#: src/qtui/playlist_tabs.cc:336
 msgid "Remo_ve"
-msgstr "Izņe_mt"
+msgstr "Noņe_mt/izvākt"
 
-#: src/gtkui/menus.cc:210
+#: src/gtkui/menus.cc:170 src/qtui/menus.cc:233
 msgid "_Import ..."
 msgstr "_Importēt ..."
 
-#: src/gtkui/menus.cc:211
+#: src/gtkui/menus.cc:171 src/qtui/menus.cc:234
 msgid "_Export ..."
 msgstr "_Eksportēt ..."
 
-#: src/gtkui/menus.cc:213
+#: src/gtkui/menus.cc:173 src/qtui/menus.cc:237
 msgid "Playlist _Manager ..."
 msgstr "Reper_tuāru pārvaldnieks ..."
 
-#: src/gtkui/menus.cc:214 src/qtui/main_window_actions.cc:176
+#: src/gtkui/menus.cc:174 src/qtui/menus.cc:239
 msgid "_Queue Manager ..."
 msgstr "Ri_ndas pārvaldnieks ..."
 
-#: src/gtkui/menus.cc:218 src/qtui/main_window_actions.cc:180
+#: src/gtkui/menus.cc:178 src/qtui/menus.cc:243
 msgid "Volume _Up"
 msgstr "_Palielināt skaļumu"
 
-#: src/gtkui/menus.cc:219 src/qtui/main_window_actions.cc:181
+#: src/gtkui/menus.cc:179 src/qtui/menus.cc:245
 msgid "Volume _Down"
 msgstr "_Samazināt skaļumu"
 
-#: src/gtkui/menus.cc:221 src/qtui/main_window_actions.cc:183
-msgid "_Equalizer"
-msgstr "_Balansieris"
+#: src/gtkui/menus.cc:181 src/qtui/menus.cc:249
+msgid "_Equalizer ..."
+msgstr "_Balansieris ..."
 
-#: src/gtkui/menus.cc:223 src/qtui/main_window_actions.cc:185
+#: src/gtkui/menus.cc:182 src/qtui/menus.cc:251
 msgid "E_ffects ..."
 msgstr "E_fekti ..."
 
-#: src/gtkui/menus.cc:227
+#: src/gtkui/menus.cc:184
+msgid "_Record Stream"
+msgstr "Ie_rakstīt straumi"
+
+#: src/gtkui/menus.cc:185
+msgid "Audio _Settings ..."
+msgstr "Audio ie_statījumi ..."
+
+#: src/gtkui/menus.cc:189 src/qtui/menus.cc:260
 msgid "Show _Menu Bar"
 msgstr "Rādīt _izvēlnes joslu"
 
-#: src/gtkui/menus.cc:228
+#: src/gtkui/menus.cc:190 src/qtui/menus.cc:262
 msgid "Show I_nfo Bar"
-msgstr "Rādīt i_nfoapgabalu"
+msgstr "Rādīt i_nfo joslu"
 
-#: src/gtkui/menus.cc:229
+#: src/gtkui/menus.cc:191 src/qtui/menus.cc:264
+msgid "Show Info Bar _Album Art"
+msgstr "Rādīt i_nfo joslas albūma attēlu"
+
+#: src/gtkui/menus.cc:192 src/qtui/menus.cc:266
 msgid "Show Info Bar Vis_ualization"
-msgstr "Rādīt infoapgabala viz_ualizāciju"
+msgstr "Rādīt info joslas viz_ualizāciju"
 
-#: src/gtkui/menus.cc:230
+#: src/gtkui/menus.cc:193 src/qtui/menus.cc:268
 msgid "Show _Status Bar"
-msgstr "Rādīt _stāvokļjoslu"
+msgstr "Rādīt _statusa/stāvokļa joslu"
 
-#: src/gtkui/menus.cc:232
+#: src/gtkui/menus.cc:195 src/qtui/menus.cc:272
 msgid "Show _Remaining Time"
 msgstr "Rādīt a_tlikušo laiku"
 
-#: src/gtkui/menus.cc:234
+#: src/gtkui/menus.cc:197 src/qtui/menus.cc:276 src/skins/menus.cc:157
+#: src/skins-qt/menus.cc:152
 msgid "_Visualizations ..."
 msgstr "_Vizualizācijas ..."
 
-#: src/gtkui/menus.cc:238 src/qtui/main_window_actions.cc:189
+#: src/gtkui/menus.cc:201 src/qtui/menus.cc:280
 msgid "_File"
 msgstr "_Fails"
 
-#: src/gtkui/menus.cc:239 src/qtui/main_window_actions.cc:190
+#: src/gtkui/menus.cc:202 src/qtui/menus.cc:281
 msgid "_Playback"
 msgstr "_Atskaņošana"
 
-#: src/gtkui/menus.cc:240 src/qtui/main_window_actions.cc:191
+#: src/gtkui/menus.cc:203 src/qtui/menus.cc:282
 msgid "P_laylist"
 msgstr "_Repertuārs"
 
-#: src/gtkui/menus.cc:241 src/gtkui/menus.cc:258
-#: src/qtui/main_window_actions.cc:192
+#: src/gtkui/menus.cc:204 src/gtkui/menus.cc:222 src/qtui/menus.cc:283
+#: src/qtui/menus.cc:312
 msgid "_Services"
 msgstr "_Servisi"
 
-#: src/gtkui/menus.cc:242 src/qtui/main_window_actions.cc:193
+#: src/gtkui/menus.cc:205 src/qtui/menus.cc:284
 msgid "_Output"
 msgstr "I_zvade"
 
-#: src/gtkui/menus.cc:243
+#: src/gtkui/menus.cc:206 src/qtui/menus.cc:285
 msgid "_View"
 msgstr "S_kats"
 
-#: src/gtkui/menus.cc:248
+#: src/gtkui/menus.cc:211 src/qtui/menus.cc:296
 msgid "_Queue/Unqueue"
 msgstr "Ie_rindot/Izņ. no rindas"
 
-#: src/gtkui/menus.cc:250
+#: src/gtkui/menus.cc:213 src/qtui/menus.cc:299
 msgid "_Open Containing Folder"
 msgstr "_Atvērt saturošo mapi"
 
-#: src/gtkui/menus.cc:253
+#: src/gtkui/menus.cc:214 src/qtui/menus.cc:301
+msgid "_Refresh Selected"
+msgstr "A_tsvaidzināt izvēlētos"
+
+#: src/gtkui/menus.cc:216 src/qtui/menus.cc:304
 msgid "Cu_t"
 msgstr "_Izgriezt"
 
-#: src/gtkui/menus.cc:254
+#: src/gtkui/menus.cc:217 src/qtui/menus.cc:305
 msgid "_Copy"
 msgstr "_Kopēt"
 
-#: src/gtkui/menus.cc:255
+#: src/gtkui/menus.cc:218 src/qtui/menus.cc:306
 msgid "_Paste"
 msgstr "I_elīmēt"
 
-#: src/gtkui/menus.cc:256
+#: src/gtkui/menus.cc:219 src/qtui/menus.cc:307
+msgid "Paste at _End"
+msgstr "Ielīmēt _beigās"
+
+#: src/gtkui/menus.cc:220 src/qtui/menus.cc:309
 msgid "Select _All"
 msgstr "Iezīmēt _visu"
 
-#: src/gtkui/menus.cc:263
+#: src/gtkui/menus.cc:227 src/moonstone/playlist_tabs.cc:309
+#: src/qtui/playlist_tabs.cc:334
 msgid "_Rename ..."
 msgstr "Pā_rdēvēt ..."
 
-#: src/gtkui/settings.cc:35
+#: src/gtkui/settings.cc:35 src/qtui/settings.cc:59
+msgid "Always"
+msgstr "Vienmēr"
+
+#: src/gtkui/settings.cc:36 src/qtui/settings.cc:60
+msgid "Auto-hide"
+msgstr "Automātiski paslēpt"
+
+#: src/gtkui/settings.cc:37 src/qtui/settings.cc:61
+msgid "Never"
+msgstr "Nekad"
+
+#: src/gtkui/settings.cc:41 src/qtui/settings.cc:64
 msgid "Playlist Tabs"
 msgstr "Repertuāru cilnes"
 
-#: src/gtkui/settings.cc:36
-msgid "Always show tabs"
-msgstr "Vienmēr rādīt cilnes"
+#: src/gtkui/settings.cc:42 src/qtui/settings.cc:65
+msgid "Show playlist tabs:"
+msgstr "Rādīt repertuāra cilnes:"
 
-#: src/gtkui/settings.cc:38
+#: src/gtkui/settings.cc:45 src/qtui/settings.cc:69
 msgid "Show entry counts"
 msgstr "Rādīt ierakstu skaitu"
 
-#: src/gtkui/settings.cc:40
+#: src/gtkui/settings.cc:47 src/qtui/settings.cc:72
 msgid "Show close buttons"
 msgstr "Rādīt aizvēršanas pogas"
 
-#: src/gtkui/settings.cc:42
+#: src/gtkui/settings.cc:49 src/qtui/settings.cc:75
 msgid "Playlist Columns"
 msgstr "Repertuāru kolonnas"
 
-#: src/gtkui/settings.cc:44
+#: src/gtkui/settings.cc:51 src/qtui/settings.cc:77
 msgid "Show column headers"
 msgstr "Rādīt kolonnu galvenes"
 
-#: src/gtkui/settings.cc:46 src/modplug/plugin_main.cc:106
-#: src/skins/skins_cfg.cc:263
-msgid "Miscellaneous"
-msgstr "Dažādi"
+#: src/gtkui/settings.cc:53 src/qtui/settings.cc:82
+msgid "Make column headers clickable for sorting"
+msgstr ""
 
-#: src/gtkui/settings.cc:47
-msgid "Arrow keys seek by:"
-msgstr "Kursortaustiņi meklē pa:"
+#: src/gtkui/settings.cc:56
+msgid "Use symbolic icons in toolbar"
+msgstr ""
 
-#: src/gtkui/settings.cc:50
+#: src/gtkui/settings.cc:58 src/qtui/settings.cc:86
 msgid "Scroll on song change"
 msgstr "Ritināt dziesmām mainoties"
 
-#: src/gtkui/ui_gtk.cc:71
+#: src/gtkui/ui_gtk.cc:82
 msgid "GTK Interface"
 msgstr "GTK saskarne"
 
-#: src/gtkui/ui_gtk.cc:222 src/skins/ui_main.cc:232
+#: src/gtkui/ui_gtk.cc:219 src/skins/main.cc:228 src/skins-qt/main.cc:231
 #, c-format
 msgid "%s - Audacious"
 msgstr "%s - Audacious"
 
-#: src/gtkui/ui_gtk.cc:225 src/qtui/main_window.cc:186
+#: src/gtkui/ui_gtk.cc:221 src/moonstone/main_window.cc:184
+#: src/qtui/main_window.cc:385
 msgid "Buffering ..."
 msgstr "Buferizācija ..."
 
-#: src/gtkui/ui_gtk.cc:228 src/skins/ui_main.cc:234 src/skins/ui_main.cc:1164
+#: src/gtkui/ui_gtk.cc:224 src/pipewire/pipewire.cc:402 src/skins/main.cc:230
+#: src/skins-qt/main.cc:233
 msgid "Audacious"
 msgstr "Audacious"
 
-#: src/gtkui/ui_statusbar.cc:63 src/qtui/status_bar.cc:67
+#: src/gtkui/ui_gtk.cc:487 src/gtkui/ui_gtk.cc:518 src/gtkui/ui_gtk.cc:882
+#: src/hotkey/gui.cc:72 src/moonstone/main_window.cc:67
+#: src/moonstone/main_window.cc:145 src/moonstone/main_window.cc:146
+#: src/notify/osd.cc:85 src/qthotkey/gui.cc:67 src/qtui/main_window.cc:154
+#: src/qtui/main_window.cc:347 src/qtui/main_window.cc:348
+#: src/skins/menus.cc:109 src/skins-qt/menus.cc:100
+msgid "Play"
+msgstr "Atskaņot"
+
+#: src/gtkui/ui_gtk.cc:487 src/moonstone/main_window.cc:151
+#: src/moonstone/main_window.cc:152 src/notify/osd.cc:82
+#: src/qtui/main_window.cc:353 src/qtui/main_window.cc:354
+#: src/skins/menus.cc:110 src/skins-qt/menus.cc:101
+msgid "Pause"
+msgstr "Pauze"
+
+#: src/gtkui/ui_gtk.cc:868 src/moonstone/main_window.cc:57
+#: src/qtui/main_window.cc:145 src/skins/menus.cc:86 src/skins-qt/menus.cc:77
+msgid "Search Library"
+msgstr "Meklēt bibliotēkā"
+
+#: src/gtkui/ui_gtk.cc:875 src/moonstone/main_window.cc:60
+#: src/qtui/main_window.cc:147
+msgid "Open Files"
+msgstr "Atvērt failus"
+
+#: src/gtkui/ui_gtk.cc:876 src/moonstone/main_window.cc:62
+#: src/qtui/main_window.cc:149
+msgid "Add Files"
+msgstr "Pievienot failus"
+
+#: src/gtkui/ui_gtk.cc:881 src/moonstone/main_window.cc:65
+#: src/qtui/main_window.cc:152 src/skins/menus.cc:112 src/skins-qt/menus.cc:103
+msgid "Previous"
+msgstr "Iepriekšējais"
+
+#: src/gtkui/ui_gtk.cc:883 src/hotkey/gui.cc:74 src/moonstone/main_window.cc:69
+#: src/qthotkey/gui.cc:69 src/qtui/main_window.cc:156 src/skins/menus.cc:111
+#: src/skins-qt/menus.cc:102
+msgid "Stop"
+msgstr "Stop"
+
+#: src/gtkui/ui_gtk.cc:884 src/moonstone/main_window.cc:76 src/notify/osd.cc:89
+#: src/qtui/main_window.cc:163 src/skins/menus.cc:113 src/skins-qt/menus.cc:104
+msgid "Next"
+msgstr "Nākošais"
+
+#: src/gtkui/ui_gtk.cc:886 src/moonstone/main_window.cc:79
+#: src/qtui/main_window.cc:166 src/qtui/menus.cc:254 src/skins/menus.cc:79
+#: src/skins-qt/menus.cc:69
+msgid "Record Stream"
+msgstr "Ierakstīt straumi"
+
+#: src/gtkui/ui_gtk.cc:919 src/moonstone/main_window.cc:86
+#: src/qtui/main_window.cc:173 src/skins/menus.cc:103 src/skins-qt/menus.cc:94
+msgid "Repeat"
+msgstr "Atkārtot"
+
+#: src/gtkui/ui_gtk.cc:922 src/moonstone/main_window.cc:89
+#: src/qtui/main_window.cc:176 src/skins/menus.cc:104 src/skins-qt/menus.cc:95
+msgid "Shuffle"
+msgstr "Jaukt"
+
+#: src/gtkui/ui_gtk.cc:1114 src/qtui/main_window.cc:123
+msgid "Menu"
+msgstr "Izvēlne"
+
+#: src/gtkui/ui_statusbar.cc:64 src/qtui/status_bar.cc:155
 msgid "mono"
 msgstr "mono"
 
-#: src/gtkui/ui_statusbar.cc:65 src/qtui/status_bar.cc:69
+#: src/gtkui/ui_statusbar.cc:66 src/qtui/status_bar.cc:157
 msgid "stereo"
 msgstr "stereo"
 
-#: src/gtkui/ui_statusbar.cc:67 src/qtui/status_bar.cc:71
+#: src/gtkui/ui_statusbar.cc:68 src/qtui/status_bar.cc:160
 #, c-format
 msgid "%d channel"
 msgid_plural "%d channels"
@@ -2061,113 +2129,107 @@
 msgstr1 "%d kanāli"
 msgstr2 "%d kanālu"
 
-#: src/gtkui/ui_statusbar.cc:81 src/qtui/status_bar.cc:85
+#: src/gtkui/ui_statusbar.cc:76 src/qtui/status_bar.cc:168
+#, c-format
+msgid "%d kHz"
+msgstr "%d kHz"
+
+#: src/gtkui/ui_statusbar.cc:82 src/qtui/status_bar.cc:174
 #, c-format
-msgid "%d kbps"
-msgstr "%d kbps"
+msgid "%d kbit/s"
+msgstr "%d kbit/s"
 
-#: src/gtkui/ui_statusbar.cc:107 src/skins/ui_main_evlisteners.cc:103
+#: src/gtkui/ui_statusbar.cc:108 src/skins/main.cc:478 src/skins-qt/main.cc:461
 msgid "Single mode."
 msgstr "Vieninstances režīms."
 
-#: src/gtkui/ui_statusbar.cc:109 src/skins/ui_main_evlisteners.cc:105
+#: src/gtkui/ui_statusbar.cc:110 src/skins/main.cc:480 src/skins-qt/main.cc:463
 msgid "Playlist mode."
 msgstr "Repertuāra režīms."
 
-#: src/gtkui/ui_statusbar.cc:117 src/skins/ui_main_evlisteners.cc:111
+#: src/gtkui/ui_statusbar.cc:118 src/skins/main.cc:486 src/skins-qt/main.cc:469
 msgid "Stopping after song."
 msgstr "Aptur pēc pašreizējās dziesmas."
 
-#: src/hotkey/gui.cc:71
+#: src/hotkey/gui.cc:71 src/qthotkey/gui.cc:66
 msgid "Previous track"
 msgstr "Iepriekšējais celiņš"
 
-#: src/hotkey/gui.cc:72 src/notify/osd.cc:69 src/qtui/main_window.cc:69
-#: src/qtui/main_window.cc:172 src/qtui/main_window.cc:173
-#: src/skins/menus.cc:87
-msgid "Play"
-msgstr "Atskaņot"
-
-#: src/hotkey/gui.cc:73
+#: src/hotkey/gui.cc:73 src/qthotkey/gui.cc:68
 msgid "Pause/Resume"
 msgstr "Pauze/Atsākt"
 
-#: src/hotkey/gui.cc:74 src/qtui/main_window.cc:70 src/skins/menus.cc:89
-msgid "Stop"
-msgstr "Stop"
-
-#: src/hotkey/gui.cc:75
+#: src/hotkey/gui.cc:75 src/qthotkey/gui.cc:70
 msgid "Next track"
 msgstr "Nākamais celiņš"
 
-#: src/hotkey/gui.cc:76
-msgid "Forward 5 seconds"
-msgstr "Uz priekšu par 5 sekundēm"
-
-#: src/hotkey/gui.cc:77
-msgid "Rewind 5 seconds"
-msgstr "Atpakaļ par 5 sekundēm"
+#: src/hotkey/gui.cc:76 src/qthotkey/gui.cc:71
+msgid "Step forward"
+msgstr "Soli uz priekšu"
+
+#: src/hotkey/gui.cc:77 src/qthotkey/gui.cc:72
+msgid "Step backward"
+msgstr "Soli atpakaļ"
 
-#: src/hotkey/gui.cc:78
+#: src/hotkey/gui.cc:78 src/qthotkey/gui.cc:73
 msgid "Mute"
 msgstr "Apklusināt"
 
-#: src/hotkey/gui.cc:79
+#: src/hotkey/gui.cc:79 src/qthotkey/gui.cc:74
 msgid "Volume up"
 msgstr "Skaļāk"
 
-#: src/hotkey/gui.cc:80
+#: src/hotkey/gui.cc:80 src/qthotkey/gui.cc:75
 msgid "Volume down"
 msgstr "Klusāk"
 
-#: src/hotkey/gui.cc:81
+#: src/hotkey/gui.cc:81 src/qthotkey/gui.cc:76
 msgid "Jump to file"
 msgstr "Pāriet uz failu"
 
-#: src/hotkey/gui.cc:82
+#: src/hotkey/gui.cc:82 src/qthotkey/gui.cc:77
 msgid "Toggle player window(s)"
 msgstr "Pārslēgt atskaņotāja logu(s)"
 
-#: src/hotkey/gui.cc:83
+#: src/hotkey/gui.cc:83 src/qthotkey/gui.cc:78
 msgid "Show On-Screen-Display"
 msgstr "Parādīt virsekrāna displeju"
 
-#: src/hotkey/gui.cc:84
+#: src/hotkey/gui.cc:84 src/qthotkey/gui.cc:79
 msgid "Toggle repeat"
 msgstr "Pārslēgt atkārtošanu"
 
-#: src/hotkey/gui.cc:85
+#: src/hotkey/gui.cc:85 src/qthotkey/gui.cc:80
 msgid "Toggle shuffle"
 msgstr "Pārslēgt jaukšanu"
 
-#: src/hotkey/gui.cc:86
+#: src/hotkey/gui.cc:86 src/qthotkey/gui.cc:81
 msgid "Toggle stop after current"
 msgstr "Pārslēgt atkārtošanu pēc pašreizējā"
 
-#: src/hotkey/gui.cc:87
+#: src/hotkey/gui.cc:87 src/qthotkey/gui.cc:82
 msgid "Raise player window(s)"
 msgstr "Pacelt atskaņotāja logu(s)"
 
-#: src/hotkey/gui.cc:97
+#: src/hotkey/gui.cc:98 src/qthotkey/gui.cc:100
 msgid "(none)"
 msgstr "(nekas)"
 
-#: src/hotkey/gui.cc:234
+#: src/hotkey/gui.cc:261
 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 modifiers.\n"
 "\n"
 "Do you want to continue?"
 msgstr ""
-"Nav ieteicams piesaistīt primārās peles pogas bez modificētājtaustiņiem.\n"
+"Nav ieteicams piesaistīt galvenās peles pogas bez modifikatoriem.\n"
 "\n"
-"Vai vēlaties turpināt?"
+"Vēlaties turpināt?"
 
-#: src/hotkey/gui.cc:236
+#: src/hotkey/gui.cc:264
 msgid "Binding mouse buttons"
 msgstr "Piesaista peles pogas"
 
-#: src/hotkey/gui.cc:391
+#: src/hotkey/gui.cc:434
 msgid ""
 "Press a key combination inside a text field.\n"
 "You can also bind mouse buttons."
@@ -2175,72 +2237,100 @@
 "Nospiediet taustiņu kombināciju teksta laukā.\n"
 "Jūs varat piesaistīt arī peles pogas."
 
-#: src/hotkey/gui.cc:396
+#: src/hotkey/gui.cc:444 src/qthotkey/gui.cc:179
 msgid "Hotkeys:"
 msgstr "Īsinājumtaustiņi:"
 
-#: src/hotkey/gui.cc:413
+#: src/hotkey/gui.cc:457 src/qthotkey/gui.cc:181
 msgid "Action:"
 msgstr "Darbība:"
 
-#: src/hotkey/gui.cc:420
+#: src/hotkey/gui.cc:461 src/qthotkey/gui.cc:182
 msgid "Key Binding:"
 msgstr "Taustiņa piesaiste:"
 
-#: src/hotkey/gui.cc:468
+#: src/hotkey/gui.cc:518 src/qthotkey/gui.cc:184
 msgid "_Add"
 msgstr "Pi_evienot"
 
-#: src/hotkey/plugin.cc:61
+#: src/hotkey/plugin.cc:59 src/qthotkey/plugin.cc:78
 msgid "Global Hotkeys"
 msgstr "Globālie īsinājumtaustiņi"
 
-#: src/hotkey/plugin.cc:79
+#: src/hotkey/plugin.cc:74
 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"
+"Contributors 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 ""
-"Globālo īsinājumtaustiņu spraudnis\n"
-"Kontrolējiet atskaņotāju ar globālām taustiņu kombinācijām vai multitvides\n"
+"Global Hotkey Plugin (Globālo īstaustiņu spraudnis)\n"
+"Ļauj vadīt atskaņotāju ar globālām taustiņu kombinācijām vai multivides "
 "taustiņiem.\n"
 "\n"
-"Autortiesības (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n"
+"Copyright (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"
+"Piedalījušies arī:\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/jack-ng/jack-ng.cc:49
+#: src/jack/jack-ng.cc:54
 msgid "JACK Output"
 msgstr "JACK izvade"
 
-#: src/jack-ng/jack-ng.cc:114
+#: src/jack/jack-ng.cc:126
+msgid "Client name:"
+msgstr "Klienta nosaukums:"
+
+#: src/jack/jack-ng.cc:128
 msgid "Automatically connect to output ports"
 msgstr "Automātiski pieslēgties izvades portiem"
 
-#: src/jack-ng/jack-ng.cc:155
+#: src/jack/jack-ng.cc:130
+msgid "Filter ports (regex, use any port if blank):"
+msgstr "Filtrēt portus (regex, izmantojot jebkuru brīvu portu):"
+
+#: src/jack/jack-ng.cc:136
+msgid "Connect to physical ports only"
+msgstr "Pievienoties tikai fiziskiem portiem"
+
+#: src/jack/jack-ng.cc:139
+msgid "Upmix to"
+msgstr "Paaugstinoša mikserēšana uz"
+
+#: src/jack/jack-ng.cc:141
+msgid "ports if input has fewer channels"
+msgstr "portiem, ja ievadei ir mazāk kanālu"
+
+#: src/jack/jack-ng.cc:143
+msgid "Ignore insufficient number of ports"
+msgstr "Ignorēt nepietiekamu portu skaitu"
+
+#: src/jack/jack-ng.cc:181
+msgid "No JACK output ports were found. Please check settings."
+msgstr "Netika atrasti JACK izvades porti. Lūdzu, pārbaudiet iestatījumus."
+
+#: src/jack/jack-ng.cc:195
 #, c-format
 msgid "Only %d JACK output ports were found but %d are required."
 msgstr "Tika atrasti tikai %d JACK izvades porti, bet vajadzīgi %d."
 
-#: src/jack-ng/jack-ng.cc:164
+#: src/jack/jack-ng.cc:210
 #, c-format
 msgid "Failed to connect to JACK port %s."
 msgstr "Neizdevās pieslēgties JACK portam %s."
 
-#: src/jack-ng/jack-ng.cc:184
+#: src/jack/jack-ng.cc:230
 msgid ""
 "JACK supports only floating-point audio. You must change the output bit "
 "depth to floating-point in Audacious settings."
@@ -2248,11 +2338,11 @@
 "JACK atbalsta tikai peldošā punkta audio. Jums Audacious iestatījumos "
 "jāizmaina izvades dziļums uz 'peldošā punkta'."
 
-#: src/jack-ng/jack-ng.cc:197
+#: src/jack/jack-ng.cc:245
 msgid "Failed to connect to the JACK server; is it running?"
 msgstr "Neizdevās pieslēgties JACK serverim, vai tas ir palaists?"
 
-#: src/jack-ng/jack-ng.cc:273
+#: src/jack/jack-ng.cc:321
 #, c-format
 msgid ""
 "The JACK server requires a sample rate of %d Hz, but Audacious is playing at "
@@ -2262,16 +2352,16 @@
 "atskaņo %d Hz. Lūdzu, izmantojiet diskretizācijas frekvences pārveidotāja "
 "efektu, lai izlabotu nesakritību."
 
-#: src/ladspa/plugin.cc:414
+#: src/ladspa/plugin.cc:416
 #, c-format
 msgid "%s Settings"
 msgstr "%s iestatījumi"
 
-#: src/ladspa/plugin.cc:478
+#: src/ladspa/plugin.cc:482
 msgid "Module paths:"
 msgstr "Moduļu ceļi:"
 
-#: src/ladspa/plugin.cc:483
+#: src/ladspa/plugin.cc:487
 msgid ""
 "Separate multiple paths with a colon.\n"
 "These paths are searched in addition to LADSPA_PATH.\n"
@@ -2282,41 +2372,41 @@
 "Pēc jauno ceļu pievienošanas nospiediet 'Enter', lai skenētu jaunos "
 "spraudņus."
 
-#: src/ladspa/plugin.cc:499
+#: src/ladspa/plugin.cc:508
 msgid "Available plugins:"
 msgstr "Pieejamie spraudņi:"
 
-#: src/ladspa/plugin.cc:512 src/modplug/plugin_main.cc:92
-#: src/modplug/plugin_main.cc:95 src/modplug/plugin_main.cc:98
-#: src/modplug/plugin_main.cc:101
+#: src/ladspa/plugin.cc:521 src/modplug/plugin_main.cc:91
+#: src/modplug/plugin_main.cc:94 src/modplug/plugin_main.cc:97
+#: src/modplug/plugin_main.cc:100
 msgid "Enable"
-msgstr "Ieslēgt"
+msgstr "Iespējot/ieslēgt"
 
-#: src/ladspa/plugin.cc:518
+#: src/ladspa/plugin.cc:527
 msgid "Enabled plugins:"
-msgstr "Ieslēgtie spraudņi:"
+msgstr "Iespējotie spraudņi:"
 
-#: src/ladspa/plugin.cc:534
+#: src/ladspa/plugin.cc:543
 msgid "Settings"
 msgstr "Iestatījumi"
 
-#: src/ladspa/plugin.cc:551
+#: src/ladspa/plugin.cc:560
 msgid ""
 "LADSPA Host for Audacious\n"
 "Copyright 2011 John Lindgren"
 msgstr ""
-"LADSPA saimnieks atskaņotājam Audacious\n"
-"Autortiesības 2011 John Lindgren"
+"LADSPA hosts priekš Audacious\n"
+"Copyright 2011 John Lindgren"
 
 #: src/ladspa/plugin.h:78
 msgid "LADSPA Host"
-msgstr "LADSPA saimnieks"
+msgstr "LADSPA hosts"
 
 #: src/lirc/lirc.cc:55
 msgid "LIRC Plugin"
 msgstr "LIRC spraudnis"
 
-#: src/lirc/lirc.cc:381
+#: src/lirc/lirc.cc:379
 msgid ""
 "A simple plugin to control Audacious using the LIRC remote control daemon\n"
 "\n"
@@ -2345,63 +2435,123 @@
 "\n"
 "Papildu informācijai par LIRC skatiet http://lirc.org."
 
-#: src/lirc/lirc.cc:392
+#: src/lirc/lirc.cc:390
 msgid "Connection"
 msgstr "Savienojums"
 
-#: src/lirc/lirc.cc:393
+#: src/lirc/lirc.cc:391
 msgid "Reconnect to LIRC server"
 msgstr "Pieslēgties vēlreiz LIRC serverim"
 
-#: src/lirc/lirc.cc:395
+#: src/lirc/lirc.cc:393
 msgid "Wait before reconnecting:"
 msgstr "Gaidīt, pirms atkārtoti pieslēgties:"
 
-#: src/lyricwiki/lyricwiki.cc:41
-msgid "LyricWiki Plugin"
-msgstr "LyricWiki spraudnis"
-
-#: src/lyricwiki/lyricwiki.cc:131 src/lyricwiki-qt/lyricwiki.cc:136
-msgid "No lyrics available"
-msgstr "Dziesmu vārdu teksti nav pieejami"
-
-#: src/lyricwiki/lyricwiki.cc:217 src/lyricwiki/lyricwiki.cc:226
-#: src/lyricwiki/lyricwiki.cc:243 src/lyricwiki/lyricwiki.cc:252
-#: src/lyricwiki/lyricwiki.cc:267 src/lyricwiki-qt/lyricwiki.cc:222
-#: src/lyricwiki-qt/lyricwiki.cc:231 src/lyricwiki-qt/lyricwiki.cc:248
-#: src/lyricwiki-qt/lyricwiki.cc:257 src/lyricwiki-qt/lyricwiki.cc:272
-msgid "Error"
-msgstr "Kļūda"
-
-#: src/lyricwiki/lyricwiki.cc:218 src/lyricwiki/lyricwiki.cc:244
-#: src/lyricwiki-qt/lyricwiki.cc:223 src/lyricwiki-qt/lyricwiki.cc:249
+#: src/lyrics-common/chart_lyrics_provider.cc:93
+#: src/lyrics-common/chart_lyrics_provider.cc:150
+#: src/lyrics-common/lyrics_ovh_provider.cc:50
 #, c-format
 msgid "Unable to fetch %s"
 msgstr "Neizdevās saņemt %s"
 
-#: src/lyricwiki/lyricwiki.cc:227 src/lyricwiki/lyricwiki.cc:253
-#: src/lyricwiki-qt/lyricwiki.cc:232 src/lyricwiki-qt/lyricwiki.cc:258
+#: src/lyrics-common/chart_lyrics_provider.cc:100
+#: src/lyrics-common/chart_lyrics_provider.cc:157
+#: src/lyrics-common/lyrics_ovh_provider.cc:57
 #, c-format
 msgid "Unable to parse %s"
-msgstr "Neizdevās parsēt %s"
+msgstr "Neizdevās apstrādāt (pārsēt) %s"
 
-#: src/lyricwiki/lyricwiki.cc:259 src/lyricwiki-qt/lyricwiki.cc:264
+#: src/lyrics-common/chart_lyrics_provider.cc:121
+#: src/lyrics-common/chart_lyrics_provider.cc:194
+#: src/lyrics-common/lyrics_ovh_provider.cc:88
 msgid "Looking for lyrics ..."
 msgstr "Meklē dziesmas vārdu tekstu ..."
 
-#: src/lyricwiki/lyricwiki.cc:267 src/lyricwiki-qt/lyricwiki.cc:272
-msgid "Missing song metadata"
-msgstr "Trūkst dziesmas metadatu"
-
-#: src/lyricwiki/lyricwiki.cc:278 src/lyricwiki-qt/lyricwiki.cc:283
-msgid "Connecting to lyrics.wikia.com ..."
-msgstr "Pieslēdzas lyrics.wikia.com ..."
-
-#: src/lyricwiki-qt/lyricwiki.cc:55
-msgid "LyricWiki Plugin (Qt)"
-msgstr "LyricWiki spraudnis (Qt)"
+#: src/lyrics-common/preferences.h:43
+msgid "Nowhere"
+msgstr "Nekur"
+
+#: src/lyrics-common/preferences.h:49
+msgid "Artist is truncated at the start, Title -- at the end"
+msgstr "Izpildītājs tiek saīsināts sākumā, Nosaukums -- beigās"
+
+#: src/lyrics-common/preferences.h:50
+msgid "Chars to truncate on:"
+msgstr "Rakstuzīmes saīsināt uz:?"
+
+#: src/lyrics-common/preferences.h:54
+msgid "Chars are ORed in RegExp, surrounded by whitespace"
+msgstr "Rakstzīmes ir ORed iekš RegExp, atstarpju ieskautas"
+
+#: src/lyrics-common/preferences.h:55
+msgid "Chars to split on:"
+msgstr "Rakstzīmes uz kurām dalīt:"
+
+#: src/lyrics-common/preferences.h:56
+msgid "Further truncate those on chars"
+msgstr "Turpmāk saīsināt/apgriezt šos uz rakstzīmēm"
+
+#: src/lyrics-common/preferences.h:62
+msgid "General"
+msgstr "Vispārīgs"
+
+#: src/lyrics-common/preferences.h:63
+msgid "Split title into artist and title on chars"
+msgstr "Sadalīt nosaukumu izpildītājā un nosaukumā, uz rakstzīmēm"
+
+#: src/lyrics-common/preferences.h:66
+msgid "Sources"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:67
+msgid "Use embedded lyrics (from Lyrics tag)"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:69
+msgid "Fetch lyrics from internet:"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:72
+msgid "Store fetched lyrics in local cache"
+msgstr "Ielādētos dziesmu vārdus saglabāt lokālajā kešatmiņā"
+
+#: src/lyrics-common/preferences.h:74
+msgid "Local Storage"
+msgstr "Lokālā failu noliktava"
+
+#: src/lyrics-common/preferences.h:75
+msgid "Load lyric files (.lrc) from local storage"
+msgstr "Ielādēt dziesmu vārdu failus (.lrc) no lokālās noliktavas"
 
-#: src/m3u/m3u.cc:32
+#: src/lyrics-common/utils.cc:54 src/ui-common/dialogs-qt.cc:63
+msgid "Error"
+msgstr "Kļūda"
+
+#: src/lyrics-common/utils.cc:60
+msgid "Lyrics could not be found."
+msgstr "Dziesmas vārdi netika atrasti."
+
+#: src/lyrics-common/utils.cc:142
+msgid "Missing title and/or artist."
+msgstr "Trūkst nosaukuma un/vai izpildītāja."
+
+#: src/lyrics-gtk/lyrics-gtk.cc:37 src/lyrics-qt/lyrics-qt.cc:50
+msgid "Lyrics"
+msgstr "Dziesmu vārdi"
+
+#: src/lyrics-gtk/lyrics-gtk.cc:189 src/lyrics-qt/lyrics-qt.cc:171
+msgid "Edit Lyrics ..."
+msgstr ""
+
+#: src/lyrics-gtk/lyrics-gtk.cc:195 src/lyrics-qt/lyrics-qt.cc:178
+msgid "Save Locally"
+msgstr "Saglabāt lokāli."
+
+#: src/lyrics-gtk/lyrics-gtk.cc:201 src/lyrics-qt/lyrics-qt.cc:186
+msgid "Refresh"
+msgstr "Aktualizēt"
+
+#: src/m3u/m3u.cc:33
 msgid "M3U Playlists"
 msgstr "M3U repertuāri"
 
@@ -2409,17 +2559,17 @@
 msgid "Tact Generator"
 msgstr "Takts ģenerators"
 
-#: src/metronom/metronom.cc:147
+#: src/metronom/metronom.cc:145
 #, c-format
 msgid "Tact generator: %d bpm"
 msgstr "Takts ģenerators: %d sit./min."
 
-#: src/metronom/metronom.cc:149
+#: src/metronom/metronom.cc:147
 #, c-format
 msgid "Tact generator: %d bpm %d/%d"
 msgstr "Takts ģenerators: %d sit./min. %d/%d"
 
-#: src/metronom/metronom.cc:237
+#: src/metronom/metronom.cc:235
 msgid ""
 "A Tact Generator by Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
 "\n"
@@ -2433,11 +2583,11 @@
 "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/mixer/mixer.cc:38
+#: src/mixer/mixer.cc:43
 msgid "Channel Mixer"
 msgstr "Kanālu mikseris"
 
-#: src/mixer/mixer.cc:202
+#: src/mixer/mixer.cc:255
 msgid ""
 "Channel Mixer Plugin for Audacious\n"
 "Copyright 2011-2012 John Lindgren and Michał Lipski"
@@ -2445,11 +2595,11 @@
 "Kanālu miksera spraudnis atskaņotājam Audacious\n"
 "Autortiesības 2011-2012 John Lindgren un Michał Lipski"
 
-#: src/mixer/mixer.cc:206
+#: src/mixer/mixer.cc:259
 msgid "Channel Mixer"
 msgstr "Kanālu mikseris"
 
-#: src/mixer/mixer.cc:207
+#: src/mixer/mixer.cc:260
 msgid "Output channels:"
 msgstr "Izvades kanāli:"
 
@@ -2461,168 +2611,176 @@
 msgid "Error connecting to MMS server"
 msgstr "Kļūda pieslēdzoties MMS serverim"
 
-#: src/modplug/modplugbmp.h:53
+#: src/modplug/modplugbmp.h:57
 msgid "ModPlug (Module Player)"
 msgstr "ModPlug (moduļu atskaņotājs)"
 
-#: src/modplug/plugin_main.cc:53
-msgid "Resolution"
-msgstr "Izšķirtspēja"
-
-#: src/modplug/plugin_main.cc:54
-msgid "8-bit"
-msgstr "8-bit"
-
 #: src/modplug/plugin_main.cc:55
-msgid "16-bit"
-msgstr "16-bit"
-
-#: src/modplug/plugin_main.cc:56
 msgid "Channels"
 msgstr "Kanāli"
 
-#: src/modplug/plugin_main.cc:60
+#: src/modplug/plugin_main.cc:59
 msgid "Nearest (fastest)"
 msgstr "Tuvākais (ātrākais)"
 
-#: src/modplug/plugin_main.cc:61
+#: src/modplug/plugin_main.cc:60
 msgid "Linear (fast)"
 msgstr "Lineārs (ātrs)"
 
-#: src/modplug/plugin_main.cc:62
+#: src/modplug/plugin_main.cc:61
 msgid "Spline (good)"
 msgstr "Splaina (labs)"
 
-#: src/modplug/plugin_main.cc:63
+#: src/modplug/plugin_main.cc:62
 msgid "Polyphase (best)"
 msgstr "Polifāzes (labākais)"
 
-#: src/modplug/plugin_main.cc:64
+#: src/modplug/plugin_main.cc:63
 msgid "Sample rate"
 msgstr "Iztveršanas temps"
 
-#: src/modplug/plugin_main.cc:65
+#: src/modplug/plugin_main.cc:64
 msgid "22 kHz"
 msgstr "22 kHz"
 
-#: src/modplug/plugin_main.cc:66
+#: src/modplug/plugin_main.cc:65
 msgid "44 kHz"
 msgstr "44 kHz"
 
-#: src/modplug/plugin_main.cc:67
+#: src/modplug/plugin_main.cc:66
 msgid "48 kHz"
 msgstr "48 kHz"
 
-#: src/modplug/plugin_main.cc:68
+#: src/modplug/plugin_main.cc:67
 msgid "96 kHz"
 msgstr "96 kHz"
 
-#: src/modplug/plugin_main.cc:72 src/modplug/plugin_main.cc:77
-#: src/modplug/plugin_main.cc:82
+#: src/modplug/plugin_main.cc:71 src/modplug/plugin_main.cc:76
+#: src/modplug/plugin_main.cc:81
 msgid "Level:"
 msgstr "Līmenis:"
 
-#: src/modplug/plugin_main.cc:78
+#: src/modplug/plugin_main.cc:77
 msgid "Cutoff:"
 msgstr "Nogriešana:"
 
-#: src/modplug/plugin_main.cc:91
+#: src/modplug/plugin_main.cc:90
 msgid "Reverb"
 msgstr "Atbalss"
 
-#: src/modplug/plugin_main.cc:94
+#: src/modplug/plugin_main.cc:93
 msgid "Bass Boost"
 msgstr "Basu pastiprinājums"
 
-#: src/modplug/plugin_main.cc:97
+#: src/modplug/plugin_main.cc:96
 msgid "Surround"
 msgstr "Ieskaušana"
 
-#: src/modplug/plugin_main.cc:100
+#: src/modplug/plugin_main.cc:99
 msgid "Preamp"
 msgstr "Priekšpastiprinājums"
 
-#: src/modplug/plugin_main.cc:107
+#: src/modplug/plugin_main.cc:106
 msgid "Oversample"
 msgstr "Pārdiskretizācija"
 
-#: src/modplug/plugin_main.cc:108
+#: src/modplug/plugin_main.cc:107
 msgid "Noise reduction"
 msgstr "Trokšņu samazināšana"
 
-#: src/modplug/plugin_main.cc:109
+#: src/modplug/plugin_main.cc:108
 msgid "Play Amiga MODs"
 msgstr "Atskaņot Amiga MOD-us"
 
-#: src/modplug/plugin_main.cc:110
+#: src/modplug/plugin_main.cc:109
 msgid "Repeat"
 msgstr "Atkārtot"
 
-#: src/modplug/plugin_main.cc:111
+#: src/modplug/plugin_main.cc:110
 msgid "Repeat count:"
 msgstr "Atkārtojumu skaits:"
 
-#: src/modplug/plugin_main.cc:112
+#: src/modplug/plugin_main.cc:111
 msgid "To repeat forever, set the repeat count to -1."
-msgstr "Lai atkārtotu bezgalīgi, iestaties skaitu uz -1."
+msgstr "Lai atkārtotu bezgalīgi, iestatiet skaitu -1."
 
-#: src/modplug/plugin_main.cc:125 src/sid/xs_config.cc:106
+#: src/modplug/plugin_main.cc:124 src/sid/xs_config.cc:106
 msgid "These settings will take effect when Audacious is restarted."
-msgstr "Šie iestatījumi stāsies spēkā, pārstartējot Audacious."
+msgstr "Šie iestatījumi būs spēkā, pārstartējot Audacious."
+
+#: src/moonstone/main_window.cc:72 src/moonstone/main_window.cc:73
+#: src/qtui/main_window.cc:159 src/qtui/main_window.cc:160
+#: src/skins/menus.cc:107 src/skins-qt/menus.cc:98
+msgid "Stop After This Song"
+msgstr "Apturēt pēc pašreizējās dziesmas"
+
+#: src/moonstone/moonstone.cc:39
+msgid "Moonstone"
+msgstr "Mēnessakmens"
+
+#: src/moonstone/playlist_header.cc:212 src/qtui/playlist_header.cc:258
+msgid "Reset to Defaults"
+msgstr "Atstatīt uz noklusējumu"
+
+#: src/moonstone/playlist_model.cc:38 src/qtui/playlist_header.cc:232
+msgid "Now Playing"
+msgstr "Pašreiz atskaņo"
+
+#: src/moonstone/playlist_selection.cc:66
+#: src/playlist-manager/playlist-manager.cc:201
+#: src/playlist-manager-qt/playlist-manager-qt.cc:190
+msgid "Entries"
+msgstr "Ieraksti"
 
 #: src/mpg123/mpg123.cc:54
 msgid "MPG123 Plugin"
 msgstr "MPG123 spraudnis"
 
-#: src/mpg123/mpg123.cc:83
-msgid "Advanced"
-msgstr "Paplašināti"
-
-#: src/mpg123/mpg123.cc:84
+#: src/mpg123/mpg123.cc:82
 msgid "Use accurate length calculation (slow)"
 msgstr "Lietot precīzo ilguma aprēķināšanu (lēni)"
 
-#: src/mpg123/mpg123.cc:248
+#: src/mpg123/mpg123.cc:260
 msgid "Surround"
-msgstr "Ieskaušana"
+msgstr "Surround skaņa"
 
-#: src/mpris2/plugin.cc:39
+#: src/mpris2/plugin.cc:40
 msgid "MPRIS 2 Server"
 msgstr "MPRIS 2 serveris"
 
-#: src/neon/neon.cc:97
+#: src/neon/neon.cc:102
 msgid "Neon HTTP/HTTPS Plugin"
 msgstr "Neon HTTP/HTTPS spraudnis"
 
-#: src/neon/neon.cc:521
+#: src/neon/neon.cc:526
 msgid "Error parsing redirect"
 msgstr "Kļūda parsējot pārvirzi"
 
-#: src/neon/neon.cc:535
+#: src/neon/neon.cc:540
 msgid "Unknown HTTP error"
 msgstr "Nezināma HTTP kļūda"
 
-#: src/neon/neon.cc:569
+#: src/neon/neon.cc:614
 msgid "Error parsing URL"
 msgstr "Kļūda parsējot URL"
 
-#: src/neon/neon.cc:632
+#: src/neon/neon.cc:687
 msgid "Too many redirects"
 msgstr "Pārāk daudz pārviržu"
 
-#: src/notify/event.cc:64
+#: src/notify/event.cc:97
 msgid "Stopped"
 msgstr "Apturēts"
 
-#: src/notify/event.cc:64
+#: src/notify/event.cc:97
 msgid "Audacious is not playing."
 msgstr "Audacious pašreiz neatskaņo."
 
-#: src/notify/notify.cc:42
+#: src/notify/notify.cc:39
 msgid "Desktop Notifications"
 msgstr "Darbvirsmas paziņojumi"
 
-#: src/notify/notify.cc:60
+#: src/notify/notify.cc:57
 msgid ""
 "Desktop Notifications Plugin for Audacious\n"
 "Copyright (C) 2010 Maximilian Bogner\n"
@@ -2657,36 +2815,79 @@
 "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.cc:110
+#: src/notify/notify.cc:104
 msgid "Show playback controls"
-msgstr "Rādīt atskaņošanas vadīklas"
+msgstr "Rādīt atskaņošanas vadīkļus"
 
-#: src/notify/notify.cc:112
+#: src/notify/notify.cc:106
 msgid "Always show notification"
 msgstr "Vienmēr rādīt paziņojumu"
 
-#: src/notify/notify.cc:114
+#: src/notify/notify.cc:108
 msgid "Include album name in notification"
 msgstr "Paziņojumā iekļaut albuma nosaukumu"
 
-#: src/notify/osd.cc:58
+#: src/notify/notify.cc:110
+msgid "Custom notification duration:"
+msgstr "Pielāgotā paziņojuma ilgums:"
+
+#: src/notify/osd.cc:74
 msgid "Show"
 msgstr "Rādīt"
 
-#: src/notify/osd.cc:66 src/qtui/main_window.cc:178
-#: src/qtui/main_window.cc:179 src/skins/menus.cc:88
-msgid "Pause"
-msgstr "Pauze"
+#: src/openmpt/mpt.cc:50
+msgid "OpenMPT (Module Player)"
+msgstr "OpenMPT (moduļu atskaņotājs)"
 
-#: src/notify/osd.cc:73 src/qtui/main_window.cc:72 src/skins/menus.cc:91
-msgid "Next"
-msgstr "Nākamais"
+#: src/openmpt/mpt.cc:132
+msgid ""
+"Module player based on libopenmpt\n"
+"\n"
+"Written by: Chris Spiegel <cspiegel@gmail.com>"
+msgstr ""
+"Moduļu atskaņotājs, bāzēts uz libopenmpt\n"
+"\n"
+"Sarakstījis: Chris Spiegel <cspiegel@gmail.com>"
+
+#: src/openmpt/mpt.cc:151
+msgid "Stereo separation:"
+msgstr "Stereo celiņu atdalīšana:"
 
-#: src/oss4/oss.h:93
+#: src/openmpt/mpt.cc:153
+msgid "% (0=mono, 100=default, 200=full)"
+msgstr ""
+
+#: src/openmpt/mpt.cc:157
+msgid "Interpolation:"
+msgstr "Interpolācija:"
+
+#: src/openmpt/mptwrap.h:51 src/soxr/sox-resampler.cc:189 src/xsf/plugin.cc:437
+msgid "Linear"
+msgstr "Linēārā"
+
+#: src/openmpt/mptwrap.h:52
+msgid "Cubic"
+msgstr "Kubiskā"
+
+#: src/openmpt/mptwrap.h:53
+msgid "Windowed sinc"
+msgstr "Ielogota sinc (sinhronizācija)"
+
+#: src/opus/opus.cc:39
+msgid "Opus Decoder"
+msgstr ""
+
+#: src/opus/opus.cc:336
+msgid ""
+"Opus Decoder Plugin for Audacious\n"
+"Copyright 2022 Thomas Lange"
+msgstr ""
+
+#: src/oss4/oss.h:70
 msgid "OSS4 Output"
 msgstr "OSS4 izvade"
 
-#: src/oss4/oss.h:95
+#: src/oss4/oss.h:72
 msgid "OSS3 Output"
 msgstr "OSS3 izvade"
 
@@ -2694,27 +2895,27 @@
 msgid "Default device"
 msgstr "Noklusētā ierīce"
 
-#: src/oss4/plugin.cc:77
+#: src/oss4/plugin.cc:78
 msgid "Audio device:"
 msgstr "Audio ierīce:"
 
-#: src/oss4/plugin.cc:80
+#: src/oss4/plugin.cc:81
 msgid "Use alternate device:"
 msgstr "Lietot citu ierīci:"
 
-#: src/oss4/plugin.cc:84
+#: src/oss4/plugin.cc:85
 msgid "Save volume between sessions."
 msgstr "Saglabāt skaļumu starp sesijām."
 
-#: src/oss4/plugin.cc:86
+#: src/oss4/plugin.cc:87
 msgid "Enable format conversions made by the OSS software."
 msgstr "Ieslēgt OSS programmatūras veiktās formāta pārveides."
 
-#: src/oss4/plugin.cc:88
+#: src/oss4/plugin.cc:89
 msgid "Enable exclusive mode to prevent virtual mixing."
-msgstr "Ieslēgt izņēmuma režīmu, lai novērstu virtuālo miksēšanu."
+msgstr "Iespējot/ieslēgt izņēmuma režīmu, lai novērstu virtuālo miksēšanu."
 
-#: src/oss4/plugin.cc:100
+#: src/oss4/plugin.cc:101
 msgid ""
 "OSS4 Output Plugin for Audacious\n"
 "Copyright 2010-2012 Michał Lipski\n"
@@ -2728,19 +2929,35 @@
 "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/playlist-manager/playlist-manager.cc:37
+#: src/pipewire/pipewire.cc:44
+msgid "PipeWire Output"
+msgstr ""
+
+#: src/pipewire/pipewire.cc:118
+msgid ""
+"PipeWire Output Plugin for Audacious\n"
+"Copyright 2022 Thomas Lange\n"
+"\n"
+"Based on the PipeWire Output Plugin for Qmmp\n"
+"Copyright 2021 Ilya Kotov"
+msgstr ""
+
+#: src/pipewire/pipewire.cc:408 src/skins/menus.cc:88 src/skins-qt/menus.cc:79
+msgid "Playback"
+msgstr "Atskaņošana"
+
+#: src/playlist-manager/playlist-manager.cc:38
+#: src/playlist-manager-qt/playlist-manager-qt.cc:42
 msgid "Playlist Manager"
 msgstr "Repertuāru pārvaldnieks"
 
-#: src/playlist-manager/playlist-manager.cc:226
-msgid "Entries"
-msgstr "Ieraksti"
-
-#: src/playlist-manager/playlist-manager.cc:245
+#: src/playlist-manager/playlist-manager.cc:221
+#: src/playlist-manager-qt/playlist-manager-qt.cc:356
 msgid "_Remove"
-msgstr "_Izņemt"
+msgstr "_Noņemt/izvākt"
 
-#: src/playlist-manager/playlist-manager.cc:246
+#: src/playlist-manager/playlist-manager.cc:222
+#: src/playlist-manager-qt/playlist-manager-qt.cc:351
 msgid "Ren_ame"
 msgstr "Pār_dēvēt"
 
@@ -2748,32 +2965,47 @@
 msgid "PLS Playlists"
 msgstr "PLS repertuāri"
 
-#: src/psf/plugin.cc:45
+#: src/psf/plugin.cc:53
 msgid "OpenPSF PSF1/PSF2 Decoder"
 msgstr "OpenPSF PSF1/PSF2 dekodētājs"
 
-#: src/pulse_audio/pulse_audio.cc:38
+#: src/psf/plugin.cc:270
+msgid "OpenPSF Configuration"
+msgstr "OpenPSF konfigurācija"
+
+#: src/psf/plugin.cc:271 src/xsf/plugin.cc:444
+msgid "Ignore length from file"
+msgstr "Ignorēt ilgumu no faila"
+
+#: src/pulse/pulse_audio.cc:42
 msgid "PulseAudio Output"
 msgstr "PulseAudio izvade"
 
-#: src/pulse_audio/pulse_audio.cc:611
+#: src/pulse/pulse_audio.cc:84
+msgid "Context name:"
+msgstr "Konteksta nosaukums:"
+
+#: src/pulse/pulse_audio.cc:86
+msgid "Stream name:"
+msgstr "Straumes nosaukums:"
+
+#: src/pulse/pulse_audio.cc:596
 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."
+"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 ""
 "Audacious PulseAudio izvades spraudnis\n"
 "\n"
@@ -2790,11 +3022,11 @@
 "Ja tā nav, rakstiet uz Free Software Foundation, Inc., 51 Franklin Street,\n"
 "Fifth Floor, Boston, MA 02110-1301, USA."
 
-#: src/qtaudio/qtaudio.cc:49
+#: src/qtaudio/qtaudio.cc:53
 msgid "QtMultimedia Output"
 msgstr "QtMultimedia izvade"
 
-#: src/qtaudio/qtaudio.cc:77
+#: src/qtaudio/qtaudio.cc:84
 msgid ""
 "QtMultimedia Audio Output Plugin for Audacious\n"
 "Copyright 2014 William Pitcock\n"
@@ -2808,53 +3040,112 @@
 "Bāzēts uz Audacious SDL izvades spraudņa\n"
 "Autortiesības 2010 John Lindgren"
 
-#: src/qtui/dialog_windows.cc:31
-msgid "Working ..."
-msgstr "Darbojas ..."
+#: src/qtglspectrum/gl-spectrum.cc:41
+msgid ""
+"OpenGL Spectrum Analyzer for Audacious\n"
+"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
+"Copyright 2014, 2020 Ariadne Conill\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 (OpenGL spektra analizators priekš "
+"Audacious)\n"
+"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
+"Copyright 2014, 2020 Ariadne Conill\n"
+"\n"
+"Balstīts uz XMMS spraudni:\n"
+"Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson, and "
+"4Front Technologies\n"
+"\n"
+"Licence: GPLv2+"
 
-#: src/qtui/filter_input.cc:44 src/skins/ui_playlist.cc:221
-msgid "Search"
-msgstr "Meklēt"
+#: src/qthotkey/gui.cc:177
+msgid "Press a key combination inside a text field."
+msgstr "Nospiediet taustiņu kombināciju teksta laukā."
 
-#: src/qtui/main_window_actions.cc:94
+#: src/qthotkey/plugin.cc:105
+msgid ""
+"Global Hotkey Plugin\n"
+"Control the player with global key combinations or multimedia keys.\n"
+"\n"
+"Copyright (C) 2020 i.Dark_Templar <darktemplar@dark-templar-archives.net>\n"
+"Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n"
+"\n"
+"Contributors 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 Plugin\n"
+"Control the player with global key combinations or multimedia keys.\n"
+"\n"
+"Copyright (C) 2020 i.Dark_Templar <darktemplar@dark-templar-archives.net>\n"
+"Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n"
+"\n"
+"Contributors 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/qtui/menus.cc:109
 msgid "_Open Folder ..."
 msgstr "_Atvērt mapi ..."
 
-#: src/qtui/main_window_actions.cc:96
+#: src/qtui/menus.cc:115
 msgid "_Add Folder ..."
 msgstr "_Pievienot mapi ..."
 
-#: src/qtui/main_window_actions.cc:101
+#: src/qtui/menus.cc:128
 msgid "_Log Inspector ..."
 msgstr "Ž_urnāla inspektors ..."
 
-#: src/qtui/main_window.cc:64
-msgid "Open Files"
-msgstr "Atvērt failus"
+#: src/qtui/menus.cc:220
+msgid "_Find ..."
+msgstr "A_trast ..."
 
-#: src/qtui/main_window.cc:66
-msgid "Add Files"
-msgstr "Pievienot failus"
+#: src/qtui/menus.cc:256 src/skins/menus.cc:80 src/skins-qt/menus.cc:70
+msgid "Audio Settings ..."
+msgstr "Audio iestatījumi ..."
 
-#: src/qtui/main_window.cc:71 src/skins/menus.cc:90
-msgid "Previous"
-msgstr "Iepriekšējais"
+#: src/qtui/playlist_model.cc:188
+msgid "Q#"
+msgstr "R#"
 
-#: src/qtui/main_window.cc:77 src/skins/menus.cc:82
-msgid "Repeat"
-msgstr "Atkārtot"
+#: src/qtui/playlist_model.cc:190
+msgid "T#"
+msgstr "C#"
 
-#: src/qtui/main_window.cc:79 src/skins/menus.cc:83
-msgid "Shuffle"
-msgstr "Jaukt"
+#: src/qtui/playlist_model.cc:192
+msgid "C#"
+msgstr ""
+
+#: src/qtui/playlist_model.cc:194
+msgid "D#"
+msgstr ""
 
-#: src/qtui/qtui.cc:42
+#: src/qtui/qtui.cc:40
 msgid "Qt Interface"
 msgstr "Qt saskarne"
 
+#: src/qtui/search_bar.cc:46
+msgid "Search playlist"
+msgstr "Meklēt repertuāru"
+
+#: src/qtui/settings.cc:79
+msgid "Use bold font for column headers"
+msgstr "Izmantot treknrakstu kolonu galvenēm/virsrakstiem"
+
 #: src/resample/resample.cc:43
 msgid "Sample Rate Converter"
-msgstr "Diskretizācijas frekvences pārveidotājs"
+msgstr "Diskretizācijas frekvences (sample rate) pārveidotājs"
 
 #: src/resample/resample.cc:183
 msgid ""
@@ -2893,9 +3184,9 @@
 msgid "Method:"
 msgstr "Metode:"
 
-#: src/resample/resample.cc:199 src/sox-resampler/sox-resampler.cc:161
+#: src/resample/resample.cc:199 src/soxr/sox-resampler.cc:203
 msgid "Rate:"
-msgstr "Temps:"
+msgstr "Temps (rate):"
 
 #: src/resample/resample.cc:202
 msgid "Rate Mappings"
@@ -2945,64 +3236,53 @@
 msgid "192 kHz:"
 msgstr "192 kHz:"
 
-#: src/scrobbler2/config_window.cc:41
-#, c-format
-msgid "OK. Scrobbling for user: %s"
-msgstr "Labi. Nosūta atskaņojumu lietotājam: %s"
-
-#: src/scrobbler2/config_window.cc:54
-msgid "Permission Denied"
-msgstr "Pieeja liegta"
+#: src/scrobbler2/config_window.cc:29
+msgid "Checking Last.fm access ..."
+msgstr "Pārbauda Last.fm piekļuvi ..."
 
-#: src/scrobbler2/config_window.cc:56
-msgid "Access the following link to allow Audacious to scrobble your plays:"
+#: src/scrobbler2/config_window.cc:35
+msgid ""
+"Your scrobbles are being saved on your computer temporarily. They will be "
+"submitted as soon as Audacious is allowed access."
 msgstr ""
-"Nospiediet uz sekojošās saites, lai ļautu Audacious nosūtīt jūsu "
-"atskaņojumus:"
+"Jūsu atskaņojumi pagaidām ir saglabāti jūsu datorā.\n"
+"Tie tiks nosūtīti tiklīdz Audacious tiks atļauta piekļuve."
 
-#: src/scrobbler2/config_window.cc:66
-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/scrobbler2/config_window.cc:41
+#, c-format
+msgid "Permission granted. Scrobbling for user %s."
+msgstr "Piekļuves atļauja dota. Nosūta atskaņojumu lietotājam: %s"
 
-#: src/scrobbler2/config_window.cc:69 src/scrobbler2/config_window.cc:80
+#: src/scrobbler2/config_window.cc:44
 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."
+"Permission denied. Open the following URL in a browser, allow Audacious "
+"access to your account, and then click 'Check Permission' again:"
 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."
+"Piekļuves atļauja liegta. Atveriet sekojošo URL pārlūkā, dodiet Audacious "
+"piekļuvi jūsu kontam un tad noklikšķiniet uz \"Pārbaudīt piekļuvi\" vēlreiz:"
 
-#: src/scrobbler2/config_window.cc:77
-msgid "Network Problem."
-msgstr "Tīkla problēma."
+#: src/scrobbler2/config_window.cc:53
+msgid "There was a problem contacting Last.fm."
+msgstr "Radās problēma, sazinoties ar Last.fm."
 
-#: src/scrobbler2/config_window.cc:78
-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/scrobbler2/config_window.cc:92
+msgid "Check Permission"
+msgstr "Pārbaudīt piekļuvi"
 
-#: src/scrobbler2/config_window.cc:110
-msgid "Checking..."
-msgstr "Pārbauda..."
+#: src/scrobbler2/config_window.cc:93
+msgid "Revoke Permission"
+msgstr "Atcelt piekļuves atļauju"
 
-#: src/scrobbler2/config_window.cc:176
-msgid "C_heck Permission"
-msgstr "Pār_baudīt pieeju"
-
-#: src/scrobbler2/config_window.cc:177
-msgid "_Revoke Permission"
-msgstr "At_celt pieeju"
-
-#: src/scrobbler2/config_window.cc:220
-msgid ""
-"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/config_window.cc:97
+msgid "You need to allow Audacious to scrobble tracks to your Last.fm account."
+msgstr ""
+"Jums jādod atļauja Audacious nosūtīt atskaņojumu uz savu Last.fm kontu."
 
 #: src/scrobbler2/scrobbler.cc:29
 msgid "Scrobbler 2.0"
-msgstr "Atskaņojumu nosūtītājs 2.0"
+msgstr "Atskaņojumu nosūtītājs (Scrobbler) 2.0"
 
-#: src/scrobbler2/scrobbler.cc:224
+#: src/scrobbler2/scrobbler.cc:200
 msgid ""
 "The Scrobbler plugin could not be started.\n"
 "There might be a problem with your installation."
@@ -3010,36 +3290,21 @@
 "Neizdevās palaist atskaņojumu nosūtītāja spraudni.\n"
 "Iespējams, jūsu instalācijā radusies problēma."
 
-#: src/scrobbler2/scrobbler.cc:289
+#: src/scrobbler2/scrobbler.cc:245
 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"
-
-#: src/scrobbler2/scrobbler_communication.cc:642
-msgid ""
-"Audacious is now using an improved version of the Last.fm Scrobbler.\n"
-"Please check the Preferences for the Scrobbler plugin."
+"project."
 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/sdlout.cc:48
+#: src/sdlout/sdlout.cc:43
 msgid "SDL Output"
 msgstr "SDL izvade"
 
-#: src/sdlout/sdlout.cc:77
+#: src/sdlout/sdlout.cc:72
 msgid ""
 "SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
@@ -3047,27 +3312,12 @@
 "SDL izvades spraudnis atskaņotājam Audacious\n"
 "Autortiesības 2010 John Lindgren"
 
-#: src/search-tool/search-tool.cc:116 src/search-tool/search-tool.cc:124
+#: src/search-tool/library.cc:35 src/search-tool/library.cc:46
+#: src/search-tool-qt/library.cc:35 src/search-tool-qt/library.cc:46
 msgid "Library"
 msgstr "Bibliotēka"
 
-#: src/search-tool/search-tool.cc:394
-#, c-format
-msgid "%d result"
-msgid_plural "%d results"
-msgstr0 "%d rezultātu"
-msgstr1 "%d rezultāts"
-msgstr2 "%d rezultāti"
-
-#: src/search-tool/search-tool.cc:400
-#, c-format
-msgid "(%d hidden)"
-msgid_plural "(%d hidden)"
-msgstr0 "(%d paslēpti)"
-msgstr1 "(%d paslēpts)"
-msgstr2 "(%d paslēpti)"
-
-#: src/search-tool/search-tool.cc:594
+#: src/search-tool-qt/search-model.cc:44 src/search-tool/search-tool.cc:287
 #, c-format
 msgid "%d song"
 msgid_plural "%d songs"
@@ -3075,54 +3325,78 @@
 msgstr1 "%d dziesma"
 msgstr2 "%d dziesmas"
 
-#: src/search-tool/search-tool.cc:601
+#: src/search-tool-qt/search-model.cc:53 src/search-tool/search-tool.cc:294
 msgid "of this genre"
 msgstr "šajā žanrā"
 
-#: src/search-tool/search-tool.cc:607
+#: src/search-tool-qt/search-model.h:47 src/search-tool/search-model.h:45
 msgid "on"
 msgstr "uz"
 
-#: src/search-tool/search-tool.cc:607
+#: src/search-tool-qt/search-model.h:47 src/search-tool/search-model.h:45
 msgid "by"
 msgstr "izpilda"
 
-#: src/search-tool/search-tool.cc:643
-msgid "_Create Playlist"
-msgstr "Iz_veidot repertuāru"
-
-#: src/search-tool/search-tool.cc:645
-msgid "_Add to Playlist"
-msgstr "Pi_evienot repertuāru"
-
-#: src/search-tool/search-tool.cc:684
-msgid "Search library"
-msgstr "Meklēt bibliotēkā"
+#: src/search-tool-qt/search-tool-qt.cc:165 src/search-tool/search-tool.cc:74
+msgid "Number of results to show:"
+msgstr "Attēlojamo rezultātu skaits:"
+
+#: src/search-tool-qt/search-tool-qt.cc:168 src/search-tool/search-tool.cc:77
+msgid "Rescan library at startup"
+msgstr "Pārskanēt bibliotēku pie startēšanas laikā"
+
+#: src/search-tool-qt/search-tool-qt.cc:170
+msgid "Monitor library for changes"
+msgstr "Monitorēt bibliotēkas izmaiņas"
 
-#: src/search-tool/search-tool.cc:688
+#: src/search-tool-qt/search-tool-qt.cc:193 src/search-tool/search-tool.cc:450
 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\"."
+"Lai importētu jūsu mūzikas bibliotēku atskaņotājā Audacious, izvēlieties "
+"mapi un noklikšķiniet uz ikonas \"aktualizēt/atsvaidzināt\"."
 
-#: src/search-tool/search-tool.cc:696
+#: src/search-tool-qt/search-tool-qt.cc:195 src/search-tool/search-tool.cc:459
 msgid "Please wait ..."
 msgstr "Lūdzu, uzgaidiet ..."
 
-#: src/search-tool/search-tool.cc:723
+#: src/search-tool-qt/search-tool-qt.cc:197 src/search-tool/search-tool.cc:487
 msgid "Choose Folder"
 msgstr "Izvēlieties mapi"
 
+#: src/search-tool-qt/search-tool-qt.cc:201 src/search-tool/search-tool.cc:445
+msgid "Search library"
+msgstr "Meklēt bibliotēkā"
+
+#: src/search-tool-qt/search-tool-qt.cc:327 src/search-tool/search-tool.cc:156
+#, c-format
+msgid "%d of %d result shown"
+msgid_plural "%d of %d results shown"
+msgstr0 ""
+msgstr1 ""
+msgstr2 ""
+
+#: src/search-tool-qt/search-tool-qt.cc:331 src/search-tool/search-tool.cc:160
+#, c-format
+msgid "%d result"
+msgid_plural "%d results"
+msgstr0 "%d rezultātu"
+msgstr1 "%d rezultāts"
+msgstr2 "%d rezultāti"
+
+#: src/search-tool-qt/search-tool-qt.cc:501 src/search-tool/search-tool.cc:341
+msgid "_Create Playlist"
+msgstr "Iz_veidot repertuāru"
+
+#: src/search-tool-qt/search-tool-qt.cc:503 src/search-tool/search-tool.cc:343
+msgid "_Add to Playlist"
+msgstr "Pi_evienot repertuāru"
+
 #: src/sid/xmms-sid.cc:43
 msgid "SID Player"
 msgstr "SID atskaņotājs"
 
-#: src/sid/xs_config.cc:61
-msgid "Output"
-msgstr "Izvade"
-
 #: src/sid/xs_config.cc:62
 msgid "Channels:"
 msgstr "Kanāli:"
@@ -3203,740 +3477,683 @@
 msgid "Threshold:"
 msgstr "Slieksnis:"
 
-#: src/silence-removal/silence-removal.cc:70
-msgid "dB"
-msgstr "dB"
+#: src/skins/actions.cc:45 src/skins-qt/actions.cc:43
+msgid "Repeat points cleared."
+msgstr "Atkārtošanas punkti notīrīti."
+
+#: src/skins/actions.cc:60 src/skins-qt/actions.cc:58
+msgid "Repeat point A set."
+msgstr "Atkārtošanas punkts A iestatīts."
+
+#: src/skins/actions.cc:65 src/skins-qt/actions.cc:63
+msgid "Repeat point B set."
+msgstr "Atkārtošanas punkts B iestatīts."
+
+#: src/skins/equalizer.cc:223 src/skins-qt/equalizer.cc:223
+msgid "Preamp"
+msgstr "Priekšpastiprinājums"
+
+#: src/skins/equalizer.cc:227 src/skins-qt/equalizer.cc:227
+msgid "31 Hz"
+msgstr "31 Hz"
 
-#: src/skins/menus.cc:64
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "63 Hz"
+msgstr "63 Hz"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "125 Hz"
+msgstr "125 Hz"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "250 Hz"
+msgstr "250 Hz"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "500 Hz"
+msgstr "500 Hz"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "1 kHz"
+msgstr "1 kHz"
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "2 kHz"
+msgstr "2 kHz"
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "4 kHz"
+msgstr "4 kHz"
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "8 kHz"
+msgstr "8 kHz"
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "16 kHz"
+msgstr "16 kHz"
+
+#: src/skins/equalizer.cc:270 src/skins-qt/equalizer.cc:270
+msgid "Audacious Equalizer"
+msgstr "Audacious balansieris"
+
+#: src/skins/main.cc:459 src/skins-qt/main.cc:442
+msgid "Recording on"
+msgstr "Ierakstīšana ieslēgta"
+
+#: src/skins/main.cc:461 src/skins-qt/main.cc:444
+msgid "Recording off"
+msgstr "Ierakstīšana izslēgta"
+
+#: src/skins/main.cc:754 src/skins-qt/main.cc:701
+#, c-format
+msgid "Seek to %d:%-2.2d / %d:%-2.2d"
+msgstr "Pāriet uz %d:%-2.2d / %d:%-2.2d"
+
+#: src/skins/main.cc:771 src/skins-qt/main.cc:718
+#, c-format
+msgid "Volume: %d%%"
+msgstr "Skaļums: %d%%"
+
+#: src/skins/main.cc:784 src/skins-qt/main.cc:731
+#, c-format
+msgid "Balance: %d%% left"
+msgstr "Balanss: %d%% pa kreisi"
+
+#: src/skins/main.cc:786 src/skins-qt/main.cc:733
+msgid "Balance: center"
+msgstr "Balanss: centrs"
+
+#: src/skins/main.cc:788 src/skins-qt/main.cc:735
+#, c-format
+msgid "Balance: %d%% right"
+msgstr "Balanss: %d%% pa labi"
+
+#: src/skins/main.cc:880 src/skins-qt/main.cc:827
+msgid "Options Menu"
+msgstr "Iestatījumu izvēlne"
+
+#: src/skins/main.cc:884 src/skins-qt/main.cc:831
+msgid "Disable 'Always On Top'"
+msgstr "Atstatīt 'Vienmēr virspusē'"
+
+#: src/skins/main.cc:886 src/skins-qt/main.cc:833
+msgid "Enable 'Always On Top'"
+msgstr "Iestatīt 'Vienmēr virspusē'"
+
+#: src/skins/main.cc:889 src/skins-qt/main.cc:836
+msgid "File Info Box"
+msgstr "Faila info lodziņš"
+
+#: src/skins/main.cc:892 src/skins/menus.cc:149 src/skins-qt/main.cc:839
+#: src/skins-qt/menus.cc:142
+msgid "Double Size"
+msgstr "Dubultizmērs"
+
+#: src/skins/main.cc:895 src/skins-qt/main.cc:842
+msgid "Visualizations"
+msgstr "Vizualizācijas"
+
+#: src/skins/menus.cc:74 src/skins-qt/menus.cc:64
+msgid "Volume Up"
+msgstr "Palielināt skaļumu"
+
+#: src/skins/menus.cc:75 src/skins-qt/menus.cc:65
+msgid "Volume Down"
+msgstr "Samazināt skaļumu"
+
+#: src/skins/menus.cc:77 src/skins-qt/menus.cc:67
+msgid "Effects ..."
+msgstr "Efekti ..."
+
+#: src/skins/menus.cc:84 src/skins-qt/menus.cc:74
 msgid "Open Files ..."
 msgstr "Atvērt failus ..."
 
-#: src/skins/menus.cc:65
+#: src/skins/menus.cc:85 src/skins-qt/menus.cc:76
 msgid "Open URL ..."
 msgstr "Atvērt URL ..."
 
-#: src/skins/menus.cc:66
-msgid "Search Library"
-msgstr "Meklēt bibliotēkā"
-
-#: src/skins/menus.cc:68
-msgid "Playback"
-msgstr "Atskaņošana"
-
-#: src/skins/menus.cc:69
+#: src/skins/menus.cc:89 src/skins-qt/menus.cc:80
 msgid "Playlist"
 msgstr "Repertuārs"
 
-#: src/skins/menus.cc:70
+#: src/skins/menus.cc:90 src/skins-qt/menus.cc:81
+msgid "Output"
+msgstr "Izvade"
+
+#: src/skins/menus.cc:91 src/skins-qt/menus.cc:82
 msgid "View"
 msgstr "Skatīt"
 
-#: src/skins/menus.cc:72 src/skins/menus.cc:136 src/skins/menus.cc:149
-#: src/skins/menus.cc:214
+#: src/skins/menus.cc:93 src/skins/menus.cc:161 src/skins/menus.cc:174
+#: src/skins/menus.cc:245 src/skins-qt/menus.cc:84 src/skins-qt/menus.cc:156
+#: src/skins-qt/menus.cc:170 src/skins-qt/menus.cc:241
 msgid "Services"
 msgstr "Servisi"
 
-#: src/skins/menus.cc:74
+#: src/skins/menus.cc:95 src/skins-qt/menus.cc:86
 msgid "About ..."
 msgstr "Par ..."
 
-#: src/skins/menus.cc:75
+#: src/skins/menus.cc:96 src/skins-qt/menus.cc:87
 msgid "Settings ..."
 msgstr "iestatījumi ..."
 
-#: src/skins/menus.cc:76
+#: src/skins/menus.cc:97 src/skins-qt/menus.cc:88
 msgid "Quit"
 msgstr "Iziet"
 
-#: src/skins/menus.cc:80 src/skins/menus.cc:206
+#: src/skins/menus.cc:101 src/skins/menus.cc:235 src/skins-qt/menus.cc:92
+#: src/skins-qt/menus.cc:231
 msgid "Song Info ..."
 msgstr "Dziesmas info ..."
 
-#: src/skins/menus.cc:84
+#: src/skins/menus.cc:105 src/skins-qt/menus.cc:96
+msgid "Shuffle by Album"
+msgstr "Sajaukt pēc albuma"
+
+#: src/skins/menus.cc:106 src/skins-qt/menus.cc:97
 msgid "No Playlist Advance"
 msgstr "Nevirzīties uz priekšu repertuārā"
 
-#: src/skins/menus.cc:85
-msgid "Stop After This Song"
-msgstr "Apturēt pēc pašreizējās dziesmas"
-
-#: src/skins/menus.cc:93
+#: src/skins/menus.cc:117 src/skins-qt/menus.cc:108
 msgid "Set A-B Repeat"
-msgstr "Uzstādīt A-B atkārtošanu"
+msgstr "Iestatīt A-B atkārtošanu"
 
-#: src/skins/menus.cc:94
+#: src/skins/menus.cc:118 src/skins-qt/menus.cc:109
 msgid "Clear A-B Repeat"
-msgstr "Notīrīt A-B atkārtošanu"
+msgstr "Atstatīt A-B atkārtošanu"
 
-#: src/skins/menus.cc:96
+#: src/skins/menus.cc:120 src/skins-qt/menus.cc:111
 msgid "Jump to Song ..."
 msgstr "Pāriet uz dziesmu ..."
 
-#: src/skins/menus.cc:97
+#: src/skins/menus.cc:121 src/skins-qt/menus.cc:113
 msgid "Jump to Time ..."
 msgstr "Pāriet uz laiku ..."
 
-#: src/skins/menus.cc:101
+#: src/skins/menus.cc:125 src/skins-qt/menus.cc:118
 msgid "Play/Resume"
 msgstr "Atskaņot/Atsākt"
 
-#: src/skins/menus.cc:103
+#: src/skins/menus.cc:127 src/skins-qt/menus.cc:120
 msgid "New Playlist"
 msgstr "Jauns repertuārs"
 
-#: src/skins/menus.cc:104
+#: src/skins/menus.cc:128 src/skins-qt/menus.cc:121
 msgid "Rename Playlist ..."
 msgstr "Pārdēvēt repertuāru ..."
 
-#: src/skins/menus.cc:105
+#: src/skins/menus.cc:129 src/skins-qt/menus.cc:122
 msgid "Remove Playlist"
-msgstr "Izņemt repertuāru"
+msgstr "Noņemt/izvākt repertuāru"
 
-#: src/skins/menus.cc:107
+#: src/skins/menus.cc:131 src/skins-qt/menus.cc:124
 msgid "Previous Playlist"
 msgstr "Iepriekšējais repertuārs"
 
-#: src/skins/menus.cc:108
+#: src/skins/menus.cc:132 src/skins-qt/menus.cc:125
 msgid "Next Playlist"
-msgstr "Nākamais repertuārs"
+msgstr "Nākošais repertuārs"
 
-#: src/skins/menus.cc:110
+#: src/skins/menus.cc:134 src/skins-qt/menus.cc:127
 msgid "Import Playlist ..."
 msgstr "Importēt repertuāru ..."
 
-#: src/skins/menus.cc:111
+#: src/skins/menus.cc:135 src/skins-qt/menus.cc:128
 msgid "Export Playlist ..."
 msgstr "Eksportēt repertuāru ..."
 
-#: src/skins/menus.cc:113
+#: src/skins/menus.cc:137 src/skins-qt/menus.cc:130
 msgid "Playlist Manager ..."
 msgstr "Repertuāru pārvaldnieks ..."
 
-#: src/skins/menus.cc:114
+#: src/skins/menus.cc:138 src/skins-qt/menus.cc:131
 msgid "Queue Manager ..."
 msgstr "Rindas pārvaldnieks ..."
 
-#: src/skins/menus.cc:116
+#: src/skins/menus.cc:140 src/skins-qt/menus.cc:133
 msgid "Refresh Playlist"
 msgstr "Atsvaidzināt repertuāru"
 
-#: src/skins/menus.cc:120
+#: src/skins/menus.cc:144 src/skins-qt/menus.cc:137
 msgid "Show Playlist Editor"
 msgstr "Rādīt repertuāra redaktoru"
 
-#: src/skins/menus.cc:121
+#: src/skins/menus.cc:145 src/skins-qt/menus.cc:138
 msgid "Show Equalizer"
 msgstr "Rādīt balansieri"
 
-#: src/skins/menus.cc:123
+#: src/skins/menus.cc:147 src/skins-qt/menus.cc:140
 msgid "Show Remaining Time"
 msgstr "Rādīt atlikušo laiku"
 
-#: src/skins/menus.cc:125
+#: src/skins/menus.cc:150 src/skins-qt/menus.cc:143
 msgid "Always on Top"
 msgstr "Vienmēr virspusē"
 
-#: src/skins/menus.cc:126
+#: src/skins/menus.cc:151 src/skins-qt/menus.cc:145
 msgid "On All Workspaces"
 msgstr "Uz visām darbvirsmām"
 
-#: src/skins/menus.cc:128
+#: src/skins/menus.cc:153 src/skins-qt/menus.cc:148
 msgid "Roll Up Player"
 msgstr "Saritināt atskaņotāju"
 
-#: src/skins/menus.cc:129
+#: src/skins/menus.cc:154 src/skins-qt/menus.cc:149
 msgid "Roll Up Playlist Editor"
 msgstr "Saritināt repertuāra redaktoru"
 
-#: src/skins/menus.cc:130
+#: src/skins/menus.cc:155 src/skins-qt/menus.cc:150
 msgid "Roll Up Equalizer"
 msgstr "Saritināt balansieri"
 
-#: src/skins/menus.cc:132 src/skins/ui_main.cc:854
-msgid "Double Size"
-msgstr "Dubultizmērs"
-
-#: src/skins/menus.cc:138
+#: src/skins/menus.cc:163 src/skins-qt/menus.cc:158
 msgid "Add URL ..."
 msgstr "Pievienot URL ..."
 
-#: src/skins/menus.cc:139
+#: src/skins/menus.cc:164 src/skins-qt/menus.cc:160
 msgid "Add Files ..."
 msgstr "Pievienot failus ..."
 
-#: src/skins/menus.cc:143 src/skins/menus.cc:171 src/skins/menus.cc:185
+#: src/skins/menus.cc:168 src/skins/menus.cc:196 src/skins/menus.cc:212
+#: src/skins-qt/menus.cc:164 src/skins-qt/menus.cc:192
+#: src/skins-qt/menus.cc:208
 msgid "By Title"
-msgstr "Pēc nosaukuma"
+msgstr "Pēc dziesmas nosaukuma"
 
-#: src/skins/menus.cc:144 src/skins/menus.cc:178 src/skins/menus.cc:192
+#: src/skins/menus.cc:169 src/skins/menus.cc:203 src/skins/menus.cc:219
+#: src/skins-qt/menus.cc:165 src/skins-qt/menus.cc:199
+#: src/skins-qt/menus.cc:215
 msgid "By File Name"
 msgstr "Pēc faila nosaukuma"
 
-#: src/skins/menus.cc:145 src/skins/menus.cc:179 src/skins/menus.cc:193
+#: src/skins/menus.cc:170 src/skins/menus.cc:204 src/skins/menus.cc:220
+#: src/skins-qt/menus.cc:166 src/skins-qt/menus.cc:200
+#: src/skins-qt/menus.cc:216
 msgid "By File Path"
 msgstr "Pēc faila ceļa"
 
-#: src/skins/menus.cc:151
+#: src/skins/menus.cc:176 src/skins-qt/menus.cc:172
 msgid "Remove All"
-msgstr "Izņemt visus"
+msgstr "Noņemt/izvākt visus"
 
-#: src/skins/menus.cc:152
+#: src/skins/menus.cc:177 src/skins-qt/menus.cc:173
 msgid "Clear Queue"
-msgstr "Notīrīt ierindošanu"
+msgstr "Atcelt rindošanu"
 
-#: src/skins/menus.cc:154
+#: src/skins/menus.cc:179 src/skins-qt/menus.cc:175
 msgid "Remove Unavailable Files"
-msgstr "Izņemt nepieejamos failus"
+msgstr "Novākt nepieejamos failus"
 
-#: src/skins/menus.cc:155
+#: src/skins/menus.cc:180 src/skins-qt/menus.cc:176
 msgid "Remove Duplicates"
-msgstr "Izņemt dublikātus"
+msgstr "Novākt dublikātus"
 
-#: src/skins/menus.cc:157
+#: src/skins/menus.cc:182 src/skins-qt/menus.cc:178
 msgid "Remove Unselected"
-msgstr "Izņemt neiezīmētos"
+msgstr "Novākt neiezīmētos"
 
-#: src/skins/menus.cc:158
+#: src/skins/menus.cc:183 src/skins-qt/menus.cc:179
 msgid "Remove Selected"
-msgstr "Izņemt iezīmētos"
+msgstr "Novākt iezīmētos"
 
-#: src/skins/menus.cc:162
+#: src/skins/menus.cc:187 src/skins-qt/menus.cc:183
 msgid "Search and Select"
 msgstr "Meklēt un iezīmēt"
 
-#: src/skins/menus.cc:164
+#: src/skins/menus.cc:189 src/skins-qt/menus.cc:185
 msgid "Invert Selection"
-msgstr "Apgriezt iezīmēto"
+msgstr "Invertēt iezīmētos"
 
-#: src/skins/menus.cc:165
+#: src/skins/menus.cc:190 src/skins-qt/menus.cc:186
 msgid "Select None"
-msgstr "Notīrīt iezīmējumu"
+msgstr "Novākt/notīrīt iezīmējumu"
 
-#: src/skins/menus.cc:166
+#: src/skins/menus.cc:191 src/skins-qt/menus.cc:187
 msgid "Select All"
 msgstr "Iezīmēt visus"
 
-#: src/skins/menus.cc:170 src/skins/menus.cc:184
+#: src/skins/menus.cc:195 src/skins/menus.cc:211 src/skins-qt/menus.cc:191
+#: src/skins-qt/menus.cc:207
 msgid "By Track Number"
 msgstr "Pēc celiņa numura"
 
-#: src/skins/menus.cc:172 src/skins/menus.cc:186
+#: src/skins/menus.cc:197 src/skins/menus.cc:213 src/skins-qt/menus.cc:193
+#: src/skins-qt/menus.cc:209
 msgid "By Artist"
 msgstr "Pēc izpildītāja"
 
-#: src/skins/menus.cc:173 src/skins/menus.cc:187
+#: src/skins/menus.cc:198 src/skins/menus.cc:214 src/skins-qt/menus.cc:194
+#: src/skins-qt/menus.cc:210
 msgid "By Album"
 msgstr "Pēc albuma"
 
-#: src/skins/menus.cc:174 src/skins/menus.cc:188
+#: src/skins/menus.cc:199 src/skins/menus.cc:215 src/skins-qt/menus.cc:195
+#: src/skins-qt/menus.cc:211
 msgid "By Album Artist"
 msgstr "Pēc albuma izpildītāja"
 
-#: src/skins/menus.cc:175 src/skins/menus.cc:190
+#: src/skins/menus.cc:200 src/skins/menus.cc:216 src/skins-qt/menus.cc:196
+#: src/skins-qt/menus.cc:212
 msgid "By Release Date"
 msgstr "Pēc izlaišanas datuma"
 
-#: src/skins/menus.cc:176 src/skins/menus.cc:189
+#: src/skins/menus.cc:201 src/skins/menus.cc:217 src/skins-qt/menus.cc:197
+#: src/skins-qt/menus.cc:213
 msgid "By Genre"
 msgstr "Pēc žanra"
 
-#: src/skins/menus.cc:177 src/skins/menus.cc:191
+#: src/skins/menus.cc:202 src/skins/menus.cc:218 src/skins-qt/menus.cc:198
+#: src/skins-qt/menus.cc:214
 msgid "By Length"
 msgstr "Pēc ilguma"
 
-#: src/skins/menus.cc:180 src/skins/menus.cc:194
+#: src/skins/menus.cc:205 src/skins/menus.cc:221 src/skins-qt/menus.cc:201
+#: src/skins-qt/menus.cc:217
 msgid "By Custom Title"
 msgstr "Pēc pielāgotā nosaukuma"
 
-#: src/skins/menus.cc:198
+#: src/skins/menus.cc:206 src/skins/menus.cc:222 src/skins-qt/menus.cc:202
+#: src/skins-qt/menus.cc:218
+msgid "By Comment"
+msgstr "Pēc komentāra"
+
+#: src/skins/menus.cc:207 src/skins/menus.cc:223 src/skins-qt/menus.cc:203
+#: src/skins-qt/menus.cc:219
+msgid "By Disc Number"
+msgstr ""
+
+#: src/skins/menus.cc:227 src/skins-qt/menus.cc:223
 msgid "Randomize List"
-msgstr "Sajaukt repertuāru"
+msgstr "Sajaukt (nejaušībot) repertuāru"
 
-#: src/skins/menus.cc:199
+#: src/skins/menus.cc:228 src/skins-qt/menus.cc:224
 msgid "Reverse List"
-msgstr "Apgriezt repertuāru"
+msgstr "Reversot repertuāru"
 
-#: src/skins/menus.cc:201
+#: src/skins/menus.cc:230 src/skins-qt/menus.cc:226
 msgid "Sort Selected"
 msgstr "Kārtot iezīmētos"
 
-#: src/skins/menus.cc:202
+#: src/skins/menus.cc:231 src/skins-qt/menus.cc:227
 msgid "Sort List"
 msgstr "Kārtot repertuāru"
 
-#: src/skins/menus.cc:208
+#: src/skins/menus.cc:236 src/skins-qt/menus.cc:232
+msgid "Open Containing Folder"
+msgstr "Atvērt saturošo mapi"
+
+#: src/skins/menus.cc:238 src/skins-qt/menus.cc:234
 msgid "Cut"
 msgstr "Izgriezt"
 
-#: src/skins/menus.cc:209
+#: src/skins/menus.cc:239 src/skins-qt/menus.cc:235
 msgid "Copy"
 msgstr "Kopēt"
 
-#: src/skins/menus.cc:210
+#: src/skins/menus.cc:240 src/skins-qt/menus.cc:236
 msgid "Paste"
-msgstr "Ielīmēt"
+msgstr "Ievietot"
+
+#: src/skins/menus.cc:241 src/skins-qt/menus.cc:237
+msgid "Paste at End"
+msgstr "Ievietot beigās"
 
-#: src/skins/menus.cc:212
+#: src/skins/menus.cc:243 src/skins-qt/menus.cc:239
 msgid "Queue/Unqueue"
 msgstr "Ierindot/Izņemt no rindas"
 
-#: src/skins/menus.cc:218
-msgid "Load Preset ..."
-msgstr "Ielādēt sākumuzstādījumu ..."
-
-#: src/skins/menus.cc:219
-msgid "Load Auto Preset ..."
-msgstr "Ielādēt auto-sākumuzstādījumu ..."
-
-#: src/skins/menus.cc:220
-msgid "Load Default"
-msgstr "Ielādēt noklusēto"
-
-#: src/skins/menus.cc:221
-msgid "Load Preset File ..."
-msgstr "Ielādēt sākumuzstādījumu no faila ..."
-
-#: src/skins/menus.cc:222
-msgid "Load EQF File ..."
-msgstr "Ielādēt EQF failu ..."
-
-#: src/skins/menus.cc:224
-msgid "Save Preset ..."
-msgstr "Saglabāt sākumuzstādījumu ..."
-
-#: src/skins/menus.cc:225
-msgid "Save Auto Preset ..."
-msgstr "Saglabāt auto-sākumuzstādījumu ..."
-
-#: src/skins/menus.cc:226
-msgid "Save Default"
-msgstr "Saglabāt noklusēto"
-
-#: src/skins/menus.cc:227
-msgid "Save Preset File ..."
-msgstr "Saglabāt sākumuzstādījumu failā ..."
-
-#: src/skins/menus.cc:228
-msgid "Save EQF File ..."
-msgstr "Saglabāt EQF failu ..."
-
-#: src/skins/menus.cc:230
-msgid "Delete Preset ..."
-msgstr "Dzēst sākumuzstādījumu ..."
-
-#: src/skins/menus.cc:231
-msgid "Delete Auto Preset ..."
-msgstr "Dzēst auto-sākumuzstādījumu ..."
-
-#: src/skins/menus.cc:233
-msgid "Import Winamp Presets ..."
-msgstr "Importēt WinAMP sākumuzstādījumus ..."
-
-#: src/skins/menus.cc:235
-msgid "Reset to Zero"
-msgstr "Atstatīt uz nulli"
+#: src/skins/playlist-widget.cc:58 src/skins-qt/playlist-widget.cc:58
+#, c-format
+msgid "%s (%d of %d)"
+msgstr "%s (%d of %d)"
+
+#: src/skins/playlistwin.cc:491 src/skins-qt/playlistwin.cc:478
+msgid "Audacious Playlist Editor"
+msgstr "Audacious repertuāra redaktors"
 
-#: src/skins/plugin.cc:48
+#: src/skins/plugin.cc:53 src/skins-qt/plugin.cc:65
 msgid "Winamp Classic Interface"
 msgstr "Winamp klasiskā saskarne"
 
-#: src/skins/preset-browser.cc:57 src/skins/preset-list.cc:371
-#: src/skins/preset-list.cc:386
-msgid "Save"
-msgstr "Saglabāt"
-
-#: src/skins/preset-browser.cc:57 src/skins/preset-list.cc:338
-#: src/skins/preset-list.cc:354
-msgid "Load"
-msgstr "Ielādēt"
-
-#: src/skins/preset-browser.cc:83
-msgid "Load Preset File"
-msgstr "Ielādēt sākumuzstādījumu no faila"
-
-#: src/skins/preset-browser.cc:100
-msgid "Load EQF File"
-msgstr "Ielādēt EQF failu"
-
-#: src/skins/preset-browser.cc:119
-msgid "Save Preset File"
-msgstr "Saglabāt sākumuzstādījumu failā"
-
-#: src/skins/preset-browser.cc:137
-msgid "Save EQF File"
-msgstr "Saglabāt EQF failu"
-
-#: src/skins/preset-browser.cc:151
-msgid "Import Winamp Presets"
-msgstr "Importēt WinAMP sākumuzstādījumus"
-
-#: src/skins/preset-list.cc:285
-msgid "Presets"
-msgstr "Gatavie regulējumi"
-
-#: src/skins/preset-list.cc:335
-msgid "Load preset"
-msgstr "Ielādēt sākumuzstādījumu"
-
-#: src/skins/preset-list.cc:351
-msgid "Load auto-preset"
-msgstr "Ielādēt auto-sākumuzstādījumu"
-
-#: src/skins/preset-list.cc:367
-msgid "Save preset"
-msgstr "Saglabāt sākumuzstādījumu"
-
-#: src/skins/preset-list.cc:382
-msgid "Save auto-preset"
-msgstr "Saglabāt auto-sākumuzstādījumu"
-
-#: src/skins/preset-list.cc:408
-msgid "Delete preset"
-msgstr "Dzēst sākumuzstādījumu"
-
-#: src/skins/preset-list.cc:424
-msgid "Delete auto-preset"
-msgstr "Dzēst auto-sākumuzstādījumu"
+#: src/skins-qt/menus.cc:75
+msgid "Open Folder ..."
+msgstr "Atvērt mapi ..."
+
+#: src/skins-qt/menus.cc:159
+msgid "Add Folder ..."
+msgstr "Pievienot mapi ..."
+
+#: src/skins-qt/search-select.cc:62 src/skins/search-select.cc:77
+msgid "Search entries in active playlist"
+msgstr "Meklēt ierakstus aktīvajā repertuārā"
+
+#: src/skins-qt/search-select.cc:70 src/skins/search-select.cc:83
+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 ""
+"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-qt/search-select.cc:75 src/skins/search-select.cc:91
+msgid "Title:"
+msgstr "Nosaukums:"
+
+#: src/skins-qt/search-select.cc:79 src/skins/search-select.cc:96
+msgid "Album:"
+msgstr "Albums: "
+
+#: src/skins-qt/search-select.cc:82 src/skins/search-select.cc:101
+msgid "Artist:"
+msgstr "Izpildītājs: "
+
+#: src/skins-qt/search-select.cc:85 src/skins/search-select.cc:106
+msgid "File Name:"
+msgstr "Faila nosaukums:"
+
+#: src/skins-qt/search-select.cc:88 src/skins/search-select.cc:134
+msgid "Clear previous selection before searching"
+msgstr "Notīrīt iepriekšējo iezīmējumu pirms meklēšanas"
+
+#: src/skins-qt/search-select.cc:89 src/skins/search-select.cc:137
+msgid "Automatically toggle queue for matching entries"
+msgstr "Automātiski pārslēgt rindošanu atbilstošajiem ierakstiem"
+
+#: src/skins-qt/search-select.cc:90 src/skins/search-select.cc:140
+msgid "Create a new playlist with matching entries"
+msgstr "Izveidot jaunu repertuāru no atlasei atbilstošajiem ierakstiem"
+
+#: src/skins-qt/search-select.cc:101 src/skins/search-select.cc:78
+msgid "Search"
+msgstr "Meklēt"
 
-#: src/skins/skins_cfg.cc:176
+#: src/skins-qt/skins_cfg.cc:198 src/skins/skins_cfg.cc:182
 msgid "Player:"
 msgstr "Atskaņotājs:"
 
-#: src/skins/skins_cfg.cc:178
+#: src/skins-qt/skins_cfg.cc:200 src/skins/skins_cfg.cc:184
 msgid "Select main player window font:"
 msgstr "Izvēlieties galvenā atskaņotāja loga fontu:"
 
-#: src/skins/skins_cfg.cc:179
+#: src/skins-qt/skins_cfg.cc:201 src/skins/skins_cfg.cc:185
 msgid "Playlist:"
 msgstr "Repertuārs:"
 
-#: src/skins/skins_cfg.cc:181
+#: src/skins-qt/skins_cfg.cc:203 src/skins/skins_cfg.cc:187
 msgid "Select playlist font:"
-msgstr "Izvēlieties repertuāra fontu:"
+msgstr "Izvēlieties repertuāra šriftu:"
 
-#: src/skins/skins_cfg.cc:187
+#: src/skins-qt/skins_cfg.cc:207 src/skins/skins_cfg.cc:191
 msgid "Skin"
-msgstr "Apdare"
+msgstr "Apdare/ādiņa"
+
+#: src/skins-qt/skins_cfg.cc:211 src/skins/skins_cfg.cc:193
+msgid "Display active titlebar when any window is focused"
+msgstr ""
 
-#: src/skins/skins_cfg.cc:189
+#: src/skins-qt/skins_cfg.cc:213 src/skins/skins_cfg.cc:195
 msgid "Fonts"
-msgstr "Fonti"
+msgstr "Šrifti"
 
-#: src/skins/skins_cfg.cc:192
+#: src/skins-qt/skins_cfg.cc:215 src/skins/skins_cfg.cc:197
 msgid "Use bitmap fonts (supports ASCII only)"
-msgstr "Lietot bitmap fontus (atbalsta tikai ASCII)"
+msgstr "Lietot bitmap šriftus (atbalsta tikai ASCII)"
 
-#: src/skins/skins_cfg.cc:194
+#: src/skins-qt/skins_cfg.cc:217 src/skins/skins_cfg.cc:199
 msgid "Scroll song title"
 msgstr "Ritināt dziesmas nosaukumu"
 
-#: src/skins/skins_cfg.cc:196
+#: src/skins-qt/skins_cfg.cc:219 src/skins/skins_cfg.cc:201
 msgid "Scroll song title in both directions"
 msgstr "Ritināt dziesmas nosaukumu abos virzienos"
 
-#: src/skins/skins_cfg.cc:201
+#: src/skins-qt/skins_cfg.cc:224 src/skins/skins_cfg.cc:206
 msgid "Analyzer"
 msgstr "Analizators"
 
-#: src/skins/skins_cfg.cc:202
+#: src/skins-qt/skins_cfg.cc:225 src/skins/skins_cfg.cc:207
 msgid "Scope"
-msgstr "Loks"
+msgstr "Loks/vēriens/sfēra"
 
-#: src/skins/skins_cfg.cc:203
+#: src/skins-qt/skins_cfg.cc:226 src/skins/skins_cfg.cc:208
 msgid "Voiceprint / VU meter"
-msgstr "Balss vizualizēšana / VU mērītājs"
+msgstr "Balss vizualizēšana / VU mērnieks"
 
-#: src/skins/skins_cfg.cc:204
+#: src/skins-qt/skins_cfg.cc:227 src/skins/skins_cfg.cc:209
 msgid "Off"
 msgstr "Izslēgts"
 
-#: src/skins/skins_cfg.cc:208 src/skins/skins_cfg.cc:233
-#: src/skins/skins_cfg.cc:239
+#: src/skins-qt/skins_cfg.cc:231 src/skins-qt/skins_cfg.cc:256
+#: src/skins-qt/skins_cfg.cc:262 src/skins/skins_cfg.cc:213
+#: src/skins/skins_cfg.cc:238 src/skins/skins_cfg.cc:244
 msgid "Normal"
 msgstr "Normāls"
 
-#: src/skins/skins_cfg.cc:209 src/skins/skins_cfg.cc:234
+#: src/skins-qt/skins_cfg.cc:232 src/skins-qt/skins_cfg.cc:257
+#: src/skins/skins_cfg.cc:214 src/skins/skins_cfg.cc:239
 msgid "Fire"
 msgstr "Uguns"
 
-#: src/skins/skins_cfg.cc:210
+#: src/skins-qt/skins_cfg.cc:233 src/skins/skins_cfg.cc:215
 msgid "Vertical lines"
 msgstr "Vertikālas līnijas"
 
-#: src/skins/skins_cfg.cc:214
+#: src/skins-qt/skins_cfg.cc:237 src/skins/skins_cfg.cc:219
 msgid "Lines"
 msgstr "Līnijas"
 
-#: src/skins/skins_cfg.cc:215
+#: src/skins-qt/skins_cfg.cc:238 src/skins/skins_cfg.cc:220
 msgid "Bars"
-msgstr "Joslas"
+msgstr "Stabiņi"
 
-#: src/skins/skins_cfg.cc:219
+#: src/skins-qt/skins_cfg.cc:242 src/skins/skins_cfg.cc:224
 msgid "Slowest"
-msgstr "Lēnākais"
+msgstr "Vislēnāk"
 
-#: src/skins/skins_cfg.cc:220
+#: src/skins-qt/skins_cfg.cc:243 src/skins/skins_cfg.cc:225
 msgid "Slow"
 msgstr "Lēni"
 
-#: src/skins/skins_cfg.cc:221 src/sox-resampler/sox-resampler.cc:152
+#: src/skins-qt/skins_cfg.cc:244 src/skins/skins_cfg.cc:226
+#: src/soxr/sox-resampler.cc:180
 msgid "Medium"
 msgstr "Vidēji"
 
-#: src/skins/skins_cfg.cc:222
+#: src/skins-qt/skins_cfg.cc:245 src/skins/skins_cfg.cc:227
 msgid "Fast"
 msgstr "Ātri"
 
-#: src/skins/skins_cfg.cc:223
+#: src/skins-qt/skins_cfg.cc:246 src/skins/skins_cfg.cc:228
 msgid "Fastest"
-msgstr "Ātrākais"
+msgstr "Visātrāk"
 
-#: src/skins/skins_cfg.cc:227
+#: src/skins-qt/skins_cfg.cc:250 src/skins/skins_cfg.cc:232
 msgid "Dots"
 msgstr "Punkti"
 
-#: src/skins/skins_cfg.cc:228
+#: src/skins-qt/skins_cfg.cc:251 src/skins/skins_cfg.cc:233
 msgid "Line"
 msgstr "Līnijas"
 
-#: src/skins/skins_cfg.cc:229
+#: src/skins-qt/skins_cfg.cc:252 src/skins/skins_cfg.cc:234
 msgid "Solid"
 msgstr "Aizpildīts"
 
-#: src/skins/skins_cfg.cc:235
+#: src/skins-qt/skins_cfg.cc:258 src/skins/skins_cfg.cc:240
 msgid "Ice"
 msgstr "Ledus"
 
-#: src/skins/skins_cfg.cc:240
+#: src/skins-qt/skins_cfg.cc:263 src/skins/skins_cfg.cc:245
 msgid "Smooth"
 msgstr "Gluds"
 
-#: src/skins/skins_cfg.cc:244
-msgid "Type"
-msgstr "Tips"
-
-#: src/skins/skins_cfg.cc:245
-msgid "Visualization type:"
-msgstr "Vizualizācijas tips:"
-
-#: src/skins/skins_cfg.cc:248
-msgid "Analyzer"
-msgstr "Analizators"
-
-#: src/skins/skins_cfg.cc:249
-msgid "Show peaks"
-msgstr "Rādīt virsotnes"
-
-#: src/skins/skins_cfg.cc:251
+#: src/skins-qt/skins_cfg.cc:267 src/skins/skins_cfg.cc:249
 msgid "Coloring:"
 msgstr "Krāsa:"
 
-#: src/skins/skins_cfg.cc:254
+#: src/skins-qt/skins_cfg.cc:270 src/skins/skins_cfg.cc:252
 msgid "Style:"
 msgstr "Stils:"
 
-#: src/skins/skins_cfg.cc:257
+#: src/skins-qt/skins_cfg.cc:273 src/skins/skins_cfg.cc:255
 msgid "Falloff:"
 msgstr "Krišana:"
 
-#: src/skins/skins_cfg.cc:260
+#: src/skins-qt/skins_cfg.cc:276 src/skins/skins_cfg.cc:258
 msgid "Peak falloff:"
 msgstr "Virsotņu krišana:"
 
-#: src/skins/skins_cfg.cc:264
+#: src/skins-qt/skins_cfg.cc:282 src/skins/skins_cfg.cc:264
 msgid "Scope Style:"
-msgstr "Loka stils:"
+msgstr "Loka/vēriena/sfēras stils:"
 
-#: src/skins/skins_cfg.cc:267
+#: src/skins-qt/skins_cfg.cc:285 src/skins/skins_cfg.cc:267
 msgid "Voiceprint Coloring:"
 msgstr "Balss vizualizācijas krāsa:"
 
-#: src/skins/skins_cfg.cc:270
+#: src/skins-qt/skins_cfg.cc:288 src/skins/skins_cfg.cc:270
 msgid "VU Meter Style:"
-msgstr "VU mērītāja stils:"
-
-#: src/skins/skins_cfg.cc:276
-msgid "General"
-msgstr "Vispārīgi"
-
-#: src/skins/skins_cfg.cc:277
-msgid "Visualization"
-msgstr "Vizualizēšana"
-
-#: src/skins/ui_equalizer.cc:282
-msgid "Preamp"
-msgstr "Priekšpastiprinājums"
-
-#: src/skins/ui_equalizer.cc:286
-msgid "31 Hz"
-msgstr "31 Hz"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "63 Hz"
-msgstr "63 Hz"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "125 Hz"
-msgstr "125 Hz"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "250 Hz"
-msgstr "250 Hz"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "500 Hz"
-msgstr "500 Hz"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "1 kHz"
-msgstr "1 kHz"
-
-#: src/skins/ui_equalizer.cc:288
-msgid "2 kHz"
-msgstr "2 kHz"
-
-#: src/skins/ui_equalizer.cc:288
-msgid "4 kHz"
-msgstr "4 kHz"
-
-#: src/skins/ui_equalizer.cc:288
-msgid "8 kHz"
-msgstr "8 kHz"
-
-#: src/skins/ui_equalizer.cc:288
-msgid "16 kHz"
-msgstr "16 kHz"
-
-#: src/skins/ui_equalizer.cc:330
-msgid "Audacious Equalizer"
-msgstr "Audacious balansieris"
-
-#: src/skins/ui_main.cc:688
-#, 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.cc:709
-#, c-format
-msgid "Volume: %d%%"
-msgstr "Skaļums: %d%%"
-
-#: src/skins/ui_main.cc:732
-#, c-format
-msgid "Balance: %d%% left"
-msgstr "Balanss: %d%% pa kreisi"
-
-#: src/skins/ui_main.cc:734
-msgid "Balance: center"
-msgstr "Balanss: centrs"
-
-#: src/skins/ui_main.cc:736
-#, c-format
-msgid "Balance: %d%% right"
-msgstr "Balanss: %d%% pa labi"
-
-#: src/skins/ui_main.cc:842
-msgid "Options Menu"
-msgstr "Iestatījumu izvēlne"
-
-#: src/skins/ui_main.cc:846
-msgid "Disable 'Always On Top'"
-msgstr "Izslēgt 'Vienmēr virspusē'"
-
-#: src/skins/ui_main.cc:848
-msgid "Enable 'Always On Top'"
-msgstr "Ieslēgt 'Vienmēr virspusē'"
-
-#: src/skins/ui_main.cc:851
-msgid "File Info Box"
-msgstr "Faila info lodziņš"
-
-#: src/skins/ui_main.cc:857
-msgid "Visualizations"
-msgstr "Vizualizācijas"
-
-#: src/skins/ui_main.cc:1336
-msgid "Repeat point A set."
-msgstr "Atkārtošanas punkts A iestatīts."
-
-#: src/skins/ui_main.cc:1341
-msgid "Repeat point B set."
-msgstr "Atkārtošanas punkts B iestatīts."
-
-#: src/skins/ui_main.cc:1350
-msgid "Repeat points cleared."
-msgstr "Atkārtošanas punkti notīrīti."
-
-#: src/skins/ui_playlist.cc:219
-msgid "Search entries in active playlist"
-msgstr "Meklēt ierakstus aktīvajā repertuārā"
-
-#: src/skins/ui_playlist.cc:226
-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 ""
-"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.cc:234
-msgid "Title:"
-msgstr "Nosaukums:"
-
-#: src/skins/ui_playlist.cc:241
-msgid "Album:"
-msgstr "Albums: "
-
-#: src/skins/ui_playlist.cc:248
-msgid "Artist:"
-msgstr "Izpildītājs: "
+msgstr "VU mērnieka stils:"
 
-#: src/skins/ui_playlist.cc:255
-msgid "File Name:"
-msgstr "Faila nosaukums:"
-
-#: src/skins/ui_playlist.cc:263
-msgid "Clear previous selection before searching"
-msgstr "Notīrīt iepriekšējo iezīmējumu pirms meklēšanas"
+#: src/skins-qt/skins_cfg.cc:294 src/skins/skins_cfg.cc:276
+msgid "Type"
+msgstr "Tips"
 
-#: src/skins/ui_playlist.cc:266
-msgid "Automatically toggle queue for matching entries"
-msgstr "Automātiski pārslēgt ierindošanu atbilstošajiem ierakstiem"
+#: src/skins-qt/skins_cfg.cc:295 src/skins/skins_cfg.cc:277
+msgid "Visualization type:"
+msgstr "Vizualizācijas tips:"
 
-#: src/skins/ui_playlist.cc:269
-msgid "Create a new playlist with matching entries"
-msgstr "Izveidot jaunu repertuāru no atbilstošajiem ierakstiem"
+#: src/skins-qt/skins_cfg.cc:298 src/skins/skins_cfg.cc:280
+msgid "Analyzer"
+msgstr "Analizators"
 
-#: src/skins/ui_playlist.cc:717
-msgid "Audacious Playlist Editor"
-msgstr "Audacious repertuāra redaktors"
+#: src/skins-qt/skins_cfg.cc:299 src/skins/skins_cfg.cc:281
+msgid "Show peaks"
+msgstr "Rādīt virsotnes"
 
-#: src/skins/ui_playlist.cc:752
-#, c-format
-msgid "%s (%d of %d)"
-msgstr "%s (%d of %d)"
+#: src/skins-qt/skins_cfg.cc:308 src/skins/skins_cfg.cc:290
+msgid "Visualization"
+msgstr "Vizualizēšana"
 
-#: src/skins/ui_skinselector.cc:167
+#: src/skins-qt/skinselector.cc:98 src/skins/skinselector.cc:111
 msgid "Archived Winamp 2.x skin"
-msgstr "Arhivēta Winamp 2.x apdare"
+msgstr "Arhivēta Winamp 2.x ādiņa"
 
-#: src/skins/ui_skinselector.cc:172
+#: src/skins-qt/skinselector.cc:102 src/skins/skinselector.cc:115
 msgid "Unarchived Winamp 2.x skin"
-msgstr "Atarhivēta Winamp 2.x apdare"
-
-#: src/skins/util.cc:430
-#, c-format
-msgid "Could not create directory (%s): %s\n"
-msgstr "Neizdevās izveidot mapi (%s): %s\n"
+msgstr "Atarhivēta Winamp 2.x ādiņa"
 
-#: src/sndfile/plugin.cc:39
+#: src/sndfile/plugin.cc:38
 msgid "Sndfile Plugin"
 msgstr "Sndfile spraudnis"
 
-#: src/sndfile/plugin.cc:336
+#: src/sndfile/plugin.cc:372
 msgid ""
 "Based on the xmms_sndfile plugin:\n"
 "Copyright (C) 2000, 2002 Erik de Castro Lopo\n"
@@ -3975,108 +4192,111 @@
 "Ja tā nav, rakstiet uz Free Software Foundation, Inc., 51 Franklin Street,\n"
 "Fifth Floor, Boston, MA 02110-1301, USA."
 
-#: src/sndio-ng/sndio.cc:44
+#: src/sndio/sndio.cc:43
 msgid "Sndio Output"
 msgstr "Sndio izvade"
 
-#: src/sndio-ng/sndio.cc:98
+#: src/sndio/sndio.cc:98
 msgid "Device (blank for default):"
 msgstr "Ierīce (noklusētajai atstāt tukšu):"
 
-#: src/sndio-ng/sndio.cc:100
+#: src/sndio/sndio.cc:100
 msgid "Save and restore volume:"
-msgstr "Saglabāt un atjaunot skaļumu:"
+msgstr "Saglabāt un atgriezt iepriekšējo skaļumu:"
 
-#: src/sndio-ng/sndio.cc:181
+#: src/sndio/sndio.cc:181
 #, c-format
 msgid "Sndio error: Unsupported audio format (%d)"
 msgstr "Sndio kļūda: neatbalstīts audio formāts (%d)"
 
-#: src/sndio-ng/sndio.cc:192
+#: src/sndio/sndio.cc:192
 msgid "Sndio error: sio_open() failed"
 msgstr "Sndio kļūda: sio_open() neizdevās"
 
-#: src/sndio-ng/sndio.cc:222
+#: src/sndio/sndio.cc:221
 msgid "Sndio error: sio_setpar() failed"
 msgstr "Sndio kļūda: sio_setpar() neizdevās"
 
-#: src/sndio-ng/sndio.cc:234
+#: src/sndio/sndio.cc:233
 msgid "Sndio error: sio_start() failed"
 msgstr "Sndio kļūda: sio_start() neizdevās"
 
-#: src/song_change/song_change.cc:33
+#: src/songchange/song_change.cc:30
 msgid "Song Change"
 msgstr "Dziesmas maiņa"
 
-#: src/song_change/song_change.cc:342
-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."
-
-#: src/song_change/song_change.cc:358
+#: src/songchange/song_change.cc:256
 msgid "Commands"
 msgstr "Komandas"
 
-#: src/song_change/song_change.cc:360
+#: src/songchange/song_change.cc:258
 msgid "Command to run when starting a new song:"
 msgstr "Komanda, ko palaist, sākot atskaņot jaunu dziesmu:"
 
-#: src/song_change/song_change.cc:364
+#: src/songchange/song_change.cc:261
+msgid "Command to run when stopping a song:"
+msgstr ""
+
+#: src/songchange/song_change.cc:264
 msgid "Command to run at the end of a song:"
 msgstr "Komanda, ko palaist dziesmas beigās:"
 
-#: src/song_change/song_change.cc:368
+#: src/songchange/song_change.cc:267
 msgid "Command to run at the end of the playlist:"
 msgstr "Komanda, ko palaist repertuāra beigās:"
 
-#: src/song_change/song_change.cc:372
+#: src/songchange/song_change.cc:270
 msgid "Command to run when song title changes (for network streams):"
 msgstr "Komanda, ko palaist, kad nomainās dziesmas nosaukums (tīkla plūsmām):"
 
-#: src/song_change/song_change.cc:376
+#: src/songchange/song_change.cc:273
 msgid ""
-"You can use the following format strings which will be substituted before "
-"calling the command (not all are useful for the end-of-playlist command):\n"
-"\n"
-"%F: Frequency (in hertz)\n"
+"You can use the following format codes, which will be replaced before "
+"running the command.\n"
+"Not all are useful though for the song-stopped or end-of-playlist command."
+msgstr ""
+
+#: src/songchange/song_change.cc:276
+msgid ""
+"%a: Artist\n"
+"%b: Album\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"
+"%F: Frequency (Hertz)\n"
+"%l: Length (milliseconds)\n"
+"%n or %s: Formatted title (see playlist settings)\n"
 "%p: Currently playing (1 or 0)\n"
-"%a: Artist\n"
-"%b: Album\n"
-"%T: Track title"
-msgstr ""
-"Varat izmantot sekojoša formāta virknes, kuras pirms komandas izsaukšanas "
-"tiks aizvietotas (ne visas ir derīgas repertuāra-beigas komandai):\n"
-"\n"
-"%F: Frekvence (hercos)\n"
-"%c: Kanālu skaits\n"
+"%r: Rate (bits per second)\n"
+"%t: Playlist position\n"
+"%T: Title (unformatted)"
+msgstr ""
+"%a: izpildītājs\n"
+"%b: albums\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-info-qt/song-info.cc:32
-msgid "Song Info (Qt)"
-msgstr "Dziesmas info (Qt)"
+"%F: frekvence (hercos)\n"
+"%l: ilgums (milisekundes)\n"
+"%n vai %s: formatētais nosaukums (skatīt repertuāru iestatījumos)\n"
+"%p: pašreiz atskaņo (1 vai 0)\n"
+"%r: bitātrums (biti sekundē)\n"
+"%t: repertuāra pozīcija\n"
+"%T: nosaukums (neformatēts)"
+
+#: src/songchange/song_change.cc:287
+msgid ""
+"Parameters passed to the shell should be enclosed in quotation marks.\n"
+"Unquoted parameters may lead to unexpected results."
+msgstr ""
 
-#: src/sox-resampler/sox-resampler.cc:44
+#: src/song-info-qt/song-info.cc:30
+msgid "Song Info"
+msgstr "Dziesmas info"
+
+#: src/soxr/sox-resampler.cc:44
 msgid "SoX Resampler"
 msgstr "SoX diskretizācijas frekvences pārveidotājs"
 
-#: src/sox-resampler/sox-resampler.cc:144
+#: src/soxr/sox-resampler.cc:172
 msgid ""
 "SoX Resampler Plugin for Audacious\n"
 "Copyright 2013 Michał Lipski\n"
@@ -4090,99 +4310,147 @@
 "Balstīts uz diskretizācijas frekvences pārveidošanas spraudni:\n"
 "autortiesības 2010-2012 John Lindgren"
 
-#: src/sox-resampler/sox-resampler.cc:150
+#: src/soxr/sox-resampler.cc:178
 msgid "Quick"
-msgstr "Ātri"
+msgstr "Ātra"
 
-#: src/sox-resampler/sox-resampler.cc:151
+#: src/soxr/sox-resampler.cc:179
 msgid "Low"
 msgstr "Zema"
 
-#: src/sox-resampler/sox-resampler.cc:153
+#: src/soxr/sox-resampler.cc:181
 msgid "High"
 msgstr "Augsta"
 
-#: src/sox-resampler/sox-resampler.cc:154
+#: src/soxr/sox-resampler.cc:182
 msgid "Very High"
 msgstr "Ļoti augsta"
 
-#: src/sox-resampler/sox-resampler.cc:158
+#: src/soxr/sox-resampler.cc:183
+msgid "Ultra High"
+msgstr "Ļoti ļoti augsta"
+
+#: src/soxr/sox-resampler.cc:187
+msgid "Minimum"
+msgstr "Minimālā"
+
+#: src/soxr/sox-resampler.cc:188
+msgid "Intermediate"
+msgstr "Vidēja"
+
+#: src/soxr/sox-resampler.cc:193
 msgid "Quality:"
 msgstr "Kvalitāte:"
 
-#: src/speed-pitch/speed-pitch.cc:51
+#: src/soxr/sox-resampler.cc:196
+msgid "Phase:"
+msgstr "Fāze"
+
+#: src/soxr/sox-resampler.cc:200
+msgid "Allow aliasing"
+msgstr "Ļaut aliases"
+
+#: src/soxr/sox-resampler.cc:202
+msgid "Use steep filter"
+msgstr "Lietot stāvu filtru"
+
+#: src/speedpitch/speed-pitch.cc:54
 msgid "Speed and Pitch"
-msgstr "Ātrums un augstums"
+msgstr "Ātrums un augstums (toņkārta)"
 
-#: src/speed-pitch/speed-pitch.cc:210
-msgid "Speed and Pitch"
-msgstr "Ātrums un augstums"
+#: src/speedpitch/speed-pitch.cc:247
+msgid "Speed"
+msgstr "Ātrums"
 
-#: src/speed-pitch/speed-pitch.cc:211
-msgid "Speed:"
-msgstr "Ātrums:"
+#: src/speedpitch/speed-pitch.cc:248
+msgid "Decouple from pitch"
+msgstr "Atpārot no toņkārtas/augstuma"
 
-#: src/speed-pitch/speed-pitch.cc:214
-msgid "Pitch:"
-msgstr "Augstums:"
+#: src/speedpitch/speed-pitch.cc:250 src/speedpitch/speed-pitch.cc:258
+msgid "Multiplier:"
+msgstr "Reizinātājs:"
 
-#: src/statusicon/statusicon.cc:47
+#: src/speedpitch/speed-pitch.cc:254
+msgid "Pitch"
+msgstr "Toņkārta/augstums"
+
+#: src/statusicon-qt/statusicon.cc:45 src/statusicon/statusicon.cc:47
 msgid "Status Icon"
 msgstr "Statusa ikona"
 
-#: src/statusicon/statusicon.cc:283
-msgid "Se_ttings ..."
-msgstr "Ies_tatījumi ..."
-
-#: src/statusicon/statusicon.cc:372
+#: src/statusicon-qt/statusicon.cc:68
 msgid ""
-"Status Icon Plugin\n"
+"Status Icon Plugin (partial port for Qt interface)\n"
 "\n"
 "Copyright 2005-2007 Giacomo Lozito <james@develia.org>\n"
 "Copyright 2010 Michał Lipski <tallica@o2.pl>\n"
+"Copyright 2015 Eugene Paskevich <eugene@raptor.kiev.ua>\n"
 "\n"
 "This plugin provides a status icon, placed in\n"
 "the system tray area of the window manager."
 msgstr ""
-"Statusa ikonas spraudnis\n"
+"Statusa ikonas spraudnis (daļējs ports Qt saskarnei)\n"
 "\n"
 "Autortiesības 2005-2007 Giacomo Lozito <james@develia.org>\n"
 "Autortiesības 2010 Michał Lipski <tallica@o2.pl>\n"
+"Copyright 2015 Eugene Paskevich <eugene@raptor.kiev.ua>\n"
 "\n"
 "Šis spraudnis nodrošina ar statusa ikonu, kas novietota\n"
 "sistēmas ikonu joslas apgabalā."
 
-#: src/statusicon/statusicon.cc:379
+#: src/statusicon-qt/statusicon.cc:89 src/statusicon/statusicon.cc:384
 msgid "Mouse Scroll Action"
 msgstr "Peles rullīša darbība"
 
-#: src/statusicon/statusicon.cc:380
+#: src/statusicon-qt/statusicon.cc:90 src/statusicon/statusicon.cc:385
 msgid "Change volume"
 msgstr "Mainīt skaļumu"
 
-#: src/statusicon/statusicon.cc:383
+#: src/statusicon-qt/statusicon.cc:93 src/statusicon/statusicon.cc:388
 msgid "Change playing song"
 msgstr "Mainīt atskaņojamo dziesmu"
 
-#: src/statusicon/statusicon.cc:386
+#: src/statusicon-qt/statusicon.cc:96 src/statusicon/statusicon.cc:391
 msgid "Other Settings"
 msgstr "Citi iestatījumi"
 
-#: src/statusicon/statusicon.cc:387
+#: src/statusicon-qt/statusicon.cc:97 src/statusicon/statusicon.cc:392
 msgid "Disable the popup window"
 msgstr "Atslēgt izlecošo logu"
 
-#: src/statusicon/statusicon.cc:389
+#: src/statusicon-qt/statusicon.cc:99 src/statusicon/statusicon.cc:394
 msgid "Close to the system tray"
 msgstr "Aizvērt sistēmas ikonu joslu"
 
-#: src/statusicon/statusicon.cc:391
+#: src/statusicon-qt/statusicon.cc:101 src/statusicon/statusicon.cc:396
 msgid "Advance in playlist when scrolling upward"
 msgstr "Tinot uz augšu, pāriet uz priekšu repertuārā"
 
+#: src/statusicon-qt/statusicon.cc:116 src/statusicon/statusicon.cc:287
+msgid "Se_ttings ..."
+msgstr "Ies_tatījumi ..."
+
+#: src/statusicon/statusicon.cc:377
+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 ""
+"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/stereo_plugin/stereo.cc:19
 msgid "Extra Stereo"
-msgstr "Papildu stereo"
+msgstr "Papildus stereo"
 
 #: src/stereo_plugin/stereo.cc:36
 msgid ""
@@ -4190,28 +4458,168 @@
 "\n"
 "By Johan Levin, 1999"
 msgstr ""
-"Papildu stereo spraudnis\n"
+"Papildus stereo spraudnis\n"
 "\n"
 "Autors Johan Levin, 1999"
 
 #: src/stereo_plugin/stereo.cc:44
 msgid "Extra Stereo"
-msgstr "Papildu stereo"
+msgstr "Papildus stereo"
+
+#: src/streamtuner/icecast-model.cc:126 src/streamtuner/shoutcast-model.cc:131
+msgid "Type"
+msgstr "Tips"
+
+#: src/streamtuner/icecast-model.cc:132
+msgid "Current Song"
+msgstr "Pašreizējā dziesma"
+
+#: src/streamtuner/icecast-model.cc:164
+msgid "Other"
+msgstr "CIts"
+
+#: src/streamtuner/ihr-model.cc:63
+msgid "Market"
+msgstr "Tirgus"
+
+#: src/streamtuner/ihr-model.cc:156
+msgid "Call Letters"
+msgstr "Saucamie burti?"
+
+#: src/streamtuner/ihr-model.cc:162
+msgid "Description"
+msgstr "Apraksts"
+
+#: src/streamtuner/shoutcast-model.cc:128
+msgid "Listeners"
+msgstr "Klausītāji"
+
+#: src/streamtuner/shoutcast-model.cc:188
+msgid "Top 500 Stations"
+msgstr "Top 500 radio-stacijas"
+
+#: src/streamtuner/shoutcast-model.cc:189
+msgid "Alternative"
+msgstr "Alternatīvā"
+
+#: src/streamtuner/shoutcast-model.cc:190
+msgid "Blues"
+msgstr "Blūzs"
+
+#: src/streamtuner/shoutcast-model.cc:191
+msgid "Classical"
+msgstr "Klasiskā mūzika"
+
+#: src/streamtuner/shoutcast-model.cc:192
+msgid "Country"
+msgstr "Kantrī"
+
+#: src/streamtuner/shoutcast-model.cc:193
+msgid "Decades"
+msgstr "Dekādes"
+
+#: src/streamtuner/shoutcast-model.cc:194
+msgid "Easy Listening"
+msgstr "Easy Listening"
+
+#: src/streamtuner/shoutcast-model.cc:195
+msgid "Electronic"
+msgstr "Elektroniska"
+
+#: src/streamtuner/shoutcast-model.cc:196
+msgid "Folk"
+msgstr "Tautas"
+
+#: src/streamtuner/shoutcast-model.cc:197
+msgid "Inspirational"
+msgstr "Iedvesmojoša"
+
+#: src/streamtuner/shoutcast-model.cc:198
+msgid "International"
+msgstr "Starptautiska"
+
+#: src/streamtuner/shoutcast-model.cc:199
+msgid "Jazz"
+msgstr "Džezs"
+
+#: src/streamtuner/shoutcast-model.cc:200
+msgid "Latin"
+msgstr "Latīņamerikas"
+
+#: src/streamtuner/shoutcast-model.cc:201
+msgid "Metal"
+msgstr "Metāls"
+
+#: src/streamtuner/shoutcast-model.cc:203
+msgid "New Age"
+msgstr "New Age"
+
+#: src/streamtuner/shoutcast-model.cc:204
+msgid "Pop"
+msgstr "Pops"
+
+#: src/streamtuner/shoutcast-model.cc:205
+msgid "Public Radio"
+msgstr "Publiskais radio"
+
+#: src/streamtuner/shoutcast-model.cc:206
+msgid "R&B and Urban"
+msgstr "Ritms un blūzs (R&B) un urbānā"
+
+#: src/streamtuner/shoutcast-model.cc:207
+msgid "Rap"
+msgstr "Reps"
+
+#: src/streamtuner/shoutcast-model.cc:208
+msgid "Reggae"
+msgstr "Regejs"
+
+#: src/streamtuner/shoutcast-model.cc:209
+msgid "Rock"
+msgstr "Roks"
+
+#: src/streamtuner/shoutcast-model.cc:210
+msgid "Seasonal and Holiday"
+msgstr "Gadalaiku un svētku"
+
+#: src/streamtuner/shoutcast-model.cc:211
+msgid "Soundtracks"
+msgstr "Skaņu celiņi"
+
+#: src/streamtuner/shoutcast-model.cc:212
+msgid "Talk"
+msgstr "Runa"
+
+#: src/streamtuner/shoutcast-model.cc:213
+msgid "Themes"
+msgstr "Tēmas"
+
+#: src/streamtuner/streamtuner.cc:59
+msgid "Shoutcast"
+msgstr "Shoutcast"
+
+#: src/streamtuner/streamtuner.cc:60
+msgid "Icecast"
+msgstr "Icecast"
+
+#: src/streamtuner/streamtuner.cc:71
+msgid "Stream Tuner"
+msgstr "Straumēšanas iestatītājs"
 
 #: src/tonegen/tonegen.cc:45
 msgid "Tone Generator"
 msgstr "Toņa ģenerators"
 
-#: src/tonegen/tonegen.cc:94
+#: src/tonegen/tonegen.cc:92
 #, c-format
 msgid "%s %.1f Hz"
 msgstr "%s %.1f Hz"
 
-#: src/tonegen/tonegen.cc:94
+#: src/tonegen/tonegen.cc:92
 msgid "Tone Generator: "
 msgstr "Toņa ģenerators: "
 
-#: src/tonegen/tonegen.cc:160
+#: src/tonegen/tonegen.cc:161
 msgid ""
 "Sine tone generator by Håvard Kvålen <havardk@xmms.org>\n"
 "Modified by Daniel J. Peng <danielpeng@bigfoot.com>\n"
@@ -4226,11 +4634,32 @@
 "frekvence3;...\n"
 "piem., tone://2000;2005, lai atskaņotu 2000 Hz tonu un 2005 Hz toni"
 
+#: src/ui-common/dialogs-qt.cc:40
+msgid ""
+"\n"
+"(Further messages have been hidden.)"
+msgstr ""
+"\n"
+"(Turpmākie ziņojumi tika paslēpti.)"
+
+#: src/ui-common/dialogs-qt.cc:52
+msgid "Working ..."
+msgstr "Darbojas ..."
+
+#: src/ui-common/dialogs-qt.cc:73
+msgid "Information"
+msgstr "Informācija"
+
+#: src/ui-common/menu-ops-gtk.cc:132 src/ui-common/menu-ops-qt.cc:113
+#, c-format
+msgid "%s does not appear to be a valid folder."
+msgstr ""
+
 #: src/voice_removal/voice_removal.cc:28
 msgid "Voice Removal"
-msgstr "Balss izņemšana"
+msgstr "Balss notušēšana/noņemšana"
 
-#: src/vorbis/vorbis.cc:465
+#: src/vorbis/vorbis.cc:433
 msgid ""
 "Audacious Ogg Vorbis Decoder\n"
 "\n"
@@ -4271,12 +4700,12 @@
 msgid "Ogg Vorbis Decoder"
 msgstr "Ogg Vorbis dekodētājs"
 
-#: src/vtx/info.cc:22
+#: src/vtx/info.cc:24
 #, c-format
 msgid "Details about %s"
 msgstr "Detaļas par %s"
 
-#: src/vtx/info.cc:24
+#: src/vtx/info.cc:26
 msgid ""
 "Title: %t\n"
 "Author: %a\n"
@@ -4306,7 +4735,7 @@
 msgid "VTX Decoder"
 msgstr "VTX dekodētājs"
 
-#: src/vtx/vtx.cc:184
+#: src/vtx/vtx.cc:178
 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"
@@ -4316,19 +4745,63 @@
 "Balstīts uz in_vtx.dll, autors Roman Sherbakov <v_soft@microfor.ru>\n"
 "Audacious spraudņa autors Pavel Vymetalek <pvymetalek@seznam.cz>"
 
-#: src/wavpack/wavpack.cc:24
+#: src/vumeter-qt/vumeter_qt.cc:31
+msgid ""
+"VU Meter Plugin for Audacious\n"
+"Copyright 2017-2019 Marc Sánchez Fauste"
+msgstr ""
+"VU Mērnieka spraudnis priekš Audacious\n"
+"Copyright 2017-2019 Marc Sánchez Fauste"
+
+#: src/vumeter-qt/vumeter_qt.cc:35
+msgid "VU Meter Settings"
+msgstr "VU Mērnieka iestatījumi"
+
+#: src/vumeter-qt/vumeter_qt.cc:37
+msgid "Peak hold time:"
+msgstr "Maksimālais aizkaves/aiztures laiks:"
+
+#: src/vumeter-qt/vumeter_qt.cc:42
+msgid "Fall-off time:"
+msgstr "Nokrišanas (Fall-off) laiks:"
+
+#: src/vumeter-qt/vumeter_qt.cc:44
+msgid "dB/second"
+msgstr "dB/sekundē"
+
+#: src/vumeter-qt/vumeter_qt.cc:46
+msgid "Display legend"
+msgstr "Rādīt leģendu"
+
+#: src/vumeter-qt/vumeter_qt.h:37
+msgid "VU Meter"
+msgstr "VU Mērnieks"
+
+#: src/waveout/waveout.cc:43
+msgid "Win32 waveOut"
+msgstr "Win32 waveOut"
+
+#: src/waveout/waveout.cc:69
+msgid ""
+"Win32 waveOut Plugin for Audacious\n"
+"Copyright 2016 John Lindgren"
+msgstr ""
+"Win32 waveOut spraudnis atskaņotājam Audacious\n"
+"Autortiesības 2016 John Lindgren"
+
+#: src/wavpack/wavpack.cc:25
 msgid "WavPack Decoder"
 msgstr "WavPack dekodētājs"
 
-#: src/wavpack/wavpack.cc:211
+#: src/wavpack/wavpack.cc:217
 msgid "lossy (hybrid)"
-msgstr "zudumradošs (hibrīdais)"
+msgstr "zudumīgs/zudumains (hibrīdais)"
 
-#: src/wavpack/wavpack.cc:213
+#: src/wavpack/wavpack.cc:219
 msgid "lossy"
-msgstr "zudumradošs"
+msgstr "zudumīgs/zudumains"
 
-#: src/wavpack/wavpack.cc:255
+#: src/wavpack/wavpack.cc:259
 msgid ""
 "Copyright 2006 William Pitcock <nenolod@nenolod.net>\n"
 "\n"
@@ -4338,18 +4811,38 @@
 "\n"
 "Daļai koda autors ir Miles Egan."
 
-#: src/xsf/plugin.cc:50
+#: src/xsf/plugin.cc:74
 msgid "2SF Decoder"
 msgstr "2SF dekodētājs"
 
-#: src/xsf/plugin.cc:238
+#: src/xsf/plugin.cc:429
+msgid "32728 Hz"
+msgstr ""
+
+#: src/xsf/plugin.cc:432
+msgid "65456 Hz"
+msgstr ""
+
+#: src/xsf/plugin.cc:438
+msgid "Cosine"
+msgstr ""
+
+#: src/xsf/plugin.cc:439
+msgid "Sharp"
+msgstr ""
+
+#: src/xsf/plugin.cc:443
 msgid "XSF Configuration"
 msgstr "XSF konfigurācija"
 
-#: src/xsf/plugin.cc:239
-msgid "Ignore length from file"
-msgstr "Ignorēt ilgumu no faila"
+#: src/xsf/plugin.cc:445
+msgid "Default fade time:"
+msgstr ""
+
+#: src/xsf/plugin.cc:447
+msgid "Interpolation mode:"
+msgstr ""
 
-#: src/xspf/xspf.cc:89
+#: src/xspf/xspf.cc:95
 msgid "XML Shareable Playlists (XSPF)"
 msgstr "XML kopīgojamie repertuāri (XSPF)"

audacious-plugins-4.4.1.tar.bz2/po/meson.build Added

audacious-plugins-3.6.2-gtk3.tar.bz2/po/ml_IN.po -> audacious-plugins-4.4.1.tar.bz2/po/ml_IN.po Changed

@@ -4,17 +4,18 @@
 #
 # Translators:
 # Nandakumar <nandakumar96@gmail.com>, 2013
-# Navaneeth <inactive+navaneeths52@transifex.com>, 2013-2014
-# Navaneeth <inactive+navaneeths52@transifex.com>, 2013
+# dff5941a14d8d203ffd5eb33c1beb2f5_ddb2eba <eae4f8623a844aad3e4df6256d6e67cd_138996>, 2013-2014
+# dff5941a14d8d203ffd5eb33c1beb2f5_ddb2eba <eae4f8623a844aad3e4df6256d6e67cd_138996>, 2013
 # ST Alfas, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: Audacious Plugins\n"
-"Report-Msgid-Bugs-To: http://redmine.audacious-media-player.org/\n"
-"POT-Creation-Date: 2015-02-28 19:18+0100\n"
-"PO-Revision-Date: 2015-02-04 21:21+0000\n"
-"Last-Translator: Thomas Lange <thomas-lange2@gmx.de>\n"
-"Language-Team: Malayalam (India) (http://www.transifex.com/projects/p/"
+"Report-Msgid-Bugs-To: https://github.com/audacious-media-player/audacious/"
+"issues\n"
+"POT-Creation-Date: 2024-09-26 21:54+0200\n"
+"PO-Revision-Date: 2011-10-10 17:43+0000\n"
+"Last-Translator: ST Alfas, 2014\n"
+"Language-Team: Malayalam (India) (http://app.transifex.com/audacious/"
 "audacious/language/ml_IN/)\n"
 "Language: ml_IN\n"
 "MIME-Version: 1.0\n"
@@ -22,239 +23,60 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/aac-raw/aac.cc:18
+#: src/aac/aac.cc:19
 msgid "AAC (Raw) Decoder"
 msgstr ""
 
-#: src/adplug/adplug-xmms.cc:42
+#: src/adplug/adplug-xmms.cc:70
 msgid "AdPlug (AdLib Player)"
 msgstr "AdPlug (AdLib പ്ലേയര്‍)"
 
-#: src/adplug/adplug-xmms.cc:156 src/modplug/modplugbmp.cc:335
-#: src/psf/plugin.cc:138 src/vtx/vtx.cc:87 src/xsf/plugin.cc:113
+#: src/adplug/adplug-xmms.cc:167 src/modplug/modplugbmp.cc:321
+#: src/psf/plugin.cc:161 src/vtx/vtx.cc:89 src/xsf/plugin.cc:204
 msgid "sequenced"
 msgstr "സീക്വന്‍സ്ഡ്"
 
-#: src/alarm/alarm.cc:55 src/alarm/interface.cc:82
-msgid "Alarm"
-msgstr "അലാം"
-
-#: src/alarm/alarm.cc:782
-msgid "Set Alarm ..."
-msgstr ""
-
-#: src/alarm/alarm.cc:810
-msgid ""
-"A plugin that can be used to start playing at a certain time.\n"
-"\n"
-"Originally written by Adam Feakin and Daniel Stodden."
+#: src/adplug/adplug-xmms.cc:349 src/sid/xs_config.cc:61
+msgid "Output"
 msgstr ""
 
-#: src/alarm/interface.cc: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"
+#: src/adplug/adplug-xmms.cc:350
+msgid "OPL Emulator:"
 msgstr ""
 
-#: src/alarm/interface.cc: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.cc: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."
+#: src/adplug/adplug-xmms.cc:353 src/amidiplug/i_configure.cc:153
+#: src/console/plugin.cc:45 src/filewriter/filewriter.cc:481
+#: src/sid/xs_config.cc:65 src/xsf/plugin.cc:446
+msgid "Sample rate:"
 msgstr ""
 
-#: src/alarm/interface.cc:81
-msgid "This is your wakeup call."
-msgstr "ഇത് നിങ്ങളുടെ ഉണര്‍ത്തുപാട്ടാണ്."
-
-#: src/alarm/interface.cc:99
-msgid "Your reminder for today is..."
-msgstr "ഇന്നേയ്ക്കുള്ള നിങ്ങളുടെ സ്മാരകം: "
-
-#: src/alarm/interface.cc:101 src/alarm/interface.cc:386
-msgid "Reminder"
-msgstr "സ്മാരകം"
-
-#: src/alarm/interface.cc:132
-msgid "Monday"
-msgstr "തിങ്കളാഴ്ച"
-
-#: src/alarm/interface.cc:132
-msgid "Tuesday"
-msgstr "ചൊവ്വാഴ്ച"
-
-#: src/alarm/interface.cc:132
-msgid "Wednesday"
-msgstr "ബുധനാഴ്ച"
-
-#: src/alarm/interface.cc:133
-msgid "Thursday"
-msgstr "വ്യാഴാഴ്ച"
-
-#: src/alarm/interface.cc:133
-msgid "Friday"
-msgstr "വെള്ളിയാഴ്ച"
-
-#: src/alarm/interface.cc:133
-msgid "Saturday"
-msgstr "ശനിയാഴ്ച"
-
-#: src/alarm/interface.cc:133
-msgid "Sunday"
-msgstr "ഞായറാഴ്ച"
-
-#: src/alarm/interface.cc:171 src/alarm/interface.cc:230
-#: src/alarm/interface.cc:245
-msgid "Time"
-msgstr "സമയം"
-
-#: src/alarm/interface.cc:178
-msgid "Alarm at (default):"
-msgstr "അലാം മുഴങ്ങേണ്ട സമയം (സ്വതവേയുള്ളത്):"
-
-#: src/alarm/interface.cc:200
-msgid "h"
-msgstr "h"
-
-#: src/alarm/interface.cc:203
-msgid "Quiet after:"
-msgstr "ശേഷം ശാന്തമാകൂ :"
-
-#: src/alarm/interface.cc:215
-msgid "hours"
-msgstr "മണിക്കൂറുകള്‍"
-
-#: src/alarm/interface.cc:226
-msgid "minutes"
-msgstr "മിനിറ്റുകള്‍"
-
-#: src/alarm/interface.cc:235
-msgid "Choose the days for the alarm to come on"
-msgstr "അലാം മുഴങ്ങേണ്ട ദിനങ്ങള്‍ തെരെഞ്ഞെടുക്കുക"
-
-#: src/alarm/interface.cc:242
-msgid "Day"
-msgstr "ദിവസം"
-
-#: src/alarm/interface.cc:259 src/bs2b/plugin.cc:130
-#: src/skins/preset-list.cc:434 src/skins/preset-list.cc:440
-msgid "Default"
-msgstr "സ്വതസ്സിദ്ധം"
-
-#: src/alarm/interface.cc:288
-msgid "Days"
-msgstr "ദിവസങ്ങള്‍"
-
-#: src/alarm/interface.cc:297
-msgid "Fading"
-msgstr "മായുന്നു"
-
-#: src/alarm/interface.cc:305 src/console/plugin.cc:41
-#: src/crossfade/crossfade.cc:53 src/crossfade/crossfade.cc:59
-#: src/gtkui/settings.cc:49 src/lirc/lirc.cc:397 src/sid/xs_config.cc:85
-#: src/sid/xs_config.cc:94 src/sid/xs_config.cc:103
-msgid "seconds"
-msgstr "സെക്കന്‍ഡുകള്‍"
-
-#: src/alarm/interface.cc:312 src/alarm/interface.cc:353
-msgid "Volume"
-msgstr "ഉച്ചത"
-
-#: src/alarm/interface.cc:317
-msgid "Start at"
-msgstr "ഇവിടെ തുടങ്ങുക"
-
-#: src/alarm/interface.cc:333
-msgid "Final"
-msgstr "അവസാനത്തേത്"
-
-#: src/alarm/interface.cc:346
-msgid "Current"
-msgstr "നിലവിലുള്ളത്"
-
-#: src/alarm/interface.cc:359
-msgid "Additional Command"
-msgstr "അധികകല്‍പ്പന"
+#: src/adplug/adplug-xmms.cc:354 src/amidiplug/i_configure.cc:155
+#: src/bs2b/plugin.cc:141 src/console/plugin.cc:47
+#: src/modplug/plugin_main.cc:77 src/resample/resample.cc:201
+#: src/resample/resample.cc:207 src/resample/resample.cc:211
+#: src/resample/resample.cc:215 src/resample/resample.cc:219
+#: src/resample/resample.cc:223 src/resample/resample.cc:227
+#: src/resample/resample.cc:231 src/resample/resample.cc:235
+#: src/resample/resample.cc:239 src/resample/resample.cc:243
+#: src/sid/xs_config.cc:67 src/soxr/sox-resampler.cc:205
+msgid "Hz"
+msgstr "Hz"
 
-#: src/alarm/interface.cc:365 src/alarm/interface.cc:391
-msgid "enable"
-msgstr "സാദ്ധ്യമാക്കുക"
+#: src/adplug/adplug-xmms.cc:355 src/gtkui/settings.cc:55
+#: src/modplug/plugin_main.cc:105 src/qtui/settings.cc:85
+#: src/skins-qt/skins_cfg.cc:302 src/skins/skins_cfg.cc:284
+msgid "Miscellaneous"
+msgstr "പലവക"
 
-#: src/alarm/interface.cc:372
-msgid "Playlist (optional)"
-msgstr "പ്ലേലിസ്റ്റ് (നിര്‍ബന്ധമില്ല)"
-
-#: src/alarm/interface.cc:379
-msgid "Select a playlist"
-msgstr "ഒരു പ്ലേലിസ്റ്റ് തിരഞ്ഞെടുക്കുക"
-
-#: src/alarm/interface.cc:399
-msgid "Options"
-msgstr "ഓപ്ഷനുകള്‍"
-
-#: src/alarm/interface.cc:404
-msgid "What do these options mean?"
-msgstr "ഈ ഓപ്ഷനുകള്‍ എന്താണ് അര്‍ത്ഥമാക്കുന്നത്?"
-
-#: src/alarm/interface.cc:420
-msgid "Help"
-msgstr "സഹായം"
+#: src/adplug/adplug-xmms.cc:356
+msgid "Repeat song in endless loop"
+msgstr ""
 
-#: src/albumart/albumart.cc:31
+#: src/albumart/albumart.cc:31 src/albumart-qt/albumart.cc:35
 msgid "Album Art"
 msgstr "ആല്‍ബം ആര്‍ട്ട്"
 
-#: src/albumart-qt/albumart.cc:33
-msgid "Album Art (Qt)"
-msgstr ""
-
-#: src/alsa/alsa.h:70
+#: src/alsa/alsa.h:64
 msgid "ALSA Output"
 msgstr "അല്‍സ ഔട്പുട്ട്"
 
@@ -291,11 +113,11 @@
 msgid "Mixer element:"
 msgstr "മിക്സര്‍ എലമെന്റ്:"
 
-#: src/amidi-plug/amidi-plug.cc:41
+#: src/amidiplug/amidi-plug.cc:42
 msgid "AMIDI-Plug (MIDI Player)"
 msgstr "AMIDI-പ്ലഗ്ഗ് (MIDI പ്ലേയര്‍)"
 
-#: src/amidi-plug/amidi-plug.cc:437
+#: src/amidiplug/amidi-plug.cc:445
 msgid ""
 "AMIDI-Plug\n"
 "modular MIDI music player\n"
@@ -318,157 +140,156 @@
 "for the good help with alpha testing"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:94
+#: src/amidiplug/i_configure.cc:94
 msgid "Override default gain:"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:102
+#: src/amidiplug/i_configure.cc:102
 msgid "Override default polyphony:"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:110
+#: src/amidiplug/i_configure.cc:110
 msgid "Override default reverb:"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:112 src/amidi-plug/i_configure.cc:120
+#: src/amidiplug/i_configure.cc:112 src/amidiplug/i_configure.cc:120
 msgid "On"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:118
+#: src/amidiplug/i_configure.cc:118
 msgid "Override default chorus:"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:128 src/console/plugin.cc:29
+#: src/amidiplug/i_configure.cc:128 src/console/plugin.cc:29
 msgid "Playback"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:129
+#: src/amidiplug/i_configure.cc:129
 msgid "Transpose:"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:131
+#: src/amidiplug/i_configure.cc:131 src/speedpitch/speed-pitch.cc:257
 msgid "semitones"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:132
+#: src/amidiplug/i_configure.cc:132
 msgid "Drum shift:"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:134
+#: src/amidiplug/i_configure.cc:134
 msgid "note numbers"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:135
+#: src/amidiplug/i_configure.cc:135
 msgid "Skip leading silence"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:137
+#: src/amidiplug/i_configure.cc:137
 msgid "Skip trailing silence"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:141
+#: src/amidiplug/i_configure.cc:141
 msgid "SoundFont"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:143
+#: src/amidiplug/i_configure.cc:148
 msgid "Synthesizer"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:148 src/console/plugin.cc:45
-#: src/sid/xs_config.cc:65
-msgid "Sample rate:"
-msgstr ""
-
-#: src/amidi-plug/i_configure.cc:150 src/bs2b/plugin.cc:141
-#: src/console/plugin.cc:47 src/modplug/plugin_main.cc:78
-#: src/resample/resample.cc:201 src/resample/resample.cc:207
-#: src/resample/resample.cc:211 src/resample/resample.cc:215
-#: src/resample/resample.cc:219 src/resample/resample.cc:223
-#: src/resample/resample.cc:227 src/resample/resample.cc:231
-#: src/resample/resample.cc:235 src/resample/resample.cc:239
-#: src/resample/resample.cc:243 src/sid/xs_config.cc:67
-#: src/sox-resampler/sox-resampler.cc:163
-msgid "Hz"
-msgstr "Hz"
-
-#: src/amidi-plug/i_configure-fluidsynth.cc:52
+#: src/amidiplug/i_configure-fluidsynth.cc:58
+#: src/amidiplug/i_configure-fluidsynth.cc:527
 msgid "AMIDI-Plug - select SoundFont file"
 msgstr "AMIDI-പ്ലഗ്ഗ് - സൗണ്ട് ഫോണ്ട് തെരെഞ്ഞെടുക്കുക"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:55 src/filewriter/mp3.cc:658
+#: src/amidiplug/i_configure-fluidsynth.cc:61
 msgid "_Cancel"
 msgstr ""
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:56
+#: src/amidiplug/i_configure-fluidsynth.cc:62
 msgid "_Open"
 msgstr ""
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:225 src/gtkui/columns.cc:46
+#: src/amidiplug/i_configure-fluidsynth.cc:233
+#: src/amidiplug/i_configure-fluidsynth.cc:461
 msgid "File name"
 msgstr "ഫയല്‍ നെയിം"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:229
+#: src/amidiplug/i_configure-fluidsynth.cc:237
+#: src/amidiplug/i_configure-fluidsynth.cc:464
 msgid "Size (bytes)"
 msgstr "വലിപ്പം (ബൈറ്റുകള്‍)"
 
-#: src/amidi-plug/i_fileinfo.cc:163
+#: src/amidiplug/i_fileinfo.cc:184
 msgid "Name:"
 msgstr "പേര്:"
 
-#: src/amidi-plug/i_fileinfo.cc:181
+#: src/amidiplug/i_fileinfo.cc:202
 msgid " MIDI Info "
 msgstr " MIDI വിവരങ്ങള്‍ "
 
-#: src/amidi-plug/i_fileinfo.cc:195
+#: src/amidiplug/i_fileinfo.cc:216
 msgid "Format:"
 msgstr "ഫോര്‍മാറ്റ്:"
 
-#: src/amidi-plug/i_fileinfo.cc:198
+#: src/amidiplug/i_fileinfo.cc:219
 msgid "Length (msec):"
 msgstr "നീളം (മില്ലി സെക്കന്‍ഡില്‍):"
 
-#: src/amidi-plug/i_fileinfo.cc:201
+#: src/amidiplug/i_fileinfo.cc:222
 msgid "No. of Tracks:"
 msgstr "ട്രാക്കുകളുടെ എണ്ണം:"
 
-#: src/amidi-plug/i_fileinfo.cc:207
+#: src/amidiplug/i_fileinfo.cc:228
 msgid "variable"
 msgstr "ചരം"
 
-#: src/amidi-plug/i_fileinfo.cc:209
+#: src/amidiplug/i_fileinfo.cc:230
 msgid "BPM:"
 msgstr "BPM:"
 
-#: src/amidi-plug/i_fileinfo.cc:217
+#: src/amidiplug/i_fileinfo.cc:238
 msgid "BPM (wavg):"
 msgstr "BPM (wavg):"
 
-#: src/amidi-plug/i_fileinfo.cc:220
+#: src/amidiplug/i_fileinfo.cc:241
 msgid "Time Div:"
 msgstr ""
 
-#: src/amidi-plug/i_fileinfo.cc:231
+#: src/amidiplug/i_fileinfo.cc:252
 msgid " MIDI Comments and Lyrics "
 msgstr " MIDI വിവരണങ്ങളും വരികളും "
 
-#: src/amidi-plug/i_fileinfo.cc:278
+#: src/amidiplug/i_fileinfo.cc:299
 msgid "* no comments available in this MIDI file *"
 msgstr "* ഈ MIDI ഫയലില്‍ നിലവിലുള്ള വിവരണങ്ങള്‍ ഒന്നുമില്ല *"
 
-#: src/amidi-plug/i_fileinfo.cc:290
+#: src/amidiplug/i_fileinfo.cc:311
 msgid "* no lyrics available in this MIDI file *"
 msgstr "* ഈ MIDI ഫയലില്‍ നിലവിലുള്ള വരികള്‍ ഒന്നുമില്ല *"
 
-#: src/amidi-plug/i_fileinfo.cc:300 src/filewriter/vorbis.cc:197
-#: src/ladspa/plugin.cc:416
+#: src/amidiplug/i_fileinfo.cc:321 src/ladspa/plugin.cc:418
+#: src/ui-common/dialogs-qt.cc:32
 msgid "_Close"
 msgstr "_അടയ്ക്കുക"
 
-#: src/amidi-plug/i_fileinfo.cc:325
+#: src/amidiplug/i_fileinfo.cc:346
 msgid " (invalid UTF-8)"
 msgstr "(പ്രാബല്യമില്ലാത്ത UTF-8)"
 
-#: src/aosd/aosd.cc:32
+#: src/ampache/ampache.cc:33
+msgid "Ampache Browser"
+msgstr ""
+
+#: src/ampache/ampache.cc:46
+msgid ""
+"Ampache Browser for Audacious\n"
+"http://ampache-browser.org/\n"
+"\n"
+"Copyright (C) Róbert Čerňanský and John Lindgren\n"
+"License: GNU GPLv3"
+msgstr ""
+
+#: src/aosd/aosd.cc:31
 msgid ""
 "Audacious OSD\n"
 "http://www.develia.org/projects.php?p=audacious#aosd\n"
@@ -495,130 +316,130 @@
 msgid "Concave Rectangle"
 msgstr "അവതലചതുരം"
 
-#: src/aosd/aosd_style.cc:69
+#: src/aosd/aosd_style.cc:69 src/openmpt/mptwrap.h:50 src/xsf/plugin.cc:436
 msgid "None"
 msgstr "ശൂന്യം"
 
-#: src/aosd/aosd_trigger.cc:50
+#: src/aosd/aosd_trigger.cc:49
 msgid "Playback Start"
 msgstr "പ്ലേബാക്ക് തുടങ്ങുക"
 
-#: src/aosd/aosd_trigger.cc:51
+#: src/aosd/aosd_trigger.cc:50
 msgid "Triggers OSD when a playlist entry is played."
 msgstr ""
 
-#: src/aosd/aosd_trigger.cc:56
+#: src/aosd/aosd_trigger.cc:55
 msgid "Title Change"
 msgstr "തലക്കെട്ടിലെ മാറ്റം"
 
-#: src/aosd/aosd_trigger.cc:57
+#: src/aosd/aosd_trigger.cc:56
 msgid "Triggers OSD when the song title changes (for internet streams)."
 msgstr ""
 
-#: src/aosd/aosd_trigger.cc:62
+#: src/aosd/aosd_trigger.cc:61
 msgid "Pause On"
 msgstr "പോസ് ഓണ്‍"
 
-#: src/aosd/aosd_trigger.cc:63
+#: src/aosd/aosd_trigger.cc:62
 msgid "Triggers OSD when playback is paused."
 msgstr ""
 
-#: src/aosd/aosd_trigger.cc:68
+#: src/aosd/aosd_trigger.cc:67
 msgid "Pause Off"
 msgstr "പോസ് ഓഫ്"
 
-#: src/aosd/aosd_trigger.cc:69
+#: src/aosd/aosd_trigger.cc:68
 msgid "Triggers OSD when playback is unpaused."
 msgstr ""
 
-#: src/aosd/aosd_ui.cc:163
+#: src/aosd/aosd_ui.cc:204
 msgid "Placement"
 msgstr "അവസ്ഥ"
 
-#: src/aosd/aosd_ui.cc:196
+#: src/aosd/aosd_ui.cc:241
 msgid "Relative X offset:"
 msgstr "താരതമ്യേനയുള്ള X ഓഫ്‌സെറ്റ്"
 
-#: src/aosd/aosd_ui.cc:203
+#: src/aosd/aosd_ui.cc:245
 msgid "Relative Y offset:"
 msgstr "താരതമ്യേനയുള്ള Y ഓഫ്‌സെറ്റ്"
 
-#: src/aosd/aosd_ui.cc:210
+#: src/aosd/aosd_ui.cc:249
 msgid "Max OSD width:"
 msgstr "പരമാവധി OSD നീളം"
 
-#: src/aosd/aosd_ui.cc:221
+#: src/aosd/aosd_ui.cc:281
 msgid "Multi-Monitor options"
 msgstr "മള്‍ട്ടി മോണിറ്റര്‍ ക്രമീകരണങ്ങള്‍"
 
-#: src/aosd/aosd_ui.cc:225
+#: src/aosd/aosd_ui.cc:285
 msgid "Display OSD using:"
 msgstr ""
 
-#: src/aosd/aosd_ui.cc:227
+#: src/aosd/aosd_ui.cc:287
 msgid "all monitors"
 msgstr "എല്ലാ മോണിറ്ററുകളും"
 
-#: src/aosd/aosd_ui.cc:230
+#: src/aosd/aosd_ui.cc:290
 #, c-format
 msgid "monitor %i"
 msgstr "മോണിറ്റര്‍ %i"
 
-#: src/aosd/aosd_ui.cc:282
+#: src/aosd/aosd_ui.cc:342
 msgid "Timing (ms)"
 msgstr ""
 
-#: src/aosd/aosd_ui.cc:287
+#: src/aosd/aosd_ui.cc:347
 msgid "Display:"
 msgstr "ഡിസ്പ്ലേ:"
 
-#: src/aosd/aosd_ui.cc:292
+#: src/aosd/aosd_ui.cc:352
 msgid "Fade in:"
 msgstr "ഫെയ്ഡ് ഇന്‍:"
 
-#: src/aosd/aosd_ui.cc:297
+#: src/aosd/aosd_ui.cc:357
 msgid "Fade out:"
 msgstr "ഫെയ്ഡ് ഔട്ട്"
 
-#: src/aosd/aosd_ui.cc:361
+#: src/aosd/aosd_ui.cc:442
 msgid "Fonts"
 msgstr "ഫോണ്ടുകള്‍"
 
-#: src/aosd/aosd_ui.cc:368
+#: src/aosd/aosd_ui.cc:449
 #, c-format
 msgid "Font %i:"
 msgstr "ഫോണ്ട് %i"
 
-#: src/aosd/aosd_ui.cc:382
+#: src/aosd/aosd_ui.cc:466
 msgid "Shadow"
 msgstr "നിഴല്‍"
 
-#: src/aosd/aosd_ui.cc:486
+#: src/aosd/aosd_ui.cc:589
 msgid "Render Style"
 msgstr "റെന്‍ഡര്‍ സ്റ്റൈല്‍"
 
-#: src/aosd/aosd_ui.cc:502
+#: src/aosd/aosd_ui.cc:605
 msgid "Colors"
 msgstr "നിറങ്ങള്‍"
 
-#: src/aosd/aosd_ui.cc:513
+#: src/aosd/aosd_ui.cc:616
 #, c-format
 msgid "Color %i:"
 msgstr "നിറം %i:"
 
-#: src/aosd/aosd_ui.cc:600
+#: src/aosd/aosd_ui.cc:714
 msgid "Enable trigger"
 msgstr "കാഞ്ചി സാദ്ധ്യമാക്കുക"
 
-#: src/aosd/aosd_ui.cc:627
+#: src/aosd/aosd_ui.cc:741
 msgid "Event"
 msgstr "സംഭവം"
 
-#: src/aosd/aosd_ui.cc:655
+#: src/aosd/aosd_ui.cc:768
 msgid "Composite manager detected"
 msgstr "കമ്പോസിറ്റ് മാനേജര്‍ ശ്രദ്ധയില്‍ പെട്ടു"
 
-#: src/aosd/aosd_ui.cc:662
+#: src/aosd/aosd_ui.cc:775
 msgid ""
 "Composite manager not detected;\n"
 "unless you know that you have one running, please activate a composite "
@@ -628,62 +449,58 @@
 "മറ്റൊന്ന് പ്രവര്‍ത്തിക്കുന്നത് നിങ്ങള്‍ക്കറിയാമെങ്കില്‍, ദയവ് ചെയ്ത് ഒരു കമ്പോസിറ്റ് മാനേജര്‍ "
 "പ്രാവര്‍ത്തികമാക്കുക അല്ലെങ്കില്‍ OSD പ്രവര്‍ത്തിച്ചില്ലെന്ന് വരാം"
 
-#: src/aosd/aosd_ui.cc:670
+#: src/aosd/aosd_ui.cc:783
 msgid "Composite manager not required for fake transparency"
 msgstr "വ്യാജമായ സുതാര്യതയ്ക്ക് കമ്പോസിറ്റ് മാനേജര്‍ ആവശ്യമില്ല"
 
-#: src/aosd/aosd_ui.cc:706
+#: src/aosd/aosd_ui.cc:820
 msgid "Transparency"
 msgstr "സുതാര്യത"
 
-#: src/aosd/aosd_ui.cc:712
+#: src/aosd/aosd_ui.cc:826
 msgid "Fake transparency"
 msgstr "കപടസുതാര്യത"
 
-#: src/aosd/aosd_ui.cc:714
+#: src/aosd/aosd_ui.cc:828
 msgid "Real transparency (requires X Composite Ext.)"
 msgstr "യഥാര്‍ത്ഥ സുതാര്യത (X composite Ext. ആവശ്യമുണ്ട്)"
 
-#: src/aosd/aosd_ui.cc:756
+#: src/aosd/aosd_ui.cc:875
 msgid "Composite extension not loaded"
 msgstr "കോമ്പോസിറ്റ് എക്സ്റ്റന്‍ഷന്‍ നിലവില്‍ വന്നിട്ടില്ല"
 
-#: src/aosd/aosd_ui.cc:764
-msgid "Composite extension not available"
-msgstr "കോമ്പോസിറ്റ് എക്സ്റ്റന്‍ഷന്‍ നിലവിലില്ല"
-
-#: src/aosd/aosd_ui.cc:781
+#: src/aosd/aosd_ui.cc:892
 #, c-format
 msgid "Audacious OSD"
 msgstr "ഒഡാഷ്യസ് OSD"
 
-#: src/aosd/aosd_ui.cc:844
+#: src/aosd/aosd_ui.cc:955
 msgid "Position"
 msgstr "സ്ഥാനം"
 
-#: src/aosd/aosd_ui.cc:849
+#: src/aosd/aosd_ui.cc:960
 msgid "Animation"
 msgstr "അനിമേഷന്‍"
 
-#: src/aosd/aosd_ui.cc:854
+#: src/aosd/aosd_ui.cc:965
 msgid "Text"
 msgstr "എഴുത്ത്"
 
-#: src/aosd/aosd_ui.cc:859
+#: src/aosd/aosd_ui.cc:970
 msgid "Decoration"
 msgstr "അലങ്കാരം"
 
-#: src/aosd/aosd_ui.cc:864
+#: src/aosd/aosd_ui.cc:975
 msgid "Trigger"
 msgstr "കാഞ്ചി"
 
-#: src/aosd/aosd_ui.cc:869
+#: src/aosd/aosd_ui.cc:980 src/streamtuner/shoutcast-model.cc:202
 msgid "Misc"
 msgstr "പലവക"
 
-#: src/aosd/aosd_ui.cc:878
+#: src/aosd/aosd_ui.cc:989
 msgid "Test"
-msgstr ""
+msgstr "പരിശോധന"
 
 #: src/asx3/asx3.cc:35
 msgid "ASXv3 Playlists"
@@ -697,11 +514,83 @@
 msgid "Audacious Playlists (audpl)"
 msgstr ""
 
-#: src/blur_scope/blur_scope.cc:42
+#: src/background_music/background_music.cc:24
+msgid "Background music"
+msgstr ""
+
+#: src/background_music/background_music.cc:25
+msgid "Target level:"
+msgstr ""
+
+#: src/background_music/background_music.cc:28
+#: src/background_music/background_music.cc:33
+#: src/silence-removal/silence-removal.cc:70
+msgid "dB"
+msgstr "dB"
+
+#: src/background_music/background_music.cc:29
+msgid "Maximum amplification:"
+msgstr ""
+
+#: src/background_music/background_music.cc:34 src/mpg123/mpg123.cc:81
+msgid "Advanced"
+msgstr ""
+
+#: src/background_music/background_music.cc:36
+msgid "Slow detection weight:"
+msgstr ""
+
+#: src/background_music/background_music.cc:39
+msgid "Hint"
+msgstr ""
+
+#: src/background_music/background_music.cc:41
+msgid ""
+"Slow detection weight is the relative weight\n"
+"of a long term average detection when compared\n"
+"to the actual, faster loudness detection.\n"
+"A value of zero gives a more radio-like sound\n"
+"where soft passages get \"pulled up\" more quickly,\n"
+"a value of two makes the sound feel less compressed."
+msgstr ""
+
+#: src/background_music/background_music.cc:52
+msgid ""
+"Background Music Plugin for Audacious\n"
+"Copyright 2023;2024 Michel Fleur\n"
+"\n"
+"Controls the volume to make the sound equally loud within and between "
+"tracks.\n"
+" It uses accurate loudness measurement and tries to make the volume changes "
+"sound natural without audible peaks, yet without lowering the volume before "
+"a peak in advance."
+msgstr ""
+
+#: src/background_music/background_music.cc:61
+msgid "Background Music"
+msgstr ""
+
+#: src/bitcrusher/bitcrusher.cc:33
+msgid "Bitcrusher"
+msgstr ""
+
+#: src/bitcrusher/bitcrusher.cc:34
+msgid "Bit Depth:"
+msgstr ""
+
+#: src/bitcrusher/bitcrusher.cc:37
+msgid "Downsample ratio:"
+msgstr ""
+
+#: src/bitcrusher/bitcrusher.cc:48
+msgid "Bitcrusher"
+msgstr ""
+
+#: src/blur_scope/blur_scope.cc:40 src/blur_scope-qt/blur_scope.cc:45
 msgid "Color"
 msgstr "നിറം"
 
-#: src/blur_scope/blur_scope.cc:58
+#: src/blur_scope/blur_scope.cc:56 src/blur_scope-qt/blur_scope.cc:158
 msgid "Blur Scope"
 msgstr "ബ്ലര്‍ സ്കോപ്പ്"
 
@@ -713,6 +602,10 @@
 msgid "Presets:"
 msgstr "പ്രീസെറ്റുകള്‍:"
 
+#: src/bs2b/plugin.cc:130
+msgid "Default"
+msgstr "സ്വതസ്സിദ്ധം"
+
 #: src/bs2b/plugin.cc:136
 msgid "Feed level:"
 msgstr "ഫീഡ് ലെവല്‍:"
@@ -725,15 +618,15 @@
 msgid "Cut frequency:"
 msgstr "ആവൃത്തി മുറിയ്ക്കുക:"
 
-#: src/cairo-spectrum/cairo-spectrum.cc:41
+#: src/cairo-spectrum/cairo-spectrum.cc:42 src/qt-spectrum/qt-spectrum.cc:107
 msgid "Spectrum Analyzer"
 msgstr "സ്പെക്ട്രം അനലൈസര്‍"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:72
+#: src/cdaudio/cdaudio-ng.cc:74
 msgid "Audio CD Plugin"
 msgstr "ഓഡിയോ സി.ഡി. പ്ലഗ്ഗിന്‍"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:121
+#: src/cdaudio/cdaudio-ng.cc:121
 msgid ""
 "Copyright (C) 2007-2012 Calin Crisan <ccrisan@gmail.com> and others.\n"
 "\n"
@@ -745,132 +638,132 @@
 "This was a Google Summer of Code 2007 project."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:137
+#: src/cdaudio/cdaudio-ng.cc:140
 msgid "Device"
 msgstr "ഉപകരണം"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:138
+#: src/cdaudio/cdaudio-ng.cc:141
 msgid "Read speed:"
 msgstr "വായനയുടെ വേഗം:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:141
+#: src/cdaudio/cdaudio-ng.cc:144
 msgid "Override device:"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:143
+#: src/cdaudio/cdaudio-ng.cc:146
 msgid "Metadata"
 msgstr "മെറ്റാഡേറ്റ"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:144
+#: src/cdaudio/cdaudio-ng.cc:147
 msgid "Use CD-Text"
 msgstr "സി.ഡി.-ടെക്സ്റ്റ് ഉപയോഗിയ്ക്കുക"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:146
+#: src/cdaudio/cdaudio-ng.cc:150
 msgid "Use CDDB"
 msgstr "CDDB ഉപയോഗിയ്ക്കുക"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:148
+#: src/cdaudio/cdaudio-ng.cc:152
 msgid "Use HTTP instead of CDDBP"
 msgstr "CDDBP യ്ക്ക് പകരം HTTP ഉപയോഗിക്കാം"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:151
+#: src/cdaudio/cdaudio-ng.cc:155
 msgid "Server:"
 msgstr "സെര്‍വര്‍:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:155
+#: src/cdaudio/cdaudio-ng.cc:159
 msgid "Path:"
 msgstr "പാത്ത്:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:159
+#: src/cdaudio/cdaudio-ng.cc:163
 msgid "Port:"
 msgstr "പോര്‍ട്ട്:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:246
+#: src/cdaudio/cdaudio-ng.cc:228
 msgid "Failed to initialize cdio subsystem."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:281
+#: src/cdaudio/cdaudio-ng.cc:260
 #, c-format
 msgid "Invalid URI %s."
 msgstr "അസാധുവായ URI %s."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:283
+#: src/cdaudio/cdaudio-ng.cc:262
 #, c-format
 msgid "Track %d not found."
 msgstr "ട്രാക്ക് %d കണ്ടുകിട്ടിയില്ല."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:285
+#: src/cdaudio/cdaudio-ng.cc:264
 #, c-format
 msgid "Track %d is a data track."
 msgstr "ട്രാക്ക് %d ഒരു ഡേറ്റാ ട്രാക്ക് ആണ്."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:360
+#: src/cdaudio/cdaudio-ng.cc:339
 msgid "Error reading audio CD."
 msgstr "ഓഡിയോ സി.ഡി. വായിയ്ക്കുന്നതില്‍ പിശക്."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:429
+#: src/cdaudio/cdaudio-ng.cc:410
 msgid "Audio CD"
 msgstr "ഓഡിയോ സി.ഡി."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:460 src/cdaudio-ng/cdaudio-ng.cc:469
+#: src/cdaudio/cdaudio-ng.cc:446 src/cdaudio/cdaudio-ng.cc:455
 #, c-format
 msgid "Failed to open CD device %s."
 msgstr "സി.ഡി. ഉപകരണം %s തുറക്കുന്നതില്‍ പരാജയപ്പെട്ടു."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:472
+#: src/cdaudio/cdaudio-ng.cc:458
 msgid "No audio capable CD drive found."
 msgstr "ഓഡിയോ ശേഷിയുള്ള സി.ഡി. ഡ്രൈവ് കണ്ടുകിട്ടിയില്ല."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:497
+#: src/cdaudio/cdaudio-ng.cc:481
+msgid "Drive is empty."
+msgstr "ഡ്രൈവ് ശൂന്യമാണ്."
+
+#: src/cdaudio/cdaudio-ng.cc:483
+msgid "Unsupported disk type."
+msgstr "പിന്തുണയില്ലാത്ത തരം ഡിസ്ക്."
+
+#: src/cdaudio/cdaudio-ng.cc:507
 msgid "Failed to finish initializing opened CD drive."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:510
+#: src/cdaudio/cdaudio-ng.cc:520
 msgid "Failed to retrieve first/last track number."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:531
+#: src/cdaudio/cdaudio-ng.cc:541
 #, c-format
 msgid "Cannot read start/end LSN for track %d."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:613
-msgid "Failed to create the cddb connection."
-msgstr "cddb ബന്ധം സാദ്ധ്യമാക്കുന്നതില്‍ പരാജയപ്പെട്ടു."
+#: src/cdaudio/cdaudio-ng.cc:624
+msgid "Failed to create the CDDB connection."
+msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:679
+#: src/cdaudio/cdaudio-ng.cc:690
 msgid "Failed to query the CDDB server"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:681
+#: src/cdaudio/cdaudio-ng.cc:692
 #, c-format
 msgid "Failed to query the CDDB server: %s"
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:705
+#: src/cdaudio/cdaudio-ng.cc:716
 #, c-format
-msgid "Failed to read the cddb info: %s"
-msgstr "cddb ഇന്‍ഫോ വായിയ്ക്കുന്നതില്‍ പരാജയം: %s"
-
-#: src/cdaudio-ng/cdaudio-ng.cc:765
-msgid "Drive is empty."
-msgstr "ഡ്രൈവ് ശൂന്യമാണ്."
-
-#: src/cdaudio-ng/cdaudio-ng.cc:767
-msgid "Unsupported disk type."
-msgstr "പിന്തുണയില്ലാത്ത തരം ഡിസ്ക്."
+msgid "Failed to read the CDDB info: %s"
+msgstr ""
 
-#: src/cd-menu-items/cd-menu-items.cc:35
+#: src/cd-menu-items/cd-menu-items.cc:33
 msgid "Audio CD Menu Items"
 msgstr "ഓഡിയോ സി.ഡി. മെനു അംഗങ്ങള്‍"
 
-#: src/cd-menu-items/cd-menu-items.cc:47
-msgid "Play CD"
-msgstr "സി.ഡി. പാടുക"
-
-#: src/cd-menu-items/cd-menu-items.cc:47
-msgid "Add CD"
-msgstr "സി.ഡി. ചേര്‍ക്കുക"
+#: src/cd-menu-items/cd-menu-items.cc:45
+msgid "Pla_y CD"
+msgstr ""
+
+#: src/cd-menu-items/cd-menu-items.cc:45
+msgid "_Add CD"
+msgstr ""
 
 #: src/compressor/compressor.cc:45
 msgid "Compression"
@@ -920,7 +813,14 @@
 msgid "Default song length:"
 msgstr "പാട്ടിന്റെ സ്വതസ്സിദ്ധമായ നീളം"
 
-#: src/console/plugin.cc:42 src/modplug/plugin_main.cc:59
+#: src/console/plugin.cc:41 src/crossfade/crossfade.cc:56
+#: src/crossfade/crossfade.cc:62 src/lirc/lirc.cc:395 src/notify/notify.cc:113
+#: src/sid/xs_config.cc:85 src/sid/xs_config.cc:94 src/sid/xs_config.cc:103
+#: src/vumeter-qt/vumeter_qt.cc:39
+msgid "seconds"
+msgstr "സെക്കന്‍ഡുകള്‍"
+
+#: src/console/plugin.cc:42 src/modplug/plugin_main.cc:58
 msgid "Resampling"
 msgstr "റീസാംപ്ലിങ്"
 
@@ -944,72 +844,82 @@
 msgid "Game Console Music Decoder"
 msgstr "ഗെയിം കണ്‍സോള്‍ മ്യൂസിക് ഡീകോഡര്‍"
 
-#: src/coreaudio/coreaudio.cc:50
+#: src/coreaudio/coreaudio.cc:53
 msgid "CoreAudio output"
 msgstr ""
 
-#: src/coreaudio/coreaudio.cc:131
+#: src/coreaudio/coreaudio.cc:155
 msgid ""
 "CoreAudio Output Plugin for Audacious\n"
 "Copyright 2014 William Pitcock\n"
+"Copyright 2017,18 René J.V. Bertin\n"
+" (original code and code adapted from\n"
+" Apple examples, (C) Apple 2013)\n"
 "\n"
 "Based on SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
 msgstr ""
 
-#: src/coreaudio/coreaudio.cc:143
+#: src/coreaudio/coreaudio.cc:171
 msgid "Use exclusive mode"
 msgstr ""
 
-#: src/crossfade/crossfade.cc:44
+#: src/coreaudio/coreaudio.cc:173
+msgid "Use bit perfect audio (adapt device sampling rate)"
+msgstr ""
+
+#: src/crossfade/crossfade.cc:47
 msgid ""
 "Crossfade Plugin for Audacious\n"
 "Copyright 2010-2014 John Lindgren"
 msgstr ""
 
-#: src/crossfade/crossfade.cc:48
+#: src/crossfade/crossfade.cc:51
 msgid "Crossfade"
 msgstr "ക്രോസ്‌ഫെയ്ഡ്"
 
-#: src/crossfade/crossfade.cc:49
+#: src/crossfade/crossfade.cc:52
 msgid "On automatic song change"
 msgstr ""
 
-#: src/crossfade/crossfade.cc:51 src/crossfade/crossfade.cc:57
+#: src/crossfade/crossfade.cc:54 src/crossfade/crossfade.cc:60
 msgid "Overlap:"
 msgstr "ഓവര്‍ലാപ്പ്:"
 
-#: src/crossfade/crossfade.cc:55
+#: src/crossfade/crossfade.cc:58
 msgid "On seek or manual song change"
 msgstr ""
 
-#: src/crossfade/crossfade.cc:61
+#: src/crossfade/crossfade.cc:64
+msgid "No fade in"
+msgstr ""
+
+#: src/crossfade/crossfade.cc:66
+msgid "Use S-curve fade"
+msgstr ""
+
+#: src/crossfade/crossfade.cc:68
+msgid "S-curve steepness:"
+msgstr ""
+
+#: src/crossfade/crossfade.cc:70
+msgid "(higher is steeper)"
+msgstr ""
+
+#: src/crossfade/crossfade.cc:72
 msgid "Tip"
 msgstr ""
 
-#: src/crossfade/crossfade.cc:62
+#: src/crossfade/crossfade.cc:73
 msgid ""
 "For better crossfading, enable\n"
 "the Silence Removal effect."
 msgstr ""
 
-#: src/crossfade/crossfade.cc:72
+#: src/crossfade/crossfade.cc:83
 msgid "Crossfade"
 msgstr "ക്രോസ്‌ഫെയ്ഡ്"
 
-#: src/crossfade/crossfade.cc:161
-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.cc:168
-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/crystalizer/crystalizer.cc:31
 msgid "Crystalizer"
 msgstr "ക്രിസ്റ്റലൈസര്‍"
@@ -1022,60 +932,61 @@
 msgid "Crystalizer"
 msgstr "ക്രിസ്റ്റലൈസര്‍"
 
-#: src/cue/cue.cc:37
+#: src/cue/cue.cc:42
 msgid "Cue Sheet Plugin"
 msgstr ""
 
-#: src/delete-files/delete-files.cc:46 src/delete-files/delete-files.cc:146
+#: src/delete-files/delete-files.cc:53 src/delete-files/delete-files.cc:215
+#: src/delete-files/delete-files.cc:230
 msgid "Delete Files"
 msgstr ""
 
-#: src/delete-files/delete-files.cc:75
-#, c-format
-msgid "Error moving %s to trash: %s."
+#: src/delete-files/delete-files.cc:120
+msgid "No files are selected."
 msgstr ""
 
-#: src/delete-files/delete-files.cc:86
+#: src/delete-files/delete-files.cc:125
 #, c-format
-msgid "Error deleting %s: %s."
+msgid "Do you want to move %s to the trash?"
 msgstr ""
 
-#: src/delete-files/delete-files.cc:117
+#: src/delete-files/delete-files.cc:126
 #, c-format
-msgid "Error deleting %s: not a local file."
+msgid "Do you want to permanently delete %s?"
 msgstr ""
 
-#: src/delete-files/delete-files.cc:134
-msgid "Do you want to move the selected files to the trash?"
+#: src/delete-files/delete-files.cc:133
+#, c-format
+msgid "Do you want to move %d files to the trash?"
 msgstr ""
 
-#: src/delete-files/delete-files.cc:135
-msgid "Move to Trash"
+#: src/delete-files/delete-files.cc:134
+#, c-format
+msgid "Do you want to permanently delete %d files?"
 msgstr ""
 
-#: src/delete-files/delete-files.cc:140
-msgid "Do you want to permanently delete the selected files?"
+#: src/delete-files/delete-files.cc:146
+msgid "Move to trash"
 msgstr ""
 
-#: src/delete-files/delete-files.cc:141 src/skins/preset-list.cc:411
-#: src/skins/preset-list.cc:427
+#: src/delete-files/delete-files.cc:146
 msgid "Delete"
 msgstr "നീക്കം ചെയ്യുക"
 
-#: src/delete-files/delete-files.cc:145 src/skins/preset-browser.cc:56
-#: src/skins/preset-list.cc:307 src/skins/ui_playlist.cc:221
+#: src/delete-files/delete-files.cc:213 src/delete-files/delete-files.cc:235
+#: src/skins-qt/search-select.cc:102 src/skins/search-select.cc:78
 msgid "Cancel"
 msgstr "റദ്ദാക്കുക"
 
-#: src/delete-files/delete-files.cc:166
+#: src/delete-files/delete-files.cc:267
 msgid "Delete Selected Files"
 msgstr ""
 
-#: src/delete-files/delete-files.cc:181
+#: src/delete-files/delete-files.cc:287
 msgid "Delete Method"
 msgstr ""
 
-#: src/delete-files/delete-files.cc:182
+#: src/delete-files/delete-files.cc:288
 msgid "Move to trash instead of deleting immediately"
 msgstr ""
 
@@ -1091,21 +1002,21 @@
 msgid "Echo"
 msgstr "പ്രതിധ്വനി"
 
-#: src/echo_plugin/echo.cc:22 src/modplug/plugin_main.cc:73
-#: src/modplug/plugin_main.cc:83
+#: src/echo_plugin/echo.cc:22 src/modplug/plugin_main.cc:72
+#: src/modplug/plugin_main.cc:82
 msgid "Delay:"
 msgstr "താമസം:"
 
-#: src/echo_plugin/echo.cc:24 src/modplug/plugin_main.cc:73
-#: src/modplug/plugin_main.cc:83
+#: src/echo_plugin/echo.cc:24 src/modplug/plugin_main.cc:72
+#: src/modplug/plugin_main.cc:82 src/xsf/plugin.cc:445
 msgid "ms"
-msgstr ""
+msgstr "ms"
 
 #: src/echo_plugin/echo.cc:25
 msgid "Feedback:"
 msgstr "അഭിപ്രായം:"
 
-#: src/echo_plugin/echo.cc:28 src/modplug/plugin_main.cc:87
+#: src/echo_plugin/echo.cc:28 src/modplug/plugin_main.cc:86
 msgid "Volume:"
 msgstr "ശബ്ദോച്ചത:"
 
@@ -1113,11 +1024,11 @@
 msgid "Echo"
 msgstr "പ്രതിധ്വനി"
 
-#: src/ffaudio/ffaudio-core.cc:41
+#: src/ffaudio/ffaudio-core.cc:50
 msgid "FFmpeg Plugin"
 msgstr "FFmpeg പ്ലഗ്ഗിന്‍"
 
-#: src/ffaudio/ffaudio-core.cc:571
+#: src/ffaudio/ffaudio-core.cc:649
 msgid ""
 "Multi-format audio decoding plugin for Audacious using\n"
 "FFmpeg multimedia framework (http://www.ffmpeg.org/)\n"
@@ -1127,235 +1038,306 @@
 "Matti Hämäläinen <ccr@tnsp.org>"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:45
+#: src/filewriter/filewriter.cc:48
 msgid "FileWriter Plugin"
 msgstr "FileWriter പ്ലഗ്ഗിന്‍"
 
-#: src/filewriter/filewriter.cc:386
+#: src/filewriter/filewriter.cc:316
+#, c-format
+msgid ""
+"Error opening %s:\n"
+"%s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:358
+msgid ""
+"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/filewriter/filewriter.cc:385
 msgid "Output file format:"
 msgstr "ഔട്പുട്ട് ഫയല്‍ ഫോര്‍മാറ്റ്:"
 
-#: src/filewriter/filewriter.cc:403
-msgid "Configure"
-msgstr "ക്രമീകരിയ്ക്കുക"
-
-#: src/filewriter/filewriter.cc:413
+#: src/filewriter/filewriter.cc:389
 msgid "Save into original directory"
 msgstr "യഥാര്‍ത്ഥഡയറക്റ്ററിയിലേയ്ക്ക സേവ് ചെയ്യുക"
 
-#: src/filewriter/filewriter.cc:417
-msgid "Save into custom directory"
-msgstr "സ്വേച്ഛയാലുള്ള ഡയറക്റ്ററിയിലേയ്ക്ക് സേവ് ചെയ്യുക"
-
-#: src/filewriter/filewriter.cc:427
-msgid "Output file folder:"
-msgstr "ഔട്പുട്ട് ഫയല്‍ ഫോള്‍ഡര്‍:"
-
-#: src/filewriter/filewriter.cc:431
-msgid "Pick a folder"
-msgstr "ഒരു ഫോള്‍ഡര്‍ തിരഞ്ഞെടുക്കുക"
-
-#: src/filewriter/filewriter.cc:444
-msgid "Generate file name from:"
+#: src/filewriter/filewriter.cc:392
+msgid "Save into custom directory:"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:448
-msgid "Original file tag"
+#: src/filewriter/filewriter.cc:400
+msgid "Generate file name from:"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:453
+#: src/filewriter/filewriter.cc:401
 msgid "Original file name"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:459
-msgid "Include original file name extension"
+#: src/filewriter/filewriter.cc:404
+msgid "Original file name (no suffix)"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:468
-msgid "Prepend track number to file name"
+#: src/filewriter/filewriter.cc:407
+msgid "Original file tag"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:484
-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."
+#: src/filewriter/filewriter.cc:411
+msgid "Prepend track number to file name"
 msgstr ""
 
-#: src/filewriter/mp3.cc:40 src/filewriter/mp3.cc:717
+#: src/filewriter/filewriter.cc:417 src/filewriter/filewriter.cc:449
 msgid "Auto"
 msgstr "സ്വയം"
 
-#: src/filewriter/mp3.cc:40
+#: src/filewriter/filewriter.cc:418
+msgid "8000 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:419
+msgid "11025 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:420
+msgid "12000 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:421
+msgid "16000 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:422
+msgid "22050 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:423
+msgid "24000 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:424
+msgid "32000 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:425 src/xsf/plugin.cc:430
+msgid "44100 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:426 src/xsf/plugin.cc:431
+msgid "48000 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:430
+msgid "8 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:431
+msgid "16 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:432
+msgid "32 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:433
+msgid "40 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:434
+msgid "48 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:435
+msgid "56 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:436
+msgid "64 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:437
+msgid "80 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:438
+msgid "96 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:439
+msgid "112 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:440
+msgid "128 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:441
+msgid "160 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:442
+msgid "192 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:443
+msgid "224 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:444
+msgid "256 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:445
+msgid "320 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:450
 msgid "Joint Stereo"
 msgstr "കൂട്ടിച്ചേര്‍ത്ത സ്റ്റീരിയോ"
 
-#: src/filewriter/mp3.cc:41 src/modplug/plugin_main.cc:58
-#: src/mpg123/mpg123.cc:248
+#: src/filewriter/filewriter.cc:451 src/modplug/plugin_main.cc:57
+#: src/mpg123/mpg123.cc:259
 msgid "Stereo"
 msgstr "സ്റ്റീരിയോ"
 
-#: src/filewriter/mp3.cc:41 src/modplug/plugin_main.cc:57
-#: src/mpg123/mpg123.cc:248
+#: src/filewriter/filewriter.cc:452 src/modplug/plugin_main.cc:56
+#: src/mpg123/mpg123.cc:260
 msgid "Mono"
 msgstr "മോണോ"
 
-#: src/filewriter/mp3.cc:657
-msgid "MP3 Configuration"
-msgstr "MP3 ക്രമീകരണം"
-
-#: src/filewriter/mp3.cc:658
-msgid "_OK"
+#: src/filewriter/filewriter.cc:456
+msgid "VBR"
 msgstr ""
 
-#: src/filewriter/mp3.cc:681
-msgid "Algorithm Quality:"
-msgstr "ഓല്‍ഗൊരിതം ഗുണമേന്മ:"
-
-#: src/filewriter/mp3.cc:706
-msgid "Output Sample Rate:"
+#: src/filewriter/filewriter.cc:457
+msgid "ABR"
 msgstr ""
 
-#: src/filewriter/mp3.cc:733
-msgid "(Hz)"
-msgstr "(Hz)"
-
-#: src/filewriter/mp3.cc:740
-msgid "Bitrate / Compression Ratio:"
+#: src/filewriter/filewriter.cc:478
+msgid "Algorithm quality:"
 msgstr ""
 
-#: src/filewriter/mp3.cc:764
-msgid "Bitrate (kbps):"
-msgstr "ബിറ്റ്‌റേറ്റ് (kbps):"
+#: src/filewriter/filewriter.cc:484
+msgid "Bitrate:"
+msgstr ""
 
-#: src/filewriter/mp3.cc:796
+#: src/filewriter/filewriter.cc:491
 msgid "Compression ratio:"
 msgstr "കംപ്രഷന്‍ നിരക്ക്:"
 
-#: src/filewriter/mp3.cc:820
-msgid "Audio Mode:"
-msgstr "ഓഡിയോ മോഡ്:"
-
-#: src/filewriter/mp3.cc:845
-msgid "Miscellaneous:"
+#: src/filewriter/filewriter.cc:498
+msgid "Audio mode:"
 msgstr ""
 
-#: src/filewriter/mp3.cc:856
+#: src/filewriter/filewriter.cc:501
 msgid "Enforce strict ISO compliance"
 msgstr ""
 
-#: src/filewriter/mp3.cc:867
+#: src/filewriter/filewriter.cc:503
 msgid "Error protection"
 msgstr "സംരക്ഷണ പിശക്"
 
-#: src/filewriter/mp3.cc:879 src/filewriter/vorbis.cc:206
-msgid "Quality"
-msgstr "ഗുണമേന്മ"
-
-#: src/filewriter/mp3.cc:888
+#: src/filewriter/filewriter.cc:508
 msgid "Enable VBR/ABR"
 msgstr "VBR/ABR സാദ്ധ്യമാക്കുക"
 
-#: src/filewriter/mp3.cc:898
+#: src/filewriter/filewriter.cc:510
 msgid "Type:"
 msgstr "തരം:"
 
-#: src/filewriter/mp3.cc:931
-msgid "VBR Options:"
-msgstr "VBR ഓപ്ഷനുകള്‍"
-
-#: src/filewriter/mp3.cc:947
-msgid "Minimum bitrate (kbps):"
-msgstr "കുറഞ്ഞ ബിറ്റ്‌റേറ്റ് (kbps):"
-
-#: src/filewriter/mp3.cc:973
-msgid "Maximum bitrate (kbps):"
-msgstr "പരമാവധി ബിറ്റ്‌റേറ്റ് (kbps):"
+#: src/filewriter/filewriter.cc:514
+msgid "Minimum bitrate:"
+msgstr ""
 
-#: src/filewriter/mp3.cc:995
-msgid "Strictly enforce minimum bitrate"
-msgstr "ചുരുങ്ങിയ ബൈട്രേറ്റ് കര്‍ശനമായി നിര്‍ബന്ധിക്കുക"
+#: src/filewriter/filewriter.cc:518
+msgid "Maximum bitrate:"
+msgstr ""
 
-#: src/filewriter/mp3.cc:1007
-msgid "ABR Options:"
-msgstr "ABR ക്രമീകരണങ്ങള്‍:"
-
-#: src/filewriter/mp3.cc:1017
-msgid "Average bitrate (kbps):"
-msgstr "ശരാശരി ബിറ്റ്റേറ്റ് (kbps):"
+#: src/filewriter/filewriter.cc:522
+msgid "Average bitrate:"
+msgstr ""
 
-#: src/filewriter/mp3.cc:1044
+#: src/filewriter/filewriter.cc:526
 msgid "VBR quality level:"
 msgstr "VBR ഗുണനിലവാരം:"
 
-#: src/filewriter/mp3.cc:1063
+#: src/filewriter/filewriter.cc:530
+msgid "Strictly enforce minimum bitrate"
+msgstr "ചുരുങ്ങിയ ബൈട്രേറ്റ് കര്‍ശനമായി നിര്‍ബന്ധിക്കുക"
+
+#: src/filewriter/filewriter.cc:533
 msgid "Omit Xing VBR header"
 msgstr ""
 
-#: src/filewriter/mp3.cc:1076
-msgid "VBR/ABR"
-msgstr "VBR/ABR"
-
-#: src/filewriter/mp3.cc:1085
-msgid "Frame Parameters:"
+#: src/filewriter/filewriter.cc:539
+msgid "Frame Headers"
 msgstr ""
 
-#: src/filewriter/mp3.cc:1097
+#: src/filewriter/filewriter.cc:540
 msgid "Mark as copyright"
 msgstr "കോപ്പിറൈറ്റടായി അടയാളപ്പെടുത്തുക"
 
-#: src/filewriter/mp3.cc:1108
+#: src/filewriter/filewriter.cc:542
 msgid "Mark as original"
 msgstr "പ്രഥമമായി അടയാളപ്പെടുത്തുക"
 
-#: src/filewriter/mp3.cc:1120
-msgid "ID3 Parameters:"
+#: src/filewriter/filewriter.cc:544
+msgid "ID3 Tags"
 msgstr ""
 
-#: src/filewriter/mp3.cc:1131
+#: src/filewriter/filewriter.cc:545
 msgid "Force addition of version 2 tag"
 msgstr "വെര്‍ഷന്‍ 2 ടാഗിന്റെ സംയോഗം നിര്‍ബന്ധിക്കുക"
 
-#: src/filewriter/mp3.cc:1141
+#: src/filewriter/filewriter.cc:547
 msgid "Only add v1 tag"
 msgstr "v1 ടാഗ് മാത്രം സംയോഗിക്കുക"
 
-#: src/filewriter/mp3.cc:1148
+#: src/filewriter/filewriter.cc:549
 msgid "Only add v2 tag"
 msgstr "v2 ടാഗ് മാത്രം സംയോഗിക്കുക"
 
-#: src/filewriter/mp3.cc:1169
+#: src/filewriter/filewriter.cc:554
+msgid "Quality"
+msgstr "ഗുണമേന്മ"
+
+#: src/filewriter/filewriter.cc:555
+msgid "VBR/ABR"
+msgstr "VBR/ABR"
+
+#: src/filewriter/filewriter.cc:556
 msgid "Tags"
 msgstr "ടാഗുകള്‍"
 
-#: src/filewriter/vorbis.cc:196
-msgid "Vorbis Encoder Configuration"
-msgstr "വോര്‍ബിസ് എന്‍കോഡര്‍ ക്രമീകരണം"
-
-#: src/filewriter/vorbis.cc:219
-msgid "Quality level (0 - 10):"
-msgstr "ഗുണനിലവാരം ( 0 - 10):"
+#: src/filewriter/filewriter.cc:566
+msgid "Quality (0-1):"
+msgstr ""
 
-#: src/flacng/flacng.h:35
+#: src/filewriter/filewriter.cc:573 src/skins-qt/skins_cfg.cc:307
+#: src/skins/skins_cfg.cc:289
+msgid "General"
+msgstr "പൊതുവായവ"
+
+#: src/flac/flacng.h:36
 msgid "FLAC Decoder"
 msgstr "FLAC ഡീകോഡര്‍"
 
-#: src/flacng/metadata.cc:351 src/wavpack/wavpack.cc:209
+#: src/flac/metadata.cc:296 src/wavpack/wavpack.cc:215
 msgid "lossless"
 msgstr "ലോസ്‌ലെസ്സ്"
 
-#: src/flacng/plugin.cc:169
+#: src/flac/plugin.cc:214
 msgid ""
 "Original code by\n"
 "Ralf Ertzinger <ralf@skytale.net>\n"
@@ -1373,15 +1355,15 @@
 msgid "GIO Plugin"
 msgstr "GIO പ്ലഗ്ഗിന്‍"
 
-#: src/gio/gio.cc:153
+#: src/gio/gio.cc:152
 msgid "Read-and-append mode not supported"
 msgstr ""
 
-#: src/gio/gio.cc:166
+#: src/gio/gio.cc:165
 msgid "Invalid open mode"
 msgstr ""
 
-#: src/gl-spectrum/gl-spectrum.cc:51
+#: src/glspectrum/gl-spectrum.cc:52
 msgid ""
 "OpenGL Spectrum Analyzer for Audacious\n"
 "Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
@@ -1393,622 +1375,754 @@
 "License: GPLv2+"
 msgstr ""
 
-#: src/gl-spectrum/gl-spectrum.cc:62
+#: src/glspectrum/gl-spectrum.cc:63 src/qtglspectrum/gl-spectrum.cc:53
 msgid "OpenGL Spectrum Analyzer"
 msgstr "OpenGL സ്പെക്ട്രം അനലൈസര്‍"
 
-#: src/gl-spectrum-qt/gl-spectrum.cc:41
-msgid ""
-"OpenGL Spectrum Analyzer for Audacious\n"
-"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
-"Copyright 2014 William Pitcock\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-qt/gl-spectrum.cc:53
-msgid "OpenGL Spectrum Analyzer (Qt)"
-msgstr ""
-
-#: src/gnomeshortcuts/gnomeshortcuts.cc:38
-msgid "GNOME Shortcuts"
+#: src/gtkui/columns.cc:36 src/moonstone/playlist_model.cc:38
+#: src/qtui/playlist_model.cc:33
+msgid "Entry Number"
 msgstr ""
 
-#: src/gnomeshortcuts/gnomeshortcuts.cc:54
-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/gtkui/columns.cc:35
-msgid "Entry number"
-msgstr "എന്‍ട്രി നമ്പര്‍"
-
-#: src/gtkui/columns.cc:36 src/playlist-manager/playlist-manager.cc:225
-#: src/qtui/playlist_model.cc:123
+#: src/gtkui/columns.cc:37 src/moonstone/playlist_model.cc:38
+#: src/moonstone/playlist_selection.cc:64
+#: src/playlist-manager/playlist-manager.cc:200
+#: src/playlist-manager-qt/playlist-manager-qt.cc:188
+#: src/qtui/playlist_model.cc:33 src/streamtuner/icecast-model.cc:120
+#: src/streamtuner/ihr-model.cc:159 src/streamtuner/shoutcast-model.cc:122
 msgid "Title"
 msgstr "ടൈറ്റില്‍"
 
-#: src/gtkui/columns.cc:37 src/qtui/playlist_model.cc:125
+#: src/gtkui/columns.cc:38 src/moonstone/playlist_model.cc:39
+#: src/qtui/playlist_model.cc:33
 msgid "Artist"
 msgstr "ആര്‍ട്ടിസ്റ്റ്"
 
-#: src/gtkui/columns.cc:38
+#: src/gtkui/columns.cc:39 src/moonstone/playlist_model.cc:39
+#: src/qtui/playlist_model.cc:33
 msgid "Year"
 msgstr "വര്‍ഷം"
 
-#: src/gtkui/columns.cc:39 src/qtui/playlist_model.cc:127
+#: src/gtkui/columns.cc:40 src/moonstone/playlist_model.cc:39
+#: src/qtui/playlist_model.cc:34
 msgid "Album"
 msgstr "ആല്‍ബം"
 
-#: src/gtkui/columns.cc:40
-msgid "Album artist"
+#: src/gtkui/columns.cc:41 src/moonstone/playlist_model.cc:40
+#: src/qtui/playlist_model.cc:34
+msgid "Album Artist"
 msgstr ""
 
-#: src/gtkui/columns.cc:41
+#: src/gtkui/columns.cc:42 src/moonstone/playlist_model.cc:40
+#: src/qtui/playlist_model.cc:34
 msgid "Track"
 msgstr "ട്രാക്ക്"
 
-#: src/gtkui/columns.cc:42
+#: src/gtkui/columns.cc:43 src/moonstone/playlist_model.cc:40
+#: src/qtui/playlist_model.cc:34 src/streamtuner/icecast-model.cc:123
+#: src/streamtuner/shoutcast-model.cc:125
+#: src/streamtuner/shoutcast-model.cc:236
 msgid "Genre"
 msgstr "തരം"
 
-#: src/gtkui/columns.cc:43
-msgid "Queue position"
-msgstr "വരിയിലുള്ള സ്ഥാനം"
+#: src/gtkui/columns.cc:44 src/moonstone/playlist_model.cc:41
+#: src/qtui/playlist_model.cc:35
+msgid "Queue Position"
+msgstr ""
 
-#: src/gtkui/columns.cc:44
+#: src/gtkui/columns.cc:45 src/moonstone/playlist_model.cc:41
+#: src/qtui/playlist_model.cc:35
 msgid "Length"
 msgstr "നീളം"
 
-#: src/gtkui/columns.cc:45
-msgid "File path"
-msgstr "ഫയല്‍ പാത്ത്"
-
-#: src/gtkui/columns.cc:47
-msgid "Custom title"
-msgstr "സ്വേച്ഛയാലുള്ള തലക്കെട്ട്"
+#: src/gtkui/columns.cc:46 src/moonstone/playlist_model.cc:41
+#: src/qtui/playlist_model.cc:35
+msgid "File Path"
+msgstr ""
+
+#: src/gtkui/columns.cc:47 src/moonstone/playlist_model.cc:42
+#: src/qtui/playlist_model.cc:35
+msgid "File Name"
+msgstr ""
 
-#: src/gtkui/columns.cc:48
+#: src/gtkui/columns.cc:48 src/moonstone/playlist_model.cc:42
+#: src/qtui/playlist_model.cc:36
+msgid "Custom Title"
+msgstr ""
+
+#: src/gtkui/columns.cc:49 src/moonstone/playlist_model.cc:42
+#: src/qtui/playlist_model.cc:36 src/streamtuner/icecast-model.cc:129
+#: src/streamtuner/shoutcast-model.cc:134
 msgid "Bitrate"
 msgstr "ബിറ്റ്‌റേറ്റ്"
 
-#: src/gtkui/columns.cc:308
+#: src/gtkui/columns.cc:50 src/moonstone/playlist_model.cc:43
+#: src/qtui/playlist_model.cc:36
+msgid "Comment"
+msgstr "അഭിപ്രായം"
+
+#: src/gtkui/columns.cc:51 src/qtui/playlist_model.cc:36
+msgid "Publisher"
+msgstr ""
+
+#: src/gtkui/columns.cc:52 src/qtui/playlist_model.cc:37
+msgid "Catalog Number"
+msgstr ""
+
+#: src/gtkui/columns.cc:53 src/moonstone/playlist_model.cc:43
+#: src/qtui/playlist_model.cc:37
+msgid "Disc"
+msgstr ""
+
+#: src/gtkui/columns.cc:325
 msgid "Available columns"
 msgstr ""
 
-#: src/gtkui/columns.cc:334
+#: src/gtkui/columns.cc:351
 msgid "Displayed columns"
 msgstr ""
 
-#: src/gtkui/layout.cc:72 src/search-tool/search-tool.cc:40
+#: src/gtkui/layout.cc:74 src/search-tool-qt/search-tool-qt.cc:58
+#: src/search-tool/search-tool.cc:49
 msgid "Search Tool"
 msgstr "തിരച്ചില്‍ ടുള്‍"
 
-#: src/gtkui/layout.cc:167
+#: src/gtkui/layout.cc:170
 msgid "Dock at Left"
 msgstr "ഇടതുവശത്ത് ഡോക്ക് ചെയ്യുക"
 
-#: src/gtkui/layout.cc:167
+#: src/gtkui/layout.cc:170
 msgid "Dock at Right"
 msgstr "വലതുവശത്ത് ഡോക്ക് ചെയ്യുക"
 
-#: src/gtkui/layout.cc:168
+#: src/gtkui/layout.cc:171
 msgid "Dock at Top"
 msgstr "മുകളില്‍ ഡോക്ക് ചെയ്യുക"
 
-#: src/gtkui/layout.cc:168
+#: src/gtkui/layout.cc:171
 msgid "Dock at Bottom"
 msgstr "താഴെ ഡോക്ക് ചെയ്യുക"
 
-#: src/gtkui/layout.cc:168
+#: src/gtkui/layout.cc:171
 msgid "Undock"
 msgstr "ഡോക്കിങ് ഒഴിവാക്കുക"
 
-#: src/gtkui/layout.cc:168 src/ladspa/plugin.cc:531
+#: src/gtkui/layout.cc:171 src/ladspa/plugin.cc:540
 msgid "Disable"
 msgstr "അസാദ്ധ്യമാക്കുക"
 
-#: src/gtkui/menus.cc:126 src/qtui/main_window_actions.cc:93
-#: src/statusicon/statusicon.cc:276
+#: src/gtkui/menus.cc:79 src/qtui/menus.cc:107
+#: src/statusicon-qt/statusicon.cc:115 src/statusicon/statusicon.cc:286
 msgid "_Open Files ..."
 msgstr "ഫയലുകള്‍ _തുറക്കുക ..."
 
-#: src/gtkui/menus.cc:127
+#: src/gtkui/menus.cc:80 src/qtui/menus.cc:111
 msgid "Open _URL ..."
 msgstr "_URL തുറക്കുക"
 
-#: src/gtkui/menus.cc:128 src/qtui/main_window_actions.cc:95
+#: src/gtkui/menus.cc:81 src/qtui/menus.cc:113
 msgid "_Add Files ..."
 msgstr "_ഫയലുകള്‍ ചേര്‍ക്കുക"
 
-#: src/gtkui/menus.cc:129
+#: src/gtkui/menus.cc:82 src/qtui/menus.cc:118
 msgid "Add U_RL ..."
 msgstr "U_RL ചേര്‍ക്കുക"
 
-#: src/gtkui/menus.cc:131
+#: src/gtkui/menus.cc:84 src/qtui/menus.cc:120
 msgid "Search _Library"
 msgstr ""
 
-#: src/gtkui/menus.cc:133 src/qtui/main_window_actions.cc:98
+#: src/gtkui/menus.cc:86 src/qtui/menus.cc:123
 msgid "A_bout ..."
 msgstr "_ഇതേപ്പറ്റി ..."
 
-#: src/gtkui/menus.cc:134 src/qtui/main_window_actions.cc:99
+#: src/gtkui/menus.cc:87 src/qtui/menus.cc:125
 msgid "_Settings ..."
 msgstr ""
 
-#: src/gtkui/menus.cc:135 src/qtui/main_window_actions.cc:103
-#: src/statusicon/statusicon.cc:284
+#: src/gtkui/menus.cc:88 src/qtui/menus.cc:131
+#: src/statusicon-qt/statusicon.cc:117 src/statusicon/statusicon.cc:288
 msgid "_Quit"
 msgstr "_പുറത്തുകടക്കുക"
 
-#: src/gtkui/menus.cc:139 src/gtkui/menus.cc:262
-#: src/qtui/main_window_actions.cc:107 src/search-tool/search-tool.cc:641
-#: src/statusicon/statusicon.cc:278
+#: src/gtkui/menus.cc:92 src/gtkui/menus.cc:226
+#: src/moonstone/playlist_tabs.cc:306 src/qtui/menus.cc:135
+#: src/qtui/playlist_tabs.cc:331 src/search-tool-qt/search-tool-qt.cc:499
+#: src/search-tool/search-tool.cc:339 src/statusicon-qt/statusicon.cc:109
+#: src/statusicon/statusicon.cc:280
 msgid "_Play"
 msgstr "_പാടുക"
 
-#: src/gtkui/menus.cc:140 src/qtui/main_window_actions.cc:108
-#: src/statusicon/statusicon.cc:279
+#: src/gtkui/menus.cc:93 src/qtui/menus.cc:137
+#: src/statusicon-qt/statusicon.cc:110 src/statusicon/statusicon.cc:281
 msgid "Paus_e"
 msgstr "പോ_സ് ചെയ്യുക"
 
-#: src/gtkui/menus.cc:141 src/qtui/main_window_actions.cc:109
-#: src/statusicon/statusicon.cc:280
+#: src/gtkui/menus.cc:94 src/qtui/menus.cc:139
+#: src/statusicon-qt/statusicon.cc:111 src/statusicon/statusicon.cc:282
 msgid "_Stop"
 msgstr "_നിര്‍ത്തുക"
 
-#: src/gtkui/menus.cc:142 src/qtui/main_window_actions.cc:110
-#: src/statusicon/statusicon.cc:277
+#: src/gtkui/menus.cc:95 src/qtui/menus.cc:141
+#: src/statusicon-qt/statusicon.cc:112 src/statusicon/statusicon.cc:283
 msgid "Pre_vious"
 msgstr "_മുമ്പത്തേത്"
 
-#: src/gtkui/menus.cc:143 src/qtui/main_window_actions.cc:111
-#: src/statusicon/statusicon.cc:281
+#: src/gtkui/menus.cc:96 src/qtui/menus.cc:143
+#: src/statusicon-qt/statusicon.cc:113 src/statusicon/statusicon.cc:284
 msgid "_Next"
 msgstr "_അടുത്തത്"
 
-#: src/gtkui/menus.cc:145 src/qtui/main_window_actions.cc:113
+#: src/gtkui/menus.cc:97 src/qtui/menus.cc:145 src/skins/menus.cc:114
+#: src/skins-qt/menus.cc:105
+msgid "Previous Album"
+msgstr ""
+
+#: src/gtkui/menus.cc:98 src/qtui/menus.cc:146 src/skins/menus.cc:115
+#: src/skins-qt/menus.cc:106
+msgid "Next Album"
+msgstr ""
+
+#: src/gtkui/menus.cc:100 src/qtui/menus.cc:148
 msgid "_Repeat"
 msgstr "_ആവര്‍ത്തിയ്ക്കുക"
 
-#: src/gtkui/menus.cc:146 src/qtui/main_window_actions.cc:114
+#: src/gtkui/menus.cc:101 src/qtui/menus.cc:150
 msgid "S_huffle"
 msgstr "_കശക്കുക"
 
-#: src/gtkui/menus.cc:147 src/qtui/main_window_actions.cc:115
+#: src/gtkui/menus.cc:102 src/qtui/menus.cc:152
+msgid "Shuffle by Albu_m"
+msgstr ""
+
+#: src/gtkui/menus.cc:103 src/qtui/menus.cc:155
 msgid "N_o Playlist Advance"
 msgstr "N_o പ്ലേലിസ്റ്റ് പുരോഗമനം"
 
-#: src/gtkui/menus.cc:148 src/qtui/main_window_actions.cc:116
+#: src/gtkui/menus.cc:104 src/qtui/menus.cc:157
 msgid "Stop A_fter This Song"
 msgstr "_ഈ പാട്ട് കഴിഞ്ഞാല്‍ നിര്‍ത്തുക"
 
-#: src/gtkui/menus.cc:150 src/gtkui/menus.cc:247
-#: src/qtui/main_window_actions.cc:118
+#: src/gtkui/menus.cc:106 src/gtkui/menus.cc:210 src/qtui/menus.cc:162
+#: src/qtui/menus.cc:294
 msgid "Song _Info ..."
 msgstr "സോങ് ഇന്‍ഫോ ..."
 
-#: src/gtkui/menus.cc:151
+#: src/gtkui/menus.cc:107
 msgid "Jump to _Time ..."
 msgstr "_സമയത്തിലേക്ക് ചാടുക ..."
 
-#: src/gtkui/menus.cc:152
+#: src/gtkui/menus.cc:108
 msgid "_Jump to Song ..."
 msgstr "പാട്ടിലേക്ക് _ചാടുക ..."
 
-#: src/gtkui/menus.cc:154
+#: src/gtkui/menus.cc:110 src/qtui/menus.cc:165
 msgid "Set Repeat Point _A"
 msgstr ""
 
-#: src/gtkui/menus.cc:155
+#: src/gtkui/menus.cc:111 src/qtui/menus.cc:167
 msgid "Set Repeat Point _B"
 msgstr ""
 
-#: src/gtkui/menus.cc:156
+#: src/gtkui/menus.cc:112 src/qtui/menus.cc:169
 msgid "_Clear Repeat Points"
 msgstr ""
 
-#: src/gtkui/menus.cc:160 src/gtkui/menus.cc:167 src/gtkui/menus.cc:183
-#: src/qtui/main_window_actions.cc:122 src/qtui/main_window_actions.cc:129
-#: src/qtui/main_window_actions.cc:145
+#: src/gtkui/menus.cc:116 src/gtkui/menus.cc:123 src/gtkui/menus.cc:141
+#: src/qtui/menus.cc:173 src/qtui/menus.cc:180 src/qtui/menus.cc:198
 msgid "By _Title"
 msgstr "_ടൈറ്റില്‍ അനുസരിച്ച്"
 
-#: src/gtkui/menus.cc:161 src/qtui/main_window_actions.cc:123
+#: src/gtkui/menus.cc:117 src/qtui/menus.cc:174
 msgid "By _File Name"
 msgstr ""
 
-#: src/gtkui/menus.cc:162 src/qtui/main_window_actions.cc:124
+#: src/gtkui/menus.cc:118 src/qtui/menus.cc:175
 msgid "By File _Path"
 msgstr "ഫയല്‍_പാത്ത് അനുസരിച്ച്"
 
-#: src/gtkui/menus.cc:166 src/gtkui/menus.cc:182
-#: src/qtui/main_window_actions.cc:128 src/qtui/main_window_actions.cc:144
+#: src/gtkui/menus.cc:122 src/gtkui/menus.cc:140 src/qtui/menus.cc:179
+#: src/qtui/menus.cc:197
 msgid "By Track _Number"
 msgstr "ട്രാക്ക് _നമ്പര്‍ അനുസരിച്ച്"
 
-#: src/gtkui/menus.cc:168 src/gtkui/menus.cc:184
-#: src/qtui/main_window_actions.cc:130 src/qtui/main_window_actions.cc:146
+#: src/gtkui/menus.cc:124 src/gtkui/menus.cc:142 src/qtui/menus.cc:181
+#: src/qtui/menus.cc:199
 msgid "By _Artist"
 msgstr "_ആര്‍ട്ടിസ്റ്റിനനുസരിച്ച്"
 
-#: src/gtkui/menus.cc:169 src/gtkui/menus.cc:185
-#: src/qtui/main_window_actions.cc:131 src/qtui/main_window_actions.cc:147
+#: src/gtkui/menus.cc:125 src/gtkui/menus.cc:143 src/qtui/menus.cc:182
+#: src/qtui/menus.cc:200
 msgid "By Al_bum"
 msgstr "ആ_ല്‍ബമനുസരിച്ച്"
 
-#: src/gtkui/menus.cc:170 src/gtkui/menus.cc:186
-#: src/qtui/main_window_actions.cc:132 src/qtui/main_window_actions.cc:148
+#: src/gtkui/menus.cc:126 src/gtkui/menus.cc:144 src/qtui/menus.cc:183
+#: src/qtui/menus.cc:201
 msgid "By Albu_m Artist"
 msgstr ""
 
-#: src/gtkui/menus.cc:171 src/gtkui/menus.cc:187
-#: src/qtui/main_window_actions.cc:133 src/qtui/main_window_actions.cc:149
+#: src/gtkui/menus.cc:127 src/gtkui/menus.cc:145 src/qtui/menus.cc:184
+#: src/qtui/menus.cc:202
 msgid "By Release _Date"
 msgstr "റിലീസ് ഡേറ്റ് അനുസരിച്ച്"
 
-#: src/gtkui/menus.cc:172 src/gtkui/menus.cc:188
-#: src/qtui/main_window_actions.cc:134 src/qtui/main_window_actions.cc:150
+#: src/gtkui/menus.cc:128 src/gtkui/menus.cc:146 src/qtui/menus.cc:185
+#: src/qtui/menus.cc:203
 msgid "By _Genre"
 msgstr ""
 
-#: src/gtkui/menus.cc:173 src/gtkui/menus.cc:189
-#: src/qtui/main_window_actions.cc:135 src/qtui/main_window_actions.cc:151
+#: src/gtkui/menus.cc:129 src/gtkui/menus.cc:147 src/qtui/menus.cc:186
+#: src/qtui/menus.cc:204
 msgid "By _Length"
 msgstr "_നീളമനുസരിച്ച്"
 
-#: src/gtkui/menus.cc:174 src/gtkui/menus.cc:190
-#: src/qtui/main_window_actions.cc:136 src/qtui/main_window_actions.cc:152
+#: src/gtkui/menus.cc:130 src/gtkui/menus.cc:148 src/qtui/menus.cc:187
+#: src/qtui/menus.cc:205
 msgid "By _File Path"
 msgstr "ഫയല്‍ പാത്ത് അനുസരിച്ച്"
 
-#: src/gtkui/menus.cc:175 src/gtkui/menus.cc:191
-#: src/qtui/main_window_actions.cc:137 src/qtui/main_window_actions.cc:153
+#: src/gtkui/menus.cc:131 src/gtkui/menus.cc:149 src/qtui/menus.cc:188
+#: src/qtui/menus.cc:206
 msgid "By _Custom Title"
 msgstr "സ്വേച്ഛയാലുള്ള തലക്കെട്ട് അനുസരിച്ച്"
 
-#: src/gtkui/menus.cc:177 src/gtkui/menus.cc:193
-#: src/qtui/main_window_actions.cc:139 src/qtui/main_window_actions.cc:155
+#: src/gtkui/menus.cc:132 src/gtkui/menus.cc:150 src/qtui/menus.cc:189
+#: src/qtui/menus.cc:207
+msgid "By C_omment"
+msgstr ""
+
+#: src/gtkui/menus.cc:133 src/gtkui/menus.cc:151 src/qtui/menus.cc:190
+#: src/qtui/menus.cc:208
+msgid "By D_isc Number"
+msgstr ""
+
+#: src/gtkui/menus.cc:135 src/gtkui/menus.cc:153 src/qtui/menus.cc:192
+#: src/qtui/menus.cc:210
 msgid "R_everse Order"
 msgstr "നേ_ര്‍വിപരീത രീതി"
 
-#: src/gtkui/menus.cc:178 src/gtkui/menus.cc:194
-#: src/qtui/main_window_actions.cc:140 src/qtui/main_window_actions.cc:156
+#: src/gtkui/menus.cc:136 src/gtkui/menus.cc:154 src/qtui/menus.cc:194
+#: src/qtui/menus.cc:212
 msgid "_Random Order"
 msgstr "_ക്രമമില്ലാത്ത രീതി"
 
-#: src/gtkui/menus.cc:198 src/qtui/main_window_actions.cc:160
+#: src/gtkui/menus.cc:158 src/qtui/menus.cc:216
 msgid "_Play/Resume"
 msgstr ""
 
-#: src/gtkui/menus.cc:199 src/gtkui/menus.cc:251
-#: src/qtui/main_window_actions.cc:161
+#: src/gtkui/menus.cc:159 src/qtui/menus.cc:218
 msgid "_Refresh"
 msgstr "പു_തുക്കുക"
 
-#: src/gtkui/menus.cc:201 src/qtui/main_window_actions.cc:163
+#: src/gtkui/menus.cc:161 src/qtui/menus.cc:222
 msgid "_Sort"
 msgstr "_ക്രമത്തിലാക്കുക"
 
-#: src/gtkui/menus.cc:202 src/qtui/main_window_actions.cc:164
+#: src/gtkui/menus.cc:162 src/qtui/menus.cc:223
 msgid "Sort Se_lected"
 msgstr ""
 
-#: src/gtkui/menus.cc:203 src/qtui/main_window_actions.cc:165
+#: src/gtkui/menus.cc:163 src/qtui/menus.cc:225
 msgid "Remove _Duplicates"
 msgstr "_പകര്‍പ്പുകള്‍ നീക്കം ചെയ്യുക"
 
-#: src/gtkui/menus.cc:204 src/qtui/main_window_actions.cc:166
+#: src/gtkui/menus.cc:164 src/qtui/menus.cc:226
 msgid "Remove _Unavailable Files"
 msgstr "_ലഭ്യമല്ലാത്ത ഫയലുകള്‍ നീക്കം ചെയ്യുക"
 
-#: src/gtkui/menus.cc:206 src/playlist-manager/playlist-manager.cc:244
-#: src/qtui/main_window_actions.cc:168
+#: src/gtkui/menus.cc:166 src/playlist-manager/playlist-manager.cc:219
+#: src/playlist-manager-qt/playlist-manager-qt.cc:348 src/qtui/menus.cc:229
 msgid "_New"
 msgstr "_പുതിയത്"
 
-#: src/gtkui/menus.cc:207
+#: src/gtkui/menus.cc:167 src/qtui/menus.cc:230
 msgid "Ren_ame ..."
 msgstr "പേര് _മാറ്റുക"
 
-#: src/gtkui/menus.cc:208 src/gtkui/menus.cc:264
-#: src/qtui/main_window_actions.cc:170
+#: src/gtkui/menus.cc:168 src/gtkui/menus.cc:228
+#: src/moonstone/playlist_tabs.cc:311 src/qtui/menus.cc:231
+#: src/qtui/playlist_tabs.cc:336
 msgid "Remo_ve"
 msgstr ""
 
-#: src/gtkui/menus.cc:210
+#: src/gtkui/menus.cc:170 src/qtui/menus.cc:233
 msgid "_Import ..."
 msgstr "_ഇറക്കുമതി ചെയ്യുക ..."
 
-#: src/gtkui/menus.cc:211
+#: src/gtkui/menus.cc:171 src/qtui/menus.cc:234
 msgid "_Export ..."
 msgstr "_കയറ്റുമതി ചെയ്യുക ..."
 
-#: src/gtkui/menus.cc:213
+#: src/gtkui/menus.cc:173 src/qtui/menus.cc:237
 msgid "Playlist _Manager ..."
 msgstr "പ്ലേലിസ്റ്റ് _മാനേജര്‍ ..."
 
-#: src/gtkui/menus.cc:214 src/qtui/main_window_actions.cc:176
+#: src/gtkui/menus.cc:174 src/qtui/menus.cc:239
 msgid "_Queue Manager ..."
 msgstr "ക്യൂ മാനേജര്‍ ..."
 
-#: src/gtkui/menus.cc:218 src/qtui/main_window_actions.cc:180
+#: src/gtkui/menus.cc:178 src/qtui/menus.cc:243
 msgid "Volume _Up"
 msgstr "ശബ്ദം കൂട്ടുക (_U)"
 
-#: src/gtkui/menus.cc:219 src/qtui/main_window_actions.cc:181
+#: src/gtkui/menus.cc:179 src/qtui/menus.cc:245
 msgid "Volume _Down"
 msgstr "ശബ്ദം കുറയ്ക്കുക (_D)"
 
-#: src/gtkui/menus.cc:221 src/qtui/main_window_actions.cc:183
-msgid "_Equalizer"
-msgstr "_ഈക്വലൈസര്‍"
+#: src/gtkui/menus.cc:181 src/qtui/menus.cc:249
+msgid "_Equalizer ..."
+msgstr ""
 
-#: src/gtkui/menus.cc:223 src/qtui/main_window_actions.cc:185
+#: src/gtkui/menus.cc:182 src/qtui/menus.cc:251
 msgid "E_ffects ..."
 msgstr ""
 
-#: src/gtkui/menus.cc:227
+#: src/gtkui/menus.cc:184
+msgid "_Record Stream"
+msgstr ""
+
+#: src/gtkui/menus.cc:185
+msgid "Audio _Settings ..."
+msgstr ""
+
+#: src/gtkui/menus.cc:189 src/qtui/menus.cc:260
 msgid "Show _Menu Bar"
 msgstr "_മെനുബാര്‍ കാണിയ്ക്കുക"
 
-#: src/gtkui/menus.cc:228
+#: src/gtkui/menus.cc:190 src/qtui/menus.cc:262
 msgid "Show I_nfo Bar"
 msgstr "_ഇന്‍ഫോബാര്‍ കാണിയ്ക്കുക"
 
-#: src/gtkui/menus.cc:229
+#: src/gtkui/menus.cc:191 src/qtui/menus.cc:264
+msgid "Show Info Bar _Album Art"
+msgstr ""
+
+#: src/gtkui/menus.cc:192 src/qtui/menus.cc:266
 msgid "Show Info Bar Vis_ualization"
 msgstr ""
 
-#: src/gtkui/menus.cc:230
+#: src/gtkui/menus.cc:193 src/qtui/menus.cc:268
 msgid "Show _Status Bar"
 msgstr "_സ്റ്റാറ്റസ്ബാര്‍ കാണിയ്ക്കുക"
 
-#: src/gtkui/menus.cc:232
+#: src/gtkui/menus.cc:195 src/qtui/menus.cc:272
 msgid "Show _Remaining Time"
 msgstr "_അവശേഷിക്കുന്ന സമയം കാണിക്കുക"
 
-#: src/gtkui/menus.cc:234
+#: src/gtkui/menus.cc:197 src/qtui/menus.cc:276 src/skins/menus.cc:157
+#: src/skins-qt/menus.cc:152
 msgid "_Visualizations ..."
 msgstr ""
 
-#: src/gtkui/menus.cc:238 src/qtui/main_window_actions.cc:189
+#: src/gtkui/menus.cc:201 src/qtui/menus.cc:280
 msgid "_File"
 msgstr "_ഫയല്‍"
 
-#: src/gtkui/menus.cc:239 src/qtui/main_window_actions.cc:190
+#: src/gtkui/menus.cc:202 src/qtui/menus.cc:281
 msgid "_Playback"
 msgstr "_പ്ലേബാക്ക്"
 
-#: src/gtkui/menus.cc:240 src/qtui/main_window_actions.cc:191
+#: src/gtkui/menus.cc:203 src/qtui/menus.cc:282
 msgid "P_laylist"
 msgstr "പ്ലേ_ലിസ്റ്റ്"
 
-#: src/gtkui/menus.cc:241 src/gtkui/menus.cc:258
-#: src/qtui/main_window_actions.cc:192
+#: src/gtkui/menus.cc:204 src/gtkui/menus.cc:222 src/qtui/menus.cc:283
+#: src/qtui/menus.cc:312
 msgid "_Services"
 msgstr "_സേവനങ്ങള്‍"
 
-#: src/gtkui/menus.cc:242 src/qtui/main_window_actions.cc:193
+#: src/gtkui/menus.cc:205 src/qtui/menus.cc:284
 msgid "_Output"
 msgstr "_ഔട്പുട്ട്"
 
-#: src/gtkui/menus.cc:243
+#: src/gtkui/menus.cc:206 src/qtui/menus.cc:285
 msgid "_View"
 msgstr "_കാഴ്ച"
 
-#: src/gtkui/menus.cc:248
+#: src/gtkui/menus.cc:211 src/qtui/menus.cc:296
 msgid "_Queue/Unqueue"
 msgstr "_ക്യൂ/അണ്‍ക്യൂ"
 
-#: src/gtkui/menus.cc:250
+#: src/gtkui/menus.cc:213 src/qtui/menus.cc:299
 msgid "_Open Containing Folder"
 msgstr ""
 
-#: src/gtkui/menus.cc:253
+#: src/gtkui/menus.cc:214 src/qtui/menus.cc:301
+msgid "_Refresh Selected"
+msgstr ""
+
+#: src/gtkui/menus.cc:216 src/qtui/menus.cc:304
 msgid "Cu_t"
 msgstr "_മുറിയ്ക്കുക"
 
-#: src/gtkui/menus.cc:254
+#: src/gtkui/menus.cc:217 src/qtui/menus.cc:305
 msgid "_Copy"
 msgstr "_പകര്‍ത്തുക"
 
-#: src/gtkui/menus.cc:255
+#: src/gtkui/menus.cc:218 src/qtui/menus.cc:306
 msgid "_Paste"
 msgstr "_ഒട്ടിയ്ക്കുക"
 
-#: src/gtkui/menus.cc:256
+#: src/gtkui/menus.cc:219 src/qtui/menus.cc:307
+msgid "Paste at _End"
+msgstr ""
+
+#: src/gtkui/menus.cc:220 src/qtui/menus.cc:309
 msgid "Select _All"
 msgstr "_എല്ലാം തിരഞ്ഞെടുക്കുക"
 
-#: src/gtkui/menus.cc:263
+#: src/gtkui/menus.cc:227 src/moonstone/playlist_tabs.cc:309
+#: src/qtui/playlist_tabs.cc:334
 msgid "_Rename ..."
 msgstr "പേര് _മാറ്റുക ..."
 
-#: src/gtkui/settings.cc:35
+#: src/gtkui/settings.cc:35 src/qtui/settings.cc:59
+msgid "Always"
+msgstr ""
+
+#: src/gtkui/settings.cc:36 src/qtui/settings.cc:60
+msgid "Auto-hide"
+msgstr ""
+
+#: src/gtkui/settings.cc:37 src/qtui/settings.cc:61
+msgid "Never"
+msgstr ""
+
+#: src/gtkui/settings.cc:41 src/qtui/settings.cc:64
 msgid "Playlist Tabs"
 msgstr ""
 
-#: src/gtkui/settings.cc:36
-msgid "Always show tabs"
+#: src/gtkui/settings.cc:42 src/qtui/settings.cc:65
+msgid "Show playlist tabs:"
 msgstr ""
 
-#: src/gtkui/settings.cc:38
+#: src/gtkui/settings.cc:45 src/qtui/settings.cc:69
 msgid "Show entry counts"
 msgstr ""
 
-#: src/gtkui/settings.cc:40
+#: src/gtkui/settings.cc:47 src/qtui/settings.cc:72
 msgid "Show close buttons"
 msgstr ""
 
-#: src/gtkui/settings.cc:42
+#: src/gtkui/settings.cc:49 src/qtui/settings.cc:75
 msgid "Playlist Columns"
 msgstr ""
 
-#: src/gtkui/settings.cc:44
+#: src/gtkui/settings.cc:51 src/qtui/settings.cc:77
 msgid "Show column headers"
 msgstr ""
 
-#: src/gtkui/settings.cc:46 src/modplug/plugin_main.cc:106
-#: src/skins/skins_cfg.cc:263
-msgid "Miscellaneous"
-msgstr "പലവക"
+#: src/gtkui/settings.cc:53 src/qtui/settings.cc:82
+msgid "Make column headers clickable for sorting"
+msgstr ""
 
-#: src/gtkui/settings.cc:47
-msgid "Arrow keys seek by:"
+#: src/gtkui/settings.cc:56
+msgid "Use symbolic icons in toolbar"
 msgstr ""
 
-#: src/gtkui/settings.cc:50
+#: src/gtkui/settings.cc:58 src/qtui/settings.cc:86
 msgid "Scroll on song change"
 msgstr ""
 
-#: src/gtkui/ui_gtk.cc:71
+#: src/gtkui/ui_gtk.cc:82
 msgid "GTK Interface"
 msgstr "GTK ഇന്‍ഡര്‍ഫേസ്"
 
-#: src/gtkui/ui_gtk.cc:222 src/skins/ui_main.cc:232
+#: src/gtkui/ui_gtk.cc:219 src/skins/main.cc:228 src/skins-qt/main.cc:231
 #, c-format
 msgid "%s - Audacious"
 msgstr "%s - ഒഡാഷ്യസ്"
 
-#: src/gtkui/ui_gtk.cc:225 src/qtui/main_window.cc:186
+#: src/gtkui/ui_gtk.cc:221 src/moonstone/main_window.cc:184
+#: src/qtui/main_window.cc:385
 msgid "Buffering ..."
 msgstr "ബഫര്‍ ചെയ്യുന്നു ..."
 
-#: src/gtkui/ui_gtk.cc:228 src/skins/ui_main.cc:234 src/skins/ui_main.cc:1164
+#: src/gtkui/ui_gtk.cc:224 src/pipewire/pipewire.cc:402 src/skins/main.cc:230
+#: src/skins-qt/main.cc:233
 msgid "Audacious"
 msgstr "ഒഡാഷ്യസ്"
 
-#: src/gtkui/ui_statusbar.cc:63 src/qtui/status_bar.cc:67
+#: src/gtkui/ui_gtk.cc:487 src/gtkui/ui_gtk.cc:518 src/gtkui/ui_gtk.cc:882
+#: src/hotkey/gui.cc:72 src/moonstone/main_window.cc:67
+#: src/moonstone/main_window.cc:145 src/moonstone/main_window.cc:146
+#: src/notify/osd.cc:85 src/qthotkey/gui.cc:67 src/qtui/main_window.cc:154
+#: src/qtui/main_window.cc:347 src/qtui/main_window.cc:348
+#: src/skins/menus.cc:109 src/skins-qt/menus.cc:100
+msgid "Play"
+msgstr "പാടുക"
+
+#: src/gtkui/ui_gtk.cc:487 src/moonstone/main_window.cc:151
+#: src/moonstone/main_window.cc:152 src/notify/osd.cc:82
+#: src/qtui/main_window.cc:353 src/qtui/main_window.cc:354
+#: src/skins/menus.cc:110 src/skins-qt/menus.cc:101
+msgid "Pause"
+msgstr "പോസ് ചെയ്യുക"
+
+#: src/gtkui/ui_gtk.cc:868 src/moonstone/main_window.cc:57
+#: src/qtui/main_window.cc:145 src/skins/menus.cc:86 src/skins-qt/menus.cc:77
+msgid "Search Library"
+msgstr ""
+
+#: src/gtkui/ui_gtk.cc:875 src/moonstone/main_window.cc:60
+#: src/qtui/main_window.cc:147
+msgid "Open Files"
+msgstr "ഫയലുകള്‍ തുറക്കുക"
+
+#: src/gtkui/ui_gtk.cc:876 src/moonstone/main_window.cc:62
+#: src/qtui/main_window.cc:149
+msgid "Add Files"
+msgstr "ഫയലുകള്‍ ചേര്‍ക്കുക"
+
+#: src/gtkui/ui_gtk.cc:881 src/moonstone/main_window.cc:65
+#: src/qtui/main_window.cc:152 src/skins/menus.cc:112 src/skins-qt/menus.cc:103
+msgid "Previous"
+msgstr "മുമ്പത്തേത്"
+
+#: src/gtkui/ui_gtk.cc:883 src/hotkey/gui.cc:74 src/moonstone/main_window.cc:69
+#: src/qthotkey/gui.cc:69 src/qtui/main_window.cc:156 src/skins/menus.cc:111
+#: src/skins-qt/menus.cc:102
+msgid "Stop"
+msgstr "നിര്‍ത്തുക"
+
+#: src/gtkui/ui_gtk.cc:884 src/moonstone/main_window.cc:76 src/notify/osd.cc:89
+#: src/qtui/main_window.cc:163 src/skins/menus.cc:113 src/skins-qt/menus.cc:104
+msgid "Next"
+msgstr "അടുത്തത്"
+
+#: src/gtkui/ui_gtk.cc:886 src/moonstone/main_window.cc:79
+#: src/qtui/main_window.cc:166 src/qtui/menus.cc:254 src/skins/menus.cc:79
+#: src/skins-qt/menus.cc:69
+msgid "Record Stream"
+msgstr ""
+
+#: src/gtkui/ui_gtk.cc:919 src/moonstone/main_window.cc:86
+#: src/qtui/main_window.cc:173 src/skins/menus.cc:103 src/skins-qt/menus.cc:94
+msgid "Repeat"
+msgstr "ആവര്‍ത്തിയ്ക്കുക"
+
+#: src/gtkui/ui_gtk.cc:922 src/moonstone/main_window.cc:89
+#: src/qtui/main_window.cc:176 src/skins/menus.cc:104 src/skins-qt/menus.cc:95
+msgid "Shuffle"
+msgstr "കശക്കുക"
+
+#: src/gtkui/ui_gtk.cc:1114 src/qtui/main_window.cc:123
+msgid "Menu"
+msgstr ""
+
+#: src/gtkui/ui_statusbar.cc:64 src/qtui/status_bar.cc:155
 msgid "mono"
 msgstr "മോണോ"
 
-#: src/gtkui/ui_statusbar.cc:65 src/qtui/status_bar.cc:69
+#: src/gtkui/ui_statusbar.cc:66 src/qtui/status_bar.cc:157
 msgid "stereo"
 msgstr "സ്റ്റീരിയോ"
 
-#: src/gtkui/ui_statusbar.cc:67 src/qtui/status_bar.cc:71
+#: src/gtkui/ui_statusbar.cc:68 src/qtui/status_bar.cc:160
 #, c-format
 msgid "%d channel"
 msgid_plural "%d channels"
 msgstr0 "%d ചാനല്‍"
 msgstr1 "%d ചാനലുകള്‍"
 
-#: src/gtkui/ui_statusbar.cc:81 src/qtui/status_bar.cc:85
+#: src/gtkui/ui_statusbar.cc:76 src/qtui/status_bar.cc:168
+#, c-format
+msgid "%d kHz"
+msgstr ""
+
+#: src/gtkui/ui_statusbar.cc:82 src/qtui/status_bar.cc:174
 #, c-format
-msgid "%d kbps"
-msgstr "%d kbps"
+msgid "%d kbit/s"
+msgstr ""
 
-#: src/gtkui/ui_statusbar.cc:107 src/skins/ui_main_evlisteners.cc:103
+#: src/gtkui/ui_statusbar.cc:108 src/skins/main.cc:478 src/skins-qt/main.cc:461
 msgid "Single mode."
 msgstr "സിംഗ്ള്‍ മോഡ്"
 
-#: src/gtkui/ui_statusbar.cc:109 src/skins/ui_main_evlisteners.cc:105
+#: src/gtkui/ui_statusbar.cc:110 src/skins/main.cc:480 src/skins-qt/main.cc:463
 msgid "Playlist mode."
 msgstr "പ്ലേലിസ്റ്റ് മോഡ്"
 
-#: src/gtkui/ui_statusbar.cc:117 src/skins/ui_main_evlisteners.cc:111
+#: src/gtkui/ui_statusbar.cc:118 src/skins/main.cc:486 src/skins-qt/main.cc:469
 msgid "Stopping after song."
 msgstr "പാട്ടിനു ശേഷം നിര്‍ത്തുന്നു."
 
-#: src/hotkey/gui.cc:71
+#: src/hotkey/gui.cc:71 src/qthotkey/gui.cc:66
 msgid "Previous track"
 msgstr "മുമ്പത്തെ ട്രാക്ക്"
 
-#: src/hotkey/gui.cc:72 src/notify/osd.cc:69 src/qtui/main_window.cc:69
-#: src/qtui/main_window.cc:172 src/qtui/main_window.cc:173
-#: src/skins/menus.cc:87
-msgid "Play"
-msgstr "പാടുക"
-
-#: src/hotkey/gui.cc:73
+#: src/hotkey/gui.cc:73 src/qthotkey/gui.cc:68
 msgid "Pause/Resume"
 msgstr "പോസ്/റെസ്യൂം"
 
-#: src/hotkey/gui.cc:74 src/qtui/main_window.cc:70 src/skins/menus.cc:89
-msgid "Stop"
-msgstr "നിര്‍ത്തുക"
-
-#: src/hotkey/gui.cc:75
+#: src/hotkey/gui.cc:75 src/qthotkey/gui.cc:70
 msgid "Next track"
 msgstr "അടുത്ത ട്രാക്ക്"
 
-#: src/hotkey/gui.cc:76
-msgid "Forward 5 seconds"
-msgstr "5 സെക്കന്‍ഡ് മുന്നോട്ട്"
-
-#: src/hotkey/gui.cc:77
-msgid "Rewind 5 seconds"
-msgstr "5 സെക്കന്‍ഡ് പിന്നോട്ട്"
+#: src/hotkey/gui.cc:76 src/qthotkey/gui.cc:71
+msgid "Step forward"
+msgstr ""
 
-#: src/hotkey/gui.cc:78
+#: src/hotkey/gui.cc:77 src/qthotkey/gui.cc:72
+msgid "Step backward"
+msgstr ""
+
+#: src/hotkey/gui.cc:78 src/qthotkey/gui.cc:73
 msgid "Mute"
 msgstr "നിശ്ശബ്ദമാക്കുക"
 
-#: src/hotkey/gui.cc:79
+#: src/hotkey/gui.cc:79 src/qthotkey/gui.cc:74
 msgid "Volume up"
 msgstr "ശബ്ദം കൂട്ടുക"
 
-#: src/hotkey/gui.cc:80
+#: src/hotkey/gui.cc:80 src/qthotkey/gui.cc:75
 msgid "Volume down"
 msgstr "ശബ്ദം കുറയ്ക്കുക"
 
-#: src/hotkey/gui.cc:81
+#: src/hotkey/gui.cc:81 src/qthotkey/gui.cc:76
 msgid "Jump to file"
 msgstr "ഫയലിലേയ്ക്ക് ചാടുക"
 
-#: src/hotkey/gui.cc:82
+#: src/hotkey/gui.cc:82 src/qthotkey/gui.cc:77
 msgid "Toggle player window(s)"
 msgstr ""
 
-#: src/hotkey/gui.cc:83
+#: src/hotkey/gui.cc:83 src/qthotkey/gui.cc:78
 msgid "Show On-Screen-Display"
 msgstr "ഓണ്‍-സ്ക്രീന്‍-ഡിസ്‌പ്ലേ കാണിയ്ക്കുക"
 
-#: src/hotkey/gui.cc:84
+#: src/hotkey/gui.cc:84 src/qthotkey/gui.cc:79
 msgid "Toggle repeat"
 msgstr ""
 
-#: src/hotkey/gui.cc:85
+#: src/hotkey/gui.cc:85 src/qthotkey/gui.cc:80
 msgid "Toggle shuffle"
 msgstr ""
 
-#: src/hotkey/gui.cc:86
+#: src/hotkey/gui.cc:86 src/qthotkey/gui.cc:81
 msgid "Toggle stop after current"
 msgstr ""
 
-#: src/hotkey/gui.cc:87
+#: src/hotkey/gui.cc:87 src/qthotkey/gui.cc:82
 msgid "Raise player window(s)"
 msgstr ""
 
-#: src/hotkey/gui.cc:97
+#: src/hotkey/gui.cc:98 src/qthotkey/gui.cc:100
 msgid "(none)"
 msgstr "(ശൂന്യം)"
 
-#: src/hotkey/gui.cc:234
+#: src/hotkey/gui.cc:261
 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 modifiers.\n"
 "\n"
 "Do you want to continue?"
 msgstr ""
-"പ്രൈമറി മൗസ് ബട്ടണുകള്‍ മാറ്റങ്ങളില്ലാതെ ബൈന്‍ഡ് ചെയ്യാന്‍ ശുപാര്‍ശ ചെയ്യുന്നില്ല.\n"
-"\n"
-"നിങ്ങള്‍ക്ക് തുടരാന്‍ താല്പര്യമുണ്ടോ ?"
 
-#: src/hotkey/gui.cc:236
+#: src/hotkey/gui.cc:264
 msgid "Binding mouse buttons"
 msgstr "മൗസ് ബട്ടണുകള്‍ ബൈന്റ് ചെയ്യുന്നു"
 
-#: src/hotkey/gui.cc:391
+#: src/hotkey/gui.cc:434
 msgid ""
 "Press a key combination inside a text field.\n"
 "You can also bind mouse buttons."
@@ -2016,34 +2130,34 @@
 "ടെക്സ്റ്റ് ഫീല്‍ഡിനുള്ളില്‍ ഒരു കീ കോമ്പിനേഷന്‍ അമര്‍ത്തുക.\n"
 "മൗസ് ബട്ടണുകളും നിങ്ങള്‍ക്ക് ബൈന്‍ഡ് ചെയ്യാം."
 
-#: src/hotkey/gui.cc:396
+#: src/hotkey/gui.cc:444 src/qthotkey/gui.cc:179
 msgid "Hotkeys:"
 msgstr "ഹോട്കീകള്‍"
 
-#: src/hotkey/gui.cc:413
+#: src/hotkey/gui.cc:457 src/qthotkey/gui.cc:181
 msgid "Action:"
 msgstr "പ്രവൃത്തി:"
 
-#: src/hotkey/gui.cc:420
+#: src/hotkey/gui.cc:461 src/qthotkey/gui.cc:182
 msgid "Key Binding:"
 msgstr "കീ ബൈന്റിങ്:"
 
-#: src/hotkey/gui.cc:468
+#: src/hotkey/gui.cc:518 src/qthotkey/gui.cc:184
 msgid "_Add"
 msgstr ""
 
-#: src/hotkey/plugin.cc:61
+#: src/hotkey/plugin.cc:59 src/qthotkey/plugin.cc:78
 msgid "Global Hotkeys"
 msgstr ""
 
-#: src/hotkey/plugin.cc:79
+#: src/hotkey/plugin.cc:74
 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"
+"Contributors 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"
@@ -2051,76 +2165,104 @@
 " Jeremy Tan <nsx@nsx.homeip.net>"
 msgstr ""
 
-#: src/jack-ng/jack-ng.cc:49
+#: src/jack/jack-ng.cc:54
 msgid "JACK Output"
 msgstr "ജാക്ക് ഔട്പുട്ട്"
 
-#: src/jack-ng/jack-ng.cc:114
+#: src/jack/jack-ng.cc:126
+msgid "Client name:"
+msgstr ""
+
+#: src/jack/jack-ng.cc:128
 msgid "Automatically connect to output ports"
 msgstr ""
 
-#: src/jack-ng/jack-ng.cc:155
+#: src/jack/jack-ng.cc:130
+msgid "Filter ports (regex, use any port if blank):"
+msgstr ""
+
+#: src/jack/jack-ng.cc:136
+msgid "Connect to physical ports only"
+msgstr ""
+
+#: src/jack/jack-ng.cc:139
+msgid "Upmix to"
+msgstr ""
+
+#: src/jack/jack-ng.cc:141
+msgid "ports if input has fewer channels"
+msgstr ""
+
+#: src/jack/jack-ng.cc:143
+msgid "Ignore insufficient number of ports"
+msgstr ""
+
+#: src/jack/jack-ng.cc:181
+msgid "No JACK output ports were found. Please check settings."
+msgstr ""
+
+#: src/jack/jack-ng.cc:195
 #, c-format
 msgid "Only %d JACK output ports were found but %d are required."
 msgstr ""
 
-#: src/jack-ng/jack-ng.cc:164
+#: src/jack/jack-ng.cc:210
 #, c-format
 msgid "Failed to connect to JACK port %s."
 msgstr ""
 
-#: src/jack-ng/jack-ng.cc:184
+#: src/jack/jack-ng.cc:230
 msgid ""
 "JACK supports only floating-point audio. You must change the output bit "
 "depth to floating-point in Audacious settings."
 msgstr ""
 
-#: src/jack-ng/jack-ng.cc:197
+#: src/jack/jack-ng.cc:245
 msgid "Failed to connect to the JACK server; is it running?"
 msgstr ""
 
-#: src/jack-ng/jack-ng.cc:273
+#: src/jack/jack-ng.cc:321
 #, c-format
 msgid ""
 "The JACK server requires a sample rate of %d Hz, but Audacious is playing at "
 "%d Hz. Please use the Sample Rate Converter effect to correct the mismatch."
 msgstr ""
 
-#: src/ladspa/plugin.cc:414
+#: src/ladspa/plugin.cc:416
 #, c-format
 msgid "%s Settings"
 msgstr "%s ക്രമീകരണങ്ങള്‍"
 
-#: src/ladspa/plugin.cc:478
+#: src/ladspa/plugin.cc:482
 msgid "Module paths:"
 msgstr "മൊഡ്യൂള്‍ പാത്തുകള്‍:"
 
-#: src/ladspa/plugin.cc:483
+#: src/ladspa/plugin.cc:487
 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.cc:499
+#: src/ladspa/plugin.cc:508
 msgid "Available plugins:"
 msgstr "ലഭ്യമായ പ്ലഗ്ഗിന്നുകള്‍:"
 
-#: src/ladspa/plugin.cc:512 src/modplug/plugin_main.cc:92
-#: src/modplug/plugin_main.cc:95 src/modplug/plugin_main.cc:98
-#: src/modplug/plugin_main.cc:101
+#: src/ladspa/plugin.cc:521 src/modplug/plugin_main.cc:91
+#: src/modplug/plugin_main.cc:94 src/modplug/plugin_main.cc:97
+#: src/modplug/plugin_main.cc:100
 msgid "Enable"
 msgstr "സാദ്ധ്യമാക്കുക"
 
-#: src/ladspa/plugin.cc:518
+#: src/ladspa/plugin.cc:527
 msgid "Enabled plugins:"
 msgstr "പ്ലഗ്ഗിനുകള്‍ സാദ്ധ്യമാക്കുക:"
 
-#: src/ladspa/plugin.cc:534
+#: src/ladspa/plugin.cc:543
 msgid "Settings"
 msgstr "ക്രമീകരണങ്ങള്‍"
 
-#: src/ladspa/plugin.cc:551
+#: src/ladspa/plugin.cc:560
 msgid ""
 "LADSPA Host for Audacious\n"
 "Copyright 2011 John Lindgren"
@@ -2134,7 +2276,7 @@
 msgid "LIRC Plugin"
 msgstr "LIRC പ്ലഗ്ഗിന്‍"
 
-#: src/lirc/lirc.cc:381
+#: src/lirc/lirc.cc:379
 msgid ""
 "A simple plugin to control Audacious using the LIRC remote control daemon\n"
 "\n"
@@ -2150,63 +2292,123 @@
 "For more information about LIRC, see http://lirc.org."
 msgstr ""
 
-#: src/lirc/lirc.cc:392
+#: src/lirc/lirc.cc:390
 msgid "Connection"
 msgstr "ബന്ധം"
 
-#: src/lirc/lirc.cc:393
+#: src/lirc/lirc.cc:391
 msgid "Reconnect to LIRC server"
 msgstr "LIRC സെര്‍വറുമായി വീണ്ടും ബന്ധിപ്പിയ്ക്കുക"
 
-#: src/lirc/lirc.cc:395
+#: src/lirc/lirc.cc:393
 msgid "Wait before reconnecting:"
 msgstr "പുനര്‍ബന്ധത്തിനു മുമ്പ് കാത്തിരിക്കുക:"
 
-#: src/lyricwiki/lyricwiki.cc:41
-msgid "LyricWiki Plugin"
-msgstr "LyricWiki പ്ലഗ്ഗിന്‍"
-
-#: src/lyricwiki/lyricwiki.cc:131 src/lyricwiki-qt/lyricwiki.cc:136
-msgid "No lyrics available"
-msgstr "വരികള്‌ ലഭ്യമല്ല"
-
-#: src/lyricwiki/lyricwiki.cc:217 src/lyricwiki/lyricwiki.cc:226
-#: src/lyricwiki/lyricwiki.cc:243 src/lyricwiki/lyricwiki.cc:252
-#: src/lyricwiki/lyricwiki.cc:267 src/lyricwiki-qt/lyricwiki.cc:222
-#: src/lyricwiki-qt/lyricwiki.cc:231 src/lyricwiki-qt/lyricwiki.cc:248
-#: src/lyricwiki-qt/lyricwiki.cc:257 src/lyricwiki-qt/lyricwiki.cc:272
-msgid "Error"
-msgstr "പിശക്"
-
-#: src/lyricwiki/lyricwiki.cc:218 src/lyricwiki/lyricwiki.cc:244
-#: src/lyricwiki-qt/lyricwiki.cc:223 src/lyricwiki-qt/lyricwiki.cc:249
+#: src/lyrics-common/chart_lyrics_provider.cc:93
+#: src/lyrics-common/chart_lyrics_provider.cc:150
+#: src/lyrics-common/lyrics_ovh_provider.cc:50
 #, c-format
 msgid "Unable to fetch %s"
 msgstr ""
 
-#: src/lyricwiki/lyricwiki.cc:227 src/lyricwiki/lyricwiki.cc:253
-#: src/lyricwiki-qt/lyricwiki.cc:232 src/lyricwiki-qt/lyricwiki.cc:258
+#: src/lyrics-common/chart_lyrics_provider.cc:100
+#: src/lyrics-common/chart_lyrics_provider.cc:157
+#: src/lyrics-common/lyrics_ovh_provider.cc:57
 #, c-format
 msgid "Unable to parse %s"
 msgstr ""
 
-#: src/lyricwiki/lyricwiki.cc:259 src/lyricwiki-qt/lyricwiki.cc:264
+#: src/lyrics-common/chart_lyrics_provider.cc:121
+#: src/lyrics-common/chart_lyrics_provider.cc:194
+#: src/lyrics-common/lyrics_ovh_provider.cc:88
 msgid "Looking for lyrics ..."
 msgstr "വരികള്‍ക്കായി നോക്കുന്നു ..."
 
-#: src/lyricwiki/lyricwiki.cc:267 src/lyricwiki-qt/lyricwiki.cc:272
-msgid "Missing song metadata"
-msgstr "ചില മെറ്റാഡേറ്റ ലഭ്യമല്ല"
+#: src/lyrics-common/preferences.h:43
+msgid "Nowhere"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:49
+msgid "Artist is truncated at the start, Title -- at the end"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:50
+msgid "Chars to truncate on:"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:54
+msgid "Chars are ORed in RegExp, surrounded by whitespace"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:55
+msgid "Chars to split on:"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:56
+msgid "Further truncate those on chars"
+msgstr ""
 
-#: src/lyricwiki/lyricwiki.cc:278 src/lyricwiki-qt/lyricwiki.cc:283
-msgid "Connecting to lyrics.wikia.com ..."
+#: src/lyrics-common/preferences.h:62
+msgid "General"
 msgstr ""
 
-#: src/lyricwiki-qt/lyricwiki.cc:55
-msgid "LyricWiki Plugin (Qt)"
+#: src/lyrics-common/preferences.h:63
+msgid "Split title into artist and title on chars"
 msgstr ""
 
-#: src/m3u/m3u.cc:32
+#: src/lyrics-common/preferences.h:66
+msgid "Sources"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:67
+msgid "Use embedded lyrics (from Lyrics tag)"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:69
+msgid "Fetch lyrics from internet:"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:72
+msgid "Store fetched lyrics in local cache"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:74
+msgid "Local Storage"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:75
+msgid "Load lyric files (.lrc) from local storage"
+msgstr ""
+
+#: src/lyrics-common/utils.cc:54 src/ui-common/dialogs-qt.cc:63
+msgid "Error"
+msgstr "പിശക്"
+
+#: src/lyrics-common/utils.cc:60
+msgid "Lyrics could not be found."
+msgstr ""
+
+#: src/lyrics-common/utils.cc:142
+msgid "Missing title and/or artist."
+msgstr ""
+
+#: src/lyrics-gtk/lyrics-gtk.cc:37 src/lyrics-qt/lyrics-qt.cc:50
+msgid "Lyrics"
+msgstr ""
+
+#: src/lyrics-gtk/lyrics-gtk.cc:189 src/lyrics-qt/lyrics-qt.cc:171
+msgid "Edit Lyrics ..."
+msgstr ""
+
+#: src/lyrics-gtk/lyrics-gtk.cc:195 src/lyrics-qt/lyrics-qt.cc:178
+msgid "Save Locally"
+msgstr ""
+
+#: src/lyrics-gtk/lyrics-gtk.cc:201 src/lyrics-qt/lyrics-qt.cc:186
+msgid "Refresh"
+msgstr ""
+
+#: src/m3u/m3u.cc:33
 msgid "M3U Playlists"
 msgstr "M3U പ്ലേലിസ്റ്റുകള്‍"
 
@@ -2214,17 +2416,17 @@
 msgid "Tact Generator"
 msgstr "ടാക്റ്റ് ജനറേറ്റര്‍"
 
-#: src/metronom/metronom.cc:147
+#: src/metronom/metronom.cc:145
 #, c-format
 msgid "Tact generator: %d bpm"
 msgstr ""
 
-#: src/metronom/metronom.cc:149
+#: src/metronom/metronom.cc:147
 #, c-format
 msgid "Tact generator: %d bpm %d/%d"
 msgstr ""
 
-#: src/metronom/metronom.cc:237
+#: src/metronom/metronom.cc:235
 msgid ""
 "A Tact Generator by Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
 "\n"
@@ -2233,21 +2435,21 @@
 "or tact://60*3/4 to play 60 bpm in 3/4 tacts"
 msgstr ""
 
-#: src/mixer/mixer.cc:38
+#: src/mixer/mixer.cc:43
 msgid "Channel Mixer"
 msgstr "ചാനല്‍ മിക്സര്‍"
 
-#: src/mixer/mixer.cc:202
+#: src/mixer/mixer.cc:255
 msgid ""
 "Channel Mixer Plugin for Audacious\n"
 "Copyright 2011-2012 John Lindgren and Michał Lipski"
 msgstr ""
 
-#: src/mixer/mixer.cc:206
+#: src/mixer/mixer.cc:259
 msgid "Channel Mixer"
 msgstr "ചാനല്‍ മിക്സര്‍"
 
-#: src/mixer/mixer.cc:207
+#: src/mixer/mixer.cc:260
 msgid "Output channels:"
 msgstr "ഔട്പുട്ട് ചാനലുകള്‍:"
 
@@ -2259,168 +2461,176 @@
 msgid "Error connecting to MMS server"
 msgstr ""
 
-#: src/modplug/modplugbmp.h:53
+#: src/modplug/modplugbmp.h:57
 msgid "ModPlug (Module Player)"
 msgstr ""
 
-#: src/modplug/plugin_main.cc:53
-msgid "Resolution"
-msgstr "റെസല്യൂഷന്‍"
-
-#: src/modplug/plugin_main.cc:54
-msgid "8-bit"
-msgstr "8-ബിറ്റ്"
-
 #: src/modplug/plugin_main.cc:55
-msgid "16-bit"
-msgstr "16-ബിറ്റ്"
-
-#: src/modplug/plugin_main.cc:56
 msgid "Channels"
 msgstr "ചാനലുകള്‍"
 
-#: src/modplug/plugin_main.cc:60
+#: src/modplug/plugin_main.cc:59
 msgid "Nearest (fastest)"
 msgstr "ഏറ്റവും അടുത്തുള്ളത് (ഏറ്റവും വേഗതയുള്ളത്)"
 
-#: src/modplug/plugin_main.cc:61
+#: src/modplug/plugin_main.cc:60
 msgid "Linear (fast)"
 msgstr ""
 
-#: src/modplug/plugin_main.cc:62
+#: src/modplug/plugin_main.cc:61
 msgid "Spline (good)"
 msgstr ""
 
-#: src/modplug/plugin_main.cc:63
+#: src/modplug/plugin_main.cc:62
 msgid "Polyphase (best)"
 msgstr ""
 
-#: src/modplug/plugin_main.cc:64
+#: src/modplug/plugin_main.cc:63
 msgid "Sample rate"
 msgstr ""
 
-#: src/modplug/plugin_main.cc:65
+#: src/modplug/plugin_main.cc:64
 msgid "22 kHz"
 msgstr "22 kHz"
 
-#: src/modplug/plugin_main.cc:66
+#: src/modplug/plugin_main.cc:65
 msgid "44 kHz"
 msgstr "44 kHz"
 
-#: src/modplug/plugin_main.cc:67
+#: src/modplug/plugin_main.cc:66
 msgid "48 kHz"
 msgstr "48 kHz"
 
-#: src/modplug/plugin_main.cc:68
+#: src/modplug/plugin_main.cc:67
 msgid "96 kHz"
 msgstr "96 kHz"
 
-#: src/modplug/plugin_main.cc:72 src/modplug/plugin_main.cc:77
-#: src/modplug/plugin_main.cc:82
+#: src/modplug/plugin_main.cc:71 src/modplug/plugin_main.cc:76
+#: src/modplug/plugin_main.cc:81
 msgid "Level:"
 msgstr "തലം:"
 
-#: src/modplug/plugin_main.cc:78
+#: src/modplug/plugin_main.cc:77
 msgid "Cutoff:"
 msgstr "കട്ടോഫ്:"
 
-#: src/modplug/plugin_main.cc:91
+#: src/modplug/plugin_main.cc:90
 msgid "Reverb"
 msgstr " പ്രതിധ്വനി "
 
-#: src/modplug/plugin_main.cc:94
+#: src/modplug/plugin_main.cc:93
 msgid "Bass Boost"
 msgstr "ബേസ് ബൂസ്റ്റ്"
 
-#: src/modplug/plugin_main.cc:97
+#: src/modplug/plugin_main.cc:96
 msgid "Surround"
 msgstr "സറൗണ്ട്"
 
-#: src/modplug/plugin_main.cc:100
+#: src/modplug/plugin_main.cc:99
 msgid "Preamp"
 msgstr "പ്രീആംപ്"
 
-#: src/modplug/plugin_main.cc:107
+#: src/modplug/plugin_main.cc:106
 msgid "Oversample"
 msgstr "ഓവര്‍സാമ്പ്ള്‍"
 
-#: src/modplug/plugin_main.cc:108
+#: src/modplug/plugin_main.cc:107
 msgid "Noise reduction"
 msgstr "നോയ്സ് റിഡക്ഷന്‍"
 
-#: src/modplug/plugin_main.cc:109
+#: src/modplug/plugin_main.cc:108
 msgid "Play Amiga MODs"
 msgstr ""
 
-#: src/modplug/plugin_main.cc:110
+#: src/modplug/plugin_main.cc:109
 msgid "Repeat"
 msgstr "ആവര്‍ത്തിയ്ക്കുക"
 
-#: src/modplug/plugin_main.cc:111
+#: src/modplug/plugin_main.cc:110
 msgid "Repeat count:"
 msgstr "ആവര്‍ത്തങ്ങളുടെ എണ്ണം:"
 
-#: src/modplug/plugin_main.cc:112
+#: src/modplug/plugin_main.cc:111
 msgid "To repeat forever, set the repeat count to -1."
 msgstr ""
 
-#: src/modplug/plugin_main.cc:125 src/sid/xs_config.cc:106
+#: src/modplug/plugin_main.cc:124 src/sid/xs_config.cc:106
 msgid "These settings will take effect when Audacious is restarted."
 msgstr ""
 
+#: src/moonstone/main_window.cc:72 src/moonstone/main_window.cc:73
+#: src/qtui/main_window.cc:159 src/qtui/main_window.cc:160
+#: src/skins/menus.cc:107 src/skins-qt/menus.cc:98
+msgid "Stop After This Song"
+msgstr ""
+
+#: src/moonstone/moonstone.cc:39
+msgid "Moonstone"
+msgstr ""
+
+#: src/moonstone/playlist_header.cc:212 src/qtui/playlist_header.cc:258
+msgid "Reset to Defaults"
+msgstr ""
+
+#: src/moonstone/playlist_model.cc:38 src/qtui/playlist_header.cc:232
+msgid "Now Playing"
+msgstr "ഇപ്പോള്‍ പാടുന്നത്"
+
+#: src/moonstone/playlist_selection.cc:66
+#: src/playlist-manager/playlist-manager.cc:201
+#: src/playlist-manager-qt/playlist-manager-qt.cc:190
+msgid "Entries"
+msgstr "എന്‍ട്രികള്‍"
+
 #: src/mpg123/mpg123.cc:54
 msgid "MPG123 Plugin"
 msgstr "MPG123 പ്ലഗ്ഗിന്‍"
 
-#: src/mpg123/mpg123.cc:83
-msgid "Advanced"
-msgstr ""
-
-#: src/mpg123/mpg123.cc:84
+#: src/mpg123/mpg123.cc:82
 msgid "Use accurate length calculation (slow)"
 msgstr ""
 
-#: src/mpg123/mpg123.cc:248
+#: src/mpg123/mpg123.cc:260
 msgid "Surround"
 msgstr "സറൗണ്ട്"
 
-#: src/mpris2/plugin.cc:39
+#: src/mpris2/plugin.cc:40
 msgid "MPRIS 2 Server"
 msgstr "MPRIS 2 സെര്‍വര്‍"
 
-#: src/neon/neon.cc:97
+#: src/neon/neon.cc:102
 msgid "Neon HTTP/HTTPS Plugin"
 msgstr ""
 
-#: src/neon/neon.cc:521
+#: src/neon/neon.cc:526
 msgid "Error parsing redirect"
 msgstr ""
 
-#: src/neon/neon.cc:535
+#: src/neon/neon.cc:540
 msgid "Unknown HTTP error"
 msgstr ""
 
-#: src/neon/neon.cc:569
+#: src/neon/neon.cc:614
 msgid "Error parsing URL"
 msgstr ""
 
-#: src/neon/neon.cc:632
+#: src/neon/neon.cc:687
 msgid "Too many redirects"
 msgstr ""
 
-#: src/notify/event.cc:64
+#: src/notify/event.cc:97
 msgid "Stopped"
 msgstr "നിര്‍ത്തി"
 
-#: src/notify/event.cc:64
+#: src/notify/event.cc:97
 msgid "Audacious is not playing."
 msgstr "ഒഡാഷ്യസ് പ്രവര്‍ത്തിക്കുന്നില്ല."
 
-#: src/notify/notify.cc:42
+#: src/notify/notify.cc:39
 msgid "Desktop Notifications"
 msgstr "ഡെസ്ക്ടോപ്പ് അറിയിപ്പുകള്‍"
 
-#: src/notify/notify.cc:60
+#: src/notify/notify.cc:57
 msgid ""
 "Desktop Notifications Plugin for Audacious\n"
 "Copyright (C) 2010 Maximilian Bogner\n"
@@ -2440,36 +2650,76 @@
 "this program. If not, see <http://www.gnu.org/licenses/>."
 msgstr ""
 
-#: src/notify/notify.cc:110
+#: src/notify/notify.cc:104
 msgid "Show playback controls"
 msgstr "പ്ലേബാക്ക് ക്രമീകരണങ്ങള്‍ കാണിക്കുക"
 
-#: src/notify/notify.cc:112
+#: src/notify/notify.cc:106
 msgid "Always show notification"
 msgstr "എല്ലായ്പ്പോഴും വിജ്ഞാപനങ്ങള്‍ കാണിക്കുക"
 
-#: src/notify/notify.cc:114
+#: src/notify/notify.cc:108
 msgid "Include album name in notification"
 msgstr ""
 
-#: src/notify/osd.cc:58
+#: src/notify/notify.cc:110
+msgid "Custom notification duration:"
+msgstr ""
+
+#: src/notify/osd.cc:74
 msgid "Show"
 msgstr "കാണിയ്ക്കുക"
 
-#: src/notify/osd.cc:66 src/qtui/main_window.cc:178
-#: src/qtui/main_window.cc:179 src/skins/menus.cc:88
-msgid "Pause"
-msgstr "പോസ് ചെയ്യുക"
+#: src/openmpt/mpt.cc:50
+msgid "OpenMPT (Module Player)"
+msgstr ""
 
-#: src/notify/osd.cc:73 src/qtui/main_window.cc:72 src/skins/menus.cc:91
-msgid "Next"
-msgstr "അടുത്തത്"
+#: src/openmpt/mpt.cc:132
+msgid ""
+"Module player based on libopenmpt\n"
+"\n"
+"Written by: Chris Spiegel <cspiegel@gmail.com>"
+msgstr ""
+
+#: src/openmpt/mpt.cc:151
+msgid "Stereo separation:"
+msgstr ""
+
+#: src/openmpt/mpt.cc:153
+msgid "% (0=mono, 100=default, 200=full)"
+msgstr ""
+
+#: src/openmpt/mpt.cc:157
+msgid "Interpolation:"
+msgstr ""
+
+#: src/openmpt/mptwrap.h:51 src/soxr/sox-resampler.cc:189 src/xsf/plugin.cc:437
+msgid "Linear"
+msgstr ""
+
+#: src/openmpt/mptwrap.h:52
+msgid "Cubic"
+msgstr ""
 
-#: src/oss4/oss.h:93
+#: src/openmpt/mptwrap.h:53
+msgid "Windowed sinc"
+msgstr ""
+
+#: src/opus/opus.cc:39
+msgid "Opus Decoder"
+msgstr ""
+
+#: src/opus/opus.cc:336
+msgid ""
+"Opus Decoder Plugin for Audacious\n"
+"Copyright 2022 Thomas Lange"
+msgstr ""
+
+#: src/oss4/oss.h:70
 msgid "OSS4 Output"
 msgstr "OSS4 ഔട്പുട്ട്"
 
-#: src/oss4/oss.h:95
+#: src/oss4/oss.h:72
 msgid "OSS3 Output"
 msgstr ""
 
@@ -2477,27 +2727,27 @@
 msgid "Default device"
 msgstr ""
 
-#: src/oss4/plugin.cc:77
+#: src/oss4/plugin.cc:78
 msgid "Audio device:"
 msgstr "ഓഡിയോ ഉപകരണം:"
 
-#: src/oss4/plugin.cc:80
+#: src/oss4/plugin.cc:81
 msgid "Use alternate device:"
 msgstr "ബദല്‍ ഉപകരണം ഉപയോഗിയ്ക്കുക"
 
-#: src/oss4/plugin.cc:84
+#: src/oss4/plugin.cc:85
 msgid "Save volume between sessions."
 msgstr "സെഷനുകളുടെ ഇടയിലുള്ള ഉച്ചത സേവ് ചെയ്യുക."
 
-#: src/oss4/plugin.cc:86
+#: src/oss4/plugin.cc:87
 msgid "Enable format conversions made by the OSS software."
 msgstr "OSS സോഫ്റ്റ്വെയര്‍ തയ്യാറാക്കിയ ഫോര്‍മാറ്റ് മാറ്റങ്ങള്‍ സാധ്യമാക്കുക."
 
-#: src/oss4/plugin.cc:88
+#: src/oss4/plugin.cc:89
 msgid "Enable exclusive mode to prevent virtual mixing."
 msgstr ""
 
-#: src/oss4/plugin.cc:100
+#: src/oss4/plugin.cc:101
 msgid ""
 "OSS4 Output Plugin for Audacious\n"
 "Copyright 2010-2012 Michał Lipski\n"
@@ -2506,19 +2756,35 @@
 "Lindgren and of course the authors of the previous OSS plugin."
 msgstr ""
 
-#: src/playlist-manager/playlist-manager.cc:37
-msgid "Playlist Manager"
+#: src/pipewire/pipewire.cc:44
+msgid "PipeWire Output"
 msgstr ""
 
-#: src/playlist-manager/playlist-manager.cc:226
-msgid "Entries"
+#: src/pipewire/pipewire.cc:118
+msgid ""
+"PipeWire Output Plugin for Audacious\n"
+"Copyright 2022 Thomas Lange\n"
+"\n"
+"Based on the PipeWire Output Plugin for Qmmp\n"
+"Copyright 2021 Ilya Kotov"
 msgstr ""
 
-#: src/playlist-manager/playlist-manager.cc:245
+#: src/pipewire/pipewire.cc:408 src/skins/menus.cc:88 src/skins-qt/menus.cc:79
+msgid "Playback"
+msgstr "പ്ലേബാക്ക്"
+
+#: src/playlist-manager/playlist-manager.cc:38
+#: src/playlist-manager-qt/playlist-manager-qt.cc:42
+msgid "Playlist Manager"
+msgstr "പ്ലേലിസ്റ്റ് മാനേജര്‍"
+
+#: src/playlist-manager/playlist-manager.cc:221
+#: src/playlist-manager-qt/playlist-manager-qt.cc:356
 msgid "_Remove"
 msgstr ""
 
-#: src/playlist-manager/playlist-manager.cc:246
+#: src/playlist-manager/playlist-manager.cc:222
+#: src/playlist-manager-qt/playlist-manager-qt.cc:351
 msgid "Ren_ame"
 msgstr ""
 
@@ -2526,39 +2792,54 @@
 msgid "PLS Playlists"
 msgstr "PLS പ്ലേലിസ്റ്റുകള്‍"
 
-#: src/psf/plugin.cc:45
+#: src/psf/plugin.cc:53
 msgid "OpenPSF PSF1/PSF2 Decoder"
 msgstr ""
 
-#: src/pulse_audio/pulse_audio.cc:38
+#: src/psf/plugin.cc:270
+msgid "OpenPSF Configuration"
+msgstr ""
+
+#: src/psf/plugin.cc:271 src/xsf/plugin.cc:444
+msgid "Ignore length from file"
+msgstr ""
+
+#: src/pulse/pulse_audio.cc:42
 msgid "PulseAudio Output"
 msgstr "പള്‍സ്‌ഓഡിയോ ഔട്പുട്ട്"
 
-#: src/pulse_audio/pulse_audio.cc:611
+#: src/pulse/pulse_audio.cc:84
+msgid "Context name:"
+msgstr ""
+
+#: src/pulse/pulse_audio.cc:86
+msgid "Stream name:"
+msgstr ""
+
+#: src/pulse/pulse_audio.cc:596
 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."
+"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/qtaudio/qtaudio.cc:49
+#: src/qtaudio/qtaudio.cc:53
 msgid "QtMultimedia Output"
 msgstr ""
 
-#: src/qtaudio/qtaudio.cc:77
+#: src/qtaudio/qtaudio.cc:84
 msgid ""
 "QtMultimedia Audio Output Plugin for Audacious\n"
 "Copyright 2014 William Pitcock\n"
@@ -2567,50 +2848,87 @@
 "Copyright 2010 John Lindgren"
 msgstr ""
 
-#: src/qtui/dialog_windows.cc:31
-msgid "Working ..."
+#: src/qtglspectrum/gl-spectrum.cc:41
+msgid ""
+"OpenGL Spectrum Analyzer for Audacious\n"
+"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
+"Copyright 2014, 2020 Ariadne Conill\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/qtui/filter_input.cc:44 src/skins/ui_playlist.cc:221
-msgid "Search"
+#: src/qthotkey/gui.cc:177
+msgid "Press a key combination inside a text field."
 msgstr ""
 
-#: src/qtui/main_window_actions.cc:94
+#: src/qthotkey/plugin.cc:105
+msgid ""
+"Global Hotkey Plugin\n"
+"Control the player with global key combinations or multimedia keys.\n"
+"\n"
+"Copyright (C) 2020 i.Dark_Templar <darktemplar@dark-templar-archives.net>\n"
+"Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n"
+"\n"
+"Contributors 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/qtui/menus.cc:109
 msgid "_Open Folder ..."
 msgstr ""
 
-#: src/qtui/main_window_actions.cc:96
+#: src/qtui/menus.cc:115
 msgid "_Add Folder ..."
 msgstr ""
 
-#: src/qtui/main_window_actions.cc:101
+#: src/qtui/menus.cc:128
 msgid "_Log Inspector ..."
 msgstr ""
 
-#: src/qtui/main_window.cc:64
-msgid "Open Files"
+#: src/qtui/menus.cc:220
+msgid "_Find ..."
 msgstr ""
 
-#: src/qtui/main_window.cc:66
-msgid "Add Files"
+#: src/qtui/menus.cc:256 src/skins/menus.cc:80 src/skins-qt/menus.cc:70
+msgid "Audio Settings ..."
 msgstr ""
 
-#: src/qtui/main_window.cc:71 src/skins/menus.cc:90
-msgid "Previous"
-msgstr "മുമ്പത്തേത്"
+#: src/qtui/playlist_model.cc:188
+msgid "Q#"
+msgstr ""
 
-#: src/qtui/main_window.cc:77 src/skins/menus.cc:82
-msgid "Repeat"
-msgstr "ആവര്‍ത്തിയ്ക്കുക"
+#: src/qtui/playlist_model.cc:190
+msgid "T#"
+msgstr ""
 
-#: src/qtui/main_window.cc:79 src/skins/menus.cc:83
-msgid "Shuffle"
-msgstr "കശക്കുക"
+#: src/qtui/playlist_model.cc:192
+msgid "C#"
+msgstr ""
 
-#: src/qtui/qtui.cc:42
+#: src/qtui/playlist_model.cc:194
+msgid "D#"
+msgstr ""
+
+#: src/qtui/qtui.cc:40
 msgid "Qt Interface"
 msgstr ""
 
+#: src/qtui/search_bar.cc:46
+msgid "Search playlist"
+msgstr ""
+
+#: src/qtui/settings.cc:79
+msgid "Use bold font for column headers"
+msgstr ""
+
 #: src/resample/resample.cc:43
 msgid "Sample Rate Converter"
 msgstr ""
@@ -2649,7 +2967,7 @@
 msgid "Method:"
 msgstr "രീതി:"
 
-#: src/resample/resample.cc:199 src/sox-resampler/sox-resampler.cc:161
+#: src/resample/resample.cc:199 src/soxr/sox-resampler.cc:203
 msgid "Rate:"
 msgstr "തോത്:"
 
@@ -2701,162 +3019,153 @@
 msgid "192 kHz:"
 msgstr "192 kHz:"
 
-#: src/scrobbler2/config_window.cc:41
-#, c-format
-msgid "OK. Scrobbling for user: %s"
+#: src/scrobbler2/config_window.cc:29
+msgid "Checking Last.fm access ..."
 msgstr ""
 
-#: src/scrobbler2/config_window.cc:54
-msgid "Permission Denied"
-msgstr "അനുവാദം ഇല്ല"
-
-#: src/scrobbler2/config_window.cc:56
-msgid "Access the following link to allow Audacious to scrobble your plays:"
+#: src/scrobbler2/config_window.cc:35
+msgid ""
+"Your scrobbles are being saved on your computer temporarily. They will be "
+"submitted as soon as Audacious is allowed access."
 msgstr ""
 
-#: src/scrobbler2/config_window.cc:66
-msgid "Keep this window open and click 'Check Permission' again.\n"
+#: src/scrobbler2/config_window.cc:41
+#, c-format
+msgid "Permission granted. Scrobbling for user %s."
 msgstr ""
 
-#: src/scrobbler2/config_window.cc:69 src/scrobbler2/config_window.cc:80
+#: src/scrobbler2/config_window.cc:44
 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."
+"Permission denied. Open the following URL in a browser, allow Audacious "
+"access to your account, and then click 'Check Permission' again:"
 msgstr ""
 
-#: src/scrobbler2/config_window.cc:77
-msgid "Network Problem."
-msgstr "നെറ്റ്‌വര്‍ക്ക് കുഴപ്പം."
-
-#: src/scrobbler2/config_window.cc:78
-msgid "There was a problem contacting Last.fm. Please try again later."
+#: src/scrobbler2/config_window.cc:53
+msgid "There was a problem contacting Last.fm."
 msgstr ""
 
-#: src/scrobbler2/config_window.cc:110
-msgid "Checking..."
-msgstr "പരിശോധിക്കുന്നു..."
-
-#: src/scrobbler2/config_window.cc:176
-msgid "C_heck Permission"
+#: src/scrobbler2/config_window.cc:92
+msgid "Check Permission"
 msgstr ""
 
-#: src/scrobbler2/config_window.cc:177
-msgid "_Revoke Permission"
+#: src/scrobbler2/config_window.cc:93
+msgid "Revoke Permission"
 msgstr ""
 
-#: src/scrobbler2/config_window.cc:220
-msgid ""
-"You need to allow Audacious to scrobble tracks to your Last.fm account.\n"
+#: src/scrobbler2/config_window.cc:97
+msgid "You need to allow Audacious to scrobble tracks to your Last.fm account."
 msgstr ""
 
 #: src/scrobbler2/scrobbler.cc:29
 msgid "Scrobbler 2.0"
 msgstr "സ്‌ക്രോബ്ബ്ലര്‍ 2.0"
 
-#: src/scrobbler2/scrobbler.cc:224
+#: src/scrobbler2/scrobbler.cc:200
 msgid ""
 "The Scrobbler plugin could not be started.\n"
 "There might be a problem with your installation."
 msgstr ""
 
-#: src/scrobbler2/scrobbler.cc:289
+#: src/scrobbler2/scrobbler.cc:245
 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"
+"project."
 msgstr ""
 
-#: src/scrobbler2/scrobbler_communication.cc:642
-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/sdlout.cc:48
+#: src/sdlout/sdlout.cc:43
 msgid "SDL Output"
 msgstr ""
 
-#: src/sdlout/sdlout.cc:77
+#: src/sdlout/sdlout.cc:72
 msgid ""
 "SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
 msgstr ""
 
-#: src/search-tool/search-tool.cc:116 src/search-tool/search-tool.cc:124
+#: src/search-tool/library.cc:35 src/search-tool/library.cc:46
+#: src/search-tool-qt/library.cc:35 src/search-tool-qt/library.cc:46
 msgid "Library"
 msgstr "ഗ്രന്ഥശാല"
 
-#: src/search-tool/search-tool.cc:394
-#, c-format
-msgid "%d result"
-msgid_plural "%d results"
-msgstr0 ""
-msgstr1 ""
-
-#: src/search-tool/search-tool.cc:400
-#, c-format
-msgid "(%d hidden)"
-msgid_plural "(%d hidden)"
-msgstr0 ""
-msgstr1 ""
-
-#: src/search-tool/search-tool.cc:594
+#: src/search-tool-qt/search-model.cc:44 src/search-tool/search-tool.cc:287
 #, c-format
 msgid "%d song"
 msgid_plural "%d songs"
 msgstr0 ""
 msgstr1 ""
 
-#: src/search-tool/search-tool.cc:601
+#: src/search-tool-qt/search-model.cc:53 src/search-tool/search-tool.cc:294
 msgid "of this genre"
 msgstr ""
 
-#: src/search-tool/search-tool.cc:607
+#: src/search-tool-qt/search-model.h:47 src/search-tool/search-model.h:45
 msgid "on"
 msgstr ""
 
-#: src/search-tool/search-tool.cc:607
+#: src/search-tool-qt/search-model.h:47 src/search-tool/search-model.h:45
 msgid "by"
 msgstr ""
 
-#: src/search-tool/search-tool.cc:643
-msgid "_Create Playlist"
-msgstr "പ്ലേലിസ്റ്റ് _നിര്‍മിക്കുക"
+#: src/search-tool-qt/search-tool-qt.cc:165 src/search-tool/search-tool.cc:74
+msgid "Number of results to show:"
+msgstr ""
 
-#: src/search-tool/search-tool.cc:645
-msgid "_Add to Playlist"
-msgstr "പ്ലേലിസ്റ്റിലേയ്ക്ക് _ചേര്‍ക്കുക"
+#: src/search-tool-qt/search-tool-qt.cc:168 src/search-tool/search-tool.cc:77
+msgid "Rescan library at startup"
+msgstr ""
 
-#: src/search-tool/search-tool.cc:684
-msgid "Search library"
-msgstr "ഗ്രന്ഥശാല തിരയുക"
+#: src/search-tool-qt/search-tool-qt.cc:170
+msgid "Monitor library for changes"
+msgstr ""
 
-#: src/search-tool/search-tool.cc:688
+#: src/search-tool-qt/search-tool-qt.cc:193 src/search-tool/search-tool.cc:450
 msgid ""
 "To import your music library into Audacious, choose a folder and then click "
 "the \"refresh\" icon."
 msgstr ""
 
-#: src/search-tool/search-tool.cc:696
+#: src/search-tool-qt/search-tool-qt.cc:195 src/search-tool/search-tool.cc:459
 msgid "Please wait ..."
 msgstr "ദയവായി കാത്തിരിക്കുക ..."
 
-#: src/search-tool/search-tool.cc:723
+#: src/search-tool-qt/search-tool-qt.cc:197 src/search-tool/search-tool.cc:487
 msgid "Choose Folder"
 msgstr "ഫോള്‍ഡര്‍ തെരെഞ്ഞെടുക്കുക"
 
+#: src/search-tool-qt/search-tool-qt.cc:201 src/search-tool/search-tool.cc:445
+msgid "Search library"
+msgstr "ഗ്രന്ഥശാല തിരയുക"
+
+#: src/search-tool-qt/search-tool-qt.cc:327 src/search-tool/search-tool.cc:156
+#, c-format
+msgid "%d of %d result shown"
+msgid_plural "%d of %d results shown"
+msgstr0 ""
+msgstr1 ""
+
+#: src/search-tool-qt/search-tool-qt.cc:331 src/search-tool/search-tool.cc:160
+#, c-format
+msgid "%d result"
+msgid_plural "%d results"
+msgstr0 ""
+msgstr1 ""
+
+#: src/search-tool-qt/search-tool-qt.cc:501 src/search-tool/search-tool.cc:341
+msgid "_Create Playlist"
+msgstr "പ്ലേലിസ്റ്റ് _നിര്‍മിക്കുക"
+
+#: src/search-tool-qt/search-tool-qt.cc:503 src/search-tool/search-tool.cc:343
+msgid "_Add to Playlist"
+msgstr "പ്ലേലിസ്റ്റിലേയ്ക്ക് _ചേര്‍ക്കുക"
+
 #: src/sid/xmms-sid.cc:43
 msgid "SID Player"
 msgstr ""
 
-#: src/sid/xs_config.cc:61
-msgid "Output"
-msgstr ""
-
 #: src/sid/xs_config.cc:62
 msgid "Channels:"
 msgstr ""
@@ -2935,737 +3244,680 @@
 msgid "Threshold:"
 msgstr ""
 
-#: src/silence-removal/silence-removal.cc:70
-msgid "dB"
+#: src/skins/actions.cc:45 src/skins-qt/actions.cc:43
+msgid "Repeat points cleared."
 msgstr ""
 
-#: src/skins/menus.cc:64
-msgid "Open Files ..."
+#: src/skins/actions.cc:60 src/skins-qt/actions.cc:58
+msgid "Repeat point A set."
 msgstr ""
 
-#: src/skins/menus.cc:65
-msgid "Open URL ..."
+#: src/skins/actions.cc:65 src/skins-qt/actions.cc:63
+msgid "Repeat point B set."
 msgstr ""
 
-#: src/skins/menus.cc:66
-msgid "Search Library"
+#: src/skins/equalizer.cc:223 src/skins-qt/equalizer.cc:223
+msgid "Preamp"
+msgstr "പ്രീആംപ്"
+
+#: src/skins/equalizer.cc:227 src/skins-qt/equalizer.cc:227
+msgid "31 Hz"
+msgstr "31 Hz"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "63 Hz"
+msgstr "63 Hz"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "125 Hz"
+msgstr "125 Hz"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "250 Hz"
+msgstr "250 Hz"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "500 Hz"
+msgstr "500 Hz"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "1 kHz"
+msgstr "1 kHz"
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "2 kHz"
+msgstr "2 kHz"
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "4 kHz"
+msgstr "4 kHz"
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "8 kHz"
+msgstr "8 kHz"
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "16 kHz"
+msgstr "16 kHz"
+
+#: src/skins/equalizer.cc:270 src/skins-qt/equalizer.cc:270
+msgid "Audacious Equalizer"
+msgstr "ഒഡാഷ്യസ് ഈക്വലൈസര്‍"
+
+#: src/skins/main.cc:459 src/skins-qt/main.cc:442
+msgid "Recording on"
 msgstr ""
 
-#: src/skins/menus.cc:68
-msgid "Playback"
-msgstr "പ്ലേബാക്ക്"
+#: src/skins/main.cc:461 src/skins-qt/main.cc:444
+msgid "Recording off"
+msgstr ""
 
-#: src/skins/menus.cc:69
+#: src/skins/main.cc:754 src/skins-qt/main.cc:701
+#, c-format
+msgid "Seek to %d:%-2.2d / %d:%-2.2d"
+msgstr "തിരയുക %d:%-2.2d / %d:%-2.2d"
+
+#: src/skins/main.cc:771 src/skins-qt/main.cc:718
+#, c-format
+msgid "Volume: %d%%"
+msgstr "ശബ്ദം: %d%%"
+
+#: src/skins/main.cc:784 src/skins-qt/main.cc:731
+#, c-format
+msgid "Balance: %d%% left"
+msgstr "അവശേഷിക്കുന്നത്: %d%% വലത്"
+
+#: src/skins/main.cc:786 src/skins-qt/main.cc:733
+msgid "Balance: center"
+msgstr "അവശേഷിക്കുന്നത്: നടുവില്‍"
+
+#: src/skins/main.cc:788 src/skins-qt/main.cc:735
+#, c-format
+msgid "Balance: %d%% right"
+msgstr "അവശേഷിക്കുന്നത്: %d%% ഇടത്"
+
+#: src/skins/main.cc:880 src/skins-qt/main.cc:827
+msgid "Options Menu"
+msgstr "ഓപ്ഷന്‍സ് മെനു"
+
+#: src/skins/main.cc:884 src/skins-qt/main.cc:831
+msgid "Disable 'Always On Top'"
+msgstr "'എപ്പോഴും മുകളില്‍' അസാദ്ധ്യമാക്കുക"
+
+#: src/skins/main.cc:886 src/skins-qt/main.cc:833
+msgid "Enable 'Always On Top'"
+msgstr "'എപ്പോഴും മുകളില്‍' സാദ്ധ്യമാക്കുക"
+
+#: src/skins/main.cc:889 src/skins-qt/main.cc:836
+msgid "File Info Box"
+msgstr "ഫയല്‍ ഇന്‍ഫോ ജാലകം"
+
+#: src/skins/main.cc:892 src/skins/menus.cc:149 src/skins-qt/main.cc:839
+#: src/skins-qt/menus.cc:142
+msgid "Double Size"
+msgstr ""
+
+#: src/skins/main.cc:895 src/skins-qt/main.cc:842
+msgid "Visualizations"
+msgstr ""
+
+#: src/skins/menus.cc:74 src/skins-qt/menus.cc:64
+msgid "Volume Up"
+msgstr ""
+
+#: src/skins/menus.cc:75 src/skins-qt/menus.cc:65
+msgid "Volume Down"
+msgstr ""
+
+#: src/skins/menus.cc:77 src/skins-qt/menus.cc:67
+msgid "Effects ..."
+msgstr ""
+
+#: src/skins/menus.cc:84 src/skins-qt/menus.cc:74
+msgid "Open Files ..."
+msgstr ""
+
+#: src/skins/menus.cc:85 src/skins-qt/menus.cc:76
+msgid "Open URL ..."
+msgstr ""
+
+#: src/skins/menus.cc:89 src/skins-qt/menus.cc:80
 msgid "Playlist"
 msgstr "പ്ലേലിസ്റ്റ്"
 
-#: src/skins/menus.cc:70
+#: src/skins/menus.cc:90 src/skins-qt/menus.cc:81
+msgid "Output"
+msgstr ""
+
+#: src/skins/menus.cc:91 src/skins-qt/menus.cc:82
 msgid "View"
 msgstr "കാണുക"
 
-#: src/skins/menus.cc:72 src/skins/menus.cc:136 src/skins/menus.cc:149
-#: src/skins/menus.cc:214
+#: src/skins/menus.cc:93 src/skins/menus.cc:161 src/skins/menus.cc:174
+#: src/skins/menus.cc:245 src/skins-qt/menus.cc:84 src/skins-qt/menus.cc:156
+#: src/skins-qt/menus.cc:170 src/skins-qt/menus.cc:241
 msgid "Services"
 msgstr ""
 
-#: src/skins/menus.cc:74
+#: src/skins/menus.cc:95 src/skins-qt/menus.cc:86
 msgid "About ..."
 msgstr ""
 
-#: src/skins/menus.cc:75
+#: src/skins/menus.cc:96 src/skins-qt/menus.cc:87
 msgid "Settings ..."
 msgstr ""
 
-#: src/skins/menus.cc:76
+#: src/skins/menus.cc:97 src/skins-qt/menus.cc:88
 msgid "Quit"
 msgstr ""
 
-#: src/skins/menus.cc:80 src/skins/menus.cc:206
+#: src/skins/menus.cc:101 src/skins/menus.cc:235 src/skins-qt/menus.cc:92
+#: src/skins-qt/menus.cc:231
 msgid "Song Info ..."
 msgstr ""
 
-#: src/skins/menus.cc:84
-msgid "No Playlist Advance"
+#: src/skins/menus.cc:105 src/skins-qt/menus.cc:96
+msgid "Shuffle by Album"
 msgstr ""
 
-#: src/skins/menus.cc:85
-msgid "Stop After This Song"
+#: src/skins/menus.cc:106 src/skins-qt/menus.cc:97
+msgid "No Playlist Advance"
 msgstr ""
 
-#: src/skins/menus.cc:93
+#: src/skins/menus.cc:117 src/skins-qt/menus.cc:108
 msgid "Set A-B Repeat"
 msgstr ""
 
-#: src/skins/menus.cc:94
+#: src/skins/menus.cc:118 src/skins-qt/menus.cc:109
 msgid "Clear A-B Repeat"
 msgstr ""
 
-#: src/skins/menus.cc:96
+#: src/skins/menus.cc:120 src/skins-qt/menus.cc:111
 msgid "Jump to Song ..."
 msgstr ""
 
-#: src/skins/menus.cc:97
+#: src/skins/menus.cc:121 src/skins-qt/menus.cc:113
 msgid "Jump to Time ..."
 msgstr ""
 
-#: src/skins/menus.cc:101
+#: src/skins/menus.cc:125 src/skins-qt/menus.cc:118
 msgid "Play/Resume"
 msgstr ""
 
-#: src/skins/menus.cc:103
+#: src/skins/menus.cc:127 src/skins-qt/menus.cc:120
 msgid "New Playlist"
 msgstr "പുതിയ പ്ലേലിസ്റ്റ്"
 
-#: src/skins/menus.cc:104
+#: src/skins/menus.cc:128 src/skins-qt/menus.cc:121
 msgid "Rename Playlist ..."
 msgstr ""
 
-#: src/skins/menus.cc:105
+#: src/skins/menus.cc:129 src/skins-qt/menus.cc:122
 msgid "Remove Playlist"
 msgstr ""
 
-#: src/skins/menus.cc:107
+#: src/skins/menus.cc:131 src/skins-qt/menus.cc:124
 msgid "Previous Playlist"
 msgstr ""
 
-#: src/skins/menus.cc:108
+#: src/skins/menus.cc:132 src/skins-qt/menus.cc:125
 msgid "Next Playlist"
 msgstr ""
 
-#: src/skins/menus.cc:110
+#: src/skins/menus.cc:134 src/skins-qt/menus.cc:127
 msgid "Import Playlist ..."
 msgstr ""
 
-#: src/skins/menus.cc:111
+#: src/skins/menus.cc:135 src/skins-qt/menus.cc:128
 msgid "Export Playlist ..."
 msgstr ""
 
-#: src/skins/menus.cc:113
+#: src/skins/menus.cc:137 src/skins-qt/menus.cc:130
 msgid "Playlist Manager ..."
 msgstr ""
 
-#: src/skins/menus.cc:114
+#: src/skins/menus.cc:138 src/skins-qt/menus.cc:131
 msgid "Queue Manager ..."
 msgstr ""
 
-#: src/skins/menus.cc:116
+#: src/skins/menus.cc:140 src/skins-qt/menus.cc:133
 msgid "Refresh Playlist"
 msgstr ""
 
-#: src/skins/menus.cc:120
+#: src/skins/menus.cc:144 src/skins-qt/menus.cc:137
 msgid "Show Playlist Editor"
 msgstr "പ്ലേലിസ്റ്റ് എഡിറ്റര്‍ കാണിക്കുക"
 
-#: src/skins/menus.cc:121
+#: src/skins/menus.cc:145 src/skins-qt/menus.cc:138
 msgid "Show Equalizer"
 msgstr "ഈക്വലൈര്‍ പ്രദര്‍ശിപ്പിയ്ക്കുക"
 
-#: src/skins/menus.cc:123
+#: src/skins/menus.cc:147 src/skins-qt/menus.cc:140
 msgid "Show Remaining Time"
 msgstr ""
 
-#: src/skins/menus.cc:125
+#: src/skins/menus.cc:150 src/skins-qt/menus.cc:143
 msgid "Always on Top"
 msgstr "എപ്പോഴും മുകളില്‍"
 
-#: src/skins/menus.cc:126
+#: src/skins/menus.cc:151 src/skins-qt/menus.cc:145
 msgid "On All Workspaces"
 msgstr ""
 
-#: src/skins/menus.cc:128
+#: src/skins/menus.cc:153 src/skins-qt/menus.cc:148
 msgid "Roll Up Player"
 msgstr ""
 
-#: src/skins/menus.cc:129
+#: src/skins/menus.cc:154 src/skins-qt/menus.cc:149
 msgid "Roll Up Playlist Editor"
 msgstr ""
 
-#: src/skins/menus.cc:130
+#: src/skins/menus.cc:155 src/skins-qt/menus.cc:150
 msgid "Roll Up Equalizer"
 msgstr ""
 
-#: src/skins/menus.cc:132 src/skins/ui_main.cc:854
-msgid "Double Size"
-msgstr ""
-
-#: src/skins/menus.cc:138
+#: src/skins/menus.cc:163 src/skins-qt/menus.cc:158
 msgid "Add URL ..."
 msgstr ""
 
-#: src/skins/menus.cc:139
+#: src/skins/menus.cc:164 src/skins-qt/menus.cc:160
 msgid "Add Files ..."
 msgstr ""
 
-#: src/skins/menus.cc:143 src/skins/menus.cc:171 src/skins/menus.cc:185
+#: src/skins/menus.cc:168 src/skins/menus.cc:196 src/skins/menus.cc:212
+#: src/skins-qt/menus.cc:164 src/skins-qt/menus.cc:192
+#: src/skins-qt/menus.cc:208
 msgid "By Title"
 msgstr "ടൈറ്റിലിനനുസരിച്ച്"
 
-#: src/skins/menus.cc:144 src/skins/menus.cc:178 src/skins/menus.cc:192
+#: src/skins/menus.cc:169 src/skins/menus.cc:203 src/skins/menus.cc:219
+#: src/skins-qt/menus.cc:165 src/skins-qt/menus.cc:199
+#: src/skins-qt/menus.cc:215
 msgid "By File Name"
 msgstr ""
 
-#: src/skins/menus.cc:145 src/skins/menus.cc:179 src/skins/menus.cc:193
+#: src/skins/menus.cc:170 src/skins/menus.cc:204 src/skins/menus.cc:220
+#: src/skins-qt/menus.cc:166 src/skins-qt/menus.cc:200
+#: src/skins-qt/menus.cc:216
 msgid "By File Path"
 msgstr ""
 
-#: src/skins/menus.cc:151
+#: src/skins/menus.cc:176 src/skins-qt/menus.cc:172
 msgid "Remove All"
 msgstr "എല്ലാം നീക്കം ചെയ്യുക"
 
-#: src/skins/menus.cc:152
+#: src/skins/menus.cc:177 src/skins-qt/menus.cc:173
 msgid "Clear Queue"
 msgstr "വരി വെടിപ്പാക്കുക"
 
-#: src/skins/menus.cc:154
+#: src/skins/menus.cc:179 src/skins-qt/menus.cc:175
 msgid "Remove Unavailable Files"
 msgstr "ലഭ്യമല്ലാത്ത ഫയലുകള്‍ നീക്കംചെയ്യുക"
 
-#: src/skins/menus.cc:155
+#: src/skins/menus.cc:180 src/skins-qt/menus.cc:176
 msgid "Remove Duplicates"
 msgstr "പകര്‍പ്പുകള്‍ ഒഴിവാക്കുക"
 
-#: src/skins/menus.cc:157
+#: src/skins/menus.cc:182 src/skins-qt/menus.cc:178
 msgid "Remove Unselected"
 msgstr "തിരഞ്ഞെടുക്കാത്തവ നീക്കംചെയ്യുക"
 
-#: src/skins/menus.cc:158
+#: src/skins/menus.cc:183 src/skins-qt/menus.cc:179
 msgid "Remove Selected"
 msgstr "തിരഞ്ഞെടുത്തവ നീക്കംചെയ്യുക"
 
-#: src/skins/menus.cc:162
+#: src/skins/menus.cc:187 src/skins-qt/menus.cc:183
 msgid "Search and Select"
 msgstr "തിരയുക, തിരഞ്ഞെടുക്കുക"
 
-#: src/skins/menus.cc:164
+#: src/skins/menus.cc:189 src/skins-qt/menus.cc:185
 msgid "Invert Selection"
 msgstr "തിരഞ്ഞെടുപ്പ് ഇന്‍വേര്‍ട്ട് ചെയ്യുക"
 
-#: src/skins/menus.cc:165
+#: src/skins/menus.cc:190 src/skins-qt/menus.cc:186
 msgid "Select None"
 msgstr "ഒന്നും തിരഞ്ഞെടുക്കേണ്ട"
 
-#: src/skins/menus.cc:166
+#: src/skins/menus.cc:191 src/skins-qt/menus.cc:187
 msgid "Select All"
 msgstr "എല്ലാം തിരഞ്ഞെടുക്കുക"
 
-#: src/skins/menus.cc:170 src/skins/menus.cc:184
+#: src/skins/menus.cc:195 src/skins/menus.cc:211 src/skins-qt/menus.cc:191
+#: src/skins-qt/menus.cc:207
 msgid "By Track Number"
 msgstr "ട്രാക്ക് നമ്പര്‍ അനുസരിച്ച്"
 
-#: src/skins/menus.cc:172 src/skins/menus.cc:186
+#: src/skins/menus.cc:197 src/skins/menus.cc:213 src/skins-qt/menus.cc:193
+#: src/skins-qt/menus.cc:209
 msgid "By Artist"
 msgstr "ആര്‍ട്ടസ്റ്റിനനുസരിച്ച്"
 
-#: src/skins/menus.cc:173 src/skins/menus.cc:187
+#: src/skins/menus.cc:198 src/skins/menus.cc:214 src/skins-qt/menus.cc:194
+#: src/skins-qt/menus.cc:210
 msgid "By Album"
 msgstr "ആല്‍ബമനുസരിച്ച്"
 
-#: src/skins/menus.cc:174 src/skins/menus.cc:188
+#: src/skins/menus.cc:199 src/skins/menus.cc:215 src/skins-qt/menus.cc:195
+#: src/skins-qt/menus.cc:211
 msgid "By Album Artist"
 msgstr ""
 
-#: src/skins/menus.cc:175 src/skins/menus.cc:190
+#: src/skins/menus.cc:200 src/skins/menus.cc:216 src/skins-qt/menus.cc:196
+#: src/skins-qt/menus.cc:212
 msgid "By Release Date"
 msgstr ""
 
-#: src/skins/menus.cc:176 src/skins/menus.cc:189
+#: src/skins/menus.cc:201 src/skins/menus.cc:217 src/skins-qt/menus.cc:197
+#: src/skins-qt/menus.cc:213
 msgid "By Genre"
 msgstr ""
 
-#: src/skins/menus.cc:177 src/skins/menus.cc:191
+#: src/skins/menus.cc:202 src/skins/menus.cc:218 src/skins-qt/menus.cc:198
+#: src/skins-qt/menus.cc:214
 msgid "By Length"
 msgstr ""
 
-#: src/skins/menus.cc:180 src/skins/menus.cc:194
+#: src/skins/menus.cc:205 src/skins/menus.cc:221 src/skins-qt/menus.cc:201
+#: src/skins-qt/menus.cc:217
 msgid "By Custom Title"
 msgstr ""
 
-#: src/skins/menus.cc:198
+#: src/skins/menus.cc:206 src/skins/menus.cc:222 src/skins-qt/menus.cc:202
+#: src/skins-qt/menus.cc:218
+msgid "By Comment"
+msgstr ""
+
+#: src/skins/menus.cc:207 src/skins/menus.cc:223 src/skins-qt/menus.cc:203
+#: src/skins-qt/menus.cc:219
+msgid "By Disc Number"
+msgstr ""
+
+#: src/skins/menus.cc:227 src/skins-qt/menus.cc:223
 msgid "Randomize List"
 msgstr "ലിസ്റ്റ് ക്രമമില്ലാതെയാക്കുക"
 
-#: src/skins/menus.cc:199
+#: src/skins/menus.cc:228 src/skins-qt/menus.cc:224
 msgid "Reverse List"
 msgstr "പട്ടിക തലതിരിയ്ക്കുക"
 
-#: src/skins/menus.cc:201
+#: src/skins/menus.cc:230 src/skins-qt/menus.cc:226
 msgid "Sort Selected"
 msgstr "തിരഞ്ഞെടുത്തവ ക്രമീകരിയ്ക്കുക"
 
-#: src/skins/menus.cc:202
+#: src/skins/menus.cc:231 src/skins-qt/menus.cc:227
 msgid "Sort List"
 msgstr "പട്ടിക അക്ഷരമാലാക്രമത്തിലാക്കുക"
 
-#: src/skins/menus.cc:208
+#: src/skins/menus.cc:236 src/skins-qt/menus.cc:232
+msgid "Open Containing Folder"
+msgstr ""
+
+#: src/skins/menus.cc:238 src/skins-qt/menus.cc:234
 msgid "Cut"
 msgstr "മുറിയ്ക്കുക"
 
-#: src/skins/menus.cc:209
+#: src/skins/menus.cc:239 src/skins-qt/menus.cc:235
 msgid "Copy"
 msgstr "പകര്‍ത്തുക"
 
-#: src/skins/menus.cc:210
+#: src/skins/menus.cc:240 src/skins-qt/menus.cc:236
 msgid "Paste"
 msgstr "ഒട്ടിയ്ക്കുക"
 
-#: src/skins/menus.cc:212
-msgid "Queue/Unqueue"
+#: src/skins/menus.cc:241 src/skins-qt/menus.cc:237
+msgid "Paste at End"
 msgstr ""
 
-#: src/skins/menus.cc:218
-msgid "Load Preset ..."
-msgstr ""
-
-#: src/skins/menus.cc:219
-msgid "Load Auto Preset ..."
-msgstr ""
-
-#: src/skins/menus.cc:220
-msgid "Load Default"
-msgstr ""
-
-#: src/skins/menus.cc:221
-msgid "Load Preset File ..."
-msgstr ""
-
-#: src/skins/menus.cc:222
-msgid "Load EQF File ..."
+#: src/skins/menus.cc:243 src/skins-qt/menus.cc:239
+msgid "Queue/Unqueue"
 msgstr ""
 
-#: src/skins/menus.cc:224
-msgid "Save Preset ..."
-msgstr ""
+#: src/skins/playlist-widget.cc:58 src/skins-qt/playlist-widget.cc:58
+#, c-format
+msgid "%s (%d of %d)"
+msgstr "%s (%d / %d)"
 
-#: src/skins/menus.cc:225
-msgid "Save Auto Preset ..."
-msgstr ""
+#: src/skins/playlistwin.cc:491 src/skins-qt/playlistwin.cc:478
+msgid "Audacious Playlist Editor"
+msgstr "ഒഡാഷ്യസ് പ്ലേലിസ്റ്റ് എഡിറ്റര്‍"
 
-#: src/skins/menus.cc:226
-msgid "Save Default"
+#: src/skins/plugin.cc:53 src/skins-qt/plugin.cc:65
+msgid "Winamp Classic Interface"
 msgstr ""
 
-#: src/skins/menus.cc:227
-msgid "Save Preset File ..."
+#: src/skins-qt/menus.cc:75
+msgid "Open Folder ..."
 msgstr ""
 
-#: src/skins/menus.cc:228
-msgid "Save EQF File ..."
+#: src/skins-qt/menus.cc:159
+msgid "Add Folder ..."
 msgstr ""
 
-#: src/skins/menus.cc:230
-msgid "Delete Preset ..."
-msgstr ""
+#: src/skins-qt/search-select.cc:62 src/skins/search-select.cc:77
+msgid "Search entries in active playlist"
+msgstr "സജീവമായ പ്ലേലിസ്റ്റിലെ എന്‍ട്രികള്‍ തിരയുക"
 
-#: src/skins/menus.cc:231
-msgid "Delete Auto Preset ..."
+#: src/skins-qt/search-select.cc:70 src/skins/search-select.cc:83
+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/menus.cc:233
-msgid "Import Winamp Presets ..."
+#: src/skins-qt/search-select.cc:75 src/skins/search-select.cc:91
+msgid "Title:"
 msgstr ""
 
-#: src/skins/menus.cc:235
-msgid "Reset to Zero"
+#: src/skins-qt/search-select.cc:79 src/skins/search-select.cc:96
+msgid "Album:"
 msgstr ""
 
-#: src/skins/plugin.cc:48
-msgid "Winamp Classic Interface"
+#: src/skins-qt/search-select.cc:82 src/skins/search-select.cc:101
+msgid "Artist:"
 msgstr ""
 
-#: src/skins/preset-browser.cc:57 src/skins/preset-list.cc:371
-#: src/skins/preset-list.cc:386
-msgid "Save"
-msgstr "സേവ്"
-
-#: src/skins/preset-browser.cc:57 src/skins/preset-list.cc:338
-#: src/skins/preset-list.cc:354
-msgid "Load"
-msgstr "ലോഡ് ചെയ്യുക"
-
-#: src/skins/preset-browser.cc:83
-msgid "Load Preset File"
+#: src/skins-qt/search-select.cc:85 src/skins/search-select.cc:106
+msgid "File Name:"
 msgstr ""
 
-#: src/skins/preset-browser.cc:100
-msgid "Load EQF File"
-msgstr ""
+#: src/skins-qt/search-select.cc:88 src/skins/search-select.cc:134
+msgid "Clear previous selection before searching"
+msgstr "തിരയുന്നതിനുമുമ്പ് മുമ്പുള്ള തിരഞ്ഞെടുപ്പ് വെടിപ്പാക്കുക"
 
-#: src/skins/preset-browser.cc:119
-msgid "Save Preset File"
+#: src/skins-qt/search-select.cc:89 src/skins/search-select.cc:137
+msgid "Automatically toggle queue for matching entries"
 msgstr ""
 
-#: src/skins/preset-browser.cc:137
-msgid "Save EQF File"
-msgstr ""
+#: src/skins-qt/search-select.cc:90 src/skins/search-select.cc:140
+msgid "Create a new playlist with matching entries"
+msgstr "യോജിയ്ക്കുന്ന എന്‍ട്രികള്‍ ഉപയോഗിച്ച് പുതിയൊരു പ്ലേലിസ്റ്റ് ഉണ്ടാക്കുക"
 
-#: src/skins/preset-browser.cc:151
-msgid "Import Winamp Presets"
+#: src/skins-qt/search-select.cc:101 src/skins/search-select.cc:78
+msgid "Search"
 msgstr ""
 
-#: src/skins/preset-list.cc:285
-msgid "Presets"
-msgstr "പ്രീസെറ്റുകള്‍"
-
-#: src/skins/preset-list.cc:335
-msgid "Load preset"
-msgstr "പ്രീസെറ്റ് ലോഡ് ചെയ്യുക"
-
-#: src/skins/preset-list.cc:351
-msgid "Load auto-preset"
-msgstr "ഓട്ടോ-പ്രീസെറ്റ് ലോഡ് ചെയ്യുക"
-
-#: src/skins/preset-list.cc:367
-msgid "Save preset"
-msgstr "പ്രീസെറ്റ് സേവ് ചെയ്യുക"
-
-#: src/skins/preset-list.cc:382
-msgid "Save auto-preset"
-msgstr "ഓട്ടോ പ്രീസെറ്റ് സേവ് ചെയ്യുക"
-
-#: src/skins/preset-list.cc:408
-msgid "Delete preset"
-msgstr "പ്രീസെറ്റ് നീക്കംചെയ്യുക"
-
-#: src/skins/preset-list.cc:424
-msgid "Delete auto-preset"
-msgstr "ഓട്ടോ പ്രീസെറ്റ് നീക്കം ചെയ്യുക"
-
-#: src/skins/skins_cfg.cc:176
+#: src/skins-qt/skins_cfg.cc:198 src/skins/skins_cfg.cc:182
 msgid "Player:"
 msgstr ""
 
-#: src/skins/skins_cfg.cc:178
+#: src/skins-qt/skins_cfg.cc:200 src/skins/skins_cfg.cc:184
 msgid "Select main player window font:"
 msgstr "പ്രധാനപ്പെട്ട പ്ലെയര്‍ വിന്‍ഡോയുടെ ഫോണ്ട് തെരെഞ്ഞെടുക്കുക:"
 
-#: src/skins/skins_cfg.cc:179
+#: src/skins-qt/skins_cfg.cc:201 src/skins/skins_cfg.cc:185
 msgid "Playlist:"
 msgstr ""
 
-#: src/skins/skins_cfg.cc:181
+#: src/skins-qt/skins_cfg.cc:203 src/skins/skins_cfg.cc:187
 msgid "Select playlist font:"
 msgstr "പ്ലേലിസ്റ്റ് ഫോണ്ട് തെരെഞ്ഞെടുക്കുക:"
 
-#: src/skins/skins_cfg.cc:187
+#: src/skins-qt/skins_cfg.cc:207 src/skins/skins_cfg.cc:191
 msgid "Skin"
 msgstr ""
 
-#: src/skins/skins_cfg.cc:189
+#: src/skins-qt/skins_cfg.cc:211 src/skins/skins_cfg.cc:193
+msgid "Display active titlebar when any window is focused"
+msgstr ""
+
+#: src/skins-qt/skins_cfg.cc:213 src/skins/skins_cfg.cc:195
 msgid "Fonts"
 msgstr ""
 
-#: src/skins/skins_cfg.cc:192
+#: src/skins-qt/skins_cfg.cc:215 src/skins/skins_cfg.cc:197
 msgid "Use bitmap fonts (supports ASCII only)"
 msgstr "ബിറ്റ്മാപ് ഫോണ്ടുകള്‍ ഉപയോഗിക്കാം (ASCII മാത്രം പിന്‍തുണയ്ക്കും)"
 
-#: src/skins/skins_cfg.cc:194
+#: src/skins-qt/skins_cfg.cc:217 src/skins/skins_cfg.cc:199
 msgid "Scroll song title"
 msgstr ""
 
-#: src/skins/skins_cfg.cc:196
+#: src/skins-qt/skins_cfg.cc:219 src/skins/skins_cfg.cc:201
 msgid "Scroll song title in both directions"
 msgstr "രണ്ട് ദിശകളിലും പാട്ടിന്റെ ശീര്‍ഷകം സ്‌ക്രോള്‍ ചെയ്യുക"
 
-#: src/skins/skins_cfg.cc:201
+#: src/skins-qt/skins_cfg.cc:224 src/skins/skins_cfg.cc:206
 msgid "Analyzer"
 msgstr "അനലൈസര്‍"
 
-#: src/skins/skins_cfg.cc:202
+#: src/skins-qt/skins_cfg.cc:225 src/skins/skins_cfg.cc:207
 msgid "Scope"
 msgstr "സ്കോപ്പ്"
 
-#: src/skins/skins_cfg.cc:203
+#: src/skins-qt/skins_cfg.cc:226 src/skins/skins_cfg.cc:208
 msgid "Voiceprint / VU meter"
 msgstr ""
 
-#: src/skins/skins_cfg.cc:204
+#: src/skins-qt/skins_cfg.cc:227 src/skins/skins_cfg.cc:209
 msgid "Off"
 msgstr "ഓഫ്"
 
-#: src/skins/skins_cfg.cc:208 src/skins/skins_cfg.cc:233
-#: src/skins/skins_cfg.cc:239
+#: src/skins-qt/skins_cfg.cc:231 src/skins-qt/skins_cfg.cc:256
+#: src/skins-qt/skins_cfg.cc:262 src/skins/skins_cfg.cc:213
+#: src/skins/skins_cfg.cc:238 src/skins/skins_cfg.cc:244
 msgid "Normal"
 msgstr "സാധാരണം"
 
-#: src/skins/skins_cfg.cc:209 src/skins/skins_cfg.cc:234
+#: src/skins-qt/skins_cfg.cc:232 src/skins-qt/skins_cfg.cc:257
+#: src/skins/skins_cfg.cc:214 src/skins/skins_cfg.cc:239
 msgid "Fire"
 msgstr "തീ"
 
-#: src/skins/skins_cfg.cc:210
+#: src/skins-qt/skins_cfg.cc:233 src/skins/skins_cfg.cc:215
 msgid "Vertical lines"
 msgstr ""
 
-#: src/skins/skins_cfg.cc:214
+#: src/skins-qt/skins_cfg.cc:237 src/skins/skins_cfg.cc:219
 msgid "Lines"
 msgstr "വരകള്‍"
 
-#: src/skins/skins_cfg.cc:215
+#: src/skins-qt/skins_cfg.cc:238 src/skins/skins_cfg.cc:220
 msgid "Bars"
 msgstr "നാടകള്‍"
 
-#: src/skins/skins_cfg.cc:219
+#: src/skins-qt/skins_cfg.cc:242 src/skins/skins_cfg.cc:224
 msgid "Slowest"
 msgstr "വളരെപ്പതുക്കെ"
 
-#: src/skins/skins_cfg.cc:220
+#: src/skins-qt/skins_cfg.cc:243 src/skins/skins_cfg.cc:225
 msgid "Slow"
 msgstr "പതുക്കെ"
 
-#: src/skins/skins_cfg.cc:221 src/sox-resampler/sox-resampler.cc:152
+#: src/skins-qt/skins_cfg.cc:244 src/skins/skins_cfg.cc:226
+#: src/soxr/sox-resampler.cc:180
 msgid "Medium"
 msgstr "പാകം"
 
-#: src/skins/skins_cfg.cc:222
+#: src/skins-qt/skins_cfg.cc:245 src/skins/skins_cfg.cc:227
 msgid "Fast"
 msgstr "വേഗം"
 
-#: src/skins/skins_cfg.cc:223
+#: src/skins-qt/skins_cfg.cc:246 src/skins/skins_cfg.cc:228
 msgid "Fastest"
 msgstr "അതിദ്രുതം"
 
-#: src/skins/skins_cfg.cc:227
+#: src/skins-qt/skins_cfg.cc:250 src/skins/skins_cfg.cc:232
 msgid "Dots"
 msgstr ""
 
-#: src/skins/skins_cfg.cc:228
+#: src/skins-qt/skins_cfg.cc:251 src/skins/skins_cfg.cc:233
 msgid "Line"
 msgstr ""
 
-#: src/skins/skins_cfg.cc:229
+#: src/skins-qt/skins_cfg.cc:252 src/skins/skins_cfg.cc:234
 msgid "Solid"
 msgstr ""
 
-#: src/skins/skins_cfg.cc:235
+#: src/skins-qt/skins_cfg.cc:258 src/skins/skins_cfg.cc:240
 msgid "Ice"
 msgstr "ഐസ്"
 
-#: src/skins/skins_cfg.cc:240
+#: src/skins-qt/skins_cfg.cc:263 src/skins/skins_cfg.cc:245
 msgid "Smooth"
 msgstr "മൃദുലം"
 
-#: src/skins/skins_cfg.cc:244
-msgid "Type"
-msgstr ""
-
-#: src/skins/skins_cfg.cc:245
-msgid "Visualization type:"
-msgstr ""
-
-#: src/skins/skins_cfg.cc:248
-msgid "Analyzer"
-msgstr ""
-
-#: src/skins/skins_cfg.cc:249
-msgid "Show peaks"
-msgstr ""
-
-#: src/skins/skins_cfg.cc:251
+#: src/skins-qt/skins_cfg.cc:267 src/skins/skins_cfg.cc:249
 msgid "Coloring:"
 msgstr ""
 
-#: src/skins/skins_cfg.cc:254
+#: src/skins-qt/skins_cfg.cc:270 src/skins/skins_cfg.cc:252
 msgid "Style:"
 msgstr ""
 
-#: src/skins/skins_cfg.cc:257
+#: src/skins-qt/skins_cfg.cc:273 src/skins/skins_cfg.cc:255
 msgid "Falloff:"
 msgstr ""
 
-#: src/skins/skins_cfg.cc:260
+#: src/skins-qt/skins_cfg.cc:276 src/skins/skins_cfg.cc:258
 msgid "Peak falloff:"
 msgstr ""
 
-#: src/skins/skins_cfg.cc:264
+#: src/skins-qt/skins_cfg.cc:282 src/skins/skins_cfg.cc:264
 msgid "Scope Style:"
 msgstr ""
 
-#: src/skins/skins_cfg.cc:267
+#: src/skins-qt/skins_cfg.cc:285 src/skins/skins_cfg.cc:267
 msgid "Voiceprint Coloring:"
 msgstr ""
 
-#: src/skins/skins_cfg.cc:270
+#: src/skins-qt/skins_cfg.cc:288 src/skins/skins_cfg.cc:270
 msgid "VU Meter Style:"
 msgstr ""
 
-#: src/skins/skins_cfg.cc:276
-msgid "General"
-msgstr "പൊതുവായവ"
-
-#: src/skins/skins_cfg.cc:277
-msgid "Visualization"
-msgstr "ദൃശ്യവത്കരണം"
-
-#: src/skins/ui_equalizer.cc:282
-msgid "Preamp"
-msgstr "പ്രീആംപ്"
-
-#: src/skins/ui_equalizer.cc:286
-msgid "31 Hz"
-msgstr "31 Hz"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "63 Hz"
-msgstr "63 Hz"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "125 Hz"
-msgstr "125 Hz"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "250 Hz"
-msgstr "250 Hz"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "500 Hz"
-msgstr "500 Hz"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "1 kHz"
-msgstr "1 kHz"
-
-#: src/skins/ui_equalizer.cc:288
-msgid "2 kHz"
-msgstr "2 kHz"
-
-#: src/skins/ui_equalizer.cc:288
-msgid "4 kHz"
-msgstr "4 kHz"
-
-#: src/skins/ui_equalizer.cc:288
-msgid "8 kHz"
-msgstr "8 kHz"
-
-#: src/skins/ui_equalizer.cc:288
-msgid "16 kHz"
-msgstr "16 kHz"
-
-#: src/skins/ui_equalizer.cc:330
-msgid "Audacious Equalizer"
-msgstr "ഒഡാഷ്യസ് ഈക്വലൈസര്‍"
-
-#: src/skins/ui_main.cc:688
-#, c-format
-msgid "Seek to %d:%-2.2d / %d:%-2.2d"
-msgstr "തിരയുക %d:%-2.2d / %d:%-2.2d"
-
-#: src/skins/ui_main.cc:709
-#, c-format
-msgid "Volume: %d%%"
-msgstr "ശബ്ദം: %d%%"
-
-#: src/skins/ui_main.cc:732
-#, c-format
-msgid "Balance: %d%% left"
-msgstr "അവശേഷിക്കുന്നത്: %d%% വലത്"
-
-#: src/skins/ui_main.cc:734
-msgid "Balance: center"
-msgstr "അവശേഷിക്കുന്നത്: നടുവില്‍"
-
-#: src/skins/ui_main.cc:736
-#, c-format
-msgid "Balance: %d%% right"
-msgstr "അവശേഷിക്കുന്നത്: %d%% ഇടത്"
-
-#: src/skins/ui_main.cc:842
-msgid "Options Menu"
-msgstr "ഓപ്ഷന്‍സ് മെനു"
-
-#: src/skins/ui_main.cc:846
-msgid "Disable 'Always On Top'"
-msgstr "'എപ്പോഴും മുകളില്‍' അസാദ്ധ്യമാക്കുക"
-
-#: src/skins/ui_main.cc:848
-msgid "Enable 'Always On Top'"
-msgstr "'എപ്പോഴും മുകളില്‍' സാദ്ധ്യമാക്കുക"
-
-#: src/skins/ui_main.cc:851
-msgid "File Info Box"
-msgstr "ഫയല്‍ ഇന്‍ഫോ ജാലകം"
-
-#: src/skins/ui_main.cc:857
-msgid "Visualizations"
-msgstr ""
-
-#: src/skins/ui_main.cc:1336
-msgid "Repeat point A set."
-msgstr ""
-
-#: src/skins/ui_main.cc:1341
-msgid "Repeat point B set."
-msgstr ""
-
-#: src/skins/ui_main.cc:1350
-msgid "Repeat points cleared."
-msgstr ""
-
-#: src/skins/ui_playlist.cc:219
-msgid "Search entries in active playlist"
-msgstr "സജീവമായ പ്ലേലിസ്റ്റിലെ എന്‍ട്രികള്‍ തിരയുക"
-
-#: src/skins/ui_playlist.cc:226
-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.cc:234
-msgid "Title:"
-msgstr ""
-
-#: src/skins/ui_playlist.cc:241
-msgid "Album:"
+#: src/skins-qt/skins_cfg.cc:294 src/skins/skins_cfg.cc:276
+msgid "Type"
 msgstr ""
 
-#: src/skins/ui_playlist.cc:248
-msgid "Artist:"
+#: src/skins-qt/skins_cfg.cc:295 src/skins/skins_cfg.cc:277
+msgid "Visualization type:"
 msgstr ""
 
-#: src/skins/ui_playlist.cc:255
-msgid "File Name:"
+#: src/skins-qt/skins_cfg.cc:298 src/skins/skins_cfg.cc:280
+msgid "Analyzer"
 msgstr ""
 
-#: src/skins/ui_playlist.cc:263
-msgid "Clear previous selection before searching"
-msgstr "തിരയുന്നതിനുമുമ്പ് മുമ്പുള്ള തിരഞ്ഞെടുപ്പ് വെടിപ്പാക്കുക"
-
-#: src/skins/ui_playlist.cc:266
-msgid "Automatically toggle queue for matching entries"
+#: src/skins-qt/skins_cfg.cc:299 src/skins/skins_cfg.cc:281
+msgid "Show peaks"
 msgstr ""
 
-#: src/skins/ui_playlist.cc:269
-msgid "Create a new playlist with matching entries"
-msgstr "യോജിയ്ക്കുന്ന എന്‍ട്രികള്‍ ഉപയോഗിച്ച് പുതിയൊരു പ്ലേലിസ്റ്റ് ഉണ്ടാക്കുക"
-
-#: src/skins/ui_playlist.cc:717
-msgid "Audacious Playlist Editor"
-msgstr "ഒഡാഷ്യസ് പ്ലേലിസ്റ്റ് എഡിറ്റര്‍"
-
-#: src/skins/ui_playlist.cc:752
-#, c-format
-msgid "%s (%d of %d)"
-msgstr "%s (%d / %d)"
+#: src/skins-qt/skins_cfg.cc:308 src/skins/skins_cfg.cc:290
+msgid "Visualization"
+msgstr "ദൃശ്യവത്കരണം"
 
-#: src/skins/ui_skinselector.cc:167
+#: src/skins-qt/skinselector.cc:98 src/skins/skinselector.cc:111
 msgid "Archived Winamp 2.x skin"
 msgstr "ശേഖരിക്കപ്പെട്ട വിനാമ്പ് 2.x രൂപം"
 
-#: src/skins/ui_skinselector.cc:172
+#: src/skins-qt/skinselector.cc:102 src/skins/skinselector.cc:115
 msgid "Unarchived Winamp 2.x skin"
 msgstr "ശേഖരിക്കാത്ത വിനാമ്പ് 2.x രൂപം"
 
-#: src/skins/util.cc:430
-#, c-format
-msgid "Could not create directory (%s): %s\n"
-msgstr "ഫോള്‍ഡര്‍ നിര്‍മാണം സാധ്യമല്ല (%s): %s\n"
-
-#: src/sndfile/plugin.cc:39
+#: src/sndfile/plugin.cc:38
 msgid "Sndfile Plugin"
 msgstr "Sndfile പ്ലഗ്ഗിന്‍"
 
-#: src/sndfile/plugin.cc:336
+#: src/sndfile/plugin.cc:372
 msgid ""
 "Based on the xmms_sndfile plugin:\n"
 "Copyright (C) 2000, 2002 Erik de Castro Lopo\n"
@@ -3687,92 +3939,100 @@
 "Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:44
+#: src/sndio/sndio.cc:43
 msgid "Sndio Output"
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:98
+#: src/sndio/sndio.cc:98
 msgid "Device (blank for default):"
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:100
+#: src/sndio/sndio.cc:100
 msgid "Save and restore volume:"
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:181
+#: src/sndio/sndio.cc:181
 #, c-format
 msgid "Sndio error: Unsupported audio format (%d)"
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:192
+#: src/sndio/sndio.cc:192
 msgid "Sndio error: sio_open() failed"
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:222
+#: src/sndio/sndio.cc:221
 msgid "Sndio error: sio_setpar() failed"
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:234
+#: src/sndio/sndio.cc:233
 msgid "Sndio error: sio_start() failed"
 msgstr ""
 
-#: src/song_change/song_change.cc:33
+#: src/songchange/song_change.cc:30
 msgid "Song Change"
 msgstr "പാട്ട് മാറ്റുക"
 
-#: src/song_change/song_change.cc:342
-msgid ""
-"Parameters passed to the shell should be encapsulated in "
-"quotes. Doing otherwise is a security risk."
-msgstr ""
-
-#: src/song_change/song_change.cc:358
+#: src/songchange/song_change.cc:256
 msgid "Commands"
 msgstr ""
 
-#: src/song_change/song_change.cc:360
+#: src/songchange/song_change.cc:258
 msgid "Command to run when starting a new song:"
 msgstr ""
 
-#: src/song_change/song_change.cc:364
+#: src/songchange/song_change.cc:261
+msgid "Command to run when stopping a song:"
+msgstr ""
+
+#: src/songchange/song_change.cc:264
 msgid "Command to run at the end of a song:"
 msgstr ""
 
-#: src/song_change/song_change.cc:368
+#: src/songchange/song_change.cc:267
 msgid "Command to run at the end of the playlist:"
 msgstr ""
 
-#: src/song_change/song_change.cc:372
+#: src/songchange/song_change.cc:270
 msgid "Command to run when song title changes (for network streams):"
 msgstr ""
 
-#: src/song_change/song_change.cc:376
+#: src/songchange/song_change.cc:273
 msgid ""
-"You can use the following format strings which will be substituted before "
-"calling the command (not all are useful for the end-of-playlist command):\n"
-"\n"
-"%F: Frequency (in hertz)\n"
+"You can use the following format codes, which will be replaced before "
+"running the command.\n"
+"Not all are useful though for the song-stopped or end-of-playlist command."
+msgstr ""
+
+#: src/songchange/song_change.cc:276
+msgid ""
+"%a: Artist\n"
+"%b: Album\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"
+"%F: Frequency (Hertz)\n"
+"%l: Length (milliseconds)\n"
+"%n or %s: Formatted title (see playlist settings)\n"
 "%p: Currently playing (1 or 0)\n"
-"%a: Artist\n"
-"%b: Album\n"
-"%T: Track title"
+"%r: Rate (bits per second)\n"
+"%t: Playlist position\n"
+"%T: Title (unformatted)"
 msgstr ""
 
-#: src/song-info-qt/song-info.cc:32
-msgid "Song Info (Qt)"
+#: src/songchange/song_change.cc:287
+msgid ""
+"Parameters passed to the shell should be enclosed in quotation marks.\n"
+"Unquoted parameters may lead to unexpected results."
 msgstr ""
 
-#: src/sox-resampler/sox-resampler.cc:44
+#: src/song-info-qt/song-info.cc:30
+msgid "Song Info"
+msgstr "സോങ് ഇന്‍ഫോ"
+
+#: src/soxr/sox-resampler.cc:44
 msgid "SoX Resampler"
 msgstr "SoX റീസാംപ്ലര്‍"
 
-#: src/sox-resampler/sox-resampler.cc:144
+#: src/soxr/sox-resampler.cc:172
 msgid ""
 "SoX Resampler Plugin for Audacious\n"
 "Copyright 2013 Michał Lipski\n"
@@ -3781,89 +4041,129 @@
 "Copyright 2010-2012 John Lindgren"
 msgstr ""
 
-#: src/sox-resampler/sox-resampler.cc:150
+#: src/soxr/sox-resampler.cc:178
 msgid "Quick"
 msgstr "ദ്രുതം"
 
-#: src/sox-resampler/sox-resampler.cc:151
+#: src/soxr/sox-resampler.cc:179
 msgid "Low"
 msgstr "താഴ്ന്നത്"
 
-#: src/sox-resampler/sox-resampler.cc:153
+#: src/soxr/sox-resampler.cc:181
 msgid "High"
 msgstr "ഉയര്‍ന്നത്"
 
-#: src/sox-resampler/sox-resampler.cc:154
+#: src/soxr/sox-resampler.cc:182
 msgid "Very High"
 msgstr "വളരെ ഉയര്‍ന്നത്"
 
-#: src/sox-resampler/sox-resampler.cc:158
+#: src/soxr/sox-resampler.cc:183
+msgid "Ultra High"
+msgstr ""
+
+#: src/soxr/sox-resampler.cc:187
+msgid "Minimum"
+msgstr ""
+
+#: src/soxr/sox-resampler.cc:188
+msgid "Intermediate"
+msgstr ""
+
+#: src/soxr/sox-resampler.cc:193
 msgid "Quality:"
 msgstr "ഗുണമേന്മ:"
 
-#: src/speed-pitch/speed-pitch.cc:51
+#: src/soxr/sox-resampler.cc:196
+msgid "Phase:"
+msgstr ""
+
+#: src/soxr/sox-resampler.cc:200
+msgid "Allow aliasing"
+msgstr ""
+
+#: src/soxr/sox-resampler.cc:202
+msgid "Use steep filter"
+msgstr ""
+
+#: src/speedpitch/speed-pitch.cc:54
 msgid "Speed and Pitch"
 msgstr "വേഗവും ശ്രുതിയും"
 
-#: src/speed-pitch/speed-pitch.cc:210
-msgid "Speed and Pitch"
-msgstr "വേഗവും ശ്രുതിയും"
-
-#: src/speed-pitch/speed-pitch.cc:211
-msgid "Speed:"
-msgstr "വേഗം:"
-
-#: src/speed-pitch/speed-pitch.cc:214
-msgid "Pitch:"
-msgstr "ശ്രൂതി:"
+#: src/speedpitch/speed-pitch.cc:247
+msgid "Speed"
+msgstr ""
 
-#: src/statusicon/statusicon.cc:47
-msgid "Status Icon"
-msgstr "സ്റ്റാറ്റസ് ഐക്കണ്‍"
+#: src/speedpitch/speed-pitch.cc:248
+msgid "Decouple from pitch"
+msgstr ""
 
-#: src/statusicon/statusicon.cc:283
-msgid "Se_ttings ..."
+#: src/speedpitch/speed-pitch.cc:250 src/speedpitch/speed-pitch.cc:258
+msgid "Multiplier:"
 msgstr ""
 
-#: src/statusicon/statusicon.cc:372
+#: src/speedpitch/speed-pitch.cc:254
+msgid "Pitch"
+msgstr ""
+
+#: src/statusicon-qt/statusicon.cc:45 src/statusicon/statusicon.cc:47
+msgid "Status Icon"
+msgstr "സ്റ്റാറ്റസ് ഐക്കണ്‍"
+
+#: src/statusicon-qt/statusicon.cc:68
 msgid ""
-"Status Icon Plugin\n"
+"Status Icon Plugin (partial port for Qt interface)\n"
 "\n"
 "Copyright 2005-2007 Giacomo Lozito <james@develia.org>\n"
 "Copyright 2010 Michał Lipski <tallica@o2.pl>\n"
+"Copyright 2015 Eugene Paskevich <eugene@raptor.kiev.ua>\n"
 "\n"
 "This plugin provides a status icon, placed in\n"
 "the system tray area of the window manager."
 msgstr ""
 
-#: src/statusicon/statusicon.cc:379
+#: src/statusicon-qt/statusicon.cc:89 src/statusicon/statusicon.cc:384
 msgid "Mouse Scroll Action"
 msgstr ""
 
-#: src/statusicon/statusicon.cc:380
+#: src/statusicon-qt/statusicon.cc:90 src/statusicon/statusicon.cc:385
 msgid "Change volume"
 msgstr "ശബ്ദോച്ചത മാറ്റുക"
 
-#: src/statusicon/statusicon.cc:383
+#: src/statusicon-qt/statusicon.cc:93 src/statusicon/statusicon.cc:388
 msgid "Change playing song"
 msgstr "പാടുന്ന പാട്ട് മാറ്റുക"
 
-#: src/statusicon/statusicon.cc:386
+#: src/statusicon-qt/statusicon.cc:96 src/statusicon/statusicon.cc:391
 msgid "Other Settings"
 msgstr "മറ്റു ക്രമീകരണങ്ങള്‍"
 
-#: src/statusicon/statusicon.cc:387
+#: src/statusicon-qt/statusicon.cc:97 src/statusicon/statusicon.cc:392
 msgid "Disable the popup window"
 msgstr "പോപ്പപ്പ് ജാലകം അസാദ്ധ്യമാക്കുക"
 
-#: src/statusicon/statusicon.cc:389
+#: src/statusicon-qt/statusicon.cc:99 src/statusicon/statusicon.cc:394
 msgid "Close to the system tray"
 msgstr "സിസ്റ്റം ട്രേയിലേയ്ക്ക് അടച്ചിടുക"
 
-#: src/statusicon/statusicon.cc:391
+#: src/statusicon-qt/statusicon.cc:101 src/statusicon/statusicon.cc:396
 msgid "Advance in playlist when scrolling upward"
 msgstr ""
 
+#: src/statusicon-qt/statusicon.cc:116 src/statusicon/statusicon.cc:287
+msgid "Se_ttings ..."
+msgstr ""
+
+#: src/statusicon/statusicon.cc:377
+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/stereo_plugin/stereo.cc:19
 msgid "Extra Stereo"
 msgstr "എക്സ്ട്രാ സ്റ്റീരിയോ"
@@ -3879,20 +4179,160 @@
 msgid "Extra Stereo"
 msgstr "എക്സ്ട്രാ സ്റ്റീരിയോ"
 
+#: src/streamtuner/icecast-model.cc:126 src/streamtuner/shoutcast-model.cc:131
+msgid "Type"
+msgstr ""
+
+#: src/streamtuner/icecast-model.cc:132
+msgid "Current Song"
+msgstr ""
+
+#: src/streamtuner/icecast-model.cc:164
+msgid "Other"
+msgstr ""
+
+#: src/streamtuner/ihr-model.cc:63
+msgid "Market"
+msgstr ""
+
+#: src/streamtuner/ihr-model.cc:156
+msgid "Call Letters"
+msgstr ""
+
+#: src/streamtuner/ihr-model.cc:162
+msgid "Description"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:128
+msgid "Listeners"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:188
+msgid "Top 500 Stations"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:189
+msgid "Alternative"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:190
+msgid "Blues"
+msgstr "ബ്ലൂസ്"
+
+#: src/streamtuner/shoutcast-model.cc:191
+msgid "Classical"
+msgstr "ക്ലാസിക്കല്‍"
+
+#: src/streamtuner/shoutcast-model.cc:192
+msgid "Country"
+msgstr "കണ്‍ട്രി"
+
+#: src/streamtuner/shoutcast-model.cc:193
+msgid "Decades"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:194
+msgid "Easy Listening"
+msgstr "ഈസി ലിസണിങ്"
+
+#: src/streamtuner/shoutcast-model.cc:195
+msgid "Electronic"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:196
+msgid "Folk"
+msgstr "നാടോടി"
+
+#: src/streamtuner/shoutcast-model.cc:197
+msgid "Inspirational"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:198
+msgid "International"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:199
+msgid "Jazz"
+msgstr "ജാസ്"
+
+#: src/streamtuner/shoutcast-model.cc:200
+msgid "Latin"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:201
+msgid "Metal"
+msgstr "മെറ്റല്‍"
+
+#: src/streamtuner/shoutcast-model.cc:203
+msgid "New Age"
+msgstr "നവയുഗം"
+
+#: src/streamtuner/shoutcast-model.cc:204
+msgid "Pop"
+msgstr "പോപ്പ്"
+
+#: src/streamtuner/shoutcast-model.cc:205
+msgid "Public Radio"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:206
+msgid "R&B and Urban"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:207
+msgid "Rap"
+msgstr "റാപ്പ്"
+
+#: src/streamtuner/shoutcast-model.cc:208
+msgid "Reggae"
+msgstr "റെഗ്ഗേജ്"
+
+#: src/streamtuner/shoutcast-model.cc:209
+msgid "Rock"
+msgstr "റോക്ക്"
+
+#: src/streamtuner/shoutcast-model.cc:210
+msgid "Seasonal and Holiday"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:211
+msgid "Soundtracks"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:212
+msgid "Talk"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:213
+msgid "Themes"
+msgstr ""
+
+#: src/streamtuner/streamtuner.cc:59
+msgid "Shoutcast"
+msgstr ""
+
+#: src/streamtuner/streamtuner.cc:60
+msgid "Icecast"
+msgstr ""
+
+#: src/streamtuner/streamtuner.cc:71
+msgid "Stream Tuner"
+msgstr ""
+
 #: src/tonegen/tonegen.cc:45
 msgid "Tone Generator"
 msgstr "ടോണ്‍ ജനറേറ്റര്‍"
 
-#: src/tonegen/tonegen.cc:94
+#: src/tonegen/tonegen.cc:92
 #, c-format
 msgid "%s %.1f Hz"
 msgstr "%s %.1f Hz"
 
-#: src/tonegen/tonegen.cc:94
+#: src/tonegen/tonegen.cc:92
 msgid "Tone Generator: "
 msgstr "ടോണ്‍ ജനറേറ്റര്‍: "
 
-#: src/tonegen/tonegen.cc:160
+#: src/tonegen/tonegen.cc:161
 msgid ""
 "Sine tone generator by Håvard Kvålen <havardk@xmms.org>\n"
 "Modified by Daniel J. Peng <danielpeng@bigfoot.com>\n"
@@ -3901,11 +4341,32 @@
 "e.g. tone://2000;2005 to play a 2000 Hz tone and a 2005 Hz tone"
 msgstr ""
 
+#: src/ui-common/dialogs-qt.cc:40
+msgid ""
+"\n"
+"(Further messages have been hidden.)"
+msgstr ""
+"\n"
+"(തുടര്‍ന്നുള്ള സന്ദേശങ്ങള്‍ മറച്ചുവച്ചിരിയ്ക്കുന്നു.)"
+
+#: src/ui-common/dialogs-qt.cc:52
+msgid "Working ..."
+msgstr ""
+
+#: src/ui-common/dialogs-qt.cc:73
+msgid "Information"
+msgstr ""
+
+#: src/ui-common/menu-ops-gtk.cc:132 src/ui-common/menu-ops-qt.cc:113
+#, c-format
+msgid "%s does not appear to be a valid folder."
+msgstr ""
+
 #: src/voice_removal/voice_removal.cc:28
 msgid "Voice Removal"
 msgstr "വോയ്സ് റിമൂവല്‍"
 
-#: src/vorbis/vorbis.cc:465
+#: src/vorbis/vorbis.cc:433
 msgid ""
 "Audacious Ogg Vorbis Decoder\n"
 "\n"
@@ -3930,12 +4391,12 @@
 msgid "Ogg Vorbis Decoder"
 msgstr "Ogg Vorbis ഡീകോഡര്‍"
 
-#: src/vtx/info.cc:22
+#: src/vtx/info.cc:24
 #, c-format
 msgid "Details about %s"
 msgstr ""
 
-#: src/vtx/info.cc:24
+#: src/vtx/info.cc:26
 msgid ""
 "Title: %t\n"
 "Author: %a\n"
@@ -3954,44 +4415,104 @@
 msgid "VTX Decoder"
 msgstr "VTX ഡീകോഡര്‍"
 
-#: src/vtx/vtx.cc:184
+#: src/vtx/vtx.cc:178
 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/wavpack/wavpack.cc:24
+#: src/vumeter-qt/vumeter_qt.cc:31
+msgid ""
+"VU Meter Plugin for Audacious\n"
+"Copyright 2017-2019 Marc Sánchez Fauste"
+msgstr ""
+
+#: src/vumeter-qt/vumeter_qt.cc:35
+msgid "VU Meter Settings"
+msgstr ""
+
+#: src/vumeter-qt/vumeter_qt.cc:37
+msgid "Peak hold time:"
+msgstr ""
+
+#: src/vumeter-qt/vumeter_qt.cc:42
+msgid "Fall-off time:"
+msgstr ""
+
+#: src/vumeter-qt/vumeter_qt.cc:44
+msgid "dB/second"
+msgstr ""
+
+#: src/vumeter-qt/vumeter_qt.cc:46
+msgid "Display legend"
+msgstr ""
+
+#: src/vumeter-qt/vumeter_qt.h:37
+msgid "VU Meter"
+msgstr ""
+
+#: src/waveout/waveout.cc:43
+msgid "Win32 waveOut"
+msgstr ""
+
+#: src/waveout/waveout.cc:69
+msgid ""
+"Win32 waveOut Plugin for Audacious\n"
+"Copyright 2016 John Lindgren"
+msgstr ""
+
+#: src/wavpack/wavpack.cc:25
 msgid "WavPack Decoder"
 msgstr "WavPack ഡീകോഡര്‍"
 
-#: src/wavpack/wavpack.cc:211
+#: src/wavpack/wavpack.cc:217
 msgid "lossy (hybrid)"
 msgstr "ലോസി (സങ്കരം)"
 
-#: src/wavpack/wavpack.cc:213
+#: src/wavpack/wavpack.cc:219
 msgid "lossy"
 msgstr "ലോസി"
 
-#: src/wavpack/wavpack.cc:255
+#: src/wavpack/wavpack.cc:259
 msgid ""
 "Copyright 2006 William Pitcock <nenolod@nenolod.net>\n"
 "\n"
 "Some of the plugin code was by Miles Egan."
 msgstr ""
 
-#: src/xsf/plugin.cc:50
+#: src/xsf/plugin.cc:74
 msgid "2SF Decoder"
 msgstr "2SF ഡീകോഡര്‍"
 
-#: src/xsf/plugin.cc:238
+#: src/xsf/plugin.cc:429
+msgid "32728 Hz"
+msgstr ""
+
+#: src/xsf/plugin.cc:432
+msgid "65456 Hz"
+msgstr ""
+
+#: src/xsf/plugin.cc:438
+msgid "Cosine"
+msgstr ""
+
+#: src/xsf/plugin.cc:439
+msgid "Sharp"
+msgstr ""
+
+#: src/xsf/plugin.cc:443
 msgid "XSF Configuration"
 msgstr ""
 
-#: src/xsf/plugin.cc:239
-msgid "Ignore length from file"
+#: src/xsf/plugin.cc:445
+msgid "Default fade time:"
+msgstr ""
+
+#: src/xsf/plugin.cc:447
+msgid "Interpolation mode:"
 msgstr ""
 
-#: src/xspf/xspf.cc:89
+#: src/xspf/xspf.cc:95
 msgid "XML Shareable Playlists (XSPF)"
 msgstr ""

audacious-plugins-3.6.2-gtk3.tar.bz2/po/ms.po -> audacious-plugins-4.4.1.tar.bz2/po/ms.po Changed

@@ -3,16 +3,17 @@
 # This file is distributed under the same license as the Audacious Plugins package.
 #
 # Translators:
-# abuyop <abuyop@gmail.com>, 2014-2015
+# abuyop <abuyop@gmail.com>, 2014-2018,2021
 # Mick The KN <f.seedsss@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: 2015-02-28 19:18+0100\n"
-"PO-Revision-Date: 2015-02-09 15:08+0000\n"
-"Last-Translator: abuyop <abuyop@gmail.com>\n"
-"Language-Team: Malay (http://www.transifex.com/projects/p/audacious/language/"
+"Report-Msgid-Bugs-To: https://github.com/audacious-media-player/audacious/"
+"issues\n"
+"POT-Creation-Date: 2024-09-26 21:54+0200\n"
+"PO-Revision-Date: 2011-10-10 17:43+0000\n"
+"Last-Translator: abuyop <abuyop@gmail.com>, 2014-2018,2021\n"
+"Language-Team: Malay (http://app.transifex.com/audacious/audacious/language/"
 "ms/)\n"
 "Language: ms\n"
 "MIME-Version: 1.0\n"
@@ -20,290 +21,60 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: src/aac-raw/aac.cc:18
+#: src/aac/aac.cc:19
 msgid "AAC (Raw) Decoder"
 msgstr "Penyahkod AAC (Raw)"
 
-#: src/adplug/adplug-xmms.cc:42
+#: src/adplug/adplug-xmms.cc:70
 msgid "AdPlug (AdLib Player)"
 msgstr "AdPlug (Pemain AdLib)"
 
-#: src/adplug/adplug-xmms.cc:156 src/modplug/modplugbmp.cc:335
-#: src/psf/plugin.cc:138 src/vtx/vtx.cc:87 src/xsf/plugin.cc:113
+#: src/adplug/adplug-xmms.cc:167 src/modplug/modplugbmp.cc:321
+#: src/psf/plugin.cc:161 src/vtx/vtx.cc:89 src/xsf/plugin.cc:204
 msgid "sequenced"
 msgstr "berjujukan"
 
-#: src/alarm/alarm.cc:55 src/alarm/interface.cc:82
-msgid "Alarm"
-msgstr "Penggera"
-
-#: src/alarm/alarm.cc:782
-msgid "Set Alarm ..."
-msgstr "Tetapkan Penggera ..."
-
-#: src/alarm/alarm.cc:810
-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 ""
-"Pemalam yang boleh digunakan untuk mula memainkan pada\n"
-"masa tertentu.\n"
-"\n"
-"Asalnya ditulis oleh Adam Feakin dan Daniel Stodden."
-
-#: src/alarm/interface.cc: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 ""
-"Masa\n"
-" Penggera pada:\n"
-" Masa untuk penggera bergerak.\n"
-"\n"
-" Senyap selepas:\n"
-" Hentikan penggera selepas amaum masa ini.\n"
-" (jika dialog bangun tidak ditutup)\n"
-"\n"
-"\n"
-"Hari\n"
-" Hari:\n"
-" Pilih hari untuk penggera diaktifkan.\n"
-"\n"
-" Masa:\n"
-" Pilih masa untuk penggera pada setiap hari,\n"
-" atau pilih butang togol untuk guna masa\n"
-" lalai.\n"
-"\n"
-"\n"
-
-#: src/alarm/interface.cc: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 ""
-"Volum\n"
-" Pelenyapan:\n"
-" Lenyapkan volum mengikut volum pilihan\n"
-" untuk amaun masa ini.\n"
-"\n"
-" Mula pada:\n"
-" Mula melenyap dari volum ini.\n"
-"\n"
-" Akhir:\n"
-" Volum berhenti melenyap. Jika masa melenyap\n"
-" adalah 0 maka tetapkan volum pada ini dan mula\n"
-" main.\n"
-"\n"
-"\n"
-"Pilihan:\n"
-" Perintah Tambahan:\n"
-" Jalankan perintah ini pada masa penggera.\n"
-"\n"
-
-#: src/alarm/interface.cc: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 ""
-" Senarai Main:\n"
-" Muatkan senarai main ini. Jika tiada senarai main\n"
-" diberi, yang semasa akan digunakan.\n"
-" URL bagi strim mp3/ogg juga boleh digunakan\n"
-" di sini.\n"
-"\n"
-" Peringatan:\n"
-" Papar peringatan bila penggera dimatikan.\n"
-" Taip peringatan dalam kotak dan hidupkan\n"
-" butang togol jika anda mahu ia ditunjukkan."
-
-#: src/alarm/interface.cc:81
-msgid "This is your wakeup call."
-msgstr "Ini adalah panggilan bangun tidur anda."
-
-#: src/alarm/interface.cc:99
-msgid "Your reminder for today is..."
-msgstr "Peringatan untuk hari ini ialah..."
-
-#: src/alarm/interface.cc:101 src/alarm/interface.cc:386
-msgid "Reminder"
-msgstr "Peringatan"
-
-#: src/alarm/interface.cc:132
-msgid "Monday"
-msgstr "Isnin"
-
-#: src/alarm/interface.cc:132
-msgid "Tuesday"
-msgstr "Selasa"
-
-#: src/alarm/interface.cc:132
-msgid "Wednesday"
-msgstr "Rabu"
-
-#: src/alarm/interface.cc:133
-msgid "Thursday"
-msgstr "Khamis"
-
-#: src/alarm/interface.cc:133
-msgid "Friday"
-msgstr "Jumaat"
-
-#: src/alarm/interface.cc:133
-msgid "Saturday"
-msgstr "Sabtu"
-
-#: src/alarm/interface.cc:133
-msgid "Sunday"
-msgstr "Ahad"
-
-#: src/alarm/interface.cc:171 src/alarm/interface.cc:230
-#: src/alarm/interface.cc:245
-msgid "Time"
-msgstr "Masa"
-
-#: src/alarm/interface.cc:178
-msgid "Alarm at (default):"
-msgstr "Penggera pada (lalai):"
-
-#: src/alarm/interface.cc:200
-msgid "h"
-msgstr "h"
-
-#: src/alarm/interface.cc:203
-msgid "Quiet after:"
-msgstr "Tenang selepas:"
-
-#: src/alarm/interface.cc:215
-msgid "hours"
-msgstr "jam"
-
-#: src/alarm/interface.cc:226
-msgid "minutes"
-msgstr "minit"
-
-#: src/alarm/interface.cc:235
-msgid "Choose the days for the alarm to come on"
-msgstr "Pilih hari bagi penggera beraktif"
+#: src/adplug/adplug-xmms.cc:349 src/sid/xs_config.cc:61
+msgid "Output"
+msgstr "Output"
 
-#: src/alarm/interface.cc:242
-msgid "Day"
-msgstr "Hari"
+#: src/adplug/adplug-xmms.cc:350
+msgid "OPL Emulator:"
+msgstr "Emulator OPL:"
+
+#: src/adplug/adplug-xmms.cc:353 src/amidiplug/i_configure.cc:153
+#: src/console/plugin.cc:45 src/filewriter/filewriter.cc:481
+#: src/sid/xs_config.cc:65 src/xsf/plugin.cc:446
+msgid "Sample rate:"
+msgstr "Kadar sampel:"
 
-#: src/alarm/interface.cc:259 src/bs2b/plugin.cc:130
-#: src/skins/preset-list.cc:434 src/skins/preset-list.cc:440
-msgid "Default"
-msgstr "Lalai"
+#: src/adplug/adplug-xmms.cc:354 src/amidiplug/i_configure.cc:155
+#: src/bs2b/plugin.cc:141 src/console/plugin.cc:47
+#: src/modplug/plugin_main.cc:77 src/resample/resample.cc:201
+#: src/resample/resample.cc:207 src/resample/resample.cc:211
+#: src/resample/resample.cc:215 src/resample/resample.cc:219
+#: src/resample/resample.cc:223 src/resample/resample.cc:227
+#: src/resample/resample.cc:231 src/resample/resample.cc:235
+#: src/resample/resample.cc:239 src/resample/resample.cc:243
+#: src/sid/xs_config.cc:67 src/soxr/sox-resampler.cc:205
+msgid "Hz"
+msgstr "Hz"
 
-#: src/alarm/interface.cc:288
-msgid "Days"
-msgstr "Hari"
-
-#: src/alarm/interface.cc:297
-msgid "Fading"
-msgstr "Pudar"
-
-#: src/alarm/interface.cc:305 src/console/plugin.cc:41
-#: src/crossfade/crossfade.cc:53 src/crossfade/crossfade.cc:59
-#: src/gtkui/settings.cc:49 src/lirc/lirc.cc:397 src/sid/xs_config.cc:85
-#: src/sid/xs_config.cc:94 src/sid/xs_config.cc:103
-msgid "seconds"
-msgstr "Saat"
+#: src/adplug/adplug-xmms.cc:355 src/gtkui/settings.cc:55
+#: src/modplug/plugin_main.cc:105 src/qtui/settings.cc:85
+#: src/skins-qt/skins_cfg.cc:302 src/skins/skins_cfg.cc:284
+msgid "Miscellaneous"
+msgstr "Pelbagai"
 
-#: src/alarm/interface.cc:312 src/alarm/interface.cc:353
-msgid "Volume"
-msgstr "Volum"
-
-#: src/alarm/interface.cc:317
-msgid "Start at"
-msgstr "Bermula pada"
-
-#: src/alarm/interface.cc:333
-msgid "Final"
-msgstr "Terakhir"
-
-#: src/alarm/interface.cc:346
-msgid "Current"
-msgstr "Semasa"
-
-#: src/alarm/interface.cc:359
-msgid "Additional Command"
-msgstr "Perintah Tambahan"
-
-#: src/alarm/interface.cc:365 src/alarm/interface.cc:391
-msgid "enable"
-msgstr "Aktif"
-
-#: src/alarm/interface.cc:372
-msgid "Playlist (optional)"
-msgstr "Senarai Main (pilihan)"
-
-#: src/alarm/interface.cc:379
-msgid "Select a playlist"
-msgstr "Pilih satu senarai main"
-
-#: src/alarm/interface.cc:399
-msgid "Options"
-msgstr "Pilihan"
-
-#: src/alarm/interface.cc:404
-msgid "What do these options mean?"
-msgstr "Apa pilihan ini bermakna?"
-
-#: src/alarm/interface.cc:420
-msgid "Help"
-msgstr "Bantuan"
+#: src/adplug/adplug-xmms.cc:356
+msgid "Repeat song in endless loop"
+msgstr "Ulang lagu dalam gelung tanpa batas"
 
-#: src/albumart/albumart.cc:31
+#: src/albumart/albumart.cc:31 src/albumart-qt/albumart.cc:35
 msgid "Album Art"
 msgstr "Seni Album"
 
-#: src/albumart-qt/albumart.cc:33
-msgid "Album Art (Qt)"
-msgstr "Seni Album (Qt)"
-
-#: src/alsa/alsa.h:70
+#: src/alsa/alsa.h:64
 msgid "ALSA Output"
 msgstr "Output ALSA"
 
@@ -345,11 +116,11 @@
 msgid "Mixer element:"
 msgstr "Elemen campuran:"
 
-#: src/amidi-plug/amidi-plug.cc:41
+#: src/amidiplug/amidi-plug.cc:42
 msgid "AMIDI-Plug (MIDI Player)"
 msgstr "AMIDI-Plug (Pemain MIDI)"
 
-#: src/amidi-plug/amidi-plug.cc:437
+#: src/amidiplug/amidi-plug.cc:445
 msgid ""
 "AMIDI-Plug\n"
 "modular MIDI music player\n"
@@ -391,157 +162,161 @@
 "Tony Vroon\n"
 "atas bantuan pengujian alfa yang diberi"
 
-#: src/amidi-plug/i_configure.cc:94
+#: src/amidiplug/i_configure.cc:94
 msgid "Override default gain:"
 msgstr "Batalkan gandaan lalai:"
 
-#: src/amidi-plug/i_configure.cc:102
+#: src/amidiplug/i_configure.cc:102
 msgid "Override default polyphony:"
 msgstr "Batalkan polifoni lalai:"
 
-#: src/amidi-plug/i_configure.cc:110
+#: src/amidiplug/i_configure.cc:110
 msgid "Override default reverb:"
 msgstr "Batalkan reverb lalai:"
 
-#: src/amidi-plug/i_configure.cc:112 src/amidi-plug/i_configure.cc:120
+#: src/amidiplug/i_configure.cc:112 src/amidiplug/i_configure.cc:120
 msgid "On"
 msgstr "Hidup"
 
-#: src/amidi-plug/i_configure.cc:118
+#: src/amidiplug/i_configure.cc:118
 msgid "Override default chorus:"
 msgstr "Batalkan korus lalai:"
 
-#: src/amidi-plug/i_configure.cc:128 src/console/plugin.cc:29
+#: src/amidiplug/i_configure.cc:128 src/console/plugin.cc:29
 msgid "Playback"
 msgstr "Main Balik"
 
-#: src/amidi-plug/i_configure.cc:129
+#: src/amidiplug/i_configure.cc:129
 msgid "Transpose:"
 msgstr "Transsposisi:"
 
-#: src/amidi-plug/i_configure.cc:131
+#: src/amidiplug/i_configure.cc:131 src/speedpitch/speed-pitch.cc:257
 msgid "semitones"
 msgstr "seminada"
 
-#: src/amidi-plug/i_configure.cc:132
+#: src/amidiplug/i_configure.cc:132
 msgid "Drum shift:"
 msgstr "Anjak dram:"
 
-#: src/amidi-plug/i_configure.cc:134
+#: src/amidiplug/i_configure.cc:134
 msgid "note numbers"
 msgstr "nombor nota"
 
-#: src/amidi-plug/i_configure.cc:135
+#: src/amidiplug/i_configure.cc:135
 msgid "Skip leading silence"
 msgstr "Langkau senyap hadapan"
 
-#: src/amidi-plug/i_configure.cc:137
+#: src/amidiplug/i_configure.cc:137
 msgid "Skip trailing silence"
 msgstr "Langkau senyap belakang"
 
-#: src/amidi-plug/i_configure.cc:141
+#: src/amidiplug/i_configure.cc:141
 msgid "SoundFont"
 msgstr "SoundFont"
 
-#: src/amidi-plug/i_configure.cc:143
+#: src/amidiplug/i_configure.cc:148
 msgid "Synthesizer"
 msgstr "Pensintesis"
 
-#: src/amidi-plug/i_configure.cc:148 src/console/plugin.cc:45
-#: src/sid/xs_config.cc:65
-msgid "Sample rate:"
-msgstr "Kadar sampel:"
-
-#: src/amidi-plug/i_configure.cc:150 src/bs2b/plugin.cc:141
-#: src/console/plugin.cc:47 src/modplug/plugin_main.cc:78
-#: src/resample/resample.cc:201 src/resample/resample.cc:207
-#: src/resample/resample.cc:211 src/resample/resample.cc:215
-#: src/resample/resample.cc:219 src/resample/resample.cc:223
-#: src/resample/resample.cc:227 src/resample/resample.cc:231
-#: src/resample/resample.cc:235 src/resample/resample.cc:239
-#: src/resample/resample.cc:243 src/sid/xs_config.cc:67
-#: src/sox-resampler/sox-resampler.cc:163
-msgid "Hz"
-msgstr "Hz"
-
-#: src/amidi-plug/i_configure-fluidsynth.cc:52
+#: src/amidiplug/i_configure-fluidsynth.cc:58
+#: src/amidiplug/i_configure-fluidsynth.cc:527
 msgid "AMIDI-Plug - select SoundFont file"
 msgstr "AMIDI-Plug - pilih fail SoundFont"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:55 src/filewriter/mp3.cc:658
+#: src/amidiplug/i_configure-fluidsynth.cc:61
 msgid "_Cancel"
 msgstr "_Batal"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:56
+#: src/amidiplug/i_configure-fluidsynth.cc:62
 msgid "_Open"
 msgstr "_Buka"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:225 src/gtkui/columns.cc:46
+#: src/amidiplug/i_configure-fluidsynth.cc:233
+#: src/amidiplug/i_configure-fluidsynth.cc:461
 msgid "File name"
 msgstr "Nama fail"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:229
+#: src/amidiplug/i_configure-fluidsynth.cc:237
+#: src/amidiplug/i_configure-fluidsynth.cc:464
 msgid "Size (bytes)"
 msgstr "Saiz (bait)"
 
-#: src/amidi-plug/i_fileinfo.cc:163
+#: src/amidiplug/i_fileinfo.cc:184
 msgid "Name:"
 msgstr "Nama:"
 
-#: src/amidi-plug/i_fileinfo.cc:181
+#: src/amidiplug/i_fileinfo.cc:202
 msgid " MIDI Info "
 msgstr " Maklumat MIDI "
 
-#: src/amidi-plug/i_fileinfo.cc:195
+#: src/amidiplug/i_fileinfo.cc:216
 msgid "Format:"
 msgstr "Format:"
 
-#: src/amidi-plug/i_fileinfo.cc:198
+#: src/amidiplug/i_fileinfo.cc:219
 msgid "Length (msec):"
 msgstr "Panjang (msaat):"
 
-#: src/amidi-plug/i_fileinfo.cc:201
+#: src/amidiplug/i_fileinfo.cc:222
 msgid "No. of Tracks:"
 msgstr "Nombor Trek:"
 
-#: src/amidi-plug/i_fileinfo.cc:207
+#: src/amidiplug/i_fileinfo.cc:228
 msgid "variable"
 msgstr "pembolehubah"
 
-#: src/amidi-plug/i_fileinfo.cc:209
+#: src/amidiplug/i_fileinfo.cc:230
 msgid "BPM:"
 msgstr "BPM:"
 
-#: src/amidi-plug/i_fileinfo.cc:217
+#: src/amidiplug/i_fileinfo.cc:238
 msgid "BPM (wavg):"
 msgstr "BPM (wavg):"
 
-#: src/amidi-plug/i_fileinfo.cc:220
+#: src/amidiplug/i_fileinfo.cc:241
 msgid "Time Div:"
 msgstr "Masa Div:"
 
-#: src/amidi-plug/i_fileinfo.cc:231
+#: src/amidiplug/i_fileinfo.cc:252
 msgid " MIDI Comments and Lyrics "
 msgstr " Ulasan dan Lirik MIDI "
 
-#: src/amidi-plug/i_fileinfo.cc:278
+#: src/amidiplug/i_fileinfo.cc:299
 msgid "* no comments available in this MIDI file *"
 msgstr "* tiada ulasan tersedi dalam fail MIDI ini *"
 
-#: src/amidi-plug/i_fileinfo.cc:290
+#: src/amidiplug/i_fileinfo.cc:311
 msgid "* no lyrics available in this MIDI file *"
 msgstr "* tiada lirik didapati dalam fail MIDI ini *"
 
-#: src/amidi-plug/i_fileinfo.cc:300 src/filewriter/vorbis.cc:197
-#: src/ladspa/plugin.cc:416
+#: src/amidiplug/i_fileinfo.cc:321 src/ladspa/plugin.cc:418
+#: src/ui-common/dialogs-qt.cc:32
 msgid "_Close"
 msgstr "T_utup"
 
-#: src/amidi-plug/i_fileinfo.cc:325
+#: src/amidiplug/i_fileinfo.cc:346
 msgid " (invalid UTF-8)"
 msgstr "(UTF-8 tidak sah)"
 
-#: src/aosd/aosd.cc:32
+#: src/ampache/ampache.cc:33
+msgid "Ampache Browser"
+msgstr "Pelayar Ampache"
+
+#: src/ampache/ampache.cc:46
+msgid ""
+"Ampache Browser for Audacious\n"
+"http://ampache-browser.org/\n"
+"\n"
+"Copyright (C) Róbert Čerňanský and John Lindgren\n"
+"License: GNU GPLv3"
+msgstr ""
+"Pelayar Ampache untuk Audacious\n"
+"http://ampache-browser.org/\n"
+"\n"
+"Hakcipta (C) Róbert Čerňanský dan John Lindgren\n"
+"Lesen: GNU GPLv3"
+
+#: src/aosd/aosd.cc:31
 msgid ""
 "Audacious OSD\n"
 "http://www.develia.org/projects.php?p=audacious#aosd\n"
@@ -575,130 +350,130 @@
 msgid "Concave Rectangle"
 msgstr "Cekung Segiempat Tepat"
 
-#: src/aosd/aosd_style.cc:69
+#: src/aosd/aosd_style.cc:69 src/openmpt/mptwrap.h:50 src/xsf/plugin.cc:436
 msgid "None"
 msgstr "Tiada"
 
-#: src/aosd/aosd_trigger.cc:50
+#: src/aosd/aosd_trigger.cc:49
 msgid "Playback Start"
 msgstr "Mulakan Main Semula"
 
-#: src/aosd/aosd_trigger.cc:51
+#: src/aosd/aosd_trigger.cc:50
 msgid "Triggers OSD when a playlist entry is played."
 msgstr "Mencetus OSD apabila kemasukan senarai main dimainkan."
 
-#: src/aosd/aosd_trigger.cc:56
+#: src/aosd/aosd_trigger.cc:55
 msgid "Title Change"
 msgstr "Tukar Tajuk"
 
-#: src/aosd/aosd_trigger.cc:57
+#: src/aosd/aosd_trigger.cc:56
 msgid "Triggers OSD when the song title changes (for internet streams)."
 msgstr "Memicu OSD bila tajuk lagu berubah (untuk strim internet)."
 
-#: src/aosd/aosd_trigger.cc:62
+#: src/aosd/aosd_trigger.cc:61
 msgid "Pause On"
 msgstr "Aktifkan Jeda"
 
-#: src/aosd/aosd_trigger.cc:63
+#: src/aosd/aosd_trigger.cc:62
 msgid "Triggers OSD when playback is paused."
 msgstr "Mencetus OSD apabila main dijeda."
 
-#: src/aosd/aosd_trigger.cc:68
+#: src/aosd/aosd_trigger.cc:67
 msgid "Pause Off"
 msgstr "Matikan Jeda"
 
-#: src/aosd/aosd_trigger.cc:69
+#: src/aosd/aosd_trigger.cc:68
 msgid "Triggers OSD when playback is unpaused."
 msgstr "Mencetus OSD apabila main tidak dijeda"
 
-#: src/aosd/aosd_ui.cc:163
+#: src/aosd/aosd_ui.cc:204
 msgid "Placement"
 msgstr "Penempatan"
 
-#: src/aosd/aosd_ui.cc:196
+#: src/aosd/aosd_ui.cc:241
 msgid "Relative X offset:"
 msgstr "X relatif diimbangi:"
 
-#: src/aosd/aosd_ui.cc:203
+#: src/aosd/aosd_ui.cc:245
 msgid "Relative Y offset:"
 msgstr "Y relatif diimbangi:"
 
-#: src/aosd/aosd_ui.cc:210
+#: src/aosd/aosd_ui.cc:249
 msgid "Max OSD width:"
 msgstr "Max lebar OSD:"
 
-#: src/aosd/aosd_ui.cc:221
+#: src/aosd/aosd_ui.cc:281
 msgid "Multi-Monitor options"
 msgstr "pilihan Pelbagai-Monitor"
 
-#: src/aosd/aosd_ui.cc:225
+#: src/aosd/aosd_ui.cc:285
 msgid "Display OSD using:"
 msgstr "Paparkan OSD digunakan:"
 
-#: src/aosd/aosd_ui.cc:227
+#: src/aosd/aosd_ui.cc:287
 msgid "all monitors"
 msgstr "semua monitor"
 
-#: src/aosd/aosd_ui.cc:230
+#: src/aosd/aosd_ui.cc:290
 #, c-format
 msgid "monitor %i"
 msgstr "monitor %i"
 
-#: src/aosd/aosd_ui.cc:282
+#: src/aosd/aosd_ui.cc:342
 msgid "Timing (ms)"
 msgstr "Masa (ms)"
 
-#: src/aosd/aosd_ui.cc:287
+#: src/aosd/aosd_ui.cc:347
 msgid "Display:"
 msgstr "Paparan:"
 
-#: src/aosd/aosd_ui.cc:292
+#: src/aosd/aosd_ui.cc:352
 msgid "Fade in:"
 msgstr "Pudar dalam:"
 
-#: src/aosd/aosd_ui.cc:297
+#: src/aosd/aosd_ui.cc:357
 msgid "Fade out:"
 msgstr "Pudar luar:"
 
-#: src/aosd/aosd_ui.cc:361
+#: src/aosd/aosd_ui.cc:442
 msgid "Fonts"
 msgstr "Font"
 
-#: src/aosd/aosd_ui.cc:368
+#: src/aosd/aosd_ui.cc:449
 #, c-format
 msgid "Font %i:"
 msgstr "Font %i:"
 
-#: src/aosd/aosd_ui.cc:382
+#: src/aosd/aosd_ui.cc:466
 msgid "Shadow"
 msgstr "Bayang"
 
-#: src/aosd/aosd_ui.cc:486
+#: src/aosd/aosd_ui.cc:589
 msgid "Render Style"
 msgstr "Realisasi Gaya"
 
-#: src/aosd/aosd_ui.cc:502
+#: src/aosd/aosd_ui.cc:605
 msgid "Colors"
 msgstr "Warna"
 
-#: src/aosd/aosd_ui.cc:513
+#: src/aosd/aosd_ui.cc:616
 #, c-format
 msgid "Color %i:"
 msgstr "Warna %i:"
 
-#: src/aosd/aosd_ui.cc:600
+#: src/aosd/aosd_ui.cc:714
 msgid "Enable trigger"
 msgstr "Aktifkan pencetus"
 
-#: src/aosd/aosd_ui.cc:627
+#: src/aosd/aosd_ui.cc:741
 msgid "Event"
 msgstr "Acara"
 
-#: src/aosd/aosd_ui.cc:655
+#: src/aosd/aosd_ui.cc:768
 msgid "Composite manager detected"
 msgstr "Pengurus komposit dikesan"
 
-#: src/aosd/aosd_ui.cc:662
+#: src/aosd/aosd_ui.cc:775
 msgid ""
 "Composite manager not detected;\n"
 "unless you know that you have one running, please activate a composite "
@@ -708,60 +483,56 @@
 "melainkan anda tahu bahawa anda mempunyai satu berjalan, sila mengaktifkan "
 "pengurus komposit sebaliknya OSD tidak akan berfungsi dengan betul"
 
-#: src/aosd/aosd_ui.cc:670
+#: src/aosd/aosd_ui.cc:783
 msgid "Composite manager not required for fake transparency"
 msgstr "Komposit pengurus tidak diperlukan untuk ketelusan palsu"
 
-#: src/aosd/aosd_ui.cc:706
+#: src/aosd/aosd_ui.cc:820
 msgid "Transparency"
 msgstr "Ketelusan"
 
-#: src/aosd/aosd_ui.cc:712
+#: src/aosd/aosd_ui.cc:826
 msgid "Fake transparency"
 msgstr "Ketelusan palsu"
 
-#: src/aosd/aosd_ui.cc:714
+#: src/aosd/aosd_ui.cc:828
 msgid "Real transparency (requires X Composite Ext.)"
 msgstr "Ketelusan sebenar (minta X Composite Ext.)"
 
-#: src/aosd/aosd_ui.cc:756
+#: src/aosd/aosd_ui.cc:875
 msgid "Composite extension not loaded"
 msgstr "Lanjutan komposit tidak dimuatkan"
 
-#: src/aosd/aosd_ui.cc:764
-msgid "Composite extension not available"
-msgstr "Sambungan komposit tidak tersedia"
-
-#: src/aosd/aosd_ui.cc:781
+#: src/aosd/aosd_ui.cc:892
 #, c-format
 msgid "Audacious OSD"
 msgstr "Audacious OSD"
 
-#: src/aosd/aosd_ui.cc:844
+#: src/aosd/aosd_ui.cc:955
 msgid "Position"
 msgstr "Kedudukan"
 
-#: src/aosd/aosd_ui.cc:849
+#: src/aosd/aosd_ui.cc:960
 msgid "Animation"
 msgstr "Animasi"
 
-#: src/aosd/aosd_ui.cc:854
+#: src/aosd/aosd_ui.cc:965
 msgid "Text"
 msgstr "Teks"
 
-#: src/aosd/aosd_ui.cc:859
+#: src/aosd/aosd_ui.cc:970
 msgid "Decoration"
 msgstr "Hiasan"
 
-#: src/aosd/aosd_ui.cc:864
+#: src/aosd/aosd_ui.cc:975
 msgid "Trigger"
 msgstr "Pemicu"
 
-#: src/aosd/aosd_ui.cc:869
+#: src/aosd/aosd_ui.cc:980 src/streamtuner/shoutcast-model.cc:202
 msgid "Misc"
 msgstr "Pelbagai"
 
-#: src/aosd/aosd_ui.cc:878
+#: src/aosd/aosd_ui.cc:989
 msgid "Test"
 msgstr "Uji"
 
@@ -777,11 +548,83 @@
 msgid "Audacious Playlists (audpl)"
 msgstr "Senarai Main Audacious (audpl)"
 
-#: src/blur_scope/blur_scope.cc:42
+#: src/background_music/background_music.cc:24
+msgid "Background music"
+msgstr ""
+
+#: src/background_music/background_music.cc:25
+msgid "Target level:"
+msgstr ""
+
+#: src/background_music/background_music.cc:28
+#: src/background_music/background_music.cc:33
+#: src/silence-removal/silence-removal.cc:70
+msgid "dB"
+msgstr "dB"
+
+#: src/background_music/background_music.cc:29
+msgid "Maximum amplification:"
+msgstr ""
+
+#: src/background_music/background_music.cc:34 src/mpg123/mpg123.cc:81
+msgid "Advanced"
+msgstr "Lanjutan"
+
+#: src/background_music/background_music.cc:36
+msgid "Slow detection weight:"
+msgstr ""
+
+#: src/background_music/background_music.cc:39
+msgid "Hint"
+msgstr ""
+
+#: src/background_music/background_music.cc:41
+msgid ""
+"Slow detection weight is the relative weight\n"
+"of a long term average detection when compared\n"
+"to the actual, faster loudness detection.\n"
+"A value of zero gives a more radio-like sound\n"
+"where soft passages get \"pulled up\" more quickly,\n"
+"a value of two makes the sound feel less compressed."
+msgstr ""
+
+#: src/background_music/background_music.cc:52
+msgid ""
+"Background Music Plugin for Audacious\n"
+"Copyright 2023;2024 Michel Fleur\n"
+"\n"
+"Controls the volume to make the sound equally loud within and between "
+"tracks.\n"
+" It uses accurate loudness measurement and tries to make the volume changes "
+"sound natural without audible peaks, yet without lowering the volume before "
+"a peak in advance."
+msgstr ""
+
+#: src/background_music/background_music.cc:61
+msgid "Background Music"
+msgstr ""
+
+#: src/bitcrusher/bitcrusher.cc:33
+msgid "Bitcrusher"
+msgstr ""
+
+#: src/bitcrusher/bitcrusher.cc:34
+msgid "Bit Depth:"
+msgstr ""
+
+#: src/bitcrusher/bitcrusher.cc:37
+msgid "Downsample ratio:"
+msgstr ""
+
+#: src/bitcrusher/bitcrusher.cc:48
+msgid "Bitcrusher"
+msgstr ""
+
+#: src/blur_scope/blur_scope.cc:40 src/blur_scope-qt/blur_scope.cc:45
 msgid "Color"
 msgstr "Warna"
 
-#: src/blur_scope/blur_scope.cc:58
+#: src/blur_scope/blur_scope.cc:56 src/blur_scope-qt/blur_scope.cc:158
 msgid "Blur Scope"
 msgstr "Skop Kabur"
 
@@ -793,6 +636,10 @@
 msgid "Presets:"
 msgstr "Praset:"
 
+#: src/bs2b/plugin.cc:130
+msgid "Default"
+msgstr "Lalai"
+
 #: src/bs2b/plugin.cc:136
 msgid "Feed level:"
 msgstr "Aras suapan:"
@@ -805,15 +652,15 @@
 msgid "Cut frequency:"
 msgstr "Frekuensi kerat:"
 
-#: src/cairo-spectrum/cairo-spectrum.cc:41
+#: src/cairo-spectrum/cairo-spectrum.cc:42 src/qt-spectrum/qt-spectrum.cc:107
 msgid "Spectrum Analyzer"
 msgstr "Penganalisis Spektrum"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:72
+#: src/cdaudio/cdaudio-ng.cc:74
 msgid "Audio CD Plugin"
 msgstr "Pemalam CD Audio"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:121
+#: src/cdaudio/cdaudio-ng.cc:121
 msgid ""
 "Copyright (C) 2007-2012 Calin Crisan <ccrisan@gmail.com> and others.\n"
 "\n"
@@ -833,132 +680,132 @@
 "\n"
 "Ini merupakan projek Google Summer of Code 2007."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:137
+#: src/cdaudio/cdaudio-ng.cc:140
 msgid "Device"
 msgstr "Peranti"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:138
+#: src/cdaudio/cdaudio-ng.cc:141
 msgid "Read speed:"
 msgstr "Kelajuan baca:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:141
+#: src/cdaudio/cdaudio-ng.cc:144
 msgid "Override device:"
 msgstr "Batalkan peranti:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:143
+#: src/cdaudio/cdaudio-ng.cc:146
 msgid "Metadata"
 msgstr "Data meta"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:144
+#: src/cdaudio/cdaudio-ng.cc:147
 msgid "Use CD-Text"
 msgstr "Guna Teks-CD"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:146
+#: src/cdaudio/cdaudio-ng.cc:150
 msgid "Use CDDB"
 msgstr "Guna CDDB"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:148
+#: src/cdaudio/cdaudio-ng.cc:152
 msgid "Use HTTP instead of CDDBP"
 msgstr "Guna HTTP selain dari CDDBP"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:151
+#: src/cdaudio/cdaudio-ng.cc:155
 msgid "Server:"
 msgstr "Pelayan:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:155
+#: src/cdaudio/cdaudio-ng.cc:159
 msgid "Path:"
 msgstr "Laluan:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:159
+#: src/cdaudio/cdaudio-ng.cc:163
 msgid "Port:"
 msgstr "Port:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:246
+#: src/cdaudio/cdaudio-ng.cc:228
 msgid "Failed to initialize cdio subsystem."
 msgstr "Gagal mengawalkan subsistem cdio."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:281
+#: src/cdaudio/cdaudio-ng.cc:260
 #, c-format
 msgid "Invalid URI %s."
 msgstr "URI %s tidak sah."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:283
+#: src/cdaudio/cdaudio-ng.cc:262
 #, c-format
 msgid "Track %d not found."
 msgstr "Trek %d tidak ditemui."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:285
+#: src/cdaudio/cdaudio-ng.cc:264
 #, c-format
 msgid "Track %d is a data track."
 msgstr "Trek %d adalah trek data."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:360
+#: src/cdaudio/cdaudio-ng.cc:339
 msgid "Error reading audio CD."
 msgstr "Ralat membaca CD audio."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:429
+#: src/cdaudio/cdaudio-ng.cc:410
 msgid "Audio CD"
 msgstr "CD Audio"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:460 src/cdaudio-ng/cdaudio-ng.cc:469
+#: src/cdaudio/cdaudio-ng.cc:446 src/cdaudio/cdaudio-ng.cc:455
 #, c-format
 msgid "Failed to open CD device %s."
 msgstr "Gagal membuka peranti CD %s."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:472
+#: src/cdaudio/cdaudio-ng.cc:458
 msgid "No audio capable CD drive found."
 msgstr "Tiada pemacu CD upaya audio ditemui."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:497
+#: src/cdaudio/cdaudio-ng.cc:481
+msgid "Drive is empty."
+msgstr "Pemacu kosong."
+
+#: src/cdaudio/cdaudio-ng.cc:483
+msgid "Unsupported disk type."
+msgstr "Jenis cakera tidak disokong."
+
+#: src/cdaudio/cdaudio-ng.cc:507
 msgid "Failed to finish initializing opened CD drive."
 msgstr "Gagal menyelesaikan pengawalan pemacu CD dibuka."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:510
+#: src/cdaudio/cdaudio-ng.cc:520
 msgid "Failed to retrieve first/last track number."
 msgstr "Gagal mendapatkan nombor trek pertama/terakhir."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:531
+#: src/cdaudio/cdaudio-ng.cc:541
 #, c-format
 msgid "Cannot read start/end LSN for track %d."
 msgstr "Tidak dapat baca/tamatkan LSN untuk trek %d."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:613
-msgid "Failed to create the cddb connection."
-msgstr "Gagal mencipta sambungan cddb."
+#: src/cdaudio/cdaudio-ng.cc:624
+msgid "Failed to create the CDDB connection."
+msgstr "Gagal mencipta sambungan CDDB."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:679
+#: src/cdaudio/cdaudio-ng.cc:690
 msgid "Failed to query the CDDB server"
 msgstr "Gagal menanya pelayan CDDB"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:681
+#: src/cdaudio/cdaudio-ng.cc:692
 #, c-format
 msgid "Failed to query the CDDB server: %s"
 msgstr "Gagal menanya pelayan CDDB: %s"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:705
+#: src/cdaudio/cdaudio-ng.cc:716
 #, c-format
-msgid "Failed to read the cddb info: %s"
-msgstr "Gagal membaca maklumat cddb: %s"
+msgid "Failed to read the CDDB info: %s"
+msgstr "Gagal membaca maklumat CDDB: %s"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:765
-msgid "Drive is empty."
-msgstr "Pemacu kosong."
-
-#: src/cdaudio-ng/cdaudio-ng.cc:767
-msgid "Unsupported disk type."
-msgstr "Jenis cakera tidak disokong."
-
-#: src/cd-menu-items/cd-menu-items.cc:35
+#: src/cd-menu-items/cd-menu-items.cc:33
 msgid "Audio CD Menu Items"
 msgstr "Item Menu CD Audio"
 
-#: src/cd-menu-items/cd-menu-items.cc:47
-msgid "Play CD"
-msgstr "Main CD"
-
-#: src/cd-menu-items/cd-menu-items.cc:47
-msgid "Add CD"
-msgstr "Tambah CD"
+#: src/cd-menu-items/cd-menu-items.cc:45
+msgid "Pla_y CD"
+msgstr "_Main CD"
+
+#: src/cd-menu-items/cd-menu-items.cc:45
+msgid "_Add CD"
+msgstr "_Tambah CD"
 
 #: src/compressor/compressor.cc:45
 msgid "Compression"
@@ -1016,7 +863,14 @@
 msgid "Default song length:"
 msgstr "Panjang lagu lalai:"
 
-#: src/console/plugin.cc:42 src/modplug/plugin_main.cc:59
+#: src/console/plugin.cc:41 src/crossfade/crossfade.cc:56
+#: src/crossfade/crossfade.cc:62 src/lirc/lirc.cc:395 src/notify/notify.cc:113
+#: src/sid/xs_config.cc:85 src/sid/xs_config.cc:94 src/sid/xs_config.cc:103
+#: src/vumeter-qt/vumeter_qt.cc:39
+msgid "seconds"
+msgstr "Saat"
+
+#: src/console/plugin.cc:42 src/modplug/plugin_main.cc:58
 msgid "Resampling"
 msgstr "Persampelan Semula"
 
@@ -1040,29 +894,39 @@
 msgid "Game Console Music Decoder"
 msgstr "Penyahkod Muzik Konsol Permainan"
 
-#: src/coreaudio/coreaudio.cc:50
+#: src/coreaudio/coreaudio.cc:53
 msgid "CoreAudio output"
 msgstr "Output CoreAudio"
 
-#: src/coreaudio/coreaudio.cc:131
+#: src/coreaudio/coreaudio.cc:155
 msgid ""
 "CoreAudio Output Plugin for Audacious\n"
 "Copyright 2014 William Pitcock\n"
+"Copyright 2017,18 René J.V. Bertin\n"
+" (original code and code adapted from\n"
+" Apple examples, (C) Apple 2013)\n"
 "\n"
 "Based on SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
 msgstr ""
 "Pemalam Output CoreAudio untuk Audacious\n"
 "Hakcipta 2014 William Pitcock\n"
+"Hakcopta 2017,18 René J.V. Bertin\n"
+" (kod asal dan kos diadaptasi daripada\n"
+" contoh Apple, (C) Apple 2013)\n"
 "\n"
 "Berdasarkan pada Pemalam Output SDL untukr Audacious\n"
 "Hakcipta 2010 John Lindgren"
 
-#: src/coreaudio/coreaudio.cc:143
+#: src/coreaudio/coreaudio.cc:171
 msgid "Use exclusive mode"
 msgstr "Guna mod ekslusif"
 
-#: src/crossfade/crossfade.cc:44
+#: src/coreaudio/coreaudio.cc:173
+msgid "Use bit perfect audio (adapt device sampling rate)"
+msgstr "Guna audio sempurna bit (suaikan kadar persampelan peranti)"
+
+#: src/crossfade/crossfade.cc:47
 msgid ""
 "Crossfade Plugin for Audacious\n"
 "Copyright 2010-2014 John Lindgren"
@@ -1070,27 +934,43 @@
 "Pemalam Resap Silang untuk Audacious\n"
 "Hakcipta 2010-2014 John Lindgren"
 
-#: src/crossfade/crossfade.cc:48
+#: src/crossfade/crossfade.cc:51
 msgid "Crossfade"
 msgstr "Resap Silang"
 
-#: src/crossfade/crossfade.cc:49
+#: src/crossfade/crossfade.cc:52
 msgid "On automatic song change"
 msgstr "Bila automatik lagu berubah"
 
-#: src/crossfade/crossfade.cc:51 src/crossfade/crossfade.cc:57
+#: src/crossfade/crossfade.cc:54 src/crossfade/crossfade.cc:60
 msgid "Overlap:"
 msgstr "Tindih:"
 
-#: src/crossfade/crossfade.cc:55
+#: src/crossfade/crossfade.cc:58
 msgid "On seek or manual song change"
 msgstr "Bila jangkau atau ubah lagu secara manual"
 
-#: src/crossfade/crossfade.cc:61
+#: src/crossfade/crossfade.cc:64
+msgid "No fade in"
+msgstr ""
+
+#: src/crossfade/crossfade.cc:66
+msgid "Use S-curve fade"
+msgstr ""
+
+#: src/crossfade/crossfade.cc:68
+msgid "S-curve steepness:"
+msgstr ""
+
+#: src/crossfade/crossfade.cc:70
+msgid "(higher is steeper)"
+msgstr ""
+
+#: src/crossfade/crossfade.cc:72
 msgid "Tip"
 msgstr "Petua"
 
-#: src/crossfade/crossfade.cc:62
+#: src/crossfade/crossfade.cc:73
 msgid ""
 "For better crossfading, enable\n"
 "the Silence Removal effect."
@@ -1098,29 +978,10 @@
 "Untuk resap silang yang lebih baik,\n"
 "benarkan kesan Pembuangan Senyap."
 
-#: src/crossfade/crossfade.cc:72
+#: src/crossfade/crossfade.cc:83
 msgid "Crossfade"
 msgstr "Resap Silang"
 
-#: src/crossfade/crossfade.cc:161
-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 ""
-"Peresapan silang gagal kerana lagu mempunyai bilangan saluran berbeza. Anda "
-"boleh guna Pengadun Saluran untuk tukarkan lagu ke bilangan saluran yang "
-"sama."
-
-#: src/crossfade/crossfade.cc:168
-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 ""
-"Peresapan silang gagal keran lagu mempunyai kadar sampel yang berlainan. "
-"Anda boleh guna Penukar Kadar Sampel untuk tukarkan lagu menjadi kadar "
-"sampel yang sama."
-
 #: src/crystalizer/crystalizer.cc:31
 msgid "Crystalizer"
 msgstr "Crystalizer"
@@ -1133,60 +994,61 @@
 msgid "Crystalizer"
 msgstr "Crystalizer"
 
-#: src/cue/cue.cc:37
+#: src/cue/cue.cc:42
 msgid "Cue Sheet Plugin"
 msgstr "Pemalam Lembaran Isyarat"
 
-#: src/delete-files/delete-files.cc:46 src/delete-files/delete-files.cc:146
+#: src/delete-files/delete-files.cc:53 src/delete-files/delete-files.cc:215
+#: src/delete-files/delete-files.cc:230
 msgid "Delete Files"
 msgstr "Padam Fail"
 
-#: src/delete-files/delete-files.cc:75
+#: src/delete-files/delete-files.cc:120
+msgid "No files are selected."
+msgstr "Tiada fail dipilih."
+
+#: src/delete-files/delete-files.cc:125
 #, c-format
-msgid "Error moving %s to trash: %s."
-msgstr "Ralat mengalih %s ke tong sampah: %s."
+msgid "Do you want to move %s to the trash?"
+msgstr "Anda mahu alih %s ke tong sampah?"
 
-#: src/delete-files/delete-files.cc:86
+#: src/delete-files/delete-files.cc:126
 #, c-format
-msgid "Error deleting %s: %s."
-msgstr "Ralat memadam %s: %s."
+msgid "Do you want to permanently delete %s?"
+msgstr "Anda mahu padam %s secara kekal?"
 
-#: src/delete-files/delete-files.cc:117
+#: src/delete-files/delete-files.cc:133
 #, c-format
-msgid "Error deleting %s: not a local file."
-msgstr "Ralat memadam %s: bukan fail setempat."
+msgid "Do you want to move %d files to the trash?"
+msgstr "Anda mahu alih %d fail ke dalam tong sampah?"
 
 #: src/delete-files/delete-files.cc:134
-msgid "Do you want to move the selected files to the trash?"
-msgstr "Anda mahu alih fail terpilih ke tong sampah?"
+#, c-format
+msgid "Do you want to permanently delete %d files?"
+msgstr "Anda mahu padam %d fail secara kekal?"
 
-#: src/delete-files/delete-files.cc:135
-msgid "Move to Trash"
-msgstr "Alih ke Tong Sampah"
-
-#: src/delete-files/delete-files.cc:140
-msgid "Do you want to permanently delete the selected files?"
-msgstr "Anda mahu padam fail terpilih secara kekal?"
+#: src/delete-files/delete-files.cc:146
+msgid "Move to trash"
+msgstr "Alih ke tong sampah"
 
-#: src/delete-files/delete-files.cc:141 src/skins/preset-list.cc:411
-#: src/skins/preset-list.cc:427
+#: src/delete-files/delete-files.cc:146
 msgid "Delete"
 msgstr "Padam"
 
-#: src/delete-files/delete-files.cc:145 src/skins/preset-browser.cc:56
-#: src/skins/preset-list.cc:307 src/skins/ui_playlist.cc:221
+#: src/delete-files/delete-files.cc:213 src/delete-files/delete-files.cc:235
+#: src/skins-qt/search-select.cc:102 src/skins/search-select.cc:78
 msgid "Cancel"
 msgstr "Batal"
 
-#: src/delete-files/delete-files.cc:166
+#: src/delete-files/delete-files.cc:267
 msgid "Delete Selected Files"
 msgstr "Padam Fail Terpilih"
 
-#: src/delete-files/delete-files.cc:181
+#: src/delete-files/delete-files.cc:287
 msgid "Delete Method"
 msgstr "Kaedah Padam"
 
-#: src/delete-files/delete-files.cc:182
+#: src/delete-files/delete-files.cc:288
 msgid "Move to trash instead of deleting immediately"
 msgstr "Alih ke tong sampah selain dari memadam serta-merta"
 
@@ -1206,13 +1068,13 @@
 msgid "Echo"
 msgstr "Gema"
 
-#: src/echo_plugin/echo.cc:22 src/modplug/plugin_main.cc:73
-#: src/modplug/plugin_main.cc:83
+#: src/echo_plugin/echo.cc:22 src/modplug/plugin_main.cc:72
+#: src/modplug/plugin_main.cc:82
 msgid "Delay:"
 msgstr "Lengah:"
 
-#: src/echo_plugin/echo.cc:24 src/modplug/plugin_main.cc:73
-#: src/modplug/plugin_main.cc:83
+#: src/echo_plugin/echo.cc:24 src/modplug/plugin_main.cc:72
+#: src/modplug/plugin_main.cc:82 src/xsf/plugin.cc:445
 msgid "ms"
 msgstr "ms"
 
@@ -1220,7 +1082,7 @@
 msgid "Feedback:"
 msgstr "Maklumbalas:"
 
-#: src/echo_plugin/echo.cc:28 src/modplug/plugin_main.cc:87
+#: src/echo_plugin/echo.cc:28 src/modplug/plugin_main.cc:86
 msgid "Volume:"
 msgstr "Volum:"
 
@@ -1228,11 +1090,11 @@
 msgid "Echo"
 msgstr "Gema"
 
-#: src/ffaudio/ffaudio-core.cc:41
+#: src/ffaudio/ffaudio-core.cc:50
 msgid "FFmpeg Plugin"
 msgstr "Pemalam FFmpeg"
 
-#: src/ffaudio/ffaudio-core.cc:571
+#: src/ffaudio/ffaudio-core.cc:649
 msgid ""
 "Multi-format audio decoding plugin for Audacious using\n"
 "FFmpeg multimedia framework (http://www.ffmpeg.org/)\n"
@@ -1248,248 +1110,321 @@
 "William Pitcock <nenolod@nenolod.net>\n"
 "Matti Hämäläinen <ccr@tnsp.org>"
 
-#: src/filewriter/filewriter.cc:45
+#: src/filewriter/filewriter.cc:48
 msgid "FileWriter Plugin"
 msgstr "Pemalam FileWriter"
 
-#: src/filewriter/filewriter.cc:386
+#: src/filewriter/filewriter.cc:316
+#, c-format
+msgid ""
+"Error opening %s:\n"
+"%s"
+msgstr ""
+"Ralat membuka %s:\n"
+"%s"
+
+#: src/filewriter/filewriter.cc:358
+msgid ""
+"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 ""
+"Program ini adalah perisian bebas, anda boleh edar semula ia dan /atau "
+"ubahsuai ia di bawah terma Lese Awam Am GNU yang diterbitkan oleh Free "
+"Software Foundation: sama ada versi 2 dari Lesen, atau (mengikut pilihan "
+"anda) mana-mana versi kemudian.\n"
+"\n"
+"Program ini diedar dengan harapan ia akan berguna, tetapi TANPA APA-APA "
+"JAMINAN; tanpa juga jaminan yang dikenankan pada KEBOLEHPASARAN atau "
+"KESESUAIAN UNTUK APA JUA TUJUAN. Sila rujuk Lesen Awam Am GNU untuk "
+"perincian lanjut.\n"
+"\n"
+"Anda seharusnya menerima satu salinan Lesen Awam Am GNU bersama-sama program "
+"ini; jika tidak disertakan, tulis ke Free Software Foundation, Inc., 51 "
+"Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
+
+#: src/filewriter/filewriter.cc:385
 msgid "Output file format:"
 msgstr "Format fail output:"
 
-#: src/filewriter/filewriter.cc:403
-msgid "Configure"
-msgstr "Konfigur"
-
-#: src/filewriter/filewriter.cc:413
+#: src/filewriter/filewriter.cc:389
 msgid "Save into original directory"
 msgstr "Simpan ke dalam direktori asal"
 
-#: src/filewriter/filewriter.cc:417
-msgid "Save into custom directory"
-msgstr "Simpan ke dalam direktori suai"
-
-#: src/filewriter/filewriter.cc:427
-msgid "Output file folder:"
-msgstr "Folder fail output:"
-
-#: src/filewriter/filewriter.cc:431
-msgid "Pick a folder"
-msgstr "Ambil satu folder"
+#: src/filewriter/filewriter.cc:392
+msgid "Save into custom directory:"
+msgstr "Simpan ke dalam direktori suai:"
 
-#: src/filewriter/filewriter.cc:444
+#: src/filewriter/filewriter.cc:400
 msgid "Generate file name from:"
 msgstr "Jana nama fail dari:"
 
-#: src/filewriter/filewriter.cc:448
-msgid "Original file tag"
-msgstr "Tag fail asal"
-
-#: src/filewriter/filewriter.cc:453
+#: src/filewriter/filewriter.cc:401
 msgid "Original file name"
 msgstr "Nama fail asal"
 
-#: src/filewriter/filewriter.cc:459
-msgid "Include original file name extension"
-msgstr "Sertakan sambungan nama fail asal"
+#: src/filewriter/filewriter.cc:404
+msgid "Original file name (no suffix)"
+msgstr "Nama fail asal (tanpa akhiran)"
+
+#: src/filewriter/filewriter.cc:407
+msgid "Original file tag"
+msgstr "Tag fail asal"
 
-#: src/filewriter/filewriter.cc:468
+#: src/filewriter/filewriter.cc:411
 msgid "Prepend track number to file name"
 msgstr "Tambah nombor trek ke nama fail"
 
-#: src/filewriter/filewriter.cc:484
-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 ""
-"Program adalah perisian bebas; anda boleh mengedarkannya dan/atau "
-"mengubahsuainya dibawah terma Pelesenan Awam Am GNU yang diterbitkan oleh "
-"Free Software Foundation; sama ada versi 2 dari lesen, atau (mengikut "
-"pilihan anda) mana-mana versi terkini.\n"
-"\n"
-"Program ini diedarkan dengan harapan ianya akan berguna, TANPA SEBARANG "
-"JAMINAN; termasuk juga KESESUAIAN UNTUK DIPASARKAN, JAMINAN KUALITI, atau "
-"JAMINAN ATAS APA JUA SEBAB. Sila lihat GNU General Public License untuk "
-"maklumat lanjut.\n"
-"\n"
-"Anda seharusnya menerima satu salinan Lesen Awam Am GNU bersama-sama dengan "
-"Gwibber; jika tidak, laporkannya ke Free Software Foundation, Inc., 51 "
-"Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
-
-#: src/filewriter/mp3.cc:40 src/filewriter/mp3.cc:717
+#: src/filewriter/filewriter.cc:417 src/filewriter/filewriter.cc:449
 msgid "Auto"
 msgstr "Auto"
 
-#: src/filewriter/mp3.cc:40
+#: src/filewriter/filewriter.cc:418
+msgid "8000 Hz"
+msgstr "8000 Hz"
+
+#: src/filewriter/filewriter.cc:419
+msgid "11025 Hz"
+msgstr "11025 Hz"
+
+#: src/filewriter/filewriter.cc:420
+msgid "12000 Hz"
+msgstr "12000 Hz"
+
+#: src/filewriter/filewriter.cc:421
+msgid "16000 Hz"
+msgstr "16000 Hz"
+
+#: src/filewriter/filewriter.cc:422
+msgid "22050 Hz"
+msgstr "22050 Hz"
+
+#: src/filewriter/filewriter.cc:423
+msgid "24000 Hz"
+msgstr "24000 Hz"
+
+#: src/filewriter/filewriter.cc:424
+msgid "32000 Hz"
+msgstr "32000 Hz"
+
+#: src/filewriter/filewriter.cc:425 src/xsf/plugin.cc:430
+msgid "44100 Hz"
+msgstr "44100 Hz"
+
+#: src/filewriter/filewriter.cc:426 src/xsf/plugin.cc:431
+msgid "48000 Hz"
+msgstr "48000 Hz"
+
+#: src/filewriter/filewriter.cc:430
+msgid "8 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:431
+msgid "16 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:432
+msgid "32 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:433
+msgid "40 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:434
+msgid "48 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:435
+msgid "56 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:436
+msgid "64 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:437
+msgid "80 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:438
+msgid "96 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:439
+msgid "112 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:440
+msgid "128 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:441
+msgid "160 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:442
+msgid "192 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:443
+msgid "224 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:444
+msgid "256 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:445
+msgid "320 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:450
 msgid "Joint Stereo"
 msgstr "Stereo Gabung"
 
-#: src/filewriter/mp3.cc:41 src/modplug/plugin_main.cc:58
-#: src/mpg123/mpg123.cc:248
+#: src/filewriter/filewriter.cc:451 src/modplug/plugin_main.cc:57
+#: src/mpg123/mpg123.cc:259
 msgid "Stereo"
 msgstr "Stereo"
 
-#: src/filewriter/mp3.cc:41 src/modplug/plugin_main.cc:57
-#: src/mpg123/mpg123.cc:248
+#: src/filewriter/filewriter.cc:452 src/modplug/plugin_main.cc:56
+#: src/mpg123/mpg123.cc:260
 msgid "Mono"
 msgstr "Mono"
 
-#: src/filewriter/mp3.cc:657
-msgid "MP3 Configuration"
-msgstr "Konfigurasi MP3"
-
-#: src/filewriter/mp3.cc:658
-msgid "_OK"
-msgstr "_OK"
-
-#: src/filewriter/mp3.cc:681
-msgid "Algorithm Quality:"
-msgstr "Kualiti Algoritma:"
-
-#: src/filewriter/mp3.cc:706
-msgid "Output Sample Rate:"
-msgstr "Kadar Sampel Output:"
-
-#: src/filewriter/mp3.cc:733
-msgid "(Hz)"
-msgstr "(Hz)"
-
-#: src/filewriter/mp3.cc:740
-msgid "Bitrate / Compression Ratio:"
-msgstr "Kadar Bit / Nisbah Pemampatan:"
-
-#: src/filewriter/mp3.cc:764
-msgid "Bitrate (kbps):"
-msgstr "Kadar bit (kbps):"
+#: src/filewriter/filewriter.cc:456
+msgid "VBR"
+msgstr "VBR"
+
+#: src/filewriter/filewriter.cc:457
+msgid "ABR"
+msgstr "ABR"
+
+#: src/filewriter/filewriter.cc:478
+msgid "Algorithm quality:"
+msgstr "Kualiti algoritma:"
+
+#: src/filewriter/filewriter.cc:484
+msgid "Bitrate:"
+msgstr "Kadar bit:"
 
-#: src/filewriter/mp3.cc:796
+#: src/filewriter/filewriter.cc:491
 msgid "Compression ratio:"
 msgstr "Nisbah pemampatan:"
 
-#: src/filewriter/mp3.cc:820
-msgid "Audio Mode:"
-msgstr "Mod Audio:"
-
-#: src/filewriter/mp3.cc:845
-msgid "Miscellaneous:"
-msgstr "Pelbagai:"
+#: src/filewriter/filewriter.cc:498
+msgid "Audio mode:"
+msgstr "Mod audio:"
 
-#: src/filewriter/mp3.cc:856
+#: src/filewriter/filewriter.cc:501
 msgid "Enforce strict ISO compliance"
 msgstr "Paksa turutan ISO ketat"
 
-#: src/filewriter/mp3.cc:867
+#: src/filewriter/filewriter.cc:503
 msgid "Error protection"
 msgstr "Pelindungan ralat"
 
-#: src/filewriter/mp3.cc:879 src/filewriter/vorbis.cc:206
-msgid "Quality"
-msgstr "Kualiti"
-
-#: src/filewriter/mp3.cc:888
+#: src/filewriter/filewriter.cc:508
 msgid "Enable VBR/ABR"
 msgstr "Benarkan VBR/ABR"
 
-#: src/filewriter/mp3.cc:898
+#: src/filewriter/filewriter.cc:510
 msgid "Type:"
 msgstr "Jenis:"
 
-#: src/filewriter/mp3.cc:931
-msgid "VBR Options:"
-msgstr "Pilihan VBR:"
-
-#: src/filewriter/mp3.cc:947
-msgid "Minimum bitrate (kbps):"
-msgstr "Kadar bit minimum (kbps):"
-
-#: src/filewriter/mp3.cc:973
-msgid "Maximum bitrate (kbps):"
-msgstr "Kadar bit maksimum (kbps):"
-
-#: src/filewriter/mp3.cc:995
-msgid "Strictly enforce minimum bitrate"
-msgstr "Paksa kadar bit minimum betul-betul"
+#: src/filewriter/filewriter.cc:514
+msgid "Minimum bitrate:"
+msgstr "Kadar bit minimum:"
+
+#: src/filewriter/filewriter.cc:518
+msgid "Maximum bitrate:"
+msgstr "Kadar bit maksimum:"
+
+#: src/filewriter/filewriter.cc:522
+msgid "Average bitrate:"
+msgstr "Kadar bit purata:"
 
-#: src/filewriter/mp3.cc:1007
-msgid "ABR Options:"
-msgstr "Pilihan ABR:"
-
-#: src/filewriter/mp3.cc:1017
-msgid "Average bitrate (kbps):"
-msgstr "Kadar bit purata (kbps):"
-
-#: src/filewriter/mp3.cc:1044
+#: src/filewriter/filewriter.cc:526
 msgid "VBR quality level:"
 msgstr "Aras kualiti VBR:"
 
-#: src/filewriter/mp3.cc:1063
+#: src/filewriter/filewriter.cc:530
+msgid "Strictly enforce minimum bitrate"
+msgstr "Paksa kadar bit minimum betul-betul"
+
+#: src/filewriter/filewriter.cc:533
 msgid "Omit Xing VBR header"
 msgstr "Buang pengepala VBR Xing"
 
-#: src/filewriter/mp3.cc:1076
-msgid "VBR/ABR"
-msgstr "VBR/ABR"
-
-#: src/filewriter/mp3.cc:1085
-msgid "Frame Parameters:"
-msgstr "Parameter Bingkai:"
+#: src/filewriter/filewriter.cc:539
+msgid "Frame Headers"
+msgstr "Pengepala Bingkai"
 
-#: src/filewriter/mp3.cc:1097
+#: src/filewriter/filewriter.cc:540
 msgid "Mark as copyright"
 msgstr "Tanda sebagai hakcipta"
 
-#: src/filewriter/mp3.cc:1108
+#: src/filewriter/filewriter.cc:542
 msgid "Mark as original"
 msgstr "Tanda sebagai asal"
 
-#: src/filewriter/mp3.cc:1120
-msgid "ID3 Parameters:"
-msgstr "Parameter ID3:"
+#: src/filewriter/filewriter.cc:544
+msgid "ID3 Tags"
+msgstr "Tag ID3"
 
-#: src/filewriter/mp3.cc:1131
+#: src/filewriter/filewriter.cc:545
 msgid "Force addition of version 2 tag"
 msgstr "Paksa penambahan tag versi 2"
 
-#: src/filewriter/mp3.cc:1141
+#: src/filewriter/filewriter.cc:547
 msgid "Only add v1 tag"
 msgstr "Hanya tambah tag v1"
 
-#: src/filewriter/mp3.cc:1148
+#: src/filewriter/filewriter.cc:549
 msgid "Only add v2 tag"
 msgstr "Hanya tambah tag v2"
 
-#: src/filewriter/mp3.cc:1169
+#: src/filewriter/filewriter.cc:554
+msgid "Quality"
+msgstr "Kualiti"
+
+#: src/filewriter/filewriter.cc:555
+msgid "VBR/ABR"
+msgstr "VBR/ABR"
+
+#: src/filewriter/filewriter.cc:556
 msgid "Tags"
 msgstr "Tag"
 
-#: src/filewriter/vorbis.cc:196
-msgid "Vorbis Encoder Configuration"
-msgstr "Konfigurasi Pengekod Vorbis"
-
-#: src/filewriter/vorbis.cc:219
-msgid "Quality level (0 - 10):"
-msgstr "Aras kualiti (0 - 10):"
+#: src/filewriter/filewriter.cc:566
+msgid "Quality (0-1):"
+msgstr "Kualiti (0-1):"
+
+#: src/filewriter/filewriter.cc:573 src/skins-qt/skins_cfg.cc:307
+#: src/skins/skins_cfg.cc:289
+msgid "General"
+msgstr "Am"
 
-#: src/flacng/flacng.h:35
+#: src/flac/flacng.h:36
 msgid "FLAC Decoder"
 msgstr "Penyahkod FLAC"
 
-#: src/flacng/metadata.cc:351 src/wavpack/wavpack.cc:209
+#: src/flac/metadata.cc:296 src/wavpack/wavpack.cc:215
 msgid "lossless"
 msgstr "tak hilang"
 
-#: src/flacng/plugin.cc:169
+#: src/flac/plugin.cc:214
 msgid ""
 "Original code by\n"
 "Ralf Ertzinger <ralf@skytale.net>\n"
@@ -1513,15 +1448,15 @@
 msgid "GIO Plugin"
 msgstr "Pemalam GIO"
 
-#: src/gio/gio.cc:153
+#: src/gio/gio.cc:152
 msgid "Read-and-append mode not supported"
 msgstr "Mod baca-dan-tambah tidak disokong"
 
-#: src/gio/gio.cc:166
+#: src/gio/gio.cc:165
 msgid "Invalid open mode"
 msgstr "Mod buka tidak sah"
 
-#: src/gl-spectrum/gl-spectrum.cc:51
+#: src/glspectrum/gl-spectrum.cc:52
 msgid ""
 "OpenGL Spectrum Analyzer for Audacious\n"
 "Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
@@ -1541,634 +1476,756 @@
 "\n"
 "Lesen: GPLv2+"
 
-#: src/gl-spectrum/gl-spectrum.cc:62
+#: src/glspectrum/gl-spectrum.cc:63 src/qtglspectrum/gl-spectrum.cc:53
 msgid "OpenGL Spectrum Analyzer"
 msgstr "Penganalisis Spektrum OpenGL"
 
-#: src/gl-spectrum-qt/gl-spectrum.cc:41
-msgid ""
-"OpenGL Spectrum Analyzer for Audacious\n"
-"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
-"Copyright 2014 William Pitcock\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 ""
-"Penganalisis Spektrum OpenGL untuk Audacious\n"
-"Hakcipta 2013 Christophe Budé, John Lindgren, dan Carlo Bramini\n"
-"Hakcipta 2014 William Pitcock\n"
-"\n"
-"Berdasarkan pada pemalam XMMS:\n"
-"Hakcipta 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson, dan "
-"4Front Technologies\n"
-"\n"
-"Lesen: GPLv2+"
-
-#: src/gl-spectrum-qt/gl-spectrum.cc:53
-msgid "OpenGL Spectrum Analyzer (Qt)"
-msgstr "Penganalisis Spektrum OpenGL (Qt)"
-
-#: src/gnomeshortcuts/gnomeshortcuts.cc:38
-msgid "GNOME Shortcuts"
-msgstr "Pintasan GNOME"
-
-#: src/gnomeshortcuts/gnomeshortcuts.cc:54
-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 ""
-"Pemalam Pintasan GNOME\n"
-"Membolehkan anda kawal pemain dengan pintasan GNOME.\n"
-"\n"
-"Hakcipta (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>"
-
-#: src/gtkui/columns.cc:35
-msgid "Entry number"
-msgstr "Nombor masukan"
-
-#: src/gtkui/columns.cc:36 src/playlist-manager/playlist-manager.cc:225
-#: src/qtui/playlist_model.cc:123
+#: src/gtkui/columns.cc:36 src/moonstone/playlist_model.cc:38
+#: src/qtui/playlist_model.cc:33
+msgid "Entry Number"
+msgstr "Nombor Masukan"
+
+#: src/gtkui/columns.cc:37 src/moonstone/playlist_model.cc:38
+#: src/moonstone/playlist_selection.cc:64
+#: src/playlist-manager/playlist-manager.cc:200
+#: src/playlist-manager-qt/playlist-manager-qt.cc:188
+#: src/qtui/playlist_model.cc:33 src/streamtuner/icecast-model.cc:120
+#: src/streamtuner/ihr-model.cc:159 src/streamtuner/shoutcast-model.cc:122
 msgid "Title"
 msgstr "Tajuk"
 
-#: src/gtkui/columns.cc:37 src/qtui/playlist_model.cc:125
+#: src/gtkui/columns.cc:38 src/moonstone/playlist_model.cc:39
+#: src/qtui/playlist_model.cc:33
 msgid "Artist"
 msgstr "Artis"
 
-#: src/gtkui/columns.cc:38
+#: src/gtkui/columns.cc:39 src/moonstone/playlist_model.cc:39
+#: src/qtui/playlist_model.cc:33
 msgid "Year"
 msgstr "Tahun"
 
-#: src/gtkui/columns.cc:39 src/qtui/playlist_model.cc:127
+#: src/gtkui/columns.cc:40 src/moonstone/playlist_model.cc:39
+#: src/qtui/playlist_model.cc:34
 msgid "Album"
 msgstr "Album"
 
-#: src/gtkui/columns.cc:40
-msgid "Album artist"
-msgstr "Artis album"
+#: src/gtkui/columns.cc:41 src/moonstone/playlist_model.cc:40
+#: src/qtui/playlist_model.cc:34
+msgid "Album Artist"
+msgstr "Album Artis"
 
-#: src/gtkui/columns.cc:41
+#: src/gtkui/columns.cc:42 src/moonstone/playlist_model.cc:40
+#: src/qtui/playlist_model.cc:34
 msgid "Track"
 msgstr "Trek"
 
-#: src/gtkui/columns.cc:42
+#: src/gtkui/columns.cc:43 src/moonstone/playlist_model.cc:40
+#: src/qtui/playlist_model.cc:34 src/streamtuner/icecast-model.cc:123
+#: src/streamtuner/shoutcast-model.cc:125
+#: src/streamtuner/shoutcast-model.cc:236
 msgid "Genre"
 msgstr "Genre"
 
-#: src/gtkui/columns.cc:43
-msgid "Queue position"
-msgstr "Kedudukan baris gilir"
+#: src/gtkui/columns.cc:44 src/moonstone/playlist_model.cc:41
+#: src/qtui/playlist_model.cc:35
+msgid "Queue Position"
+msgstr "Kedudukan Baris Gilir"
 
-#: src/gtkui/columns.cc:44
+#: src/gtkui/columns.cc:45 src/moonstone/playlist_model.cc:41
+#: src/qtui/playlist_model.cc:35
 msgid "Length"
 msgstr "Panjang"
 
-#: src/gtkui/columns.cc:45
-msgid "File path"
-msgstr "Laluan fail"
-
-#: src/gtkui/columns.cc:47
-msgid "Custom title"
-msgstr "Tajuk suai"
-
-#: src/gtkui/columns.cc:48
+#: src/gtkui/columns.cc:46 src/moonstone/playlist_model.cc:41
+#: src/qtui/playlist_model.cc:35
+msgid "File Path"
+msgstr "Laluan Fail"
+
+#: src/gtkui/columns.cc:47 src/moonstone/playlist_model.cc:42
+#: src/qtui/playlist_model.cc:35
+msgid "File Name"
+msgstr "Nama Fail"
+
+#: src/gtkui/columns.cc:48 src/moonstone/playlist_model.cc:42
+#: src/qtui/playlist_model.cc:36
+msgid "Custom Title"
+msgstr "Tajuk Suai"
+
+#: src/gtkui/columns.cc:49 src/moonstone/playlist_model.cc:42
+#: src/qtui/playlist_model.cc:36 src/streamtuner/icecast-model.cc:129
+#: src/streamtuner/shoutcast-model.cc:134
 msgid "Bitrate"
 msgstr "Kadar bit"
 
-#: src/gtkui/columns.cc:308
+#: src/gtkui/columns.cc:50 src/moonstone/playlist_model.cc:43
+#: src/qtui/playlist_model.cc:36
+msgid "Comment"
+msgstr "Ulasan"
+
+#: src/gtkui/columns.cc:51 src/qtui/playlist_model.cc:36
+msgid "Publisher"
+msgstr ""
+
+#: src/gtkui/columns.cc:52 src/qtui/playlist_model.cc:37
+msgid "Catalog Number"
+msgstr ""
+
+#: src/gtkui/columns.cc:53 src/moonstone/playlist_model.cc:43
+#: src/qtui/playlist_model.cc:37
+msgid "Disc"
+msgstr ""
+
+#: src/gtkui/columns.cc:325
 msgid "Available columns"
 msgstr "Lajur tersedia"
 
-#: src/gtkui/columns.cc:334
+#: src/gtkui/columns.cc:351
 msgid "Displayed columns"
 msgstr "Lajur dipapar"
 
-#: src/gtkui/layout.cc:72 src/search-tool/search-tool.cc:40
+#: src/gtkui/layout.cc:74 src/search-tool-qt/search-tool-qt.cc:58
+#: src/search-tool/search-tool.cc:49
 msgid "Search Tool"
 msgstr "Alat Gelintar"
 
-#: src/gtkui/layout.cc:167
+#: src/gtkui/layout.cc:170
 msgid "Dock at Left"
 msgstr "Labuh di Kiri"
 
-#: src/gtkui/layout.cc:167
+#: src/gtkui/layout.cc:170
 msgid "Dock at Right"
 msgstr "Labuh di Kanan"
 
-#: src/gtkui/layout.cc:168
+#: src/gtkui/layout.cc:171
 msgid "Dock at Top"
 msgstr "Labuh di Atas"
 
-#: src/gtkui/layout.cc:168
+#: src/gtkui/layout.cc:171
 msgid "Dock at Bottom"
 msgstr "Labuh di Bawah"
 
-#: src/gtkui/layout.cc:168
+#: src/gtkui/layout.cc:171
 msgid "Undock"
 msgstr "Tanggalkan"
 
-#: src/gtkui/layout.cc:168 src/ladspa/plugin.cc:531
+#: src/gtkui/layout.cc:171 src/ladspa/plugin.cc:540
 msgid "Disable"
 msgstr "Lumpuhkan"
 
-#: src/gtkui/menus.cc:126 src/qtui/main_window_actions.cc:93
-#: src/statusicon/statusicon.cc:276
+#: src/gtkui/menus.cc:79 src/qtui/menus.cc:107
+#: src/statusicon-qt/statusicon.cc:115 src/statusicon/statusicon.cc:286
 msgid "_Open Files ..."
 msgstr "_Buka Fail ..."
 
-#: src/gtkui/menus.cc:127
+#: src/gtkui/menus.cc:80 src/qtui/menus.cc:111
 msgid "Open _URL ..."
 msgstr "Buka _URL ..."
 
-#: src/gtkui/menus.cc:128 src/qtui/main_window_actions.cc:95
+#: src/gtkui/menus.cc:81 src/qtui/menus.cc:113
 msgid "_Add Files ..."
 msgstr "T_ambah Fail ..."
 
-#: src/gtkui/menus.cc:129
+#: src/gtkui/menus.cc:82 src/qtui/menus.cc:118
 msgid "Add U_RL ..."
 msgstr "Tambah U_RL ..."
 
-#: src/gtkui/menus.cc:131
+#: src/gtkui/menus.cc:84 src/qtui/menus.cc:120
 msgid "Search _Library"
 msgstr "Gelintar _Pustaka"
 
-#: src/gtkui/menus.cc:133 src/qtui/main_window_actions.cc:98
+#: src/gtkui/menus.cc:86 src/qtui/menus.cc:123
 msgid "A_bout ..."
 msgstr "Per_ihal ..."
 
-#: src/gtkui/menus.cc:134 src/qtui/main_window_actions.cc:99
+#: src/gtkui/menus.cc:87 src/qtui/menus.cc:125
 msgid "_Settings ..."
 msgstr "T_etapan ..."
 
-#: src/gtkui/menus.cc:135 src/qtui/main_window_actions.cc:103
-#: src/statusicon/statusicon.cc:284
+#: src/gtkui/menus.cc:88 src/qtui/menus.cc:131
+#: src/statusicon-qt/statusicon.cc:117 src/statusicon/statusicon.cc:288
 msgid "_Quit"
 msgstr "_Keluar"
 
-#: src/gtkui/menus.cc:139 src/gtkui/menus.cc:262
-#: src/qtui/main_window_actions.cc:107 src/search-tool/search-tool.cc:641
-#: src/statusicon/statusicon.cc:278
+#: src/gtkui/menus.cc:92 src/gtkui/menus.cc:226
+#: src/moonstone/playlist_tabs.cc:306 src/qtui/menus.cc:135
+#: src/qtui/playlist_tabs.cc:331 src/search-tool-qt/search-tool-qt.cc:499
+#: src/search-tool/search-tool.cc:339 src/statusicon-qt/statusicon.cc:109
+#: src/statusicon/statusicon.cc:280
 msgid "_Play"
 msgstr "_Main"
 
-#: src/gtkui/menus.cc:140 src/qtui/main_window_actions.cc:108
-#: src/statusicon/statusicon.cc:279
+#: src/gtkui/menus.cc:93 src/qtui/menus.cc:137
+#: src/statusicon-qt/statusicon.cc:110 src/statusicon/statusicon.cc:281
 msgid "Paus_e"
 msgstr "_Jeda"
 
-#: src/gtkui/menus.cc:141 src/qtui/main_window_actions.cc:109
-#: src/statusicon/statusicon.cc:280
+#: src/gtkui/menus.cc:94 src/qtui/menus.cc:139
+#: src/statusicon-qt/statusicon.cc:111 src/statusicon/statusicon.cc:282
 msgid "_Stop"
 msgstr "_Henti"
 
-#: src/gtkui/menus.cc:142 src/qtui/main_window_actions.cc:110
-#: src/statusicon/statusicon.cc:277
+#: src/gtkui/menus.cc:95 src/qtui/menus.cc:141
+#: src/statusicon-qt/statusicon.cc:112 src/statusicon/statusicon.cc:283
 msgid "Pre_vious"
 msgstr "Ter_dahulu"
 
-#: src/gtkui/menus.cc:143 src/qtui/main_window_actions.cc:111
-#: src/statusicon/statusicon.cc:281
+#: src/gtkui/menus.cc:96 src/qtui/menus.cc:143
+#: src/statusicon-qt/statusicon.cc:113 src/statusicon/statusicon.cc:284
 msgid "_Next"
 msgstr "Ber_ikutnya"
 
-#: src/gtkui/menus.cc:145 src/qtui/main_window_actions.cc:113
+#: src/gtkui/menus.cc:97 src/qtui/menus.cc:145 src/skins/menus.cc:114
+#: src/skins-qt/menus.cc:105
+msgid "Previous Album"
+msgstr "Album Terdahulu"
+
+#: src/gtkui/menus.cc:98 src/qtui/menus.cc:146 src/skins/menus.cc:115
+#: src/skins-qt/menus.cc:106
+msgid "Next Album"
+msgstr "Album Berikutnya"
+
+#: src/gtkui/menus.cc:100 src/qtui/menus.cc:148
 msgid "_Repeat"
 msgstr "_Ulang"
 
-#: src/gtkui/menus.cc:146 src/qtui/main_window_actions.cc:114
+#: src/gtkui/menus.cc:101 src/qtui/menus.cc:150
 msgid "S_huffle"
 msgstr "K_ocok"
 
-#: src/gtkui/menus.cc:147 src/qtui/main_window_actions.cc:115
+#: src/gtkui/menus.cc:102 src/qtui/menus.cc:152
+msgid "Shuffle by Albu_m"
+msgstr "Kocok mengikut Albu_,"
+
+#: src/gtkui/menus.cc:103 src/qtui/menus.cc:155
 msgid "N_o Playlist Advance"
 msgstr "T_iada Senarai Main Pendahuluan"
 
-#: src/gtkui/menus.cc:148 src/qtui/main_window_actions.cc:116
+#: src/gtkui/menus.cc:104 src/qtui/menus.cc:157
 msgid "Stop A_fter This Song"
 msgstr "Henti Se_lepas Lagu Ini"
 
-#: src/gtkui/menus.cc:150 src/gtkui/menus.cc:247
-#: src/qtui/main_window_actions.cc:118
+#: src/gtkui/menus.cc:106 src/gtkui/menus.cc:210 src/qtui/menus.cc:162
+#: src/qtui/menus.cc:294
 msgid "Song _Info ..."
 msgstr "Mak_lumat Lagu ..."
 
-#: src/gtkui/menus.cc:151
+#: src/gtkui/menus.cc:107
 msgid "Jump to _Time ..."
 msgstr "Lompat ke Ma_sa ..."
 
-#: src/gtkui/menus.cc:152
+#: src/gtkui/menus.cc:108
 msgid "_Jump to Song ..."
 msgstr "L_ompat ke Lagu ..."
 
-#: src/gtkui/menus.cc:154
+#: src/gtkui/menus.cc:110 src/qtui/menus.cc:165
 msgid "Set Repeat Point _A"
 msgstr "Tetapkan Titik Ulang _A"
 
-#: src/gtkui/menus.cc:155
+#: src/gtkui/menus.cc:111 src/qtui/menus.cc:167
 msgid "Set Repeat Point _B"
 msgstr "Tetapkan Titik Ulang _B"
 
-#: src/gtkui/menus.cc:156
+#: src/gtkui/menus.cc:112 src/qtui/menus.cc:169
 msgid "_Clear Repeat Points"
 msgstr "_Kosongkan Titik Ulang"
 
-#: src/gtkui/menus.cc:160 src/gtkui/menus.cc:167 src/gtkui/menus.cc:183
-#: src/qtui/main_window_actions.cc:122 src/qtui/main_window_actions.cc:129
-#: src/qtui/main_window_actions.cc:145
+#: src/gtkui/menus.cc:116 src/gtkui/menus.cc:123 src/gtkui/menus.cc:141
+#: src/qtui/menus.cc:173 src/qtui/menus.cc:180 src/qtui/menus.cc:198
 msgid "By _Title"
 msgstr "Mengikut _Tajuk"
 
-#: src/gtkui/menus.cc:161 src/qtui/main_window_actions.cc:123
+#: src/gtkui/menus.cc:117 src/qtui/menus.cc:174
 msgid "By _File Name"
 msgstr "Mengikut Nama _Fail"
 
-#: src/gtkui/menus.cc:162 src/qtui/main_window_actions.cc:124
+#: src/gtkui/menus.cc:118 src/qtui/menus.cc:175
 msgid "By File _Path"
 msgstr "Mengikut _Laluan Fail"
 
-#: src/gtkui/menus.cc:166 src/gtkui/menus.cc:182
-#: src/qtui/main_window_actions.cc:128 src/qtui/main_window_actions.cc:144
+#: src/gtkui/menus.cc:122 src/gtkui/menus.cc:140 src/qtui/menus.cc:179
+#: src/qtui/menus.cc:197
 msgid "By Track _Number"
 msgstr "Mengikut _Nombor Trek"
 
-#: src/gtkui/menus.cc:168 src/gtkui/menus.cc:184
-#: src/qtui/main_window_actions.cc:130 src/qtui/main_window_actions.cc:146
+#: src/gtkui/menus.cc:124 src/gtkui/menus.cc:142 src/qtui/menus.cc:181
+#: src/qtui/menus.cc:199
 msgid "By _Artist"
 msgstr "Mengikut _Artis"
 
-#: src/gtkui/menus.cc:169 src/gtkui/menus.cc:185
-#: src/qtui/main_window_actions.cc:131 src/qtui/main_window_actions.cc:147
+#: src/gtkui/menus.cc:125 src/gtkui/menus.cc:143 src/qtui/menus.cc:182
+#: src/qtui/menus.cc:200
 msgid "By Al_bum"
 msgstr "Mengikut Al_bum"
 
-#: src/gtkui/menus.cc:170 src/gtkui/menus.cc:186
-#: src/qtui/main_window_actions.cc:132 src/qtui/main_window_actions.cc:148
+#: src/gtkui/menus.cc:126 src/gtkui/menus.cc:144 src/qtui/menus.cc:183
+#: src/qtui/menus.cc:201
 msgid "By Albu_m Artist"
 msgstr "Mengikut Albu_m Artis"
 
-#: src/gtkui/menus.cc:171 src/gtkui/menus.cc:187
-#: src/qtui/main_window_actions.cc:133 src/qtui/main_window_actions.cc:149
+#: src/gtkui/menus.cc:127 src/gtkui/menus.cc:145 src/qtui/menus.cc:184
+#: src/qtui/menus.cc:202
 msgid "By Release _Date"
 msgstr "Mengikut Tarik_h Keluaran"
 
-#: src/gtkui/menus.cc:172 src/gtkui/menus.cc:188
-#: src/qtui/main_window_actions.cc:134 src/qtui/main_window_actions.cc:150
+#: src/gtkui/menus.cc:128 src/gtkui/menus.cc:146 src/qtui/menus.cc:185
+#: src/qtui/menus.cc:203
 msgid "By _Genre"
 msgstr "Mengikut _Genre"
 
-#: src/gtkui/menus.cc:173 src/gtkui/menus.cc:189
-#: src/qtui/main_window_actions.cc:135 src/qtui/main_window_actions.cc:151
+#: src/gtkui/menus.cc:129 src/gtkui/menus.cc:147 src/qtui/menus.cc:186
+#: src/qtui/menus.cc:204
 msgid "By _Length"
 msgstr "Mengikut Pan_jang"
 
-#: src/gtkui/menus.cc:174 src/gtkui/menus.cc:190
-#: src/qtui/main_window_actions.cc:136 src/qtui/main_window_actions.cc:152
+#: src/gtkui/menus.cc:130 src/gtkui/menus.cc:148 src/qtui/menus.cc:187
+#: src/qtui/menus.cc:205
 msgid "By _File Path"
 msgstr "Mengikut Laluan _Fail"
 
-#: src/gtkui/menus.cc:175 src/gtkui/menus.cc:191
-#: src/qtui/main_window_actions.cc:137 src/qtui/main_window_actions.cc:153
+#: src/gtkui/menus.cc:131 src/gtkui/menus.cc:149 src/qtui/menus.cc:188
+#: src/qtui/menus.cc:206
 msgid "By _Custom Title"
 msgstr "Mengikut Tajuk _Suai"
 
-#: src/gtkui/menus.cc:177 src/gtkui/menus.cc:193
-#: src/qtui/main_window_actions.cc:139 src/qtui/main_window_actions.cc:155
+#: src/gtkui/menus.cc:132 src/gtkui/menus.cc:150 src/qtui/menus.cc:189
+#: src/qtui/menus.cc:207
+msgid "By C_omment"
+msgstr "Mengikut _Ulasan"
+
+#: src/gtkui/menus.cc:133 src/gtkui/menus.cc:151 src/qtui/menus.cc:190
+#: src/qtui/menus.cc:208
+msgid "By D_isc Number"
+msgstr ""
+
+#: src/gtkui/menus.cc:135 src/gtkui/menus.cc:153 src/qtui/menus.cc:192
+#: src/qtui/menus.cc:210
 msgid "R_everse Order"
 msgstr "Tertib S_ongsang"
 
-#: src/gtkui/menus.cc:178 src/gtkui/menus.cc:194
-#: src/qtui/main_window_actions.cc:140 src/qtui/main_window_actions.cc:156
+#: src/gtkui/menus.cc:136 src/gtkui/menus.cc:154 src/qtui/menus.cc:194
+#: src/qtui/menus.cc:212
 msgid "_Random Order"
 msgstr "Tertib _Rawak"
 
-#: src/gtkui/menus.cc:198 src/qtui/main_window_actions.cc:160
+#: src/gtkui/menus.cc:158 src/qtui/menus.cc:216
 msgid "_Play/Resume"
 msgstr "_Main/Sambung Semula"
 
-#: src/gtkui/menus.cc:199 src/gtkui/menus.cc:251
-#: src/qtui/main_window_actions.cc:161
+#: src/gtkui/menus.cc:159 src/qtui/menus.cc:218
 msgid "_Refresh"
 msgstr "Se_gar Semula"
 
-#: src/gtkui/menus.cc:201 src/qtui/main_window_actions.cc:163
+#: src/gtkui/menus.cc:161 src/qtui/menus.cc:222
 msgid "_Sort"
 msgstr "_Isih"
 
-#: src/gtkui/menus.cc:202 src/qtui/main_window_actions.cc:164
+#: src/gtkui/menus.cc:162 src/qtui/menus.cc:223
 msgid "Sort Se_lected"
 msgstr "Isih T_erpilih"
 
-#: src/gtkui/menus.cc:203 src/qtui/main_window_actions.cc:165
+#: src/gtkui/menus.cc:163 src/qtui/menus.cc:225
 msgid "Remove _Duplicates"
 msgstr "Buang Pen_dua"
 
-#: src/gtkui/menus.cc:204 src/qtui/main_window_actions.cc:166
+#: src/gtkui/menus.cc:164 src/qtui/menus.cc:226
 msgid "Remove _Unavailable Files"
 msgstr "Buang Fail Yang _Tiada"
 
-#: src/gtkui/menus.cc:206 src/playlist-manager/playlist-manager.cc:244
-#: src/qtui/main_window_actions.cc:168
+#: src/gtkui/menus.cc:166 src/playlist-manager/playlist-manager.cc:219
+#: src/playlist-manager-qt/playlist-manager-qt.cc:348 src/qtui/menus.cc:229
 msgid "_New"
 msgstr "_Baharu"
 
-#: src/gtkui/menus.cc:207
+#: src/gtkui/menus.cc:167 src/qtui/menus.cc:230
 msgid "Ren_ame ..."
 msgstr "N_ama Semula ..."
 
-#: src/gtkui/menus.cc:208 src/gtkui/menus.cc:264
-#: src/qtui/main_window_actions.cc:170
+#: src/gtkui/menus.cc:168 src/gtkui/menus.cc:228
+#: src/moonstone/playlist_tabs.cc:311 src/qtui/menus.cc:231
+#: src/qtui/playlist_tabs.cc:336
 msgid "Remo_ve"
 msgstr "B_uang"
 
-#: src/gtkui/menus.cc:210
+#: src/gtkui/menus.cc:170 src/qtui/menus.cc:233
 msgid "_Import ..."
 msgstr "_Import ..."
 
-#: src/gtkui/menus.cc:211
+#: src/gtkui/menus.cc:171 src/qtui/menus.cc:234
 msgid "_Export ..."
 msgstr "_Eksport ..."
 
-#: src/gtkui/menus.cc:213
+#: src/gtkui/menus.cc:173 src/qtui/menus.cc:237
 msgid "Playlist _Manager ..."
 msgstr "Pen_gurus Senarai Main ..."
 
-#: src/gtkui/menus.cc:214 src/qtui/main_window_actions.cc:176
+#: src/gtkui/menus.cc:174 src/qtui/menus.cc:239
 msgid "_Queue Manager ..."
 msgstr "Pengurus Baris _Gilir ..."
 
-#: src/gtkui/menus.cc:218 src/qtui/main_window_actions.cc:180
+#: src/gtkui/menus.cc:178 src/qtui/menus.cc:243
 msgid "Volume _Up"
 msgstr "Volum _Naik"
 
-#: src/gtkui/menus.cc:219 src/qtui/main_window_actions.cc:181
+#: src/gtkui/menus.cc:179 src/qtui/menus.cc:245
 msgid "Volume _Down"
 msgstr "Volum _Turun"
 
-#: src/gtkui/menus.cc:221 src/qtui/main_window_actions.cc:183
-msgid "_Equalizer"
-msgstr "Pen_yama"
+#: src/gtkui/menus.cc:181 src/qtui/menus.cc:249
+msgid "_Equalizer ..."
+msgstr "Pen_yama..."
 
-#: src/gtkui/menus.cc:223 src/qtui/main_window_actions.cc:185
+#: src/gtkui/menus.cc:182 src/qtui/menus.cc:251
 msgid "E_ffects ..."
 msgstr "K_esan ..."
 
-#: src/gtkui/menus.cc:227
+#: src/gtkui/menus.cc:184
+msgid "_Record Stream"
+msgstr "_Rakam Strim"
+
+#: src/gtkui/menus.cc:185
+msgid "Audio _Settings ..."
+msgstr "T_etapan Audio ..."
+
+#: src/gtkui/menus.cc:189 src/qtui/menus.cc:260
 msgid "Show _Menu Bar"
 msgstr "Tunjuk Palang _Menu"
 
-#: src/gtkui/menus.cc:228
+#: src/gtkui/menus.cc:190 src/qtui/menus.cc:262
 msgid "Show I_nfo Bar"
 msgstr "Tunjuk Palang Ma_klumat"
 
-#: src/gtkui/menus.cc:229
+#: src/gtkui/menus.cc:191 src/qtui/menus.cc:264
+msgid "Show Info Bar _Album Art"
+msgstr "Tunjuk Seni _Album Palang Maklumat"
+
+#: src/gtkui/menus.cc:192 src/qtui/menus.cc:266
 msgid "Show Info Bar Vis_ualization"
 msgstr "Tunjuk Peng_visualan Palang Maklumat"
 
-#: src/gtkui/menus.cc:230
+#: src/gtkui/menus.cc:193 src/qtui/menus.cc:268
 msgid "Show _Status Bar"
 msgstr "Tunjuk Palang _Status"
 
-#: src/gtkui/menus.cc:232
+#: src/gtkui/menus.cc:195 src/qtui/menus.cc:272
 msgid "Show _Remaining Time"
 msgstr "Tunjuk Masa _Berbaki"
 
-#: src/gtkui/menus.cc:234
+#: src/gtkui/menus.cc:197 src/qtui/menus.cc:276 src/skins/menus.cc:157
+#: src/skins-qt/menus.cc:152
 msgid "_Visualizations ..."
 msgstr "Pe_ngvisualan ..."
 
-#: src/gtkui/menus.cc:238 src/qtui/main_window_actions.cc:189
+#: src/gtkui/menus.cc:201 src/qtui/menus.cc:280
 msgid "_File"
 msgstr "_Fail"
 
-#: src/gtkui/menus.cc:239 src/qtui/main_window_actions.cc:190
+#: src/gtkui/menus.cc:202 src/qtui/menus.cc:281
 msgid "_Playback"
 msgstr "_Main Balik"
 
-#: src/gtkui/menus.cc:240 src/qtui/main_window_actions.cc:191
+#: src/gtkui/menus.cc:203 src/qtui/menus.cc:282
 msgid "P_laylist"
 msgstr "Se_narai Main"
 
-#: src/gtkui/menus.cc:241 src/gtkui/menus.cc:258
-#: src/qtui/main_window_actions.cc:192
+#: src/gtkui/menus.cc:204 src/gtkui/menus.cc:222 src/qtui/menus.cc:283
+#: src/qtui/menus.cc:312
 msgid "_Services"
 msgstr "Perk_hidmatan"
 
-#: src/gtkui/menus.cc:242 src/qtui/main_window_actions.cc:193
+#: src/gtkui/menus.cc:205 src/qtui/menus.cc:284
 msgid "_Output"
 msgstr "_Output"
 
-#: src/gtkui/menus.cc:243
+#: src/gtkui/menus.cc:206 src/qtui/menus.cc:285
 msgid "_View"
 msgstr "_Lihat"
 
-#: src/gtkui/menus.cc:248
+#: src/gtkui/menus.cc:211 src/qtui/menus.cc:296
 msgid "_Queue/Unqueue"
 msgstr "_Baris Gilir/Nyahbaris Gilir"
 
-#: src/gtkui/menus.cc:250
+#: src/gtkui/menus.cc:213 src/qtui/menus.cc:299
 msgid "_Open Containing Folder"
 msgstr "_Buka Folder Dikandungi"
 
-#: src/gtkui/menus.cc:253
+#: src/gtkui/menus.cc:214 src/qtui/menus.cc:301
+msgid "_Refresh Selected"
+msgstr "_Segar Semula Dipilih"
+
+#: src/gtkui/menus.cc:216 src/qtui/menus.cc:304
 msgid "Cu_t"
 msgstr "Po_tong"
 
-#: src/gtkui/menus.cc:254
+#: src/gtkui/menus.cc:217 src/qtui/menus.cc:305
 msgid "_Copy"
 msgstr "Sa_lin"
 
-#: src/gtkui/menus.cc:255
+#: src/gtkui/menus.cc:218 src/qtui/menus.cc:306
 msgid "_Paste"
 msgstr "Tam_pal"
 
-#: src/gtkui/menus.cc:256
+#: src/gtkui/menus.cc:219 src/qtui/menus.cc:307
+msgid "Paste at _End"
+msgstr "Tampal di _Penghujung"
+
+#: src/gtkui/menus.cc:220 src/qtui/menus.cc:309
 msgid "Select _All"
 msgstr "Pilih Semu_a"
 
-#: src/gtkui/menus.cc:263
+#: src/gtkui/menus.cc:227 src/moonstone/playlist_tabs.cc:309
+#: src/qtui/playlist_tabs.cc:334
 msgid "_Rename ..."
 msgstr "_Nama Semula ..."
 
-#: src/gtkui/settings.cc:35
+#: src/gtkui/settings.cc:35 src/qtui/settings.cc:59
+msgid "Always"
+msgstr "Sentiasa"
+
+#: src/gtkui/settings.cc:36 src/qtui/settings.cc:60
+msgid "Auto-hide"
+msgstr "Auto-sembunyi"
+
+#: src/gtkui/settings.cc:37 src/qtui/settings.cc:61
+msgid "Never"
+msgstr "Tidak Sesekali"
+
+#: src/gtkui/settings.cc:41 src/qtui/settings.cc:64
 msgid "Playlist Tabs"
 msgstr "Tab Senarai Main"
 
-#: src/gtkui/settings.cc:36
-msgid "Always show tabs"
-msgstr "Sentiasa tunjuk tab"
+#: src/gtkui/settings.cc:42 src/qtui/settings.cc:65
+msgid "Show playlist tabs:"
+msgstr "Tunjuk tab senarai main:"
 
-#: src/gtkui/settings.cc:38
+#: src/gtkui/settings.cc:45 src/qtui/settings.cc:69
 msgid "Show entry counts"
 msgstr "Tunjuk kiraan masukan"
 
-#: src/gtkui/settings.cc:40
+#: src/gtkui/settings.cc:47 src/qtui/settings.cc:72
 msgid "Show close buttons"
 msgstr "Tunjuk butang tutup"
 
-#: src/gtkui/settings.cc:42
+#: src/gtkui/settings.cc:49 src/qtui/settings.cc:75
 msgid "Playlist Columns"
 msgstr "Lajur Senarai Main"
 
-#: src/gtkui/settings.cc:44
+#: src/gtkui/settings.cc:51 src/qtui/settings.cc:77
 msgid "Show column headers"
 msgstr "Tunjuk pengepala lajur"
 
-#: src/gtkui/settings.cc:46 src/modplug/plugin_main.cc:106
-#: src/skins/skins_cfg.cc:263
-msgid "Miscellaneous"
-msgstr "Pelbagai"
+#: src/gtkui/settings.cc:53 src/qtui/settings.cc:82
+msgid "Make column headers clickable for sorting"
+msgstr ""
 
-#: src/gtkui/settings.cc:47
-msgid "Arrow keys seek by:"
-msgstr "Kekunci anak panah jangkau:"
+#: src/gtkui/settings.cc:56
+msgid "Use symbolic icons in toolbar"
+msgstr ""
 
-#: src/gtkui/settings.cc:50
+#: src/gtkui/settings.cc:58 src/qtui/settings.cc:86
 msgid "Scroll on song change"
 msgstr "Tatal bila lagu berubah"
 
-#: src/gtkui/ui_gtk.cc:71
+#: src/gtkui/ui_gtk.cc:82
 msgid "GTK Interface"
 msgstr "Antaramuka GTK"
 
-#: src/gtkui/ui_gtk.cc:222 src/skins/ui_main.cc:232
+#: src/gtkui/ui_gtk.cc:219 src/skins/main.cc:228 src/skins-qt/main.cc:231
 #, c-format
 msgid "%s - Audacious"
 msgstr "%s - Audacious"
 
-#: src/gtkui/ui_gtk.cc:225 src/qtui/main_window.cc:186
+#: src/gtkui/ui_gtk.cc:221 src/moonstone/main_window.cc:184
+#: src/qtui/main_window.cc:385
 msgid "Buffering ..."
 msgstr "Menimbal ..."
 
-#: src/gtkui/ui_gtk.cc:228 src/skins/ui_main.cc:234 src/skins/ui_main.cc:1164
+#: src/gtkui/ui_gtk.cc:224 src/pipewire/pipewire.cc:402 src/skins/main.cc:230
+#: src/skins-qt/main.cc:233
 msgid "Audacious"
 msgstr "Audacious"
 
-#: src/gtkui/ui_statusbar.cc:63 src/qtui/status_bar.cc:67
+#: src/gtkui/ui_gtk.cc:487 src/gtkui/ui_gtk.cc:518 src/gtkui/ui_gtk.cc:882
+#: src/hotkey/gui.cc:72 src/moonstone/main_window.cc:67
+#: src/moonstone/main_window.cc:145 src/moonstone/main_window.cc:146
+#: src/notify/osd.cc:85 src/qthotkey/gui.cc:67 src/qtui/main_window.cc:154
+#: src/qtui/main_window.cc:347 src/qtui/main_window.cc:348
+#: src/skins/menus.cc:109 src/skins-qt/menus.cc:100
+msgid "Play"
+msgstr "Main"
+
+#: src/gtkui/ui_gtk.cc:487 src/moonstone/main_window.cc:151
+#: src/moonstone/main_window.cc:152 src/notify/osd.cc:82
+#: src/qtui/main_window.cc:353 src/qtui/main_window.cc:354
+#: src/skins/menus.cc:110 src/skins-qt/menus.cc:101
+msgid "Pause"
+msgstr "Jeda"
+
+#: src/gtkui/ui_gtk.cc:868 src/moonstone/main_window.cc:57
+#: src/qtui/main_window.cc:145 src/skins/menus.cc:86 src/skins-qt/menus.cc:77
+msgid "Search Library"
+msgstr "Gelintar Pustaka"
+
+#: src/gtkui/ui_gtk.cc:875 src/moonstone/main_window.cc:60
+#: src/qtui/main_window.cc:147
+msgid "Open Files"
+msgstr "Buka Fail"
+
+#: src/gtkui/ui_gtk.cc:876 src/moonstone/main_window.cc:62
+#: src/qtui/main_window.cc:149
+msgid "Add Files"
+msgstr "Tambah Fail"
+
+#: src/gtkui/ui_gtk.cc:881 src/moonstone/main_window.cc:65
+#: src/qtui/main_window.cc:152 src/skins/menus.cc:112 src/skins-qt/menus.cc:103
+msgid "Previous"
+msgstr "Terdahulu"
+
+#: src/gtkui/ui_gtk.cc:883 src/hotkey/gui.cc:74 src/moonstone/main_window.cc:69
+#: src/qthotkey/gui.cc:69 src/qtui/main_window.cc:156 src/skins/menus.cc:111
+#: src/skins-qt/menus.cc:102
+msgid "Stop"
+msgstr "Henti"
+
+#: src/gtkui/ui_gtk.cc:884 src/moonstone/main_window.cc:76 src/notify/osd.cc:89
+#: src/qtui/main_window.cc:163 src/skins/menus.cc:113 src/skins-qt/menus.cc:104
+msgid "Next"
+msgstr "Berikutnya"
+
+#: src/gtkui/ui_gtk.cc:886 src/moonstone/main_window.cc:79
+#: src/qtui/main_window.cc:166 src/qtui/menus.cc:254 src/skins/menus.cc:79
+#: src/skins-qt/menus.cc:69
+msgid "Record Stream"
+msgstr "Rakam Strim"
+
+#: src/gtkui/ui_gtk.cc:919 src/moonstone/main_window.cc:86
+#: src/qtui/main_window.cc:173 src/skins/menus.cc:103 src/skins-qt/menus.cc:94
+msgid "Repeat"
+msgstr "Ulang"
+
+#: src/gtkui/ui_gtk.cc:922 src/moonstone/main_window.cc:89
+#: src/qtui/main_window.cc:176 src/skins/menus.cc:104 src/skins-qt/menus.cc:95
+msgid "Shuffle"
+msgstr "Kocok"
+
+#: src/gtkui/ui_gtk.cc:1114 src/qtui/main_window.cc:123
+msgid "Menu"
+msgstr "Menu"
+
+#: src/gtkui/ui_statusbar.cc:64 src/qtui/status_bar.cc:155
 msgid "mono"
 msgstr "mono"
 
-#: src/gtkui/ui_statusbar.cc:65 src/qtui/status_bar.cc:69
+#: src/gtkui/ui_statusbar.cc:66 src/qtui/status_bar.cc:157
 msgid "stereo"
 msgstr "stereo"
 
-#: src/gtkui/ui_statusbar.cc:67 src/qtui/status_bar.cc:71
+#: src/gtkui/ui_statusbar.cc:68 src/qtui/status_bar.cc:160
 #, c-format
 msgid "%d channel"
 msgid_plural "%d channels"
 msgstr0 "%d saluran"
 
-#: src/gtkui/ui_statusbar.cc:81 src/qtui/status_bar.cc:85
+#: src/gtkui/ui_statusbar.cc:76 src/qtui/status_bar.cc:168
+#, c-format
+msgid "%d kHz"
+msgstr "%d kHz"
+
+#: src/gtkui/ui_statusbar.cc:82 src/qtui/status_bar.cc:174
 #, c-format
-msgid "%d kbps"
-msgstr "%d kbps"
+msgid "%d kbit/s"
+msgstr ""
 
-#: src/gtkui/ui_statusbar.cc:107 src/skins/ui_main_evlisteners.cc:103
+#: src/gtkui/ui_statusbar.cc:108 src/skins/main.cc:478 src/skins-qt/main.cc:461
 msgid "Single mode."
 msgstr "Mod tunggal."
 
-#: src/gtkui/ui_statusbar.cc:109 src/skins/ui_main_evlisteners.cc:105
+#: src/gtkui/ui_statusbar.cc:110 src/skins/main.cc:480 src/skins-qt/main.cc:463
 msgid "Playlist mode."
 msgstr "Mod senarai main."
 
-#: src/gtkui/ui_statusbar.cc:117 src/skins/ui_main_evlisteners.cc:111
+#: src/gtkui/ui_statusbar.cc:118 src/skins/main.cc:486 src/skins-qt/main.cc:469
 msgid "Stopping after song."
 msgstr "Dihentikan selepas lagu."
 
-#: src/hotkey/gui.cc:71
+#: src/hotkey/gui.cc:71 src/qthotkey/gui.cc:66
 msgid "Previous track"
 msgstr "Trek terdahulu"
 
-#: src/hotkey/gui.cc:72 src/notify/osd.cc:69 src/qtui/main_window.cc:69
-#: src/qtui/main_window.cc:172 src/qtui/main_window.cc:173
-#: src/skins/menus.cc:87
-msgid "Play"
-msgstr "Main"
-
-#: src/hotkey/gui.cc:73
+#: src/hotkey/gui.cc:73 src/qthotkey/gui.cc:68
 msgid "Pause/Resume"
 msgstr "Jeda/Sambung Semula"
 
-#: src/hotkey/gui.cc:74 src/qtui/main_window.cc:70 src/skins/menus.cc:89
-msgid "Stop"
-msgstr "Henti"
-
-#: src/hotkey/gui.cc:75
+#: src/hotkey/gui.cc:75 src/qthotkey/gui.cc:70
 msgid "Next track"
 msgstr "Trek berikutnya"
 
-#: src/hotkey/gui.cc:76
-msgid "Forward 5 seconds"
-msgstr "Maju 5 saat"
-
-#: src/hotkey/gui.cc:77
-msgid "Rewind 5 seconds"
-msgstr "Undur 5 saat"
+#: src/hotkey/gui.cc:76 src/qthotkey/gui.cc:71
+msgid "Step forward"
+msgstr "Langkah maju"
+
+#: src/hotkey/gui.cc:77 src/qthotkey/gui.cc:72
+msgid "Step backward"
+msgstr "Langkah undur"
 
-#: src/hotkey/gui.cc:78
+#: src/hotkey/gui.cc:78 src/qthotkey/gui.cc:73
 msgid "Mute"
 msgstr "Senyap"
 
-#: src/hotkey/gui.cc:79
+#: src/hotkey/gui.cc:79 src/qthotkey/gui.cc:74
 msgid "Volume up"
 msgstr "Volum naik"
 
-#: src/hotkey/gui.cc:80
+#: src/hotkey/gui.cc:80 src/qthotkey/gui.cc:75
 msgid "Volume down"
 msgstr "Volum turun"
 
-#: src/hotkey/gui.cc:81
+#: src/hotkey/gui.cc:81 src/qthotkey/gui.cc:76
 msgid "Jump to file"
 msgstr "Lompat ke fail"
 
-#: src/hotkey/gui.cc:82
+#: src/hotkey/gui.cc:82 src/qthotkey/gui.cc:77
 msgid "Toggle player window(s)"
 msgstr "Togol tetingkap pemain"
 
-#: src/hotkey/gui.cc:83
+#: src/hotkey/gui.cc:83 src/qthotkey/gui.cc:78
 msgid "Show On-Screen-Display"
 msgstr "Tunjuk Paparan-Atas-Skrin"
 
-#: src/hotkey/gui.cc:84
+#: src/hotkey/gui.cc:84 src/qthotkey/gui.cc:79
 msgid "Toggle repeat"
 msgstr "Togol ulang"
 
-#: src/hotkey/gui.cc:85
+#: src/hotkey/gui.cc:85 src/qthotkey/gui.cc:80
 msgid "Toggle shuffle"
 msgstr "Togol kocok"
 
-#: src/hotkey/gui.cc:86
+#: src/hotkey/gui.cc:86 src/qthotkey/gui.cc:81
 msgid "Toggle stop after current"
 msgstr "Togol henti selepas semasa"
 
-#: src/hotkey/gui.cc:87
+#: src/hotkey/gui.cc:87 src/qthotkey/gui.cc:82
 msgid "Raise player window(s)"
 msgstr "Naik tetingkap pemain"
 
-#: src/hotkey/gui.cc:97
+#: src/hotkey/gui.cc:98 src/qthotkey/gui.cc:100
 msgid "(none)"
 msgstr "(tiada)"
 
-#: src/hotkey/gui.cc:234
+#: src/hotkey/gui.cc:261
 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 modifiers.\n"
 "\n"
 "Do you want to continue?"
 msgstr ""
-"Anda tidak disarankan mengikat butang tetikus utama dan pengubahsuai.\n"
+"Tidak disarankan mengikat butang tetikus utama tanpa pengubahsuai.\n"
 "\n"
 "Anda mahu teruskan?"
 
-#: src/hotkey/gui.cc:236
+#: src/hotkey/gui.cc:264
 msgid "Binding mouse buttons"
 msgstr "Pengikatan butang tetikus"
 
-#: src/hotkey/gui.cc:391
+#: src/hotkey/gui.cc:434
 msgid ""
 "Press a key combination inside a text field.\n"
 "You can also bind mouse buttons."
@@ -2176,34 +2233,34 @@
 "Tekan gabungan kekunci di dalam medan teks.\n"
 "Anda juga boleh mengikat butang tetikus."
 
-#: src/hotkey/gui.cc:396
+#: src/hotkey/gui.cc:444 src/qthotkey/gui.cc:179
 msgid "Hotkeys:"
 msgstr "Kekunci Panas:"
 
-#: src/hotkey/gui.cc:413
+#: src/hotkey/gui.cc:457 src/qthotkey/gui.cc:181
 msgid "Action:"
 msgstr "Tindakan:"
 
-#: src/hotkey/gui.cc:420
+#: src/hotkey/gui.cc:461 src/qthotkey/gui.cc:182
 msgid "Key Binding:"
 msgstr "Pengikatan Kekunci:"
 
-#: src/hotkey/gui.cc:468
+#: src/hotkey/gui.cc:518 src/qthotkey/gui.cc:184
 msgid "_Add"
 msgstr "T_ambah"
 
-#: src/hotkey/plugin.cc:61
+#: src/hotkey/plugin.cc:59 src/qthotkey/plugin.cc:78
 msgid "Global Hotkeys"
 msgstr "Kekunci Panas Sejagat"
 
-#: src/hotkey/plugin.cc:79
+#: src/hotkey/plugin.cc:74
 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"
+"Contributors 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"
@@ -2213,7 +2270,7 @@
 "Pemalam Kekunci Panas Sejagat\n"
 "Kawal pemain dengan gabungan kekunci sejagat atau kekunci multimedia.\n"
 "\n"
-"Hakcopta (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n"
+"Hak cipta (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n"
 "\n"
 "Penyumbang terlibat:\n"
 "Copyright (C) 2006-2007 Vladimir Paskov <vlado.paskov@gmail.com>\n"
@@ -2222,25 +2279,53 @@
 " Jonathan A. Davis <davis@jdhouse.org>,\n"
 " Jeremy Tan <nsx@nsx.homeip.net>"
 
-#: src/jack-ng/jack-ng.cc:49
+#: src/jack/jack-ng.cc:54
 msgid "JACK Output"
 msgstr "Output JEK"
 
-#: src/jack-ng/jack-ng.cc:114
+#: src/jack/jack-ng.cc:126
+msgid "Client name:"
+msgstr "Nama klien:"
+
+#: src/jack/jack-ng.cc:128
 msgid "Automatically connect to output ports"
 msgstr "Sambung ke port output secara automatik"
 
-#: src/jack-ng/jack-ng.cc:155
+#: src/jack/jack-ng.cc:130
+msgid "Filter ports (regex, use any port if blank):"
+msgstr ""
+
+#: src/jack/jack-ng.cc:136
+msgid "Connect to physical ports only"
+msgstr "Sambung ke port fizikal sahaja"
+
+#: src/jack/jack-ng.cc:139
+msgid "Upmix to"
+msgstr "Upmix ke"
+
+#: src/jack/jack-ng.cc:141
+msgid "ports if input has fewer channels"
+msgstr ""
+
+#: src/jack/jack-ng.cc:143
+msgid "Ignore insufficient number of ports"
+msgstr "Abai bilangan port yang tidak mencukupi"
+
+#: src/jack/jack-ng.cc:181
+msgid "No JACK output ports were found. Please check settings."
+msgstr ""
+
+#: src/jack/jack-ng.cc:195
 #, c-format
 msgid "Only %d JACK output ports were found but %d are required."
 msgstr "Hanya %d port output JACK ditemui tetapi %d yang diperlukan."
 
-#: src/jack-ng/jack-ng.cc:164
+#: src/jack/jack-ng.cc:210
 #, c-format
 msgid "Failed to connect to JACK port %s."
 msgstr "Gagal menyambung ke port JACK %s."
 
-#: src/jack-ng/jack-ng.cc:184
+#: src/jack/jack-ng.cc:230
 msgid ""
 "JACK supports only floating-point audio. You must change the output bit "
 "depth to floating-point in Audacious settings."
@@ -2248,11 +2333,11 @@
 "JACK hanya menyokong audio titik-apung. Anda mesti ubah kedalaman bit output "
 "ke titik-apung di dalam tetapan Audacious."
 
-#: src/jack-ng/jack-ng.cc:197
+#: src/jack/jack-ng.cc:245
 msgid "Failed to connect to the JACK server; is it running?"
 msgstr "Gagal bersambung dengan pelayan JACK; adakah ia berjalan?"
 
-#: src/jack-ng/jack-ng.cc:273
+#: src/jack/jack-ng.cc:321
 #, c-format
 msgid ""
 "The JACK server requires a sample rate of %d Hz, but Audacious is playing at "
@@ -2262,16 +2347,16 @@
 "%d Hz. Sila guna kesan Penukar Kadar Sampel untuk membetulkan ketidakpadanan "
 "ini."
 
-#: src/ladspa/plugin.cc:414
+#: src/ladspa/plugin.cc:416
 #, c-format
 msgid "%s Settings"
 msgstr "Tetapan %s"
 
-#: src/ladspa/plugin.cc:478
+#: src/ladspa/plugin.cc:482
 msgid "Module paths:"
 msgstr "Laluan Modul:"
 
-#: src/ladspa/plugin.cc:483
+#: src/ladspa/plugin.cc:487
 msgid ""
 "Separate multiple paths with a colon.\n"
 "These paths are searched in addition to LADSPA_PATH.\n"
@@ -2282,25 +2367,25 @@
 "Selepas menambah laluan baharu, tekan Enter untuk imbas pemalam baharu.</"
 "small>"
 
-#: src/ladspa/plugin.cc:499
+#: src/ladspa/plugin.cc:508
 msgid "Available plugins:"
 msgstr "Pemalam tersedia:"
 
-#: src/ladspa/plugin.cc:512 src/modplug/plugin_main.cc:92
-#: src/modplug/plugin_main.cc:95 src/modplug/plugin_main.cc:98
-#: src/modplug/plugin_main.cc:101
+#: src/ladspa/plugin.cc:521 src/modplug/plugin_main.cc:91
+#: src/modplug/plugin_main.cc:94 src/modplug/plugin_main.cc:97
+#: src/modplug/plugin_main.cc:100
 msgid "Enable"
 msgstr "Benarkan"
 
-#: src/ladspa/plugin.cc:518
+#: src/ladspa/plugin.cc:527
 msgid "Enabled plugins:"
 msgstr "Pemalam dibenarkan:"
 
-#: src/ladspa/plugin.cc:534
+#: src/ladspa/plugin.cc:543
 msgid "Settings"
 msgstr "Tetapan"
 
-#: src/ladspa/plugin.cc:551
+#: src/ladspa/plugin.cc:560
 msgid ""
 "LADSPA Host for Audacious\n"
 "Copyright 2011 John Lindgren"
@@ -2316,7 +2401,7 @@
 msgid "LIRC Plugin"
 msgstr "Pemalam LIRC"
 
-#: src/lirc/lirc.cc:381
+#: src/lirc/lirc.cc:379
 msgid ""
 "A simple plugin to control Audacious using the LIRC remote control daemon\n"
 "\n"
@@ -2345,63 +2430,123 @@
 "\n"
 "Untuk maklumat lanjut mengenai LIRC, sila rujuk http://lirc.org."
 
-#: src/lirc/lirc.cc:392
+#: src/lirc/lirc.cc:390
 msgid "Connection"
 msgstr "Sambungan"
 
-#: src/lirc/lirc.cc:393
+#: src/lirc/lirc.cc:391
 msgid "Reconnect to LIRC server"
 msgstr "Sambung semula ke pelayan LIRC"
 
-#: src/lirc/lirc.cc:395
+#: src/lirc/lirc.cc:393
 msgid "Wait before reconnecting:"
 msgstr "Tunggu sebelum disambung semula:"
 
-#: src/lyricwiki/lyricwiki.cc:41
-msgid "LyricWiki Plugin"
-msgstr "Pemalam LyricWiki"
-
-#: src/lyricwiki/lyricwiki.cc:131 src/lyricwiki-qt/lyricwiki.cc:136
-msgid "No lyrics available"
-msgstr "Tiada lirik tersedia"
-
-#: src/lyricwiki/lyricwiki.cc:217 src/lyricwiki/lyricwiki.cc:226
-#: src/lyricwiki/lyricwiki.cc:243 src/lyricwiki/lyricwiki.cc:252
-#: src/lyricwiki/lyricwiki.cc:267 src/lyricwiki-qt/lyricwiki.cc:222
-#: src/lyricwiki-qt/lyricwiki.cc:231 src/lyricwiki-qt/lyricwiki.cc:248
-#: src/lyricwiki-qt/lyricwiki.cc:257 src/lyricwiki-qt/lyricwiki.cc:272
-msgid "Error"
-msgstr "Ralat"
-
-#: src/lyricwiki/lyricwiki.cc:218 src/lyricwiki/lyricwiki.cc:244
-#: src/lyricwiki-qt/lyricwiki.cc:223 src/lyricwiki-qt/lyricwiki.cc:249
+#: src/lyrics-common/chart_lyrics_provider.cc:93
+#: src/lyrics-common/chart_lyrics_provider.cc:150
+#: src/lyrics-common/lyrics_ovh_provider.cc:50
 #, c-format
 msgid "Unable to fetch %s"
 msgstr "Tidak boleh dapatkan %s"
 
-#: src/lyricwiki/lyricwiki.cc:227 src/lyricwiki/lyricwiki.cc:253
-#: src/lyricwiki-qt/lyricwiki.cc:232 src/lyricwiki-qt/lyricwiki.cc:258
+#: src/lyrics-common/chart_lyrics_provider.cc:100
+#: src/lyrics-common/chart_lyrics_provider.cc:157
+#: src/lyrics-common/lyrics_ovh_provider.cc:57
 #, c-format
 msgid "Unable to parse %s"
 msgstr "Tidak boleh hurai %s"
 
-#: src/lyricwiki/lyricwiki.cc:259 src/lyricwiki-qt/lyricwiki.cc:264
+#: src/lyrics-common/chart_lyrics_provider.cc:121
+#: src/lyrics-common/chart_lyrics_provider.cc:194
+#: src/lyrics-common/lyrics_ovh_provider.cc:88
 msgid "Looking for lyrics ..."
 msgstr "Mencari lirik ..."
 
-#: src/lyricwiki/lyricwiki.cc:267 src/lyricwiki-qt/lyricwiki.cc:272
-msgid "Missing song metadata"
-msgstr "Data meta lagu hilang"
-
-#: src/lyricwiki/lyricwiki.cc:278 src/lyricwiki-qt/lyricwiki.cc:283
-msgid "Connecting to lyrics.wikia.com ..."
-msgstr "Menyambung ke lyrics.wikia.com ..."
-
-#: src/lyricwiki-qt/lyricwiki.cc:55
-msgid "LyricWiki Plugin (Qt)"
-msgstr "Pemalam LyricWiki (Qt)"
+#: src/lyrics-common/preferences.h:43
+msgid "Nowhere"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:49
+msgid "Artist is truncated at the start, Title -- at the end"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:50
+msgid "Chars to truncate on:"
+msgstr "Aksara dipangkas pada:"
+
+#: src/lyrics-common/preferences.h:54
+msgid "Chars are ORed in RegExp, surrounded by whitespace"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:55
+msgid "Chars to split on:"
+msgstr "Aksara diasing pada:"
+
+#: src/lyrics-common/preferences.h:56
+msgid "Further truncate those on chars"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:62
+msgid "General"
+msgstr "Am"
+
+#: src/lyrics-common/preferences.h:63
+msgid "Split title into artist and title on chars"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:66
+msgid "Sources"
+msgstr ""
 
-#: src/m3u/m3u.cc:32
+#: src/lyrics-common/preferences.h:67
+msgid "Use embedded lyrics (from Lyrics tag)"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:69
+msgid "Fetch lyrics from internet:"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:72
+msgid "Store fetched lyrics in local cache"
+msgstr "Simpan lirik yang diperoleh dalam cache setempat"
+
+#: src/lyrics-common/preferences.h:74
+msgid "Local Storage"
+msgstr "Storan Setempat"
+
+#: src/lyrics-common/preferences.h:75
+msgid "Load lyric files (.lrc) from local storage"
+msgstr "Muat fail lirik (.lrc) dari storan setempat"
+
+#: src/lyrics-common/utils.cc:54 src/ui-common/dialogs-qt.cc:63
+msgid "Error"
+msgstr "Ralat"
+
+#: src/lyrics-common/utils.cc:60
+msgid "Lyrics could not be found."
+msgstr "Lirik tidak ditemui."
+
+#: src/lyrics-common/utils.cc:142
+msgid "Missing title and/or artist."
+msgstr "Tajuk dan/atau artis hilang."
+
+#: src/lyrics-gtk/lyrics-gtk.cc:37 src/lyrics-qt/lyrics-qt.cc:50
+msgid "Lyrics"
+msgstr "Lirik"
+
+#: src/lyrics-gtk/lyrics-gtk.cc:189 src/lyrics-qt/lyrics-qt.cc:171
+msgid "Edit Lyrics ..."
+msgstr ""
+
+#: src/lyrics-gtk/lyrics-gtk.cc:195 src/lyrics-qt/lyrics-qt.cc:178
+msgid "Save Locally"
+msgstr "Simpan secara Setempat"
+
+#: src/lyrics-gtk/lyrics-gtk.cc:201 src/lyrics-qt/lyrics-qt.cc:186
+msgid "Refresh"
+msgstr "Segar Semula"
+
+#: src/m3u/m3u.cc:33
 msgid "M3U Playlists"
 msgstr "Senarai Main M3U"
 
@@ -2409,17 +2554,17 @@
 msgid "Tact Generator"
 msgstr "Penjana Rentak"
 
-#: src/metronom/metronom.cc:147
+#: src/metronom/metronom.cc:145
 #, c-format
 msgid "Tact generator: %d bpm"
 msgstr "Penjana rentak: %d bpm"
 
-#: src/metronom/metronom.cc:149
+#: src/metronom/metronom.cc:147
 #, c-format
 msgid "Tact generator: %d bpm %d/%d"
 msgstr "Penjana rentak: %d bpm %d/%d"
 
-#: src/metronom/metronom.cc:237
+#: src/metronom/metronom.cc:235
 msgid ""
 "A Tact Generator by Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
 "\n"
@@ -2433,11 +2578,11 @@
 "cth. tact://77 untuk main 77 beat per minit\n"
 "atau tact://60*3/4 untuk main 60 bpm dalam tempo 3/4 rentak"
 
-#: src/mixer/mixer.cc:38
+#: src/mixer/mixer.cc:43
 msgid "Channel Mixer"
 msgstr "Pengadun Saluran"
 
-#: src/mixer/mixer.cc:202
+#: src/mixer/mixer.cc:255
 msgid ""
 "Channel Mixer Plugin for Audacious\n"
 "Copyright 2011-2012 John Lindgren and Michał Lipski"
@@ -2445,11 +2590,11 @@
 "Pemalam Pengadun Saluran untuk Audacious\n"
 "Hakcipta 2011-2012 John Lindgren dan Michał Lipski"
 
-#: src/mixer/mixer.cc:206
+#: src/mixer/mixer.cc:259
 msgid "Channel Mixer"
 msgstr "Pengadun Saluran"
 
-#: src/mixer/mixer.cc:207
+#: src/mixer/mixer.cc:260
 msgid "Output channels:"
 msgstr "Saluran output:"
 
@@ -2461,168 +2606,176 @@
 msgid "Error connecting to MMS server"
 msgstr "Ralat menyambung ke pelayan MMS"
 
-#: src/modplug/modplugbmp.h:53
+#: src/modplug/modplugbmp.h:57
 msgid "ModPlug (Module Player)"
 msgstr "ModPlug (Pemain Modul)"
 
-#: src/modplug/plugin_main.cc:53
-msgid "Resolution"
-msgstr "Resolusi"
-
-#: src/modplug/plugin_main.cc:54
-msgid "8-bit"
-msgstr "8-bit"
-
 #: src/modplug/plugin_main.cc:55
-msgid "16-bit"
-msgstr "16-bit"
-
-#: src/modplug/plugin_main.cc:56
 msgid "Channels"
 msgstr "Saluran"
 
-#: src/modplug/plugin_main.cc:60
+#: src/modplug/plugin_main.cc:59
 msgid "Nearest (fastest)"
 msgstr "Terdekat (terpantas)"
 
-#: src/modplug/plugin_main.cc:61
+#: src/modplug/plugin_main.cc:60
 msgid "Linear (fast)"
 msgstr "Linear (pantas)"
 
-#: src/modplug/plugin_main.cc:62
+#: src/modplug/plugin_main.cc:61
 msgid "Spline (good)"
 msgstr "Spline (baik)"
 
-#: src/modplug/plugin_main.cc:63
+#: src/modplug/plugin_main.cc:62
 msgid "Polyphase (best)"
 msgstr "Polifasa (terbaik)"
 
-#: src/modplug/plugin_main.cc:64
+#: src/modplug/plugin_main.cc:63
 msgid "Sample rate"
 msgstr "Kadar sampel"
 
-#: src/modplug/plugin_main.cc:65
+#: src/modplug/plugin_main.cc:64
 msgid "22 kHz"
 msgstr "22 kHz"
 
-#: src/modplug/plugin_main.cc:66
+#: src/modplug/plugin_main.cc:65
 msgid "44 kHz"
 msgstr "44 kHz"
 
-#: src/modplug/plugin_main.cc:67
+#: src/modplug/plugin_main.cc:66
 msgid "48 kHz"
 msgstr "48 kHz"
 
-#: src/modplug/plugin_main.cc:68
+#: src/modplug/plugin_main.cc:67
 msgid "96 kHz"
 msgstr "96 kHz"
 
-#: src/modplug/plugin_main.cc:72 src/modplug/plugin_main.cc:77
-#: src/modplug/plugin_main.cc:82
+#: src/modplug/plugin_main.cc:71 src/modplug/plugin_main.cc:76
+#: src/modplug/plugin_main.cc:81
 msgid "Level:"
 msgstr "Aras:"
 
-#: src/modplug/plugin_main.cc:78
+#: src/modplug/plugin_main.cc:77
 msgid "Cutoff:"
 msgstr "Pangkas:"
 
-#: src/modplug/plugin_main.cc:91
+#: src/modplug/plugin_main.cc:90
 msgid "Reverb"
 msgstr "Reverb"
 
-#: src/modplug/plugin_main.cc:94
+#: src/modplug/plugin_main.cc:93
 msgid "Bass Boost"
 msgstr "Galak Bes"
 
-#: src/modplug/plugin_main.cc:97
+#: src/modplug/plugin_main.cc:96
 msgid "Surround"
 msgstr "Keliling"
 
-#: src/modplug/plugin_main.cc:100
+#: src/modplug/plugin_main.cc:99
 msgid "Preamp"
 msgstr "Praamp"
 
-#: src/modplug/plugin_main.cc:107
+#: src/modplug/plugin_main.cc:106
 msgid "Oversample"
 msgstr "Oversampel"
 
-#: src/modplug/plugin_main.cc:108
+#: src/modplug/plugin_main.cc:107
 msgid "Noise reduction"
 msgstr "Pengurangan hingar"
 
-#: src/modplug/plugin_main.cc:109
+#: src/modplug/plugin_main.cc:108
 msgid "Play Amiga MODs"
 msgstr "Main MOD Amiga"
 
-#: src/modplug/plugin_main.cc:110
+#: src/modplug/plugin_main.cc:109
 msgid "Repeat"
 msgstr "Ulang"
 
-#: src/modplug/plugin_main.cc:111
+#: src/modplug/plugin_main.cc:110
 msgid "Repeat count:"
 msgstr "Kiraan ulang:"
 
-#: src/modplug/plugin_main.cc:112
+#: src/modplug/plugin_main.cc:111
 msgid "To repeat forever, set the repeat count to -1."
 msgstr "Untuk ulang selamanya, tetapkan kiraan ulang menjadi -1."
 
-#: src/modplug/plugin_main.cc:125 src/sid/xs_config.cc:106
+#: src/modplug/plugin_main.cc:124 src/sid/xs_config.cc:106
 msgid "These settings will take effect when Audacious is restarted."
 msgstr "Tetapan ini akan berkesan bila Audacious dimulakan semula."
 
+#: src/moonstone/main_window.cc:72 src/moonstone/main_window.cc:73
+#: src/qtui/main_window.cc:159 src/qtui/main_window.cc:160
+#: src/skins/menus.cc:107 src/skins-qt/menus.cc:98
+msgid "Stop After This Song"
+msgstr "Henti Selepas Lagu Ini"
+
+#: src/moonstone/moonstone.cc:39
+msgid "Moonstone"
+msgstr "Moonstone"
+
+#: src/moonstone/playlist_header.cc:212 src/qtui/playlist_header.cc:258
+msgid "Reset to Defaults"
+msgstr "Tetap Semula ke Lalai"
+
+#: src/moonstone/playlist_model.cc:38 src/qtui/playlist_header.cc:232
+msgid "Now Playing"
+msgstr "Kini Dimainkan"
+
+#: src/moonstone/playlist_selection.cc:66
+#: src/playlist-manager/playlist-manager.cc:201
+#: src/playlist-manager-qt/playlist-manager-qt.cc:190
+msgid "Entries"
+msgstr "Masukan"
+
 #: src/mpg123/mpg123.cc:54
 msgid "MPG123 Plugin"
 msgstr "Pemalam MPG123"
 
-#: src/mpg123/mpg123.cc:83
-msgid "Advanced"
-msgstr "Lanjutan"
-
-#: src/mpg123/mpg123.cc:84
+#: src/mpg123/mpg123.cc:82
 msgid "Use accurate length calculation (slow)"
 msgstr "Guna pengiraan lebih tepat (perlahan)"
 
-#: src/mpg123/mpg123.cc:248
+#: src/mpg123/mpg123.cc:260
 msgid "Surround"
 msgstr "Keliling"
 
-#: src/mpris2/plugin.cc:39
+#: src/mpris2/plugin.cc:40
 msgid "MPRIS 2 Server"
 msgstr "Pelayan MPRIS 2"
 
-#: src/neon/neon.cc:97
+#: src/neon/neon.cc:102
 msgid "Neon HTTP/HTTPS Plugin"
 msgstr "Pemalam Neon HTTP/HTTPS"
 
-#: src/neon/neon.cc:521
+#: src/neon/neon.cc:526
 msgid "Error parsing redirect"
 msgstr "Ralat menghurai arah semula"
 
-#: src/neon/neon.cc:535
+#: src/neon/neon.cc:540
 msgid "Unknown HTTP error"
 msgstr "Ralat HTTP tidak diketahui"
 
-#: src/neon/neon.cc:569
+#: src/neon/neon.cc:614
 msgid "Error parsing URL"
 msgstr "Ralat menghurai URL"
 
-#: src/neon/neon.cc:632
+#: src/neon/neon.cc:687
 msgid "Too many redirects"
 msgstr "Terlalu banyak arah semula"
 
-#: src/notify/event.cc:64
+#: src/notify/event.cc:97
 msgid "Stopped"
 msgstr "Dihentikan"
 
-#: src/notify/event.cc:64
+#: src/notify/event.cc:97
 msgid "Audacious is not playing."
 msgstr "Audacioud tidak dimainkan."
 
-#: src/notify/notify.cc:42
+#: src/notify/notify.cc:39
 msgid "Desktop Notifications"
 msgstr "Pemberitahuan Desktop"
 
-#: src/notify/notify.cc:60
+#: src/notify/notify.cc:57
 msgid ""
 "Desktop Notifications Plugin for Audacious\n"
 "Copyright (C) 2010 Maximilian Bogner\n"
@@ -2658,36 +2811,76 @@
 "Anda seharusnya menerima satu salinan Lesen Awam Am GNU bersama-sama dengan "
 "pengurus skrip Nautilus; jika tidak, rujuk <http://www.gnu.org/licenses/>."
 
-#: src/notify/notify.cc:110
+#: src/notify/notify.cc:104
 msgid "Show playback controls"
 msgstr "Tunjuk kawalan main balik"
 
-#: src/notify/notify.cc:112
+#: src/notify/notify.cc:106
 msgid "Always show notification"
 msgstr "Sentiasa tunjuk pemberitahuan"
 
-#: src/notify/notify.cc:114
+#: src/notify/notify.cc:108
 msgid "Include album name in notification"
 msgstr "Sertakan nama album dalam pemberitahuan"
 
-#: src/notify/osd.cc:58
+#: src/notify/notify.cc:110
+msgid "Custom notification duration:"
+msgstr "Tempoh pemberitahuan suai:"
+
+#: src/notify/osd.cc:74
 msgid "Show"
 msgstr "Tunjuk"
 
-#: src/notify/osd.cc:66 src/qtui/main_window.cc:178
-#: src/qtui/main_window.cc:179 src/skins/menus.cc:88
-msgid "Pause"
-msgstr "Jeda"
+#: src/openmpt/mpt.cc:50
+msgid "OpenMPT (Module Player)"
+msgstr "OpenMPT (Pemain Module)"
 
-#: src/notify/osd.cc:73 src/qtui/main_window.cc:72 src/skins/menus.cc:91
-msgid "Next"
-msgstr "Berikutnya"
+#: src/openmpt/mpt.cc:132
+msgid ""
+"Module player based on libopenmpt\n"
+"\n"
+"Written by: Chris Spiegel <cspiegel@gmail.com>"
+msgstr ""
+
+#: src/openmpt/mpt.cc:151
+msgid "Stereo separation:"
+msgstr ""
+
+#: src/openmpt/mpt.cc:153
+msgid "% (0=mono, 100=default, 200=full)"
+msgstr ""
 
-#: src/oss4/oss.h:93
+#: src/openmpt/mpt.cc:157
+msgid "Interpolation:"
+msgstr "Interpolasi:"
+
+#: src/openmpt/mptwrap.h:51 src/soxr/sox-resampler.cc:189 src/xsf/plugin.cc:437
+msgid "Linear"
+msgstr "Linear"
+
+#: src/openmpt/mptwrap.h:52
+msgid "Cubic"
+msgstr "Kuib"
+
+#: src/openmpt/mptwrap.h:53
+msgid "Windowed sinc"
+msgstr ""
+
+#: src/opus/opus.cc:39
+msgid "Opus Decoder"
+msgstr ""
+
+#: src/opus/opus.cc:336
+msgid ""
+"Opus Decoder Plugin for Audacious\n"
+"Copyright 2022 Thomas Lange"
+msgstr ""
+
+#: src/oss4/oss.h:70
 msgid "OSS4 Output"
 msgstr "Output OSS4"
 
-#: src/oss4/oss.h:95
+#: src/oss4/oss.h:72
 msgid "OSS3 Output"
 msgstr "Output OSS3"
 
@@ -2695,27 +2888,27 @@
 msgid "Default device"
 msgstr "Peranti lalai"
 
-#: src/oss4/plugin.cc:77
+#: src/oss4/plugin.cc:78
 msgid "Audio device:"
 msgstr "Peranti audio:"
 
-#: src/oss4/plugin.cc:80
+#: src/oss4/plugin.cc:81
 msgid "Use alternate device:"
 msgstr "Guna peranti alternatif:"
 
-#: src/oss4/plugin.cc:84
+#: src/oss4/plugin.cc:85
 msgid "Save volume between sessions."
 msgstr "Simpan volum diantara sesi."
 
-#: src/oss4/plugin.cc:86
+#: src/oss4/plugin.cc:87
 msgid "Enable format conversions made by the OSS software."
 msgstr "Benarkan penukaran format yang dibuat oleh perisian OSS."
 
-#: src/oss4/plugin.cc:88
+#: src/oss4/plugin.cc:89
 msgid "Enable exclusive mode to prevent virtual mixing."
 msgstr "Benarkan mod ekslusif untuk menghindari pengadunan maya."
 
-#: src/oss4/plugin.cc:100
+#: src/oss4/plugin.cc:101
 msgid ""
 "OSS4 Output Plugin for Audacious\n"
 "Copyright 2010-2012 Michał Lipski\n"
@@ -2729,19 +2922,35 @@
 "Terima kasih buat individu di #audacious, terutamanya Tony Vroon dan John "
 "Lindgren serta bekas pengarang pemalam OSS."
 
-#: src/playlist-manager/playlist-manager.cc:37
+#: src/pipewire/pipewire.cc:44
+msgid "PipeWire Output"
+msgstr ""
+
+#: src/pipewire/pipewire.cc:118
+msgid ""
+"PipeWire Output Plugin for Audacious\n"
+"Copyright 2022 Thomas Lange\n"
+"\n"
+"Based on the PipeWire Output Plugin for Qmmp\n"
+"Copyright 2021 Ilya Kotov"
+msgstr ""
+
+#: src/pipewire/pipewire.cc:408 src/skins/menus.cc:88 src/skins-qt/menus.cc:79
+msgid "Playback"
+msgstr "Main Balik"
+
+#: src/playlist-manager/playlist-manager.cc:38
+#: src/playlist-manager-qt/playlist-manager-qt.cc:42
 msgid "Playlist Manager"
 msgstr "Pengurus Senarai Main"
 
-#: src/playlist-manager/playlist-manager.cc:226
-msgid "Entries"
-msgstr "Masukan"
-
-#: src/playlist-manager/playlist-manager.cc:245
+#: src/playlist-manager/playlist-manager.cc:221
+#: src/playlist-manager-qt/playlist-manager-qt.cc:356
 msgid "_Remove"
 msgstr "_Buang"
 
-#: src/playlist-manager/playlist-manager.cc:246
+#: src/playlist-manager/playlist-manager.cc:222
+#: src/playlist-manager-qt/playlist-manager-qt.cc:351
 msgid "Ren_ame"
 msgstr "N_ama Semula"
 
@@ -2749,55 +2958,68 @@
 msgid "PLS Playlists"
 msgstr "Senarai Main PLS"
 
-#: src/psf/plugin.cc:45
+#: src/psf/plugin.cc:53
 msgid "OpenPSF PSF1/PSF2 Decoder"
 msgstr "Penyahkod OpenPSF PSF1/PSF2"
 
-#: src/pulse_audio/pulse_audio.cc:38
+#: src/psf/plugin.cc:270
+msgid "OpenPSF Configuration"
+msgstr ""
+
+#: src/psf/plugin.cc:271 src/xsf/plugin.cc:444
+msgid "Ignore length from file"
+msgstr "Abai panjang dari fail"
+
+#: src/pulse/pulse_audio.cc:42
 msgid "PulseAudio Output"
 msgstr "Output PulseAudio"
 
-#: src/pulse_audio/pulse_audio.cc:611
+#: src/pulse/pulse_audio.cc:84
+msgid "Context name:"
+msgstr "Nama konteks:"
+
+#: src/pulse/pulse_audio.cc:86
+msgid "Stream name:"
+msgstr "Nama stream:"
+
+#: src/pulse/pulse_audio.cc:596
 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."
+"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 ""
 "Pemalam Output Audacious PulseAudio\n"
 "\n"
-"Program ini adalah perisian bebas; anda boleh mengedarkannya dan/atau\n"
-"mengubahsuainya dibawah terma Pelesenan Awam Am GNU yang\n"
-"diterbitkan oleh Free Software Foundation; sama ada versi 2 dari lesen, \n"
-"atau (mengikut pilihan anda) mana-mana versi terkini\n"
-"\n"
-"Program ini diedarkan dengan harapan ianya akan berguna, TANPA \n"
-"SEBARANG JAMINAN; termasuk juga KESESUAIAN UNTUK DIPASARKAN,\n"
-"JAMINAN KUALITI, atau JAMINAN ATAS APA JUA SEBAB. Sila lihat GNU\n"
-"General Public License untuk maklumat lanjut.\n"
-"\n"
-"Anda seharusnya menerima satu salinan Lesen Awam Am GNU \n"
-"bersama-sama dengan Gwibber; jika tidak, laporkannya ke Free Software\n"
-"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
-"USA."
+"Program ini adalah perisian bebas; anda boleh mengedarkannya dan/atau "
+"mengubahsuainya dibawah terma Pelesenan Awam Am GNU yang diterbitkan oleh "
+"Free Software Foundation; sama ada versi 2 dari lesen, atau (mengikut "
+"pilihan anda) mana-mana versi terkini\n"
+"\n"
+"Program ini diedarkan dengan harapan ianya akan berguna, TANPA SEBARANG "
+"JAMINAN; termasuk juga KESESUAIAN UNTUK DIPASARKAN atau JAMINAN ATAS APA JUA "
+"SEBAB. Sila lihat GNU General Public License untuk maklumat lanjut.\n"
+"\n"
+"Anda seharusnya menerima satu salinan Lesen Awam Am GNU bersama-sama program "
+"ini; jika tidak, laporkannya ke Free Software Foundation, Inc., 51 Franklin "
+"Street, Fifth Floor, Boston, MA 02110-1301, USA."
 
-#: src/qtaudio/qtaudio.cc:49
+#: src/qtaudio/qtaudio.cc:53
 msgid "QtMultimedia Output"
 msgstr "Output QtMultimedia"
 
-#: src/qtaudio/qtaudio.cc:77
+#: src/qtaudio/qtaudio.cc:84
 msgid ""
 "QtMultimedia Audio Output Plugin for Audacious\n"
 "Copyright 2014 William Pitcock\n"
@@ -2811,50 +3033,87 @@
 "Berdasarkan pada Pemalam Output SDL untuk Audacious\n"
 "Hakcipta 2010 John Lindgren"
 
-#: src/qtui/dialog_windows.cc:31
-msgid "Working ..."
-msgstr "Berfungsi ..."
+#: src/qtglspectrum/gl-spectrum.cc:41
+msgid ""
+"OpenGL Spectrum Analyzer for Audacious\n"
+"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
+"Copyright 2014, 2020 Ariadne Conill\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/qtui/filter_input.cc:44 src/skins/ui_playlist.cc:221
-msgid "Search"
-msgstr "Gelintar"
+#: src/qthotkey/gui.cc:177
+msgid "Press a key combination inside a text field."
+msgstr ""
 
-#: src/qtui/main_window_actions.cc:94
+#: src/qthotkey/plugin.cc:105
+msgid ""
+"Global Hotkey Plugin\n"
+"Control the player with global key combinations or multimedia keys.\n"
+"\n"
+"Copyright (C) 2020 i.Dark_Templar <darktemplar@dark-templar-archives.net>\n"
+"Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n"
+"\n"
+"Contributors 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/qtui/menus.cc:109
 msgid "_Open Folder ..."
 msgstr "_Buka Folder ..."
 
-#: src/qtui/main_window_actions.cc:96
+#: src/qtui/menus.cc:115
 msgid "_Add Folder ..."
 msgstr "_Tambah Folder ..."
 
-#: src/qtui/main_window_actions.cc:101
+#: src/qtui/menus.cc:128
 msgid "_Log Inspector ..."
 msgstr "Pemeriksa _Log ..."
 
-#: src/qtui/main_window.cc:64
-msgid "Open Files"
-msgstr "Buka Fail"
+#: src/qtui/menus.cc:220
+msgid "_Find ..."
+msgstr "_Cari ..."
 
-#: src/qtui/main_window.cc:66
-msgid "Add Files"
-msgstr "Tambah Fail"
+#: src/qtui/menus.cc:256 src/skins/menus.cc:80 src/skins-qt/menus.cc:70
+msgid "Audio Settings ..."
+msgstr "Tetapan Audio ..."
 
-#: src/qtui/main_window.cc:71 src/skins/menus.cc:90
-msgid "Previous"
-msgstr "Terdahulu"
+#: src/qtui/playlist_model.cc:188
+msgid "Q#"
+msgstr "Q#"
 
-#: src/qtui/main_window.cc:77 src/skins/menus.cc:82
-msgid "Repeat"
-msgstr "Ulang"
+#: src/qtui/playlist_model.cc:190
+msgid "T#"
+msgstr "T#"
 
-#: src/qtui/main_window.cc:79 src/skins/menus.cc:83
-msgid "Shuffle"
-msgstr "Kocok"
+#: src/qtui/playlist_model.cc:192
+msgid "C#"
+msgstr ""
+
+#: src/qtui/playlist_model.cc:194
+msgid "D#"
+msgstr ""
 
-#: src/qtui/qtui.cc:42
+#: src/qtui/qtui.cc:40
 msgid "Qt Interface"
 msgstr "Antaramuka Qt"
 
+#: src/qtui/search_bar.cc:46
+msgid "Search playlist"
+msgstr "Gelintar senarai main"
+
+#: src/qtui/settings.cc:79
+msgid "Use bold font for column headers"
+msgstr "Guna fon tebal untuk pengepala lajur"
+
 #: src/resample/resample.cc:43
 msgid "Sample Rate Converter"
 msgstr "Penukar Kadar Sampel"
@@ -2895,7 +3154,7 @@
 msgid "Method:"
 msgstr "Kaedah:"
 
-#: src/resample/resample.cc:199 src/sox-resampler/sox-resampler.cc:161
+#: src/resample/resample.cc:199 src/soxr/sox-resampler.cc:203
 msgid "Rate:"
 msgstr "Kadar:"
 
@@ -2947,61 +3206,52 @@
 msgid "192 kHz:"
 msgstr "192 kHz:"
 
-#: src/scrobbler2/config_window.cc:41
-#, c-format
-msgid "OK. Scrobbling for user: %s"
-msgstr "OK. Scrobble untuk pengguna: %s"
-
-#: src/scrobbler2/config_window.cc:54
-msgid "Permission Denied"
-msgstr "Keizinan Dinafikan"
-
-#: src/scrobbler2/config_window.cc:56
-msgid "Access the following link to allow Audacious to scrobble your plays:"
-msgstr "Capai pautan berikut untuk membolehkan Audacious scrobble lagu anda:"
+#: src/scrobbler2/config_window.cc:29
+msgid "Checking Last.fm access ..."
+msgstr "Memeriksa capaian Last.fm ..."
 
-#: src/scrobbler2/config_window.cc:66
-msgid "Keep this window open and click 'Check Permission' again.\n"
-msgstr "Kekalkan tetingkap ini dibuka dan klik 'Semak Keizinan' lagi.\n"
-
-#: src/scrobbler2/config_window.cc:69 src/scrobbler2/config_window.cc:80
+#: src/scrobbler2/config_window.cc:35
 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."
+"Your scrobbles are being saved on your computer temporarily. They will be "
+"submitted as soon as Audacious is allowed access."
 msgstr ""
-"Jangan risau. Scrobble anda disimpan dalam komputer anda.\n"
-"Ia akan diserah sebaik sahaja Audacious dibenarkan membuatnya."
+"Scrobble anda disimpan dalam komputer anda buat sementara. Ia akan diserah "
+"sebaik sahaja Audacious dibenarkan mencapainya."
 
-#: src/scrobbler2/config_window.cc:77
-msgid "Network Problem."
-msgstr "Masalah Rangkaian."
+#: src/scrobbler2/config_window.cc:41
+#, c-format
+msgid "Permission granted. Scrobbling for user %s."
+msgstr "Keizinan diberi. Scrobble untuk pengguna %s."
 
-#: src/scrobbler2/config_window.cc:78
-msgid "There was a problem contacting Last.fm. Please try again later."
-msgstr "Terdapat masalah menghubungi Last.fm. Sila cuba lagi kemudian."
+#: src/scrobbler2/config_window.cc:44
+msgid ""
+"Permission denied. Open the following URL in a browser, allow Audacious "
+"access to your account, and then click 'Check Permission' again:"
+msgstr ""
+"Keizinan dinafikan. Buka URL berikut di dalam pelayar, yang mana Audacious "
+"dapat mencapai akaun anda, kemudian klik 'Semak Keizinan' sekali lagi: "
 
-#: src/scrobbler2/config_window.cc:110
-msgid "Checking..."
-msgstr "Memeriksa..."
+#: src/scrobbler2/config_window.cc:53
+msgid "There was a problem contacting Last.fm."
+msgstr "Terdapat masalah menghubungi Last.fm."
 
-#: src/scrobbler2/config_window.cc:176
-msgid "C_heck Permission"
-msgstr "S_emak Keizinan"
+#: src/scrobbler2/config_window.cc:92
+msgid "Check Permission"
+msgstr "Periksa Keizinan"
 
-#: src/scrobbler2/config_window.cc:177
-msgid "_Revoke Permission"
-msgstr "_Batalkan Keizinan"
+#: src/scrobbler2/config_window.cc:93
+msgid "Revoke Permission"
+msgstr "Batalkan Keizinan"
 
-#: src/scrobbler2/config_window.cc:220
-msgid ""
-"You need to allow Audacious to scrobble tracks to your Last.fm account.\n"
-msgstr "Anda perlu benarkan Audacious scrobble trek ke akaun Last.fm anda.\n"
+#: src/scrobbler2/config_window.cc:97
+msgid "You need to allow Audacious to scrobble tracks to your Last.fm account."
+msgstr "Anda perlu benarkan Audacious scrobble trek ke akaun Last.fm anda."
 
 #: src/scrobbler2/scrobbler.cc:29
 msgid "Scrobbler 2.0"
 msgstr "Scrobbler 2.0"
 
-#: src/scrobbler2/scrobbler.cc:224
+#: src/scrobbler2/scrobbler.cc:200
 msgid ""
 "The Scrobbler plugin could not be started.\n"
 "There might be a problem with your installation."
@@ -3009,36 +3259,21 @@
 "Pemalam Scrobbler tidak dapat dimulakan.\n"
 "Terdapat masalah dengan pemasangan anda."
 
-#: src/scrobbler2/scrobbler.cc:289
+#: src/scrobbler2/scrobbler.cc:245
 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 ""
-"Pemalam Audacious Scrobbler 2.0 oleh Pitxyoki,\n"
-"\n"
-"hakcipta © 2012-2013 Luís M. Picciochi Oliveira <Pitxyoki@Gmail.com>\n"
-"\n"
-"Terima kasih buat John Lindgren kerana membantu saya memulakan projek ini.\n"
-"\n"
-
-#: src/scrobbler2/scrobbler_communication.cc:642
-msgid ""
-"Audacious is now using an improved version of the Last.fm Scrobbler.\n"
-"Please check the Preferences for the Scrobbler plugin."
+"project."
 msgstr ""
-"Audacious kini menggunakan versi dipertingkat Scrobbler Last.fm.\n"
-"Sila semak Keutamaan untuk pemalam Scrobbler."
 
-#: src/sdlout/sdlout.cc:48
+#: src/sdlout/sdlout.cc:43
 msgid "SDL Output"
 msgstr "Output SDL"
 
-#: src/sdlout/sdlout.cc:77
+#: src/sdlout/sdlout.cc:72
 msgid ""
 "SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
@@ -3046,53 +3281,42 @@
 "Pemalam Output SDL untuk Audacious\n"
 "Hakcipta 2010 John Lindgren"
 
-#: src/search-tool/search-tool.cc:116 src/search-tool/search-tool.cc:124
+#: src/search-tool/library.cc:35 src/search-tool/library.cc:46
+#: src/search-tool-qt/library.cc:35 src/search-tool-qt/library.cc:46
 msgid "Library"
 msgstr "Pustaka"
 
-#: src/search-tool/search-tool.cc:394
-#, c-format
-msgid "%d result"
-msgid_plural "%d results"
-msgstr0 "%d keputusan"
-
-#: src/search-tool/search-tool.cc:400
-#, c-format
-msgid "(%d hidden)"
-msgid_plural "(%d hidden)"
-msgstr0 "(%d tersembunyi)"
-
-#: src/search-tool/search-tool.cc:594
+#: src/search-tool-qt/search-model.cc:44 src/search-tool/search-tool.cc:287
 #, c-format
 msgid "%d song"
 msgid_plural "%d songs"
 msgstr0 "%d lagu"
 
-#: src/search-tool/search-tool.cc:601
+#: src/search-tool-qt/search-model.cc:53 src/search-tool/search-tool.cc:294
 msgid "of this genre"
 msgstr "dari genre ini"
 
-#: src/search-tool/search-tool.cc:607
+#: src/search-tool-qt/search-model.h:47 src/search-tool/search-model.h:45
 msgid "on"
 msgstr "hidup"
 
-#: src/search-tool/search-tool.cc:607
+#: src/search-tool-qt/search-model.h:47 src/search-tool/search-model.h:45
 msgid "by"
 msgstr "oleh"
 
-#: src/search-tool/search-tool.cc:643
-msgid "_Create Playlist"
-msgstr "_Cipta Senarai Main"
-
-#: src/search-tool/search-tool.cc:645
-msgid "_Add to Playlist"
-msgstr "T_ambah ke Senarai Main"
+#: src/search-tool-qt/search-tool-qt.cc:165 src/search-tool/search-tool.cc:74
+msgid "Number of results to show:"
+msgstr "Bilangan keputusan ditunjukkan:"
+
+#: src/search-tool-qt/search-tool-qt.cc:168 src/search-tool/search-tool.cc:77
+msgid "Rescan library at startup"
+msgstr "Imbas semula pustaka ketika permulaan"
+
+#: src/search-tool-qt/search-tool-qt.cc:170
+msgid "Monitor library for changes"
+msgstr "Pantau pustaka jika ada perubahan"
 
-#: src/search-tool/search-tool.cc:684
-msgid "Search library"
-msgstr "Gelintar pustaka"
-
-#: src/search-tool/search-tool.cc:688
+#: src/search-tool-qt/search-tool-qt.cc:193 src/search-tool/search-tool.cc:450
 msgid ""
 "To import your music library into Audacious, choose a folder and then click "
 "the \"refresh\" icon."
@@ -3100,22 +3324,42 @@
 "Untuk mengimport pustaka muzik anda ke dalam Audacious, pilih satu folder "
 "dan kemudian klik pada ikon \"segar semula\"."
 
-#: src/search-tool/search-tool.cc:696
+#: src/search-tool-qt/search-tool-qt.cc:195 src/search-tool/search-tool.cc:459
 msgid "Please wait ..."
 msgstr "Tunggu sebentar ..."
 
-#: src/search-tool/search-tool.cc:723
+#: src/search-tool-qt/search-tool-qt.cc:197 src/search-tool/search-tool.cc:487
 msgid "Choose Folder"
 msgstr "Pilih Folder"
 
+#: src/search-tool-qt/search-tool-qt.cc:201 src/search-tool/search-tool.cc:445
+msgid "Search library"
+msgstr "Gelintar pustaka"
+
+#: src/search-tool-qt/search-tool-qt.cc:327 src/search-tool/search-tool.cc:156
+#, c-format
+msgid "%d of %d result shown"
+msgid_plural "%d of %d results shown"
+msgstr0 "%d dari %d keputusan ditunjukkan"
+
+#: src/search-tool-qt/search-tool-qt.cc:331 src/search-tool/search-tool.cc:160
+#, c-format
+msgid "%d result"
+msgid_plural "%d results"
+msgstr0 "%d keputusan"
+
+#: src/search-tool-qt/search-tool-qt.cc:501 src/search-tool/search-tool.cc:341
+msgid "_Create Playlist"
+msgstr "_Cipta Senarai Main"
+
+#: src/search-tool-qt/search-tool-qt.cc:503 src/search-tool/search-tool.cc:343
+msgid "_Add to Playlist"
+msgstr "T_ambah ke Senarai Main"
+
 #: src/sid/xmms-sid.cc:43
 msgid "SID Player"
 msgstr "Pemain SID"
 
-#: src/sid/xs_config.cc:61
-msgid "Output"
-msgstr "Output"
-
 #: src/sid/xs_config.cc:62
 msgid "Channels:"
 msgstr "Saluran:"
@@ -3196,741 +3440,684 @@
 msgid "Threshold:"
 msgstr "Ambang:"
 
-#: src/silence-removal/silence-removal.cc:70
-msgid "dB"
-msgstr "dB"
+#: src/skins/actions.cc:45 src/skins-qt/actions.cc:43
+msgid "Repeat points cleared."
+msgstr "Ulang titik dikosongkan."
+
+#: src/skins/actions.cc:60 src/skins-qt/actions.cc:58
+msgid "Repeat point A set."
+msgstr "Ulang titik A ditetapkan."
+
+#: src/skins/actions.cc:65 src/skins-qt/actions.cc:63
+msgid "Repeat point B set."
+msgstr "Ulang titik B ditetapkan"
+
+#: src/skins/equalizer.cc:223 src/skins-qt/equalizer.cc:223
+msgid "Preamp"
+msgstr "Praamp"
+
+#: src/skins/equalizer.cc:227 src/skins-qt/equalizer.cc:227
+msgid "31 Hz"
+msgstr "31 Hz"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "63 Hz"
+msgstr "63 Hz"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "125 Hz"
+msgstr "125 Hz"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "250 Hz"
+msgstr "250 Hz"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "500 Hz"
+msgstr "500 Hz"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "1 kHz"
+msgstr "1 kHz"
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "2 kHz"
+msgstr "2 kHz"
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "4 kHz"
+msgstr "4 kHz"
 
-#: src/skins/menus.cc:64
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "8 kHz"
+msgstr "8 kHz"
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "16 kHz"
+msgstr "16 kHz"
+
+#: src/skins/equalizer.cc:270 src/skins-qt/equalizer.cc:270
+msgid "Audacious Equalizer"
+msgstr "Penyama Audacious"
+
+#: src/skins/main.cc:459 src/skins-qt/main.cc:442
+msgid "Recording on"
+msgstr "Rakaman hidup"
+
+#: src/skins/main.cc:461 src/skins-qt/main.cc:444
+msgid "Recording off"
+msgstr "Rakaman mati"
+
+#: src/skins/main.cc:754 src/skins-qt/main.cc:701
+#, c-format
+msgid "Seek to %d:%-2.2d / %d:%-2.2d"
+msgstr "Jangkau ke %d:%-2.2d / %d:%-2.2d"
+
+#: src/skins/main.cc:771 src/skins-qt/main.cc:718
+#, c-format
+msgid "Volume: %d%%"
+msgstr "Volum: %d%%"
+
+#: src/skins/main.cc:784 src/skins-qt/main.cc:731
+#, c-format
+msgid "Balance: %d%% left"
+msgstr "Imbangan: %d%% kiri"
+
+#: src/skins/main.cc:786 src/skins-qt/main.cc:733
+msgid "Balance: center"
+msgstr "Imbangan: tengah"
+
+#: src/skins/main.cc:788 src/skins-qt/main.cc:735
+#, c-format
+msgid "Balance: %d%% right"
+msgstr "Imbangan: %d%% kanan"
+
+#: src/skins/main.cc:880 src/skins-qt/main.cc:827
+msgid "Options Menu"
+msgstr "Menu Pilihan"
+
+#: src/skins/main.cc:884 src/skins-qt/main.cc:831
+msgid "Disable 'Always On Top'"
+msgstr "Lumpuhkan 'Sentiasa Di Atas'"
+
+#: src/skins/main.cc:886 src/skins-qt/main.cc:833
+msgid "Enable 'Always On Top'"
+msgstr "Benarkan 'Sentiasa Di Atas'"
+
+#: src/skins/main.cc:889 src/skins-qt/main.cc:836
+msgid "File Info Box"
+msgstr "Kotak Maklumat Fail"
+
+#: src/skins/main.cc:892 src/skins/menus.cc:149 src/skins-qt/main.cc:839
+#: src/skins-qt/menus.cc:142
+msgid "Double Size"
+msgstr "Saiz Dua Kali Ganda"
+
+#: src/skins/main.cc:895 src/skins-qt/main.cc:842
+msgid "Visualizations"
+msgstr "Pengvisualan"
+
+#: src/skins/menus.cc:74 src/skins-qt/menus.cc:64
+msgid "Volume Up"
+msgstr "Volum Naik"
+
+#: src/skins/menus.cc:75 src/skins-qt/menus.cc:65
+msgid "Volume Down"
+msgstr "Volum Turun"
+
+#: src/skins/menus.cc:77 src/skins-qt/menus.cc:67
+msgid "Effects ..."
+msgstr "Kesan ..."
+
+#: src/skins/menus.cc:84 src/skins-qt/menus.cc:74
 msgid "Open Files ..."
 msgstr "Buka Fail ..."
 
-#: src/skins/menus.cc:65
+#: src/skins/menus.cc:85 src/skins-qt/menus.cc:76
 msgid "Open URL ..."
 msgstr "Buka URL ..."
 
-#: src/skins/menus.cc:66
-msgid "Search Library"
-msgstr "Gelintar Pustaka"
-
-#: src/skins/menus.cc:68
-msgid "Playback"
-msgstr "Main Balik"
-
-#: src/skins/menus.cc:69
+#: src/skins/menus.cc:89 src/skins-qt/menus.cc:80
 msgid "Playlist"
 msgstr "Senarai Main"
 
-#: src/skins/menus.cc:70
+#: src/skins/menus.cc:90 src/skins-qt/menus.cc:81
+msgid "Output"
+msgstr "Output"
+
+#: src/skins/menus.cc:91 src/skins-qt/menus.cc:82
 msgid "View"
 msgstr "Lihat"
 
-#: src/skins/menus.cc:72 src/skins/menus.cc:136 src/skins/menus.cc:149
-#: src/skins/menus.cc:214
+#: src/skins/menus.cc:93 src/skins/menus.cc:161 src/skins/menus.cc:174
+#: src/skins/menus.cc:245 src/skins-qt/menus.cc:84 src/skins-qt/menus.cc:156
+#: src/skins-qt/menus.cc:170 src/skins-qt/menus.cc:241
 msgid "Services"
 msgstr "Perkhidmatan"
 
-#: src/skins/menus.cc:74
+#: src/skins/menus.cc:95 src/skins-qt/menus.cc:86
 msgid "About ..."
 msgstr "Perihal ..."
 
-#: src/skins/menus.cc:75
+#: src/skins/menus.cc:96 src/skins-qt/menus.cc:87
 msgid "Settings ..."
 msgstr "Tetapan ..."
 
-#: src/skins/menus.cc:76
+#: src/skins/menus.cc:97 src/skins-qt/menus.cc:88
 msgid "Quit"
 msgstr "Keluar"
 
-#: src/skins/menus.cc:80 src/skins/menus.cc:206
+#: src/skins/menus.cc:101 src/skins/menus.cc:235 src/skins-qt/menus.cc:92
+#: src/skins-qt/menus.cc:231
 msgid "Song Info ..."
 msgstr "Maklumat Lagu ..."
 
-#: src/skins/menus.cc:84
+#: src/skins/menus.cc:105 src/skins-qt/menus.cc:96
+msgid "Shuffle by Album"
+msgstr "Kocok mengikut Album"
+
+#: src/skins/menus.cc:106 src/skins-qt/menus.cc:97
 msgid "No Playlist Advance"
 msgstr "Tiada Senarai Main Pendahuluan"
 
-#: src/skins/menus.cc:85
-msgid "Stop After This Song"
-msgstr "Henti Selepas Lagu Ini"
-
-#: src/skins/menus.cc:93
+#: src/skins/menus.cc:117 src/skins-qt/menus.cc:108
 msgid "Set A-B Repeat"
 msgstr "Tetapkan Ulang A-B"
 
-#: src/skins/menus.cc:94
+#: src/skins/menus.cc:118 src/skins-qt/menus.cc:109
 msgid "Clear A-B Repeat"
 msgstr "Kosongkan Ulang A-B"
 
-#: src/skins/menus.cc:96
+#: src/skins/menus.cc:120 src/skins-qt/menus.cc:111
 msgid "Jump to Song ..."
 msgstr "Lompat ke Lagu ..."
 
-#: src/skins/menus.cc:97
+#: src/skins/menus.cc:121 src/skins-qt/menus.cc:113
 msgid "Jump to Time ..."
 msgstr "Lompat ke Masa ..."
 
-#: src/skins/menus.cc:101
+#: src/skins/menus.cc:125 src/skins-qt/menus.cc:118
 msgid "Play/Resume"
 msgstr "Main/Sambung Semula"
 
-#: src/skins/menus.cc:103
+#: src/skins/menus.cc:127 src/skins-qt/menus.cc:120
 msgid "New Playlist"
 msgstr "Senarai Main Baharu"
 
-#: src/skins/menus.cc:104
+#: src/skins/menus.cc:128 src/skins-qt/menus.cc:121
 msgid "Rename Playlist ..."
 msgstr "Nama Semula Senarai Main ..."
 
-#: src/skins/menus.cc:105
+#: src/skins/menus.cc:129 src/skins-qt/menus.cc:122
 msgid "Remove Playlist"
 msgstr "Buang Senarai Main"
 
-#: src/skins/menus.cc:107
+#: src/skins/menus.cc:131 src/skins-qt/menus.cc:124
 msgid "Previous Playlist"
 msgstr "Senarai Main Terdahulu"
 
-#: src/skins/menus.cc:108
+#: src/skins/menus.cc:132 src/skins-qt/menus.cc:125
 msgid "Next Playlist"
 msgstr "Senarai Main Berikutnya"
 
-#: src/skins/menus.cc:110
+#: src/skins/menus.cc:134 src/skins-qt/menus.cc:127
 msgid "Import Playlist ..."
 msgstr "Import Senarai Main ..."
 
-#: src/skins/menus.cc:111
+#: src/skins/menus.cc:135 src/skins-qt/menus.cc:128
 msgid "Export Playlist ..."
 msgstr "Eksport Senarai Main ..."
 
-#: src/skins/menus.cc:113
+#: src/skins/menus.cc:137 src/skins-qt/menus.cc:130
 msgid "Playlist Manager ..."
 msgstr "Pengurus Senarai Main ..."
 
-#: src/skins/menus.cc:114
+#: src/skins/menus.cc:138 src/skins-qt/menus.cc:131
 msgid "Queue Manager ..."
 msgstr "Pengurus Baris Gilir ..."
 
-#: src/skins/menus.cc:116
+#: src/skins/menus.cc:140 src/skins-qt/menus.cc:133
 msgid "Refresh Playlist"
 msgstr "Segar Semula Senarai Main"
 
-#: src/skins/menus.cc:120
+#: src/skins/menus.cc:144 src/skins-qt/menus.cc:137
 msgid "Show Playlist Editor"
 msgstr "Tunjuk Penyunting Senarai Main"
 
-#: src/skins/menus.cc:121
+#: src/skins/menus.cc:145 src/skins-qt/menus.cc:138
 msgid "Show Equalizer"
 msgstr "Tunjuk Penyama"
 
-#: src/skins/menus.cc:123
+#: src/skins/menus.cc:147 src/skins-qt/menus.cc:140
 msgid "Show Remaining Time"
 msgstr "Tunjuk Masa Berbaki"
 
-#: src/skins/menus.cc:125
+#: src/skins/menus.cc:150 src/skins-qt/menus.cc:143
 msgid "Always on Top"
 msgstr "Sentiasa di Atas"
 
-#: src/skins/menus.cc:126
+#: src/skins/menus.cc:151 src/skins-qt/menus.cc:145
 msgid "On All Workspaces"
 msgstr "Pada Semua Ruang Kerja"
 
-#: src/skins/menus.cc:128
+#: src/skins/menus.cc:153 src/skins-qt/menus.cc:148
 msgid "Roll Up Player"
 msgstr "Gulung Pemain"
 
-#: src/skins/menus.cc:129
+#: src/skins/menus.cc:154 src/skins-qt/menus.cc:149
 msgid "Roll Up Playlist Editor"
 msgstr "Gulung Penyunting Senarai Main"
 
-#: src/skins/menus.cc:130
+#: src/skins/menus.cc:155 src/skins-qt/menus.cc:150
 msgid "Roll Up Equalizer"
 msgstr "Gulung Penyama"
 
-#: src/skins/menus.cc:132 src/skins/ui_main.cc:854
-msgid "Double Size"
-msgstr "Saiz Dua Kali Ganda"
-
-#: src/skins/menus.cc:138
+#: src/skins/menus.cc:163 src/skins-qt/menus.cc:158
 msgid "Add URL ..."
 msgstr "Tambah URL ..."
 
-#: src/skins/menus.cc:139
+#: src/skins/menus.cc:164 src/skins-qt/menus.cc:160
 msgid "Add Files ..."
 msgstr "Tambah Fail ..."
 
-#: src/skins/menus.cc:143 src/skins/menus.cc:171 src/skins/menus.cc:185
+#: src/skins/menus.cc:168 src/skins/menus.cc:196 src/skins/menus.cc:212
+#: src/skins-qt/menus.cc:164 src/skins-qt/menus.cc:192
+#: src/skins-qt/menus.cc:208
 msgid "By Title"
 msgstr "Mengikut Tajuk"
 
-#: src/skins/menus.cc:144 src/skins/menus.cc:178 src/skins/menus.cc:192
+#: src/skins/menus.cc:169 src/skins/menus.cc:203 src/skins/menus.cc:219
+#: src/skins-qt/menus.cc:165 src/skins-qt/menus.cc:199
+#: src/skins-qt/menus.cc:215
 msgid "By File Name"
 msgstr "Mengikut Nama Fail"
 
-#: src/skins/menus.cc:145 src/skins/menus.cc:179 src/skins/menus.cc:193
+#: src/skins/menus.cc:170 src/skins/menus.cc:204 src/skins/menus.cc:220
+#: src/skins-qt/menus.cc:166 src/skins-qt/menus.cc:200
+#: src/skins-qt/menus.cc:216
 msgid "By File Path"
 msgstr "Mengikut Laluan Fail"
 
-#: src/skins/menus.cc:151
+#: src/skins/menus.cc:176 src/skins-qt/menus.cc:172
 msgid "Remove All"
 msgstr "Buang Semua"
 
-#: src/skins/menus.cc:152
+#: src/skins/menus.cc:177 src/skins-qt/menus.cc:173
 msgid "Clear Queue"
 msgstr "Kosongkan Baris Gilir"
 
-#: src/skins/menus.cc:154
+#: src/skins/menus.cc:179 src/skins-qt/menus.cc:175
 msgid "Remove Unavailable Files"
 msgstr "Buang Fail Tidak Tersedia"
 
-#: src/skins/menus.cc:155
+#: src/skins/menus.cc:180 src/skins-qt/menus.cc:176
 msgid "Remove Duplicates"
 msgstr "Buang Pendua"
 
-#: src/skins/menus.cc:157
+#: src/skins/menus.cc:182 src/skins-qt/menus.cc:178
 msgid "Remove Unselected"
 msgstr "Buang Dinyahpilih"
 
-#: src/skins/menus.cc:158
+#: src/skins/menus.cc:183 src/skins-qt/menus.cc:179
 msgid "Remove Selected"
 msgstr "Buang Terpilih"
 
-#: src/skins/menus.cc:162
+#: src/skins/menus.cc:187 src/skins-qt/menus.cc:183
 msgid "Search and Select"
 msgstr "Gelintar dan Pilih"
 
-#: src/skins/menus.cc:164
+#: src/skins/menus.cc:189 src/skins-qt/menus.cc:185
 msgid "Invert Selection"
 msgstr "Songsangkan Pemilihan"
 
-#: src/skins/menus.cc:165
+#: src/skins/menus.cc:190 src/skins-qt/menus.cc:186
 msgid "Select None"
 msgstr "Pilih Tiada"
 
-#: src/skins/menus.cc:166
+#: src/skins/menus.cc:191 src/skins-qt/menus.cc:187
 msgid "Select All"
 msgstr "Pilih Semua"
 
-#: src/skins/menus.cc:170 src/skins/menus.cc:184
+#: src/skins/menus.cc:195 src/skins/menus.cc:211 src/skins-qt/menus.cc:191
+#: src/skins-qt/menus.cc:207
 msgid "By Track Number"
 msgstr "Mengikut Nombor Trek"
 
-#: src/skins/menus.cc:172 src/skins/menus.cc:186
+#: src/skins/menus.cc:197 src/skins/menus.cc:213 src/skins-qt/menus.cc:193
+#: src/skins-qt/menus.cc:209
 msgid "By Artist"
 msgstr "Mengikut Artis"
 
-#: src/skins/menus.cc:173 src/skins/menus.cc:187
+#: src/skins/menus.cc:198 src/skins/menus.cc:214 src/skins-qt/menus.cc:194
+#: src/skins-qt/menus.cc:210
 msgid "By Album"
 msgstr "Mengikut Album"
 
-#: src/skins/menus.cc:174 src/skins/menus.cc:188
+#: src/skins/menus.cc:199 src/skins/menus.cc:215 src/skins-qt/menus.cc:195
+#: src/skins-qt/menus.cc:211
 msgid "By Album Artist"
 msgstr "Mengikut Album Artis"
 
-#: src/skins/menus.cc:175 src/skins/menus.cc:190
+#: src/skins/menus.cc:200 src/skins/menus.cc:216 src/skins-qt/menus.cc:196
+#: src/skins-qt/menus.cc:212
 msgid "By Release Date"
 msgstr "Mengikut Tarikh Keluaran"
 
-#: src/skins/menus.cc:176 src/skins/menus.cc:189
+#: src/skins/menus.cc:201 src/skins/menus.cc:217 src/skins-qt/menus.cc:197
+#: src/skins-qt/menus.cc:213
 msgid "By Genre"
 msgstr "Mengikut Genre"
 
-#: src/skins/menus.cc:177 src/skins/menus.cc:191
+#: src/skins/menus.cc:202 src/skins/menus.cc:218 src/skins-qt/menus.cc:198
+#: src/skins-qt/menus.cc:214
 msgid "By Length"
 msgstr "Mengikut Panjang"
 
-#: src/skins/menus.cc:180 src/skins/menus.cc:194
+#: src/skins/menus.cc:205 src/skins/menus.cc:221 src/skins-qt/menus.cc:201
+#: src/skins-qt/menus.cc:217
 msgid "By Custom Title"
 msgstr "Mengikut Tajuk Suai"
 
-#: src/skins/menus.cc:198
+#: src/skins/menus.cc:206 src/skins/menus.cc:222 src/skins-qt/menus.cc:202
+#: src/skins-qt/menus.cc:218
+msgid "By Comment"
+msgstr "Mengikut Ulasan"
+
+#: src/skins/menus.cc:207 src/skins/menus.cc:223 src/skins-qt/menus.cc:203
+#: src/skins-qt/menus.cc:219
+msgid "By Disc Number"
+msgstr ""
+
+#: src/skins/menus.cc:227 src/skins-qt/menus.cc:223
 msgid "Randomize List"
 msgstr "Rawakkan Senarai"
 
-#: src/skins/menus.cc:199
+#: src/skins/menus.cc:228 src/skins-qt/menus.cc:224
 msgid "Reverse List"
 msgstr "Songsangkan Senarai"
 
-#: src/skins/menus.cc:201
+#: src/skins/menus.cc:230 src/skins-qt/menus.cc:226
 msgid "Sort Selected"
 msgstr "Isih Terpilih"
 
-#: src/skins/menus.cc:202
+#: src/skins/menus.cc:231 src/skins-qt/menus.cc:227
 msgid "Sort List"
 msgstr "Isih Senarai"
 
-#: src/skins/menus.cc:208
+#: src/skins/menus.cc:236 src/skins-qt/menus.cc:232
+msgid "Open Containing Folder"
+msgstr "Buka Folder Dikandungi"
+
+#: src/skins/menus.cc:238 src/skins-qt/menus.cc:234
 msgid "Cut"
 msgstr "Potong"
 
-#: src/skins/menus.cc:209
+#: src/skins/menus.cc:239 src/skins-qt/menus.cc:235
 msgid "Copy"
 msgstr "Salin"
 
-#: src/skins/menus.cc:210
+#: src/skins/menus.cc:240 src/skins-qt/menus.cc:236
 msgid "Paste"
 msgstr "Tampal"
 
-#: src/skins/menus.cc:212
+#: src/skins/menus.cc:241 src/skins-qt/menus.cc:237
+msgid "Paste at End"
+msgstr "Tampal di Penghujung"
+
+#: src/skins/menus.cc:243 src/skins-qt/menus.cc:239
 msgid "Queue/Unqueue"
 msgstr "Baris Gilir/Nyahbaris Gilir"
 
-#: src/skins/menus.cc:218
-msgid "Load Preset ..."
-msgstr "Muat Praset ..."
-
-#: src/skins/menus.cc:219
-msgid "Load Auto Preset ..."
-msgstr "Muat Auto Praset ..."
-
-#: src/skins/menus.cc:220
-msgid "Load Default"
-msgstr "Muat Lalai"
-
-#: src/skins/menus.cc:221
-msgid "Load Preset File ..."
-msgstr "Muat Fail Praset ..."
-
-#: src/skins/menus.cc:222
-msgid "Load EQF File ..."
-msgstr "Muat Fail EQF ..."
-
-#: src/skins/menus.cc:224
-msgid "Save Preset ..."
-msgstr "Simpan Praset ..."
-
-#: src/skins/menus.cc:225
-msgid "Save Auto Preset ..."
-msgstr "Simpan Auto Praset ..."
-
-#: src/skins/menus.cc:226
-msgid "Save Default"
-msgstr "Simpan Lalai"
-
-#: src/skins/menus.cc:227
-msgid "Save Preset File ..."
-msgstr "Simpan Fail Praset ..."
-
-#: src/skins/menus.cc:228
-msgid "Save EQF File ..."
-msgstr "Simpan Fail EQF ..."
-
-#: src/skins/menus.cc:230
-msgid "Delete Preset ..."
-msgstr "Padam Praset ..."
-
-#: src/skins/menus.cc:231
-msgid "Delete Auto Preset ..."
-msgstr "Padam Auto Praset ..."
-
-#: src/skins/menus.cc:233
-msgid "Import Winamp Presets ..."
-msgstr "Import Praset Winamp ..."
-
-#: src/skins/menus.cc:235
-msgid "Reset to Zero"
-msgstr "Tetap Semula ke Sifar"
+#: src/skins/playlist-widget.cc:58 src/skins-qt/playlist-widget.cc:58
+#, c-format
+msgid "%s (%d of %d)"
+msgstr "%s (%d dar %d)"
+
+#: src/skins/playlistwin.cc:491 src/skins-qt/playlistwin.cc:478
+msgid "Audacious Playlist Editor"
+msgstr "Penyunting Senarai Main Audacious"
 
-#: src/skins/plugin.cc:48
+#: src/skins/plugin.cc:53 src/skins-qt/plugin.cc:65
 msgid "Winamp Classic Interface"
 msgstr "Antaramuka Klasik Winamp"
 
-#: src/skins/preset-browser.cc:57 src/skins/preset-list.cc:371
-#: src/skins/preset-list.cc:386
-msgid "Save"
-msgstr "Simpan"
-
-#: src/skins/preset-browser.cc:57 src/skins/preset-list.cc:338
-#: src/skins/preset-list.cc:354
-msgid "Load"
-msgstr "Muat"
-
-#: src/skins/preset-browser.cc:83
-msgid "Load Preset File"
-msgstr "Muat Fail Praset"
-
-#: src/skins/preset-browser.cc:100
-msgid "Load EQF File"
-msgstr "Muat Fail EQF"
-
-#: src/skins/preset-browser.cc:119
-msgid "Save Preset File"
-msgstr "Simpan Fail Praset"
-
-#: src/skins/preset-browser.cc:137
-msgid "Save EQF File"
-msgstr "Simpan Fail EQF"
-
-#: src/skins/preset-browser.cc:151
-msgid "Import Winamp Presets"
-msgstr "Import Praset Winamp"
-
-#: src/skins/preset-list.cc:285
-msgid "Presets"
-msgstr "Praset"
-
-#: src/skins/preset-list.cc:335
-msgid "Load preset"
-msgstr "Muat praset"
-
-#: src/skins/preset-list.cc:351
-msgid "Load auto-preset"
-msgstr "Muat auto-praset"
-
-#: src/skins/preset-list.cc:367
-msgid "Save preset"
-msgstr "Simpan praset"
-
-#: src/skins/preset-list.cc:382
-msgid "Save auto-preset"
-msgstr "Simpan auto-praset"
-
-#: src/skins/preset-list.cc:408
-msgid "Delete preset"
-msgstr "Padam praset"
-
-#: src/skins/preset-list.cc:424
-msgid "Delete auto-preset"
-msgstr "Padam auto-praset"
+#: src/skins-qt/menus.cc:75
+msgid "Open Folder ..."
+msgstr "Buka Folder ..."
+
+#: src/skins-qt/menus.cc:159
+msgid "Add Folder ..."
+msgstr "Tambah Folder ..."
+
+#: src/skins-qt/search-select.cc:62 src/skins/search-select.cc:77
+msgid "Search entries in active playlist"
+msgstr "Gelintar masukan dalam senarai main aktif"
+
+#: src/skins-qt/search-select.cc:70 src/skins/search-select.cc:83
+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 ""
+"Pilih masukan dalam senarai main dengan mengisi satu atau lebih medan. Medan "
+"guna sintaks ungkapan nalar, tidak-sensitif-kata. Jika anda tidak tahu "
+"bagaimana ungkapan nalar berfungsi, hanya masukkan bahagian harfiah apa yang "
+"anda gelintar."
+
+#: src/skins-qt/search-select.cc:75 src/skins/search-select.cc:91
+msgid "Title:"
+msgstr "Tajuk:"
+
+#: src/skins-qt/search-select.cc:79 src/skins/search-select.cc:96
+msgid "Album:"
+msgstr "Album:"
+
+#: src/skins-qt/search-select.cc:82 src/skins/search-select.cc:101
+msgid "Artist:"
+msgstr "Artis:"
+
+#: src/skins-qt/search-select.cc:85 src/skins/search-select.cc:106
+msgid "File Name:"
+msgstr "Nama Fail:"
+
+#: src/skins-qt/search-select.cc:88 src/skins/search-select.cc:134
+msgid "Clear previous selection before searching"
+msgstr "Kosongkan pemilihan terdahulu sebelum menggelintar"
+
+#: src/skins-qt/search-select.cc:89 src/skins/search-select.cc:137
+msgid "Automatically toggle queue for matching entries"
+msgstr "Togol baris gilir secara automatik untuk pemadanan masukan"
 
-#: src/skins/skins_cfg.cc:176
+#: src/skins-qt/search-select.cc:90 src/skins/search-select.cc:140
+msgid "Create a new playlist with matching entries"
+msgstr "Cipta senarai main baharu dengan masukan sepadan"
+
+#: src/skins-qt/search-select.cc:101 src/skins/search-select.cc:78
+msgid "Search"
+msgstr "Gelintar"
+
+#: src/skins-qt/skins_cfg.cc:198 src/skins/skins_cfg.cc:182
 msgid "Player:"
 msgstr "Pemain:"
 
-#: src/skins/skins_cfg.cc:178
+#: src/skins-qt/skins_cfg.cc:200 src/skins/skins_cfg.cc:184
 msgid "Select main player window font:"
 msgstr "Pilih fon tetingkap pemain utama:"
 
-#: src/skins/skins_cfg.cc:179
+#: src/skins-qt/skins_cfg.cc:201 src/skins/skins_cfg.cc:185
 msgid "Playlist:"
 msgstr "Senarai Main:"
 
-#: src/skins/skins_cfg.cc:181
+#: src/skins-qt/skins_cfg.cc:203 src/skins/skins_cfg.cc:187
 msgid "Select playlist font:"
 msgstr "Pilih fon senarai main:"
 
-#: src/skins/skins_cfg.cc:187
+#: src/skins-qt/skins_cfg.cc:207 src/skins/skins_cfg.cc:191
 msgid "Skin"
 msgstr "Kulit"
 
-#: src/skins/skins_cfg.cc:189
+#: src/skins-qt/skins_cfg.cc:211 src/skins/skins_cfg.cc:193
+msgid "Display active titlebar when any window is focused"
+msgstr ""
+
+#: src/skins-qt/skins_cfg.cc:213 src/skins/skins_cfg.cc:195
 msgid "Fonts"
 msgstr "Fon"
 
-#: src/skins/skins_cfg.cc:192
+#: src/skins-qt/skins_cfg.cc:215 src/skins/skins_cfg.cc:197
 msgid "Use bitmap fonts (supports ASCII only)"
 msgstr "Guna fon peta bit (sokong ASCII sahaja)"
 
-#: src/skins/skins_cfg.cc:194
+#: src/skins-qt/skins_cfg.cc:217 src/skins/skins_cfg.cc:199
 msgid "Scroll song title"
 msgstr "Tatal tajuk lagu"
 
-#: src/skins/skins_cfg.cc:196
+#: src/skins-qt/skins_cfg.cc:219 src/skins/skins_cfg.cc:201
 msgid "Scroll song title in both directions"
 msgstr "Tatal tajuk lagu dalam kedua-dua arah"
 
-#: src/skins/skins_cfg.cc:201
+#: src/skins-qt/skins_cfg.cc:224 src/skins/skins_cfg.cc:206
 msgid "Analyzer"
 msgstr "Penganalisis"
 
-#: src/skins/skins_cfg.cc:202
+#: src/skins-qt/skins_cfg.cc:225 src/skins/skins_cfg.cc:207
 msgid "Scope"
 msgstr "Skop"
 
-#: src/skins/skins_cfg.cc:203
+#: src/skins-qt/skins_cfg.cc:226 src/skins/skins_cfg.cc:208
 msgid "Voiceprint / VU meter"
 msgstr "Voiceprint / VU meter"
 
-#: src/skins/skins_cfg.cc:204
+#: src/skins-qt/skins_cfg.cc:227 src/skins/skins_cfg.cc:209
 msgid "Off"
 msgstr "Mati"
 
-#: src/skins/skins_cfg.cc:208 src/skins/skins_cfg.cc:233
-#: src/skins/skins_cfg.cc:239
+#: src/skins-qt/skins_cfg.cc:231 src/skins-qt/skins_cfg.cc:256
+#: src/skins-qt/skins_cfg.cc:262 src/skins/skins_cfg.cc:213
+#: src/skins/skins_cfg.cc:238 src/skins/skins_cfg.cc:244
 msgid "Normal"
 msgstr "Biasa"
 
-#: src/skins/skins_cfg.cc:209 src/skins/skins_cfg.cc:234
+#: src/skins-qt/skins_cfg.cc:232 src/skins-qt/skins_cfg.cc:257
+#: src/skins/skins_cfg.cc:214 src/skins/skins_cfg.cc:239
 msgid "Fire"
 msgstr "Api"
 
-#: src/skins/skins_cfg.cc:210
+#: src/skins-qt/skins_cfg.cc:233 src/skins/skins_cfg.cc:215
 msgid "Vertical lines"
 msgstr "Garis menegak"
 
-#: src/skins/skins_cfg.cc:214
+#: src/skins-qt/skins_cfg.cc:237 src/skins/skins_cfg.cc:219
 msgid "Lines"
 msgstr "Garis"
 
-#: src/skins/skins_cfg.cc:215
+#: src/skins-qt/skins_cfg.cc:238 src/skins/skins_cfg.cc:220
 msgid "Bars"
 msgstr "Palang"
 
-#: src/skins/skins_cfg.cc:219
+#: src/skins-qt/skins_cfg.cc:242 src/skins/skins_cfg.cc:224
 msgid "Slowest"
 msgstr "Paling lambat"
 
-#: src/skins/skins_cfg.cc:220
+#: src/skins-qt/skins_cfg.cc:243 src/skins/skins_cfg.cc:225
 msgid "Slow"
 msgstr "Lambat"
 
-#: src/skins/skins_cfg.cc:221 src/sox-resampler/sox-resampler.cc:152
+#: src/skins-qt/skins_cfg.cc:244 src/skins/skins_cfg.cc:226
+#: src/soxr/sox-resampler.cc:180
 msgid "Medium"
 msgstr "Sederhana"
 
-#: src/skins/skins_cfg.cc:222
+#: src/skins-qt/skins_cfg.cc:245 src/skins/skins_cfg.cc:227
 msgid "Fast"
 msgstr "Pantas"
 
-#: src/skins/skins_cfg.cc:223
+#: src/skins-qt/skins_cfg.cc:246 src/skins/skins_cfg.cc:228
 msgid "Fastest"
 msgstr "Paling pantas"
 
-#: src/skins/skins_cfg.cc:227
+#: src/skins-qt/skins_cfg.cc:250 src/skins/skins_cfg.cc:232
 msgid "Dots"
 msgstr "Titik"
 
-#: src/skins/skins_cfg.cc:228
+#: src/skins-qt/skins_cfg.cc:251 src/skins/skins_cfg.cc:233
 msgid "Line"
 msgstr "Garis"
 
-#: src/skins/skins_cfg.cc:229
+#: src/skins-qt/skins_cfg.cc:252 src/skins/skins_cfg.cc:234
 msgid "Solid"
 msgstr "Tegar"
 
-#: src/skins/skins_cfg.cc:235
+#: src/skins-qt/skins_cfg.cc:258 src/skins/skins_cfg.cc:240
 msgid "Ice"
 msgstr "Ais"
 
-#: src/skins/skins_cfg.cc:240
+#: src/skins-qt/skins_cfg.cc:263 src/skins/skins_cfg.cc:245
 msgid "Smooth"
 msgstr "Licin"
 
-#: src/skins/skins_cfg.cc:244
-msgid "Type"
-msgstr "Jenis"
-
-#: src/skins/skins_cfg.cc:245
-msgid "Visualization type:"
-msgstr "Jenis pengvisualan:"
-
-#: src/skins/skins_cfg.cc:248
-msgid "Analyzer"
-msgstr "Penganalisis"
-
-#: src/skins/skins_cfg.cc:249
-msgid "Show peaks"
-msgstr "Tunjuk puncak"
-
-#: src/skins/skins_cfg.cc:251
+#: src/skins-qt/skins_cfg.cc:267 src/skins/skins_cfg.cc:249
 msgid "Coloring:"
 msgstr "Pewarnaan:"
 
-#: src/skins/skins_cfg.cc:254
+#: src/skins-qt/skins_cfg.cc:270 src/skins/skins_cfg.cc:252
 msgid "Style:"
 msgstr "Gaya:"
 
-#: src/skins/skins_cfg.cc:257
+#: src/skins-qt/skins_cfg.cc:273 src/skins/skins_cfg.cc:255
 msgid "Falloff:"
 msgstr "Jatuhan:"
 
-#: src/skins/skins_cfg.cc:260
+#: src/skins-qt/skins_cfg.cc:276 src/skins/skins_cfg.cc:258
 msgid "Peak falloff:"
 msgstr "Jatuhan puncak:"
 
-#: src/skins/skins_cfg.cc:264
+#: src/skins-qt/skins_cfg.cc:282 src/skins/skins_cfg.cc:264
 msgid "Scope Style:"
 msgstr "Gaya Skop:"
 
-#: src/skins/skins_cfg.cc:267
+#: src/skins-qt/skins_cfg.cc:285 src/skins/skins_cfg.cc:267
 msgid "Voiceprint Coloring:"
 msgstr "Pewarnaan Voiceprint:"
 
-#: src/skins/skins_cfg.cc:270
+#: src/skins-qt/skins_cfg.cc:288 src/skins/skins_cfg.cc:270
 msgid "VU Meter Style:"
 msgstr "Gaya Meter VU:"
 
-#: src/skins/skins_cfg.cc:276
-msgid "General"
-msgstr "Am"
-
-#: src/skins/skins_cfg.cc:277
-msgid "Visualization"
-msgstr "Pengvisualan"
-
-#: src/skins/ui_equalizer.cc:282
-msgid "Preamp"
-msgstr "Praamp"
-
-#: src/skins/ui_equalizer.cc:286
-msgid "31 Hz"
-msgstr "31 Hz"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "63 Hz"
-msgstr "63 Hz"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "125 Hz"
-msgstr "125 Hz"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "250 Hz"
-msgstr "250 Hz"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "500 Hz"
-msgstr "500 Hz"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "1 kHz"
-msgstr "1 kHz"
-
-#: src/skins/ui_equalizer.cc:288
-msgid "2 kHz"
-msgstr "2 kHz"
-
-#: src/skins/ui_equalizer.cc:288
-msgid "4 kHz"
-msgstr "4 kHz"
-
-#: src/skins/ui_equalizer.cc:288
-msgid "8 kHz"
-msgstr "8 kHz"
-
-#: src/skins/ui_equalizer.cc:288
-msgid "16 kHz"
-msgstr "16 kHz"
-
-#: src/skins/ui_equalizer.cc:330
-msgid "Audacious Equalizer"
-msgstr "Penyama Audacious"
-
-#: src/skins/ui_main.cc:688
-#, c-format
-msgid "Seek to %d:%-2.2d / %d:%-2.2d"
-msgstr "Jangkau ke %d:%-2.2d / %d:%-2.2d"
-
-#: src/skins/ui_main.cc:709
-#, c-format
-msgid "Volume: %d%%"
-msgstr "Volum: %d%%"
-
-#: src/skins/ui_main.cc:732
-#, c-format
-msgid "Balance: %d%% left"
-msgstr "Imbangan: %d%% kiri"
-
-#: src/skins/ui_main.cc:734
-msgid "Balance: center"
-msgstr "Imbangan: tengah"
-
-#: src/skins/ui_main.cc:736
-#, c-format
-msgid "Balance: %d%% right"
-msgstr "Imbangan: %d%% kanan"
-
-#: src/skins/ui_main.cc:842
-msgid "Options Menu"
-msgstr "Menu Pilihan"
+#: src/skins-qt/skins_cfg.cc:294 src/skins/skins_cfg.cc:276
+msgid "Type"
+msgstr "Jenis"
 
-#: src/skins/ui_main.cc:846
-msgid "Disable 'Always On Top'"
-msgstr "Lumpuhkan 'Sentiasa Di Atas'"
+#: src/skins-qt/skins_cfg.cc:295 src/skins/skins_cfg.cc:277
+msgid "Visualization type:"
+msgstr "Jenis pengvisualan:"
 
-#: src/skins/ui_main.cc:848
-msgid "Enable 'Always On Top'"
-msgstr "Benarkan 'Sentiasa Di Atas'"
+#: src/skins-qt/skins_cfg.cc:298 src/skins/skins_cfg.cc:280
+msgid "Analyzer"
+msgstr "Penganalisis"
 
-#: src/skins/ui_main.cc:851
-msgid "File Info Box"
-msgstr "Kotak Maklumat Fail"
+#: src/skins-qt/skins_cfg.cc:299 src/skins/skins_cfg.cc:281
+msgid "Show peaks"
+msgstr "Tunjuk puncak"
 
-#: src/skins/ui_main.cc:857
-msgid "Visualizations"
+#: src/skins-qt/skins_cfg.cc:308 src/skins/skins_cfg.cc:290
+msgid "Visualization"
 msgstr "Pengvisualan"
 
-#: src/skins/ui_main.cc:1336
-msgid "Repeat point A set."
-msgstr "Ulang titik A ditetapkan."
-
-#: src/skins/ui_main.cc:1341
-msgid "Repeat point B set."
-msgstr "Ulang titik B ditetapkan"
-
-#: src/skins/ui_main.cc:1350
-msgid "Repeat points cleared."
-msgstr "Ulang titik dikosongkan."
-
-#: src/skins/ui_playlist.cc:219
-msgid "Search entries in active playlist"
-msgstr "Gelintar masukan dalam senarai main aktif"
-
-#: src/skins/ui_playlist.cc:226
-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 ""
-"Pilih masukan dalam senarai main dengan mengisi satu atau lebih medan. Medan "
-"guna sintaks ungkapan nalar, tidak-sensitif-kata. Jika anda tidak tahu "
-"bagaimana ungkapan nalar berfungsi, hanya masukkan bahagian harfiah apa yang "
-"anda gelintar."
-
-#: src/skins/ui_playlist.cc:234
-msgid "Title:"
-msgstr "Tajuk:"
-
-#: src/skins/ui_playlist.cc:241
-msgid "Album:"
-msgstr "Album:"
-
-#: src/skins/ui_playlist.cc:248
-msgid "Artist:"
-msgstr "Artis:"
-
-#: src/skins/ui_playlist.cc:255
-msgid "File Name:"
-msgstr "Nama Fail:"
-
-#: src/skins/ui_playlist.cc:263
-msgid "Clear previous selection before searching"
-msgstr "Kosongkan pemilihan terdahulu sebelum menggelintar"
-
-#: src/skins/ui_playlist.cc:266
-msgid "Automatically toggle queue for matching entries"
-msgstr "Togol baris gilir secara automatik untuk pemadanan masukan"
-
-#: src/skins/ui_playlist.cc:269
-msgid "Create a new playlist with matching entries"
-msgstr "Cipta senarai main baharu dengan masukan sepadan"
-
-#: src/skins/ui_playlist.cc:717
-msgid "Audacious Playlist Editor"
-msgstr "Penyunting Senarai Main Audacious"
-
-#: src/skins/ui_playlist.cc:752
-#, c-format
-msgid "%s (%d of %d)"
-msgstr "%s (%d dar %d)"
-
-#: src/skins/ui_skinselector.cc:167
+#: src/skins-qt/skinselector.cc:98 src/skins/skinselector.cc:111
 msgid "Archived Winamp 2.x skin"
 msgstr "Kulit Winamp 2.x berarkib"
 
-#: src/skins/ui_skinselector.cc:172
+#: src/skins-qt/skinselector.cc:102 src/skins/skinselector.cc:115
 msgid "Unarchived Winamp 2.x skin"
 msgstr "Kulit Winamp 2.x tidak berarkib"
 
-#: src/skins/util.cc:430
-#, c-format
-msgid "Could not create directory (%s): %s\n"
-msgstr "Tidak dapat mencipta direktori (%s): %s\n"
-
-#: src/sndfile/plugin.cc:39
+#: src/sndfile/plugin.cc:38
 msgid "Sndfile Plugin"
 msgstr "Pemalam Sndfile"
 
-#: src/sndfile/plugin.cc:336
+#: src/sndfile/plugin.cc:372
 msgid ""
 "Based on the xmms_sndfile plugin:\n"
 "Copyright (C) 2000, 2002 Erik de Castro Lopo\n"
@@ -3970,108 +4157,111 @@
 "program; jika tidak, laporkannya ke Free Software Foundation, Inc., 51 "
 "Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 
-#: src/sndio-ng/sndio.cc:44
+#: src/sndio/sndio.cc:43
 msgid "Sndio Output"
 msgstr "Output Sndio"
 
-#: src/sndio-ng/sndio.cc:98
+#: src/sndio/sndio.cc:98
 msgid "Device (blank for default):"
 msgstr "Peranti (kosong untuk lalai):"
 
-#: src/sndio-ng/sndio.cc:100
+#: src/sndio/sndio.cc:100
 msgid "Save and restore volume:"
 msgstr "Simpan dan pulihkan volum:"
 
-#: src/sndio-ng/sndio.cc:181
+#: src/sndio/sndio.cc:181
 #, c-format
 msgid "Sndio error: Unsupported audio format (%d)"
 msgstr "Ralat Sndio: Format audio tidak disokong (%d)"
 
-#: src/sndio-ng/sndio.cc:192
+#: src/sndio/sndio.cc:192
 msgid "Sndio error: sio_open() failed"
 msgstr "Ralat Sndio: sio_open() gagal"
 
-#: src/sndio-ng/sndio.cc:222
+#: src/sndio/sndio.cc:221
 msgid "Sndio error: sio_setpar() failed"
 msgstr "Ralat Sndio: sio_setpar() gagal"
 
-#: src/sndio-ng/sndio.cc:234
+#: src/sndio/sndio.cc:233
 msgid "Sndio error: sio_start() failed"
 msgstr "Ralat Sndio: sio_start() gagal"
 
-#: src/song_change/song_change.cc:33
+#: src/songchange/song_change.cc:30
 msgid "Song Change"
 msgstr "Lagu Berubah"
 
-#: src/song_change/song_change.cc:342
-msgid ""
-"Parameters passed to the shell should be encapsulated in "
-"quotes. Doing otherwise is a security risk."
-msgstr ""
-"Parameter dilepasi ke shell seharusnya dikurungkan dalam "
-"petikan. Jika dibuat sebaliknya mengundang risiko keselamatan."
-
-#: src/song_change/song_change.cc:358
+#: src/songchange/song_change.cc:256
 msgid "Commands"
 msgstr "Perintah"
 
-#: src/song_change/song_change.cc:360
+#: src/songchange/song_change.cc:258
 msgid "Command to run when starting a new song:"
 msgstr "Perintah dijalankan bila memulakan lagu baharu:"
 
-#: src/song_change/song_change.cc:364
+#: src/songchange/song_change.cc:261
+msgid "Command to run when stopping a song:"
+msgstr ""
+
+#: src/songchange/song_change.cc:264
 msgid "Command to run at the end of a song:"
 msgstr "Perintah dijalankan dipenghujung lagu:"
 
-#: src/song_change/song_change.cc:368
+#: src/songchange/song_change.cc:267
 msgid "Command to run at the end of the playlist:"
 msgstr "Perintah dijalankan dipenghujung senarai main:"
 
-#: src/song_change/song_change.cc:372
+#: src/songchange/song_change.cc:270
 msgid "Command to run when song title changes (for network streams):"
 msgstr "Perintah dijalankan bila tajuk lagu berubah (untuk strim rangkaian):"
 
-#: src/song_change/song_change.cc:376
+#: src/songchange/song_change.cc:273
 msgid ""
-"You can use the following format strings which will be substituted before "
-"calling the command (not all are useful for the end-of-playlist command):\n"
-"\n"
-"%F: Frequency (in hertz)\n"
+"You can use the following format codes, which will be replaced before "
+"running the command.\n"
+"Not all are useful though for the song-stopped or end-of-playlist command."
+msgstr ""
+
+#: src/songchange/song_change.cc:276
+msgid ""
+"%a: Artist\n"
+"%b: Album\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"
+"%F: Frequency (Hertz)\n"
+"%l: Length (milliseconds)\n"
+"%n or %s: Formatted title (see playlist settings)\n"
 "%p: Currently playing (1 or 0)\n"
-"%a: Artist\n"
-"%b: Album\n"
-"%T: Track title"
+"%r: Rate (bits per second)\n"
+"%t: Playlist position\n"
+"%T: Title (unformatted)"
 msgstr ""
-"Anda boleh guna rentetan format berikut yang diganti sebelum memanggil "
-"perintah (bukan emua berguna untuk perintah end-of-playlist):\n"
-"\n"
-"%F: Frekuensi (dalam hertz)\n"
-"%c: Bilangan saluran\n"
-"%f: Nama penuh (laluan penuh)\n"
-"%l: Panjang (dalam milisaat)\n"
-"%n atau %s: Nama lagu\n"
-"%r: Kadar (dalam bit per saat)\n"
-"%t: Kedudukan senarai main (%02d)\n"
-"%p: Dimain ketika ini (1 atau 0)\n"
 "%a: Artis\n"
 "%b: Album\n"
-"%T: Tajuk trek"
-
-#: src/song-info-qt/song-info.cc:32
-msgid "Song Info (Qt)"
-msgstr "Maklumat Lagu (Qt)"
+"%c: Bilangan saluran\n"
+"%f: Nama fail (laluan penuh)\n"
+"%F: Frekuensi (Hertz)\n"
+"%l: Tempoh (milisaat)\n"
+"%n or %s: Tajuk berformate (lihat tetapan senarai main)\n"
+"%p: Dimainkan ketika ini (1 atau 0)\n"
+"%r: kadar (bit per saat)\n"
+"%t: Kedudukan senarai main\n"
+"%T: Tajuk (tanpa format)"
+
+#: src/songchange/song_change.cc:287
+msgid ""
+"Parameters passed to the shell should be enclosed in quotation marks.\n"
+"Unquoted parameters may lead to unexpected results."
+msgstr ""
+
+#: src/song-info-qt/song-info.cc:30
+msgid "Song Info"
+msgstr "Maklumat Lagu"
 
-#: src/sox-resampler/sox-resampler.cc:44
+#: src/soxr/sox-resampler.cc:44
 msgid "SoX Resampler"
 msgstr "Pensampel Semula SoX"
 
-#: src/sox-resampler/sox-resampler.cc:144
+#: src/soxr/sox-resampler.cc:172
 msgid ""
 "SoX Resampler Plugin for Audacious\n"
 "Copyright 2013 Michał Lipski\n"
@@ -4087,96 +4277,144 @@
 "Kadar Sampel:\n"
 "Hakcipta 2010-2012 John Lindgren"
 
-#: src/sox-resampler/sox-resampler.cc:150
+#: src/soxr/sox-resampler.cc:178
 msgid "Quick"
 msgstr "Pantas"
 
-#: src/sox-resampler/sox-resampler.cc:151
+#: src/soxr/sox-resampler.cc:179
 msgid "Low"
 msgstr "Rendah"
 
-#: src/sox-resampler/sox-resampler.cc:153
+#: src/soxr/sox-resampler.cc:181
 msgid "High"
 msgstr "Tinggi"
 
-#: src/sox-resampler/sox-resampler.cc:154
+#: src/soxr/sox-resampler.cc:182
 msgid "Very High"
 msgstr "Sangat Tinggi"
 
-#: src/sox-resampler/sox-resampler.cc:158
+#: src/soxr/sox-resampler.cc:183
+msgid "Ultra High"
+msgstr "Lampau Tinggi"
+
+#: src/soxr/sox-resampler.cc:187
+msgid "Minimum"
+msgstr "Minimum"
+
+#: src/soxr/sox-resampler.cc:188
+msgid "Intermediate"
+msgstr "Pertengahan"
+
+#: src/soxr/sox-resampler.cc:193
 msgid "Quality:"
 msgstr "Kualiti:"
 
-#: src/speed-pitch/speed-pitch.cc:51
+#: src/soxr/sox-resampler.cc:196
+msgid "Phase:"
+msgstr "Fasa:"
+
+#: src/soxr/sox-resampler.cc:200
+msgid "Allow aliasing"
+msgstr "Benarkan alias"
+
+#: src/soxr/sox-resampler.cc:202
+msgid "Use steep filter"
+msgstr "Guna penapis curam"
+
+#: src/speedpitch/speed-pitch.cc:54
 msgid "Speed and Pitch"
 msgstr "Kelajuan dan Pic"
 
-#: src/speed-pitch/speed-pitch.cc:210
-msgid "Speed and Pitch"
-msgstr "Kelajuan dan Pic"
-
-#: src/speed-pitch/speed-pitch.cc:211
-msgid "Speed:"
-msgstr "Kelajuan:"
-
-#: src/speed-pitch/speed-pitch.cc:214
-msgid "Pitch:"
-msgstr "Pic:"
+#: src/speedpitch/speed-pitch.cc:247
+msgid "Speed"
+msgstr "Kelajuan"
+
+#: src/speedpitch/speed-pitch.cc:248
+msgid "Decouple from pitch"
+msgstr "Decouple dari pic"
+
+#: src/speedpitch/speed-pitch.cc:250 src/speedpitch/speed-pitch.cc:258
+msgid "Multiplier:"
+msgstr "Pendarab:"
+
+#: src/speedpitch/speed-pitch.cc:254
+msgid "Pitch"
+msgstr "Pic"
 
-#: src/statusicon/statusicon.cc:47
+#: src/statusicon-qt/statusicon.cc:45 src/statusicon/statusicon.cc:47
 msgid "Status Icon"
 msgstr "Ikon Status"
 
-#: src/statusicon/statusicon.cc:283
-msgid "Se_ttings ..."
-msgstr "_Tetapan ..."
-
-#: src/statusicon/statusicon.cc:372
+#: src/statusicon-qt/statusicon.cc:68
 msgid ""
-"Status Icon Plugin\n"
+"Status Icon Plugin (partial port for Qt interface)\n"
 "\n"
 "Copyright 2005-2007 Giacomo Lozito <james@develia.org>\n"
 "Copyright 2010 Michał Lipski <tallica@o2.pl>\n"
+"Copyright 2015 Eugene Paskevich <eugene@raptor.kiev.ua>\n"
 "\n"
 "This plugin provides a status icon, placed in\n"
 "the system tray area of the window manager."
 msgstr ""
-"Pemalam Ikon Status\n"
+"Pemalam Ikon Status (port separa untuk antaramuka Qt)\n"
 "\n"
 "Hakcipta 2005-2007 Giacomo Lozito <james@develia.org>\n"
 "Hakcipta 2010 Michał Lipski <tallica@o2.pl>\n"
+"Hakcipta 2015 Eugene Paskevich <eugene@raptor.kiev.ua>\n"
 "\n"
-"Pemalam ini menyediakan ikon status, terletak di\n"
-"dalam kawasan talam sistem pengurus tetingkap."
+"Pemalam ini menyediakan ikon status, diletakkan dalam\n"
+"kawasan talam sistem pengurus tetingkap."
 
-#: src/statusicon/statusicon.cc:379
+#: src/statusicon-qt/statusicon.cc:89 src/statusicon/statusicon.cc:384
 msgid "Mouse Scroll Action"
 msgstr "Tindakan Tatal Tetikus"
 
-#: src/statusicon/statusicon.cc:380
+#: src/statusicon-qt/statusicon.cc:90 src/statusicon/statusicon.cc:385
 msgid "Change volume"
 msgstr "Ubah volum"
 
-#: src/statusicon/statusicon.cc:383
+#: src/statusicon-qt/statusicon.cc:93 src/statusicon/statusicon.cc:388
 msgid "Change playing song"
 msgstr "Ubah lagu dimainkan"
 
-#: src/statusicon/statusicon.cc:386
+#: src/statusicon-qt/statusicon.cc:96 src/statusicon/statusicon.cc:391
 msgid "Other Settings"
 msgstr "Tetapan Lain"
 
-#: src/statusicon/statusicon.cc:387
+#: src/statusicon-qt/statusicon.cc:97 src/statusicon/statusicon.cc:392
 msgid "Disable the popup window"
 msgstr "Lumpuhkan tetingkap timbul"
 
-#: src/statusicon/statusicon.cc:389
+#: src/statusicon-qt/statusicon.cc:99 src/statusicon/statusicon.cc:394
 msgid "Close to the system tray"
 msgstr "Tutup talam sistem"
 
-#: src/statusicon/statusicon.cc:391
+#: src/statusicon-qt/statusicon.cc:101 src/statusicon/statusicon.cc:396
 msgid "Advance in playlist when scrolling upward"
 msgstr "Dahulukan dalam senarai main bila menatal ke atas"
 
+#: src/statusicon-qt/statusicon.cc:116 src/statusicon/statusicon.cc:287
+msgid "Se_ttings ..."
+msgstr "_Tetapan ..."
+
+#: src/statusicon/statusicon.cc:377
+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 ""
+"Pemalam Ikon Status\n"
+"\n"
+"Hakcipta 2005-2007 Giacomo Lozito <james@develia.org>\n"
+"Hakcipta 2010 Michał Lipski <tallica@o2.pl>\n"
+"\n"
+"Pemalam ini menyediakan ikon status, terletak di\n"
+"dalam kawasan talam sistem pengurus tetingkap."
+
 #: src/stereo_plugin/stereo.cc:19
 msgid "Extra Stereo"
 msgstr "Stereo Ekstra"
@@ -4195,20 +4433,160 @@
 msgid "Extra Stereo"
 msgstr "Stereo Ekstra"
 
+#: src/streamtuner/icecast-model.cc:126 src/streamtuner/shoutcast-model.cc:131
+msgid "Type"
+msgstr "Jenis"
+
+#: src/streamtuner/icecast-model.cc:132
+msgid "Current Song"
+msgstr "Lagu Semasa"
+
+#: src/streamtuner/icecast-model.cc:164
+msgid "Other"
+msgstr "Lain-lain"
+
+#: src/streamtuner/ihr-model.cc:63
+msgid "Market"
+msgstr ""
+
+#: src/streamtuner/ihr-model.cc:156
+msgid "Call Letters"
+msgstr ""
+
+#: src/streamtuner/ihr-model.cc:162
+msgid "Description"
+msgstr "Keterangan"
+
+#: src/streamtuner/shoutcast-model.cc:128
+msgid "Listeners"
+msgstr "Pendengar"
+
+#: src/streamtuner/shoutcast-model.cc:188
+msgid "Top 500 Stations"
+msgstr "500 Stesen Teratas"
+
+#: src/streamtuner/shoutcast-model.cc:189
+msgid "Alternative"
+msgstr "Alternatif"
+
+#: src/streamtuner/shoutcast-model.cc:190
+msgid "Blues"
+msgstr "Blues"
+
+#: src/streamtuner/shoutcast-model.cc:191
+msgid "Classical"
+msgstr "Classical"
+
+#: src/streamtuner/shoutcast-model.cc:192
+msgid "Country"
+msgstr "Country"
+
+#: src/streamtuner/shoutcast-model.cc:193
+msgid "Decades"
+msgstr "Dekad"
+
+#: src/streamtuner/shoutcast-model.cc:194
+msgid "Easy Listening"
+msgstr "Easy Listening"
+
+#: src/streamtuner/shoutcast-model.cc:195
+msgid "Electronic"
+msgstr "Elektronik"
+
+#: src/streamtuner/shoutcast-model.cc:196
+msgid "Folk"
+msgstr "Folk"
+
+#: src/streamtuner/shoutcast-model.cc:197
+msgid "Inspirational"
+msgstr "Inspirasi"
+
+#: src/streamtuner/shoutcast-model.cc:198
+msgid "International"
+msgstr "Antara Bangsa"
+
+#: src/streamtuner/shoutcast-model.cc:199
+msgid "Jazz"
+msgstr "Jazz"
+
+#: src/streamtuner/shoutcast-model.cc:200
+msgid "Latin"
+msgstr "Latin"
+
+#: src/streamtuner/shoutcast-model.cc:201
+msgid "Metal"
+msgstr "Metal"
+
+#: src/streamtuner/shoutcast-model.cc:203
+msgid "New Age"
+msgstr "New Age"
+
+#: src/streamtuner/shoutcast-model.cc:204
+msgid "Pop"
+msgstr "Pop"
+
+#: src/streamtuner/shoutcast-model.cc:205
+msgid "Public Radio"
+msgstr "Radio Awam"
+
+#: src/streamtuner/shoutcast-model.cc:206
+msgid "R&B and Urban"
+msgstr "R&B dan Urban"
+
+#: src/streamtuner/shoutcast-model.cc:207
+msgid "Rap"
+msgstr "Rap"
+
+#: src/streamtuner/shoutcast-model.cc:208
+msgid "Reggae"
+msgstr "Reggae"
+
+#: src/streamtuner/shoutcast-model.cc:209
+msgid "Rock"
+msgstr "Rock"
+
+#: src/streamtuner/shoutcast-model.cc:210
+msgid "Seasonal and Holiday"
+msgstr "Bermusim dan Perayaan"
+
+#: src/streamtuner/shoutcast-model.cc:211
+msgid "Soundtracks"
+msgstr "Runut Bunyi"
+
+#: src/streamtuner/shoutcast-model.cc:212
+msgid "Talk"
+msgstr "Bicara"
+
+#: src/streamtuner/shoutcast-model.cc:213
+msgid "Themes"
+msgstr "Tema"
+
+#: src/streamtuner/streamtuner.cc:59
+msgid "Shoutcast"
+msgstr "Shoutcast"
+
+#: src/streamtuner/streamtuner.cc:60
+msgid "Icecast"
+msgstr "Icecast"
+
+#: src/streamtuner/streamtuner.cc:71
+msgid "Stream Tuner"
+msgstr ""
+
 #: src/tonegen/tonegen.cc:45
 msgid "Tone Generator"
 msgstr "Penjana Nada"
 
-#: src/tonegen/tonegen.cc:94
+#: src/tonegen/tonegen.cc:92
 #, c-format
 msgid "%s %.1f Hz"
 msgstr "%s %.1f Hz"
 
-#: src/tonegen/tonegen.cc:94
+#: src/tonegen/tonegen.cc:92
 msgid "Tone Generator: "
 msgstr "Penjana Nada:"
 
-#: src/tonegen/tonegen.cc:160
+#: src/tonegen/tonegen.cc:161
 msgid ""
 "Sine tone generator by Håvard Kvålen <havardk@xmms.org>\n"
 "Modified by Daniel J. Peng <danielpeng@bigfoot.com>\n"
@@ -4222,11 +4600,32 @@
 "Untuk guna ia, tambah URL: tone://frequency1;frequency2;frequency3;...\n"
 "cth. tone://2000;2005 untuk mainkan nada 2000 Hz dan nada 2005 Hz"
 
+#: src/ui-common/dialogs-qt.cc:40
+msgid ""
+"\n"
+"(Further messages have been hidden.)"
+msgstr ""
+"\n"
+"(Mesej lanjut telah disembunyi.)"
+
+#: src/ui-common/dialogs-qt.cc:52
+msgid "Working ..."
+msgstr "Berfungsi ..."
+
+#: src/ui-common/dialogs-qt.cc:73
+msgid "Information"
+msgstr "Maklumat"
+
+#: src/ui-common/menu-ops-gtk.cc:132 src/ui-common/menu-ops-qt.cc:113
+#, c-format
+msgid "%s does not appear to be a valid folder."
+msgstr ""
+
 #: src/voice_removal/voice_removal.cc:28
 msgid "Voice Removal"
 msgstr "Pembuangan Suara"
 
-#: src/vorbis/vorbis.cc:465
+#: src/vorbis/vorbis.cc:433
 msgid ""
 "Audacious Ogg Vorbis Decoder\n"
 "\n"
@@ -4268,12 +4667,12 @@
 msgid "Ogg Vorbis Decoder"
 msgstr "Penyahkod Ogg Vorbis"
 
-#: src/vtx/info.cc:22
+#: src/vtx/info.cc:24
 #, c-format
 msgid "Details about %s"
 msgstr "Perincian mengenai %s"
 
-#: src/vtx/info.cc:24
+#: src/vtx/info.cc:26
 msgid ""
 "Title: %t\n"
 "Author: %a\n"
@@ -4303,7 +4702,7 @@
 msgid "VTX Decoder"
 msgstr "Penyahkod VTX"
 
-#: src/vtx/vtx.cc:184
+#: src/vtx/vtx.cc:178
 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"
@@ -4313,19 +4712,61 @@
 "Berdasarkan pada in_vtx.dll by Roman Sherbakov <v_soft@microfor.ru>\n"
 "Pemalam Audacious oleh Pavel Vymetalek <pvymetalek@seznam.cz>"
 
-#: src/wavpack/wavpack.cc:24
+#: src/vumeter-qt/vumeter_qt.cc:31
+msgid ""
+"VU Meter Plugin for Audacious\n"
+"Copyright 2017-2019 Marc Sánchez Fauste"
+msgstr ""
+
+#: src/vumeter-qt/vumeter_qt.cc:35
+msgid "VU Meter Settings"
+msgstr ""
+
+#: src/vumeter-qt/vumeter_qt.cc:37
+msgid "Peak hold time:"
+msgstr ""
+
+#: src/vumeter-qt/vumeter_qt.cc:42
+msgid "Fall-off time:"
+msgstr ""
+
+#: src/vumeter-qt/vumeter_qt.cc:44
+msgid "dB/second"
+msgstr ""
+
+#: src/vumeter-qt/vumeter_qt.cc:46
+msgid "Display legend"
+msgstr ""
+
+#: src/vumeter-qt/vumeter_qt.h:37
+msgid "VU Meter"
+msgstr ""
+
+#: src/waveout/waveout.cc:43
+msgid "Win32 waveOut"
+msgstr "Win32 waveOut"
+
+#: src/waveout/waveout.cc:69
+msgid ""
+"Win32 waveOut Plugin for Audacious\n"
+"Copyright 2016 John Lindgren"
+msgstr ""
+"Pemalam Win32 waveOut untuk Audacious\n"
+"Hakcipta 2016 John Lindgren"
+
+#: src/wavpack/wavpack.cc:25
 msgid "WavPack Decoder"
 msgstr "Penyahkod WavPack"
 
-#: src/wavpack/wavpack.cc:211
+#: src/wavpack/wavpack.cc:217
 msgid "lossy (hybrid)"
 msgstr "hilang (hidbrid)"
 
-#: src/wavpack/wavpack.cc:213
+#: src/wavpack/wavpack.cc:219
 msgid "lossy"
 msgstr "hilang"
 
-#: src/wavpack/wavpack.cc:255
+#: src/wavpack/wavpack.cc:259
 msgid ""
 "Copyright 2006 William Pitcock <nenolod@nenolod.net>\n"
 "\n"
@@ -4335,18 +4776,38 @@
 "\n"
 "Sebahagian kod pemalam oleh Miles Egan."
 
-#: src/xsf/plugin.cc:50
+#: src/xsf/plugin.cc:74
 msgid "2SF Decoder"
 msgstr "Penyahkod 2SF"
 
-#: src/xsf/plugin.cc:238
+#: src/xsf/plugin.cc:429
+msgid "32728 Hz"
+msgstr ""
+
+#: src/xsf/plugin.cc:432
+msgid "65456 Hz"
+msgstr ""
+
+#: src/xsf/plugin.cc:438
+msgid "Cosine"
+msgstr ""
+
+#: src/xsf/plugin.cc:439
+msgid "Sharp"
+msgstr ""
+
+#: src/xsf/plugin.cc:443
 msgid "XSF Configuration"
 msgstr "Konfigurasi XSF"
 
-#: src/xsf/plugin.cc:239
-msgid "Ignore length from file"
-msgstr "Abai panjang dari fail"
+#: src/xsf/plugin.cc:445
+msgid "Default fade time:"
+msgstr ""
+
+#: src/xsf/plugin.cc:447
+msgid "Interpolation mode:"
+msgstr ""
 
-#: src/xspf/xspf.cc:89
+#: src/xspf/xspf.cc:95
 msgid "XML Shareable Playlists (XSPF)"
 msgstr "Senarai Main Boleh Kongsi XML (XSPF)"

audacious-plugins-3.6.2-gtk3.tar.bz2/po/nl.po -> audacious-plugins-4.4.1.tar.bz2/po/nl.po Changed

@@ -5,18 +5,21 @@
 # Translators:
 # Bjorn Roesbeke <inbox@bjornroesbeke.be>, 2013
 # Dennis Klomp <c_klomp@epu-forum.net>, 2012
-# dragnadh <dragnadh@gmail.com>, 2015
+# dragnadh, 2015,2017
 # Farioko <fabianbakkum@hotmail.com>, 2014
 # Freek1A <fjvluijt@hotmail.com>, 2012
+# Heimen Stoffels <vistausss@fastmail.com>, 2022-2024
+# Heimen Stoffels <vistausss@fastmail.com>, 2018,2020
 # shured <shured1@gmail.com>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: Audacious Plugins\n"
-"Report-Msgid-Bugs-To: http://redmine.audacious-media-player.org/\n"
-"POT-Creation-Date: 2015-02-28 19:18+0100\n"
-"PO-Revision-Date: 2015-02-17 17:53+0000\n"
-"Last-Translator: dragnadh <dragnadh@gmail.com>\n"
-"Language-Team: Dutch (http://www.transifex.com/projects/p/audacious/language/"
+"Report-Msgid-Bugs-To: https://github.com/audacious-media-player/audacious/"
+"issues\n"
+"POT-Creation-Date: 2024-09-26 21:54+0200\n"
+"PO-Revision-Date: 2011-10-10 17:43+0000\n"
+"Last-Translator: Heimen Stoffels <vistausss@fastmail.com>, 2022-2024\n"
+"Language-Team: Dutch (http://app.transifex.com/audacious/audacious/language/"
 "nl/)\n"
 "Language: nl\n"
 "MIME-Version: 1.0\n"
@@ -24,292 +27,62 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/aac-raw/aac.cc:18
+#: src/aac/aac.cc:19
 msgid "AAC (Raw) Decoder"
-msgstr "AAC (Raw) Decoder"
+msgstr "AAC (Raw)-decodering"
 
-#: src/adplug/adplug-xmms.cc:42
+#: src/adplug/adplug-xmms.cc:70
 msgid "AdPlug (AdLib Player)"
-msgstr "AdPlug (AdLib Player)"
+msgstr "AdPlug (AdLib-speler)"
 
-#: src/adplug/adplug-xmms.cc:156 src/modplug/modplugbmp.cc:335
-#: src/psf/plugin.cc:138 src/vtx/vtx.cc:87 src/xsf/plugin.cc:113
+#: src/adplug/adplug-xmms.cc:167 src/modplug/modplugbmp.cc:321
+#: src/psf/plugin.cc:161 src/vtx/vtx.cc:89 src/xsf/plugin.cc:204
 msgid "sequenced"
-msgstr "gesequentieerd"
+msgstr "stapsgewijs"
 
-#: src/alarm/alarm.cc:55 src/alarm/interface.cc:82
-msgid "Alarm"
-msgstr "Alarm"
-
-#: src/alarm/alarm.cc:782
-msgid "Set Alarm ..."
-msgstr "Alarm instellen ..."
-
-#: src/alarm/alarm.cc:810
-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 ""
-"Een invoegtoepassing die gebruikt kan worden om het afspelen te starten op "
-"een bepaald tijdstip.\n"
-"\n"
-"Origineel geschreven door Adam Feakin en Daniel Stodden."
-
-#: src/alarm/interface.cc: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 ""
-"Tijd\n"
-"Alarm op:\n"
-"De tijd voor het alarm start.\n"
-"\n"
-"Stil na:\n"
-"Stop alarm na zolang.\n"
-"(als het opsta venster nog gesloten is)\n"
-"\n"
-"\n"
-"Dagen\n"
-"Dag:\n"
-"Selecteer de dagen voor wanneer het \n"
-"alarm actief moet zijn.\n"
-"\n"
-"Tijd:\n"
-"Kies de tijd voor het alarm elke dag,\n"
-"of klik op de pin knop om de standaardwaarde\n"
-"te gebruiken.\n"
-"\n"
-"\n"
-
-#: src/alarm/interface.cc: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"
-"Vervaging:\n"
-"Vervaag het volume op het gekozen tijdstip.\n"
-"\n"
-"Start op:\n"
-"Start vervaging vanaf dit volume.\n"
-"\n"
-"Uiteindelijk:\n"
-"Stop met het vervagen wanneer,\n"
-"de tijd op 0 staat en start met afspelen.\n"
-"\n"
-"\n"
-"Opties:\n"
-"Overige commando's:\n"
-"Voer dit commando uit wanneer het\n"
-"alarm wordt geactiveerd.\n"
-
-#: src/alarm/interface.cc: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 ""
-"Afspeellijst:\n"
-"Laad deze afspeellijst. Als er\n"
-"geen afspeellijst gespecificeerd\n"
-"is, zal de huidige worden gebruikt.\n"
-"De URL van een mp3/ogg stream\n"
-"kan hier ook ingevoerd worden.\n"
-"\n"
-"Herinnering:\n"
-"Laat een herinnering zien wanneer het alarm afgaat.\n"
-"Schrijf een herinnering in dit vakje en activeer de\n"
-"pin knop als je het wilt laten weergeven."
-
-#: src/alarm/interface.cc:81
-msgid "This is your wakeup call."
-msgstr "Dit is uw opstaan melding"
-
-#: src/alarm/interface.cc:99
-msgid "Your reminder for today is..."
-msgstr "Uw herinnering voor vandaag is..."
-
-#: src/alarm/interface.cc:101 src/alarm/interface.cc:386
-msgid "Reminder"
-msgstr "Herinnering"
-
-#: src/alarm/interface.cc:132
-msgid "Monday"
-msgstr "Maandag"
-
-#: src/alarm/interface.cc:132
-msgid "Tuesday"
-msgstr "Dinsdag"
-
-#: src/alarm/interface.cc:132
-msgid "Wednesday"
-msgstr "Woensdag"
-
-#: src/alarm/interface.cc:133
-msgid "Thursday"
-msgstr "Donderdag"
-
-#: src/alarm/interface.cc:133
-msgid "Friday"
-msgstr "Vrijdag"
-
-#: src/alarm/interface.cc:133
-msgid "Saturday"
-msgstr "Zaterdag"
-
-#: src/alarm/interface.cc:133
-msgid "Sunday"
-msgstr "Zondag"
-
-#: src/alarm/interface.cc:171 src/alarm/interface.cc:230
-#: src/alarm/interface.cc:245
-msgid "Time"
-msgstr "Tijd"
-
-#: src/alarm/interface.cc:178
-msgid "Alarm at (default):"
-msgstr "Alarm (op standaard)"
-
-#: src/alarm/interface.cc:200
-msgid "h"
-msgstr "h"
-
-#: src/alarm/interface.cc:203
-msgid "Quiet after:"
-msgstr "Stil na:"
-
-#: src/alarm/interface.cc:215
-msgid "hours"
-msgstr "uren"
-
-#: src/alarm/interface.cc:226
-msgid "minutes"
-msgstr "minuten"
-
-#: src/alarm/interface.cc:235
-msgid "Choose the days for the alarm to come on"
-msgstr "Kies de dag voor het alarm om aan te gaan"
-
-#: src/alarm/interface.cc:242
-msgid "Day"
-msgstr "Dag"
-
-#: src/alarm/interface.cc:259 src/bs2b/plugin.cc:130
-#: src/skins/preset-list.cc:434 src/skins/preset-list.cc:440
-msgid "Default"
-msgstr "Standaard"
-
-#: src/alarm/interface.cc:288
-msgid "Days"
-msgstr "Dagen"
-
-#: src/alarm/interface.cc:297
-msgid "Fading"
-msgstr "Vervagen"
-
-#: src/alarm/interface.cc:305 src/console/plugin.cc:41
-#: src/crossfade/crossfade.cc:53 src/crossfade/crossfade.cc:59
-#: src/gtkui/settings.cc:49 src/lirc/lirc.cc:397 src/sid/xs_config.cc:85
-#: src/sid/xs_config.cc:94 src/sid/xs_config.cc:103
-msgid "seconds"
-msgstr "Seconden"
-
-#: src/alarm/interface.cc:312 src/alarm/interface.cc:353
-msgid "Volume"
-msgstr "Volume"
-
-#: src/alarm/interface.cc:317
-msgid "Start at"
-msgstr "Start bij"
-
-#: src/alarm/interface.cc:333
-msgid "Final"
-msgstr "Laatste"
-
-#: src/alarm/interface.cc:346
-msgid "Current"
-msgstr "Huidige"
-
-#: src/alarm/interface.cc:359
-msgid "Additional Command"
-msgstr "Extra Opdracht"
-
-#: src/alarm/interface.cc:365 src/alarm/interface.cc:391
-msgid "enable"
-msgstr "Aan"
-
-#: src/alarm/interface.cc:372
-msgid "Playlist (optional)"
-msgstr "Afspeellijst (Hoeft niet)"
+#: src/adplug/adplug-xmms.cc:349 src/sid/xs_config.cc:61
+msgid "Output"
+msgstr "Uitvoer"
 
-#: src/alarm/interface.cc:379
-msgid "Select a playlist"
-msgstr "Selecteer een afspeellijst"
+#: src/adplug/adplug-xmms.cc:350
+msgid "OPL Emulator:"
+msgstr "OPL-emulator:"
+
+#: src/adplug/adplug-xmms.cc:353 src/amidiplug/i_configure.cc:153
+#: src/console/plugin.cc:45 src/filewriter/filewriter.cc:481
+#: src/sid/xs_config.cc:65 src/xsf/plugin.cc:446
+msgid "Sample rate:"
+msgstr "Sample-rate:"
 
-#: src/alarm/interface.cc:399
-msgid "Options"
-msgstr "Opties"
+#: src/adplug/adplug-xmms.cc:354 src/amidiplug/i_configure.cc:155
+#: src/bs2b/plugin.cc:141 src/console/plugin.cc:47
+#: src/modplug/plugin_main.cc:77 src/resample/resample.cc:201
+#: src/resample/resample.cc:207 src/resample/resample.cc:211
+#: src/resample/resample.cc:215 src/resample/resample.cc:219
+#: src/resample/resample.cc:223 src/resample/resample.cc:227
+#: src/resample/resample.cc:231 src/resample/resample.cc:235
+#: src/resample/resample.cc:239 src/resample/resample.cc:243
+#: src/sid/xs_config.cc:67 src/soxr/sox-resampler.cc:205
+msgid "Hz"
+msgstr "Hz"
 
-#: src/alarm/interface.cc:404
-msgid "What do these options mean?"
-msgstr "Wat betekenen deze opties"
+#: src/adplug/adplug-xmms.cc:355 src/gtkui/settings.cc:55
+#: src/modplug/plugin_main.cc:105 src/qtui/settings.cc:85
+#: src/skins-qt/skins_cfg.cc:302 src/skins/skins_cfg.cc:284
+msgid "Miscellaneous"
+msgstr "Overig"
 
-#: src/alarm/interface.cc:420
-msgid "Help"
-msgstr "Help"
+#: src/adplug/adplug-xmms.cc:356
+msgid "Repeat song in endless loop"
+msgstr "Nummer eindeloos herhalen"
 
-#: src/albumart/albumart.cc:31
+#: src/albumart/albumart.cc:31 src/albumart-qt/albumart.cc:35
 msgid "Album Art"
 msgstr "Albumhoes"
 
-#: src/albumart-qt/albumart.cc:33
-msgid "Album Art (Qt)"
-msgstr "Albumhoes (Qt)"
-
-#: src/alsa/alsa.h:70
+#: src/alsa/alsa.h:64
 msgid "ALSA Output"
-msgstr "ALSA Uitvoer"
+msgstr "ALSA-uitvoer"
 
 #: src/alsa/config.cc:28
 msgid ""
@@ -319,42 +92,42 @@
 "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 Uitvoer Invoegtoepassing voor Audacious\n"
+"ALSA-uitvoerplug-in voor Audacious\n"
 "Copyright 2009-2012 John Lindgren\n"
 "\n"
-"Met dank aan William Pitcock, schrijver van de ALSA Uitvoer Plugin NG,\n"
-"van wie zijn code werd gebruikt als handleiding wanneer de ALSA handleiding "
-"niet genoeg was."
+"Met dank aan William Pitcock, auteur van de ALSA-uitvoerplug-in NG,\n"
+"van wie zijn code werd gebruikt als handleiding als de ALSA-handleiding niet "
+"genoeg was."
 
 #: src/alsa/config.cc:61
 msgid "(no description)"
-msgstr "(geen beschrijving)"
+msgstr "(geen omschrijving)"
 
 #: src/alsa/config.cc:166
 msgid "Default PCM device"
-msgstr "Standaard PCM apparaat"
+msgstr "Standaard PCM-apparaat"
 
 #: src/alsa/config.cc:188
 msgid "Default mixer device"
-msgstr "Standaard mixer apparaat"
+msgstr "Standaard mixer-apparaat"
 
 #: src/alsa/config.cc:296
 msgid "PCM device:"
-msgstr "PCM apparaat:"
+msgstr "PCM-apparaat:"
 
 #: src/alsa/config.cc:299
 msgid "Mixer device:"
-msgstr "Mixer apparaat:"
+msgstr "Mixer-apparaat:"
 
 #: src/alsa/config.cc:302
 msgid "Mixer element:"
-msgstr "Mixer element:"
+msgstr "Mixer-element:"
 
-#: src/amidi-plug/amidi-plug.cc:41
+#: src/amidiplug/amidi-plug.cc:42
 msgid "AMIDI-Plug (MIDI Player)"
-msgstr "AMIDI-Plug (MIDI Speler)"
+msgstr "AMIDI-Plug (midi-speler)"
 
-#: src/amidi-plug/amidi-plug.cc:437
+#: src/amidiplug/amidi-plug.cc:445
 msgid ""
 "AMIDI-Plug\n"
 "modular MIDI music player\n"
@@ -376,158 +149,180 @@
 "Tony Vroon\n"
 "for the good help with alpha testing"
 msgstr ""
+"AMIDI-Plug\n"
+"Modulaire midi-muziekspeler\n"
+"http://www.develia.org/projects.php?p=amidiplug\n"
+"\n"
+"Gemaakt door Giacomo Lozito\n"
+"<james@develia.org>\n"
+"Met speciale dank aan…\n"
+"\n"
+"Clemens Ladisch en Jaroslav Kysela\n"
+"Voor hun coole programma's aplaymidi en amixer; \n"
+"Deze waren erg handig, evenals de documentatie van alsa-lib, \n"
+"waardoor men meer informatie kan krijgen over de ALSA-api\n"
+"\n"
+"Alfredo Spadafina\n"
+"voor het mooie midi-toetsenbordlogo\n"
+"\n"
+"Tony Vroon\n"
+"voor de goede hulp met het testen van de alfaversie"
 
-#: src/amidi-plug/i_configure.cc:94
+#: src/amidiplug/i_configure.cc:94
 msgid "Override default gain:"
-msgstr ""
+msgstr "Standaard toenemen negeren:"
 
-#: src/amidi-plug/i_configure.cc:102
+#: src/amidiplug/i_configure.cc:102
 msgid "Override default polyphony:"
-msgstr ""
+msgstr "Standaard polyphony negeren:"
 
-#: src/amidi-plug/i_configure.cc:110
+#: src/amidiplug/i_configure.cc:110
 msgid "Override default reverb:"
-msgstr ""
+msgstr "Standaard reverb negeren:"
 
-#: src/amidi-plug/i_configure.cc:112 src/amidi-plug/i_configure.cc:120
+#: src/amidiplug/i_configure.cc:112 src/amidiplug/i_configure.cc:120
 msgid "On"
-msgstr "Aan"
+msgstr "Ingeschakeld"
 
-#: src/amidi-plug/i_configure.cc:118
+#: src/amidiplug/i_configure.cc:118
 msgid "Override default chorus:"
-msgstr ""
+msgstr "Standaard refrein negeren:"
 
-#: src/amidi-plug/i_configure.cc:128 src/console/plugin.cc:29
+#: src/amidiplug/i_configure.cc:128 src/console/plugin.cc:29
 msgid "Playback"
 msgstr "Afspelen"
 
-#: src/amidi-plug/i_configure.cc:129
+#: src/amidiplug/i_configure.cc:129
 msgid "Transpose:"
-msgstr ""
+msgstr "Omzetten: "
 
-#: src/amidi-plug/i_configure.cc:131
+#: src/amidiplug/i_configure.cc:131 src/speedpitch/speed-pitch.cc:257
 msgid "semitones"
-msgstr ""
+msgstr "halve tonen"
 
-#: src/amidi-plug/i_configure.cc:132
+#: src/amidiplug/i_configure.cc:132
 msgid "Drum shift:"
-msgstr ""
+msgstr "Drumverschuiving: "
 
-#: src/amidi-plug/i_configure.cc:134
+#: src/amidiplug/i_configure.cc:134
 msgid "note numbers"
-msgstr "Noteer nummers"
+msgstr "nummers noteren"
 
-#: src/amidi-plug/i_configure.cc:135
+#: src/amidiplug/i_configure.cc:135
 msgid "Skip leading silence"
-msgstr ""
+msgstr "Voornaamste stilte overslaan"
 
-#: src/amidi-plug/i_configure.cc:137
+#: src/amidiplug/i_configure.cc:137
 msgid "Skip trailing silence"
-msgstr ""
+msgstr "Achterlatende stilte overslaan"
 
-#: src/amidi-plug/i_configure.cc:141
+#: src/amidiplug/i_configure.cc:141
 msgid "SoundFont"
-msgstr ""
+msgstr "SoundFont"
 
-#: src/amidi-plug/i_configure.cc:143
+#: src/amidiplug/i_configure.cc:148
 msgid "Synthesizer"
 msgstr "Synthesizer"
 
-#: src/amidi-plug/i_configure.cc:148 src/console/plugin.cc:45
-#: src/sid/xs_config.cc:65
-msgid "Sample rate:"
-msgstr "Sample rate:"
-
-#: src/amidi-plug/i_configure.cc:150 src/bs2b/plugin.cc:141
-#: src/console/plugin.cc:47 src/modplug/plugin_main.cc:78
-#: src/resample/resample.cc:201 src/resample/resample.cc:207
-#: src/resample/resample.cc:211 src/resample/resample.cc:215
-#: src/resample/resample.cc:219 src/resample/resample.cc:223
-#: src/resample/resample.cc:227 src/resample/resample.cc:231
-#: src/resample/resample.cc:235 src/resample/resample.cc:239
-#: src/resample/resample.cc:243 src/sid/xs_config.cc:67
-#: src/sox-resampler/sox-resampler.cc:163
-msgid "Hz"
-msgstr "Hz"
-
-#: src/amidi-plug/i_configure-fluidsynth.cc:52
+#: src/amidiplug/i_configure-fluidsynth.cc:58
+#: src/amidiplug/i_configure-fluidsynth.cc:527
 msgid "AMIDI-Plug - select SoundFont file"
-msgstr "AMIDI-Plug - SoundFont bestand selecteren"
+msgstr "AMIDI-Plug - SoundFont-bestand selecteren"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:55 src/filewriter/mp3.cc:658
+#: src/amidiplug/i_configure-fluidsynth.cc:61
 msgid "_Cancel"
-msgstr "_Sluiten"
+msgstr "_Annuleren"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:56
+#: src/amidiplug/i_configure-fluidsynth.cc:62
 msgid "_Open"
-msgstr "_Open"
+msgstr "_Openen"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:225 src/gtkui/columns.cc:46
+#: src/amidiplug/i_configure-fluidsynth.cc:233
+#: src/amidiplug/i_configure-fluidsynth.cc:461
 msgid "File name"
 msgstr "Bestandsnaam"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:229
+#: src/amidiplug/i_configure-fluidsynth.cc:237
+#: src/amidiplug/i_configure-fluidsynth.cc:464
 msgid "Size (bytes)"
-msgstr "Groote (bytes)"
+msgstr "Grootte (bytes)"
 
-#: src/amidi-plug/i_fileinfo.cc:163
+#: src/amidiplug/i_fileinfo.cc:184
 msgid "Name:"
 msgstr "Naam:"
 
-#: src/amidi-plug/i_fileinfo.cc:181
+#: src/amidiplug/i_fileinfo.cc:202
 msgid " MIDI Info "
-msgstr " MIDI Info "
+msgstr " MIDI-informatie "
 
-#: src/amidi-plug/i_fileinfo.cc:195
+#: src/amidiplug/i_fileinfo.cc:216
 msgid "Format:"
-msgstr "A"
+msgstr "Formaat:"
 
-#: src/amidi-plug/i_fileinfo.cc:198
+#: src/amidiplug/i_fileinfo.cc:219
 msgid "Length (msec):"
-msgstr "Lengte (msec):"
+msgstr "Duur (msec):"
 
-#: src/amidi-plug/i_fileinfo.cc:201
+#: src/amidiplug/i_fileinfo.cc:222
 msgid "No. of Tracks:"
-msgstr "Aantal Tracks:"
+msgstr "Aantal nummers:"
 
-#: src/amidi-plug/i_fileinfo.cc:207
+#: src/amidiplug/i_fileinfo.cc:228
 msgid "variable"
 msgstr "variabel"
 
-#: src/amidi-plug/i_fileinfo.cc:209
+#: src/amidiplug/i_fileinfo.cc:230
 msgid "BPM:"
 msgstr "BPM:"
 
-#: src/amidi-plug/i_fileinfo.cc:217
+#: src/amidiplug/i_fileinfo.cc:238
 msgid "BPM (wavg):"
 msgstr "BPM (wavg):"
 
-#: src/amidi-plug/i_fileinfo.cc:220
+#: src/amidiplug/i_fileinfo.cc:241
 msgid "Time Div:"
 msgstr "Time Div:"
 
-#: src/amidi-plug/i_fileinfo.cc:231
+#: src/amidiplug/i_fileinfo.cc:252
 msgid " MIDI Comments and Lyrics "
-msgstr " MIDI Commentaar en songtekst "
+msgstr " MIDI-commentaar en songtekst "
 
-#: src/amidi-plug/i_fileinfo.cc:278
+#: src/amidiplug/i_fileinfo.cc:299
 msgid "* no comments available in this MIDI file *"
-msgstr "* geen commentaar beschikbaar in dit MIDI bestand *"
+msgstr "* geen commentaar beschikbaar in dit MIDI-bestand *"
 
-#: src/amidi-plug/i_fileinfo.cc:290
+#: src/amidiplug/i_fileinfo.cc:311
 msgid "* no lyrics available in this MIDI file *"
-msgstr "* geen songtekst beschikbaar in dit MIDI bestand *"
+msgstr "* geen songtekst beschikbaar in dit MIDI-bestand *"
 
-#: src/amidi-plug/i_fileinfo.cc:300 src/filewriter/vorbis.cc:197
-#: src/ladspa/plugin.cc:416
+#: src/amidiplug/i_fileinfo.cc:321 src/ladspa/plugin.cc:418
+#: src/ui-common/dialogs-qt.cc:32
 msgid "_Close"
-msgstr "_Sluit"
+msgstr "_Sluiten"
 
-#: src/amidi-plug/i_fileinfo.cc:325
+#: src/amidiplug/i_fileinfo.cc:346
 msgid " (invalid UTF-8)"
-msgstr " (onjuist UTF-8)"
+msgstr " (onjuiste UTF-8)"
+
+#: src/ampache/ampache.cc:33
+msgid "Ampache Browser"
+msgstr "Ampache Browser"
+
+#: src/ampache/ampache.cc:46
+msgid ""
+"Ampache Browser for Audacious\n"
+"http://ampache-browser.org/\n"
+"\n"
+"Copyright (C) Róbert Čerňanský and John Lindgren\n"
+"License: GNU GPLv3"
+msgstr ""
+"Ampache Browser voor Audacious\n"
+"http://ampache-browser.org/\n"
+"\n"
+"Auteursrecht (C) Róbert Čerňanský and John Lindgren\n"
+"Licentie: GNU GPLv3"
 
-#: src/aosd/aosd.cc:32
+#: src/aosd/aosd.cc:31
 msgid ""
 "Audacious OSD\n"
 "http://www.develia.org/projects.php?p=audacious#aosd\n"
@@ -537,6 +332,13 @@
 "Based in part on Evan Martin's Ghosd library:\n"
 "http://neugierig.org/software/ghosd/"
 msgstr ""
+"Audacious OSD\n"
+"http://www.develia.org/projects.php?p=audacious#aosd\n"
+"\n"
+"Geschreven door Giacomo Lozito <james@develia.org>\n"
+"\n"
+"Gebaseerd op de Evan Martin Ghosd-bibliotheek:\n"
+"http://neugierig.org/software/ghosd/"
 
 #: src/aosd/aosd.h:37
 msgid "AOSD (On-Screen Display)"
@@ -552,228 +354,301 @@
 
 #: src/aosd/aosd_style.cc:64
 msgid "Concave Rectangle"
-msgstr "Concave vierkant"
+msgstr "Vierkant met bolle hoeken"
 
-#: src/aosd/aosd_style.cc:69
+#: src/aosd/aosd_style.cc:69 src/openmpt/mptwrap.h:50 src/xsf/plugin.cc:436
 msgid "None"
 msgstr "Geen"
 
-#: src/aosd/aosd_trigger.cc:50
+#: src/aosd/aosd_trigger.cc:49
 msgid "Playback Start"
-msgstr "Start Afspelen"
+msgstr "Afspelen starten"
 
-#: src/aosd/aosd_trigger.cc:51
+#: src/aosd/aosd_trigger.cc:50
 msgid "Triggers OSD when a playlist entry is played."
-msgstr "OSD starten wanneer een afspeellijst regel word afgespeeld."
+msgstr "OSD tonen bij het afspelen van afspeellijstitems."
 
-#: src/aosd/aosd_trigger.cc:56
+#: src/aosd/aosd_trigger.cc:55
 msgid "Title Change"
-msgstr "Titel verandering"
+msgstr "Titelwijziging"
 
-#: src/aosd/aosd_trigger.cc:57
+#: src/aosd/aosd_trigger.cc:56
 msgid "Triggers OSD when the song title changes (for internet streams)."
-msgstr ""
-"OSD wordt geactiveerd wanneer een liedtitel verandert (voor internet "
-"streams)."
+msgstr "OSD tonen bij nummerwijzigingen (voor internetstreams)."
 
-#: src/aosd/aosd_trigger.cc:62
+#: src/aosd/aosd_trigger.cc:61
 msgid "Pause On"
-msgstr "Pause Aan"
+msgstr "Gepauzeerd"
 
-#: src/aosd/aosd_trigger.cc:63
+#: src/aosd/aosd_trigger.cc:62
 msgid "Triggers OSD when playback is paused."
-msgstr "OSD wordt geactiveerd wanneer afspelen wordt gepauzeerd."
+msgstr "OSD tonen als het afspelen wordt gepauzeerd."
 
-#: src/aosd/aosd_trigger.cc:68
+#: src/aosd/aosd_trigger.cc:67
 msgid "Pause Off"
-msgstr "Pause Uit"
+msgstr "Hervatten"
 
-#: src/aosd/aosd_trigger.cc:69
+#: src/aosd/aosd_trigger.cc:68
 msgid "Triggers OSD when playback is unpaused."
-msgstr "OSD wordt geactiveerd wanneer afspelen wordt hervat."
+msgstr "OSD tonen als het afspelen wordt hervat."
 
-#: src/aosd/aosd_ui.cc:163
+#: src/aosd/aosd_ui.cc:204
 msgid "Placement"
 msgstr "Plaatsing"
 
-#: src/aosd/aosd_ui.cc:196
+#: src/aosd/aosd_ui.cc:241
 msgid "Relative X offset:"
-msgstr "Relatieve X verplaatsing:"
+msgstr "Relatieve X-plaatsing:"
 
-#: src/aosd/aosd_ui.cc:203
+#: src/aosd/aosd_ui.cc:245
 msgid "Relative Y offset:"
-msgstr "Relatieve Y verplaatsing:"
+msgstr "Relatieve Y-plaatsing:"
 
-#: src/aosd/aosd_ui.cc:210
+#: src/aosd/aosd_ui.cc:249
 msgid "Max OSD width:"
-msgstr "Max OSD breedte:"
+msgstr "Max. OSD-breedte:"
 
-#: src/aosd/aosd_ui.cc:221
+#: src/aosd/aosd_ui.cc:281
 msgid "Multi-Monitor options"
-msgstr "Multi-Monitor opties"
+msgstr "Meerdere monitors-opties"
 
-#: src/aosd/aosd_ui.cc:225
+#: src/aosd/aosd_ui.cc:285
 msgid "Display OSD using:"
-msgstr "Toon OSD op:"
+msgstr "OSD tonen op:"
 
-#: src/aosd/aosd_ui.cc:227
+#: src/aosd/aosd_ui.cc:287
 msgid "all monitors"
 msgstr "alle monitors"
 
-#: src/aosd/aosd_ui.cc:230
+#: src/aosd/aosd_ui.cc:290
 #, c-format
 msgid "monitor %i"
 msgstr "monitor %i"
 
-#: src/aosd/aosd_ui.cc:282
+#: src/aosd/aosd_ui.cc:342
 msgid "Timing (ms)"
 msgstr "Timing (ms)"
 
-#: src/aosd/aosd_ui.cc:287
+#: src/aosd/aosd_ui.cc:347
 msgid "Display:"
-msgstr "Weergeven:"
+msgstr "Tonen:"
 
-#: src/aosd/aosd_ui.cc:292
+#: src/aosd/aosd_ui.cc:352
 msgid "Fade in:"
-msgstr "Fade in:"
+msgstr "Fade-in:"
 
-#: src/aosd/aosd_ui.cc:297
+#: src/aosd/aosd_ui.cc:357
 msgid "Fade out:"
-msgstr "Fade uit:"
+msgstr "Fade-out:"
 
-#: src/aosd/aosd_ui.cc:361
+#: src/aosd/aosd_ui.cc:442
 msgid "Fonts"
 msgstr "Lettertypen"
 
-#: src/aosd/aosd_ui.cc:368
+#: src/aosd/aosd_ui.cc:449
 #, c-format
 msgid "Font %i:"
 msgstr "Lettertype %i:"
 
-#: src/aosd/aosd_ui.cc:382
+#: src/aosd/aosd_ui.cc:466
 msgid "Shadow"
 msgstr "Schaduw"
 
-#: src/aosd/aosd_ui.cc:486
+#: src/aosd/aosd_ui.cc:589
 msgid "Render Style"
 msgstr "Weergavestijl"
 
-#: src/aosd/aosd_ui.cc:502
+#: src/aosd/aosd_ui.cc:605
 msgid "Colors"
 msgstr "Kleuren"
 
-#: src/aosd/aosd_ui.cc:513
+#: src/aosd/aosd_ui.cc:616
 #, c-format
 msgid "Color %i:"
 msgstr "Kleur %i:"
 
-#: src/aosd/aosd_ui.cc:600
+#: src/aosd/aosd_ui.cc:714
 msgid "Enable trigger"
-msgstr "Trekker inschakelen"
+msgstr "Trigger inschakelen"
 
-#: src/aosd/aosd_ui.cc:627
+#: src/aosd/aosd_ui.cc:741
 msgid "Event"
 msgstr "Gebeurtenis"
 
-#: src/aosd/aosd_ui.cc:655
+#: src/aosd/aosd_ui.cc:768
 msgid "Composite manager detected"
-msgstr ""
+msgstr "3D-vensterbeheerder gedetecteerd"
 
-#: src/aosd/aosd_ui.cc:662
+#: src/aosd/aosd_ui.cc:775
 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 ""
+"Geen 3D-vensterbeheerder gedetecteerd.\n"
+"Als je weet dat er wél één draait, activeer hem dan. Zonder 3D-"
+"vensterbeheerder zal OSD niet goed werken."
 
-#: src/aosd/aosd_ui.cc:670
+#: src/aosd/aosd_ui.cc:783
 msgid "Composite manager not required for fake transparency"
-msgstr ""
+msgstr "Geen 3D-vensterbeheerder vereist voor nep-doorzichtigheid"
 
-#: src/aosd/aosd_ui.cc:706
+#: src/aosd/aosd_ui.cc:820
 msgid "Transparency"
 msgstr "Doorzichtigheid"
 
-#: src/aosd/aosd_ui.cc:712
+#: src/aosd/aosd_ui.cc:826
 msgid "Fake transparency"
-msgstr "Valse doorzichtigheid"
+msgstr "Nep-doorzichtigheid"
 
-#: src/aosd/aosd_ui.cc:714
+#: src/aosd/aosd_ui.cc:828
 msgid "Real transparency (requires X Composite Ext.)"
-msgstr "Echte doorzichtigheid (vereist X Composiet uitbreiding)"
+msgstr "Echte doorzichtigheid (vereist X Composite-uitbreiding)"
 
-#: src/aosd/aosd_ui.cc:756
+#: src/aosd/aosd_ui.cc:875
 msgid "Composite extension not loaded"
-msgstr ""
-
-#: src/aosd/aosd_ui.cc:764
-msgid "Composite extension not available"
-msgstr ""
+msgstr "Composite-uitbreiding is niet geladen"
 
-#: src/aosd/aosd_ui.cc:781
+#: src/aosd/aosd_ui.cc:892
 #, c-format
 msgid "Audacious OSD"
 msgstr "Audacious OSD"
 
-#: src/aosd/aosd_ui.cc:844
+#: src/aosd/aosd_ui.cc:955
 msgid "Position"
 msgstr "Positie"
 
-#: src/aosd/aosd_ui.cc:849
+#: src/aosd/aosd_ui.cc:960
 msgid "Animation"
 msgstr "Animatie"
 
-#: src/aosd/aosd_ui.cc:854
+#: src/aosd/aosd_ui.cc:965
 msgid "Text"
 msgstr "Tekst"
 
-#: src/aosd/aosd_ui.cc:859
+#: src/aosd/aosd_ui.cc:970
 msgid "Decoration"
 msgstr "Decoratie"
 
-#: src/aosd/aosd_ui.cc:864
+#: src/aosd/aosd_ui.cc:975
 msgid "Trigger"
-msgstr "Trekker"
+msgstr "Trigger"
 
-#: src/aosd/aosd_ui.cc:869
+#: src/aosd/aosd_ui.cc:980 src/streamtuner/shoutcast-model.cc:202
 msgid "Misc"
-msgstr "Divers"
+msgstr "Overig"
 
-#: src/aosd/aosd_ui.cc:878
+#: src/aosd/aosd_ui.cc:989
 msgid "Test"
 msgstr "Test"
 
 #: src/asx3/asx3.cc:35
 msgid "ASXv3 Playlists"
-msgstr "ASXv3 Afspeellijsten"
+msgstr "ASXv3-afspeellijsten"
 
 #: src/asx/asx.cc:33
 msgid "ASXv1/ASXv2 Playlists"
-msgstr "ASXv1/ASXv2 Afspeellijsten"
+msgstr "ASXv1/ASXv2-afspeellijsten"
 
 #: src/audpl/audpl.cc:33
 msgid "Audacious Playlists (audpl)"
-msgstr "Audacious Afspeellijsten (audpl)"
+msgstr "Audacious-afspeellijsten (audpl)"
+
+#: src/background_music/background_music.cc:24
+msgid "Background music"
+msgstr "Achtergrondmuziek"
+
+#: src/background_music/background_music.cc:25
+msgid "Target level:"
+msgstr "Doelniveau:"
 
-#: src/blur_scope/blur_scope.cc:42
+#: src/background_music/background_music.cc:28
+#: src/background_music/background_music.cc:33
+#: src/silence-removal/silence-removal.cc:70
+msgid "dB"
+msgstr "dB"
+
+#: src/background_music/background_music.cc:29
+msgid "Maximum amplification:"
+msgstr "Maximale versterking:"
+
+#: src/background_music/background_music.cc:34 src/mpg123/mpg123.cc:81
+msgid "Advanced"
+msgstr "Geavanceerd"
+
+#: src/background_music/background_music.cc:36
+msgid "Slow detection weight:"
+msgstr "Langzaam detectiegewicht:"
+
+#: src/background_music/background_music.cc:39
+msgid "Hint"
+msgstr "Tip"
+
+#: src/background_music/background_music.cc:41
+msgid ""
+"Slow detection weight is the relative weight\n"
+"of a long term average detection when compared\n"
+"to the actual, faster loudness detection.\n"
+"A value of zero gives a more radio-like sound\n"
+"where soft passages get \"pulled up\" more quickly,\n"
+"a value of two makes the sound feel less compressed."
+msgstr ""
+
+#: src/background_music/background_music.cc:52
+msgid ""
+"Background Music Plugin for Audacious\n"
+"Copyright 2023;2024 Michel Fleur\n"
+"\n"
+"Controls the volume to make the sound equally loud within and between "
+"tracks.\n"
+" It uses accurate loudness measurement and tries to make the volume changes "
+"sound natural without audible peaks, yet without lowering the volume before "
+"a peak in advance."
+msgstr ""
+
+#: src/background_music/background_music.cc:61
+msgid "Background Music"
+msgstr "Achtergrondmuziek"
+
+#: src/bitcrusher/bitcrusher.cc:33
+msgid "Bitcrusher"
+msgstr "Bitvertraging"
+
+#: src/bitcrusher/bitcrusher.cc:34
+msgid "Bit Depth:"
+msgstr "Bitdiepte:"
+
+#: src/bitcrusher/bitcrusher.cc:37
+msgid "Downsample ratio:"
+msgstr "Downsample-verhouding:"
+
+#: src/bitcrusher/bitcrusher.cc:48
+msgid "Bitcrusher"
+msgstr "Bitvertraging"
+
+#: src/blur_scope/blur_scope.cc:40 src/blur_scope-qt/blur_scope.cc:45
 msgid "Color"
 msgstr "Kleur"
 
-#: src/blur_scope/blur_scope.cc:58
+#: src/blur_scope/blur_scope.cc:56 src/blur_scope-qt/blur_scope.cc:158
 msgid "Blur Scope"
-msgstr ""
+msgstr "Omtrek vervagen"
 
 #: src/bs2b/plugin.cc:38
 msgid "Bauer Stereophonic-to-Binaural (BS2B)"
-msgstr ""
+msgstr "Bauer Stereofonisch-naar-Binaural (BS2B)"
 
 #: src/bs2b/plugin.cc:129
 msgid "Presets:"
-msgstr "Presets:"
+msgstr "Voorinstellingen:"
+
+#: src/bs2b/plugin.cc:130
+msgid "Default"
+msgstr "Standaard"
 
 #: src/bs2b/plugin.cc:136
 msgid "Feed level:"
-msgstr ""
+msgstr "Feedniveau:"
 
 #: src/bs2b/plugin.cc:138
 msgid "x1/10 dB"
@@ -781,17 +656,17 @@
 
 #: src/bs2b/plugin.cc:139
 msgid "Cut frequency:"
-msgstr "Knip frequentie:"
+msgstr "Knipfrequentie:"
 
-#: src/cairo-spectrum/cairo-spectrum.cc:41
+#: src/cairo-spectrum/cairo-spectrum.cc:42 src/qt-spectrum/qt-spectrum.cc:107
 msgid "Spectrum Analyzer"
-msgstr "Spectrum Analyseerder"
+msgstr "Spectrum-analyse"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:72
+#: src/cdaudio/cdaudio-ng.cc:74
 msgid "Audio CD Plugin"
-msgstr "Audio CD Plugin"
+msgstr "Audio-cd-plug-in"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:121
+#: src/cdaudio/cdaudio-ng.cc:121
 msgid ""
 "Copyright (C) 2007-2012 Calin Crisan <ccrisan@gmail.com> and others.\n"
 "\n"
@@ -802,133 +677,138 @@
 "\n"
 "This was a Google Summer of Code 2007 project."
 msgstr ""
+"Auteursrecht (C) 2007-2012 Calin Crisan <ccrisan@gmail.com> en andere.\n"
+"Veel dank aan libcdio ontwikkelaars <http://www.gnu.org/software/libcdio/>\n"
+"en aan libcddb ontwikkelaars <http://libcddb.sourceforge.net/>.\n"
+"Ook bedankt aan Tony Vroon voor het begeleiden van mij.\n"
+"Dit was een Google Summer of Code 2007-project."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:137
+#: src/cdaudio/cdaudio-ng.cc:140
 msgid "Device"
 msgstr "Apparaat"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:138
+#: src/cdaudio/cdaudio-ng.cc:141
 msgid "Read speed:"
-msgstr "Lees snelheid:"
+msgstr "Leessnelheid:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:141
+#: src/cdaudio/cdaudio-ng.cc:144
 msgid "Override device:"
-msgstr "Override apparaat:"
+msgstr "Apparaat overschrijven:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:143
+#: src/cdaudio/cdaudio-ng.cc:146
 msgid "Metadata"
-msgstr "Metadata"
+msgstr "Metagegevens"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:144
+#: src/cdaudio/cdaudio-ng.cc:147
 msgid "Use CD-Text"
-msgstr "Gebruik CD-Tekst"
+msgstr "CD-tekst gebruiken"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:146
+#: src/cdaudio/cdaudio-ng.cc:150
 msgid "Use CDDB"
-msgstr "Gebruik CDDB"
+msgstr "CDDB gebruiken"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:148
+#: src/cdaudio/cdaudio-ng.cc:152
 msgid "Use HTTP instead of CDDBP"
-msgstr "Gebruik HTTP in plaats van CDDBP"
+msgstr "HTTP gebruiken in plaats van CDDBP"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:151
+#: src/cdaudio/cdaudio-ng.cc:155
 msgid "Server:"
 msgstr "Server:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:155
+#: src/cdaudio/cdaudio-ng.cc:159
 msgid "Path:"
 msgstr "Pad:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:159
+#: src/cdaudio/cdaudio-ng.cc:163
 msgid "Port:"
 msgstr "Poort:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:246
+#: src/cdaudio/cdaudio-ng.cc:228
 msgid "Failed to initialize cdio subsystem."
-msgstr "Fout bij initialiseren cdio subsysteem."
+msgstr "Fout bij initialiseren van cdio-subsysteem."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:281
+#: src/cdaudio/cdaudio-ng.cc:260
 #, c-format
 msgid "Invalid URI %s."
-msgstr "Ongeldige URI %s"
+msgstr "Ongeldige uri: %s."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:283
+#: src/cdaudio/cdaudio-ng.cc:262
 #, c-format
 msgid "Track %d not found."
-msgstr "Track %d niet gevonden."
+msgstr "Nummer %d niet gevonden."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:285
+#: src/cdaudio/cdaudio-ng.cc:264
 #, c-format
 msgid "Track %d is a data track."
-msgstr "Track %d is alleen data."
+msgstr "Nummer %d bevat alleen gegevens."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:360
+#: src/cdaudio/cdaudio-ng.cc:339
 msgid "Error reading audio CD."
-msgstr "Fout bij lezen audio CD"
+msgstr "De audio-cd kan niet worden uitgelezen"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:429
+#: src/cdaudio/cdaudio-ng.cc:410
 msgid "Audio CD"
-msgstr "Audio CD"
+msgstr "Audio-cd"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:460 src/cdaudio-ng/cdaudio-ng.cc:469
+#: src/cdaudio/cdaudio-ng.cc:446 src/cdaudio/cdaudio-ng.cc:455
 #, c-format
 msgid "Failed to open CD device %s."
-msgstr "Het openen van CD apparaat %s is mislukt."
+msgstr "Het openen van het cd-apparaat ‘%s’ is mislukt."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:472
+#: src/cdaudio/cdaudio-ng.cc:458
 msgid "No audio capable CD drive found."
-msgstr "Geen CD speler met audio mogelijkheid gevonden."
+msgstr "Geen cd-speler met audiomogelijkheid aangetroffen."
+
+#: src/cdaudio/cdaudio-ng.cc:481
+msgid "Drive is empty."
+msgstr "Schijfstation is leeg."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:497
+#: src/cdaudio/cdaudio-ng.cc:483
+msgid "Unsupported disk type."
+msgstr "Niet-ondersteund schijftype."
+
+#: src/cdaudio/cdaudio-ng.cc:507
 msgid "Failed to finish initializing opened CD drive."
-msgstr "Het Initialiseren van de geopende CD Drive is mislukt."
+msgstr "Het initialiseren van de geopende cd-schijf is mislukt."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:510
+#: src/cdaudio/cdaudio-ng.cc:520
 msgid "Failed to retrieve first/last track number."
-msgstr "Het herstellen van de eerste/laatste tracknummer is mislukt."
+msgstr "Het herstellen van het eerste/laatste titelnummer is mislukt."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:531
+#: src/cdaudio/cdaudio-ng.cc:541
 #, c-format
 msgid "Cannot read start/end LSN for track %d."
-msgstr ""
+msgstr "Kan begin-/eind-LSN van het nummer ‘%d’ niet uitlezen."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:613
-msgid "Failed to create the cddb connection."
-msgstr "Fout bij verbinden met de cddb"
+#: src/cdaudio/cdaudio-ng.cc:624
+msgid "Failed to create the CDDB connection."
+msgstr "Fout bij verbinden met de CDDB."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:679
+#: src/cdaudio/cdaudio-ng.cc:690
 msgid "Failed to query the CDDB server"
-msgstr ""
+msgstr "Fout bij indienen van verzoek bij de CDDB-server"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:681
+#: src/cdaudio/cdaudio-ng.cc:692
 #, c-format
 msgid "Failed to query the CDDB server: %s"
-msgstr ""
+msgstr "Fout bij indienen van verzoek bij de CDDB-server: %s"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:705
+#: src/cdaudio/cdaudio-ng.cc:716
 #, c-format
-msgid "Failed to read the cddb info: %s"
-msgstr "Fout bij lezen van cddb info: %s"
-
-#: src/cdaudio-ng/cdaudio-ng.cc:765
-msgid "Drive is empty."
-msgstr "Schijfstation is leeg."
-
-#: src/cdaudio-ng/cdaudio-ng.cc:767
-msgid "Unsupported disk type."
-msgstr "Niet-ondersteund schijftype."
+msgid "Failed to read the CDDB info: %s"
+msgstr "Fout bij uitlezen van CDDB-informatie: %s"
 
-#: src/cd-menu-items/cd-menu-items.cc:35
+#: src/cd-menu-items/cd-menu-items.cc:33
 msgid "Audio CD Menu Items"
-msgstr "Audio CD Menu Items"
+msgstr "Audio-cd - menu-items"
 
-#: src/cd-menu-items/cd-menu-items.cc:47
-msgid "Play CD"
-msgstr "CD afspelen"
-
-#: src/cd-menu-items/cd-menu-items.cc:47
-msgid "Add CD"
-msgstr "CD toevoegen"
+#: src/cd-menu-items/cd-menu-items.cc:45
+msgid "Pla_y CD"
+msgstr "CD afspe_len"
+
+#: src/cd-menu-items/cd-menu-items.cc:45
+msgid "_Add CD"
+msgstr "CD _toevoegen"
 
 #: src/compressor/compressor.cc:45
 msgid "Compression"
@@ -936,7 +816,7 @@
 
 #: src/compressor/compressor.cc:46
 msgid "Center volume:"
-msgstr "Centrum volume:"
+msgstr "Centrumvolume:"
 
 #: src/compressor/compressor.cc:49
 msgid "Dynamic range:"
@@ -947,10 +827,12 @@
 "Dynamic Range Compression Plugin for Audacious\n"
 "Copyright 2010-2014 John Lindgren"
 msgstr ""
+"Dynamisch bereik-compressor-plug-in voor Audacious\n"
+"Copyright 2010-2014 John Lindgren"
 
 #: src/compressor/compressor.cc:64
 msgid "Dynamic Range Compressor"
-msgstr ""
+msgstr "Dynamisch bereik-compressor"
 
 #: src/console/plugin.cc:15
 msgid ""
@@ -961,6 +843,13 @@
 "William Pitcock <nenolod@dereferenced.org>\n"
 "Shay Green <gblargg@gmail.com>"
 msgstr ""
+"Console muziek decoder motor gebaseerd op Game_Music_Emu 0.5.2\n"
+"Ondersteunde formaten: AY, GBS, GYM, HES, KSS, NSF, NSFE, SAP, SPC, VGM, "
+"VGZ\n"
+"\n"
+"Audacious plugin door:\n"
+"William Pitcock <nenolod@dereferenced.org>\n"
+"Shay Green <gblargg@gmail.com>"
 
 #: src/console/plugin.cc:30
 msgid "Bass:"
@@ -976,15 +865,22 @@
 
 #: src/console/plugin.cc:39
 msgid "Default song length:"
-msgstr "Standaard lied lengte:"
+msgstr "Standaard nummerduur:"
+
+#: src/console/plugin.cc:41 src/crossfade/crossfade.cc:56
+#: src/crossfade/crossfade.cc:62 src/lirc/lirc.cc:395 src/notify/notify.cc:113
+#: src/sid/xs_config.cc:85 src/sid/xs_config.cc:94 src/sid/xs_config.cc:103
+#: src/vumeter-qt/vumeter_qt.cc:39
+msgid "seconds"
+msgstr "seconden"
 
-#: src/console/plugin.cc:42 src/modplug/plugin_main.cc:59
+#: src/console/plugin.cc:42 src/modplug/plugin_main.cc:58
 msgid "Resampling"
-msgstr ""
+msgstr "Resampling"
 
 #: src/console/plugin.cc:43
 msgid "Enable audio resampling"
-msgstr ""
+msgstr "Audio-resampling inschakelen"
 
 #: src/console/plugin.cc:49
 msgid "SPC"
@@ -992,85 +888,108 @@
 
 #: src/console/plugin.cc:50
 msgid "Ignore length from SPC tags"
-msgstr "Negeer lengte van SPC tags"
+msgstr "Lengte van SPC-tags negeren"
 
 #: src/console/plugin.cc:52
 msgid "Increase reverb"
-msgstr ""
+msgstr "Reverb verhogen"
 
 #: src/console/plugin.h:26
 msgid "Game Console Music Decoder"
-msgstr ""
+msgstr "Gameconsole-muziekdecoder"
 
-#: src/coreaudio/coreaudio.cc:50
+#: src/coreaudio/coreaudio.cc:53
 msgid "CoreAudio output"
-msgstr ""
+msgstr "CoreAudio-uitvoer"
 
-#: src/coreaudio/coreaudio.cc:131
+#: src/coreaudio/coreaudio.cc:155
 msgid ""
 "CoreAudio Output Plugin for Audacious\n"
 "Copyright 2014 William Pitcock\n"
+"Copyright 2017,18 René J.V. Bertin\n"
+" (original code and code adapted from\n"
+" Apple examples, (C) Apple 2013)\n"
 "\n"
 "Based on SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
 msgstr ""
+"CoreAudio Output Plugin voor Audacious\n"
+"Copyright 2014 William Pitcock\n"
+"Copyright 2017,18 René J.V. Bertin\n"
+" (oorspronkelijke code en code gebruikt van\n"
+" Apple-voorbeelden, (C) Apple 2013) \n"
+"\n"
+"Gebaseerd op de SDL-uitvoerplug-in voor Audacious\n"
+"Copyright 2010 John Lindgren"
 
-#: src/coreaudio/coreaudio.cc:143
+#: src/coreaudio/coreaudio.cc:171
 msgid "Use exclusive mode"
+msgstr "Exclusieve modus gebruiken"
+
+#: src/coreaudio/coreaudio.cc:173
+msgid "Use bit perfect audio (adapt device sampling rate)"
 msgstr ""
+"Bitperfect-audio gebruiken (aanpassen aan samplingsnelheid van apparaat)"
 
-#: src/crossfade/crossfade.cc:44
+#: src/crossfade/crossfade.cc:47
 msgid ""
 "Crossfade Plugin for Audacious\n"
 "Copyright 2010-2014 John Lindgren"
 msgstr ""
+"Overlopen-plug-in voor Audacious\n"
+"Copyright 2010-2014 John Lindgren"
 
-#: src/crossfade/crossfade.cc:48
+#: src/crossfade/crossfade.cc:51
 msgid "Crossfade"
-msgstr ""
+msgstr "Overlopen"
 
-#: src/crossfade/crossfade.cc:49
+#: src/crossfade/crossfade.cc:52
 msgid "On automatic song change"
-msgstr ""
+msgstr "Bij automatische nummerwijziging"
 
-#: src/crossfade/crossfade.cc:51 src/crossfade/crossfade.cc:57
+#: src/crossfade/crossfade.cc:54 src/crossfade/crossfade.cc:60
 msgid "Overlap:"
-msgstr ""
+msgstr "Overlappen:"
 
-#: src/crossfade/crossfade.cc:55
+#: src/crossfade/crossfade.cc:58
 msgid "On seek or manual song change"
+msgstr "Via spoelen of handmatige nummerwijziging"
+
+#: src/crossfade/crossfade.cc:64
+msgid "No fade in"
+msgstr "Niet overvloeien"
+
+#: src/crossfade/crossfade.cc:66
+msgid "Use S-curve fade"
+msgstr "Overvloeiing met s-curve gebruiken"
+
+#: src/crossfade/crossfade.cc:68
+msgid "S-curve steepness:"
+msgstr ""
+
+#: src/crossfade/crossfade.cc:70
+msgid "(higher is steeper)"
 msgstr ""
 
-#: src/crossfade/crossfade.cc:61
+#: src/crossfade/crossfade.cc:72
 msgid "Tip"
 msgstr "Tip"
 
-#: src/crossfade/crossfade.cc:62
+#: src/crossfade/crossfade.cc:73
 msgid ""
 "For better crossfading, enable\n"
 "the Silence Removal effect."
 msgstr ""
+"Schakel het stilte-verwijderingseffect in\n"
+"om nummer beters in elkaar te laten overlopen."
 
-#: src/crossfade/crossfade.cc:72
+#: src/crossfade/crossfade.cc:83
 msgid "Crossfade"
-msgstr ""
-
-#: src/crossfade/crossfade.cc:161
-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.cc:168
-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 "Nummers in elkaar laten overlopen"
 
 #: src/crystalizer/crystalizer.cc:31
 msgid "Crystalizer"
-msgstr ""
+msgstr "Crystalizer"
 
 #: src/crystalizer/crystalizer.cc:32 src/stereo_plugin/stereo.cc:45
 msgid "Intensity:"
@@ -1078,64 +997,65 @@
 
 #: src/crystalizer/crystalizer.cc:43
 msgid "Crystalizer"
-msgstr ""
+msgstr "Crystalizer"
 
-#: src/cue/cue.cc:37
+#: src/cue/cue.cc:42
 msgid "Cue Sheet Plugin"
-msgstr ""
+msgstr "Cue sheet-plug-in"
 
-#: src/delete-files/delete-files.cc:46 src/delete-files/delete-files.cc:146
+#: src/delete-files/delete-files.cc:53 src/delete-files/delete-files.cc:215
+#: src/delete-files/delete-files.cc:230
 msgid "Delete Files"
-msgstr "Verwijder Bestanden"
+msgstr "Bestanden verwijderen"
 
-#: src/delete-files/delete-files.cc:75
+#: src/delete-files/delete-files.cc:120
+msgid "No files are selected."
+msgstr "Er zijn geen bestanden geselecteerd."
+
+#: src/delete-files/delete-files.cc:125
 #, c-format
-msgid "Error moving %s to trash: %s."
-msgstr "Fout bij verplaatsen %s naar de prullenbak: %s."
+msgid "Do you want to move %s to the trash?"
+msgstr "Wil je %s verplaatsen naar de prullenbak?"
 
-#: src/delete-files/delete-files.cc:86
+#: src/delete-files/delete-files.cc:126
 #, c-format
-msgid "Error deleting %s: %s."
-msgstr "Fout bij verwijderen %s: %s."
+msgid "Do you want to permanently delete %s?"
+msgstr "Wil je %s permanent verwijderen?"
 
-#: src/delete-files/delete-files.cc:117
+#: src/delete-files/delete-files.cc:133
 #, c-format
-msgid "Error deleting %s: not a local file."
-msgstr "Fout bij verwijderen %s: is geen lokaal bestand."
+msgid "Do you want to move %d files to the trash?"
+msgstr "Wil je %d bestanden verplaatsen naar de prullenbak?"
 
 #: src/delete-files/delete-files.cc:134
-msgid "Do you want to move the selected files to the trash?"
-msgstr "Wilt u de geselecteerde bestanden verplaatsen naar de prullenbak?"
+#, c-format
+msgid "Do you want to permanently delete %d files?"
+msgstr "Wilt je %d bestanden permanent verwijderen?"
 
-#: src/delete-files/delete-files.cc:135
-msgid "Move to Trash"
-msgstr "Verplaats naar Prullenbak"
-
-#: src/delete-files/delete-files.cc:140
-msgid "Do you want to permanently delete the selected files?"
-msgstr "Wilt u de geselecteerde bestanden definitief verwijderen?"
+#: src/delete-files/delete-files.cc:146
+msgid "Move to trash"
+msgstr "Verplaatsen naar prullenbak"
 
-#: src/delete-files/delete-files.cc:141 src/skins/preset-list.cc:411
-#: src/skins/preset-list.cc:427
+#: src/delete-files/delete-files.cc:146
 msgid "Delete"
-msgstr "Verwijder"
+msgstr "Verwijderen"
 
-#: src/delete-files/delete-files.cc:145 src/skins/preset-browser.cc:56
-#: src/skins/preset-list.cc:307 src/skins/ui_playlist.cc:221
+#: src/delete-files/delete-files.cc:213 src/delete-files/delete-files.cc:235
+#: src/skins-qt/search-select.cc:102 src/skins/search-select.cc:78
 msgid "Cancel"
 msgstr "Annuleren"
 
-#: src/delete-files/delete-files.cc:166
+#: src/delete-files/delete-files.cc:267
 msgid "Delete Selected Files"
-msgstr "Verwijder Geselcteerde Bestanden"
+msgstr "Geselecteerde bestanden verwijderen"
 
-#: src/delete-files/delete-files.cc:181
+#: src/delete-files/delete-files.cc:287
 msgid "Delete Method"
-msgstr "Verwijder Methode"
+msgstr "Verwijdermethode"
 
-#: src/delete-files/delete-files.cc:182
+#: src/delete-files/delete-files.cc:288
 msgid "Move to trash instead of deleting immediately"
-msgstr "Verplaats naar de prullenbak ipv onmiddellijk verwijderen"
+msgstr "Verplaatsen naar prullenbak i.p.v. permanent verwijderen"
 
 #: src/echo_plugin/echo.cc:9
 msgid ""
@@ -1144,18 +1064,22 @@
 "Surround echo by Carl van Schaik, 1999\n"
 "Updated for Audacious by William Pitcock and John Lindgren, 2010-2014"
 msgstr ""
+"Echo-plug-in\n"
+"Door Johan Levin, 1999\n"
+"Surround-echo door Carl van Schaik, 1999\n"
+"Bijgewerkt voor Audacious door William Pitcock en John Lindgren, 2010-2014"
 
 #: src/echo_plugin/echo.cc:21
 msgid "Echo"
 msgstr "Echo"
 
-#: src/echo_plugin/echo.cc:22 src/modplug/plugin_main.cc:73
-#: src/modplug/plugin_main.cc:83
+#: src/echo_plugin/echo.cc:22 src/modplug/plugin_main.cc:72
+#: src/modplug/plugin_main.cc:82
 msgid "Delay:"
 msgstr "Vertraging:"
 
-#: src/echo_plugin/echo.cc:24 src/modplug/plugin_main.cc:73
-#: src/modplug/plugin_main.cc:83
+#: src/echo_plugin/echo.cc:24 src/modplug/plugin_main.cc:72
+#: src/modplug/plugin_main.cc:82 src/xsf/plugin.cc:445
 msgid "ms"
 msgstr "ms"
 
@@ -1163,7 +1087,7 @@
 msgid "Feedback:"
 msgstr "Terugkoppeling:"
 
-#: src/echo_plugin/echo.cc:28 src/modplug/plugin_main.cc:87
+#: src/echo_plugin/echo.cc:28 src/modplug/plugin_main.cc:86
 msgid "Volume:"
 msgstr "Volume:"
 
@@ -1171,11 +1095,11 @@
 msgid "Echo"
 msgstr "Echo"
 
-#: src/ffaudio/ffaudio-core.cc:41
+#: src/ffaudio/ffaudio-core.cc:50
 msgid "FFmpeg Plugin"
-msgstr "FFmpeg Plugin"
+msgstr "FFmpeg-plug-in"
 
-#: src/ffaudio/ffaudio-core.cc:571
+#: src/ffaudio/ffaudio-core.cc:649
 msgid ""
 "Multi-format audio decoding plugin for Audacious using\n"
 "FFmpeg multimedia framework (http://www.ffmpeg.org/)\n"
@@ -1184,243 +1108,337 @@
 "William Pitcock <nenolod@nenolod.net>\n"
 "Matti Hämäläinen <ccr@tnsp.org>"
 msgstr ""
+"Meerdere audioformaten decoder-plug-in voor Audacious, die gebruikt maakt \n"
+"van het FFmpeg-multimediaframework (http://www.ffmpeg.org/)\n"
+"\n"
+"Audacious-plug-in door:\n"
+"William Pitcock <nenolod@nenolod.net>\n"
+"Matti Hämäläinen <ccr@tnsp.org>"
 
-#: src/filewriter/filewriter.cc:45
+#: src/filewriter/filewriter.cc:48
 msgid "FileWriter Plugin"
-msgstr "FileWriter Plugin"
+msgstr "FileWriter-plug-in"
 
-#: src/filewriter/filewriter.cc:386
-msgid "Output file format:"
-msgstr "Uitvoer bestandsformaat:"
+#: src/filewriter/filewriter.cc:316
+#, c-format
+msgid ""
+"Error opening %s:\n"
+"%s"
+msgstr ""
+"Fout bij openen van %s:\n"
+"%s"
 
-#: src/filewriter/filewriter.cc:403
-msgid "Configure"
-msgstr "Configureer"
+#: src/filewriter/filewriter.cc:358
+msgid ""
+"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 ""
+"Dit programma is gratis software; U kunt het opnieuw uitgeven en/of \n"
+"wijzigen onder de voorwaarden van de GNU General Public License zoals \n"
+"gepubliceerd door de Free Software Foundation; Ofwel versie 2 van de \n"
+"licentie, of (naar keuze) elke latere versie.\n"
+"\n"
+"\n"
+"Dit programma wordt uitgegeven in de hoop dat het nuttig zal zijn, maar \n"
+"ZONDER ENIGE GARANTIE; zelfs zonder de impliciete garantie van \n"
+"VERKOOPBAARHEID of GESCHIKTHEID VOOR EEN BEPAALD DOEL. Zie de GNU General "
+"Public License voor meer informatie.\n"
+"\n"
+"U zou een kopie van de GNU General Public License ontvangen moeten \n"
+"hebben samen met dit programma; Indien niet, schrijf aan de Free \n"
+"Software Foundation, Inc., Franklin Street 51, Vijfde Vloer, Boston, MA \n"
+"02110-1301, USA."
+
+#: src/filewriter/filewriter.cc:385
+msgid "Output file format:"
+msgstr "Uitvoer-bestandsformaat:"
 
-#: src/filewriter/filewriter.cc:413
+#: src/filewriter/filewriter.cc:389
 msgid "Save into original directory"
 msgstr "Opslaan in oorspronkelijke map"
 
-#: src/filewriter/filewriter.cc:417
-msgid "Save into custom directory"
-msgstr "Opslaan in aangepaste map"
-
-#: src/filewriter/filewriter.cc:427
-msgid "Output file folder:"
-msgstr "Bestandsuitvoer map:"
-
-#: src/filewriter/filewriter.cc:431
-msgid "Pick a folder"
-msgstr "Kies een map"
+#: src/filewriter/filewriter.cc:392
+msgid "Save into custom directory:"
+msgstr "Opslaan in aangepaste map:"
 
-#: src/filewriter/filewriter.cc:444
+#: src/filewriter/filewriter.cc:400
 msgid "Generate file name from:"
-msgstr ""
-
-#: src/filewriter/filewriter.cc:448
-msgid "Original file tag"
-msgstr "Oorspronkelijke bestandslabel"
+msgstr "Bestandsnaam genereren uit:"
 
-#: src/filewriter/filewriter.cc:453
+#: src/filewriter/filewriter.cc:401
 msgid "Original file name"
 msgstr "Oorspronkelijke bestandsnaam"
 
-#: src/filewriter/filewriter.cc:459
-msgid "Include original file name extension"
-msgstr "Omvat originele bestandsnaam extensie"
+#: src/filewriter/filewriter.cc:404
+msgid "Original file name (no suffix)"
+msgstr "Oorspronkelijke bestandsnaam (geen achtervoegsel)"
 
-#: src/filewriter/filewriter.cc:468
-msgid "Prepend track number to file name"
-msgstr ""
+#: src/filewriter/filewriter.cc:407
+msgid "Original file tag"
+msgstr "Oorspronkelijk bestandslabel"
 
-#: src/filewriter/filewriter.cc:484
-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.cc:411
+msgid "Prepend track number to file name"
+msgstr "Titelnummer toevoegen aan begin van bestandsnaam"
 
-#: src/filewriter/mp3.cc:40 src/filewriter/mp3.cc:717
+#: src/filewriter/filewriter.cc:417 src/filewriter/filewriter.cc:449
 msgid "Auto"
-msgstr "Auto"
+msgstr "Automatisch"
+
+#: src/filewriter/filewriter.cc:418
+msgid "8000 Hz"
+msgstr "8000 Hz"
+
+#: src/filewriter/filewriter.cc:419
+msgid "11025 Hz"
+msgstr "11025 Hz"
+
+#: src/filewriter/filewriter.cc:420
+msgid "12000 Hz"
+msgstr "12000 Hz"
+
+#: src/filewriter/filewriter.cc:421
+msgid "16000 Hz"
+msgstr "16000 Hz"
+
+#: src/filewriter/filewriter.cc:422
+msgid "22050 Hz"
+msgstr "22050 Hz"
+
+#: src/filewriter/filewriter.cc:423
+msgid "24000 Hz"
+msgstr "24000 Hz"
+
+#: src/filewriter/filewriter.cc:424
+msgid "32000 Hz"
+msgstr "32000 Hz"
+
+#: src/filewriter/filewriter.cc:425 src/xsf/plugin.cc:430
+msgid "44100 Hz"
+msgstr "44100 Hz"
+
+#: src/filewriter/filewriter.cc:426 src/xsf/plugin.cc:431
+msgid "48000 Hz"
+msgstr "48000 Hz"
+
+#: src/filewriter/filewriter.cc:430
+msgid "8 kbit/s"
+msgstr "8 kbit/s"
 
-#: src/filewriter/mp3.cc:40
+#: src/filewriter/filewriter.cc:431
+msgid "16 kbit/s"
+msgstr "16 kbit/s"
+
+#: src/filewriter/filewriter.cc:432
+msgid "32 kbit/s"
+msgstr "32 kbit/s"
+
+#: src/filewriter/filewriter.cc:433
+msgid "40 kbit/s"
+msgstr "40 kbit/s"
+
+#: src/filewriter/filewriter.cc:434
+msgid "48 kbit/s"
+msgstr "48 kbit/s"
+
+#: src/filewriter/filewriter.cc:435
+msgid "56 kbit/s"
+msgstr "56 kbit/s"
+
+#: src/filewriter/filewriter.cc:436
+msgid "64 kbit/s"
+msgstr "64 kbit/s"
+
+#: src/filewriter/filewriter.cc:437
+msgid "80 kbit/s"
+msgstr "80 kbit/s"
+
+#: src/filewriter/filewriter.cc:438
+msgid "96 kbit/s"
+msgstr "96 kbit/s"
+
+#: src/filewriter/filewriter.cc:439
+msgid "112 kbit/s"
+msgstr "112 kbit/s"
+
+#: src/filewriter/filewriter.cc:440
+msgid "128 kbit/s"
+msgstr "128 kbit/s"
+
+#: src/filewriter/filewriter.cc:441
+msgid "160 kbit/s"
+msgstr "160 kbit/s"
+
+#: src/filewriter/filewriter.cc:442
+msgid "192 kbit/s"
+msgstr "192 kbit/s"
+
+#: src/filewriter/filewriter.cc:443
+msgid "224 kbit/s"
+msgstr "224 kbit/s"
+
+#: src/filewriter/filewriter.cc:444
+msgid "256 kbit/s"
+msgstr "256 kbit/s"
+
+#: src/filewriter/filewriter.cc:445
+msgid "320 kbit/s"
+msgstr "320 kbit/s"
+
+#: src/filewriter/filewriter.cc:450
 msgid "Joint Stereo"
-msgstr "Samengevoegd stereo"
+msgstr "Samengevoegde stereo"
 
-#: src/filewriter/mp3.cc:41 src/modplug/plugin_main.cc:58
-#: src/mpg123/mpg123.cc:248
+#: src/filewriter/filewriter.cc:451 src/modplug/plugin_main.cc:57
+#: src/mpg123/mpg123.cc:259
 msgid "Stereo"
 msgstr "Stereo"
 
-#: src/filewriter/mp3.cc:41 src/modplug/plugin_main.cc:57
-#: src/mpg123/mpg123.cc:248
+#: src/filewriter/filewriter.cc:452 src/modplug/plugin_main.cc:56
+#: src/mpg123/mpg123.cc:260
 msgid "Mono"
 msgstr "Mono"
 
-#: src/filewriter/mp3.cc:657
-msgid "MP3 Configuration"
-msgstr "MP3 Configuratie"
-
-#: src/filewriter/mp3.cc:658
-msgid "_OK"
-msgstr "_Ok"
-
-#: src/filewriter/mp3.cc:681
-msgid "Algorithm Quality:"
-msgstr "Algoritme kwaliteit:"
-
-#: src/filewriter/mp3.cc:706
-msgid "Output Sample Rate:"
-msgstr "Sample Rate Uitvoer:"
-
-#: src/filewriter/mp3.cc:733
-msgid "(Hz)"
-msgstr "(Hz)"
-
-#: src/filewriter/mp3.cc:740
-msgid "Bitrate / Compression Ratio:"
-msgstr "Bitrate / Compressie Ratio:"
-
-#: src/filewriter/mp3.cc:764
-msgid "Bitrate (kbps):"
-msgstr "Bitrate (kbps):"
+#: src/filewriter/filewriter.cc:456
+msgid "VBR"
+msgstr "VBR"
+
+#: src/filewriter/filewriter.cc:457
+msgid "ABR"
+msgstr "ABR"
+
+#: src/filewriter/filewriter.cc:478
+msgid "Algorithm quality:"
+msgstr "Algoritmekwaliteit:"
 
-#: src/filewriter/mp3.cc:796
-msgid "Compression ratio:"
-msgstr "Compressie ratio:"
+#: src/filewriter/filewriter.cc:484
+msgid "Bitrate:"
+msgstr "Bitsnelheid:"
 
-#: src/filewriter/mp3.cc:820
-msgid "Audio Mode:"
-msgstr "Audio Modus:"
+#: src/filewriter/filewriter.cc:491
+msgid "Compression ratio:"
+msgstr "Compressieratio:"
 
-#: src/filewriter/mp3.cc:845
-msgid "Miscellaneous:"
-msgstr "Diversen:"
+#: src/filewriter/filewriter.cc:498
+msgid "Audio mode:"
+msgstr "Audiomodus:"
 
-#: src/filewriter/mp3.cc:856
+#: src/filewriter/filewriter.cc:501
 msgid "Enforce strict ISO compliance"
-msgstr ""
+msgstr "Handhaving van strikte ISO-naleving"
 
-#: src/filewriter/mp3.cc:867
+#: src/filewriter/filewriter.cc:503
 msgid "Error protection"
 msgstr "Foutbescherming"
 
-#: src/filewriter/mp3.cc:879 src/filewriter/vorbis.cc:206
-msgid "Quality"
-msgstr "Kwaliteit"
-
-#: src/filewriter/mp3.cc:888
+#: src/filewriter/filewriter.cc:508
 msgid "Enable VBR/ABR"
 msgstr "VBR/ABR inschakelen"
 
-#: src/filewriter/mp3.cc:898
+#: src/filewriter/filewriter.cc:510
 msgid "Type:"
 msgstr "Type:"
 
-#: src/filewriter/mp3.cc:931
-msgid "VBR Options:"
-msgstr "VBR Opties:"
-
-#: src/filewriter/mp3.cc:947
-msgid "Minimum bitrate (kbps):"
-msgstr "Minimale bitrate (kbps):"
-
-#: src/filewriter/mp3.cc:973
-msgid "Maximum bitrate (kbps):"
-msgstr "Maximale bitrate (kbps):"
-
-#: src/filewriter/mp3.cc:995
-msgid "Strictly enforce minimum bitrate"
-msgstr ""
-
-#: src/filewriter/mp3.cc:1007
-msgid "ABR Options:"
-msgstr "ABR Opties:"
-
-#: src/filewriter/mp3.cc:1017
-msgid "Average bitrate (kbps):"
-msgstr "Gemiddelde bitrate (kbps):"
+#: src/filewriter/filewriter.cc:514
+msgid "Minimum bitrate:"
+msgstr "Minimale bitsnelheid:"
+
+#: src/filewriter/filewriter.cc:518
+msgid "Maximum bitrate:"
+msgstr "Maximale bitsnelheid:"
+
+#: src/filewriter/filewriter.cc:522
+msgid "Average bitrate:"
+msgstr "Gemiddelde bitsnelheid:"
 
-#: src/filewriter/mp3.cc:1044
+#: src/filewriter/filewriter.cc:526
 msgid "VBR quality level:"
-msgstr "VBR kwaliteitsniveau:"
+msgstr "VBR-kwaliteitsniveau:"
 
-#: src/filewriter/mp3.cc:1063
-msgid "Omit Xing VBR header"
-msgstr ""
+#: src/filewriter/filewriter.cc:530
+msgid "Strictly enforce minimum bitrate"
+msgstr "Minimum bitsnelheid strikt handhaven"
 
-#: src/filewriter/mp3.cc:1076
-msgid "VBR/ABR"
-msgstr "VBR/ABR"
+#: src/filewriter/filewriter.cc:533
+msgid "Omit Xing VBR header"
+msgstr "Xing VBR-kop weglaten"
 
-#: src/filewriter/mp3.cc:1085
-msgid "Frame Parameters:"
-msgstr ""
+#: src/filewriter/filewriter.cc:539
+msgid "Frame Headers"
+msgstr "Framekoppen"
 
-#: src/filewriter/mp3.cc:1097
+#: src/filewriter/filewriter.cc:540
 msgid "Mark as copyright"
-msgstr "Markeer als auteursrecht"
+msgstr "Markeren als auteursrecht/copyright"
 
-#: src/filewriter/mp3.cc:1108
+#: src/filewriter/filewriter.cc:542
 msgid "Mark as original"
-msgstr "Markeer als origineel"
+msgstr "Markeren als origineel"
 
-#: src/filewriter/mp3.cc:1120
-msgid "ID3 Parameters:"
-msgstr "ID3 Parameters:"
+#: src/filewriter/filewriter.cc:544
+msgid "ID3 Tags"
+msgstr "ID3-labels"
 
-#: src/filewriter/mp3.cc:1131
+#: src/filewriter/filewriter.cc:545
 msgid "Force addition of version 2 tag"
-msgstr "Forceer het toevoegen van een versie 2 tag"
+msgstr "Toevoegen van versie 2-label forceren"
 
-#: src/filewriter/mp3.cc:1141
+#: src/filewriter/filewriter.cc:547
 msgid "Only add v1 tag"
-msgstr "Alleen v1 tag toevoegen"
+msgstr "Alleen v1-label toevoegen"
 
-#: src/filewriter/mp3.cc:1148
+#: src/filewriter/filewriter.cc:549
 msgid "Only add v2 tag"
-msgstr "Alleen v2 tag toevoegen"
+msgstr "Alleen v2-label toevoegen"
 
-#: src/filewriter/mp3.cc:1169
+#: src/filewriter/filewriter.cc:554
+msgid "Quality"
+msgstr "Kwaliteit"
+
+#: src/filewriter/filewriter.cc:555
+msgid "VBR/ABR"
+msgstr "VBR/ABR"
+
+#: src/filewriter/filewriter.cc:556
 msgid "Tags"
-msgstr "Tags"
+msgstr "Labels"
 
-#: src/filewriter/vorbis.cc:196
-msgid "Vorbis Encoder Configuration"
-msgstr "Vorbis Encoder Configuratie"
+#: src/filewriter/filewriter.cc:566
+msgid "Quality (0-1):"
+msgstr "Kwaliteit (0-1):"
 
-#: src/filewriter/vorbis.cc:219
-msgid "Quality level (0 - 10):"
-msgstr "Kwaliteitsniveau (0 - 10):"
+#: src/filewriter/filewriter.cc:573 src/skins-qt/skins_cfg.cc:307
+#: src/skins/skins_cfg.cc:289
+msgid "General"
+msgstr "Algemeen"
 
-#: src/flacng/flacng.h:35
+#: src/flac/flacng.h:36
 msgid "FLAC Decoder"
-msgstr "FLAC Decoder"
+msgstr "FLAC-decoder"
 
-#: src/flacng/metadata.cc:351 src/wavpack/wavpack.cc:209
+#: src/flac/metadata.cc:296 src/wavpack/wavpack.cc:215
 msgid "lossless"
 msgstr "lossless"
 
-#: src/flacng/plugin.cc:169
+#: src/flac/plugin.cc:214
 msgid ""
 "Original code by\n"
 "Ralf Ertzinger <ralf@skytale.net>\n"
 "\n"
 "http://www.skytale.net/projects/bmp-flac2/"
 msgstr ""
-"Originele code door\n"
+"Oorspronkelijke code door\n"
 "Ralf Ertzinger <ralf@skytale.net>\n"
 "\n"
 "http://www.skytale.net/projects/bmp-flac2/"
@@ -1430,22 +1448,22 @@
 "GIO Plugin for Audacious\n"
 "Copyright 2009-2012 John Lindgren"
 msgstr ""
-"GIO Plugin voor Audicious\n"
+"GIO-plug-in voor Audacious\n"
 "Copyright 2009-2012 John Lindgren"
 
 #: src/gio/gio.cc:42
 msgid "GIO Plugin"
-msgstr "GIO Plugin"
+msgstr "GIO-plug-in"
 
-#: src/gio/gio.cc:153
+#: src/gio/gio.cc:152
 msgid "Read-and-append mode not supported"
-msgstr ""
+msgstr "Lezen-en-toevoegen-modus wordt niet ondersteund"
 
-#: src/gio/gio.cc:166
+#: src/gio/gio.cc:165
 msgid "Invalid open mode"
-msgstr ""
+msgstr "Ongeldige open-modus"
 
-#: src/gl-spectrum/gl-spectrum.cc:51
+#: src/glspectrum/gl-spectrum.cc:52
 msgid ""
 "OpenGL Spectrum Analyzer for Audacious\n"
 "Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
@@ -1456,730 +1474,930 @@
 "\n"
 "License: GPLv2+"
 msgstr ""
-
-#: src/gl-spectrum/gl-spectrum.cc:62
-msgid "OpenGL Spectrum Analyzer"
-msgstr "OpenGL Spectrum Analyseerder"
-
-#: src/gl-spectrum-qt/gl-spectrum.cc:41
-msgid ""
-"OpenGL Spectrum Analyzer for Audacious\n"
-"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
-"Copyright 2014 William Pitcock\n"
+"OpenGL-spectrumanalyse voor Audacious\n"
+"Auteursrecht/Copyright 2013 Christophe Budé, John Lindgren, en Carlo "
+"Bramini\n"
 "\n"
-"Based on the XMMS plugin:\n"
-"Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson, and "
-"4Front Technologies\n"
+"Gebaseerd op de XMMS-plug-in:\n"
+"Auteursrecht 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson "
+"en 4Front Technologies\n"
 "\n"
-"License: GPLv2+"
-msgstr ""
+"Licentie: GPLv2+"
 
-#: src/gl-spectrum-qt/gl-spectrum.cc:53
-msgid "OpenGL Spectrum Analyzer (Qt)"
-msgstr ""
-
-#: src/gnomeshortcuts/gnomeshortcuts.cc:38
-msgid "GNOME Shortcuts"
-msgstr "GNOME Snelkoppeling"
-
-#: src/gnomeshortcuts/gnomeshortcuts.cc:54
-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/gtkui/columns.cc:35
-msgid "Entry number"
-msgstr "Invoer nummer"
+#: src/glspectrum/gl-spectrum.cc:63 src/qtglspectrum/gl-spectrum.cc:53
+msgid "OpenGL Spectrum Analyzer"
+msgstr "OpenGL-spectrumanalyse"
 
-#: src/gtkui/columns.cc:36 src/playlist-manager/playlist-manager.cc:225
-#: src/qtui/playlist_model.cc:123
+#: src/gtkui/columns.cc:36 src/moonstone/playlist_model.cc:38
+#: src/qtui/playlist_model.cc:33
+msgid "Entry Number"
+msgstr "Itemnummer"
+
+#: src/gtkui/columns.cc:37 src/moonstone/playlist_model.cc:38
+#: src/moonstone/playlist_selection.cc:64
+#: src/playlist-manager/playlist-manager.cc:200
+#: src/playlist-manager-qt/playlist-manager-qt.cc:188
+#: src/qtui/playlist_model.cc:33 src/streamtuner/icecast-model.cc:120
+#: src/streamtuner/ihr-model.cc:159 src/streamtuner/shoutcast-model.cc:122
 msgid "Title"
 msgstr "Titel"
 
-#: src/gtkui/columns.cc:37 src/qtui/playlist_model.cc:125
+#: src/gtkui/columns.cc:38 src/moonstone/playlist_model.cc:39
+#: src/qtui/playlist_model.cc:33
 msgid "Artist"
 msgstr "Artiest"
 
-#: src/gtkui/columns.cc:38
+#: src/gtkui/columns.cc:39 src/moonstone/playlist_model.cc:39
+#: src/qtui/playlist_model.cc:33
 msgid "Year"
 msgstr "Jaar"
 
-#: src/gtkui/columns.cc:39 src/qtui/playlist_model.cc:127
+#: src/gtkui/columns.cc:40 src/moonstone/playlist_model.cc:39
+#: src/qtui/playlist_model.cc:34
 msgid "Album"
 msgstr "Album"
 
-#: src/gtkui/columns.cc:40
-msgid "Album artist"
-msgstr "Album Artiest"
+#: src/gtkui/columns.cc:41 src/moonstone/playlist_model.cc:40
+#: src/qtui/playlist_model.cc:34
+msgid "Album Artist"
+msgstr "Albumartiest"
 
-#: src/gtkui/columns.cc:41
+#: src/gtkui/columns.cc:42 src/moonstone/playlist_model.cc:40
+#: src/qtui/playlist_model.cc:34
 msgid "Track"
 msgstr "Nummer"
 
-#: src/gtkui/columns.cc:42
+#: src/gtkui/columns.cc:43 src/moonstone/playlist_model.cc:40
+#: src/qtui/playlist_model.cc:34 src/streamtuner/icecast-model.cc:123
+#: src/streamtuner/shoutcast-model.cc:125
+#: src/streamtuner/shoutcast-model.cc:236
 msgid "Genre"
 msgstr "Genre"
 
-#: src/gtkui/columns.cc:43
-msgid "Queue position"
+#: src/gtkui/columns.cc:44 src/moonstone/playlist_model.cc:41
+#: src/qtui/playlist_model.cc:35
+msgid "Queue Position"
 msgstr "Positie in wachtrij"
 
-#: src/gtkui/columns.cc:44
+#: src/gtkui/columns.cc:45 src/moonstone/playlist_model.cc:41
+#: src/qtui/playlist_model.cc:35
 msgid "Length"
-msgstr "Lengte"
+msgstr "Duur"
 
-#: src/gtkui/columns.cc:45
-msgid "File path"
+#: src/gtkui/columns.cc:46 src/moonstone/playlist_model.cc:41
+#: src/qtui/playlist_model.cc:35
+msgid "File Path"
 msgstr "Bestandspad"
 
-#: src/gtkui/columns.cc:47
-msgid "Custom title"
+#: src/gtkui/columns.cc:47 src/moonstone/playlist_model.cc:42
+#: src/qtui/playlist_model.cc:35
+msgid "File Name"
+msgstr "Bestandsnaam"
+
+#: src/gtkui/columns.cc:48 src/moonstone/playlist_model.cc:42
+#: src/qtui/playlist_model.cc:36
+msgid "Custom Title"
 msgstr "Aangepaste titel"
 
-#: src/gtkui/columns.cc:48
+#: src/gtkui/columns.cc:49 src/moonstone/playlist_model.cc:42
+#: src/qtui/playlist_model.cc:36 src/streamtuner/icecast-model.cc:129
+#: src/streamtuner/shoutcast-model.cc:134
 msgid "Bitrate"
-msgstr "Bitrate"
+msgstr "Bitsnelheid"
 
-#: src/gtkui/columns.cc:308
+#: src/gtkui/columns.cc:50 src/moonstone/playlist_model.cc:43
+#: src/qtui/playlist_model.cc:36
+msgid "Comment"
+msgstr "Commentaar"
+
+#: src/gtkui/columns.cc:51 src/qtui/playlist_model.cc:36
+msgid "Publisher"
+msgstr "Uitgever"
+
+#: src/gtkui/columns.cc:52 src/qtui/playlist_model.cc:37
+msgid "Catalog Number"
+msgstr "Catalogusnummer"
+
+#: src/gtkui/columns.cc:53 src/moonstone/playlist_model.cc:43
+#: src/qtui/playlist_model.cc:37
+msgid "Disc"
+msgstr "Schijf"
+
+#: src/gtkui/columns.cc:325
 msgid "Available columns"
 msgstr "Beschikbare kolommen"
 
-#: src/gtkui/columns.cc:334
+#: src/gtkui/columns.cc:351
 msgid "Displayed columns"
-msgstr "Weergegeven kolommen"
+msgstr "Getoonde kolommen"
 
-#: src/gtkui/layout.cc:72 src/search-tool/search-tool.cc:40
+#: src/gtkui/layout.cc:74 src/search-tool-qt/search-tool-qt.cc:58
+#: src/search-tool/search-tool.cc:49
 msgid "Search Tool"
-msgstr "Zoek hulpmiddel"
+msgstr "Zoekhulpmiddel"
 
-#: src/gtkui/layout.cc:167
+#: src/gtkui/layout.cc:170
 msgid "Dock at Left"
-msgstr "Vastkoppelen aan linkerzijde"
+msgstr "Vastmaken aan linkerzijde"
 
-#: src/gtkui/layout.cc:167
+#: src/gtkui/layout.cc:170
 msgid "Dock at Right"
-msgstr "Vastkoppelen aan rechterzijde"
+msgstr "Vastmaken aan rechterzijde"
 
-#: src/gtkui/layout.cc:168
+#: src/gtkui/layout.cc:171
 msgid "Dock at Top"
-msgstr "Vastkoppelen aan bovenkant"
+msgstr "Vastmaken aan bovenkant"
 
-#: src/gtkui/layout.cc:168
+#: src/gtkui/layout.cc:171
 msgid "Dock at Bottom"
-msgstr "Vastkoppelen aan onderkant"
+msgstr "Vastmaken aan onderkant"
 
-#: src/gtkui/layout.cc:168
+#: src/gtkui/layout.cc:171
 msgid "Undock"
-msgstr "Loskoppelen"
+msgstr "Losmaken"
 
-#: src/gtkui/layout.cc:168 src/ladspa/plugin.cc:531
+#: src/gtkui/layout.cc:171 src/ladspa/plugin.cc:540
 msgid "Disable"
 msgstr "Uitschakelen"
 
-#: src/gtkui/menus.cc:126 src/qtui/main_window_actions.cc:93
-#: src/statusicon/statusicon.cc:276
+#: src/gtkui/menus.cc:79 src/qtui/menus.cc:107
+#: src/statusicon-qt/statusicon.cc:115 src/statusicon/statusicon.cc:286
 msgid "_Open Files ..."
-msgstr "_Open bestanden ..."
+msgstr "Bestanden _openen…"
 
-#: src/gtkui/menus.cc:127
+#: src/gtkui/menus.cc:80 src/qtui/menus.cc:111
 msgid "Open _URL ..."
-msgstr "Open _URL ..."
+msgstr "_URL openen…"
 
-#: src/gtkui/menus.cc:128 src/qtui/main_window_actions.cc:95
+#: src/gtkui/menus.cc:81 src/qtui/menus.cc:113
 msgid "_Add Files ..."
-msgstr "_Bestanden Toevoegen ..."
+msgstr "Best_anden toevoegen…"
 
-#: src/gtkui/menus.cc:129
+#: src/gtkui/menus.cc:82 src/qtui/menus.cc:118
 msgid "Add U_RL ..."
-msgstr "U_RL toevoegen ..."
+msgstr "U_RL toevoegen…"
 
-#: src/gtkui/menus.cc:131
+#: src/gtkui/menus.cc:84 src/qtui/menus.cc:120
 msgid "Search _Library"
-msgstr "Doorzoek_Bibliotheek"
+msgstr "Bib_liotheek doorzoeken"
 
-#: src/gtkui/menus.cc:133 src/qtui/main_window_actions.cc:98
+#: src/gtkui/menus.cc:86 src/qtui/menus.cc:123
 msgid "A_bout ..."
-msgstr ""
+msgstr "O_ver…"
 
-#: src/gtkui/menus.cc:134 src/qtui/main_window_actions.cc:99
+#: src/gtkui/menus.cc:87 src/qtui/menus.cc:125
 msgid "_Settings ..."
-msgstr "In_stellingen ..."
+msgstr "In_stellingen…"
 
-#: src/gtkui/menus.cc:135 src/qtui/main_window_actions.cc:103
-#: src/statusicon/statusicon.cc:284
+#: src/gtkui/menus.cc:88 src/qtui/menus.cc:131
+#: src/statusicon-qt/statusicon.cc:117 src/statusicon/statusicon.cc:288
 msgid "_Quit"
 msgstr "_Afsluiten"
 
-#: src/gtkui/menus.cc:139 src/gtkui/menus.cc:262
-#: src/qtui/main_window_actions.cc:107 src/search-tool/search-tool.cc:641
-#: src/statusicon/statusicon.cc:278
+#: src/gtkui/menus.cc:92 src/gtkui/menus.cc:226
+#: src/moonstone/playlist_tabs.cc:306 src/qtui/menus.cc:135
+#: src/qtui/playlist_tabs.cc:331 src/search-tool-qt/search-tool-qt.cc:499
+#: src/search-tool/search-tool.cc:339 src/statusicon-qt/statusicon.cc:109
+#: src/statusicon/statusicon.cc:280
 msgid "_Play"
-msgstr ""
+msgstr "Afs_pelen"
 
-#: src/gtkui/menus.cc:140 src/qtui/main_window_actions.cc:108
-#: src/statusicon/statusicon.cc:279
+#: src/gtkui/menus.cc:93 src/qtui/menus.cc:137
+#: src/statusicon-qt/statusicon.cc:110 src/statusicon/statusicon.cc:281
 msgid "Paus_e"
-msgstr ""
+msgstr "Pauzer_en"
 
-#: src/gtkui/menus.cc:141 src/qtui/main_window_actions.cc:109
-#: src/statusicon/statusicon.cc:280
+#: src/gtkui/menus.cc:94 src/qtui/menus.cc:139
+#: src/statusicon-qt/statusicon.cc:111 src/statusicon/statusicon.cc:282
 msgid "_Stop"
-msgstr "_Stop"
+msgstr "_Stoppen"
 
-#: src/gtkui/menus.cc:142 src/qtui/main_window_actions.cc:110
-#: src/statusicon/statusicon.cc:277
+#: src/gtkui/menus.cc:95 src/qtui/menus.cc:141
+#: src/statusicon-qt/statusicon.cc:112 src/statusicon/statusicon.cc:283
 msgid "Pre_vious"
-msgstr "Vo_rige"
+msgstr "_Vorige"
 
-#: src/gtkui/menus.cc:143 src/qtui/main_window_actions.cc:111
-#: src/statusicon/statusicon.cc:281
+#: src/gtkui/menus.cc:96 src/qtui/menus.cc:143
+#: src/statusicon-qt/statusicon.cc:113 src/statusicon/statusicon.cc:284
 msgid "_Next"
-msgstr "_Volgende"
+msgstr "Volge_nde"
 
-#: src/gtkui/menus.cc:145 src/qtui/main_window_actions.cc:113
+#: src/gtkui/menus.cc:97 src/qtui/menus.cc:145 src/skins/menus.cc:114
+#: src/skins-qt/menus.cc:105
+msgid "Previous Album"
+msgstr "Vorige album"
+
+#: src/gtkui/menus.cc:98 src/qtui/menus.cc:146 src/skins/menus.cc:115
+#: src/skins-qt/menus.cc:106
+msgid "Next Album"
+msgstr "Volgende album"
+
+#: src/gtkui/menus.cc:100 src/qtui/menus.cc:148
 msgid "_Repeat"
-msgstr "_Herhaal"
+msgstr "He_rhalen"
 
-#: src/gtkui/menus.cc:146 src/qtui/main_window_actions.cc:114
+#: src/gtkui/menus.cc:101 src/qtui/menus.cc:150
 msgid "S_huffle"
-msgstr ""
+msgstr "W_illekeurige volgorde"
 
-#: src/gtkui/menus.cc:147 src/qtui/main_window_actions.cc:115
+#: src/gtkui/menus.cc:102 src/qtui/menus.cc:152
+msgid "Shuffle by Albu_m"
+msgstr "Willekeurige albu_mvolgorde"
+
+#: src/gtkui/menus.cc:103 src/qtui/menus.cc:155
 msgid "N_o Playlist Advance"
-msgstr ""
+msgstr "G_een vooruitgang afspeellijst"
 
-#: src/gtkui/menus.cc:148 src/qtui/main_window_actions.cc:116
+#: src/gtkui/menus.cc:104 src/qtui/menus.cc:157
 msgid "Stop A_fter This Song"
-msgstr ""
+msgstr "Stoppen n_a dit nummer"
 
-#: src/gtkui/menus.cc:150 src/gtkui/menus.cc:247
-#: src/qtui/main_window_actions.cc:118
+#: src/gtkui/menus.cc:106 src/gtkui/menus.cc:210 src/qtui/menus.cc:162
+#: src/qtui/menus.cc:294
 msgid "Song _Info ..."
-msgstr "Lied_Informatie ..."
+msgstr "Nummer_informatie…"
 
-#: src/gtkui/menus.cc:151
+#: src/gtkui/menus.cc:107
 msgid "Jump to _Time ..."
-msgstr "Spring naar _Tijd ..."
+msgstr "Spoelen naar _tijd…"
 
-#: src/gtkui/menus.cc:152
+#: src/gtkui/menus.cc:108
 msgid "_Jump to Song ..."
-msgstr ""
+msgstr "_Spoelen naar nummer…"
 
-#: src/gtkui/menus.cc:154
+#: src/gtkui/menus.cc:110 src/qtui/menus.cc:165
 msgid "Set Repeat Point _A"
-msgstr ""
+msgstr "Herhaalpunt _A instellen"
 
-#: src/gtkui/menus.cc:155
+#: src/gtkui/menus.cc:111 src/qtui/menus.cc:167
 msgid "Set Repeat Point _B"
-msgstr ""
+msgstr "Herhaalpunt _B instellen"
 
-#: src/gtkui/menus.cc:156
+#: src/gtkui/menus.cc:112 src/qtui/menus.cc:169
 msgid "_Clear Repeat Points"
-msgstr ""
+msgstr "Herhaalpunten _wissen"
 
-#: src/gtkui/menus.cc:160 src/gtkui/menus.cc:167 src/gtkui/menus.cc:183
-#: src/qtui/main_window_actions.cc:122 src/qtui/main_window_actions.cc:129
-#: src/qtui/main_window_actions.cc:145
+#: src/gtkui/menus.cc:116 src/gtkui/menus.cc:123 src/gtkui/menus.cc:141
+#: src/qtui/menus.cc:173 src/qtui/menus.cc:180 src/qtui/menus.cc:198
 msgid "By _Title"
-msgstr "Volgens _Titel"
+msgstr "Op _titel"
 
-#: src/gtkui/menus.cc:161 src/qtui/main_window_actions.cc:123
+#: src/gtkui/menus.cc:117 src/qtui/menus.cc:174
 msgid "By _File Name"
-msgstr ""
+msgstr "Op _bestandsnaam"
 
-#: src/gtkui/menus.cc:162 src/qtui/main_window_actions.cc:124
+#: src/gtkui/menus.cc:118 src/qtui/menus.cc:175
 msgid "By File _Path"
-msgstr ""
+msgstr "Op bestands_pad"
 
-#: src/gtkui/menus.cc:166 src/gtkui/menus.cc:182
-#: src/qtui/main_window_actions.cc:128 src/qtui/main_window_actions.cc:144
+#: src/gtkui/menus.cc:122 src/gtkui/menus.cc:140 src/qtui/menus.cc:179
+#: src/qtui/menus.cc:197
 msgid "By Track _Number"
-msgstr "Volgens _Nummer"
+msgstr "Op _nummer"
 
-#: src/gtkui/menus.cc:168 src/gtkui/menus.cc:184
-#: src/qtui/main_window_actions.cc:130 src/qtui/main_window_actions.cc:146
+#: src/gtkui/menus.cc:124 src/gtkui/menus.cc:142 src/qtui/menus.cc:181
+#: src/qtui/menus.cc:199
 msgid "By _Artist"
-msgstr "Volgens _Artiest"
+msgstr "Op _artiest"
 
-#: src/gtkui/menus.cc:169 src/gtkui/menus.cc:185
-#: src/qtui/main_window_actions.cc:131 src/qtui/main_window_actions.cc:147
+#: src/gtkui/menus.cc:125 src/gtkui/menus.cc:143 src/qtui/menus.cc:182
+#: src/qtui/menus.cc:200
 msgid "By Al_bum"
-msgstr ""
+msgstr "Op al_bum"
 
-#: src/gtkui/menus.cc:170 src/gtkui/menus.cc:186
-#: src/qtui/main_window_actions.cc:132 src/qtui/main_window_actions.cc:148
+#: src/gtkui/menus.cc:126 src/gtkui/menus.cc:144 src/qtui/menus.cc:183
+#: src/qtui/menus.cc:201
 msgid "By Albu_m Artist"
-msgstr ""
+msgstr "Op albu_martiest"
 
-#: src/gtkui/menus.cc:171 src/gtkui/menus.cc:187
-#: src/qtui/main_window_actions.cc:133 src/qtui/main_window_actions.cc:149
+#: src/gtkui/menus.cc:127 src/gtkui/menus.cc:145 src/qtui/menus.cc:184
+#: src/qtui/menus.cc:202
 msgid "By Release _Date"
-msgstr "Volgens uitgave_datum"
+msgstr "Op uitgave_datum"
 
-#: src/gtkui/menus.cc:172 src/gtkui/menus.cc:188
-#: src/qtui/main_window_actions.cc:134 src/qtui/main_window_actions.cc:150
+#: src/gtkui/menus.cc:128 src/gtkui/menus.cc:146 src/qtui/menus.cc:185
+#: src/qtui/menus.cc:203
 msgid "By _Genre"
-msgstr ""
+msgstr "Op _genre"
 
-#: src/gtkui/menus.cc:173 src/gtkui/menus.cc:189
-#: src/qtui/main_window_actions.cc:135 src/qtui/main_window_actions.cc:151
+#: src/gtkui/menus.cc:129 src/gtkui/menus.cc:147 src/qtui/menus.cc:186
+#: src/qtui/menus.cc:204
 msgid "By _Length"
-msgstr ""
+msgstr "Op _duur"
 
-#: src/gtkui/menus.cc:174 src/gtkui/menus.cc:190
-#: src/qtui/main_window_actions.cc:136 src/qtui/main_window_actions.cc:152
+#: src/gtkui/menus.cc:130 src/gtkui/menus.cc:148 src/qtui/menus.cc:187
+#: src/qtui/menus.cc:205
 msgid "By _File Path"
-msgstr "Volgens _Bestandspad"
+msgstr "Op _bestandspad"
 
-#: src/gtkui/menus.cc:175 src/gtkui/menus.cc:191
-#: src/qtui/main_window_actions.cc:137 src/qtui/main_window_actions.cc:153
+#: src/gtkui/menus.cc:131 src/gtkui/menus.cc:149 src/qtui/menus.cc:188
+#: src/qtui/menus.cc:206
 msgid "By _Custom Title"
-msgstr "Volgens _Aangepaste titel"
+msgstr "Op _aangepaste titel"
 
-#: src/gtkui/menus.cc:177 src/gtkui/menus.cc:193
-#: src/qtui/main_window_actions.cc:139 src/qtui/main_window_actions.cc:155
+#: src/gtkui/menus.cc:132 src/gtkui/menus.cc:150 src/qtui/menus.cc:189
+#: src/qtui/menus.cc:207
+msgid "By C_omment"
+msgstr "Op c_ommentaar"
+
+#: src/gtkui/menus.cc:133 src/gtkui/menus.cc:151 src/qtui/menus.cc:190
+#: src/qtui/menus.cc:208
+msgid "By D_isc Number"
+msgstr ""
+
+#: src/gtkui/menus.cc:135 src/gtkui/menus.cc:153 src/qtui/menus.cc:192
+#: src/qtui/menus.cc:210
 msgid "R_everse Order"
-msgstr "R_angschikking omkeren"
+msgstr "Sortering omdraaien"
 
-#: src/gtkui/menus.cc:178 src/gtkui/menus.cc:194
-#: src/qtui/main_window_actions.cc:140 src/qtui/main_window_actions.cc:156
+#: src/gtkui/menus.cc:136 src/gtkui/menus.cc:154 src/qtui/menus.cc:194
+#: src/qtui/menus.cc:212
 msgid "_Random Order"
-msgstr "_Willekeurige volgorde"
+msgstr "Willekeu_rige volgorde"
 
-#: src/gtkui/menus.cc:198 src/qtui/main_window_actions.cc:160
+#: src/gtkui/menus.cc:158 src/qtui/menus.cc:216
 msgid "_Play/Resume"
-msgstr ""
+msgstr "Afs_pelen/Hervatten"
 
-#: src/gtkui/menus.cc:199 src/gtkui/menus.cc:251
-#: src/qtui/main_window_actions.cc:161
+#: src/gtkui/menus.cc:159 src/qtui/menus.cc:218
 msgid "_Refresh"
-msgstr "_Vernieuw"
+msgstr "Ve_rnieuwen"
 
-#: src/gtkui/menus.cc:201 src/qtui/main_window_actions.cc:163
+#: src/gtkui/menus.cc:161 src/qtui/menus.cc:222
 msgid "_Sort"
-msgstr "_Sorteer"
+msgstr "_Sorteren"
 
-#: src/gtkui/menus.cc:202 src/qtui/main_window_actions.cc:164
+#: src/gtkui/menus.cc:162 src/qtui/menus.cc:223
 msgid "Sort Se_lected"
-msgstr ""
+msgstr "Se_lectie sorteren"
 
-#: src/gtkui/menus.cc:203 src/qtui/main_window_actions.cc:165
+#: src/gtkui/menus.cc:163 src/qtui/menus.cc:225
 msgid "Remove _Duplicates"
-msgstr ""
+msgstr "_Duplicaten verwijderen"
 
-#: src/gtkui/menus.cc:204 src/qtui/main_window_actions.cc:166
+#: src/gtkui/menus.cc:164 src/qtui/menus.cc:226
 msgid "Remove _Unavailable Files"
-msgstr ""
+msgstr "_Niet-beschikbare bestanden verwijderen"
 
-#: src/gtkui/menus.cc:206 src/playlist-manager/playlist-manager.cc:244
-#: src/qtui/main_window_actions.cc:168
+#: src/gtkui/menus.cc:166 src/playlist-manager/playlist-manager.cc:219
+#: src/playlist-manager-qt/playlist-manager-qt.cc:348 src/qtui/menus.cc:229
 msgid "_New"
 msgstr "_Nieuw"
 
-#: src/gtkui/menus.cc:207
+#: src/gtkui/menus.cc:167 src/qtui/menus.cc:230
 msgid "Ren_ame ..."
-msgstr ""
+msgstr "_Naam wijzigen…"
 
-#: src/gtkui/menus.cc:208 src/gtkui/menus.cc:264
-#: src/qtui/main_window_actions.cc:170
+#: src/gtkui/menus.cc:168 src/gtkui/menus.cc:228
+#: src/moonstone/playlist_tabs.cc:311 src/qtui/menus.cc:231
+#: src/qtui/playlist_tabs.cc:336
 msgid "Remo_ve"
-msgstr "_Verwijder"
+msgstr "_Verwijderen"
 
-#: src/gtkui/menus.cc:210
+#: src/gtkui/menus.cc:170 src/qtui/menus.cc:233
 msgid "_Import ..."
-msgstr "_Importeer ..."
+msgstr "_Importeren…"
 
-#: src/gtkui/menus.cc:211
+#: src/gtkui/menus.cc:171 src/qtui/menus.cc:234
 msgid "_Export ..."
-msgstr "_Exporteer ..."
+msgstr "_Exporteren…"
 
-#: src/gtkui/menus.cc:213
+#: src/gtkui/menus.cc:173 src/qtui/menus.cc:237
 msgid "Playlist _Manager ..."
-msgstr ""
+msgstr "Afspeellijst_beheer…"
 
-#: src/gtkui/menus.cc:214 src/qtui/main_window_actions.cc:176
+#: src/gtkui/menus.cc:174 src/qtui/menus.cc:239
 msgid "_Queue Manager ..."
-msgstr ""
+msgstr "_Wachtrijbeheer…"
 
-#: src/gtkui/menus.cc:218 src/qtui/main_window_actions.cc:180
+#: src/gtkui/menus.cc:178 src/qtui/menus.cc:243
 msgid "Volume _Up"
-msgstr "Volume _Hoger"
+msgstr "Volume _omhoog"
 
-#: src/gtkui/menus.cc:219 src/qtui/main_window_actions.cc:181
+#: src/gtkui/menus.cc:179 src/qtui/menus.cc:245
 msgid "Volume _Down"
-msgstr "Volume _Lager"
+msgstr "Volume _omlaag"
 
-#: src/gtkui/menus.cc:221 src/qtui/main_window_actions.cc:183
-msgid "_Equalizer"
-msgstr "_Equalizer"
+#: src/gtkui/menus.cc:181 src/qtui/menus.cc:249
+msgid "_Equalizer ..."
+msgstr "_Equalizer…"
 
-#: src/gtkui/menus.cc:223 src/qtui/main_window_actions.cc:185
+#: src/gtkui/menus.cc:182 src/qtui/menus.cc:251
 msgid "E_ffects ..."
-msgstr "E_ffecten ..."
+msgstr "E_ffecten…"
+
+#: src/gtkui/menus.cc:184
+msgid "_Record Stream"
+msgstr "_Stream opnemen"
 
-#: src/gtkui/menus.cc:227
+#: src/gtkui/menus.cc:185
+msgid "Audio _Settings ..."
+msgstr "Audio-in_stellingen…"
+
+#: src/gtkui/menus.cc:189 src/qtui/menus.cc:260
 msgid "Show _Menu Bar"
-msgstr "Toon _Menubalk"
+msgstr "_Menubalk tonen"
 
-#: src/gtkui/menus.cc:228
+#: src/gtkui/menus.cc:190 src/qtui/menus.cc:262
 msgid "Show I_nfo Bar"
-msgstr "Show I_nfobalk"
+msgstr "I_nformatiebalk tonen"
+
+#: src/gtkui/menus.cc:191 src/qtui/menus.cc:264
+msgid "Show Info Bar _Album Art"
+msgstr "Informatiebalk tonen bij _albumhoezen"
 
-#: src/gtkui/menus.cc:229
+#: src/gtkui/menus.cc:192 src/qtui/menus.cc:266
 msgid "Show Info Bar Vis_ualization"
-msgstr ""
+msgstr "Vis_ualisatiebalk tonen"
 
-#: src/gtkui/menus.cc:230
+#: src/gtkui/menus.cc:193 src/qtui/menus.cc:268
 msgid "Show _Status Bar"
-msgstr "Toon _Statusbalk"
+msgstr "_Statusbalk tonen"
 
-#: src/gtkui/menus.cc:232
+#: src/gtkui/menus.cc:195 src/qtui/menus.cc:272
 msgid "Show _Remaining Time"
-msgstr ""
+msgstr "_Resterende tijd tonen"
 
-#: src/gtkui/menus.cc:234
+#: src/gtkui/menus.cc:197 src/qtui/menus.cc:276 src/skins/menus.cc:157
+#: src/skins-qt/menus.cc:152
 msgid "_Visualizations ..."
-msgstr ""
+msgstr "_Visualisaties…"
 
-#: src/gtkui/menus.cc:238 src/qtui/main_window_actions.cc:189
+#: src/gtkui/menus.cc:201 src/qtui/menus.cc:280
 msgid "_File"
 msgstr "_Bestand"
 
-#: src/gtkui/menus.cc:239 src/qtui/main_window_actions.cc:190
+#: src/gtkui/menus.cc:202 src/qtui/menus.cc:281
 msgid "_Playback"
-msgstr ""
+msgstr "Afs_pelen"
 
-#: src/gtkui/menus.cc:240 src/qtui/main_window_actions.cc:191
+#: src/gtkui/menus.cc:203 src/qtui/menus.cc:282
 msgid "P_laylist"
-msgstr "Spee_llijst"
+msgstr "Afspee_llijst"
 
-#: src/gtkui/menus.cc:241 src/gtkui/menus.cc:258
-#: src/qtui/main_window_actions.cc:192
+#: src/gtkui/menus.cc:204 src/gtkui/menus.cc:222 src/qtui/menus.cc:283
+#: src/qtui/menus.cc:312
 msgid "_Services"
-msgstr ""
+msgstr "Dien_sten"
 
-#: src/gtkui/menus.cc:242 src/qtui/main_window_actions.cc:193
+#: src/gtkui/menus.cc:205 src/qtui/menus.cc:284
 msgid "_Output"
-msgstr "_Uitvoer"
+msgstr "Uitv_oer"
 
-#: src/gtkui/menus.cc:243
+#: src/gtkui/menus.cc:206 src/qtui/menus.cc:285
 msgid "_View"
-msgstr "_Bekijk"
+msgstr "_Tonen"
 
-#: src/gtkui/menus.cc:248
+#: src/gtkui/menus.cc:211 src/qtui/menus.cc:296
 msgid "_Queue/Unqueue"
 msgstr "In/uit _wachtrij"
 
-#: src/gtkui/menus.cc:250
+#: src/gtkui/menus.cc:213 src/qtui/menus.cc:299
 msgid "_Open Containing Folder"
-msgstr ""
+msgstr "Bijbehorende map _openen"
 
-#: src/gtkui/menus.cc:253
+#: src/gtkui/menus.cc:214 src/qtui/menus.cc:301
+msgid "_Refresh Selected"
+msgstr "Selectie ve_rnieuwen"
+
+#: src/gtkui/menus.cc:216 src/qtui/menus.cc:304
 msgid "Cu_t"
-msgstr ""
+msgstr "Kn_ippen"
 
-#: src/gtkui/menus.cc:254
+#: src/gtkui/menus.cc:217 src/qtui/menus.cc:305
 msgid "_Copy"
-msgstr "_Kopieer"
+msgstr "_Kopiëren"
 
-#: src/gtkui/menus.cc:255
+#: src/gtkui/menus.cc:218 src/qtui/menus.cc:306
 msgid "_Paste"
-msgstr "_Plak"
+msgstr "_Plakken"
 
-#: src/gtkui/menus.cc:256
+#: src/gtkui/menus.cc:219 src/qtui/menus.cc:307
+msgid "Paste at _End"
+msgstr "Plakken aan het _einde"
+
+#: src/gtkui/menus.cc:220 src/qtui/menus.cc:309
 msgid "Select _All"
-msgstr "Selecteer _Alles"
+msgstr "_Alles selecteren"
 
-#: src/gtkui/menus.cc:263
+#: src/gtkui/menus.cc:227 src/moonstone/playlist_tabs.cc:309
+#: src/qtui/playlist_tabs.cc:334
 msgid "_Rename ..."
-msgstr "He_rnoem ..."
+msgstr "_Naam wijzigen…"
+
+#: src/gtkui/settings.cc:35 src/qtui/settings.cc:59
+msgid "Always"
+msgstr "Altijd"
+
+#: src/gtkui/settings.cc:36 src/qtui/settings.cc:60
+msgid "Auto-hide"
+msgstr "Automatisch verbergen"
+
+#: src/gtkui/settings.cc:37 src/qtui/settings.cc:61
+msgid "Never"
+msgstr "Nooit"
 
-#: src/gtkui/settings.cc:35
+#: src/gtkui/settings.cc:41 src/qtui/settings.cc:64
 msgid "Playlist Tabs"
-msgstr ""
+msgstr "Afspeellijst-tabbladen"
 
-#: src/gtkui/settings.cc:36
-msgid "Always show tabs"
-msgstr "Laat tabbladen altijd zien"
+#: src/gtkui/settings.cc:42 src/qtui/settings.cc:65
+msgid "Show playlist tabs:"
+msgstr "Tabbladen tonen op afspeellijsten:"
 
-#: src/gtkui/settings.cc:38
+#: src/gtkui/settings.cc:45 src/qtui/settings.cc:69
 msgid "Show entry counts"
-msgstr "Toon entree tellingen"
+msgstr "Itemtellers tonen"
 
-#: src/gtkui/settings.cc:40
+#: src/gtkui/settings.cc:47 src/qtui/settings.cc:72
 msgid "Show close buttons"
-msgstr "Toon sluitknoppen"
+msgstr "Sluitknoppen tonen"
 
-#: src/gtkui/settings.cc:42
+#: src/gtkui/settings.cc:49 src/qtui/settings.cc:75
 msgid "Playlist Columns"
-msgstr "Afspeellijst Kolommen"
+msgstr "Afspeellijstkolommen"
 
-#: src/gtkui/settings.cc:44
+#: src/gtkui/settings.cc:51 src/qtui/settings.cc:77
 msgid "Show column headers"
-msgstr "Toon kolomkoppen"
-
-#: src/gtkui/settings.cc:46 src/modplug/plugin_main.cc:106
-#: src/skins/skins_cfg.cc:263
-msgid "Miscellaneous"
-msgstr "Diversen"
+msgstr "Kolomkoppen tonen"
 
-#: src/gtkui/settings.cc:47
-msgid "Arrow keys seek by:"
+#: src/gtkui/settings.cc:53 src/qtui/settings.cc:82
+msgid "Make column headers clickable for sorting"
 msgstr ""
 
-#: src/gtkui/settings.cc:50
+#: src/gtkui/settings.cc:56
+msgid "Use symbolic icons in toolbar"
+msgstr "Symbolische werkbalkpictogrammen"
+
+#: src/gtkui/settings.cc:58 src/qtui/settings.cc:86
 msgid "Scroll on song change"
-msgstr ""
+msgstr "Scrollen bij nummerwijziging"
 
-#: src/gtkui/ui_gtk.cc:71
+#: src/gtkui/ui_gtk.cc:82
 msgid "GTK Interface"
-msgstr "GTK Interface"
+msgstr "GTK-interface"
 
-#: src/gtkui/ui_gtk.cc:222 src/skins/ui_main.cc:232
+#: src/gtkui/ui_gtk.cc:219 src/skins/main.cc:228 src/skins-qt/main.cc:231
 #, c-format
 msgid "%s - Audacious"
 msgstr "%s - Audacious"
 
-#: src/gtkui/ui_gtk.cc:225 src/qtui/main_window.cc:186
+#: src/gtkui/ui_gtk.cc:221 src/moonstone/main_window.cc:184
+#: src/qtui/main_window.cc:385
 msgid "Buffering ..."
-msgstr ""
+msgstr "Bezig met bufferen…"
 
-#: src/gtkui/ui_gtk.cc:228 src/skins/ui_main.cc:234 src/skins/ui_main.cc:1164
+#: src/gtkui/ui_gtk.cc:224 src/pipewire/pipewire.cc:402 src/skins/main.cc:230
+#: src/skins-qt/main.cc:233
 msgid "Audacious"
 msgstr "Audacious"
 
-#: src/gtkui/ui_statusbar.cc:63 src/qtui/status_bar.cc:67
+#: src/gtkui/ui_gtk.cc:487 src/gtkui/ui_gtk.cc:518 src/gtkui/ui_gtk.cc:882
+#: src/hotkey/gui.cc:72 src/moonstone/main_window.cc:67
+#: src/moonstone/main_window.cc:145 src/moonstone/main_window.cc:146
+#: src/notify/osd.cc:85 src/qthotkey/gui.cc:67 src/qtui/main_window.cc:154
+#: src/qtui/main_window.cc:347 src/qtui/main_window.cc:348
+#: src/skins/menus.cc:109 src/skins-qt/menus.cc:100
+msgid "Play"
+msgstr "Afspelen"
+
+#: src/gtkui/ui_gtk.cc:487 src/moonstone/main_window.cc:151
+#: src/moonstone/main_window.cc:152 src/notify/osd.cc:82
+#: src/qtui/main_window.cc:353 src/qtui/main_window.cc:354
+#: src/skins/menus.cc:110 src/skins-qt/menus.cc:101
+msgid "Pause"
+msgstr "Pauzeren"
+
+#: src/gtkui/ui_gtk.cc:868 src/moonstone/main_window.cc:57
+#: src/qtui/main_window.cc:145 src/skins/menus.cc:86 src/skins-qt/menus.cc:77
+msgid "Search Library"
+msgstr "Bibliotheek doorzoeken"
+
+#: src/gtkui/ui_gtk.cc:875 src/moonstone/main_window.cc:60
+#: src/qtui/main_window.cc:147
+msgid "Open Files"
+msgstr "Bestanden openen"
+
+#: src/gtkui/ui_gtk.cc:876 src/moonstone/main_window.cc:62
+#: src/qtui/main_window.cc:149
+msgid "Add Files"
+msgstr "Bestanden toevoegen"
+
+#: src/gtkui/ui_gtk.cc:881 src/moonstone/main_window.cc:65
+#: src/qtui/main_window.cc:152 src/skins/menus.cc:112 src/skins-qt/menus.cc:103
+msgid "Previous"
+msgstr "Vorige"
+
+#: src/gtkui/ui_gtk.cc:883 src/hotkey/gui.cc:74 src/moonstone/main_window.cc:69
+#: src/qthotkey/gui.cc:69 src/qtui/main_window.cc:156 src/skins/menus.cc:111
+#: src/skins-qt/menus.cc:102
+msgid "Stop"
+msgstr "Stoppen"
+
+#: src/gtkui/ui_gtk.cc:884 src/moonstone/main_window.cc:76 src/notify/osd.cc:89
+#: src/qtui/main_window.cc:163 src/skins/menus.cc:113 src/skins-qt/menus.cc:104
+msgid "Next"
+msgstr "Volgende"
+
+#: src/gtkui/ui_gtk.cc:886 src/moonstone/main_window.cc:79
+#: src/qtui/main_window.cc:166 src/qtui/menus.cc:254 src/skins/menus.cc:79
+#: src/skins-qt/menus.cc:69
+msgid "Record Stream"
+msgstr "Stream opnemen"
+
+#: src/gtkui/ui_gtk.cc:919 src/moonstone/main_window.cc:86
+#: src/qtui/main_window.cc:173 src/skins/menus.cc:103 src/skins-qt/menus.cc:94
+msgid "Repeat"
+msgstr "Herhalen"
+
+#: src/gtkui/ui_gtk.cc:922 src/moonstone/main_window.cc:89
+#: src/qtui/main_window.cc:176 src/skins/menus.cc:104 src/skins-qt/menus.cc:95
+msgid "Shuffle"
+msgstr "Willekeurig"
+
+#: src/gtkui/ui_gtk.cc:1114 src/qtui/main_window.cc:123
+msgid "Menu"
+msgstr "Menu"
+
+#: src/gtkui/ui_statusbar.cc:64 src/qtui/status_bar.cc:155
 msgid "mono"
 msgstr "mono"
 
-#: src/gtkui/ui_statusbar.cc:65 src/qtui/status_bar.cc:69
+#: src/gtkui/ui_statusbar.cc:66 src/qtui/status_bar.cc:157
 msgid "stereo"
 msgstr "stereo"
 
-#: src/gtkui/ui_statusbar.cc:67 src/qtui/status_bar.cc:71
+#: src/gtkui/ui_statusbar.cc:68 src/qtui/status_bar.cc:160
 #, c-format
 msgid "%d channel"
 msgid_plural "%d channels"
 msgstr0 "%d kanaal"
 msgstr1 "%d kanalen"
 
-#: src/gtkui/ui_statusbar.cc:81 src/qtui/status_bar.cc:85
+#: src/gtkui/ui_statusbar.cc:76 src/qtui/status_bar.cc:168
+#, c-format
+msgid "%d kHz"
+msgstr "%d kHz"
+
+#: src/gtkui/ui_statusbar.cc:82 src/qtui/status_bar.cc:174
 #, c-format
-msgid "%d kbps"
-msgstr "%d kbps"
+msgid "%d kbit/s"
+msgstr "%d kbit/s"
 
-#: src/gtkui/ui_statusbar.cc:107 src/skins/ui_main_evlisteners.cc:103
+#: src/gtkui/ui_statusbar.cc:108 src/skins/main.cc:478 src/skins-qt/main.cc:461
 msgid "Single mode."
-msgstr ""
+msgstr "Enkele modus."
 
-#: src/gtkui/ui_statusbar.cc:109 src/skins/ui_main_evlisteners.cc:105
+#: src/gtkui/ui_statusbar.cc:110 src/skins/main.cc:480 src/skins-qt/main.cc:463
 msgid "Playlist mode."
-msgstr "Speellijst modus."
+msgstr "Afspeellijstmodus."
 
-#: src/gtkui/ui_statusbar.cc:117 src/skins/ui_main_evlisteners.cc:111
+#: src/gtkui/ui_statusbar.cc:118 src/skins/main.cc:486 src/skins-qt/main.cc:469
 msgid "Stopping after song."
-msgstr ""
+msgstr "Stoppen na dit nummer."
 
-#: src/hotkey/gui.cc:71
+#: src/hotkey/gui.cc:71 src/qthotkey/gui.cc:66
 msgid "Previous track"
-msgstr "Vorig liedje"
+msgstr "Vorig nummer"
 
-#: src/hotkey/gui.cc:72 src/notify/osd.cc:69 src/qtui/main_window.cc:69
-#: src/qtui/main_window.cc:172 src/qtui/main_window.cc:173
-#: src/skins/menus.cc:87
-msgid "Play"
-msgstr "Afspelen"
-
-#: src/hotkey/gui.cc:73
+#: src/hotkey/gui.cc:73 src/qthotkey/gui.cc:68
 msgid "Pause/Resume"
-msgstr "Pauzeer/Hervat"
+msgstr "Pauzeren/Hervatten"
 
-#: src/hotkey/gui.cc:74 src/qtui/main_window.cc:70 src/skins/menus.cc:89
-msgid "Stop"
-msgstr "Stop"
-
-#: src/hotkey/gui.cc:75
+#: src/hotkey/gui.cc:75 src/qthotkey/gui.cc:70
 msgid "Next track"
-msgstr "Volgend liedje"
+msgstr "Volgende nummer"
 
-#: src/hotkey/gui.cc:76
-msgid "Forward 5 seconds"
-msgstr "Vijf seconden naar voren"
+#: src/hotkey/gui.cc:76 src/qthotkey/gui.cc:71
+msgid "Step forward"
+msgstr "Vooruitspoelen"
 
-#: src/hotkey/gui.cc:77
-msgid "Rewind 5 seconds"
-msgstr "Vijf seconden terug"
+#: src/hotkey/gui.cc:77 src/qthotkey/gui.cc:72
+msgid "Step backward"
+msgstr "Terugspoelen"
 
-#: src/hotkey/gui.cc:78
+#: src/hotkey/gui.cc:78 src/qthotkey/gui.cc:73
 msgid "Mute"
 msgstr "Dempen"
 
-#: src/hotkey/gui.cc:79
+#: src/hotkey/gui.cc:79 src/qthotkey/gui.cc:74
 msgid "Volume up"
-msgstr "Volume Harder"
+msgstr "Volume omhoog"
 
-#: src/hotkey/gui.cc:80
+#: src/hotkey/gui.cc:80 src/qthotkey/gui.cc:75
 msgid "Volume down"
-msgstr "Volume zachter"
+msgstr "Volume omlaag"
 
-#: src/hotkey/gui.cc:81
+#: src/hotkey/gui.cc:81 src/qthotkey/gui.cc:76
 msgid "Jump to file"
-msgstr "Spring naar bestand"
+msgstr "Spoelen naar bestand"
 
-#: src/hotkey/gui.cc:82
+#: src/hotkey/gui.cc:82 src/qthotkey/gui.cc:77
 msgid "Toggle player window(s)"
-msgstr ""
+msgstr "Spelersvenster(s) in-/uitschakelen"
 
-#: src/hotkey/gui.cc:83
+#: src/hotkey/gui.cc:83 src/qthotkey/gui.cc:78
 msgid "Show On-Screen-Display"
-msgstr "Show On-Screen-Display"
+msgstr "On-Screen-Display tonen"
 
-#: src/hotkey/gui.cc:84
+#: src/hotkey/gui.cc:84 src/qthotkey/gui.cc:79
 msgid "Toggle repeat"
-msgstr "Herhaal Aan/Uit"
+msgstr "Herhalen in-/uitschakelen"
 
-#: src/hotkey/gui.cc:85
+#: src/hotkey/gui.cc:85 src/qthotkey/gui.cc:80
 msgid "Toggle shuffle"
-msgstr "Shuffle Aan/Uit"
+msgstr "Willekeurig in-/uitschakelen"
 
-#: src/hotkey/gui.cc:86
+#: src/hotkey/gui.cc:86 src/qthotkey/gui.cc:81
 msgid "Toggle stop after current"
-msgstr ""
+msgstr "Stoppen na huidig nummer in-/uitschakelen"
 
-#: src/hotkey/gui.cc:87
+#: src/hotkey/gui.cc:87 src/qthotkey/gui.cc:82
 msgid "Raise player window(s)"
-msgstr ""
+msgstr "Spelersvenster(s) verhogen"
 
-#: src/hotkey/gui.cc:97
+#: src/hotkey/gui.cc:98 src/qthotkey/gui.cc:100
 msgid "(none)"
 msgstr "(geen)"
 
-#: src/hotkey/gui.cc:234
+#: src/hotkey/gui.cc:261
 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 modifiers.\n"
 "\n"
 "Do you want to continue?"
 msgstr ""
+"Het is niet aanbevolen om de primaire muisknoppen te koppelen zonder "
+"modificatoren.\n"
+"\n"
+"Wil je doorgaan?"
 
-#: src/hotkey/gui.cc:236
+#: src/hotkey/gui.cc:264
 msgid "Binding mouse buttons"
-msgstr ""
+msgstr "Muisknopkoppelingen"
 
-#: src/hotkey/gui.cc:391
+#: src/hotkey/gui.cc:434
 msgid ""
 "Press a key combination inside a text field.\n"
 "You can also bind mouse buttons."
 msgstr ""
+"Druk op een toetscombinatie in een tekstveld.\n"
+"Je kunt ook de muisknoppen koppelen."
 
-#: src/hotkey/gui.cc:396
+#: src/hotkey/gui.cc:444 src/qthotkey/gui.cc:179
 msgid "Hotkeys:"
 msgstr "Sneltoetsen:"
 
-#: src/hotkey/gui.cc:413
+#: src/hotkey/gui.cc:457 src/qthotkey/gui.cc:181
 msgid "Action:"
 msgstr "Actie:"
 
-#: src/hotkey/gui.cc:420
+#: src/hotkey/gui.cc:461 src/qthotkey/gui.cc:182
 msgid "Key Binding:"
-msgstr ""
+msgstr "Sneltoetsen:"
 
-#: src/hotkey/gui.cc:468
+#: src/hotkey/gui.cc:518 src/qthotkey/gui.cc:184
 msgid "_Add"
 msgstr "_Toevoegen"
 
-#: src/hotkey/plugin.cc:61
+#: src/hotkey/plugin.cc:59 src/qthotkey/plugin.cc:78
 msgid "Global Hotkeys"
-msgstr "Globale Sneltoetsen"
+msgstr "Algemene sneltoetsen"
 
-#: src/hotkey/plugin.cc:79
+#: src/hotkey/plugin.cc:74
 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"
+"Contributors 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 ""
+"Algemene sneltoetsplug-in\n"
+"Beheer de speler met algemene toetscombinaties of de multimediatoetsen.\n"
+"\n"
+"Auteursrecht (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n"
+"\n"
+"Met hulp van o.a. deze bijdragers:\n"
+"Auteursrecht (C) 2006-2007 Vladimir Paskov <vlado.paskov@gmail.com>\n"
+"Auteursrecht/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/jack-ng/jack-ng.cc:49
+#: src/jack/jack-ng.cc:54
 msgid "JACK Output"
-msgstr "JACK Uitvoer"
+msgstr "JACK-uitvoer"
+
+#: src/jack/jack-ng.cc:126
+msgid "Client name:"
+msgstr "Clientnaam:"
 
-#: src/jack-ng/jack-ng.cc:114
+#: src/jack/jack-ng.cc:128
 msgid "Automatically connect to output ports"
-msgstr ""
+msgstr "Automatisch verbinden met uitgangen"
+
+#: src/jack/jack-ng.cc:130
+msgid "Filter ports (regex, use any port if blank):"
+msgstr "Poorten filteren (regex - laat leeg om elke poort te gebruiken):"
+
+#: src/jack/jack-ng.cc:136
+msgid "Connect to physical ports only"
+msgstr "Alleen verbinden met fysieke poorten"
+
+#: src/jack/jack-ng.cc:139
+msgid "Upmix to"
+msgstr "Omhoogmixen naar"
 
-#: src/jack-ng/jack-ng.cc:155
+#: src/jack/jack-ng.cc:141
+msgid "ports if input has fewer channels"
+msgstr "poorten als de invoer minder kanalen bevat"
+
+#: src/jack/jack-ng.cc:143
+msgid "Ignore insufficient number of ports"
+msgstr "Onvoldoende aantal poorten negeren"
+
+#: src/jack/jack-ng.cc:181
+msgid "No JACK output ports were found. Please check settings."
+msgstr "Geen JACK-uitgangen aangetroffen. Controleer de instellingen."
+
+#: src/jack/jack-ng.cc:195
 #, c-format
 msgid "Only %d JACK output ports were found but %d are required."
 msgstr ""
+"Er zijn slechts %d JACK-uitgangen gevonden, terwijl het verplichte aantal%d "
+"is."
 
-#: src/jack-ng/jack-ng.cc:164
+#: src/jack/jack-ng.cc:210
 #, c-format
 msgid "Failed to connect to JACK port %s."
-msgstr ""
+msgstr "Kan geen verbinding maken met de JACK-poort %s."
 
-#: src/jack-ng/jack-ng.cc:184
+#: src/jack/jack-ng.cc:230
 msgid ""
 "JACK supports only floating-point audio. You must change the output bit "
 "depth to floating-point in Audacious settings."
 msgstr ""
+"JACK ondersteunt alleen floating-point audio. Je moet de uitvoer-bitdiepte "
+"daarom wijzigen naar floating-point in de Audacious-instellingen."
 
-#: src/jack-ng/jack-ng.cc:197
+#: src/jack/jack-ng.cc:245
 msgid "Failed to connect to the JACK server; is it running?"
-msgstr ""
+msgstr "aon geen verbinding maken met de JACK-server; draait de server?"
 
-#: src/jack-ng/jack-ng.cc:273
+#: src/jack/jack-ng.cc:321
 #, c-format
 msgid ""
 "The JACK server requires a sample rate of %d Hz, but Audacious is playing at "
 "%d Hz. Please use the Sample Rate Converter effect to correct the mismatch."
 msgstr ""
+"De JACK-server heeft een samplesnelheid van %d Hz nodig, maar Audacious "
+"speelt af op %d Hz. Gebruik het samplesnelheidomvormer-effect om het "
+"verschil te corrigeren."
 
-#: src/ladspa/plugin.cc:414
+#: src/ladspa/plugin.cc:416
 #, c-format
 msgid "%s Settings"
 msgstr "%s Instellingen"
 
-#: src/ladspa/plugin.cc:478
+#: src/ladspa/plugin.cc:482
 msgid "Module paths:"
-msgstr "Module paden:"
+msgstr "Modulepaden:"
 
-#: src/ladspa/plugin.cc:483
+#: src/ladspa/plugin.cc:487
 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 ""
+"meerdere aparte paden met een dubbelepunt.\n"
+"Deze paden worden gezocht in aanvulling op LADSPA_PATH.\n"
+"Nadat u nieuwe paden heeft toegevoegd, hoeft u alleen op Enter te drukken om "
+"nieuwe plugins te zoeken."
 
-#: src/ladspa/plugin.cc:499
+#: src/ladspa/plugin.cc:508
 msgid "Available plugins:"
-msgstr "Beschikbare plugins:"
+msgstr "Beschikbare plug-ins:"
 
-#: src/ladspa/plugin.cc:512 src/modplug/plugin_main.cc:92
-#: src/modplug/plugin_main.cc:95 src/modplug/plugin_main.cc:98
-#: src/modplug/plugin_main.cc:101
+#: src/ladspa/plugin.cc:521 src/modplug/plugin_main.cc:91
+#: src/modplug/plugin_main.cc:94 src/modplug/plugin_main.cc:97
+#: src/modplug/plugin_main.cc:100
 msgid "Enable"
 msgstr "Inschakelen"
 
-#: src/ladspa/plugin.cc:518
+#: src/ladspa/plugin.cc:527
 msgid "Enabled plugins:"
-msgstr "Ingeschakelde plugins:"
+msgstr "Ingeschakelde plug-ins:"
 
-#: src/ladspa/plugin.cc:534
+#: src/ladspa/plugin.cc:543
 msgid "Settings"
 msgstr "Instellingen"
 
-#: src/ladspa/plugin.cc:551
+#: src/ladspa/plugin.cc:560
 msgid ""
 "LADSPA Host for Audacious\n"
 "Copyright 2011 John Lindgren"
@@ -2195,7 +2413,7 @@
 msgid "LIRC Plugin"
 msgstr "LIRC Plugin"
 
-#: src/lirc/lirc.cc:381
+#: src/lirc/lirc.cc:379
 msgid ""
 "A simple plugin to control Audacious using the LIRC remote control daemon\n"
 "\n"
@@ -2210,82 +2428,155 @@
 "\n"
 "For more information about LIRC, see http://lirc.org."
 msgstr ""
+"Een eenvoudige plugin om Audacious te bedienen met de LIRC afstandsbediening "
+"daemon\n"
+"\n"
+"Aangepast voor Audacious door:\n"
+"Tony Vroon <chainsaw@gentoo.org>\n"
+"Joonas Harjumäki <jharjuma@gmail.com>\n"
+"\n"
+"Gebaseerd op de XMMS LIRC plugin door:\n"
+"Carl van Schaik <carl@leg.uct.ac.za>\n"
+"Christoph Bartelmus <xmms@bartelmus.de>\n"
+"Andrew O. Shadoura <bugzilla@tut.by>\n"
+"\n"
+"Voor meer informatie over LIRC, zie http://lirc.org."
 
-#: src/lirc/lirc.cc:392
+#: src/lirc/lirc.cc:390
 msgid "Connection"
 msgstr "Verbinding"
 
-#: src/lirc/lirc.cc:393
+#: src/lirc/lirc.cc:391
 msgid "Reconnect to LIRC server"
-msgstr ""
+msgstr "Opnieuw verbinden met LIRC-server"
 
-#: src/lirc/lirc.cc:395
+#: src/lirc/lirc.cc:393
 msgid "Wait before reconnecting:"
-msgstr ""
-
-#: src/lyricwiki/lyricwiki.cc:41
-msgid "LyricWiki Plugin"
-msgstr "LyricWiki Plugin"
-
-#: src/lyricwiki/lyricwiki.cc:131 src/lyricwiki-qt/lyricwiki.cc:136
-msgid "No lyrics available"
-msgstr "Geen song-tekst beschikbaar"
-
-#: src/lyricwiki/lyricwiki.cc:217 src/lyricwiki/lyricwiki.cc:226
-#: src/lyricwiki/lyricwiki.cc:243 src/lyricwiki/lyricwiki.cc:252
-#: src/lyricwiki/lyricwiki.cc:267 src/lyricwiki-qt/lyricwiki.cc:222
-#: src/lyricwiki-qt/lyricwiki.cc:231 src/lyricwiki-qt/lyricwiki.cc:248
-#: src/lyricwiki-qt/lyricwiki.cc:257 src/lyricwiki-qt/lyricwiki.cc:272
-msgid "Error"
-msgstr "Fout"
+msgstr "Wachten met opnieuw verbinden:"
 
-#: src/lyricwiki/lyricwiki.cc:218 src/lyricwiki/lyricwiki.cc:244
-#: src/lyricwiki-qt/lyricwiki.cc:223 src/lyricwiki-qt/lyricwiki.cc:249
+#: src/lyrics-common/chart_lyrics_provider.cc:93
+#: src/lyrics-common/chart_lyrics_provider.cc:150
+#: src/lyrics-common/lyrics_ovh_provider.cc:50
 #, c-format
 msgid "Unable to fetch %s"
-msgstr ""
+msgstr "Kan %s niet ophalen"
 
-#: src/lyricwiki/lyricwiki.cc:227 src/lyricwiki/lyricwiki.cc:253
-#: src/lyricwiki-qt/lyricwiki.cc:232 src/lyricwiki-qt/lyricwiki.cc:258
+#: src/lyrics-common/chart_lyrics_provider.cc:100
+#: src/lyrics-common/chart_lyrics_provider.cc:157
+#: src/lyrics-common/lyrics_ovh_provider.cc:57
 #, c-format
 msgid "Unable to parse %s"
-msgstr ""
+msgstr "Kan %s niet verwerken"
 
-#: src/lyricwiki/lyricwiki.cc:259 src/lyricwiki-qt/lyricwiki.cc:264
+#: src/lyrics-common/chart_lyrics_provider.cc:121
+#: src/lyrics-common/chart_lyrics_provider.cc:194
+#: src/lyrics-common/lyrics_ovh_provider.cc:88
 msgid "Looking for lyrics ..."
-msgstr "Zoeken naar teksten ..."
+msgstr "Bezig met zoeken naar songteksten…"
 
-#: src/lyricwiki/lyricwiki.cc:267 src/lyricwiki-qt/lyricwiki.cc:272
-msgid "Missing song metadata"
-msgstr "Ontbrekende metadata"
+#: src/lyrics-common/preferences.h:43
+msgid "Nowhere"
+msgstr "Nergens"
 
-#: src/lyricwiki/lyricwiki.cc:278 src/lyricwiki-qt/lyricwiki.cc:283
-msgid "Connecting to lyrics.wikia.com ..."
-msgstr "Verbinden met lyrics.wikia.com ..."
+#: src/lyrics-common/preferences.h:49
+msgid "Artist is truncated at the start, Title -- at the end"
+msgstr "Artiest is aan hen begin verkort - Titel aan het eind"
 
-#: src/lyricwiki-qt/lyricwiki.cc:55
-msgid "LyricWiki Plugin (Qt)"
-msgstr ""
+#: src/lyrics-common/preferences.h:50
+msgid "Chars to truncate on:"
+msgstr "Verkorten naar:"
+
+#: src/lyrics-common/preferences.h:54
+msgid "Chars are ORed in RegExp, surrounded by whitespace"
+msgstr "Tekens zijn ORed in RegExp, omgeven door witruimte"
+
+#: src/lyrics-common/preferences.h:55
+msgid "Chars to split on:"
+msgstr "Splitsen na:"
+
+#: src/lyrics-common/preferences.h:56
+msgid "Further truncate those on chars"
+msgstr "Verder verkorten"
+
+#: src/lyrics-common/preferences.h:62
+msgid "General"
+msgstr "Algemeen"
+
+#: src/lyrics-common/preferences.h:63
+msgid "Split title into artist and title on chars"
+msgstr "Titel splitsen naar artiest en titel na"
+
+#: src/lyrics-common/preferences.h:66
+msgid "Sources"
+msgstr "Bronnen"
+
+#: src/lyrics-common/preferences.h:67
+msgid "Use embedded lyrics (from Lyrics tag)"
+msgstr "Meegeleverde songteksten tonen (uit songtekst-tag)"
 
-#: src/m3u/m3u.cc:32
+#: src/lyrics-common/preferences.h:69
+msgid "Fetch lyrics from internet:"
+msgstr "Songteksten ophalen van internet:"
+
+#: src/lyrics-common/preferences.h:72
+msgid "Store fetched lyrics in local cache"
+msgstr "Opgevraagde songteksten opslaan in lokale cache"
+
+#: src/lyrics-common/preferences.h:74
+msgid "Local Storage"
+msgstr "Lokale opslag"
+
+#: src/lyrics-common/preferences.h:75
+msgid "Load lyric files (.lrc) from local storage"
+msgstr "Songtekstbestanden (.lrc) laden uit lokale opslag"
+
+#: src/lyrics-common/utils.cc:54 src/ui-common/dialogs-qt.cc:63
+msgid "Error"
+msgstr "Fout"
+
+#: src/lyrics-common/utils.cc:60
+msgid "Lyrics could not be found."
+msgstr "Er is geen songtekst beschikbaar."
+
+#: src/lyrics-common/utils.cc:142
+msgid "Missing title and/or artist."
+msgstr "De titel en/of artiest ontbreekt."
+
+#: src/lyrics-gtk/lyrics-gtk.cc:37 src/lyrics-qt/lyrics-qt.cc:50
+msgid "Lyrics"
+msgstr "Songtekst"
+
+#: src/lyrics-gtk/lyrics-gtk.cc:189 src/lyrics-qt/lyrics-qt.cc:171
+msgid "Edit Lyrics ..."
+msgstr "Songtekst bewerken..."
+
+#: src/lyrics-gtk/lyrics-gtk.cc:195 src/lyrics-qt/lyrics-qt.cc:178
+msgid "Save Locally"
+msgstr "Lokaal opslaan"
+
+#: src/lyrics-gtk/lyrics-gtk.cc:201 src/lyrics-qt/lyrics-qt.cc:186
+msgid "Refresh"
+msgstr "Verversen"
+
+#: src/m3u/m3u.cc:33
 msgid "M3U Playlists"
-msgstr "M3U Afspeellijsten"
+msgstr "M3U-afspeellijsten"
 
 #: src/metronom/metronom.cc:44
 msgid "Tact Generator"
-msgstr ""
+msgstr "Tactgenerator"
 
-#: src/metronom/metronom.cc:147
+#: src/metronom/metronom.cc:145
 #, c-format
 msgid "Tact generator: %d bpm"
-msgstr ""
+msgstr "Tactgenerator: %d bpm"
 
-#: src/metronom/metronom.cc:149
+#: src/metronom/metronom.cc:147
 #, c-format
 msgid "Tact generator: %d bpm %d/%d"
-msgstr ""
+msgstr "Tactgenerator: %d bpm %d/%d"
 
-#: src/metronom/metronom.cc:237
+#: src/metronom/metronom.cc:235
 msgid ""
 "A Tact Generator by Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
 "\n"
@@ -2293,195 +2584,211 @@
 "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 ""
+"Een Tactgenerator door Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
+"\n"
+"Voeg een url toe om te gebruiken: tact://beats*num/den\n"
+"bijv. tact://77 om 77 beats per minuut (bpm) af te spelen\n"
+"of tact://60*3/4 om 60 bpm af te spelen in 3/4 tacts"
 
-#: src/mixer/mixer.cc:38
+#: src/mixer/mixer.cc:43
 msgid "Channel Mixer"
-msgstr "Kanaal Mixer"
+msgstr "Kanaalmixer"
 
-#: src/mixer/mixer.cc:202
+#: src/mixer/mixer.cc:255
 msgid ""
 "Channel Mixer Plugin for Audacious\n"
 "Copyright 2011-2012 John Lindgren and Michał Lipski"
 msgstr ""
+"Kanaalmixer-plug-in voor Audacious\n"
+"Auteursrecht /Copyright2011-2012 John Lindgren en Michał Lipski"
 
-#: src/mixer/mixer.cc:206
+#: src/mixer/mixer.cc:259
 msgid "Channel Mixer"
-msgstr "Kanalen Mixer"
+msgstr "Kanaalmixer"
 
-#: src/mixer/mixer.cc:207
+#: src/mixer/mixer.cc:260
 msgid "Output channels:"
 msgstr "Uitvoerkanalen:"
 
 #: src/mms/mms.cc:35
 msgid "MMS Plugin"
-msgstr "MMS Plugin"
+msgstr "MMS-plug-in"
 
 #: src/mms/mms.cc:82
 msgid "Error connecting to MMS server"
-msgstr ""
+msgstr "Fout tijdens verbinden met de MMS-server"
 
-#: src/modplug/modplugbmp.h:53
+#: src/modplug/modplugbmp.h:57
 msgid "ModPlug (Module Player)"
-msgstr "ModPlus (Module Player)"
-
-#: src/modplug/plugin_main.cc:53
-msgid "Resolution"
-msgstr "Resolutie"
-
-#: src/modplug/plugin_main.cc:54
-msgid "8-bit"
-msgstr "8-bit"
+msgstr "ModPlug (Modulespeler)"
 
 #: src/modplug/plugin_main.cc:55
-msgid "16-bit"
-msgstr "16-bit"
-
-#: src/modplug/plugin_main.cc:56
 msgid "Channels"
 msgstr "Kanalen"
 
-#: src/modplug/plugin_main.cc:60
+#: src/modplug/plugin_main.cc:59
 msgid "Nearest (fastest)"
 msgstr "Dichtstbijzijnd (snelst)"
 
-#: src/modplug/plugin_main.cc:61
+#: src/modplug/plugin_main.cc:60
 msgid "Linear (fast)"
 msgstr "Lineair (snel)"
 
-#: src/modplug/plugin_main.cc:62
+#: src/modplug/plugin_main.cc:61
 msgid "Spline (good)"
-msgstr ""
+msgstr "Spline (goed)"
 
-#: src/modplug/plugin_main.cc:63
+#: src/modplug/plugin_main.cc:62
 msgid "Polyphase (best)"
-msgstr ""
+msgstr "Meerfasemeters (beste)"
 
-#: src/modplug/plugin_main.cc:64
+#: src/modplug/plugin_main.cc:63
 msgid "Sample rate"
-msgstr ""
+msgstr "Samplesnelheid"
 
-#: src/modplug/plugin_main.cc:65
+#: src/modplug/plugin_main.cc:64
 msgid "22 kHz"
 msgstr "22 kHz"
 
-#: src/modplug/plugin_main.cc:66
+#: src/modplug/plugin_main.cc:65
 msgid "44 kHz"
 msgstr "44 kHz"
 
-#: src/modplug/plugin_main.cc:67
+#: src/modplug/plugin_main.cc:66
 msgid "48 kHz"
 msgstr "48 kHz"
 
-#: src/modplug/plugin_main.cc:68
+#: src/modplug/plugin_main.cc:67
 msgid "96 kHz"
 msgstr "96 kHz"
 
-#: src/modplug/plugin_main.cc:72 src/modplug/plugin_main.cc:77
-#: src/modplug/plugin_main.cc:82
+#: src/modplug/plugin_main.cc:71 src/modplug/plugin_main.cc:76
+#: src/modplug/plugin_main.cc:81
 msgid "Level:"
-msgstr "Level:"
+msgstr "Niveau:"
 
-#: src/modplug/plugin_main.cc:78
+#: src/modplug/plugin_main.cc:77
 msgid "Cutoff:"
-msgstr ""
+msgstr "Afknippen:"
 
-#: src/modplug/plugin_main.cc:91
+#: src/modplug/plugin_main.cc:90
 msgid "Reverb"
-msgstr ""
+msgstr "Nagalm"
 
-#: src/modplug/plugin_main.cc:94
+#: src/modplug/plugin_main.cc:93
 msgid "Bass Boost"
-msgstr ""
+msgstr "Bas versterken"
 
-#: src/modplug/plugin_main.cc:97
+#: src/modplug/plugin_main.cc:96
 msgid "Surround"
 msgstr "Surround"
 
-#: src/modplug/plugin_main.cc:100
+#: src/modplug/plugin_main.cc:99
 msgid "Preamp"
-msgstr ""
+msgstr "Voorversterker"
 
-#: src/modplug/plugin_main.cc:107
+#: src/modplug/plugin_main.cc:106
 msgid "Oversample"
-msgstr ""
+msgstr "Oversample"
 
-#: src/modplug/plugin_main.cc:108
+#: src/modplug/plugin_main.cc:107
 msgid "Noise reduction"
 msgstr "Ruisonderdrukking"
 
-#: src/modplug/plugin_main.cc:109
+#: src/modplug/plugin_main.cc:108
 msgid "Play Amiga MODs"
-msgstr "Speel Amiga MOD's"
+msgstr "Amiga MOD's afspelen"
 
-#: src/modplug/plugin_main.cc:110
+#: src/modplug/plugin_main.cc:109
 msgid "Repeat"
-msgstr "Herhaal"
+msgstr "Herhalen"
 
-#: src/modplug/plugin_main.cc:111
+#: src/modplug/plugin_main.cc:110
 msgid "Repeat count:"
-msgstr "Herhaal teller:"
+msgstr "Aantal herhalingen:"
 
-#: src/modplug/plugin_main.cc:112
+#: src/modplug/plugin_main.cc:111
 msgid "To repeat forever, set the repeat count to -1."
-msgstr ""
+msgstr "Stel het aantal in op -1 om oneindig te herhalen."
 
-#: src/modplug/plugin_main.cc:125 src/sid/xs_config.cc:106
+#: src/modplug/plugin_main.cc:124 src/sid/xs_config.cc:106
 msgid "These settings will take effect when Audacious is restarted."
 msgstr ""
+"Deze instellingen worden toegepast zodra Audacious opnieuw wordt gestart."
+
+#: src/moonstone/main_window.cc:72 src/moonstone/main_window.cc:73
+#: src/qtui/main_window.cc:159 src/qtui/main_window.cc:160
+#: src/skins/menus.cc:107 src/skins-qt/menus.cc:98
+msgid "Stop After This Song"
+msgstr "Stoppen na dit nummer"
+
+#: src/moonstone/moonstone.cc:39
+msgid "Moonstone"
+msgstr "Maansteen"
+
+#: src/moonstone/playlist_header.cc:212 src/qtui/playlist_header.cc:258
+msgid "Reset to Defaults"
+msgstr "Standaardwaarden herstellen"
+
+#: src/moonstone/playlist_model.cc:38 src/qtui/playlist_header.cc:232
+msgid "Now Playing"
+msgstr "Nu aan het afspelen"
+
+#: src/moonstone/playlist_selection.cc:66
+#: src/playlist-manager/playlist-manager.cc:201
+#: src/playlist-manager-qt/playlist-manager-qt.cc:190
+msgid "Entries"
+msgstr "Items"
 
 #: src/mpg123/mpg123.cc:54
 msgid "MPG123 Plugin"
-msgstr "MPG123 Plugin"
-
-#: src/mpg123/mpg123.cc:83
-msgid "Advanced"
-msgstr "Geadvanceerd"
+msgstr "MPG123-plug-in"
 
-#: src/mpg123/mpg123.cc:84
+#: src/mpg123/mpg123.cc:82
 msgid "Use accurate length calculation (slow)"
-msgstr ""
+msgstr "Nauwkeurige duurberekening gebruiken (langzaam)"
 
-#: src/mpg123/mpg123.cc:248
+#: src/mpg123/mpg123.cc:260
 msgid "Surround"
 msgstr "Surround"
 
-#: src/mpris2/plugin.cc:39
+#: src/mpris2/plugin.cc:40
 msgid "MPRIS 2 Server"
-msgstr "MPRIS 2 Server"
+msgstr "MPRIS 2-server"
 
-#: src/neon/neon.cc:97
+#: src/neon/neon.cc:102
 msgid "Neon HTTP/HTTPS Plugin"
-msgstr "Neon HTTP/HTTPS Plugin"
+msgstr "Neon HTTP/HTTPS-plug-in"
 
-#: src/neon/neon.cc:521
+#: src/neon/neon.cc:526
 msgid "Error parsing redirect"
-msgstr ""
+msgstr "Fout bij verwerken van doorverwijzing"
 
-#: src/neon/neon.cc:535
+#: src/neon/neon.cc:540
 msgid "Unknown HTTP error"
-msgstr "Onbekende HTTP fout"
+msgstr "Onbekende HTTP-fout"
 
-#: src/neon/neon.cc:569
+#: src/neon/neon.cc:614
 msgid "Error parsing URL"
-msgstr ""
+msgstr "De url kan niet worden verwerkt"
 
-#: src/neon/neon.cc:632
+#: src/neon/neon.cc:687
 msgid "Too many redirects"
-msgstr "Teveel redirects"
+msgstr "Teveel doorverwijzingen"
 
-#: src/notify/event.cc:64
+#: src/notify/event.cc:97
 msgid "Stopped"
 msgstr "Gestopt"
 
-#: src/notify/event.cc:64
+#: src/notify/event.cc:97
 msgid "Audacious is not playing."
 msgstr "Audacious is niets aan het afspelen."
 
-#: src/notify/notify.cc:42
+#: src/notify/notify.cc:39
 msgid "Desktop Notifications"
-msgstr "Desktop Notificaties"
+msgstr "Bureaubladmeldingen"
 
-#: src/notify/notify.cc:60
+#: src/notify/notify.cc:57
 msgid ""
 "Desktop Notifications Plugin for Audacious\n"
 "Copyright (C) 2010 Maximilian Bogner\n"
@@ -2500,65 +2807,127 @@
 "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 ""
+"Bureaubladmeldingenplug-in voor Audacious\n"
+"Auteursrecht (C) 2010 Maximilian Bogne\n"
+"Auteursrecht/Copyright (C) 2011-2013 John Lindgren en Jean-Alexandre Anglès "
+"d'Auriac\n"
+"\n"
+"Dit programma is gratis software; U kunt het opnieuw uitgeven en/of \n"
+"wijzigen onder de voorwaarden van de GNU General Public License zoals \n"
+"gepubliceerd door de Free Software Foundation; Ofwel versie 3 van de \n"
+"licentie, of (naar keuze) elke latere versie.\n"
+"\n"
+"Deze plugin wordt uitgegeven in de hoop dat het nuttig zal zijn, maar \n"
+"ZONDER ENIGE GARANTIE; zelfs zonder de impliciete garantie van \n"
+"VERKOOPBAARHEID of GESCHIKTHEID VOOR EEN BEPAALD DOEL. Zie de GNU General "
+"Public License voor meer informatie.\n"
+"\n"
+"U zou een kopie van de GNU General Public License ontvangen moeten hebben "
+"samen met dit programma. Indien niet, zie <http://www.gnu.org/licenses/>."
 
-#: src/notify/notify.cc:110
+#: src/notify/notify.cc:104
 msgid "Show playback controls"
-msgstr ""
+msgstr "Mediabesturing tonen"
 
-#: src/notify/notify.cc:112
+#: src/notify/notify.cc:106
 msgid "Always show notification"
-msgstr "Laat altijd de notificaties zien"
+msgstr "Meldingen altijd tonen"
 
-#: src/notify/notify.cc:114
+#: src/notify/notify.cc:108
 msgid "Include album name in notification"
-msgstr ""
+msgstr "Albumnaam tonen in meldingen"
+
+#: src/notify/notify.cc:110
+msgid "Custom notification duration:"
+msgstr "Aangepaste meldingsduur:"
 
-#: src/notify/osd.cc:58
+#: src/notify/osd.cc:74
 msgid "Show"
-msgstr "Laat zien"
+msgstr "Tonen"
 
-#: src/notify/osd.cc:66 src/qtui/main_window.cc:178
-#: src/qtui/main_window.cc:179 src/skins/menus.cc:88
-msgid "Pause"
-msgstr "Pauze"
+#: src/openmpt/mpt.cc:50
+msgid "OpenMPT (Module Player)"
+msgstr "OpenMPT (Modulespeler)"
 
-#: src/notify/osd.cc:73 src/qtui/main_window.cc:72 src/skins/menus.cc:91
-msgid "Next"
-msgstr "Volgende"
+#: src/openmpt/mpt.cc:132
+msgid ""
+"Module player based on libopenmpt\n"
+"\n"
+"Written by: Chris Spiegel <cspiegel@gmail.com>"
+msgstr ""
+"Modulespeler, gebaseerd op libopenmpt\n"
+"\n"
+"Gemaakt door: Chris Spiegel <cspiegel@gmail.com>"
+
+#: src/openmpt/mpt.cc:151
+msgid "Stereo separation:"
+msgstr "Stereoscheiding:"
+
+#: src/openmpt/mpt.cc:153
+msgid "% (0=mono, 100=default, 200=full)"
+msgstr ""
+
+#: src/openmpt/mpt.cc:157
+msgid "Interpolation:"
+msgstr "Interpolatie:"
+
+#: src/openmpt/mptwrap.h:51 src/soxr/sox-resampler.cc:189 src/xsf/plugin.cc:437
+msgid "Linear"
+msgstr "Lineair"
 
-#: src/oss4/oss.h:93
+#: src/openmpt/mptwrap.h:52
+msgid "Cubic"
+msgstr "Kubisch"
+
+#: src/openmpt/mptwrap.h:53
+msgid "Windowed sinc"
+msgstr "Venstersinc"
+
+#: src/opus/opus.cc:39
+msgid "Opus Decoder"
+msgstr "Opus-decoder"
+
+#: src/opus/opus.cc:336
+msgid ""
+"Opus Decoder Plugin for Audacious\n"
+"Copyright 2022 Thomas Lange"
+msgstr ""
+"Opus Decoder-plug-in voor Audacious\n"
+"Copyright 2022 Thomas Lange"
+
+#: src/oss4/oss.h:70
 msgid "OSS4 Output"
-msgstr "OSS4 Uitvoer"
+msgstr "OSS4-uitvoer"
 
-#: src/oss4/oss.h:95
+#: src/oss4/oss.h:72
 msgid "OSS3 Output"
-msgstr "OSS3 Uitvoer"
+msgstr "OSS3-uitvoer"
 
 #: src/oss4/plugin.cc:35
 msgid "Default device"
-msgstr "Standaard Apparaat"
+msgstr "Standaardapparaat"
 
-#: src/oss4/plugin.cc:77
+#: src/oss4/plugin.cc:78
 msgid "Audio device:"
-msgstr "Audio apparaat:"
+msgstr "Audio-apparaat:"
 
-#: src/oss4/plugin.cc:80
+#: src/oss4/plugin.cc:81
 msgid "Use alternate device:"
-msgstr "Gebruik alternatief apparaat:"
+msgstr "Alternatief apparaat gebruiken:"
 
-#: src/oss4/plugin.cc:84
+#: src/oss4/plugin.cc:85
 msgid "Save volume between sessions."
-msgstr "Bewaar het volume tussen twee sessies."
+msgstr "Volume onthouden tussen sessies."
 
-#: src/oss4/plugin.cc:86
+#: src/oss4/plugin.cc:87
 msgid "Enable format conversions made by the OSS software."
-msgstr ""
+msgstr "Formaatconversies inschakelen die door de OSS-software worden gemaakt."
 
-#: src/oss4/plugin.cc:88
+#: src/oss4/plugin.cc:89
 msgid "Enable exclusive mode to prevent virtual mixing."
-msgstr ""
+msgstr "Exclusieve modus inschakelen om virtueel mengen te voorkomen."
 
-#: src/oss4/plugin.cc:100
+#: src/oss4/plugin.cc:101
 msgid ""
 "OSS4 Output Plugin for Audacious\n"
 "Copyright 2010-2012 Michał Lipski\n"
@@ -2566,65 +2935,117 @@
 "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 voor Audacious\n"
-"Copyright 2010-2012 Michał Lipski\n"
+"OSS4-uitvoerplug-in voor Audacious\n"
+"Auteursrecht 2010-2012 Michał Lipski\n"
 "\n"
-"Ik wil graag de mensen op #audacious bedanken. Speciaal Tony Vroon en John "
-"Lindgren en natuurlijk de auteurs van de vorige OSS plugin."
+"Ik wil graag de mensen op #audacious bedanken, in het bijzonder Tony Vroon "
+"en John Lindgren en natuurlijk de auteurs van de vorige OSS-plug-in."
 
-#: src/playlist-manager/playlist-manager.cc:37
-msgid "Playlist Manager"
+#: src/pipewire/pipewire.cc:44
+msgid "PipeWire Output"
+msgstr "PipeWire-uitvoer"
+
+#: src/pipewire/pipewire.cc:118
+msgid ""
+"PipeWire Output Plugin for Audacious\n"
+"Copyright 2022 Thomas Lange\n"
+"\n"
+"Based on the PipeWire Output Plugin for Qmmp\n"
+"Copyright 2021 Ilya Kotov"
 msgstr ""
+"PipeWire-uitvoerplug-in voor Audacious\n"
+"Copyright 2022 Thomas Lange\n"
+"\n"
+"Gebaseerd op de PipeWire-uitvoerplug-in voor Qmmp\n"
+"Copyright 2021 Ilya Kotov"
 
-#: src/playlist-manager/playlist-manager.cc:226
-msgid "Entries"
-msgstr "Invoer"
+#: src/pipewire/pipewire.cc:408 src/skins/menus.cc:88 src/skins-qt/menus.cc:79
+msgid "Playback"
+msgstr "Afspelen"
 
-#: src/playlist-manager/playlist-manager.cc:245
+#: src/playlist-manager/playlist-manager.cc:38
+#: src/playlist-manager-qt/playlist-manager-qt.cc:42
+msgid "Playlist Manager"
+msgstr "Afspeellijstbeheer"
+
+#: src/playlist-manager/playlist-manager.cc:221
+#: src/playlist-manager-qt/playlist-manager-qt.cc:356
 msgid "_Remove"
-msgstr "_Verwijderen"
+msgstr "Ve_rwijderen"
 
-#: src/playlist-manager/playlist-manager.cc:246
+#: src/playlist-manager/playlist-manager.cc:222
+#: src/playlist-manager-qt/playlist-manager-qt.cc:351
 msgid "Ren_ame"
-msgstr ""
+msgstr "N_aam wijzigen"
 
 #: src/pls/pls.cc:35
 msgid "PLS Playlists"
-msgstr "PLS Afspeellijsten"
+msgstr "PLS-afspeellijsten"
 
-#: src/psf/plugin.cc:45
+#: src/psf/plugin.cc:53
 msgid "OpenPSF PSF1/PSF2 Decoder"
-msgstr "OpenPSF PSF1/PSF2 Decoder"
+msgstr "OpenPSF PSF1/PSF2-decoder"
 
-#: src/pulse_audio/pulse_audio.cc:38
+#: src/psf/plugin.cc:270
+msgid "OpenPSF Configuration"
+msgstr "OpenPSF-instellingen"
+
+#: src/psf/plugin.cc:271 src/xsf/plugin.cc:444
+msgid "Ignore length from file"
+msgstr "Duur negeren volgens bestand"
+
+#: src/pulse/pulse_audio.cc:42
 msgid "PulseAudio Output"
-msgstr "PulseAudio Uitvoer"
+msgstr "PulseAudio-uitvoer"
+
+#: src/pulse/pulse_audio.cc:84
+msgid "Context name:"
+msgstr "Contextnaam:"
 
-#: src/pulse_audio/pulse_audio.cc:611
+#: src/pulse/pulse_audio.cc:86
+msgid "Stream name:"
+msgstr "Naam van stream:"
+
+#: src/pulse/pulse_audio.cc:596
 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."
+"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 ""
+"Audacious PulseAudio-uitvoerplug-in\n"
+"\n"
+"Dit programma is gratis software; U kunt het opnieuw uitgeven en/of wijzigen "
+"onder de voorwaarden van de GNU General Public License zoals gepubliceerd "
+"door de Free Software Foundation; Ofwel versie 2 van de licentie, of (naar "
+"keuze) elke latere versie.\n"
+"\n"
+"Dit programma wordt uitgegeven in de hoop dat het nuttig zal zijn, maar "
+"ZONDER ENIGE GARANTIE; zelfs zonder de impliciete garantie van "
+"VERKOOPBAARHEID of GESCHIKTHEID VOOR EEN BEPAALD DOEL. Zie de GNU General "
+"Public License voor meer informatie.\n"
+"\n"
+"U zou een kopie van de GNU General Public License ontvangen moeten hebben "
+"samen met dit programma; Indien niet, schrijf aan de Free Software "
+"Foundation, Inc., Franklin Street 51, Vijfde Vloer, Boston, MA 02110-1301, "
+"USA."
 
-#: src/qtaudio/qtaudio.cc:49
+#: src/qtaudio/qtaudio.cc:53
 msgid "QtMultimedia Output"
-msgstr "QtMultimedia Uitvoer"
+msgstr "QtMultimedia-uitvoer"
 
-#: src/qtaudio/qtaudio.cc:77
+#: src/qtaudio/qtaudio.cc:84
 msgid ""
 "QtMultimedia Audio Output Plugin for Audacious\n"
 "Copyright 2014 William Pitcock\n"
@@ -2632,80 +3053,145 @@
 "Based on SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
 msgstr ""
+"QtMultimedia-uitvoerplug-in voor Audacious\n"
+"Copyright 2014 William Pitcock\n"
+"\n"
+"Gebaseerd op de SDL-uitvoerplug-in voor Audacious\n"
+"Copyright 2010 John Lindgren"
 
-#: src/qtui/dialog_windows.cc:31
-msgid "Working ..."
-msgstr "Werken ..."
+#: src/qtglspectrum/gl-spectrum.cc:41
+msgid ""
+"OpenGL Spectrum Analyzer for Audacious\n"
+"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
+"Copyright 2014, 2020 Ariadne Conill\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-spectrumanalyse voor Audacious\n"
+"Copyright 2013 Christophe Budé, John Lindgren en Carlo Bramini\n"
+"Copyright 2014, 2020 Ariadne Conill\n"
+"\n"
+"Gebaseerd op de XMMS-plug-in:\n"
+"Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson en "
+"4Front Technologies\n"
+"\n"
+"Licentie: GPLv2+"
 
-#: src/qtui/filter_input.cc:44 src/skins/ui_playlist.cc:221
-msgid "Search"
-msgstr "Zoeken"
+#: src/qthotkey/gui.cc:177
+msgid "Press a key combination inside a text field."
+msgstr "Druk op een toetscombinatie in een tekstveld."
 
-#: src/qtui/main_window_actions.cc:94
+#: src/qthotkey/plugin.cc:105
+msgid ""
+"Global Hotkey Plugin\n"
+"Control the player with global key combinations or multimedia keys.\n"
+"\n"
+"Copyright (C) 2020 i.Dark_Templar <darktemplar@dark-templar-archives.net>\n"
+"Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n"
+"\n"
+"Contributors 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 ""
+"Algemene sneltoetsplug-in\n"
+"Beheer de speler met algemene toetscombinaties of de multimediatoetsen.\n"
+"\n"
+"Copyright (C) 2020 i.Dark_Templar <darktemplar@dark-templar-archives.net>\n"
+"Auteursrecht (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n"
+"\n"
+"Met hulp van o.a. deze bijdragers:\n"
+"Auteursrecht (C) 2006-2007 Vladimir Paskov <vlado.paskov@gmail.com>\n"
+"Auteursrecht/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/qtui/menus.cc:109
 msgid "_Open Folder ..."
-msgstr "_Map Openen ..."
+msgstr "Map _openen…"
 
-#: src/qtui/main_window_actions.cc:96
+#: src/qtui/menus.cc:115
 msgid "_Add Folder ..."
-msgstr "_Map Toevoegen ..."
+msgstr "M_ap toevoegen…"
 
-#: src/qtui/main_window_actions.cc:101
+#: src/qtui/menus.cc:128
 msgid "_Log Inspector ..."
-msgstr ""
+msgstr "_Logboekinspectie…"
 
-#: src/qtui/main_window.cc:64
-msgid "Open Files"
-msgstr "Bestanden Openen"
+#: src/qtui/menus.cc:220
+msgid "_Find ..."
+msgstr "_Zoeken…"
 
-#: src/qtui/main_window.cc:66
-msgid "Add Files"
-msgstr "Bestanden Toevoegen"
+#: src/qtui/menus.cc:256 src/skins/menus.cc:80 src/skins-qt/menus.cc:70
+msgid "Audio Settings ..."
+msgstr "Audio-instellingen…"
 
-#: src/qtui/main_window.cc:71 src/skins/menus.cc:90
-msgid "Previous"
-msgstr "Vorige"
+#: src/qtui/playlist_model.cc:188
+msgid "Q#"
+msgstr "Q#"
 
-#: src/qtui/main_window.cc:77 src/skins/menus.cc:82
-msgid "Repeat"
-msgstr "Herhaal"
+#: src/qtui/playlist_model.cc:190
+msgid "T#"
+msgstr "T#"
 
-#: src/qtui/main_window.cc:79 src/skins/menus.cc:83
-msgid "Shuffle"
-msgstr "Shuffle"
+#: src/qtui/playlist_model.cc:192
+msgid "C#"
+msgstr "C#"
 
-#: src/qtui/qtui.cc:42
+#: src/qtui/playlist_model.cc:194
+msgid "D#"
+msgstr ""
+
+#: src/qtui/qtui.cc:40
 msgid "Qt Interface"
-msgstr "Qt Interface"
+msgstr "Qt-interface"
+
+#: src/qtui/search_bar.cc:46
+msgid "Search playlist"
+msgstr "Afspeellijst doorzoeken"
+
+#: src/qtui/settings.cc:79
+msgid "Use bold font for column headers"
+msgstr "Vetgedrukt lettertype gebruiken op kolomkoppen"
 
 #: src/resample/resample.cc:43
 msgid "Sample Rate Converter"
-msgstr ""
+msgstr "Samplesnelheid-omvormer"
 
 #: src/resample/resample.cc:183
 msgid ""
 "Sample Rate Converter Plugin for Audacious\n"
 "Copyright 2010-2012 John Lindgren"
 msgstr ""
+"Samplesnelheid-omvormer-plug-in voor Audacious\n"
+"Copyright 2010-2012 John Lindgren"
 
 #: src/resample/resample.cc:187
 msgid "Skip/repeat samples"
-msgstr ""
+msgstr "Samples herhalen/overslaan"
 
 #: src/resample/resample.cc:188
 msgid "Linear interpolation"
-msgstr ""
+msgstr "Lineaire interpolatie"
 
 #: src/resample/resample.cc:189
 msgid "Fast sinc interpolation"
-msgstr ""
+msgstr "Snelle sinc-interpolatie"
 
 #: src/resample/resample.cc:190
 msgid "Medium sinc interpolation"
-msgstr ""
+msgstr "Gemiddelde sinc-interpolatie"
 
 #: src/resample/resample.cc:191
 msgid "Best sinc interpolation"
-msgstr ""
+msgstr "Beste sinc-interpolatie"
 
 #: src/resample/resample.cc:195
 msgid "Conversion"
@@ -2715,17 +3201,17 @@
 msgid "Method:"
 msgstr "Methode:"
 
-#: src/resample/resample.cc:199 src/sox-resampler/sox-resampler.cc:161
+#: src/resample/resample.cc:199 src/soxr/sox-resampler.cc:203
 msgid "Rate:"
-msgstr "Rate:"
+msgstr "Snelheid:"
 
 #: src/resample/resample.cc:202
 msgid "Rate Mappings"
-msgstr ""
+msgstr "Snelheidstoewijzingen"
 
 #: src/resample/resample.cc:203
 msgid "Use rate mappings"
-msgstr ""
+msgstr "Snelheidstoewijzingen gebruiken"
 
 #: src/resample/resample.cc:205
 msgid "8 kHz:"
@@ -2767,164 +3253,164 @@
 msgid "192 kHz:"
 msgstr "192 kHz:"
 
-#: src/scrobbler2/config_window.cc:41
-#, c-format
-msgid "OK. Scrobbling for user: %s"
-msgstr "OK. Scrobbling voor gebruiker: %s"
-
-#: src/scrobbler2/config_window.cc:54
-msgid "Permission Denied"
-msgstr "Toegang Geweigerd"
+#: src/scrobbler2/config_window.cc:29
+msgid "Checking Last.fm access ..."
+msgstr "Bezig met controleren op Last.fm-toegang…"
 
-#: src/scrobbler2/config_window.cc:56
-msgid "Access the following link to allow Audacious to scrobble your plays:"
-msgstr ""
-
-#: src/scrobbler2/config_window.cc:66
-msgid "Keep this window open and click 'Check Permission' again.\n"
-msgstr ""
-
-#: src/scrobbler2/config_window.cc:69 src/scrobbler2/config_window.cc:80
+#: src/scrobbler2/config_window.cc:35
 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."
+"Your scrobbles are being saved on your computer temporarily. They will be "
+"submitted as soon as Audacious is allowed access."
 msgstr ""
+"Je scrobbles worden tijdelijk opgeslagen op je computer. Zij worden "
+"ingediend zodra Audacious toegang heeft gekregen."
 
-#: src/scrobbler2/config_window.cc:77
-msgid "Network Problem."
-msgstr "Netwerk Probleem."
+#: src/scrobbler2/config_window.cc:41
+#, c-format
+msgid "Permission granted. Scrobbling for user %s."
+msgstr "Machtiging verleend; scrobbling voor gebruiker %s."
 
-#: src/scrobbler2/config_window.cc:78
-msgid "There was a problem contacting Last.fm. Please try again later."
+#: src/scrobbler2/config_window.cc:44
+msgid ""
+"Permission denied. Open the following URL in a browser, allow Audacious "
+"access to your account, and then click 'Check Permission' again:"
 msgstr ""
-"Er is een probleem om met Last.fm te verbinden. Probeer het later nog eens."
+"Niet bevoegd. Open de volgende url in een browser, geef Audacious toegang "
+"tot je account en klik vervolgens opnieuw op ‘Machtiging controleren’:"
 
-#: src/scrobbler2/config_window.cc:110
-msgid "Checking..."
-msgstr "Controleren..."
+#: src/scrobbler2/config_window.cc:53
+msgid "There was a problem contacting Last.fm."
+msgstr "Er is een probleem opgetredens tijdens het verbinden met Last.fm."
 
-#: src/scrobbler2/config_window.cc:176
-msgid "C_heck Permission"
-msgstr ""
+#: src/scrobbler2/config_window.cc:92
+msgid "Check Permission"
+msgstr "Machtiging controleren"
 
-#: src/scrobbler2/config_window.cc:177
-msgid "_Revoke Permission"
-msgstr ""
+#: src/scrobbler2/config_window.cc:93
+msgid "Revoke Permission"
+msgstr "Machtiging intrekken"
 
-#: src/scrobbler2/config_window.cc:220
-msgid ""
-"You need to allow Audacious to scrobble tracks to your Last.fm account.\n"
+#: src/scrobbler2/config_window.cc:97
+msgid "You need to allow Audacious to scrobble tracks to your Last.fm account."
 msgstr ""
+"Je moet Audacious machtigen om je nummers op je Last.fm-account te kunnen "
+"scrobbelen."
 
 #: src/scrobbler2/scrobbler.cc:29
 msgid "Scrobbler 2.0"
 msgstr "Scrobbler 2.0"
 
-#: src/scrobbler2/scrobbler.cc:224
+#: src/scrobbler2/scrobbler.cc:200
 msgid ""
 "The Scrobbler plugin could not be started.\n"
 "There might be a problem with your installation."
 msgstr ""
+"De Scrobbler-plug-in kan niet worden gestart. \n"
+"Er is mogelijk een probleem met je installatie."
 
-#: src/scrobbler2/scrobbler.cc:289
+#: src/scrobbler2/scrobbler.cc:245
 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_communication.cc:642
-msgid ""
-"Audacious is now using an improved version of the Last.fm Scrobbler.\n"
-"Please check the Preferences for the Scrobbler plugin."
+"project."
 msgstr ""
 
-#: src/sdlout/sdlout.cc:48
+#: src/sdlout/sdlout.cc:43
 msgid "SDL Output"
-msgstr "SDL Uitvoer"
+msgstr "SDL-uitvoer"
 
-#: src/sdlout/sdlout.cc:77
+#: src/sdlout/sdlout.cc:72
 msgid ""
 "SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
 msgstr ""
-"SDL Output Plugin voor Audacious\n"
+"SDL-uitvoer-plug-in voor Audacious\n"
 "Copyright 2010 John Lindgren"
 
-#: src/search-tool/search-tool.cc:116 src/search-tool/search-tool.cc:124
+#: src/search-tool/library.cc:35 src/search-tool/library.cc:46
+#: src/search-tool-qt/library.cc:35 src/search-tool-qt/library.cc:46
 msgid "Library"
 msgstr "Bibliotheek"
 
-#: src/search-tool/search-tool.cc:394
-#, c-format
-msgid "%d result"
-msgid_plural "%d results"
-msgstr0 "%d resultaat"
-msgstr1 "%d resultaten"
-
-#: src/search-tool/search-tool.cc:400
-#, c-format
-msgid "(%d hidden)"
-msgid_plural "(%d hidden)"
-msgstr0 "(%d verborgen)"
-msgstr1 "(%d verborgen)"
-
-#: src/search-tool/search-tool.cc:594
+#: src/search-tool-qt/search-model.cc:44 src/search-tool/search-tool.cc:287
 #, c-format
 msgid "%d song"
 msgid_plural "%d songs"
-msgstr0 "%d lied"
-msgstr1 "%d liedjes"
+msgstr0 "%d nummer"
+msgstr1 "%d nummers"
 
-#: src/search-tool/search-tool.cc:601
+#: src/search-tool-qt/search-model.cc:53 src/search-tool/search-tool.cc:294
 msgid "of this genre"
-msgstr "van deze genre"
+msgstr "van dit genre"
 
-#: src/search-tool/search-tool.cc:607
+#: src/search-tool-qt/search-model.h:47 src/search-tool/search-model.h:45
 msgid "on"
 msgstr "op"
 
-#: src/search-tool/search-tool.cc:607
+#: src/search-tool-qt/search-model.h:47 src/search-tool/search-model.h:45
 msgid "by"
 msgstr "volgens"
 
-#: src/search-tool/search-tool.cc:643
-msgid "_Create Playlist"
-msgstr "_Creëer Afspeellijst"
-
-#: src/search-tool/search-tool.cc:645
-msgid "_Add to Playlist"
-msgstr "Voeg toe _Aan Afspeellijst"
-
-#: src/search-tool/search-tool.cc:684
-msgid "Search library"
-msgstr "Zoek bibliotheek"
+#: src/search-tool-qt/search-tool-qt.cc:165 src/search-tool/search-tool.cc:74
+msgid "Number of results to show:"
+msgstr "Aantal te tonen resultaten:"
+
+#: src/search-tool-qt/search-tool-qt.cc:168 src/search-tool/search-tool.cc:77
+msgid "Rescan library at startup"
+msgstr "Bibliotheek opnieuw doorzoeken bij opstarten"
+
+#: src/search-tool-qt/search-tool-qt.cc:170
+msgid "Monitor library for changes"
+msgstr "Verzameling blijvend doorzoeken"
 
-#: src/search-tool/search-tool.cc:688
+#: src/search-tool-qt/search-tool-qt.cc:193 src/search-tool/search-tool.cc:450
 msgid ""
 "To import your music library into Audacious, choose a folder and then click "
 "the \"refresh\" icon."
 msgstr ""
+"Om je muziekbibliotheek in Audacious te importeren, kies je een map en klik "
+"je vervolgens op het pictogram ‘Vernieuwen’."
 
-#: src/search-tool/search-tool.cc:696
+#: src/search-tool-qt/search-tool-qt.cc:195 src/search-tool/search-tool.cc:459
 msgid "Please wait ..."
-msgstr "Aub wachten ..."
+msgstr "Even geduld…"
 
-#: src/search-tool/search-tool.cc:723
+#: src/search-tool-qt/search-tool-qt.cc:197 src/search-tool/search-tool.cc:487
 msgid "Choose Folder"
-msgstr "Kies Map"
+msgstr "Map kiezen"
+
+#: src/search-tool-qt/search-tool-qt.cc:201 src/search-tool/search-tool.cc:445
+msgid "Search library"
+msgstr "Bibliotheek doorzoeken"
+
+#: src/search-tool-qt/search-tool-qt.cc:327 src/search-tool/search-tool.cc:156
+#, c-format
+msgid "%d of %d result shown"
+msgid_plural "%d of %d results shown"
+msgstr0 "%dvan%d getoond resultaat"
+msgstr1 "%dvan%d getoonde resultaten"
+
+#: src/search-tool-qt/search-tool-qt.cc:331 src/search-tool/search-tool.cc:160
+#, c-format
+msgid "%d result"
+msgid_plural "%d results"
+msgstr0 "%d resultaat"
+msgstr1 "%d resultaten"
+
+#: src/search-tool-qt/search-tool-qt.cc:501 src/search-tool/search-tool.cc:341
+msgid "_Create Playlist"
+msgstr "Afspeellijst _creëren"
+
+#: src/search-tool-qt/search-tool-qt.cc:503 src/search-tool/search-tool.cc:343
+msgid "_Add to Playlist"
+msgstr "Toevoegen _aan afspeellijst"
 
 #: src/sid/xmms-sid.cc:43
 msgid "SID Player"
-msgstr "SID Speler"
-
-#: src/sid/xs_config.cc:61
-msgid "Output"
-msgstr ""
+msgstr "SID-speler"
 
 #: src/sid/xs_config.cc:62
 msgid "Channels:"
@@ -2932,19 +3418,19 @@
 
 #: src/sid/xs_config.cc:68
 msgid "Emulation"
-msgstr ""
+msgstr "Emulatie"
 
 #: src/sid/xs_config.cc:69
 msgid "Emulate MOS 8580 (default: MOS 6581)"
-msgstr ""
+msgstr "MOS 8580 emuleren (standaard: MOS 6581)"
 
 #: src/sid/xs_config.cc:71
 msgid "Do not automatically select chip model"
-msgstr ""
+msgstr "Selecteer niet automatisch het chipmodel"
 
 #: src/sid/xs_config.cc:73
 msgid "Emulate filter"
-msgstr ""
+msgstr "Emulatiefilter"
 
 #: src/sid/xs_config.cc:75
 msgid "Clock speed:"
@@ -2952,789 +3438,738 @@
 
 #: src/sid/xs_config.cc:78
 msgid "Do not automatically select clock speed"
-msgstr ""
+msgstr "Selecteer niet automatisch de kloksnelheid"
 
 #: src/sid/xs_config.cc:80
 msgid "Playback time"
-msgstr ""
+msgstr "Afspeeltijd"
 
 #: src/sid/xs_config.cc:81
 msgid "Set maximum playback time:"
-msgstr ""
+msgstr "Stel de maximale afspeeltijd in:"
 
 #: src/sid/xs_config.cc:87
 msgid "Use only when song length is unknown"
-msgstr ""
+msgstr "Alleen gebruiken bij onbekende nummerduur"
 
 #: src/sid/xs_config.cc:90
 msgid "Set minimum playback time:"
-msgstr ""
+msgstr "Stel de minimale afspeeltijd in:"
 
 #: src/sid/xs_config.cc:96
 msgid "Subtunes"
-msgstr ""
+msgstr "Subtunes"
 
 #: src/sid/xs_config.cc:97
 msgid "Enable subtunes"
-msgstr ""
+msgstr "Subtunes inschakelen"
 
 #: src/sid/xs_config.cc:99
 msgid "Ignore subtunes shorter than:"
-msgstr ""
+msgstr "Negeer subtunes korter dan:"
 
 #: src/sid/xs_config.cc:105
 msgid "Note"
-msgstr ""
+msgstr "Opmerking"
 
 #: src/silence-removal/silence-removal.cc:39
 msgid "Silence Removal"
-msgstr ""
+msgstr "Stilteverwijdering"
 
 #: src/silence-removal/silence-removal.cc:58
 msgid ""
 "Silence Removal Plugin for Audacious\n"
 "Copyright 2014 John Lindgren"
 msgstr ""
+"Stilteverwijderingplug-in voor Audacious\n"
+"Copyright 2014 John Lindgren"
 
 #: src/silence-removal/silence-removal.cc:67
 msgid "Silence Removal"
-msgstr ""
+msgstr "Stilteverwijdering"
 
 #: src/silence-removal/silence-removal.cc:68
 msgid "Threshold:"
-msgstr ""
+msgstr "Drempel:"
 
-#: src/silence-removal/silence-removal.cc:70
-msgid "dB"
-msgstr "dB"
+#: src/skins/actions.cc:45 src/skins-qt/actions.cc:43
+msgid "Repeat points cleared."
+msgstr "Herhaalpunten gewist."
 
-#: src/skins/menus.cc:64
-msgid "Open Files ..."
-msgstr "Open Bestanden ..."
+#: src/skins/actions.cc:60 src/skins-qt/actions.cc:58
+msgid "Repeat point A set."
+msgstr "Herhaalpunt A ingesteld."
 
-#: src/skins/menus.cc:65
-msgid "Open URL ..."
-msgstr "Open URL ..."
+#: src/skins/actions.cc:65 src/skins-qt/actions.cc:63
+msgid "Repeat point B set."
+msgstr "Herhaalpunt B ingesteld."
 
-#: src/skins/menus.cc:66
-msgid "Search Library"
-msgstr "Doorzoek Bibliotheek"
+#: src/skins/equalizer.cc:223 src/skins-qt/equalizer.cc:223
+msgid "Preamp"
+msgstr "Voorversterker"
 
-#: src/skins/menus.cc:68
-msgid "Playback"
-msgstr ""
+#: src/skins/equalizer.cc:227 src/skins-qt/equalizer.cc:227
+msgid "31 Hz"
+msgstr "31 Hz"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "63 Hz"
+msgstr "63 Hz"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "125 Hz"
+msgstr "125 Hz"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "250 Hz"
+msgstr "250 Hz"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "500 Hz"
+msgstr "500 Hz"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "1 kHz"
+msgstr "1 kHz"
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "2 kHz"
+msgstr "2 kHz"
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "4 kHz"
+msgstr "4 kHz"
 
-#: src/skins/menus.cc:69
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "8 kHz"
+msgstr "8 kHz"
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "16 kHz"
+msgstr "16 kHz"
+
+#: src/skins/equalizer.cc:270 src/skins-qt/equalizer.cc:270
+msgid "Audacious Equalizer"
+msgstr "Audacious-equalizer"
+
+#: src/skins/main.cc:459 src/skins-qt/main.cc:442
+msgid "Recording on"
+msgstr "Opname aan"
+
+#: src/skins/main.cc:461 src/skins-qt/main.cc:444
+msgid "Recording off"
+msgstr "Opname uit"
+
+#: src/skins/main.cc:754 src/skins-qt/main.cc:701
+#, c-format
+msgid "Seek to %d:%-2.2d / %d:%-2.2d"
+msgstr "Spoelen naar %d:%-2.2d / %d:%-2.2d"
+
+#: src/skins/main.cc:771 src/skins-qt/main.cc:718
+#, c-format
+msgid "Volume: %d%%"
+msgstr "Volume: %d%%"
+
+#: src/skins/main.cc:784 src/skins-qt/main.cc:731
+#, c-format
+msgid "Balance: %d%% left"
+msgstr "Balans: %d%% links"
+
+#: src/skins/main.cc:786 src/skins-qt/main.cc:733
+msgid "Balance: center"
+msgstr "Balans: centrum"
+
+#: src/skins/main.cc:788 src/skins-qt/main.cc:735
+#, c-format
+msgid "Balance: %d%% right"
+msgstr "Balans: %d%% rechts"
+
+#: src/skins/main.cc:880 src/skins-qt/main.cc:827
+msgid "Options Menu"
+msgstr "Optiesmenu"
+
+#: src/skins/main.cc:884 src/skins-qt/main.cc:831
+msgid "Disable 'Always On Top'"
+msgstr "‘Altijd bovenaan’ uitschakelen"
+
+#: src/skins/main.cc:886 src/skins-qt/main.cc:833
+msgid "Enable 'Always On Top'"
+msgstr "‘Altijd bovenaan’ inschakelen"
+
+#: src/skins/main.cc:889 src/skins-qt/main.cc:836
+msgid "File Info Box"
+msgstr "Bestandsinformatieveld"
+
+#: src/skins/main.cc:892 src/skins/menus.cc:149 src/skins-qt/main.cc:839
+#: src/skins-qt/menus.cc:142
+msgid "Double Size"
+msgstr "Dubbele grootte"
+
+#: src/skins/main.cc:895 src/skins-qt/main.cc:842
+msgid "Visualizations"
+msgstr "Visualisaties"
+
+#: src/skins/menus.cc:74 src/skins-qt/menus.cc:64
+msgid "Volume Up"
+msgstr "Volume omhoog"
+
+#: src/skins/menus.cc:75 src/skins-qt/menus.cc:65
+msgid "Volume Down"
+msgstr "Volume omlaag"
+
+#: src/skins/menus.cc:77 src/skins-qt/menus.cc:67
+msgid "Effects ..."
+msgstr "Effecten…"
+
+#: src/skins/menus.cc:84 src/skins-qt/menus.cc:74
+msgid "Open Files ..."
+msgstr "Bestanden openen…"
+
+#: src/skins/menus.cc:85 src/skins-qt/menus.cc:76
+msgid "Open URL ..."
+msgstr "URL openen…"
+
+#: src/skins/menus.cc:89 src/skins-qt/menus.cc:80
 msgid "Playlist"
-msgstr "Speellijst"
+msgstr "Afspeellijst"
+
+#: src/skins/menus.cc:90 src/skins-qt/menus.cc:81
+msgid "Output"
+msgstr "Uitvoer"
 
-#: src/skins/menus.cc:70
+#: src/skins/menus.cc:91 src/skins-qt/menus.cc:82
 msgid "View"
-msgstr ""
+msgstr "Tonen"
 
-#: src/skins/menus.cc:72 src/skins/menus.cc:136 src/skins/menus.cc:149
-#: src/skins/menus.cc:214
+#: src/skins/menus.cc:93 src/skins/menus.cc:161 src/skins/menus.cc:174
+#: src/skins/menus.cc:245 src/skins-qt/menus.cc:84 src/skins-qt/menus.cc:156
+#: src/skins-qt/menus.cc:170 src/skins-qt/menus.cc:241
 msgid "Services"
-msgstr ""
+msgstr "Diensten"
 
-#: src/skins/menus.cc:74
+#: src/skins/menus.cc:95 src/skins-qt/menus.cc:86
 msgid "About ..."
-msgstr "Over ..."
+msgstr "Over…"
 
-#: src/skins/menus.cc:75
+#: src/skins/menus.cc:96 src/skins-qt/menus.cc:87
 msgid "Settings ..."
-msgstr "Instellingen ..."
+msgstr "Instellingen…"
 
-#: src/skins/menus.cc:76
+#: src/skins/menus.cc:97 src/skins-qt/menus.cc:88
 msgid "Quit"
-msgstr ""
+msgstr "Afsluiten"
 
-#: src/skins/menus.cc:80 src/skins/menus.cc:206
+#: src/skins/menus.cc:101 src/skins/menus.cc:235 src/skins-qt/menus.cc:92
+#: src/skins-qt/menus.cc:231
 msgid "Song Info ..."
-msgstr ""
+msgstr "Nummerinformatie…"
 
-#: src/skins/menus.cc:84
-msgid "No Playlist Advance"
-msgstr ""
+#: src/skins/menus.cc:105 src/skins-qt/menus.cc:96
+msgid "Shuffle by Album"
+msgstr "Willekeurige albums"
 
-#: src/skins/menus.cc:85
-msgid "Stop After This Song"
-msgstr "Stop Na Dit Liedje"
+#: src/skins/menus.cc:106 src/skins-qt/menus.cc:97
+msgid "No Playlist Advance"
+msgstr "Geen vooruitgang afspeellijst"
 
-#: src/skins/menus.cc:93
+#: src/skins/menus.cc:117 src/skins-qt/menus.cc:108
 msgid "Set A-B Repeat"
-msgstr "Set A-B Herhaling"
+msgstr "A-B-herhaling instellen"
 
-#: src/skins/menus.cc:94
+#: src/skins/menus.cc:118 src/skins-qt/menus.cc:109
 msgid "Clear A-B Repeat"
-msgstr "Wis A-B Herhaling"
+msgstr "A-B-herhaling wissen"
 
-#: src/skins/menus.cc:96
+#: src/skins/menus.cc:120 src/skins-qt/menus.cc:111
 msgid "Jump to Song ..."
-msgstr "Spring naar Liedje ..."
+msgstr "Spoelen naar nummer…"
 
-#: src/skins/menus.cc:97
+#: src/skins/menus.cc:121 src/skins-qt/menus.cc:113
 msgid "Jump to Time ..."
-msgstr "Spring naar Tijd ..."
+msgstr "Spoelen naar tijd…"
 
-#: src/skins/menus.cc:101
+#: src/skins/menus.cc:125 src/skins-qt/menus.cc:118
 msgid "Play/Resume"
-msgstr ""
+msgstr "Afspelen/Hervatten"
 
-#: src/skins/menus.cc:103
+#: src/skins/menus.cc:127 src/skins-qt/menus.cc:120
 msgid "New Playlist"
 msgstr "Nieuwe afspeellijst"
 
-#: src/skins/menus.cc:104
+#: src/skins/menus.cc:128 src/skins-qt/menus.cc:121
 msgid "Rename Playlist ..."
-msgstr "Hernoem Afspeellijst ..."
+msgstr "Afspeellijstnaam wijzigen…"
 
-#: src/skins/menus.cc:105
+#: src/skins/menus.cc:129 src/skins-qt/menus.cc:122
 msgid "Remove Playlist"
-msgstr "Verwijder Afspeellijst"
+msgstr "Afspeellijst verwijderen"
 
-#: src/skins/menus.cc:107
+#: src/skins/menus.cc:131 src/skins-qt/menus.cc:124
 msgid "Previous Playlist"
-msgstr "Vorige Afspeellijst"
+msgstr "Vorige afspeellijst"
 
-#: src/skins/menus.cc:108
+#: src/skins/menus.cc:132 src/skins-qt/menus.cc:125
 msgid "Next Playlist"
-msgstr "Volgende Afspeellijst"
+msgstr "Volgende afspeellijst"
 
-#: src/skins/menus.cc:110
+#: src/skins/menus.cc:134 src/skins-qt/menus.cc:127
 msgid "Import Playlist ..."
-msgstr "Importeer Afspeellijst ..."
+msgstr "Afspeellijst importeren…"
 
-#: src/skins/menus.cc:111
+#: src/skins/menus.cc:135 src/skins-qt/menus.cc:128
 msgid "Export Playlist ..."
-msgstr "Exporteer Afspeellijst ..."
+msgstr "Afspeellijst exporteren…"
 
-#: src/skins/menus.cc:113
+#: src/skins/menus.cc:137 src/skins-qt/menus.cc:130
 msgid "Playlist Manager ..."
-msgstr ""
+msgstr "Afspeellijstbeheer…"
 
-#: src/skins/menus.cc:114
+#: src/skins/menus.cc:138 src/skins-qt/menus.cc:131
 msgid "Queue Manager ..."
-msgstr ""
+msgstr "Wachtrijbeheer…"
 
-#: src/skins/menus.cc:116
+#: src/skins/menus.cc:140 src/skins-qt/menus.cc:133
 msgid "Refresh Playlist"
-msgstr ""
+msgstr "Afspeellijst vernieuwen"
 
-#: src/skins/menus.cc:120
+#: src/skins/menus.cc:144 src/skins-qt/menus.cc:137
 msgid "Show Playlist Editor"
-msgstr ""
+msgstr "Afspeellijstbewerker tonen"
 
-#: src/skins/menus.cc:121
+#: src/skins/menus.cc:145 src/skins-qt/menus.cc:138
 msgid "Show Equalizer"
-msgstr "Toon Equalizer"
+msgstr "Equalizer tonen"
 
-#: src/skins/menus.cc:123
+#: src/skins/menus.cc:147 src/skins-qt/menus.cc:140
 msgid "Show Remaining Time"
-msgstr ""
+msgstr "Resterende tijd tonen"
 
-#: src/skins/menus.cc:125
+#: src/skins/menus.cc:150 src/skins-qt/menus.cc:143
 msgid "Always on Top"
 msgstr "Altijd bovenaan"
 
-#: src/skins/menus.cc:126
+#: src/skins/menus.cc:151 src/skins-qt/menus.cc:145
 msgid "On All Workspaces"
-msgstr ""
+msgstr "Op alle werkbladen"
 
-#: src/skins/menus.cc:128
+#: src/skins/menus.cc:153 src/skins-qt/menus.cc:148
 msgid "Roll Up Player"
-msgstr ""
+msgstr "Speler oprollen"
 
-#: src/skins/menus.cc:129
+#: src/skins/menus.cc:154 src/skins-qt/menus.cc:149
 msgid "Roll Up Playlist Editor"
-msgstr ""
+msgstr "Afspeellijstbewerker oprollen"
 
-#: src/skins/menus.cc:130
+#: src/skins/menus.cc:155 src/skins-qt/menus.cc:150
 msgid "Roll Up Equalizer"
-msgstr ""
+msgstr "Equalizer oprollen"
 
-#: src/skins/menus.cc:132 src/skins/ui_main.cc:854
-msgid "Double Size"
-msgstr "Dubbele Grootte"
-
-#: src/skins/menus.cc:138
+#: src/skins/menus.cc:163 src/skins-qt/menus.cc:158
 msgid "Add URL ..."
-msgstr "URL Toevoegen ..."
+msgstr "URL toevoegen…"
 
-#: src/skins/menus.cc:139
+#: src/skins/menus.cc:164 src/skins-qt/menus.cc:160
 msgid "Add Files ..."
-msgstr "Bestanden Toevoegen ..."
+msgstr "Bestanden toevoegen…"
 
-#: src/skins/menus.cc:143 src/skins/menus.cc:171 src/skins/menus.cc:185
+#: src/skins/menus.cc:168 src/skins/menus.cc:196 src/skins/menus.cc:212
+#: src/skins-qt/menus.cc:164 src/skins-qt/menus.cc:192
+#: src/skins-qt/menus.cc:208
 msgid "By Title"
-msgstr "Volgens titel"
+msgstr "Op titel"
 
-#: src/skins/menus.cc:144 src/skins/menus.cc:178 src/skins/menus.cc:192
+#: src/skins/menus.cc:169 src/skins/menus.cc:203 src/skins/menus.cc:219
+#: src/skins-qt/menus.cc:165 src/skins-qt/menus.cc:199
+#: src/skins-qt/menus.cc:215
 msgid "By File Name"
-msgstr "Volgens Bestandsnaam"
+msgstr "Op bestandsnaam"
 
-#: src/skins/menus.cc:145 src/skins/menus.cc:179 src/skins/menus.cc:193
+#: src/skins/menus.cc:170 src/skins/menus.cc:204 src/skins/menus.cc:220
+#: src/skins-qt/menus.cc:166 src/skins-qt/menus.cc:200
+#: src/skins-qt/menus.cc:216
 msgid "By File Path"
-msgstr "Volgens Bestandspad"
+msgstr "Op bestandspad"
 
-#: src/skins/menus.cc:151
+#: src/skins/menus.cc:176 src/skins-qt/menus.cc:172
 msgid "Remove All"
-msgstr "Verwijder Alles"
+msgstr "Alles verwijderen"
 
-#: src/skins/menus.cc:152
+#: src/skins/menus.cc:177 src/skins-qt/menus.cc:173
 msgid "Clear Queue"
 msgstr "Wachtrij leegmaken"
 
-#: src/skins/menus.cc:154
+#: src/skins/menus.cc:179 src/skins-qt/menus.cc:175
 msgid "Remove Unavailable Files"
-msgstr "Verwijder onbeschikbare bestanden"
+msgstr "Niet-beschikbare bestanden verwijderen"
 
-#: src/skins/menus.cc:155
+#: src/skins/menus.cc:180 src/skins-qt/menus.cc:176
 msgid "Remove Duplicates"
-msgstr "Verwijder duplicaten"
+msgstr "Duplicaten verwijderen"
 
-#: src/skins/menus.cc:157
+#: src/skins/menus.cc:182 src/skins-qt/menus.cc:178
 msgid "Remove Unselected"
-msgstr "Verwijder niet geselecteerde"
+msgstr "Niet-geselecteerde verwijderen"
 
-#: src/skins/menus.cc:158
+#: src/skins/menus.cc:183 src/skins-qt/menus.cc:179
 msgid "Remove Selected"
-msgstr "Verwijder geselecteerde"
+msgstr "Selectie verwijderen"
 
-#: src/skins/menus.cc:162
+#: src/skins/menus.cc:187 src/skins-qt/menus.cc:183
 msgid "Search and Select"
-msgstr "Zoek en selecteer"
+msgstr "Zoeken-en-selecteren"
 
-#: src/skins/menus.cc:164
+#: src/skins/menus.cc:189 src/skins-qt/menus.cc:185
 msgid "Invert Selection"
 msgstr "Selectie omkeren"
 
-#: src/skins/menus.cc:165
+#: src/skins/menus.cc:190 src/skins-qt/menus.cc:186
 msgid "Select None"
-msgstr "Selecteer geen enkele"
+msgstr "Niks selecteren"
 
-#: src/skins/menus.cc:166
+#: src/skins/menus.cc:191 src/skins-qt/menus.cc:187
 msgid "Select All"
-msgstr "Selecteer alles"
+msgstr "Alles selecteren"
 
-#: src/skins/menus.cc:170 src/skins/menus.cc:184
+#: src/skins/menus.cc:195 src/skins/menus.cc:211 src/skins-qt/menus.cc:191
+#: src/skins-qt/menus.cc:207
 msgid "By Track Number"
-msgstr "Volgens nummer"
+msgstr "Op nummer"
 
-#: src/skins/menus.cc:172 src/skins/menus.cc:186
+#: src/skins/menus.cc:197 src/skins/menus.cc:213 src/skins-qt/menus.cc:193
+#: src/skins-qt/menus.cc:209
 msgid "By Artist"
-msgstr "Volgens artiest"
+msgstr "Op artiest"
 
-#: src/skins/menus.cc:173 src/skins/menus.cc:187
+#: src/skins/menus.cc:198 src/skins/menus.cc:214 src/skins-qt/menus.cc:194
+#: src/skins-qt/menus.cc:210
 msgid "By Album"
-msgstr "Volgens album"
+msgstr "Op album"
 
-#: src/skins/menus.cc:174 src/skins/menus.cc:188
+#: src/skins/menus.cc:199 src/skins/menus.cc:215 src/skins-qt/menus.cc:195
+#: src/skins-qt/menus.cc:211
 msgid "By Album Artist"
-msgstr "Volgens Album Artiest"
+msgstr "Op albumartiest"
 
-#: src/skins/menus.cc:175 src/skins/menus.cc:190
+#: src/skins/menus.cc:200 src/skins/menus.cc:216 src/skins-qt/menus.cc:196
+#: src/skins-qt/menus.cc:212
 msgid "By Release Date"
-msgstr "Volgens Uitgave Datum"
+msgstr "Op uitgavedatum"
 
-#: src/skins/menus.cc:176 src/skins/menus.cc:189
+#: src/skins/menus.cc:201 src/skins/menus.cc:217 src/skins-qt/menus.cc:197
+#: src/skins-qt/menus.cc:213
 msgid "By Genre"
-msgstr "Volgens Genre"
+msgstr "Op genre"
 
-#: src/skins/menus.cc:177 src/skins/menus.cc:191
+#: src/skins/menus.cc:202 src/skins/menus.cc:218 src/skins-qt/menus.cc:198
+#: src/skins-qt/menus.cc:214
 msgid "By Length"
-msgstr "Volgens Lengte"
+msgstr "Op duur"
 
-#: src/skins/menus.cc:180 src/skins/menus.cc:194
+#: src/skins/menus.cc:205 src/skins/menus.cc:221 src/skins-qt/menus.cc:201
+#: src/skins-qt/menus.cc:217
 msgid "By Custom Title"
-msgstr "Volgens Aangepaste Titel"
+msgstr "Op aangepaste titel"
+
+#: src/skins/menus.cc:206 src/skins/menus.cc:222 src/skins-qt/menus.cc:202
+#: src/skins-qt/menus.cc:218
+msgid "By Comment"
+msgstr "Op commentaar"
+
+#: src/skins/menus.cc:207 src/skins/menus.cc:223 src/skins-qt/menus.cc:203
+#: src/skins-qt/menus.cc:219
+msgid "By Disc Number"
+msgstr ""
 
-#: src/skins/menus.cc:198
+#: src/skins/menus.cc:227 src/skins-qt/menus.cc:223
 msgid "Randomize List"
-msgstr "Herschik lijst in willekeurige volgorde"
+msgstr "Lijst in willekeurige volgorde"
 
-#: src/skins/menus.cc:199
+#: src/skins/menus.cc:228 src/skins-qt/menus.cc:224
 msgid "Reverse List"
 msgstr "Lijst omkeren"
 
-#: src/skins/menus.cc:201
+#: src/skins/menus.cc:230 src/skins-qt/menus.cc:226
 msgid "Sort Selected"
-msgstr "Sorteer het geselecteerde"
+msgstr "Selectie sorteren"
 
-#: src/skins/menus.cc:202
+#: src/skins/menus.cc:231 src/skins-qt/menus.cc:227
 msgid "Sort List"
-msgstr "Sorteer lijst"
+msgstr "Lijst sorteren"
 
-#: src/skins/menus.cc:208
+#: src/skins/menus.cc:236 src/skins-qt/menus.cc:232
+msgid "Open Containing Folder"
+msgstr "Bijbehorende map openen"
+
+#: src/skins/menus.cc:238 src/skins-qt/menus.cc:234
 msgid "Cut"
-msgstr "Knip"
+msgstr "Knippen"
 
-#: src/skins/menus.cc:209
+#: src/skins/menus.cc:239 src/skins-qt/menus.cc:235
 msgid "Copy"
-msgstr "Kopieer"
+msgstr "Kopiëren"
 
-#: src/skins/menus.cc:210
+#: src/skins/menus.cc:240 src/skins-qt/menus.cc:236
 msgid "Paste"
-msgstr "Plak"
+msgstr "Plakken"
 
-#: src/skins/menus.cc:212
-msgid "Queue/Unqueue"
-msgstr "Queue/Unqueue"
+#: src/skins/menus.cc:241 src/skins-qt/menus.cc:237
+msgid "Paste at End"
+msgstr "Plakken aan het einde"
 
-#: src/skins/menus.cc:218
-msgid "Load Preset ..."
-msgstr "Laad Presets ..."
+#: src/skins/menus.cc:243 src/skins-qt/menus.cc:239
+msgid "Queue/Unqueue"
+msgstr "In/Uit wachtrij"
 
-#: src/skins/menus.cc:219
-msgid "Load Auto Preset ..."
-msgstr "Laad Auto Preset ..."
+#: src/skins/playlist-widget.cc:58 src/skins-qt/playlist-widget.cc:58
+#, c-format
+msgid "%s (%d of %d)"
+msgstr "%s (%d van %d)"
 
-#: src/skins/menus.cc:220
-msgid "Load Default"
-msgstr "Laad Standaard"
+#: src/skins/playlistwin.cc:491 src/skins-qt/playlistwin.cc:478
+msgid "Audacious Playlist Editor"
+msgstr "Audacious-afspeellijstbewerker"
 
-#: src/skins/menus.cc:221
-msgid "Load Preset File ..."
-msgstr "Laad Presets Bestand"
+#: src/skins/plugin.cc:53 src/skins-qt/plugin.cc:65
+msgid "Winamp Classic Interface"
+msgstr "Winamp klassiek uiterlijk"
 
-#: src/skins/menus.cc:222
-msgid "Load EQF File ..."
-msgstr "Laad EQF Bestand"
+#: src/skins-qt/menus.cc:75
+msgid "Open Folder ..."
+msgstr "Map openen…"
 
-#: src/skins/menus.cc:224
-msgid "Save Preset ..."
-msgstr "Bewaar Presets ..."
+#: src/skins-qt/menus.cc:159
+msgid "Add Folder ..."
+msgstr "Map toevoegen…"
 
-#: src/skins/menus.cc:225
-msgid "Save Auto Preset ..."
-msgstr "Bewaar Auto Preset ..."
+#: src/skins-qt/search-select.cc:62 src/skins/search-select.cc:77
+msgid "Search entries in active playlist"
+msgstr "Items doorzoeken in actieve afspeellijst"
 
-#: src/skins/menus.cc:226
-msgid "Save Default"
-msgstr "Bewaar Standaard"
+#: src/skins-qt/search-select.cc:70 src/skins/search-select.cc:83
+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 ""
+"Selecteer de items in de afspeellijst door één of meerdere velden in te "
+"vullen. Deze velden maken gebruik van een regelmatige expressie-syntax, die "
+"niet hoofdlettergevoelig zijn. Als je niet weet hoe reguliere expressies "
+"werken, voer dan gewoon een letterlijk gedeelte in van wat je zoekt."
 
-#: src/skins/menus.cc:227
-msgid "Save Preset File ..."
-msgstr "Bewaar Presets Bestand ..."
+#: src/skins-qt/search-select.cc:75 src/skins/search-select.cc:91
+msgid "Title:"
+msgstr "Titel:"
 
-#: src/skins/menus.cc:228
-msgid "Save EQF File ..."
-msgstr "Bewaar EQF Bestand ..."
+#: src/skins-qt/search-select.cc:79 src/skins/search-select.cc:96
+msgid "Album:"
+msgstr "Album:"
 
-#: src/skins/menus.cc:230
-msgid "Delete Preset ..."
-msgstr "Verwijder Preset ..."
+#: src/skins-qt/search-select.cc:82 src/skins/search-select.cc:101
+msgid "Artist:"
+msgstr "Artiest:"
 
-#: src/skins/menus.cc:231
-msgid "Delete Auto Preset ..."
-msgstr "Verwijder Auto Preset ..."
+#: src/skins-qt/search-select.cc:85 src/skins/search-select.cc:106
+msgid "File Name:"
+msgstr "Bestandsnaam:"
 
-#: src/skins/menus.cc:233
-msgid "Import Winamp Presets ..."
-msgstr "Importeer Winaps Presets ..."
+#: src/skins-qt/search-select.cc:88 src/skins/search-select.cc:134
+msgid "Clear previous selection before searching"
+msgstr "Vorige selectie wissen voordat zoekopdracht start"
 
-#: src/skins/menus.cc:235
-msgid "Reset to Zero"
-msgstr "Terug naar Nul"
+#: src/skins-qt/search-select.cc:89 src/skins/search-select.cc:137
+msgid "Automatically toggle queue for matching entries"
+msgstr "Wachtrij automatisch omschakelen voor overeenkomende items"
 
-#: src/skins/plugin.cc:48
-msgid "Winamp Classic Interface"
-msgstr "Winamp Klassieke Interface"
+#: src/skins-qt/search-select.cc:90 src/skins/search-select.cc:140
+msgid "Create a new playlist with matching entries"
+msgstr "Nieuwe afspeellijst creëren met overeenkomende items"
 
-#: src/skins/preset-browser.cc:57 src/skins/preset-list.cc:371
-#: src/skins/preset-list.cc:386
-msgid "Save"
-msgstr "Opslaan"
-
-#: src/skins/preset-browser.cc:57 src/skins/preset-list.cc:338
-#: src/skins/preset-list.cc:354
-msgid "Load"
-msgstr "Laad"
-
-#: src/skins/preset-browser.cc:83
-msgid "Load Preset File"
-msgstr "Laad Presets Bestand"
-
-#: src/skins/preset-browser.cc:100
-msgid "Load EQF File"
-msgstr "Laad EQF Bestand"
-
-#: src/skins/preset-browser.cc:119
-msgid "Save Preset File"
-msgstr "Bewaar Presets Bestand"
-
-#: src/skins/preset-browser.cc:137
-msgid "Save EQF File"
-msgstr "Bewaar EQF Bestand"
-
-#: src/skins/preset-browser.cc:151
-msgid "Import Winamp Presets"
-msgstr "Importeer Winamp Instellingen"
-
-#: src/skins/preset-list.cc:285
-msgid "Presets"
-msgstr "Presets"
-
-#: src/skins/preset-list.cc:335
-msgid "Load preset"
-msgstr "Laad Presets"
-
-#: src/skins/preset-list.cc:351
-msgid "Load auto-preset"
-msgstr "Laad auto-preset"
-
-#: src/skins/preset-list.cc:367
-msgid "Save preset"
-msgstr "Bewaar Presets"
-
-#: src/skins/preset-list.cc:382
-msgid "Save auto-preset"
-msgstr "Bewaar auto-preset"
-
-#: src/skins/preset-list.cc:408
-msgid "Delete preset"
-msgstr "Verwijder preset"
-
-#: src/skins/preset-list.cc:424
-msgid "Delete auto-preset"
-msgstr "Verwijder auto-preset"
+#: src/skins-qt/search-select.cc:101 src/skins/search-select.cc:78
+msgid "Search"
+msgstr "Zoeken"
 
-#: src/skins/skins_cfg.cc:176
+#: src/skins-qt/skins_cfg.cc:198 src/skins/skins_cfg.cc:182
 msgid "Player:"
 msgstr "Speler:"
 
-#: src/skins/skins_cfg.cc:178
+#: src/skins-qt/skins_cfg.cc:200 src/skins/skins_cfg.cc:184
 msgid "Select main player window font:"
-msgstr ""
+msgstr "Selecteer het hoofdvensterlettertype:"
 
-#: src/skins/skins_cfg.cc:179
+#: src/skins-qt/skins_cfg.cc:201 src/skins/skins_cfg.cc:185
 msgid "Playlist:"
 msgstr "Afspeellijst:"
 
-#: src/skins/skins_cfg.cc:181
+#: src/skins-qt/skins_cfg.cc:203 src/skins/skins_cfg.cc:187
 msgid "Select playlist font:"
-msgstr "Selecteer lettertype van de speellijst:"
+msgstr "Selecteer het afspeellijstlettertype:"
 
-#: src/skins/skins_cfg.cc:187
+#: src/skins-qt/skins_cfg.cc:207 src/skins/skins_cfg.cc:191
 msgid "Skin"
-msgstr ""
+msgstr "Thema"
+
+#: src/skins-qt/skins_cfg.cc:211 src/skins/skins_cfg.cc:193
+msgid "Display active titlebar when any window is focused"
+msgstr "Actieve titelbalk tonen na focussen van eender welk venster"
 
-#: src/skins/skins_cfg.cc:189
+#: src/skins-qt/skins_cfg.cc:213 src/skins/skins_cfg.cc:195
 msgid "Fonts"
-msgstr "Lettertypes"
+msgstr "Lettertypen"
 
-#: src/skins/skins_cfg.cc:192
+#: src/skins-qt/skins_cfg.cc:215 src/skins/skins_cfg.cc:197
 msgid "Use bitmap fonts (supports ASCII only)"
-msgstr "Gebruik bitmap lettertypen (ondersteunt alleen ASCII)"
+msgstr "Bitmap-lettertypen gebruiken (ondersteunt alleen ASCII)"
 
-#: src/skins/skins_cfg.cc:194
+#: src/skins-qt/skins_cfg.cc:217 src/skins/skins_cfg.cc:199
 msgid "Scroll song title"
-msgstr "Scrol titel "
+msgstr "Titel scrollen"
 
-#: src/skins/skins_cfg.cc:196
+#: src/skins-qt/skins_cfg.cc:219 src/skins/skins_cfg.cc:201
 msgid "Scroll song title in both directions"
-msgstr "Scrol titel in beide kanten"
+msgstr "Titel in beide richtingen scrollen"
 
-#: src/skins/skins_cfg.cc:201
+#: src/skins-qt/skins_cfg.cc:224 src/skins/skins_cfg.cc:206
 msgid "Analyzer"
-msgstr "Analyseerder"
+msgstr "Analyse"
 
-#: src/skins/skins_cfg.cc:202
+#: src/skins-qt/skins_cfg.cc:225 src/skins/skins_cfg.cc:207
 msgid "Scope"
-msgstr "Scope"
+msgstr "Omvang"
 
-#: src/skins/skins_cfg.cc:203
+#: src/skins-qt/skins_cfg.cc:226 src/skins/skins_cfg.cc:208
 msgid "Voiceprint / VU meter"
-msgstr ""
+msgstr "Stemafdruk / VU-meter"
 
-#: src/skins/skins_cfg.cc:204
+#: src/skins-qt/skins_cfg.cc:227 src/skins/skins_cfg.cc:209
 msgid "Off"
 msgstr "Uit"
 
-#: src/skins/skins_cfg.cc:208 src/skins/skins_cfg.cc:233
-#: src/skins/skins_cfg.cc:239
+#: src/skins-qt/skins_cfg.cc:231 src/skins-qt/skins_cfg.cc:256
+#: src/skins-qt/skins_cfg.cc:262 src/skins/skins_cfg.cc:213
+#: src/skins/skins_cfg.cc:238 src/skins/skins_cfg.cc:244
 msgid "Normal"
 msgstr "Normaal"
 
-#: src/skins/skins_cfg.cc:209 src/skins/skins_cfg.cc:234
+#: src/skins-qt/skins_cfg.cc:232 src/skins-qt/skins_cfg.cc:257
+#: src/skins/skins_cfg.cc:214 src/skins/skins_cfg.cc:239
 msgid "Fire"
 msgstr "Vuur"
 
-#: src/skins/skins_cfg.cc:210
+#: src/skins-qt/skins_cfg.cc:233 src/skins/skins_cfg.cc:215
 msgid "Vertical lines"
-msgstr "Verticale Strepen"
+msgstr "Verticale strepen"
 
-#: src/skins/skins_cfg.cc:214
+#: src/skins-qt/skins_cfg.cc:237 src/skins/skins_cfg.cc:219
 msgid "Lines"
-msgstr "Lijnen"
+msgstr "Strepen"
 
-#: src/skins/skins_cfg.cc:215
+#: src/skins-qt/skins_cfg.cc:238 src/skins/skins_cfg.cc:220
 msgid "Bars"
-msgstr "Horizontale Strepen"
+msgstr "Horizontale strepen"
 
-#: src/skins/skins_cfg.cc:219
+#: src/skins-qt/skins_cfg.cc:242 src/skins/skins_cfg.cc:224
 msgid "Slowest"
 msgstr "Traagst"
 
-#: src/skins/skins_cfg.cc:220
+#: src/skins-qt/skins_cfg.cc:243 src/skins/skins_cfg.cc:225
 msgid "Slow"
 msgstr "Traag"
 
-#: src/skins/skins_cfg.cc:221 src/sox-resampler/sox-resampler.cc:152
+#: src/skins-qt/skins_cfg.cc:244 src/skins/skins_cfg.cc:226
+#: src/soxr/sox-resampler.cc:180
 msgid "Medium"
 msgstr "Matig"
 
-#: src/skins/skins_cfg.cc:222
+#: src/skins-qt/skins_cfg.cc:245 src/skins/skins_cfg.cc:227
 msgid "Fast"
 msgstr "Snel"
 
-#: src/skins/skins_cfg.cc:223
+#: src/skins-qt/skins_cfg.cc:246 src/skins/skins_cfg.cc:228
 msgid "Fastest"
 msgstr "Snelst"
 
-#: src/skins/skins_cfg.cc:227
+#: src/skins-qt/skins_cfg.cc:250 src/skins/skins_cfg.cc:232
 msgid "Dots"
 msgstr "Punten"
 
-#: src/skins/skins_cfg.cc:228
+#: src/skins-qt/skins_cfg.cc:251 src/skins/skins_cfg.cc:233
 msgid "Line"
-msgstr "Lijn"
+msgstr "Streep"
 
-#: src/skins/skins_cfg.cc:229
+#: src/skins-qt/skins_cfg.cc:252 src/skins/skins_cfg.cc:234
 msgid "Solid"
 msgstr "Solide"
 
-#: src/skins/skins_cfg.cc:235
+#: src/skins-qt/skins_cfg.cc:258 src/skins/skins_cfg.cc:240
 msgid "Ice"
 msgstr "IJs"
 
-#: src/skins/skins_cfg.cc:240
+#: src/skins-qt/skins_cfg.cc:263 src/skins/skins_cfg.cc:245
 msgid "Smooth"
 msgstr "Glad"
 
-#: src/skins/skins_cfg.cc:244
-msgid "Type"
-msgstr "Type"
-
-#: src/skins/skins_cfg.cc:245
-msgid "Visualization type:"
-msgstr "Visualisatie type:"
-
-#: src/skins/skins_cfg.cc:248
-msgid "Analyzer"
-msgstr "Analyseerder"
-
-#: src/skins/skins_cfg.cc:249
-msgid "Show peaks"
-msgstr "Laat pieken zien"
-
-#: src/skins/skins_cfg.cc:251
+#: src/skins-qt/skins_cfg.cc:267 src/skins/skins_cfg.cc:249
 msgid "Coloring:"
-msgstr ""
+msgstr "Verkleuring:"
 
-#: src/skins/skins_cfg.cc:254
+#: src/skins-qt/skins_cfg.cc:270 src/skins/skins_cfg.cc:252
 msgid "Style:"
 msgstr "Stijl:"
 
-#: src/skins/skins_cfg.cc:257
+#: src/skins-qt/skins_cfg.cc:273 src/skins/skins_cfg.cc:255
 msgid "Falloff:"
-msgstr ""
+msgstr "Uitvallen:"
 
-#: src/skins/skins_cfg.cc:260
+#: src/skins-qt/skins_cfg.cc:276 src/skins/skins_cfg.cc:258
 msgid "Peak falloff:"
-msgstr ""
+msgstr "Hoogtepunt afzwakken:"
 
-#: src/skins/skins_cfg.cc:264
+#: src/skins-qt/skins_cfg.cc:282 src/skins/skins_cfg.cc:264
 msgid "Scope Style:"
-msgstr "Scope Stijl:"
+msgstr "Omvangstijl:"
 
-#: src/skins/skins_cfg.cc:267
+#: src/skins-qt/skins_cfg.cc:285 src/skins/skins_cfg.cc:267
 msgid "Voiceprint Coloring:"
-msgstr ""
+msgstr "Stemafdrukverkleuring:"
 
-#: src/skins/skins_cfg.cc:270
+#: src/skins-qt/skins_cfg.cc:288 src/skins/skins_cfg.cc:270
 msgid "VU Meter Style:"
-msgstr "VU Meter Stijl:"
+msgstr "VU-meterstijl:"
 
-#: src/skins/skins_cfg.cc:276
-msgid "General"
-msgstr "Algemeen"
-
-#: src/skins/skins_cfg.cc:277
-msgid "Visualization"
-msgstr "Visualisatie "
-
-#: src/skins/ui_equalizer.cc:282
-msgid "Preamp"
-msgstr "Voorversterker"
-
-#: src/skins/ui_equalizer.cc:286
-msgid "31 Hz"
-msgstr "31 Hz"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "63 Hz"
-msgstr "63 Hz"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "125 Hz"
-msgstr "125 Hz"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "250 Hz"
-msgstr "250 Hz"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "500 Hz"
-msgstr "500 Hz"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "1 kHz"
-msgstr "1 kHz"
-
-#: src/skins/ui_equalizer.cc:288
-msgid "2 kHz"
-msgstr "2 kHz"
-
-#: src/skins/ui_equalizer.cc:288
-msgid "4 kHz"
-msgstr "4 kHz"
-
-#: src/skins/ui_equalizer.cc:288
-msgid "8 kHz"
-msgstr "8 kHz"
-
-#: src/skins/ui_equalizer.cc:288
-msgid "16 kHz"
-msgstr "16 kHz"
-
-#: src/skins/ui_equalizer.cc:330
-msgid "Audacious Equalizer"
-msgstr "Audacious Equalizer"
-
-#: src/skins/ui_main.cc:688
-#, c-format
-msgid "Seek to %d:%-2.2d / %d:%-2.2d"
-msgstr ""
-
-#: src/skins/ui_main.cc:709
-#, c-format
-msgid "Volume: %d%%"
-msgstr "Volume: %d%%"
-
-#: src/skins/ui_main.cc:732
-#, c-format
-msgid "Balance: %d%% left"
-msgstr "Balans: %d%% links"
-
-#: src/skins/ui_main.cc:734
-msgid "Balance: center"
-msgstr "Balans: gecentreerd"
-
-#: src/skins/ui_main.cc:736
-#, c-format
-msgid "Balance: %d%% right"
-msgstr "Balans: %d%% rechts"
-
-#: src/skins/ui_main.cc:842
-msgid "Options Menu"
-msgstr "Opties menu"
+#: src/skins-qt/skins_cfg.cc:294 src/skins/skins_cfg.cc:276
+msgid "Type"
+msgstr "Type"
 
-#: src/skins/ui_main.cc:846
-msgid "Disable 'Always On Top'"
-msgstr "'Altijd bovenaan' uitschakelen"
+#: src/skins-qt/skins_cfg.cc:295 src/skins/skins_cfg.cc:277
+msgid "Visualization type:"
+msgstr "Visualisatietype:"
 
-#: src/skins/ui_main.cc:848
-msgid "Enable 'Always On Top'"
-msgstr "'Altijd bovenaan' inschakelen"
+#: src/skins-qt/skins_cfg.cc:298 src/skins/skins_cfg.cc:280
+msgid "Analyzer"
+msgstr "Analyse"
 
-#: src/skins/ui_main.cc:851
-msgid "File Info Box"
-msgstr "Bestandsinformatie Box"
+#: src/skins-qt/skins_cfg.cc:299 src/skins/skins_cfg.cc:281
+msgid "Show peaks"
+msgstr "Pieken tonen"
 
-#: src/skins/ui_main.cc:857
-msgid "Visualizations"
+#: src/skins-qt/skins_cfg.cc:308 src/skins/skins_cfg.cc:290
+msgid "Visualization"
 msgstr "Visualisatie "
 
-#: src/skins/ui_main.cc:1336
-msgid "Repeat point A set."
-msgstr "Herhaal ingesteld punt A."
-
-#: src/skins/ui_main.cc:1341
-msgid "Repeat point B set."
-msgstr "Herhaal ingesteld punt B."
-
-#: src/skins/ui_main.cc:1350
-msgid "Repeat points cleared."
-msgstr ""
-
-#: src/skins/ui_playlist.cc:219
-msgid "Search entries in active playlist"
-msgstr ""
-
-#: src/skins/ui_playlist.cc:226
-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.cc:234
-msgid "Title:"
-msgstr "Titel:"
-
-#: src/skins/ui_playlist.cc:241
-msgid "Album:"
-msgstr "Album:"
-
-#: src/skins/ui_playlist.cc:248
-msgid "Artist:"
-msgstr "Artiest:"
-
-#: src/skins/ui_playlist.cc:255
-msgid "File Name:"
-msgstr "Bestadsnaam:"
-
-#: src/skins/ui_playlist.cc:263
-msgid "Clear previous selection before searching"
-msgstr ""
-
-#: src/skins/ui_playlist.cc:266
-msgid "Automatically toggle queue for matching entries"
-msgstr ""
-
-#: src/skins/ui_playlist.cc:269
-msgid "Create a new playlist with matching entries"
-msgstr ""
-
-#: src/skins/ui_playlist.cc:717
-msgid "Audacious Playlist Editor"
-msgstr "Audacious Afspeellijst Bewerker"
-
-#: src/skins/ui_playlist.cc:752
-#, c-format
-msgid "%s (%d of %d)"
-msgstr "%s (%d van %d)"
-
-#: src/skins/ui_skinselector.cc:167
+#: src/skins-qt/skinselector.cc:98 src/skins/skinselector.cc:111
 msgid "Archived Winamp 2.x skin"
-msgstr ""
+msgstr "Gearchiveerd Winamp 2.x-thema"
 
-#: src/skins/ui_skinselector.cc:172
+#: src/skins-qt/skinselector.cc:102 src/skins/skinselector.cc:115
 msgid "Unarchived Winamp 2.x skin"
-msgstr ""
-
-#: src/skins/util.cc:430
-#, c-format
-msgid "Could not create directory (%s): %s\n"
-msgstr "Kon de map (%s) niet aanmaken: %s\n"
+msgstr "Niet-gearchiveerd Winamp 2.x-thema"
 
-#: src/sndfile/plugin.cc:39
+#: src/sndfile/plugin.cc:38
 msgid "Sndfile Plugin"
-msgstr "Sndfile Plugin"
+msgstr "Sndfile-plug-in"
 
-#: src/sndfile/plugin.cc:336
+#: src/sndfile/plugin.cc:372
 msgid ""
 "Based on the xmms_sndfile plugin:\n"
 "Copyright (C) 2000, 2002 Erik de Castro Lopo\n"
@@ -3755,94 +4190,130 @@
 "this program; if not, write to the Free Software Foundation, Inc., 51 "
 "Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 msgstr ""
+"Gebaseerd op de xmms_sndfile plugin:\n"
+"Auteursrecht (C) 2000, 2002 Erik de Castro Lopo\n"
+"\n"
+"Aangepast voor Audacious door Tony Vroon <chainsaw@gentoo.org>\n"
+"Dit programma is gratis software; U kunt het opnieuw uitgeven en/of wijzigen "
+"onder de voorwaarden van de GNU General Public License zoals gepubliceerd "
+"door de Free Software Foundation; Ofwel versie 2 van de licentie, of (naar "
+"keuze) elke latere versie.\n"
+"\n"
+"Dit programma wordt uitgegeven in de hoop dat het nuttig zal zijn, maar "
+"ZONDER ENIGE GARANTIE; zelfs zonder de impliciete garantie van "
+"VERKOOPBAARHEID of GESCHIKTHEID VOOR EEN BEPAALD DOEL. Zie de GNU General "
+"Public License voor meer informatie.\n"
+"\n"
+"U zou een kopie van de GNU General Public License ontvangen moeten hebben "
+"samen met dit programma; Indien niet, schrijf aan de Free Software "
+"Foundation, Inc., Franklin Street 51, Vijfde Vloer, Boston, MA 02110-1301, "
+"USA."
 
-#: src/sndio-ng/sndio.cc:44
+#: src/sndio/sndio.cc:43
 msgid "Sndio Output"
-msgstr "Sndio Uitvoer"
+msgstr "Sndio-uitvoer"
 
-#: src/sndio-ng/sndio.cc:98
+#: src/sndio/sndio.cc:98
 msgid "Device (blank for default):"
-msgstr "Apparaat (leeg voor standaardwaarde):"
+msgstr "Apparaat (laat leeg voor standaardwaarde):"
 
-#: src/sndio-ng/sndio.cc:100
+#: src/sndio/sndio.cc:100
 msgid "Save and restore volume:"
-msgstr "Volume opslaan en herstellen:"
+msgstr "Volume onthouden en herstellen:"
 
-#: src/sndio-ng/sndio.cc:181
+#: src/sndio/sndio.cc:181
 #, c-format
 msgid "Sndio error: Unsupported audio format (%d)"
-msgstr ""
+msgstr "Sndio-fout: audioformaat wordt niet ondersteund (%d)"
 
-#: src/sndio-ng/sndio.cc:192
+#: src/sndio/sndio.cc:192
 msgid "Sndio error: sio_open() failed"
-msgstr ""
+msgstr "Sndio-fout: sio_open() mislukt"
 
-#: src/sndio-ng/sndio.cc:222
+#: src/sndio/sndio.cc:221
 msgid "Sndio error: sio_setpar() failed"
-msgstr ""
+msgstr "Sndio-fout: sio_setpar() mislukt"
 
-#: src/sndio-ng/sndio.cc:234
+#: src/sndio/sndio.cc:233
 msgid "Sndio error: sio_start() failed"
-msgstr ""
+msgstr "Sndio-fout: sio_start() mislukt"
 
-#: src/song_change/song_change.cc:33
+#: src/songchange/song_change.cc:30
 msgid "Song Change"
-msgstr ""
-
-#: src/song_change/song_change.cc:342
-msgid ""
-"Parameters passed to the shell should be encapsulated in "
-"quotes. Doing otherwise is a security risk."
-msgstr ""
+msgstr "Nummerwijziging"
 
-#: src/song_change/song_change.cc:358
+#: src/songchange/song_change.cc:256
 msgid "Commands"
 msgstr "Opdrachten"
 
-#: src/song_change/song_change.cc:360
+#: src/songchange/song_change.cc:258
 msgid "Command to run when starting a new song:"
-msgstr "Opdracht uitvoeren wanneer een nieuw lied start:"
+msgstr "Opdracht uitvoeren bij begin van nieuw nummer:"
+
+#: src/songchange/song_change.cc:261
+msgid "Command to run when stopping a song:"
+msgstr ""
 
-#: src/song_change/song_change.cc:364
+#: src/songchange/song_change.cc:264
 msgid "Command to run at the end of a song:"
-msgstr "Opdracht uitvoeren aan het eind van een lied:"
+msgstr "Opdracht uitvoeren bij einde van nummer:"
 
-#: src/song_change/song_change.cc:368
+#: src/songchange/song_change.cc:267
 msgid "Command to run at the end of the playlist:"
-msgstr "Opdracht uitvoeren aan het eind van een afspeellijst:"
+msgstr "Opdracht uitvoeren bij einde van afspeellijst:"
 
-#: src/song_change/song_change.cc:372
+#: src/songchange/song_change.cc:270
 msgid "Command to run when song title changes (for network streams):"
+msgstr "Opdracht uitvoeren bij titelwijziging (voor netwerkstreams):"
+
+#: src/songchange/song_change.cc:273
+msgid ""
+"You can use the following format codes, which will be replaced before "
+"running the command.\n"
+"Not all are useful though for the song-stopped or end-of-playlist command."
 msgstr ""
-"Opdracht uitvoeren wanneer de songtitel verandert (voor netwerk streams):"
 
-#: src/song_change/song_change.cc:376
+#: src/songchange/song_change.cc:276
 msgid ""
-"You can use the following format strings which will be substituted before "
-"calling the command (not all are useful for the end-of-playlist command):\n"
-"\n"
-"%F: Frequency (in hertz)\n"
+"%a: Artist\n"
+"%b: Album\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"
+"%F: Frequency (Hertz)\n"
+"%l: Length (milliseconds)\n"
+"%n or %s: Formatted title (see playlist settings)\n"
 "%p: Currently playing (1 or 0)\n"
-"%a: Artist\n"
-"%b: Album\n"
-"%T: Track title"
+"%r: Rate (bits per second)\n"
+"%t: Playlist position\n"
+"%T: Title (unformatted)"
 msgstr ""
+"%a: Artiest\n"
+"%b: Album\n"
+"%c: Aantal kanalen\n"
+"%f: Bestandsnaam (volledige pad)\n"
+"%F: Frequentie (Hertz)\n"
+"%l: Duur (milliseconden)\n"
+"%n of %s: Opgemaakte titel (zie afspeellijstinstellingen)\n"
+"%p: Nu aan het afspelen (1 of 0)\n"
+"%r: Snelheid (bits per seconde)\n"
+"%t: Afspeellijstpositie\n"
+"%T: Titel (niet-opgemaakt)"
+
+#: src/songchange/song_change.cc:287
+msgid ""
+"Parameters passed to the shell should be enclosed in quotation marks.\n"
+"Unquoted parameters may lead to unexpected results."
+msgstr ""
+
+#: src/song-info-qt/song-info.cc:30
+msgid "Song Info"
+msgstr "Nummerinformatie"
 
-#: src/song-info-qt/song-info.cc:32
-msgid "Song Info (Qt)"
-msgstr "Lied Informatie (Qt)"
-
-#: src/sox-resampler/sox-resampler.cc:44
+#: src/soxr/sox-resampler.cc:44
 msgid "SoX Resampler"
-msgstr "SoX Resampler"
+msgstr "SoX-resampler"
 
-#: src/sox-resampler/sox-resampler.cc:144
+#: src/soxr/sox-resampler.cc:172
 msgid ""
 "SoX Resampler Plugin for Audacious\n"
 "Copyright 2013 Michał Lipski\n"
@@ -3850,98 +4321,153 @@
 "Based on Sample Rate Converter Plugin:\n"
 "Copyright 2010-2012 John Lindgren"
 msgstr ""
-"SoX Resampler Plugin voor Audacious\n"
-"Copyright 2013 Michał Lipski\n"
+"SoX-resamplerplug-in voor Audacious\n"
+"Auteursrecht 2013 Michał Lipski\n"
 "\n"
 "Gebaseerd op de Sample Rate Converter Plugin:\n"
 "Copyright 2010-2012 John Lindgren"
 
-#: src/sox-resampler/sox-resampler.cc:150
+#: src/soxr/sox-resampler.cc:178
 msgid "Quick"
 msgstr "Snel"
 
-#: src/sox-resampler/sox-resampler.cc:151
+#: src/soxr/sox-resampler.cc:179
 msgid "Low"
 msgstr "Laag"
 
-#: src/sox-resampler/sox-resampler.cc:153
+#: src/soxr/sox-resampler.cc:181
 msgid "High"
 msgstr "Hoog"
 
-#: src/sox-resampler/sox-resampler.cc:154
+#: src/soxr/sox-resampler.cc:182
 msgid "Very High"
 msgstr "Erg Hoog"
 
-#: src/sox-resampler/sox-resampler.cc:158
+#: src/soxr/sox-resampler.cc:183
+msgid "Ultra High"
+msgstr "Heel erg hoog"
+
+#: src/soxr/sox-resampler.cc:187
+msgid "Minimum"
+msgstr "Minimaal"
+
+#: src/soxr/sox-resampler.cc:188
+msgid "Intermediate"
+msgstr "Gemiddeld"
+
+#: src/soxr/sox-resampler.cc:193
 msgid "Quality:"
 msgstr "Kwaliteit:"
 
-#: src/speed-pitch/speed-pitch.cc:51
+#: src/soxr/sox-resampler.cc:196
+msgid "Phase:"
+msgstr "Fase:"
+
+#: src/soxr/sox-resampler.cc:200
+msgid "Allow aliasing"
+msgstr "Aliasing toestaan"
+
+#: src/soxr/sox-resampler.cc:202
+msgid "Use steep filter"
+msgstr "Hoog filter gebruiken"
+
+#: src/speedpitch/speed-pitch.cc:54
 msgid "Speed and Pitch"
-msgstr "Snelheid en Pitch"
+msgstr "Snelheid en toonhoogte"
 
-#: src/speed-pitch/speed-pitch.cc:210
-msgid "Speed and Pitch"
-msgstr "Snelheid en Pitch"
+#: src/speedpitch/speed-pitch.cc:247
+msgid "Speed"
+msgstr "Snelheid"
 
-#: src/speed-pitch/speed-pitch.cc:211
-msgid "Speed:"
-msgstr "Snelheid:"
+#: src/speedpitch/speed-pitch.cc:248
+msgid "Decouple from pitch"
+msgstr "Losmaken van toonhoogte"
 
-#: src/speed-pitch/speed-pitch.cc:214
-msgid "Pitch:"
-msgstr "Pitch:"
+#: src/speedpitch/speed-pitch.cc:250 src/speedpitch/speed-pitch.cc:258
+msgid "Multiplier:"
+msgstr "Vermenigvuldiger:"
 
-#: src/statusicon/statusicon.cc:47
-msgid "Status Icon"
-msgstr "Status Icoon"
+#: src/speedpitch/speed-pitch.cc:254
+msgid "Pitch"
+msgstr "Toonhoogte"
 
-#: src/statusicon/statusicon.cc:283
-msgid "Se_ttings ..."
-msgstr "Ins_tellingen"
+#: src/statusicon-qt/statusicon.cc:45 src/statusicon/statusicon.cc:47
+msgid "Status Icon"
+msgstr "Statuspictogram"
 
-#: src/statusicon/statusicon.cc:372
+#: src/statusicon-qt/statusicon.cc:68
 msgid ""
-"Status Icon Plugin\n"
+"Status Icon Plugin (partial port for Qt interface)\n"
 "\n"
 "Copyright 2005-2007 Giacomo Lozito <james@develia.org>\n"
 "Copyright 2010 Michał Lipski <tallica@o2.pl>\n"
+"Copyright 2015 Eugene Paskevich <eugene@raptor.kiev.ua>\n"
 "\n"
 "This plugin provides a status icon, placed in\n"
 "the system tray area of the window manager."
 msgstr ""
+"Statuspictogram-plug-in (gedeeltelijke overzetting voor de QT-interface)\n"
+"\n"
+"Auteursrecht 2005-2007 Giacomo Lozito <james@develia.org>\n"
+"Auteursrecht 2010 Michał Lipski <tallica@o2.pl>\n"
+"Auteursrecht 2015 Eugene Paskevich <eugene@raptor.kiev.ua>\n"
+"\n"
+"Deze plug-in bevat een statuspictogram dat in het systeemvakgebied \n"
+"van de vensterbeheerder wordt geplaatst."
 
-#: src/statusicon/statusicon.cc:379
+#: src/statusicon-qt/statusicon.cc:89 src/statusicon/statusicon.cc:384
 msgid "Mouse Scroll Action"
-msgstr "Muis Scroll Actie"
+msgstr "Muisscroll-actie"
 
-#: src/statusicon/statusicon.cc:380
+#: src/statusicon-qt/statusicon.cc:90 src/statusicon/statusicon.cc:385
 msgid "Change volume"
-msgstr "Verander Volume"
+msgstr "Volume wijzigen"
 
-#: src/statusicon/statusicon.cc:383
+#: src/statusicon-qt/statusicon.cc:93 src/statusicon/statusicon.cc:388
 msgid "Change playing song"
-msgstr "Verander het huidige lied dat wordt afgespeeld"
+msgstr "Huidige nummer wijzigen"
 
-#: src/statusicon/statusicon.cc:386
+#: src/statusicon-qt/statusicon.cc:96 src/statusicon/statusicon.cc:391
 msgid "Other Settings"
-msgstr "Ander Instellingen"
+msgstr "Overige instellingen"
 
-#: src/statusicon/statusicon.cc:387
+#: src/statusicon-qt/statusicon.cc:97 src/statusicon/statusicon.cc:392
 msgid "Disable the popup window"
-msgstr "Het pop-up venster uitschakelen"
+msgstr "Pop-upvenster uitschakelen"
 
-#: src/statusicon/statusicon.cc:389
+#: src/statusicon-qt/statusicon.cc:99 src/statusicon/statusicon.cc:394
 msgid "Close to the system tray"
-msgstr "In de buurt van het systeemvak"
+msgstr "Sluiten naar systeemvak"
 
-#: src/statusicon/statusicon.cc:391
+#: src/statusicon-qt/statusicon.cc:101 src/statusicon/statusicon.cc:396
 msgid "Advance in playlist when scrolling upward"
+msgstr "Vooruit in afspeellijst bij naar boven scrollen"
+
+#: src/statusicon-qt/statusicon.cc:116 src/statusicon/statusicon.cc:287
+msgid "Se_ttings ..."
+msgstr "Ins_tellingen…"
+
+#: src/statusicon/statusicon.cc:377
+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 ""
+"Statuspictogram-plug-in\n"
+"\n"
+"Auteursrecht 2005-2007 Giacomo Lozito <james@develia.org>\n"
+"Auteursrecht 2010 Michał Lipski <tallica@o2.pl>\n"
+"\n"
+"Deze plug-in bevat een statuspictogram dat in het systeemvakgebied \n"
+"van de vensterbeheerder wordt geplaatst."
 
 #: src/stereo_plugin/stereo.cc:19
 msgid "Extra Stereo"
-msgstr "Extra Stereo"
+msgstr "Extra stereo"
 
 #: src/stereo_plugin/stereo.cc:36
 msgid ""
@@ -3949,28 +4475,168 @@
 "\n"
 "By Johan Levin, 1999"
 msgstr ""
-"Extra Stereo Plugin\n"
+"Extra stereo-plug-in\n"
 "\n"
 "Door Johan Levin, 1999"
 
 #: src/stereo_plugin/stereo.cc:44
 msgid "Extra Stereo"
-msgstr "Extra Stereo"
+msgstr "Extra Stereo"
+
+#: src/streamtuner/icecast-model.cc:126 src/streamtuner/shoutcast-model.cc:131
+msgid "Type"
+msgstr "Soort"
+
+#: src/streamtuner/icecast-model.cc:132
+msgid "Current Song"
+msgstr "Huidige nummer"
+
+#: src/streamtuner/icecast-model.cc:164
+msgid "Other"
+msgstr "Anders"
+
+#: src/streamtuner/ihr-model.cc:63
+msgid "Market"
+msgstr "Markt"
+
+#: src/streamtuner/ihr-model.cc:156
+msgid "Call Letters"
+msgstr "Call Letters"
+
+#: src/streamtuner/ihr-model.cc:162
+msgid "Description"
+msgstr "Omschrijving"
+
+#: src/streamtuner/shoutcast-model.cc:128
+msgid "Listeners"
+msgstr "Luisteraars"
+
+#: src/streamtuner/shoutcast-model.cc:188
+msgid "Top 500 Stations"
+msgstr "Top 500 radiostations"
+
+#: src/streamtuner/shoutcast-model.cc:189
+msgid "Alternative"
+msgstr "Alternatief"
+
+#: src/streamtuner/shoutcast-model.cc:190
+msgid "Blues"
+msgstr "Blues"
+
+#: src/streamtuner/shoutcast-model.cc:191
+msgid "Classical"
+msgstr "Klassiek"
+
+#: src/streamtuner/shoutcast-model.cc:192
+msgid "Country"
+msgstr "Country"
+
+#: src/streamtuner/shoutcast-model.cc:193
+msgid "Decades"
+msgstr "Decennia"
+
+#: src/streamtuner/shoutcast-model.cc:194
+msgid "Easy Listening"
+msgstr "Easy Listening"
+
+#: src/streamtuner/shoutcast-model.cc:195
+msgid "Electronic"
+msgstr "Electronisch"
+
+#: src/streamtuner/shoutcast-model.cc:196
+msgid "Folk"
+msgstr "Folk"
+
+#: src/streamtuner/shoutcast-model.cc:197
+msgid "Inspirational"
+msgstr "Inspirerend"
+
+#: src/streamtuner/shoutcast-model.cc:198
+msgid "International"
+msgstr "Internationaal"
+
+#: src/streamtuner/shoutcast-model.cc:199
+msgid "Jazz"
+msgstr "Jazz"
+
+#: src/streamtuner/shoutcast-model.cc:200
+msgid "Latin"
+msgstr "Latijns-Amerikaans"
+
+#: src/streamtuner/shoutcast-model.cc:201
+msgid "Metal"
+msgstr "Metal"
+
+#: src/streamtuner/shoutcast-model.cc:203
+msgid "New Age"
+msgstr "New Age"
+
+#: src/streamtuner/shoutcast-model.cc:204
+msgid "Pop"
+msgstr "Pop"
+
+#: src/streamtuner/shoutcast-model.cc:205
+msgid "Public Radio"
+msgstr "Openbare omroep"
+
+#: src/streamtuner/shoutcast-model.cc:206
+msgid "R&B and Urban"
+msgstr "R&B en urban"
+
+#: src/streamtuner/shoutcast-model.cc:207
+msgid "Rap"
+msgstr "Rap"
+
+#: src/streamtuner/shoutcast-model.cc:208
+msgid "Reggae"
+msgstr "Reggae"
+
+#: src/streamtuner/shoutcast-model.cc:209
+msgid "Rock"
+msgstr "Rock"
+
+#: src/streamtuner/shoutcast-model.cc:210
+msgid "Seasonal and Holiday"
+msgstr "Seizoens- of feestdaggebonden"
+
+#: src/streamtuner/shoutcast-model.cc:211
+msgid "Soundtracks"
+msgstr "Soundtracks"
+
+#: src/streamtuner/shoutcast-model.cc:212
+msgid "Talk"
+msgstr "Gesprekken"
+
+#: src/streamtuner/shoutcast-model.cc:213
+msgid "Themes"
+msgstr "Thema's"
+
+#: src/streamtuner/streamtuner.cc:59
+msgid "Shoutcast"
+msgstr "Shoutcast"
+
+#: src/streamtuner/streamtuner.cc:60
+msgid "Icecast"
+msgstr "Icecast"
+
+#: src/streamtuner/streamtuner.cc:71
+msgid "Stream Tuner"
+msgstr "Stream Tuner"
 
 #: src/tonegen/tonegen.cc:45
 msgid "Tone Generator"
-msgstr "Toon Generator"
+msgstr "Toongenerator"
 
-#: src/tonegen/tonegen.cc:94
+#: src/tonegen/tonegen.cc:92
 #, c-format
 msgid "%s %.1f Hz"
 msgstr "%s %.1f Hz"
 
-#: src/tonegen/tonegen.cc:94
+#: src/tonegen/tonegen.cc:92
 msgid "Tone Generator: "
-msgstr "Toon Generator:"
+msgstr "Toongenerator:"
 
-#: src/tonegen/tonegen.cc:160
+#: src/tonegen/tonegen.cc:161
 msgid ""
 "Sine tone generator by Håvard Kvålen <havardk@xmms.org>\n"
 "Modified by Daniel J. Peng <danielpeng@bigfoot.com>\n"
@@ -3978,12 +4644,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 ""
+"Sinus-toongenerator door Håvard Kvålen <havardk@xmms.org>\n"
+"Aangepast door Daniel J. Peng <danielpeng@bigfoot.com>\n"
+"\n"
+"Voeg een url toe om te gebruiken: tone://frequency1;frequency2;frequency3;…\n"
+"bijv. tone://2000;2005 to play a 2000 Hz tone and a 2005 Hz tone"
+
+#: src/ui-common/dialogs-qt.cc:40
+msgid ""
+"\n"
+"(Further messages have been hidden.)"
+msgstr ""
+"\n"
+"(Verdere berichten zijn verborgen.)"
+
+#: src/ui-common/dialogs-qt.cc:52
+msgid "Working ..."
+msgstr "Bezig met uitvoeren…"
+
+#: src/ui-common/dialogs-qt.cc:73
+msgid "Information"
+msgstr "Informatie"
+
+#: src/ui-common/menu-ops-gtk.cc:132 src/ui-common/menu-ops-qt.cc:113
+#, c-format
+msgid "%s does not appear to be a valid folder."
+msgstr "%s lijkt geen geldige map te zijn."
 
 #: src/voice_removal/voice_removal.cc:28
 msgid "Voice Removal"
-msgstr "Stem Opheffing"
+msgstr "Stemverwijdering"
 
-#: src/vorbis/vorbis.cc:465
+#: src/vorbis/vorbis.cc:433
 msgid ""
 "Audacious Ogg Vorbis Decoder\n"
 "\n"
@@ -4003,17 +4695,34 @@
 "Gian-Carlo Pascutto <gcp@sjeng.org>\n"
 "Eugene Zagidullin <e.asphyx@gmail.com>"
 msgstr ""
+"Audacious Ogg Vorbis Decoder\n"
+"\n"
+"Gebaseerd op de Ogg Vorbis Plugin van de Xiph.org Stichting\n"
+"http://www.xiph.org/\n"
+"\n"
+"Originele code door:\n"
+"Tony Arcieri <bascule@inferno.tusculum.edu>\n"
+"\n"
+"Met contributies van:\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.h:18
 msgid "Ogg Vorbis Decoder"
 msgstr "Ogg Vorbis Decoder"
 
-#: src/vtx/info.cc:22
+#: src/vtx/info.cc:24
 #, c-format
 msgid "Details about %s"
-msgstr "Details over %s"
+msgstr "Informatie over %s"
 
-#: src/vtx/info.cc:24
+#: src/vtx/info.cc:26
 msgid ""
 "Title: %t\n"
 "Author: %a\n"
@@ -4027,31 +4736,89 @@
 "Player Freq: %P\n"
 "Year: %y"
 msgstr ""
+"Titel: %t\n"
+"Auteur: %a\n"
+"Van: %f\n"
+"Volger: %T\n"
+"Opmerking: %C\n"
+"Chip type: %c\n"
+"Stereo: %s\n"
+"Lus: %l\n"
+"Chip freq: %F\n"
+"Speler Freq: %P\n"
+"Jaar: %y"
 
 #: src/vtx/vtx.cc:38
 msgid "VTX Decoder"
 msgstr "VTX Decoder"
 
-#: src/vtx/vtx.cc:184
+#: src/vtx/vtx.cc:178
 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 bestandsformaat speler door Sashnov Alexander <sashnov@ngs.ru>\n"
+"Gebaseerd op in_vtx.dll door Roman Sherbakov <v_soft@microfor.ru>\n"
+"Audacious plugin door Pavel Vymetalek <pvymetalek@seznam.cz>"
+
+#: src/vumeter-qt/vumeter_qt.cc:31
+msgid ""
+"VU Meter Plugin for Audacious\n"
+"Copyright 2017-2019 Marc Sánchez Fauste"
+msgstr ""
+"VU-meterplug-in voor Audacious\n"
+"Copyright 2017-2019 Marc Sánchez Fauste"
+
+#: src/vumeter-qt/vumeter_qt.cc:35
+msgid "VU Meter Settings"
+msgstr "VU-meter-instellingen"
+
+#: src/vumeter-qt/vumeter_qt.cc:37
+msgid "Peak hold time:"
+msgstr "Max. vasthoudtijd:"
+
+#: src/vumeter-qt/vumeter_qt.cc:42
+msgid "Fall-off time:"
+msgstr "Stoppen om:"
+
+#: src/vumeter-qt/vumeter_qt.cc:44
+msgid "dB/second"
+msgstr "dB/second"
+
+#: src/vumeter-qt/vumeter_qt.cc:46
+msgid "Display legend"
+msgstr "Legenda tonen"
+
+#: src/vumeter-qt/vumeter_qt.h:37
+msgid "VU Meter"
+msgstr "VU-meter"
+
+#: src/waveout/waveout.cc:43
+msgid "Win32 waveOut"
+msgstr "Win32 waveOut"
+
+#: src/waveout/waveout.cc:69
+msgid ""
+"Win32 waveOut Plugin for Audacious\n"
+"Copyright 2016 John Lindgren"
+msgstr ""
+"Win32 waveOut Plugin voor Audacious\n"
+"Auteursrecht 2016 John Lindgren"
 
-#: src/wavpack/wavpack.cc:24
+#: src/wavpack/wavpack.cc:25
 msgid "WavPack Decoder"
 msgstr "WavPack Decoder"
 
-#: src/wavpack/wavpack.cc:211
+#: src/wavpack/wavpack.cc:217
 msgid "lossy (hybrid)"
-msgstr ""
+msgstr "lossy (hybride)"
 
-#: src/wavpack/wavpack.cc:213
+#: src/wavpack/wavpack.cc:219
 msgid "lossy"
-msgstr ""
+msgstr "lossy"
 
-#: src/wavpack/wavpack.cc:255
+#: src/wavpack/wavpack.cc:259
 msgid ""
 "Copyright 2006 William Pitcock <nenolod@nenolod.net>\n"
 "\n"
@@ -4061,18 +4828,38 @@
 "\n"
 "Enkele regels code van de plugin zijn door Miles Egan."
 
-#: src/xsf/plugin.cc:50
+#: src/xsf/plugin.cc:74
 msgid "2SF Decoder"
 msgstr "2SF Decoder"
 
-#: src/xsf/plugin.cc:238
+#: src/xsf/plugin.cc:429
+msgid "32728 Hz"
+msgstr "32728 Hz"
+
+#: src/xsf/plugin.cc:432
+msgid "65456 Hz"
+msgstr "65456 Hz"
+
+#: src/xsf/plugin.cc:438
+msgid "Cosine"
+msgstr "Cosinus"
+
+#: src/xsf/plugin.cc:439
+msgid "Sharp"
+msgstr "Scherp"
+
+#: src/xsf/plugin.cc:443
 msgid "XSF Configuration"
 msgstr "XSF Configuratie"
 
-#: src/xsf/plugin.cc:239
-msgid "Ignore length from file"
-msgstr "Negeer de lengte van het bestand"
+#: src/xsf/plugin.cc:445
+msgid "Default fade time:"
+msgstr "Standaard vervaagtijd::"
+
+#: src/xsf/plugin.cc:447
+msgid "Interpolation mode:"
+msgstr "Interpolatiemodus:"
 
-#: src/xspf/xspf.cc:89
+#: src/xspf/xspf.cc:95
 msgid "XML Shareable Playlists (XSPF)"
-msgstr ""
+msgstr "XML deelbare afspeellijsten (XSPF)"

audacious-plugins-3.6.2-gtk3.tar.bz2/po/pl.po -> audacious-plugins-4.4.1.tar.bz2/po/pl.po Changed

@@ -4,6 +4,8 @@
 #
 # Translators:
 # Chris <259095+transifex@gmail.com>, 2012
+# d5197d93c063a2b1e22d1630a39b7aef_d173d74, 2016
+# HrabiaN <bohopicasso@gmail.com>, 2015
 # Chris <259095+transifex@gmail.com>, 2012
 # Chris <259095+transifex@gmail.com>, 2012
 # felikstayson <felikstayson@o2.pl>, 2012
@@ -11,10 +13,14 @@
 # mkkot <marcin2006@gmail.com>, 2013
 # Marco Oliver Grunwald <m@mgrvnwald.com>, 2013
 # Marco Oliver Grunwald <m@mgrvnwald.com>, 2013
+# Marek Adamski, 2022-2024
 # Marco Oliver Grunwald <m@mgrvnwald.com>, 2013
 # mkkot <marcin2006@gmail.com>, 2013-2014
-# Piotr Sokół <psokol@jabster.pl>, 2012
-# Piotr Strębski <strebski@o2.pl>, 2014-2015
+# Marek Adamski, 2020
+# Marek Adamski, 2017-2018,2020
+# Piotr Sokół <psokol.l10n@gmail.com>, 2012
+# Piotr Strębski <strebski@gmail.com>, 2017
+# Piotr Strębski <strebski@gmail.com>, 2014-2015
 # Szymon Weihs <sz.weihs@gmail.com>, 2011
 # Szymon Weihs <sz.weihs@gmail.com>, 2011-2012
 # Wojciech Myrda <vojcek@tlen.pl>, 2013
@@ -22,301 +28,75 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Audacious Plugins\n"
-"Report-Msgid-Bugs-To: http://redmine.audacious-media-player.org/\n"
-"POT-Creation-Date: 2015-02-28 19:18+0100\n"
-"PO-Revision-Date: 2015-02-05 12:12+0000\n"
-"Last-Translator: Piotr Strębski <strebski@o2.pl>\n"
-"Language-Team: Polish (http://www.transifex.com/projects/p/audacious/"
-"language/pl/)\n"
+"Report-Msgid-Bugs-To: https://github.com/audacious-media-player/audacious/"
+"issues\n"
+"POT-Creation-Date: 2024-09-26 21:54+0200\n"
+"PO-Revision-Date: 2011-10-10 17:43+0000\n"
+"Last-Translator: Marek Adamski, 2022-2024\n"
+"Language-Team: Polish (http://app.transifex.com/audacious/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"
-"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=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && "
+"(n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && "
+"n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
 
-#: src/aac-raw/aac.cc:18
+#: src/aac/aac.cc:19
 msgid "AAC (Raw) Decoder"
 msgstr "Dekoder AAC (surowe dane)"
 
-#: src/adplug/adplug-xmms.cc:42
+#: src/adplug/adplug-xmms.cc:70
 msgid "AdPlug (AdLib Player)"
 msgstr "AdPlug (Odtwarzacz AdLib)"
 
-#: src/adplug/adplug-xmms.cc:156 src/modplug/modplugbmp.cc:335
-#: src/psf/plugin.cc:138 src/vtx/vtx.cc:87 src/xsf/plugin.cc:113
+#: src/adplug/adplug-xmms.cc:167 src/modplug/modplugbmp.cc:321
+#: src/psf/plugin.cc:161 src/vtx/vtx.cc:89 src/xsf/plugin.cc:204
 msgid "sequenced"
 msgstr "sekwencjonowane"
 
-#: src/alarm/alarm.cc:55 src/alarm/interface.cc:82
-msgid "Alarm"
-msgstr "Alarm"
-
-#: src/alarm/alarm.cc:782
-msgid "Set Alarm ..."
-msgstr "Ustaw alarm..."
-
-#: src/alarm/alarm.cc:810
-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 ""
-"Wtyczka do zaplanowania odtwarzania w określonym czasie.\n"
-"Pierwotni autorzy: Adam Feakin i Daniel Stodden."
-
-#: src/alarm/interface.cc: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.cc: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.cc: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.cc:81
-msgid "This is your wakeup call."
-msgstr "To jest twój sygnał budzenia."
-
-#: src/alarm/interface.cc:99
-msgid "Your reminder for today is..."
-msgstr "Twoje przypomnienie na dzisiaj to..."
-
-#: src/alarm/interface.cc:101 src/alarm/interface.cc:386
-msgid "Reminder"
-msgstr "Przypominacz"
-
-#: src/alarm/interface.cc:132
-msgid "Monday"
-msgstr "Poniedziałek"
-
-#: src/alarm/interface.cc:132
-msgid "Tuesday"
-msgstr "Wtorek"
-
-#: src/alarm/interface.cc:132
-msgid "Wednesday"
-msgstr "Środa"
-
-#: src/alarm/interface.cc:133
-msgid "Thursday"
-msgstr "Czwartek"
-
-#: src/alarm/interface.cc:133
-msgid "Friday"
-msgstr "Piątek"
-
-#: src/alarm/interface.cc:133
-msgid "Saturday"
-msgstr "Sobota"
-
-#: src/alarm/interface.cc:133
-msgid "Sunday"
-msgstr "Niedziela"
-
-#: src/alarm/interface.cc:171 src/alarm/interface.cc:230
-#: src/alarm/interface.cc:245
-msgid "Time"
-msgstr "Czas"
-
-#: src/alarm/interface.cc:178
-msgid "Alarm at (default):"
-msgstr "Domyślnie alarm o:"
-
-#: src/alarm/interface.cc:200
-msgid "h"
-msgstr "hh:mm"
-
-#: src/alarm/interface.cc:203
-msgid "Quiet after:"
-msgstr "Wyciszenie po:"
-
-#: src/alarm/interface.cc:215
-msgid "hours"
-msgstr "godziny"
-
-#: src/alarm/interface.cc:226
-msgid "minutes"
-msgstr "minuty"
-
-#: src/alarm/interface.cc:235
-msgid "Choose the days for the alarm to come on"
-msgstr "Wybierz dni, w których alarm będzie aktywny"
-
-#: src/alarm/interface.cc:242
-msgid "Day"
-msgstr "Dzień"
-
-#: src/alarm/interface.cc:259 src/bs2b/plugin.cc:130
-#: src/skins/preset-list.cc:434 src/skins/preset-list.cc:440
-msgid "Default"
-msgstr "Domyślny"
+#: src/adplug/adplug-xmms.cc:349 src/sid/xs_config.cc:61
+msgid "Output"
+msgstr "Wyjście"
 
-#: src/alarm/interface.cc:288
-msgid "Days"
-msgstr "Dni"
-
-#: src/alarm/interface.cc:297
-msgid "Fading"
-msgstr "Czas przejścia"
-
-#: src/alarm/interface.cc:305 src/console/plugin.cc:41
-#: src/crossfade/crossfade.cc:53 src/crossfade/crossfade.cc:59
-#: src/gtkui/settings.cc:49 src/lirc/lirc.cc:397 src/sid/xs_config.cc:85
-#: src/sid/xs_config.cc:94 src/sid/xs_config.cc:103
-msgid "seconds"
-msgstr "sekundy"
+#: src/adplug/adplug-xmms.cc:350
+msgid "OPL Emulator:"
+msgstr "Emulator OPL:"
+
+#: src/adplug/adplug-xmms.cc:353 src/amidiplug/i_configure.cc:153
+#: src/console/plugin.cc:45 src/filewriter/filewriter.cc:481
+#: src/sid/xs_config.cc:65 src/xsf/plugin.cc:446
+msgid "Sample rate:"
+msgstr "Częstotliwość próbkowania:"
 
-#: src/alarm/interface.cc:312 src/alarm/interface.cc:353
-msgid "Volume"
-msgstr "Głośność"
-
-#: src/alarm/interface.cc:317
-msgid "Start at"
-msgstr "Początkowa"
-
-#: src/alarm/interface.cc:333
-msgid "Final"
-msgstr "Końcowa"
-
-#: src/alarm/interface.cc:346
-msgid "Current"
-msgstr "Bieżąca"
-
-#: src/alarm/interface.cc:359
-msgid "Additional Command"
-msgstr "Dodatkowe polecenie"
-
-#: src/alarm/interface.cc:365 src/alarm/interface.cc:391
-msgid "enable"
-msgstr "włącz"
-
-#: src/alarm/interface.cc:372
-msgid "Playlist (optional)"
-msgstr "Lista odtwarzania (opcjonalnie)"
-
-#: src/alarm/interface.cc:379
-msgid "Select a playlist"
-msgstr "Wybierz listę odtwarzania"
+#: src/adplug/adplug-xmms.cc:354 src/amidiplug/i_configure.cc:155
+#: src/bs2b/plugin.cc:141 src/console/plugin.cc:47
+#: src/modplug/plugin_main.cc:77 src/resample/resample.cc:201
+#: src/resample/resample.cc:207 src/resample/resample.cc:211
+#: src/resample/resample.cc:215 src/resample/resample.cc:219
+#: src/resample/resample.cc:223 src/resample/resample.cc:227
+#: src/resample/resample.cc:231 src/resample/resample.cc:235
+#: src/resample/resample.cc:239 src/resample/resample.cc:243
+#: src/sid/xs_config.cc:67 src/soxr/sox-resampler.cc:205
+msgid "Hz"
+msgstr "Hz"
 
-#: src/alarm/interface.cc:399
-msgid "Options"
-msgstr "Ustawienia"
+#: src/adplug/adplug-xmms.cc:355 src/gtkui/settings.cc:55
+#: src/modplug/plugin_main.cc:105 src/qtui/settings.cc:85
+#: src/skins-qt/skins_cfg.cc:302 src/skins/skins_cfg.cc:284
+msgid "Miscellaneous"
+msgstr "Różne"
 
-#: src/alarm/interface.cc:404
-msgid "What do these options mean?"
-msgstr "Co oznaczają te ustawienia?"
-
-#: src/alarm/interface.cc:420
-msgid "Help"
-msgstr "Pomoc"
+#: src/adplug/adplug-xmms.cc:356
+msgid "Repeat song in endless loop"
+msgstr "Powtarzaj piosenkę w nieskończonej pętli"
 
-#: src/albumart/albumart.cc:31
+#: src/albumart/albumart.cc:31 src/albumart-qt/albumart.cc:35
 msgid "Album Art"
 msgstr "Okładka albumu"
 
-#: src/albumart-qt/albumart.cc:33
-msgid "Album Art (Qt)"
-msgstr "Okładka albumu (Qt)"
-
-#: src/alsa/alsa.h:70
+#: src/alsa/alsa.h:64
 msgid "ALSA Output"
 msgstr "Wyjście ALSA"
 
@@ -358,11 +138,11 @@
 msgid "Mixer element:"
 msgstr "Element miksera:"
 
-#: src/amidi-plug/amidi-plug.cc:41
+#: src/amidiplug/amidi-plug.cc:42
 msgid "AMIDI-Plug (MIDI Player)"
 msgstr "AMIDI-Plug (Odtwarzacz MIDI)"
 
-#: src/amidi-plug/amidi-plug.cc:437
+#: src/amidiplug/amidi-plug.cc:445
 msgid ""
 "AMIDI-Plug\n"
 "modular MIDI music player\n"
@@ -404,157 +184,161 @@
 "Tony'ego Vroona\n"
 "za pomoc w testowaniu wersji alfa"
 
-#: src/amidi-plug/i_configure.cc:94
+#: src/amidiplug/i_configure.cc:94
 msgid "Override default gain:"
 msgstr "Zmień domyślną głośność:"
 
-#: src/amidi-plug/i_configure.cc:102
+#: src/amidiplug/i_configure.cc:102
 msgid "Override default polyphony:"
 msgstr "Zmień domyślną polifonię:"
 
-#: src/amidi-plug/i_configure.cc:110
+#: src/amidiplug/i_configure.cc:110
 msgid "Override default reverb:"
 msgstr "Zmień domyślne echo:"
 
-#: src/amidi-plug/i_configure.cc:112 src/amidi-plug/i_configure.cc:120
+#: src/amidiplug/i_configure.cc:112 src/amidiplug/i_configure.cc:120
 msgid "On"
 msgstr "Włączone"
 
-#: src/amidi-plug/i_configure.cc:118
+#: src/amidiplug/i_configure.cc:118
 msgid "Override default chorus:"
 msgstr "Zmień domyślny chorus:"
 
-#: src/amidi-plug/i_configure.cc:128 src/console/plugin.cc:29
+#: src/amidiplug/i_configure.cc:128 src/console/plugin.cc:29
 msgid "Playback"
 msgstr "Odtwarzanie"
 
-#: src/amidi-plug/i_configure.cc:129
+#: src/amidiplug/i_configure.cc:129
 msgid "Transpose:"
 msgstr "Przesunięcie:"
 
-#: src/amidi-plug/i_configure.cc:131
+#: src/amidiplug/i_configure.cc:131 src/speedpitch/speed-pitch.cc:257
 msgid "semitones"
 msgstr "półtony"
 
-#: src/amidi-plug/i_configure.cc:132
+#: src/amidiplug/i_configure.cc:132
 msgid "Drum shift:"
 msgstr "Przesunięcie perkusji:"
 
-#: src/amidi-plug/i_configure.cc:134
+#: src/amidiplug/i_configure.cc:134
 msgid "note numbers"
 msgstr "numery nut"
 
-#: src/amidi-plug/i_configure.cc:135
+#: src/amidiplug/i_configure.cc:135
 msgid "Skip leading silence"
 msgstr "Przeskocz ciszę na wprowadzeniu"
 
-#: src/amidi-plug/i_configure.cc:137
+#: src/amidiplug/i_configure.cc:137
 msgid "Skip trailing silence"
 msgstr "Przeskocz ciszę na zakończeniu"
 
-#: src/amidi-plug/i_configure.cc:141
+#: src/amidiplug/i_configure.cc:141
 msgid "SoundFont"
-msgstr "Czcionka"
+msgstr "SoundFont"
 
-#: src/amidi-plug/i_configure.cc:143
+#: src/amidiplug/i_configure.cc:148
 msgid "Synthesizer"
 msgstr "Syntezator"
 
-#: src/amidi-plug/i_configure.cc:148 src/console/plugin.cc:45
-#: src/sid/xs_config.cc:65
-msgid "Sample rate:"
-msgstr "Częstotliwość próbkowania:"
-
-#: src/amidi-plug/i_configure.cc:150 src/bs2b/plugin.cc:141
-#: src/console/plugin.cc:47 src/modplug/plugin_main.cc:78
-#: src/resample/resample.cc:201 src/resample/resample.cc:207
-#: src/resample/resample.cc:211 src/resample/resample.cc:215
-#: src/resample/resample.cc:219 src/resample/resample.cc:223
-#: src/resample/resample.cc:227 src/resample/resample.cc:231
-#: src/resample/resample.cc:235 src/resample/resample.cc:239
-#: src/resample/resample.cc:243 src/sid/xs_config.cc:67
-#: src/sox-resampler/sox-resampler.cc:163
-msgid "Hz"
-msgstr "Hz"
-
-#: src/amidi-plug/i_configure-fluidsynth.cc:52
+#: src/amidiplug/i_configure-fluidsynth.cc:58
+#: src/amidiplug/i_configure-fluidsynth.cc:527
 msgid "AMIDI-Plug - select SoundFont file"
-msgstr "AMIDI-Plug - wybierz plik czcionki"
+msgstr "AMIDI-Plug - wybierz plik SoundFont"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:55 src/filewriter/mp3.cc:658
+#: src/amidiplug/i_configure-fluidsynth.cc:61
 msgid "_Cancel"
 msgstr "_Anuluj"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:56
+#: src/amidiplug/i_configure-fluidsynth.cc:62
 msgid "_Open"
 msgstr "_Otwórz"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:225 src/gtkui/columns.cc:46
+#: src/amidiplug/i_configure-fluidsynth.cc:233
+#: src/amidiplug/i_configure-fluidsynth.cc:461
 msgid "File name"
 msgstr "Nazwa pliku"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:229
+#: src/amidiplug/i_configure-fluidsynth.cc:237
+#: src/amidiplug/i_configure-fluidsynth.cc:464
 msgid "Size (bytes)"
 msgstr "Wielkość (w bajtach)"
 
-#: src/amidi-plug/i_fileinfo.cc:163
+#: src/amidiplug/i_fileinfo.cc:184
 msgid "Name:"
 msgstr "Nazwa:"
 
-#: src/amidi-plug/i_fileinfo.cc:181
+#: src/amidiplug/i_fileinfo.cc:202
 msgid " MIDI Info "
 msgstr " Informacje MIDI "
 
-#: src/amidi-plug/i_fileinfo.cc:195
+#: src/amidiplug/i_fileinfo.cc:216
 msgid "Format:"
 msgstr "Format:"
 
-#: src/amidi-plug/i_fileinfo.cc:198
+#: src/amidiplug/i_fileinfo.cc:219
 msgid "Length (msec):"
 msgstr "Długość (ms):"
 
-#: src/amidi-plug/i_fileinfo.cc:201
+#: src/amidiplug/i_fileinfo.cc:222
 msgid "No. of Tracks:"
-msgstr "Liczba utworów:"
+msgstr "Liczba ścieżek:"
 
-#: src/amidi-plug/i_fileinfo.cc:207
+#: src/amidiplug/i_fileinfo.cc:228
 msgid "variable"
 msgstr "zmienna"
 
-#: src/amidi-plug/i_fileinfo.cc:209
+#: src/amidiplug/i_fileinfo.cc:230
 msgid "BPM:"
 msgstr "Uderzenia na minutę:"
 
-#: src/amidi-plug/i_fileinfo.cc:217
+#: src/amidiplug/i_fileinfo.cc:238
 msgid "BPM (wavg):"
 msgstr "Uderzenia na minutę (średnia ważona):"
 
-#: src/amidi-plug/i_fileinfo.cc:220
+#: src/amidiplug/i_fileinfo.cc:241
 msgid "Time Div:"
 msgstr "Podział czasu:"
 
-#: src/amidi-plug/i_fileinfo.cc:231
+#: src/amidiplug/i_fileinfo.cc:252
 msgid " MIDI Comments and Lyrics "
-msgstr " Komentarze i teksty utworów MIDI "
+msgstr " Komentarze i teksty piosenek MIDI "
 
-#: src/amidi-plug/i_fileinfo.cc:278
+#: src/amidiplug/i_fileinfo.cc:299
 msgid "* no comments available in this MIDI file *"
 msgstr "* brak dostępnych komentarzy w tym pliku MIDI *"
 
-#: src/amidi-plug/i_fileinfo.cc:290
+#: src/amidiplug/i_fileinfo.cc:311
 msgid "* no lyrics available in this MIDI file *"
-msgstr "* brak dostępnych tekstów utworów w tym pliku MIDI *"
+msgstr "* brak dostępnego tekstu piosenki w tym pliku MIDI *"
 
-#: src/amidi-plug/i_fileinfo.cc:300 src/filewriter/vorbis.cc:197
-#: src/ladspa/plugin.cc:416
+#: src/amidiplug/i_fileinfo.cc:321 src/ladspa/plugin.cc:418
+#: src/ui-common/dialogs-qt.cc:32
 msgid "_Close"
 msgstr "_Zamknij"
 
-#: src/amidi-plug/i_fileinfo.cc:325
+#: src/amidiplug/i_fileinfo.cc:346
 msgid " (invalid UTF-8)"
 msgstr " (niepoprawne kodowanie UTF-8)"
 
-#: src/aosd/aosd.cc:32
+#: src/ampache/ampache.cc:33
+msgid "Ampache Browser"
+msgstr "Przeglądarka Ampache"
+
+#: src/ampache/ampache.cc:46
+msgid ""
+"Ampache Browser for Audacious\n"
+"http://ampache-browser.org/\n"
+"\n"
+"Copyright (C) Róbert Čerňanský and John Lindgren\n"
+"License: GNU GPLv3"
+msgstr ""
+"Przeglądarka Ampache dla Audaciousa\n"
+"http://ampache-browser.org/\n"
+"\n"
+"Prawa autorskie (C) Róbert Čerňanský i John Lindgren\n"
+"Licencja: GNU GPLv3"
+
+#: src/aosd/aosd.cc:31
 msgid ""
 "Audacious OSD\n"
 "http://www.develia.org/projects.php?p=audacious#aosd\n"
@@ -588,133 +372,133 @@
 msgid "Concave Rectangle"
 msgstr "Wklęsły prostokąt"
 
-#: src/aosd/aosd_style.cc:69
+#: src/aosd/aosd_style.cc:69 src/openmpt/mptwrap.h:50 src/xsf/plugin.cc:436
 msgid "None"
 msgstr "Brak"
 
-#: src/aosd/aosd_trigger.cc:50
+#: src/aosd/aosd_trigger.cc:49
 msgid "Playback Start"
 msgstr "Rozpocznij odtwarzanie"
 
-#: src/aosd/aosd_trigger.cc:51
+#: src/aosd/aosd_trigger.cc:50
 msgid "Triggers OSD when a playlist entry is played."
 msgstr ""
 "Wyświetla informację ekranową po zmianie pozycji na liście odtwarzania."
 
-#: src/aosd/aosd_trigger.cc:56
+#: src/aosd/aosd_trigger.cc:55
 msgid "Title Change"
 msgstr "Zmiana tytułu"
 
-#: src/aosd/aosd_trigger.cc:57
+#: src/aosd/aosd_trigger.cc:56
 msgid "Triggers OSD when the song title changes (for internet streams)."
 msgstr ""
 "Wyzwala OSD, gdy następuje zmiana tytułu piosenki (dla strumieniowania "
 "internetowego)"
 
-#: src/aosd/aosd_trigger.cc:62
+#: src/aosd/aosd_trigger.cc:61
 msgid "Pause On"
 msgstr "Wstrzymaj"
 
-#: src/aosd/aosd_trigger.cc:63
+#: src/aosd/aosd_trigger.cc:62
 msgid "Triggers OSD when playback is paused."
 msgstr "Wyświetla informację ekranową po wstrzymaniu odtwarzania."
 
-#: src/aosd/aosd_trigger.cc:68
+#: src/aosd/aosd_trigger.cc:67
 msgid "Pause Off"
 msgstr "Wznów"
 
-#: src/aosd/aosd_trigger.cc:69
+#: src/aosd/aosd_trigger.cc:68
 msgid "Triggers OSD when playback is unpaused."
 msgstr "Wyświetla informację ekranową po wznowieniu odtwarzania."
 
-#: src/aosd/aosd_ui.cc:163
+#: src/aosd/aosd_ui.cc:204
 msgid "Placement"
 msgstr "Rozmieszczenie"
 
-#: src/aosd/aosd_ui.cc:196
+#: src/aosd/aosd_ui.cc:241
 msgid "Relative X offset:"
 msgstr "Przesunięcie wzdłuż osi X:"
 
-#: src/aosd/aosd_ui.cc:203
+#: src/aosd/aosd_ui.cc:245
 msgid "Relative Y offset:"
 msgstr "Przesunięcie wzdłuż osi Y:"
 
-#: src/aosd/aosd_ui.cc:210
+#: src/aosd/aosd_ui.cc:249
 msgid "Max OSD width:"
 msgstr "Maksymalna szerokość informacji:"
 
-#: src/aosd/aosd_ui.cc:221
+#: src/aosd/aosd_ui.cc:281
 msgid "Multi-Monitor options"
 msgstr "Wiele ekranów"
 
-#: src/aosd/aosd_ui.cc:225
+#: src/aosd/aosd_ui.cc:285
 msgid "Display OSD using:"
 msgstr "Wyświetlanie informacji ekranowej na:"
 
-#: src/aosd/aosd_ui.cc:227
+#: src/aosd/aosd_ui.cc:287
 msgid "all monitors"
 msgstr "wszystkie ekrany"
 
-#: src/aosd/aosd_ui.cc:230
+#: src/aosd/aosd_ui.cc:290
 #, c-format
 msgid "monitor %i"
 msgstr "ekran %i"
 
-#: src/aosd/aosd_ui.cc:282
+#: src/aosd/aosd_ui.cc:342
 msgid "Timing (ms)"
 msgstr "Czas (ms)"
 
-#: src/aosd/aosd_ui.cc:287
+#: src/aosd/aosd_ui.cc:347
 msgid "Display:"
 msgstr "Wyświetlanie:"
 
-#: src/aosd/aosd_ui.cc:292
+#: src/aosd/aosd_ui.cc:352
 msgid "Fade in:"
 msgstr "Pojawianie się:"
 
-#: src/aosd/aosd_ui.cc:297
+#: src/aosd/aosd_ui.cc:357
 msgid "Fade out:"
 msgstr "Zanikanie:"
 
-#: src/aosd/aosd_ui.cc:361
+#: src/aosd/aosd_ui.cc:442
 msgid "Fonts"
 msgstr "Czcionki"
 
-#: src/aosd/aosd_ui.cc:368
+#: src/aosd/aosd_ui.cc:449
 #, c-format
 msgid "Font %i:"
 msgstr "Czcionka %i:"
 
-#: src/aosd/aosd_ui.cc:382
+#: src/aosd/aosd_ui.cc:466
 msgid "Shadow"
 msgstr "Cień"
 
-#: src/aosd/aosd_ui.cc:486
+#: src/aosd/aosd_ui.cc:589
 msgid "Render Style"
 msgstr "Kształt"
 
-#: src/aosd/aosd_ui.cc:502
+#: src/aosd/aosd_ui.cc:605
 msgid "Colors"
 msgstr "Kolory"
 
-#: src/aosd/aosd_ui.cc:513
+#: src/aosd/aosd_ui.cc:616
 #, c-format
 msgid "Color %i:"
 msgstr "Kolor %i:"
 
-#: src/aosd/aosd_ui.cc:600
+#: src/aosd/aosd_ui.cc:714
 msgid "Enable trigger"
 msgstr "Włączenie"
 
-#: src/aosd/aosd_ui.cc:627
+#: src/aosd/aosd_ui.cc:741
 msgid "Event"
 msgstr "Zdarzenia"
 
-#: src/aosd/aosd_ui.cc:655
+#: src/aosd/aosd_ui.cc:768
 msgid "Composite manager detected"
 msgstr "Wykryto menedżer okien obsługujący kompozycje"
 
-#: src/aosd/aosd_ui.cc:662
+#: src/aosd/aosd_ui.cc:775
 msgid ""
 "Composite manager not detected;\n"
 "unless you know that you have one running, please activate a composite "
@@ -722,64 +506,60 @@
 msgstr ""
 "Nie wykryto menedżera okien obsługującego kompozycje.\n"
 "Aby menu ekranowe było wyświetlanie prawidłowo, należy uruchomić menedżer "
-"okien obsługujący kompozycje (np. Compiz)."
+"okien obsługujący kompozycje"
 
-#: src/aosd/aosd_ui.cc:670
+#: src/aosd/aosd_ui.cc:783
 msgid "Composite manager not required for fake transparency"
 msgstr ""
 "Menedżer okien obsługujący kompozycje nie jest wymagany dla udawanej "
 "przezroczystości"
 
-#: src/aosd/aosd_ui.cc:706
+#: src/aosd/aosd_ui.cc:820
 msgid "Transparency"
 msgstr "Przezroczystość"
 
-#: src/aosd/aosd_ui.cc:712
+#: src/aosd/aosd_ui.cc:826
 msgid "Fake transparency"
 msgstr "Udawana przeźroczystość"
 
-#: src/aosd/aosd_ui.cc:714
+#: src/aosd/aosd_ui.cc:828
 msgid "Real transparency (requires X Composite Ext.)"
 msgstr "Prawdziwa przezroczystość (wymaga rozszerzenia X Composite)"
 
-#: src/aosd/aosd_ui.cc:756
+#: src/aosd/aosd_ui.cc:875
 msgid "Composite extension not loaded"
 msgstr "Nie wczytano rozszerzenia kompozycji"
 
-#: src/aosd/aosd_ui.cc:764
-msgid "Composite extension not available"
-msgstr "Rozszerzenie kompozycji jest niedostępne"
-
-#: src/aosd/aosd_ui.cc:781
+#: src/aosd/aosd_ui.cc:892
 #, c-format
 msgid "Audacious OSD"
 msgstr "Audacious OSD"
 
-#: src/aosd/aosd_ui.cc:844
+#: src/aosd/aosd_ui.cc:955
 msgid "Position"
 msgstr "Pozycja"
 
-#: src/aosd/aosd_ui.cc:849
+#: src/aosd/aosd_ui.cc:960
 msgid "Animation"
 msgstr "Animacja"
 
-#: src/aosd/aosd_ui.cc:854
+#: src/aosd/aosd_ui.cc:965
 msgid "Text"
 msgstr "Tekst"
 
-#: src/aosd/aosd_ui.cc:859
+#: src/aosd/aosd_ui.cc:970
 msgid "Decoration"
 msgstr "Obramowanie"
 
-#: src/aosd/aosd_ui.cc:864
+#: src/aosd/aosd_ui.cc:975
 msgid "Trigger"
 msgstr "Wyzwalanie"
 
-#: src/aosd/aosd_ui.cc:869
+#: src/aosd/aosd_ui.cc:980 src/streamtuner/shoutcast-model.cc:202
 msgid "Misc"
 msgstr "Różne"
 
-#: src/aosd/aosd_ui.cc:878
+#: src/aosd/aosd_ui.cc:989
 msgid "Test"
 msgstr "Przetestuj"
 
@@ -795,11 +575,97 @@
 msgid "Audacious Playlists (audpl)"
 msgstr "Listy odtwarzania Audacious (audpl)"
 
-#: src/blur_scope/blur_scope.cc:42
+#: src/background_music/background_music.cc:24
+msgid "Background music"
+msgstr "Muzyka w tle"
+
+#: src/background_music/background_music.cc:25
+msgid "Target level:"
+msgstr "Poziom docelowy:"
+
+#: src/background_music/background_music.cc:28
+#: src/background_music/background_music.cc:33
+#: src/silence-removal/silence-removal.cc:70
+msgid "dB"
+msgstr "dB"
+
+#: src/background_music/background_music.cc:29
+msgid "Maximum amplification:"
+msgstr "Maksymalne wzmocnienie:"
+
+#: src/background_music/background_music.cc:34 src/mpg123/mpg123.cc:81
+msgid "Advanced"
+msgstr "Zaawansowane"
+
+#: src/background_music/background_music.cc:36
+msgid "Slow detection weight:"
+msgstr "Waga powolnego wykrywania:"
+
+#: src/background_music/background_music.cc:39
+msgid "Hint"
+msgstr "Wskazówka"
+
+#: src/background_music/background_music.cc:41
+msgid ""
+"Slow detection weight is the relative weight\n"
+"of a long term average detection when compared\n"
+"to the actual, faster loudness detection.\n"
+"A value of zero gives a more radio-like sound\n"
+"where soft passages get \"pulled up\" more quickly,\n"
+"a value of two makes the sound feel less compressed."
+msgstr ""
+"Waga powolnej detekcji to względna waga\n"
+"długoterminowej średniej detekcji w porównaniu\n"
+"z rzeczywistą, szybszą detekcją głośności. Wartość\n"
+"zero daje dźwięk bardziej przypominający radio, w którym\n"
+"miękkie pasaże są szybciej „podciągane”, natomiast wartość\n"
+"dwa sprawia, że dźwięk jest mniej skompresowany."
+
+#: src/background_music/background_music.cc:52
+msgid ""
+"Background Music Plugin for Audacious\n"
+"Copyright 2023;2024 Michel Fleur\n"
+"\n"
+"Controls the volume to make the sound equally loud within and between "
+"tracks.\n"
+" It uses accurate loudness measurement and tries to make the volume changes "
+"sound natural without audible peaks, yet without lowering the volume before "
+"a peak in advance."
+msgstr ""
+"Wtyczka muzyki w tle dla Audaciousa\n"
+"Prawa autorskie 2023;2024 Michel Fleur\n"
+"\n"
+"Steruje głośnością, aby dźwięk był jednakowo głośny w obrębie utworów i "
+"pomiędzy nimi.\n"
+"Wykorzystuje dokładny pomiar głośności i stara się, aby zmiany głośności "
+"brzmiały naturalnie, bez słyszalnych szczytów, ale bez wcześniejszego "
+"obniżania głośności przed szczytem."
+
+#: src/background_music/background_music.cc:61
+msgid "Background Music"
+msgstr "Muzyka w tle"
+
+#: src/bitcrusher/bitcrusher.cc:33
+msgid "Bitcrusher"
+msgstr "Kruszarka bitów"
+
+#: src/bitcrusher/bitcrusher.cc:34
+msgid "Bit Depth:"
+msgstr "Głębia bitowa:"
+
+#: src/bitcrusher/bitcrusher.cc:37
+msgid "Downsample ratio:"
+msgstr "Współczynnik próbkowania w dół:"
+
+#: src/bitcrusher/bitcrusher.cc:48
+msgid "Bitcrusher"
+msgstr "Kruszarka bitów"
+
+#: src/blur_scope/blur_scope.cc:40 src/blur_scope-qt/blur_scope.cc:45
 msgid "Color"
 msgstr "Kolor"
 
-#: src/blur_scope/blur_scope.cc:58
+#: src/blur_scope/blur_scope.cc:56 src/blur_scope-qt/blur_scope.cc:158
 msgid "Blur Scope"
 msgstr "Rozmyty zakres"
 
@@ -811,6 +677,10 @@
 msgid "Presets:"
 msgstr "Profile ustawień:"
 
+#: src/bs2b/plugin.cc:130
+msgid "Default"
+msgstr "Domyślny"
+
 #: src/bs2b/plugin.cc:136
 msgid "Feed level:"
 msgstr "Poziom sygnału wejściowego:"
@@ -823,15 +693,15 @@
 msgid "Cut frequency:"
 msgstr "Częstotliwość obcięcia:"
 
-#: src/cairo-spectrum/cairo-spectrum.cc:41
+#: src/cairo-spectrum/cairo-spectrum.cc:42 src/qt-spectrum/qt-spectrum.cc:107
 msgid "Spectrum Analyzer"
 msgstr "Analizator spektrum"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:72
+#: src/cdaudio/cdaudio-ng.cc:74
 msgid "Audio CD Plugin"
 msgstr "Wtyczka Audio CD"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:121
+#: src/cdaudio/cdaudio-ng.cc:121
 msgid ""
 "Copyright (C) 2007-2012 Calin Crisan <ccrisan@gmail.com> and others.\n"
 "\n"
@@ -852,132 +722,132 @@
 "\n"
 "Zrealizowano w ramach programu Google Summer of Code 2007."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:137
+#: src/cdaudio/cdaudio-ng.cc:140
 msgid "Device"
 msgstr "Urządzenie"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:138
+#: src/cdaudio/cdaudio-ng.cc:141
 msgid "Read speed:"
 msgstr "Prędkość odczytu:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:141
+#: src/cdaudio/cdaudio-ng.cc:144
 msgid "Override device:"
 msgstr "Zastąp urządzenie:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:143
+#: src/cdaudio/cdaudio-ng.cc:146
 msgid "Metadata"
 msgstr "Metadane"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:144
+#: src/cdaudio/cdaudio-ng.cc:147
 msgid "Use CD-Text"
 msgstr "Użyj CD-Tekstu"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:146
+#: src/cdaudio/cdaudio-ng.cc:150
 msgid "Use CDDB"
 msgstr "Użyj CDDB"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:148
+#: src/cdaudio/cdaudio-ng.cc:152
 msgid "Use HTTP instead of CDDBP"
 msgstr "Używanie protokołu HTTP zamiast CDDBP"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:151
+#: src/cdaudio/cdaudio-ng.cc:155
 msgid "Server:"
 msgstr "Serwer:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:155
+#: src/cdaudio/cdaudio-ng.cc:159
 msgid "Path:"
 msgstr "Ścieżka:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:159
+#: src/cdaudio/cdaudio-ng.cc:163
 msgid "Port:"
 msgstr "Port:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:246
+#: src/cdaudio/cdaudio-ng.cc:228
 msgid "Failed to initialize cdio subsystem."
 msgstr "Nie udało się zainicjalizować podsystemu cdio."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:281
+#: src/cdaudio/cdaudio-ng.cc:260
 #, c-format
 msgid "Invalid URI %s."
 msgstr "Nieprawidłowy URI %s."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:283
+#: src/cdaudio/cdaudio-ng.cc:262
 #, c-format
 msgid "Track %d not found."
 msgstr "Ścieżka %d nie znaleziona."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:285
+#: src/cdaudio/cdaudio-ng.cc:264
 #, c-format
 msgid "Track %d is a data track."
 msgstr "Ścieżka %d jest ścieżką danych."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:360
+#: src/cdaudio/cdaudio-ng.cc:339
 msgid "Error reading audio CD."
 msgstr "Wystąpił błąd przy odczycie płyty CD Audio."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:429
+#: src/cdaudio/cdaudio-ng.cc:410
 msgid "Audio CD"
 msgstr "Audio CD"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:460 src/cdaudio-ng/cdaudio-ng.cc:469
+#: src/cdaudio/cdaudio-ng.cc:446 src/cdaudio/cdaudio-ng.cc:455
 #, c-format
 msgid "Failed to open CD device %s."
 msgstr "Nie udało się otworzyć urządzenia CD %s."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:472
+#: src/cdaudio/cdaudio-ng.cc:458
 msgid "No audio capable CD drive found."
 msgstr "Nie znaleziono napędu CD."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:497
+#: src/cdaudio/cdaudio-ng.cc:481
+msgid "Drive is empty."
+msgstr "Brak płyty w napędzie."
+
+#: src/cdaudio/cdaudio-ng.cc:483
+msgid "Unsupported disk type."
+msgstr "Nieobsługiwany rodzaj płyty."
+
+#: src/cdaudio/cdaudio-ng.cc:507
 msgid "Failed to finish initializing opened CD drive."
 msgstr "Nie udało się zainicjalizować otwarcia napędu CD."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:510
+#: src/cdaudio/cdaudio-ng.cc:520
 msgid "Failed to retrieve first/last track number."
 msgstr "Nie udało się odzyskać pierwszego/ostatniego numeru ścieżki."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:531
+#: src/cdaudio/cdaudio-ng.cc:541
 #, 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.cc:613
-msgid "Failed to create the cddb connection."
-msgstr "Nie udało się połączyć z cddb."
+#: src/cdaudio/cdaudio-ng.cc:624
+msgid "Failed to create the CDDB connection."
+msgstr "Nie udało się połączyć z CDDB."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:679
+#: src/cdaudio/cdaudio-ng.cc:690
 msgid "Failed to query the CDDB server"
-msgstr "Nie udało się uzyskać odpowiedzi z serwera cddb."
+msgstr "Nie udało się uzyskać odpowiedzi z serwera CDDB"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:681
+#: src/cdaudio/cdaudio-ng.cc:692
 #, c-format
 msgid "Failed to query the CDDB server: %s"
-msgstr "Nie udało się uzyskać odpowiedzi z serwera cddb: %s"
+msgstr "Nie udało się uzyskać odpowiedzi z serwera CDDB: %s"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:705
+#: src/cdaudio/cdaudio-ng.cc:716
 #, 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.cc:765
-msgid "Drive is empty."
-msgstr "Brak płyty w napędzie."
+msgid "Failed to read the CDDB info: %s"
+msgstr "Nie udało się odczytać informacji z CDDB: %s"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:767
-msgid "Unsupported disk type."
-msgstr "Nieobsługiwany rodzaj płyty."
-
-#: src/cd-menu-items/cd-menu-items.cc:35
+#: src/cd-menu-items/cd-menu-items.cc:33
 msgid "Audio CD Menu Items"
 msgstr "Pozycje menu Audio CD"
 
-#: src/cd-menu-items/cd-menu-items.cc:47
-msgid "Play CD"
-msgstr "Odtwórz płytę CD"
-
-#: src/cd-menu-items/cd-menu-items.cc:47
-msgid "Add CD"
-msgstr "Dodaj płytę CD"
+#: src/cd-menu-items/cd-menu-items.cc:45
+msgid "Pla_y CD"
+msgstr "_Odtwórz płytę CD"
+
+#: src/cd-menu-items/cd-menu-items.cc:45
+msgid "_Add CD"
+msgstr "_Dodaj płytę CD"
 
 #: src/compressor/compressor.cc:45
 msgid "Compression"
@@ -996,7 +866,7 @@
 "Dynamic Range Compression Plugin for Audacious\n"
 "Copyright 2010-2014 John Lindgren"
 msgstr ""
-"Wtyczka kompresora zakresu dynamicznego dla Audacious\n"
+"Wtyczka kompresora zakresu dynamicznego dla Audaciousa\n"
 "Prawa autorskie 2010-2014 John Lindgren"
 
 #: src/compressor/compressor.cc:64
@@ -1033,9 +903,16 @@
 
 #: src/console/plugin.cc:39
 msgid "Default song length:"
-msgstr "Domyślny czas trwania ścieżki:"
+msgstr "Domyślna długość piosenki:"
 
-#: src/console/plugin.cc:42 src/modplug/plugin_main.cc:59
+#: src/console/plugin.cc:41 src/crossfade/crossfade.cc:56
+#: src/crossfade/crossfade.cc:62 src/lirc/lirc.cc:395 src/notify/notify.cc:113
+#: src/sid/xs_config.cc:85 src/sid/xs_config.cc:94 src/sid/xs_config.cc:103
+#: src/vumeter-qt/vumeter_qt.cc:39
+msgid "seconds"
+msgstr "sekundy"
+
+#: src/console/plugin.cc:42 src/modplug/plugin_main.cc:58
 msgid "Resampling"
 msgstr ""
 "Konwersja częstotliwości\n"
@@ -1061,57 +938,84 @@
 msgid "Game Console Music Decoder"
 msgstr "Dekoder muzyki z konsol gier"
 
-#: src/coreaudio/coreaudio.cc:50
+#: src/coreaudio/coreaudio.cc:53
 msgid "CoreAudio output"
 msgstr "Wyjście CoreAudio"
 
-#: src/coreaudio/coreaudio.cc:131
+#: src/coreaudio/coreaudio.cc:155
 msgid ""
 "CoreAudio Output Plugin for Audacious\n"
 "Copyright 2014 William Pitcock\n"
+"Copyright 2017,18 René J.V. Bertin\n"
+" (original code and code adapted from\n"
+" Apple examples, (C) Apple 2013)\n"
 "\n"
 "Based on SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
 msgstr ""
-"Wtyczka wyjście CoreAudio dla Audacious\n"
+"Wtyczka wyjścia CoreAudio dla Audaciousa\n"
 "Prawa autorskie 2014 William Pitcock\n"
+"Prawa autorskie 2017,18 René J.V. Bertin\n"
+" (oryginalny kod i kod dostosowany z\n"
+" przykładów Apple, (C) Apple 2013)\n"
 "\n"
-"Oparta na wtyczce wyjścia SDL dla Audacious\n"
+"Oparta na wtyczce wyjścia SDL dla Audaciousa\n"
 "Prawa autorskie 2010 John Lindgren"
 
-#: src/coreaudio/coreaudio.cc:143
+#: src/coreaudio/coreaudio.cc:171
 msgid "Use exclusive mode"
 msgstr "Użyj trybu wyłączności"
 
-#: src/crossfade/crossfade.cc:44
+#: src/coreaudio/coreaudio.cc:173
+msgid "Use bit perfect audio (adapt device sampling rate)"
+msgstr ""
+"Użyj dźwięku bit perfect (dostosuj częstotliwość próbkowania urządzenia)"
+
+#: src/crossfade/crossfade.cc:47
 msgid ""
 "Crossfade Plugin for Audacious\n"
 "Copyright 2010-2014 John Lindgren"
 msgstr ""
-"Wtyczka przenikania ścieżek dla Audacious\n"
+"Wtyczka przenikania ścieżek dla Audaciousa\n"
 "Prawa autorskie 2010-2014 John Lindgren"
 
-#: src/crossfade/crossfade.cc:48
+#: src/crossfade/crossfade.cc:51
 msgid "Crossfade"
 msgstr "Przenikanie ścieżek"
 
-#: src/crossfade/crossfade.cc:49
+#: src/crossfade/crossfade.cc:52
 msgid "On automatic song change"
 msgstr "Przy automatycznej zmianie piosenki"
 
-#: src/crossfade/crossfade.cc:51 src/crossfade/crossfade.cc:57
+#: src/crossfade/crossfade.cc:54 src/crossfade/crossfade.cc:60
 msgid "Overlap:"
 msgstr "Nakładanie się:"
 
-#: src/crossfade/crossfade.cc:55
+#: src/crossfade/crossfade.cc:58
 msgid "On seek or manual song change"
 msgstr "Przy wyszukiwaniu lub ręcznej zmianie piosenki"
 
-#: src/crossfade/crossfade.cc:61
+#: src/crossfade/crossfade.cc:64
+msgid "No fade in"
+msgstr "Bez zanikania"
+
+#: src/crossfade/crossfade.cc:66
+msgid "Use S-curve fade"
+msgstr "Użyj zanikania S-krzywą"
+
+#: src/crossfade/crossfade.cc:68
+msgid "S-curve steepness:"
+msgstr "Spadzistość S-krzywej:"
+
+#: src/crossfade/crossfade.cc:70
+msgid "(higher is steeper)"
+msgstr "(im wyżej, tym spadziściej)"
+
+#: src/crossfade/crossfade.cc:72
 msgid "Tip"
 msgstr "Podpowiedź"
 
-#: src/crossfade/crossfade.cc:62
+#: src/crossfade/crossfade.cc:73
 msgid ""
 "For better crossfading, enable\n"
 "the Silence Removal effect."
@@ -1119,29 +1023,10 @@
 "Dla lepszego przenikania ścieżek, \n"
 "włącz efekt usuwania ciszy."
 
-#: src/crossfade/crossfade.cc:72
+#: src/crossfade/crossfade.cc:83
 msgid "Crossfade"
 msgstr "Przenikanie ścieżek"
 
-#: src/crossfade/crossfade.cc:161
-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 ""
-"Przenikanie ścieżek 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.cc:168
-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 przenikania ścieżek 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/crystalizer/crystalizer.cc:31
 msgid "Crystalizer"
 msgstr "Krystaliczność"
@@ -1154,60 +1039,61 @@
 msgid "Crystalizer"
 msgstr "Krystalizator"
 
-#: src/cue/cue.cc:37
+#: src/cue/cue.cc:42
 msgid "Cue Sheet Plugin"
 msgstr "Wtyczka Cue Sheet"
 
-#: src/delete-files/delete-files.cc:46 src/delete-files/delete-files.cc:146
+#: src/delete-files/delete-files.cc:53 src/delete-files/delete-files.cc:215
+#: src/delete-files/delete-files.cc:230
 msgid "Delete Files"
 msgstr "Usuń pliki"
 
-#: src/delete-files/delete-files.cc:75
+#: src/delete-files/delete-files.cc:120
+msgid "No files are selected."
+msgstr "Nie zaznaczono żadnych plików."
+
+#: src/delete-files/delete-files.cc:125
 #, c-format
-msgid "Error moving %s to trash: %s."
-msgstr "Nie udało się przenieść %s do kosza: %s."
+msgid "Do you want to move %s to the trash?"
+msgstr "Czy chcesz przenieść %s do kosza?"
 
-#: src/delete-files/delete-files.cc:86
+#: src/delete-files/delete-files.cc:126
 #, c-format
-msgid "Error deleting %s: %s."
-msgstr "Nie udało się usunąć %s: %s."
+msgid "Do you want to permanently delete %s?"
+msgstr "Czy chcesz trwale usunąć %s?"
 
-#: src/delete-files/delete-files.cc:117
+#: src/delete-files/delete-files.cc:133
 #, c-format
-msgid "Error deleting %s: not a local file."
-msgstr "Nie udało się usunąć %s: to nie jest plik lokalny."
+msgid "Do you want to move %d files to the trash?"
+msgstr "Czy chcesz przenieść plików %d do kosza?"
 
 #: src/delete-files/delete-files.cc:134
-msgid "Do you want to move the selected files to the trash?"
-msgstr "Czy chcesz usunąć zaznaczone pliki do kosza?"
+#, c-format
+msgid "Do you want to permanently delete %d files?"
+msgstr "Czy chcesz całkowicie usunąć plików %d?"
 
-#: src/delete-files/delete-files.cc:135
-msgid "Move to Trash"
-msgstr "Przesuń do kosza"
-
-#: src/delete-files/delete-files.cc:140
-msgid "Do you want to permanently delete the selected files?"
-msgstr "Czy chcesz całkowicie usunąć zaznaczone pliki?"
+#: src/delete-files/delete-files.cc:146
+msgid "Move to trash"
+msgstr "Przenieś do kosza"
 
-#: src/delete-files/delete-files.cc:141 src/skins/preset-list.cc:411
-#: src/skins/preset-list.cc:427
+#: src/delete-files/delete-files.cc:146
 msgid "Delete"
 msgstr "Usuń"
 
-#: src/delete-files/delete-files.cc:145 src/skins/preset-browser.cc:56
-#: src/skins/preset-list.cc:307 src/skins/ui_playlist.cc:221
+#: src/delete-files/delete-files.cc:213 src/delete-files/delete-files.cc:235
+#: src/skins-qt/search-select.cc:102 src/skins/search-select.cc:78
 msgid "Cancel"
 msgstr "Anuluj"
 
-#: src/delete-files/delete-files.cc:166
+#: src/delete-files/delete-files.cc:267
 msgid "Delete Selected Files"
 msgstr "Usuń zaznaczone pliki"
 
-#: src/delete-files/delete-files.cc:181
+#: src/delete-files/delete-files.cc:287
 msgid "Delete Method"
 msgstr "Sposób usuwania"
 
-#: src/delete-files/delete-files.cc:182
+#: src/delete-files/delete-files.cc:288
 msgid "Move to trash instead of deleting immediately"
 msgstr "Przesuń do kosza zamiast kasować"
 
@@ -1221,20 +1107,20 @@
 "Wtyczka echa\n"
 "Autor: Johan Levin, 1999\n"
 "Otaczające echo autorstwa Carla van Schaika, 1999\n"
-"Zaktualizowano dla potrzeb Audacious przez Williama Pitcocka i Johna "
+"Zaktualizowano dla potrzeb Audaciousa przez Williama Pitcocka i Johna "
 "Lindgrena, 2010-2014"
 
 #: src/echo_plugin/echo.cc:21
 msgid "Echo"
 msgstr "Echo"
 
-#: src/echo_plugin/echo.cc:22 src/modplug/plugin_main.cc:73
-#: src/modplug/plugin_main.cc:83
+#: src/echo_plugin/echo.cc:22 src/modplug/plugin_main.cc:72
+#: src/modplug/plugin_main.cc:82
 msgid "Delay:"
 msgstr "Opóźnienie:"
 
-#: src/echo_plugin/echo.cc:24 src/modplug/plugin_main.cc:73
-#: src/modplug/plugin_main.cc:83
+#: src/echo_plugin/echo.cc:24 src/modplug/plugin_main.cc:72
+#: src/modplug/plugin_main.cc:82 src/xsf/plugin.cc:445
 msgid "ms"
 msgstr "ms"
 
@@ -1242,7 +1128,7 @@
 msgid "Feedback:"
 msgstr "Sprzężenie zwrotne:"
 
-#: src/echo_plugin/echo.cc:28 src/modplug/plugin_main.cc:87
+#: src/echo_plugin/echo.cc:28 src/modplug/plugin_main.cc:86
 msgid "Volume:"
 msgstr "Głośność:"
 
@@ -1250,11 +1136,11 @@
 msgid "Echo"
 msgstr "Echo"
 
-#: src/ffaudio/ffaudio-core.cc:41
+#: src/ffaudio/ffaudio-core.cc:50
 msgid "FFmpeg Plugin"
 msgstr "Wtyczka FFmpeg"
 
-#: src/ffaudio/ffaudio-core.cc:571
+#: src/ffaudio/ffaudio-core.cc:649
 msgid ""
 "Multi-format audio decoding plugin for Audacious using\n"
 "FFmpeg multimedia framework (http://www.ffmpeg.org/)\n"
@@ -1270,252 +1156,322 @@
 "William Pitcock <nenolod@nenolod.net>\n"
 "Matti Hämäläinen <ccr@tnsp.org>"
 
-#: src/filewriter/filewriter.cc:45
+#: src/filewriter/filewriter.cc:48
 msgid "FileWriter Plugin"
 msgstr "Zapis do pliku"
 
-#: src/filewriter/filewriter.cc:386
+#: src/filewriter/filewriter.cc:316
+#, c-format
+msgid ""
+"Error opening %s:\n"
+"%s"
+msgstr ""
+"Błąd otwierania %s:\n"
+"%s"
+
+#: src/filewriter/filewriter.cc:358
+msgid ""
+"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 ""
+"Niniejszy program jest wolnym oprogramowaniem; możesz go rozprowadzać dalej "
+"i/lub modyfikować na warunkach Powszechnej Licencji Publicznej GNU, wydanej "
+"przez Fundację Wolnego Oprogramowania - według wersji 2-giej tej Licencji "
+"lub którejś z późniejszych wersji.\n"
+"\n"
+"Niniejszy program rozpowszechniany jest z nadzieją, iż będzie on użyteczny - "
+"jednak BEZ JAKIEJKOLWIEK GWARANCJI, nawet domyślnej gwarancji PRZYDATNOŚCI "
+"HANDLOWEJ albo PRZYDATNOŚCI DO OKREŚLONYCH ZASTOSOWAŃ. W celu uzyskania "
+"bliższych informacji - Powszechna Licencja Publiczna GNU.\n"
+"\n"
+"Z pewnością wraz z niniejszym programem otrzymałeś też egzemplarz "
+"Powszechnej Licencji Publicznej GNU (GNU General Public License); jeśli nie "
+"- napisz do Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, "
+"Boston, MA 02110-1301, USA."
+
+#: src/filewriter/filewriter.cc:385
 msgid "Output file format:"
 msgstr "Format pliku wyjściowego:"
 
-#: src/filewriter/filewriter.cc:403
-msgid "Configure"
-msgstr "Konfiguruj"
-
-#: src/filewriter/filewriter.cc:413
+#: src/filewriter/filewriter.cc:389
 msgid "Save into original directory"
 msgstr "Zapisywanie w pierwotnym położeniu"
 
-#: src/filewriter/filewriter.cc:417
-msgid "Save into custom directory"
-msgstr "Zapisywanie we własnym położeniu"
-
-#: src/filewriter/filewriter.cc:427
-msgid "Output file folder:"
-msgstr "Położenie pliku docelowego:"
+#: src/filewriter/filewriter.cc:392
+msgid "Save into custom directory:"
+msgstr "Zapisywanie we własnym położeniu:"
 
-#: src/filewriter/filewriter.cc:431
-msgid "Pick a folder"
-msgstr "Wybór katalogu"
-
-#: src/filewriter/filewriter.cc:444
+#: src/filewriter/filewriter.cc:400
 msgid "Generate file name from:"
 msgstr "Utwórz nazwę pliku z:"
 
-#: src/filewriter/filewriter.cc:448
-msgid "Original file tag"
-msgstr "Pierwotny znacznik pliku"
-
-#: src/filewriter/filewriter.cc:453
+#: src/filewriter/filewriter.cc:401
 msgid "Original file name"
 msgstr "Pierwotna nazwa pliku"
 
-#: src/filewriter/filewriter.cc:459
-msgid "Include original file name extension"
-msgstr "Dołączenie rozszerzenia pierwotnej nazwy pliku"
+#: src/filewriter/filewriter.cc:404
+msgid "Original file name (no suffix)"
+msgstr "Pierwotna nazwa pliku (brak sufiksu)"
+
+#: src/filewriter/filewriter.cc:407
+msgid "Original file tag"
+msgstr "Pierwotny tag pliku"
 
-#: src/filewriter/filewriter.cc:468
+#: src/filewriter/filewriter.cc:411
 msgid "Prepend track number to file name"
 msgstr "Dodanie do nazwy pliku numeru ścieżki"
 
-#: src/filewriter/filewriter.cc:484
-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 ""
-"Niniejszy program jest wolnym oprogramowaniem; możesz go \n"
-"rozprowadzać dalej i/lub modyfikować na warunkach Powszechnej\n"
-"Licencji Publicznej GNU, wydanej przez Fundację Wolnego\n"
-"Oprogramowania - według wersji 2-giej tej Licencji lub którejś\n"
-"z późniejszych wersji.\n"
-"\n"
-"Niniejszy program rozpowszechniany jest z nadzieją, iż będzie on \n"
-"użyteczny - jednak BEZ JAKIEJKOLWIEK GWARANCJI, nawet domyślnej \n"
-"gwarancji PRZYDATNOŚCI HANDLOWEJ albo PRZYDATNOŚCI DO OKREŚLONYCH \n"
-"ZASTOSOWAŃ. W celu uzyskania bliższych informacji - Powszechna \n"
-"Licencja Publiczna GNU.\n"
-"\n"
-"Z pewnością wraz z niniejszym programem otrzymałeś też egzemplarz \n"
-"Powszechnej Licencji Publicznej GNU (GNU General Public License);\n"
-"jeśli nie - napisz do Free Software Foundation, Inc., 51 Franklin Street, "
-"Fifth Floor, Boston, MA 02110-1301,\n"
-"USA."
-
-#: src/filewriter/mp3.cc:40 src/filewriter/mp3.cc:717
+#: src/filewriter/filewriter.cc:417 src/filewriter/filewriter.cc:449
 msgid "Auto"
 msgstr "Automatycznie"
 
-#: src/filewriter/mp3.cc:40
+#: src/filewriter/filewriter.cc:418
+msgid "8000 Hz"
+msgstr "8000 Hz"
+
+#: src/filewriter/filewriter.cc:419
+msgid "11025 Hz"
+msgstr "11025 Hz"
+
+#: src/filewriter/filewriter.cc:420
+msgid "12000 Hz"
+msgstr "12000 Hz"
+
+#: src/filewriter/filewriter.cc:421
+msgid "16000 Hz"
+msgstr "16000 Hz"
+
+#: src/filewriter/filewriter.cc:422
+msgid "22050 Hz"
+msgstr "22050 Hz"
+
+#: src/filewriter/filewriter.cc:423
+msgid "24000 Hz"
+msgstr "24000 Hz"
+
+#: src/filewriter/filewriter.cc:424
+msgid "32000 Hz"
+msgstr "32000 Hz"
+
+#: src/filewriter/filewriter.cc:425 src/xsf/plugin.cc:430
+msgid "44100 Hz"
+msgstr "44100 Hz"
+
+#: src/filewriter/filewriter.cc:426 src/xsf/plugin.cc:431
+msgid "48000 Hz"
+msgstr "48000 Hz"
+
+#: src/filewriter/filewriter.cc:430
+msgid "8 kbit/s"
+msgstr "8 kbit/s"
+
+#: src/filewriter/filewriter.cc:431
+msgid "16 kbit/s"
+msgstr "16 kbit/s"
+
+#: src/filewriter/filewriter.cc:432
+msgid "32 kbit/s"
+msgstr "32 kbit/s"
+
+#: src/filewriter/filewriter.cc:433
+msgid "40 kbit/s"
+msgstr "40 kbit/s"
+
+#: src/filewriter/filewriter.cc:434
+msgid "48 kbit/s"
+msgstr "48 kbit/s"
+
+#: src/filewriter/filewriter.cc:435
+msgid "56 kbit/s"
+msgstr "56 kbit/s"
+
+#: src/filewriter/filewriter.cc:436
+msgid "64 kbit/s"
+msgstr "64 kbit/s"
+
+#: src/filewriter/filewriter.cc:437
+msgid "80 kbit/s"
+msgstr "80 kbit/s"
+
+#: src/filewriter/filewriter.cc:438
+msgid "96 kbit/s"
+msgstr "96 kbit/s"
+
+#: src/filewriter/filewriter.cc:439
+msgid "112 kbit/s"
+msgstr "112 kbit/s"
+
+#: src/filewriter/filewriter.cc:440
+msgid "128 kbit/s"
+msgstr "128 kbit/s"
+
+#: src/filewriter/filewriter.cc:441
+msgid "160 kbit/s"
+msgstr "160 kbit/s"
+
+#: src/filewriter/filewriter.cc:442
+msgid "192 kbit/s"
+msgstr "192 kbit/s"
+
+#: src/filewriter/filewriter.cc:443
+msgid "224 kbit/s"
+msgstr "224 kbit/s"
+
+#: src/filewriter/filewriter.cc:444
+msgid "256 kbit/s"
+msgstr "256 kbit/s"
+
+#: src/filewriter/filewriter.cc:445
+msgid "320 kbit/s"
+msgstr "320 kbit/s"
+
+#: src/filewriter/filewriter.cc:450
 msgid "Joint Stereo"
 msgstr "Połączone stereo"
 
-#: src/filewriter/mp3.cc:41 src/modplug/plugin_main.cc:58
-#: src/mpg123/mpg123.cc:248
+#: src/filewriter/filewriter.cc:451 src/modplug/plugin_main.cc:57
+#: src/mpg123/mpg123.cc:259
 msgid "Stereo"
 msgstr "Stereo"
 
-#: src/filewriter/mp3.cc:41 src/modplug/plugin_main.cc:57
-#: src/mpg123/mpg123.cc:248
+#: src/filewriter/filewriter.cc:452 src/modplug/plugin_main.cc:56
+#: src/mpg123/mpg123.cc:260
 msgid "Mono"
 msgstr "Mono"
 
-#: src/filewriter/mp3.cc:657
-msgid "MP3 Configuration"
-msgstr "Konfiguracja kodera MP3"
-
-#: src/filewriter/mp3.cc:658
-msgid "_OK"
-msgstr "_OK"
+#: src/filewriter/filewriter.cc:456
+msgid "VBR"
+msgstr "VBR"
+
+#: src/filewriter/filewriter.cc:457
+msgid "ABR"
+msgstr "ABR"
 
-#: src/filewriter/mp3.cc:681
-msgid "Algorithm Quality:"
+#: src/filewriter/filewriter.cc:478
+msgid "Algorithm quality:"
 msgstr "Jakość algorytmu:"
 
-#: src/filewriter/mp3.cc:706
-msgid "Output Sample Rate:"
-msgstr "Wyjściowa częstotliwość próbkowania:"
-
-#: src/filewriter/mp3.cc:733
-msgid "(Hz)"
-msgstr "(Hz)"
-
-#: src/filewriter/mp3.cc:740
-msgid "Bitrate / Compression Ratio:"
-msgstr "Tempo bitowe / współczynnik kompresji:"
-
-#: src/filewriter/mp3.cc:764
-msgid "Bitrate (kbps):"
-msgstr "Tempo transmisji (kb/s):"
+#: src/filewriter/filewriter.cc:484
+msgid "Bitrate:"
+msgstr "Bitrate:"
 
-#: src/filewriter/mp3.cc:796
+#: src/filewriter/filewriter.cc:491
 msgid "Compression ratio:"
 msgstr "Współczynnik kompresji:"
 
-#: src/filewriter/mp3.cc:820
-msgid "Audio Mode:"
-msgstr "Kanały:"
-
-#: src/filewriter/mp3.cc:845
-msgid "Miscellaneous:"
-msgstr "Różne:"
+#: src/filewriter/filewriter.cc:498
+msgid "Audio mode:"
+msgstr "Tryb audio:"
 
-#: src/filewriter/mp3.cc:856
+#: src/filewriter/filewriter.cc:501
 msgid "Enforce strict ISO compliance"
 msgstr "Wymuszenie ścisłej zgodności z ISO"
 
-#: src/filewriter/mp3.cc:867
+#: src/filewriter/filewriter.cc:503
 msgid "Error protection"
 msgstr "Zabezpieczenie przed błędami"
 
-#: src/filewriter/mp3.cc:879 src/filewriter/vorbis.cc:206
-msgid "Quality"
-msgstr "Jakość"
-
-#: src/filewriter/mp3.cc:888
+#: src/filewriter/filewriter.cc:508
 msgid "Enable VBR/ABR"
 msgstr "Włączenie"
 
-#: src/filewriter/mp3.cc:898
+#: src/filewriter/filewriter.cc:510
 msgid "Type:"
 msgstr "Rodzaj:"
 
-#: src/filewriter/mp3.cc:931
-msgid "VBR Options:"
-msgstr "Zmienne tempo transmisji (VBR):"
-
-#: src/filewriter/mp3.cc:947
-msgid "Minimum bitrate (kbps):"
-msgstr "Minimalna wartość (kb/s):"
-
-#: src/filewriter/mp3.cc:973
-msgid "Maximum bitrate (kbps):"
-msgstr "Maksymalna wartość (kb/s):"
-
-#: src/filewriter/mp3.cc:995
-msgid "Strictly enforce minimum bitrate"
-msgstr "Wymuszenie wartości minimalnej"
-
-#: src/filewriter/mp3.cc:1007
-msgid "ABR Options:"
-msgstr "Średnie tempo transmisji (ABR):"
-
-#: src/filewriter/mp3.cc:1017
-msgid "Average bitrate (kbps):"
-msgstr "Średnia wartość (kb/s):"
+#: src/filewriter/filewriter.cc:514
+msgid "Minimum bitrate:"
+msgstr "Minimalny bitrate:"
+
+#: src/filewriter/filewriter.cc:518
+msgid "Maximum bitrate:"
+msgstr "Maksymalny bitrate:"
+
+#: src/filewriter/filewriter.cc:522
+msgid "Average bitrate:"
+msgstr "Średni bitrate:"
 
-#: src/filewriter/mp3.cc:1044
+#: src/filewriter/filewriter.cc:526
 msgid "VBR quality level:"
 msgstr "Jakość algorytmu VBR:"
 
-#: src/filewriter/mp3.cc:1063
+#: src/filewriter/filewriter.cc:530
+msgid "Strictly enforce minimum bitrate"
+msgstr "Wymuszenie wartości minimalnej"
+
+#: src/filewriter/filewriter.cc:533
 msgid "Omit Xing VBR header"
 msgstr "Pominięcie nagłówka Xing VBR"
 
-#: src/filewriter/mp3.cc:1076
-msgid "VBR/ABR"
-msgstr "VBR/ABR"
-
-#: src/filewriter/mp3.cc:1085
-msgid "Frame Parameters:"
-msgstr "Parametry klatek:"
+#: src/filewriter/filewriter.cc:539
+msgid "Frame Headers"
+msgstr "Nagłówki ramki"
 
-#: src/filewriter/mp3.cc:1097
+#: src/filewriter/filewriter.cc:540
 msgid "Mark as copyright"
 msgstr "Oznaczenie prawem autorskim"
 
-#: src/filewriter/mp3.cc:1108
+#: src/filewriter/filewriter.cc:542
 msgid "Mark as original"
 msgstr "Oznaczenie jako oryginalne"
 
-#: src/filewriter/mp3.cc:1120
-msgid "ID3 Parameters:"
-msgstr "Parametry ID3:"
+#: src/filewriter/filewriter.cc:544
+msgid "ID3 Tags"
+msgstr "Tagi ID3"
 
-#: src/filewriter/mp3.cc:1131
+#: src/filewriter/filewriter.cc:545
 msgid "Force addition of version 2 tag"
 msgstr "Wymuś dodawanie tagów wersji 2"
 
-#: src/filewriter/mp3.cc:1141
+#: src/filewriter/filewriter.cc:547
 msgid "Only add v1 tag"
 msgstr "Dodawanie tagów tylko wersji 1"
 
-#: src/filewriter/mp3.cc:1148
+#: src/filewriter/filewriter.cc:549
 msgid "Only add v2 tag"
 msgstr "Dodawanie tagów tylko wersji 2"
 
-#: src/filewriter/mp3.cc:1169
+#: src/filewriter/filewriter.cc:554
+msgid "Quality"
+msgstr "Jakość"
+
+#: src/filewriter/filewriter.cc:555
+msgid "VBR/ABR"
+msgstr "VBR/ABR"
+
+#: src/filewriter/filewriter.cc:556
 msgid "Tags"
-msgstr "Znaczniki"
+msgstr "Tagi"
 
-#: src/filewriter/vorbis.cc:196
-msgid "Vorbis Encoder Configuration"
-msgstr "Konfiguracja kodera Vorbis"
+#: src/filewriter/filewriter.cc:566
+msgid "Quality (0-1):"
+msgstr "Jakość (0-1):"
 
-#: src/filewriter/vorbis.cc:219
-msgid "Quality level (0 - 10):"
-msgstr "Jakość (0 - 10):"
+#: src/filewriter/filewriter.cc:573 src/skins-qt/skins_cfg.cc:307
+#: src/skins/skins_cfg.cc:289
+msgid "General"
+msgstr "Ogólne"
 
-#: src/flacng/flacng.h:35
+#: src/flac/flacng.h:36
 msgid "FLAC Decoder"
 msgstr "Dekoder FLAC"
 
-#: src/flacng/metadata.cc:351 src/wavpack/wavpack.cc:209
+#: src/flac/metadata.cc:296 src/wavpack/wavpack.cc:215
 msgid "lossless"
 msgstr "bezstratna"
 
-#: src/flacng/plugin.cc:169
+#: src/flac/plugin.cc:214
 msgid ""
 "Original code by\n"
 "Ralf Ertzinger <ralf@skytale.net>\n"
@@ -1539,15 +1495,15 @@
 msgid "GIO Plugin"
 msgstr "Wtyczka GIO"
 
-#: src/gio/gio.cc:153
+#: src/gio/gio.cc:152
 msgid "Read-and-append mode not supported"
 msgstr "Tryb odczytu i dołączania nie jest obsługiwany"
 
-#: src/gio/gio.cc:166
+#: src/gio/gio.cc:165
 msgid "Invalid open mode"
 msgstr "Nieprawidłowy tryb otwierania"
 
-#: src/gl-spectrum/gl-spectrum.cc:51
+#: src/glspectrum/gl-spectrum.cc:52
 msgid ""
 "OpenGL Spectrum Analyzer for Audacious\n"
 "Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
@@ -1567,637 +1523,760 @@
 "\n"
 "Licencja: GPLv2+"
 
-#: src/gl-spectrum/gl-spectrum.cc:62
+#: src/glspectrum/gl-spectrum.cc:63 src/qtglspectrum/gl-spectrum.cc:53
 msgid "OpenGL Spectrum Analyzer"
 msgstr "Analizator spektrum OpenGL"
 
-#: src/gl-spectrum-qt/gl-spectrum.cc:41
-msgid ""
-"OpenGL Spectrum Analyzer for Audacious\n"
-"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
-"Copyright 2014 William Pitcock\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 spektrum OpenGL dla Audaciousa\n"
-"Prawa autorskie: 2013 Christophe Budé, John Lindgren i Carlo Bramini\n"
-"Prawa autorskie 2014 William Pitcock\n"
-"\n"
-"Na podstawie wtyczki XMMS-a:\n"
-"Prawa autorskie 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas "
-"Nilsson i 4Front Technologies\n"
-"\n"
-"Licencja: GPL wersja 2 i późniejsze"
-
-#: src/gl-spectrum-qt/gl-spectrum.cc:53
-msgid "OpenGL Spectrum Analyzer (Qt)"
-msgstr "Analizator spektrum OpenGL (Qt)"
-
-#: src/gnomeshortcuts/gnomeshortcuts.cc:38
-msgid "GNOME Shortcuts"
-msgstr "Skróty GNOME"
-
-#: src/gnomeshortcuts/gnomeshortcuts.cc:54
-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 ""
-"Wtyczka skrótów GNOME\n"
-"Umożliwia obsługę odtwarzacza za pomocą skrótów GNOME.\n"
-"\n"
-"Prawa autorskie (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>"
-
-#: src/gtkui/columns.cc:35
-msgid "Entry number"
+#: src/gtkui/columns.cc:36 src/moonstone/playlist_model.cc:38
+#: src/qtui/playlist_model.cc:33
+msgid "Entry Number"
 msgstr "Numer porządkowy"
 
-#: src/gtkui/columns.cc:36 src/playlist-manager/playlist-manager.cc:225
-#: src/qtui/playlist_model.cc:123
+#: src/gtkui/columns.cc:37 src/moonstone/playlist_model.cc:38
+#: src/moonstone/playlist_selection.cc:64
+#: src/playlist-manager/playlist-manager.cc:200
+#: src/playlist-manager-qt/playlist-manager-qt.cc:188
+#: src/qtui/playlist_model.cc:33 src/streamtuner/icecast-model.cc:120
+#: src/streamtuner/ihr-model.cc:159 src/streamtuner/shoutcast-model.cc:122
 msgid "Title"
 msgstr "Tytuł"
 
-#: src/gtkui/columns.cc:37 src/qtui/playlist_model.cc:125
+#: src/gtkui/columns.cc:38 src/moonstone/playlist_model.cc:39
+#: src/qtui/playlist_model.cc:33
 msgid "Artist"
 msgstr "Wykonawca"
 
-#: src/gtkui/columns.cc:38
+#: src/gtkui/columns.cc:39 src/moonstone/playlist_model.cc:39
+#: src/qtui/playlist_model.cc:33
 msgid "Year"
 msgstr "Rok"
 
-#: src/gtkui/columns.cc:39 src/qtui/playlist_model.cc:127
+#: src/gtkui/columns.cc:40 src/moonstone/playlist_model.cc:39
+#: src/qtui/playlist_model.cc:34
 msgid "Album"
 msgstr "Album"
 
-#: src/gtkui/columns.cc:40
-msgid "Album artist"
-msgstr "Artysta albumu"
+#: src/gtkui/columns.cc:41 src/moonstone/playlist_model.cc:40
+#: src/qtui/playlist_model.cc:34
+msgid "Album Artist"
+msgstr "Wykonawca albumu"
 
-#: src/gtkui/columns.cc:41
+#: src/gtkui/columns.cc:42 src/moonstone/playlist_model.cc:40
+#: src/qtui/playlist_model.cc:34
 msgid "Track"
-msgstr "Numer ścieżki"
+msgstr "Ścieżka"
 
-#: src/gtkui/columns.cc:42
+#: src/gtkui/columns.cc:43 src/moonstone/playlist_model.cc:40
+#: src/qtui/playlist_model.cc:34 src/streamtuner/icecast-model.cc:123
+#: src/streamtuner/shoutcast-model.cc:125
+#: src/streamtuner/shoutcast-model.cc:236
 msgid "Genre"
 msgstr "Gatunek"
 
-#: src/gtkui/columns.cc:43
-msgid "Queue position"
+#: src/gtkui/columns.cc:44 src/moonstone/playlist_model.cc:41
+#: src/qtui/playlist_model.cc:35
+msgid "Queue Position"
 msgstr "Pozycja w kolejce"
 
-#: src/gtkui/columns.cc:44
+#: src/gtkui/columns.cc:45 src/moonstone/playlist_model.cc:41
+#: src/qtui/playlist_model.cc:35
 msgid "Length"
 msgstr "Czas trwania"
 
-#: src/gtkui/columns.cc:45
-msgid "File path"
-msgstr "Położenie pliku"
-
-#: src/gtkui/columns.cc:47
-msgid "Custom title"
-msgstr "Własny tytuł (z ustawień)"
+#: src/gtkui/columns.cc:46 src/moonstone/playlist_model.cc:41
+#: src/qtui/playlist_model.cc:35
+msgid "File Path"
+msgstr "Ścieżka pliku"
+
+#: src/gtkui/columns.cc:47 src/moonstone/playlist_model.cc:42
+#: src/qtui/playlist_model.cc:35
+msgid "File Name"
+msgstr "Nazwa pliku"
 
-#: src/gtkui/columns.cc:48
+#: src/gtkui/columns.cc:48 src/moonstone/playlist_model.cc:42
+#: src/qtui/playlist_model.cc:36
+msgid "Custom Title"
+msgstr "Własny tytuł"
+
+#: src/gtkui/columns.cc:49 src/moonstone/playlist_model.cc:42
+#: src/qtui/playlist_model.cc:36 src/streamtuner/icecast-model.cc:129
+#: src/streamtuner/shoutcast-model.cc:134
 msgid "Bitrate"
 msgstr "Tempo transmisji"
 
-#: src/gtkui/columns.cc:308
+#: src/gtkui/columns.cc:50 src/moonstone/playlist_model.cc:43
+#: src/qtui/playlist_model.cc:36
+msgid "Comment"
+msgstr "Komentarz"
+
+#: src/gtkui/columns.cc:51 src/qtui/playlist_model.cc:36
+msgid "Publisher"
+msgstr "Wydawca"
+
+#: src/gtkui/columns.cc:52 src/qtui/playlist_model.cc:37
+msgid "Catalog Number"
+msgstr "Numer katalogowy"
+
+#: src/gtkui/columns.cc:53 src/moonstone/playlist_model.cc:43
+#: src/qtui/playlist_model.cc:37
+msgid "Disc"
+msgstr "Płyta"
+
+#: src/gtkui/columns.cc:325
 msgid "Available columns"
 msgstr "Dostępne kolumny"
 
-#: src/gtkui/columns.cc:334
+#: src/gtkui/columns.cc:351
 msgid "Displayed columns"
 msgstr "Wyświetlane kolumny"
 
-#: src/gtkui/layout.cc:72 src/search-tool/search-tool.cc:40
+#: src/gtkui/layout.cc:74 src/search-tool-qt/search-tool-qt.cc:58
+#: src/search-tool/search-tool.cc:49
 msgid "Search Tool"
 msgstr "Narzędzie wyszukiwania"
 
-#: src/gtkui/layout.cc:167
+#: src/gtkui/layout.cc:170
 msgid "Dock at Left"
 msgstr "Zaczep po lewej"
 
-#: src/gtkui/layout.cc:167
+#: src/gtkui/layout.cc:170
 msgid "Dock at Right"
 msgstr "Zaczep po prawej"
 
-#: src/gtkui/layout.cc:168
+#: src/gtkui/layout.cc:171
 msgid "Dock at Top"
 msgstr "Zaczep na górze"
 
-#: src/gtkui/layout.cc:168
+#: src/gtkui/layout.cc:171
 msgid "Dock at Bottom"
 msgstr "Zaczep na dole"
 
-#: src/gtkui/layout.cc:168
+#: src/gtkui/layout.cc:171
 msgid "Undock"
 msgstr "Odczep"
 
-#: src/gtkui/layout.cc:168 src/ladspa/plugin.cc:531
+#: src/gtkui/layout.cc:171 src/ladspa/plugin.cc:540
 msgid "Disable"
 msgstr "Wyłącz"
 
-#: src/gtkui/menus.cc:126 src/qtui/main_window_actions.cc:93
-#: src/statusicon/statusicon.cc:276
+#: src/gtkui/menus.cc:79 src/qtui/menus.cc:107
+#: src/statusicon-qt/statusicon.cc:115 src/statusicon/statusicon.cc:286
 msgid "_Open Files ..."
-msgstr "_Otwórz pliki ..."
+msgstr "_Otwórz pliki..."
 
-#: src/gtkui/menus.cc:127
+#: src/gtkui/menus.cc:80 src/qtui/menus.cc:111
 msgid "Open _URL ..."
-msgstr "Otwórz adres _URL ..."
+msgstr "Otwórz adres _URL..."
 
-#: src/gtkui/menus.cc:128 src/qtui/main_window_actions.cc:95
+#: src/gtkui/menus.cc:81 src/qtui/menus.cc:113
 msgid "_Add Files ..."
-msgstr "_Dodaj pliki ..."
+msgstr "_Dodaj pliki..."
 
-#: src/gtkui/menus.cc:129
+#: src/gtkui/menus.cc:82 src/qtui/menus.cc:118
 msgid "Add U_RL ..."
-msgstr "Dodaj adres U_RL ..."
+msgstr "Dodaj adres U_RL..."
 
-#: src/gtkui/menus.cc:131
+#: src/gtkui/menus.cc:84 src/qtui/menus.cc:120
 msgid "Search _Library"
 msgstr "_Wyszukaj w bibliotece"
 
-#: src/gtkui/menus.cc:133 src/qtui/main_window_actions.cc:98
+#: src/gtkui/menus.cc:86 src/qtui/menus.cc:123
 msgid "A_bout ..."
-msgstr "O _programie ..."
+msgstr "In_formacje o..."
 
-#: src/gtkui/menus.cc:134 src/qtui/main_window_actions.cc:99
+#: src/gtkui/menus.cc:87 src/qtui/menus.cc:125
 msgid "_Settings ..."
-msgstr "_Ustawienia"
+msgstr "_Ustawienia..."
 
-#: src/gtkui/menus.cc:135 src/qtui/main_window_actions.cc:103
-#: src/statusicon/statusicon.cc:284
+#: src/gtkui/menus.cc:88 src/qtui/menus.cc:131
+#: src/statusicon-qt/statusicon.cc:117 src/statusicon/statusicon.cc:288
 msgid "_Quit"
 msgstr "Za_kończ"
 
-#: src/gtkui/menus.cc:139 src/gtkui/menus.cc:262
-#: src/qtui/main_window_actions.cc:107 src/search-tool/search-tool.cc:641
-#: src/statusicon/statusicon.cc:278
+#: src/gtkui/menus.cc:92 src/gtkui/menus.cc:226
+#: src/moonstone/playlist_tabs.cc:306 src/qtui/menus.cc:135
+#: src/qtui/playlist_tabs.cc:331 src/search-tool-qt/search-tool-qt.cc:499
+#: src/search-tool/search-tool.cc:339 src/statusicon-qt/statusicon.cc:109
+#: src/statusicon/statusicon.cc:280
 msgid "_Play"
 msgstr "_Odtwarzaj"
 
-#: src/gtkui/menus.cc:140 src/qtui/main_window_actions.cc:108
-#: src/statusicon/statusicon.cc:279
+#: src/gtkui/menus.cc:93 src/qtui/menus.cc:137
+#: src/statusicon-qt/statusicon.cc:110 src/statusicon/statusicon.cc:281
 msgid "Paus_e"
 msgstr "_Wstrzymaj"
 
-#: src/gtkui/menus.cc:141 src/qtui/main_window_actions.cc:109
-#: src/statusicon/statusicon.cc:280
+#: src/gtkui/menus.cc:94 src/qtui/menus.cc:139
+#: src/statusicon-qt/statusicon.cc:111 src/statusicon/statusicon.cc:282
 msgid "_Stop"
 msgstr "_Zatrzymaj"
 
-#: src/gtkui/menus.cc:142 src/qtui/main_window_actions.cc:110
-#: src/statusicon/statusicon.cc:277
+#: src/gtkui/menus.cc:95 src/qtui/menus.cc:141
+#: src/statusicon-qt/statusicon.cc:112 src/statusicon/statusicon.cc:283
 msgid "Pre_vious"
 msgstr "P_oprzednie"
 
-#: src/gtkui/menus.cc:143 src/qtui/main_window_actions.cc:111
-#: src/statusicon/statusicon.cc:281
+#: src/gtkui/menus.cc:96 src/qtui/menus.cc:143
+#: src/statusicon-qt/statusicon.cc:113 src/statusicon/statusicon.cc:284
 msgid "_Next"
 msgstr "_Następne"
 
-#: src/gtkui/menus.cc:145 src/qtui/main_window_actions.cc:113
+#: src/gtkui/menus.cc:97 src/qtui/menus.cc:145 src/skins/menus.cc:114
+#: src/skins-qt/menus.cc:105
+msgid "Previous Album"
+msgstr "Poprzedni album"
+
+#: src/gtkui/menus.cc:98 src/qtui/menus.cc:146 src/skins/menus.cc:115
+#: src/skins-qt/menus.cc:106
+msgid "Next Album"
+msgstr "Następny album"
+
+#: src/gtkui/menus.cc:100 src/qtui/menus.cc:148
 msgid "_Repeat"
 msgstr "Powta_rzanie"
 
-#: src/gtkui/menus.cc:146 src/qtui/main_window_actions.cc:114
+#: src/gtkui/menus.cc:101 src/qtui/menus.cc:150
 msgid "S_huffle"
 msgstr "_Losowo"
 
-#: src/gtkui/menus.cc:147 src/qtui/main_window_actions.cc:115
+#: src/gtkui/menus.cc:102 src/qtui/menus.cc:152
+msgid "Shuffle by Albu_m"
+msgstr "Losowa kolejność albu_mów"
+
+#: src/gtkui/menus.cc:103 src/qtui/menus.cc:155
 msgid "N_o Playlist Advance"
 msgstr "Odtwarzaj _pojedynczo"
 
-#: src/gtkui/menus.cc:148 src/qtui/main_window_actions.cc:116
+#: src/gtkui/menus.cc:104 src/qtui/menus.cc:157
 msgid "Stop A_fter This Song"
-msgstr "Z_atrzymaj odtwarzanie po tym utworze"
+msgstr "Z_atrzymaj odtwarzanie po tej piosence"
 
-#: src/gtkui/menus.cc:150 src/gtkui/menus.cc:247
-#: src/qtui/main_window_actions.cc:118
+#: src/gtkui/menus.cc:106 src/gtkui/menus.cc:210 src/qtui/menus.cc:162
+#: src/qtui/menus.cc:294
 msgid "Song _Info ..."
-msgstr "_Informacje o ścieżce..."
+msgstr "_Informacje o piosence..."
 
-#: src/gtkui/menus.cc:151
+#: src/gtkui/menus.cc:107
 msgid "Jump to _Time ..."
 msgstr "Przejdź do _czasu..."
 
-#: src/gtkui/menus.cc:152
+#: src/gtkui/menus.cc:108
 msgid "_Jump to Song ..."
-msgstr "Przejdź do ścież_ki..."
+msgstr "Przejdź do piosen_ki..."
 
-#: src/gtkui/menus.cc:154
+#: src/gtkui/menus.cc:110 src/qtui/menus.cc:165
 msgid "Set Repeat Point _A"
-msgstr "Ustaw punkt początkowy pętli"
+msgstr "Ustaw punkt powtarzania _A"
 
-#: src/gtkui/menus.cc:155
+#: src/gtkui/menus.cc:111 src/qtui/menus.cc:167
 msgid "Set Repeat Point _B"
-msgstr "Ustaw punkt końcowy pętli"
+msgstr "Ustaw punkt powtarzania _B"
 
-#: src/gtkui/menus.cc:156
+#: src/gtkui/menus.cc:112 src/qtui/menus.cc:169
 msgid "_Clear Repeat Points"
 msgstr "_Resetuj punkty graniczne pętli"
 
-#: src/gtkui/menus.cc:160 src/gtkui/menus.cc:167 src/gtkui/menus.cc:183
-#: src/qtui/main_window_actions.cc:122 src/qtui/main_window_actions.cc:129
-#: src/qtui/main_window_actions.cc:145
+#: src/gtkui/menus.cc:116 src/gtkui/menus.cc:123 src/gtkui/menus.cc:141
+#: src/qtui/menus.cc:173 src/qtui/menus.cc:180 src/qtui/menus.cc:198
 msgid "By _Title"
-msgstr "według _tytułu"
+msgstr "Według _tytułu"
 
-#: src/gtkui/menus.cc:161 src/qtui/main_window_actions.cc:123
+#: src/gtkui/menus.cc:117 src/qtui/menus.cc:174
 msgid "By _File Name"
 msgstr "Według _nazwy pliku"
 
-#: src/gtkui/menus.cc:162 src/qtui/main_window_actions.cc:124
+#: src/gtkui/menus.cc:118 src/qtui/menus.cc:175
 msgid "By File _Path"
-msgstr "według ścieżki _pliku"
+msgstr "Według ścieżki _pliku"
 
-#: src/gtkui/menus.cc:166 src/gtkui/menus.cc:182
-#: src/qtui/main_window_actions.cc:128 src/qtui/main_window_actions.cc:144
+#: src/gtkui/menus.cc:122 src/gtkui/menus.cc:140 src/qtui/menus.cc:179
+#: src/qtui/menus.cc:197
 msgid "By Track _Number"
-msgstr "według _numeru ścieżki"
+msgstr "Według numeru ścież_ki"
 
-#: src/gtkui/menus.cc:168 src/gtkui/menus.cc:184
-#: src/qtui/main_window_actions.cc:130 src/qtui/main_window_actions.cc:146
+#: src/gtkui/menus.cc:124 src/gtkui/menus.cc:142 src/qtui/menus.cc:181
+#: src/qtui/menus.cc:199
 msgid "By _Artist"
-msgstr "według _wykonawcy"
+msgstr "Według _wykonawcy"
 
-#: src/gtkui/menus.cc:169 src/gtkui/menus.cc:185
-#: src/qtui/main_window_actions.cc:131 src/qtui/main_window_actions.cc:147
+#: src/gtkui/menus.cc:125 src/gtkui/menus.cc:143 src/qtui/menus.cc:182
+#: src/qtui/menus.cc:200
 msgid "By Al_bum"
-msgstr "według al_bumu"
+msgstr "Według al_bumu"
 
-#: src/gtkui/menus.cc:170 src/gtkui/menus.cc:186
-#: src/qtui/main_window_actions.cc:132 src/qtui/main_window_actions.cc:148
+#: src/gtkui/menus.cc:126 src/gtkui/menus.cc:144 src/qtui/menus.cc:183
+#: src/qtui/menus.cc:201
 msgid "By Albu_m Artist"
-msgstr "według wykonawcy albu_mu"
+msgstr "Według wykonawcy albu_mu"
 
-#: src/gtkui/menus.cc:171 src/gtkui/menus.cc:187
-#: src/qtui/main_window_actions.cc:133 src/qtui/main_window_actions.cc:149
+#: src/gtkui/menus.cc:127 src/gtkui/menus.cc:145 src/qtui/menus.cc:184
+#: src/qtui/menus.cc:202
 msgid "By Release _Date"
-msgstr "według daty w_ydania"
+msgstr "Według daty w_ydania"
 
-#: src/gtkui/menus.cc:172 src/gtkui/menus.cc:188
-#: src/qtui/main_window_actions.cc:134 src/qtui/main_window_actions.cc:150
+#: src/gtkui/menus.cc:128 src/gtkui/menus.cc:146 src/qtui/menus.cc:185
+#: src/qtui/menus.cc:203
 msgid "By _Genre"
 msgstr "Według _gatunku"
 
-#: src/gtkui/menus.cc:173 src/gtkui/menus.cc:189
-#: src/qtui/main_window_actions.cc:135 src/qtui/main_window_actions.cc:151
+#: src/gtkui/menus.cc:129 src/gtkui/menus.cc:147 src/qtui/menus.cc:186
+#: src/qtui/menus.cc:204
 msgid "By _Length"
-msgstr "według _długości"
+msgstr "Według _długości"
 
-#: src/gtkui/menus.cc:174 src/gtkui/menus.cc:190
-#: src/qtui/main_window_actions.cc:136 src/qtui/main_window_actions.cc:152
+#: src/gtkui/menus.cc:130 src/gtkui/menus.cc:148 src/qtui/menus.cc:187
+#: src/qtui/menus.cc:205
 msgid "By _File Path"
-msgstr "według p_ołożenia pliku"
+msgstr "Według ś_cieżki pliku"
 
-#: src/gtkui/menus.cc:175 src/gtkui/menus.cc:191
-#: src/qtui/main_window_actions.cc:137 src/qtui/main_window_actions.cc:153
+#: src/gtkui/menus.cc:131 src/gtkui/menus.cc:149 src/qtui/menus.cc:188
+#: src/qtui/menus.cc:206
 msgid "By _Custom Title"
-msgstr "według wła_snego tytułu"
+msgstr "Według wła_snego tytułu"
 
-#: src/gtkui/menus.cc:177 src/gtkui/menus.cc:193
-#: src/qtui/main_window_actions.cc:139 src/qtui/main_window_actions.cc:155
+#: src/gtkui/menus.cc:132 src/gtkui/menus.cc:150 src/qtui/menus.cc:189
+#: src/qtui/menus.cc:207
+msgid "By C_omment"
+msgstr "Według k_omentarza"
+
+#: src/gtkui/menus.cc:133 src/gtkui/menus.cc:151 src/qtui/menus.cc:190
+#: src/qtui/menus.cc:208
+msgid "By D_isc Number"
+msgstr "Według nume_ru płyty"
+
+#: src/gtkui/menus.cc:135 src/gtkui/menus.cc:153 src/qtui/menus.cc:192
+#: src/qtui/menus.cc:210
 msgid "R_everse Order"
 msgstr "_Odwróć kolejność"
 
-#: src/gtkui/menus.cc:178 src/gtkui/menus.cc:194
-#: src/qtui/main_window_actions.cc:140 src/qtui/main_window_actions.cc:156
+#: src/gtkui/menus.cc:136 src/gtkui/menus.cc:154 src/qtui/menus.cc:194
+#: src/qtui/menus.cc:212
 msgid "_Random Order"
 msgstr "Wy_losuj kolejność"
 
-#: src/gtkui/menus.cc:198 src/qtui/main_window_actions.cc:160
+#: src/gtkui/menus.cc:158 src/qtui/menus.cc:216
 msgid "_Play/Resume"
-msgstr "_Odtwórz/Ponów"
+msgstr "_Odtwórz lub wznów"
 
-#: src/gtkui/menus.cc:199 src/gtkui/menus.cc:251
-#: src/qtui/main_window_actions.cc:161
+#: src/gtkui/menus.cc:159 src/qtui/menus.cc:218
 msgid "_Refresh"
-msgstr "_Wczytaj ponownie"
+msgstr "O_dśwież"
 
-#: src/gtkui/menus.cc:201 src/qtui/main_window_actions.cc:163
+#: src/gtkui/menus.cc:161 src/qtui/menus.cc:222
 msgid "_Sort"
 msgstr "_Sortuj"
 
-#: src/gtkui/menus.cc:202 src/qtui/main_window_actions.cc:164
+#: src/gtkui/menus.cc:162 src/qtui/menus.cc:223
 msgid "Sort Se_lected"
 msgstr "Sortuj _wybrane"
 
-#: src/gtkui/menus.cc:203 src/qtui/main_window_actions.cc:165
+#: src/gtkui/menus.cc:163 src/qtui/menus.cc:225
 msgid "Remove _Duplicates"
 msgstr "Usuń _duplikaty"
 
-#: src/gtkui/menus.cc:204 src/qtui/main_window_actions.cc:166
+#: src/gtkui/menus.cc:164 src/qtui/menus.cc:226
 msgid "Remove _Unavailable Files"
 msgstr "_Usuń niedostępne pliki"
 
-#: src/gtkui/menus.cc:206 src/playlist-manager/playlist-manager.cc:244
-#: src/qtui/main_window_actions.cc:168
+#: src/gtkui/menus.cc:166 src/playlist-manager/playlist-manager.cc:219
+#: src/playlist-manager-qt/playlist-manager-qt.cc:348 src/qtui/menus.cc:229
 msgid "_New"
 msgstr "_Nowa"
 
-#: src/gtkui/menus.cc:207
+#: src/gtkui/menus.cc:167 src/qtui/menus.cc:230
 msgid "Ren_ame ..."
 msgstr "Z_mień nazwę..."
 
-#: src/gtkui/menus.cc:208 src/gtkui/menus.cc:264
-#: src/qtui/main_window_actions.cc:170
+#: src/gtkui/menus.cc:168 src/gtkui/menus.cc:228
+#: src/moonstone/playlist_tabs.cc:311 src/qtui/menus.cc:231
+#: src/qtui/playlist_tabs.cc:336
 msgid "Remo_ve"
 msgstr "_Usuń"
 
-#: src/gtkui/menus.cc:210
+#: src/gtkui/menus.cc:170 src/qtui/menus.cc:233
 msgid "_Import ..."
 msgstr "_Importuj..."
 
-#: src/gtkui/menus.cc:211
+#: src/gtkui/menus.cc:171 src/qtui/menus.cc:234
 msgid "_Export ..."
 msgstr "_Eksportuj..."
 
-#: src/gtkui/menus.cc:213
+#: src/gtkui/menus.cc:173 src/qtui/menus.cc:237
 msgid "Playlist _Manager ..."
 msgstr "Menedżer _listy odtwarzania..."
 
-#: src/gtkui/menus.cc:214 src/qtui/main_window_actions.cc:176
+#: src/gtkui/menus.cc:174 src/qtui/menus.cc:239
 msgid "_Queue Manager ..."
 msgstr "Menedżer _kolejki..."
 
-#: src/gtkui/menus.cc:218 src/qtui/main_window_actions.cc:180
+#: src/gtkui/menus.cc:178 src/qtui/menus.cc:243
 msgid "Volume _Up"
 msgstr "Z_większ głośność"
 
-#: src/gtkui/menus.cc:219 src/qtui/main_window_actions.cc:181
+#: src/gtkui/menus.cc:179 src/qtui/menus.cc:245
 msgid "Volume _Down"
 msgstr "Z_mniejsz głośność"
 
-#: src/gtkui/menus.cc:221 src/qtui/main_window_actions.cc:183
-msgid "_Equalizer"
-msgstr "_Korektor graficzny"
+#: src/gtkui/menus.cc:181 src/qtui/menus.cc:249
+msgid "_Equalizer ..."
+msgstr "_Korektor graficzny..."
 
-#: src/gtkui/menus.cc:223 src/qtui/main_window_actions.cc:185
+#: src/gtkui/menus.cc:182 src/qtui/menus.cc:251
 msgid "E_ffects ..."
 msgstr "E_fekty..."
 
-#: src/gtkui/menus.cc:227
+#: src/gtkui/menus.cc:184
+msgid "_Record Stream"
+msgstr "Nag_raj strumień"
+
+#: src/gtkui/menus.cc:185
+msgid "Audio _Settings ..."
+msgstr "U_stawienia dźwięku..."
+
+#: src/gtkui/menus.cc:189 src/qtui/menus.cc:260
 msgid "Show _Menu Bar"
 msgstr "Pasek _menu"
 
-#: src/gtkui/menus.cc:228
+#: src/gtkui/menus.cc:190 src/qtui/menus.cc:262
 msgid "Show I_nfo Bar"
 msgstr "Pasek _informacji"
 
-#: src/gtkui/menus.cc:229
+#: src/gtkui/menus.cc:191 src/qtui/menus.cc:264
+msgid "Show Info Bar _Album Art"
+msgstr "Pokaż _okładkę albumu na pasku informacji"
+
+#: src/gtkui/menus.cc:192 src/qtui/menus.cc:266
 msgid "Show Info Bar Vis_ualization"
 msgstr "Pokaż pasek wiz_ualizacji"
 
-#: src/gtkui/menus.cc:230
+#: src/gtkui/menus.cc:193 src/qtui/menus.cc:268
 msgid "Show _Status Bar"
 msgstr "Pokaż pasek _stanu"
 
-#: src/gtkui/menus.cc:232
+#: src/gtkui/menus.cc:195 src/qtui/menus.cc:272
 msgid "Show _Remaining Time"
 msgstr "Pokaż _pozostały czas"
 
-#: src/gtkui/menus.cc:234
+#: src/gtkui/menus.cc:197 src/qtui/menus.cc:276 src/skins/menus.cc:157
+#: src/skins-qt/menus.cc:152
 msgid "_Visualizations ..."
-msgstr "_Wizualizacje"
+msgstr "_Wizualizacje..."
 
-#: src/gtkui/menus.cc:238 src/qtui/main_window_actions.cc:189
+#: src/gtkui/menus.cc:201 src/qtui/menus.cc:280
 msgid "_File"
 msgstr "_Plik"
 
-#: src/gtkui/menus.cc:239 src/qtui/main_window_actions.cc:190
+#: src/gtkui/menus.cc:202 src/qtui/menus.cc:281
 msgid "_Playback"
 msgstr "Odt_warzanie"
 
-#: src/gtkui/menus.cc:240 src/qtui/main_window_actions.cc:191
+#: src/gtkui/menus.cc:203 src/qtui/menus.cc:282
 msgid "P_laylist"
 msgstr "_Lista"
 
-#: src/gtkui/menus.cc:241 src/gtkui/menus.cc:258
-#: src/qtui/main_window_actions.cc:192
+#: src/gtkui/menus.cc:204 src/gtkui/menus.cc:222 src/qtui/menus.cc:283
+#: src/qtui/menus.cc:312
 msgid "_Services"
 msgstr "W_tyczki"
 
-#: src/gtkui/menus.cc:242 src/qtui/main_window_actions.cc:193
+#: src/gtkui/menus.cc:205 src/qtui/menus.cc:284
 msgid "_Output"
 msgstr "_Dźwięk"
 
-#: src/gtkui/menus.cc:243
+#: src/gtkui/menus.cc:206 src/qtui/menus.cc:285
 msgid "_View"
 msgstr "_Widok"
 
-#: src/gtkui/menus.cc:248
+#: src/gtkui/menus.cc:211 src/qtui/menus.cc:296
 msgid "_Queue/Unqueue"
-msgstr "_Dodaj/usuń kolejkę"
+msgstr "_Przełącz kolejkę"
 
-#: src/gtkui/menus.cc:250
+#: src/gtkui/menus.cc:213 src/qtui/menus.cc:299
 msgid "_Open Containing Folder"
 msgstr "_Otwórz katalog zawierający"
 
-#: src/gtkui/menus.cc:253
+#: src/gtkui/menus.cc:214 src/qtui/menus.cc:301
+msgid "_Refresh Selected"
+msgstr "O_dśwież zaznaczone"
+
+#: src/gtkui/menus.cc:216 src/qtui/menus.cc:304
 msgid "Cu_t"
 msgstr "_Wytnij"
 
-#: src/gtkui/menus.cc:254
+#: src/gtkui/menus.cc:217 src/qtui/menus.cc:305
 msgid "_Copy"
 msgstr "K_opiuj"
 
-#: src/gtkui/menus.cc:255
+#: src/gtkui/menus.cc:218 src/qtui/menus.cc:306
 msgid "_Paste"
 msgstr "Wk_lej"
 
-#: src/gtkui/menus.cc:256
+#: src/gtkui/menus.cc:219 src/qtui/menus.cc:307
+msgid "Paste at _End"
+msgstr "_Wklej na końcu"
+
+#: src/gtkui/menus.cc:220 src/qtui/menus.cc:309
 msgid "Select _All"
 msgstr "_Zaznacz wszystko"
 
-#: src/gtkui/menus.cc:263
+#: src/gtkui/menus.cc:227 src/moonstone/playlist_tabs.cc:309
+#: src/qtui/playlist_tabs.cc:334
 msgid "_Rename ..."
-msgstr "Z_mień nazwę ..."
+msgstr "Z_mień nazwę..."
+
+#: src/gtkui/settings.cc:35 src/qtui/settings.cc:59
+msgid "Always"
+msgstr "Zawsze"
+
+#: src/gtkui/settings.cc:36 src/qtui/settings.cc:60
+msgid "Auto-hide"
+msgstr "Automatyczne ukrywaj"
+
+#: src/gtkui/settings.cc:37 src/qtui/settings.cc:61
+msgid "Never"
+msgstr "Nigdy"
 
-#: src/gtkui/settings.cc:35
+#: src/gtkui/settings.cc:41 src/qtui/settings.cc:64
 msgid "Playlist Tabs"
 msgstr "Karty listy odtwarzania"
 
-#: src/gtkui/settings.cc:36
-msgid "Always show tabs"
-msgstr "Zawsze pokazuj karty"
+#: src/gtkui/settings.cc:42 src/qtui/settings.cc:65
+msgid "Show playlist tabs:"
+msgstr "Pokaż karty listy odtwarzania:"
 
-#: src/gtkui/settings.cc:38
+#: src/gtkui/settings.cc:45 src/qtui/settings.cc:69
 msgid "Show entry counts"
 msgstr "Pokaż statystykę nagrań"
 
-#: src/gtkui/settings.cc:40
+#: src/gtkui/settings.cc:47 src/qtui/settings.cc:72
 msgid "Show close buttons"
 msgstr "Pokaż przyciski zamykania"
 
-#: src/gtkui/settings.cc:42
+#: src/gtkui/settings.cc:49 src/qtui/settings.cc:75
 msgid "Playlist Columns"
 msgstr "Kolumny listy odtwarzania"
 
-#: src/gtkui/settings.cc:44
+#: src/gtkui/settings.cc:51 src/qtui/settings.cc:77
 msgid "Show column headers"
 msgstr "Pokaż nagłówki listy odtwarzania"
 
-#: src/gtkui/settings.cc:46 src/modplug/plugin_main.cc:106
-#: src/skins/skins_cfg.cc:263
-msgid "Miscellaneous"
-msgstr "Różne"
+#: src/gtkui/settings.cc:53 src/qtui/settings.cc:82
+msgid "Make column headers clickable for sorting"
+msgstr "Spraw, aby nagłówki kolumn były klikalne w celu sortowania"
+
+#: src/gtkui/settings.cc:56
+msgid "Use symbolic icons in toolbar"
+msgstr "Używaj ikon symbolicznych na pasku narzędzi"
 
-#: src/gtkui/settings.cc:47
-msgid "Arrow keys seek by:"
-msgstr "Przyciski strzałki przesuwają o:"
-
-#: src/gtkui/settings.cc:50
+#: src/gtkui/settings.cc:58 src/qtui/settings.cc:86
 msgid "Scroll on song change"
 msgstr "Przewiń przy zmianie piosenki"
 
-#: src/gtkui/ui_gtk.cc:71
+#: src/gtkui/ui_gtk.cc:82
 msgid "GTK Interface"
 msgstr "Interfejs GTK"
 
-#: src/gtkui/ui_gtk.cc:222 src/skins/ui_main.cc:232
+#: src/gtkui/ui_gtk.cc:219 src/skins/main.cc:228 src/skins-qt/main.cc:231
 #, c-format
 msgid "%s - Audacious"
 msgstr "%s - Audacious"
 
-#: src/gtkui/ui_gtk.cc:225 src/qtui/main_window.cc:186
+#: src/gtkui/ui_gtk.cc:221 src/moonstone/main_window.cc:184
+#: src/qtui/main_window.cc:385
 msgid "Buffering ..."
-msgstr "Buforowanie ..."
+msgstr "Buforowanie..."
 
-#: src/gtkui/ui_gtk.cc:228 src/skins/ui_main.cc:234 src/skins/ui_main.cc:1164
+#: src/gtkui/ui_gtk.cc:224 src/pipewire/pipewire.cc:402 src/skins/main.cc:230
+#: src/skins-qt/main.cc:233
 msgid "Audacious"
 msgstr "Audacious"
 
-#: src/gtkui/ui_statusbar.cc:63 src/qtui/status_bar.cc:67
+#: src/gtkui/ui_gtk.cc:487 src/gtkui/ui_gtk.cc:518 src/gtkui/ui_gtk.cc:882
+#: src/hotkey/gui.cc:72 src/moonstone/main_window.cc:67
+#: src/moonstone/main_window.cc:145 src/moonstone/main_window.cc:146
+#: src/notify/osd.cc:85 src/qthotkey/gui.cc:67 src/qtui/main_window.cc:154
+#: src/qtui/main_window.cc:347 src/qtui/main_window.cc:348
+#: src/skins/menus.cc:109 src/skins-qt/menus.cc:100
+msgid "Play"
+msgstr "Odtwarzaj"
+
+#: src/gtkui/ui_gtk.cc:487 src/moonstone/main_window.cc:151
+#: src/moonstone/main_window.cc:152 src/notify/osd.cc:82
+#: src/qtui/main_window.cc:353 src/qtui/main_window.cc:354
+#: src/skins/menus.cc:110 src/skins-qt/menus.cc:101
+msgid "Pause"
+msgstr "Wstrzymaj"
+
+#: src/gtkui/ui_gtk.cc:868 src/moonstone/main_window.cc:57
+#: src/qtui/main_window.cc:145 src/skins/menus.cc:86 src/skins-qt/menus.cc:77
+msgid "Search Library"
+msgstr "Przeszukaj bibliotekę"
+
+#: src/gtkui/ui_gtk.cc:875 src/moonstone/main_window.cc:60
+#: src/qtui/main_window.cc:147
+msgid "Open Files"
+msgstr "Otwórz pliki"
+
+#: src/gtkui/ui_gtk.cc:876 src/moonstone/main_window.cc:62
+#: src/qtui/main_window.cc:149
+msgid "Add Files"
+msgstr "Dodaj pliki"
+
+#: src/gtkui/ui_gtk.cc:881 src/moonstone/main_window.cc:65
+#: src/qtui/main_window.cc:152 src/skins/menus.cc:112 src/skins-qt/menus.cc:103
+msgid "Previous"
+msgstr "Poprzednie"
+
+#: src/gtkui/ui_gtk.cc:883 src/hotkey/gui.cc:74 src/moonstone/main_window.cc:69
+#: src/qthotkey/gui.cc:69 src/qtui/main_window.cc:156 src/skins/menus.cc:111
+#: src/skins-qt/menus.cc:102
+msgid "Stop"
+msgstr "Zatrzymaj"
+
+#: src/gtkui/ui_gtk.cc:884 src/moonstone/main_window.cc:76 src/notify/osd.cc:89
+#: src/qtui/main_window.cc:163 src/skins/menus.cc:113 src/skins-qt/menus.cc:104
+msgid "Next"
+msgstr "Następne"
+
+#: src/gtkui/ui_gtk.cc:886 src/moonstone/main_window.cc:79
+#: src/qtui/main_window.cc:166 src/qtui/menus.cc:254 src/skins/menus.cc:79
+#: src/skins-qt/menus.cc:69
+msgid "Record Stream"
+msgstr "Nagraj strumień"
+
+#: src/gtkui/ui_gtk.cc:919 src/moonstone/main_window.cc:86
+#: src/qtui/main_window.cc:173 src/skins/menus.cc:103 src/skins-qt/menus.cc:94
+msgid "Repeat"
+msgstr "Powtarzaj"
+
+#: src/gtkui/ui_gtk.cc:922 src/moonstone/main_window.cc:89
+#: src/qtui/main_window.cc:176 src/skins/menus.cc:104 src/skins-qt/menus.cc:95
+msgid "Shuffle"
+msgstr "Losowa kolejność"
+
+#: src/gtkui/ui_gtk.cc:1114 src/qtui/main_window.cc:123
+msgid "Menu"
+msgstr "Menu"
+
+#: src/gtkui/ui_statusbar.cc:64 src/qtui/status_bar.cc:155
 msgid "mono"
 msgstr "mono"
 
-#: src/gtkui/ui_statusbar.cc:65 src/qtui/status_bar.cc:69
+#: src/gtkui/ui_statusbar.cc:66 src/qtui/status_bar.cc:157
 msgid "stereo"
 msgstr "stereo"
 
-#: src/gtkui/ui_statusbar.cc:67 src/qtui/status_bar.cc:71
+#: src/gtkui/ui_statusbar.cc:68 src/qtui/status_bar.cc:160
 #, c-format
 msgid "%d channel"
 msgid_plural "%d channels"
 msgstr0 "%d kanał"
 msgstr1 "%d kanały"
 msgstr2 "%d kanałów"
+msgstr3 "%d kanałów"
+
+#: src/gtkui/ui_statusbar.cc:76 src/qtui/status_bar.cc:168
+#, c-format
+msgid "%d kHz"
+msgstr "%d kHz"
 
-#: src/gtkui/ui_statusbar.cc:81 src/qtui/status_bar.cc:85
+#: src/gtkui/ui_statusbar.cc:82 src/qtui/status_bar.cc:174
 #, c-format
-msgid "%d kbps"
-msgstr "%d kb/s"
+msgid "%d kbit/s"
+msgstr "%d kbit/s"
 
-#: src/gtkui/ui_statusbar.cc:107 src/skins/ui_main_evlisteners.cc:103
+#: src/gtkui/ui_statusbar.cc:108 src/skins/main.cc:478 src/skins-qt/main.cc:461
 msgid "Single mode."
 msgstr "Tryb prosty."
 
-#: src/gtkui/ui_statusbar.cc:109 src/skins/ui_main_evlisteners.cc:105
+#: src/gtkui/ui_statusbar.cc:110 src/skins/main.cc:480 src/skins-qt/main.cc:463
 msgid "Playlist mode."
 msgstr "Tryb listy odtwarzania."
 
-#: src/gtkui/ui_statusbar.cc:117 src/skins/ui_main_evlisteners.cc:111
+#: src/gtkui/ui_statusbar.cc:118 src/skins/main.cc:486 src/skins-qt/main.cc:469
 msgid "Stopping after song."
-msgstr "Zatrzymaj po tym utworze."
+msgstr "Zatrzymaj po tej piosence."
 
-#: src/hotkey/gui.cc:71
+#: src/hotkey/gui.cc:71 src/qthotkey/gui.cc:66
 msgid "Previous track"
-msgstr "Poprzedni utwór"
-
-#: src/hotkey/gui.cc:72 src/notify/osd.cc:69 src/qtui/main_window.cc:69
-#: src/qtui/main_window.cc:172 src/qtui/main_window.cc:173
-#: src/skins/menus.cc:87
-msgid "Play"
-msgstr "Odtwarzaj"
+msgstr "Poprzedna ścieżka"
 
-#: src/hotkey/gui.cc:73
+#: src/hotkey/gui.cc:73 src/qthotkey/gui.cc:68
 msgid "Pause/Resume"
 msgstr "Wstrzymaj/wznów"
 
-#: src/hotkey/gui.cc:74 src/qtui/main_window.cc:70 src/skins/menus.cc:89
-msgid "Stop"
-msgstr "Zatrzymaj"
-
-#: src/hotkey/gui.cc:75
+#: src/hotkey/gui.cc:75 src/qthotkey/gui.cc:70
 msgid "Next track"
-msgstr "Następny utwór"
+msgstr "Następna ścieżka"
 
-#: src/hotkey/gui.cc:76
-msgid "Forward 5 seconds"
-msgstr "Przewiń o 5 sekund do przodu"
+#: src/hotkey/gui.cc:76 src/qthotkey/gui.cc:71
+msgid "Step forward"
+msgstr "Krok do przodu"
 
-#: src/hotkey/gui.cc:77
-msgid "Rewind 5 seconds"
-msgstr "Przewiń o 5 sekund do tyłu"
+#: src/hotkey/gui.cc:77 src/qthotkey/gui.cc:72
+msgid "Step backward"
+msgstr "Krok do tyłu"
 
-#: src/hotkey/gui.cc:78
+#: src/hotkey/gui.cc:78 src/qthotkey/gui.cc:73
 msgid "Mute"
 msgstr "Wyciszenie dźwięku"
 
-#: src/hotkey/gui.cc:79
+#: src/hotkey/gui.cc:79 src/qthotkey/gui.cc:74
 msgid "Volume up"
 msgstr "Zwiększ głośność"
 
-#: src/hotkey/gui.cc:80
+#: src/hotkey/gui.cc:80 src/qthotkey/gui.cc:75
 msgid "Volume down"
 msgstr "Zmniejsz głośność"
 
-#: src/hotkey/gui.cc:81
+#: src/hotkey/gui.cc:81 src/qthotkey/gui.cc:76
 msgid "Jump to file"
 msgstr "Przejdź do pliku"
 
-#: src/hotkey/gui.cc:82
+#: src/hotkey/gui.cc:82 src/qthotkey/gui.cc:77
 msgid "Toggle player window(s)"
 msgstr "Przełącz okno(a) odtwarzacza"
 
-#: src/hotkey/gui.cc:83
+#: src/hotkey/gui.cc:83 src/qthotkey/gui.cc:78
 msgid "Show On-Screen-Display"
 msgstr "Pokaż menu ekranowe"
 
-#: src/hotkey/gui.cc:84
+#: src/hotkey/gui.cc:84 src/qthotkey/gui.cc:79
 msgid "Toggle repeat"
 msgstr "Włącz/Wyłącz powtarzanie"
 
-#: src/hotkey/gui.cc:85
+#: src/hotkey/gui.cc:85 src/qthotkey/gui.cc:80
 msgid "Toggle shuffle"
 msgstr "Włącz/Wyłącz odtwaranie losowe"
 
-#: src/hotkey/gui.cc:86
+#: src/hotkey/gui.cc:86 src/qthotkey/gui.cc:81
 msgid "Toggle stop after current"
 msgstr "Zatrzymanie po bieżącej ścieżce"
 
-#: src/hotkey/gui.cc:87
+#: src/hotkey/gui.cc:87 src/qthotkey/gui.cc:82
 msgid "Raise player window(s)"
 msgstr "Przesuń na wierzch okno(a) odtwarzacza"
 
-#: src/hotkey/gui.cc:97
+#: src/hotkey/gui.cc:98 src/qthotkey/gui.cc:100
 msgid "(none)"
 msgstr "(brak)"
 
-#: src/hotkey/gui.cc:234
+#: src/hotkey/gui.cc:261
 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 modifiers.\n"
 "\n"
 "Do you want to continue?"
 msgstr ""
-"Niezalecane jest dowiązywanie podstawowych przycisków myszy bez dodatkowych "
-"klawiszy.\n"
+"Niezalecane jest dowiązywanie podstawowych przycisków myszy bez "
+"modyfikatorów.\n"
 "\n"
-"Kontynuować?"
+"Czy chcesz kontynuować?"
 
-#: src/hotkey/gui.cc:236
+#: src/hotkey/gui.cc:264
 msgid "Binding mouse buttons"
 msgstr "Przyciski dowiązań myszy"
 
-#: src/hotkey/gui.cc:391
+#: src/hotkey/gui.cc:434
 msgid ""
 "Press a key combination inside a text field.\n"
 "You can also bind mouse buttons."
@@ -2205,34 +2284,34 @@
 "Proszę wcisnąć kombinację klawiszy wewnątrz pola\n"
 "tekstowego. Można również użyć przycisków myszy."
 
-#: src/hotkey/gui.cc:396
+#: src/hotkey/gui.cc:444 src/qthotkey/gui.cc:179
 msgid "Hotkeys:"
 msgstr "Skróty klawiszowe:"
 
-#: src/hotkey/gui.cc:413
+#: src/hotkey/gui.cc:457 src/qthotkey/gui.cc:181
 msgid "Action:"
 msgstr "Czynność:"
 
-#: src/hotkey/gui.cc:420
+#: src/hotkey/gui.cc:461 src/qthotkey/gui.cc:182
 msgid "Key Binding:"
 msgstr "Kombinacja klawiszy:"
 
-#: src/hotkey/gui.cc:468
+#: src/hotkey/gui.cc:518 src/qthotkey/gui.cc:184
 msgid "_Add"
 msgstr "_Dodaj"
 
-#: src/hotkey/plugin.cc:61
+#: src/hotkey/plugin.cc:59 src/qthotkey/plugin.cc:78
 msgid "Global Hotkeys"
 msgstr "Globalne skróty klawiszowe"
 
-#: src/hotkey/plugin.cc:79
+#: src/hotkey/plugin.cc:74
 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"
+"Contributors 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"
@@ -2252,25 +2331,53 @@
 " Jonathan A. Davis <davis@jdhouse.org>,\n"
 " Jeremy Tan <nsx@nsx.homeip.net>"
 
-#: src/jack-ng/jack-ng.cc:49
+#: src/jack/jack-ng.cc:54
 msgid "JACK Output"
 msgstr "Wyjście JACK"
 
-#: src/jack-ng/jack-ng.cc:114
+#: src/jack/jack-ng.cc:126
+msgid "Client name:"
+msgstr "Nazwa klienta:"
+
+#: src/jack/jack-ng.cc:128
 msgid "Automatically connect to output ports"
 msgstr "Automatycznie połącz z portami wyjścia"
 
-#: src/jack-ng/jack-ng.cc:155
+#: src/jack/jack-ng.cc:130
+msgid "Filter ports (regex, use any port if blank):"
+msgstr "Filtruj porty (regex, użyje dowolnego portu, jeśli jest pusty):"
+
+#: src/jack/jack-ng.cc:136
+msgid "Connect to physical ports only"
+msgstr "Podłącz tylko do fizycznych portów"
+
+#: src/jack/jack-ng.cc:139
+msgid "Upmix to"
+msgstr "Upmix do"
+
+#: src/jack/jack-ng.cc:141
+msgid "ports if input has fewer channels"
+msgstr "portów, jeśli wejście ma mniej kanałów"
+
+#: src/jack/jack-ng.cc:143
+msgid "Ignore insufficient number of ports"
+msgstr "Zignoruj niewystarczającą liczbę portów"
+
+#: src/jack/jack-ng.cc:181
+msgid "No JACK output ports were found. Please check settings."
+msgstr "Nie znaleziono portów wyjściowych JACK. Sprawdź ustawienia."
+
+#: src/jack/jack-ng.cc:195
 #, c-format
 msgid "Only %d JACK output ports were found but %d are required."
 msgstr "Odnaleziono tylko %d portów wyjścia JACK, ale wymaganych jest %d."
 
-#: src/jack-ng/jack-ng.cc:164
+#: src/jack/jack-ng.cc:210
 #, c-format
 msgid "Failed to connect to JACK port %s."
 msgstr "Wystąpił błąd przy połączeniu z portem JACK %s."
 
-#: src/jack-ng/jack-ng.cc:184
+#: src/jack/jack-ng.cc:230
 msgid ""
 "JACK supports only floating-point audio. You must change the output bit "
 "depth to floating-point in Audacious settings."
@@ -2278,11 +2385,11 @@
 "JACK obsługuje tylko dźwięk zmiennoprzecinkowy. Musisz zmienić rozdzielczość "
 "bitową w ustawieniach dźwięku Audaciousa na tryb zmiennopozycyjny."
 
-#: src/jack-ng/jack-ng.cc:197
+#: src/jack/jack-ng.cc:245
 msgid "Failed to connect to the JACK server; is it running?"
 msgstr "Wystąpił błąd przy połączeniu z serwerem JACK. Czy jest uruchomiony?"
 
-#: src/jack-ng/jack-ng.cc:273
+#: src/jack/jack-ng.cc:321
 #, c-format
 msgid ""
 "The JACK server requires a sample rate of %d Hz, but Audacious is playing at "
@@ -2292,16 +2399,16 @@
 "Hz. Użyj proszę Konwertera częstotliwości próbkowania (wtyczki) aby usunąć "
 "niezgodność."
 
-#: src/ladspa/plugin.cc:414
+#: src/ladspa/plugin.cc:416
 #, c-format
 msgid "%s Settings"
 msgstr "Ustawienia %s"
 
-#: src/ladspa/plugin.cc:478
+#: src/ladspa/plugin.cc:482
 msgid "Module paths:"
 msgstr "Położenia modułów:"
 
-#: src/ladspa/plugin.cc:483
+#: src/ladspa/plugin.cc:487
 msgid ""
 "Separate multiple paths with a colon.\n"
 "These paths are searched in addition to LADSPA_PATH.\n"
@@ -2312,30 +2419,30 @@
 "Po dodaniu nowych ścieżek proszę wcisnąć Enter, aby wyszukać nowe wtyczki.</"
 "small>"
 
-#: src/ladspa/plugin.cc:499
+#: src/ladspa/plugin.cc:508
 msgid "Available plugins:"
 msgstr "Dostępne wtyczki:"
 
-#: src/ladspa/plugin.cc:512 src/modplug/plugin_main.cc:92
-#: src/modplug/plugin_main.cc:95 src/modplug/plugin_main.cc:98
-#: src/modplug/plugin_main.cc:101
+#: src/ladspa/plugin.cc:521 src/modplug/plugin_main.cc:91
+#: src/modplug/plugin_main.cc:94 src/modplug/plugin_main.cc:97
+#: src/modplug/plugin_main.cc:100
 msgid "Enable"
 msgstr "Włącz"
 
-#: src/ladspa/plugin.cc:518
+#: src/ladspa/plugin.cc:527
 msgid "Enabled plugins:"
 msgstr "Włączone wtyczki:"
 
-#: src/ladspa/plugin.cc:534
+#: src/ladspa/plugin.cc:543
 msgid "Settings"
 msgstr "Ustawienia"
 
-#: src/ladspa/plugin.cc:551
+#: src/ladspa/plugin.cc:560
 msgid ""
 "LADSPA Host for Audacious\n"
 "Copyright 2011 John Lindgren"
 msgstr ""
-"Serwer LADSPA dla Audacious\n"
+"Serwer LADSPA dla Audaciousa\n"
 "Prawa autorskie 2011 John Lindgren"
 
 #: src/ladspa/plugin.h:78
@@ -2346,7 +2453,7 @@
 msgid "LIRC Plugin"
 msgstr "Wtyczka LIRC"
 
-#: src/lirc/lirc.cc:381
+#: src/lirc/lirc.cc:379
 msgid ""
 "A simple plugin to control Audacious using the LIRC remote control daemon\n"
 "\n"
@@ -2375,63 +2482,123 @@
 "\n"
 "Więcej informacji LIRC-u, znajdziesz na stronie: http://lirc.org."
 
-#: src/lirc/lirc.cc:392
+#: src/lirc/lirc.cc:390
 msgid "Connection"
 msgstr "Połącznenie"
 
-#: src/lirc/lirc.cc:393
+#: src/lirc/lirc.cc:391
 msgid "Reconnect to LIRC server"
 msgstr "Podłącz ponownie do serwera LIRC"
 
-#: src/lirc/lirc.cc:395
+#: src/lirc/lirc.cc:393
 msgid "Wait before reconnecting:"
 msgstr "Odczekaj przed ponownym połączeniem:"
 
-#: src/lyricwiki/lyricwiki.cc:41
-msgid "LyricWiki Plugin"
-msgstr "Wtyczka LyricWiki"
-
-#: src/lyricwiki/lyricwiki.cc:131 src/lyricwiki-qt/lyricwiki.cc:136
-msgid "No lyrics available"
-msgstr "Nie znaleziono tekstu piosenki"
-
-#: src/lyricwiki/lyricwiki.cc:217 src/lyricwiki/lyricwiki.cc:226
-#: src/lyricwiki/lyricwiki.cc:243 src/lyricwiki/lyricwiki.cc:252
-#: src/lyricwiki/lyricwiki.cc:267 src/lyricwiki-qt/lyricwiki.cc:222
-#: src/lyricwiki-qt/lyricwiki.cc:231 src/lyricwiki-qt/lyricwiki.cc:248
-#: src/lyricwiki-qt/lyricwiki.cc:257 src/lyricwiki-qt/lyricwiki.cc:272
-msgid "Error"
-msgstr "Błąd"
-
-#: src/lyricwiki/lyricwiki.cc:218 src/lyricwiki/lyricwiki.cc:244
-#: src/lyricwiki-qt/lyricwiki.cc:223 src/lyricwiki-qt/lyricwiki.cc:249
+#: src/lyrics-common/chart_lyrics_provider.cc:93
+#: src/lyrics-common/chart_lyrics_provider.cc:150
+#: src/lyrics-common/lyrics_ovh_provider.cc:50
 #, c-format
 msgid "Unable to fetch %s"
 msgstr "Nie można pobrać %s"
 
-#: src/lyricwiki/lyricwiki.cc:227 src/lyricwiki/lyricwiki.cc:253
-#: src/lyricwiki-qt/lyricwiki.cc:232 src/lyricwiki-qt/lyricwiki.cc:258
+#: src/lyrics-common/chart_lyrics_provider.cc:100
+#: src/lyrics-common/chart_lyrics_provider.cc:157
+#: src/lyrics-common/lyrics_ovh_provider.cc:57
 #, c-format
 msgid "Unable to parse %s"
 msgstr "Nie można odczytać %s"
 
-#: src/lyricwiki/lyricwiki.cc:259 src/lyricwiki-qt/lyricwiki.cc:264
+#: src/lyrics-common/chart_lyrics_provider.cc:121
+#: src/lyrics-common/chart_lyrics_provider.cc:194
+#: src/lyrics-common/lyrics_ovh_provider.cc:88
 msgid "Looking for lyrics ..."
-msgstr "Szukanie tekstu piosenk i ..."
+msgstr "Szukanie tekstu piosenki ..."
+
+#: src/lyrics-common/preferences.h:43
+msgid "Nowhere"
+msgstr "Nigdzie"
+
+#: src/lyrics-common/preferences.h:49
+msgid "Artist is truncated at the start, Title -- at the end"
+msgstr "Wykonawca jest skracany na początku, tytuł -- na końcu"
 
-#: src/lyricwiki/lyricwiki.cc:267 src/lyricwiki-qt/lyricwiki.cc:272
-msgid "Missing song metadata"
-msgstr "Brakujące metadane utworu"
+#: src/lyrics-common/preferences.h:50
+msgid "Chars to truncate on:"
+msgstr "Znaki do obcięcia:"
 
-#: src/lyricwiki/lyricwiki.cc:278 src/lyricwiki-qt/lyricwiki.cc:283
-msgid "Connecting to lyrics.wikia.com ..."
-msgstr "Łączenie z lyrics.wikia.com ..."
+#: src/lyrics-common/preferences.h:54
+msgid "Chars are ORed in RegExp, surrounded by whitespace"
+msgstr "Znaki są OR-owane w RegExp, otoczone białymi znakami"
 
-#: src/lyricwiki-qt/lyricwiki.cc:55
-msgid "LyricWiki Plugin (Qt)"
-msgstr "Wtyczka LyricWiki (Qt)"
+#: src/lyrics-common/preferences.h:55
+msgid "Chars to split on:"
+msgstr "Znaki do podziału:"
 
-#: src/m3u/m3u.cc:32
+#: src/lyrics-common/preferences.h:56
+msgid "Further truncate those on chars"
+msgstr "Dalsze obcięcie tych na znakach"
+
+#: src/lyrics-common/preferences.h:62
+msgid "General"
+msgstr "Główne"
+
+#: src/lyrics-common/preferences.h:63
+msgid "Split title into artist and title on chars"
+msgstr "Podziel tytuł na wykonawcę i tytuł na znakach"
+
+#: src/lyrics-common/preferences.h:66
+msgid "Sources"
+msgstr "Źródła"
+
+#: src/lyrics-common/preferences.h:67
+msgid "Use embedded lyrics (from Lyrics tag)"
+msgstr "Użyj osadzonych tekstów piosenek (z tagu Teksty piosenek)"
+
+#: src/lyrics-common/preferences.h:69
+msgid "Fetch lyrics from internet:"
+msgstr "Pobierz teksty piosenek z Internetu:"
+
+#: src/lyrics-common/preferences.h:72
+msgid "Store fetched lyrics in local cache"
+msgstr "Przechowuj pobrane teksty piosenek w lokalnej pamięci podręcznej"
+
+#: src/lyrics-common/preferences.h:74
+msgid "Local Storage"
+msgstr "Pamięć lokalna"
+
+#: src/lyrics-common/preferences.h:75
+msgid "Load lyric files (.lrc) from local storage"
+msgstr "Załaduj pliki tekstów utworów (.lrc) z pamięci lokalnej"
+
+#: src/lyrics-common/utils.cc:54 src/ui-common/dialogs-qt.cc:63
+msgid "Error"
+msgstr "Błąd"
+
+#: src/lyrics-common/utils.cc:60
+msgid "Lyrics could not be found."
+msgstr "Nie można znaleźć tekstu piosenki."
+
+#: src/lyrics-common/utils.cc:142
+msgid "Missing title and/or artist."
+msgstr "Brak tytułu i/lub wykonawcy."
+
+#: src/lyrics-gtk/lyrics-gtk.cc:37 src/lyrics-qt/lyrics-qt.cc:50
+msgid "Lyrics"
+msgstr "Teksty piosenek"
+
+#: src/lyrics-gtk/lyrics-gtk.cc:189 src/lyrics-qt/lyrics-qt.cc:171
+msgid "Edit Lyrics ..."
+msgstr "Edycja tekstu utworu..."
+
+#: src/lyrics-gtk/lyrics-gtk.cc:195 src/lyrics-qt/lyrics-qt.cc:178
+msgid "Save Locally"
+msgstr "Zapisz lokalnie"
+
+#: src/lyrics-gtk/lyrics-gtk.cc:201 src/lyrics-qt/lyrics-qt.cc:186
+msgid "Refresh"
+msgstr "Odśwież"
+
+#: src/m3u/m3u.cc:33
 msgid "M3U Playlists"
 msgstr "Lista odtwarzania M3U"
 
@@ -2439,17 +2606,17 @@
 msgid "Tact Generator"
 msgstr "Generator taktu"
 
-#: src/metronom/metronom.cc:147
+#: src/metronom/metronom.cc:145
 #, c-format
 msgid "Tact generator: %d bpm"
 msgstr "Generator taktu: %d uderzeń na minutę"
 
-#: src/metronom/metronom.cc:149
+#: src/metronom/metronom.cc:147
 #, c-format
 msgid "Tact generator: %d bpm %d/%d"
 msgstr "Generator taktu: %d bpm %d/%d"
 
-#: src/metronom/metronom.cc:237
+#: src/metronom/metronom.cc:235
 msgid ""
 "A Tact Generator by Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
 "\n"
@@ -2462,25 +2629,25 @@
 "Instrukcja: wprowadź adres URL: tact://uderzenia*liczba jednostek "
 "metrycznych/jednostka metryczna\n"
 "na przykład tact://77 aby wygenerować 77 uderzeń na minutę\n"
-"lub tact://60*3/4 aby wygenerować 60 uderzeń na minutę w metrum 3/4."
+"lub tact://60*3/4 aby wygenerować 60 uderzeń na minutę w metrum 3/4"
 
-#: src/mixer/mixer.cc:38
+#: src/mixer/mixer.cc:43
 msgid "Channel Mixer"
 msgstr "Mikser kanałów"
 
-#: src/mixer/mixer.cc:202
+#: src/mixer/mixer.cc:255
 msgid ""
 "Channel Mixer Plugin for Audacious\n"
 "Copyright 2011-2012 John Lindgren and Michał Lipski"
 msgstr ""
-"Wtyczka miksera kanałów dla Audacious\n"
+"Wtyczka miksera kanałów dla Audaciousa\n"
 "Prawa autorskie 2011-2012 John Lindgren i Michał Lipski"
 
-#: src/mixer/mixer.cc:206
+#: src/mixer/mixer.cc:259
 msgid "Channel Mixer"
 msgstr "Mikser kanałów"
 
-#: src/mixer/mixer.cc:207
+#: src/mixer/mixer.cc:260
 msgid "Output channels:"
 msgstr "Ilość kanałów wyjściowych:"
 
@@ -2492,169 +2659,177 @@
 msgid "Error connecting to MMS server"
 msgstr "Błąd połączenia z serwerem MMS"
 
-#: src/modplug/modplugbmp.h:53
+#: src/modplug/modplugbmp.h:57
 msgid "ModPlug (Module Player)"
 msgstr "ModPlug (odtwarzacz modułów)"
 
-#: src/modplug/plugin_main.cc:53
-msgid "Resolution"
-msgstr "Rozdzielczość bitowa"
-
-#: src/modplug/plugin_main.cc:54
-msgid "8-bit"
-msgstr "8 bitów"
-
 #: src/modplug/plugin_main.cc:55
-msgid "16-bit"
-msgstr "16 bitów"
-
-#: src/modplug/plugin_main.cc:56
 msgid "Channels"
 msgstr "Kanały"
 
-#: src/modplug/plugin_main.cc:60
+#: src/modplug/plugin_main.cc:59
 msgid "Nearest (fastest)"
 msgstr "Najbliższa (najszybsza)"
 
-#: src/modplug/plugin_main.cc:61
+#: src/modplug/plugin_main.cc:60
 msgid "Linear (fast)"
 msgstr "Liniowa (szybka)"
 
-#: src/modplug/plugin_main.cc:62
+#: src/modplug/plugin_main.cc:61
 msgid "Spline (good)"
 msgstr "Krzywa (dobra)"
 
-#: src/modplug/plugin_main.cc:63
+#: src/modplug/plugin_main.cc:62
 msgid "Polyphase (best)"
 msgstr "Przesunięcie fazowe (najlepsza)"
 
-#: src/modplug/plugin_main.cc:64
+#: src/modplug/plugin_main.cc:63
 msgid "Sample rate"
 msgstr "Częstotliwość próbkowania"
 
-#: src/modplug/plugin_main.cc:65
+#: src/modplug/plugin_main.cc:64
 msgid "22 kHz"
 msgstr "22 kHz"
 
-#: src/modplug/plugin_main.cc:66
+#: src/modplug/plugin_main.cc:65
 msgid "44 kHz"
 msgstr "44 kHz"
 
-#: src/modplug/plugin_main.cc:67
+#: src/modplug/plugin_main.cc:66
 msgid "48 kHz"
 msgstr "48 kHz"
 
-#: src/modplug/plugin_main.cc:68
+#: src/modplug/plugin_main.cc:67
 msgid "96 kHz"
 msgstr "96 kHz"
 
-#: src/modplug/plugin_main.cc:72 src/modplug/plugin_main.cc:77
-#: src/modplug/plugin_main.cc:82
+#: src/modplug/plugin_main.cc:71 src/modplug/plugin_main.cc:76
+#: src/modplug/plugin_main.cc:81
 msgid "Level:"
 msgstr "Poziom:"
 
-#: src/modplug/plugin_main.cc:78
+#: src/modplug/plugin_main.cc:77
 msgid "Cutoff:"
 msgstr "Odcięcie:"
 
-#: src/modplug/plugin_main.cc:91
+#: src/modplug/plugin_main.cc:90
 msgid "Reverb"
 msgstr "Echo"
 
-#: src/modplug/plugin_main.cc:94
+#: src/modplug/plugin_main.cc:93
 msgid "Bass Boost"
 msgstr "Podbicie basów"
 
-#: src/modplug/plugin_main.cc:97
+#: src/modplug/plugin_main.cc:96
 msgid "Surround"
 msgstr "Dźwięk przestrzenny"
 
-#: src/modplug/plugin_main.cc:100
+#: src/modplug/plugin_main.cc:99
 msgid "Preamp"
 msgstr "Przedwzmacniacz"
 
-#: src/modplug/plugin_main.cc:107
+#: src/modplug/plugin_main.cc:106
 msgid "Oversample"
 msgstr "Próbkowanie nadmiarowe"
 
-#: src/modplug/plugin_main.cc:108
+#: src/modplug/plugin_main.cc:107
 msgid "Noise reduction"
 msgstr "Redukcja szumów"
 
-#: src/modplug/plugin_main.cc:109
+#: src/modplug/plugin_main.cc:108
 msgid "Play Amiga MODs"
 msgstr "Odtwórz MOD-y Amigi"
 
-#: src/modplug/plugin_main.cc:110
+#: src/modplug/plugin_main.cc:109
 msgid "Repeat"
 msgstr "Powtórz"
 
-#: src/modplug/plugin_main.cc:111
+#: src/modplug/plugin_main.cc:110
 msgid "Repeat count:"
 msgstr "Ilość powtórzeń:"
 
-#: src/modplug/plugin_main.cc:112
+#: src/modplug/plugin_main.cc:111
 msgid "To repeat forever, set the repeat count to -1."
 msgstr "By powtarzać bez końca ustaw -1."
 
-#: src/modplug/plugin_main.cc:125 src/sid/xs_config.cc:106
+#: src/modplug/plugin_main.cc:124 src/sid/xs_config.cc:106
 msgid "These settings will take effect when Audacious is restarted."
 msgstr ""
 "Poniższe ustawienia zostaną wprowadzone w życie po restarcie Audaciousa."
 
+#: src/moonstone/main_window.cc:72 src/moonstone/main_window.cc:73
+#: src/qtui/main_window.cc:159 src/qtui/main_window.cc:160
+#: src/skins/menus.cc:107 src/skins-qt/menus.cc:98
+msgid "Stop After This Song"
+msgstr "Zatrzymaj odtwarzanie po tej piosence"
+
+#: src/moonstone/moonstone.cc:39
+msgid "Moonstone"
+msgstr "Kamień księżycowy"
+
+#: src/moonstone/playlist_header.cc:212 src/qtui/playlist_header.cc:258
+msgid "Reset to Defaults"
+msgstr "Przywróć do domyślnych"
+
+#: src/moonstone/playlist_model.cc:38 src/qtui/playlist_header.cc:232
+msgid "Now Playing"
+msgstr "Teraz odtwarzane"
+
+#: src/moonstone/playlist_selection.cc:66
+#: src/playlist-manager/playlist-manager.cc:201
+#: src/playlist-manager-qt/playlist-manager-qt.cc:190
+msgid "Entries"
+msgstr "Wpisy"
+
 #: src/mpg123/mpg123.cc:54
 msgid "MPG123 Plugin"
 msgstr "Wtyczka MPG123"
 
-#: src/mpg123/mpg123.cc:83
-msgid "Advanced"
-msgstr "Zaawansowane"
-
-#: src/mpg123/mpg123.cc:84
+#: src/mpg123/mpg123.cc:82
 msgid "Use accurate length calculation (slow)"
 msgstr "Użyj dokładnego obliczania długości (wolne)"
 
-#: src/mpg123/mpg123.cc:248
+#: src/mpg123/mpg123.cc:260
 msgid "Surround"
 msgstr "Dźwięk przestrzenny"
 
-#: src/mpris2/plugin.cc:39
+#: src/mpris2/plugin.cc:40
 msgid "MPRIS 2 Server"
 msgstr "Serwer MPRIS 2"
 
-#: src/neon/neon.cc:97
+#: src/neon/neon.cc:102
 msgid "Neon HTTP/HTTPS Plugin"
 msgstr "Wtyczka Neon HTTP/HTTPS"
 
-#: src/neon/neon.cc:521
+#: src/neon/neon.cc:526
 msgid "Error parsing redirect"
 msgstr "Błąd przetwarzania przekierowania"
 
-#: src/neon/neon.cc:535
+#: src/neon/neon.cc:540
 msgid "Unknown HTTP error"
 msgstr "Nieznany błąd HTTP"
 
-#: src/neon/neon.cc:569
+#: src/neon/neon.cc:614
 msgid "Error parsing URL"
 msgstr "Błąd przetwarzania adresu URL"
 
-#: src/neon/neon.cc:632
+#: src/neon/neon.cc:687
 msgid "Too many redirects"
 msgstr "Za dużo przekierowań"
 
-#: src/notify/event.cc:64
+#: src/notify/event.cc:97
 msgid "Stopped"
 msgstr "Zatrzymany"
 
-#: src/notify/event.cc:64
+#: src/notify/event.cc:97
 msgid "Audacious is not playing."
 msgstr "Audacious nie odtwarza."
 
-#: src/notify/notify.cc:42
+#: src/notify/notify.cc:39
 msgid "Desktop Notifications"
 msgstr "Powiadomienia na pulpicie"
 
-#: src/notify/notify.cc:60
+#: src/notify/notify.cc:57
 msgid ""
 "Desktop Notifications Plugin for Audacious\n"
 "Copyright (C) 2010 Maximilian Bogner\n"
@@ -2692,36 +2867,81 @@
 "Publicznej GNU (GNU General Public License); jeśli nie, odwiedź <http://www."
 "gnu.org/licenses/>."
 
-#: src/notify/notify.cc:110
+#: src/notify/notify.cc:104
 msgid "Show playback controls"
 msgstr "Pokaż kontrolki odtwarzania"
 
-#: src/notify/notify.cc:112
+#: src/notify/notify.cc:106
 msgid "Always show notification"
 msgstr "Zawsze pokazuj powiadomienia"
 
-#: src/notify/notify.cc:114
+#: src/notify/notify.cc:108
 msgid "Include album name in notification"
 msgstr "Dołącz nazwę albumu do powiadomienia"
 
-#: src/notify/osd.cc:58
+#: src/notify/notify.cc:110
+msgid "Custom notification duration:"
+msgstr "Niestandardowy czas trwania powiadomienia:"
+
+#: src/notify/osd.cc:74
 msgid "Show"
 msgstr "Pokaż"
 
-#: src/notify/osd.cc:66 src/qtui/main_window.cc:178
-#: src/qtui/main_window.cc:179 src/skins/menus.cc:88
-msgid "Pause"
-msgstr "Wstrzymaj"
+#: src/openmpt/mpt.cc:50
+msgid "OpenMPT (Module Player)"
+msgstr "OpenMPT (odtwarzacz modułów)"
 
-#: src/notify/osd.cc:73 src/qtui/main_window.cc:72 src/skins/menus.cc:91
-msgid "Next"
-msgstr "Następne"
+#: src/openmpt/mpt.cc:132
+msgid ""
+"Module player based on libopenmpt\n"
+"\n"
+"Written by: Chris Spiegel <cspiegel@gmail.com>"
+msgstr ""
+"Odtwarzacz modułów oparty na libopenmpt\n"
+"\n"
+"Napisany przez: Chris Spiegel <cspiegel@gmail.com>"
+
+#: src/openmpt/mpt.cc:151
+msgid "Stereo separation:"
+msgstr "Separacja stereo:"
+
+#: src/openmpt/mpt.cc:153
+msgid "% (0=mono, 100=default, 200=full)"
+msgstr "% (0=mono, 100=domyślne, 200=pełne)"
+
+#: src/openmpt/mpt.cc:157
+msgid "Interpolation:"
+msgstr "Interpolacja:"
+
+#: src/openmpt/mptwrap.h:51 src/soxr/sox-resampler.cc:189 src/xsf/plugin.cc:437
+msgid "Linear"
+msgstr "Liniowa"
+
+#: src/openmpt/mptwrap.h:52
+msgid "Cubic"
+msgstr "Kubiczna"
+
+#: src/openmpt/mptwrap.h:53
+msgid "Windowed sinc"
+msgstr "Okienkowa sinc"
 
-#: src/oss4/oss.h:93
+#: src/opus/opus.cc:39
+msgid "Opus Decoder"
+msgstr "Dekoder Opus"
+
+#: src/opus/opus.cc:336
+msgid ""
+"Opus Decoder Plugin for Audacious\n"
+"Copyright 2022 Thomas Lange"
+msgstr ""
+"Dekoder Opus dla Audaciousa\n"
+"Prawa autorskie 2022 Thomas Lange"
+
+#: src/oss4/oss.h:70
 msgid "OSS4 Output"
 msgstr "Wyjście OSS4"
 
-#: src/oss4/oss.h:95
+#: src/oss4/oss.h:72
 msgid "OSS3 Output"
 msgstr "Wyjście OSS3"
 
@@ -2729,27 +2949,27 @@
 msgid "Default device"
 msgstr "Domyślne urządzenie"
 
-#: src/oss4/plugin.cc:77
+#: src/oss4/plugin.cc:78
 msgid "Audio device:"
 msgstr "Urządzenie dźwiękowe:"
 
-#: src/oss4/plugin.cc:80
+#: src/oss4/plugin.cc:81
 msgid "Use alternate device:"
 msgstr "Użyj alternatywnego urządzenia:"
 
-#: src/oss4/plugin.cc:84
+#: src/oss4/plugin.cc:85
 msgid "Save volume between sessions."
 msgstr "Zapisz poziom głośności."
 
-#: src/oss4/plugin.cc:86
+#: src/oss4/plugin.cc:87
 msgid "Enable format conversions made by the OSS software."
-msgstr "Włącz konwersje formatu poprzez oprogramowanie OSS"
+msgstr "Włącz konwersje formatu poprzez oprogramowanie OSS."
 
-#: src/oss4/plugin.cc:88
+#: src/oss4/plugin.cc:89
 msgid "Enable exclusive mode to prevent virtual mixing."
 msgstr "Włącz tryb wyłączności, aby wyłączyć programowe miksowanie."
 
-#: src/oss4/plugin.cc:100
+#: src/oss4/plugin.cc:101
 msgid ""
 "OSS4 Output Plugin for Audacious\n"
 "Copyright 2010-2012 Michał Lipski\n"
@@ -2757,26 +2977,47 @@
 "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 ""
-"Wtyczka wyjścia OSS4 dla Audaciousa Prawa autorskie: 2010-2012 Michał "
-"Lipski\n"
+"Wtyczka wyjścia OSS4 dla Audaciousa\n"
+"Prawa autorskie 2010-2012 Michał Lipski\n"
 "\n"
 "Chciałbym wyrazić wdzięczność bywalcom kanału #audacious, szczególnie "
 "Tony'emu Vroonowi oraz Johnowi Lindgrenowi, a także, naturalnie, autorom "
 "poprzedniej wtyczki OSS."
 
-#: src/playlist-manager/playlist-manager.cc:37
+#: src/pipewire/pipewire.cc:44
+msgid "PipeWire Output"
+msgstr "Wyjście PipeWire"
+
+#: src/pipewire/pipewire.cc:118
+msgid ""
+"PipeWire Output Plugin for Audacious\n"
+"Copyright 2022 Thomas Lange\n"
+"\n"
+"Based on the PipeWire Output Plugin for Qmmp\n"
+"Copyright 2021 Ilya Kotov"
+msgstr ""
+"Wtyczka wyjścia PipeWire dla Audaciousa\n"
+"Prawa autorskie 2022 Thomas Lange\n"
+"\n"
+"Oparta na wtyczce wyjścia PipeWire dla Audaciousa\n"
+"Prawa autorskie 2021 Ilya Kotov"
+
+#: src/pipewire/pipewire.cc:408 src/skins/menus.cc:88 src/skins-qt/menus.cc:79
+msgid "Playback"
+msgstr "Odtwarzanie"
+
+#: src/playlist-manager/playlist-manager.cc:38
+#: src/playlist-manager-qt/playlist-manager-qt.cc:42
 msgid "Playlist Manager"
 msgstr "Menedżer list odtwarzania"
 
-#: src/playlist-manager/playlist-manager.cc:226
-msgid "Entries"
-msgstr "Wpisy"
-
-#: src/playlist-manager/playlist-manager.cc:245
+#: src/playlist-manager/playlist-manager.cc:221
+#: src/playlist-manager-qt/playlist-manager-qt.cc:356
 msgid "_Remove"
 msgstr "_Usuń"
 
-#: src/playlist-manager/playlist-manager.cc:246
+#: src/playlist-manager/playlist-manager.cc:222
+#: src/playlist-manager-qt/playlist-manager-qt.cc:351
 msgid "Ren_ame"
 msgstr "_Zmień nazwę"
 
@@ -2784,57 +3025,69 @@
 msgid "PLS Playlists"
 msgstr "Listy odtwarzania PLS"
 
-#: src/psf/plugin.cc:45
+#: src/psf/plugin.cc:53
 msgid "OpenPSF PSF1/PSF2 Decoder"
 msgstr "Dekoder OpenPSF PSF1/PSF2"
 
-#: src/pulse_audio/pulse_audio.cc:38
+#: src/psf/plugin.cc:270
+msgid "OpenPSF Configuration"
+msgstr "Konfiguracja OpenPSF"
+
+#: src/psf/plugin.cc:271 src/xsf/plugin.cc:444
+msgid "Ignore length from file"
+msgstr "Ignorowanie czasu trwania z pliku"
+
+#: src/pulse/pulse_audio.cc:42
 msgid "PulseAudio Output"
 msgstr "Wyjście PulseAudio"
 
-#: src/pulse_audio/pulse_audio.cc:611
+#: src/pulse/pulse_audio.cc:84
+msgid "Context name:"
+msgstr "Nazwa kontekstu:"
+
+#: src/pulse/pulse_audio.cc:86
+msgid "Stream name:"
+msgstr "Nazwa strumienia:"
+
+#: src/pulse/pulse_audio.cc:596
 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 ""
-"Wtyczka wyjścia PulseAudio dla Audaciousa\n"
-"Niniejszy program jest wolnym oprogramowaniem; możesz go\n"
-"rozprowadzać dalej i/lub modyfikować na warunkach Powszechnej\n"
-"Licencji Publicznej GNU, wydanej przez Fundację Wolnego\n"
-"Oprogramowania - według wersji 2-giej tej Licencji lub którejś\n"
-"z późniejszych wersji. \n"
-"\n"
-"Niniejszy program rozpowszechniany jest z nadzieją, iż będzie on \n"
-"użyteczny - jednak BEZ JAKIEJKOLWIEK GWARANCJI, nawet domyślnej \n"
-"gwarancji PRZYDATNOŚCI HANDLOWEJ albo PRZYDATNOŚCI DO OKREŚLONYCH \n"
-"ZASTOSOWAŃ. W celu uzyskania bliższych informacji - Powszechna \n"
-"Licencja Publiczna GNU. \n"
-"\n"
-"Z pewnością wraz z niniejszym programem otrzymałeś też egzemplarz \n"
-"Powszechnej Licencji Publicznej GNU (GNU General Public License);\n"
-"jeśli nie - napisz do Free Software Foundation, Inc., 51 Franklin Street, "
-"Fifth Floor, Boston, MA 02110-1301,\n"
-"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 ""
+"Plugin wyjściowy Audacious PulseAudio\n"
+"\n"
+"Ten program jest darmowym oprogramowaniem; możesz go re-dystrybuować i/lub "
+"modyfikować zgodnie z warunkami licencji GNU General Public License, która "
+"została opublikowana przez Free Software Foundation; zarówno w wersji 2 lub "
+"(wedle życzenia) którejkolwiek późniejszej wersji licencji.\n"
+"\n"
+"Ten program jest dystrybuowany w nadziei, że będzie użyteczny, ale BEZ "
+"JAKIEJKOLWIEK GWARANCJI; Nawet bez domyślnej gwarancji HANDLOWEJ lub "
+"PRZYDATNOŚCI DO OKREŚLONEGO CELU. Zobacz licencję GNU General Public "
+"License w celu poznania szczegółów.\n"
+"\n"
+"Powinieneś otrzymać kopię licencji GNU General Public License razem z tym "
+"programem; Jeżeli tak się nie stało, napisz do Free Software Foundation, "
+"Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 
-#: src/qtaudio/qtaudio.cc:49
+#: src/qtaudio/qtaudio.cc:53
 msgid "QtMultimedia Output"
 msgstr "Wyjście QtMultimedia"
 
-#: src/qtaudio/qtaudio.cc:77
+#: src/qtaudio/qtaudio.cc:84
 msgid ""
 "QtMultimedia Audio Output Plugin for Audacious\n"
 "Copyright 2014 William Pitcock\n"
@@ -2842,56 +3095,116 @@
 "Based on SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
 msgstr ""
-"Wtyczka wyjścia dźwiękowego QtMultimedia dla Audacious\n"
+"Wtyczka wyjścia dźwiękowego QtMultimedia dla Audaciousa\n"
 "Prawa autorskie 2014 William Pitcock\n"
 "\n"
 "Oparta na wtyczce wyjścia SDL dla Audacious\n"
 "Prawa autorskie 2010 John Lindgren"
 
-#: src/qtui/dialog_windows.cc:31
-msgid "Working ..."
-msgstr "Działanie..."
+#: src/qtglspectrum/gl-spectrum.cc:41
+msgid ""
+"OpenGL Spectrum Analyzer for Audacious\n"
+"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
+"Copyright 2014, 2020 Ariadne Conill\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 spektrum OpenGL dla Audaciousa\n"
+"Prawa autorskie: 2013 Christophe Budé, John Lindgren i Carlo Bramini\n"
+"Prawa autorskie 2014, 2020 Ariadne Conill\n"
+"\n"
+"Na podstawie wtyczki XMMS-a:\n"
+"Prawa autorskie 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas "
+"Nilsson i 4Front Technologies\n"
+"\n"
+"Licencja: GPL wersja 2 i późniejsze"
 
-#: src/qtui/filter_input.cc:44 src/skins/ui_playlist.cc:221
-msgid "Search"
-msgstr "Szukaj"
+#: src/qthotkey/gui.cc:177
+msgid "Press a key combination inside a text field."
+msgstr "Naciśnij kombinację klawiszy w polu tekstowym."
+
+#: src/qthotkey/plugin.cc:105
+msgid ""
+"Global Hotkey Plugin\n"
+"Control the player with global key combinations or multimedia keys.\n"
+"\n"
+"Copyright (C) 2020 i.Dark_Templar <darktemplar@dark-templar-archives.net>\n"
+"Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n"
+"\n"
+"Contributors 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 ""
+"Wtyczka globalnych skrótów klawiszowych\n"
+"Steruj odtwarzaniem przy użyciu globalnych skrótów klawiszowych lub "
+"przycisków multimedialnych.\n"
+"\n"
+"Prawa autorskie (C) 2020 i.Dark_Templar <darktemplar@dark-templar-archives."
+"net>\n"
+"Prawa autorskie (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n"
+"\n"
+"Przyczynili się:\n"
+"Prawa autorskie (C) 2006-2007 Vladimir Paskov <vlado.paskov@gmail.com>\n"
+"Prawa autorskie (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/qtui/main_window_actions.cc:94
+#: src/qtui/menus.cc:109
 msgid "_Open Folder ..."
 msgstr "_Otwórz katalog..."
 
-#: src/qtui/main_window_actions.cc:96
+#: src/qtui/menus.cc:115
 msgid "_Add Folder ..."
 msgstr "_Dodaj katalog..."
 
-#: src/qtui/main_window_actions.cc:101
+#: src/qtui/menus.cc:128
 msgid "_Log Inspector ..."
-msgstr "_Dziennik programu"
+msgstr "_Dziennik programu..."
 
-#: src/qtui/main_window.cc:64
-msgid "Open Files"
-msgstr "Otwórz pliki"
+#: src/qtui/menus.cc:220
+msgid "_Find ..."
+msgstr "_Znajdź ..."
 
-#: src/qtui/main_window.cc:66
-msgid "Add Files"
-msgstr "Dodaj pliki"
+#: src/qtui/menus.cc:256 src/skins/menus.cc:80 src/skins-qt/menus.cc:70
+msgid "Audio Settings ..."
+msgstr "Ustawienia dźwięku..."
 
-#: src/qtui/main_window.cc:71 src/skins/menus.cc:90
-msgid "Previous"
-msgstr "Poprzednie"
+#: src/qtui/playlist_model.cc:188
+msgid "Q#"
+msgstr "#PK"
 
-#: src/qtui/main_window.cc:77 src/skins/menus.cc:82
-msgid "Repeat"
-msgstr "Powtarzaj"
+#: src/qtui/playlist_model.cc:190
+msgid "T#"
+msgstr "#Ś"
 
-#: src/qtui/main_window.cc:79 src/skins/menus.cc:83
-msgid "Shuffle"
-msgstr "Losowa kolejność"
+#: src/qtui/playlist_model.cc:192
+msgid "C#"
+msgstr "#K"
+
+#: src/qtui/playlist_model.cc:194
+msgid "D#"
+msgstr "#P"
 
-#: src/qtui/qtui.cc:42
+#: src/qtui/qtui.cc:40
 msgid "Qt Interface"
 msgstr "Interfejs Qt"
 
+#: src/qtui/search_bar.cc:46
+msgid "Search playlist"
+msgstr "Wyszukaj listę odtwarzania"
+
+#: src/qtui/settings.cc:79
+msgid "Use bold font for column headers"
+msgstr "Użyj pogrubionej czcionki w nagłówkach kolumn"
+
 #: src/resample/resample.cc:43
 msgid "Sample Rate Converter"
 msgstr "Konwerter częstotliwości próbkowania"
@@ -2901,7 +3214,7 @@
 "Sample Rate Converter Plugin for Audacious\n"
 "Copyright 2010-2012 John Lindgren"
 msgstr ""
-"Wtyczka konwertera częstotliwości próbkowania dla Audacious\n"
+"Wtyczka konwertera częstotliwości próbkowania dla Audaciousa\n"
 "Prawa autorskie 2010-2012 John Lindgren"
 
 #: src/resample/resample.cc:187
@@ -2932,7 +3245,7 @@
 msgid "Method:"
 msgstr "Metoda:"
 
-#: src/resample/resample.cc:199 src/sox-resampler/sox-resampler.cc:161
+#: src/resample/resample.cc:199 src/soxr/sox-resampler.cc:203
 msgid "Rate:"
 msgstr "Klasa:"
 
@@ -2984,65 +3297,53 @@
 msgid "192 kHz:"
 msgstr "192 kHz:"
 
-#: src/scrobbler2/config_window.cc:41
-#, c-format
-msgid "OK. Scrobbling for user: %s"
-msgstr "OK, Scrobblowanie dla użytkownika: %s"
-
-#: src/scrobbler2/config_window.cc:54
-msgid "Permission Denied"
-msgstr "Brak zezwolenia"
-
-#: src/scrobbler2/config_window.cc:56
-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.cc:29
+msgid "Checking Last.fm access ..."
+msgstr "Sprawdzam dostęp do Last.fm ..."
 
-#: src/scrobbler2/config_window.cc:66
-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.cc:69 src/scrobbler2/config_window.cc:80
+#: src/scrobbler2/config_window.cc:35
 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."
+"Your scrobbles are being saved on your computer temporarily. They will be "
+"submitted as soon as Audacious is allowed access."
 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."
+"Twoje nazwy odtworzonych utworów są tymczasowo zapisywane na twoim "
+"komputerze. Zostaną wysłane kiedy tylko Audacious będzie miał dostęp."
 
-#: src/scrobbler2/config_window.cc:77
-msgid "Network Problem."
-msgstr "Problem z siecią."
+#: src/scrobbler2/config_window.cc:41
+#, c-format
+msgid "Permission granted. Scrobbling for user %s."
+msgstr "Uprawnienia przyznane. Scrobbling dla użytkownika %s."
 
-#: src/scrobbler2/config_window.cc:78
-msgid "There was a problem contacting Last.fm. Please try again later."
+#: src/scrobbler2/config_window.cc:44
+msgid ""
+"Permission denied. Open the following URL in a browser, allow Audacious "
+"access to your account, and then click 'Check Permission' again:"
 msgstr ""
-"Wystąpił problem przy skontaktowaniu się z Last.fm. Proszę spróbuj ponownie."
+"Brak uprawnień. Otwórz następujący URL w przeglądarce, zezwól Audacious na "
+"dostęp do swojego konta i następnie kliknij ponownie 'Sprawdź uprawnienia':"
 
-#: src/scrobbler2/config_window.cc:110
-msgid "Checking..."
-msgstr "Sprawdzanie..."
+#: src/scrobbler2/config_window.cc:53
+msgid "There was a problem contacting Last.fm."
+msgstr "Wystąpił problem łączenia z Last.fm."
 
-#: src/scrobbler2/config_window.cc:176
-msgid "C_heck Permission"
-msgstr "S_prawdź zezwolenia"
+#: src/scrobbler2/config_window.cc:92
+msgid "Check Permission"
+msgstr "Sprawdź uprawnienia"
 
-#: src/scrobbler2/config_window.cc:177
-msgid "_Revoke Permission"
-msgstr "U_nieważnij pozwolenia"
+#: src/scrobbler2/config_window.cc:93
+msgid "Revoke Permission"
+msgstr "Unieważnij uprawnienia"
 
-#: src/scrobbler2/config_window.cc:220
-msgid ""
-"You need to allow Audacious to scrobble tracks to your Last.fm account.\n"
+#: src/scrobbler2/config_window.cc:97
+msgid "You need to allow Audacious to scrobble tracks to your Last.fm account."
 msgstr ""
-"Musisz zezwolić Audacious na scrobblowanie utworów do twojego konta Last."
-"fm.\n"
+"Musisz pozwolić Audacious wysyłać nazwy ścieżek do swojego konta Last.fm."
 
 #: src/scrobbler2/scrobbler.cc:29
 msgid "Scrobbler 2.0"
 msgstr "Scrobbler 2.0"
 
-#: src/scrobbler2/scrobbler.cc:224
+#: src/scrobbler2/scrobbler.cc:200
 msgid ""
 "The Scrobbler plugin could not be started.\n"
 "There might be a problem with your installation."
@@ -3050,96 +3351,72 @@
 "Wtyczka Scrobbler nie mogła zostać uruchomiona.\n"
 "Prawdopodobnie wystąpił problem z Twoją instalacją."
 
-#: src/scrobbler2/scrobbler.cc:289
+#: src/scrobbler2/scrobbler.cc:245
 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"
+"project."
 msgstr ""
-"Wtyczka Scrobbler dla Audacious 2.0, przez Pitxyoki,\n"
+"Wtyczka Scrobbler 2.0 dla Audaciousa autorstwa Pitxyoki,\n"
 "\n"
 "Prawa autorskie © 2012-2013 Luís M. Picciochi Oliveira <Pitxyoki@Gmail.com>\n"
 "\n"
-"Podziękowania dla John Lindgren za wsparcie na początku projektu.\n"
-"\n"
+"Podziękowania dla Johna Lindgrena za wsparcie na początku projektu."
 
-#: src/scrobbler2/scrobbler_communication.cc:642
-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/sdlout.cc:48
+#: src/sdlout/sdlout.cc:43
 msgid "SDL Output"
 msgstr "Wyjście SDL"
 
-#: src/sdlout/sdlout.cc:77
+#: src/sdlout/sdlout.cc:72
 msgid ""
 "SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
 msgstr ""
-"Wtyczka wyjścia SDL dla Audacious\n"
+"Wtyczka wyjścia SDL dla Audaciousa\n"
 "Prawa autorskie 2010 John Lindgren"
 
-#: src/search-tool/search-tool.cc:116 src/search-tool/search-tool.cc:124
+#: src/search-tool/library.cc:35 src/search-tool/library.cc:46
+#: src/search-tool-qt/library.cc:35 src/search-tool-qt/library.cc:46
 msgid "Library"
 msgstr "Biblioteka"
 
-#: src/search-tool/search-tool.cc:394
-#, c-format
-msgid "%d result"
-msgid_plural "%d results"
-msgstr0 "%d wynik"
-msgstr1 "%d wyniki"
-msgstr2 "%d wyników"
-
-#: src/search-tool/search-tool.cc:400
-#, c-format
-msgid "(%d hidden)"
-msgid_plural "(%d hidden)"
-msgstr0 "(%d ukryty)"
-msgstr1 "(%d ukryte)"
-msgstr2 "(%d ukrytych)"
-
-#: src/search-tool/search-tool.cc:594
+#: src/search-tool-qt/search-model.cc:44 src/search-tool/search-tool.cc:287
 #, c-format
 msgid "%d song"
 msgid_plural "%d songs"
 msgstr0 "%d piosenka"
 msgstr1 "%d piosenki"
 msgstr2 "%d piosenek"
+msgstr3 "%d piosenek"
 
-#: src/search-tool/search-tool.cc:601
+#: src/search-tool-qt/search-model.cc:53 src/search-tool/search-tool.cc:294
 msgid "of this genre"
 msgstr "tego gatunku"
 
-#: src/search-tool/search-tool.cc:607
+#: src/search-tool-qt/search-model.h:47 src/search-tool/search-model.h:45
 msgid "on"
 msgstr "na"
 
-#: src/search-tool/search-tool.cc:607
+#: src/search-tool-qt/search-model.h:47 src/search-tool/search-model.h:45
 msgid "by"
 msgstr "przez"
 
-#: src/search-tool/search-tool.cc:643
-msgid "_Create Playlist"
-msgstr "_Utwórz listę odtwarzania"
-
-#: src/search-tool/search-tool.cc:645
-msgid "_Add to Playlist"
-msgstr "_Dodaj do listy odtwarzania"
-
-#: src/search-tool/search-tool.cc:684
-msgid "Search library"
-msgstr "Przeszukaj bibliotekę"
+#: src/search-tool-qt/search-tool-qt.cc:165 src/search-tool/search-tool.cc:74
+msgid "Number of results to show:"
+msgstr "Liczba pokazanych wyników:"
+
+#: src/search-tool-qt/search-tool-qt.cc:168 src/search-tool/search-tool.cc:77
+msgid "Rescan library at startup"
+msgstr "Przeszukaj bibliotekę podczas uruchamiania"
+
+#: src/search-tool-qt/search-tool-qt.cc:170
+msgid "Monitor library for changes"
+msgstr "Monitoruj bibliotekę pod kątem zmian"
 
-#: src/search-tool/search-tool.cc:688
+#: src/search-tool-qt/search-tool-qt.cc:193 src/search-tool/search-tool.cc:450
 msgid ""
 "To import your music library into Audacious, choose a folder and then click "
 "the \"refresh\" icon."
@@ -3147,22 +3424,48 @@
 "Aby zaimportować kolekcję muzyczną, proszę wybrać katalog i kliknąć przycisk "
 "ponownego wczytywania."
 
-#: src/search-tool/search-tool.cc:696
+#: src/search-tool-qt/search-tool-qt.cc:195 src/search-tool/search-tool.cc:459
 msgid "Please wait ..."
 msgstr "Proszę czekać ..."
 
-#: src/search-tool/search-tool.cc:723
+#: src/search-tool-qt/search-tool-qt.cc:197 src/search-tool/search-tool.cc:487
 msgid "Choose Folder"
 msgstr "Wybierz katalog"
 
+#: src/search-tool-qt/search-tool-qt.cc:201 src/search-tool/search-tool.cc:445
+msgid "Search library"
+msgstr "Przeszukaj bibliotekę"
+
+#: src/search-tool-qt/search-tool-qt.cc:327 src/search-tool/search-tool.cc:156
+#, c-format
+msgid "%d of %d result shown"
+msgid_plural "%d of %d results shown"
+msgstr0 "%d z %d pokazanego wyniku"
+msgstr1 "%d z %d pokazanych wyników"
+msgstr2 "%d z %d pokazanych wyników"
+msgstr3 "%d z %d pokazanych wyników"
+
+#: src/search-tool-qt/search-tool-qt.cc:331 src/search-tool/search-tool.cc:160
+#, c-format
+msgid "%d result"
+msgid_plural "%d results"
+msgstr0 "%d wynik"
+msgstr1 "%d wyniki"
+msgstr2 "%d wyników"
+msgstr3 "%d wyników"
+
+#: src/search-tool-qt/search-tool-qt.cc:501 src/search-tool/search-tool.cc:341
+msgid "_Create Playlist"
+msgstr "_Utwórz listę odtwarzania"
+
+#: src/search-tool-qt/search-tool-qt.cc:503 src/search-tool/search-tool.cc:343
+msgid "_Add to Playlist"
+msgstr "_Dodaj do listy odtwarzania"
+
 #: src/sid/xmms-sid.cc:43
 msgid "SID Player"
 msgstr "Odtwarzacz SID"
 
-#: src/sid/xs_config.cc:61
-msgid "Output"
-msgstr "Wyjście"
-
 #: src/sid/xs_config.cc:62
 msgid "Channels:"
 msgstr "Kanały:"
@@ -3232,7 +3535,7 @@
 "Silence Removal Plugin for Audacious\n"
 "Copyright 2014 John Lindgren"
 msgstr ""
-"Wtyczka usuwania ciszy dla Audacious\n"
+"Wtyczka usuwania ciszy dla Audaciousa\n"
 "Prawa autorskie 2014 John Lindgren"
 
 #: src/silence-removal/silence-removal.cc:67
@@ -3243,741 +3546,684 @@
 msgid "Threshold:"
 msgstr "Próg:"
 
-#: src/silence-removal/silence-removal.cc:70
-msgid "dB"
-msgstr "dB"
+#: src/skins/actions.cc:45 src/skins-qt/actions.cc:43
+msgid "Repeat points cleared."
+msgstr "Zresetowano punkty graniczne pętli."
+
+#: src/skins/actions.cc:60 src/skins-qt/actions.cc:58
+msgid "Repeat point A set."
+msgstr "Ustawiono punkt początkowy pętli."
+
+#: src/skins/actions.cc:65 src/skins-qt/actions.cc:63
+msgid "Repeat point B set."
+msgstr "Ustawiono punkt końcowy pętli."
+
+#: src/skins/equalizer.cc:223 src/skins-qt/equalizer.cc:223
+msgid "Preamp"
+msgstr "Przedwzmacniacz"
+
+#: src/skins/equalizer.cc:227 src/skins-qt/equalizer.cc:227
+msgid "31 Hz"
+msgstr "31 Hz"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "63 Hz"
+msgstr "63 Hz"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "125 Hz"
+msgstr "125 Hz"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "250 Hz"
+msgstr "250 Hz"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "500 Hz"
+msgstr "500 Hz"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "1 kHz"
+msgstr "1 kHz"
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "2 kHz"
+msgstr "2 kHz"
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "4 kHz"
+msgstr "4 kHz"
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "8 kHz"
+msgstr "8 kHz"
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "16 kHz"
+msgstr "16 kHz"
+
+#: src/skins/equalizer.cc:270 src/skins-qt/equalizer.cc:270
+msgid "Audacious Equalizer"
+msgstr "Korektor graficzny Audacious"
+
+#: src/skins/main.cc:459 src/skins-qt/main.cc:442
+msgid "Recording on"
+msgstr "Nagrywanie włączone"
+
+#: src/skins/main.cc:461 src/skins-qt/main.cc:444
+msgid "Recording off"
+msgstr "Nagrywanie wyłączone"
+
+#: src/skins/main.cc:754 src/skins-qt/main.cc:701
+#, c-format
+msgid "Seek to %d:%-2.2d / %d:%-2.2d"
+msgstr "Skocz do: %d:%-2.2d / %d:%-2.2d"
+
+#: src/skins/main.cc:771 src/skins-qt/main.cc:718
+#, c-format
+msgid "Volume: %d%%"
+msgstr "Głośność: %d%%"
+
+#: src/skins/main.cc:784 src/skins-qt/main.cc:731
+#, c-format
+msgid "Balance: %d%% left"
+msgstr "Balans: %d%% lewy"
+
+#: src/skins/main.cc:786 src/skins-qt/main.cc:733
+msgid "Balance: center"
+msgstr "Balans: centralny"
+
+#: src/skins/main.cc:788 src/skins-qt/main.cc:735
+#, c-format
+msgid "Balance: %d%% right"
+msgstr "Balans: %d%% prawy"
+
+#: src/skins/main.cc:880 src/skins-qt/main.cc:827
+msgid "Options Menu"
+msgstr "Menu opcji"
+
+#: src/skins/main.cc:884 src/skins-qt/main.cc:831
+msgid "Disable 'Always On Top'"
+msgstr "Wyłącz 'Zawsze na wierzchu'"
+
+#: src/skins/main.cc:886 src/skins-qt/main.cc:833
+msgid "Enable 'Always On Top'"
+msgstr "Włącz 'Zawsze na wierzchu'"
 
-#: src/skins/menus.cc:64
+#: src/skins/main.cc:889 src/skins-qt/main.cc:836
+msgid "File Info Box"
+msgstr "Obszar informacji o pliku"
+
+#: src/skins/main.cc:892 src/skins/menus.cc:149 src/skins-qt/main.cc:839
+#: src/skins-qt/menus.cc:142
+msgid "Double Size"
+msgstr "Podwójny rozmiar"
+
+#: src/skins/main.cc:895 src/skins-qt/main.cc:842
+msgid "Visualizations"
+msgstr "Wizualizacje"
+
+#: src/skins/menus.cc:74 src/skins-qt/menus.cc:64
+msgid "Volume Up"
+msgstr "Zwiększenie głośności"
+
+#: src/skins/menus.cc:75 src/skins-qt/menus.cc:65
+msgid "Volume Down"
+msgstr "Zmniejszenie głośności"
+
+#: src/skins/menus.cc:77 src/skins-qt/menus.cc:67
+msgid "Effects ..."
+msgstr "Efekty..."
+
+#: src/skins/menus.cc:84 src/skins-qt/menus.cc:74
 msgid "Open Files ..."
 msgstr "Otwórz pliki..."
 
-#: src/skins/menus.cc:65
+#: src/skins/menus.cc:85 src/skins-qt/menus.cc:76
 msgid "Open URL ..."
 msgstr "Otwórz URL..."
 
-#: src/skins/menus.cc:66
-msgid "Search Library"
-msgstr "Przeszukaj bibliotekę"
-
-#: src/skins/menus.cc:68
-msgid "Playback"
-msgstr "Odtwarzanie"
-
-#: src/skins/menus.cc:69
+#: src/skins/menus.cc:89 src/skins-qt/menus.cc:80
 msgid "Playlist"
 msgstr "Lista odtwarzania"
 
-#: src/skins/menus.cc:70
+#: src/skins/menus.cc:90 src/skins-qt/menus.cc:81
+msgid "Output"
+msgstr "Wyjście"
+
+#: src/skins/menus.cc:91 src/skins-qt/menus.cc:82
 msgid "View"
 msgstr "Widok"
 
-#: src/skins/menus.cc:72 src/skins/menus.cc:136 src/skins/menus.cc:149
-#: src/skins/menus.cc:214
+#: src/skins/menus.cc:93 src/skins/menus.cc:161 src/skins/menus.cc:174
+#: src/skins/menus.cc:245 src/skins-qt/menus.cc:84 src/skins-qt/menus.cc:156
+#: src/skins-qt/menus.cc:170 src/skins-qt/menus.cc:241
 msgid "Services"
 msgstr "Usługi"
 
-#: src/skins/menus.cc:74
+#: src/skins/menus.cc:95 src/skins-qt/menus.cc:86
 msgid "About ..."
-msgstr "O..."
+msgstr "Informacje o ..."
 
-#: src/skins/menus.cc:75
+#: src/skins/menus.cc:96 src/skins-qt/menus.cc:87
 msgid "Settings ..."
 msgstr "Ustawienia..."
 
-#: src/skins/menus.cc:76
+#: src/skins/menus.cc:97 src/skins-qt/menus.cc:88
 msgid "Quit"
 msgstr "Zakończ"
 
-#: src/skins/menus.cc:80 src/skins/menus.cc:206
+#: src/skins/menus.cc:101 src/skins/menus.cc:235 src/skins-qt/menus.cc:92
+#: src/skins-qt/menus.cc:231
 msgid "Song Info ..."
 msgstr "Informacje o piosence..."
 
-#: src/skins/menus.cc:84
+#: src/skins/menus.cc:105 src/skins-qt/menus.cc:96
+msgid "Shuffle by Album"
+msgstr "Losowa kolejność albumów"
+
+#: src/skins/menus.cc:106 src/skins-qt/menus.cc:97
 msgid "No Playlist Advance"
 msgstr "Odtwarzaj pojedynczo"
 
-#: src/skins/menus.cc:85
-msgid "Stop After This Song"
-msgstr "Zatrzymaj odtwarzanie po tym utworze"
-
-#: src/skins/menus.cc:93
+#: src/skins/menus.cc:117 src/skins-qt/menus.cc:108
 msgid "Set A-B Repeat"
 msgstr "Ustaw powtarzanie od punktu A do punktu B"
 
-#: src/skins/menus.cc:94
+#: src/skins/menus.cc:118 src/skins-qt/menus.cc:109
 msgid "Clear A-B Repeat"
 msgstr "Usuń powtarzanie A-B"
 
-#: src/skins/menus.cc:96
+#: src/skins/menus.cc:120 src/skins-qt/menus.cc:111
 msgid "Jump to Song ..."
 msgstr "Przejdź do piosenki..."
 
-#: src/skins/menus.cc:97
+#: src/skins/menus.cc:121 src/skins-qt/menus.cc:113
 msgid "Jump to Time ..."
 msgstr "Przejdź do czasu..."
 
-#: src/skins/menus.cc:101
+#: src/skins/menus.cc:125 src/skins-qt/menus.cc:118
 msgid "Play/Resume"
 msgstr "Odtwórz/Ponów"
 
-#: src/skins/menus.cc:103
+#: src/skins/menus.cc:127 src/skins-qt/menus.cc:120
 msgid "New Playlist"
 msgstr "Nowa lista odtwarzania"
 
-#: src/skins/menus.cc:104
+#: src/skins/menus.cc:128 src/skins-qt/menus.cc:121
 msgid "Rename Playlist ..."
 msgstr "Zmień nazwę listy odtwarzania..."
 
-#: src/skins/menus.cc:105
+#: src/skins/menus.cc:129 src/skins-qt/menus.cc:122
 msgid "Remove Playlist"
 msgstr "Usuń listę odtwarzania"
 
-#: src/skins/menus.cc:107
+#: src/skins/menus.cc:131 src/skins-qt/menus.cc:124
 msgid "Previous Playlist"
 msgstr "Poprzednia lista odtwarzania"
 
-#: src/skins/menus.cc:108
+#: src/skins/menus.cc:132 src/skins-qt/menus.cc:125
 msgid "Next Playlist"
 msgstr "Następna lista odtwarzania"
 
-#: src/skins/menus.cc:110
+#: src/skins/menus.cc:134 src/skins-qt/menus.cc:127
 msgid "Import Playlist ..."
 msgstr "Importuj listę odtwarzania..."
 
-#: src/skins/menus.cc:111
+#: src/skins/menus.cc:135 src/skins-qt/menus.cc:128
 msgid "Export Playlist ..."
 msgstr "Eksportuj listę odtwarzania..."
 
-#: src/skins/menus.cc:113
+#: src/skins/menus.cc:137 src/skins-qt/menus.cc:130
 msgid "Playlist Manager ..."
 msgstr "Menedżer list odtwarzania..."
 
-#: src/skins/menus.cc:114
+#: src/skins/menus.cc:138 src/skins-qt/menus.cc:131
 msgid "Queue Manager ..."
 msgstr "Menedżer kolejki..."
 
-#: src/skins/menus.cc:116
+#: src/skins/menus.cc:140 src/skins-qt/menus.cc:133
 msgid "Refresh Playlist"
 msgstr "Odśwież listę odtwarzania"
 
-#: src/skins/menus.cc:120
+#: src/skins/menus.cc:144 src/skins-qt/menus.cc:137
 msgid "Show Playlist Editor"
 msgstr "Okno listy odtwarzania"
 
-#: src/skins/menus.cc:121
+#: src/skins/menus.cc:145 src/skins-qt/menus.cc:138
 msgid "Show Equalizer"
 msgstr "Okno korektora graficznego"
 
-#: src/skins/menus.cc:123
+#: src/skins/menus.cc:147 src/skins-qt/menus.cc:140
 msgid "Show Remaining Time"
 msgstr "Pokaż pozostały czas"
 
-#: src/skins/menus.cc:125
+#: src/skins/menus.cc:150 src/skins-qt/menus.cc:143
 msgid "Always on Top"
 msgstr "Zawsze na wierzchu"
 
-#: src/skins/menus.cc:126
+#: src/skins/menus.cc:151 src/skins-qt/menus.cc:145
 msgid "On All Workspaces"
 msgstr "Na wszystkich pulpitach"
 
-#: src/skins/menus.cc:128
+#: src/skins/menus.cc:153 src/skins-qt/menus.cc:148
 msgid "Roll Up Player"
 msgstr "Zwiń odtwarzacz"
 
-#: src/skins/menus.cc:129
+#: src/skins/menus.cc:154 src/skins-qt/menus.cc:149
 msgid "Roll Up Playlist Editor"
 msgstr "Zwiń okno listy odtwarzania"
 
-#: src/skins/menus.cc:130
+#: src/skins/menus.cc:155 src/skins-qt/menus.cc:150
 msgid "Roll Up Equalizer"
 msgstr "Zwiń okno korektora graficznego"
 
-#: src/skins/menus.cc:132 src/skins/ui_main.cc:854
-msgid "Double Size"
-msgstr "Podwójny rozmiar"
-
-#: src/skins/menus.cc:138
+#: src/skins/menus.cc:163 src/skins-qt/menus.cc:158
 msgid "Add URL ..."
 msgstr "Dodaj adres URL..."
 
-#: src/skins/menus.cc:139
+#: src/skins/menus.cc:164 src/skins-qt/menus.cc:160
 msgid "Add Files ..."
 msgstr "Dodaj pliki..."
 
-#: src/skins/menus.cc:143 src/skins/menus.cc:171 src/skins/menus.cc:185
+#: src/skins/menus.cc:168 src/skins/menus.cc:196 src/skins/menus.cc:212
+#: src/skins-qt/menus.cc:164 src/skins-qt/menus.cc:192
+#: src/skins-qt/menus.cc:208
 msgid "By Title"
 msgstr "Według tytułu"
 
-#: src/skins/menus.cc:144 src/skins/menus.cc:178 src/skins/menus.cc:192
+#: src/skins/menus.cc:169 src/skins/menus.cc:203 src/skins/menus.cc:219
+#: src/skins-qt/menus.cc:165 src/skins-qt/menus.cc:199
+#: src/skins-qt/menus.cc:215
 msgid "By File Name"
 msgstr "Według nazwy pliku"
 
-#: src/skins/menus.cc:145 src/skins/menus.cc:179 src/skins/menus.cc:193
+#: src/skins/menus.cc:170 src/skins/menus.cc:204 src/skins/menus.cc:220
+#: src/skins-qt/menus.cc:166 src/skins-qt/menus.cc:200
+#: src/skins-qt/menus.cc:216
 msgid "By File Path"
-msgstr "Według ścieżki dostępu"
+msgstr "Według ścieżki pliku"
 
-#: src/skins/menus.cc:151
+#: src/skins/menus.cc:176 src/skins-qt/menus.cc:172
 msgid "Remove All"
 msgstr "Usuń wszystkie"
 
-#: src/skins/menus.cc:152
+#: src/skins/menus.cc:177 src/skins-qt/menus.cc:173
 msgid "Clear Queue"
 msgstr "Wyczyść kolejkę"
 
-#: src/skins/menus.cc:154
+#: src/skins/menus.cc:179 src/skins-qt/menus.cc:175
 msgid "Remove Unavailable Files"
 msgstr "Usuń niedostępne"
 
-#: src/skins/menus.cc:155
+#: src/skins/menus.cc:180 src/skins-qt/menus.cc:176
 msgid "Remove Duplicates"
 msgstr "Usuń duplikaty"
 
-#: src/skins/menus.cc:157
+#: src/skins/menus.cc:182 src/skins-qt/menus.cc:178
 msgid "Remove Unselected"
 msgstr "Usuń niezaznaczone"
 
-#: src/skins/menus.cc:158
+#: src/skins/menus.cc:183 src/skins-qt/menus.cc:179
 msgid "Remove Selected"
 msgstr "Usuń zaznaczone"
 
-#: src/skins/menus.cc:162
+#: src/skins/menus.cc:187 src/skins-qt/menus.cc:183
 msgid "Search and Select"
 msgstr "Szukaj i wybierz"
 
-#: src/skins/menus.cc:164
+#: src/skins/menus.cc:189 src/skins-qt/menus.cc:185
 msgid "Invert Selection"
 msgstr "Odwróć zaznaczenie"
 
-#: src/skins/menus.cc:165
+#: src/skins/menus.cc:190 src/skins-qt/menus.cc:186
 msgid "Select None"
 msgstr "Wyczyść zaznaczenie"
 
-#: src/skins/menus.cc:166
+#: src/skins/menus.cc:191 src/skins-qt/menus.cc:187
 msgid "Select All"
 msgstr "Zaznacz wszystko"
 
-#: src/skins/menus.cc:170 src/skins/menus.cc:184
+#: src/skins/menus.cc:195 src/skins/menus.cc:211 src/skins-qt/menus.cc:191
+#: src/skins-qt/menus.cc:207
 msgid "By Track Number"
-msgstr "według numeru ścieżki"
+msgstr "Według numeru ścieżki"
 
-#: src/skins/menus.cc:172 src/skins/menus.cc:186
+#: src/skins/menus.cc:197 src/skins/menus.cc:213 src/skins-qt/menus.cc:193
+#: src/skins-qt/menus.cc:209
 msgid "By Artist"
-msgstr "według wykonawcy"
+msgstr "Według wykonawcy"
 
-#: src/skins/menus.cc:173 src/skins/menus.cc:187
+#: src/skins/menus.cc:198 src/skins/menus.cc:214 src/skins-qt/menus.cc:194
+#: src/skins-qt/menus.cc:210
 msgid "By Album"
-msgstr "według albumu"
+msgstr "Według albumu"
 
-#: src/skins/menus.cc:174 src/skins/menus.cc:188
+#: src/skins/menus.cc:199 src/skins/menus.cc:215 src/skins-qt/menus.cc:195
+#: src/skins-qt/menus.cc:211
 msgid "By Album Artist"
-msgstr "według wykonawcy albumu"
+msgstr "Według wykonawcy albumu"
 
-#: src/skins/menus.cc:175 src/skins/menus.cc:190
+#: src/skins/menus.cc:200 src/skins/menus.cc:216 src/skins-qt/menus.cc:196
+#: src/skins-qt/menus.cc:212
 msgid "By Release Date"
-msgstr "według daty wydania"
+msgstr "Według daty wydania"
 
-#: src/skins/menus.cc:176 src/skins/menus.cc:189
+#: src/skins/menus.cc:201 src/skins/menus.cc:217 src/skins-qt/menus.cc:197
+#: src/skins-qt/menus.cc:213
 msgid "By Genre"
 msgstr "Według gatunku"
 
-#: src/skins/menus.cc:177 src/skins/menus.cc:191
+#: src/skins/menus.cc:202 src/skins/menus.cc:218 src/skins-qt/menus.cc:198
+#: src/skins-qt/menus.cc:214
 msgid "By Length"
 msgstr "Według długości"
 
-#: src/skins/menus.cc:180 src/skins/menus.cc:194
+#: src/skins/menus.cc:205 src/skins/menus.cc:221 src/skins-qt/menus.cc:201
+#: src/skins-qt/menus.cc:217
 msgid "By Custom Title"
 msgstr "Według własnego tytułu"
 
-#: src/skins/menus.cc:198
+#: src/skins/menus.cc:206 src/skins/menus.cc:222 src/skins-qt/menus.cc:202
+#: src/skins-qt/menus.cc:218
+msgid "By Comment"
+msgstr "Według komentarza"
+
+#: src/skins/menus.cc:207 src/skins/menus.cc:223 src/skins-qt/menus.cc:203
+#: src/skins-qt/menus.cc:219
+msgid "By Disc Number"
+msgstr "Według numeru płyty"
+
+#: src/skins/menus.cc:227 src/skins-qt/menus.cc:223
 msgid "Randomize List"
 msgstr "Wymieszaj listę odtwarzania"
 
-#: src/skins/menus.cc:199
+#: src/skins/menus.cc:228 src/skins-qt/menus.cc:224
 msgid "Reverse List"
 msgstr "Odwróć kolejność listy odtwarzania"
 
-#: src/skins/menus.cc:201
+#: src/skins/menus.cc:230 src/skins-qt/menus.cc:226
 msgid "Sort Selected"
 msgstr "Posortuj zaznaczone"
 
-#: src/skins/menus.cc:202
+#: src/skins/menus.cc:231 src/skins-qt/menus.cc:227
 msgid "Sort List"
 msgstr "Sortuj"
 
-#: src/skins/menus.cc:208
+#: src/skins/menus.cc:236 src/skins-qt/menus.cc:232
+msgid "Open Containing Folder"
+msgstr "Otwórz nadrzędny katalog"
+
+#: src/skins/menus.cc:238 src/skins-qt/menus.cc:234
 msgid "Cut"
 msgstr "Wytnij"
 
-#: src/skins/menus.cc:209
+#: src/skins/menus.cc:239 src/skins-qt/menus.cc:235
 msgid "Copy"
 msgstr "Kopiuj"
 
-#: src/skins/menus.cc:210
+#: src/skins/menus.cc:240 src/skins-qt/menus.cc:236
 msgid "Paste"
 msgstr "Wklej"
 
-#: src/skins/menus.cc:212
+#: src/skins/menus.cc:241 src/skins-qt/menus.cc:237
+msgid "Paste at End"
+msgstr "Wklej na końcu"
+
+#: src/skins/menus.cc:243 src/skins-qt/menus.cc:239
 msgid "Queue/Unqueue"
 msgstr "Przełącz kolejkę"
 
-#: src/skins/menus.cc:218
-msgid "Load Preset ..."
-msgstr "Wczytaj ustawienia..."
-
-#: src/skins/menus.cc:219
-msgid "Load Auto Preset ..."
-msgstr "Wczytaj automatyczne ustawienia"
-
-#: src/skins/menus.cc:220
-msgid "Load Default"
-msgstr "Wczytaj domyślne"
-
-#: src/skins/menus.cc:221
-msgid "Load Preset File ..."
-msgstr "Wczytaj plik ustawień..."
-
-#: src/skins/menus.cc:222
-msgid "Load EQF File ..."
-msgstr "Wczytaj plik EQF..."
-
-#: src/skins/menus.cc:224
-msgid "Save Preset ..."
-msgstr "Zapisz ustawienia..."
-
-#: src/skins/menus.cc:225
-msgid "Save Auto Preset ..."
-msgstr "Zapisz automatyczne ustawienia"
-
-#: src/skins/menus.cc:226
-msgid "Save Default"
-msgstr "Zapisz domyślne"
-
-#: src/skins/menus.cc:227
-msgid "Save Preset File ..."
-msgstr "Zapisz plik ustawień..."
-
-#: src/skins/menus.cc:228
-msgid "Save EQF File ..."
-msgstr "Zapisz plik EQF..."
-
-#: src/skins/menus.cc:230
-msgid "Delete Preset ..."
-msgstr "Usuń ustawienia"
-
-#: src/skins/menus.cc:231
-msgid "Delete Auto Preset ..."
-msgstr "Usuń automatyczne ustawienia..."
-
-#: src/skins/menus.cc:233
-msgid "Import Winamp Presets ..."
-msgstr "Importuj ustawienia Winampa..."
-
-#: src/skins/menus.cc:235
-msgid "Reset to Zero"
-msgstr "Wyzeruj"
+#: src/skins/playlist-widget.cc:58 src/skins-qt/playlist-widget.cc:58
+#, c-format
+msgid "%s (%d of %d)"
+msgstr "%s (%d z %d)"
+
+#: src/skins/playlistwin.cc:491 src/skins-qt/playlistwin.cc:478
+msgid "Audacious Playlist Editor"
+msgstr "Edytor listy odtwarzania Audacious"
 
-#: src/skins/plugin.cc:48
+#: src/skins/plugin.cc:53 src/skins-qt/plugin.cc:65
 msgid "Winamp Classic Interface"
 msgstr "Klasyczny interfejs Winampa"
 
-#: src/skins/preset-browser.cc:57 src/skins/preset-list.cc:371
-#: src/skins/preset-list.cc:386
-msgid "Save"
-msgstr "Zapisz"
-
-#: src/skins/preset-browser.cc:57 src/skins/preset-list.cc:338
-#: src/skins/preset-list.cc:354
-msgid "Load"
-msgstr "Wczytaj"
-
-#: src/skins/preset-browser.cc:83
-msgid "Load Preset File"
-msgstr "Wczytaj plik ustawień"
-
-#: src/skins/preset-browser.cc:100
-msgid "Load EQF File"
-msgstr "Wczytaj plik EQF"
-
-#: src/skins/preset-browser.cc:119
-msgid "Save Preset File"
-msgstr "Zapisz plik ustawień"
-
-#: src/skins/preset-browser.cc:137
-msgid "Save EQF File"
-msgstr "Zapisz plik EQF"
-
-#: src/skins/preset-browser.cc:151
-msgid "Import Winamp Presets"
-msgstr "Importuj ustawienia Winampa"
-
-#: src/skins/preset-list.cc:285
-msgid "Presets"
-msgstr "Profile ustawień"
-
-#: src/skins/preset-list.cc:335
-msgid "Load preset"
-msgstr "Wczytaj ustawienia"
-
-#: src/skins/preset-list.cc:351
-msgid "Load auto-preset"
-msgstr "Wczytaj automatyczne ustawienia"
-
-#: src/skins/preset-list.cc:367
-msgid "Save preset"
-msgstr "Zapisz ustawienia"
-
-#: src/skins/preset-list.cc:382
-msgid "Save auto-preset"
-msgstr "Zapisz automatyczne ustawienia"
-
-#: src/skins/preset-list.cc:408
-msgid "Delete preset"
-msgstr "Usuń ustawienia"
-
-#: src/skins/preset-list.cc:424
-msgid "Delete auto-preset"
-msgstr "Usuń automatyczne ustawienia"
+#: src/skins-qt/menus.cc:75
+msgid "Open Folder ..."
+msgstr "Otwórz katalog..."
+
+#: src/skins-qt/menus.cc:159
+msgid "Add Folder ..."
+msgstr "Dodaj katalog..."
+
+#: src/skins-qt/search-select.cc:62 src/skins/search-select.cc:77
+msgid "Search entries in active playlist"
+msgstr "Wyszukaj wpisy w aktywnej playliście"
+
+#: src/skins-qt/search-select.cc:70 src/skins/search-select.cc:83
+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 ""
+"Zaznacz wpisy na playliście poprzez wypełnienie jednego lub więcej pól. Pola "
+"używają składni wyrażeń regularnych, z uwzględnieniem wielkości liter. Jeśli "
+"nie wiesz, jak działają wyrażenia regularne, wpisz po prostu to, czego "
+"szukasz."
+
+#: src/skins-qt/search-select.cc:75 src/skins/search-select.cc:91
+msgid "Title:"
+msgstr "Tytuł:"
+
+#: src/skins-qt/search-select.cc:79 src/skins/search-select.cc:96
+msgid "Album:"
+msgstr "Album:"
+
+#: src/skins-qt/search-select.cc:82 src/skins/search-select.cc:101
+msgid "Artist:"
+msgstr "Artysta:"
+
+#: src/skins-qt/search-select.cc:85 src/skins/search-select.cc:106
+msgid "File Name:"
+msgstr "Nazwa pliku:"
+
+#: src/skins-qt/search-select.cc:88 src/skins/search-select.cc:134
+msgid "Clear previous selection before searching"
+msgstr "Wyczyść poprzednie zaznaczenie przed szukaniem"
+
+#: src/skins-qt/search-select.cc:89 src/skins/search-select.cc:137
+msgid "Automatically toggle queue for matching entries"
+msgstr "Automatycznie przełącz kolejkę dla pasujących wpisów"
+
+#: src/skins-qt/search-select.cc:90 src/skins/search-select.cc:140
+msgid "Create a new playlist with matching entries"
+msgstr "Utwórz nową playlistę z pasującymi wpisami"
+
+#: src/skins-qt/search-select.cc:101 src/skins/search-select.cc:78
+msgid "Search"
+msgstr "Szukaj"
 
-#: src/skins/skins_cfg.cc:176
+#: src/skins-qt/skins_cfg.cc:198 src/skins/skins_cfg.cc:182
 msgid "Player:"
 msgstr "Odtwarzacz:"
 
-#: src/skins/skins_cfg.cc:178
+#: src/skins-qt/skins_cfg.cc:200 src/skins/skins_cfg.cc:184
 msgid "Select main player window font:"
 msgstr "Wybór czcionki okna odtwarzacza:"
 
-#: src/skins/skins_cfg.cc:179
+#: src/skins-qt/skins_cfg.cc:201 src/skins/skins_cfg.cc:185
 msgid "Playlist:"
 msgstr "Lista odtwarzania:"
 
-#: src/skins/skins_cfg.cc:181
+#: src/skins-qt/skins_cfg.cc:203 src/skins/skins_cfg.cc:187
 msgid "Select playlist font:"
-msgstr "Wybór czcionki listy odtwarzania"
+msgstr "Wybór czcionki listy odtwarzania:"
 
-#: src/skins/skins_cfg.cc:187
+#: src/skins-qt/skins_cfg.cc:207 src/skins/skins_cfg.cc:191
 msgid "Skin"
 msgstr "Skórka"
 
-#: src/skins/skins_cfg.cc:189
+#: src/skins-qt/skins_cfg.cc:211 src/skins/skins_cfg.cc:193
+msgid "Display active titlebar when any window is focused"
+msgstr "Wyświetlaj aktywny pasek tytułu, gdy aktywne jest dowolne okno"
+
+#: src/skins-qt/skins_cfg.cc:213 src/skins/skins_cfg.cc:195
 msgid "Fonts"
 msgstr "Czcionki"
 
-#: src/skins/skins_cfg.cc:192
+#: src/skins-qt/skins_cfg.cc:215 src/skins/skins_cfg.cc:197
 msgid "Use bitmap fonts (supports ASCII only)"
 msgstr "Czcionki bitmapowe (obsługuje tylko kodowanie ASCII)"
 
-#: src/skins/skins_cfg.cc:194
+#: src/skins-qt/skins_cfg.cc:217 src/skins/skins_cfg.cc:199
 msgid "Scroll song title"
 msgstr "Przewijaj tytuł piosenki"
 
-#: src/skins/skins_cfg.cc:196
+#: src/skins-qt/skins_cfg.cc:219 src/skins/skins_cfg.cc:201
 msgid "Scroll song title in both directions"
-msgstr "Przewijanie tytułu utworu w obydwu kierunkach"
+msgstr "Przewijanie tytułu piosenki w obydwu kierunkach"
 
-#: src/skins/skins_cfg.cc:201
+#: src/skins-qt/skins_cfg.cc:224 src/skins/skins_cfg.cc:206
 msgid "Analyzer"
 msgstr "Analizator"
 
-#: src/skins/skins_cfg.cc:202
+#: src/skins-qt/skins_cfg.cc:225 src/skins/skins_cfg.cc:207
 msgid "Scope"
 msgstr "Zakres"
 
-#: src/skins/skins_cfg.cc:203
+#: src/skins-qt/skins_cfg.cc:226 src/skins/skins_cfg.cc:208
 msgid "Voiceprint / VU meter"
 msgstr "Spektogram / wskaźnik wysterowania"
 
-#: src/skins/skins_cfg.cc:204
+#: src/skins-qt/skins_cfg.cc:227 src/skins/skins_cfg.cc:209
 msgid "Off"
 msgstr "Wyłączony"
 
-#: src/skins/skins_cfg.cc:208 src/skins/skins_cfg.cc:233
-#: src/skins/skins_cfg.cc:239
+#: src/skins-qt/skins_cfg.cc:231 src/skins-qt/skins_cfg.cc:256
+#: src/skins-qt/skins_cfg.cc:262 src/skins/skins_cfg.cc:213
+#: src/skins/skins_cfg.cc:238 src/skins/skins_cfg.cc:244
 msgid "Normal"
 msgstr "Zwykły"
 
-#: src/skins/skins_cfg.cc:209 src/skins/skins_cfg.cc:234
+#: src/skins-qt/skins_cfg.cc:232 src/skins-qt/skins_cfg.cc:257
+#: src/skins/skins_cfg.cc:214 src/skins/skins_cfg.cc:239
 msgid "Fire"
 msgstr "Ognisty"
 
-#: src/skins/skins_cfg.cc:210
+#: src/skins-qt/skins_cfg.cc:233 src/skins/skins_cfg.cc:215
 msgid "Vertical lines"
 msgstr "Pionowe linie"
 
-#: src/skins/skins_cfg.cc:214
+#: src/skins-qt/skins_cfg.cc:237 src/skins/skins_cfg.cc:219
 msgid "Lines"
 msgstr "Linie"
 
-#: src/skins/skins_cfg.cc:215
+#: src/skins-qt/skins_cfg.cc:238 src/skins/skins_cfg.cc:220
 msgid "Bars"
 msgstr "Kolumny"
 
-#: src/skins/skins_cfg.cc:219
+#: src/skins-qt/skins_cfg.cc:242 src/skins/skins_cfg.cc:224
 msgid "Slowest"
 msgstr "Najwolniejszy"
 
-#: src/skins/skins_cfg.cc:220
+#: src/skins-qt/skins_cfg.cc:243 src/skins/skins_cfg.cc:225
 msgid "Slow"
 msgstr "Wolny"
 
-#: src/skins/skins_cfg.cc:221 src/sox-resampler/sox-resampler.cc:152
+#: src/skins-qt/skins_cfg.cc:244 src/skins/skins_cfg.cc:226
+#: src/soxr/sox-resampler.cc:180
 msgid "Medium"
 msgstr "Średni"
 
-#: src/skins/skins_cfg.cc:222
+#: src/skins-qt/skins_cfg.cc:245 src/skins/skins_cfg.cc:227
 msgid "Fast"
 msgstr "Szybki"
 
-#: src/skins/skins_cfg.cc:223
+#: src/skins-qt/skins_cfg.cc:246 src/skins/skins_cfg.cc:228
 msgid "Fastest"
 msgstr "Najszybszy"
 
-#: src/skins/skins_cfg.cc:227
+#: src/skins-qt/skins_cfg.cc:250 src/skins/skins_cfg.cc:232
 msgid "Dots"
 msgstr "Kropki"
 
-#: src/skins/skins_cfg.cc:228
+#: src/skins-qt/skins_cfg.cc:251 src/skins/skins_cfg.cc:233
 msgid "Line"
 msgstr "Linia"
 
-#: src/skins/skins_cfg.cc:229
+#: src/skins-qt/skins_cfg.cc:252 src/skins/skins_cfg.cc:234
 msgid "Solid"
 msgstr "Zwykły"
 
-#: src/skins/skins_cfg.cc:235
+#: src/skins-qt/skins_cfg.cc:258 src/skins/skins_cfg.cc:240
 msgid "Ice"
 msgstr "Lodowy"
 
-#: src/skins/skins_cfg.cc:240
+#: src/skins-qt/skins_cfg.cc:263 src/skins/skins_cfg.cc:245
 msgid "Smooth"
 msgstr "Wygładzony"
 
-#: src/skins/skins_cfg.cc:244
-msgid "Type"
-msgstr "Sposób"
-
-#: src/skins/skins_cfg.cc:245
-msgid "Visualization type:"
-msgstr "Sposób wizualizacji:"
-
-#: src/skins/skins_cfg.cc:248
-msgid "Analyzer"
-msgstr "Analizator"
-
-#: src/skins/skins_cfg.cc:249
-msgid "Show peaks"
-msgstr "Pokaż wartości szczytowe"
-
-#: src/skins/skins_cfg.cc:251
+#: src/skins-qt/skins_cfg.cc:267 src/skins/skins_cfg.cc:249
 msgid "Coloring:"
 msgstr "Kolorowanie:"
 
-#: src/skins/skins_cfg.cc:254
+#: src/skins-qt/skins_cfg.cc:270 src/skins/skins_cfg.cc:252
 msgid "Style:"
-msgstr "Styl: "
+msgstr "Styl:"
 
-#: src/skins/skins_cfg.cc:257
+#: src/skins-qt/skins_cfg.cc:273 src/skins/skins_cfg.cc:255
 msgid "Falloff:"
 msgstr "Upadanie:"
 
-#: src/skins/skins_cfg.cc:260
+#: src/skins-qt/skins_cfg.cc:276 src/skins/skins_cfg.cc:258
 msgid "Peak falloff:"
 msgstr "Upadanie wartości szczytowych:"
 
-#: src/skins/skins_cfg.cc:264
+#: src/skins-qt/skins_cfg.cc:282 src/skins/skins_cfg.cc:264
 msgid "Scope Style:"
 msgstr "Stylistyka kształtu:"
 
-#: src/skins/skins_cfg.cc:267
+#: src/skins-qt/skins_cfg.cc:285 src/skins/skins_cfg.cc:267
 msgid "Voiceprint Coloring:"
 msgstr "Kolor spektogramu:"
 
-#: src/skins/skins_cfg.cc:270
+#: src/skins-qt/skins_cfg.cc:288 src/skins/skins_cfg.cc:270
 msgid "VU Meter Style:"
 msgstr "Styl wskaźnika wysterowania:"
 
-#: src/skins/skins_cfg.cc:276
-msgid "General"
-msgstr "Ogólne"
-
-#: src/skins/skins_cfg.cc:277
-msgid "Visualization"
-msgstr "Wizualizacja"
-
-#: src/skins/ui_equalizer.cc:282
-msgid "Preamp"
-msgstr "Przedwzmacniacz"
-
-#: src/skins/ui_equalizer.cc:286
-msgid "31 Hz"
-msgstr "31 Hz"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "63 Hz"
-msgstr "63 Hz"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "125 Hz"
-msgstr "125 Hz"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "250 Hz"
-msgstr "250 Hz"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "500 Hz"
-msgstr "500 Hz"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "1 kHz"
-msgstr "1 kHz"
-
-#: src/skins/ui_equalizer.cc:288
-msgid "2 kHz"
-msgstr "2 kHz"
-
-#: src/skins/ui_equalizer.cc:288
-msgid "4 kHz"
-msgstr "4 kHz"
-
-#: src/skins/ui_equalizer.cc:288
-msgid "8 kHz"
-msgstr "8 kHz"
-
-#: src/skins/ui_equalizer.cc:288
-msgid "16 kHz"
-msgstr "16 kHz"
-
-#: src/skins/ui_equalizer.cc:330
-msgid "Audacious Equalizer"
-msgstr "Korektor graficzny Audacious"
-
-#: src/skins/ui_main.cc:688
-#, c-format
-msgid "Seek to %d:%-2.2d / %d:%-2.2d"
-msgstr "Skocz do: %d:%-2.2d / %d:%-2.2d"
-
-#: src/skins/ui_main.cc:709
-#, c-format
-msgid "Volume: %d%%"
-msgstr "Głośność: %d%%"
-
-#: src/skins/ui_main.cc:732
-#, c-format
-msgid "Balance: %d%% left"
-msgstr "Balans: %d%% lewy"
-
-#: src/skins/ui_main.cc:734
-msgid "Balance: center"
-msgstr "Balans: centralny"
-
-#: src/skins/ui_main.cc:736
-#, c-format
-msgid "Balance: %d%% right"
-msgstr "Balans: %d%% prawy"
-
-#: src/skins/ui_main.cc:842
-msgid "Options Menu"
-msgstr "Menu opcji"
-
-#: src/skins/ui_main.cc:846
-msgid "Disable 'Always On Top'"
-msgstr "Wyłącz 'Zawsze na wierzchu'"
-
-#: src/skins/ui_main.cc:848
-msgid "Enable 'Always On Top'"
-msgstr "Włącz 'Zawsze na wierzchu'"
-
-#: src/skins/ui_main.cc:851
-msgid "File Info Box"
-msgstr "Obszar informacji o pliku"
-
-#: src/skins/ui_main.cc:857
-msgid "Visualizations"
-msgstr "Wizualizacje"
-
-#: src/skins/ui_main.cc:1336
-msgid "Repeat point A set."
-msgstr "Ustawiono punkt początkowy pętli."
-
-#: src/skins/ui_main.cc:1341
-msgid "Repeat point B set."
-msgstr "Ustawiono punkt końcowy pętli."
-
-#: src/skins/ui_main.cc:1350
-msgid "Repeat points cleared."
-msgstr "Zresetowano punkty graniczne pętli."
-
-#: src/skins/ui_playlist.cc:219
-msgid "Search entries in active playlist"
-msgstr "Wyszukaj wpisy w aktywnej playliście"
-
-#: src/skins/ui_playlist.cc:226
-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 ""
-"Zaznacz wpisy na playliście poprzez wypełnienie jednego lub więcej pól. Pola "
-"używają składni wyrażeń regularnych, z uwzględnieniem wielkości liter. Jeśli "
-"nie wiesz, jak działają wyrażenia regularne, wpisz po prostu to, czego "
-"szukasz."
-
-#: src/skins/ui_playlist.cc:234
-msgid "Title:"
-msgstr "Tytuł:"
-
-#: src/skins/ui_playlist.cc:241
-msgid "Album:"
-msgstr "Album:"
-
-#: src/skins/ui_playlist.cc:248
-msgid "Artist:"
-msgstr "Artysta:"
-
-#: src/skins/ui_playlist.cc:255
-msgid "File Name:"
-msgstr "Nazwa pliku:"
-
-#: src/skins/ui_playlist.cc:263
-msgid "Clear previous selection before searching"
-msgstr "Wyczyść poprzednie zaznaczenie przed szukaniem"
+#: src/skins-qt/skins_cfg.cc:294 src/skins/skins_cfg.cc:276
+msgid "Type"
+msgstr "Sposób"
 
-#: src/skins/ui_playlist.cc:266
-msgid "Automatically toggle queue for matching entries"
-msgstr "Automatycznie przełącz kolejkę dla pasujących wpisów"
+#: src/skins-qt/skins_cfg.cc:295 src/skins/skins_cfg.cc:277
+msgid "Visualization type:"
+msgstr "Sposób wizualizacji:"
 
-#: src/skins/ui_playlist.cc:269
-msgid "Create a new playlist with matching entries"
-msgstr "Utwórz nową playlistę z pasującymi wpisami"
+#: src/skins-qt/skins_cfg.cc:298 src/skins/skins_cfg.cc:280
+msgid "Analyzer"
+msgstr "Analizator"
 
-#: src/skins/ui_playlist.cc:717
-msgid "Audacious Playlist Editor"
-msgstr "Edytor listy odtwarzania Audacious"
+#: src/skins-qt/skins_cfg.cc:299 src/skins/skins_cfg.cc:281
+msgid "Show peaks"
+msgstr "Pokaż wartości szczytowe"
 
-#: src/skins/ui_playlist.cc:752
-#, c-format
-msgid "%s (%d of %d)"
-msgstr "%s (%d z %d)"
+#: src/skins-qt/skins_cfg.cc:308 src/skins/skins_cfg.cc:290
+msgid "Visualization"
+msgstr "Wizualizacja"
 
-#: src/skins/ui_skinselector.cc:167
+#: src/skins-qt/skinselector.cc:98 src/skins/skinselector.cc:111
 msgid "Archived Winamp 2.x skin"
 msgstr "Zarchiwizowany styl programu Winamp 2.x"
 
-#: src/skins/ui_skinselector.cc:172
+#: src/skins-qt/skinselector.cc:102 src/skins/skinselector.cc:115
 msgid "Unarchived Winamp 2.x skin"
 msgstr "Styl programu Winamp 2.x"
 
-#: src/skins/util.cc:430
-#, c-format
-msgid "Could not create directory (%s): %s\n"
-msgstr "Nie można utworzyć katalogu (%s): %s\n"
-
-#: src/sndfile/plugin.cc:39
+#: src/sndfile/plugin.cc:38
 msgid "Sndfile Plugin"
 msgstr "Wtyczka Sndfile"
 
-#: src/sndfile/plugin.cc:336
+#: src/sndfile/plugin.cc:372
 msgid ""
 "Based on the xmms_sndfile plugin:\n"
 "Copyright (C) 2000, 2002 Erik de Castro Lopo\n"
@@ -4018,111 +4264,119 @@
 "napisz do Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, "
 "Boston, MA 02110-1301, USA."
 
-#: src/sndio-ng/sndio.cc:44
+#: src/sndio/sndio.cc:43
 msgid "Sndio Output"
 msgstr "Wyjście Sndio"
 
-#: src/sndio-ng/sndio.cc:98
+#: src/sndio/sndio.cc:98
 msgid "Device (blank for default):"
 msgstr "Urządzenie (puste oznacza domyślne):"
 
-#: src/sndio-ng/sndio.cc:100
+#: src/sndio/sndio.cc:100
 msgid "Save and restore volume:"
 msgstr "Zapisz i przywróć głośność:"
 
-#: src/sndio-ng/sndio.cc:181
+#: src/sndio/sndio.cc:181
 #, c-format
 msgid "Sndio error: Unsupported audio format (%d)"
 msgstr "Błąd Sndio: Nieobsługiwany format dźwięku (%d)"
 
-#: src/sndio-ng/sndio.cc:192
+#: src/sndio/sndio.cc:192
 msgid "Sndio error: sio_open() failed"
 msgstr "Błąd Sndio: funkcja sio_open() zwróciła błąd"
 
-#: src/sndio-ng/sndio.cc:222
+#: src/sndio/sndio.cc:221
 msgid "Sndio error: sio_setpar() failed"
 msgstr "Błąd Sndio: funkcja sio_setpar() zwróciła błąd"
 
-#: src/sndio-ng/sndio.cc:234
+#: src/sndio/sndio.cc:233
 msgid "Sndio error: sio_start() failed"
 msgstr "Błąd Sndio: funkcja sio_start() zwróciła błąd"
 
-#: src/song_change/song_change.cc:33
+#: src/songchange/song_change.cc:30
 msgid "Song Change"
-msgstr "Polecenie przy zmianie ścieżki"
+msgstr "Zmiana piosenki"
 
-#: src/song_change/song_change.cc:342
-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."
-
-#: src/song_change/song_change.cc:358
+#: src/songchange/song_change.cc:256
 msgid "Commands"
 msgstr "Polecenia"
 
-#: src/song_change/song_change.cc:360
+#: src/songchange/song_change.cc:258
 msgid "Command to run when starting a new song:"
 msgstr "Polecenie do uruchomienia przy rozpoczęciu nowej piosenki:"
 
-#: src/song_change/song_change.cc:364
+#: src/songchange/song_change.cc:261
+msgid "Command to run when stopping a song:"
+msgstr "Polecenie do uruchomienia po zatrzymaniu piosenki:"
+
+#: src/songchange/song_change.cc:264
 msgid "Command to run at the end of a song:"
 msgstr "Polecenie do uruchomienia przy zakończeniu piosenki:"
 
-#: src/song_change/song_change.cc:368
+#: src/songchange/song_change.cc:267
 msgid "Command to run at the end of the playlist:"
 msgstr "Polecenie do uruchomienia przy zakończeniu listy odtwarzania:"
 
-#: src/song_change/song_change.cc:372
+#: src/songchange/song_change.cc:270
 msgid "Command to run when song title changes (for network streams):"
 msgstr ""
 "Polecenie do uruchomienia, gdy zmieni się tytuł piosenki (dla "
 "strumieniowania sieciowego):"
 
-#: src/song_change/song_change.cc:376
+#: src/songchange/song_change.cc:273
 msgid ""
-"You can use the following format strings which will be substituted before "
-"calling the command (not all are useful for the end-of-playlist command):\n"
-"\n"
-"%F: Frequency (in hertz)\n"
+"You can use the following format codes, which will be replaced before "
+"running the command.\n"
+"Not all are useful though for the song-stopped or end-of-playlist command."
+msgstr ""
+"Możesz użyć następujących kodów formatujących, które zostaną zastąpione "
+"przed uruchomieniem polecenia.\n"
+"Nie wszystkie są jednak przydatne w przypadku poleceń zatrzymania piosenki "
+"lub zakończenia listy odtwarzania."
+
+#: src/songchange/song_change.cc:276
+msgid ""
+"%a: Artist\n"
+"%b: Album\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"
+"%F: Frequency (Hertz)\n"
+"%l: Length (milliseconds)\n"
+"%n or %s: Formatted title (see playlist settings)\n"
 "%p: Currently playing (1 or 0)\n"
-"%a: Artist\n"
-"%b: Album\n"
-"%T: Track title"
+"%r: Rate (bits per second)\n"
+"%t: Playlist position\n"
+"%T: Title (unformatted)"
 msgstr ""
-"Możesz użyć poniższych symboli, które zostaną zastąpione przed wywołaniem "
-"polecenia (nie wszystkie są użyteczne jeśli chodzi o polecenie wywoływane po "
-"zakończeniu listy odtwarzania):\n"
-"\n"
-"%F: Częstotliwość (w hercach)\n"
-"%c: Liczba kanałów\n"
-"%f: Pełna nazwa (ze ścieżką dostępu)\n"
-"%l: Długość (w milisekundach)\n"
-"%n lub %s: Nazwa nagrania\n"
-"%r: Przepływność (w bitach na sekundę)\n"
-"%t: Pozycja na liście odtwarzania (%02d)\n"
-"%p: Aktualnie odtwarzane (1 lub 0)\n"
 "%a: Wykonawca\n"
 "%b: Album\n"
-"%T: Nazwa ścieżki"
-
-#: src/song-info-qt/song-info.cc:32
-msgid "Song Info (Qt)"
-msgstr "Informacje o utworze (Qt)"
+"%c: Liczba kanałów\n"
+"%f: Nazwa pliku (pełna ścieżka)\n"
+"%F: Częstotliwość (Herce)\n"
+"%l: Długość (milisekundy)\n"
+"%n lub %s: Sformatowany tytuł (zobacz ustawienia listy odtwarzania)\n"
+"%p: Teraz gra (1 lub 0)\n"
+"%r: Rate (bitów na sekundę)\n"
+"%t: Pozycja listy odtwarzania\n"
+"%T: Tytuł (niesformatowany)"
+
+#: src/songchange/song_change.cc:287
+msgid ""
+"Parameters passed to the shell should be enclosed in quotation marks.\n"
+"Unquoted parameters may lead to unexpected results."
+msgstr ""
+"Parametry przekazywane do powłoki powinny być zawarte w cudzysłowach.\n"
+"Ich brak może prowadzić do nieoczekiwanych rezultatów."
+
+#: src/song-info-qt/song-info.cc:30
+msgid "Song Info"
+msgstr "Informacje o piosence"
 
-#: src/sox-resampler/sox-resampler.cc:44
+#: src/soxr/sox-resampler.cc:44
 msgid "SoX Resampler"
 msgstr "Konwerter częstotliwości SoX"
 
-#: src/sox-resampler/sox-resampler.cc:144
+#: src/soxr/sox-resampler.cc:172
 msgid ""
 "SoX Resampler Plugin for Audacious\n"
 "Copyright 2013 Michał Lipski\n"
@@ -4130,100 +4384,148 @@
 "Based on Sample Rate Converter Plugin:\n"
 "Copyright 2010-2012 John Lindgren"
 msgstr ""
-"Wtyczka SoX Resampler dla Audacious\n"
+"Wtyczka SoX Resampler dla Audaciousa\n"
 "Prawa autorskie 2013 Michał Lipski\n"
 "\n"
 "Oparty na wtyczce Sample Rate Converter:\n"
 "Prawa autorskie 2010-2012 John Lindgren"
 
-#: src/sox-resampler/sox-resampler.cc:150
+#: src/soxr/sox-resampler.cc:178
 msgid "Quick"
 msgstr "Szybki"
 
-#: src/sox-resampler/sox-resampler.cc:151
+#: src/soxr/sox-resampler.cc:179
 msgid "Low"
 msgstr "Wolny"
 
-#: src/sox-resampler/sox-resampler.cc:153
+#: src/soxr/sox-resampler.cc:181
 msgid "High"
 msgstr "Wysoki"
 
-#: src/sox-resampler/sox-resampler.cc:154
+#: src/soxr/sox-resampler.cc:182
 msgid "Very High"
 msgstr "Bardzo wysoki"
 
-#: src/sox-resampler/sox-resampler.cc:158
+#: src/soxr/sox-resampler.cc:183
+msgid "Ultra High"
+msgstr "Utrawysoka"
+
+#: src/soxr/sox-resampler.cc:187
+msgid "Minimum"
+msgstr "Minimalna"
+
+#: src/soxr/sox-resampler.cc:188
+msgid "Intermediate"
+msgstr "Pośrednia"
+
+#: src/soxr/sox-resampler.cc:193
 msgid "Quality:"
 msgstr "Jakość:"
 
-#: src/speed-pitch/speed-pitch.cc:51
+#: src/soxr/sox-resampler.cc:196
+msgid "Phase:"
+msgstr "Faza:"
+
+#: src/soxr/sox-resampler.cc:200
+msgid "Allow aliasing"
+msgstr "Zezwalaj na aliasing"
+
+#: src/soxr/sox-resampler.cc:202
+msgid "Use steep filter"
+msgstr "Użyj filtra stromego"
+
+#: src/speedpitch/speed-pitch.cc:54
 msgid "Speed and Pitch"
 msgstr "Szybkość i wysokość tonu"
 
-#: src/speed-pitch/speed-pitch.cc:210
-msgid "Speed and Pitch"
-msgstr "Szybkość i wysokość tonu"
-
-#: src/speed-pitch/speed-pitch.cc:211
-msgid "Speed:"
-msgstr "Szybkość:"
-
-#: src/speed-pitch/speed-pitch.cc:214
-msgid "Pitch:"
-msgstr "Wysokość tonu:"
+#: src/speedpitch/speed-pitch.cc:247
+msgid "Speed"
+msgstr "Szybkość"
+
+#: src/speedpitch/speed-pitch.cc:248
+msgid "Decouple from pitch"
+msgstr "Odłącz od tonu"
+
+#: src/speedpitch/speed-pitch.cc:250 src/speedpitch/speed-pitch.cc:258
+msgid "Multiplier:"
+msgstr "Mnożnik:"
+
+#: src/speedpitch/speed-pitch.cc:254
+msgid "Pitch"
+msgstr "Ton"
 
-#: src/statusicon/statusicon.cc:47
+#: src/statusicon-qt/statusicon.cc:45 src/statusicon/statusicon.cc:47
 msgid "Status Icon"
 msgstr "Ikona statusu"
 
-#: src/statusicon/statusicon.cc:283
-msgid "Se_ttings ..."
-msgstr "_Ustawienia..."
-
-#: src/statusicon/statusicon.cc:372
+#: src/statusicon-qt/statusicon.cc:68
 msgid ""
-"Status Icon Plugin\n"
+"Status Icon Plugin (partial port for Qt interface)\n"
 "\n"
 "Copyright 2005-2007 Giacomo Lozito <james@develia.org>\n"
 "Copyright 2010 Michał Lipski <tallica@o2.pl>\n"
+"Copyright 2015 Eugene Paskevich <eugene@raptor.kiev.ua>\n"
 "\n"
 "This plugin provides a status icon, placed in\n"
 "the system tray area of the window manager."
 msgstr ""
-"Wtyczka ikony statusu\n"
-"Prawa autorskie: 2005-2007 Giacomo Lozito <james@develia.org>\n"
+"Wtyczka ikony stanu (częściowy port dla interfejsu Qt)\n"
+"\n"
+"Prawa autorskie 2005-2007 Giacomo Lozito <james@develia.org>\n"
 "Prawa autorskie 2010 Michał Lipski <tallica@o2.pl>\n"
-"Wtyczka wyświetla ikonę statusu, umieszczoną w obszarze ikon powiadomienia "
-"menedżera okien."
+"Prawa autorskie 2015 Eugene Paskevich <eugene@raptor.kiev.ua>\n"
+"\n"
+"Wtyczka wyświetla ikonę stanu, umieszczoną\n"
+"w obszarze ikon powiadomienia menedżera okien."
 
-#: src/statusicon/statusicon.cc:379
+#: src/statusicon-qt/statusicon.cc:89 src/statusicon/statusicon.cc:384
 msgid "Mouse Scroll Action"
 msgstr "Akcja dla przewijania kółkiem myszy"
 
-#: src/statusicon/statusicon.cc:380
+#: src/statusicon-qt/statusicon.cc:90 src/statusicon/statusicon.cc:385
 msgid "Change volume"
 msgstr "Zmiana głośności"
 
-#: src/statusicon/statusicon.cc:383
+#: src/statusicon-qt/statusicon.cc:93 src/statusicon/statusicon.cc:388
 msgid "Change playing song"
-msgstr "Zmiana bieżącej ścieżki"
+msgstr "Zmiana bieżącej piosenki"
 
-#: src/statusicon/statusicon.cc:386
+#: src/statusicon-qt/statusicon.cc:96 src/statusicon/statusicon.cc:391
 msgid "Other Settings"
 msgstr "Inne ustawienia"
 
-#: src/statusicon/statusicon.cc:387
+#: src/statusicon-qt/statusicon.cc:97 src/statusicon/statusicon.cc:392
 msgid "Disable the popup window"
 msgstr "Wyłączenie wyskakujących komunikatów"
 
-#: src/statusicon/statusicon.cc:389
+#: src/statusicon-qt/statusicon.cc:99 src/statusicon/statusicon.cc:394
 msgid "Close to the system tray"
 msgstr "Zamknij do zasobnika systemowego"
 
-#: src/statusicon/statusicon.cc:391
+#: src/statusicon-qt/statusicon.cc:101 src/statusicon/statusicon.cc:396
 msgid "Advance in playlist when scrolling upward"
 msgstr "Przejdź do następnej ścieżki przewijając w górę"
 
+#: src/statusicon-qt/statusicon.cc:116 src/statusicon/statusicon.cc:287
+msgid "Se_ttings ..."
+msgstr "_Ustawienia..."
+
+#: src/statusicon/statusicon.cc:377
+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 ""
+"Wtyczka ikony statusu\n"
+"Prawa autorskie: 2005-2007 Giacomo Lozito <james@develia.org>\n"
+"Prawa autorskie 2010 Michał Lipski <tallica@o2.pl>\n"
+"Wtyczka wyświetla ikonę statusu, umieszczoną w obszarze ikon powiadomienia "
+"menedżera okien."
+
 #: src/stereo_plugin/stereo.cc:19
 msgid "Extra Stereo"
 msgstr "Dodatkowe stereo"
@@ -4241,20 +4543,160 @@
 msgid "Extra Stereo"
 msgstr "Dodatkowe stereo"
 
+#: src/streamtuner/icecast-model.cc:126 src/streamtuner/shoutcast-model.cc:131
+msgid "Type"
+msgstr "Typ"
+
+#: src/streamtuner/icecast-model.cc:132
+msgid "Current Song"
+msgstr "Bieżąca ścieżka"
+
+#: src/streamtuner/icecast-model.cc:164
+msgid "Other"
+msgstr "Inne"
+
+#: src/streamtuner/ihr-model.cc:63
+msgid "Market"
+msgstr "Rynek"
+
+#: src/streamtuner/ihr-model.cc:156
+msgid "Call Letters"
+msgstr "Znaki wywoławcze"
+
+#: src/streamtuner/ihr-model.cc:162
+msgid "Description"
+msgstr "Opis"
+
+#: src/streamtuner/shoutcast-model.cc:128
+msgid "Listeners"
+msgstr "Słuchacze"
+
+#: src/streamtuner/shoutcast-model.cc:188
+msgid "Top 500 Stations"
+msgstr "Najlepsze 500 stacji"
+
+#: src/streamtuner/shoutcast-model.cc:189
+msgid "Alternative"
+msgstr "Alternatywna"
+
+#: src/streamtuner/shoutcast-model.cc:190
+msgid "Blues"
+msgstr "Blues"
+
+#: src/streamtuner/shoutcast-model.cc:191
+msgid "Classical"
+msgstr "Klasyczna"
+
+#: src/streamtuner/shoutcast-model.cc:192
+msgid "Country"
+msgstr "Country"
+
+#: src/streamtuner/shoutcast-model.cc:193
+msgid "Decades"
+msgstr "Dekady"
+
+#: src/streamtuner/shoutcast-model.cc:194
+msgid "Easy Listening"
+msgstr "Lekka muzyka"
+
+#: src/streamtuner/shoutcast-model.cc:195
+msgid "Electronic"
+msgstr "Elektroniczna"
+
+#: src/streamtuner/shoutcast-model.cc:196
+msgid "Folk"
+msgstr "Folk"
+
+#: src/streamtuner/shoutcast-model.cc:197
+msgid "Inspirational"
+msgstr "Inspirująca"
+
+#: src/streamtuner/shoutcast-model.cc:198
+msgid "International"
+msgstr "Międzynarodowa"
+
+#: src/streamtuner/shoutcast-model.cc:199
+msgid "Jazz"
+msgstr "Jazz"
+
+#: src/streamtuner/shoutcast-model.cc:200
+msgid "Latin"
+msgstr "Łacińska"
+
+#: src/streamtuner/shoutcast-model.cc:201
+msgid "Metal"
+msgstr "Metal"
+
+#: src/streamtuner/shoutcast-model.cc:203
+msgid "New Age"
+msgstr "New Age"
+
+#: src/streamtuner/shoutcast-model.cc:204
+msgid "Pop"
+msgstr "Pop"
+
+#: src/streamtuner/shoutcast-model.cc:205
+msgid "Public Radio"
+msgstr "Radio publiczne"
+
+#: src/streamtuner/shoutcast-model.cc:206
+msgid "R&B and Urban"
+msgstr "R&B i urban"
+
+#: src/streamtuner/shoutcast-model.cc:207
+msgid "Rap"
+msgstr "Rap"
+
+#: src/streamtuner/shoutcast-model.cc:208
+msgid "Reggae"
+msgstr "Reggae"
+
+#: src/streamtuner/shoutcast-model.cc:209
+msgid "Rock"
+msgstr "Rock"
+
+#: src/streamtuner/shoutcast-model.cc:210
+msgid "Seasonal and Holiday"
+msgstr "Sezonowa i świąteczna"
+
+#: src/streamtuner/shoutcast-model.cc:211
+msgid "Soundtracks"
+msgstr "Ścieżki dźwiękowe"
+
+#: src/streamtuner/shoutcast-model.cc:212
+msgid "Talk"
+msgstr "Rozmowy"
+
+#: src/streamtuner/shoutcast-model.cc:213
+msgid "Themes"
+msgstr "Motywy"
+
+#: src/streamtuner/streamtuner.cc:59
+msgid "Shoutcast"
+msgstr "Shoutcast"
+
+#: src/streamtuner/streamtuner.cc:60
+msgid "Icecast"
+msgstr "Icecast"
+
+#: src/streamtuner/streamtuner.cc:71
+msgid "Stream Tuner"
+msgstr "Tuner strumienia"
+
 #: src/tonegen/tonegen.cc:45
 msgid "Tone Generator"
 msgstr "Generator sygnałów"
 
-#: src/tonegen/tonegen.cc:94
+#: src/tonegen/tonegen.cc:92
 #, c-format
 msgid "%s %.1f Hz"
 msgstr "%s %.1f Hz"
 
-#: src/tonegen/tonegen.cc:94
+#: src/tonegen/tonegen.cc:92
 msgid "Tone Generator: "
 msgstr "Generator sygnałów: "
 
-#: src/tonegen/tonegen.cc:160
+#: src/tonegen/tonegen.cc:161
 msgid ""
 "Sine tone generator by Håvard Kvålen <havardk@xmms.org>\n"
 "Modified by Daniel J. Peng <danielpeng@bigfoot.com>\n"
@@ -4268,13 +4710,34 @@
 "Instrukcja użytkowania: wprowadź URL tone://częstotliwość1;częstotliwość2;"
 "częstotliwość3;...\n"
 "przykładowo wprowadzenie: tone://2000;2005 wytworzy dźwięk o częstotliwości "
-"2000 Hz oraz 2005 Hz."
+"2000 Hz oraz 2005 Hz"
+
+#: src/ui-common/dialogs-qt.cc:40
+msgid ""
+"\n"
+"(Further messages have been hidden.)"
+msgstr ""
+"\n"
+"(Dalsze komunikaty zostały ukryte.)"
+
+#: src/ui-common/dialogs-qt.cc:52
+msgid "Working ..."
+msgstr "Działanie..."
+
+#: src/ui-common/dialogs-qt.cc:73
+msgid "Information"
+msgstr "Informacje"
+
+#: src/ui-common/menu-ops-gtk.cc:132 src/ui-common/menu-ops-qt.cc:113
+#, c-format
+msgid "%s does not appear to be a valid folder."
+msgstr "%s nie wygląda na prawidłowy katalog."
 
 #: src/voice_removal/voice_removal.cc:28
 msgid "Voice Removal"
 msgstr "Usuwanie głosu (karaoke)"
 
-#: src/vorbis/vorbis.cc:465
+#: src/vorbis/vorbis.cc:433
 msgid ""
 "Audacious Ogg Vorbis Decoder\n"
 "\n"
@@ -4316,12 +4779,12 @@
 msgid "Ogg Vorbis Decoder"
 msgstr "Dekoder Ogg Vorbis"
 
-#: src/vtx/info.cc:22
+#: src/vtx/info.cc:24
 #, c-format
 msgid "Details about %s"
 msgstr "Szczegóły o %s"
 
-#: src/vtx/info.cc:24
+#: src/vtx/info.cc:26
 msgid ""
 "Title: %t\n"
 "Author: %a\n"
@@ -4338,7 +4801,7 @@
 "Tytuł: %t\n"
 "Autor: %a\n"
 "Z: %f\n"
-"Tropiciel: %T\n"
+"Tracker: %T\n"
 "Komentarz: %C\n"
 "Rodzaj układu: %c\n"
 "Stereo: %s\n"
@@ -4351,7 +4814,7 @@
 msgid "VTX Decoder"
 msgstr "Dekoder VTX"
 
-#: src/vtx/vtx.cc:184
+#: src/vtx/vtx.cc:178
 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"
@@ -4362,19 +4825,63 @@
 "ru>\n"
 "Wtyczka Audaciousa napisana przez Pavel Vymetalek <pvymetalek@seznam.cz>"
 
-#: src/wavpack/wavpack.cc:24
+#: src/vumeter-qt/vumeter_qt.cc:31
+msgid ""
+"VU Meter Plugin for Audacious\n"
+"Copyright 2017-2019 Marc Sánchez Fauste"
+msgstr ""
+"Wtyczka wskaźnika wysterowania dla Audaciousa\n"
+"Prawa autorskie 2017-2019 Marc Sánchez Fauste"
+
+#: src/vumeter-qt/vumeter_qt.cc:35
+msgid "VU Meter Settings"
+msgstr "Ustawienia wskaźnika wysterowania"
+
+#: src/vumeter-qt/vumeter_qt.cc:37
+msgid "Peak hold time:"
+msgstr "Okres wstrzymania wartości szczytowych:"
+
+#: src/vumeter-qt/vumeter_qt.cc:42
+msgid "Fall-off time:"
+msgstr "Okres upadania:"
+
+#: src/vumeter-qt/vumeter_qt.cc:44
+msgid "dB/second"
+msgstr "dB/sekundy"
+
+#: src/vumeter-qt/vumeter_qt.cc:46
+msgid "Display legend"
+msgstr "Wyświetlanie legendy"
+
+#: src/vumeter-qt/vumeter_qt.h:37
+msgid "VU Meter"
+msgstr "Wskaźnik wysterowania"
+
+#: src/waveout/waveout.cc:43
+msgid "Win32 waveOut"
+msgstr "Win32 waveOut"
+
+#: src/waveout/waveout.cc:69
+msgid ""
+"Win32 waveOut Plugin for Audacious\n"
+"Copyright 2016 John Lindgren"
+msgstr ""
+"Wtyczka Win32 waveOut dla Audaciousa\n"
+"Prawa autorskie 2016 John Lindgren"
+
+#: src/wavpack/wavpack.cc:25
 msgid "WavPack Decoder"
 msgstr "Dekoder WavPack"
 
-#: src/wavpack/wavpack.cc:211
+#: src/wavpack/wavpack.cc:217
 msgid "lossy (hybrid)"
 msgstr "stratna (hybryda)"
 
-#: src/wavpack/wavpack.cc:213
+#: src/wavpack/wavpack.cc:219
 msgid "lossy"
 msgstr "stratna"
 
-#: src/wavpack/wavpack.cc:255
+#: src/wavpack/wavpack.cc:259
 msgid ""
 "Copyright 2006 William Pitcock <nenolod@nenolod.net>\n"
 "\n"
@@ -4384,18 +4891,38 @@
 "\n"
 "Część kodu napisana przez Milesa Egana."
 
-#: src/xsf/plugin.cc:50
+#: src/xsf/plugin.cc:74
 msgid "2SF Decoder"
 msgstr "Dekoder 2SF"
 
-#: src/xsf/plugin.cc:238
+#: src/xsf/plugin.cc:429
+msgid "32728 Hz"
+msgstr "32728 Hz"
+
+#: src/xsf/plugin.cc:432
+msgid "65456 Hz"
+msgstr "65456 Hz"
+
+#: src/xsf/plugin.cc:438
+msgid "Cosine"
+msgstr "Cosinus"
+
+#: src/xsf/plugin.cc:439
+msgid "Sharp"
+msgstr "Ostry"
+
+#: src/xsf/plugin.cc:443
 msgid "XSF Configuration"
 msgstr "Konfiguracja XSF"
 
-#: src/xsf/plugin.cc:239
-msgid "Ignore length from file"
-msgstr "Ignorowanie czasu trwania z pliku"
+#: src/xsf/plugin.cc:445
+msgid "Default fade time:"
+msgstr "Domyślny czas zanikania:"
+
+#: src/xsf/plugin.cc:447
+msgid "Interpolation mode:"
+msgstr "Tryb interpolacji:"
 
-#: src/xspf/xspf.cc:89
+#: src/xspf/xspf.cc:95
 msgid "XML Shareable Playlists (XSPF)"
 msgstr "Współdzielone listy odtwarzania XML (XSPF)"

audacious-plugins-3.6.2-gtk3.tar.bz2/po/process-transifex-po -> audacious-plugins-4.4.1.tar.bz2/po/process-transifex-po Changed

audacious-plugins-3.6.2-gtk3.tar.bz2/po/pt_BR.po -> audacious-plugins-4.4.1.tar.bz2/po/pt_BR.po Changed

@@ -5,315 +5,99 @@
 # Translators:
 # Alexandro Casanova <shorterfire@gmail.com>, 2013
 # Conservador Ressurge, 2014
+# Eduardo Marinho <e@calmaamigo.com>, 2018
 # Eudes Soares <eudes.sp2007@gmail.com>, 2014
+# Fabiano Ramos <fabiano.suporteinfo@gmail.com>, 2018
 # F Marcelo O Amarante <marcelo.amarante@hotmail.com>, 2015
 # Fuad Saud <fuadksd@gmail.com>, 2012
+# Fúlvio Alves <fga.fulvio@gmail.com>, 2020-2024
 # mcnd2 <glauber_gf@hotmail.com>, 2012
+# Iuri Suzano <isuzano@netkings.cc>, 2017
 # John_Norum <john.norum4@gmail.com>, 2012
+# Jorgebadad <jorgebadad@gmail.com>, 2016
+# Juliano Silva <juliano.sil6@gmail.com>, 2019
 # Bruno Bacelar <mail2buy8@gmail.com>, 2012
-# Rafael Ferreira <rafael.f.f1@gmail.com>, 2012
-# Rodrigo Macedo <rodrigomacedo@rmsolucoeseminformatica.com>, 2012
+# MarkB97, 2023
+# MarkB97, 2022
+# Rafael Fontenelle <rffontenelle@gmail.com>, 2012
+# rafael garcia <rafaelhipercg@hotmail.com>, 2017
+# Rodrigo de Araujo <araujorodrigo1984@gmail.com>, 2016
+# Rodrigo de Araujo <araujorodrigo1984@gmail.com>, 2016
+# Rodrigo Sottomaior Macedo <sottomaiormacedotec@sottomaiormacedo.tech>, 2012
 # Alexandro Casanova <shorterfire@gmail.com>, 2012-2013
 # vitorgatti <vitorgatti@yahoo.com.br>, 2012
 # Alexandro Casanova <shorterfire@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: 2015-05-30 15:51+0200\n"
-"PO-Revision-Date: 2015-05-02 14:45+0000\n"
-"Last-Translator: F Marcelo O Amarante <marcelo.amarante@hotmail.com>\n"
-"Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/"
+"Report-Msgid-Bugs-To: https://github.com/audacious-media-player/audacious/"
+"issues\n"
+"POT-Creation-Date: 2024-09-26 21:54+0200\n"
+"PO-Revision-Date: 2011-10-10 17:43+0000\n"
+"Last-Translator: Fúlvio Alves <fga.fulvio@gmail.com>, 2020-2024\n"
+"Language-Team: Portuguese (Brazil) (http://app.transifex.com/audacious/"
 "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"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"Plural-Forms: nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % "
+"1000000 == 0 ? 1 : 2;\n"
 
-#: src/aac-raw/aac.cc:18
+#: src/aac/aac.cc:19
 msgid "AAC (Raw) Decoder"
-msgstr "Decodificador AAC(Bruto)"
+msgstr "Decodificador AAC (RAW)"
 
-#: src/adplug/adplug-xmms.cc:42
+#: src/adplug/adplug-xmms.cc:70
 msgid "AdPlug (AdLib Player)"
 msgstr "AdPlug (Reprodutor AdLib)"
 
-#: src/adplug/adplug-xmms.cc:156 src/modplug/modplugbmp.cc:335
-#: src/psf/plugin.cc:138 src/vtx/vtx.cc:87 src/xsf/plugin.cc:113
+#: src/adplug/adplug-xmms.cc:167 src/modplug/modplugbmp.cc:321
+#: src/psf/plugin.cc:161 src/vtx/vtx.cc:89 src/xsf/plugin.cc:204
 msgid "sequenced"
 msgstr "sequenciado"
 
-#: src/alarm/alarm.cc:55 src/alarm/interface.cc:82
-msgid "Alarm"
-msgstr "Alarme"
-
-#: src/alarm/alarm.cc:782
-msgid "Set Alarm ..."
-msgstr "Definir Alarme ..."
-
-#: src/alarm/alarm.cc:810
-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"
-"\n"
-"Originalmente escrito por Adam Feakin e Daniel Stodden."
-
-#: src/alarm/interface.cc: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.cc: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.cc: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.cc:81
-msgid "This is your wakeup call."
-msgstr "Este é o seu alerta."
-
-#: src/alarm/interface.cc:99
-msgid "Your reminder for today is..."
-msgstr "Seu lembrete para hoje é..."
-
-#: src/alarm/interface.cc:101 src/alarm/interface.cc:386
-msgid "Reminder"
-msgstr "Lembrete"
-
-#: src/alarm/interface.cc:132
-msgid "Monday"
-msgstr "Segunda-feira"
-
-#: src/alarm/interface.cc:132
-msgid "Tuesday"
-msgstr "Terça-feira"
-
-#: src/alarm/interface.cc:132
-msgid "Wednesday"
-msgstr "Quarta-feira"
-
-#: src/alarm/interface.cc:133
-msgid "Thursday"
-msgstr "Quinta-feira"
-
-#: src/alarm/interface.cc:133
-msgid "Friday"
-msgstr "Sexta-feira"
-
-#: src/alarm/interface.cc:133
-msgid "Saturday"
-msgstr "Sábado"
-
-#: src/alarm/interface.cc:133
-msgid "Sunday"
-msgstr "Domingo"
-
-#: src/alarm/interface.cc:171 src/alarm/interface.cc:230
-#: src/alarm/interface.cc:245
-msgid "Time"
-msgstr "Horário"
-
-#: src/alarm/interface.cc:178
-msgid "Alarm at (default):"
-msgstr "Alarme às (padrão):"
-
-#: src/alarm/interface.cc:200
-msgid "h"
-msgstr "h"
-
-#: src/alarm/interface.cc:203
-msgid "Quiet after:"
-msgstr "Silenciar após:"
-
-#: src/alarm/interface.cc:215
-msgid "hours"
-msgstr "horas"
-
-#: src/alarm/interface.cc:226
-msgid "minutes"
-msgstr "minutos"
-
-#: src/alarm/interface.cc:235
-msgid "Choose the days for the alarm to come on"
-msgstr "Escolha os dias para o alarme tocar"
+#: src/adplug/adplug-xmms.cc:349 src/sid/xs_config.cc:61
+msgid "Output"
+msgstr "Saída"
 
-#: src/alarm/interface.cc:242
-msgid "Day"
-msgstr "Dia"
+#: src/adplug/adplug-xmms.cc:350
+msgid "OPL Emulator:"
+msgstr "Emulador OPL:"
+
+#: src/adplug/adplug-xmms.cc:353 src/amidiplug/i_configure.cc:153
+#: src/console/plugin.cc:45 src/filewriter/filewriter.cc:481
+#: src/sid/xs_config.cc:65 src/xsf/plugin.cc:446
+msgid "Sample rate:"
+msgstr "Taxa de amostragem:"
 
-#: src/alarm/interface.cc:259 src/bs2b/plugin.cc:130
-#: src/skins/preset-list.cc:434 src/skins/preset-list.cc:440
-msgid "Default"
-msgstr "Padrão"
+#: src/adplug/adplug-xmms.cc:354 src/amidiplug/i_configure.cc:155
+#: src/bs2b/plugin.cc:141 src/console/plugin.cc:47
+#: src/modplug/plugin_main.cc:77 src/resample/resample.cc:201
+#: src/resample/resample.cc:207 src/resample/resample.cc:211
+#: src/resample/resample.cc:215 src/resample/resample.cc:219
+#: src/resample/resample.cc:223 src/resample/resample.cc:227
+#: src/resample/resample.cc:231 src/resample/resample.cc:235
+#: src/resample/resample.cc:239 src/resample/resample.cc:243
+#: src/sid/xs_config.cc:67 src/soxr/sox-resampler.cc:205
+msgid "Hz"
+msgstr "Hz"
 
-#: src/alarm/interface.cc:288
-msgid "Days"
-msgstr "Dias"
-
-#: src/alarm/interface.cc:297
-msgid "Fading"
-msgstr "Enfraquecimento"
-
-#: src/alarm/interface.cc:305 src/console/plugin.cc:41
-#: src/crossfade/crossfade.cc:53 src/crossfade/crossfade.cc:59
-#: src/gtkui/settings.cc:49 src/lirc/lirc.cc:397 src/sid/xs_config.cc:85
-#: src/sid/xs_config.cc:94 src/sid/xs_config.cc:103
-msgid "seconds"
-msgstr "segundos"
+#: src/adplug/adplug-xmms.cc:355 src/gtkui/settings.cc:55
+#: src/modplug/plugin_main.cc:105 src/qtui/settings.cc:85
+#: src/skins-qt/skins_cfg.cc:302 src/skins/skins_cfg.cc:284
+msgid "Miscellaneous"
+msgstr "Diversos"
 
-#: src/alarm/interface.cc:312 src/alarm/interface.cc:353
-msgid "Volume"
-msgstr "Volume"
-
-#: src/alarm/interface.cc:317
-msgid "Start at"
-msgstr "Começar no"
-
-#: src/alarm/interface.cc:333
-msgid "Final"
-msgstr "Final"
-
-#: src/alarm/interface.cc:346
-msgid "Current"
-msgstr "Atual"
-
-#: src/alarm/interface.cc:359
-msgid "Additional Command"
-msgstr "Comando Adicional"
-
-#: src/alarm/interface.cc:365 src/alarm/interface.cc:391
-msgid "enable"
-msgstr "habilitar"
-
-#: src/alarm/interface.cc:372
-msgid "Playlist (optional)"
-msgstr "Lista de Reprodução (opcional)"
-
-#: src/alarm/interface.cc:379
-msgid "Select a playlist"
-msgstr "Selecionar uma Lista de Reprodução"
-
-#: src/alarm/interface.cc:399
-msgid "Options"
-msgstr "Opções"
-
-#: src/alarm/interface.cc:404
-msgid "What do these options mean?"
-msgstr "O que significam estas opções?"
-
-#: src/alarm/interface.cc:420
-msgid "Help"
-msgstr "Ajuda"
+#: src/adplug/adplug-xmms.cc:356
+msgid "Repeat song in endless loop"
+msgstr "Repetir música em loop infinito"
 
-#: src/albumart/albumart.cc:31
+#: src/albumart/albumart.cc:31 src/albumart-qt/albumart.cc:35
 msgid "Album Art"
-msgstr "Capa do Álbum"
+msgstr "Arte do Álbum"
 
-#: src/albumart-qt/albumart.cc:33
-msgid "Album Art (Qt)"
-msgstr "Capa do Álbum (Qt)"
-
-#: src/alsa/alsa.h:70
+#: src/alsa/alsa.h:64
 msgid "ALSA Output"
 msgstr "Saída ALSA"
 
@@ -357,11 +141,11 @@
 msgid "Mixer element:"
 msgstr "Elemento mixer:"
 
-#: src/amidi-plug/amidi-plug.cc:41
+#: src/amidiplug/amidi-plug.cc:42
 msgid "AMIDI-Plug (MIDI Player)"
 msgstr "AMIDI-Plug (Reprodutor MIDI)"
 
-#: src/amidi-plug/amidi-plug.cc:437
+#: src/amidiplug/amidi-plug.cc:445
 msgid ""
 "AMIDI-Plug\n"
 "modular MIDI music player\n"
@@ -403,157 +187,161 @@
 "Tony Vroon\n"
 "pela boa ajuda com os testes alfa"
 
-#: src/amidi-plug/i_configure.cc:94
+#: src/amidiplug/i_configure.cc:94
 msgid "Override default gain:"
 msgstr "Sobrescrever ganho padrão:"
 
-#: src/amidi-plug/i_configure.cc:102
+#: src/amidiplug/i_configure.cc:102
 msgid "Override default polyphony:"
 msgstr "Sobrescrever polifonia padrão:"
 
-#: src/amidi-plug/i_configure.cc:110
+#: src/amidiplug/i_configure.cc:110
 msgid "Override default reverb:"
 msgstr "Sobrescrever reverberação padrão:"
 
-#: src/amidi-plug/i_configure.cc:112 src/amidi-plug/i_configure.cc:120
+#: src/amidiplug/i_configure.cc:112 src/amidiplug/i_configure.cc:120
 msgid "On"
 msgstr "Ativo"
 
-#: src/amidi-plug/i_configure.cc:118
+#: src/amidiplug/i_configure.cc:118
 msgid "Override default chorus:"
 msgstr "Sobrescrever coro padrão:"
 
-#: src/amidi-plug/i_configure.cc:128 src/console/plugin.cc:29
+#: src/amidiplug/i_configure.cc:128 src/console/plugin.cc:29
 msgid "Playback"
 msgstr "Reprodução"
 
-#: src/amidi-plug/i_configure.cc:129
+#: src/amidiplug/i_configure.cc:129
 msgid "Transpose:"
 msgstr "Transposição:"
 
-#: src/amidi-plug/i_configure.cc:131
+#: src/amidiplug/i_configure.cc:131 src/speedpitch/speed-pitch.cc:257
 msgid "semitones"
 msgstr "semitons"
 
-#: src/amidi-plug/i_configure.cc:132
+#: src/amidiplug/i_configure.cc:132
 msgid "Drum shift:"
 msgstr "Mudança de bateria:"
 
-#: src/amidi-plug/i_configure.cc:134
+#: src/amidiplug/i_configure.cc:134
 msgid "note numbers"
 msgstr "número de notas"
 
-#: src/amidi-plug/i_configure.cc:135
+#: src/amidiplug/i_configure.cc:135
 msgid "Skip leading silence"
 msgstr "Pular silêncio inicial"
 
-#: src/amidi-plug/i_configure.cc:137
+#: src/amidiplug/i_configure.cc:137
 msgid "Skip trailing silence"
 msgstr "Pular silêncio final"
 
-#: src/amidi-plug/i_configure.cc:141
+#: src/amidiplug/i_configure.cc:141
 msgid "SoundFont"
 msgstr "SoundFont"
 
-#: src/amidi-plug/i_configure.cc:143
+#: src/amidiplug/i_configure.cc:148
 msgid "Synthesizer"
 msgstr "Sintetizador"
 
-#: src/amidi-plug/i_configure.cc:148 src/console/plugin.cc:45
-#: src/sid/xs_config.cc:65
-msgid "Sample rate:"
-msgstr "Taxa de amostragem:"
-
-#: src/amidi-plug/i_configure.cc:150 src/bs2b/plugin.cc:141
-#: src/console/plugin.cc:47 src/modplug/plugin_main.cc:78
-#: src/resample/resample.cc:201 src/resample/resample.cc:207
-#: src/resample/resample.cc:211 src/resample/resample.cc:215
-#: src/resample/resample.cc:219 src/resample/resample.cc:223
-#: src/resample/resample.cc:227 src/resample/resample.cc:231
-#: src/resample/resample.cc:235 src/resample/resample.cc:239
-#: src/resample/resample.cc:243 src/sid/xs_config.cc:67
-#: src/sox-resampler/sox-resampler.cc:163
-msgid "Hz"
-msgstr "Hz"
-
-#: src/amidi-plug/i_configure-fluidsynth.cc:52
+#: src/amidiplug/i_configure-fluidsynth.cc:58
+#: src/amidiplug/i_configure-fluidsynth.cc:527
 msgid "AMIDI-Plug - select SoundFont file"
 msgstr "AMIDI-Plug - Selecione o arquivo SoundFont"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:55 src/filewriter/mp3.cc:658
+#: src/amidiplug/i_configure-fluidsynth.cc:61
 msgid "_Cancel"
 msgstr "_Cancelar"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:56
+#: src/amidiplug/i_configure-fluidsynth.cc:62
 msgid "_Open"
 msgstr "_Abrir"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:225 src/gtkui/columns.cc:46
+#: src/amidiplug/i_configure-fluidsynth.cc:233
+#: src/amidiplug/i_configure-fluidsynth.cc:461
 msgid "File name"
 msgstr "Nome do Arquivo"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:229
+#: src/amidiplug/i_configure-fluidsynth.cc:237
+#: src/amidiplug/i_configure-fluidsynth.cc:464
 msgid "Size (bytes)"
 msgstr "Tamanho (bytes)"
 
-#: src/amidi-plug/i_fileinfo.cc:163
+#: src/amidiplug/i_fileinfo.cc:184
 msgid "Name:"
 msgstr "Nome:"
 
-#: src/amidi-plug/i_fileinfo.cc:181
+#: src/amidiplug/i_fileinfo.cc:202
 msgid " MIDI Info "
 msgstr "Informações MIDI"
 
-#: src/amidi-plug/i_fileinfo.cc:195
+#: src/amidiplug/i_fileinfo.cc:216
 msgid "Format:"
 msgstr "Formato:"
 
-#: src/amidi-plug/i_fileinfo.cc:198
+#: src/amidiplug/i_fileinfo.cc:219
 msgid "Length (msec):"
 msgstr "Duração (msec):"
 
-#: src/amidi-plug/i_fileinfo.cc:201
+#: src/amidiplug/i_fileinfo.cc:222
 msgid "No. of Tracks:"
-msgstr "N.º de Faixas;"
+msgstr "N.º de Faixas:"
 
-#: src/amidi-plug/i_fileinfo.cc:207
+#: src/amidiplug/i_fileinfo.cc:228
 msgid "variable"
 msgstr "variável"
 
-#: src/amidi-plug/i_fileinfo.cc:209
+#: src/amidiplug/i_fileinfo.cc:230
 msgid "BPM:"
 msgstr "BPM:"
 
-#: src/amidi-plug/i_fileinfo.cc:217
+#: src/amidiplug/i_fileinfo.cc:238
 msgid "BPM (wavg):"
-msgstr "BPM (wavg):"
+msgstr "BPM (média):"
 
-#: src/amidi-plug/i_fileinfo.cc:220
+#: src/amidiplug/i_fileinfo.cc:241
 msgid "Time Div:"
 msgstr "Div. de tempo:"
 
-#: src/amidi-plug/i_fileinfo.cc:231
+#: src/amidiplug/i_fileinfo.cc:252
 msgid " MIDI Comments and Lyrics "
 msgstr " Comentários de MIDI e Letras "
 
-#: src/amidi-plug/i_fileinfo.cc:278
+#: src/amidiplug/i_fileinfo.cc:299
 msgid "* no comments available in this MIDI file *"
 msgstr "* Sem comentários disponíveis neste arquivo MIDI *"
 
-#: src/amidi-plug/i_fileinfo.cc:290
+#: src/amidiplug/i_fileinfo.cc:311
 msgid "* no lyrics available in this MIDI file *"
 msgstr "* Sem letras disponíveis neste arquivo MIDI *"
 
-#: src/amidi-plug/i_fileinfo.cc:300 src/filewriter/vorbis.cc:197
-#: src/ladspa/plugin.cc:416
+#: src/amidiplug/i_fileinfo.cc:321 src/ladspa/plugin.cc:418
+#: src/ui-common/dialogs-qt.cc:32
 msgid "_Close"
 msgstr "_Fechar"
 
-#: src/amidi-plug/i_fileinfo.cc:325
+#: src/amidiplug/i_fileinfo.cc:346
 msgid " (invalid UTF-8)"
 msgstr " (UTF-8 invalido)"
 
-#: src/aosd/aosd.cc:32
+#: src/ampache/ampache.cc:33
+msgid "Ampache Browser"
+msgstr "Navegador Ampache "
+
+#: src/ampache/ampache.cc:46
+msgid ""
+"Ampache Browser for Audacious\n"
+"http://ampache-browser.org/\n"
+"\n"
+"Copyright (C) Róbert Čerňanský and John Lindgren\n"
+"License: GNU GPLv3"
+msgstr ""
+"Ampache Browser para Audacious\n"
+"http://ampache-browser.org/\n"
+"\n"
+"Copyright (C) Róbert Čerňanský e John Lindgren\n"
+"Licenças: GNU GPLv3"
+
+#: src/aosd/aosd.cc:31
 msgid ""
 "Audacious OSD\n"
 "http://www.develia.org/projects.php?p=audacious#aosd\n"
@@ -573,7 +361,7 @@
 
 #: src/aosd/aosd.h:37
 msgid "AOSD (On-Screen Display)"
-msgstr "AOSD (OSD)"
+msgstr "AOSD (Display na tela)"
 
 #: src/aosd/aosd_style.cc:54
 msgid "Rectangle"
@@ -587,130 +375,130 @@
 msgid "Concave Rectangle"
 msgstr "Retângulo Côncavo"
 
-#: src/aosd/aosd_style.cc:69
+#: src/aosd/aosd_style.cc:69 src/openmpt/mptwrap.h:50 src/xsf/plugin.cc:436
 msgid "None"
-msgstr "Nada"
+msgstr "Nenhum"
 
-#: src/aosd/aosd_trigger.cc:50
+#: src/aosd/aosd_trigger.cc:49
 msgid "Playback Start"
 msgstr "Iniciar Reprodução"
 
-#: src/aosd/aosd_trigger.cc:51
+#: src/aosd/aosd_trigger.cc:50
 msgid "Triggers OSD when a playlist entry is played."
 msgstr "Ativar OSD ao reproduzir uma faixa da lista de reprodução"
 
-#: src/aosd/aosd_trigger.cc:56
+#: src/aosd/aosd_trigger.cc:55
 msgid "Title Change"
 msgstr "Mudança de Título"
 
-#: src/aosd/aosd_trigger.cc:57
+#: src/aosd/aosd_trigger.cc:56
 msgid "Triggers OSD when the song title changes (for internet streams)."
 msgstr "Ativar OSD ao mudar o título da faixa (para transmissões da internet)."
 
-#: src/aosd/aosd_trigger.cc:62
+#: src/aosd/aosd_trigger.cc:61
 msgid "Pause On"
-msgstr "Pausar"
+msgstr "Ao pausar"
 
-#: src/aosd/aosd_trigger.cc:63
+#: src/aosd/aosd_trigger.cc:62
 msgid "Triggers OSD when playback is paused."
 msgstr "Ativar OSD se a reprodução for colocada em pausa"
 
-#: src/aosd/aosd_trigger.cc:68
+#: src/aosd/aosd_trigger.cc:67
 msgid "Pause Off"
-msgstr "Despausar"
+msgstr "Ao despausar"
 
-#: src/aosd/aosd_trigger.cc:69
+#: src/aosd/aosd_trigger.cc:68
 msgid "Triggers OSD when playback is unpaused."
 msgstr "Ativar OSD ao retomar a reprodução"
 
-#: src/aosd/aosd_ui.cc:163
+#: src/aosd/aosd_ui.cc:204
 msgid "Placement"
-msgstr "Localização"
+msgstr "Colocação"
 
-#: src/aosd/aosd_ui.cc:196
+#: src/aosd/aosd_ui.cc:241
 msgid "Relative X offset:"
 msgstr "Desvio X relativo:"
 
-#: src/aosd/aosd_ui.cc:203
+#: src/aosd/aosd_ui.cc:245
 msgid "Relative Y offset:"
 msgstr "Desvio Y relativo:"
 
-#: src/aosd/aosd_ui.cc:210
+#: src/aosd/aosd_ui.cc:249
 msgid "Max OSD width:"
 msgstr "Largura máxima do OSD:"
 
-#: src/aosd/aosd_ui.cc:221
+#: src/aosd/aosd_ui.cc:281
 msgid "Multi-Monitor options"
 msgstr "Opções de múltiplos monitores "
 
-#: src/aosd/aosd_ui.cc:225
+#: src/aosd/aosd_ui.cc:285
 msgid "Display OSD using:"
 msgstr "Exibir uso do OSD:"
 
-#: src/aosd/aosd_ui.cc:227
+#: src/aosd/aosd_ui.cc:287
 msgid "all monitors"
 msgstr "todos os monitores"
 
-#: src/aosd/aosd_ui.cc:230
+#: src/aosd/aosd_ui.cc:290
 #, c-format
 msgid "monitor %i"
 msgstr "monitor %i"
 
-#: src/aosd/aosd_ui.cc:282
+#: src/aosd/aosd_ui.cc:342
 msgid "Timing (ms)"
 msgstr "Duração (ms)"
 
-#: src/aosd/aosd_ui.cc:287
+#: src/aosd/aosd_ui.cc:347
 msgid "Display:"
 msgstr "Exibição:"
 
-#: src/aosd/aosd_ui.cc:292
+#: src/aosd/aosd_ui.cc:352
 msgid "Fade in:"
 msgstr "Aparecer gradual:"
 
-#: src/aosd/aosd_ui.cc:297
+#: src/aosd/aosd_ui.cc:357
 msgid "Fade out:"
 msgstr "Desaparecer gradual:"
 
-#: src/aosd/aosd_ui.cc:361
+#: src/aosd/aosd_ui.cc:442
 msgid "Fonts"
 msgstr "Tipo de letra"
 
-#: src/aosd/aosd_ui.cc:368
+#: src/aosd/aosd_ui.cc:449
 #, c-format
 msgid "Font %i:"
 msgstr "Tipo de letra %i:"
 
-#: src/aosd/aosd_ui.cc:382
+#: src/aosd/aosd_ui.cc:466
 msgid "Shadow"
 msgstr "Sombra"
 
-#: src/aosd/aosd_ui.cc:486
+#: src/aosd/aosd_ui.cc:589
 msgid "Render Style"
 msgstr "Estilo de renderização"
 
-#: src/aosd/aosd_ui.cc:502
+#: src/aosd/aosd_ui.cc:605
 msgid "Colors"
 msgstr "Cores"
 
-#: src/aosd/aosd_ui.cc:513
+#: src/aosd/aosd_ui.cc:616
 #, c-format
 msgid "Color %i:"
 msgstr "Cor %i:"
 
-#: src/aosd/aosd_ui.cc:600
+#: src/aosd/aosd_ui.cc:714
 msgid "Enable trigger"
 msgstr "Habilitar gatilho"
 
-#: src/aosd/aosd_ui.cc:627
+#: src/aosd/aosd_ui.cc:741
 msgid "Event"
 msgstr "Evento "
 
-#: src/aosd/aosd_ui.cc:655
+#: src/aosd/aosd_ui.cc:768
 msgid "Composite manager detected"
 msgstr "Gerenciador Composite detectado"
 
-#: src/aosd/aosd_ui.cc:662
+#: src/aosd/aosd_ui.cc:775
 msgid ""
 "Composite manager not detected;\n"
 "unless you know that you have one running, please activate a composite "
@@ -720,60 +508,56 @@
 "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.cc:670
+#: src/aosd/aosd_ui.cc:783
 msgid "Composite manager not required for fake transparency"
 msgstr "Não é necessário o gerenciador Composite para falsa transparência."
 
-#: src/aosd/aosd_ui.cc:706
+#: src/aosd/aosd_ui.cc:820
 msgid "Transparency"
 msgstr "Transparência "
 
-#: src/aosd/aosd_ui.cc:712
+#: src/aosd/aosd_ui.cc:826
 msgid "Fake transparency"
 msgstr "Falsa transparência "
 
-#: src/aosd/aosd_ui.cc:714
+#: src/aosd/aosd_ui.cc:828
 msgid "Real transparency (requires X Composite Ext.)"
 msgstr "Transparência Real (requer a Extensão X Composite.)"
 
-#: src/aosd/aosd_ui.cc:756
+#: src/aosd/aosd_ui.cc:875
 msgid "Composite extension not loaded"
 msgstr "Extensão Composite não carregada"
 
-#: src/aosd/aosd_ui.cc:764
-msgid "Composite extension not available"
-msgstr "Extensão Composite não disponível"
-
-#: src/aosd/aosd_ui.cc:781
+#: src/aosd/aosd_ui.cc:892
 #, c-format
 msgid "Audacious OSD"
 msgstr "Audacious OSD"
 
-#: src/aosd/aosd_ui.cc:844
+#: src/aosd/aosd_ui.cc:955
 msgid "Position"
 msgstr "Posição"
 
-#: src/aosd/aosd_ui.cc:849
+#: src/aosd/aosd_ui.cc:960
 msgid "Animation"
 msgstr "Animação"
 
-#: src/aosd/aosd_ui.cc:854
+#: src/aosd/aosd_ui.cc:965
 msgid "Text"
 msgstr "Texto"
 
-#: src/aosd/aosd_ui.cc:859
+#: src/aosd/aosd_ui.cc:970
 msgid "Decoration"
 msgstr "Decoração"
 
-#: src/aosd/aosd_ui.cc:864
+#: src/aosd/aosd_ui.cc:975
 msgid "Trigger"
 msgstr "Gatilho"
 
-#: src/aosd/aosd_ui.cc:869
+#: src/aosd/aosd_ui.cc:980 src/streamtuner/shoutcast-model.cc:202
 msgid "Misc"
 msgstr "Vários"
 
-#: src/aosd/aosd_ui.cc:878
+#: src/aosd/aosd_ui.cc:989
 msgid "Test"
 msgstr "Teste"
 
@@ -789,11 +573,97 @@
 msgid "Audacious Playlists (audpl)"
 msgstr "Listas de Reproduções Audacious (audpl)"
 
-#: src/blur_scope/blur_scope.cc:42
+#: src/background_music/background_music.cc:24
+msgid "Background music"
+msgstr "Música de fundo"
+
+#: src/background_music/background_music.cc:25
+msgid "Target level:"
+msgstr "Nível alvo:"
+
+#: src/background_music/background_music.cc:28
+#: src/background_music/background_music.cc:33
+#: src/silence-removal/silence-removal.cc:70
+msgid "dB"
+msgstr "dB"
+
+#: src/background_music/background_music.cc:29
+msgid "Maximum amplification:"
+msgstr "Amplificação máxima:"
+
+#: src/background_music/background_music.cc:34 src/mpg123/mpg123.cc:81
+msgid "Advanced"
+msgstr "Avançado"
+
+#: src/background_music/background_music.cc:36
+msgid "Slow detection weight:"
+msgstr "Peso de detecção lenta:"
+
+#: src/background_music/background_music.cc:39
+msgid "Hint"
+msgstr "Dica"
+
+#: src/background_music/background_music.cc:41
+msgid ""
+"Slow detection weight is the relative weight\n"
+"of a long term average detection when compared\n"
+"to the actual, faster loudness detection.\n"
+"A value of zero gives a more radio-like sound\n"
+"where soft passages get \"pulled up\" more quickly,\n"
+"a value of two makes the sound feel less compressed."
+msgstr ""
+"O peso de detecção lenta é o peso relativo de uma\n"
+"detecção média de longo prazo quando comparado\n"
+"à detecção de volume real e mais rápida. Um valor de\n"
+"zero oferece um som mais parecido a um rádio, onde\n"
+"passagens suaves são \"puxadas\" mais rapidamente,\n"
+"um valor de dois faz o som parecer menos comprimido."
+
+#: src/background_music/background_music.cc:52
+msgid ""
+"Background Music Plugin for Audacious\n"
+"Copyright 2023;2024 Michel Fleur\n"
+"\n"
+"Controls the volume to make the sound equally loud within and between "
+"tracks.\n"
+" It uses accurate loudness measurement and tries to make the volume changes "
+"sound natural without audible peaks, yet without lowering the volume before "
+"a peak in advance."
+msgstr ""
+"Background Music Plugin for Audacious\n"
+"Copyright 2023;2024 Michel Fleur\n"
+"\n"
+"Controla o volume para tornar o som igualmente alto dentro e entre as "
+"faixas.\n"
+"Ele usa medições precisas de loudness e tenta fazer com que as mudanças de "
+"volume soem naturais, sem picos audíveis, mas sem diminuir o volume antes de "
+"um pico com antecedência."
+
+#: src/background_music/background_music.cc:61
+msgid "Background Music"
+msgstr "Música de Fundo"
+
+#: src/bitcrusher/bitcrusher.cc:33
+msgid "Bitcrusher"
+msgstr "Bitcrusher"
+
+#: src/bitcrusher/bitcrusher.cc:34
+msgid "Bit Depth:"
+msgstr "Profundidade de bits:"
+
+#: src/bitcrusher/bitcrusher.cc:37
+msgid "Downsample ratio:"
+msgstr "Relação de redução:"
+
+#: src/bitcrusher/bitcrusher.cc:48
+msgid "Bitcrusher"
+msgstr "Bitcrusher"
+
+#: src/blur_scope/blur_scope.cc:40 src/blur_scope-qt/blur_scope.cc:45
 msgid "Color"
 msgstr "Cor"
 
-#: src/blur_scope/blur_scope.cc:58
+#: src/blur_scope/blur_scope.cc:56 src/blur_scope-qt/blur_scope.cc:158
 msgid "Blur Scope"
 msgstr "Ofuscar Escopo"
 
@@ -803,11 +673,15 @@
 
 #: src/bs2b/plugin.cc:129
 msgid "Presets:"
-msgstr "Pré-ajuste:"
+msgstr "Predefinições:"
+
+#: src/bs2b/plugin.cc:130
+msgid "Default"
+msgstr "Padrão"
 
 #: src/bs2b/plugin.cc:136
 msgid "Feed level:"
-msgstr "Nível alimentar:"
+msgstr "Nível de alimentação:"
 
 #: src/bs2b/plugin.cc:138
 msgid "x1/10 dB"
@@ -817,15 +691,15 @@
 msgid "Cut frequency:"
 msgstr "Frequência de corte:"
 
-#: src/cairo-spectrum/cairo-spectrum.cc:41
+#: src/cairo-spectrum/cairo-spectrum.cc:42 src/qt-spectrum/qt-spectrum.cc:107
 msgid "Spectrum Analyzer"
 msgstr "Analisador Espectro"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:72
+#: src/cdaudio/cdaudio-ng.cc:74
 msgid "Audio CD Plugin"
 msgstr "Plugin de CD de Áudio"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:121
+#: src/cdaudio/cdaudio-ng.cc:121
 msgid ""
 "Copyright (C) 2007-2012 Calin Crisan <ccrisan@gmail.com> and others.\n"
 "\n"
@@ -846,132 +720,132 @@
 "\n"
 "Este foi um projeto do Google Summer of Code 2007."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:137
+#: src/cdaudio/cdaudio-ng.cc:140
 msgid "Device"
 msgstr "Dispositivo"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:138
+#: src/cdaudio/cdaudio-ng.cc:141
 msgid "Read speed:"
 msgstr "Velocidade de Leitura:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:141
+#: src/cdaudio/cdaudio-ng.cc:144
 msgid "Override device:"
 msgstr "Substituir dispositivo:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:143
+#: src/cdaudio/cdaudio-ng.cc:146
 msgid "Metadata"
 msgstr "Metadados"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:144
+#: src/cdaudio/cdaudio-ng.cc:147
 msgid "Use CD-Text"
 msgstr "Utilizar CD-Text"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:146
+#: src/cdaudio/cdaudio-ng.cc:150
 msgid "Use CDDB"
 msgstr "Usar CDDB"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:148
+#: src/cdaudio/cdaudio-ng.cc:152
 msgid "Use HTTP instead of CDDBP"
 msgstr "Use HTTP em vez de CDDBP"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:151
+#: src/cdaudio/cdaudio-ng.cc:155
 msgid "Server:"
 msgstr "Servidor:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:155
+#: src/cdaudio/cdaudio-ng.cc:159
 msgid "Path:"
 msgstr "Caminho:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:159
+#: src/cdaudio/cdaudio-ng.cc:163
 msgid "Port:"
 msgstr "Porta:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:246
+#: src/cdaudio/cdaudio-ng.cc:228
 msgid "Failed to initialize cdio subsystem."
 msgstr "Falha ao iniciar o subsistema cdio."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:281
+#: src/cdaudio/cdaudio-ng.cc:260
 #, c-format
 msgid "Invalid URI %s."
 msgstr "URI Inválido %s."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:283
+#: src/cdaudio/cdaudio-ng.cc:262
 #, c-format
 msgid "Track %d not found."
 msgstr "Faixa %d não encontrada."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:285
+#: src/cdaudio/cdaudio-ng.cc:264
 #, c-format
 msgid "Track %d is a data track."
 msgstr "A faixa %d é uma faixa de dados."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:360
+#: src/cdaudio/cdaudio-ng.cc:339
 msgid "Error reading audio CD."
 msgstr "Erro ao ler CD de áudio. "
 
-#: src/cdaudio-ng/cdaudio-ng.cc:429
+#: src/cdaudio/cdaudio-ng.cc:410
 msgid "Audio CD"
 msgstr "Audio CD "
 
-#: src/cdaudio-ng/cdaudio-ng.cc:460 src/cdaudio-ng/cdaudio-ng.cc:469
+#: src/cdaudio/cdaudio-ng.cc:446 src/cdaudio/cdaudio-ng.cc:455
 #, c-format
 msgid "Failed to open CD device %s."
 msgstr "Falha ao abrir dispositivo de CD %s."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:472
+#: src/cdaudio/cdaudio-ng.cc:458
 msgid "No audio capable CD drive found."
 msgstr "Não se encontrou drive de CD capaz de reproduzir áudio."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:497
+#: src/cdaudio/cdaudio-ng.cc:481
+msgid "Drive is empty."
+msgstr "Unidade está vazia."
+
+#: src/cdaudio/cdaudio-ng.cc:483
+msgid "Unsupported disk type."
+msgstr "Tipo de disco não suportado."
+
+#: src/cdaudio/cdaudio-ng.cc:507
 msgid "Failed to finish initializing opened CD drive."
 msgstr "Falha ao terminar de inicializar drive de CD aberto."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:510
+#: src/cdaudio/cdaudio-ng.cc:520
 msgid "Failed to retrieve first/last track number."
 msgstr "Falha ao recuperar primeiro/ultimo número de faixa."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:531
+#: src/cdaudio/cdaudio-ng.cc:541
 #, 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.cc:613
-msgid "Failed to create the cddb connection."
-msgstr "Falha ao criar a conexão cddb."
+#: src/cdaudio/cdaudio-ng.cc:624
+msgid "Failed to create the CDDB connection."
+msgstr "Falha ao criar a conexão CDDB"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:679
+#: src/cdaudio/cdaudio-ng.cc:690
 msgid "Failed to query the CDDB server"
 msgstr "Falha ao consultar o servidor CDDB."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:681
+#: src/cdaudio/cdaudio-ng.cc:692
 #, c-format
 msgid "Failed to query the CDDB server: %s"
 msgstr "Falha ao consultar o servidor CDDB: %s"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:705
+#: src/cdaudio/cdaudio-ng.cc:716
 #, c-format
-msgid "Failed to read the cddb info: %s"
-msgstr "Falha ao ler as informações cddb: %s"
-
-#: src/cdaudio-ng/cdaudio-ng.cc:765
-msgid "Drive is empty."
-msgstr "Unidade está vazia."
+msgid "Failed to read the CDDB info: %s"
+msgstr "Falha ao ler as informações CDDB: %s"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:767
-msgid "Unsupported disk type."
-msgstr "Tipo de disco não suportado."
-
-#: src/cd-menu-items/cd-menu-items.cc:35
+#: src/cd-menu-items/cd-menu-items.cc:33
 msgid "Audio CD Menu Items"
 msgstr "Itens do Menu do Áudio CD"
 
-#: src/cd-menu-items/cd-menu-items.cc:47
-msgid "Play CD"
+#: src/cd-menu-items/cd-menu-items.cc:45
+msgid "Pla_y CD"
 msgstr "Reproduzir CD"
 
-#: src/cd-menu-items/cd-menu-items.cc:47
-msgid "Add CD"
-msgstr "Adicionar CD "
+#: src/cd-menu-items/cd-menu-items.cc:45
+msgid "_Add CD"
+msgstr "Adicionar CD"
 
 #: src/compressor/compressor.cc:45
 msgid "Compression"
@@ -1006,7 +880,7 @@
 "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\n"
+"Engine decodificador de músicas 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"
@@ -1029,7 +903,14 @@
 msgid "Default song length:"
 msgstr " Predefinição da duração da faixa:"
 
-#: src/console/plugin.cc:42 src/modplug/plugin_main.cc:59
+#: src/console/plugin.cc:41 src/crossfade/crossfade.cc:56
+#: src/crossfade/crossfade.cc:62 src/lirc/lirc.cc:395 src/notify/notify.cc:113
+#: src/sid/xs_config.cc:85 src/sid/xs_config.cc:94 src/sid/xs_config.cc:103
+#: src/vumeter-qt/vumeter_qt.cc:39
+msgid "seconds"
+msgstr "segundos"
+
+#: src/console/plugin.cc:42 src/modplug/plugin_main.cc:58
 msgid "Resampling"
 msgstr "Reamostragem"
 
@@ -1053,29 +934,39 @@
 msgid "Game Console Music Decoder"
 msgstr "Decodificador Game Console Music"
 
-#: src/coreaudio/coreaudio.cc:50
+#: src/coreaudio/coreaudio.cc:53
 msgid "CoreAudio output"
 msgstr "Saída CoreAudio"
 
-#: src/coreaudio/coreaudio.cc:131
+#: src/coreaudio/coreaudio.cc:155
 msgid ""
 "CoreAudio Output Plugin for Audacious\n"
 "Copyright 2014 William Pitcock\n"
+"Copyright 2017,18 René J.V. Bertin\n"
+" (original code and code adapted from\n"
+" Apple examples, (C) Apple 2013)\n"
 "\n"
 "Based on SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
 msgstr ""
-"Plugin de Saída CoreAudio para Audacious\n"
-"Direitos Autorais 2014 William Pitcock\n"
+"Plugin de saída CoreAudio para Audacious\n"
+"Direitos Reservados à William Pitcock - 2014\n"
+"Direitos Reservados à René J.V. Bertin - 2017-2018\n"
+"(Código Original e Código adaptado\n"
+" dos exemplos da Apple, (C) Apple - 2013\n"
 "\n"
-"Baseado no Plugin de Saída SDL para Audacious\n"
-"Direitos Autorais 2010 John Lindgren"
+"Baseado no Plugin de saída SDL para Audacious\n"
+"Direitos Reservados à John Lindgren - 2010"
 
-#: src/coreaudio/coreaudio.cc:143
+#: src/coreaudio/coreaudio.cc:171
 msgid "Use exclusive mode"
 msgstr "Usar modo exclusivo"
 
-#: src/crossfade/crossfade.cc:44
+#: src/coreaudio/coreaudio.cc:173
+msgid "Use bit perfect audio (adapt device sampling rate)"
+msgstr "Usar áudio perfeito (ajusta a taxa de amostragem do dispositivo)"
+
+#: src/crossfade/crossfade.cc:47
 msgid ""
 "Crossfade Plugin for Audacious\n"
 "Copyright 2010-2014 John Lindgren"
@@ -1083,27 +974,43 @@
 "Plugin Atenuação cruzada para Audacious\n"
 "Direitos Autorais 2010-2014 John Lindgren"
 
-#: src/crossfade/crossfade.cc:48
+#: src/crossfade/crossfade.cc:51
 msgid "Crossfade"
 msgstr "Atenuação cruzada"
 
-#: src/crossfade/crossfade.cc:49
+#: src/crossfade/crossfade.cc:52
 msgid "On automatic song change"
 msgstr "Sobre a mudança automática de faixa"
 
-#: src/crossfade/crossfade.cc:51 src/crossfade/crossfade.cc:57
+#: src/crossfade/crossfade.cc:54 src/crossfade/crossfade.cc:60
 msgid "Overlap:"
 msgstr "Sobrepor:"
 
-#: src/crossfade/crossfade.cc:55
+#: src/crossfade/crossfade.cc:58
 msgid "On seek or manual song change"
 msgstr "Sobre a busca ou mudança manual de faixa"
 
-#: src/crossfade/crossfade.cc:61
+#: src/crossfade/crossfade.cc:64
+msgid "No fade in"
+msgstr "Sem fade in"
+
+#: src/crossfade/crossfade.cc:66
+msgid "Use S-curve fade"
+msgstr "Usar fade de curva S"
+
+#: src/crossfade/crossfade.cc:68
+msgid "S-curve steepness:"
+msgstr "Inclinação da curva S:"
+
+#: src/crossfade/crossfade.cc:70
+msgid "(higher is steeper)"
+msgstr "(mais alto é mais íngreme)"
+
+#: src/crossfade/crossfade.cc:72
 msgid "Tip"
 msgstr "Dica"
 
-#: src/crossfade/crossfade.cc:62
+#: src/crossfade/crossfade.cc:73
 msgid ""
 "For better crossfading, enable\n"
 "the Silence Removal effect."
@@ -1111,29 +1018,10 @@
 "Para uma melhor transição gradual, ative\n"
 "o efeito Remoção de Silêncio."
 
-#: src/crossfade/crossfade.cc:72
+#: src/crossfade/crossfade.cc:83
 msgid "Crossfade"
 msgstr "Atenuação cruzada"
 
-#: src/crossfade/crossfade.cc:161
-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 transição gradual falhou porque as músicas tinham um número diferente de "
-"canais. Você pode utilizar o Canal Mixer para converter as músicas para o "
-"mesmo número de canais."
-
-#: src/crossfade/crossfade.cc:168
-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 transição gradual falhou porque as músicas tinham taxas de amostragem "
-"diferentes. Você pode usar o Conversor de Taxa de Amostragem para converter "
-"as músicas para a mesma taxa de amostragem."
-
 #: src/crystalizer/crystalizer.cc:31
 msgid "Crystalizer"
 msgstr "Cristalizar"
@@ -1146,60 +1034,61 @@
 msgid "Crystalizer"
 msgstr "Cristalizador"
 
-#: src/cue/cue.cc:37
+#: src/cue/cue.cc:42
 msgid "Cue Sheet Plugin"
 msgstr "Plugin Cue Sheet"
 
-#: src/delete-files/delete-files.cc:46 src/delete-files/delete-files.cc:146
+#: src/delete-files/delete-files.cc:53 src/delete-files/delete-files.cc:215
+#: src/delete-files/delete-files.cc:230
 msgid "Delete Files"
-msgstr "Deletar Arquivos"
+msgstr "Excluir Arquivos"
+
+#: src/delete-files/delete-files.cc:120
+msgid "No files are selected."
+msgstr "Nenhum arquivo foi selecionado."
 
-#: src/delete-files/delete-files.cc:75
+#: src/delete-files/delete-files.cc:125
 #, c-format
-msgid "Error moving %s to trash: %s."
-msgstr "Erro ao mover %s para lixeira: %s."
+msgid "Do you want to move %s to the trash?"
+msgstr "Você quer mover %spara a lixeira?"
 
-#: src/delete-files/delete-files.cc:86
+#: src/delete-files/delete-files.cc:126
 #, c-format
-msgid "Error deleting %s: %s."
-msgstr "Erro ao deletar %s: %s."
+msgid "Do you want to permanently delete %s?"
+msgstr "Você quer deletar %s permanentemente?"
 
-#: src/delete-files/delete-files.cc:117
+#: src/delete-files/delete-files.cc:133
 #, c-format
-msgid "Error deleting %s: not a local file."
-msgstr "Erro apagando %s: não é um arquivo local."
+msgid "Do you want to move %d files to the trash?"
+msgstr "Você quer mover %d arquivos para a lixeira?"
 
 #: src/delete-files/delete-files.cc:134
-msgid "Do you want to move the selected files to the trash?"
-msgstr "Deseja mover os arquivos selecionados para a lixeira?"
+#, c-format
+msgid "Do you want to permanently delete %d files?"
+msgstr "Você quer deletar permanentemente esses %d arquivos?"
 
-#: src/delete-files/delete-files.cc:135
-msgid "Move to Trash"
-msgstr "Mover para Lixeira"
-
-#: src/delete-files/delete-files.cc:140
-msgid "Do you want to permanently delete the selected files?"
-msgstr "Deseja excluir permanentemente os arquivos selecionados?"
+#: src/delete-files/delete-files.cc:146
+msgid "Move to trash"
+msgstr "Mover para a lixeira"
 
-#: src/delete-files/delete-files.cc:141 src/skins/preset-list.cc:411
-#: src/skins/preset-list.cc:427
+#: src/delete-files/delete-files.cc:146
 msgid "Delete"
-msgstr "Apagar"
+msgstr "Excluir"
 
-#: src/delete-files/delete-files.cc:145 src/skins/preset-browser.cc:56
-#: src/skins/preset-list.cc:307 src/skins/ui_playlist.cc:221
+#: src/delete-files/delete-files.cc:213 src/delete-files/delete-files.cc:235
+#: src/skins-qt/search-select.cc:102 src/skins/search-select.cc:78
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: src/delete-files/delete-files.cc:166
+#: src/delete-files/delete-files.cc:267
 msgid "Delete Selected Files"
-msgstr "Deletar Arquivos Selecionados"
+msgstr "Excluir Arquivos Selecionados"
 
-#: src/delete-files/delete-files.cc:181
+#: src/delete-files/delete-files.cc:287
 msgid "Delete Method"
 msgstr "Excluir Método"
 
-#: src/delete-files/delete-files.cc:182
+#: src/delete-files/delete-files.cc:288
 msgid "Move to trash instead of deleting immediately"
 msgstr "Mover para a lixeira ao invés de excluir imediatamente"
 
@@ -1219,13 +1108,13 @@
 msgid "Echo"
 msgstr "Eco"
 
-#: src/echo_plugin/echo.cc:22 src/modplug/plugin_main.cc:73
-#: src/modplug/plugin_main.cc:83
+#: src/echo_plugin/echo.cc:22 src/modplug/plugin_main.cc:72
+#: src/modplug/plugin_main.cc:82
 msgid "Delay:"
 msgstr "Atraso:"
 
-#: src/echo_plugin/echo.cc:24 src/modplug/plugin_main.cc:73
-#: src/modplug/plugin_main.cc:83
+#: src/echo_plugin/echo.cc:24 src/modplug/plugin_main.cc:72
+#: src/modplug/plugin_main.cc:82 src/xsf/plugin.cc:445
 msgid "ms"
 msgstr "ms"
 
@@ -1233,7 +1122,7 @@
 msgid "Feedback:"
 msgstr "Comentários:"
 
-#: src/echo_plugin/echo.cc:28 src/modplug/plugin_main.cc:87
+#: src/echo_plugin/echo.cc:28 src/modplug/plugin_main.cc:86
 msgid "Volume:"
 msgstr "Volume:"
 
@@ -1241,11 +1130,11 @@
 msgid "Echo"
 msgstr "Eco"
 
-#: src/ffaudio/ffaudio-core.cc:41
+#: src/ffaudio/ffaudio-core.cc:50
 msgid "FFmpeg Plugin"
 msgstr "Plugin FFmpeg"
 
-#: src/ffaudio/ffaudio-core.cc:571
+#: src/ffaudio/ffaudio-core.cc:649
 msgid ""
 "Multi-format audio decoding plugin for Audacious using\n"
 "FFmpeg multimedia framework (http://www.ffmpeg.org/)\n"
@@ -1262,248 +1151,321 @@
 "William Pitcock <nenolod@nenolod.net>\n"
 "Matti Hämäläinen <ccr@tnsp.org>."
 
-#: src/filewriter/filewriter.cc:45
+#: src/filewriter/filewriter.cc:48
 msgid "FileWriter Plugin"
 msgstr "Plugin FileWriter"
 
-#: src/filewriter/filewriter.cc:386
+#: src/filewriter/filewriter.cc:316
+#, c-format
+msgid ""
+"Error opening %s:\n"
+"%s"
+msgstr ""
+"Erro ao abrir %s:\n"
+"%s"
+
+#: src/filewriter/filewriter.cc:358
+msgid ""
+"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 ""
+"Este programa é software livre; você pode redistribuí-lo e/ou modificá-lo "
+"sob os termos da Licença Pública Geral GNU conforme publicado pela Free "
+"Software Foundation; tanto a versão 2 da Licença, ou (a seu critério) "
+"qualquer versão posterior\n"
+"\n"
+"Este programa é distribuído na esperança de que possa ser útil, mas SEM "
+"QUALQUER GARANTIA; nem mesmo a garantia implícita de COMERCIALIZAÇÃO ou "
+"ADEQUAÇÃO A UM DETERMINADO FIM. Veja a Licença Pública Geral GNU para obter "
+"mais detalhes.\n"
+"\n"
+"Você deve ter recebido uma cópia da Licença Pública Geral GNU junto com este "
+"programa; se não, escreva para a Free Software Foundation, Inc., 51 Franklin "
+"Street, Fifth Floor, Boston, MA 02110-1301, USA."
+
+#: src/filewriter/filewriter.cc:385
 msgid "Output file format:"
 msgstr "Formato de saída do arquivo:"
 
-#: src/filewriter/filewriter.cc:403
-msgid "Configure"
-msgstr "Configurar"
-
-#: src/filewriter/filewriter.cc:413
+#: src/filewriter/filewriter.cc:389
 msgid "Save into original directory"
 msgstr "Salvar no diretório original"
 
-#: src/filewriter/filewriter.cc:417
-msgid "Save into custom directory"
-msgstr "Salvar em diretório personalizado"
-
-#: src/filewriter/filewriter.cc:427
-msgid "Output file folder:"
-msgstr "Pasta de destino:"
-
-#: src/filewriter/filewriter.cc:431
-msgid "Pick a folder"
-msgstr "Escolha uma pasta"
+#: src/filewriter/filewriter.cc:392
+msgid "Save into custom directory:"
+msgstr "Salvar no diretório personalizado:"
 
-#: src/filewriter/filewriter.cc:444
+#: src/filewriter/filewriter.cc:400
 msgid "Generate file name from:"
 msgstr "Gerar nome de arquivo a partir de:"
 
-#: src/filewriter/filewriter.cc:448
-msgid "Original file tag"
-msgstr "Etiqueta do arquivo original"
-
-#: src/filewriter/filewriter.cc:453
+#: src/filewriter/filewriter.cc:401
 msgid "Original file name"
 msgstr "Nome do arquivo original"
 
-#: src/filewriter/filewriter.cc:459
-msgid "Include original file name extension"
-msgstr "Incluir extensão original do nome do arquivo "
+#: src/filewriter/filewriter.cc:404
+msgid "Original file name (no suffix)"
+msgstr "Nome do arquivo original (sem sufixo)"
 
-#: src/filewriter/filewriter.cc:468
+#: src/filewriter/filewriter.cc:407
+msgid "Original file tag"
+msgstr "Etiqueta do arquivo original"
+
+#: src/filewriter/filewriter.cc:411
 msgid "Prepend track number to file name"
 msgstr "Acrescentar número da faixa no início do nome do arquivo"
 
-#: src/filewriter/filewriter.cc:484
-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 ""
-"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/mp3.cc:40 src/filewriter/mp3.cc:717
+#: src/filewriter/filewriter.cc:417 src/filewriter/filewriter.cc:449
 msgid "Auto"
 msgstr "Automático"
 
-#: src/filewriter/mp3.cc:40
+#: src/filewriter/filewriter.cc:418
+msgid "8000 Hz"
+msgstr "8000 Hz"
+
+#: src/filewriter/filewriter.cc:419
+msgid "11025 Hz"
+msgstr "11025 Hz"
+
+#: src/filewriter/filewriter.cc:420
+msgid "12000 Hz"
+msgstr "12000 Hz"
+
+#: src/filewriter/filewriter.cc:421
+msgid "16000 Hz"
+msgstr "16000 Hz"
+
+#: src/filewriter/filewriter.cc:422
+msgid "22050 Hz"
+msgstr "22050 Hz"
+
+#: src/filewriter/filewriter.cc:423
+msgid "24000 Hz"
+msgstr "24000 Hz"
+
+#: src/filewriter/filewriter.cc:424
+msgid "32000 Hz"
+msgstr "32000 Hz"
+
+#: src/filewriter/filewriter.cc:425 src/xsf/plugin.cc:430
+msgid "44100 Hz"
+msgstr "44100 Hz"
+
+#: src/filewriter/filewriter.cc:426 src/xsf/plugin.cc:431
+msgid "48000 Hz"
+msgstr "48000 Hz"
+
+#: src/filewriter/filewriter.cc:430
+msgid "8 kbit/s"
+msgstr "8 kbit/s"
+
+#: src/filewriter/filewriter.cc:431
+msgid "16 kbit/s"
+msgstr "16 kbit/s"
+
+#: src/filewriter/filewriter.cc:432
+msgid "32 kbit/s"
+msgstr "32 kbit/s"
+
+#: src/filewriter/filewriter.cc:433
+msgid "40 kbit/s"
+msgstr "40 kbit/s"
+
+#: src/filewriter/filewriter.cc:434
+msgid "48 kbit/s"
+msgstr "48 kbit/s"
+
+#: src/filewriter/filewriter.cc:435
+msgid "56 kbit/s"
+msgstr "56 kbit/s"
+
+#: src/filewriter/filewriter.cc:436
+msgid "64 kbit/s"
+msgstr "64 kbit/s"
+
+#: src/filewriter/filewriter.cc:437
+msgid "80 kbit/s"
+msgstr "80 kbit/s"
+
+#: src/filewriter/filewriter.cc:438
+msgid "96 kbit/s"
+msgstr "96 kbit/s"
+
+#: src/filewriter/filewriter.cc:439
+msgid "112 kbit/s"
+msgstr "112 kbit/s"
+
+#: src/filewriter/filewriter.cc:440
+msgid "128 kbit/s"
+msgstr "128 kbit/s"
+
+#: src/filewriter/filewriter.cc:441
+msgid "160 kbit/s"
+msgstr "160 kbit/s"
+
+#: src/filewriter/filewriter.cc:442
+msgid "192 kbit/s"
+msgstr "192 kbit/s"
+
+#: src/filewriter/filewriter.cc:443
+msgid "224 kbit/s"
+msgstr "224 kbit/s"
+
+#: src/filewriter/filewriter.cc:444
+msgid "256 kbit/s"
+msgstr "256 kbit/s"
+
+#: src/filewriter/filewriter.cc:445
+msgid "320 kbit/s"
+msgstr "320 kbit/s"
+
+#: src/filewriter/filewriter.cc:450
 msgid "Joint Stereo"
 msgstr "Joint Stereo"
 
-#: src/filewriter/mp3.cc:41 src/modplug/plugin_main.cc:58
-#: src/mpg123/mpg123.cc:248
+#: src/filewriter/filewriter.cc:451 src/modplug/plugin_main.cc:57
+#: src/mpg123/mpg123.cc:259
 msgid "Stereo"
 msgstr "Stereo"
 
-#: src/filewriter/mp3.cc:41 src/modplug/plugin_main.cc:57
-#: src/mpg123/mpg123.cc:248
+#: src/filewriter/filewriter.cc:452 src/modplug/plugin_main.cc:56
+#: src/mpg123/mpg123.cc:260
 msgid "Mono"
 msgstr "Mono"
 
-#: src/filewriter/mp3.cc:657
-msgid "MP3 Configuration"
-msgstr "Configuração MP3"
-
-#: src/filewriter/mp3.cc:658
-msgid "_OK"
-msgstr "_OK"
-
-#: src/filewriter/mp3.cc:681
-msgid "Algorithm Quality:"
-msgstr "Qualidade do Algorítimo:"
-
-#: src/filewriter/mp3.cc:706
-msgid "Output Sample Rate:"
-msgstr "Taxa de Amostragem de Saída:"
-
-#: src/filewriter/mp3.cc:733
-msgid "(Hz)"
-msgstr "(Hz)"
+#: src/filewriter/filewriter.cc:456
+msgid "VBR"
+msgstr "VBR"
+
+#: src/filewriter/filewriter.cc:457
+msgid "ABR"
+msgstr "ABR"
+
+#: src/filewriter/filewriter.cc:478
+msgid "Algorithm quality:"
+msgstr "Qualidade do Algoritmo:"
 
-#: src/filewriter/mp3.cc:740
-msgid "Bitrate / Compression Ratio:"
-msgstr "Taxa de compressão:"
-
-#: src/filewriter/mp3.cc:764
-msgid "Bitrate (kbps):"
-msgstr "Taxa de dados (kbps):"
+#: src/filewriter/filewriter.cc:484
+msgid "Bitrate:"
+msgstr "Bitrate:"
 
-#: src/filewriter/mp3.cc:796
+#: src/filewriter/filewriter.cc:491
 msgid "Compression ratio:"
 msgstr "Taxa de compressão:"
 
-#: src/filewriter/mp3.cc:820
-msgid "Audio Mode:"
-msgstr "Modo de áudio:"
-
-#: src/filewriter/mp3.cc:845
-msgid "Miscellaneous:"
-msgstr "Diversos:"
+#: src/filewriter/filewriter.cc:498
+msgid "Audio mode:"
+msgstr "Modo de Áudio:"
 
-#: src/filewriter/mp3.cc:856
+#: src/filewriter/filewriter.cc:501
 msgid "Enforce strict ISO compliance"
 msgstr "Assegurar o estrito cumprimento da ISO"
 
-#: src/filewriter/mp3.cc:867
+#: src/filewriter/filewriter.cc:503
 msgid "Error protection"
 msgstr "Proteção de erros"
 
-#: src/filewriter/mp3.cc:879 src/filewriter/vorbis.cc:206
-msgid "Quality"
-msgstr "Qualidade"
-
-#: src/filewriter/mp3.cc:888
+#: src/filewriter/filewriter.cc:508
 msgid "Enable VBR/ABR"
 msgstr "Ativar VBR/ABR"
 
-#: src/filewriter/mp3.cc:898
+#: src/filewriter/filewriter.cc:510
 msgid "Type:"
 msgstr "Tipo:"
 
-#: src/filewriter/mp3.cc:931
-msgid "VBR Options:"
-msgstr "Opções VBR"
-
-#: src/filewriter/mp3.cc:947
-msgid "Minimum bitrate (kbps):"
-msgstr "Taxa mínima (kbps)"
-
-#: src/filewriter/mp3.cc:973
-msgid "Maximum bitrate (kbps):"
-msgstr "Taxa máxima (kbps)"
-
-#: src/filewriter/mp3.cc:995
-msgid "Strictly enforce minimum bitrate"
-msgstr "Cumprir rigorosamente taxa de bits mínima"
+#: src/filewriter/filewriter.cc:514
+msgid "Minimum bitrate:"
+msgstr "Bitrate mínimo:"
+
+#: src/filewriter/filewriter.cc:518
+msgid "Maximum bitrate:"
+msgstr "Bitrate máximo:"
+
+#: src/filewriter/filewriter.cc:522
+msgid "Average bitrate:"
+msgstr "Bitrate médio:"
 
-#: src/filewriter/mp3.cc:1007
-msgid "ABR Options:"
-msgstr "Opções ABR:"
-
-#: src/filewriter/mp3.cc:1017
-msgid "Average bitrate (kbps):"
-msgstr "Taxa média (kbps)"
-
-#: src/filewriter/mp3.cc:1044
+#: src/filewriter/filewriter.cc:526
 msgid "VBR quality level:"
 msgstr "Nível de qualidade VBR:"
 
-#: src/filewriter/mp3.cc:1063
+#: src/filewriter/filewriter.cc:530
+msgid "Strictly enforce minimum bitrate"
+msgstr "Cumprir rigorosamente taxa de bits mínima"
+
+#: src/filewriter/filewriter.cc:533
 msgid "Omit Xing VBR header"
 msgstr "Omitir cabeçalho Xing VBR"
 
-#: src/filewriter/mp3.cc:1076
-msgid "VBR/ABR"
-msgstr "VBR/ABR"
-
-#: src/filewriter/mp3.cc:1085
-msgid "Frame Parameters:"
-msgstr "Parâmetros da Estrutura:"
+#: src/filewriter/filewriter.cc:539
+msgid "Frame Headers"
+msgstr "Estrutura de Cabeçalhos"
 
-#: src/filewriter/mp3.cc:1097
+#: src/filewriter/filewriter.cc:540
 msgid "Mark as copyright"
 msgstr "Assinalar como Direitos Autorais"
 
-#: src/filewriter/mp3.cc:1108
+#: src/filewriter/filewriter.cc:542
 msgid "Mark as original"
 msgstr "Assinalar como original"
 
-#: src/filewriter/mp3.cc:1120
-msgid "ID3 Parameters:"
-msgstr "Parâmetros ID3:"
+#: src/filewriter/filewriter.cc:544
+msgid "ID3 Tags"
+msgstr "ID3 Tags"
 
-#: src/filewriter/mp3.cc:1131
+#: src/filewriter/filewriter.cc:545
 msgid "Force addition of version 2 tag"
 msgstr "Forçar adição de tag, versão 2"
 
-#: src/filewriter/mp3.cc:1141
+#: src/filewriter/filewriter.cc:547
 msgid "Only add v1 tag"
 msgstr "Somente adicionar tag v1 "
 
-#: src/filewriter/mp3.cc:1148
+#: src/filewriter/filewriter.cc:549
 msgid "Only add v2 tag"
 msgstr "Somente adicionar tag v2"
 
-#: src/filewriter/mp3.cc:1169
+#: src/filewriter/filewriter.cc:554
+msgid "Quality"
+msgstr "Qualidade"
+
+#: src/filewriter/filewriter.cc:555
+msgid "VBR/ABR"
+msgstr "VBR/ABR"
+
+#: src/filewriter/filewriter.cc:556
 msgid "Tags"
 msgstr "Tags"
 
-#: src/filewriter/vorbis.cc:196
-msgid "Vorbis Encoder Configuration"
-msgstr "Configuração do codificador Vorbis"
-
-#: src/filewriter/vorbis.cc:219
-msgid "Quality level (0 - 10):"
-msgstr "Nível de Qualidade (0 - 10):"
+#: src/filewriter/filewriter.cc:566
+msgid "Quality (0-1):"
+msgstr "Qualidade (0-1):"
+
+#: src/filewriter/filewriter.cc:573 src/skins-qt/skins_cfg.cc:307
+#: src/skins/skins_cfg.cc:289
+msgid "General"
+msgstr "Geral"
 
-#: src/flacng/flacng.h:35
+#: src/flac/flacng.h:36
 msgid "FLAC Decoder"
-msgstr "Decodificador FLAG"
+msgstr "Decodificador FLAC"
 
-#: src/flacng/metadata.cc:351 src/wavpack/wavpack.cc:209
+#: src/flac/metadata.cc:296 src/wavpack/wavpack.cc:215
 msgid "lossless"
 msgstr "sem perdas"
 
-#: src/flacng/plugin.cc:169
+#: src/flac/plugin.cc:214
 msgid ""
 "Original code by\n"
 "Ralf Ertzinger <ralf@skytale.net>\n"
@@ -1527,15 +1489,15 @@
 msgid "GIO Plugin"
 msgstr "Plugin GIO"
 
-#: src/gio/gio.cc:153
+#: src/gio/gio.cc:152
 msgid "Read-and-append mode not supported"
 msgstr "Modo Ler-e-anexar não suportado"
 
-#: src/gio/gio.cc:166
+#: src/gio/gio.cc:165
 msgid "Invalid open mode"
 msgstr "Modo de abertura inválido"
 
-#: src/gl-spectrum/gl-spectrum.cc:51
+#: src/glspectrum/gl-spectrum.cc:52
 msgid ""
 "OpenGL Spectrum Analyzer for Audacious\n"
 "Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
@@ -1547,631 +1509,754 @@
 "License: GPLv2+"
 msgstr ""
 "Analisador de Espectro OpenGL para Audacious\n"
-"Direitos Autorais 2013 Christophe Budé, John Lindgren, e Carlo Bramini\n"
+"Copyright 2013 Christophe Budé, John Lindgren, e Carlo Bramini\n"
 "\n"
 "Baseado no plugin XMMS:\n"
-"Direitos Autorais 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas "
-"Nilsson, e 4Front Technologies\n"
-"\n"
-"Licença: GPLv2+"
-
-#: src/gl-spectrum/gl-spectrum.cc:62
-msgid "OpenGL Spectrum Analyzer"
-msgstr "Analisador Espectro OpenGL"
-
-#: src/gl-spectrum-qt/gl-spectrum.cc:41
-msgid ""
-"OpenGL Spectrum Analyzer for Audacious\n"
-"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
-"Copyright 2014 William Pitcock\n"
-"\n"
-"Based on the XMMS plugin:\n"
-"Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson, and "
+"Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson, e "
 "4Front Technologies\n"
 "\n"
-"License: GPLv2+"
-msgstr ""
-"Analisador de Espectro OpenGL para Audacious\n"
-"Direitos Autorais 2013 Christophe Budé, John Lindgren, e Carlo Bramini\n"
-"Direitos Autorais 2014 William Pitcock\n"
-"\n"
-"Baseado no plugin XMMS:\n"
-"Direitos Autorais 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas "
-"Nilsson, e 4Front Technologies\n"
-"\n"
 "Licença: GPLv2+"
 
-#: src/gl-spectrum-qt/gl-spectrum.cc:53
-msgid "OpenGL Spectrum Analyzer (Qt)"
-msgstr "Analisador Espectro OpenGL (Qt)"
-
-#: src/gnomeshortcuts/gnomeshortcuts.cc:38
-msgid "GNOME Shortcuts"
-msgstr "Atalhos do GNOME"
-
-#: src/gnomeshortcuts/gnomeshortcuts.cc:54
-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 Atalho do GNOME\n"
-"Permite controlar o reprodutor com atalhos do GNOME.\n"
-"\n"
-"Direitos Autorais (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>"
-
-#: src/gtkui/columns.cc:35
-msgid "Entry number"
-msgstr "Número de entrada"
+#: src/glspectrum/gl-spectrum.cc:63 src/qtglspectrum/gl-spectrum.cc:53
+msgid "OpenGL Spectrum Analyzer"
+msgstr "Analisador de Espectro OpenGL"
 
-#: src/gtkui/columns.cc:36 src/playlist-manager/playlist-manager.cc:225
-#: src/qtui/playlist_model.cc:123
+#: src/gtkui/columns.cc:36 src/moonstone/playlist_model.cc:38
+#: src/qtui/playlist_model.cc:33
+msgid "Entry Number"
+msgstr "Número de Entrada"
+
+#: src/gtkui/columns.cc:37 src/moonstone/playlist_model.cc:38
+#: src/moonstone/playlist_selection.cc:64
+#: src/playlist-manager/playlist-manager.cc:200
+#: src/playlist-manager-qt/playlist-manager-qt.cc:188
+#: src/qtui/playlist_model.cc:33 src/streamtuner/icecast-model.cc:120
+#: src/streamtuner/ihr-model.cc:159 src/streamtuner/shoutcast-model.cc:122
 msgid "Title"
 msgstr "Título"
 
-#: src/gtkui/columns.cc:37 src/qtui/playlist_model.cc:125
+#: src/gtkui/columns.cc:38 src/moonstone/playlist_model.cc:39
+#: src/qtui/playlist_model.cc:33
 msgid "Artist"
 msgstr "Artista"
 
-#: src/gtkui/columns.cc:38
+#: src/gtkui/columns.cc:39 src/moonstone/playlist_model.cc:39
+#: src/qtui/playlist_model.cc:33
 msgid "Year"
 msgstr "Ano"
 
-#: src/gtkui/columns.cc:39 src/qtui/playlist_model.cc:127
+#: src/gtkui/columns.cc:40 src/moonstone/playlist_model.cc:39
+#: src/qtui/playlist_model.cc:34
 msgid "Album"
 msgstr "Álbum"
 
-#: src/gtkui/columns.cc:40
-msgid "Album artist"
+#: src/gtkui/columns.cc:41 src/moonstone/playlist_model.cc:40
+#: src/qtui/playlist_model.cc:34
+msgid "Album Artist"
 msgstr "Artista do Álbum"
 
-#: src/gtkui/columns.cc:41
+#: src/gtkui/columns.cc:42 src/moonstone/playlist_model.cc:40
+#: src/qtui/playlist_model.cc:34
 msgid "Track"
 msgstr "Faixa"
 
-#: src/gtkui/columns.cc:42
+#: src/gtkui/columns.cc:43 src/moonstone/playlist_model.cc:40
+#: src/qtui/playlist_model.cc:34 src/streamtuner/icecast-model.cc:123
+#: src/streamtuner/shoutcast-model.cc:125
+#: src/streamtuner/shoutcast-model.cc:236
 msgid "Genre"
 msgstr "Gênero"
 
-#: src/gtkui/columns.cc:43
-msgid "Queue position"
-msgstr "Posição na fila de reprodução"
+#: src/gtkui/columns.cc:44 src/moonstone/playlist_model.cc:41
+#: src/qtui/playlist_model.cc:35
+msgid "Queue Position"
+msgstr "Posição Na Fila De Reprodução"
 
-#: src/gtkui/columns.cc:44
+#: src/gtkui/columns.cc:45 src/moonstone/playlist_model.cc:41
+#: src/qtui/playlist_model.cc:35
 msgid "Length"
 msgstr "Duração"
 
-#: src/gtkui/columns.cc:45
-msgid "File path"
-msgstr "Localização do arquivo"
+#: src/gtkui/columns.cc:46 src/moonstone/playlist_model.cc:41
+#: src/qtui/playlist_model.cc:35
+msgid "File Path"
+msgstr "Diretório Do Arquivo"
+
+#: src/gtkui/columns.cc:47 src/moonstone/playlist_model.cc:42
+#: src/qtui/playlist_model.cc:35
+msgid "File Name"
+msgstr "Nome do Arquivo"
 
-#: src/gtkui/columns.cc:47
-msgid "Custom title"
+#: src/gtkui/columns.cc:48 src/moonstone/playlist_model.cc:42
+#: src/qtui/playlist_model.cc:36
+msgid "Custom Title"
 msgstr "Título personalizado"
 
-#: src/gtkui/columns.cc:48
+#: src/gtkui/columns.cc:49 src/moonstone/playlist_model.cc:42
+#: src/qtui/playlist_model.cc:36 src/streamtuner/icecast-model.cc:129
+#: src/streamtuner/shoutcast-model.cc:134
 msgid "Bitrate"
 msgstr "Taxa de dados"
 
-#: src/gtkui/columns.cc:308
+#: src/gtkui/columns.cc:50 src/moonstone/playlist_model.cc:43
+#: src/qtui/playlist_model.cc:36
+msgid "Comment"
+msgstr "Comentário"
+
+#: src/gtkui/columns.cc:51 src/qtui/playlist_model.cc:36
+msgid "Publisher"
+msgstr "Editora"
+
+#: src/gtkui/columns.cc:52 src/qtui/playlist_model.cc:37
+msgid "Catalog Number"
+msgstr "Número de catálogo"
+
+#: src/gtkui/columns.cc:53 src/moonstone/playlist_model.cc:43
+#: src/qtui/playlist_model.cc:37
+msgid "Disc"
+msgstr "Disco"
+
+#: src/gtkui/columns.cc:325
 msgid "Available columns"
 msgstr "Colunas disponíveis"
 
-#: src/gtkui/columns.cc:334
+#: src/gtkui/columns.cc:351
 msgid "Displayed columns"
 msgstr "Colunas visíveis"
 
-#: src/gtkui/layout.cc:72 src/search-tool/search-tool.cc:40
+#: src/gtkui/layout.cc:74 src/search-tool-qt/search-tool-qt.cc:58
+#: src/search-tool/search-tool.cc:49
 msgid "Search Tool"
 msgstr "Ferramenta de Busca"
 
-#: src/gtkui/layout.cc:167
+#: src/gtkui/layout.cc:170
 msgid "Dock at Left"
 msgstr "Apontar na esquerda"
 
-#: src/gtkui/layout.cc:167
+#: src/gtkui/layout.cc:170
 msgid "Dock at Right"
 msgstr "Apontar na direita"
 
-#: src/gtkui/layout.cc:168
+#: src/gtkui/layout.cc:171
 msgid "Dock at Top"
 msgstr "Apontar no topo"
 
-#: src/gtkui/layout.cc:168
+#: src/gtkui/layout.cc:171
 msgid "Dock at Bottom"
 msgstr "Apontar na parte inferior"
 
-#: src/gtkui/layout.cc:168
+#: src/gtkui/layout.cc:171
 msgid "Undock"
 msgstr "Desencaixar"
 
-#: src/gtkui/layout.cc:168 src/ladspa/plugin.cc:531
+#: src/gtkui/layout.cc:171 src/ladspa/plugin.cc:540
 msgid "Disable"
 msgstr "Desabilitar"
 
-#: src/gtkui/menus.cc:126 src/qtui/main_window_actions.cc:93
-#: src/statusicon/statusicon.cc:276
+#: src/gtkui/menus.cc:79 src/qtui/menus.cc:107
+#: src/statusicon-qt/statusicon.cc:115 src/statusicon/statusicon.cc:286
 msgid "_Open Files ..."
 msgstr "_Abrir Arquivo(s) ..."
 
-#: src/gtkui/menus.cc:127
+#: src/gtkui/menus.cc:80 src/qtui/menus.cc:111
 msgid "Open _URL ..."
 msgstr "Abrir _URL ..."
 
-#: src/gtkui/menus.cc:128 src/qtui/main_window_actions.cc:95
+#: src/gtkui/menus.cc:81 src/qtui/menus.cc:113
 msgid "_Add Files ..."
 msgstr "_Adicionar Arquivo(s) ..."
 
-#: src/gtkui/menus.cc:129
+#: src/gtkui/menus.cc:82 src/qtui/menus.cc:118
 msgid "Add U_RL ..."
 msgstr "Adicionar U_RL ..."
 
-#: src/gtkui/menus.cc:131
+#: src/gtkui/menus.cc:84 src/qtui/menus.cc:120
 msgid "Search _Library"
 msgstr "Pesquisar _Biblioteca"
 
-#: src/gtkui/menus.cc:133 src/qtui/main_window_actions.cc:98
+#: src/gtkui/menus.cc:86 src/qtui/menus.cc:123
 msgid "A_bout ..."
 msgstr "S_obre ..."
 
-#: src/gtkui/menus.cc:134 src/qtui/main_window_actions.cc:99
+#: src/gtkui/menus.cc:87 src/qtui/menus.cc:125
 msgid "_Settings ..."
 msgstr "_Configurações ..."
 
-#: src/gtkui/menus.cc:135 src/qtui/main_window_actions.cc:103
-#: src/statusicon/statusicon.cc:284
+#: src/gtkui/menus.cc:88 src/qtui/menus.cc:131
+#: src/statusicon-qt/statusicon.cc:117 src/statusicon/statusicon.cc:288
 msgid "_Quit"
 msgstr "_Sair"
 
-#: src/gtkui/menus.cc:139 src/gtkui/menus.cc:262
-#: src/qtui/main_window_actions.cc:107 src/search-tool/search-tool.cc:641
-#: src/statusicon/statusicon.cc:278
+#: src/gtkui/menus.cc:92 src/gtkui/menus.cc:226
+#: src/moonstone/playlist_tabs.cc:306 src/qtui/menus.cc:135
+#: src/qtui/playlist_tabs.cc:331 src/search-tool-qt/search-tool-qt.cc:499
+#: src/search-tool/search-tool.cc:339 src/statusicon-qt/statusicon.cc:109
+#: src/statusicon/statusicon.cc:280
 msgid "_Play"
 msgstr "_Reproduzir"
 
-#: src/gtkui/menus.cc:140 src/qtui/main_window_actions.cc:108
-#: src/statusicon/statusicon.cc:279
+#: src/gtkui/menus.cc:93 src/qtui/menus.cc:137
+#: src/statusicon-qt/statusicon.cc:110 src/statusicon/statusicon.cc:281
 msgid "Paus_e"
 msgstr "Paus_ar"
 
-#: src/gtkui/menus.cc:141 src/qtui/main_window_actions.cc:109
-#: src/statusicon/statusicon.cc:280
+#: src/gtkui/menus.cc:94 src/qtui/menus.cc:139
+#: src/statusicon-qt/statusicon.cc:111 src/statusicon/statusicon.cc:282
 msgid "_Stop"
 msgstr "_Parar"
 
-#: src/gtkui/menus.cc:142 src/qtui/main_window_actions.cc:110
-#: src/statusicon/statusicon.cc:277
+#: src/gtkui/menus.cc:95 src/qtui/menus.cc:141
+#: src/statusicon-qt/statusicon.cc:112 src/statusicon/statusicon.cc:283
 msgid "Pre_vious"
 msgstr "An_terior"
 
-#: src/gtkui/menus.cc:143 src/qtui/main_window_actions.cc:111
-#: src/statusicon/statusicon.cc:281
+#: src/gtkui/menus.cc:96 src/qtui/menus.cc:143
+#: src/statusicon-qt/statusicon.cc:113 src/statusicon/statusicon.cc:284
 msgid "_Next"
 msgstr "_Próxima"
 
-#: src/gtkui/menus.cc:145 src/qtui/main_window_actions.cc:113
+#: src/gtkui/menus.cc:97 src/qtui/menus.cc:145 src/skins/menus.cc:114
+#: src/skins-qt/menus.cc:105
+msgid "Previous Album"
+msgstr "Álbum anterior"
+
+#: src/gtkui/menus.cc:98 src/qtui/menus.cc:146 src/skins/menus.cc:115
+#: src/skins-qt/menus.cc:106
+msgid "Next Album"
+msgstr "Próximo álbum"
+
+#: src/gtkui/menus.cc:100 src/qtui/menus.cc:148
 msgid "_Repeat"
 msgstr "_Repetir"
 
-#: src/gtkui/menus.cc:146 src/qtui/main_window_actions.cc:114
+#: src/gtkui/menus.cc:101 src/qtui/menus.cc:150
 msgid "S_huffle"
 msgstr "E_mbaralhar"
 
-#: src/gtkui/menus.cc:147 src/qtui/main_window_actions.cc:115
+#: src/gtkui/menus.cc:102 src/qtui/menus.cc:152
+msgid "Shuffle by Albu_m"
+msgstr "Embaralhar por Álbu_m"
+
+#: src/gtkui/menus.cc:103 src/qtui/menus.cc:155
 msgid "N_o Playlist Advance"
 msgstr "N_enhum Avanço da Lista de Reprodução"
 
-#: src/gtkui/menus.cc:148 src/qtui/main_window_actions.cc:116
+#: src/gtkui/menus.cc:104 src/qtui/menus.cc:157
 msgid "Stop A_fter This Song"
 msgstr "Parar D_epois Desta Faixa"
 
-#: src/gtkui/menus.cc:150 src/gtkui/menus.cc:247
-#: src/qtui/main_window_actions.cc:118
+#: src/gtkui/menus.cc:106 src/gtkui/menus.cc:210 src/qtui/menus.cc:162
+#: src/qtui/menus.cc:294
 msgid "Song _Info ..."
 msgstr "_Informações da faixa ..."
 
-#: src/gtkui/menus.cc:151
+#: src/gtkui/menus.cc:107
 msgid "Jump to _Time ..."
 msgstr "Ir para posição _temporal ..."
 
-#: src/gtkui/menus.cc:152
+#: src/gtkui/menus.cc:108
 msgid "_Jump to Song ..."
 msgstr "_Ir para a faixa ..."
 
-#: src/gtkui/menus.cc:154
+#: src/gtkui/menus.cc:110 src/qtui/menus.cc:165
 msgid "Set Repeat Point _A"
 msgstr "Definir Ponto de Repetição _A"
 
-#: src/gtkui/menus.cc:155
+#: src/gtkui/menus.cc:111 src/qtui/menus.cc:167
 msgid "Set Repeat Point _B"
 msgstr "Definir Ponto de Repetição _B"
 
-#: src/gtkui/menus.cc:156
+#: src/gtkui/menus.cc:112 src/qtui/menus.cc:169
 msgid "_Clear Repeat Points"
 msgstr "_Limpar Pontos de Repetição"
 
-#: src/gtkui/menus.cc:160 src/gtkui/menus.cc:167 src/gtkui/menus.cc:183
-#: src/qtui/main_window_actions.cc:122 src/qtui/main_window_actions.cc:129
-#: src/qtui/main_window_actions.cc:145
+#: src/gtkui/menus.cc:116 src/gtkui/menus.cc:123 src/gtkui/menus.cc:141
+#: src/qtui/menus.cc:173 src/qtui/menus.cc:180 src/qtui/menus.cc:198
 msgid "By _Title"
 msgstr "Por _Título"
 
-#: src/gtkui/menus.cc:161 src/qtui/main_window_actions.cc:123
+#: src/gtkui/menus.cc:117 src/qtui/menus.cc:174
 msgid "By _File Name"
 msgstr "Por _Nome de Arquivo"
 
-#: src/gtkui/menus.cc:162 src/qtui/main_window_actions.cc:124
+#: src/gtkui/menus.cc:118 src/qtui/menus.cc:175
 msgid "By File _Path"
 msgstr "Por Localização _do Arquivo"
 
-#: src/gtkui/menus.cc:166 src/gtkui/menus.cc:182
-#: src/qtui/main_window_actions.cc:128 src/qtui/main_window_actions.cc:144
+#: src/gtkui/menus.cc:122 src/gtkui/menus.cc:140 src/qtui/menus.cc:179
+#: src/qtui/menus.cc:197
 msgid "By Track _Number"
 msgstr "Por Número _da Faixa"
 
-#: src/gtkui/menus.cc:168 src/gtkui/menus.cc:184
-#: src/qtui/main_window_actions.cc:130 src/qtui/main_window_actions.cc:146
+#: src/gtkui/menus.cc:124 src/gtkui/menus.cc:142 src/qtui/menus.cc:181
+#: src/qtui/menus.cc:199
 msgid "By _Artist"
 msgstr "Por _Artista"
 
-#: src/gtkui/menus.cc:169 src/gtkui/menus.cc:185
-#: src/qtui/main_window_actions.cc:131 src/qtui/main_window_actions.cc:147
+#: src/gtkui/menus.cc:125 src/gtkui/menus.cc:143 src/qtui/menus.cc:182
+#: src/qtui/menus.cc:200
 msgid "By Al_bum"
 msgstr "Por Ál_bum "
 
-#: src/gtkui/menus.cc:170 src/gtkui/menus.cc:186
-#: src/qtui/main_window_actions.cc:132 src/qtui/main_window_actions.cc:148
+#: src/gtkui/menus.cc:126 src/gtkui/menus.cc:144 src/qtui/menus.cc:183
+#: src/qtui/menus.cc:201
 msgid "By Albu_m Artist"
 msgstr "Por Art_ista do Álbum"
 
-#: src/gtkui/menus.cc:171 src/gtkui/menus.cc:187
-#: src/qtui/main_window_actions.cc:133 src/qtui/main_window_actions.cc:149
+#: src/gtkui/menus.cc:127 src/gtkui/menus.cc:145 src/qtui/menus.cc:184
+#: src/qtui/menus.cc:202
 msgid "By Release _Date"
 msgstr "Por Data de _Lançamento"
 
-#: src/gtkui/menus.cc:172 src/gtkui/menus.cc:188
-#: src/qtui/main_window_actions.cc:134 src/qtui/main_window_actions.cc:150
+#: src/gtkui/menus.cc:128 src/gtkui/menus.cc:146 src/qtui/menus.cc:185
+#: src/qtui/menus.cc:203
 msgid "By _Genre"
 msgstr "Por _Gênero"
 
-#: src/gtkui/menus.cc:173 src/gtkui/menus.cc:189
-#: src/qtui/main_window_actions.cc:135 src/qtui/main_window_actions.cc:151
+#: src/gtkui/menus.cc:129 src/gtkui/menus.cc:147 src/qtui/menus.cc:186
+#: src/qtui/menus.cc:204
 msgid "By _Length"
 msgstr "Por _Duração"
 
-#: src/gtkui/menus.cc:174 src/gtkui/menus.cc:190
-#: src/qtui/main_window_actions.cc:136 src/qtui/main_window_actions.cc:152
+#: src/gtkui/menus.cc:130 src/gtkui/menus.cc:148 src/qtui/menus.cc:187
+#: src/qtui/menus.cc:205
 msgid "By _File Path"
 msgstr "Por _Localização do Arquivo"
 
-#: src/gtkui/menus.cc:175 src/gtkui/menus.cc:191
-#: src/qtui/main_window_actions.cc:137 src/qtui/main_window_actions.cc:153
+#: src/gtkui/menus.cc:131 src/gtkui/menus.cc:149 src/qtui/menus.cc:188
+#: src/qtui/menus.cc:206
 msgid "By _Custom Title"
 msgstr "Por _Título Personalizado"
 
-#: src/gtkui/menus.cc:177 src/gtkui/menus.cc:193
-#: src/qtui/main_window_actions.cc:139 src/qtui/main_window_actions.cc:155
+#: src/gtkui/menus.cc:132 src/gtkui/menus.cc:150 src/qtui/menus.cc:189
+#: src/qtui/menus.cc:207
+msgid "By C_omment"
+msgstr "Por C_omentário"
+
+#: src/gtkui/menus.cc:133 src/gtkui/menus.cc:151 src/qtui/menus.cc:190
+#: src/qtui/menus.cc:208
+msgid "By D_isc Number"
+msgstr "Por número de d_isco"
+
+#: src/gtkui/menus.cc:135 src/gtkui/menus.cc:153 src/qtui/menus.cc:192
+#: src/qtui/menus.cc:210
 msgid "R_everse Order"
 msgstr "I_nverter Ordem"
 
-#: src/gtkui/menus.cc:178 src/gtkui/menus.cc:194
-#: src/qtui/main_window_actions.cc:140 src/qtui/main_window_actions.cc:156
+#: src/gtkui/menus.cc:136 src/gtkui/menus.cc:154 src/qtui/menus.cc:194
+#: src/qtui/menus.cc:212
 msgid "_Random Order"
 msgstr "_Aleatório"
 
-#: src/gtkui/menus.cc:198 src/qtui/main_window_actions.cc:160
+#: src/gtkui/menus.cc:158 src/qtui/menus.cc:216
 msgid "_Play/Resume"
 msgstr "_Reproduzir/Retomar"
 
-#: src/gtkui/menus.cc:199 src/gtkui/menus.cc:251
-#: src/qtui/main_window_actions.cc:161
+#: src/gtkui/menus.cc:159 src/qtui/menus.cc:218
 msgid "_Refresh"
 msgstr "_Atualizar"
 
-#: src/gtkui/menus.cc:201 src/qtui/main_window_actions.cc:163
+#: src/gtkui/menus.cc:161 src/qtui/menus.cc:222
 msgid "_Sort"
 msgstr "_Organizar Lista de Reprodução"
 
-#: src/gtkui/menus.cc:202 src/qtui/main_window_actions.cc:164
+#: src/gtkui/menus.cc:162 src/qtui/menus.cc:223
 msgid "Sort Se_lected"
 msgstr "Organizar Se_lecionado"
 
-#: src/gtkui/menus.cc:203 src/qtui/main_window_actions.cc:165
+#: src/gtkui/menus.cc:163 src/qtui/menus.cc:225
 msgid "Remove _Duplicates"
 msgstr "Remover _Duplicatas"
 
-#: src/gtkui/menus.cc:204 src/qtui/main_window_actions.cc:166
+#: src/gtkui/menus.cc:164 src/qtui/menus.cc:226
 msgid "Remove _Unavailable Files"
 msgstr "Remover _Arquivos Indisponíveis"
 
-#: src/gtkui/menus.cc:206 src/playlist-manager/playlist-manager.cc:244
-#: src/qtui/main_window_actions.cc:168
+#: src/gtkui/menus.cc:166 src/playlist-manager/playlist-manager.cc:219
+#: src/playlist-manager-qt/playlist-manager-qt.cc:348 src/qtui/menus.cc:229
 msgid "_New"
 msgstr "_Novo"
 
-#: src/gtkui/menus.cc:207
+#: src/gtkui/menus.cc:167 src/qtui/menus.cc:230
 msgid "Ren_ame ..."
 msgstr "Re_nomear ..."
 
-#: src/gtkui/menus.cc:208 src/gtkui/menus.cc:264
-#: src/qtui/main_window_actions.cc:170
+#: src/gtkui/menus.cc:168 src/gtkui/menus.cc:228
+#: src/moonstone/playlist_tabs.cc:311 src/qtui/menus.cc:231
+#: src/qtui/playlist_tabs.cc:336
 msgid "Remo_ve"
 msgstr "Remo_ver"
 
-#: src/gtkui/menus.cc:210
+#: src/gtkui/menus.cc:170 src/qtui/menus.cc:233
 msgid "_Import ..."
 msgstr "_Importar"
 
-#: src/gtkui/menus.cc:211
+#: src/gtkui/menus.cc:171 src/qtui/menus.cc:234
 msgid "_Export ..."
 msgstr "_Exportar"
 
-#: src/gtkui/menus.cc:213
+#: src/gtkui/menus.cc:173 src/qtui/menus.cc:237
 msgid "Playlist _Manager ..."
 msgstr "Gerenciador de _Lista de Reprodução ..."
 
-#: src/gtkui/menus.cc:214 src/qtui/main_window_actions.cc:176
+#: src/gtkui/menus.cc:174 src/qtui/menus.cc:239
 msgid "_Queue Manager ..."
 msgstr "_Gerenciador de Fila de Reprodução ..."
 
-#: src/gtkui/menus.cc:218 src/qtui/main_window_actions.cc:180
+#: src/gtkui/menus.cc:178 src/qtui/menus.cc:243
 msgid "Volume _Up"
 msgstr "Aumentar _Volume"
 
-#: src/gtkui/menus.cc:219 src/qtui/main_window_actions.cc:181
+#: src/gtkui/menus.cc:179 src/qtui/menus.cc:245
 msgid "Volume _Down"
 msgstr "Abaixar _Volume"
 
-#: src/gtkui/menus.cc:221 src/qtui/main_window_actions.cc:183
-msgid "_Equalizer"
-msgstr "_Equalizador"
+#: src/gtkui/menus.cc:181 src/qtui/menus.cc:249
+msgid "_Equalizer ..."
+msgstr "_Equalizador ..."
 
-#: src/gtkui/menus.cc:223 src/qtui/main_window_actions.cc:185
+#: src/gtkui/menus.cc:182 src/qtui/menus.cc:251
 msgid "E_ffects ..."
 msgstr "E_feitos"
 
-#: src/gtkui/menus.cc:227
+#: src/gtkui/menus.cc:184
+msgid "_Record Stream"
+msgstr "_Fluxo do arquivo"
+
+#: src/gtkui/menus.cc:185
+msgid "Audio _Settings ..."
+msgstr "Configurações _de Áudio ..."
+
+#: src/gtkui/menus.cc:189 src/qtui/menus.cc:260
 msgid "Show _Menu Bar"
 msgstr "Mostrar Barra de _Menu"
 
-#: src/gtkui/menus.cc:228
+#: src/gtkui/menus.cc:190 src/qtui/menus.cc:262
 msgid "Show I_nfo Bar"
 msgstr "Mostrar Barra de _Informação"
 
-#: src/gtkui/menus.cc:229
+#: src/gtkui/menus.cc:191 src/qtui/menus.cc:264
+msgid "Show Info Bar _Album Art"
+msgstr "Mostrar _arte do álbum na barra de informações"
+
+#: src/gtkui/menus.cc:192 src/qtui/menus.cc:266
 msgid "Show Info Bar Vis_ualization"
 msgstr "Mostrar vis_ualização da barra de informaçoes"
 
-#: src/gtkui/menus.cc:230
+#: src/gtkui/menus.cc:193 src/qtui/menus.cc:268
 msgid "Show _Status Bar"
 msgstr "Mostrar Barra de _Status"
 
-#: src/gtkui/menus.cc:232
+#: src/gtkui/menus.cc:195 src/qtui/menus.cc:272
 msgid "Show _Remaining Time"
 msgstr "Mostrar _Tempo Restante"
 
-#: src/gtkui/menus.cc:234
+#: src/gtkui/menus.cc:197 src/qtui/menus.cc:276 src/skins/menus.cc:157
+#: src/skins-qt/menus.cc:152
 msgid "_Visualizations ..."
 msgstr "_Visualizações"
 
-#: src/gtkui/menus.cc:238 src/qtui/main_window_actions.cc:189
+#: src/gtkui/menus.cc:201 src/qtui/menus.cc:280
 msgid "_File"
 msgstr "_Arquivo"
 
-#: src/gtkui/menus.cc:239 src/qtui/main_window_actions.cc:190
+#: src/gtkui/menus.cc:202 src/qtui/menus.cc:281
 msgid "_Playback"
 msgstr "_Reprodução"
 
-#: src/gtkui/menus.cc:240 src/qtui/main_window_actions.cc:191
+#: src/gtkui/menus.cc:203 src/qtui/menus.cc:282
 msgid "P_laylist"
 msgstr "_Lista de Reprodução"
 
-#: src/gtkui/menus.cc:241 src/gtkui/menus.cc:258
-#: src/qtui/main_window_actions.cc:192
+#: src/gtkui/menus.cc:204 src/gtkui/menus.cc:222 src/qtui/menus.cc:283
+#: src/qtui/menus.cc:312
 msgid "_Services"
 msgstr "_Serviços"
 
-#: src/gtkui/menus.cc:242 src/qtui/main_window_actions.cc:193
+#: src/gtkui/menus.cc:205 src/qtui/menus.cc:284
 msgid "_Output"
 msgstr "_Saída"
 
-#: src/gtkui/menus.cc:243
+#: src/gtkui/menus.cc:206 src/qtui/menus.cc:285
 msgid "_View"
 msgstr "_Visualizar"
 
-#: src/gtkui/menus.cc:248
+#: src/gtkui/menus.cc:211 src/qtui/menus.cc:296
 msgid "_Queue/Unqueue"
 msgstr "_Adicionar/Remover da Fila de Reprodução"
 
-#: src/gtkui/menus.cc:250
+#: src/gtkui/menus.cc:213 src/qtui/menus.cc:299
 msgid "_Open Containing Folder"
 msgstr "_Abrir Pasta de Conteúdo"
 
-#: src/gtkui/menus.cc:253
+#: src/gtkui/menus.cc:214 src/qtui/menus.cc:301
+msgid "_Refresh Selected"
+msgstr "_Atualizar Selecionado"
+
+#: src/gtkui/menus.cc:216 src/qtui/menus.cc:304
 msgid "Cu_t"
 msgstr "Recor_tar"
 
-#: src/gtkui/menus.cc:254
+#: src/gtkui/menus.cc:217 src/qtui/menus.cc:305
 msgid "_Copy"
 msgstr "_Copiar"
 
-#: src/gtkui/menus.cc:255
+#: src/gtkui/menus.cc:218 src/qtui/menus.cc:306
 msgid "_Paste"
 msgstr "_Colar"
 
-#: src/gtkui/menus.cc:256
+#: src/gtkui/menus.cc:219 src/qtui/menus.cc:307
+msgid "Paste at _End"
+msgstr "Colar no _Final"
+
+#: src/gtkui/menus.cc:220 src/qtui/menus.cc:309
 msgid "Select _All"
 msgstr "Selecionar _Tudo"
 
-#: src/gtkui/menus.cc:263
+#: src/gtkui/menus.cc:227 src/moonstone/playlist_tabs.cc:309
+#: src/qtui/playlist_tabs.cc:334
 msgid "_Rename ..."
 msgstr "_Renomear ..."
 
-#: src/gtkui/settings.cc:35
+#: src/gtkui/settings.cc:35 src/qtui/settings.cc:59
+msgid "Always"
+msgstr "Sempre"
+
+#: src/gtkui/settings.cc:36 src/qtui/settings.cc:60
+msgid "Auto-hide"
+msgstr "Ocultar automaticamente"
+
+#: src/gtkui/settings.cc:37 src/qtui/settings.cc:61
+msgid "Never"
+msgstr "Nunca"
+
+#: src/gtkui/settings.cc:41 src/qtui/settings.cc:64
 msgid "Playlist Tabs"
 msgstr "Abas da Lista de Reprodução"
 
-#: src/gtkui/settings.cc:36
-msgid "Always show tabs"
-msgstr "Sempre exibir abas"
+#: src/gtkui/settings.cc:42 src/qtui/settings.cc:65
+msgid "Show playlist tabs:"
+msgstr "Mostrar guias da lista de reprodução:"
 
-#: src/gtkui/settings.cc:38
+#: src/gtkui/settings.cc:45 src/qtui/settings.cc:69
 msgid "Show entry counts"
 msgstr "Mostrar contagens de entrada"
 
-#: src/gtkui/settings.cc:40
+#: src/gtkui/settings.cc:47 src/qtui/settings.cc:72
 msgid "Show close buttons"
 msgstr "Mostrar botão fechar"
 
-#: src/gtkui/settings.cc:42
+#: src/gtkui/settings.cc:49 src/qtui/settings.cc:75
 msgid "Playlist Columns"
 msgstr "Colunas da Lista de Reprodução"
 
-#: src/gtkui/settings.cc:44
+#: src/gtkui/settings.cc:51 src/qtui/settings.cc:77
 msgid "Show column headers"
 msgstr "Mostrar cabeçalho das colunas"
 
-#: src/gtkui/settings.cc:46 src/modplug/plugin_main.cc:106
-#: src/skins/skins_cfg.cc:263
-msgid "Miscellaneous"
-msgstr "Diversos"
+#: src/gtkui/settings.cc:53 src/qtui/settings.cc:82
+msgid "Make column headers clickable for sorting"
+msgstr "Torna os cabeçalhos das colunas clicáveis para classificação"
+
+#: src/gtkui/settings.cc:56
+msgid "Use symbolic icons in toolbar"
+msgstr "Use ícones simbólicos na barra de ferramentas"
 
-#: src/gtkui/settings.cc:47
-msgid "Arrow keys seek by:"
-msgstr "Teclas de setas procuram por:"
-
-#: src/gtkui/settings.cc:50
+#: src/gtkui/settings.cc:58 src/qtui/settings.cc:86
 msgid "Scroll on song change"
 msgstr "Deslocar ao mudar de faixa"
 
-#: src/gtkui/ui_gtk.cc:71
+#: src/gtkui/ui_gtk.cc:82
 msgid "GTK Interface"
 msgstr "Interface GTK"
 
-#: src/gtkui/ui_gtk.cc:222 src/skins/ui_main.cc:232
+#: src/gtkui/ui_gtk.cc:219 src/skins/main.cc:228 src/skins-qt/main.cc:231
 #, c-format
 msgid "%s - Audacious"
 msgstr "%s - Audacious"
 
-#: src/gtkui/ui_gtk.cc:225 src/qtui/main_window.cc:186
+#: src/gtkui/ui_gtk.cc:221 src/moonstone/main_window.cc:184
+#: src/qtui/main_window.cc:385
 msgid "Buffering ..."
 msgstr "A processar ..."
 
-#: src/gtkui/ui_gtk.cc:228 src/skins/ui_main.cc:234 src/skins/ui_main.cc:1164
+#: src/gtkui/ui_gtk.cc:224 src/pipewire/pipewire.cc:402 src/skins/main.cc:230
+#: src/skins-qt/main.cc:233
 msgid "Audacious"
 msgstr "Audacious"
 
-#: src/gtkui/ui_statusbar.cc:63 src/qtui/status_bar.cc:67
+#: src/gtkui/ui_gtk.cc:487 src/gtkui/ui_gtk.cc:518 src/gtkui/ui_gtk.cc:882
+#: src/hotkey/gui.cc:72 src/moonstone/main_window.cc:67
+#: src/moonstone/main_window.cc:145 src/moonstone/main_window.cc:146
+#: src/notify/osd.cc:85 src/qthotkey/gui.cc:67 src/qtui/main_window.cc:154
+#: src/qtui/main_window.cc:347 src/qtui/main_window.cc:348
+#: src/skins/menus.cc:109 src/skins-qt/menus.cc:100
+msgid "Play"
+msgstr "Reproduzir"
+
+#: src/gtkui/ui_gtk.cc:487 src/moonstone/main_window.cc:151
+#: src/moonstone/main_window.cc:152 src/notify/osd.cc:82
+#: src/qtui/main_window.cc:353 src/qtui/main_window.cc:354
+#: src/skins/menus.cc:110 src/skins-qt/menus.cc:101
+msgid "Pause"
+msgstr "Pausa"
+
+#: src/gtkui/ui_gtk.cc:868 src/moonstone/main_window.cc:57
+#: src/qtui/main_window.cc:145 src/skins/menus.cc:86 src/skins-qt/menus.cc:77
+msgid "Search Library"
+msgstr "Procurar Biblioteca"
+
+#: src/gtkui/ui_gtk.cc:875 src/moonstone/main_window.cc:60
+#: src/qtui/main_window.cc:147
+msgid "Open Files"
+msgstr "Abrir arquivos"
+
+#: src/gtkui/ui_gtk.cc:876 src/moonstone/main_window.cc:62
+#: src/qtui/main_window.cc:149
+msgid "Add Files"
+msgstr "Adicionar arquivos"
+
+#: src/gtkui/ui_gtk.cc:881 src/moonstone/main_window.cc:65
+#: src/qtui/main_window.cc:152 src/skins/menus.cc:112 src/skins-qt/menus.cc:103
+msgid "Previous"
+msgstr "Anterior"
+
+#: src/gtkui/ui_gtk.cc:883 src/hotkey/gui.cc:74 src/moonstone/main_window.cc:69
+#: src/qthotkey/gui.cc:69 src/qtui/main_window.cc:156 src/skins/menus.cc:111
+#: src/skins-qt/menus.cc:102
+msgid "Stop"
+msgstr "Parar"
+
+#: src/gtkui/ui_gtk.cc:884 src/moonstone/main_window.cc:76 src/notify/osd.cc:89
+#: src/qtui/main_window.cc:163 src/skins/menus.cc:113 src/skins-qt/menus.cc:104
+msgid "Next"
+msgstr "Próxima"
+
+#: src/gtkui/ui_gtk.cc:886 src/moonstone/main_window.cc:79
+#: src/qtui/main_window.cc:166 src/qtui/menus.cc:254 src/skins/menus.cc:79
+#: src/skins-qt/menus.cc:69
+msgid "Record Stream"
+msgstr "Fluxo do arquivo"
+
+#: src/gtkui/ui_gtk.cc:919 src/moonstone/main_window.cc:86
+#: src/qtui/main_window.cc:173 src/skins/menus.cc:103 src/skins-qt/menus.cc:94
+msgid "Repeat"
+msgstr "Repetir"
+
+#: src/gtkui/ui_gtk.cc:922 src/moonstone/main_window.cc:89
+#: src/qtui/main_window.cc:176 src/skins/menus.cc:104 src/skins-qt/menus.cc:95
+msgid "Shuffle"
+msgstr "Embaralhar"
+
+#: src/gtkui/ui_gtk.cc:1114 src/qtui/main_window.cc:123
+msgid "Menu"
+msgstr "Menu"
+
+#: src/gtkui/ui_statusbar.cc:64 src/qtui/status_bar.cc:155
 msgid "mono"
 msgstr "mono"
 
-#: src/gtkui/ui_statusbar.cc:65 src/qtui/status_bar.cc:69
+#: src/gtkui/ui_statusbar.cc:66 src/qtui/status_bar.cc:157
 msgid "stereo"
 msgstr "stereo"
 
-#: src/gtkui/ui_statusbar.cc:67 src/qtui/status_bar.cc:71
+#: src/gtkui/ui_statusbar.cc:68 src/qtui/status_bar.cc:160
 #, c-format
 msgid "%d channel"
 msgid_plural "%d channels"
 msgstr0 "%d canal"
 msgstr1 "%d canais"
+msgstr2 "%d canais"
 
-#: src/gtkui/ui_statusbar.cc:81 src/qtui/status_bar.cc:85
+#: src/gtkui/ui_statusbar.cc:76 src/qtui/status_bar.cc:168
 #, c-format
-msgid "%d kbps"
-msgstr "%d kbps"
+msgid "%d kHz"
+msgstr "%d kHz"
 
-#: src/gtkui/ui_statusbar.cc:107 src/skins/ui_main_evlisteners.cc:103
+#: src/gtkui/ui_statusbar.cc:82 src/qtui/status_bar.cc:174
+#, c-format
+msgid "%d kbit/s"
+msgstr "%d kbit/s"
+
+#: src/gtkui/ui_statusbar.cc:108 src/skins/main.cc:478 src/skins-qt/main.cc:461
 msgid "Single mode."
 msgstr "Modo simples."
 
-#: src/gtkui/ui_statusbar.cc:109 src/skins/ui_main_evlisteners.cc:105
+#: src/gtkui/ui_statusbar.cc:110 src/skins/main.cc:480 src/skins-qt/main.cc:463
 msgid "Playlist mode."
 msgstr "Modo Lista de Reprodução."
 
-#: src/gtkui/ui_statusbar.cc:117 src/skins/ui_main_evlisteners.cc:111
+#: src/gtkui/ui_statusbar.cc:118 src/skins/main.cc:486 src/skins-qt/main.cc:469
 msgid "Stopping after song."
 msgstr "Parar após faixa"
 
-#: src/hotkey/gui.cc:71
+#: src/hotkey/gui.cc:71 src/qthotkey/gui.cc:66
 msgid "Previous track"
 msgstr "Faixa anterior"
 
-#: src/hotkey/gui.cc:72 src/notify/osd.cc:69 src/qtui/main_window.cc:69
-#: src/qtui/main_window.cc:172 src/qtui/main_window.cc:173
-#: src/skins/menus.cc:87
-msgid "Play"
-msgstr "Reproduzir"
-
-#: src/hotkey/gui.cc:73
+#: src/hotkey/gui.cc:73 src/qthotkey/gui.cc:68
 msgid "Pause/Resume"
 msgstr "Pausa/Retornar"
 
-#: src/hotkey/gui.cc:74 src/qtui/main_window.cc:70 src/skins/menus.cc:89
-msgid "Stop"
-msgstr "Parar"
-
-#: src/hotkey/gui.cc:75
+#: src/hotkey/gui.cc:75 src/qthotkey/gui.cc:70
 msgid "Next track"
 msgstr "Próxima faixa"
 
-#: src/hotkey/gui.cc:76
-msgid "Forward 5 seconds"
-msgstr "Avançar 5 segundos"
-
-#: src/hotkey/gui.cc:77
-msgid "Rewind 5 seconds"
-msgstr "Retroceder 5 segundos"
+#: src/hotkey/gui.cc:76 src/qthotkey/gui.cc:71
+msgid "Step forward"
+msgstr "Avançar"
+
+#: src/hotkey/gui.cc:77 src/qthotkey/gui.cc:72
+msgid "Step backward"
+msgstr "Retroceder"
 
-#: src/hotkey/gui.cc:78
+#: src/hotkey/gui.cc:78 src/qthotkey/gui.cc:73
 msgid "Mute"
 msgstr "Mudo"
 
-#: src/hotkey/gui.cc:79
+#: src/hotkey/gui.cc:79 src/qthotkey/gui.cc:74
 msgid "Volume up"
 msgstr "Aumentar volume"
 
-#: src/hotkey/gui.cc:80
+#: src/hotkey/gui.cc:80 src/qthotkey/gui.cc:75
 msgid "Volume down"
 msgstr "Diminuir volume"
 
-#: src/hotkey/gui.cc:81
+#: src/hotkey/gui.cc:81 src/qthotkey/gui.cc:76
 msgid "Jump to file"
 msgstr "Ir para o arquivo"
 
-#: src/hotkey/gui.cc:82
+#: src/hotkey/gui.cc:82 src/qthotkey/gui.cc:77
 msgid "Toggle player window(s)"
 msgstr "Habilitar/Desabilitar janela(s) do player"
 
-#: src/hotkey/gui.cc:83
+#: src/hotkey/gui.cc:83 src/qthotkey/gui.cc:78
 msgid "Show On-Screen-Display"
 msgstr "Mostrar OSD"
 
-#: src/hotkey/gui.cc:84
+#: src/hotkey/gui.cc:84 src/qthotkey/gui.cc:79
 msgid "Toggle repeat"
 msgstr "Habilitar/Desabilitar repetir"
 
-#: src/hotkey/gui.cc:85
+#: src/hotkey/gui.cc:85 src/qthotkey/gui.cc:80
 msgid "Toggle shuffle"
 msgstr "Habilitar/Desabilitar embaralhar"
 
-#: src/hotkey/gui.cc:86
+#: src/hotkey/gui.cc:86 src/qthotkey/gui.cc:81
 msgid "Toggle stop after current"
 msgstr "Habilitar/Desabilitar parar depois da atual"
 
-#: src/hotkey/gui.cc:87
+#: src/hotkey/gui.cc:87 src/qthotkey/gui.cc:82
 msgid "Raise player window(s)"
 msgstr "Aumentar janela(s) do player"
 
-#: src/hotkey/gui.cc:97
+#: src/hotkey/gui.cc:98 src/qthotkey/gui.cc:100
 msgid "(none)"
 msgstr "(nada)"
 
-#: src/hotkey/gui.cc:234
+#: src/hotkey/gui.cc:261
 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 modifiers.\n"
 "\n"
 "Do you want to continue?"
 msgstr ""
@@ -2180,11 +2265,11 @@
 "\n"
 "Continuar?"
 
-#: src/hotkey/gui.cc:236
+#: src/hotkey/gui.cc:264
 msgid "Binding mouse buttons"
 msgstr "Associação do botão do mouse"
 
-#: src/hotkey/gui.cc:391
+#: src/hotkey/gui.cc:434
 msgid ""
 "Press a key combination inside a text field.\n"
 "You can also bind mouse buttons."
@@ -2192,34 +2277,34 @@
 "Pressionar uma combinação de teclas no campo de texto.\n"
 "Você também pode associar os botoes do mouse."
 
-#: src/hotkey/gui.cc:396
+#: src/hotkey/gui.cc:444 src/qthotkey/gui.cc:179
 msgid "Hotkeys:"
 msgstr "Hotkeys:"
 
-#: src/hotkey/gui.cc:413
+#: src/hotkey/gui.cc:457 src/qthotkey/gui.cc:181
 msgid "Action:"
 msgstr "Ação:"
 
-#: src/hotkey/gui.cc:420
+#: src/hotkey/gui.cc:461 src/qthotkey/gui.cc:182
 msgid "Key Binding:"
 msgstr "Combinação de Teclas:"
 
-#: src/hotkey/gui.cc:468
+#: src/hotkey/gui.cc:518 src/qthotkey/gui.cc:184
 msgid "_Add"
 msgstr "_Adicionar"
 
-#: src/hotkey/plugin.cc:61
+#: src/hotkey/plugin.cc:59 src/qthotkey/plugin.cc:78
 msgid "Global Hotkeys"
 msgstr "Global Hotkeys"
 
-#: src/hotkey/plugin.cc:79
+#: src/hotkey/plugin.cc:74
 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"
+"Contributors 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"
@@ -2227,8 +2312,9 @@
 " Jeremy Tan <nsx@nsx.homeip.net>"
 msgstr ""
 "Plugin Global Hotkey\n"
-"Controla o player com teclas globais ou com combinações de teclas "
+"Controla o player com combinações globais de teclas ou com teclas "
 "multimídia.\n"
+"\n"
 "Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n"
 "\n"
 "Outros colaboradores:\n"
@@ -2238,26 +2324,56 @@
 " Jonathan A. Davis <davis@jdhouse.org>,\n"
 " Jeremy Tan <nsx@nsx.homeip.net>."
 
-#: src/jack-ng/jack-ng.cc:49
+#: src/jack/jack-ng.cc:54
 msgid "JACK Output"
 msgstr "Saída JACK"
 
-#: src/jack-ng/jack-ng.cc:114
+#: src/jack/jack-ng.cc:126
+msgid "Client name:"
+msgstr "Nome do cliente:"
+
+#: src/jack/jack-ng.cc:128
 msgid "Automatically connect to output ports"
 msgstr "Conectar-se automaticamente às portas de saída"
 
-#: src/jack-ng/jack-ng.cc:155
+#: src/jack/jack-ng.cc:130
+msgid "Filter ports (regex, use any port if blank):"
+msgstr "Filtrar portas (regex, usa qualquer porta se estiver em branco):"
+
+#: src/jack/jack-ng.cc:136
+msgid "Connect to physical ports only"
+msgstr "Conectar apenas a portas físicas"
+
+#: src/jack/jack-ng.cc:139
+msgid "Upmix to"
+msgstr "Upmix para"
+
+#: src/jack/jack-ng.cc:141
+msgid "ports if input has fewer channels"
+msgstr "portas se a entrada tiver menos canais"
+
+#: src/jack/jack-ng.cc:143
+msgid "Ignore insufficient number of ports"
+msgstr "Ignorar número insuficiente de portas"
+
+#: src/jack/jack-ng.cc:181
+msgid "No JACK output ports were found. Please check settings."
+msgstr ""
+"Não foram encontradas portas de saída JACK. Por favor, verifique as "
+"configurações."
+
+#: src/jack/jack-ng.cc:195
 #, c-format
 msgid "Only %d JACK output ports were found but %d are required."
 msgstr ""
 "Apenas %d portas de saída JACK foram encontradas, mas %d são necessárias."
 
-#: src/jack-ng/jack-ng.cc:164
+#: src/jack/jack-ng.cc:210
 #, c-format
 msgid "Failed to connect to JACK port %s."
 msgstr "Falha ao conectar a porta JACK %s."
 
-#: src/jack-ng/jack-ng.cc:184
+#: src/jack/jack-ng.cc:230
 msgid ""
 "JACK supports only floating-point audio. You must change the output bit "
 "depth to floating-point in Audacious settings."
@@ -2266,11 +2382,11 @@
 "profundidade de bits de saída para ponto-flutuante nas configurações do "
 "Audacious."
 
-#: src/jack-ng/jack-ng.cc:197
+#: src/jack/jack-ng.cc:245
 msgid "Failed to connect to the JACK server; is it running?"
 msgstr "Falha ao conectar ao servidor JACK; Está em funcionamento?"
 
-#: src/jack-ng/jack-ng.cc:273
+#: src/jack/jack-ng.cc:321
 #, c-format
 msgid ""
 "The JACK server requires a sample rate of %d Hz, but Audacious is playing at "
@@ -2280,16 +2396,16 @@
 "reproduzindo à %d Hz. Utilize o efeito Conversor de Taxa de Amostragem para "
 "corrigir a incompatibilidade."
 
-#: src/ladspa/plugin.cc:414
+#: src/ladspa/plugin.cc:416
 #, c-format
 msgid "%s Settings"
 msgstr "Configurações de %s"
 
-#: src/ladspa/plugin.cc:478
+#: src/ladspa/plugin.cc:482
 msgid "Module paths:"
 msgstr "Diretório do Modulo:"
 
-#: src/ladspa/plugin.cc:483
+#: src/ladspa/plugin.cc:487
 msgid ""
 "Separate multiple paths with a colon.\n"
 "These paths are searched in addition to LADSPA_PATH.\n"
@@ -2300,25 +2416,25 @@
 "Após a adição dos caminhos, pressione Enter para procurar os novos plugins.</"
 "small>"
 
-#: src/ladspa/plugin.cc:499
+#: src/ladspa/plugin.cc:508
 msgid "Available plugins:"
 msgstr "Plugins disponíveis:"
 
-#: src/ladspa/plugin.cc:512 src/modplug/plugin_main.cc:92
-#: src/modplug/plugin_main.cc:95 src/modplug/plugin_main.cc:98
-#: src/modplug/plugin_main.cc:101
+#: src/ladspa/plugin.cc:521 src/modplug/plugin_main.cc:91
+#: src/modplug/plugin_main.cc:94 src/modplug/plugin_main.cc:97
+#: src/modplug/plugin_main.cc:100
 msgid "Enable"
 msgstr "Habilitar"
 
-#: src/ladspa/plugin.cc:518
+#: src/ladspa/plugin.cc:527
 msgid "Enabled plugins:"
 msgstr "Plugins ativos:"
 
-#: src/ladspa/plugin.cc:534
+#: src/ladspa/plugin.cc:543
 msgid "Settings"
 msgstr "Configurações"
 
-#: src/ladspa/plugin.cc:551
+#: src/ladspa/plugin.cc:560
 msgid ""
 "LADSPA Host for Audacious\n"
 "Copyright 2011 John Lindgren"
@@ -2334,7 +2450,7 @@
 msgid "LIRC Plugin"
 msgstr "Plugin LIRC"
 
-#: src/lirc/lirc.cc:381
+#: src/lirc/lirc.cc:379
 msgid ""
 "A simple plugin to control Audacious using the LIRC remote control daemon\n"
 "\n"
@@ -2364,63 +2480,125 @@
 "\n"
 "Para mais informações sobre LIRC, veja http://lirc.org."
 
-#: src/lirc/lirc.cc:392
+#: src/lirc/lirc.cc:390
 msgid "Connection"
 msgstr "Conexão"
 
-#: src/lirc/lirc.cc:393
+#: src/lirc/lirc.cc:391
 msgid "Reconnect to LIRC server"
 msgstr "Reconectar ao servidor LIRC"
 
-#: src/lirc/lirc.cc:395
+#: src/lirc/lirc.cc:393
 msgid "Wait before reconnecting:"
 msgstr "Espere antes de reconectar:"
 
-#: src/lyricwiki/lyricwiki.cc:41
-msgid "LyricWiki Plugin"
-msgstr "Plugin LyricWiki"
-
-#: src/lyricwiki/lyricwiki.cc:131 src/lyricwiki-qt/lyricwiki.cc:136
-msgid "No lyrics available"
-msgstr "A letra da faixa não está disponível"
-
-#: src/lyricwiki/lyricwiki.cc:217 src/lyricwiki/lyricwiki.cc:226
-#: src/lyricwiki/lyricwiki.cc:243 src/lyricwiki/lyricwiki.cc:252
-#: src/lyricwiki/lyricwiki.cc:267 src/lyricwiki-qt/lyricwiki.cc:222
-#: src/lyricwiki-qt/lyricwiki.cc:231 src/lyricwiki-qt/lyricwiki.cc:248
-#: src/lyricwiki-qt/lyricwiki.cc:257 src/lyricwiki-qt/lyricwiki.cc:272
-msgid "Error"
-msgstr "Erro"
-
-#: src/lyricwiki/lyricwiki.cc:218 src/lyricwiki/lyricwiki.cc:244
-#: src/lyricwiki-qt/lyricwiki.cc:223 src/lyricwiki-qt/lyricwiki.cc:249
+#: src/lyrics-common/chart_lyrics_provider.cc:93
+#: src/lyrics-common/chart_lyrics_provider.cc:150
+#: src/lyrics-common/lyrics_ovh_provider.cc:50
 #, c-format
 msgid "Unable to fetch %s"
 msgstr "Não foi possível obter %s"
 
-#: src/lyricwiki/lyricwiki.cc:227 src/lyricwiki/lyricwiki.cc:253
-#: src/lyricwiki-qt/lyricwiki.cc:232 src/lyricwiki-qt/lyricwiki.cc:258
+#: src/lyrics-common/chart_lyrics_provider.cc:100
+#: src/lyrics-common/chart_lyrics_provider.cc:157
+#: src/lyrics-common/lyrics_ovh_provider.cc:57
 #, c-format
 msgid "Unable to parse %s"
 msgstr "Não foi possível analisar %s"
 
-#: src/lyricwiki/lyricwiki.cc:259 src/lyricwiki-qt/lyricwiki.cc:264
+#: src/lyrics-common/chart_lyrics_provider.cc:121
+#: src/lyrics-common/chart_lyrics_provider.cc:194
+#: src/lyrics-common/lyrics_ovh_provider.cc:88
 msgid "Looking for lyrics ..."
 msgstr "Procurando a letra da faixa ..."
 
-#: src/lyricwiki/lyricwiki.cc:267 src/lyricwiki-qt/lyricwiki.cc:272
-msgid "Missing song metadata"
-msgstr "Metadados da música faltando"
-
-#: src/lyricwiki/lyricwiki.cc:278 src/lyricwiki-qt/lyricwiki.cc:283
-msgid "Connecting to lyrics.wikia.com ..."
-msgstr "Conectando no lyrics.wikia.com ..."
-
-#: src/lyricwiki-qt/lyricwiki.cc:55
-msgid "LyricWiki Plugin (Qt)"
-msgstr "Plugin LyricWiki (Qt)"
+#: src/lyrics-common/preferences.h:43
+msgid "Nowhere"
+msgstr "Nenhum lugar"
+
+#: src/lyrics-common/preferences.h:49
+msgid "Artist is truncated at the start, Title -- at the end"
+msgstr "Artista é truncado no início, Título -- no fim"
+
+#: src/lyrics-common/preferences.h:50
+msgid "Chars to truncate on:"
+msgstr "Caracteres para truncar em:"
+
+#: src/lyrics-common/preferences.h:54
+msgid "Chars are ORed in RegExp, surrounded by whitespace"
+msgstr ""
+"Os caracteres são ORed em RegExp, cercados por espaços em branco</"
+"small>"
+
+#: src/lyrics-common/preferences.h:55
+msgid "Chars to split on:"
+msgstr "Caracteres para dividir em:"
+
+#: src/lyrics-common/preferences.h:56
+msgid "Further truncate those on chars"
+msgstr "Truncar ainda mais aqueles em caracteres"
+
+#: src/lyrics-common/preferences.h:62
+msgid "General"
+msgstr "Geral"
+
+#: src/lyrics-common/preferences.h:63
+msgid "Split title into artist and title on chars"
+msgstr "Dividir título entre artista e título nos caracteres"
 
-#: src/m3u/m3u.cc:32
+#: src/lyrics-common/preferences.h:66
+msgid "Sources"
+msgstr "Fontes"
+
+#: src/lyrics-common/preferences.h:67
+msgid "Use embedded lyrics (from Lyrics tag)"
+msgstr "Usar letras incorporadas (da etiqueta Letras)"
+
+#: src/lyrics-common/preferences.h:69
+msgid "Fetch lyrics from internet:"
+msgstr "Buscar letras na internet:"
+
+#: src/lyrics-common/preferences.h:72
+msgid "Store fetched lyrics in local cache"
+msgstr "Armazenar letras obtidas no cache local"
+
+#: src/lyrics-common/preferences.h:74
+msgid "Local Storage"
+msgstr "Armazenamento local"
+
+#: src/lyrics-common/preferences.h:75
+msgid "Load lyric files (.lrc) from local storage"
+msgstr "Carregar arquivos de letra (.lrc) do armazenamento local"
+
+#: src/lyrics-common/utils.cc:54 src/ui-common/dialogs-qt.cc:63
+msgid "Error"
+msgstr "Erro"
+
+#: src/lyrics-common/utils.cc:60
+msgid "Lyrics could not be found."
+msgstr "Não foi possível encontrar a letra da faixa."
+
+#: src/lyrics-common/utils.cc:142
+msgid "Missing title and/or artist."
+msgstr "Título e/ou artista ausentes."
+
+#: src/lyrics-gtk/lyrics-gtk.cc:37 src/lyrics-qt/lyrics-qt.cc:50
+msgid "Lyrics"
+msgstr "Letras"
+
+#: src/lyrics-gtk/lyrics-gtk.cc:189 src/lyrics-qt/lyrics-qt.cc:171
+msgid "Edit Lyrics ..."
+msgstr "Editar letras..."
+
+#: src/lyrics-gtk/lyrics-gtk.cc:195 src/lyrics-qt/lyrics-qt.cc:178
+msgid "Save Locally"
+msgstr "Salvar localmente"
+
+#: src/lyrics-gtk/lyrics-gtk.cc:201 src/lyrics-qt/lyrics-qt.cc:186
+msgid "Refresh"
+msgstr "Atualizar"
+
+#: src/m3u/m3u.cc:33
 msgid "M3U Playlists"
 msgstr "Listas de Reproduções M3U"
 
@@ -2428,17 +2606,17 @@
 msgid "Tact Generator"
 msgstr "Gerador Tacto"
 
-#: src/metronom/metronom.cc:147
+#: src/metronom/metronom.cc:145
 #, c-format
 msgid "Tact generator: %d bpm"
 msgstr "Gerador Tacto: %d bpm"
 
-#: src/metronom/metronom.cc:149
+#: src/metronom/metronom.cc:147
 #, c-format
 msgid "Tact generator: %d bpm %d/%d"
 msgstr "Gerador Tacto: %d bpm %d%d"
 
-#: src/metronom/metronom.cc:237
+#: src/metronom/metronom.cc:235
 msgid ""
 "A Tact Generator by Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
 "\n"
@@ -2452,11 +2630,11 @@
 "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/mixer/mixer.cc:38
+#: src/mixer/mixer.cc:43
 msgid "Channel Mixer"
-msgstr "Canal Mixer"
+msgstr "Mixer de canais"
 
-#: src/mixer/mixer.cc:202
+#: src/mixer/mixer.cc:255
 msgid ""
 "Channel Mixer Plugin for Audacious\n"
 "Copyright 2011-2012 John Lindgren and Michał Lipski"
@@ -2464,11 +2642,11 @@
 "Plugin Canal Mixer para Audacious\n"
 "Direitos Autorais 2011-2012 John Lindgren e Michał Lipski."
 
-#: src/mixer/mixer.cc:206
+#: src/mixer/mixer.cc:259
 msgid "Channel Mixer"
 msgstr "Canal Mixer"
 
-#: src/mixer/mixer.cc:207
+#: src/mixer/mixer.cc:260
 msgid "Output channels:"
 msgstr "Canais de saída:"
 
@@ -2480,168 +2658,176 @@
 msgid "Error connecting to MMS server"
 msgstr "Erro ao conectar a um servidor MMS"
 
-#: src/modplug/modplugbmp.h:53
+#: src/modplug/modplugbmp.h:57
 msgid "ModPlug (Module Player)"
-msgstr "ModPlug (Módulo Reprodutor)"
-
-#: src/modplug/plugin_main.cc:53
-msgid "Resolution"
-msgstr "Resolução"
-
-#: src/modplug/plugin_main.cc:54
-msgid "8-bit"
-msgstr "8-bit"
+msgstr "ModPlug (Reprodutor de Module music)"
 
 #: src/modplug/plugin_main.cc:55
-msgid "16-bit"
-msgstr "16-bit"
-
-#: src/modplug/plugin_main.cc:56
 msgid "Channels"
 msgstr "Canais"
 
-#: src/modplug/plugin_main.cc:60
+#: src/modplug/plugin_main.cc:59
 msgid "Nearest (fastest)"
 msgstr "O mais próximo (mais rápido)"
 
-#: src/modplug/plugin_main.cc:61
+#: src/modplug/plugin_main.cc:60
 msgid "Linear (fast)"
 msgstr "Linear (rápido)"
 
-#: src/modplug/plugin_main.cc:62
+#: src/modplug/plugin_main.cc:61
 msgid "Spline (good)"
 msgstr "Spline (bom)"
 
-#: src/modplug/plugin_main.cc:63
+#: src/modplug/plugin_main.cc:62
 msgid "Polyphase (best)"
 msgstr "Polifásico (melhor)"
 
-#: src/modplug/plugin_main.cc:64
+#: src/modplug/plugin_main.cc:63
 msgid "Sample rate"
 msgstr "Taxa de amostragem"
 
-#: src/modplug/plugin_main.cc:65
+#: src/modplug/plugin_main.cc:64
 msgid "22 kHz"
 msgstr "22 kHz"
 
-#: src/modplug/plugin_main.cc:66
+#: src/modplug/plugin_main.cc:65
 msgid "44 kHz"
 msgstr "44 kHz"
 
-#: src/modplug/plugin_main.cc:67
+#: src/modplug/plugin_main.cc:66
 msgid "48 kHz"
 msgstr "48 kHz"
 
-#: src/modplug/plugin_main.cc:68
+#: src/modplug/plugin_main.cc:67
 msgid "96 kHz"
 msgstr "96 kHz"
 
-#: src/modplug/plugin_main.cc:72 src/modplug/plugin_main.cc:77
-#: src/modplug/plugin_main.cc:82
+#: src/modplug/plugin_main.cc:71 src/modplug/plugin_main.cc:76
+#: src/modplug/plugin_main.cc:81
 msgid "Level:"
 msgstr "Nível:"
 
-#: src/modplug/plugin_main.cc:78
+#: src/modplug/plugin_main.cc:77
 msgid "Cutoff:"
-msgstr "Atalho:"
+msgstr "Corte:"
 
-#: src/modplug/plugin_main.cc:91
+#: src/modplug/plugin_main.cc:90
 msgid "Reverb"
 msgstr "Reverberação"
 
-#: src/modplug/plugin_main.cc:94
+#: src/modplug/plugin_main.cc:93
 msgid "Bass Boost"
-msgstr "Bass Boost"
+msgstr "Aumento de graves"
 
-#: src/modplug/plugin_main.cc:97
+#: src/modplug/plugin_main.cc:96
 msgid "Surround"
-msgstr "Cercar"
+msgstr "Surround"
 
-#: src/modplug/plugin_main.cc:100
+#: src/modplug/plugin_main.cc:99
 msgid "Preamp"
 msgstr "Pré-amplificador"
 
-#: src/modplug/plugin_main.cc:107
+#: src/modplug/plugin_main.cc:106
 msgid "Oversample"
 msgstr "Sobreamostra"
 
-#: src/modplug/plugin_main.cc:108
+#: src/modplug/plugin_main.cc:107
 msgid "Noise reduction"
 msgstr "Redução de ruído"
 
-#: src/modplug/plugin_main.cc:109
+#: src/modplug/plugin_main.cc:108
 msgid "Play Amiga MODs"
 msgstr "Reproduzir Amiga MODs"
 
-#: src/modplug/plugin_main.cc:110
+#: src/modplug/plugin_main.cc:109
 msgid "Repeat"
 msgstr "Repetir"
 
-#: src/modplug/plugin_main.cc:111
+#: src/modplug/plugin_main.cc:110
 msgid "Repeat count:"
 msgstr "Contagem de repetição:"
 
-#: src/modplug/plugin_main.cc:112
+#: src/modplug/plugin_main.cc:111
 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.cc:125 src/sid/xs_config.cc:106
+#: src/modplug/plugin_main.cc:124 src/sid/xs_config.cc:106
 msgid "These settings will take effect when Audacious is restarted."
-msgstr "Essas configurações entrarão em vigor quando Audacious for reiniciado."
+msgstr "Essas configurações terão efeito quando Audacious for reiniciado."
+
+#: src/moonstone/main_window.cc:72 src/moonstone/main_window.cc:73
+#: src/qtui/main_window.cc:159 src/qtui/main_window.cc:160
+#: src/skins/menus.cc:107 src/skins-qt/menus.cc:98
+msgid "Stop After This Song"
+msgstr "Parar Após Esta Faixa"
+
+#: src/moonstone/moonstone.cc:39
+msgid "Moonstone"
+msgstr "Moonstone"
+
+#: src/moonstone/playlist_header.cc:212 src/qtui/playlist_header.cc:258
+msgid "Reset to Defaults"
+msgstr "Redefinir padrões"
+
+#: src/moonstone/playlist_model.cc:38 src/qtui/playlist_header.cc:232
+msgid "Now Playing"
+msgstr "Reproduzindo"
+
+#: src/moonstone/playlist_selection.cc:66
+#: src/playlist-manager/playlist-manager.cc:201
+#: src/playlist-manager-qt/playlist-manager-qt.cc:190
+msgid "Entries"
+msgstr "Entradas"
 
 #: src/mpg123/mpg123.cc:54
 msgid "MPG123 Plugin"
-msgstr "Plugin MPG 123"
+msgstr "Plugin MPG123"
 
-#: src/mpg123/mpg123.cc:83
-msgid "Advanced"
-msgstr "Avançado"
-
-#: src/mpg123/mpg123.cc:84
+#: src/mpg123/mpg123.cc:82
 msgid "Use accurate length calculation (slow)"
-msgstr "Usar cálculo exato da duração (lento)"
+msgstr "Usar cálculo preciso da duração (lento)"
 
-#: src/mpg123/mpg123.cc:248
+#: src/mpg123/mpg123.cc:260
 msgid "Surround"
 msgstr "Surround"
 
-#: src/mpris2/plugin.cc:39
+#: src/mpris2/plugin.cc:40
 msgid "MPRIS 2 Server"
 msgstr "Servidor MPRIS 2"
 
-#: src/neon/neon.cc:97
+#: src/neon/neon.cc:102
 msgid "Neon HTTP/HTTPS Plugin"
 msgstr "Plugin Neon HTTP/HTTPS"
 
-#: src/neon/neon.cc:521
+#: src/neon/neon.cc:526
 msgid "Error parsing redirect"
 msgstr "Erro ao validar redirecionamento"
 
-#: src/neon/neon.cc:535
+#: src/neon/neon.cc:540
 msgid "Unknown HTTP error"
 msgstr "Erro HTTP desconhecido"
 
-#: src/neon/neon.cc:569
+#: src/neon/neon.cc:614
 msgid "Error parsing URL"
 msgstr "Erro ao validar URL"
 
-#: src/neon/neon.cc:632
+#: src/neon/neon.cc:687
 msgid "Too many redirects"
 msgstr "Muitos redirecionamentos"
 
-#: src/notify/event.cc:64
+#: src/notify/event.cc:97
 msgid "Stopped"
 msgstr "Parado"
 
-#: src/notify/event.cc:64
+#: src/notify/event.cc:97
 msgid "Audacious is not playing."
 msgstr "Audacious não está tocando."
 
-#: src/notify/notify.cc:42
+#: src/notify/notify.cc:39
 msgid "Desktop Notifications"
 msgstr "Notificações do Desktop"
 
-#: src/notify/notify.cc:60
+#: src/notify/notify.cc:57
 msgid ""
 "Desktop Notifications Plugin for Audacious\n"
 "Copyright (C) 2010 Maximilian Bogner\n"
@@ -2676,36 +2862,81 @@
 "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.cc:110
+#: src/notify/notify.cc:104
 msgid "Show playback controls"
 msgstr "Mostrar controles de reprodução"
 
-#: src/notify/notify.cc:112
+#: src/notify/notify.cc:106
 msgid "Always show notification"
 msgstr "Sempre exibir notificação"
 
-#: src/notify/notify.cc:114
+#: src/notify/notify.cc:108
 msgid "Include album name in notification"
 msgstr "Incluir nome do álbum na notificação"
 
-#: src/notify/osd.cc:58
+#: src/notify/notify.cc:110
+msgid "Custom notification duration:"
+msgstr "Duração de notificação personalizada:"
+
+#: src/notify/osd.cc:74
 msgid "Show"
 msgstr "Exibir"
 
-#: src/notify/osd.cc:66 src/qtui/main_window.cc:178
-#: src/qtui/main_window.cc:179 src/skins/menus.cc:88
-msgid "Pause"
-msgstr "Pausa"
+#: src/openmpt/mpt.cc:50
+msgid "OpenMPT (Module Player)"
+msgstr "OpenMPT (Reprodutor de Module music)"
 
-#: src/notify/osd.cc:73 src/qtui/main_window.cc:72 src/skins/menus.cc:91
-msgid "Next"
-msgstr "Próxima"
+#: src/openmpt/mpt.cc:132
+msgid ""
+"Module player based on libopenmpt\n"
+"\n"
+"Written by: Chris Spiegel <cspiegel@gmail.com>"
+msgstr ""
+"Módulo reprodutor baseado em libopenmpt\n"
+"\n"
+"Escrito por: Chris Spiegel <cspiegel@gmail.com>"
+
+#: src/openmpt/mpt.cc:151
+msgid "Stereo separation:"
+msgstr "Separação estéreo:"
+
+#: src/openmpt/mpt.cc:153
+msgid "% (0=mono, 100=default, 200=full)"
+msgstr "% (0=mono, 100=padrão, 200=completo)"
+
+#: src/openmpt/mpt.cc:157
+msgid "Interpolation:"
+msgstr "Interpolação:"
+
+#: src/openmpt/mptwrap.h:51 src/soxr/sox-resampler.cc:189 src/xsf/plugin.cc:437
+msgid "Linear"
+msgstr "Linear"
+
+#: src/openmpt/mptwrap.h:52
+msgid "Cubic"
+msgstr "Cúbica"
 
-#: src/oss4/oss.h:93
+#: src/openmpt/mptwrap.h:53
+msgid "Windowed sinc"
+msgstr "Sinc em janela"
+
+#: src/opus/opus.cc:39
+msgid "Opus Decoder"
+msgstr "Decodificador Opus"
+
+#: src/opus/opus.cc:336
+msgid ""
+"Opus Decoder Plugin for Audacious\n"
+"Copyright 2022 Thomas Lange"
+msgstr ""
+"Opus Decoder Plugin para Audacious\n"
+"Copyright 2022 Thomas Lange"
+
+#: src/oss4/oss.h:70
 msgid "OSS4 Output"
 msgstr "Saída OSS4"
 
-#: src/oss4/oss.h:95
+#: src/oss4/oss.h:72
 msgid "OSS3 Output"
 msgstr "Saída OSS3"
 
@@ -2713,27 +2944,27 @@
 msgid "Default device"
 msgstr "Dispositivo padrão"
 
-#: src/oss4/plugin.cc:77
+#: src/oss4/plugin.cc:78
 msgid "Audio device:"
 msgstr "Dispositivo de áudio:"
 
-#: src/oss4/plugin.cc:80
+#: src/oss4/plugin.cc:81
 msgid "Use alternate device:"
 msgstr "Usar dispositivo alternativo:"
 
-#: src/oss4/plugin.cc:84
+#: src/oss4/plugin.cc:85
 msgid "Save volume between sessions."
 msgstr "Salve volume entre sessões."
 
-#: src/oss4/plugin.cc:86
+#: src/oss4/plugin.cc:87
 msgid "Enable format conversions made by the OSS software."
 msgstr "Permitir conversões de formatos com programa OSS"
 
-#: src/oss4/plugin.cc:88
+#: src/oss4/plugin.cc:89
 msgid "Enable exclusive mode to prevent virtual mixing."
 msgstr "Ativar modo exclusivo para evitar mistura virtual."
 
-#: src/oss4/plugin.cc:100
+#: src/oss4/plugin.cc:101
 msgid ""
 "OSS4 Output Plugin for Audacious\n"
 "Copyright 2010-2012 Michał Lipski\n"
@@ -2747,19 +2978,40 @@
 "Gostaria de agradecer as pessoas em #audacious, especialmente Tony Vroon e "
 "John Lindgren e a todos os autores anteriores do plugin OSS."
 
-#: src/playlist-manager/playlist-manager.cc:37
+#: src/pipewire/pipewire.cc:44
+msgid "PipeWire Output"
+msgstr "Saída PipeWire"
+
+#: src/pipewire/pipewire.cc:118
+msgid ""
+"PipeWire Output Plugin for Audacious\n"
+"Copyright 2022 Thomas Lange\n"
+"\n"
+"Based on the PipeWire Output Plugin for Qmmp\n"
+"Copyright 2021 Ilya Kotov"
+msgstr ""
+"PipeWire Output Plugin para Audacious\n"
+"Copyright 2022 Thomas Lange\n"
+"\n"
+"Baseado no Plugin de Saída PipeWire para Qmmp\n"
+"Copyright 2021 Ilya Kotov"
+
+#: src/pipewire/pipewire.cc:408 src/skins/menus.cc:88 src/skins-qt/menus.cc:79
+msgid "Playback"
+msgstr "Reprodução:"
+
+#: src/playlist-manager/playlist-manager.cc:38
+#: src/playlist-manager-qt/playlist-manager-qt.cc:42
 msgid "Playlist Manager"
 msgstr "Gerenciador de Lista de Reprodução"
 
-#: src/playlist-manager/playlist-manager.cc:226
-msgid "Entries"
-msgstr "Entradas"
-
-#: src/playlist-manager/playlist-manager.cc:245
+#: src/playlist-manager/playlist-manager.cc:221
+#: src/playlist-manager-qt/playlist-manager-qt.cc:356
 msgid "_Remove"
 msgstr "_Remover"
 
-#: src/playlist-manager/playlist-manager.cc:246
+#: src/playlist-manager/playlist-manager.cc:222
+#: src/playlist-manager-qt/playlist-manager-qt.cc:351
 msgid "Ren_ame"
 msgstr "Ren_omear"
 
@@ -2767,32 +3019,47 @@
 msgid "PLS Playlists"
 msgstr "Listas de Reproduções PLS"
 
-#: src/psf/plugin.cc:45
+#: src/psf/plugin.cc:53
 msgid "OpenPSF PSF1/PSF2 Decoder"
-msgstr "Decodificador OpenPSF PDF1/PSF2"
+msgstr "OpenPSF (Reprodutor de PSF1/PSF2)"
+
+#: src/psf/plugin.cc:270
+msgid "OpenPSF Configuration"
+msgstr "Configuração do OpenPSF"
+
+#: src/psf/plugin.cc:271 src/xsf/plugin.cc:444
+msgid "Ignore length from file"
+msgstr "Ignorar duração do arquivo"
 
-#: src/pulse_audio/pulse_audio.cc:38
+#: src/pulse/pulse_audio.cc:42
 msgid "PulseAudio Output"
 msgstr "Saída PulseAudio"
 
-#: src/pulse_audio/pulse_audio.cc:611
+#: src/pulse/pulse_audio.cc:84
+msgid "Context name:"
+msgstr "Nome do contexto:"
+
+#: src/pulse/pulse_audio.cc:86
+msgid "Stream name:"
+msgstr "Nome do stream:"
+
+#: src/pulse/pulse_audio.cc:596
 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"
+"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"
-"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."
+"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 ""
 "Plugin de saída Audacious Pulse Audio\n"
 "\n"
@@ -2811,11 +3078,11 @@
 "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
 "USA."
 
-#: src/qtaudio/qtaudio.cc:49
+#: src/qtaudio/qtaudio.cc:53
 msgid "QtMultimedia Output"
 msgstr "Saída QtMultimedia"
 
-#: src/qtaudio/qtaudio.cc:77
+#: src/qtaudio/qtaudio.cc:84
 msgid ""
 "QtMultimedia Audio Output Plugin for Audacious\n"
 "Copyright 2014 William Pitcock\n"
@@ -2829,50 +3096,109 @@
 "Baseado no Plugin de Saída SDL para Audacious\n"
 "Direitos Autorais 2010 John Lindgren"
 
-#: src/qtui/dialog_windows.cc:31
-msgid "Working ..."
-msgstr "Processando ..."
+#: src/qtglspectrum/gl-spectrum.cc:41
+msgid ""
+"OpenGL Spectrum Analyzer for Audacious\n"
+"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
+"Copyright 2014, 2020 Ariadne Conill\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 Espectro OpenGL para Audacious\n"
+"Copyright 2013 Christophe Budé, John Lindgren, e Carlo Bramini\n"
+"Copyright 2014, 2020 Ariadne Conill\n"
+"\n"
+"Baseado no plugin XMMS:\n"
+"Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson, e "
+"4Front \n"
+"\n"
+"Licença: GPLv2+"
 
-#: src/qtui/filter_input.cc:44 src/skins/ui_playlist.cc:221
-msgid "Search"
-msgstr "Pesquisar"
+#: src/qthotkey/gui.cc:177
+msgid "Press a key combination inside a text field."
+msgstr "Pressione uma combinação de teclas dentro de um campo de texto."
+
+#: src/qthotkey/plugin.cc:105
+msgid ""
+"Global Hotkey Plugin\n"
+"Control the player with global key combinations or multimedia keys.\n"
+"\n"
+"Copyright (C) 2020 i.Dark_Templar <darktemplar@dark-templar-archives.net>\n"
+"Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n"
+"\n"
+"Contributors 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 ""
+"Plugin Global Hotkey\n"
+"Controla o reprodutor com combinações de teclas globais ou teclas "
+"multimídia.\n"
+"\n"
+"Copyright (C) 2020 i.Dark_Templar <darktemplar@dark-templar-archives.net>\n"
+"Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n"
+"\n"
+"Os colaboradores incluem:\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/qtui/main_window_actions.cc:94
+#: src/qtui/menus.cc:109
 msgid "_Open Folder ..."
 msgstr "_Abrir Pasta ..."
 
-#: src/qtui/main_window_actions.cc:96
+#: src/qtui/menus.cc:115
 msgid "_Add Folder ..."
 msgstr "_Adicionar Pasta ..."
 
-#: src/qtui/main_window_actions.cc:101
+#: src/qtui/menus.cc:128
 msgid "_Log Inspector ..."
 msgstr "_Inspector do Histórico ..."
 
-#: src/qtui/main_window.cc:64
-msgid "Open Files"
-msgstr "Abrir arquivos"
+#: src/qtui/menus.cc:220
+msgid "_Find ..."
+msgstr "_Procurar ..."
+
+#: src/qtui/menus.cc:256 src/skins/menus.cc:80 src/skins-qt/menus.cc:70
+msgid "Audio Settings ..."
+msgstr "Configurações de Audio ..."
+
+#: src/qtui/playlist_model.cc:188
+msgid "Q#"
+msgstr "Q#"
+
+#: src/qtui/playlist_model.cc:190
+msgid "T#"
+msgstr "F#"
+
+#: src/qtui/playlist_model.cc:192
+msgid "C#"
+msgstr "C#"
+
+#: src/qtui/playlist_model.cc:194
+msgid "D#"
+msgstr "D#"
 
-#: src/qtui/main_window.cc:66
-msgid "Add Files"
-msgstr "Adicionar arquivos"
-
-#: src/qtui/main_window.cc:71 src/skins/menus.cc:90
-msgid "Previous"
-msgstr "Anterior"
-
-#: src/qtui/main_window.cc:77 src/skins/menus.cc:82
-msgid "Repeat"
-msgstr "Repetir"
-
-#: src/qtui/main_window.cc:79 src/skins/menus.cc:83
-msgid "Shuffle"
-msgstr "Embaralhar"
-
-#: src/qtui/qtui.cc:42
+#: src/qtui/qtui.cc:40
 msgid "Qt Interface"
 msgstr "Interface Qt"
 
+#: src/qtui/search_bar.cc:46
+msgid "Search playlist"
+msgstr "Procurar lista de reprodução "
+
+#: src/qtui/settings.cc:79
+msgid "Use bold font for column headers"
+msgstr "Usar fonte em negrito nos cabeçalhos de coluna"
+
 #: src/resample/resample.cc:43
 msgid "Sample Rate Converter"
 msgstr "Conversor de Taxa de Amostragem"
@@ -2913,7 +3239,7 @@
 msgid "Method:"
 msgstr "Método:"
 
-#: src/resample/resample.cc:199 src/sox-resampler/sox-resampler.cc:161
+#: src/resample/resample.cc:199 src/soxr/sox-resampler.cc:203
 msgid "Rate:"
 msgstr "Taxa:"
 
@@ -2965,68 +3291,54 @@
 msgid "192 kHz:"
 msgstr "192 kHz:"
 
-#: src/scrobbler2/config_window.cc:41
-#, c-format
-msgid "OK. Scrobbling for user: %s"
-msgstr "OK. Scrobbling para o usuário: %s"
+#: src/scrobbler2/config_window.cc:29
+msgid "Checking Last.fm access ..."
+msgstr "Checando o acesso ao Last.fm ..."
 
-#: src/scrobbler2/config_window.cc:54
-msgid "Permission Denied"
-msgstr "Permissão Negada"
-
-#: src/scrobbler2/config_window.cc:56
-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.cc:66
-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.cc:69 src/scrobbler2/config_window.cc:80
+#: src/scrobbler2/config_window.cc:35
 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."
+"Your scrobbles are being saved on your computer temporarily. They will be "
+"submitted as soon as Audacious is allowed access."
 msgstr ""
-"Não se preocupe. Seus scrobbles são salvos no seu computador.\n"
-"Eles serão apresentados logo que Audacious é permitido fazê-lo."
+"Seu scrobbles está sendo salvo no seu computador temporariamente. Eles serão "
+"enviados logo que o acesso seja permitido para o Audacious. "
 
-#: src/scrobbler2/config_window.cc:77
-msgid "Network Problem."
-msgstr "Problema de Rede."
+#: src/scrobbler2/config_window.cc:41
+#, c-format
+msgid "Permission granted. Scrobbling for user %s."
+msgstr "Permissão garantida. Scrobbling para o usuário: %s"
 
-#: src/scrobbler2/config_window.cc:78
-msgid "There was a problem contacting Last.fm. Please try again later."
+#: src/scrobbler2/config_window.cc:44
+msgid ""
+"Permission denied. Open the following URL in a browser, allow Audacious "
+"access to your account, and then click 'Check Permission' again:"
 msgstr ""
-"Houve um problema ao contactar Last.fm. Por favor, tente novamente mais "
-"tarde."
+"Acesso negado. Abra o seguinte URL em seu browser, de permissão de acesso ao "
+"Audacious a sua conta e depois clique 'Checar Permissão' novamente:"
 
-#: src/scrobbler2/config_window.cc:110
-msgid "Checking..."
-msgstr "Verificando..."
+#: src/scrobbler2/config_window.cc:53
+msgid "There was a problem contacting Last.fm."
+msgstr "Houve um problema ao contactar Last.fm."
 
-#: src/scrobbler2/config_window.cc:176
-msgid "C_heck Permission"
-msgstr "V_erificar Permissão"
+#: src/scrobbler2/config_window.cc:92
+msgid "Check Permission"
+msgstr "Checar Permissão"
 
-#: src/scrobbler2/config_window.cc:177
-msgid "_Revoke Permission"
-msgstr "_Revogar Permissão"
+#: src/scrobbler2/config_window.cc:93
+msgid "Revoke Permission"
+msgstr "Revogar Permissão"
 
-#: src/scrobbler2/config_window.cc:220
-msgid ""
-"You need to allow Audacious to scrobble tracks to your Last.fm account.\n"
+#: src/scrobbler2/config_window.cc:97
+msgid "You need to allow Audacious to scrobble tracks to your Last.fm account."
 msgstr ""
 "Você precisa permitir Audacious para a reprodução de faixas scrobble na sua "
-"conta Last.fm.\n"
+"conta Last.fm."
 
 #: src/scrobbler2/scrobbler.cc:29
 msgid "Scrobbler 2.0"
 msgstr "Scrobbler 2.0"
 
-#: src/scrobbler2/scrobbler.cc:224
+#: src/scrobbler2/scrobbler.cc:200
 msgid ""
 "The Scrobbler plugin could not be started.\n"
 "There might be a problem with your installation."
@@ -3034,37 +3346,26 @@
 "O plugin Scrobbler não pôde ser iniciado.\n"
 "Pode haver um problema com a sua instalação."
 
-#: src/scrobbler2/scrobbler.cc:289
+#: src/scrobbler2/scrobbler.cc:245
 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"
+"project."
 msgstr ""
-"Plugin Audacious Scrobbler 2.0 por Pitxyoki.\n"
+"Audacious Scrobbler Plugin 2.0 by 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_communication.cc:642
-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."
+"Agradeço a John Lindgren por me ajudar no início deste projeto."
 
-#: src/sdlout/sdlout.cc:48
+#: src/sdlout/sdlout.cc:43
 msgid "SDL Output"
 msgstr "Saída SDL"
 
-#: src/sdlout/sdlout.cc:77
+#: src/sdlout/sdlout.cc:72
 msgid ""
 "SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
@@ -3072,56 +3373,44 @@
 "Plugin de Saída SDL para Audacious\n"
 "Direitos Autorais 2010 John Lindgren."
 
-#: src/search-tool/search-tool.cc:116 src/search-tool/search-tool.cc:124
+#: src/search-tool/library.cc:35 src/search-tool/library.cc:46
+#: src/search-tool-qt/library.cc:35 src/search-tool-qt/library.cc:46
 msgid "Library"
 msgstr "Biblioteca"
 
-#: src/search-tool/search-tool.cc:394
-#, c-format
-msgid "%d result"
-msgid_plural "%d results"
-msgstr0 "%d resultado"
-msgstr1 "%d resultados"
-
-#: src/search-tool/search-tool.cc:400
-#, c-format
-msgid "(%d hidden)"
-msgid_plural "(%d hidden)"
-msgstr0 "(%d oculto)"
-msgstr1 "(%d ocultos)"
-
-#: src/search-tool/search-tool.cc:594
+#: src/search-tool-qt/search-model.cc:44 src/search-tool/search-tool.cc:287
 #, c-format
 msgid "%d song"
 msgid_plural "%d songs"
 msgstr0 "%d faixa"
 msgstr1 "%d faixas"
+msgstr2 "%d faixas"
 
-#: src/search-tool/search-tool.cc:601
+#: src/search-tool-qt/search-model.cc:53 src/search-tool/search-tool.cc:294
 msgid "of this genre"
 msgstr "deste gênero"
 
-#: src/search-tool/search-tool.cc:607
+#: src/search-tool-qt/search-model.h:47 src/search-tool/search-model.h:45
 msgid "on"
 msgstr "sobre"
 
-#: src/search-tool/search-tool.cc:607
+#: src/search-tool-qt/search-model.h:47 src/search-tool/search-model.h:45
 msgid "by"
 msgstr "por"
 
-#: src/search-tool/search-tool.cc:643
-msgid "_Create Playlist"
-msgstr "_Criar Lista de Reprodução"
+#: src/search-tool-qt/search-tool-qt.cc:165 src/search-tool/search-tool.cc:74
+msgid "Number of results to show:"
+msgstr "Número de resultados para exibir:"
+
+#: src/search-tool-qt/search-tool-qt.cc:168 src/search-tool/search-tool.cc:77
+msgid "Rescan library at startup"
+msgstr "Re-escanear lista de reprodução na inicialização"
+
+#: src/search-tool-qt/search-tool-qt.cc:170
+msgid "Monitor library for changes"
+msgstr "Monitorar a biblioteca por alterações"
 
-#: src/search-tool/search-tool.cc:645
-msgid "_Add to Playlist"
-msgstr "_Adicionar à Lista de Reprodução"
-
-#: src/search-tool/search-tool.cc:684
-msgid "Search library"
-msgstr "Procurar biblioteca"
-
-#: src/search-tool/search-tool.cc:688
+#: src/search-tool-qt/search-tool-qt.cc:193 src/search-tool/search-tool.cc:450
 msgid ""
 "To import your music library into Audacious, choose a folder and then click "
 "the \"refresh\" icon."
@@ -3129,21 +3418,45 @@
 "Para importar sua biblioteca de música no Audacious, escolha uma pasta e em "
 "seguida no ícone \"atualizar\"."
 
-#: src/search-tool/search-tool.cc:696
+#: src/search-tool-qt/search-tool-qt.cc:195 src/search-tool/search-tool.cc:459
 msgid "Please wait ..."
 msgstr "Por favor aguarde ..."
 
-#: src/search-tool/search-tool.cc:723
+#: src/search-tool-qt/search-tool-qt.cc:197 src/search-tool/search-tool.cc:487
 msgid "Choose Folder"
 msgstr "Escolha pasta"
 
+#: src/search-tool-qt/search-tool-qt.cc:201 src/search-tool/search-tool.cc:445
+msgid "Search library"
+msgstr "Procurar biblioteca"
+
+#: src/search-tool-qt/search-tool-qt.cc:327 src/search-tool/search-tool.cc:156
+#, c-format
+msgid "%d of %d result shown"
+msgid_plural "%d of %d results shown"
+msgstr0 " %d de %d resultado mostrado"
+msgstr1 "%d de %d resultados mostrados"
+msgstr2 "%d de %d resultados mostrados"
+
+#: src/search-tool-qt/search-tool-qt.cc:331 src/search-tool/search-tool.cc:160
+#, c-format
+msgid "%d result"
+msgid_plural "%d results"
+msgstr0 "%d resultado"
+msgstr1 "%d resultados"
+msgstr2 "%d resultados"
+
+#: src/search-tool-qt/search-tool-qt.cc:501 src/search-tool/search-tool.cc:341
+msgid "_Create Playlist"
+msgstr "_Criar Lista de Reprodução"
+
+#: src/search-tool-qt/search-tool-qt.cc:503 src/search-tool/search-tool.cc:343
+msgid "_Add to Playlist"
+msgstr "_Adicionar à Lista de Reprodução"
+
 #: src/sid/xmms-sid.cc:43
 msgid "SID Player"
-msgstr "Reprodutor SID"
-
-#: src/sid/xs_config.cc:61
-msgid "Output"
-msgstr "Saída"
+msgstr "Decodificador SID"
 
 #: src/sid/xs_config.cc:62
 msgid "Channels:"
@@ -3155,11 +3468,11 @@
 
 #: src/sid/xs_config.cc:69
 msgid "Emulate MOS 8580 (default: MOS 6581)"
-msgstr "Emulatar MOS 8580 (Padrão: MOS 6581)"
+msgstr "Emular MOS 8580 (Padrão: MOS 6581)"
 
 #: src/sid/xs_config.cc:71
 msgid "Do not automatically select chip model"
-msgstr "Não selecionar automaticamente o modelo do chip"
+msgstr "Não selecionar o modelo do chip automaticamente"
 
 #: src/sid/xs_config.cc:73
 msgid "Emulate filter"
@@ -3225,742 +3538,685 @@
 msgid "Threshold:"
 msgstr "Limite:"
 
-#: src/silence-removal/silence-removal.cc:70
-msgid "dB"
-msgstr "dB"
+#: src/skins/actions.cc:45 src/skins-qt/actions.cc:43
+msgid "Repeat points cleared."
+msgstr "Repetir pontos apagados."
+
+#: src/skins/actions.cc:60 src/skins-qt/actions.cc:58
+msgid "Repeat point A set."
+msgstr "Repetir ponto de definição A."
+
+#: src/skins/actions.cc:65 src/skins-qt/actions.cc:63
+msgid "Repeat point B set."
+msgstr "Repetir ponto de definição B."
+
+#: src/skins/equalizer.cc:223 src/skins-qt/equalizer.cc:223
+msgid "Preamp"
+msgstr "Amplificador"
+
+#: src/skins/equalizer.cc:227 src/skins-qt/equalizer.cc:227
+msgid "31 Hz"
+msgstr "31 Hz"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "63 Hz"
+msgstr "63 Hz"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "125 Hz"
+msgstr "125 Hz"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "250 Hz"
+msgstr "250 Hz"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "500 Hz"
+msgstr "500 Hz"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "1 kHz"
+msgstr "1 kHz"
 
-#: src/skins/menus.cc:64
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "2 kHz"
+msgstr "2 kHz"
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "4 kHz"
+msgstr "4 kHz"
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "8 kHz"
+msgstr "8 kHz"
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "16 kHz"
+msgstr "16 kHz"
+
+#: src/skins/equalizer.cc:270 src/skins-qt/equalizer.cc:270
+msgid "Audacious Equalizer"
+msgstr "Equalizador do Audacious"
+
+#: src/skins/main.cc:459 src/skins-qt/main.cc:442
+msgid "Recording on"
+msgstr "Iniciar gravação"
+
+#: src/skins/main.cc:461 src/skins-qt/main.cc:444
+msgid "Recording off"
+msgstr "Encerrar gravação"
+
+#: src/skins/main.cc:754 src/skins-qt/main.cc:701
+#, c-format
+msgid "Seek to %d:%-2.2d / %d:%-2.2d"
+msgstr "Ir para %d:%-2.2d / %d:%-2.2d"
+
+#: src/skins/main.cc:771 src/skins-qt/main.cc:718
+#, c-format
+msgid "Volume: %d%%"
+msgstr "Volume: %d%%"
+
+#: src/skins/main.cc:784 src/skins-qt/main.cc:731
+#, c-format
+msgid "Balance: %d%% left"
+msgstr "Equilíbrio: %d%% esquerda"
+
+#: src/skins/main.cc:786 src/skins-qt/main.cc:733
+msgid "Balance: center"
+msgstr "Equilíbrio centro"
+
+#: src/skins/main.cc:788 src/skins-qt/main.cc:735
+#, c-format
+msgid "Balance: %d%% right"
+msgstr "Equilíbrio: %d%% direita"
+
+#: src/skins/main.cc:880 src/skins-qt/main.cc:827
+msgid "Options Menu"
+msgstr "Menu de Opções"
+
+#: src/skins/main.cc:884 src/skins-qt/main.cc:831
+msgid "Disable 'Always On Top'"
+msgstr "Desativar 'Sempre No Topo'"
+
+#: src/skins/main.cc:886 src/skins-qt/main.cc:833
+msgid "Enable 'Always On Top'"
+msgstr "Ativar 'Sempre No Topo'"
+
+#: src/skins/main.cc:889 src/skins-qt/main.cc:836
+msgid "File Info Box"
+msgstr "Caixa de Informações do Arquivo"
+
+#: src/skins/main.cc:892 src/skins/menus.cc:149 src/skins-qt/main.cc:839
+#: src/skins-qt/menus.cc:142
+msgid "Double Size"
+msgstr "Tamanho Duplo"
+
+#: src/skins/main.cc:895 src/skins-qt/main.cc:842
+msgid "Visualizations"
+msgstr "Visualizações"
+
+#: src/skins/menus.cc:74 src/skins-qt/menus.cc:64
+msgid "Volume Up"
+msgstr "Aumentar Volume"
+
+#: src/skins/menus.cc:75 src/skins-qt/menus.cc:65
+msgid "Volume Down"
+msgstr "Diminuir Volume"
+
+#: src/skins/menus.cc:77 src/skins-qt/menus.cc:67
+msgid "Effects ..."
+msgstr "Efeitos ..."
+
+#: src/skins/menus.cc:84 src/skins-qt/menus.cc:74
 msgid "Open Files ..."
 msgstr "Abrir Arquivos ..."
 
-#: src/skins/menus.cc:65
+#: src/skins/menus.cc:85 src/skins-qt/menus.cc:76
 msgid "Open URL ..."
 msgstr "Abrir URL ..."
 
-#: src/skins/menus.cc:66
-msgid "Search Library"
-msgstr "Procurar Biblioteca"
-
-#: src/skins/menus.cc:68
-msgid "Playback"
-msgstr "Reprodução:"
-
-#: src/skins/menus.cc:69
+#: src/skins/menus.cc:89 src/skins-qt/menus.cc:80
 msgid "Playlist"
 msgstr "Lista de Reprodução"
 
-#: src/skins/menus.cc:70
+#: src/skins/menus.cc:90 src/skins-qt/menus.cc:81
+msgid "Output"
+msgstr "Saída"
+
+#: src/skins/menus.cc:91 src/skins-qt/menus.cc:82
 msgid "View"
 msgstr "Ver"
 
-#: src/skins/menus.cc:72 src/skins/menus.cc:136 src/skins/menus.cc:149
-#: src/skins/menus.cc:214
+#: src/skins/menus.cc:93 src/skins/menus.cc:161 src/skins/menus.cc:174
+#: src/skins/menus.cc:245 src/skins-qt/menus.cc:84 src/skins-qt/menus.cc:156
+#: src/skins-qt/menus.cc:170 src/skins-qt/menus.cc:241
 msgid "Services"
 msgstr "Serviços"
 
-#: src/skins/menus.cc:74
+#: src/skins/menus.cc:95 src/skins-qt/menus.cc:86
 msgid "About ..."
 msgstr "Sobre ..."
 
-#: src/skins/menus.cc:75
+#: src/skins/menus.cc:96 src/skins-qt/menus.cc:87
 msgid "Settings ..."
 msgstr "Configurações ..."
 
-#: src/skins/menus.cc:76
+#: src/skins/menus.cc:97 src/skins-qt/menus.cc:88
 msgid "Quit"
 msgstr "Sair"
 
-#: src/skins/menus.cc:80 src/skins/menus.cc:206
+#: src/skins/menus.cc:101 src/skins/menus.cc:235 src/skins-qt/menus.cc:92
+#: src/skins-qt/menus.cc:231
 msgid "Song Info ..."
 msgstr "Informações da Faixa ..."
 
-#: src/skins/menus.cc:84
+#: src/skins/menus.cc:105 src/skins-qt/menus.cc:96
+msgid "Shuffle by Album"
+msgstr "Embaralhar por Álbum"
+
+#: src/skins/menus.cc:106 src/skins-qt/menus.cc:97
 msgid "No Playlist Advance"
 msgstr "Não Avançar a Lista de Reprodução"
 
-#: src/skins/menus.cc:85
-msgid "Stop After This Song"
-msgstr "Parar Após Esta Faixa"
-
-#: src/skins/menus.cc:93
+#: src/skins/menus.cc:117 src/skins-qt/menus.cc:108
 msgid "Set A-B Repeat"
 msgstr "Definir Repetição A-B"
 
-#: src/skins/menus.cc:94
+#: src/skins/menus.cc:118 src/skins-qt/menus.cc:109
 msgid "Clear A-B Repeat"
 msgstr "Limpar Repetição A-B"
 
-#: src/skins/menus.cc:96
+#: src/skins/menus.cc:120 src/skins-qt/menus.cc:111
 msgid "Jump to Song ..."
 msgstr "Ir para a Música ..."
 
-#: src/skins/menus.cc:97
+#: src/skins/menus.cc:121 src/skins-qt/menus.cc:113
 msgid "Jump to Time ..."
 msgstr "Ir para Posição Temporal ..."
 
-#: src/skins/menus.cc:101
+#: src/skins/menus.cc:125 src/skins-qt/menus.cc:118
 msgid "Play/Resume"
 msgstr "Reproduzir/Retomar"
 
-#: src/skins/menus.cc:103
+#: src/skins/menus.cc:127 src/skins-qt/menus.cc:120
 msgid "New Playlist"
 msgstr "Nova Lista de Reprodução"
 
-#: src/skins/menus.cc:104
+#: src/skins/menus.cc:128 src/skins-qt/menus.cc:121
 msgid "Rename Playlist ..."
 msgstr "Renomear Lista de Reprodução ..."
 
-#: src/skins/menus.cc:105
+#: src/skins/menus.cc:129 src/skins-qt/menus.cc:122
 msgid "Remove Playlist"
 msgstr "Remover lista de reprodução"
 
-#: src/skins/menus.cc:107
+#: src/skins/menus.cc:131 src/skins-qt/menus.cc:124
 msgid "Previous Playlist"
 msgstr "Lista de Reprodução Anterior"
 
-#: src/skins/menus.cc:108
+#: src/skins/menus.cc:132 src/skins-qt/menus.cc:125
 msgid "Next Playlist"
 msgstr "Próxima Lista de Reprodução"
 
-#: src/skins/menus.cc:110
+#: src/skins/menus.cc:134 src/skins-qt/menus.cc:127
 msgid "Import Playlist ..."
 msgstr "Importar Lista de Reprodução"
 
-#: src/skins/menus.cc:111
+#: src/skins/menus.cc:135 src/skins-qt/menus.cc:128
 msgid "Export Playlist ..."
 msgstr "Exportar Lista de Reprodução ..."
 
-#: src/skins/menus.cc:113
+#: src/skins/menus.cc:137 src/skins-qt/menus.cc:130
 msgid "Playlist Manager ..."
 msgstr "Gerenciador de Lista de Reprodução ..."
 
-#: src/skins/menus.cc:114
+#: src/skins/menus.cc:138 src/skins-qt/menus.cc:131
 msgid "Queue Manager ..."
 msgstr "Gerenciador de Fila de Reprodução ..."
 
-#: src/skins/menus.cc:116
+#: src/skins/menus.cc:140 src/skins-qt/menus.cc:133
 msgid "Refresh Playlist"
 msgstr "Atualizar Lista de Reprodução"
 
-#: src/skins/menus.cc:120
+#: src/skins/menus.cc:144 src/skins-qt/menus.cc:137
 msgid "Show Playlist Editor"
 msgstr "Mostrar Editor da Lista de Reprodução"
 
-#: src/skins/menus.cc:121
+#: src/skins/menus.cc:145 src/skins-qt/menus.cc:138
 msgid "Show Equalizer"
 msgstr "Mostrar Equalizador"
 
-#: src/skins/menus.cc:123
+#: src/skins/menus.cc:147 src/skins-qt/menus.cc:140
 msgid "Show Remaining Time"
 msgstr "Mostrar Tempo Restante"
 
-#: src/skins/menus.cc:125
+#: src/skins/menus.cc:150 src/skins-qt/menus.cc:143
 msgid "Always on Top"
 msgstr "Sempre no Topo"
 
-#: src/skins/menus.cc:126
+#: src/skins/menus.cc:151 src/skins-qt/menus.cc:145
 msgid "On All Workspaces"
 msgstr "Em Todas as Áreas de Trabalho"
 
-#: src/skins/menus.cc:128
+#: src/skins/menus.cc:153 src/skins-qt/menus.cc:148
 msgid "Roll Up Player"
 msgstr "Minimizar Reprodutor"
 
-#: src/skins/menus.cc:129
+#: src/skins/menus.cc:154 src/skins-qt/menus.cc:149
 msgid "Roll Up Playlist Editor"
 msgstr "Editor de rolagem"
 
-#: src/skins/menus.cc:130
+#: src/skins/menus.cc:155 src/skins-qt/menus.cc:150
 msgid "Roll Up Equalizer"
 msgstr "Minimizar Equalizador"
 
-#: src/skins/menus.cc:132 src/skins/ui_main.cc:854
-msgid "Double Size"
-msgstr "Tamanho Duplo"
-
-#: src/skins/menus.cc:138
+#: src/skins/menus.cc:163 src/skins-qt/menus.cc:158
 msgid "Add URL ..."
 msgstr "Adicionar URL ..."
 
-#: src/skins/menus.cc:139
+#: src/skins/menus.cc:164 src/skins-qt/menus.cc:160
 msgid "Add Files ..."
 msgstr "Adicionar Arquivos ..."
 
-#: src/skins/menus.cc:143 src/skins/menus.cc:171 src/skins/menus.cc:185
+#: src/skins/menus.cc:168 src/skins/menus.cc:196 src/skins/menus.cc:212
+#: src/skins-qt/menus.cc:164 src/skins-qt/menus.cc:192
+#: src/skins-qt/menus.cc:208
 msgid "By Title"
 msgstr "Por Título"
 
-#: src/skins/menus.cc:144 src/skins/menus.cc:178 src/skins/menus.cc:192
+#: src/skins/menus.cc:169 src/skins/menus.cc:203 src/skins/menus.cc:219
+#: src/skins-qt/menus.cc:165 src/skins-qt/menus.cc:199
+#: src/skins-qt/menus.cc:215
 msgid "By File Name"
 msgstr "Por Nome de Arquivo"
 
-#: src/skins/menus.cc:145 src/skins/menus.cc:179 src/skins/menus.cc:193
+#: src/skins/menus.cc:170 src/skins/menus.cc:204 src/skins/menus.cc:220
+#: src/skins-qt/menus.cc:166 src/skins-qt/menus.cc:200
+#: src/skins-qt/menus.cc:216
 msgid "By File Path"
 msgstr "Por Localização do Arquivo"
 
-#: src/skins/menus.cc:151
+#: src/skins/menus.cc:176 src/skins-qt/menus.cc:172
 msgid "Remove All"
 msgstr "Remover Todos"
 
-#: src/skins/menus.cc:152
+#: src/skins/menus.cc:177 src/skins-qt/menus.cc:173
 msgid "Clear Queue"
 msgstr "Apagar Fila de Reprodução"
 
-#: src/skins/menus.cc:154
+#: src/skins/menus.cc:179 src/skins-qt/menus.cc:175
 msgid "Remove Unavailable Files"
 msgstr "Remover Arquivos Indisponíveis"
 
-#: src/skins/menus.cc:155
+#: src/skins/menus.cc:180 src/skins-qt/menus.cc:176
 msgid "Remove Duplicates"
 msgstr "Remover Duplicatas"
 
-#: src/skins/menus.cc:157
+#: src/skins/menus.cc:182 src/skins-qt/menus.cc:178
 msgid "Remove Unselected"
 msgstr "Remover Desmarcada"
 
-#: src/skins/menus.cc:158
+#: src/skins/menus.cc:183 src/skins-qt/menus.cc:179
 msgid "Remove Selected"
 msgstr "Remover Selecionados"
 
-#: src/skins/menus.cc:162
+#: src/skins/menus.cc:187 src/skins-qt/menus.cc:183
 msgid "Search and Select"
 msgstr "Pesquisar e Selecionar"
 
-#: src/skins/menus.cc:164
+#: src/skins/menus.cc:189 src/skins-qt/menus.cc:185
 msgid "Invert Selection"
 msgstr "Inverter Seleção"
 
-#: src/skins/menus.cc:165
+#: src/skins/menus.cc:190 src/skins-qt/menus.cc:186
 msgid "Select None"
 msgstr "Não Selecionar"
 
-#: src/skins/menus.cc:166
+#: src/skins/menus.cc:191 src/skins-qt/menus.cc:187
 msgid "Select All"
 msgstr "Selecionar Tudo"
 
-#: src/skins/menus.cc:170 src/skins/menus.cc:184
+#: src/skins/menus.cc:195 src/skins/menus.cc:211 src/skins-qt/menus.cc:191
+#: src/skins-qt/menus.cc:207
 msgid "By Track Number"
 msgstr "Por Número da Faixa"
 
-#: src/skins/menus.cc:172 src/skins/menus.cc:186
+#: src/skins/menus.cc:197 src/skins/menus.cc:213 src/skins-qt/menus.cc:193
+#: src/skins-qt/menus.cc:209
 msgid "By Artist"
 msgstr "Por Artista"
 
-#: src/skins/menus.cc:173 src/skins/menus.cc:187
+#: src/skins/menus.cc:198 src/skins/menus.cc:214 src/skins-qt/menus.cc:194
+#: src/skins-qt/menus.cc:210
 msgid "By Album"
 msgstr "Por Album"
 
-#: src/skins/menus.cc:174 src/skins/menus.cc:188
+#: src/skins/menus.cc:199 src/skins/menus.cc:215 src/skins-qt/menus.cc:195
+#: src/skins-qt/menus.cc:211
 msgid "By Album Artist"
 msgstr "Por Artista do Álbum"
 
-#: src/skins/menus.cc:175 src/skins/menus.cc:190
+#: src/skins/menus.cc:200 src/skins/menus.cc:216 src/skins-qt/menus.cc:196
+#: src/skins-qt/menus.cc:212
 msgid "By Release Date"
 msgstr "Por Data de Lançamento"
 
-#: src/skins/menus.cc:176 src/skins/menus.cc:189
+#: src/skins/menus.cc:201 src/skins/menus.cc:217 src/skins-qt/menus.cc:197
+#: src/skins-qt/menus.cc:213
 msgid "By Genre"
 msgstr "Por Gênero"
 
-#: src/skins/menus.cc:177 src/skins/menus.cc:191
+#: src/skins/menus.cc:202 src/skins/menus.cc:218 src/skins-qt/menus.cc:198
+#: src/skins-qt/menus.cc:214
 msgid "By Length"
 msgstr "Por Duração"
 
-#: src/skins/menus.cc:180 src/skins/menus.cc:194
+#: src/skins/menus.cc:205 src/skins/menus.cc:221 src/skins-qt/menus.cc:201
+#: src/skins-qt/menus.cc:217
 msgid "By Custom Title"
 msgstr "Por Título Personalizado"
 
-#: src/skins/menus.cc:198
+#: src/skins/menus.cc:206 src/skins/menus.cc:222 src/skins-qt/menus.cc:202
+#: src/skins-qt/menus.cc:218
+msgid "By Comment"
+msgstr "Por Comentário"
+
+#: src/skins/menus.cc:207 src/skins/menus.cc:223 src/skins-qt/menus.cc:203
+#: src/skins-qt/menus.cc:219
+msgid "By Disc Number"
+msgstr "Por número de disco"
+
+#: src/skins/menus.cc:227 src/skins-qt/menus.cc:223
 msgid "Randomize List"
 msgstr "Randomizar Lista"
 
-#: src/skins/menus.cc:199
+#: src/skins/menus.cc:228 src/skins-qt/menus.cc:224
 msgid "Reverse List"
 msgstr "Reverter Lista"
 
-#: src/skins/menus.cc:201
+#: src/skins/menus.cc:230 src/skins-qt/menus.cc:226
 msgid "Sort Selected"
 msgstr "Organizar Selecionado"
 
-#: src/skins/menus.cc:202
+#: src/skins/menus.cc:231 src/skins-qt/menus.cc:227
 msgid "Sort List"
 msgstr "Organizar Lista"
 
-#: src/skins/menus.cc:208
+#: src/skins/menus.cc:236 src/skins-qt/menus.cc:232
+msgid "Open Containing Folder"
+msgstr "Abrir Pasta de Conteúdo"
+
+#: src/skins/menus.cc:238 src/skins-qt/menus.cc:234
 msgid "Cut"
 msgstr "Cortar"
 
-#: src/skins/menus.cc:209
+#: src/skins/menus.cc:239 src/skins-qt/menus.cc:235
 msgid "Copy"
 msgstr "Copiar"
 
-#: src/skins/menus.cc:210
+#: src/skins/menus.cc:240 src/skins-qt/menus.cc:236
 msgid "Paste"
 msgstr "Colar"
 
-#: src/skins/menus.cc:212
+#: src/skins/menus.cc:241 src/skins-qt/menus.cc:237
+msgid "Paste at End"
+msgstr "Colar no final"
+
+#: src/skins/menus.cc:243 src/skins-qt/menus.cc:239
 msgid "Queue/Unqueue"
 msgstr "Adicionar/Remover da Fila de Reprodução"
 
-#: src/skins/menus.cc:218
-msgid "Load Preset ..."
-msgstr "Carregar pré-ajuste ..."
-
-#: src/skins/menus.cc:219
-msgid "Load Auto Preset ..."
-msgstr "Carregar pré-ajuste automático ..."
-
-#: src/skins/menus.cc:220
-msgid "Load Default"
-msgstr "Carregar Padrão"
-
-#: src/skins/menus.cc:221
-msgid "Load Preset File ..."
-msgstr "Carregar Arquivo de Pré-ajuste ..."
-
-#: src/skins/menus.cc:222
-msgid "Load EQF File ..."
-msgstr "Carregar Arquivo EQF ..."
-
-#: src/skins/menus.cc:224
-msgid "Save Preset ..."
-msgstr "Salvar Pré-ajuste ..."
-
-#: src/skins/menus.cc:225
-msgid "Save Auto Preset ..."
-msgstr "Salvar pré-ajuste automático ..."
-
-#: src/skins/menus.cc:226
-msgid "Save Default"
-msgstr "Salvar Padrão"
-
-#: src/skins/menus.cc:227
-msgid "Save Preset File ..."
-msgstr "Salvar Arquivo de Pré-ajuste ..."
-
-#: src/skins/menus.cc:228
-msgid "Save EQF File ..."
-msgstr "Salvar Arquivo EQF ..."
-
-#: src/skins/menus.cc:230
-msgid "Delete Preset ..."
-msgstr "Deletar pré-ajuste ..."
-
-#: src/skins/menus.cc:231
-msgid "Delete Auto Preset ..."
-msgstr "Deletar pré-ajuste automático ..."
-
-#: src/skins/menus.cc:233
-msgid "Import Winamp Presets ..."
-msgstr "Importar Pré-ajustes Winamp ..."
-
-#: src/skins/menus.cc:235
-msgid "Reset to Zero"
-msgstr "Redefinir para Zero"
+#: src/skins/playlist-widget.cc:58 src/skins-qt/playlist-widget.cc:58
+#, c-format
+msgid "%s (%d of %d)"
+msgstr "%s (%d de %d)"
 
-#: src/skins/plugin.cc:48
+#: src/skins/playlistwin.cc:491 src/skins-qt/playlistwin.cc:478
+msgid "Audacious Playlist Editor"
+msgstr "Editor de lista de reprodução do Audacious"
+
+#: src/skins/plugin.cc:53 src/skins-qt/plugin.cc:65
 msgid "Winamp Classic Interface"
 msgstr "Interface Clássica Winamp"
 
-#: src/skins/preset-browser.cc:57 src/skins/preset-list.cc:371
-#: src/skins/preset-list.cc:386
-msgid "Save"
-msgstr "Salvar"
-
-#: src/skins/preset-browser.cc:57 src/skins/preset-list.cc:338
-#: src/skins/preset-list.cc:354
-msgid "Load"
-msgstr "Carregar"
-
-#: src/skins/preset-browser.cc:83
-msgid "Load Preset File"
-msgstr "Carregar Arquivo de Pré-ajuste"
-
-#: src/skins/preset-browser.cc:100
-msgid "Load EQF File"
-msgstr "Carregar Arquivo EQF"
-
-#: src/skins/preset-browser.cc:119
-msgid "Save Preset File"
-msgstr "Salvar Arquivo de Pré-ajuste"
-
-#: src/skins/preset-browser.cc:137
-msgid "Save EQF File"
-msgstr "Salvar Arquivo EQF"
-
-#: src/skins/preset-browser.cc:151
-msgid "Import Winamp Presets"
-msgstr "Importar Pré-ajustes Winamp"
-
-#: src/skins/preset-list.cc:285
-msgid "Presets"
-msgstr "Pré-ajuste"
-
-#: src/skins/preset-list.cc:335
-msgid "Load preset"
-msgstr "Carregar pré-ajuste"
-
-#: src/skins/preset-list.cc:351
-msgid "Load auto-preset"
-msgstr "Carregar pré-ajuste automático"
-
-#: src/skins/preset-list.cc:367
-msgid "Save preset"
-msgstr "Salvar pré-ajuste"
-
-#: src/skins/preset-list.cc:382
-msgid "Save auto-preset"
-msgstr "Salvar pré-ajuste automático"
-
-#: src/skins/preset-list.cc:408
-msgid "Delete preset"
-msgstr "Deletar pré-ajuste"
-
-#: src/skins/preset-list.cc:424
-msgid "Delete auto-preset"
-msgstr "Deletar pré-ajuste automático"
+#: src/skins-qt/menus.cc:75
+msgid "Open Folder ..."
+msgstr "Abrir Pasta ..."
+
+#: src/skins-qt/menus.cc:159
+msgid "Add Folder ..."
+msgstr "Adicionar Pasta ..."
+
+#: src/skins-qt/search-select.cc:62 src/skins/search-select.cc:77
+msgid "Search entries in active playlist"
+msgstr "Procurar entradas na lista de reprodução ativa"
+
+#: src/skins-qt/search-select.cc:70 src/skins/search-select.cc:83
+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 ""
+"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-qt/search-select.cc:75 src/skins/search-select.cc:91
+msgid "Title:"
+msgstr "Título:"
+
+#: src/skins-qt/search-select.cc:79 src/skins/search-select.cc:96
+msgid "Album:"
+msgstr "Álbum:"
+
+#: src/skins-qt/search-select.cc:82 src/skins/search-select.cc:101
+msgid "Artist:"
+msgstr "Artista:"
+
+#: src/skins-qt/search-select.cc:85 src/skins/search-select.cc:106
+msgid "File Name:"
+msgstr "Nome do Arquivo:"
+
+#: src/skins-qt/search-select.cc:88 src/skins/search-select.cc:134
+msgid "Clear previous selection before searching"
+msgstr "Apagar seleção anterior antes de pesquisar"
+
+#: src/skins-qt/search-select.cc:89 src/skins/search-select.cc:137
+msgid "Automatically toggle queue for matching entries"
+msgstr ""
+"Automaticamente habilitar/desabilitar fila para as entradas coincidentes"
+
+#: src/skins-qt/search-select.cc:90 src/skins/search-select.cc:140
+msgid "Create a new playlist with matching entries"
+msgstr "Criar uma nova lista de reprodução com as entradas correspondentes"
+
+#: src/skins-qt/search-select.cc:101 src/skins/search-select.cc:78
+msgid "Search"
+msgstr "Pesquisar"
 
-#: src/skins/skins_cfg.cc:176
+#: src/skins-qt/skins_cfg.cc:198 src/skins/skins_cfg.cc:182
 msgid "Player:"
 msgstr "Reprodutor:"
 
-#: src/skins/skins_cfg.cc:178
+#: src/skins-qt/skins_cfg.cc:200 src/skins/skins_cfg.cc:184
 msgid "Select main player window font:"
 msgstr "Selecionar o tipo de letra do player:"
 
-#: src/skins/skins_cfg.cc:179
+#: src/skins-qt/skins_cfg.cc:201 src/skins/skins_cfg.cc:185
 msgid "Playlist:"
 msgstr "Lista de Reprodução:"
 
-#: src/skins/skins_cfg.cc:181
+#: src/skins-qt/skins_cfg.cc:203 src/skins/skins_cfg.cc:187
 msgid "Select playlist font:"
 msgstr "Selecionar o tipo de letra da lista de reprodução:"
 
-#: src/skins/skins_cfg.cc:187
+#: src/skins-qt/skins_cfg.cc:207 src/skins/skins_cfg.cc:191
 msgid "Skin"
 msgstr "Aparência"
 
-#: src/skins/skins_cfg.cc:189
+#: src/skins-qt/skins_cfg.cc:211 src/skins/skins_cfg.cc:193
+msgid "Display active titlebar when any window is focused"
+msgstr "Exibir barra de título ativa quando qualquer janela estiver focada"
+
+#: src/skins-qt/skins_cfg.cc:213 src/skins/skins_cfg.cc:195
 msgid "Fonts"
 msgstr "Fontes"
 
-#: src/skins/skins_cfg.cc:192
+#: src/skins-qt/skins_cfg.cc:215 src/skins/skins_cfg.cc:197
 msgid "Use bitmap fonts (supports ASCII only)"
-msgstr "Usar letras bitmap (suporta ASCII somente)"
+msgstr "Usar fontes bitmap (suporta somente ASCII)"
 
-#: src/skins/skins_cfg.cc:194
+#: src/skins-qt/skins_cfg.cc:217 src/skins/skins_cfg.cc:199
 msgid "Scroll song title"
-msgstr "Rolagem do título da faixa"
+msgstr "Rolar o título da faixa"
 
-#: src/skins/skins_cfg.cc:196
+#: src/skins-qt/skins_cfg.cc:219 src/skins/skins_cfg.cc:201
 msgid "Scroll song title in both directions"
-msgstr "Título da musica rola em ambas as direções"
+msgstr "Rolar o título da faixa em ambas as direções"
 
-#: src/skins/skins_cfg.cc:201
+#: src/skins-qt/skins_cfg.cc:224 src/skins/skins_cfg.cc:206
 msgid "Analyzer"
 msgstr "Analisador"
 
-#: src/skins/skins_cfg.cc:202
+#: src/skins-qt/skins_cfg.cc:225 src/skins/skins_cfg.cc:207
 msgid "Scope"
 msgstr "Escopo"
 
-#: src/skins/skins_cfg.cc:203
+#: src/skins-qt/skins_cfg.cc:226 src/skins/skins_cfg.cc:208
 msgid "Voiceprint / VU meter"
 msgstr "Gravador de Voz / medidor de VU"
 
-#: src/skins/skins_cfg.cc:204
+#: src/skins-qt/skins_cfg.cc:227 src/skins/skins_cfg.cc:209
 msgid "Off"
 msgstr "Desligado"
 
-#: src/skins/skins_cfg.cc:208 src/skins/skins_cfg.cc:233
-#: src/skins/skins_cfg.cc:239
+#: src/skins-qt/skins_cfg.cc:231 src/skins-qt/skins_cfg.cc:256
+#: src/skins-qt/skins_cfg.cc:262 src/skins/skins_cfg.cc:213
+#: src/skins/skins_cfg.cc:238 src/skins/skins_cfg.cc:244
 msgid "Normal"
 msgstr "Normal"
 
-#: src/skins/skins_cfg.cc:209 src/skins/skins_cfg.cc:234
+#: src/skins-qt/skins_cfg.cc:232 src/skins-qt/skins_cfg.cc:257
+#: src/skins/skins_cfg.cc:214 src/skins/skins_cfg.cc:239
 msgid "Fire"
 msgstr "Fogo"
 
-#: src/skins/skins_cfg.cc:210
+#: src/skins-qt/skins_cfg.cc:233 src/skins/skins_cfg.cc:215
 msgid "Vertical lines"
 msgstr "Linhas Verticais"
 
-#: src/skins/skins_cfg.cc:214
+#: src/skins-qt/skins_cfg.cc:237 src/skins/skins_cfg.cc:219
 msgid "Lines"
 msgstr "Linhas"
 
-#: src/skins/skins_cfg.cc:215
+#: src/skins-qt/skins_cfg.cc:238 src/skins/skins_cfg.cc:220
 msgid "Bars"
 msgstr "Barras"
 
-#: src/skins/skins_cfg.cc:219
+#: src/skins-qt/skins_cfg.cc:242 src/skins/skins_cfg.cc:224
 msgid "Slowest"
 msgstr "Mais Lento"
 
-#: src/skins/skins_cfg.cc:220
+#: src/skins-qt/skins_cfg.cc:243 src/skins/skins_cfg.cc:225
 msgid "Slow"
 msgstr "Lento"
 
-#: src/skins/skins_cfg.cc:221 src/sox-resampler/sox-resampler.cc:152
+#: src/skins-qt/skins_cfg.cc:244 src/skins/skins_cfg.cc:226
+#: src/soxr/sox-resampler.cc:180
 msgid "Medium"
 msgstr "Médio"
 
-#: src/skins/skins_cfg.cc:222
+#: src/skins-qt/skins_cfg.cc:245 src/skins/skins_cfg.cc:227
 msgid "Fast"
 msgstr "Rápido"
 
-#: src/skins/skins_cfg.cc:223
+#: src/skins-qt/skins_cfg.cc:246 src/skins/skins_cfg.cc:228
 msgid "Fastest"
 msgstr "Muito Rápido"
 
-#: src/skins/skins_cfg.cc:227
+#: src/skins-qt/skins_cfg.cc:250 src/skins/skins_cfg.cc:232
 msgid "Dots"
 msgstr "Dots"
 
-#: src/skins/skins_cfg.cc:228
+#: src/skins-qt/skins_cfg.cc:251 src/skins/skins_cfg.cc:233
 msgid "Line"
 msgstr "Linha"
 
-#: src/skins/skins_cfg.cc:229
+#: src/skins-qt/skins_cfg.cc:252 src/skins/skins_cfg.cc:234
 msgid "Solid"
 msgstr "Solido"
 
-#: src/skins/skins_cfg.cc:235
+#: src/skins-qt/skins_cfg.cc:258 src/skins/skins_cfg.cc:240
 msgid "Ice"
 msgstr "Gelo"
 
-#: src/skins/skins_cfg.cc:240
+#: src/skins-qt/skins_cfg.cc:263 src/skins/skins_cfg.cc:245
 msgid "Smooth"
 msgstr "Suave"
 
-#: src/skins/skins_cfg.cc:244
-msgid "Type"
-msgstr "Tipo"
-
-#: src/skins/skins_cfg.cc:245
-msgid "Visualization type:"
-msgstr "Tipo de Visualização:"
-
-#: src/skins/skins_cfg.cc:248
-msgid "Analyzer"
-msgstr "Analisador"
-
-#: src/skins/skins_cfg.cc:249
-msgid "Show peaks"
-msgstr "Mostrar picos"
-
-#: src/skins/skins_cfg.cc:251
+#: src/skins-qt/skins_cfg.cc:267 src/skins/skins_cfg.cc:249
 msgid "Coloring:"
 msgstr "Coloração:"
 
-#: src/skins/skins_cfg.cc:254
+#: src/skins-qt/skins_cfg.cc:270 src/skins/skins_cfg.cc:252
 msgid "Style:"
 msgstr "Estilo:"
 
-#: src/skins/skins_cfg.cc:257
+#: src/skins-qt/skins_cfg.cc:273 src/skins/skins_cfg.cc:255
 msgid "Falloff:"
 msgstr "Queda:"
 
-#: src/skins/skins_cfg.cc:260
+#: src/skins-qt/skins_cfg.cc:276 src/skins/skins_cfg.cc:258
 msgid "Peak falloff:"
 msgstr "Queda Máxima:"
 
-#: src/skins/skins_cfg.cc:264
+#: src/skins-qt/skins_cfg.cc:282 src/skins/skins_cfg.cc:264
 msgid "Scope Style:"
 msgstr "Estilo do Escopo"
 
-#: src/skins/skins_cfg.cc:267
+#: src/skins-qt/skins_cfg.cc:285 src/skins/skins_cfg.cc:267
 msgid "Voiceprint Coloring:"
 msgstr "Coloração do Gravador de Voz:"
 
-#: src/skins/skins_cfg.cc:270
+#: src/skins-qt/skins_cfg.cc:288 src/skins/skins_cfg.cc:270
 msgid "VU Meter Style:"
-msgstr "Estilo do Medidor VU"
-
-#: src/skins/skins_cfg.cc:276
-msgid "General"
-msgstr "Geral"
-
-#: src/skins/skins_cfg.cc:277
-msgid "Visualization"
-msgstr "Visualização"
-
-#: src/skins/ui_equalizer.cc:282
-msgid "Preamp"
-msgstr "Amplificador"
-
-#: src/skins/ui_equalizer.cc:286
-msgid "31 Hz"
-msgstr "31 Hz"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "63 Hz"
-msgstr "63 Hz"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "125 Hz"
-msgstr "125 Hz"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "250 Hz"
-msgstr "250 Hz"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "500 Hz"
-msgstr "500 Hz"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "1 kHz"
-msgstr "1 kHz"
-
-#: src/skins/ui_equalizer.cc:288
-msgid "2 kHz"
-msgstr "2 kHz"
-
-#: src/skins/ui_equalizer.cc:288
-msgid "4 kHz"
-msgstr "4 kHz"
-
-#: src/skins/ui_equalizer.cc:288
-msgid "8 kHz"
-msgstr "8 kHz"
-
-#: src/skins/ui_equalizer.cc:288
-msgid "16 kHz"
-msgstr "16 kHz"
-
-#: src/skins/ui_equalizer.cc:330
-msgid "Audacious Equalizer"
-msgstr "Esqualizador do Audacious"
-
-#: src/skins/ui_main.cc:688
-#, c-format
-msgid "Seek to %d:%-2.2d / %d:%-2.2d"
-msgstr "Ir para %d:%-2.2d / %d:%-2.2d"
-
-#: src/skins/ui_main.cc:709
-#, c-format
-msgid "Volume: %d%%"
-msgstr "Volume: %d%%"
-
-#: src/skins/ui_main.cc:732
-#, c-format
-msgid "Balance: %d%% left"
-msgstr "Equilíbrio: %d%% esquerda"
-
-#: src/skins/ui_main.cc:734
-msgid "Balance: center"
-msgstr "Equilíbrio centro"
-
-#: src/skins/ui_main.cc:736
-#, c-format
-msgid "Balance: %d%% right"
-msgstr "Equilíbrio: %d%% direita"
-
-#: src/skins/ui_main.cc:842
-msgid "Options Menu"
-msgstr "Menu de Opções"
-
-#: src/skins/ui_main.cc:846
-msgid "Disable 'Always On Top'"
-msgstr "Desativar 'Sempre No Topo'"
-
-#: src/skins/ui_main.cc:848
-msgid "Enable 'Always On Top'"
-msgstr "Ativar 'Sempre No Topo'"
-
-#: src/skins/ui_main.cc:851
-msgid "File Info Box"
-msgstr "Caixa de Informações do Arquivo"
-
-#: src/skins/ui_main.cc:857
-msgid "Visualizations"
-msgstr "Visualizações"
-
-#: src/skins/ui_main.cc:1336
-msgid "Repeat point A set."
-msgstr "Repetir ponto de definição A."
-
-#: src/skins/ui_main.cc:1341
-msgid "Repeat point B set."
-msgstr "Repetir ponto de definição B."
-
-#: src/skins/ui_main.cc:1350
-msgid "Repeat points cleared."
-msgstr "Repetir pontos apagados."
-
-#: src/skins/ui_playlist.cc:219
-msgid "Search entries in active playlist"
-msgstr "Procurar entradas na lista de reprodução ativa"
-
-#: src/skins/ui_playlist.cc:226
-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 ""
-"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.cc:234
-msgid "Title:"
-msgstr "Título:"
+msgstr "Estilo do Medidor de VU"
 
-#: src/skins/ui_playlist.cc:241
-msgid "Album:"
-msgstr "Álbum:"
-
-#: src/skins/ui_playlist.cc:248
-msgid "Artist:"
-msgstr "Artista:"
-
-#: src/skins/ui_playlist.cc:255
-msgid "File Name:"
-msgstr "Nome do Arquivo:"
-
-#: src/skins/ui_playlist.cc:263
-msgid "Clear previous selection before searching"
-msgstr "Apagar seleção anterior antes de pesquisar"
+#: src/skins-qt/skins_cfg.cc:294 src/skins/skins_cfg.cc:276
+msgid "Type"
+msgstr "Tipo"
 
-#: src/skins/ui_playlist.cc:266
-msgid "Automatically toggle queue for matching entries"
-msgstr ""
-"Automaticamente habilitar/desabilitar fila para as entradas coincidentes"
+#: src/skins-qt/skins_cfg.cc:295 src/skins/skins_cfg.cc:277
+msgid "Visualization type:"
+msgstr "Tipo de Visualização:"
 
-#: src/skins/ui_playlist.cc:269
-msgid "Create a new playlist with matching entries"
-msgstr "Criar uma nova lista de reprodução com as entradas correspondentes"
+#: src/skins-qt/skins_cfg.cc:298 src/skins/skins_cfg.cc:280
+msgid "Analyzer"
+msgstr "Analisador"
 
-#: src/skins/ui_playlist.cc:717
-msgid "Audacious Playlist Editor"
-msgstr "Editor de lista de reprodução do Audacious"
+#: src/skins-qt/skins_cfg.cc:299 src/skins/skins_cfg.cc:281
+msgid "Show peaks"
+msgstr "Mostrar picos"
 
-#: src/skins/ui_playlist.cc:752
-#, c-format
-msgid "%s (%d of %d)"
-msgstr "%s (%d de %d)"
+#: src/skins-qt/skins_cfg.cc:308 src/skins/skins_cfg.cc:290
+msgid "Visualization"
+msgstr "Visualização"
 
-#: src/skins/ui_skinselector.cc:167
+#: src/skins-qt/skinselector.cc:98 src/skins/skinselector.cc:111
 msgid "Archived Winamp 2.x skin"
 msgstr "Tema Winamp 2.x arquivado"
 
-#: src/skins/ui_skinselector.cc:172
+#: src/skins-qt/skinselector.cc:102 src/skins/skinselector.cc:115
 msgid "Unarchived Winamp 2.x skin"
 msgstr "Tema Winamp 2.x não arquivado"
 
-#: src/skins/util.cc:430
-#, c-format
-msgid "Could not create directory (%s): %s\n"
-msgstr "Não foi possível criar o diretório (%s): %s\n"
-
-#: src/sndfile/plugin.cc:39
+#: src/sndfile/plugin.cc:38
 msgid "Sndfile Plugin"
 msgstr "Plugin Sndfile"
 
-#: src/sndfile/plugin.cc:336
+#: src/sndfile/plugin.cc:372
 msgid ""
 "Based on the xmms_sndfile plugin:\n"
 "Copyright (C) 2000, 2002 Erik de Castro Lopo\n"
@@ -4001,111 +4257,119 @@
 "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
 "USA."
 
-#: src/sndio-ng/sndio.cc:44
+#: src/sndio/sndio.cc:43
 msgid "Sndio Output"
 msgstr "Saída Sndio"
 
-#: src/sndio-ng/sndio.cc:98
+#: src/sndio/sndio.cc:98
 msgid "Device (blank for default):"
 msgstr "Dispositivo (branco para o padrão):"
 
-#: src/sndio-ng/sndio.cc:100
+#: src/sndio/sndio.cc:100
 msgid "Save and restore volume:"
 msgstr "Salvar e restaurar volume:"
 
-#: src/sndio-ng/sndio.cc:181
+#: src/sndio/sndio.cc:181
 #, c-format
 msgid "Sndio error: Unsupported audio format (%d)"
 msgstr " Erro do Sndio: Formato de áudio não suportado (%d)"
 
-#: src/sndio-ng/sndio.cc:192
+#: src/sndio/sndio.cc:192
 msgid "Sndio error: sio_open() failed"
 msgstr "Erro do Sndio: sio_open() falhou"
 
-#: src/sndio-ng/sndio.cc:222
+#: src/sndio/sndio.cc:221
 msgid "Sndio error: sio_setpar() failed"
 msgstr "Erro do Sndio: sio_setpar() falhou"
 
-#: src/sndio-ng/sndio.cc:234
+#: src/sndio/sndio.cc:233
 msgid "Sndio error: sio_start() failed"
 msgstr "Erro do Sndio: sio_start() falhou"
 
-#: src/song_change/song_change.cc:33
+#: src/songchange/song_change.cc:30
 msgid "Song Change"
 msgstr "Mudança de Faixa"
 
-#: src/song_change/song_change.cc:342
-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."
-
-#: src/song_change/song_change.cc:358
+#: src/songchange/song_change.cc:256
 msgid "Commands"
 msgstr "Comandos"
 
-#: src/song_change/song_change.cc:360
+#: src/songchange/song_change.cc:258
 msgid "Command to run when starting a new song:"
 msgstr "Comando a executar ao iniciar uma nova faixa:"
 
-#: src/song_change/song_change.cc:364
+#: src/songchange/song_change.cc:261
+msgid "Command to run when stopping a song:"
+msgstr "Comando a ser executado ao parar uma música:"
+
+#: src/songchange/song_change.cc:264
 msgid "Command to run at the end of a song:"
 msgstr "Comando a executar no final de uma faixa:"
 
-#: src/song_change/song_change.cc:368
+#: src/songchange/song_change.cc:267
 msgid "Command to run at the end of the playlist:"
 msgstr "Comando a executar no final da lista de reprodução:"
 
-#: src/song_change/song_change.cc:372
+#: src/songchange/song_change.cc:270
 msgid "Command to run when song title changes (for network streams):"
 msgstr ""
 "Comando a executar ao mudar o título da faixa (para transmissões da "
 "internet):"
 
-#: src/song_change/song_change.cc:376
+#: src/songchange/song_change.cc:273
 msgid ""
-"You can use the following format strings which will be substituted before "
-"calling the command (not all are useful for the end-of-playlist command):\n"
-"\n"
-"%F: Frequency (in hertz)\n"
+"You can use the following format codes, which will be replaced before "
+"running the command.\n"
+"Not all are useful though for the song-stopped or end-of-playlist command."
+msgstr ""
+"Você pode usar os seguintes códigos de formato, que serão substituídos antes "
+"de executar o comando.\n"
+"Nem todos são úteis para o comando de parada de música ou de fim da lista de "
+"reprodução."
+
+#: src/songchange/song_change.cc:276
+msgid ""
+"%a: Artist\n"
+"%b: Album\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"
+"%F: Frequency (Hertz)\n"
+"%l: Length (milliseconds)\n"
+"%n or %s: Formatted title (see playlist settings)\n"
 "%p: Currently playing (1 or 0)\n"
-"%a: Artist\n"
-"%b: Album\n"
-"%T: Track title"
+"%r: Rate (bits per second)\n"
+"%t: Playlist position\n"
+"%T: Title (unformatted)"
 msgstr ""
-"Você pode usar os seguintes formatos de strings que serão substituídos antes "
-"de executar o comando (nem todos são úteis para o comando final-de-lista de "
-"reprodução):\n"
-"\n"
-"%F: Frequência (em hertz)\n"
-"%c: Número de canais\n"
-"%f: Nome do arquivo (localização completa)\n"
-"%l: Duração (em milisegundos)\n"
-"%n or %s: Nome da faixa\n"
-"%r: Taxa (em bits por segundo)\n"
-"%t: Posição da Lista de Reprodução (%02d)\n"
-"%p: Atualmente em reprodução (1 or 0)\n"
-"%a: Artísta\n"
+"%a: Artista\n"
 "%b: Álbum\n"
-"%T: Título da Faixa"
-
-#: src/song-info-qt/song-info.cc:32
-msgid "Song Info (Qt)"
-msgstr "Informações da Faixa (Qt)"
+"%c: Número de canais\n"
+"%f: Nome do arquivo (caminho completo)\n"
+"%F: Frequência (Hertz)\n"
+"%l: Duração (milisegundos)\n"
+"%n or %s: Título formatado (Ver configurações da lista de reprodução)\n"
+"%p: Reproduzindo atualmente (1 or 0)\n"
+"%r: Taxa (bits por segundos)\n"
+"%t: Posição da Lista de Reprodução\n"
+"%T: Título (sem formatação)"
+
+#: src/songchange/song_change.cc:287
+msgid ""
+"Parameters passed to the shell should be enclosed in quotation marks.\n"
+"Unquoted parameters may lead to unexpected results."
+msgstr ""
+"Parâmetros passados para o shell devem ser colocados entre aspas.\n"
+"Parâmetros sem aspas podem levar a resultados inesperados."
+
+#: src/song-info-qt/song-info.cc:30
+msgid "Song Info"
+msgstr "Informações da Faixa"
 
-#: src/sox-resampler/sox-resampler.cc:44
+#: src/soxr/sox-resampler.cc:44
 msgid "SoX Resampler"
 msgstr "Reamostrador SoX"
 
-#: src/sox-resampler/sox-resampler.cc:144
+#: src/soxr/sox-resampler.cc:172
 msgid ""
 "SoX Resampler Plugin for Audacious\n"
 "Copyright 2013 Michał Lipski\n"
@@ -4119,96 +4383,144 @@
 "Baseado no Plugin Conversor de Taxa de Amostragem:\n"
 "Direitos Autorais 2010-2012 John Lindgren"
 
-#: src/sox-resampler/sox-resampler.cc:150
+#: src/soxr/sox-resampler.cc:178
 msgid "Quick"
 msgstr "Rápido"
 
-#: src/sox-resampler/sox-resampler.cc:151
+#: src/soxr/sox-resampler.cc:179
 msgid "Low"
 msgstr "Baixo"
 
-#: src/sox-resampler/sox-resampler.cc:153
+#: src/soxr/sox-resampler.cc:181
 msgid "High"
 msgstr "Alto"
 
-#: src/sox-resampler/sox-resampler.cc:154
+#: src/soxr/sox-resampler.cc:182
 msgid "Very High"
 msgstr "Muito Alto"
 
-#: src/sox-resampler/sox-resampler.cc:158
+#: src/soxr/sox-resampler.cc:183
+msgid "Ultra High"
+msgstr "Máxima"
+
+#: src/soxr/sox-resampler.cc:187
+msgid "Minimum"
+msgstr "Mínima"
+
+#: src/soxr/sox-resampler.cc:188
+msgid "Intermediate"
+msgstr "Intermediária"
+
+#: src/soxr/sox-resampler.cc:193
 msgid "Quality:"
 msgstr "Qualidade:"
 
-#: src/speed-pitch/speed-pitch.cc:51
+#: src/soxr/sox-resampler.cc:196
+msgid "Phase:"
+msgstr "Fase:"
+
+#: src/soxr/sox-resampler.cc:200
+msgid "Allow aliasing"
+msgstr "Permitir apelido"
+
+#: src/soxr/sox-resampler.cc:202
+msgid "Use steep filter"
+msgstr "Usar filtro íngreme"
+
+#: src/speedpitch/speed-pitch.cc:54
 msgid "Speed and Pitch"
 msgstr "Velocidade e Tom"
 
-#: src/speed-pitch/speed-pitch.cc:210
-msgid "Speed and Pitch"
-msgstr "Velocidade e Tom"
-
-#: src/speed-pitch/speed-pitch.cc:211
-msgid "Speed:"
-msgstr "Velocidade:"
-
-#: src/speed-pitch/speed-pitch.cc:214
-msgid "Pitch:"
-msgstr "Tom:"
+#: src/speedpitch/speed-pitch.cc:247
+msgid "Speed"
+msgstr "Velocidade"
+
+#: src/speedpitch/speed-pitch.cc:248
+msgid "Decouple from pitch"
+msgstr "Dissociar do tom"
+
+#: src/speedpitch/speed-pitch.cc:250 src/speedpitch/speed-pitch.cc:258
+msgid "Multiplier:"
+msgstr "Multiplicador:"
+
+#: src/speedpitch/speed-pitch.cc:254
+msgid "Pitch"
+msgstr "Tom"
 
-#: src/statusicon/statusicon.cc:47
+#: src/statusicon-qt/statusicon.cc:45 src/statusicon/statusicon.cc:47
 msgid "Status Icon"
 msgstr "Ícone de Status"
 
-#: src/statusicon/statusicon.cc:283
-msgid "Se_ttings ..."
-msgstr "Con_figurações ..."
-
-#: src/statusicon/statusicon.cc:372
+#: src/statusicon-qt/statusicon.cc:68
 msgid ""
-"Status Icon Plugin\n"
+"Status Icon Plugin (partial port for Qt interface)\n"
 "\n"
 "Copyright 2005-2007 Giacomo Lozito <james@develia.org>\n"
 "Copyright 2010 Michał Lipski <tallica@o2.pl>\n"
+"Copyright 2015 Eugene Paskevich <eugene@raptor.kiev.ua>\n"
 "\n"
 "This plugin provides a status icon, placed in\n"
 "the system tray area of the window manager."
 msgstr ""
-"Plugin Ícone de Status\n"
+"Plugin Ícone de Status (porta parcial para interface Qt)\n"
 "\n"
-"Copyright 2005-2007 Giacomo Lozito <james@develia.org>\n"
-"Copyright 2010 Michał Lipski <tallica@o2.pl>\n"
+"Direitos Autorais 2005-2007 Giacomo Lozito <james@develia.org>\n"
+"Direitos Autorais 2010 Michał Lipski <tallica@o2.pl>\n"
+"Direitos Autorais 2015 Eugene Paskevich <eugene@raptor.kiev.ua>\n"
 "\n"
-"Esse plugin fornece um ícone de status, colocado na\n"
-"área de notificação do sistema no gerenciador de janelas."
+"Este plugin fornece um ícone de status, colocado na\n"
+"área da bandeja do sistema do gerenciador de janelas."
 
-#: src/statusicon/statusicon.cc:379
+#: src/statusicon-qt/statusicon.cc:89 src/statusicon/statusicon.cc:384
 msgid "Mouse Scroll Action"
 msgstr "Ação do Mouse no botão do meio"
 
-#: src/statusicon/statusicon.cc:380
+#: src/statusicon-qt/statusicon.cc:90 src/statusicon/statusicon.cc:385
 msgid "Change volume"
 msgstr "Alterar volume"
 
-#: src/statusicon/statusicon.cc:383
+#: src/statusicon-qt/statusicon.cc:93 src/statusicon/statusicon.cc:388
 msgid "Change playing song"
 msgstr "Mudar de faixa"
 
-#: src/statusicon/statusicon.cc:386
+#: src/statusicon-qt/statusicon.cc:96 src/statusicon/statusicon.cc:391
 msgid "Other Settings"
 msgstr "Outras Configuraçoes"
 
-#: src/statusicon/statusicon.cc:387
+#: src/statusicon-qt/statusicon.cc:97 src/statusicon/statusicon.cc:392
 msgid "Disable the popup window"
 msgstr "Desativar janelas pop-up"
 
-#: src/statusicon/statusicon.cc:389
+#: src/statusicon-qt/statusicon.cc:99 src/statusicon/statusicon.cc:394
 msgid "Close to the system tray"
 msgstr "Fechar para a bandeja do sistema"
 
-#: src/statusicon/statusicon.cc:391
+#: src/statusicon-qt/statusicon.cc:101 src/statusicon/statusicon.cc:396
 msgid "Advance in playlist when scrolling upward"
 msgstr "Avançar lista de reprodução ao rolar para cima"
 
+#: src/statusicon-qt/statusicon.cc:116 src/statusicon/statusicon.cc:287
+msgid "Se_ttings ..."
+msgstr "Con_figurações ..."
+
+#: src/statusicon/statusicon.cc:377
+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 ""
+"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/stereo_plugin/stereo.cc:19
 msgid "Extra Stereo"
 msgstr "Stereo Extra"
@@ -4227,20 +4539,160 @@
 msgid "Extra Stereo"
 msgstr "Stereo Extra"
 
+#: src/streamtuner/icecast-model.cc:126 src/streamtuner/shoutcast-model.cc:131
+msgid "Type"
+msgstr "Tipo"
+
+#: src/streamtuner/icecast-model.cc:132
+msgid "Current Song"
+msgstr "Música atual"
+
+#: src/streamtuner/icecast-model.cc:164
+msgid "Other"
+msgstr "Outro"
+
+#: src/streamtuner/ihr-model.cc:63
+msgid "Market"
+msgstr "Mercado"
+
+#: src/streamtuner/ihr-model.cc:156
+msgid "Call Letters"
+msgstr "Indicativo"
+
+#: src/streamtuner/ihr-model.cc:162
+msgid "Description"
+msgstr "Descrição"
+
+#: src/streamtuner/shoutcast-model.cc:128
+msgid "Listeners"
+msgstr "Ouvintes"
+
+#: src/streamtuner/shoutcast-model.cc:188
+msgid "Top 500 Stations"
+msgstr "Estações Top 500"
+
+#: src/streamtuner/shoutcast-model.cc:189
+msgid "Alternative"
+msgstr "Alternativa"
+
+#: src/streamtuner/shoutcast-model.cc:190
+msgid "Blues"
+msgstr "Blues"
+
+#: src/streamtuner/shoutcast-model.cc:191
+msgid "Classical"
+msgstr "Clássica"
+
+#: src/streamtuner/shoutcast-model.cc:192
+msgid "Country"
+msgstr "Country"
+
+#: src/streamtuner/shoutcast-model.cc:193
+msgid "Decades"
+msgstr "Décadas"
+
+#: src/streamtuner/shoutcast-model.cc:194
+msgid "Easy Listening"
+msgstr "Easy Listening"
+
+#: src/streamtuner/shoutcast-model.cc:195
+msgid "Electronic"
+msgstr "Eletrônica"
+
+#: src/streamtuner/shoutcast-model.cc:196
+msgid "Folk"
+msgstr "Folk"
+
+#: src/streamtuner/shoutcast-model.cc:197
+msgid "Inspirational"
+msgstr "Inspirada"
+
+#: src/streamtuner/shoutcast-model.cc:198
+msgid "International"
+msgstr "Internacional"
+
+#: src/streamtuner/shoutcast-model.cc:199
+msgid "Jazz"
+msgstr "Jazz"
+
+#: src/streamtuner/shoutcast-model.cc:200
+msgid "Latin"
+msgstr "Latina"
+
+#: src/streamtuner/shoutcast-model.cc:201
+msgid "Metal"
+msgstr "Metal"
+
+#: src/streamtuner/shoutcast-model.cc:203
+msgid "New Age"
+msgstr "New Age"
+
+#: src/streamtuner/shoutcast-model.cc:204
+msgid "Pop"
+msgstr "Pop"
+
+#: src/streamtuner/shoutcast-model.cc:205
+msgid "Public Radio"
+msgstr "Rádio Pública"
+
+#: src/streamtuner/shoutcast-model.cc:206
+msgid "R&B and Urban"
+msgstr "R&B e Urbana"
+
+#: src/streamtuner/shoutcast-model.cc:207
+msgid "Rap"
+msgstr "Rap"
+
+#: src/streamtuner/shoutcast-model.cc:208
+msgid "Reggae"
+msgstr "Reggae"
+
+#: src/streamtuner/shoutcast-model.cc:209
+msgid "Rock"
+msgstr "Rock"
+
+#: src/streamtuner/shoutcast-model.cc:210
+msgid "Seasonal and Holiday"
+msgstr "Sazonais e Férias"
+
+#: src/streamtuner/shoutcast-model.cc:211
+msgid "Soundtracks"
+msgstr "Trilhas Sonoras"
+
+#: src/streamtuner/shoutcast-model.cc:212
+msgid "Talk"
+msgstr "Talk"
+
+#: src/streamtuner/shoutcast-model.cc:213
+msgid "Themes"
+msgstr "Temas"
+
+#: src/streamtuner/streamtuner.cc:59
+msgid "Shoutcast"
+msgstr "Shoutcast"
+
+#: src/streamtuner/streamtuner.cc:60
+msgid "Icecast"
+msgstr "Icecast"
+
+#: src/streamtuner/streamtuner.cc:71
+msgid "Stream Tuner"
+msgstr "Stream Tuner"
+
 #: src/tonegen/tonegen.cc:45
 msgid "Tone Generator"
 msgstr "Gerador de Tons"
 
-#: src/tonegen/tonegen.cc:94
+#: src/tonegen/tonegen.cc:92
 #, c-format
 msgid "%s %.1f Hz"
 msgstr "%s %.1f Hz"
 
-#: src/tonegen/tonegen.cc:94
+#: src/tonegen/tonegen.cc:92
 msgid "Tone Generator: "
 msgstr "Gerador de Tons:"
 
-#: src/tonegen/tonegen.cc:160
+#: src/tonegen/tonegen.cc:161
 msgid ""
 "Sine tone generator by Håvard Kvålen <havardk@xmms.org>\n"
 "Modified by Daniel J. Peng <danielpeng@bigfoot.com>\n"
@@ -4255,11 +4707,32 @@
 "frequência3;...\n"
 "Exemplo: tone://2000;2005 para reproduzir um tom 2000 Hz e outro de 2005 Hz."
 
+#: src/ui-common/dialogs-qt.cc:40
+msgid ""
+"\n"
+"(Further messages have been hidden.)"
+msgstr ""
+"\n"
+"(Demais mensagens foram escondidas.)"
+
+#: src/ui-common/dialogs-qt.cc:52
+msgid "Working ..."
+msgstr "Processando ..."
+
+#: src/ui-common/dialogs-qt.cc:73
+msgid "Information"
+msgstr "Informação"
+
+#: src/ui-common/menu-ops-gtk.cc:132 src/ui-common/menu-ops-qt.cc:113
+#, c-format
+msgid "%s does not appear to be a valid folder."
+msgstr "%s não parece ser uma pasta válida."
+
 #: src/voice_removal/voice_removal.cc:28
 msgid "Voice Removal"
 msgstr "Remoção de voz"
 
-#: src/vorbis/vorbis.cc:465
+#: src/vorbis/vorbis.cc:433
 msgid ""
 "Audacious Ogg Vorbis Decoder\n"
 "\n"
@@ -4301,12 +4774,12 @@
 msgid "Ogg Vorbis Decoder"
 msgstr "Decodificador Ogg Vorbis"
 
-#: src/vtx/info.cc:22
+#: src/vtx/info.cc:24
 #, c-format
 msgid "Details about %s"
 msgstr "Detalhes sobre %s"
 
-#: src/vtx/info.cc:24
+#: src/vtx/info.cc:26
 msgid ""
 "Title: %t\n"
 "Author: %a\n"
@@ -4336,7 +4809,7 @@
 msgid "VTX Decoder"
 msgstr "Decodificador VTX"
 
-#: src/vtx/vtx.cc:184
+#: src/vtx/vtx.cc:178
 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"
@@ -4347,19 +4820,63 @@
 "Baseado em in_vtx.dll by Roman Sherbakov <v_soft@microfor.ru>\n"
 "Plugin Audacious por Pavel Vymetalek <pvymetalek@seznam.cz>."
 
-#: src/wavpack/wavpack.cc:24
+#: src/vumeter-qt/vumeter_qt.cc:31
+msgid ""
+"VU Meter Plugin for Audacious\n"
+"Copyright 2017-2019 Marc Sánchez Fauste"
+msgstr ""
+"Plugin Medidor de VU para Audacious\n"
+"Copyright 2017-2019 Marc Sánchez Fauste"
+
+#: src/vumeter-qt/vumeter_qt.cc:35
+msgid "VU Meter Settings"
+msgstr "Configurações do Medidor de VU"
+
+#: src/vumeter-qt/vumeter_qt.cc:37
+msgid "Peak hold time:"
+msgstr "Tempo de espera de pico:"
+
+#: src/vumeter-qt/vumeter_qt.cc:42
+msgid "Fall-off time:"
+msgstr "Tempo de queda:"
+
+#: src/vumeter-qt/vumeter_qt.cc:44
+msgid "dB/second"
+msgstr "dB/segundo"
+
+#: src/vumeter-qt/vumeter_qt.cc:46
+msgid "Display legend"
+msgstr "Mostrar legenda"
+
+#: src/vumeter-qt/vumeter_qt.h:37
+msgid "VU Meter"
+msgstr "Medidor de VU"
+
+#: src/waveout/waveout.cc:43
+msgid "Win32 waveOut"
+msgstr "Win32 waveOut"
+
+#: src/waveout/waveout.cc:69
+msgid ""
+"Win32 waveOut Plugin for Audacious\n"
+"Copyright 2016 John Lindgren"
+msgstr ""
+"Win32 waveOut Plugin para Audacious\n"
+"Copyright 2016 John Lindgren"
+
+#: src/wavpack/wavpack.cc:25
 msgid "WavPack Decoder"
 msgstr "Decodificador WavPack"
 
-#: src/wavpack/wavpack.cc:211
+#: src/wavpack/wavpack.cc:217
 msgid "lossy (hybrid)"
 msgstr "com perdas (híbrido)"
 
-#: src/wavpack/wavpack.cc:213
+#: src/wavpack/wavpack.cc:219
 msgid "lossy"
 msgstr "com perdas"
 
-#: src/wavpack/wavpack.cc:255
+#: src/wavpack/wavpack.cc:259
 msgid ""
 "Copyright 2006 William Pitcock <nenolod@nenolod.net>\n"
 "\n"
@@ -4369,18 +4886,38 @@
 "\n"
 "Parte do código do plugin foi por Miles Egan."
 
-#: src/xsf/plugin.cc:50
+#: src/xsf/plugin.cc:74
 msgid "2SF Decoder"
 msgstr "Decodificador 2SF"
 
-#: src/xsf/plugin.cc:238
+#: src/xsf/plugin.cc:429
+msgid "32728 Hz"
+msgstr "32728 Hz"
+
+#: src/xsf/plugin.cc:432
+msgid "65456 Hz"
+msgstr "65456 Hz"
+
+#: src/xsf/plugin.cc:438
+msgid "Cosine"
+msgstr "Cosseno"
+
+#: src/xsf/plugin.cc:439
+msgid "Sharp"
+msgstr "Afiado"
+
+#: src/xsf/plugin.cc:443
 msgid "XSF Configuration"
 msgstr "Configuração XSF"
 
-#: src/xsf/plugin.cc:239
-msgid "Ignore length from file"
-msgstr "Ignorar duração do arquivo"
+#: src/xsf/plugin.cc:445
+msgid "Default fade time:"
+msgstr "Tempo de desvanecimento padrão:"
+
+#: src/xsf/plugin.cc:447
+msgid "Interpolation mode:"
+msgstr "Modo de interpolação:"
 
-#: src/xspf/xspf.cc:89
+#: src/xspf/xspf.cc:95
 msgid "XML Shareable Playlists (XSPF)"
 msgstr "Lista de Reprodução Compartilhável XML (XSPF)"

audacious-plugins-3.6.2-gtk3.tar.bz2/po/pt_PT.po -> audacious-plugins-4.4.1.tar.bz2/po/pt_PT.po Changed

@@ -5,308 +5,82 @@
 # Translators:
 # Alexandro Casanova <shorterfire@gmail.com>, 2012
 # Bruno Martins <bmomartins@gmail.com>, 2011
+# Miguel Diaz Gonçalves, 2022-2023
 # Pitxyoki <Pitxyoki@gmail.com>, 2013
 # Pitxyoki <Pitxyoki@gmail.com>, 2013
-# Sérgio Marques <smarquespt@gmail.com>, 2012-2015
+# Sérgio Marques <smarquespt@gmail.com>, 2012-2018
 # Alexandro Casanova <shorterfire@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: 2015-02-28 19:18+0100\n"
-"PO-Revision-Date: 2015-02-05 13:02+0000\n"
-"Last-Translator: Sérgio Marques <smarquespt@gmail.com>\n"
-"Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/"
+"Report-Msgid-Bugs-To: https://github.com/audacious-media-player/audacious/"
+"issues\n"
+"POT-Creation-Date: 2024-09-26 21:54+0200\n"
+"PO-Revision-Date: 2011-10-10 17:43+0000\n"
+"Last-Translator: Miguel Diaz Gonçalves, 2022-2023\n"
+"Language-Team: Portuguese (Portugal) (http://app.transifex.com/audacious/"
 "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"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % "
+"1000000 == 0 ? 1 : 2;\n"
 
-#: src/aac-raw/aac.cc:18
+#: src/aac/aac.cc:19
 msgid "AAC (Raw) Decoder"
 msgstr "Descodificador AAC (RAW)"
 
-#: src/adplug/adplug-xmms.cc:42
+#: src/adplug/adplug-xmms.cc:70
 msgid "AdPlug (AdLib Player)"
 msgstr "AdPlug (Reprodutor AdLib)"
 
-#: src/adplug/adplug-xmms.cc:156 src/modplug/modplugbmp.cc:335
-#: src/psf/plugin.cc:138 src/vtx/vtx.cc:87 src/xsf/plugin.cc:113
+#: src/adplug/adplug-xmms.cc:167 src/modplug/modplugbmp.cc:321
+#: src/psf/plugin.cc:161 src/vtx/vtx.cc:89 src/xsf/plugin.cc:204
 msgid "sequenced"
 msgstr "sequencial"
 
-#: src/alarm/alarm.cc:55 src/alarm/interface.cc:82
-msgid "Alarm"
-msgstr "Alarme"
-
-#: src/alarm/alarm.cc:782
-msgid "Set Alarm ..."
-msgstr "Definir alarme..."
-
-#: src/alarm/alarm.cc:810
-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"
-"\n"
-"Versão original desenvolvida por Adam Feakin e Daniel Stodden."
-
-#: src/alarm/interface.cc: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.cc: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.cc: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.cc:81
-msgid "This is your wakeup call."
-msgstr "Este é o seu alerta."
-
-#: src/alarm/interface.cc:99
-msgid "Your reminder for today is..."
-msgstr "O seu lembrete de hoje é:"
-
-#: src/alarm/interface.cc:101 src/alarm/interface.cc:386
-msgid "Reminder"
-msgstr "Lembrete"
-
-#: src/alarm/interface.cc:132
-msgid "Monday"
-msgstr "segunda"
-
-#: src/alarm/interface.cc:132
-msgid "Tuesday"
-msgstr "terça"
-
-#: src/alarm/interface.cc:132
-msgid "Wednesday"
-msgstr "quarta"
-
-#: src/alarm/interface.cc:133
-msgid "Thursday"
-msgstr "quinta"
-
-#: src/alarm/interface.cc:133
-msgid "Friday"
-msgstr "sexta"
-
-#: src/alarm/interface.cc:133
-msgid "Saturday"
-msgstr "sábado"
-
-#: src/alarm/interface.cc:133
-msgid "Sunday"
-msgstr "domingo"
-
-#: src/alarm/interface.cc:171 src/alarm/interface.cc:230
-#: src/alarm/interface.cc:245
-msgid "Time"
-msgstr "Horário"
-
-#: src/alarm/interface.cc:178
-msgid "Alarm at (default):"
-msgstr "Alarme às (pré-definido):"
-
-#: src/alarm/interface.cc:200
-msgid "h"
-msgstr "h"
-
-#: src/alarm/interface.cc:203
-msgid "Quiet after:"
-msgstr "Silenciar após:"
-
-#: src/alarm/interface.cc:215
-msgid "hours"
-msgstr "horas"
-
-#: src/alarm/interface.cc:226
-msgid "minutes"
-msgstr "minutos"
-
-#: src/alarm/interface.cc:235
-msgid "Choose the days for the alarm to come on"
-msgstr "Escolha os dias para o alarme tocar"
+#: src/adplug/adplug-xmms.cc:349 src/sid/xs_config.cc:61
+msgid "Output"
+msgstr "Saída"
 
-#: src/alarm/interface.cc:242
-msgid "Day"
-msgstr "Dia"
+#: src/adplug/adplug-xmms.cc:350
+msgid "OPL Emulator:"
+msgstr "Emulador OPL:"
+
+#: src/adplug/adplug-xmms.cc:353 src/amidiplug/i_configure.cc:153
+#: src/console/plugin.cc:45 src/filewriter/filewriter.cc:481
+#: src/sid/xs_config.cc:65 src/xsf/plugin.cc:446
+msgid "Sample rate:"
+msgstr "Frequência:"
 
-#: src/alarm/interface.cc:259 src/bs2b/plugin.cc:130
-#: src/skins/preset-list.cc:434 src/skins/preset-list.cc:440
-msgid "Default"
-msgstr "Pré-definido"
+#: src/adplug/adplug-xmms.cc:354 src/amidiplug/i_configure.cc:155
+#: src/bs2b/plugin.cc:141 src/console/plugin.cc:47
+#: src/modplug/plugin_main.cc:77 src/resample/resample.cc:201
+#: src/resample/resample.cc:207 src/resample/resample.cc:211
+#: src/resample/resample.cc:215 src/resample/resample.cc:219
+#: src/resample/resample.cc:223 src/resample/resample.cc:227
+#: src/resample/resample.cc:231 src/resample/resample.cc:235
+#: src/resample/resample.cc:239 src/resample/resample.cc:243
+#: src/sid/xs_config.cc:67 src/soxr/sox-resampler.cc:205
+msgid "Hz"
+msgstr "Hz"
 
-#: src/alarm/interface.cc:288
-msgid "Days"
-msgstr "Dias"
-
-#: src/alarm/interface.cc:297
-msgid "Fading"
-msgstr "Desvanecimento"
-
-#: src/alarm/interface.cc:305 src/console/plugin.cc:41
-#: src/crossfade/crossfade.cc:53 src/crossfade/crossfade.cc:59
-#: src/gtkui/settings.cc:49 src/lirc/lirc.cc:397 src/sid/xs_config.cc:85
-#: src/sid/xs_config.cc:94 src/sid/xs_config.cc:103
-msgid "seconds"
-msgstr "segundos"
+#: src/adplug/adplug-xmms.cc:355 src/gtkui/settings.cc:55
+#: src/modplug/plugin_main.cc:105 src/qtui/settings.cc:85
+#: src/skins-qt/skins_cfg.cc:302 src/skins/skins_cfg.cc:284
+msgid "Miscellaneous"
+msgstr "Diversos"
 
-#: src/alarm/interface.cc:312 src/alarm/interface.cc:353
-msgid "Volume"
-msgstr "Volume"
-
-#: src/alarm/interface.cc:317
-msgid "Start at"
-msgstr "Ao iniciar"
-
-#: src/alarm/interface.cc:333
-msgid "Final"
-msgstr "Ao terminar"
-
-#: src/alarm/interface.cc:346
-msgid "Current"
-msgstr "Atual"
-
-#: src/alarm/interface.cc:359
-msgid "Additional Command"
-msgstr "Comando adicional"
-
-#: src/alarm/interface.cc:365 src/alarm/interface.cc:391
-msgid "enable"
-msgstr "ativar"
-
-#: src/alarm/interface.cc:372
-msgid "Playlist (optional)"
-msgstr "Lista de reprodução (opcional)"
-
-#: src/alarm/interface.cc:379
-msgid "Select a playlist"
-msgstr "Escolha a lista de reprodução"
-
-#: src/alarm/interface.cc:399
-msgid "Options"
-msgstr "Opções"
-
-#: src/alarm/interface.cc:404
-msgid "What do these options mean?"
-msgstr "O que significam estas opções?"
-
-#: src/alarm/interface.cc:420
-msgid "Help"
-msgstr "Ajuda"
+#: src/adplug/adplug-xmms.cc:356
+msgid "Repeat song in endless loop"
+msgstr "Repetir faixa eternamente"
 
-#: src/albumart/albumart.cc:31
+#: src/albumart/albumart.cc:31 src/albumart-qt/albumart.cc:35
 msgid "Album Art"
 msgstr "Imagem de álbum"
 
-#: src/albumart-qt/albumart.cc:33
-msgid "Album Art (Qt)"
-msgstr "Imagem do álbum (Qt)"
-
-#: src/alsa/alsa.h:70
+#: src/alsa/alsa.h:64
 msgid "ALSA Output"
 msgstr "Sistema ALSA"
 
@@ -319,7 +93,7 @@
 "code served as a reference when the ALSA manual was not enough."
 msgstr ""
 "Suplemento ALSA\n"
-"Direitos de autor 2009-2012 John Lindgren\n"
+"Copyright 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 "
@@ -349,11 +123,11 @@
 msgid "Mixer element:"
 msgstr "Elemento misturador:"
 
-#: src/amidi-plug/amidi-plug.cc:41
+#: src/amidiplug/amidi-plug.cc:42
 msgid "AMIDI-Plug (MIDI Player)"
 msgstr "AMIDI-Plug (Reprodutor MIDI)"
 
-#: src/amidi-plug/amidi-plug.cc:437
+#: src/amidiplug/amidi-plug.cc:445
 msgid ""
 "AMIDI-Plug\n"
 "modular MIDI music player\n"
@@ -395,157 +169,161 @@
 "Tony Vroon\n"
 "pela ajuda nos testes"
 
-#: src/amidi-plug/i_configure.cc:94
+#: src/amidiplug/i_configure.cc:94
 msgid "Override default gain:"
 msgstr "Substituir ganho pré-definido:"
 
-#: src/amidi-plug/i_configure.cc:102
+#: src/amidiplug/i_configure.cc:102
 msgid "Override default polyphony:"
 msgstr "Substituir polifonia pré-definido:"
 
-#: src/amidi-plug/i_configure.cc:110
+#: src/amidiplug/i_configure.cc:110
 msgid "Override default reverb:"
 msgstr "Substituir reverb pré-definido:"
 
-#: src/amidi-plug/i_configure.cc:112 src/amidi-plug/i_configure.cc:120
+#: src/amidiplug/i_configure.cc:112 src/amidiplug/i_configure.cc:120
 msgid "On"
 msgstr "Ligado"
 
-#: src/amidi-plug/i_configure.cc:118
+#: src/amidiplug/i_configure.cc:118
 msgid "Override default chorus:"
 msgstr "Substituir coro pré-definido:"
 
-#: src/amidi-plug/i_configure.cc:128 src/console/plugin.cc:29
+#: src/amidiplug/i_configure.cc:128 src/console/plugin.cc:29
 msgid "Playback"
 msgstr "Reprodução"
 
-#: src/amidi-plug/i_configure.cc:129
+#: src/amidiplug/i_configure.cc:129
 msgid "Transpose:"
 msgstr "Transposição:"
 
-#: src/amidi-plug/i_configure.cc:131
+#: src/amidiplug/i_configure.cc:131 src/speedpitch/speed-pitch.cc:257
 msgid "semitones"
 msgstr "semitons"
 
-#: src/amidi-plug/i_configure.cc:132
+#: src/amidiplug/i_configure.cc:132
 msgid "Drum shift:"
 msgstr "Drum shift:"
 
-#: src/amidi-plug/i_configure.cc:134
+#: src/amidiplug/i_configure.cc:134
 msgid "note numbers"
 msgstr "número da nota"
 
-#: src/amidi-plug/i_configure.cc:135
+#: src/amidiplug/i_configure.cc:135
 msgid "Skip leading silence"
 msgstr "Ignorar silêncio inicial"
 
-#: src/amidi-plug/i_configure.cc:137
+#: src/amidiplug/i_configure.cc:137
 msgid "Skip trailing silence"
 msgstr "Ignorar silêncio final"
 
-#: src/amidi-plug/i_configure.cc:141
+#: src/amidiplug/i_configure.cc:141
 msgid "SoundFont"
 msgstr "SoundFont"
 
-#: src/amidi-plug/i_configure.cc:143
+#: src/amidiplug/i_configure.cc:148
 msgid "Synthesizer"
 msgstr "Sintetizador"
 
-#: src/amidi-plug/i_configure.cc:148 src/console/plugin.cc:45
-#: src/sid/xs_config.cc:65
-msgid "Sample rate:"
-msgstr "Frequência:"
-
-#: src/amidi-plug/i_configure.cc:150 src/bs2b/plugin.cc:141
-#: src/console/plugin.cc:47 src/modplug/plugin_main.cc:78
-#: src/resample/resample.cc:201 src/resample/resample.cc:207
-#: src/resample/resample.cc:211 src/resample/resample.cc:215
-#: src/resample/resample.cc:219 src/resample/resample.cc:223
-#: src/resample/resample.cc:227 src/resample/resample.cc:231
-#: src/resample/resample.cc:235 src/resample/resample.cc:239
-#: src/resample/resample.cc:243 src/sid/xs_config.cc:67
-#: src/sox-resampler/sox-resampler.cc:163
-msgid "Hz"
-msgstr "Hz"
-
-#: src/amidi-plug/i_configure-fluidsynth.cc:52
+#: src/amidiplug/i_configure-fluidsynth.cc:58
+#: src/amidiplug/i_configure-fluidsynth.cc:527
 msgid "AMIDI-Plug - select SoundFont file"
 msgstr "AMIDI-Plug - selecione o ficheiro SoundFont"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:55 src/filewriter/mp3.cc:658
+#: src/amidiplug/i_configure-fluidsynth.cc:61
 msgid "_Cancel"
 msgstr "_Cancelar"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:56
+#: src/amidiplug/i_configure-fluidsynth.cc:62
 msgid "_Open"
 msgstr "_Abrir"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:225 src/gtkui/columns.cc:46
+#: src/amidiplug/i_configure-fluidsynth.cc:233
+#: src/amidiplug/i_configure-fluidsynth.cc:461
 msgid "File name"
 msgstr "Nome do ficheiro"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:229
+#: src/amidiplug/i_configure-fluidsynth.cc:237
+#: src/amidiplug/i_configure-fluidsynth.cc:464
 msgid "Size (bytes)"
 msgstr "Tamanho (bytes)"
 
-#: src/amidi-plug/i_fileinfo.cc:163
+#: src/amidiplug/i_fileinfo.cc:184
 msgid "Name:"
 msgstr "Nome:"
 
-#: src/amidi-plug/i_fileinfo.cc:181
+#: src/amidiplug/i_fileinfo.cc:202
 msgid " MIDI Info "
 msgstr "Informações MIDI"
 
-#: src/amidi-plug/i_fileinfo.cc:195
+#: src/amidiplug/i_fileinfo.cc:216
 msgid "Format:"
 msgstr "Formato:"
 
-#: src/amidi-plug/i_fileinfo.cc:198
+#: src/amidiplug/i_fileinfo.cc:219
 msgid "Length (msec):"
 msgstr "Duração (mseg):"
 
-#: src/amidi-plug/i_fileinfo.cc:201
+#: src/amidiplug/i_fileinfo.cc:222
 msgid "No. of Tracks:"
 msgstr "N.º de faixas:"
 
-#: src/amidi-plug/i_fileinfo.cc:207
+#: src/amidiplug/i_fileinfo.cc:228
 msgid "variable"
 msgstr "variável"
 
-#: src/amidi-plug/i_fileinfo.cc:209
+#: src/amidiplug/i_fileinfo.cc:230
 msgid "BPM:"
 msgstr "BPM:"
 
-#: src/amidi-plug/i_fileinfo.cc:217
+#: src/amidiplug/i_fileinfo.cc:238
 msgid "BPM (wavg):"
 msgstr "BPM (wavg):"
 
-#: src/amidi-plug/i_fileinfo.cc:220
+#: src/amidiplug/i_fileinfo.cc:241
 msgid "Time Div:"
 msgstr "Div. de tempo:"
 
-#: src/amidi-plug/i_fileinfo.cc:231
+#: src/amidiplug/i_fileinfo.cc:252
 msgid " MIDI Comments and Lyrics "
 msgstr "Comentários e letras das faixas MIDI"
 
-#: src/amidi-plug/i_fileinfo.cc:278
+#: src/amidiplug/i_fileinfo.cc:299
 msgid "* no comments available in this MIDI file *"
 msgstr "* sem comentários para este ficheiro MIDI *"
 
-#: src/amidi-plug/i_fileinfo.cc:290
+#: src/amidiplug/i_fileinfo.cc:311
 msgid "* no lyrics available in this MIDI file *"
 msgstr "* sem letra da música para este ficheiro MIDI *"
 
-#: src/amidi-plug/i_fileinfo.cc:300 src/filewriter/vorbis.cc:197
-#: src/ladspa/plugin.cc:416
+#: src/amidiplug/i_fileinfo.cc:321 src/ladspa/plugin.cc:418
+#: src/ui-common/dialogs-qt.cc:32
 msgid "_Close"
 msgstr "Fe_char"
 
-#: src/amidi-plug/i_fileinfo.cc:325
+#: src/amidiplug/i_fileinfo.cc:346
 msgid " (invalid UTF-8)"
 msgstr " (UTF-8 inválido)"
 
-#: src/aosd/aosd.cc:32
+#: src/ampache/ampache.cc:33
+msgid "Ampache Browser"
+msgstr "Explorador Ampache"
+
+#: src/ampache/ampache.cc:46
+msgid ""
+"Ampache Browser for Audacious\n"
+"http://ampache-browser.org/\n"
+"\n"
+"Copyright (C) Róbert Čerňanský and John Lindgren\n"
+"License: GNU GPLv3"
+msgstr ""
+"Explorador Ampache Browser\n"
+"http://ampache-browser.org/\n"
+"\n"
+"Copyright (C) Róbert Čerňanský e John Lindgren\n"
+"Licença: GNU GPLv3"
+
+#: src/aosd/aosd.cc:31
 msgid ""
 "Audacious OSD\n"
 "http://www.develia.org/projects.php?p=audacious#aosd\n"
@@ -579,130 +357,130 @@
 msgid "Concave Rectangle"
 msgstr "Retângulo côncavo"
 
-#: src/aosd/aosd_style.cc:69
+#: src/aosd/aosd_style.cc:69 src/openmpt/mptwrap.h:50 src/xsf/plugin.cc:436
 msgid "None"
 msgstr "Nenhum"
 
-#: src/aosd/aosd_trigger.cc:50
+#: src/aosd/aosd_trigger.cc:49
 msgid "Playback Start"
 msgstr "Ao iniciar reprodução"
 
-#: src/aosd/aosd_trigger.cc:51
+#: src/aosd/aosd_trigger.cc:50
 msgid "Triggers OSD when a playlist entry is played."
 msgstr "Ativar OSD ao reproduzir uma faixa da lista de reprodução."
 
-#: src/aosd/aosd_trigger.cc:56
+#: src/aosd/aosd_trigger.cc:55
 msgid "Title Change"
 msgstr "Ao mudar o título"
 
-#: src/aosd/aosd_trigger.cc:57
+#: src/aosd/aosd_trigger.cc:56
 msgid "Triggers OSD when the song title changes (for internet streams)."
 msgstr "Ativar OSD ao mudar o título da faixa (para emissões web)."
 
-#: src/aosd/aosd_trigger.cc:62
+#: src/aosd/aosd_trigger.cc:61
 msgid "Pause On"
 msgstr "Ao pausar"
 
-#: src/aosd/aosd_trigger.cc:63
+#: src/aosd/aosd_trigger.cc:62
 msgid "Triggers OSD when playback is paused."
 msgstr "Ativar OSD se a reprodução for colocada em pausa."
 
-#: src/aosd/aosd_trigger.cc:68
+#: src/aosd/aosd_trigger.cc:67
 msgid "Pause Off"
 msgstr "Ao retirar da pausa"
 
-#: src/aosd/aosd_trigger.cc:69
+#: src/aosd/aosd_trigger.cc:68
 msgid "Triggers OSD when playback is unpaused."
 msgstr "Ativar OSD ao retomar a reprodução."
 
-#: src/aosd/aosd_ui.cc:163
+#: src/aosd/aosd_ui.cc:204
 msgid "Placement"
 msgstr "Posicionamento"
 
-#: src/aosd/aosd_ui.cc:196
+#: src/aosd/aosd_ui.cc:241
 msgid "Relative X offset:"
 msgstr "X relativo:"
 
-#: src/aosd/aosd_ui.cc:203
+#: src/aosd/aosd_ui.cc:245
 msgid "Relative Y offset:"
 msgstr "Y relativo:"
 
-#: src/aosd/aosd_ui.cc:210
+#: src/aosd/aosd_ui.cc:249
 msgid "Max OSD width:"
 msgstr "Largura máxima do OSD:"
 
-#: src/aosd/aosd_ui.cc:221
+#: src/aosd/aosd_ui.cc:281
 msgid "Multi-Monitor options"
 msgstr "Opções de monitores múltiplos"
 
-#: src/aosd/aosd_ui.cc:225
+#: src/aosd/aosd_ui.cc:285
 msgid "Display OSD using:"
 msgstr "Mostrar OSD:"
 
-#: src/aosd/aosd_ui.cc:227
+#: src/aosd/aosd_ui.cc:287
 msgid "all monitors"
 msgstr "em todos os monitores"
 
-#: src/aosd/aosd_ui.cc:230
+#: src/aosd/aosd_ui.cc:290
 #, c-format
 msgid "monitor %i"
 msgstr "no monitor %i"
 
-#: src/aosd/aosd_ui.cc:282
+#: src/aosd/aosd_ui.cc:342
 msgid "Timing (ms)"
 msgstr "Duração (ms)"
 
-#: src/aosd/aosd_ui.cc:287
+#: src/aosd/aosd_ui.cc:347
 msgid "Display:"
 msgstr "Exibição:"
 
-#: src/aosd/aosd_ui.cc:292
+#: src/aosd/aosd_ui.cc:352
 msgid "Fade in:"
 msgstr "Aparecer gradual:"
 
-#: src/aosd/aosd_ui.cc:297
+#: src/aosd/aosd_ui.cc:357
 msgid "Fade out:"
 msgstr "Desaparecer gradual:"
 
-#: src/aosd/aosd_ui.cc:361
+#: src/aosd/aosd_ui.cc:442
 msgid "Fonts"
 msgstr "Tipo de letra"
 
-#: src/aosd/aosd_ui.cc:368
+#: src/aosd/aosd_ui.cc:449
 #, c-format
 msgid "Font %i:"
 msgstr "Tipo de letra %i:"
 
-#: src/aosd/aosd_ui.cc:382
+#: src/aosd/aosd_ui.cc:466
 msgid "Shadow"
 msgstr "Sombra"
 
-#: src/aosd/aosd_ui.cc:486
+#: src/aosd/aosd_ui.cc:589
 msgid "Render Style"
 msgstr "Estilo"
 
-#: src/aosd/aosd_ui.cc:502
+#: src/aosd/aosd_ui.cc:605
 msgid "Colors"
 msgstr "Cores"
 
-#: src/aosd/aosd_ui.cc:513
+#: src/aosd/aosd_ui.cc:616
 #, c-format
 msgid "Color %i:"
 msgstr "Cor %i:"
 
-#: src/aosd/aosd_ui.cc:600
+#: src/aosd/aosd_ui.cc:714
 msgid "Enable trigger"
 msgstr "Ativar"
 
-#: src/aosd/aosd_ui.cc:627
+#: src/aosd/aosd_ui.cc:741
 msgid "Event"
 msgstr "Evento"
 
-#: src/aosd/aosd_ui.cc:655
+#: src/aosd/aosd_ui.cc:768
 msgid "Composite manager detected"
 msgstr "Detetado um gestor de composição."
 
-#: src/aosd/aosd_ui.cc:662
+#: src/aosd/aosd_ui.cc:775
 msgid ""
 "Composite manager not detected;\n"
 "unless you know that you have one running, please activate a composite "
@@ -712,60 +490,56 @@
 "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.cc:670
+#: src/aosd/aosd_ui.cc:783
 msgid "Composite manager not required for fake transparency"
 msgstr "A transparência fictícia não precisa de um gestor de composição"
 
-#: src/aosd/aosd_ui.cc:706
+#: src/aosd/aosd_ui.cc:820
 msgid "Transparency"
 msgstr "Transparência"
 
-#: src/aosd/aosd_ui.cc:712
+#: src/aosd/aosd_ui.cc:826
 msgid "Fake transparency"
 msgstr "Transparência fictícia"
 
-#: src/aosd/aosd_ui.cc:714
+#: src/aosd/aosd_ui.cc:828
 msgid "Real transparency (requires X Composite Ext.)"
 msgstr "Transparência efetiva (requer a extensão X Composite)"
 
-#: src/aosd/aosd_ui.cc:756
+#: src/aosd/aosd_ui.cc:875
 msgid "Composite extension not loaded"
 msgstr "Extensão de composição não carregada"
 
-#: src/aosd/aosd_ui.cc:764
-msgid "Composite extension not available"
-msgstr "Extensão de composição não disponível"
-
-#: src/aosd/aosd_ui.cc:781
+#: src/aosd/aosd_ui.cc:892
 #, c-format
 msgid "Audacious OSD"
 msgstr "Audacious OSD"
 
-#: src/aosd/aosd_ui.cc:844
+#: src/aosd/aosd_ui.cc:955
 msgid "Position"
 msgstr "Posição"
 
-#: src/aosd/aosd_ui.cc:849
+#: src/aosd/aosd_ui.cc:960
 msgid "Animation"
 msgstr "Animação"
 
-#: src/aosd/aosd_ui.cc:854
+#: src/aosd/aosd_ui.cc:965
 msgid "Text"
 msgstr "Texto"
 
-#: src/aosd/aosd_ui.cc:859
+#: src/aosd/aosd_ui.cc:970
 msgid "Decoration"
 msgstr "Decoração"
 
-#: src/aosd/aosd_ui.cc:864
+#: src/aosd/aosd_ui.cc:975
 msgid "Trigger"
 msgstr "Ativador"
 
-#: src/aosd/aosd_ui.cc:869
+#: src/aosd/aosd_ui.cc:980 src/streamtuner/shoutcast-model.cc:202
 msgid "Misc"
 msgstr "Outras"
 
-#: src/aosd/aosd_ui.cc:878
+#: src/aosd/aosd_ui.cc:989
 msgid "Test"
 msgstr "Teste"
 
@@ -781,11 +555,83 @@
 msgid "Audacious Playlists (audpl)"
 msgstr "Listas de reprodução Audacious (audpl)"
 
-#: src/blur_scope/blur_scope.cc:42
+#: src/background_music/background_music.cc:24
+msgid "Background music"
+msgstr ""
+
+#: src/background_music/background_music.cc:25
+msgid "Target level:"
+msgstr ""
+
+#: src/background_music/background_music.cc:28
+#: src/background_music/background_music.cc:33
+#: src/silence-removal/silence-removal.cc:70
+msgid "dB"
+msgstr "dB"
+
+#: src/background_music/background_music.cc:29
+msgid "Maximum amplification:"
+msgstr ""
+
+#: src/background_music/background_music.cc:34 src/mpg123/mpg123.cc:81
+msgid "Advanced"
+msgstr "Avançado"
+
+#: src/background_music/background_music.cc:36
+msgid "Slow detection weight:"
+msgstr ""
+
+#: src/background_music/background_music.cc:39
+msgid "Hint"
+msgstr ""
+
+#: src/background_music/background_music.cc:41
+msgid ""
+"Slow detection weight is the relative weight\n"
+"of a long term average detection when compared\n"
+"to the actual, faster loudness detection.\n"
+"A value of zero gives a more radio-like sound\n"
+"where soft passages get \"pulled up\" more quickly,\n"
+"a value of two makes the sound feel less compressed."
+msgstr ""
+
+#: src/background_music/background_music.cc:52
+msgid ""
+"Background Music Plugin for Audacious\n"
+"Copyright 2023;2024 Michel Fleur\n"
+"\n"
+"Controls the volume to make the sound equally loud within and between "
+"tracks.\n"
+" It uses accurate loudness measurement and tries to make the volume changes "
+"sound natural without audible peaks, yet without lowering the volume before "
+"a peak in advance."
+msgstr ""
+
+#: src/background_music/background_music.cc:61
+msgid "Background Music"
+msgstr ""
+
+#: src/bitcrusher/bitcrusher.cc:33
+msgid "Bitcrusher"
+msgstr "Bitcrusher"
+
+#: src/bitcrusher/bitcrusher.cc:34
+msgid "Bit Depth:"
+msgstr "Profundidade de bits:"
+
+#: src/bitcrusher/bitcrusher.cc:37
+msgid "Downsample ratio:"
+msgstr "Rácio de redução da amostra:"
+
+#: src/bitcrusher/bitcrusher.cc:48
+msgid "Bitcrusher"
+msgstr "Bitcrusher"
+
+#: src/blur_scope/blur_scope.cc:40 src/blur_scope-qt/blur_scope.cc:45
 msgid "Color"
 msgstr "Cor"
 
-#: src/blur_scope/blur_scope.cc:58
+#: src/blur_scope/blur_scope.cc:56 src/blur_scope-qt/blur_scope.cc:158
 msgid "Blur Scope"
 msgstr "Blur Scope"
 
@@ -797,6 +643,10 @@
 msgid "Presets:"
 msgstr "Pré-ajuste:"
 
+#: src/bs2b/plugin.cc:130
+msgid "Default"
+msgstr "Pré-definido"
+
 #: src/bs2b/plugin.cc:136
 msgid "Feed level:"
 msgstr "Nível:"
@@ -809,15 +659,15 @@
 msgid "Cut frequency:"
 msgstr "Frequência de corte:"
 
-#: src/cairo-spectrum/cairo-spectrum.cc:41
+#: src/cairo-spectrum/cairo-spectrum.cc:42 src/qt-spectrum/qt-spectrum.cc:107
 msgid "Spectrum Analyzer"
 msgstr "Analisador de espetro"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:72
+#: src/cdaudio/cdaudio-ng.cc:74
 msgid "Audio CD Plugin"
 msgstr "Suplemento Áudio CD"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:121
+#: src/cdaudio/cdaudio-ng.cc:121
 msgid ""
 "Copyright (C) 2007-2012 Calin Crisan <ccrisan@gmail.com> and others.\n"
 "\n"
@@ -828,7 +678,7 @@
 "\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"
+"Copyright (C) 2007-2012 Calin Crisan <ccrisan@gmail.com> e outros.\n"
 "\n"
 "O meu obrigado aos programadores da libcdio <http://www.gnu.org/software/"
 "libcdio/>\n"
@@ -838,132 +688,132 @@
 "\n"
 "Este foi um projeto do Google Summer of Code 2007."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:137
+#: src/cdaudio/cdaudio-ng.cc:140
 msgid "Device"
 msgstr "Dispositivo"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:138
+#: src/cdaudio/cdaudio-ng.cc:141
 msgid "Read speed:"
 msgstr "Velocidade de leitura:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:141
+#: src/cdaudio/cdaudio-ng.cc:144
 msgid "Override device:"
 msgstr "Sobrepor dispositivo:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:143
+#: src/cdaudio/cdaudio-ng.cc:146
 msgid "Metadata"
 msgstr "Detalhes"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:144
+#: src/cdaudio/cdaudio-ng.cc:147
 msgid "Use CD-Text"
 msgstr "Utilizar CD-Text"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:146
+#: src/cdaudio/cdaudio-ng.cc:150
 msgid "Use CDDB"
 msgstr "Utilizar CDDB"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:148
+#: src/cdaudio/cdaudio-ng.cc:152
 msgid "Use HTTP instead of CDDBP"
 msgstr "Utilizar HTTP em vez de CDDBP"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:151
+#: src/cdaudio/cdaudio-ng.cc:155
 msgid "Server:"
 msgstr "Servidor:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:155
+#: src/cdaudio/cdaudio-ng.cc:159
 msgid "Path:"
 msgstr "Caminho:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:159
+#: src/cdaudio/cdaudio-ng.cc:163
 msgid "Port:"
 msgstr "Porta:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:246
+#: src/cdaudio/cdaudio-ng.cc:228
 msgid "Failed to initialize cdio subsystem."
 msgstr "Ocorreu um erro ao iniciar o sistema cdio."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:281
+#: src/cdaudio/cdaudio-ng.cc:260
 #, c-format
 msgid "Invalid URI %s."
 msgstr "URI %s inválido."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:283
+#: src/cdaudio/cdaudio-ng.cc:262
 #, c-format
 msgid "Track %d not found."
 msgstr "Faixa %d não encontrada."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:285
+#: src/cdaudio/cdaudio-ng.cc:264
 #, c-format
 msgid "Track %d is a data track."
 msgstr "A faixa %d é uma faixa de dados."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:360
+#: src/cdaudio/cdaudio-ng.cc:339
 msgid "Error reading audio CD."
 msgstr "Ocorreu um erro ao ler o CD."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:429
+#: src/cdaudio/cdaudio-ng.cc:410
 msgid "Audio CD"
 msgstr "CD áudio"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:460 src/cdaudio-ng/cdaudio-ng.cc:469
+#: src/cdaudio/cdaudio-ng.cc:446 src/cdaudio/cdaudio-ng.cc:455
 #, c-format
 msgid "Failed to open CD device %s."
 msgstr "Ocorreu um erro ao abrir o dispositivo %s."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:472
+#: src/cdaudio/cdaudio-ng.cc:458
 msgid "No audio capable CD drive found."
 msgstr "Não foi encontrada uma unidade de CD."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:497
+#: src/cdaudio/cdaudio-ng.cc:481
+msgid "Drive is empty."
+msgstr "Unidade vazia."
+
+#: src/cdaudio/cdaudio-ng.cc:483
+msgid "Unsupported disk type."
+msgstr "Tipo de disco não suportado."
+
+#: src/cdaudio/cdaudio-ng.cc:507
 msgid "Failed to finish initializing opened CD drive."
 msgstr "Ocorreu um erro ao iniciar a unidade de CD."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:510
+#: src/cdaudio/cdaudio-ng.cc:520
 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.cc:531
+#: src/cdaudio/cdaudio-ng.cc:541
 #, 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.cc:613
-msgid "Failed to create the cddb connection."
-msgstr "Ocorreu um erro ao criar a ligação à cddb."
+#: src/cdaudio/cdaudio-ng.cc:624
+msgid "Failed to create the CDDB connection."
+msgstr "Falha ao estabelecer a ligação à CDDB."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:679
+#: src/cdaudio/cdaudio-ng.cc:690
 msgid "Failed to query the CDDB server"
 msgstr "Ocorreu um erro ao consultar o servidor cddb."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:681
+#: src/cdaudio/cdaudio-ng.cc:692
 #, 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.cc:705
+#: src/cdaudio/cdaudio-ng.cc:716
 #, 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.cc:765
-msgid "Drive is empty."
-msgstr "Unidade vazia."
+msgid "Failed to read the CDDB info: %s"
+msgstr "Falha ao ler as informações CDDB: %s"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:767
-msgid "Unsupported disk type."
-msgstr "Tipo de disco não suportado."
-
-#: src/cd-menu-items/cd-menu-items.cc:35
+#: src/cd-menu-items/cd-menu-items.cc:33
 msgid "Audio CD Menu Items"
 msgstr "Itens de menu do Áudio CD"
 
-#: src/cd-menu-items/cd-menu-items.cc:47
-msgid "Play CD"
-msgstr "Reproduzir CD"
-
-#: src/cd-menu-items/cd-menu-items.cc:47
-msgid "Add CD"
-msgstr "Adicionar CD"
+#: src/cd-menu-items/cd-menu-items.cc:45
+msgid "Pla_y CD"
+msgstr "Repro_duzir CD"
+
+#: src/cd-menu-items/cd-menu-items.cc:45
+msgid "_Add CD"
+msgstr "_Adicionar CD"
 
 #: src/compressor/compressor.cc:45
 msgid "Compression"
@@ -983,7 +833,7 @@
 "Copyright 2010-2014 John Lindgren"
 msgstr ""
 "Suplemento Dynamic Range Compression\n"
-"Direitos de autor 2010-2014 John Lindgren"
+"Copyright 2010-2014 John Lindgren"
 
 #: src/compressor/compressor.cc:64
 msgid "Dynamic Range Compressor"
@@ -1021,7 +871,14 @@
 msgid "Default song length:"
 msgstr "Duração pré-definida da faixa:"
 
-#: src/console/plugin.cc:42 src/modplug/plugin_main.cc:59
+#: src/console/plugin.cc:41 src/crossfade/crossfade.cc:56
+#: src/crossfade/crossfade.cc:62 src/lirc/lirc.cc:395 src/notify/notify.cc:113
+#: src/sid/xs_config.cc:85 src/sid/xs_config.cc:94 src/sid/xs_config.cc:103
+#: src/vumeter-qt/vumeter_qt.cc:39
+msgid "seconds"
+msgstr "segundos"
+
+#: src/console/plugin.cc:42 src/modplug/plugin_main.cc:58
 msgid "Resampling"
 msgstr "Remistura"
 
@@ -1045,57 +902,83 @@
 msgid "Game Console Music Decoder"
 msgstr "Descodificador Game Console Music"
 
-#: src/coreaudio/coreaudio.cc:50
+#: src/coreaudio/coreaudio.cc:53
 msgid "CoreAudio output"
 msgstr "Suplemento CoreAudio"
 
-#: src/coreaudio/coreaudio.cc:131
+#: src/coreaudio/coreaudio.cc:155
 msgid ""
 "CoreAudio Output Plugin for Audacious\n"
 "Copyright 2014 William Pitcock\n"
+"Copyright 2017,18 René J.V. Bertin\n"
+" (original code and code adapted from\n"
+" Apple examples, (C) Apple 2013)\n"
 "\n"
 "Based on SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
 msgstr ""
 "Suplemento CoreAudio Output\n"
-"Direitos de autor 2014 William Pitcock\n"
+"Copyright 2014 William Pitcock\n"
+"Copyright 2017,18 René J.V. Bertin\n"
+"(código original e adaptação de\n"
+"exemplos Apple, (C) Apple 2013)\n"
 "\n"
 "Baseado no suplemento SDL Output\n"
-"Direitos de autor 2010 John Lindgren"
+"Copyright 2010 John Lindgren"
 
-#: src/coreaudio/coreaudio.cc:143
+#: src/coreaudio/coreaudio.cc:171
 msgid "Use exclusive mode"
 msgstr "Usar modo exclusivo"
 
-#: src/crossfade/crossfade.cc:44
+#: src/coreaudio/coreaudio.cc:173
+msgid "Use bit perfect audio (adapt device sampling rate)"
+msgstr "Utilizar áudio 'bit perfect' (ajustar frequência do dispositivo)"
+
+#: src/crossfade/crossfade.cc:47
 msgid ""
 "Crossfade Plugin for Audacious\n"
 "Copyright 2010-2014 John Lindgren"
 msgstr ""
 "Suplemento Crossfade\n"
-"Direitos de autor 2010-2014 John Lindgren"
+"Copyright 2010-2014 John Lindgren"
 
-#: src/crossfade/crossfade.cc:48
+#: src/crossfade/crossfade.cc:51
 msgid "Crossfade"
 msgstr "Sobreposição"
 
-#: src/crossfade/crossfade.cc:49
+#: src/crossfade/crossfade.cc:52
 msgid "On automatic song change"
 msgstr "Ao mudar automaticamente de faixa"
 
-#: src/crossfade/crossfade.cc:51 src/crossfade/crossfade.cc:57
+#: src/crossfade/crossfade.cc:54 src/crossfade/crossfade.cc:60
 msgid "Overlap:"
 msgstr "Sobreposição:"
 
-#: src/crossfade/crossfade.cc:55
+#: src/crossfade/crossfade.cc:58
 msgid "On seek or manual song change"
 msgstr "Ao procurar ou mudar manualmente a faixa"
 
-#: src/crossfade/crossfade.cc:61
+#: src/crossfade/crossfade.cc:64
+msgid "No fade in"
+msgstr ""
+
+#: src/crossfade/crossfade.cc:66
+msgid "Use S-curve fade"
+msgstr ""
+
+#: src/crossfade/crossfade.cc:68
+msgid "S-curve steepness:"
+msgstr ""
+
+#: src/crossfade/crossfade.cc:70
+msgid "(higher is steeper)"
+msgstr ""
+
+#: src/crossfade/crossfade.cc:72
 msgid "Tip"
 msgstr "Dica"
 
-#: src/crossfade/crossfade.cc:62
+#: src/crossfade/crossfade.cc:73
 msgid ""
 "For better crossfading, enable\n"
 "the Silence Removal effect."
@@ -1103,28 +986,10 @@
 "Para um melhor desempenho, ative\n"
 "o efeito Remoção de silêncio."
 
-#: src/crossfade/crossfade.cc:72
+#: src/crossfade/crossfade.cc:83
 msgid "Crossfade"
 msgstr "Sobreposição"
 
-#: src/crossfade/crossfade.cc:161
-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."
-
-#: src/crossfade/crossfade.cc:168
-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."
-
 #: src/crystalizer/crystalizer.cc:31
 msgid "Crystalizer"
 msgstr "Cristalizador"
@@ -1137,60 +1002,61 @@
 msgid "Crystalizer"
 msgstr "Cristalizador"
 
-#: src/cue/cue.cc:37
+#: src/cue/cue.cc:42
 msgid "Cue Sheet Plugin"
 msgstr "Suplemento Cue Sheet"
 
-#: src/delete-files/delete-files.cc:46 src/delete-files/delete-files.cc:146
+#: src/delete-files/delete-files.cc:53 src/delete-files/delete-files.cc:215
+#: src/delete-files/delete-files.cc:230
 msgid "Delete Files"
 msgstr "Eliminar ficheiros"
 
-#: src/delete-files/delete-files.cc:75
+#: src/delete-files/delete-files.cc:120
+msgid "No files are selected."
+msgstr "Nenhum ficheiro selecionado."
+
+#: src/delete-files/delete-files.cc:125
 #, c-format
-msgid "Error moving %s to trash: %s."
-msgstr "Erro ao mover %s para o lixo: %s"
+msgid "Do you want to move %s to the trash?"
+msgstr "Deseja mover %s para o lixo?"
 
-#: src/delete-files/delete-files.cc:86
+#: src/delete-files/delete-files.cc:126
 #, c-format
-msgid "Error deleting %s: %s."
-msgstr "Erro ao eliminar %s: %s"
+msgid "Do you want to permanently delete %s?"
+msgstr "Deseja eliminar \"%s\" permanentemente?"
 
-#: src/delete-files/delete-files.cc:117
+#: src/delete-files/delete-files.cc:133
 #, c-format
-msgid "Error deleting %s: not a local file."
-msgstr "Erro ao eliminar %s: não é ficheiro local"
+msgid "Do you want to move %d files to the trash?"
+msgstr "Deseja mover %d ficheiros para o lixo?"
 
 #: src/delete-files/delete-files.cc:134
-msgid "Do you want to move the selected files to the trash?"
-msgstr "Pretende mover os ficheiros selecionados para o lixo?"
+#, c-format
+msgid "Do you want to permanently delete %d files?"
+msgstr "Deseja eliminar %d ficheiros permanentemente?"
 
-#: src/delete-files/delete-files.cc:135
-msgid "Move to Trash"
+#: src/delete-files/delete-files.cc:146
+msgid "Move to trash"
 msgstr "Mover para o lixo"
 
-#: src/delete-files/delete-files.cc:140
-msgid "Do you want to permanently delete the selected files?"
-msgstr "Pretende eliminar permanentemente os ficheiros selecionados?"
-
-#: src/delete-files/delete-files.cc:141 src/skins/preset-list.cc:411
-#: src/skins/preset-list.cc:427
+#: src/delete-files/delete-files.cc:146
 msgid "Delete"
 msgstr "Eliminar"
 
-#: src/delete-files/delete-files.cc:145 src/skins/preset-browser.cc:56
-#: src/skins/preset-list.cc:307 src/skins/ui_playlist.cc:221
+#: src/delete-files/delete-files.cc:213 src/delete-files/delete-files.cc:235
+#: src/skins-qt/search-select.cc:102 src/skins/search-select.cc:78
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: src/delete-files/delete-files.cc:166
+#: src/delete-files/delete-files.cc:267
 msgid "Delete Selected Files"
 msgstr "Eliminar ficheiros selecionados"
 
-#: src/delete-files/delete-files.cc:181
+#: src/delete-files/delete-files.cc:287
 msgid "Delete Method"
 msgstr "Método de eliminação"
 
-#: src/delete-files/delete-files.cc:182
+#: src/delete-files/delete-files.cc:288
 msgid "Move to trash instead of deleting immediately"
 msgstr "Mover para o lixo em vez de os eliminar"
 
@@ -1210,13 +1076,13 @@
 msgid "Echo"
 msgstr "Eco"
 
-#: src/echo_plugin/echo.cc:22 src/modplug/plugin_main.cc:73
-#: src/modplug/plugin_main.cc:83
+#: src/echo_plugin/echo.cc:22 src/modplug/plugin_main.cc:72
+#: src/modplug/plugin_main.cc:82
 msgid "Delay:"
 msgstr "Atraso:"
 
-#: src/echo_plugin/echo.cc:24 src/modplug/plugin_main.cc:73
-#: src/modplug/plugin_main.cc:83
+#: src/echo_plugin/echo.cc:24 src/modplug/plugin_main.cc:72
+#: src/modplug/plugin_main.cc:82 src/xsf/plugin.cc:445
 msgid "ms"
 msgstr "ms"
 
@@ -1224,7 +1090,7 @@
 msgid "Feedback:"
 msgstr "Retorno:"
 
-#: src/echo_plugin/echo.cc:28 src/modplug/plugin_main.cc:87
+#: src/echo_plugin/echo.cc:28 src/modplug/plugin_main.cc:86
 msgid "Volume:"
 msgstr "Volume:"
 
@@ -1232,11 +1098,11 @@
 msgid "Echo"
 msgstr "Eco"
 
-#: src/ffaudio/ffaudio-core.cc:41
+#: src/ffaudio/ffaudio-core.cc:50
 msgid "FFmpeg Plugin"
 msgstr "Suplemento FFmpeg"
 
-#: src/ffaudio/ffaudio-core.cc:571
+#: src/ffaudio/ffaudio-core.cc:649
 msgid ""
 "Multi-format audio decoding plugin for Audacious using\n"
 "FFmpeg multimedia framework (http://www.ffmpeg.org/)\n"
@@ -1251,249 +1117,321 @@
 "William Pitcock <nenolod@nenolod.net>\n"
 "Matti Hämäläinen <ccr@tnsp.org>"
 
-#: src/filewriter/filewriter.cc:45
+#: src/filewriter/filewriter.cc:48
 msgid "FileWriter Plugin"
 msgstr "Suplemento FileWriter"
 
-#: src/filewriter/filewriter.cc:386
+#: src/filewriter/filewriter.cc:316
+#, c-format
+msgid ""
+"Error opening %s:\n"
+"%s"
+msgstr ""
+"Erro ao abrir %s:\n"
+"%s"
+
+#: src/filewriter/filewriter.cc:358
+msgid ""
+"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 ""
+"Este suplemento é um programa livre. Pode redistribui-lo e/ou modificá-lonos "
+"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 com o programa. Se "
+"tal não aconteceu, escreva uma carta para Free Software Foundation, Inc., 51 "
+"Franklin Street, Fifth Floor\n"
+"Boston, MA 02110-1301, USA."
+
+#: src/filewriter/filewriter.cc:385
 msgid "Output file format:"
 msgstr "Formato de saída:"
 
-#: src/filewriter/filewriter.cc:403
-msgid "Configure"
-msgstr "Configurar"
-
-#: src/filewriter/filewriter.cc:413
+#: src/filewriter/filewriter.cc:389
 msgid "Save into original directory"
-msgstr "Gravar no diretório original"
-
-#: src/filewriter/filewriter.cc:417
-msgid "Save into custom directory"
-msgstr "Gravar num diretório personalizado"
-
-#: src/filewriter/filewriter.cc:427
-msgid "Output file folder:"
-msgstr "Pasta de destino:"
+msgstr "Guardar no diretório original"
 
-#: src/filewriter/filewriter.cc:431
-msgid "Pick a folder"
-msgstr "Escolha a pasta"
+#: src/filewriter/filewriter.cc:392
+msgid "Save into custom directory:"
+msgstr "Guardar num diretório personalizado:"
 
-#: src/filewriter/filewriter.cc:444
+#: src/filewriter/filewriter.cc:400
 msgid "Generate file name from:"
 msgstr "Gerar nome de ficheiro de:"
 
-#: src/filewriter/filewriter.cc:448
-msgid "Original file tag"
-msgstr "Etiqueta orifinal"
-
-#: src/filewriter/filewriter.cc:453
+#: src/filewriter/filewriter.cc:401
 msgid "Original file name"
 msgstr "Nome de ficheiro original"
 
-#: src/filewriter/filewriter.cc:459
-msgid "Include original file name extension"
-msgstr "Incluir extensão de ficheiro original"
+#: src/filewriter/filewriter.cc:404
+msgid "Original file name (no suffix)"
+msgstr "Nome de ficheiro original (sem sufixo)"
 
-#: src/filewriter/filewriter.cc:468
+#: src/filewriter/filewriter.cc:407
+msgid "Original file tag"
+msgstr "Etiqueta orifinal"
+
+#: src/filewriter/filewriter.cc:411
 msgid "Prepend track number to file name"
 msgstr "Adicionar número de faixa ao nome do ficheiro"
 
-#: src/filewriter/filewriter.cc:484
-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 ""
-"Este suplemento é um programa livre. Pode redistribui-lo e/ou modificá-lo\n"
-"nos termos da GNU General Public License, tal como publicada pela\n"
-"Free Software Foundation, tanto na versão 3 ou (por opção)\n"
-"qualquer versão mais recente.\n"
-"\n"
-"Este programa é disponibilizado com o intuito de ser útil mas\n"
-"NÃO POSSUI QUALQUER GARANTIA. Nem mesmo a garantia implícita\n"
-"de comercialização ou adequação a um propósito concreto.\n"
-"Consulte a GNU General Public License para mais detalhes.\n"
-"\n"
-"Deve ter recebido uma cópia da GNU General Public License\n"
-"com o programa. Se tal não aconteceu, escreva uma carta para\n"
-"Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor\n"
-"Boston, MA 02110-1301, USA."
-
-#: src/filewriter/mp3.cc:40 src/filewriter/mp3.cc:717
+#: src/filewriter/filewriter.cc:417 src/filewriter/filewriter.cc:449
 msgid "Auto"
 msgstr "Automático"
 
-#: src/filewriter/mp3.cc:40
+#: src/filewriter/filewriter.cc:418
+msgid "8000 Hz"
+msgstr "8000 Hz"
+
+#: src/filewriter/filewriter.cc:419
+msgid "11025 Hz"
+msgstr "11 025 Hz"
+
+#: src/filewriter/filewriter.cc:420
+msgid "12000 Hz"
+msgstr "12 000 Hz"
+
+#: src/filewriter/filewriter.cc:421
+msgid "16000 Hz"
+msgstr "16 000 Hz"
+
+#: src/filewriter/filewriter.cc:422
+msgid "22050 Hz"
+msgstr "22 050 Hz"
+
+#: src/filewriter/filewriter.cc:423
+msgid "24000 Hz"
+msgstr "24 000 Hz"
+
+#: src/filewriter/filewriter.cc:424
+msgid "32000 Hz"
+msgstr "32 000 Hz"
+
+#: src/filewriter/filewriter.cc:425 src/xsf/plugin.cc:430
+msgid "44100 Hz"
+msgstr "44 100 Hz"
+
+#: src/filewriter/filewriter.cc:426 src/xsf/plugin.cc:431
+msgid "48000 Hz"
+msgstr "48 000 Hz"
+
+#: src/filewriter/filewriter.cc:430
+msgid "8 kbit/s"
+msgstr "8 kbit/s"
+
+#: src/filewriter/filewriter.cc:431
+msgid "16 kbit/s"
+msgstr "16 kbit/s"
+
+#: src/filewriter/filewriter.cc:432
+msgid "32 kbit/s"
+msgstr "32 kbit/s"
+
+#: src/filewriter/filewriter.cc:433
+msgid "40 kbit/s"
+msgstr "40 kbit/s"
+
+#: src/filewriter/filewriter.cc:434
+msgid "48 kbit/s"
+msgstr "48 kbit/s"
+
+#: src/filewriter/filewriter.cc:435
+msgid "56 kbit/s"
+msgstr "56 kbit/s"
+
+#: src/filewriter/filewriter.cc:436
+msgid "64 kbit/s"
+msgstr "64 kbit/s"
+
+#: src/filewriter/filewriter.cc:437
+msgid "80 kbit/s"
+msgstr "80 kbit/s"
+
+#: src/filewriter/filewriter.cc:438
+msgid "96 kbit/s"
+msgstr "96 kbit/s"
+
+#: src/filewriter/filewriter.cc:439
+msgid "112 kbit/s"
+msgstr "112 kbit/s"
+
+#: src/filewriter/filewriter.cc:440
+msgid "128 kbit/s"
+msgstr "128 kbit/s"
+
+#: src/filewriter/filewriter.cc:441
+msgid "160 kbit/s"
+msgstr "160 kbit/s"
+
+#: src/filewriter/filewriter.cc:442
+msgid "192 kbit/s"
+msgstr "192 kbit/s"
+
+#: src/filewriter/filewriter.cc:443
+msgid "224 kbit/s"
+msgstr "224 kbit/s"
+
+#: src/filewriter/filewriter.cc:444
+msgid "256 kbit/s"
+msgstr "256 kbit/s"
+
+#: src/filewriter/filewriter.cc:445
+msgid "320 kbit/s"
+msgstr "320 kbit/s"
+
+#: src/filewriter/filewriter.cc:450
 msgid "Joint Stereo"
 msgstr "Joint estéreo"
 
-#: src/filewriter/mp3.cc:41 src/modplug/plugin_main.cc:58
-#: src/mpg123/mpg123.cc:248
+#: src/filewriter/filewriter.cc:451 src/modplug/plugin_main.cc:57
+#: src/mpg123/mpg123.cc:259
 msgid "Stereo"
 msgstr "Estéreo"
 
-#: src/filewriter/mp3.cc:41 src/modplug/plugin_main.cc:57
-#: src/mpg123/mpg123.cc:248
+#: src/filewriter/filewriter.cc:452 src/modplug/plugin_main.cc:56
+#: src/mpg123/mpg123.cc:260
 msgid "Mono"
 msgstr "Mono"
 
-#: src/filewriter/mp3.cc:657
-msgid "MP3 Configuration"
-msgstr "Definições MP3"
-
-#: src/filewriter/mp3.cc:658
-msgid "_OK"
-msgstr "_Aceitar"
+#: src/filewriter/filewriter.cc:456
+msgid "VBR"
+msgstr "VBR"
+
+#: src/filewriter/filewriter.cc:457
+msgid "ABR"
+msgstr "ABR"
 
-#: src/filewriter/mp3.cc:681
-msgid "Algorithm Quality:"
+#: src/filewriter/filewriter.cc:478
+msgid "Algorithm quality:"
 msgstr "Qualidade do algoritmo:"
 
-#: src/filewriter/mp3.cc:706
-msgid "Output Sample Rate:"
-msgstr "Frequência de saída:"
-
-#: src/filewriter/mp3.cc:733
-msgid "(Hz)"
-msgstr "(Hz)"
-
-#: src/filewriter/mp3.cc:740
-msgid "Bitrate / Compression Ratio:"
-msgstr "Taxa de dados/compressão:"
-
-#: src/filewriter/mp3.cc:764
-msgid "Bitrate (kbps):"
-msgstr "Taxa de dados (kbps):"
+#: src/filewriter/filewriter.cc:484
+msgid "Bitrate:"
+msgstr "Taxa de dados:"
 
-#: src/filewriter/mp3.cc:796
+#: src/filewriter/filewriter.cc:491
 msgid "Compression ratio:"
 msgstr "Rácio de compressão:"
 
-#: src/filewriter/mp3.cc:820
-msgid "Audio Mode:"
-msgstr "Modo áudio:"
-
-#: src/filewriter/mp3.cc:845
-msgid "Miscellaneous:"
-msgstr "Diversos"
+#: src/filewriter/filewriter.cc:498
+msgid "Audio mode:"
+msgstr "Modo de áudio:"
 
-#: src/filewriter/mp3.cc:856
+#: src/filewriter/filewriter.cc:501
 msgid "Enforce strict ISO compliance"
 msgstr "Forçar conformidade ISO"
 
-#: src/filewriter/mp3.cc:867
+#: src/filewriter/filewriter.cc:503
 msgid "Error protection"
 msgstr "Proteção de erros"
 
-#: src/filewriter/mp3.cc:879 src/filewriter/vorbis.cc:206
-msgid "Quality"
-msgstr "Qualidade"
-
-#: src/filewriter/mp3.cc:888
+#: src/filewriter/filewriter.cc:508
 msgid "Enable VBR/ABR"
 msgstr "Ativar VBR/ABR"
 
-#: src/filewriter/mp3.cc:898
+#: src/filewriter/filewriter.cc:510
 msgid "Type:"
 msgstr "Tipo:"
 
-#: src/filewriter/mp3.cc:931
-msgid "VBR Options:"
-msgstr "Opções VBR:"
-
-#: src/filewriter/mp3.cc:947
-msgid "Minimum bitrate (kbps):"
-msgstr "Taxa mínima (kbps):"
-
-#: src/filewriter/mp3.cc:973
-msgid "Maximum bitrate (kbps):"
-msgstr "Taxa máxima (kbps):"
+#: src/filewriter/filewriter.cc:514
+msgid "Minimum bitrate:"
+msgstr "Taxa mínima:"
+
+#: src/filewriter/filewriter.cc:518
+msgid "Maximum bitrate:"
+msgstr "Taxa máxima:"
+
+#: src/filewriter/filewriter.cc:522
+msgid "Average bitrate:"
+msgstr "Taxa média:"
 
-#: src/filewriter/mp3.cc:995
-msgid "Strictly enforce minimum bitrate"
-msgstr "Forçar taxa de dados mínima"
-
-#: src/filewriter/mp3.cc:1007
-msgid "ABR Options:"
-msgstr "Opções ABR:"
-
-#: src/filewriter/mp3.cc:1017
-msgid "Average bitrate (kbps):"
-msgstr "Taxa média (kbps):"
-
-#: src/filewriter/mp3.cc:1044
+#: src/filewriter/filewriter.cc:526
 msgid "VBR quality level:"
 msgstr "Qualidade VBR:"
 
-#: src/filewriter/mp3.cc:1063
+#: src/filewriter/filewriter.cc:530
+msgid "Strictly enforce minimum bitrate"
+msgstr "Forçar taxa de dados mínima"
+
+#: src/filewriter/filewriter.cc:533
 msgid "Omit Xing VBR header"
 msgstr "Omitir cabeçalho Xing VBR"
 
-#: src/filewriter/mp3.cc:1076
-msgid "VBR/ABR"
-msgstr "VBR/ABR"
+#: src/filewriter/filewriter.cc:539
+msgid "Frame Headers"
+msgstr "Cabeçalhos"
 
-#: src/filewriter/mp3.cc:1085
-msgid "Frame Parameters:"
-msgstr "Parâmetros:"
-
-#: src/filewriter/mp3.cc:1097
+#: src/filewriter/filewriter.cc:540
 msgid "Mark as copyright"
 msgstr "Marcar como copyright"
 
-#: src/filewriter/mp3.cc:1108
+#: src/filewriter/filewriter.cc:542
 msgid "Mark as original"
 msgstr "Marcar como original"
 
-#: src/filewriter/mp3.cc:1120
-msgid "ID3 Parameters:"
-msgstr "Parâmetros ID3:"
+#: src/filewriter/filewriter.cc:544
+msgid "ID3 Tags"
+msgstr "Etiquetas ID3"
 
-#: src/filewriter/mp3.cc:1131
+#: src/filewriter/filewriter.cc:545
 msgid "Force addition of version 2 tag"
 msgstr "Forçar adição de \"tags\" v2"
 
-#: src/filewriter/mp3.cc:1141
+#: src/filewriter/filewriter.cc:547
 msgid "Only add v1 tag"
 msgstr "Apenas \"tags\" v1"
 
-#: src/filewriter/mp3.cc:1148
+#: src/filewriter/filewriter.cc:549
 msgid "Only add v2 tag"
 msgstr "Apenas \"tags\" v2"
 
-#: src/filewriter/mp3.cc:1169
+#: src/filewriter/filewriter.cc:554
+msgid "Quality"
+msgstr "Qualidade"
+
+#: src/filewriter/filewriter.cc:555
+msgid "VBR/ABR"
+msgstr "VBR/ABR"
+
+#: src/filewriter/filewriter.cc:556
 msgid "Tags"
 msgstr "\"Tags\""
 
-#: src/filewriter/vorbis.cc:196
-msgid "Vorbis Encoder Configuration"
-msgstr "Definições do codificador Vorbis"
-
-#: src/filewriter/vorbis.cc:219
-msgid "Quality level (0 - 10):"
-msgstr "Qualidade (0 - 10):"
+#: src/filewriter/filewriter.cc:566
+msgid "Quality (0-1):"
+msgstr "Qualidade (0-1):"
 
-#: src/flacng/flacng.h:35
+#: src/filewriter/filewriter.cc:573 src/skins-qt/skins_cfg.cc:307
+#: src/skins/skins_cfg.cc:289
+msgid "General"
+msgstr "Geral"
+
+#: src/flac/flacng.h:36
 msgid "FLAC Decoder"
 msgstr "Descodificador FLAC"
 
-#: src/flacng/metadata.cc:351 src/wavpack/wavpack.cc:209
+#: src/flac/metadata.cc:296 src/wavpack/wavpack.cc:215
 msgid "lossless"
 msgstr "sem perda"
 
-#: src/flacng/plugin.cc:169
+#: src/flac/plugin.cc:214
 msgid ""
 "Original code by\n"
 "Ralf Ertzinger <ralf@skytale.net>\n"
@@ -1511,21 +1449,21 @@
 "Copyright 2009-2012 John Lindgren"
 msgstr ""
 "Suplemento GIO\n"
-"Direitos de autor 2009-2012 John Lindgren"
+"Copyright 2009-2012 John Lindgren"
 
 #: src/gio/gio.cc:42
 msgid "GIO Plugin"
 msgstr "Suplemento GIO"
 
-#: src/gio/gio.cc:153
+#: src/gio/gio.cc:152
 msgid "Read-and-append mode not supported"
 msgstr "Modo \"read-and-append\" não suportado"
 
-#: src/gio/gio.cc:166
+#: src/gio/gio.cc:165
 msgid "Invalid open mode"
 msgstr "Modo inválido de abertura"
 
-#: src/gl-spectrum/gl-spectrum.cc:51
+#: src/glspectrum/gl-spectrum.cc:52
 msgid ""
 "OpenGL Spectrum Analyzer for Audacious\n"
 "Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
@@ -1537,631 +1475,754 @@
 "License: GPLv2+"
 msgstr ""
 "Analisador de espetro OpenGL\n"
-"Direitos de autor 2013 Christophe Budé, John Lindgren e Carlo Bramini\n"
+"Copyright 2013 Christophe Budé, John Lindgren e Carlo Bramini\n"
 "\n"
 "Baseado no suplemento XMMS:\n"
-"Direitos de autor 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas "
-"Nilsson e 4Front Technologies\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.cc:62
+#: src/glspectrum/gl-spectrum.cc:63 src/qtglspectrum/gl-spectrum.cc:53
 msgid "OpenGL Spectrum Analyzer"
 msgstr "Analisador de espetro OpenGL"
 
-#: src/gl-spectrum-qt/gl-spectrum.cc:41
-msgid ""
-"OpenGL Spectrum Analyzer for Audacious\n"
-"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
-"Copyright 2014 William Pitcock\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\n"
-"Direitos de autor 2013 Christophe Budé, John Lindgren e Carlo Bramini\n"
-"Direitos de autor 2014 William Pitcock\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-qt/gl-spectrum.cc:53
-msgid "OpenGL Spectrum Analyzer (Qt)"
-msgstr "Analisador de espetro OpenGL (Qt)"
-
-#: src/gnomeshortcuts/gnomeshortcuts.cc:38
-msgid "GNOME Shortcuts"
-msgstr "GNOME Shortcuts"
-
-#: src/gnomeshortcuts/gnomeshortcuts.cc:54
-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\n"
-"Permite controlar a aplicação através dos atalhos GNOME.\n"
-"\n"
-"Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>"
-
-#: src/gtkui/columns.cc:35
-msgid "Entry number"
+#: src/gtkui/columns.cc:36 src/moonstone/playlist_model.cc:38
+#: src/qtui/playlist_model.cc:33
+msgid "Entry Number"
 msgstr "Número da entrada"
 
-#: src/gtkui/columns.cc:36 src/playlist-manager/playlist-manager.cc:225
-#: src/qtui/playlist_model.cc:123
+#: src/gtkui/columns.cc:37 src/moonstone/playlist_model.cc:38
+#: src/moonstone/playlist_selection.cc:64
+#: src/playlist-manager/playlist-manager.cc:200
+#: src/playlist-manager-qt/playlist-manager-qt.cc:188
+#: src/qtui/playlist_model.cc:33 src/streamtuner/icecast-model.cc:120
+#: src/streamtuner/ihr-model.cc:159 src/streamtuner/shoutcast-model.cc:122
 msgid "Title"
 msgstr "Título"
 
-#: src/gtkui/columns.cc:37 src/qtui/playlist_model.cc:125
+#: src/gtkui/columns.cc:38 src/moonstone/playlist_model.cc:39
+#: src/qtui/playlist_model.cc:33
 msgid "Artist"
 msgstr "Artista"
 
-#: src/gtkui/columns.cc:38
+#: src/gtkui/columns.cc:39 src/moonstone/playlist_model.cc:39
+#: src/qtui/playlist_model.cc:33
 msgid "Year"
 msgstr "Ano"
 
-#: src/gtkui/columns.cc:39 src/qtui/playlist_model.cc:127
+#: src/gtkui/columns.cc:40 src/moonstone/playlist_model.cc:39
+#: src/qtui/playlist_model.cc:34
 msgid "Album"
 msgstr "Álbum"
 
-#: src/gtkui/columns.cc:40
-msgid "Album artist"
+#: src/gtkui/columns.cc:41 src/moonstone/playlist_model.cc:40
+#: src/qtui/playlist_model.cc:34
+msgid "Album Artist"
 msgstr "Artista do álbum"
 
-#: src/gtkui/columns.cc:41
+#: src/gtkui/columns.cc:42 src/moonstone/playlist_model.cc:40
+#: src/qtui/playlist_model.cc:34
 msgid "Track"
 msgstr "Faixa"
 
-#: src/gtkui/columns.cc:42
+#: src/gtkui/columns.cc:43 src/moonstone/playlist_model.cc:40
+#: src/qtui/playlist_model.cc:34 src/streamtuner/icecast-model.cc:123
+#: src/streamtuner/shoutcast-model.cc:125
+#: src/streamtuner/shoutcast-model.cc:236
 msgid "Genre"
 msgstr "Género"
 
-#: src/gtkui/columns.cc:43
-msgid "Queue position"
+#: src/gtkui/columns.cc:44 src/moonstone/playlist_model.cc:41
+#: src/qtui/playlist_model.cc:35
+msgid "Queue Position"
 msgstr "Posição na fila"
 
-#: src/gtkui/columns.cc:44
+#: src/gtkui/columns.cc:45 src/moonstone/playlist_model.cc:41
+#: src/qtui/playlist_model.cc:35
 msgid "Length"
 msgstr "Duração"
 
-#: src/gtkui/columns.cc:45
-msgid "File path"
+#: src/gtkui/columns.cc:46 src/moonstone/playlist_model.cc:41
+#: src/qtui/playlist_model.cc:35
+msgid "File Path"
 msgstr "Caminho do ficheiro"
 
-#: src/gtkui/columns.cc:47
-msgid "Custom title"
+#: src/gtkui/columns.cc:47 src/moonstone/playlist_model.cc:42
+#: src/qtui/playlist_model.cc:35
+msgid "File Name"
+msgstr "Nome de ficheiro"
+
+#: src/gtkui/columns.cc:48 src/moonstone/playlist_model.cc:42
+#: src/qtui/playlist_model.cc:36
+msgid "Custom Title"
 msgstr "Título personalizado"
 
-#: src/gtkui/columns.cc:48
+#: src/gtkui/columns.cc:49 src/moonstone/playlist_model.cc:42
+#: src/qtui/playlist_model.cc:36 src/streamtuner/icecast-model.cc:129
+#: src/streamtuner/shoutcast-model.cc:134
 msgid "Bitrate"
 msgstr "Taxa de dados"
 
-#: src/gtkui/columns.cc:308
+#: src/gtkui/columns.cc:50 src/moonstone/playlist_model.cc:43
+#: src/qtui/playlist_model.cc:36
+msgid "Comment"
+msgstr "Comentário"
+
+#: src/gtkui/columns.cc:51 src/qtui/playlist_model.cc:36
+msgid "Publisher"
+msgstr "Editor"
+
+#: src/gtkui/columns.cc:52 src/qtui/playlist_model.cc:37
+msgid "Catalog Number"
+msgstr "Número de catálogo"
+
+#: src/gtkui/columns.cc:53 src/moonstone/playlist_model.cc:43
+#: src/qtui/playlist_model.cc:37
+msgid "Disc"
+msgstr ""
+
+#: src/gtkui/columns.cc:325
 msgid "Available columns"
 msgstr "Colunas disponíveis"
 
-#: src/gtkui/columns.cc:334
+#: src/gtkui/columns.cc:351
 msgid "Displayed columns"
 msgstr "Colunas mostradas"
 
-#: src/gtkui/layout.cc:72 src/search-tool/search-tool.cc:40
+#: src/gtkui/layout.cc:74 src/search-tool-qt/search-tool-qt.cc:58
+#: src/search-tool/search-tool.cc:49
 msgid "Search Tool"
 msgstr "Ferramenta de procura"
 
-#: src/gtkui/layout.cc:167
+#: src/gtkui/layout.cc:170
 msgid "Dock at Left"
 msgstr "Doca à esquerda"
 
-#: src/gtkui/layout.cc:167
+#: src/gtkui/layout.cc:170
 msgid "Dock at Right"
 msgstr "Doca à direita"
 
-#: src/gtkui/layout.cc:168
+#: src/gtkui/layout.cc:171
 msgid "Dock at Top"
 msgstr "Doca em cima"
 
-#: src/gtkui/layout.cc:168
+#: src/gtkui/layout.cc:171
 msgid "Dock at Bottom"
 msgstr "Doca em baixo"
 
-#: src/gtkui/layout.cc:168
+#: src/gtkui/layout.cc:171
 msgid "Undock"
 msgstr "Desacoplar"
 
-#: src/gtkui/layout.cc:168 src/ladspa/plugin.cc:531
+#: src/gtkui/layout.cc:171 src/ladspa/plugin.cc:540
 msgid "Disable"
 msgstr "Desativar"
 
-#: src/gtkui/menus.cc:126 src/qtui/main_window_actions.cc:93
-#: src/statusicon/statusicon.cc:276
+#: src/gtkui/menus.cc:79 src/qtui/menus.cc:107
+#: src/statusicon-qt/statusicon.cc:115 src/statusicon/statusicon.cc:286
 msgid "_Open Files ..."
 msgstr "Abrir ficheir_os..."
 
-#: src/gtkui/menus.cc:127
+#: src/gtkui/menus.cc:80 src/qtui/menus.cc:111
 msgid "Open _URL ..."
 msgstr "Abrir _URL..."
 
-#: src/gtkui/menus.cc:128 src/qtui/main_window_actions.cc:95
+#: src/gtkui/menus.cc:81 src/qtui/menus.cc:113
 msgid "_Add Files ..."
 msgstr "_Adicionar ficheiros..."
 
-#: src/gtkui/menus.cc:129
+#: src/gtkui/menus.cc:82 src/qtui/menus.cc:118
 msgid "Add U_RL ..."
 msgstr "Adicionar U_RL..."
 
-#: src/gtkui/menus.cc:131
+#: src/gtkui/menus.cc:84 src/qtui/menus.cc:120
 msgid "Search _Library"
 msgstr "Procurar co_leção"
 
-#: src/gtkui/menus.cc:133 src/qtui/main_window_actions.cc:98
+#: src/gtkui/menus.cc:86 src/qtui/menus.cc:123
 msgid "A_bout ..."
 msgstr "So_bre..."
 
-#: src/gtkui/menus.cc:134 src/qtui/main_window_actions.cc:99
+#: src/gtkui/menus.cc:87 src/qtui/menus.cc:125
 msgid "_Settings ..."
 msgstr "Definiçõe_s..."
 
-#: src/gtkui/menus.cc:135 src/qtui/main_window_actions.cc:103
-#: src/statusicon/statusicon.cc:284
+#: src/gtkui/menus.cc:88 src/qtui/menus.cc:131
+#: src/statusicon-qt/statusicon.cc:117 src/statusicon/statusicon.cc:288
 msgid "_Quit"
 msgstr "_Sair"
 
-#: src/gtkui/menus.cc:139 src/gtkui/menus.cc:262
-#: src/qtui/main_window_actions.cc:107 src/search-tool/search-tool.cc:641
-#: src/statusicon/statusicon.cc:278
+#: src/gtkui/menus.cc:92 src/gtkui/menus.cc:226
+#: src/moonstone/playlist_tabs.cc:306 src/qtui/menus.cc:135
+#: src/qtui/playlist_tabs.cc:331 src/search-tool-qt/search-tool-qt.cc:499
+#: src/search-tool/search-tool.cc:339 src/statusicon-qt/statusicon.cc:109
+#: src/statusicon/statusicon.cc:280
 msgid "_Play"
 msgstr "Re_produzir"
 
-#: src/gtkui/menus.cc:140 src/qtui/main_window_actions.cc:108
-#: src/statusicon/statusicon.cc:279
+#: src/gtkui/menus.cc:93 src/qtui/menus.cc:137
+#: src/statusicon-qt/statusicon.cc:110 src/statusicon/statusicon.cc:281
 msgid "Paus_e"
 msgstr "Paus_a"
 
-#: src/gtkui/menus.cc:141 src/qtui/main_window_actions.cc:109
-#: src/statusicon/statusicon.cc:280
+#: src/gtkui/menus.cc:94 src/qtui/menus.cc:139
+#: src/statusicon-qt/statusicon.cc:111 src/statusicon/statusicon.cc:282
 msgid "_Stop"
 msgstr "Pa_rar"
 
-#: src/gtkui/menus.cc:142 src/qtui/main_window_actions.cc:110
-#: src/statusicon/statusicon.cc:277
+#: src/gtkui/menus.cc:95 src/qtui/menus.cc:141
+#: src/statusicon-qt/statusicon.cc:112 src/statusicon/statusicon.cc:283
 msgid "Pre_vious"
 msgstr "An_terior"
 
-#: src/gtkui/menus.cc:143 src/qtui/main_window_actions.cc:111
-#: src/statusicon/statusicon.cc:281
+#: src/gtkui/menus.cc:96 src/qtui/menus.cc:143
+#: src/statusicon-qt/statusicon.cc:113 src/statusicon/statusicon.cc:284
 msgid "_Next"
 msgstr "Segui_nte"
 
-#: src/gtkui/menus.cc:145 src/qtui/main_window_actions.cc:113
+#: src/gtkui/menus.cc:97 src/qtui/menus.cc:145 src/skins/menus.cc:114
+#: src/skins-qt/menus.cc:105
+msgid "Previous Album"
+msgstr "Álbum anterior"
+
+#: src/gtkui/menus.cc:98 src/qtui/menus.cc:146 src/skins/menus.cc:115
+#: src/skins-qt/menus.cc:106
+msgid "Next Album"
+msgstr "Próximo álbum"
+
+#: src/gtkui/menus.cc:100 src/qtui/menus.cc:148
 msgid "_Repeat"
 msgstr "_Repetir"
 
-#: src/gtkui/menus.cc:146 src/qtui/main_window_actions.cc:114
+#: src/gtkui/menus.cc:101 src/qtui/menus.cc:150
 msgid "S_huffle"
 msgstr "Baral_har"
 
-#: src/gtkui/menus.cc:147 src/qtui/main_window_actions.cc:115
+#: src/gtkui/menus.cc:102 src/qtui/menus.cc:152
+msgid "Shuffle by Albu_m"
+msgstr "Baralhar por álbu_m"
+
+#: src/gtkui/menus.cc:103 src/qtui/menus.cc:155
 msgid "N_o Playlist Advance"
 msgstr "Sem avanç_o na lista de reprodução"
 
-#: src/gtkui/menus.cc:148 src/qtui/main_window_actions.cc:116
+#: src/gtkui/menus.cc:104 src/qtui/menus.cc:157
 msgid "Stop A_fter This Song"
 msgstr "Parar após esta fai_xa"
 
-#: src/gtkui/menus.cc:150 src/gtkui/menus.cc:247
-#: src/qtui/main_window_actions.cc:118
+#: src/gtkui/menus.cc:106 src/gtkui/menus.cc:210 src/qtui/menus.cc:162
+#: src/qtui/menus.cc:294
 msgid "Song _Info ..."
 msgstr "_Informações da faixa..."
 
-#: src/gtkui/menus.cc:151
+#: src/gtkui/menus.cc:107
 msgid "Jump to _Time ..."
 msgstr "Ir para posição _temporal..."
 
-#: src/gtkui/menus.cc:152
+#: src/gtkui/menus.cc:108
 msgid "_Jump to Song ..."
 msgstr "I_r para a faixa..."
 
-#: src/gtkui/menus.cc:154
+#: src/gtkui/menus.cc:110 src/qtui/menus.cc:165
 msgid "Set Repeat Point _A"
 msgstr "Definir ponto de repetição _A"
 
-#: src/gtkui/menus.cc:155
+#: src/gtkui/menus.cc:111 src/qtui/menus.cc:167
 msgid "Set Repeat Point _B"
 msgstr "Definir ponto de repetição _B"
 
-#: src/gtkui/menus.cc:156
+#: src/gtkui/menus.cc:112 src/qtui/menus.cc:169
 msgid "_Clear Repeat Points"
 msgstr "Remover pontos de rep_etição"
 
-#: src/gtkui/menus.cc:160 src/gtkui/menus.cc:167 src/gtkui/menus.cc:183
-#: src/qtui/main_window_actions.cc:122 src/qtui/main_window_actions.cc:129
-#: src/qtui/main_window_actions.cc:145
+#: src/gtkui/menus.cc:116 src/gtkui/menus.cc:123 src/gtkui/menus.cc:141
+#: src/qtui/menus.cc:173 src/qtui/menus.cc:180 src/qtui/menus.cc:198
 msgid "By _Title"
 msgstr "Por _título"
 
-#: src/gtkui/menus.cc:161 src/qtui/main_window_actions.cc:123
+#: src/gtkui/menus.cc:117 src/qtui/menus.cc:174
 msgid "By _File Name"
 msgstr "Por nome do _ficheiro"
 
-#: src/gtkui/menus.cc:162 src/qtui/main_window_actions.cc:124
+#: src/gtkui/menus.cc:118 src/qtui/menus.cc:175
 msgid "By File _Path"
 msgstr "Por caminho do fic_heiro"
 
-#: src/gtkui/menus.cc:166 src/gtkui/menus.cc:182
-#: src/qtui/main_window_actions.cc:128 src/qtui/main_window_actions.cc:144
+#: src/gtkui/menus.cc:122 src/gtkui/menus.cc:140 src/qtui/menus.cc:179
+#: src/qtui/menus.cc:197
 msgid "By Track _Number"
 msgstr "Por _número de faixa"
 
-#: src/gtkui/menus.cc:168 src/gtkui/menus.cc:184
-#: src/qtui/main_window_actions.cc:130 src/qtui/main_window_actions.cc:146
+#: src/gtkui/menus.cc:124 src/gtkui/menus.cc:142 src/qtui/menus.cc:181
+#: src/qtui/menus.cc:199
 msgid "By _Artist"
 msgstr "Por _artista"
 
-#: src/gtkui/menus.cc:169 src/gtkui/menus.cc:185
-#: src/qtui/main_window_actions.cc:131 src/qtui/main_window_actions.cc:147
+#: src/gtkui/menus.cc:125 src/gtkui/menus.cc:143 src/qtui/menus.cc:182
+#: src/qtui/menus.cc:200
 msgid "By Al_bum"
 msgstr "Por ál_bum"
 
-#: src/gtkui/menus.cc:170 src/gtkui/menus.cc:186
-#: src/qtui/main_window_actions.cc:132 src/qtui/main_window_actions.cc:148
+#: src/gtkui/menus.cc:126 src/gtkui/menus.cc:144 src/qtui/menus.cc:183
+#: src/qtui/menus.cc:201
 msgid "By Albu_m Artist"
 msgstr "Por artista do álbu_m"
 
-#: src/gtkui/menus.cc:171 src/gtkui/menus.cc:187
-#: src/qtui/main_window_actions.cc:133 src/qtui/main_window_actions.cc:149
+#: src/gtkui/menus.cc:127 src/gtkui/menus.cc:145 src/qtui/menus.cc:184
+#: src/qtui/menus.cc:202
 msgid "By Release _Date"
 msgstr "Por _data de disponibilização"
 
-#: src/gtkui/menus.cc:172 src/gtkui/menus.cc:188
-#: src/qtui/main_window_actions.cc:134 src/qtui/main_window_actions.cc:150
+#: src/gtkui/menus.cc:128 src/gtkui/menus.cc:146 src/qtui/menus.cc:185
+#: src/qtui/menus.cc:203
 msgid "By _Genre"
 msgstr "Por _género"
 
-#: src/gtkui/menus.cc:173 src/gtkui/menus.cc:189
-#: src/qtui/main_window_actions.cc:135 src/qtui/main_window_actions.cc:151
+#: src/gtkui/menus.cc:129 src/gtkui/menus.cc:147 src/qtui/menus.cc:186
+#: src/qtui/menus.cc:204
 msgid "By _Length"
 msgstr "Por d_uração"
 
-#: src/gtkui/menus.cc:174 src/gtkui/menus.cc:190
-#: src/qtui/main_window_actions.cc:136 src/qtui/main_window_actions.cc:152
+#: src/gtkui/menus.cc:130 src/gtkui/menus.cc:148 src/qtui/menus.cc:187
+#: src/qtui/menus.cc:205
 msgid "By _File Path"
 msgstr "Por caminho do _ficheiro"
 
-#: src/gtkui/menus.cc:175 src/gtkui/menus.cc:191
-#: src/qtui/main_window_actions.cc:137 src/qtui/main_window_actions.cc:153
+#: src/gtkui/menus.cc:131 src/gtkui/menus.cc:149 src/qtui/menus.cc:188
+#: src/qtui/menus.cc:206
 msgid "By _Custom Title"
 msgstr "Por título personali_zado"
 
-#: src/gtkui/menus.cc:177 src/gtkui/menus.cc:193
-#: src/qtui/main_window_actions.cc:139 src/qtui/main_window_actions.cc:155
+#: src/gtkui/menus.cc:132 src/gtkui/menus.cc:150 src/qtui/menus.cc:189
+#: src/qtui/menus.cc:207
+msgid "By C_omment"
+msgstr "Por c_omentário"
+
+#: src/gtkui/menus.cc:133 src/gtkui/menus.cc:151 src/qtui/menus.cc:190
+#: src/qtui/menus.cc:208
+msgid "By D_isc Number"
+msgstr ""
+
+#: src/gtkui/menus.cc:135 src/gtkui/menus.cc:153 src/qtui/menus.cc:192
+#: src/qtui/menus.cc:210
 msgid "R_everse Order"
 msgstr "Inv_erter ordem"
 
-#: src/gtkui/menus.cc:178 src/gtkui/menus.cc:194
-#: src/qtui/main_window_actions.cc:140 src/qtui/main_window_actions.cc:156
+#: src/gtkui/menus.cc:136 src/gtkui/menus.cc:154 src/qtui/menus.cc:194
+#: src/qtui/menus.cc:212
 msgid "_Random Order"
 msgstr "Aleató_rio"
 
-#: src/gtkui/menus.cc:198 src/qtui/main_window_actions.cc:160
+#: src/gtkui/menus.cc:158 src/qtui/menus.cc:216
 msgid "_Play/Resume"
 msgstr "Re_produzir/Retomar"
 
-#: src/gtkui/menus.cc:199 src/gtkui/menus.cc:251
-#: src/qtui/main_window_actions.cc:161
+#: src/gtkui/menus.cc:159 src/qtui/menus.cc:218
 msgid "_Refresh"
 msgstr "_Atualizar"
 
-#: src/gtkui/menus.cc:201 src/qtui/main_window_actions.cc:163
+#: src/gtkui/menus.cc:161 src/qtui/menus.cc:222
 msgid "_Sort"
 msgstr "_Organização"
 
-#: src/gtkui/menus.cc:202 src/qtui/main_window_actions.cc:164
+#: src/gtkui/menus.cc:162 src/qtui/menus.cc:223
 msgid "Sort Se_lected"
 msgstr "Organizar se_leção"
 
-#: src/gtkui/menus.cc:203 src/qtui/main_window_actions.cc:165
+#: src/gtkui/menus.cc:163 src/qtui/menus.cc:225
 msgid "Remove _Duplicates"
 msgstr "Remover _duplicados"
 
-#: src/gtkui/menus.cc:204 src/qtui/main_window_actions.cc:166
+#: src/gtkui/menus.cc:164 src/qtui/menus.cc:226
 msgid "Remove _Unavailable Files"
 msgstr "Remover ficheiros indisponívei_s"
 
-#: src/gtkui/menus.cc:206 src/playlist-manager/playlist-manager.cc:244
-#: src/qtui/main_window_actions.cc:168
+#: src/gtkui/menus.cc:166 src/playlist-manager/playlist-manager.cc:219
+#: src/playlist-manager-qt/playlist-manager-qt.cc:348 src/qtui/menus.cc:229
 msgid "_New"
 msgstr "_Nova"
 
-#: src/gtkui/menus.cc:207
+#: src/gtkui/menus.cc:167 src/qtui/menus.cc:230
 msgid "Ren_ame ..."
 msgstr "Mud_ar nome..."
 
-#: src/gtkui/menus.cc:208 src/gtkui/menus.cc:264
-#: src/qtui/main_window_actions.cc:170
+#: src/gtkui/menus.cc:168 src/gtkui/menus.cc:228
+#: src/moonstone/playlist_tabs.cc:311 src/qtui/menus.cc:231
+#: src/qtui/playlist_tabs.cc:336
 msgid "Remo_ve"
 msgstr "Remo_ver"
 
-#: src/gtkui/menus.cc:210
+#: src/gtkui/menus.cc:170 src/qtui/menus.cc:233
 msgid "_Import ..."
 msgstr "_Importar..."
 
-#: src/gtkui/menus.cc:211
+#: src/gtkui/menus.cc:171 src/qtui/menus.cc:234
 msgid "_Export ..."
 msgstr "_Exportar..."
 
-#: src/gtkui/menus.cc:213
+#: src/gtkui/menus.cc:173 src/qtui/menus.cc:237
 msgid "Playlist _Manager ..."
 msgstr "_Gestão da lista de reprodução..."
 
-#: src/gtkui/menus.cc:214 src/qtui/main_window_actions.cc:176
+#: src/gtkui/menus.cc:174 src/qtui/menus.cc:239
 msgid "_Queue Manager ..."
 msgstr "_Gestão da fila de reprodução..."
 
-#: src/gtkui/menus.cc:218 src/qtui/main_window_actions.cc:180
+#: src/gtkui/menus.cc:178 src/qtui/menus.cc:243
 msgid "Volume _Up"
 msgstr "A_umentar volume"
 
-#: src/gtkui/menus.cc:219 src/qtui/main_window_actions.cc:181
+#: src/gtkui/menus.cc:179 src/qtui/menus.cc:245
 msgid "Volume _Down"
 msgstr "_Diminuir volume"
 
-#: src/gtkui/menus.cc:221 src/qtui/main_window_actions.cc:183
-msgid "_Equalizer"
-msgstr "_Equalizador"
+#: src/gtkui/menus.cc:181 src/qtui/menus.cc:249
+msgid "_Equalizer ..."
+msgstr "_Equalizador..."
 
-#: src/gtkui/menus.cc:223 src/qtui/main_window_actions.cc:185
+#: src/gtkui/menus.cc:182 src/qtui/menus.cc:251
 msgid "E_ffects ..."
 msgstr "E_feitos..."
 
-#: src/gtkui/menus.cc:227
+#: src/gtkui/menus.cc:184
+msgid "_Record Stream"
+msgstr "G_ravar emissão"
+
+#: src/gtkui/menus.cc:185
+msgid "Audio _Settings ..."
+msgstr "Definiçõe_s áudio..."
+
+#: src/gtkui/menus.cc:189 src/qtui/menus.cc:260
 msgid "Show _Menu Bar"
 msgstr "_Mostrar barra de menu"
 
-#: src/gtkui/menus.cc:228
+#: src/gtkui/menus.cc:190 src/qtui/menus.cc:262
 msgid "Show I_nfo Bar"
 msgstr "Mostrar barra de i_nformações"
 
-#: src/gtkui/menus.cc:229
+#: src/gtkui/menus.cc:191 src/qtui/menus.cc:264
+msgid "Show Info Bar _Album Art"
+msgstr "Mostrar _arte do álbum na barra de informações"
+
+#: src/gtkui/menus.cc:192 src/qtui/menus.cc:266
 msgid "Show Info Bar Vis_ualization"
 msgstr "Mostrar vis_ualização da barra de informações"
 
-#: src/gtkui/menus.cc:230
+#: src/gtkui/menus.cc:193 src/qtui/menus.cc:268
 msgid "Show _Status Bar"
 msgstr "Mo_strar barra de estado"
 
-#: src/gtkui/menus.cc:232
+#: src/gtkui/menus.cc:195 src/qtui/menus.cc:272
 msgid "Show _Remaining Time"
 msgstr "Mostrar tempo _restante"
 
-#: src/gtkui/menus.cc:234
+#: src/gtkui/menus.cc:197 src/qtui/menus.cc:276 src/skins/menus.cc:157
+#: src/skins-qt/menus.cc:152
 msgid "_Visualizations ..."
 msgstr "_Visualizações..."
 
-#: src/gtkui/menus.cc:238 src/qtui/main_window_actions.cc:189
+#: src/gtkui/menus.cc:201 src/qtui/menus.cc:280
 msgid "_File"
 msgstr "_Ficheiro"
 
-#: src/gtkui/menus.cc:239 src/qtui/main_window_actions.cc:190
+#: src/gtkui/menus.cc:202 src/qtui/menus.cc:281
 msgid "_Playback"
 msgstr "Re_produção"
 
-#: src/gtkui/menus.cc:240 src/qtui/main_window_actions.cc:191
+#: src/gtkui/menus.cc:203 src/qtui/menus.cc:282
 msgid "P_laylist"
 msgstr "_Lista de reprodução"
 
-#: src/gtkui/menus.cc:241 src/gtkui/menus.cc:258
-#: src/qtui/main_window_actions.cc:192
+#: src/gtkui/menus.cc:204 src/gtkui/menus.cc:222 src/qtui/menus.cc:283
+#: src/qtui/menus.cc:312
 msgid "_Services"
 msgstr "_Serviços"
 
-#: src/gtkui/menus.cc:242 src/qtui/main_window_actions.cc:193
+#: src/gtkui/menus.cc:205 src/qtui/menus.cc:284
 msgid "_Output"
 msgstr "S_aída"
 
-#: src/gtkui/menus.cc:243
+#: src/gtkui/menus.cc:206 src/qtui/menus.cc:285
 msgid "_View"
 msgstr "_Ver"
 
-#: src/gtkui/menus.cc:248
+#: src/gtkui/menus.cc:211 src/qtui/menus.cc:296
 msgid "_Queue/Unqueue"
 msgstr "_Colocar/retirar da fila"
 
-#: src/gtkui/menus.cc:250
+#: src/gtkui/menus.cc:213 src/qtui/menus.cc:299
 msgid "_Open Containing Folder"
 msgstr "_Abrir pasta respetiva"
 
-#: src/gtkui/menus.cc:253
+#: src/gtkui/menus.cc:214 src/qtui/menus.cc:301
+msgid "_Refresh Selected"
+msgstr "_Recarregar seleção"
+
+#: src/gtkui/menus.cc:216 src/qtui/menus.cc:304
 msgid "Cu_t"
 msgstr "Cor_tar"
 
-#: src/gtkui/menus.cc:254
+#: src/gtkui/menus.cc:217 src/qtui/menus.cc:305
 msgid "_Copy"
 msgstr "_Copiar"
 
-#: src/gtkui/menus.cc:255
+#: src/gtkui/menus.cc:218 src/qtui/menus.cc:306
 msgid "_Paste"
 msgstr "Co_lar"
 
-#: src/gtkui/menus.cc:256
+#: src/gtkui/menus.cc:219 src/qtui/menus.cc:307
+msgid "Paste at _End"
+msgstr "Colar _no final"
+
+#: src/gtkui/menus.cc:220 src/qtui/menus.cc:309
 msgid "Select _All"
 msgstr "Selecion_ar tudo"
 
-#: src/gtkui/menus.cc:263
+#: src/gtkui/menus.cc:227 src/moonstone/playlist_tabs.cc:309
+#: src/qtui/playlist_tabs.cc:334
 msgid "_Rename ..."
 msgstr "Muda_r nome..."
 
-#: src/gtkui/settings.cc:35
+#: src/gtkui/settings.cc:35 src/qtui/settings.cc:59
+msgid "Always"
+msgstr "Sempre"
+
+#: src/gtkui/settings.cc:36 src/qtui/settings.cc:60
+msgid "Auto-hide"
+msgstr "Ocultar automaticamente"
+
+#: src/gtkui/settings.cc:37 src/qtui/settings.cc:61
+msgid "Never"
+msgstr "Nunca"
+
+#: src/gtkui/settings.cc:41 src/qtui/settings.cc:64
 msgid "Playlist Tabs"
 msgstr "Separadores da lista de reprodução"
 
-#: src/gtkui/settings.cc:36
-msgid "Always show tabs"
-msgstr "Mostrar sempre"
+#: src/gtkui/settings.cc:42 src/qtui/settings.cc:65
+msgid "Show playlist tabs:"
+msgstr "Mostrar guias da lista de reprodução:"
 
-#: src/gtkui/settings.cc:38
+#: src/gtkui/settings.cc:45 src/qtui/settings.cc:69
 msgid "Show entry counts"
 msgstr "Mostrar número de entradas"
 
-#: src/gtkui/settings.cc:40
+#: src/gtkui/settings.cc:47 src/qtui/settings.cc:72
 msgid "Show close buttons"
 msgstr "Mostrar botão Fechar"
 
-#: src/gtkui/settings.cc:42
+#: src/gtkui/settings.cc:49 src/qtui/settings.cc:75
 msgid "Playlist Columns"
 msgstr "Colunas da lista de reprodução"
 
-#: src/gtkui/settings.cc:44
+#: src/gtkui/settings.cc:51 src/qtui/settings.cc:77
 msgid "Show column headers"
 msgstr "Mostrar título das colunas"
 
-#: src/gtkui/settings.cc:46 src/modplug/plugin_main.cc:106
-#: src/skins/skins_cfg.cc:263
-msgid "Miscellaneous"
-msgstr "Diversos"
+#: src/gtkui/settings.cc:53 src/qtui/settings.cc:82
+msgid "Make column headers clickable for sorting"
+msgstr ""
 
-#: src/gtkui/settings.cc:47
-msgid "Arrow keys seek by:"
-msgstr "Teclas de seta procuram por:"
+#: src/gtkui/settings.cc:56
+msgid "Use symbolic icons in toolbar"
+msgstr "Utilizar ícones simbólicos na barra de ferramentas"
 
-#: src/gtkui/settings.cc:50
+#: src/gtkui/settings.cc:58 src/qtui/settings.cc:86
 msgid "Scroll on song change"
 msgstr "Deslocar ao mudar de faixa"
 
-#: src/gtkui/ui_gtk.cc:71
+#: src/gtkui/ui_gtk.cc:82
 msgid "GTK Interface"
 msgstr "Interface GTK"
 
-#: src/gtkui/ui_gtk.cc:222 src/skins/ui_main.cc:232
+#: src/gtkui/ui_gtk.cc:219 src/skins/main.cc:228 src/skins-qt/main.cc:231
 #, c-format
 msgid "%s - Audacious"
 msgstr "%s - Audacious"
 
-#: src/gtkui/ui_gtk.cc:225 src/qtui/main_window.cc:186
+#: src/gtkui/ui_gtk.cc:221 src/moonstone/main_window.cc:184
+#: src/qtui/main_window.cc:385
 msgid "Buffering ..."
 msgstr "A processar..."
 
-#: src/gtkui/ui_gtk.cc:228 src/skins/ui_main.cc:234 src/skins/ui_main.cc:1164
+#: src/gtkui/ui_gtk.cc:224 src/pipewire/pipewire.cc:402 src/skins/main.cc:230
+#: src/skins-qt/main.cc:233
 msgid "Audacious"
 msgstr "Audacious"
 
-#: src/gtkui/ui_statusbar.cc:63 src/qtui/status_bar.cc:67
+#: src/gtkui/ui_gtk.cc:487 src/gtkui/ui_gtk.cc:518 src/gtkui/ui_gtk.cc:882
+#: src/hotkey/gui.cc:72 src/moonstone/main_window.cc:67
+#: src/moonstone/main_window.cc:145 src/moonstone/main_window.cc:146
+#: src/notify/osd.cc:85 src/qthotkey/gui.cc:67 src/qtui/main_window.cc:154
+#: src/qtui/main_window.cc:347 src/qtui/main_window.cc:348
+#: src/skins/menus.cc:109 src/skins-qt/menus.cc:100
+msgid "Play"
+msgstr "Reproduzir"
+
+#: src/gtkui/ui_gtk.cc:487 src/moonstone/main_window.cc:151
+#: src/moonstone/main_window.cc:152 src/notify/osd.cc:82
+#: src/qtui/main_window.cc:353 src/qtui/main_window.cc:354
+#: src/skins/menus.cc:110 src/skins-qt/menus.cc:101
+msgid "Pause"
+msgstr "Pausa"
+
+#: src/gtkui/ui_gtk.cc:868 src/moonstone/main_window.cc:57
+#: src/qtui/main_window.cc:145 src/skins/menus.cc:86 src/skins-qt/menus.cc:77
+msgid "Search Library"
+msgstr "Procurar na coleção"
+
+#: src/gtkui/ui_gtk.cc:875 src/moonstone/main_window.cc:60
+#: src/qtui/main_window.cc:147
+msgid "Open Files"
+msgstr "Abrir ficheiros"
+
+#: src/gtkui/ui_gtk.cc:876 src/moonstone/main_window.cc:62
+#: src/qtui/main_window.cc:149
+msgid "Add Files"
+msgstr "Adicionar ficheiros"
+
+#: src/gtkui/ui_gtk.cc:881 src/moonstone/main_window.cc:65
+#: src/qtui/main_window.cc:152 src/skins/menus.cc:112 src/skins-qt/menus.cc:103
+msgid "Previous"
+msgstr "Anterior"
+
+#: src/gtkui/ui_gtk.cc:883 src/hotkey/gui.cc:74 src/moonstone/main_window.cc:69
+#: src/qthotkey/gui.cc:69 src/qtui/main_window.cc:156 src/skins/menus.cc:111
+#: src/skins-qt/menus.cc:102
+msgid "Stop"
+msgstr "Parar"
+
+#: src/gtkui/ui_gtk.cc:884 src/moonstone/main_window.cc:76 src/notify/osd.cc:89
+#: src/qtui/main_window.cc:163 src/skins/menus.cc:113 src/skins-qt/menus.cc:104
+msgid "Next"
+msgstr "Seguinte"
+
+#: src/gtkui/ui_gtk.cc:886 src/moonstone/main_window.cc:79
+#: src/qtui/main_window.cc:166 src/qtui/menus.cc:254 src/skins/menus.cc:79
+#: src/skins-qt/menus.cc:69
+msgid "Record Stream"
+msgstr "Gravar emissão"
+
+#: src/gtkui/ui_gtk.cc:919 src/moonstone/main_window.cc:86
+#: src/qtui/main_window.cc:173 src/skins/menus.cc:103 src/skins-qt/menus.cc:94
+msgid "Repeat"
+msgstr "Repetir"
+
+#: src/gtkui/ui_gtk.cc:922 src/moonstone/main_window.cc:89
+#: src/qtui/main_window.cc:176 src/skins/menus.cc:104 src/skins-qt/menus.cc:95
+msgid "Shuffle"
+msgstr "Baralhar"
+
+#: src/gtkui/ui_gtk.cc:1114 src/qtui/main_window.cc:123
+msgid "Menu"
+msgstr "Menu"
+
+#: src/gtkui/ui_statusbar.cc:64 src/qtui/status_bar.cc:155
 msgid "mono"
 msgstr "mono"
 
-#: src/gtkui/ui_statusbar.cc:65 src/qtui/status_bar.cc:69
+#: src/gtkui/ui_statusbar.cc:66 src/qtui/status_bar.cc:157
 msgid "stereo"
 msgstr "estéreo"
 
-#: src/gtkui/ui_statusbar.cc:67 src/qtui/status_bar.cc:71
+#: src/gtkui/ui_statusbar.cc:68 src/qtui/status_bar.cc:160
 #, c-format
 msgid "%d channel"
 msgid_plural "%d channels"
 msgstr0 "%d canal"
 msgstr1 "%d canais"
+msgstr2 "%d canais"
+
+#: src/gtkui/ui_statusbar.cc:76 src/qtui/status_bar.cc:168
+#, c-format
+msgid "%d kHz"
+msgstr "%d kHz"
 
-#: src/gtkui/ui_statusbar.cc:81 src/qtui/status_bar.cc:85
+#: src/gtkui/ui_statusbar.cc:82 src/qtui/status_bar.cc:174
 #, c-format
-msgid "%d kbps"
-msgstr "%d kbps"
+msgid "%d kbit/s"
+msgstr "%d kbit/s"
 
-#: src/gtkui/ui_statusbar.cc:107 src/skins/ui_main_evlisteners.cc:103
+#: src/gtkui/ui_statusbar.cc:108 src/skins/main.cc:478 src/skins-qt/main.cc:461
 msgid "Single mode."
 msgstr "Modo simples"
 
-#: src/gtkui/ui_statusbar.cc:109 src/skins/ui_main_evlisteners.cc:105
+#: src/gtkui/ui_statusbar.cc:110 src/skins/main.cc:480 src/skins-qt/main.cc:463
 msgid "Playlist mode."
 msgstr "Modo lista de reprodução"
 
-#: src/gtkui/ui_statusbar.cc:117 src/skins/ui_main_evlisteners.cc:111
+#: src/gtkui/ui_statusbar.cc:118 src/skins/main.cc:486 src/skins-qt/main.cc:469
 msgid "Stopping after song."
 msgstr "Para após a faixa"
 
-#: src/hotkey/gui.cc:71
+#: src/hotkey/gui.cc:71 src/qthotkey/gui.cc:66
 msgid "Previous track"
 msgstr "Faixa anterior"
 
-#: src/hotkey/gui.cc:72 src/notify/osd.cc:69 src/qtui/main_window.cc:69
-#: src/qtui/main_window.cc:172 src/qtui/main_window.cc:173
-#: src/skins/menus.cc:87
-msgid "Play"
-msgstr "Reproduzir"
-
-#: src/hotkey/gui.cc:73
+#: src/hotkey/gui.cc:73 src/qthotkey/gui.cc:68
 msgid "Pause/Resume"
 msgstr "Pausa/Retomar"
 
-#: src/hotkey/gui.cc:74 src/qtui/main_window.cc:70 src/skins/menus.cc:89
-msgid "Stop"
-msgstr "Parar"
-
-#: src/hotkey/gui.cc:75
+#: src/hotkey/gui.cc:75 src/qthotkey/gui.cc:70
 msgid "Next track"
 msgstr "Faixa seguinte"
 
-#: src/hotkey/gui.cc:76
-msgid "Forward 5 seconds"
-msgstr "Avançar 5 segundos"
-
-#: src/hotkey/gui.cc:77
-msgid "Rewind 5 seconds"
-msgstr "Recuar 5 segundos"
+#: src/hotkey/gui.cc:76 src/qthotkey/gui.cc:71
+msgid "Step forward"
+msgstr "Avançar"
+
+#: src/hotkey/gui.cc:77 src/qthotkey/gui.cc:72
+msgid "Step backward"
+msgstr "Retroceder"
 
-#: src/hotkey/gui.cc:78
+#: src/hotkey/gui.cc:78 src/qthotkey/gui.cc:73
 msgid "Mute"
 msgstr "Silenciar"
 
-#: src/hotkey/gui.cc:79
+#: src/hotkey/gui.cc:79 src/qthotkey/gui.cc:74
 msgid "Volume up"
 msgstr "Aumentar volume"
 
-#: src/hotkey/gui.cc:80
+#: src/hotkey/gui.cc:80 src/qthotkey/gui.cc:75
 msgid "Volume down"
 msgstr "Diminuir volume"
 
-#: src/hotkey/gui.cc:81
+#: src/hotkey/gui.cc:81 src/qthotkey/gui.cc:76
 msgid "Jump to file"
 msgstr "Ir para ficheiro"
 
-#: src/hotkey/gui.cc:82
+#: src/hotkey/gui.cc:82 src/qthotkey/gui.cc:77
 msgid "Toggle player window(s)"
 msgstr "Ativar/desativar janela(s) do reprodutor"
 
-#: src/hotkey/gui.cc:83
+#: src/hotkey/gui.cc:83 src/qthotkey/gui.cc:78
 msgid "Show On-Screen-Display"
 msgstr "Mostrar OSD"
 
-#: src/hotkey/gui.cc:84
+#: src/hotkey/gui.cc:84 src/qthotkey/gui.cc:79
 msgid "Toggle repeat"
 msgstr "Ativar/desativar repetição"
 
-#: src/hotkey/gui.cc:85
+#: src/hotkey/gui.cc:85 src/qthotkey/gui.cc:80
 msgid "Toggle shuffle"
 msgstr "Ativar/desativar desorganização"
 
-#: src/hotkey/gui.cc:86
+#: src/hotkey/gui.cc:86 src/qthotkey/gui.cc:81
 msgid "Toggle stop after current"
 msgstr "Ativar/desativar paragem após a faixa atual"
 
-#: src/hotkey/gui.cc:87
+#: src/hotkey/gui.cc:87 src/qthotkey/gui.cc:82
 msgid "Raise player window(s)"
 msgstr "Mostrar janela(s) do reprodutor"
 
-#: src/hotkey/gui.cc:97
+#: src/hotkey/gui.cc:98 src/qthotkey/gui.cc:100
 msgid "(none)"
 msgstr "(nada)"
 
-#: src/hotkey/gui.cc:234
+#: src/hotkey/gui.cc:261
 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 modifiers.\n"
 "\n"
 "Do you want to continue?"
 msgstr ""
@@ -2169,11 +2230,11 @@
 "\n"
 "Continuar?"
 
-#: src/hotkey/gui.cc:236
+#: src/hotkey/gui.cc:264
 msgid "Binding mouse buttons"
 msgstr "Associação dos botões do rato"
 
-#: src/hotkey/gui.cc:391
+#: src/hotkey/gui.cc:434
 msgid ""
 "Press a key combination inside a text field.\n"
 "You can also bind mouse buttons."
@@ -2181,72 +2242,102 @@
 "Prima a combinação de teclas no campo de texto.\n"
 "Também pode associar os botões do rato."
 
-#: src/hotkey/gui.cc:396
+#: src/hotkey/gui.cc:444 src/qthotkey/gui.cc:179
 msgid "Hotkeys:"
 msgstr "Teclas de atalho:"
 
-#: src/hotkey/gui.cc:413
+#: src/hotkey/gui.cc:457 src/qthotkey/gui.cc:181
 msgid "Action:"
 msgstr "Ação:"
 
-#: src/hotkey/gui.cc:420
+#: src/hotkey/gui.cc:461 src/qthotkey/gui.cc:182
 msgid "Key Binding:"
 msgstr "Associação de teclas:"
 
-#: src/hotkey/gui.cc:468
+#: src/hotkey/gui.cc:518 src/qthotkey/gui.cc:184
 msgid "_Add"
 msgstr "_Adicionar"
 
-#: src/hotkey/plugin.cc:61
+#: src/hotkey/plugin.cc:59 src/qthotkey/plugin.cc:78
 msgid "Global Hotkeys"
 msgstr "Atalhos globais"
 
-#: src/hotkey/plugin.cc:79
+#: src/hotkey/plugin.cc:74
 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"
+"Contributors 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 ""
-"Suplemento Global Hotkey\n"
-"Permite-lhe controlar o Audacious com as teclas globais ou com as teclas "
-"multimédia.\n"
+"Plugin Global Hotkey\n"
+"Controla o player com combinações globais de teclas ou com teclas "
+"multimídia.\n"
 "\n"
-"Direitos de autor (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n"
+"Copyright (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"
+"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>"
+" Jeremy Tan <nsx@nsx.homeip.net>."
 
-#: src/jack-ng/jack-ng.cc:49
+#: src/jack/jack-ng.cc:54
 msgid "JACK Output"
 msgstr "Sistema Jack"
 
-#: src/jack-ng/jack-ng.cc:114
+#: src/jack/jack-ng.cc:126
+msgid "Client name:"
+msgstr "Nome do cliente:"
+
+#: src/jack/jack-ng.cc:128
 msgid "Automatically connect to output ports"
 msgstr "Ligar automaticamente às portas de saída"
 
-#: src/jack-ng/jack-ng.cc:155
+#: src/jack/jack-ng.cc:130
+msgid "Filter ports (regex, use any port if blank):"
+msgstr "Filtrar portas (regex, usar qualquer porta se estiver em branco):"
+
+#: src/jack/jack-ng.cc:136
+msgid "Connect to physical ports only"
+msgstr "Ligar apenas a portas físicas"
+
+#: src/jack/jack-ng.cc:139
+msgid "Upmix to"
+msgstr "Upmix para"
+
+#: src/jack/jack-ng.cc:141
+msgid "ports if input has fewer channels"
+msgstr "portas se a entrada tiver menos canais"
+
+#: src/jack/jack-ng.cc:143
+msgid "Ignore insufficient number of ports"
+msgstr "Ignorar número insuficiente de portas"
+
+#: src/jack/jack-ng.cc:181
+msgid "No JACK output ports were found. Please check settings."
+msgstr ""
+"Não foram encontradas portas de saída JACK. Por favor, verifique as "
+"configurações."
+
+#: src/jack/jack-ng.cc:195
 #, c-format
 msgid "Only %d JACK output ports were found but %d are required."
 msgstr "Apenas foram encontradas %d portas de saída JACK e são precisas %d."
 
-#: src/jack-ng/jack-ng.cc:164
+#: src/jack/jack-ng.cc:210
 #, c-format
 msgid "Failed to connect to JACK port %s."
 msgstr "Falha ao estabelecer ligação à porta %s."
 
-#: src/jack-ng/jack-ng.cc:184
+#: src/jack/jack-ng.cc:230
 msgid ""
 "JACK supports only floating-point audio. You must change the output bit "
 "depth to floating-point in Audacious settings."
@@ -2254,12 +2345,12 @@
 "O JACK apenas tem suporte a áudio de vírgula flutuante. Deve alterar a "
 "profundidade para vírgula flutuante nas definições."
 
-#: src/jack-ng/jack-ng.cc:197
+#: src/jack/jack-ng.cc:245
 msgid "Failed to connect to the JACK server; is it running?"
 msgstr ""
 "Falha ao estabelecer ligação ao servidor JACK. O servidor está em execução?"
 
-#: src/jack-ng/jack-ng.cc:273
+#: src/jack/jack-ng.cc:321
 #, c-format
 msgid ""
 "The JACK server requires a sample rate of %d Hz, but Audacious is playing at "
@@ -2269,16 +2360,16 @@
 "reproduzir a %d Hz. Utilize o efeito Sample Rate Converter para corrigir a "
 "diferença."
 
-#: src/ladspa/plugin.cc:414
+#: src/ladspa/plugin.cc:416
 #, c-format
 msgid "%s Settings"
 msgstr "Definições de %s"
 
-#: src/ladspa/plugin.cc:478
+#: src/ladspa/plugin.cc:482
 msgid "Module paths:"
 msgstr "Caminhos do módulo:"
 
-#: src/ladspa/plugin.cc:483
+#: src/ladspa/plugin.cc:487
 msgid ""
 "Separate multiple paths with a colon.\n"
 "These paths are searched in addition to LADSPA_PATH.\n"
@@ -2289,31 +2380,31 @@
 "Após a adição dos caminhos, prima Enter para procurar os novos suplementos.</"
 "small>"
 
-#: src/ladspa/plugin.cc:499
+#: src/ladspa/plugin.cc:508
 msgid "Available plugins:"
 msgstr "Suplemento disponíveis:"
 
-#: src/ladspa/plugin.cc:512 src/modplug/plugin_main.cc:92
-#: src/modplug/plugin_main.cc:95 src/modplug/plugin_main.cc:98
-#: src/modplug/plugin_main.cc:101
+#: src/ladspa/plugin.cc:521 src/modplug/plugin_main.cc:91
+#: src/modplug/plugin_main.cc:94 src/modplug/plugin_main.cc:97
+#: src/modplug/plugin_main.cc:100
 msgid "Enable"
 msgstr "Ativar"
 
-#: src/ladspa/plugin.cc:518
+#: src/ladspa/plugin.cc:527
 msgid "Enabled plugins:"
 msgstr "Suplementos ativos:"
 
-#: src/ladspa/plugin.cc:534
+#: src/ladspa/plugin.cc:543
 msgid "Settings"
 msgstr "Definições"
 
-#: src/ladspa/plugin.cc:551
+#: src/ladspa/plugin.cc:560
 msgid ""
 "LADSPA Host for Audacious\n"
 "Copyright 2011 John Lindgren"
 msgstr ""
 "Suplemento LADSPA Host\n"
-"Direitos de autor 2011 John Lindgren"
+"Copyright 2011 John Lindgren"
 
 #: src/ladspa/plugin.h:78
 msgid "LADSPA Host"
@@ -2323,7 +2414,7 @@
 msgid "LIRC Plugin"
 msgstr "Suplemento LIRC"
 
-#: src/lirc/lirc.cc:381
+#: src/lirc/lirc.cc:379
 msgid ""
 "A simple plugin to control Audacious using the LIRC remote control daemon\n"
 "\n"
@@ -2351,63 +2442,125 @@
 "\n"
 "Para mais informações, consulte http://lirc.org."
 
-#: src/lirc/lirc.cc:392
+#: src/lirc/lirc.cc:390
 msgid "Connection"
 msgstr "Ligação"
 
-#: src/lirc/lirc.cc:393
+#: src/lirc/lirc.cc:391
 msgid "Reconnect to LIRC server"
 msgstr "Nova ligação ao servidor LIRC"
 
-#: src/lirc/lirc.cc:395
+#: src/lirc/lirc.cc:393
 msgid "Wait before reconnecting:"
 msgstr "Intervalo entre ligações:"
 
-#: src/lyricwiki/lyricwiki.cc:41
-msgid "LyricWiki Plugin"
-msgstr "Suplemento LyricWiki"
-
-#: src/lyricwiki/lyricwiki.cc:131 src/lyricwiki-qt/lyricwiki.cc:136
-msgid "No lyrics available"
-msgstr "A letra da faixa não está disponível."
-
-#: src/lyricwiki/lyricwiki.cc:217 src/lyricwiki/lyricwiki.cc:226
-#: src/lyricwiki/lyricwiki.cc:243 src/lyricwiki/lyricwiki.cc:252
-#: src/lyricwiki/lyricwiki.cc:267 src/lyricwiki-qt/lyricwiki.cc:222
-#: src/lyricwiki-qt/lyricwiki.cc:231 src/lyricwiki-qt/lyricwiki.cc:248
-#: src/lyricwiki-qt/lyricwiki.cc:257 src/lyricwiki-qt/lyricwiki.cc:272
-msgid "Error"
-msgstr "Erro"
-
-#: src/lyricwiki/lyricwiki.cc:218 src/lyricwiki/lyricwiki.cc:244
-#: src/lyricwiki-qt/lyricwiki.cc:223 src/lyricwiki-qt/lyricwiki.cc:249
+#: src/lyrics-common/chart_lyrics_provider.cc:93
+#: src/lyrics-common/chart_lyrics_provider.cc:150
+#: src/lyrics-common/lyrics_ovh_provider.cc:50
 #, c-format
 msgid "Unable to fetch %s"
 msgstr "Não foi possível obter %s."
 
-#: src/lyricwiki/lyricwiki.cc:227 src/lyricwiki/lyricwiki.cc:253
-#: src/lyricwiki-qt/lyricwiki.cc:232 src/lyricwiki-qt/lyricwiki.cc:258
+#: src/lyrics-common/chart_lyrics_provider.cc:100
+#: src/lyrics-common/chart_lyrics_provider.cc:157
+#: src/lyrics-common/lyrics_ovh_provider.cc:57
 #, c-format
 msgid "Unable to parse %s"
 msgstr "Não foi possível processar %s."
 
-#: src/lyricwiki/lyricwiki.cc:259 src/lyricwiki-qt/lyricwiki.cc:264
+#: src/lyrics-common/chart_lyrics_provider.cc:121
+#: src/lyrics-common/chart_lyrics_provider.cc:194
+#: src/lyrics-common/lyrics_ovh_provider.cc:88
 msgid "Looking for lyrics ..."
 msgstr "A procurar letra da faixa..."
 
-#: src/lyricwiki/lyricwiki.cc:267 src/lyricwiki-qt/lyricwiki.cc:272
-msgid "Missing song metadata"
-msgstr "Detalhes em falta"
-
-#: src/lyricwiki/lyricwiki.cc:278 src/lyricwiki-qt/lyricwiki.cc:283
-msgid "Connecting to lyrics.wikia.com ..."
-msgstr "Ligação a lyrics.wikia.com..."
-
-#: src/lyricwiki-qt/lyricwiki.cc:55
-msgid "LyricWiki Plugin (Qt)"
-msgstr "Suplemento LyricWiki (Qt)"
+#: src/lyrics-common/preferences.h:43
+msgid "Nowhere"
+msgstr "Em nenhum lugar"
+
+#: src/lyrics-common/preferences.h:49
+msgid "Artist is truncated at the start, Title -- at the end"
+msgstr "Artista é truncado no início, Título -- no final"
+
+#: src/lyrics-common/preferences.h:50
+msgid "Chars to truncate on:"
+msgstr "Caracteres para truncar em:"
+
+#: src/lyrics-common/preferences.h:54
+msgid "Chars are ORed in RegExp, surrounded by whitespace"
+msgstr ""
+"Os caracteres são ORed em RegExp, cercados por espaços em branco</"
+"small>"
+
+#: src/lyrics-common/preferences.h:55
+msgid "Chars to split on:"
+msgstr "Caracteres para dividir em:"
+
+#: src/lyrics-common/preferences.h:56
+msgid "Further truncate those on chars"
+msgstr "Truncar ainda mais os que se encontram em caracteres"
+
+#: src/lyrics-common/preferences.h:62
+msgid "General"
+msgstr "Geral"
+
+#: src/lyrics-common/preferences.h:63
+msgid "Split title into artist and title on chars"
+msgstr "Dividir título entre artista e título nos caracteres"
+
+#: src/lyrics-common/preferences.h:66
+msgid "Sources"
+msgstr "Fontes"
+
+#: src/lyrics-common/preferences.h:67
+msgid "Use embedded lyrics (from Lyrics tag)"
+msgstr "Utilizar letras incorporadas (da etiqueta das Letras)"
+
+#: src/lyrics-common/preferences.h:69
+msgid "Fetch lyrics from internet:"
+msgstr "Obter letras da Internet:"
+
+#: src/lyrics-common/preferences.h:72
+msgid "Store fetched lyrics in local cache"
+msgstr "Armazenar letras obtidas no cache local"
+
+#: src/lyrics-common/preferences.h:74
+msgid "Local Storage"
+msgstr "Armazenamento local"
+
+#: src/lyrics-common/preferences.h:75
+msgid "Load lyric files (.lrc) from local storage"
+msgstr "Carregar arquivos de letra (.lrc) do armazenamento local"
+
+#: src/lyrics-common/utils.cc:54 src/ui-common/dialogs-qt.cc:63
+msgid "Error"
+msgstr "Erro"
+
+#: src/lyrics-common/utils.cc:60
+msgid "Lyrics could not be found."
+msgstr "Não foi possível encontrar a letra."
+
+#: src/lyrics-common/utils.cc:142
+msgid "Missing title and/or artist."
+msgstr "Título e/ou artista em falta."
+
+#: src/lyrics-gtk/lyrics-gtk.cc:37 src/lyrics-qt/lyrics-qt.cc:50
+msgid "Lyrics"
+msgstr "Letras"
+
+#: src/lyrics-gtk/lyrics-gtk.cc:189 src/lyrics-qt/lyrics-qt.cc:171
+msgid "Edit Lyrics ..."
+msgstr ""
+
+#: src/lyrics-gtk/lyrics-gtk.cc:195 src/lyrics-qt/lyrics-qt.cc:178
+msgid "Save Locally"
+msgstr "Gravar localmente"
+
+#: src/lyrics-gtk/lyrics-gtk.cc:201 src/lyrics-qt/lyrics-qt.cc:186
+msgid "Refresh"
+msgstr "Atualizar"
 
-#: src/m3u/m3u.cc:32
+#: src/m3u/m3u.cc:33
 msgid "M3U Playlists"
 msgstr "Listas de reprodução M3U"
 
@@ -2415,17 +2568,17 @@
 msgid "Tact Generator"
 msgstr "Gerador Tact"
 
-#: src/metronom/metronom.cc:147
+#: src/metronom/metronom.cc:145
 #, c-format
 msgid "Tact generator: %d bpm"
 msgstr "Gerador Tact: %d bpm"
 
-#: src/metronom/metronom.cc:149
+#: src/metronom/metronom.cc:147
 #, c-format
 msgid "Tact generator: %d bpm %d/%d"
 msgstr "Gerador Tact: %d bpm %d/%d"
 
-#: src/metronom/metronom.cc:237
+#: src/metronom/metronom.cc:235
 msgid ""
 "A Tact Generator by Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
 "\n"
@@ -2439,23 +2592,23 @@
 "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/mixer/mixer.cc:38
+#: src/mixer/mixer.cc:43
 msgid "Channel Mixer"
 msgstr "Gestor de canais"
 
-#: src/mixer/mixer.cc:202
+#: src/mixer/mixer.cc:255
 msgid ""
 "Channel Mixer Plugin for Audacious\n"
 "Copyright 2011-2012 John Lindgren and Michał Lipski"
 msgstr ""
 "Suplemento Channel Mixer\n"
-"Direitos de autor 2011-2012 John Lindgren e Michał Lipski"
+"Copyright 2011-2012 John Lindgren e Michał Lipski"
 
-#: src/mixer/mixer.cc:206
+#: src/mixer/mixer.cc:259
 msgid "Channel Mixer"
 msgstr "Gestor de canais"
 
-#: src/mixer/mixer.cc:207
+#: src/mixer/mixer.cc:260
 msgid "Output channels:"
 msgstr "Canais de saída:"
 
@@ -2467,168 +2620,176 @@
 msgid "Error connecting to MMS server"
 msgstr "Erro ao estabelecer ligação ao servidor MMS"
 
-#: src/modplug/modplugbmp.h:53
+#: src/modplug/modplugbmp.h:57
 msgid "ModPlug (Module Player)"
 msgstr "ModPlug (Reprodutor Module)"
 
-#: src/modplug/plugin_main.cc:53
-msgid "Resolution"
-msgstr "Resolução"
-
-#: src/modplug/plugin_main.cc:54
-msgid "8-bit"
-msgstr "8-bit"
-
 #: src/modplug/plugin_main.cc:55
-msgid "16-bit"
-msgstr "16-bit"
-
-#: src/modplug/plugin_main.cc:56
 msgid "Channels"
 msgstr "Canais"
 
-#: src/modplug/plugin_main.cc:60
+#: src/modplug/plugin_main.cc:59
 msgid "Nearest (fastest)"
 msgstr "Nearest (mais rápido)"
 
-#: src/modplug/plugin_main.cc:61
+#: src/modplug/plugin_main.cc:60
 msgid "Linear (fast)"
 msgstr "Linear (rápido)"
 
-#: src/modplug/plugin_main.cc:62
+#: src/modplug/plugin_main.cc:61
 msgid "Spline (good)"
 msgstr "Spline (bom)"
 
-#: src/modplug/plugin_main.cc:63
+#: src/modplug/plugin_main.cc:62
 msgid "Polyphase (best)"
 msgstr "Polyphase (melhor)"
 
-#: src/modplug/plugin_main.cc:64
+#: src/modplug/plugin_main.cc:63
 msgid "Sample rate"
 msgstr "Frequência"
 
-#: src/modplug/plugin_main.cc:65
+#: src/modplug/plugin_main.cc:64
 msgid "22 kHz"
 msgstr "22 kHz"
 
-#: src/modplug/plugin_main.cc:66
+#: src/modplug/plugin_main.cc:65
 msgid "44 kHz"
 msgstr "44 kHz"
 
-#: src/modplug/plugin_main.cc:67
+#: src/modplug/plugin_main.cc:66
 msgid "48 kHz"
 msgstr "48 kHz"
 
-#: src/modplug/plugin_main.cc:68
+#: src/modplug/plugin_main.cc:67
 msgid "96 kHz"
 msgstr "96 kHz"
 
-#: src/modplug/plugin_main.cc:72 src/modplug/plugin_main.cc:77
-#: src/modplug/plugin_main.cc:82
+#: src/modplug/plugin_main.cc:71 src/modplug/plugin_main.cc:76
+#: src/modplug/plugin_main.cc:81
 msgid "Level:"
 msgstr "Nível:"
 
-#: src/modplug/plugin_main.cc:78
+#: src/modplug/plugin_main.cc:77
 msgid "Cutoff:"
 msgstr "Corte:"
 
-#: src/modplug/plugin_main.cc:91
+#: src/modplug/plugin_main.cc:90
 msgid "Reverb"
 msgstr "Reverb"
 
-#: src/modplug/plugin_main.cc:94
+#: src/modplug/plugin_main.cc:93
 msgid "Bass Boost"
 msgstr "Amplificação de graves"
 
-#: src/modplug/plugin_main.cc:97
+#: src/modplug/plugin_main.cc:96
 msgid "Surround"
 msgstr "Surround"
 
-#: src/modplug/plugin_main.cc:100
+#: src/modplug/plugin_main.cc:99
 msgid "Preamp"
 msgstr "Amplificador"
 
-#: src/modplug/plugin_main.cc:107
+#: src/modplug/plugin_main.cc:106
 msgid "Oversample"
 msgstr "Oversample"
 
-#: src/modplug/plugin_main.cc:108
+#: src/modplug/plugin_main.cc:107
 msgid "Noise reduction"
 msgstr "Redução de ruído"
 
-#: src/modplug/plugin_main.cc:109
+#: src/modplug/plugin_main.cc:108
 msgid "Play Amiga MODs"
 msgstr "Reproduzir Amiga MODs"
 
-#: src/modplug/plugin_main.cc:110
+#: src/modplug/plugin_main.cc:109
 msgid "Repeat"
 msgstr "Repetição"
 
-#: src/modplug/plugin_main.cc:111
+#: src/modplug/plugin_main.cc:110
 msgid "Repeat count:"
 msgstr "N.º de repetições:"
 
-#: src/modplug/plugin_main.cc:112
+#: src/modplug/plugin_main.cc:111
 msgid "To repeat forever, set the repeat count to -1."
 msgstr "Para repetir eternamente, defina o valor -1."
 
-#: src/modplug/plugin_main.cc:125 src/sid/xs_config.cc:106
+#: src/modplug/plugin_main.cc:124 src/sid/xs_config.cc:106
 msgid "These settings will take effect when Audacious is restarted."
 msgstr "Estas definições serão aplicadas após reiniciar o Audacious."
 
+#: src/moonstone/main_window.cc:72 src/moonstone/main_window.cc:73
+#: src/qtui/main_window.cc:159 src/qtui/main_window.cc:160
+#: src/skins/menus.cc:107 src/skins-qt/menus.cc:98
+msgid "Stop After This Song"
+msgstr "Parar após esta faixa"
+
+#: src/moonstone/moonstone.cc:39
+msgid "Moonstone"
+msgstr "Moonstone"
+
+#: src/moonstone/playlist_header.cc:212 src/qtui/playlist_header.cc:258
+msgid "Reset to Defaults"
+msgstr "Repor predefinições"
+
+#: src/moonstone/playlist_model.cc:38 src/qtui/playlist_header.cc:232
+msgid "Now Playing"
+msgstr "A reproduzir"
+
+#: src/moonstone/playlist_selection.cc:66
+#: src/playlist-manager/playlist-manager.cc:201
+#: src/playlist-manager-qt/playlist-manager-qt.cc:190
+msgid "Entries"
+msgstr "Entradas"
+
 #: src/mpg123/mpg123.cc:54
 msgid "MPG123 Plugin"
 msgstr "Suplemento MPG123"
 
-#: src/mpg123/mpg123.cc:83
-msgid "Advanced"
-msgstr "Avançado"
-
-#: src/mpg123/mpg123.cc:84
+#: src/mpg123/mpg123.cc:82
 msgid "Use accurate length calculation (slow)"
 msgstr "Usar cálculo preciso de duração (lento)"
 
-#: src/mpg123/mpg123.cc:248
+#: src/mpg123/mpg123.cc:260
 msgid "Surround"
 msgstr "Surround"
 
-#: src/mpris2/plugin.cc:39
+#: src/mpris2/plugin.cc:40
 msgid "MPRIS 2 Server"
 msgstr "Servidor MPRIS 2"
 
-#: src/neon/neon.cc:97
+#: src/neon/neon.cc:102
 msgid "Neon HTTP/HTTPS Plugin"
 msgstr "Suplemento Neon HTTP/HTTPS"
 
-#: src/neon/neon.cc:521
+#: src/neon/neon.cc:526
 msgid "Error parsing redirect"
 msgstr "Erro ao redirecionar"
 
-#: src/neon/neon.cc:535
+#: src/neon/neon.cc:540
 msgid "Unknown HTTP error"
 msgstr "Erro HTTP desconhecido"
 
-#: src/neon/neon.cc:569
+#: src/neon/neon.cc:614
 msgid "Error parsing URL"
 msgstr "Erro ao processar URL"
 
-#: src/neon/neon.cc:632
+#: src/neon/neon.cc:687
 msgid "Too many redirects"
 msgstr "Demasiados redirecionamentos"
 
-#: src/notify/event.cc:64
+#: src/notify/event.cc:97
 msgid "Stopped"
 msgstr "Parado"
 
-#: src/notify/event.cc:64
+#: src/notify/event.cc:97
 msgid "Audacious is not playing."
 msgstr "O Audacious não está a reproduzir."
 
-#: src/notify/notify.cc:42
+#: src/notify/notify.cc:39
 msgid "Desktop Notifications"
 msgstr "Notificações do ambiente de trabalho"
 
-#: src/notify/notify.cc:60
+#: src/notify/notify.cc:57
 msgid ""
 "Desktop Notifications Plugin for Audacious\n"
 "Copyright (C) 2010 Maximilian Bogner\n"
@@ -2648,9 +2809,8 @@
 "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"
+"Copyright (C) 2010 Maximilian Bogner\n"
+"Copyright (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 "
@@ -2665,36 +2825,81 @@
 "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.cc:110
+#: src/notify/notify.cc:104
 msgid "Show playback controls"
 msgstr "Mostrar controlos de reprodução"
 
-#: src/notify/notify.cc:112
+#: src/notify/notify.cc:106
 msgid "Always show notification"
 msgstr "Mostrar sempre notificação"
 
-#: src/notify/notify.cc:114
+#: src/notify/notify.cc:108
 msgid "Include album name in notification"
 msgstr "Incluir nome do álbum na notificação"
 
-#: src/notify/osd.cc:58
+#: src/notify/notify.cc:110
+msgid "Custom notification duration:"
+msgstr "Duração de notificação personalizada:"
+
+#: src/notify/osd.cc:74
 msgid "Show"
 msgstr "Mostrar"
 
-#: src/notify/osd.cc:66 src/qtui/main_window.cc:178
-#: src/qtui/main_window.cc:179 src/skins/menus.cc:88
-msgid "Pause"
-msgstr "Pausa"
+#: src/openmpt/mpt.cc:50
+msgid "OpenMPT (Module Player)"
+msgstr "OpenMPT (Reprodutor de módulos)"
 
-#: src/notify/osd.cc:73 src/qtui/main_window.cc:72 src/skins/menus.cc:91
-msgid "Next"
-msgstr "Seguinte"
+#: src/openmpt/mpt.cc:132
+msgid ""
+"Module player based on libopenmpt\n"
+"\n"
+"Written by: Chris Spiegel <cspiegel@gmail.com>"
+msgstr ""
+"Reprodutor de módulos baseado em libopenmpt\n"
+"\n"
+"Escrito por: Chris Spiegel <cspiegel@gmail.com>"
+
+#: src/openmpt/mpt.cc:151
+msgid "Stereo separation:"
+msgstr "Separação estéreo:"
+
+#: src/openmpt/mpt.cc:153
+msgid "% (0=mono, 100=default, 200=full)"
+msgstr ""
+
+#: src/openmpt/mpt.cc:157
+msgid "Interpolation:"
+msgstr "Interpolação:"
+
+#: src/openmpt/mptwrap.h:51 src/soxr/sox-resampler.cc:189 src/xsf/plugin.cc:437
+msgid "Linear"
+msgstr "Linear"
+
+#: src/openmpt/mptwrap.h:52
+msgid "Cubic"
+msgstr "Cúbica"
 
-#: src/oss4/oss.h:93
+#: src/openmpt/mptwrap.h:53
+msgid "Windowed sinc"
+msgstr "Sinc em janela"
+
+#: src/opus/opus.cc:39
+msgid "Opus Decoder"
+msgstr "Descodificador Opus"
+
+#: src/opus/opus.cc:336
+msgid ""
+"Opus Decoder Plugin for Audacious\n"
+"Copyright 2022 Thomas Lange"
+msgstr ""
+"Opus Decoder Plugin para o Audacious\n"
+"Copyright 2022 Thomas Lange"
+
+#: src/oss4/oss.h:70
 msgid "OSS4 Output"
 msgstr "Sistema OSS4"
 
-#: src/oss4/oss.h:95
+#: src/oss4/oss.h:72
 msgid "OSS3 Output"
 msgstr "Saída OSS3"
 
@@ -2702,27 +2907,27 @@
 msgid "Default device"
 msgstr "Dispositivo pré-definido"
 
-#: src/oss4/plugin.cc:77
+#: src/oss4/plugin.cc:78
 msgid "Audio device:"
 msgstr "Dispositivo áudio:"
 
-#: src/oss4/plugin.cc:80
+#: src/oss4/plugin.cc:81
 msgid "Use alternate device:"
 msgstr "Utilizar dispositivo alternativo:"
 
-#: src/oss4/plugin.cc:84
+#: src/oss4/plugin.cc:85
 msgid "Save volume between sessions."
 msgstr "Memorizar volume entre sessões."
 
-#: src/oss4/plugin.cc:86
+#: src/oss4/plugin.cc:87
 msgid "Enable format conversions made by the OSS software."
 msgstr "Ativar conversão de formatos com o programa OSS."
 
-#: src/oss4/plugin.cc:88
+#: src/oss4/plugin.cc:89
 msgid "Enable exclusive mode to prevent virtual mixing."
 msgstr "Ativar modo exclusivo para prevenir mistura virtual."
 
-#: src/oss4/plugin.cc:100
+#: src/oss4/plugin.cc:101
 msgid ""
 "OSS4 Output Plugin for Audacious\n"
 "Copyright 2010-2012 Michał Lipski\n"
@@ -2731,24 +2936,45 @@
 "Lindgren and of course the authors of the previous OSS plugin."
 msgstr ""
 "Suplemento OSS4\n"
-"Direitos de autor 2010-2012 Michał Lipski\n"
+"Copyright 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/playlist-manager/playlist-manager.cc:37
+#: src/pipewire/pipewire.cc:44
+msgid "PipeWire Output"
+msgstr "Saída PipeWire"
+
+#: src/pipewire/pipewire.cc:118
+msgid ""
+"PipeWire Output Plugin for Audacious\n"
+"Copyright 2022 Thomas Lange\n"
+"\n"
+"Based on the PipeWire Output Plugin for Qmmp\n"
+"Copyright 2021 Ilya Kotov"
+msgstr ""
+"PipeWire Output Plugin para o Audacious\n"
+"Copyright 2022 Thomas Lange\n"
+"\n"
+"Based on the PipeWire Output Plugin para o Qmmp\n"
+"Copyright 2021 Ilya Kotov"
+
+#: src/pipewire/pipewire.cc:408 src/skins/menus.cc:88 src/skins-qt/menus.cc:79
+msgid "Playback"
+msgstr "Reprodução"
+
+#: src/playlist-manager/playlist-manager.cc:38
+#: src/playlist-manager-qt/playlist-manager-qt.cc:42
 msgid "Playlist Manager"
 msgstr "Gestor de lista de reprodução"
 
-#: src/playlist-manager/playlist-manager.cc:226
-msgid "Entries"
-msgstr "Entradas"
-
-#: src/playlist-manager/playlist-manager.cc:245
+#: src/playlist-manager/playlist-manager.cc:221
+#: src/playlist-manager-qt/playlist-manager-qt.cc:356
 msgid "_Remove"
 msgstr "_Remover"
 
-#: src/playlist-manager/playlist-manager.cc:246
+#: src/playlist-manager/playlist-manager.cc:222
+#: src/playlist-manager-qt/playlist-manager-qt.cc:351
 msgid "Ren_ame"
 msgstr "Mud_ar nome"
 
@@ -2756,38 +2982,53 @@
 msgid "PLS Playlists"
 msgstr "Listas de reprodução PLS"
 
-#: src/psf/plugin.cc:45
+#: src/psf/plugin.cc:53
 msgid "OpenPSF PSF1/PSF2 Decoder"
 msgstr "Descodificador OpenPSF PSF1/PSF2"
 
-#: src/pulse_audio/pulse_audio.cc:38
+#: src/psf/plugin.cc:270
+msgid "OpenPSF Configuration"
+msgstr "Configuração do OpenPSF"
+
+#: src/psf/plugin.cc:271 src/xsf/plugin.cc:444
+msgid "Ignore length from file"
+msgstr "Ignorar duração do ficheiro"
+
+#: src/pulse/pulse_audio.cc:42
 msgid "PulseAudio Output"
 msgstr "Sistema PulseAudio"
 
-#: src/pulse_audio/pulse_audio.cc:611
+#: src/pulse/pulse_audio.cc:84
+msgid "Context name:"
+msgstr "Nome do contexto:"
+
+#: src/pulse/pulse_audio.cc:86
+msgid "Stream name:"
+msgstr "Nome do stream:"
+
+#: src/pulse/pulse_audio.cc:596
 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"
+"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"
-"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."
+"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 ""
 "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 "
+"Software Foundation, tanto na versão 2 ou (por opção) qualquer versão mais "
 "recente.\n"
 "\n"
 "Este programa é disponibilizado com o intuito de ser útil mas NÃO POSSUI "
@@ -2796,15 +3037,15 @@
 "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."
+"programa. Se tal não aconteceu, escreva uma carta para:\n"
+"Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA "
+"02110-1301, USA."
 
-#: src/qtaudio/qtaudio.cc:49
+#: src/qtaudio/qtaudio.cc:53
 msgid "QtMultimedia Output"
 msgstr "Saída QtMultimedia"
 
-#: src/qtaudio/qtaudio.cc:77
+#: src/qtaudio/qtaudio.cc:84
 msgid ""
 "QtMultimedia Audio Output Plugin for Audacious\n"
 "Copyright 2014 William Pitcock\n"
@@ -2813,55 +3054,114 @@
 "Copyright 2010 John Lindgren"
 msgstr ""
 "Suplemento QtMultimedia Audio Output\n"
-"Direitos de autor 2014 William Pitcock\n"
+"Copyright 2014 William Pitcock\n"
 "\n"
 "Baseado no suplemento SDL Output\n"
-"Direitos de autor 2010 John Lindgren"
+"Copyright 2010 John Lindgren"
 
-#: src/qtui/dialog_windows.cc:31
-msgid "Working ..."
-msgstr "Execução..."
+#: src/qtglspectrum/gl-spectrum.cc:41
+msgid ""
+"OpenGL Spectrum Analyzer for Audacious\n"
+"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
+"Copyright 2014, 2020 Ariadne Conill\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 Espectro OpenGL para Audacious\n"
+"Copyright 2013 Christophe Budé, John Lindgren, e Carlo Bramini\n"
+"Copyright 2014, 2020 Ariadne Conill\n"
+"\n"
+"Baseado no plugin XMMS:\n"
+"Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson, e "
+"4Front \n"
+"\n"
+"Licença: GPLv2+"
 
-#: src/qtui/filter_input.cc:44 src/skins/ui_playlist.cc:221
-msgid "Search"
-msgstr "Procura"
+#: src/qthotkey/gui.cc:177
+msgid "Press a key combination inside a text field."
+msgstr "Prima uma combinação de teclas dentro de um campo de texto."
+
+#: src/qthotkey/plugin.cc:105
+msgid ""
+"Global Hotkey Plugin\n"
+"Control the player with global key combinations or multimedia keys.\n"
+"\n"
+"Copyright (C) 2020 i.Dark_Templar <darktemplar@dark-templar-archives.net>\n"
+"Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n"
+"\n"
+"Contributors 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 ""
+"Plugin Global Hotkey\n"
+"Controla o reprodutor com combinações de teclas globais ou teclas "
+"multimídia.\n"
+"\n"
+"Copyright (C) 2020 i.Dark_Templar <darktemplar@dark-templar-archives.net>\n"
+"Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n"
+"\n"
+"Os colaboradores incluem:\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/qtui/main_window_actions.cc:94
+#: src/qtui/menus.cc:109
 msgid "_Open Folder ..."
 msgstr "A_brir pasta..."
 
-#: src/qtui/main_window_actions.cc:96
+#: src/qtui/menus.cc:115
 msgid "_Add Folder ..."
 msgstr "_Adicionar pasta..."
 
-#: src/qtui/main_window_actions.cc:101
+#: src/qtui/menus.cc:128
 msgid "_Log Inspector ..."
 msgstr "Insp_etor de registos..."
 
-#: src/qtui/main_window.cc:64
-msgid "Open Files"
-msgstr "Abrir ficheiros"
+#: src/qtui/menus.cc:220
+msgid "_Find ..."
+msgstr "Loca_lizar..."
 
-#: src/qtui/main_window.cc:66
-msgid "Add Files"
-msgstr "Adicionar ficheiros"
+#: src/qtui/menus.cc:256 src/skins/menus.cc:80 src/skins-qt/menus.cc:70
+msgid "Audio Settings ..."
+msgstr "Definições áudio..."
 
-#: src/qtui/main_window.cc:71 src/skins/menus.cc:90
-msgid "Previous"
-msgstr "Anterior"
+#: src/qtui/playlist_model.cc:188
+msgid "Q#"
+msgstr "Q#"
 
-#: src/qtui/main_window.cc:77 src/skins/menus.cc:82
-msgid "Repeat"
-msgstr "Repetir"
+#: src/qtui/playlist_model.cc:190
+msgid "T#"
+msgstr "F#"
 
-#: src/qtui/main_window.cc:79 src/skins/menus.cc:83
-msgid "Shuffle"
-msgstr "Baralhar"
+#: src/qtui/playlist_model.cc:192
+msgid "C#"
+msgstr "C#"
+
+#: src/qtui/playlist_model.cc:194
+msgid "D#"
+msgstr ""
 
-#: src/qtui/qtui.cc:42
+#: src/qtui/qtui.cc:40
 msgid "Qt Interface"
 msgstr "Interface Qt"
 
+#: src/qtui/search_bar.cc:46
+msgid "Search playlist"
+msgstr "Pesquisar na lista de reprodução"
+
+#: src/qtui/settings.cc:79
+msgid "Use bold font for column headers"
+msgstr "Usar tipo de letra em negrito nos cabeçalhos de coluna"
+
 #: src/resample/resample.cc:43
 msgid "Sample Rate Converter"
 msgstr "Conversor de frequências"
@@ -2872,7 +3172,7 @@
 "Copyright 2010-2012 John Lindgren"
 msgstr ""
 "Suplemento Sample Rate Converter\n"
-"Direitos de autor 2010-2012 John Lindgren"
+"Copyright 2010-2012 John Lindgren"
 
 #: src/resample/resample.cc:187
 msgid "Skip/repeat samples"
@@ -2902,7 +3202,7 @@
 msgid "Method:"
 msgstr "Método:"
 
-#: src/resample/resample.cc:199 src/sox-resampler/sox-resampler.cc:161
+#: src/resample/resample.cc:199 src/soxr/sox-resampler.cc:203
 msgid "Rate:"
 msgstr "Taxa:"
 
@@ -2954,66 +3254,55 @@
 msgid "192 kHz:"
 msgstr "192 kHz:"
 
-#: src/scrobbler2/config_window.cc:41
-#, c-format
-msgid "OK. Scrobbling for user: %s"
-msgstr "OK. A fazer scrobble para o utilizador: %s"
+#: src/scrobbler2/config_window.cc:29
+msgid "Checking Last.fm access ..."
+msgstr "A verificar o acesso Last.fm..."
 
-#: src/scrobbler2/config_window.cc:54
-msgid "Permission Denied"
-msgstr "Permissão recusada"
-
-#: src/scrobbler2/config_window.cc:56
-msgid "Access the following link to allow Audacious to scrobble your plays:"
+#: src/scrobbler2/config_window.cc:35
+msgid ""
+"Your scrobbles are being saved on your computer temporarily. They will be "
+"submitted as soon as Audacious is allowed access."
 msgstr ""
-"Aceda a esta ligação para permitir que o Audacious faça scrobble das "
-"reproduções:"
+"Os seus 'scrobbles' estão guardados no computador. Serão enviados assim que "
+"o Audacious tiver permissão para o fazer."
 
-#: src/scrobbler2/config_window.cc:66
-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.cc:41
+#, c-format
+msgid "Permission granted. Scrobbling for user %s."
+msgstr "Permissão concedida. A enviar faixas para o utilizador %s."
 
-#: src/scrobbler2/config_window.cc:69 src/scrobbler2/config_window.cc:80
+#: src/scrobbler2/config_window.cc:44
 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."
+"Permission denied. Open the following URL in a browser, allow Audacious "
+"access to your account, and then click 'Check Permission' again:"
 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.cc:77
-msgid "Network Problem."
-msgstr "Erro na rede"
-
-#: src/scrobbler2/config_window.cc:78
-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."
+"Permissão recusada. Abra o seguinte URL no navegador, permita que o "
+"Audacious tenha acesso à sua conta e clique novamente em 'Verificar "
+"permissão':"
 
-#: src/scrobbler2/config_window.cc:110
-msgid "Checking..."
-msgstr "A verificar..."
+#: src/scrobbler2/config_window.cc:53
+msgid "There was a problem contacting Last.fm."
+msgstr "Ocorreu um erro ao contactar com a Last.fm."
 
-#: src/scrobbler2/config_window.cc:176
-msgid "C_heck Permission"
-msgstr "Verific_ar permissão"
+#: src/scrobbler2/config_window.cc:92
+msgid "Check Permission"
+msgstr "Verificar permissão"
 
-#: src/scrobbler2/config_window.cc:177
-msgid "_Revoke Permission"
-msgstr "_Revogar permissão"
+#: src/scrobbler2/config_window.cc:93
+msgid "Revoke Permission"
+msgstr "Revogar permissão"
 
-#: src/scrobbler2/config_window.cc:220
-msgid ""
-"You need to allow Audacious to scrobble tracks to your Last.fm account.\n"
+#: src/scrobbler2/config_window.cc:97
+msgid "You need to allow Audacious to scrobble tracks to your Last.fm account."
 msgstr ""
-"Tem de dar permissão ao Audacious para fazer scrobble das faixas para a sua "
-"conta Last.fm.\n"
+"Tem que permitir que o Audacious aceda à sua conta Last.fm para poder fazer "
+"o 'scrobble' das suas faixas."
 
 #: src/scrobbler2/scrobbler.cc:29
 msgid "Scrobbler 2.0"
 msgstr "Scrobbler 2.0"
 
-#: src/scrobbler2/scrobbler.cc:224
+#: src/scrobbler2/scrobbler.cc:200
 msgid ""
 "The Scrobbler plugin could not be started.\n"
 "There might be a problem with your installation."
@@ -3021,94 +3310,66 @@
 "O suplemento Scrobbler não foi iniciado.\n"
 "Pode haver um problema com a sua instalação."
 
-#: src/scrobbler2/scrobbler.cc:289
+#: src/scrobbler2/scrobbler.cc:245
 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 ""
-"Suplemento 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 projeto.\n"
-"\n"
-
-#: src/scrobbler2/scrobbler_communication.cc:642
-msgid ""
-"Audacious is now using an improved version of the Last.fm Scrobbler.\n"
-"Please check the Preferences for the Scrobbler plugin."
+"project."
 msgstr ""
-"O Audacious passou a usar uma nova versão do scrobbler Last.fm.\n"
-"Por favor verifique as definições do suplemento Scrobbler."
 
-#: src/sdlout/sdlout.cc:48
+#: src/sdlout/sdlout.cc:43
 msgid "SDL Output"
 msgstr "Sistema SDL"
 
-#: src/sdlout/sdlout.cc:77
+#: src/sdlout/sdlout.cc:72
 msgid ""
 "SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
 msgstr ""
 "Suplemento SDL\n"
-"Direitos de autor 2010 John Lindgren"
+"Copyright 2010 John Lindgren"
 
-#: src/search-tool/search-tool.cc:116 src/search-tool/search-tool.cc:124
+#: src/search-tool/library.cc:35 src/search-tool/library.cc:46
+#: src/search-tool-qt/library.cc:35 src/search-tool-qt/library.cc:46
 msgid "Library"
 msgstr "Coleção"
 
-#: src/search-tool/search-tool.cc:394
-#, c-format
-msgid "%d result"
-msgid_plural "%d results"
-msgstr0 "%d resultado"
-msgstr1 "%d resultados"
-
-#: src/search-tool/search-tool.cc:400
-#, c-format
-msgid "(%d hidden)"
-msgid_plural "(%d hidden)"
-msgstr0 "(%d oculto)"
-msgstr1 "(%d ocultos)"
-
-#: src/search-tool/search-tool.cc:594
+#: src/search-tool-qt/search-model.cc:44 src/search-tool/search-tool.cc:287
 #, c-format
 msgid "%d song"
 msgid_plural "%d songs"
 msgstr0 "%d faixa"
 msgstr1 "%d faixas"
+msgstr2 "%d faixas"
 
-#: src/search-tool/search-tool.cc:601
+#: src/search-tool-qt/search-model.cc:53 src/search-tool/search-tool.cc:294
 msgid "of this genre"
 msgstr "deste género"
 
-#: src/search-tool/search-tool.cc:607
+#: src/search-tool-qt/search-model.h:47 src/search-tool/search-model.h:45
 msgid "on"
 msgstr "em"
 
-#: src/search-tool/search-tool.cc:607
+#: src/search-tool-qt/search-model.h:47 src/search-tool/search-model.h:45
 msgid "by"
 msgstr "por"
 
-#: src/search-tool/search-tool.cc:643
-msgid "_Create Playlist"
-msgstr "_Criar lista de reprodução"
-
-#: src/search-tool/search-tool.cc:645
-msgid "_Add to Playlist"
-msgstr "_Adicionar à lista de reprodução"
-
-#: src/search-tool/search-tool.cc:684
-msgid "Search library"
-msgstr "Procurar coleção"
+#: src/search-tool-qt/search-tool-qt.cc:165 src/search-tool/search-tool.cc:74
+msgid "Number of results to show:"
+msgstr "Número de resultados a mostrar:"
+
+#: src/search-tool-qt/search-tool-qt.cc:168 src/search-tool/search-tool.cc:77
+msgid "Rescan library at startup"
+msgstr "Analisar coleção ao iniciar"
+
+#: src/search-tool-qt/search-tool-qt.cc:170
+msgid "Monitor library for changes"
+msgstr "Monitorizar biblioteca quanto a alterações"
 
-#: src/search-tool/search-tool.cc:688
+#: src/search-tool-qt/search-tool-qt.cc:193 src/search-tool/search-tool.cc:450
 msgid ""
 "To import your music library into Audacious, choose a folder and then click "
 "the \"refresh\" icon."
@@ -3116,22 +3377,46 @@
 "Para importar a coleção de músicas para o Audacious, escolha a pasta e "
 "clique no ícone \"Atualizar\"."
 
-#: src/search-tool/search-tool.cc:696
+#: src/search-tool-qt/search-tool-qt.cc:195 src/search-tool/search-tool.cc:459
 msgid "Please wait ..."
 msgstr "Aguarde..."
 
-#: src/search-tool/search-tool.cc:723
+#: src/search-tool-qt/search-tool-qt.cc:197 src/search-tool/search-tool.cc:487
 msgid "Choose Folder"
 msgstr "Escolha a pasta"
 
+#: src/search-tool-qt/search-tool-qt.cc:201 src/search-tool/search-tool.cc:445
+msgid "Search library"
+msgstr "Procurar coleção"
+
+#: src/search-tool-qt/search-tool-qt.cc:327 src/search-tool/search-tool.cc:156
+#, c-format
+msgid "%d of %d result shown"
+msgid_plural "%d of %d results shown"
+msgstr0 "Mostrado %d de %d resultado"
+msgstr1 "Mostrados %d de %d resultados"
+msgstr2 "Mostrados %d de %d resultados"
+
+#: src/search-tool-qt/search-tool-qt.cc:331 src/search-tool/search-tool.cc:160
+#, c-format
+msgid "%d result"
+msgid_plural "%d results"
+msgstr0 "%d resultado"
+msgstr1 "%d resultados"
+msgstr2 "%d resultados"
+
+#: src/search-tool-qt/search-tool-qt.cc:501 src/search-tool/search-tool.cc:341
+msgid "_Create Playlist"
+msgstr "_Criar lista de reprodução"
+
+#: src/search-tool-qt/search-tool-qt.cc:503 src/search-tool/search-tool.cc:343
+msgid "_Add to Playlist"
+msgstr "_Adicionar à lista de reprodução"
+
 #: src/sid/xmms-sid.cc:43
 msgid "SID Player"
 msgstr "Reprodutor SID"
 
-#: src/sid/xs_config.cc:61
-msgid "Output"
-msgstr "Saída"
-
 #: src/sid/xs_config.cc:62
 msgid "Channels:"
 msgstr "Canais:"
@@ -3202,7 +3487,7 @@
 "Copyright 2014 John Lindgren"
 msgstr ""
 "Suplemento Silence Removal\n"
-"Direitos de autor 2014 John Lindgren"
+"Copyright 2014 John Lindgren"
 
 #: src/silence-removal/silence-removal.cc:67
 msgid "Silence Removal"
@@ -3212,741 +3497,684 @@
 msgid "Threshold:"
 msgstr "Limite:"
 
-#: src/silence-removal/silence-removal.cc:70
-msgid "dB"
-msgstr "dB"
+#: src/skins/actions.cc:45 src/skins-qt/actions.cc:43
+msgid "Repeat points cleared."
+msgstr "Pontos de repetição removidos"
+
+#: src/skins/actions.cc:60 src/skins-qt/actions.cc:58
+msgid "Repeat point A set."
+msgstr "Ponto de repetição A definido"
+
+#: src/skins/actions.cc:65 src/skins-qt/actions.cc:63
+msgid "Repeat point B set."
+msgstr "Ponto de repetição B definido"
+
+#: src/skins/equalizer.cc:223 src/skins-qt/equalizer.cc:223
+msgid "Preamp"
+msgstr "Amplificador"
+
+#: src/skins/equalizer.cc:227 src/skins-qt/equalizer.cc:227
+msgid "31 Hz"
+msgstr "31 Hz"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "63 Hz"
+msgstr "63 Hz"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "125 Hz"
+msgstr "125 Hz"
 
-#: src/skins/menus.cc:64
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "250 Hz"
+msgstr "250 Hz"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "500 Hz"
+msgstr "500 Hz"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "1 kHz"
+msgstr "1 kHz"
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "2 kHz"
+msgstr "2 kHz"
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "4 kHz"
+msgstr "4 kHz"
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "8 kHz"
+msgstr "8 kHz"
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "16 kHz"
+msgstr "16 kHz"
+
+#: src/skins/equalizer.cc:270 src/skins-qt/equalizer.cc:270
+msgid "Audacious Equalizer"
+msgstr "Equalizador do Audacious"
+
+#: src/skins/main.cc:459 src/skins-qt/main.cc:442
+msgid "Recording on"
+msgstr "Gravação ativa"
+
+#: src/skins/main.cc:461 src/skins-qt/main.cc:444
+msgid "Recording off"
+msgstr "Gravação inativa"
+
+#: src/skins/main.cc:754 src/skins-qt/main.cc:701
+#, c-format
+msgid "Seek to %d:%-2.2d / %d:%-2.2d"
+msgstr "Ir para %d:%-2.2d / %d:%-2.2d"
+
+#: src/skins/main.cc:771 src/skins-qt/main.cc:718
+#, c-format
+msgid "Volume: %d%%"
+msgstr "Volume: %d%%"
+
+#: src/skins/main.cc:784 src/skins-qt/main.cc:731
+#, c-format
+msgid "Balance: %d%% left"
+msgstr "Equilíbrio: %d%% à esquerda"
+
+#: src/skins/main.cc:786 src/skins-qt/main.cc:733
+msgid "Balance: center"
+msgstr "Equilíbrio: centro"
+
+#: src/skins/main.cc:788 src/skins-qt/main.cc:735
+#, c-format
+msgid "Balance: %d%% right"
+msgstr "Equilíbrio: %d%% à direita"
+
+#: src/skins/main.cc:880 src/skins-qt/main.cc:827
+msgid "Options Menu"
+msgstr "Menu de opções"
+
+#: src/skins/main.cc:884 src/skins-qt/main.cc:831
+msgid "Disable 'Always On Top'"
+msgstr "Desativar \"Sempre visível\""
+
+#: src/skins/main.cc:886 src/skins-qt/main.cc:833
+msgid "Enable 'Always On Top'"
+msgstr "Ativar \"Sempre visível\""
+
+#: src/skins/main.cc:889 src/skins-qt/main.cc:836
+msgid "File Info Box"
+msgstr "Caixa de informações de ficheiro"
+
+#: src/skins/main.cc:892 src/skins/menus.cc:149 src/skins-qt/main.cc:839
+#: src/skins-qt/menus.cc:142
+msgid "Double Size"
+msgstr "Tamanho duplo"
+
+#: src/skins/main.cc:895 src/skins-qt/main.cc:842
+msgid "Visualizations"
+msgstr "Visualizações"
+
+#: src/skins/menus.cc:74 src/skins-qt/menus.cc:64
+msgid "Volume Up"
+msgstr "Aumentar volume"
+
+#: src/skins/menus.cc:75 src/skins-qt/menus.cc:65
+msgid "Volume Down"
+msgstr "Reduzir volume"
+
+#: src/skins/menus.cc:77 src/skins-qt/menus.cc:67
+msgid "Effects ..."
+msgstr "Efeitos..."
+
+#: src/skins/menus.cc:84 src/skins-qt/menus.cc:74
 msgid "Open Files ..."
 msgstr "Abrir ficheiros..."
 
-#: src/skins/menus.cc:65
+#: src/skins/menus.cc:85 src/skins-qt/menus.cc:76
 msgid "Open URL ..."
 msgstr "Abrir URL..."
 
-#: src/skins/menus.cc:66
-msgid "Search Library"
-msgstr "Procurar na coleção"
-
-#: src/skins/menus.cc:68
-msgid "Playback"
-msgstr "Reprodução"
-
-#: src/skins/menus.cc:69
+#: src/skins/menus.cc:89 src/skins-qt/menus.cc:80
 msgid "Playlist"
 msgstr "Lista de reprodução"
 
-#: src/skins/menus.cc:70
+#: src/skins/menus.cc:90 src/skins-qt/menus.cc:81
+msgid "Output"
+msgstr "Saída"
+
+#: src/skins/menus.cc:91 src/skins-qt/menus.cc:82
 msgid "View"
 msgstr "Ver"
 
-#: src/skins/menus.cc:72 src/skins/menus.cc:136 src/skins/menus.cc:149
-#: src/skins/menus.cc:214
+#: src/skins/menus.cc:93 src/skins/menus.cc:161 src/skins/menus.cc:174
+#: src/skins/menus.cc:245 src/skins-qt/menus.cc:84 src/skins-qt/menus.cc:156
+#: src/skins-qt/menus.cc:170 src/skins-qt/menus.cc:241
 msgid "Services"
 msgstr "Serviços"
 
-#: src/skins/menus.cc:74
+#: src/skins/menus.cc:95 src/skins-qt/menus.cc:86
 msgid "About ..."
 msgstr "Sobre..."
 
-#: src/skins/menus.cc:75
+#: src/skins/menus.cc:96 src/skins-qt/menus.cc:87
 msgid "Settings ..."
 msgstr "Definições..."
 
-#: src/skins/menus.cc:76
+#: src/skins/menus.cc:97 src/skins-qt/menus.cc:88
 msgid "Quit"
 msgstr "Sair"
 
-#: src/skins/menus.cc:80 src/skins/menus.cc:206
+#: src/skins/menus.cc:101 src/skins/menus.cc:235 src/skins-qt/menus.cc:92
+#: src/skins-qt/menus.cc:231
 msgid "Song Info ..."
 msgstr "Informações da faixa..."
 
-#: src/skins/menus.cc:84
+#: src/skins/menus.cc:105 src/skins-qt/menus.cc:96
+msgid "Shuffle by Album"
+msgstr "Baralhar por álbum"
+
+#: src/skins/menus.cc:106 src/skins-qt/menus.cc:97
 msgid "No Playlist Advance"
 msgstr "Sem avanço na lista de reprodução"
 
-#: src/skins/menus.cc:85
-msgid "Stop After This Song"
-msgstr "Parar após esta faixa"
-
-#: src/skins/menus.cc:93
+#: src/skins/menus.cc:117 src/skins-qt/menus.cc:108
 msgid "Set A-B Repeat"
 msgstr "Definir repetição A-B"
 
-#: src/skins/menus.cc:94
+#: src/skins/menus.cc:118 src/skins-qt/menus.cc:109
 msgid "Clear A-B Repeat"
 msgstr "Remover repetição A-B"
 
-#: src/skins/menus.cc:96
+#: src/skins/menus.cc:120 src/skins-qt/menus.cc:111
 msgid "Jump to Song ..."
 msgstr "Ir para a faixa..."
 
-#: src/skins/menus.cc:97
+#: src/skins/menus.cc:121 src/skins-qt/menus.cc:113
 msgid "Jump to Time ..."
 msgstr "Ir para posição temporal..."
 
-#: src/skins/menus.cc:101
+#: src/skins/menus.cc:125 src/skins-qt/menus.cc:118
 msgid "Play/Resume"
 msgstr "Reproduzir/Retomar"
 
-#: src/skins/menus.cc:103
+#: src/skins/menus.cc:127 src/skins-qt/menus.cc:120
 msgid "New Playlist"
 msgstr "Nova lista de reprodução"
 
-#: src/skins/menus.cc:104
+#: src/skins/menus.cc:128 src/skins-qt/menus.cc:121
 msgid "Rename Playlist ..."
 msgstr "Mudar nome da lista de reprodução..."
 
-#: src/skins/menus.cc:105
+#: src/skins/menus.cc:129 src/skins-qt/menus.cc:122
 msgid "Remove Playlist"
 msgstr "Remover lista de reprodução..."
 
-#: src/skins/menus.cc:107
+#: src/skins/menus.cc:131 src/skins-qt/menus.cc:124
 msgid "Previous Playlist"
 msgstr "Lista de reprodução anterior"
 
-#: src/skins/menus.cc:108
+#: src/skins/menus.cc:132 src/skins-qt/menus.cc:125
 msgid "Next Playlist"
 msgstr "Próxima lista de reprodução"
 
-#: src/skins/menus.cc:110
+#: src/skins/menus.cc:134 src/skins-qt/menus.cc:127
 msgid "Import Playlist ..."
 msgstr "Importar lista de reprodução..."
 
-#: src/skins/menus.cc:111
+#: src/skins/menus.cc:135 src/skins-qt/menus.cc:128
 msgid "Export Playlist ..."
 msgstr "Exportar lista de reprodução..."
 
-#: src/skins/menus.cc:113
+#: src/skins/menus.cc:137 src/skins-qt/menus.cc:130
 msgid "Playlist Manager ..."
 msgstr "Gestão da lista de reprodução..."
 
-#: src/skins/menus.cc:114
+#: src/skins/menus.cc:138 src/skins-qt/menus.cc:131
 msgid "Queue Manager ..."
 msgstr "Gestão da fila de reprodução..."
 
-#: src/skins/menus.cc:116
+#: src/skins/menus.cc:140 src/skins-qt/menus.cc:133
 msgid "Refresh Playlist"
 msgstr "Atualizar lista de reprodução"
 
-#: src/skins/menus.cc:120
+#: src/skins/menus.cc:144 src/skins-qt/menus.cc:137
 msgid "Show Playlist Editor"
 msgstr "Mostrar editor de listas de reprodução"
 
-#: src/skins/menus.cc:121
+#: src/skins/menus.cc:145 src/skins-qt/menus.cc:138
 msgid "Show Equalizer"
 msgstr "Mostrar equalizador"
 
-#: src/skins/menus.cc:123
+#: src/skins/menus.cc:147 src/skins-qt/menus.cc:140
 msgid "Show Remaining Time"
 msgstr "Mostrar tempo restante"
 
-#: src/skins/menus.cc:125
+#: src/skins/menus.cc:150 src/skins-qt/menus.cc:143
 msgid "Always on Top"
 msgstr "Sempre visível"
 
-#: src/skins/menus.cc:126
+#: src/skins/menus.cc:151 src/skins-qt/menus.cc:145
 msgid "On All Workspaces"
 msgstr "Em todas as áreas de trabalho"
 
-#: src/skins/menus.cc:128
+#: src/skins/menus.cc:153 src/skins-qt/menus.cc:148
 msgid "Roll Up Player"
 msgstr "Recolher reprodutor"
 
-#: src/skins/menus.cc:129
+#: src/skins/menus.cc:154 src/skins-qt/menus.cc:149
 msgid "Roll Up Playlist Editor"
 msgstr "Recolher editor de listas"
 
-#: src/skins/menus.cc:130
+#: src/skins/menus.cc:155 src/skins-qt/menus.cc:150
 msgid "Roll Up Equalizer"
 msgstr "Recolher equalizador"
 
-#: src/skins/menus.cc:132 src/skins/ui_main.cc:854
-msgid "Double Size"
-msgstr "Tamanho duplo"
-
-#: src/skins/menus.cc:138
+#: src/skins/menus.cc:163 src/skins-qt/menus.cc:158
 msgid "Add URL ..."
 msgstr "Adicionar URL..."
 
-#: src/skins/menus.cc:139
+#: src/skins/menus.cc:164 src/skins-qt/menus.cc:160
 msgid "Add Files ..."
 msgstr "Adicionar ficheiros..."
 
-#: src/skins/menus.cc:143 src/skins/menus.cc:171 src/skins/menus.cc:185
+#: src/skins/menus.cc:168 src/skins/menus.cc:196 src/skins/menus.cc:212
+#: src/skins-qt/menus.cc:164 src/skins-qt/menus.cc:192
+#: src/skins-qt/menus.cc:208
 msgid "By Title"
 msgstr "Por título"
 
-#: src/skins/menus.cc:144 src/skins/menus.cc:178 src/skins/menus.cc:192
+#: src/skins/menus.cc:169 src/skins/menus.cc:203 src/skins/menus.cc:219
+#: src/skins-qt/menus.cc:165 src/skins-qt/menus.cc:199
+#: src/skins-qt/menus.cc:215
 msgid "By File Name"
 msgstr "Por nome de ficheiro"
 
-#: src/skins/menus.cc:145 src/skins/menus.cc:179 src/skins/menus.cc:193
+#: src/skins/menus.cc:170 src/skins/menus.cc:204 src/skins/menus.cc:220
+#: src/skins-qt/menus.cc:166 src/skins-qt/menus.cc:200
+#: src/skins-qt/menus.cc:216
 msgid "By File Path"
 msgstr "Por caminho"
 
-#: src/skins/menus.cc:151
+#: src/skins/menus.cc:176 src/skins-qt/menus.cc:172
 msgid "Remove All"
 msgstr "Remover tudo"
 
-#: src/skins/menus.cc:152
+#: src/skins/menus.cc:177 src/skins-qt/menus.cc:173
 msgid "Clear Queue"
 msgstr "Limpar fila de reprodução"
 
-#: src/skins/menus.cc:154
+#: src/skins/menus.cc:179 src/skins-qt/menus.cc:175
 msgid "Remove Unavailable Files"
 msgstr "Remover ficheiros indisponíveis"
 
-#: src/skins/menus.cc:155
+#: src/skins/menus.cc:180 src/skins-qt/menus.cc:176
 msgid "Remove Duplicates"
 msgstr "Remover duplicados"
 
-#: src/skins/menus.cc:157
+#: src/skins/menus.cc:182 src/skins-qt/menus.cc:178
 msgid "Remove Unselected"
 msgstr "Remover desmarcadas"
 
-#: src/skins/menus.cc:158
+#: src/skins/menus.cc:183 src/skins-qt/menus.cc:179
 msgid "Remove Selected"
 msgstr "Remover seleção"
 
-#: src/skins/menus.cc:162
+#: src/skins/menus.cc:187 src/skins-qt/menus.cc:183
 msgid "Search and Select"
 msgstr "Procurar e selecionar"
 
-#: src/skins/menus.cc:164
+#: src/skins/menus.cc:189 src/skins-qt/menus.cc:185
 msgid "Invert Selection"
 msgstr "Inverter seleção"
 
-#: src/skins/menus.cc:165
+#: src/skins/menus.cc:190 src/skins-qt/menus.cc:186
 msgid "Select None"
 msgstr "Não selecionar"
 
-#: src/skins/menus.cc:166
+#: src/skins/menus.cc:191 src/skins-qt/menus.cc:187
 msgid "Select All"
 msgstr "Selecionar tudo"
 
-#: src/skins/menus.cc:170 src/skins/menus.cc:184
+#: src/skins/menus.cc:195 src/skins/menus.cc:211 src/skins-qt/menus.cc:191
+#: src/skins-qt/menus.cc:207
 msgid "By Track Number"
 msgstr "Por número de faixa"
 
-#: src/skins/menus.cc:172 src/skins/menus.cc:186
+#: src/skins/menus.cc:197 src/skins/menus.cc:213 src/skins-qt/menus.cc:193
+#: src/skins-qt/menus.cc:209
 msgid "By Artist"
 msgstr "Por artista"
 
-#: src/skins/menus.cc:173 src/skins/menus.cc:187
+#: src/skins/menus.cc:198 src/skins/menus.cc:214 src/skins-qt/menus.cc:194
+#: src/skins-qt/menus.cc:210
 msgid "By Album"
 msgstr "Por álbum"
 
-#: src/skins/menus.cc:174 src/skins/menus.cc:188
+#: src/skins/menus.cc:199 src/skins/menus.cc:215 src/skins-qt/menus.cc:195
+#: src/skins-qt/menus.cc:211
 msgid "By Album Artist"
 msgstr "Por artista do álbum"
 
-#: src/skins/menus.cc:175 src/skins/menus.cc:190
+#: src/skins/menus.cc:200 src/skins/menus.cc:216 src/skins-qt/menus.cc:196
+#: src/skins-qt/menus.cc:212
 msgid "By Release Date"
 msgstr "Por data de lançamento"
 
-#: src/skins/menus.cc:176 src/skins/menus.cc:189
+#: src/skins/menus.cc:201 src/skins/menus.cc:217 src/skins-qt/menus.cc:197
+#: src/skins-qt/menus.cc:213
 msgid "By Genre"
 msgstr "Por género"
 
-#: src/skins/menus.cc:177 src/skins/menus.cc:191
+#: src/skins/menus.cc:202 src/skins/menus.cc:218 src/skins-qt/menus.cc:198
+#: src/skins-qt/menus.cc:214
 msgid "By Length"
 msgstr "Por duração"
 
-#: src/skins/menus.cc:180 src/skins/menus.cc:194
+#: src/skins/menus.cc:205 src/skins/menus.cc:221 src/skins-qt/menus.cc:201
+#: src/skins-qt/menus.cc:217
 msgid "By Custom Title"
 msgstr "Por título personalizado"
 
-#: src/skins/menus.cc:198
+#: src/skins/menus.cc:206 src/skins/menus.cc:222 src/skins-qt/menus.cc:202
+#: src/skins-qt/menus.cc:218
+msgid "By Comment"
+msgstr "Por comentário"
+
+#: src/skins/menus.cc:207 src/skins/menus.cc:223 src/skins-qt/menus.cc:203
+#: src/skins-qt/menus.cc:219
+msgid "By Disc Number"
+msgstr ""
+
+#: src/skins/menus.cc:227 src/skins-qt/menus.cc:223
 msgid "Randomize List"
 msgstr "Lista aleatória"
 
-#: src/skins/menus.cc:199
+#: src/skins/menus.cc:228 src/skins-qt/menus.cc:224
 msgid "Reverse List"
 msgstr "Inverter lista"
 
-#: src/skins/menus.cc:201
+#: src/skins/menus.cc:230 src/skins-qt/menus.cc:226
 msgid "Sort Selected"
 msgstr "Organizar seleção"
 
-#: src/skins/menus.cc:202
+#: src/skins/menus.cc:231 src/skins-qt/menus.cc:227
 msgid "Sort List"
 msgstr "Ordenação"
 
-#: src/skins/menus.cc:208
+#: src/skins/menus.cc:236 src/skins-qt/menus.cc:232
+msgid "Open Containing Folder"
+msgstr "Abrir pasta respetiva"
+
+#: src/skins/menus.cc:238 src/skins-qt/menus.cc:234
 msgid "Cut"
 msgstr "Cortar"
 
-#: src/skins/menus.cc:209
+#: src/skins/menus.cc:239 src/skins-qt/menus.cc:235
 msgid "Copy"
 msgstr "Copiar"
 
-#: src/skins/menus.cc:210
+#: src/skins/menus.cc:240 src/skins-qt/menus.cc:236
 msgid "Paste"
 msgstr "Colar"
 
-#: src/skins/menus.cc:212
+#: src/skins/menus.cc:241 src/skins-qt/menus.cc:237
+msgid "Paste at End"
+msgstr "Colar no final"
+
+#: src/skins/menus.cc:243 src/skins-qt/menus.cc:239
 msgid "Queue/Unqueue"
 msgstr "Colocar/retirar da fila"
 
-#: src/skins/menus.cc:218
-msgid "Load Preset ..."
-msgstr "Carregar pré-ajuste..."
-
-#: src/skins/menus.cc:219
-msgid "Load Auto Preset ..."
-msgstr "Carregar pré-ajuste automático"
-
-#: src/skins/menus.cc:220
-msgid "Load Default"
-msgstr "Carregar pré-definido"
-
-#: src/skins/menus.cc:221
-msgid "Load Preset File ..."
-msgstr "Carregar ficheiro de pré-ajuste..."
-
-#: src/skins/menus.cc:222
-msgid "Load EQF File ..."
-msgstr "Carregar ficheiro EQF..."
-
-#: src/skins/menus.cc:224
-msgid "Save Preset ..."
-msgstr "Gravar pré-ajuste..."
-
-#: src/skins/menus.cc:225
-msgid "Save Auto Preset ..."
-msgstr "Gravar pré-ajuste automático..."
-
-#: src/skins/menus.cc:226
-msgid "Save Default"
-msgstr "Gravar pré-definido"
-
-#: src/skins/menus.cc:227
-msgid "Save Preset File ..."
-msgstr "Gravar ficheiro de pré-ajuste..."
-
-#: src/skins/menus.cc:228
-msgid "Save EQF File ..."
-msgstr "Gravar ficheiro EQF..."
-
-#: src/skins/menus.cc:230
-msgid "Delete Preset ..."
-msgstr "Eliminar pré-ajuste..."
-
-#: src/skins/menus.cc:231
-msgid "Delete Auto Preset ..."
-msgstr "Eliminar pré-ajuste automático..."
-
-#: src/skins/menus.cc:233
-msgid "Import Winamp Presets ..."
-msgstr "Importar pré-ajuste Winamp..."
-
-#: src/skins/menus.cc:235
-msgid "Reset to Zero"
-msgstr "Repor para zero"
+#: src/skins/playlist-widget.cc:58 src/skins-qt/playlist-widget.cc:58
+#, c-format
+msgid "%s (%d of %d)"
+msgstr "%s (%d de %d)"
 
-#: src/skins/plugin.cc:48
+#: src/skins/playlistwin.cc:491 src/skins-qt/playlistwin.cc:478
+msgid "Audacious Playlist Editor"
+msgstr "Editor de listas de reprodução"
+
+#: src/skins/plugin.cc:53 src/skins-qt/plugin.cc:65
 msgid "Winamp Classic Interface"
 msgstr "Interface clássica Winamp"
 
-#: src/skins/preset-browser.cc:57 src/skins/preset-list.cc:371
-#: src/skins/preset-list.cc:386
-msgid "Save"
-msgstr "Gravar"
-
-#: src/skins/preset-browser.cc:57 src/skins/preset-list.cc:338
-#: src/skins/preset-list.cc:354
-msgid "Load"
-msgstr "Carregar"
-
-#: src/skins/preset-browser.cc:83
-msgid "Load Preset File"
-msgstr "Carregar ficheiro de pré-ajuste"
-
-#: src/skins/preset-browser.cc:100
-msgid "Load EQF File"
-msgstr "Carregar ficheiro EQF"
-
-#: src/skins/preset-browser.cc:119
-msgid "Save Preset File"
-msgstr "Gravar ficheiro de pré-ajuste"
-
-#: src/skins/preset-browser.cc:137
-msgid "Save EQF File"
-msgstr "Gravar ficheiro EQF"
-
-#: src/skins/preset-browser.cc:151
-msgid "Import Winamp Presets"
-msgstr "Importar pré-ajuste Winamp"
-
-#: src/skins/preset-list.cc:285
-msgid "Presets"
-msgstr "Pré-ajuste"
-
-#: src/skins/preset-list.cc:335
-msgid "Load preset"
-msgstr "Carregar pré-ajuste"
-
-#: src/skins/preset-list.cc:351
-msgid "Load auto-preset"
-msgstr "Carregar pré-ajuste automático"
-
-#: src/skins/preset-list.cc:367
-msgid "Save preset"
-msgstr "Gravar pré-ajuste"
-
-#: src/skins/preset-list.cc:382
-msgid "Save auto-preset"
-msgstr "Gravar pré-ajuste automático"
-
-#: src/skins/preset-list.cc:408
-msgid "Delete preset"
-msgstr "Eliminar pré-ajuste"
-
-#: src/skins/preset-list.cc:424
-msgid "Delete auto-preset"
-msgstr "Eliminar pré-ajuste automático"
+#: src/skins-qt/menus.cc:75
+msgid "Open Folder ..."
+msgstr "Abrir pasta..."
+
+#: src/skins-qt/menus.cc:159
+msgid "Add Folder ..."
+msgstr "Adicionar pasta..."
+
+#: src/skins-qt/search-select.cc:62 src/skins/search-select.cc:77
+msgid "Search entries in active playlist"
+msgstr "Procurar entradas na lista de reprodução ativa"
+
+#: src/skins-qt/search-select.cc:70 src/skins/search-select.cc:83
+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 ""
+"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-qt/search-select.cc:75 src/skins/search-select.cc:91
+msgid "Title:"
+msgstr "Título:"
+
+#: src/skins-qt/search-select.cc:79 src/skins/search-select.cc:96
+msgid "Album:"
+msgstr "Álbum: "
+
+#: src/skins-qt/search-select.cc:82 src/skins/search-select.cc:101
+msgid "Artist:"
+msgstr "Artista: "
+
+#: src/skins-qt/search-select.cc:85 src/skins/search-select.cc:106
+msgid "File Name:"
+msgstr "Nome de ficheiro:"
+
+#: src/skins-qt/search-select.cc:88 src/skins/search-select.cc:134
+msgid "Clear previous selection before searching"
+msgstr "Limpar seleção anterior antes de procurar"
+
+#: src/skins-qt/search-select.cc:89 src/skins/search-select.cc:137
+msgid "Automatically toggle queue for matching entries"
+msgstr "Alternar fila automaticamente para as entradas coincidentes"
+
+#: src/skins-qt/search-select.cc:90 src/skins/search-select.cc:140
+msgid "Create a new playlist with matching entries"
+msgstr "Criar lista de reprodução com as entradas coincidentes"
 
-#: src/skins/skins_cfg.cc:176
+#: src/skins-qt/search-select.cc:101 src/skins/search-select.cc:78
+msgid "Search"
+msgstr "Procura"
+
+#: src/skins-qt/skins_cfg.cc:198 src/skins/skins_cfg.cc:182
 msgid "Player:"
 msgstr "Reprodutor:"
 
-#: src/skins/skins_cfg.cc:178
+#: src/skins-qt/skins_cfg.cc:200 src/skins/skins_cfg.cc:184
 msgid "Select main player window font:"
 msgstr "Selecione o tipo de letra do reprodutor:"
 
-#: src/skins/skins_cfg.cc:179
+#: src/skins-qt/skins_cfg.cc:201 src/skins/skins_cfg.cc:185
 msgid "Playlist:"
 msgstr "Lista de reprodução:"
 
-#: src/skins/skins_cfg.cc:181
+#: src/skins-qt/skins_cfg.cc:203 src/skins/skins_cfg.cc:187
 msgid "Select playlist font:"
 msgstr "Escolha o tipo de letra da lista de reprodução:"
 
-#: src/skins/skins_cfg.cc:187
+#: src/skins-qt/skins_cfg.cc:207 src/skins/skins_cfg.cc:191
 msgid "Skin"
 msgstr "Tema"
 
-#: src/skins/skins_cfg.cc:189
+#: src/skins-qt/skins_cfg.cc:211 src/skins/skins_cfg.cc:193
+msgid "Display active titlebar when any window is focused"
+msgstr "Mostrar a barra de título ativa quando qualquer janela estiver em foco"
+
+#: src/skins-qt/skins_cfg.cc:213 src/skins/skins_cfg.cc:195
 msgid "Fonts"
 msgstr "Tipos de letra"
 
-#: src/skins/skins_cfg.cc:192
+#: src/skins-qt/skins_cfg.cc:215 src/skins/skins_cfg.cc:197
 msgid "Use bitmap fonts (supports ASCII only)"
 msgstr "Utilizar letras bitmap (só para ASCII)"
 
-#: src/skins/skins_cfg.cc:194
+#: src/skins-qt/skins_cfg.cc:217 src/skins/skins_cfg.cc:199
 msgid "Scroll song title"
 msgstr "Deslocar título da faixa"
 
-#: src/skins/skins_cfg.cc:196
+#: src/skins-qt/skins_cfg.cc:219 src/skins/skins_cfg.cc:201
 msgid "Scroll song title in both directions"
 msgstr "Deslocar título em ambas as direções"
 
-#: src/skins/skins_cfg.cc:201
+#: src/skins-qt/skins_cfg.cc:224 src/skins/skins_cfg.cc:206
 msgid "Analyzer"
 msgstr "Analisador"
 
-#: src/skins/skins_cfg.cc:202
+#: src/skins-qt/skins_cfg.cc:225 src/skins/skins_cfg.cc:207
 msgid "Scope"
 msgstr "Scope"
 
-#: src/skins/skins_cfg.cc:203
+#: src/skins-qt/skins_cfg.cc:226 src/skins/skins_cfg.cc:208
 msgid "Voiceprint / VU meter"
 msgstr "Voiceprint/Medidor VU"
 
-#: src/skins/skins_cfg.cc:204
+#: src/skins-qt/skins_cfg.cc:227 src/skins/skins_cfg.cc:209
 msgid "Off"
 msgstr "Desligado"
 
-#: src/skins/skins_cfg.cc:208 src/skins/skins_cfg.cc:233
-#: src/skins/skins_cfg.cc:239
+#: src/skins-qt/skins_cfg.cc:231 src/skins-qt/skins_cfg.cc:256
+#: src/skins-qt/skins_cfg.cc:262 src/skins/skins_cfg.cc:213
+#: src/skins/skins_cfg.cc:238 src/skins/skins_cfg.cc:244
 msgid "Normal"
 msgstr "Normal"
 
-#: src/skins/skins_cfg.cc:209 src/skins/skins_cfg.cc:234
+#: src/skins-qt/skins_cfg.cc:232 src/skins-qt/skins_cfg.cc:257
+#: src/skins/skins_cfg.cc:214 src/skins/skins_cfg.cc:239
 msgid "Fire"
 msgstr "Fogo"
 
-#: src/skins/skins_cfg.cc:210
+#: src/skins-qt/skins_cfg.cc:233 src/skins/skins_cfg.cc:215
 msgid "Vertical lines"
 msgstr "Linhas verticais"
 
-#: src/skins/skins_cfg.cc:214
+#: src/skins-qt/skins_cfg.cc:237 src/skins/skins_cfg.cc:219
 msgid "Lines"
 msgstr "Linhas"
 
-#: src/skins/skins_cfg.cc:215
+#: src/skins-qt/skins_cfg.cc:238 src/skins/skins_cfg.cc:220
 msgid "Bars"
 msgstr "Barras"
 
-#: src/skins/skins_cfg.cc:219
+#: src/skins-qt/skins_cfg.cc:242 src/skins/skins_cfg.cc:224
 msgid "Slowest"
 msgstr "Mais lento"
 
-#: src/skins/skins_cfg.cc:220
+#: src/skins-qt/skins_cfg.cc:243 src/skins/skins_cfg.cc:225
 msgid "Slow"
 msgstr "Lento"
 
-#: src/skins/skins_cfg.cc:221 src/sox-resampler/sox-resampler.cc:152
+#: src/skins-qt/skins_cfg.cc:244 src/skins/skins_cfg.cc:226
+#: src/soxr/sox-resampler.cc:180
 msgid "Medium"
 msgstr "Normal"
 
-#: src/skins/skins_cfg.cc:222
+#: src/skins-qt/skins_cfg.cc:245 src/skins/skins_cfg.cc:227
 msgid "Fast"
 msgstr "Rápido"
 
-#: src/skins/skins_cfg.cc:223
+#: src/skins-qt/skins_cfg.cc:246 src/skins/skins_cfg.cc:228
 msgid "Fastest"
 msgstr "Mais rápido"
 
-#: src/skins/skins_cfg.cc:227
+#: src/skins-qt/skins_cfg.cc:250 src/skins/skins_cfg.cc:232
 msgid "Dots"
 msgstr "Pontos"
 
-#: src/skins/skins_cfg.cc:228
+#: src/skins-qt/skins_cfg.cc:251 src/skins/skins_cfg.cc:233
 msgid "Line"
 msgstr "Linha"
 
-#: src/skins/skins_cfg.cc:229
+#: src/skins-qt/skins_cfg.cc:252 src/skins/skins_cfg.cc:234
 msgid "Solid"
 msgstr "Sólido"
 
-#: src/skins/skins_cfg.cc:235
+#: src/skins-qt/skins_cfg.cc:258 src/skins/skins_cfg.cc:240
 msgid "Ice"
 msgstr "Gelo"
 
-#: src/skins/skins_cfg.cc:240
+#: src/skins-qt/skins_cfg.cc:263 src/skins/skins_cfg.cc:245
 msgid "Smooth"
 msgstr "Suave"
 
-#: src/skins/skins_cfg.cc:244
-msgid "Type"
-msgstr "Tipo"
-
-#: src/skins/skins_cfg.cc:245
-msgid "Visualization type:"
-msgstr "Tipo de visualização:"
-
-#: src/skins/skins_cfg.cc:248
-msgid "Analyzer"
-msgstr "Analisador"
-
-#: src/skins/skins_cfg.cc:249
-msgid "Show peaks"
-msgstr "Mostrar picos"
-
-#: src/skins/skins_cfg.cc:251
+#: src/skins-qt/skins_cfg.cc:267 src/skins/skins_cfg.cc:249
 msgid "Coloring:"
 msgstr "Coloração:"
 
-#: src/skins/skins_cfg.cc:254
+#: src/skins-qt/skins_cfg.cc:270 src/skins/skins_cfg.cc:252
 msgid "Style:"
 msgstr "Estilo:"
 
-#: src/skins/skins_cfg.cc:257
+#: src/skins-qt/skins_cfg.cc:273 src/skins/skins_cfg.cc:255
 msgid "Falloff:"
 msgstr "Recurso:"
 
-#: src/skins/skins_cfg.cc:260
+#: src/skins-qt/skins_cfg.cc:276 src/skins/skins_cfg.cc:258
 msgid "Peak falloff:"
 msgstr "Recurso de picos:"
 
-#: src/skins/skins_cfg.cc:264
+#: src/skins-qt/skins_cfg.cc:282 src/skins/skins_cfg.cc:264
 msgid "Scope Style:"
 msgstr "Estilo de scope:"
 
-#: src/skins/skins_cfg.cc:267
+#: src/skins-qt/skins_cfg.cc:285 src/skins/skins_cfg.cc:267
 msgid "Voiceprint Coloring:"
 msgstr "Coloração Voiceprint:"
 
-#: src/skins/skins_cfg.cc:270
+#: src/skins-qt/skins_cfg.cc:288 src/skins/skins_cfg.cc:270
 msgid "VU Meter Style:"
 msgstr "Estilo do medidor VU:"
 
-#: src/skins/skins_cfg.cc:276
-msgid "General"
-msgstr "Geral"
-
-#: src/skins/skins_cfg.cc:277
-msgid "Visualization"
-msgstr "Visualização"
-
-#: src/skins/ui_equalizer.cc:282
-msgid "Preamp"
-msgstr "Amplificador"
-
-#: src/skins/ui_equalizer.cc:286
-msgid "31 Hz"
-msgstr "31 Hz"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "63 Hz"
-msgstr "63 Hz"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "125 Hz"
-msgstr "125 Hz"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "250 Hz"
-msgstr "250 Hz"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "500 Hz"
-msgstr "500 Hz"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "1 kHz"
-msgstr "1 kHz"
-
-#: src/skins/ui_equalizer.cc:288
-msgid "2 kHz"
-msgstr "2 kHz"
-
-#: src/skins/ui_equalizer.cc:288
-msgid "4 kHz"
-msgstr "4 kHz"
-
-#: src/skins/ui_equalizer.cc:288
-msgid "8 kHz"
-msgstr "8 kHz"
-
-#: src/skins/ui_equalizer.cc:288
-msgid "16 kHz"
-msgstr "16 kHz"
-
-#: src/skins/ui_equalizer.cc:330
-msgid "Audacious Equalizer"
-msgstr "Equalizador do Audacious"
-
-#: src/skins/ui_main.cc:688
-#, c-format
-msgid "Seek to %d:%-2.2d / %d:%-2.2d"
-msgstr "Ir para %d:%-2.2d / %d:%-2.2d"
-
-#: src/skins/ui_main.cc:709
-#, c-format
-msgid "Volume: %d%%"
-msgstr "Volume: %d%%"
-
-#: src/skins/ui_main.cc:732
-#, c-format
-msgid "Balance: %d%% left"
-msgstr "Equilíbrio: %d%% à esquerda"
-
-#: src/skins/ui_main.cc:734
-msgid "Balance: center"
-msgstr "Equilíbrio: centro"
-
-#: src/skins/ui_main.cc:736
-#, c-format
-msgid "Balance: %d%% right"
-msgstr "Equilíbrio: %d%% à direita"
-
-#: src/skins/ui_main.cc:842
-msgid "Options Menu"
-msgstr "Menu de opções"
-
-#: src/skins/ui_main.cc:846
-msgid "Disable 'Always On Top'"
-msgstr "Desativar \"Sempre visível\""
-
-#: src/skins/ui_main.cc:848
-msgid "Enable 'Always On Top'"
-msgstr "Ativar \"Sempre visível\""
-
-#: src/skins/ui_main.cc:851
-msgid "File Info Box"
-msgstr "Caixa de informações de ficheiro"
-
-#: src/skins/ui_main.cc:857
-msgid "Visualizations"
-msgstr "Visualizações"
-
-#: src/skins/ui_main.cc:1336
-msgid "Repeat point A set."
-msgstr "Ponto de repetição A definido"
-
-#: src/skins/ui_main.cc:1341
-msgid "Repeat point B set."
-msgstr "Ponto de repetição B definido"
-
-#: src/skins/ui_main.cc:1350
-msgid "Repeat points cleared."
-msgstr "Pontos de repetição removidos"
-
-#: src/skins/ui_playlist.cc:219
-msgid "Search entries in active playlist"
-msgstr "Procurar entradas na lista de reprodução ativa"
-
-#: src/skins/ui_playlist.cc:226
-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 ""
-"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.cc:234
-msgid "Title:"
-msgstr "Título:"
-
-#: src/skins/ui_playlist.cc:241
-msgid "Album:"
-msgstr "Álbum: "
-
-#: src/skins/ui_playlist.cc:248
-msgid "Artist:"
-msgstr "Artista: "
-
-#: src/skins/ui_playlist.cc:255
-msgid "File Name:"
-msgstr "Nome de ficheiro:"
-
-#: src/skins/ui_playlist.cc:263
-msgid "Clear previous selection before searching"
-msgstr "Limpar seleção anterior antes de procurar"
+#: src/skins-qt/skins_cfg.cc:294 src/skins/skins_cfg.cc:276
+msgid "Type"
+msgstr "Tipo"
 
-#: src/skins/ui_playlist.cc:266
-msgid "Automatically toggle queue for matching entries"
-msgstr "Alternar fila automaticamente para as entradas coincidentes"
+#: src/skins-qt/skins_cfg.cc:295 src/skins/skins_cfg.cc:277
+msgid "Visualization type:"
+msgstr "Tipo de visualização:"
 
-#: src/skins/ui_playlist.cc:269
-msgid "Create a new playlist with matching entries"
-msgstr "Criar lista de reprodução com as entradas coincidentes"
+#: src/skins-qt/skins_cfg.cc:298 src/skins/skins_cfg.cc:280
+msgid "Analyzer"
+msgstr "Analisador"
 
-#: src/skins/ui_playlist.cc:717
-msgid "Audacious Playlist Editor"
-msgstr "Editor de listas de reprodução"
+#: src/skins-qt/skins_cfg.cc:299 src/skins/skins_cfg.cc:281
+msgid "Show peaks"
+msgstr "Mostrar picos"
 
-#: src/skins/ui_playlist.cc:752
-#, c-format
-msgid "%s (%d of %d)"
-msgstr "%s (%d de %d)"
+#: src/skins-qt/skins_cfg.cc:308 src/skins/skins_cfg.cc:290
+msgid "Visualization"
+msgstr "Visualização"
 
-#: src/skins/ui_skinselector.cc:167
+#: src/skins-qt/skinselector.cc:98 src/skins/skinselector.cc:111
 msgid "Archived Winamp 2.x skin"
 msgstr "Tema Winamp 2.x arquivado"
 
-#: src/skins/ui_skinselector.cc:172
+#: src/skins-qt/skinselector.cc:102 src/skins/skinselector.cc:115
 msgid "Unarchived Winamp 2.x skin"
 msgstr "Tema Winamp 2.x não arquivado"
 
-#: src/skins/util.cc:430
-#, c-format
-msgid "Could not create directory (%s): %s\n"
-msgstr "Não foi possível criar o diretório (%s): %s.\n"
-
-#: src/sndfile/plugin.cc:39
+#: src/sndfile/plugin.cc:38
 msgid "Sndfile Plugin"
 msgstr "Suplemento Sndfile"
 
-#: src/sndfile/plugin.cc:336
+#: src/sndfile/plugin.cc:372
 msgid ""
 "Based on the xmms_sndfile plugin:\n"
 "Copyright (C) 2000, 2002 Erik de Castro Lopo\n"
@@ -3968,9 +4196,9 @@
 "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"
+"Copyright (C) 2000, 2002 Erik de Castro Lopo\n"
 "\n"
-"Adaptação ao Audacious por Tony Vroon <chainsaw@gentoo.org>\n"
+"Adaptação para o Audacious por Tony Vroon <chainsaw@gentoo.org>\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 "
@@ -3987,109 +4215,111 @@
 "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
 "USA."
 
-#: src/sndio-ng/sndio.cc:44
+#: src/sndio/sndio.cc:43
 msgid "Sndio Output"
 msgstr "Saída Sndio"
 
-#: src/sndio-ng/sndio.cc:98
+#: src/sndio/sndio.cc:98
 msgid "Device (blank for default):"
 msgstr "Dispositivo (vazio para predefinição):"
 
-#: src/sndio-ng/sndio.cc:100
+#: src/sndio/sndio.cc:100
 msgid "Save and restore volume:"
-msgstr "Gravar e restaurar volume:"
+msgstr "Guardar e restaurar volume:"
 
-#: src/sndio-ng/sndio.cc:181
+#: src/sndio/sndio.cc:181
 #, c-format
 msgid "Sndio error: Unsupported audio format (%d)"
 msgstr "Erro Sndio: formato áudio não suportado (%d)"
 
-#: src/sndio-ng/sndio.cc:192
+#: src/sndio/sndio.cc:192
 msgid "Sndio error: sio_open() failed"
 msgstr "Erro Sndio: falha sio_open()"
 
-#: src/sndio-ng/sndio.cc:222
+#: src/sndio/sndio.cc:221
 msgid "Sndio error: sio_setpar() failed"
 msgstr "Erro Sndio: falha sio_setpar()"
 
-#: src/sndio-ng/sndio.cc:234
+#: src/sndio/sndio.cc:233
 msgid "Sndio error: sio_start() failed"
 msgstr "Erro Sndio: falha sio_start()"
 
-#: src/song_change/song_change.cc:33
+#: src/songchange/song_change.cc:30
 msgid "Song Change"
 msgstr "Alteração de faixa"
 
-#: src/song_change/song_change.cc:342
-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."
-
-#: src/song_change/song_change.cc:358
+#: src/songchange/song_change.cc:256
 msgid "Commands"
 msgstr "Comandos"
 
-#: src/song_change/song_change.cc:360
+#: src/songchange/song_change.cc:258
 msgid "Command to run when starting a new song:"
 msgstr "Comando a executar ao inicar uma nova faixa:"
 
-#: src/song_change/song_change.cc:364
+#: src/songchange/song_change.cc:261
+msgid "Command to run when stopping a song:"
+msgstr ""
+
+#: src/songchange/song_change.cc:264
 msgid "Command to run at the end of a song:"
 msgstr "Comando a executar ao terminar uma faixa:"
 
-#: src/song_change/song_change.cc:368
+#: src/songchange/song_change.cc:267
 msgid "Command to run at the end of the playlist:"
 msgstr "Comando a executar no final de uma lista de reprodução:"
 
-#: src/song_change/song_change.cc:372
+#: src/songchange/song_change.cc:270
 msgid "Command to run when song title changes (for network streams):"
 msgstr "Comando a executar ao mudar o título da faixa (para emissões web):"
 
-#: src/song_change/song_change.cc:376
+#: src/songchange/song_change.cc:273
 msgid ""
-"You can use the following format strings which will be substituted before "
-"calling the command (not all are useful for the end-of-playlist command):\n"
-"\n"
-"%F: Frequency (in hertz)\n"
+"You can use the following format codes, which will be replaced before "
+"running the command.\n"
+"Not all are useful though for the song-stopped or end-of-playlist command."
+msgstr ""
+
+#: src/songchange/song_change.cc:276
+msgid ""
+"%a: Artist\n"
+"%b: Album\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"
+"%F: Frequency (Hertz)\n"
+"%l: Length (milliseconds)\n"
+"%n or %s: Formatted title (see playlist settings)\n"
 "%p: Currently playing (1 or 0)\n"
-"%a: Artist\n"
-"%b: Album\n"
-"%T: Track title"
-msgstr ""
-"Pode utilizar os formatos descritos em baixo, que serão substituídos antes "
-"de invocar o comando (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: reprodução atual (1 ou 0)\n"
-"%a: artista\n"
-"%b: álbum\n"
-"%T: título da faixa"
-
-#: src/song-info-qt/song-info.cc:32
-msgid "Song Info (Qt)"
-msgstr "Informações da faixa (Qt)"
+"%r: Rate (bits per second)\n"
+"%t: Playlist position\n"
+"%T: Title (unformatted)"
+msgstr ""
+"%a: Artista\n"
+"%b: Álbum\n"
+"%c: Número de canais\n"
+"%f: Nome de ficheiro (caminho completo)\n"
+"%F: Frequência (Hz)\n"
+"%l: Duração (milissegundos)\n"
+"%n ou %s: Título formatado (ver definições da lista de reprodução)\n"
+"%p: Em reprodução (1 ou 0)\n"
+"%r: Taxa (bits por segundo)\n"
+"%t: Posição na lista de reprodução\n"
+"%T: Título (não formatado)"
+
+#: src/songchange/song_change.cc:287
+msgid ""
+"Parameters passed to the shell should be enclosed in quotation marks.\n"
+"Unquoted parameters may lead to unexpected results."
+msgstr ""
+
+#: src/song-info-qt/song-info.cc:30
+msgid "Song Info"
+msgstr "Informações da faixa"
 
-#: src/sox-resampler/sox-resampler.cc:44
+#: src/soxr/sox-resampler.cc:44
 msgid "SoX Resampler"
 msgstr "SoX Resampler"
 
-#: src/sox-resampler/sox-resampler.cc:144
+#: src/soxr/sox-resampler.cc:172
 msgid ""
 "SoX Resampler Plugin for Audacious\n"
 "Copyright 2013 Michał Lipski\n"
@@ -4098,101 +4328,149 @@
 "Copyright 2010-2012 John Lindgren"
 msgstr ""
 "Suplemento SoX Resampler\n"
-"Direitos de autor 2013 Michał Lipski\n"
+"Copyright 2013 Michał Lipski\n"
 "\n"
 "Baseado no suplemento Sample Rate Converter\n"
-"Direitos de autor 2010-2012 John Lindgren"
+"Copyright 2010-2012 John Lindgren"
 
-#: src/sox-resampler/sox-resampler.cc:150
+#: src/soxr/sox-resampler.cc:178
 msgid "Quick"
 msgstr "Rápida"
 
-#: src/sox-resampler/sox-resampler.cc:151
+#: src/soxr/sox-resampler.cc:179
 msgid "Low"
 msgstr "Baixa"
 
-#: src/sox-resampler/sox-resampler.cc:153
+#: src/soxr/sox-resampler.cc:181
 msgid "High"
 msgstr "Alta"
 
-#: src/sox-resampler/sox-resampler.cc:154
+#: src/soxr/sox-resampler.cc:182
 msgid "Very High"
 msgstr "Muito alta"
 
-#: src/sox-resampler/sox-resampler.cc:158
+#: src/soxr/sox-resampler.cc:183
+msgid "Ultra High"
+msgstr "Ultra alta"
+
+#: src/soxr/sox-resampler.cc:187
+msgid "Minimum"
+msgstr "Mínima"
+
+#: src/soxr/sox-resampler.cc:188
+msgid "Intermediate"
+msgstr "Intermédia"
+
+#: src/soxr/sox-resampler.cc:193
 msgid "Quality:"
 msgstr "Qualidade:"
 
-#: src/speed-pitch/speed-pitch.cc:51
+#: src/soxr/sox-resampler.cc:196
+msgid "Phase:"
+msgstr "Fase:"
+
+#: src/soxr/sox-resampler.cc:200
+msgid "Allow aliasing"
+msgstr "Permitir suavização"
+
+#: src/soxr/sox-resampler.cc:202
+msgid "Use steep filter"
+msgstr "Utilizar filtro 'steep'"
+
+#: src/speedpitch/speed-pitch.cc:54
 msgid "Speed and Pitch"
 msgstr "Velocidade e pitch"
 
-#: src/speed-pitch/speed-pitch.cc:210
-msgid "Speed and Pitch"
-msgstr "Velocidade e pitch"
-
-#: src/speed-pitch/speed-pitch.cc:211
-msgid "Speed:"
-msgstr "Velocidade:"
-
-#: src/speed-pitch/speed-pitch.cc:214
-msgid "Pitch:"
-msgstr "Pitch:"
+#: src/speedpitch/speed-pitch.cc:247
+msgid "Speed"
+msgstr "Velocidade"
+
+#: src/speedpitch/speed-pitch.cc:248
+msgid "Decouple from pitch"
+msgstr "Separar do pitch"
+
+#: src/speedpitch/speed-pitch.cc:250 src/speedpitch/speed-pitch.cc:258
+msgid "Multiplier:"
+msgstr "Multiplicador:"
+
+#: src/speedpitch/speed-pitch.cc:254
+msgid "Pitch"
+msgstr "Pitch"
 
-#: src/statusicon/statusicon.cc:47
+#: src/statusicon-qt/statusicon.cc:45 src/statusicon/statusicon.cc:47
 msgid "Status Icon"
 msgstr "Ícone de estado"
 
-#: src/statusicon/statusicon.cc:283
-msgid "Se_ttings ..."
-msgstr "De_finições..."
-
-#: src/statusicon/statusicon.cc:372
+#: src/statusicon-qt/statusicon.cc:68
 msgid ""
-"Status Icon Plugin\n"
+"Status Icon Plugin (partial port for Qt interface)\n"
 "\n"
 "Copyright 2005-2007 Giacomo Lozito <james@develia.org>\n"
 "Copyright 2010 Michał Lipski <tallica@o2.pl>\n"
+"Copyright 2015 Eugene Paskevich <eugene@raptor.kiev.ua>\n"
 "\n"
 "This plugin provides a status icon, placed in\n"
 "the system tray area of the window manager."
 msgstr ""
-"Suplemento Status Icon\n"
+"Suplemento Status Icon (versão parcial para a interface Qt)\n"
 "\n"
-"Direitos de autor 2005-2007 Giacomo Lozito <james@develia.org>\n"
-"Direitos de autor 2010 Michał Lipski <tallica@o2.pl>\n"
+"Copyright 2005-2007 Giacomo Lozito <james@develia.org>\n"
+"Copyright 2010 Michał Lipski <tallica@o2.pl>\n"
+"Copyright 2015 Eugene Paskevich <eugene@raptor.kiev.ua>\n"
 "\n"
-"Este suplemento disponibiliza um ícone de estado na área de notificação do "
-"seu gestor de janelas."
+"Este suplemento disponibiliza um ícone de estado\n"
+"na área de notificação do seu gestor de janelas."
 
-#: src/statusicon/statusicon.cc:379
+#: src/statusicon-qt/statusicon.cc:89 src/statusicon/statusicon.cc:384
 msgid "Mouse Scroll Action"
 msgstr "Ação da roda do rato"
 
-#: src/statusicon/statusicon.cc:380
+#: src/statusicon-qt/statusicon.cc:90 src/statusicon/statusicon.cc:385
 msgid "Change volume"
 msgstr "Alterar volume"
 
-#: src/statusicon/statusicon.cc:383
+#: src/statusicon-qt/statusicon.cc:93 src/statusicon/statusicon.cc:388
 msgid "Change playing song"
 msgstr "Alterar faixa reproduzida"
 
-#: src/statusicon/statusicon.cc:386
+#: src/statusicon-qt/statusicon.cc:96 src/statusicon/statusicon.cc:391
 msgid "Other Settings"
 msgstr "Outras definições"
 
-#: src/statusicon/statusicon.cc:387
+#: src/statusicon-qt/statusicon.cc:97 src/statusicon/statusicon.cc:392
 msgid "Disable the popup window"
 msgstr "Desativar janela emergente"
 
-#: src/statusicon/statusicon.cc:389
+#: src/statusicon-qt/statusicon.cc:99 src/statusicon/statusicon.cc:394
 msgid "Close to the system tray"
 msgstr "Fechar para a área de notificação"
 
-#: src/statusicon/statusicon.cc:391
+#: src/statusicon-qt/statusicon.cc:101 src/statusicon/statusicon.cc:396
 msgid "Advance in playlist when scrolling upward"
 msgstr "Avançar na lista de reprodução ao rolar para cima"
 
+#: src/statusicon-qt/statusicon.cc:116 src/statusicon/statusicon.cc:287
+msgid "Se_ttings ..."
+msgstr "De_finições..."
+
+#: src/statusicon/statusicon.cc:377
+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 ""
+"Suplemento Status Icon\n"
+"\n"
+"Copyright 2005-2007 Giacomo Lozito <james@develia.org>\n"
+"Copyright 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/stereo_plugin/stereo.cc:19
 msgid "Extra Stereo"
 msgstr "Extra estéreo"
@@ -4211,20 +4489,160 @@
 msgid "Extra Stereo"
 msgstr "Extra estéreo"
 
+#: src/streamtuner/icecast-model.cc:126 src/streamtuner/shoutcast-model.cc:131
+msgid "Type"
+msgstr "Tipo"
+
+#: src/streamtuner/icecast-model.cc:132
+msgid "Current Song"
+msgstr "Música atual"
+
+#: src/streamtuner/icecast-model.cc:164
+msgid "Other"
+msgstr "Outro"
+
+#: src/streamtuner/ihr-model.cc:63
+msgid "Market"
+msgstr "Mercado"
+
+#: src/streamtuner/ihr-model.cc:156
+msgid "Call Letters"
+msgstr "Indicativo"
+
+#: src/streamtuner/ihr-model.cc:162
+msgid "Description"
+msgstr "Descrição"
+
+#: src/streamtuner/shoutcast-model.cc:128
+msgid "Listeners"
+msgstr "Ouvintes"
+
+#: src/streamtuner/shoutcast-model.cc:188
+msgid "Top 500 Stations"
+msgstr "Estações do Top 500"
+
+#: src/streamtuner/shoutcast-model.cc:189
+msgid "Alternative"
+msgstr "Alternativa"
+
+#: src/streamtuner/shoutcast-model.cc:190
+msgid "Blues"
+msgstr "Blues"
+
+#: src/streamtuner/shoutcast-model.cc:191
+msgid "Classical"
+msgstr "Clássica"
+
+#: src/streamtuner/shoutcast-model.cc:192
+msgid "Country"
+msgstr "Country"
+
+#: src/streamtuner/shoutcast-model.cc:193
+msgid "Decades"
+msgstr "Décadas"
+
+#: src/streamtuner/shoutcast-model.cc:194
+msgid "Easy Listening"
+msgstr "Música ligeira"
+
+#: src/streamtuner/shoutcast-model.cc:195
+msgid "Electronic"
+msgstr "Electrónica"
+
+#: src/streamtuner/shoutcast-model.cc:196
+msgid "Folk"
+msgstr "Folk"
+
+#: src/streamtuner/shoutcast-model.cc:197
+msgid "Inspirational"
+msgstr "Inspiracional"
+
+#: src/streamtuner/shoutcast-model.cc:198
+msgid "International"
+msgstr "Internacional"
+
+#: src/streamtuner/shoutcast-model.cc:199
+msgid "Jazz"
+msgstr "Jazz"
+
+#: src/streamtuner/shoutcast-model.cc:200
+msgid "Latin"
+msgstr "Latina"
+
+#: src/streamtuner/shoutcast-model.cc:201
+msgid "Metal"
+msgstr "Metal"
+
+#: src/streamtuner/shoutcast-model.cc:203
+msgid "New Age"
+msgstr "New Age"
+
+#: src/streamtuner/shoutcast-model.cc:204
+msgid "Pop"
+msgstr "Pop"
+
+#: src/streamtuner/shoutcast-model.cc:205
+msgid "Public Radio"
+msgstr "Rádio Pública"
+
+#: src/streamtuner/shoutcast-model.cc:206
+msgid "R&B and Urban"
+msgstr "R&B e Urbana"
+
+#: src/streamtuner/shoutcast-model.cc:207
+msgid "Rap"
+msgstr "Rap"
+
+#: src/streamtuner/shoutcast-model.cc:208
+msgid "Reggae"
+msgstr "Reggae"
+
+#: src/streamtuner/shoutcast-model.cc:209
+msgid "Rock"
+msgstr "Rock"
+
+#: src/streamtuner/shoutcast-model.cc:210
+msgid "Seasonal and Holiday"
+msgstr "Sazonais e Férias"
+
+#: src/streamtuner/shoutcast-model.cc:211
+msgid "Soundtracks"
+msgstr "Bandas sonoras"
+
+#: src/streamtuner/shoutcast-model.cc:212
+msgid "Talk"
+msgstr "Talk"
+
+#: src/streamtuner/shoutcast-model.cc:213
+msgid "Themes"
+msgstr "Temas"
+
+#: src/streamtuner/streamtuner.cc:59
+msgid "Shoutcast"
+msgstr "Shoutcast"
+
+#: src/streamtuner/streamtuner.cc:60
+msgid "Icecast"
+msgstr "Icecast"
+
+#: src/streamtuner/streamtuner.cc:71
+msgid "Stream Tuner"
+msgstr "Stream Tuner"
+
 #: src/tonegen/tonegen.cc:45
 msgid "Tone Generator"
 msgstr "Gerador de tons"
 
-#: src/tonegen/tonegen.cc:94
+#: src/tonegen/tonegen.cc:92
 #, c-format
 msgid "%s %.1f Hz"
 msgstr "%s %.1f Hz"
 
-#: src/tonegen/tonegen.cc:94
+#: src/tonegen/tonegen.cc:92
 msgid "Tone Generator: "
 msgstr "Gerador de tons:"
 
-#: src/tonegen/tonegen.cc:160
+#: src/tonegen/tonegen.cc:161
 msgid ""
 "Sine tone generator by Håvard Kvålen <havardk@xmms.org>\n"
 "Modified by Daniel J. Peng <danielpeng@bigfoot.com>\n"
@@ -4240,11 +4658,32 @@
 "exemplo: tone://2000;2005 para reproduzir um tom de 2000 Hz e outro de 2005 "
 "Hz"
 
+#: src/ui-common/dialogs-qt.cc:40
+msgid ""
+"\n"
+"(Further messages have been hidden.)"
+msgstr ""
+"\n"
+"(Foram ocultas algumas mensagens.)"
+
+#: src/ui-common/dialogs-qt.cc:52
+msgid "Working ..."
+msgstr "Execução..."
+
+#: src/ui-common/dialogs-qt.cc:73
+msgid "Information"
+msgstr "Informações"
+
+#: src/ui-common/menu-ops-gtk.cc:132 src/ui-common/menu-ops-qt.cc:113
+#, c-format
+msgid "%s does not appear to be a valid folder."
+msgstr "%s não aparenta ser uma pasta válida."
+
 #: src/voice_removal/voice_removal.cc:28
 msgid "Voice Removal"
 msgstr "Remoção de voz"
 
-#: src/vorbis/vorbis.cc:465
+#: src/vorbis/vorbis.cc:433
 msgid ""
 "Audacious Ogg Vorbis Decoder\n"
 "\n"
@@ -4287,12 +4726,12 @@
 msgid "Ogg Vorbis Decoder"
 msgstr "Descodificador Ogg Vorbis"
 
-#: src/vtx/info.cc:22
+#: src/vtx/info.cc:24
 #, c-format
 msgid "Details about %s"
 msgstr "Detalhes para %s"
 
-#: src/vtx/info.cc:24
+#: src/vtx/info.cc:26
 msgid ""
 "Title: %t\n"
 "Author: %a\n"
@@ -4322,7 +4761,7 @@
 msgid "VTX Decoder"
 msgstr "Descodificador VTX"
 
-#: src/vtx/vtx.cc:184
+#: src/vtx/vtx.cc:178
 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"
@@ -4332,40 +4771,104 @@
 "Baseado em in_vtx.dll de Roman Sherbakov <v_soft@microfor.ru>\n"
 "Adaptação ao Audacious por Pavel Vymetalek <pvymetalek@seznam.cz>"
 
-#: src/wavpack/wavpack.cc:24
+#: src/vumeter-qt/vumeter_qt.cc:31
+msgid ""
+"VU Meter Plugin for Audacious\n"
+"Copyright 2017-2019 Marc Sánchez Fauste"
+msgstr ""
+"Plugin Medidor de VU para Audacious\n"
+"Copyright 2017-2019 Marc Sánchez Fauste"
+
+#: src/vumeter-qt/vumeter_qt.cc:35
+msgid "VU Meter Settings"
+msgstr "Configurações do medidor VU"
+
+#: src/vumeter-qt/vumeter_qt.cc:37
+msgid "Peak hold time:"
+msgstr "Tempo de espera de pico:"
+
+#: src/vumeter-qt/vumeter_qt.cc:42
+msgid "Fall-off time:"
+msgstr "Tempo de queda:"
+
+#: src/vumeter-qt/vumeter_qt.cc:44
+msgid "dB/second"
+msgstr "dB/segundo"
+
+#: src/vumeter-qt/vumeter_qt.cc:46
+msgid "Display legend"
+msgstr "Mostrar legenda"
+
+#: src/vumeter-qt/vumeter_qt.h:37
+msgid "VU Meter"
+msgstr "Medidor de VU"
+
+#: src/waveout/waveout.cc:43
+msgid "Win32 waveOut"
+msgstr "Win32 waveOut"
+
+#: src/waveout/waveout.cc:69
+msgid ""
+"Win32 waveOut Plugin for Audacious\n"
+"Copyright 2016 John Lindgren"
+msgstr ""
+"Suplemento Win32 waveOut\n"
+"Copyright 2016 John Lindgren"
+
+#: src/wavpack/wavpack.cc:25
 msgid "WavPack Decoder"
 msgstr "Descodificador WavPack"
 
-#: src/wavpack/wavpack.cc:211
+#: src/wavpack/wavpack.cc:217
 msgid "lossy (hybrid)"
 msgstr "com perda (híbrido)"
 
-#: src/wavpack/wavpack.cc:213
+#: src/wavpack/wavpack.cc:219
 msgid "lossy"
 msgstr "com perda"
 
-#: src/wavpack/wavpack.cc:255
+#: src/wavpack/wavpack.cc:259
 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"
+"Copyright 2006 William Pitcock <nenolod@nenolod.net>\n"
 "\n"
 "Parte do código foi desenvolvido por Miles Egan."
 
-#: src/xsf/plugin.cc:50
+#: src/xsf/plugin.cc:74
 msgid "2SF Decoder"
 msgstr "Descodificador 2SF"
 
-#: src/xsf/plugin.cc:238
+#: src/xsf/plugin.cc:429
+msgid "32728 Hz"
+msgstr "32728 Hz"
+
+#: src/xsf/plugin.cc:432
+msgid "65456 Hz"
+msgstr "65456 Hz"
+
+#: src/xsf/plugin.cc:438
+msgid "Cosine"
+msgstr "Cosseno"
+
+#: src/xsf/plugin.cc:439
+msgid "Sharp"
+msgstr "Aguçado"
+
+#: src/xsf/plugin.cc:443
 msgid "XSF Configuration"
 msgstr "Configuração XSF"
 
-#: src/xsf/plugin.cc:239
-msgid "Ignore length from file"
-msgstr "Ignorar duração do ficheiro"
+#: src/xsf/plugin.cc:445
+msgid "Default fade time:"
+msgstr "Tempo de atenuação predefinido:"
+
+#: src/xsf/plugin.cc:447
+msgid "Interpolation mode:"
+msgstr "Modo de interpolação:"
 
-#: src/xspf/xspf.cc:89
+#: src/xspf/xspf.cc:95
 msgid "XML Shareable Playlists (XSPF)"
 msgstr "Listas de reprodução XML Shareable (XSPF)"

audacious-plugins-4.4.1.tar.bz2/po/ro.po Added

@@ -0,0 +1,4658 @@
+# Romanian translation for Audacious Plugins
+# Copyright (C) Audacious translators
+# This file is distributed under the same license as the Audacious Plugins package.
+#
+# Translators:
+# Cătălin, 2024
+# 3d5ab56b1b83fefceeab671c39a98a6d_999ae54, 2014
+# Cristi <majeru@atheme.org>, 2007
+# Emil Ungurean <emil.ungurean@gmail.com>, 2014
+# Marie J, 2022
+# Mihai Michael, 2022
+# xyz32 <oanaradu32@yahoo.com>, 2013
+# Warui-chan <>, 2012
+msgid ""
+msgstr ""
+"Project-Id-Version: Audacious Plugins\n"
+"Report-Msgid-Bugs-To: https://github.com/audacious-media-player/audacious/"
+"issues\n"
+"POT-Creation-Date: 2024-09-26 21:54+0200\n"
+"PO-Revision-Date: 2011-10-10 17:43+0000\n"
+"Last-Translator: Cătălin, 2024\n"
+"Language-Team: Romanian (http://app.transifex.com/audacious/audacious/"
+"language/ro/)\n"
+"Language: ro\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?"
+"2:1));\n"
+
+#: src/aac/aac.cc:19
+msgid "AAC (Raw) Decoder"
+msgstr "Decodor AAC (Raw)"
+
+#: src/adplug/adplug-xmms.cc:70
+msgid "AdPlug (AdLib Player)"
+msgstr "AdPlug (AdLib Player)"
+
+#: src/adplug/adplug-xmms.cc:167 src/modplug/modplugbmp.cc:321
+#: src/psf/plugin.cc:161 src/vtx/vtx.cc:89 src/xsf/plugin.cc:204
+msgid "sequenced"
+msgstr "eşalonat"
+
+#: src/adplug/adplug-xmms.cc:349 src/sid/xs_config.cc:61
+msgid "Output"
+msgstr "Ieșire"
+
+#: src/adplug/adplug-xmms.cc:350
+msgid "OPL Emulator:"
+msgstr "Emulator OPL:"
+
+#: src/adplug/adplug-xmms.cc:353 src/amidiplug/i_configure.cc:153
+#: src/console/plugin.cc:45 src/filewriter/filewriter.cc:481
+#: src/sid/xs_config.cc:65 src/xsf/plugin.cc:446
+msgid "Sample rate:"
+msgstr "Rată de eșantionare:"
+
+#: src/adplug/adplug-xmms.cc:354 src/amidiplug/i_configure.cc:155
+#: src/bs2b/plugin.cc:141 src/console/plugin.cc:47
+#: src/modplug/plugin_main.cc:77 src/resample/resample.cc:201
+#: src/resample/resample.cc:207 src/resample/resample.cc:211
+#: src/resample/resample.cc:215 src/resample/resample.cc:219
+#: src/resample/resample.cc:223 src/resample/resample.cc:227
+#: src/resample/resample.cc:231 src/resample/resample.cc:235
+#: src/resample/resample.cc:239 src/resample/resample.cc:243
+#: src/sid/xs_config.cc:67 src/soxr/sox-resampler.cc:205
+msgid "Hz"
+msgstr "Hz"
+
+#: src/adplug/adplug-xmms.cc:355 src/gtkui/settings.cc:55
+#: src/modplug/plugin_main.cc:105 src/qtui/settings.cc:85
+#: src/skins-qt/skins_cfg.cc:302 src/skins/skins_cfg.cc:284
+msgid "Miscellaneous"
+msgstr "Diverse"
+
+#: src/adplug/adplug-xmms.cc:356
+msgid "Repeat song in endless loop"
+msgstr "Repeta melodia într-o buclă infinită"
+
+#: src/albumart/albumart.cc:31 src/albumart-qt/albumart.cc:35
+msgid "Album Art"
+msgstr "Album Art"
+
+#: src/alsa/alsa.h:64
+msgid "ALSA Output"
+msgstr "ALSA Output"
+
+#: src/alsa/config.cc:28
+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\n"
+"Copyright 2009-2012 John Lindgren\n"
+"\n"
+"Multe mulțumiri lui William Pitcock, autorul ALSA Output Plugin NG, al cărui "
+"cod sursă a servit ca și referință când ALSA nu a fost îndeajuns."
+
+#: src/alsa/config.cc:61
+msgid "(no description)"
+msgstr "(fără descriere)"
+
+#: src/alsa/config.cc:166
+msgid "Default PCM device"
+msgstr "Dispozitiv PCM implicit"
+
+#: src/alsa/config.cc:188
+msgid "Default mixer device"
+msgstr "Dispozitiv de mixare implicit"
+
+#: src/alsa/config.cc:296
+msgid "PCM device:"
+msgstr "Dispozitiv PCM:"
+
+#: src/alsa/config.cc:299
+msgid "Mixer device:"
+msgstr "Dispozitiv mixer:"
+
+#: src/alsa/config.cc:302
+msgid "Mixer element:"
+msgstr "Element de mixat:"
+
+#: src/amidiplug/amidi-plug.cc:42
+msgid "AMIDI-Plug (MIDI Player)"
+msgstr "AMIDI-Plug (Player MIDI)"
+
+#: src/amidiplug/amidi-plug.cc:445
+msgid ""
+"AMIDI-Plug\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 ""
+"AMIDI-Plug\n"
+"MIDI player muzical modular\n"
+"http://www.develia.org/projects.php?p=amidiplug\n"
+"\n"
+"scris de Giacomo Lozito\n"
+"<james@develia.org>\n"
+"\n"
+"multumiri speciale către...\n"
+"\n"
+"Clemens Ladisch și Jaroslav Kysela\n"
+"pentru programele lor cool aplaymidi și amixer; acestea\n"
+"au fost extrem de folositoare, împreună cu alsa-lib docs, pentru\n"
+"a învăța mai multe despre ALSA API\n"
+"\n"
+"Alfredo Spadafina\n"
+"pentru logoul frumos cu a clapă midi\n"
+"\n"
+"Tony Vroon\n"
+"pentru bunul ajutor oferit cu testarea veriunii alpha"
+
+#: src/amidiplug/i_configure.cc:94
+msgid "Override default gain:"
+msgstr "Suprascrie gain implicit:"
+
+#: src/amidiplug/i_configure.cc:102
+msgid "Override default polyphony:"
+msgstr "Suprascrie polyfonia implicită"
+
+#: src/amidiplug/i_configure.cc:110
+msgid "Override default reverb:"
+msgstr "Suprascrie reverberaţia implicită"
+
+#: src/amidiplug/i_configure.cc:112 src/amidiplug/i_configure.cc:120
+msgid "On"
+msgstr "Pornit"
+
+#: src/amidiplug/i_configure.cc:118
+msgid "Override default chorus:"
+msgstr "Suprascrie chorus implicit:"
+
+#: src/amidiplug/i_configure.cc:128 src/console/plugin.cc:29
+msgid "Playback"
+msgstr "Redare"
+
+#: src/amidiplug/i_configure.cc:129
+msgid "Transpose:"
+msgstr "Transpune:"
+
+#: src/amidiplug/i_configure.cc:131 src/speedpitch/speed-pitch.cc:257
+msgid "semitones"
+msgstr "semitonuri"
+
+#: src/amidiplug/i_configure.cc:132
+msgid "Drum shift:"
+msgstr "Drum shift:"
+
+#: src/amidiplug/i_configure.cc:134
+msgid "note numbers"
+msgstr "Numere în loc de note muzicale"
+
+#: src/amidiplug/i_configure.cc:135
+msgid "Skip leading silence"
+msgstr "Sari peste liniștea de la început"
+
+#: src/amidiplug/i_configure.cc:137
+msgid "Skip trailing silence"
+msgstr "Sari peste liniștea de la final"
+
+#: src/amidiplug/i_configure.cc:141
+msgid "SoundFont"
+msgstr "SoundFont"
+
+#: src/amidiplug/i_configure.cc:148
+msgid "Synthesizer"
+msgstr "Sintetizator"
+
+#: src/amidiplug/i_configure-fluidsynth.cc:58
+#: src/amidiplug/i_configure-fluidsynth.cc:527
+msgid "AMIDI-Plug - select SoundFont file"
+msgstr "AMIDI-Plug - Selectaţi fişierul SoundFont"
+
+#: src/amidiplug/i_configure-fluidsynth.cc:61
+msgid "_Cancel"
+msgstr "_Anulează"
+
+#: src/amidiplug/i_configure-fluidsynth.cc:62
+msgid "_Open"
+msgstr "_Deschide"
+
+#: src/amidiplug/i_configure-fluidsynth.cc:233
+#: src/amidiplug/i_configure-fluidsynth.cc:461
+msgid "File name"
+msgstr "Nume fișier"
+
+#: src/amidiplug/i_configure-fluidsynth.cc:237
+#: src/amidiplug/i_configure-fluidsynth.cc:464
+msgid "Size (bytes)"
+msgstr "Mărime (octeti)"
+
+#: src/amidiplug/i_fileinfo.cc:184
+msgid "Name:"
+msgstr "Nume:"
+
+#: src/amidiplug/i_fileinfo.cc:202
+msgid " MIDI Info "
+msgstr " Informații MIDI "
+
+#: src/amidiplug/i_fileinfo.cc:216
+msgid "Format:"
+msgstr "Format:"
+
+#: src/amidiplug/i_fileinfo.cc:219
+msgid "Length (msec):"
+msgstr "Lungime (msec):"
+
+#: src/amidiplug/i_fileinfo.cc:222
+msgid "No. of Tracks:"
+msgstr "Numărul de piste:"
+
+#: src/amidiplug/i_fileinfo.cc:228
+msgid "variable"
+msgstr "variabil"
+
+#: src/amidiplug/i_fileinfo.cc:230
+msgid "BPM:"
+msgstr "BPM:"
+
+#: src/amidiplug/i_fileinfo.cc:238
+msgid "BPM (wavg):"
+msgstr "BPM (wavg):"
+
+#: src/amidiplug/i_fileinfo.cc:241
+msgid "Time Div:"
+msgstr "Diviziunea timpului:"
+
+#: src/amidiplug/i_fileinfo.cc:252
+msgid " MIDI Comments and Lyrics "
+msgstr " Comentarii şi versuri MIDI "
+
+#: src/amidiplug/i_fileinfo.cc:299
+msgid "* no comments available in this MIDI file *"
+msgstr "* nici un comentariu disponibil în acest fişier MIDI *"
+
+#: src/amidiplug/i_fileinfo.cc:311
+msgid "* no lyrics available in this MIDI file *"
+msgstr "* versuri indisponibile în acest fişier MIDI *"
+
+#: src/amidiplug/i_fileinfo.cc:321 src/ladspa/plugin.cc:418
+#: src/ui-common/dialogs-qt.cc:32
+msgid "_Close"
+msgstr "_Închide"
+
+#: src/amidiplug/i_fileinfo.cc:346
+msgid " (invalid UTF-8)"
+msgstr " (invalid UTF-8)"
+
+#: src/ampache/ampache.cc:33
+msgid "Ampache Browser"
+msgstr "Browser Ampache"
+
+#: src/ampache/ampache.cc:46
+msgid ""
+"Ampache Browser for Audacious\n"
+"http://ampache-browser.org/\n"
+"\n"
+"Copyright (C) Róbert Čerňanský and John Lindgren\n"
+"License: GNU GPLv3"
+msgstr ""
+"Ampache Browser pentru Audacious\n"
+"http://ampache-browser.org/\n"
+"\n"
+"Drepturi de autor (C) Róbert Čerňanský și John Lindgren\n"
+"Licență: GNU GPLv3"
+
+#: src/aosd/aosd.cc:31
+msgid ""
+"Audacious OSD\n"
+"http://www.develia.org/projects.php?p=audacious#aosd\n"
+"\n"
+"Written by Giacomo Lozito <james@develia.org>\n"
+"\n"
+"Based in part on Evan Martin's Ghosd library:\n"
+"http://neugierig.org/software/ghosd/"
+msgstr ""
+"Audacious OSD\n"
+"http://www.develia.org/projects.php?p=audacious#aosd\n"
+"\n"
+"Scris de Giacomo Lozito <james@develia.org>\n"
+"\n"
+"PArțial bazat pe librăria Evan Martin's Ghosd:\n"
+"http://neugierig.org/software/ghosd/"
+
+#: src/aosd/aosd.h:37
+msgid "AOSD (On-Screen Display)"
+msgstr "AOSD (On-Screen Display)"
+
+#: src/aosd/aosd_style.cc:54
+msgid "Rectangle"
+msgstr "Dreptunghi"
+
+#: src/aosd/aosd_style.cc:59
+msgid "Rounded Rectangle"
+msgstr "Dreptunghi rotunjit"
+
+#: src/aosd/aosd_style.cc:64
+msgid "Concave Rectangle"
+msgstr "Dreptunghi concav"
+
+#: src/aosd/aosd_style.cc:69 src/openmpt/mptwrap.h:50 src/xsf/plugin.cc:436
+msgid "None"
+msgstr "Nici unul"
+
+#: src/aosd/aosd_trigger.cc:49
+msgid "Playback Start"
+msgstr "Start redare"
+
+#: src/aosd/aosd_trigger.cc:50
+msgid "Triggers OSD when a playlist entry is played."
+msgstr "Pornește afișajul OSD în momentul redării"
+
+#: src/aosd/aosd_trigger.cc:55
+msgid "Title Change"
+msgstr "Schimbare Titlu"
+
+#: src/aosd/aosd_trigger.cc:56
+msgid "Triggers OSD when the song title changes (for internet streams)."
+msgstr ""
+"Pornește afișajul OSD în momentul schimbării titlului (pentru stream-uri de "
+"pe internet)."
+
+#: src/aosd/aosd_trigger.cc:61
+msgid "Pause On"
+msgstr "Pornește pauza"
+
+#: src/aosd/aosd_trigger.cc:62
+msgid "Triggers OSD when playback is paused."
+msgstr "Pornește afișajul OSD când se pune pauză."
+
+#: src/aosd/aosd_trigger.cc:67
+msgid "Pause Off"
+msgstr "Oprește pauza"
+
+#: src/aosd/aosd_trigger.cc:68
+msgid "Triggers OSD when playback is unpaused."
+msgstr "Pornește afișajul OSD când redarea este repornită"
+
+#: src/aosd/aosd_ui.cc:204
+msgid "Placement"
+msgstr "Pozitionare"
+
+#: src/aosd/aosd_ui.cc:241
+msgid "Relative X offset:"
+msgstr "Decalajul relativ pe axa X:"
+
+#: src/aosd/aosd_ui.cc:245
+msgid "Relative Y offset:"
+msgstr "Decalajul relativ pe axa Y:"
+
+#: src/aosd/aosd_ui.cc:249
+msgid "Max OSD width:"
+msgstr "Lungimea maximă a afișajului OSD:"
+
+#: src/aosd/aosd_ui.cc:281
+msgid "Multi-Monitor options"
+msgstr "Opțiuni multi pentru mai multe monitoare"
+
+#: src/aosd/aosd_ui.cc:285
+msgid "Display OSD using:"
+msgstr "Afișajul OSD folosind:"
+
+#: src/aosd/aosd_ui.cc:287
+msgid "all monitors"
+msgstr "tote monitoarele"
+
+#: src/aosd/aosd_ui.cc:290
+#, c-format
+msgid "monitor %i"
+msgstr "monitor %i"
+
+#: src/aosd/aosd_ui.cc:342
+msgid "Timing (ms)"
+msgstr "Sincronizare (ms)"
+
+#: src/aosd/aosd_ui.cc:347
+msgid "Display:"
+msgstr "Ecran:"
+
+#: src/aosd/aosd_ui.cc:352
+msgid "Fade in:"
+msgstr "Fade in:"
+
+#: src/aosd/aosd_ui.cc:357
+msgid "Fade out:"
+msgstr "Fade out:"
+
+#: src/aosd/aosd_ui.cc:442
+msgid "Fonts"
+msgstr "Fonturi"
+
+#: src/aosd/aosd_ui.cc:449
+#, c-format
+msgid "Font %i:"
+msgstr "Fonturi %i:"
+
+#: src/aosd/aosd_ui.cc:466
+msgid "Shadow"
+msgstr "umbră"
+
+#: src/aosd/aosd_ui.cc:589
+msgid "Render Style"
+msgstr "Stil de randare"
+
+#: src/aosd/aosd_ui.cc:605
+msgid "Colors"
+msgstr "Culori"
+
+#: src/aosd/aosd_ui.cc:616
+#, c-format
+msgid "Color %i:"
+msgstr "Culoare %i:"
+
+#: src/aosd/aosd_ui.cc:714
+msgid "Enable trigger"
+msgstr "Metoda de declanșare"
+
+#: src/aosd/aosd_ui.cc:741
+msgid "Event"
+msgstr "Eveniment"
+
+#: src/aosd/aosd_ui.cc:768
+msgid "Composite manager detected"
+msgstr "Manager compozit detectat"
+
+#: src/aosd/aosd_ui.cc:775
+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 ""
+"Managerul compozit nu a fost găsit;\n"
+"dacă știi că nu ai un manager compozit pornit; te rugăm să activezi un "
+"manager compozit, altfel afișajul OSD nu va funcționa corect"
+
+#: src/aosd/aosd_ui.cc:783
+msgid "Composite manager not required for fake transparency"
+msgstr ""
+"Managerul compozit nu este necesar pentru efectul de transparență falsă"
+
+#: src/aosd/aosd_ui.cc:820
+msgid "Transparency"
+msgstr "Transparenţă"
+
+#: src/aosd/aosd_ui.cc:826
+msgid "Fake transparency"
+msgstr "Transparenţă falsă"
+
+#: src/aosd/aosd_ui.cc:828
+msgid "Real transparency (requires X Composite Ext.)"
+msgstr "Transparenţă reală (necesita Extensia X Composite)"
+
+#: src/aosd/aosd_ui.cc:875
+msgid "Composite extension not loaded"
+msgstr "Extensia composită nu a fost încărcată"
+
+#: src/aosd/aosd_ui.cc:892
+#, c-format
+msgid "Audacious OSD"
+msgstr "Audacious OSD"
+
+#: src/aosd/aosd_ui.cc:955
+msgid "Position"
+msgstr "Poziţie"
+
+#: src/aosd/aosd_ui.cc:960
+msgid "Animation"
+msgstr "Animaţie"
+
+#: src/aosd/aosd_ui.cc:965
+msgid "Text"
+msgstr "Text"
+
+#: src/aosd/aosd_ui.cc:970
+msgid "Decoration"
+msgstr "Decoraţii"
+
+#: src/aosd/aosd_ui.cc:975
+msgid "Trigger"
+msgstr "Declanşator"
+
+#: src/aosd/aosd_ui.cc:980 src/streamtuner/shoutcast-model.cc:202
+msgid "Misc"
+msgstr "Diverse"
+
+#: src/aosd/aosd_ui.cc:989
+msgid "Test"
+msgstr "Test"
+
+#: src/asx3/asx3.cc:35
+msgid "ASXv3 Playlists"
+msgstr "Playlisturi ASXv3"
+
+#: src/asx/asx.cc:33
+msgid "ASXv1/ASXv2 Playlists"
+msgstr "Playlisturi ASXv1/ASXv2"
+
+#: src/audpl/audpl.cc:33
+msgid "Audacious Playlists (audpl)"
+msgstr "Playlisturi Audacious (audpl)"
+
+#: src/background_music/background_music.cc:24
+msgid "Background music"
+msgstr ""
+
+#: src/background_music/background_music.cc:25
+msgid "Target level:"
+msgstr ""
+
+#: src/background_music/background_music.cc:28
+#: src/background_music/background_music.cc:33
+#: src/silence-removal/silence-removal.cc:70
+msgid "dB"
+msgstr "dB"
+
+#: src/background_music/background_music.cc:29
+msgid "Maximum amplification:"
+msgstr "Amplificare maximă:"
+
+#: src/background_music/background_music.cc:34 src/mpg123/mpg123.cc:81
+msgid "Advanced"
+msgstr "Avansat"
+
+#: src/background_music/background_music.cc:36
+msgid "Slow detection weight:"
+msgstr ""
+
+#: src/background_music/background_music.cc:39
+msgid "Hint"
+msgstr "Indiciu"
+
+#: src/background_music/background_music.cc:41
+msgid ""
+"Slow detection weight is the relative weight\n"
+"of a long term average detection when compared\n"
+"to the actual, faster loudness detection.\n"
+"A value of zero gives a more radio-like sound\n"
+"where soft passages get \"pulled up\" more quickly,\n"
+"a value of two makes the sound feel less compressed."
+msgstr ""
+
+#: src/background_music/background_music.cc:52
+msgid ""
+"Background Music Plugin for Audacious\n"
+"Copyright 2023;2024 Michel Fleur\n"
+"\n"
+"Controls the volume to make the sound equally loud within and between "
+"tracks.\n"
+" It uses accurate loudness measurement and tries to make the volume changes "
+"sound natural without audible peaks, yet without lowering the volume before "
+"a peak in advance."
+msgstr ""
+
+#: src/background_music/background_music.cc:61
+msgid "Background Music"
+msgstr "Muzică de Fundal"
+
+#: src/bitcrusher/bitcrusher.cc:33
+msgid "Bitcrusher"
+msgstr "Bitcrusher"
+
+#: src/bitcrusher/bitcrusher.cc:34
+msgid "Bit Depth:"
+msgstr "Rezoluție:"
+
+#: src/bitcrusher/bitcrusher.cc:37
+msgid "Downsample ratio:"
+msgstr "Rație de subeșantionare:"
+
+#: src/bitcrusher/bitcrusher.cc:48
+msgid "Bitcrusher"
+msgstr "Bitcrusher"
+
+#: src/blur_scope/blur_scope.cc:40 src/blur_scope-qt/blur_scope.cc:45
+msgid "Color"
+msgstr "Culoare"
+
+#: src/blur_scope/blur_scope.cc:56 src/blur_scope-qt/blur_scope.cc:158
+msgid "Blur Scope"
+msgstr "Ecran încețoșat"
+
+#: src/bs2b/plugin.cc:38
+msgid "Bauer Stereophonic-to-Binaural (BS2B)"
+msgstr "Bauer Stereofonic-la-Binaural (BS2B)"
+
+#: src/bs2b/plugin.cc:129
+msgid "Presets:"
+msgstr "Presetări:"
+
+#: src/bs2b/plugin.cc:130
+msgid "Default"
+msgstr "Implicit"
+
+#: src/bs2b/plugin.cc:136
+msgid "Feed level:"
+msgstr "Nivelul de intrare"
+
+#: src/bs2b/plugin.cc:138
+msgid "x1/10 dB"
+msgstr "x1/10 dB"
+
+#: src/bs2b/plugin.cc:139
+msgid "Cut frequency:"
+msgstr "Frecvența de tăiere:"
+
+#: src/cairo-spectrum/cairo-spectrum.cc:42 src/qt-spectrum/qt-spectrum.cc:107
+msgid "Spectrum Analyzer"
+msgstr "Analizor de spectru"
+
+#: src/cdaudio/cdaudio-ng.cc:74
+msgid "Audio CD Plugin"
+msgstr "Plugin pentru CD audio"
+
+#: src/cdaudio/cdaudio-ng.cc:121
+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> și alții.\n"
+"\n"
+"Multe mulțumiri dezvoltatorilor libcdio <http://www.gnu.org/software/libcdio/"
+">\n"
+"și dezvoltatorilor libcddb <http://libcddb.sourceforge.net/>.\n"
+"\n"
+"De asemenea mulțumesc lui Tony Vroon pentru mentoratul și gidajul oferit.\n"
+"\n"
+"Acesta a fost un proiect Google Summer of Code din 2007."
+
+#: src/cdaudio/cdaudio-ng.cc:140
+msgid "Device"
+msgstr "Dispozitiv"
+
+#: src/cdaudio/cdaudio-ng.cc:141
+msgid "Read speed:"
+msgstr "Viteză de citire:"
+
+#: src/cdaudio/cdaudio-ng.cc:144
+msgid "Override device:"
+msgstr "Suprascrie dispozitivul:"
+
+#: src/cdaudio/cdaudio-ng.cc:146
+msgid "Metadata"
+msgstr "Metadata"
+
+#: src/cdaudio/cdaudio-ng.cc:147
+msgid "Use CD-Text"
+msgstr "Folosește textul din CD"
+
+#: src/cdaudio/cdaudio-ng.cc:150
+msgid "Use CDDB"
+msgstr "Folosește CDDB"
+
+#: src/cdaudio/cdaudio-ng.cc:152
+msgid "Use HTTP instead of CDDBP"
+msgstr "Folosește HTTP în locul CDDBP"
+
+#: src/cdaudio/cdaudio-ng.cc:155
+msgid "Server:"
+msgstr "Server:"
+
+#: src/cdaudio/cdaudio-ng.cc:159
+msgid "Path:"
+msgstr "Cale:"
+
+#: src/cdaudio/cdaudio-ng.cc:163
+msgid "Port:"
+msgstr "Port:"
+
+#: src/cdaudio/cdaudio-ng.cc:228
+msgid "Failed to initialize cdio subsystem."
+msgstr "Nu s-a putut inițializa subsistemul cdio."
+
+#: src/cdaudio/cdaudio-ng.cc:260
+#, c-format
+msgid "Invalid URI %s."
+msgstr "URI invalid %s."
+
+#: src/cdaudio/cdaudio-ng.cc:262
+#, c-format
+msgid "Track %d not found."
+msgstr "Piesa %d nu a fost găsită."
+
+#: src/cdaudio/cdaudio-ng.cc:264
+#, c-format
+msgid "Track %d is a data track."
+msgstr "Piesa %d este o piesă cu date."
+
+#: src/cdaudio/cdaudio-ng.cc:339
+msgid "Error reading audio CD."
+msgstr "Eroare citire CD audio."
+
+#: src/cdaudio/cdaudio-ng.cc:410
+msgid "Audio CD"
+msgstr "Audio CD"
+
+#: src/cdaudio/cdaudio-ng.cc:446 src/cdaudio/cdaudio-ng.cc:455
+#, c-format
+msgid "Failed to open CD device %s."
+msgstr "Nu s-a putut deschide unitatea CD %s."
+
+#: src/cdaudio/cdaudio-ng.cc:458
+msgid "No audio capable CD drive found."
+msgstr "Nu a fost găsită unitatea CD cu capabilități audio."
+
+#: src/cdaudio/cdaudio-ng.cc:481
+msgid "Drive is empty."
+msgstr "Unitatea este goală."
+
+#: src/cdaudio/cdaudio-ng.cc:483
+msgid "Unsupported disk type."
+msgstr "Tipul de disc nu este suportat."
+
+#: src/cdaudio/cdaudio-ng.cc:507
+msgid "Failed to finish initializing opened CD drive."
+msgstr "Nu s-a putut finaliza inițializarea unitatea CD deschisă."
+
+#: src/cdaudio/cdaudio-ng.cc:520
+msgid "Failed to retrieve first/last track number."
+msgstr "Nu s-au putut obține numerele de ordine aferente pieselor. "
+
+#: src/cdaudio/cdaudio-ng.cc:541
+#, c-format
+msgid "Cannot read start/end LSN for track %d."
+msgstr "Nu se poate citi începutul și/sau sfârșitul LSN pentru piesa %d."
+
+#: src/cdaudio/cdaudio-ng.cc:624
+msgid "Failed to create the CDDB connection."
+msgstr "Nu s-a putut creea conexiunea CDDB."
+
+#: src/cdaudio/cdaudio-ng.cc:690
+msgid "Failed to query the CDDB server"
+msgstr "Nu s-a putut interoga serverul CDDB"
+
+#: src/cdaudio/cdaudio-ng.cc:692
+#, c-format
+msgid "Failed to query the CDDB server: %s"
+msgstr "Nu s-a putut interoga serverul CDDB: %s"
+
+#: src/cdaudio/cdaudio-ng.cc:716
+#, c-format
+msgid "Failed to read the CDDB info: %s"
+msgstr "Nu s-au putut citi informațiile CDDB: %s"
+
+#: src/cd-menu-items/cd-menu-items.cc:33
+msgid "Audio CD Menu Items"
+msgstr "Elemente din meniul CD-ului audio"
+
+#: src/cd-menu-items/cd-menu-items.cc:45
+msgid "Pla_y CD"
+msgstr "Redă CD"
+
+#: src/cd-menu-items/cd-menu-items.cc:45
+msgid "_Add CD"
+msgstr "Adaugă CD"
+
+#: src/compressor/compressor.cc:45
+msgid "Compression"
+msgstr "Compresie"
+
+#: src/compressor/compressor.cc:46
+msgid "Center volume:"
+msgstr "Centrul volumului:"
+
+#: src/compressor/compressor.cc:49
+msgid "Dynamic range:"
+msgstr "Interval dinamic:"
+
+#: src/compressor/compressor.cc:57
+msgid ""
+"Dynamic Range Compression Plugin for Audacious\n"
+"Copyright 2010-2014 John Lindgren"
+msgstr ""
+"Dynamic Range Compression Plugin pentru Audacious\n"
+"Drepturi de autor 2010-2014 John Lindgren"
+
+#: src/compressor/compressor.cc:64
+msgid "Dynamic Range Compressor"
+msgstr "Compresor interval dinamic"
+
+#: src/console/plugin.cc:15
+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 ""
+"Decodor de muzică bazat pe Game_Music_Emu 0.5.2\n"
+"Formate suportate: AY, GBS, GYM, HES, KSS, NSF, NSFE, SAP, SPC, VGM, VGZ\n"
+"\n"
+"Plugin Audacious de:\n"
+"William Pitcock <nenolod@dereferenced.org>\n"
+"Shay Green <gblargg@gmail.com>"
+
+#: src/console/plugin.cc:30
+msgid "Bass:"
+msgstr "Bass:"
+
+#: src/console/plugin.cc:33
+msgid "Treble:"
+msgstr "Inalte:"
+
+#: src/console/plugin.cc:36
+msgid "Echo:"
+msgstr "Ecou:"
+
+#: src/console/plugin.cc:39
+msgid "Default song length:"
+msgstr "Lungimea implicită a melodiei:"
+
+#: src/console/plugin.cc:41 src/crossfade/crossfade.cc:56
+#: src/crossfade/crossfade.cc:62 src/lirc/lirc.cc:395 src/notify/notify.cc:113
+#: src/sid/xs_config.cc:85 src/sid/xs_config.cc:94 src/sid/xs_config.cc:103
+#: src/vumeter-qt/vumeter_qt.cc:39
+msgid "seconds"
+msgstr "secunde"
+
+#: src/console/plugin.cc:42 src/modplug/plugin_main.cc:58
+msgid "Resampling"
+msgstr "Reeșantionare"
+
+#: src/console/plugin.cc:43
+msgid "Enable audio resampling"
+msgstr "Activează reeșantionarea audio"
+
+#: src/console/plugin.cc:49
+msgid "SPC"
+msgstr "SPC"
+
+#: src/console/plugin.cc:50
+msgid "Ignore length from SPC tags"
+msgstr "Ignoră lungimea din etichetele SPC"
+
+#: src/console/plugin.cc:52
+msgid "Increase reverb"
+msgstr "Măreşte reverbul"
+
+#: src/console/plugin.h:26
+msgid "Game Console Music Decoder"
+msgstr "Game Console Music Decoder"
+
+#: src/coreaudio/coreaudio.cc:53
+msgid "CoreAudio output"
+msgstr "Ieșirea CoreAudio"
+
+#: src/coreaudio/coreaudio.cc:155
+msgid ""
+"CoreAudio Output Plugin for Audacious\n"
+"Copyright 2014 William Pitcock\n"
+"Copyright 2017,18 René J.V. Bertin\n"
+" (original code and code adapted from\n"
+" Apple examples, (C) Apple 2013)\n"
+"\n"
+"Based on SDL Output Plugin for Audacious\n"
+"Copyright 2010 John Lindgren"
+msgstr ""
+"CoreAudio Output Plugin pentru Audacious\n"
+"Drepturi de autor 2014 William Pitcock\n"
+"Drepturi de autor 2017,18 René J.V. Bertin\n"
+" (codul original și codul adaptat din\n"
+" exemplele provenite de la Apple, (C) Apple 2013)\n"
+"\n"
+"Bazat pe SDL Output Plugin pentru Audacious\n"
+"Drepturi de autor 2010 John Lindgren"
+
+#: src/coreaudio/coreaudio.cc:171
+msgid "Use exclusive mode"
+msgstr "Folosește modul exclusiv"
+
+#: src/coreaudio/coreaudio.cc:173
+msgid "Use bit perfect audio (adapt device sampling rate)"
+msgstr "Folosește numărul de biți ideali (adaptează rata de eșantionare)"
+
+#: src/crossfade/crossfade.cc:47
+msgid ""
+"Crossfade Plugin for Audacious\n"
+"Copyright 2010-2014 John Lindgren"
+msgstr ""
+"Crossfade Plugin pentru Audacious\n"
+"Drepturi de autor 2010-2014 John Lindgren"
+
+#: src/crossfade/crossfade.cc:51
+msgid "Crossfade"
+msgstr "Crossfade"
+
+#: src/crossfade/crossfade.cc:52
+msgid "On automatic song change"
+msgstr "La schimbarea automată a melodiei"
+
+#: src/crossfade/crossfade.cc:54 src/crossfade/crossfade.cc:60
+msgid "Overlap:"
+msgstr "Suprapune:"
+
+#: src/crossfade/crossfade.cc:58
+msgid "On seek or manual song change"
+msgstr "La căutare sau la schimbarea manuală a melodiei"
+
+#: src/crossfade/crossfade.cc:64
+msgid "No fade in"
+msgstr ""
+
+#: src/crossfade/crossfade.cc:66
+msgid "Use S-curve fade"
+msgstr ""
+
+#: src/crossfade/crossfade.cc:68
+msgid "S-curve steepness:"
+msgstr ""
+
+#: src/crossfade/crossfade.cc:70
+msgid "(higher is steeper)"
+msgstr ""
+
+#: src/crossfade/crossfade.cc:72
+msgid "Tip"
+msgstr "Vârf"
+
+#: src/crossfade/crossfade.cc:73
+msgid ""
+"For better crossfading, enable\n"
+"the Silence Removal effect."
+msgstr ""
+"Pentru un efect de crossfading, activează\n"
+"efectul de eliminare a liniștii."
+
+#: src/crossfade/crossfade.cc:83
+msgid "Crossfade"
+msgstr "Crossfade"
+
+#: src/crystalizer/crystalizer.cc:31
+msgid "Crystalizer"
+msgstr "Crystalizer"
+
+#: src/crystalizer/crystalizer.cc:32 src/stereo_plugin/stereo.cc:45
+msgid "Intensity:"
+msgstr "Intensitate:"
+
+#: src/crystalizer/crystalizer.cc:43
+msgid "Crystalizer"
+msgstr "Crystalizer"
+
+#: src/cue/cue.cc:42
+msgid "Cue Sheet Plugin"
+msgstr "Plugin pentru fișiere Cue"
+
+#: src/delete-files/delete-files.cc:53 src/delete-files/delete-files.cc:215
+#: src/delete-files/delete-files.cc:230
+msgid "Delete Files"
+msgstr "Șterge fișiere"
+
+#: src/delete-files/delete-files.cc:120
+msgid "No files are selected."
+msgstr "Fișierele nu sunt selectate."
+
+#: src/delete-files/delete-files.cc:125
+#, c-format
+msgid "Do you want to move %s to the trash?"
+msgstr "Dorești să muți %s la gunoi ?"
+
+#: src/delete-files/delete-files.cc:126
+#, c-format
+msgid "Do you want to permanently delete %s?"
+msgstr "Dorești să ștergi permanent %s ?"
+
+#: src/delete-files/delete-files.cc:133
+#, c-format
+msgid "Do you want to move %d files to the trash?"
+msgstr "Dorești să muți %d fișiere la gunoi ?"
+
+#: src/delete-files/delete-files.cc:134
+#, c-format
+msgid "Do you want to permanently delete %d files?"
+msgstr "Dorești să ștergi permanent %d fișiere ?"
+
+#: src/delete-files/delete-files.cc:146
+msgid "Move to trash"
+msgstr "Mută la gunoi"
+
+#: src/delete-files/delete-files.cc:146
+msgid "Delete"
+msgstr "Șterge"
+
+#: src/delete-files/delete-files.cc:213 src/delete-files/delete-files.cc:235
+#: src/skins-qt/search-select.cc:102 src/skins/search-select.cc:78
+msgid "Cancel"
+msgstr "Anulează"
+
+#: src/delete-files/delete-files.cc:267
+msgid "Delete Selected Files"
+msgstr "Șterge fișierele selectate"
+
+#: src/delete-files/delete-files.cc:287
+msgid "Delete Method"
+msgstr "Methoda de ștergere"
+
+#: src/delete-files/delete-files.cc:288
+msgid "Move to trash instead of deleting immediately"
+msgstr "Muta la gunoi în locul ștergerii imediate"
+
+#: src/echo_plugin/echo.cc:9
+msgid ""
+"Echo Plugin\n"
+"By Johan Levin, 1999\n"
+"Surround echo by Carl van Schaik, 1999\n"
+"Updated for Audacious by William Pitcock and John Lindgren, 2010-2014"
+msgstr ""
+"Echo Plugin\n"
+"De Johan Levin, 1999\n"
+"Ecou Surround de Carl van Schaik, 1999\n"
+"Uploadat pentru Audacious de William Pitcock și John Lindgren, 2010-2014"
+
+#: src/echo_plugin/echo.cc:21
+msgid "Echo"
+msgstr "Ecou"
+
+#: src/echo_plugin/echo.cc:22 src/modplug/plugin_main.cc:72
+#: src/modplug/plugin_main.cc:82
+msgid "Delay:"
+msgstr "Întârziere:"
+
+#: src/echo_plugin/echo.cc:24 src/modplug/plugin_main.cc:72
+#: src/modplug/plugin_main.cc:82 src/xsf/plugin.cc:445
+msgid "ms"
+msgstr "ms"
+
+#: src/echo_plugin/echo.cc:25
+msgid "Feedback:"
+msgstr "Feedback:"
+
+#: src/echo_plugin/echo.cc:28 src/modplug/plugin_main.cc:86
+msgid "Volume:"
+msgstr "Volum:"
+
+#: src/echo_plugin/echo.cc:39
+msgid "Echo"
+msgstr "Ecou"
+
+#: src/ffaudio/ffaudio-core.cc:50
+msgid "FFmpeg Plugin"
+msgstr "Plugin FFmpeg"
+
+#: src/ffaudio/ffaudio-core.cc:649
+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 ""
+"Plugin de decodare audio multi format pentru Audacious folosind\n"
+"librăriile multimedia FFmpeg (http://www.ffmpeg.org/)\n"
+"\n"
+"Plugin Audacious de:\n"
+"William Pitcock <nenolod@nenolod.net>\n"
+"Matti Hämäläinen <ccr@tnsp.org>"
+
+#: src/filewriter/filewriter.cc:48
+msgid "FileWriter Plugin"
+msgstr "FileWriter Plugin"
+
+#: src/filewriter/filewriter.cc:316
+#, c-format
+msgid ""
+"Error opening %s:\n"
+"%s"
+msgstr ""
+"Eroare la deschiderea %s:\n"
+"%s"
+
+#: src/filewriter/filewriter.cc:358
+msgid ""
+"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/filewriter/filewriter.cc:385
+msgid "Output file format:"
+msgstr "Fișier de ieșire:"
+
+#: src/filewriter/filewriter.cc:389
+msgid "Save into original directory"
+msgstr "Salvează în directorul original"
+
+#: src/filewriter/filewriter.cc:392
+msgid "Save into custom directory:"
+msgstr "Salvează într-un dosar personalizat:"
+
+#: src/filewriter/filewriter.cc:400
+msgid "Generate file name from:"
+msgstr "Generează numele de fișiere din:"
+
+#: src/filewriter/filewriter.cc:401
+msgid "Original file name"
+msgstr "Numele original al fișierului"
+
+#: src/filewriter/filewriter.cc:404
+msgid "Original file name (no suffix)"
+msgstr "Nmele original al fișierului (fără sufix)"
+
+#: src/filewriter/filewriter.cc:407
+msgid "Original file tag"
+msgstr "Eticheta originală a fișierului"
+
+#: src/filewriter/filewriter.cc:411
+msgid "Prepend track number to file name"
+msgstr "Adaugă numele piesei la începutul numelui fișierului"
+
+#: src/filewriter/filewriter.cc:417 src/filewriter/filewriter.cc:449
+msgid "Auto"
+msgstr "Auto"
+
+#: src/filewriter/filewriter.cc:418
+msgid "8000 Hz"
+msgstr "8000 Hz"
+
+#: src/filewriter/filewriter.cc:419
+msgid "11025 Hz"
+msgstr "11025 Hz"
+
+#: src/filewriter/filewriter.cc:420
+msgid "12000 Hz"
+msgstr "12000 Hz"
+
+#: src/filewriter/filewriter.cc:421
+msgid "16000 Hz"
+msgstr "16000 Hz"
+
+#: src/filewriter/filewriter.cc:422
+msgid "22050 Hz"
+msgstr "22050 Hz"
+
+#: src/filewriter/filewriter.cc:423
+msgid "24000 Hz"
+msgstr "24000 Hz"
+
+#: src/filewriter/filewriter.cc:424
+msgid "32000 Hz"
+msgstr "32000 Hz"
+
+#: src/filewriter/filewriter.cc:425 src/xsf/plugin.cc:430
+msgid "44100 Hz"
+msgstr "44100 Hz"
+
+#: src/filewriter/filewriter.cc:426 src/xsf/plugin.cc:431
+msgid "48000 Hz"
+msgstr "48000 Hz"
+
+#: src/filewriter/filewriter.cc:430
+msgid "8 kbit/s"
+msgstr "8 kbit/s"
+
+#: src/filewriter/filewriter.cc:431
+msgid "16 kbit/s"
+msgstr "16 kbit/s"
+
+#: src/filewriter/filewriter.cc:432
+msgid "32 kbit/s"
+msgstr "32 kbit/s"
+
+#: src/filewriter/filewriter.cc:433
+msgid "40 kbit/s"
+msgstr "40 kbit/s"
+
+#: src/filewriter/filewriter.cc:434
+msgid "48 kbit/s"
+msgstr "48 kbit/s"
+
+#: src/filewriter/filewriter.cc:435
+msgid "56 kbit/s"
+msgstr "56 kbit/s"
+
+#: src/filewriter/filewriter.cc:436
+msgid "64 kbit/s"
+msgstr "64 kbit/s"
+
+#: src/filewriter/filewriter.cc:437
+msgid "80 kbit/s"
+msgstr "80 kbit/s"
+
+#: src/filewriter/filewriter.cc:438
+msgid "96 kbit/s"
+msgstr "96 kbit/s"
+
+#: src/filewriter/filewriter.cc:439
+msgid "112 kbit/s"
+msgstr "112 kbit/s"
+
+#: src/filewriter/filewriter.cc:440
+msgid "128 kbit/s"
+msgstr "128 kbit/s"
+
+#: src/filewriter/filewriter.cc:441
+msgid "160 kbit/s"
+msgstr "160 kbit/s"
+
+#: src/filewriter/filewriter.cc:442
+msgid "192 kbit/s"
+msgstr "192 kbit/s"
+
+#: src/filewriter/filewriter.cc:443
+msgid "224 kbit/s"
+msgstr "224 kbit/s"
+
+#: src/filewriter/filewriter.cc:444
+msgid "256 kbit/s"
+msgstr "256 kbit/s"
+
+#: src/filewriter/filewriter.cc:445
+msgid "320 kbit/s"
+msgstr "320 kbit/s"
+
+#: src/filewriter/filewriter.cc:450
+msgid "Joint Stereo"
+msgstr "Stereo combinat"
+
+#: src/filewriter/filewriter.cc:451 src/modplug/plugin_main.cc:57
+#: src/mpg123/mpg123.cc:259
+msgid "Stereo"
+msgstr "Stereo"
+
+#: src/filewriter/filewriter.cc:452 src/modplug/plugin_main.cc:56
+#: src/mpg123/mpg123.cc:260
+msgid "Mono"
+msgstr "Mono"
+
+#: src/filewriter/filewriter.cc:456
+msgid "VBR"
+msgstr "VBR"
+
+#: src/filewriter/filewriter.cc:457
+msgid "ABR"
+msgstr "ABR"
+
+#: src/filewriter/filewriter.cc:478
+msgid "Algorithm quality:"
+msgstr "Calitatea algoritmului:"
+
+#: src/filewriter/filewriter.cc:484
+msgid "Bitrate:"
+msgstr "Bitrate:"
+
+#: src/filewriter/filewriter.cc:491
+msgid "Compression ratio:"
+msgstr "Rația de compresie:"
+
+#: src/filewriter/filewriter.cc:498
+msgid "Audio mode:"
+msgstr "Mod audio:"
+
+#: src/filewriter/filewriter.cc:501
+msgid "Enforce strict ISO compliance"
+msgstr "Impune conformarea strictă la standardul ISO"
+
+#: src/filewriter/filewriter.cc:503
+msgid "Error protection"
+msgstr "Protecție la erori"
+
+#: src/filewriter/filewriter.cc:508
+msgid "Enable VBR/ABR"
+msgstr "Pornește VBR/ABR"
+
+#: src/filewriter/filewriter.cc:510
+msgid "Type:"
+msgstr "Tip:"
+
+#: src/filewriter/filewriter.cc:514
+msgid "Minimum bitrate:"
+msgstr "Bitrare minim:"
+
+#: src/filewriter/filewriter.cc:518
+msgid "Maximum bitrate:"
+msgstr "Bitrate maxim:"
+
+#: src/filewriter/filewriter.cc:522
+msgid "Average bitrate:"
+msgstr "Bitrate mediu:"
+
+#: src/filewriter/filewriter.cc:526
+msgid "VBR quality level:"
+msgstr "Nivelul de calitate al VBR:"
+
+#: src/filewriter/filewriter.cc:530
+msgid "Strictly enforce minimum bitrate"
+msgstr "Impune în mod strict un bitrate minim"
+
+#: src/filewriter/filewriter.cc:533
+msgid "Omit Xing VBR header"
+msgstr "Omite antentul Xing VBR"
+
+#: src/filewriter/filewriter.cc:539
+msgid "Frame Headers"
+msgstr "Antetul cadrelor"
+
+#: src/filewriter/filewriter.cc:540
+msgid "Mark as copyright"
+msgstr "Marchează cu drepturi de autor"
+
+#: src/filewriter/filewriter.cc:542
+msgid "Mark as original"
+msgstr "Marchează ca original"
+
+#: src/filewriter/filewriter.cc:544
+msgid "ID3 Tags"
+msgstr "Etichete ID3"
+
+#: src/filewriter/filewriter.cc:545
+msgid "Force addition of version 2 tag"
+msgstr "Forțează adiția etichetelor versiunea 2 "
+
+#: src/filewriter/filewriter.cc:547
+msgid "Only add v1 tag"
+msgstr "Adaugă numai tag-ul v1"
+
+#: src/filewriter/filewriter.cc:549
+msgid "Only add v2 tag"
+msgstr "Adaugă numai tag-ul v2"
+
+#: src/filewriter/filewriter.cc:554
+msgid "Quality"
+msgstr "Calitate"
+
+#: src/filewriter/filewriter.cc:555
+msgid "VBR/ABR"
+msgstr "VBR/ABR"
+
+#: src/filewriter/filewriter.cc:556
+msgid "Tags"
+msgstr "Tag-uri"
+
+#: src/filewriter/filewriter.cc:566
+msgid "Quality (0-1):"
+msgstr "Calitate (0-1):"
+
+#: src/filewriter/filewriter.cc:573 src/skins-qt/skins_cfg.cc:307
+#: src/skins/skins_cfg.cc:289
+msgid "General"
+msgstr "General"
+
+#: src/flac/flacng.h:36
+msgid "FLAC Decoder"
+msgstr "Decodor FLAC"
+
+#: src/flac/metadata.cc:296 src/wavpack/wavpack.cc:215
+msgid "lossless"
+msgstr "lossless"
+
+#: src/flac/plugin.cc:214
+msgid ""
+"Original code by\n"
+"Ralf Ertzinger <ralf@skytale.net>\n"
+"\n"
+"http://www.skytale.net/projects/bmp-flac2/"
+msgstr ""
+"Codul original de\n"
+"Ralf Ertzinger <ralf@skytale.net>\n"
+"\n"
+"http://www.skytale.net/projects/bmp-flac2/"
+
+#: src/gio/gio.cc:34
+msgid ""
+"GIO Plugin for Audacious\n"
+"Copyright 2009-2012 John Lindgren"
+msgstr ""
+"GIO Plugin pentru Audacious\n"
+"Drepturi de autor 2009-2012 John Lindgren"
+
+#: src/gio/gio.cc:42
+msgid "GIO Plugin"
+msgstr "GIO Plugin"
+
+#: src/gio/gio.cc:152
+msgid "Read-and-append mode not supported"
+msgstr "Modul de citire și lipire nu este suportat"
+
+#: src/gio/gio.cc:165
+msgid "Invalid open mode"
+msgstr "Mod deschid invalid"
+
+#: src/glspectrum/gl-spectrum.cc:52
+msgid ""
+"OpenGL Spectrum Analyzer for Audacious\n"
+"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\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 ""
+"Analizor de spectru bazat pe OpenGL pentru Audacious\n"
+"Drepturi de autor 2013 Christophe Budé, John Lindgren, și Carlo Bramini\n"
+"\n"
+"Bazat pe pluginul XMMS:\n"
+"Drepturi de autor 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas "
+"Nilsson, și 4Front Technologies\n"
+"\n"
+"Licență: GPLv2+"
+
+#: src/glspectrum/gl-spectrum.cc:63 src/qtglspectrum/gl-spectrum.cc:53
+msgid "OpenGL Spectrum Analyzer"
+msgstr "Analizor de spectru bazat pe OpenGL"
+
+#: src/gtkui/columns.cc:36 src/moonstone/playlist_model.cc:38
+#: src/qtui/playlist_model.cc:33
+msgid "Entry Number"
+msgstr "Numărul de intrare"
+
+#: src/gtkui/columns.cc:37 src/moonstone/playlist_model.cc:38
+#: src/moonstone/playlist_selection.cc:64
+#: src/playlist-manager/playlist-manager.cc:200
+#: src/playlist-manager-qt/playlist-manager-qt.cc:188
+#: src/qtui/playlist_model.cc:33 src/streamtuner/icecast-model.cc:120
+#: src/streamtuner/ihr-model.cc:159 src/streamtuner/shoutcast-model.cc:122
+msgid "Title"
+msgstr "Titlu"
+
+#: src/gtkui/columns.cc:38 src/moonstone/playlist_model.cc:39
+#: src/qtui/playlist_model.cc:33
+msgid "Artist"
+msgstr "Artist"
+
+#: src/gtkui/columns.cc:39 src/moonstone/playlist_model.cc:39
+#: src/qtui/playlist_model.cc:33
+msgid "Year"
+msgstr "An"
+
+#: src/gtkui/columns.cc:40 src/moonstone/playlist_model.cc:39
+#: src/qtui/playlist_model.cc:34
+msgid "Album"
+msgstr "Album"
+
+#: src/gtkui/columns.cc:41 src/moonstone/playlist_model.cc:40
+#: src/qtui/playlist_model.cc:34
+msgid "Album Artist"
+msgstr "Artist Album"
+
+#: src/gtkui/columns.cc:42 src/moonstone/playlist_model.cc:40
+#: src/qtui/playlist_model.cc:34
+msgid "Track"
+msgstr "Pistă"
+
+#: src/gtkui/columns.cc:43 src/moonstone/playlist_model.cc:40
+#: src/qtui/playlist_model.cc:34 src/streamtuner/icecast-model.cc:123
+#: src/streamtuner/shoutcast-model.cc:125
+#: src/streamtuner/shoutcast-model.cc:236
+msgid "Genre"
+msgstr "Genul"
+
+#: src/gtkui/columns.cc:44 src/moonstone/playlist_model.cc:41
+#: src/qtui/playlist_model.cc:35
+msgid "Queue Position"
+msgstr "Poziția la coadă"
+
+#: src/gtkui/columns.cc:45 src/moonstone/playlist_model.cc:41
+#: src/qtui/playlist_model.cc:35
+msgid "Length"
+msgstr "Lungime"
+
+#: src/gtkui/columns.cc:46 src/moonstone/playlist_model.cc:41
+#: src/qtui/playlist_model.cc:35
+msgid "File Path"
+msgstr "Calea către fișier"
+
+#: src/gtkui/columns.cc:47 src/moonstone/playlist_model.cc:42
+#: src/qtui/playlist_model.cc:35
+msgid "File Name"
+msgstr "Numele fișierului"
+
+#: src/gtkui/columns.cc:48 src/moonstone/playlist_model.cc:42
+#: src/qtui/playlist_model.cc:36
+msgid "Custom Title"
+msgstr "Nume personalizat"
+
+#: src/gtkui/columns.cc:49 src/moonstone/playlist_model.cc:42
+#: src/qtui/playlist_model.cc:36 src/streamtuner/icecast-model.cc:129
+#: src/streamtuner/shoutcast-model.cc:134
+msgid "Bitrate"
+msgstr "Bitrate"
+
+#: src/gtkui/columns.cc:50 src/moonstone/playlist_model.cc:43
+#: src/qtui/playlist_model.cc:36
+msgid "Comment"
+msgstr "Comentariu"
+
+#: src/gtkui/columns.cc:51 src/qtui/playlist_model.cc:36
+msgid "Publisher"
+msgstr "Casă de discuri"
+
+#: src/gtkui/columns.cc:52 src/qtui/playlist_model.cc:37
+msgid "Catalog Number"
+msgstr "Numărul de catalog"
+
+#: src/gtkui/columns.cc:53 src/moonstone/playlist_model.cc:43
+#: src/qtui/playlist_model.cc:37
+msgid "Disc"
+msgstr "Disc"
+
+#: src/gtkui/columns.cc:325
+msgid "Available columns"
+msgstr "Coloanele disponibile"
+
+#: src/gtkui/columns.cc:351
+msgid "Displayed columns"
+msgstr "Coloanele afișate"
+
+#: src/gtkui/layout.cc:74 src/search-tool-qt/search-tool-qt.cc:58
+#: src/search-tool/search-tool.cc:49
+msgid "Search Tool"
+msgstr "Instrument de căutare"
+
+#: src/gtkui/layout.cc:170
+msgid "Dock at Left"
+msgstr "Dock-ul la stânga"
+
+#: src/gtkui/layout.cc:170
+msgid "Dock at Right"
+msgstr "Dock-ul la dreapta"
+
+#: src/gtkui/layout.cc:171
+msgid "Dock at Top"
+msgstr "Dock-ul deasupra"
+
+#: src/gtkui/layout.cc:171
+msgid "Dock at Bottom"
+msgstr "Dock-ul jos"
+
+#: src/gtkui/layout.cc:171
+msgid "Undock"
+msgstr "Undock"
+
+#: src/gtkui/layout.cc:171 src/ladspa/plugin.cc:540
+msgid "Disable"
+msgstr "Dezactivează"
+
+#: src/gtkui/menus.cc:79 src/qtui/menus.cc:107
+#: src/statusicon-qt/statusicon.cc:115 src/statusicon/statusicon.cc:286
+msgid "_Open Files ..."
+msgstr "_Deschide Fișiere ..."
+
+#: src/gtkui/menus.cc:80 src/qtui/menus.cc:111
+msgid "Open _URL ..."
+msgstr "Deschide _URL ..."
+
+#: src/gtkui/menus.cc:81 src/qtui/menus.cc:113
+msgid "_Add Files ..."
+msgstr "Adaugă fișiere ..."
+
+#: src/gtkui/menus.cc:82 src/qtui/menus.cc:118
+msgid "Add U_RL ..."
+msgstr "Adaugă URL ..."
+
+#: src/gtkui/menus.cc:84 src/qtui/menus.cc:120
+msgid "Search _Library"
+msgstr "Caută_în_bibliotecă"
+
+#: src/gtkui/menus.cc:86 src/qtui/menus.cc:123
+msgid "A_bout ..."
+msgstr "Despre ..."
+
+#: src/gtkui/menus.cc:87 src/qtui/menus.cc:125
+msgid "_Settings ..."
+msgstr "_Setări ..."
+
+#: src/gtkui/menus.cc:88 src/qtui/menus.cc:131
+#: src/statusicon-qt/statusicon.cc:117 src/statusicon/statusicon.cc:288
+msgid "_Quit"
+msgstr "_Ieșire"
+
+#: src/gtkui/menus.cc:92 src/gtkui/menus.cc:226
+#: src/moonstone/playlist_tabs.cc:306 src/qtui/menus.cc:135
+#: src/qtui/playlist_tabs.cc:331 src/search-tool-qt/search-tool-qt.cc:499
+#: src/search-tool/search-tool.cc:339 src/statusicon-qt/statusicon.cc:109
+#: src/statusicon/statusicon.cc:280
+msgid "_Play"
+msgstr "_Redare"
+
+#: src/gtkui/menus.cc:93 src/qtui/menus.cc:137
+#: src/statusicon-qt/statusicon.cc:110 src/statusicon/statusicon.cc:281
+msgid "Paus_e"
+msgstr "Pauză"
+
+#: src/gtkui/menus.cc:94 src/qtui/menus.cc:139
+#: src/statusicon-qt/statusicon.cc:111 src/statusicon/statusicon.cc:282
+msgid "_Stop"
+msgstr "_Oprește"
+
+#: src/gtkui/menus.cc:95 src/qtui/menus.cc:141
+#: src/statusicon-qt/statusicon.cc:112 src/statusicon/statusicon.cc:283
+msgid "Pre_vious"
+msgstr "Precedent"
+
+#: src/gtkui/menus.cc:96 src/qtui/menus.cc:143
+#: src/statusicon-qt/statusicon.cc:113 src/statusicon/statusicon.cc:284
+msgid "_Next"
+msgstr "_Următorul"
+
+#: src/gtkui/menus.cc:97 src/qtui/menus.cc:145 src/skins/menus.cc:114
+#: src/skins-qt/menus.cc:105
+msgid "Previous Album"
+msgstr "Albumul precedent"
+
+#: src/gtkui/menus.cc:98 src/qtui/menus.cc:146 src/skins/menus.cc:115
+#: src/skins-qt/menus.cc:106
+msgid "Next Album"
+msgstr "Albumul următor"
+
+#: src/gtkui/menus.cc:100 src/qtui/menus.cc:148
+msgid "_Repeat"
+msgstr "_Repetă"
+
+#: src/gtkui/menus.cc:101 src/qtui/menus.cc:150
+msgid "S_huffle"
+msgstr "Aleatoriu"
+
+#: src/gtkui/menus.cc:102 src/qtui/menus.cc:152
+msgid "Shuffle by Albu_m"
+msgstr "Aleatoriu după album"
+
+#: src/gtkui/menus.cc:103 src/qtui/menus.cc:155
+msgid "N_o Playlist Advance"
+msgstr "Fără avansul playlistului"
+
+#: src/gtkui/menus.cc:104 src/qtui/menus.cc:157
+msgid "Stop A_fter This Song"
+msgstr "Oprește după această melodie"
+
+#: src/gtkui/menus.cc:106 src/gtkui/menus.cc:210 src/qtui/menus.cc:162
+#: src/qtui/menus.cc:294
+msgid "Song _Info ..."
+msgstr "Informații_despre_ melodie ..."
+
+#: src/gtkui/menus.cc:107
+msgid "Jump to _Time ..."
+msgstr "Sari la_timp ..."
+
+#: src/gtkui/menus.cc:108
+msgid "_Jump to Song ..."
+msgstr "_Sari la melodia ..."
+
+#: src/gtkui/menus.cc:110 src/qtui/menus.cc:165
+msgid "Set Repeat Point _A"
+msgstr "Setează punctul de redare _A"
+
+#: src/gtkui/menus.cc:111 src/qtui/menus.cc:167
+msgid "Set Repeat Point _B"
+msgstr "Setează punctul de redare _B"
+
+#: src/gtkui/menus.cc:112 src/qtui/menus.cc:169
+msgid "_Clear Repeat Points"
+msgstr "_elimină punctele de repetiție"
+
+#: src/gtkui/menus.cc:116 src/gtkui/menus.cc:123 src/gtkui/menus.cc:141
+#: src/qtui/menus.cc:173 src/qtui/menus.cc:180 src/qtui/menus.cc:198
+msgid "By _Title"
+msgstr "După titlu"
+
+#: src/gtkui/menus.cc:117 src/qtui/menus.cc:174
+msgid "By _File Name"
+msgstr "După numele fișierului"
+
+#: src/gtkui/menus.cc:118 src/qtui/menus.cc:175
+msgid "By File _Path"
+msgstr "După calea de pe disc"
+
+#: src/gtkui/menus.cc:122 src/gtkui/menus.cc:140 src/qtui/menus.cc:179
+#: src/qtui/menus.cc:197
+msgid "By Track _Number"
+msgstr "După numarul de ordine"
+
+#: src/gtkui/menus.cc:124 src/gtkui/menus.cc:142 src/qtui/menus.cc:181
+#: src/qtui/menus.cc:199
+msgid "By _Artist"
+msgstr "După artist"
+
+#: src/gtkui/menus.cc:125 src/gtkui/menus.cc:143 src/qtui/menus.cc:182
+#: src/qtui/menus.cc:200
+msgid "By Al_bum"
+msgstr "După album"
+
+#: src/gtkui/menus.cc:126 src/gtkui/menus.cc:144 src/qtui/menus.cc:183
+#: src/qtui/menus.cc:201
+msgid "By Albu_m Artist"
+msgstr "După artistul albumului"
+
+#: src/gtkui/menus.cc:127 src/gtkui/menus.cc:145 src/qtui/menus.cc:184
+#: src/qtui/menus.cc:202
+msgid "By Release _Date"
+msgstr "După anul lansării"
+
+#: src/gtkui/menus.cc:128 src/gtkui/menus.cc:146 src/qtui/menus.cc:185
+#: src/qtui/menus.cc:203
+msgid "By _Genre"
+msgstr "După gen"
+
+#: src/gtkui/menus.cc:129 src/gtkui/menus.cc:147 src/qtui/menus.cc:186
+#: src/qtui/menus.cc:204
+msgid "By _Length"
+msgstr "După lungime"
+
+#: src/gtkui/menus.cc:130 src/gtkui/menus.cc:148 src/qtui/menus.cc:187
+#: src/qtui/menus.cc:205
+msgid "By _File Path"
+msgstr "După calea fișierului"
+
+#: src/gtkui/menus.cc:131 src/gtkui/menus.cc:149 src/qtui/menus.cc:188
+#: src/qtui/menus.cc:206
+msgid "By _Custom Title"
+msgstr "După titlul personalizat"
+
+#: src/gtkui/menus.cc:132 src/gtkui/menus.cc:150 src/qtui/menus.cc:189
+#: src/qtui/menus.cc:207
+msgid "By C_omment"
+msgstr "După comentariu"
+
+#: src/gtkui/menus.cc:133 src/gtkui/menus.cc:151 src/qtui/menus.cc:190
+#: src/qtui/menus.cc:208
+msgid "By D_isc Number"
+msgstr "După numărul discului"
+
+#: src/gtkui/menus.cc:135 src/gtkui/menus.cc:153 src/qtui/menus.cc:192
+#: src/qtui/menus.cc:210
+msgid "R_everse Order"
+msgstr "Ordine inversă"
+
+#: src/gtkui/menus.cc:136 src/gtkui/menus.cc:154 src/qtui/menus.cc:194
+#: src/qtui/menus.cc:212
+msgid "_Random Order"
+msgstr "Ordine aleatorie"
+
+#: src/gtkui/menus.cc:158 src/qtui/menus.cc:216
+msgid "_Play/Resume"
+msgstr "Start/Reia"
+
+#: src/gtkui/menus.cc:159 src/qtui/menus.cc:218
+msgid "_Refresh"
+msgstr "Reîmprospătează"
+
+#: src/gtkui/menus.cc:161 src/qtui/menus.cc:222
+msgid "_Sort"
+msgstr "Sortează"
+
+#: src/gtkui/menus.cc:162 src/qtui/menus.cc:223
+msgid "Sort Se_lected"
+msgstr "Sortează selecțiile"
+
+#: src/gtkui/menus.cc:163 src/qtui/menus.cc:225
+msgid "Remove _Duplicates"
+msgstr "Eliminiă dublurile"
+
+#: src/gtkui/menus.cc:164 src/qtui/menus.cc:226
+msgid "Remove _Unavailable Files"
+msgstr "Elimină fișierele nedisponibile"
+
+#: src/gtkui/menus.cc:166 src/playlist-manager/playlist-manager.cc:219
+#: src/playlist-manager-qt/playlist-manager-qt.cc:348 src/qtui/menus.cc:229
+msgid "_New"
+msgstr "_Nou"
+
+#: src/gtkui/menus.cc:167 src/qtui/menus.cc:230
+msgid "Ren_ame ..."
+msgstr "Redenumește"
+
+#: src/gtkui/menus.cc:168 src/gtkui/menus.cc:228
+#: src/moonstone/playlist_tabs.cc:311 src/qtui/menus.cc:231
+#: src/qtui/playlist_tabs.cc:336
+msgid "Remo_ve"
+msgstr "Elimină"
+
+#: src/gtkui/menus.cc:170 src/qtui/menus.cc:233
+msgid "_Import ..."
+msgstr "_Importă ..."
+
+#: src/gtkui/menus.cc:171 src/qtui/menus.cc:234
+msgid "_Export ..."
+msgstr "_Exportă ..."
+
+#: src/gtkui/menus.cc:173 src/qtui/menus.cc:237
+msgid "Playlist _Manager ..."
+msgstr "Manager de playslist"
+
+#: src/gtkui/menus.cc:174 src/qtui/menus.cc:239
+msgid "_Queue Manager ..."
+msgstr "_Queue Manager ..."
+
+#: src/gtkui/menus.cc:178 src/qtui/menus.cc:243
+msgid "Volume _Up"
+msgstr "Volum _Sus"
+
+#: src/gtkui/menus.cc:179 src/qtui/menus.cc:245
+msgid "Volume _Down"
+msgstr "Volum _Jos"
+
+#: src/gtkui/menus.cc:181 src/qtui/menus.cc:249
+msgid "_Equalizer ..."
+msgstr "Egalizator"
+
+#: src/gtkui/menus.cc:182 src/qtui/menus.cc:251
+msgid "E_ffects ..."
+msgstr "Efecte"
+
+#: src/gtkui/menus.cc:184
+msgid "_Record Stream"
+msgstr "Înregistrează strem"
+
+#: src/gtkui/menus.cc:185
+msgid "Audio _Settings ..."
+msgstr "Setări audio"
+
+#: src/gtkui/menus.cc:189 src/qtui/menus.cc:260
+msgid "Show _Menu Bar"
+msgstr "Arată bara de meniu"
+
+#: src/gtkui/menus.cc:190 src/qtui/menus.cc:262
+msgid "Show I_nfo Bar"
+msgstr "Arată bara de informații"
+
+#: src/gtkui/menus.cc:191 src/qtui/menus.cc:264
+msgid "Show Info Bar _Album Art"
+msgstr "Arată bara de informații _Coperta"
+
+#: src/gtkui/menus.cc:192 src/qtui/menus.cc:266
+msgid "Show Info Bar Vis_ualization"
+msgstr "Arată vizualizarea în bara de informații"
+
+#: src/gtkui/menus.cc:193 src/qtui/menus.cc:268
+msgid "Show _Status Bar"
+msgstr "Arată bara de stare"
+
+#: src/gtkui/menus.cc:195 src/qtui/menus.cc:272
+msgid "Show _Remaining Time"
+msgstr "Arată timpul rămas"
+
+#: src/gtkui/menus.cc:197 src/qtui/menus.cc:276 src/skins/menus.cc:157
+#: src/skins-qt/menus.cc:152
+msgid "_Visualizations ..."
+msgstr "Vizualizare"
+
+#: src/gtkui/menus.cc:201 src/qtui/menus.cc:280
+msgid "_File"
+msgstr "_Filă"
+
+#: src/gtkui/menus.cc:202 src/qtui/menus.cc:281
+msgid "_Playback"
+msgstr "Redare"
+
+#: src/gtkui/menus.cc:203 src/qtui/menus.cc:282
+msgid "P_laylist"
+msgstr "Playlist"
+
+#: src/gtkui/menus.cc:204 src/gtkui/menus.cc:222 src/qtui/menus.cc:283
+#: src/qtui/menus.cc:312
+msgid "_Services"
+msgstr "_Servicii"
+
+#: src/gtkui/menus.cc:205 src/qtui/menus.cc:284
+msgid "_Output"
+msgstr "Ieșire"
+
+#: src/gtkui/menus.cc:206 src/qtui/menus.cc:285
+msgid "_View"
+msgstr "Vizualizează"
+
+#: src/gtkui/menus.cc:211 src/qtui/menus.cc:296
+msgid "_Queue/Unqueue"
+msgstr "_Queue/Unqueue"
+
+#: src/gtkui/menus.cc:213 src/qtui/menus.cc:299
+msgid "_Open Containing Folder"
+msgstr "Deschide folderul ce conține"
+
+#: src/gtkui/menus.cc:214 src/qtui/menus.cc:301
+msgid "_Refresh Selected"
+msgstr "Reîmprospătează selecțiile"
+
+#: src/gtkui/menus.cc:216 src/qtui/menus.cc:304
+msgid "Cu_t"
+msgstr "Taie"
+
+#: src/gtkui/menus.cc:217 src/qtui/menus.cc:305
+msgid "_Copy"
+msgstr "Copiază"
+
+#: src/gtkui/menus.cc:218 src/qtui/menus.cc:306
+msgid "_Paste"
+msgstr "Lipire"
+
+#: src/gtkui/menus.cc:219 src/qtui/menus.cc:307
+msgid "Paste at _End"
+msgstr "Lipește la final"
+
+#: src/gtkui/menus.cc:220 src/qtui/menus.cc:309
+msgid "Select _All"
+msgstr "Selectează tot"
+
+#: src/gtkui/menus.cc:227 src/moonstone/playlist_tabs.cc:309
+#: src/qtui/playlist_tabs.cc:334
+msgid "_Rename ..."
+msgstr "Redenumește"
+
+#: src/gtkui/settings.cc:35 src/qtui/settings.cc:59
+msgid "Always"
+msgstr ""
+
+#: src/gtkui/settings.cc:36 src/qtui/settings.cc:60
+msgid "Auto-hide"
+msgstr ""
+
+#: src/gtkui/settings.cc:37 src/qtui/settings.cc:61
+msgid "Never"
+msgstr ""
+
+#: src/gtkui/settings.cc:41 src/qtui/settings.cc:64
+msgid "Playlist Tabs"
+msgstr "Taburile playlistului"
+
+#: src/gtkui/settings.cc:42 src/qtui/settings.cc:65
+msgid "Show playlist tabs:"
+msgstr ""
+
+#: src/gtkui/settings.cc:45 src/qtui/settings.cc:69
+msgid "Show entry counts"
+msgstr "Arată numărul intrăriilor"
+
+#: src/gtkui/settings.cc:47 src/qtui/settings.cc:72
+msgid "Show close buttons"
+msgstr "Arată butonul de închidere"
+
+#: src/gtkui/settings.cc:49 src/qtui/settings.cc:75
+msgid "Playlist Columns"
+msgstr "Coloanele Playlistului"
+
+#: src/gtkui/settings.cc:51 src/qtui/settings.cc:77
+msgid "Show column headers"
+msgstr "Arată antetul coloanei"
+
+#: src/gtkui/settings.cc:53 src/qtui/settings.cc:82
+msgid "Make column headers clickable for sorting"
+msgstr ""
+
+#: src/gtkui/settings.cc:56
+msgid "Use symbolic icons in toolbar"
+msgstr ""
+
+#: src/gtkui/settings.cc:58 src/qtui/settings.cc:86
+msgid "Scroll on song change"
+msgstr "Derulează la schimbarea melodiei"
+
+#: src/gtkui/ui_gtk.cc:82
+msgid "GTK Interface"
+msgstr "Interfața GTK"
+
+#: src/gtkui/ui_gtk.cc:219 src/skins/main.cc:228 src/skins-qt/main.cc:231
+#, c-format
+msgid "%s - Audacious"
+msgstr "%s - Audacious"
+
+#: src/gtkui/ui_gtk.cc:221 src/moonstone/main_window.cc:184
+#: src/qtui/main_window.cc:385
+msgid "Buffering ..."
+msgstr "Se încarcă ..."
+
+#: src/gtkui/ui_gtk.cc:224 src/pipewire/pipewire.cc:402 src/skins/main.cc:230
+#: src/skins-qt/main.cc:233
+msgid "Audacious"
+msgstr "Audacious"
+
+#: src/gtkui/ui_gtk.cc:487 src/gtkui/ui_gtk.cc:518 src/gtkui/ui_gtk.cc:882
+#: src/hotkey/gui.cc:72 src/moonstone/main_window.cc:67
+#: src/moonstone/main_window.cc:145 src/moonstone/main_window.cc:146
+#: src/notify/osd.cc:85 src/qthotkey/gui.cc:67 src/qtui/main_window.cc:154
+#: src/qtui/main_window.cc:347 src/qtui/main_window.cc:348
+#: src/skins/menus.cc:109 src/skins-qt/menus.cc:100
+msgid "Play"
+msgstr "Play"
+
+#: src/gtkui/ui_gtk.cc:487 src/moonstone/main_window.cc:151
+#: src/moonstone/main_window.cc:152 src/notify/osd.cc:82
+#: src/qtui/main_window.cc:353 src/qtui/main_window.cc:354
+#: src/skins/menus.cc:110 src/skins-qt/menus.cc:101
+msgid "Pause"
+msgstr "Pauză"
+
+#: src/gtkui/ui_gtk.cc:868 src/moonstone/main_window.cc:57
+#: src/qtui/main_window.cc:145 src/skins/menus.cc:86 src/skins-qt/menus.cc:77
+msgid "Search Library"
+msgstr "Caută în bibliotecă"
+
+#: src/gtkui/ui_gtk.cc:875 src/moonstone/main_window.cc:60
+#: src/qtui/main_window.cc:147
+msgid "Open Files"
+msgstr "Deschide Fișiere"
+
+#: src/gtkui/ui_gtk.cc:876 src/moonstone/main_window.cc:62
+#: src/qtui/main_window.cc:149
+msgid "Add Files"
+msgstr "Adaugă Fișiere"
+
+#: src/gtkui/ui_gtk.cc:881 src/moonstone/main_window.cc:65
+#: src/qtui/main_window.cc:152 src/skins/menus.cc:112 src/skins-qt/menus.cc:103
+msgid "Previous"
+msgstr "Anterior"
+
+#: src/gtkui/ui_gtk.cc:883 src/hotkey/gui.cc:74 src/moonstone/main_window.cc:69
+#: src/qthotkey/gui.cc:69 src/qtui/main_window.cc:156 src/skins/menus.cc:111
+#: src/skins-qt/menus.cc:102
+msgid "Stop"
+msgstr "Stop"
+
+#: src/gtkui/ui_gtk.cc:884 src/moonstone/main_window.cc:76 src/notify/osd.cc:89
+#: src/qtui/main_window.cc:163 src/skins/menus.cc:113 src/skins-qt/menus.cc:104
+msgid "Next"
+msgstr "Următorul"
+
+#: src/gtkui/ui_gtk.cc:886 src/moonstone/main_window.cc:79
+#: src/qtui/main_window.cc:166 src/qtui/menus.cc:254 src/skins/menus.cc:79
+#: src/skins-qt/menus.cc:69
+msgid "Record Stream"
+msgstr "Înregistrează streamul"
+
+#: src/gtkui/ui_gtk.cc:919 src/moonstone/main_window.cc:86
+#: src/qtui/main_window.cc:173 src/skins/menus.cc:103 src/skins-qt/menus.cc:94
+msgid "Repeat"
+msgstr "Repetă"
+
+#: src/gtkui/ui_gtk.cc:922 src/moonstone/main_window.cc:89
+#: src/qtui/main_window.cc:176 src/skins/menus.cc:104 src/skins-qt/menus.cc:95
+msgid "Shuffle"
+msgstr "Aleatoriu"
+
+#: src/gtkui/ui_gtk.cc:1114 src/qtui/main_window.cc:123
+msgid "Menu"
+msgstr "Meniu"
+
+#: src/gtkui/ui_statusbar.cc:64 src/qtui/status_bar.cc:155
+msgid "mono"
+msgstr "mono"
+
+#: src/gtkui/ui_statusbar.cc:66 src/qtui/status_bar.cc:157
+msgid "stereo"
+msgstr "stereo"
+
+#: src/gtkui/ui_statusbar.cc:68 src/qtui/status_bar.cc:160
+#, c-format
+msgid "%d channel"
+msgid_plural "%d channels"
+msgstr0 "%d canal"
+msgstr1 "%d canale"
+msgstr2 "%d de canale"
+
+#: src/gtkui/ui_statusbar.cc:76 src/qtui/status_bar.cc:168
+#, c-format
+msgid "%d kHz"
+msgstr "%d kHz"
+
+#: src/gtkui/ui_statusbar.cc:82 src/qtui/status_bar.cc:174
+#, c-format
+msgid "%d kbit/s"
+msgstr "%d kbit/s"
+
+#: src/gtkui/ui_statusbar.cc:108 src/skins/main.cc:478 src/skins-qt/main.cc:461
+msgid "Single mode."
+msgstr "Mod singular."
+
+#: src/gtkui/ui_statusbar.cc:110 src/skins/main.cc:480 src/skins-qt/main.cc:463
+msgid "Playlist mode."
+msgstr "Mod playlist."
+
+#: src/gtkui/ui_statusbar.cc:118 src/skins/main.cc:486 src/skins-qt/main.cc:469
+msgid "Stopping after song."
+msgstr "Oprește după melodia."
+
+#: src/hotkey/gui.cc:71 src/qthotkey/gui.cc:66
+msgid "Previous track"
+msgstr "Piesa anterioară"
+
+#: src/hotkey/gui.cc:73 src/qthotkey/gui.cc:68
+msgid "Pause/Resume"
+msgstr "Pauză/Reia"
+
+#: src/hotkey/gui.cc:75 src/qthotkey/gui.cc:70
+msgid "Next track"
+msgstr "Piesa următoare"
+
+#: src/hotkey/gui.cc:76 src/qthotkey/gui.cc:71
+msgid "Step forward"
+msgstr "Sari înainte"
+
+#: src/hotkey/gui.cc:77 src/qthotkey/gui.cc:72
+msgid "Step backward"
+msgstr "Sari înapoi"
+
+#: src/hotkey/gui.cc:78 src/qthotkey/gui.cc:73
+msgid "Mute"
+msgstr "Mut"
+
+#: src/hotkey/gui.cc:79 src/qthotkey/gui.cc:74
+msgid "Volume up"
+msgstr "Crește volumul"
+
+#: src/hotkey/gui.cc:80 src/qthotkey/gui.cc:75
+msgid "Volume down"
+msgstr "Scade volumul"
+
+#: src/hotkey/gui.cc:81 src/qthotkey/gui.cc:76
+msgid "Jump to file"
+msgstr "Sari la fișier"
+
+#: src/hotkey/gui.cc:82 src/qthotkey/gui.cc:77
+msgid "Toggle player window(s)"
+msgstr "Comută între ferestrele player-ului"
+
+#: src/hotkey/gui.cc:83 src/qthotkey/gui.cc:78
+msgid "Show On-Screen-Display"
+msgstr "Arată afișajul OSD"
+
+#: src/hotkey/gui.cc:84 src/qthotkey/gui.cc:79
+msgid "Toggle repeat"
+msgstr "Schimbă funcția de a repeta"
+
+#: src/hotkey/gui.cc:85 src/qthotkey/gui.cc:80
+msgid "Toggle shuffle"
+msgstr "Schimbă funcția de redare aleatoriu"
+
+#: src/hotkey/gui.cc:86 src/qthotkey/gui.cc:81
+msgid "Toggle stop after current"
+msgstr "Schimbă funcția de oprire după piesa curentă"
+
+#: src/hotkey/gui.cc:87 src/qthotkey/gui.cc:82
+msgid "Raise player window(s)"
+msgstr "Mărește fereastra(le) player-ului"
+
+#: src/hotkey/gui.cc:98 src/qthotkey/gui.cc:100
+msgid "(none)"
+msgstr "(nimic)"
+
+#: src/hotkey/gui.cc:261
+msgid ""
+"It is not recommended to bind the primary mouse buttons without modifiers.\n"
+"\n"
+"Do you want to continue?"
+msgstr ""
+"Nu este recomandat să asignați butoanele pricipale ale mouse-ului fără a "
+"folosi modificatori.\n"
+"\n"
+"Dorești să continui ?"
+
+#: src/hotkey/gui.cc:264
+msgid "Binding mouse buttons"
+msgstr "Asignează butonele mouse-ului"
+
+#: src/hotkey/gui.cc:434
+msgid ""
+"Press a key combination inside a text field.\n"
+"You can also bind mouse buttons."
+msgstr ""
+"Apasă o combinație de taste în interiorul câmpului.\n"
+"Poți de asemenea să asignezi butoanele de pe mouse."
+
+#: src/hotkey/gui.cc:444 src/qthotkey/gui.cc:179
+msgid "Hotkeys:"
+msgstr "Taste rapide:"
+
+#: src/hotkey/gui.cc:457 src/qthotkey/gui.cc:181
+msgid "Action:"
+msgstr "Acțiune:"
+
+#: src/hotkey/gui.cc:461 src/qthotkey/gui.cc:182
+msgid "Key Binding:"
+msgstr "Tasta asignată:"
+
+#: src/hotkey/gui.cc:518 src/qthotkey/gui.cc:184
+msgid "_Add"
+msgstr "_Adaugă"
+
+#: src/hotkey/plugin.cc:59 src/qthotkey/plugin.cc:78
+msgid "Global Hotkeys"
+msgstr "Taste rapide globale"
+
+#: src/hotkey/plugin.cc:74
+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"
+"Contributors 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 Plugin\n"
+"Controlează playerul cu combinațiile globale de taste sau taste multimedia.\n"
+"\n"
+"Drepturi de autor(C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n"
+"\n"
+"Colaboratorii sunt:\n"
+"Drepturi de autor(C) 2006-2007 Vladimir Paskov <vlado.paskov@gmail.com>\n"
+"Drepturi 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/jack/jack-ng.cc:54
+msgid "JACK Output"
+msgstr "Portul JACK de ieșire"
+
+#: src/jack/jack-ng.cc:126
+msgid "Client name:"
+msgstr "Numele clientului:"
+
+#: src/jack/jack-ng.cc:128
+msgid "Automatically connect to output ports"
+msgstr "Conectează-te automat la porturile de ieșire"
+
+#: src/jack/jack-ng.cc:130
+msgid "Filter ports (regex, use any port if blank):"
+msgstr ""
+"Filtrează porturile (regex, folosește orice port dacă acest câmp este liber):"
+
+#: src/jack/jack-ng.cc:136
+msgid "Connect to physical ports only"
+msgstr "Conectează-te numai la porturile fizice"
+
+#: src/jack/jack-ng.cc:139
+msgid "Upmix to"
+msgstr "Împarte canalele audio în"
+
+#: src/jack/jack-ng.cc:141
+msgid "ports if input has fewer channels"
+msgstr "porturi în cazul în care intrarea are mai puține canale"
+
+#: src/jack/jack-ng.cc:143
+msgid "Ignore insufficient number of ports"
+msgstr "Ignoră numărul insuficient de porturi"
+
+#: src/jack/jack-ng.cc:181
+msgid "No JACK output ports were found. Please check settings."
+msgstr "Nu a fost găsit un port Jack. Te rugăm să verifici setările."
+
+#: src/jack/jack-ng.cc:195
+#, c-format
+msgid "Only %d JACK output ports were found but %d are required."
+msgstr "Doar %d porturi Jack au fost găsite dar sunt necesare %d. "
+
+#: src/jack/jack-ng.cc:210
+#, c-format
+msgid "Failed to connect to JACK port %s."
+msgstr "Conectarea la portul Jack %s a eșuat."
+
+#: src/jack/jack-ng.cc:230
+msgid ""
+"JACK supports only floating-point audio. You must change the output bit "
+"depth to floating-point in Audacious settings."
+msgstr ""
+"Portul Jack suportă numai audio în virgulă mobilă. Trebuie să schimbi "
+"rezoluția de ieșire în virgulă mobilă în setările Audacious."
+
+#: src/jack/jack-ng.cc:245
+msgid "Failed to connect to the JACK server; is it running?"
+msgstr "Conectarea la serverul Jack a eșuat; acesta este funcțional ?"
+
+#: src/jack/jack-ng.cc:321
+#, c-format
+msgid ""
+"The JACK server requires a sample rate of %d Hz, but Audacious is playing at "
+"%d Hz. Please use the Sample Rate Converter effect to correct the mismatch."
+msgstr ""
+"Serverul JACK necesită o rată de eșantionare de %d Hz, dar Audacious "
+"folosește rata de %d Hz. Te rugăm să folosești efectul de convertor de rată "
+"a eșantionării pentru a corecta diferența."
+
+#: src/ladspa/plugin.cc:416
+#, c-format
+msgid "%s Settings"
+msgstr "%s Setări"
+
+#: src/ladspa/plugin.cc:482
+msgid "Module paths:"
+msgstr "Calea către modul:"
+
+#: src/ladspa/plugin.cc:487
+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 ""
+" Separă mai multe căi cu două puncte.\n"
+"Aceste căi sunt căutate în adiția căii LADSPA_PATH.\n"
+"După ce ai adăugat o cale nouă, apasă Enter pentru a scana pentru un plugin "
+"nou."
+
+#: src/ladspa/plugin.cc:508
+msgid "Available plugins:"
+msgstr "Pluginuri disponibile:"
+
+#: src/ladspa/plugin.cc:521 src/modplug/plugin_main.cc:91
+#: src/modplug/plugin_main.cc:94 src/modplug/plugin_main.cc:97
+#: src/modplug/plugin_main.cc:100
+msgid "Enable"
+msgstr "Activează"
+
+#: src/ladspa/plugin.cc:527
+msgid "Enabled plugins:"
+msgstr "Activează pluginurile:"
+
+#: src/ladspa/plugin.cc:543
+msgid "Settings"
+msgstr "Setări"
+
+#: src/ladspa/plugin.cc:560
+msgid ""
+"LADSPA Host for Audacious\n"
+"Copyright 2011 John Lindgren"
+msgstr ""
+"Gazdă LADSPA pentru Audacious\n"
+"Drepturi de autor 2011 John Lindgren"
+
+#: src/ladspa/plugin.h:78
+msgid "LADSPA Host"
+msgstr "Gazdă LADSPA"
+
+#: src/lirc/lirc.cc:55
+msgid "LIRC Plugin"
+msgstr "Plugin LIRC"
+
+#: src/lirc/lirc.cc:379
+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.cc:390
+msgid "Connection"
+msgstr "Conexiune"
+
+#: src/lirc/lirc.cc:391
+msgid "Reconnect to LIRC server"
+msgstr "Reconectare la serverul LIRC"
+
+#: src/lirc/lirc.cc:393
+msgid "Wait before reconnecting:"
+msgstr "Așteaptă înainte de reconectare:"
+
+#: src/lyrics-common/chart_lyrics_provider.cc:93
+#: src/lyrics-common/chart_lyrics_provider.cc:150
+#: src/lyrics-common/lyrics_ovh_provider.cc:50
+#, c-format
+msgid "Unable to fetch %s"
+msgstr "Nu se poate prelua %s"
+
+#: src/lyrics-common/chart_lyrics_provider.cc:100
+#: src/lyrics-common/chart_lyrics_provider.cc:157
+#: src/lyrics-common/lyrics_ovh_provider.cc:57
+#, c-format
+msgid "Unable to parse %s"
+msgstr "Nu se poate procesa %s"
+
+#: src/lyrics-common/chart_lyrics_provider.cc:121
+#: src/lyrics-common/chart_lyrics_provider.cc:194
+#: src/lyrics-common/lyrics_ovh_provider.cc:88
+msgid "Looking for lyrics ..."
+msgstr "Se caută versurile ..."
+
+#: src/lyrics-common/preferences.h:43
+msgid "Nowhere"
+msgstr "Nicăieri"
+
+#: src/lyrics-common/preferences.h:49
+msgid "Artist is truncated at the start, Title -- at the end"
+msgstr ""
+"Numele artistului este trunchiat la început, Titlu -- la final"
+
+#: src/lyrics-common/preferences.h:50
+msgid "Chars to truncate on:"
+msgstr "Caractere de trunchiat:"
+
+#: src/lyrics-common/preferences.h:54
+msgid "Chars are ORed in RegExp, surrounded by whitespace"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:55
+msgid "Chars to split on:"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:56
+msgid "Further truncate those on chars"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:62
+msgid "General"
+msgstr "General"
+
+#: src/lyrics-common/preferences.h:63
+msgid "Split title into artist and title on chars"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:66
+msgid "Sources"
+msgstr "Surse"
+
+#: src/lyrics-common/preferences.h:67
+msgid "Use embedded lyrics (from Lyrics tag)"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:69
+msgid "Fetch lyrics from internet:"
+msgstr "Preia versuri de pe internet:"
+
+#: src/lyrics-common/preferences.h:72
+msgid "Store fetched lyrics in local cache"
+msgstr "Stochează versurile obținute în memoria cache locală"
+
+#: src/lyrics-common/preferences.h:74
+msgid "Local Storage"
+msgstr "Stocare locală"
+
+#: src/lyrics-common/preferences.h:75
+msgid "Load lyric files (.lrc) from local storage"
+msgstr "Încarcă fișierele cu versuri (.lrc) din stocarea locală"
+
+#: src/lyrics-common/utils.cc:54 src/ui-common/dialogs-qt.cc:63
+msgid "Error"
+msgstr "Eroare"
+
+#: src/lyrics-common/utils.cc:60
+msgid "Lyrics could not be found."
+msgstr "Versurile nu au putut fi găsite."
+
+#: src/lyrics-common/utils.cc:142
+msgid "Missing title and/or artist."
+msgstr "Titlul și/sau artistul lipsesc."
+
+#: src/lyrics-gtk/lyrics-gtk.cc:37 src/lyrics-qt/lyrics-qt.cc:50
+msgid "Lyrics"
+msgstr "Versuri"
+
+#: src/lyrics-gtk/lyrics-gtk.cc:189 src/lyrics-qt/lyrics-qt.cc:171
+msgid "Edit Lyrics ..."
+msgstr "Modifică Versuri ..."
+
+#: src/lyrics-gtk/lyrics-gtk.cc:195 src/lyrics-qt/lyrics-qt.cc:178
+msgid "Save Locally"
+msgstr "Salvează local"
+
+#: src/lyrics-gtk/lyrics-gtk.cc:201 src/lyrics-qt/lyrics-qt.cc:186
+msgid "Refresh"
+msgstr "Reîmprospătează"
+
+#: src/m3u/m3u.cc:33
+msgid "M3U Playlists"
+msgstr "Playlisturi M3U"
+
+#: src/metronom/metronom.cc:44
+msgid "Tact Generator"
+msgstr "Metronom"
+
+#: src/metronom/metronom.cc:145
+#, c-format
+msgid "Tact generator: %d bpm"
+msgstr "Metronom: %d bpm"
+
+#: src/metronom/metronom.cc:147
+#, c-format
+msgid "Tact generator: %d bpm %d/%d"
+msgstr "Metronom: %d bpm %d/%d"
+
+#: src/metronom/metronom.cc:235
+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 ""
+"Metronom de Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
+"\n"
+"Pentru a-l folosi, adaugă un URL: tact://beats*num/den\n"
+"ex. tact://77 pentru a reda 77 bătăi pe minut\n"
+"sau tact://60*3/4 pentru a reda 60 bpm în măsura 3/4"
+
+#: src/mixer/mixer.cc:43
+msgid "Channel Mixer"
+msgstr "Mixer de canale"
+
+#: src/mixer/mixer.cc:255
+msgid ""
+"Channel Mixer Plugin for Audacious\n"
+"Copyright 2011-2012 John Lindgren and Michał Lipski"
+msgstr ""
+"Channel Mixer Plugin pentru Audacious\n"
+"Drepturi de autor 2011-2012 John Lindgren și Michał Lipski"
+
+#: src/mixer/mixer.cc:259
+msgid "Channel Mixer"
+msgstr "Mixer de canale"
+
+#: src/mixer/mixer.cc:260
+msgid "Output channels:"
+msgstr "Canale de ieșire:"
+
+#: src/mms/mms.cc:35
+msgid "MMS Plugin"
+msgstr "Plugin MMS"
+
+#: src/mms/mms.cc:82
+msgid "Error connecting to MMS server"
+msgstr "Eroare la conectarea la serverul MMS"
+
+#: src/modplug/modplugbmp.h:57
+msgid "ModPlug (Module Player)"
+msgstr "ModPlug (Module Player)"
+
+#: src/modplug/plugin_main.cc:55
+msgid "Channels"
+msgstr "Canale"
+
+#: src/modplug/plugin_main.cc:59
+msgid "Nearest (fastest)"
+msgstr "Cel mai apropiat (cel mai rapid)"
+
+#: src/modplug/plugin_main.cc:60
+msgid "Linear (fast)"
+msgstr "Linear (rapid)"
+
+#: src/modplug/plugin_main.cc:61
+msgid "Spline (good)"
+msgstr ""
+
+#: src/modplug/plugin_main.cc:62
+msgid "Polyphase (best)"
+msgstr ""
+
+#: src/modplug/plugin_main.cc:63
+msgid "Sample rate"
+msgstr "Rata de eșantionare"
+
+#: src/modplug/plugin_main.cc:64
+msgid "22 kHz"
+msgstr "22 kHz"
+
+#: src/modplug/plugin_main.cc:65
+msgid "44 kHz"
+msgstr "44 kHz"
+
+#: src/modplug/plugin_main.cc:66
+msgid "48 kHz"
+msgstr "48 kHz"
+
+#: src/modplug/plugin_main.cc:67
+msgid "96 kHz"
+msgstr "96 kHz"
+
+#: src/modplug/plugin_main.cc:71 src/modplug/plugin_main.cc:76
+#: src/modplug/plugin_main.cc:81
+msgid "Level:"
+msgstr "Nivel:"
+
+#: src/modplug/plugin_main.cc:77
+msgid "Cutoff:"
+msgstr "Tăiere:"
+
+#: src/modplug/plugin_main.cc:90
+msgid "Reverb"
+msgstr "Reverb"
+
+#: src/modplug/plugin_main.cc:93
+msgid "Bass Boost"
+msgstr "Bass Boost"
+
+#: src/modplug/plugin_main.cc:96
+msgid "Surround"
+msgstr "Surround"
+
+#: src/modplug/plugin_main.cc:99
+msgid "Preamp"
+msgstr "Preamplificator"
+
+#: src/modplug/plugin_main.cc:106
+msgid "Oversample"
+msgstr "Supraeșantionare"
+
+#: src/modplug/plugin_main.cc:107
+msgid "Noise reduction"
+msgstr "Reducerea zgomotului"
+
+#: src/modplug/plugin_main.cc:108
+msgid "Play Amiga MODs"
+msgstr "Redă MOD-uri Amiga"
+
+#: src/modplug/plugin_main.cc:109
+msgid "Repeat"
+msgstr "Repetă"
+
+#: src/modplug/plugin_main.cc:110
+msgid "Repeat count:"
+msgstr "Numărul de repetări:"
+
+#: src/modplug/plugin_main.cc:111
+msgid "To repeat forever, set the repeat count to -1."
+msgstr "Pentru a repeta mereu, setează umărul de repetări al -1."
+
+#: src/modplug/plugin_main.cc:124 src/sid/xs_config.cc:106
+msgid "These settings will take effect when Audacious is restarted."
+msgstr "Aceste setări vor avea efect după ce Audacious va fi repornit."
+
+#: src/moonstone/main_window.cc:72 src/moonstone/main_window.cc:73
+#: src/qtui/main_window.cc:159 src/qtui/main_window.cc:160
+#: src/skins/menus.cc:107 src/skins-qt/menus.cc:98
+msgid "Stop After This Song"
+msgstr "Oprește după această melodie"
+
+#: src/moonstone/moonstone.cc:39
+msgid "Moonstone"
+msgstr ""
+
+#: src/moonstone/playlist_header.cc:212 src/qtui/playlist_header.cc:258
+msgid "Reset to Defaults"
+msgstr "Resetează la setările prestabilite"
+
+#: src/moonstone/playlist_model.cc:38 src/qtui/playlist_header.cc:232
+msgid "Now Playing"
+msgstr "Se redă acum"
+
+#: src/moonstone/playlist_selection.cc:66
+#: src/playlist-manager/playlist-manager.cc:201
+#: src/playlist-manager-qt/playlist-manager-qt.cc:190
+msgid "Entries"
+msgstr "Intrări"
+
+#: src/mpg123/mpg123.cc:54
+msgid "MPG123 Plugin"
+msgstr "MPG123 Plugin"
+
+#: src/mpg123/mpg123.cc:82
+msgid "Use accurate length calculation (slow)"
+msgstr ""
+
+#: src/mpg123/mpg123.cc:260
+msgid "Surround"
+msgstr "Surround"
+
+#: src/mpris2/plugin.cc:40
+msgid "MPRIS 2 Server"
+msgstr "MPRIS 2 Server"
+
+#: src/neon/neon.cc:102
+msgid "Neon HTTP/HTTPS Plugin"
+msgstr ""
+
+#: src/neon/neon.cc:526
+msgid "Error parsing redirect"
+msgstr ""
+
+#: src/neon/neon.cc:540
+msgid "Unknown HTTP error"
+msgstr "Eroare HTTP necunoscută"
+
+#: src/neon/neon.cc:614
+msgid "Error parsing URL"
+msgstr ""
+
+#: src/neon/neon.cc:687
+msgid "Too many redirects"
+msgstr ""
+
+#: src/notify/event.cc:97
+msgid "Stopped"
+msgstr ""
+
+#: src/notify/event.cc:97
+msgid "Audacious is not playing."
+msgstr ""
+
+#: src/notify/notify.cc:39
+msgid "Desktop Notifications"
+msgstr "Notificări pe desktop"
+
+#: src/notify/notify.cc:57
+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.cc:104
+msgid "Show playback controls"
+msgstr "Arată controalele de redare"
+
+#: src/notify/notify.cc:106
+msgid "Always show notification"
+msgstr "Afișează întotdeauna notificarea"
+
+#: src/notify/notify.cc:108
+msgid "Include album name in notification"
+msgstr "Include numele albumului în notificare"
+
+#: src/notify/notify.cc:110
+msgid "Custom notification duration:"
+msgstr ""
+
+#: src/notify/osd.cc:74
+msgid "Show"
+msgstr ""
+
+#: src/openmpt/mpt.cc:50
+msgid "OpenMPT (Module Player)"
+msgstr ""
+
+#: src/openmpt/mpt.cc:132
+msgid ""
+"Module player based on libopenmpt\n"
+"\n"
+"Written by: Chris Spiegel <cspiegel@gmail.com>"
+msgstr ""
+
+#: src/openmpt/mpt.cc:151
+msgid "Stereo separation:"
+msgstr ""
+
+#: src/openmpt/mpt.cc:153
+msgid "% (0=mono, 100=default, 200=full)"
+msgstr ""
+
+#: src/openmpt/mpt.cc:157
+msgid "Interpolation:"
+msgstr ""
+
+#: src/openmpt/mptwrap.h:51 src/soxr/sox-resampler.cc:189 src/xsf/plugin.cc:437
+msgid "Linear"
+msgstr ""
+
+#: src/openmpt/mptwrap.h:52
+msgid "Cubic"
+msgstr ""
+
+#: src/openmpt/mptwrap.h:53
+msgid "Windowed sinc"
+msgstr ""
+
+#: src/opus/opus.cc:39
+msgid "Opus Decoder"
+msgstr ""
+
+#: src/opus/opus.cc:336
+msgid ""
+"Opus Decoder Plugin for Audacious\n"
+"Copyright 2022 Thomas Lange"
+msgstr ""
+
+#: src/oss4/oss.h:70
+msgid "OSS4 Output"
+msgstr ""
+
+#: src/oss4/oss.h:72
+msgid "OSS3 Output"
+msgstr ""
+
+#: src/oss4/plugin.cc:35
+msgid "Default device"
+msgstr ""
+
+#: src/oss4/plugin.cc:78
+msgid "Audio device:"
+msgstr ""
+
+#: src/oss4/plugin.cc:81
+msgid "Use alternate device:"
+msgstr ""
+
+#: src/oss4/plugin.cc:85
+msgid "Save volume between sessions."
+msgstr ""
+
+#: src/oss4/plugin.cc:87
+msgid "Enable format conversions made by the OSS software."
+msgstr ""
+
+#: src/oss4/plugin.cc:89
+msgid "Enable exclusive mode to prevent virtual mixing."
+msgstr ""
+
+#: src/oss4/plugin.cc:101
+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/pipewire/pipewire.cc:44
+msgid "PipeWire Output"
+msgstr ""
+
+#: src/pipewire/pipewire.cc:118
+msgid ""
+"PipeWire Output Plugin for Audacious\n"
+"Copyright 2022 Thomas Lange\n"
+"\n"
+"Based on the PipeWire Output Plugin for Qmmp\n"
+"Copyright 2021 Ilya Kotov"
+msgstr ""
+
+#: src/pipewire/pipewire.cc:408 src/skins/menus.cc:88 src/skins-qt/menus.cc:79
+msgid "Playback"
+msgstr "Redare"
+
+#: src/playlist-manager/playlist-manager.cc:38
+#: src/playlist-manager-qt/playlist-manager-qt.cc:42
+msgid "Playlist Manager"
+msgstr "Manager de Playlist"
+
+#: src/playlist-manager/playlist-manager.cc:221
+#: src/playlist-manager-qt/playlist-manager-qt.cc:356
+msgid "_Remove"
+msgstr "_Elimină"
+
+#: src/playlist-manager/playlist-manager.cc:222
+#: src/playlist-manager-qt/playlist-manager-qt.cc:351
+msgid "Ren_ame"
+msgstr "Reden_umește"
+
+#: src/pls/pls.cc:35
+msgid "PLS Playlists"
+msgstr "Playlist-uri PLS"
+
+#: src/psf/plugin.cc:53
+msgid "OpenPSF PSF1/PSF2 Decoder"
+msgstr "Decodor OpenPSF PSF1/PSF2"
+
+#: src/psf/plugin.cc:270
+msgid "OpenPSF Configuration"
+msgstr "Configurație OpenPSF"
+
+#: src/psf/plugin.cc:271 src/xsf/plugin.cc:444
+msgid "Ignore length from file"
+msgstr ""
+
+#: src/pulse/pulse_audio.cc:42
+msgid "PulseAudio Output"
+msgstr ""
+
+#: src/pulse/pulse_audio.cc:84
+msgid "Context name:"
+msgstr ""
+
+#: src/pulse/pulse_audio.cc:86
+msgid "Stream name:"
+msgstr "Nume flux:"
+
+#: src/pulse/pulse_audio.cc:596
+msgid ""
+"Audacious PulseAudio Output Plugin\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/qtaudio/qtaudio.cc:53
+msgid "QtMultimedia Output"
+msgstr ""
+
+#: src/qtaudio/qtaudio.cc:84
+msgid ""
+"QtMultimedia Audio Output Plugin for Audacious\n"
+"Copyright 2014 William Pitcock\n"
+"\n"
+"Based on SDL Output Plugin for Audacious\n"
+"Copyright 2010 John Lindgren"
+msgstr ""
+
+#: src/qtglspectrum/gl-spectrum.cc:41
+msgid ""
+"OpenGL Spectrum Analyzer for Audacious\n"
+"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
+"Copyright 2014, 2020 Ariadne Conill\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/qthotkey/gui.cc:177
+msgid "Press a key combination inside a text field."
+msgstr ""
+
+#: src/qthotkey/plugin.cc:105
+msgid ""
+"Global Hotkey Plugin\n"
+"Control the player with global key combinations or multimedia keys.\n"
+"\n"
+"Copyright (C) 2020 i.Dark_Templar <darktemplar@dark-templar-archives.net>\n"
+"Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n"
+"\n"
+"Contributors 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/qtui/menus.cc:109
+msgid "_Open Folder ..."
+msgstr ""
+
+#: src/qtui/menus.cc:115
+msgid "_Add Folder ..."
+msgstr ""
+
+#: src/qtui/menus.cc:128
+msgid "_Log Inspector ..."
+msgstr ""
+
+#: src/qtui/menus.cc:220
+msgid "_Find ..."
+msgstr ""
+
+#: src/qtui/menus.cc:256 src/skins/menus.cc:80 src/skins-qt/menus.cc:70
+msgid "Audio Settings ..."
+msgstr ""
+
+#: src/qtui/playlist_model.cc:188
+msgid "Q#"
+msgstr ""
+
+#: src/qtui/playlist_model.cc:190
+msgid "T#"
+msgstr ""
+
+#: src/qtui/playlist_model.cc:192
+msgid "C#"
+msgstr ""
+
+#: src/qtui/playlist_model.cc:194
+msgid "D#"
+msgstr ""
+
+#: src/qtui/qtui.cc:40
+msgid "Qt Interface"
+msgstr ""
+
+#: src/qtui/search_bar.cc:46
+msgid "Search playlist"
+msgstr ""
+
+#: src/qtui/settings.cc:79
+msgid "Use bold font for column headers"
+msgstr ""
+
+#: src/resample/resample.cc:43
+msgid "Sample Rate Converter"
+msgstr ""
+
+#: src/resample/resample.cc:183
+msgid ""
+"Sample Rate Converter Plugin for Audacious\n"
+"Copyright 2010-2012 John Lindgren"
+msgstr ""
+
+#: src/resample/resample.cc:187
+msgid "Skip/repeat samples"
+msgstr ""
+
+#: src/resample/resample.cc:188
+msgid "Linear interpolation"
+msgstr ""
+
+#: src/resample/resample.cc:189
+msgid "Fast sinc interpolation"
+msgstr ""
+
+#: src/resample/resample.cc:190
+msgid "Medium sinc interpolation"
+msgstr ""
+
+#: src/resample/resample.cc:191
+msgid "Best sinc interpolation"
+msgstr ""
+
+#: src/resample/resample.cc:195
+msgid "Conversion"
+msgstr ""
+
+#: src/resample/resample.cc:196
+msgid "Method:"
+msgstr "Metodă:"
+
+#: src/resample/resample.cc:199 src/soxr/sox-resampler.cc:203
+msgid "Rate:"
+msgstr ""
+
+#: src/resample/resample.cc:202
+msgid "Rate Mappings"
+msgstr ""
+
+#: src/resample/resample.cc:203
+msgid "Use rate mappings"
+msgstr ""
+
+#: src/resample/resample.cc:205
+msgid "8 kHz:"
+msgstr "8 kHz:"
+
+#: src/resample/resample.cc:209
+msgid "16 kHz:"
+msgstr "16 kHz:"
+
+#: src/resample/resample.cc:213
+msgid "22.05 kHz:"
+msgstr "22.05 kHz:"
+
+#: src/resample/resample.cc:217
+msgid "32.0 kHz:"
+msgstr "32.0 kHz:"
+
+#: src/resample/resample.cc:221
+msgid "44.1 kHz:"
+msgstr "44.1 kHz:"
+
+#: src/resample/resample.cc:225
+msgid "48 kHz:"
+msgstr "48 kHz:"
+
+#: src/resample/resample.cc:229
+msgid "88.2 kHz:"
+msgstr "88.2 kHz:"
+
+#: src/resample/resample.cc:233
+msgid "96 kHz:"
+msgstr "96 kHz:"
+
+#: src/resample/resample.cc:237
+msgid "176.4 kHz:"
+msgstr "176.4 kHz:"
+
+#: src/resample/resample.cc:241
+msgid "192 kHz:"
+msgstr "192 kHz:"
+
+#: src/scrobbler2/config_window.cc:29
+msgid "Checking Last.fm access ..."
+msgstr ""
+
+#: src/scrobbler2/config_window.cc:35
+msgid ""
+"Your scrobbles are being saved on your computer temporarily. They will be "
+"submitted as soon as Audacious is allowed access."
+msgstr ""
+
+#: src/scrobbler2/config_window.cc:41
+#, c-format
+msgid "Permission granted. Scrobbling for user %s."
+msgstr ""
+
+#: src/scrobbler2/config_window.cc:44
+msgid ""
+"Permission denied. Open the following URL in a browser, allow Audacious "
+"access to your account, and then click 'Check Permission' again:"
+msgstr ""
+
+#: src/scrobbler2/config_window.cc:53
+msgid "There was a problem contacting Last.fm."
+msgstr ""
+
+#: src/scrobbler2/config_window.cc:92
+msgid "Check Permission"
+msgstr ""
+
+#: src/scrobbler2/config_window.cc:93
+msgid "Revoke Permission"
+msgstr ""
+
+#: src/scrobbler2/config_window.cc:97
+msgid "You need to allow Audacious to scrobble tracks to your Last.fm account."
+msgstr ""
+
+#: src/scrobbler2/scrobbler.cc:29
+msgid "Scrobbler 2.0"
+msgstr ""
+
+#: src/scrobbler2/scrobbler.cc:200
+msgid ""
+"The Scrobbler plugin could not be started.\n"
+"There might be a problem with your installation."
+msgstr ""
+
+#: src/scrobbler2/scrobbler.cc:245
+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."
+msgstr ""
+
+#: src/sdlout/sdlout.cc:43
+msgid "SDL Output"
+msgstr ""
+
+#: src/sdlout/sdlout.cc:72
+msgid ""
+"SDL Output Plugin for Audacious\n"
+"Copyright 2010 John Lindgren"
+msgstr ""
+
+#: src/search-tool/library.cc:35 src/search-tool/library.cc:46
+#: src/search-tool-qt/library.cc:35 src/search-tool-qt/library.cc:46
+msgid "Library"
+msgstr "Bibliotecă"
+
+#: src/search-tool-qt/search-model.cc:44 src/search-tool/search-tool.cc:287
+#, c-format
+msgid "%d song"
+msgid_plural "%d songs"
+msgstr0 "%dcântec"
+msgstr1 "%dcântece"
+msgstr2 "%d cântece"
+
+#: src/search-tool-qt/search-model.cc:53 src/search-tool/search-tool.cc:294
+msgid "of this genre"
+msgstr "din acest gen"
+
+#: src/search-tool-qt/search-model.h:47 src/search-tool/search-model.h:45
+msgid "on"
+msgstr ""
+
+#: src/search-tool-qt/search-model.h:47 src/search-tool/search-model.h:45
+msgid "by"
+msgstr ""
+
+#: src/search-tool-qt/search-tool-qt.cc:165 src/search-tool/search-tool.cc:74
+msgid "Number of results to show:"
+msgstr ""
+
+#: src/search-tool-qt/search-tool-qt.cc:168 src/search-tool/search-tool.cc:77
+msgid "Rescan library at startup"
+msgstr "Rescanează biblioteca la pornire"
+
+#: src/search-tool-qt/search-tool-qt.cc:170
+msgid "Monitor library for changes"
+msgstr "Monitorizează biblioteca pentru schimbări"
+
+#: src/search-tool-qt/search-tool-qt.cc:193 src/search-tool/search-tool.cc:450
+msgid ""
+"To import your music library into Audacious, choose a folder and then click "
+"the \"refresh\" icon."
+msgstr ""
+"Pentru a importa biblioteca ta muzicală în Audacious, alege un director și "
+"apoi apasă iconița de „reîmprospătare”"
+
+#: src/search-tool-qt/search-tool-qt.cc:195 src/search-tool/search-tool.cc:459
+msgid "Please wait ..."
+msgstr "Așteptați ..."
+
+#: src/search-tool-qt/search-tool-qt.cc:197 src/search-tool/search-tool.cc:487
+msgid "Choose Folder"
+msgstr "Alege un director"
+
+#: src/search-tool-qt/search-tool-qt.cc:201 src/search-tool/search-tool.cc:445
+msgid "Search library"
+msgstr ""
+
+#: src/search-tool-qt/search-tool-qt.cc:327 src/search-tool/search-tool.cc:156
+#, c-format
+msgid "%d of %d result shown"
+msgid_plural "%d of %d results shown"
+msgstr0 ""
+msgstr1 ""
+msgstr2 ""
+
+#: src/search-tool-qt/search-tool-qt.cc:331 src/search-tool/search-tool.cc:160
+#, c-format
+msgid "%d result"
+msgid_plural "%d results"
+msgstr0 ""
+msgstr1 ""
+msgstr2 ""
+
+#: src/search-tool-qt/search-tool-qt.cc:501 src/search-tool/search-tool.cc:341
+msgid "_Create Playlist"
+msgstr ""
+
+#: src/search-tool-qt/search-tool-qt.cc:503 src/search-tool/search-tool.cc:343
+msgid "_Add to Playlist"
+msgstr ""
+
+#: src/sid/xmms-sid.cc:43
+msgid "SID Player"
+msgstr ""
+
+#: src/sid/xs_config.cc:62
+msgid "Channels:"
+msgstr ""
+
+#: src/sid/xs_config.cc:68
+msgid "Emulation"
+msgstr ""
+
+#: src/sid/xs_config.cc:69
+msgid "Emulate MOS 8580 (default: MOS 6581)"
+msgstr ""
+
+#: src/sid/xs_config.cc:71
+msgid "Do not automatically select chip model"
+msgstr ""
+
+#: src/sid/xs_config.cc:73
+msgid "Emulate filter"
+msgstr ""
+
+#: src/sid/xs_config.cc:75
+msgid "Clock speed:"
+msgstr ""
+
+#: src/sid/xs_config.cc:78
+msgid "Do not automatically select clock speed"
+msgstr ""
+
+#: src/sid/xs_config.cc:80
+msgid "Playback time"
+msgstr ""
+
+#: src/sid/xs_config.cc:81
+msgid "Set maximum playback time:"
+msgstr ""
+
+#: src/sid/xs_config.cc:87
+msgid "Use only when song length is unknown"
+msgstr ""
+
+#: src/sid/xs_config.cc:90
+msgid "Set minimum playback time:"
+msgstr ""
+
+#: src/sid/xs_config.cc:96
+msgid "Subtunes"
+msgstr ""
+
+#: src/sid/xs_config.cc:97
+msgid "Enable subtunes"
+msgstr ""
+
+#: src/sid/xs_config.cc:99
+msgid "Ignore subtunes shorter than:"
+msgstr ""
+
+#: src/sid/xs_config.cc:105
+msgid "Note"
+msgstr ""
+
+#: src/silence-removal/silence-removal.cc:39
+msgid "Silence Removal"
+msgstr ""
+
+#: src/silence-removal/silence-removal.cc:58
+msgid ""
+"Silence Removal Plugin for Audacious\n"
+"Copyright 2014 John Lindgren"
+msgstr ""
+
+#: src/silence-removal/silence-removal.cc:67
+msgid "Silence Removal"
+msgstr ""
+
+#: src/silence-removal/silence-removal.cc:68
+msgid "Threshold:"
+msgstr ""
+
+#: src/skins/actions.cc:45 src/skins-qt/actions.cc:43
+msgid "Repeat points cleared."
+msgstr ""
+
+#: src/skins/actions.cc:60 src/skins-qt/actions.cc:58
+msgid "Repeat point A set."
+msgstr ""
+
+#: src/skins/actions.cc:65 src/skins-qt/actions.cc:63
+msgid "Repeat point B set."
+msgstr ""
+
+#: src/skins/equalizer.cc:223 src/skins-qt/equalizer.cc:223
+msgid "Preamp"
+msgstr "Preamplificator"
+
+#: src/skins/equalizer.cc:227 src/skins-qt/equalizer.cc:227
+msgid "31 Hz"
+msgstr "31 Hz"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "63 Hz"
+msgstr "63 Hz"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "125 Hz"
+msgstr "125 Hz"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "250 Hz"
+msgstr "250 Hz"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "500 Hz"
+msgstr "500 Hz"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "1 kHz"
+msgstr "1 kHz"
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "2 kHz"
+msgstr "2 kHz"
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "4 kHz"
+msgstr "4 kHz"
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "8 kHz"
+msgstr "8 kHz"
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "16 kHz"
+msgstr "16 kHz"
+
+#: src/skins/equalizer.cc:270 src/skins-qt/equalizer.cc:270
+msgid "Audacious Equalizer"
+msgstr "Egalizator Audacious"
+
+#: src/skins/main.cc:459 src/skins-qt/main.cc:442
+msgid "Recording on"
+msgstr ""
+
+#: src/skins/main.cc:461 src/skins-qt/main.cc:444
+msgid "Recording off"
+msgstr ""
+
+#: src/skins/main.cc:754 src/skins-qt/main.cc:701
+#, c-format
+msgid "Seek to %d:%-2.2d / %d:%-2.2d"
+msgstr ""
+
+#: src/skins/main.cc:771 src/skins-qt/main.cc:718
+#, c-format
+msgid "Volume: %d%%"
+msgstr "Volum: %d%%"
+
+#: src/skins/main.cc:784 src/skins-qt/main.cc:731
+#, c-format
+msgid "Balance: %d%% left"
+msgstr ""
+
+#: src/skins/main.cc:786 src/skins-qt/main.cc:733
+msgid "Balance: center"
+msgstr ""
+
+#: src/skins/main.cc:788 src/skins-qt/main.cc:735
+#, c-format
+msgid "Balance: %d%% right"
+msgstr ""
+
+#: src/skins/main.cc:880 src/skins-qt/main.cc:827
+msgid "Options Menu"
+msgstr ""
+
+#: src/skins/main.cc:884 src/skins-qt/main.cc:831
+msgid "Disable 'Always On Top'"
+msgstr ""
+
+#: src/skins/main.cc:886 src/skins-qt/main.cc:833
+msgid "Enable 'Always On Top'"
+msgstr ""
+
+#: src/skins/main.cc:889 src/skins-qt/main.cc:836
+msgid "File Info Box"
+msgstr ""
+
+#: src/skins/main.cc:892 src/skins/menus.cc:149 src/skins-qt/main.cc:839
+#: src/skins-qt/menus.cc:142
+msgid "Double Size"
+msgstr ""
+
+#: src/skins/main.cc:895 src/skins-qt/main.cc:842
+msgid "Visualizations"
+msgstr ""
+
+#: src/skins/menus.cc:74 src/skins-qt/menus.cc:64
+msgid "Volume Up"
+msgstr ""
+
+#: src/skins/menus.cc:75 src/skins-qt/menus.cc:65
+msgid "Volume Down"
+msgstr ""
+
+#: src/skins/menus.cc:77 src/skins-qt/menus.cc:67
+msgid "Effects ..."
+msgstr ""
+
+#: src/skins/menus.cc:84 src/skins-qt/menus.cc:74
+msgid "Open Files ..."
+msgstr "Deschide Fișiere ..."
+
+#: src/skins/menus.cc:85 src/skins-qt/menus.cc:76
+msgid "Open URL ..."
+msgstr "Deschide URL ..."
+
+#: src/skins/menus.cc:89 src/skins-qt/menus.cc:80
+msgid "Playlist"
+msgstr "Listă de redare"
+
+#: src/skins/menus.cc:90 src/skins-qt/menus.cc:81
+msgid "Output"
+msgstr ""
+
+#: src/skins/menus.cc:91 src/skins-qt/menus.cc:82
+msgid "View"
+msgstr ""
+
+#: src/skins/menus.cc:93 src/skins/menus.cc:161 src/skins/menus.cc:174
+#: src/skins/menus.cc:245 src/skins-qt/menus.cc:84 src/skins-qt/menus.cc:156
+#: src/skins-qt/menus.cc:170 src/skins-qt/menus.cc:241
+msgid "Services"
+msgstr "Servicii"
+
+#: src/skins/menus.cc:95 src/skins-qt/menus.cc:86
+msgid "About ..."
+msgstr "Despre ..."
+
+#: src/skins/menus.cc:96 src/skins-qt/menus.cc:87
+msgid "Settings ..."
+msgstr ""
+
+#: src/skins/menus.cc:97 src/skins-qt/menus.cc:88
+msgid "Quit"
+msgstr ""
+
+#: src/skins/menus.cc:101 src/skins/menus.cc:235 src/skins-qt/menus.cc:92
+#: src/skins-qt/menus.cc:231
+msgid "Song Info ..."
+msgstr ""
+
+#: src/skins/menus.cc:105 src/skins-qt/menus.cc:96
+msgid "Shuffle by Album"
+msgstr ""
+
+#: src/skins/menus.cc:106 src/skins-qt/menus.cc:97
+msgid "No Playlist Advance"
+msgstr ""
+
+#: src/skins/menus.cc:117 src/skins-qt/menus.cc:108
+msgid "Set A-B Repeat"
+msgstr ""
+
+#: src/skins/menus.cc:118 src/skins-qt/menus.cc:109
+msgid "Clear A-B Repeat"
+msgstr ""
+
+#: src/skins/menus.cc:120 src/skins-qt/menus.cc:111
+msgid "Jump to Song ..."
+msgstr ""
+
+#: src/skins/menus.cc:121 src/skins-qt/menus.cc:113
+msgid "Jump to Time ..."
+msgstr ""
+
+#: src/skins/menus.cc:125 src/skins-qt/menus.cc:118
+msgid "Play/Resume"
+msgstr ""
+
+#: src/skins/menus.cc:127 src/skins-qt/menus.cc:120
+msgid "New Playlist"
+msgstr "Listă de redare nouă"
+
+#: src/skins/menus.cc:128 src/skins-qt/menus.cc:121
+msgid "Rename Playlist ..."
+msgstr ""
+
+#: src/skins/menus.cc:129 src/skins-qt/menus.cc:122
+msgid "Remove Playlist"
+msgstr "Elimină Lista de redare"
+
+#: src/skins/menus.cc:131 src/skins-qt/menus.cc:124
+msgid "Previous Playlist"
+msgstr ""
+
+#: src/skins/menus.cc:132 src/skins-qt/menus.cc:125
+msgid "Next Playlist"
+msgstr ""
+
+#: src/skins/menus.cc:134 src/skins-qt/menus.cc:127
+msgid "Import Playlist ..."
+msgstr ""
+
+#: src/skins/menus.cc:135 src/skins-qt/menus.cc:128
+msgid "Export Playlist ..."
+msgstr ""
+
+#: src/skins/menus.cc:137 src/skins-qt/menus.cc:130
+msgid "Playlist Manager ..."
+msgstr ""
+
+#: src/skins/menus.cc:138 src/skins-qt/menus.cc:131
+msgid "Queue Manager ..."
+msgstr ""
+
+#: src/skins/menus.cc:140 src/skins-qt/menus.cc:133
+msgid "Refresh Playlist"
+msgstr ""
+
+#: src/skins/menus.cc:144 src/skins-qt/menus.cc:137
+msgid "Show Playlist Editor"
+msgstr ""
+
+#: src/skins/menus.cc:145 src/skins-qt/menus.cc:138
+msgid "Show Equalizer"
+msgstr ""
+
+#: src/skins/menus.cc:147 src/skins-qt/menus.cc:140
+msgid "Show Remaining Time"
+msgstr ""
+
+#: src/skins/menus.cc:150 src/skins-qt/menus.cc:143
+msgid "Always on Top"
+msgstr ""
+
+#: src/skins/menus.cc:151 src/skins-qt/menus.cc:145
+msgid "On All Workspaces"
+msgstr ""
+
+#: src/skins/menus.cc:153 src/skins-qt/menus.cc:148
+msgid "Roll Up Player"
+msgstr ""
+
+#: src/skins/menus.cc:154 src/skins-qt/menus.cc:149
+msgid "Roll Up Playlist Editor"
+msgstr ""
+
+#: src/skins/menus.cc:155 src/skins-qt/menus.cc:150
+msgid "Roll Up Equalizer"
+msgstr ""
+
+#: src/skins/menus.cc:163 src/skins-qt/menus.cc:158
+msgid "Add URL ..."
+msgstr ""
+
+#: src/skins/menus.cc:164 src/skins-qt/menus.cc:160
+msgid "Add Files ..."
+msgstr ""
+
+#: src/skins/menus.cc:168 src/skins/menus.cc:196 src/skins/menus.cc:212
+#: src/skins-qt/menus.cc:164 src/skins-qt/menus.cc:192
+#: src/skins-qt/menus.cc:208
+msgid "By Title"
+msgstr ""
+
+#: src/skins/menus.cc:169 src/skins/menus.cc:203 src/skins/menus.cc:219
+#: src/skins-qt/menus.cc:165 src/skins-qt/menus.cc:199
+#: src/skins-qt/menus.cc:215
+msgid "By File Name"
+msgstr ""
+
+#: src/skins/menus.cc:170 src/skins/menus.cc:204 src/skins/menus.cc:220
+#: src/skins-qt/menus.cc:166 src/skins-qt/menus.cc:200
+#: src/skins-qt/menus.cc:216
+msgid "By File Path"
+msgstr ""
+
+#: src/skins/menus.cc:176 src/skins-qt/menus.cc:172
+msgid "Remove All"
+msgstr ""
+
+#: src/skins/menus.cc:177 src/skins-qt/menus.cc:173
+msgid "Clear Queue"
+msgstr ""
+
+#: src/skins/menus.cc:179 src/skins-qt/menus.cc:175
+msgid "Remove Unavailable Files"
+msgstr ""
+
+#: src/skins/menus.cc:180 src/skins-qt/menus.cc:176
+msgid "Remove Duplicates"
+msgstr ""
+
+#: src/skins/menus.cc:182 src/skins-qt/menus.cc:178
+msgid "Remove Unselected"
+msgstr ""
+
+#: src/skins/menus.cc:183 src/skins-qt/menus.cc:179
+msgid "Remove Selected"
+msgstr ""
+
+#: src/skins/menus.cc:187 src/skins-qt/menus.cc:183
+msgid "Search and Select"
+msgstr ""
+
+#: src/skins/menus.cc:189 src/skins-qt/menus.cc:185
+msgid "Invert Selection"
+msgstr ""
+
+#: src/skins/menus.cc:190 src/skins-qt/menus.cc:186
+msgid "Select None"
+msgstr ""
+
+#: src/skins/menus.cc:191 src/skins-qt/menus.cc:187
+msgid "Select All"
+msgstr ""
+
+#: src/skins/menus.cc:195 src/skins/menus.cc:211 src/skins-qt/menus.cc:191
+#: src/skins-qt/menus.cc:207
+msgid "By Track Number"
+msgstr ""
+
+#: src/skins/menus.cc:197 src/skins/menus.cc:213 src/skins-qt/menus.cc:193
+#: src/skins-qt/menus.cc:209
+msgid "By Artist"
+msgstr ""
+
+#: src/skins/menus.cc:198 src/skins/menus.cc:214 src/skins-qt/menus.cc:194
+#: src/skins-qt/menus.cc:210
+msgid "By Album"
+msgstr ""
+
+#: src/skins/menus.cc:199 src/skins/menus.cc:215 src/skins-qt/menus.cc:195
+#: src/skins-qt/menus.cc:211
+msgid "By Album Artist"
+msgstr ""
+
+#: src/skins/menus.cc:200 src/skins/menus.cc:216 src/skins-qt/menus.cc:196
+#: src/skins-qt/menus.cc:212
+msgid "By Release Date"
+msgstr ""
+
+#: src/skins/menus.cc:201 src/skins/menus.cc:217 src/skins-qt/menus.cc:197
+#: src/skins-qt/menus.cc:213
+msgid "By Genre"
+msgstr ""
+
+#: src/skins/menus.cc:202 src/skins/menus.cc:218 src/skins-qt/menus.cc:198
+#: src/skins-qt/menus.cc:214
+msgid "By Length"
+msgstr ""
+
+#: src/skins/menus.cc:205 src/skins/menus.cc:221 src/skins-qt/menus.cc:201
+#: src/skins-qt/menus.cc:217
+msgid "By Custom Title"
+msgstr ""
+
+#: src/skins/menus.cc:206 src/skins/menus.cc:222 src/skins-qt/menus.cc:202
+#: src/skins-qt/menus.cc:218
+msgid "By Comment"
+msgstr ""
+
+#: src/skins/menus.cc:207 src/skins/menus.cc:223 src/skins-qt/menus.cc:203
+#: src/skins-qt/menus.cc:219
+msgid "By Disc Number"
+msgstr ""
+
+#: src/skins/menus.cc:227 src/skins-qt/menus.cc:223
+msgid "Randomize List"
+msgstr ""
+
+#: src/skins/menus.cc:228 src/skins-qt/menus.cc:224
+msgid "Reverse List"
+msgstr ""
+
+#: src/skins/menus.cc:230 src/skins-qt/menus.cc:226
+msgid "Sort Selected"
+msgstr ""
+
+#: src/skins/menus.cc:231 src/skins-qt/menus.cc:227
+msgid "Sort List"
+msgstr ""
+
+#: src/skins/menus.cc:236 src/skins-qt/menus.cc:232
+msgid "Open Containing Folder"
+msgstr ""
+
+#: src/skins/menus.cc:238 src/skins-qt/menus.cc:234
+msgid "Cut"
+msgstr ""
+
+#: src/skins/menus.cc:239 src/skins-qt/menus.cc:235
+msgid "Copy"
+msgstr "Copiază"
+
+#: src/skins/menus.cc:240 src/skins-qt/menus.cc:236
+msgid "Paste"
+msgstr ""
+
+#: src/skins/menus.cc:241 src/skins-qt/menus.cc:237
+msgid "Paste at End"
+msgstr ""
+
+#: src/skins/menus.cc:243 src/skins-qt/menus.cc:239
+msgid "Queue/Unqueue"
+msgstr ""
+
+#: src/skins/playlist-widget.cc:58 src/skins-qt/playlist-widget.cc:58
+#, c-format
+msgid "%s (%d of %d)"
+msgstr ""
+
+#: src/skins/playlistwin.cc:491 src/skins-qt/playlistwin.cc:478
+msgid "Audacious Playlist Editor"
+msgstr ""
+
+#: src/skins/plugin.cc:53 src/skins-qt/plugin.cc:65
+msgid "Winamp Classic Interface"
+msgstr ""
+
+#: src/skins-qt/menus.cc:75
+msgid "Open Folder ..."
+msgstr ""
+
+#: src/skins-qt/menus.cc:159
+msgid "Add Folder ..."
+msgstr ""
+
+#: src/skins-qt/search-select.cc:62 src/skins/search-select.cc:77
+msgid "Search entries in active playlist"
+msgstr ""
+
+#: src/skins-qt/search-select.cc:70 src/skins/search-select.cc:83
+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-qt/search-select.cc:75 src/skins/search-select.cc:91
+msgid "Title:"
+msgstr ""
+
+#: src/skins-qt/search-select.cc:79 src/skins/search-select.cc:96
+msgid "Album:"
+msgstr ""
+
+#: src/skins-qt/search-select.cc:82 src/skins/search-select.cc:101
+msgid "Artist:"
+msgstr ""
+
+#: src/skins-qt/search-select.cc:85 src/skins/search-select.cc:106
+msgid "File Name:"
+msgstr ""
+
+#: src/skins-qt/search-select.cc:88 src/skins/search-select.cc:134
+msgid "Clear previous selection before searching"
+msgstr ""
+
+#: src/skins-qt/search-select.cc:89 src/skins/search-select.cc:137
+msgid "Automatically toggle queue for matching entries"
+msgstr ""
+
+#: src/skins-qt/search-select.cc:90 src/skins/search-select.cc:140
+msgid "Create a new playlist with matching entries"
+msgstr ""
+
+#: src/skins-qt/search-select.cc:101 src/skins/search-select.cc:78
+msgid "Search"
+msgstr ""
+
+#: src/skins-qt/skins_cfg.cc:198 src/skins/skins_cfg.cc:182
+msgid "Player:"
+msgstr ""
+
+#: src/skins-qt/skins_cfg.cc:200 src/skins/skins_cfg.cc:184
+msgid "Select main player window font:"
+msgstr ""
+
+#: src/skins-qt/skins_cfg.cc:201 src/skins/skins_cfg.cc:185
+msgid "Playlist:"
+msgstr ""
+
+#: src/skins-qt/skins_cfg.cc:203 src/skins/skins_cfg.cc:187
+msgid "Select playlist font:"
+msgstr ""
+
+#: src/skins-qt/skins_cfg.cc:207 src/skins/skins_cfg.cc:191
+msgid "Skin"
+msgstr ""
+
+#: src/skins-qt/skins_cfg.cc:211 src/skins/skins_cfg.cc:193
+msgid "Display active titlebar when any window is focused"
+msgstr ""
+
+#: src/skins-qt/skins_cfg.cc:213 src/skins/skins_cfg.cc:195
+msgid "Fonts"
+msgstr ""
+
+#: src/skins-qt/skins_cfg.cc:215 src/skins/skins_cfg.cc:197
+msgid "Use bitmap fonts (supports ASCII only)"
+msgstr ""
+
+#: src/skins-qt/skins_cfg.cc:217 src/skins/skins_cfg.cc:199
+msgid "Scroll song title"
+msgstr ""
+
+#: src/skins-qt/skins_cfg.cc:219 src/skins/skins_cfg.cc:201
+msgid "Scroll song title in both directions"
+msgstr ""
+
+#: src/skins-qt/skins_cfg.cc:224 src/skins/skins_cfg.cc:206
+msgid "Analyzer"
+msgstr ""
+
+#: src/skins-qt/skins_cfg.cc:225 src/skins/skins_cfg.cc:207
+msgid "Scope"
+msgstr ""
+
+#: src/skins-qt/skins_cfg.cc:226 src/skins/skins_cfg.cc:208
+msgid "Voiceprint / VU meter"
+msgstr ""
+
+#: src/skins-qt/skins_cfg.cc:227 src/skins/skins_cfg.cc:209
+msgid "Off"
+msgstr ""
+
+#: src/skins-qt/skins_cfg.cc:231 src/skins-qt/skins_cfg.cc:256
+#: src/skins-qt/skins_cfg.cc:262 src/skins/skins_cfg.cc:213
+#: src/skins/skins_cfg.cc:238 src/skins/skins_cfg.cc:244
+msgid "Normal"
+msgstr "Normal"
+
+#: src/skins-qt/skins_cfg.cc:232 src/skins-qt/skins_cfg.cc:257
+#: src/skins/skins_cfg.cc:214 src/skins/skins_cfg.cc:239
+msgid "Fire"
+msgstr ""
+
+#: src/skins-qt/skins_cfg.cc:233 src/skins/skins_cfg.cc:215
+msgid "Vertical lines"
+msgstr ""
+
+#: src/skins-qt/skins_cfg.cc:237 src/skins/skins_cfg.cc:219
+msgid "Lines"
+msgstr ""
+
+#: src/skins-qt/skins_cfg.cc:238 src/skins/skins_cfg.cc:220
+msgid "Bars"
+msgstr ""
+
+#: src/skins-qt/skins_cfg.cc:242 src/skins/skins_cfg.cc:224
+msgid "Slowest"
+msgstr ""
+
+#: src/skins-qt/skins_cfg.cc:243 src/skins/skins_cfg.cc:225
+msgid "Slow"
+msgstr ""
+
+#: src/skins-qt/skins_cfg.cc:244 src/skins/skins_cfg.cc:226
+#: src/soxr/sox-resampler.cc:180
+msgid "Medium"
+msgstr ""
+
+#: src/skins-qt/skins_cfg.cc:245 src/skins/skins_cfg.cc:227
+msgid "Fast"
+msgstr ""
+
+#: src/skins-qt/skins_cfg.cc:246 src/skins/skins_cfg.cc:228
+msgid "Fastest"
+msgstr ""
+
+#: src/skins-qt/skins_cfg.cc:250 src/skins/skins_cfg.cc:232
+msgid "Dots"
+msgstr ""
+
+#: src/skins-qt/skins_cfg.cc:251 src/skins/skins_cfg.cc:233
+msgid "Line"
+msgstr "Linie"
+
+#: src/skins-qt/skins_cfg.cc:252 src/skins/skins_cfg.cc:234
+msgid "Solid"
+msgstr ""
+
+#: src/skins-qt/skins_cfg.cc:258 src/skins/skins_cfg.cc:240
+msgid "Ice"
+msgstr ""
+
+#: src/skins-qt/skins_cfg.cc:263 src/skins/skins_cfg.cc:245
+msgid "Smooth"
+msgstr ""
+
+#: src/skins-qt/skins_cfg.cc:267 src/skins/skins_cfg.cc:249
+msgid "Coloring:"
+msgstr ""
+
+#: src/skins-qt/skins_cfg.cc:270 src/skins/skins_cfg.cc:252
+msgid "Style:"
+msgstr ""
+
+#: src/skins-qt/skins_cfg.cc:273 src/skins/skins_cfg.cc:255
+msgid "Falloff:"
+msgstr ""
+
+#: src/skins-qt/skins_cfg.cc:276 src/skins/skins_cfg.cc:258
+msgid "Peak falloff:"
+msgstr ""
+
+#: src/skins-qt/skins_cfg.cc:282 src/skins/skins_cfg.cc:264
+msgid "Scope Style:"
+msgstr ""
+
+#: src/skins-qt/skins_cfg.cc:285 src/skins/skins_cfg.cc:267
+msgid "Voiceprint Coloring:"
+msgstr ""
+
+#: src/skins-qt/skins_cfg.cc:288 src/skins/skins_cfg.cc:270
+msgid "VU Meter Style:"
+msgstr ""
+
+#: src/skins-qt/skins_cfg.cc:294 src/skins/skins_cfg.cc:276
+msgid "Type"
+msgstr ""
+
+#: src/skins-qt/skins_cfg.cc:295 src/skins/skins_cfg.cc:277
+msgid "Visualization type:"
+msgstr ""
+
+#: src/skins-qt/skins_cfg.cc:298 src/skins/skins_cfg.cc:280
+msgid "Analyzer"
+msgstr ""
+
+#: src/skins-qt/skins_cfg.cc:299 src/skins/skins_cfg.cc:281
+msgid "Show peaks"
+msgstr ""
+
+#: src/skins-qt/skins_cfg.cc:308 src/skins/skins_cfg.cc:290
+msgid "Visualization"
+msgstr "Vizualizare"
+
+#: src/skins-qt/skinselector.cc:98 src/skins/skinselector.cc:111
+msgid "Archived Winamp 2.x skin"
+msgstr ""
+
+#: src/skins-qt/skinselector.cc:102 src/skins/skinselector.cc:115
+msgid "Unarchived Winamp 2.x skin"
+msgstr ""
+
+#: src/sndfile/plugin.cc:38
+msgid "Sndfile Plugin"
+msgstr "Plugin Sndfile"
+
+#: src/sndfile/plugin.cc:372
+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/sndio/sndio.cc:43
+msgid "Sndio Output"
+msgstr ""
+
+#: src/sndio/sndio.cc:98
+msgid "Device (blank for default):"
+msgstr ""
+
+#: src/sndio/sndio.cc:100
+msgid "Save and restore volume:"
+msgstr ""
+
+#: src/sndio/sndio.cc:181
+#, c-format
+msgid "Sndio error: Unsupported audio format (%d)"
+msgstr ""
+
+#: src/sndio/sndio.cc:192
+msgid "Sndio error: sio_open() failed"
+msgstr ""
+
+#: src/sndio/sndio.cc:221
+msgid "Sndio error: sio_setpar() failed"
+msgstr ""
+
+#: src/sndio/sndio.cc:233
+msgid "Sndio error: sio_start() failed"
+msgstr ""
+
+#: src/songchange/song_change.cc:30
+msgid "Song Change"
+msgstr ""
+
+#: src/songchange/song_change.cc:256
+msgid "Commands"
+msgstr ""
+
+#: src/songchange/song_change.cc:258
+msgid "Command to run when starting a new song:"
+msgstr ""
+
+#: src/songchange/song_change.cc:261
+msgid "Command to run when stopping a song:"
+msgstr ""
+
+#: src/songchange/song_change.cc:264
+msgid "Command to run at the end of a song:"
+msgstr ""
+
+#: src/songchange/song_change.cc:267
+msgid "Command to run at the end of the playlist:"
+msgstr ""
+
+#: src/songchange/song_change.cc:270
+msgid "Command to run when song title changes (for network streams):"
+msgstr ""
+
+#: src/songchange/song_change.cc:273
+msgid ""
+"You can use the following format codes, which will be replaced before "
+"running the command.\n"
+"Not all are useful though for the song-stopped or end-of-playlist command."
+msgstr ""
+
+#: src/songchange/song_change.cc:276
+msgid ""
+"%a: Artist\n"
+"%b: Album\n"
+"%c: Number of channels\n"
+"%f: File name (full path)\n"
+"%F: Frequency (Hertz)\n"
+"%l: Length (milliseconds)\n"
+"%n or %s: Formatted title (see playlist settings)\n"
+"%p: Currently playing (1 or 0)\n"
+"%r: Rate (bits per second)\n"
+"%t: Playlist position\n"
+"%T: Title (unformatted)"
+msgstr ""
+
+#: src/songchange/song_change.cc:287
+msgid ""
+"Parameters passed to the shell should be enclosed in quotation marks.\n"
+"Unquoted parameters may lead to unexpected results."
+msgstr ""
+
+#: src/song-info-qt/song-info.cc:30
+msgid "Song Info"
+msgstr "Informații despre melodie"
+
+#: src/soxr/sox-resampler.cc:44
+msgid "SoX Resampler"
+msgstr ""
+
+#: src/soxr/sox-resampler.cc:172
+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/soxr/sox-resampler.cc:178
+msgid "Quick"
+msgstr ""
+
+#: src/soxr/sox-resampler.cc:179
+msgid "Low"
+msgstr ""
+
+#: src/soxr/sox-resampler.cc:181
+msgid "High"
+msgstr ""
+
+#: src/soxr/sox-resampler.cc:182
+msgid "Very High"
+msgstr ""
+
+#: src/soxr/sox-resampler.cc:183
+msgid "Ultra High"
+msgstr ""
+
+#: src/soxr/sox-resampler.cc:187
+msgid "Minimum"
+msgstr ""
+
+#: src/soxr/sox-resampler.cc:188
+msgid "Intermediate"
+msgstr ""
+
+#: src/soxr/sox-resampler.cc:193
+msgid "Quality:"
+msgstr "Calitate:"
+
+#: src/soxr/sox-resampler.cc:196
+msgid "Phase:"
+msgstr ""
+
+#: src/soxr/sox-resampler.cc:200
+msgid "Allow aliasing"
+msgstr ""
+
+#: src/soxr/sox-resampler.cc:202
+msgid "Use steep filter"
+msgstr ""
+
+#: src/speedpitch/speed-pitch.cc:54
+msgid "Speed and Pitch"
+msgstr ""
+
+#: src/speedpitch/speed-pitch.cc:247
+msgid "Speed"
+msgstr ""
+
+#: src/speedpitch/speed-pitch.cc:248
+msgid "Decouple from pitch"
+msgstr ""
+
+#: src/speedpitch/speed-pitch.cc:250 src/speedpitch/speed-pitch.cc:258
+msgid "Multiplier:"
+msgstr ""
+
+#: src/speedpitch/speed-pitch.cc:254
+msgid "Pitch"
+msgstr ""
+
+#: src/statusicon-qt/statusicon.cc:45 src/statusicon/statusicon.cc:47
+msgid "Status Icon"
+msgstr ""
+
+#: src/statusicon-qt/statusicon.cc:68
+msgid ""
+"Status Icon Plugin (partial port for Qt interface)\n"
+"\n"
+"Copyright 2005-2007 Giacomo Lozito <james@develia.org>\n"
+"Copyright 2010 Michał Lipski <tallica@o2.pl>\n"
+"Copyright 2015 Eugene Paskevich <eugene@raptor.kiev.ua>\n"
+"\n"
+"This plugin provides a status icon, placed in\n"
+"the system tray area of the window manager."
+msgstr ""
+
+#: src/statusicon-qt/statusicon.cc:89 src/statusicon/statusicon.cc:384
+msgid "Mouse Scroll Action"
+msgstr ""
+
+#: src/statusicon-qt/statusicon.cc:90 src/statusicon/statusicon.cc:385
+msgid "Change volume"
+msgstr ""
+
+#: src/statusicon-qt/statusicon.cc:93 src/statusicon/statusicon.cc:388
+msgid "Change playing song"
+msgstr ""
+
+#: src/statusicon-qt/statusicon.cc:96 src/statusicon/statusicon.cc:391
+msgid "Other Settings"
+msgstr ""
+
+#: src/statusicon-qt/statusicon.cc:97 src/statusicon/statusicon.cc:392
+msgid "Disable the popup window"
+msgstr ""
+
+#: src/statusicon-qt/statusicon.cc:99 src/statusicon/statusicon.cc:394
+msgid "Close to the system tray"
+msgstr ""
+
+#: src/statusicon-qt/statusicon.cc:101 src/statusicon/statusicon.cc:396
+msgid "Advance in playlist when scrolling upward"
+msgstr ""
+
+#: src/statusicon-qt/statusicon.cc:116 src/statusicon/statusicon.cc:287
+msgid "Se_ttings ..."
+msgstr ""
+
+#: src/statusicon/statusicon.cc:377
+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/stereo_plugin/stereo.cc:19
+msgid "Extra Stereo"
+msgstr ""
+
+#: src/stereo_plugin/stereo.cc:36
+msgid ""
+"Extra Stereo Plugin\n"
+"\n"
+"By Johan Levin, 1999"
+msgstr ""
+
+#: src/stereo_plugin/stereo.cc:44
+msgid "Extra Stereo"
+msgstr ""
+
+#: src/streamtuner/icecast-model.cc:126 src/streamtuner/shoutcast-model.cc:131
+msgid "Type"
+msgstr ""
+
+#: src/streamtuner/icecast-model.cc:132
+msgid "Current Song"
+msgstr ""
+
+#: src/streamtuner/icecast-model.cc:164
+msgid "Other"
+msgstr ""
+
+#: src/streamtuner/ihr-model.cc:63
+msgid "Market"
+msgstr ""
+
+#: src/streamtuner/ihr-model.cc:156
+msgid "Call Letters"
+msgstr ""
+
+#: src/streamtuner/ihr-model.cc:162
+msgid "Description"
+msgstr "Descriere"
+
+#: src/streamtuner/shoutcast-model.cc:128
+msgid "Listeners"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:188
+msgid "Top 500 Stations"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:189
+msgid "Alternative"
+msgstr "Alternative"
+
+#: src/streamtuner/shoutcast-model.cc:190
+msgid "Blues"
+msgstr "Blues"
+
+#: src/streamtuner/shoutcast-model.cc:191
+msgid "Classical"
+msgstr "Clasic"
+
+#: src/streamtuner/shoutcast-model.cc:192
+msgid "Country"
+msgstr "Country"
+
+#: src/streamtuner/shoutcast-model.cc:193
+msgid "Decades"
+msgstr "Decenii"
+
+#: src/streamtuner/shoutcast-model.cc:194
+msgid "Easy Listening"
+msgstr "Easy Listening"
+
+#: src/streamtuner/shoutcast-model.cc:195
+msgid "Electronic"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:196
+msgid "Folk"
+msgstr "Folk"
+
+#: src/streamtuner/shoutcast-model.cc:197
+msgid "Inspirational"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:198
+msgid "International"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:199
+msgid "Jazz"
+msgstr "Jazz"
+
+#: src/streamtuner/shoutcast-model.cc:200
+msgid "Latin"
+msgstr "Latino"
+
+#: src/streamtuner/shoutcast-model.cc:201
+msgid "Metal"
+msgstr "Metal"
+
+#: src/streamtuner/shoutcast-model.cc:203
+msgid "New Age"
+msgstr "New Age"
+
+#: src/streamtuner/shoutcast-model.cc:204
+msgid "Pop"
+msgstr "Pop"
+
+#: src/streamtuner/shoutcast-model.cc:205
+msgid "Public Radio"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:206
+msgid "R&B and Urban"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:207
+msgid "Rap"
+msgstr "Rap"
+
+#: src/streamtuner/shoutcast-model.cc:208
+msgid "Reggae"
+msgstr "Reggae"
+
+#: src/streamtuner/shoutcast-model.cc:209
+msgid "Rock"
+msgstr "Rock"
+
+#: src/streamtuner/shoutcast-model.cc:210
+msgid "Seasonal and Holiday"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:211
+msgid "Soundtracks"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:212
+msgid "Talk"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:213
+msgid "Themes"
+msgstr ""
+
+#: src/streamtuner/streamtuner.cc:59
+msgid "Shoutcast"
+msgstr ""
+
+#: src/streamtuner/streamtuner.cc:60
+msgid "Icecast"
+msgstr ""
+
+#: src/streamtuner/streamtuner.cc:71
+msgid "Stream Tuner"
+msgstr ""
+
+#: src/tonegen/tonegen.cc:45
+msgid "Tone Generator"
+msgstr ""
+
+#: src/tonegen/tonegen.cc:92
+#, c-format
+msgid "%s %.1f Hz"
+msgstr "%s %.1f Hz"
+
+#: src/tonegen/tonegen.cc:92
+msgid "Tone Generator: "
+msgstr ""
+
+#: src/tonegen/tonegen.cc:161
+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/ui-common/dialogs-qt.cc:40
+msgid ""
+"\n"
+"(Further messages have been hidden.)"
+msgstr ""
+"\n"
+"(Mesajele următoare au fost ascunse.)"
+
+#: src/ui-common/dialogs-qt.cc:52
+msgid "Working ..."
+msgstr "Se lucrează ..."
+
+#: src/ui-common/dialogs-qt.cc:73
+msgid "Information"
+msgstr "Informații"
+
+#: src/ui-common/menu-ops-gtk.cc:132 src/ui-common/menu-ops-qt.cc:113
+#, c-format
+msgid "%s does not appear to be a valid folder."
+msgstr ""
+
+#: src/voice_removal/voice_removal.cc:28
+msgid "Voice Removal"
+msgstr ""
+
+#: src/vorbis/vorbis.cc:433
+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.h:18
+msgid "Ogg Vorbis Decoder"
+msgstr ""
+
+#: src/vtx/info.cc:24
+#, c-format
+msgid "Details about %s"
+msgstr ""
+
+#: src/vtx/info.cc:26
+msgid ""
+"Title: %t\n"
+"Author: %a\n"
+"From: %f\n"
+"Tracker: %T\n"
+"Comment: %C\n"
+"Chip type: %c\n"
+"Stereo: %s\n"
+"Loop: %l\n"
+"Chip freq: %F\n"
+"Player Freq: %P\n"
+"Year: %y"
+msgstr ""
+
+#: src/vtx/vtx.cc:38
+msgid "VTX Decoder"
+msgstr ""
+
+#: src/vtx/vtx.cc:178
+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/vumeter-qt/vumeter_qt.cc:31
+msgid ""
+"VU Meter Plugin for Audacious\n"
+"Copyright 2017-2019 Marc Sánchez Fauste"
+msgstr ""
+
+#: src/vumeter-qt/vumeter_qt.cc:35
+msgid "VU Meter Settings"
+msgstr ""
+
+#: src/vumeter-qt/vumeter_qt.cc:37
+msgid "Peak hold time:"
+msgstr ""
+
+#: src/vumeter-qt/vumeter_qt.cc:42
+msgid "Fall-off time:"
+msgstr ""
+
+#: src/vumeter-qt/vumeter_qt.cc:44
+msgid "dB/second"
+msgstr ""
+
+#: src/vumeter-qt/vumeter_qt.cc:46
+msgid "Display legend"
+msgstr ""
+
+#: src/vumeter-qt/vumeter_qt.h:37
+msgid "VU Meter"
+msgstr ""
+
+#: src/waveout/waveout.cc:43
+msgid "Win32 waveOut"
+msgstr ""
+
+#: src/waveout/waveout.cc:69
+msgid ""
+"Win32 waveOut Plugin for Audacious\n"
+"Copyright 2016 John Lindgren"
+msgstr ""
+
+#: src/wavpack/wavpack.cc:25
+msgid "WavPack Decoder"
+msgstr ""
+
+#: src/wavpack/wavpack.cc:217
+msgid "lossy (hybrid)"
+msgstr ""
+
+#: src/wavpack/wavpack.cc:219
+msgid "lossy"
+msgstr ""
+
+#: src/wavpack/wavpack.cc:259
+msgid ""
+"Copyright 2006 William Pitcock <nenolod@nenolod.net>\n"
+"\n"
+"Some of the plugin code was by Miles Egan."
+msgstr ""
+
+#: src/xsf/plugin.cc:74
+msgid "2SF Decoder"
+msgstr ""
+
+#: src/xsf/plugin.cc:429
+msgid "32728 Hz"
+msgstr ""
+
+#: src/xsf/plugin.cc:432
+msgid "65456 Hz"
+msgstr ""
+
+#: src/xsf/plugin.cc:438
+msgid "Cosine"
+msgstr ""
+
+#: src/xsf/plugin.cc:439
+msgid "Sharp"
+msgstr ""
+
+#: src/xsf/plugin.cc:443
+msgid "XSF Configuration"
+msgstr ""
+
+#: src/xsf/plugin.cc:445
+msgid "Default fade time:"
+msgstr ""
+
+#: src/xsf/plugin.cc:447
+msgid "Interpolation mode:"
+msgstr ""
+
+#: src/xspf/xspf.cc:95
+msgid "XML Shareable Playlists (XSPF)"
+msgstr ""

audacious-plugins-3.6.2-gtk3.tar.bz2/po/ru.po -> audacious-plugins-4.4.1.tar.bz2/po/ru.po Changed

@@ -3,330 +3,128 @@
 # This file is distributed under the same license as the Audacious Plugins package.
 #
 # Translators:
+# Alexander B <beliy@yandex.ru>, 2019
 # Alexander Orlov <alxorlov@pochta.ru>, 2007
+# Alexa Poruch <alexa.poruch@gmail.com>, 2020
 # Денис <alpi_bel@mail.ru>, 2014
-# Andrei Stepanov, 2014
+# Andrei Stepanov, 2014-2015,2022-2024
+# Arnold Layne, 2021
+# Danila E <KnightDanila@gmail.com>, 2018
+# dartraiden, 2018
+# 85f5ad14c5f803c69d22f4aeb4ef6a7e, 2018
 # Someonefree <drag-sasha@mail.ru>, 2013-2014
-# arinov <i.arinov@iht.kz>, 2014
+# Eugene Paskevich <eugene@raptor.kiev.ua>, 2015-2016
+# Ilyas B Arinov <arinov.ilyas@gmail.com>, 2014
 # iavojd <iavojd@gmail.com>, 2013
 # iavojd <iavojd@gmail.com>, 2013
+# Ilyas B Arinov <arinov.ilyas@gmail.com>, 2014-2016
+# Ilyas B Arinov <arinov.ilyas@gmail.com>, 2015
+# Ilyas B Arinov <arinov.ilyas@gmail.com>, 2015
 # joshuazzz <joshuazzz@yandex.ru>, 2012
 # joshuazzz <joshuazzz@yandex.ru>, 2012
 # Oleg <kvantarium@gmail.com>, 2012
 # Max Musatov <m1kc@yandex.ru>, 2012
 # Max Musatov <m1kc@yandex.ru>, 2012
+# Max Musatov <m1kc@yandex.ru>, 2012
 # NaiLi (aka jamesjames) Rootaerc <theism@mail.ru>, 2012-2013
 # NaiLi (aka jamesjames) Rootaerc <theism@mail.ru>, 2012
 # Алексей <kvadrocu7@gmail.com>, 2013
 # Nikita <osbib2@gmail.com>, 2015
+# Oleg C <aiien@yandex.ru>, 2017
+# Oleg <kvantarium@gmail.com>, 2012
 # Lowrider <pams@imail.ru>, 2014-2015
+# PARD OFFSPRING <pardoffspring@gmail.com>, 2020
 # Rax Garfield <admin@dvizho.ks.ua>, 2012
 # <sejava@mail.ru>, 2012
 # Senya <senyalutyi@ya.ru>, 2013
 # Senya <senyalutyi@ya.ru>, 2013
+# Senya <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
 # Oleg <kvantarium@gmail.com>, 2012
 # Victor Ponomarev <victor.a.ponomarev@gmail.com>, 2013
+# Volk Daemon <volk-daemon@rambler.ru>, 2016,2018
+# Алексей <aleshtorm@gmail.com>, 2022
 # Алексей <kvadrocu7@gmail.com>, 2013
+# Темак, 2022-2023
+# Victor Golovanenko <drygdryg2014@yandex.ru>, 2020
+# Денис <alpi_bel@mail.ru>, 2014-2015
+# Денис Локтев <den32ds@gmail.com>, 2017
+# Петро Проценко <petruk3@gmail.com>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Audacious Plugins\n"
-"Report-Msgid-Bugs-To: http://redmine.audacious-media-player.org/\n"
-"POT-Creation-Date: 2015-05-30 15:51+0200\n"
-"PO-Revision-Date: 2015-04-30 22:04+0000\n"
-"Last-Translator: Nikita <osbib2@gmail.com>\n"
-"Language-Team: Russian (http://www.transifex.com/projects/p/audacious/"
+"Report-Msgid-Bugs-To: https://github.com/audacious-media-player/audacious/"
+"issues\n"
+"POT-Creation-Date: 2024-09-26 21:54+0200\n"
+"PO-Revision-Date: 2011-10-10 17:43+0000\n"
+"Last-Translator: Andrei Stepanov, 2014-2015,2022-2024\n"
+"Language-Team: Russian (http://app.transifex.com/audacious/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"
-"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n"
-"%100>=11 && n%100<=14)? 2 : 3);\n"
+"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
+"n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || "
+"(n%100>=11 && n%100<=14)? 2 : 3);\n"
 
-#: src/aac-raw/aac.cc:18
+#: src/aac/aac.cc:19
 msgid "AAC (Raw) Decoder"
-msgstr "Декодер AAC(Raw)"
+msgstr "Декодер AAC (Raw)"
 
-#: src/adplug/adplug-xmms.cc:42
+#: src/adplug/adplug-xmms.cc:70
 msgid "AdPlug (AdLib Player)"
 msgstr "AdPlug (проигрыватель AdLib)"
 
-#: src/adplug/adplug-xmms.cc:156 src/modplug/modplugbmp.cc:335
-#: src/psf/plugin.cc:138 src/vtx/vtx.cc:87 src/xsf/plugin.cc:113
+#: src/adplug/adplug-xmms.cc:167 src/modplug/modplugbmp.cc:321
+#: src/psf/plugin.cc:161 src/vtx/vtx.cc:89 src/xsf/plugin.cc:204
 msgid "sequenced"
 msgstr "последовательный"
 
-#: src/alarm/alarm.cc:55 src/alarm/interface.cc:82
-msgid "Alarm"
-msgstr "Будильник"
-
-#: src/alarm/alarm.cc:782
-msgid "Set Alarm ..."
-msgstr "Установить Будильник,,,,"
-
-#: src/alarm/alarm.cc:810
-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/interface.cc: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.cc: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.cc: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.cc:81
-msgid "This is your wakeup call."
-msgstr "Это ваш звонок будильника"
-
-#: src/alarm/interface.cc:99
-msgid "Your reminder for today is..."
-msgstr "Напоминание на сегодняшний день..."
-
-#: src/alarm/interface.cc:101 src/alarm/interface.cc:386
-msgid "Reminder"
-msgstr "Напоминание"
-
-#: src/alarm/interface.cc:132
-msgid "Monday"
-msgstr "Понедельник"
-
-#: src/alarm/interface.cc:132
-msgid "Tuesday"
-msgstr "Вторник"
-
-#: src/alarm/interface.cc:132
-msgid "Wednesday"
-msgstr "Среда"
-
-#: src/alarm/interface.cc:133
-msgid "Thursday"
-msgstr "Четверг"
-
-#: src/alarm/interface.cc:133
-msgid "Friday"
-msgstr "Пятница"
-
-#: src/alarm/interface.cc:133
-msgid "Saturday"
-msgstr "Суббота"
-
-#: src/alarm/interface.cc:133
-msgid "Sunday"
-msgstr "Воскресенье"
-
-#: src/alarm/interface.cc:171 src/alarm/interface.cc:230
-#: src/alarm/interface.cc:245
-msgid "Time"
-msgstr "Время"
-
-#: src/alarm/interface.cc:178
-msgid "Alarm at (default):"
-msgstr "Будильник в (по умолчанию):"
-
-#: src/alarm/interface.cc:200
-msgid "h"
-msgstr "ч"
-
-#: src/alarm/interface.cc:203
-msgid "Quiet after:"
-msgstr "Перестать звонить после:"
-
-#: src/alarm/interface.cc:215
-msgid "hours"
-msgstr "часы"
-
-#: src/alarm/interface.cc:226
-msgid "minutes"
-msgstr "минуты"
-
-#: src/alarm/interface.cc:235
-msgid "Choose the days for the alarm to come on"
-msgstr "Выберите дни, в которые будет срабатывать будильник"
+#: src/adplug/adplug-xmms.cc:349 src/sid/xs_config.cc:61
+msgid "Output"
+msgstr "Вывод"
 
-#: src/alarm/interface.cc:242
-msgid "Day"
-msgstr "День"
+#: src/adplug/adplug-xmms.cc:350
+msgid "OPL Emulator:"
+msgstr "Эмулятор OPL:"
+
+#: src/adplug/adplug-xmms.cc:353 src/amidiplug/i_configure.cc:153
+#: src/console/plugin.cc:45 src/filewriter/filewriter.cc:481
+#: src/sid/xs_config.cc:65 src/xsf/plugin.cc:446
+msgid "Sample rate:"
+msgstr "Частота дискретизации:"
 
-#: src/alarm/interface.cc:259 src/bs2b/plugin.cc:130
-#: src/skins/preset-list.cc:434 src/skins/preset-list.cc:440
-msgid "Default"
-msgstr "По умолчанию"
+#: src/adplug/adplug-xmms.cc:354 src/amidiplug/i_configure.cc:155
+#: src/bs2b/plugin.cc:141 src/console/plugin.cc:47
+#: src/modplug/plugin_main.cc:77 src/resample/resample.cc:201
+#: src/resample/resample.cc:207 src/resample/resample.cc:211
+#: src/resample/resample.cc:215 src/resample/resample.cc:219
+#: src/resample/resample.cc:223 src/resample/resample.cc:227
+#: src/resample/resample.cc:231 src/resample/resample.cc:235
+#: src/resample/resample.cc:239 src/resample/resample.cc:243
+#: src/sid/xs_config.cc:67 src/soxr/sox-resampler.cc:205
+msgid "Hz"
+msgstr "Гц"
 
-#: src/alarm/interface.cc:288
-msgid "Days"
-msgstr "Дни"
-
-#: src/alarm/interface.cc:297
-msgid "Fading"
-msgstr "Плавное нарастание громкости"
-
-#: src/alarm/interface.cc:305 src/console/plugin.cc:41
-#: src/crossfade/crossfade.cc:53 src/crossfade/crossfade.cc:59
-#: src/gtkui/settings.cc:49 src/lirc/lirc.cc:397 src/sid/xs_config.cc:85
-#: src/sid/xs_config.cc:94 src/sid/xs_config.cc:103
-msgid "seconds"
-msgstr "секунд"
+#: src/adplug/adplug-xmms.cc:355 src/gtkui/settings.cc:55
+#: src/modplug/plugin_main.cc:105 src/qtui/settings.cc:85
+#: src/skins-qt/skins_cfg.cc:302 src/skins/skins_cfg.cc:284
+msgid "Miscellaneous"
+msgstr "Разное"
 
-#: src/alarm/interface.cc:312 src/alarm/interface.cc:353
-msgid "Volume"
-msgstr "Громкость"
-
-#: src/alarm/interface.cc:317
-msgid "Start at"
-msgstr "Начать c"
-
-#: src/alarm/interface.cc:333
-msgid "Final"
-msgstr "В конце"
-
-#: src/alarm/interface.cc:346
-msgid "Current"
-msgstr "Текущее"
-
-#: src/alarm/interface.cc:359
-msgid "Additional Command"
-msgstr "Дополнительная команда"
-
-#: src/alarm/interface.cc:365 src/alarm/interface.cc:391
-msgid "enable"
-msgstr "включить"
-
-#: src/alarm/interface.cc:372
-msgid "Playlist (optional)"
-msgstr "Плейлист (необязательно)"
-
-#: src/alarm/interface.cc:379
-msgid "Select a playlist"
-msgstr "Выберите список воспроизведения"
-
-#: src/alarm/interface.cc:399
-msgid "Options"
-msgstr "Параметры"
-
-#: src/alarm/interface.cc:404
-msgid "What do these options mean?"
-msgstr "Что означают эти опции?"
-
-#: src/alarm/interface.cc:420
-msgid "Help"
-msgstr "Справка"
+#: src/adplug/adplug-xmms.cc:356
+msgid "Repeat song in endless loop"
+msgstr "Повторить песню в бесконечном цикле"
 
-#: src/albumart/albumart.cc:31
+#: src/albumart/albumart.cc:31 src/albumart-qt/albumart.cc:35
 msgid "Album Art"
 msgstr "Обложка альбома"
 
-#: src/albumart-qt/albumart.cc:33
-msgid "Album Art (Qt)"
-msgstr "Иллюстрация альбома (Qt)"
-
-#: src/alsa/alsa.h:70
+#: src/alsa/alsa.h:64
 msgid "ALSA Output"
 msgstr "Вывод ALSA"
 
@@ -338,11 +136,11 @@
 "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"
+"Модуль вывода ALSA для Audacious\n"
+"Авторское право 2009-2012 John Lindgren\n"
 "\n"
-"Моя благодарность Уильяму Pitcock, автор Вывода ALSA NG, чей код служил "
-"ориентиром, когда руководства по ALSA было недостаточно."
+"Моя благодарность William Pitcock, автору модуля вывода ALSA NG, чей код "
+"служил ориентиром, когда руководства по ALSA было недостаточно."
 
 #: src/alsa/config.cc:61
 msgid "(no description)"
@@ -368,11 +166,11 @@
 msgid "Mixer element:"
 msgstr "Компонент микшера:"
 
-#: src/amidi-plug/amidi-plug.cc:41
+#: src/amidiplug/amidi-plug.cc:42
 msgid "AMIDI-Plug (MIDI Player)"
 msgstr "Плагин AMIDI (проигрыватель MIDI)"
 
-#: src/amidi-plug/amidi-plug.cc:437
+#: src/amidiplug/amidi-plug.cc:445
 msgid ""
 "AMIDI-Plug\n"
 "modular MIDI music player\n"
@@ -414,157 +212,161 @@
 "Tony Vroon\n"
 "за помощь при альфа-тестировании"
 
-#: src/amidi-plug/i_configure.cc:94
+#: src/amidiplug/i_configure.cc:94
 msgid "Override default gain:"
-msgstr "Заменить дефолтный усилитель на:"
+msgstr "Заменить усилитель по умолчанию:"
 
-#: src/amidi-plug/i_configure.cc:102
+#: src/amidiplug/i_configure.cc:102
 msgid "Override default polyphony:"
 msgstr "Изменить полифонию по умолчанию:"
 
-#: src/amidi-plug/i_configure.cc:110
+#: src/amidiplug/i_configure.cc:110
 msgid "Override default reverb:"
-msgstr "Заменить ревербацию по умолчанию на:"
+msgstr "Заменить реверберацию по умолчанию:"
 
-#: src/amidi-plug/i_configure.cc:112 src/amidi-plug/i_configure.cc:120
+#: src/amidiplug/i_configure.cc:112 src/amidiplug/i_configure.cc:120
 msgid "On"
-msgstr "На"
+msgstr "Вкл"
 
-#: src/amidi-plug/i_configure.cc:118
+#: src/amidiplug/i_configure.cc:118
 msgid "Override default chorus:"
-msgstr "Заменить хор по умолчанию на:"
+msgstr "Заменить хор по умолчанию:"
 
-#: src/amidi-plug/i_configure.cc:128 src/console/plugin.cc:29
+#: src/amidiplug/i_configure.cc:128 src/console/plugin.cc:29
 msgid "Playback"
 msgstr "Воспроизведение"
 
-#: src/amidi-plug/i_configure.cc:129
+#: src/amidiplug/i_configure.cc:129
 msgid "Transpose:"
-msgstr "Транспонирование: "
+msgstr "Транспонирование:"
 
-#: src/amidi-plug/i_configure.cc:131
+#: src/amidiplug/i_configure.cc:131 src/speedpitch/speed-pitch.cc:257
 msgid "semitones"
 msgstr "полутона"
 
-#: src/amidi-plug/i_configure.cc:132
+#: src/amidiplug/i_configure.cc:132
 msgid "Drum shift:"
-msgstr "Смещение ударных: "
+msgstr "Смещение ударных:"
 
-#: src/amidi-plug/i_configure.cc:134
+#: src/amidiplug/i_configure.cc:134
 msgid "note numbers"
 msgstr "номера нот"
 
-#: src/amidi-plug/i_configure.cc:135
+#: src/amidiplug/i_configure.cc:135
 msgid "Skip leading silence"
-msgstr "Пропускать тишину"
+msgstr "Пропускать тишину в начале"
 
-#: src/amidi-plug/i_configure.cc:137
+#: src/amidiplug/i_configure.cc:137
 msgid "Skip trailing silence"
 msgstr "Пропускать тишину в конце"
 
-#: src/amidi-plug/i_configure.cc:141
+#: src/amidiplug/i_configure.cc:141
 msgid "SoundFont"
 msgstr "Шрифт"
 
-#: src/amidi-plug/i_configure.cc:143
+#: src/amidiplug/i_configure.cc:148
 msgid "Synthesizer"
 msgstr "Синтезатор"
 
-#: src/amidi-plug/i_configure.cc:148 src/console/plugin.cc:45
-#: src/sid/xs_config.cc:65
-msgid "Sample rate:"
-msgstr "Частота дискретизации:"
-
-#: src/amidi-plug/i_configure.cc:150 src/bs2b/plugin.cc:141
-#: src/console/plugin.cc:47 src/modplug/plugin_main.cc:78
-#: src/resample/resample.cc:201 src/resample/resample.cc:207
-#: src/resample/resample.cc:211 src/resample/resample.cc:215
-#: src/resample/resample.cc:219 src/resample/resample.cc:223
-#: src/resample/resample.cc:227 src/resample/resample.cc:231
-#: src/resample/resample.cc:235 src/resample/resample.cc:239
-#: src/resample/resample.cc:243 src/sid/xs_config.cc:67
-#: src/sox-resampler/sox-resampler.cc:163
-msgid "Hz"
-msgstr "Гц"
-
-#: src/amidi-plug/i_configure-fluidsynth.cc:52
+#: src/amidiplug/i_configure-fluidsynth.cc:58
+#: src/amidiplug/i_configure-fluidsynth.cc:527
 msgid "AMIDI-Plug - select SoundFont file"
-msgstr "AMIDI-Plug - выбор SoundFont файла"
+msgstr "AMIDI-Plug — выбор файла SoundFont"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:55 src/filewriter/mp3.cc:658
+#: src/amidiplug/i_configure-fluidsynth.cc:61
 msgid "_Cancel"
-msgstr "Закончить"
+msgstr "От_мена"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:56
+#: src/amidiplug/i_configure-fluidsynth.cc:62
 msgid "_Open"
 msgstr "_Открыть"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:225 src/gtkui/columns.cc:46
+#: src/amidiplug/i_configure-fluidsynth.cc:233
+#: src/amidiplug/i_configure-fluidsynth.cc:461
 msgid "File name"
 msgstr "Имя файла"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:229
+#: src/amidiplug/i_configure-fluidsynth.cc:237
+#: src/amidiplug/i_configure-fluidsynth.cc:464
 msgid "Size (bytes)"
 msgstr "Размер (байт)"
 
-#: src/amidi-plug/i_fileinfo.cc:163
+#: src/amidiplug/i_fileinfo.cc:184
 msgid "Name:"
 msgstr "Имя:"
 
-#: src/amidi-plug/i_fileinfo.cc:181
+#: src/amidiplug/i_fileinfo.cc:202
 msgid " MIDI Info "
 msgstr "Информация MIDI "
 
-#: src/amidi-plug/i_fileinfo.cc:195
+#: src/amidiplug/i_fileinfo.cc:216
 msgid "Format:"
 msgstr "Формат:"
 
-#: src/amidi-plug/i_fileinfo.cc:198
+#: src/amidiplug/i_fileinfo.cc:219
 msgid "Length (msec):"
 msgstr "Длительность (мс):"
 
-#: src/amidi-plug/i_fileinfo.cc:201
+#: src/amidiplug/i_fileinfo.cc:222
 msgid "No. of Tracks:"
 msgstr "Количество дорожек:"
 
-#: src/amidi-plug/i_fileinfo.cc:207
+#: src/amidiplug/i_fileinfo.cc:228
 msgid "variable"
 msgstr "переменный"
 
-#: src/amidi-plug/i_fileinfo.cc:209
+#: src/amidiplug/i_fileinfo.cc:230
 msgid "BPM:"
 msgstr "BPM:"
 
-#: src/amidi-plug/i_fileinfo.cc:217
+#: src/amidiplug/i_fileinfo.cc:238
 msgid "BPM (wavg):"
 msgstr "BPM (wavg):"
 
-#: src/amidi-plug/i_fileinfo.cc:220
+#: src/amidiplug/i_fileinfo.cc:241
 msgid "Time Div:"
 msgstr "Time Div:"
 
-#: src/amidi-plug/i_fileinfo.cc:231
+#: src/amidiplug/i_fileinfo.cc:252
 msgid " MIDI Comments and Lyrics "
 msgstr "Комментарии и тексты MIDI "
 
-#: src/amidi-plug/i_fileinfo.cc:278
+#: src/amidiplug/i_fileinfo.cc:299
 msgid "* no comments available in this MIDI file *"
 msgstr "* в этом MIDI-файле нет комментариев *"
 
-#: src/amidi-plug/i_fileinfo.cc:290
+#: src/amidiplug/i_fileinfo.cc:311
 msgid "* no lyrics available in this MIDI file *"
 msgstr "* в этом MIDI-файле нет текстов *"
 
-#: src/amidi-plug/i_fileinfo.cc:300 src/filewriter/vorbis.cc:197
-#: src/ladspa/plugin.cc:416
+#: src/amidiplug/i_fileinfo.cc:321 src/ladspa/plugin.cc:418
+#: src/ui-common/dialogs-qt.cc:32
 msgid "_Close"
-msgstr "Закрыть"
+msgstr "З_акрыть"
 
-#: src/amidi-plug/i_fileinfo.cc:325
+#: src/amidiplug/i_fileinfo.cc:346
 msgid " (invalid UTF-8)"
 msgstr " (неверный UTF-8)"
 
-#: src/aosd/aosd.cc:32
+#: src/ampache/ampache.cc:33
+msgid "Ampache Browser"
+msgstr "Браузер Ampache"
+
+#: src/ampache/ampache.cc:46
+msgid ""
+"Ampache Browser for Audacious\n"
+"http://ampache-browser.org/\n"
+"\n"
+"Copyright (C) Róbert Čerňanský and John Lindgren\n"
+"License: GNU GPLv3"
+msgstr ""
+"Ampache Browser для Audacious\n"
+"http://ampache-browser.org/\n"
+"\n"
+"Copyright (C) Róbert Čerňanský and John Lindgren\n"
+"Лицензия: GNU GPLv3"
+
+#: src/aosd/aosd.cc:31
 msgid ""
 "Audacious OSD\n"
 "http://www.develia.org/projects.php?p=audacious#aosd\n"
@@ -598,132 +400,132 @@
 msgid "Concave Rectangle"
 msgstr "Вогнутый прямоугольник"
 
-#: src/aosd/aosd_style.cc:69
+#: src/aosd/aosd_style.cc:69 src/openmpt/mptwrap.h:50 src/xsf/plugin.cc:436
 msgid "None"
 msgstr "Нет"
 
-#: src/aosd/aosd_trigger.cc:50
+#: src/aosd/aosd_trigger.cc:49
 msgid "Playback Start"
 msgstr "Начало воспроизведения"
 
-#: src/aosd/aosd_trigger.cc:51
+#: src/aosd/aosd_trigger.cc:50
 msgid "Triggers OSD when a playlist entry is played."
 msgstr "Показать OSD в начале воспроизведения."
 
-#: src/aosd/aosd_trigger.cc:56
+#: src/aosd/aosd_trigger.cc:55
 msgid "Title Change"
 msgstr "Изменение названия"
 
-#: src/aosd/aosd_trigger.cc:57
+#: src/aosd/aosd_trigger.cc:56
 msgid "Triggers OSD when the song title changes (for internet streams)."
 msgstr ""
-"Переключает экранное меню, когда название композиции меняется (для интернет "
+"Переключает экранное меню, когда название композиции меняется (для интернет-"
 "потоков)."
 
-#: src/aosd/aosd_trigger.cc:62
+#: src/aosd/aosd_trigger.cc:61
 msgid "Pause On"
 msgstr "Пауза вкл."
 
-#: src/aosd/aosd_trigger.cc:63
+#: src/aosd/aosd_trigger.cc:62
 msgid "Triggers OSD when playback is paused."
 msgstr "Показать OSD, когда воспроизведение приостанавливается."
 
-#: src/aosd/aosd_trigger.cc:68
+#: src/aosd/aosd_trigger.cc:67
 msgid "Pause Off"
-msgstr "Пауза выкл."
+msgstr "Пауза откл."
 
-#: src/aosd/aosd_trigger.cc:69
+#: src/aosd/aosd_trigger.cc:68
 msgid "Triggers OSD when playback is unpaused."
 msgstr "Показать OSD, когда воспроизведение возобновляется."
 
-#: src/aosd/aosd_ui.cc:163
+#: src/aosd/aosd_ui.cc:204
 msgid "Placement"
 msgstr "Расположение"
 
-#: src/aosd/aosd_ui.cc:196
+#: src/aosd/aosd_ui.cc:241
 msgid "Relative X offset:"
 msgstr "Смещение по оси X:"
 
-#: src/aosd/aosd_ui.cc:203
+#: src/aosd/aosd_ui.cc:245
 msgid "Relative Y offset:"
 msgstr "Смещение по оси Y:"
 
-#: src/aosd/aosd_ui.cc:210
+#: src/aosd/aosd_ui.cc:249
 msgid "Max OSD width:"
 msgstr "Максимальная ширина OSD:"
 
-#: src/aosd/aosd_ui.cc:221
+#: src/aosd/aosd_ui.cc:281
 msgid "Multi-Monitor options"
 msgstr "Параметры для систем с несколькими мониторами"
 
-#: src/aosd/aosd_ui.cc:225
+#: src/aosd/aosd_ui.cc:285
 msgid "Display OSD using:"
 msgstr "Показать OSD:"
 
-#: src/aosd/aosd_ui.cc:227
+#: src/aosd/aosd_ui.cc:287
 msgid "all monitors"
 msgstr "на всех мониторах"
 
-#: src/aosd/aosd_ui.cc:230
+#: src/aosd/aosd_ui.cc:290
 #, c-format
 msgid "monitor %i"
 msgstr "на мониторе %i"
 
-#: src/aosd/aosd_ui.cc:282
+#: src/aosd/aosd_ui.cc:342
 msgid "Timing (ms)"
 msgstr "Время (мс)"
 
-#: src/aosd/aosd_ui.cc:287
+#: src/aosd/aosd_ui.cc:347
 msgid "Display:"
-msgstr "отображения:"
+msgstr "Отображения:"
 
-#: src/aosd/aosd_ui.cc:292
+#: src/aosd/aosd_ui.cc:352
 msgid "Fade in:"
-msgstr "появления:"
+msgstr "Появления:"
 
-#: src/aosd/aosd_ui.cc:297
+#: src/aosd/aosd_ui.cc:357
 msgid "Fade out:"
-msgstr "затухания:"
+msgstr "Затухания:"
 
-#: src/aosd/aosd_ui.cc:361
+#: src/aosd/aosd_ui.cc:442
 msgid "Fonts"
 msgstr "Шрифты"
 
-#: src/aosd/aosd_ui.cc:368
+#: src/aosd/aosd_ui.cc:449
 #, c-format
 msgid "Font %i:"
 msgstr "Шрифт %i:"
 
-#: src/aosd/aosd_ui.cc:382
+#: src/aosd/aosd_ui.cc:466
 msgid "Shadow"
 msgstr "Тень"
 
-#: src/aosd/aosd_ui.cc:486
+#: src/aosd/aosd_ui.cc:589
 msgid "Render Style"
 msgstr "Стиль отображения"
 
-#: src/aosd/aosd_ui.cc:502
+#: src/aosd/aosd_ui.cc:605
 msgid "Colors"
 msgstr "Цвета"
 
-#: src/aosd/aosd_ui.cc:513
+#: src/aosd/aosd_ui.cc:616
 #, c-format
 msgid "Color %i:"
 msgstr "Цвет %i:"
 
-#: src/aosd/aosd_ui.cc:600
+#: src/aosd/aosd_ui.cc:714
 msgid "Enable trigger"
 msgstr "Включить событие"
 
-#: src/aosd/aosd_ui.cc:627
+#: src/aosd/aosd_ui.cc:741
 msgid "Event"
 msgstr "Событие"
 
-#: src/aosd/aosd_ui.cc:655
+#: src/aosd/aosd_ui.cc:768
 msgid "Composite manager detected"
 msgstr "Найден композитный менеджер"
 
-#: src/aosd/aosd_ui.cc:662
+#: src/aosd/aosd_ui.cc:775
 msgid ""
 "Composite manager not detected;\n"
 "unless you know that you have one running, please activate a composite "
@@ -731,69 +533,65 @@
 msgstr ""
 "Композитный менеджер не найден;\n"
 "Пожалуйста, запустите композитный менеджер; в противном случае\n"
-"OSD не будет работать корректно."
+"OSD не будет работать правильно."
 
-#: src/aosd/aosd_ui.cc:670
+#: src/aosd/aosd_ui.cc:783
 msgid "Composite manager not required for fake transparency"
 msgstr ""
 "Для режима \"Имитированная прозрачность\" композитный менеджер не требуется."
 
-#: src/aosd/aosd_ui.cc:706
+#: src/aosd/aosd_ui.cc:820
 msgid "Transparency"
 msgstr "Прозрачность"
 
-#: src/aosd/aosd_ui.cc:712
+#: src/aosd/aosd_ui.cc:826
 msgid "Fake transparency"
 msgstr "Имитированная прозрачность"
 
-#: src/aosd/aosd_ui.cc:714
+#: src/aosd/aosd_ui.cc:828
 msgid "Real transparency (requires X Composite Ext.)"
 msgstr "Настоящая прозрачность (требуется расширение X Composite)"
 
-#: src/aosd/aosd_ui.cc:756
+#: src/aosd/aosd_ui.cc:875
 msgid "Composite extension not loaded"
 msgstr "Расширение X Composite не загружено"
 
-#: src/aosd/aosd_ui.cc:764
-msgid "Composite extension not available"
-msgstr "Расширение X Composite недоступно"
-
-#: src/aosd/aosd_ui.cc:781
+#: src/aosd/aosd_ui.cc:892
 #, c-format
 msgid "Audacious OSD"
 msgstr "Audacious OSD"
 
-#: src/aosd/aosd_ui.cc:844
+#: src/aosd/aosd_ui.cc:955
 msgid "Position"
 msgstr "Положение"
 
-#: src/aosd/aosd_ui.cc:849
+#: src/aosd/aosd_ui.cc:960
 msgid "Animation"
 msgstr "Анимация"
 
-#: src/aosd/aosd_ui.cc:854
+#: src/aosd/aosd_ui.cc:965
 msgid "Text"
 msgstr "Текст"
 
-#: src/aosd/aosd_ui.cc:859
+#: src/aosd/aosd_ui.cc:970
 msgid "Decoration"
 msgstr "Стиль"
 
-#: src/aosd/aosd_ui.cc:864
+#: src/aosd/aosd_ui.cc:975
 msgid "Trigger"
 msgstr "События"
 
-#: src/aosd/aosd_ui.cc:869
+#: src/aosd/aosd_ui.cc:980 src/streamtuner/shoutcast-model.cc:202
 msgid "Misc"
 msgstr "Прочее"
 
-#: src/aosd/aosd_ui.cc:878
+#: src/aosd/aosd_ui.cc:989
 msgid "Test"
 msgstr "Тест"
 
 #: src/asx3/asx3.cc:35
 msgid "ASXv3 Playlists"
-msgstr "ASXv3 Плейлисты"
+msgstr "Списки воспроизведения ASXv3"
 
 #: src/asx/asx.cc:33
 msgid "ASXv1/ASXv2 Playlists"
@@ -803,11 +601,98 @@
 msgid "Audacious Playlists (audpl)"
 msgstr "Списки воспроизведения Audacious (audpl)"
 
-#: src/blur_scope/blur_scope.cc:42
+#: src/background_music/background_music.cc:24
+msgid "Background music"
+msgstr "Фоновая музыка"
+
+#: src/background_music/background_music.cc:25
+msgid "Target level:"
+msgstr "Целевой уровень:"
+
+#: src/background_music/background_music.cc:28
+#: src/background_music/background_music.cc:33
+#: src/silence-removal/silence-removal.cc:70
+msgid "dB"
+msgstr "дБ"
+
+#: src/background_music/background_music.cc:29
+msgid "Maximum amplification:"
+msgstr "Максимальное усиление:"
+
+#: src/background_music/background_music.cc:34 src/mpg123/mpg123.cc:81
+msgid "Advanced"
+msgstr "Расширенные"
+
+#: src/background_music/background_music.cc:36
+msgid "Slow detection weight:"
+msgstr "Вес медленного обнаружения:"
+
+#: src/background_music/background_music.cc:39
+msgid "Hint"
+msgstr "Подсказка"
+
+#: src/background_music/background_music.cc:41
+msgid ""
+"Slow detection weight is the relative weight\n"
+"of a long term average detection when compared\n"
+"to the actual, faster loudness detection.\n"
+"A value of zero gives a more radio-like sound\n"
+"where soft passages get \"pulled up\" more quickly,\n"
+"a value of two makes the sound feel less compressed."
+msgstr ""
+"Вес медленного обнаружения — это относительный вес\n"
+"долгосрочного среднего обнаружения по сравнению\n"
+"с фактическим, более быстрым определением громкости.\n"
+"Значение, равное нулю, обеспечивает более радиоподобное\n"
+"звучание, где мягкие пассажи «подтягиваются»\n"
+"быстрее, значение 2 делает звук менее сжатым."
+
+#: src/background_music/background_music.cc:52
+msgid ""
+"Background Music Plugin for Audacious\n"
+"Copyright 2023;2024 Michel Fleur\n"
+"\n"
+"Controls the volume to make the sound equally loud within and between "
+"tracks.\n"
+" It uses accurate loudness measurement and tries to make the volume changes "
+"sound natural without audible peaks, yet without lowering the volume before "
+"a peak in advance."
+msgstr ""
+"Плагин фоновой музыки для Audacious\n"
+"Авторское право 2023;2024 Мишель Флёр\n"
+"\n"
+"Регулирует громкость так, чтобы звук был одинаково громким внутри и между "
+"треками.\n"
+"\n"
+"Он использует точное измерение громкости и старается, чтобы изменения "
+"громкости звучали естественно, без слышимых пиков, но при этом не снижали "
+"громкость перед пиком заранее."
+
+#: src/background_music/background_music.cc:61
+msgid "Background Music"
+msgstr "Фоновая музыка"
+
+#: src/bitcrusher/bitcrusher.cc:33
+msgid "Bitcrusher"
+msgstr "Биткрашер"
+
+#: src/bitcrusher/bitcrusher.cc:34
+msgid "Bit Depth:"
+msgstr "Разрядность:"
+
+#: src/bitcrusher/bitcrusher.cc:37
+msgid "Downsample ratio:"
+msgstr "Коэффициент понижения дискретизации:"
+
+#: src/bitcrusher/bitcrusher.cc:48
+msgid "Bitcrusher"
+msgstr "Биткрашер"
+
+#: src/blur_scope/blur_scope.cc:40 src/blur_scope-qt/blur_scope.cc:45
 msgid "Color"
 msgstr "Цвет"
 
-#: src/blur_scope/blur_scope.cc:58
+#: src/blur_scope/blur_scope.cc:56 src/blur_scope-qt/blur_scope.cc:158
 msgid "Blur Scope"
 msgstr "Размывающийся уровень"
 
@@ -819,6 +704,10 @@
 msgid "Presets:"
 msgstr "Заготовки:"
 
+#: src/bs2b/plugin.cc:130
+msgid "Default"
+msgstr "По умолчанию"
+
 #: src/bs2b/plugin.cc:136
 msgid "Feed level:"
 msgstr "Уровень смешивания каналов:"
@@ -831,15 +720,15 @@
 msgid "Cut frequency:"
 msgstr "Частота среза:"
 
-#: src/cairo-spectrum/cairo-spectrum.cc:41
+#: src/cairo-spectrum/cairo-spectrum.cc:42 src/qt-spectrum/qt-spectrum.cc:107
 msgid "Spectrum Analyzer"
 msgstr "Анализатор спектра"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:72
+#: src/cdaudio/cdaudio-ng.cc:74
 msgid "Audio CD Plugin"
-msgstr "Плагин Audio CD"
+msgstr "Модуль аудио-CD"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:121
+#: src/cdaudio/cdaudio-ng.cc:121
 msgid ""
 "Copyright (C) 2007-2012 Calin Crisan <ccrisan@gmail.com> and others.\n"
 "\n"
@@ -850,8 +739,8 @@
 "\n"
 "This was a Google Summer of Code 2007 project."
 msgstr ""
-"Copyright (c) 2007 Calin Crisan <ccrisan@gmail.com> и команда разработчиков "
-"Audacious.\n"
+"Авторское право (c) 2007-2012 Calin Crisan <ccrisan@gmail.com> и команда "
+"разработчиков Audacious.\n"
 "\n"
 "Автор выражает благодарность разработчикам библиотеки libcdio <http://www."
 "gnu.org/software/libcdio/>\n"
@@ -859,136 +748,134 @@
 "\n"
 "Также спасибо тебе, Tony Vroon, за наставления.\n"
 "\n"
-"Этот модуль разработан в рамках проекта Google Summer of Code 2007.\n"
-"\n"
-"Copyright 2009 John Lindgren"
+"Этот модуль разработан в рамках проекта Google Summer of Code 2007."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:137
+#: src/cdaudio/cdaudio-ng.cc:140
 msgid "Device"
 msgstr "Устройство"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:138
+#: src/cdaudio/cdaudio-ng.cc:141
 msgid "Read speed:"
 msgstr "Скорость чтения:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:141
+#: src/cdaudio/cdaudio-ng.cc:144
 msgid "Override device:"
 msgstr "Переопределить устройство:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:143
+#: src/cdaudio/cdaudio-ng.cc:146
 msgid "Metadata"
 msgstr "Метаданные"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:144
+#: src/cdaudio/cdaudio-ng.cc:147
 msgid "Use CD-Text"
 msgstr "Использовать CD-Text"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:146
+#: src/cdaudio/cdaudio-ng.cc:150
 msgid "Use CDDB"
 msgstr "Использовать CDDB"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:148
+#: src/cdaudio/cdaudio-ng.cc:152
 msgid "Use HTTP instead of CDDBP"
 msgstr "Использовать HTTP вместо CDDBP"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:151
+#: src/cdaudio/cdaudio-ng.cc:155
 msgid "Server:"
 msgstr "Сервер:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:155
+#: src/cdaudio/cdaudio-ng.cc:159
 msgid "Path:"
 msgstr "Пусть:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:159
+#: src/cdaudio/cdaudio-ng.cc:163
 msgid "Port:"
 msgstr "Порт:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:246
+#: src/cdaudio/cdaudio-ng.cc:228
 msgid "Failed to initialize cdio subsystem."
 msgstr "Ошибка при инициализации CD."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:281
+#: src/cdaudio/cdaudio-ng.cc:260
 #, c-format
 msgid "Invalid URI %s."
-msgstr "Некорректный URI %s."
+msgstr "Неверный URI %s."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:283
+#: src/cdaudio/cdaudio-ng.cc:262
 #, c-format
 msgid "Track %d not found."
-msgstr "Трек %d не найден."
+msgstr "Дорожка %d не найдена."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:285
+#: src/cdaudio/cdaudio-ng.cc:264
 #, c-format
 msgid "Track %d is a data track."
 msgstr "Дорожка %d это данные дорожки."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:360
+#: src/cdaudio/cdaudio-ng.cc:339
 msgid "Error reading audio CD."
-msgstr "Ошибка чтения Аудио CD"
+msgstr "Ошибка чтения аудио-CD."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:429
+#: src/cdaudio/cdaudio-ng.cc:410
 msgid "Audio CD"
-msgstr "Audio CD"
+msgstr "Аудио-CD"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:460 src/cdaudio-ng/cdaudio-ng.cc:469
+#: src/cdaudio/cdaudio-ng.cc:446 src/cdaudio/cdaudio-ng.cc:455
 #, c-format
 msgid "Failed to open CD device %s."
 msgstr "Не удалось открыть устройство CD %s."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:472
+#: src/cdaudio/cdaudio-ng.cc:458
 msgid "No audio capable CD drive found."
 msgstr "Не найдено совместимого CD-устройства."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:497
+#: src/cdaudio/cdaudio-ng.cc:481
+msgid "Drive is empty."
+msgstr "Привод пуст."
+
+#: src/cdaudio/cdaudio-ng.cc:483
+msgid "Unsupported disk type."
+msgstr "Неподдерживаемый тип диска."
+
+#: src/cdaudio/cdaudio-ng.cc:507
 msgid "Failed to finish initializing opened CD drive."
-msgstr "Ошибка при инициализации CD."
+msgstr "Ошибка при инициализации открытого CD-устройства."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:510
+#: src/cdaudio/cdaudio-ng.cc:520
 msgid "Failed to retrieve first/last track number."
-msgstr "Failed to retrieve first/last track number."
+msgstr "Не удалось получить номер первой/последней дорожки."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:531
+#: src/cdaudio/cdaudio-ng.cc:541
 #, c-format
 msgid "Cannot read start/end LSN for track %d."
 msgstr "Невозможно считать начало/конец LSN для трека %d."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:613
-msgid "Failed to create the cddb connection."
-msgstr "Не удалось создать cddb соеденения."
+#: src/cdaudio/cdaudio-ng.cc:624
+msgid "Failed to create the CDDB connection."
+msgstr "Не удалось создать соединение CDDB."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:679
+#: src/cdaudio/cdaudio-ng.cc:690
 msgid "Failed to query the CDDB server"
-msgstr "Не удалось выполнить запрос к базе CDDB сервера"
+msgstr "Не удалось выполнить запрос к базе сервера CDDB"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:681
+#: src/cdaudio/cdaudio-ng.cc:692
 #, c-format
 msgid "Failed to query the CDDB server: %s"
-msgstr "Не удалось выполнить запрос к базе CDDB сервера: %s"
+msgstr "Не удалось выполнить запрос к базе сервера CDDB: %s"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:705
+#: src/cdaudio/cdaudio-ng.cc:716
 #, c-format
-msgid "Failed to read the cddb info: %s"
-msgstr "Не удалось прочитать cddb информацию: %s"
-
-#: src/cdaudio-ng/cdaudio-ng.cc:765
-msgid "Drive is empty."
-msgstr "Привод пуст."
+msgid "Failed to read the CDDB info: %s"
+msgstr "Не удалось прочитать информацию CDDB: %s"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:767
-msgid "Unsupported disk type."
-msgstr "Неподдерживаемый тип диска."
-
-#: src/cd-menu-items/cd-menu-items.cc:35
+#: src/cd-menu-items/cd-menu-items.cc:33
 msgid "Audio CD Menu Items"
-msgstr "Пункты меню Audio CD"
+msgstr "Пункты меню аудио-CD"
 
-#: src/cd-menu-items/cd-menu-items.cc:47
-msgid "Play CD"
-msgstr "Воспроизвести CD-диск"
-
-#: src/cd-menu-items/cd-menu-items.cc:47
-msgid "Add CD"
-msgstr "Добавить CD-диск"
+#: src/cd-menu-items/cd-menu-items.cc:45
+msgid "Pla_y CD"
+msgstr "_Играть CD-диск"
+
+#: src/cd-menu-items/cd-menu-items.cc:45
+msgid "_Add CD"
+msgstr "_Добавить CD-диск"
 
 #: src/compressor/compressor.cc:45
 msgid "Compression"
@@ -1007,12 +894,12 @@
 "Dynamic Range Compression Plugin for Audacious\n"
 "Copyright 2010-2014 John Lindgren"
 msgstr ""
-"Надстройка сжатия динамического диапазона для Audacious\n"
+"Модуль сжатия динамического диапазона для Audacious\n"
 "Авторское право 2010-2014 John Lindgren"
 
 #: src/compressor/compressor.cc:64
 msgid "Dynamic Range Compressor"
-msgstr "Компрессор широкого диапозона"
+msgstr "Компрессор широкого диапазона"
 
 #: src/console/plugin.cc:15
 msgid ""
@@ -1023,12 +910,12 @@
 "William Pitcock <nenolod@dereferenced.org>\n"
 "Shay Green <gblargg@gmail.com>"
 msgstr ""
-"Модуль поддержки звука игровых консолей основан на движке Game_Music_Emu "
-"0.5.2\n"
+"Декодер звука игровых консолей, основанный на движке 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"
+"\n"
+"Модуль для Audacious написан:\n"
+"William Pitcock <nenolod@dereferenced.org>\n"
 "Shay Green <gblargg@gmail.com>"
 
 #: src/console/plugin.cc:30
@@ -1041,19 +928,26 @@
 
 #: src/console/plugin.cc:36
 msgid "Echo:"
-msgstr "Эхо"
+msgstr "Эхо:"
 
 #: src/console/plugin.cc:39
 msgid "Default song length:"
 msgstr "Длительность композиции по умолчанию:"
 
-#: src/console/plugin.cc:42 src/modplug/plugin_main.cc:59
+#: src/console/plugin.cc:41 src/crossfade/crossfade.cc:56
+#: src/crossfade/crossfade.cc:62 src/lirc/lirc.cc:395 src/notify/notify.cc:113
+#: src/sid/xs_config.cc:85 src/sid/xs_config.cc:94 src/sid/xs_config.cc:103
+#: src/vumeter-qt/vumeter_qt.cc:39
+msgid "seconds"
+msgstr "секунд"
+
+#: src/console/plugin.cc:42 src/modplug/plugin_main.cc:58
 msgid "Resampling"
 msgstr "Передискретизация"
 
 #: src/console/plugin.cc:43
 msgid "Enable audio resampling"
-msgstr "Включить преобразование"
+msgstr "Включить передискретизацию аудио"
 
 #: src/console/plugin.cc:49
 msgid "SPC"
@@ -1061,7 +955,7 @@
 
 #: src/console/plugin.cc:50
 msgid "Ignore length from SPC tags"
-msgstr "Игнорировать длительность из тегов SPC"
+msgstr "Игнорировать длительность из меток SPC"
 
 #: src/console/plugin.cc:52
 msgid "Increase reverb"
@@ -1071,149 +965,162 @@
 msgid "Game Console Music Decoder"
 msgstr "Декодер звука игровой консоли"
 
-#: src/coreaudio/coreaudio.cc:50
+#: src/coreaudio/coreaudio.cc:53
 msgid "CoreAudio output"
 msgstr "Выход CoreAudio"
 
-#: src/coreaudio/coreaudio.cc:131
+#: src/coreaudio/coreaudio.cc:155
 msgid ""
 "CoreAudio Output Plugin for Audacious\n"
 "Copyright 2014 William Pitcock\n"
+"Copyright 2017,18 René J.V. Bertin\n"
+" (original code and code adapted from\n"
+" Apple examples, (C) Apple 2013)\n"
 "\n"
 "Based on SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
 msgstr ""
-"Плагин вывода CoreAudio для Audacious\n"
+"Модуль Вывода CoreAudio для Audacious\n"
 "Copyright 2014 William Pitcock\n"
+"Copyright 2017,18 René J.V. Bertin\n"
+" (оригинальный код и код, адаптированный из\n"
+" примеров Apple, (C) Apple 2013)\n"
 "\n"
-"Основан на плагине вывода SDL для Audacious\n"
+"Основан на Модуле Вывода SDL для Audacious\n"
 "Copyright 2010 John Lindgren"
 
-#: src/coreaudio/coreaudio.cc:143
+#: src/coreaudio/coreaudio.cc:171
 msgid "Use exclusive mode"
 msgstr "Эксклюзивный режим"
 
-#: src/crossfade/crossfade.cc:44
+#: src/coreaudio/coreaudio.cc:173
+msgid "Use bit perfect audio (adapt device sampling rate)"
+msgstr ""
+"Использовать улучшение звука (адаптация частоты дискретизации устройства)"
+
+#: src/crossfade/crossfade.cc:47
 msgid ""
 "Crossfade Plugin for Audacious\n"
 "Copyright 2010-2014 John Lindgren"
 msgstr ""
+"Модуль перекрёстного затухания для Audacious\n"
+"Copyright 2010-2014 John Lindgren"
 
-#: src/crossfade/crossfade.cc:48
+#: src/crossfade/crossfade.cc:51
 msgid "Crossfade"
-msgstr "Плавный переход"
+msgstr "Перекрёстное затухание"
 
-#: src/crossfade/crossfade.cc:49
+#: src/crossfade/crossfade.cc:52
 msgid "On automatic song change"
 msgstr "При автоматической смене композиции"
 
-#: src/crossfade/crossfade.cc:51 src/crossfade/crossfade.cc:57
+#: src/crossfade/crossfade.cc:54 src/crossfade/crossfade.cc:60
 msgid "Overlap:"
 msgstr "Перекрытие:"
 
-#: src/crossfade/crossfade.cc:55
+#: src/crossfade/crossfade.cc:58
 msgid "On seek or manual song change"
 msgstr "При поиске или самостоятельной смене композиции"
 
-#: src/crossfade/crossfade.cc:61
+#: src/crossfade/crossfade.cc:64
+msgid "No fade in"
+msgstr "Без нарастания"
+
+#: src/crossfade/crossfade.cc:66
+msgid "Use S-curve fade"
+msgstr "Использовать S-образное затухание"
+
+#: src/crossfade/crossfade.cc:68
+msgid "S-curve steepness:"
+msgstr "Крутизна S-образной кривой:"
+
+#: src/crossfade/crossfade.cc:70
+msgid "(higher is steeper)"
+msgstr "(выше — круче)"
+
+#: src/crossfade/crossfade.cc:72
 msgid "Tip"
 msgstr "Совет"
 
-#: src/crossfade/crossfade.cc:62
+#: src/crossfade/crossfade.cc:73
 msgid ""
 "For better crossfading, enable\n"
 "the Silence Removal effect."
 msgstr ""
+"Для лучшего перекрёстного затухания\n"
+"включите эффект удаления тишины."
 
-#: src/crossfade/crossfade.cc:72
+#: src/crossfade/crossfade.cc:83
 msgid "Crossfade"
-msgstr "Плавный переход"
-
-#: src/crossfade/crossfade.cc:161
-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.cc:168
-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/crystalizer/crystalizer.cc:31
 msgid "Crystalizer"
-msgstr "Кристализатор"
+msgstr "Кристаллизатор"
 
 #: src/crystalizer/crystalizer.cc:32 src/stereo_plugin/stereo.cc:45
 msgid "Intensity:"
-msgstr "Интенсивность:"
+msgstr "Выраженность:"
 
 #: src/crystalizer/crystalizer.cc:43
 msgid "Crystalizer"
-msgstr "Кристализатор"
+msgstr "Кристаллизатор"
 
-#: src/cue/cue.cc:37
+#: src/cue/cue.cc:42
 msgid "Cue Sheet Plugin"
-msgstr "Плагин Cue листов"
+msgstr "Модуль файлов разметки Cue Sheet"
 
-#: src/delete-files/delete-files.cc:46 src/delete-files/delete-files.cc:146
+#: src/delete-files/delete-files.cc:53 src/delete-files/delete-files.cc:215
+#: src/delete-files/delete-files.cc:230
 msgid "Delete Files"
-msgstr "Удалить файлы"
+msgstr "Удаление файлов"
 
-#: src/delete-files/delete-files.cc:75
+#: src/delete-files/delete-files.cc:120
+msgid "No files are selected."
+msgstr "Файлы не выбраны."
+
+#: src/delete-files/delete-files.cc:125
 #, c-format
-msgid "Error moving %s to trash: %s."
-msgstr "Ошибка при перемещении %s в корзину: %s."
+msgid "Do you want to move %s to the trash?"
+msgstr "Вы хотите переместить %s в корзину?"
 
-#: src/delete-files/delete-files.cc:86
+#: src/delete-files/delete-files.cc:126
 #, c-format
-msgid "Error deleting %s: %s."
-msgstr "ошибка удаления %s: %s"
+msgid "Do you want to permanently delete %s?"
+msgstr "Вы хотите удалить навсегда %s?"
 
-#: src/delete-files/delete-files.cc:117
+#: src/delete-files/delete-files.cc:133
 #, c-format
-msgid "Error deleting %s: not a local file."
-msgstr "Ошибка удаления %s: это не локальный файл."
+msgid "Do you want to move %d files to the trash?"
+msgstr "Вы хотите переместить %d файлы в корзину?"
 
 #: src/delete-files/delete-files.cc:134
-msgid "Do you want to move the selected files to the trash?"
-msgstr "Вы хотите удалить выбранные файлы в корзину?"
+#, c-format
+msgid "Do you want to permanently delete %d files?"
+msgstr "Вы хотите удалить файлы %d навсегда?"
 
-#: src/delete-files/delete-files.cc:135
-msgid "Move to Trash"
-msgstr "Удалить в Корзину"
-
-#: src/delete-files/delete-files.cc:140
-msgid "Do you want to permanently delete the selected files?"
-msgstr "Вы хотите удалить без восстановления выбранные файлы”?"
+#: src/delete-files/delete-files.cc:146
+msgid "Move to trash"
+msgstr "Переместить в корзину"
 
-#: src/delete-files/delete-files.cc:141 src/skins/preset-list.cc:411
-#: src/skins/preset-list.cc:427
+#: src/delete-files/delete-files.cc:146
 msgid "Delete"
 msgstr "Удалить"
 
-#: src/delete-files/delete-files.cc:145 src/skins/preset-browser.cc:56
-#: src/skins/preset-list.cc:307 src/skins/ui_playlist.cc:221
+#: src/delete-files/delete-files.cc:213 src/delete-files/delete-files.cc:235
+#: src/skins-qt/search-select.cc:102 src/skins/search-select.cc:78
 msgid "Cancel"
 msgstr "Отмена"
 
-#: src/delete-files/delete-files.cc:166
+#: src/delete-files/delete-files.cc:267
 msgid "Delete Selected Files"
 msgstr "Удалить выбранный файлы"
 
-#: src/delete-files/delete-files.cc:181
+#: src/delete-files/delete-files.cc:287
 msgid "Delete Method"
-msgstr "Метод Удаления"
+msgstr "Способ удаления"
 
-#: src/delete-files/delete-files.cc:182
+#: src/delete-files/delete-files.cc:288
 msgid "Move to trash instead of deleting immediately"
 msgstr "Перемещать в корзину вместо немедленного удаления"
 
@@ -1224,18 +1131,22 @@
 "Surround echo by Carl van Schaik, 1999\n"
 "Updated for Audacious by William Pitcock and John Lindgren, 2010-2014"
 msgstr ""
+"Модуль эха\n"
+"От Johan Levin, 1999\n"
+"Эхо окружения от Carl van Schaik, 1999\n"
+"Обновлено для Audacious William Pitcock и John Lindgren, 2010-2014"
 
 #: src/echo_plugin/echo.cc:21
 msgid "Echo"
 msgstr "Эхо"
 
-#: src/echo_plugin/echo.cc:22 src/modplug/plugin_main.cc:73
-#: src/modplug/plugin_main.cc:83
+#: src/echo_plugin/echo.cc:22 src/modplug/plugin_main.cc:72
+#: src/modplug/plugin_main.cc:82
 msgid "Delay:"
 msgstr "Задержка:"
 
-#: src/echo_plugin/echo.cc:24 src/modplug/plugin_main.cc:73
-#: src/modplug/plugin_main.cc:83
+#: src/echo_plugin/echo.cc:24 src/modplug/plugin_main.cc:72
+#: src/modplug/plugin_main.cc:82 src/xsf/plugin.cc:445
 msgid "ms"
 msgstr "мс"
 
@@ -1243,7 +1154,7 @@
 msgid "Feedback:"
 msgstr "Обратная связь:"
 
-#: src/echo_plugin/echo.cc:28 src/modplug/plugin_main.cc:87
+#: src/echo_plugin/echo.cc:28 src/modplug/plugin_main.cc:86
 msgid "Volume:"
 msgstr "Громкость:"
 
@@ -1251,11 +1162,11 @@
 msgid "Echo"
 msgstr "Эхо"
 
-#: src/ffaudio/ffaudio-core.cc:41
+#: src/ffaudio/ffaudio-core.cc:50
 msgid "FFmpeg Plugin"
-msgstr "Плагин FFmpeg"
+msgstr "Модуль FFmpeg"
 
-#: src/ffaudio/ffaudio-core.cc:571
+#: src/ffaudio/ffaudio-core.cc:649
 msgid ""
 "Multi-format audio decoding plugin for Audacious using\n"
 "FFmpeg multimedia framework (http://www.ffmpeg.org/)\n"
@@ -1264,264 +1175,334 @@
 "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"
+"Модуль мультиформатного звукового декодера для 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>"
+"Авторы модуля для Audacious:\n"
+"William Pitcock <nenolod@nenolod.net>\n"
+"Matti Hämäläinen <ccr@tnsp.org>"
 
-#: src/filewriter/filewriter.cc:45
+#: src/filewriter/filewriter.cc:48
 msgid "FileWriter Plugin"
-msgstr "Плагин записи в файл"
+msgstr "Модуль записи в файл"
+
+#: src/filewriter/filewriter.cc:316
+#, c-format
+msgid ""
+"Error opening %s:\n"
+"%s"
+msgstr ""
+"Ошибка открытия %s:\n"
+"%s"
+
+#: src/filewriter/filewriter.cc:358
+msgid ""
+"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 ""
+"Это свободное приложение; вы можете повторно распространять его и/или "
+"изменять его в соответствии с условиями 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, США."
 
-#: src/filewriter/filewriter.cc:386
+#: src/filewriter/filewriter.cc:385
 msgid "Output file format:"
 msgstr "Формат записываемого файла:"
 
-#: src/filewriter/filewriter.cc:403
-msgid "Configure"
-msgstr "Настройка"
-
-#: src/filewriter/filewriter.cc:413
+#: src/filewriter/filewriter.cc:389
 msgid "Save into original directory"
 msgstr "Сохранить в тот же каталог"
 
-#: src/filewriter/filewriter.cc:417
-msgid "Save into custom directory"
-msgstr "Сохранить в другой каталог"
-
-#: src/filewriter/filewriter.cc:427
-msgid "Output file folder:"
-msgstr "Каталог для записываемых файлов:"
+#: src/filewriter/filewriter.cc:392
+msgid "Save into custom directory:"
+msgstr "Сохранить в другую папку:"
 
-#: src/filewriter/filewriter.cc:431
-msgid "Pick a folder"
-msgstr "Выбор каталога"
-
-#: src/filewriter/filewriter.cc:444
+#: src/filewriter/filewriter.cc:400
 msgid "Generate file name from:"
 msgstr "Создавать имя файла из:"
 
-#: src/filewriter/filewriter.cc:448
-msgid "Original file tag"
-msgstr "Метка исходного файла"
-
-#: src/filewriter/filewriter.cc:453
+#: src/filewriter/filewriter.cc:401
 msgid "Original file name"
 msgstr "Исходное имя файла"
 
-#: src/filewriter/filewriter.cc:459
-msgid "Include original file name extension"
-msgstr "Добавлять расширение к исходному имени файла"
+#: src/filewriter/filewriter.cc:404
+msgid "Original file name (no suffix)"
+msgstr "Исходное имя файла (без суффикса)"
+
+#: src/filewriter/filewriter.cc:407
+msgid "Original file tag"
+msgstr "Метка исходного файла"
 
-#: src/filewriter/filewriter.cc:468
+#: src/filewriter/filewriter.cc:411
 msgid "Prepend track number to file name"
 msgstr "Добавить в начало названия файла номер дорожки"
 
-#: src/filewriter/filewriter.cc:484
-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 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/mp3.cc:40 src/filewriter/mp3.cc:717
+#: src/filewriter/filewriter.cc:417 src/filewriter/filewriter.cc:449
 msgid "Auto"
 msgstr "Автоматически"
 
-#: src/filewriter/mp3.cc:40
+#: src/filewriter/filewriter.cc:418
+msgid "8000 Hz"
+msgstr "8000 Гц"
+
+#: src/filewriter/filewriter.cc:419
+msgid "11025 Hz"
+msgstr "11025 Гц"
+
+#: src/filewriter/filewriter.cc:420
+msgid "12000 Hz"
+msgstr "12000 Гц"
+
+#: src/filewriter/filewriter.cc:421
+msgid "16000 Hz"
+msgstr "16000 Гц"
+
+#: src/filewriter/filewriter.cc:422
+msgid "22050 Hz"
+msgstr "22050 Гц"
+
+#: src/filewriter/filewriter.cc:423
+msgid "24000 Hz"
+msgstr "24000 Гц"
+
+#: src/filewriter/filewriter.cc:424
+msgid "32000 Hz"
+msgstr "32000 Гц"
+
+#: src/filewriter/filewriter.cc:425 src/xsf/plugin.cc:430
+msgid "44100 Hz"
+msgstr "44100 Гц"
+
+#: src/filewriter/filewriter.cc:426 src/xsf/plugin.cc:431
+msgid "48000 Hz"
+msgstr "48000 Гц"
+
+#: src/filewriter/filewriter.cc:430
+msgid "8 kbit/s"
+msgstr "8 кбит/с"
+
+#: src/filewriter/filewriter.cc:431
+msgid "16 kbit/s"
+msgstr "16 кбит/с"
+
+#: src/filewriter/filewriter.cc:432
+msgid "32 kbit/s"
+msgstr "32 кбит/с"
+
+#: src/filewriter/filewriter.cc:433
+msgid "40 kbit/s"
+msgstr "40 кбит/с"
+
+#: src/filewriter/filewriter.cc:434
+msgid "48 kbit/s"
+msgstr "48 кбит/с"
+
+#: src/filewriter/filewriter.cc:435
+msgid "56 kbit/s"
+msgstr "56 кбит/с"
+
+#: src/filewriter/filewriter.cc:436
+msgid "64 kbit/s"
+msgstr "64 кбит/с"
+
+#: src/filewriter/filewriter.cc:437
+msgid "80 kbit/s"
+msgstr "80 кбит/с"
+
+#: src/filewriter/filewriter.cc:438
+msgid "96 kbit/s"
+msgstr "96 кбит/с"
+
+#: src/filewriter/filewriter.cc:439
+msgid "112 kbit/s"
+msgstr "112 кбит/с"
+
+#: src/filewriter/filewriter.cc:440
+msgid "128 kbit/s"
+msgstr "128 кбит/с"
+
+#: src/filewriter/filewriter.cc:441
+msgid "160 kbit/s"
+msgstr "160 кбит/с"
+
+#: src/filewriter/filewriter.cc:442
+msgid "192 kbit/s"
+msgstr "192 кбит/с"
+
+#: src/filewriter/filewriter.cc:443
+msgid "224 kbit/s"
+msgstr "224 кбит/с"
+
+#: src/filewriter/filewriter.cc:444
+msgid "256 kbit/s"
+msgstr "256 кбит/с"
+
+#: src/filewriter/filewriter.cc:445
+msgid "320 kbit/s"
+msgstr "320 кбит/с"
+
+#: src/filewriter/filewriter.cc:450
 msgid "Joint Stereo"
 msgstr "Объединённое стерео"
 
-#: src/filewriter/mp3.cc:41 src/modplug/plugin_main.cc:58
-#: src/mpg123/mpg123.cc:248
+#: src/filewriter/filewriter.cc:451 src/modplug/plugin_main.cc:57
+#: src/mpg123/mpg123.cc:259
 msgid "Stereo"
 msgstr "Стерео"
 
-#: src/filewriter/mp3.cc:41 src/modplug/plugin_main.cc:57
-#: src/mpg123/mpg123.cc:248
+#: src/filewriter/filewriter.cc:452 src/modplug/plugin_main.cc:56
+#: src/mpg123/mpg123.cc:260
 msgid "Mono"
 msgstr "Моно"
 
-#: src/filewriter/mp3.cc:657
-msgid "MP3 Configuration"
-msgstr "Параметры MP3"
-
-#: src/filewriter/mp3.cc:658
-msgid "_OK"
-msgstr "_ОК"
+#: src/filewriter/filewriter.cc:456
+msgid "VBR"
+msgstr "VBR"
+
+#: src/filewriter/filewriter.cc:457
+msgid "ABR"
+msgstr "ABR"
 
-#: src/filewriter/mp3.cc:681
-msgid "Algorithm Quality:"
+#: src/filewriter/filewriter.cc:478
+msgid "Algorithm quality:"
 msgstr "Качество алгоритма:"
 
-#: src/filewriter/mp3.cc:706
-msgid "Output Sample Rate:"
-msgstr "Частота дискретизации на выходе:"
-
-#: src/filewriter/mp3.cc:733
-msgid "(Hz)"
-msgstr "(Гц)"
-
-#: src/filewriter/mp3.cc:740
-msgid "Bitrate / Compression Ratio:"
-msgstr "Качество звука и степень сжатия:"
-
-#: src/filewriter/mp3.cc:764
-msgid "Bitrate (kbps):"
-msgstr "Битрейт (кб/с)"
+#: src/filewriter/filewriter.cc:484
+msgid "Bitrate:"
+msgstr "Битрейт:"
 
-#: src/filewriter/mp3.cc:796
+#: src/filewriter/filewriter.cc:491
 msgid "Compression ratio:"
 msgstr "Степень сжатия:"
 
-#: src/filewriter/mp3.cc:820
-msgid "Audio Mode:"
-msgstr "Аудио режим:"
-
-#: src/filewriter/mp3.cc:845
-msgid "Miscellaneous:"
-msgstr "Прочее:"
+#: src/filewriter/filewriter.cc:498
+msgid "Audio mode:"
+msgstr "Режим звука:"
 
-#: src/filewriter/mp3.cc:856
+#: src/filewriter/filewriter.cc:501
 msgid "Enforce strict ISO compliance"
 msgstr "Строгое соответствие ISO"
 
-#: src/filewriter/mp3.cc:867
+#: src/filewriter/filewriter.cc:503
 msgid "Error protection"
 msgstr "Защита от ошибок"
 
-#: src/filewriter/mp3.cc:879 src/filewriter/vorbis.cc:206
-msgid "Quality"
-msgstr "Качество"
-
-#: src/filewriter/mp3.cc:888
+#: src/filewriter/filewriter.cc:508
 msgid "Enable VBR/ABR"
 msgstr "Включить VBR/ABR"
 
-#: src/filewriter/mp3.cc:898
+#: src/filewriter/filewriter.cc:510
 msgid "Type:"
 msgstr "Тип:"
 
-#: src/filewriter/mp3.cc:931
-msgid "VBR Options:"
-msgstr "Параметры VBR:"
-
-#: src/filewriter/mp3.cc:947
-msgid "Minimum bitrate (kbps):"
-msgstr "Минимальный битрейт (кб/с):"
-
-#: src/filewriter/mp3.cc:973
-msgid "Maximum bitrate (kbps):"
-msgstr "Максимальный битрейт (кб/с):"
+#: src/filewriter/filewriter.cc:514
+msgid "Minimum bitrate:"
+msgstr "Минимальный битрейт:"
+
+#: src/filewriter/filewriter.cc:518
+msgid "Maximum bitrate:"
+msgstr "Максимальный битрейт:"
+
+#: src/filewriter/filewriter.cc:522
+msgid "Average bitrate:"
+msgstr "Средний битрейт:"
 
-#: src/filewriter/mp3.cc:995
-msgid "Strictly enforce minimum bitrate"
-msgstr "Строгое соблюдение минимального битрейта"
-
-#: src/filewriter/mp3.cc:1007
-msgid "ABR Options:"
-msgstr "Параметры ABR:"
-
-#: src/filewriter/mp3.cc:1017
-msgid "Average bitrate (kbps):"
-msgstr "Средний битрейт (кбит/с):"
-
-#: src/filewriter/mp3.cc:1044
+#: src/filewriter/filewriter.cc:526
 msgid "VBR quality level:"
 msgstr "Уровень качества VBR:"
 
-#: src/filewriter/mp3.cc:1063
-msgid "Omit Xing VBR header"
-msgstr ""
+#: src/filewriter/filewriter.cc:530
+msgid "Strictly enforce minimum bitrate"
+msgstr "Строгое соблюдение минимального битрейта"
 
-#: src/filewriter/mp3.cc:1076
-msgid "VBR/ABR"
-msgstr "VBR/ABR"
+#: src/filewriter/filewriter.cc:533
+msgid "Omit Xing VBR header"
+msgstr "Пропускать заголовок Xing VBR"
 
-#: src/filewriter/mp3.cc:1085
-msgid "Frame Parameters:"
-msgstr "Параметры кадра:"
+#: src/filewriter/filewriter.cc:539
+msgid "Frame Headers"
+msgstr "Заголовки кадра"
 
-#: src/filewriter/mp3.cc:1097
+#: src/filewriter/filewriter.cc:540
 msgid "Mark as copyright"
 msgstr "Пометить как защищённое авторским правом"
 
-#: src/filewriter/mp3.cc:1108
+#: src/filewriter/filewriter.cc:542
 msgid "Mark as original"
 msgstr "Пометить как оригинальное"
 
-#: src/filewriter/mp3.cc:1120
-msgid "ID3 Parameters:"
-msgstr "Параметры ID3:"
+#: src/filewriter/filewriter.cc:544
+msgid "ID3 Tags"
+msgstr "Метки ID3"
 
-#: src/filewriter/mp3.cc:1131
+#: src/filewriter/filewriter.cc:545
 msgid "Force addition of version 2 tag"
-msgstr "Принудительное добавление тегов 2-й версии"
+msgstr "Принудительное добавление меток 2-й версии"
 
-#: src/filewriter/mp3.cc:1141
+#: src/filewriter/filewriter.cc:547
 msgid "Only add v1 tag"
-msgstr "Только 1-я версия тегов"
+msgstr "Только 1-я версия меток"
 
-#: src/filewriter/mp3.cc:1148
+#: src/filewriter/filewriter.cc:549
 msgid "Only add v2 tag"
-msgstr "Только 2-я версия тегов"
+msgstr "Только 2-я версия меток"
+
+#: src/filewriter/filewriter.cc:554
+msgid "Quality"
+msgstr "Качество"
 
-#: src/filewriter/mp3.cc:1169
+#: src/filewriter/filewriter.cc:555
+msgid "VBR/ABR"
+msgstr "VBR/ABR"
+
+#: src/filewriter/filewriter.cc:556
 msgid "Tags"
-msgstr "Теги"
+msgstr "Метки"
 
-#: src/filewriter/vorbis.cc:196
-msgid "Vorbis Encoder Configuration"
-msgstr "Настройка кодека Vorbis"
+#: src/filewriter/filewriter.cc:566
+msgid "Quality (0-1):"
+msgstr "Качество (0-1):"
 
-#: src/filewriter/vorbis.cc:219
-msgid "Quality level (0 - 10):"
-msgstr "Уровень качества (0 – 10):"
+#: src/filewriter/filewriter.cc:573 src/skins-qt/skins_cfg.cc:307
+#: src/skins/skins_cfg.cc:289
+msgid "General"
+msgstr "Основной"
 
-#: src/flacng/flacng.h:35
+#: src/flac/flacng.h:36
 msgid "FLAC Decoder"
 msgstr "Декодер FLAC"
 
-#: src/flacng/metadata.cc:351 src/wavpack/wavpack.cc:209
+#: src/flac/metadata.cc:296 src/wavpack/wavpack.cc:215
 msgid "lossless"
 msgstr "lossless"
 
-#: src/flacng/plugin.cc:169
+#: src/flac/plugin.cc:214
 msgid ""
 "Original code by\n"
 "Ralf Ertzinger <ralf@skytale.net>\n"
 "\n"
 "http://www.skytale.net/projects/bmp-flac2/"
 msgstr ""
-"Оригинальный код написал\n"
+"Исходный код написал\n"
 "Ralf Ertzinger <ralf@skytale.net>\n"
 "\n"
 "http://www.skytale.net/projects/bmp-flac2/"
@@ -1531,22 +1512,22 @@
 "GIO Plugin for Audacious\n"
 "Copyright 2009-2012 John Lindgren"
 msgstr ""
-"GIO Плагин для Audacious⏎\n"
-"Copyright 2009-2012 John Lindgren"
+"Модуль GIO для Audacious\n"
+"Авторское право 2009-2012 John Lindgren"
 
 #: src/gio/gio.cc:42
 msgid "GIO Plugin"
-msgstr "Плагин GIO"
+msgstr "Модуль GIO"
 
-#: src/gio/gio.cc:153
+#: src/gio/gio.cc:152
 msgid "Read-and-append mode not supported"
-msgstr ""
+msgstr "Режим чтения-и-добавления не поддерживается"
 
-#: src/gio/gio.cc:166
+#: src/gio/gio.cc:165
 msgid "Invalid open mode"
 msgstr "Недопустимый метод открытия"
 
-#: src/gl-spectrum/gl-spectrum.cc:51
+#: src/glspectrum/gl-spectrum.cc:52
 msgid ""
 "OpenGL Spectrum Analyzer for Audacious\n"
 "Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
@@ -1557,518 +1538,659 @@
 "\n"
 "License: GPLv2+"
 msgstr ""
-"OpenGL Spectrum Analyzer для Audacious\n"
-"Авторское право 2013 Christophe Budé, John Lindgren, и Carlo Bramini\n"
+"Анализатор спектра OpenGL для Audacious\n"
+"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
 "\n"
 "Основан на плагине для XMMS:\n"
-"Авторское право 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas "
-"Nilsson, и 4Front Technologies\n"
+"Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson, и "
+"4Front Technologies\n"
 "\n"
 "Лицензия: GPLv2+"
 
-#: src/gl-spectrum/gl-spectrum.cc:62
+#: src/glspectrum/gl-spectrum.cc:63 src/qtglspectrum/gl-spectrum.cc:53
 msgid "OpenGL Spectrum Analyzer"
-msgstr "OpenGL Спектральный Анализатор"
-
-#: src/gl-spectrum-qt/gl-spectrum.cc:41
-msgid ""
-"OpenGL Spectrum Analyzer for Audacious\n"
-"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
-"Copyright 2014 William Pitcock\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-qt/gl-spectrum.cc:53
-msgid "OpenGL Spectrum Analyzer (Qt)"
-msgstr "OpenGL Спектральный Анализатор (Qt)"
-
-#: src/gnomeshortcuts/gnomeshortcuts.cc:38
-msgid "GNOME Shortcuts"
-msgstr ""
-
-#: src/gnomeshortcuts/gnomeshortcuts.cc:54
-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 ""
+msgstr "Спектральный анализатор (OpenGL)"
 
-#: src/gtkui/columns.cc:35
-msgid "Entry number"
+#: src/gtkui/columns.cc:36 src/moonstone/playlist_model.cc:38
+#: src/qtui/playlist_model.cc:33
+msgid "Entry Number"
 msgstr "Номер записи"
 
-#: src/gtkui/columns.cc:36 src/playlist-manager/playlist-manager.cc:225
-#: src/qtui/playlist_model.cc:123
+#: src/gtkui/columns.cc:37 src/moonstone/playlist_model.cc:38
+#: src/moonstone/playlist_selection.cc:64
+#: src/playlist-manager/playlist-manager.cc:200
+#: src/playlist-manager-qt/playlist-manager-qt.cc:188
+#: src/qtui/playlist_model.cc:33 src/streamtuner/icecast-model.cc:120
+#: src/streamtuner/ihr-model.cc:159 src/streamtuner/shoutcast-model.cc:122
 msgid "Title"
 msgstr "Название"
 
-#: src/gtkui/columns.cc:37 src/qtui/playlist_model.cc:125
+#: src/gtkui/columns.cc:38 src/moonstone/playlist_model.cc:39
+#: src/qtui/playlist_model.cc:33
 msgid "Artist"
 msgstr "Исполнитель"
 
-#: src/gtkui/columns.cc:38
+#: src/gtkui/columns.cc:39 src/moonstone/playlist_model.cc:39
+#: src/qtui/playlist_model.cc:33
 msgid "Year"
 msgstr "Год"
 
-#: src/gtkui/columns.cc:39 src/qtui/playlist_model.cc:127
+#: src/gtkui/columns.cc:40 src/moonstone/playlist_model.cc:39
+#: src/qtui/playlist_model.cc:34
 msgid "Album"
 msgstr "Альбом"
 
-#: src/gtkui/columns.cc:40
-msgid "Album artist"
+#: src/gtkui/columns.cc:41 src/moonstone/playlist_model.cc:40
+#: src/qtui/playlist_model.cc:34
+msgid "Album Artist"
 msgstr "Исполнитель альбома"
 
-#: src/gtkui/columns.cc:41
+#: src/gtkui/columns.cc:42 src/moonstone/playlist_model.cc:40
+#: src/qtui/playlist_model.cc:34
 msgid "Track"
 msgstr "Дорожка"
 
-#: src/gtkui/columns.cc:42
+#: src/gtkui/columns.cc:43 src/moonstone/playlist_model.cc:40
+#: src/qtui/playlist_model.cc:34 src/streamtuner/icecast-model.cc:123
+#: src/streamtuner/shoutcast-model.cc:125
+#: src/streamtuner/shoutcast-model.cc:236
 msgid "Genre"
 msgstr "Жанр"
 
-#: src/gtkui/columns.cc:43
-msgid "Queue position"
-msgstr "Положение в очереди"
+#: src/gtkui/columns.cc:44 src/moonstone/playlist_model.cc:41
+#: src/qtui/playlist_model.cc:35
+msgid "Queue Position"
+msgstr "Позиция в очереди"
 
-#: src/gtkui/columns.cc:44
+#: src/gtkui/columns.cc:45 src/moonstone/playlist_model.cc:41
+#: src/qtui/playlist_model.cc:35
 msgid "Length"
 msgstr "Длительность"
 
-#: src/gtkui/columns.cc:45
-msgid "File path"
-msgstr "Путь к файлу"
-
-#: src/gtkui/columns.cc:47
-msgid "Custom title"
-msgstr "Задать название"
+#: src/gtkui/columns.cc:46 src/moonstone/playlist_model.cc:41
+#: src/qtui/playlist_model.cc:35
+msgid "File Path"
+msgstr "Путь файла"
+
+#: src/gtkui/columns.cc:47 src/moonstone/playlist_model.cc:42
+#: src/qtui/playlist_model.cc:35
+msgid "File Name"
+msgstr "Имя файла"
 
-#: src/gtkui/columns.cc:48
+#: src/gtkui/columns.cc:48 src/moonstone/playlist_model.cc:42
+#: src/qtui/playlist_model.cc:36
+msgid "Custom Title"
+msgstr "Пользовательский заголовок"
+
+#: src/gtkui/columns.cc:49 src/moonstone/playlist_model.cc:42
+#: src/qtui/playlist_model.cc:36 src/streamtuner/icecast-model.cc:129
+#: src/streamtuner/shoutcast-model.cc:134
 msgid "Bitrate"
 msgstr "Битрейт"
 
-#: src/gtkui/columns.cc:308
+#: src/gtkui/columns.cc:50 src/moonstone/playlist_model.cc:43
+#: src/qtui/playlist_model.cc:36
+msgid "Comment"
+msgstr "Комментарий"
+
+#: src/gtkui/columns.cc:51 src/qtui/playlist_model.cc:36
+msgid "Publisher"
+msgstr "Издатель"
+
+#: src/gtkui/columns.cc:52 src/qtui/playlist_model.cc:37
+msgid "Catalog Number"
+msgstr "Каталожный номер "
+
+#: src/gtkui/columns.cc:53 src/moonstone/playlist_model.cc:43
+#: src/qtui/playlist_model.cc:37
+msgid "Disc"
+msgstr "Диск"
+
+#: src/gtkui/columns.cc:325
 msgid "Available columns"
-msgstr "Доступные колонки"
+msgstr "Доступные столбцы"
 
-#: src/gtkui/columns.cc:334
+#: src/gtkui/columns.cc:351
 msgid "Displayed columns"
-msgstr "Показанные колонки"
+msgstr "Показанные столбцы"
 
-#: src/gtkui/layout.cc:72 src/search-tool/search-tool.cc:40
+#: src/gtkui/layout.cc:74 src/search-tool-qt/search-tool-qt.cc:58
+#: src/search-tool/search-tool.cc:49
 msgid "Search Tool"
 msgstr "Поиск"
 
-#: src/gtkui/layout.cc:167
+#: src/gtkui/layout.cc:170
 msgid "Dock at Left"
 msgstr "Прикрепить слева"
 
-#: src/gtkui/layout.cc:167
+#: src/gtkui/layout.cc:170
 msgid "Dock at Right"
 msgstr "Прикрепить справа"
 
-#: src/gtkui/layout.cc:168
+#: src/gtkui/layout.cc:171
 msgid "Dock at Top"
 msgstr "Прикрепить наверху"
 
-#: src/gtkui/layout.cc:168
+#: src/gtkui/layout.cc:171
 msgid "Dock at Bottom"
 msgstr "Прикрепить внизу"
 
-#: src/gtkui/layout.cc:168
+#: src/gtkui/layout.cc:171
 msgid "Undock"
 msgstr "Открепить"
 
-#: src/gtkui/layout.cc:168 src/ladspa/plugin.cc:531
+#: src/gtkui/layout.cc:171 src/ladspa/plugin.cc:540
 msgid "Disable"
 msgstr "Отключить"
 
-#: src/gtkui/menus.cc:126 src/qtui/main_window_actions.cc:93
-#: src/statusicon/statusicon.cc:276
+#: src/gtkui/menus.cc:79 src/qtui/menus.cc:107
+#: src/statusicon-qt/statusicon.cc:115 src/statusicon/statusicon.cc:286
 msgid "_Open Files ..."
-msgstr "_Открыть файлы ..."
+msgstr "_Открыть файлы..."
 
-#: src/gtkui/menus.cc:127
+#: src/gtkui/menus.cc:80 src/qtui/menus.cc:111
 msgid "Open _URL ..."
-msgstr "Открыть _URL ..."
+msgstr "Отк_рыть ссылку..."
 
-#: src/gtkui/menus.cc:128 src/qtui/main_window_actions.cc:95
+#: src/gtkui/menus.cc:81 src/qtui/menus.cc:113
 msgid "_Add Files ..."
-msgstr "_Добавить файлы ..."
+msgstr "_Добавить файлы..."
 
-#: src/gtkui/menus.cc:129
+#: src/gtkui/menus.cc:82 src/qtui/menus.cc:118
 msgid "Add U_RL ..."
-msgstr "Добавить U_RL ..."
+msgstr "Доба_вить ссылку..."
 
-#: src/gtkui/menus.cc:131
+#: src/gtkui/menus.cc:84 src/qtui/menus.cc:120
 msgid "Search _Library"
-msgstr "Поиск в библиотеке"
+msgstr "Поиск в фонотеке"
 
-#: src/gtkui/menus.cc:133 src/qtui/main_window_actions.cc:98
+#: src/gtkui/menus.cc:86 src/qtui/menus.cc:123
 msgid "A_bout ..."
-msgstr "О_ программе ..."
+msgstr "О _приложении..."
 
-#: src/gtkui/menus.cc:134 src/qtui/main_window_actions.cc:99
+#: src/gtkui/menus.cc:87 src/qtui/menus.cc:125
 msgid "_Settings ..."
-msgstr "_Настройки"
+msgstr "_Настройки..."
 
-#: src/gtkui/menus.cc:135 src/qtui/main_window_actions.cc:103
-#: src/statusicon/statusicon.cc:284
+#: src/gtkui/menus.cc:88 src/qtui/menus.cc:131
+#: src/statusicon-qt/statusicon.cc:117 src/statusicon/statusicon.cc:288
 msgid "_Quit"
 msgstr "_Выход"
 
-#: src/gtkui/menus.cc:139 src/gtkui/menus.cc:262
-#: src/qtui/main_window_actions.cc:107 src/search-tool/search-tool.cc:641
-#: src/statusicon/statusicon.cc:278
+#: src/gtkui/menus.cc:92 src/gtkui/menus.cc:226
+#: src/moonstone/playlist_tabs.cc:306 src/qtui/menus.cc:135
+#: src/qtui/playlist_tabs.cc:331 src/search-tool-qt/search-tool-qt.cc:499
+#: src/search-tool/search-tool.cc:339 src/statusicon-qt/statusicon.cc:109
+#: src/statusicon/statusicon.cc:280
 msgid "_Play"
-msgstr "_Воспроизведение"
+msgstr "_Играть"
 
-#: src/gtkui/menus.cc:140 src/qtui/main_window_actions.cc:108
-#: src/statusicon/statusicon.cc:279
+#: src/gtkui/menus.cc:93 src/qtui/menus.cc:137
+#: src/statusicon-qt/statusicon.cc:110 src/statusicon/statusicon.cc:281
 msgid "Paus_e"
 msgstr "Пауз_а"
 
-#: src/gtkui/menus.cc:141 src/qtui/main_window_actions.cc:109
-#: src/statusicon/statusicon.cc:280
+#: src/gtkui/menus.cc:94 src/qtui/menus.cc:139
+#: src/statusicon-qt/statusicon.cc:111 src/statusicon/statusicon.cc:282
 msgid "_Stop"
 msgstr "_Стоп"
 
-#: src/gtkui/menus.cc:142 src/qtui/main_window_actions.cc:110
-#: src/statusicon/statusicon.cc:277
+#: src/gtkui/menus.cc:95 src/qtui/menus.cc:141
+#: src/statusicon-qt/statusicon.cc:112 src/statusicon/statusicon.cc:283
 msgid "Pre_vious"
 msgstr "Пре_дыдущий"
 
-#: src/gtkui/menus.cc:143 src/qtui/main_window_actions.cc:111
-#: src/statusicon/statusicon.cc:281
+#: src/gtkui/menus.cc:96 src/qtui/menus.cc:143
+#: src/statusicon-qt/statusicon.cc:113 src/statusicon/statusicon.cc:284
 msgid "_Next"
 msgstr "_Следующий"
 
-#: src/gtkui/menus.cc:145 src/qtui/main_window_actions.cc:113
+#: src/gtkui/menus.cc:97 src/qtui/menus.cc:145 src/skins/menus.cc:114
+#: src/skins-qt/menus.cc:105
+msgid "Previous Album"
+msgstr "Предыдущий альбом"
+
+#: src/gtkui/menus.cc:98 src/qtui/menus.cc:146 src/skins/menus.cc:115
+#: src/skins-qt/menus.cc:106
+msgid "Next Album"
+msgstr "Следующий альбом"
+
+#: src/gtkui/menus.cc:100 src/qtui/menus.cc:148
 msgid "_Repeat"
 msgstr "_Повтор"
 
-#: src/gtkui/menus.cc:146 src/qtui/main_window_actions.cc:114
+#: src/gtkui/menus.cc:101 src/qtui/menus.cc:150
 msgid "S_huffle"
 msgstr "В_разброс"
 
-#: src/gtkui/menus.cc:147 src/qtui/main_window_actions.cc:115
+#: src/gtkui/menus.cc:102 src/qtui/menus.cc:152
+msgid "Shuffle by Albu_m"
+msgstr "Вразброс по альбо_мам"
+
+#: src/gtkui/menus.cc:103 src/qtui/menus.cc:155
 msgid "N_o Playlist Advance"
 msgstr "Н_е передвигаться по списку"
 
-#: src/gtkui/menus.cc:148 src/qtui/main_window_actions.cc:116
+#: src/gtkui/menus.cc:104 src/qtui/menus.cc:157
 msgid "Stop A_fter This Song"
-msgstr "Остановка после этой песни"
+msgstr "Остановка после _этой песни"
 
-#: src/gtkui/menus.cc:150 src/gtkui/menus.cc:247
-#: src/qtui/main_window_actions.cc:118
+#: src/gtkui/menus.cc:106 src/gtkui/menus.cc:210 src/qtui/menus.cc:162
+#: src/qtui/menus.cc:294
 msgid "Song _Info ..."
-msgstr "Информация о _песне"
+msgstr "Сведения о _песне"
 
-#: src/gtkui/menus.cc:151
+#: src/gtkui/menus.cc:107
 msgid "Jump to _Time ..."
-msgstr "Перейти ко _времени ..."
+msgstr "Перейти ко _времени..."
 
-#: src/gtkui/menus.cc:152
+#: src/gtkui/menus.cc:108
 msgid "_Jump to Song ..."
-msgstr "_Перейти к песне ..."
+msgstr "_Перейти к песне..."
 
-#: src/gtkui/menus.cc:154
+#: src/gtkui/menus.cc:110 src/qtui/menus.cc:165
 msgid "Set Repeat Point _A"
-msgstr "Повтор установки _A"
+msgstr "Установить точку повтора _А"
 
-#: src/gtkui/menus.cc:155
+#: src/gtkui/menus.cc:111 src/qtui/menus.cc:167
 msgid "Set Repeat Point _B"
-msgstr "Повтор установки _B"
+msgstr "Установить точку повтора _Б"
 
-#: src/gtkui/menus.cc:156
+#: src/gtkui/menus.cc:112 src/qtui/menus.cc:169
 msgid "_Clear Repeat Points"
-msgstr "_Повтор чистых пунктов"
+msgstr "О_чистить точки повтора"
 
-#: src/gtkui/menus.cc:160 src/gtkui/menus.cc:167 src/gtkui/menus.cc:183
-#: src/qtui/main_window_actions.cc:122 src/qtui/main_window_actions.cc:129
-#: src/qtui/main_window_actions.cc:145
+#: src/gtkui/menus.cc:116 src/gtkui/menus.cc:123 src/gtkui/menus.cc:141
+#: src/qtui/menus.cc:173 src/qtui/menus.cc:180 src/qtui/menus.cc:198
 msgid "By _Title"
 msgstr "По _названию"
 
-#: src/gtkui/menus.cc:161 src/qtui/main_window_actions.cc:123
+#: src/gtkui/menus.cc:117 src/qtui/menus.cc:174
 msgid "By _File Name"
 msgstr "По _имени файла"
 
-#: src/gtkui/menus.cc:162 src/qtui/main_window_actions.cc:124
+#: src/gtkui/menus.cc:118 src/qtui/menus.cc:175
 msgid "By File _Path"
 msgstr "Путь к файлу"
 
-#: src/gtkui/menus.cc:166 src/gtkui/menus.cc:182
-#: src/qtui/main_window_actions.cc:128 src/qtui/main_window_actions.cc:144
+#: src/gtkui/menus.cc:122 src/gtkui/menus.cc:140 src/qtui/menus.cc:179
+#: src/qtui/menus.cc:197
 msgid "By Track _Number"
 msgstr "По _номеру трека"
 
-#: src/gtkui/menus.cc:168 src/gtkui/menus.cc:184
-#: src/qtui/main_window_actions.cc:130 src/qtui/main_window_actions.cc:146
+#: src/gtkui/menus.cc:124 src/gtkui/menus.cc:142 src/qtui/menus.cc:181
+#: src/qtui/menus.cc:199
 msgid "By _Artist"
 msgstr "По _исполнителю"
 
-#: src/gtkui/menus.cc:169 src/gtkui/menus.cc:185
-#: src/qtui/main_window_actions.cc:131 src/qtui/main_window_actions.cc:147
+#: src/gtkui/menus.cc:125 src/gtkui/menus.cc:143 src/qtui/menus.cc:182
+#: src/qtui/menus.cc:200
 msgid "By Al_bum"
-msgstr "По Альбому"
+msgstr "По альбому"
 
-#: src/gtkui/menus.cc:170 src/gtkui/menus.cc:186
-#: src/qtui/main_window_actions.cc:132 src/qtui/main_window_actions.cc:148
+#: src/gtkui/menus.cc:126 src/gtkui/menus.cc:144 src/qtui/menus.cc:183
+#: src/qtui/menus.cc:201
 msgid "By Albu_m Artist"
 msgstr "По исполнителю"
 
-#: src/gtkui/menus.cc:171 src/gtkui/menus.cc:187
-#: src/qtui/main_window_actions.cc:133 src/qtui/main_window_actions.cc:149
+#: src/gtkui/menus.cc:127 src/gtkui/menus.cc:145 src/qtui/menus.cc:184
+#: src/qtui/menus.cc:202
 msgid "By Release _Date"
-msgstr "По _дате выпуска"
+msgstr "По дате _выпуска"
 
-#: src/gtkui/menus.cc:172 src/gtkui/menus.cc:188
-#: src/qtui/main_window_actions.cc:134 src/qtui/main_window_actions.cc:150
+#: src/gtkui/menus.cc:128 src/gtkui/menus.cc:146 src/qtui/menus.cc:185
+#: src/qtui/menus.cc:203
 msgid "By _Genre"
 msgstr "По _жанру"
 
-#: src/gtkui/menus.cc:173 src/gtkui/menus.cc:189
-#: src/qtui/main_window_actions.cc:135 src/qtui/main_window_actions.cc:151
+#: src/gtkui/menus.cc:129 src/gtkui/menus.cc:147 src/qtui/menus.cc:186
+#: src/qtui/menus.cc:204
 msgid "By _Length"
-msgstr "По _Длинне"
+msgstr "По _длине"
 
-#: src/gtkui/menus.cc:174 src/gtkui/menus.cc:190
-#: src/qtui/main_window_actions.cc:136 src/qtui/main_window_actions.cc:152
+#: src/gtkui/menus.cc:130 src/gtkui/menus.cc:148 src/qtui/menus.cc:187
+#: src/qtui/menus.cc:205
 msgid "By _File Path"
 msgstr "По расположению _файла"
 
-#: src/gtkui/menus.cc:175 src/gtkui/menus.cc:191
-#: src/qtui/main_window_actions.cc:137 src/qtui/main_window_actions.cc:153
+#: src/gtkui/menus.cc:131 src/gtkui/menus.cc:149 src/qtui/menus.cc:188
+#: src/qtui/menus.cc:206
 msgid "By _Custom Title"
 msgstr "По _заданному названию файла"
 
-#: src/gtkui/menus.cc:177 src/gtkui/menus.cc:193
-#: src/qtui/main_window_actions.cc:139 src/qtui/main_window_actions.cc:155
+#: src/gtkui/menus.cc:132 src/gtkui/menus.cc:150 src/qtui/menus.cc:189
+#: src/qtui/menus.cc:207
+msgid "By C_omment"
+msgstr "По к_омментарию"
+
+#: src/gtkui/menus.cc:133 src/gtkui/menus.cc:151 src/qtui/menus.cc:190
+#: src/qtui/menus.cc:208
+msgid "By D_isc Number"
+msgstr "По номеру _диску"
+
+#: src/gtkui/menus.cc:135 src/gtkui/menus.cc:153 src/qtui/menus.cc:192
+#: src/qtui/menus.cc:210
 msgid "R_everse Order"
 msgstr "В _обратном порядке"
 
-#: src/gtkui/menus.cc:178 src/gtkui/menus.cc:194
-#: src/qtui/main_window_actions.cc:140 src/qtui/main_window_actions.cc:156
+#: src/gtkui/menus.cc:136 src/gtkui/menus.cc:154 src/qtui/menus.cc:194
+#: src/qtui/menus.cc:212
 msgid "_Random Order"
 msgstr "В _случайном порядке"
 
-#: src/gtkui/menus.cc:198 src/qtui/main_window_actions.cc:160
+#: src/gtkui/menus.cc:158 src/qtui/menus.cc:216
 msgid "_Play/Resume"
 msgstr "_Воспроизвести/продолжить"
 
-#: src/gtkui/menus.cc:199 src/gtkui/menus.cc:251
-#: src/qtui/main_window_actions.cc:161
+#: src/gtkui/menus.cc:159 src/qtui/menus.cc:218
 msgid "_Refresh"
 msgstr "Обновить"
 
-#: src/gtkui/menus.cc:201 src/qtui/main_window_actions.cc:163
+#: src/gtkui/menus.cc:161 src/qtui/menus.cc:222
 msgid "_Sort"
 msgstr "_Сортировать"
 
-#: src/gtkui/menus.cc:202 src/qtui/main_window_actions.cc:164
+#: src/gtkui/menus.cc:162 src/qtui/menus.cc:223
 msgid "Sort Se_lected"
-msgstr "Сортировать выбранные"
+msgstr "Упорядочивать вы_бранные"
 
-#: src/gtkui/menus.cc:203 src/qtui/main_window_actions.cc:165
+#: src/gtkui/menus.cc:163 src/qtui/menus.cc:225
 msgid "Remove _Duplicates"
-msgstr "Удалить _Дубликаты"
+msgstr "Удалить _дубликаты"
 
-#: src/gtkui/menus.cc:204 src/qtui/main_window_actions.cc:166
+#: src/gtkui/menus.cc:164 src/qtui/menus.cc:226
 msgid "Remove _Unavailable Files"
 msgstr "Убрать _недоступные файлы"
 
-#: src/gtkui/menus.cc:206 src/playlist-manager/playlist-manager.cc:244
-#: src/qtui/main_window_actions.cc:168
+#: src/gtkui/menus.cc:166 src/playlist-manager/playlist-manager.cc:219
+#: src/playlist-manager-qt/playlist-manager-qt.cc:348 src/qtui/menus.cc:229
 msgid "_New"
 msgstr "_Новый"
 
-#: src/gtkui/menus.cc:207
+#: src/gtkui/menus.cc:167 src/qtui/menus.cc:230
 msgid "Ren_ame ..."
 msgstr "Пере_именовать"
 
-#: src/gtkui/menus.cc:208 src/gtkui/menus.cc:264
-#: src/qtui/main_window_actions.cc:170
+#: src/gtkui/menus.cc:168 src/gtkui/menus.cc:228
+#: src/moonstone/playlist_tabs.cc:311 src/qtui/menus.cc:231
+#: src/qtui/playlist_tabs.cc:336
 msgid "Remo_ve"
 msgstr "Убрать"
 
-#: src/gtkui/menus.cc:210
+#: src/gtkui/menus.cc:170 src/qtui/menus.cc:233
 msgid "_Import ..."
-msgstr "_Импортировать ..."
+msgstr "_Импортировать..."
 
-#: src/gtkui/menus.cc:211
+#: src/gtkui/menus.cc:171 src/qtui/menus.cc:234
 msgid "_Export ..."
-msgstr "_Экспортировать ..."
+msgstr "_Экспортировать..."
 
-#: src/gtkui/menus.cc:213
+#: src/gtkui/menus.cc:173 src/qtui/menus.cc:237
 msgid "Playlist _Manager ..."
 msgstr "_Управление списками..."
 
-#: src/gtkui/menus.cc:214 src/qtui/main_window_actions.cc:176
+#: src/gtkui/menus.cc:174 src/qtui/menus.cc:239
 msgid "_Queue Manager ..."
-msgstr "_Управление очередью ..."
+msgstr "_Управление очередью..."
 
-#: src/gtkui/menus.cc:218 src/qtui/main_window_actions.cc:180
+#: src/gtkui/menus.cc:178 src/qtui/menus.cc:243
 msgid "Volume _Up"
 msgstr "Увеличить громкость"
 
-#: src/gtkui/menus.cc:219 src/qtui/main_window_actions.cc:181
+#: src/gtkui/menus.cc:179 src/qtui/menus.cc:245
 msgid "Volume _Down"
 msgstr "Уменьшить громкость"
 
-#: src/gtkui/menus.cc:221 src/qtui/main_window_actions.cc:183
-msgid "_Equalizer"
-msgstr "_Эквалайзер"
+#: src/gtkui/menus.cc:181 src/qtui/menus.cc:249
+msgid "_Equalizer ..."
+msgstr "_Эквалайзер..."
 
-#: src/gtkui/menus.cc:223 src/qtui/main_window_actions.cc:185
+#: src/gtkui/menus.cc:182 src/qtui/menus.cc:251
 msgid "E_ffects ..."
 msgstr "Э_ффекты"
 
-#: src/gtkui/menus.cc:227
+#: src/gtkui/menus.cc:184
+msgid "_Record Stream"
+msgstr "_Запись потока"
+
+#: src/gtkui/menus.cc:185
+msgid "Audio _Settings ..."
+msgstr "Настрой_ки звука..."
+
+#: src/gtkui/menus.cc:189 src/qtui/menus.cc:260
 msgid "Show _Menu Bar"
 msgstr "Показывать _панель меню"
 
-#: src/gtkui/menus.cc:228
+#: src/gtkui/menus.cc:190 src/qtui/menus.cc:262
 msgid "Show I_nfo Bar"
 msgstr "Показывать п_анель информации"
 
-#: src/gtkui/menus.cc:229
+#: src/gtkui/menus.cc:191 src/qtui/menus.cc:264
+msgid "Show Info Bar _Album Art"
+msgstr "Показать ин_фопанель с обложкой альбома"
+
+#: src/gtkui/menus.cc:192 src/qtui/menus.cc:266
 msgid "Show Info Bar Vis_ualization"
-msgstr "Показывать Info Bar Vis_ualization"
+msgstr "Показывать инфо. визуализации"
 
-#: src/gtkui/menus.cc:230
+#: src/gtkui/menus.cc:193 src/qtui/menus.cc:268
 msgid "Show _Status Bar"
 msgstr "Показывать _строку состояния"
 
-#: src/gtkui/menus.cc:232
+#: src/gtkui/menus.cc:195 src/qtui/menus.cc:272
 msgid "Show _Remaining Time"
-msgstr "Показать _Оставшееся время"
+msgstr "Показать _оставшееся время"
 
-#: src/gtkui/menus.cc:234
+#: src/gtkui/menus.cc:197 src/qtui/menus.cc:276 src/skins/menus.cc:157
+#: src/skins-qt/menus.cc:152
 msgid "_Visualizations ..."
 msgstr "_Визуализация..."
 
-#: src/gtkui/menus.cc:238 src/qtui/main_window_actions.cc:189
+#: src/gtkui/menus.cc:201 src/qtui/menus.cc:280
 msgid "_File"
 msgstr "_Файл"
 
-#: src/gtkui/menus.cc:239 src/qtui/main_window_actions.cc:190
+#: src/gtkui/menus.cc:202 src/qtui/menus.cc:281
 msgid "_Playback"
 msgstr "_Воспроизведение"
 
-#: src/gtkui/menus.cc:240 src/qtui/main_window_actions.cc:191
+#: src/gtkui/menus.cc:203 src/qtui/menus.cc:282
 msgid "P_laylist"
 msgstr "С_писок"
 
-#: src/gtkui/menus.cc:241 src/gtkui/menus.cc:258
-#: src/qtui/main_window_actions.cc:192
+#: src/gtkui/menus.cc:204 src/gtkui/menus.cc:222 src/qtui/menus.cc:283
+#: src/qtui/menus.cc:312
 msgid "_Services"
 msgstr "_Службы"
 
-#: src/gtkui/menus.cc:242 src/qtui/main_window_actions.cc:193
+#: src/gtkui/menus.cc:205 src/qtui/menus.cc:284
 msgid "_Output"
 msgstr "_Вывод"
 
-#: src/gtkui/menus.cc:243
+#: src/gtkui/menus.cc:206 src/qtui/menus.cc:285
 msgid "_View"
 msgstr "_Вид"
 
-#: src/gtkui/menus.cc:248
+#: src/gtkui/menus.cc:211 src/qtui/menus.cc:296
 msgid "_Queue/Unqueue"
-msgstr "_Элемент очереди"
+msgstr "_В очередь / из очереди"
 
-#: src/gtkui/menus.cc:250
+#: src/gtkui/menus.cc:213 src/qtui/menus.cc:299
 msgid "_Open Containing Folder"
 msgstr "_Открыть расположение файла"
 
-#: src/gtkui/menus.cc:253
+#: src/gtkui/menus.cc:214 src/qtui/menus.cc:301
+msgid "_Refresh Selected"
+msgstr "_Обновить выбранное"
+
+#: src/gtkui/menus.cc:216 src/qtui/menus.cc:304
 msgid "Cu_t"
 msgstr "_Вырезать"
 
-#: src/gtkui/menus.cc:254
+#: src/gtkui/menus.cc:217 src/qtui/menus.cc:305
 msgid "_Copy"
 msgstr "_Копировать"
 
-#: src/gtkui/menus.cc:255
+#: src/gtkui/menus.cc:218 src/qtui/menus.cc:306
 msgid "_Paste"
 msgstr "_Вставить"
 
-#: src/gtkui/menus.cc:256
+#: src/gtkui/menus.cc:219 src/qtui/menus.cc:307
+msgid "Paste at _End"
+msgstr "Вставить в _конец"
+
+#: src/gtkui/menus.cc:220 src/qtui/menus.cc:309
 msgid "Select _All"
 msgstr "Выбрать _всё"
 
-#: src/gtkui/menus.cc:263
+#: src/gtkui/menus.cc:227 src/moonstone/playlist_tabs.cc:309
+#: src/qtui/playlist_tabs.cc:334
 msgid "_Rename ..."
 msgstr "Пере_именовать..."
 
-#: src/gtkui/settings.cc:35
+#: src/gtkui/settings.cc:35 src/qtui/settings.cc:59
+msgid "Always"
+msgstr "Всегда"
+
+#: src/gtkui/settings.cc:36 src/qtui/settings.cc:60
+msgid "Auto-hide"
+msgstr "Автоскрытие"
+
+#: src/gtkui/settings.cc:37 src/qtui/settings.cc:61
+msgid "Never"
+msgstr "Никогда"
+
+#: src/gtkui/settings.cc:41 src/qtui/settings.cc:64
 msgid "Playlist Tabs"
 msgstr "Вкладки плейлиста"
 
-#: src/gtkui/settings.cc:36
-msgid "Always show tabs"
-msgstr "Всегда показывать вкладки"
+#: src/gtkui/settings.cc:42 src/qtui/settings.cc:65
+msgid "Show playlist tabs:"
+msgstr "Отобразить вкладки списка воспроизведения:"
 
-#: src/gtkui/settings.cc:38
+#: src/gtkui/settings.cc:45 src/qtui/settings.cc:69
 msgid "Show entry counts"
-msgstr "Показывать счетчик элементов"
+msgstr "Показывать счётчик элементов"
 
-#: src/gtkui/settings.cc:40
+#: src/gtkui/settings.cc:47 src/qtui/settings.cc:72
 msgid "Show close buttons"
 msgstr "Показывать кнопки закрытия"
 
-#: src/gtkui/settings.cc:42
+#: src/gtkui/settings.cc:49 src/qtui/settings.cc:75
 msgid "Playlist Columns"
-msgstr "Колонки плейлиста"
+msgstr "Столбцы плейлиста"
 
-#: src/gtkui/settings.cc:44
+#: src/gtkui/settings.cc:51 src/qtui/settings.cc:77
 msgid "Show column headers"
 msgstr "Показывать заголовки столбцов"
 
-#: src/gtkui/settings.cc:46 src/modplug/plugin_main.cc:106
-#: src/skins/skins_cfg.cc:263
-msgid "Miscellaneous"
-msgstr "Разное"
-
-#: src/gtkui/settings.cc:47
-msgid "Arrow keys seek by:"
-msgstr "Поиск стрелками:"
+#: src/gtkui/settings.cc:53 src/qtui/settings.cc:82
+msgid "Make column headers clickable for sorting"
+msgstr "Активировать сортировку столбцов по щелчку на заголовок"
+
+#: src/gtkui/settings.cc:56
+msgid "Use symbolic icons in toolbar"
+msgstr "Использовать символические значки на панели инструментов"
 
-#: src/gtkui/settings.cc:50
+#: src/gtkui/settings.cc:58 src/qtui/settings.cc:86
 msgid "Scroll on song change"
 msgstr "Прокручивать при смене песни"
 
-#: src/gtkui/ui_gtk.cc:71
+#: src/gtkui/ui_gtk.cc:82
 msgid "GTK Interface"
 msgstr "Интерфейс GTK"
 
-#: src/gtkui/ui_gtk.cc:222 src/skins/ui_main.cc:232
+#: src/gtkui/ui_gtk.cc:219 src/skins/main.cc:228 src/skins-qt/main.cc:231
 #, c-format
 msgid "%s - Audacious"
 msgstr "%s - Audacious"
 
-#: src/gtkui/ui_gtk.cc:225 src/qtui/main_window.cc:186
+#: src/gtkui/ui_gtk.cc:221 src/moonstone/main_window.cc:184
+#: src/qtui/main_window.cc:385
 msgid "Buffering ..."
-msgstr "Буферизация ..."
+msgstr "Буферизация..."
 
-#: src/gtkui/ui_gtk.cc:228 src/skins/ui_main.cc:234 src/skins/ui_main.cc:1164
+#: src/gtkui/ui_gtk.cc:224 src/pipewire/pipewire.cc:402 src/skins/main.cc:230
+#: src/skins-qt/main.cc:233
 msgid "Audacious"
 msgstr "Audacious"
 
-#: src/gtkui/ui_statusbar.cc:63 src/qtui/status_bar.cc:67
+#: src/gtkui/ui_gtk.cc:487 src/gtkui/ui_gtk.cc:518 src/gtkui/ui_gtk.cc:882
+#: src/hotkey/gui.cc:72 src/moonstone/main_window.cc:67
+#: src/moonstone/main_window.cc:145 src/moonstone/main_window.cc:146
+#: src/notify/osd.cc:85 src/qthotkey/gui.cc:67 src/qtui/main_window.cc:154
+#: src/qtui/main_window.cc:347 src/qtui/main_window.cc:348
+#: src/skins/menus.cc:109 src/skins-qt/menus.cc:100
+msgid "Play"
+msgstr "Воспроизвести"
+
+#: src/gtkui/ui_gtk.cc:487 src/moonstone/main_window.cc:151
+#: src/moonstone/main_window.cc:152 src/notify/osd.cc:82
+#: src/qtui/main_window.cc:353 src/qtui/main_window.cc:354
+#: src/skins/menus.cc:110 src/skins-qt/menus.cc:101
+msgid "Pause"
+msgstr "Пауза"
+
+#: src/gtkui/ui_gtk.cc:868 src/moonstone/main_window.cc:57
+#: src/qtui/main_window.cc:145 src/skins/menus.cc:86 src/skins-qt/menus.cc:77
+msgid "Search Library"
+msgstr "Поиск в фонотеке"
+
+#: src/gtkui/ui_gtk.cc:875 src/moonstone/main_window.cc:60
+#: src/qtui/main_window.cc:147
+msgid "Open Files"
+msgstr "Открыть файлы"
+
+#: src/gtkui/ui_gtk.cc:876 src/moonstone/main_window.cc:62
+#: src/qtui/main_window.cc:149
+msgid "Add Files"
+msgstr "Добавить файлы"
+
+#: src/gtkui/ui_gtk.cc:881 src/moonstone/main_window.cc:65
+#: src/qtui/main_window.cc:152 src/skins/menus.cc:112 src/skins-qt/menus.cc:103
+msgid "Previous"
+msgstr "Предыдущая дорожка"
+
+#: src/gtkui/ui_gtk.cc:883 src/hotkey/gui.cc:74 src/moonstone/main_window.cc:69
+#: src/qthotkey/gui.cc:69 src/qtui/main_window.cc:156 src/skins/menus.cc:111
+#: src/skins-qt/menus.cc:102
+msgid "Stop"
+msgstr "Остановить"
+
+#: src/gtkui/ui_gtk.cc:884 src/moonstone/main_window.cc:76 src/notify/osd.cc:89
+#: src/qtui/main_window.cc:163 src/skins/menus.cc:113 src/skins-qt/menus.cc:104
+msgid "Next"
+msgstr "Следующая дорожка"
+
+#: src/gtkui/ui_gtk.cc:886 src/moonstone/main_window.cc:79
+#: src/qtui/main_window.cc:166 src/qtui/menus.cc:254 src/skins/menus.cc:79
+#: src/skins-qt/menus.cc:69
+msgid "Record Stream"
+msgstr "Запись потока"
+
+#: src/gtkui/ui_gtk.cc:919 src/moonstone/main_window.cc:86
+#: src/qtui/main_window.cc:173 src/skins/menus.cc:103 src/skins-qt/menus.cc:94
+msgid "Repeat"
+msgstr "Повтор"
+
+#: src/gtkui/ui_gtk.cc:922 src/moonstone/main_window.cc:89
+#: src/qtui/main_window.cc:176 src/skins/menus.cc:104 src/skins-qt/menus.cc:95
+msgid "Shuffle"
+msgstr "Вразброс"
+
+#: src/gtkui/ui_gtk.cc:1114 src/qtui/main_window.cc:123
+msgid "Menu"
+msgstr "Меню"
+
+#: src/gtkui/ui_statusbar.cc:64 src/qtui/status_bar.cc:155
 msgid "mono"
 msgstr "моно"
 
-#: src/gtkui/ui_statusbar.cc:65 src/qtui/status_bar.cc:69
+#: src/gtkui/ui_statusbar.cc:66 src/qtui/status_bar.cc:157
 msgid "stereo"
 msgstr "стерео"
 
-#: src/gtkui/ui_statusbar.cc:67 src/qtui/status_bar.cc:71
+#: src/gtkui/ui_statusbar.cc:68 src/qtui/status_bar.cc:160
 #, c-format
 msgid "%d channel"
 msgid_plural "%d channels"
@@ -2077,197 +2199,223 @@
 msgstr2 "%d каналов"
 msgstr3 "%d каналов"
 
-#: src/gtkui/ui_statusbar.cc:81 src/qtui/status_bar.cc:85
+#: src/gtkui/ui_statusbar.cc:76 src/qtui/status_bar.cc:168
 #, c-format
-msgid "%d kbps"
+msgid "%d kHz"
+msgstr "%d кГц"
+
+#: src/gtkui/ui_statusbar.cc:82 src/qtui/status_bar.cc:174
+#, c-format
+msgid "%d kbit/s"
 msgstr "%d кбит/с"
 
-#: src/gtkui/ui_statusbar.cc:107 src/skins/ui_main_evlisteners.cc:103
+#: src/gtkui/ui_statusbar.cc:108 src/skins/main.cc:478 src/skins-qt/main.cc:461
 msgid "Single mode."
 msgstr "Одиночный режим"
 
-#: src/gtkui/ui_statusbar.cc:109 src/skins/ui_main_evlisteners.cc:105
+#: src/gtkui/ui_statusbar.cc:110 src/skins/main.cc:480 src/skins-qt/main.cc:463
 msgid "Playlist mode."
 msgstr "Режим списка воспроизведения"
 
-#: src/gtkui/ui_statusbar.cc:117 src/skins/ui_main_evlisteners.cc:111
+#: src/gtkui/ui_statusbar.cc:118 src/skins/main.cc:486 src/skins-qt/main.cc:469
 msgid "Stopping after song."
 msgstr "Остановить после дорожки"
 
-#: src/hotkey/gui.cc:71
+#: src/hotkey/gui.cc:71 src/qthotkey/gui.cc:66
 msgid "Previous track"
 msgstr "Предыдущая дорожка"
 
-#: src/hotkey/gui.cc:72 src/notify/osd.cc:69 src/qtui/main_window.cc:69
-#: src/qtui/main_window.cc:172 src/qtui/main_window.cc:173
-#: src/skins/menus.cc:87
-msgid "Play"
-msgstr "Воспроизвести"
-
-#: src/hotkey/gui.cc:73
+#: src/hotkey/gui.cc:73 src/qthotkey/gui.cc:68
 msgid "Pause/Resume"
-msgstr "Пауза/Продолжить"
-
-#: src/hotkey/gui.cc:74 src/qtui/main_window.cc:70 src/skins/menus.cc:89
-msgid "Stop"
-msgstr "Остановить"
+msgstr "Прервать/продолжить"
 
-#: src/hotkey/gui.cc:75
+#: src/hotkey/gui.cc:75 src/qthotkey/gui.cc:70
 msgid "Next track"
 msgstr "Следующая дорожка"
 
-#: src/hotkey/gui.cc:76
-msgid "Forward 5 seconds"
-msgstr "Перемотать вперёд на 5 сек"
-
-#: src/hotkey/gui.cc:77
-msgid "Rewind 5 seconds"
-msgstr "Перемотать назад на 5 сек"
+#: src/hotkey/gui.cc:76 src/qthotkey/gui.cc:71
+msgid "Step forward"
+msgstr "Следующая дорожка"
+
+#: src/hotkey/gui.cc:77 src/qthotkey/gui.cc:72
+msgid "Step backward"
+msgstr "Предыдущая дорожка"
 
-#: src/hotkey/gui.cc:78
+#: src/hotkey/gui.cc:78 src/qthotkey/gui.cc:73
 msgid "Mute"
 msgstr "Приглушить"
 
-#: src/hotkey/gui.cc:79
+#: src/hotkey/gui.cc:79 src/qthotkey/gui.cc:74
 msgid "Volume up"
 msgstr "Увеличить громкость"
 
-#: src/hotkey/gui.cc:80
+#: src/hotkey/gui.cc:80 src/qthotkey/gui.cc:75
 msgid "Volume down"
 msgstr "Уменьшить громкость"
 
-#: src/hotkey/gui.cc:81
+#: src/hotkey/gui.cc:81 src/qthotkey/gui.cc:76
 msgid "Jump to file"
 msgstr "Перейти к файлу"
 
-#: src/hotkey/gui.cc:82
+#: src/hotkey/gui.cc:82 src/qthotkey/gui.cc:77
 msgid "Toggle player window(s)"
 msgstr "Переключить состояние окон проигрывателя"
 
-#: src/hotkey/gui.cc:83
+#: src/hotkey/gui.cc:83 src/qthotkey/gui.cc:78
 msgid "Show On-Screen-Display"
 msgstr "Отобразить экранное сообщение (OSD)"
 
-#: src/hotkey/gui.cc:84
+#: src/hotkey/gui.cc:84 src/qthotkey/gui.cc:79
 msgid "Toggle repeat"
 msgstr "Повтор"
 
-#: src/hotkey/gui.cc:85
+#: src/hotkey/gui.cc:85 src/qthotkey/gui.cc:80
 msgid "Toggle shuffle"
-msgstr "Перетасовка"
+msgstr "Вкл. / откл. вразброс"
 
-#: src/hotkey/gui.cc:86
+#: src/hotkey/gui.cc:86 src/qthotkey/gui.cc:81
 msgid "Toggle stop after current"
 msgstr "Остановить после текущего"
 
-#: src/hotkey/gui.cc:87
+#: src/hotkey/gui.cc:87 src/qthotkey/gui.cc:82
 msgid "Raise player window(s)"
-msgstr "Поднять окно(а) плеера"
+msgstr "Поднять окно(а) проигрывателя"
 
-#: src/hotkey/gui.cc:97
+#: src/hotkey/gui.cc:98 src/qthotkey/gui.cc:100
 msgid "(none)"
 msgstr "(нет)"
 
-#: src/hotkey/gui.cc:234
+#: src/hotkey/gui.cc:261
 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 modifiers.\n"
 "\n"
 "Do you want to continue?"
 msgstr ""
-"Не рекомендуется делать привязки к основным кнопкам мыши без клавиш-"
-"модификаторов.\n"
+"Не желательно связывать основные кнопки мыши без модификаторов.\n"
 "\n"
-"Продолжить?"
+"Вы хотите продолжить?"
 
-#: src/hotkey/gui.cc:236
+#: src/hotkey/gui.cc:264
 msgid "Binding mouse buttons"
 msgstr "Привязки к кнопкам мыши"
 
-#: src/hotkey/gui.cc:391
+#: src/hotkey/gui.cc:434
 msgid ""
 "Press a key combination inside a text field.\n"
 "You can also bind mouse buttons."
 msgstr ""
-"Нажмите комбинацию клавиш в текстовом поле.\n"
+"Зажмите сочитания клавиш в текстовом поле.\n"
 "Можно также сделать привязки к кнопкам мыши."
 
-#: src/hotkey/gui.cc:396
+#: src/hotkey/gui.cc:444 src/qthotkey/gui.cc:179
 msgid "Hotkeys:"
 msgstr "Горячие клавиши:"
 
-#: src/hotkey/gui.cc:413
+#: src/hotkey/gui.cc:457 src/qthotkey/gui.cc:181
 msgid "Action:"
 msgstr "Действие:"
 
-#: src/hotkey/gui.cc:420
+#: src/hotkey/gui.cc:461 src/qthotkey/gui.cc:182
 msgid "Key Binding:"
 msgstr "Привязка клавиш:"
 
-#: src/hotkey/gui.cc:468
+#: src/hotkey/gui.cc:518 src/qthotkey/gui.cc:184
 msgid "_Add"
 msgstr "Добавить"
 
-#: src/hotkey/plugin.cc:61
+#: src/hotkey/plugin.cc:59 src/qthotkey/plugin.cc:78
 msgid "Global Hotkeys"
 msgstr "Глобальные горячие клавиши"
 
-#: src/hotkey/plugin.cc:79
+#: src/hotkey/plugin.cc:74
 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"
+"Contributors 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"
-"\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>"
+"Модуль Global Hotkey \n"
+"Управляйте проигрывателем с помощью глобальных сочетаний клавиш или "
+"мультимедийных клавиш.\n"
+"\n"
+"Авторское право (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n"
+"\n"
+"При участии:\n"
+"Авторское право (C) 2006-2007 Владимир Пасков <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/jack-ng/jack-ng.cc:49
+#: src/jack/jack-ng.cc:54
 msgid "JACK Output"
 msgstr "Вывод JACK"
 
-#: src/jack-ng/jack-ng.cc:114
+#: src/jack/jack-ng.cc:126
+msgid "Client name:"
+msgstr "Название клиента:"
+
+#: src/jack/jack-ng.cc:128
 msgid "Automatically connect to output ports"
 msgstr "Автоматически подключаться к портам вывода"
 
-#: src/jack-ng/jack-ng.cc:155
+#: src/jack/jack-ng.cc:130
+msgid "Filter ports (regex, use any port if blank):"
+msgstr ""
+"Фильтровать порты (регулярное выражение, использовать любой порт, если "
+"пусто):"
+
+#: src/jack/jack-ng.cc:136
+msgid "Connect to physical ports only"
+msgstr "Подключаться только к физическим портам"
+
+#: src/jack/jack-ng.cc:139
+msgid "Upmix to"
+msgstr "Повысить число канало до"
+
+#: src/jack/jack-ng.cc:141
+msgid "ports if input has fewer channels"
+msgstr "порты, если на входе меньше каналов"
+
+#: src/jack/jack-ng.cc:143
+msgid "Ignore insufficient number of ports"
+msgstr "Игнорировать недостаточное количество портов"
+
+#: src/jack/jack-ng.cc:181
+msgid "No JACK output ports were found. Please check settings."
+msgstr ""
+"Никаких выходных портов JACK не обнаружено. Пожалуйста, проверьте настройки."
+
+#: src/jack/jack-ng.cc:195
 #, c-format
 msgid "Only %d JACK output ports were found but %d are required."
 msgstr "Обнаружены только выходные разъёмы %d JACK, но требуется %d."
 
-#: src/jack-ng/jack-ng.cc:164
+#: src/jack/jack-ng.cc:210
 #, c-format
 msgid "Failed to connect to JACK port %s."
 msgstr "Ошибка подключения к разъёму JACK %s."
 
-#: src/jack-ng/jack-ng.cc:184
+#: src/jack/jack-ng.cc:230
 msgid ""
 "JACK supports only floating-point audio. You must change the output bit "
 "depth to floating-point in Audacious settings."
 msgstr ""
+"JACK поддерживает только звук с плавающей точкой. Вы должны изменить "
+"выходную битовую глубину на режим с плавающей точкой в настройках Audacious."
 
-#: src/jack-ng/jack-ng.cc:197
+#: src/jack/jack-ng.cc:245
 msgid "Failed to connect to the JACK server; is it running?"
 msgstr "Сбой подключения к серверу JACK; он работает?"
 
-#: src/jack-ng/jack-ng.cc:273
+#: src/jack/jack-ng.cc:321
 #, c-format
 msgid ""
 "The JACK server requires a sample rate of %d Hz, but Audacious is playing at "
@@ -2277,16 +2425,16 @@
 "Гц. Пожалуйста, используйте эффект конвертера частоты семплов для устранения "
 "несовпадений."
 
-#: src/ladspa/plugin.cc:414
+#: src/ladspa/plugin.cc:416
 #, c-format
 msgid "%s Settings"
 msgstr "%s Настройки"
 
-#: src/ladspa/plugin.cc:478
+#: src/ladspa/plugin.cc:482
 msgid "Module paths:"
 msgstr "Путь к модулям:"
 
-#: src/ladspa/plugin.cc:483
+#: src/ladspa/plugin.cc:487
 msgid ""
 "Separate multiple paths with a colon.\n"
 "These paths are searched in addition to LADSPA_PATH.\n"
@@ -2294,33 +2442,33 @@
 msgstr ""
 "Если путей несколько, разделяйте их двоеточием.\n"
 "Поиск осуществляется по указанным путям и переменной LADSPA_PATH.\n"
-"Указав пути, нажмите Enter для поиска новых плагинов."
+"Указав пути, нажмите Enter для поиска новых модулей."
 
-#: src/ladspa/plugin.cc:499
+#: src/ladspa/plugin.cc:508
 msgid "Available plugins:"
-msgstr "Доступные плагины:"
+msgstr "Доступные модули:"
 
-#: src/ladspa/plugin.cc:512 src/modplug/plugin_main.cc:92
-#: src/modplug/plugin_main.cc:95 src/modplug/plugin_main.cc:98
-#: src/modplug/plugin_main.cc:101
+#: src/ladspa/plugin.cc:521 src/modplug/plugin_main.cc:91
+#: src/modplug/plugin_main.cc:94 src/modplug/plugin_main.cc:97
+#: src/modplug/plugin_main.cc:100
 msgid "Enable"
 msgstr "Включить"
 
-#: src/ladspa/plugin.cc:518
+#: src/ladspa/plugin.cc:527
 msgid "Enabled plugins:"
-msgstr "Включенные плагины"
+msgstr "Включённые модули:"
 
-#: src/ladspa/plugin.cc:534
+#: src/ladspa/plugin.cc:543
 msgid "Settings"
 msgstr "Настройки"
 
-#: src/ladspa/plugin.cc:551
+#: src/ladspa/plugin.cc:560
 msgid ""
 "LADSPA Host for Audacious\n"
 "Copyright 2011 John Lindgren"
 msgstr ""
-"LADSPA Хост для Audacious\n"
-"Авторство 2011 John Lindgren"
+"Хост LADSPA для Audacious\n"
+"Авторское право 2011 John Lindgren"
 
 #: src/ladspa/plugin.h:78
 msgid "LADSPA Host"
@@ -2328,9 +2476,9 @@
 
 #: src/lirc/lirc.cc:55
 msgid "LIRC Plugin"
-msgstr "Плагин LIRC"
+msgstr "Модуль LIRC"
 
-#: src/lirc/lirc.cc:381
+#: src/lirc/lirc.cc:379
 msgid ""
 "A simple plugin to control Audacious using the LIRC remote control daemon\n"
 "\n"
@@ -2345,95 +2493,155 @@
 "\n"
 "For more information about LIRC, see http://lirc.org."
 msgstr ""
-"Простой плагин для управления Дерзкий, используя LIRC демон дистанционного "
-"управления\n"
+"Простой модуль для управления Audacious, используя службу удалённого "
+"управления LIRC\n"
 "\n"
-"Адаптирован для Audacious:\n"
+"Приспособлен для Audacious:\n"
 "Tony Vroon <chainsaw@gentoo.org>\n"
 "Joonas Harjumäki <jharjuma@gmail.com>\n"
 "\n"
-"Основан на XMMS LIRC плагине:\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."
+"Подробности про LIRC смотрите на http://lirc.org."
 
-#: src/lirc/lirc.cc:392
+#: src/lirc/lirc.cc:390
 msgid "Connection"
 msgstr "Подключение"
 
-#: src/lirc/lirc.cc:393
+#: src/lirc/lirc.cc:391
 msgid "Reconnect to LIRC server"
-msgstr "Переподключиться к LIRC серверу"
+msgstr "Переподключиться к серверу LIRC"
 
-#: src/lirc/lirc.cc:395
+#: src/lirc/lirc.cc:393
 msgid "Wait before reconnecting:"
 msgstr "Ждать перед переподключением:"
 
-#: src/lyricwiki/lyricwiki.cc:41
-msgid "LyricWiki Plugin"
-msgstr "Плагин LyricWiki"
-
-#: src/lyricwiki/lyricwiki.cc:131 src/lyricwiki-qt/lyricwiki.cc:136
-msgid "No lyrics available"
-msgstr "Текст песни недоступен"
-
-#: src/lyricwiki/lyricwiki.cc:217 src/lyricwiki/lyricwiki.cc:226
-#: src/lyricwiki/lyricwiki.cc:243 src/lyricwiki/lyricwiki.cc:252
-#: src/lyricwiki/lyricwiki.cc:267 src/lyricwiki-qt/lyricwiki.cc:222
-#: src/lyricwiki-qt/lyricwiki.cc:231 src/lyricwiki-qt/lyricwiki.cc:248
-#: src/lyricwiki-qt/lyricwiki.cc:257 src/lyricwiki-qt/lyricwiki.cc:272
-msgid "Error"
-msgstr "Ошибка"
-
-#: src/lyricwiki/lyricwiki.cc:218 src/lyricwiki/lyricwiki.cc:244
-#: src/lyricwiki-qt/lyricwiki.cc:223 src/lyricwiki-qt/lyricwiki.cc:249
+#: src/lyrics-common/chart_lyrics_provider.cc:93
+#: src/lyrics-common/chart_lyrics_provider.cc:150
+#: src/lyrics-common/lyrics_ovh_provider.cc:50
 #, c-format
 msgid "Unable to fetch %s"
 msgstr "Не удалось получить %s"
 
-#: src/lyricwiki/lyricwiki.cc:227 src/lyricwiki/lyricwiki.cc:253
-#: src/lyricwiki-qt/lyricwiki.cc:232 src/lyricwiki-qt/lyricwiki.cc:258
+#: src/lyrics-common/chart_lyrics_provider.cc:100
+#: src/lyrics-common/chart_lyrics_provider.cc:157
+#: src/lyrics-common/lyrics_ovh_provider.cc:57
 #, c-format
 msgid "Unable to parse %s"
 msgstr "Не удалось проанализировать %s"
 
-#: src/lyricwiki/lyricwiki.cc:259 src/lyricwiki-qt/lyricwiki.cc:264
+#: src/lyrics-common/chart_lyrics_provider.cc:121
+#: src/lyrics-common/chart_lyrics_provider.cc:194
+#: src/lyrics-common/lyrics_ovh_provider.cc:88
 msgid "Looking for lyrics ..."
-msgstr "Поиск текста песни ..."
+msgstr "Поиск слов песни..."
+
+#: src/lyrics-common/preferences.h:43
+msgid "Nowhere"
+msgstr "Нет"
 
-#: src/lyricwiki/lyricwiki.cc:267 src/lyricwiki-qt/lyricwiki.cc:272
-msgid "Missing song metadata"
-msgstr "Метаданные песни отсутствуют"
+#: src/lyrics-common/preferences.h:49
+msgid "Artist is truncated at the start, Title -- at the end"
+msgstr "Исполнитель -- с начала, Название -- с конца"
+
+#: src/lyrics-common/preferences.h:50
+msgid "Chars to truncate on:"
+msgstr "Обрезать до:"
+
+#: src/lyrics-common/preferences.h:54
+msgid "Chars are ORed in RegExp, surrounded by whitespace"
+msgstr "Варианты перечисляются через пробел"
+
+#: src/lyrics-common/preferences.h:55
+msgid "Chars to split on:"
+msgstr "Разделители:"
+
+#: src/lyrics-common/preferences.h:56
+msgid "Further truncate those on chars"
+msgstr "Далее обрезать до символа"
+
+#: src/lyrics-common/preferences.h:62
+msgid "General"
+msgstr "Основные"
+
+#: src/lyrics-common/preferences.h:63
+msgid "Split title into artist and title on chars"
+msgstr "Разделить название на название и исполнителя"
+
+#: src/lyrics-common/preferences.h:66
+msgid "Sources"
+msgstr "Источники"
+
+#: src/lyrics-common/preferences.h:67
+msgid "Use embedded lyrics (from Lyrics tag)"
+msgstr "Использовать встроенные тексты песен (из метки Lyrics)"
+
+#: src/lyrics-common/preferences.h:69
+msgid "Fetch lyrics from internet:"
+msgstr "Получать тексты песен из Интернета:"
+
+#: src/lyrics-common/preferences.h:72
+msgid "Store fetched lyrics in local cache"
+msgstr "Сохранять извлечённые тексты в локальном кэше"
+
+#: src/lyrics-common/preferences.h:74
+msgid "Local Storage"
+msgstr "Локальное хранилище"
+
+#: src/lyrics-common/preferences.h:75
+msgid "Load lyric files (.lrc) from local storage"
+msgstr "Загружать файлы слов песен (.lrc) из локального хранилища"
 
-#: src/lyricwiki/lyricwiki.cc:278 src/lyricwiki-qt/lyricwiki.cc:283
-msgid "Connecting to lyrics.wikia.com ..."
-msgstr "Устанавливаю соединение с lyrics.wikia.com ..."
+#: src/lyrics-common/utils.cc:54 src/ui-common/dialogs-qt.cc:63
+msgid "Error"
+msgstr "Ошибка"
 
-#: src/lyricwiki-qt/lyricwiki.cc:55
-msgid "LyricWiki Plugin (Qt)"
-msgstr "Надстройка LyricWiki (Qt)"
+#: src/lyrics-common/utils.cc:60
+msgid "Lyrics could not be found."
+msgstr "Не удалось найти слова песни."
+
+#: src/lyrics-common/utils.cc:142
+msgid "Missing title and/or artist."
+msgstr "Отсутствует название и / или исполнитель."
+
+#: src/lyrics-gtk/lyrics-gtk.cc:37 src/lyrics-qt/lyrics-qt.cc:50
+msgid "Lyrics"
+msgstr "Слова песни"
+
+#: src/lyrics-gtk/lyrics-gtk.cc:189 src/lyrics-qt/lyrics-qt.cc:171
+msgid "Edit Lyrics ..."
+msgstr "Редактировать слова..."
+
+#: src/lyrics-gtk/lyrics-gtk.cc:195 src/lyrics-qt/lyrics-qt.cc:178
+msgid "Save Locally"
+msgstr "Сохранить локально"
 
-#: src/m3u/m3u.cc:32
+#: src/lyrics-gtk/lyrics-gtk.cc:201 src/lyrics-qt/lyrics-qt.cc:186
+msgid "Refresh"
+msgstr "Обновить"
+
+#: src/m3u/m3u.cc:33
 msgid "M3U Playlists"
 msgstr "Списки воспроизведения M3U"
 
 #: src/metronom/metronom.cc:44
 msgid "Tact Generator"
-msgstr "Генератор тактов"
+msgstr "Тактовый генератор"
 
-#: src/metronom/metronom.cc:147
+#: src/metronom/metronom.cc:145
 #, c-format
 msgid "Tact generator: %d bpm"
 msgstr "Тактовый генератор: %d тактов/с"
 
-#: src/metronom/metronom.cc:149
+#: src/metronom/metronom.cc:147
 #, c-format
 msgid "Tact generator: %d bpm %d/%d"
 msgstr "Тактовый генератор: %d уд/мин %d/%d"
 
-#: src/metronom/metronom.cc:237
+#: src/metronom/metronom.cc:235
 msgid ""
 "A Tact Generator by Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
 "\n"
@@ -2441,202 +2649,210 @@
 "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"
+"Тактовый генератор от 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"
+"Чтобы использовать его, добавьте адрес: tact://beats*num/den\n"
+"например, tact://77 для 77 ударов в минуту\n"
+"или tact://60*3/4 для 60 ударов в минуту в 3/4 такта"
 
-#: src/mixer/mixer.cc:38
+#: src/mixer/mixer.cc:43
 msgid "Channel Mixer"
 msgstr "Микшер каналов"
 
-#: src/mixer/mixer.cc:202
+#: src/mixer/mixer.cc:255
 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"
+"Модуль смешивания каналов Audacious\n"
+"Copyright 2011-2012 John Lindgren и Michał Lipski"
 
-#: src/mixer/mixer.cc:206
+#: src/mixer/mixer.cc:259
 msgid "Channel Mixer"
 msgstr "Микшер каналов"
 
-#: src/mixer/mixer.cc:207
+#: src/mixer/mixer.cc:260
 msgid "Output channels:"
 msgstr "Каналов на выходе:"
 
 #: src/mms/mms.cc:35
 msgid "MMS Plugin"
-msgstr "Плагин MMS"
+msgstr "Модуль MMS"
 
 #: src/mms/mms.cc:82
 msgid "Error connecting to MMS server"
 msgstr "Ошибка подключения к серверу MMS"
 
-#: src/modplug/modplugbmp.h:53
+#: src/modplug/modplugbmp.h:57
 msgid "ModPlug (Module Player)"
-msgstr "ModPlug (модульный плеер)"
-
-#: src/modplug/plugin_main.cc:53
-msgid "Resolution"
-msgstr "Разрешение"
-
-#: src/modplug/plugin_main.cc:54
-msgid "8-bit"
-msgstr "8-бит"
+msgstr "ModPlug (модульный проигрыватель)"
 
 #: src/modplug/plugin_main.cc:55
-msgid "16-bit"
-msgstr "16-бит"
-
-#: src/modplug/plugin_main.cc:56
 msgid "Channels"
 msgstr "Каналы"
 
-#: src/modplug/plugin_main.cc:60
+#: src/modplug/plugin_main.cc:59
 msgid "Nearest (fastest)"
 msgstr "Ближайший (самый быстрый)"
 
-#: src/modplug/plugin_main.cc:61
+#: src/modplug/plugin_main.cc:60
 msgid "Linear (fast)"
 msgstr "Линейный (быстрый)"
 
-#: src/modplug/plugin_main.cc:62
+#: src/modplug/plugin_main.cc:61
 msgid "Spline (good)"
 msgstr "Сплайн (хороший)"
 
-#: src/modplug/plugin_main.cc:63
+#: src/modplug/plugin_main.cc:62
 msgid "Polyphase (best)"
 msgstr "Многофазный (лучший)"
 
-#: src/modplug/plugin_main.cc:64
+#: src/modplug/plugin_main.cc:63
 msgid "Sample rate"
 msgstr "Частота дискретизации"
 
-#: src/modplug/plugin_main.cc:65
+#: src/modplug/plugin_main.cc:64
 msgid "22 kHz"
 msgstr "22 кГц:"
 
-#: src/modplug/plugin_main.cc:66
+#: src/modplug/plugin_main.cc:65
 msgid "44 kHz"
 msgstr "44 кГц:"
 
-#: src/modplug/plugin_main.cc:67
+#: src/modplug/plugin_main.cc:66
 msgid "48 kHz"
 msgstr "48 кГц:"
 
-#: src/modplug/plugin_main.cc:68
+#: src/modplug/plugin_main.cc:67
 msgid "96 kHz"
 msgstr "96 кГц:"
 
-#: src/modplug/plugin_main.cc:72 src/modplug/plugin_main.cc:77
-#: src/modplug/plugin_main.cc:82
+#: src/modplug/plugin_main.cc:71 src/modplug/plugin_main.cc:76
+#: src/modplug/plugin_main.cc:81
 msgid "Level:"
 msgstr "Уровень:"
 
-#: src/modplug/plugin_main.cc:78
+#: src/modplug/plugin_main.cc:77
 msgid "Cutoff:"
 msgstr "Отключение:"
 
-#: src/modplug/plugin_main.cc:91
+#: src/modplug/plugin_main.cc:90
 msgid "Reverb"
 msgstr "Реверберация"
 
-#: src/modplug/plugin_main.cc:94
+#: src/modplug/plugin_main.cc:93
 msgid "Bass Boost"
 msgstr "Усиление басов"
 
-#: src/modplug/plugin_main.cc:97
+#: src/modplug/plugin_main.cc:96
 msgid "Surround"
 msgstr "Окружение"
 
-#: src/modplug/plugin_main.cc:100
+#: src/modplug/plugin_main.cc:99
 msgid "Preamp"
 msgstr "Предусилитель"
 
-#: src/modplug/plugin_main.cc:107
+#: src/modplug/plugin_main.cc:106
 msgid "Oversample"
 msgstr "Перекрытие"
 
-#: src/modplug/plugin_main.cc:108
+#: src/modplug/plugin_main.cc:107
 msgid "Noise reduction"
 msgstr "Шумоподавление"
 
-#: src/modplug/plugin_main.cc:109
+#: src/modplug/plugin_main.cc:108
 msgid "Play Amiga MODs"
-msgstr "Воспроизвести модификацию Amiga"
+msgstr "Воспроизвести модульные файлы Amiga"
 
-#: src/modplug/plugin_main.cc:110
+#: src/modplug/plugin_main.cc:109
 msgid "Repeat"
 msgstr "Повторить"
 
-#: src/modplug/plugin_main.cc:111
+#: src/modplug/plugin_main.cc:110
 msgid "Repeat count:"
-msgstr "Счетчик повторений:"
+msgstr "Счётчик повторений:"
 
-#: src/modplug/plugin_main.cc:112
+#: src/modplug/plugin_main.cc:111
 msgid "To repeat forever, set the repeat count to -1."
 msgstr "Повторять всегда, задать число повторов до -1."
 
-#: src/modplug/plugin_main.cc:125 src/sid/xs_config.cc:106
+#: src/modplug/plugin_main.cc:124 src/sid/xs_config.cc:106
 msgid "These settings will take effect when Audacious is restarted."
 msgstr "Настройки вступят в силу после перезапуска Audacious."
 
+#: src/moonstone/main_window.cc:72 src/moonstone/main_window.cc:73
+#: src/qtui/main_window.cc:159 src/qtui/main_window.cc:160
+#: src/skins/menus.cc:107 src/skins-qt/menus.cc:98
+msgid "Stop After This Song"
+msgstr "Остановить после этой песни"
+
+#: src/moonstone/moonstone.cc:39
+msgid "Moonstone"
+msgstr "Moonstone"
+
+#: src/moonstone/playlist_header.cc:212 src/qtui/playlist_header.cc:258
+msgid "Reset to Defaults"
+msgstr "Сбросить на изначальные"
+
+#: src/moonstone/playlist_model.cc:38 src/qtui/playlist_header.cc:232
+msgid "Now Playing"
+msgstr "Сейчас Воспроизводится"
+
+#: src/moonstone/playlist_selection.cc:66
+#: src/playlist-manager/playlist-manager.cc:201
+#: src/playlist-manager-qt/playlist-manager-qt.cc:190
+msgid "Entries"
+msgstr "Элементы"
+
 #: src/mpg123/mpg123.cc:54
 msgid "MPG123 Plugin"
-msgstr "Плагин MPG123"
-
-#: src/mpg123/mpg123.cc:83
-msgid "Advanced"
-msgstr "Расширенные"
+msgstr "Модуль MPG123"
 
-#: src/mpg123/mpg123.cc:84
+#: src/mpg123/mpg123.cc:82
 msgid "Use accurate length calculation (slow)"
 msgstr "Использовать аккуратное вычисление длины (медленно)"
 
-#: src/mpg123/mpg123.cc:248
+#: src/mpg123/mpg123.cc:260
 msgid "Surround"
 msgstr "Объёмное звучание"
 
-#: src/mpris2/plugin.cc:39
+#: src/mpris2/plugin.cc:40
 msgid "MPRIS 2 Server"
 msgstr "Сервер MPRIS 2"
 
-#: src/neon/neon.cc:97
+#: src/neon/neon.cc:102
 msgid "Neon HTTP/HTTPS Plugin"
-msgstr "Плагин Neon HTTP/HTTPS"
+msgstr "Модуль HTTP/HTTPS Neon"
 
-#: src/neon/neon.cc:521
+#: src/neon/neon.cc:526
 msgid "Error parsing redirect"
-msgstr "Ошибка парсинга перенаправлений"
+msgstr "Ошибка разбора перенаправлений"
 
-#: src/neon/neon.cc:535
+#: src/neon/neon.cc:540
 msgid "Unknown HTTP error"
 msgstr "Неизвестная ошибка HTTP"
 
-#: src/neon/neon.cc:569
+#: src/neon/neon.cc:614
 msgid "Error parsing URL"
-msgstr "Ошибка парсинга URL"
+msgstr "Ошибка разбора ссылки"
 
-#: src/neon/neon.cc:632
+#: src/neon/neon.cc:687
 msgid "Too many redirects"
 msgstr "Слишком много перенаправлений"
 
-#: src/notify/event.cc:64
+#: src/notify/event.cc:97
 msgid "Stopped"
 msgstr "Остановлен"
 
-#: src/notify/event.cc:64
+#: src/notify/event.cc:97
 msgid "Audacious is not playing."
 msgstr "Audacious ничего не воспроизводит."
 
-#: src/notify/notify.cc:42
+#: src/notify/notify.cc:39
 msgid "Desktop Notifications"
 msgstr "Всплывающие сообщения"
 
-#: src/notify/notify.cc:60
+#: src/notify/notify.cc:57
 msgid ""
 "Desktop Notifications Plugin for Audacious\n"
 "Copyright (C) 2010 Maximilian Bogner\n"
@@ -2655,48 +2871,93 @@
 "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 версию "
+"Модуль уведомлений на рабочем столе для Audacious\n"
+"Copyright (C) 2010 Maximilian Bogner\n"
+"Copyright (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/>."
+"Вы должны были получить копию Общей Общественной Лицензии GNU вместе с этой "
+"программой. Если нет, смотрите <http://www.gnu.org/licenses/>."
 
-#: src/notify/notify.cc:110
+#: src/notify/notify.cc:104
 msgid "Show playback controls"
 msgstr "Показать кнопки управления воспроизведением"
 
-#: src/notify/notify.cc:112
+#: src/notify/notify.cc:106
 msgid "Always show notification"
 msgstr "Всегда показывать уведомления"
 
-#: src/notify/notify.cc:114
+#: src/notify/notify.cc:108
 msgid "Include album name in notification"
 msgstr "Включить название альбома в уведомление"
 
-#: src/notify/osd.cc:58
+#: src/notify/notify.cc:110
+msgid "Custom notification duration:"
+msgstr "Длительность уведомления:"
+
+#: src/notify/osd.cc:74
 msgid "Show"
 msgstr "Показать"
 
-#: src/notify/osd.cc:66 src/qtui/main_window.cc:178
-#: src/qtui/main_window.cc:179 src/skins/menus.cc:88
-msgid "Pause"
-msgstr "Пауза"
+#: src/openmpt/mpt.cc:50
+msgid "OpenMPT (Module Player)"
+msgstr "OpenMPT (модуль проигрывателя)"
 
-#: src/notify/osd.cc:73 src/qtui/main_window.cc:72 src/skins/menus.cc:91
-msgid "Next"
-msgstr "Следующая дорожка"
+#: src/openmpt/mpt.cc:132
+msgid ""
+"Module player based on libopenmpt\n"
+"\n"
+"Written by: Chris Spiegel <cspiegel@gmail.com>"
+msgstr ""
+"Модульный проигрыватель основан на libopenmpt\n"
+"\n"
+"Написан: Chris Spiegel <cspiegel@gmail.com>"
+
+#: src/openmpt/mpt.cc:151
+msgid "Stereo separation:"
+msgstr "Разделение стерео:"
+
+#: src/openmpt/mpt.cc:153
+msgid "% (0=mono, 100=default, 200=full)"
+msgstr "% (0=моно, 100=стандарт, 200=полный)"
+
+#: src/openmpt/mpt.cc:157
+msgid "Interpolation:"
+msgstr "Интерполяция:"
 
-#: src/oss4/oss.h:93
+#: src/openmpt/mptwrap.h:51 src/soxr/sox-resampler.cc:189 src/xsf/plugin.cc:437
+msgid "Linear"
+msgstr "Линейный"
+
+#: src/openmpt/mptwrap.h:52
+msgid "Cubic"
+msgstr "Кубический"
+
+#: src/openmpt/mptwrap.h:53
+msgid "Windowed sinc"
+msgstr "Оконная синхронизация"
+
+#: src/opus/opus.cc:39
+msgid "Opus Decoder"
+msgstr "Декодер Opus"
+
+#: src/opus/opus.cc:336
+msgid ""
+"Opus Decoder Plugin for Audacious\n"
+"Copyright 2022 Thomas Lange"
+msgstr ""
+"Модуль декодера Opus для Audacious\n"
+"Авторское право 2022 Томас Ланге"
+
+#: src/oss4/oss.h:70
 msgid "OSS4 Output"
 msgstr "Вывод OSS4"
 
-#: src/oss4/oss.h:95
+#: src/oss4/oss.h:72
 msgid "OSS3 Output"
 msgstr "Выход OSS3"
 
@@ -2704,27 +2965,27 @@
 msgid "Default device"
 msgstr "Устройство по умолчанию"
 
-#: src/oss4/plugin.cc:77
+#: src/oss4/plugin.cc:78
 msgid "Audio device:"
 msgstr "Звуковое устройство:"
 
-#: src/oss4/plugin.cc:80
+#: src/oss4/plugin.cc:81
 msgid "Use alternate device:"
 msgstr "Использовать другое устройство:"
 
-#: src/oss4/plugin.cc:84
+#: src/oss4/plugin.cc:85
 msgid "Save volume between sessions."
 msgstr "Сохранять громкость между сессиями."
 
-#: src/oss4/plugin.cc:86
+#: src/oss4/plugin.cc:87
 msgid "Enable format conversions made by the OSS software."
 msgstr "Разрешить преобразования формата с помощью OSS."
 
-#: src/oss4/plugin.cc:88
+#: src/oss4/plugin.cc:89
 msgid "Enable exclusive mode to prevent virtual mixing."
 msgstr "Включить монопольный режим, чтобы избежать виртуального микширования."
 
-#: src/oss4/plugin.cc:100
+#: src/oss4/plugin.cc:101
 msgid ""
 "OSS4 Output Plugin for Audacious\n"
 "Copyright 2010-2012 Michał Lipski\n"
@@ -2732,25 +2993,46 @@
 "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"
+"Модуль вывода OSS4 для Audacious\n"
+"Copyright 2010-2012 Michał Lipski\n"
+"\n"
+"Я хочу поблагодарить людей из #audacious, особенно Тони Vroon и John "
+"Lindgren, и, конечно же, авторов предыдущего модуля OSS."
+
+#: src/pipewire/pipewire.cc:44
+msgid "PipeWire Output"
+msgstr "Вывод PipeWire"
+
+#: src/pipewire/pipewire.cc:118
+msgid ""
+"PipeWire Output Plugin for Audacious\n"
+"Copyright 2022 Thomas Lange\n"
+"\n"
+"Based on the PipeWire Output Plugin for Qmmp\n"
+"Copyright 2021 Ilya Kotov"
+msgstr ""
+"Модуль вывода PipeWire для Audacious\n"
+"Авторское право 2022 Томас Ланге\n"
 "\n"
-"Я хочу поблагодарить тех людей #audacious, особенно Тони Vroon и Джон "
-"Линдгрен и, конечно же авторов предыдущих OSS плагин."
+"На основе модуля вывода PipeWire для Qmmp\n"
+"Авторское право 2021 Илья Котов"
 
-#: src/playlist-manager/playlist-manager.cc:37
+#: src/pipewire/pipewire.cc:408 src/skins/menus.cc:88 src/skins-qt/menus.cc:79
+msgid "Playback"
+msgstr "Воспроизведение"
+
+#: src/playlist-manager/playlist-manager.cc:38
+#: src/playlist-manager-qt/playlist-manager-qt.cc:42
 msgid "Playlist Manager"
 msgstr "Списки воспроизведения"
 
-#: src/playlist-manager/playlist-manager.cc:226
-msgid "Entries"
-msgstr "Элементы"
-
-#: src/playlist-manager/playlist-manager.cc:245
+#: src/playlist-manager/playlist-manager.cc:221
+#: src/playlist-manager-qt/playlist-manager-qt.cc:356
 msgid "_Remove"
 msgstr "_Удалить"
 
-#: src/playlist-manager/playlist-manager.cc:246
+#: src/playlist-manager/playlist-manager.cc:222
+#: src/playlist-manager-qt/playlist-manager-qt.cc:351
 msgid "Ren_ame"
 msgstr "Пере_именовать"
 
@@ -2758,57 +3040,68 @@
 msgid "PLS Playlists"
 msgstr "Списки воспроизведения PLS"
 
-#: src/psf/plugin.cc:45
+#: src/psf/plugin.cc:53
 msgid "OpenPSF PSF1/PSF2 Decoder"
 msgstr "Декодер OpenPSF PSF1/PSF2"
 
-#: src/pulse_audio/pulse_audio.cc:38
+#: src/psf/plugin.cc:270
+msgid "OpenPSF Configuration"
+msgstr "Настройка OpenPSF"
+
+#: src/psf/plugin.cc:271 src/xsf/plugin.cc:444
+msgid "Ignore length from file"
+msgstr "Не придавать значение длительности из файла"
+
+#: src/pulse/pulse_audio.cc:42
 msgid "PulseAudio Output"
 msgstr "Вывод PulseAudio"
 
-#: src/pulse_audio/pulse_audio.cc:611
+#: src/pulse/pulse_audio.cc:84
+msgid "Context name:"
+msgstr "Название контекста:"
+
+#: src/pulse/pulse_audio.cc:86
+msgid "Stream name:"
+msgstr "Имя трансляции:"
+
+#: src/pulse/pulse_audio.cc:596
 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"
-" \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"
-"США."
+"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 ""
+"Модуль вывода PulseAudio для Audacious\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, США."
 
-#: src/qtaudio/qtaudio.cc:49
+#: src/qtaudio/qtaudio.cc:53
 msgid "QtMultimedia Output"
 msgstr "Выход QtMultimedia"
 
-#: src/qtaudio/qtaudio.cc:77
+#: src/qtaudio/qtaudio.cc:84
 msgid ""
 "QtMultimedia Audio Output Plugin for Audacious\n"
 "Copyright 2014 William Pitcock\n"
@@ -2816,56 +3109,114 @@
 "Based on SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
 msgstr ""
-"Плагин QtMultimedia Audio Output для Audacious\n"
-"Права защищены 2014 Уиллиам Питкок\n"
+"Модуль QtMultimedia Audio Output для Audacious\n"
+"Copyright 2014 Уиллиам Питкок\n"
 "\n"
 "Основан на плагине SDL Output для Audacious\n"
-"Права защищены 2010 Джон Линдгрэн"
+"Copyright 2010 Джон Линдгрэн"
 
-#: src/qtui/dialog_windows.cc:31
-msgid "Working ..."
-msgstr "Работаю ..."
+#: src/qtglspectrum/gl-spectrum.cc:41
+msgid ""
+"OpenGL Spectrum Analyzer for Audacious\n"
+"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
+"Copyright 2014, 2020 Ariadne Conill\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é, John Lindgren, and Carlo Bramini\n"
+"Copyright 2014, 2020 Ariadne Conill\n"
+"\n"
+"Основан на плагине XMMS:\n"
+"Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson, and "
+"4Front Technologies\n"
+"\n"
+"Лицензия: GPLv2+"
 
-#: src/qtui/filter_input.cc:44 src/skins/ui_playlist.cc:221
-msgid "Search"
-msgstr "Поиск"
+#: src/qthotkey/gui.cc:177
+msgid "Press a key combination inside a text field."
+msgstr "Зажмите сочетание клавиш в текстовом поле."
 
-#: src/qtui/main_window_actions.cc:94
+#: src/qthotkey/plugin.cc:105
+msgid ""
+"Global Hotkey Plugin\n"
+"Control the player with global key combinations or multimedia keys.\n"
+"\n"
+"Copyright (C) 2020 i.Dark_Templar <darktemplar@dark-templar-archives.net>\n"
+"Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n"
+"\n"
+"Contributors 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"
+"Copyright (C) 2020 i.Dark_Templar <darktemplar@dark-templar-archives.net>\n"
+"Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n"
+"\n"
+"Contributors 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/qtui/menus.cc:109
 msgid "_Open Folder ..."
-msgstr "_Oткрыть папку ..."
+msgstr "_Открыть папку ..."
 
-#: src/qtui/main_window_actions.cc:96
+#: src/qtui/menus.cc:115
 msgid "_Add Folder ..."
 msgstr "_Добавить папку ..."
 
-#: src/qtui/main_window_actions.cc:101
+#: src/qtui/menus.cc:128
 msgid "_Log Inspector ..."
-msgstr "_Инспектор журнала ..."
+msgstr "_Инспектор журнала..."
 
-#: src/qtui/main_window.cc:64
-msgid "Open Files"
-msgstr "Открыть файлы"
+#: src/qtui/menus.cc:220
+msgid "_Find ..."
+msgstr "_Найти..."
 
-#: src/qtui/main_window.cc:66
-msgid "Add Files"
-msgstr "Добавить файлы"
+#: src/qtui/menus.cc:256 src/skins/menus.cc:80 src/skins-qt/menus.cc:70
+msgid "Audio Settings ..."
+msgstr "Настройки звука ..."
 
-#: src/qtui/main_window.cc:71 src/skins/menus.cc:90
-msgid "Previous"
-msgstr "Предыдущая дорожка"
+#: src/qtui/playlist_model.cc:188
+msgid "Q#"
+msgstr "№О"
 
-#: src/qtui/main_window.cc:77 src/skins/menus.cc:82
-msgid "Repeat"
-msgstr "Повтор"
+#: src/qtui/playlist_model.cc:190
+msgid "T#"
+msgstr "№Д"
 
-#: src/qtui/main_window.cc:79 src/skins/menus.cc:83
-msgid "Shuffle"
-msgstr "Случайно"
+#: src/qtui/playlist_model.cc:192
+msgid "C#"
+msgstr "№К"
+
+#: src/qtui/playlist_model.cc:194
+msgid "D#"
+msgstr "№Д"
 
-#: src/qtui/qtui.cc:42
+#: src/qtui/qtui.cc:40
 msgid "Qt Interface"
 msgstr "Интерфейс Qt"
 
+#: src/qtui/search_bar.cc:46
+msgid "Search playlist"
+msgstr "Найти список воспроизведения"
+
+#: src/qtui/settings.cc:79
+msgid "Use bold font for column headers"
+msgstr "Использовать жирный шрифт в заголовках столбцов"
+
 #: src/resample/resample.cc:43
 msgid "Sample Rate Converter"
 msgstr "Конвертер частоты"
@@ -2875,12 +3226,12 @@
 "Sample Rate Converter Plugin for Audacious\n"
 "Copyright 2010-2012 John Lindgren"
 msgstr ""
-"Конвертер частоты дискретизации Плагин для Audacious\n"
-"Авторство 2010-2012 Джон Линдгрен"
+"Модуль конвертера частоты дискретизации для Audacious\n"
+"Copyright 2010-2012 John Lindgren"
 
 #: src/resample/resample.cc:187
 msgid "Skip/repeat samples"
-msgstr "Пропустить/повторить сэмплы"
+msgstr "Пропустить / повторить отрывки"
 
 #: src/resample/resample.cc:188
 msgid "Linear interpolation"
@@ -2888,15 +3239,15 @@
 
 #: src/resample/resample.cc:189
 msgid "Fast sinc interpolation"
-msgstr "Быстрая sinc интерполяция"
+msgstr "Быстрая sinc-интерполяция"
 
 #: src/resample/resample.cc:190
 msgid "Medium sinc interpolation"
-msgstr "Средняя sinc интерполяция"
+msgstr "Средняя sinc-интерполяция"
 
 #: src/resample/resample.cc:191
 msgid "Best sinc interpolation"
-msgstr "Лучшая sinc интерполяция"
+msgstr "Лучшая sinc-интерполяция"
 
 #: src/resample/resample.cc:195
 msgid "Conversion"
@@ -2906,7 +3257,7 @@
 msgid "Method:"
 msgstr "Метод:"
 
-#: src/resample/resample.cc:199 src/sox-resampler/sox-resampler.cc:161
+#: src/resample/resample.cc:199 src/soxr/sox-resampler.cc:203
 msgid "Rate:"
 msgstr "Частота:"
 
@@ -2916,7 +3267,7 @@
 
 #: src/resample/resample.cc:203
 msgid "Use rate mappings"
-msgstr "Использвать карту частот"
+msgstr "Использовать карту частот"
 
 #: src/resample/resample.cc:205
 msgid "8 kHz:"
@@ -2928,15 +3279,15 @@
 
 #: src/resample/resample.cc:213
 msgid "22.05 kHz:"
-msgstr "22.05 кГц:"
+msgstr "22,05 кГц:"
 
 #: src/resample/resample.cc:217
 msgid "32.0 kHz:"
-msgstr "32.0 кГц:"
+msgstr "32,0 кГц:"
 
 #: src/resample/resample.cc:221
 msgid "44.1 kHz:"
-msgstr "44.1 кГц:"
+msgstr "44,1 кГц:"
 
 #: src/resample/resample.cc:225
 msgid "48 kHz:"
@@ -2944,7 +3295,7 @@
 
 #: src/resample/resample.cc:229
 msgid "88.2 kHz:"
-msgstr "88.2 кГц:"
+msgstr "88,2 кГц:"
 
 #: src/resample/resample.cc:233
 msgid "96 kHz:"
@@ -2952,196 +3303,182 @@
 
 #: src/resample/resample.cc:237
 msgid "176.4 kHz:"
-msgstr "176.4 кГц:"
+msgstr "176,4 кГц:"
 
 #: src/resample/resample.cc:241
 msgid "192 kHz:"
 msgstr "192 кГц:"
 
-#: src/scrobbler2/config_window.cc:41
-#, c-format
-msgid "OK. Scrobbling for user: %s"
-msgstr "OK. Прослушивание для пользователя: %s"
-
-#: src/scrobbler2/config_window.cc:54
-msgid "Permission Denied"
-msgstr "Отказано в доступе"
+#: src/scrobbler2/config_window.cc:29
+msgid "Checking Last.fm access ..."
+msgstr "Проверяется доступ к Last.fm..."
 
-#: src/scrobbler2/config_window.cc:56
-msgid "Access the following link to allow Audacious to scrobble your plays:"
+#: src/scrobbler2/config_window.cc:35
+msgid ""
+"Your scrobbles are being saved on your computer temporarily. They will be "
+"submitted as soon as Audacious is allowed access."
 msgstr ""
-"Воспользуйтесь следующей ссылкой чтобы разрешить Audacious отправлять "
-"прослушанные композиции на Last.fm:"
+"Список ваших прослушиваний временно сохраняется на вашем компьютере. Он "
+"будет отправлен на Last.fm, как только Audacious получит доступ."
 
-#: src/scrobbler2/config_window.cc:66
-msgid "Keep this window open and click 'Check Permission' again.\n"
-msgstr ""
-"Оставте это окно открытым и нажмите кнопку \" Запросить разрешение' снова.\n"
+#: src/scrobbler2/config_window.cc:41
+#, c-format
+msgid "Permission granted. Scrobbling for user %s."
+msgstr "Доступ получен. Пользователь %s."
 
-#: src/scrobbler2/config_window.cc:69 src/scrobbler2/config_window.cc:80
+#: src/scrobbler2/config_window.cc:44
 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."
+"Permission denied. Open the following URL in a browser, allow Audacious "
+"access to your account, and then click 'Check Permission' again:"
 msgstr ""
-"Не беспокойтесь, список ваших прослушиваний сохраняется на компьютере.\n"
-"Он будет доставлен на Last.fm, как только Audacious получит разрешение это "
-"сделать."
-
-#: src/scrobbler2/config_window.cc:77
-msgid "Network Problem."
-msgstr "Проблемы с сетью"
+"В доступе отказано. Откройте ссылку ниже в вашем браузере, предоставьте "
+"доступ для Audacious, а затем нажмите «Проверить доступ» ещё раз:"
 
-#: src/scrobbler2/config_window.cc:78
-msgid "There was a problem contacting Last.fm. Please try again later."
-msgstr "Невозможно подключится к Last.fm. Попробуйте повторить позже"
+#: src/scrobbler2/config_window.cc:53
+msgid "There was a problem contacting Last.fm."
+msgstr "Не удалось подключиться к Last.fm."
 
-#: src/scrobbler2/config_window.cc:110
-msgid "Checking..."
-msgstr "Проверка..."
+#: src/scrobbler2/config_window.cc:92
+msgid "Check Permission"
+msgstr "Проверить доступ"
 
-#: src/scrobbler2/config_window.cc:176
-msgid "C_heck Permission"
-msgstr "З_апросить разрешение"
+#: src/scrobbler2/config_window.cc:93
+msgid "Revoke Permission"
+msgstr "Отменить доступ"
 
-#: src/scrobbler2/config_window.cc:177
-msgid "_Revoke Permission"
-msgstr "_Отменить разрешение"
-
-#: src/scrobbler2/config_window.cc:220
-msgid ""
-"You need to allow Audacious to scrobble tracks to your Last.fm account.\n"
+#: src/scrobbler2/config_window.cc:97
+msgid "You need to allow Audacious to scrobble tracks to your Last.fm account."
 msgstr ""
-"Вы должны разрешить Audacious отправлять прослушанные дорожки в ваш аккаунт "
-"Last.fm\n"
+"Вы должны разрешить Audacious отправлять прослушанные дорожки в вашу учётную "
+"запись Last.fm."
 
 #: src/scrobbler2/scrobbler.cc:29
 msgid "Scrobbler 2.0"
 msgstr "Скробблер 2.0"
 
-#: src/scrobbler2/scrobbler.cc:224
+#: src/scrobbler2/scrobbler.cc:200
 msgid ""
 "The Scrobbler plugin could not be started.\n"
 "There might be a problem with your installation."
 msgstr ""
-"Плагин scrobbler не может быть запущен.\n"
-"Могут быть проблемы с установкой"
+"Не удалось запустить модуль скробблера\n"
+"Возможно проблемы с вашей установкой."
 
-#: src/scrobbler2/scrobbler.cc:289
+#: src/scrobbler2/scrobbler.cc:245
 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"
+"project."
 msgstr ""
-"Audacious Scrobbler Plugin 2.0 by Pitxyoki,\n"
+"Модуль скробблера 2.0 для Audacious от Pitxyoki,\n"
 "\n"
-"Авторство © 2012-2013 Luís M. Picciochi Oliveira <Pitxyoki@Gmail.com>\n"
+"Авторское право © 2012-2013 Luís M. Picciochi Oliveira <Pitxyoki@Gmail.com>\n"
 "\n"
-"Спасибо Джону Линдгрен что подал мне руку в начале этого проекта.\n"
-
-#: src/scrobbler2/scrobbler_communication.cc:642
-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"
+"Спасибо John Lindgren за оказание помощи в начале этого проекта."
 
-#: src/sdlout/sdlout.cc:48
+#: src/sdlout/sdlout.cc:43
 msgid "SDL Output"
 msgstr "Вывод SDL"
 
-#: src/sdlout/sdlout.cc:77
+#: src/sdlout/sdlout.cc:72
 msgid ""
 "SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
 msgstr ""
-" \n"
-"SDL модуль Вывода для Audacious\n"
-"Авторство 2010 Джон Линдгрен"
+"Модуль вывода SDL для Audacious\n"
+"Copyright 2010 John Lindgren"
 
-#: src/search-tool/search-tool.cc:116 src/search-tool/search-tool.cc:124
+#: src/search-tool/library.cc:35 src/search-tool/library.cc:46
+#: src/search-tool-qt/library.cc:35 src/search-tool-qt/library.cc:46
 msgid "Library"
-msgstr "Библиотека"
-
-#: src/search-tool/search-tool.cc:394
-#, c-format
-msgid "%d result"
-msgid_plural "%d results"
-msgstr0 "%d результат"
-msgstr1 "%d результатов"
-msgstr2 "%d результатов"
-msgstr3 "%d результатов"
-
-#: src/search-tool/search-tool.cc:400
-#, c-format
-msgid "(%d hidden)"
-msgid_plural "(%d hidden)"
-msgstr0 "(%d скрыто)"
-msgstr1 "(%d скрыто)"
-msgstr2 "(%d скрыто)"
-msgstr3 "(%d скрыто)"
+msgstr "Фонотека"
 
-#: src/search-tool/search-tool.cc:594
+#: src/search-tool-qt/search-model.cc:44 src/search-tool/search-tool.cc:287
 #, c-format
 msgid "%d song"
 msgid_plural "%d songs"
 msgstr0 "%d песня"
-msgstr1 "%d песен"
+msgstr1 "%d песни"
 msgstr2 "%d песен"
 msgstr3 "%d песен"
 
-#: src/search-tool/search-tool.cc:601
+#: src/search-tool-qt/search-model.cc:53 src/search-tool/search-tool.cc:294
 msgid "of this genre"
 msgstr "этого жанра"
 
-#: src/search-tool/search-tool.cc:607
+#: src/search-tool-qt/search-model.h:47 src/search-tool/search-model.h:45
 msgid "on"
 msgstr "на"
 
-#: src/search-tool/search-tool.cc:607
+#: src/search-tool-qt/search-model.h:47 src/search-tool/search-model.h:45
 msgid "by"
 msgstr "от"
 
-#: src/search-tool/search-tool.cc:643
-msgid "_Create Playlist"
-msgstr "_Создать список воспроизведения"
-
-#: src/search-tool/search-tool.cc:645
-msgid "_Add to Playlist"
-msgstr "_Добавить в список воспроизведения"
-
-#: src/search-tool/search-tool.cc:684
-msgid "Search library"
-msgstr "Поиск в библиотеке"
+#: src/search-tool-qt/search-tool-qt.cc:165 src/search-tool/search-tool.cc:74
+msgid "Number of results to show:"
+msgstr "Количество результатов, чтобы показать:"
+
+#: src/search-tool-qt/search-tool-qt.cc:168 src/search-tool/search-tool.cc:77
+msgid "Rescan library at startup"
+msgstr "Пересканировать фонотеку при запуске"
+
+#: src/search-tool-qt/search-tool-qt.cc:170
+msgid "Monitor library for changes"
+msgstr "Следить за изменениями фонотеки"
 
-#: src/search-tool/search-tool.cc:688
+#: src/search-tool-qt/search-tool-qt.cc:193 src/search-tool/search-tool.cc:450
 msgid ""
 "To import your music library into Audacious, choose a folder and then click "
 "the \"refresh\" icon."
 msgstr ""
-"Для импорта музыки в библиотеку Audacious выберите каталог, затем нажмите "
-"иконку \"обновить\"."
+"Для импорта музыки в фонотеку Audacious выберите папку, затем нажмите на "
+"значок «обновить»."
 
-#: src/search-tool/search-tool.cc:696
+#: src/search-tool-qt/search-tool-qt.cc:195 src/search-tool/search-tool.cc:459
 msgid "Please wait ..."
-msgstr "Пожалуйста, подождите ..."
+msgstr "Пожалуйста, подождите..."
 
-#: src/search-tool/search-tool.cc:723
+#: src/search-tool-qt/search-tool-qt.cc:197 src/search-tool/search-tool.cc:487
 msgid "Choose Folder"
-msgstr "Выберите каталог"
+msgstr "Выберите папку"
+
+#: src/search-tool-qt/search-tool-qt.cc:201 src/search-tool/search-tool.cc:445
+msgid "Search library"
+msgstr "Поиск в фонотеке"
+
+#: src/search-tool-qt/search-tool-qt.cc:327 src/search-tool/search-tool.cc:156
+#, c-format
+msgid "%d of %d result shown"
+msgid_plural "%d of %d results shown"
+msgstr0 "%d of %d results shown"
+msgstr1 "%d of%dьresults shown"
+msgstr2 "%d of %d results shown"
+msgstr3 "%dиз%d результатов показаны"
+
+#: src/search-tool-qt/search-tool-qt.cc:331 src/search-tool/search-tool.cc:160
+#, c-format
+msgid "%d result"
+msgid_plural "%d results"
+msgstr0 "%d результат"
+msgstr1 "%d результатов"
+msgstr2 "%d результатов"
+msgstr3 "%d результатов"
+
+#: src/search-tool-qt/search-tool-qt.cc:501 src/search-tool/search-tool.cc:341
+msgid "_Create Playlist"
+msgstr "_Создать список воспроизведения"
+
+#: src/search-tool-qt/search-tool-qt.cc:503 src/search-tool/search-tool.cc:343
+msgid "_Add to Playlist"
+msgstr "_Добавить в список воспроизведения"
 
 #: src/sid/xmms-sid.cc:43
 msgid "SID Player"
 msgstr "Проигрыватель SID"
 
-#: src/sid/xs_config.cc:61
-msgid "Output"
-msgstr "Вывод"
-
 #: src/sid/xs_config.cc:62
 msgid "Channels:"
 msgstr "Каналы:"
@@ -3164,11 +3501,11 @@
 
 #: src/sid/xs_config.cc:75
 msgid "Clock speed:"
-msgstr ""
+msgstr "Тактовая частота:"
 
 #: src/sid/xs_config.cc:78
 msgid "Do not automatically select clock speed"
-msgstr ""
+msgstr "Не выбирать тактовую частоту автоматически"
 
 #: src/sid/xs_config.cc:80
 msgid "Playback time"
@@ -3176,7 +3513,7 @@
 
 #: src/sid/xs_config.cc:81
 msgid "Set maximum playback time:"
-msgstr "Назначить максимальное время воспроизведения:"
+msgstr "Назначить предельное время воспроизведения:"
 
 #: src/sid/xs_config.cc:87
 msgid "Use only when song length is unknown"
@@ -3184,779 +3521,722 @@
 
 #: src/sid/xs_config.cc:90
 msgid "Set minimum playback time:"
-msgstr "Назначить минимальное время воспроизведения:"
+msgstr "Назначить наименьшее время воспроизведения:"
 
 #: src/sid/xs_config.cc:96
 msgid "Subtunes"
-msgstr ""
+msgstr "Подстройка"
 
 #: src/sid/xs_config.cc:97
 msgid "Enable subtunes"
-msgstr ""
+msgstr "Включить подстройку"
 
 #: src/sid/xs_config.cc:99
 msgid "Ignore subtunes shorter than:"
-msgstr ""
+msgstr "Не учитывать подстройку короче чем:"
 
 #: src/sid/xs_config.cc:105
 msgid "Note"
-msgstr ""
+msgstr "Заметка"
 
 #: src/silence-removal/silence-removal.cc:39
 msgid "Silence Removal"
-msgstr "Шумоподавление"
+msgstr "Удаление тишины"
 
 #: src/silence-removal/silence-removal.cc:58
 msgid ""
 "Silence Removal Plugin for Audacious\n"
 "Copyright 2014 John Lindgren"
 msgstr ""
-"Плагин шумоподавления для Audacious\n"
-"Права защищены 2014 Джон Линдгрэн"
+"Модуль удаления тишины для Audacious\n"
+"Copyright 2014 John Lindgren"
 
 #: src/silence-removal/silence-removal.cc:67
 msgid "Silence Removal"
-msgstr "Шумоподавление"
+msgstr "Удаление тишины"
 
 #: src/silence-removal/silence-removal.cc:68
 msgid "Threshold:"
-msgstr "Примесь:"
+msgstr "Порог:"
 
-#: src/silence-removal/silence-removal.cc:70
-msgid "dB"
-msgstr "дБ"
+#: src/skins/actions.cc:45 src/skins-qt/actions.cc:43
+msgid "Repeat points cleared."
+msgstr "Повторить очищенные пункты"
+
+#: src/skins/actions.cc:60 src/skins-qt/actions.cc:58
+msgid "Repeat point A set."
+msgstr "Точка повтора А установлена."
+
+#: src/skins/actions.cc:65 src/skins-qt/actions.cc:63
+msgid "Repeat point B set."
+msgstr "Точка повтора Б установлена."
 
-#: src/skins/menus.cc:64
+#: src/skins/equalizer.cc:223 src/skins-qt/equalizer.cc:223
+msgid "Preamp"
+msgstr "Предусиление"
+
+#: src/skins/equalizer.cc:227 src/skins-qt/equalizer.cc:227
+msgid "31 Hz"
+msgstr "31 Гц"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "63 Hz"
+msgstr "63 Гц"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "125 Hz"
+msgstr "125 Гц"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "250 Hz"
+msgstr "250 Гц"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "500 Hz"
+msgstr "500 Гц"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "1 kHz"
+msgstr "1 кГц"
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "2 kHz"
+msgstr "2 кГц"
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "4 kHz"
+msgstr "4 кГц"
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "8 kHz"
+msgstr "8 кГц"
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "16 kHz"
+msgstr "16 кГц"
+
+#: src/skins/equalizer.cc:270 src/skins-qt/equalizer.cc:270
+msgid "Audacious Equalizer"
+msgstr "Эквалайзер Audacious"
+
+#: src/skins/main.cc:459 src/skins-qt/main.cc:442
+msgid "Recording on"
+msgstr "Запись включена"
+
+#: src/skins/main.cc:461 src/skins-qt/main.cc:444
+msgid "Recording off"
+msgstr "Запись отключена"
+
+#: src/skins/main.cc:754 src/skins-qt/main.cc:701
+#, c-format
+msgid "Seek to %d:%-2.2d / %d:%-2.2d"
+msgstr "Переход к %d:%-2.2d / %d:%-2.2d"
+
+#: src/skins/main.cc:771 src/skins-qt/main.cc:718
+#, c-format
+msgid "Volume: %d%%"
+msgstr "Громкость: %d%%"
+
+#: src/skins/main.cc:784 src/skins-qt/main.cc:731
+#, c-format
+msgid "Balance: %d%% left"
+msgstr "Баланс: %d%% влево"
+
+#: src/skins/main.cc:786 src/skins-qt/main.cc:733
+msgid "Balance: center"
+msgstr "Баланс: по центру"
+
+#: src/skins/main.cc:788 src/skins-qt/main.cc:735
+#, c-format
+msgid "Balance: %d%% right"
+msgstr "Баланс: %d%% вправо"
+
+#: src/skins/main.cc:880 src/skins-qt/main.cc:827
+msgid "Options Menu"
+msgstr "Список настроек"
+
+#: src/skins/main.cc:884 src/skins-qt/main.cc:831
+msgid "Disable 'Always On Top'"
+msgstr "Отключить «Поверх всех окон»"
+
+#: src/skins/main.cc:886 src/skins-qt/main.cc:833
+msgid "Enable 'Always On Top'"
+msgstr "Включить «Поверх всех окон»"
+
+#: src/skins/main.cc:889 src/skins-qt/main.cc:836
+msgid "File Info Box"
+msgstr "Сведения о файле"
+
+#: src/skins/main.cc:892 src/skins/menus.cc:149 src/skins-qt/main.cc:839
+#: src/skins-qt/menus.cc:142
+msgid "Double Size"
+msgstr "Двойной размер"
+
+#: src/skins/main.cc:895 src/skins-qt/main.cc:842
+msgid "Visualizations"
+msgstr "Зрительные образы"
+
+#: src/skins/menus.cc:74 src/skins-qt/menus.cc:64
+msgid "Volume Up"
+msgstr "Увеличить громкость"
+
+#: src/skins/menus.cc:75 src/skins-qt/menus.cc:65
+msgid "Volume Down"
+msgstr "Уменьшить громкость"
+
+#: src/skins/menus.cc:77 src/skins-qt/menus.cc:67
+msgid "Effects ..."
+msgstr "Эффекты..."
+
+#: src/skins/menus.cc:84 src/skins-qt/menus.cc:74
 msgid "Open Files ..."
 msgstr "Открыть файлы..."
 
-#: src/skins/menus.cc:65
+#: src/skins/menus.cc:85 src/skins-qt/menus.cc:76
 msgid "Open URL ..."
-msgstr "Открыть URL..."
-
-#: src/skins/menus.cc:66
-msgid "Search Library"
-msgstr "Поиск в библиотеке"
+msgstr "Открыть ссылку..."
 
-#: src/skins/menus.cc:68
-msgid "Playback"
-msgstr "Воспроизведение"
-
-#: src/skins/menus.cc:69
+#: src/skins/menus.cc:89 src/skins-qt/menus.cc:80
 msgid "Playlist"
 msgstr "Плейлист"
 
-#: src/skins/menus.cc:70
+#: src/skins/menus.cc:90 src/skins-qt/menus.cc:81
+msgid "Output"
+msgstr "Вывод"
+
+#: src/skins/menus.cc:91 src/skins-qt/menus.cc:82
 msgid "View"
 msgstr "Вид"
 
-#: src/skins/menus.cc:72 src/skins/menus.cc:136 src/skins/menus.cc:149
-#: src/skins/menus.cc:214
+#: src/skins/menus.cc:93 src/skins/menus.cc:161 src/skins/menus.cc:174
+#: src/skins/menus.cc:245 src/skins-qt/menus.cc:84 src/skins-qt/menus.cc:156
+#: src/skins-qt/menus.cc:170 src/skins-qt/menus.cc:241
 msgid "Services"
 msgstr "Службы"
 
-#: src/skins/menus.cc:74
+#: src/skins/menus.cc:95 src/skins-qt/menus.cc:86
 msgid "About ..."
-msgstr "О..."
+msgstr "О приложении..."
 
-#: src/skins/menus.cc:75
+#: src/skins/menus.cc:96 src/skins-qt/menus.cc:87
 msgid "Settings ..."
-msgstr "настройки ..."
+msgstr "Настройки..."
 
-#: src/skins/menus.cc:76
+#: src/skins/menus.cc:97 src/skins-qt/menus.cc:88
 msgid "Quit"
 msgstr "Выход"
 
-#: src/skins/menus.cc:80 src/skins/menus.cc:206
+#: src/skins/menus.cc:101 src/skins/menus.cc:235 src/skins-qt/menus.cc:92
+#: src/skins-qt/menus.cc:231
 msgid "Song Info ..."
-msgstr "Информация о песне"
+msgstr "Сведения о песне"
 
-#: src/skins/menus.cc:84
+#: src/skins/menus.cc:105 src/skins-qt/menus.cc:96
+msgid "Shuffle by Album"
+msgstr "Вразброс по альбомам"
+
+#: src/skins/menus.cc:106 src/skins-qt/menus.cc:97
 msgid "No Playlist Advance"
 msgstr "Без движения по списку воспроизведения"
 
-#: src/skins/menus.cc:85
-msgid "Stop After This Song"
-msgstr "Остановить после этой песни"
-
-#: src/skins/menus.cc:93
+#: src/skins/menus.cc:117 src/skins-qt/menus.cc:108
 msgid "Set A-B Repeat"
-msgstr "Установить A-B повтор"
+msgstr "Установить повтор А-Б"
 
-#: src/skins/menus.cc:94
+#: src/skins/menus.cc:118 src/skins-qt/menus.cc:109
 msgid "Clear A-B Repeat"
-msgstr "Удалить A-B повтор"
+msgstr "Удалить повтор А-Б"
 
-#: src/skins/menus.cc:96
+#: src/skins/menus.cc:120 src/skins-qt/menus.cc:111
 msgid "Jump to Song ..."
-msgstr "Перейти к песне ..."
+msgstr "Перейти к песне..."
 
-#: src/skins/menus.cc:97
+#: src/skins/menus.cc:121 src/skins-qt/menus.cc:113
 msgid "Jump to Time ..."
-msgstr "Перейти ко времени ..."
+msgstr "Перейти ко времени..."
 
-#: src/skins/menus.cc:101
+#: src/skins/menus.cc:125 src/skins-qt/menus.cc:118
 msgid "Play/Resume"
 msgstr "Воспроизвести/продолжить"
 
-#: src/skins/menus.cc:103
+#: src/skins/menus.cc:127 src/skins-qt/menus.cc:120
 msgid "New Playlist"
 msgstr "Новый список воспроизведения"
 
-#: src/skins/menus.cc:104
+#: src/skins/menus.cc:128 src/skins-qt/menus.cc:121
 msgid "Rename Playlist ..."
 msgstr "Переименовать список"
 
-#: src/skins/menus.cc:105
+#: src/skins/menus.cc:129 src/skins-qt/menus.cc:122
 msgid "Remove Playlist"
 msgstr "Удалить плейлист"
 
-#: src/skins/menus.cc:107
+#: src/skins/menus.cc:131 src/skins-qt/menus.cc:124
 msgid "Previous Playlist"
 msgstr "Предыдущий список"
 
-#: src/skins/menus.cc:108
+#: src/skins/menus.cc:132 src/skins-qt/menus.cc:125
 msgid "Next Playlist"
 msgstr "Следующий список"
 
-#: src/skins/menus.cc:110
+#: src/skins/menus.cc:134 src/skins-qt/menus.cc:127
 msgid "Import Playlist ..."
 msgstr "Импортировать список воспроизведения"
 
-#: src/skins/menus.cc:111
+#: src/skins/menus.cc:135 src/skins-qt/menus.cc:128
 msgid "Export Playlist ..."
 msgstr "Экспортировать список воспроизведения"
 
-#: src/skins/menus.cc:113
+#: src/skins/menus.cc:137 src/skins-qt/menus.cc:130
 msgid "Playlist Manager ..."
 msgstr "Управление списками..."
 
-#: src/skins/menus.cc:114
+#: src/skins/menus.cc:138 src/skins-qt/menus.cc:131
 msgid "Queue Manager ..."
-msgstr "Управление очередью ..."
+msgstr "Управление очередью..."
 
-#: src/skins/menus.cc:116
+#: src/skins/menus.cc:140 src/skins-qt/menus.cc:133
 msgid "Refresh Playlist"
 msgstr "Обновить список воспроизведения"
 
-#: src/skins/menus.cc:120
+#: src/skins/menus.cc:144 src/skins-qt/menus.cc:137
 msgid "Show Playlist Editor"
 msgstr "Отобразить редактор списка воспроизведения"
 
-#: src/skins/menus.cc:121
+#: src/skins/menus.cc:145 src/skins-qt/menus.cc:138
 msgid "Show Equalizer"
 msgstr "Отобразить эквалайзер"
 
-#: src/skins/menus.cc:123
+#: src/skins/menus.cc:147 src/skins-qt/menus.cc:140
 msgid "Show Remaining Time"
-msgstr "Показать Оставшееся время"
+msgstr "Показать оставшееся время"
 
-#: src/skins/menus.cc:125
+#: src/skins/menus.cc:150 src/skins-qt/menus.cc:143
 msgid "Always on Top"
 msgstr "Поверх всех окон"
 
-#: src/skins/menus.cc:126
+#: src/skins/menus.cc:151 src/skins-qt/menus.cc:145
 msgid "On All Workspaces"
 msgstr "На всех рабочих столах"
 
-#: src/skins/menus.cc:128
+#: src/skins/menus.cc:153 src/skins-qt/menus.cc:148
 msgid "Roll Up Player"
 msgstr "Свернуть проигрыватель"
 
-#: src/skins/menus.cc:129
+#: src/skins/menus.cc:154 src/skins-qt/menus.cc:149
 msgid "Roll Up Playlist Editor"
 msgstr "Свернуть редактор списка воспроизведения"
 
-#: src/skins/menus.cc:130
+#: src/skins/menus.cc:155 src/skins-qt/menus.cc:150
 msgid "Roll Up Equalizer"
 msgstr "Свернуть эквалайзер"
 
-#: src/skins/menus.cc:132 src/skins/ui_main.cc:854
-msgid "Double Size"
-msgstr "Двойной размер"
-
-#: src/skins/menus.cc:138
+#: src/skins/menus.cc:163 src/skins-qt/menus.cc:158
 msgid "Add URL ..."
-msgstr "Добавить URL ..."
+msgstr "Добавить ссылку..."
 
-#: src/skins/menus.cc:139
+#: src/skins/menus.cc:164 src/skins-qt/menus.cc:160
 msgid "Add Files ..."
 msgstr "Добавить файлы..."
 
-#: src/skins/menus.cc:143 src/skins/menus.cc:171 src/skins/menus.cc:185
+#: src/skins/menus.cc:168 src/skins/menus.cc:196 src/skins/menus.cc:212
+#: src/skins-qt/menus.cc:164 src/skins-qt/menus.cc:192
+#: src/skins-qt/menus.cc:208
 msgid "By Title"
 msgstr "По названию"
 
-#: src/skins/menus.cc:144 src/skins/menus.cc:178 src/skins/menus.cc:192
+#: src/skins/menus.cc:169 src/skins/menus.cc:203 src/skins/menus.cc:219
+#: src/skins-qt/menus.cc:165 src/skins-qt/menus.cc:199
+#: src/skins-qt/menus.cc:215
 msgid "By File Name"
 msgstr "По имени файла"
 
-#: src/skins/menus.cc:145 src/skins/menus.cc:179 src/skins/menus.cc:193
+#: src/skins/menus.cc:170 src/skins/menus.cc:204 src/skins/menus.cc:220
+#: src/skins-qt/menus.cc:166 src/skins-qt/menus.cc:200
+#: src/skins-qt/menus.cc:216
 msgid "By File Path"
 msgstr "По расположению _файла"
 
-#: src/skins/menus.cc:151
+#: src/skins/menus.cc:176 src/skins-qt/menus.cc:172
 msgid "Remove All"
 msgstr "Удалить все"
 
-#: src/skins/menus.cc:152
+#: src/skins/menus.cc:177 src/skins-qt/menus.cc:173
 msgid "Clear Queue"
 msgstr "Очистить очередь"
 
-#: src/skins/menus.cc:154
+#: src/skins/menus.cc:179 src/skins-qt/menus.cc:175
 msgid "Remove Unavailable Files"
 msgstr "Удалить недоступные файлы"
 
-#: src/skins/menus.cc:155
+#: src/skins/menus.cc:180 src/skins-qt/menus.cc:176
 msgid "Remove Duplicates"
 msgstr "Удалить дубликаты"
 
-#: src/skins/menus.cc:157
+#: src/skins/menus.cc:182 src/skins-qt/menus.cc:178
 msgid "Remove Unselected"
 msgstr "Удалить не отмеченные"
 
-#: src/skins/menus.cc:158
+#: src/skins/menus.cc:183 src/skins-qt/menus.cc:179
 msgid "Remove Selected"
 msgstr "Удалить выбранные"
 
-#: src/skins/menus.cc:162
+#: src/skins/menus.cc:187 src/skins-qt/menus.cc:183
 msgid "Search and Select"
 msgstr "Найти и выбрать"
 
-#: src/skins/menus.cc:164
+#: src/skins/menus.cc:189 src/skins-qt/menus.cc:185
 msgid "Invert Selection"
 msgstr "Инвертировать выбор"
 
-#: src/skins/menus.cc:165
+#: src/skins/menus.cc:190 src/skins-qt/menus.cc:186
 msgid "Select None"
 msgstr "Снять выделение"
 
-#: src/skins/menus.cc:166
+#: src/skins/menus.cc:191 src/skins-qt/menus.cc:187
 msgid "Select All"
 msgstr "Выбрать все"
 
-#: src/skins/menus.cc:170 src/skins/menus.cc:184
+#: src/skins/menus.cc:195 src/skins/menus.cc:211 src/skins-qt/menus.cc:191
+#: src/skins-qt/menus.cc:207
 msgid "By Track Number"
 msgstr "По номеру дорожки"
 
-#: src/skins/menus.cc:172 src/skins/menus.cc:186
+#: src/skins/menus.cc:197 src/skins/menus.cc:213 src/skins-qt/menus.cc:193
+#: src/skins-qt/menus.cc:209
 msgid "By Artist"
 msgstr "По исполнителю"
 
-#: src/skins/menus.cc:173 src/skins/menus.cc:187
+#: src/skins/menus.cc:198 src/skins/menus.cc:214 src/skins-qt/menus.cc:194
+#: src/skins-qt/menus.cc:210
 msgid "By Album"
 msgstr "По альбому"
 
-#: src/skins/menus.cc:174 src/skins/menus.cc:188
+#: src/skins/menus.cc:199 src/skins/menus.cc:215 src/skins-qt/menus.cc:195
+#: src/skins-qt/menus.cc:211
 msgid "By Album Artist"
 msgstr "По исполнителю"
 
-#: src/skins/menus.cc:175 src/skins/menus.cc:190
+#: src/skins/menus.cc:200 src/skins/menus.cc:216 src/skins-qt/menus.cc:196
+#: src/skins-qt/menus.cc:212
 msgid "By Release Date"
-msgstr "По _дате выпуска"
+msgstr "По дате выпуска"
 
-#: src/skins/menus.cc:176 src/skins/menus.cc:189
+#: src/skins/menus.cc:201 src/skins/menus.cc:217 src/skins-qt/menus.cc:197
+#: src/skins-qt/menus.cc:213
 msgid "By Genre"
 msgstr "По жанру"
 
-#: src/skins/menus.cc:177 src/skins/menus.cc:191
+#: src/skins/menus.cc:202 src/skins/menus.cc:218 src/skins-qt/menus.cc:198
+#: src/skins-qt/menus.cc:214
 msgid "By Length"
 msgstr "По длительности"
 
-#: src/skins/menus.cc:180 src/skins/menus.cc:194
+#: src/skins/menus.cc:205 src/skins/menus.cc:221 src/skins-qt/menus.cc:201
+#: src/skins-qt/menus.cc:217
 msgid "By Custom Title"
 msgstr "По _заданному названию файла"
 
-#: src/skins/menus.cc:198
+#: src/skins/menus.cc:206 src/skins/menus.cc:222 src/skins-qt/menus.cc:202
+#: src/skins-qt/menus.cc:218
+msgid "By Comment"
+msgstr "По комментарию"
+
+#: src/skins/menus.cc:207 src/skins/menus.cc:223 src/skins-qt/menus.cc:203
+#: src/skins-qt/menus.cc:219
+msgid "By Disc Number"
+msgstr "По номеру диску"
+
+#: src/skins/menus.cc:227 src/skins-qt/menus.cc:223
 msgid "Randomize List"
-msgstr "Сортировать в случайном порядке"
+msgstr "Упорядочивать в случайном порядке"
 
-#: src/skins/menus.cc:199
+#: src/skins/menus.cc:228 src/skins-qt/menus.cc:224
 msgid "Reverse List"
 msgstr "В обратном порядке"
 
-#: src/skins/menus.cc:201
+#: src/skins/menus.cc:230 src/skins-qt/menus.cc:226
 msgid "Sort Selected"
-msgstr "Сортировать выбранные"
+msgstr "Упорядочивать выбранные"
 
-#: src/skins/menus.cc:202
+#: src/skins/menus.cc:231 src/skins-qt/menus.cc:227
 msgid "Sort List"
-msgstr "Сортировать список"
+msgstr "Упорядочивать список"
+
+#: src/skins/menus.cc:236 src/skins-qt/menus.cc:232
+msgid "Open Containing Folder"
+msgstr "Открыть папку, содержащую"
 
-#: src/skins/menus.cc:208
+#: src/skins/menus.cc:238 src/skins-qt/menus.cc:234
 msgid "Cut"
 msgstr "Вырезать"
 
-#: src/skins/menus.cc:209
+#: src/skins/menus.cc:239 src/skins-qt/menus.cc:235
 msgid "Copy"
 msgstr "Копировать"
 
-#: src/skins/menus.cc:210
+#: src/skins/menus.cc:240 src/skins-qt/menus.cc:236
 msgid "Paste"
 msgstr "Вставить"
 
-#: src/skins/menus.cc:212
-msgid "Queue/Unqueue"
-msgstr "В очередь/Из очереди"
+#: src/skins/menus.cc:241 src/skins-qt/menus.cc:237
+msgid "Paste at End"
+msgstr "Вставить в конец"
 
-#: src/skins/menus.cc:218
-msgid "Load Preset ..."
-msgstr "Загрузить Предустановку"
+#: src/skins/menus.cc:243 src/skins-qt/menus.cc:239
+msgid "Queue/Unqueue"
+msgstr "В очередь / из очереди"
 
-#: src/skins/menus.cc:219
-msgid "Load Auto Preset ..."
-msgstr "Загрузить Авто Установку..."
+#: src/skins/playlist-widget.cc:58 src/skins-qt/playlist-widget.cc:58
+#, c-format
+msgid "%s (%d of %d)"
+msgstr "%s (%d из %d)"
 
-#: src/skins/menus.cc:220
-msgid "Load Default"
-msgstr "Загрузить по умолчанию"
+#: src/skins/playlistwin.cc:491 src/skins-qt/playlistwin.cc:478
+msgid "Audacious Playlist Editor"
+msgstr "Редактор списков воспроизведения Audacious"
 
-#: src/skins/menus.cc:221
-msgid "Load Preset File ..."
-msgstr "Загрузить файл предустановки"
+#: src/skins/plugin.cc:53 src/skins-qt/plugin.cc:65
+msgid "Winamp Classic Interface"
+msgstr "Классическая оболочка Winamp"
 
-#: src/skins/menus.cc:222
-msgid "Load EQF File ..."
-msgstr "Загрузить EQF файл ..."
+#: src/skins-qt/menus.cc:75
+msgid "Open Folder ..."
+msgstr "Открыть папку..."
 
-#: src/skins/menus.cc:224
-msgid "Save Preset ..."
-msgstr "Сохранить предустановки...."
+#: src/skins-qt/menus.cc:159
+msgid "Add Folder ..."
+msgstr "Добавить папку..."
 
-#: src/skins/menus.cc:225
-msgid "Save Auto Preset ..."
-msgstr "Сохранить авто установки..."
+#: src/skins-qt/search-select.cc:62 src/skins/search-select.cc:77
+msgid "Search entries in active playlist"
+msgstr "Поиск записей в текущем списке воспроизведения"
 
-#: src/skins/menus.cc:226
-msgid "Save Default"
-msgstr "Сохранить по умолчанию"
+#: src/skins-qt/search-select.cc:70 src/skins/search-select.cc:83
+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/menus.cc:227
-msgid "Save Preset File ..."
-msgstr "сохранить файл предустановки"
+#: src/skins-qt/search-select.cc:75 src/skins/search-select.cc:91
+msgid "Title:"
+msgstr "Заголовок:"
 
-#: src/skins/menus.cc:228
-msgid "Save EQF File ..."
-msgstr "Сохранить EQF Файл"
+#: src/skins-qt/search-select.cc:79 src/skins/search-select.cc:96
+msgid "Album:"
+msgstr "Альбом:"
 
-#: src/skins/menus.cc:230
-msgid "Delete Preset ..."
-msgstr "Удалить предустановку..."
+#: src/skins-qt/search-select.cc:82 src/skins/search-select.cc:101
+msgid "Artist:"
+msgstr "Артист:"
 
-#: src/skins/menus.cc:231
-msgid "Delete Auto Preset ..."
-msgstr "Удалить авто установки..."
+#: src/skins-qt/search-select.cc:85 src/skins/search-select.cc:106
+msgid "File Name:"
+msgstr "Имя файла:"
 
-#: src/skins/menus.cc:233
-msgid "Import Winamp Presets ..."
-msgstr "Импортировать предустановки WinAMP'a...."
+#: src/skins-qt/search-select.cc:88 src/skins/search-select.cc:134
+msgid "Clear previous selection before searching"
+msgstr "Очистить предыдущий выбор до начала поиска"
 
-#: src/skins/menus.cc:235
-msgid "Reset to Zero"
-msgstr "Сброс на Ноль"
+#: src/skins-qt/search-select.cc:89 src/skins/search-select.cc:137
+msgid "Automatically toggle queue for matching entries"
+msgstr "Автоматически переключать поочерёдно на соответствующим записям"
 
-#: src/skins/plugin.cc:48
-msgid "Winamp Classic Interface"
-msgstr "Интерфейс классического Winamp"
+#: src/skins-qt/search-select.cc:90 src/skins/search-select.cc:140
+msgid "Create a new playlist with matching entries"
+msgstr "Создать новый список воспроизведения с соответствующими записями"
 
-#: src/skins/preset-browser.cc:57 src/skins/preset-list.cc:371
-#: src/skins/preset-list.cc:386
-msgid "Save"
-msgstr "Сохранить"
-
-#: src/skins/preset-browser.cc:57 src/skins/preset-list.cc:338
-#: src/skins/preset-list.cc:354
-msgid "Load"
-msgstr "Загрузить"
-
-#: src/skins/preset-browser.cc:83
-msgid "Load Preset File"
-msgstr "Загрузить файл предустановки"
-
-#: src/skins/preset-browser.cc:100
-msgid "Load EQF File"
-msgstr "Загрузить EQF файл"
-
-#: src/skins/preset-browser.cc:119
-msgid "Save Preset File"
-msgstr "Сохранить файл предустановки"
-
-#: src/skins/preset-browser.cc:137
-msgid "Save EQF File"
-msgstr "Сохранить EQF файл"
-
-#: src/skins/preset-browser.cc:151
-msgid "Import Winamp Presets"
-msgstr "Импортировать предустановки WinAMP'a"
-
-#: src/skins/preset-list.cc:285
-msgid "Presets"
-msgstr "Предустановки"
-
-#: src/skins/preset-list.cc:335
-msgid "Load preset"
-msgstr "Загрузить предустановку"
-
-#: src/skins/preset-list.cc:351
-msgid "Load auto-preset"
-msgstr "Загрузить авто-установки"
-
-#: src/skins/preset-list.cc:367
-msgid "Save preset"
-msgstr "Сохранить предустановки"
-
-#: src/skins/preset-list.cc:382
-msgid "Save auto-preset"
-msgstr "Сохранить автоустановки"
-
-#: src/skins/preset-list.cc:408
-msgid "Delete preset"
-msgstr "Удалить предустановку"
-
-#: src/skins/preset-list.cc:424
-msgid "Delete auto-preset"
-msgstr "Удалить автоустановки"
+#: src/skins-qt/search-select.cc:101 src/skins/search-select.cc:78
+msgid "Search"
+msgstr "Поиск"
 
-#: src/skins/skins_cfg.cc:176
+#: src/skins-qt/skins_cfg.cc:198 src/skins/skins_cfg.cc:182
 msgid "Player:"
 msgstr "Проигрыватель:"
 
-#: src/skins/skins_cfg.cc:178
+#: src/skins-qt/skins_cfg.cc:200 src/skins/skins_cfg.cc:184
 msgid "Select main player window font:"
 msgstr "Выберите шрифт основного окна проигрывателя:"
 
-#: src/skins/skins_cfg.cc:179
+#: src/skins-qt/skins_cfg.cc:201 src/skins/skins_cfg.cc:185
 msgid "Playlist:"
 msgstr "Список:"
 
-#: src/skins/skins_cfg.cc:181
+#: src/skins-qt/skins_cfg.cc:203 src/skins/skins_cfg.cc:187
 msgid "Select playlist font:"
 msgstr "Выберите шрифт плейлиста:"
 
-#: src/skins/skins_cfg.cc:187
+#: src/skins-qt/skins_cfg.cc:207 src/skins/skins_cfg.cc:191
 msgid "Skin"
 msgstr "Скин"
 
-#: src/skins/skins_cfg.cc:189
+#: src/skins-qt/skins_cfg.cc:211 src/skins/skins_cfg.cc:193
+msgid "Display active titlebar when any window is focused"
+msgstr "Отображать активный заголовок, когда любые окна находятся в фокусе"
+
+#: src/skins-qt/skins_cfg.cc:213 src/skins/skins_cfg.cc:195
 msgid "Fonts"
 msgstr "Шрифты"
 
-#: src/skins/skins_cfg.cc:192
+#: src/skins-qt/skins_cfg.cc:215 src/skins/skins_cfg.cc:197
 msgid "Use bitmap fonts (supports ASCII only)"
 msgstr "Использовать растровые шрифты (поддерживает только ASCII)"
 
-#: src/skins/skins_cfg.cc:194
+#: src/skins-qt/skins_cfg.cc:217 src/skins/skins_cfg.cc:199
 msgid "Scroll song title"
 msgstr "Прокручивать название песни "
 
-#: src/skins/skins_cfg.cc:196
+#: src/skins-qt/skins_cfg.cc:219 src/skins/skins_cfg.cc:201
 msgid "Scroll song title in both directions"
 msgstr "Прокручивать название песни в обоих направлениях"
 
-#: src/skins/skins_cfg.cc:201
+#: src/skins-qt/skins_cfg.cc:224 src/skins/skins_cfg.cc:206
 msgid "Analyzer"
 msgstr "Анализатор"
 
-#: src/skins/skins_cfg.cc:202
+#: src/skins-qt/skins_cfg.cc:225 src/skins/skins_cfg.cc:207
 msgid "Scope"
 msgstr "Осциллограмма"
 
-#: src/skins/skins_cfg.cc:203
+#: src/skins-qt/skins_cfg.cc:226 src/skins/skins_cfg.cc:208
 msgid "Voiceprint / VU meter"
-msgstr "Отпечаток голоса / VU измеритель"
+msgstr "Отпечаток голоса / волюметр"
 
-#: src/skins/skins_cfg.cc:204
+#: src/skins-qt/skins_cfg.cc:227 src/skins/skins_cfg.cc:209
 msgid "Off"
-msgstr "Выкл."
+msgstr "Откл."
 
-#: src/skins/skins_cfg.cc:208 src/skins/skins_cfg.cc:233
-#: src/skins/skins_cfg.cc:239
+#: src/skins-qt/skins_cfg.cc:231 src/skins-qt/skins_cfg.cc:256
+#: src/skins-qt/skins_cfg.cc:262 src/skins/skins_cfg.cc:213
+#: src/skins/skins_cfg.cc:238 src/skins/skins_cfg.cc:244
 msgid "Normal"
 msgstr "Обычный"
 
-#: src/skins/skins_cfg.cc:209 src/skins/skins_cfg.cc:234
+#: src/skins-qt/skins_cfg.cc:232 src/skins-qt/skins_cfg.cc:257
+#: src/skins/skins_cfg.cc:214 src/skins/skins_cfg.cc:239
 msgid "Fire"
 msgstr "Огонь"
 
-#: src/skins/skins_cfg.cc:210
+#: src/skins-qt/skins_cfg.cc:233 src/skins/skins_cfg.cc:215
 msgid "Vertical lines"
 msgstr "Вертикальные линии"
 
-#: src/skins/skins_cfg.cc:214
+#: src/skins-qt/skins_cfg.cc:237 src/skins/skins_cfg.cc:219
 msgid "Lines"
 msgstr "Линии"
 
-#: src/skins/skins_cfg.cc:215
+#: src/skins-qt/skins_cfg.cc:238 src/skins/skins_cfg.cc:220
 msgid "Bars"
 msgstr "Полоски"
 
-#: src/skins/skins_cfg.cc:219
+#: src/skins-qt/skins_cfg.cc:242 src/skins/skins_cfg.cc:224
 msgid "Slowest"
 msgstr "Очень медленно"
 
-#: src/skins/skins_cfg.cc:220
+#: src/skins-qt/skins_cfg.cc:243 src/skins/skins_cfg.cc:225
 msgid "Slow"
 msgstr "Медленно"
 
-#: src/skins/skins_cfg.cc:221 src/sox-resampler/sox-resampler.cc:152
+#: src/skins-qt/skins_cfg.cc:244 src/skins/skins_cfg.cc:226
+#: src/soxr/sox-resampler.cc:180
 msgid "Medium"
 msgstr "Средне"
 
-#: src/skins/skins_cfg.cc:222
+#: src/skins-qt/skins_cfg.cc:245 src/skins/skins_cfg.cc:227
 msgid "Fast"
 msgstr "Быстро"
 
-#: src/skins/skins_cfg.cc:223
+#: src/skins-qt/skins_cfg.cc:246 src/skins/skins_cfg.cc:228
 msgid "Fastest"
 msgstr "Очень быстро"
 
-#: src/skins/skins_cfg.cc:227
+#: src/skins-qt/skins_cfg.cc:250 src/skins/skins_cfg.cc:232
 msgid "Dots"
 msgstr "Точки"
 
-#: src/skins/skins_cfg.cc:228
+#: src/skins-qt/skins_cfg.cc:251 src/skins/skins_cfg.cc:233
 msgid "Line"
 msgstr "Линия"
 
-#: src/skins/skins_cfg.cc:229
+#: src/skins-qt/skins_cfg.cc:252 src/skins/skins_cfg.cc:234
 msgid "Solid"
 msgstr "Сплошная"
 
-#: src/skins/skins_cfg.cc:235
+#: src/skins-qt/skins_cfg.cc:258 src/skins/skins_cfg.cc:240
 msgid "Ice"
 msgstr "Лёд"
 
-#: src/skins/skins_cfg.cc:240
+#: src/skins-qt/skins_cfg.cc:263 src/skins/skins_cfg.cc:245
 msgid "Smooth"
 msgstr "Сглаженный"
 
-#: src/skins/skins_cfg.cc:244
-msgid "Type"
-msgstr "Тип"
-
-#: src/skins/skins_cfg.cc:245
-msgid "Visualization type:"
-msgstr "Тип визуализации:"
-
-#: src/skins/skins_cfg.cc:248
-msgid "Analyzer"
-msgstr "Анализатор"
-
-#: src/skins/skins_cfg.cc:249
-msgid "Show peaks"
-msgstr "Показывать пики"
-
-#: src/skins/skins_cfg.cc:251
+#: src/skins-qt/skins_cfg.cc:267 src/skins/skins_cfg.cc:249
 msgid "Coloring:"
 msgstr "Окраска:"
 
-#: src/skins/skins_cfg.cc:254
+#: src/skins-qt/skins_cfg.cc:270 src/skins/skins_cfg.cc:252
 msgid "Style:"
 msgstr "Стиль:"
 
-#: src/skins/skins_cfg.cc:257
+#: src/skins-qt/skins_cfg.cc:273 src/skins/skins_cfg.cc:255
 msgid "Falloff:"
 msgstr "Спад:"
 
-#: src/skins/skins_cfg.cc:260
+#: src/skins-qt/skins_cfg.cc:276 src/skins/skins_cfg.cc:258
 msgid "Peak falloff:"
 msgstr "Спад пиков:"
 
-#: src/skins/skins_cfg.cc:264
+#: src/skins-qt/skins_cfg.cc:282 src/skins/skins_cfg.cc:264
 msgid "Scope Style:"
 msgstr "Стиль осциллограммы:"
 
-#: src/skins/skins_cfg.cc:267
+#: src/skins-qt/skins_cfg.cc:285 src/skins/skins_cfg.cc:267
 msgid "Voiceprint Coloring:"
 msgstr "Окраска отпечатка голоса:"
 
-#: src/skins/skins_cfg.cc:270
+#: src/skins-qt/skins_cfg.cc:288 src/skins/skins_cfg.cc:270
 msgid "VU Meter Style:"
-msgstr "Стиль VU измерителя:"
-
-#: src/skins/skins_cfg.cc:276
-msgid "General"
-msgstr "Основной"
-
-#: src/skins/skins_cfg.cc:277
-msgid "Visualization"
-msgstr "Визуализация"
-
-#: src/skins/ui_equalizer.cc:282
-msgid "Preamp"
-msgstr "Предусиление"
-
-#: src/skins/ui_equalizer.cc:286
-msgid "31 Hz"
-msgstr "31 Гц"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "63 Hz"
-msgstr "63 Гц"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "125 Hz"
-msgstr "125 Гц"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "250 Hz"
-msgstr "250 Гц"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "500 Hz"
-msgstr "500 Гц"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "1 kHz"
-msgstr "1 кГц"
-
-#: src/skins/ui_equalizer.cc:288
-msgid "2 kHz"
-msgstr "2 кГц"
-
-#: src/skins/ui_equalizer.cc:288
-msgid "4 kHz"
-msgstr "4 кГц"
-
-#: src/skins/ui_equalizer.cc:288
-msgid "8 kHz"
-msgstr "8 кГц"
-
-#: src/skins/ui_equalizer.cc:288
-msgid "16 kHz"
-msgstr "16 кГц"
-
-#: src/skins/ui_equalizer.cc:330
-msgid "Audacious Equalizer"
-msgstr "Эквалайзер Audacious"
-
-#: src/skins/ui_main.cc:688
-#, c-format
-msgid "Seek to %d:%-2.2d / %d:%-2.2d"
-msgstr "Переход к %d:%-2.2d / %d:%-2.2d"
-
-#: src/skins/ui_main.cc:709
-#, c-format
-msgid "Volume: %d%%"
-msgstr "Громкость: %d%%"
-
-#: src/skins/ui_main.cc:732
-#, c-format
-msgid "Balance: %d%% left"
-msgstr "Баланс: %d%% влево"
-
-#: src/skins/ui_main.cc:734
-msgid "Balance: center"
-msgstr "Баланс: по центру"
-
-#: src/skins/ui_main.cc:736
-#, c-format
-msgid "Balance: %d%% right"
-msgstr "Баланс: %d%% вправо"
-
-#: src/skins/ui_main.cc:842
-msgid "Options Menu"
-msgstr "Меню параметров"
-
-#: src/skins/ui_main.cc:846
-msgid "Disable 'Always On Top'"
-msgstr "Отключить \"Поверх всех окон\""
-
-#: src/skins/ui_main.cc:848
-msgid "Enable 'Always On Top'"
-msgstr "Включить \"Поверх всех окон\""
-
-#: src/skins/ui_main.cc:851
-msgid "File Info Box"
-msgstr "Информация о файле"
-
-#: src/skins/ui_main.cc:857
-msgid "Visualizations"
-msgstr "Зрительные образы"
-
-#: src/skins/ui_main.cc:1336
-msgid "Repeat point A set."
-msgstr "Повторить установки A"
-
-#: src/skins/ui_main.cc:1341
-msgid "Repeat point B set."
-msgstr "Повторить установки B"
-
-#: src/skins/ui_main.cc:1350
-msgid "Repeat points cleared."
-msgstr "Повторить очищенные пункты"
-
-#: src/skins/ui_playlist.cc:219
-msgid "Search entries in active playlist"
-msgstr "Поиск записей в активном списке воспроизведения"
-
-#: src/skins/ui_playlist.cc:226
-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.cc:234
-msgid "Title:"
-msgstr "Заголовок:"
-
-#: src/skins/ui_playlist.cc:241
-msgid "Album:"
-msgstr "Альбом:"
-
-#: src/skins/ui_playlist.cc:248
-msgid "Artist:"
-msgstr "Артист:"
-
-#: src/skins/ui_playlist.cc:255
-msgid "File Name:"
-msgstr "Имя файла:"
+msgstr "Стиль волюметра:"
 
-#: src/skins/ui_playlist.cc:263
-msgid "Clear previous selection before searching"
-msgstr "Очистить предыдущий выбор до начала поиска"
+#: src/skins-qt/skins_cfg.cc:294 src/skins/skins_cfg.cc:276
+msgid "Type"
+msgstr "Тип"
 
-#: src/skins/ui_playlist.cc:266
-msgid "Automatically toggle queue for matching entries"
-msgstr "Автоматически переключать поочерёдно на соответствующим записям"
+#: src/skins-qt/skins_cfg.cc:295 src/skins/skins_cfg.cc:277
+msgid "Visualization type:"
+msgstr "Тип визуализации:"
 
-#: src/skins/ui_playlist.cc:269
-msgid "Create a new playlist with matching entries"
-msgstr "Создать новый список воспроизведения с соответствующими записями"
+#: src/skins-qt/skins_cfg.cc:298 src/skins/skins_cfg.cc:280
+msgid "Analyzer"
+msgstr "Анализатор"
 
-#: src/skins/ui_playlist.cc:717
-msgid "Audacious Playlist Editor"
-msgstr "Редактор списков воспроизведения Audacious"
+#: src/skins-qt/skins_cfg.cc:299 src/skins/skins_cfg.cc:281
+msgid "Show peaks"
+msgstr "Показывать пики"
 
-#: src/skins/ui_playlist.cc:752
-#, c-format
-msgid "%s (%d of %d)"
-msgstr "%s (%d из %d)"
+#: src/skins-qt/skins_cfg.cc:308 src/skins/skins_cfg.cc:290
+msgid "Visualization"
+msgstr "Визуализация"
 
-#: src/skins/ui_skinselector.cc:167
+#: src/skins-qt/skinselector.cc:98 src/skins/skinselector.cc:111
 msgid "Archived Winamp 2.x skin"
-msgstr "Архивированная тема Winamp 2.x"
+msgstr "Архивированный скин Winamp 2.x"
 
-#: src/skins/ui_skinselector.cc:172
+#: src/skins-qt/skinselector.cc:102 src/skins/skinselector.cc:115
 msgid "Unarchived Winamp 2.x skin"
-msgstr "Не архивированная тема Winamp 2.x"
+msgstr "Разархивированный скин Winamp 2.x"
 
-#: src/skins/util.cc:430
-#, c-format
-msgid "Could not create directory (%s): %s\n"
-msgstr "Невозможно создать каталог (%s): %s\n"
-
-#: src/sndfile/plugin.cc:39
+#: src/sndfile/plugin.cc:38
 msgid "Sndfile Plugin"
-msgstr "Плагин Sndfile"
+msgstr "Модуль Sndfile"
 
-#: src/sndfile/plugin.cc:336
+#: src/sndfile/plugin.cc:372
 msgid ""
 "Based on the xmms_sndfile plugin:\n"
 "Copyright (C) 2000, 2002 Erik de Castro Lopo\n"
@@ -3977,15 +4257,15 @@
 "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"
+"Основан на модуле xmms_sndfile:\n"
+"Copyright (C) 2000, 2002 Erik de Castro Lopo\n"
 "\n"
-"Адаптация для Audacious Tony Vroon <chainsaw@gentoo.org>\n"
+"Адаптация для Audacious от Tony Vroon <chainsaw@gentoo.org>\n"
 "\n"
-"Это свободная программа; вы можете повторно распространять или "
+"Это свободная программа; Вы можете повторно распространять и/или "
 "модифицировать её в соответствии с условиями GNU General Public License, "
 "опубликованной Free Software Foundation, либо версии 2 Лицензии, либо (по "
-"вашему выбору) любой более поздней версии.\n"
+"Вашему выбору) любой более поздней версии.\n"
 "\n"
 "Эта программа распространяется в надежде, что она будет полезной, но БЕЗ "
 "КАКИХ-ЛИБО ГАРАНТИЙ, даже без подразумеваемых гарантий коммерческой ценности "
@@ -3996,96 +4276,119 @@
 "программой; если этого не произошло, напишите во Free Software Foundation, "
 "Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 
-#: src/sndio-ng/sndio.cc:44
+#: src/sndio/sndio.cc:43
 msgid "Sndio Output"
 msgstr "Выход Sndio"
 
-#: src/sndio-ng/sndio.cc:98
+#: src/sndio/sndio.cc:98
 msgid "Device (blank for default):"
 msgstr "Устройство (по-умолчанию - оставить пустым):"
 
-#: src/sndio-ng/sndio.cc:100
+#: src/sndio/sndio.cc:100
 msgid "Save and restore volume:"
-msgstr ""
+msgstr "Сохранять и восстанавливать уровень:"
 
-#: src/sndio-ng/sndio.cc:181
+#: src/sndio/sndio.cc:181
 #, c-format
 msgid "Sndio error: Unsupported audio format (%d)"
-msgstr "Ошибка Sndio: Неподдерживаемый звуковой формат (%d)"
+msgstr "Ошибка Sndio: Неподдерживаемый формат аудио (%d)"
 
-#: src/sndio-ng/sndio.cc:192
+#: src/sndio/sndio.cc:192
 msgid "Sndio error: sio_open() failed"
-msgstr ""
+msgstr "Ошибка sndio: sio_open() сбой"
 
-#: src/sndio-ng/sndio.cc:222
+#: src/sndio/sndio.cc:221
 msgid "Sndio error: sio_setpar() failed"
-msgstr ""
+msgstr "Ошибка sndio: sio_setpar() сбой"
 
-#: src/sndio-ng/sndio.cc:234
+#: src/sndio/sndio.cc:233
 msgid "Sndio error: sio_start() failed"
-msgstr ""
+msgstr "Ошибка sndio: sio_start() сбой"
 
-#: src/song_change/song_change.cc:33
+#: src/songchange/song_change.cc:30
 msgid "Song Change"
 msgstr "Смена дорожки"
 
-#: src/song_change/song_change.cc:342
-msgid ""
-"Parameters passed to the shell should be encapsulated in "
-"quotes. Doing otherwise is a security risk."
-msgstr ""
-"Параметры, передаваемые оболочке, должны быть заключены в "
-"кавычки. В противном случае возможны проблемы с безопасностью"
-
-#: src/song_change/song_change.cc:358
+#: src/songchange/song_change.cc:256
 msgid "Commands"
 msgstr "Команды"
 
-#: src/song_change/song_change.cc:360
+#: src/songchange/song_change.cc:258
 msgid "Command to run when starting a new song:"
 msgstr "Команда для выполнения после начала воспроизведения новой композиции:"
 
-#: src/song_change/song_change.cc:364
+#: src/songchange/song_change.cc:261
+msgid "Command to run when stopping a song:"
+msgstr "Команда для выполнения при остановке песни:"
+
+#: src/songchange/song_change.cc:264
 msgid "Command to run at the end of a song:"
 msgstr "Команда выполняемая после окончания композиции:"
 
-#: src/song_change/song_change.cc:368
+#: src/songchange/song_change.cc:267
 msgid "Command to run at the end of the playlist:"
 msgstr "Команда выполняемая после окончания списка воспроизведения:"
 
-#: src/song_change/song_change.cc:372
+#: src/songchange/song_change.cc:270
 msgid "Command to run when song title changes (for network streams):"
 msgstr ""
 "Команда для выполнения при изменении названия композиции (для "
 "воспроизведения по сети):"
 
-#: src/song_change/song_change.cc:376
+#: src/songchange/song_change.cc:273
 msgid ""
-"You can use the following format strings which will be substituted before "
-"calling the command (not all are useful for the end-of-playlist command):\n"
-"\n"
-"%F: Frequency (in hertz)\n"
+"You can use the following format codes, which will be replaced before "
+"running the command.\n"
+"Not all are useful though for the song-stopped or end-of-playlist command."
+msgstr ""
+"Вы можете использовать следующие коды формата, которые будут заменены перед "
+"выполнением команды.\n"
+"Однако не все из них подходят для команд song-stopped или end-of-playlist."
+
+#: src/songchange/song_change.cc:276
+msgid ""
+"%a: Artist\n"
+"%b: Album\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"
+"%F: Frequency (Hertz)\n"
+"%l: Length (milliseconds)\n"
+"%n or %s: Formatted title (see playlist settings)\n"
 "%p: Currently playing (1 or 0)\n"
-"%a: Artist\n"
-"%b: Album\n"
-"%T: Track title"
-msgstr ""
+"%r: Rate (bits per second)\n"
+"%t: Playlist position\n"
+"%T: Title (unformatted)"
+msgstr ""
+"%а: Артист\n"
+"%b: Альбом\n"
+"%c: Число каналов\n"
+"%f: Имя файла (полный путь)\n"
+"%F: Частота (герц)\n"
+"%I: Длина (миллисекунды)\n"
+"%n или %s: Форматированное название \n"
+"(смотри настройки списка воспроизведения)\n"
+"%p: Воспроизводится в текущий момент (1 или 0)\n"
+"%r: Темп (бит в секунду)\n"
+"%t: Позиция в списке воспроизведения\n"
+"%T: Название (без форматирования)"
+
+#: src/songchange/song_change.cc:287
+msgid ""
+"Parameters passed to the shell should be enclosed in quotation marks.\n"
+"Unquoted parameters may lead to unexpected results."
+msgstr ""
+"Параметры, передаваемые оболочке, должны быть заключены в кавычки.\n"
+"Без них параметры могут привести к неожиданным результатам."
+
+#: src/song-info-qt/song-info.cc:30
+msgid "Song Info"
+msgstr "Сведения о песне"
 
-#: src/song-info-qt/song-info.cc:32
-msgid "Song Info (Qt)"
-msgstr "Сведения о композиции (Qt)"
-
-#: src/sox-resampler/sox-resampler.cc:44
+#: src/soxr/sox-resampler.cc:44
 msgid "SoX Resampler"
 msgstr "SoX Ресемплер"
 
-#: src/sox-resampler/sox-resampler.cc:144
+#: src/soxr/sox-resampler.cc:172
 msgid ""
 "SoX Resampler Plugin for Audacious\n"
 "Copyright 2013 Michał Lipski\n"
@@ -4093,102 +4396,151 @@
 "Based on Sample Rate Converter Plugin:\n"
 "Copyright 2010-2012 John Lindgren"
 msgstr ""
-"SoX Ресемплер Плагин для Audacious\n"
-"Авторство 2013 Michał Lipski\n"
+"Модуль преобразования SoX для Audacious\n"
+"Copyright 2013 Michał Lipski\n"
 "\n"
-"Основан на плагине конвертора частоты дискретизации:\n"
-"Авторство 2010-2012 John Lindgren"
+"Основан на модуле преобразования частоты дискретизации:\n"
+"Copyright 2010-2012 John Lindgren"
 
-#: src/sox-resampler/sox-resampler.cc:150
+#: src/soxr/sox-resampler.cc:178
 msgid "Quick"
 msgstr "Быстро"
 
-#: src/sox-resampler/sox-resampler.cc:151
+#: src/soxr/sox-resampler.cc:179
 msgid "Low"
 msgstr "Низкое"
 
-#: src/sox-resampler/sox-resampler.cc:153
+#: src/soxr/sox-resampler.cc:181
 msgid "High"
 msgstr "Высокое"
 
-#: src/sox-resampler/sox-resampler.cc:154
+#: src/soxr/sox-resampler.cc:182
 msgid "Very High"
 msgstr "Очень высокое"
 
-#: src/sox-resampler/sox-resampler.cc:158
+#: src/soxr/sox-resampler.cc:183
+msgid "Ultra High"
+msgstr "Сверхвысокий"
+
+#: src/soxr/sox-resampler.cc:187
+msgid "Minimum"
+msgstr "Наименьший"
+
+#: src/soxr/sox-resampler.cc:188
+msgid "Intermediate"
+msgstr "Промежуточный"
+
+#: src/soxr/sox-resampler.cc:193
 msgid "Quality:"
 msgstr "Качество:"
 
-#: src/speed-pitch/speed-pitch.cc:51
+#: src/soxr/sox-resampler.cc:196
+msgid "Phase:"
+msgstr "Фаза"
+
+#: src/soxr/sox-resampler.cc:200
+msgid "Allow aliasing"
+msgstr "Разрешить псевдонимы"
+
+#: src/soxr/sox-resampler.cc:202
+msgid "Use steep filter"
+msgstr "Использовать повышающий фильтр"
+
+#: src/speedpitch/speed-pitch.cc:54
 msgid "Speed and Pitch"
 msgstr "Скорость и высота"
 
-#: src/speed-pitch/speed-pitch.cc:210
-msgid "Speed and Pitch"
-msgstr "Скорость и высота"
-
-#: src/speed-pitch/speed-pitch.cc:211
-msgid "Speed:"
-msgstr "Скорость:"
-
-#: src/speed-pitch/speed-pitch.cc:214
-msgid "Pitch:"
-msgstr "Высота:"
+#: src/speedpitch/speed-pitch.cc:247
+msgid "Speed"
+msgstr "Скорость"
+
+#: src/speedpitch/speed-pitch.cc:248
+msgid "Decouple from pitch"
+msgstr "Разделение по частоте"
+
+#: src/speedpitch/speed-pitch.cc:250 src/speedpitch/speed-pitch.cc:258
+msgid "Multiplier:"
+msgstr "Множитель:"
+
+#: src/speedpitch/speed-pitch.cc:254
+msgid "Pitch"
+msgstr "Частота"
 
-#: src/statusicon/statusicon.cc:47
+#: src/statusicon-qt/statusicon.cc:45 src/statusicon/statusicon.cc:47
 msgid "Status Icon"
-msgstr "Иконка статуса"
-
-#: src/statusicon/statusicon.cc:283
-msgid "Se_ttings ..."
-msgstr "Настройки ..."
+msgstr "Значок состояния"
 
-#: src/statusicon/statusicon.cc:372
+#: src/statusicon-qt/statusicon.cc:68
 msgid ""
-"Status Icon Plugin\n"
+"Status Icon Plugin (partial port for Qt interface)\n"
 "\n"
 "Copyright 2005-2007 Giacomo Lozito <james@develia.org>\n"
 "Copyright 2010 Michał Lipski <tallica@o2.pl>\n"
+"Copyright 2015 Eugene Paskevich <eugene@raptor.kiev.ua>\n"
 "\n"
 "This plugin provides a status icon, placed in\n"
 "the system tray area of the window manager."
 msgstr ""
-"Модуль Статус\n"
+"Модуль значка состояния\n"
+"(частичный перенос для интерфейса Qt)\n"
 "\n"
-"Copyright 2005-2007 Giacomo Lozito <james@develia.org>\n"
-"Copyright 2010 Michał Lipski <tallica@o2.pl>\n"
+"Авторское право 2005-2007 Giacomo Lozito <james@develia.org>\n"
+"Авторское право 2010 Michał Lipski <tallica@o2.pl>\n"
+"Авторское право 2015 Евгений Паскевич <eugene@raptor.kiev.ua>\n"
 "\n"
-"Этот модуль отображает значок программы\n"
-"в системном лотке"
+"Этот модуль отображает значок приложения\n"
+"в системном лотке оконного менеджера."
 
-#: src/statusicon/statusicon.cc:379
+#: src/statusicon-qt/statusicon.cc:89 src/statusicon/statusicon.cc:384
 msgid "Mouse Scroll Action"
 msgstr "Действие прокрутки мыши"
 
-#: src/statusicon/statusicon.cc:380
+#: src/statusicon-qt/statusicon.cc:90 src/statusicon/statusicon.cc:385
 msgid "Change volume"
 msgstr "Изменить громкость"
 
-#: src/statusicon/statusicon.cc:383
+#: src/statusicon-qt/statusicon.cc:93 src/statusicon/statusicon.cc:388
 msgid "Change playing song"
 msgstr "Сменить текущую дорожку"
 
-#: src/statusicon/statusicon.cc:386
+#: src/statusicon-qt/statusicon.cc:96 src/statusicon/statusicon.cc:391
 msgid "Other Settings"
 msgstr "Другие настройки"
 
-#: src/statusicon/statusicon.cc:387
+#: src/statusicon-qt/statusicon.cc:97 src/statusicon/statusicon.cc:392
 msgid "Disable the popup window"
 msgstr "Отключить всплывающее окно"
 
-#: src/statusicon/statusicon.cc:389
+#: src/statusicon-qt/statusicon.cc:99 src/statusicon/statusicon.cc:394
 msgid "Close to the system tray"
 msgstr "Закрыть в системный трей"
 
-#: src/statusicon/statusicon.cc:391
+#: src/statusicon-qt/statusicon.cc:101 src/statusicon/statusicon.cc:396
 msgid "Advance in playlist when scrolling upward"
 msgstr "Продвигаться по списку воспроизведения при прокрутке колёсика"
 
+#: src/statusicon-qt/statusicon.cc:116 src/statusicon/statusicon.cc:287
+msgid "Se_ttings ..."
+msgstr "_Настройки..."
+
+#: src/statusicon/statusicon.cc:377
+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"
+"Copyright 2005-2007 Giacomo Lozito <james@develia.org>\n"
+"Copyright 2010 Michał Lipski <tallica@o2.pl>\n"
+"\n"
+"Этот модуль отображает значок программы\n"
+"в системном лотке оконного менеджера."
+
 #: src/stereo_plugin/stereo.cc:19
 msgid "Extra Stereo"
 msgstr "Расширенное стерео"
@@ -4199,28 +4551,168 @@
 "\n"
 "By Johan Levin, 1999"
 msgstr ""
-"Модуль Дополнительное стерео\n"
+"Модуль дополнения стерео\n"
 "\n"
-"Johan Levin 1999"
+"От Johan Levin, 1999"
 
 #: src/stereo_plugin/stereo.cc:44
 msgid "Extra Stereo"
 msgstr "Расширенное стерео"
 
+#: src/streamtuner/icecast-model.cc:126 src/streamtuner/shoutcast-model.cc:131
+msgid "Type"
+msgstr "Тип"
+
+#: src/streamtuner/icecast-model.cc:132
+msgid "Current Song"
+msgstr "Текущая песня"
+
+#: src/streamtuner/icecast-model.cc:164
+msgid "Other"
+msgstr "Другой"
+
+#: src/streamtuner/ihr-model.cc:63
+msgid "Market"
+msgstr "Магазин"
+
+#: src/streamtuner/ihr-model.cc:156
+msgid "Call Letters"
+msgstr "Уведомление"
+
+#: src/streamtuner/ihr-model.cc:162
+msgid "Description"
+msgstr "Описание"
+
+#: src/streamtuner/shoutcast-model.cc:128
+msgid "Listeners"
+msgstr "Слушатели"
+
+#: src/streamtuner/shoutcast-model.cc:188
+msgid "Top 500 Stations"
+msgstr "Топ-500 станций"
+
+#: src/streamtuner/shoutcast-model.cc:189
+msgid "Alternative"
+msgstr "Альтернативная музыка"
+
+#: src/streamtuner/shoutcast-model.cc:190
+msgid "Blues"
+msgstr "Блюз"
+
+#: src/streamtuner/shoutcast-model.cc:191
+msgid "Classical"
+msgstr "Классическая"
+
+#: src/streamtuner/shoutcast-model.cc:192
+msgid "Country"
+msgstr "Кантри"
+
+#: src/streamtuner/shoutcast-model.cc:193
+msgid "Decades"
+msgstr "Десяток"
+
+#: src/streamtuner/shoutcast-model.cc:194
+msgid "Easy Listening"
+msgstr "Лёгкая музыка"
+
+#: src/streamtuner/shoutcast-model.cc:195
+msgid "Electronic"
+msgstr "Электронная"
+
+#: src/streamtuner/shoutcast-model.cc:196
+msgid "Folk"
+msgstr "Народная"
+
+#: src/streamtuner/shoutcast-model.cc:197
+msgid "Inspirational"
+msgstr "Вдохновляющая"
+
+#: src/streamtuner/shoutcast-model.cc:198
+msgid "International"
+msgstr "Международная"
+
+#: src/streamtuner/shoutcast-model.cc:199
+msgid "Jazz"
+msgstr "Джаз"
+
+#: src/streamtuner/shoutcast-model.cc:200
+msgid "Latin"
+msgstr "Латинская"
+
+#: src/streamtuner/shoutcast-model.cc:201
+msgid "Metal"
+msgstr "Метал"
+
+#: src/streamtuner/shoutcast-model.cc:203
+msgid "New Age"
+msgstr "Нью-эйдж"
+
+#: src/streamtuner/shoutcast-model.cc:204
+msgid "Pop"
+msgstr "Попса"
+
+#: src/streamtuner/shoutcast-model.cc:205
+msgid "Public Radio"
+msgstr "Общественное радио"
+
+#: src/streamtuner/shoutcast-model.cc:206
+msgid "R&B and Urban"
+msgstr "Ритм-н-Блюз и городская"
+
+#: src/streamtuner/shoutcast-model.cc:207
+msgid "Rap"
+msgstr "Рэп"
+
+#: src/streamtuner/shoutcast-model.cc:208
+msgid "Reggae"
+msgstr "Регги"
+
+#: src/streamtuner/shoutcast-model.cc:209
+msgid "Rock"
+msgstr "Рок"
+
+#: src/streamtuner/shoutcast-model.cc:210
+msgid "Seasonal and Holiday"
+msgstr "Сезонная и праздничная"
+
+#: src/streamtuner/shoutcast-model.cc:211
+msgid "Soundtracks"
+msgstr "Звуковые дорожки"
+
+#: src/streamtuner/shoutcast-model.cc:212
+msgid "Talk"
+msgstr "Беседы"
+
+#: src/streamtuner/shoutcast-model.cc:213
+msgid "Themes"
+msgstr "Тематики"
+
+#: src/streamtuner/streamtuner.cc:59
+msgid "Shoutcast"
+msgstr "Shoutcast"
+
+#: src/streamtuner/streamtuner.cc:60
+msgid "Icecast"
+msgstr "Icecast"
+
+#: src/streamtuner/streamtuner.cc:71
+msgid "Stream Tuner"
+msgstr "Тюнер трансляций"
+
 #: src/tonegen/tonegen.cc:45
 msgid "Tone Generator"
 msgstr "Генератор тона"
 
-#: src/tonegen/tonegen.cc:94
+#: src/tonegen/tonegen.cc:92
 #, c-format
 msgid "%s %.1f Hz"
 msgstr "%s %.1f Гц"
 
-#: src/tonegen/tonegen.cc:94
+#: src/tonegen/tonegen.cc:92
 msgid "Tone Generator: "
 msgstr "Генератор сигналов: "
 
-#: src/tonegen/tonegen.cc:160
+#: src/tonegen/tonegen.cc:161
 msgid ""
 "Sine tone generator by Håvard Kvålen <havardk@xmms.org>\n"
 "Modified by Daniel J. Peng <danielpeng@bigfoot.com>\n"
@@ -4235,11 +4727,32 @@
 "частота1;частота2;частота3;...\n"
 "Например, tone://2000;2005 для воспроизведения сигналов 2000 Гц и 2005 Гц"
 
+#: src/ui-common/dialogs-qt.cc:40
+msgid ""
+"\n"
+"(Further messages have been hidden.)"
+msgstr ""
+"\n"
+"(Подробные сообщения были скрыты.)"
+
+#: src/ui-common/dialogs-qt.cc:52
+msgid "Working ..."
+msgstr "Работает.."
+
+#: src/ui-common/dialogs-qt.cc:73
+msgid "Information"
+msgstr "Сведения"
+
+#: src/ui-common/menu-ops-gtk.cc:132 src/ui-common/menu-ops-qt.cc:113
+#, c-format
+msgid "%s does not appear to be a valid folder."
+msgstr "%s является недопустимой папкой."
+
 #: src/voice_removal/voice_removal.cc:28
 msgid "Voice Removal"
 msgstr "Удаление вокала"
 
-#: src/vorbis/vorbis.cc:465
+#: src/vorbis/vorbis.cc:433
 msgid ""
 "Audacious Ogg Vorbis Decoder\n"
 "\n"
@@ -4259,11 +4772,15 @@
 "Gian-Carlo Pascutto <gcp@sjeng.org>\n"
 "Eugene Zagidullin <e.asphyx@gmail.com>"
 msgstr ""
-"Модуль Ogg Vorbis от Xiph.org Foundation\n"
+"Декодер Ogg Vorbis для Audacious\n"
 "\n"
-"Начальный код был написан\n"
+"Основан на модуле Ogg Vorbis от Xiph.org Foundation:\n"
+"http://www.xiph.org/\n"
+"\n"
+"Оригинальный код:\n"
 "Tony Arcieri <bascule@inferno.tusculum.edu>\n"
-"Вклад внесли\n"
+"\n"
+"Дополнения:\n"
 "Chris Montgomery <monty@xiph.org>\n"
 "Peter Alm <peter@xmms.org>\n"
 "Michael Smith <msmith@labyrinth.edu.au>\n"
@@ -4271,20 +4788,18 @@
 "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/"
+"Eugene Zagidullin <e.asphyx@gmail.com>"
 
 #: src/vorbis/vorbis.h:18
 msgid "Ogg Vorbis Decoder"
 msgstr "Декодер Ogg Vorbis"
 
-#: src/vtx/info.cc:22
+#: src/vtx/info.cc:24
 #, c-format
 msgid "Details about %s"
 msgstr "Сведения о %s"
 
-#: src/vtx/info.cc:24
+#: src/vtx/info.cc:26
 msgid ""
 "Title: %t\n"
 "Author: %a\n"
@@ -4314,7 +4829,7 @@
 msgid "VTX Decoder"
 msgstr "Декодер VTX"
 
-#: src/vtx/vtx.cc:184
+#: src/vtx/vtx.cc:178
 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"
@@ -4322,42 +4837,106 @@
 msgstr ""
 "Проигрыватель файлов Vortex от Sashnov Alexander <sashnov@ngs.ru>\n"
 "Основан на коде in_vtx.dll от Roman Sherbakov <v_soft@microfor.ru>\n"
-"Реализацию для Audacious выполнил Pavel Vymetalek <pvymetalek@seznam.cz>"
+"Модуль для Audacious от Pavel Vymetalek <pvymetalek@seznam.cz>"
+
+#: src/vumeter-qt/vumeter_qt.cc:31
+msgid ""
+"VU Meter Plugin for Audacious\n"
+"Copyright 2017-2019 Marc Sánchez Fauste"
+msgstr ""
+"Модуль волюметра для Audacious\n"
+"Copyright 2017-2019 Marc Sánchez Fauste"
 
-#: src/wavpack/wavpack.cc:24
+#: src/vumeter-qt/vumeter_qt.cc:35
+msgid "VU Meter Settings"
+msgstr "Настройки волюметра"
+
+#: src/vumeter-qt/vumeter_qt.cc:37
+msgid "Peak hold time:"
+msgstr "Время удержания пика:"
+
+#: src/vumeter-qt/vumeter_qt.cc:42
+msgid "Fall-off time:"
+msgstr "Время спада:"
+
+#: src/vumeter-qt/vumeter_qt.cc:44
+msgid "dB/second"
+msgstr "дБ/с"
+
+#: src/vumeter-qt/vumeter_qt.cc:46
+msgid "Display legend"
+msgstr "Отобразить шкалу"
+
+#: src/vumeter-qt/vumeter_qt.h:37
+msgid "VU Meter"
+msgstr "Волюметр"
+
+#: src/waveout/waveout.cc:43
+msgid "Win32 waveOut"
+msgstr "Win32 waveOut"
+
+#: src/waveout/waveout.cc:69
+msgid ""
+"Win32 waveOut Plugin for Audacious\n"
+"Copyright 2016 John Lindgren"
+msgstr ""
+"Win32 waveOut Plugin для Audacious\n"
+"Copyright 2016 John Lindgren"
+
+#: src/wavpack/wavpack.cc:25
 msgid "WavPack Decoder"
 msgstr "Декодер WavPack"
 
-#: src/wavpack/wavpack.cc:211
+#: src/wavpack/wavpack.cc:217
 msgid "lossy (hybrid)"
-msgstr "lossy (hybrid)"
+msgstr "lossy (гибрид)"
 
-#: src/wavpack/wavpack.cc:213
+#: src/wavpack/wavpack.cc:219
 msgid "lossy"
 msgstr "lossy"
 
-#: src/wavpack/wavpack.cc:255
+#: src/wavpack/wavpack.cc:259
 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"
+"Авторское право 2006 William Pitcock <nenolod@nenolod.net>\n"
 "\n"
-"Некоторый код плагина Miles Egan"
+"Частично код от Miles Egan."
 
-#: src/xsf/plugin.cc:50
+#: src/xsf/plugin.cc:74
 msgid "2SF Decoder"
 msgstr "Декодер 2SF"
 
-#: src/xsf/plugin.cc:238
+#: src/xsf/plugin.cc:429
+msgid "32728 Hz"
+msgstr "32728 Гц"
+
+#: src/xsf/plugin.cc:432
+msgid "65456 Hz"
+msgstr "65456 Гц"
+
+#: src/xsf/plugin.cc:438
+msgid "Cosine"
+msgstr "Косинус"
+
+#: src/xsf/plugin.cc:439
+msgid "Sharp"
+msgstr "Резкий"
+
+#: src/xsf/plugin.cc:443
 msgid "XSF Configuration"
 msgstr "Настройки XSF"
 
-#: src/xsf/plugin.cc:239
-msgid "Ignore length from file"
-msgstr "Не придавать значение длительности из файла"
+#: src/xsf/plugin.cc:445
+msgid "Default fade time:"
+msgstr "Время затухания по умолчанию:"
+
+#: src/xsf/plugin.cc:447
+msgid "Interpolation mode:"
+msgstr "Режим интерполяции:"
 
-#: src/xspf/xspf.cc:89
+#: src/xspf/xspf.cc:95
 msgid "XML Shareable Playlists (XSPF)"
-msgstr "XSPF"
+msgstr "Списки воспроизведения XSPF"

audacious-plugins-3.6.2-gtk3.tar.bz2/po/si.po -> audacious-plugins-4.4.1.tar.bz2/po/si.po Changed

@@ -12,11 +12,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Audacious Plugins\n"
-"Report-Msgid-Bugs-To: http://redmine.audacious-media-player.org/\n"
-"POT-Creation-Date: 2015-02-28 19:18+0100\n"
-"PO-Revision-Date: 2015-02-04 21:21+0000\n"
-"Last-Translator: Thomas Lange <thomas-lange2@gmx.de>\n"
-"Language-Team: Sinhala (http://www.transifex.com/projects/p/audacious/"
+"Report-Msgid-Bugs-To: https://github.com/audacious-media-player/audacious/"
+"issues\n"
+"POT-Creation-Date: 2024-09-26 21:54+0200\n"
+"PO-Revision-Date: 2011-10-10 17:43+0000\n"
+"Last-Translator: Ashintha Rukmal Perera <ashintha@gmail.com>, 2013-2014\n"
+"Language-Team: Sinhala (http://app.transifex.com/audacious/audacious/"
 "language/si/)\n"
 "Language: si\n"
 "MIME-Version: 1.0\n"
@@ -24,286 +25,60 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/aac-raw/aac.cc:18
+#: src/aac/aac.cc:19
 msgid "AAC (Raw) Decoder"
 msgstr ""
 
-#: src/adplug/adplug-xmms.cc:42
+#: src/adplug/adplug-xmms.cc:70
 msgid "AdPlug (AdLib Player)"
 msgstr "Adකෙවෙනිය (AdLib ධාවකය)"
 
-#: src/adplug/adplug-xmms.cc:156 src/modplug/modplugbmp.cc:335
-#: src/psf/plugin.cc:138 src/vtx/vtx.cc:87 src/xsf/plugin.cc:113
+#: src/adplug/adplug-xmms.cc:167 src/modplug/modplugbmp.cc:321
+#: src/psf/plugin.cc:161 src/vtx/vtx.cc:89 src/xsf/plugin.cc:204
 msgid "sequenced"
 msgstr "අනුපිළිවෙළ"
 
-#: src/alarm/alarm.cc:55 src/alarm/interface.cc:82
-msgid "Alarm"
-msgstr "සිහි කැඳවීම"
-
-#: src/alarm/alarm.cc:782
-msgid "Set Alarm ..."
+#: src/adplug/adplug-xmms.cc:349 src/sid/xs_config.cc:61
+msgid "Output"
 msgstr ""
 
-#: src/alarm/alarm.cc:810
-msgid ""
-"A plugin that can be used to start playing at a certain time.\n"
-"\n"
-"Originally written by Adam Feakin and Daniel Stodden."
+#: src/adplug/adplug-xmms.cc:350
+msgid "OPL Emulator:"
 msgstr ""
-"කිසියම් වෙලාවකදී ධාවනය කිරීමට යොදාගත හැකි පේනු මෘදුකාංගයක්.⏎\n"
-"⏎\n"
-"මුලින් ලියන ලද්දේ ඇඩම් ෆීකින් සහ ඩැනියෙල් ස්ටොඩ්ඩන් විසිනි."
 
-#: src/alarm/interface.cc: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.cc: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.cc: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."
+#: src/adplug/adplug-xmms.cc:353 src/amidiplug/i_configure.cc:153
+#: src/console/plugin.cc:45 src/filewriter/filewriter.cc:481
+#: src/sid/xs_config.cc:65 src/xsf/plugin.cc:446
+msgid "Sample rate:"
 msgstr ""
-"ධාවන ලැයිස්තුව\n"
-"මෙම ධාවන ලැයිස්තුව ප්‍රවේශනය කරන්න. ධාවන ලැයිස්තුවක් නොමැතිනම්\n"
-"ලබා දී ඇත, පවත්නා දෙය යොදා ගනු ලැබේ.\n"
-"mp3/ogg දහරක URL\n"
-"මෙහි ඇතුල් කල හැක.\n"
-"\n"
-"සිහි කැදවුම:\n"
-"සංඥා කිරීම අවසන් වූ පසු සිහි කැදවුමක් පෙන්වන්න\n"
-"කොටුව තුල සිහි කැදවුම ටයිප් කරන්න සහ ඔබට එය පෙන්වීමට\n"
-"අවශ්‍ය නම් ටොගල බොත්තම සක්‍රිය කරන්න "
-
-#: src/alarm/interface.cc:81
-msgid "This is your wakeup call."
-msgstr "මේ ඔබගේ සිහි කැඳවීමේ ඇමතුමයි."
 
-#: src/alarm/interface.cc:99
-msgid "Your reminder for today is..."
-msgstr "ඔබගේ අද දවසේ මතක් කිරීම වන්නේ..."
-
-#: src/alarm/interface.cc:101 src/alarm/interface.cc:386
-msgid "Reminder"
-msgstr "මතක් කිරීම"
-
-#: src/alarm/interface.cc:132
-msgid "Monday"
-msgstr "සඳුදා"
-
-#: src/alarm/interface.cc:132
-msgid "Tuesday"
-msgstr "අඟහරුවාදා"
-
-#: src/alarm/interface.cc:132
-msgid "Wednesday"
-msgstr "බදාදා"
-
-#: src/alarm/interface.cc:133
-msgid "Thursday"
-msgstr "බ්‍රහස්පතින්දා"
-
-#: src/alarm/interface.cc:133
-msgid "Friday"
-msgstr "සිකුරාදා"
-
-#: src/alarm/interface.cc:133
-msgid "Saturday"
-msgstr "සෙනසුරාදා"
-
-#: src/alarm/interface.cc:133
-msgid "Sunday"
-msgstr "ඉරිදා"
-
-#: src/alarm/interface.cc:171 src/alarm/interface.cc:230
-#: src/alarm/interface.cc:245
-msgid "Time"
-msgstr "වෙලාව"
-
-#: src/alarm/interface.cc:178
-msgid "Alarm at (default):"
-msgstr "සිහිකැඳවීම (පෙරනිමිය)"
-
-#: src/alarm/interface.cc:200
-msgid "h"
-msgstr "පැ"
-
-#: src/alarm/interface.cc:203
-msgid "Quiet after:"
-msgstr "පසු නිහඬවන්න:"
-
-#: src/alarm/interface.cc:215
-msgid "hours"
-msgstr "පැය"
-
-#: src/alarm/interface.cc:226
-msgid "minutes"
-msgstr "මිනිත්තු"
-
-#: src/alarm/interface.cc:235
-msgid "Choose the days for the alarm to come on"
-msgstr "සිහි කැඳවීම් ලැබිය යුතු දිනයන් තෝරන්න"
-
-#: src/alarm/interface.cc:242
-msgid "Day"
-msgstr "දවස"
-
-#: src/alarm/interface.cc:259 src/bs2b/plugin.cc:130
-#: src/skins/preset-list.cc:434 src/skins/preset-list.cc:440
-msgid "Default"
-msgstr "පෙරනිමිය"
+#: src/adplug/adplug-xmms.cc:354 src/amidiplug/i_configure.cc:155
+#: src/bs2b/plugin.cc:141 src/console/plugin.cc:47
+#: src/modplug/plugin_main.cc:77 src/resample/resample.cc:201
+#: src/resample/resample.cc:207 src/resample/resample.cc:211
+#: src/resample/resample.cc:215 src/resample/resample.cc:219
+#: src/resample/resample.cc:223 src/resample/resample.cc:227
+#: src/resample/resample.cc:231 src/resample/resample.cc:235
+#: src/resample/resample.cc:239 src/resample/resample.cc:243
+#: src/sid/xs_config.cc:67 src/soxr/sox-resampler.cc:205
+msgid "Hz"
+msgstr "හර්ට්ස්"
 
-#: src/alarm/interface.cc:288
-msgid "Days"
-msgstr "දවස්"
-
-#: src/alarm/interface.cc:297
-msgid "Fading"
-msgstr "හායනය"
-
-#: src/alarm/interface.cc:305 src/console/plugin.cc:41
-#: src/crossfade/crossfade.cc:53 src/crossfade/crossfade.cc:59
-#: src/gtkui/settings.cc:49 src/lirc/lirc.cc:397 src/sid/xs_config.cc:85
-#: src/sid/xs_config.cc:94 src/sid/xs_config.cc:103
-msgid "seconds"
-msgstr "තප්පර"
+#: src/adplug/adplug-xmms.cc:355 src/gtkui/settings.cc:55
+#: src/modplug/plugin_main.cc:105 src/qtui/settings.cc:85
+#: src/skins-qt/skins_cfg.cc:302 src/skins/skins_cfg.cc:284
+msgid "Miscellaneous"
+msgstr "විවිධ"
 
-#: src/alarm/interface.cc:312 src/alarm/interface.cc:353
-msgid "Volume"
-msgstr "ශබ්ද මට්ටම"
-
-#: src/alarm/interface.cc:317
-msgid "Start at"
-msgstr "ආරම්භ කරන්න"
-
-#: src/alarm/interface.cc:333
-msgid "Final"
-msgstr "අවසානය"
-
-#: src/alarm/interface.cc:346
-msgid "Current"
-msgstr "දැන්"
-
-#: src/alarm/interface.cc:359
-msgid "Additional Command"
-msgstr "අමතර විධාන"
-
-#: src/alarm/interface.cc:365 src/alarm/interface.cc:391
-msgid "enable"
-msgstr "සක්‍රීය"
-
-#: src/alarm/interface.cc:372
-msgid "Playlist (optional)"
-msgstr "ධාවනය වන ගොනුව (අමතර)"
-
-#: src/alarm/interface.cc:379
-msgid "Select a playlist"
-msgstr "ධාවන ලැයිස්තුවක් තෝරන්න"
-
-#: src/alarm/interface.cc:399
-msgid "Options"
-msgstr "විකල්ප"
-
-#: src/alarm/interface.cc:404
-msgid "What do these options mean?"
-msgstr "මොනවාද මේ විකල්පයන්ගෙන් අදහස් වන්නේ?"
-
-#: src/alarm/interface.cc:420
-msgid "Help"
-msgstr "උදව්"
+#: src/adplug/adplug-xmms.cc:356
+msgid "Repeat song in endless loop"
+msgstr ""
 
-#: src/albumart/albumart.cc:31
+#: src/albumart/albumart.cc:31 src/albumart-qt/albumart.cc:35
 msgid "Album Art"
 msgstr "ඇල්බම් කලාව"
 
-#: src/albumart-qt/albumart.cc:33
-msgid "Album Art (Qt)"
-msgstr ""
-
-#: src/alsa/alsa.h:70
+#: src/alsa/alsa.h:64
 msgid "ALSA Output"
 msgstr "ALSA ප්‍රතිදානය "
 
@@ -344,11 +119,11 @@
 msgid "Mixer element:"
 msgstr "මිශ්‍ර කිරීමේ මූලද්‍රව්‍ය:"
 
-#: src/amidi-plug/amidi-plug.cc:41
+#: src/amidiplug/amidi-plug.cc:42
 msgid "AMIDI-Plug (MIDI Player)"
 msgstr "AMIDI-කෙවෙනිය (MIDI ධාවකය)"
 
-#: src/amidi-plug/amidi-plug.cc:437
+#: src/amidiplug/amidi-plug.cc:445
 msgid ""
 "AMIDI-Plug\n"
 "modular MIDI music player\n"
@@ -371,157 +146,156 @@
 "for the good help with alpha testing"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:94
+#: src/amidiplug/i_configure.cc:94
 msgid "Override default gain:"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:102
+#: src/amidiplug/i_configure.cc:102
 msgid "Override default polyphony:"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:110
+#: src/amidiplug/i_configure.cc:110
 msgid "Override default reverb:"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:112 src/amidi-plug/i_configure.cc:120
+#: src/amidiplug/i_configure.cc:112 src/amidiplug/i_configure.cc:120
 msgid "On"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:118
+#: src/amidiplug/i_configure.cc:118
 msgid "Override default chorus:"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:128 src/console/plugin.cc:29
+#: src/amidiplug/i_configure.cc:128 src/console/plugin.cc:29
 msgid "Playback"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:129
+#: src/amidiplug/i_configure.cc:129
 msgid "Transpose:"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:131
+#: src/amidiplug/i_configure.cc:131 src/speedpitch/speed-pitch.cc:257
 msgid "semitones"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:132
+#: src/amidiplug/i_configure.cc:132
 msgid "Drum shift:"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:134
+#: src/amidiplug/i_configure.cc:134
 msgid "note numbers"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:135
+#: src/amidiplug/i_configure.cc:135
 msgid "Skip leading silence"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:137
+#: src/amidiplug/i_configure.cc:137
 msgid "Skip trailing silence"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:141
+#: src/amidiplug/i_configure.cc:141
 msgid "SoundFont"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:143
+#: src/amidiplug/i_configure.cc:148
 msgid "Synthesizer"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:148 src/console/plugin.cc:45
-#: src/sid/xs_config.cc:65
-msgid "Sample rate:"
-msgstr ""
-
-#: src/amidi-plug/i_configure.cc:150 src/bs2b/plugin.cc:141
-#: src/console/plugin.cc:47 src/modplug/plugin_main.cc:78
-#: src/resample/resample.cc:201 src/resample/resample.cc:207
-#: src/resample/resample.cc:211 src/resample/resample.cc:215
-#: src/resample/resample.cc:219 src/resample/resample.cc:223
-#: src/resample/resample.cc:227 src/resample/resample.cc:231
-#: src/resample/resample.cc:235 src/resample/resample.cc:239
-#: src/resample/resample.cc:243 src/sid/xs_config.cc:67
-#: src/sox-resampler/sox-resampler.cc:163
-msgid "Hz"
-msgstr "හර්ට්ස්"
-
-#: src/amidi-plug/i_configure-fluidsynth.cc:52
+#: src/amidiplug/i_configure-fluidsynth.cc:58
+#: src/amidiplug/i_configure-fluidsynth.cc:527
 msgid "AMIDI-Plug - select SoundFont file"
 msgstr "AMIDI-පේනු - SoundFont ගොනුව තෝරන්න"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:55 src/filewriter/mp3.cc:658
+#: src/amidiplug/i_configure-fluidsynth.cc:61
 msgid "_Cancel"
 msgstr "_අවලංගු කරන්න"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:56
+#: src/amidiplug/i_configure-fluidsynth.cc:62
 msgid "_Open"
 msgstr ""
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:225 src/gtkui/columns.cc:46
+#: src/amidiplug/i_configure-fluidsynth.cc:233
+#: src/amidiplug/i_configure-fluidsynth.cc:461
 msgid "File name"
 msgstr "ගොනු නම"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:229
+#: src/amidiplug/i_configure-fluidsynth.cc:237
+#: src/amidiplug/i_configure-fluidsynth.cc:464
 msgid "Size (bytes)"
 msgstr "ප්‍රමාණය (බයිට්ස්)"
 
-#: src/amidi-plug/i_fileinfo.cc:163
+#: src/amidiplug/i_fileinfo.cc:184
 msgid "Name:"
 msgstr "නම:"
 
-#: src/amidi-plug/i_fileinfo.cc:181
+#: src/amidiplug/i_fileinfo.cc:202
 msgid " MIDI Info "
 msgstr " MIDI තොරතුරු "
 
-#: src/amidi-plug/i_fileinfo.cc:195
+#: src/amidiplug/i_fileinfo.cc:216
 msgid "Format:"
 msgstr "හැඩතලය:"
 
-#: src/amidi-plug/i_fileinfo.cc:198
+#: src/amidiplug/i_fileinfo.cc:219
 msgid "Length (msec):"
 msgstr "දිග (මිලි තප්පර):"
 
-#: src/amidi-plug/i_fileinfo.cc:201
+#: src/amidiplug/i_fileinfo.cc:222
 msgid "No. of Tracks:"
 msgstr "ඛණ්ඩ ගණන:"
 
-#: src/amidi-plug/i_fileinfo.cc:207
+#: src/amidiplug/i_fileinfo.cc:228
 msgid "variable"
 msgstr "විචල්‍යය"
 
-#: src/amidi-plug/i_fileinfo.cc:209
+#: src/amidiplug/i_fileinfo.cc:230
 msgid "BPM:"
 msgstr "BPM:"
 
-#: src/amidi-plug/i_fileinfo.cc:217
+#: src/amidiplug/i_fileinfo.cc:238
 msgid "BPM (wavg):"
 msgstr "BPM (wavg):"
 
-#: src/amidi-plug/i_fileinfo.cc:220
+#: src/amidiplug/i_fileinfo.cc:241
 msgid "Time Div:"
 msgstr "කාලය බෙදීම:"
 
-#: src/amidi-plug/i_fileinfo.cc:231
+#: src/amidiplug/i_fileinfo.cc:252
 msgid " MIDI Comments and Lyrics "
 msgstr " MIDI අදහස් දැක්වීම් සහ පද රචනයන් "
 
-#: src/amidi-plug/i_fileinfo.cc:278
+#: src/amidiplug/i_fileinfo.cc:299
 msgid "* no comments available in this MIDI file *"
 msgstr "* මෙම MIDI ගොනුවෙහි අදහස් දැක්වීම් නොමැත *"
 
-#: src/amidi-plug/i_fileinfo.cc:290
+#: src/amidiplug/i_fileinfo.cc:311
 msgid "* no lyrics available in this MIDI file *"
 msgstr "* මෙම MIDI ගොනුවෙහි පද රචනා නොමැත *"
 
-#: src/amidi-plug/i_fileinfo.cc:300 src/filewriter/vorbis.cc:197
-#: src/ladspa/plugin.cc:416
+#: src/amidiplug/i_fileinfo.cc:321 src/ladspa/plugin.cc:418
+#: src/ui-common/dialogs-qt.cc:32
 msgid "_Close"
 msgstr "_වසන්න"
 
-#: src/amidi-plug/i_fileinfo.cc:325
+#: src/amidiplug/i_fileinfo.cc:346
 msgid " (invalid UTF-8)"
 msgstr "(අවලංගු UTF-8)"
 
-#: src/aosd/aosd.cc:32
+#: src/ampache/ampache.cc:33
+msgid "Ampache Browser"
+msgstr ""
+
+#: src/ampache/ampache.cc:46
+msgid ""
+"Ampache Browser for Audacious\n"
+"http://ampache-browser.org/\n"
+"\n"
+"Copyright (C) Róbert Čerňanský and John Lindgren\n"
+"License: GNU GPLv3"
+msgstr ""
+
+#: src/aosd/aosd.cc:31
 msgid ""
 "Audacious OSD\n"
 "http://www.develia.org/projects.php?p=audacious#aosd\n"
@@ -548,130 +322,130 @@
 msgid "Concave Rectangle"
 msgstr "අවතල ඍජුකෝණාශ්‍රය"
 
-#: src/aosd/aosd_style.cc:69
+#: src/aosd/aosd_style.cc:69 src/openmpt/mptwrap.h:50 src/xsf/plugin.cc:436
 msgid "None"
 msgstr "කිසිවක් නැත"
 
-#: src/aosd/aosd_trigger.cc:50
+#: src/aosd/aosd_trigger.cc:49
 msgid "Playback Start"
 msgstr "පිළිවැයීම ආරම්භ කිරීම"
 
-#: src/aosd/aosd_trigger.cc:51
+#: src/aosd/aosd_trigger.cc:50
 msgid "Triggers OSD when a playlist entry is played."
 msgstr "ධාවන ලැයිස්තු අයිතමයක් ක්‍රියාත්මක වනවිට OSD කියාත්මක කිරීම"
 
-#: src/aosd/aosd_trigger.cc:56
+#: src/aosd/aosd_trigger.cc:55
 msgid "Title Change"
 msgstr "මාතෘකාව වෙනස්කිරීම"
 
-#: src/aosd/aosd_trigger.cc:57
+#: src/aosd/aosd_trigger.cc:56
 msgid "Triggers OSD when the song title changes (for internet streams)."
 msgstr ""
 
-#: src/aosd/aosd_trigger.cc:62
+#: src/aosd/aosd_trigger.cc:61
 msgid "Pause On"
 msgstr "විරාමය ක්‍රියාත්මකයි"
 
-#: src/aosd/aosd_trigger.cc:63
+#: src/aosd/aosd_trigger.cc:62
 msgid "Triggers OSD when playback is paused."
 msgstr "පිළිවැයීම් විරාමයේදී OSD ක්‍රියාත්මක කිරීම"
 
-#: src/aosd/aosd_trigger.cc:68
+#: src/aosd/aosd_trigger.cc:67
 msgid "Pause Off"
 msgstr "විරාමය ක්‍රියාවිරහිතයි"
 
-#: src/aosd/aosd_trigger.cc:69
+#: src/aosd/aosd_trigger.cc:68
 msgid "Triggers OSD when playback is unpaused."
 msgstr "පිළිවැයීම් විරාමය අවසානයේදී OSD ක්‍රියාත්මක කිරීම"
 
-#: src/aosd/aosd_ui.cc:163
+#: src/aosd/aosd_ui.cc:204
 msgid "Placement"
 msgstr "ස්ථාපනය"
 
-#: src/aosd/aosd_ui.cc:196
+#: src/aosd/aosd_ui.cc:241
 msgid "Relative X offset:"
 msgstr "සාපේක්ෂ X අනුලම්බය:"
 
-#: src/aosd/aosd_ui.cc:203
+#: src/aosd/aosd_ui.cc:245
 msgid "Relative Y offset:"
 msgstr "සාපේක්ෂ Y අනුලම්බය:"
 
-#: src/aosd/aosd_ui.cc:210
+#: src/aosd/aosd_ui.cc:249
 msgid "Max OSD width:"
 msgstr "උපරිම OSD පළල:"
 
-#: src/aosd/aosd_ui.cc:221
+#: src/aosd/aosd_ui.cc:281
 msgid "Multi-Monitor options"
 msgstr "බහු මොනිටර විකල්ප"
 
-#: src/aosd/aosd_ui.cc:225
+#: src/aosd/aosd_ui.cc:285
 msgid "Display OSD using:"
 msgstr "OSD දර්ශනයට භාවිතා කරන්න:"
 
-#: src/aosd/aosd_ui.cc:227
+#: src/aosd/aosd_ui.cc:287
 msgid "all monitors"
 msgstr "සියලුම මොනිටර"
 
-#: src/aosd/aosd_ui.cc:230
+#: src/aosd/aosd_ui.cc:290
 #, c-format
 msgid "monitor %i"
 msgstr "මොනිටරය %i"
 
-#: src/aosd/aosd_ui.cc:282
+#: src/aosd/aosd_ui.cc:342
 msgid "Timing (ms)"
 msgstr "කාල නියමය (මිලි තප්පර)"
 
-#: src/aosd/aosd_ui.cc:287
+#: src/aosd/aosd_ui.cc:347
 msgid "Display:"
 msgstr "දර්ශනය:"
 
-#: src/aosd/aosd_ui.cc:292
+#: src/aosd/aosd_ui.cc:352
 msgid "Fade in:"
 msgstr "ක්‍රමෝද්දීපනය:"
 
-#: src/aosd/aosd_ui.cc:297
+#: src/aosd/aosd_ui.cc:357
 msgid "Fade out:"
 msgstr "ක්‍රමාවදීපනය:"
 
-#: src/aosd/aosd_ui.cc:361
+#: src/aosd/aosd_ui.cc:442
 msgid "Fonts"
 msgstr "අකුරු වර්ගය"
 
-#: src/aosd/aosd_ui.cc:368
+#: src/aosd/aosd_ui.cc:449
 #, c-format
 msgid "Font %i:"
 msgstr "අකුරු වර්ගය %i:"
 
-#: src/aosd/aosd_ui.cc:382
+#: src/aosd/aosd_ui.cc:466
 msgid "Shadow"
 msgstr "සෙවනැල්ල"
 
-#: src/aosd/aosd_ui.cc:486
+#: src/aosd/aosd_ui.cc:589
 msgid "Render Style"
 msgstr "විදැහුම් අන්දම"
 
-#: src/aosd/aosd_ui.cc:502
+#: src/aosd/aosd_ui.cc:605
 msgid "Colors"
 msgstr "පාට"
 
-#: src/aosd/aosd_ui.cc:513
+#: src/aosd/aosd_ui.cc:616
 #, c-format
 msgid "Color %i:"
 msgstr "පාට %i:"
 
-#: src/aosd/aosd_ui.cc:600
+#: src/aosd/aosd_ui.cc:714
 msgid "Enable trigger"
 msgstr "ක්‍රියාරම්භකය සක්‍රිය කිරිම"
 
-#: src/aosd/aosd_ui.cc:627
+#: src/aosd/aosd_ui.cc:741
 msgid "Event"
 msgstr "සිද්ධිය"
 
-#: src/aosd/aosd_ui.cc:655
+#: src/aosd/aosd_ui.cc:768
 msgid "Composite manager detected"
 msgstr "සංයුක්ත කළමනාකාරකය හඳුනා ගන්නා ලදී"
 
-#: src/aosd/aosd_ui.cc:662
+#: src/aosd/aosd_ui.cc:775
 msgid ""
 "Composite manager not detected;\n"
 "unless you know that you have one running, please activate a composite "
@@ -681,62 +455,58 @@
 "දැනටමත් එකක් ධාවනය වෙමින් නොපවතී නම් කරුණාකර සංයුක්ත කළමනාකාරකයක් සක්‍රීය කරන්න. එසේ නැතිනම් "
 "OSD නිසි ලෙස ක්‍රියා නොකරයි"
 
-#: src/aosd/aosd_ui.cc:670
+#: src/aosd/aosd_ui.cc:783
 msgid "Composite manager not required for fake transparency"
 msgstr "ව්‍යාජ විනිවිද පෙනීම සඳහා සංයුක්ත කළමනාකාරකය අවශ්‍ය නැත"
 
-#: src/aosd/aosd_ui.cc:706
+#: src/aosd/aosd_ui.cc:820
 msgid "Transparency"
 msgstr "විනිවිද පෙනීම"
 
-#: src/aosd/aosd_ui.cc:712
+#: src/aosd/aosd_ui.cc:826
 msgid "Fake transparency"
 msgstr "ව්‍යාජ විනිවිද පෙනීම"
 
-#: src/aosd/aosd_ui.cc:714
+#: src/aosd/aosd_ui.cc:828
 msgid "Real transparency (requires X Composite Ext.)"
 msgstr "සත්‍ය විනිවිද පෙනීම (X සංයුක්ත Ext. අවශ්‍යයයි)"
 
-#: src/aosd/aosd_ui.cc:756
+#: src/aosd/aosd_ui.cc:875
 msgid "Composite extension not loaded"
 msgstr "සංයුක්ත දිගුව ප්‍රවේශනය වී නොමැත"
 
-#: src/aosd/aosd_ui.cc:764
-msgid "Composite extension not available"
-msgstr "සංයුක්ත දිගුව නොමැත"
-
-#: src/aosd/aosd_ui.cc:781
+#: src/aosd/aosd_ui.cc:892
 #, c-format
 msgid "Audacious OSD"
 msgstr "Audacious OSD"
 
-#: src/aosd/aosd_ui.cc:844
+#: src/aosd/aosd_ui.cc:955
 msgid "Position"
 msgstr "පිහිටීම"
 
-#: src/aosd/aosd_ui.cc:849
+#: src/aosd/aosd_ui.cc:960
 msgid "Animation"
 msgstr "සජීවනය"
 
-#: src/aosd/aosd_ui.cc:854
+#: src/aosd/aosd_ui.cc:965
 msgid "Text"
 msgstr "පෙළ"
 
-#: src/aosd/aosd_ui.cc:859
+#: src/aosd/aosd_ui.cc:970
 msgid "Decoration"
 msgstr "අලංකරණය"
 
-#: src/aosd/aosd_ui.cc:864
+#: src/aosd/aosd_ui.cc:975
 msgid "Trigger"
 msgstr "ක්‍රියාරම්භකය"
 
-#: src/aosd/aosd_ui.cc:869
+#: src/aosd/aosd_ui.cc:980 src/streamtuner/shoutcast-model.cc:202
 msgid "Misc"
 msgstr "විවිධ"
 
-#: src/aosd/aosd_ui.cc:878
+#: src/aosd/aosd_ui.cc:989
 msgid "Test"
-msgstr ""
+msgstr "පරික්‍ෂා කිරීම"
 
 #: src/asx3/asx3.cc:35
 msgid "ASXv3 Playlists"
@@ -750,11 +520,83 @@
 msgid "Audacious Playlists (audpl)"
 msgstr "ඔඩෙෂස් ධාවන ලැස්තු (audpl)"
 
-#: src/blur_scope/blur_scope.cc:42
+#: src/background_music/background_music.cc:24
+msgid "Background music"
+msgstr ""
+
+#: src/background_music/background_music.cc:25
+msgid "Target level:"
+msgstr ""
+
+#: src/background_music/background_music.cc:28
+#: src/background_music/background_music.cc:33
+#: src/silence-removal/silence-removal.cc:70
+msgid "dB"
+msgstr "dB"
+
+#: src/background_music/background_music.cc:29
+msgid "Maximum amplification:"
+msgstr ""
+
+#: src/background_music/background_music.cc:34 src/mpg123/mpg123.cc:81
+msgid "Advanced"
+msgstr ""
+
+#: src/background_music/background_music.cc:36
+msgid "Slow detection weight:"
+msgstr ""
+
+#: src/background_music/background_music.cc:39
+msgid "Hint"
+msgstr ""
+
+#: src/background_music/background_music.cc:41
+msgid ""
+"Slow detection weight is the relative weight\n"
+"of a long term average detection when compared\n"
+"to the actual, faster loudness detection.\n"
+"A value of zero gives a more radio-like sound\n"
+"where soft passages get \"pulled up\" more quickly,\n"
+"a value of two makes the sound feel less compressed."
+msgstr ""
+
+#: src/background_music/background_music.cc:52
+msgid ""
+"Background Music Plugin for Audacious\n"
+"Copyright 2023;2024 Michel Fleur\n"
+"\n"
+"Controls the volume to make the sound equally loud within and between "
+"tracks.\n"
+" It uses accurate loudness measurement and tries to make the volume changes "
+"sound natural without audible peaks, yet without lowering the volume before "
+"a peak in advance."
+msgstr ""
+
+#: src/background_music/background_music.cc:61
+msgid "Background Music"
+msgstr ""
+
+#: src/bitcrusher/bitcrusher.cc:33
+msgid "Bitcrusher"
+msgstr ""
+
+#: src/bitcrusher/bitcrusher.cc:34
+msgid "Bit Depth:"
+msgstr ""
+
+#: src/bitcrusher/bitcrusher.cc:37
+msgid "Downsample ratio:"
+msgstr ""
+
+#: src/bitcrusher/bitcrusher.cc:48
+msgid "Bitcrusher"
+msgstr ""
+
+#: src/blur_scope/blur_scope.cc:40 src/blur_scope-qt/blur_scope.cc:45
 msgid "Color"
 msgstr "වර්ණ"
 
-#: src/blur_scope/blur_scope.cc:58
+#: src/blur_scope/blur_scope.cc:56 src/blur_scope-qt/blur_scope.cc:158
 msgid "Blur Scope"
 msgstr "නොපැහැදිලි විෂය පථය"
 
@@ -766,6 +608,10 @@
 msgid "Presets:"
 msgstr "පෙර සකසන ලද:"
 
+#: src/bs2b/plugin.cc:130
+msgid "Default"
+msgstr "පෙරනිමිය"
+
 #: src/bs2b/plugin.cc:136
 msgid "Feed level:"
 msgstr "සංග්‍රහ මට්ටම:"
@@ -778,15 +624,15 @@
 msgid "Cut frequency:"
 msgstr "සංඛ්‍යාතය කපන්න:"
 
-#: src/cairo-spectrum/cairo-spectrum.cc:41
+#: src/cairo-spectrum/cairo-spectrum.cc:42 src/qt-spectrum/qt-spectrum.cc:107
 msgid "Spectrum Analyzer"
 msgstr "වර්ණාවලි විශ්ලේශකය"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:72
+#: src/cdaudio/cdaudio-ng.cc:74
 msgid "Audio CD Plugin"
 msgstr "ශ්‍රව්‍ය CD පේනු මෘදුකාංගය "
 
-#: src/cdaudio-ng/cdaudio-ng.cc:121
+#: src/cdaudio/cdaudio-ng.cc:121
 msgid ""
 "Copyright (C) 2007-2012 Calin Crisan <ccrisan@gmail.com> and others.\n"
 "\n"
@@ -803,132 +649,132 @@
 "උපදෙස් දීම සහ මගපෙන්වීම වෙනුවෙන් මගේ ස්තුතිය Tony Vroon වෙත පුද කරමි.\n"
 "මෙය 2007 වසරේ Google Summer of Code ව්‍යාපෘතියකි."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:137
+#: src/cdaudio/cdaudio-ng.cc:140
 msgid "Device"
 msgstr "ආම්පන්නය"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:138
+#: src/cdaudio/cdaudio-ng.cc:141
 msgid "Read speed:"
 msgstr "වේගයෙන් කියවන්න:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:141
+#: src/cdaudio/cdaudio-ng.cc:144
 msgid "Override device:"
 msgstr "ප්‍රතික්ෂේපිත ආම්පන්නය:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:143
+#: src/cdaudio/cdaudio-ng.cc:146
 msgid "Metadata"
 msgstr "පාරදත්ත"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:144
+#: src/cdaudio/cdaudio-ng.cc:147
 msgid "Use CD-Text"
 msgstr "භාවිතා කරන්න CD-පෙළ "
 
-#: src/cdaudio-ng/cdaudio-ng.cc:146
+#: src/cdaudio/cdaudio-ng.cc:150
 msgid "Use CDDB"
 msgstr "භාවිතා කරන්න CDDB"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:148
+#: src/cdaudio/cdaudio-ng.cc:152
 msgid "Use HTTP instead of CDDBP"
 msgstr "CDDBP වෙනුවට HTTP භාවිතා කරන්න"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:151
+#: src/cdaudio/cdaudio-ng.cc:155
 msgid "Server:"
 msgstr "සේවාදායකය:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:155
+#: src/cdaudio/cdaudio-ng.cc:159
 msgid "Path:"
 msgstr "පථය:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:159
+#: src/cdaudio/cdaudio-ng.cc:163
 msgid "Port:"
 msgstr "තොට:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:246
+#: src/cdaudio/cdaudio-ng.cc:228
 msgid "Failed to initialize cdio subsystem."
 msgstr "cdio උප පද්ධතිය ඇරඹීම අසාර්ථකය."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:281
+#: src/cdaudio/cdaudio-ng.cc:260
 #, c-format
 msgid "Invalid URI %s."
 msgstr "අවලංගු URI %s."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:283
+#: src/cdaudio/cdaudio-ng.cc:262
 #, c-format
 msgid "Track %d not found."
 msgstr "ඛණ්ඩය %d සොයාගත නොහැක."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:285
+#: src/cdaudio/cdaudio-ng.cc:264
 #, c-format
 msgid "Track %d is a data track."
 msgstr "ඛණ්ඩ %d දත්ත ඛණ්ඩයකි."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:360
+#: src/cdaudio/cdaudio-ng.cc:339
 msgid "Error reading audio CD."
 msgstr "ශ්‍රව්‍ය CD කියවීමේ දෝෂය"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:429
+#: src/cdaudio/cdaudio-ng.cc:410
 msgid "Audio CD"
 msgstr "ශ්‍රව්‍ය CD"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:460 src/cdaudio-ng/cdaudio-ng.cc:469
+#: src/cdaudio/cdaudio-ng.cc:446 src/cdaudio/cdaudio-ng.cc:455
 #, c-format
 msgid "Failed to open CD device %s."
 msgstr "CD අම්පන්නය %s විවෘත කිරීම අසාර්ථක විය."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:472
+#: src/cdaudio/cdaudio-ng.cc:458
 msgid "No audio capable CD drive found."
 msgstr "ශ්‍රව්‍ය ක්‍රියා කල හැකි CD අම්පන්නය සොයාගත නොහැක."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:497
+#: src/cdaudio/cdaudio-ng.cc:481
+msgid "Drive is empty."
+msgstr "ධාවකය හිස්."
+
+#: src/cdaudio/cdaudio-ng.cc:483
+msgid "Unsupported disk type."
+msgstr "සහාය නොමැති තැටි වර්ගයකි."
+
+#: src/cdaudio/cdaudio-ng.cc:507
 msgid "Failed to finish initializing opened CD drive."
 msgstr "විවෘත කරන ලද CD අම්පන්නය අවසානය තෙක් ක්‍රියාත්මක කිරීම අසාර්ථක විය."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:510
+#: src/cdaudio/cdaudio-ng.cc:520
 msgid "Failed to retrieve first/last track number."
 msgstr "පළමු/අවසාන ඛණ්ඩ අංකය සොයාගැනීම අසාර්ථක විය."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:531
+#: src/cdaudio/cdaudio-ng.cc:541
 #, c-format
 msgid "Cannot read start/end LSN for track %d."
 msgstr "ඛණ්ඩ %d හි පළමු/අවසාන LSN කියවීමට නොහැක."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:613
-msgid "Failed to create the cddb connection."
-msgstr "cddb සම්බන්ධතාව තැනීම අසාර්ථක විය."
+#: src/cdaudio/cdaudio-ng.cc:624
+msgid "Failed to create the CDDB connection."
+msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:679
+#: src/cdaudio/cdaudio-ng.cc:690
 msgid "Failed to query the CDDB server"
 msgstr "CDDB සේවාදායකය විමසුමට අපොහොසත් විය."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:681
+#: src/cdaudio/cdaudio-ng.cc:692
 #, c-format
 msgid "Failed to query the CDDB server: %s"
 msgstr "CDDB සේවාදායකය : %s විමසුමට අපොහොසත් විය."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:705
+#: src/cdaudio/cdaudio-ng.cc:716
 #, c-format
-msgid "Failed to read the cddb info: %s"
-msgstr "cddb තොරතුරු: %s කියවීමට අපොහොසත් විය."
-
-#: src/cdaudio-ng/cdaudio-ng.cc:765
-msgid "Drive is empty."
-msgstr "ධාවකය හිස්."
-
-#: src/cdaudio-ng/cdaudio-ng.cc:767
-msgid "Unsupported disk type."
-msgstr "සහාය නොමැති තැටි වර්ගයකි."
+msgid "Failed to read the CDDB info: %s"
+msgstr ""
 
-#: src/cd-menu-items/cd-menu-items.cc:35
+#: src/cd-menu-items/cd-menu-items.cc:33
 msgid "Audio CD Menu Items"
 msgstr "ශ්‍රව්‍ය CD මෙනු අයිතම "
 
-#: src/cd-menu-items/cd-menu-items.cc:47
-msgid "Play CD"
-msgstr "සංයුක්ත තැටිය ධාවනය කරන්න "
-
-#: src/cd-menu-items/cd-menu-items.cc:47
-msgid "Add CD"
-msgstr "සංයුක්ත තැටිය එකතු කරන්න"
+#: src/cd-menu-items/cd-menu-items.cc:45
+msgid "Pla_y CD"
+msgstr ""
+
+#: src/cd-menu-items/cd-menu-items.cc:45
+msgid "_Add CD"
+msgstr ""
 
 #: src/compressor/compressor.cc:45
 msgid "Compression"
@@ -984,7 +830,14 @@
 msgid "Default song length:"
 msgstr "පෙරනිමි ගීත දිග:"
 
-#: src/console/plugin.cc:42 src/modplug/plugin_main.cc:59
+#: src/console/plugin.cc:41 src/crossfade/crossfade.cc:56
+#: src/crossfade/crossfade.cc:62 src/lirc/lirc.cc:395 src/notify/notify.cc:113
+#: src/sid/xs_config.cc:85 src/sid/xs_config.cc:94 src/sid/xs_config.cc:103
+#: src/vumeter-qt/vumeter_qt.cc:39
+msgid "seconds"
+msgstr "තප්පර"
+
+#: src/console/plugin.cc:42 src/modplug/plugin_main.cc:58
 msgid "Resampling"
 msgstr " නැවත සාම්පල කිරීම"
 
@@ -1008,76 +861,82 @@
 msgid "Game Console Music Decoder"
 msgstr "ක්‍රීඩා පාලන පුවරු සංගීත විකේතකය"
 
-#: src/coreaudio/coreaudio.cc:50
+#: src/coreaudio/coreaudio.cc:53
 msgid "CoreAudio output"
 msgstr ""
 
-#: src/coreaudio/coreaudio.cc:131
+#: src/coreaudio/coreaudio.cc:155
 msgid ""
 "CoreAudio Output Plugin for Audacious\n"
 "Copyright 2014 William Pitcock\n"
+"Copyright 2017,18 René J.V. Bertin\n"
+" (original code and code adapted from\n"
+" Apple examples, (C) Apple 2013)\n"
 "\n"
 "Based on SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
 msgstr ""
 
-#: src/coreaudio/coreaudio.cc:143
+#: src/coreaudio/coreaudio.cc:171
 msgid "Use exclusive mode"
 msgstr ""
 
-#: src/crossfade/crossfade.cc:44
+#: src/coreaudio/coreaudio.cc:173
+msgid "Use bit perfect audio (adapt device sampling rate)"
+msgstr ""
+
+#: src/crossfade/crossfade.cc:47
 msgid ""
 "Crossfade Plugin for Audacious\n"
 "Copyright 2010-2014 John Lindgren"
 msgstr ""
 
-#: src/crossfade/crossfade.cc:48
+#: src/crossfade/crossfade.cc:51
 msgid "Crossfade"
 msgstr "එක් ශබ්දයකින් තවත් ශබ්දයකට මාරු වීම"
 
-#: src/crossfade/crossfade.cc:49
+#: src/crossfade/crossfade.cc:52
 msgid "On automatic song change"
 msgstr ""
 
-#: src/crossfade/crossfade.cc:51 src/crossfade/crossfade.cc:57
+#: src/crossfade/crossfade.cc:54 src/crossfade/crossfade.cc:60
 msgid "Overlap:"
 msgstr "අතිච්ඡාදන:"
 
-#: src/crossfade/crossfade.cc:55
+#: src/crossfade/crossfade.cc:58
 msgid "On seek or manual song change"
 msgstr ""
 
-#: src/crossfade/crossfade.cc:61
+#: src/crossfade/crossfade.cc:64
+msgid "No fade in"
+msgstr ""
+
+#: src/crossfade/crossfade.cc:66
+msgid "Use S-curve fade"
+msgstr ""
+
+#: src/crossfade/crossfade.cc:68
+msgid "S-curve steepness:"
+msgstr ""
+
+#: src/crossfade/crossfade.cc:70
+msgid "(higher is steeper)"
+msgstr ""
+
+#: src/crossfade/crossfade.cc:72
 msgid "Tip"
 msgstr ""
 
-#: src/crossfade/crossfade.cc:62
+#: src/crossfade/crossfade.cc:73
 msgid ""
 "For better crossfading, enable\n"
 "the Silence Removal effect."
 msgstr ""
 
-#: src/crossfade/crossfade.cc:72
+#: src/crossfade/crossfade.cc:83
 msgid "Crossfade"
 msgstr "එක් ශබ්දයකින් තවත් ශබ්දයකට මාරු වීම"
 
-#: src/crossfade/crossfade.cc:161
-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.cc:168
-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/crystalizer/crystalizer.cc:31
 msgid "Crystalizer"
 msgstr "පළිඟුව"
@@ -1090,60 +949,61 @@
 msgid "Crystalizer"
 msgstr "පළිඟුව"
 
-#: src/cue/cue.cc:37
+#: src/cue/cue.cc:42
 msgid "Cue Sheet Plugin"
 msgstr "සලකුණු පත් පේනු මෘදුකාංගය "
 
-#: src/delete-files/delete-files.cc:46 src/delete-files/delete-files.cc:146
+#: src/delete-files/delete-files.cc:53 src/delete-files/delete-files.cc:215
+#: src/delete-files/delete-files.cc:230
 msgid "Delete Files"
 msgstr ""
 
-#: src/delete-files/delete-files.cc:75
-#, c-format
-msgid "Error moving %s to trash: %s."
+#: src/delete-files/delete-files.cc:120
+msgid "No files are selected."
 msgstr ""
 
-#: src/delete-files/delete-files.cc:86
+#: src/delete-files/delete-files.cc:125
 #, c-format
-msgid "Error deleting %s: %s."
+msgid "Do you want to move %s to the trash?"
 msgstr ""
 
-#: src/delete-files/delete-files.cc:117
+#: src/delete-files/delete-files.cc:126
 #, c-format
-msgid "Error deleting %s: not a local file."
+msgid "Do you want to permanently delete %s?"
 msgstr ""
 
-#: src/delete-files/delete-files.cc:134
-msgid "Do you want to move the selected files to the trash?"
+#: src/delete-files/delete-files.cc:133
+#, c-format
+msgid "Do you want to move %d files to the trash?"
 msgstr ""
 
-#: src/delete-files/delete-files.cc:135
-msgid "Move to Trash"
+#: src/delete-files/delete-files.cc:134
+#, c-format
+msgid "Do you want to permanently delete %d files?"
 msgstr ""
 
-#: src/delete-files/delete-files.cc:140
-msgid "Do you want to permanently delete the selected files?"
+#: src/delete-files/delete-files.cc:146
+msgid "Move to trash"
 msgstr ""
 
-#: src/delete-files/delete-files.cc:141 src/skins/preset-list.cc:411
-#: src/skins/preset-list.cc:427
+#: src/delete-files/delete-files.cc:146
 msgid "Delete"
 msgstr "මකන්න "
 
-#: src/delete-files/delete-files.cc:145 src/skins/preset-browser.cc:56
-#: src/skins/preset-list.cc:307 src/skins/ui_playlist.cc:221
+#: src/delete-files/delete-files.cc:213 src/delete-files/delete-files.cc:235
+#: src/skins-qt/search-select.cc:102 src/skins/search-select.cc:78
 msgid "Cancel"
 msgstr "අවලංගු කිරීම"
 
-#: src/delete-files/delete-files.cc:166
+#: src/delete-files/delete-files.cc:267
 msgid "Delete Selected Files"
 msgstr ""
 
-#: src/delete-files/delete-files.cc:181
+#: src/delete-files/delete-files.cc:287
 msgid "Delete Method"
 msgstr ""
 
-#: src/delete-files/delete-files.cc:182
+#: src/delete-files/delete-files.cc:288
 msgid "Move to trash instead of deleting immediately"
 msgstr ""
 
@@ -1159,13 +1019,13 @@
 msgid "Echo"
 msgstr "ප්‍රතිරාව"
 
-#: src/echo_plugin/echo.cc:22 src/modplug/plugin_main.cc:73
-#: src/modplug/plugin_main.cc:83
+#: src/echo_plugin/echo.cc:22 src/modplug/plugin_main.cc:72
+#: src/modplug/plugin_main.cc:82
 msgid "Delay:"
 msgstr "ප්‍රමාදය:"
 
-#: src/echo_plugin/echo.cc:24 src/modplug/plugin_main.cc:73
-#: src/modplug/plugin_main.cc:83
+#: src/echo_plugin/echo.cc:24 src/modplug/plugin_main.cc:72
+#: src/modplug/plugin_main.cc:82 src/xsf/plugin.cc:445
 msgid "ms"
 msgstr "මාත සංවේද්‍යතාව"
 
@@ -1173,7 +1033,7 @@
 msgid "Feedback:"
 msgstr "ප්‍රතිපෝෂණය:"
 
-#: src/echo_plugin/echo.cc:28 src/modplug/plugin_main.cc:87
+#: src/echo_plugin/echo.cc:28 src/modplug/plugin_main.cc:86
 msgid "Volume:"
 msgstr "ශබ්ද මට්ටම :"
 
@@ -1181,11 +1041,11 @@
 msgid "Echo"
 msgstr "ප්‍රතිරාව"
 
-#: src/ffaudio/ffaudio-core.cc:41
+#: src/ffaudio/ffaudio-core.cc:50
 msgid "FFmpeg Plugin"
 msgstr "FFmpeg පේනු මෘදුකාංගය "
 
-#: src/ffaudio/ffaudio-core.cc:571
+#: src/ffaudio/ffaudio-core.cc:649
 msgid ""
 "Multi-format audio decoding plugin for Audacious using\n"
 "FFmpeg multimedia framework (http://www.ffmpeg.org/)\n"
@@ -1201,245 +1061,306 @@
 "විලියම් පිට්කොක් <nenolod@nenolod.net>⏎\n"
 "මැටී හැමලේයිනෙන් <ccr@tnsp.org>"
 
-#: src/filewriter/filewriter.cc:45
+#: src/filewriter/filewriter.cc:48
 msgid "FileWriter Plugin"
 msgstr "ගොනු රචක පේනු මෘදුකාංගය "
 
-#: src/filewriter/filewriter.cc:386
+#: src/filewriter/filewriter.cc:316
+#, c-format
+msgid ""
+"Error opening %s:\n"
+"%s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:358
+msgid ""
+"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/filewriter/filewriter.cc:385
 msgid "Output file format:"
 msgstr "ප්‍රතිදාන ගොනු ආකෘතිය:"
 
-#: src/filewriter/filewriter.cc:403
-msgid "Configure"
-msgstr "වින්‍යාස කරන්න"
-
-#: src/filewriter/filewriter.cc:413
+#: src/filewriter/filewriter.cc:389
 msgid "Save into original directory"
 msgstr "මූලික නාමාවලියට සුරකින්න"
 
-#: src/filewriter/filewriter.cc:417
-msgid "Save into custom directory"
-msgstr "අභිරුචි නාමාවලියටකට සුරකින්න"
-
-#: src/filewriter/filewriter.cc:427
-msgid "Output file folder:"
-msgstr "ප්‍රතිදාන ගොනු ෆෝල්ඩරය:"
-
-#: src/filewriter/filewriter.cc:431
-msgid "Pick a folder"
-msgstr "ෆෝල්ඩරයක් තෝරන්න"
-
-#: src/filewriter/filewriter.cc:444
-msgid "Generate file name from:"
+#: src/filewriter/filewriter.cc:392
+msgid "Save into custom directory:"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:448
-msgid "Original file tag"
+#: src/filewriter/filewriter.cc:400
+msgid "Generate file name from:"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:453
+#: src/filewriter/filewriter.cc:401
 msgid "Original file name"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:459
-msgid "Include original file name extension"
+#: src/filewriter/filewriter.cc:404
+msgid "Original file name (no suffix)"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:468
-msgid "Prepend track number to file name"
+#: src/filewriter/filewriter.cc:407
+msgid "Original file tag"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:484
-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."
+#: src/filewriter/filewriter.cc:411
+msgid "Prepend track number to file name"
 msgstr ""
-"මෙම මෘදුකාංගය නිදහස් කි; නිදහස් මෘදුකාංග පදනම විසින් ප්‍රකාශ කරන ලද GNU සාමාන්‍ය පොදු "
-"බලපත්‍රය යටතේ ඔබට මෙය නැවත බෙදා හැරීම හෝ වෙනස් කිරීම කළ හැක; බලපත්‍රයේ 2වන සංස්කරණය "
-"හෝ(ඔබගේ කැමත්ත අනුව) පසු සංස්කරණයක් යටතේ.\n"
-"\n"
-"මෙම මෘදුකාංගය බෙදාහැර ඇත්තේ ප්‍රයෝජනවත් වේ යන බලාපොරොත්තුවෙන් වුවත් වගකීමක් නොමැත; විකිණිය "
-"හැකි හෝ යම් නිශ්චිත අරමුණකට ලෙසවත් ගම්‍යමාන වන වගකීමකින් තොරයි. වැඩි විස්තර සඳහා GNU සාමාන්‍ය "
-"පොදු බලපත්‍රය බලන්න. මෙම සමග ඔබට හි පිටපතක් ලැබිය යුතුයි; නැතිනම් නිදහස් මෘදුකාංග පදනමට දන්වන්න"
-". Free Software\n"
-"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
-"USA."
 
-#: src/filewriter/mp3.cc:40 src/filewriter/mp3.cc:717
+#: src/filewriter/filewriter.cc:417 src/filewriter/filewriter.cc:449
 msgid "Auto"
 msgstr "ස්වයංක්‍රීය"
 
-#: src/filewriter/mp3.cc:40
+#: src/filewriter/filewriter.cc:418
+msgid "8000 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:419
+msgid "11025 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:420
+msgid "12000 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:421
+msgid "16000 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:422
+msgid "22050 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:423
+msgid "24000 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:424
+msgid "32000 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:425 src/xsf/plugin.cc:430
+msgid "44100 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:426 src/xsf/plugin.cc:431
+msgid "48000 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:430
+msgid "8 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:431
+msgid "16 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:432
+msgid "32 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:433
+msgid "40 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:434
+msgid "48 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:435
+msgid "56 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:436
+msgid "64 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:437
+msgid "80 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:438
+msgid "96 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:439
+msgid "112 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:440
+msgid "128 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:441
+msgid "160 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:442
+msgid "192 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:443
+msgid "224 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:444
+msgid "256 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:445
+msgid "320 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:450
 msgid "Joint Stereo"
 msgstr "එකතු වූ ත්‍රිමාණ"
 
-#: src/filewriter/mp3.cc:41 src/modplug/plugin_main.cc:58
-#: src/mpg123/mpg123.cc:248
+#: src/filewriter/filewriter.cc:451 src/modplug/plugin_main.cc:57
+#: src/mpg123/mpg123.cc:259
 msgid "Stereo"
 msgstr "ත‍්‍ර‍්‍රිමාණ "
 
-#: src/filewriter/mp3.cc:41 src/modplug/plugin_main.cc:57
-#: src/mpg123/mpg123.cc:248
+#: src/filewriter/filewriter.cc:452 src/modplug/plugin_main.cc:56
+#: src/mpg123/mpg123.cc:260
 msgid "Mono"
 msgstr "තනි "
 
-#: src/filewriter/mp3.cc:657
-msgid "MP3 Configuration"
-msgstr "MP3 වින්‍යාසය"
-
-#: src/filewriter/mp3.cc:658
-msgid "_OK"
+#: src/filewriter/filewriter.cc:456
+msgid "VBR"
 msgstr ""
 
-#: src/filewriter/mp3.cc:681
-msgid "Algorithm Quality:"
-msgstr "ඇල්ගොරිතම තත්ත්වය:"
-
-#: src/filewriter/mp3.cc:706
-msgid "Output Sample Rate:"
+#: src/filewriter/filewriter.cc:457
+msgid "ABR"
 msgstr ""
 
-#: src/filewriter/mp3.cc:733
-msgid "(Hz)"
-msgstr "(හර්ට්ස්)"
-
-#: src/filewriter/mp3.cc:740
-msgid "Bitrate / Compression Ratio:"
+#: src/filewriter/filewriter.cc:478
+msgid "Algorithm quality:"
 msgstr ""
 
-#: src/filewriter/mp3.cc:764
-msgid "Bitrate (kbps):"
-msgstr "බිට් රේටය (තප්පරයට කි.බ.)"
+#: src/filewriter/filewriter.cc:484
+msgid "Bitrate:"
+msgstr ""
 
-#: src/filewriter/mp3.cc:796
+#: src/filewriter/filewriter.cc:491
 msgid "Compression ratio:"
 msgstr "සම්පීඩක අනුපාතය:"
 
-#: src/filewriter/mp3.cc:820
-msgid "Audio Mode:"
-msgstr "ශ්‍රව්‍ය ප්‍රකාරය:"
-
-#: src/filewriter/mp3.cc:845
-msgid "Miscellaneous:"
+#: src/filewriter/filewriter.cc:498
+msgid "Audio mode:"
 msgstr ""
 
-#: src/filewriter/mp3.cc:856
+#: src/filewriter/filewriter.cc:501
 msgid "Enforce strict ISO compliance"
 msgstr ""
 
-#: src/filewriter/mp3.cc:867
+#: src/filewriter/filewriter.cc:503
 msgid "Error protection"
 msgstr "දෝෂ ආරක්‍ෂාව"
 
-#: src/filewriter/mp3.cc:879 src/filewriter/vorbis.cc:206
-msgid "Quality"
-msgstr "ප්‍රශස්තතාව"
-
-#: src/filewriter/mp3.cc:888
+#: src/filewriter/filewriter.cc:508
 msgid "Enable VBR/ABR"
 msgstr "VBR/ABR සක්‍රිය කරන්න"
 
-#: src/filewriter/mp3.cc:898
+#: src/filewriter/filewriter.cc:510
 msgid "Type:"
 msgstr "වර්ගය:"
 
-#: src/filewriter/mp3.cc:931
-msgid "VBR Options:"
-msgstr "VBR විකල්ප:"
-
-#: src/filewriter/mp3.cc:947
-msgid "Minimum bitrate (kbps):"
-msgstr "අවම බිට් රේටය (තප්පරයට කි.බ.)"
-
-#: src/filewriter/mp3.cc:973
-msgid "Maximum bitrate (kbps):"
-msgstr "උපරිම බිට් රේටය (තප්පරයට කි.බ.)"
+#: src/filewriter/filewriter.cc:514
+msgid "Minimum bitrate:"
+msgstr ""
 
-#: src/filewriter/mp3.cc:995
-msgid "Strictly enforce minimum bitrate"
-msgstr "අවම බිට් රේටය සඳහා තදින් බලකරන්න"
+#: src/filewriter/filewriter.cc:518
+msgid "Maximum bitrate:"
+msgstr ""
 
-#: src/filewriter/mp3.cc:1007
-msgid "ABR Options:"
-msgstr "ABR විකල්ප:"
-
-#: src/filewriter/mp3.cc:1017
-msgid "Average bitrate (kbps):"
-msgstr "සාමාන්‍ය බිට් රේටය (තත්පරයට කි.බ.)"
+#: src/filewriter/filewriter.cc:522
+msgid "Average bitrate:"
+msgstr ""
 
-#: src/filewriter/mp3.cc:1044
+#: src/filewriter/filewriter.cc:526
 msgid "VBR quality level:"
 msgstr "VBR ප්‍රශස්තතා මට්ටම:"
 
-#: src/filewriter/mp3.cc:1063
+#: src/filewriter/filewriter.cc:530
+msgid "Strictly enforce minimum bitrate"
+msgstr "අවම බිට් රේටය සඳහා තදින් බලකරන්න"
+
+#: src/filewriter/filewriter.cc:533
 msgid "Omit Xing VBR header"
 msgstr ""
 
-#: src/filewriter/mp3.cc:1076
-msgid "VBR/ABR"
-msgstr "VBR/ABR"
-
-#: src/filewriter/mp3.cc:1085
-msgid "Frame Parameters:"
+#: src/filewriter/filewriter.cc:539
+msgid "Frame Headers"
 msgstr ""
 
-#: src/filewriter/mp3.cc:1097
+#: src/filewriter/filewriter.cc:540
 msgid "Mark as copyright"
 msgstr "ප්‍රකාශන අයිතිය සහිත ලෙස සලකුණු කරන්න"
 
-#: src/filewriter/mp3.cc:1108
+#: src/filewriter/filewriter.cc:542
 msgid "Mark as original"
 msgstr "මුල් පිටපතක් ලෙස සලකුණු කරන්න"
 
-#: src/filewriter/mp3.cc:1120
-msgid "ID3 Parameters:"
+#: src/filewriter/filewriter.cc:544
+msgid "ID3 Tags"
 msgstr ""
 
-#: src/filewriter/mp3.cc:1131
+#: src/filewriter/filewriter.cc:545
 msgid "Force addition of version 2 tag"
 msgstr "2 වන සංස්කරණයේ සම්බන්ධකයට බලෙන් ඇතුලත් කිරීම"
 
-#: src/filewriter/mp3.cc:1141
+#: src/filewriter/filewriter.cc:547
 msgid "Only add v1 tag"
 msgstr "1 වන සංස්කරණයේ සම්බන්ධකය පමණක් එකතු කරන්න"
 
-#: src/filewriter/mp3.cc:1148
+#: src/filewriter/filewriter.cc:549
 msgid "Only add v2 tag"
 msgstr "2 වන සංස්කරණයේ සම්බන්ධකය පමණක් එකතු කරන්න"
 
-#: src/filewriter/mp3.cc:1169
+#: src/filewriter/filewriter.cc:554
+msgid "Quality"
+msgstr "ප්‍රශස්තතාව"
+
+#: src/filewriter/filewriter.cc:555
+msgid "VBR/ABR"
+msgstr "VBR/ABR"
+
+#: src/filewriter/filewriter.cc:556
 msgid "Tags"
 msgstr "සම්බන්ධක"
 
-#: src/filewriter/vorbis.cc:196
-msgid "Vorbis Encoder Configuration"
-msgstr "Vorbis විකේතකයේ වින්‍යාසය"
-
-#: src/filewriter/vorbis.cc:219
-msgid "Quality level (0 - 10):"
-msgstr "ප්‍රශස්ථතා මට්ටම (0 - 10):"
+#: src/filewriter/filewriter.cc:566
+msgid "Quality (0-1):"
+msgstr ""
 
-#: src/flacng/flacng.h:35
+#: src/filewriter/filewriter.cc:573 src/skins-qt/skins_cfg.cc:307
+#: src/skins/skins_cfg.cc:289
+msgid "General"
+msgstr "සාමාන්‍ය"
+
+#: src/flac/flacng.h:36
 msgid "FLAC Decoder"
 msgstr "FLAC විකේතකය"
 
-#: src/flacng/metadata.cc:351 src/wavpack/wavpack.cc:209
+#: src/flac/metadata.cc:296 src/wavpack/wavpack.cc:215
 msgid "lossless"
 msgstr "හානි වී නොමැති "
 
-#: src/flacng/plugin.cc:169
+#: src/flac/plugin.cc:214
 msgid ""
 "Original code by\n"
 "Ralf Ertzinger <ralf@skytale.net>\n"
@@ -1463,15 +1384,15 @@
 msgid "GIO Plugin"
 msgstr "GIO පේනු මෘදුකාංගය "
 
-#: src/gio/gio.cc:153
+#: src/gio/gio.cc:152
 msgid "Read-and-append mode not supported"
 msgstr ""
 
-#: src/gio/gio.cc:166
+#: src/gio/gio.cc:165
 msgid "Invalid open mode"
 msgstr ""
 
-#: src/gl-spectrum/gl-spectrum.cc:51
+#: src/glspectrum/gl-spectrum.cc:52
 msgid ""
 "OpenGL Spectrum Analyzer for Audacious\n"
 "Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
@@ -1483,621 +1404,754 @@
 "License: GPLv2+"
 msgstr ""
 
-#: src/gl-spectrum/gl-spectrum.cc:62
+#: src/glspectrum/gl-spectrum.cc:63 src/qtglspectrum/gl-spectrum.cc:53
 msgid "OpenGL Spectrum Analyzer"
 msgstr "OpenGL වර්ණාවලි විශ්ලේශකය"
 
-#: src/gl-spectrum-qt/gl-spectrum.cc:41
-msgid ""
-"OpenGL Spectrum Analyzer for Audacious\n"
-"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
-"Copyright 2014 William Pitcock\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/gtkui/columns.cc:36 src/moonstone/playlist_model.cc:38
+#: src/qtui/playlist_model.cc:33
+msgid "Entry Number"
 msgstr ""
 
-#: src/gl-spectrum-qt/gl-spectrum.cc:53
-msgid "OpenGL Spectrum Analyzer (Qt)"
-msgstr ""
-
-#: src/gnomeshortcuts/gnomeshortcuts.cc:38
-msgid "GNOME Shortcuts"
-msgstr ""
-
-#: src/gnomeshortcuts/gnomeshortcuts.cc:54
-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/gtkui/columns.cc:35
-msgid "Entry number"
-msgstr "ඇතුලත් කිරීමේ අංකය"
-
-#: src/gtkui/columns.cc:36 src/playlist-manager/playlist-manager.cc:225
-#: src/qtui/playlist_model.cc:123
+#: src/gtkui/columns.cc:37 src/moonstone/playlist_model.cc:38
+#: src/moonstone/playlist_selection.cc:64
+#: src/playlist-manager/playlist-manager.cc:200
+#: src/playlist-manager-qt/playlist-manager-qt.cc:188
+#: src/qtui/playlist_model.cc:33 src/streamtuner/icecast-model.cc:120
+#: src/streamtuner/ihr-model.cc:159 src/streamtuner/shoutcast-model.cc:122
 msgid "Title"
 msgstr "මාතෘකාව"
 
-#: src/gtkui/columns.cc:37 src/qtui/playlist_model.cc:125
+#: src/gtkui/columns.cc:38 src/moonstone/playlist_model.cc:39
+#: src/qtui/playlist_model.cc:33
 msgid "Artist"
 msgstr "ශිල්පියා "
 
-#: src/gtkui/columns.cc:38
+#: src/gtkui/columns.cc:39 src/moonstone/playlist_model.cc:39
+#: src/qtui/playlist_model.cc:33
 msgid "Year"
 msgstr "වර්ෂය "
 
-#: src/gtkui/columns.cc:39 src/qtui/playlist_model.cc:127
+#: src/gtkui/columns.cc:40 src/moonstone/playlist_model.cc:39
+#: src/qtui/playlist_model.cc:34
 msgid "Album"
 msgstr "ඇල්බමය "
 
-#: src/gtkui/columns.cc:40
-msgid "Album artist"
+#: src/gtkui/columns.cc:41 src/moonstone/playlist_model.cc:40
+#: src/qtui/playlist_model.cc:34
+msgid "Album Artist"
 msgstr ""
 
-#: src/gtkui/columns.cc:41
+#: src/gtkui/columns.cc:42 src/moonstone/playlist_model.cc:40
+#: src/qtui/playlist_model.cc:34
 msgid "Track"
 msgstr "ඛණ්ඩය "
 
-#: src/gtkui/columns.cc:42
+#: src/gtkui/columns.cc:43 src/moonstone/playlist_model.cc:40
+#: src/qtui/playlist_model.cc:34 src/streamtuner/icecast-model.cc:123
+#: src/streamtuner/shoutcast-model.cc:125
+#: src/streamtuner/shoutcast-model.cc:236
 msgid "Genre"
 msgstr "ප්‍රභේදය"
 
-#: src/gtkui/columns.cc:43
-msgid "Queue position"
-msgstr "පේලියෙහි පිහිටන ස්ථානය"
+#: src/gtkui/columns.cc:44 src/moonstone/playlist_model.cc:41
+#: src/qtui/playlist_model.cc:35
+msgid "Queue Position"
+msgstr ""
 
-#: src/gtkui/columns.cc:44
+#: src/gtkui/columns.cc:45 src/moonstone/playlist_model.cc:41
+#: src/qtui/playlist_model.cc:35
 msgid "Length"
 msgstr "දිග"
 
-#: src/gtkui/columns.cc:45
-msgid "File path"
-msgstr "ගොනු පථය"
-
-#: src/gtkui/columns.cc:47
-msgid "Custom title"
-msgstr "අභිරුචි මාතෘකාව"
+#: src/gtkui/columns.cc:46 src/moonstone/playlist_model.cc:41
+#: src/qtui/playlist_model.cc:35
+msgid "File Path"
+msgstr ""
+
+#: src/gtkui/columns.cc:47 src/moonstone/playlist_model.cc:42
+#: src/qtui/playlist_model.cc:35
+msgid "File Name"
+msgstr ""
+
+#: src/gtkui/columns.cc:48 src/moonstone/playlist_model.cc:42
+#: src/qtui/playlist_model.cc:36
+msgid "Custom Title"
+msgstr ""
 
-#: src/gtkui/columns.cc:48
+#: src/gtkui/columns.cc:49 src/moonstone/playlist_model.cc:42
+#: src/qtui/playlist_model.cc:36 src/streamtuner/icecast-model.cc:129
+#: src/streamtuner/shoutcast-model.cc:134
 msgid "Bitrate"
 msgstr "බිට් රේටය"
 
-#: src/gtkui/columns.cc:308
+#: src/gtkui/columns.cc:50 src/moonstone/playlist_model.cc:43
+#: src/qtui/playlist_model.cc:36
+msgid "Comment"
+msgstr "විවරණය"
+
+#: src/gtkui/columns.cc:51 src/qtui/playlist_model.cc:36
+msgid "Publisher"
+msgstr ""
+
+#: src/gtkui/columns.cc:52 src/qtui/playlist_model.cc:37
+msgid "Catalog Number"
+msgstr ""
+
+#: src/gtkui/columns.cc:53 src/moonstone/playlist_model.cc:43
+#: src/qtui/playlist_model.cc:37
+msgid "Disc"
+msgstr ""
+
+#: src/gtkui/columns.cc:325
 msgid "Available columns"
 msgstr ""
 
-#: src/gtkui/columns.cc:334
+#: src/gtkui/columns.cc:351
 msgid "Displayed columns"
 msgstr ""
 
-#: src/gtkui/layout.cc:72 src/search-tool/search-tool.cc:40
+#: src/gtkui/layout.cc:74 src/search-tool-qt/search-tool-qt.cc:58
+#: src/search-tool/search-tool.cc:49
 msgid "Search Tool"
 msgstr "සෙවීමේ මෙවලම "
 
-#: src/gtkui/layout.cc:167
+#: src/gtkui/layout.cc:170
 msgid "Dock at Left"
 msgstr "වමට ඈඳන්න"
 
-#: src/gtkui/layout.cc:167
+#: src/gtkui/layout.cc:170
 msgid "Dock at Right"
 msgstr "දකුණට ඈඳන්න"
 
-#: src/gtkui/layout.cc:168
+#: src/gtkui/layout.cc:171
 msgid "Dock at Top"
 msgstr "ඉහළට ඈඳන්න"
 
-#: src/gtkui/layout.cc:168
+#: src/gtkui/layout.cc:171
 msgid "Dock at Bottom"
 msgstr " පහළට ඈඳන්න"
 
-#: src/gtkui/layout.cc:168
+#: src/gtkui/layout.cc:171
 msgid "Undock"
 msgstr "ඈඳීම අවලංගු කරන්න"
 
-#: src/gtkui/layout.cc:168 src/ladspa/plugin.cc:531
+#: src/gtkui/layout.cc:171 src/ladspa/plugin.cc:540
 msgid "Disable"
 msgstr "අක්‍රීය කරන්න"
 
-#: src/gtkui/menus.cc:126 src/qtui/main_window_actions.cc:93
-#: src/statusicon/statusicon.cc:276
+#: src/gtkui/menus.cc:79 src/qtui/menus.cc:107
+#: src/statusicon-qt/statusicon.cc:115 src/statusicon/statusicon.cc:286
 msgid "_Open Files ..."
 msgstr "_ගොනු විවෘත කරන්න ..."
 
-#: src/gtkui/menus.cc:127
+#: src/gtkui/menus.cc:80 src/qtui/menus.cc:111
 msgid "Open _URL ..."
 msgstr "_URL විවෘත කරන්න ..."
 
-#: src/gtkui/menus.cc:128 src/qtui/main_window_actions.cc:95
+#: src/gtkui/menus.cc:81 src/qtui/menus.cc:113
 msgid "_Add Files ..."
 msgstr "_ගොනු එකතු කරන්න ..."
 
-#: src/gtkui/menus.cc:129
+#: src/gtkui/menus.cc:82 src/qtui/menus.cc:118
 msgid "Add U_RL ..."
 msgstr "U_RL එකතු කරන්න ..."
 
-#: src/gtkui/menus.cc:131
+#: src/gtkui/menus.cc:84 src/qtui/menus.cc:120
 msgid "Search _Library"
 msgstr ""
 
-#: src/gtkui/menus.cc:133 src/qtui/main_window_actions.cc:98
+#: src/gtkui/menus.cc:86 src/qtui/menus.cc:123
 msgid "A_bout ..."
 msgstr "පි_ළිබඳ ..."
 
-#: src/gtkui/menus.cc:134 src/qtui/main_window_actions.cc:99
+#: src/gtkui/menus.cc:87 src/qtui/menus.cc:125
 msgid "_Settings ..."
 msgstr ""
 
-#: src/gtkui/menus.cc:135 src/qtui/main_window_actions.cc:103
-#: src/statusicon/statusicon.cc:284
+#: src/gtkui/menus.cc:88 src/qtui/menus.cc:131
+#: src/statusicon-qt/statusicon.cc:117 src/statusicon/statusicon.cc:288
 msgid "_Quit"
 msgstr "_පිටවෙන්න"
 
-#: src/gtkui/menus.cc:139 src/gtkui/menus.cc:262
-#: src/qtui/main_window_actions.cc:107 src/search-tool/search-tool.cc:641
-#: src/statusicon/statusicon.cc:278
+#: src/gtkui/menus.cc:92 src/gtkui/menus.cc:226
+#: src/moonstone/playlist_tabs.cc:306 src/qtui/menus.cc:135
+#: src/qtui/playlist_tabs.cc:331 src/search-tool-qt/search-tool-qt.cc:499
+#: src/search-tool/search-tool.cc:339 src/statusicon-qt/statusicon.cc:109
+#: src/statusicon/statusicon.cc:280
 msgid "_Play"
 msgstr "_ධාවනය කරන්න"
 
-#: src/gtkui/menus.cc:140 src/qtui/main_window_actions.cc:108
-#: src/statusicon/statusicon.cc:279
+#: src/gtkui/menus.cc:93 src/qtui/menus.cc:137
+#: src/statusicon-qt/statusicon.cc:110 src/statusicon/statusicon.cc:281
 msgid "Paus_e"
 msgstr "විරාම_ය"
 
-#: src/gtkui/menus.cc:141 src/qtui/main_window_actions.cc:109
-#: src/statusicon/statusicon.cc:280
+#: src/gtkui/menus.cc:94 src/qtui/menus.cc:139
+#: src/statusicon-qt/statusicon.cc:111 src/statusicon/statusicon.cc:282
 msgid "_Stop"
 msgstr "_නවත්වන්න"
 
-#: src/gtkui/menus.cc:142 src/qtui/main_window_actions.cc:110
-#: src/statusicon/statusicon.cc:277
+#: src/gtkui/menus.cc:95 src/qtui/menus.cc:141
+#: src/statusicon-qt/statusicon.cc:112 src/statusicon/statusicon.cc:283
 msgid "Pre_vious"
 msgstr "ක_ලින්"
 
-#: src/gtkui/menus.cc:143 src/qtui/main_window_actions.cc:111
-#: src/statusicon/statusicon.cc:281
+#: src/gtkui/menus.cc:96 src/qtui/menus.cc:143
+#: src/statusicon-qt/statusicon.cc:113 src/statusicon/statusicon.cc:284
 msgid "_Next"
 msgstr "_ඊළඟ"
 
-#: src/gtkui/menus.cc:145 src/qtui/main_window_actions.cc:113
+#: src/gtkui/menus.cc:97 src/qtui/menus.cc:145 src/skins/menus.cc:114
+#: src/skins-qt/menus.cc:105
+msgid "Previous Album"
+msgstr ""
+
+#: src/gtkui/menus.cc:98 src/qtui/menus.cc:146 src/skins/menus.cc:115
+#: src/skins-qt/menus.cc:106
+msgid "Next Album"
+msgstr ""
+
+#: src/gtkui/menus.cc:100 src/qtui/menus.cc:148
 msgid "_Repeat"
 msgstr "_නැවත ධාවනය"
 
-#: src/gtkui/menus.cc:146 src/qtui/main_window_actions.cc:114
+#: src/gtkui/menus.cc:101 src/qtui/menus.cc:150
 msgid "S_huffle"
 msgstr "ක_ළවම් කිරීම"
 
-#: src/gtkui/menus.cc:147 src/qtui/main_window_actions.cc:115
+#: src/gtkui/menus.cc:102 src/qtui/menus.cc:152
+msgid "Shuffle by Albu_m"
+msgstr ""
+
+#: src/gtkui/menus.cc:103 src/qtui/menus.cc:155
 msgid "N_o Playlist Advance"
 msgstr "ධාවන ලැස්තු නැ_ත "
 
-#: src/gtkui/menus.cc:148 src/qtui/main_window_actions.cc:116
+#: src/gtkui/menus.cc:104 src/qtui/menus.cc:157
 msgid "Stop A_fter This Song"
 msgstr "මෙම ගීතයෙන් පසු නවත්තන්න "
 
-#: src/gtkui/menus.cc:150 src/gtkui/menus.cc:247
-#: src/qtui/main_window_actions.cc:118
+#: src/gtkui/menus.cc:106 src/gtkui/menus.cc:210 src/qtui/menus.cc:162
+#: src/qtui/menus.cc:294
 msgid "Song _Info ..."
 msgstr "ගීත_තොරතුරු ..."
 
-#: src/gtkui/menus.cc:151
+#: src/gtkui/menus.cc:107
 msgid "Jump to _Time ..."
 msgstr "මගහැර වේලාවට_පිවිසෙන්න ..."
 
-#: src/gtkui/menus.cc:152
+#: src/gtkui/menus.cc:108
 msgid "_Jump to Song ..."
 msgstr "_මගහැර ගීතයට පිවිසෙන්න ..."
 
-#: src/gtkui/menus.cc:154
+#: src/gtkui/menus.cc:110 src/qtui/menus.cc:165
 msgid "Set Repeat Point _A"
 msgstr "නැවත සිදුවන ස්ථාන_A පිහිටුවන්න "
 
-#: src/gtkui/menus.cc:155
+#: src/gtkui/menus.cc:111 src/qtui/menus.cc:167
 msgid "Set Repeat Point _B"
 msgstr "නැවත සිදුවන ස්ථාන_B පිහිටුවන්න "
 
-#: src/gtkui/menus.cc:156
+#: src/gtkui/menus.cc:112 src/qtui/menus.cc:169
 msgid "_Clear Repeat Points"
 msgstr "නැවත සිදුවන ස්ථාන හිස්කරන්න "
 
-#: src/gtkui/menus.cc:160 src/gtkui/menus.cc:167 src/gtkui/menus.cc:183
-#: src/qtui/main_window_actions.cc:122 src/qtui/main_window_actions.cc:129
-#: src/qtui/main_window_actions.cc:145
+#: src/gtkui/menus.cc:116 src/gtkui/menus.cc:123 src/gtkui/menus.cc:141
+#: src/qtui/menus.cc:173 src/qtui/menus.cc:180 src/qtui/menus.cc:198
 msgid "By _Title"
 msgstr "මාතෘකා_වෙන්"
 
-#: src/gtkui/menus.cc:161 src/qtui/main_window_actions.cc:123
+#: src/gtkui/menus.cc:117 src/qtui/menus.cc:174
 msgid "By _File Name"
 msgstr ""
 
-#: src/gtkui/menus.cc:162 src/qtui/main_window_actions.cc:124
+#: src/gtkui/menus.cc:118 src/qtui/menus.cc:175
 msgid "By File _Path"
 msgstr "ගොනු පථයෙන් "
 
-#: src/gtkui/menus.cc:166 src/gtkui/menus.cc:182
-#: src/qtui/main_window_actions.cc:128 src/qtui/main_window_actions.cc:144
+#: src/gtkui/menus.cc:122 src/gtkui/menus.cc:140 src/qtui/menus.cc:179
+#: src/qtui/menus.cc:197
 msgid "By Track _Number"
 msgstr "ඛණ්ඩ_අංකයෙන් "
 
-#: src/gtkui/menus.cc:168 src/gtkui/menus.cc:184
-#: src/qtui/main_window_actions.cc:130 src/qtui/main_window_actions.cc:146
+#: src/gtkui/menus.cc:124 src/gtkui/menus.cc:142 src/qtui/menus.cc:181
+#: src/qtui/menus.cc:199
 msgid "By _Artist"
 msgstr "ශිල්පියා_ගෙන්"
 
-#: src/gtkui/menus.cc:169 src/gtkui/menus.cc:185
-#: src/qtui/main_window_actions.cc:131 src/qtui/main_window_actions.cc:147
+#: src/gtkui/menus.cc:125 src/gtkui/menus.cc:143 src/qtui/menus.cc:182
+#: src/qtui/menus.cc:200
 msgid "By Al_bum"
 msgstr "ඇල්බමයෙන් "
 
-#: src/gtkui/menus.cc:170 src/gtkui/menus.cc:186
-#: src/qtui/main_window_actions.cc:132 src/qtui/main_window_actions.cc:148
+#: src/gtkui/menus.cc:126 src/gtkui/menus.cc:144 src/qtui/menus.cc:183
+#: src/qtui/menus.cc:201
 msgid "By Albu_m Artist"
 msgstr ""
 
-#: src/gtkui/menus.cc:171 src/gtkui/menus.cc:187
-#: src/qtui/main_window_actions.cc:133 src/qtui/main_window_actions.cc:149
+#: src/gtkui/menus.cc:127 src/gtkui/menus.cc:145 src/qtui/menus.cc:184
+#: src/qtui/menus.cc:202
 msgid "By Release _Date"
 msgstr "පිට කල _දිනයෙන්"
 
-#: src/gtkui/menus.cc:172 src/gtkui/menus.cc:188
-#: src/qtui/main_window_actions.cc:134 src/qtui/main_window_actions.cc:150
+#: src/gtkui/menus.cc:128 src/gtkui/menus.cc:146 src/qtui/menus.cc:185
+#: src/qtui/menus.cc:203
 msgid "By _Genre"
 msgstr ""
 
-#: src/gtkui/menus.cc:173 src/gtkui/menus.cc:189
-#: src/qtui/main_window_actions.cc:135 src/qtui/main_window_actions.cc:151
+#: src/gtkui/menus.cc:129 src/gtkui/menus.cc:147 src/qtui/menus.cc:186
+#: src/qtui/menus.cc:204
 msgid "By _Length"
 msgstr "දුරෙන් "
 
-#: src/gtkui/menus.cc:174 src/gtkui/menus.cc:190
-#: src/qtui/main_window_actions.cc:136 src/qtui/main_window_actions.cc:152
+#: src/gtkui/menus.cc:130 src/gtkui/menus.cc:148 src/qtui/menus.cc:187
+#: src/qtui/menus.cc:205
 msgid "By _File Path"
 msgstr "ගොනු_පථයෙන්"
 
-#: src/gtkui/menus.cc:175 src/gtkui/menus.cc:191
-#: src/qtui/main_window_actions.cc:137 src/qtui/main_window_actions.cc:153
+#: src/gtkui/menus.cc:131 src/gtkui/menus.cc:149 src/qtui/menus.cc:188
+#: src/qtui/menus.cc:206
 msgid "By _Custom Title"
 msgstr "අභිරුචි_මාතෘකාවෙන් "
 
-#: src/gtkui/menus.cc:177 src/gtkui/menus.cc:193
-#: src/qtui/main_window_actions.cc:139 src/qtui/main_window_actions.cc:155
+#: src/gtkui/menus.cc:132 src/gtkui/menus.cc:150 src/qtui/menus.cc:189
+#: src/qtui/menus.cc:207
+msgid "By C_omment"
+msgstr ""
+
+#: src/gtkui/menus.cc:133 src/gtkui/menus.cc:151 src/qtui/menus.cc:190
+#: src/qtui/menus.cc:208
+msgid "By D_isc Number"
+msgstr ""
+
+#: src/gtkui/menus.cc:135 src/gtkui/menus.cc:153 src/qtui/menus.cc:192
+#: src/qtui/menus.cc:210
 msgid "R_everse Order"
 msgstr "අග_සිට මුලට"
 
-#: src/gtkui/menus.cc:178 src/gtkui/menus.cc:194
-#: src/qtui/main_window_actions.cc:140 src/qtui/main_window_actions.cc:156
+#: src/gtkui/menus.cc:136 src/gtkui/menus.cc:154 src/qtui/menus.cc:194
+#: src/qtui/menus.cc:212
 msgid "_Random Order"
 msgstr "_සසම්භාවී පිළිවෙල"
 
-#: src/gtkui/menus.cc:198 src/qtui/main_window_actions.cc:160
+#: src/gtkui/menus.cc:158 src/qtui/menus.cc:216
 msgid "_Play/Resume"
 msgstr ""
 
-#: src/gtkui/menus.cc:199 src/gtkui/menus.cc:251
-#: src/qtui/main_window_actions.cc:161
+#: src/gtkui/menus.cc:159 src/qtui/menus.cc:218
 msgid "_Refresh"
 msgstr "_නැවුම් කරන්න"
 
-#: src/gtkui/menus.cc:201 src/qtui/main_window_actions.cc:163
+#: src/gtkui/menus.cc:161 src/qtui/menus.cc:222
 msgid "_Sort"
 msgstr "_අනුපිළිවෙලට සකසන්න"
 
-#: src/gtkui/menus.cc:202 src/qtui/main_window_actions.cc:164
+#: src/gtkui/menus.cc:162 src/qtui/menus.cc:223
 msgid "Sort Se_lected"
 msgstr ""
 
-#: src/gtkui/menus.cc:203 src/qtui/main_window_actions.cc:165
+#: src/gtkui/menus.cc:163 src/qtui/menus.cc:225
 msgid "Remove _Duplicates"
 msgstr "අනුපිටපත්_ඉවත් කිරීම "
 
-#: src/gtkui/menus.cc:204 src/qtui/main_window_actions.cc:166
+#: src/gtkui/menus.cc:164 src/qtui/menus.cc:226
 msgid "Remove _Unavailable Files"
 msgstr "අනුපයෝජ්‍ය_ගොනු ඉවත් කරන්න"
 
-#: src/gtkui/menus.cc:206 src/playlist-manager/playlist-manager.cc:244
-#: src/qtui/main_window_actions.cc:168
+#: src/gtkui/menus.cc:166 src/playlist-manager/playlist-manager.cc:219
+#: src/playlist-manager-qt/playlist-manager-qt.cc:348 src/qtui/menus.cc:229
 msgid "_New"
 msgstr "_නව"
 
-#: src/gtkui/menus.cc:207
+#: src/gtkui/menus.cc:167 src/qtui/menus.cc:230
 msgid "Ren_ame ..."
 msgstr "Ren_ame ..."
 
-#: src/gtkui/menus.cc:208 src/gtkui/menus.cc:264
-#: src/qtui/main_window_actions.cc:170
+#: src/gtkui/menus.cc:168 src/gtkui/menus.cc:228
+#: src/moonstone/playlist_tabs.cc:311 src/qtui/menus.cc:231
+#: src/qtui/playlist_tabs.cc:336
 msgid "Remo_ve"
 msgstr ""
 
-#: src/gtkui/menus.cc:210
+#: src/gtkui/menus.cc:170 src/qtui/menus.cc:233
 msgid "_Import ..."
 msgstr "_ආයාත කරන්න ..."
 
-#: src/gtkui/menus.cc:211
+#: src/gtkui/menus.cc:171 src/qtui/menus.cc:234
 msgid "_Export ..."
 msgstr "_නිර්යාත කරන්න ..."
 
-#: src/gtkui/menus.cc:213
+#: src/gtkui/menus.cc:173 src/qtui/menus.cc:237
 msgid "Playlist _Manager ..."
 msgstr "ධාවන ලැයිස්තු_කළමනාකාරකය ..."
 
-#: src/gtkui/menus.cc:214 src/qtui/main_window_actions.cc:176
+#: src/gtkui/menus.cc:174 src/qtui/menus.cc:239
 msgid "_Queue Manager ..."
 msgstr "_පෙළගැස්ම කළමනාකරණය ..."
 
-#: src/gtkui/menus.cc:218 src/qtui/main_window_actions.cc:180
+#: src/gtkui/menus.cc:178 src/qtui/menus.cc:243
 msgid "Volume _Up"
 msgstr "ශබ්ද මට්ටම _වැඩි කරන්න"
 
-#: src/gtkui/menus.cc:219 src/qtui/main_window_actions.cc:181
+#: src/gtkui/menus.cc:179 src/qtui/menus.cc:245
 msgid "Volume _Down"
 msgstr "ශබ්ද මට්ටම _අඩු කරන්න"
 
-#: src/gtkui/menus.cc:221 src/qtui/main_window_actions.cc:183
-msgid "_Equalizer"
-msgstr "_ඊක්‍යුවලයිසරය"
+#: src/gtkui/menus.cc:181 src/qtui/menus.cc:249
+msgid "_Equalizer ..."
+msgstr ""
 
-#: src/gtkui/menus.cc:223 src/qtui/main_window_actions.cc:185
+#: src/gtkui/menus.cc:182 src/qtui/menus.cc:251
 msgid "E_ffects ..."
 msgstr ""
 
-#: src/gtkui/menus.cc:227
+#: src/gtkui/menus.cc:184
+msgid "_Record Stream"
+msgstr ""
+
+#: src/gtkui/menus.cc:185
+msgid "Audio _Settings ..."
+msgstr ""
+
+#: src/gtkui/menus.cc:189 src/qtui/menus.cc:260
 msgid "Show _Menu Bar"
 msgstr "_මෙනු තීරුව පෙන්වන්න"
 
-#: src/gtkui/menus.cc:228
+#: src/gtkui/menus.cc:190 src/qtui/menus.cc:262
 msgid "Show I_nfo Bar"
 msgstr "තොරතුරු තී_රුව පෙන්වන්න"
 
-#: src/gtkui/menus.cc:229
+#: src/gtkui/menus.cc:191 src/qtui/menus.cc:264
+msgid "Show Info Bar _Album Art"
+msgstr ""
+
+#: src/gtkui/menus.cc:192 src/qtui/menus.cc:266
 msgid "Show Info Bar Vis_ualization"
 msgstr "තොරතුරු තීරුවේ දෘෂ්ටි කල්පනය පෙන්වන්න "
 
-#: src/gtkui/menus.cc:230
+#: src/gtkui/menus.cc:193 src/qtui/menus.cc:268
 msgid "Show _Status Bar"
 msgstr "තත්ව _තීරුව පෙන්වන්න"
 
-#: src/gtkui/menus.cc:232
+#: src/gtkui/menus.cc:195 src/qtui/menus.cc:272
 msgid "Show _Remaining Time"
 msgstr "ඉතුරුවී ඇති කාලය පෙන්වන්න."
 
-#: src/gtkui/menus.cc:234
+#: src/gtkui/menus.cc:197 src/qtui/menus.cc:276 src/skins/menus.cc:157
+#: src/skins-qt/menus.cc:152
 msgid "_Visualizations ..."
 msgstr ""
 
-#: src/gtkui/menus.cc:238 src/qtui/main_window_actions.cc:189
+#: src/gtkui/menus.cc:201 src/qtui/menus.cc:280
 msgid "_File"
 msgstr "_ගොනුව"
 
-#: src/gtkui/menus.cc:239 src/qtui/main_window_actions.cc:190
+#: src/gtkui/menus.cc:202 src/qtui/menus.cc:281
 msgid "_Playback"
 msgstr "_පිළිවැයුම"
 
-#: src/gtkui/menus.cc:240 src/qtui/main_window_actions.cc:191
+#: src/gtkui/menus.cc:203 src/qtui/menus.cc:282
 msgid "P_laylist"
 msgstr "ධා_වන ලැයිස්තුව"
 
-#: src/gtkui/menus.cc:241 src/gtkui/menus.cc:258
-#: src/qtui/main_window_actions.cc:192
+#: src/gtkui/menus.cc:204 src/gtkui/menus.cc:222 src/qtui/menus.cc:283
+#: src/qtui/menus.cc:312
 msgid "_Services"
 msgstr "_සේවා"
 
-#: src/gtkui/menus.cc:242 src/qtui/main_window_actions.cc:193
+#: src/gtkui/menus.cc:205 src/qtui/menus.cc:284
 msgid "_Output"
 msgstr "_ප්‍රතිදාන"
 
-#: src/gtkui/menus.cc:243
+#: src/gtkui/menus.cc:206 src/qtui/menus.cc:285
 msgid "_View"
 msgstr "_දසුන"
 
-#: src/gtkui/menus.cc:248
+#: src/gtkui/menus.cc:211 src/qtui/menus.cc:296
 msgid "_Queue/Unqueue"
 msgstr "_පෙළගස්වන්න/පෙළගැස්ම අවලංගු කරන්න"
 
-#: src/gtkui/menus.cc:250
+#: src/gtkui/menus.cc:213 src/qtui/menus.cc:299
 msgid "_Open Containing Folder"
 msgstr ""
 
-#: src/gtkui/menus.cc:253
+#: src/gtkui/menus.cc:214 src/qtui/menus.cc:301
+msgid "_Refresh Selected"
+msgstr ""
+
+#: src/gtkui/menus.cc:216 src/qtui/menus.cc:304
 msgid "Cu_t"
 msgstr "කපන්_න"
 
-#: src/gtkui/menus.cc:254
+#: src/gtkui/menus.cc:217 src/qtui/menus.cc:305
 msgid "_Copy"
 msgstr "_පිටපත් කරන්න"
 
-#: src/gtkui/menus.cc:255
+#: src/gtkui/menus.cc:218 src/qtui/menus.cc:306
 msgid "_Paste"
 msgstr "_අලවන්න"
 
-#: src/gtkui/menus.cc:256
+#: src/gtkui/menus.cc:219 src/qtui/menus.cc:307
+msgid "Paste at _End"
+msgstr ""
+
+#: src/gtkui/menus.cc:220 src/qtui/menus.cc:309
 msgid "Select _All"
 msgstr "සියල්ල_තෝරන්න"
 
-#: src/gtkui/menus.cc:263
+#: src/gtkui/menus.cc:227 src/moonstone/playlist_tabs.cc:309
+#: src/qtui/playlist_tabs.cc:334
 msgid "_Rename ..."
 msgstr "_නැවත නම් කිරීම ..."
 
-#: src/gtkui/settings.cc:35
+#: src/gtkui/settings.cc:35 src/qtui/settings.cc:59
+msgid "Always"
+msgstr ""
+
+#: src/gtkui/settings.cc:36 src/qtui/settings.cc:60
+msgid "Auto-hide"
+msgstr ""
+
+#: src/gtkui/settings.cc:37 src/qtui/settings.cc:61
+msgid "Never"
+msgstr ""
+
+#: src/gtkui/settings.cc:41 src/qtui/settings.cc:64
 msgid "Playlist Tabs"
 msgstr ""
 
-#: src/gtkui/settings.cc:36
-msgid "Always show tabs"
+#: src/gtkui/settings.cc:42 src/qtui/settings.cc:65
+msgid "Show playlist tabs:"
 msgstr ""
 
-#: src/gtkui/settings.cc:38
+#: src/gtkui/settings.cc:45 src/qtui/settings.cc:69
 msgid "Show entry counts"
 msgstr ""
 
-#: src/gtkui/settings.cc:40
+#: src/gtkui/settings.cc:47 src/qtui/settings.cc:72
 msgid "Show close buttons"
 msgstr ""
 
-#: src/gtkui/settings.cc:42
+#: src/gtkui/settings.cc:49 src/qtui/settings.cc:75
 msgid "Playlist Columns"
 msgstr ""
 
-#: src/gtkui/settings.cc:44
+#: src/gtkui/settings.cc:51 src/qtui/settings.cc:77
 msgid "Show column headers"
 msgstr ""
 
-#: src/gtkui/settings.cc:46 src/modplug/plugin_main.cc:106
-#: src/skins/skins_cfg.cc:263
-msgid "Miscellaneous"
-msgstr "විවිධ"
+#: src/gtkui/settings.cc:53 src/qtui/settings.cc:82
+msgid "Make column headers clickable for sorting"
+msgstr ""
 
-#: src/gtkui/settings.cc:47
-msgid "Arrow keys seek by:"
+#: src/gtkui/settings.cc:56
+msgid "Use symbolic icons in toolbar"
 msgstr ""
 
-#: src/gtkui/settings.cc:50
+#: src/gtkui/settings.cc:58 src/qtui/settings.cc:86
 msgid "Scroll on song change"
 msgstr ""
 
-#: src/gtkui/ui_gtk.cc:71
+#: src/gtkui/ui_gtk.cc:82
 msgid "GTK Interface"
 msgstr "GTK අතුරු මුහුණත"
 
-#: src/gtkui/ui_gtk.cc:222 src/skins/ui_main.cc:232
+#: src/gtkui/ui_gtk.cc:219 src/skins/main.cc:228 src/skins-qt/main.cc:231
 #, c-format
 msgid "%s - Audacious"
 msgstr "%s - Audacious"
 
-#: src/gtkui/ui_gtk.cc:225 src/qtui/main_window.cc:186
+#: src/gtkui/ui_gtk.cc:221 src/moonstone/main_window.cc:184
+#: src/qtui/main_window.cc:385
 msgid "Buffering ..."
 msgstr "අන්තරාචයනය..."
 
-#: src/gtkui/ui_gtk.cc:228 src/skins/ui_main.cc:234 src/skins/ui_main.cc:1164
+#: src/gtkui/ui_gtk.cc:224 src/pipewire/pipewire.cc:402 src/skins/main.cc:230
+#: src/skins-qt/main.cc:233
 msgid "Audacious"
 msgstr "ඔඩෙෂස් "
 
-#: src/gtkui/ui_statusbar.cc:63 src/qtui/status_bar.cc:67
+#: src/gtkui/ui_gtk.cc:487 src/gtkui/ui_gtk.cc:518 src/gtkui/ui_gtk.cc:882
+#: src/hotkey/gui.cc:72 src/moonstone/main_window.cc:67
+#: src/moonstone/main_window.cc:145 src/moonstone/main_window.cc:146
+#: src/notify/osd.cc:85 src/qthotkey/gui.cc:67 src/qtui/main_window.cc:154
+#: src/qtui/main_window.cc:347 src/qtui/main_window.cc:348
+#: src/skins/menus.cc:109 src/skins-qt/menus.cc:100
+msgid "Play"
+msgstr "ධාවනය කරන්න "
+
+#: src/gtkui/ui_gtk.cc:487 src/moonstone/main_window.cc:151
+#: src/moonstone/main_window.cc:152 src/notify/osd.cc:82
+#: src/qtui/main_window.cc:353 src/qtui/main_window.cc:354
+#: src/skins/menus.cc:110 src/skins-qt/menus.cc:101
+msgid "Pause"
+msgstr "විරාමය "
+
+#: src/gtkui/ui_gtk.cc:868 src/moonstone/main_window.cc:57
+#: src/qtui/main_window.cc:145 src/skins/menus.cc:86 src/skins-qt/menus.cc:77
+msgid "Search Library"
+msgstr ""
+
+#: src/gtkui/ui_gtk.cc:875 src/moonstone/main_window.cc:60
+#: src/qtui/main_window.cc:147
+msgid "Open Files"
+msgstr "ගොනු විවෘත කරන්න"
+
+#: src/gtkui/ui_gtk.cc:876 src/moonstone/main_window.cc:62
+#: src/qtui/main_window.cc:149
+msgid "Add Files"
+msgstr "ගොනු එකතු කරන්න"
+
+#: src/gtkui/ui_gtk.cc:881 src/moonstone/main_window.cc:65
+#: src/qtui/main_window.cc:152 src/skins/menus.cc:112 src/skins-qt/menus.cc:103
+msgid "Previous"
+msgstr "පෙර "
+
+#: src/gtkui/ui_gtk.cc:883 src/hotkey/gui.cc:74 src/moonstone/main_window.cc:69
+#: src/qthotkey/gui.cc:69 src/qtui/main_window.cc:156 src/skins/menus.cc:111
+#: src/skins-qt/menus.cc:102
+msgid "Stop"
+msgstr "නැවතීම "
+
+#: src/gtkui/ui_gtk.cc:884 src/moonstone/main_window.cc:76 src/notify/osd.cc:89
+#: src/qtui/main_window.cc:163 src/skins/menus.cc:113 src/skins-qt/menus.cc:104
+msgid "Next"
+msgstr "ඊළඟ "
+
+#: src/gtkui/ui_gtk.cc:886 src/moonstone/main_window.cc:79
+#: src/qtui/main_window.cc:166 src/qtui/menus.cc:254 src/skins/menus.cc:79
+#: src/skins-qt/menus.cc:69
+msgid "Record Stream"
+msgstr ""
+
+#: src/gtkui/ui_gtk.cc:919 src/moonstone/main_window.cc:86
+#: src/qtui/main_window.cc:173 src/skins/menus.cc:103 src/skins-qt/menus.cc:94
+msgid "Repeat"
+msgstr "නැවත කරන්න "
+
+#: src/gtkui/ui_gtk.cc:922 src/moonstone/main_window.cc:89
+#: src/qtui/main_window.cc:176 src/skins/menus.cc:104 src/skins-qt/menus.cc:95
+msgid "Shuffle"
+msgstr "කලවම් කරන්න "
+
+#: src/gtkui/ui_gtk.cc:1114 src/qtui/main_window.cc:123
+msgid "Menu"
+msgstr ""
+
+#: src/gtkui/ui_statusbar.cc:64 src/qtui/status_bar.cc:155
 msgid "mono"
 msgstr " තනි "
 
-#: src/gtkui/ui_statusbar.cc:65 src/qtui/status_bar.cc:69
+#: src/gtkui/ui_statusbar.cc:66 src/qtui/status_bar.cc:157
 msgid "stereo"
 msgstr "ත්‍රිමාන "
 
-#: src/gtkui/ui_statusbar.cc:67 src/qtui/status_bar.cc:71
+#: src/gtkui/ui_statusbar.cc:68 src/qtui/status_bar.cc:160
 #, c-format
 msgid "%d channel"
 msgid_plural "%d channels"
 msgstr0 "%d නාලිකාව "
 msgstr1 "%d නාලිකා "
 
-#: src/gtkui/ui_statusbar.cc:81 src/qtui/status_bar.cc:85
+#: src/gtkui/ui_statusbar.cc:76 src/qtui/status_bar.cc:168
+#, c-format
+msgid "%d kHz"
+msgstr ""
+
+#: src/gtkui/ui_statusbar.cc:82 src/qtui/status_bar.cc:174
 #, c-format
-msgid "%d kbps"
-msgstr "%d තත්පරයට කිලෝ බයිට් "
+msgid "%d kbit/s"
+msgstr ""
 
-#: src/gtkui/ui_statusbar.cc:107 src/skins/ui_main_evlisteners.cc:103
+#: src/gtkui/ui_statusbar.cc:108 src/skins/main.cc:478 src/skins-qt/main.cc:461
 msgid "Single mode."
 msgstr "තනි ප්‍රකාරය."
 
-#: src/gtkui/ui_statusbar.cc:109 src/skins/ui_main_evlisteners.cc:105
+#: src/gtkui/ui_statusbar.cc:110 src/skins/main.cc:480 src/skins-qt/main.cc:463
 msgid "Playlist mode."
 msgstr "ධාවන ලැස්තු ප්‍රකාරය."
 
-#: src/gtkui/ui_statusbar.cc:117 src/skins/ui_main_evlisteners.cc:111
+#: src/gtkui/ui_statusbar.cc:118 src/skins/main.cc:486 src/skins-qt/main.cc:469
 msgid "Stopping after song."
 msgstr "ගීතයකින් පසු නැවතීම."
 
-#: src/hotkey/gui.cc:71
+#: src/hotkey/gui.cc:71 src/qthotkey/gui.cc:66
 msgid "Previous track"
 msgstr "පෙර ඛණ්ඩය"
 
-#: src/hotkey/gui.cc:72 src/notify/osd.cc:69 src/qtui/main_window.cc:69
-#: src/qtui/main_window.cc:172 src/qtui/main_window.cc:173
-#: src/skins/menus.cc:87
-msgid "Play"
-msgstr "ධාවනය කරන්න "
-
-#: src/hotkey/gui.cc:73
+#: src/hotkey/gui.cc:73 src/qthotkey/gui.cc:68
 msgid "Pause/Resume"
 msgstr "නැවතීම/නැවත ඇරඹීම "
 
-#: src/hotkey/gui.cc:74 src/qtui/main_window.cc:70 src/skins/menus.cc:89
-msgid "Stop"
-msgstr "නැවතීම "
-
-#: src/hotkey/gui.cc:75
+#: src/hotkey/gui.cc:75 src/qthotkey/gui.cc:70
 msgid "Next track"
 msgstr "පසු ඛණ්ඩය "
 
-#: src/hotkey/gui.cc:76
-msgid "Forward 5 seconds"
-msgstr "තත්.5 ධාවනය කරන්න"
-
-#: src/hotkey/gui.cc:77
-msgid "Rewind 5 seconds"
-msgstr "තත්.5 පසු ධාවනය කරන්න"
+#: src/hotkey/gui.cc:76 src/qthotkey/gui.cc:71
+msgid "Step forward"
+msgstr ""
+
+#: src/hotkey/gui.cc:77 src/qthotkey/gui.cc:72
+msgid "Step backward"
+msgstr ""
 
-#: src/hotkey/gui.cc:78
+#: src/hotkey/gui.cc:78 src/qthotkey/gui.cc:73
 msgid "Mute"
 msgstr "නිහඬ කරන්න "
 
-#: src/hotkey/gui.cc:79
+#: src/hotkey/gui.cc:79 src/qthotkey/gui.cc:74
 msgid "Volume up"
 msgstr "ශබ්ද මට්ටම වැඩි කරන්න"
 
-#: src/hotkey/gui.cc:80
+#: src/hotkey/gui.cc:80 src/qthotkey/gui.cc:75
 msgid "Volume down"
 msgstr "ශබ්ද මට්ටම අඩු කරන්න"
 
-#: src/hotkey/gui.cc:81
+#: src/hotkey/gui.cc:81 src/qthotkey/gui.cc:76
 msgid "Jump to file"
 msgstr "මගහැර ගොනුවට පිවිසෙන්න "
 
-#: src/hotkey/gui.cc:82
+#: src/hotkey/gui.cc:82 src/qthotkey/gui.cc:77
 msgid "Toggle player window(s)"
 msgstr "ධාවක කවුළු(ව) පුරුක් කරන්න"
 
-#: src/hotkey/gui.cc:83
+#: src/hotkey/gui.cc:83 src/qthotkey/gui.cc:78
 msgid "Show On-Screen-Display"
 msgstr "තිරය මත සංදර්ශනය කර පෙන්වන්න "
 
-#: src/hotkey/gui.cc:84
+#: src/hotkey/gui.cc:84 src/qthotkey/gui.cc:79
 msgid "Toggle repeat"
 msgstr "නැවත කිරීම ටොගල් කරන්න"
 
-#: src/hotkey/gui.cc:85
+#: src/hotkey/gui.cc:85 src/qthotkey/gui.cc:80
 msgid "Toggle shuffle"
 msgstr "කළවම් කිරිම ටොගල් කරන්න"
 
-#: src/hotkey/gui.cc:86
+#: src/hotkey/gui.cc:86 src/qthotkey/gui.cc:81
 msgid "Toggle stop after current"
 msgstr "පවතින ගීතයෙන් පසු නැවතීම ටොගල් කරන්න "
 
-#: src/hotkey/gui.cc:87
+#: src/hotkey/gui.cc:87 src/qthotkey/gui.cc:82
 msgid "Raise player window(s)"
 msgstr "ධාවක කවුළු(ව) පෙන්වන්න"
 
-#: src/hotkey/gui.cc:97
+#: src/hotkey/gui.cc:98 src/qthotkey/gui.cc:100
 msgid "(none)"
 msgstr "(කිසිවක් නැත)"
 
-#: src/hotkey/gui.cc:234
+#: src/hotkey/gui.cc:261
 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 modifiers.\n"
 "\n"
 "Do you want to continue?"
 msgstr ""
-"ප්‍රාථමික මූසික බොත්තම් නවීකරණයකින් තොරව බැඳීමට නිර්දේශ නොකෙරේ.\n"
-"ඔබට ඉදිරියටයාම‍ට අවශ්‍යද ?"
 
-#: src/hotkey/gui.cc:236
+#: src/hotkey/gui.cc:264
 msgid "Binding mouse buttons"
 msgstr "බැඳෙන මූසික බොත්තම් "
 
-#: src/hotkey/gui.cc:391
+#: src/hotkey/gui.cc:434
 msgid ""
 "Press a key combination inside a text field.\n"
 "You can also bind mouse buttons."
@@ -2105,97 +2159,114 @@
 "පෙළ ක්ෂේත්‍රය ඇතුලත යතුරු එකතුව ඔබන්න.\n"
 "ඔබට මූසික බොත්තමද බැඳීය හැක."
 
-#: src/hotkey/gui.cc:396
+#: src/hotkey/gui.cc:444 src/qthotkey/gui.cc:179
 msgid "Hotkeys:"
 msgstr "විශේෂ බොත්තම්:"
 
-#: src/hotkey/gui.cc:413
+#: src/hotkey/gui.cc:457 src/qthotkey/gui.cc:181
 msgid "Action:"
 msgstr "ක්‍රියාව:"
 
-#: src/hotkey/gui.cc:420
+#: src/hotkey/gui.cc:461 src/qthotkey/gui.cc:182
 msgid "Key Binding:"
 msgstr "යතුරු බැඳීම:"
 
-#: src/hotkey/gui.cc:468
+#: src/hotkey/gui.cc:518 src/qthotkey/gui.cc:184
 msgid "_Add"
 msgstr ""
 
-#: src/hotkey/plugin.cc:61
+#: src/hotkey/plugin.cc:59 src/qthotkey/plugin.cc:78
 msgid "Global Hotkeys"
 msgstr "ගෝලීය විශේෂ බොත්තම්:"
 
-#: src/hotkey/plugin.cc:79
+#: src/hotkey/plugin.cc:74
 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"
+"Contributors 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/jack-ng/jack-ng.cc:49
+#: src/jack/jack-ng.cc:54
 msgid "JACK Output"
 msgstr "JACK ප්‍රතිදානය"
 
-#: src/jack-ng/jack-ng.cc:114
+#: src/jack/jack-ng.cc:126
+msgid "Client name:"
+msgstr ""
+
+#: src/jack/jack-ng.cc:128
 msgid "Automatically connect to output ports"
 msgstr ""
 
-#: src/jack-ng/jack-ng.cc:155
+#: src/jack/jack-ng.cc:130
+msgid "Filter ports (regex, use any port if blank):"
+msgstr ""
+
+#: src/jack/jack-ng.cc:136
+msgid "Connect to physical ports only"
+msgstr ""
+
+#: src/jack/jack-ng.cc:139
+msgid "Upmix to"
+msgstr ""
+
+#: src/jack/jack-ng.cc:141
+msgid "ports if input has fewer channels"
+msgstr ""
+
+#: src/jack/jack-ng.cc:143
+msgid "Ignore insufficient number of ports"
+msgstr ""
+
+#: src/jack/jack-ng.cc:181
+msgid "No JACK output ports were found. Please check settings."
+msgstr ""
+
+#: src/jack/jack-ng.cc:195
 #, c-format
 msgid "Only %d JACK output ports were found but %d are required."
 msgstr ""
 
-#: src/jack-ng/jack-ng.cc:164
+#: src/jack/jack-ng.cc:210
 #, c-format
 msgid "Failed to connect to JACK port %s."
 msgstr ""
 
-#: src/jack-ng/jack-ng.cc:184
+#: src/jack/jack-ng.cc:230
 msgid ""
 "JACK supports only floating-point audio. You must change the output bit "
 "depth to floating-point in Audacious settings."
 msgstr ""
 
-#: src/jack-ng/jack-ng.cc:197
+#: src/jack/jack-ng.cc:245
 msgid "Failed to connect to the JACK server; is it running?"
 msgstr ""
 
-#: src/jack-ng/jack-ng.cc:273
+#: src/jack/jack-ng.cc:321
 #, c-format
 msgid ""
 "The JACK server requires a sample rate of %d Hz, but Audacious is playing at "
 "%d Hz. Please use the Sample Rate Converter effect to correct the mismatch."
 msgstr ""
 
-#: src/ladspa/plugin.cc:414
+#: src/ladspa/plugin.cc:416
 #, c-format
 msgid "%s Settings"
 msgstr "%s සිටුවම "
 
-#: src/ladspa/plugin.cc:478
+#: src/ladspa/plugin.cc:482
 msgid "Module paths:"
 msgstr "මොඩියුල පථය:"
 
-#: src/ladspa/plugin.cc:483
+#: src/ladspa/plugin.cc:487
 msgid ""
 "Separate multiple paths with a colon.\n"
 "These paths are searched in addition to LADSPA_PATH.\n"
@@ -2205,25 +2276,25 @@
 "මෙම පථ සොයන්නේ LADSPA_PATH එකට අමතරවය.\n"
 "නව පථ ඇතුලත් කිරීමෙන් පසුව, නව පේනු මෘදුකාංග සදහා Enter යතුර ඔබන්න."
 
-#: src/ladspa/plugin.cc:499
+#: src/ladspa/plugin.cc:508
 msgid "Available plugins:"
 msgstr "උපයෝජ්‍ය පේනු මෘදුකාංග:"
 
-#: src/ladspa/plugin.cc:512 src/modplug/plugin_main.cc:92
-#: src/modplug/plugin_main.cc:95 src/modplug/plugin_main.cc:98
-#: src/modplug/plugin_main.cc:101
+#: src/ladspa/plugin.cc:521 src/modplug/plugin_main.cc:91
+#: src/modplug/plugin_main.cc:94 src/modplug/plugin_main.cc:97
+#: src/modplug/plugin_main.cc:100
 msgid "Enable"
 msgstr "සක්‍රිය "
 
-#: src/ladspa/plugin.cc:518
+#: src/ladspa/plugin.cc:527
 msgid "Enabled plugins:"
 msgstr "සක්‍රිය පේනු මෘදුකාංග:"
 
-#: src/ladspa/plugin.cc:534
+#: src/ladspa/plugin.cc:543
 msgid "Settings"
 msgstr "සිටුවම් "
 
-#: src/ladspa/plugin.cc:551
+#: src/ladspa/plugin.cc:560
 msgid ""
 "LADSPA Host for Audacious\n"
 "Copyright 2011 John Lindgren"
@@ -2239,7 +2310,7 @@
 msgid "LIRC Plugin"
 msgstr "LIRC පේනු මෘදුකාංගය"
 
-#: src/lirc/lirc.cc:381
+#: src/lirc/lirc.cc:379
 msgid ""
 "A simple plugin to control Audacious using the LIRC remote control daemon\n"
 "\n"
@@ -2267,63 +2338,123 @@
 "⏎\n"
 "LIRC පිළිබඳ වැඩි විස්තර සඳහා,http://lirc.org බලන්න."
 
-#: src/lirc/lirc.cc:392
+#: src/lirc/lirc.cc:390
 msgid "Connection"
 msgstr "සබැඳුම"
 
-#: src/lirc/lirc.cc:393
+#: src/lirc/lirc.cc:391
 msgid "Reconnect to LIRC server"
 msgstr "සේවාදායකයට ප්‍රතිසම්බන්ධ කරන්න "
 
-#: src/lirc/lirc.cc:395
+#: src/lirc/lirc.cc:393
 msgid "Wait before reconnecting:"
 msgstr "ප්‍රතිසම්බන්ධ වීමට පෙර මදක් සිටින්න:"
 
-#: src/lyricwiki/lyricwiki.cc:41
-msgid "LyricWiki Plugin"
-msgstr "ලිරික් විකී පේනු මෘදුකාංගය"
-
-#: src/lyricwiki/lyricwiki.cc:131 src/lyricwiki-qt/lyricwiki.cc:136
-msgid "No lyrics available"
-msgstr "පද රචනා නොමැත"
-
-#: src/lyricwiki/lyricwiki.cc:217 src/lyricwiki/lyricwiki.cc:226
-#: src/lyricwiki/lyricwiki.cc:243 src/lyricwiki/lyricwiki.cc:252
-#: src/lyricwiki/lyricwiki.cc:267 src/lyricwiki-qt/lyricwiki.cc:222
-#: src/lyricwiki-qt/lyricwiki.cc:231 src/lyricwiki-qt/lyricwiki.cc:248
-#: src/lyricwiki-qt/lyricwiki.cc:257 src/lyricwiki-qt/lyricwiki.cc:272
-msgid "Error"
-msgstr "දෝෂය "
-
-#: src/lyricwiki/lyricwiki.cc:218 src/lyricwiki/lyricwiki.cc:244
-#: src/lyricwiki-qt/lyricwiki.cc:223 src/lyricwiki-qt/lyricwiki.cc:249
+#: src/lyrics-common/chart_lyrics_provider.cc:93
+#: src/lyrics-common/chart_lyrics_provider.cc:150
+#: src/lyrics-common/lyrics_ovh_provider.cc:50
 #, c-format
 msgid "Unable to fetch %s"
 msgstr "කැඳවාගෙන යා නොහැක %s"
 
-#: src/lyricwiki/lyricwiki.cc:227 src/lyricwiki/lyricwiki.cc:253
-#: src/lyricwiki-qt/lyricwiki.cc:232 src/lyricwiki-qt/lyricwiki.cc:258
+#: src/lyrics-common/chart_lyrics_provider.cc:100
+#: src/lyrics-common/chart_lyrics_provider.cc:157
+#: src/lyrics-common/lyrics_ovh_provider.cc:57
 #, c-format
 msgid "Unable to parse %s"
 msgstr "parse කළ නොහැක %s"
 
-#: src/lyricwiki/lyricwiki.cc:259 src/lyricwiki-qt/lyricwiki.cc:264
+#: src/lyrics-common/chart_lyrics_provider.cc:121
+#: src/lyrics-common/chart_lyrics_provider.cc:194
+#: src/lyrics-common/lyrics_ovh_provider.cc:88
 msgid "Looking for lyrics ..."
 msgstr "පද රචනා සොයමින් පවතී ..."
 
-#: src/lyricwiki/lyricwiki.cc:267 src/lyricwiki-qt/lyricwiki.cc:272
-msgid "Missing song metadata"
-msgstr "ගීතයේ metadata නොමැත"
+#: src/lyrics-common/preferences.h:43
+msgid "Nowhere"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:49
+msgid "Artist is truncated at the start, Title -- at the end"
+msgstr ""
 
-#: src/lyricwiki/lyricwiki.cc:278 src/lyricwiki-qt/lyricwiki.cc:283
-msgid "Connecting to lyrics.wikia.com ..."
-msgstr "lyrics.wikia.com වෙත සම්බන්ද වෙමින් පවතී ..."
+#: src/lyrics-common/preferences.h:50
+msgid "Chars to truncate on:"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:54
+msgid "Chars are ORed in RegExp, surrounded by whitespace"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:55
+msgid "Chars to split on:"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:56
+msgid "Further truncate those on chars"
+msgstr ""
 
-#: src/lyricwiki-qt/lyricwiki.cc:55
-msgid "LyricWiki Plugin (Qt)"
+#: src/lyrics-common/preferences.h:62
+msgid "General"
 msgstr ""
 
-#: src/m3u/m3u.cc:32
+#: src/lyrics-common/preferences.h:63
+msgid "Split title into artist and title on chars"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:66
+msgid "Sources"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:67
+msgid "Use embedded lyrics (from Lyrics tag)"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:69
+msgid "Fetch lyrics from internet:"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:72
+msgid "Store fetched lyrics in local cache"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:74
+msgid "Local Storage"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:75
+msgid "Load lyric files (.lrc) from local storage"
+msgstr ""
+
+#: src/lyrics-common/utils.cc:54 src/ui-common/dialogs-qt.cc:63
+msgid "Error"
+msgstr "දෝෂය "
+
+#: src/lyrics-common/utils.cc:60
+msgid "Lyrics could not be found."
+msgstr ""
+
+#: src/lyrics-common/utils.cc:142
+msgid "Missing title and/or artist."
+msgstr ""
+
+#: src/lyrics-gtk/lyrics-gtk.cc:37 src/lyrics-qt/lyrics-qt.cc:50
+msgid "Lyrics"
+msgstr ""
+
+#: src/lyrics-gtk/lyrics-gtk.cc:189 src/lyrics-qt/lyrics-qt.cc:171
+msgid "Edit Lyrics ..."
+msgstr ""
+
+#: src/lyrics-gtk/lyrics-gtk.cc:195 src/lyrics-qt/lyrics-qt.cc:178
+msgid "Save Locally"
+msgstr ""
+
+#: src/lyrics-gtk/lyrics-gtk.cc:201 src/lyrics-qt/lyrics-qt.cc:186
+msgid "Refresh"
+msgstr ""
+
+#: src/m3u/m3u.cc:33
 msgid "M3U Playlists"
 msgstr "M3U ධාවන ලැයිස්තුව"
 
@@ -2331,17 +2462,17 @@
 msgid "Tact Generator"
 msgstr "ටැක්ට් ජනකය"
 
-#: src/metronom/metronom.cc:147
+#: src/metronom/metronom.cc:145
 #, c-format
 msgid "Tact generator: %d bpm"
 msgstr "ටැක්ට් ජනකය: %d මිනිත්තුවට බයිට්ස් "
 
-#: src/metronom/metronom.cc:149
+#: src/metronom/metronom.cc:147
 #, c-format
 msgid "Tact generator: %d bpm %d/%d"
 msgstr "ටැක්ට් ජනකය: %d මිනිත්තුවට බයිට්ස් %d/%d"
 
-#: src/metronom/metronom.cc:237
+#: src/metronom/metronom.cc:235
 msgid ""
 "A Tact Generator by Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
 "\n"
@@ -2355,11 +2486,11 @@
 "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/mixer/mixer.cc:38
+#: src/mixer/mixer.cc:43
 msgid "Channel Mixer"
 msgstr "නාලිකා මිශ්‍රකය"
 
-#: src/mixer/mixer.cc:202
+#: src/mixer/mixer.cc:255
 msgid ""
 "Channel Mixer Plugin for Audacious\n"
 "Copyright 2011-2012 John Lindgren and Michał Lipski"
@@ -2367,11 +2498,11 @@
 "Audacious සඳහා නාලිකා මිශ්‍රන පේනු මෘදුකාංගයක්\n"
 "ප්‍රකාශන අයිතිය 2011-2012 John Lindgren and Michał Lipski"
 
-#: src/mixer/mixer.cc:206
+#: src/mixer/mixer.cc:259
 msgid "Channel Mixer"
 msgstr "නාලිකා මිශ්‍රකය"
 
-#: src/mixer/mixer.cc:207
+#: src/mixer/mixer.cc:260
 msgid "Output channels:"
 msgstr "ප්‍රතිදාන නාලිකා:"
 
@@ -2383,168 +2514,176 @@
 msgid "Error connecting to MMS server"
 msgstr ""
 
-#: src/modplug/modplugbmp.h:53
+#: src/modplug/modplugbmp.h:57
 msgid "ModPlug (Module Player)"
 msgstr "මොඩ් කෙවෙනිය (මොඩියුල ධාවකය)"
 
-#: src/modplug/plugin_main.cc:53
-msgid "Resolution"
-msgstr "විභේදනය"
-
-#: src/modplug/plugin_main.cc:54
-msgid "8-bit"
-msgstr "බිටු-8"
-
 #: src/modplug/plugin_main.cc:55
-msgid "16-bit"
-msgstr "බිටු-16"
-
-#: src/modplug/plugin_main.cc:56
 msgid "Channels"
 msgstr "නාලිකා "
 
-#: src/modplug/plugin_main.cc:60
+#: src/modplug/plugin_main.cc:59
 msgid "Nearest (fastest)"
 msgstr "කිට්ටුතම (වේගවත්ම)"
 
-#: src/modplug/plugin_main.cc:61
+#: src/modplug/plugin_main.cc:60
 msgid "Linear (fast)"
 msgstr "රේඛීය (වේගවත්)"
 
-#: src/modplug/plugin_main.cc:62
+#: src/modplug/plugin_main.cc:61
 msgid "Spline (good)"
 msgstr "හිර ඇලිය (යහපත්)"
 
-#: src/modplug/plugin_main.cc:63
+#: src/modplug/plugin_main.cc:62
 msgid "Polyphase (best)"
 msgstr "බහු අදියර (ප්‍රශස්ත)"
 
-#: src/modplug/plugin_main.cc:64
+#: src/modplug/plugin_main.cc:63
 msgid "Sample rate"
 msgstr ""
 
-#: src/modplug/plugin_main.cc:65
+#: src/modplug/plugin_main.cc:64
 msgid "22 kHz"
 msgstr "22 kHz"
 
-#: src/modplug/plugin_main.cc:66
+#: src/modplug/plugin_main.cc:65
 msgid "44 kHz"
 msgstr "44 kHz"
 
-#: src/modplug/plugin_main.cc:67
+#: src/modplug/plugin_main.cc:66
 msgid "48 kHz"
 msgstr "48 kHz"
 
-#: src/modplug/plugin_main.cc:68
+#: src/modplug/plugin_main.cc:67
 msgid "96 kHz"
 msgstr "96 kHz"
 
-#: src/modplug/plugin_main.cc:72 src/modplug/plugin_main.cc:77
-#: src/modplug/plugin_main.cc:82
+#: src/modplug/plugin_main.cc:71 src/modplug/plugin_main.cc:76
+#: src/modplug/plugin_main.cc:81
 msgid "Level:"
 msgstr "මට්ටම:"
 
-#: src/modplug/plugin_main.cc:78
+#: src/modplug/plugin_main.cc:77
 msgid "Cutoff:"
 msgstr "කපා හැරීම:"
 
-#: src/modplug/plugin_main.cc:91
+#: src/modplug/plugin_main.cc:90
 msgid "Reverb"
 msgstr "ප්‍රතිනාදකය"
 
-#: src/modplug/plugin_main.cc:94
+#: src/modplug/plugin_main.cc:93
 msgid "Bass Boost"
 msgstr "\tමන්ද්‍රස්වරය වැඩිවීම"
 
-#: src/modplug/plugin_main.cc:97
+#: src/modplug/plugin_main.cc:96
 msgid "Surround"
 msgstr "වටපිටාව"
 
-#: src/modplug/plugin_main.cc:100
+#: src/modplug/plugin_main.cc:99
 msgid "Preamp"
 msgstr "ප්‍රාක්වර්ධකය"
 
-#: src/modplug/plugin_main.cc:107
+#: src/modplug/plugin_main.cc:106
 msgid "Oversample"
 msgstr "අධික සාම්පල"
 
-#: src/modplug/plugin_main.cc:108
+#: src/modplug/plugin_main.cc:107
 msgid "Noise reduction"
 msgstr "ශබ්දය අඩු කිරීම"
 
-#: src/modplug/plugin_main.cc:109
+#: src/modplug/plugin_main.cc:108
 msgid "Play Amiga MODs"
 msgstr "Amiga MODs ධාවනය කරන්න "
 
-#: src/modplug/plugin_main.cc:110
+#: src/modplug/plugin_main.cc:109
 msgid "Repeat"
 msgstr "නැවත කිරීම"
 
-#: src/modplug/plugin_main.cc:111
+#: src/modplug/plugin_main.cc:110
 msgid "Repeat count:"
 msgstr "නැවත ගණන් කිරීම"
 
-#: src/modplug/plugin_main.cc:112
+#: src/modplug/plugin_main.cc:111
 msgid "To repeat forever, set the repeat count to -1."
 msgstr "සදහටම නැවත නැවත කිරීමට, නැවත වරක් ගණන් කිරීම -1 හි පිහිටුවන්න."
 
-#: src/modplug/plugin_main.cc:125 src/sid/xs_config.cc:106
+#: src/modplug/plugin_main.cc:124 src/sid/xs_config.cc:106
 msgid "These settings will take effect when Audacious is restarted."
 msgstr ""
 
+#: src/moonstone/main_window.cc:72 src/moonstone/main_window.cc:73
+#: src/qtui/main_window.cc:159 src/qtui/main_window.cc:160
+#: src/skins/menus.cc:107 src/skins-qt/menus.cc:98
+msgid "Stop After This Song"
+msgstr ""
+
+#: src/moonstone/moonstone.cc:39
+msgid "Moonstone"
+msgstr ""
+
+#: src/moonstone/playlist_header.cc:212 src/qtui/playlist_header.cc:258
+msgid "Reset to Defaults"
+msgstr ""
+
+#: src/moonstone/playlist_model.cc:38 src/qtui/playlist_header.cc:232
+msgid "Now Playing"
+msgstr "දැන් ධාවනයවේ"
+
+#: src/moonstone/playlist_selection.cc:66
+#: src/playlist-manager/playlist-manager.cc:201
+#: src/playlist-manager-qt/playlist-manager-qt.cc:190
+msgid "Entries"
+msgstr "සටහන්"
+
 #: src/mpg123/mpg123.cc:54
 msgid "MPG123 Plugin"
 msgstr "MPG123 පේනු මෘදුකාංගය"
 
-#: src/mpg123/mpg123.cc:83
-msgid "Advanced"
-msgstr ""
-
-#: src/mpg123/mpg123.cc:84
+#: src/mpg123/mpg123.cc:82
 msgid "Use accurate length calculation (slow)"
 msgstr ""
 
-#: src/mpg123/mpg123.cc:248
+#: src/mpg123/mpg123.cc:260
 msgid "Surround"
 msgstr "සිසාළ "
 
-#: src/mpris2/plugin.cc:39
+#: src/mpris2/plugin.cc:40
 msgid "MPRIS 2 Server"
 msgstr "MPRIS 2 සේවාදායකය"
 
-#: src/neon/neon.cc:97
+#: src/neon/neon.cc:102
 msgid "Neon HTTP/HTTPS Plugin"
 msgstr "නිඕන් HTTP/HTTPS පේනු මෘදුකාංගය"
 
-#: src/neon/neon.cc:521
+#: src/neon/neon.cc:526
 msgid "Error parsing redirect"
 msgstr ""
 
-#: src/neon/neon.cc:535
+#: src/neon/neon.cc:540
 msgid "Unknown HTTP error"
 msgstr ""
 
-#: src/neon/neon.cc:569
+#: src/neon/neon.cc:614
 msgid "Error parsing URL"
 msgstr ""
 
-#: src/neon/neon.cc:632
+#: src/neon/neon.cc:687
 msgid "Too many redirects"
 msgstr ""
 
-#: src/notify/event.cc:64
+#: src/notify/event.cc:97
 msgid "Stopped"
 msgstr "නැවතුන "
 
-#: src/notify/event.cc:64
+#: src/notify/event.cc:97
 msgid "Audacious is not playing."
 msgstr "ඔඩෙෂස් ක්‍රියාත්මක නොවේ."
 
-#: src/notify/notify.cc:42
+#: src/notify/notify.cc:39
 msgid "Desktop Notifications"
 msgstr "වැඩතලය දැනුම් දීම "
 
-#: src/notify/notify.cc:60
+#: src/notify/notify.cc:57
 msgid ""
 "Desktop Notifications Plugin for Audacious\n"
 "Copyright (C) 2010 Maximilian Bogner\n"
@@ -2578,36 +2717,76 @@
 "ඔබට මම මෘදුකාංගය සමග GNU පොදු මහජන වරපතේ පිටපතක් ලැබී තිබිය යුතුය, එසේ නොමැති නම් "
 "<http://www.gnu.org/licenses/>. බලන්න."
 
-#: src/notify/notify.cc:110
+#: src/notify/notify.cc:104
 msgid "Show playback controls"
 msgstr "යළි ධාවන පාලන යතුරු පෙන්නන්න "
 
-#: src/notify/notify.cc:112
+#: src/notify/notify.cc:106
 msgid "Always show notification"
 msgstr "නිතර නිවේදන පෙන්නන්න"
 
-#: src/notify/notify.cc:114
+#: src/notify/notify.cc:108
 msgid "Include album name in notification"
 msgstr ""
 
-#: src/notify/osd.cc:58
+#: src/notify/notify.cc:110
+msgid "Custom notification duration:"
+msgstr ""
+
+#: src/notify/osd.cc:74
 msgid "Show"
 msgstr "පෙන්නන්න "
 
-#: src/notify/osd.cc:66 src/qtui/main_window.cc:178
-#: src/qtui/main_window.cc:179 src/skins/menus.cc:88
-msgid "Pause"
-msgstr "විරාමය "
+#: src/openmpt/mpt.cc:50
+msgid "OpenMPT (Module Player)"
+msgstr ""
 
-#: src/notify/osd.cc:73 src/qtui/main_window.cc:72 src/skins/menus.cc:91
-msgid "Next"
-msgstr "ඊළඟ "
+#: src/openmpt/mpt.cc:132
+msgid ""
+"Module player based on libopenmpt\n"
+"\n"
+"Written by: Chris Spiegel <cspiegel@gmail.com>"
+msgstr ""
+
+#: src/openmpt/mpt.cc:151
+msgid "Stereo separation:"
+msgstr ""
+
+#: src/openmpt/mpt.cc:153
+msgid "% (0=mono, 100=default, 200=full)"
+msgstr ""
+
+#: src/openmpt/mpt.cc:157
+msgid "Interpolation:"
+msgstr ""
+
+#: src/openmpt/mptwrap.h:51 src/soxr/sox-resampler.cc:189 src/xsf/plugin.cc:437
+msgid "Linear"
+msgstr ""
+
+#: src/openmpt/mptwrap.h:52
+msgid "Cubic"
+msgstr ""
+
+#: src/openmpt/mptwrap.h:53
+msgid "Windowed sinc"
+msgstr ""
+
+#: src/opus/opus.cc:39
+msgid "Opus Decoder"
+msgstr ""
 
-#: src/oss4/oss.h:93
+#: src/opus/opus.cc:336
+msgid ""
+"Opus Decoder Plugin for Audacious\n"
+"Copyright 2022 Thomas Lange"
+msgstr ""
+
+#: src/oss4/oss.h:70
 msgid "OSS4 Output"
 msgstr "OSS4 ප්‍රතිදානය"
 
-#: src/oss4/oss.h:95
+#: src/oss4/oss.h:72
 msgid "OSS3 Output"
 msgstr ""
 
@@ -2615,27 +2794,27 @@
 msgid "Default device"
 msgstr ""
 
-#: src/oss4/plugin.cc:77
+#: src/oss4/plugin.cc:78
 msgid "Audio device:"
 msgstr "ස්වයංක්‍රිය අම්පන්නය:"
 
-#: src/oss4/plugin.cc:80
+#: src/oss4/plugin.cc:81
 msgid "Use alternate device:"
 msgstr "විකල්ප අම්පන්නයක් භාවිතා කරන්න:"
 
-#: src/oss4/plugin.cc:84
+#: src/oss4/plugin.cc:85
 msgid "Save volume between sessions."
 msgstr "සැසි අතර ශබ්දය සුරකින්න."
 
-#: src/oss4/plugin.cc:86
+#: src/oss4/plugin.cc:87
 msgid "Enable format conversions made by the OSS software."
 msgstr "OSS මෘදුකාංගයෙන් සාදන ලද ආකෘති අනුවර්තන සක්‍රීය කරන්න."
 
-#: src/oss4/plugin.cc:88
+#: src/oss4/plugin.cc:89
 msgid "Enable exclusive mode to prevent virtual mixing."
 msgstr "අතාත්වික ඝටනාවෙන් මිදීමට කේවල ප්‍රකාරය සක්‍රිය කරන්න."
 
-#: src/oss4/plugin.cc:100
+#: src/oss4/plugin.cc:101
 msgid ""
 "OSS4 Output Plugin for Audacious\n"
 "Copyright 2010-2012 Michał Lipski\n"
@@ -2649,19 +2828,35 @@
 "#audacious හි මිනිසුන් වෙත ස්තූති කරමි, විශේෂයෙන් Tony Vroon සහ John Lindgren මෙන්ම පෙර "
 "OSS පේනු මෘදුකාංගයයෙහි කතෘන් හට ."
 
-#: src/playlist-manager/playlist-manager.cc:37
-msgid "Playlist Manager"
+#: src/pipewire/pipewire.cc:44
+msgid "PipeWire Output"
 msgstr ""
 
-#: src/playlist-manager/playlist-manager.cc:226
-msgid "Entries"
+#: src/pipewire/pipewire.cc:118
+msgid ""
+"PipeWire Output Plugin for Audacious\n"
+"Copyright 2022 Thomas Lange\n"
+"\n"
+"Based on the PipeWire Output Plugin for Qmmp\n"
+"Copyright 2021 Ilya Kotov"
 msgstr ""
 
-#: src/playlist-manager/playlist-manager.cc:245
+#: src/pipewire/pipewire.cc:408 src/skins/menus.cc:88 src/skins-qt/menus.cc:79
+msgid "Playback"
+msgstr "පිළිවැයීම"
+
+#: src/playlist-manager/playlist-manager.cc:38
+#: src/playlist-manager-qt/playlist-manager-qt.cc:42
+msgid "Playlist Manager"
+msgstr "\tධාවන ලැයිස්තු කළමනාකරු"
+
+#: src/playlist-manager/playlist-manager.cc:221
+#: src/playlist-manager-qt/playlist-manager-qt.cc:356
 msgid "_Remove"
 msgstr ""
 
-#: src/playlist-manager/playlist-manager.cc:246
+#: src/playlist-manager/playlist-manager.cc:222
+#: src/playlist-manager-qt/playlist-manager-qt.cc:351
 msgid "Ren_ame"
 msgstr ""
 
@@ -2669,53 +2864,54 @@
 msgid "PLS Playlists"
 msgstr "PLS ධාවන ලැයිස්තුව"
 
-#: src/psf/plugin.cc:45
+#: src/psf/plugin.cc:53
 msgid "OpenPSF PSF1/PSF2 Decoder"
 msgstr "PSF PSF1/PSF2 විකේතකය විවෘත කරන්න "
 
-#: src/pulse_audio/pulse_audio.cc:38
+#: src/psf/plugin.cc:270
+msgid "OpenPSF Configuration"
+msgstr ""
+
+#: src/psf/plugin.cc:271 src/xsf/plugin.cc:444
+msgid "Ignore length from file"
+msgstr ""
+
+#: src/pulse/pulse_audio.cc:42
 msgid "PulseAudio Output"
 msgstr "ශ්‍රව්‍ය ස්පන්ද ප්‍රතිදානය "
 
-#: src/pulse_audio/pulse_audio.cc:611
+#: src/pulse/pulse_audio.cc:84
+msgid "Context name:"
+msgstr ""
+
+#: src/pulse/pulse_audio.cc:86
+msgid "Stream name:"
+msgstr ""
+
+#: src/pulse/pulse_audio.cc:596
 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"
+"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"
-"මෙම මෘදුකාංගය බෙදාහැර ඇත්තේ ප්‍රයෝජනවත් වේ යන බලාපොරොත්තුවෙන් වුවත් වගකීමක් නොමැත; විකිණිය "
-"හැකි හෝ යම් නිශ්චිත අරමුණකට ලෙසවත් ගම්‍යමාන වන වගකීමකින් තොරයි. වැඩි විස්තර සඳහා GNU සාමාන්‍ය "
-"පොදු බලපත්‍රය බලන්න. \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"
-"මෙම මෘදුකාංගය සමග ඔබට GNU සාමාන්‍ය පොදු බලපත්‍රයහි පිටපතක් ලැබිය යුතුයි; නැතිනම් නිදහස් "
-"මෘදුකාංග පදනමට දන්වන්න. Free Software\n"
-"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
-"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/qtaudio/qtaudio.cc:49
+#: src/qtaudio/qtaudio.cc:53
 msgid "QtMultimedia Output"
 msgstr ""
 
-#: src/qtaudio/qtaudio.cc:77
+#: src/qtaudio/qtaudio.cc:84
 msgid ""
 "QtMultimedia Audio Output Plugin for Audacious\n"
 "Copyright 2014 William Pitcock\n"
@@ -2724,50 +2920,87 @@
 "Copyright 2010 John Lindgren"
 msgstr ""
 
-#: src/qtui/dialog_windows.cc:31
-msgid "Working ..."
+#: src/qtglspectrum/gl-spectrum.cc:41
+msgid ""
+"OpenGL Spectrum Analyzer for Audacious\n"
+"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
+"Copyright 2014, 2020 Ariadne Conill\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/qtui/filter_input.cc:44 src/skins/ui_playlist.cc:221
-msgid "Search"
+#: src/qthotkey/gui.cc:177
+msgid "Press a key combination inside a text field."
 msgstr ""
 
-#: src/qtui/main_window_actions.cc:94
+#: src/qthotkey/plugin.cc:105
+msgid ""
+"Global Hotkey Plugin\n"
+"Control the player with global key combinations or multimedia keys.\n"
+"\n"
+"Copyright (C) 2020 i.Dark_Templar <darktemplar@dark-templar-archives.net>\n"
+"Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n"
+"\n"
+"Contributors 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/qtui/menus.cc:109
 msgid "_Open Folder ..."
 msgstr ""
 
-#: src/qtui/main_window_actions.cc:96
+#: src/qtui/menus.cc:115
 msgid "_Add Folder ..."
 msgstr ""
 
-#: src/qtui/main_window_actions.cc:101
+#: src/qtui/menus.cc:128
 msgid "_Log Inspector ..."
 msgstr ""
 
-#: src/qtui/main_window.cc:64
-msgid "Open Files"
+#: src/qtui/menus.cc:220
+msgid "_Find ..."
 msgstr ""
 
-#: src/qtui/main_window.cc:66
-msgid "Add Files"
+#: src/qtui/menus.cc:256 src/skins/menus.cc:80 src/skins-qt/menus.cc:70
+msgid "Audio Settings ..."
 msgstr ""
 
-#: src/qtui/main_window.cc:71 src/skins/menus.cc:90
-msgid "Previous"
-msgstr "පෙර "
+#: src/qtui/playlist_model.cc:188
+msgid "Q#"
+msgstr ""
 
-#: src/qtui/main_window.cc:77 src/skins/menus.cc:82
-msgid "Repeat"
-msgstr "නැවත කරන්න "
+#: src/qtui/playlist_model.cc:190
+msgid "T#"
+msgstr ""
 
-#: src/qtui/main_window.cc:79 src/skins/menus.cc:83
-msgid "Shuffle"
-msgstr "කලවම් කරන්න "
+#: src/qtui/playlist_model.cc:192
+msgid "C#"
+msgstr ""
+
+#: src/qtui/playlist_model.cc:194
+msgid "D#"
+msgstr ""
 
-#: src/qtui/qtui.cc:42
+#: src/qtui/qtui.cc:40
 msgid "Qt Interface"
 msgstr ""
 
+#: src/qtui/search_bar.cc:46
+msgid "Search playlist"
+msgstr ""
+
+#: src/qtui/settings.cc:79
+msgid "Use bold font for column headers"
+msgstr ""
+
 #: src/resample/resample.cc:43
 msgid "Sample Rate Converter"
 msgstr "නියැදි අනුපාත පරිවර්තකය "
@@ -2808,7 +3041,7 @@
 msgid "Method:"
 msgstr "ක්‍රමය "
 
-#: src/resample/resample.cc:199 src/sox-resampler/sox-resampler.cc:161
+#: src/resample/resample.cc:199 src/soxr/sox-resampler.cc:203
 msgid "Rate:"
 msgstr "අනුපාතය:"
 
@@ -2860,61 +3093,48 @@
 msgid "192 kHz:"
 msgstr "192 කිලෝ හරට්ස්:"
 
-#: src/scrobbler2/config_window.cc:41
-#, c-format
-msgid "OK. Scrobbling for user: %s"
-msgstr "ඔව්. \tපරිශ්‍රීලක: %s සදහා භාවිත දත්ත සුරකින්න"
-
-#: src/scrobbler2/config_window.cc:54
-msgid "Permission Denied"
-msgstr "අනුමැතිය තහනම් කිරීම "
-
-#: src/scrobbler2/config_window.cc:56
-msgid "Access the following link to allow Audacious to scrobble your plays:"
-msgstr "Audacious සදහා භාවිත දත්ත සුරකීමට මෙම අමුණට පිවිසෙන්න :"
-
-#: src/scrobbler2/config_window.cc:66
-msgid "Keep this window open and click 'Check Permission' again.\n"
-msgstr "මම කවුළුව විවෘතව තබා 'අවසර පිරික්සන්න' නැවත ක්ලික් කරන්න\n"
+#: src/scrobbler2/config_window.cc:29
+msgid "Checking Last.fm access ..."
+msgstr ""
 
-#: src/scrobbler2/config_window.cc:69 src/scrobbler2/config_window.cc:80
+#: src/scrobbler2/config_window.cc:35
 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."
+"Your scrobbles are being saved on your computer temporarily. They will be "
+"submitted as soon as Audacious is allowed access."
 msgstr ""
-"කණගාටු නොවන්න ඔබගේ භාවිත දත්ත ඔබගේ පරිගණකයේ ම සුරක්ෂිත කරයි.\n"
-"ඒවා Audacious සදහා අවසර ලැබුණු වහාම සුරක්ෂිත වේ"
 
-#: src/scrobbler2/config_window.cc:77
-msgid "Network Problem."
-msgstr "ජාල ගැටළු."
+#: src/scrobbler2/config_window.cc:41
+#, c-format
+msgid "Permission granted. Scrobbling for user %s."
+msgstr ""
 
-#: src/scrobbler2/config_window.cc:78
-msgid "There was a problem contacting Last.fm. Please try again later."
-msgstr "අවසානයට සම්බන්ධ වීමේ ගැටළුවක් විය.fm.කරුණාකර පසුව නැවත උත්සහ කරන්න "
+#: src/scrobbler2/config_window.cc:44
+msgid ""
+"Permission denied. Open the following URL in a browser, allow Audacious "
+"access to your account, and then click 'Check Permission' again:"
+msgstr ""
 
-#: src/scrobbler2/config_window.cc:110
-msgid "Checking..."
-msgstr "පිරික්සන..."
+#: src/scrobbler2/config_window.cc:53
+msgid "There was a problem contacting Last.fm."
+msgstr ""
 
-#: src/scrobbler2/config_window.cc:176
-msgid "C_heck Permission"
-msgstr "C_heck අනුමැතිය "
+#: src/scrobbler2/config_window.cc:92
+msgid "Check Permission"
+msgstr ""
 
-#: src/scrobbler2/config_window.cc:177
-msgid "_Revoke Permission"
-msgstr "_අනුමැතිය අවලංගු කිරීම "
+#: src/scrobbler2/config_window.cc:93
+msgid "Revoke Permission"
+msgstr ""
 
-#: src/scrobbler2/config_window.cc:220
-msgid ""
-"You need to allow Audacious to scrobble tracks to your Last.fm account.\n"
-msgstr "ඔබ ඔඩෙෂස් හට ඔබගේ අවසාන fm ගිණුමෙන් ගීත ලබා ගැනීමට අවසර දිය යුතුය.\n"
+#: src/scrobbler2/config_window.cc:97
+msgid "You need to allow Audacious to scrobble tracks to your Last.fm account."
+msgstr ""
 
 #: src/scrobbler2/scrobbler.cc:29
 msgid "Scrobbler 2.0"
 msgstr "ස්ක්රෝබ්ලර් 2.0"
 
-#: src/scrobbler2/scrobbler.cc:224
+#: src/scrobbler2/scrobbler.cc:200
 msgid ""
 "The Scrobbler plugin could not be started.\n"
 "There might be a problem with your installation."
@@ -2922,33 +3142,21 @@
 "Scrobbler පේනු මෘදුකාංගය ඇරභිය නොහැකිය.⏎\n"
 "සමහරවිට ඔබගේ පිහිටැවුමෙහි ගැටලුවක් ඇත."
 
-#: src/scrobbler2/scrobbler.cc:289
+#: src/scrobbler2/scrobbler.cc:245
 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_communication.cc:642
-msgid ""
-"Audacious is now using an improved version of the Last.fm Scrobbler.\n"
-"Please check the Preferences for the Scrobbler plugin."
+"project."
 msgstr ""
-"Audacious අවසානයට වැඩි දියුණුකළ අනුවාදය භාවිත කරයි.fm Scrobbler.⏎ \n"
-"කරුණාකර Scrobbler පේනු මෘදුකාංගයේ අභිරුචිය පරීක්ෂා කර බලන්න."
 
-#: src/sdlout/sdlout.cc:48
+#: src/sdlout/sdlout.cc:43
 msgid "SDL Output"
 msgstr "SDL ප්‍රතිදානය"
 
-#: src/sdlout/sdlout.cc:77
+#: src/sdlout/sdlout.cc:72
 msgid ""
 "SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
@@ -2956,78 +3164,87 @@
 "Audacious සඳහා වන SDL ප්‍රතිදාන පේනු මෘදුකාංගය\n"
 "ප්‍රකාශන අයිතිය 2010 ජෝන් ලින්ඩ්ග්‍රෙන්"
 
-#: src/search-tool/search-tool.cc:116 src/search-tool/search-tool.cc:124
+#: src/search-tool/library.cc:35 src/search-tool/library.cc:46
+#: src/search-tool-qt/library.cc:35 src/search-tool-qt/library.cc:46
 msgid "Library"
 msgstr "පුස්තකාලය "
 
-#: src/search-tool/search-tool.cc:394
-#, c-format
-msgid "%d result"
-msgid_plural "%d results"
-msgstr0 ""
-msgstr1 ""
-
-#: src/search-tool/search-tool.cc:400
-#, c-format
-msgid "(%d hidden)"
-msgid_plural "(%d hidden)"
-msgstr0 ""
-msgstr1 ""
-
-#: src/search-tool/search-tool.cc:594
+#: src/search-tool-qt/search-model.cc:44 src/search-tool/search-tool.cc:287
 #, c-format
 msgid "%d song"
 msgid_plural "%d songs"
 msgstr0 ""
 msgstr1 ""
 
-#: src/search-tool/search-tool.cc:601
+#: src/search-tool-qt/search-model.cc:53 src/search-tool/search-tool.cc:294
 msgid "of this genre"
 msgstr ""
 
-#: src/search-tool/search-tool.cc:607
+#: src/search-tool-qt/search-model.h:47 src/search-tool/search-model.h:45
 msgid "on"
 msgstr ""
 
-#: src/search-tool/search-tool.cc:607
+#: src/search-tool-qt/search-model.h:47 src/search-tool/search-model.h:45
 msgid "by"
 msgstr ""
 
-#: src/search-tool/search-tool.cc:643
-msgid "_Create Playlist"
-msgstr "_ධාවන ලැයිස්තුව තනන්න "
+#: src/search-tool-qt/search-tool-qt.cc:165 src/search-tool/search-tool.cc:74
+msgid "Number of results to show:"
+msgstr ""
 
-#: src/search-tool/search-tool.cc:645
-msgid "_Add to Playlist"
-msgstr "_ධාවන ලැයිස්තුවට එකතු කරන්න "
+#: src/search-tool-qt/search-tool-qt.cc:168 src/search-tool/search-tool.cc:77
+msgid "Rescan library at startup"
+msgstr ""
 
-#: src/search-tool/search-tool.cc:684
-msgid "Search library"
-msgstr "පුස්තකාලය සොයන්න "
+#: src/search-tool-qt/search-tool-qt.cc:170
+msgid "Monitor library for changes"
+msgstr ""
 
-#: src/search-tool/search-tool.cc:688
+#: src/search-tool-qt/search-tool-qt.cc:193 src/search-tool/search-tool.cc:450
 msgid ""
 "To import your music library into Audacious, choose a folder and then click "
 "the \"refresh\" icon."
 msgstr ""
 "ඔඩෙෂස් තුලට ඔබගේ ගීත පුස්තකාලය ආයාත කිරීමට, ෆෝල්ඩරයක් තෝරා \"නැවුම් කරන්න\" නිරූපකය ඔබන්න."
 
-#: src/search-tool/search-tool.cc:696
+#: src/search-tool-qt/search-tool-qt.cc:195 src/search-tool/search-tool.cc:459
 msgid "Please wait ..."
 msgstr "කරුණාකර රැඳී සිටින්න ..."
 
-#: src/search-tool/search-tool.cc:723
+#: src/search-tool-qt/search-tool-qt.cc:197 src/search-tool/search-tool.cc:487
 msgid "Choose Folder"
 msgstr "ෆෝල්ඩරය තෝරන්න "
 
+#: src/search-tool-qt/search-tool-qt.cc:201 src/search-tool/search-tool.cc:445
+msgid "Search library"
+msgstr "පුස්තකාලය සොයන්න "
+
+#: src/search-tool-qt/search-tool-qt.cc:327 src/search-tool/search-tool.cc:156
+#, c-format
+msgid "%d of %d result shown"
+msgid_plural "%d of %d results shown"
+msgstr0 ""
+msgstr1 ""
+
+#: src/search-tool-qt/search-tool-qt.cc:331 src/search-tool/search-tool.cc:160
+#, c-format
+msgid "%d result"
+msgid_plural "%d results"
+msgstr0 ""
+msgstr1 ""
+
+#: src/search-tool-qt/search-tool-qt.cc:501 src/search-tool/search-tool.cc:341
+msgid "_Create Playlist"
+msgstr "_ධාවන ලැයිස්තුව තනන්න "
+
+#: src/search-tool-qt/search-tool-qt.cc:503 src/search-tool/search-tool.cc:343
+msgid "_Add to Playlist"
+msgstr "_ධාවන ලැයිස්තුවට එකතු කරන්න "
+
 #: src/sid/xmms-sid.cc:43
 msgid "SID Player"
 msgstr ""
 
-#: src/sid/xs_config.cc:61
-msgid "Output"
-msgstr ""
-
 #: src/sid/xs_config.cc:62
 msgid "Channels:"
 msgstr ""
@@ -3106,740 +3323,683 @@
 msgid "Threshold:"
 msgstr ""
 
-#: src/silence-removal/silence-removal.cc:70
-msgid "dB"
+#: src/skins/actions.cc:45 src/skins-qt/actions.cc:43
+msgid "Repeat points cleared."
+msgstr "පුනරාවර්ථන ස්ථාන හිස් කරන ලදී."
+
+#: src/skins/actions.cc:60 src/skins-qt/actions.cc:58
+msgid "Repeat point A set."
+msgstr "පුනරාවර්ථන ස්ථානය A කුලකය."
+
+#: src/skins/actions.cc:65 src/skins-qt/actions.cc:63
+msgid "Repeat point B set."
+msgstr "පුනරාවර්ථන ස්ථානය B කුලකය."
+
+#: src/skins/equalizer.cc:223 src/skins-qt/equalizer.cc:223
+msgid "Preamp"
+msgstr "පූර්ව වර්ධකය"
+
+#: src/skins/equalizer.cc:227 src/skins-qt/equalizer.cc:227
+msgid "31 Hz"
+msgstr "31 හරට්ස් "
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "63 Hz"
+msgstr "63 හරට්ස් "
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "125 Hz"
+msgstr "125 හරට්ස් "
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "250 Hz"
+msgstr "250 හරට්ස් "
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "500 Hz"
+msgstr "500 හරට්ස් "
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "1 kHz"
+msgstr "1 හරට්ස් "
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "2 kHz"
+msgstr "2 හරට්ස් "
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "4 kHz"
+msgstr "4 හරට්ස් "
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "8 kHz"
+msgstr "8 හරට්ස් "
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "16 kHz"
+msgstr "16 හරට්ස් "
+
+#: src/skins/equalizer.cc:270 src/skins-qt/equalizer.cc:270
+msgid "Audacious Equalizer"
+msgstr "ඔඩෙෂස් ඉකුවලිසරය "
+
+#: src/skins/main.cc:459 src/skins-qt/main.cc:442
+msgid "Recording on"
 msgstr ""
 
-#: src/skins/menus.cc:64
-msgid "Open Files ..."
+#: src/skins/main.cc:461 src/skins-qt/main.cc:444
+msgid "Recording off"
 msgstr ""
 
-#: src/skins/menus.cc:65
-msgid "Open URL ..."
+#: src/skins/main.cc:754 src/skins-qt/main.cc:701
+#, c-format
+msgid "Seek to %d:%-2.2d / %d:%-2.2d"
+msgstr "සොයනවා %d:%-2.2d / %d:%-2.2d"
+
+#: src/skins/main.cc:771 src/skins-qt/main.cc:718
+#, c-format
+msgid "Volume: %d%%"
+msgstr "ශබ්ද මට්ටම : %d%%"
+
+#: src/skins/main.cc:784 src/skins-qt/main.cc:731
+#, c-format
+msgid "Balance: %d%% left"
+msgstr "තුලනය : %d%% වමට "
+
+#: src/skins/main.cc:786 src/skins-qt/main.cc:733
+msgid "Balance: center"
+msgstr "තුලනය: මැදට "
+
+#: src/skins/main.cc:788 src/skins-qt/main.cc:735
+#, c-format
+msgid "Balance: %d%% right"
+msgstr "තුලනය: %d%% දකුණට "
+
+#: src/skins/main.cc:880 src/skins-qt/main.cc:827
+msgid "Options Menu"
+msgstr "විකල්ප මෙනුව "
+
+#: src/skins/main.cc:884 src/skins-qt/main.cc:831
+msgid "Disable 'Always On Top'"
+msgstr "අක්‍රිය කරන්න 'සැමවිටම ඉහළ '"
+
+#: src/skins/main.cc:886 src/skins-qt/main.cc:833
+msgid "Enable 'Always On Top'"
+msgstr "සක්‍රිය කරන්න 'සැමවිටම ඉහළ '"
+
+#: src/skins/main.cc:889 src/skins-qt/main.cc:836
+msgid "File Info Box"
+msgstr "ගොනු තොරතුරු පෙට්ටිය "
+
+#: src/skins/main.cc:892 src/skins/menus.cc:149 src/skins-qt/main.cc:839
+#: src/skins-qt/menus.cc:142
+msgid "Double Size"
 msgstr ""
 
-#: src/skins/menus.cc:66
-msgid "Search Library"
+#: src/skins/main.cc:895 src/skins-qt/main.cc:842
+msgid "Visualizations"
 msgstr ""
 
-#: src/skins/menus.cc:68
-msgid "Playback"
-msgstr "පිළිවැයීම"
+#: src/skins/menus.cc:74 src/skins-qt/menus.cc:64
+msgid "Volume Up"
+msgstr ""
+
+#: src/skins/menus.cc:75 src/skins-qt/menus.cc:65
+msgid "Volume Down"
+msgstr ""
+
+#: src/skins/menus.cc:77 src/skins-qt/menus.cc:67
+msgid "Effects ..."
+msgstr ""
+
+#: src/skins/menus.cc:84 src/skins-qt/menus.cc:74
+msgid "Open Files ..."
+msgstr ""
+
+#: src/skins/menus.cc:85 src/skins-qt/menus.cc:76
+msgid "Open URL ..."
+msgstr ""
 
-#: src/skins/menus.cc:69
+#: src/skins/menus.cc:89 src/skins-qt/menus.cc:80
 msgid "Playlist"
 msgstr "ධාවන ලැයිස්තුව"
 
-#: src/skins/menus.cc:70
+#: src/skins/menus.cc:90 src/skins-qt/menus.cc:81
+msgid "Output"
+msgstr ""
+
+#: src/skins/menus.cc:91 src/skins-qt/menus.cc:82
 msgid "View"
 msgstr "දක්වන්න "
 
-#: src/skins/menus.cc:72 src/skins/menus.cc:136 src/skins/menus.cc:149
-#: src/skins/menus.cc:214
+#: src/skins/menus.cc:93 src/skins/menus.cc:161 src/skins/menus.cc:174
+#: src/skins/menus.cc:245 src/skins-qt/menus.cc:84 src/skins-qt/menus.cc:156
+#: src/skins-qt/menus.cc:170 src/skins-qt/menus.cc:241
 msgid "Services"
 msgstr ""
 
-#: src/skins/menus.cc:74
+#: src/skins/menus.cc:95 src/skins-qt/menus.cc:86
 msgid "About ..."
 msgstr ""
 
-#: src/skins/menus.cc:75
+#: src/skins/menus.cc:96 src/skins-qt/menus.cc:87
 msgid "Settings ..."
 msgstr ""
 
-#: src/skins/menus.cc:76
+#: src/skins/menus.cc:97 src/skins-qt/menus.cc:88
 msgid "Quit"
 msgstr ""
 
-#: src/skins/menus.cc:80 src/skins/menus.cc:206
+#: src/skins/menus.cc:101 src/skins/menus.cc:235 src/skins-qt/menus.cc:92
+#: src/skins-qt/menus.cc:231
 msgid "Song Info ..."
 msgstr ""
 
-#: src/skins/menus.cc:84
+#: src/skins/menus.cc:105 src/skins-qt/menus.cc:96
+msgid "Shuffle by Album"
+msgstr ""
+
+#: src/skins/menus.cc:106 src/skins-qt/menus.cc:97
 msgid "No Playlist Advance"
 msgstr "ධාවන ලැස්තු නැත "
 
-#: src/skins/menus.cc:85
-msgid "Stop After This Song"
-msgstr ""
-
-#: src/skins/menus.cc:93
+#: src/skins/menus.cc:117 src/skins-qt/menus.cc:108
 msgid "Set A-B Repeat"
 msgstr ""
 
-#: src/skins/menus.cc:94
+#: src/skins/menus.cc:118 src/skins-qt/menus.cc:109
 msgid "Clear A-B Repeat"
 msgstr ""
 
-#: src/skins/menus.cc:96
+#: src/skins/menus.cc:120 src/skins-qt/menus.cc:111
 msgid "Jump to Song ..."
 msgstr ""
 
-#: src/skins/menus.cc:97
+#: src/skins/menus.cc:121 src/skins-qt/menus.cc:113
 msgid "Jump to Time ..."
 msgstr ""
 
-#: src/skins/menus.cc:101
+#: src/skins/menus.cc:125 src/skins-qt/menus.cc:118
 msgid "Play/Resume"
 msgstr ""
 
-#: src/skins/menus.cc:103
+#: src/skins/menus.cc:127 src/skins-qt/menus.cc:120
 msgid "New Playlist"
 msgstr "නව ධාවන ලැයිස්තුව"
 
-#: src/skins/menus.cc:104
+#: src/skins/menus.cc:128 src/skins-qt/menus.cc:121
 msgid "Rename Playlist ..."
 msgstr ""
 
-#: src/skins/menus.cc:105
+#: src/skins/menus.cc:129 src/skins-qt/menus.cc:122
 msgid "Remove Playlist"
 msgstr ""
 
-#: src/skins/menus.cc:107
+#: src/skins/menus.cc:131 src/skins-qt/menus.cc:124
 msgid "Previous Playlist"
 msgstr ""
 
-#: src/skins/menus.cc:108
+#: src/skins/menus.cc:132 src/skins-qt/menus.cc:125
 msgid "Next Playlist"
 msgstr ""
 
-#: src/skins/menus.cc:110
+#: src/skins/menus.cc:134 src/skins-qt/menus.cc:127
 msgid "Import Playlist ..."
 msgstr ""
 
-#: src/skins/menus.cc:111
+#: src/skins/menus.cc:135 src/skins-qt/menus.cc:128
 msgid "Export Playlist ..."
 msgstr ""
 
-#: src/skins/menus.cc:113
+#: src/skins/menus.cc:137 src/skins-qt/menus.cc:130
 msgid "Playlist Manager ..."
 msgstr ""
 
-#: src/skins/menus.cc:114
+#: src/skins/menus.cc:138 src/skins-qt/menus.cc:131
 msgid "Queue Manager ..."
 msgstr ""
 
-#: src/skins/menus.cc:116
+#: src/skins/menus.cc:140 src/skins-qt/menus.cc:133
 msgid "Refresh Playlist"
 msgstr ""
 
-#: src/skins/menus.cc:120
+#: src/skins/menus.cc:144 src/skins-qt/menus.cc:137
 msgid "Show Playlist Editor"
 msgstr "ධාවන ලැස්තු සකසනය පෙන්වන්න "
 
-#: src/skins/menus.cc:121
+#: src/skins/menus.cc:145 src/skins-qt/menus.cc:138
 msgid "Show Equalizer"
 msgstr " ඉකුවලිසරය පෙන්වන්න "
 
-#: src/skins/menus.cc:123
+#: src/skins/menus.cc:147 src/skins-qt/menus.cc:140
 msgid "Show Remaining Time"
 msgstr ""
 
-#: src/skins/menus.cc:125
+#: src/skins/menus.cc:150 src/skins-qt/menus.cc:143
 msgid "Always on Top"
 msgstr "සැමවිටම ඉහළ"
 
-#: src/skins/menus.cc:126
+#: src/skins/menus.cc:151 src/skins-qt/menus.cc:145
 msgid "On All Workspaces"
 msgstr ""
 
-#: src/skins/menus.cc:128
+#: src/skins/menus.cc:153 src/skins-qt/menus.cc:148
 msgid "Roll Up Player"
 msgstr ""
 
-#: src/skins/menus.cc:129
+#: src/skins/menus.cc:154 src/skins-qt/menus.cc:149
 msgid "Roll Up Playlist Editor"
 msgstr ""
 
-#: src/skins/menus.cc:130
+#: src/skins/menus.cc:155 src/skins-qt/menus.cc:150
 msgid "Roll Up Equalizer"
 msgstr ""
 
-#: src/skins/menus.cc:132 src/skins/ui_main.cc:854
-msgid "Double Size"
-msgstr ""
-
-#: src/skins/menus.cc:138
+#: src/skins/menus.cc:163 src/skins-qt/menus.cc:158
 msgid "Add URL ..."
 msgstr ""
 
-#: src/skins/menus.cc:139
+#: src/skins/menus.cc:164 src/skins-qt/menus.cc:160
 msgid "Add Files ..."
 msgstr ""
 
-#: src/skins/menus.cc:143 src/skins/menus.cc:171 src/skins/menus.cc:185
+#: src/skins/menus.cc:168 src/skins/menus.cc:196 src/skins/menus.cc:212
+#: src/skins-qt/menus.cc:164 src/skins-qt/menus.cc:192
+#: src/skins-qt/menus.cc:208
 msgid "By Title"
 msgstr "මාතෘකාවෙන් "
 
-#: src/skins/menus.cc:144 src/skins/menus.cc:178 src/skins/menus.cc:192
+#: src/skins/menus.cc:169 src/skins/menus.cc:203 src/skins/menus.cc:219
+#: src/skins-qt/menus.cc:165 src/skins-qt/menus.cc:199
+#: src/skins-qt/menus.cc:215
 msgid "By File Name"
 msgstr ""
 
-#: src/skins/menus.cc:145 src/skins/menus.cc:179 src/skins/menus.cc:193
+#: src/skins/menus.cc:170 src/skins/menus.cc:204 src/skins/menus.cc:220
+#: src/skins-qt/menus.cc:166 src/skins-qt/menus.cc:200
+#: src/skins-qt/menus.cc:216
 msgid "By File Path"
 msgstr ""
 
-#: src/skins/menus.cc:151
+#: src/skins/menus.cc:176 src/skins-qt/menus.cc:172
 msgid "Remove All"
 msgstr "සියල්ල ඉවත් කරන්න "
 
-#: src/skins/menus.cc:152
+#: src/skins/menus.cc:177 src/skins-qt/menus.cc:173
 msgid "Clear Queue"
 msgstr "පෙළගැස්ම හිස් කරන්න"
 
-#: src/skins/menus.cc:154
+#: src/skins/menus.cc:179 src/skins-qt/menus.cc:175
 msgid "Remove Unavailable Files"
 msgstr "අනුපයෝජ්‍ය ගොනු ඉවත් කරන්න "
 
-#: src/skins/menus.cc:155
+#: src/skins/menus.cc:180 src/skins-qt/menus.cc:176
 msgid "Remove Duplicates"
 msgstr "ද්විකරණ ඉවත් කරන්න "
 
-#: src/skins/menus.cc:157
+#: src/skins/menus.cc:182 src/skins-qt/menus.cc:178
 msgid "Remove Unselected"
 msgstr "තෝරානොගත් ඒවා ඉවත් කරන්න "
 
-#: src/skins/menus.cc:158
+#: src/skins/menus.cc:183 src/skins-qt/menus.cc:179
 msgid "Remove Selected"
 msgstr "තෝරාගත් ඒවා ඉවත් කරන්න "
 
-#: src/skins/menus.cc:162
+#: src/skins/menus.cc:187 src/skins-qt/menus.cc:183
 msgid "Search and Select"
 msgstr "සොයන්න සහ තෝරන්න "
 
-#: src/skins/menus.cc:164
+#: src/skins/menus.cc:189 src/skins-qt/menus.cc:185
 msgid "Invert Selection"
 msgstr "වරණය පෙරලන්න "
 
-#: src/skins/menus.cc:165
+#: src/skins/menus.cc:190 src/skins-qt/menus.cc:186
 msgid "Select None"
 msgstr "කිසිවක් තෝරානොගන්න "
 
-#: src/skins/menus.cc:166
+#: src/skins/menus.cc:191 src/skins-qt/menus.cc:187
 msgid "Select All"
 msgstr "සියල්ල තෝරන්න"
 
-#: src/skins/menus.cc:170 src/skins/menus.cc:184
+#: src/skins/menus.cc:195 src/skins/menus.cc:211 src/skins-qt/menus.cc:191
+#: src/skins-qt/menus.cc:207
 msgid "By Track Number"
 msgstr "ඛණ්ඩ අංකයෙන් "
 
-#: src/skins/menus.cc:172 src/skins/menus.cc:186
+#: src/skins/menus.cc:197 src/skins/menus.cc:213 src/skins-qt/menus.cc:193
+#: src/skins-qt/menus.cc:209
 msgid "By Artist"
 msgstr "ශිල්පියාගෙන් "
 
-#: src/skins/menus.cc:173 src/skins/menus.cc:187
+#: src/skins/menus.cc:198 src/skins/menus.cc:214 src/skins-qt/menus.cc:194
+#: src/skins-qt/menus.cc:210
 msgid "By Album"
 msgstr "ඇල්බමයෙන් "
 
-#: src/skins/menus.cc:174 src/skins/menus.cc:188
+#: src/skins/menus.cc:199 src/skins/menus.cc:215 src/skins-qt/menus.cc:195
+#: src/skins-qt/menus.cc:211
 msgid "By Album Artist"
 msgstr ""
 
-#: src/skins/menus.cc:175 src/skins/menus.cc:190
+#: src/skins/menus.cc:200 src/skins/menus.cc:216 src/skins-qt/menus.cc:196
+#: src/skins-qt/menus.cc:212
 msgid "By Release Date"
 msgstr ""
 
-#: src/skins/menus.cc:176 src/skins/menus.cc:189
+#: src/skins/menus.cc:201 src/skins/menus.cc:217 src/skins-qt/menus.cc:197
+#: src/skins-qt/menus.cc:213
 msgid "By Genre"
 msgstr ""
 
-#: src/skins/menus.cc:177 src/skins/menus.cc:191
+#: src/skins/menus.cc:202 src/skins/menus.cc:218 src/skins-qt/menus.cc:198
+#: src/skins-qt/menus.cc:214
 msgid "By Length"
 msgstr ""
 
-#: src/skins/menus.cc:180 src/skins/menus.cc:194
+#: src/skins/menus.cc:205 src/skins/menus.cc:221 src/skins-qt/menus.cc:201
+#: src/skins-qt/menus.cc:217
 msgid "By Custom Title"
 msgstr ""
 
-#: src/skins/menus.cc:198
+#: src/skins/menus.cc:206 src/skins/menus.cc:222 src/skins-qt/menus.cc:202
+#: src/skins-qt/menus.cc:218
+msgid "By Comment"
+msgstr ""
+
+#: src/skins/menus.cc:207 src/skins/menus.cc:223 src/skins-qt/menus.cc:203
+#: src/skins-qt/menus.cc:219
+msgid "By Disc Number"
+msgstr ""
+
+#: src/skins/menus.cc:227 src/skins-qt/menus.cc:223
 msgid "Randomize List"
 msgstr "සසම්භාවී ධාවන ලැයිස්තුව "
 
-#: src/skins/menus.cc:199
+#: src/skins/menus.cc:228 src/skins-qt/menus.cc:224
 msgid "Reverse List"
 msgstr "ලැස්තුවේ ආපස්සට යන්න "
 
-#: src/skins/menus.cc:201
+#: src/skins/menus.cc:230 src/skins-qt/menus.cc:226
 msgid "Sort Selected"
 msgstr "තෝරාගත් අනුපිළිවලට "
 
-#: src/skins/menus.cc:202
+#: src/skins/menus.cc:231 src/skins-qt/menus.cc:227
 msgid "Sort List"
 msgstr "ලැයිස්තුව අනුපිළිවලට සකසන්න "
 
-#: src/skins/menus.cc:208
+#: src/skins/menus.cc:236 src/skins-qt/menus.cc:232
+msgid "Open Containing Folder"
+msgstr ""
+
+#: src/skins/menus.cc:238 src/skins-qt/menus.cc:234
 msgid "Cut"
 msgstr "කපන්න "
 
-#: src/skins/menus.cc:209
+#: src/skins/menus.cc:239 src/skins-qt/menus.cc:235
 msgid "Copy"
 msgstr "පිටපත් කරන්න "
 
-#: src/skins/menus.cc:210
+#: src/skins/menus.cc:240 src/skins-qt/menus.cc:236
 msgid "Paste"
 msgstr "අලවන්න "
 
-#: src/skins/menus.cc:212
-msgid "Queue/Unqueue"
+#: src/skins/menus.cc:241 src/skins-qt/menus.cc:237
+msgid "Paste at End"
 msgstr ""
 
-#: src/skins/menus.cc:218
-msgid "Load Preset ..."
-msgstr ""
-
-#: src/skins/menus.cc:219
-msgid "Load Auto Preset ..."
-msgstr ""
-
-#: src/skins/menus.cc:220
-msgid "Load Default"
-msgstr ""
-
-#: src/skins/menus.cc:221
-msgid "Load Preset File ..."
+#: src/skins/menus.cc:243 src/skins-qt/menus.cc:239
+msgid "Queue/Unqueue"
 msgstr ""
 
-#: src/skins/menus.cc:222
-msgid "Load EQF File ..."
-msgstr ""
+#: src/skins/playlist-widget.cc:58 src/skins-qt/playlist-widget.cc:58
+#, c-format
+msgid "%s (%d of %d)"
+msgstr "%s (%d ගෙන් %d)"
 
-#: src/skins/menus.cc:224
-msgid "Save Preset ..."
-msgstr ""
+#: src/skins/playlistwin.cc:491 src/skins-qt/playlistwin.cc:478
+msgid "Audacious Playlist Editor"
+msgstr "ඔඩෙෂස් ධාවන ලැස්තු සකසනය "
 
-#: src/skins/menus.cc:225
-msgid "Save Auto Preset ..."
-msgstr ""
+#: src/skins/plugin.cc:53 src/skins-qt/plugin.cc:65
+msgid "Winamp Classic Interface"
+msgstr "Winamp සම්භාව්‍ය අතුරු මුහුණත"
 
-#: src/skins/menus.cc:226
-msgid "Save Default"
+#: src/skins-qt/menus.cc:75
+msgid "Open Folder ..."
 msgstr ""
 
-#: src/skins/menus.cc:227
-msgid "Save Preset File ..."
+#: src/skins-qt/menus.cc:159
+msgid "Add Folder ..."
 msgstr ""
 
-#: src/skins/menus.cc:228
-msgid "Save EQF File ..."
-msgstr ""
+#: src/skins-qt/search-select.cc:62 src/skins/search-select.cc:77
+msgid "Search entries in active playlist"
+msgstr "සක්‍රිය ධාවන ලැයිස්තුවේ පිවිසුම් සොයන්න "
 
-#: src/skins/menus.cc:230
-msgid "Delete Preset ..."
+#: src/skins-qt/search-select.cc:70 src/skins/search-select.cc:83
+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/menus.cc:231
-msgid "Delete Auto Preset ..."
+#: src/skins-qt/search-select.cc:75 src/skins/search-select.cc:91
+msgid "Title:"
 msgstr ""
 
-#: src/skins/menus.cc:233
-msgid "Import Winamp Presets ..."
+#: src/skins-qt/search-select.cc:79 src/skins/search-select.cc:96
+msgid "Album:"
 msgstr ""
 
-#: src/skins/menus.cc:235
-msgid "Reset to Zero"
+#: src/skins-qt/search-select.cc:82 src/skins/search-select.cc:101
+msgid "Artist:"
 msgstr ""
 
-#: src/skins/plugin.cc:48
-msgid "Winamp Classic Interface"
-msgstr "Winamp සම්භාව්‍ය අතුරු මුහුණත"
-
-#: src/skins/preset-browser.cc:57 src/skins/preset-list.cc:371
-#: src/skins/preset-list.cc:386
-msgid "Save"
-msgstr "සුරකින්න "
-
-#: src/skins/preset-browser.cc:57 src/skins/preset-list.cc:338
-#: src/skins/preset-list.cc:354
-msgid "Load"
-msgstr "ප්‍රවේශනය "
-
-#: src/skins/preset-browser.cc:83
-msgid "Load Preset File"
+#: src/skins-qt/search-select.cc:85 src/skins/search-select.cc:106
+msgid "File Name:"
 msgstr ""
 
-#: src/skins/preset-browser.cc:100
-msgid "Load EQF File"
-msgstr ""
+#: src/skins-qt/search-select.cc:88 src/skins/search-select.cc:134
+msgid "Clear previous selection before searching"
+msgstr "පෙර තේරීම සෙවීමට පෙර හිස් කරන්න "
 
-#: src/skins/preset-browser.cc:119
-msgid "Save Preset File"
-msgstr ""
+#: src/skins-qt/search-select.cc:89 src/skins/search-select.cc:137
+msgid "Automatically toggle queue for matching entries"
+msgstr "ගැලපෙන පිවිසුම් සඳහා ස්වයංක්‍රියව පෙළගැස්ම ටෝගල කරන්න "
 
-#: src/skins/preset-browser.cc:137
-msgid "Save EQF File"
-msgstr ""
+#: src/skins-qt/search-select.cc:90 src/skins/search-select.cc:140
+msgid "Create a new playlist with matching entries"
+msgstr "ගැලපෙන පිවිසුම් සමග නව ධාවන ලැයිස්තුව තනන්න "
 
-#: src/skins/preset-browser.cc:151
-msgid "Import Winamp Presets"
+#: src/skins-qt/search-select.cc:101 src/skins/search-select.cc:78
+msgid "Search"
 msgstr ""
 
-#: src/skins/preset-list.cc:285
-msgid "Presets"
-msgstr "පෙර සකසන ලද "
-
-#: src/skins/preset-list.cc:335
-msgid "Load preset"
-msgstr "පෙර සකසනය ප්‍රවේශනය කරන්න "
-
-#: src/skins/preset-list.cc:351
-msgid "Load auto-preset"
-msgstr "පෙර සකසන-ස්වයංක්‍රිය ප්‍රවේශනය"
-
-#: src/skins/preset-list.cc:367
-msgid "Save preset"
-msgstr "පෙර සකසනය සුරකින්න "
-
-#: src/skins/preset-list.cc:382
-msgid "Save auto-preset"
-msgstr "පෙර සකසනය-ස්වයංක්‍රියව සුරකින්න"
-
-#: src/skins/preset-list.cc:408
-msgid "Delete preset"
-msgstr "පෙර සකසනය මකන්න"
-
-#: src/skins/preset-list.cc:424
-msgid "Delete auto-preset"
-msgstr "පෙර සකසනය-ස්වයංක්‍රියව මකන්න"
-
-#: src/skins/skins_cfg.cc:176
+#: src/skins-qt/skins_cfg.cc:198 src/skins/skins_cfg.cc:182
 msgid "Player:"
 msgstr ""
 
-#: src/skins/skins_cfg.cc:178
+#: src/skins-qt/skins_cfg.cc:200 src/skins/skins_cfg.cc:184
 msgid "Select main player window font:"
 msgstr "කවුළු ෆොන්ටයේ ප්‍රධාන ධාවකය තෝරන්න:"
 
-#: src/skins/skins_cfg.cc:179
+#: src/skins-qt/skins_cfg.cc:201 src/skins/skins_cfg.cc:185
 msgid "Playlist:"
 msgstr ""
 
-#: src/skins/skins_cfg.cc:181
+#: src/skins-qt/skins_cfg.cc:203 src/skins/skins_cfg.cc:187
 msgid "Select playlist font:"
 msgstr "ධාවන ලැස්තු ෆොන්ටය තෝරන්න:"
 
-#: src/skins/skins_cfg.cc:187
+#: src/skins-qt/skins_cfg.cc:207 src/skins/skins_cfg.cc:191
 msgid "Skin"
 msgstr ""
 
-#: src/skins/skins_cfg.cc:189
+#: src/skins-qt/skins_cfg.cc:211 src/skins/skins_cfg.cc:193
+msgid "Display active titlebar when any window is focused"
+msgstr ""
+
+#: src/skins-qt/skins_cfg.cc:213 src/skins/skins_cfg.cc:195
 msgid "Fonts"
 msgstr ""
 
-#: src/skins/skins_cfg.cc:192
+#: src/skins-qt/skins_cfg.cc:215 src/skins/skins_cfg.cc:197
 msgid "Use bitmap fonts (supports ASCII only)"
 msgstr "බිට්මැප් ෆොන්ට භාවිතා කරන්න (ASCII පමණක් සහය වන )"
 
-#: src/skins/skins_cfg.cc:194
+#: src/skins-qt/skins_cfg.cc:217 src/skins/skins_cfg.cc:199
 msgid "Scroll song title"
 msgstr ""
 
-#: src/skins/skins_cfg.cc:196
+#: src/skins-qt/skins_cfg.cc:219 src/skins/skins_cfg.cc:201
 msgid "Scroll song title in both directions"
 msgstr "ගීත තේමාව දෙපසට චලනය කරන්න "
 
-#: src/skins/skins_cfg.cc:201
+#: src/skins-qt/skins_cfg.cc:224 src/skins/skins_cfg.cc:206
 msgid "Analyzer"
 msgstr "විශ්ලේශකය "
 
-#: src/skins/skins_cfg.cc:202
+#: src/skins-qt/skins_cfg.cc:225 src/skins/skins_cfg.cc:207
 msgid "Scope"
 msgstr "විෂය පථය "
 
-#: src/skins/skins_cfg.cc:203
+#: src/skins-qt/skins_cfg.cc:226 src/skins/skins_cfg.cc:208
 msgid "Voiceprint / VU meter"
 msgstr ""
 
-#: src/skins/skins_cfg.cc:204
+#: src/skins-qt/skins_cfg.cc:227 src/skins/skins_cfg.cc:209
 msgid "Off"
 msgstr "වහනවා "
 
-#: src/skins/skins_cfg.cc:208 src/skins/skins_cfg.cc:233
-#: src/skins/skins_cfg.cc:239
+#: src/skins-qt/skins_cfg.cc:231 src/skins-qt/skins_cfg.cc:256
+#: src/skins-qt/skins_cfg.cc:262 src/skins/skins_cfg.cc:213
+#: src/skins/skins_cfg.cc:238 src/skins/skins_cfg.cc:244
 msgid "Normal"
 msgstr "සාමාන්‍ය "
 
-#: src/skins/skins_cfg.cc:209 src/skins/skins_cfg.cc:234
+#: src/skins-qt/skins_cfg.cc:232 src/skins-qt/skins_cfg.cc:257
+#: src/skins/skins_cfg.cc:214 src/skins/skins_cfg.cc:239
 msgid "Fire"
 msgstr "දල්වනවා "
 
-#: src/skins/skins_cfg.cc:210
+#: src/skins-qt/skins_cfg.cc:233 src/skins/skins_cfg.cc:215
 msgid "Vertical lines"
 msgstr ""
 
-#: src/skins/skins_cfg.cc:214
+#: src/skins-qt/skins_cfg.cc:237 src/skins/skins_cfg.cc:219
 msgid "Lines"
 msgstr " රේඛා"
 
-#: src/skins/skins_cfg.cc:215
+#: src/skins-qt/skins_cfg.cc:238 src/skins/skins_cfg.cc:220
 msgid "Bars"
 msgstr "තීරු "
 
-#: src/skins/skins_cfg.cc:219
+#: src/skins-qt/skins_cfg.cc:242 src/skins/skins_cfg.cc:224
 msgid "Slowest"
 msgstr "මන්දගාමිම "
 
-#: src/skins/skins_cfg.cc:220
+#: src/skins-qt/skins_cfg.cc:243 src/skins/skins_cfg.cc:225
 msgid "Slow"
 msgstr "මන්දගාමි"
 
-#: src/skins/skins_cfg.cc:221 src/sox-resampler/sox-resampler.cc:152
+#: src/skins-qt/skins_cfg.cc:244 src/skins/skins_cfg.cc:226
+#: src/soxr/sox-resampler.cc:180
 msgid "Medium"
 msgstr "මධ්‍යම "
 
-#: src/skins/skins_cfg.cc:222
+#: src/skins-qt/skins_cfg.cc:245 src/skins/skins_cfg.cc:227
 msgid "Fast"
 msgstr "වේගවත් "
 
-#: src/skins/skins_cfg.cc:223
+#: src/skins-qt/skins_cfg.cc:246 src/skins/skins_cfg.cc:228
 msgid "Fastest"
 msgstr "වේගවත්ම "
 
-#: src/skins/skins_cfg.cc:227
+#: src/skins-qt/skins_cfg.cc:250 src/skins/skins_cfg.cc:232
 msgid "Dots"
 msgstr ""
 
-#: src/skins/skins_cfg.cc:228
+#: src/skins-qt/skins_cfg.cc:251 src/skins/skins_cfg.cc:233
 msgid "Line"
 msgstr ""
 
-#: src/skins/skins_cfg.cc:229
+#: src/skins-qt/skins_cfg.cc:252 src/skins/skins_cfg.cc:234
 msgid "Solid"
 msgstr ""
 
-#: src/skins/skins_cfg.cc:235
+#: src/skins-qt/skins_cfg.cc:258 src/skins/skins_cfg.cc:240
 msgid "Ice"
 msgstr "හිම "
 
-#: src/skins/skins_cfg.cc:240
+#: src/skins-qt/skins_cfg.cc:263 src/skins/skins_cfg.cc:245
 msgid "Smooth"
 msgstr "මෘදු "
 
-#: src/skins/skins_cfg.cc:244
-msgid "Type"
-msgstr ""
-
-#: src/skins/skins_cfg.cc:245
-msgid "Visualization type:"
-msgstr ""
-
-#: src/skins/skins_cfg.cc:248
-msgid "Analyzer"
-msgstr ""
-
-#: src/skins/skins_cfg.cc:249
-msgid "Show peaks"
-msgstr ""
-
-#: src/skins/skins_cfg.cc:251
+#: src/skins-qt/skins_cfg.cc:267 src/skins/skins_cfg.cc:249
 msgid "Coloring:"
 msgstr ""
 
-#: src/skins/skins_cfg.cc:254
+#: src/skins-qt/skins_cfg.cc:270 src/skins/skins_cfg.cc:252
 msgid "Style:"
 msgstr ""
 
-#: src/skins/skins_cfg.cc:257
+#: src/skins-qt/skins_cfg.cc:273 src/skins/skins_cfg.cc:255
 msgid "Falloff:"
 msgstr ""
 
-#: src/skins/skins_cfg.cc:260
+#: src/skins-qt/skins_cfg.cc:276 src/skins/skins_cfg.cc:258
 msgid "Peak falloff:"
 msgstr ""
 
-#: src/skins/skins_cfg.cc:264
+#: src/skins-qt/skins_cfg.cc:282 src/skins/skins_cfg.cc:264
 msgid "Scope Style:"
 msgstr ""
 
-#: src/skins/skins_cfg.cc:267
+#: src/skins-qt/skins_cfg.cc:285 src/skins/skins_cfg.cc:267
 msgid "Voiceprint Coloring:"
 msgstr ""
 
-#: src/skins/skins_cfg.cc:270
+#: src/skins-qt/skins_cfg.cc:288 src/skins/skins_cfg.cc:270
 msgid "VU Meter Style:"
 msgstr ""
 
-#: src/skins/skins_cfg.cc:276
-msgid "General"
-msgstr "සාමාන්‍ය"
-
-#: src/skins/skins_cfg.cc:277
-msgid "Visualization"
-msgstr "දෘෂ්ටි කල්පනය "
-
-#: src/skins/ui_equalizer.cc:282
-msgid "Preamp"
-msgstr "පූර්ව වර්ධකය"
-
-#: src/skins/ui_equalizer.cc:286
-msgid "31 Hz"
-msgstr "31 හරට්ස් "
-
-#: src/skins/ui_equalizer.cc:287
-msgid "63 Hz"
-msgstr "63 හරට්ස් "
-
-#: src/skins/ui_equalizer.cc:287
-msgid "125 Hz"
-msgstr "125 හරට්ස් "
-
-#: src/skins/ui_equalizer.cc:287
-msgid "250 Hz"
-msgstr "250 හරට්ස් "
-
-#: src/skins/ui_equalizer.cc:287
-msgid "500 Hz"
-msgstr "500 හරට්ස් "
-
-#: src/skins/ui_equalizer.cc:287
-msgid "1 kHz"
-msgstr "1 හරට්ස් "
-
-#: src/skins/ui_equalizer.cc:288
-msgid "2 kHz"
-msgstr "2 හරට්ස් "
-
-#: src/skins/ui_equalizer.cc:288
-msgid "4 kHz"
-msgstr "4 හරට්ස් "
-
-#: src/skins/ui_equalizer.cc:288
-msgid "8 kHz"
-msgstr "8 හරට්ස් "
-
-#: src/skins/ui_equalizer.cc:288
-msgid "16 kHz"
-msgstr "16 හරට්ස් "
-
-#: src/skins/ui_equalizer.cc:330
-msgid "Audacious Equalizer"
-msgstr "ඔඩෙෂස් ඉකුවලිසරය "
-
-#: src/skins/ui_main.cc:688
-#, c-format
-msgid "Seek to %d:%-2.2d / %d:%-2.2d"
-msgstr "සොයනවා %d:%-2.2d / %d:%-2.2d"
-
-#: src/skins/ui_main.cc:709
-#, c-format
-msgid "Volume: %d%%"
-msgstr "ශබ්ද මට්ටම : %d%%"
-
-#: src/skins/ui_main.cc:732
-#, c-format
-msgid "Balance: %d%% left"
-msgstr "තුලනය : %d%% වමට "
-
-#: src/skins/ui_main.cc:734
-msgid "Balance: center"
-msgstr "තුලනය: මැදට "
-
-#: src/skins/ui_main.cc:736
-#, c-format
-msgid "Balance: %d%% right"
-msgstr "තුලනය: %d%% දකුණට "
-
-#: src/skins/ui_main.cc:842
-msgid "Options Menu"
-msgstr "විකල්ප මෙනුව "
-
-#: src/skins/ui_main.cc:846
-msgid "Disable 'Always On Top'"
-msgstr "අක්‍රිය කරන්න 'සැමවිටම ඉහළ '"
-
-#: src/skins/ui_main.cc:848
-msgid "Enable 'Always On Top'"
-msgstr "සක්‍රිය කරන්න 'සැමවිටම ඉහළ '"
-
-#: src/skins/ui_main.cc:851
-msgid "File Info Box"
-msgstr "ගොනු තොරතුරු පෙට්ටිය "
-
-#: src/skins/ui_main.cc:857
-msgid "Visualizations"
-msgstr ""
-
-#: src/skins/ui_main.cc:1336
-msgid "Repeat point A set."
-msgstr "පුනරාවර්ථන ස්ථානය A කුලකය."
-
-#: src/skins/ui_main.cc:1341
-msgid "Repeat point B set."
-msgstr "පුනරාවර්ථන ස්ථානය B කුලකය."
-
-#: src/skins/ui_main.cc:1350
-msgid "Repeat points cleared."
-msgstr "පුනරාවර්ථන ස්ථාන හිස් කරන ලදී."
-
-#: src/skins/ui_playlist.cc:219
-msgid "Search entries in active playlist"
-msgstr "සක්‍රිය ධාවන ලැයිස්තුවේ පිවිසුම් සොයන්න "
-
-#: src/skins/ui_playlist.cc:226
-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.cc:234
-msgid "Title:"
+#: src/skins-qt/skins_cfg.cc:294 src/skins/skins_cfg.cc:276
+msgid "Type"
 msgstr ""
 
-#: src/skins/ui_playlist.cc:241
-msgid "Album:"
+#: src/skins-qt/skins_cfg.cc:295 src/skins/skins_cfg.cc:277
+msgid "Visualization type:"
 msgstr ""
 
-#: src/skins/ui_playlist.cc:248
-msgid "Artist:"
+#: src/skins-qt/skins_cfg.cc:298 src/skins/skins_cfg.cc:280
+msgid "Analyzer"
 msgstr ""
 
-#: src/skins/ui_playlist.cc:255
-msgid "File Name:"
+#: src/skins-qt/skins_cfg.cc:299 src/skins/skins_cfg.cc:281
+msgid "Show peaks"
 msgstr ""
 
-#: src/skins/ui_playlist.cc:263
-msgid "Clear previous selection before searching"
-msgstr "පෙර තේරීම සෙවීමට පෙර හිස් කරන්න "
-
-#: src/skins/ui_playlist.cc:266
-msgid "Automatically toggle queue for matching entries"
-msgstr "ගැලපෙන පිවිසුම් සඳහා ස්වයංක්‍රියව පෙළගැස්ම ටෝගල කරන්න "
-
-#: src/skins/ui_playlist.cc:269
-msgid "Create a new playlist with matching entries"
-msgstr "ගැලපෙන පිවිසුම් සමග නව ධාවන ලැයිස්තුව තනන්න "
-
-#: src/skins/ui_playlist.cc:717
-msgid "Audacious Playlist Editor"
-msgstr "ඔඩෙෂස් ධාවන ලැස්තු සකසනය "
-
-#: src/skins/ui_playlist.cc:752
-#, c-format
-msgid "%s (%d of %d)"
-msgstr "%s (%d ගෙන් %d)"
+#: src/skins-qt/skins_cfg.cc:308 src/skins/skins_cfg.cc:290
+msgid "Visualization"
+msgstr "දෘෂ්ටි කල්පනය "
 
-#: src/skins/ui_skinselector.cc:167
+#: src/skins-qt/skinselector.cc:98 src/skins/skinselector.cc:111
 msgid "Archived Winamp 2.x skin"
 msgstr "සංරක්ෂිත Winamp 2.x මතුපිට "
 
-#: src/skins/ui_skinselector.cc:172
+#: src/skins-qt/skinselector.cc:102 src/skins/skinselector.cc:115
 msgid "Unarchived Winamp 2.x skin"
 msgstr "සංරක්ෂණය නොකරන ලද Winamp 2.x මතුපිට"
 
-#: src/skins/util.cc:430
-#, c-format
-msgid "Could not create directory (%s): %s\n"
-msgstr "නාමාවලිය නිර්මාණය කීරීමට නොහැකිය (%s): %s\n"
-
-#: src/sndfile/plugin.cc:39
+#: src/sndfile/plugin.cc:38
 msgid "Sndfile Plugin"
 msgstr "Snd ගොනු පේනු මෘදුකාංගය"
 
-#: src/sndfile/plugin.cc:336
+#: src/sndfile/plugin.cc:372
 msgid ""
 "Based on the xmms_sndfile plugin:\n"
 "Copyright (C) 2000, 2002 Erik de Castro Lopo\n"
@@ -3878,94 +4038,100 @@
 "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
 "USA."
 
-#: src/sndio-ng/sndio.cc:44
+#: src/sndio/sndio.cc:43
 msgid "Sndio Output"
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:98
+#: src/sndio/sndio.cc:98
 msgid "Device (blank for default):"
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:100
+#: src/sndio/sndio.cc:100
 msgid "Save and restore volume:"
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:181
+#: src/sndio/sndio.cc:181
 #, c-format
 msgid "Sndio error: Unsupported audio format (%d)"
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:192
+#: src/sndio/sndio.cc:192
 msgid "Sndio error: sio_open() failed"
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:222
+#: src/sndio/sndio.cc:221
 msgid "Sndio error: sio_setpar() failed"
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:234
+#: src/sndio/sndio.cc:233
 msgid "Sndio error: sio_start() failed"
 msgstr ""
 
-#: src/song_change/song_change.cc:33
+#: src/songchange/song_change.cc:30
 msgid "Song Change"
 msgstr "ගීත වෙනස්කිරීම "
 
-#: src/song_change/song_change.cc:342
-msgid ""
-"Parameters passed to the shell should be encapsulated in "
-"quotes. Doing otherwise is a security risk."
-msgstr ""
-"කවචය වෙත හුවමාරු කරන ලද පරාමිතික කොටස් ලෙස ප්‍රාවරිකෘත කර ඇත. එය "
-"එසේ නොකරහොත් ආරක්ෂාව පිළිබඳ අවදානමක් පවතී."
-
-#: src/song_change/song_change.cc:358
+#: src/songchange/song_change.cc:256
 msgid "Commands"
 msgstr ""
 
-#: src/song_change/song_change.cc:360
+#: src/songchange/song_change.cc:258
 msgid "Command to run when starting a new song:"
 msgstr ""
 
-#: src/song_change/song_change.cc:364
+#: src/songchange/song_change.cc:261
+msgid "Command to run when stopping a song:"
+msgstr ""
+
+#: src/songchange/song_change.cc:264
 msgid "Command to run at the end of a song:"
 msgstr ""
 
-#: src/song_change/song_change.cc:368
+#: src/songchange/song_change.cc:267
 msgid "Command to run at the end of the playlist:"
 msgstr ""
 
-#: src/song_change/song_change.cc:372
+#: src/songchange/song_change.cc:270
 msgid "Command to run when song title changes (for network streams):"
 msgstr ""
 
-#: src/song_change/song_change.cc:376
+#: src/songchange/song_change.cc:273
 msgid ""
-"You can use the following format strings which will be substituted before "
-"calling the command (not all are useful for the end-of-playlist command):\n"
-"\n"
-"%F: Frequency (in hertz)\n"
+"You can use the following format codes, which will be replaced before "
+"running the command.\n"
+"Not all are useful though for the song-stopped or end-of-playlist command."
+msgstr ""
+
+#: src/songchange/song_change.cc:276
+msgid ""
+"%a: Artist\n"
+"%b: Album\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"
+"%F: Frequency (Hertz)\n"
+"%l: Length (milliseconds)\n"
+"%n or %s: Formatted title (see playlist settings)\n"
 "%p: Currently playing (1 or 0)\n"
-"%a: Artist\n"
-"%b: Album\n"
-"%T: Track title"
+"%r: Rate (bits per second)\n"
+"%t: Playlist position\n"
+"%T: Title (unformatted)"
 msgstr ""
 
-#: src/song-info-qt/song-info.cc:32
-msgid "Song Info (Qt)"
+#: src/songchange/song_change.cc:287
+msgid ""
+"Parameters passed to the shell should be enclosed in quotation marks.\n"
+"Unquoted parameters may lead to unexpected results."
 msgstr ""
 
-#: src/sox-resampler/sox-resampler.cc:44
+#: src/song-info-qt/song-info.cc:30
+msgid "Song Info"
+msgstr "ගීත තොරතුරු "
+
+#: src/soxr/sox-resampler.cc:44
 msgid "SoX Resampler"
 msgstr "Sox නැවත සාම්පල කිරීම "
 
-#: src/sox-resampler/sox-resampler.cc:144
+#: src/soxr/sox-resampler.cc:172
 msgid ""
 "SoX Resampler Plugin for Audacious\n"
 "Copyright 2013 Michał Lipski\n"
@@ -3979,96 +4145,136 @@
 "නියැදි අනුපාත පරිවර්තන පේනු මෘදුකාංගය මත පදනම් වී ඇත:\n"
 "ප්‍රකාශන අයිතිය 2010-2012 John Lindgren"
 
-#: src/sox-resampler/sox-resampler.cc:150
+#: src/soxr/sox-resampler.cc:178
 msgid "Quick"
 msgstr "කඩිනම්"
 
-#: src/sox-resampler/sox-resampler.cc:151
+#: src/soxr/sox-resampler.cc:179
 msgid "Low"
 msgstr "පහළ"
 
-#: src/sox-resampler/sox-resampler.cc:153
+#: src/soxr/sox-resampler.cc:181
 msgid "High"
 msgstr "ඉහළ"
 
-#: src/sox-resampler/sox-resampler.cc:154
+#: src/soxr/sox-resampler.cc:182
 msgid "Very High"
 msgstr "අති- උච්ච"
 
-#: src/sox-resampler/sox-resampler.cc:158
+#: src/soxr/sox-resampler.cc:183
+msgid "Ultra High"
+msgstr ""
+
+#: src/soxr/sox-resampler.cc:187
+msgid "Minimum"
+msgstr ""
+
+#: src/soxr/sox-resampler.cc:188
+msgid "Intermediate"
+msgstr ""
+
+#: src/soxr/sox-resampler.cc:193
 msgid "Quality:"
 msgstr "ප්‍රශස්තතාව:"
 
-#: src/speed-pitch/speed-pitch.cc:51
+#: src/soxr/sox-resampler.cc:196
+msgid "Phase:"
+msgstr ""
+
+#: src/soxr/sox-resampler.cc:200
+msgid "Allow aliasing"
+msgstr ""
+
+#: src/soxr/sox-resampler.cc:202
+msgid "Use steep filter"
+msgstr ""
+
+#: src/speedpitch/speed-pitch.cc:54
 msgid "Speed and Pitch"
 msgstr "වේගය සහ ස්වරමානය"
 
-#: src/speed-pitch/speed-pitch.cc:210
-msgid "Speed and Pitch"
-msgstr "වේගය සහ ස්වරමානය"
-
-#: src/speed-pitch/speed-pitch.cc:211
-msgid "Speed:"
-msgstr "වේගය:"
-
-#: src/speed-pitch/speed-pitch.cc:214
-msgid "Pitch:"
-msgstr "ස්වරමානය:"
+#: src/speedpitch/speed-pitch.cc:247
+msgid "Speed"
+msgstr ""
 
-#: src/statusicon/statusicon.cc:47
-msgid "Status Icon"
-msgstr "තත්ව නිරූපකය"
+#: src/speedpitch/speed-pitch.cc:248
+msgid "Decouple from pitch"
+msgstr ""
 
-#: src/statusicon/statusicon.cc:283
-msgid "Se_ttings ..."
+#: src/speedpitch/speed-pitch.cc:250 src/speedpitch/speed-pitch.cc:258
+msgid "Multiplier:"
+msgstr ""
+
+#: src/speedpitch/speed-pitch.cc:254
+msgid "Pitch"
 msgstr ""
 
-#: src/statusicon/statusicon.cc:372
+#: src/statusicon-qt/statusicon.cc:45 src/statusicon/statusicon.cc:47
+msgid "Status Icon"
+msgstr "තත්ව නිරූපකය"
+
+#: src/statusicon-qt/statusicon.cc:68
 msgid ""
-"Status Icon Plugin\n"
+"Status Icon Plugin (partial port for Qt interface)\n"
 "\n"
 "Copyright 2005-2007 Giacomo Lozito <james@develia.org>\n"
 "Copyright 2010 Michał Lipski <tallica@o2.pl>\n"
+"Copyright 2015 Eugene Paskevich <eugene@raptor.kiev.ua>\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.cc:379
+#: src/statusicon-qt/statusicon.cc:89 src/statusicon/statusicon.cc:384
 msgid "Mouse Scroll Action"
 msgstr "මුසික අනුචලන ක්‍රියාව"
 
-#: src/statusicon/statusicon.cc:380
+#: src/statusicon-qt/statusicon.cc:90 src/statusicon/statusicon.cc:385
 msgid "Change volume"
 msgstr "ශබ්දය වෙනස්කිරීම "
 
-#: src/statusicon/statusicon.cc:383
+#: src/statusicon-qt/statusicon.cc:93 src/statusicon/statusicon.cc:388
 msgid "Change playing song"
 msgstr "වාදනය වන ගීතය වෙනස්කිරීම "
 
-#: src/statusicon/statusicon.cc:386
+#: src/statusicon-qt/statusicon.cc:96 src/statusicon/statusicon.cc:391
 msgid "Other Settings"
 msgstr "අනෙකුත් සැකසුම්"
 
-#: src/statusicon/statusicon.cc:387
+#: src/statusicon-qt/statusicon.cc:97 src/statusicon/statusicon.cc:392
 msgid "Disable the popup window"
 msgstr "උත්පතන කවුළුව අක්‍රිය කරන්න "
 
-#: src/statusicon/statusicon.cc:389
+#: src/statusicon-qt/statusicon.cc:99 src/statusicon/statusicon.cc:394
 msgid "Close to the system tray"
 msgstr "පද්ධති තට්ටුවට ආසන්නව "
 
-#: src/statusicon/statusicon.cc:391
+#: src/statusicon-qt/statusicon.cc:101 src/statusicon/statusicon.cc:396
 msgid "Advance in playlist when scrolling upward"
 msgstr "අනුචලනය ඉහළට සිදුකරන විට ධාවන ලැයිස්තු ප්‍රගමනය "
 
+#: src/statusicon-qt/statusicon.cc:116 src/statusicon/statusicon.cc:287
+msgid "Se_ttings ..."
+msgstr ""
+
+#: src/statusicon/statusicon.cc:377
+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/stereo_plugin/stereo.cc:19
 msgid "Extra Stereo"
 msgstr "අතිරේක ත‍්‍ර‍්‍රිමාණ"
@@ -4087,20 +4293,160 @@
 msgid "Extra Stereo"
 msgstr "අතිරේක ත්‍රිමාන"
 
+#: src/streamtuner/icecast-model.cc:126 src/streamtuner/shoutcast-model.cc:131
+msgid "Type"
+msgstr ""
+
+#: src/streamtuner/icecast-model.cc:132
+msgid "Current Song"
+msgstr ""
+
+#: src/streamtuner/icecast-model.cc:164
+msgid "Other"
+msgstr ""
+
+#: src/streamtuner/ihr-model.cc:63
+msgid "Market"
+msgstr ""
+
+#: src/streamtuner/ihr-model.cc:156
+msgid "Call Letters"
+msgstr ""
+
+#: src/streamtuner/ihr-model.cc:162
+msgid "Description"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:128
+msgid "Listeners"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:188
+msgid "Top 500 Stations"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:189
+msgid "Alternative"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:190
+msgid "Blues"
+msgstr "බ්ලූස් "
+
+#: src/streamtuner/shoutcast-model.cc:191
+msgid "Classical"
+msgstr "සම්භාව්‍ය"
+
+#: src/streamtuner/shoutcast-model.cc:192
+msgid "Country"
+msgstr "දේශය "
+
+#: src/streamtuner/shoutcast-model.cc:193
+msgid "Decades"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:194
+msgid "Easy Listening"
+msgstr "පහසු ඇහුන්කන් දීම "
+
+#: src/streamtuner/shoutcast-model.cc:195
+msgid "Electronic"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:196
+msgid "Folk"
+msgstr "ජන සමූහය "
+
+#: src/streamtuner/shoutcast-model.cc:197
+msgid "Inspirational"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:198
+msgid "International"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:199
+msgid "Jazz"
+msgstr "ජෑස්"
+
+#: src/streamtuner/shoutcast-model.cc:200
+msgid "Latin"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:201
+msgid "Metal"
+msgstr "ලෝහය"
+
+#: src/streamtuner/shoutcast-model.cc:203
+msgid "New Age"
+msgstr "නව යුගය"
+
+#: src/streamtuner/shoutcast-model.cc:204
+msgid "Pop"
+msgstr "ජනප‍්‍රිය "
+
+#: src/streamtuner/shoutcast-model.cc:205
+msgid "Public Radio"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:206
+msgid "R&B and Urban"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:207
+msgid "Rap"
+msgstr "තට්ටු කරනවා"
+
+#: src/streamtuner/shoutcast-model.cc:208
+msgid "Reggae"
+msgstr "රෙගේයී සංගීතය"
+
+#: src/streamtuner/shoutcast-model.cc:209
+msgid "Rock"
+msgstr "පැද්දෙනවා "
+
+#: src/streamtuner/shoutcast-model.cc:210
+msgid "Seasonal and Holiday"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:211
+msgid "Soundtracks"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:212
+msgid "Talk"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:213
+msgid "Themes"
+msgstr ""
+
+#: src/streamtuner/streamtuner.cc:59
+msgid "Shoutcast"
+msgstr ""
+
+#: src/streamtuner/streamtuner.cc:60
+msgid "Icecast"
+msgstr ""
+
+#: src/streamtuner/streamtuner.cc:71
+msgid "Stream Tuner"
+msgstr ""
+
 #: src/tonegen/tonegen.cc:45
 msgid "Tone Generator"
 msgstr "ස්වර ජනකය"
 
-#: src/tonegen/tonegen.cc:94
+#: src/tonegen/tonegen.cc:92
 #, c-format
 msgid "%s %.1f Hz"
 msgstr "%s %.1f හර්ට්ස් "
 
-#: src/tonegen/tonegen.cc:94
+#: src/tonegen/tonegen.cc:92
 msgid "Tone Generator: "
 msgstr "ස්වර ජනකය:"
 
-#: src/tonegen/tonegen.cc:160
+#: src/tonegen/tonegen.cc:161
 msgid ""
 "Sine tone generator by Håvard Kvålen <havardk@xmms.org>\n"
 "Modified by Daniel J. Peng <danielpeng@bigfoot.com>\n"
@@ -4114,11 +4460,32 @@
 "භාවිතා කිරීම සඳහා, 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/ui-common/dialogs-qt.cc:40
+msgid ""
+"\n"
+"(Further messages have been hidden.)"
+msgstr ""
+"\n"
+"(අතිරේක පණිවිඩ සඟවන ලඳි.)"
+
+#: src/ui-common/dialogs-qt.cc:52
+msgid "Working ..."
+msgstr ""
+
+#: src/ui-common/dialogs-qt.cc:73
+msgid "Information"
+msgstr ""
+
+#: src/ui-common/menu-ops-gtk.cc:132 src/ui-common/menu-ops-qt.cc:113
+#, c-format
+msgid "%s does not appear to be a valid folder."
+msgstr ""
+
 #: src/voice_removal/voice_removal.cc:28
 msgid "Voice Removal"
 msgstr "කටහඬ ඉවත් කිරීම"
 
-#: src/vorbis/vorbis.cc:465
+#: src/vorbis/vorbis.cc:433
 msgid ""
 "Audacious Ogg Vorbis Decoder\n"
 "\n"
@@ -4160,12 +4527,12 @@
 msgid "Ogg Vorbis Decoder"
 msgstr "Ogg Vorbis විකේතකය"
 
-#: src/vtx/info.cc:22
+#: src/vtx/info.cc:24
 #, c-format
 msgid "Details about %s"
 msgstr ""
 
-#: src/vtx/info.cc:24
+#: src/vtx/info.cc:26
 msgid ""
 "Title: %t\n"
 "Author: %a\n"
@@ -4184,7 +4551,7 @@
 msgid "VTX Decoder"
 msgstr "VTX විකේතකය"
 
-#: src/vtx/vtx.cc:184
+#: src/vtx/vtx.cc:178
 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"
@@ -4194,19 +4561,59 @@
 "Based on in_vtx.dll Roman Sherbakov විසින් <v_soft@microfor.ru>\n"
 "Audacious පේනු මෘදුකාංගය Pavel Vymetalek විසින් <pvymetalek@seznam.cz>"
 
-#: src/wavpack/wavpack.cc:24
+#: src/vumeter-qt/vumeter_qt.cc:31
+msgid ""
+"VU Meter Plugin for Audacious\n"
+"Copyright 2017-2019 Marc Sánchez Fauste"
+msgstr ""
+
+#: src/vumeter-qt/vumeter_qt.cc:35
+msgid "VU Meter Settings"
+msgstr ""
+
+#: src/vumeter-qt/vumeter_qt.cc:37
+msgid "Peak hold time:"
+msgstr ""
+
+#: src/vumeter-qt/vumeter_qt.cc:42
+msgid "Fall-off time:"
+msgstr ""
+
+#: src/vumeter-qt/vumeter_qt.cc:44
+msgid "dB/second"
+msgstr ""
+
+#: src/vumeter-qt/vumeter_qt.cc:46
+msgid "Display legend"
+msgstr ""
+
+#: src/vumeter-qt/vumeter_qt.h:37
+msgid "VU Meter"
+msgstr ""
+
+#: src/waveout/waveout.cc:43
+msgid "Win32 waveOut"
+msgstr ""
+
+#: src/waveout/waveout.cc:69
+msgid ""
+"Win32 waveOut Plugin for Audacious\n"
+"Copyright 2016 John Lindgren"
+msgstr ""
+
+#: src/wavpack/wavpack.cc:25
 msgid "WavPack Decoder"
 msgstr "WavPack විකේතකය"
 
-#: src/wavpack/wavpack.cc:211
+#: src/wavpack/wavpack.cc:217
 msgid "lossy (hybrid)"
 msgstr "හානිමත් (දෙමුහුන්)"
 
-#: src/wavpack/wavpack.cc:213
+#: src/wavpack/wavpack.cc:219
 msgid "lossy"
 msgstr "හානිමත් "
 
-#: src/wavpack/wavpack.cc:255
+#: src/wavpack/wavpack.cc:259
 msgid ""
 "Copyright 2006 William Pitcock <nenolod@nenolod.net>\n"
 "\n"
@@ -4215,18 +4622,38 @@
 "ප්‍රකාශන හිමිකම 2006 William Pitcock <nenolod@nenolod.net>\n"
 "ඇතැම් පේනු මෘදුකාංග කේත Miles Egan විසිනි."
 
-#: src/xsf/plugin.cc:50
+#: src/xsf/plugin.cc:74
 msgid "2SF Decoder"
 msgstr " 2SF විකේතකය"
 
-#: src/xsf/plugin.cc:238
+#: src/xsf/plugin.cc:429
+msgid "32728 Hz"
+msgstr ""
+
+#: src/xsf/plugin.cc:432
+msgid "65456 Hz"
+msgstr ""
+
+#: src/xsf/plugin.cc:438
+msgid "Cosine"
+msgstr ""
+
+#: src/xsf/plugin.cc:439
+msgid "Sharp"
+msgstr ""
+
+#: src/xsf/plugin.cc:443
 msgid "XSF Configuration"
 msgstr ""
 
-#: src/xsf/plugin.cc:239
-msgid "Ignore length from file"
+#: src/xsf/plugin.cc:445
+msgid "Default fade time:"
+msgstr ""
+
+#: src/xsf/plugin.cc:447
+msgid "Interpolation mode:"
 msgstr ""
 
-#: src/xspf/xspf.cc:89
+#: src/xspf/xspf.cc:95
 msgid "XML Shareable Playlists (XSPF)"
 msgstr "XML හුවමාරු කළ හැකි ධාවන ලැයිස්තුව (XSPF)"

audacious-plugins-3.6.2-gtk3.tar.bz2/po/sk.po -> audacious-plugins-4.4.1.tar.bz2/po/sk.po Changed

@@ -3,262 +3,86 @@
 # This file is distributed under the same license as the Audacious Plugins package.
 #
 # Translators:
+# Andrej Časo <andrejcaso@gmail.com>, 2017
 # Andrej Herceg <herceg.andrej@zoznam.sk>, 2007, 2008, 2010, 2011
+# awg awg, 2022
 # Lukáš Dobránsky <lukas.dobransky@gmail.com>, 2012
-# Tomáš Vadina <tomasvadina+transifex@cryptolab.net>, 2012
+# Mastný Chleba, 2022
+# Tomáš Tomovčík <tomovcik.tomas@gmail.com>, 2016
+# 7dcd6f74323fe8d9c477949ff8fcbb1c_c427b63 <3fcd202e3dfab15fda15b8e88e54d449_7173>, 2012
 # Corduroy <vdcorduroy@gmail.com>, 2013
 # Corduroy <vdcorduroy@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: 2015-02-28 19:18+0100\n"
-"PO-Revision-Date: 2015-02-04 21:21+0000\n"
-"Last-Translator: Thomas Lange <thomas-lange2@gmx.de>\n"
-"Language-Team: Slovak (http://www.transifex.com/projects/p/audacious/"
-"language/sk/)\n"
+"Report-Msgid-Bugs-To: https://github.com/audacious-media-player/audacious/"
+"issues\n"
+"POT-Creation-Date: 2024-09-26 21:54+0200\n"
+"PO-Revision-Date: 2011-10-10 17:43+0000\n"
+"Last-Translator: awg awg, 2022\n"
+"Language-Team: Slovak (http://app.transifex.com/audacious/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"
-"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"Plural-Forms: nplurals=4; plural=(n % 1 == 0 && n == 1 ? 0 : n % 1 == 0 && n "
+">= 2 && n <= 4 ? 1 : n % 1 != 0 ? 2: 3);\n"
 
-#: src/aac-raw/aac.cc:18
+#: src/aac/aac.cc:19
 msgid "AAC (Raw) Decoder"
-msgstr ""
+msgstr "AAC (Raw) Dekodér"
 
-#: src/adplug/adplug-xmms.cc:42
+#: src/adplug/adplug-xmms.cc:70
 msgid "AdPlug (AdLib Player)"
 msgstr "AdPlug (AdLib prehrávač)"
 
-#: src/adplug/adplug-xmms.cc:156 src/modplug/modplugbmp.cc:335
-#: src/psf/plugin.cc:138 src/vtx/vtx.cc:87 src/xsf/plugin.cc:113
+#: src/adplug/adplug-xmms.cc:167 src/modplug/modplugbmp.cc:321
+#: src/psf/plugin.cc:161 src/vtx/vtx.cc:89 src/xsf/plugin.cc:204
 msgid "sequenced"
 msgstr "sekvenčný"
 
-#: src/alarm/alarm.cc:55 src/alarm/interface.cc:82
-msgid "Alarm"
-msgstr "Alarm"
-
-#: src/alarm/alarm.cc:782
-msgid "Set Alarm ..."
-msgstr ""
-
-#: src/alarm/alarm.cc:810
-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"
-"\n"
-"Napísali Adam Feakin a Daniel Stodden."
-
-#: src/alarm/interface.cc: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.cc: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.cc: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.cc:81
-msgid "This is your wakeup call."
-msgstr "Toto je budiaci signál."
-
-#: src/alarm/interface.cc:99
-msgid "Your reminder for today is..."
-msgstr ""
-
-#: src/alarm/interface.cc:101 src/alarm/interface.cc:386
-msgid "Reminder"
-msgstr "Upozornenie"
-
-#: src/alarm/interface.cc:132
-msgid "Monday"
-msgstr "Pondelok"
-
-#: src/alarm/interface.cc:132
-msgid "Tuesday"
-msgstr "Utorok"
-
-#: src/alarm/interface.cc:132
-msgid "Wednesday"
-msgstr "Streda"
-
-#: src/alarm/interface.cc:133
-msgid "Thursday"
-msgstr "Štvrtok"
-
-#: src/alarm/interface.cc:133
-msgid "Friday"
-msgstr "Piatok"
-
-#: src/alarm/interface.cc:133
-msgid "Saturday"
-msgstr "Sobota"
-
-#: src/alarm/interface.cc:133
-msgid "Sunday"
-msgstr "Nedeľa"
-
-#: src/alarm/interface.cc:171 src/alarm/interface.cc:230
-#: src/alarm/interface.cc:245
-msgid "Time"
-msgstr "Čas"
-
-#: src/alarm/interface.cc:178
-msgid "Alarm at (default):"
-msgstr "Budiť o (predvolené):"
-
-#: src/alarm/interface.cc:200
-msgid "h"
-msgstr "h"
-
-#: src/alarm/interface.cc:203
-msgid "Quiet after:"
-msgstr "Ticho po:"
-
-#: src/alarm/interface.cc:215
-msgid "hours"
-msgstr "hodín"
-
-#: src/alarm/interface.cc:226
-msgid "minutes"
-msgstr "minút"
-
-#: src/alarm/interface.cc:235
-msgid "Choose the days for the alarm to come on"
-msgstr "Vyberte dni, kedy má budík budiť"
+#: src/adplug/adplug-xmms.cc:349 src/sid/xs_config.cc:61
+msgid "Output"
+msgstr "Výstup"
 
-#: src/alarm/interface.cc:242
-msgid "Day"
-msgstr "Deň"
+#: src/adplug/adplug-xmms.cc:350
+msgid "OPL Emulator:"
+msgstr "OPL Emulátor:"
+
+#: src/adplug/adplug-xmms.cc:353 src/amidiplug/i_configure.cc:153
+#: src/console/plugin.cc:45 src/filewriter/filewriter.cc:481
+#: src/sid/xs_config.cc:65 src/xsf/plugin.cc:446
+msgid "Sample rate:"
+msgstr "Vzorkovacia frekvencia:"
 
-#: src/alarm/interface.cc:259 src/bs2b/plugin.cc:130
-#: src/skins/preset-list.cc:434 src/skins/preset-list.cc:440
-msgid "Default"
-msgstr "Štandardné"
+#: src/adplug/adplug-xmms.cc:354 src/amidiplug/i_configure.cc:155
+#: src/bs2b/plugin.cc:141 src/console/plugin.cc:47
+#: src/modplug/plugin_main.cc:77 src/resample/resample.cc:201
+#: src/resample/resample.cc:207 src/resample/resample.cc:211
+#: src/resample/resample.cc:215 src/resample/resample.cc:219
+#: src/resample/resample.cc:223 src/resample/resample.cc:227
+#: src/resample/resample.cc:231 src/resample/resample.cc:235
+#: src/resample/resample.cc:239 src/resample/resample.cc:243
+#: src/sid/xs_config.cc:67 src/soxr/sox-resampler.cc:205
+msgid "Hz"
+msgstr "Hz"
 
-#: src/alarm/interface.cc:288
-msgid "Days"
-msgstr "Dni"
-
-#: src/alarm/interface.cc:297
-msgid "Fading"
-msgstr "Zosilovanie"
-
-#: src/alarm/interface.cc:305 src/console/plugin.cc:41
-#: src/crossfade/crossfade.cc:53 src/crossfade/crossfade.cc:59
-#: src/gtkui/settings.cc:49 src/lirc/lirc.cc:397 src/sid/xs_config.cc:85
-#: src/sid/xs_config.cc:94 src/sid/xs_config.cc:103
-msgid "seconds"
-msgstr "sekúnd"
+#: src/adplug/adplug-xmms.cc:355 src/gtkui/settings.cc:55
+#: src/modplug/plugin_main.cc:105 src/qtui/settings.cc:85
+#: src/skins-qt/skins_cfg.cc:302 src/skins/skins_cfg.cc:284
+msgid "Miscellaneous"
+msgstr "Rôzne"
 
-#: src/alarm/interface.cc:312 src/alarm/interface.cc:353
-msgid "Volume"
-msgstr "Hlasitosť"
-
-#: src/alarm/interface.cc:317
-msgid "Start at"
-msgstr "Začať na"
-
-#: src/alarm/interface.cc:333
-msgid "Final"
-msgstr "Skončiť na"
-
-#: src/alarm/interface.cc:346
-msgid "Current"
-msgstr "Aktuálna"
-
-#: src/alarm/interface.cc:359
-msgid "Additional Command"
-msgstr "Dodatočný príkaz"
-
-#: src/alarm/interface.cc:365 src/alarm/interface.cc:391
-msgid "enable"
-msgstr "povoliť"
-
-#: src/alarm/interface.cc:372
-msgid "Playlist (optional)"
-msgstr "Zoznam skladieb (voliteľné)"
-
-#: src/alarm/interface.cc:379
-msgid "Select a playlist"
-msgstr "Vyber zoznam skladieb"
-
-#: src/alarm/interface.cc:399
-msgid "Options"
-msgstr "Možnosti"
-
-#: src/alarm/interface.cc:404
-msgid "What do these options mean?"
-msgstr "Čo tieto možnosti znamenajú?"
-
-#: src/alarm/interface.cc:420
-msgid "Help"
-msgstr "Pomocník"
+#: src/adplug/adplug-xmms.cc:356
+msgid "Repeat song in endless loop"
+msgstr "Nekonečné opakovanie skladby"
 
-#: src/albumart/albumart.cc:31
+#: src/albumart/albumart.cc:31 src/albumart-qt/albumart.cc:35
 msgid "Album Art"
 msgstr "Album"
 
-#: src/albumart-qt/albumart.cc:33
-msgid "Album Art (Qt)"
-msgstr ""
-
-#: src/alsa/alsa.h:70
+#: src/alsa/alsa.h:64
 msgid "ALSA Output"
 msgstr "ALSA výstup"
 
@@ -278,7 +102,7 @@
 
 #: src/alsa/config.cc:61
 msgid "(no description)"
-msgstr ""
+msgstr "(žiadny popis)"
 
 #: src/alsa/config.cc:166
 msgid "Default PCM device"
@@ -300,11 +124,11 @@
 msgid "Mixer element:"
 msgstr "Prvok mixéra:"
 
-#: src/amidi-plug/amidi-plug.cc:41
+#: src/amidiplug/amidi-plug.cc:42
 msgid "AMIDI-Plug (MIDI Player)"
 msgstr "AMIDI-Plug (MIDI prehrávač)"
 
-#: src/amidi-plug/amidi-plug.cc:437
+#: src/amidiplug/amidi-plug.cc:445
 msgid ""
 "AMIDI-Plug\n"
 "modular MIDI music player\n"
@@ -326,158 +150,181 @@
 "Tony Vroon\n"
 "for the good help with alpha testing"
 msgstr ""
+"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"
+"\n"
+"zvláštne poďakovanie patrí…\n"
+"\n"
+"Clemensovi Ladischovi a Jaroslavovi Kyselovi\n"
+"za ich úžasné programy aplaymidi a amixer; tieto\n"
+"boli naozaj užitočné, spolu s dokumentáciou alsa-lib,\n"
+"aby som sa dozvedel viac o ALSA API\n"
+" <<<<<<<<<<<\n"
+"Alfredovi Spadafinovi\n"
+"za pekné logo MIDI klávesnice\n"
+"\n"
+"Tonymu Vroonovi\n"
+"za pomoc pri testovaní alfa verzie"
 
-#: src/amidi-plug/i_configure.cc:94
+#: src/amidiplug/i_configure.cc:94
 msgid "Override default gain:"
-msgstr ""
+msgstr "Nahradiť predvolené zosilnenie:"
 
-#: src/amidi-plug/i_configure.cc:102
+#: src/amidiplug/i_configure.cc:102
 msgid "Override default polyphony:"
-msgstr ""
+msgstr "Potlačiť predvolený mnohohlas:"
 
-#: src/amidi-plug/i_configure.cc:110
+#: src/amidiplug/i_configure.cc:110
 msgid "Override default reverb:"
-msgstr ""
+msgstr "Potlačiť predvolený reverb:"
 
-#: src/amidi-plug/i_configure.cc:112 src/amidi-plug/i_configure.cc:120
+#: src/amidiplug/i_configure.cc:112 src/amidiplug/i_configure.cc:120
 msgid "On"
-msgstr ""
+msgstr "Zapnúť"
 
-#: src/amidi-plug/i_configure.cc:118
+#: src/amidiplug/i_configure.cc:118
 msgid "Override default chorus:"
-msgstr ""
+msgstr "Potlačiť predvolený chór:"
 
-#: src/amidi-plug/i_configure.cc:128 src/console/plugin.cc:29
+#: src/amidiplug/i_configure.cc:128 src/console/plugin.cc:29
 msgid "Playback"
-msgstr ""
+msgstr "Prehrávanie"
 
-#: src/amidi-plug/i_configure.cc:129
+#: src/amidiplug/i_configure.cc:129
 msgid "Transpose:"
-msgstr ""
+msgstr "Transponovať:"
 
-#: src/amidi-plug/i_configure.cc:131
+#: src/amidiplug/i_configure.cc:131 src/speedpitch/speed-pitch.cc:257
 msgid "semitones"
-msgstr ""
+msgstr "poltóny"
 
-#: src/amidi-plug/i_configure.cc:132
+#: src/amidiplug/i_configure.cc:132
 msgid "Drum shift:"
-msgstr ""
+msgstr "Posun bubnov"
 
-#: src/amidi-plug/i_configure.cc:134
+#: src/amidiplug/i_configure.cc:134
 msgid "note numbers"
-msgstr ""
+msgstr "čísla poznámok"
 
-#: src/amidi-plug/i_configure.cc:135
+#: src/amidiplug/i_configure.cc:135
 msgid "Skip leading silence"
-msgstr ""
+msgstr "Preskočiť ticho na začiatku"
 
-#: src/amidi-plug/i_configure.cc:137
+#: src/amidiplug/i_configure.cc:137
 msgid "Skip trailing silence"
-msgstr ""
+msgstr "Preskočiť ticho na konci"
 
-#: src/amidi-plug/i_configure.cc:141
+#: src/amidiplug/i_configure.cc:141
 msgid "SoundFont"
-msgstr ""
+msgstr "SoundFont"
 
-#: src/amidi-plug/i_configure.cc:143
+#: src/amidiplug/i_configure.cc:148
 msgid "Synthesizer"
-msgstr ""
-
-#: src/amidi-plug/i_configure.cc:148 src/console/plugin.cc:45
-#: src/sid/xs_config.cc:65
-msgid "Sample rate:"
-msgstr ""
+msgstr "Synthesizer"
 
-#: src/amidi-plug/i_configure.cc:150 src/bs2b/plugin.cc:141
-#: src/console/plugin.cc:47 src/modplug/plugin_main.cc:78
-#: src/resample/resample.cc:201 src/resample/resample.cc:207
-#: src/resample/resample.cc:211 src/resample/resample.cc:215
-#: src/resample/resample.cc:219 src/resample/resample.cc:223
-#: src/resample/resample.cc:227 src/resample/resample.cc:231
-#: src/resample/resample.cc:235 src/resample/resample.cc:239
-#: src/resample/resample.cc:243 src/sid/xs_config.cc:67
-#: src/sox-resampler/sox-resampler.cc:163
-msgid "Hz"
-msgstr "Hz"
-
-#: src/amidi-plug/i_configure-fluidsynth.cc:52
+#: src/amidiplug/i_configure-fluidsynth.cc:58
+#: src/amidiplug/i_configure-fluidsynth.cc:527
 msgid "AMIDI-Plug - select SoundFont file"
-msgstr "AMIDI-Plug - vyberte SoundFont súbor"
+msgstr "AMIDI-Plug - zvoľte SoundFont súbor"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:55 src/filewriter/mp3.cc:658
+#: src/amidiplug/i_configure-fluidsynth.cc:61
 msgid "_Cancel"
-msgstr ""
+msgstr "_Zrušiť"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:56
+#: src/amidiplug/i_configure-fluidsynth.cc:62
 msgid "_Open"
-msgstr ""
+msgstr "_Otvoriť"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:225 src/gtkui/columns.cc:46
+#: src/amidiplug/i_configure-fluidsynth.cc:233
+#: src/amidiplug/i_configure-fluidsynth.cc:461
 msgid "File name"
 msgstr "Názov súboru"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:229
+#: src/amidiplug/i_configure-fluidsynth.cc:237
+#: src/amidiplug/i_configure-fluidsynth.cc:464
 msgid "Size (bytes)"
 msgstr "Veľkosť (v bajtoch)"
 
-#: src/amidi-plug/i_fileinfo.cc:163
+#: src/amidiplug/i_fileinfo.cc:184
 msgid "Name:"
 msgstr "Názov:"
 
-#: src/amidi-plug/i_fileinfo.cc:181
+#: src/amidiplug/i_fileinfo.cc:202
 msgid " MIDI Info "
 msgstr " Podrobnosti o MIDI "
 
-#: src/amidi-plug/i_fileinfo.cc:195
+#: src/amidiplug/i_fileinfo.cc:216
 msgid "Format:"
 msgstr "Formát:"
 
-#: src/amidi-plug/i_fileinfo.cc:198
+#: src/amidiplug/i_fileinfo.cc:219
 msgid "Length (msec):"
 msgstr "Dĺžka (ms):"
 
-#: src/amidi-plug/i_fileinfo.cc:201
+#: src/amidiplug/i_fileinfo.cc:222
 msgid "No. of Tracks:"
 msgstr "Počet stôp:"
 
-#: src/amidi-plug/i_fileinfo.cc:207
+#: src/amidiplug/i_fileinfo.cc:228
 msgid "variable"
 msgstr "premenlivé"
 
-#: src/amidi-plug/i_fileinfo.cc:209
+#: src/amidiplug/i_fileinfo.cc:230
 msgid "BPM:"
 msgstr "BPM:"
 
-#: src/amidi-plug/i_fileinfo.cc:217
+#: src/amidiplug/i_fileinfo.cc:238
 msgid "BPM (wavg):"
 msgstr "BPM (váž.):"
 
-#: src/amidi-plug/i_fileinfo.cc:220
+#: src/amidiplug/i_fileinfo.cc:241
 msgid "Time Div:"
 msgstr "Čas. pomer:"
 
-#: src/amidi-plug/i_fileinfo.cc:231
+#: src/amidiplug/i_fileinfo.cc:252
 msgid " MIDI Comments and Lyrics "
-msgstr " Komentáre a slová MIDI skladby "
+msgstr " Komentáre a text MIDI skladby "
 
-#: src/amidi-plug/i_fileinfo.cc:278
+#: src/amidiplug/i_fileinfo.cc:299
 msgid "* no comments available in this MIDI file *"
 msgstr "* v MIDI súbore sa nenachádzajú žiadne komentáre *"
 
-#: src/amidi-plug/i_fileinfo.cc:290
+#: src/amidiplug/i_fileinfo.cc:311
 msgid "* no lyrics available in this MIDI file *"
 msgstr "* v MIDI súbore sa nenachádzajú žiadne texty skladby *"
 
-#: src/amidi-plug/i_fileinfo.cc:300 src/filewriter/vorbis.cc:197
-#: src/ladspa/plugin.cc:416
+#: src/amidiplug/i_fileinfo.cc:321 src/ladspa/plugin.cc:418
+#: src/ui-common/dialogs-qt.cc:32
 msgid "_Close"
 msgstr "_Zatvoriť"
 
-#: src/amidi-plug/i_fileinfo.cc:325
+#: src/amidiplug/i_fileinfo.cc:346
 msgid " (invalid UTF-8)"
 msgstr " (neplatné UTF-8)"
 
-#: src/aosd/aosd.cc:32
+#: src/ampache/ampache.cc:33
+msgid "Ampache Browser"
+msgstr "Ampache Prehliadač"
+
+#: src/ampache/ampache.cc:46
+msgid ""
+"Ampache Browser for Audacious\n"
+"http://ampache-browser.org/\n"
+"\n"
+"Copyright (C) Róbert Čerňanský and John Lindgren\n"
+"License: GNU GPLv3"
+msgstr ""
+"Ampache prehliadač pre Audacious\n"
+"http://ampache-browser.org/\n"
+"\n"
+"Copyright (C) Róbert Čerňanský a John Lindgren\n"
+"Licencia: GNU GPLv3"
+
+#: src/aosd/aosd.cc:31
 msgid ""
 "Audacious OSD\n"
 "http://www.develia.org/projects.php?p=audacious#aosd\n"
@@ -487,6 +334,13 @@
 "Based in part on Evan Martin's Ghosd library:\n"
 "http://neugierig.org/software/ghosd/"
 msgstr ""
+"Audacious OSD\n"
+"http://www.develia.org/projects.php?p=audacious#aosd\n"
+"\n"
+"Napísal Giacomo Lozito <james@develia.org>\n"
+"\n"
+"Čiastočne založené na Evan Martin's Ghosd knižnici:\n"
+"http://neugierig.org/software/ghosd/"
 
 #: src/aosd/aosd.h:37
 msgid "AOSD (On-Screen Display)"
@@ -504,130 +358,132 @@
 msgid "Concave Rectangle"
 msgstr "Konkávny obdĺžnik"
 
-#: src/aosd/aosd_style.cc:69
+#: src/aosd/aosd_style.cc:69 src/openmpt/mptwrap.h:50 src/xsf/plugin.cc:436
 msgid "None"
 msgstr "Žiadne"
 
-#: src/aosd/aosd_trigger.cc:50
+#: src/aosd/aosd_trigger.cc:49
 msgid "Playback Start"
 msgstr "Začiatok prehrávania"
 
-#: src/aosd/aosd_trigger.cc:51
+#: src/aosd/aosd_trigger.cc:50
 msgid "Triggers OSD when a playlist entry is played."
 msgstr "OSD sa zobrazí pri zahájení prehrávania položky zo zoznamu skladieb."
 
-#: src/aosd/aosd_trigger.cc:56
+#: src/aosd/aosd_trigger.cc:55
 msgid "Title Change"
 msgstr "Zmena názvu"
 
-#: src/aosd/aosd_trigger.cc:57
+#: src/aosd/aosd_trigger.cc:56
 msgid "Triggers OSD when the song title changes (for internet streams)."
 msgstr ""
+"Spustí OSD pri zmene názvu skladby\n"
+"(pre internetové streamy)"
 
-#: src/aosd/aosd_trigger.cc:62
+#: src/aosd/aosd_trigger.cc:61
 msgid "Pause On"
 msgstr "Pozastavenie prehrávania"
 
-#: src/aosd/aosd_trigger.cc:63
+#: src/aosd/aosd_trigger.cc:62
 msgid "Triggers OSD when playback is paused."
 msgstr "OSD sa zobrazí pri pozastavení prehrávania."
 
-#: src/aosd/aosd_trigger.cc:68
+#: src/aosd/aosd_trigger.cc:67
 msgid "Pause Off"
 msgstr "Obnovenie prehrávania"
 
-#: src/aosd/aosd_trigger.cc:69
+#: src/aosd/aosd_trigger.cc:68
 msgid "Triggers OSD when playback is unpaused."
 msgstr "OSD sa zobrazí keď je prehrávanie obnovené."
 
-#: src/aosd/aosd_ui.cc:163
+#: src/aosd/aosd_ui.cc:204
 msgid "Placement"
 msgstr "Umiestnenie"
 
-#: src/aosd/aosd_ui.cc:196
+#: src/aosd/aosd_ui.cc:241
 msgid "Relative X offset:"
 msgstr "Relatívne odsadenie v smere osi X:"
 
-#: src/aosd/aosd_ui.cc:203
+#: src/aosd/aosd_ui.cc:245
 msgid "Relative Y offset:"
 msgstr "Relatívne odsadenie v smere osi Y:"
 
-#: src/aosd/aosd_ui.cc:210
+#: src/aosd/aosd_ui.cc:249
 msgid "Max OSD width:"
 msgstr "Maximálna šírka OSD:"
 
-#: src/aosd/aosd_ui.cc:221
+#: src/aosd/aosd_ui.cc:281
 msgid "Multi-Monitor options"
-msgstr "Nastavenia pre viac monitorov"
+msgstr "Možnosti pre viac monitorov"
 
-#: src/aosd/aosd_ui.cc:225
+#: src/aosd/aosd_ui.cc:285
 msgid "Display OSD using:"
 msgstr "Zobraziť OSD na:"
 
-#: src/aosd/aosd_ui.cc:227
+#: src/aosd/aosd_ui.cc:287
 msgid "all monitors"
 msgstr "všetkých monitoroch"
 
-#: src/aosd/aosd_ui.cc:230
+#: src/aosd/aosd_ui.cc:290
 #, c-format
 msgid "monitor %i"
 msgstr "monitore %i"
 
-#: src/aosd/aosd_ui.cc:282
+#: src/aosd/aosd_ui.cc:342
 msgid "Timing (ms)"
 msgstr "Časovanie (ms)"
 
-#: src/aosd/aosd_ui.cc:287
+#: src/aosd/aosd_ui.cc:347
 msgid "Display:"
-msgstr "Zobrazenie:"
+msgstr "Zobraziť:"
 
-#: src/aosd/aosd_ui.cc:292
+#: src/aosd/aosd_ui.cc:352
 msgid "Fade in:"
-msgstr "Rozsvietenie:"
+msgstr "Zosvetliť:"
 
-#: src/aosd/aosd_ui.cc:297
+#: src/aosd/aosd_ui.cc:357
 msgid "Fade out:"
-msgstr "Zhasnutie:"
+msgstr "Stmavnúť:"
 
-#: src/aosd/aosd_ui.cc:361
+#: src/aosd/aosd_ui.cc:442
 msgid "Fonts"
 msgstr "Písma"
 
-#: src/aosd/aosd_ui.cc:368
+#: src/aosd/aosd_ui.cc:449
 #, c-format
 msgid "Font %i:"
 msgstr "Písmo %i:"
 
-#: src/aosd/aosd_ui.cc:382
+#: src/aosd/aosd_ui.cc:466
 msgid "Shadow"
 msgstr "Tieň"
 
-#: src/aosd/aosd_ui.cc:486
+#: src/aosd/aosd_ui.cc:589
 msgid "Render Style"
 msgstr "Štýl zobrazenia"
 
-#: src/aosd/aosd_ui.cc:502
+#: src/aosd/aosd_ui.cc:605
 msgid "Colors"
 msgstr "Farby"
 
-#: src/aosd/aosd_ui.cc:513
+#: src/aosd/aosd_ui.cc:616
 #, c-format
 msgid "Color %i:"
 msgstr "Farba %i:"
 
-#: src/aosd/aosd_ui.cc:600
+#: src/aosd/aosd_ui.cc:714
 msgid "Enable trigger"
 msgstr "Povoliť spúšťač"
 
-#: src/aosd/aosd_ui.cc:627
+#: src/aosd/aosd_ui.cc:741
 msgid "Event"
 msgstr "Udalosť"
 
-#: src/aosd/aosd_ui.cc:655
+#: src/aosd/aosd_ui.cc:768
 msgid "Composite manager detected"
 msgstr "Bol zistený kompozitný správca"
 
-#: src/aosd/aosd_ui.cc:662
+#: src/aosd/aosd_ui.cc:775
 msgid ""
 "Composite manager not detected;\n"
 "unless you know that you have one running, please activate a composite "
@@ -637,66 +493,62 @@
 "Ak viete, že žiadny nebeží, prosím, aktivujte kompozitného správcu, inak "
 "nebude OSD pracovať správne"
 
-#: src/aosd/aosd_ui.cc:670
+#: src/aosd/aosd_ui.cc:783
 msgid "Composite manager not required for fake transparency"
 msgstr "Pri falošnej priehľadnosti nie je potrebný kompozitný správca"
 
-#: src/aosd/aosd_ui.cc:706
+#: src/aosd/aosd_ui.cc:820
 msgid "Transparency"
 msgstr "Priehľadnosť"
 
-#: src/aosd/aosd_ui.cc:712
+#: src/aosd/aosd_ui.cc:826
 msgid "Fake transparency"
 msgstr "Falošná priehľadnosť"
 
-#: src/aosd/aosd_ui.cc:714
+#: src/aosd/aosd_ui.cc:828
 msgid "Real transparency (requires X Composite Ext.)"
 msgstr "Skutočná priehľadnosť (vyžaduje kompozitné rozšírenie X servera)"
 
-#: src/aosd/aosd_ui.cc:756
+#: src/aosd/aosd_ui.cc:875
 msgid "Composite extension not loaded"
 msgstr "Kompozitné rozšírenie nie je načítané"
 
-#: src/aosd/aosd_ui.cc:764
-msgid "Composite extension not available"
-msgstr "Kompozitné rozšírenie nie je dostupné"
-
-#: src/aosd/aosd_ui.cc:781
+#: src/aosd/aosd_ui.cc:892
 #, c-format
 msgid "Audacious OSD"
 msgstr "OSD Audacious"
 
-#: src/aosd/aosd_ui.cc:844
+#: src/aosd/aosd_ui.cc:955
 msgid "Position"
 msgstr "Umiestnenie"
 
-#: src/aosd/aosd_ui.cc:849
+#: src/aosd/aosd_ui.cc:960
 msgid "Animation"
 msgstr "Animácia"
 
-#: src/aosd/aosd_ui.cc:854
+#: src/aosd/aosd_ui.cc:965
 msgid "Text"
 msgstr "Text"
 
-#: src/aosd/aosd_ui.cc:859
+#: src/aosd/aosd_ui.cc:970
 msgid "Decoration"
 msgstr "Výzdoba"
 
-#: src/aosd/aosd_ui.cc:864
+#: src/aosd/aosd_ui.cc:975
 msgid "Trigger"
 msgstr "Spúšťač"
 
-#: src/aosd/aosd_ui.cc:869
+#: src/aosd/aosd_ui.cc:980 src/streamtuner/shoutcast-model.cc:202
 msgid "Misc"
 msgstr "Rôzne"
 
-#: src/aosd/aosd_ui.cc:878
+#: src/aosd/aosd_ui.cc:989
 msgid "Test"
-msgstr ""
+msgstr "Test"
 
 #: src/asx3/asx3.cc:35
 msgid "ASXv3 Playlists"
-msgstr ""
+msgstr "Zoznamy skladieb ASXv3"
 
 #: src/asx/asx.cc:33
 msgid "ASXv1/ASXv2 Playlists"
@@ -706,11 +558,83 @@
 msgid "Audacious Playlists (audpl)"
 msgstr "Audacious zoznamy skladieb (audpl)"
 
-#: src/blur_scope/blur_scope.cc:42
+#: src/background_music/background_music.cc:24
+msgid "Background music"
+msgstr ""
+
+#: src/background_music/background_music.cc:25
+msgid "Target level:"
+msgstr ""
+
+#: src/background_music/background_music.cc:28
+#: src/background_music/background_music.cc:33
+#: src/silence-removal/silence-removal.cc:70
+msgid "dB"
+msgstr "dB"
+
+#: src/background_music/background_music.cc:29
+msgid "Maximum amplification:"
+msgstr ""
+
+#: src/background_music/background_music.cc:34 src/mpg123/mpg123.cc:81
+msgid "Advanced"
+msgstr "Rozšírené"
+
+#: src/background_music/background_music.cc:36
+msgid "Slow detection weight:"
+msgstr ""
+
+#: src/background_music/background_music.cc:39
+msgid "Hint"
+msgstr ""
+
+#: src/background_music/background_music.cc:41
+msgid ""
+"Slow detection weight is the relative weight\n"
+"of a long term average detection when compared\n"
+"to the actual, faster loudness detection.\n"
+"A value of zero gives a more radio-like sound\n"
+"where soft passages get \"pulled up\" more quickly,\n"
+"a value of two makes the sound feel less compressed."
+msgstr ""
+
+#: src/background_music/background_music.cc:52
+msgid ""
+"Background Music Plugin for Audacious\n"
+"Copyright 2023;2024 Michel Fleur\n"
+"\n"
+"Controls the volume to make the sound equally loud within and between "
+"tracks.\n"
+" It uses accurate loudness measurement and tries to make the volume changes "
+"sound natural without audible peaks, yet without lowering the volume before "
+"a peak in advance."
+msgstr ""
+
+#: src/background_music/background_music.cc:61
+msgid "Background Music"
+msgstr ""
+
+#: src/bitcrusher/bitcrusher.cc:33
+msgid "Bitcrusher"
+msgstr ""
+
+#: src/bitcrusher/bitcrusher.cc:34
+msgid "Bit Depth:"
+msgstr ""
+
+#: src/bitcrusher/bitcrusher.cc:37
+msgid "Downsample ratio:"
+msgstr ""
+
+#: src/bitcrusher/bitcrusher.cc:48
+msgid "Bitcrusher"
+msgstr ""
+
+#: src/blur_scope/blur_scope.cc:40 src/blur_scope-qt/blur_scope.cc:45
 msgid "Color"
 msgstr "Farba"
 
-#: src/blur_scope/blur_scope.cc:58
+#: src/blur_scope/blur_scope.cc:56 src/blur_scope-qt/blur_scope.cc:158
 msgid "Blur Scope"
 msgstr "Rozsah rozostrenia"
 
@@ -722,27 +646,31 @@
 msgid "Presets:"
 msgstr "Predvoľby:"
 
+#: src/bs2b/plugin.cc:130
+msgid "Default"
+msgstr "Predvolené"
+
 #: src/bs2b/plugin.cc:136
 msgid "Feed level:"
 msgstr "Úroveň zdroja:"
 
 #: src/bs2b/plugin.cc:138
 msgid "x1/10 dB"
-msgstr ""
+msgstr "x1/10 dB"
 
 #: src/bs2b/plugin.cc:139
 msgid "Cut frequency:"
 msgstr "Frekvencia pre vystrihnutie:"
 
-#: src/cairo-spectrum/cairo-spectrum.cc:41
+#: src/cairo-spectrum/cairo-spectrum.cc:42 src/qt-spectrum/qt-spectrum.cc:107
 msgid "Spectrum Analyzer"
-msgstr "Analyzér spektra"
+msgstr "Analyzátor spektra"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:72
+#: src/cdaudio/cdaudio-ng.cc:74
 msgid "Audio CD Plugin"
 msgstr "Audio CD zásuvný modul"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:121
+#: src/cdaudio/cdaudio-ng.cc:121
 msgid ""
 "Copyright (C) 2007-2012 Calin Crisan <ccrisan@gmail.com> and others.\n"
 "\n"
@@ -762,132 +690,132 @@
 "\n"
 "Toto bol Google Summer of Code 2007 projekt."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:137
+#: src/cdaudio/cdaudio-ng.cc:140
 msgid "Device"
 msgstr "Zariadenia"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:138
+#: src/cdaudio/cdaudio-ng.cc:141
 msgid "Read speed:"
 msgstr "Rýchlosť disku:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:141
+#: src/cdaudio/cdaudio-ng.cc:144
 msgid "Override device:"
 msgstr "Prepísať zariadenie:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:143
+#: src/cdaudio/cdaudio-ng.cc:146
 msgid "Metadata"
-msgstr "&lt;b&gt;Metadáta&lt;/b&gt;"
+msgstr "Metadáta"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:144
+#: src/cdaudio/cdaudio-ng.cc:147
 msgid "Use CD-Text"
 msgstr "Použiť CD-Text"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:146
+#: src/cdaudio/cdaudio-ng.cc:150
 msgid "Use CDDB"
 msgstr "Použiť CDDB"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:148
+#: src/cdaudio/cdaudio-ng.cc:152
 msgid "Use HTTP instead of CDDBP"
 msgstr "Namiesto CDDBP použiť HTTP"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:151
+#: src/cdaudio/cdaudio-ng.cc:155
 msgid "Server:"
 msgstr "Server: "
 
-#: src/cdaudio-ng/cdaudio-ng.cc:155
+#: src/cdaudio/cdaudio-ng.cc:159
 msgid "Path:"
 msgstr "Cesta: "
 
-#: src/cdaudio-ng/cdaudio-ng.cc:159
+#: src/cdaudio/cdaudio-ng.cc:163
 msgid "Port:"
 msgstr "Port: "
 
-#: src/cdaudio-ng/cdaudio-ng.cc:246
+#: src/cdaudio/cdaudio-ng.cc:228
 msgid "Failed to initialize cdio subsystem."
 msgstr "Zlyhala inicializácia cdio podsystému."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:281
+#: src/cdaudio/cdaudio-ng.cc:260
 #, c-format
 msgid "Invalid URI %s."
 msgstr "Neplatná URI %s."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:283
+#: src/cdaudio/cdaudio-ng.cc:262
 #, c-format
 msgid "Track %d not found."
 msgstr "Stopa %d sa nenašla."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:285
+#: src/cdaudio/cdaudio-ng.cc:264
 #, c-format
 msgid "Track %d is a data track."
 msgstr "Stopa %d je dátová stopa."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:360
+#: src/cdaudio/cdaudio-ng.cc:339
 msgid "Error reading audio CD."
 msgstr "Chyba pri čítaní audio CD."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:429
+#: src/cdaudio/cdaudio-ng.cc:410
 msgid "Audio CD"
 msgstr "Zvukové CD"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:460 src/cdaudio-ng/cdaudio-ng.cc:469
+#: src/cdaudio/cdaudio-ng.cc:446 src/cdaudio/cdaudio-ng.cc:455
 #, c-format
 msgid "Failed to open CD device %s."
 msgstr "Zlyhalo CD zariadenie %s."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:472
+#: src/cdaudio/cdaudio-ng.cc:458
 msgid "No audio capable CD drive found."
-msgstr "Nebolo nájdené žiadne spôsobilé CD zariadenie."
+msgstr "Nebolo nájdené žiadne vhodné CD zariadenie."
+
+#: src/cdaudio/cdaudio-ng.cc:481
+msgid "Drive is empty."
+msgstr "Mechanika je prázdna."
+
+#: src/cdaudio/cdaudio-ng.cc:483
+msgid "Unsupported disk type."
+msgstr "Nepodporovaný typ disku."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:497
+#: src/cdaudio/cdaudio-ng.cc:507
 msgid "Failed to finish initializing opened CD drive."
-msgstr "Zlyhalo dokončenie inicializácie otvoreného CD zariadenia."
+msgstr "Zlyhalo dokončenie inicializácie otvorenia CD zariadenia."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:510
+#: src/cdaudio/cdaudio-ng.cc:520
 msgid "Failed to retrieve first/last track number."
 msgstr "Zlyhalo načítanie prvého/posledného čísla skladby."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:531
+#: src/cdaudio/cdaudio-ng.cc:541
 #, 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.cc:613
-msgid "Failed to create the cddb connection."
-msgstr "Zlyhalo vytvorenie cddb pripojenia."
+#: src/cdaudio/cdaudio-ng.cc:624
+msgid "Failed to create the CDDB connection."
+msgstr "Zlyhalo pripojenie k CDDB databáze"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:679
+#: src/cdaudio/cdaudio-ng.cc:690
 msgid "Failed to query the CDDB server"
 msgstr "Nepodaril sa dotaz na CDDB server"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:681
+#: src/cdaudio/cdaudio-ng.cc:692
 #, c-format
 msgid "Failed to query the CDDB server: %s"
 msgstr "Nepodaril sa dotaz na CDDB server: %s"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:705
+#: src/cdaudio/cdaudio-ng.cc:716
 #, c-format
-msgid "Failed to read the cddb info: %s"
-msgstr "Zlyhalo načítanie cddb info: %s"
-
-#: src/cdaudio-ng/cdaudio-ng.cc:765
-msgid "Drive is empty."
-msgstr "Mechanika je prázdna."
-
-#: src/cdaudio-ng/cdaudio-ng.cc:767
-msgid "Unsupported disk type."
-msgstr "Nepodporovaný typ disku."
+msgid "Failed to read the CDDB info: %s"
+msgstr ""
 
-#: src/cd-menu-items/cd-menu-items.cc:35
+#: src/cd-menu-items/cd-menu-items.cc:33
 msgid "Audio CD Menu Items"
 msgstr "Položky Audio CD menu"
 
-#: src/cd-menu-items/cd-menu-items.cc:47
-msgid "Play CD"
-msgstr "Prehrať CD"
-
-#: src/cd-menu-items/cd-menu-items.cc:47
-msgid "Add CD"
-msgstr "Pridať CD"
+#: src/cd-menu-items/cd-menu-items.cc:45
+msgid "Pla_y CD"
+msgstr ""
+
+#: src/cd-menu-items/cd-menu-items.cc:45
+msgid "_Add CD"
+msgstr ""
 
 #: src/compressor/compressor.cc:45
 msgid "Compression"
@@ -906,6 +834,8 @@
 "Dynamic Range Compression Plugin for Audacious\n"
 "Copyright 2010-2014 John Lindgren"
 msgstr ""
+"Zásuvný modul kompresie dynamického rozsahu pre Audacious\n"
+"Copyright 2010-2014 John Lindgren"
 
 #: src/compressor/compressor.cc:64
 msgid "Dynamic Range Compressor"
@@ -937,15 +867,22 @@
 
 #: src/console/plugin.cc:36
 msgid "Echo:"
-msgstr ""
+msgstr "Ozvena"
 
 #: src/console/plugin.cc:39
 msgid "Default song length:"
 msgstr "Predvolená dĺžka skladby:"
 
-#: src/console/plugin.cc:42 src/modplug/plugin_main.cc:59
+#: src/console/plugin.cc:41 src/crossfade/crossfade.cc:56
+#: src/crossfade/crossfade.cc:62 src/lirc/lirc.cc:395 src/notify/notify.cc:113
+#: src/sid/xs_config.cc:85 src/sid/xs_config.cc:94 src/sid/xs_config.cc:103
+#: src/vumeter-qt/vumeter_qt.cc:39
+msgid "seconds"
+msgstr "sekúnd"
+
+#: src/console/plugin.cc:42 src/modplug/plugin_main.cc:58
 msgid "Resampling"
-msgstr ""
+msgstr "Prevzorkovanie"
 
 #: src/console/plugin.cc:43
 msgid "Enable audio resampling"
@@ -953,7 +890,7 @@
 
 #: src/console/plugin.cc:49
 msgid "SPC"
-msgstr ""
+msgstr "SPC"
 
 #: src/console/plugin.cc:50
 msgid "Ignore length from SPC tags"
@@ -967,77 +904,85 @@
 msgid "Game Console Music Decoder"
 msgstr "Dekodér konzolovej hudby"
 
-#: src/coreaudio/coreaudio.cc:50
+#: src/coreaudio/coreaudio.cc:53
 msgid "CoreAudio output"
-msgstr ""
+msgstr "CoreAudio výstup"
 
-#: src/coreaudio/coreaudio.cc:131
+#: src/coreaudio/coreaudio.cc:155
 msgid ""
 "CoreAudio Output Plugin for Audacious\n"
 "Copyright 2014 William Pitcock\n"
+"Copyright 2017,18 René J.V. Bertin\n"
+" (original code and code adapted from\n"
+" Apple examples, (C) Apple 2013)\n"
 "\n"
 "Based on SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
 msgstr ""
 
-#: src/coreaudio/coreaudio.cc:143
+#: src/coreaudio/coreaudio.cc:171
 msgid "Use exclusive mode"
+msgstr "Použite exkluzívny mód"
+
+#: src/coreaudio/coreaudio.cc:173
+msgid "Use bit perfect audio (adapt device sampling rate)"
 msgstr ""
 
-#: src/crossfade/crossfade.cc:44
+#: src/crossfade/crossfade.cc:47
 msgid ""
 "Crossfade Plugin for Audacious\n"
 "Copyright 2010-2014 John Lindgren"
 msgstr ""
+"Prelínanie - zásuvný modul pre Audacious\n"
+"Copyright 2010-2014 John Lindgren"
 
-#: src/crossfade/crossfade.cc:48
+#: src/crossfade/crossfade.cc:51
 msgid "Crossfade"
 msgstr "Prelínanie"
 
-#: src/crossfade/crossfade.cc:49
+#: src/crossfade/crossfade.cc:52
 msgid "On automatic song change"
-msgstr ""
+msgstr "Pri automatickej zmene skladby"
 
-#: src/crossfade/crossfade.cc:51 src/crossfade/crossfade.cc:57
+#: src/crossfade/crossfade.cc:54 src/crossfade/crossfade.cc:60
 msgid "Overlap:"
 msgstr "Prekrývanie:"
 
-#: src/crossfade/crossfade.cc:55
+#: src/crossfade/crossfade.cc:58
 msgid "On seek or manual song change"
+msgstr "Pri vyhľadávaní alebo pri ručnej zmene skladby"
+
+#: src/crossfade/crossfade.cc:64
+msgid "No fade in"
 msgstr ""
 
-#: src/crossfade/crossfade.cc:61
-msgid "Tip"
+#: src/crossfade/crossfade.cc:66
+msgid "Use S-curve fade"
 msgstr ""
 
-#: src/crossfade/crossfade.cc:62
-msgid ""
-"For better crossfading, enable\n"
-"the Silence Removal effect."
+#: src/crossfade/crossfade.cc:68
+msgid "S-curve steepness:"
+msgstr ""
+
+#: src/crossfade/crossfade.cc:70
+msgid "(higher is steeper)"
 msgstr ""
 
 #: src/crossfade/crossfade.cc:72
-msgid "Crossfade"
-msgstr "Prelínanie"
+msgid "Tip"
+msgstr "Tip"
 
-#: src/crossfade/crossfade.cc:161
+#: src/crossfade/crossfade.cc:73
 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."
+"For better crossfading, enable\n"
+"the Silence Removal effect."
 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."
+"Pre lepšie prelínanie, povoľte\n"
+"efekt odstránenia ticha."
 
-#: src/crossfade/crossfade.cc:168
-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"
-"\n"
-"Na prevzorkovanie skladieb na rovnakú frekvenciu môžete použiť efektový "
-"modul „Konvertor vzorkovacej frekvencie“."
+#: src/crossfade/crossfade.cc:83
+msgid "Crossfade"
+msgstr "Prelínanie"
 
 #: src/crystalizer/crystalizer.cc:31
 msgid "Crystalizer"
@@ -1049,64 +994,65 @@
 
 #: src/crystalizer/crystalizer.cc:43
 msgid "Crystalizer"
-msgstr "Crystalizer"
+msgstr "Krystalizér"
 
-#: src/cue/cue.cc:37
+#: src/cue/cue.cc:42
 msgid "Cue Sheet Plugin"
 msgstr "Cue Sheet zásuvný modul"
 
-#: src/delete-files/delete-files.cc:46 src/delete-files/delete-files.cc:146
+#: src/delete-files/delete-files.cc:53 src/delete-files/delete-files.cc:215
+#: src/delete-files/delete-files.cc:230
 msgid "Delete Files"
+msgstr "Odstrániť súbory"
+
+#: src/delete-files/delete-files.cc:120
+msgid "No files are selected."
 msgstr ""
 
-#: src/delete-files/delete-files.cc:75
+#: src/delete-files/delete-files.cc:125
 #, c-format
-msgid "Error moving %s to trash: %s."
+msgid "Do you want to move %s to the trash?"
 msgstr ""
 
-#: src/delete-files/delete-files.cc:86
+#: src/delete-files/delete-files.cc:126
 #, c-format
-msgid "Error deleting %s: %s."
+msgid "Do you want to permanently delete %s?"
 msgstr ""
 
-#: src/delete-files/delete-files.cc:117
+#: src/delete-files/delete-files.cc:133
 #, c-format
-msgid "Error deleting %s: not a local file."
+msgid "Do you want to move %d files to the trash?"
 msgstr ""
 
 #: src/delete-files/delete-files.cc:134
-msgid "Do you want to move the selected files to the trash?"
-msgstr ""
-
-#: src/delete-files/delete-files.cc:135
-msgid "Move to Trash"
+#, c-format
+msgid "Do you want to permanently delete %d files?"
 msgstr ""
 
-#: src/delete-files/delete-files.cc:140
-msgid "Do you want to permanently delete the selected files?"
+#: src/delete-files/delete-files.cc:146
+msgid "Move to trash"
 msgstr ""
 
-#: src/delete-files/delete-files.cc:141 src/skins/preset-list.cc:411
-#: src/skins/preset-list.cc:427
+#: src/delete-files/delete-files.cc:146
 msgid "Delete"
-msgstr "Vymazať"
+msgstr "Odstrániť"
 
-#: src/delete-files/delete-files.cc:145 src/skins/preset-browser.cc:56
-#: src/skins/preset-list.cc:307 src/skins/ui_playlist.cc:221
+#: src/delete-files/delete-files.cc:213 src/delete-files/delete-files.cc:235
+#: src/skins-qt/search-select.cc:102 src/skins/search-select.cc:78
 msgid "Cancel"
 msgstr "Zrušiť"
 
-#: src/delete-files/delete-files.cc:166
+#: src/delete-files/delete-files.cc:267
 msgid "Delete Selected Files"
-msgstr ""
+msgstr "Odstrániť zvolené súbory"
 
-#: src/delete-files/delete-files.cc:181
+#: src/delete-files/delete-files.cc:287
 msgid "Delete Method"
-msgstr ""
+msgstr "Metóda odstraňovania"
 
-#: src/delete-files/delete-files.cc:182
+#: src/delete-files/delete-files.cc:288
 msgid "Move to trash instead of deleting immediately"
-msgstr ""
+msgstr "Namiesto okamžitého odstránenia presunúť do koša"
 
 #: src/echo_plugin/echo.cc:9
 msgid ""
@@ -1115,18 +1061,22 @@
 "Surround echo by Carl van Schaik, 1999\n"
 "Updated for Audacious by William Pitcock and John Lindgren, 2010-2014"
 msgstr ""
+"Zásuvný modul ozvena\n"
+"Od Johan Levin, 1999\n"
+"Priestorová ozvena od Carl van Schaik, 1999\n"
+"Pre Audacious aktualizovali William Pitcock a John Lindgren, 2010-2014"
 
 #: src/echo_plugin/echo.cc:21
 msgid "Echo"
 msgstr "Ozvena"
 
-#: src/echo_plugin/echo.cc:22 src/modplug/plugin_main.cc:73
-#: src/modplug/plugin_main.cc:83
+#: src/echo_plugin/echo.cc:22 src/modplug/plugin_main.cc:72
+#: src/modplug/plugin_main.cc:82
 msgid "Delay:"
 msgstr "Oneskorenie:"
 
-#: src/echo_plugin/echo.cc:24 src/modplug/plugin_main.cc:73
-#: src/modplug/plugin_main.cc:83
+#: src/echo_plugin/echo.cc:24 src/modplug/plugin_main.cc:72
+#: src/modplug/plugin_main.cc:82 src/xsf/plugin.cc:445
 msgid "ms"
 msgstr "ms"
 
@@ -1134,7 +1084,7 @@
 msgid "Feedback:"
 msgstr "Spätná väzba:"
 
-#: src/echo_plugin/echo.cc:28 src/modplug/plugin_main.cc:87
+#: src/echo_plugin/echo.cc:28 src/modplug/plugin_main.cc:86
 msgid "Volume:"
 msgstr "Hlasitosť:"
 
@@ -1142,11 +1092,11 @@
 msgid "Echo"
 msgstr "Ozvena"
 
-#: src/ffaudio/ffaudio-core.cc:41
+#: src/ffaudio/ffaudio-core.cc:50
 msgid "FFmpeg Plugin"
 msgstr "FFmpeg zásuvný modul"
 
-#: src/ffaudio/ffaudio-core.cc:571
+#: src/ffaudio/ffaudio-core.cc:649
 msgid ""
 "Multi-format audio decoding plugin for Audacious using\n"
 "FFmpeg multimedia framework (http://www.ffmpeg.org/)\n"
@@ -1163,249 +1113,321 @@
 "William Pitcock <nenolod@nenolod.net>\n"
 "Matti Hämäläinen <ccr@tnsp.org>"
 
-#: src/filewriter/filewriter.cc:45
+#: src/filewriter/filewriter.cc:48
 msgid "FileWriter Plugin"
-msgstr "Zápis do súboru zásuvný modul"
+msgstr "Zásuvný modul FileWriter"
 
-#: src/filewriter/filewriter.cc:386
+#: src/filewriter/filewriter.cc:316
+#, c-format
+msgid ""
+"Error opening %s:\n"
+"%s"
+msgstr ""
+"Nastala chyba počas otvárania %s:\n"
+"%s"
+
+#: src/filewriter/filewriter.cc:358
+msgid ""
+"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 ""
+"Tento program je slobodný softvér: môžete ho šíriť a/alebo upravovať podľa "
+"podmienok GNU General Public License publikovanou Free Software Foundation; "
+"a to buď verzie 2 tejto licencie alebo (podľa vlastného zváženia) "
+"ktorejkoľvek novšej verzie.\n"
+"\n"
+"Tento program je šírený v nádeji, že bude užitočný, ale BEZ AKEJKOĽVEK "
+"ZÁRUKY; dokonca aj bez predpokladanej záruky PREDAJNOSTI alebo VHODNOSTI PRE "
+"KONKRÉTNY ÚČEL. Pre bližšie podrobnosti sa pozrite na GNU General Public "
+"License.\n"
+"\n"
+"Spolu s týmto programom by ste mali obdržať aj kópiu GNU General Public "
+"License. Ak tomu tak nieje napíšte do Free Software Foundation, Inc., 51 "
+"Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
+
+#: src/filewriter/filewriter.cc:385
 msgid "Output file format:"
 msgstr "Formát výstupného súboru:"
 
-#: src/filewriter/filewriter.cc:403
-msgid "Configure"
-msgstr "Nastaviť"
-
-#: src/filewriter/filewriter.cc:413
+#: src/filewriter/filewriter.cc:389
 msgid "Save into original directory"
-msgstr "Ukladať do pôvodného adresára"
+msgstr "Uložiť do pôvodného priečinka"
+
+#: src/filewriter/filewriter.cc:392
+msgid "Save into custom directory:"
+msgstr "Uložiť do vlastného priečinka:"
+
+#: src/filewriter/filewriter.cc:400
+msgid "Generate file name from:"
+msgstr "Vygenerovať názov súboru z:"
+
+#: src/filewriter/filewriter.cc:401
+msgid "Original file name"
+msgstr "Pôvodný názov súboru"
+
+#: src/filewriter/filewriter.cc:404
+msgid "Original file name (no suffix)"
+msgstr "Pôvodný názov súboru (bez prípony)"
+
+#: src/filewriter/filewriter.cc:407
+msgid "Original file tag"
+msgstr "Pôvodná značka súboru"
+
+#: src/filewriter/filewriter.cc:411
+msgid "Prepend track number to file name"
+msgstr "Pridať číslo stopy pred názov súboru"
+
+#: src/filewriter/filewriter.cc:417 src/filewriter/filewriter.cc:449
+msgid "Auto"
+msgstr "Auto"
+
+#: src/filewriter/filewriter.cc:418
+msgid "8000 Hz"
+msgstr "8000 Hz"
+
+#: src/filewriter/filewriter.cc:419
+msgid "11025 Hz"
+msgstr "11025 Hz"
+
+#: src/filewriter/filewriter.cc:420
+msgid "12000 Hz"
+msgstr "12000 Hz"
+
+#: src/filewriter/filewriter.cc:421
+msgid "16000 Hz"
+msgstr "16000 Hz"
+
+#: src/filewriter/filewriter.cc:422
+msgid "22050 Hz"
+msgstr "22050 Hz"
+
+#: src/filewriter/filewriter.cc:423
+msgid "24000 Hz"
+msgstr "24000 Hz"
+
+#: src/filewriter/filewriter.cc:424
+msgid "32000 Hz"
+msgstr "32000 Hz"
+
+#: src/filewriter/filewriter.cc:425 src/xsf/plugin.cc:430
+msgid "44100 Hz"
+msgstr "44100 Hz"
+
+#: src/filewriter/filewriter.cc:426 src/xsf/plugin.cc:431
+msgid "48000 Hz"
+msgstr "48000 Hz"
 
-#: src/filewriter/filewriter.cc:417
-msgid "Save into custom directory"
-msgstr "Ukladať do vlastného adresára"
-
-#: src/filewriter/filewriter.cc:427
-msgid "Output file folder:"
-msgstr "Priečinok s výstupnými súbormi:"
+#: src/filewriter/filewriter.cc:430
+msgid "8 kbit/s"
+msgstr ""
 
 #: src/filewriter/filewriter.cc:431
-msgid "Pick a folder"
-msgstr "Vybrať priečinok"
+msgid "16 kbit/s"
+msgstr ""
 
-#: src/filewriter/filewriter.cc:444
-msgid "Generate file name from:"
+#: src/filewriter/filewriter.cc:432
+msgid "32 kbit/s"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:448
-msgid "Original file tag"
+#: src/filewriter/filewriter.cc:433
+msgid "40 kbit/s"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:453
-msgid "Original file name"
+#: src/filewriter/filewriter.cc:434
+msgid "48 kbit/s"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:459
-msgid "Include original file name extension"
+#: src/filewriter/filewriter.cc:435
+msgid "56 kbit/s"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:468
-msgid "Prepend track number to file name"
+#: src/filewriter/filewriter.cc:436
+msgid "64 kbit/s"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:484
-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.cc:437
+msgid "80 kbit/s"
+msgstr ""
 
-#: src/filewriter/mp3.cc:40 src/filewriter/mp3.cc:717
-msgid "Auto"
-msgstr "Auto"
+#: src/filewriter/filewriter.cc:438
+msgid "96 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:439
+msgid "112 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:440
+msgid "128 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:441
+msgid "160 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:442
+msgid "192 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:443
+msgid "224 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:444
+msgid "256 kbit/s"
+msgstr ""
 
-#: src/filewriter/mp3.cc:40
+#: src/filewriter/filewriter.cc:445
+msgid "320 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:450
 msgid "Joint Stereo"
 msgstr "Joint Stereo"
 
-#: src/filewriter/mp3.cc:41 src/modplug/plugin_main.cc:58
-#: src/mpg123/mpg123.cc:248
+#: src/filewriter/filewriter.cc:451 src/modplug/plugin_main.cc:57
+#: src/mpg123/mpg123.cc:259
 msgid "Stereo"
 msgstr "Stereo"
 
-#: src/filewriter/mp3.cc:41 src/modplug/plugin_main.cc:57
-#: src/mpg123/mpg123.cc:248
+#: src/filewriter/filewriter.cc:452 src/modplug/plugin_main.cc:56
+#: src/mpg123/mpg123.cc:260
 msgid "Mono"
 msgstr "Mono"
 
-#: src/filewriter/mp3.cc:657
-msgid "MP3 Configuration"
-msgstr "Nastavenie MP3"
-
-#: src/filewriter/mp3.cc:658
-msgid "_OK"
-msgstr ""
+#: src/filewriter/filewriter.cc:456
+msgid "VBR"
+msgstr "VBR"
+
+#: src/filewriter/filewriter.cc:457
+msgid "ABR"
+msgstr "ABR"
 
-#: src/filewriter/mp3.cc:681
-msgid "Algorithm Quality:"
+#: src/filewriter/filewriter.cc:478
+msgid "Algorithm quality:"
 msgstr "Kvalita algoritmu:"
 
-#: src/filewriter/mp3.cc:706
-msgid "Output Sample Rate:"
-msgstr ""
-
-#: src/filewriter/mp3.cc:733
-msgid "(Hz)"
-msgstr "(Hz)"
-
-#: src/filewriter/mp3.cc:740
-msgid "Bitrate / Compression Ratio:"
-msgstr ""
-
-#: src/filewriter/mp3.cc:764
-msgid "Bitrate (kbps):"
-msgstr "Dátový tok (kb/s):"
+#: src/filewriter/filewriter.cc:484
+msgid "Bitrate:"
+msgstr "Dátový tok:"
 
-#: src/filewriter/mp3.cc:796
+#: src/filewriter/filewriter.cc:491
 msgid "Compression ratio:"
 msgstr "Kompresný pomer:"
 
-#: src/filewriter/mp3.cc:820
-msgid "Audio Mode:"
-msgstr "Zvukový režim:"
+#: src/filewriter/filewriter.cc:498
+msgid "Audio mode:"
+msgstr "Režim zvuku:"
 
-#: src/filewriter/mp3.cc:845
-msgid "Miscellaneous:"
-msgstr ""
-
-#: src/filewriter/mp3.cc:856
+#: src/filewriter/filewriter.cc:501
 msgid "Enforce strict ISO compliance"
-msgstr ""
+msgstr "vynútiť si prísnu zhodu s ISO"
 
-#: src/filewriter/mp3.cc:867
+#: src/filewriter/filewriter.cc:503
 msgid "Error protection"
 msgstr "Ochrana pred chybami"
 
-#: src/filewriter/mp3.cc:879 src/filewriter/vorbis.cc:206
-msgid "Quality"
-msgstr "Kvalita"
-
-#: src/filewriter/mp3.cc:888
+#: src/filewriter/filewriter.cc:508
 msgid "Enable VBR/ABR"
 msgstr "Povoliť VBR/ABR"
 
-#: src/filewriter/mp3.cc:898
+#: src/filewriter/filewriter.cc:510
 msgid "Type:"
 msgstr "Typ:"
 
-#: src/filewriter/mp3.cc:931
-msgid "VBR Options:"
-msgstr "Nastavenia VBR:"
-
-#: src/filewriter/mp3.cc:947
-msgid "Minimum bitrate (kbps):"
-msgstr "Najmenší dátový tok (kb/s):"
-
-#: src/filewriter/mp3.cc:973
-msgid "Maximum bitrate (kbps):"
-msgstr "Najväčší dátový tok (kb/s):"
-
-#: src/filewriter/mp3.cc:995
-msgid "Strictly enforce minimum bitrate"
-msgstr "Prísne vynucovať najmenší dátový tok"
-
-#: src/filewriter/mp3.cc:1007
-msgid "ABR Options:"
-msgstr "Nastavenia ABR:"
-
-#: src/filewriter/mp3.cc:1017
-msgid "Average bitrate (kbps):"
-msgstr "Priemerný dátový tok (kb/s):"
+#: src/filewriter/filewriter.cc:514
+msgid "Minimum bitrate:"
+msgstr "Minimálny dátový tok:"
+
+#: src/filewriter/filewriter.cc:518
+msgid "Maximum bitrate:"
+msgstr "Maximálny dátový tok:"
+
+#: src/filewriter/filewriter.cc:522
+msgid "Average bitrate:"
+msgstr "Priemerný dátový tok:"
 
-#: src/filewriter/mp3.cc:1044
+#: src/filewriter/filewriter.cc:526
 msgid "VBR quality level:"
 msgstr "Úroveň kvality VBR:"
 
-#: src/filewriter/mp3.cc:1063
-msgid "Omit Xing VBR header"
-msgstr ""
+#: src/filewriter/filewriter.cc:530
+msgid "Strictly enforce minimum bitrate"
+msgstr "Prísne vynucovať najmenší dátový tok"
 
-#: src/filewriter/mp3.cc:1076
-msgid "VBR/ABR"
-msgstr "VBR/ABR"
+#: src/filewriter/filewriter.cc:533
+msgid "Omit Xing VBR header"
+msgstr "Vynechať Xing VBR hlavičku"
 
-#: src/filewriter/mp3.cc:1085
-msgid "Frame Parameters:"
-msgstr ""
+#: src/filewriter/filewriter.cc:539
+msgid "Frame Headers"
+msgstr "Hlavičky rámcov"
 
-#: src/filewriter/mp3.cc:1097
+#: src/filewriter/filewriter.cc:540
 msgid "Mark as copyright"
 msgstr "Pridať označenie autorských práv"
 
-#: src/filewriter/mp3.cc:1108
+#: src/filewriter/filewriter.cc:542
 msgid "Mark as original"
 msgstr "Pridať označenie originálu"
 
-#: src/filewriter/mp3.cc:1120
-msgid "ID3 Parameters:"
-msgstr ""
+#: src/filewriter/filewriter.cc:544
+msgid "ID3 Tags"
+msgstr "ID3 Tags"
 
-#: src/filewriter/mp3.cc:1131
+#: src/filewriter/filewriter.cc:545
 msgid "Force addition of version 2 tag"
 msgstr "Vynútiť pridanie značiek verzie 2"
 
-#: src/filewriter/mp3.cc:1141
+#: src/filewriter/filewriter.cc:547
 msgid "Only add v1 tag"
 msgstr "Pridávať iba značky verzie 1"
 
-#: src/filewriter/mp3.cc:1148
+#: src/filewriter/filewriter.cc:549
 msgid "Only add v2 tag"
 msgstr "Pridávať iba značky verzie 2"
 
-#: src/filewriter/mp3.cc:1169
+#: src/filewriter/filewriter.cc:554
+msgid "Quality"
+msgstr "Kvalita"
+
+#: src/filewriter/filewriter.cc:555
+msgid "VBR/ABR"
+msgstr "VBR/ABR"
+
+#: src/filewriter/filewriter.cc:556
 msgid "Tags"
 msgstr "Značky"
 
-#: src/filewriter/vorbis.cc:196
-msgid "Vorbis Encoder Configuration"
-msgstr "Nastavenie kodéra Vorbis"
-
-#: src/filewriter/vorbis.cc:219
-msgid "Quality level (0 - 10):"
-msgstr "Úroveň kvality (0-10):"
+#: src/filewriter/filewriter.cc:566
+msgid "Quality (0-1):"
+msgstr "Kvalita (0-1):"
+
+#: src/filewriter/filewriter.cc:573 src/skins-qt/skins_cfg.cc:307
+#: src/skins/skins_cfg.cc:289
+msgid "General"
+msgstr "Všeobecné"
 
-#: src/flacng/flacng.h:35
+#: src/flac/flacng.h:36
 msgid "FLAC Decoder"
 msgstr "FLAC dekodér"
 
-#: src/flacng/metadata.cc:351 src/wavpack/wavpack.cc:209
+#: src/flac/metadata.cc:296 src/wavpack/wavpack.cc:215
 msgid "lossless"
 msgstr "bezstratový"
 
-#: src/flacng/plugin.cc:169
+#: src/flac/plugin.cc:214
 msgid ""
 "Original code by\n"
 "Ralf Ertzinger <ralf@skytale.net>\n"
@@ -1429,15 +1451,15 @@
 msgid "GIO Plugin"
 msgstr "GIO zásuvný modul"
 
-#: src/gio/gio.cc:153
+#: src/gio/gio.cc:152
 msgid "Read-and-append mode not supported"
-msgstr ""
+msgstr "Režim \"nahrať a pridať\" nieje podporovaný"
 
-#: src/gio/gio.cc:166
+#: src/gio/gio.cc:165
 msgid "Invalid open mode"
-msgstr ""
+msgstr "Neplatný spôsob otvárania"
 
-#: src/gl-spectrum/gl-spectrum.cc:51
+#: src/glspectrum/gl-spectrum.cc:52
 msgid ""
 "OpenGL Spectrum Analyzer for Audacious\n"
 "Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
@@ -1448,624 +1470,765 @@
 "\n"
 "License: GPLv2+"
 msgstr ""
-
-#: src/gl-spectrum/gl-spectrum.cc:62
-msgid "OpenGL Spectrum Analyzer"
-msgstr ""
-
-#: src/gl-spectrum-qt/gl-spectrum.cc:41
-msgid ""
-"OpenGL Spectrum Analyzer for Audacious\n"
-"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
-"Copyright 2014 William Pitcock\n"
+"OpenGL Analyzátor spektra pre Audacious\n"
+"Copyright 2013 Christophe Budé, John Lindgren a Carlo Bramini\n"
 "\n"
-"Based on the XMMS plugin:\n"
-"Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson, and "
+"Založené na XMMS module:\n"
+"Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson a "
 "4Front Technologies\n"
 "\n"
-"License: GPLv2+"
-msgstr ""
-
-#: src/gl-spectrum-qt/gl-spectrum.cc:53
-msgid "OpenGL Spectrum Analyzer (Qt)"
-msgstr ""
-
-#: src/gnomeshortcuts/gnomeshortcuts.cc:38
-msgid "GNOME Shortcuts"
-msgstr ""
+"Licencia: GPLv2+"
 
-#: src/gnomeshortcuts/gnomeshortcuts.cc:54
-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/gtkui/columns.cc:35
-msgid "Entry number"
-msgstr "Číslo položky"
+#: src/glspectrum/gl-spectrum.cc:63 src/qtglspectrum/gl-spectrum.cc:53
+msgid "OpenGL Spectrum Analyzer"
+msgstr "OpenGL analyzátor spektra"
 
-#: src/gtkui/columns.cc:36 src/playlist-manager/playlist-manager.cc:225
-#: src/qtui/playlist_model.cc:123
+#: src/gtkui/columns.cc:36 src/moonstone/playlist_model.cc:38
+#: src/qtui/playlist_model.cc:33
+msgid "Entry Number"
+msgstr "Vstupné číslo"
+
+#: src/gtkui/columns.cc:37 src/moonstone/playlist_model.cc:38
+#: src/moonstone/playlist_selection.cc:64
+#: src/playlist-manager/playlist-manager.cc:200
+#: src/playlist-manager-qt/playlist-manager-qt.cc:188
+#: src/qtui/playlist_model.cc:33 src/streamtuner/icecast-model.cc:120
+#: src/streamtuner/ihr-model.cc:159 src/streamtuner/shoutcast-model.cc:122
 msgid "Title"
 msgstr "Názov"
 
-#: src/gtkui/columns.cc:37 src/qtui/playlist_model.cc:125
+#: src/gtkui/columns.cc:38 src/moonstone/playlist_model.cc:39
+#: src/qtui/playlist_model.cc:33
 msgid "Artist"
 msgstr "Umelec"
 
-#: src/gtkui/columns.cc:38
+#: src/gtkui/columns.cc:39 src/moonstone/playlist_model.cc:39
+#: src/qtui/playlist_model.cc:33
 msgid "Year"
 msgstr "Rok"
 
-#: src/gtkui/columns.cc:39 src/qtui/playlist_model.cc:127
+#: src/gtkui/columns.cc:40 src/moonstone/playlist_model.cc:39
+#: src/qtui/playlist_model.cc:34
 msgid "Album"
 msgstr "Album"
 
-#: src/gtkui/columns.cc:40
-msgid "Album artist"
-msgstr ""
+#: src/gtkui/columns.cc:41 src/moonstone/playlist_model.cc:40
+#: src/qtui/playlist_model.cc:34
+msgid "Album Artist"
+msgstr "Umelec albumu"
 
-#: src/gtkui/columns.cc:41
+#: src/gtkui/columns.cc:42 src/moonstone/playlist_model.cc:40
+#: src/qtui/playlist_model.cc:34
 msgid "Track"
 msgstr "Stopa"
 
-#: src/gtkui/columns.cc:42
+#: src/gtkui/columns.cc:43 src/moonstone/playlist_model.cc:40
+#: src/qtui/playlist_model.cc:34 src/streamtuner/icecast-model.cc:123
+#: src/streamtuner/shoutcast-model.cc:125
+#: src/streamtuner/shoutcast-model.cc:236
 msgid "Genre"
 msgstr "Žáner"
 
-#: src/gtkui/columns.cc:43
-msgid "Queue position"
-msgstr "Poradie vo fronte"
+#: src/gtkui/columns.cc:44 src/moonstone/playlist_model.cc:41
+#: src/qtui/playlist_model.cc:35
+msgid "Queue Position"
+msgstr "Pozícia fronty"
 
-#: src/gtkui/columns.cc:44
+#: src/gtkui/columns.cc:45 src/moonstone/playlist_model.cc:41
+#: src/qtui/playlist_model.cc:35
 msgid "Length"
 msgstr "Dĺžka"
 
-#: src/gtkui/columns.cc:45
-msgid "File path"
-msgstr "Cesta k súboru"
+#: src/gtkui/columns.cc:46 src/moonstone/playlist_model.cc:41
+#: src/qtui/playlist_model.cc:35
+msgid "File Path"
+msgstr "Cesta súboru"
+
+#: src/gtkui/columns.cc:47 src/moonstone/playlist_model.cc:42
+#: src/qtui/playlist_model.cc:35
+msgid "File Name"
+msgstr "Názov súboru"
 
-#: src/gtkui/columns.cc:47
-msgid "Custom title"
+#: src/gtkui/columns.cc:48 src/moonstone/playlist_model.cc:42
+#: src/qtui/playlist_model.cc:36
+msgid "Custom Title"
 msgstr "Vlastný názov"
 
-#: src/gtkui/columns.cc:48
+#: src/gtkui/columns.cc:49 src/moonstone/playlist_model.cc:42
+#: src/qtui/playlist_model.cc:36 src/streamtuner/icecast-model.cc:129
+#: src/streamtuner/shoutcast-model.cc:134
 msgid "Bitrate"
 msgstr "Dátový tok"
 
-#: src/gtkui/columns.cc:308
+#: src/gtkui/columns.cc:50 src/moonstone/playlist_model.cc:43
+#: src/qtui/playlist_model.cc:36
+msgid "Comment"
+msgstr "Komentár"
+
+#: src/gtkui/columns.cc:51 src/qtui/playlist_model.cc:36
+msgid "Publisher"
+msgstr "Vydavateľ"
+
+#: src/gtkui/columns.cc:52 src/qtui/playlist_model.cc:37
+msgid "Catalog Number"
+msgstr "Číslo v katalógu"
+
+#: src/gtkui/columns.cc:53 src/moonstone/playlist_model.cc:43
+#: src/qtui/playlist_model.cc:37
+msgid "Disc"
+msgstr "Disk"
+
+#: src/gtkui/columns.cc:325
 msgid "Available columns"
-msgstr ""
+msgstr "Dostupné stĺpce"
 
-#: src/gtkui/columns.cc:334
+#: src/gtkui/columns.cc:351
 msgid "Displayed columns"
-msgstr ""
+msgstr "Zobrazené stĺpce"
 
-#: src/gtkui/layout.cc:72 src/search-tool/search-tool.cc:40
+#: src/gtkui/layout.cc:74 src/search-tool-qt/search-tool-qt.cc:58
+#: src/search-tool/search-tool.cc:49
 msgid "Search Tool"
 msgstr "Vyhľadávací nástroj"
 
-#: src/gtkui/layout.cc:167
+#: src/gtkui/layout.cc:170
 msgid "Dock at Left"
 msgstr "Ukotviť vľavo"
 
-#: src/gtkui/layout.cc:167
+#: src/gtkui/layout.cc:170
 msgid "Dock at Right"
 msgstr "Ukotviť vpravo"
 
-#: src/gtkui/layout.cc:168
+#: src/gtkui/layout.cc:171
 msgid "Dock at Top"
 msgstr "Ukotviť hore"
 
-#: src/gtkui/layout.cc:168
+#: src/gtkui/layout.cc:171
 msgid "Dock at Bottom"
 msgstr "Ukotviť dole"
 
-#: src/gtkui/layout.cc:168
+#: src/gtkui/layout.cc:171
 msgid "Undock"
 msgstr "Uvolniť"
 
-#: src/gtkui/layout.cc:168 src/ladspa/plugin.cc:531
+#: src/gtkui/layout.cc:171 src/ladspa/plugin.cc:540
 msgid "Disable"
 msgstr "Zakázať"
 
-#: src/gtkui/menus.cc:126 src/qtui/main_window_actions.cc:93
-#: src/statusicon/statusicon.cc:276
+#: src/gtkui/menus.cc:79 src/qtui/menus.cc:107
+#: src/statusicon-qt/statusicon.cc:115 src/statusicon/statusicon.cc:286
 msgid "_Open Files ..."
 msgstr "_Otvoriť súbory ..."
 
-#: src/gtkui/menus.cc:127
+#: src/gtkui/menus.cc:80 src/qtui/menus.cc:111
 msgid "Open _URL ..."
 msgstr "Otvoriť _URL ..."
 
-#: src/gtkui/menus.cc:128 src/qtui/main_window_actions.cc:95
+#: src/gtkui/menus.cc:81 src/qtui/menus.cc:113
 msgid "_Add Files ..."
 msgstr "Prid_ať súbory ..."
 
-#: src/gtkui/menus.cc:129
+#: src/gtkui/menus.cc:82 src/qtui/menus.cc:118
 msgid "Add U_RL ..."
 msgstr "Pridať U_RL ..."
 
-#: src/gtkui/menus.cc:131
+#: src/gtkui/menus.cc:84 src/qtui/menus.cc:120
 msgid "Search _Library"
-msgstr ""
+msgstr "Pre_hľadať knižnicu"
 
-#: src/gtkui/menus.cc:133 src/qtui/main_window_actions.cc:98
+#: src/gtkui/menus.cc:86 src/qtui/menus.cc:123
 msgid "A_bout ..."
-msgstr "_O programe ..."
+msgstr "O _programe ..."
 
-#: src/gtkui/menus.cc:134 src/qtui/main_window_actions.cc:99
+#: src/gtkui/menus.cc:87 src/qtui/menus.cc:125
 msgid "_Settings ..."
-msgstr ""
+msgstr "_Nastavenia ..."
 
-#: src/gtkui/menus.cc:135 src/qtui/main_window_actions.cc:103
-#: src/statusicon/statusicon.cc:284
+#: src/gtkui/menus.cc:88 src/qtui/menus.cc:131
+#: src/statusicon-qt/statusicon.cc:117 src/statusicon/statusicon.cc:288
 msgid "_Quit"
 msgstr "_Koniec"
 
-#: src/gtkui/menus.cc:139 src/gtkui/menus.cc:262
-#: src/qtui/main_window_actions.cc:107 src/search-tool/search-tool.cc:641
-#: src/statusicon/statusicon.cc:278
+#: src/gtkui/menus.cc:92 src/gtkui/menus.cc:226
+#: src/moonstone/playlist_tabs.cc:306 src/qtui/menus.cc:135
+#: src/qtui/playlist_tabs.cc:331 src/search-tool-qt/search-tool-qt.cc:499
+#: src/search-tool/search-tool.cc:339 src/statusicon-qt/statusicon.cc:109
+#: src/statusicon/statusicon.cc:280
 msgid "_Play"
 msgstr "_Hrať"
 
-#: src/gtkui/menus.cc:140 src/qtui/main_window_actions.cc:108
-#: src/statusicon/statusicon.cc:279
+#: src/gtkui/menus.cc:93 src/qtui/menus.cc:137
+#: src/statusicon-qt/statusicon.cc:110 src/statusicon/statusicon.cc:281
 msgid "Paus_e"
 msgstr "P_ozastaviť"
 
-#: src/gtkui/menus.cc:141 src/qtui/main_window_actions.cc:109
-#: src/statusicon/statusicon.cc:280
+#: src/gtkui/menus.cc:94 src/qtui/menus.cc:139
+#: src/statusicon-qt/statusicon.cc:111 src/statusicon/statusicon.cc:282
 msgid "_Stop"
 msgstr "Za_staviť"
 
-#: src/gtkui/menus.cc:142 src/qtui/main_window_actions.cc:110
-#: src/statusicon/statusicon.cc:277
+#: src/gtkui/menus.cc:95 src/qtui/menus.cc:141
+#: src/statusicon-qt/statusicon.cc:112 src/statusicon/statusicon.cc:283
 msgid "Pre_vious"
 msgstr "Pred_chádzajúca"
 
-#: src/gtkui/menus.cc:143 src/qtui/main_window_actions.cc:111
-#: src/statusicon/statusicon.cc:281
+#: src/gtkui/menus.cc:96 src/qtui/menus.cc:143
+#: src/statusicon-qt/statusicon.cc:113 src/statusicon/statusicon.cc:284
 msgid "_Next"
 msgstr "_Nasledujúca"
 
-#: src/gtkui/menus.cc:145 src/qtui/main_window_actions.cc:113
+#: src/gtkui/menus.cc:97 src/qtui/menus.cc:145 src/skins/menus.cc:114
+#: src/skins-qt/menus.cc:105
+msgid "Previous Album"
+msgstr ""
+
+#: src/gtkui/menus.cc:98 src/qtui/menus.cc:146 src/skins/menus.cc:115
+#: src/skins-qt/menus.cc:106
+msgid "Next Album"
+msgstr ""
+
+#: src/gtkui/menus.cc:100 src/qtui/menus.cc:148
 msgid "_Repeat"
 msgstr "O_pakovať"
 
-#: src/gtkui/menus.cc:146 src/qtui/main_window_actions.cc:114
+#: src/gtkui/menus.cc:101 src/qtui/menus.cc:150
 msgid "S_huffle"
-msgstr "Ná_hodné prehrávanie"
+msgstr "Náho_dné prehrávanie"
 
-#: src/gtkui/menus.cc:147 src/qtui/main_window_actions.cc:115
+#: src/gtkui/menus.cc:102 src/qtui/menus.cc:152
+msgid "Shuffle by Albu_m"
+msgstr "Náhodné preh_rávánie v rámci albumu"
+
+#: src/gtkui/menus.cc:103 src/qtui/menus.cc:155
 msgid "N_o Playlist Advance"
-msgstr "Nep_okračovať podľa zoznamu skladieb"
+msgstr "N_epokračovať podľa zoznamu skladieb"
 
-#: src/gtkui/menus.cc:148 src/qtui/main_window_actions.cc:116
+#: src/gtkui/menus.cc:104 src/qtui/menus.cc:157
 msgid "Stop A_fter This Song"
-msgstr "Zastaviť po tejto skladbe"
+msgstr "Zastaviť _po tejto skladbe"
 
-#: src/gtkui/menus.cc:150 src/gtkui/menus.cc:247
-#: src/qtui/main_window_actions.cc:118
+#: src/gtkui/menus.cc:106 src/gtkui/menus.cc:210 src/qtui/menus.cc:162
+#: src/qtui/menus.cc:294
 msgid "Song _Info ..."
 msgstr "_Informácie o skladbe ..."
 
-#: src/gtkui/menus.cc:151
+#: src/gtkui/menus.cc:107
 msgid "Jump to _Time ..."
 msgstr "S_kočiť na čas ..."
 
-#: src/gtkui/menus.cc:152
+#: src/gtkui/menus.cc:108
 msgid "_Jump to Song ..."
 msgstr "Skočiť na sk_ladbu ..."
 
-#: src/gtkui/menus.cc:154
+#: src/gtkui/menus.cc:110 src/qtui/menus.cc:165
 msgid "Set Repeat Point _A"
-msgstr ""
+msgstr "Nastaviť bod opakovania _A"
 
-#: src/gtkui/menus.cc:155
+#: src/gtkui/menus.cc:111 src/qtui/menus.cc:167
 msgid "Set Repeat Point _B"
-msgstr ""
+msgstr "Nastaviť bod opakovania _B"
 
-#: src/gtkui/menus.cc:156
+#: src/gtkui/menus.cc:112 src/qtui/menus.cc:169
 msgid "_Clear Repeat Points"
-msgstr ""
+msgstr "Odstrániť bod_y opakovania"
 
-#: src/gtkui/menus.cc:160 src/gtkui/menus.cc:167 src/gtkui/menus.cc:183
-#: src/qtui/main_window_actions.cc:122 src/qtui/main_window_actions.cc:129
-#: src/qtui/main_window_actions.cc:145
+#: src/gtkui/menus.cc:116 src/gtkui/menus.cc:123 src/gtkui/menus.cc:141
+#: src/qtui/menus.cc:173 src/qtui/menus.cc:180 src/qtui/menus.cc:198
 msgid "By _Title"
 msgstr "Podľa _názvu"
 
-#: src/gtkui/menus.cc:161 src/qtui/main_window_actions.cc:123
+#: src/gtkui/menus.cc:117 src/qtui/menus.cc:174
 msgid "By _File Name"
-msgstr ""
+msgstr "Podľa ná_zvu súboru"
 
-#: src/gtkui/menus.cc:162 src/qtui/main_window_actions.cc:124
+#: src/gtkui/menus.cc:118 src/qtui/menus.cc:175
 msgid "By File _Path"
-msgstr ""
+msgstr "Podľa cesty k _súboru"
 
-#: src/gtkui/menus.cc:166 src/gtkui/menus.cc:182
-#: src/qtui/main_window_actions.cc:128 src/qtui/main_window_actions.cc:144
+#: src/gtkui/menus.cc:122 src/gtkui/menus.cc:140 src/qtui/menus.cc:179
+#: src/qtui/menus.cc:197
 msgid "By Track _Number"
 msgstr "Podľa čí_sla stopy"
 
-#: src/gtkui/menus.cc:168 src/gtkui/menus.cc:184
-#: src/qtui/main_window_actions.cc:130 src/qtui/main_window_actions.cc:146
+#: src/gtkui/menus.cc:124 src/gtkui/menus.cc:142 src/qtui/menus.cc:181
+#: src/qtui/menus.cc:199
 msgid "By _Artist"
 msgstr "Podľa _umelca"
 
-#: src/gtkui/menus.cc:169 src/gtkui/menus.cc:185
-#: src/qtui/main_window_actions.cc:131 src/qtui/main_window_actions.cc:147
+#: src/gtkui/menus.cc:125 src/gtkui/menus.cc:143 src/qtui/menus.cc:182
+#: src/qtui/menus.cc:200
 msgid "By Al_bum"
-msgstr ""
+msgstr "Podľa Al_bumu"
 
-#: src/gtkui/menus.cc:170 src/gtkui/menus.cc:186
-#: src/qtui/main_window_actions.cc:132 src/qtui/main_window_actions.cc:148
+#: src/gtkui/menus.cc:126 src/gtkui/menus.cc:144 src/qtui/menus.cc:183
+#: src/qtui/menus.cc:201
 msgid "By Albu_m Artist"
-msgstr ""
+msgstr "Podľa i_nterpréta albumu"
 
-#: src/gtkui/menus.cc:171 src/gtkui/menus.cc:187
-#: src/qtui/main_window_actions.cc:133 src/qtui/main_window_actions.cc:149
+#: src/gtkui/menus.cc:127 src/gtkui/menus.cc:145 src/qtui/menus.cc:184
+#: src/qtui/menus.cc:202
 msgid "By Release _Date"
 msgstr "Podľa dátumu vy_dania"
 
-#: src/gtkui/menus.cc:172 src/gtkui/menus.cc:188
-#: src/qtui/main_window_actions.cc:134 src/qtui/main_window_actions.cc:150
+#: src/gtkui/menus.cc:128 src/gtkui/menus.cc:146 src/qtui/menus.cc:185
+#: src/qtui/menus.cc:203
 msgid "By _Genre"
-msgstr ""
+msgstr "Podľa žá_nru"
 
-#: src/gtkui/menus.cc:173 src/gtkui/menus.cc:189
-#: src/qtui/main_window_actions.cc:135 src/qtui/main_window_actions.cc:151
+#: src/gtkui/menus.cc:129 src/gtkui/menus.cc:147 src/qtui/menus.cc:186
+#: src/qtui/menus.cc:204
 msgid "By _Length"
-msgstr ""
+msgstr "Podľa _dĺžky"
 
-#: src/gtkui/menus.cc:174 src/gtkui/menus.cc:190
-#: src/qtui/main_window_actions.cc:136 src/qtui/main_window_actions.cc:152
+#: src/gtkui/menus.cc:130 src/gtkui/menus.cc:148 src/qtui/menus.cc:187
+#: src/qtui/menus.cc:205
 msgid "By _File Path"
 msgstr "Podľa _cesty k súboru"
 
-#: src/gtkui/menus.cc:175 src/gtkui/menus.cc:191
-#: src/qtui/main_window_actions.cc:137 src/qtui/main_window_actions.cc:153
+#: src/gtkui/menus.cc:131 src/gtkui/menus.cc:149 src/qtui/menus.cc:188
+#: src/qtui/menus.cc:206
 msgid "By _Custom Title"
 msgstr "Podľa vlastného ná_zvu"
 
-#: src/gtkui/menus.cc:177 src/gtkui/menus.cc:193
-#: src/qtui/main_window_actions.cc:139 src/qtui/main_window_actions.cc:155
+#: src/gtkui/menus.cc:132 src/gtkui/menus.cc:150 src/qtui/menus.cc:189
+#: src/qtui/menus.cc:207
+msgid "By C_omment"
+msgstr "Podľa k_omentára"
+
+#: src/gtkui/menus.cc:133 src/gtkui/menus.cc:151 src/qtui/menus.cc:190
+#: src/qtui/menus.cc:208
+msgid "By D_isc Number"
+msgstr ""
+
+#: src/gtkui/menus.cc:135 src/gtkui/menus.cc:153 src/qtui/menus.cc:192
+#: src/qtui/menus.cc:210
 msgid "R_everse Order"
-msgstr "Obrátené poradie"
+msgstr "_Obrátené poradie"
 
-#: src/gtkui/menus.cc:178 src/gtkui/menus.cc:194
-#: src/qtui/main_window_actions.cc:140 src/qtui/main_window_actions.cc:156
+#: src/gtkui/menus.cc:136 src/gtkui/menus.cc:154 src/qtui/menus.cc:194
+#: src/qtui/menus.cc:212
 msgid "_Random Order"
 msgstr "Náhodné po_radie"
 
-#: src/gtkui/menus.cc:198 src/qtui/main_window_actions.cc:160
+#: src/gtkui/menus.cc:158 src/qtui/menus.cc:216
 msgid "_Play/Resume"
-msgstr ""
+msgstr "_Prehrať/Pokračovať"
 
-#: src/gtkui/menus.cc:199 src/gtkui/menus.cc:251
-#: src/qtui/main_window_actions.cc:161
+#: src/gtkui/menus.cc:159 src/qtui/menus.cc:218
 msgid "_Refresh"
 msgstr "_Obnoviť"
 
-#: src/gtkui/menus.cc:201 src/qtui/main_window_actions.cc:163
+#: src/gtkui/menus.cc:161 src/qtui/menus.cc:222
 msgid "_Sort"
 msgstr "_Zoradiť"
 
-#: src/gtkui/menus.cc:202 src/qtui/main_window_actions.cc:164
+#: src/gtkui/menus.cc:162 src/qtui/menus.cc:223
 msgid "Sort Se_lected"
-msgstr ""
+msgstr "Zoradiť z_volené"
 
-#: src/gtkui/menus.cc:203 src/qtui/main_window_actions.cc:165
+#: src/gtkui/menus.cc:163 src/qtui/menus.cc:225
 msgid "Remove _Duplicates"
-msgstr ""
+msgstr "Odstrániť _duplikáty"
 
-#: src/gtkui/menus.cc:204 src/qtui/main_window_actions.cc:166
+#: src/gtkui/menus.cc:164 src/qtui/menus.cc:226
 msgid "Remove _Unavailable Files"
 msgstr "Odstrániť nedost_upné súbory"
 
-#: src/gtkui/menus.cc:206 src/playlist-manager/playlist-manager.cc:244
-#: src/qtui/main_window_actions.cc:168
+#: src/gtkui/menus.cc:166 src/playlist-manager/playlist-manager.cc:219
+#: src/playlist-manager-qt/playlist-manager-qt.cc:348 src/qtui/menus.cc:229
 msgid "_New"
 msgstr "_Nový"
 
-#: src/gtkui/menus.cc:207
+#: src/gtkui/menus.cc:167 src/qtui/menus.cc:230
 msgid "Ren_ame ..."
 msgstr "Pre_menovať ..."
 
-#: src/gtkui/menus.cc:208 src/gtkui/menus.cc:264
-#: src/qtui/main_window_actions.cc:170
+#: src/gtkui/menus.cc:168 src/gtkui/menus.cc:228
+#: src/moonstone/playlist_tabs.cc:311 src/qtui/menus.cc:231
+#: src/qtui/playlist_tabs.cc:336
 msgid "Remo_ve"
-msgstr ""
+msgstr "Od_strániť"
 
-#: src/gtkui/menus.cc:210
+#: src/gtkui/menus.cc:170 src/qtui/menus.cc:233
 msgid "_Import ..."
 msgstr "_Importovať ..."
 
-#: src/gtkui/menus.cc:211
+#: src/gtkui/menus.cc:171 src/qtui/menus.cc:234
 msgid "_Export ..."
 msgstr "_Exportovať ..."
 
-#: src/gtkui/menus.cc:213
+#: src/gtkui/menus.cc:173 src/qtui/menus.cc:237
 msgid "Playlist _Manager ..."
-msgstr "Správca_zoznamu skladieb ..."
+msgstr "Správca zoznamu s_kladieb ..."
 
-#: src/gtkui/menus.cc:214 src/qtui/main_window_actions.cc:176
+#: src/gtkui/menus.cc:174 src/qtui/menus.cc:239
 msgid "_Queue Manager ..."
 msgstr "Správca _fronty .."
 
-#: src/gtkui/menus.cc:218 src/qtui/main_window_actions.cc:180
+#: src/gtkui/menus.cc:178 src/qtui/menus.cc:243
 msgid "Volume _Up"
 msgstr "Zo_silniť"
 
-#: src/gtkui/menus.cc:219 src/qtui/main_window_actions.cc:181
+#: src/gtkui/menus.cc:179 src/qtui/menus.cc:245
 msgid "Volume _Down"
 msgstr "S_tíšiť"
 
-#: src/gtkui/menus.cc:221 src/qtui/main_window_actions.cc:183
-msgid "_Equalizer"
-msgstr "_Ekvalizér"
+#: src/gtkui/menus.cc:181 src/qtui/menus.cc:249
+msgid "_Equalizer ..."
+msgstr "_Ekvalizér..."
 
-#: src/gtkui/menus.cc:223 src/qtui/main_window_actions.cc:185
+#: src/gtkui/menus.cc:182 src/qtui/menus.cc:251
 msgid "E_ffects ..."
-msgstr ""
+msgstr "E_fekty ..."
+
+#: src/gtkui/menus.cc:184
+msgid "_Record Stream"
+msgstr "Nah_rať stream"
 
-#: src/gtkui/menus.cc:227
+#: src/gtkui/menus.cc:185
+msgid "Audio _Settings ..."
+msgstr "Nastavenie _zvuku"
+
+#: src/gtkui/menus.cc:189 src/qtui/menus.cc:260
 msgid "Show _Menu Bar"
 msgstr "Zobraziť _panel s ponukou"
 
-#: src/gtkui/menus.cc:228
+#: src/gtkui/menus.cc:190 src/qtui/menus.cc:262
 msgid "Show I_nfo Bar"
 msgstr "Zobraziť panel s i_nformáciami"
 
-#: src/gtkui/menus.cc:229
+#: src/gtkui/menus.cc:191 src/qtui/menus.cc:264
+msgid "Show Info Bar _Album Art"
+msgstr ""
+
+#: src/gtkui/menus.cc:192 src/qtui/menus.cc:266
 msgid "Show Info Bar Vis_ualization"
-msgstr "Zobraziť znázornenie oblasti informácií"
+msgstr "_Zobraziť znázornenie oblasti informácií"
 
-#: src/gtkui/menus.cc:230
+#: src/gtkui/menus.cc:193 src/qtui/menus.cc:268
 msgid "Show _Status Bar"
 msgstr "Zobraziť panel so _stavom"
 
-#: src/gtkui/menus.cc:232
+#: src/gtkui/menus.cc:195 src/qtui/menus.cc:272
 msgid "Show _Remaining Time"
-msgstr ""
+msgstr "Uká_zať ostávajúci čas"
 
-#: src/gtkui/menus.cc:234
+#: src/gtkui/menus.cc:197 src/qtui/menus.cc:276 src/skins/menus.cc:157
+#: src/skins-qt/menus.cc:152
 msgid "_Visualizations ..."
-msgstr ""
+msgstr "_Vizualizácie"
 
-#: src/gtkui/menus.cc:238 src/qtui/main_window_actions.cc:189
+#: src/gtkui/menus.cc:201 src/qtui/menus.cc:280
 msgid "_File"
 msgstr "_Súbor"
 
-#: src/gtkui/menus.cc:239 src/qtui/main_window_actions.cc:190
+#: src/gtkui/menus.cc:202 src/qtui/menus.cc:281
 msgid "_Playback"
 msgstr "_Prehrávanie"
 
-#: src/gtkui/menus.cc:240 src/qtui/main_window_actions.cc:191
+#: src/gtkui/menus.cc:203 src/qtui/menus.cc:282
 msgid "P_laylist"
 msgstr "Zoznam sk_ladieb"
 
-#: src/gtkui/menus.cc:241 src/gtkui/menus.cc:258
-#: src/qtui/main_window_actions.cc:192
+#: src/gtkui/menus.cc:204 src/gtkui/menus.cc:222 src/qtui/menus.cc:283
+#: src/qtui/menus.cc:312
 msgid "_Services"
-msgstr "_Služby"
+msgstr "Služ_by"
 
-#: src/gtkui/menus.cc:242 src/qtui/main_window_actions.cc:193
+#: src/gtkui/menus.cc:205 src/qtui/menus.cc:284
 msgid "_Output"
 msgstr "_Výstup"
 
-#: src/gtkui/menus.cc:243
+#: src/gtkui/menus.cc:206 src/qtui/menus.cc:285
 msgid "_View"
 msgstr "_Zobrazenie"
 
-#: src/gtkui/menus.cc:248
+#: src/gtkui/menus.cc:211 src/qtui/menus.cc:296
 msgid "_Queue/Unqueue"
 msgstr "Pridať alebo odobrať z _fronty"
 
-#: src/gtkui/menus.cc:250
+#: src/gtkui/menus.cc:213 src/qtui/menus.cc:299
 msgid "_Open Containing Folder"
-msgstr ""
+msgstr "_Otvoriť priečinok"
+
+#: src/gtkui/menus.cc:214 src/qtui/menus.cc:301
+msgid "_Refresh Selected"
+msgstr "Obnoviť vyb_rané"
 
-#: src/gtkui/menus.cc:253
+#: src/gtkui/menus.cc:216 src/qtui/menus.cc:304
 msgid "Cu_t"
 msgstr "Vys_trihnúť"
 
-#: src/gtkui/menus.cc:254
+#: src/gtkui/menus.cc:217 src/qtui/menus.cc:305
 msgid "_Copy"
 msgstr "_Kopírovať"
 
-#: src/gtkui/menus.cc:255
+#: src/gtkui/menus.cc:218 src/qtui/menus.cc:306
 msgid "_Paste"
 msgstr "V_ložiť"
 
-#: src/gtkui/menus.cc:256
+#: src/gtkui/menus.cc:219 src/qtui/menus.cc:307
+msgid "Paste at _End"
+msgstr "Vložiť na koni_ec"
+
+#: src/gtkui/menus.cc:220 src/qtui/menus.cc:309
 msgid "Select _All"
 msgstr "Ozn_ačiť všetko"
 
-#: src/gtkui/menus.cc:263
+#: src/gtkui/menus.cc:227 src/moonstone/playlist_tabs.cc:309
+#: src/qtui/playlist_tabs.cc:334
 msgid "_Rename ..."
-msgstr "_Premenovať ..."
+msgstr "P_remenovať ..."
 
-#: src/gtkui/settings.cc:35
-msgid "Playlist Tabs"
+#: src/gtkui/settings.cc:35 src/qtui/settings.cc:59
+msgid "Always"
 msgstr ""
 
-#: src/gtkui/settings.cc:36
-msgid "Always show tabs"
+#: src/gtkui/settings.cc:36 src/qtui/settings.cc:60
+msgid "Auto-hide"
 msgstr ""
 
-#: src/gtkui/settings.cc:38
-msgid "Show entry counts"
+#: src/gtkui/settings.cc:37 src/qtui/settings.cc:61
+msgid "Never"
 msgstr ""
 
-#: src/gtkui/settings.cc:40
-msgid "Show close buttons"
+#: src/gtkui/settings.cc:41 src/qtui/settings.cc:64
+msgid "Playlist Tabs"
+msgstr "Panely zoznamu skladieb"
+
+#: src/gtkui/settings.cc:42 src/qtui/settings.cc:65
+msgid "Show playlist tabs:"
 msgstr ""
 
-#: src/gtkui/settings.cc:42
+#: src/gtkui/settings.cc:45 src/qtui/settings.cc:69
+msgid "Show entry counts"
+msgstr "Zobrazovať počet skladieb"
+
+#: src/gtkui/settings.cc:47 src/qtui/settings.cc:72
+msgid "Show close buttons"
+msgstr "Zobrazovať uzavieracie tlačítko"
+
+#: src/gtkui/settings.cc:49 src/qtui/settings.cc:75
 msgid "Playlist Columns"
-msgstr ""
+msgstr "Stĺpce zoznamu skladieb"
 
-#: src/gtkui/settings.cc:44
+#: src/gtkui/settings.cc:51 src/qtui/settings.cc:77
 msgid "Show column headers"
-msgstr ""
+msgstr "Zobrazovať hlavičky stĺpcov"
 
-#: src/gtkui/settings.cc:46 src/modplug/plugin_main.cc:106
-#: src/skins/skins_cfg.cc:263
-msgid "Miscellaneous"
+#: src/gtkui/settings.cc:53 src/qtui/settings.cc:82
+msgid "Make column headers clickable for sorting"
 msgstr ""
 
-#: src/gtkui/settings.cc:47
-msgid "Arrow keys seek by:"
+#: src/gtkui/settings.cc:56
+msgid "Use symbolic icons in toolbar"
 msgstr ""
 
-#: src/gtkui/settings.cc:50
+#: src/gtkui/settings.cc:58 src/qtui/settings.cc:86
 msgid "Scroll on song change"
-msgstr ""
+msgstr "Posuň pri zmene skladby"
 
-#: src/gtkui/ui_gtk.cc:71
+#: src/gtkui/ui_gtk.cc:82
 msgid "GTK Interface"
-msgstr "Rozhranie GTK"
+msgstr "Prostredie GTK"
 
-#: src/gtkui/ui_gtk.cc:222 src/skins/ui_main.cc:232
+#: src/gtkui/ui_gtk.cc:219 src/skins/main.cc:228 src/skins-qt/main.cc:231
 #, c-format
 msgid "%s - Audacious"
 msgstr "%s - Audacious"
 
-#: src/gtkui/ui_gtk.cc:225 src/qtui/main_window.cc:186
+#: src/gtkui/ui_gtk.cc:221 src/moonstone/main_window.cc:184
+#: src/qtui/main_window.cc:385
 msgid "Buffering ..."
 msgstr "Napĺňanie vyrovnávajúcej pamäte ..."
 
-#: src/gtkui/ui_gtk.cc:228 src/skins/ui_main.cc:234 src/skins/ui_main.cc:1164
+#: src/gtkui/ui_gtk.cc:224 src/pipewire/pipewire.cc:402 src/skins/main.cc:230
+#: src/skins-qt/main.cc:233
 msgid "Audacious"
 msgstr "Audacious"
 
-#: src/gtkui/ui_statusbar.cc:63 src/qtui/status_bar.cc:67
+#: src/gtkui/ui_gtk.cc:487 src/gtkui/ui_gtk.cc:518 src/gtkui/ui_gtk.cc:882
+#: src/hotkey/gui.cc:72 src/moonstone/main_window.cc:67
+#: src/moonstone/main_window.cc:145 src/moonstone/main_window.cc:146
+#: src/notify/osd.cc:85 src/qthotkey/gui.cc:67 src/qtui/main_window.cc:154
+#: src/qtui/main_window.cc:347 src/qtui/main_window.cc:348
+#: src/skins/menus.cc:109 src/skins-qt/menus.cc:100
+msgid "Play"
+msgstr "Prehrať"
+
+#: src/gtkui/ui_gtk.cc:487 src/moonstone/main_window.cc:151
+#: src/moonstone/main_window.cc:152 src/notify/osd.cc:82
+#: src/qtui/main_window.cc:353 src/qtui/main_window.cc:354
+#: src/skins/menus.cc:110 src/skins-qt/menus.cc:101
+msgid "Pause"
+msgstr "Pozastaviť"
+
+#: src/gtkui/ui_gtk.cc:868 src/moonstone/main_window.cc:57
+#: src/qtui/main_window.cc:145 src/skins/menus.cc:86 src/skins-qt/menus.cc:77
+msgid "Search Library"
+msgstr "Prehľadať knižnicu"
+
+#: src/gtkui/ui_gtk.cc:875 src/moonstone/main_window.cc:60
+#: src/qtui/main_window.cc:147
+msgid "Open Files"
+msgstr "Otvoriť súbory"
+
+#: src/gtkui/ui_gtk.cc:876 src/moonstone/main_window.cc:62
+#: src/qtui/main_window.cc:149
+msgid "Add Files"
+msgstr "Pridať súbory"
+
+#: src/gtkui/ui_gtk.cc:881 src/moonstone/main_window.cc:65
+#: src/qtui/main_window.cc:152 src/skins/menus.cc:112 src/skins-qt/menus.cc:103
+msgid "Previous"
+msgstr "Predchádzajúca"
+
+#: src/gtkui/ui_gtk.cc:883 src/hotkey/gui.cc:74 src/moonstone/main_window.cc:69
+#: src/qthotkey/gui.cc:69 src/qtui/main_window.cc:156 src/skins/menus.cc:111
+#: src/skins-qt/menus.cc:102
+msgid "Stop"
+msgstr "Zastaviť"
+
+#: src/gtkui/ui_gtk.cc:884 src/moonstone/main_window.cc:76 src/notify/osd.cc:89
+#: src/qtui/main_window.cc:163 src/skins/menus.cc:113 src/skins-qt/menus.cc:104
+msgid "Next"
+msgstr "Nasledujúca"
+
+#: src/gtkui/ui_gtk.cc:886 src/moonstone/main_window.cc:79
+#: src/qtui/main_window.cc:166 src/qtui/menus.cc:254 src/skins/menus.cc:79
+#: src/skins-qt/menus.cc:69
+msgid "Record Stream"
+msgstr "Záznam streamu"
+
+#: src/gtkui/ui_gtk.cc:919 src/moonstone/main_window.cc:86
+#: src/qtui/main_window.cc:173 src/skins/menus.cc:103 src/skins-qt/menus.cc:94
+msgid "Repeat"
+msgstr "Opako_vať"
+
+#: src/gtkui/ui_gtk.cc:922 src/moonstone/main_window.cc:89
+#: src/qtui/main_window.cc:176 src/skins/menus.cc:104 src/skins-qt/menus.cc:95
+msgid "Shuffle"
+msgstr "Náhodné prehrávanie"
+
+#: src/gtkui/ui_gtk.cc:1114 src/qtui/main_window.cc:123
+msgid "Menu"
+msgstr ""
+
+#: src/gtkui/ui_statusbar.cc:64 src/qtui/status_bar.cc:155
 msgid "mono"
 msgstr "mono"
 
-#: src/gtkui/ui_statusbar.cc:65 src/qtui/status_bar.cc:69
+#: src/gtkui/ui_statusbar.cc:66 src/qtui/status_bar.cc:157
 msgid "stereo"
 msgstr "stereo"
 
-#: src/gtkui/ui_statusbar.cc:67 src/qtui/status_bar.cc:71
+#: src/gtkui/ui_statusbar.cc:68 src/qtui/status_bar.cc:160
 #, c-format
 msgid "%d channel"
 msgid_plural "%d channels"
 msgstr0 "%d kanálov"
 msgstr1 "%d kanál"
 msgstr2 "%d kanály"
+msgstr3 "%d kanály"
+
+#: src/gtkui/ui_statusbar.cc:76 src/qtui/status_bar.cc:168
+#, c-format
+msgid "%d kHz"
+msgstr "%d kHz"
 
-#: src/gtkui/ui_statusbar.cc:81 src/qtui/status_bar.cc:85
+#: src/gtkui/ui_statusbar.cc:82 src/qtui/status_bar.cc:174
 #, c-format
-msgid "%d kbps"
-msgstr "%d kbps"
+msgid "%d kbit/s"
+msgstr ""
 
-#: src/gtkui/ui_statusbar.cc:107 src/skins/ui_main_evlisteners.cc:103
+#: src/gtkui/ui_statusbar.cc:108 src/skins/main.cc:478 src/skins-qt/main.cc:461
 msgid "Single mode."
 msgstr "Režim jednej skladby."
 
-#: src/gtkui/ui_statusbar.cc:109 src/skins/ui_main_evlisteners.cc:105
+#: src/gtkui/ui_statusbar.cc:110 src/skins/main.cc:480 src/skins-qt/main.cc:463
 msgid "Playlist mode."
 msgstr "Režim zoznamu skladieb."
 
-#: src/gtkui/ui_statusbar.cc:117 src/skins/ui_main_evlisteners.cc:111
+#: src/gtkui/ui_statusbar.cc:118 src/skins/main.cc:486 src/skins-qt/main.cc:469
 msgid "Stopping after song."
 msgstr "Zastaviť po skončení skladby."
 
-#: src/hotkey/gui.cc:71
+#: src/hotkey/gui.cc:71 src/qthotkey/gui.cc:66
 msgid "Previous track"
 msgstr "Predchádzajúca skladba"
 
-#: src/hotkey/gui.cc:72 src/notify/osd.cc:69 src/qtui/main_window.cc:69
-#: src/qtui/main_window.cc:172 src/qtui/main_window.cc:173
-#: src/skins/menus.cc:87
-msgid "Play"
-msgstr "Prehrať"
-
-#: src/hotkey/gui.cc:73
+#: src/hotkey/gui.cc:73 src/qthotkey/gui.cc:68
 msgid "Pause/Resume"
 msgstr "Pozastaviť/Pokračovať"
 
-#: src/hotkey/gui.cc:74 src/qtui/main_window.cc:70 src/skins/menus.cc:89
-msgid "Stop"
-msgstr "Zastaviť"
-
-#: src/hotkey/gui.cc:75
+#: src/hotkey/gui.cc:75 src/qthotkey/gui.cc:70
 msgid "Next track"
 msgstr "Nasledujúca skladba"
 
-#: src/hotkey/gui.cc:76
-msgid "Forward 5 seconds"
-msgstr "Vpred o 5 sekúnd"
-
-#: src/hotkey/gui.cc:77
-msgid "Rewind 5 seconds"
-msgstr "Späť o 5 sekúnd"
+#: src/hotkey/gui.cc:76 src/qthotkey/gui.cc:71
+msgid "Step forward"
+msgstr ""
+
+#: src/hotkey/gui.cc:77 src/qthotkey/gui.cc:72
+msgid "Step backward"
+msgstr ""
 
-#: src/hotkey/gui.cc:78
+#: src/hotkey/gui.cc:78 src/qthotkey/gui.cc:73
 msgid "Mute"
 msgstr "Stlmiť"
 
-#: src/hotkey/gui.cc:79
+#: src/hotkey/gui.cc:79 src/qthotkey/gui.cc:74
 msgid "Volume up"
 msgstr "Zvýšenie hlasitosti"
 
-#: src/hotkey/gui.cc:80
+#: src/hotkey/gui.cc:80 src/qthotkey/gui.cc:75
 msgid "Volume down"
 msgstr "Zníženie hlasitosti"
 
-#: src/hotkey/gui.cc:81
+#: src/hotkey/gui.cc:81 src/qthotkey/gui.cc:76
 msgid "Jump to file"
 msgstr "Prejsť na súbor"
 
-#: src/hotkey/gui.cc:82
+#: src/hotkey/gui.cc:82 src/qthotkey/gui.cc:77
 msgid "Toggle player window(s)"
-msgstr ""
+msgstr "Prepnúť okno prehrávača"
 
-#: src/hotkey/gui.cc:83
+#: src/hotkey/gui.cc:83 src/qthotkey/gui.cc:78
 msgid "Show On-Screen-Display"
 msgstr "Zobraziť OSD"
 
-#: src/hotkey/gui.cc:84
+#: src/hotkey/gui.cc:84 src/qthotkey/gui.cc:79
 msgid "Toggle repeat"
 msgstr "Opakovanie"
 
-#: src/hotkey/gui.cc:85
+#: src/hotkey/gui.cc:85 src/qthotkey/gui.cc:80
 msgid "Toggle shuffle"
 msgstr "Náhodné prehrávanie"
 
-#: src/hotkey/gui.cc:86
+#: src/hotkey/gui.cc:86 src/qthotkey/gui.cc:81
 msgid "Toggle stop after current"
 msgstr "Zastaviť po skončení aktuálnej skladby"
 
-#: src/hotkey/gui.cc:87
+#: src/hotkey/gui.cc:87 src/qthotkey/gui.cc:82
 msgid "Raise player window(s)"
-msgstr ""
+msgstr "Vyvolať okno/á prehrávača"
 
-#: src/hotkey/gui.cc:97
+#: src/hotkey/gui.cc:98 src/qthotkey/gui.cc:100
 msgid "(none)"
 msgstr "(žiadne)"
 
-#: src/hotkey/gui.cc:234
+#: src/hotkey/gui.cc:261
 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 modifiers.\n"
 "\n"
 "Do you want to continue?"
 msgstr ""
-"Priradenie primárneho tlačidla myši bez modifikátoru nie je odporúčané.\n"
-"\n"
-"Chcete pokračovať?"
 
-#: src/hotkey/gui.cc:236
+#: src/hotkey/gui.cc:264
 msgid "Binding mouse buttons"
 msgstr "Priradenie tlačidiel myši"
 
-#: src/hotkey/gui.cc:391
+#: src/hotkey/gui.cc:434
 msgid ""
 "Press a key combination inside a text field.\n"
 "You can also bind mouse buttons."
@@ -2073,126 +2236,147 @@
 "V textovom poli stlačte kombináciu klávesov.\n"
 "Môžete priradiť aj tlačítka na myši."
 
-#: src/hotkey/gui.cc:396
+#: src/hotkey/gui.cc:444 src/qthotkey/gui.cc:179
 msgid "Hotkeys:"
 msgstr "Klávesové skratky:"
 
-#: src/hotkey/gui.cc:413
+#: src/hotkey/gui.cc:457 src/qthotkey/gui.cc:181
 msgid "Action:"
 msgstr "Činnosť:"
 
-#: src/hotkey/gui.cc:420
+#: src/hotkey/gui.cc:461 src/qthotkey/gui.cc:182
 msgid "Key Binding:"
 msgstr "Priradenie klávesu:"
 
-#: src/hotkey/gui.cc:468
+#: src/hotkey/gui.cc:518 src/qthotkey/gui.cc:184
 msgid "_Add"
-msgstr ""
+msgstr "Pridať"
 
-#: src/hotkey/plugin.cc:61
+#: src/hotkey/plugin.cc:59 src/qthotkey/plugin.cc:78
 msgid "Global Hotkeys"
 msgstr "Globálne klávesové skratky"
 
-#: src/hotkey/plugin.cc:79
+#: src/hotkey/plugin.cc:74
 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"
+"Contributors 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 ""
-"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/jack-ng/jack-ng.cc:49
+#: src/jack/jack-ng.cc:54
 msgid "JACK Output"
 msgstr "JACK výstup"
 
-#: src/jack-ng/jack-ng.cc:114
+#: src/jack/jack-ng.cc:126
+msgid "Client name:"
+msgstr ""
+
+#: src/jack/jack-ng.cc:128
 msgid "Automatically connect to output ports"
+msgstr "Automaticky pripojiť k výstupným portom"
+
+#: src/jack/jack-ng.cc:130
+msgid "Filter ports (regex, use any port if blank):"
+msgstr ""
+
+#: src/jack/jack-ng.cc:136
+msgid "Connect to physical ports only"
+msgstr ""
+
+#: src/jack/jack-ng.cc:139
+msgid "Upmix to"
+msgstr ""
+
+#: src/jack/jack-ng.cc:141
+msgid "ports if input has fewer channels"
+msgstr ""
+
+#: src/jack/jack-ng.cc:143
+msgid "Ignore insufficient number of ports"
+msgstr ""
+
+#: src/jack/jack-ng.cc:181
+msgid "No JACK output ports were found. Please check settings."
 msgstr ""
 
-#: src/jack-ng/jack-ng.cc:155
+#: src/jack/jack-ng.cc:195
 #, c-format
 msgid "Only %d JACK output ports were found but %d are required."
-msgstr ""
+msgstr "Iba %d JACK výstupných portov bolo nájdených, ale potrebných je%d."
 
-#: src/jack-ng/jack-ng.cc:164
+#: src/jack/jack-ng.cc:210
 #, c-format
 msgid "Failed to connect to JACK port %s."
-msgstr ""
+msgstr "Nepodarilo sa pripojiť na JACK port %s."
 
-#: src/jack-ng/jack-ng.cc:184
+#: src/jack/jack-ng.cc:230
 msgid ""
 "JACK supports only floating-point audio. You must change the output bit "
 "depth to floating-point in Audacious settings."
 msgstr ""
+"JACK podporuje iba audio s plávajúcou desatinou čiarkou. Musíte zmeniť "
+"výstupnú bitovú hĺbku Plávajúcu desatinnú čiarku v nastaveniach JACK výstupu."
 
-#: src/jack-ng/jack-ng.cc:197
+#: src/jack/jack-ng.cc:245
 msgid "Failed to connect to the JACK server; is it running?"
-msgstr ""
+msgstr "Nepodarilo sa spojiť s JACK serverom; je spustený?"
 
-#: src/jack-ng/jack-ng.cc:273
+#: src/jack/jack-ng.cc:321
 #, c-format
 msgid ""
 "The JACK server requires a sample rate of %d Hz, but Audacious is playing at "
 "%d Hz. Please use the Sample Rate Converter effect to correct the mismatch."
 msgstr ""
+"ACK server vyžaduje vzorkovací kmitočet %d Hz, ale Audacious prehráva na %d "
+"Hz. Prosím použite efekt Prevodník vzorkovacieho kmitočtu na opravu."
 
-#: src/ladspa/plugin.cc:414
+#: src/ladspa/plugin.cc:416
 #, c-format
 msgid "%s Settings"
 msgstr "Nastavenia %s"
 
-#: src/ladspa/plugin.cc:478
+#: src/ladspa/plugin.cc:482
 msgid "Module paths:"
 msgstr "Cesty modulu:"
 
-#: src/ladspa/plugin.cc:483
+#: src/ladspa/plugin.cc:487
 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.\n"
-"Tieto cesty sú vyhľadávané v rátane do LADSPA_PATH.\n"
+"Tieto cesty sú vyhľadávané vrátane s LADSPA_PATH.\n"
 "Po pridaní novej cesty, stlačte Enter pre vyhľadanie nových modulov. </ "
 "Small>"
 
-#: src/ladspa/plugin.cc:499
+#: src/ladspa/plugin.cc:508
 msgid "Available plugins:"
 msgstr "Dostupné moduly:"
 
-#: src/ladspa/plugin.cc:512 src/modplug/plugin_main.cc:92
-#: src/modplug/plugin_main.cc:95 src/modplug/plugin_main.cc:98
-#: src/modplug/plugin_main.cc:101
+#: src/ladspa/plugin.cc:521 src/modplug/plugin_main.cc:91
+#: src/modplug/plugin_main.cc:94 src/modplug/plugin_main.cc:97
+#: src/modplug/plugin_main.cc:100
 msgid "Enable"
 msgstr "Povoliť"
 
-#: src/ladspa/plugin.cc:518
+#: src/ladspa/plugin.cc:527
 msgid "Enabled plugins:"
 msgstr "Povolené moduly:"
 
-#: src/ladspa/plugin.cc:534
+#: src/ladspa/plugin.cc:543
 msgid "Settings"
 msgstr "Nastavenie"
 
-#: src/ladspa/plugin.cc:551
+#: src/ladspa/plugin.cc:560
 msgid ""
 "LADSPA Host for Audacious\n"
 "Copyright 2011 John Lindgren"
@@ -2208,7 +2392,7 @@
 msgid "LIRC Plugin"
 msgstr "LIRC zásuvný modul"
 
-#: src/lirc/lirc.cc:381
+#: src/lirc/lirc.cc:379
 msgid ""
 "A simple plugin to control Audacious using the LIRC remote control daemon\n"
 "\n"
@@ -2235,63 +2419,123 @@
 "\n"
 "Pre viac informácií o LIRC, navštívte http://lirc.org."
 
-#: src/lirc/lirc.cc:392
+#: src/lirc/lirc.cc:390
 msgid "Connection"
 msgstr "Pripojenie"
 
-#: src/lirc/lirc.cc:393
+#: src/lirc/lirc.cc:391
 msgid "Reconnect to LIRC server"
 msgstr "Znovu sa pripojiť k serveru LIRC"
 
-#: src/lirc/lirc.cc:395
+#: src/lirc/lirc.cc:393
 msgid "Wait before reconnecting:"
 msgstr "Počkajte pred opätovným pripojením:"
 
-#: src/lyricwiki/lyricwiki.cc:41
-msgid "LyricWiki Plugin"
-msgstr "LyricWiki zásuvný modul"
-
-#: src/lyricwiki/lyricwiki.cc:131 src/lyricwiki-qt/lyricwiki.cc:136
-msgid "No lyrics available"
-msgstr "Žiadne texty k dispozícii"
-
-#: src/lyricwiki/lyricwiki.cc:217 src/lyricwiki/lyricwiki.cc:226
-#: src/lyricwiki/lyricwiki.cc:243 src/lyricwiki/lyricwiki.cc:252
-#: src/lyricwiki/lyricwiki.cc:267 src/lyricwiki-qt/lyricwiki.cc:222
-#: src/lyricwiki-qt/lyricwiki.cc:231 src/lyricwiki-qt/lyricwiki.cc:248
-#: src/lyricwiki-qt/lyricwiki.cc:257 src/lyricwiki-qt/lyricwiki.cc:272
-msgid "Error"
-msgstr "Chyba"
-
-#: src/lyricwiki/lyricwiki.cc:218 src/lyricwiki/lyricwiki.cc:244
-#: src/lyricwiki-qt/lyricwiki.cc:223 src/lyricwiki-qt/lyricwiki.cc:249
+#: src/lyrics-common/chart_lyrics_provider.cc:93
+#: src/lyrics-common/chart_lyrics_provider.cc:150
+#: src/lyrics-common/lyrics_ovh_provider.cc:50
 #, c-format
 msgid "Unable to fetch %s"
 msgstr "Nedá sa načítať %s"
 
-#: src/lyricwiki/lyricwiki.cc:227 src/lyricwiki/lyricwiki.cc:253
-#: src/lyricwiki-qt/lyricwiki.cc:232 src/lyricwiki-qt/lyricwiki.cc:258
+#: src/lyrics-common/chart_lyrics_provider.cc:100
+#: src/lyrics-common/chart_lyrics_provider.cc:157
+#: src/lyrics-common/lyrics_ovh_provider.cc:57
 #, c-format
 msgid "Unable to parse %s"
 msgstr "Nedá sa analyzovať %s"
 
-#: src/lyricwiki/lyricwiki.cc:259 src/lyricwiki-qt/lyricwiki.cc:264
+#: src/lyrics-common/chart_lyrics_provider.cc:121
+#: src/lyrics-common/chart_lyrics_provider.cc:194
+#: src/lyrics-common/lyrics_ovh_provider.cc:88
 msgid "Looking for lyrics ..."
 msgstr "Vyhľadáva sa text skladby..."
 
-#: src/lyricwiki/lyricwiki.cc:267 src/lyricwiki-qt/lyricwiki.cc:272
-msgid "Missing song metadata"
-msgstr "Chýba metadata skladby"
+#: src/lyrics-common/preferences.h:43
+msgid "Nowhere"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:49
+msgid "Artist is truncated at the start, Title -- at the end"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:50
+msgid "Chars to truncate on:"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:54
+msgid "Chars are ORed in RegExp, surrounded by whitespace"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:55
+msgid "Chars to split on:"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:56
+msgid "Further truncate those on chars"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:62
+msgid "General"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:63
+msgid "Split title into artist and title on chars"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:66
+msgid "Sources"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:67
+msgid "Use embedded lyrics (from Lyrics tag)"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:69
+msgid "Fetch lyrics from internet:"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:72
+msgid "Store fetched lyrics in local cache"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:74
+msgid "Local Storage"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:75
+msgid "Load lyric files (.lrc) from local storage"
+msgstr ""
+
+#: src/lyrics-common/utils.cc:54 src/ui-common/dialogs-qt.cc:63
+msgid "Error"
+msgstr "Chyba"
+
+#: src/lyrics-common/utils.cc:60
+msgid "Lyrics could not be found."
+msgstr ""
+
+#: src/lyrics-common/utils.cc:142
+msgid "Missing title and/or artist."
+msgstr ""
 
-#: src/lyricwiki/lyricwiki.cc:278 src/lyricwiki-qt/lyricwiki.cc:283
-msgid "Connecting to lyrics.wikia.com ..."
-msgstr "Pripájanie na lyrics.wikia.com..."
+#: src/lyrics-gtk/lyrics-gtk.cc:37 src/lyrics-qt/lyrics-qt.cc:50
+msgid "Lyrics"
+msgstr ""
 
-#: src/lyricwiki-qt/lyricwiki.cc:55
-msgid "LyricWiki Plugin (Qt)"
+#: src/lyrics-gtk/lyrics-gtk.cc:189 src/lyrics-qt/lyrics-qt.cc:171
+msgid "Edit Lyrics ..."
 msgstr ""
 
-#: src/m3u/m3u.cc:32
+#: src/lyrics-gtk/lyrics-gtk.cc:195 src/lyrics-qt/lyrics-qt.cc:178
+msgid "Save Locally"
+msgstr ""
+
+#: src/lyrics-gtk/lyrics-gtk.cc:201 src/lyrics-qt/lyrics-qt.cc:186
+msgid "Refresh"
+msgstr ""
+
+#: src/m3u/m3u.cc:33
 msgid "M3U Playlists"
 msgstr "M3U zoznam skladieb"
 
@@ -2299,17 +2543,17 @@
 msgid "Tact Generator"
 msgstr "Generátor taktov"
 
-#: src/metronom/metronom.cc:147
+#: src/metronom/metronom.cc:145
 #, c-format
 msgid "Tact generator: %d bpm"
 msgstr "Generátor taktu: %d bpm"
 
-#: src/metronom/metronom.cc:149
+#: src/metronom/metronom.cc:147
 #, c-format
 msgid "Tact generator: %d bpm %d/%d"
 msgstr "Generátor taktu: %d bpm %d/%d"
 
-#: src/metronom/metronom.cc:237
+#: src/metronom/metronom.cc:235
 msgid ""
 "A Tact Generator by Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
 "\n"
@@ -2323,11 +2567,11 @@
 "napr. tact://77 to play 77 beats per minute\n"
 "alebo tact://60*3/4 to play 60 bpm in 3/4 tacts"
 
-#: src/mixer/mixer.cc:38
+#: src/mixer/mixer.cc:43
 msgid "Channel Mixer"
 msgstr "Zmiešavač kanálov"
 
-#: src/mixer/mixer.cc:202
+#: src/mixer/mixer.cc:255
 msgid ""
 "Channel Mixer Plugin for Audacious\n"
 "Copyright 2011-2012 John Lindgren and Michał Lipski"
@@ -2335,11 +2579,11 @@
 "Channel Mixer zásuvný modul pre Audacious\n"
 "Copyright 2011-2012 John Lindgren a Michał Lipski"
 
-#: src/mixer/mixer.cc:206
+#: src/mixer/mixer.cc:259
 msgid "Channel Mixer"
 msgstr "Zmiešavač kanálov"
 
-#: src/mixer/mixer.cc:207
+#: src/mixer/mixer.cc:260
 msgid "Output channels:"
 msgstr "Výstupné kanály:"
 
@@ -2349,170 +2593,178 @@
 
 #: src/mms/mms.cc:82
 msgid "Error connecting to MMS server"
-msgstr ""
+msgstr "Chyba pri pripojení k MMS serveru"
 
-#: src/modplug/modplugbmp.h:53
+#: src/modplug/modplugbmp.h:57
 msgid "ModPlug (Module Player)"
 msgstr "ModPlug (Module Player) zásuvný modul"
 
-#: src/modplug/plugin_main.cc:53
-msgid "Resolution"
-msgstr ""
-
-#: src/modplug/plugin_main.cc:54
-msgid "8-bit"
-msgstr ""
-
 #: src/modplug/plugin_main.cc:55
-msgid "16-bit"
-msgstr ""
-
-#: src/modplug/plugin_main.cc:56
 msgid "Channels"
-msgstr ""
+msgstr "Kanály"
 
-#: src/modplug/plugin_main.cc:60
+#: src/modplug/plugin_main.cc:59
 msgid "Nearest (fastest)"
-msgstr ""
+msgstr "Najbližší (najrychlejší)"
 
-#: src/modplug/plugin_main.cc:61
+#: src/modplug/plugin_main.cc:60
 msgid "Linear (fast)"
-msgstr ""
+msgstr "Lineárne (rýchle)"
 
-#: src/modplug/plugin_main.cc:62
+#: src/modplug/plugin_main.cc:61
 msgid "Spline (good)"
-msgstr ""
+msgstr "Krivka (dobré)"
 
-#: src/modplug/plugin_main.cc:63
+#: src/modplug/plugin_main.cc:62
 msgid "Polyphase (best)"
-msgstr ""
+msgstr "Viacfázové (najlepšie)"
 
-#: src/modplug/plugin_main.cc:64
+#: src/modplug/plugin_main.cc:63
 msgid "Sample rate"
-msgstr ""
+msgstr "Vzorkovacia frekvencia"
 
-#: src/modplug/plugin_main.cc:65
+#: src/modplug/plugin_main.cc:64
 msgid "22 kHz"
-msgstr ""
+msgstr "22 kHz"
 
-#: src/modplug/plugin_main.cc:66
+#: src/modplug/plugin_main.cc:65
 msgid "44 kHz"
-msgstr ""
+msgstr "44 kHz"
 
-#: src/modplug/plugin_main.cc:67
+#: src/modplug/plugin_main.cc:66
 msgid "48 kHz"
-msgstr ""
+msgstr "48 kHz"
 
-#: src/modplug/plugin_main.cc:68
+#: src/modplug/plugin_main.cc:67
 msgid "96 kHz"
-msgstr ""
+msgstr "96 kHz"
 
-#: src/modplug/plugin_main.cc:72 src/modplug/plugin_main.cc:77
-#: src/modplug/plugin_main.cc:82
+#: src/modplug/plugin_main.cc:71 src/modplug/plugin_main.cc:76
+#: src/modplug/plugin_main.cc:81
 msgid "Level:"
-msgstr ""
+msgstr "Úroveň:"
 
-#: src/modplug/plugin_main.cc:78
+#: src/modplug/plugin_main.cc:77
 msgid "Cutoff:"
-msgstr ""
+msgstr "Bod skrátenia"
 
-#: src/modplug/plugin_main.cc:91
+#: src/modplug/plugin_main.cc:90
 msgid "Reverb"
-msgstr ""
+msgstr "Dozvuk"
 
-#: src/modplug/plugin_main.cc:94
+#: src/modplug/plugin_main.cc:93
 msgid "Bass Boost"
-msgstr ""
+msgstr "Zvýraznenie basov"
 
-#: src/modplug/plugin_main.cc:97
+#: src/modplug/plugin_main.cc:96
 msgid "Surround"
-msgstr ""
+msgstr "Priestorový zvuk"
 
-#: src/modplug/plugin_main.cc:100
+#: src/modplug/plugin_main.cc:99
 msgid "Preamp"
-msgstr ""
+msgstr "Predzosilnenie"
 
-#: src/modplug/plugin_main.cc:107
+#: src/modplug/plugin_main.cc:106
 msgid "Oversample"
-msgstr ""
+msgstr "Oblasť vzorku"
 
-#: src/modplug/plugin_main.cc:108
+#: src/modplug/plugin_main.cc:107
 msgid "Noise reduction"
-msgstr ""
+msgstr "Redukcia šumu"
 
-#: src/modplug/plugin_main.cc:109
+#: src/modplug/plugin_main.cc:108
 msgid "Play Amiga MODs"
-msgstr ""
+msgstr "Prehrať Amiga MOD"
 
-#: src/modplug/plugin_main.cc:110
+#: src/modplug/plugin_main.cc:109
 msgid "Repeat"
-msgstr ""
+msgstr "Opakovať"
 
-#: src/modplug/plugin_main.cc:111
+#: src/modplug/plugin_main.cc:110
 msgid "Repeat count:"
-msgstr ""
+msgstr "Počet opakovaní"
 
-#: src/modplug/plugin_main.cc:112
+#: src/modplug/plugin_main.cc:111
 msgid "To repeat forever, set the repeat count to -1."
-msgstr ""
+msgstr "Pre nekonečné opakovanie, nastavte opakovanie na -1."
 
-#: src/modplug/plugin_main.cc:125 src/sid/xs_config.cc:106
+#: src/modplug/plugin_main.cc:124 src/sid/xs_config.cc:106
 msgid "These settings will take effect when Audacious is restarted."
+msgstr "Tieto nastavenia sa prejavia až po reštartovaní Audacious."
+
+#: src/moonstone/main_window.cc:72 src/moonstone/main_window.cc:73
+#: src/qtui/main_window.cc:159 src/qtui/main_window.cc:160
+#: src/skins/menus.cc:107 src/skins-qt/menus.cc:98
+msgid "Stop After This Song"
+msgstr "_Zastaviť po tejto skladbe"
+
+#: src/moonstone/moonstone.cc:39
+msgid "Moonstone"
 msgstr ""
 
+#: src/moonstone/playlist_header.cc:212 src/qtui/playlist_header.cc:258
+msgid "Reset to Defaults"
+msgstr "Obnoviť predvolené nastavenia"
+
+#: src/moonstone/playlist_model.cc:38 src/qtui/playlist_header.cc:232
+msgid "Now Playing"
+msgstr "Práve hrá"
+
+#: src/moonstone/playlist_selection.cc:66
+#: src/playlist-manager/playlist-manager.cc:201
+#: src/playlist-manager-qt/playlist-manager-qt.cc:190
+msgid "Entries"
+msgstr "Počet položiek"
+
 #: src/mpg123/mpg123.cc:54
 msgid "MPG123 Plugin"
 msgstr "MPG123 zásuvný modul"
 
-#: src/mpg123/mpg123.cc:83
-msgid "Advanced"
-msgstr ""
-
-#: src/mpg123/mpg123.cc:84
+#: src/mpg123/mpg123.cc:82
 msgid "Use accurate length calculation (slow)"
-msgstr ""
+msgstr "Použiť presný výpočet dĺžky (pomalé)"
 
-#: src/mpg123/mpg123.cc:248
+#: src/mpg123/mpg123.cc:260
 msgid "Surround"
 msgstr "Priestorový zvuk"
 
-#: src/mpris2/plugin.cc:39
+#: src/mpris2/plugin.cc:40
 msgid "MPRIS 2 Server"
 msgstr "MPRIS 2 Server"
 
-#: src/neon/neon.cc:97
+#: src/neon/neon.cc:102
 msgid "Neon HTTP/HTTPS Plugin"
 msgstr "Neon HTTP/HTTPS zásuvný modul"
 
-#: src/neon/neon.cc:521
+#: src/neon/neon.cc:526
 msgid "Error parsing redirect"
-msgstr ""
+msgstr "Počas presmerovania nastala chyba"
 
-#: src/neon/neon.cc:535
+#: src/neon/neon.cc:540
 msgid "Unknown HTTP error"
-msgstr ""
+msgstr "Neznáma HTTP chyba"
 
-#: src/neon/neon.cc:569
+#: src/neon/neon.cc:614
 msgid "Error parsing URL"
-msgstr ""
+msgstr "Počas spracovania URL nastala chyba"
 
-#: src/neon/neon.cc:632
+#: src/neon/neon.cc:687
 msgid "Too many redirects"
-msgstr ""
+msgstr "Príliš veľa presmerovaní"
 
-#: src/notify/event.cc:64
+#: src/notify/event.cc:97
 msgid "Stopped"
 msgstr "Zastavené"
 
-#: src/notify/event.cc:64
+#: src/notify/event.cc:97
 msgid "Audacious is not playing."
 msgstr "Audacious teraz neprehráva."
 
-#: src/notify/notify.cc:42
+#: src/notify/notify.cc:39
 msgid "Desktop Notifications"
-msgstr "Oznámenia na plochu"
+msgstr "Oznámenia na pracovnú plochu"
 
-#: src/notify/notify.cc:60
+#: src/notify/notify.cc:57
 msgid ""
 "Desktop Notifications Plugin for Audacious\n"
 "Copyright (C) 2010 Maximilian Bogner\n"
@@ -2531,65 +2783,122 @@
 "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 ""
+"Oznámenia na pracovnú plochu zásuvný modul pre Audacious\n"
+"Copyright (C) 2010 Maximilian Bogner\n"
+"Copyright (C) 2011-2013 John Lindgren a Jean-Alexandre Anglès d'Auriac\n"
+"\n"
+"Tento zásuvný modul je slobodný softvér: môžete ho šíriť a/alebo upravovať "
+"podľa podmienok GNU General Public License publikovanou Free Software "
+"Foundation, aa to buď verzie 3 tejto licencie, alebo (podľa vlastného "
+"zváženia) ktorej kolvek novšej verzie.\n"
+"\n"
+"Tento zásuvný modul je šírený v nádeji, že bude užitočný, ale BEZ AKEJKOĽVEK "
+"ZÁRUKY; dokonca aj bez predpokladanej záruky PREDAJNOSTI alebo VHODNOSTI PRE "
+"KONKRÉTNY ÚČEL. Pre bližšie podrobnosti sa pozrite na GNU General Public "
+"License.\n"
+"\n"
+"Spolu s týmto programom by ste mali obdržať aj kópiu GNU General Public "
+"License. Ak tomu tak nieje pozrite si nasledujúcu adresu <http://www.gnu.org/"
+"licenses/>."
 
-#: src/notify/notify.cc:110
+#: src/notify/notify.cc:104
 msgid "Show playback controls"
-msgstr ""
+msgstr "Zobraziť ovládanie prehrávania"
 
-#: src/notify/notify.cc:112
+#: src/notify/notify.cc:106
 msgid "Always show notification"
-msgstr ""
+msgstr "Vždy zobraziť upozornenia"
 
-#: src/notify/notify.cc:114
+#: src/notify/notify.cc:108
 msgid "Include album name in notification"
+msgstr "Do upozornenia zahrnúť aj názov albumu"
+
+#: src/notify/notify.cc:110
+msgid "Custom notification duration:"
 msgstr ""
 
-#: src/notify/osd.cc:58
+#: src/notify/osd.cc:74
 msgid "Show"
+msgstr "Zobraziť"
+
+#: src/openmpt/mpt.cc:50
+msgid "OpenMPT (Module Player)"
 msgstr ""
 
-#: src/notify/osd.cc:66 src/qtui/main_window.cc:178
-#: src/qtui/main_window.cc:179 src/skins/menus.cc:88
-msgid "Pause"
-msgstr "Pozastaviť"
+#: src/openmpt/mpt.cc:132
+msgid ""
+"Module player based on libopenmpt\n"
+"\n"
+"Written by: Chris Spiegel <cspiegel@gmail.com>"
+msgstr ""
 
-#: src/notify/osd.cc:73 src/qtui/main_window.cc:72 src/skins/menus.cc:91
-msgid "Next"
-msgstr "Nasledujúca"
+#: src/openmpt/mpt.cc:151
+msgid "Stereo separation:"
+msgstr ""
+
+#: src/openmpt/mpt.cc:153
+msgid "% (0=mono, 100=default, 200=full)"
+msgstr ""
+
+#: src/openmpt/mpt.cc:157
+msgid "Interpolation:"
+msgstr ""
+
+#: src/openmpt/mptwrap.h:51 src/soxr/sox-resampler.cc:189 src/xsf/plugin.cc:437
+msgid "Linear"
+msgstr ""
+
+#: src/openmpt/mptwrap.h:52
+msgid "Cubic"
+msgstr ""
+
+#: src/openmpt/mptwrap.h:53
+msgid "Windowed sinc"
+msgstr ""
+
+#: src/opus/opus.cc:39
+msgid "Opus Decoder"
+msgstr ""
 
-#: src/oss4/oss.h:93
+#: src/opus/opus.cc:336
+msgid ""
+"Opus Decoder Plugin for Audacious\n"
+"Copyright 2022 Thomas Lange"
+msgstr ""
+
+#: src/oss4/oss.h:70
 msgid "OSS4 Output"
 msgstr "OSS4 výstup"
 
-#: src/oss4/oss.h:95
+#: src/oss4/oss.h:72
 msgid "OSS3 Output"
-msgstr ""
+msgstr "OSS3 výstup"
 
 #: src/oss4/plugin.cc:35
 msgid "Default device"
-msgstr ""
+msgstr "Predvolené zariadenie"
 
-#: src/oss4/plugin.cc:77
+#: src/oss4/plugin.cc:78
 msgid "Audio device:"
 msgstr "Zvukové zariadenie:"
 
-#: src/oss4/plugin.cc:80
+#: src/oss4/plugin.cc:81
 msgid "Use alternate device:"
 msgstr "Použiť iné zariadenie:"
 
-#: src/oss4/plugin.cc:84
+#: src/oss4/plugin.cc:85
 msgid "Save volume between sessions."
 msgstr "Ulož hlasitosť medzi reláciami"
 
-#: src/oss4/plugin.cc:86
+#: src/oss4/plugin.cc:87
 msgid "Enable format conversions made by the OSS software."
 msgstr "Povoliť konverziu formátu prostredníctvom OSS."
 
-#: src/oss4/plugin.cc:88
+#: src/oss4/plugin.cc:89
 msgid "Enable exclusive mode to prevent virtual mixing."
 msgstr "Povoliť exkluzívny režim pre predchádzanie virtuálnemu zmiešavaniu."
 
-#: src/oss4/plugin.cc:100
+#: src/oss4/plugin.cc:101
 msgid ""
 "OSS4 Output Plugin for Audacious\n"
 "Copyright 2010-2012 Michał Lipski\n"
@@ -2603,75 +2912,105 @@
 "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/playlist-manager/playlist-manager.cc:37
-msgid "Playlist Manager"
+#: src/pipewire/pipewire.cc:44
+msgid "PipeWire Output"
 msgstr ""
 
-#: src/playlist-manager/playlist-manager.cc:226
-msgid "Entries"
+#: src/pipewire/pipewire.cc:118
+msgid ""
+"PipeWire Output Plugin for Audacious\n"
+"Copyright 2022 Thomas Lange\n"
+"\n"
+"Based on the PipeWire Output Plugin for Qmmp\n"
+"Copyright 2021 Ilya Kotov"
 msgstr ""
 
-#: src/playlist-manager/playlist-manager.cc:245
+#: src/pipewire/pipewire.cc:408 src/skins/menus.cc:88 src/skins-qt/menus.cc:79
+msgid "Playback"
+msgstr "Prehrávanie"
+
+#: src/playlist-manager/playlist-manager.cc:38
+#: src/playlist-manager-qt/playlist-manager-qt.cc:42
+msgid "Playlist Manager"
+msgstr "Správca zoznamu skladieb"
+
+#: src/playlist-manager/playlist-manager.cc:221
+#: src/playlist-manager-qt/playlist-manager-qt.cc:356
 msgid "_Remove"
-msgstr ""
+msgstr "_Odstrániť"
 
-#: src/playlist-manager/playlist-manager.cc:246
+#: src/playlist-manager/playlist-manager.cc:222
+#: src/playlist-manager-qt/playlist-manager-qt.cc:351
 msgid "Ren_ame"
-msgstr ""
+msgstr "Premenovať"
 
 #: src/pls/pls.cc:35
 msgid "PLS Playlists"
 msgstr "PLS zoznamy skladieb"
 
-#: src/psf/plugin.cc:45
+#: src/psf/plugin.cc:53
 msgid "OpenPSF PSF1/PSF2 Decoder"
 msgstr "OpenPSF PSF1/PSF2 dekodér"
 
-#: src/pulse_audio/pulse_audio.cc:38
+#: src/psf/plugin.cc:270
+msgid "OpenPSF Configuration"
+msgstr ""
+
+#: src/psf/plugin.cc:271 src/xsf/plugin.cc:444
+msgid "Ignore length from file"
+msgstr "Ignorovať dĺžku zo súboru"
+
+#: src/pulse/pulse_audio.cc:42
 msgid "PulseAudio Output"
 msgstr "PulseAudio výstup"
 
-#: src/pulse_audio/pulse_audio.cc:611
+#: src/pulse/pulse_audio.cc:84
+msgid "Context name:"
+msgstr ""
+
+#: src/pulse/pulse_audio.cc:86
+msgid "Stream name:"
+msgstr ""
+
+#: src/pulse/pulse_audio.cc:596
 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."
+"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 ""
 "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."
+"Tento program je slobodný softvér: môžete ho šíriť a/alebo upravovať podľa "
+"podmienok GNU General Public License publikovanou Free Software Foundation; "
+"a to buď verzie 2 tejto licencie alebo (podľa vlastného zváženia) "
+"ktorejkoľvek novšej verzie.\n"
+"\n"
+"Tento program je šírený v nádeji, že bude užitočný, ale BEZ AKEJKOĽVEK "
+"ZÁRUKY; dokonca aj bez predpokladanej záruky PREDAJNOSTI alebo VHODNOSTI PRE "
+"KONKRÉTNY ÚČEL. Pre bližšie podrobnosti sa pozrite na GNU General Public "
+"License.\n"
+"\n"
+"Spolu s týmto programom by ste mali obdržať aj kópiu GNU General Public "
+"License. Ak tomu tak nieje napíšte do Free Software Foundation, Inc., 51 "
+"Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 
-#: src/qtaudio/qtaudio.cc:49
+#: src/qtaudio/qtaudio.cc:53
 msgid "QtMultimedia Output"
-msgstr ""
+msgstr "Výstup QtMultimedia"
 
-#: src/qtaudio/qtaudio.cc:77
+#: src/qtaudio/qtaudio.cc:84
 msgid ""
 "QtMultimedia Audio Output Plugin for Audacious\n"
 "Copyright 2014 William Pitcock\n"
@@ -2679,49 +3018,91 @@
 "Based on SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
 msgstr ""
+"Výstupný zásuvný modul QtMultimedia pre Audacious\n"
+"Copyright 2014 William Pitcock\n"
+"\n"
+"Založené na výstupnom zásuvnom module SDL pre Audacious\n"
+"Copyright 2010 John Lindgren"
 
-#: src/qtui/dialog_windows.cc:31
-msgid "Working ..."
+#: src/qtglspectrum/gl-spectrum.cc:41
+msgid ""
+"OpenGL Spectrum Analyzer for Audacious\n"
+"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
+"Copyright 2014, 2020 Ariadne Conill\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/qtui/filter_input.cc:44 src/skins/ui_playlist.cc:221
-msgid "Search"
+#: src/qthotkey/gui.cc:177
+msgid "Press a key combination inside a text field."
 msgstr ""
 
-#: src/qtui/main_window_actions.cc:94
-msgid "_Open Folder ..."
+#: src/qthotkey/plugin.cc:105
+msgid ""
+"Global Hotkey Plugin\n"
+"Control the player with global key combinations or multimedia keys.\n"
+"\n"
+"Copyright (C) 2020 i.Dark_Templar <darktemplar@dark-templar-archives.net>\n"
+"Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n"
+"\n"
+"Contributors 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/qtui/main_window_actions.cc:96
+#: src/qtui/menus.cc:109
+msgid "_Open Folder ..."
+msgstr "_Otvoriť priečinok ..."
+
+#: src/qtui/menus.cc:115
 msgid "_Add Folder ..."
-msgstr ""
+msgstr "_Pridať priečinok ..."
 
-#: src/qtui/main_window_actions.cc:101
+#: src/qtui/menus.cc:128
 msgid "_Log Inspector ..."
+msgstr "Inšpektor logov"
+
+#: src/qtui/menus.cc:220
+msgid "_Find ..."
+msgstr "_Hľadať ..."
+
+#: src/qtui/menus.cc:256 src/skins/menus.cc:80 src/skins-qt/menus.cc:70
+msgid "Audio Settings ..."
+msgstr "Nastavenie zvuku ..."
+
+#: src/qtui/playlist_model.cc:188
+msgid "Q#"
 msgstr ""
 
-#: src/qtui/main_window.cc:64
-msgid "Open Files"
+#: src/qtui/playlist_model.cc:190
+msgid "T#"
 msgstr ""
 
-#: src/qtui/main_window.cc:66
-msgid "Add Files"
+#: src/qtui/playlist_model.cc:192
+msgid "C#"
 msgstr ""
 
-#: src/qtui/main_window.cc:71 src/skins/menus.cc:90
-msgid "Previous"
-msgstr "Predchádzajúca"
+#: src/qtui/playlist_model.cc:194
+msgid "D#"
+msgstr ""
 
-#: src/qtui/main_window.cc:77 src/skins/menus.cc:82
-msgid "Repeat"
-msgstr "Opakovať"
+#: src/qtui/qtui.cc:40
+msgid "Qt Interface"
+msgstr "Qt prostredie"
 
-#: src/qtui/main_window.cc:79 src/skins/menus.cc:83
-msgid "Shuffle"
-msgstr "Náhodné poradie"
+#: src/qtui/search_bar.cc:46
+msgid "Search playlist"
+msgstr "Prehľadať zoznam skladieb"
 
-#: src/qtui/qtui.cc:42
-msgid "Qt Interface"
+#: src/qtui/settings.cc:79
+msgid "Use bold font for column headers"
 msgstr ""
 
 #: src/resample/resample.cc:43
@@ -2738,7 +3119,7 @@
 
 #: src/resample/resample.cc:187
 msgid "Skip/repeat samples"
-msgstr "Preskoč/opakuj vzorky"
+msgstr "Preskočiť/opakovať vzorky"
 
 #: src/resample/resample.cc:188
 msgid "Linear interpolation"
@@ -2764,7 +3145,7 @@
 msgid "Method:"
 msgstr "Metóda:"
 
-#: src/resample/resample.cc:199 src/sox-resampler/sox-resampler.cc:161
+#: src/resample/resample.cc:199 src/soxr/sox-resampler.cc:203
 msgid "Rate:"
 msgstr "Hodnotenie:"
 
@@ -2790,7 +3171,7 @@
 
 #: src/resample/resample.cc:217
 msgid "32.0 kHz:"
-msgstr ""
+msgstr "32.0 kHz:"
 
 #: src/resample/resample.cc:221
 msgid "44.1 kHz:"
@@ -2802,7 +3183,7 @@
 
 #: src/resample/resample.cc:229
 msgid "88.2 kHz:"
-msgstr ""
+msgstr "88.2 kHz:"
 
 #: src/resample/resample.cc:233
 msgid "96 kHz:"
@@ -2810,94 +3191,83 @@
 
 #: src/resample/resample.cc:237
 msgid "176.4 kHz:"
-msgstr ""
+msgstr "176.4 kHz:"
 
 #: src/resample/resample.cc:241
 msgid "192 kHz:"
 msgstr "192 kHz:"
 
-#: src/scrobbler2/config_window.cc:41
-#, c-format
-msgid "OK. Scrobbling for user: %s"
-msgstr ""
-
-#: src/scrobbler2/config_window.cc:54
-msgid "Permission Denied"
-msgstr ""
+#: src/scrobbler2/config_window.cc:29
+msgid "Checking Last.fm access ..."
+msgstr "Kontroluje sa prístup k Last.fm ..."
 
-#: src/scrobbler2/config_window.cc:56
-msgid "Access the following link to allow Audacious to scrobble your plays:"
+#: src/scrobbler2/config_window.cc:35
+msgid ""
+"Your scrobbles are being saved on your computer temporarily. They will be "
+"submitted as soon as Audacious is allowed access."
 msgstr ""
+"Prehrané skladby sú v počítači uložené len dočasne. Okamžite ako bude pre "
+"Audacious udelený prístup budú odoslané."
 
-#: src/scrobbler2/config_window.cc:66
-msgid "Keep this window open and click 'Check Permission' again.\n"
-msgstr ""
+#: src/scrobbler2/config_window.cc:41
+#, c-format
+msgid "Permission granted. Scrobbling for user %s."
+msgstr "Oprávnenie udelené. Scrobbluje sa pre používateľa %s."
 
-#: src/scrobbler2/config_window.cc:69 src/scrobbler2/config_window.cc:80
+#: src/scrobbler2/config_window.cc:44
 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.cc:77
-msgid "Network Problem."
+"Permission denied. Open the following URL in a browser, allow Audacious "
+"access to your account, and then click 'Check Permission' again:"
 msgstr ""
+"Oprávnenie zakázané. Otvorte nasledujúcu URL vo webovom prehliadači a "
+"povoľte prístup Audacious k vášmu účtu, potom kliknite na \"Znovu "
+"skontrolovať oprávnenie\":"
 
-#: src/scrobbler2/config_window.cc:78
-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/scrobbler2/config_window.cc:53
+msgid "There was a problem contacting Last.fm."
+msgstr "Vyskytol sa problém s pripojením k Last.fm."
 
-#: src/scrobbler2/config_window.cc:110
-msgid "Checking..."
-msgstr ""
+#: src/scrobbler2/config_window.cc:92
+msgid "Check Permission"
+msgstr "Skontrolovať oprávnenie"
 
-#: src/scrobbler2/config_window.cc:176
-msgid "C_heck Permission"
-msgstr ""
+#: src/scrobbler2/config_window.cc:93
+msgid "Revoke Permission"
+msgstr "Zrušiť oprávnenie"
 
-#: src/scrobbler2/config_window.cc:177
-msgid "_Revoke Permission"
-msgstr ""
-
-#: src/scrobbler2/config_window.cc:220
-msgid ""
-"You need to allow Audacious to scrobble tracks to your Last.fm account.\n"
+#: src/scrobbler2/config_window.cc:97
+msgid "You need to allow Audacious to scrobble tracks to your Last.fm account."
 msgstr ""
+"Aby mohol Audacious scrobbleovať skladby do Last.fm účtu je nutné udelenie "
+"oprávnenia."
 
 #: src/scrobbler2/scrobbler.cc:29
 msgid "Scrobbler 2.0"
-msgstr ""
+msgstr "Scrobbler 2.0"
 
-#: src/scrobbler2/scrobbler.cc:224
+#: src/scrobbler2/scrobbler.cc:200
 msgid ""
 "The Scrobbler plugin could not be started.\n"
 "There might be a problem with your installation."
 msgstr ""
+"Zásuvný modul Scrobber nie je možné spustiť.\n"
+"Toto môže spôsobovať problém vo vašej inštalácii."
 
-#: src/scrobbler2/scrobbler.cc:289
+#: src/scrobbler2/scrobbler.cc:245
 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_communication.cc:642
-msgid ""
-"Audacious is now using an improved version of the Last.fm Scrobbler.\n"
-"Please check the Preferences for the Scrobbler plugin."
+"project."
 msgstr ""
-"Audacious odteraz používa vylepšenú verziu doplnku Last.fm Scrobbler.\n"
-"Prosím, skontrolujte Predvoľby doplnku Scrobbler."
 
-#: src/sdlout/sdlout.cc:48
+#: src/sdlout/sdlout.cc:43
 msgid "SDL Output"
 msgstr "SDL výstup"
 
-#: src/sdlout/sdlout.cc:77
+#: src/sdlout/sdlout.cc:72
 msgid ""
 "SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
@@ -2905,59 +3275,45 @@
 "SDL výstupný zásuvný modul pre Aduacious\n"
 "Copyright 2010 John Lindgren"
 
-#: src/search-tool/search-tool.cc:116 src/search-tool/search-tool.cc:124
+#: src/search-tool/library.cc:35 src/search-tool/library.cc:46
+#: src/search-tool-qt/library.cc:35 src/search-tool-qt/library.cc:46
 msgid "Library"
 msgstr "Knižnica"
 
-#: src/search-tool/search-tool.cc:394
-#, c-format
-msgid "%d result"
-msgid_plural "%d results"
-msgstr0 ""
-msgstr1 ""
-msgstr2 ""
-
-#: src/search-tool/search-tool.cc:400
-#, c-format
-msgid "(%d hidden)"
-msgid_plural "(%d hidden)"
-msgstr0 ""
-msgstr1 ""
-msgstr2 ""
-
-#: src/search-tool/search-tool.cc:594
+#: src/search-tool-qt/search-model.cc:44 src/search-tool/search-tool.cc:287
 #, c-format
 msgid "%d song"
 msgid_plural "%d songs"
-msgstr0 ""
-msgstr1 ""
-msgstr2 ""
+msgstr0 "%d skladba"
+msgstr1 "%d skladby"
+msgstr2 "%d skladieb"
+msgstr3 "%d skladieb"
 
-#: src/search-tool/search-tool.cc:601
+#: src/search-tool-qt/search-model.cc:53 src/search-tool/search-tool.cc:294
 msgid "of this genre"
-msgstr ""
+msgstr "tohto žánru"
 
-#: src/search-tool/search-tool.cc:607
+#: src/search-tool-qt/search-model.h:47 src/search-tool/search-model.h:45
 msgid "on"
-msgstr ""
+msgstr "na"
 
-#: src/search-tool/search-tool.cc:607
+#: src/search-tool-qt/search-model.h:47 src/search-tool/search-model.h:45
 msgid "by"
-msgstr ""
+msgstr "od"
 
-#: src/search-tool/search-tool.cc:643
-msgid "_Create Playlist"
-msgstr "_Vytvoriť zoznam skladieb"
+#: src/search-tool-qt/search-tool-qt.cc:165 src/search-tool/search-tool.cc:74
+msgid "Number of results to show:"
+msgstr ""
 
-#: src/search-tool/search-tool.cc:645
-msgid "_Add to Playlist"
-msgstr "_Pridať do zoznamu skladieb"
+#: src/search-tool-qt/search-tool-qt.cc:168 src/search-tool/search-tool.cc:77
+msgid "Rescan library at startup"
+msgstr ""
 
-#: src/search-tool/search-tool.cc:684
-msgid "Search library"
-msgstr "Vyhľadať knižnicu"
+#: src/search-tool-qt/search-tool-qt.cc:170
+msgid "Monitor library for changes"
+msgstr ""
 
-#: src/search-tool/search-tool.cc:688
+#: src/search-tool-qt/search-tool-qt.cc:193 src/search-tool/search-tool.cc:450
 msgid ""
 "To import your music library into Audacious, choose a folder and then click "
 "the \"refresh\" icon."
@@ -2965,835 +3321,806 @@
 "Pre import hudobnej knižnice do Audacious, vyberte priečinok a potom "
 "kliknite na ikonu \"obnoviť\"."
 
-#: src/search-tool/search-tool.cc:696
+#: src/search-tool-qt/search-tool-qt.cc:195 src/search-tool/search-tool.cc:459
 msgid "Please wait ..."
 msgstr "Čakajte prosím ..."
 
-#: src/search-tool/search-tool.cc:723
+#: src/search-tool-qt/search-tool-qt.cc:197 src/search-tool/search-tool.cc:487
 msgid "Choose Folder"
 msgstr "Vybrať priečinok"
 
+#: src/search-tool-qt/search-tool-qt.cc:201 src/search-tool/search-tool.cc:445
+msgid "Search library"
+msgstr "Vyhľadať knižnicu"
+
+#: src/search-tool-qt/search-tool-qt.cc:327 src/search-tool/search-tool.cc:156
+#, c-format
+msgid "%d of %d result shown"
+msgid_plural "%d of %d results shown"
+msgstr0 "Zobrazený %d z%d výsledku"
+msgstr1 "Zobrazené %d z %d výsledkov"
+msgstr2 "Zobrazené %d z(o) %d výledkov"
+msgstr3 "Zobrazené %d z(o) %d výledkov"
+
+#: src/search-tool-qt/search-tool-qt.cc:331 src/search-tool/search-tool.cc:160
+#, c-format
+msgid "%d result"
+msgid_plural "%d results"
+msgstr0 "%d výsledok"
+msgstr1 "%d výsledky"
+msgstr2 "%d výsledkov"
+msgstr3 "%d výsledkov"
+
+#: src/search-tool-qt/search-tool-qt.cc:501 src/search-tool/search-tool.cc:341
+msgid "_Create Playlist"
+msgstr "_Vytvoriť zoznam skladieb"
+
+#: src/search-tool-qt/search-tool-qt.cc:503 src/search-tool/search-tool.cc:343
+msgid "_Add to Playlist"
+msgstr "_Pridať do zoznamu skladieb"
+
 #: src/sid/xmms-sid.cc:43
 msgid "SID Player"
-msgstr ""
-
-#: src/sid/xs_config.cc:61
-msgid "Output"
-msgstr ""
+msgstr "SID Prehhrávač"
 
 #: src/sid/xs_config.cc:62
 msgid "Channels:"
-msgstr ""
+msgstr "Kanály:"
 
 #: src/sid/xs_config.cc:68
 msgid "Emulation"
-msgstr ""
+msgstr "Emulácia"
 
 #: src/sid/xs_config.cc:69
 msgid "Emulate MOS 8580 (default: MOS 6581)"
-msgstr ""
+msgstr "Emuluje sa MOS 8580 (predvolené: MOS 6581)"
 
 #: src/sid/xs_config.cc:71
 msgid "Do not automatically select chip model"
-msgstr ""
+msgstr "Nevyberať automaticky model čipu"
 
 #: src/sid/xs_config.cc:73
 msgid "Emulate filter"
-msgstr ""
+msgstr "Emulovať filter"
 
 #: src/sid/xs_config.cc:75
 msgid "Clock speed:"
-msgstr ""
+msgstr "Hodinová frekvencia"
 
 #: src/sid/xs_config.cc:78
 msgid "Do not automatically select clock speed"
-msgstr ""
+msgstr "Nevyberať automaticky hodinovú frekvenciu"
 
 #: src/sid/xs_config.cc:80
 msgid "Playback time"
-msgstr ""
+msgstr "Čas prehrávania"
 
 #: src/sid/xs_config.cc:81
 msgid "Set maximum playback time:"
-msgstr ""
+msgstr "Nastaviť maximálny čas prehrávania:"
 
 #: src/sid/xs_config.cc:87
 msgid "Use only when song length is unknown"
-msgstr ""
+msgstr "Použiť iba v prípade, ak je dĺžka skladby neznáma"
 
 #: src/sid/xs_config.cc:90
 msgid "Set minimum playback time:"
-msgstr ""
+msgstr "Nastaviť minimálny čas prehrávania:"
 
 #: src/sid/xs_config.cc:96
 msgid "Subtunes"
-msgstr ""
+msgstr "Subtunes"
 
 #: src/sid/xs_config.cc:97
 msgid "Enable subtunes"
-msgstr ""
+msgstr "Povoliť subtunes"
 
 #: src/sid/xs_config.cc:99
 msgid "Ignore subtunes shorter than:"
-msgstr ""
+msgstr "Ignorovať subtunes kratšie ako:"
 
 #: src/sid/xs_config.cc:105
 msgid "Note"
-msgstr ""
+msgstr "Poznámka"
 
 #: src/silence-removal/silence-removal.cc:39
 msgid "Silence Removal"
-msgstr ""
+msgstr "Odstránenie ticha"
 
 #: src/silence-removal/silence-removal.cc:58
 msgid ""
 "Silence Removal Plugin for Audacious\n"
 "Copyright 2014 John Lindgren"
 msgstr ""
+"Silence Removal zásuvný modul pre Audacious\n"
+"Copyright 2014 John Lindgren"
 
 #: src/silence-removal/silence-removal.cc:67
 msgid "Silence Removal"
-msgstr ""
+msgstr "Odstránenie ticha"
 
 #: src/silence-removal/silence-removal.cc:68
 msgid "Threshold:"
-msgstr ""
+msgstr "Prah:"
 
-#: src/silence-removal/silence-removal.cc:70
-msgid "dB"
-msgstr ""
+#: src/skins/actions.cc:45 src/skins-qt/actions.cc:43
+msgid "Repeat points cleared."
+msgstr "Body opakovania boli odstránené."
 
-#: src/skins/menus.cc:64
-msgid "Open Files ..."
-msgstr ""
+#: src/skins/actions.cc:60 src/skins-qt/actions.cc:58
+msgid "Repeat point A set."
+msgstr "Nastaviť bod opakovania A."
 
-#: src/skins/menus.cc:65
-msgid "Open URL ..."
-msgstr ""
+#: src/skins/actions.cc:65 src/skins-qt/actions.cc:63
+msgid "Repeat point B set."
+msgstr "Nastaviť bod opakovania B."
 
-#: src/skins/menus.cc:66
-msgid "Search Library"
-msgstr ""
+#: src/skins/equalizer.cc:223 src/skins-qt/equalizer.cc:223
+msgid "Preamp"
+msgstr "Predzosilnenie"
 
-#: src/skins/menus.cc:68
-msgid "Playback"
-msgstr "Prehrávanie"
+#: src/skins/equalizer.cc:227 src/skins-qt/equalizer.cc:227
+msgid "31 Hz"
+msgstr "31 Hz"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "63 Hz"
+msgstr "63 Hz"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "125 Hz"
+msgstr "125 Hz"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "250 Hz"
+msgstr "250 Hz "
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "500 Hz"
+msgstr "500 Hz "
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "1 kHz"
+msgstr "1 kHz"
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "2 kHz"
+msgstr "2 kHz"
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "4 kHz"
+msgstr "4 kHz"
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "8 kHz"
+msgstr "8 kHz"
 
-#: src/skins/menus.cc:69
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "16 kHz"
+msgstr "16 kHz"
+
+#: src/skins/equalizer.cc:270 src/skins-qt/equalizer.cc:270
+msgid "Audacious Equalizer"
+msgstr "Ekvalizér Audacious"
+
+#: src/skins/main.cc:459 src/skins-qt/main.cc:442
+msgid "Recording on"
+msgstr "Nahrávanie zapnuté"
+
+#: src/skins/main.cc:461 src/skins-qt/main.cc:444
+msgid "Recording off"
+msgstr "Nahrávanie vypnuté"
+
+#: src/skins/main.cc:754 src/skins-qt/main.cc:701
+#, c-format
+msgid "Seek to %d:%-2.2d / %d:%-2.2d"
+msgstr "prejsť na %d:%-2.2d / %d:%-2.2d"
+
+#: src/skins/main.cc:771 src/skins-qt/main.cc:718
+#, c-format
+msgid "Volume: %d%%"
+msgstr "Hlasitosť: %d%%"
+
+#: src/skins/main.cc:784 src/skins-qt/main.cc:731
+#, c-format
+msgid "Balance: %d%% left"
+msgstr "Vyváženie: %d%% vľavo"
+
+#: src/skins/main.cc:786 src/skins-qt/main.cc:733
+msgid "Balance: center"
+msgstr "Vyváženie: stred"
+
+#: src/skins/main.cc:788 src/skins-qt/main.cc:735
+#, c-format
+msgid "Balance: %d%% right"
+msgstr "Vyváženie: %d%% vpravo"
+
+#: src/skins/main.cc:880 src/skins-qt/main.cc:827
+msgid "Options Menu"
+msgstr "Ponuka s možnosťami"
+
+#: src/skins/main.cc:884 src/skins-qt/main.cc:831
+msgid "Disable 'Always On Top'"
+msgstr "Vypnúť „Vždy navrchu“"
+
+#: src/skins/main.cc:886 src/skins-qt/main.cc:833
+msgid "Enable 'Always On Top'"
+msgstr "Zapnúť „Vždy navrchu“"
+
+#: src/skins/main.cc:889 src/skins-qt/main.cc:836
+msgid "File Info Box"
+msgstr "Informácie o súbore"
+
+#: src/skins/main.cc:892 src/skins/menus.cc:149 src/skins-qt/main.cc:839
+#: src/skins-qt/menus.cc:142
+msgid "Double Size"
+msgstr "Dvojnásobná veľkosť"
+
+#: src/skins/main.cc:895 src/skins-qt/main.cc:842
+msgid "Visualizations"
+msgstr "Vizualizácia"
+
+#: src/skins/menus.cc:74 src/skins-qt/menus.cc:64
+msgid "Volume Up"
+msgstr "Zosilniť"
+
+#: src/skins/menus.cc:75 src/skins-qt/menus.cc:65
+msgid "Volume Down"
+msgstr "Stíšiť"
+
+#: src/skins/menus.cc:77 src/skins-qt/menus.cc:67
+msgid "Effects ..."
+msgstr "Efekty..."
+
+#: src/skins/menus.cc:84 src/skins-qt/menus.cc:74
+msgid "Open Files ..."
+msgstr "Otvoriť súbory ..."
+
+#: src/skins/menus.cc:85 src/skins-qt/menus.cc:76
+msgid "Open URL ..."
+msgstr "Otvoriť URL ..."
+
+#: src/skins/menus.cc:89 src/skins-qt/menus.cc:80
 msgid "Playlist"
 msgstr "Zoznam skladieb"
 
-#: src/skins/menus.cc:70
+#: src/skins/menus.cc:90 src/skins-qt/menus.cc:81
+msgid "Output"
+msgstr "Výstup"
+
+#: src/skins/menus.cc:91 src/skins-qt/menus.cc:82
 msgid "View"
 msgstr "Zobrazenie"
 
-#: src/skins/menus.cc:72 src/skins/menus.cc:136 src/skins/menus.cc:149
-#: src/skins/menus.cc:214
+#: src/skins/menus.cc:93 src/skins/menus.cc:161 src/skins/menus.cc:174
+#: src/skins/menus.cc:245 src/skins-qt/menus.cc:84 src/skins-qt/menus.cc:156
+#: src/skins-qt/menus.cc:170 src/skins-qt/menus.cc:241
 msgid "Services"
-msgstr ""
+msgstr "Služby"
 
-#: src/skins/menus.cc:74
+#: src/skins/menus.cc:95 src/skins-qt/menus.cc:86
 msgid "About ..."
-msgstr ""
+msgstr "O programe ..."
 
-#: src/skins/menus.cc:75
+#: src/skins/menus.cc:96 src/skins-qt/menus.cc:87
 msgid "Settings ..."
-msgstr ""
+msgstr "Nastavenia …"
 
-#: src/skins/menus.cc:76
+#: src/skins/menus.cc:97 src/skins-qt/menus.cc:88
 msgid "Quit"
-msgstr ""
+msgstr "Ukončiť"
 
-#: src/skins/menus.cc:80 src/skins/menus.cc:206
+#: src/skins/menus.cc:101 src/skins/menus.cc:235 src/skins-qt/menus.cc:92
+#: src/skins-qt/menus.cc:231
 msgid "Song Info ..."
-msgstr ""
+msgstr "Informácie o skladbe ..."
 
-#: src/skins/menus.cc:84
+#: src/skins/menus.cc:105 src/skins-qt/menus.cc:96
+msgid "Shuffle by Album"
+msgstr "Náhodne vrámci albumu"
+
+#: src/skins/menus.cc:106 src/skins-qt/menus.cc:97
 msgid "No Playlist Advance"
 msgstr "Neprehrávať ďalšiu skladbu zo zoznamu"
 
-#: src/skins/menus.cc:85
-msgid "Stop After This Song"
-msgstr ""
-
-#: src/skins/menus.cc:93
+#: src/skins/menus.cc:117 src/skins-qt/menus.cc:108
 msgid "Set A-B Repeat"
-msgstr ""
+msgstr "Nastaviť A-B opakovanie"
 
-#: src/skins/menus.cc:94
+#: src/skins/menus.cc:118 src/skins-qt/menus.cc:109
 msgid "Clear A-B Repeat"
-msgstr ""
+msgstr "Odstrániť A-B opakovanie"
 
-#: src/skins/menus.cc:96
+#: src/skins/menus.cc:120 src/skins-qt/menus.cc:111
 msgid "Jump to Song ..."
-msgstr ""
+msgstr "Prejsť na skladbu ..."
 
-#: src/skins/menus.cc:97
+#: src/skins/menus.cc:121 src/skins-qt/menus.cc:113
 msgid "Jump to Time ..."
-msgstr ""
+msgstr "Prejsť na čas ..."
 
-#: src/skins/menus.cc:101
+#: src/skins/menus.cc:125 src/skins-qt/menus.cc:118
 msgid "Play/Resume"
-msgstr ""
+msgstr "Prehrať/Pokračovať"
 
-#: src/skins/menus.cc:103
+#: src/skins/menus.cc:127 src/skins-qt/menus.cc:120
 msgid "New Playlist"
 msgstr "Nový zoznam skladieb"
 
-#: src/skins/menus.cc:104
+#: src/skins/menus.cc:128 src/skins-qt/menus.cc:121
 msgid "Rename Playlist ..."
-msgstr ""
+msgstr "Premenovať zoznam skladieb ..."
 
-#: src/skins/menus.cc:105
+#: src/skins/menus.cc:129 src/skins-qt/menus.cc:122
 msgid "Remove Playlist"
-msgstr ""
+msgstr "Odstrániť zoznam skladieb"
 
-#: src/skins/menus.cc:107
+#: src/skins/menus.cc:131 src/skins-qt/menus.cc:124
 msgid "Previous Playlist"
-msgstr ""
+msgstr "Predchádzajúci zoznam skladieb"
 
-#: src/skins/menus.cc:108
+#: src/skins/menus.cc:132 src/skins-qt/menus.cc:125
 msgid "Next Playlist"
-msgstr ""
+msgstr "Nasledujúci zoznam skladieb"
 
-#: src/skins/menus.cc:110
+#: src/skins/menus.cc:134 src/skins-qt/menus.cc:127
 msgid "Import Playlist ..."
-msgstr ""
+msgstr "Importovať zoznam skladieb ..."
 
-#: src/skins/menus.cc:111
+#: src/skins/menus.cc:135 src/skins-qt/menus.cc:128
 msgid "Export Playlist ..."
-msgstr ""
+msgstr "Exportovať zoznam skladieb ..."
 
-#: src/skins/menus.cc:113
+#: src/skins/menus.cc:137 src/skins-qt/menus.cc:130
 msgid "Playlist Manager ..."
-msgstr ""
+msgstr "Správca zoznamu skladieb ..."
 
-#: src/skins/menus.cc:114
+#: src/skins/menus.cc:138 src/skins-qt/menus.cc:131
 msgid "Queue Manager ..."
-msgstr ""
+msgstr "Správca fronty ..."
 
-#: src/skins/menus.cc:116
+#: src/skins/menus.cc:140 src/skins-qt/menus.cc:133
 msgid "Refresh Playlist"
-msgstr ""
+msgstr "Obnoviť zoznam skladieb"
 
-#: src/skins/menus.cc:120
+#: src/skins/menus.cc:144 src/skins-qt/menus.cc:137
 msgid "Show Playlist Editor"
 msgstr "Zobraziť editor zoznamu skladieb"
 
-#: src/skins/menus.cc:121
+#: src/skins/menus.cc:145 src/skins-qt/menus.cc:138
 msgid "Show Equalizer"
 msgstr "Zobraziť ekvalizér"
 
-#: src/skins/menus.cc:123
+#: src/skins/menus.cc:147 src/skins-qt/menus.cc:140
 msgid "Show Remaining Time"
-msgstr ""
+msgstr "Ukázať ostávajúci čas"
 
-#: src/skins/menus.cc:125
+#: src/skins/menus.cc:150 src/skins-qt/menus.cc:143
 msgid "Always on Top"
 msgstr "Vždy navrchu"
 
-#: src/skins/menus.cc:126
+#: src/skins/menus.cc:151 src/skins-qt/menus.cc:145
 msgid "On All Workspaces"
-msgstr ""
+msgstr "Na všetkých plochách"
 
-#: src/skins/menus.cc:128
+#: src/skins/menus.cc:153 src/skins-qt/menus.cc:148
 msgid "Roll Up Player"
-msgstr ""
+msgstr "Vybaliť prehrávač"
 
-#: src/skins/menus.cc:129
+#: src/skins/menus.cc:154 src/skins-qt/menus.cc:149
 msgid "Roll Up Playlist Editor"
-msgstr ""
+msgstr "Vybaliť editor zoznamu skladieb"
 
-#: src/skins/menus.cc:130
+#: src/skins/menus.cc:155 src/skins-qt/menus.cc:150
 msgid "Roll Up Equalizer"
-msgstr ""
+msgstr "Vybaliť ekvalizér"
 
-#: src/skins/menus.cc:132 src/skins/ui_main.cc:854
-msgid "Double Size"
-msgstr ""
-
-#: src/skins/menus.cc:138
+#: src/skins/menus.cc:163 src/skins-qt/menus.cc:158
 msgid "Add URL ..."
-msgstr ""
+msgstr "Pridať URL ..."
 
-#: src/skins/menus.cc:139
+#: src/skins/menus.cc:164 src/skins-qt/menus.cc:160
 msgid "Add Files ..."
-msgstr ""
+msgstr "Pridať súbory …"
 
-#: src/skins/menus.cc:143 src/skins/menus.cc:171 src/skins/menus.cc:185
+#: src/skins/menus.cc:168 src/skins/menus.cc:196 src/skins/menus.cc:212
+#: src/skins-qt/menus.cc:164 src/skins-qt/menus.cc:192
+#: src/skins-qt/menus.cc:208
 msgid "By Title"
 msgstr "Podľa názvu"
 
-#: src/skins/menus.cc:144 src/skins/menus.cc:178 src/skins/menus.cc:192
+#: src/skins/menus.cc:169 src/skins/menus.cc:203 src/skins/menus.cc:219
+#: src/skins-qt/menus.cc:165 src/skins-qt/menus.cc:199
+#: src/skins-qt/menus.cc:215
 msgid "By File Name"
-msgstr ""
+msgstr "Podľa názvu súboru"
 
-#: src/skins/menus.cc:145 src/skins/menus.cc:179 src/skins/menus.cc:193
+#: src/skins/menus.cc:170 src/skins/menus.cc:204 src/skins/menus.cc:220
+#: src/skins-qt/menus.cc:166 src/skins-qt/menus.cc:200
+#: src/skins-qt/menus.cc:216
 msgid "By File Path"
-msgstr ""
+msgstr "Podľa cesty k súboru"
 
-#: src/skins/menus.cc:151
+#: src/skins/menus.cc:176 src/skins-qt/menus.cc:172
 msgid "Remove All"
 msgstr "Odstrániť všetky"
 
-#: src/skins/menus.cc:152
+#: src/skins/menus.cc:177 src/skins-qt/menus.cc:173
 msgid "Clear Queue"
-msgstr "Vyprázdniť front"
+msgstr "Vyprázdniť frontu"
 
-#: src/skins/menus.cc:154
+#: src/skins/menus.cc:179 src/skins-qt/menus.cc:175
 msgid "Remove Unavailable Files"
 msgstr "Odstrániť nedostupné súbory"
 
-#: src/skins/menus.cc:155
+#: src/skins/menus.cc:180 src/skins-qt/menus.cc:176
 msgid "Remove Duplicates"
 msgstr "Odstrániť duplikáty"
 
-#: src/skins/menus.cc:157
+#: src/skins/menus.cc:182 src/skins-qt/menus.cc:178
 msgid "Remove Unselected"
 msgstr "Odstrániť neoznačené"
 
-#: src/skins/menus.cc:158
+#: src/skins/menus.cc:183 src/skins-qt/menus.cc:179
 msgid "Remove Selected"
 msgstr "Odstrániť označené"
 
-#: src/skins/menus.cc:162
+#: src/skins/menus.cc:187 src/skins-qt/menus.cc:183
 msgid "Search and Select"
 msgstr "Hľadanie a výber"
 
-#: src/skins/menus.cc:164
+#: src/skins/menus.cc:189 src/skins-qt/menus.cc:185
 msgid "Invert Selection"
 msgstr "Invertovať výber"
 
-#: src/skins/menus.cc:165
+#: src/skins/menus.cc:190 src/skins-qt/menus.cc:186
 msgid "Select None"
 msgstr "Zrušiť výber"
 
-#: src/skins/menus.cc:166
+#: src/skins/menus.cc:191 src/skins-qt/menus.cc:187
 msgid "Select All"
 msgstr "Označiť všetko"
 
-#: src/skins/menus.cc:170 src/skins/menus.cc:184
+#: src/skins/menus.cc:195 src/skins/menus.cc:211 src/skins-qt/menus.cc:191
+#: src/skins-qt/menus.cc:207
 msgid "By Track Number"
 msgstr "Podľa čísla stopy"
 
-#: src/skins/menus.cc:172 src/skins/menus.cc:186
+#: src/skins/menus.cc:197 src/skins/menus.cc:213 src/skins-qt/menus.cc:193
+#: src/skins-qt/menus.cc:209
 msgid "By Artist"
 msgstr "Podľa umelca"
 
-#: src/skins/menus.cc:173 src/skins/menus.cc:187
+#: src/skins/menus.cc:198 src/skins/menus.cc:214 src/skins-qt/menus.cc:194
+#: src/skins-qt/menus.cc:210
 msgid "By Album"
 msgstr "Podľa albumu"
 
-#: src/skins/menus.cc:174 src/skins/menus.cc:188
+#: src/skins/menus.cc:199 src/skins/menus.cc:215 src/skins-qt/menus.cc:195
+#: src/skins-qt/menus.cc:211
 msgid "By Album Artist"
-msgstr ""
+msgstr "Podľa umelca albumu"
 
-#: src/skins/menus.cc:175 src/skins/menus.cc:190
+#: src/skins/menus.cc:200 src/skins/menus.cc:216 src/skins-qt/menus.cc:196
+#: src/skins-qt/menus.cc:212
 msgid "By Release Date"
-msgstr ""
+msgstr "Podľa dátumu vydania"
 
-#: src/skins/menus.cc:176 src/skins/menus.cc:189
+#: src/skins/menus.cc:201 src/skins/menus.cc:217 src/skins-qt/menus.cc:197
+#: src/skins-qt/menus.cc:213
 msgid "By Genre"
-msgstr ""
+msgstr "Podľa žánru"
 
-#: src/skins/menus.cc:177 src/skins/menus.cc:191
+#: src/skins/menus.cc:202 src/skins/menus.cc:218 src/skins-qt/menus.cc:198
+#: src/skins-qt/menus.cc:214
 msgid "By Length"
-msgstr ""
+msgstr "Podľa dĺžky"
 
-#: src/skins/menus.cc:180 src/skins/menus.cc:194
+#: src/skins/menus.cc:205 src/skins/menus.cc:221 src/skins-qt/menus.cc:201
+#: src/skins-qt/menus.cc:217
 msgid "By Custom Title"
+msgstr "Podľa vlastného názvu"
+
+#: src/skins/menus.cc:206 src/skins/menus.cc:222 src/skins-qt/menus.cc:202
+#: src/skins-qt/menus.cc:218
+msgid "By Comment"
+msgstr "Podľa komentára"
+
+#: src/skins/menus.cc:207 src/skins/menus.cc:223 src/skins-qt/menus.cc:203
+#: src/skins-qt/menus.cc:219
+msgid "By Disc Number"
 msgstr ""
 
-#: src/skins/menus.cc:198
+#: src/skins/menus.cc:227 src/skins-qt/menus.cc:223
 msgid "Randomize List"
 msgstr "Premiešať poradie"
 
-#: src/skins/menus.cc:199
+#: src/skins/menus.cc:228 src/skins-qt/menus.cc:224
 msgid "Reverse List"
 msgstr "Obrátiť poradie"
 
-#: src/skins/menus.cc:201
+#: src/skins/menus.cc:230 src/skins-qt/menus.cc:226
 msgid "Sort Selected"
 msgstr "Triediť výber"
 
-#: src/skins/menus.cc:202
+#: src/skins/menus.cc:231 src/skins-qt/menus.cc:227
 msgid "Sort List"
 msgstr "Triediť zoznam"
 
-#: src/skins/menus.cc:208
+#: src/skins/menus.cc:236 src/skins-qt/menus.cc:232
+msgid "Open Containing Folder"
+msgstr "Otvoriť priečinok"
+
+#: src/skins/menus.cc:238 src/skins-qt/menus.cc:234
 msgid "Cut"
 msgstr "Vystrihnúť"
 
-#: src/skins/menus.cc:209
+#: src/skins/menus.cc:239 src/skins-qt/menus.cc:235
 msgid "Copy"
 msgstr "Kopírovať"
 
-#: src/skins/menus.cc:210
+#: src/skins/menus.cc:240 src/skins-qt/menus.cc:236
 msgid "Paste"
 msgstr "Vložiť"
 
-#: src/skins/menus.cc:212
-msgid "Queue/Unqueue"
-msgstr ""
-
-#: src/skins/menus.cc:218
-msgid "Load Preset ..."
-msgstr ""
-
-#: src/skins/menus.cc:219
-msgid "Load Auto Preset ..."
-msgstr ""
-
-#: src/skins/menus.cc:220
-msgid "Load Default"
-msgstr ""
-
-#: src/skins/menus.cc:221
-msgid "Load Preset File ..."
-msgstr ""
-
-#: src/skins/menus.cc:222
-msgid "Load EQF File ..."
-msgstr ""
-
-#: src/skins/menus.cc:224
-msgid "Save Preset ..."
-msgstr ""
-
-#: src/skins/menus.cc:225
-msgid "Save Auto Preset ..."
-msgstr ""
-
-#: src/skins/menus.cc:226
-msgid "Save Default"
-msgstr ""
-
-#: src/skins/menus.cc:227
-msgid "Save Preset File ..."
-msgstr ""
+#: src/skins/menus.cc:241 src/skins-qt/menus.cc:237
+msgid "Paste at End"
+msgstr "Vložiť na koniec"
 
-#: src/skins/menus.cc:228
-msgid "Save EQF File ..."
-msgstr ""
-
-#: src/skins/menus.cc:230
-msgid "Delete Preset ..."
-msgstr ""
-
-#: src/skins/menus.cc:231
-msgid "Delete Auto Preset ..."
-msgstr ""
+#: src/skins/menus.cc:243 src/skins-qt/menus.cc:239
+msgid "Queue/Unqueue"
+msgstr "Pridať alebo odobrať z fronty"
 
-#: src/skins/menus.cc:233
-msgid "Import Winamp Presets ..."
-msgstr ""
+#: src/skins/playlist-widget.cc:58 src/skins-qt/playlist-widget.cc:58
+#, c-format
+msgid "%s (%d of %d)"
+msgstr "%s (%d z %d)"
 
-#: src/skins/menus.cc:235
-msgid "Reset to Zero"
-msgstr ""
+#: src/skins/playlistwin.cc:491 src/skins-qt/playlistwin.cc:478
+msgid "Audacious Playlist Editor"
+msgstr "Editor zoznamu skladieb"
 
-#: src/skins/plugin.cc:48
+#: src/skins/plugin.cc:53 src/skins-qt/plugin.cc:65
 msgid "Winamp Classic Interface"
-msgstr "Winamp Classic Interface"
-
-#: src/skins/preset-browser.cc:57 src/skins/preset-list.cc:371
-#: src/skins/preset-list.cc:386
-msgid "Save"
-msgstr "Uložiť"
-
-#: src/skins/preset-browser.cc:57 src/skins/preset-list.cc:338
-#: src/skins/preset-list.cc:354
-msgid "Load"
-msgstr "Načítať"
+msgstr "Vzhľad Winamp Classic"
 
-#: src/skins/preset-browser.cc:83
-msgid "Load Preset File"
-msgstr ""
+#: src/skins-qt/menus.cc:75
+msgid "Open Folder ..."
+msgstr "Otvoriť priečinok ..."
 
-#: src/skins/preset-browser.cc:100
-msgid "Load EQF File"
-msgstr ""
+#: src/skins-qt/menus.cc:159
+msgid "Add Folder ..."
+msgstr "Pridať priečinok ..."
 
-#: src/skins/preset-browser.cc:119
-msgid "Save Preset File"
-msgstr ""
+#: src/skins-qt/search-select.cc:62 src/skins/search-select.cc:77
+msgid "Search entries in active playlist"
+msgstr "Vyhľadať skladby v aktívnom zozname skladieb"
 
-#: src/skins/preset-browser.cc:137
-msgid "Save EQF File"
+#: src/skins-qt/search-select.cc:70 src/skins/search-select.cc:83
+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 ""
+"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/preset-browser.cc:151
-msgid "Import Winamp Presets"
-msgstr ""
+#: src/skins-qt/search-select.cc:75 src/skins/search-select.cc:91
+msgid "Title:"
+msgstr "Názov: "
 
-#: src/skins/preset-list.cc:285
-msgid "Presets"
-msgstr "Predvoľby"
+#: src/skins-qt/search-select.cc:79 src/skins/search-select.cc:96
+msgid "Album:"
+msgstr "Album: "
 
-#: src/skins/preset-list.cc:335
-msgid "Load preset"
-msgstr "Načítať predvoľbu"
+#: src/skins-qt/search-select.cc:82 src/skins/search-select.cc:101
+msgid "Artist:"
+msgstr "Umelec: "
 
-#: src/skins/preset-list.cc:351
-msgid "Load auto-preset"
-msgstr "Načítať automatickú predvoľbu"
+#: src/skins-qt/search-select.cc:85 src/skins/search-select.cc:106
+msgid "File Name:"
+msgstr "Názov súboru:"
 
-#: src/skins/preset-list.cc:367
-msgid "Save preset"
-msgstr "Uložiť predvoľbu"
+#: src/skins-qt/search-select.cc:88 src/skins/search-select.cc:134
+msgid "Clear previous selection before searching"
+msgstr "Pred hľadaním vymazať predchádzajúci výber"
 
-#: src/skins/preset-list.cc:382
-msgid "Save auto-preset"
-msgstr "Uložiť automatickú predvoľbu"
+#: src/skins-qt/search-select.cc:89 src/skins/search-select.cc:137
+msgid "Automatically toggle queue for matching entries"
+msgstr "Zhodujúce sa položky pridať do (odstrániť z) frontu"
 
-#: src/skins/preset-list.cc:408
-msgid "Delete preset"
-msgstr "Vymazať predvoľbu"
+#: src/skins-qt/search-select.cc:90 src/skins/search-select.cc:140
+msgid "Create a new playlist with matching entries"
+msgstr "Zo zhodujúcich sa položiek vytvoriť nový zoznam skladieb"
 
-#: src/skins/preset-list.cc:424
-msgid "Delete auto-preset"
-msgstr "Vymazať automatickú predvoľbu"
+#: src/skins-qt/search-select.cc:101 src/skins/search-select.cc:78
+msgid "Search"
+msgstr "Hľadať"
 
-#: src/skins/skins_cfg.cc:176
+#: src/skins-qt/skins_cfg.cc:198 src/skins/skins_cfg.cc:182
 msgid "Player:"
-msgstr ""
+msgstr "Prehrávač:"
 
-#: src/skins/skins_cfg.cc:178
+#: src/skins-qt/skins_cfg.cc:200 src/skins/skins_cfg.cc:184
 msgid "Select main player window font:"
 msgstr "Vyberte písmo pre hlavné okno prehrávača:"
 
-#: src/skins/skins_cfg.cc:179
+#: src/skins-qt/skins_cfg.cc:201 src/skins/skins_cfg.cc:185
 msgid "Playlist:"
-msgstr ""
+msgstr "Zoznam skladieb:"
 
-#: src/skins/skins_cfg.cc:181
+#: src/skins-qt/skins_cfg.cc:203 src/skins/skins_cfg.cc:187
 msgid "Select playlist font:"
-msgstr "Vyberte písmo pre zoznam skladieb:"
+msgstr "Zvoliť písmo pre zoznam skladieb:"
 
-#: src/skins/skins_cfg.cc:187
+#: src/skins-qt/skins_cfg.cc:207 src/skins/skins_cfg.cc:191
 msgid "Skin"
+msgstr "Téma vzhľadu"
+
+#: src/skins-qt/skins_cfg.cc:211 src/skins/skins_cfg.cc:193
+msgid "Display active titlebar when any window is focused"
 msgstr ""
 
-#: src/skins/skins_cfg.cc:189
+#: src/skins-qt/skins_cfg.cc:213 src/skins/skins_cfg.cc:195
 msgid "Fonts"
-msgstr ""
+msgstr "Písma"
 
-#: src/skins/skins_cfg.cc:192
+#: src/skins-qt/skins_cfg.cc:215 src/skins/skins_cfg.cc:197
 msgid "Use bitmap fonts (supports ASCII only)"
 msgstr "Použiť bitmapové písma (podporuje iba ASCII)"
 
-#: src/skins/skins_cfg.cc:194
+#: src/skins-qt/skins_cfg.cc:217 src/skins/skins_cfg.cc:199
 msgid "Scroll song title"
-msgstr ""
+msgstr "Rolovať názov skladby"
 
-#: src/skins/skins_cfg.cc:196
+#: src/skins-qt/skins_cfg.cc:219 src/skins/skins_cfg.cc:201
 msgid "Scroll song title in both directions"
 msgstr "Rolovať názov skladby obidvoma smermi"
 
-#: src/skins/skins_cfg.cc:201
+#: src/skins-qt/skins_cfg.cc:224 src/skins/skins_cfg.cc:206
 msgid "Analyzer"
 msgstr "Analyzátor"
 
-#: src/skins/skins_cfg.cc:202
+#: src/skins-qt/skins_cfg.cc:225 src/skins/skins_cfg.cc:207
 msgid "Scope"
 msgstr "Osciloskop"
 
-#: src/skins/skins_cfg.cc:203
+#: src/skins-qt/skins_cfg.cc:226 src/skins/skins_cfg.cc:208
 msgid "Voiceprint / VU meter"
-msgstr ""
+msgstr "Zvukový odtlačok / VU meter"
 
-#: src/skins/skins_cfg.cc:204
+#: src/skins-qt/skins_cfg.cc:227 src/skins/skins_cfg.cc:209
 msgid "Off"
 msgstr "Žiadne"
 
-#: src/skins/skins_cfg.cc:208 src/skins/skins_cfg.cc:233
-#: src/skins/skins_cfg.cc:239
+#: src/skins-qt/skins_cfg.cc:231 src/skins-qt/skins_cfg.cc:256
+#: src/skins-qt/skins_cfg.cc:262 src/skins/skins_cfg.cc:213
+#: src/skins/skins_cfg.cc:238 src/skins/skins_cfg.cc:244
 msgid "Normal"
 msgstr "Normálny"
 
-#: src/skins/skins_cfg.cc:209 src/skins/skins_cfg.cc:234
+#: src/skins-qt/skins_cfg.cc:232 src/skins-qt/skins_cfg.cc:257
+#: src/skins/skins_cfg.cc:214 src/skins/skins_cfg.cc:239
 msgid "Fire"
 msgstr "Oheň"
 
-#: src/skins/skins_cfg.cc:210
+#: src/skins-qt/skins_cfg.cc:233 src/skins/skins_cfg.cc:215
 msgid "Vertical lines"
-msgstr ""
+msgstr "Vertikálne čiary"
 
-#: src/skins/skins_cfg.cc:214
+#: src/skins-qt/skins_cfg.cc:237 src/skins/skins_cfg.cc:219
 msgid "Lines"
 msgstr "Čiary"
 
-#: src/skins/skins_cfg.cc:215
+#: src/skins-qt/skins_cfg.cc:238 src/skins/skins_cfg.cc:220
 msgid "Bars"
 msgstr "Obdĺžniky"
 
-#: src/skins/skins_cfg.cc:219
+#: src/skins-qt/skins_cfg.cc:242 src/skins/skins_cfg.cc:224
 msgid "Slowest"
 msgstr "Najpomalšie"
 
-#: src/skins/skins_cfg.cc:220
+#: src/skins-qt/skins_cfg.cc:243 src/skins/skins_cfg.cc:225
 msgid "Slow"
 msgstr "Pomaly"
 
-#: src/skins/skins_cfg.cc:221 src/sox-resampler/sox-resampler.cc:152
+#: src/skins-qt/skins_cfg.cc:244 src/skins/skins_cfg.cc:226
+#: src/soxr/sox-resampler.cc:180
 msgid "Medium"
 msgstr "Stredne"
 
-#: src/skins/skins_cfg.cc:222
+#: src/skins-qt/skins_cfg.cc:245 src/skins/skins_cfg.cc:227
 msgid "Fast"
 msgstr "Rýchlo"
 
-#: src/skins/skins_cfg.cc:223
+#: src/skins-qt/skins_cfg.cc:246 src/skins/skins_cfg.cc:228
 msgid "Fastest"
 msgstr "Najrýchlejšie"
 
-#: src/skins/skins_cfg.cc:227
+#: src/skins-qt/skins_cfg.cc:250 src/skins/skins_cfg.cc:232
 msgid "Dots"
-msgstr ""
+msgstr "Body"
 
-#: src/skins/skins_cfg.cc:228
+#: src/skins-qt/skins_cfg.cc:251 src/skins/skins_cfg.cc:233
 msgid "Line"
-msgstr ""
+msgstr "Čiara"
 
-#: src/skins/skins_cfg.cc:229
+#: src/skins-qt/skins_cfg.cc:252 src/skins/skins_cfg.cc:234
 msgid "Solid"
-msgstr ""
+msgstr "Plná vlnovka"
 
-#: src/skins/skins_cfg.cc:235
+#: src/skins-qt/skins_cfg.cc:258 src/skins/skins_cfg.cc:240
 msgid "Ice"
 msgstr "Ľad"
 
-#: src/skins/skins_cfg.cc:240
+#: src/skins-qt/skins_cfg.cc:263 src/skins/skins_cfg.cc:245
 msgid "Smooth"
 msgstr "Plynulý"
 
-#: src/skins/skins_cfg.cc:244
-msgid "Type"
-msgstr ""
-
-#: src/skins/skins_cfg.cc:245
-msgid "Visualization type:"
-msgstr ""
-
-#: src/skins/skins_cfg.cc:248
-msgid "Analyzer"
-msgstr ""
-
-#: src/skins/skins_cfg.cc:249
-msgid "Show peaks"
-msgstr ""
-
-#: src/skins/skins_cfg.cc:251
+#: src/skins-qt/skins_cfg.cc:267 src/skins/skins_cfg.cc:249
 msgid "Coloring:"
-msgstr ""
+msgstr "Farebná schéma:"
 
-#: src/skins/skins_cfg.cc:254
+#: src/skins-qt/skins_cfg.cc:270 src/skins/skins_cfg.cc:252
 msgid "Style:"
-msgstr ""
+msgstr "Štýl:"
 
-#: src/skins/skins_cfg.cc:257
+#: src/skins-qt/skins_cfg.cc:273 src/skins/skins_cfg.cc:255
 msgid "Falloff:"
-msgstr ""
+msgstr "Klesanie:"
 
-#: src/skins/skins_cfg.cc:260
+#: src/skins-qt/skins_cfg.cc:276 src/skins/skins_cfg.cc:258
 msgid "Peak falloff:"
-msgstr ""
+msgstr "Klesanie vrcholu:"
 
-#: src/skins/skins_cfg.cc:264
+#: src/skins-qt/skins_cfg.cc:282 src/skins/skins_cfg.cc:264
 msgid "Scope Style:"
-msgstr ""
+msgstr "Štýl vlnovky:"
 
-#: src/skins/skins_cfg.cc:267
+#: src/skins-qt/skins_cfg.cc:285 src/skins/skins_cfg.cc:267
 msgid "Voiceprint Coloring:"
-msgstr ""
+msgstr "Farebná schéma zvukového odtlačku:"
 
-#: src/skins/skins_cfg.cc:270
+#: src/skins-qt/skins_cfg.cc:288 src/skins/skins_cfg.cc:270
 msgid "VU Meter Style:"
-msgstr ""
+msgstr "Štýl VU metera:"
 
-#: src/skins/skins_cfg.cc:276
-msgid "General"
-msgstr "Všeobecné"
-
-#: src/skins/skins_cfg.cc:277
-msgid "Visualization"
-msgstr "Vizualizácia"
-
-#: src/skins/ui_equalizer.cc:282
-msgid "Preamp"
-msgstr "Predzosilnenie"
-
-#: src/skins/ui_equalizer.cc:286
-msgid "31 Hz"
-msgstr "31 Hz"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "63 Hz"
-msgstr "63 Hz"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "125 Hz"
-msgstr "125 Hz"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "250 Hz"
-msgstr "250 Hz "
-
-#: src/skins/ui_equalizer.cc:287
-msgid "500 Hz"
-msgstr "500 Hz "
-
-#: src/skins/ui_equalizer.cc:287
-msgid "1 kHz"
-msgstr "1 kHz"
-
-#: src/skins/ui_equalizer.cc:288
-msgid "2 kHz"
-msgstr "2 kHz"
-
-#: src/skins/ui_equalizer.cc:288
-msgid "4 kHz"
-msgstr "4 kHz"
-
-#: src/skins/ui_equalizer.cc:288
-msgid "8 kHz"
-msgstr "8 kHz"
-
-#: src/skins/ui_equalizer.cc:288
-msgid "16 kHz"
-msgstr "16 kHz"
-
-#: src/skins/ui_equalizer.cc:330
-msgid "Audacious Equalizer"
-msgstr "Ekvalizér Audacious"
-
-#: src/skins/ui_main.cc:688
-#, c-format
-msgid "Seek to %d:%-2.2d / %d:%-2.2d"
-msgstr "prejsť na %d:%-2.2d / %d:%-2.2d"
-
-#: src/skins/ui_main.cc:709
-#, c-format
-msgid "Volume: %d%%"
-msgstr "Hlasitosť: %d%%"
-
-#: src/skins/ui_main.cc:732
-#, c-format
-msgid "Balance: %d%% left"
-msgstr "Vyváženie: %d%% vľavo"
-
-#: src/skins/ui_main.cc:734
-msgid "Balance: center"
-msgstr "Vyváženie: stred"
-
-#: src/skins/ui_main.cc:736
-#, c-format
-msgid "Balance: %d%% right"
-msgstr "Vyváženie: %d%% vpravo"
-
-#: src/skins/ui_main.cc:842
-msgid "Options Menu"
-msgstr "Ponuka s možnosťami"
-
-#: src/skins/ui_main.cc:846
-msgid "Disable 'Always On Top'"
-msgstr "Vypnúť „Vždy navrchu“"
-
-#: src/skins/ui_main.cc:848
-msgid "Enable 'Always On Top'"
-msgstr "Zapnúť „Vždy navrchu“"
-
-#: src/skins/ui_main.cc:851
-msgid "File Info Box"
-msgstr "Informácie o súbore"
-
-#: src/skins/ui_main.cc:857
-msgid "Visualizations"
-msgstr ""
-
-#: src/skins/ui_main.cc:1336
-msgid "Repeat point A set."
-msgstr ""
-
-#: src/skins/ui_main.cc:1341
-msgid "Repeat point B set."
-msgstr ""
-
-#: src/skins/ui_main.cc:1350
-msgid "Repeat points cleared."
-msgstr ""
-
-#: src/skins/ui_playlist.cc:219
-msgid "Search entries in active playlist"
-msgstr "Vyhľadať skladby v aktívnom zozname skladieb"
-
-#: src/skins/ui_playlist.cc:226
-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 ""
-"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.cc:234
-msgid "Title:"
-msgstr ""
-
-#: src/skins/ui_playlist.cc:241
-msgid "Album:"
-msgstr ""
-
-#: src/skins/ui_playlist.cc:248
-msgid "Artist:"
-msgstr ""
-
-#: src/skins/ui_playlist.cc:255
-msgid "File Name:"
-msgstr ""
-
-#: src/skins/ui_playlist.cc:263
-msgid "Clear previous selection before searching"
-msgstr "Pred hľadaním vymazať predchádzajúci výber"
+#: src/skins-qt/skins_cfg.cc:294 src/skins/skins_cfg.cc:276
+msgid "Type"
+msgstr "Typ"
 
-#: src/skins/ui_playlist.cc:266
-msgid "Automatically toggle queue for matching entries"
-msgstr "Zhodujúce sa položky pridať do (odstrániť z) frontu"
+#: src/skins-qt/skins_cfg.cc:295 src/skins/skins_cfg.cc:277
+msgid "Visualization type:"
+msgstr "Typ vizualizácie:"
 
-#: src/skins/ui_playlist.cc:269
-msgid "Create a new playlist with matching entries"
-msgstr "Zo zhodujúcich sa položiek vytvoriť nový zoznam skladieb"
+#: src/skins-qt/skins_cfg.cc:298 src/skins/skins_cfg.cc:280
+msgid "Analyzer"
+msgstr "Analyzátor"
 
-#: src/skins/ui_playlist.cc:717
-msgid "Audacious Playlist Editor"
-msgstr "Editor zoznamu skladieb"
+#: src/skins-qt/skins_cfg.cc:299 src/skins/skins_cfg.cc:281
+msgid "Show peaks"
+msgstr "Zobrazovať zvukové špičky"
 
-#: src/skins/ui_playlist.cc:752
-#, c-format
-msgid "%s (%d of %d)"
-msgstr "%s (%d z %d)"
+#: src/skins-qt/skins_cfg.cc:308 src/skins/skins_cfg.cc:290
+msgid "Visualization"
+msgstr "Vizualizácia"
 
-#: src/skins/ui_skinselector.cc:167
+#: src/skins-qt/skinselector.cc:98 src/skins/skinselector.cc:111
 msgid "Archived Winamp 2.x skin"
 msgstr "Zabalený vzhľad pre WinAMP 2.x"
 
-#: src/skins/ui_skinselector.cc:172
+#: src/skins-qt/skinselector.cc:102 src/skins/skinselector.cc:115
 msgid "Unarchived Winamp 2.x skin"
 msgstr "Nezabalený vzhľad pre WinAMP 2.x"
 
-#: src/skins/util.cc:430
-#, c-format
-msgid "Could not create directory (%s): %s\n"
-msgstr "Nepodarilo sa vytvoriť adresár (%s): %s\n"
-
-#: src/sndfile/plugin.cc:39
+#: src/sndfile/plugin.cc:38
 msgid "Sndfile Plugin"
 msgstr "Sndfile zásuvný modul"
 
-#: src/sndfile/plugin.cc:336
+#: src/sndfile/plugin.cc:372
 msgid ""
 "Based on the xmms_sndfile plugin:\n"
 "Copyright (C) 2000, 2002 Erik de Castro Lopo\n"
@@ -3819,109 +4146,125 @@
 "\n"
 "Pre Aduacious upravil 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."
+"Tento program je slobodný softvér: môžete ho šíriť a/alebo upravovať podľa "
+"podmienok GNU General Public License publikovanou Free Software Foundation; "
+"a to buď verzie 2 tejto licencie alebo (podľa vlastného zváženia) "
+"ktorejkoľvek novšej verzie.\n"
+"\n"
+"Tento program je šírený v nádeji, že bude užitočný, ale BEZ AKEJKOĽVEK "
+"ZÁRUKY; dokonca aj bez predpokladanej záruky PREDAJNOSTI alebo VHODNOSTI PRE "
+"KONKRÉTNY ÚČEL. Pre bližšie podrobnosti sa pozrite na GNU General Public "
+"License.\n"
+"\n"
+"Spolu s týmto programom by ste mali obdržať aj kópiu GNU General Public "
+"License. Ak tomu tak nieje napíšte do Free Software Foundation, Inc., 51 "
+"Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. "
 
-#: src/sndio-ng/sndio.cc:44
+#: src/sndio/sndio.cc:43
 msgid "Sndio Output"
-msgstr ""
+msgstr "Sndio Výstup"
 
-#: src/sndio-ng/sndio.cc:98
+#: src/sndio/sndio.cc:98
 msgid "Device (blank for default):"
-msgstr ""
+msgstr "Zariadenie (prázdne pre predvolené)"
 
-#: src/sndio-ng/sndio.cc:100
+#: src/sndio/sndio.cc:100
 msgid "Save and restore volume:"
-msgstr ""
+msgstr "Uložiť a obnoviť hlasitosť:"
 
-#: src/sndio-ng/sndio.cc:181
+#: src/sndio/sndio.cc:181
 #, c-format
 msgid "Sndio error: Unsupported audio format (%d)"
-msgstr ""
+msgstr "Sndio chyba: Nepodporovaný zvukový formát (%d)"
 
-#: src/sndio-ng/sndio.cc:192
+#: src/sndio/sndio.cc:192
 msgid "Sndio error: sio_open() failed"
-msgstr ""
+msgstr "Sndio chyba: sio_open() zlyhal"
 
-#: src/sndio-ng/sndio.cc:222
+#: src/sndio/sndio.cc:221
 msgid "Sndio error: sio_setpar() failed"
-msgstr ""
+msgstr "Sndio chyba: sio_setpar() zlyhal"
 
-#: src/sndio-ng/sndio.cc:234
+#: src/sndio/sndio.cc:233
 msgid "Sndio error: sio_start() failed"
-msgstr ""
+msgstr "Sndio chyba: sio_start() zlyhal"
 
-#: src/song_change/song_change.cc:33
+#: src/songchange/song_change.cc:30
 msgid "Song Change"
 msgstr "Zmena skladby"
 
-#: src/song_change/song_change.cc:342
-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.</"
-"span>"
-
-#: src/song_change/song_change.cc:358
+#: src/songchange/song_change.cc:256
 msgid "Commands"
-msgstr ""
+msgstr "Príkazy"
 
-#: src/song_change/song_change.cc:360
+#: src/songchange/song_change.cc:258
 msgid "Command to run when starting a new song:"
+msgstr "Príkaz sa vykoná na začiatku novej skladby:"
+
+#: src/songchange/song_change.cc:261
+msgid "Command to run when stopping a song:"
 msgstr ""
 
-#: src/song_change/song_change.cc:364
+#: src/songchange/song_change.cc:264
 msgid "Command to run at the end of a song:"
-msgstr ""
+msgstr "Príkaz sa vykoná po skončení skladby:"
 
-#: src/song_change/song_change.cc:368
+#: src/songchange/song_change.cc:267
 msgid "Command to run at the end of the playlist:"
-msgstr ""
+msgstr "Príkaz sa vykoná po skončení zoznamu skladieb:"
 
-#: src/song_change/song_change.cc:372
+#: src/songchange/song_change.cc:270
 msgid "Command to run when song title changes (for network streams):"
+msgstr "Príkaz sa vykoná, keď sa zmení názov skladby (pre sieťové streamy):"
+
+#: src/songchange/song_change.cc:273
+msgid ""
+"You can use the following format codes, which will be replaced before "
+"running the command.\n"
+"Not all are useful though for the song-stopped or end-of-playlist command."
 msgstr ""
 
-#: src/song_change/song_change.cc:376
+#: src/songchange/song_change.cc:276
 msgid ""
-"You can use the following format strings which will be substituted before "
-"calling the command (not all are useful for the end-of-playlist command):\n"
-"\n"
-"%F: Frequency (in hertz)\n"
+"%a: Artist\n"
+"%b: Album\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"
+"%F: Frequency (Hertz)\n"
+"%l: Length (milliseconds)\n"
+"%n or %s: Formatted title (see playlist settings)\n"
 "%p: Currently playing (1 or 0)\n"
-"%a: Artist\n"
-"%b: Album\n"
-"%T: Track title"
-msgstr ""
-
-#: src/song-info-qt/song-info.cc:32
-msgid "Song Info (Qt)"
+"%r: Rate (bits per second)\n"
+"%t: Playlist position\n"
+"%T: Title (unformatted)"
 msgstr ""
+"%a: Umelec\n"
+"%b: Album\n"
+"%c: Počet kanálov\n"
+"%f: Názov súboru (úplná cesta)\n"
+"%F: Frekvencia (Hz)\n"
+"%l: Dĺžka (v millisekundách)\n"
+"%n alebo %s: Formátovaný názov (pozri nastavenia zoznamu skladieb)\n"
+"%p: Aktuálna prehrávaná skladba (1 alebo 0)\n"
+"%r: Datový tok (bity za sekundu)\n"
+"%t: Pozícia v zozname skladieb\n"
+"%T: Názov (neformátovaný)"
+
+#: src/songchange/song_change.cc:287
+msgid ""
+"Parameters passed to the shell should be enclosed in quotation marks.\n"
+"Unquoted parameters may lead to unexpected results."
+msgstr ""
+
+#: src/song-info-qt/song-info.cc:30
+msgid "Song Info"
+msgstr "Informácie o skladbe"
 
-#: src/sox-resampler/sox-resampler.cc:44
+#: src/soxr/sox-resampler.cc:44
 msgid "SoX Resampler"
-msgstr ""
+msgstr "SoX Resampler"
 
-#: src/sox-resampler/sox-resampler.cc:144
+#: src/soxr/sox-resampler.cc:172
 msgid ""
 "SoX Resampler Plugin for Audacious\n"
 "Copyright 2013 Michał Lipski\n"
@@ -3929,97 +4272,150 @@
 "Based on Sample Rate Converter Plugin:\n"
 "Copyright 2010-2012 John Lindgren"
 msgstr ""
+"SoX Resampler zásuvný modul pre Audacious\n"
+"Copyright 2013 Michał Lipski\n"
+"\n"
+"Na základe zásuvného modulu Sample Rate Converter:\n"
+"Copyright 2010-2012 John Lindgren"
 
-#: src/sox-resampler/sox-resampler.cc:150
+#: src/soxr/sox-resampler.cc:178
 msgid "Quick"
-msgstr ""
+msgstr "Rýchlo"
 
-#: src/sox-resampler/sox-resampler.cc:151
+#: src/soxr/sox-resampler.cc:179
 msgid "Low"
-msgstr ""
+msgstr "Nízka"
 
-#: src/sox-resampler/sox-resampler.cc:153
+#: src/soxr/sox-resampler.cc:181
 msgid "High"
-msgstr ""
+msgstr "Vysoká"
 
-#: src/sox-resampler/sox-resampler.cc:154
+#: src/soxr/sox-resampler.cc:182
 msgid "Very High"
+msgstr "Veľmi vysoká"
+
+#: src/soxr/sox-resampler.cc:183
+msgid "Ultra High"
+msgstr ""
+
+#: src/soxr/sox-resampler.cc:187
+msgid "Minimum"
+msgstr ""
+
+#: src/soxr/sox-resampler.cc:188
+msgid "Intermediate"
 msgstr ""
 
-#: src/sox-resampler/sox-resampler.cc:158
+#: src/soxr/sox-resampler.cc:193
 msgid "Quality:"
+msgstr "Kvalita:"
+
+#: src/soxr/sox-resampler.cc:196
+msgid "Phase:"
+msgstr ""
+
+#: src/soxr/sox-resampler.cc:200
+msgid "Allow aliasing"
+msgstr ""
+
+#: src/soxr/sox-resampler.cc:202
+msgid "Use steep filter"
 msgstr ""
 
-#: src/speed-pitch/speed-pitch.cc:51
+#: src/speedpitch/speed-pitch.cc:54
 msgid "Speed and Pitch"
 msgstr "Rýchlosť a výška"
 
-#: src/speed-pitch/speed-pitch.cc:210
-msgid "Speed and Pitch"
-msgstr "Rýchlosť a výška"
-
-#: src/speed-pitch/speed-pitch.cc:211
-msgid "Speed:"
-msgstr "Rýchlosť"
-
-#: src/speed-pitch/speed-pitch.cc:214
-msgid "Pitch:"
-msgstr "Výška"
+#: src/speedpitch/speed-pitch.cc:247
+msgid "Speed"
+msgstr "Rýchlosť"
+
+#: src/speedpitch/speed-pitch.cc:248
+msgid "Decouple from pitch"
+msgstr "Oddeliť od výšok"
+
+#: src/speedpitch/speed-pitch.cc:250 src/speedpitch/speed-pitch.cc:258
+msgid "Multiplier:"
+msgstr "Násobič:"
+
+#: src/speedpitch/speed-pitch.cc:254
+msgid "Pitch"
+msgstr "Výška"
 
-#: src/statusicon/statusicon.cc:47
+#: src/statusicon-qt/statusicon.cc:45 src/statusicon/statusicon.cc:47
 msgid "Status Icon"
 msgstr "Stavová ikona"
 
-#: src/statusicon/statusicon.cc:283
-msgid "Se_ttings ..."
-msgstr ""
-
-#: src/statusicon/statusicon.cc:372
+#: src/statusicon-qt/statusicon.cc:68
 msgid ""
-"Status Icon Plugin\n"
+"Status Icon Plugin (partial port for Qt interface)\n"
 "\n"
 "Copyright 2005-2007 Giacomo Lozito <james@develia.org>\n"
 "Copyright 2010 Michał Lipski <tallica@o2.pl>\n"
+"Copyright 2015 Eugene Paskevich <eugene@raptor.kiev.ua>\n"
 "\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"
+"Zásuvný modul stavovej ikony (čiastočný port Qt prostredia)\n"
 "\n"
 "Copyright 2005-2007 Giacomo Lozito <james@develia.org>\n"
 "Copyright 2010 Michał Lipski <tallica@o2.pl>\n"
+"Copyright 2015 Eugene Paskevich <eugene@raptor.kiev.ua>\n"
 "\n"
-"Tento zásuvný modul poskytuje stavovú ikonu, umiestnenú v\n"
+"Tento zásuvný modul poskytuje stavovú ikonu umiestenú v\n"
 "stavovej oblasti správcu okien."
 
-#: src/statusicon/statusicon.cc:379
+#: src/statusicon-qt/statusicon.cc:89 src/statusicon/statusicon.cc:384
 msgid "Mouse Scroll Action"
 msgstr "Rolovanie kolieskom myši"
 
-#: src/statusicon/statusicon.cc:380
+#: src/statusicon-qt/statusicon.cc:90 src/statusicon/statusicon.cc:385
 msgid "Change volume"
 msgstr "Zmeniť hlasitosť"
 
-#: src/statusicon/statusicon.cc:383
+#: src/statusicon-qt/statusicon.cc:93 src/statusicon/statusicon.cc:388
 msgid "Change playing song"
 msgstr "Zmeniť prehrávanú skladbu"
 
-#: src/statusicon/statusicon.cc:386
+#: src/statusicon-qt/statusicon.cc:96 src/statusicon/statusicon.cc:391
 msgid "Other Settings"
 msgstr "Ostatné nastavenia"
 
-#: src/statusicon/statusicon.cc:387
+#: src/statusicon-qt/statusicon.cc:97 src/statusicon/statusicon.cc:392
 msgid "Disable the popup window"
 msgstr "Zakázať vyskakovacie okno"
 
-#: src/statusicon/statusicon.cc:389
+#: src/statusicon-qt/statusicon.cc:99 src/statusicon/statusicon.cc:394
 msgid "Close to the system tray"
 msgstr "Zatvor do systémového zásobníka"
 
-#: src/statusicon/statusicon.cc:391
+#: src/statusicon-qt/statusicon.cc:101 src/statusicon/statusicon.cc:396
 msgid "Advance in playlist when scrolling upward"
 msgstr "Pokračovať v zozname skladieb ak sa posúva smerom hore"
 
+#: src/statusicon-qt/statusicon.cc:116 src/statusicon/statusicon.cc:287
+msgid "Se_ttings ..."
+msgstr "Nas_tavenia..."
+
+#: src/statusicon/statusicon.cc:377
+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 ""
+"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/stereo_plugin/stereo.cc:19
 msgid "Extra Stereo"
 msgstr "Extra Stereo"
@@ -4038,20 +4434,160 @@
 msgid "Extra Stereo"
 msgstr "Extra Stereo"
 
+#: src/streamtuner/icecast-model.cc:126 src/streamtuner/shoutcast-model.cc:131
+msgid "Type"
+msgstr ""
+
+#: src/streamtuner/icecast-model.cc:132
+msgid "Current Song"
+msgstr ""
+
+#: src/streamtuner/icecast-model.cc:164
+msgid "Other"
+msgstr ""
+
+#: src/streamtuner/ihr-model.cc:63
+msgid "Market"
+msgstr ""
+
+#: src/streamtuner/ihr-model.cc:156
+msgid "Call Letters"
+msgstr ""
+
+#: src/streamtuner/ihr-model.cc:162
+msgid "Description"
+msgstr "Popis"
+
+#: src/streamtuner/shoutcast-model.cc:128
+msgid "Listeners"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:188
+msgid "Top 500 Stations"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:189
+msgid "Alternative"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:190
+msgid "Blues"
+msgstr "Blues"
+
+#: src/streamtuner/shoutcast-model.cc:191
+msgid "Classical"
+msgstr "Klasika"
+
+#: src/streamtuner/shoutcast-model.cc:192
+msgid "Country"
+msgstr "Country"
+
+#: src/streamtuner/shoutcast-model.cc:193
+msgid "Decades"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:194
+msgid "Easy Listening"
+msgstr "Príjemné počúvanie"
+
+#: src/streamtuner/shoutcast-model.cc:195
+msgid "Electronic"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:196
+msgid "Folk"
+msgstr "Folk"
+
+#: src/streamtuner/shoutcast-model.cc:197
+msgid "Inspirational"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:198
+msgid "International"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:199
+msgid "Jazz"
+msgstr "Jazz"
+
+#: src/streamtuner/shoutcast-model.cc:200
+msgid "Latin"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:201
+msgid "Metal"
+msgstr "Metal"
+
+#: src/streamtuner/shoutcast-model.cc:203
+msgid "New Age"
+msgstr "New Age"
+
+#: src/streamtuner/shoutcast-model.cc:204
+msgid "Pop"
+msgstr "Pop"
+
+#: src/streamtuner/shoutcast-model.cc:205
+msgid "Public Radio"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:206
+msgid "R&B and Urban"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:207
+msgid "Rap"
+msgstr "Rap"
+
+#: src/streamtuner/shoutcast-model.cc:208
+msgid "Reggae"
+msgstr "Reggae"
+
+#: src/streamtuner/shoutcast-model.cc:209
+msgid "Rock"
+msgstr "Rock"
+
+#: src/streamtuner/shoutcast-model.cc:210
+msgid "Seasonal and Holiday"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:211
+msgid "Soundtracks"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:212
+msgid "Talk"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:213
+msgid "Themes"
+msgstr ""
+
+#: src/streamtuner/streamtuner.cc:59
+msgid "Shoutcast"
+msgstr ""
+
+#: src/streamtuner/streamtuner.cc:60
+msgid "Icecast"
+msgstr ""
+
+#: src/streamtuner/streamtuner.cc:71
+msgid "Stream Tuner"
+msgstr ""
+
 #: src/tonegen/tonegen.cc:45
 msgid "Tone Generator"
 msgstr "Generátor tónov"
 
-#: src/tonegen/tonegen.cc:94
+#: src/tonegen/tonegen.cc:92
 #, c-format
 msgid "%s %.1f Hz"
 msgstr "%s %.1f Hz"
 
-#: src/tonegen/tonegen.cc:94
+#: src/tonegen/tonegen.cc:92
 msgid "Tone Generator: "
 msgstr "Generátor tónov: "
 
-#: src/tonegen/tonegen.cc:160
+#: src/tonegen/tonegen.cc:161
 msgid ""
 "Sine tone generator by Håvard Kvålen <havardk@xmms.org>\n"
 "Modified by Daniel J. Peng <danielpeng@bigfoot.com>\n"
@@ -4065,11 +4601,32 @@
 "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/ui-common/dialogs-qt.cc:40
+msgid ""
+"\n"
+"(Further messages have been hidden.)"
+msgstr ""
+"\n"
+"(Ďalšie správy boli skryté.)"
+
+#: src/ui-common/dialogs-qt.cc:52
+msgid "Working ..."
+msgstr "Pracujem..."
+
+#: src/ui-common/dialogs-qt.cc:73
+msgid "Information"
+msgstr "Informácie"
+
+#: src/ui-common/menu-ops-gtk.cc:132 src/ui-common/menu-ops-qt.cc:113
+#, c-format
+msgid "%s does not appear to be a valid folder."
+msgstr ""
+
 #: src/voice_removal/voice_removal.cc:28
 msgid "Voice Removal"
 msgstr "Odstránenie hlasu"
 
-#: src/vorbis/vorbis.cc:465
+#: src/vorbis/vorbis.cc:433
 msgid ""
 "Audacious Ogg Vorbis Decoder\n"
 "\n"
@@ -4111,12 +4668,12 @@
 msgid "Ogg Vorbis Decoder"
 msgstr "Ogg Vorbis dekodér"
 
-#: src/vtx/info.cc:22
+#: src/vtx/info.cc:24
 #, c-format
 msgid "Details about %s"
-msgstr ""
+msgstr "Podrobnosti o %s"
 
-#: src/vtx/info.cc:24
+#: src/vtx/info.cc:26
 msgid ""
 "Title: %t\n"
 "Author: %a\n"
@@ -4130,12 +4687,23 @@
 "Player Freq: %P\n"
 "Year: %y"
 msgstr ""
+"Názov: %t\n"
+"Autor: %a\n"
+"Od: %f\n"
+"Tracker: %T\n"
+"Komentár: %C\n"
+"Typ čipu: %c\n"
+"Stereo: %s\n"
+"Slučka: %l\n"
+"Frekvencia čipu: %F\n"
+"Frekvencia prehrávača: %P\n"
+"Rok: %y"
 
 #: src/vtx/vtx.cc:38
 msgid "VTX Decoder"
 msgstr "VTX dekodér"
 
-#: src/vtx/vtx.cc:184
+#: src/vtx/vtx.cc:178
 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"
@@ -4145,19 +4713,61 @@
 "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/wavpack/wavpack.cc:24
+#: src/vumeter-qt/vumeter_qt.cc:31
+msgid ""
+"VU Meter Plugin for Audacious\n"
+"Copyright 2017-2019 Marc Sánchez Fauste"
+msgstr ""
+
+#: src/vumeter-qt/vumeter_qt.cc:35
+msgid "VU Meter Settings"
+msgstr ""
+
+#: src/vumeter-qt/vumeter_qt.cc:37
+msgid "Peak hold time:"
+msgstr ""
+
+#: src/vumeter-qt/vumeter_qt.cc:42
+msgid "Fall-off time:"
+msgstr ""
+
+#: src/vumeter-qt/vumeter_qt.cc:44
+msgid "dB/second"
+msgstr ""
+
+#: src/vumeter-qt/vumeter_qt.cc:46
+msgid "Display legend"
+msgstr ""
+
+#: src/vumeter-qt/vumeter_qt.h:37
+msgid "VU Meter"
+msgstr ""
+
+#: src/waveout/waveout.cc:43
+msgid "Win32 waveOut"
+msgstr "Win32 waveOut"
+
+#: src/waveout/waveout.cc:69
+msgid ""
+"Win32 waveOut Plugin for Audacious\n"
+"Copyright 2016 John Lindgren"
+msgstr ""
+"Win32 waveOut zásuvný modul pre Audacious\n"
+"Copyright 2016 John Lindgren"
+
+#: src/wavpack/wavpack.cc:25
 msgid "WavPack Decoder"
 msgstr "WavPack dekodér"
 
-#: src/wavpack/wavpack.cc:211
+#: src/wavpack/wavpack.cc:217
 msgid "lossy (hybrid)"
 msgstr "stratový (hybrid)"
 
-#: src/wavpack/wavpack.cc:213
+#: src/wavpack/wavpack.cc:219
 msgid "lossy"
 msgstr "stratový"
 
-#: src/wavpack/wavpack.cc:255
+#: src/wavpack/wavpack.cc:259
 msgid ""
 "Copyright 2006 William Pitcock <nenolod@nenolod.net>\n"
 "\n"
@@ -4167,18 +4777,38 @@
 "\n"
 "časť kódu zásuvného modulu napísal Miles Egan."
 
-#: src/xsf/plugin.cc:50
+#: src/xsf/plugin.cc:74
 msgid "2SF Decoder"
 msgstr "2SF dekodér"
 
-#: src/xsf/plugin.cc:238
+#: src/xsf/plugin.cc:429
+msgid "32728 Hz"
+msgstr ""
+
+#: src/xsf/plugin.cc:432
+msgid "65456 Hz"
+msgstr ""
+
+#: src/xsf/plugin.cc:438
+msgid "Cosine"
+msgstr ""
+
+#: src/xsf/plugin.cc:439
+msgid "Sharp"
+msgstr ""
+
+#: src/xsf/plugin.cc:443
 msgid "XSF Configuration"
+msgstr "Konfigurácia XSF"
+
+#: src/xsf/plugin.cc:445
+msgid "Default fade time:"
 msgstr ""
 
-#: src/xsf/plugin.cc:239
-msgid "Ignore length from file"
+#: src/xsf/plugin.cc:447
+msgid "Interpolation mode:"
 msgstr ""
 
-#: src/xspf/xspf.cc:89
+#: src/xspf/xspf.cc:95
 msgid "XML Shareable Playlists (XSPF)"
 msgstr "XML Shareable Playlists (XSPF)"

audacious-plugins-4.4.1.tar.bz2/po/sl.po Added

@@ -0,0 +1,4872 @@
+# Slovenian translation for Audacious Plugins
+# Copyright (C) Audacious translators
+# This file is distributed under the same license as the Audacious Plugins package.
+#
+# Translators:
+# Arnold Marko <arnold.marko@gmail.com>, 2021-2024
+# Nejc Bertoncelj, 2020
+# Nejc Bertoncelj <nejc@bertoncelj.eu.org>, 2020-2021
+msgid ""
+msgstr ""
+"Project-Id-Version: Audacious Plugins\n"
+"Report-Msgid-Bugs-To: https://github.com/audacious-media-player/audacious/"
+"issues\n"
+"POT-Creation-Date: 2024-09-26 21:54+0200\n"
+"PO-Revision-Date: 2011-10-10 17:43+0000\n"
+"Last-Translator: Arnold Marko <arnold.marko@gmail.com>, 2021-2024\n"
+"Language-Team: Slovenian (http://app.transifex.com/audacious/audacious/"
+"language/sl/)\n"
+"Language: sl\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || "
+"n%100==4 ? 2 : 3);\n"
+
+#: src/aac/aac.cc:19
+msgid "AAC (Raw) Decoder"
+msgstr "Dekodirnik AAC (Raw)"
+
+#: src/adplug/adplug-xmms.cc:70
+msgid "AdPlug (AdLib Player)"
+msgstr "AdPlug (AdLib Player)"
+
+#: src/adplug/adplug-xmms.cc:167 src/modplug/modplugbmp.cc:321
+#: src/psf/plugin.cc:161 src/vtx/vtx.cc:89 src/xsf/plugin.cc:204
+msgid "sequenced"
+msgstr "sekvenčno"
+
+#: src/adplug/adplug-xmms.cc:349 src/sid/xs_config.cc:61
+msgid "Output"
+msgstr "Izhod"
+
+#: src/adplug/adplug-xmms.cc:350
+msgid "OPL Emulator:"
+msgstr "OPL emulator:"
+
+#: src/adplug/adplug-xmms.cc:353 src/amidiplug/i_configure.cc:153
+#: src/console/plugin.cc:45 src/filewriter/filewriter.cc:481
+#: src/sid/xs_config.cc:65 src/xsf/plugin.cc:446
+msgid "Sample rate:"
+msgstr "Frekvenca vzorčenja:"
+
+#: src/adplug/adplug-xmms.cc:354 src/amidiplug/i_configure.cc:155
+#: src/bs2b/plugin.cc:141 src/console/plugin.cc:47
+#: src/modplug/plugin_main.cc:77 src/resample/resample.cc:201
+#: src/resample/resample.cc:207 src/resample/resample.cc:211
+#: src/resample/resample.cc:215 src/resample/resample.cc:219
+#: src/resample/resample.cc:223 src/resample/resample.cc:227
+#: src/resample/resample.cc:231 src/resample/resample.cc:235
+#: src/resample/resample.cc:239 src/resample/resample.cc:243
+#: src/sid/xs_config.cc:67 src/soxr/sox-resampler.cc:205
+msgid "Hz"
+msgstr "Hz"
+
+#: src/adplug/adplug-xmms.cc:355 src/gtkui/settings.cc:55
+#: src/modplug/plugin_main.cc:105 src/qtui/settings.cc:85
+#: src/skins-qt/skins_cfg.cc:302 src/skins/skins_cfg.cc:284
+msgid "Miscellaneous"
+msgstr "Razno"
+
+#: src/adplug/adplug-xmms.cc:356
+msgid "Repeat song in endless loop"
+msgstr "Ponavljaj skladbo v neskončni zanki"
+
+#: src/albumart/albumart.cc:31 src/albumart-qt/albumart.cc:35
+msgid "Album Art"
+msgstr "Naslovnica albuma"
+
+#: src/alsa/alsa.h:64
+msgid "ALSA Output"
+msgstr "ALSA"
+
+#: src/alsa/config.cc:28
+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\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/config.cc:61
+msgid "(no description)"
+msgstr "(ni opisa)"
+
+#: src/alsa/config.cc:166
+msgid "Default PCM device"
+msgstr "Privzeta naprava PCM"
+
+#: src/alsa/config.cc:188
+msgid "Default mixer device"
+msgstr "Privzeta mešalka"
+
+#: src/alsa/config.cc:296
+msgid "PCM device:"
+msgstr "Naprava PCM:"
+
+#: src/alsa/config.cc:299
+msgid "Mixer device:"
+msgstr "Mešalka:"
+
+#: src/alsa/config.cc:302
+msgid "Mixer element:"
+msgstr "Element mešalke:"
+
+#: src/amidiplug/amidi-plug.cc:42
+msgid "AMIDI-Plug (MIDI Player)"
+msgstr "AMIDI-Plug (predvajalnik MIDI)"
+
+#: src/amidiplug/amidi-plug.cc:445
+msgid ""
+"AMIDI-Plug\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 ""
+"AMIDI-Plug\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/amidiplug/i_configure.cc:94
+msgid "Override default gain:"
+msgstr "Prezri privzeto ojačanje:"
+
+#: src/amidiplug/i_configure.cc:102
+msgid "Override default polyphony:"
+msgstr "Prezri privzeto polifonijo:"
+
+#: src/amidiplug/i_configure.cc:110
+msgid "Override default reverb:"
+msgstr "Prezri privzeti odjek:"
+
+#: src/amidiplug/i_configure.cc:112 src/amidiplug/i_configure.cc:120
+msgid "On"
+msgstr "vklopi"
+
+#: src/amidiplug/i_configure.cc:118
+msgid "Override default chorus:"
+msgstr "Prezri privzeti odmev:"
+
+#: src/amidiplug/i_configure.cc:128 src/console/plugin.cc:29
+msgid "Playback"
+msgstr "Predvajanje"
+
+#: src/amidiplug/i_configure.cc:129
+msgid "Transpose:"
+msgstr "Transpozicija:"
+
+#: src/amidiplug/i_configure.cc:131 src/speedpitch/speed-pitch.cc:257
+msgid "semitones"
+msgstr "poltonov"
+
+#: src/amidiplug/i_configure.cc:132
+msgid "Drum shift:"
+msgstr "Premik bobnov:"
+
+#: src/amidiplug/i_configure.cc:134
+msgid "note numbers"
+msgstr "številke not"
+
+#: src/amidiplug/i_configure.cc:135
+msgid "Skip leading silence"
+msgstr "Preskoči uvodno tišino"
+
+#: src/amidiplug/i_configure.cc:137
+msgid "Skip trailing silence"
+msgstr "Preskoči končno tišino"
+
+#: src/amidiplug/i_configure.cc:141
+msgid "SoundFont"
+msgstr "SoundFont"
+
+#: src/amidiplug/i_configure.cc:148
+msgid "Synthesizer"
+msgstr "Sintetizator"
+
+#: src/amidiplug/i_configure-fluidsynth.cc:58
+#: src/amidiplug/i_configure-fluidsynth.cc:527
+msgid "AMIDI-Plug - select SoundFont file"
+msgstr "AMIDI-Plug - izberite datoteko SoundFont"
+
+#: src/amidiplug/i_configure-fluidsynth.cc:61
+msgid "_Cancel"
+msgstr "_Prekliči"
+
+#: src/amidiplug/i_configure-fluidsynth.cc:62
+msgid "_Open"
+msgstr "_Odpri"
+
+#: src/amidiplug/i_configure-fluidsynth.cc:233
+#: src/amidiplug/i_configure-fluidsynth.cc:461
+msgid "File name"
+msgstr "Ime datoteke"
+
+#: src/amidiplug/i_configure-fluidsynth.cc:237
+#: src/amidiplug/i_configure-fluidsynth.cc:464
+msgid "Size (bytes)"
+msgstr "Velikost (biti)"
+
+#: src/amidiplug/i_fileinfo.cc:184
+msgid "Name:"
+msgstr "Ime:"
+
+#: src/amidiplug/i_fileinfo.cc:202
+msgid " MIDI Info "
+msgstr " Podatki MIDI "
+
+#: src/amidiplug/i_fileinfo.cc:216
+msgid "Format:"
+msgstr "Vrsta:"
+
+#: src/amidiplug/i_fileinfo.cc:219
+msgid "Length (msec):"
+msgstr "Dolžina (ms):"
+
+#: src/amidiplug/i_fileinfo.cc:222
+msgid "No. of Tracks:"
+msgstr "Št. skladb:"
+
+#: src/amidiplug/i_fileinfo.cc:228
+msgid "variable"
+msgstr "spremenljivo"
+
+#: src/amidiplug/i_fileinfo.cc:230
+msgid "BPM:"
+msgstr "BPM:"
+
+#: src/amidiplug/i_fileinfo.cc:238
+msgid "BPM (wavg):"
+msgstr "BPM (wavg):"
+
+#: src/amidiplug/i_fileinfo.cc:241
+msgid "Time Div:"
+msgstr "Časovni razdelki:"
+
+#: src/amidiplug/i_fileinfo.cc:252
+msgid " MIDI Comments and Lyrics "
+msgstr " MIDI komentarji in besedila "
+
+#: src/amidiplug/i_fileinfo.cc:299
+msgid "* no comments available in this MIDI file *"
+msgstr "* ta MIDI datoteka ne vsebuje komentarjev *"
+
+#: src/amidiplug/i_fileinfo.cc:311
+msgid "* no lyrics available in this MIDI file *"
+msgstr "* ta MIDI datoteka ne vsebuje besedil *"
+
+#: src/amidiplug/i_fileinfo.cc:321 src/ladspa/plugin.cc:418
+#: src/ui-common/dialogs-qt.cc:32
+msgid "_Close"
+msgstr "_Zapri"
+
+#: src/amidiplug/i_fileinfo.cc:346
+msgid " (invalid UTF-8)"
+msgstr " (neveljaven UTF-8)"
+
+#: src/ampache/ampache.cc:33
+msgid "Ampache Browser"
+msgstr "Brskalnik Ampache"
+
+#: src/ampache/ampache.cc:46
+msgid ""
+"Ampache Browser for Audacious\n"
+"http://ampache-browser.org/\n"
+"\n"
+"Copyright (C) Róbert Čerňanský and John Lindgren\n"
+"License: GNU GPLv3"
+msgstr ""
+"Ampache Browser for Audacious\n"
+"http://ampache-browser.org/\n"
+"\n"
+"Copyright (C) Róbert Čerňanský and John Lindgren\n"
+"License: GNU GPLv3"
+
+#: src/aosd/aosd.cc:31
+msgid ""
+"Audacious OSD\n"
+"http://www.develia.org/projects.php?p=audacious#aosd\n"
+"\n"
+"Written by Giacomo Lozito <james@develia.org>\n"
+"\n"
+"Based in part on Evan Martin's Ghosd library:\n"
+"http://neugierig.org/software/ghosd/"
+msgstr ""
+"Audacious OSD\n"
+"http://www.develia.org/projects.php?p=audacious#aosd\n"
+"\n"
+"Written by Giacomo Lozito <james@develia.org>\n"
+"\n"
+"Based in part on Evan Martin's Ghosd library:\n"
+"http://neugierig.org/software/ghosd/"
+
+#: src/aosd/aosd.h:37
+msgid "AOSD (On-Screen Display)"
+msgstr "AOSD (On-Screen Display)"
+
+#: src/aosd/aosd_style.cc:54
+msgid "Rectangle"
+msgstr "Pravokotnik"
+
+#: src/aosd/aosd_style.cc:59
+msgid "Rounded Rectangle"
+msgstr "Zaobljen pravokotnik"
+
+#: src/aosd/aosd_style.cc:64
+msgid "Concave Rectangle"
+msgstr "Udrti pravokotnik"
+
+#: src/aosd/aosd_style.cc:69 src/openmpt/mptwrap.h:50 src/xsf/plugin.cc:436
+msgid "None"
+msgstr "Ničesar"
+
+#: src/aosd/aosd_trigger.cc:49
+msgid "Playback Start"
+msgstr "Začetek predvajanja"
+
+#: src/aosd/aosd_trigger.cc:50
+msgid "Triggers OSD when a playlist entry is played."
+msgstr "Ob preklopu vnosa seznama predvajanja prikaži OSD"
+
+#: src/aosd/aosd_trigger.cc:55
+msgid "Title Change"
+msgstr "Zamenjava naslova"
+
+#: src/aosd/aosd_trigger.cc:56
+msgid "Triggers OSD when the song title changes (for internet streams)."
+msgstr "Ob zamenjavi naslova skladbe prikaži OSD (pretočna vsebina)"
+
+#: src/aosd/aosd_trigger.cc:61
+msgid "Pause On"
+msgstr "Premor vklopljen"
+
+#: src/aosd/aosd_trigger.cc:62
+msgid "Triggers OSD when playback is paused."
+msgstr "Ob premoru prikaži OSD."
+
+#: src/aosd/aosd_trigger.cc:67
+msgid "Pause Off"
+msgstr "Premor izklopljen"
+
+#: src/aosd/aosd_trigger.cc:68
+msgid "Triggers OSD when playback is unpaused."
+msgstr "Ob koncu premora prikaži OSD."
+
+#: src/aosd/aosd_ui.cc:204
+msgid "Placement"
+msgstr "Postavitev"
+
+#: src/aosd/aosd_ui.cc:241
+msgid "Relative X offset:"
+msgstr "Relativni zamik na osi X:"
+
+#: src/aosd/aosd_ui.cc:245
+msgid "Relative Y offset:"
+msgstr "Relativni zamik na osi Y:"
+
+#: src/aosd/aosd_ui.cc:249
+msgid "Max OSD width:"
+msgstr "Največja širina OSD:"
+
+#: src/aosd/aosd_ui.cc:281
+msgid "Multi-Monitor options"
+msgstr "Nastavitve za več zaslonov"
+
+#: src/aosd/aosd_ui.cc:285
+msgid "Display OSD using:"
+msgstr "Prikaži OSD z uporabo:"
+
+#: src/aosd/aosd_ui.cc:287
+msgid "all monitors"
+msgstr "vseh zaslonov"
+
+#: src/aosd/aosd_ui.cc:290
+#, c-format
+msgid "monitor %i"
+msgstr "zaslona %i"
+
+#: src/aosd/aosd_ui.cc:342
+msgid "Timing (ms)"
+msgstr "Trajanje (ms)"
+
+#: src/aosd/aosd_ui.cc:347
+msgid "Display:"
+msgstr "Prikaz:"
+
+#: src/aosd/aosd_ui.cc:352
+msgid "Fade in:"
+msgstr "Vstopni preliv:"
+
+#: src/aosd/aosd_ui.cc:357
+msgid "Fade out:"
+msgstr "Izstopni preliv:"
+
+#: src/aosd/aosd_ui.cc:442
+msgid "Fonts"
+msgstr "Pisave"
+
+#: src/aosd/aosd_ui.cc:449
+#, c-format
+msgid "Font %i:"
+msgstr "Pisava %i:"
+
+#: src/aosd/aosd_ui.cc:466
+msgid "Shadow"
+msgstr "Senca"
+
+#: src/aosd/aosd_ui.cc:589
+msgid "Render Style"
+msgstr "Slog izrisovanja"
+
+#: src/aosd/aosd_ui.cc:605
+msgid "Colors"
+msgstr "Barve"
+
+#: src/aosd/aosd_ui.cc:616
+#, c-format
+msgid "Color %i:"
+msgstr "Barva %i:"
+
+#: src/aosd/aosd_ui.cc:714
+msgid "Enable trigger"
+msgstr "Vklopi prožilnik"
+
+#: src/aosd/aosd_ui.cc:741
+msgid "Event"
+msgstr "Dogodek"
+
+#: src/aosd/aosd_ui.cc:768
+msgid "Composite manager detected"
+msgstr "Zaznan upravljalnik skladnje"
+
+#: src/aosd/aosd_ui.cc:775
+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 ""
+"Upravljalnik skladnje ni bil zaznan;\n"
+"razen če veste, da deluje, ga prosimo zaradi delovanja OSD aktivirajte"
+
+#: src/aosd/aosd_ui.cc:783
+msgid "Composite manager not required for fake transparency"
+msgstr "Upravljalnik skladnje ni potreben za lažno prosojnost"
+
+#: src/aosd/aosd_ui.cc:820
+msgid "Transparency"
+msgstr "Prosojnost"
+
+#: src/aosd/aosd_ui.cc:826
+msgid "Fake transparency"
+msgstr "Lažna prosojnost"
+
+#: src/aosd/aosd_ui.cc:828
+msgid "Real transparency (requires X Composite Ext.)"
+msgstr "Prosojnost (zahteva X Composite Extensions)"
+
+#: src/aosd/aosd_ui.cc:875
+msgid "Composite extension not loaded"
+msgstr "Skladenjske razširitve niso naložene"
+
+#: src/aosd/aosd_ui.cc:892
+#, c-format
+msgid "Audacious OSD"
+msgstr "Audacious OSD"
+
+#: src/aosd/aosd_ui.cc:955
+msgid "Position"
+msgstr "Mesto"
+
+#: src/aosd/aosd_ui.cc:960
+msgid "Animation"
+msgstr "Animacija"
+
+#: src/aosd/aosd_ui.cc:965
+msgid "Text"
+msgstr "Besedilo"
+
+#: src/aosd/aosd_ui.cc:970
+msgid "Decoration"
+msgstr "Okras"
+
+#: src/aosd/aosd_ui.cc:975
+msgid "Trigger"
+msgstr "Prožilnik"
+
+#: src/aosd/aosd_ui.cc:980 src/streamtuner/shoutcast-model.cc:202
+msgid "Misc"
+msgstr "Razno"
+
+#: src/aosd/aosd_ui.cc:989
+msgid "Test"
+msgstr "Test"
+
+#: src/asx3/asx3.cc:35
+msgid "ASXv3 Playlists"
+msgstr "Seznami predvajanja ASXv3"
+
+#: src/asx/asx.cc:33
+msgid "ASXv1/ASXv2 Playlists"
+msgstr "Seznami predvajanja ASXv1/ASXv2"
+
+#: src/audpl/audpl.cc:33
+msgid "Audacious Playlists (audpl)"
+msgstr "Seznami predvajanja Audacious Playlists (audpl)"
+
+#: src/background_music/background_music.cc:24
+msgid "Background music"
+msgstr "Glasba v ozadju"
+
+#: src/background_music/background_music.cc:25
+msgid "Target level:"
+msgstr "Ciljni nivo:"
+
+#: src/background_music/background_music.cc:28
+#: src/background_music/background_music.cc:33
+#: src/silence-removal/silence-removal.cc:70
+msgid "dB"
+msgstr "dB"
+
+#: src/background_music/background_music.cc:29
+msgid "Maximum amplification:"
+msgstr "Največja ojačitev:"
+
+#: src/background_music/background_music.cc:34 src/mpg123/mpg123.cc:81
+msgid "Advanced"
+msgstr "Napredno"
+
+#: src/background_music/background_music.cc:36
+msgid "Slow detection weight:"
+msgstr "Počasno prepoznavanje teže:"
+
+#: src/background_music/background_music.cc:39
+msgid "Hint"
+msgstr "Namig"
+
+#: src/background_music/background_music.cc:41
+msgid ""
+"Slow detection weight is the relative weight\n"
+"of a long term average detection when compared\n"
+"to the actual, faster loudness detection.\n"
+"A value of zero gives a more radio-like sound\n"
+"where soft passages get \"pulled up\" more quickly,\n"
+"a value of two makes the sound feel less compressed."
+msgstr ""
+"Počasno prepoznavanje teže je relativna teža\n"
+"dolgoročnega prepoznavanja povprečja, v\n"
+"primerjavi z dejanskim, hitrejšim prepoznavanjem\n"
+"glasnosti. Vrednost nič daje bolj radijski zvok, ko se\n"
+"mehke pasaže hitreje \"ojačijo\", vrednost dve pa\n"
+"daje občutek manj stisnjenega zvoka."
+
+#: src/background_music/background_music.cc:52
+msgid ""
+"Background Music Plugin for Audacious\n"
+"Copyright 2023;2024 Michel Fleur\n"
+"\n"
+"Controls the volume to make the sound equally loud within and between "
+"tracks.\n"
+" It uses accurate loudness measurement and tries to make the volume changes "
+"sound natural without audible peaks, yet without lowering the volume before "
+"a peak in advance."
+msgstr ""
+"Vtičnik za glasbo v ozadju za Audacious\n"
+"Avtorske pravice 2023;2024 Michel Fleur\n"
+"\n"
+"Nadzoruje glasnost na način, da je ta enaka med skladbami.\n"
+"Uporablja natančno merjenje glasnosti in poskrbi za naravno zveneče "
+"spreminjanje glasnosti, brez slišnih prehodov, a brez manjšanja glasnosti "
+"vnaprej."
+
+#: src/background_music/background_music.cc:61
+msgid "Background Music"
+msgstr "Glasba v ozadju"
+
+#: src/bitcrusher/bitcrusher.cc:33
+msgid "Bitcrusher"
+msgstr "Lomilec bitov"
+
+#: src/bitcrusher/bitcrusher.cc:34
+msgid "Bit Depth:"
+msgstr "Bitna globina:"
+
+#: src/bitcrusher/bitcrusher.cc:37
+msgid "Downsample ratio:"
+msgstr "Stopnja prevzorčenja na manj:"
+
+#: src/bitcrusher/bitcrusher.cc:48
+msgid "Bitcrusher"
+msgstr "Lomilec bitov"
+
+#: src/blur_scope/blur_scope.cc:40 src/blur_scope-qt/blur_scope.cc:45
+msgid "Color"
+msgstr "Barva"
+
+#: src/blur_scope/blur_scope.cc:56 src/blur_scope-qt/blur_scope.cc:158
+msgid "Blur Scope"
+msgstr "Osciloskop"
+
+#: src/bs2b/plugin.cc:38
+msgid "Bauer Stereophonic-to-Binaural (BS2B)"
+msgstr "Bauer Stereophonic-to-Binaural (BS2B)"
+
+#: src/bs2b/plugin.cc:129
+msgid "Presets:"
+msgstr "Predloge:"
+
+#: src/bs2b/plugin.cc:130
+msgid "Default"
+msgstr "Privzeto"
+
+#: src/bs2b/plugin.cc:136
+msgid "Feed level:"
+msgstr "Nivo dovajanja:"
+
+#: src/bs2b/plugin.cc:138
+msgid "x1/10 dB"
+msgstr "x1/10 dB"
+
+#: src/bs2b/plugin.cc:139
+msgid "Cut frequency:"
+msgstr "Mejna frekvenca:"
+
+#: src/cairo-spectrum/cairo-spectrum.cc:42 src/qt-spectrum/qt-spectrum.cc:107
+msgid "Spectrum Analyzer"
+msgstr "Spektralni analizator"
+
+#: src/cdaudio/cdaudio-ng.cc:74
+msgid "Audio CD Plugin"
+msgstr "Vtičnik za glasbene nosilce CD"
+
+#: src/cdaudio/cdaudio-ng.cc:121
+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> 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/cdaudio-ng.cc:140
+msgid "Device"
+msgstr "Naprava"
+
+#: src/cdaudio/cdaudio-ng.cc:141
+msgid "Read speed:"
+msgstr "Hitrost branja:"
+
+#: src/cdaudio/cdaudio-ng.cc:144
+msgid "Override device:"
+msgstr "Prezri napravo:"
+
+#: src/cdaudio/cdaudio-ng.cc:146
+msgid "Metadata"
+msgstr "Metapodatki"
+
+#: src/cdaudio/cdaudio-ng.cc:147
+msgid "Use CD-Text"
+msgstr "Uporabi CD-Text"
+
+#: src/cdaudio/cdaudio-ng.cc:150
+msgid "Use CDDB"
+msgstr "Uporabi CDDB"
+
+#: src/cdaudio/cdaudio-ng.cc:152
+msgid "Use HTTP instead of CDDBP"
+msgstr "Uporabi HTTP namesto CDDBP"
+
+#: src/cdaudio/cdaudio-ng.cc:155
+msgid "Server:"
+msgstr "Strežnik:"
+
+#: src/cdaudio/cdaudio-ng.cc:159
+msgid "Path:"
+msgstr "Pot:"
+
+#: src/cdaudio/cdaudio-ng.cc:163
+msgid "Port:"
+msgstr "Vrata:"
+
+#: src/cdaudio/cdaudio-ng.cc:228
+msgid "Failed to initialize cdio subsystem."
+msgstr "Napaka inicializacije podsistema cdio."
+
+#: src/cdaudio/cdaudio-ng.cc:260
+#, c-format
+msgid "Invalid URI %s."
+msgstr "Napačen naslov URI %s."
+
+#: src/cdaudio/cdaudio-ng.cc:262
+#, c-format
+msgid "Track %d not found."
+msgstr "Skladba %d ni najdena."
+
+#: src/cdaudio/cdaudio-ng.cc:264
+#, c-format
+msgid "Track %d is a data track."
+msgstr "Skladba %d vsebuje podatkovni zapis."
+
+#: src/cdaudio/cdaudio-ng.cc:339
+msgid "Error reading audio CD."
+msgstr "Napaka branja nosilca CD."
+
+#: src/cdaudio/cdaudio-ng.cc:410
+msgid "Audio CD"
+msgstr "Glasbeni CD"
+
+#: src/cdaudio/cdaudio-ng.cc:446 src/cdaudio/cdaudio-ng.cc:455
+#, c-format
+msgid "Failed to open CD device %s."
+msgstr "Napaka odpiranja naprave CD %s."
+
+#: src/cdaudio/cdaudio-ng.cc:458
+msgid "No audio capable CD drive found."
+msgstr "Naprave za branje nosilcev CD niso bile najdene."
+
+#: src/cdaudio/cdaudio-ng.cc:481
+msgid "Drive is empty."
+msgstr "Pogon je prazen."
+
+#: src/cdaudio/cdaudio-ng.cc:483
+msgid "Unsupported disk type."
+msgstr "Nepodprt tip nosilca."
+
+#: src/cdaudio/cdaudio-ng.cc:507
+msgid "Failed to finish initializing opened CD drive."
+msgstr "Napaka inicializacije odprtega CD-pogona."
+
+#: src/cdaudio/cdaudio-ng.cc:520
+msgid "Failed to retrieve first/last track number."
+msgstr "Napaka pridobivanja prve/zadnje skladbe."
+
+#: src/cdaudio/cdaudio-ng.cc:541
+#, c-format
+msgid "Cannot read start/end LSN for track %d."
+msgstr "Ne morem brati začetka/konca LSN za skladbo %d."
+
+#: src/cdaudio/cdaudio-ng.cc:624
+msgid "Failed to create the CDDB connection."
+msgstr "Napaka vzpostavljanja povezave s CDDB."
+
+#: src/cdaudio/cdaudio-ng.cc:690
+msgid "Failed to query the CDDB server"
+msgstr "Napaka poizvedovanja v bazi CDDB."
+
+#: src/cdaudio/cdaudio-ng.cc:692
+#, c-format
+msgid "Failed to query the CDDB server: %s"
+msgstr "Napaka poizvedovanja v bazi CDDB: %s"
+
+#: src/cdaudio/cdaudio-ng.cc:716
+#, c-format
+msgid "Failed to read the CDDB info: %s"
+msgstr "Napaka branja baze CDDB: %s"
+
+#: src/cd-menu-items/cd-menu-items.cc:33
+msgid "Audio CD Menu Items"
+msgstr "Menijski vnos za predvajanje CD-nosilca"
+
+#: src/cd-menu-items/cd-menu-items.cc:45
+msgid "Pla_y CD"
+msgstr "_Predvajaj CD"
+
+#: src/cd-menu-items/cd-menu-items.cc:45
+msgid "_Add CD"
+msgstr "_Dodaj CD"
+
+#: src/compressor/compressor.cc:45
+msgid "Compression"
+msgstr "Stiskanje"
+
+#: src/compressor/compressor.cc:46
+msgid "Center volume:"
+msgstr "Sredina glasnosti:"
+
+#: src/compressor/compressor.cc:49
+msgid "Dynamic range:"
+msgstr "Dinamično območje:"
+
+#: src/compressor/compressor.cc:57
+msgid ""
+"Dynamic Range Compression Plugin for Audacious\n"
+"Copyright 2010-2014 John Lindgren"
+msgstr ""
+"Dynamic Range Compression Plugin for Audacious\n"
+"Copyright 2010-2014 John Lindgren"
+
+#: src/compressor/compressor.cc:64
+msgid "Dynamic Range Compressor"
+msgstr "Dynamic Range Compressor"
+
+#: src/console/plugin.cc:15
+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 ""
+"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/console/plugin.cc:30
+msgid "Bass:"
+msgstr "Nizki toni:"
+
+#: src/console/plugin.cc:33
+msgid "Treble:"
+msgstr "Visoki toni:"
+
+#: src/console/plugin.cc:36
+msgid "Echo:"
+msgstr "Odmev:"
+
+#: src/console/plugin.cc:39
+msgid "Default song length:"
+msgstr "Privzeta dolžina skladbe:"
+
+#: src/console/plugin.cc:41 src/crossfade/crossfade.cc:56
+#: src/crossfade/crossfade.cc:62 src/lirc/lirc.cc:395 src/notify/notify.cc:113
+#: src/sid/xs_config.cc:85 src/sid/xs_config.cc:94 src/sid/xs_config.cc:103
+#: src/vumeter-qt/vumeter_qt.cc:39
+msgid "seconds"
+msgstr "sek"
+
+#: src/console/plugin.cc:42 src/modplug/plugin_main.cc:58
+msgid "Resampling"
+msgstr "Vnovično vzorčenje"
+
+#: src/console/plugin.cc:43
+msgid "Enable audio resampling"
+msgstr "Omogoči vnovično vzorčenje zvoka"
+
+#: src/console/plugin.cc:49
+msgid "SPC"
+msgstr "SPC"
+
+#: src/console/plugin.cc:50
+msgid "Ignore length from SPC tags"
+msgstr "Prezri dolžino značk SPC"
+
+#: src/console/plugin.cc:52
+msgid "Increase reverb"
+msgstr "Povečaj reverb"
+
+#: src/console/plugin.h:26
+msgid "Game Console Music Decoder"
+msgstr "Dekodirnik glasbe igralnih konzol"
+
+#: src/coreaudio/coreaudio.cc:53
+msgid "CoreAudio output"
+msgstr "CoreAudio"
+
+#: src/coreaudio/coreaudio.cc:155
+msgid ""
+"CoreAudio Output Plugin for Audacious\n"
+"Copyright 2014 William Pitcock\n"
+"Copyright 2017,18 René J.V. Bertin\n"
+" (original code and code adapted from\n"
+" Apple examples, (C) Apple 2013)\n"
+"\n"
+"Based on SDL Output Plugin for Audacious\n"
+"Copyright 2010 John Lindgren"
+msgstr ""
+"CoreAudio Output Plugin for Audacious\n"
+"Copyright 2014 William Pitcock\n"
+"Copyright 2017,18 René J.V. Bertin\n"
+" (original code and code adapted from\n"
+" Apple examples, (C) Apple 2013)\n"
+"\n"
+"Based on SDL Output Plugin for Audacious\n"
+"Copyright 2010 John Lindgren"
+
+#: src/coreaudio/coreaudio.cc:171
+msgid "Use exclusive mode"
+msgstr "Uporabi ekskluzivni način"
+
+#: src/coreaudio/coreaudio.cc:173
+msgid "Use bit perfect audio (adapt device sampling rate)"
+msgstr "Uporabi bitno točen zvok (prilagodi mero vzorčenja)"
+
+#: src/crossfade/crossfade.cc:47
+msgid ""
+"Crossfade Plugin for Audacious\n"
+"Copyright 2010-2014 John Lindgren"
+msgstr ""
+"Vtičnik za prelivanje zvoka za Audacious\n"
+"Avtorske pravice 2010-2014 John Lindgren"
+
+#: src/crossfade/crossfade.cc:51
+msgid "Crossfade"
+msgstr "Križni preliv"
+
+#: src/crossfade/crossfade.cc:52
+msgid "On automatic song change"
+msgstr "Ob samodejni menjavi skladbe"
+
+#: src/crossfade/crossfade.cc:54 src/crossfade/crossfade.cc:60
+msgid "Overlap:"
+msgstr "Prekrivanje:"
+
+#: src/crossfade/crossfade.cc:58
+msgid "On seek or manual song change"
+msgstr "Ob iskanju ali ročnem izboru glasbe"
+
+#: src/crossfade/crossfade.cc:64
+msgid "No fade in"
+msgstr "Brez vstopnega preliva"
+
+#: src/crossfade/crossfade.cc:66
+msgid "Use S-curve fade"
+msgstr "Uporabi prelive S oblike"
+
+#: src/crossfade/crossfade.cc:68
+msgid "S-curve steepness:"
+msgstr "Naklon S krivulje"
+
+#: src/crossfade/crossfade.cc:70
+msgid "(higher is steeper)"
+msgstr "(več je večji nagib)"
+
+#: src/crossfade/crossfade.cc:72
+msgid "Tip"
+msgstr "Namig"
+
+#: src/crossfade/crossfade.cc:73
+msgid ""
+"For better crossfading, enable\n"
+"the Silence Removal effect."
+msgstr ""
+"Za boljši križni prehod omogočite\n"
+"učinek Odstranitev tišine"
+
+#: src/crossfade/crossfade.cc:83
+msgid "Crossfade"
+msgstr "Križni preliv"
+
+#: src/crystalizer/crystalizer.cc:31
+msgid "Crystalizer"
+msgstr "Kristalizator"
+
+#: src/crystalizer/crystalizer.cc:32 src/stereo_plugin/stereo.cc:45
+msgid "Intensity:"
+msgstr "Jakost:"
+
+#: src/crystalizer/crystalizer.cc:43
+msgid "Crystalizer"
+msgstr "Kristalizator"
+
+#: src/cue/cue.cc:42
+msgid "Cue Sheet Plugin"
+msgstr "Vtičnik za seznam skladb (cue sheet)"
+
+#: src/delete-files/delete-files.cc:53 src/delete-files/delete-files.cc:215
+#: src/delete-files/delete-files.cc:230
+msgid "Delete Files"
+msgstr "Izbris datotek"
+
+#: src/delete-files/delete-files.cc:120
+msgid "No files are selected."
+msgstr "Ni izbranih datotek."
+
+#: src/delete-files/delete-files.cc:125
+#, c-format
+msgid "Do you want to move %s to the trash?"
+msgstr "Želite premakniti %s v koš?"
+
+#: src/delete-files/delete-files.cc:126
+#, c-format
+msgid "Do you want to permanently delete %s?"
+msgstr "Želite trajno izbrisati %s?"
+
+#: src/delete-files/delete-files.cc:133
+#, c-format
+msgid "Do you want to move %d files to the trash?"
+msgstr "Želite premakniti toliko datotek v koš: %d?"
+
+#: src/delete-files/delete-files.cc:134
+#, c-format
+msgid "Do you want to permanently delete %d files?"
+msgstr "Želite trajno izbrisati toliko datotek: %d?"
+
+#: src/delete-files/delete-files.cc:146
+msgid "Move to trash"
+msgstr "Premakni v koš"
+
+#: src/delete-files/delete-files.cc:146
+msgid "Delete"
+msgstr "Izbriši"
+
+#: src/delete-files/delete-files.cc:213 src/delete-files/delete-files.cc:235
+#: src/skins-qt/search-select.cc:102 src/skins/search-select.cc:78
+msgid "Cancel"
+msgstr "Prekliči"
+
+#: src/delete-files/delete-files.cc:267
+msgid "Delete Selected Files"
+msgstr "Izbriši izbrane datoteke"
+
+#: src/delete-files/delete-files.cc:287
+msgid "Delete Method"
+msgstr "Način brisanja"
+
+#: src/delete-files/delete-files.cc:288
+msgid "Move to trash instead of deleting immediately"
+msgstr "Namesto trajnega brisanja premakni v koš"
+
+#: src/echo_plugin/echo.cc:9
+msgid ""
+"Echo Plugin\n"
+"By Johan Levin, 1999\n"
+"Surround echo by Carl van Schaik, 1999\n"
+"Updated for Audacious by William Pitcock and John Lindgren, 2010-2014"
+msgstr ""
+"Echo Plugin\n"
+"By Johan Levin, 1999\n"
+"Surround echo by Carl van Schaik, 1999\n"
+"Updated for Audacious by William Pitcock and John Lindgren, 2010-2014"
+
+#: src/echo_plugin/echo.cc:21
+msgid "Echo"
+msgstr "Odmev"
+
+#: src/echo_plugin/echo.cc:22 src/modplug/plugin_main.cc:72
+#: src/modplug/plugin_main.cc:82
+msgid "Delay:"
+msgstr "Zamik:"
+
+#: src/echo_plugin/echo.cc:24 src/modplug/plugin_main.cc:72
+#: src/modplug/plugin_main.cc:82 src/xsf/plugin.cc:445
+msgid "ms"
+msgstr "ms"
+
+#: src/echo_plugin/echo.cc:25
+msgid "Feedback:"
+msgstr "Odziv:"
+
+#: src/echo_plugin/echo.cc:28 src/modplug/plugin_main.cc:86
+msgid "Volume:"
+msgstr "Glasnost:"
+
+#: src/echo_plugin/echo.cc:39
+msgid "Echo"
+msgstr "Odmev"
+
+#: src/ffaudio/ffaudio-core.cc:50
+msgid "FFmpeg Plugin"
+msgstr "Vtičnik FFmpeg"
+
+#: src/ffaudio/ffaudio-core.cc:649
+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 ""
+"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/filewriter/filewriter.cc:48
+msgid "FileWriter Plugin"
+msgstr "FileWriter"
+
+#: src/filewriter/filewriter.cc:316
+#, c-format
+msgid ""
+"Error opening %s:\n"
+"%s"
+msgstr ""
+"Napaka pri odpiranju datoteke %s:\n"
+"%s"
+
+#: src/filewriter/filewriter.cc:358
+msgid ""
+"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."
+
+#: src/filewriter/filewriter.cc:385
+msgid "Output file format:"
+msgstr "Izhodni datotečni format:"
+
+#: src/filewriter/filewriter.cc:389
+msgid "Save into original directory"
+msgstr "Shrani v izvirno mapo"
+
+#: src/filewriter/filewriter.cc:392
+msgid "Save into custom directory:"
+msgstr "Shrani v mapo po meri"
+
+#: src/filewriter/filewriter.cc:400
+msgid "Generate file name from:"
+msgstr "Ustvari ime datoteke iz:"
+
+#: src/filewriter/filewriter.cc:401
+msgid "Original file name"
+msgstr "Izvirno ime"
+
+#: src/filewriter/filewriter.cc:404
+msgid "Original file name (no suffix)"
+msgstr "Izvirno ime (brez končnice)"
+
+#: src/filewriter/filewriter.cc:407
+msgid "Original file tag"
+msgstr "Izvirna datotečna značka"
+
+#: src/filewriter/filewriter.cc:411
+msgid "Prepend track number to file name"
+msgstr "Pred ime datoteke pripiši številko skladbe"
+
+#: src/filewriter/filewriter.cc:417 src/filewriter/filewriter.cc:449
+msgid "Auto"
+msgstr "Samodejno"
+
+#: src/filewriter/filewriter.cc:418
+msgid "8000 Hz"
+msgstr "8000 Hz"
+
+#: src/filewriter/filewriter.cc:419
+msgid "11025 Hz"
+msgstr "11025 Hz"
+
+#: src/filewriter/filewriter.cc:420
+msgid "12000 Hz"
+msgstr "12000 Hz"
+
+#: src/filewriter/filewriter.cc:421
+msgid "16000 Hz"
+msgstr "16000 Hz"
+
+#: src/filewriter/filewriter.cc:422
+msgid "22050 Hz"
+msgstr "22050 Hz"
+
+#: src/filewriter/filewriter.cc:423
+msgid "24000 Hz"
+msgstr "24000 Hz"
+
+#: src/filewriter/filewriter.cc:424
+msgid "32000 Hz"
+msgstr "32000 Hz"
+
+#: src/filewriter/filewriter.cc:425 src/xsf/plugin.cc:430
+msgid "44100 Hz"
+msgstr "44100 Hz"
+
+#: src/filewriter/filewriter.cc:426 src/xsf/plugin.cc:431
+msgid "48000 Hz"
+msgstr "48000 Hz"
+
+#: src/filewriter/filewriter.cc:430
+msgid "8 kbit/s"
+msgstr "8 kbit/s"
+
+#: src/filewriter/filewriter.cc:431
+msgid "16 kbit/s"
+msgstr "16 kbit/s"
+
+#: src/filewriter/filewriter.cc:432
+msgid "32 kbit/s"
+msgstr "32 kbit/s"
+
+#: src/filewriter/filewriter.cc:433
+msgid "40 kbit/s"
+msgstr "40 kbit/s"
+
+#: src/filewriter/filewriter.cc:434
+msgid "48 kbit/s"
+msgstr "48 kbit/s"
+
+#: src/filewriter/filewriter.cc:435
+msgid "56 kbit/s"
+msgstr "56 kbit/s"
+
+#: src/filewriter/filewriter.cc:436
+msgid "64 kbit/s"
+msgstr "64 kbit/s"
+
+#: src/filewriter/filewriter.cc:437
+msgid "80 kbit/s"
+msgstr "80 kbit/s"
+
+#: src/filewriter/filewriter.cc:438
+msgid "96 kbit/s"
+msgstr "96 kbit/s"
+
+#: src/filewriter/filewriter.cc:439
+msgid "112 kbit/s"
+msgstr "112 kbit/s"
+
+#: src/filewriter/filewriter.cc:440
+msgid "128 kbit/s"
+msgstr "128 kbit/s"
+
+#: src/filewriter/filewriter.cc:441
+msgid "160 kbit/s"
+msgstr "160 kbit/s"
+
+#: src/filewriter/filewriter.cc:442
+msgid "192 kbit/s"
+msgstr "192 kbit/s"
+
+#: src/filewriter/filewriter.cc:443
+msgid "224 kbit/s"
+msgstr "224 kbit/s"
+
+#: src/filewriter/filewriter.cc:444
+msgid "256 kbit/s"
+msgstr "256 kbit/s"
+
+#: src/filewriter/filewriter.cc:445
+msgid "320 kbit/s"
+msgstr "320 kbit/s"
+
+#: src/filewriter/filewriter.cc:450
+msgid "Joint Stereo"
+msgstr "Združen stereo"
+
+#: src/filewriter/filewriter.cc:451 src/modplug/plugin_main.cc:57
+#: src/mpg123/mpg123.cc:259
+msgid "Stereo"
+msgstr "Stereo"
+
+#: src/filewriter/filewriter.cc:452 src/modplug/plugin_main.cc:56
+#: src/mpg123/mpg123.cc:260
+msgid "Mono"
+msgstr "Mono"
+
+#: src/filewriter/filewriter.cc:456
+msgid "VBR"
+msgstr "VBR"
+
+#: src/filewriter/filewriter.cc:457
+msgid "ABR"
+msgstr "ABR"
+
+#: src/filewriter/filewriter.cc:478
+msgid "Algorithm quality:"
+msgstr "Kakovost algoritma:"
+
+#: src/filewriter/filewriter.cc:484
+msgid "Bitrate:"
+msgstr "Bitna hitrost:"
+
+#: src/filewriter/filewriter.cc:491
+msgid "Compression ratio:"
+msgstr "Nivo stiskanja:"
+
+#: src/filewriter/filewriter.cc:498
+msgid "Audio mode:"
+msgstr "Zvočni način:"
+
+#: src/filewriter/filewriter.cc:501
+msgid "Enforce strict ISO compliance"
+msgstr "Vsili strogo skladnost ISO"
+
+#: src/filewriter/filewriter.cc:503
+msgid "Error protection"
+msgstr "Zaščita pred napakami"
+
+#: src/filewriter/filewriter.cc:508
+msgid "Enable VBR/ABR"
+msgstr "Omogoči VBR/ABR"
+
+#: src/filewriter/filewriter.cc:510
+msgid "Type:"
+msgstr "Vrsta:"
+
+#: src/filewriter/filewriter.cc:514
+msgid "Minimum bitrate:"
+msgstr "Najmanjša bitna hitrost:"
+
+#: src/filewriter/filewriter.cc:518
+msgid "Maximum bitrate:"
+msgstr "Največja bitna hitrost:"
+
+#: src/filewriter/filewriter.cc:522
+msgid "Average bitrate:"
+msgstr "Povprečna bitna hitrost:"
+
+#: src/filewriter/filewriter.cc:526
+msgid "VBR quality level:"
+msgstr "Nivo kakovosti VBR:"
+
+#: src/filewriter/filewriter.cc:530
+msgid "Strictly enforce minimum bitrate"
+msgstr "Strogo vsili najmanjšo bitno hitrost"
+
+#: src/filewriter/filewriter.cc:533
+msgid "Omit Xing VBR header"
+msgstr "Prezri glavo Xing VBR"
+
+#: src/filewriter/filewriter.cc:539
+msgid "Frame Headers"
+msgstr "Glave okvirjev"
+
+#: src/filewriter/filewriter.cc:540
+msgid "Mark as copyright"
+msgstr "Označi kot copyright"
+
+#: src/filewriter/filewriter.cc:542
+msgid "Mark as original"
+msgstr "Označi kot izvirnik"
+
+#: src/filewriter/filewriter.cc:544
+msgid "ID3 Tags"
+msgstr "Značke ID3"
+
+#: src/filewriter/filewriter.cc:545
+msgid "Force addition of version 2 tag"
+msgstr "Vsili dodajanje značke različice 2"
+
+#: src/filewriter/filewriter.cc:547
+msgid "Only add v1 tag"
+msgstr "Dodaj le značko v1"
+
+#: src/filewriter/filewriter.cc:549
+msgid "Only add v2 tag"
+msgstr "Dodaj le značko v2"
+
+#: src/filewriter/filewriter.cc:554
+msgid "Quality"
+msgstr "Kakovost"
+
+#: src/filewriter/filewriter.cc:555
+msgid "VBR/ABR"
+msgstr "VBR/ABR"
+
+#: src/filewriter/filewriter.cc:556
+msgid "Tags"
+msgstr "Značke"
+
+#: src/filewriter/filewriter.cc:566
+msgid "Quality (0-1):"
+msgstr "Kakovost (0-1):"
+
+#: src/filewriter/filewriter.cc:573 src/skins-qt/skins_cfg.cc:307
+#: src/skins/skins_cfg.cc:289
+msgid "General"
+msgstr "Splošno"
+
+#: src/flac/flacng.h:36
+msgid "FLAC Decoder"
+msgstr "Dekodirnik FLAC"
+
+#: src/flac/metadata.cc:296 src/wavpack/wavpack.cc:215
+msgid "lossless"
+msgstr "brezizgubno"
+
+#: src/flac/plugin.cc:214
+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/gio/gio.cc:34
+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.cc:42
+msgid "GIO Plugin"
+msgstr "Vtičnik GIO"
+
+#: src/gio/gio.cc:152
+msgid "Read-and-append mode not supported"
+msgstr "Način Read-and-append ni podprt"
+
+#: src/gio/gio.cc:165
+msgid "Invalid open mode"
+msgstr "Napačen način odpiranja"
+
+#: src/glspectrum/gl-spectrum.cc:52
+msgid ""
+"OpenGL Spectrum Analyzer for Audacious\n"
+"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\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é, John Lindgren, and Carlo Bramini\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/glspectrum/gl-spectrum.cc:63 src/qtglspectrum/gl-spectrum.cc:53
+msgid "OpenGL Spectrum Analyzer"
+msgstr "Spektralni analizator OpenGL"
+
+#: src/gtkui/columns.cc:36 src/moonstone/playlist_model.cc:38
+#: src/qtui/playlist_model.cc:33
+msgid "Entry Number"
+msgstr "Številka vnosa"
+
+#: src/gtkui/columns.cc:37 src/moonstone/playlist_model.cc:38
+#: src/moonstone/playlist_selection.cc:64
+#: src/playlist-manager/playlist-manager.cc:200
+#: src/playlist-manager-qt/playlist-manager-qt.cc:188
+#: src/qtui/playlist_model.cc:33 src/streamtuner/icecast-model.cc:120
+#: src/streamtuner/ihr-model.cc:159 src/streamtuner/shoutcast-model.cc:122
+msgid "Title"
+msgstr "Naslov"
+
+#: src/gtkui/columns.cc:38 src/moonstone/playlist_model.cc:39
+#: src/qtui/playlist_model.cc:33
+msgid "Artist"
+msgstr "Izvajalec"
+
+#: src/gtkui/columns.cc:39 src/moonstone/playlist_model.cc:39
+#: src/qtui/playlist_model.cc:33
+msgid "Year"
+msgstr "Leto"
+
+#: src/gtkui/columns.cc:40 src/moonstone/playlist_model.cc:39
+#: src/qtui/playlist_model.cc:34
+msgid "Album"
+msgstr "Album"
+
+#: src/gtkui/columns.cc:41 src/moonstone/playlist_model.cc:40
+#: src/qtui/playlist_model.cc:34
+msgid "Album Artist"
+msgstr "Izvajalec albuma"
+
+#: src/gtkui/columns.cc:42 src/moonstone/playlist_model.cc:40
+#: src/qtui/playlist_model.cc:34
+msgid "Track"
+msgstr "Skladba"
+
+#: src/gtkui/columns.cc:43 src/moonstone/playlist_model.cc:40
+#: src/qtui/playlist_model.cc:34 src/streamtuner/icecast-model.cc:123
+#: src/streamtuner/shoutcast-model.cc:125
+#: src/streamtuner/shoutcast-model.cc:236
+msgid "Genre"
+msgstr "Zvrst"
+
+#: src/gtkui/columns.cc:44 src/moonstone/playlist_model.cc:41
+#: src/qtui/playlist_model.cc:35
+msgid "Queue Position"
+msgstr "Mesto na vrsti"
+
+#: src/gtkui/columns.cc:45 src/moonstone/playlist_model.cc:41
+#: src/qtui/playlist_model.cc:35
+msgid "Length"
+msgstr "Dolžina"
+
+#: src/gtkui/columns.cc:46 src/moonstone/playlist_model.cc:41
+#: src/qtui/playlist_model.cc:35
+msgid "File Path"
+msgstr "Datotečna pot"
+
+#: src/gtkui/columns.cc:47 src/moonstone/playlist_model.cc:42
+#: src/qtui/playlist_model.cc:35
+msgid "File Name"
+msgstr "Datotečno ime"
+
+#: src/gtkui/columns.cc:48 src/moonstone/playlist_model.cc:42
+#: src/qtui/playlist_model.cc:36
+msgid "Custom Title"
+msgstr "Naslov po meri"
+
+#: src/gtkui/columns.cc:49 src/moonstone/playlist_model.cc:42
+#: src/qtui/playlist_model.cc:36 src/streamtuner/icecast-model.cc:129
+#: src/streamtuner/shoutcast-model.cc:134
+msgid "Bitrate"
+msgstr "Bitna hitrost"
+
+#: src/gtkui/columns.cc:50 src/moonstone/playlist_model.cc:43
+#: src/qtui/playlist_model.cc:36
+msgid "Comment"
+msgstr "Komentar"
+
+#: src/gtkui/columns.cc:51 src/qtui/playlist_model.cc:36
+msgid "Publisher"
+msgstr "Založnik"
+
+#: src/gtkui/columns.cc:52 src/qtui/playlist_model.cc:37
+msgid "Catalog Number"
+msgstr "Kataloška številka"
+
+#: src/gtkui/columns.cc:53 src/moonstone/playlist_model.cc:43
+#: src/qtui/playlist_model.cc:37
+msgid "Disc"
+msgstr "Disk"
+
+#: src/gtkui/columns.cc:325
+msgid "Available columns"
+msgstr "Vrstice na voljo"
+
+#: src/gtkui/columns.cc:351
+msgid "Displayed columns"
+msgstr "Prikazane vrstice"
+
+#: src/gtkui/layout.cc:74 src/search-tool-qt/search-tool-qt.cc:58
+#: src/search-tool/search-tool.cc:49
+msgid "Search Tool"
+msgstr "Orodje za iskanje"
+
+#: src/gtkui/layout.cc:170
+msgid "Dock at Left"
+msgstr "Pripni na levo"
+
+#: src/gtkui/layout.cc:170
+msgid "Dock at Right"
+msgstr "Pripni na desno"
+
+#: src/gtkui/layout.cc:171
+msgid "Dock at Top"
+msgstr "Pripni na vrh"
+
+#: src/gtkui/layout.cc:171
+msgid "Dock at Bottom"
+msgstr "Pripni na dno"
+
+#: src/gtkui/layout.cc:171
+msgid "Undock"
+msgstr "Odpni"
+
+#: src/gtkui/layout.cc:171 src/ladspa/plugin.cc:540
+msgid "Disable"
+msgstr "Onemogoči"
+
+#: src/gtkui/menus.cc:79 src/qtui/menus.cc:107
+#: src/statusicon-qt/statusicon.cc:115 src/statusicon/statusicon.cc:286
+msgid "_Open Files ..."
+msgstr "Odpri _datoteke"
+
+#: src/gtkui/menus.cc:80 src/qtui/menus.cc:111
+msgid "Open _URL ..."
+msgstr "Odpri _URL"
+
+#: src/gtkui/menus.cc:81 src/qtui/menus.cc:113
+msgid "_Add Files ..."
+msgstr "Dodaj datotek_e"
+
+#: src/gtkui/menus.cc:82 src/qtui/menus.cc:118
+msgid "Add U_RL ..."
+msgstr "Dodaj UR_L"
+
+#: src/gtkui/menus.cc:84 src/qtui/menus.cc:120
+msgid "Search _Library"
+msgstr "Išči po _knjižnici"
+
+#: src/gtkui/menus.cc:86 src/qtui/menus.cc:123
+msgid "A_bout ..."
+msgstr "O programu _Audacious"
+
+#: src/gtkui/menus.cc:87 src/qtui/menus.cc:125
+msgid "_Settings ..."
+msgstr "_Nastavitve"
+
+#: src/gtkui/menus.cc:88 src/qtui/menus.cc:131
+#: src/statusicon-qt/statusicon.cc:117 src/statusicon/statusicon.cc:288
+msgid "_Quit"
+msgstr "_Izhod"
+
+#: src/gtkui/menus.cc:92 src/gtkui/menus.cc:226
+#: src/moonstone/playlist_tabs.cc:306 src/qtui/menus.cc:135
+#: src/qtui/playlist_tabs.cc:331 src/search-tool-qt/search-tool-qt.cc:499
+#: src/search-tool/search-tool.cc:339 src/statusicon-qt/statusicon.cc:109
+#: src/statusicon/statusicon.cc:280
+msgid "_Play"
+msgstr "_Predvajaj"
+
+#: src/gtkui/menus.cc:93 src/qtui/menus.cc:137
+#: src/statusicon-qt/statusicon.cc:110 src/statusicon/statusicon.cc:281
+msgid "Paus_e"
+msgstr "P_remor"
+
+#: src/gtkui/menus.cc:94 src/qtui/menus.cc:139
+#: src/statusicon-qt/statusicon.cc:111 src/statusicon/statusicon.cc:282
+msgid "_Stop"
+msgstr "_Ustavi"
+
+#: src/gtkui/menus.cc:95 src/qtui/menus.cc:141
+#: src/statusicon-qt/statusicon.cc:112 src/statusicon/statusicon.cc:283
+msgid "Pre_vious"
+msgstr "Pr_ejšnja"
+
+#: src/gtkui/menus.cc:96 src/qtui/menus.cc:143
+#: src/statusicon-qt/statusicon.cc:113 src/statusicon/statusicon.cc:284
+msgid "_Next"
+msgstr "Nas_lednja"
+
+#: src/gtkui/menus.cc:97 src/qtui/menus.cc:145 src/skins/menus.cc:114
+#: src/skins-qt/menus.cc:105
+msgid "Previous Album"
+msgstr "Prejš_nji album"
+
+#: src/gtkui/menus.cc:98 src/qtui/menus.cc:146 src/skins/menus.cc:115
+#: src/skins-qt/menus.cc:106
+msgid "Next Album"
+msgstr "Nasledn_ji album"
+
+#: src/gtkui/menus.cc:100 src/qtui/menus.cc:148
+msgid "_Repeat"
+msgstr "P_onavljaj"
+
+#: src/gtkui/menus.cc:101 src/qtui/menus.cc:150
+msgid "S_huffle"
+msgstr "_Mešaj"
+
+#: src/gtkui/menus.cc:102 src/qtui/menus.cc:152
+msgid "Shuffle by Albu_m"
+msgstr "Me_šaj med albumi"
+
+#: src/gtkui/menus.cc:103 src/qtui/menus.cc:155
+msgid "N_o Playlist Advance"
+msgstr "Ne nadaljuj po _seznamu predvajanja"
+
+#: src/gtkui/menus.cc:104 src/qtui/menus.cc:157
+msgid "Stop A_fter This Song"
+msgstr "Ustavi po _tej skladbi"
+
+#: src/gtkui/menus.cc:106 src/gtkui/menus.cc:210 src/qtui/menus.cc:162
+#: src/qtui/menus.cc:294
+msgid "Song _Info ..."
+msgstr "_Informacije o skladbi"
+
+#: src/gtkui/menus.cc:107
+msgid "Jump to _Time ..."
+msgstr "Skoči na"
+
+#: src/gtkui/menus.cc:108
+msgid "_Jump to Song ..."
+msgstr "Skoči na skladbo"
+
+#: src/gtkui/menus.cc:110 src/qtui/menus.cc:165
+msgid "Set Repeat Point _A"
+msgstr "Nastavi točko ponavljanja _A"
+
+#: src/gtkui/menus.cc:111 src/qtui/menus.cc:167
+msgid "Set Repeat Point _B"
+msgstr "Nastavi točko ponavljanja _B"
+
+#: src/gtkui/menus.cc:112 src/qtui/menus.cc:169
+msgid "_Clear Repeat Points"
+msgstr "Počisti to_čki ponavljanja"
+
+#: src/gtkui/menus.cc:116 src/gtkui/menus.cc:123 src/gtkui/menus.cc:141
+#: src/qtui/menus.cc:173 src/qtui/menus.cc:180 src/qtui/menus.cc:198
+msgid "By _Title"
+msgstr "Po naslovu"
+
+#: src/gtkui/menus.cc:117 src/qtui/menus.cc:174
+msgid "By _File Name"
+msgstr "Po imenu datoteke"
+
+#: src/gtkui/menus.cc:118 src/qtui/menus.cc:175
+msgid "By File _Path"
+msgstr "Po poti datoteke"
+
+#: src/gtkui/menus.cc:122 src/gtkui/menus.cc:140 src/qtui/menus.cc:179
+#: src/qtui/menus.cc:197
+msgid "By Track _Number"
+msgstr "Po številki skladbe"
+
+#: src/gtkui/menus.cc:124 src/gtkui/menus.cc:142 src/qtui/menus.cc:181
+#: src/qtui/menus.cc:199
+msgid "By _Artist"
+msgstr "Po izvajalcu"
+
+#: src/gtkui/menus.cc:125 src/gtkui/menus.cc:143 src/qtui/menus.cc:182
+#: src/qtui/menus.cc:200
+msgid "By Al_bum"
+msgstr "Po albumu"
+
+#: src/gtkui/menus.cc:126 src/gtkui/menus.cc:144 src/qtui/menus.cc:183
+#: src/qtui/menus.cc:201
+msgid "By Albu_m Artist"
+msgstr "Po izvajalcu albuma"
+
+#: src/gtkui/menus.cc:127 src/gtkui/menus.cc:145 src/qtui/menus.cc:184
+#: src/qtui/menus.cc:202
+msgid "By Release _Date"
+msgstr "Po datumu izdaje"
+
+#: src/gtkui/menus.cc:128 src/gtkui/menus.cc:146 src/qtui/menus.cc:185
+#: src/qtui/menus.cc:203
+msgid "By _Genre"
+msgstr "Po žanru"
+
+#: src/gtkui/menus.cc:129 src/gtkui/menus.cc:147 src/qtui/menus.cc:186
+#: src/qtui/menus.cc:204
+msgid "By _Length"
+msgstr "Po dolžini"
+
+#: src/gtkui/menus.cc:130 src/gtkui/menus.cc:148 src/qtui/menus.cc:187
+#: src/qtui/menus.cc:205
+msgid "By _File Path"
+msgstr "Po poti datoteke"
+
+#: src/gtkui/menus.cc:131 src/gtkui/menus.cc:149 src/qtui/menus.cc:188
+#: src/qtui/menus.cc:206
+msgid "By _Custom Title"
+msgstr "Po imenu po meri"
+
+#: src/gtkui/menus.cc:132 src/gtkui/menus.cc:150 src/qtui/menus.cc:189
+#: src/qtui/menus.cc:207
+msgid "By C_omment"
+msgstr "Po komentarju"
+
+#: src/gtkui/menus.cc:133 src/gtkui/menus.cc:151 src/qtui/menus.cc:190
+#: src/qtui/menus.cc:208
+msgid "By D_isc Number"
+msgstr "Po številki d_iska"
+
+#: src/gtkui/menus.cc:135 src/gtkui/menus.cc:153 src/qtui/menus.cc:192
+#: src/qtui/menus.cc:210
+msgid "R_everse Order"
+msgstr "Obraten vrstni red"
+
+#: src/gtkui/menus.cc:136 src/gtkui/menus.cc:154 src/qtui/menus.cc:194
+#: src/qtui/menus.cc:212
+msgid "_Random Order"
+msgstr "Naključen vrstni red"
+
+#: src/gtkui/menus.cc:158 src/qtui/menus.cc:216
+msgid "_Play/Resume"
+msgstr "_Predvajaj/nadaljuj"
+
+#: src/gtkui/menus.cc:159 src/qtui/menus.cc:218
+msgid "_Refresh"
+msgstr "_Osveži"
+
+#: src/gtkui/menus.cc:161 src/qtui/menus.cc:222
+msgid "_Sort"
+msgstr "_Razvrsti"
+
+#: src/gtkui/menus.cc:162 src/qtui/menus.cc:223
+msgid "Sort Se_lected"
+msgstr "Razvrsti _izbrane"
+
+#: src/gtkui/menus.cc:163 src/qtui/menus.cc:225
+msgid "Remove _Duplicates"
+msgstr "Odstrani _dvojnike"
+
+#: src/gtkui/menus.cc:164 src/qtui/menus.cc:226
+msgid "Remove _Unavailable Files"
+msgstr "Odstrani _nedosegljive datoteke"
+
+#: src/gtkui/menus.cc:166 src/playlist-manager/playlist-manager.cc:219
+#: src/playlist-manager-qt/playlist-manager-qt.cc:348 src/qtui/menus.cc:229
+msgid "_New"
+msgstr "No_v"
+
+#: src/gtkui/menus.cc:167 src/qtui/menus.cc:230
+msgid "Ren_ame ..."
+msgstr "Pr_eimenuj"
+
+#: src/gtkui/menus.cc:168 src/gtkui/menus.cc:228
+#: src/moonstone/playlist_tabs.cc:311 src/qtui/menus.cc:231
+#: src/qtui/playlist_tabs.cc:336
+msgid "Remo_ve"
+msgstr "Od_strani"
+
+#: src/gtkui/menus.cc:170 src/qtui/menus.cc:233
+msgid "_Import ..."
+msgstr "_Uvozi"
+
+#: src/gtkui/menus.cc:171 src/qtui/menus.cc:234
+msgid "_Export ..."
+msgstr "I_zvozi"
+
+#: src/gtkui/menus.cc:173 src/qtui/menus.cc:237
+msgid "Playlist _Manager ..."
+msgstr "Upravljalnik seznamov predvajan_j"
+
+#: src/gtkui/menus.cc:174 src/qtui/menus.cc:239
+msgid "_Queue Manager ..."
+msgstr "Upravljalnik vrs_te"
+
+#: src/gtkui/menus.cc:178 src/qtui/menus.cc:243
+msgid "Volume _Up"
+msgstr "Z_višaj glasnost"
+
+#: src/gtkui/menus.cc:179 src/qtui/menus.cc:245
+msgid "Volume _Down"
+msgstr "Z_nižaj glasnost"
+
+#: src/gtkui/menus.cc:181 src/qtui/menus.cc:249
+msgid "_Equalizer ..."
+msgstr "_Izenačevalnik"
+
+#: src/gtkui/menus.cc:182 src/qtui/menus.cc:251
+msgid "E_ffects ..."
+msgstr "_Učinki"
+
+#: src/gtkui/menus.cc:184
+msgid "_Record Stream"
+msgstr "Snemanje _pretoka"
+
+#: src/gtkui/menus.cc:185
+msgid "Audio _Settings ..."
+msgstr "_Zvočne nastavitve"
+
+#: src/gtkui/menus.cc:189 src/qtui/menus.cc:260
+msgid "Show _Menu Bar"
+msgstr "Prikaži _menijsko vrstico"
+
+#: src/gtkui/menus.cc:190 src/qtui/menus.cc:262
+msgid "Show I_nfo Bar"
+msgstr "Prikaži _informacijsko vrstico"
+
+#: src/gtkui/menus.cc:191 src/qtui/menus.cc:264
+msgid "Show Info Bar _Album Art"
+msgstr "V informacijski vrstici prikaži _platnico"
+
+#: src/gtkui/menus.cc:192 src/qtui/menus.cc:266
+msgid "Show Info Bar Vis_ualization"
+msgstr "Prikaži stolpčno _vizualizacijo"
+
+#: src/gtkui/menus.cc:193 src/qtui/menus.cc:268
+msgid "Show _Status Bar"
+msgstr "Prikaži vrstico _stanja"
+
+#: src/gtkui/menus.cc:195 src/qtui/menus.cc:272
+msgid "Show _Remaining Time"
+msgstr "Prikaži preostali _čas"
+
+#: src/gtkui/menus.cc:197 src/qtui/menus.cc:276 src/skins/menus.cc:157
+#: src/skins-qt/menus.cc:152
+msgid "_Visualizations ..."
+msgstr "Vi_zualizacije"
+
+#: src/gtkui/menus.cc:201 src/qtui/menus.cc:280
+msgid "_File"
+msgstr "Datoteka"
+
+#: src/gtkui/menus.cc:202 src/qtui/menus.cc:281
+msgid "_Playback"
+msgstr "Predvajanje"
+
+#: src/gtkui/menus.cc:203 src/qtui/menus.cc:282
+msgid "P_laylist"
+msgstr "Seznam predvajanja"
+
+#: src/gtkui/menus.cc:204 src/gtkui/menus.cc:222 src/qtui/menus.cc:283
+#: src/qtui/menus.cc:312
+msgid "_Services"
+msgstr "Storitve"
+
+#: src/gtkui/menus.cc:205 src/qtui/menus.cc:284
+msgid "_Output"
+msgstr "Izhod"
+
+#: src/gtkui/menus.cc:206 src/qtui/menus.cc:285
+msgid "_View"
+msgstr "Pogled"
+
+#: src/gtkui/menus.cc:211 src/qtui/menus.cc:296
+msgid "_Queue/Unqueue"
+msgstr "Dodaj/odstrani iz vrste"
+
+#: src/gtkui/menus.cc:213 src/qtui/menus.cc:299
+msgid "_Open Containing Folder"
+msgstr "Odpri vsebujočo mapo"
+
+#: src/gtkui/menus.cc:214 src/qtui/menus.cc:301
+msgid "_Refresh Selected"
+msgstr "Osveži izbrane"
+
+#: src/gtkui/menus.cc:216 src/qtui/menus.cc:304
+msgid "Cu_t"
+msgstr "Izreži"
+
+#: src/gtkui/menus.cc:217 src/qtui/menus.cc:305
+msgid "_Copy"
+msgstr "Kopiraj"
+
+#: src/gtkui/menus.cc:218 src/qtui/menus.cc:306
+msgid "_Paste"
+msgstr "Prilepi"
+
+#: src/gtkui/menus.cc:219 src/qtui/menus.cc:307
+msgid "Paste at _End"
+msgstr "Prilepi na konec"
+
+#: src/gtkui/menus.cc:220 src/qtui/menus.cc:309
+msgid "Select _All"
+msgstr "Izberi vse"
+
+#: src/gtkui/menus.cc:227 src/moonstone/playlist_tabs.cc:309
+#: src/qtui/playlist_tabs.cc:334
+msgid "_Rename ..."
+msgstr "Preimenuj"
+
+#: src/gtkui/settings.cc:35 src/qtui/settings.cc:59
+msgid "Always"
+msgstr "Vselej"
+
+#: src/gtkui/settings.cc:36 src/qtui/settings.cc:60
+msgid "Auto-hide"
+msgstr "Če je odprt več kot eden"
+
+#: src/gtkui/settings.cc:37 src/qtui/settings.cc:61
+msgid "Never"
+msgstr "Nikoli"
+
+#: src/gtkui/settings.cc:41 src/qtui/settings.cc:64
+msgid "Playlist Tabs"
+msgstr "Zavihki seznamov predvajanj"
+
+#: src/gtkui/settings.cc:42 src/qtui/settings.cc:65
+msgid "Show playlist tabs:"
+msgstr "Prikaži zavihke seznama predvajanja:"
+
+#: src/gtkui/settings.cc:45 src/qtui/settings.cc:69
+msgid "Show entry counts"
+msgstr "Prikaži število skladb v naslovu zavihka"
+
+#: src/gtkui/settings.cc:47 src/qtui/settings.cc:72
+msgid "Show close buttons"
+msgstr "Prikaži gumb za zaprtje zavihka"
+
+#: src/gtkui/settings.cc:49 src/qtui/settings.cc:75
+msgid "Playlist Columns"
+msgstr "Glava seznama predvajanja"
+
+#: src/gtkui/settings.cc:51 src/qtui/settings.cc:77
+msgid "Show column headers"
+msgstr "Prikaži glavo"
+
+#: src/gtkui/settings.cc:53 src/qtui/settings.cc:82
+msgid "Make column headers clickable for sorting"
+msgstr "Stolpce je mogoče razvrščati s klikom na naslov"
+
+#: src/gtkui/settings.cc:56
+msgid "Use symbolic icons in toolbar"
+msgstr "V orodni vrstici uporabi simbolične ikone"
+
+#: src/gtkui/settings.cc:58 src/qtui/settings.cc:86
+msgid "Scroll on song change"
+msgstr "Zamakni dolg seznam ob zamenjavi skladbe"
+
+#: src/gtkui/ui_gtk.cc:82
+msgid "GTK Interface"
+msgstr "Vmesnik GTK"
+
+#: src/gtkui/ui_gtk.cc:219 src/skins/main.cc:228 src/skins-qt/main.cc:231
+#, c-format
+msgid "%s - Audacious"
+msgstr "%s - Audacious"
+
+#: src/gtkui/ui_gtk.cc:221 src/moonstone/main_window.cc:184
+#: src/qtui/main_window.cc:385
+msgid "Buffering ..."
+msgstr "Nalagam ..."
+
+#: src/gtkui/ui_gtk.cc:224 src/pipewire/pipewire.cc:402 src/skins/main.cc:230
+#: src/skins-qt/main.cc:233
+msgid "Audacious"
+msgstr "Audacious"
+
+#: src/gtkui/ui_gtk.cc:487 src/gtkui/ui_gtk.cc:518 src/gtkui/ui_gtk.cc:882
+#: src/hotkey/gui.cc:72 src/moonstone/main_window.cc:67
+#: src/moonstone/main_window.cc:145 src/moonstone/main_window.cc:146
+#: src/notify/osd.cc:85 src/qthotkey/gui.cc:67 src/qtui/main_window.cc:154
+#: src/qtui/main_window.cc:347 src/qtui/main_window.cc:348
+#: src/skins/menus.cc:109 src/skins-qt/menus.cc:100
+msgid "Play"
+msgstr "Predvajaj"
+
+#: src/gtkui/ui_gtk.cc:487 src/moonstone/main_window.cc:151
+#: src/moonstone/main_window.cc:152 src/notify/osd.cc:82
+#: src/qtui/main_window.cc:353 src/qtui/main_window.cc:354
+#: src/skins/menus.cc:110 src/skins-qt/menus.cc:101
+msgid "Pause"
+msgstr "Premor"
+
+#: src/gtkui/ui_gtk.cc:868 src/moonstone/main_window.cc:57
+#: src/qtui/main_window.cc:145 src/skins/menus.cc:86 src/skins-qt/menus.cc:77
+msgid "Search Library"
+msgstr "Knjižnica iskanja"
+
+#: src/gtkui/ui_gtk.cc:875 src/moonstone/main_window.cc:60
+#: src/qtui/main_window.cc:147
+msgid "Open Files"
+msgstr "Odpri datoteke"
+
+#: src/gtkui/ui_gtk.cc:876 src/moonstone/main_window.cc:62
+#: src/qtui/main_window.cc:149
+msgid "Add Files"
+msgstr "Dodaj datoteke"
+
+#: src/gtkui/ui_gtk.cc:881 src/moonstone/main_window.cc:65
+#: src/qtui/main_window.cc:152 src/skins/menus.cc:112 src/skins-qt/menus.cc:103
+msgid "Previous"
+msgstr "Prejšnja"
+
+#: src/gtkui/ui_gtk.cc:883 src/hotkey/gui.cc:74 src/moonstone/main_window.cc:69
+#: src/qthotkey/gui.cc:69 src/qtui/main_window.cc:156 src/skins/menus.cc:111
+#: src/skins-qt/menus.cc:102
+msgid "Stop"
+msgstr "Ustavi"
+
+#: src/gtkui/ui_gtk.cc:884 src/moonstone/main_window.cc:76 src/notify/osd.cc:89
+#: src/qtui/main_window.cc:163 src/skins/menus.cc:113 src/skins-qt/menus.cc:104
+msgid "Next"
+msgstr "Naslednja"
+
+#: src/gtkui/ui_gtk.cc:886 src/moonstone/main_window.cc:79
+#: src/qtui/main_window.cc:166 src/qtui/menus.cc:254 src/skins/menus.cc:79
+#: src/skins-qt/menus.cc:69
+msgid "Record Stream"
+msgstr "Pretočno snemanje"
+
+#: src/gtkui/ui_gtk.cc:919 src/moonstone/main_window.cc:86
+#: src/qtui/main_window.cc:173 src/skins/menus.cc:103 src/skins-qt/menus.cc:94
+msgid "Repeat"
+msgstr "Ponavljanje"
+
+#: src/gtkui/ui_gtk.cc:922 src/moonstone/main_window.cc:89
+#: src/qtui/main_window.cc:176 src/skins/menus.cc:104 src/skins-qt/menus.cc:95
+msgid "Shuffle"
+msgstr "Mešaj"
+
+#: src/gtkui/ui_gtk.cc:1114 src/qtui/main_window.cc:123
+msgid "Menu"
+msgstr "Meni"
+
+#: src/gtkui/ui_statusbar.cc:64 src/qtui/status_bar.cc:155
+msgid "mono"
+msgstr "mono"
+
+#: src/gtkui/ui_statusbar.cc:66 src/qtui/status_bar.cc:157
+msgid "stereo"
+msgstr "stereo"
+
+#: src/gtkui/ui_statusbar.cc:68 src/qtui/status_bar.cc:160
+#, c-format
+msgid "%d channel"
+msgid_plural "%d channels"
+msgstr0 "%d kanal"
+msgstr1 "%d kanala"
+msgstr2 "%d kanali"
+msgstr3 "%d kanalov"
+
+#: src/gtkui/ui_statusbar.cc:76 src/qtui/status_bar.cc:168
+#, c-format
+msgid "%d kHz"
+msgstr "%d kHz"
+
+#: src/gtkui/ui_statusbar.cc:82 src/qtui/status_bar.cc:174
+#, c-format
+msgid "%d kbit/s"
+msgstr "%d kbit/s"
+
+#: src/gtkui/ui_statusbar.cc:108 src/skins/main.cc:478 src/skins-qt/main.cc:461
+msgid "Single mode."
+msgstr "Enojni način."
+
+#: src/gtkui/ui_statusbar.cc:110 src/skins/main.cc:480 src/skins-qt/main.cc:463
+msgid "Playlist mode."
+msgstr "Način seznama predvajanja."
+
+#: src/gtkui/ui_statusbar.cc:118 src/skins/main.cc:486 src/skins-qt/main.cc:469
+msgid "Stopping after song."
+msgstr "Ustavljam po skladbi."
+
+#: src/hotkey/gui.cc:71 src/qthotkey/gui.cc:66
+msgid "Previous track"
+msgstr "Prejšnja skladba"
+
+#: src/hotkey/gui.cc:73 src/qthotkey/gui.cc:68
+msgid "Pause/Resume"
+msgstr "Premor/nadaljuj"
+
+#: src/hotkey/gui.cc:75 src/qthotkey/gui.cc:70
+msgid "Next track"
+msgstr "Naslednja skladba"
+
+#: src/hotkey/gui.cc:76 src/qthotkey/gui.cc:71
+msgid "Step forward"
+msgstr "Korak naprej"
+
+#: src/hotkey/gui.cc:77 src/qthotkey/gui.cc:72
+msgid "Step backward"
+msgstr "Korak nazaj"
+
+#: src/hotkey/gui.cc:78 src/qthotkey/gui.cc:73
+msgid "Mute"
+msgstr "Utišaj"
+
+#: src/hotkey/gui.cc:79 src/qthotkey/gui.cc:74
+msgid "Volume up"
+msgstr "Zvišaj glasnost"
+
+#: src/hotkey/gui.cc:80 src/qthotkey/gui.cc:75
+msgid "Volume down"
+msgstr "Znižaj glasnost"
+
+#: src/hotkey/gui.cc:81 src/qthotkey/gui.cc:76
+msgid "Jump to file"
+msgstr "Skoči na datoteko"
+
+#: src/hotkey/gui.cc:82 src/qthotkey/gui.cc:77
+msgid "Toggle player window(s)"
+msgstr "Preklopi okna predvajalnika"
+
+#: src/hotkey/gui.cc:83 src/qthotkey/gui.cc:78
+msgid "Show On-Screen-Display"
+msgstr "Prikaži OSD"
+
+#: src/hotkey/gui.cc:84 src/qthotkey/gui.cc:79
+msgid "Toggle repeat"
+msgstr "Preklopi ponavljanje"
+
+#: src/hotkey/gui.cc:85 src/qthotkey/gui.cc:80
+msgid "Toggle shuffle"
+msgstr "Preklopi mešanje"
+
+#: src/hotkey/gui.cc:86 src/qthotkey/gui.cc:81
+msgid "Toggle stop after current"
+msgstr "Preklopi ustavitev po trenutnem"
+
+#: src/hotkey/gui.cc:87 src/qthotkey/gui.cc:82
+msgid "Raise player window(s)"
+msgstr "Dvigni okna predvajalnika"
+
+#: src/hotkey/gui.cc:98 src/qthotkey/gui.cc:100
+msgid "(none)"
+msgstr "(brez)"
+
+#: src/hotkey/gui.cc:261
+msgid ""
+"It is not recommended to bind the primary mouse buttons without modifiers.\n"
+"\n"
+"Do you want to continue?"
+msgstr ""
+"Miškine gumbe ni priporočljivo vezati brez dodatnih tipk.\n"
+"\n"
+"Želite nadaljevati?"
+
+#: src/hotkey/gui.cc:264
+msgid "Binding mouse buttons"
+msgstr "Vežem miškine gumbe"
+
+#: src/hotkey/gui.cc:434
+msgid ""
+"Press a key combination inside a text field.\n"
+"You can also bind mouse buttons."
+msgstr ""
+"V besedilno okno vnesite kombinacijo tipk.\n"
+"Uporabite lahko tudi miškine gumbe."
+
+#: src/hotkey/gui.cc:444 src/qthotkey/gui.cc:179
+msgid "Hotkeys:"
+msgstr "Hitre tipke:"
+
+#: src/hotkey/gui.cc:457 src/qthotkey/gui.cc:181
+msgid "Action:"
+msgstr "Dejanje:"
+
+#: src/hotkey/gui.cc:461 src/qthotkey/gui.cc:182
+msgid "Key Binding:"
+msgstr "Tipkovne bližnjice:"
+
+#: src/hotkey/gui.cc:518 src/qthotkey/gui.cc:184
+msgid "_Add"
+msgstr "_Dodaj"
+
+#: src/hotkey/plugin.cc:59 src/qthotkey/plugin.cc:78
+msgid "Global Hotkeys"
+msgstr "Globalne bližnjice"
+
+#: src/hotkey/plugin.cc:74
+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"
+"Contributors 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 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"
+"Contributors 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/jack/jack-ng.cc:54
+msgid "JACK Output"
+msgstr "JACK"
+
+#: src/jack/jack-ng.cc:126
+msgid "Client name:"
+msgstr "Ime odjemalca:"
+
+#: src/jack/jack-ng.cc:128
+msgid "Automatically connect to output ports"
+msgstr "Samodejno poveži na odprta vrata"
+
+#: src/jack/jack-ng.cc:130
+msgid "Filter ports (regex, use any port if blank):"
+msgstr "Filtriranje vrat (regex; uporabi vrata po želji, če prazno):"
+
+#: src/jack/jack-ng.cc:136
+msgid "Connect to physical ports only"
+msgstr "Poveži le na fizična vrata"
+
+#: src/jack/jack-ng.cc:139
+msgid "Upmix to"
+msgstr "Upmix na"
+
+#: src/jack/jack-ng.cc:141
+msgid "ports if input has fewer channels"
+msgstr "vrat(a), če ima vhod manj kanalov"
+
+#: src/jack/jack-ng.cc:143
+msgid "Ignore insufficient number of ports"
+msgstr "Prezri nezadostno število vrat"
+
+#: src/jack/jack-ng.cc:181
+msgid "No JACK output ports were found. Please check settings."
+msgstr ""
+"Izhodna vrata za JACK niso bila najdena. Prosimo, preverite nastavitve."
+
+#: src/jack/jack-ng.cc:195
+#, c-format
+msgid "Only %d JACK output ports were found but %d are required."
+msgstr "Najdenih toliko izhodnih vrat za JACK: %d, potrebnih pa toliko: %d."
+
+#: src/jack/jack-ng.cc:210
+#, c-format
+msgid "Failed to connect to JACK port %s."
+msgstr "Napaka pri povezavi na JACK, vrata %s."
+
+#: src/jack/jack-ng.cc:230
+msgid ""
+"JACK supports only floating-point audio. You must change the output bit "
+"depth to floating-point in Audacious settings."
+msgstr ""
+"JACK podpira le zvok s plavajočo vejico. V nastavitvah za Audacious morate "
+"nastaviti izhodno bitno globino na tisto s plavajočo vejico."
+
+#: src/jack/jack-ng.cc:245
+msgid "Failed to connect to the JACK server; is it running?"
+msgstr "Napaka pri priklopu na strežnik JACK. Ali je zagnan?"
+
+#: src/jack/jack-ng.cc:321
+#, c-format
+msgid ""
+"The JACK server requires a sample rate of %d Hz, but Audacious is playing at "
+"%d Hz. Please use the Sample Rate Converter effect to correct the mismatch."
+msgstr ""
+"Strežnik JACK zahteva vzorčno hitrost %d Hz, Audacious pa predvaja na %d Hz. "
+"Prosimo, uporabite učinek Pretvornik vzorčne hitrosti, da odpravite "
+"neujemanje."
+
+#: src/ladspa/plugin.cc:416
+#, c-format
+msgid "%s Settings"
+msgstr "Nastavitve za %s"
+
+#: src/ladspa/plugin.cc:482
+msgid "Module paths:"
+msgstr "Poti do modulov:"
+
+#: src/ladspa/plugin.cc:487
+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 ""
+"Ločite več različnih poti s podpičjem.\n"
+"Iskanje bo poleg LADSPA_PATH potekalo tudi po njih.\n"
+"Pritisnite Enter po dodajanju novih poti."
+
+#: src/ladspa/plugin.cc:508
+msgid "Available plugins:"
+msgstr "Vtičniki na voljo:"
+
+#: src/ladspa/plugin.cc:521 src/modplug/plugin_main.cc:91
+#: src/modplug/plugin_main.cc:94 src/modplug/plugin_main.cc:97
+#: src/modplug/plugin_main.cc:100
+msgid "Enable"
+msgstr "Omogoči"
+
+#: src/ladspa/plugin.cc:527
+msgid "Enabled plugins:"
+msgstr "Omogočeni vtičniki:"
+
+#: src/ladspa/plugin.cc:543
+msgid "Settings"
+msgstr "Nastavitve"
+
+#: src/ladspa/plugin.cc:560
+msgid ""
+"LADSPA Host for Audacious\n"
+"Copyright 2011 John Lindgren"
+msgstr ""
+"LADSPA Host for Audacious\n"
+"Copyright 2011 John Lindgren"
+
+#: src/ladspa/plugin.h:78
+msgid "LADSPA Host"
+msgstr "Gostitelj LADSPA"
+
+#: src/lirc/lirc.cc:55
+msgid "LIRC Plugin"
+msgstr "Vtičnik LIRC"
+
+#: src/lirc/lirc.cc:379
+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 ""
+"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.cc:390
+msgid "Connection"
+msgstr "Povezava"
+
+#: src/lirc/lirc.cc:391
+msgid "Reconnect to LIRC server"
+msgstr "Ponovno poveži na strežnik LIRC"
+
+#: src/lirc/lirc.cc:393
+msgid "Wait before reconnecting:"
+msgstr "Počakaj pred ponovnim povezovanjem:"
+
+#: src/lyrics-common/chart_lyrics_provider.cc:93
+#: src/lyrics-common/chart_lyrics_provider.cc:150
+#: src/lyrics-common/lyrics_ovh_provider.cc:50
+#, c-format
+msgid "Unable to fetch %s"
+msgstr "Napaka pri iskanju %s"
+
+#: src/lyrics-common/chart_lyrics_provider.cc:100
+#: src/lyrics-common/chart_lyrics_provider.cc:157
+#: src/lyrics-common/lyrics_ovh_provider.cc:57
+#, c-format
+msgid "Unable to parse %s"
+msgstr "Napaka pri obdelovanju %s"
+
+#: src/lyrics-common/chart_lyrics_provider.cc:121
+#: src/lyrics-common/chart_lyrics_provider.cc:194
+#: src/lyrics-common/lyrics_ovh_provider.cc:88
+msgid "Looking for lyrics ..."
+msgstr "Iščem besedilo..."
+
+#: src/lyrics-common/preferences.h:43
+msgid "Nowhere"
+msgstr "ne išči"
+
+#: src/lyrics-common/preferences.h:49
+msgid "Artist is truncated at the start, Title -- at the end"
+msgstr "Izvajalec je skrajšan na začetku, naslov -- na koncu"
+
+#: src/lyrics-common/preferences.h:50
+msgid "Chars to truncate on:"
+msgstr "Skrajšaj na znakih:"
+
+#: src/lyrics-common/preferences.h:54
+msgid "Chars are ORed in RegExp, surrounded by whitespace"
+msgstr ""
+"Nad regularnimi izrazi, ločenimi s presledkom, je izvedena operacija "
+"OR"
+
+#: src/lyrics-common/preferences.h:55
+msgid "Chars to split on:"
+msgstr "Razdruži na znakih:"
+
+#: src/lyrics-common/preferences.h:56
+msgid "Further truncate those on chars"
+msgstr "Nadalje skrajšaj na znakih"
+
+#: src/lyrics-common/preferences.h:62
+msgid "General"
+msgstr "Splošno"
+
+#: src/lyrics-common/preferences.h:63
+msgid "Split title into artist and title on chars"
+msgstr "Razdeli naslov v izvajalca in naslov na znakih"
+
+#: src/lyrics-common/preferences.h:66
+msgid "Sources"
+msgstr "Viri"
+
+#: src/lyrics-common/preferences.h:67
+msgid "Use embedded lyrics (from Lyrics tag)"
+msgstr "Uporabni vključena besedilo (z oznake Besedila)"
+
+#: src/lyrics-common/preferences.h:69
+msgid "Fetch lyrics from internet:"
+msgstr "Pridobi besedilo s spleta:"
+
+#: src/lyrics-common/preferences.h:72
+msgid "Store fetched lyrics in local cache"
+msgstr "Shrani besedila v krajevnem medpomnilniku"
+
+#: src/lyrics-common/preferences.h:74
+msgid "Local Storage"
+msgstr "Krajevna shramba"
+
+#: src/lyrics-common/preferences.h:75
+msgid "Load lyric files (.lrc) from local storage"
+msgstr "Naloži besedilne datoteke (.lrc) iz krajevne shrambe"
+
+#: src/lyrics-common/utils.cc:54 src/ui-common/dialogs-qt.cc:63
+msgid "Error"
+msgstr "Napaka"
+
+#: src/lyrics-common/utils.cc:60
+msgid "Lyrics could not be found."
+msgstr "Besedilo ni bilo najdeno."
+
+#: src/lyrics-common/utils.cc:142
+msgid "Missing title and/or artist."
+msgstr "Manjkajo naslov in/ali izvajalec."
+
+#: src/lyrics-gtk/lyrics-gtk.cc:37 src/lyrics-qt/lyrics-qt.cc:50
+msgid "Lyrics"
+msgstr "Besedilo skladbe"
+
+#: src/lyrics-gtk/lyrics-gtk.cc:189 src/lyrics-qt/lyrics-qt.cc:171
+msgid "Edit Lyrics ..."
+msgstr "Uredi besedilo ..."
+
+#: src/lyrics-gtk/lyrics-gtk.cc:195 src/lyrics-qt/lyrics-qt.cc:178
+msgid "Save Locally"
+msgstr "Shrani krajevno"
+
+#: src/lyrics-gtk/lyrics-gtk.cc:201 src/lyrics-qt/lyrics-qt.cc:186
+msgid "Refresh"
+msgstr "Osveži"
+
+#: src/m3u/m3u.cc:33
+msgid "M3U Playlists"
+msgstr "Seznami predvajanja M3U"
+
+#: src/metronom/metronom.cc:44
+msgid "Tact Generator"
+msgstr "Generator takta"
+
+#: src/metronom/metronom.cc:145
+#, c-format
+msgid "Tact generator: %d bpm"
+msgstr "Generator takta: %d bpm"
+
+#: src/metronom/metronom.cc:147
+#, c-format
+msgid "Tact generator: %d bpm %d/%d"
+msgstr "Generator takta: %d bpm %d/%d"
+
+#: src/metronom/metronom.cc:235
+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"
+"\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"
+
+#: src/mixer/mixer.cc:43
+msgid "Channel Mixer"
+msgstr "Mešalnik kanalov"
+
+#: src/mixer/mixer.cc:255
+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.cc:259
+msgid "Channel Mixer"
+msgstr "Mešalnik kanalov"
+
+#: src/mixer/mixer.cc:260
+msgid "Output channels:"
+msgstr "Št. izhodnih kanalov:"
+
+#: src/mms/mms.cc:35
+msgid "MMS Plugin"
+msgstr "Vtičnik MMS"
+
+#: src/mms/mms.cc:82
+msgid "Error connecting to MMS server"
+msgstr "Napaka pri povezovanju na strežnik MMS"
+
+#: src/modplug/modplugbmp.h:57
+msgid "ModPlug (Module Player)"
+msgstr "ModPlug (predvajalnik modulov)"
+
+#: src/modplug/plugin_main.cc:55
+msgid "Channels"
+msgstr "Kanali"
+
+#: src/modplug/plugin_main.cc:59
+msgid "Nearest (fastest)"
+msgstr "Najbližji (najhitrejši)"
+
+#: src/modplug/plugin_main.cc:60
+msgid "Linear (fast)"
+msgstr "Linearni (hitro)"
+
+#: src/modplug/plugin_main.cc:61
+msgid "Spline (good)"
+msgstr "Spline (dobro)"
+
+#: src/modplug/plugin_main.cc:62
+msgid "Polyphase (best)"
+msgstr "Polifazni (najboljše)"
+
+#: src/modplug/plugin_main.cc:63
+msgid "Sample rate"
+msgstr "Hitrost vzorčenja"
+
+#: src/modplug/plugin_main.cc:64
+msgid "22 kHz"
+msgstr "22 kHz"
+
+#: src/modplug/plugin_main.cc:65
+msgid "44 kHz"
+msgstr "44 kHz"
+
+#: src/modplug/plugin_main.cc:66
+msgid "48 kHz"
+msgstr "48 kHz"
+
+#: src/modplug/plugin_main.cc:67
+msgid "96 kHz"
+msgstr "96 kHz"
+
+#: src/modplug/plugin_main.cc:71 src/modplug/plugin_main.cc:76
+#: src/modplug/plugin_main.cc:81
+msgid "Level:"
+msgstr "Nivo:"
+
+#: src/modplug/plugin_main.cc:77
+msgid "Cutoff:"
+msgstr "Odreži pri:"
+
+#: src/modplug/plugin_main.cc:90
+msgid "Reverb"
+msgstr "Reverb"
+
+#: src/modplug/plugin_main.cc:93
+msgid "Bass Boost"
+msgstr "Ojačitev nizkih tonov"
+
+#: src/modplug/plugin_main.cc:96
+msgid "Surround"
+msgstr "Surround"
+
+#: src/modplug/plugin_main.cc:99
+msgid "Preamp"
+msgstr "Predojačevalnik"
+
+#: src/modplug/plugin_main.cc:106
+msgid "Oversample"
+msgstr "Prevzorčenje"
+
+#: src/modplug/plugin_main.cc:107
+msgid "Noise reduction"
+msgstr "Zmanjševanje hrupa"
+
+#: src/modplug/plugin_main.cc:108
+msgid "Play Amiga MODs"
+msgstr "Predvajaj datoteke Amiga MOD"
+
+#: src/modplug/plugin_main.cc:109
+msgid "Repeat"
+msgstr "Ponavljanje"
+
+#: src/modplug/plugin_main.cc:110
+msgid "Repeat count:"
+msgstr "Števec ponovitev:"
+
+#: src/modplug/plugin_main.cc:111
+msgid "To repeat forever, set the repeat count to -1."
+msgstr "Za neskončno ponavljanje nastavite števec na -1."
+
+#: src/modplug/plugin_main.cc:124 src/sid/xs_config.cc:106
+msgid "These settings will take effect when Audacious is restarted."
+msgstr "Nastavitve se bodo uveljavile po vnovičnem zagonu programa."
+
+#: src/moonstone/main_window.cc:72 src/moonstone/main_window.cc:73
+#: src/qtui/main_window.cc:159 src/qtui/main_window.cc:160
+#: src/skins/menus.cc:107 src/skins-qt/menus.cc:98
+msgid "Stop After This Song"
+msgstr "Ustavi po tej skladbi"
+
+#: src/moonstone/moonstone.cc:39
+msgid "Moonstone"
+msgstr "Moonstone"
+
+#: src/moonstone/playlist_header.cc:212 src/qtui/playlist_header.cc:258
+msgid "Reset to Defaults"
+msgstr "Ponastavi na privzete nastavitve"
+
+#: src/moonstone/playlist_model.cc:38 src/qtui/playlist_header.cc:232
+msgid "Now Playing"
+msgstr "Predvaja se"
+
+#: src/moonstone/playlist_selection.cc:66
+#: src/playlist-manager/playlist-manager.cc:201
+#: src/playlist-manager-qt/playlist-manager-qt.cc:190
+msgid "Entries"
+msgstr "Vnosi"
+
+#: src/mpg123/mpg123.cc:54
+msgid "MPG123 Plugin"
+msgstr "Vtičnik MPG123"
+
+#: src/mpg123/mpg123.cc:82
+msgid "Use accurate length calculation (slow)"
+msgstr "Uporabi točen izračun dolžine (počasno)"
+
+#: src/mpg123/mpg123.cc:260
+msgid "Surround"
+msgstr "Surround"
+
+#: src/mpris2/plugin.cc:40
+msgid "MPRIS 2 Server"
+msgstr "Strežnik MPRIS 2"
+
+#: src/neon/neon.cc:102
+msgid "Neon HTTP/HTTPS Plugin"
+msgstr "Vtičnik Neon HTTP/HTTPS"
+
+#: src/neon/neon.cc:526
+msgid "Error parsing redirect"
+msgstr "Napaka obdelave preusmeritve"
+
+#: src/neon/neon.cc:540
+msgid "Unknown HTTP error"
+msgstr "Neznana napaka HTTP"
+
+#: src/neon/neon.cc:614
+msgid "Error parsing URL"
+msgstr "Napaka pri obdelavi naslova URL"
+
+#: src/neon/neon.cc:687
+msgid "Too many redirects"
+msgstr "Preveč preusmeritev"
+
+#: src/notify/event.cc:97
+msgid "Stopped"
+msgstr "Ustavljeno"
+
+#: src/notify/event.cc:97
+msgid "Audacious is not playing."
+msgstr "Audacious ne predvaja."
+
+#: src/notify/notify.cc:39
+msgid "Desktop Notifications"
+msgstr "Namizna obvestila"
+
+#: src/notify/notify.cc:57
+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 ""
+"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.cc:104
+msgid "Show playback controls"
+msgstr "Prikaži gumbe za nadzor predvajanja"
+
+#: src/notify/notify.cc:106
+msgid "Always show notification"
+msgstr "Vsakič prikaži obvestilo"
+
+#: src/notify/notify.cc:108
+msgid "Include album name in notification"
+msgstr "V obvestilu prikaži ime albuma"
+
+#: src/notify/notify.cc:110
+msgid "Custom notification duration:"
+msgstr "Trajanje po meri:"
+
+#: src/notify/osd.cc:74
+msgid "Show"
+msgstr "Prikaži"
+
+#: src/openmpt/mpt.cc:50
+msgid "OpenMPT (Module Player)"
+msgstr "OpenMPT (predvajalnik modulov)"
+
+#: src/openmpt/mpt.cc:132
+msgid ""
+"Module player based on libopenmpt\n"
+"\n"
+"Written by: Chris Spiegel <cspiegel@gmail.com>"
+msgstr ""
+"Module player based on libopenmpt\n"
+"\n"
+"Written by: Chris Spiegel <cspiegel@gmail.com>"
+
+#: src/openmpt/mpt.cc:151
+msgid "Stereo separation:"
+msgstr "Stereo separacija:"
+
+#: src/openmpt/mpt.cc:153
+msgid "% (0=mono, 100=default, 200=full)"
+msgstr "% (0=mono, 100=privzeto, 200=popolnoma)"
+
+#: src/openmpt/mpt.cc:157
+msgid "Interpolation:"
+msgstr "Interpolacija:"
+
+#: src/openmpt/mptwrap.h:51 src/soxr/sox-resampler.cc:189 src/xsf/plugin.cc:437
+msgid "Linear"
+msgstr "Linearna"
+
+#: src/openmpt/mptwrap.h:52
+msgid "Cubic"
+msgstr "Kubična"
+
+#: src/openmpt/mptwrap.h:53
+msgid "Windowed sinc"
+msgstr "Oknjeni sinc"
+
+#: src/opus/opus.cc:39
+msgid "Opus Decoder"
+msgstr "Opus dekodirnik"
+
+#: src/opus/opus.cc:336
+msgid ""
+"Opus Decoder Plugin for Audacious\n"
+"Copyright 2022 Thomas Lange"
+msgstr ""
+"Opus dekodirnik vtičnik za Audacious\n"
+"Avtorstvo 2022 Thomas Lange"
+
+#: src/oss4/oss.h:70
+msgid "OSS4 Output"
+msgstr "OSS4"
+
+#: src/oss4/oss.h:72
+msgid "OSS3 Output"
+msgstr "OSS3"
+
+#: src/oss4/plugin.cc:35
+msgid "Default device"
+msgstr "Privzeta naprava"
+
+#: src/oss4/plugin.cc:78
+msgid "Audio device:"
+msgstr "Zvočna naprava:"
+
+#: src/oss4/plugin.cc:81
+msgid "Use alternate device:"
+msgstr "Uporabi alternativno napravo:"
+
+#: src/oss4/plugin.cc:85
+msgid "Save volume between sessions."
+msgstr "Shrani glasnost med sejami."
+
+#: src/oss4/plugin.cc:87
+msgid "Enable format conversions made by the OSS software."
+msgstr "Omogoči pretvorbe formatov programske opreme OSS."
+
+#: src/oss4/plugin.cc:89
+msgid "Enable exclusive mode to prevent virtual mixing."
+msgstr "Omogoči ekskluziven način, ki prepreči virtualno mešanje."
+
+#: src/oss4/plugin.cc:101
+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 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/pipewire/pipewire.cc:44
+msgid "PipeWire Output"
+msgstr "PipeWire izhod"
+
+#: src/pipewire/pipewire.cc:118
+msgid ""
+"PipeWire Output Plugin for Audacious\n"
+"Copyright 2022 Thomas Lange\n"
+"\n"
+"Based on the PipeWire Output Plugin for Qmmp\n"
+"Copyright 2021 Ilya Kotov"
+msgstr ""
+"PipeWire izhod vtičnik za Audacious\n"
+"Avtorstvo 2022 Thomas Lange\n"
+"\n"
+"Na osnovi vtičnika PipeWire Output Plugin for Qmmp\n"
+"Avtorstvo 2021 Ilya Kotov"
+
+#: src/pipewire/pipewire.cc:408 src/skins/menus.cc:88 src/skins-qt/menus.cc:79
+msgid "Playback"
+msgstr "Predvajanje"
+
+#: src/playlist-manager/playlist-manager.cc:38
+#: src/playlist-manager-qt/playlist-manager-qt.cc:42
+msgid "Playlist Manager"
+msgstr "Upravljalnik seznamov predvajanja"
+
+#: src/playlist-manager/playlist-manager.cc:221
+#: src/playlist-manager-qt/playlist-manager-qt.cc:356
+msgid "_Remove"
+msgstr "_Odstrani"
+
+#: src/playlist-manager/playlist-manager.cc:222
+#: src/playlist-manager-qt/playlist-manager-qt.cc:351
+msgid "Ren_ame"
+msgstr "_Preimenuj"
+
+#: src/pls/pls.cc:35
+msgid "PLS Playlists"
+msgstr "Seznami predvajanja PLS"
+
+#: src/psf/plugin.cc:53
+msgid "OpenPSF PSF1/PSF2 Decoder"
+msgstr "Dekodirnik OpenPSF PSF1/PSF2"
+
+#: src/psf/plugin.cc:270
+msgid "OpenPSF Configuration"
+msgstr "Nastavitve OpenPSF"
+
+#: src/psf/plugin.cc:271 src/xsf/plugin.cc:444
+msgid "Ignore length from file"
+msgstr "Prezri dolžino iz datoteke"
+
+#: src/pulse/pulse_audio.cc:42
+msgid "PulseAudio Output"
+msgstr "PulseAudio"
+
+#: src/pulse/pulse_audio.cc:84
+msgid "Context name:"
+msgstr "Ime konteksta:"
+
+#: src/pulse/pulse_audio.cc:86
+msgid "Stream name:"
+msgstr "Ime pretoka:"
+
+#: src/pulse/pulse_audio.cc:596
+msgid ""
+"Audacious PulseAudio Output Plugin\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 ""
+"Audacious PulseAudio Output Plugin\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/qtaudio/qtaudio.cc:53
+msgid "QtMultimedia Output"
+msgstr "QtMultimedia"
+
+#: src/qtaudio/qtaudio.cc:84
+msgid ""
+"QtMultimedia Audio Output Plugin for Audacious\n"
+"Copyright 2014 William Pitcock\n"
+"\n"
+"Based on SDL Output Plugin for Audacious\n"
+"Copyright 2010 John Lindgren"
+msgstr ""
+"QtMultimedia Audio Output Plugin for Audacious\n"
+"Copyright 2014 William Pitcock\n"
+"\n"
+"Based on SDL Output Plugin for Audacious\n"
+"Copyright 2010 John Lindgren"
+
+#: src/qtglspectrum/gl-spectrum.cc:41
+msgid ""
+"OpenGL Spectrum Analyzer for Audacious\n"
+"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
+"Copyright 2014, 2020 Ariadne Conill\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é, John Lindgren, and Carlo Bramini\n"
+"Copyright 2014, 2020 Ariadne Conill\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/qthotkey/gui.cc:177
+msgid "Press a key combination inside a text field."
+msgstr "Vnesite tipkovno kombinacijo v besedilno polje."
+
+#: src/qthotkey/plugin.cc:105
+msgid ""
+"Global Hotkey Plugin\n"
+"Control the player with global key combinations or multimedia keys.\n"
+"\n"
+"Copyright (C) 2020 i.Dark_Templar <darktemplar@dark-templar-archives.net>\n"
+"Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n"
+"\n"
+"Contributors 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 Plugin\n"
+"Control the player with global key combinations or multimedia keys.\n"
+"\n"
+"Copyright (C) 2020 i.Dark_Templar <darktemplar@dark-templar-archives.net>\n"
+"Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n"
+"\n"
+"Contributors 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/qtui/menus.cc:109
+msgid "_Open Folder ..."
+msgstr "_Odpri mapo"
+
+#: src/qtui/menus.cc:115
+msgid "_Add Folder ..."
+msgstr "Dodaj _mapo"
+
+#: src/qtui/menus.cc:128
+msgid "_Log Inspector ..."
+msgstr "Pregledovalnik _zapisnika"
+
+#: src/qtui/menus.cc:220
+msgid "_Find ..."
+msgstr "_Išči"
+
+#: src/qtui/menus.cc:256 src/skins/menus.cc:80 src/skins-qt/menus.cc:70
+msgid "Audio Settings ..."
+msgstr "Zvočne nastavitve"
+
+#: src/qtui/playlist_model.cc:188
+msgid "Q#"
+msgstr "Q#"
+
+#: src/qtui/playlist_model.cc:190
+msgid "T#"
+msgstr "T#"
+
+#: src/qtui/playlist_model.cc:192
+msgid "C#"
+msgstr "C#"
+
+#: src/qtui/playlist_model.cc:194
+msgid "D#"
+msgstr "D#"
+
+#: src/qtui/qtui.cc:40
+msgid "Qt Interface"
+msgstr "Vmesnik Qt"
+
+#: src/qtui/search_bar.cc:46
+msgid "Search playlist"
+msgstr "Išči po seznamu predvajanja"
+
+#: src/qtui/settings.cc:79
+msgid "Use bold font for column headers"
+msgstr "Prikaži z odebeljeno pisavo"
+
+#: src/resample/resample.cc:43
+msgid "Sample Rate Converter"
+msgstr "Pretvornik hitrosti vzorčenja"
+
+#: src/resample/resample.cc:183
+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.cc:187
+msgid "Skip/repeat samples"
+msgstr "Preskoči/ponavljaj vzorce"
+
+#: src/resample/resample.cc:188
+msgid "Linear interpolation"
+msgstr "Linearna interpolacija"
+
+#: src/resample/resample.cc:189
+msgid "Fast sinc interpolation"
+msgstr "Hitra sinc interpolacija"
+
+#: src/resample/resample.cc:190
+msgid "Medium sinc interpolation"
+msgstr "Srednja sinc interpolacija"
+
+#: src/resample/resample.cc:191
+msgid "Best sinc interpolation"
+msgstr "Najboljša sinc interpolacija"
+
+#: src/resample/resample.cc:195
+msgid "Conversion"
+msgstr "Pretvorba"
+
+#: src/resample/resample.cc:196
+msgid "Method:"
+msgstr "Način:"
+
+#: src/resample/resample.cc:199 src/soxr/sox-resampler.cc:203
+msgid "Rate:"
+msgstr "Hitrost vzorčenja:"
+
+#: src/resample/resample.cc:202
+msgid "Rate Mappings"
+msgstr "Preslikave hitrosti"
+
+#: src/resample/resample.cc:203
+msgid "Use rate mappings"
+msgstr "Uporabi preslikave hitrosti"
+
+#: src/resample/resample.cc:205
+msgid "8 kHz:"
+msgstr "8 kHz:"
+
+#: src/resample/resample.cc:209
+msgid "16 kHz:"
+msgstr "16 kHz:"
+
+#: src/resample/resample.cc:213
+msgid "22.05 kHz:"
+msgstr "22.05 kHz:"
+
+#: src/resample/resample.cc:217
+msgid "32.0 kHz:"
+msgstr "32.0 kHz:"
+
+#: src/resample/resample.cc:221
+msgid "44.1 kHz:"
+msgstr "44.1 kHz:"
+
+#: src/resample/resample.cc:225
+msgid "48 kHz:"
+msgstr "48 kHz:"
+
+#: src/resample/resample.cc:229
+msgid "88.2 kHz:"
+msgstr "88.2 kHz:"
+
+#: src/resample/resample.cc:233
+msgid "96 kHz:"
+msgstr "96 kHz:"
+
+#: src/resample/resample.cc:237
+msgid "176.4 kHz:"
+msgstr "176.4 kHz:"
+
+#: src/resample/resample.cc:241
+msgid "192 kHz:"
+msgstr "192 kHz:"
+
+#: src/scrobbler2/config_window.cc:29
+msgid "Checking Last.fm access ..."
+msgstr "Preverjam dostop do Last.fm..."
+
+#: src/scrobbler2/config_window.cc:35
+msgid ""
+"Your scrobbles are being saved on your computer temporarily. They will be "
+"submitted as soon as Audacious is allowed access."
+msgstr ""
+"Vaša zgodovina je shranjena krajevno in se bo posredovala takoj, ko bo "
+"Audacious imel dostop."
+
+#: src/scrobbler2/config_window.cc:41
+#, c-format
+msgid "Permission granted. Scrobbling for user %s."
+msgstr "Dostop odobren. Nalagam za uporabnika %s."
+
+#: src/scrobbler2/config_window.cc:44
+msgid ""
+"Permission denied. Open the following URL in a browser, allow Audacious "
+"access to your account, and then click 'Check Permission' again:"
+msgstr ""
+"Dostop zavrnjen. Odprite sledeči naslov URL v brskalniku, odobrite dostop "
+"programu Audacious in spet izberite Preveri pravice."
+
+#: src/scrobbler2/config_window.cc:53
+msgid "There was a problem contacting Last.fm."
+msgstr "Napaka pri povezovanju na Last.fm."
+
+#: src/scrobbler2/config_window.cc:92
+msgid "Check Permission"
+msgstr "Preveri pravice"
+
+#: src/scrobbler2/config_window.cc:93
+msgid "Revoke Permission"
+msgstr "Odvzemi pravice"
+
+#: src/scrobbler2/config_window.cc:97
+msgid "You need to allow Audacious to scrobble tracks to your Last.fm account."
+msgstr ""
+"Programu Audacious morate dovoliti nalaganje skladb na vaš Last.fm račun."
+
+#: src/scrobbler2/scrobbler.cc:29
+msgid "Scrobbler 2.0"
+msgstr "Scrobbler 2.0"
+
+#: src/scrobbler2/scrobbler.cc:200
+msgid ""
+"The Scrobbler plugin could not be started.\n"
+"There might be a problem with your installation."
+msgstr ""
+"Vtičnik Scrobbler se ni mogel zagnati.\n"
+"To je morda težava z vašo namestitvijo."
+
+#: src/scrobbler2/scrobbler.cc:245
+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."
+msgstr ""
+
+#: src/sdlout/sdlout.cc:43
+msgid "SDL Output"
+msgstr "SDL"
+
+#: src/sdlout/sdlout.cc:72
+msgid ""
+"SDL Output Plugin for Audacious\n"
+"Copyright 2010 John Lindgren"
+msgstr ""
+"SDL Output Plugin for Audacious\n"
+"Copyright 2010 John Lindgren"
+
+#: src/search-tool/library.cc:35 src/search-tool/library.cc:46
+#: src/search-tool-qt/library.cc:35 src/search-tool-qt/library.cc:46
+msgid "Library"
+msgstr "Knjižnica"
+
+#: src/search-tool-qt/search-model.cc:44 src/search-tool/search-tool.cc:287
+#, c-format
+msgid "%d song"
+msgid_plural "%d songs"
+msgstr0 "%d skladba"
+msgstr1 "%d skladbi"
+msgstr2 "%d skladbe"
+msgstr3 "%d skladb"
+
+#: src/search-tool-qt/search-model.cc:53 src/search-tool/search-tool.cc:294
+msgid "of this genre"
+msgstr "tega žanra"
+
+#: src/search-tool-qt/search-model.h:47 src/search-tool/search-model.h:45
+msgid "on"
+msgstr "na"
+
+#: src/search-tool-qt/search-model.h:47 src/search-tool/search-model.h:45
+msgid "by"
+msgstr "od"
+
+#: src/search-tool-qt/search-tool-qt.cc:165 src/search-tool/search-tool.cc:74
+msgid "Number of results to show:"
+msgstr "Število zadetkov za prikaz:"
+
+#: src/search-tool-qt/search-tool-qt.cc:168 src/search-tool/search-tool.cc:77
+msgid "Rescan library at startup"
+msgstr "Ob zagonu ponovno preišči knjižnico"
+
+#: src/search-tool-qt/search-tool-qt.cc:170
+msgid "Monitor library for changes"
+msgstr "Opazuj knjižnico za spremembe"
+
+#: src/search-tool-qt/search-tool-qt.cc:193 src/search-tool/search-tool.cc:450
+msgid ""
+"To import your music library into Audacious, choose a folder and then click "
+"the \"refresh\" icon."
+msgstr ""
+"Za uvoz vaše knjižnice v program Audacious izberite mapo in kliknite ikono "
+"za osvežitev."
+
+#: src/search-tool-qt/search-tool-qt.cc:195 src/search-tool/search-tool.cc:459
+msgid "Please wait ..."
+msgstr "Prosimo počakajte..."
+
+#: src/search-tool-qt/search-tool-qt.cc:197 src/search-tool/search-tool.cc:487
+msgid "Choose Folder"
+msgstr "Izberite mapo"
+
+#: src/search-tool-qt/search-tool-qt.cc:201 src/search-tool/search-tool.cc:445
+msgid "Search library"
+msgstr "Išči po knjižnici"
+
+#: src/search-tool-qt/search-tool-qt.cc:327 src/search-tool/search-tool.cc:156
+#, c-format
+msgid "%d of %d result shown"
+msgid_plural "%d of %d results shown"
+msgstr0 "%d od %d zadetkov prikazan"
+msgstr1 "%d od %d zadetkov prikazana"
+msgstr2 "%d od %d zadetkov prikazani"
+msgstr3 "%d od %d zadetkov prikazanih"
+
+#: src/search-tool-qt/search-tool-qt.cc:331 src/search-tool/search-tool.cc:160
+#, c-format
+msgid "%d result"
+msgid_plural "%d results"
+msgstr0 "%d zadetek"
+msgstr1 "%d zadetka"
+msgstr2 "%d zadetki"
+msgstr3 "%d zadetkov"
+
+#: src/search-tool-qt/search-tool-qt.cc:501 src/search-tool/search-tool.cc:341
+msgid "_Create Playlist"
+msgstr "_Ustvari seznam predvajanja"
+
+#: src/search-tool-qt/search-tool-qt.cc:503 src/search-tool/search-tool.cc:343
+msgid "_Add to Playlist"
+msgstr "_Dodaj na seznam predvajanja"
+
+#: src/sid/xmms-sid.cc:43
+msgid "SID Player"
+msgstr "Predvajalnik SID"
+
+#: src/sid/xs_config.cc:62
+msgid "Channels:"
+msgstr "Št. kanalov:"
+
+#: src/sid/xs_config.cc:68
+msgid "Emulation"
+msgstr "Emulacija"
+
+#: src/sid/xs_config.cc:69
+msgid "Emulate MOS 8580 (default: MOS 6581)"
+msgstr "Emuliraj MOS 8580 (privzeto: MOS 6581)"
+
+#: src/sid/xs_config.cc:71
+msgid "Do not automatically select chip model"
+msgstr "Modela integriranega vezja ne izberi samodejno"
+
+#: src/sid/xs_config.cc:73
+msgid "Emulate filter"
+msgstr "Emuliraj filter"
+
+#: src/sid/xs_config.cc:75
+msgid "Clock speed:"
+msgstr "Hitrost ure:"
+
+#: src/sid/xs_config.cc:78
+msgid "Do not automatically select clock speed"
+msgstr "Hitrosti ure ne izberi samodejno"
+
+#: src/sid/xs_config.cc:80
+msgid "Playback time"
+msgstr "Čas predvajanja"
+
+#: src/sid/xs_config.cc:81
+msgid "Set maximum playback time:"
+msgstr "Nastavi najdaljši čas predvajanja:"
+
+#: src/sid/xs_config.cc:87
+msgid "Use only when song length is unknown"
+msgstr "Uporabi le, ko je dolžina skladbe neznana"
+
+#: src/sid/xs_config.cc:90
+msgid "Set minimum playback time:"
+msgstr "Nastavi najkrajši čas predvajanja:"
+
+#: src/sid/xs_config.cc:96
+msgid "Subtunes"
+msgstr "Podskladbe"
+
+#: src/sid/xs_config.cc:97
+msgid "Enable subtunes"
+msgstr "Omogoči podskladbe"
+
+#: src/sid/xs_config.cc:99
+msgid "Ignore subtunes shorter than:"
+msgstr "Prezri podskladbe, krajše od:"
+
+#: src/sid/xs_config.cc:105
+msgid "Note"
+msgstr "Opomba"
+
+#: src/silence-removal/silence-removal.cc:39
+msgid "Silence Removal"
+msgstr "Odstranitev tišine"
+
+#: src/silence-removal/silence-removal.cc:58
+msgid ""
+"Silence Removal Plugin for Audacious\n"
+"Copyright 2014 John Lindgren"
+msgstr ""
+"Silence Removal Plugin for Audacious\n"
+"Copyright 2014 John Lindgren"
+
+#: src/silence-removal/silence-removal.cc:67
+msgid "Silence Removal"
+msgstr "Odstranitev tišine"
+
+#: src/silence-removal/silence-removal.cc:68
+msgid "Threshold:"
+msgstr "Nivo:"
+
+#: src/skins/actions.cc:45 src/skins-qt/actions.cc:43
+msgid "Repeat points cleared."
+msgstr "Točki ponavljanja izbrisani."
+
+#: src/skins/actions.cc:60 src/skins-qt/actions.cc:58
+msgid "Repeat point A set."
+msgstr "Točka ponavljanja A nastavljena."
+
+#: src/skins/actions.cc:65 src/skins-qt/actions.cc:63
+msgid "Repeat point B set."
+msgstr "Točka ponavljanja B nastavljena."
+
+#: src/skins/equalizer.cc:223 src/skins-qt/equalizer.cc:223
+msgid "Preamp"
+msgstr "Predojačevalnik"
+
+#: src/skins/equalizer.cc:227 src/skins-qt/equalizer.cc:227
+msgid "31 Hz"
+msgstr "31 Hz"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "63 Hz"
+msgstr "63 Hz"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "125 Hz"
+msgstr "125 Hz"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "250 Hz"
+msgstr "250 Hz"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "500 Hz"
+msgstr "500 Hz"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "1 kHz"
+msgstr "1 kHz"
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "2 kHz"
+msgstr "2 kHz"
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "4 kHz"
+msgstr "4 kHz"
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "8 kHz"
+msgstr "8 kHz"
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "16 kHz"
+msgstr "16 kHz"
+
+#: src/skins/equalizer.cc:270 src/skins-qt/equalizer.cc:270
+msgid "Audacious Equalizer"
+msgstr "Izenačevalnik Audacious"
+
+#: src/skins/main.cc:459 src/skins-qt/main.cc:442
+msgid "Recording on"
+msgstr "Snemanje vklopljeno"
+
+#: src/skins/main.cc:461 src/skins-qt/main.cc:444
+msgid "Recording off"
+msgstr "Snemanje izklopljeno"
+
+#: src/skins/main.cc:754 src/skins-qt/main.cc:701
+#, c-format
+msgid "Seek to %d:%-2.2d / %d:%-2.2d"
+msgstr "Skoči na %d:%-2.2d / %d:%-2.2d"
+
+#: src/skins/main.cc:771 src/skins-qt/main.cc:718
+#, c-format
+msgid "Volume: %d%%"
+msgstr "Glasnost: %d%%"
+
+#: src/skins/main.cc:784 src/skins-qt/main.cc:731
+#, c-format
+msgid "Balance: %d%% left"
+msgstr "Ravnovesje: %d%% levo"
+
+#: src/skins/main.cc:786 src/skins-qt/main.cc:733
+msgid "Balance: center"
+msgstr "Ravnovesje: sredina"
+
+#: src/skins/main.cc:788 src/skins-qt/main.cc:735
+#, c-format
+msgid "Balance: %d%% right"
+msgstr "Ravnovesje: %d%% desno"
+
+#: src/skins/main.cc:880 src/skins-qt/main.cc:827
+msgid "Options Menu"
+msgstr "Nastavitve"
+
+#: src/skins/main.cc:884 src/skins-qt/main.cc:831
+msgid "Disable 'Always On Top'"
+msgstr "Onemogoči 'Vselej na vrhu'"
+
+#: src/skins/main.cc:886 src/skins-qt/main.cc:833
+msgid "Enable 'Always On Top'"
+msgstr "Omogoči 'Vselej na vrhu'"
+
+#: src/skins/main.cc:889 src/skins-qt/main.cc:836
+msgid "File Info Box"
+msgstr "Okno z datotečnimi podatki"
+
+#: src/skins/main.cc:892 src/skins/menus.cc:149 src/skins-qt/main.cc:839
+#: src/skins-qt/menus.cc:142
+msgid "Double Size"
+msgstr "Dvojna velikost"
+
+#: src/skins/main.cc:895 src/skins-qt/main.cc:842
+msgid "Visualizations"
+msgstr "Vizualizacije"
+
+#: src/skins/menus.cc:74 src/skins-qt/menus.cc:64
+msgid "Volume Up"
+msgstr "Zvišaj glasnost"
+
+#: src/skins/menus.cc:75 src/skins-qt/menus.cc:65
+msgid "Volume Down"
+msgstr "Znižaj glasnost"
+
+#: src/skins/menus.cc:77 src/skins-qt/menus.cc:67
+msgid "Effects ..."
+msgstr "Učinki"
+
+#: src/skins/menus.cc:84 src/skins-qt/menus.cc:74
+msgid "Open Files ..."
+msgstr "Odpri datoteke"
+
+#: src/skins/menus.cc:85 src/skins-qt/menus.cc:76
+msgid "Open URL ..."
+msgstr "Odpri URL"
+
+#: src/skins/menus.cc:89 src/skins-qt/menus.cc:80
+msgid "Playlist"
+msgstr "Seznam predvajanja"
+
+#: src/skins/menus.cc:90 src/skins-qt/menus.cc:81
+msgid "Output"
+msgstr "Izhod"
+
+#: src/skins/menus.cc:91 src/skins-qt/menus.cc:82
+msgid "View"
+msgstr "Pogled"
+
+#: src/skins/menus.cc:93 src/skins/menus.cc:161 src/skins/menus.cc:174
+#: src/skins/menus.cc:245 src/skins-qt/menus.cc:84 src/skins-qt/menus.cc:156
+#: src/skins-qt/menus.cc:170 src/skins-qt/menus.cc:241
+msgid "Services"
+msgstr "Storitve"
+
+#: src/skins/menus.cc:95 src/skins-qt/menus.cc:86
+msgid "About ..."
+msgstr "O programu"
+
+#: src/skins/menus.cc:96 src/skins-qt/menus.cc:87
+msgid "Settings ..."
+msgstr "Nastavitve"
+
+#: src/skins/menus.cc:97 src/skins-qt/menus.cc:88
+msgid "Quit"
+msgstr "Izhod"
+
+#: src/skins/menus.cc:101 src/skins/menus.cc:235 src/skins-qt/menus.cc:92
+#: src/skins-qt/menus.cc:231
+msgid "Song Info ..."
+msgstr "Podatki o skladbi"
+
+#: src/skins/menus.cc:105 src/skins-qt/menus.cc:96
+msgid "Shuffle by Album"
+msgstr "Mešaj med albumi"
+
+#: src/skins/menus.cc:106 src/skins-qt/menus.cc:97
+msgid "No Playlist Advance"
+msgstr "Ne nadaljuj po seznamu predvajanja"
+
+#: src/skins/menus.cc:117 src/skins-qt/menus.cc:108
+msgid "Set A-B Repeat"
+msgstr "Nastavi ponavljanje A-B"
+
+#: src/skins/menus.cc:118 src/skins-qt/menus.cc:109
+msgid "Clear A-B Repeat"
+msgstr "Počisti ponavljanje A-B"
+
+#: src/skins/menus.cc:120 src/skins-qt/menus.cc:111
+msgid "Jump to Song ..."
+msgstr "Skoči na skladbo"
+
+#: src/skins/menus.cc:121 src/skins-qt/menus.cc:113
+msgid "Jump to Time ..."
+msgstr "Skoči na čas"
+
+#: src/skins/menus.cc:125 src/skins-qt/menus.cc:118
+msgid "Play/Resume"
+msgstr "Predvajaj/nadaljuj"
+
+#: src/skins/menus.cc:127 src/skins-qt/menus.cc:120
+msgid "New Playlist"
+msgstr "Nov seznam predvajanja"
+
+#: src/skins/menus.cc:128 src/skins-qt/menus.cc:121
+msgid "Rename Playlist ..."
+msgstr "Preimenuj seznam predvajanja"
+
+#: src/skins/menus.cc:129 src/skins-qt/menus.cc:122
+msgid "Remove Playlist"
+msgstr "Odstrani seznam predvajanja"
+
+#: src/skins/menus.cc:131 src/skins-qt/menus.cc:124
+msgid "Previous Playlist"
+msgstr "Prejšnji seznam predvajanja"
+
+#: src/skins/menus.cc:132 src/skins-qt/menus.cc:125
+msgid "Next Playlist"
+msgstr "Naslednji seznam predvajanja"
+
+#: src/skins/menus.cc:134 src/skins-qt/menus.cc:127
+msgid "Import Playlist ..."
+msgstr "Uvozi seznam predvajanja"
+
+#: src/skins/menus.cc:135 src/skins-qt/menus.cc:128
+msgid "Export Playlist ..."
+msgstr "Izvozi seznam predvajanja"
+
+#: src/skins/menus.cc:137 src/skins-qt/menus.cc:130
+msgid "Playlist Manager ..."
+msgstr "Upravljalnik seznamov predvajanj"
+
+#: src/skins/menus.cc:138 src/skins-qt/menus.cc:131
+msgid "Queue Manager ..."
+msgstr "Upravljalnik vrste"
+
+#: src/skins/menus.cc:140 src/skins-qt/menus.cc:133
+msgid "Refresh Playlist"
+msgstr "Osveži seznam predvajanja"
+
+#: src/skins/menus.cc:144 src/skins-qt/menus.cc:137
+msgid "Show Playlist Editor"
+msgstr "Prikaži urejevalnik seznamov predvajanj"
+
+#: src/skins/menus.cc:145 src/skins-qt/menus.cc:138
+msgid "Show Equalizer"
+msgstr "Prikaži izenačevalnik"
+
+#: src/skins/menus.cc:147 src/skins-qt/menus.cc:140
+msgid "Show Remaining Time"
+msgstr "Prikaži preostali čas"
+
+#: src/skins/menus.cc:150 src/skins-qt/menus.cc:143
+msgid "Always on Top"
+msgstr "Vselej na vrhu"
+
+#: src/skins/menus.cc:151 src/skins-qt/menus.cc:145
+msgid "On All Workspaces"
+msgstr "Na vseh delovnih površinah"
+
+#: src/skins/menus.cc:153 src/skins-qt/menus.cc:148
+msgid "Roll Up Player"
+msgstr "Privzdigni predvajalnik"
+
+#: src/skins/menus.cc:154 src/skins-qt/menus.cc:149
+msgid "Roll Up Playlist Editor"
+msgstr "Privzdigni urejevalnik seznamov predvajanj"
+
+#: src/skins/menus.cc:155 src/skins-qt/menus.cc:150
+msgid "Roll Up Equalizer"
+msgstr "Privzdigni izenačevalnik"
+
+#: src/skins/menus.cc:163 src/skins-qt/menus.cc:158
+msgid "Add URL ..."
+msgstr "Dodaj URL"
+
+#: src/skins/menus.cc:164 src/skins-qt/menus.cc:160
+msgid "Add Files ..."
+msgstr "Dodaj datoteke"
+
+#: src/skins/menus.cc:168 src/skins/menus.cc:196 src/skins/menus.cc:212
+#: src/skins-qt/menus.cc:164 src/skins-qt/menus.cc:192
+#: src/skins-qt/menus.cc:208
+msgid "By Title"
+msgstr "Po naslovu"
+
+#: src/skins/menus.cc:169 src/skins/menus.cc:203 src/skins/menus.cc:219
+#: src/skins-qt/menus.cc:165 src/skins-qt/menus.cc:199
+#: src/skins-qt/menus.cc:215
+msgid "By File Name"
+msgstr "Po imenu datoteke"
+
+#: src/skins/menus.cc:170 src/skins/menus.cc:204 src/skins/menus.cc:220
+#: src/skins-qt/menus.cc:166 src/skins-qt/menus.cc:200
+#: src/skins-qt/menus.cc:216
+msgid "By File Path"
+msgstr "Po poti datoteke"
+
+#: src/skins/menus.cc:176 src/skins-qt/menus.cc:172
+msgid "Remove All"
+msgstr "Odstrani vse"
+
+#: src/skins/menus.cc:177 src/skins-qt/menus.cc:173
+msgid "Clear Queue"
+msgstr "Počisti vrsto"
+
+#: src/skins/menus.cc:179 src/skins-qt/menus.cc:175
+msgid "Remove Unavailable Files"
+msgstr "Odstrani nedosegljive datoteke"
+
+#: src/skins/menus.cc:180 src/skins-qt/menus.cc:176
+msgid "Remove Duplicates"
+msgstr "Odstrani dvojnike"
+
+#: src/skins/menus.cc:182 src/skins-qt/menus.cc:178
+msgid "Remove Unselected"
+msgstr "Odstrani neizbrane"
+
+#: src/skins/menus.cc:183 src/skins-qt/menus.cc:179
+msgid "Remove Selected"
+msgstr "Odstrani izbrane"
+
+#: src/skins/menus.cc:187 src/skins-qt/menus.cc:183
+msgid "Search and Select"
+msgstr "Išči in izberi"
+
+#: src/skins/menus.cc:189 src/skins-qt/menus.cc:185
+msgid "Invert Selection"
+msgstr "Obrni izbor"
+
+#: src/skins/menus.cc:190 src/skins-qt/menus.cc:186
+msgid "Select None"
+msgstr "Izberi nič"
+
+#: src/skins/menus.cc:191 src/skins-qt/menus.cc:187
+msgid "Select All"
+msgstr "Izberi vse"
+
+#: src/skins/menus.cc:195 src/skins/menus.cc:211 src/skins-qt/menus.cc:191
+#: src/skins-qt/menus.cc:207
+msgid "By Track Number"
+msgstr "Po številki skladbe"
+
+#: src/skins/menus.cc:197 src/skins/menus.cc:213 src/skins-qt/menus.cc:193
+#: src/skins-qt/menus.cc:209
+msgid "By Artist"
+msgstr "Po izvajalcu"
+
+#: src/skins/menus.cc:198 src/skins/menus.cc:214 src/skins-qt/menus.cc:194
+#: src/skins-qt/menus.cc:210
+msgid "By Album"
+msgstr "Po albumu"
+
+#: src/skins/menus.cc:199 src/skins/menus.cc:215 src/skins-qt/menus.cc:195
+#: src/skins-qt/menus.cc:211
+msgid "By Album Artist"
+msgstr "Po izvajalcu albuma"
+
+#: src/skins/menus.cc:200 src/skins/menus.cc:216 src/skins-qt/menus.cc:196
+#: src/skins-qt/menus.cc:212
+msgid "By Release Date"
+msgstr "Po datumu izdaje"
+
+#: src/skins/menus.cc:201 src/skins/menus.cc:217 src/skins-qt/menus.cc:197
+#: src/skins-qt/menus.cc:213
+msgid "By Genre"
+msgstr "Po žanru"
+
+#: src/skins/menus.cc:202 src/skins/menus.cc:218 src/skins-qt/menus.cc:198
+#: src/skins-qt/menus.cc:214
+msgid "By Length"
+msgstr "Po dolžini"
+
+#: src/skins/menus.cc:205 src/skins/menus.cc:221 src/skins-qt/menus.cc:201
+#: src/skins-qt/menus.cc:217
+msgid "By Custom Title"
+msgstr "Po naslovu po meri"
+
+#: src/skins/menus.cc:206 src/skins/menus.cc:222 src/skins-qt/menus.cc:202
+#: src/skins-qt/menus.cc:218
+msgid "By Comment"
+msgstr "Po komentarju"
+
+#: src/skins/menus.cc:207 src/skins/menus.cc:223 src/skins-qt/menus.cc:203
+#: src/skins-qt/menus.cc:219
+msgid "By Disc Number"
+msgstr "Po številki diska"
+
+#: src/skins/menus.cc:227 src/skins-qt/menus.cc:223
+msgid "Randomize List"
+msgstr "Razvrsti seznam naključno"
+
+#: src/skins/menus.cc:228 src/skins-qt/menus.cc:224
+msgid "Reverse List"
+msgstr "Razvrsti seznam vzvratno "
+
+#: src/skins/menus.cc:230 src/skins-qt/menus.cc:226
+msgid "Sort Selected"
+msgstr "Razvrsti izbrane"
+
+#: src/skins/menus.cc:231 src/skins-qt/menus.cc:227
+msgid "Sort List"
+msgstr "Razvrsti seznam"
+
+#: src/skins/menus.cc:236 src/skins-qt/menus.cc:232
+msgid "Open Containing Folder"
+msgstr "Odpri vsebujočo mapo"
+
+#: src/skins/menus.cc:238 src/skins-qt/menus.cc:234
+msgid "Cut"
+msgstr "Izreži"
+
+#: src/skins/menus.cc:239 src/skins-qt/menus.cc:235
+msgid "Copy"
+msgstr "Kopiraj"
+
+#: src/skins/menus.cc:240 src/skins-qt/menus.cc:236
+msgid "Paste"
+msgstr "Prilepi"
+
+#: src/skins/menus.cc:241 src/skins-qt/menus.cc:237
+msgid "Paste at End"
+msgstr "Prilepi na konec"
+
+#: src/skins/menus.cc:243 src/skins-qt/menus.cc:239
+msgid "Queue/Unqueue"
+msgstr "Dodaj/odstrani iz vrste"
+
+#: src/skins/playlist-widget.cc:58 src/skins-qt/playlist-widget.cc:58
+#, c-format
+msgid "%s (%d of %d)"
+msgstr "%s (%d od %d)"
+
+#: src/skins/playlistwin.cc:491 src/skins-qt/playlistwin.cc:478
+msgid "Audacious Playlist Editor"
+msgstr "Urejevalnik seznamov predvajanj Audacious"
+
+#: src/skins/plugin.cc:53 src/skins-qt/plugin.cc:65
+msgid "Winamp Classic Interface"
+msgstr "Vmesnik Winamp Classic"
+
+#: src/skins-qt/menus.cc:75
+msgid "Open Folder ..."
+msgstr "Odpri mapo"
+
+#: src/skins-qt/menus.cc:159
+msgid "Add Folder ..."
+msgstr "Dodaj mapo"
+
+#: src/skins-qt/search-select.cc:62 src/skins/search-select.cc:77
+msgid "Search entries in active playlist"
+msgstr "Išči v dejavnem seznamu predvajanja"
+
+#: src/skins-qt/search-select.cc:70 src/skins/search-select.cc:83
+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 ""
+"Iščite po seznamu predvajanja z izpolnjevanjem enega ali več polj. Uporablja "
+"se regex, neodvisen od velikosti črk. Če sintakse regex ne poznate, "
+"dobesedno vpišite termine za iskanje."
+
+#: src/skins-qt/search-select.cc:75 src/skins/search-select.cc:91
+msgid "Title:"
+msgstr "Naslov:"
+
+#: src/skins-qt/search-select.cc:79 src/skins/search-select.cc:96
+msgid "Album:"
+msgstr "Album:"
+
+#: src/skins-qt/search-select.cc:82 src/skins/search-select.cc:101
+msgid "Artist:"
+msgstr "Izvajalec:"
+
+#: src/skins-qt/search-select.cc:85 src/skins/search-select.cc:106
+msgid "File Name:"
+msgstr "Ime datoteke:"
+
+#: src/skins-qt/search-select.cc:88 src/skins/search-select.cc:134
+msgid "Clear previous selection before searching"
+msgstr "Počisti prejšnji izbor pred iskanjem"
+
+#: src/skins-qt/search-select.cc:89 src/skins/search-select.cc:137
+msgid "Automatically toggle queue for matching entries"
+msgstr "Samodejno prikaži vrsto za ujemajoče zadetke"
+
+#: src/skins-qt/search-select.cc:90 src/skins/search-select.cc:140
+msgid "Create a new playlist with matching entries"
+msgstr "Ustvari nov seznam predvajanja z ujemajočimi zadetki"
+
+#: src/skins-qt/search-select.cc:101 src/skins/search-select.cc:78
+msgid "Search"
+msgstr "Išči"
+
+#: src/skins-qt/skins_cfg.cc:198 src/skins/skins_cfg.cc:182
+msgid "Player:"
+msgstr "Predvajalnik:"
+
+#: src/skins-qt/skins_cfg.cc:200 src/skins/skins_cfg.cc:184
+msgid "Select main player window font:"
+msgstr "Izberite pisavo glavnega okna predvajalnika:"
+
+#: src/skins-qt/skins_cfg.cc:201 src/skins/skins_cfg.cc:185
+msgid "Playlist:"
+msgstr "Seznam predvajanja:"
+
+#: src/skins-qt/skins_cfg.cc:203 src/skins/skins_cfg.cc:187
+msgid "Select playlist font:"
+msgstr "Izberite pisavo seznama predvajanja:"
+
+#: src/skins-qt/skins_cfg.cc:207 src/skins/skins_cfg.cc:191
+msgid "Skin"
+msgstr "Preobleka"
+
+#: src/skins-qt/skins_cfg.cc:211 src/skins/skins_cfg.cc:193
+msgid "Display active titlebar when any window is focused"
+msgstr "Prikaži aktivno naslovno pasico, ko je neko okno v fokusu."
+
+#: src/skins-qt/skins_cfg.cc:213 src/skins/skins_cfg.cc:195
+msgid "Fonts"
+msgstr "Pisave"
+
+#: src/skins-qt/skins_cfg.cc:215 src/skins/skins_cfg.cc:197
+msgid "Use bitmap fonts (supports ASCII only)"
+msgstr "Uporabi bitne pisave (podpirajo le znake ASCII, brez šumnikov)"
+
+#: src/skins-qt/skins_cfg.cc:217 src/skins/skins_cfg.cc:199
+msgid "Scroll song title"
+msgstr "Drseč naslov skladbe"
+
+#: src/skins-qt/skins_cfg.cc:219 src/skins/skins_cfg.cc:201
+msgid "Scroll song title in both directions"
+msgstr "Drseč naslov skladbe v obeh smereh"
+
+#: src/skins-qt/skins_cfg.cc:224 src/skins/skins_cfg.cc:206
+msgid "Analyzer"
+msgstr "Analizator"
+
+#: src/skins-qt/skins_cfg.cc:225 src/skins/skins_cfg.cc:207
+msgid "Scope"
+msgstr "Osciloskop"
+
+#: src/skins-qt/skins_cfg.cc:226 src/skins/skins_cfg.cc:208
+msgid "Voiceprint / VU meter"
+msgstr "Spektrogram / VU-meter"
+
+#: src/skins-qt/skins_cfg.cc:227 src/skins/skins_cfg.cc:209
+msgid "Off"
+msgstr "Izklop"
+
+#: src/skins-qt/skins_cfg.cc:231 src/skins-qt/skins_cfg.cc:256
+#: src/skins-qt/skins_cfg.cc:262 src/skins/skins_cfg.cc:213
+#: src/skins/skins_cfg.cc:238 src/skins/skins_cfg.cc:244
+msgid "Normal"
+msgstr "Običajno"
+
+#: src/skins-qt/skins_cfg.cc:232 src/skins-qt/skins_cfg.cc:257
+#: src/skins/skins_cfg.cc:214 src/skins/skins_cfg.cc:239
+msgid "Fire"
+msgstr "Ogenj"
+
+#: src/skins-qt/skins_cfg.cc:233 src/skins/skins_cfg.cc:215
+msgid "Vertical lines"
+msgstr "Navpične črte"
+
+#: src/skins-qt/skins_cfg.cc:237 src/skins/skins_cfg.cc:219
+msgid "Lines"
+msgstr "Črte"
+
+#: src/skins-qt/skins_cfg.cc:238 src/skins/skins_cfg.cc:220
+msgid "Bars"
+msgstr "Vrstice"
+
+#: src/skins-qt/skins_cfg.cc:242 src/skins/skins_cfg.cc:224
+msgid "Slowest"
+msgstr "Najpočasneje"
+
+#: src/skins-qt/skins_cfg.cc:243 src/skins/skins_cfg.cc:225
+msgid "Slow"
+msgstr "Počasi"
+
+#: src/skins-qt/skins_cfg.cc:244 src/skins/skins_cfg.cc:226
+#: src/soxr/sox-resampler.cc:180
+msgid "Medium"
+msgstr "Srednje"
+
+#: src/skins-qt/skins_cfg.cc:245 src/skins/skins_cfg.cc:227
+msgid "Fast"
+msgstr "Hitro"
+
+#: src/skins-qt/skins_cfg.cc:246 src/skins/skins_cfg.cc:228
+msgid "Fastest"
+msgstr "Najhitreje"
+
+#: src/skins-qt/skins_cfg.cc:250 src/skins/skins_cfg.cc:232
+msgid "Dots"
+msgstr "Pike"
+
+#: src/skins-qt/skins_cfg.cc:251 src/skins/skins_cfg.cc:233
+msgid "Line"
+msgstr "Črta"
+
+#: src/skins-qt/skins_cfg.cc:252 src/skins/skins_cfg.cc:234
+msgid "Solid"
+msgstr "Trdno"
+
+#: src/skins-qt/skins_cfg.cc:258 src/skins/skins_cfg.cc:240
+msgid "Ice"
+msgstr "Led"
+
+#: src/skins-qt/skins_cfg.cc:263 src/skins/skins_cfg.cc:245
+msgid "Smooth"
+msgstr "Gladko"
+
+#: src/skins-qt/skins_cfg.cc:267 src/skins/skins_cfg.cc:249
+msgid "Coloring:"
+msgstr "Barvanje:"
+
+#: src/skins-qt/skins_cfg.cc:270 src/skins/skins_cfg.cc:252
+msgid "Style:"
+msgstr "Slog:"
+
+#: src/skins-qt/skins_cfg.cc:273 src/skins/skins_cfg.cc:255
+msgid "Falloff:"
+msgstr "Padec:"
+
+#: src/skins-qt/skins_cfg.cc:276 src/skins/skins_cfg.cc:258
+msgid "Peak falloff:"
+msgstr "Vrh padca:"
+
+#: src/skins-qt/skins_cfg.cc:282 src/skins/skins_cfg.cc:264
+msgid "Scope Style:"
+msgstr "Slog osciloskopa:"
+
+#: src/skins-qt/skins_cfg.cc:285 src/skins/skins_cfg.cc:267
+msgid "Voiceprint Coloring:"
+msgstr "Barve spektrograma:"
+
+#: src/skins-qt/skins_cfg.cc:288 src/skins/skins_cfg.cc:270
+msgid "VU Meter Style:"
+msgstr "Slog VU-metra:"
+
+#: src/skins-qt/skins_cfg.cc:294 src/skins/skins_cfg.cc:276
+msgid "Type"
+msgstr "Vrsta"
+
+#: src/skins-qt/skins_cfg.cc:295 src/skins/skins_cfg.cc:277
+msgid "Visualization type:"
+msgstr "Vrsta vizualizacije:"
+
+#: src/skins-qt/skins_cfg.cc:298 src/skins/skins_cfg.cc:280
+msgid "Analyzer"
+msgstr "Analizator"
+
+#: src/skins-qt/skins_cfg.cc:299 src/skins/skins_cfg.cc:281
+msgid "Show peaks"
+msgstr "Prikaži vrhe"
+
+#: src/skins-qt/skins_cfg.cc:308 src/skins/skins_cfg.cc:290
+msgid "Visualization"
+msgstr "Vizualizacija"
+
+#: src/skins-qt/skinselector.cc:98 src/skins/skinselector.cc:111
+msgid "Archived Winamp 2.x skin"
+msgstr "Arhivirane Winamp 2.x preobleke"
+
+#: src/skins-qt/skinselector.cc:102 src/skins/skinselector.cc:115
+msgid "Unarchived Winamp 2.x skin"
+msgstr "Nearhivirane Winamp 2.x preobleke"
+
+#: src/sndfile/plugin.cc:38
+msgid "Sndfile Plugin"
+msgstr "Vtičnik Sndfile"
+
+#: src/sndfile/plugin.cc:372
+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:\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."
+
+#: src/sndio/sndio.cc:43
+msgid "Sndio Output"
+msgstr "Sndio"
+
+#: src/sndio/sndio.cc:98
+msgid "Device (blank for default):"
+msgstr "Naprava (pustite prazno za privzeto):"
+
+#: src/sndio/sndio.cc:100
+msgid "Save and restore volume:"
+msgstr "Shrani in povrni glasnost:"
+
+#: src/sndio/sndio.cc:181
+#, c-format
+msgid "Sndio error: Unsupported audio format (%d)"
+msgstr "Napaka Sndio: nepodprta datotečna vrsta (%d)"
+
+#: src/sndio/sndio.cc:192
+msgid "Sndio error: sio_open() failed"
+msgstr "Napaka Sndio: sio_open() spodletel"
+
+#: src/sndio/sndio.cc:221
+msgid "Sndio error: sio_setpar() failed"
+msgstr "Napaka Sndio: sio_setpar() spodletel"
+
+#: src/sndio/sndio.cc:233
+msgid "Sndio error: sio_start() failed"
+msgstr "Napaka Sndio: sio_start() spodletel"
+
+#: src/songchange/song_change.cc:30
+msgid "Song Change"
+msgstr "Dejanja ob spremembi skladbe"
+
+#: src/songchange/song_change.cc:256
+msgid "Commands"
+msgstr "Ukazi"
+
+#: src/songchange/song_change.cc:258
+msgid "Command to run when starting a new song:"
+msgstr "Ukaz, ki se izvede ob začetku nove skladbe:"
+
+#: src/songchange/song_change.cc:261
+msgid "Command to run when stopping a song:"
+msgstr "Ukaz, ki se izvede po zaustavitvi predvajanja skladbe:"
+
+#: src/songchange/song_change.cc:264
+msgid "Command to run at the end of a song:"
+msgstr "Ukaz, ki se izvede ob koncu nove skladbe:"
+
+#: src/songchange/song_change.cc:267
+msgid "Command to run at the end of the playlist:"
+msgstr "Ukaz, ki se izvede ob koncu seznama predvajanja:"
+
+#: src/songchange/song_change.cc:270
+msgid "Command to run when song title changes (for network streams):"
+msgstr "Ukaz, ki se izvede ob zamenjavi naslova skladbe (omrežni pretok):"
+
+#: src/songchange/song_change.cc:273
+msgid ""
+"You can use the following format codes, which will be replaced before "
+"running the command.\n"
+"Not all are useful though for the song-stopped or end-of-playlist command."
+msgstr ""
+
+#: src/songchange/song_change.cc:276
+msgid ""
+"%a: Artist\n"
+"%b: Album\n"
+"%c: Number of channels\n"
+"%f: File name (full path)\n"
+"%F: Frequency (Hertz)\n"
+"%l: Length (milliseconds)\n"
+"%n or %s: Formatted title (see playlist settings)\n"
+"%p: Currently playing (1 or 0)\n"
+"%r: Rate (bits per second)\n"
+"%t: Playlist position\n"
+"%T: Title (unformatted)"
+msgstr ""
+"%a: Izvajalec\n"
+"%b: Album\n"
+"%c: Število kanalov\n"
+"%f: Datotečno ime (cela pot)\n"
+"%F: Frekvenca (Hz)\n"
+"%l: Dolžina (ms)\n"
+"%n ali %s: Preoblikovan naslov (glej nastavitve seznamov predvajanj)\n"
+"%p: Se trenutno predvaja (1 ali 0)\n"
+"%r: Hitrost (bps)\n"
+"%t: Mesto na seznamu predvajanja\n"
+"%T: Naslov (nepreoblikovan)"
+
+#: src/songchange/song_change.cc:287
+msgid ""
+"Parameters passed to the shell should be enclosed in quotation marks.\n"
+"Unquoted parameters may lead to unexpected results."
+msgstr ""
+
+#: src/song-info-qt/song-info.cc:30
+msgid "Song Info"
+msgstr "Podatki o skladbi"
+
+#: src/soxr/sox-resampler.cc:44
+msgid "SoX Resampler"
+msgstr "SoX Resampler"
+
+#: src/soxr/sox-resampler.cc:172
+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/soxr/sox-resampler.cc:178
+msgid "Quick"
+msgstr "hitra"
+
+#: src/soxr/sox-resampler.cc:179
+msgid "Low"
+msgstr "nizka"
+
+#: src/soxr/sox-resampler.cc:181
+msgid "High"
+msgstr "visoka"
+
+#: src/soxr/sox-resampler.cc:182
+msgid "Very High"
+msgstr "zelo visoka"
+
+#: src/soxr/sox-resampler.cc:183
+msgid "Ultra High"
+msgstr "izjemno visoka"
+
+#: src/soxr/sox-resampler.cc:187
+msgid "Minimum"
+msgstr "najmanjša"
+
+#: src/soxr/sox-resampler.cc:188
+msgid "Intermediate"
+msgstr "srednja"
+
+#: src/soxr/sox-resampler.cc:193
+msgid "Quality:"
+msgstr "Kakovost:"
+
+#: src/soxr/sox-resampler.cc:196
+msgid "Phase:"
+msgstr "Faza:"
+
+#: src/soxr/sox-resampler.cc:200
+msgid "Allow aliasing"
+msgstr "Dovoli glajenje"
+
+#: src/soxr/sox-resampler.cc:202
+msgid "Use steep filter"
+msgstr "Uporabi strm filter"
+
+#: src/speedpitch/speed-pitch.cc:54
+msgid "Speed and Pitch"
+msgstr "Hitrost in višina tona"
+
+#: src/speedpitch/speed-pitch.cc:247
+msgid "Speed"
+msgstr "Hitrost"
+
+#: src/speedpitch/speed-pitch.cc:248
+msgid "Decouple from pitch"
+msgstr "Razdruži od višine tona"
+
+#: src/speedpitch/speed-pitch.cc:250 src/speedpitch/speed-pitch.cc:258
+msgid "Multiplier:"
+msgstr "Faktor:"
+
+#: src/speedpitch/speed-pitch.cc:254
+msgid "Pitch"
+msgstr "Višina tona"
+
+#: src/statusicon-qt/statusicon.cc:45 src/statusicon/statusicon.cc:47
+msgid "Status Icon"
+msgstr "Ikona v orodni vrstici"
+
+#: src/statusicon-qt/statusicon.cc:68
+msgid ""
+"Status Icon Plugin (partial port for Qt interface)\n"
+"\n"
+"Copyright 2005-2007 Giacomo Lozito <james@develia.org>\n"
+"Copyright 2010 Michał Lipski <tallica@o2.pl>\n"
+"Copyright 2015 Eugene Paskevich <eugene@raptor.kiev.ua>\n"
+"\n"
+"This plugin provides a status icon, placed in\n"
+"the system tray area of the window manager."
+msgstr ""
+"Status Icon Plugin (partial port for Qt interface)\n"
+"\n"
+"Copyright 2005-2007 Giacomo Lozito <james@develia.org>\n"
+"Copyright 2010 Michał Lipski <tallica@o2.pl>\n"
+"Copyright 2015 Eugene Paskevich <eugene@raptor.kiev.ua>\n"
+"\n"
+"This plugin provides a status icon, placed in\n"
+"the system tray area of the window manager."
+
+#: src/statusicon-qt/statusicon.cc:89 src/statusicon/statusicon.cc:384
+msgid "Mouse Scroll Action"
+msgstr "Dejanja ob vrtenju miškinega kolesca"
+
+#: src/statusicon-qt/statusicon.cc:90 src/statusicon/statusicon.cc:385
+msgid "Change volume"
+msgstr "Spremeni glasnost"
+
+#: src/statusicon-qt/statusicon.cc:93 src/statusicon/statusicon.cc:388
+msgid "Change playing song"
+msgstr "Spremeni trenutno skladbo"
+
+#: src/statusicon-qt/statusicon.cc:96 src/statusicon/statusicon.cc:391
+msgid "Other Settings"
+msgstr "Ostale nastavitve"
+
+#: src/statusicon-qt/statusicon.cc:97 src/statusicon/statusicon.cc:392
+msgid "Disable the popup window"
+msgstr "Onemogoči pojavno okno"
+
+#: src/statusicon-qt/statusicon.cc:99 src/statusicon/statusicon.cc:394
+msgid "Close to the system tray"
+msgstr "Zapri v sistemsko vrstico"
+
+#: src/statusicon-qt/statusicon.cc:101 src/statusicon/statusicon.cc:396
+msgid "Advance in playlist when scrolling upward"
+msgstr "Napreduj po seznamu predvajanja ob drsenju navzgor"
+
+#: src/statusicon-qt/statusicon.cc:116 src/statusicon/statusicon.cc:287
+msgid "Se_ttings ..."
+msgstr "Nas_tavitve"
+
+#: src/statusicon/statusicon.cc:377
+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 ""
+"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."
+
+#: src/stereo_plugin/stereo.cc:19
+msgid "Extra Stereo"
+msgstr "Extra Stereo"
+
+#: src/stereo_plugin/stereo.cc:36
+msgid ""
+"Extra Stereo Plugin\n"
+"\n"
+"By Johan Levin, 1999"
+msgstr ""
+"Extra Stereo Plugin\n"
+"\n"
+"By Johan Levin, 1999"
+
+#: src/stereo_plugin/stereo.cc:44
+msgid "Extra Stereo"
+msgstr "Extra Stereo"
+
+#: src/streamtuner/icecast-model.cc:126 src/streamtuner/shoutcast-model.cc:131
+msgid "Type"
+msgstr "Vrsta"
+
+#: src/streamtuner/icecast-model.cc:132
+msgid "Current Song"
+msgstr "Trenutna skladba"
+
+#: src/streamtuner/icecast-model.cc:164
+msgid "Other"
+msgstr "Drugo"
+
+#: src/streamtuner/ihr-model.cc:63
+msgid "Market"
+msgstr "Trg"
+
+#: src/streamtuner/ihr-model.cc:156
+msgid "Call Letters"
+msgstr "Klicni znak"
+
+#: src/streamtuner/ihr-model.cc:162
+msgid "Description"
+msgstr "Opis"
+
+#: src/streamtuner/shoutcast-model.cc:128
+msgid "Listeners"
+msgstr "Poslušalci"
+
+#: src/streamtuner/shoutcast-model.cc:188
+msgid "Top 500 Stations"
+msgstr "Vrhnjih 500 postaj"
+
+#: src/streamtuner/shoutcast-model.cc:189
+msgid "Alternative"
+msgstr "Alternative"
+
+#: src/streamtuner/shoutcast-model.cc:190
+msgid "Blues"
+msgstr "Blues"
+
+#: src/streamtuner/shoutcast-model.cc:191
+msgid "Classical"
+msgstr "Classical"
+
+#: src/streamtuner/shoutcast-model.cc:192
+msgid "Country"
+msgstr "Country"
+
+#: src/streamtuner/shoutcast-model.cc:193
+msgid "Decades"
+msgstr "Decades"
+
+#: src/streamtuner/shoutcast-model.cc:194
+msgid "Easy Listening"
+msgstr "Easy Listening"
+
+#: src/streamtuner/shoutcast-model.cc:195
+msgid "Electronic"
+msgstr "Electronic"
+
+#: src/streamtuner/shoutcast-model.cc:196
+msgid "Folk"
+msgstr "Folk"
+
+#: src/streamtuner/shoutcast-model.cc:197
+msgid "Inspirational"
+msgstr "Inspirational"
+
+#: src/streamtuner/shoutcast-model.cc:198
+msgid "International"
+msgstr "International"
+
+#: src/streamtuner/shoutcast-model.cc:199
+msgid "Jazz"
+msgstr "Jazz"
+
+#: src/streamtuner/shoutcast-model.cc:200
+msgid "Latin"
+msgstr "Latin"
+
+#: src/streamtuner/shoutcast-model.cc:201
+msgid "Metal"
+msgstr "Metal"
+
+#: src/streamtuner/shoutcast-model.cc:203
+msgid "New Age"
+msgstr "New Age"
+
+#: src/streamtuner/shoutcast-model.cc:204
+msgid "Pop"
+msgstr "Pop"
+
+#: src/streamtuner/shoutcast-model.cc:205
+msgid "Public Radio"
+msgstr "Public Radio"
+
+#: src/streamtuner/shoutcast-model.cc:206
+msgid "R&B and Urban"
+msgstr "R&B and Urban"
+
+#: src/streamtuner/shoutcast-model.cc:207
+msgid "Rap"
+msgstr "Rap"
+
+#: src/streamtuner/shoutcast-model.cc:208
+msgid "Reggae"
+msgstr "Reggae"
+
+#: src/streamtuner/shoutcast-model.cc:209
+msgid "Rock"
+msgstr "Rock"
+
+#: src/streamtuner/shoutcast-model.cc:210
+msgid "Seasonal and Holiday"
+msgstr "Seasonal and Holiday"
+
+#: src/streamtuner/shoutcast-model.cc:211
+msgid "Soundtracks"
+msgstr "Soundtracks"
+
+#: src/streamtuner/shoutcast-model.cc:212
+msgid "Talk"
+msgstr "Talk"
+
+#: src/streamtuner/shoutcast-model.cc:213
+msgid "Themes"
+msgstr "Themes"
+
+#: src/streamtuner/streamtuner.cc:59
+msgid "Shoutcast"
+msgstr "Shoutcast"
+
+#: src/streamtuner/streamtuner.cc:60
+msgid "Icecast"
+msgstr "Icecast"
+
+#: src/streamtuner/streamtuner.cc:71
+msgid "Stream Tuner"
+msgstr "Stream Tuner"
+
+#: src/tonegen/tonegen.cc:45
+msgid "Tone Generator"
+msgstr "Generator tonov"
+
+#: src/tonegen/tonegen.cc:92
+#, c-format
+msgid "%s %.1f Hz"
+msgstr "%s %.1f Hz"
+
+#: src/tonegen/tonegen.cc:92
+msgid "Tone Generator: "
+msgstr "Generator tonov:"
+
+#: src/tonegen/tonegen.cc:161
+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>\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"
+
+#: src/ui-common/dialogs-qt.cc:40
+msgid ""
+"\n"
+"(Further messages have been hidden.)"
+msgstr ""
+"\n"
+"(nadaljnja sporočila so bila skrita)"
+
+#: src/ui-common/dialogs-qt.cc:52
+msgid "Working ..."
+msgstr "Nalagam..."
+
+#: src/ui-common/dialogs-qt.cc:73
+msgid "Information"
+msgstr "Podatki"
+
+#: src/ui-common/menu-ops-gtk.cc:132 src/ui-common/menu-ops-qt.cc:113
+#, c-format
+msgid "%s does not appear to be a valid folder."
+msgstr "%s ni zaznan kot mapa"
+
+#: src/voice_removal/voice_removal.cc:28
+msgid "Voice Removal"
+msgstr "Odstranitev glasu"
+
+#: src/vorbis/vorbis.cc:433
+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 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.h:18
+msgid "Ogg Vorbis Decoder"
+msgstr "Dekodirnik Ogg Vorbis"
+
+#: src/vtx/info.cc:24
+#, c-format
+msgid "Details about %s"
+msgstr "Podrobnosti o %s"
+
+#: src/vtx/info.cc:26
+msgid ""
+"Title: %t\n"
+"Author: %a\n"
+"From: %f\n"
+"Tracker: %T\n"
+"Comment: %C\n"
+"Chip type: %c\n"
+"Stereo: %s\n"
+"Loop: %l\n"
+"Chip freq: %F\n"
+"Player Freq: %P\n"
+"Year: %y"
+msgstr ""
+"Naslov: %t\n"
+"Avtor: %a\n"
+"Od: %f\n"
+"Sledilnik: %T\n"
+"Komentar: %C\n"
+"Vrsta integriranega vezja: %c\n"
+"Stereo: %s\n"
+"Zanka: %l\n"
+"Frekvenca int. vezja: %F\n"
+"Frekvenca predvajalnika: %P\n"
+"Leto: %y"
+
+#: src/vtx/vtx.cc:38
+msgid "VTX Decoder"
+msgstr "Dekodirnik VTX"
+
+#: src/vtx/vtx.cc:178
+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/vumeter-qt/vumeter_qt.cc:31
+msgid ""
+"VU Meter Plugin for Audacious\n"
+"Copyright 2017-2019 Marc Sánchez Fauste"
+msgstr ""
+"VU Meter Plugin for Audacious\n"
+"Copyright 2017-2019 Marc Sánchez Fauste"
+
+#: src/vumeter-qt/vumeter_qt.cc:35
+msgid "VU Meter Settings"
+msgstr "Nastavitve VU-metra"
+
+#: src/vumeter-qt/vumeter_qt.cc:37
+msgid "Peak hold time:"
+msgstr "Čas zadržanja vrha:"
+
+#: src/vumeter-qt/vumeter_qt.cc:42
+msgid "Fall-off time:"
+msgstr "Čas padca:"
+
+#: src/vumeter-qt/vumeter_qt.cc:44
+msgid "dB/second"
+msgstr "dB/sekundo"
+
+#: src/vumeter-qt/vumeter_qt.cc:46
+msgid "Display legend"
+msgstr "Prikaži skalo"
+
+#: src/vumeter-qt/vumeter_qt.h:37
+msgid "VU Meter"
+msgstr "VU-meter"
+
+#: src/waveout/waveout.cc:43
+msgid "Win32 waveOut"
+msgstr "Win32 waveOut"
+
+#: src/waveout/waveout.cc:69
+msgid ""
+"Win32 waveOut Plugin for Audacious\n"
+"Copyright 2016 John Lindgren"
+msgstr ""
+"Win32 waveOut Plugin for Audacious\n"
+"Copyright 2016 John Lindgren"
+
+#: src/wavpack/wavpack.cc:25
+msgid "WavPack Decoder"
+msgstr "Dekodirnik WavPack"
+
+#: src/wavpack/wavpack.cc:217
+msgid "lossy (hybrid)"
+msgstr "izgubno (hibrid)"
+
+#: src/wavpack/wavpack.cc:219
+msgid "lossy"
+msgstr "izgubno"
+
+#: src/wavpack/wavpack.cc:259
+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/xsf/plugin.cc:74
+msgid "2SF Decoder"
+msgstr "Dekodirnik 2SF"
+
+#: src/xsf/plugin.cc:429
+msgid "32728 Hz"
+msgstr "32728 Hz"
+
+#: src/xsf/plugin.cc:432
+msgid "65456 Hz"
+msgstr "65456 Hz"
+
+#: src/xsf/plugin.cc:438
+msgid "Cosine"
+msgstr "kosinus"
+
+#: src/xsf/plugin.cc:439
+msgid "Sharp"
+msgstr "Ostro"
+
+#: src/xsf/plugin.cc:443
+msgid "XSF Configuration"
+msgstr "Nastavitve XSF"
+
+#: src/xsf/plugin.cc:445
+msgid "Default fade time:"
+msgstr "Privzeti čas preliva:"
+
+#: src/xsf/plugin.cc:447
+msgid "Interpolation mode:"
+msgstr "Način prepletanja:"
+
+#: src/xspf/xspf.cc:95
+msgid "XML Shareable Playlists (XSPF)"
+msgstr "Deljivi seznami predvajanja XML (XSPF)"

audacious-plugins-4.4.1.tar.bz2/po/sq.po Added

@@ -0,0 +1,4571 @@
+# Albanian translation for Audacious Plugins
+# Copyright (C) Audacious translators
+# This file is distributed under the same license as the Audacious Plugins package.
+#
+# Translators:
+# natird zoto <dritan86@gmail.com>, 2012
+# Milot Shala <milot.shala@gmail.com>, 2013
+# natird zoto <dritan86@gmail.com>, 2012
+msgid ""
+msgstr ""
+"Project-Id-Version: Audacious Plugins\n"
+"Report-Msgid-Bugs-To: https://github.com/audacious-media-player/audacious/"
+"issues\n"
+"POT-Creation-Date: 2024-09-26 21:54+0200\n"
+"PO-Revision-Date: 2011-10-10 17:43+0000\n"
+"Last-Translator: Milot Shala <milot.shala@gmail.com>, 2013\n"
+"Language-Team: Albanian (http://app.transifex.com/audacious/audacious/"
+"language/sq/)\n"
+"Language: sq\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/aac.cc:19
+msgid "AAC (Raw) Decoder"
+msgstr "Shkodues AAC (E papërpunuar)"
+
+#: src/adplug/adplug-xmms.cc:70
+msgid "AdPlug (AdLib Player)"
+msgstr ""
+
+#: src/adplug/adplug-xmms.cc:167 src/modplug/modplugbmp.cc:321
+#: src/psf/plugin.cc:161 src/vtx/vtx.cc:89 src/xsf/plugin.cc:204
+msgid "sequenced"
+msgstr ""
+
+#: src/adplug/adplug-xmms.cc:349 src/sid/xs_config.cc:61
+msgid "Output"
+msgstr ""
+
+#: src/adplug/adplug-xmms.cc:350
+msgid "OPL Emulator:"
+msgstr "Emulues OPL:"
+
+#: src/adplug/adplug-xmms.cc:353 src/amidiplug/i_configure.cc:153
+#: src/console/plugin.cc:45 src/filewriter/filewriter.cc:481
+#: src/sid/xs_config.cc:65 src/xsf/plugin.cc:446
+msgid "Sample rate:"
+msgstr ""
+
+#: src/adplug/adplug-xmms.cc:354 src/amidiplug/i_configure.cc:155
+#: src/bs2b/plugin.cc:141 src/console/plugin.cc:47
+#: src/modplug/plugin_main.cc:77 src/resample/resample.cc:201
+#: src/resample/resample.cc:207 src/resample/resample.cc:211
+#: src/resample/resample.cc:215 src/resample/resample.cc:219
+#: src/resample/resample.cc:223 src/resample/resample.cc:227
+#: src/resample/resample.cc:231 src/resample/resample.cc:235
+#: src/resample/resample.cc:239 src/resample/resample.cc:243
+#: src/sid/xs_config.cc:67 src/soxr/sox-resampler.cc:205
+msgid "Hz"
+msgstr "Hz"
+
+#: src/adplug/adplug-xmms.cc:355 src/gtkui/settings.cc:55
+#: src/modplug/plugin_main.cc:105 src/qtui/settings.cc:85
+#: src/skins-qt/skins_cfg.cc:302 src/skins/skins_cfg.cc:284
+msgid "Miscellaneous"
+msgstr "Të ndryshme"
+
+#: src/adplug/adplug-xmms.cc:356
+msgid "Repeat song in endless loop"
+msgstr ""
+
+#: src/albumart/albumart.cc:31 src/albumart-qt/albumart.cc:35
+msgid "Album Art"
+msgstr "Figurë Albumi"
+
+#: src/alsa/alsa.h:64
+msgid "ALSA Output"
+msgstr "Output ALSA"
+
+#: src/alsa/config.cc:28
+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/config.cc:61
+msgid "(no description)"
+msgstr "(pa përshkrim)"
+
+#: src/alsa/config.cc:166
+msgid "Default PCM device"
+msgstr "Pajisje PCM Parazgjedhje"
+
+#: src/alsa/config.cc:188
+msgid "Default mixer device"
+msgstr "Pajisje përzierëse parazgjedhje"
+
+#: src/alsa/config.cc:296
+msgid "PCM device:"
+msgstr "Pajisje PCM:"
+
+#: src/alsa/config.cc:299
+msgid "Mixer device:"
+msgstr "Pajisje përzierëse:"
+
+#: src/alsa/config.cc:302
+msgid "Mixer element:"
+msgstr "Element përzierësi:"
+
+#: src/amidiplug/amidi-plug.cc:42
+msgid "AMIDI-Plug (MIDI Player)"
+msgstr "AMIDI-Plug (Lojtës MIDI-sh)"
+
+#: src/amidiplug/amidi-plug.cc:445
+msgid ""
+"AMIDI-Plug\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/amidiplug/i_configure.cc:94
+msgid "Override default gain:"
+msgstr ""
+
+#: src/amidiplug/i_configure.cc:102
+msgid "Override default polyphony:"
+msgstr "Anashkalo polifoni parazgjedhje"
+
+#: src/amidiplug/i_configure.cc:110
+msgid "Override default reverb:"
+msgstr "Anashkalo reverb parazgjedhje"
+
+#: src/amidiplug/i_configure.cc:112 src/amidiplug/i_configure.cc:120
+msgid "On"
+msgstr ""
+
+#: src/amidiplug/i_configure.cc:118
+msgid "Override default chorus:"
+msgstr "Anashkalo kor parazgjedhje"
+
+#: src/amidiplug/i_configure.cc:128 src/console/plugin.cc:29
+msgid "Playback"
+msgstr ""
+
+#: src/amidiplug/i_configure.cc:129
+msgid "Transpose:"
+msgstr "Ndërkëmbeje:"
+
+#: src/amidiplug/i_configure.cc:131 src/speedpitch/speed-pitch.cc:257
+msgid "semitones"
+msgstr ""
+
+#: src/amidiplug/i_configure.cc:132
+msgid "Drum shift:"
+msgstr ""
+
+#: src/amidiplug/i_configure.cc:134
+msgid "note numbers"
+msgstr ""
+
+#: src/amidiplug/i_configure.cc:135
+msgid "Skip leading silence"
+msgstr ""
+
+#: src/amidiplug/i_configure.cc:137
+msgid "Skip trailing silence"
+msgstr ""
+
+#: src/amidiplug/i_configure.cc:141
+msgid "SoundFont"
+msgstr "SoundFont"
+
+#: src/amidiplug/i_configure.cc:148
+msgid "Synthesizer"
+msgstr "Syntetizator"
+
+#: src/amidiplug/i_configure-fluidsynth.cc:58
+#: src/amidiplug/i_configure-fluidsynth.cc:527
+msgid "AMIDI-Plug - select SoundFont file"
+msgstr "AMIDI-Plug - përzgjidhni kartelë SoundFont"
+
+#: src/amidiplug/i_configure-fluidsynth.cc:61
+msgid "_Cancel"
+msgstr "_Anuloje"
+
+#: src/amidiplug/i_configure-fluidsynth.cc:62
+msgid "_Open"
+msgstr "_Hape"
+
+#: src/amidiplug/i_configure-fluidsynth.cc:233
+#: src/amidiplug/i_configure-fluidsynth.cc:461
+msgid "File name"
+msgstr "Emër kartele"
+
+#: src/amidiplug/i_configure-fluidsynth.cc:237
+#: src/amidiplug/i_configure-fluidsynth.cc:464
+msgid "Size (bytes)"
+msgstr "Madhësi (bajte)"
+
+#: src/amidiplug/i_fileinfo.cc:184
+msgid "Name:"
+msgstr "Emër:"
+
+#: src/amidiplug/i_fileinfo.cc:202
+msgid " MIDI Info "
+msgstr " Të dhëna MIDI "
+
+#: src/amidiplug/i_fileinfo.cc:216
+msgid "Format:"
+msgstr "Format:"
+
+#: src/amidiplug/i_fileinfo.cc:219
+msgid "Length (msec):"
+msgstr "Gjatësi (ms):"
+
+#: src/amidiplug/i_fileinfo.cc:222
+msgid "No. of Tracks:"
+msgstr "Nr. Pjesësh:"
+
+#: src/amidiplug/i_fileinfo.cc:228
+msgid "variable"
+msgstr "i luhatshëm"
+
+#: src/amidiplug/i_fileinfo.cc:230
+msgid "BPM:"
+msgstr "BPM:"
+
+#: src/amidiplug/i_fileinfo.cc:238
+msgid "BPM (wavg):"
+msgstr "BPM (wavg):"
+
+#: src/amidiplug/i_fileinfo.cc:241
+msgid "Time Div:"
+msgstr "Koha Div:"
+
+#: src/amidiplug/i_fileinfo.cc:252
+msgid " MIDI Comments and Lyrics "
+msgstr " MIDI Comments and Lyrics "
+
+#: src/amidiplug/i_fileinfo.cc:299
+msgid "* no comments available in this MIDI file *"
+msgstr "* s’ka komentet në këtë kartelë MIDI *"
+
+#: src/amidiplug/i_fileinfo.cc:311
+msgid "* no lyrics available in this MIDI file *"
+msgstr "* s’ka vargje në këtë kartelë MIDI *"
+
+#: src/amidiplug/i_fileinfo.cc:321 src/ladspa/plugin.cc:418
+#: src/ui-common/dialogs-qt.cc:32
+msgid "_Close"
+msgstr "_Mbylle"
+
+#: src/amidiplug/i_fileinfo.cc:346
+msgid " (invalid UTF-8)"
+msgstr " (UTF-8 e pavlefshme)"
+
+#: src/ampache/ampache.cc:33
+msgid "Ampache Browser"
+msgstr "Shfletues Ampache"
+
+#: src/ampache/ampache.cc:46
+msgid ""
+"Ampache Browser for Audacious\n"
+"http://ampache-browser.org/\n"
+"\n"
+"Copyright (C) Róbert Čerňanský and John Lindgren\n"
+"License: GNU GPLv3"
+msgstr ""
+
+#: src/aosd/aosd.cc:31
+msgid ""
+"Audacious OSD\n"
+"http://www.develia.org/projects.php?p=audacious#aosd\n"
+"\n"
+"Written by Giacomo Lozito <james@develia.org>\n"
+"\n"
+"Based in part on Evan Martin's Ghosd library:\n"
+"http://neugierig.org/software/ghosd/"
+msgstr ""
+
+#: src/aosd/aosd.h:37
+msgid "AOSD (On-Screen Display)"
+msgstr ""
+
+#: src/aosd/aosd_style.cc:54
+msgid "Rectangle"
+msgstr "Drejtkëndësh"
+
+#: src/aosd/aosd_style.cc:59
+msgid "Rounded Rectangle"
+msgstr "Drejtkëndësh i Rrumbullakosur"
+
+#: src/aosd/aosd_style.cc:64
+msgid "Concave Rectangle"
+msgstr "Drejtkëndësh i Lugët"
+
+#: src/aosd/aosd_style.cc:69 src/openmpt/mptwrap.h:50 src/xsf/plugin.cc:436
+msgid "None"
+msgstr "Asnjë"
+
+#: src/aosd/aosd_trigger.cc:49
+msgid "Playback Start"
+msgstr "Fillo Playback"
+
+#: src/aosd/aosd_trigger.cc:50
+msgid "Triggers OSD when a playlist entry is played."
+msgstr "Shfaq OSD kur një element lëshohet nga lista."
+
+#: src/aosd/aosd_trigger.cc:55
+msgid "Title Change"
+msgstr "Ndryshim Titulli"
+
+#: src/aosd/aosd_trigger.cc:56
+msgid "Triggers OSD when the song title changes (for internet streams)."
+msgstr ""
+
+#: src/aosd/aosd_trigger.cc:61
+msgid "Pause On"
+msgstr "Pusho"
+
+#: src/aosd/aosd_trigger.cc:62
+msgid "Triggers OSD when playback is paused."
+msgstr ""
+
+#: src/aosd/aosd_trigger.cc:67
+msgid "Pause Off"
+msgstr "Vazhdo"
+
+#: src/aosd/aosd_trigger.cc:68
+msgid "Triggers OSD when playback is unpaused."
+msgstr ""
+
+#: src/aosd/aosd_ui.cc:204
+msgid "Placement"
+msgstr "Vendosje"
+
+#: src/aosd/aosd_ui.cc:241
+msgid "Relative X offset:"
+msgstr "Shmangie X relative:"
+
+#: src/aosd/aosd_ui.cc:245
+msgid "Relative Y offset:"
+msgstr "Shmangie Y relative:"
+
+#: src/aosd/aosd_ui.cc:249
+msgid "Max OSD width:"
+msgstr "Gjerësi maksimum OSD-je:"
+
+#: src/aosd/aosd_ui.cc:281
+msgid "Multi-Monitor options"
+msgstr "Mundësi Për Multi-Monitor"
+
+#: src/aosd/aosd_ui.cc:285
+msgid "Display OSD using:"
+msgstr ""
+
+#: src/aosd/aosd_ui.cc:287
+msgid "all monitors"
+msgstr "krejt monitorët"
+
+#: src/aosd/aosd_ui.cc:290
+#, c-format
+msgid "monitor %i"
+msgstr "monitori %i"
+
+#: src/aosd/aosd_ui.cc:342
+msgid "Timing (ms)"
+msgstr ""
+
+#: src/aosd/aosd_ui.cc:347
+msgid "Display:"
+msgstr "Shfaq:"
+
+#: src/aosd/aosd_ui.cc:352
+msgid "Fade in:"
+msgstr ""
+
+#: src/aosd/aosd_ui.cc:357
+msgid "Fade out:"
+msgstr ""
+
+#: src/aosd/aosd_ui.cc:442
+msgid "Fonts"
+msgstr "Shkronja"
+
+#: src/aosd/aosd_ui.cc:449
+#, c-format
+msgid "Font %i:"
+msgstr "Shkronja %i:"
+
+#: src/aosd/aosd_ui.cc:466
+msgid "Shadow"
+msgstr "Hije"
+
+#: src/aosd/aosd_ui.cc:589
+msgid "Render Style"
+msgstr "Stil Vizatimi"
+
+#: src/aosd/aosd_ui.cc:605
+msgid "Colors"
+msgstr "Ngjyra"
+
+#: src/aosd/aosd_ui.cc:616
+#, c-format
+msgid "Color %i:"
+msgstr "Ngjyrë %i:"
+
+#: src/aosd/aosd_ui.cc:714
+msgid "Enable trigger"
+msgstr ""
+
+#: src/aosd/aosd_ui.cc:741
+msgid "Event"
+msgstr "Akt"
+
+#: src/aosd/aosd_ui.cc:768
+msgid "Composite manager detected"
+msgstr ""
+
+#: src/aosd/aosd_ui.cc:775
+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.cc:783
+msgid "Composite manager not required for fake transparency"
+msgstr ""
+
+#: src/aosd/aosd_ui.cc:820
+msgid "Transparency"
+msgstr "Tejdukshmëri"
+
+#: src/aosd/aosd_ui.cc:826
+msgid "Fake transparency"
+msgstr "Tejdukshmëri e rreme"
+
+#: src/aosd/aosd_ui.cc:828
+msgid "Real transparency (requires X Composite Ext.)"
+msgstr ""
+
+#: src/aosd/aosd_ui.cc:875
+msgid "Composite extension not loaded"
+msgstr ""
+
+#: src/aosd/aosd_ui.cc:892
+#, c-format
+msgid "Audacious OSD"
+msgstr ""
+
+#: src/aosd/aosd_ui.cc:955
+msgid "Position"
+msgstr "Pozicion"
+
+#: src/aosd/aosd_ui.cc:960
+msgid "Animation"
+msgstr "Animacion"
+
+#: src/aosd/aosd_ui.cc:965
+msgid "Text"
+msgstr "Tekst"
+
+#: src/aosd/aosd_ui.cc:970
+msgid "Decoration"
+msgstr "Zbukurim"
+
+#: src/aosd/aosd_ui.cc:975
+msgid "Trigger"
+msgstr ""
+
+#: src/aosd/aosd_ui.cc:980 src/streamtuner/shoutcast-model.cc:202
+msgid "Misc"
+msgstr "Të ndryshme"
+
+#: src/aosd/aosd_ui.cc:989
+msgid "Test"
+msgstr "Provë"
+
+#: src/asx3/asx3.cc:35
+msgid "ASXv3 Playlists"
+msgstr "Luajlista ASXv3"
+
+#: src/asx/asx.cc:33
+msgid "ASXv1/ASXv2 Playlists"
+msgstr "Luajlista ASXv1/ASXv2"
+
+#: src/audpl/audpl.cc:33
+msgid "Audacious Playlists (audpl)"
+msgstr "Luajlista Audacious (audpl)"
+
+#: src/background_music/background_music.cc:24
+msgid "Background music"
+msgstr ""
+
+#: src/background_music/background_music.cc:25
+msgid "Target level:"
+msgstr ""
+
+#: src/background_music/background_music.cc:28
+#: src/background_music/background_music.cc:33
+#: src/silence-removal/silence-removal.cc:70
+msgid "dB"
+msgstr "dB"
+
+#: src/background_music/background_music.cc:29
+msgid "Maximum amplification:"
+msgstr ""
+
+#: src/background_music/background_music.cc:34 src/mpg123/mpg123.cc:81
+msgid "Advanced"
+msgstr "Të mëtejshme"
+
+#: src/background_music/background_music.cc:36
+msgid "Slow detection weight:"
+msgstr ""
+
+#: src/background_music/background_music.cc:39
+msgid "Hint"
+msgstr ""
+
+#: src/background_music/background_music.cc:41
+msgid ""
+"Slow detection weight is the relative weight\n"
+"of a long term average detection when compared\n"
+"to the actual, faster loudness detection.\n"
+"A value of zero gives a more radio-like sound\n"
+"where soft passages get \"pulled up\" more quickly,\n"
+"a value of two makes the sound feel less compressed."
+msgstr ""
+
+#: src/background_music/background_music.cc:52
+msgid ""
+"Background Music Plugin for Audacious\n"
+"Copyright 2023;2024 Michel Fleur\n"
+"\n"
+"Controls the volume to make the sound equally loud within and between "
+"tracks.\n"
+" It uses accurate loudness measurement and tries to make the volume changes "
+"sound natural without audible peaks, yet without lowering the volume before "
+"a peak in advance."
+msgstr ""
+
+#: src/background_music/background_music.cc:61
+msgid "Background Music"
+msgstr ""
+
+#: src/bitcrusher/bitcrusher.cc:33
+msgid "Bitcrusher"
+msgstr ""
+
+#: src/bitcrusher/bitcrusher.cc:34
+msgid "Bit Depth:"
+msgstr ""
+
+#: src/bitcrusher/bitcrusher.cc:37
+msgid "Downsample ratio:"
+msgstr ""
+
+#: src/bitcrusher/bitcrusher.cc:48
+msgid "Bitcrusher"
+msgstr ""
+
+#: src/blur_scope/blur_scope.cc:40 src/blur_scope-qt/blur_scope.cc:45
+msgid "Color"
+msgstr "Ngjyrë"
+
+#: src/blur_scope/blur_scope.cc:56 src/blur_scope-qt/blur_scope.cc:158
+msgid "Blur Scope"
+msgstr ""
+
+#: src/bs2b/plugin.cc:38
+msgid "Bauer Stereophonic-to-Binaural (BS2B)"
+msgstr ""
+
+#: src/bs2b/plugin.cc:129
+msgid "Presets:"
+msgstr "Paracaktime:"
+
+#: src/bs2b/plugin.cc:130
+msgid "Default"
+msgstr "Parazgjedhje"
+
+#: src/bs2b/plugin.cc:136
+msgid "Feed level:"
+msgstr ""
+
+#: src/bs2b/plugin.cc:138
+msgid "x1/10 dB"
+msgstr "x1/10 dB"
+
+#: src/bs2b/plugin.cc:139
+msgid "Cut frequency:"
+msgstr ""
+
+#: src/cairo-spectrum/cairo-spectrum.cc:42 src/qt-spectrum/qt-spectrum.cc:107
+msgid "Spectrum Analyzer"
+msgstr "Analizues Spektri"
+
+#: src/cdaudio/cdaudio-ng.cc:74
+msgid "Audio CD Plugin"
+msgstr "Shtojcë CD Audio"
+
+#: src/cdaudio/cdaudio-ng.cc:121
+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 ""
+"Të drejta kopjimi (C) 2007-2012 Calin Crisan <ccrisan@gmail.com> dhe të "
+"tjerë.\n"
+"\n"
+"Shumë falënderime zhvilluesve të libcdio-s <http://www.gnu.org/software/"
+"libcdio/>\n"
+"dhe zhvilluesve të libcddb-sës <http://libcddb.sourceforge.net/>.\n"
+"\n"
+"Falënderime gjithashtu për Tony Vroon për drejtimin dhe udhëheqjen time.\n"
+"\n"
+"Ky qe një projekt Google Summer of Code 2007."
+
+#: src/cdaudio/cdaudio-ng.cc:140
+msgid "Device"
+msgstr "Pajisje"
+
+#: src/cdaudio/cdaudio-ng.cc:141
+msgid "Read speed:"
+msgstr "Shpejtësi leximi:"
+
+#: src/cdaudio/cdaudio-ng.cc:144
+msgid "Override device:"
+msgstr "Anashkalo pajisje:"
+
+#: src/cdaudio/cdaudio-ng.cc:146
+msgid "Metadata"
+msgstr "Tejtëdhëna"
+
+#: src/cdaudio/cdaudio-ng.cc:147
+msgid "Use CD-Text"
+msgstr "Përdor CD-Text"
+
+#: src/cdaudio/cdaudio-ng.cc:150
+msgid "Use CDDB"
+msgstr "Përdor CDDB"
+
+#: src/cdaudio/cdaudio-ng.cc:152
+msgid "Use HTTP instead of CDDBP"
+msgstr "Përdor HTTP, në vend se CDDBP"
+
+#: src/cdaudio/cdaudio-ng.cc:155
+msgid "Server:"
+msgstr "Shërbyes:"
+
+#: src/cdaudio/cdaudio-ng.cc:159
+msgid "Path:"
+msgstr "Shteg:"
+
+#: src/cdaudio/cdaudio-ng.cc:163
+msgid "Port:"
+msgstr "Portë:"
+
+#: src/cdaudio/cdaudio-ng.cc:228
+msgid "Failed to initialize cdio subsystem."
+msgstr ""
+
+#: src/cdaudio/cdaudio-ng.cc:260
+#, c-format
+msgid "Invalid URI %s."
+msgstr "URI %s e pavlefshme."
+
+#: src/cdaudio/cdaudio-ng.cc:262
+#, c-format
+msgid "Track %d not found."
+msgstr "Pjesa %d s’u gjet."
+
+#: src/cdaudio/cdaudio-ng.cc:264
+#, c-format
+msgid "Track %d is a data track."
+msgstr "Pjesa %d është pjesë të dhënash."
+
+#: src/cdaudio/cdaudio-ng.cc:339
+msgid "Error reading audio CD."
+msgstr "Gabim gjatë leximit të CD-së audio."
+
+#: src/cdaudio/cdaudio-ng.cc:410
+msgid "Audio CD"
+msgstr "CD Audio"
+
+#: src/cdaudio/cdaudio-ng.cc:446 src/cdaudio/cdaudio-ng.cc:455
+#, c-format
+msgid "Failed to open CD device %s."
+msgstr "S’u arrit të hapet pajisje CD %s."
+
+#: src/cdaudio/cdaudio-ng.cc:458
+msgid "No audio capable CD drive found."
+msgstr ""
+
+#: src/cdaudio/cdaudio-ng.cc:481
+msgid "Drive is empty."
+msgstr "Pajisja është e zbrazët."
+
+#: src/cdaudio/cdaudio-ng.cc:483
+msgid "Unsupported disk type."
+msgstr "Lloj i pambuluar disku."
+
+#: src/cdaudio/cdaudio-ng.cc:507
+msgid "Failed to finish initializing opened CD drive."
+msgstr ""
+
+#: src/cdaudio/cdaudio-ng.cc:520
+msgid "Failed to retrieve first/last track number."
+msgstr ""
+
+#: src/cdaudio/cdaudio-ng.cc:541
+#, c-format
+msgid "Cannot read start/end LSN for track %d."
+msgstr ""
+
+#: src/cdaudio/cdaudio-ng.cc:624
+msgid "Failed to create the CDDB connection."
+msgstr "S’u arrit të krijohet lidhja CDDB."
+
+#: src/cdaudio/cdaudio-ng.cc:690
+msgid "Failed to query the CDDB server"
+msgstr "S’u arrit të kërkohej te shërbyesi CDDB"
+
+#: src/cdaudio/cdaudio-ng.cc:692
+#, c-format
+msgid "Failed to query the CDDB server: %s"
+msgstr "S’u arrit të kërkohej te shërbyesi CDDB: %s"
+
+#: src/cdaudio/cdaudio-ng.cc:716
+#, c-format
+msgid "Failed to read the CDDB info: %s"
+msgstr "S’u arrit të lexohen të dhëna CDDB: %s"
+
+#: src/cd-menu-items/cd-menu-items.cc:33
+msgid "Audio CD Menu Items"
+msgstr ""
+
+#: src/cd-menu-items/cd-menu-items.cc:45
+msgid "Pla_y CD"
+msgstr ""
+
+#: src/cd-menu-items/cd-menu-items.cc:45
+msgid "_Add CD"
+msgstr ""
+
+#: src/compressor/compressor.cc:45
+msgid "Compression"
+msgstr "Ngjeshje"
+
+#: src/compressor/compressor.cc:46
+msgid "Center volume:"
+msgstr ""
+
+#: src/compressor/compressor.cc:49
+msgid "Dynamic range:"
+msgstr "Gamë dinamike:"
+
+#: src/compressor/compressor.cc:57
+msgid ""
+"Dynamic Range Compression Plugin for Audacious\n"
+"Copyright 2010-2014 John Lindgren"
+msgstr ""
+
+#: src/compressor/compressor.cc:64
+msgid "Dynamic Range Compressor"
+msgstr "Ngjeshës Game Dinamike"
+
+#: src/console/plugin.cc:15
+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/console/plugin.cc:30
+msgid "Bass:"
+msgstr "Bas:"
+
+#: src/console/plugin.cc:33
+msgid "Treble:"
+msgstr "Treble:"
+
+#: src/console/plugin.cc:36
+msgid "Echo:"
+msgstr "Eko:"
+
+#: src/console/plugin.cc:39
+msgid "Default song length:"
+msgstr "Gjatësi parazgjedhje kënge:"
+
+#: src/console/plugin.cc:41 src/crossfade/crossfade.cc:56
+#: src/crossfade/crossfade.cc:62 src/lirc/lirc.cc:395 src/notify/notify.cc:113
+#: src/sid/xs_config.cc:85 src/sid/xs_config.cc:94 src/sid/xs_config.cc:103
+#: src/vumeter-qt/vumeter_qt.cc:39
+msgid "seconds"
+msgstr "sekonda"
+
+#: src/console/plugin.cc:42 src/modplug/plugin_main.cc:58
+msgid "Resampling"
+msgstr ""
+
+#: src/console/plugin.cc:43
+msgid "Enable audio resampling"
+msgstr ""
+
+#: src/console/plugin.cc:49
+msgid "SPC"
+msgstr "SPC"
+
+#: src/console/plugin.cc:50
+msgid "Ignore length from SPC tags"
+msgstr ""
+
+#: src/console/plugin.cc:52
+msgid "Increase reverb"
+msgstr "Shtoje reverbin"
+
+#: src/console/plugin.h:26
+msgid "Game Console Music Decoder"
+msgstr ""
+
+#: src/coreaudio/coreaudio.cc:53
+msgid "CoreAudio output"
+msgstr ""
+
+#: src/coreaudio/coreaudio.cc:155
+msgid ""
+"CoreAudio Output Plugin for Audacious\n"
+"Copyright 2014 William Pitcock\n"
+"Copyright 2017,18 René J.V. Bertin\n"
+" (original code and code adapted from\n"
+" Apple examples, (C) Apple 2013)\n"
+"\n"
+"Based on SDL Output Plugin for Audacious\n"
+"Copyright 2010 John Lindgren"
+msgstr ""
+
+#: src/coreaudio/coreaudio.cc:171
+msgid "Use exclusive mode"
+msgstr ""
+
+#: src/coreaudio/coreaudio.cc:173
+msgid "Use bit perfect audio (adapt device sampling rate)"
+msgstr ""
+
+#: src/crossfade/crossfade.cc:47
+msgid ""
+"Crossfade Plugin for Audacious\n"
+"Copyright 2010-2014 John Lindgren"
+msgstr ""
+"Shtojcë Ndërzbehjeje për Audacious\n"
+"Të drejta kopjimi 2010-2014 John Lindgren"
+
+#: src/crossfade/crossfade.cc:51
+msgid "Crossfade"
+msgstr "Ndërzbehje"
+
+#: src/crossfade/crossfade.cc:52
+msgid "On automatic song change"
+msgstr ""
+
+#: src/crossfade/crossfade.cc:54 src/crossfade/crossfade.cc:60
+msgid "Overlap:"
+msgstr ""
+
+#: src/crossfade/crossfade.cc:58
+msgid "On seek or manual song change"
+msgstr ""
+
+#: src/crossfade/crossfade.cc:64
+msgid "No fade in"
+msgstr ""
+
+#: src/crossfade/crossfade.cc:66
+msgid "Use S-curve fade"
+msgstr ""
+
+#: src/crossfade/crossfade.cc:68
+msgid "S-curve steepness:"
+msgstr ""
+
+#: src/crossfade/crossfade.cc:70
+msgid "(higher is steeper)"
+msgstr ""
+
+#: src/crossfade/crossfade.cc:72
+msgid "Tip"
+msgstr ""
+
+#: src/crossfade/crossfade.cc:73
+msgid ""
+"For better crossfading, enable\n"
+"the Silence Removal effect."
+msgstr ""
+
+#: src/crossfade/crossfade.cc:83
+msgid "Crossfade"
+msgstr ""
+
+#: src/crystalizer/crystalizer.cc:31
+msgid "Crystalizer"
+msgstr ""
+
+#: src/crystalizer/crystalizer.cc:32 src/stereo_plugin/stereo.cc:45
+msgid "Intensity:"
+msgstr "Intensitet:"
+
+#: src/crystalizer/crystalizer.cc:43
+msgid "Crystalizer"
+msgstr ""
+
+#: src/cue/cue.cc:42
+msgid "Cue Sheet Plugin"
+msgstr ""
+
+#: src/delete-files/delete-files.cc:53 src/delete-files/delete-files.cc:215
+#: src/delete-files/delete-files.cc:230
+msgid "Delete Files"
+msgstr "Fshini Kartela"
+
+#: src/delete-files/delete-files.cc:120
+msgid "No files are selected."
+msgstr "S’janë përzgjedhur kartela."
+
+#: src/delete-files/delete-files.cc:125
+#, c-format
+msgid "Do you want to move %s to the trash?"
+msgstr "Doni të shpihet %s te hedhurinat?"
+
+#: src/delete-files/delete-files.cc:126
+#, c-format
+msgid "Do you want to permanently delete %s?"
+msgstr "Doni të fshihet përgjithmonë %s?"
+
+#: src/delete-files/delete-files.cc:133
+#, c-format
+msgid "Do you want to move %d files to the trash?"
+msgstr ""
+
+#: src/delete-files/delete-files.cc:134
+#, c-format
+msgid "Do you want to permanently delete %d files?"
+msgstr "Doni të fshihen përgjithmonë %d kartela?"
+
+#: src/delete-files/delete-files.cc:146
+msgid "Move to trash"
+msgstr "Shpjere te hedhurinat"
+
+#: src/delete-files/delete-files.cc:146
+msgid "Delete"
+msgstr "Fshije"
+
+#: src/delete-files/delete-files.cc:213 src/delete-files/delete-files.cc:235
+#: src/skins-qt/search-select.cc:102 src/skins/search-select.cc:78
+msgid "Cancel"
+msgstr "Anuloje"
+
+#: src/delete-files/delete-files.cc:267
+msgid "Delete Selected Files"
+msgstr "Fshiji Kartelat e Përzgjedhura"
+
+#: src/delete-files/delete-files.cc:287
+msgid "Delete Method"
+msgstr "Metodë Fshirjeje"
+
+#: src/delete-files/delete-files.cc:288
+msgid "Move to trash instead of deleting immediately"
+msgstr ""
+
+#: src/echo_plugin/echo.cc:9
+msgid ""
+"Echo Plugin\n"
+"By Johan Levin, 1999\n"
+"Surround echo by Carl van Schaik, 1999\n"
+"Updated for Audacious by William Pitcock and John Lindgren, 2010-2014"
+msgstr ""
+
+#: src/echo_plugin/echo.cc:21
+msgid "Echo"
+msgstr "Eko"
+
+#: src/echo_plugin/echo.cc:22 src/modplug/plugin_main.cc:72
+#: src/modplug/plugin_main.cc:82
+msgid "Delay:"
+msgstr "Vonesë:"
+
+#: src/echo_plugin/echo.cc:24 src/modplug/plugin_main.cc:72
+#: src/modplug/plugin_main.cc:82 src/xsf/plugin.cc:445
+msgid "ms"
+msgstr "ms"
+
+#: src/echo_plugin/echo.cc:25
+msgid "Feedback:"
+msgstr "Përshtypje:"
+
+#: src/echo_plugin/echo.cc:28 src/modplug/plugin_main.cc:86
+msgid "Volume:"
+msgstr "Volum:"
+
+#: src/echo_plugin/echo.cc:39
+msgid "Echo"
+msgstr "Eko"
+
+#: src/ffaudio/ffaudio-core.cc:50
+msgid "FFmpeg Plugin"
+msgstr "Shtojcë FFmpeg"
+
+#: src/ffaudio/ffaudio-core.cc:649
+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/filewriter/filewriter.cc:48
+msgid "FileWriter Plugin"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:316
+#, c-format
+msgid ""
+"Error opening %s:\n"
+"%s"
+msgstr ""
+"Gabim gjatë hapjes së %s:\n"
+"%s"
+
+#: src/filewriter/filewriter.cc:358
+msgid ""
+"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 ""
+"Ky program është software i lirë; mund ta rishpërndani dhe/ose ndryshoni atë "
+"sipas kushteve të Licencës së Përgjithshme Publike GNU, ashtu si botohet nga "
+"Free Software Foundation; versioni 2 i kësaj Licence, ose (sipas dëshirës "
+"suaj) çfarëdo version i mëvonshëm.\n"
+"\n"
+"Ky program shpërndahet me shpresën se do të jetë i dobishëm, por PA ASNJË "
+"GARANCI; madje pa as edhe garancinë e nënkuptuar të TREGTUESHMËRISË ose "
+"PËRSHTATSHMËRISË PËR NJË QËLLIM TË VEÇANTË. Për më tepër hollësi, shihni "
+"licencën GNU General Public License.\n"
+"\n"
+"Do të duhej të kishit marrë një kopje të licencës GNU General Public License "
+"tok me këtë program; nëse jo, shkruajini Free Software Foundation, Inc., 59 "
+"Temple Place, Suite 330, Boston, MA 02111-1307 USA."
+
+#: src/filewriter/filewriter.cc:385
+msgid "Output file format:"
+msgstr "Format kartele output-i."
+
+#: src/filewriter/filewriter.cc:389
+msgid "Save into original directory"
+msgstr "Ruaje te drejtoria origjinale"
+
+#: src/filewriter/filewriter.cc:392
+msgid "Save into custom directory:"
+msgstr "Ruajeni në drejtori vetjake"
+
+#: src/filewriter/filewriter.cc:400
+msgid "Generate file name from:"
+msgstr "Prodho emër kartele prej:"
+
+#: src/filewriter/filewriter.cc:401
+msgid "Original file name"
+msgstr "Emër i kartela origjinale"
+
+#: src/filewriter/filewriter.cc:404
+msgid "Original file name (no suffix)"
+msgstr "Emër i kartela origjinale (pa prapashtesë)"
+
+#: src/filewriter/filewriter.cc:407
+msgid "Original file tag"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:411
+msgid "Prepend track number to file name"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:417 src/filewriter/filewriter.cc:449
+msgid "Auto"
+msgstr "Auto"
+
+#: src/filewriter/filewriter.cc:418
+msgid "8000 Hz"
+msgstr "8000 Hz"
+
+#: src/filewriter/filewriter.cc:419
+msgid "11025 Hz"
+msgstr "11025 Hz"
+
+#: src/filewriter/filewriter.cc:420
+msgid "12000 Hz"
+msgstr "12000 Hz"
+
+#: src/filewriter/filewriter.cc:421
+msgid "16000 Hz"
+msgstr "16000 Hz"
+
+#: src/filewriter/filewriter.cc:422
+msgid "22050 Hz"
+msgstr "22050 Hz"
+
+#: src/filewriter/filewriter.cc:423
+msgid "24000 Hz"
+msgstr "24000 Hz"
+
+#: src/filewriter/filewriter.cc:424
+msgid "32000 Hz"
+msgstr "32000 Hz"
+
+#: src/filewriter/filewriter.cc:425 src/xsf/plugin.cc:430
+msgid "44100 Hz"
+msgstr "44100 Hz"
+
+#: src/filewriter/filewriter.cc:426 src/xsf/plugin.cc:431
+msgid "48000 Hz"
+msgstr "48000 Hz"
+
+#: src/filewriter/filewriter.cc:430
+msgid "8 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:431
+msgid "16 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:432
+msgid "32 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:433
+msgid "40 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:434
+msgid "48 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:435
+msgid "56 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:436
+msgid "64 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:437
+msgid "80 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:438
+msgid "96 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:439
+msgid "112 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:440
+msgid "128 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:441
+msgid "160 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:442
+msgid "192 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:443
+msgid "224 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:444
+msgid "256 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:445
+msgid "320 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:450
+msgid "Joint Stereo"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:451 src/modplug/plugin_main.cc:57
+#: src/mpg123/mpg123.cc:259
+msgid "Stereo"
+msgstr "Stereo"
+
+#: src/filewriter/filewriter.cc:452 src/modplug/plugin_main.cc:56
+#: src/mpg123/mpg123.cc:260
+msgid "Mono"
+msgstr "Mono"
+
+#: src/filewriter/filewriter.cc:456
+msgid "VBR"
+msgstr "VBR"
+
+#: src/filewriter/filewriter.cc:457
+msgid "ABR"
+msgstr "ABR"
+
+#: src/filewriter/filewriter.cc:478
+msgid "Algorithm quality:"
+msgstr "Cilësi algoritmi:"
+
+#: src/filewriter/filewriter.cc:484
+msgid "Bitrate:"
+msgstr "Bitrate:"
+
+#: src/filewriter/filewriter.cc:491
+msgid "Compression ratio:"
+msgstr "Përpjesëtim ngjeshjeje:"
+
+#: src/filewriter/filewriter.cc:498
+msgid "Audio mode:"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:501
+msgid "Enforce strict ISO compliance"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:503
+msgid "Error protection"
+msgstr "Mbrojtje nga gabime"
+
+#: src/filewriter/filewriter.cc:508
+msgid "Enable VBR/ABR"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:510
+msgid "Type:"
+msgstr "Lloj:"
+
+#: src/filewriter/filewriter.cc:514
+msgid "Minimum bitrate:"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:518
+msgid "Maximum bitrate:"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:522
+msgid "Average bitrate:"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:526
+msgid "VBR quality level:"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:530
+msgid "Strictly enforce minimum bitrate"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:533
+msgid "Omit Xing VBR header"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:539
+msgid "Frame Headers"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:540
+msgid "Mark as copyright"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:542
+msgid "Mark as original"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:544
+msgid "ID3 Tags"
+msgstr "Etiketa ID3"
+
+#: src/filewriter/filewriter.cc:545
+msgid "Force addition of version 2 tag"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:547
+msgid "Only add v1 tag"
+msgstr "Shto vetëm etiketë v1"
+
+#: src/filewriter/filewriter.cc:549
+msgid "Only add v2 tag"
+msgstr "Shto vetëm etiketë v2"
+
+#: src/filewriter/filewriter.cc:554
+msgid "Quality"
+msgstr "Cilësi"
+
+#: src/filewriter/filewriter.cc:555
+msgid "VBR/ABR"
+msgstr "VBR/ABR"
+
+#: src/filewriter/filewriter.cc:556
+msgid "Tags"
+msgstr "Etiketa"
+
+#: src/filewriter/filewriter.cc:566
+msgid "Quality (0-1):"
+msgstr "Cilësi (0-1):"
+
+#: src/filewriter/filewriter.cc:573 src/skins-qt/skins_cfg.cc:307
+#: src/skins/skins_cfg.cc:289
+msgid "General"
+msgstr "Të përgjithshme"
+
+#: src/flac/flacng.h:36
+msgid "FLAC Decoder"
+msgstr "Shkodues FLAC"
+
+#: src/flac/metadata.cc:296 src/wavpack/wavpack.cc:215
+msgid "lossless"
+msgstr "pa humbje"
+
+#: src/flac/plugin.cc:214
+msgid ""
+"Original code by\n"
+"Ralf Ertzinger <ralf@skytale.net>\n"
+"\n"
+"http://www.skytale.net/projects/bmp-flac2/"
+msgstr ""
+
+#: src/gio/gio.cc:34
+msgid ""
+"GIO Plugin for Audacious\n"
+"Copyright 2009-2012 John Lindgren"
+msgstr ""
+"Shtojcë GIO për Audacious\n"
+"Të drejta kopjimi 2009-2012 John Lindgren"
+
+#: src/gio/gio.cc:42
+msgid "GIO Plugin"
+msgstr "Shtojcë GIO"
+
+#: src/gio/gio.cc:152
+msgid "Read-and-append mode not supported"
+msgstr ""
+
+#: src/gio/gio.cc:165
+msgid "Invalid open mode"
+msgstr ""
+
+#: src/glspectrum/gl-spectrum.cc:52
+msgid ""
+"OpenGL Spectrum Analyzer for Audacious\n"
+"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\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/glspectrum/gl-spectrum.cc:63 src/qtglspectrum/gl-spectrum.cc:53
+msgid "OpenGL Spectrum Analyzer"
+msgstr "Analizues OpenGL Spektri"
+
+#: src/gtkui/columns.cc:36 src/moonstone/playlist_model.cc:38
+#: src/qtui/playlist_model.cc:33
+msgid "Entry Number"
+msgstr ""
+
+#: src/gtkui/columns.cc:37 src/moonstone/playlist_model.cc:38
+#: src/moonstone/playlist_selection.cc:64
+#: src/playlist-manager/playlist-manager.cc:200
+#: src/playlist-manager-qt/playlist-manager-qt.cc:188
+#: src/qtui/playlist_model.cc:33 src/streamtuner/icecast-model.cc:120
+#: src/streamtuner/ihr-model.cc:159 src/streamtuner/shoutcast-model.cc:122
+msgid "Title"
+msgstr "Titull"
+
+#: src/gtkui/columns.cc:38 src/moonstone/playlist_model.cc:39
+#: src/qtui/playlist_model.cc:33
+msgid "Artist"
+msgstr "Artist"
+
+#: src/gtkui/columns.cc:39 src/moonstone/playlist_model.cc:39
+#: src/qtui/playlist_model.cc:33
+msgid "Year"
+msgstr "Vit"
+
+#: src/gtkui/columns.cc:40 src/moonstone/playlist_model.cc:39
+#: src/qtui/playlist_model.cc:34
+msgid "Album"
+msgstr "Album"
+
+#: src/gtkui/columns.cc:41 src/moonstone/playlist_model.cc:40
+#: src/qtui/playlist_model.cc:34
+msgid "Album Artist"
+msgstr "Artist Albumi"
+
+#: src/gtkui/columns.cc:42 src/moonstone/playlist_model.cc:40
+#: src/qtui/playlist_model.cc:34
+msgid "Track"
+msgstr "Pjesë"
+
+#: src/gtkui/columns.cc:43 src/moonstone/playlist_model.cc:40
+#: src/qtui/playlist_model.cc:34 src/streamtuner/icecast-model.cc:123
+#: src/streamtuner/shoutcast-model.cc:125
+#: src/streamtuner/shoutcast-model.cc:236
+msgid "Genre"
+msgstr "Zhanër"
+
+#: src/gtkui/columns.cc:44 src/moonstone/playlist_model.cc:41
+#: src/qtui/playlist_model.cc:35
+msgid "Queue Position"
+msgstr ""
+
+#: src/gtkui/columns.cc:45 src/moonstone/playlist_model.cc:41
+#: src/qtui/playlist_model.cc:35
+msgid "Length"
+msgstr "Gjatësi"
+
+#: src/gtkui/columns.cc:46 src/moonstone/playlist_model.cc:41
+#: src/qtui/playlist_model.cc:35
+msgid "File Path"
+msgstr "Shteg Kartele"
+
+#: src/gtkui/columns.cc:47 src/moonstone/playlist_model.cc:42
+#: src/qtui/playlist_model.cc:35
+msgid "File Name"
+msgstr "Emër Kartele"
+
+#: src/gtkui/columns.cc:48 src/moonstone/playlist_model.cc:42
+#: src/qtui/playlist_model.cc:36
+msgid "Custom Title"
+msgstr "Titull Vetjak"
+
+#: src/gtkui/columns.cc:49 src/moonstone/playlist_model.cc:42
+#: src/qtui/playlist_model.cc:36 src/streamtuner/icecast-model.cc:129
+#: src/streamtuner/shoutcast-model.cc:134
+msgid "Bitrate"
+msgstr "Bitrate"
+
+#: src/gtkui/columns.cc:50 src/moonstone/playlist_model.cc:43
+#: src/qtui/playlist_model.cc:36
+msgid "Comment"
+msgstr "Koment"
+
+#: src/gtkui/columns.cc:51 src/qtui/playlist_model.cc:36
+msgid "Publisher"
+msgstr ""
+
+#: src/gtkui/columns.cc:52 src/qtui/playlist_model.cc:37
+msgid "Catalog Number"
+msgstr ""
+
+#: src/gtkui/columns.cc:53 src/moonstone/playlist_model.cc:43
+#: src/qtui/playlist_model.cc:37
+msgid "Disc"
+msgstr ""
+
+#: src/gtkui/columns.cc:325
+msgid "Available columns"
+msgstr "Shtylla të Mundshme"
+
+#: src/gtkui/columns.cc:351
+msgid "Displayed columns"
+msgstr "Shtylla të Shfaqura"
+
+#: src/gtkui/layout.cc:74 src/search-tool-qt/search-tool-qt.cc:58
+#: src/search-tool/search-tool.cc:49
+msgid "Search Tool"
+msgstr "Mjet Kërkimi"
+
+#: src/gtkui/layout.cc:170
+msgid "Dock at Left"
+msgstr "Fiksoje Majtas"
+
+#: src/gtkui/layout.cc:170
+msgid "Dock at Right"
+msgstr "Fiksoje Djathtas"
+
+#: src/gtkui/layout.cc:171
+msgid "Dock at Top"
+msgstr "Fiksoje Në Krye"
+
+#: src/gtkui/layout.cc:171
+msgid "Dock at Bottom"
+msgstr "Fiskoje Në Fund"
+
+#: src/gtkui/layout.cc:171
+msgid "Undock"
+msgstr ""
+
+#: src/gtkui/layout.cc:171 src/ladspa/plugin.cc:540
+msgid "Disable"
+msgstr "Çaktivizoje"
+
+#: src/gtkui/menus.cc:79 src/qtui/menus.cc:107
+#: src/statusicon-qt/statusicon.cc:115 src/statusicon/statusicon.cc:286
+msgid "_Open Files ..."
+msgstr "_Hapni Kartela …"
+
+#: src/gtkui/menus.cc:80 src/qtui/menus.cc:111
+msgid "Open _URL ..."
+msgstr "Hapni _URL …"
+
+#: src/gtkui/menus.cc:81 src/qtui/menus.cc:113
+msgid "_Add Files ..."
+msgstr "_Shtoni Kartela …"
+
+#: src/gtkui/menus.cc:82 src/qtui/menus.cc:118
+msgid "Add U_RL ..."
+msgstr "Shtoni U_RL …"
+
+#: src/gtkui/menus.cc:84 src/qtui/menus.cc:120
+msgid "Search _Library"
+msgstr ""
+
+#: src/gtkui/menus.cc:86 src/qtui/menus.cc:123
+msgid "A_bout ..."
+msgstr "_Mbi …"
+
+#: src/gtkui/menus.cc:87 src/qtui/menus.cc:125
+msgid "_Settings ..."
+msgstr "_Rregullime …"
+
+#: src/gtkui/menus.cc:88 src/qtui/menus.cc:131
+#: src/statusicon-qt/statusicon.cc:117 src/statusicon/statusicon.cc:288
+msgid "_Quit"
+msgstr "_Dil"
+
+#: src/gtkui/menus.cc:92 src/gtkui/menus.cc:226
+#: src/moonstone/playlist_tabs.cc:306 src/qtui/menus.cc:135
+#: src/qtui/playlist_tabs.cc:331 src/search-tool-qt/search-tool-qt.cc:499
+#: src/search-tool/search-tool.cc:339 src/statusicon-qt/statusicon.cc:109
+#: src/statusicon/statusicon.cc:280
+msgid "_Play"
+msgstr "_Luaje"
+
+#: src/gtkui/menus.cc:93 src/qtui/menus.cc:137
+#: src/statusicon-qt/statusicon.cc:110 src/statusicon/statusicon.cc:281
+msgid "Paus_e"
+msgstr "Pushi_m"
+
+#: src/gtkui/menus.cc:94 src/qtui/menus.cc:139
+#: src/statusicon-qt/statusicon.cc:111 src/statusicon/statusicon.cc:282
+msgid "_Stop"
+msgstr "_Ndal"
+
+#: src/gtkui/menus.cc:95 src/qtui/menus.cc:141
+#: src/statusicon-qt/statusicon.cc:112 src/statusicon/statusicon.cc:283
+msgid "Pre_vious"
+msgstr "I_mëparshmi"
+
+#: src/gtkui/menus.cc:96 src/qtui/menus.cc:143
+#: src/statusicon-qt/statusicon.cc:113 src/statusicon/statusicon.cc:284
+msgid "_Next"
+msgstr "_Tjetëri"
+
+#: src/gtkui/menus.cc:97 src/qtui/menus.cc:145 src/skins/menus.cc:114
+#: src/skins-qt/menus.cc:105
+msgid "Previous Album"
+msgstr "Albumi i Mëparshëm"
+
+#: src/gtkui/menus.cc:98 src/qtui/menus.cc:146 src/skins/menus.cc:115
+#: src/skins-qt/menus.cc:106
+msgid "Next Album"
+msgstr "Albumi Pasues"
+
+#: src/gtkui/menus.cc:100 src/qtui/menus.cc:148
+msgid "_Repeat"
+msgstr "_Përsërit"
+
+#: src/gtkui/menus.cc:101 src/qtui/menus.cc:150
+msgid "S_huffle"
+msgstr ""
+
+#: src/gtkui/menus.cc:102 src/qtui/menus.cc:152
+msgid "Shuffle by Albu_m"
+msgstr ""
+
+#: src/gtkui/menus.cc:103 src/qtui/menus.cc:155
+msgid "N_o Playlist Advance"
+msgstr ""
+
+#: src/gtkui/menus.cc:104 src/qtui/menus.cc:157
+msgid "Stop A_fter This Song"
+msgstr "Ndalu _Pas Kësaj Kënge"
+
+#: src/gtkui/menus.cc:106 src/gtkui/menus.cc:210 src/qtui/menus.cc:162
+#: src/qtui/menus.cc:294
+msgid "Song _Info ..."
+msgstr "Të _dhëna Kënge …"
+
+#: src/gtkui/menus.cc:107
+msgid "Jump to _Time ..."
+msgstr ""
+
+#: src/gtkui/menus.cc:108
+msgid "_Jump to Song ..."
+msgstr ""
+
+#: src/gtkui/menus.cc:110 src/qtui/menus.cc:165
+msgid "Set Repeat Point _A"
+msgstr ""
+
+#: src/gtkui/menus.cc:111 src/qtui/menus.cc:167
+msgid "Set Repeat Point _B"
+msgstr ""
+
+#: src/gtkui/menus.cc:112 src/qtui/menus.cc:169
+msgid "_Clear Repeat Points"
+msgstr "_Spastro Pika Përsëritjesh"
+
+#: src/gtkui/menus.cc:116 src/gtkui/menus.cc:123 src/gtkui/menus.cc:141
+#: src/qtui/menus.cc:173 src/qtui/menus.cc:180 src/qtui/menus.cc:198
+msgid "By _Title"
+msgstr "Sipas _Titujsh"
+
+#: src/gtkui/menus.cc:117 src/qtui/menus.cc:174
+msgid "By _File Name"
+msgstr "Sipas _Emri Kartele"
+
+#: src/gtkui/menus.cc:118 src/qtui/menus.cc:175
+msgid "By File _Path"
+msgstr "Sipas Shte_g Kartele"
+
+#: src/gtkui/menus.cc:122 src/gtkui/menus.cc:140 src/qtui/menus.cc:179
+#: src/qtui/menus.cc:197
+msgid "By Track _Number"
+msgstr "Sipas _Numër Pjese"
+
+#: src/gtkui/menus.cc:124 src/gtkui/menus.cc:142 src/qtui/menus.cc:181
+#: src/qtui/menus.cc:199
+msgid "By _Artist"
+msgstr "Sipas _Artistësh"
+
+#: src/gtkui/menus.cc:125 src/gtkui/menus.cc:143 src/qtui/menus.cc:182
+#: src/qtui/menus.cc:200
+msgid "By Al_bum"
+msgstr "Sipas Al_bumi"
+
+#: src/gtkui/menus.cc:126 src/gtkui/menus.cc:144 src/qtui/menus.cc:183
+#: src/qtui/menus.cc:201
+msgid "By Albu_m Artist"
+msgstr "Sipas Artistësh Albu_mi"
+
+#: src/gtkui/menus.cc:127 src/gtkui/menus.cc:145 src/qtui/menus.cc:184
+#: src/qtui/menus.cc:202
+msgid "By Release _Date"
+msgstr "Sipas _Datash Hedhjeje Në Qarkullim"
+
+#: src/gtkui/menus.cc:128 src/gtkui/menus.cc:146 src/qtui/menus.cc:185
+#: src/qtui/menus.cc:203
+msgid "By _Genre"
+msgstr "Sipas _Zhanresh"
+
+#: src/gtkui/menus.cc:129 src/gtkui/menus.cc:147 src/qtui/menus.cc:186
+#: src/qtui/menus.cc:204
+msgid "By _Length"
+msgstr "Sipas _Gjatësish"
+
+#: src/gtkui/menus.cc:130 src/gtkui/menus.cc:148 src/qtui/menus.cc:187
+#: src/qtui/menus.cc:205
+msgid "By _File Path"
+msgstr "Sipas Sh_tegu Kartele"
+
+#: src/gtkui/menus.cc:131 src/gtkui/menus.cc:149 src/qtui/menus.cc:188
+#: src/qtui/menus.cc:206
+msgid "By _Custom Title"
+msgstr "Sipas Titulli _Vetjak"
+
+#: src/gtkui/menus.cc:132 src/gtkui/menus.cc:150 src/qtui/menus.cc:189
+#: src/qtui/menus.cc:207
+msgid "By C_omment"
+msgstr "Sipas K_omentesh"
+
+#: src/gtkui/menus.cc:133 src/gtkui/menus.cc:151 src/qtui/menus.cc:190
+#: src/qtui/menus.cc:208
+msgid "By D_isc Number"
+msgstr ""
+
+#: src/gtkui/menus.cc:135 src/gtkui/menus.cc:153 src/qtui/menus.cc:192
+#: src/qtui/menus.cc:210
+msgid "R_everse Order"
+msgstr ""
+
+#: src/gtkui/menus.cc:136 src/gtkui/menus.cc:154 src/qtui/menus.cc:194
+#: src/qtui/menus.cc:212
+msgid "_Random Order"
+msgstr ""
+
+#: src/gtkui/menus.cc:158 src/qtui/menus.cc:216
+msgid "_Play/Resume"
+msgstr ""
+
+#: src/gtkui/menus.cc:159 src/qtui/menus.cc:218
+msgid "_Refresh"
+msgstr "_Rifreskoje"
+
+#: src/gtkui/menus.cc:161 src/qtui/menus.cc:222
+msgid "_Sort"
+msgstr "_Renditi"
+
+#: src/gtkui/menus.cc:162 src/qtui/menus.cc:223
+msgid "Sort Se_lected"
+msgstr ""
+
+#: src/gtkui/menus.cc:163 src/qtui/menus.cc:225
+msgid "Remove _Duplicates"
+msgstr "Hiq Përsëdytje"
+
+#: src/gtkui/menus.cc:164 src/qtui/menus.cc:226
+msgid "Remove _Unavailable Files"
+msgstr ""
+
+#: src/gtkui/menus.cc:166 src/playlist-manager/playlist-manager.cc:219
+#: src/playlist-manager-qt/playlist-manager-qt.cc:348 src/qtui/menus.cc:229
+msgid "_New"
+msgstr "E _re"
+
+#: src/gtkui/menus.cc:167 src/qtui/menus.cc:230
+msgid "Ren_ame ..."
+msgstr "Ri_emëro ..."
+
+#: src/gtkui/menus.cc:168 src/gtkui/menus.cc:228
+#: src/moonstone/playlist_tabs.cc:311 src/qtui/menus.cc:231
+#: src/qtui/playlist_tabs.cc:336
+msgid "Remo_ve"
+msgstr "_Hiqe"
+
+#: src/gtkui/menus.cc:170 src/qtui/menus.cc:233
+msgid "_Import ..."
+msgstr "_Importoni …"
+
+#: src/gtkui/menus.cc:171 src/qtui/menus.cc:234
+msgid "_Export ..."
+msgstr "_Eksportoni …"
+
+#: src/gtkui/menus.cc:173 src/qtui/menus.cc:237
+msgid "Playlist _Manager ..."
+msgstr "_Përgjegjës Luajlistash …"
+
+#: src/gtkui/menus.cc:174 src/qtui/menus.cc:239
+msgid "_Queue Manager ..."
+msgstr "_Përgjegjës Radhe …"
+
+#: src/gtkui/menus.cc:178 src/qtui/menus.cc:243
+msgid "Volume _Up"
+msgstr "_Ngrije Volumin"
+
+#: src/gtkui/menus.cc:179 src/qtui/menus.cc:245
+msgid "Volume _Down"
+msgstr "_Ule Volumin"
+
+#: src/gtkui/menus.cc:181 src/qtui/menus.cc:249
+msgid "_Equalizer ..."
+msgstr "_Balancues …"
+
+#: src/gtkui/menus.cc:182 src/qtui/menus.cc:251
+msgid "E_ffects ..."
+msgstr "Efekte …"
+
+#: src/gtkui/menus.cc:184
+msgid "_Record Stream"
+msgstr "_Incizo Rrrjedhë"
+
+#: src/gtkui/menus.cc:185
+msgid "Audio _Settings ..."
+msgstr "_Rregullime për Audion …"
+
+#: src/gtkui/menus.cc:189 src/qtui/menus.cc:260
+msgid "Show _Menu Bar"
+msgstr ""
+
+#: src/gtkui/menus.cc:190 src/qtui/menus.cc:262
+msgid "Show I_nfo Bar"
+msgstr ""
+
+#: src/gtkui/menus.cc:191 src/qtui/menus.cc:264
+msgid "Show Info Bar _Album Art"
+msgstr ""
+
+#: src/gtkui/menus.cc:192 src/qtui/menus.cc:266
+msgid "Show Info Bar Vis_ualization"
+msgstr ""
+
+#: src/gtkui/menus.cc:193 src/qtui/menus.cc:268
+msgid "Show _Status Bar"
+msgstr ""
+
+#: src/gtkui/menus.cc:195 src/qtui/menus.cc:272
+msgid "Show _Remaining Time"
+msgstr ""
+
+#: src/gtkui/menus.cc:197 src/qtui/menus.cc:276 src/skins/menus.cc:157
+#: src/skins-qt/menus.cc:152
+msgid "_Visualizations ..."
+msgstr "_Vizualizime …"
+
+#: src/gtkui/menus.cc:201 src/qtui/menus.cc:280
+msgid "_File"
+msgstr "_Kartelë"
+
+#: src/gtkui/menus.cc:202 src/qtui/menus.cc:281
+msgid "_Playback"
+msgstr "_Luaj përsëri"
+
+#: src/gtkui/menus.cc:203 src/qtui/menus.cc:282
+msgid "P_laylist"
+msgstr ""
+
+#: src/gtkui/menus.cc:204 src/gtkui/menus.cc:222 src/qtui/menus.cc:283
+#: src/qtui/menus.cc:312
+msgid "_Services"
+msgstr "_Shërbime"
+
+#: src/gtkui/menus.cc:205 src/qtui/menus.cc:284
+msgid "_Output"
+msgstr ""
+
+#: src/gtkui/menus.cc:206 src/qtui/menus.cc:285
+msgid "_View"
+msgstr "_Pamje"
+
+#: src/gtkui/menus.cc:211 src/qtui/menus.cc:296
+msgid "_Queue/Unqueue"
+msgstr ""
+
+#: src/gtkui/menus.cc:213 src/qtui/menus.cc:299
+msgid "_Open Containing Folder"
+msgstr ""
+
+#: src/gtkui/menus.cc:214 src/qtui/menus.cc:301
+msgid "_Refresh Selected"
+msgstr ""
+
+#: src/gtkui/menus.cc:216 src/qtui/menus.cc:304
+msgid "Cu_t"
+msgstr "_Prije"
+
+#: src/gtkui/menus.cc:217 src/qtui/menus.cc:305
+msgid "_Copy"
+msgstr "_Kopjoje"
+
+#: src/gtkui/menus.cc:218 src/qtui/menus.cc:306
+msgid "_Paste"
+msgstr "_Ngjite"
+
+#: src/gtkui/menus.cc:219 src/qtui/menus.cc:307
+msgid "Paste at _End"
+msgstr "Ngjite në _Fund"
+
+#: src/gtkui/menus.cc:220 src/qtui/menus.cc:309
+msgid "Select _All"
+msgstr "Përzgjidhe _Krejt"
+
+#: src/gtkui/menus.cc:227 src/moonstone/playlist_tabs.cc:309
+#: src/qtui/playlist_tabs.cc:334
+msgid "_Rename ..."
+msgstr "_Riemërtoni…"
+
+#: src/gtkui/settings.cc:35 src/qtui/settings.cc:59
+msgid "Always"
+msgstr "Përherë"
+
+#: src/gtkui/settings.cc:36 src/qtui/settings.cc:60
+msgid "Auto-hide"
+msgstr "Vetëfshihu"
+
+#: src/gtkui/settings.cc:37 src/qtui/settings.cc:61
+msgid "Never"
+msgstr "Kurrë"
+
+#: src/gtkui/settings.cc:41 src/qtui/settings.cc:64
+msgid "Playlist Tabs"
+msgstr "Skeda Luajliste"
+
+#: src/gtkui/settings.cc:42 src/qtui/settings.cc:65
+msgid "Show playlist tabs:"
+msgstr "Shfaq skeda luajliste:"
+
+#: src/gtkui/settings.cc:45 src/qtui/settings.cc:69
+msgid "Show entry counts"
+msgstr ""
+
+#: src/gtkui/settings.cc:47 src/qtui/settings.cc:72
+msgid "Show close buttons"
+msgstr "Shfaq butona mbylljesh"
+
+#: src/gtkui/settings.cc:49 src/qtui/settings.cc:75
+msgid "Playlist Columns"
+msgstr "Shtylla Luajliste"
+
+#: src/gtkui/settings.cc:51 src/qtui/settings.cc:77
+msgid "Show column headers"
+msgstr ""
+
+#: src/gtkui/settings.cc:53 src/qtui/settings.cc:82
+msgid "Make column headers clickable for sorting"
+msgstr ""
+
+#: src/gtkui/settings.cc:56
+msgid "Use symbolic icons in toolbar"
+msgstr ""
+
+#: src/gtkui/settings.cc:58 src/qtui/settings.cc:86
+msgid "Scroll on song change"
+msgstr ""
+
+#: src/gtkui/ui_gtk.cc:82
+msgid "GTK Interface"
+msgstr "Ndërfaqe GTK"
+
+#: src/gtkui/ui_gtk.cc:219 src/skins/main.cc:228 src/skins-qt/main.cc:231
+#, c-format
+msgid "%s - Audacious"
+msgstr "%s - Audacious"
+
+#: src/gtkui/ui_gtk.cc:221 src/moonstone/main_window.cc:184
+#: src/qtui/main_window.cc:385
+msgid "Buffering ..."
+msgstr ""
+
+#: src/gtkui/ui_gtk.cc:224 src/pipewire/pipewire.cc:402 src/skins/main.cc:230
+#: src/skins-qt/main.cc:233
+msgid "Audacious"
+msgstr "Audacious"
+
+#: src/gtkui/ui_gtk.cc:487 src/gtkui/ui_gtk.cc:518 src/gtkui/ui_gtk.cc:882
+#: src/hotkey/gui.cc:72 src/moonstone/main_window.cc:67
+#: src/moonstone/main_window.cc:145 src/moonstone/main_window.cc:146
+#: src/notify/osd.cc:85 src/qthotkey/gui.cc:67 src/qtui/main_window.cc:154
+#: src/qtui/main_window.cc:347 src/qtui/main_window.cc:348
+#: src/skins/menus.cc:109 src/skins-qt/menus.cc:100
+msgid "Play"
+msgstr "Luaje"
+
+#: src/gtkui/ui_gtk.cc:487 src/moonstone/main_window.cc:151
+#: src/moonstone/main_window.cc:152 src/notify/osd.cc:82
+#: src/qtui/main_window.cc:353 src/qtui/main_window.cc:354
+#: src/skins/menus.cc:110 src/skins-qt/menus.cc:101
+msgid "Pause"
+msgstr "Pushim"
+
+#: src/gtkui/ui_gtk.cc:868 src/moonstone/main_window.cc:57
+#: src/qtui/main_window.cc:145 src/skins/menus.cc:86 src/skins-qt/menus.cc:77
+msgid "Search Library"
+msgstr "Kërkoni në Fonotekë"
+
+#: src/gtkui/ui_gtk.cc:875 src/moonstone/main_window.cc:60
+#: src/qtui/main_window.cc:147
+msgid "Open Files"
+msgstr "Hapni Kartela"
+
+#: src/gtkui/ui_gtk.cc:876 src/moonstone/main_window.cc:62
+#: src/qtui/main_window.cc:149
+msgid "Add Files"
+msgstr "Shto Kartela"
+
+#: src/gtkui/ui_gtk.cc:881 src/moonstone/main_window.cc:65
+#: src/qtui/main_window.cc:152 src/skins/menus.cc:112 src/skins-qt/menus.cc:103
+msgid "Previous"
+msgstr "E mëparshmja"
+
+#: src/gtkui/ui_gtk.cc:883 src/hotkey/gui.cc:74 src/moonstone/main_window.cc:69
+#: src/qthotkey/gui.cc:69 src/qtui/main_window.cc:156 src/skins/menus.cc:111
+#: src/skins-qt/menus.cc:102
+msgid "Stop"
+msgstr "Ndale"
+
+#: src/gtkui/ui_gtk.cc:884 src/moonstone/main_window.cc:76 src/notify/osd.cc:89
+#: src/qtui/main_window.cc:163 src/skins/menus.cc:113 src/skins-qt/menus.cc:104
+msgid "Next"
+msgstr "Pasuesja"
+
+#: src/gtkui/ui_gtk.cc:886 src/moonstone/main_window.cc:79
+#: src/qtui/main_window.cc:166 src/qtui/menus.cc:254 src/skins/menus.cc:79
+#: src/skins-qt/menus.cc:69
+msgid "Record Stream"
+msgstr ""
+
+#: src/gtkui/ui_gtk.cc:919 src/moonstone/main_window.cc:86
+#: src/qtui/main_window.cc:173 src/skins/menus.cc:103 src/skins-qt/menus.cc:94
+msgid "Repeat"
+msgstr "Përsërite"
+
+#: src/gtkui/ui_gtk.cc:922 src/moonstone/main_window.cc:89
+#: src/qtui/main_window.cc:176 src/skins/menus.cc:104 src/skins-qt/menus.cc:95
+msgid "Shuffle"
+msgstr "Përzieji"
+
+#: src/gtkui/ui_gtk.cc:1114 src/qtui/main_window.cc:123
+msgid "Menu"
+msgstr "Menu"
+
+#: src/gtkui/ui_statusbar.cc:64 src/qtui/status_bar.cc:155
+msgid "mono"
+msgstr "mono"
+
+#: src/gtkui/ui_statusbar.cc:66 src/qtui/status_bar.cc:157
+msgid "stereo"
+msgstr "stereo"
+
+#: src/gtkui/ui_statusbar.cc:68 src/qtui/status_bar.cc:160
+#, c-format
+msgid "%d channel"
+msgid_plural "%d channels"
+msgstr0 "%d kanal"
+msgstr1 "%d kanale"
+
+#: src/gtkui/ui_statusbar.cc:76 src/qtui/status_bar.cc:168
+#, c-format
+msgid "%d kHz"
+msgstr "%d kHz"
+
+#: src/gtkui/ui_statusbar.cc:82 src/qtui/status_bar.cc:174
+#, c-format
+msgid "%d kbit/s"
+msgstr ""
+
+#: src/gtkui/ui_statusbar.cc:108 src/skins/main.cc:478 src/skins-qt/main.cc:461
+msgid "Single mode."
+msgstr ""
+
+#: src/gtkui/ui_statusbar.cc:110 src/skins/main.cc:480 src/skins-qt/main.cc:463
+msgid "Playlist mode."
+msgstr ""
+
+#: src/gtkui/ui_statusbar.cc:118 src/skins/main.cc:486 src/skins-qt/main.cc:469
+msgid "Stopping after song."
+msgstr ""
+
+#: src/hotkey/gui.cc:71 src/qthotkey/gui.cc:66
+msgid "Previous track"
+msgstr "Pjesa e mëparshme"
+
+#: src/hotkey/gui.cc:73 src/qthotkey/gui.cc:68
+msgid "Pause/Resume"
+msgstr "Pushim/Vazhdim"
+
+#: src/hotkey/gui.cc:75 src/qthotkey/gui.cc:70
+msgid "Next track"
+msgstr "Pjesa pasuese"
+
+#: src/hotkey/gui.cc:76 src/qthotkey/gui.cc:71
+msgid "Step forward"
+msgstr ""
+
+#: src/hotkey/gui.cc:77 src/qthotkey/gui.cc:72
+msgid "Step backward"
+msgstr ""
+
+#: src/hotkey/gui.cc:78 src/qthotkey/gui.cc:73
+msgid "Mute"
+msgstr "Pa zë"
+
+#: src/hotkey/gui.cc:79 src/qthotkey/gui.cc:74
+msgid "Volume up"
+msgstr "Ngrije volumin"
+
+#: src/hotkey/gui.cc:80 src/qthotkey/gui.cc:75
+msgid "Volume down"
+msgstr "Ule volumin"
+
+#: src/hotkey/gui.cc:81 src/qthotkey/gui.cc:76
+msgid "Jump to file"
+msgstr "Hidhu te kartelë"
+
+#: src/hotkey/gui.cc:82 src/qthotkey/gui.cc:77
+msgid "Toggle player window(s)"
+msgstr ""
+
+#: src/hotkey/gui.cc:83 src/qthotkey/gui.cc:78
+msgid "Show On-Screen-Display"
+msgstr ""
+
+#: src/hotkey/gui.cc:84 src/qthotkey/gui.cc:79
+msgid "Toggle repeat"
+msgstr ""
+
+#: src/hotkey/gui.cc:85 src/qthotkey/gui.cc:80
+msgid "Toggle shuffle"
+msgstr ""
+
+#: src/hotkey/gui.cc:86 src/qthotkey/gui.cc:81
+msgid "Toggle stop after current"
+msgstr ""
+
+#: src/hotkey/gui.cc:87 src/qthotkey/gui.cc:82
+msgid "Raise player window(s)"
+msgstr ""
+
+#: src/hotkey/gui.cc:98 src/qthotkey/gui.cc:100
+msgid "(none)"
+msgstr "(asnjë)"
+
+#: src/hotkey/gui.cc:261
+msgid ""
+"It is not recommended to bind the primary mouse buttons without modifiers.\n"
+"\n"
+"Do you want to continue?"
+msgstr ""
+
+#: src/hotkey/gui.cc:264
+msgid "Binding mouse buttons"
+msgstr ""
+
+#: src/hotkey/gui.cc:434
+msgid ""
+"Press a key combination inside a text field.\n"
+"You can also bind mouse buttons."
+msgstr ""
+
+#: src/hotkey/gui.cc:444 src/qthotkey/gui.cc:179
+msgid "Hotkeys:"
+msgstr ""
+
+#: src/hotkey/gui.cc:457 src/qthotkey/gui.cc:181
+msgid "Action:"
+msgstr "Veprim"
+
+#: src/hotkey/gui.cc:461 src/qthotkey/gui.cc:182
+msgid "Key Binding:"
+msgstr ""
+
+#: src/hotkey/gui.cc:518 src/qthotkey/gui.cc:184
+msgid "_Add"
+msgstr "_Shtoje"
+
+#: src/hotkey/plugin.cc:59 src/qthotkey/plugin.cc:78
+msgid "Global Hotkeys"
+msgstr ""
+
+#: src/hotkey/plugin.cc:74
+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"
+"Contributors 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/jack/jack-ng.cc:54
+msgid "JACK Output"
+msgstr ""
+
+#: src/jack/jack-ng.cc:126
+msgid "Client name:"
+msgstr "Emër klienti:"
+
+#: src/jack/jack-ng.cc:128
+msgid "Automatically connect to output ports"
+msgstr ""
+
+#: src/jack/jack-ng.cc:130
+msgid "Filter ports (regex, use any port if blank):"
+msgstr ""
+
+#: src/jack/jack-ng.cc:136
+msgid "Connect to physical ports only"
+msgstr ""
+
+#: src/jack/jack-ng.cc:139
+msgid "Upmix to"
+msgstr ""
+
+#: src/jack/jack-ng.cc:141
+msgid "ports if input has fewer channels"
+msgstr ""
+
+#: src/jack/jack-ng.cc:143
+msgid "Ignore insufficient number of ports"
+msgstr ""
+
+#: src/jack/jack-ng.cc:181
+msgid "No JACK output ports were found. Please check settings."
+msgstr ""
+
+#: src/jack/jack-ng.cc:195
+#, c-format
+msgid "Only %d JACK output ports were found but %d are required."
+msgstr ""
+
+#: src/jack/jack-ng.cc:210
+#, c-format
+msgid "Failed to connect to JACK port %s."
+msgstr ""
+
+#: src/jack/jack-ng.cc:230
+msgid ""
+"JACK supports only floating-point audio. You must change the output bit "
+"depth to floating-point in Audacious settings."
+msgstr ""
+
+#: src/jack/jack-ng.cc:245
+msgid "Failed to connect to the JACK server; is it running?"
+msgstr ""
+
+#: src/jack/jack-ng.cc:321
+#, c-format
+msgid ""
+"The JACK server requires a sample rate of %d Hz, but Audacious is playing at "
+"%d Hz. Please use the Sample Rate Converter effect to correct the mismatch."
+msgstr ""
+
+#: src/ladspa/plugin.cc:416
+#, c-format
+msgid "%s Settings"
+msgstr "Rregullime për %s"
+
+#: src/ladspa/plugin.cc:482
+msgid "Module paths:"
+msgstr "Shtigje modulesh:"
+
+#: src/ladspa/plugin.cc:487
+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.cc:508
+msgid "Available plugins:"
+msgstr "Shtojca të gatshme:"
+
+#: src/ladspa/plugin.cc:521 src/modplug/plugin_main.cc:91
+#: src/modplug/plugin_main.cc:94 src/modplug/plugin_main.cc:97
+#: src/modplug/plugin_main.cc:100
+msgid "Enable"
+msgstr "Aktivizoje"
+
+#: src/ladspa/plugin.cc:527
+msgid "Enabled plugins:"
+msgstr "Shtojca të aktivizuara:"
+
+#: src/ladspa/plugin.cc:543
+msgid "Settings"
+msgstr "Rregullime"
+
+#: src/ladspa/plugin.cc:560
+msgid ""
+"LADSPA Host for Audacious\n"
+"Copyright 2011 John Lindgren"
+msgstr ""
+
+#: src/ladspa/plugin.h:78
+msgid "LADSPA Host"
+msgstr ""
+
+#: src/lirc/lirc.cc:55
+msgid "LIRC Plugin"
+msgstr "Shtojcë LIRC"
+
+#: src/lirc/lirc.cc:379
+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.cc:390
+msgid "Connection"
+msgstr "Lidhje"
+
+#: src/lirc/lirc.cc:391
+msgid "Reconnect to LIRC server"
+msgstr "Rilidhu me shërbyesin LIRC"
+
+#: src/lirc/lirc.cc:393
+msgid "Wait before reconnecting:"
+msgstr ""
+
+#: src/lyrics-common/chart_lyrics_provider.cc:93
+#: src/lyrics-common/chart_lyrics_provider.cc:150
+#: src/lyrics-common/lyrics_ovh_provider.cc:50
+#, c-format
+msgid "Unable to fetch %s"
+msgstr ""
+
+#: src/lyrics-common/chart_lyrics_provider.cc:100
+#: src/lyrics-common/chart_lyrics_provider.cc:157
+#: src/lyrics-common/lyrics_ovh_provider.cc:57
+#, c-format
+msgid "Unable to parse %s"
+msgstr ""
+
+#: src/lyrics-common/chart_lyrics_provider.cc:121
+#: src/lyrics-common/chart_lyrics_provider.cc:194
+#: src/lyrics-common/lyrics_ovh_provider.cc:88
+msgid "Looking for lyrics ..."
+msgstr "Po kërkohet për vargje …"
+
+#: src/lyrics-common/preferences.h:43
+msgid "Nowhere"
+msgstr "Askund"
+
+#: src/lyrics-common/preferences.h:49
+msgid "Artist is truncated at the start, Title -- at the end"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:50
+msgid "Chars to truncate on:"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:54
+msgid "Chars are ORed in RegExp, surrounded by whitespace"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:55
+msgid "Chars to split on:"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:56
+msgid "Further truncate those on chars"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:62
+msgid "General"
+msgstr "Të përgjithshme"
+
+#: src/lyrics-common/preferences.h:63
+msgid "Split title into artist and title on chars"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:66
+msgid "Sources"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:67
+msgid "Use embedded lyrics (from Lyrics tag)"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:69
+msgid "Fetch lyrics from internet:"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:72
+msgid "Store fetched lyrics in local cache"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:74
+msgid "Local Storage"
+msgstr "Depozitim Vendor"
+
+#: src/lyrics-common/preferences.h:75
+msgid "Load lyric files (.lrc) from local storage"
+msgstr ""
+
+#: src/lyrics-common/utils.cc:54 src/ui-common/dialogs-qt.cc:63
+msgid "Error"
+msgstr "Gabim"
+
+#: src/lyrics-common/utils.cc:60
+msgid "Lyrics could not be found."
+msgstr "S’u gjetën vargje."
+
+#: src/lyrics-common/utils.cc:142
+msgid "Missing title and/or artist."
+msgstr ""
+
+#: src/lyrics-gtk/lyrics-gtk.cc:37 src/lyrics-qt/lyrics-qt.cc:50
+msgid "Lyrics"
+msgstr "Vargje"
+
+#: src/lyrics-gtk/lyrics-gtk.cc:189 src/lyrics-qt/lyrics-qt.cc:171
+msgid "Edit Lyrics ..."
+msgstr ""
+
+#: src/lyrics-gtk/lyrics-gtk.cc:195 src/lyrics-qt/lyrics-qt.cc:178
+msgid "Save Locally"
+msgstr "Ruaje Lokalisht"
+
+#: src/lyrics-gtk/lyrics-gtk.cc:201 src/lyrics-qt/lyrics-qt.cc:186
+msgid "Refresh"
+msgstr "Rifreskoje"
+
+#: src/m3u/m3u.cc:33
+msgid "M3U Playlists"
+msgstr "Luajlista M3U"
+
+#: src/metronom/metronom.cc:44
+msgid "Tact Generator"
+msgstr ""
+
+#: src/metronom/metronom.cc:145
+#, c-format
+msgid "Tact generator: %d bpm"
+msgstr ""
+
+#: src/metronom/metronom.cc:147
+#, c-format
+msgid "Tact generator: %d bpm %d/%d"
+msgstr ""
+
+#: src/metronom/metronom.cc:235
+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/mixer/mixer.cc:43
+msgid "Channel Mixer"
+msgstr "Përzierës Kanalesh"
+
+#: src/mixer/mixer.cc:255
+msgid ""
+"Channel Mixer Plugin for Audacious\n"
+"Copyright 2011-2012 John Lindgren and Michał Lipski"
+msgstr ""
+
+#: src/mixer/mixer.cc:259
+msgid "Channel Mixer"
+msgstr "Përzierës Kanalesh"
+
+#: src/mixer/mixer.cc:260
+msgid "Output channels:"
+msgstr ""
+
+#: src/mms/mms.cc:35
+msgid "MMS Plugin"
+msgstr "Shtojcë MMS"
+
+#: src/mms/mms.cc:82
+msgid "Error connecting to MMS server"
+msgstr "Gabim gjatë lidhjes me shërbyesin MMS"
+
+#: src/modplug/modplugbmp.h:57
+msgid "ModPlug (Module Player)"
+msgstr ""
+
+#: src/modplug/plugin_main.cc:55
+msgid "Channels"
+msgstr "Kanale"
+
+#: src/modplug/plugin_main.cc:59
+msgid "Nearest (fastest)"
+msgstr ""
+
+#: src/modplug/plugin_main.cc:60
+msgid "Linear (fast)"
+msgstr ""
+
+#: src/modplug/plugin_main.cc:61
+msgid "Spline (good)"
+msgstr ""
+
+#: src/modplug/plugin_main.cc:62
+msgid "Polyphase (best)"
+msgstr ""
+
+#: src/modplug/plugin_main.cc:63
+msgid "Sample rate"
+msgstr ""
+
+#: src/modplug/plugin_main.cc:64
+msgid "22 kHz"
+msgstr "22 kHz"
+
+#: src/modplug/plugin_main.cc:65
+msgid "44 kHz"
+msgstr "44 kHz"
+
+#: src/modplug/plugin_main.cc:66
+msgid "48 kHz"
+msgstr "48 kHz"
+
+#: src/modplug/plugin_main.cc:67
+msgid "96 kHz"
+msgstr "96 kHz"
+
+#: src/modplug/plugin_main.cc:71 src/modplug/plugin_main.cc:76
+#: src/modplug/plugin_main.cc:81
+msgid "Level:"
+msgstr ""
+
+#: src/modplug/plugin_main.cc:77
+msgid "Cutoff:"
+msgstr ""
+
+#: src/modplug/plugin_main.cc:90
+msgid "Reverb"
+msgstr ""
+
+#: src/modplug/plugin_main.cc:93
+msgid "Bass Boost"
+msgstr ""
+
+#: src/modplug/plugin_main.cc:96
+msgid "Surround"
+msgstr ""
+
+#: src/modplug/plugin_main.cc:99
+msgid "Preamp"
+msgstr ""
+
+#: src/modplug/plugin_main.cc:106
+msgid "Oversample"
+msgstr ""
+
+#: src/modplug/plugin_main.cc:107
+msgid "Noise reduction"
+msgstr ""
+
+#: src/modplug/plugin_main.cc:108
+msgid "Play Amiga MODs"
+msgstr ""
+
+#: src/modplug/plugin_main.cc:109
+msgid "Repeat"
+msgstr ""
+
+#: src/modplug/plugin_main.cc:110
+msgid "Repeat count:"
+msgstr ""
+
+#: src/modplug/plugin_main.cc:111
+msgid "To repeat forever, set the repeat count to -1."
+msgstr ""
+
+#: src/modplug/plugin_main.cc:124 src/sid/xs_config.cc:106
+msgid "These settings will take effect when Audacious is restarted."
+msgstr ""
+
+#: src/moonstone/main_window.cc:72 src/moonstone/main_window.cc:73
+#: src/qtui/main_window.cc:159 src/qtui/main_window.cc:160
+#: src/skins/menus.cc:107 src/skins-qt/menus.cc:98
+msgid "Stop After This Song"
+msgstr "Ndalu Pas Kësaj Kënge"
+
+#: src/moonstone/moonstone.cc:39
+msgid "Moonstone"
+msgstr ""
+
+#: src/moonstone/playlist_header.cc:212 src/qtui/playlist_header.cc:258
+msgid "Reset to Defaults"
+msgstr "Riktheji te Parazgjedhjet"
+
+#: src/moonstone/playlist_model.cc:38 src/qtui/playlist_header.cc:232
+msgid "Now Playing"
+msgstr "Po Luhet Tani"
+
+#: src/moonstone/playlist_selection.cc:66
+#: src/playlist-manager/playlist-manager.cc:201
+#: src/playlist-manager-qt/playlist-manager-qt.cc:190
+msgid "Entries"
+msgstr "Zëra"
+
+#: src/mpg123/mpg123.cc:54
+msgid "MPG123 Plugin"
+msgstr "Shtojcë MPG123"
+
+#: src/mpg123/mpg123.cc:82
+msgid "Use accurate length calculation (slow)"
+msgstr ""
+
+#: src/mpg123/mpg123.cc:260
+msgid "Surround"
+msgstr ""
+
+#: src/mpris2/plugin.cc:40
+msgid "MPRIS 2 Server"
+msgstr "Shërbyes MPRIS 2"
+
+#: src/neon/neon.cc:102
+msgid "Neon HTTP/HTTPS Plugin"
+msgstr "Shtojcë HTTP/HTTPS Neon"
+
+#: src/neon/neon.cc:526
+msgid "Error parsing redirect"
+msgstr "Gabim në përtypje ridrejtimi"
+
+#: src/neon/neon.cc:540
+msgid "Unknown HTTP error"
+msgstr "Gabim HTTP i panjohur"
+
+#: src/neon/neon.cc:614
+msgid "Error parsing URL"
+msgstr "Gabim gjatë përtypjeje URL-je"
+
+#: src/neon/neon.cc:687
+msgid "Too many redirects"
+msgstr "Shumë ridrejtime"
+
+#: src/notify/event.cc:97
+msgid "Stopped"
+msgstr "U ndal"
+
+#: src/notify/event.cc:97
+msgid "Audacious is not playing."
+msgstr "Audacious nuk po luan."
+
+#: src/notify/notify.cc:39
+msgid "Desktop Notifications"
+msgstr "Njoftime Desktopi"
+
+#: src/notify/notify.cc:57
+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 ""
+"Shtojcë Njoftimesh Desktop për Audacious\n"
+"Të drejta kopjimi (C) 2010 Maximilian Bogner\n"
+"Të drejta kopjimi (C) 2011-2013 John Lindgren dhe Jean-Alexandre Anglès "
+"d'Auriac\n"
+"\n"
+"Kjo shtojcë është software i lirë: mund ta rishpërndani dhe/ose ndryshoni "
+"sipas kushteve të licencës GNU General Public License, siç botohet nga Free "
+"Software Foundation, qoftë versioni 3 i Licencës, ose (në dëshirën tuaj) "
+"cilindo version i mëvonshëm.\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.cc:104
+msgid "Show playback controls"
+msgstr "Shfaq kontrolle luajtjeje"
+
+#: src/notify/notify.cc:106
+msgid "Always show notification"
+msgstr "Shfaqe përherë njoftime"
+
+#: src/notify/notify.cc:108
+msgid "Include album name in notification"
+msgstr "Përfshi emër albumi në njoftim"
+
+#: src/notify/notify.cc:110
+msgid "Custom notification duration:"
+msgstr "Kohëzgjatje vetjake njoftimesh:"
+
+#: src/notify/osd.cc:74
+msgid "Show"
+msgstr ""
+
+#: src/openmpt/mpt.cc:50
+msgid "OpenMPT (Module Player)"
+msgstr ""
+
+#: src/openmpt/mpt.cc:132
+msgid ""
+"Module player based on libopenmpt\n"
+"\n"
+"Written by: Chris Spiegel <cspiegel@gmail.com>"
+msgstr ""
+
+#: src/openmpt/mpt.cc:151
+msgid "Stereo separation:"
+msgstr "Ndarje stereo:"
+
+#: src/openmpt/mpt.cc:153
+msgid "% (0=mono, 100=default, 200=full)"
+msgstr ""
+
+#: src/openmpt/mpt.cc:157
+msgid "Interpolation:"
+msgstr ""
+
+#: src/openmpt/mptwrap.h:51 src/soxr/sox-resampler.cc:189 src/xsf/plugin.cc:437
+msgid "Linear"
+msgstr ""
+
+#: src/openmpt/mptwrap.h:52
+msgid "Cubic"
+msgstr ""
+
+#: src/openmpt/mptwrap.h:53
+msgid "Windowed sinc"
+msgstr ""
+
+#: src/opus/opus.cc:39
+msgid "Opus Decoder"
+msgstr ""
+
+#: src/opus/opus.cc:336
+msgid ""
+"Opus Decoder Plugin for Audacious\n"
+"Copyright 2022 Thomas Lange"
+msgstr ""
+
+#: src/oss4/oss.h:70
+msgid "OSS4 Output"
+msgstr ""
+
+#: src/oss4/oss.h:72
+msgid "OSS3 Output"
+msgstr ""
+
+#: src/oss4/plugin.cc:35
+msgid "Default device"
+msgstr "Pajisje parazgjedhje"
+
+#: src/oss4/plugin.cc:78
+msgid "Audio device:"
+msgstr "Pajisje audio:"
+
+#: src/oss4/plugin.cc:81
+msgid "Use alternate device:"
+msgstr "Përdor pajisje alternative:"
+
+#: src/oss4/plugin.cc:85
+msgid "Save volume between sessions."
+msgstr "Ruaje volumin mes sesionesh."
+
+#: src/oss4/plugin.cc:87
+msgid "Enable format conversions made by the OSS software."
+msgstr ""
+
+#: src/oss4/plugin.cc:89
+msgid "Enable exclusive mode to prevent virtual mixing."
+msgstr ""
+
+#: src/oss4/plugin.cc:101
+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/pipewire/pipewire.cc:44
+msgid "PipeWire Output"
+msgstr ""
+
+#: src/pipewire/pipewire.cc:118
+msgid ""
+"PipeWire Output Plugin for Audacious\n"
+"Copyright 2022 Thomas Lange\n"
+"\n"
+"Based on the PipeWire Output Plugin for Qmmp\n"
+"Copyright 2021 Ilya Kotov"
+msgstr ""
+
+#: src/pipewire/pipewire.cc:408 src/skins/menus.cc:88 src/skins-qt/menus.cc:79
+msgid "Playback"
+msgstr "Luajtje"
+
+#: src/playlist-manager/playlist-manager.cc:38
+#: src/playlist-manager-qt/playlist-manager-qt.cc:42
+msgid "Playlist Manager"
+msgstr "Përgjegjësi Luajlistash"
+
+#: src/playlist-manager/playlist-manager.cc:221
+#: src/playlist-manager-qt/playlist-manager-qt.cc:356
+msgid "_Remove"
+msgstr "_Hiqe"
+
+#: src/playlist-manager/playlist-manager.cc:222
+#: src/playlist-manager-qt/playlist-manager-qt.cc:351
+msgid "Ren_ame"
+msgstr ""
+
+#: src/pls/pls.cc:35
+msgid "PLS Playlists"
+msgstr "Luajlista PLS"
+
+#: src/psf/plugin.cc:53
+msgid "OpenPSF PSF1/PSF2 Decoder"
+msgstr "Shkodues OpenPSF PSF1/PSF2"
+
+#: src/psf/plugin.cc:270
+msgid "OpenPSF Configuration"
+msgstr "Formësim OpenPFS-je"
+
+#: src/psf/plugin.cc:271 src/xsf/plugin.cc:444
+msgid "Ignore length from file"
+msgstr "Shpërfille gjatësinë prej kartele"
+
+#: src/pulse/pulse_audio.cc:42
+msgid "PulseAudio Output"
+msgstr ""
+
+#: src/pulse/pulse_audio.cc:84
+msgid "Context name:"
+msgstr ""
+
+#: src/pulse/pulse_audio.cc:86
+msgid "Stream name:"
+msgstr ""
+
+#: src/pulse/pulse_audio.cc:596
+msgid ""
+"Audacious PulseAudio Output Plugin\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/qtaudio/qtaudio.cc:53
+msgid "QtMultimedia Output"
+msgstr ""
+
+#: src/qtaudio/qtaudio.cc:84
+msgid ""
+"QtMultimedia Audio Output Plugin for Audacious\n"
+"Copyright 2014 William Pitcock\n"
+"\n"
+"Based on SDL Output Plugin for Audacious\n"
+"Copyright 2010 John Lindgren"
+msgstr ""
+
+#: src/qtglspectrum/gl-spectrum.cc:41
+msgid ""
+"OpenGL Spectrum Analyzer for Audacious\n"
+"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
+"Copyright 2014, 2020 Ariadne Conill\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/qthotkey/gui.cc:177
+msgid "Press a key combination inside a text field."
+msgstr ""
+
+#: src/qthotkey/plugin.cc:105
+msgid ""
+"Global Hotkey Plugin\n"
+"Control the player with global key combinations or multimedia keys.\n"
+"\n"
+"Copyright (C) 2020 i.Dark_Templar <darktemplar@dark-templar-archives.net>\n"
+"Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n"
+"\n"
+"Contributors 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/qtui/menus.cc:109
+msgid "_Open Folder ..."
+msgstr ""
+
+#: src/qtui/menus.cc:115
+msgid "_Add Folder ..."
+msgstr ""
+
+#: src/qtui/menus.cc:128
+msgid "_Log Inspector ..."
+msgstr "Mbikëqyrës _Regjistrash …"
+
+#: src/qtui/menus.cc:220
+msgid "_Find ..."
+msgstr ""
+
+#: src/qtui/menus.cc:256 src/skins/menus.cc:80 src/skins-qt/menus.cc:70
+msgid "Audio Settings ..."
+msgstr "Rregullime Për Audion …"
+
+#: src/qtui/playlist_model.cc:188
+msgid "Q#"
+msgstr ""
+
+#: src/qtui/playlist_model.cc:190
+msgid "T#"
+msgstr ""
+
+#: src/qtui/playlist_model.cc:192
+msgid "C#"
+msgstr ""
+
+#: src/qtui/playlist_model.cc:194
+msgid "D#"
+msgstr ""
+
+#: src/qtui/qtui.cc:40
+msgid "Qt Interface"
+msgstr "Ndërfaqe Qt"
+
+#: src/qtui/search_bar.cc:46
+msgid "Search playlist"
+msgstr ""
+
+#: src/qtui/settings.cc:79
+msgid "Use bold font for column headers"
+msgstr ""
+
+#: src/resample/resample.cc:43
+msgid "Sample Rate Converter"
+msgstr ""
+
+#: src/resample/resample.cc:183
+msgid ""
+"Sample Rate Converter Plugin for Audacious\n"
+"Copyright 2010-2012 John Lindgren"
+msgstr ""
+
+#: src/resample/resample.cc:187
+msgid "Skip/repeat samples"
+msgstr ""
+
+#: src/resample/resample.cc:188
+msgid "Linear interpolation"
+msgstr ""
+
+#: src/resample/resample.cc:189
+msgid "Fast sinc interpolation"
+msgstr ""
+
+#: src/resample/resample.cc:190
+msgid "Medium sinc interpolation"
+msgstr ""
+
+#: src/resample/resample.cc:191
+msgid "Best sinc interpolation"
+msgstr ""
+
+#: src/resample/resample.cc:195
+msgid "Conversion"
+msgstr "Shndërrim"
+
+#: src/resample/resample.cc:196
+msgid "Method:"
+msgstr "Metodë:"
+
+#: src/resample/resample.cc:199 src/soxr/sox-resampler.cc:203
+msgid "Rate:"
+msgstr ""
+
+#: src/resample/resample.cc:202
+msgid "Rate Mappings"
+msgstr ""
+
+#: src/resample/resample.cc:203
+msgid "Use rate mappings"
+msgstr ""
+
+#: src/resample/resample.cc:205
+msgid "8 kHz:"
+msgstr "8 kHz:"
+
+#: src/resample/resample.cc:209
+msgid "16 kHz:"
+msgstr "16 kHz:"
+
+#: src/resample/resample.cc:213
+msgid "22.05 kHz:"
+msgstr "22.05 kHz:"
+
+#: src/resample/resample.cc:217
+msgid "32.0 kHz:"
+msgstr "32.0 kHz:"
+
+#: src/resample/resample.cc:221
+msgid "44.1 kHz:"
+msgstr "44.1 kHz:"
+
+#: src/resample/resample.cc:225
+msgid "48 kHz:"
+msgstr "48 kHz:"
+
+#: src/resample/resample.cc:229
+msgid "88.2 kHz:"
+msgstr "88.2 kHz:"
+
+#: src/resample/resample.cc:233
+msgid "96 kHz:"
+msgstr "96 kHz:"
+
+#: src/resample/resample.cc:237
+msgid "176.4 kHz:"
+msgstr "176.4 kHz:"
+
+#: src/resample/resample.cc:241
+msgid "192 kHz:"
+msgstr "192 kHz:"
+
+#: src/scrobbler2/config_window.cc:29
+msgid "Checking Last.fm access ..."
+msgstr ""
+
+#: src/scrobbler2/config_window.cc:35
+msgid ""
+"Your scrobbles are being saved on your computer temporarily. They will be "
+"submitted as soon as Audacious is allowed access."
+msgstr ""
+
+#: src/scrobbler2/config_window.cc:41
+#, c-format
+msgid "Permission granted. Scrobbling for user %s."
+msgstr ""
+
+#: src/scrobbler2/config_window.cc:44
+msgid ""
+"Permission denied. Open the following URL in a browser, allow Audacious "
+"access to your account, and then click 'Check Permission' again:"
+msgstr ""
+
+#: src/scrobbler2/config_window.cc:53
+msgid "There was a problem contacting Last.fm."
+msgstr "Pati një problem në lidhjen me Last.fm."
+
+#: src/scrobbler2/config_window.cc:92
+msgid "Check Permission"
+msgstr "Kontrolloni Leje"
+
+#: src/scrobbler2/config_window.cc:93
+msgid "Revoke Permission"
+msgstr "Shfuqizo Leje"
+
+#: src/scrobbler2/config_window.cc:97
+msgid "You need to allow Audacious to scrobble tracks to your Last.fm account."
+msgstr ""
+
+#: src/scrobbler2/scrobbler.cc:29
+msgid "Scrobbler 2.0"
+msgstr "Scrobbler 2.0"
+
+#: src/scrobbler2/scrobbler.cc:200
+msgid ""
+"The Scrobbler plugin could not be started.\n"
+"There might be a problem with your installation."
+msgstr ""
+
+#: src/scrobbler2/scrobbler.cc:245
+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."
+msgstr ""
+
+#: src/sdlout/sdlout.cc:43
+msgid "SDL Output"
+msgstr ""
+
+#: src/sdlout/sdlout.cc:72
+msgid ""
+"SDL Output Plugin for Audacious\n"
+"Copyright 2010 John Lindgren"
+msgstr ""
+
+#: src/search-tool/library.cc:35 src/search-tool/library.cc:46
+#: src/search-tool-qt/library.cc:35 src/search-tool-qt/library.cc:46
+msgid "Library"
+msgstr ""
+
+#: src/search-tool-qt/search-model.cc:44 src/search-tool/search-tool.cc:287
+#, c-format
+msgid "%d song"
+msgid_plural "%d songs"
+msgstr0 "%d këngë"
+msgstr1 "%d këngë"
+
+#: src/search-tool-qt/search-model.cc:53 src/search-tool/search-tool.cc:294
+msgid "of this genre"
+msgstr "të këtij zhanri"
+
+#: src/search-tool-qt/search-model.h:47 src/search-tool/search-model.h:45
+msgid "on"
+msgstr ""
+
+#: src/search-tool-qt/search-model.h:47 src/search-tool/search-model.h:45
+msgid "by"
+msgstr ""
+
+#: src/search-tool-qt/search-tool-qt.cc:165 src/search-tool/search-tool.cc:74
+msgid "Number of results to show:"
+msgstr "Numër përfundimesh për shfaqje:"
+
+#: src/search-tool-qt/search-tool-qt.cc:168 src/search-tool/search-tool.cc:77
+msgid "Rescan library at startup"
+msgstr ""
+
+#: src/search-tool-qt/search-tool-qt.cc:170
+msgid "Monitor library for changes"
+msgstr "Mbikëqyr fonotekën për ndryshime"
+
+#: src/search-tool-qt/search-tool-qt.cc:193 src/search-tool/search-tool.cc:450
+msgid ""
+"To import your music library into Audacious, choose a folder and then click "
+"the \"refresh\" icon."
+msgstr ""
+
+#: src/search-tool-qt/search-tool-qt.cc:195 src/search-tool/search-tool.cc:459
+msgid "Please wait ..."
+msgstr "Ju lutemi, prisni …"
+
+#: src/search-tool-qt/search-tool-qt.cc:197 src/search-tool/search-tool.cc:487
+msgid "Choose Folder"
+msgstr "Zgjidhni Dosje"
+
+#: src/search-tool-qt/search-tool-qt.cc:201 src/search-tool/search-tool.cc:445
+msgid "Search library"
+msgstr "Kërkoni në fonotekë"
+
+#: src/search-tool-qt/search-tool-qt.cc:327 src/search-tool/search-tool.cc:156
+#, c-format
+msgid "%d of %d result shown"
+msgid_plural "%d of %d results shown"
+msgstr0 ""
+msgstr1 ""
+
+#: src/search-tool-qt/search-tool-qt.cc:331 src/search-tool/search-tool.cc:160
+#, c-format
+msgid "%d result"
+msgid_plural "%d results"
+msgstr0 "%d përfundim"
+msgstr1 "%d përfundime"
+
+#: src/search-tool-qt/search-tool-qt.cc:501 src/search-tool/search-tool.cc:341
+msgid "_Create Playlist"
+msgstr ""
+
+#: src/search-tool-qt/search-tool-qt.cc:503 src/search-tool/search-tool.cc:343
+msgid "_Add to Playlist"
+msgstr ""
+
+#: src/sid/xmms-sid.cc:43
+msgid "SID Player"
+msgstr ""
+
+#: src/sid/xs_config.cc:62
+msgid "Channels:"
+msgstr "Kanale:"
+
+#: src/sid/xs_config.cc:68
+msgid "Emulation"
+msgstr ""
+
+#: src/sid/xs_config.cc:69
+msgid "Emulate MOS 8580 (default: MOS 6581)"
+msgstr ""
+
+#: src/sid/xs_config.cc:71
+msgid "Do not automatically select chip model"
+msgstr ""
+
+#: src/sid/xs_config.cc:73
+msgid "Emulate filter"
+msgstr ""
+
+#: src/sid/xs_config.cc:75
+msgid "Clock speed:"
+msgstr ""
+
+#: src/sid/xs_config.cc:78
+msgid "Do not automatically select clock speed"
+msgstr ""
+
+#: src/sid/xs_config.cc:80
+msgid "Playback time"
+msgstr ""
+
+#: src/sid/xs_config.cc:81
+msgid "Set maximum playback time:"
+msgstr ""
+
+#: src/sid/xs_config.cc:87
+msgid "Use only when song length is unknown"
+msgstr ""
+
+#: src/sid/xs_config.cc:90
+msgid "Set minimum playback time:"
+msgstr ""
+
+#: src/sid/xs_config.cc:96
+msgid "Subtunes"
+msgstr ""
+
+#: src/sid/xs_config.cc:97
+msgid "Enable subtunes"
+msgstr ""
+
+#: src/sid/xs_config.cc:99
+msgid "Ignore subtunes shorter than:"
+msgstr ""
+
+#: src/sid/xs_config.cc:105
+msgid "Note"
+msgstr ""
+
+#: src/silence-removal/silence-removal.cc:39
+msgid "Silence Removal"
+msgstr ""
+
+#: src/silence-removal/silence-removal.cc:58
+msgid ""
+"Silence Removal Plugin for Audacious\n"
+"Copyright 2014 John Lindgren"
+msgstr ""
+
+#: src/silence-removal/silence-removal.cc:67
+msgid "Silence Removal"
+msgstr ""
+
+#: src/silence-removal/silence-removal.cc:68
+msgid "Threshold:"
+msgstr "Prag:"
+
+#: src/skins/actions.cc:45 src/skins-qt/actions.cc:43
+msgid "Repeat points cleared."
+msgstr ""
+
+#: src/skins/actions.cc:60 src/skins-qt/actions.cc:58
+msgid "Repeat point A set."
+msgstr ""
+
+#: src/skins/actions.cc:65 src/skins-qt/actions.cc:63
+msgid "Repeat point B set."
+msgstr ""
+
+#: src/skins/equalizer.cc:223 src/skins-qt/equalizer.cc:223
+msgid "Preamp"
+msgstr "Paraamplifikator"
+
+#: src/skins/equalizer.cc:227 src/skins-qt/equalizer.cc:227
+msgid "31 Hz"
+msgstr "31 Hz"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "63 Hz"
+msgstr "63 Hz"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "125 Hz"
+msgstr "125 Hz"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "250 Hz"
+msgstr "250 Hz"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "500 Hz"
+msgstr "500 Hz"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "1 kHz"
+msgstr "1 kHz"
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "2 kHz"
+msgstr "2 kHz"
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "4 kHz"
+msgstr "4 kHz"
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "8 kHz"
+msgstr "8 kHz"
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "16 kHz"
+msgstr "16 kHz"
+
+#: src/skins/equalizer.cc:270 src/skins-qt/equalizer.cc:270
+msgid "Audacious Equalizer"
+msgstr "Balancues Audacious"
+
+#: src/skins/main.cc:459 src/skins-qt/main.cc:442
+msgid "Recording on"
+msgstr ""
+
+#: src/skins/main.cc:461 src/skins-qt/main.cc:444
+msgid "Recording off"
+msgstr ""
+
+#: src/skins/main.cc:754 src/skins-qt/main.cc:701
+#, c-format
+msgid "Seek to %d:%-2.2d / %d:%-2.2d"
+msgstr ""
+
+#: src/skins/main.cc:771 src/skins-qt/main.cc:718
+#, c-format
+msgid "Volume: %d%%"
+msgstr "Volum: %d%%"
+
+#: src/skins/main.cc:784 src/skins-qt/main.cc:731
+#, c-format
+msgid "Balance: %d%% left"
+msgstr "Balancë: %d%% majtas"
+
+#: src/skins/main.cc:786 src/skins-qt/main.cc:733
+msgid "Balance: center"
+msgstr "Balancë: në qendër"
+
+#: src/skins/main.cc:788 src/skins-qt/main.cc:735
+#, c-format
+msgid "Balance: %d%% right"
+msgstr "Balancë: %d%% djathtas"
+
+#: src/skins/main.cc:880 src/skins-qt/main.cc:827
+msgid "Options Menu"
+msgstr "Menu Mundësish"
+
+#: src/skins/main.cc:884 src/skins-qt/main.cc:831
+msgid "Disable 'Always On Top'"
+msgstr ""
+
+#: src/skins/main.cc:886 src/skins-qt/main.cc:833
+msgid "Enable 'Always On Top'"
+msgstr ""
+
+#: src/skins/main.cc:889 src/skins-qt/main.cc:836
+msgid "File Info Box"
+msgstr ""
+
+#: src/skins/main.cc:892 src/skins/menus.cc:149 src/skins-qt/main.cc:839
+#: src/skins-qt/menus.cc:142
+msgid "Double Size"
+msgstr ""
+
+#: src/skins/main.cc:895 src/skins-qt/main.cc:842
+msgid "Visualizations"
+msgstr "Vizualizime"
+
+#: src/skins/menus.cc:74 src/skins-qt/menus.cc:64
+msgid "Volume Up"
+msgstr "Ngrije Volumin"
+
+#: src/skins/menus.cc:75 src/skins-qt/menus.cc:65
+msgid "Volume Down"
+msgstr "Ule Volumin"
+
+#: src/skins/menus.cc:77 src/skins-qt/menus.cc:67
+msgid "Effects ..."
+msgstr "Efekte …"
+
+#: src/skins/menus.cc:84 src/skins-qt/menus.cc:74
+msgid "Open Files ..."
+msgstr "Hapni Kartela …"
+
+#: src/skins/menus.cc:85 src/skins-qt/menus.cc:76
+msgid "Open URL ..."
+msgstr "Hap URL …"
+
+#: src/skins/menus.cc:89 src/skins-qt/menus.cc:80
+msgid "Playlist"
+msgstr "Luajlistë"
+
+#: src/skins/menus.cc:90 src/skins-qt/menus.cc:81
+msgid "Output"
+msgstr "Dalje"
+
+#: src/skins/menus.cc:91 src/skins-qt/menus.cc:82
+msgid "View"
+msgstr "Parje"
+
+#: src/skins/menus.cc:93 src/skins/menus.cc:161 src/skins/menus.cc:174
+#: src/skins/menus.cc:245 src/skins-qt/menus.cc:84 src/skins-qt/menus.cc:156
+#: src/skins-qt/menus.cc:170 src/skins-qt/menus.cc:241
+msgid "Services"
+msgstr "Shërbime"
+
+#: src/skins/menus.cc:95 src/skins-qt/menus.cc:86
+msgid "About ..."
+msgstr "Mbi …"
+
+#: src/skins/menus.cc:96 src/skins-qt/menus.cc:87
+msgid "Settings ..."
+msgstr "Rregullime …"
+
+#: src/skins/menus.cc:97 src/skins-qt/menus.cc:88
+msgid "Quit"
+msgstr "Dil"
+
+#: src/skins/menus.cc:101 src/skins/menus.cc:235 src/skins-qt/menus.cc:92
+#: src/skins-qt/menus.cc:231
+msgid "Song Info ..."
+msgstr "Të dhëna Kënge …"
+
+#: src/skins/menus.cc:105 src/skins-qt/menus.cc:96
+msgid "Shuffle by Album"
+msgstr "Përzieji sipas Albumesh"
+
+#: src/skins/menus.cc:106 src/skins-qt/menus.cc:97
+msgid "No Playlist Advance"
+msgstr ""
+
+#: src/skins/menus.cc:117 src/skins-qt/menus.cc:108
+msgid "Set A-B Repeat"
+msgstr "Caktoni Përsëritje A-B"
+
+#: src/skins/menus.cc:118 src/skins-qt/menus.cc:109
+msgid "Clear A-B Repeat"
+msgstr "Spastro Përsëritje A-B"
+
+#: src/skins/menus.cc:120 src/skins-qt/menus.cc:111
+msgid "Jump to Song ..."
+msgstr ""
+
+#: src/skins/menus.cc:121 src/skins-qt/menus.cc:113
+msgid "Jump to Time ..."
+msgstr ""
+
+#: src/skins/menus.cc:125 src/skins-qt/menus.cc:118
+msgid "Play/Resume"
+msgstr ""
+
+#: src/skins/menus.cc:127 src/skins-qt/menus.cc:120
+msgid "New Playlist"
+msgstr "Luajlistë e Re"
+
+#: src/skins/menus.cc:128 src/skins-qt/menus.cc:121
+msgid "Rename Playlist ..."
+msgstr "Riemërtoni Luajlistën …"
+
+#: src/skins/menus.cc:129 src/skins-qt/menus.cc:122
+msgid "Remove Playlist"
+msgstr "Hiqe Luajlistën"
+
+#: src/skins/menus.cc:131 src/skins-qt/menus.cc:124
+msgid "Previous Playlist"
+msgstr "Luajlista e Mëparshme"
+
+#: src/skins/menus.cc:132 src/skins-qt/menus.cc:125
+msgid "Next Playlist"
+msgstr "Luajlista Pasuese"
+
+#: src/skins/menus.cc:134 src/skins-qt/menus.cc:127
+msgid "Import Playlist ..."
+msgstr "Importoni Luajlistë …"
+
+#: src/skins/menus.cc:135 src/skins-qt/menus.cc:128
+msgid "Export Playlist ..."
+msgstr "Eksportoni Luajlistë …"
+
+#: src/skins/menus.cc:137 src/skins-qt/menus.cc:130
+msgid "Playlist Manager ..."
+msgstr "Përgjegjës Luajlistash …"
+
+#: src/skins/menus.cc:138 src/skins-qt/menus.cc:131
+msgid "Queue Manager ..."
+msgstr "Përgjegjës Radhe …"
+
+#: src/skins/menus.cc:140 src/skins-qt/menus.cc:133
+msgid "Refresh Playlist"
+msgstr "Rifresko Luajlistën"
+
+#: src/skins/menus.cc:144 src/skins-qt/menus.cc:137
+msgid "Show Playlist Editor"
+msgstr "Shfaq Përpunues Luajlistash"
+
+#: src/skins/menus.cc:145 src/skins-qt/menus.cc:138
+msgid "Show Equalizer"
+msgstr "Shfaq Balancues"
+
+#: src/skins/menus.cc:147 src/skins-qt/menus.cc:140
+msgid "Show Remaining Time"
+msgstr "Shfaq Kohë të Mbetur"
+
+#: src/skins/menus.cc:150 src/skins-qt/menus.cc:143
+msgid "Always on Top"
+msgstr "Përherë në Krye"
+
+#: src/skins/menus.cc:151 src/skins-qt/menus.cc:145
+msgid "On All Workspaces"
+msgstr "Në Tërë Hapësirat e Punës"
+
+#: src/skins/menus.cc:153 src/skins-qt/menus.cc:148
+msgid "Roll Up Player"
+msgstr ""
+
+#: src/skins/menus.cc:154 src/skins-qt/menus.cc:149
+msgid "Roll Up Playlist Editor"
+msgstr ""
+
+#: src/skins/menus.cc:155 src/skins-qt/menus.cc:150
+msgid "Roll Up Equalizer"
+msgstr ""
+
+#: src/skins/menus.cc:163 src/skins-qt/menus.cc:158
+msgid "Add URL ..."
+msgstr "Shtoni URL …"
+
+#: src/skins/menus.cc:164 src/skins-qt/menus.cc:160
+msgid "Add Files ..."
+msgstr "Shtoni Kartela …"
+
+#: src/skins/menus.cc:168 src/skins/menus.cc:196 src/skins/menus.cc:212
+#: src/skins-qt/menus.cc:164 src/skins-qt/menus.cc:192
+#: src/skins-qt/menus.cc:208
+msgid "By Title"
+msgstr "Sipas Titujsh"
+
+#: src/skins/menus.cc:169 src/skins/menus.cc:203 src/skins/menus.cc:219
+#: src/skins-qt/menus.cc:165 src/skins-qt/menus.cc:199
+#: src/skins-qt/menus.cc:215
+msgid "By File Name"
+msgstr "Sipas Emrash Kartelash"
+
+#: src/skins/menus.cc:170 src/skins/menus.cc:204 src/skins/menus.cc:220
+#: src/skins-qt/menus.cc:166 src/skins-qt/menus.cc:200
+#: src/skins-qt/menus.cc:216
+msgid "By File Path"
+msgstr "Sipas Shtigjesh Kartelash"
+
+#: src/skins/menus.cc:176 src/skins-qt/menus.cc:172
+msgid "Remove All"
+msgstr "Hiqi Krejt"
+
+#: src/skins/menus.cc:177 src/skins-qt/menus.cc:173
+msgid "Clear Queue"
+msgstr "Spastro Radhën"
+
+#: src/skins/menus.cc:179 src/skins-qt/menus.cc:175
+msgid "Remove Unavailable Files"
+msgstr ""
+
+#: src/skins/menus.cc:180 src/skins-qt/menus.cc:176
+msgid "Remove Duplicates"
+msgstr "Hiq Përsëdytje"
+
+#: src/skins/menus.cc:182 src/skins-qt/menus.cc:178
+msgid "Remove Unselected"
+msgstr ""
+
+#: src/skins/menus.cc:183 src/skins-qt/menus.cc:179
+msgid "Remove Selected"
+msgstr "Hiq të Përzgjedhurën"
+
+#: src/skins/menus.cc:187 src/skins-qt/menus.cc:183
+msgid "Search and Select"
+msgstr "Kërkoni dhe Përzgjidhni"
+
+#: src/skins/menus.cc:189 src/skins-qt/menus.cc:185
+msgid "Invert Selection"
+msgstr ""
+
+#: src/skins/menus.cc:190 src/skins-qt/menus.cc:186
+msgid "Select None"
+msgstr "Mos Përzgjidh Gjë"
+
+#: src/skins/menus.cc:191 src/skins-qt/menus.cc:187
+msgid "Select All"
+msgstr "Përzgjidhi Krejt"
+
+#: src/skins/menus.cc:195 src/skins/menus.cc:211 src/skins-qt/menus.cc:191
+#: src/skins-qt/menus.cc:207
+msgid "By Track Number"
+msgstr "Sipas Numrash Pjesësh"
+
+#: src/skins/menus.cc:197 src/skins/menus.cc:213 src/skins-qt/menus.cc:193
+#: src/skins-qt/menus.cc:209
+msgid "By Artist"
+msgstr "Sipas Artistësh"
+
+#: src/skins/menus.cc:198 src/skins/menus.cc:214 src/skins-qt/menus.cc:194
+#: src/skins-qt/menus.cc:210
+msgid "By Album"
+msgstr ""
+
+#: src/skins/menus.cc:199 src/skins/menus.cc:215 src/skins-qt/menus.cc:195
+#: src/skins-qt/menus.cc:211
+msgid "By Album Artist"
+msgstr ""
+
+#: src/skins/menus.cc:200 src/skins/menus.cc:216 src/skins-qt/menus.cc:196
+#: src/skins-qt/menus.cc:212
+msgid "By Release Date"
+msgstr ""
+
+#: src/skins/menus.cc:201 src/skins/menus.cc:217 src/skins-qt/menus.cc:197
+#: src/skins-qt/menus.cc:213
+msgid "By Genre"
+msgstr ""
+
+#: src/skins/menus.cc:202 src/skins/menus.cc:218 src/skins-qt/menus.cc:198
+#: src/skins-qt/menus.cc:214
+msgid "By Length"
+msgstr ""
+
+#: src/skins/menus.cc:205 src/skins/menus.cc:221 src/skins-qt/menus.cc:201
+#: src/skins-qt/menus.cc:217
+msgid "By Custom Title"
+msgstr ""
+
+#: src/skins/menus.cc:206 src/skins/menus.cc:222 src/skins-qt/menus.cc:202
+#: src/skins-qt/menus.cc:218
+msgid "By Comment"
+msgstr ""
+
+#: src/skins/menus.cc:207 src/skins/menus.cc:223 src/skins-qt/menus.cc:203
+#: src/skins-qt/menus.cc:219
+msgid "By Disc Number"
+msgstr ""
+
+#: src/skins/menus.cc:227 src/skins-qt/menus.cc:223
+msgid "Randomize List"
+msgstr ""
+
+#: src/skins/menus.cc:228 src/skins-qt/menus.cc:224
+msgid "Reverse List"
+msgstr ""
+
+#: src/skins/menus.cc:230 src/skins-qt/menus.cc:226
+msgid "Sort Selected"
+msgstr ""
+
+#: src/skins/menus.cc:231 src/skins-qt/menus.cc:227
+msgid "Sort List"
+msgstr ""
+
+#: src/skins/menus.cc:236 src/skins-qt/menus.cc:232
+msgid "Open Containing Folder"
+msgstr "Hap Dosjen Që e Përmban"
+
+#: src/skins/menus.cc:238 src/skins-qt/menus.cc:234
+msgid "Cut"
+msgstr "Prije"
+
+#: src/skins/menus.cc:239 src/skins-qt/menus.cc:235
+msgid "Copy"
+msgstr "Kopjoje"
+
+#: src/skins/menus.cc:240 src/skins-qt/menus.cc:236
+msgid "Paste"
+msgstr "Ngjite"
+
+#: src/skins/menus.cc:241 src/skins-qt/menus.cc:237
+msgid "Paste at End"
+msgstr "Ngjite në Fund"
+
+#: src/skins/menus.cc:243 src/skins-qt/menus.cc:239
+msgid "Queue/Unqueue"
+msgstr ""
+
+#: src/skins/playlist-widget.cc:58 src/skins-qt/playlist-widget.cc:58
+#, c-format
+msgid "%s (%d of %d)"
+msgstr "%s (%d nga %d)"
+
+#: src/skins/playlistwin.cc:491 src/skins-qt/playlistwin.cc:478
+msgid "Audacious Playlist Editor"
+msgstr ""
+
+#: src/skins/plugin.cc:53 src/skins-qt/plugin.cc:65
+msgid "Winamp Classic Interface"
+msgstr ""
+
+#: src/skins-qt/menus.cc:75
+msgid "Open Folder ..."
+msgstr "Hapni Dosje …"
+
+#: src/skins-qt/menus.cc:159
+msgid "Add Folder ..."
+msgstr "Shtoni Dosje …"
+
+#: src/skins-qt/search-select.cc:62 src/skins/search-select.cc:77
+msgid "Search entries in active playlist"
+msgstr ""
+
+#: src/skins-qt/search-select.cc:70 src/skins/search-select.cc:83
+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-qt/search-select.cc:75 src/skins/search-select.cc:91
+msgid "Title:"
+msgstr "Titull:"
+
+#: src/skins-qt/search-select.cc:79 src/skins/search-select.cc:96
+msgid "Album:"
+msgstr "Album:"
+
+#: src/skins-qt/search-select.cc:82 src/skins/search-select.cc:101
+msgid "Artist:"
+msgstr "Artist:"
+
+#: src/skins-qt/search-select.cc:85 src/skins/search-select.cc:106
+msgid "File Name:"
+msgstr "Emër Kartele:"
+
+#: src/skins-qt/search-select.cc:88 src/skins/search-select.cc:134
+msgid "Clear previous selection before searching"
+msgstr ""
+
+#: src/skins-qt/search-select.cc:89 src/skins/search-select.cc:137
+msgid "Automatically toggle queue for matching entries"
+msgstr ""
+
+#: src/skins-qt/search-select.cc:90 src/skins/search-select.cc:140
+msgid "Create a new playlist with matching entries"
+msgstr ""
+
+#: src/skins-qt/search-select.cc:101 src/skins/search-select.cc:78
+msgid "Search"
+msgstr ""
+
+#: src/skins-qt/skins_cfg.cc:198 src/skins/skins_cfg.cc:182
+msgid "Player:"
+msgstr "Lojtës:"
+
+#: src/skins-qt/skins_cfg.cc:200 src/skins/skins_cfg.cc:184
+msgid "Select main player window font:"
+msgstr ""
+
+#: src/skins-qt/skins_cfg.cc:201 src/skins/skins_cfg.cc:185
+msgid "Playlist:"
+msgstr "Luajlistë:"
+
+#: src/skins-qt/skins_cfg.cc:203 src/skins/skins_cfg.cc:187
+msgid "Select playlist font:"
+msgstr ""
+
+#: src/skins-qt/skins_cfg.cc:207 src/skins/skins_cfg.cc:191
+msgid "Skin"
+msgstr "Lëkurçe"
+
+#: src/skins-qt/skins_cfg.cc:211 src/skins/skins_cfg.cc:193
+msgid "Display active titlebar when any window is focused"
+msgstr ""
+
+#: src/skins-qt/skins_cfg.cc:213 src/skins/skins_cfg.cc:195
+msgid "Fonts"
+msgstr "Shkronja"
+
+#: src/skins-qt/skins_cfg.cc:215 src/skins/skins_cfg.cc:197
+msgid "Use bitmap fonts (supports ASCII only)"
+msgstr ""
+
+#: src/skins-qt/skins_cfg.cc:217 src/skins/skins_cfg.cc:199
+msgid "Scroll song title"
+msgstr ""
+
+#: src/skins-qt/skins_cfg.cc:219 src/skins/skins_cfg.cc:201
+msgid "Scroll song title in both directions"
+msgstr ""
+
+#: src/skins-qt/skins_cfg.cc:224 src/skins/skins_cfg.cc:206
+msgid "Analyzer"
+msgstr "Analizues"
+
+#: src/skins-qt/skins_cfg.cc:225 src/skins/skins_cfg.cc:207
+msgid "Scope"
+msgstr "Fokus"
+
+#: src/skins-qt/skins_cfg.cc:226 src/skins/skins_cfg.cc:208
+msgid "Voiceprint / VU meter"
+msgstr ""
+
+#: src/skins-qt/skins_cfg.cc:227 src/skins/skins_cfg.cc:209
+msgid "Off"
+msgstr "Off"
+
+#: src/skins-qt/skins_cfg.cc:231 src/skins-qt/skins_cfg.cc:256
+#: src/skins-qt/skins_cfg.cc:262 src/skins/skins_cfg.cc:213
+#: src/skins/skins_cfg.cc:238 src/skins/skins_cfg.cc:244
+msgid "Normal"
+msgstr "Normal"
+
+#: src/skins-qt/skins_cfg.cc:232 src/skins-qt/skins_cfg.cc:257
+#: src/skins/skins_cfg.cc:214 src/skins/skins_cfg.cc:239
+msgid "Fire"
+msgstr "Zjarr"
+
+#: src/skins-qt/skins_cfg.cc:233 src/skins/skins_cfg.cc:215
+msgid "Vertical lines"
+msgstr "Vija vertikale"
+
+#: src/skins-qt/skins_cfg.cc:237 src/skins/skins_cfg.cc:219
+msgid "Lines"
+msgstr "Vija"
+
+#: src/skins-qt/skins_cfg.cc:238 src/skins/skins_cfg.cc:220
+msgid "Bars"
+msgstr "Shtylla"
+
+#: src/skins-qt/skins_cfg.cc:242 src/skins/skins_cfg.cc:224
+msgid "Slowest"
+msgstr ""
+
+#: src/skins-qt/skins_cfg.cc:243 src/skins/skins_cfg.cc:225
+msgid "Slow"
+msgstr ""
+
+#: src/skins-qt/skins_cfg.cc:244 src/skins/skins_cfg.cc:226
+#: src/soxr/sox-resampler.cc:180
+msgid "Medium"
+msgstr ""
+
+#: src/skins-qt/skins_cfg.cc:245 src/skins/skins_cfg.cc:227
+msgid "Fast"
+msgstr ""
+
+#: src/skins-qt/skins_cfg.cc:246 src/skins/skins_cfg.cc:228
+msgid "Fastest"
+msgstr ""
+
+#: src/skins-qt/skins_cfg.cc:250 src/skins/skins_cfg.cc:232
+msgid "Dots"
+msgstr "Pika"
+
+#: src/skins-qt/skins_cfg.cc:251 src/skins/skins_cfg.cc:233
+msgid "Line"
+msgstr "Vijë"
+
+#: src/skins-qt/skins_cfg.cc:252 src/skins/skins_cfg.cc:234
+msgid "Solid"
+msgstr ""
+
+#: src/skins-qt/skins_cfg.cc:258 src/skins/skins_cfg.cc:240
+msgid "Ice"
+msgstr ""
+
+#: src/skins-qt/skins_cfg.cc:263 src/skins/skins_cfg.cc:245
+msgid "Smooth"
+msgstr ""
+
+#: src/skins-qt/skins_cfg.cc:267 src/skins/skins_cfg.cc:249
+msgid "Coloring:"
+msgstr ""
+
+#: src/skins-qt/skins_cfg.cc:270 src/skins/skins_cfg.cc:252
+msgid "Style:"
+msgstr "Stil:"
+
+#: src/skins-qt/skins_cfg.cc:273 src/skins/skins_cfg.cc:255
+msgid "Falloff:"
+msgstr ""
+
+#: src/skins-qt/skins_cfg.cc:276 src/skins/skins_cfg.cc:258
+msgid "Peak falloff:"
+msgstr ""
+
+#: src/skins-qt/skins_cfg.cc:282 src/skins/skins_cfg.cc:264
+msgid "Scope Style:"
+msgstr ""
+
+#: src/skins-qt/skins_cfg.cc:285 src/skins/skins_cfg.cc:267
+msgid "Voiceprint Coloring:"
+msgstr ""
+
+#: src/skins-qt/skins_cfg.cc:288 src/skins/skins_cfg.cc:270
+msgid "VU Meter Style:"
+msgstr "Stil Matësi VU:"
+
+#: src/skins-qt/skins_cfg.cc:294 src/skins/skins_cfg.cc:276
+msgid "Type"
+msgstr "Lloj"
+
+#: src/skins-qt/skins_cfg.cc:295 src/skins/skins_cfg.cc:277
+msgid "Visualization type:"
+msgstr "Lloj vizualizimi:"
+
+#: src/skins-qt/skins_cfg.cc:298 src/skins/skins_cfg.cc:280
+msgid "Analyzer"
+msgstr "Analizues"
+
+#: src/skins-qt/skins_cfg.cc:299 src/skins/skins_cfg.cc:281
+msgid "Show peaks"
+msgstr "Shfaq kulme"
+
+#: src/skins-qt/skins_cfg.cc:308 src/skins/skins_cfg.cc:290
+msgid "Visualization"
+msgstr "Vizualizim"
+
+#: src/skins-qt/skinselector.cc:98 src/skins/skinselector.cc:111
+msgid "Archived Winamp 2.x skin"
+msgstr ""
+
+#: src/skins-qt/skinselector.cc:102 src/skins/skinselector.cc:115
+msgid "Unarchived Winamp 2.x skin"
+msgstr ""
+
+#: src/sndfile/plugin.cc:38
+msgid "Sndfile Plugin"
+msgstr ""
+
+#: src/sndfile/plugin.cc:372
+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/sndio/sndio.cc:43
+msgid "Sndio Output"
+msgstr ""
+
+#: src/sndio/sndio.cc:98
+msgid "Device (blank for default):"
+msgstr ""
+
+#: src/sndio/sndio.cc:100
+msgid "Save and restore volume:"
+msgstr ""
+
+#: src/sndio/sndio.cc:181
+#, c-format
+msgid "Sndio error: Unsupported audio format (%d)"
+msgstr ""
+
+#: src/sndio/sndio.cc:192
+msgid "Sndio error: sio_open() failed"
+msgstr ""
+
+#: src/sndio/sndio.cc:221
+msgid "Sndio error: sio_setpar() failed"
+msgstr ""
+
+#: src/sndio/sndio.cc:233
+msgid "Sndio error: sio_start() failed"
+msgstr ""
+
+#: src/songchange/song_change.cc:30
+msgid "Song Change"
+msgstr "Ndryshim Kënge"
+
+#: src/songchange/song_change.cc:256
+msgid "Commands"
+msgstr "Urdhra"
+
+#: src/songchange/song_change.cc:258
+msgid "Command to run when starting a new song:"
+msgstr ""
+
+#: src/songchange/song_change.cc:261
+msgid "Command to run when stopping a song:"
+msgstr ""
+
+#: src/songchange/song_change.cc:264
+msgid "Command to run at the end of a song:"
+msgstr "Urdhër për t’u xhiruar në fundin e një kënge:"
+
+#: src/songchange/song_change.cc:267
+msgid "Command to run at the end of the playlist:"
+msgstr "Urdhër për t’u xhiruar në fundin e luajlistës:"
+
+#: src/songchange/song_change.cc:270
+msgid "Command to run when song title changes (for network streams):"
+msgstr ""
+
+#: src/songchange/song_change.cc:273
+msgid ""
+"You can use the following format codes, which will be replaced before "
+"running the command.\n"
+"Not all are useful though for the song-stopped or end-of-playlist command."
+msgstr ""
+
+#: src/songchange/song_change.cc:276
+msgid ""
+"%a: Artist\n"
+"%b: Album\n"
+"%c: Number of channels\n"
+"%f: File name (full path)\n"
+"%F: Frequency (Hertz)\n"
+"%l: Length (milliseconds)\n"
+"%n or %s: Formatted title (see playlist settings)\n"
+"%p: Currently playing (1 or 0)\n"
+"%r: Rate (bits per second)\n"
+"%t: Playlist position\n"
+"%T: Title (unformatted)"
+msgstr ""
+
+#: src/songchange/song_change.cc:287
+msgid ""
+"Parameters passed to the shell should be enclosed in quotation marks.\n"
+"Unquoted parameters may lead to unexpected results."
+msgstr ""
+
+#: src/song-info-qt/song-info.cc:30
+msgid "Song Info"
+msgstr "Të dhëna Kënge"
+
+#: src/soxr/sox-resampler.cc:44
+msgid "SoX Resampler"
+msgstr ""
+
+#: src/soxr/sox-resampler.cc:172
+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/soxr/sox-resampler.cc:178
+msgid "Quick"
+msgstr ""
+
+#: src/soxr/sox-resampler.cc:179
+msgid "Low"
+msgstr ""
+
+#: src/soxr/sox-resampler.cc:181
+msgid "High"
+msgstr ""
+
+#: src/soxr/sox-resampler.cc:182
+msgid "Very High"
+msgstr ""
+
+#: src/soxr/sox-resampler.cc:183
+msgid "Ultra High"
+msgstr ""
+
+#: src/soxr/sox-resampler.cc:187
+msgid "Minimum"
+msgstr ""
+
+#: src/soxr/sox-resampler.cc:188
+msgid "Intermediate"
+msgstr ""
+
+#: src/soxr/sox-resampler.cc:193
+msgid "Quality:"
+msgstr "Cilësi:"
+
+#: src/soxr/sox-resampler.cc:196
+msgid "Phase:"
+msgstr "Fazë:"
+
+#: src/soxr/sox-resampler.cc:200
+msgid "Allow aliasing"
+msgstr ""
+
+#: src/soxr/sox-resampler.cc:202
+msgid "Use steep filter"
+msgstr ""
+
+#: src/speedpitch/speed-pitch.cc:54
+msgid "Speed and Pitch"
+msgstr "Shpejtësia dhe Intonimi"
+
+#: src/speedpitch/speed-pitch.cc:247
+msgid "Speed"
+msgstr ""
+
+#: src/speedpitch/speed-pitch.cc:248
+msgid "Decouple from pitch"
+msgstr ""
+
+#: src/speedpitch/speed-pitch.cc:250 src/speedpitch/speed-pitch.cc:258
+msgid "Multiplier:"
+msgstr ""
+
+#: src/speedpitch/speed-pitch.cc:254
+msgid "Pitch"
+msgstr ""
+
+#: src/statusicon-qt/statusicon.cc:45 src/statusicon/statusicon.cc:47
+msgid "Status Icon"
+msgstr "Ikonë Gjendjeje"
+
+#: src/statusicon-qt/statusicon.cc:68
+msgid ""
+"Status Icon Plugin (partial port for Qt interface)\n"
+"\n"
+"Copyright 2005-2007 Giacomo Lozito <james@develia.org>\n"
+"Copyright 2010 Michał Lipski <tallica@o2.pl>\n"
+"Copyright 2015 Eugene Paskevich <eugene@raptor.kiev.ua>\n"
+"\n"
+"This plugin provides a status icon, placed in\n"
+"the system tray area of the window manager."
+msgstr ""
+
+#: src/statusicon-qt/statusicon.cc:89 src/statusicon/statusicon.cc:384
+msgid "Mouse Scroll Action"
+msgstr ""
+
+#: src/statusicon-qt/statusicon.cc:90 src/statusicon/statusicon.cc:385
+msgid "Change volume"
+msgstr "Ndryshoni volumin"
+
+#: src/statusicon-qt/statusicon.cc:93 src/statusicon/statusicon.cc:388
+msgid "Change playing song"
+msgstr "Ndryshoni këngën që po luhet"
+
+#: src/statusicon-qt/statusicon.cc:96 src/statusicon/statusicon.cc:391
+msgid "Other Settings"
+msgstr "Rregullime të Tjera"
+
+#: src/statusicon-qt/statusicon.cc:97 src/statusicon/statusicon.cc:392
+msgid "Disable the popup window"
+msgstr "Çaktivizo dritaren flluskë"
+
+#: src/statusicon-qt/statusicon.cc:99 src/statusicon/statusicon.cc:394
+msgid "Close to the system tray"
+msgstr ""
+
+#: src/statusicon-qt/statusicon.cc:101 src/statusicon/statusicon.cc:396
+msgid "Advance in playlist when scrolling upward"
+msgstr ""
+
+#: src/statusicon-qt/statusicon.cc:116 src/statusicon/statusicon.cc:287
+msgid "Se_ttings ..."
+msgstr ""
+
+#: src/statusicon/statusicon.cc:377
+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 ""
+"Shtojcë Ikone Gjendjesh\n"
+"\n"
+"Të drejta kopjimi 2005-2007 Giacomo Lozito <james@develia.org>\n"
+"Të drejta kopjimi 2010 Michał Lipski <tallica@o2.pl>\n"
+"\n"
+"Kjo shtojcë furnizon një ikonë gjendjesh, të vendosur te\n"
+"zona e shtyllës së sistemit të përgjegjësit të dritareve."
+
+#: src/stereo_plugin/stereo.cc:19
+msgid "Extra Stereo"
+msgstr ""
+
+#: src/stereo_plugin/stereo.cc:36
+msgid ""
+"Extra Stereo Plugin\n"
+"\n"
+"By Johan Levin, 1999"
+msgstr ""
+"Shtojcë Stereo Ekstra\n"
+"\n"
+"Nga Johan Levin, 1999"
+
+#: src/stereo_plugin/stereo.cc:44
+msgid "Extra Stereo"
+msgstr "Stereo Ekstra"
+
+#: src/streamtuner/icecast-model.cc:126 src/streamtuner/shoutcast-model.cc:131
+msgid "Type"
+msgstr "Lloj"
+
+#: src/streamtuner/icecast-model.cc:132
+msgid "Current Song"
+msgstr "Kënga e Tanishme"
+
+#: src/streamtuner/icecast-model.cc:164
+msgid "Other"
+msgstr "Tjetër"
+
+#: src/streamtuner/ihr-model.cc:63
+msgid "Market"
+msgstr "Treg"
+
+#: src/streamtuner/ihr-model.cc:156
+msgid "Call Letters"
+msgstr ""
+
+#: src/streamtuner/ihr-model.cc:162
+msgid "Description"
+msgstr "Përshkrim"
+
+#: src/streamtuner/shoutcast-model.cc:128
+msgid "Listeners"
+msgstr "Dëgjues"
+
+#: src/streamtuner/shoutcast-model.cc:188
+msgid "Top 500 Stations"
+msgstr "500 Stacionet Kryesuese"
+
+#: src/streamtuner/shoutcast-model.cc:189
+msgid "Alternative"
+msgstr "Alternative"
+
+#: src/streamtuner/shoutcast-model.cc:190
+msgid "Blues"
+msgstr "Blues"
+
+#: src/streamtuner/shoutcast-model.cc:191
+msgid "Classical"
+msgstr "Klasike"
+
+#: src/streamtuner/shoutcast-model.cc:192
+msgid "Country"
+msgstr "Country"
+
+#: src/streamtuner/shoutcast-model.cc:193
+msgid "Decades"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:194
+msgid "Easy Listening"
+msgstr "Easy Listening"
+
+#: src/streamtuner/shoutcast-model.cc:195
+msgid "Electronic"
+msgstr "Elektronike"
+
+#: src/streamtuner/shoutcast-model.cc:196
+msgid "Folk"
+msgstr "Folk"
+
+#: src/streamtuner/shoutcast-model.cc:197
+msgid "Inspirational"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:198
+msgid "International"
+msgstr "Ndërkombëtare"
+
+#: src/streamtuner/shoutcast-model.cc:199
+msgid "Jazz"
+msgstr "Xhaz"
+
+#: src/streamtuner/shoutcast-model.cc:200
+msgid "Latin"
+msgstr "Latin"
+
+#: src/streamtuner/shoutcast-model.cc:201
+msgid "Metal"
+msgstr "Metal"
+
+#: src/streamtuner/shoutcast-model.cc:203
+msgid "New Age"
+msgstr "New Age"
+
+#: src/streamtuner/shoutcast-model.cc:204
+msgid "Pop"
+msgstr "Pop"
+
+#: src/streamtuner/shoutcast-model.cc:205
+msgid "Public Radio"
+msgstr "Radio Publike"
+
+#: src/streamtuner/shoutcast-model.cc:206
+msgid "R&B and Urban"
+msgstr "R&B dhe Urban"
+
+#: src/streamtuner/shoutcast-model.cc:207
+msgid "Rap"
+msgstr "Rap"
+
+#: src/streamtuner/shoutcast-model.cc:208
+msgid "Reggae"
+msgstr "Reggae"
+
+#: src/streamtuner/shoutcast-model.cc:209
+msgid "Rock"
+msgstr "Rok"
+
+#: src/streamtuner/shoutcast-model.cc:210
+msgid "Seasonal and Holiday"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:211
+msgid "Soundtracks"
+msgstr "Muzikë filmash"
+
+#: src/streamtuner/shoutcast-model.cc:212
+msgid "Talk"
+msgstr "Bisedë"
+
+#: src/streamtuner/shoutcast-model.cc:213
+msgid "Themes"
+msgstr "Tema"
+
+#: src/streamtuner/streamtuner.cc:59
+msgid "Shoutcast"
+msgstr "Shoutcast"
+
+#: src/streamtuner/streamtuner.cc:60
+msgid "Icecast"
+msgstr "Icecast"
+
+#: src/streamtuner/streamtuner.cc:71
+msgid "Stream Tuner"
+msgstr ""
+
+#: src/tonegen/tonegen.cc:45
+msgid "Tone Generator"
+msgstr "Prodhues Tonesh"
+
+#: src/tonegen/tonegen.cc:92
+#, c-format
+msgid "%s %.1f Hz"
+msgstr "%s %.1f Hz"
+
+#: src/tonegen/tonegen.cc:92
+msgid "Tone Generator: "
+msgstr "Prodhues Tonesh: "
+
+#: src/tonegen/tonegen.cc:161
+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/ui-common/dialogs-qt.cc:40
+msgid ""
+"\n"
+"(Further messages have been hidden.)"
+msgstr ""
+"\n"
+"(Mesazhet e mëtejshëm janë fshehur.)"
+
+#: src/ui-common/dialogs-qt.cc:52
+msgid "Working ..."
+msgstr "Po punohet …"
+
+#: src/ui-common/dialogs-qt.cc:73
+msgid "Information"
+msgstr "Informacion"
+
+#: src/ui-common/menu-ops-gtk.cc:132 src/ui-common/menu-ops-qt.cc:113
+#, c-format
+msgid "%s does not appear to be a valid folder."
+msgstr ""
+
+#: src/voice_removal/voice_removal.cc:28
+msgid "Voice Removal"
+msgstr "Heqje Zëri"
+
+#: src/vorbis/vorbis.cc:433
+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.h:18
+msgid "Ogg Vorbis Decoder"
+msgstr "Shkodues OGG Vorbis"
+
+#: src/vtx/info.cc:24
+#, c-format
+msgid "Details about %s"
+msgstr "Hollësi për %s"
+
+#: src/vtx/info.cc:26
+msgid ""
+"Title: %t\n"
+"Author: %a\n"
+"From: %f\n"
+"Tracker: %T\n"
+"Comment: %C\n"
+"Chip type: %c\n"
+"Stereo: %s\n"
+"Loop: %l\n"
+"Chip freq: %F\n"
+"Player Freq: %P\n"
+"Year: %y"
+msgstr ""
+
+#: src/vtx/vtx.cc:38
+msgid "VTX Decoder"
+msgstr "Shkodues VTX"
+
+#: src/vtx/vtx.cc:178
+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/vumeter-qt/vumeter_qt.cc:31
+msgid ""
+"VU Meter Plugin for Audacious\n"
+"Copyright 2017-2019 Marc Sánchez Fauste"
+msgstr ""
+
+#: src/vumeter-qt/vumeter_qt.cc:35
+msgid "VU Meter Settings"
+msgstr "Rregullime VU Meter:"
+
+#: src/vumeter-qt/vumeter_qt.cc:37
+msgid "Peak hold time:"
+msgstr ""
+
+#: src/vumeter-qt/vumeter_qt.cc:42
+msgid "Fall-off time:"
+msgstr ""
+
+#: src/vumeter-qt/vumeter_qt.cc:44
+msgid "dB/second"
+msgstr "dB/sekondë"
+
+#: src/vumeter-qt/vumeter_qt.cc:46
+msgid "Display legend"
+msgstr ""
+
+#: src/vumeter-qt/vumeter_qt.h:37
+msgid "VU Meter"
+msgstr "VU Meter"
+
+#: src/waveout/waveout.cc:43
+msgid "Win32 waveOut"
+msgstr ""
+
+#: src/waveout/waveout.cc:69
+msgid ""
+"Win32 waveOut Plugin for Audacious\n"
+"Copyright 2016 John Lindgren"
+msgstr ""
+
+#: src/wavpack/wavpack.cc:25
+msgid "WavPack Decoder"
+msgstr "Shkodues WavPack"
+
+#: src/wavpack/wavpack.cc:217
+msgid "lossy (hybrid)"
+msgstr ""
+
+#: src/wavpack/wavpack.cc:219
+msgid "lossy"
+msgstr "me humbje"
+
+#: src/wavpack/wavpack.cc:259
+msgid ""
+"Copyright 2006 William Pitcock <nenolod@nenolod.net>\n"
+"\n"
+"Some of the plugin code was by Miles Egan."
+msgstr ""
+"Të drejta kopjimi 2006 William Pitcock <nenolod@nenolod.net>\n"
+"\n"
+"Një pjesë e kodit të shtojcës qe nga Miles Egan."
+
+#: src/xsf/plugin.cc:74
+msgid "2SF Decoder"
+msgstr "Shkodues 2SF"
+
+#: src/xsf/plugin.cc:429
+msgid "32728 Hz"
+msgstr ""
+
+#: src/xsf/plugin.cc:432
+msgid "65456 Hz"
+msgstr ""
+
+#: src/xsf/plugin.cc:438
+msgid "Cosine"
+msgstr ""
+
+#: src/xsf/plugin.cc:439
+msgid "Sharp"
+msgstr ""
+
+#: src/xsf/plugin.cc:443
+msgid "XSF Configuration"
+msgstr "Formësim XSF-je"
+
+#: src/xsf/plugin.cc:445
+msgid "Default fade time:"
+msgstr ""
+
+#: src/xsf/plugin.cc:447
+msgid "Interpolation mode:"
+msgstr ""
+
+#: src/xspf/xspf.cc:95
+msgid "XML Shareable Playlists (XSPF)"
+msgstr "Listat e dëgjimit XML shareable (XSPF)"

audacious-plugins-3.6.2-gtk3.tar.bz2/po/sr.po -> audacious-plugins-4.4.1.tar.bz2/po/sr.po Changed

@@ -3,307 +3,80 @@
 # This file is distributed under the same license as the Audacious Plugins package.
 #
 # Translators:
-# Мирослав Николић <miroslavnikolic@rocketmail.com>, 2014-2015
+# Мирослав Николић <miroslavnikolic@rocketmail.com>, 2014-2015,2020,2022
+# Мирослав Николић <miroslavnikolic@rocketmail.com>, 2020,2022
 msgid ""
 msgstr ""
 "Project-Id-Version: Audacious Plugins\n"
-"Report-Msgid-Bugs-To: http://redmine.audacious-media-player.org/\n"
-"POT-Creation-Date: 2015-02-28 19:18+0100\n"
-"PO-Revision-Date: 2015-02-05 19:51+0000\n"
-"Last-Translator: Мирослав Николић <miroslavnikolic@rocketmail.com>\n"
-"Language-Team: Serbian (http://www.transifex.com/projects/p/audacious/"
+"Report-Msgid-Bugs-To: https://github.com/audacious-media-player/audacious/"
+"issues\n"
+"POT-Creation-Date: 2024-09-26 21:54+0200\n"
+"PO-Revision-Date: 2011-10-10 17:43+0000\n"
+"Last-Translator: Мирослав Николић <miroslavnikolic@rocketmail.com>, "
+"2014-2015,2020,2022\n"
+"Language-Team: Serbian (http://app.transifex.com/audacious/audacious/"
 "language/sr/)\n"
 "Language: sr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\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-raw/aac.cc:18
+#: src/aac/aac.cc:19
 msgid "AAC (Raw) Decoder"
 msgstr "ААЦ (Сирови) декодер"
 
-#: src/adplug/adplug-xmms.cc:42
+#: src/adplug/adplug-xmms.cc:70
 msgid "AdPlug (AdLib Player)"
 msgstr "Ад прикључак (АдБибл програм)"
 
-#: src/adplug/adplug-xmms.cc:156 src/modplug/modplugbmp.cc:335
-#: src/psf/plugin.cc:138 src/vtx/vtx.cc:87 src/xsf/plugin.cc:113
+#: src/adplug/adplug-xmms.cc:167 src/modplug/modplugbmp.cc:321
+#: src/psf/plugin.cc:161 src/vtx/vtx.cc:89 src/xsf/plugin.cc:204
 msgid "sequenced"
 msgstr "низовни"
 
-#: src/alarm/alarm.cc:55 src/alarm/interface.cc:82
-msgid "Alarm"
-msgstr "Аларм"
-
-#: src/alarm/alarm.cc:782
-msgid "Set Alarm ..."
-msgstr "Подеси аларм ..."
-
-#: src/alarm/alarm.cc:810
-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/interface.cc: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.cc: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.cc: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"
-" (мора да садржи .m3u проширење). Ако није дат\n"
-" списак нумера онда ће бити коришћене песме\n"
-" које се тренутно налазе на списку.\n"
-" Адреса мп3/огг тока може такође бити унешена\n"
-" овде.\n"
-"\n"
-" Подсетник:\n"
-" Приказује подсетник након искључења аларма,\n"
-" упишите подсетник у поље и штиклирајте\n"
-" квадратић ако желите да буде приказиван."
-
-#: src/alarm/interface.cc:81
-msgid "This is your wakeup call."
-msgstr "Ово је ваш позив за буђење."
-
-#: src/alarm/interface.cc:99
-msgid "Your reminder for today is..."
-msgstr "Ваш подсетник за данас је..."
-
-#: src/alarm/interface.cc:101 src/alarm/interface.cc:386
-msgid "Reminder"
-msgstr "Подсетник"
-
-#: src/alarm/interface.cc:132
-msgid "Monday"
-msgstr "Понедељак"
-
-#: src/alarm/interface.cc:132
-msgid "Tuesday"
-msgstr "Уторак"
-
-#: src/alarm/interface.cc:132
-msgid "Wednesday"
-msgstr "Среда"
-
-#: src/alarm/interface.cc:133
-msgid "Thursday"
-msgstr "Четвртак"
-
-#: src/alarm/interface.cc:133
-msgid "Friday"
-msgstr "Петак"
-
-#: src/alarm/interface.cc:133
-msgid "Saturday"
-msgstr "Субота"
-
-#: src/alarm/interface.cc:133
-msgid "Sunday"
-msgstr "Недеља"
-
-#: src/alarm/interface.cc:171 src/alarm/interface.cc:230
-#: src/alarm/interface.cc:245
-msgid "Time"
-msgstr "Време"
-
-#: src/alarm/interface.cc:178
-msgid "Alarm at (default):"
-msgstr "Активирај аларм у (основно):"
-
-#: src/alarm/interface.cc:200
-msgid "h"
-msgstr "часова"
-
-#: src/alarm/interface.cc:203
-msgid "Quiet after:"
-msgstr "Утишај након:"
-
-#: src/alarm/interface.cc:215
-msgid "hours"
-msgstr "сат(а)"
-
-#: src/alarm/interface.cc:226
-msgid "minutes"
-msgstr "минута"
-
-#: src/alarm/interface.cc:235
-msgid "Choose the days for the alarm to come on"
-msgstr "Изаберите којим данима ће се активирати аларм"
+#: src/adplug/adplug-xmms.cc:349 src/sid/xs_config.cc:61
+msgid "Output"
+msgstr "Излаз"
 
-#: src/alarm/interface.cc:242
-msgid "Day"
-msgstr "Дан"
+#: src/adplug/adplug-xmms.cc:350
+msgid "OPL Emulator:"
+msgstr "ОПЛ емулатор:"
+
+#: src/adplug/adplug-xmms.cc:353 src/amidiplug/i_configure.cc:153
+#: src/console/plugin.cc:45 src/filewriter/filewriter.cc:481
+#: src/sid/xs_config.cc:65 src/xsf/plugin.cc:446
+msgid "Sample rate:"
+msgstr "Проток узорка:"
 
-#: src/alarm/interface.cc:259 src/bs2b/plugin.cc:130
-#: src/skins/preset-list.cc:434 src/skins/preset-list.cc:440
-msgid "Default"
-msgstr "Основно"
+#: src/adplug/adplug-xmms.cc:354 src/amidiplug/i_configure.cc:155
+#: src/bs2b/plugin.cc:141 src/console/plugin.cc:47
+#: src/modplug/plugin_main.cc:77 src/resample/resample.cc:201
+#: src/resample/resample.cc:207 src/resample/resample.cc:211
+#: src/resample/resample.cc:215 src/resample/resample.cc:219
+#: src/resample/resample.cc:223 src/resample/resample.cc:227
+#: src/resample/resample.cc:231 src/resample/resample.cc:235
+#: src/resample/resample.cc:239 src/resample/resample.cc:243
+#: src/sid/xs_config.cc:67 src/soxr/sox-resampler.cc:205
+msgid "Hz"
+msgstr "Hz"
 
-#: src/alarm/interface.cc:288
-msgid "Days"
-msgstr "Дани"
-
-#: src/alarm/interface.cc:297
-msgid "Fading"
-msgstr "Ишчезавање"
-
-#: src/alarm/interface.cc:305 src/console/plugin.cc:41
-#: src/crossfade/crossfade.cc:53 src/crossfade/crossfade.cc:59
-#: src/gtkui/settings.cc:49 src/lirc/lirc.cc:397 src/sid/xs_config.cc:85
-#: src/sid/xs_config.cc:94 src/sid/xs_config.cc:103
-msgid "seconds"
-msgstr "секунде"
+#: src/adplug/adplug-xmms.cc:355 src/gtkui/settings.cc:55
+#: src/modplug/plugin_main.cc:105 src/qtui/settings.cc:85
+#: src/skins-qt/skins_cfg.cc:302 src/skins/skins_cfg.cc:284
+msgid "Miscellaneous"
+msgstr "Разно"
 
-#: src/alarm/interface.cc:312 src/alarm/interface.cc:353
-msgid "Volume"
-msgstr "Јачина"
-
-#: src/alarm/interface.cc:317
-msgid "Start at"
-msgstr "Започни при"
-
-#: src/alarm/interface.cc:333
-msgid "Final"
-msgstr "Заврши при"
-
-#: src/alarm/interface.cc:346
-msgid "Current"
-msgstr "Тренутно"
-
-#: src/alarm/interface.cc:359
-msgid "Additional Command"
-msgstr "Додатна наредба"
-
-#: src/alarm/interface.cc:365 src/alarm/interface.cc:391
-msgid "enable"
-msgstr "укључи"
-
-#: src/alarm/interface.cc:372
-msgid "Playlist (optional)"
-msgstr "Списак нумера (необавезно)"
-
-#: src/alarm/interface.cc:379
-msgid "Select a playlist"
-msgstr "Изаберите списак нумера"
-
-#: src/alarm/interface.cc:399
-msgid "Options"
-msgstr "Опције"
-
-#: src/alarm/interface.cc:404
-msgid "What do these options mean?"
-msgstr "Шта значе ове опције?"
-
-#: src/alarm/interface.cc:420
-msgid "Help"
-msgstr "Помоћ"
+#: src/adplug/adplug-xmms.cc:356
+msgid "Repeat song in endless loop"
+msgstr "Понављај песму бесконачно"
 
-#: src/albumart/albumart.cc:31
+#: src/albumart/albumart.cc:31 src/albumart-qt/albumart.cc:35
 msgid "Album Art"
 msgstr "Омот албума"
 
-#: src/albumart-qt/albumart.cc:33
-msgid "Album Art (Qt)"
-msgstr "Омот албума (Qt)"
-
-#: src/alsa/alsa.h:70
+#: src/alsa/alsa.h:64
 msgid "ALSA Output"
 msgstr "Излаз АЛСА-е"
 
@@ -315,7 +88,7 @@
 "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"
+"Прикључак АЛСА излаза за Аудацијуса\n"
 "Ауторска права 2009-2012 Џон Линдгрин\n"
 "\n"
 "Захваљујем се Вилијаму Питкоку, аутору НГ прикључка излаза АЛСА-е, чији је "
@@ -345,11 +118,11 @@
 msgid "Mixer element:"
 msgstr "Елемент мешача:"
 
-#: src/amidi-plug/amidi-plug.cc:41
+#: src/amidiplug/amidi-plug.cc:42
 msgid "AMIDI-Plug (MIDI Player)"
 msgstr "АМИДИ-Прикључак (МИДИ програм)"
 
-#: src/amidi-plug/amidi-plug.cc:437
+#: src/amidiplug/amidi-plug.cc:445
 msgid ""
 "AMIDI-Plug\n"
 "modular MIDI music player\n"
@@ -391,157 +164,161 @@
 "Тони Врун\n"
 "због одличне помоћи за алфа тестирање"
 
-#: src/amidi-plug/i_configure.cc:94
+#: src/amidiplug/i_configure.cc:94
 msgid "Override default gain:"
 msgstr "Препиши основно појачање:"
 
-#: src/amidi-plug/i_configure.cc:102
+#: src/amidiplug/i_configure.cc:102
 msgid "Override default polyphony:"
 msgstr "Препиши основну полифонију:"
 
-#: src/amidi-plug/i_configure.cc:110
+#: src/amidiplug/i_configure.cc:110
 msgid "Override default reverb:"
 msgstr "Препиши основни одјек:"
 
-#: src/amidi-plug/i_configure.cc:112 src/amidi-plug/i_configure.cc:120
+#: src/amidiplug/i_configure.cc:112 src/amidiplug/i_configure.cc:120
 msgid "On"
 msgstr "Укљ."
 
-#: src/amidi-plug/i_configure.cc:118
+#: src/amidiplug/i_configure.cc:118
 msgid "Override default chorus:"
 msgstr "Препиши основни хор:"
 
-#: src/amidi-plug/i_configure.cc:128 src/console/plugin.cc:29
+#: src/amidiplug/i_configure.cc:128 src/console/plugin.cc:29
 msgid "Playback"
 msgstr "Пуштање"
 
-#: src/amidi-plug/i_configure.cc:129
+#: src/amidiplug/i_configure.cc:129
 msgid "Transpose:"
 msgstr "Премештај:"
 
-#: src/amidi-plug/i_configure.cc:131
+#: src/amidiplug/i_configure.cc:131 src/speedpitch/speed-pitch.cc:257
 msgid "semitones"
 msgstr "полутонови"
 
-#: src/amidi-plug/i_configure.cc:132
+#: src/amidiplug/i_configure.cc:132
 msgid "Drum shift:"
 msgstr "Промена бубња:"
 
-#: src/amidi-plug/i_configure.cc:134
+#: src/amidiplug/i_configure.cc:134
 msgid "note numbers"
 msgstr "бројеви ноте"
 
-#: src/amidi-plug/i_configure.cc:135
+#: src/amidiplug/i_configure.cc:135
 msgid "Skip leading silence"
 msgstr "Прескочи водећу тишину"
 
-#: src/amidi-plug/i_configure.cc:137
+#: src/amidiplug/i_configure.cc:137
 msgid "Skip trailing silence"
 msgstr "Прескочи пратећу тишину"
 
-#: src/amidi-plug/i_configure.cc:141
+#: src/amidiplug/i_configure.cc:141
 msgid "SoundFont"
 msgstr "СаундФонт"
 
-#: src/amidi-plug/i_configure.cc:143
+#: src/amidiplug/i_configure.cc:148
 msgid "Synthesizer"
 msgstr "Синтисајзер"
 
-#: src/amidi-plug/i_configure.cc:148 src/console/plugin.cc:45
-#: src/sid/xs_config.cc:65
-msgid "Sample rate:"
-msgstr "Проток узорка:"
-
-#: src/amidi-plug/i_configure.cc:150 src/bs2b/plugin.cc:141
-#: src/console/plugin.cc:47 src/modplug/plugin_main.cc:78
-#: src/resample/resample.cc:201 src/resample/resample.cc:207
-#: src/resample/resample.cc:211 src/resample/resample.cc:215
-#: src/resample/resample.cc:219 src/resample/resample.cc:223
-#: src/resample/resample.cc:227 src/resample/resample.cc:231
-#: src/resample/resample.cc:235 src/resample/resample.cc:239
-#: src/resample/resample.cc:243 src/sid/xs_config.cc:67
-#: src/sox-resampler/sox-resampler.cc:163
-msgid "Hz"
-msgstr "Hz"
-
-#: src/amidi-plug/i_configure-fluidsynth.cc:52
+#: src/amidiplug/i_configure-fluidsynth.cc:58
+#: src/amidiplug/i_configure-fluidsynth.cc:527
 msgid "AMIDI-Plug - select SoundFont file"
 msgstr "АМИДИ прикључак — изаберите СаундФонт датотеку"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:55 src/filewriter/mp3.cc:658
+#: src/amidiplug/i_configure-fluidsynth.cc:61
 msgid "_Cancel"
 msgstr "От_кажи"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:56
+#: src/amidiplug/i_configure-fluidsynth.cc:62
 msgid "_Open"
 msgstr "От_вори"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:225 src/gtkui/columns.cc:46
+#: src/amidiplug/i_configure-fluidsynth.cc:233
+#: src/amidiplug/i_configure-fluidsynth.cc:461
 msgid "File name"
 msgstr "Назив датотеке"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:229
+#: src/amidiplug/i_configure-fluidsynth.cc:237
+#: src/amidiplug/i_configure-fluidsynth.cc:464
 msgid "Size (bytes)"
 msgstr "Величина (бајтова)"
 
-#: src/amidi-plug/i_fileinfo.cc:163
+#: src/amidiplug/i_fileinfo.cc:184
 msgid "Name:"
 msgstr "Назив:"
 
-#: src/amidi-plug/i_fileinfo.cc:181
+#: src/amidiplug/i_fileinfo.cc:202
 msgid " MIDI Info "
 msgstr " МИДИ подаци "
 
-#: src/amidi-plug/i_fileinfo.cc:195
+#: src/amidiplug/i_fileinfo.cc:216
 msgid "Format:"
 msgstr "Запис:"
 
-#: src/amidi-plug/i_fileinfo.cc:198
+#: src/amidiplug/i_fileinfo.cc:219
 msgid "Length (msec):"
 msgstr "Трајање (msec):"
 
-#: src/amidi-plug/i_fileinfo.cc:201
+#: src/amidiplug/i_fileinfo.cc:222
 msgid "No. of Tracks:"
 msgstr "Број нумера:"
 
-#: src/amidi-plug/i_fileinfo.cc:207
+#: src/amidiplug/i_fileinfo.cc:228
 msgid "variable"
 msgstr "променљиво"
 
-#: src/amidi-plug/i_fileinfo.cc:209
+#: src/amidiplug/i_fileinfo.cc:230
 msgid "BPM:"
 msgstr "БПМ:"
 
-#: src/amidi-plug/i_fileinfo.cc:217
+#: src/amidiplug/i_fileinfo.cc:238
 msgid "BPM (wavg):"
 msgstr "БПМ (wavg):"
 
-#: src/amidi-plug/i_fileinfo.cc:220
+#: src/amidiplug/i_fileinfo.cc:241
 msgid "Time Div:"
 msgstr "Див време:"
 
-#: src/amidi-plug/i_fileinfo.cc:231
+#: src/amidiplug/i_fileinfo.cc:252
 msgid " MIDI Comments and Lyrics "
 msgstr " МИДИ коментари и текстови песама "
 
-#: src/amidi-plug/i_fileinfo.cc:278
+#: src/amidiplug/i_fileinfo.cc:299
 msgid "* no comments available in this MIDI file *"
 msgstr "* нема доступних коментара у овој МИДИ датотеци *"
 
-#: src/amidi-plug/i_fileinfo.cc:290
+#: src/amidiplug/i_fileinfo.cc:311
 msgid "* no lyrics available in this MIDI file *"
 msgstr "* нема доступних текстова песама у овој МИДИ датотеци *"
 
-#: src/amidi-plug/i_fileinfo.cc:300 src/filewriter/vorbis.cc:197
-#: src/ladspa/plugin.cc:416
+#: src/amidiplug/i_fileinfo.cc:321 src/ladspa/plugin.cc:418
+#: src/ui-common/dialogs-qt.cc:32
 msgid "_Close"
 msgstr "_Затвори"
 
-#: src/amidi-plug/i_fileinfo.cc:325
+#: src/amidiplug/i_fileinfo.cc:346
 msgid " (invalid UTF-8)"
 msgstr " (неисправан УТФ-8)"
 
-#: src/aosd/aosd.cc:32
+#: src/ampache/ampache.cc:33
+msgid "Ampache Browser"
+msgstr "Ампаш прегледник"
+
+#: src/ampache/ampache.cc:46
+msgid ""
+"Ampache Browser for Audacious\n"
+"http://ampache-browser.org/\n"
+"\n"
+"Copyright (C) Róbert Čerňanský and John Lindgren\n"
+"License: GNU GPLv3"
+msgstr ""
+"Ампаш прегледник за Аудацијуса\n"
+"http://ampache-browser.org/\n"
+"\n"
+"Ауторска права © Роберт Черњански и Џон Линдгрен\n"
+"Лиценца: Гну ОЈЛв3"
+
+#: src/aosd/aosd.cc:31
 msgid ""
 "Audacious OSD\n"
 "http://www.develia.org/projects.php?p=audacious#aosd\n"
@@ -551,7 +328,7 @@
 "Based in part on Evan Martin's Ghosd library:\n"
 "http://neugierig.org/software/ghosd/"
 msgstr ""
-"НЕП Безочника\n"
+"НЕП Аудацијуса\n"
 "http://www.develia.org/projects.php?p=audacious#aosd\n"
 "\n"
 "Написао га је Ђакомо Лоцито < james@develia.org >\n"
@@ -575,130 +352,130 @@
 msgid "Concave Rectangle"
 msgstr "Удубљен правоугаоник"
 
-#: src/aosd/aosd_style.cc:69
+#: src/aosd/aosd_style.cc:69 src/openmpt/mptwrap.h:50 src/xsf/plugin.cc:436
 msgid "None"
 msgstr "Ништа"
 
-#: src/aosd/aosd_trigger.cc:50
+#: src/aosd/aosd_trigger.cc:49
 msgid "Playback Start"
 msgstr "Почетак репродукције"
 
-#: src/aosd/aosd_trigger.cc:51
+#: src/aosd/aosd_trigger.cc:50
 msgid "Triggers OSD when a playlist entry is played."
 msgstr "Приказује ОСД када почиње репродукција песме."
 
-#: src/aosd/aosd_trigger.cc:56
+#: src/aosd/aosd_trigger.cc:55
 msgid "Title Change"
 msgstr "Промена наслова"
 
-#: src/aosd/aosd_trigger.cc:57
+#: src/aosd/aosd_trigger.cc:56
 msgid "Triggers OSD when the song title changes (for internet streams)."
 msgstr "Пребацује ОСД када се промени наслов песме (за интернет токове)."
 
-#: src/aosd/aosd_trigger.cc:62
+#: src/aosd/aosd_trigger.cc:61
 msgid "Pause On"
 msgstr "Паузирање"
 
-#: src/aosd/aosd_trigger.cc:63
+#: src/aosd/aosd_trigger.cc:62
 msgid "Triggers OSD when playback is paused."
 msgstr "Приказује ОСД када је репродукција привремено заустављена."
 
-#: src/aosd/aosd_trigger.cc:68
+#: src/aosd/aosd_trigger.cc:67
 msgid "Pause Off"
 msgstr "Отпаузирање"
 
-#: src/aosd/aosd_trigger.cc:69
+#: src/aosd/aosd_trigger.cc:68
 msgid "Triggers OSD when playback is unpaused."
 msgstr "Приказује ОСД када је репродукција поново покренута."
 
-#: src/aosd/aosd_ui.cc:163
+#: src/aosd/aosd_ui.cc:204
 msgid "Placement"
 msgstr "Постављање"
 
-#: src/aosd/aosd_ui.cc:196
+#: src/aosd/aosd_ui.cc:241
 msgid "Relative X offset:"
 msgstr "Релативан хоризонтални померај:"
 
-#: src/aosd/aosd_ui.cc:203
+#: src/aosd/aosd_ui.cc:245
 msgid "Relative Y offset:"
 msgstr "Релативан вертикални померај:"
 
-#: src/aosd/aosd_ui.cc:210
+#: src/aosd/aosd_ui.cc:249
 msgid "Max OSD width:"
 msgstr "Највећа ширина приказа:"
 
-#: src/aosd/aosd_ui.cc:221
+#: src/aosd/aosd_ui.cc:281
 msgid "Multi-Monitor options"
 msgstr "Опција више монитора"
 
-#: src/aosd/aosd_ui.cc:225
+#: src/aosd/aosd_ui.cc:285
 msgid "Display OSD using:"
 msgstr "Прикажи ОСД на:"
 
-#: src/aosd/aosd_ui.cc:227
+#: src/aosd/aosd_ui.cc:287
 msgid "all monitors"
 msgstr "свим мониторима"
 
-#: src/aosd/aosd_ui.cc:230
+#: src/aosd/aosd_ui.cc:290
 #, c-format
 msgid "monitor %i"
 msgstr "на монитору бр. %i"
 
-#: src/aosd/aosd_ui.cc:282
+#: src/aosd/aosd_ui.cc:342
 msgid "Timing (ms)"
 msgstr "Време трајања (ms)"
 
-#: src/aosd/aosd_ui.cc:287
+#: src/aosd/aosd_ui.cc:347
 msgid "Display:"
 msgstr "Приказ:"
 
-#: src/aosd/aosd_ui.cc:292
+#: src/aosd/aosd_ui.cc:352
 msgid "Fade in:"
 msgstr "Појављивање:"
 
-#: src/aosd/aosd_ui.cc:297
+#: src/aosd/aosd_ui.cc:357
 msgid "Fade out:"
 msgstr "Ишчезавање:"
 
-#: src/aosd/aosd_ui.cc:361
+#: src/aosd/aosd_ui.cc:442
 msgid "Fonts"
 msgstr "Словни ликови"
 
-#: src/aosd/aosd_ui.cc:368
+#: src/aosd/aosd_ui.cc:449
 #, c-format
 msgid "Font %i:"
 msgstr "Писмо %i:"
 
-#: src/aosd/aosd_ui.cc:382
+#: src/aosd/aosd_ui.cc:466
 msgid "Shadow"
 msgstr "Сенка"
 
-#: src/aosd/aosd_ui.cc:486
+#: src/aosd/aosd_ui.cc:589
 msgid "Render Style"
 msgstr "Стил исцртавања"
 
-#: src/aosd/aosd_ui.cc:502
+#: src/aosd/aosd_ui.cc:605
 msgid "Colors"
 msgstr "Боје"
 
-#: src/aosd/aosd_ui.cc:513
+#: src/aosd/aosd_ui.cc:616
 #, c-format
 msgid "Color %i:"
 msgstr "Боја %i:"
 
-#: src/aosd/aosd_ui.cc:600
+#: src/aosd/aosd_ui.cc:714
 msgid "Enable trigger"
 msgstr "Омогући активирање"
 
-#: src/aosd/aosd_ui.cc:627
+#: src/aosd/aosd_ui.cc:741
 msgid "Event"
 msgstr "Догађај"
 
-#: src/aosd/aosd_ui.cc:655
+#: src/aosd/aosd_ui.cc:768
 msgid "Composite manager detected"
 msgstr "Откривен је композитни управник"
 
-#: src/aosd/aosd_ui.cc:662
+#: src/aosd/aosd_ui.cc:775
 msgid ""
 "Composite manager not detected;\n"
 "unless you know that you have one running, please activate a composite "
@@ -708,60 +485,56 @@
 "осим ако знате да је један већ покренут, молим покрените композитног "
 "управника јер у супротном ОСД неће радити исправно"
 
-#: src/aosd/aosd_ui.cc:670
+#: src/aosd/aosd_ui.cc:783
 msgid "Composite manager not required for fake transparency"
 msgstr "Композитни управник није потребан за лажну провидност"
 
-#: src/aosd/aosd_ui.cc:706
+#: src/aosd/aosd_ui.cc:820
 msgid "Transparency"
 msgstr "Провидност"
 
-#: src/aosd/aosd_ui.cc:712
+#: src/aosd/aosd_ui.cc:826
 msgid "Fake transparency"
 msgstr "Лажна провидност"
 
-#: src/aosd/aosd_ui.cc:714
+#: src/aosd/aosd_ui.cc:828
 msgid "Real transparency (requires X Composite Ext.)"
 msgstr "Стварна провидност (захтева Х композитно проширење)"
 
-#: src/aosd/aosd_ui.cc:756
+#: src/aosd/aosd_ui.cc:875
 msgid "Composite extension not loaded"
 msgstr "Композитно проширење није учитано"
 
-#: src/aosd/aosd_ui.cc:764
-msgid "Composite extension not available"
-msgstr "Композитно проширење није доступно"
-
-#: src/aosd/aosd_ui.cc:781
+#: src/aosd/aosd_ui.cc:892
 #, c-format
 msgid "Audacious OSD"
-msgstr "Безочник — ОСД"
+msgstr "Аудацијус — ОСД"
 
-#: src/aosd/aosd_ui.cc:844
+#: src/aosd/aosd_ui.cc:955
 msgid "Position"
 msgstr "Положај"
 
-#: src/aosd/aosd_ui.cc:849
+#: src/aosd/aosd_ui.cc:960
 msgid "Animation"
 msgstr "Анимација"
 
-#: src/aosd/aosd_ui.cc:854
+#: src/aosd/aosd_ui.cc:965
 msgid "Text"
 msgstr "Текст"
 
-#: src/aosd/aosd_ui.cc:859
+#: src/aosd/aosd_ui.cc:970
 msgid "Decoration"
 msgstr "Декорација"
 
-#: src/aosd/aosd_ui.cc:864
+#: src/aosd/aosd_ui.cc:975
 msgid "Trigger"
 msgstr "Укључивање"
 
-#: src/aosd/aosd_ui.cc:869
+#: src/aosd/aosd_ui.cc:980 src/streamtuner/shoutcast-model.cc:202
 msgid "Misc"
 msgstr "Остало"
 
-#: src/aosd/aosd_ui.cc:878
+#: src/aosd/aosd_ui.cc:989
 msgid "Test"
 msgstr "Испробај"
 
@@ -775,13 +548,85 @@
 
 #: src/audpl/audpl.cc:33
 msgid "Audacious Playlists (audpl)"
-msgstr "Безочникови спискови нумера (audpl)"
+msgstr "Аудацијусови спискови нумера (audpl)"
+
+#: src/background_music/background_music.cc:24
+msgid "Background music"
+msgstr ""
+
+#: src/background_music/background_music.cc:25
+msgid "Target level:"
+msgstr ""
+
+#: src/background_music/background_music.cc:28
+#: src/background_music/background_music.cc:33
+#: src/silence-removal/silence-removal.cc:70
+msgid "dB"
+msgstr "dB"
+
+#: src/background_music/background_music.cc:29
+msgid "Maximum amplification:"
+msgstr ""
+
+#: src/background_music/background_music.cc:34 src/mpg123/mpg123.cc:81
+msgid "Advanced"
+msgstr "Напредно"
+
+#: src/background_music/background_music.cc:36
+msgid "Slow detection weight:"
+msgstr ""
+
+#: src/background_music/background_music.cc:39
+msgid "Hint"
+msgstr ""
+
+#: src/background_music/background_music.cc:41
+msgid ""
+"Slow detection weight is the relative weight\n"
+"of a long term average detection when compared\n"
+"to the actual, faster loudness detection.\n"
+"A value of zero gives a more radio-like sound\n"
+"where soft passages get \"pulled up\" more quickly,\n"
+"a value of two makes the sound feel less compressed."
+msgstr ""
+
+#: src/background_music/background_music.cc:52
+msgid ""
+"Background Music Plugin for Audacious\n"
+"Copyright 2023;2024 Michel Fleur\n"
+"\n"
+"Controls the volume to make the sound equally loud within and between "
+"tracks.\n"
+" It uses accurate loudness measurement and tries to make the volume changes "
+"sound natural without audible peaks, yet without lowering the volume before "
+"a peak in advance."
+msgstr ""
+
+#: src/background_music/background_music.cc:61
+msgid "Background Music"
+msgstr ""
+
+#: src/bitcrusher/bitcrusher.cc:33
+msgid "Bitcrusher"
+msgstr ""
 
-#: src/blur_scope/blur_scope.cc:42
+#: src/bitcrusher/bitcrusher.cc:34
+msgid "Bit Depth:"
+msgstr ""
+
+#: src/bitcrusher/bitcrusher.cc:37
+msgid "Downsample ratio:"
+msgstr ""
+
+#: src/bitcrusher/bitcrusher.cc:48
+msgid "Bitcrusher"
+msgstr ""
+
+#: src/blur_scope/blur_scope.cc:40 src/blur_scope-qt/blur_scope.cc:45
 msgid "Color"
 msgstr "Боје"
 
-#: src/blur_scope/blur_scope.cc:58
+#: src/blur_scope/blur_scope.cc:56 src/blur_scope-qt/blur_scope.cc:158
 msgid "Blur Scope"
 msgstr "Обим замућења"
 
@@ -793,6 +638,10 @@
 msgid "Presets:"
 msgstr "Претподешавања:"
 
+#: src/bs2b/plugin.cc:130
+msgid "Default"
+msgstr "Основно"
+
 #: src/bs2b/plugin.cc:136
 msgid "Feed level:"
 msgstr "Ниво довода:"
@@ -805,15 +654,15 @@
 msgid "Cut frequency:"
 msgstr "Учестаност исецања:"
 
-#: src/cairo-spectrum/cairo-spectrum.cc:41
+#: src/cairo-spectrum/cairo-spectrum.cc:42 src/qt-spectrum/qt-spectrum.cc:107
 msgid "Spectrum Analyzer"
 msgstr "Анализатор спектра"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:72
+#: src/cdaudio/cdaudio-ng.cc:74
 msgid "Audio CD Plugin"
 msgstr "Прикључак звучног ЦД-а"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:121
+#: src/cdaudio/cdaudio-ng.cc:121
 msgid ""
 "Copyright (C) 2007-2012 Calin Crisan <ccrisan@gmail.com> and others.\n"
 "\n"
@@ -833,132 +682,132 @@
 "\n"
 "Беше то Гугл лето пројекта Кôд 2007."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:137
+#: src/cdaudio/cdaudio-ng.cc:140
 msgid "Device"
 msgstr "Уређај"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:138
+#: src/cdaudio/cdaudio-ng.cc:141
 msgid "Read speed:"
 msgstr "Брзина читања:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:141
+#: src/cdaudio/cdaudio-ng.cc:144
 msgid "Override device:"
 msgstr "Препиши уређај:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:143
+#: src/cdaudio/cdaudio-ng.cc:146
 msgid "Metadata"
 msgstr "Метаподаци"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:144
+#: src/cdaudio/cdaudio-ng.cc:147
 msgid "Use CD-Text"
 msgstr "Користи ЦД-текст"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:146
+#: src/cdaudio/cdaudio-ng.cc:150
 msgid "Use CDDB"
 msgstr "Користи ЦДБП"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:148
+#: src/cdaudio/cdaudio-ng.cc:152
 msgid "Use HTTP instead of CDDBP"
 msgstr "Користи ХТТП уместо ЦДДБП-а"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:151
+#: src/cdaudio/cdaudio-ng.cc:155
 msgid "Server:"
 msgstr "Сервер:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:155
+#: src/cdaudio/cdaudio-ng.cc:159
 msgid "Path:"
 msgstr "Путања:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:159
+#: src/cdaudio/cdaudio-ng.cc:163
 msgid "Port:"
 msgstr "Прикључник:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:246
+#: src/cdaudio/cdaudio-ng.cc:228
 msgid "Failed to initialize cdio subsystem."
 msgstr "Нисам успео да започнем цдуи подсистем."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:281
+#: src/cdaudio/cdaudio-ng.cc:260
 #, c-format
 msgid "Invalid URI %s."
 msgstr "Неисправна путања „%s“."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:283
+#: src/cdaudio/cdaudio-ng.cc:262
 #, c-format
 msgid "Track %d not found."
 msgstr "Нисам пронашао нумеру „%d“."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:285
+#: src/cdaudio/cdaudio-ng.cc:264
 #, c-format
 msgid "Track %d is a data track."
 msgstr "Нумера „%d“ је запис података."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:360
+#: src/cdaudio/cdaudio-ng.cc:339
 msgid "Error reading audio CD."
 msgstr "Грешка читања звучног диска."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:429
+#: src/cdaudio/cdaudio-ng.cc:410
 msgid "Audio CD"
 msgstr "Аудио ЦД"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:460 src/cdaudio-ng/cdaudio-ng.cc:469
+#: src/cdaudio/cdaudio-ng.cc:446 src/cdaudio/cdaudio-ng.cc:455
 #, c-format
 msgid "Failed to open CD device %s."
 msgstr "Нисам успео да отворим ЦД уређај „%s“."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:472
+#: src/cdaudio/cdaudio-ng.cc:458
 msgid "No audio capable CD drive found."
 msgstr "Нисам пронашао уређај за читање ЦД-а."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:497
+#: src/cdaudio/cdaudio-ng.cc:481
+msgid "Drive is empty."
+msgstr "Уређај је празан."
+
+#: src/cdaudio/cdaudio-ng.cc:483
+msgid "Unsupported disk type."
+msgstr "Неподржана врста диска."
+
+#: src/cdaudio/cdaudio-ng.cc:507
 msgid "Failed to finish initializing opened CD drive."
 msgstr "Нисам успео да завршим покретање отвореног ЦД уређаја."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:510
+#: src/cdaudio/cdaudio-ng.cc:520
 msgid "Failed to retrieve first/last track number."
 msgstr "Нисам успео да пронађем број прве/последње нумере."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:531
+#: src/cdaudio/cdaudio-ng.cc:541
 #, c-format
 msgid "Cannot read start/end LSN for track %d."
 msgstr "Не могу да прочитам почетак/крај ЛСН-а за нумеру „%d“."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:613
-msgid "Failed to create the cddb connection."
-msgstr "Нисам успео да направим везу са цд базом података."
+#: src/cdaudio/cdaudio-ng.cc:624
+msgid "Failed to create the CDDB connection."
+msgstr "Нисам успео да направим везу базе података ЦД-а."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:679
+#: src/cdaudio/cdaudio-ng.cc:690
 msgid "Failed to query the CDDB server"
 msgstr "Нисам успео да пропитам сервер базе података ЦД-а"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:681
+#: src/cdaudio/cdaudio-ng.cc:692
 #, c-format
 msgid "Failed to query the CDDB server: %s"
 msgstr "Нисам успео да пропитам сервер базе података ЦД-а: %s"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:705
+#: src/cdaudio/cdaudio-ng.cc:716
 #, c-format
-msgid "Failed to read the cddb info: %s"
-msgstr "Нисам успео да прочитам обавештење базе података цд-а: %s"
+msgid "Failed to read the CDDB info: %s"
+msgstr "Нисам успео да прочитам информације базе података ЦД-а: %s"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:765
-msgid "Drive is empty."
-msgstr "Уређај је празан."
-
-#: src/cdaudio-ng/cdaudio-ng.cc:767
-msgid "Unsupported disk type."
-msgstr "Неподржана врста диска."
-
-#: src/cd-menu-items/cd-menu-items.cc:35
+#: src/cd-menu-items/cd-menu-items.cc:33
 msgid "Audio CD Menu Items"
 msgstr "Ставке изборника звучног ЦД-а"
 
-#: src/cd-menu-items/cd-menu-items.cc:47
-msgid "Play CD"
-msgstr "Пусти ЦД"
-
-#: src/cd-menu-items/cd-menu-items.cc:47
-msgid "Add CD"
-msgstr "Додај ЦД"
+#: src/cd-menu-items/cd-menu-items.cc:45
+msgid "Pla_y CD"
+msgstr "_Пусти ЦД"
+
+#: src/cd-menu-items/cd-menu-items.cc:45
+msgid "_Add CD"
+msgstr "_Додај ЦД"
 
 #: src/compressor/compressor.cc:45
 msgid "Compression"
@@ -977,7 +826,7 @@
 "Dynamic Range Compression Plugin for Audacious\n"
 "Copyright 2010-2014 John Lindgren"
 msgstr ""
-"Прикључак сажимања динамичког опсега за Безочника\n"
+"Прикључак сажимања динамичког опсега за Аудацијуса\n"
 "Ауторска права 2010-2014 Џон Линдгрин"
 
 #: src/compressor/compressor.cc:64
@@ -995,7 +844,8 @@
 msgstr ""
 "Мотор конзолног музичког декодера је заснован на „Game_Music_Emu“-у 0.5.2\n"
 "Подржани формати: AY, GBS, GYM, HES, KSS, NSF, NSFE, SAP, SPC, VGM, VGZ\n"
-"Прикључак за Безочника су приредили:\n"
+"\n"
+"Прикључак за Аудацијуса су приредили:\n"
 "Вилијам Питкок <nenolod@dereferenced.org>, \n"
 "Шај Грин <gblargg@gmail.com>"
 
@@ -1015,7 +865,14 @@
 msgid "Default song length:"
 msgstr "Основно трајање песме:"
 
-#: src/console/plugin.cc:42 src/modplug/plugin_main.cc:59
+#: src/console/plugin.cc:41 src/crossfade/crossfade.cc:56
+#: src/crossfade/crossfade.cc:62 src/lirc/lirc.cc:395 src/notify/notify.cc:113
+#: src/sid/xs_config.cc:85 src/sid/xs_config.cc:94 src/sid/xs_config.cc:103
+#: src/vumeter-qt/vumeter_qt.cc:39
+msgid "seconds"
+msgstr "секунде"
+
+#: src/console/plugin.cc:42 src/modplug/plugin_main.cc:58
 msgid "Resampling"
 msgstr "Поновно узорковање"
 
@@ -1039,57 +896,83 @@
 msgid "Game Console Music Decoder"
 msgstr "Конзолни музички декодер игре"
 
-#: src/coreaudio/coreaudio.cc:50
+#: src/coreaudio/coreaudio.cc:53
 msgid "CoreAudio output"
 msgstr "Коре‑аудио излаз"
 
-#: src/coreaudio/coreaudio.cc:131
+#: src/coreaudio/coreaudio.cc:155
 msgid ""
 "CoreAudio Output Plugin for Audacious\n"
 "Copyright 2014 William Pitcock\n"
+"Copyright 2017,18 René J.V. Bertin\n"
+" (original code and code adapted from\n"
+" Apple examples, (C) Apple 2013)\n"
 "\n"
 "Based on SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
 msgstr ""
-"Прикључак Коре-аудио излаза за Безочника\n"
+"Прикључак Коре-аудио излаза за Аудацијуса\n"
 "Ауторска права 2014 Вилијам Питкок\n"
+"Ауторска права 2017,18 Рене Ж.В. Бертан\n"
+" (изворни код и код прилагођен из\n"
+" Ејпл примера, © Apple 2013)\n"
 "\n"
-"Засновано на прикључку СДЛ излаза за Безочника:\n"
-"Ауторска права 2010 Џон Линдгрин"
+"Заснован на прикључку СДЛ излаза за Аудацијуса\n"
+"Ауторска права 2010 Џон Линдгрен"
 
-#: src/coreaudio/coreaudio.cc:143
+#: src/coreaudio/coreaudio.cc:171
 msgid "Use exclusive mode"
 msgstr "Користи искључиви режим"
 
-#: src/crossfade/crossfade.cc:44
+#: src/coreaudio/coreaudio.cc:173
+msgid "Use bit perfect audio (adapt device sampling rate)"
+msgstr "Користи звук савршеног бита (прилагоди проток узорка уређаја)"
+
+#: src/crossfade/crossfade.cc:47
 msgid ""
 "Crossfade Plugin for Audacious\n"
 "Copyright 2010-2014 John Lindgren"
 msgstr ""
-"Прикључак постепеног прелаза за Безочника\n"
+"Прикључак постепеног прелаза за Аудацијуса\n"
 "Ауторска права 2010-2014 Џон Линдгрин"
 
-#: src/crossfade/crossfade.cc:48
+#: src/crossfade/crossfade.cc:51
 msgid "Crossfade"
 msgstr "Постепени прелаз"
 
-#: src/crossfade/crossfade.cc:49
+#: src/crossfade/crossfade.cc:52
 msgid "On automatic song change"
 msgstr "При самосталној промени песме"
 
-#: src/crossfade/crossfade.cc:51 src/crossfade/crossfade.cc:57
+#: src/crossfade/crossfade.cc:54 src/crossfade/crossfade.cc:60
 msgid "Overlap:"
 msgstr "Преклапање:"
 
-#: src/crossfade/crossfade.cc:55
+#: src/crossfade/crossfade.cc:58
 msgid "On seek or manual song change"
 msgstr "При премотавању или ручној промени песме"
 
-#: src/crossfade/crossfade.cc:61
+#: src/crossfade/crossfade.cc:64
+msgid "No fade in"
+msgstr ""
+
+#: src/crossfade/crossfade.cc:66
+msgid "Use S-curve fade"
+msgstr ""
+
+#: src/crossfade/crossfade.cc:68
+msgid "S-curve steepness:"
+msgstr ""
+
+#: src/crossfade/crossfade.cc:70
+msgid "(higher is steeper)"
+msgstr ""
+
+#: src/crossfade/crossfade.cc:72
 msgid "Tip"
 msgstr "Савет"
 
-#: src/crossfade/crossfade.cc:62
+#: src/crossfade/crossfade.cc:73
 msgid ""
 "For better crossfading, enable\n"
 "the Silence Removal effect."
@@ -1097,28 +980,10 @@
 "За бољи постепени прелаз, укључите\n"
 "дејство уклањања тишине."
 
-#: src/crossfade/crossfade.cc:72
+#: src/crossfade/crossfade.cc:83
 msgid "Crossfade"
 msgstr "Постепени прелаз"
 
-#: src/crossfade/crossfade.cc:161
-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.cc:168
-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/crystalizer/crystalizer.cc:31
 msgid "Crystalizer"
 msgstr "Кристализатор"
@@ -1131,60 +996,61 @@
 msgid "Crystalizer"
 msgstr "Кристализатор"
 
-#: src/cue/cue.cc:37
+#: src/cue/cue.cc:42
 msgid "Cue Sheet Plugin"
 msgstr "Прикључак „cue“ табеле"
 
-#: src/delete-files/delete-files.cc:46 src/delete-files/delete-files.cc:146
+#: src/delete-files/delete-files.cc:53 src/delete-files/delete-files.cc:215
+#: src/delete-files/delete-files.cc:230
 msgid "Delete Files"
 msgstr "Обриши датотеке"
 
-#: src/delete-files/delete-files.cc:75
+#: src/delete-files/delete-files.cc:120
+msgid "No files are selected."
+msgstr "Ниједна датотека није изабрана."
+
+#: src/delete-files/delete-files.cc:125
 #, c-format
-msgid "Error moving %s to trash: %s."
-msgstr "Грешка премештања „%s“ у смеће: %s."
+msgid "Do you want to move %s to the trash?"
+msgstr "Да ли желите да преместите „%s“ у смеће?"
 
-#: src/delete-files/delete-files.cc:86
+#: src/delete-files/delete-files.cc:126
 #, c-format
-msgid "Error deleting %s: %s."
-msgstr "Грешка брисања „%s“: %s."
+msgid "Do you want to permanently delete %s?"
+msgstr "Да ли желите трајно да уклоните „%s“?"
 
-#: src/delete-files/delete-files.cc:117
+#: src/delete-files/delete-files.cc:133
 #, c-format
-msgid "Error deleting %s: not a local file."
-msgstr "Грешка брисања „%s“: није месна датотека."
+msgid "Do you want to move %d files to the trash?"
+msgstr "Да ли желите да преместите %d датотеке у смеће?"
 
 #: src/delete-files/delete-files.cc:134
-msgid "Do you want to move the selected files to the trash?"
-msgstr "Да ли желите да преместите изабране датотеке у смеће?"
+#, c-format
+msgid "Do you want to permanently delete %d files?"
+msgstr "Да ли желите трајно да уклоните %d датотеке?"
 
-#: src/delete-files/delete-files.cc:135
-msgid "Move to Trash"
+#: src/delete-files/delete-files.cc:146
+msgid "Move to trash"
 msgstr "Премести у смеће"
 
-#: src/delete-files/delete-files.cc:140
-msgid "Do you want to permanently delete the selected files?"
-msgstr "Да ли желите трајно да обришете изабране датотеке?"
-
-#: src/delete-files/delete-files.cc:141 src/skins/preset-list.cc:411
-#: src/skins/preset-list.cc:427
+#: src/delete-files/delete-files.cc:146
 msgid "Delete"
 msgstr "Обриши"
 
-#: src/delete-files/delete-files.cc:145 src/skins/preset-browser.cc:56
-#: src/skins/preset-list.cc:307 src/skins/ui_playlist.cc:221
+#: src/delete-files/delete-files.cc:213 src/delete-files/delete-files.cc:235
+#: src/skins-qt/search-select.cc:102 src/skins/search-select.cc:78
 msgid "Cancel"
 msgstr "Откажи"
 
-#: src/delete-files/delete-files.cc:166
+#: src/delete-files/delete-files.cc:267
 msgid "Delete Selected Files"
 msgstr "Обришите изабране датотеке"
 
-#: src/delete-files/delete-files.cc:181
+#: src/delete-files/delete-files.cc:287
 msgid "Delete Method"
 msgstr "Начин брисања"
 
-#: src/delete-files/delete-files.cc:182
+#: src/delete-files/delete-files.cc:288
 msgid "Move to trash instead of deleting immediately"
 msgstr "Преместите у смеће уместо да одмах обришете"
 
@@ -1198,19 +1064,19 @@
 "Прикључак одјека\n"
 "Аутор Јохан Левин 1999\n"
 "Одјек окружења је написао Карл ван Шаик, 1999\n"
-"За Безочника су га освежили Вилијам Питкок и Џон Линдгрен, 2010-2014"
+"За Аудацијуса су га освежили Вилијам Питкок и Џон Линдгрен, 2010-2014"
 
 #: src/echo_plugin/echo.cc:21
 msgid "Echo"
 msgstr "Одјек"
 
-#: src/echo_plugin/echo.cc:22 src/modplug/plugin_main.cc:73
-#: src/modplug/plugin_main.cc:83
+#: src/echo_plugin/echo.cc:22 src/modplug/plugin_main.cc:72
+#: src/modplug/plugin_main.cc:82
 msgid "Delay:"
 msgstr "Застој:"
 
-#: src/echo_plugin/echo.cc:24 src/modplug/plugin_main.cc:73
-#: src/modplug/plugin_main.cc:83
+#: src/echo_plugin/echo.cc:24 src/modplug/plugin_main.cc:72
+#: src/modplug/plugin_main.cc:82 src/xsf/plugin.cc:445
 msgid "ms"
 msgstr "ms"
 
@@ -1218,7 +1084,7 @@
 msgid "Feedback:"
 msgstr "Одзив:"
 
-#: src/echo_plugin/echo.cc:28 src/modplug/plugin_main.cc:87
+#: src/echo_plugin/echo.cc:28 src/modplug/plugin_main.cc:86
 msgid "Volume:"
 msgstr "Јачина звука:"
 
@@ -1226,11 +1092,11 @@
 msgid "Echo"
 msgstr "Одјек"
 
-#: src/ffaudio/ffaudio-core.cc:41
+#: src/ffaudio/ffaudio-core.cc:50
 msgid "FFmpeg Plugin"
 msgstr "Прикључак ФФмпег-а"
 
-#: src/ffaudio/ffaudio-core.cc:571
+#: src/ffaudio/ffaudio-core.cc:649
 msgid ""
 "Multi-format audio decoding plugin for Audacious using\n"
 "FFmpeg multimedia framework (http://www.ffmpeg.org/)\n"
@@ -1239,256 +1105,328 @@
 "William Pitcock <nenolod@nenolod.net>\n"
 "Matti Hämäläinen <ccr@tnsp.org>"
 msgstr ""
-"Прикључак декодирања вишеобликног звука за Безочника који користи\n"
+"Прикључак декодирања вишеобликног звука за Аудацијуса који користи\n"
 "вишемедијски радни оквир ФФмпег-а (http://www.ffmpeg.org/)\n"
 "\n"
-"Прикључак за Безочника су приредили:\n"
+"Прикључак за Аудацијуса су приредили:\n"
 "Вилијам Питкок <nenolod@nenolod.net>\n"
 "Мати Хамалајнен <ccr@tnsp.org>"
 
-#: src/filewriter/filewriter.cc:45
+#: src/filewriter/filewriter.cc:48
 msgid "FileWriter Plugin"
 msgstr "Прикључак записивања датотека"
 
-#: src/filewriter/filewriter.cc:386
+#: src/filewriter/filewriter.cc:316
+#, c-format
+msgid ""
+"Error opening %s:\n"
+"%s"
+msgstr ""
+"Грешка отварања „%s“:\n"
+"%s"
+
+#: src/filewriter/filewriter.cc:358
+msgid ""
+"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 ""
+"Овај програм је слободан софтвер; можете га расподељивати и/или мењати под "
+"условима Гнуове опште јавне лиценце коју је објавила Задужбина слободног "
+"софтвера; издања 2 лиценце или (по вашем избору) било којег новијег издања.\n"
+"\n"
+"Овај програм се расподељује у нади да ће бити користан, али БЕЗ ИКАКВЕ "
+"ГАРАНЦИЈЕ; чак и без примењене гаранције ТРЖИШНЕ ВРЕДНОСТИ или "
+"ПРИЛАГОЂЕНОСТИ ОДРЕЂЕНОЈ НАМЕНИ. Погледајте Гнуову Општу јавну лиценцу за "
+"више детаља.\n"
+"\n"
+"Требали сте да примите примерак Гнуове Опште јавне лиценце уз овај програм. "
+"Ако нисте, пишите Задужбини слободног софтвера на адресу: „Free Software "
+"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, "
+"USA“."
+
+#: src/filewriter/filewriter.cc:385
 msgid "Output file format:"
 msgstr "Формат излазне датотеке:"
 
-#: src/filewriter/filewriter.cc:403
-msgid "Configure"
-msgstr "Подеси"
-
-#: src/filewriter/filewriter.cc:413
+#: src/filewriter/filewriter.cc:389
 msgid "Save into original directory"
 msgstr "Сачувај у оригиналном директоријуму"
 
-#: src/filewriter/filewriter.cc:417
-msgid "Save into custom directory"
-msgstr "Сачувај у произвољном директоријуму"
-
-#: src/filewriter/filewriter.cc:427
-msgid "Output file folder:"
-msgstr "Фасцикла излазне датотеке:"
-
-#: src/filewriter/filewriter.cc:431
-msgid "Pick a folder"
-msgstr "Изаберите фасциклу"
+#: src/filewriter/filewriter.cc:392
+msgid "Save into custom directory:"
+msgstr "Сачувај у произвољном директоријуму:"
 
-#: src/filewriter/filewriter.cc:444
+#: src/filewriter/filewriter.cc:400
 msgid "Generate file name from:"
 msgstr "Створи назив датотеке из:"
 
-#: src/filewriter/filewriter.cc:448
-msgid "Original file tag"
-msgstr "Изворне ознаке датотеке"
-
-#: src/filewriter/filewriter.cc:453
+#: src/filewriter/filewriter.cc:401
 msgid "Original file name"
 msgstr "Изворног назива датотеке"
 
-#: src/filewriter/filewriter.cc:459
-msgid "Include original file name extension"
-msgstr "Укључи проширење изворног назива датотеке"
+#: src/filewriter/filewriter.cc:404
+msgid "Original file name (no suffix)"
+msgstr "Изворног назива датотеке (без суфикса)"
+
+#: src/filewriter/filewriter.cc:407
+msgid "Original file tag"
+msgstr "Изворне ознаке датотеке"
 
-#: src/filewriter/filewriter.cc:468
+#: src/filewriter/filewriter.cc:411
 msgid "Prepend track number to file name"
 msgstr "Стави број нумере назива датотеке"
 
-#: src/filewriter/filewriter.cc:484
-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"
-"и мењати под условима ГНУ-ове опште јавне лиценце\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/mp3.cc:40 src/filewriter/mp3.cc:717
+#: src/filewriter/filewriter.cc:417 src/filewriter/filewriter.cc:449
 msgid "Auto"
 msgstr "Самостално"
 
-#: src/filewriter/mp3.cc:40
+#: src/filewriter/filewriter.cc:418
+msgid "8000 Hz"
+msgstr "8000 Hz"
+
+#: src/filewriter/filewriter.cc:419
+msgid "11025 Hz"
+msgstr "11025 Hz"
+
+#: src/filewriter/filewriter.cc:420
+msgid "12000 Hz"
+msgstr "12000 Hz"
+
+#: src/filewriter/filewriter.cc:421
+msgid "16000 Hz"
+msgstr "16000 Hz"
+
+#: src/filewriter/filewriter.cc:422
+msgid "22050 Hz"
+msgstr "22050 Hz"
+
+#: src/filewriter/filewriter.cc:423
+msgid "24000 Hz"
+msgstr "24000 Hz"
+
+#: src/filewriter/filewriter.cc:424
+msgid "32000 Hz"
+msgstr "32000 Hz"
+
+#: src/filewriter/filewriter.cc:425 src/xsf/plugin.cc:430
+msgid "44100 Hz"
+msgstr "44100 Hz"
+
+#: src/filewriter/filewriter.cc:426 src/xsf/plugin.cc:431
+msgid "48000 Hz"
+msgstr "48000 Hz"
+
+#: src/filewriter/filewriter.cc:430
+msgid "8 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:431
+msgid "16 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:432
+msgid "32 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:433
+msgid "40 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:434
+msgid "48 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:435
+msgid "56 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:436
+msgid "64 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:437
+msgid "80 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:438
+msgid "96 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:439
+msgid "112 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:440
+msgid "128 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:441
+msgid "160 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:442
+msgid "192 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:443
+msgid "224 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:444
+msgid "256 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:445
+msgid "320 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:450
 msgid "Joint Stereo"
 msgstr "Удружени стерео"
 
-#: src/filewriter/mp3.cc:41 src/modplug/plugin_main.cc:58
-#: src/mpg123/mpg123.cc:248
+#: src/filewriter/filewriter.cc:451 src/modplug/plugin_main.cc:57
+#: src/mpg123/mpg123.cc:259
 msgid "Stereo"
 msgstr "Стерео"
 
-#: src/filewriter/mp3.cc:41 src/modplug/plugin_main.cc:57
-#: src/mpg123/mpg123.cc:248
+#: src/filewriter/filewriter.cc:452 src/modplug/plugin_main.cc:56
+#: src/mpg123/mpg123.cc:260
 msgid "Mono"
 msgstr "Моно"
 
-#: src/filewriter/mp3.cc:657
-msgid "MP3 Configuration"
-msgstr "МП3 подешавања"
-
-#: src/filewriter/mp3.cc:658
-msgid "_OK"
-msgstr "У _реду"
+#: src/filewriter/filewriter.cc:456
+msgid "VBR"
+msgstr "ППБ"
+
+#: src/filewriter/filewriter.cc:457
+msgid "ABR"
+msgstr "СПБ"
 
-#: src/filewriter/mp3.cc:681
-msgid "Algorithm Quality:"
+#: src/filewriter/filewriter.cc:478
+msgid "Algorithm quality:"
 msgstr "Квалитет алгоритма:"
 
-#: src/filewriter/mp3.cc:706
-msgid "Output Sample Rate:"
-msgstr "Излазни проток узорка:"
-
-#: src/filewriter/mp3.cc:733
-msgid "(Hz)"
-msgstr "(Hz)"
-
-#: src/filewriter/mp3.cc:740
-msgid "Bitrate / Compression Ratio:"
-msgstr "Проток бита / Однос сажимања:"
-
-#: src/filewriter/mp3.cc:764
-msgid "Bitrate (kbps):"
-msgstr "Проток бита (kbps):"
+#: src/filewriter/filewriter.cc:484
+msgid "Bitrate:"
+msgstr "Битски проток:"
 
-#: src/filewriter/mp3.cc:796
+#: src/filewriter/filewriter.cc:491
 msgid "Compression ratio:"
 msgstr "Однос сажимања:"
 
-#: src/filewriter/mp3.cc:820
-msgid "Audio Mode:"
+#: src/filewriter/filewriter.cc:498
+msgid "Audio mode:"
 msgstr "Режим звука:"
 
-#: src/filewriter/mp3.cc:845
-msgid "Miscellaneous:"
-msgstr "Разно:"
-
-#: src/filewriter/mp3.cc:856
+#: src/filewriter/filewriter.cc:501
 msgid "Enforce strict ISO compliance"
 msgstr "Приморај изричиту ИСО сагласност"
 
-#: src/filewriter/mp3.cc:867
+#: src/filewriter/filewriter.cc:503
 msgid "Error protection"
 msgstr "Грешка заштите"
 
-#: src/filewriter/mp3.cc:879 src/filewriter/vorbis.cc:206
-msgid "Quality"
-msgstr "Квалитет"
-
-#: src/filewriter/mp3.cc:888
+#: src/filewriter/filewriter.cc:508
 msgid "Enable VBR/ABR"
 msgstr "Укључи ППБ/СПБ"
 
-#: src/filewriter/mp3.cc:898
+#: src/filewriter/filewriter.cc:510
 msgid "Type:"
 msgstr "Врста:"
 
-#: src/filewriter/mp3.cc:931
-msgid "VBR Options:"
-msgstr "Опције ППБ-а:"
-
-#: src/filewriter/mp3.cc:947
-msgid "Minimum bitrate (kbps):"
-msgstr "Најмањи проток бита (kb/s):"
-
-#: src/filewriter/mp3.cc:973
-msgid "Maximum bitrate (kbps):"
-msgstr "Највећи проток бита (kb/s):"
-
-#: src/filewriter/mp3.cc:995
-msgid "Strictly enforce minimum bitrate"
-msgstr "Строго спроведи најмањи проток бита"
-
-#: src/filewriter/mp3.cc:1007
-msgid "ABR Options:"
-msgstr "Опције СПБ-а:"
-
-#: src/filewriter/mp3.cc:1017
-msgid "Average bitrate (kbps):"
-msgstr "Средњи проток бита (kb/s):"
+#: src/filewriter/filewriter.cc:514
+msgid "Minimum bitrate:"
+msgstr "Најмањи проток бита:"
+
+#: src/filewriter/filewriter.cc:518
+msgid "Maximum bitrate:"
+msgstr "Највећи проток бита:"
+
+#: src/filewriter/filewriter.cc:522
+msgid "Average bitrate:"
+msgstr "Просечни проток бита:"
 
-#: src/filewriter/mp3.cc:1044
+#: src/filewriter/filewriter.cc:526
 msgid "VBR quality level:"
 msgstr "Ниво квалитета ППБ-а:"
 
-#: src/filewriter/mp3.cc:1063
+#: src/filewriter/filewriter.cc:530
+msgid "Strictly enforce minimum bitrate"
+msgstr "Строго спроведи најмањи проток бита"
+
+#: src/filewriter/filewriter.cc:533
 msgid "Omit Xing VBR header"
 msgstr "Изостави Иксинг заглавље ППБ-а"
 
-#: src/filewriter/mp3.cc:1076
-msgid "VBR/ABR"
-msgstr "ППБ/СПБ"
-
-#: src/filewriter/mp3.cc:1085
-msgid "Frame Parameters:"
-msgstr "Параметри кадра:"
+#: src/filewriter/filewriter.cc:539
+msgid "Frame Headers"
+msgstr "Заглавља кадра"
 
-#: src/filewriter/mp3.cc:1097
+#: src/filewriter/filewriter.cc:540
 msgid "Mark as copyright"
 msgstr "Означи као ауторско право"
 
-#: src/filewriter/mp3.cc:1108
+#: src/filewriter/filewriter.cc:542
 msgid "Mark as original"
 msgstr "Означи као оригинал"
 
-#: src/filewriter/mp3.cc:1120
-msgid "ID3 Parameters:"
-msgstr "ИД3 параметри:"
+#: src/filewriter/filewriter.cc:544
+msgid "ID3 Tags"
+msgstr "ИД3 ознаке"
 
-#: src/filewriter/mp3.cc:1131
+#: src/filewriter/filewriter.cc:545
 msgid "Force addition of version 2 tag"
 msgstr "Присили додавање ознаке издања 2"
 
-#: src/filewriter/mp3.cc:1141
+#: src/filewriter/filewriter.cc:547
 msgid "Only add v1 tag"
 msgstr "Додај само в1 ознаку"
 
-#: src/filewriter/mp3.cc:1148
+#: src/filewriter/filewriter.cc:549
 msgid "Only add v2 tag"
 msgstr "Додај само в2 ознаку"
 
-#: src/filewriter/mp3.cc:1169
+#: src/filewriter/filewriter.cc:554
+msgid "Quality"
+msgstr "Квалитет"
+
+#: src/filewriter/filewriter.cc:555
+msgid "VBR/ABR"
+msgstr "ППБ/СПБ"
+
+#: src/filewriter/filewriter.cc:556
 msgid "Tags"
 msgstr "Ознаке"
 
-#: src/filewriter/vorbis.cc:196
-msgid "Vorbis Encoder Configuration"
-msgstr "Подешавање Ворбис шифрера"
-
-#: src/filewriter/vorbis.cc:219
-msgid "Quality level (0 - 10):"
-msgstr "Ниво квалитета (0 — 10):"
+#: src/filewriter/filewriter.cc:566
+msgid "Quality (0-1):"
+msgstr "Квалитет (0-1):"
+
+#: src/filewriter/filewriter.cc:573 src/skins-qt/skins_cfg.cc:307
+#: src/skins/skins_cfg.cc:289
+msgid "General"
+msgstr "Опште"
 
-#: src/flacng/flacng.h:35
+#: src/flac/flacng.h:36
 msgid "FLAC Decoder"
 msgstr "ФЛАЦ декодер"
 
-#: src/flacng/metadata.cc:351 src/wavpack/wavpack.cc:209
+#: src/flac/metadata.cc:296 src/wavpack/wavpack.cc:215
 msgid "lossless"
 msgstr "без губитака"
 
-#: src/flacng/plugin.cc:169
+#: src/flac/plugin.cc:214
 msgid ""
 "Original code by\n"
 "Ralf Ertzinger <ralf@skytale.net>\n"
@@ -1505,22 +1443,22 @@
 "GIO Plugin for Audacious\n"
 "Copyright 2009-2012 John Lindgren"
 msgstr ""
-"ГУИ прикључак за Безочника\n"
+"ГУИ прикључак за Аудацијуса\n"
 "Ауторска права 2009-2012 Џон Линдгрин"
 
 #: src/gio/gio.cc:42
 msgid "GIO Plugin"
 msgstr "ГУИ прикључак"
 
-#: src/gio/gio.cc:153
+#: src/gio/gio.cc:152
 msgid "Read-and-append mode not supported"
 msgstr "Режим читај-и-прикачи није подржан"
 
-#: src/gio/gio.cc:166
+#: src/gio/gio.cc:165
 msgid "Invalid open mode"
 msgstr "Неисправан режим отварања"
 
-#: src/gl-spectrum/gl-spectrum.cc:51
+#: src/glspectrum/gl-spectrum.cc:52
 msgid ""
 "OpenGL Spectrum Analyzer for Audacious\n"
 "Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
@@ -1531,7 +1469,7 @@
 "\n"
 "License: GPLv2+"
 msgstr ""
-"ОпенГЛ анализатор спектра за Безочника\n"
+"ОпенГЛ анализатор спектра за Аудацијуса\n"
 "Ауторска права 2013 Кристоф Буде, Џон Линдгрин, и Карло Брамини\n"
 "\n"
 "Засновано на ИКсММС прикључку:\n"
@@ -1540,522 +1478,650 @@
 "\n"
 "Дозвола: ОЈЛв2+"
 
-#: src/gl-spectrum/gl-spectrum.cc:62
+#: src/glspectrum/gl-spectrum.cc:63 src/qtglspectrum/gl-spectrum.cc:53
 msgid "OpenGL Spectrum Analyzer"
 msgstr "ОпенГЛ Анализатор спектра"
 
-#: src/gl-spectrum-qt/gl-spectrum.cc:41
-msgid ""
-"OpenGL Spectrum Analyzer for Audacious\n"
-"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
-"Copyright 2014 William Pitcock\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 ""
-"ОпенГЛ анализатор спектра за Безочника\n"
-"Ауторска права 2013 Кристоф Буде, Џон Линдгрин, и Карло Брамини\n"
-"Ауторска права 2014 Вилијам Питкок\n"
-"\n"
-"Засновано на ИКсММС прикључку:\n"
-"Ауторска права 1998-2000 Питер Алм, Мајкол Алм, Оле Халнас, Томас Нилсон, и "
-"4Фронт Технологије\n"
-"\n"
-"Дозвола: ОЈЛв2+"
-
-#: src/gl-spectrum-qt/gl-spectrum.cc:53
-msgid "OpenGL Spectrum Analyzer (Qt)"
-msgstr "ОпенГЛ Анализатор спектра (Qt)"
-
-#: src/gnomeshortcuts/gnomeshortcuts.cc:38
-msgid "GNOME Shortcuts"
-msgstr "Гномове пречице"
-
-#: src/gnomeshortcuts/gnomeshortcuts.cc:54
-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/gtkui/columns.cc:35
-msgid "Entry number"
+#: src/gtkui/columns.cc:36 src/moonstone/playlist_model.cc:38
+#: src/qtui/playlist_model.cc:33
+msgid "Entry Number"
 msgstr "Број ставке"
 
-#: src/gtkui/columns.cc:36 src/playlist-manager/playlist-manager.cc:225
-#: src/qtui/playlist_model.cc:123
+#: src/gtkui/columns.cc:37 src/moonstone/playlist_model.cc:38
+#: src/moonstone/playlist_selection.cc:64
+#: src/playlist-manager/playlist-manager.cc:200
+#: src/playlist-manager-qt/playlist-manager-qt.cc:188
+#: src/qtui/playlist_model.cc:33 src/streamtuner/icecast-model.cc:120
+#: src/streamtuner/ihr-model.cc:159 src/streamtuner/shoutcast-model.cc:122
 msgid "Title"
 msgstr "Наслов"
 
-#: src/gtkui/columns.cc:37 src/qtui/playlist_model.cc:125
+#: src/gtkui/columns.cc:38 src/moonstone/playlist_model.cc:39
+#: src/qtui/playlist_model.cc:33
 msgid "Artist"
 msgstr "Извођач"
 
-#: src/gtkui/columns.cc:38
+#: src/gtkui/columns.cc:39 src/moonstone/playlist_model.cc:39
+#: src/qtui/playlist_model.cc:33
 msgid "Year"
 msgstr "Година"
 
-#: src/gtkui/columns.cc:39 src/qtui/playlist_model.cc:127
+#: src/gtkui/columns.cc:40 src/moonstone/playlist_model.cc:39
+#: src/qtui/playlist_model.cc:34
 msgid "Album"
 msgstr "Албум"
 
-#: src/gtkui/columns.cc:40
-msgid "Album artist"
+#: src/gtkui/columns.cc:41 src/moonstone/playlist_model.cc:40
+#: src/qtui/playlist_model.cc:34
+msgid "Album Artist"
 msgstr "Извођач албума"
 
-#: src/gtkui/columns.cc:41
+#: src/gtkui/columns.cc:42 src/moonstone/playlist_model.cc:40
+#: src/qtui/playlist_model.cc:34
 msgid "Track"
 msgstr "Нумера"
 
-#: src/gtkui/columns.cc:42
+#: src/gtkui/columns.cc:43 src/moonstone/playlist_model.cc:40
+#: src/qtui/playlist_model.cc:34 src/streamtuner/icecast-model.cc:123
+#: src/streamtuner/shoutcast-model.cc:125
+#: src/streamtuner/shoutcast-model.cc:236
 msgid "Genre"
 msgstr "Жанр"
 
-#: src/gtkui/columns.cc:43
-msgid "Queue position"
+#: src/gtkui/columns.cc:44 src/moonstone/playlist_model.cc:41
+#: src/qtui/playlist_model.cc:35
+msgid "Queue Position"
 msgstr "Положај колоне"
 
-#: src/gtkui/columns.cc:44
+#: src/gtkui/columns.cc:45 src/moonstone/playlist_model.cc:41
+#: src/qtui/playlist_model.cc:35
 msgid "Length"
 msgstr "Трајање"
 
-#: src/gtkui/columns.cc:45
-msgid "File path"
+#: src/gtkui/columns.cc:46 src/moonstone/playlist_model.cc:41
+#: src/qtui/playlist_model.cc:35
+msgid "File Path"
 msgstr "Путања датотеке"
 
-#: src/gtkui/columns.cc:47
-msgid "Custom title"
+#: src/gtkui/columns.cc:47 src/moonstone/playlist_model.cc:42
+#: src/qtui/playlist_model.cc:35
+msgid "File Name"
+msgstr "Назив датотеке"
+
+#: src/gtkui/columns.cc:48 src/moonstone/playlist_model.cc:42
+#: src/qtui/playlist_model.cc:36
+msgid "Custom Title"
 msgstr "Произвољан наслов"
 
-#: src/gtkui/columns.cc:48
+#: src/gtkui/columns.cc:49 src/moonstone/playlist_model.cc:42
+#: src/qtui/playlist_model.cc:36 src/streamtuner/icecast-model.cc:129
+#: src/streamtuner/shoutcast-model.cc:134
 msgid "Bitrate"
 msgstr "Битски проток"
 
-#: src/gtkui/columns.cc:308
+#: src/gtkui/columns.cc:50 src/moonstone/playlist_model.cc:43
+#: src/qtui/playlist_model.cc:36
+msgid "Comment"
+msgstr "Напомена"
+
+#: src/gtkui/columns.cc:51 src/qtui/playlist_model.cc:36
+msgid "Publisher"
+msgstr ""
+
+#: src/gtkui/columns.cc:52 src/qtui/playlist_model.cc:37
+msgid "Catalog Number"
+msgstr ""
+
+#: src/gtkui/columns.cc:53 src/moonstone/playlist_model.cc:43
+#: src/qtui/playlist_model.cc:37
+msgid "Disc"
+msgstr ""
+
+#: src/gtkui/columns.cc:325
 msgid "Available columns"
 msgstr "Доступни ступци"
 
-#: src/gtkui/columns.cc:334
+#: src/gtkui/columns.cc:351
 msgid "Displayed columns"
 msgstr "Приказани ступци"
 
-#: src/gtkui/layout.cc:72 src/search-tool/search-tool.cc:40
+#: src/gtkui/layout.cc:74 src/search-tool-qt/search-tool-qt.cc:58
+#: src/search-tool/search-tool.cc:49
 msgid "Search Tool"
 msgstr "Алат за претрагу"
 
-#: src/gtkui/layout.cc:167
+#: src/gtkui/layout.cc:170
 msgid "Dock at Left"
 msgstr "Усидри на лево"
 
-#: src/gtkui/layout.cc:167
+#: src/gtkui/layout.cc:170
 msgid "Dock at Right"
 msgstr "Усидри на десно"
 
-#: src/gtkui/layout.cc:168
+#: src/gtkui/layout.cc:171
 msgid "Dock at Top"
 msgstr "Усидри на врх"
 
-#: src/gtkui/layout.cc:168
+#: src/gtkui/layout.cc:171
 msgid "Dock at Bottom"
 msgstr "Усидри на дно"
 
-#: src/gtkui/layout.cc:168
+#: src/gtkui/layout.cc:171
 msgid "Undock"
 msgstr "Откачи"
 
-#: src/gtkui/layout.cc:168 src/ladspa/plugin.cc:531
+#: src/gtkui/layout.cc:171 src/ladspa/plugin.cc:540
 msgid "Disable"
 msgstr "Искључи"
 
-#: src/gtkui/menus.cc:126 src/qtui/main_window_actions.cc:93
-#: src/statusicon/statusicon.cc:276
+#: src/gtkui/menus.cc:79 src/qtui/menus.cc:107
+#: src/statusicon-qt/statusicon.cc:115 src/statusicon/statusicon.cc:286
 msgid "_Open Files ..."
 msgstr "Отвори _датотеке ..."
 
-#: src/gtkui/menus.cc:127
+#: src/gtkui/menus.cc:80 src/qtui/menus.cc:111
 msgid "Open _URL ..."
 msgstr "Отвори _адресу ..."
 
-#: src/gtkui/menus.cc:128 src/qtui/main_window_actions.cc:95
+#: src/gtkui/menus.cc:81 src/qtui/menus.cc:113
 msgid "_Add Files ..."
 msgstr "Додај да_тотеке ..."
 
-#: src/gtkui/menus.cc:129
+#: src/gtkui/menus.cc:82 src/qtui/menus.cc:118
 msgid "Add U_RL ..."
 msgstr "Додај ад_ресу ..."
 
-#: src/gtkui/menus.cc:131
+#: src/gtkui/menus.cc:84 src/qtui/menus.cc:120
 msgid "Search _Library"
 msgstr "Претражи _библиотеку"
 
-#: src/gtkui/menus.cc:133 src/qtui/main_window_actions.cc:98
+#: src/gtkui/menus.cc:86 src/qtui/menus.cc:123
 msgid "A_bout ..."
 msgstr "О _програму ..."
 
-#: src/gtkui/menus.cc:134 src/qtui/main_window_actions.cc:99
+#: src/gtkui/menus.cc:87 src/qtui/menus.cc:125
 msgid "_Settings ..."
 msgstr "_Подешавања ..."
 
-#: src/gtkui/menus.cc:135 src/qtui/main_window_actions.cc:103
-#: src/statusicon/statusicon.cc:284
+#: src/gtkui/menus.cc:88 src/qtui/menus.cc:131
+#: src/statusicon-qt/statusicon.cc:117 src/statusicon/statusicon.cc:288
 msgid "_Quit"
 msgstr "_Изађи"
 
-#: src/gtkui/menus.cc:139 src/gtkui/menus.cc:262
-#: src/qtui/main_window_actions.cc:107 src/search-tool/search-tool.cc:641
-#: src/statusicon/statusicon.cc:278
+#: src/gtkui/menus.cc:92 src/gtkui/menus.cc:226
+#: src/moonstone/playlist_tabs.cc:306 src/qtui/menus.cc:135
+#: src/qtui/playlist_tabs.cc:331 src/search-tool-qt/search-tool-qt.cc:499
+#: src/search-tool/search-tool.cc:339 src/statusicon-qt/statusicon.cc:109
+#: src/statusicon/statusicon.cc:280
 msgid "_Play"
 msgstr "Пу_сти"
 
-#: src/gtkui/menus.cc:140 src/qtui/main_window_actions.cc:108
-#: src/statusicon/statusicon.cc:279
+#: src/gtkui/menus.cc:93 src/qtui/menus.cc:137
+#: src/statusicon-qt/statusicon.cc:110 src/statusicon/statusicon.cc:281
 msgid "Paus_e"
 msgstr "Па_узирај"
 
-#: src/gtkui/menus.cc:141 src/qtui/main_window_actions.cc:109
-#: src/statusicon/statusicon.cc:280
+#: src/gtkui/menus.cc:94 src/qtui/menus.cc:139
+#: src/statusicon-qt/statusicon.cc:111 src/statusicon/statusicon.cc:282
 msgid "_Stop"
 msgstr "_Заустави"
 
-#: src/gtkui/menus.cc:142 src/qtui/main_window_actions.cc:110
-#: src/statusicon/statusicon.cc:277
+#: src/gtkui/menus.cc:95 src/qtui/menus.cc:141
+#: src/statusicon-qt/statusicon.cc:112 src/statusicon/statusicon.cc:283
 msgid "Pre_vious"
 msgstr "_Претходно"
 
-#: src/gtkui/menus.cc:143 src/qtui/main_window_actions.cc:111
-#: src/statusicon/statusicon.cc:281
+#: src/gtkui/menus.cc:96 src/qtui/menus.cc:143
+#: src/statusicon-qt/statusicon.cc:113 src/statusicon/statusicon.cc:284
 msgid "_Next"
 msgstr "С_ледеће"
 
-#: src/gtkui/menus.cc:145 src/qtui/main_window_actions.cc:113
+#: src/gtkui/menus.cc:97 src/qtui/menus.cc:145 src/skins/menus.cc:114
+#: src/skins-qt/menus.cc:105
+msgid "Previous Album"
+msgstr "Претходни албум"
+
+#: src/gtkui/menus.cc:98 src/qtui/menus.cc:146 src/skins/menus.cc:115
+#: src/skins-qt/menus.cc:106
+msgid "Next Album"
+msgstr "Следећи албум"
+
+#: src/gtkui/menus.cc:100 src/qtui/menus.cc:148
 msgid "_Repeat"
 msgstr "_Понови"
 
-#: src/gtkui/menus.cc:146 src/qtui/main_window_actions.cc:114
+#: src/gtkui/menus.cc:101 src/qtui/menus.cc:150
 msgid "S_huffle"
 msgstr "_Насумично"
 
-#: src/gtkui/menus.cc:147 src/qtui/main_window_actions.cc:115
+#: src/gtkui/menus.cc:102 src/qtui/menus.cc:152
+msgid "Shuffle by Albu_m"
+msgstr "Насумично према _албуму"
+
+#: src/gtkui/menus.cc:103 src/qtui/menus.cc:155
 msgid "N_o Playlist Advance"
 msgstr "Н_е напредуј у списку нумера"
 
-#: src/gtkui/menus.cc:148 src/qtui/main_window_actions.cc:116
+#: src/gtkui/menus.cc:104 src/qtui/menus.cc:157
 msgid "Stop A_fter This Song"
 msgstr "Заустави _након ове песме"
 
-#: src/gtkui/menus.cc:150 src/gtkui/menus.cc:247
-#: src/qtui/main_window_actions.cc:118
+#: src/gtkui/menus.cc:106 src/gtkui/menus.cc:210 src/qtui/menus.cc:162
+#: src/qtui/menus.cc:294
 msgid "Song _Info ..."
 msgstr "Подаци о _песми ..."
 
-#: src/gtkui/menus.cc:151
+#: src/gtkui/menus.cc:107
 msgid "Jump to _Time ..."
 msgstr "Пређи на _време ..."
 
-#: src/gtkui/menus.cc:152
+#: src/gtkui/menus.cc:108
 msgid "_Jump to Song ..."
 msgstr "Пређи на _песму ..."
 
-#: src/gtkui/menus.cc:154
+#: src/gtkui/menus.cc:110 src/qtui/menus.cc:165
 msgid "Set Repeat Point _A"
 msgstr "Постави _А тачку понављања"
 
-#: src/gtkui/menus.cc:155
+#: src/gtkui/menus.cc:111 src/qtui/menus.cc:167
 msgid "Set Repeat Point _B"
 msgstr "Постави _Б тачку понављања"
 
-#: src/gtkui/menus.cc:156
+#: src/gtkui/menus.cc:112 src/qtui/menus.cc:169
 msgid "_Clear Repeat Points"
 msgstr "_Очисти тачке понављања"
 
-#: src/gtkui/menus.cc:160 src/gtkui/menus.cc:167 src/gtkui/menus.cc:183
-#: src/qtui/main_window_actions.cc:122 src/qtui/main_window_actions.cc:129
-#: src/qtui/main_window_actions.cc:145
+#: src/gtkui/menus.cc:116 src/gtkui/menus.cc:123 src/gtkui/menus.cc:141
+#: src/qtui/menus.cc:173 src/qtui/menus.cc:180 src/qtui/menus.cc:198
 msgid "By _Title"
 msgstr "Према _наслову"
 
-#: src/gtkui/menus.cc:161 src/qtui/main_window_actions.cc:123
+#: src/gtkui/menus.cc:117 src/qtui/menus.cc:174
 msgid "By _File Name"
 msgstr "Према називу _датотеке"
 
-#: src/gtkui/menus.cc:162 src/qtui/main_window_actions.cc:124
+#: src/gtkui/menus.cc:118 src/qtui/menus.cc:175
 msgid "By File _Path"
 msgstr "Према _путањи датотеке"
 
-#: src/gtkui/menus.cc:166 src/gtkui/menus.cc:182
-#: src/qtui/main_window_actions.cc:128 src/qtui/main_window_actions.cc:144
+#: src/gtkui/menus.cc:122 src/gtkui/menus.cc:140 src/qtui/menus.cc:179
+#: src/qtui/menus.cc:197
 msgid "By Track _Number"
 msgstr "Према броју _нумере"
 
-#: src/gtkui/menus.cc:168 src/gtkui/menus.cc:184
-#: src/qtui/main_window_actions.cc:130 src/qtui/main_window_actions.cc:146
+#: src/gtkui/menus.cc:124 src/gtkui/menus.cc:142 src/qtui/menus.cc:181
+#: src/qtui/menus.cc:199
 msgid "By _Artist"
 msgstr "Према _извођачу"
 
-#: src/gtkui/menus.cc:169 src/gtkui/menus.cc:185
-#: src/qtui/main_window_actions.cc:131 src/qtui/main_window_actions.cc:147
+#: src/gtkui/menus.cc:125 src/gtkui/menus.cc:143 src/qtui/menus.cc:182
+#: src/qtui/menus.cc:200
 msgid "By Al_bum"
 msgstr "Према _албуму"
 
-#: src/gtkui/menus.cc:170 src/gtkui/menus.cc:186
-#: src/qtui/main_window_actions.cc:132 src/qtui/main_window_actions.cc:148
+#: src/gtkui/menus.cc:126 src/gtkui/menus.cc:144 src/qtui/menus.cc:183
+#: src/qtui/menus.cc:201
 msgid "By Albu_m Artist"
 msgstr "Према извођачу албу_ма"
 
-#: src/gtkui/menus.cc:171 src/gtkui/menus.cc:187
-#: src/qtui/main_window_actions.cc:133 src/qtui/main_window_actions.cc:149
+#: src/gtkui/menus.cc:127 src/gtkui/menus.cc:145 src/qtui/menus.cc:184
+#: src/qtui/menus.cc:202
 msgid "By Release _Date"
 msgstr "Према _датуму издавања"
 
-#: src/gtkui/menus.cc:172 src/gtkui/menus.cc:188
-#: src/qtui/main_window_actions.cc:134 src/qtui/main_window_actions.cc:150
+#: src/gtkui/menus.cc:128 src/gtkui/menus.cc:146 src/qtui/menus.cc:185
+#: src/qtui/menus.cc:203
 msgid "By _Genre"
 msgstr "Према _жанру"
 
-#: src/gtkui/menus.cc:173 src/gtkui/menus.cc:189
-#: src/qtui/main_window_actions.cc:135 src/qtui/main_window_actions.cc:151
+#: src/gtkui/menus.cc:129 src/gtkui/menus.cc:147 src/qtui/menus.cc:186
+#: src/qtui/menus.cc:204
 msgid "By _Length"
 msgstr "Према _трајању"
 
-#: src/gtkui/menus.cc:174 src/gtkui/menus.cc:190
-#: src/qtui/main_window_actions.cc:136 src/qtui/main_window_actions.cc:152
+#: src/gtkui/menus.cc:130 src/gtkui/menus.cc:148 src/qtui/menus.cc:187
+#: src/qtui/menus.cc:205
 msgid "By _File Path"
 msgstr "Према _путањи датотеке"
 
-#: src/gtkui/menus.cc:175 src/gtkui/menus.cc:191
-#: src/qtui/main_window_actions.cc:137 src/qtui/main_window_actions.cc:153
+#: src/gtkui/menus.cc:131 src/gtkui/menus.cc:149 src/qtui/menus.cc:188
+#: src/qtui/menus.cc:206
 msgid "By _Custom Title"
 msgstr "Према произвољном _наслову"
 
-#: src/gtkui/menus.cc:177 src/gtkui/menus.cc:193
-#: src/qtui/main_window_actions.cc:139 src/qtui/main_window_actions.cc:155
+#: src/gtkui/menus.cc:132 src/gtkui/menus.cc:150 src/qtui/menus.cc:189
+#: src/qtui/menus.cc:207
+msgid "By C_omment"
+msgstr "Према _коментару"
+
+#: src/gtkui/menus.cc:133 src/gtkui/menus.cc:151 src/qtui/menus.cc:190
+#: src/qtui/menus.cc:208
+msgid "By D_isc Number"
+msgstr ""
+
+#: src/gtkui/menus.cc:135 src/gtkui/menus.cc:153 src/qtui/menus.cc:192
+#: src/qtui/menus.cc:210
 msgid "R_everse Order"
 msgstr "Преокрени п_оредак"
 
-#: src/gtkui/menus.cc:178 src/gtkui/menus.cc:194
-#: src/qtui/main_window_actions.cc:140 src/qtui/main_window_actions.cc:156
+#: src/gtkui/menus.cc:136 src/gtkui/menus.cc:154 src/qtui/menus.cc:194
+#: src/qtui/menus.cc:212
 msgid "_Random Order"
 msgstr "_Случајан поредак"
 
-#: src/gtkui/menus.cc:198 src/qtui/main_window_actions.cc:160
+#: src/gtkui/menus.cc:158 src/qtui/menus.cc:216
 msgid "_Play/Resume"
 msgstr "_Пусти/Настави"
 
-#: src/gtkui/menus.cc:199 src/gtkui/menus.cc:251
-#: src/qtui/main_window_actions.cc:161
+#: src/gtkui/menus.cc:159 src/qtui/menus.cc:218
 msgid "_Refresh"
 msgstr "_Освежи"
 
-#: src/gtkui/menus.cc:201 src/qtui/main_window_actions.cc:163
+#: src/gtkui/menus.cc:161 src/qtui/menus.cc:222
 msgid "_Sort"
 msgstr "Пор_еђај"
 
-#: src/gtkui/menus.cc:202 src/qtui/main_window_actions.cc:164
+#: src/gtkui/menus.cc:162 src/qtui/menus.cc:223
 msgid "Sort Se_lected"
 msgstr "Поређај _означене"
 
-#: src/gtkui/menus.cc:203 src/qtui/main_window_actions.cc:165
+#: src/gtkui/menus.cc:163 src/qtui/menus.cc:225
 msgid "Remove _Duplicates"
 msgstr "Уклони _двоструке"
 
-#: src/gtkui/menus.cc:204 src/qtui/main_window_actions.cc:166
+#: src/gtkui/menus.cc:164 src/qtui/menus.cc:226
 msgid "Remove _Unavailable Files"
 msgstr "Уклони _недоступне датотеке"
 
-#: src/gtkui/menus.cc:206 src/playlist-manager/playlist-manager.cc:244
-#: src/qtui/main_window_actions.cc:168
+#: src/gtkui/menus.cc:166 src/playlist-manager/playlist-manager.cc:219
+#: src/playlist-manager-qt/playlist-manager-qt.cc:348 src/qtui/menus.cc:229
 msgid "_New"
 msgstr "_Ново"
 
-#: src/gtkui/menus.cc:207
+#: src/gtkui/menus.cc:167 src/qtui/menus.cc:230
 msgid "Ren_ame ..."
 msgstr "_Преименуј ..."
 
-#: src/gtkui/menus.cc:208 src/gtkui/menus.cc:264
-#: src/qtui/main_window_actions.cc:170
+#: src/gtkui/menus.cc:168 src/gtkui/menus.cc:228
+#: src/moonstone/playlist_tabs.cc:311 src/qtui/menus.cc:231
+#: src/qtui/playlist_tabs.cc:336
 msgid "Remo_ve"
 msgstr "_Уклони"
 
-#: src/gtkui/menus.cc:210
+#: src/gtkui/menus.cc:170 src/qtui/menus.cc:233
 msgid "_Import ..."
 msgstr "Ув_ези ..."
 
-#: src/gtkui/menus.cc:211
+#: src/gtkui/menus.cc:171 src/qtui/menus.cc:234
 msgid "_Export ..."
 msgstr "Из_вези ..."
 
-#: src/gtkui/menus.cc:213
+#: src/gtkui/menus.cc:173 src/qtui/menus.cc:237
 msgid "Playlist _Manager ..."
 msgstr "Управник списка _нумера ..."
 
-#: src/gtkui/menus.cc:214 src/qtui/main_window_actions.cc:176
+#: src/gtkui/menus.cc:174 src/qtui/menus.cc:239
 msgid "_Queue Manager ..."
 msgstr "Управник _редоследа ..."
 
-#: src/gtkui/menus.cc:218 src/qtui/main_window_actions.cc:180
+#: src/gtkui/menus.cc:178 src/qtui/menus.cc:243
 msgid "Volume _Up"
 msgstr "По_јачај"
 
-#: src/gtkui/menus.cc:219 src/qtui/main_window_actions.cc:181
+#: src/gtkui/menus.cc:179 src/qtui/menus.cc:245
 msgid "Volume _Down"
 msgstr "У_тишај"
 
-#: src/gtkui/menus.cc:221 src/qtui/main_window_actions.cc:183
-msgid "_Equalizer"
-msgstr "Ује_дначавач"
+#: src/gtkui/menus.cc:181 src/qtui/menus.cc:249
+msgid "_Equalizer ..."
+msgstr "_Уједначавач ..."
 
-#: src/gtkui/menus.cc:223 src/qtui/main_window_actions.cc:185
+#: src/gtkui/menus.cc:182 src/qtui/menus.cc:251
 msgid "E_ffects ..."
 msgstr "_Дејства ..."
 
-#: src/gtkui/menus.cc:227
+#: src/gtkui/menus.cc:184
+msgid "_Record Stream"
+msgstr "_Сними ток"
+
+#: src/gtkui/menus.cc:185
+msgid "Audio _Settings ..."
+msgstr "Подешавања _звука ..."
+
+#: src/gtkui/menus.cc:189 src/qtui/menus.cc:260
 msgid "Show _Menu Bar"
 msgstr "Прикажи траку _изборника"
 
-#: src/gtkui/menus.cc:228
+#: src/gtkui/menus.cc:190 src/qtui/menus.cc:262
 msgid "Show I_nfo Bar"
 msgstr "Прикажи траку _података"
 
-#: src/gtkui/menus.cc:229
+#: src/gtkui/menus.cc:191 src/qtui/menus.cc:264
+msgid "Show Info Bar _Album Art"
+msgstr "Прикажи омот _албума инфо траке"
+
+#: src/gtkui/menus.cc:192 src/qtui/menus.cc:266
 msgid "Show Info Bar Vis_ualization"
 msgstr "Прикажи _визуелизацију траке обавештења"
 
-#: src/gtkui/menus.cc:230
+#: src/gtkui/menus.cc:193 src/qtui/menus.cc:268
 msgid "Show _Status Bar"
 msgstr "Прикажи траку _стања"
 
-#: src/gtkui/menus.cc:232
+#: src/gtkui/menus.cc:195 src/qtui/menus.cc:272
 msgid "Show _Remaining Time"
 msgstr "Прикажи преостало _време"
 
-#: src/gtkui/menus.cc:234
+#: src/gtkui/menus.cc:197 src/qtui/menus.cc:276 src/skins/menus.cc:157
+#: src/skins-qt/menus.cc:152
 msgid "_Visualizations ..."
 msgstr "_Визуелизације ..."
 
-#: src/gtkui/menus.cc:238 src/qtui/main_window_actions.cc:189
+#: src/gtkui/menus.cc:201 src/qtui/menus.cc:280
 msgid "_File"
 msgstr "_Датотека"
 
-#: src/gtkui/menus.cc:239 src/qtui/main_window_actions.cc:190
+#: src/gtkui/menus.cc:202 src/qtui/menus.cc:281
 msgid "_Playback"
 msgstr "_Извођење"
 
-#: src/gtkui/menus.cc:240 src/qtui/main_window_actions.cc:191
+#: src/gtkui/menus.cc:203 src/qtui/menus.cc:282
 msgid "P_laylist"
 msgstr "_Списак нумера"
 
-#: src/gtkui/menus.cc:241 src/gtkui/menus.cc:258
-#: src/qtui/main_window_actions.cc:192
+#: src/gtkui/menus.cc:204 src/gtkui/menus.cc:222 src/qtui/menus.cc:283
+#: src/qtui/menus.cc:312
 msgid "_Services"
 msgstr "_Услуге"
 
-#: src/gtkui/menus.cc:242 src/qtui/main_window_actions.cc:193
+#: src/gtkui/menus.cc:205 src/qtui/menus.cc:284
 msgid "_Output"
 msgstr "_Излаз"
 
-#: src/gtkui/menus.cc:243
+#: src/gtkui/menus.cc:206 src/qtui/menus.cc:285
 msgid "_View"
 msgstr "_Преглед"
 
-#: src/gtkui/menus.cc:248
+#: src/gtkui/menus.cc:211 src/qtui/menus.cc:296
 msgid "_Queue/Unqueue"
 msgstr "_Стави у ред/Избаци из реда"
 
-#: src/gtkui/menus.cc:250
+#: src/gtkui/menus.cc:213 src/qtui/menus.cc:299
 msgid "_Open Containing Folder"
 msgstr "_Отвори садржавајућу фасциклу"
 
-#: src/gtkui/menus.cc:253
+#: src/gtkui/menus.cc:214 src/qtui/menus.cc:301
+msgid "_Refresh Selected"
+msgstr "_Освежи изабрано"
+
+#: src/gtkui/menus.cc:216 src/qtui/menus.cc:304
 msgid "Cu_t"
 msgstr "_Исеци"
 
-#: src/gtkui/menus.cc:254
+#: src/gtkui/menus.cc:217 src/qtui/menus.cc:305
 msgid "_Copy"
 msgstr "У_множи"
 
-#: src/gtkui/menus.cc:255
+#: src/gtkui/menus.cc:218 src/qtui/menus.cc:306
 msgid "_Paste"
 msgstr "У_баци"
 
-#: src/gtkui/menus.cc:256
+#: src/gtkui/menus.cc:219 src/qtui/menus.cc:307
+msgid "Paste at _End"
+msgstr "Убаци на _крај"
+
+#: src/gtkui/menus.cc:220 src/qtui/menus.cc:309
 msgid "Select _All"
 msgstr "_Изабери све"
 
-#: src/gtkui/menus.cc:263
+#: src/gtkui/menus.cc:227 src/moonstone/playlist_tabs.cc:309
+#: src/qtui/playlist_tabs.cc:334
 msgid "_Rename ..."
 msgstr "_Преименуј ..."
 
-#: src/gtkui/settings.cc:35
+#: src/gtkui/settings.cc:35 src/qtui/settings.cc:59
+msgid "Always"
+msgstr "Увек"
+
+#: src/gtkui/settings.cc:36 src/qtui/settings.cc:60
+msgid "Auto-hide"
+msgstr "Сам сакриј"
+
+#: src/gtkui/settings.cc:37 src/qtui/settings.cc:61
+msgid "Never"
+msgstr "Никад"
+
+#: src/gtkui/settings.cc:41 src/qtui/settings.cc:64
 msgid "Playlist Tabs"
 msgstr "Језичци списка нумера"
 
-#: src/gtkui/settings.cc:36
-msgid "Always show tabs"
-msgstr "Увек прикажи језичке"
+#: src/gtkui/settings.cc:42 src/qtui/settings.cc:65
+msgid "Show playlist tabs:"
+msgstr "Прикажи језичке списка нумера:"
 
-#: src/gtkui/settings.cc:38
+#: src/gtkui/settings.cc:45 src/qtui/settings.cc:69
 msgid "Show entry counts"
 msgstr "Прикажи број уноса"
 
-#: src/gtkui/settings.cc:40
+#: src/gtkui/settings.cc:47 src/qtui/settings.cc:72
 msgid "Show close buttons"
 msgstr "Прикажи дугмад затварања"
 
-#: src/gtkui/settings.cc:42
+#: src/gtkui/settings.cc:49 src/qtui/settings.cc:75
 msgid "Playlist Columns"
 msgstr "Ступци списка нумера"
 
-#: src/gtkui/settings.cc:44
+#: src/gtkui/settings.cc:51 src/qtui/settings.cc:77
 msgid "Show column headers"
 msgstr "Прикажи заглавља колона"
 
-#: src/gtkui/settings.cc:46 src/modplug/plugin_main.cc:106
-#: src/skins/skins_cfg.cc:263
-msgid "Miscellaneous"
-msgstr "Разно"
+#: src/gtkui/settings.cc:53 src/qtui/settings.cc:82
+msgid "Make column headers clickable for sorting"
+msgstr ""
 
-#: src/gtkui/settings.cc:47
-msgid "Arrow keys seek by:"
-msgstr "Стралице померају за:"
+#: src/gtkui/settings.cc:56
+msgid "Use symbolic icons in toolbar"
+msgstr ""
 
-#: src/gtkui/settings.cc:50
+#: src/gtkui/settings.cc:58 src/qtui/settings.cc:86
 msgid "Scroll on song change"
 msgstr "Клизај при промени песме"
 
-#: src/gtkui/ui_gtk.cc:71
+#: src/gtkui/ui_gtk.cc:82
 msgid "GTK Interface"
 msgstr "ГТК сучеље"
 
-#: src/gtkui/ui_gtk.cc:222 src/skins/ui_main.cc:232
+#: src/gtkui/ui_gtk.cc:219 src/skins/main.cc:228 src/skins-qt/main.cc:231
 #, c-format
 msgid "%s - Audacious"
-msgstr "%s — Безочник"
+msgstr "%s — Аудацијус"
 
-#: src/gtkui/ui_gtk.cc:225 src/qtui/main_window.cc:186
+#: src/gtkui/ui_gtk.cc:221 src/moonstone/main_window.cc:184
+#: src/qtui/main_window.cc:385
 msgid "Buffering ..."
 msgstr "Баферујем ..."
 
-#: src/gtkui/ui_gtk.cc:228 src/skins/ui_main.cc:234 src/skins/ui_main.cc:1164
+#: src/gtkui/ui_gtk.cc:224 src/pipewire/pipewire.cc:402 src/skins/main.cc:230
+#: src/skins-qt/main.cc:233
 msgid "Audacious"
-msgstr "Безочник"
+msgstr "Аудацијус"
+
+#: src/gtkui/ui_gtk.cc:487 src/gtkui/ui_gtk.cc:518 src/gtkui/ui_gtk.cc:882
+#: src/hotkey/gui.cc:72 src/moonstone/main_window.cc:67
+#: src/moonstone/main_window.cc:145 src/moonstone/main_window.cc:146
+#: src/notify/osd.cc:85 src/qthotkey/gui.cc:67 src/qtui/main_window.cc:154
+#: src/qtui/main_window.cc:347 src/qtui/main_window.cc:348
+#: src/skins/menus.cc:109 src/skins-qt/menus.cc:100
+msgid "Play"
+msgstr "Пусти"
+
+#: src/gtkui/ui_gtk.cc:487 src/moonstone/main_window.cc:151
+#: src/moonstone/main_window.cc:152 src/notify/osd.cc:82
+#: src/qtui/main_window.cc:353 src/qtui/main_window.cc:354
+#: src/skins/menus.cc:110 src/skins-qt/menus.cc:101
+msgid "Pause"
+msgstr "Паузирај"
+
+#: src/gtkui/ui_gtk.cc:868 src/moonstone/main_window.cc:57
+#: src/qtui/main_window.cc:145 src/skins/menus.cc:86 src/skins-qt/menus.cc:77
+msgid "Search Library"
+msgstr "Претражи библиотеку"
+
+#: src/gtkui/ui_gtk.cc:875 src/moonstone/main_window.cc:60
+#: src/qtui/main_window.cc:147
+msgid "Open Files"
+msgstr "Отвори датотеке"
+
+#: src/gtkui/ui_gtk.cc:876 src/moonstone/main_window.cc:62
+#: src/qtui/main_window.cc:149
+msgid "Add Files"
+msgstr "Додај датотеке"
+
+#: src/gtkui/ui_gtk.cc:881 src/moonstone/main_window.cc:65
+#: src/qtui/main_window.cc:152 src/skins/menus.cc:112 src/skins-qt/menus.cc:103
+msgid "Previous"
+msgstr "Претходна"
+
+#: src/gtkui/ui_gtk.cc:883 src/hotkey/gui.cc:74 src/moonstone/main_window.cc:69
+#: src/qthotkey/gui.cc:69 src/qtui/main_window.cc:156 src/skins/menus.cc:111
+#: src/skins-qt/menus.cc:102
+msgid "Stop"
+msgstr "Заустави"
 
-#: src/gtkui/ui_statusbar.cc:63 src/qtui/status_bar.cc:67
+#: src/gtkui/ui_gtk.cc:884 src/moonstone/main_window.cc:76 src/notify/osd.cc:89
+#: src/qtui/main_window.cc:163 src/skins/menus.cc:113 src/skins-qt/menus.cc:104
+msgid "Next"
+msgstr "Следећа"
+
+#: src/gtkui/ui_gtk.cc:886 src/moonstone/main_window.cc:79
+#: src/qtui/main_window.cc:166 src/qtui/menus.cc:254 src/skins/menus.cc:79
+#: src/skins-qt/menus.cc:69
+msgid "Record Stream"
+msgstr "Сними ток"
+
+#: src/gtkui/ui_gtk.cc:919 src/moonstone/main_window.cc:86
+#: src/qtui/main_window.cc:173 src/skins/menus.cc:103 src/skins-qt/menus.cc:94
+msgid "Repeat"
+msgstr "Понови"
+
+#: src/gtkui/ui_gtk.cc:922 src/moonstone/main_window.cc:89
+#: src/qtui/main_window.cc:176 src/skins/menus.cc:104 src/skins-qt/menus.cc:95
+msgid "Shuffle"
+msgstr "Насумично"
+
+#: src/gtkui/ui_gtk.cc:1114 src/qtui/main_window.cc:123
+msgid "Menu"
+msgstr "Изборник"
+
+#: src/gtkui/ui_statusbar.cc:64 src/qtui/status_bar.cc:155
 msgid "mono"
 msgstr "моно"
 
-#: src/gtkui/ui_statusbar.cc:65 src/qtui/status_bar.cc:69
+#: src/gtkui/ui_statusbar.cc:66 src/qtui/status_bar.cc:157
 msgid "stereo"
 msgstr "стерео"
 
-#: src/gtkui/ui_statusbar.cc:67 src/qtui/status_bar.cc:71
+#: src/gtkui/ui_statusbar.cc:68 src/qtui/status_bar.cc:160
 #, c-format
 msgid "%d channel"
 msgid_plural "%d channels"
@@ -2063,113 +2129,107 @@
 msgstr1 "%d канала"
 msgstr2 "%d канала"
 
-#: src/gtkui/ui_statusbar.cc:81 src/qtui/status_bar.cc:85
+#: src/gtkui/ui_statusbar.cc:76 src/qtui/status_bar.cc:168
 #, c-format
-msgid "%d kbps"
-msgstr "%d kb/s"
+msgid "%d kHz"
+msgstr "%d kHz"
 
-#: src/gtkui/ui_statusbar.cc:107 src/skins/ui_main_evlisteners.cc:103
+#: src/gtkui/ui_statusbar.cc:82 src/qtui/status_bar.cc:174
+#, c-format
+msgid "%d kbit/s"
+msgstr ""
+
+#: src/gtkui/ui_statusbar.cc:108 src/skins/main.cc:478 src/skins-qt/main.cc:461
 msgid "Single mode."
 msgstr "Једноставни режим."
 
-#: src/gtkui/ui_statusbar.cc:109 src/skins/ui_main_evlisteners.cc:105
+#: src/gtkui/ui_statusbar.cc:110 src/skins/main.cc:480 src/skins-qt/main.cc:463
 msgid "Playlist mode."
 msgstr "Режим списка нумера."
 
-#: src/gtkui/ui_statusbar.cc:117 src/skins/ui_main_evlisteners.cc:111
+#: src/gtkui/ui_statusbar.cc:118 src/skins/main.cc:486 src/skins-qt/main.cc:469
 msgid "Stopping after song."
 msgstr "Зауставља након песме."
 
-#: src/hotkey/gui.cc:71
+#: src/hotkey/gui.cc:71 src/qthotkey/gui.cc:66
 msgid "Previous track"
 msgstr "Претходна нумера"
 
-#: src/hotkey/gui.cc:72 src/notify/osd.cc:69 src/qtui/main_window.cc:69
-#: src/qtui/main_window.cc:172 src/qtui/main_window.cc:173
-#: src/skins/menus.cc:87
-msgid "Play"
-msgstr "Пусти"
-
-#: src/hotkey/gui.cc:73
+#: src/hotkey/gui.cc:73 src/qthotkey/gui.cc:68
 msgid "Pause/Resume"
 msgstr "Паузирај/настави"
 
-#: src/hotkey/gui.cc:74 src/qtui/main_window.cc:70 src/skins/menus.cc:89
-msgid "Stop"
-msgstr "Заустави"
-
-#: src/hotkey/gui.cc:75
+#: src/hotkey/gui.cc:75 src/qthotkey/gui.cc:70
 msgid "Next track"
 msgstr "Следећа нумера"
 
-#: src/hotkey/gui.cc:76
-msgid "Forward 5 seconds"
-msgstr "Унапред 5 секунде"
-
-#: src/hotkey/gui.cc:77
-msgid "Rewind 5 seconds"
-msgstr "Уназад 5 секунде"
+#: src/hotkey/gui.cc:76 src/qthotkey/gui.cc:71
+msgid "Step forward"
+msgstr "Иди напред"
+
+#: src/hotkey/gui.cc:77 src/qthotkey/gui.cc:72
+msgid "Step backward"
+msgstr "Иди назад"
 
-#: src/hotkey/gui.cc:78
+#: src/hotkey/gui.cc:78 src/qthotkey/gui.cc:73
 msgid "Mute"
 msgstr "Искључи звук"
 
-#: src/hotkey/gui.cc:79
+#: src/hotkey/gui.cc:79 src/qthotkey/gui.cc:74
 msgid "Volume up"
 msgstr "Појачај"
 
-#: src/hotkey/gui.cc:80
+#: src/hotkey/gui.cc:80 src/qthotkey/gui.cc:75
 msgid "Volume down"
 msgstr "Утишај"
 
-#: src/hotkey/gui.cc:81
+#: src/hotkey/gui.cc:81 src/qthotkey/gui.cc:76
 msgid "Jump to file"
 msgstr "Скочи до датотеке"
 
-#: src/hotkey/gui.cc:82
+#: src/hotkey/gui.cc:82 src/qthotkey/gui.cc:77
 msgid "Toggle player window(s)"
 msgstr "Укључи/искључи главни прозор"
 
-#: src/hotkey/gui.cc:83
+#: src/hotkey/gui.cc:83 src/qthotkey/gui.cc:78
 msgid "Show On-Screen-Display"
 msgstr "Прикажи приказ на екрану"
 
-#: src/hotkey/gui.cc:84
+#: src/hotkey/gui.cc:84 src/qthotkey/gui.cc:79
 msgid "Toggle repeat"
 msgstr "Укључи/искључи понављање"
 
-#: src/hotkey/gui.cc:85
+#: src/hotkey/gui.cc:85 src/qthotkey/gui.cc:80
 msgid "Toggle shuffle"
 msgstr "Укључи/искључи премештање"
 
-#: src/hotkey/gui.cc:86
+#: src/hotkey/gui.cc:86 src/qthotkey/gui.cc:81
 msgid "Toggle stop after current"
 msgstr "Заустави после текуће песме"
 
-#: src/hotkey/gui.cc:87
+#: src/hotkey/gui.cc:87 src/qthotkey/gui.cc:82
 msgid "Raise player window(s)"
 msgstr "Издигни главни прозор"
 
-#: src/hotkey/gui.cc:97
+#: src/hotkey/gui.cc:98 src/qthotkey/gui.cc:100
 msgid "(none)"
 msgstr "(ништа)"
 
-#: src/hotkey/gui.cc:234
+#: src/hotkey/gui.cc:261
 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 modifiers.\n"
 "\n"
 "Do you want to continue?"
 msgstr ""
-"Није препоручљиво повезати главну дугмад миша без измењивача.\n"
+"Није препоручљиво да свезујете главну дугмад миша без измењивача.\n"
 "\n"
 "Да ли желите да наставите?"
 
-#: src/hotkey/gui.cc:236
+#: src/hotkey/gui.cc:264
 msgid "Binding mouse buttons"
 msgstr "Повезујем дугмад миша"
 
-#: src/hotkey/gui.cc:391
+#: src/hotkey/gui.cc:434
 msgid ""
 "Press a key combination inside a text field.\n"
 "You can also bind mouse buttons."
@@ -2177,102 +2237,131 @@
 "Притисните комбинацију тастера унутар поља за текст.\n"
 "Можете такође да повежете дугмад миша."
 
-#: src/hotkey/gui.cc:396
+#: src/hotkey/gui.cc:444 src/qthotkey/gui.cc:179
 msgid "Hotkeys:"
 msgstr "Пречице:"
 
-#: src/hotkey/gui.cc:413
+#: src/hotkey/gui.cc:457 src/qthotkey/gui.cc:181
 msgid "Action:"
 msgstr "Радња:"
 
-#: src/hotkey/gui.cc:420
+#: src/hotkey/gui.cc:461 src/qthotkey/gui.cc:182
 msgid "Key Binding:"
 msgstr "Свезе тастера:"
 
-#: src/hotkey/gui.cc:468
+#: src/hotkey/gui.cc:518 src/qthotkey/gui.cc:184
 msgid "_Add"
 msgstr "_Додај"
 
-#: src/hotkey/plugin.cc:61
+#: src/hotkey/plugin.cc:59 src/qthotkey/plugin.cc:78
 msgid "Global Hotkeys"
 msgstr "Опште пречице"
 
-#: src/hotkey/plugin.cc:79
+#: src/hotkey/plugin.cc:74
 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"
+"Contributors 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 Саша Хласјак <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"
+"Прикључак Општих пречица\n"
+"Управљајте програмом комбинацијама општих тастера или мултимедијалним "
+"тастерима.\n"
+"\n"
+"Ауторска права © 2007-2008 Саша Хлусјак <contact@saschahlusiak.de>\n"
+"\n"
+"У доприносиоце спадају:\n"
+"Ауторска права © 2006-2007 Владимир Пасков <vlado.paskov@gmail.com>\n"
+"Ауторска права © 2000-2002 Виле Сирјала <syrjala@sci.fi>,\n"
+" Брајан Дејвис <curious@ihug.com.au>,\n"
+" Џонатан А. Дејвис <davis@jdhouse.org>,\n"
 " Џереми Тан <nsx@nsx.homeip.net>"
 
-#: src/jack-ng/jack-ng.cc:49
+#: src/jack/jack-ng.cc:54
 msgid "JACK Output"
 msgstr "ЏЕК излаз"
 
-#: src/jack-ng/jack-ng.cc:114
+#: src/jack/jack-ng.cc:126
+msgid "Client name:"
+msgstr "Назив клијента:"
+
+#: src/jack/jack-ng.cc:128
 msgid "Automatically connect to output ports"
 msgstr "Самостално повезивање на прикључнике излаза"
 
-#: src/jack-ng/jack-ng.cc:155
+#: src/jack/jack-ng.cc:130
+msgid "Filter ports (regex, use any port if blank):"
+msgstr ""
+"Филтрирај прикључнике (регуларан израз, користи било који ако је празно)"
+
+#: src/jack/jack-ng.cc:136
+msgid "Connect to physical ports only"
+msgstr "Повежи се само на физичке прикључнике"
+
+#: src/jack/jack-ng.cc:139
+msgid "Upmix to"
+msgstr "Домиксуј на"
+
+#: src/jack/jack-ng.cc:141
+msgid "ports if input has fewer channels"
+msgstr "прикључнике ако улаз има мање канала"
+
+#: src/jack/jack-ng.cc:143
+msgid "Ignore insufficient number of ports"
+msgstr "Занемари недовољан број прикључника"
+
+#: src/jack/jack-ng.cc:181
+msgid "No JACK output ports were found. Please check settings."
+msgstr "Нисам нашао прикључнике ЏЕК излаза. Проверите поставке."
+
+#: src/jack/jack-ng.cc:195
 #, c-format
 msgid "Only %d JACK output ports were found but %d are required."
 msgstr "Нашао сам само %d излазна прикључка ЏЕК-а али су потребна %d."
 
-#: src/jack-ng/jack-ng.cc:164
+#: src/jack/jack-ng.cc:210
 #, c-format
 msgid "Failed to connect to JACK port %s."
 msgstr "Нисам успео да се повежем на прикључник ЏЕК-а „%s“."
 
-#: src/jack-ng/jack-ng.cc:184
+#: src/jack/jack-ng.cc:230
 msgid ""
 "JACK supports only floating-point audio. You must change the output bit "
 "depth to floating-point in Audacious settings."
 msgstr ""
 "ЏЕК подржава само звук покретног зареза. Морате изменити дубину излазног "
-"бита на покретни зарез у подешавањима Безочника."
+"бита на покретни зарез у подешавањима Аудацијуса."
 
-#: src/jack-ng/jack-ng.cc:197
+#: src/jack/jack-ng.cc:245
 msgid "Failed to connect to the JACK server; is it running?"
 msgstr "Нисам успео да се повежем на сервер ЏЕК-а; да ли је покренут?"
 
-#: src/jack-ng/jack-ng.cc:273
+#: src/jack/jack-ng.cc:321
 #, c-format
 msgid ""
 "The JACK server requires a sample rate of %d Hz, but Audacious is playing at "
 "%d Hz. Please use the Sample Rate Converter effect to correct the mismatch."
 msgstr ""
-"ЏЕК сервер захтева проток узорка од %d Hz, али Безочник пушта при %d Hz. "
+"ЏЕК сервер захтева проток узорка од %d Hz, али Аудацијус пушта при %d Hz. "
 "Користите дејство претварача протока узорка да исправите несагласност."
 
-#: src/ladspa/plugin.cc:414
+#: src/ladspa/plugin.cc:416
 #, c-format
 msgid "%s Settings"
 msgstr "Подешавања за %s"
 
-#: src/ladspa/plugin.cc:478
+#: src/ladspa/plugin.cc:482
 msgid "Module paths:"
 msgstr "Путање модула:"
 
-#: src/ladspa/plugin.cc:483
+#: src/ladspa/plugin.cc:487
 msgid ""
 "Separate multiple paths with a colon.\n"
 "These paths are searched in addition to LADSPA_PATH.\n"
@@ -2283,30 +2372,30 @@
 "Након додавања нових путања, притисните Унеси да потражите нове прикључке.</"
 "small>"
 
-#: src/ladspa/plugin.cc:499
+#: src/ladspa/plugin.cc:508
 msgid "Available plugins:"
 msgstr "Доступни прикључци:"
 
-#: src/ladspa/plugin.cc:512 src/modplug/plugin_main.cc:92
-#: src/modplug/plugin_main.cc:95 src/modplug/plugin_main.cc:98
-#: src/modplug/plugin_main.cc:101
+#: src/ladspa/plugin.cc:521 src/modplug/plugin_main.cc:91
+#: src/modplug/plugin_main.cc:94 src/modplug/plugin_main.cc:97
+#: src/modplug/plugin_main.cc:100
 msgid "Enable"
 msgstr "Укључи"
 
-#: src/ladspa/plugin.cc:518
+#: src/ladspa/plugin.cc:527
 msgid "Enabled plugins:"
 msgstr "Укључени прикључци:"
 
-#: src/ladspa/plugin.cc:534
+#: src/ladspa/plugin.cc:543
 msgid "Settings"
 msgstr "Подешавања"
 
-#: src/ladspa/plugin.cc:551
+#: src/ladspa/plugin.cc:560
 msgid ""
 "LADSPA Host for Audacious\n"
 "Copyright 2011 John Lindgren"
 msgstr ""
-"ЛАДСПА домаћин за Безочника\n"
+"ЛАДСПА домаћин за Аудацијуса\n"
 "Ауторска права 2011 Џон Линдгрин"
 
 #: src/ladspa/plugin.h:78
@@ -2317,7 +2406,7 @@
 msgid "LIRC Plugin"
 msgstr "ЛИРЦ прикључак"
 
-#: src/lirc/lirc.cc:381
+#: src/lirc/lirc.cc:379
 msgid ""
 "A simple plugin to control Audacious using the LIRC remote control daemon\n"
 "\n"
@@ -2332,10 +2421,10 @@
 "\n"
 "For more information about LIRC, see http://lirc.org."
 msgstr ""
-"Једноставан прикључак за управљање Безочником коришћењем демона даљинског "
+"Једноставан прикључак за управљање Аудацијусом коришћењем демона даљинског "
 "управљања ЛИРЦ-а\n"
 "\n"
-"За Безочника су га прилагодили:\n"
+"За Аудацијуса су га прилагодили:\n"
 "Тони Врун <chainsaw@gentoo.org>\n"
 "Јунас Харјумаки <jharjuma@gmail.com>\n"
 "\n"
@@ -2346,63 +2435,124 @@
 "\n"
 "Да сазнате више о ЛИРЦ-у, погледајте „http://lirc.org“."
 
-#: src/lirc/lirc.cc:392
+#: src/lirc/lirc.cc:390
 msgid "Connection"
 msgstr "Веза"
 
-#: src/lirc/lirc.cc:393
+#: src/lirc/lirc.cc:391
 msgid "Reconnect to LIRC server"
 msgstr "Поново се повежи са ЛИРЦ сервером"
 
-#: src/lirc/lirc.cc:395
+#: src/lirc/lirc.cc:393
 msgid "Wait before reconnecting:"
 msgstr "Сачекај пре поновног повезивања:"
 
-#: src/lyricwiki/lyricwiki.cc:41
-msgid "LyricWiki Plugin"
-msgstr "Прикључак за Лирик вики"
-
-#: src/lyricwiki/lyricwiki.cc:131 src/lyricwiki-qt/lyricwiki.cc:136
-msgid "No lyrics available"
-msgstr "Нема доступних текстова"
-
-#: src/lyricwiki/lyricwiki.cc:217 src/lyricwiki/lyricwiki.cc:226
-#: src/lyricwiki/lyricwiki.cc:243 src/lyricwiki/lyricwiki.cc:252
-#: src/lyricwiki/lyricwiki.cc:267 src/lyricwiki-qt/lyricwiki.cc:222
-#: src/lyricwiki-qt/lyricwiki.cc:231 src/lyricwiki-qt/lyricwiki.cc:248
-#: src/lyricwiki-qt/lyricwiki.cc:257 src/lyricwiki-qt/lyricwiki.cc:272
-msgid "Error"
-msgstr "Грешка"
-
-#: src/lyricwiki/lyricwiki.cc:218 src/lyricwiki/lyricwiki.cc:244
-#: src/lyricwiki-qt/lyricwiki.cc:223 src/lyricwiki-qt/lyricwiki.cc:249
+#: src/lyrics-common/chart_lyrics_provider.cc:93
+#: src/lyrics-common/chart_lyrics_provider.cc:150
+#: src/lyrics-common/lyrics_ovh_provider.cc:50
 #, c-format
 msgid "Unable to fetch %s"
 msgstr "Не могу да довучем „%s“"
 
-#: src/lyricwiki/lyricwiki.cc:227 src/lyricwiki/lyricwiki.cc:253
-#: src/lyricwiki-qt/lyricwiki.cc:232 src/lyricwiki-qt/lyricwiki.cc:258
+#: src/lyrics-common/chart_lyrics_provider.cc:100
+#: src/lyrics-common/chart_lyrics_provider.cc:157
+#: src/lyrics-common/lyrics_ovh_provider.cc:57
 #, c-format
 msgid "Unable to parse %s"
 msgstr "Не могу да обрадим „%s“"
 
-#: src/lyricwiki/lyricwiki.cc:259 src/lyricwiki-qt/lyricwiki.cc:264
+#: src/lyrics-common/chart_lyrics_provider.cc:121
+#: src/lyrics-common/chart_lyrics_provider.cc:194
+#: src/lyrics-common/lyrics_ovh_provider.cc:88
 msgid "Looking for lyrics ..."
 msgstr "Тражим текст песме ..."
 
-#: src/lyricwiki/lyricwiki.cc:267 src/lyricwiki-qt/lyricwiki.cc:272
-msgid "Missing song metadata"
-msgstr "Недостају метаподаци песме"
-
-#: src/lyricwiki/lyricwiki.cc:278 src/lyricwiki-qt/lyricwiki.cc:283
-msgid "Connecting to lyrics.wikia.com ..."
-msgstr "Повезујем се на „lyrics.wikia.com“ ..."
-
-#: src/lyricwiki-qt/lyricwiki.cc:55
-msgid "LyricWiki Plugin (Qt)"
-msgstr "Прикључак за Лирик вики (Qt)"
+#: src/lyrics-common/preferences.h:43
+msgid "Nowhere"
+msgstr "Нигде"
+
+#: src/lyrics-common/preferences.h:49
+msgid "Artist is truncated at the start, Title -- at the end"
+msgstr "Извођач је скраћен на почетку, Наслов -- на крају"
+
+#: src/lyrics-common/preferences.h:50
+msgid "Chars to truncate on:"
+msgstr "Знаци на којима скратити:"
+
+#: src/lyrics-common/preferences.h:54
+msgid "Chars are ORed in RegExp, surrounded by whitespace"
+msgstr ""
+"Знаци су „ORed“ у регуларном изразу, опкољени празнинама"
+
+#: src/lyrics-common/preferences.h:55
+msgid "Chars to split on:"
+msgstr "Знаци на којима поделити:"
+
+#: src/lyrics-common/preferences.h:56
+msgid "Further truncate those on chars"
+msgstr "Даље скрати то на знацима"
+
+#: src/lyrics-common/preferences.h:62
+msgid "General"
+msgstr "Опште"
+
+#: src/lyrics-common/preferences.h:63
+msgid "Split title into artist and title on chars"
+msgstr "Подели наслов на извођача и наслова на знацима"
+
+#: src/lyrics-common/preferences.h:66
+msgid "Sources"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:67
+msgid "Use embedded lyrics (from Lyrics tag)"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:69
+msgid "Fetch lyrics from internet:"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:72
+msgid "Store fetched lyrics in local cache"
+msgstr "Смести довучене текстове у локалној остави"
+
+#: src/lyrics-common/preferences.h:74
+msgid "Local Storage"
+msgstr "Локални смештај"
+
+#: src/lyrics-common/preferences.h:75
+msgid "Load lyric files (.lrc) from local storage"
+msgstr "Учитај датотеке текстова (.lrc) са локалног смештаја"
+
+#: src/lyrics-common/utils.cc:54 src/ui-common/dialogs-qt.cc:63
+msgid "Error"
+msgstr "Грешка"
+
+#: src/lyrics-common/utils.cc:60
+msgid "Lyrics could not be found."
+msgstr "Не могу да пронађем текстове."
+
+#: src/lyrics-common/utils.cc:142
+msgid "Missing title and/or artist."
+msgstr "Недостаје наслов и/или извођач."
+
+#: src/lyrics-gtk/lyrics-gtk.cc:37 src/lyrics-qt/lyrics-qt.cc:50
+msgid "Lyrics"
+msgstr "Текстови"
+
+#: src/lyrics-gtk/lyrics-gtk.cc:189 src/lyrics-qt/lyrics-qt.cc:171
+msgid "Edit Lyrics ..."
+msgstr ""
+
+#: src/lyrics-gtk/lyrics-gtk.cc:195 src/lyrics-qt/lyrics-qt.cc:178
+msgid "Save Locally"
+msgstr "Сачувај локално"
 
-#: src/m3u/m3u.cc:32
+#: src/lyrics-gtk/lyrics-gtk.cc:201 src/lyrics-qt/lyrics-qt.cc:186
+msgid "Refresh"
+msgstr "Освежи"
+
+#: src/m3u/m3u.cc:33
 msgid "M3U Playlists"
 msgstr "М3У списак нумера"
 
@@ -2410,17 +2560,17 @@
 msgid "Tact Generator"
 msgstr "Генератор такта"
 
-#: src/metronom/metronom.cc:147
+#: src/metronom/metronom.cc:145
 #, c-format
 msgid "Tact generator: %d bpm"
 msgstr "Генератор такта: %d отк/мин"
 
-#: src/metronom/metronom.cc:149
+#: src/metronom/metronom.cc:147
 #, c-format
 msgid "Tact generator: %d bpm %d/%d"
 msgstr "Генератор такта: %d отк/мин %d/%d"
 
-#: src/metronom/metronom.cc:237
+#: src/metronom/metronom.cc:235
 msgid ""
 "A Tact Generator by Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
 "\n"
@@ -2434,23 +2584,23 @@
 "нпр.: „tact://77“ да добијете 77 откуцаја у минуту\n"
 "или: „tact://60*3/4“ да добијете 60 отк./мин у 3/4 такту"
 
-#: src/mixer/mixer.cc:38
+#: src/mixer/mixer.cc:43
 msgid "Channel Mixer"
 msgstr "Мешач канала"
 
-#: src/mixer/mixer.cc:202
+#: src/mixer/mixer.cc:255
 msgid ""
 "Channel Mixer Plugin for Audacious\n"
 "Copyright 2011-2012 John Lindgren and Michał Lipski"
 msgstr ""
-"Прикључак мешача канала за Безочника\n"
+"Прикључак мешача канала за Аудацијуса\n"
 "Ауторска права 2011-2012 Џон Линдгрин и Михал Липски"
 
-#: src/mixer/mixer.cc:206
+#: src/mixer/mixer.cc:259
 msgid "Channel Mixer"
 msgstr "Мешач канала"
 
-#: src/mixer/mixer.cc:207
+#: src/mixer/mixer.cc:260
 msgid "Output channels:"
 msgstr "Излазни канали:"
 
@@ -2462,169 +2612,177 @@
 msgid "Error connecting to MMS server"
 msgstr "Грешка повезивања на ММС сервер"
 
-#: src/modplug/modplugbmp.h:53
+#: src/modplug/modplugbmp.h:57
 msgid "ModPlug (Module Player)"
 msgstr "Мод прикључак (Програм за модле)"
 
-#: src/modplug/plugin_main.cc:53
-msgid "Resolution"
-msgstr "Резолуција"
-
-#: src/modplug/plugin_main.cc:54
-msgid "8-bit"
-msgstr "8 бита"
-
 #: src/modplug/plugin_main.cc:55
-msgid "16-bit"
-msgstr "16 бита"
-
-#: src/modplug/plugin_main.cc:56
 msgid "Channels"
 msgstr "Бр. канала"
 
-#: src/modplug/plugin_main.cc:60
+#: src/modplug/plugin_main.cc:59
 msgid "Nearest (fastest)"
 msgstr "Најближе (најбрже)"
 
-#: src/modplug/plugin_main.cc:61
+#: src/modplug/plugin_main.cc:60
 msgid "Linear (fast)"
 msgstr "Линеарно (брзо)"
 
-#: src/modplug/plugin_main.cc:62
+#: src/modplug/plugin_main.cc:61
 msgid "Spline (good)"
 msgstr "Сп-крива (добро)"
 
-#: src/modplug/plugin_main.cc:63
+#: src/modplug/plugin_main.cc:62
 msgid "Polyphase (best)"
 msgstr "Полифазни (најбоље)"
 
-#: src/modplug/plugin_main.cc:64
+#: src/modplug/plugin_main.cc:63
 msgid "Sample rate"
 msgstr "Проток узорка:"
 
-#: src/modplug/plugin_main.cc:65
+#: src/modplug/plugin_main.cc:64
 msgid "22 kHz"
 msgstr "22 kHz"
 
-#: src/modplug/plugin_main.cc:66
+#: src/modplug/plugin_main.cc:65
 msgid "44 kHz"
 msgstr "44 kHz"
 
-#: src/modplug/plugin_main.cc:67
+#: src/modplug/plugin_main.cc:66
 msgid "48 kHz"
 msgstr "48 kHz"
 
-#: src/modplug/plugin_main.cc:68
+#: src/modplug/plugin_main.cc:67
 msgid "96 kHz"
 msgstr "96 kHz"
 
-#: src/modplug/plugin_main.cc:72 src/modplug/plugin_main.cc:77
-#: src/modplug/plugin_main.cc:82
+#: src/modplug/plugin_main.cc:71 src/modplug/plugin_main.cc:76
+#: src/modplug/plugin_main.cc:81
 msgid "Level:"
 msgstr "Ниво:"
 
-#: src/modplug/plugin_main.cc:78
+#: src/modplug/plugin_main.cc:77
 msgid "Cutoff:"
 msgstr "Прекид:"
 
-#: src/modplug/plugin_main.cc:91
+#: src/modplug/plugin_main.cc:90
 msgid "Reverb"
 msgstr "Одјек"
 
-#: src/modplug/plugin_main.cc:94
+#: src/modplug/plugin_main.cc:93
 msgid "Bass Boost"
 msgstr "Прираст баса"
 
-#: src/modplug/plugin_main.cc:97
+#: src/modplug/plugin_main.cc:96
 msgid "Surround"
 msgstr "Окружење"
 
-#: src/modplug/plugin_main.cc:100
+#: src/modplug/plugin_main.cc:99
 msgid "Preamp"
 msgstr "Претпојачање"
 
-#: src/modplug/plugin_main.cc:107
+#: src/modplug/plugin_main.cc:106
 msgid "Oversample"
 msgstr "Преклапање"
 
-#: src/modplug/plugin_main.cc:108
+#: src/modplug/plugin_main.cc:107
 msgid "Noise reduction"
 msgstr "Смањење буке"
 
-#: src/modplug/plugin_main.cc:109
+#: src/modplug/plugin_main.cc:108
 msgid "Play Amiga MODs"
 msgstr "Пуштај Амига МОД-е"
 
-#: src/modplug/plugin_main.cc:110
+#: src/modplug/plugin_main.cc:109
 msgid "Repeat"
 msgstr "Понови"
 
-#: src/modplug/plugin_main.cc:111
+#: src/modplug/plugin_main.cc:110
 msgid "Repeat count:"
 msgstr "Број понављања:"
 
-#: src/modplug/plugin_main.cc:112
+#: src/modplug/plugin_main.cc:111
 msgid "To repeat forever, set the repeat count to -1."
 msgstr "За непрекидно понављање, поставите број понављања на -1."
 
-#: src/modplug/plugin_main.cc:125 src/sid/xs_config.cc:106
+#: src/modplug/plugin_main.cc:124 src/sid/xs_config.cc:106
 msgid "These settings will take effect when Audacious is restarted."
 msgstr ""
-"Ова подешавања ће ступити у дејство након поновног покретања Безочника."
+"Ова подешавања ће ступити у дејство након поновног покретања Аудацијуса."
+
+#: src/moonstone/main_window.cc:72 src/moonstone/main_window.cc:73
+#: src/qtui/main_window.cc:159 src/qtui/main_window.cc:160
+#: src/skins/menus.cc:107 src/skins-qt/menus.cc:98
+msgid "Stop After This Song"
+msgstr "Заустави након ове песме"
+
+#: src/moonstone/moonstone.cc:39
+msgid "Moonstone"
+msgstr "Месечев камен"
+
+#: src/moonstone/playlist_header.cc:212 src/qtui/playlist_header.cc:258
+msgid "Reset to Defaults"
+msgstr "Поврати на подразумевано"
+
+#: src/moonstone/playlist_model.cc:38 src/qtui/playlist_header.cc:232
+msgid "Now Playing"
+msgstr "Сад пуштам"
+
+#: src/moonstone/playlist_selection.cc:66
+#: src/playlist-manager/playlist-manager.cc:201
+#: src/playlist-manager-qt/playlist-manager-qt.cc:190
+msgid "Entries"
+msgstr "Уноси"
 
 #: src/mpg123/mpg123.cc:54
 msgid "MPG123 Plugin"
 msgstr "МПГ123 прикључак"
 
-#: src/mpg123/mpg123.cc:83
-msgid "Advanced"
-msgstr "Напредно"
-
-#: src/mpg123/mpg123.cc:84
+#: src/mpg123/mpg123.cc:82
 msgid "Use accurate length calculation (slow)"
 msgstr "Користи тачан прорачун трајања (споро)"
 
-#: src/mpg123/mpg123.cc:248
+#: src/mpg123/mpg123.cc:260
 msgid "Surround"
 msgstr "Окружење"
 
-#: src/mpris2/plugin.cc:39
+#: src/mpris2/plugin.cc:40
 msgid "MPRIS 2 Server"
 msgstr "МПРИС 2 сервер"
 
-#: src/neon/neon.cc:97
+#: src/neon/neon.cc:102
 msgid "Neon HTTP/HTTPS Plugin"
 msgstr "Неон ХТТП/ХХТПС прикључак"
 
-#: src/neon/neon.cc:521
+#: src/neon/neon.cc:526
 msgid "Error parsing redirect"
 msgstr "Грешка обраде преусмерења"
 
-#: src/neon/neon.cc:535
+#: src/neon/neon.cc:540
 msgid "Unknown HTTP error"
 msgstr "Непозната ХТТП грешка"
 
-#: src/neon/neon.cc:569
+#: src/neon/neon.cc:614
 msgid "Error parsing URL"
 msgstr "Грешка обраде адресе"
 
-#: src/neon/neon.cc:632
+#: src/neon/neon.cc:687
 msgid "Too many redirects"
 msgstr "Превише преусмерења"
 
-#: src/notify/event.cc:64
+#: src/notify/event.cc:97
 msgid "Stopped"
 msgstr "Заустављено"
 
-#: src/notify/event.cc:64
+#: src/notify/event.cc:97
 msgid "Audacious is not playing."
-msgstr "Безочник не пушта песме."
+msgstr "Аудацијус не пушта песме."
 
-#: src/notify/notify.cc:42
+#: src/notify/notify.cc:39
 msgid "Desktop Notifications"
 msgstr "Обавештења радне површи"
 
-#: src/notify/notify.cc:60
+#: src/notify/notify.cc:57
 msgid ""
 "Desktop Notifications Plugin for Audacious\n"
 "Copyright (C) 2010 Maximilian Bogner\n"
@@ -2643,9 +2801,9 @@
 "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 ""
-"Прикључак обавештавања радне површи за Безочника\n"
+"Прикључак обавештавања радне површи за Аудацијуса\n"
 "Ауторска права (C) 2010 Максимилијан Богнер\n"
-"Ауторска права (C) 2011 Џон Линдгрин и Жан-Александр Англе д'Орјак\n"
+"Ауторска права (C) 2011-2013 Џон Линдгрин и Жан-Александр Англе д'Орјак\n"
 "\n"
 "Овај прикључак је слободан софтвер: можете га прослеђивати\n"
 "и/или мењати под условима Гнуове опште јавне лиценце коју је\n"
@@ -2660,36 +2818,79 @@
 "Требали сте да примите примерак Гнуове опште јавне лиценце уз овај\n"
 "програм. Ако нисте, погледајте <http://www.gnu.org/licenses/>."
 
-#: src/notify/notify.cc:110
+#: src/notify/notify.cc:104
 msgid "Show playback controls"
 msgstr "Прикажи дугмад за пуштање"
 
-#: src/notify/notify.cc:112
+#: src/notify/notify.cc:106
 msgid "Always show notification"
 msgstr "Звек прикажи обавештења"
 
-#: src/notify/notify.cc:114
+#: src/notify/notify.cc:108
 msgid "Include album name in notification"
 msgstr "Укључи назив албума у обавештењу"
 
-#: src/notify/osd.cc:58
+#: src/notify/notify.cc:110
+msgid "Custom notification duration:"
+msgstr "Трајање произвољног обавештења:"
+
+#: src/notify/osd.cc:74
 msgid "Show"
 msgstr "Прикажи"
 
-#: src/notify/osd.cc:66 src/qtui/main_window.cc:178
-#: src/qtui/main_window.cc:179 src/skins/menus.cc:88
-msgid "Pause"
-msgstr "Паузирај"
+#: src/openmpt/mpt.cc:50
+msgid "OpenMPT (Module Player)"
+msgstr "ОпенМПТ (Пуштач модула)"
 
-#: src/notify/osd.cc:73 src/qtui/main_window.cc:72 src/skins/menus.cc:91
-msgid "Next"
-msgstr "Следећа"
+#: src/openmpt/mpt.cc:132
+msgid ""
+"Module player based on libopenmpt\n"
+"\n"
+"Written by: Chris Spiegel <cspiegel@gmail.com>"
+msgstr ""
+"Пуштач модула заснован на „libopenmpt“\n"
+"\n"
+"Написао је: Крис Шпигел <cspiegel@gmail.com>"
+
+#: src/openmpt/mpt.cc:151
+msgid "Stereo separation:"
+msgstr "Стерео раздвајање:"
 
-#: src/oss4/oss.h:93
+#: src/openmpt/mpt.cc:153
+msgid "% (0=mono, 100=default, 200=full)"
+msgstr ""
+
+#: src/openmpt/mpt.cc:157
+msgid "Interpolation:"
+msgstr "Уметање:"
+
+#: src/openmpt/mptwrap.h:51 src/soxr/sox-resampler.cc:189 src/xsf/plugin.cc:437
+msgid "Linear"
+msgstr "Линеарно"
+
+#: src/openmpt/mptwrap.h:52
+msgid "Cubic"
+msgstr "Кубично"
+
+#: src/openmpt/mptwrap.h:53
+msgid "Windowed sinc"
+msgstr "Упрозорчено усклађивање"
+
+#: src/opus/opus.cc:39
+msgid "Opus Decoder"
+msgstr ""
+
+#: src/opus/opus.cc:336
+msgid ""
+"Opus Decoder Plugin for Audacious\n"
+"Copyright 2022 Thomas Lange"
+msgstr ""
+
+#: src/oss4/oss.h:70
 msgid "OSS4 Output"
 msgstr "ОСС4 излаз"
 
-#: src/oss4/oss.h:95
+#: src/oss4/oss.h:72
 msgid "OSS3 Output"
 msgstr "ОСС3 излаз"
 
@@ -2697,27 +2898,27 @@
 msgid "Default device"
 msgstr "Основни уређај"
 
-#: src/oss4/plugin.cc:77
+#: src/oss4/plugin.cc:78
 msgid "Audio device:"
 msgstr "Звучни уређај:"
 
-#: src/oss4/plugin.cc:80
+#: src/oss4/plugin.cc:81
 msgid "Use alternate device:"
 msgstr "Користи алтернативни уређај:"
 
-#: src/oss4/plugin.cc:84
+#: src/oss4/plugin.cc:85
 msgid "Save volume between sessions."
 msgstr "Сачувајте јачину звука између сесија."
 
-#: src/oss4/plugin.cc:86
+#: src/oss4/plugin.cc:87
 msgid "Enable format conversions made by the OSS software."
 msgstr "Укључује претварање формата направљено ОСС софтвером."
 
-#: src/oss4/plugin.cc:88
+#: src/oss4/plugin.cc:89
 msgid "Enable exclusive mode to prevent virtual mixing."
 msgstr "Укључује искључиви режим да спречи виртуално мешање."
 
-#: src/oss4/plugin.cc:100
+#: src/oss4/plugin.cc:101
 msgid ""
 "OSS4 Output Plugin for Audacious\n"
 "Copyright 2010-2012 Michał Lipski\n"
@@ -2725,25 +2926,41 @@
 "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"
+"Прикључак ОСС4 излаза за Аудацијуса\n"
 "Ауторска права 2010-2012 Михал Липски\n"
 "\n"
 "Желим да се захвалим људима на „#audacious“, нарочито Тони Вруну и Џону "
 "Линдгрину и наравно ауторима претходног ОСС прикључка."
 
-#: src/playlist-manager/playlist-manager.cc:37
+#: src/pipewire/pipewire.cc:44
+msgid "PipeWire Output"
+msgstr ""
+
+#: src/pipewire/pipewire.cc:118
+msgid ""
+"PipeWire Output Plugin for Audacious\n"
+"Copyright 2022 Thomas Lange\n"
+"\n"
+"Based on the PipeWire Output Plugin for Qmmp\n"
+"Copyright 2021 Ilya Kotov"
+msgstr ""
+
+#: src/pipewire/pipewire.cc:408 src/skins/menus.cc:88 src/skins-qt/menus.cc:79
+msgid "Playback"
+msgstr "Пуштање"
+
+#: src/playlist-manager/playlist-manager.cc:38
+#: src/playlist-manager-qt/playlist-manager-qt.cc:42
 msgid "Playlist Manager"
 msgstr "Управник списка нумера"
 
-#: src/playlist-manager/playlist-manager.cc:226
-msgid "Entries"
-msgstr "Уноси"
-
-#: src/playlist-manager/playlist-manager.cc:245
+#: src/playlist-manager/playlist-manager.cc:221
+#: src/playlist-manager-qt/playlist-manager-qt.cc:356
 msgid "_Remove"
 msgstr "_Уклони"
 
-#: src/playlist-manager/playlist-manager.cc:246
+#: src/playlist-manager/playlist-manager.cc:222
+#: src/playlist-manager-qt/playlist-manager-qt.cc:351
 msgid "Ren_ame"
 msgstr "_Преименуј"
 
@@ -2751,56 +2968,69 @@
 msgid "PLS Playlists"
 msgstr "ПЛС спискови нумера"
 
-#: src/psf/plugin.cc:45
+#: src/psf/plugin.cc:53
 msgid "OpenPSF PSF1/PSF2 Decoder"
 msgstr "ОпенПСФ ПСФ1/ПСФ2 декодер"
 
-#: src/pulse_audio/pulse_audio.cc:38
+#: src/psf/plugin.cc:270
+msgid "OpenPSF Configuration"
+msgstr "ОпенПСФ подешавања"
+
+#: src/psf/plugin.cc:271 src/xsf/plugin.cc:444
+msgid "Ignore length from file"
+msgstr "Занемари трајање из датотеке"
+
+#: src/pulse/pulse_audio.cc:42
 msgid "PulseAudio Output"
 msgstr "Пулс‑аудио излаз"
 
-#: src/pulse_audio/pulse_audio.cc:611
+#: src/pulse/pulse_audio.cc:84
+msgid "Context name:"
+msgstr "Назив садржаја:"
+
+#: src/pulse/pulse_audio.cc:86
+msgid "Stream name:"
+msgstr "Назив тока:"
+
+#: src/pulse/pulse_audio.cc:596
 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 ""
-"ПулсеАудио излазни прикључак Безочника\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"
-"Овај програм је слободан софтвер; можете га прослеђивати\n"
-"и/или мењати под условима ГНУ Опште јавне лиценце коју је\n"
-"објавила Задужбина слободног софтвера; верзије 2 лиценце\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"
-"Овај програм се расподељује у нади да ће бити користан,\n"
-"али БЕЗ ИКАКВЕ ГАРАНЦИЈЕ; чак и без примењене гаранције\n"
-"ТРЖИШНЕ ВРЕДНОСТИ или ПРИЛАГОЂЕНОСТИ ОДРЕЂЕНОЈ НАМЕНИ.\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"
 "\n"
-"Требали сте да примите примерак ГНУ Опште јавне лиценце\n"
-"уз овај програм; ако нисте, пишите Задужбини слободног\n"
-"софтва на адресу: Free Software Foundation, Inc.,\n"
-"51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
-"USA."
+"Овај програм је слободан софтвер; можете га расподељивати и/или мењати под "
+"условима Гнуове опште јавне лиценце коју је објавила Задужбина слободног "
+"софтвера; издања 2 лиценце или (по вашем избору) било којег новијег издања.\n"
+"\n"
+"Овај програм се расподељује у нади да ће бити користан, али БЕЗ ИКАКВЕ "
+"ГАРАНЦИЈЕ; чак и без примењене гаранције ТРЖИШНЕ ВРЕДНОСТИ или "
+"ПРИЛАГОЂЕНОСТИ ОДРЕЂЕНОЈ НАМЕНИ. Погледајте Гнуову Општу јавну лиценцу за "
+"више детаља.\n"
+"\n"
+"Требали сте да примите примерак Гнуове Опште јавне лиценце уз овај програм. "
+"Ако нисте, пишите Задужбини слободног софтвера на адресу: „Free Software "
+"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, "
+"USA“."
 
-#: src/qtaudio/qtaudio.cc:49
+#: src/qtaudio/qtaudio.cc:53
 msgid "QtMultimedia Output"
 msgstr "Излаз Кут мултимедија"
 
-#: src/qtaudio/qtaudio.cc:77
+#: src/qtaudio/qtaudio.cc:84
 msgid ""
 "QtMultimedia Audio Output Plugin for Audacious\n"
 "Copyright 2014 William Pitcock\n"
@@ -2808,56 +3038,116 @@
 "Based on SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
 msgstr ""
-"Прикључак аудио излаза Кут мултимедија за Безочника\n"
+"Прикључак аудио излаза Кут мултимедија за Аудацијуса\n"
 "Ауторска права 2014 Вилијам Питкок\n"
 "\n"
-"Засновано на прикључку СДЛ излаза за Безочника\n"
+"Засновано на прикључку СДЛ излаза за Аудацијуса\n"
 "Ауторска права 2010 Џон Линдгрин"
 
-#: src/qtui/dialog_windows.cc:31
-msgid "Working ..."
-msgstr "Радим ..."
+#: src/qtglspectrum/gl-spectrum.cc:41
+msgid ""
+"OpenGL Spectrum Analyzer for Audacious\n"
+"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
+"Copyright 2014, 2020 Ariadne Conill\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 ""
+"ОпенГЛ анализатор спектра за Аудацијуса\n"
+"Ауторска права 2013 Кристоф Буде, Џон Линдгрин, и Карло Брамини\n"
+"Ауторска права 2014, 2020 Ариадне Конил\n"
+"\n"
+"Засновано на ИКсММС прикључку:\n"
+"Ауторска права 1998-2000 Питер Алм, Мајкол Алм, Оле Халнас, Томас Нилсон, и "
+"4Фронт Технологије\n"
+"\n"
+"Дозвола: ОЈЛв2+"
 
-#: src/qtui/filter_input.cc:44 src/skins/ui_playlist.cc:221
-msgid "Search"
-msgstr "Потражи"
+#: src/qthotkey/gui.cc:177
+msgid "Press a key combination inside a text field."
+msgstr "Притисните комбинацију тастера унутар поља за текст."
 
-#: src/qtui/main_window_actions.cc:94
+#: src/qthotkey/plugin.cc:105
+msgid ""
+"Global Hotkey Plugin\n"
+"Control the player with global key combinations or multimedia keys.\n"
+"\n"
+"Copyright (C) 2020 i.Dark_Templar <darktemplar@dark-templar-archives.net>\n"
+"Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n"
+"\n"
+"Contributors 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"
+"Ауторска права © 2020 i.Dark_Templar <darktemplar@dark-templar-archives."
+"net>\n"
+"Ауторска права © 2007-2008 Саша Хлусјак <contact@saschahlusiak.de>\n"
+"\n"
+"У доприносиоце спадају:\n"
+"Ауторска права © 2006-2007 Владимир Пасков <vlado.paskov@gmail.com>\n"
+"Ауторска права © 2000-2002 Виле Сирјала <syrjala@sci.fi>,\n"
+" Брајан Дејвис <curious@ihug.com.au>,\n"
+" Џонатан А. Дејвис <davis@jdhouse.org>,\n"
+" Џереми Тан <nsx@nsx.homeip.net>"
+
+#: src/qtui/menus.cc:109
 msgid "_Open Folder ..."
 msgstr "Отвори _фасциклу ..."
 
-#: src/qtui/main_window_actions.cc:96
+#: src/qtui/menus.cc:115
 msgid "_Add Folder ..."
 msgstr "_Додај фасциклу ..."
 
-#: src/qtui/main_window_actions.cc:101
+#: src/qtui/menus.cc:128
 msgid "_Log Inspector ..."
 msgstr "Надзорник _дневника ..."
 
-#: src/qtui/main_window.cc:64
-msgid "Open Files"
-msgstr "Отвори датотеке"
+#: src/qtui/menus.cc:220
+msgid "_Find ..."
+msgstr "_Нађи..."
 
-#: src/qtui/main_window.cc:66
-msgid "Add Files"
-msgstr "Додај датотеке"
+#: src/qtui/menus.cc:256 src/skins/menus.cc:80 src/skins-qt/menus.cc:70
+msgid "Audio Settings ..."
+msgstr "Подешавања звука ..."
 
-#: src/qtui/main_window.cc:71 src/skins/menus.cc:90
-msgid "Previous"
-msgstr "Претходна"
+#: src/qtui/playlist_model.cc:188
+msgid "Q#"
+msgstr "Q#"
 
-#: src/qtui/main_window.cc:77 src/skins/menus.cc:82
-msgid "Repeat"
-msgstr "Понови"
+#: src/qtui/playlist_model.cc:190
+msgid "T#"
+msgstr "T#"
 
-#: src/qtui/main_window.cc:79 src/skins/menus.cc:83
-msgid "Shuffle"
-msgstr "Насумично"
+#: src/qtui/playlist_model.cc:192
+msgid "C#"
+msgstr ""
 
-#: src/qtui/qtui.cc:42
+#: src/qtui/playlist_model.cc:194
+msgid "D#"
+msgstr ""
+
+#: src/qtui/qtui.cc:40
 msgid "Qt Interface"
 msgstr "Кут сучеље"
 
+#: src/qtui/search_bar.cc:46
+msgid "Search playlist"
+msgstr "Претражи списак нумера"
+
+#: src/qtui/settings.cc:79
+msgid "Use bold font for column headers"
+msgstr "Користи подебљање слова за заглавља колона"
+
 #: src/resample/resample.cc:43
 msgid "Sample Rate Converter"
 msgstr "Претварач протока узорка"
@@ -2867,7 +3157,7 @@
 "Sample Rate Converter Plugin for Audacious\n"
 "Copyright 2010-2012 John Lindgren"
 msgstr ""
-"Прикључак Претварача протока узорка за Безочника\n"
+"Прикључак Претварача протока узорка за Аудацијуса\n"
 "Ауторска права 2010-2012 Џон Линдгрин"
 
 #: src/resample/resample.cc:187
@@ -2898,7 +3188,7 @@
 msgid "Method:"
 msgstr "Метод:"
 
-#: src/resample/resample.cc:199 src/sox-resampler/sox-resampler.cc:161
+#: src/resample/resample.cc:199 src/soxr/sox-resampler.cc:203
 msgid "Rate:"
 msgstr "Проток:"
 
@@ -2950,65 +3240,53 @@
 msgid "192 kHz:"
 msgstr "192 kHz:"
 
-#: src/scrobbler2/config_window.cc:41
-#, c-format
-msgid "OK. Scrobbling for user: %s"
-msgstr "У реду. Скроблујем за корисника: %s"
-
-#: src/scrobbler2/config_window.cc:54
-msgid "Permission Denied"
-msgstr "Овлашћења су одбијена"
-
-#: src/scrobbler2/config_window.cc:56
-msgid "Access the following link to allow Audacious to scrobble your plays:"
-msgstr ""
-"Приступите следећој вези да омогућите Безочнику да скроблује ваша пуштања:"
-
-#: src/scrobbler2/config_window.cc:66
-msgid "Keep this window open and click 'Check Permission' again.\n"
-msgstr ""
-"Задржите овај прозор отвореним и опет притисните „Провери овлашћења“.\n"
+#: src/scrobbler2/config_window.cc:29
+msgid "Checking Last.fm access ..."
+msgstr "Проверавам приступ Ласт.фм-у ..."
 
-#: src/scrobbler2/config_window.cc:69 src/scrobbler2/config_window.cc:80
+#: src/scrobbler2/config_window.cc:35
 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."
+"Your scrobbles are being saved on your computer temporarily. They will be "
+"submitted as soon as Audacious is allowed access."
 msgstr ""
-"Не брините. Ваша скробловања су сачувана на вашем рачунару.\n"
-"Биће послата чим Безочнику то буде било омогућено."
+"Ваша скробловања су привремено сачувана на вашем рачунару. Биће предата чим "
+"Аудацијусу буде био дозвољен приступ."
 
-#: src/scrobbler2/config_window.cc:77
-msgid "Network Problem."
-msgstr "Проблем са мрежом."
+#: src/scrobbler2/config_window.cc:41
+#, c-format
+msgid "Permission granted. Scrobbling for user %s."
+msgstr "Овлашћење је дато. Скроблујем за корисника %s."
 
-#: src/scrobbler2/config_window.cc:78
-msgid "There was a problem contacting Last.fm. Please try again later."
+#: src/scrobbler2/config_window.cc:44
+msgid ""
+"Permission denied. Open the following URL in a browser, allow Audacious "
+"access to your account, and then click 'Check Permission' again:"
 msgstr ""
-"Дошло је до проблема ступања у везу са Ласт.фм-ом. Касније покушајте поново."
+"Овлашћење је одбијено. Отворите следећу адресу у прегледнику, дозволите "
+"Аудацијусу приступ вашем налогу, и затим поново кликните „Овери овлашћење“:"
 
-#: src/scrobbler2/config_window.cc:110
-msgid "Checking..."
-msgstr "Проверавам..."
+#: src/scrobbler2/config_window.cc:53
+msgid "There was a problem contacting Last.fm."
+msgstr "Дошло је до проблема приликом ступања у везу са Ласт.фм-ом."
 
-#: src/scrobbler2/config_window.cc:176
-msgid "C_heck Permission"
-msgstr "_Провери овлашћења"
+#: src/scrobbler2/config_window.cc:92
+msgid "Check Permission"
+msgstr "Овери овлашћење"
 
-#: src/scrobbler2/config_window.cc:177
-msgid "_Revoke Permission"
-msgstr "_Уклони овлашћења"
+#: src/scrobbler2/config_window.cc:93
+msgid "Revoke Permission"
+msgstr "Опозови овлашћење"
 
-#: src/scrobbler2/config_window.cc:220
-msgid ""
-"You need to allow Audacious to scrobble tracks to your Last.fm account.\n"
+#: src/scrobbler2/config_window.cc:97
+msgid "You need to allow Audacious to scrobble tracks to your Last.fm account."
 msgstr ""
-"Требате да омогућите Безочнику да скроблује нумере до вашег Ласт.фм налога.\n"
+"Треба да дозволите Аудацијусу да скроблује нумере на ваш налог Ласт.фм-а."
 
 #: src/scrobbler2/scrobbler.cc:29
 msgid "Scrobbler 2.0"
 msgstr "Скроблер 2.0"
 
-#: src/scrobbler2/scrobbler.cc:224
+#: src/scrobbler2/scrobbler.cc:200
 msgid ""
 "The Scrobbler plugin could not be started.\n"
 "There might be a problem with your installation."
@@ -3016,64 +3294,34 @@
 "Прикључак Скроблера не може бити покренут.\n"
 "Можда је проблем са вашом инсталацијом."
 
-#: src/scrobbler2/scrobbler.cc:289
+#: src/scrobbler2/scrobbler.cc:245
 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"
+"project."
 msgstr ""
-"Безочников прикључак скроблера 2.0 је написао Питксјоки,\n"
-"\n"
-"Ауторска права © 2012-2013 Луис М. Пићоки Оливеира <Pitxyoki@Gmail.com>\n"
-"\n"
-"Захваљујем се Џону Линдгрину што ми је помогао на почетку овог пројекта.\n"
-"\n"
 
-#: src/scrobbler2/scrobbler_communication.cc:642
-msgid ""
-"Audacious is now using an improved version of the Last.fm Scrobbler.\n"
-"Please check the Preferences for the Scrobbler plugin."
-msgstr ""
-"Безочник сада користи побољшано издање Ласт.фм-овог Скроблера.\n"
-"Проверите у поставкама за прикључком Скроблера"
-
-#: src/sdlout/sdlout.cc:48
+#: src/sdlout/sdlout.cc:43
 msgid "SDL Output"
 msgstr "СДЛ излаз"
 
-#: src/sdlout/sdlout.cc:77
+#: src/sdlout/sdlout.cc:72
 msgid ""
 "SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
 msgstr ""
-"Прикључак СДЛ излаза за Безочника\n"
+"Прикључак СДЛ излаза за Аудацијуса\n"
 "Ауторска права 2010 Џон Линдгрин"
 
-#: src/search-tool/search-tool.cc:116 src/search-tool/search-tool.cc:124
+#: src/search-tool/library.cc:35 src/search-tool/library.cc:46
+#: src/search-tool-qt/library.cc:35 src/search-tool-qt/library.cc:46
 msgid "Library"
 msgstr "Библиотека"
 
-#: src/search-tool/search-tool.cc:394
-#, c-format
-msgid "%d result"
-msgid_plural "%d results"
-msgstr0 "%d резултат"
-msgstr1 "%d резултата"
-msgstr2 "%d резултата"
-
-#: src/search-tool/search-tool.cc:400
-#, c-format
-msgid "(%d hidden)"
-msgid_plural "(%d hidden)"
-msgstr0 "(%d скривена)"
-msgstr1 "(%d скривене)"
-msgstr2 "(%d скривених)"
-
-#: src/search-tool/search-tool.cc:594
+#: src/search-tool-qt/search-model.cc:44 src/search-tool/search-tool.cc:287
 #, c-format
 msgid "%d song"
 msgid_plural "%d songs"
@@ -3081,54 +3329,78 @@
 msgstr1 "%d песме"
 msgstr2 "%d песама"
 
-#: src/search-tool/search-tool.cc:601
+#: src/search-tool-qt/search-model.cc:53 src/search-tool/search-tool.cc:294
 msgid "of this genre"
 msgstr "овог жанра"
 
-#: src/search-tool/search-tool.cc:607
+#: src/search-tool-qt/search-model.h:47 src/search-tool/search-model.h:45
 msgid "on"
 msgstr " "
 
-#: src/search-tool/search-tool.cc:607
+#: src/search-tool-qt/search-model.h:47 src/search-tool/search-model.h:45
 msgid "by"
 msgstr "изводи"
 
-#: src/search-tool/search-tool.cc:643
-msgid "_Create Playlist"
-msgstr "_Направи списак нумера"
+#: src/search-tool-qt/search-tool-qt.cc:165 src/search-tool/search-tool.cc:74
+msgid "Number of results to show:"
+msgstr "Број резултата за приказивање:"
+
+#: src/search-tool-qt/search-tool-qt.cc:168 src/search-tool/search-tool.cc:77
+msgid "Rescan library at startup"
+msgstr "Поново прегледај збирку приликом покретања"
+
+#: src/search-tool-qt/search-tool-qt.cc:170
+msgid "Monitor library for changes"
+msgstr "Надгледај збирку за изменама"
 
-#: src/search-tool/search-tool.cc:645
-msgid "_Add to Playlist"
-msgstr "_Додај у списак нумера"
-
-#: src/search-tool/search-tool.cc:684
-msgid "Search library"
-msgstr "Претражите библиотеку"
-
-#: src/search-tool/search-tool.cc:688
+#: src/search-tool-qt/search-tool-qt.cc:193 src/search-tool/search-tool.cc:450
 msgid ""
 "To import your music library into Audacious, choose a folder and then click "
 "the \"refresh\" icon."
 msgstr ""
-"Да увезете вашу музичку библиотеку у Безочнику, изаберите фасциклу и затим "
+"Да увезете вашу музичку библиотеку у Аудацијусу, изаберите фасциклу и затим "
 "кликните на иконицу „освежи“."
 
-#: src/search-tool/search-tool.cc:696
+#: src/search-tool-qt/search-tool-qt.cc:195 src/search-tool/search-tool.cc:459
 msgid "Please wait ..."
 msgstr "Молим сачекајте ..."
 
-#: src/search-tool/search-tool.cc:723
+#: src/search-tool-qt/search-tool-qt.cc:197 src/search-tool/search-tool.cc:487
 msgid "Choose Folder"
 msgstr "Изаберите фасциклу"
 
+#: src/search-tool-qt/search-tool-qt.cc:201 src/search-tool/search-tool.cc:445
+msgid "Search library"
+msgstr "Претражите библиотеку"
+
+#: src/search-tool-qt/search-tool-qt.cc:327 src/search-tool/search-tool.cc:156
+#, c-format
+msgid "%d of %d result shown"
+msgid_plural "%d of %d results shown"
+msgstr0 "Приказан је %d од %d резултата"
+msgstr1 "Приказана су %d од %d резултата"
+msgstr2 "Приказано је %d од %d резултата"
+
+#: src/search-tool-qt/search-tool-qt.cc:331 src/search-tool/search-tool.cc:160
+#, c-format
+msgid "%d result"
+msgid_plural "%d results"
+msgstr0 "%d резултат"
+msgstr1 "%d резултата"
+msgstr2 "%d резултата"
+
+#: src/search-tool-qt/search-tool-qt.cc:501 src/search-tool/search-tool.cc:341
+msgid "_Create Playlist"
+msgstr "_Направи списак нумера"
+
+#: src/search-tool-qt/search-tool-qt.cc:503 src/search-tool/search-tool.cc:343
+msgid "_Add to Playlist"
+msgstr "_Додај у списак нумера"
+
 #: src/sid/xmms-sid.cc:43
 msgid "SID Player"
 msgstr "СИД пуштач"
 
-#: src/sid/xs_config.cc:61
-msgid "Output"
-msgstr "Излаз"
-
 #: src/sid/xs_config.cc:62
 msgid "Channels:"
 msgstr "Бр. канала:"
@@ -3198,7 +3470,7 @@
 "Silence Removal Plugin for Audacious\n"
 "Copyright 2014 John Lindgren"
 msgstr ""
-"Прикључак уклањања тишине за Безочника\n"
+"Прикључак уклањања тишине за Аудацијуса\n"
 "Ауторска права 2014 Џон Линдгрин"
 
 #: src/silence-removal/silence-removal.cc:67
@@ -3209,741 +3481,684 @@
 msgid "Threshold:"
 msgstr "Осетљивост:"
 
-#: src/silence-removal/silence-removal.cc:70
-msgid "dB"
-msgstr "dB"
+#: src/skins/actions.cc:45 src/skins-qt/actions.cc:43
+msgid "Repeat points cleared."
+msgstr "Понови очишћене тачке."
 
-#: src/skins/menus.cc:64
+#: src/skins/actions.cc:60 src/skins-qt/actions.cc:58
+msgid "Repeat point A set."
+msgstr "Понови скуп тачке А."
+
+#: src/skins/actions.cc:65 src/skins-qt/actions.cc:63
+msgid "Repeat point B set."
+msgstr "Понови скуп тачке Б."
+
+#: src/skins/equalizer.cc:223 src/skins-qt/equalizer.cc:223
+msgid "Preamp"
+msgstr "Претпојачање"
+
+#: src/skins/equalizer.cc:227 src/skins-qt/equalizer.cc:227
+msgid "31 Hz"
+msgstr "31 Hz"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "63 Hz"
+msgstr "63 Hz"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "125 Hz"
+msgstr "125 Hz"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "250 Hz"
+msgstr "250 Hz"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "500 Hz"
+msgstr "500 Hz"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "1 kHz"
+msgstr "1 kHz"
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "2 kHz"
+msgstr "2 kHz"
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "4 kHz"
+msgstr "4 kHz"
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "8 kHz"
+msgstr "8 kHz"
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "16 kHz"
+msgstr "16 kHz"
+
+#: src/skins/equalizer.cc:270 src/skins-qt/equalizer.cc:270
+msgid "Audacious Equalizer"
+msgstr "Уједначавач Аудацијуса"
+
+#: src/skins/main.cc:459 src/skins-qt/main.cc:442
+msgid "Recording on"
+msgstr "Снимање је укључено"
+
+#: src/skins/main.cc:461 src/skins-qt/main.cc:444
+msgid "Recording off"
+msgstr "Снимање је искључено"
+
+#: src/skins/main.cc:754 src/skins-qt/main.cc:701
+#, c-format
+msgid "Seek to %d:%-2.2d / %d:%-2.2d"
+msgstr "Тражи до: %d:%-2.2d / %d:%-2.2d"
+
+#: src/skins/main.cc:771 src/skins-qt/main.cc:718
+#, c-format
+msgid "Volume: %d%%"
+msgstr "Јачина звука: %d%%"
+
+#: src/skins/main.cc:784 src/skins-qt/main.cc:731
+#, c-format
+msgid "Balance: %d%% left"
+msgstr "Уравнотеженост: %d%% леви"
+
+#: src/skins/main.cc:786 src/skins-qt/main.cc:733
+msgid "Balance: center"
+msgstr "Уравнотеженост: центрирано"
+
+#: src/skins/main.cc:788 src/skins-qt/main.cc:735
+#, c-format
+msgid "Balance: %d%% right"
+msgstr "Уравнотеженост: %d%% десни"
+
+#: src/skins/main.cc:880 src/skins-qt/main.cc:827
+msgid "Options Menu"
+msgstr "Изборник опција"
+
+#: src/skins/main.cc:884 src/skins-qt/main.cc:831
+msgid "Disable 'Always On Top'"
+msgstr "Искључи „Увек у првом плану“"
+
+#: src/skins/main.cc:886 src/skins-qt/main.cc:833
+msgid "Enable 'Always On Top'"
+msgstr "Укључи „Увек у првом плану“"
+
+#: src/skins/main.cc:889 src/skins-qt/main.cc:836
+msgid "File Info Box"
+msgstr "Поље података датотеке"
+
+#: src/skins/main.cc:892 src/skins/menus.cc:149 src/skins-qt/main.cc:839
+#: src/skins-qt/menus.cc:142
+msgid "Double Size"
+msgstr "Двострука величина"
+
+#: src/skins/main.cc:895 src/skins-qt/main.cc:842
+msgid "Visualizations"
+msgstr "Визуализације"
+
+#: src/skins/menus.cc:74 src/skins-qt/menus.cc:64
+msgid "Volume Up"
+msgstr "Појачај"
+
+#: src/skins/menus.cc:75 src/skins-qt/menus.cc:65
+msgid "Volume Down"
+msgstr "Утишај"
+
+#: src/skins/menus.cc:77 src/skins-qt/menus.cc:67
+msgid "Effects ..."
+msgstr "Дејства ..."
+
+#: src/skins/menus.cc:84 src/skins-qt/menus.cc:74
 msgid "Open Files ..."
 msgstr "Отвори датотеке ..."
 
-#: src/skins/menus.cc:65
+#: src/skins/menus.cc:85 src/skins-qt/menus.cc:76
 msgid "Open URL ..."
 msgstr "Отвори адресу ..."
 
-#: src/skins/menus.cc:66
-msgid "Search Library"
-msgstr "Претражи библиотеку"
-
-#: src/skins/menus.cc:68
-msgid "Playback"
-msgstr "Пуштање"
-
-#: src/skins/menus.cc:69
+#: src/skins/menus.cc:89 src/skins-qt/menus.cc:80
 msgid "Playlist"
 msgstr "Списак нумера"
 
-#: src/skins/menus.cc:70
+#: src/skins/menus.cc:90 src/skins-qt/menus.cc:81
+msgid "Output"
+msgstr "Излаз"
+
+#: src/skins/menus.cc:91 src/skins-qt/menus.cc:82
 msgid "View"
 msgstr "Поглед"
 
-#: src/skins/menus.cc:72 src/skins/menus.cc:136 src/skins/menus.cc:149
-#: src/skins/menus.cc:214
+#: src/skins/menus.cc:93 src/skins/menus.cc:161 src/skins/menus.cc:174
+#: src/skins/menus.cc:245 src/skins-qt/menus.cc:84 src/skins-qt/menus.cc:156
+#: src/skins-qt/menus.cc:170 src/skins-qt/menus.cc:241
 msgid "Services"
 msgstr "Услуге"
 
-#: src/skins/menus.cc:74
+#: src/skins/menus.cc:95 src/skins-qt/menus.cc:86
 msgid "About ..."
 msgstr "О програму ..."
 
-#: src/skins/menus.cc:75
+#: src/skins/menus.cc:96 src/skins-qt/menus.cc:87
 msgid "Settings ..."
 msgstr "Подешавања ..."
 
-#: src/skins/menus.cc:76
+#: src/skins/menus.cc:97 src/skins-qt/menus.cc:88
 msgid "Quit"
 msgstr "Изађи"
 
-#: src/skins/menus.cc:80 src/skins/menus.cc:206
+#: src/skins/menus.cc:101 src/skins/menus.cc:235 src/skins-qt/menus.cc:92
+#: src/skins-qt/menus.cc:231
 msgid "Song Info ..."
 msgstr "Подаци о песми ..."
 
-#: src/skins/menus.cc:84
+#: src/skins/menus.cc:105 src/skins-qt/menus.cc:96
+msgid "Shuffle by Album"
+msgstr "Насумично према албуму"
+
+#: src/skins/menus.cc:106 src/skins-qt/menus.cc:97
 msgid "No Playlist Advance"
 msgstr "Не напредуј у списку нумера"
 
-#: src/skins/menus.cc:85
-msgid "Stop After This Song"
-msgstr "Заустави након ове песме"
-
-#: src/skins/menus.cc:93
+#: src/skins/menus.cc:117 src/skins-qt/menus.cc:108
 msgid "Set A-B Repeat"
 msgstr "Постави А—Б понављања"
 
-#: src/skins/menus.cc:94
+#: src/skins/menus.cc:118 src/skins-qt/menus.cc:109
 msgid "Clear A-B Repeat"
 msgstr "Очисти А—Б понављања"
 
-#: src/skins/menus.cc:96
+#: src/skins/menus.cc:120 src/skins-qt/menus.cc:111
 msgid "Jump to Song ..."
 msgstr "Пређи на песму ..."
 
-#: src/skins/menus.cc:97
+#: src/skins/menus.cc:121 src/skins-qt/menus.cc:113
 msgid "Jump to Time ..."
 msgstr "Пређи на време ..."
 
-#: src/skins/menus.cc:101
+#: src/skins/menus.cc:125 src/skins-qt/menus.cc:118
 msgid "Play/Resume"
 msgstr "Пусти/Настави"
 
-#: src/skins/menus.cc:103
+#: src/skins/menus.cc:127 src/skins-qt/menus.cc:120
 msgid "New Playlist"
 msgstr "Нови списак нумера"
 
-#: src/skins/menus.cc:104
+#: src/skins/menus.cc:128 src/skins-qt/menus.cc:121
 msgid "Rename Playlist ..."
 msgstr "Преименуј списак нумера ..."
 
-#: src/skins/menus.cc:105
+#: src/skins/menus.cc:129 src/skins-qt/menus.cc:122
 msgid "Remove Playlist"
 msgstr "Нови списак нумера"
 
-#: src/skins/menus.cc:107
+#: src/skins/menus.cc:131 src/skins-qt/menus.cc:124
 msgid "Previous Playlist"
 msgstr "Претходни списак нумера"
 
-#: src/skins/menus.cc:108
+#: src/skins/menus.cc:132 src/skins-qt/menus.cc:125
 msgid "Next Playlist"
 msgstr "Следећи списак нумера"
 
-#: src/skins/menus.cc:110
+#: src/skins/menus.cc:134 src/skins-qt/menus.cc:127
 msgid "Import Playlist ..."
 msgstr "Увези списак нумера ..."
 
-#: src/skins/menus.cc:111
+#: src/skins/menus.cc:135 src/skins-qt/menus.cc:128
 msgid "Export Playlist ..."
 msgstr "Извези списак нумера ..."
 
-#: src/skins/menus.cc:113
+#: src/skins/menus.cc:137 src/skins-qt/menus.cc:130
 msgid "Playlist Manager ..."
 msgstr "Управник списка нумера ..."
 
-#: src/skins/menus.cc:114
+#: src/skins/menus.cc:138 src/skins-qt/menus.cc:131
 msgid "Queue Manager ..."
 msgstr "Управник редоследа ..."
 
-#: src/skins/menus.cc:116
+#: src/skins/menus.cc:140 src/skins-qt/menus.cc:133
 msgid "Refresh Playlist"
 msgstr "Освежи списак нумера"
 
-#: src/skins/menus.cc:120
+#: src/skins/menus.cc:144 src/skins-qt/menus.cc:137
 msgid "Show Playlist Editor"
 msgstr "Прикажи уређивач списка нумера"
 
-#: src/skins/menus.cc:121
+#: src/skins/menus.cc:145 src/skins-qt/menus.cc:138
 msgid "Show Equalizer"
 msgstr "Прикажи уједначавач"
 
-#: src/skins/menus.cc:123
+#: src/skins/menus.cc:147 src/skins-qt/menus.cc:140
 msgid "Show Remaining Time"
 msgstr "Прикажи преостало време"
 
-#: src/skins/menus.cc:125
+#: src/skins/menus.cc:150 src/skins-qt/menus.cc:143
 msgid "Always on Top"
 msgstr "Увек у првом плану"
 
-#: src/skins/menus.cc:126
+#: src/skins/menus.cc:151 src/skins-qt/menus.cc:145
 msgid "On All Workspaces"
 msgstr "Све на радне просторе"
 
-#: src/skins/menus.cc:128
+#: src/skins/menus.cc:153 src/skins-qt/menus.cc:148
 msgid "Roll Up Player"
 msgstr "Замотај плејер"
 
-#: src/skins/menus.cc:129
+#: src/skins/menus.cc:154 src/skins-qt/menus.cc:149
 msgid "Roll Up Playlist Editor"
 msgstr "Замотај уређивач списка нумера"
 
-#: src/skins/menus.cc:130
+#: src/skins/menus.cc:155 src/skins-qt/menus.cc:150
 msgid "Roll Up Equalizer"
 msgstr "Замотај уједначавач"
 
-#: src/skins/menus.cc:132 src/skins/ui_main.cc:854
-msgid "Double Size"
-msgstr "Двострука величина"
-
-#: src/skins/menus.cc:138
+#: src/skins/menus.cc:163 src/skins-qt/menus.cc:158
 msgid "Add URL ..."
 msgstr "Додај адресу ..."
 
-#: src/skins/menus.cc:139
+#: src/skins/menus.cc:164 src/skins-qt/menus.cc:160
 msgid "Add Files ..."
 msgstr "Додај датотеке ..."
 
-#: src/skins/menus.cc:143 src/skins/menus.cc:171 src/skins/menus.cc:185
+#: src/skins/menus.cc:168 src/skins/menus.cc:196 src/skins/menus.cc:212
+#: src/skins-qt/menus.cc:164 src/skins-qt/menus.cc:192
+#: src/skins-qt/menus.cc:208
 msgid "By Title"
 msgstr "Према наслову"
 
-#: src/skins/menus.cc:144 src/skins/menus.cc:178 src/skins/menus.cc:192
+#: src/skins/menus.cc:169 src/skins/menus.cc:203 src/skins/menus.cc:219
+#: src/skins-qt/menus.cc:165 src/skins-qt/menus.cc:199
+#: src/skins-qt/menus.cc:215
 msgid "By File Name"
 msgstr "Према називу датотеке"
 
-#: src/skins/menus.cc:145 src/skins/menus.cc:179 src/skins/menus.cc:193
+#: src/skins/menus.cc:170 src/skins/menus.cc:204 src/skins/menus.cc:220
+#: src/skins-qt/menus.cc:166 src/skins-qt/menus.cc:200
+#: src/skins-qt/menus.cc:216
 msgid "By File Path"
 msgstr "Према путањи датотеке"
 
-#: src/skins/menus.cc:151
+#: src/skins/menus.cc:176 src/skins-qt/menus.cc:172
 msgid "Remove All"
 msgstr "Уклони све"
 
-#: src/skins/menus.cc:152
+#: src/skins/menus.cc:177 src/skins-qt/menus.cc:173
 msgid "Clear Queue"
 msgstr "Обриши заказано"
 
-#: src/skins/menus.cc:154
+#: src/skins/menus.cc:179 src/skins-qt/menus.cc:175
 msgid "Remove Unavailable Files"
 msgstr "Уклони недоступне датотеке"
 
-#: src/skins/menus.cc:155
+#: src/skins/menus.cc:180 src/skins-qt/menus.cc:176
 msgid "Remove Duplicates"
 msgstr "Уклони дупликате"
 
-#: src/skins/menus.cc:157
+#: src/skins/menus.cc:182 src/skins-qt/menus.cc:178
 msgid "Remove Unselected"
 msgstr "Уклони неозначене"
 
-#: src/skins/menus.cc:158
+#: src/skins/menus.cc:183 src/skins-qt/menus.cc:179
 msgid "Remove Selected"
 msgstr "Уклони означене"
 
-#: src/skins/menus.cc:162
+#: src/skins/menus.cc:187 src/skins-qt/menus.cc:183
 msgid "Search and Select"
 msgstr "Претражи и означи"
 
-#: src/skins/menus.cc:164
+#: src/skins/menus.cc:189 src/skins-qt/menus.cc:185
 msgid "Invert Selection"
 msgstr "Обрни избор"
 
-#: src/skins/menus.cc:165
+#: src/skins/menus.cc:190 src/skins-qt/menus.cc:186
 msgid "Select None"
 msgstr "Означи ништа"
 
-#: src/skins/menus.cc:166
+#: src/skins/menus.cc:191 src/skins-qt/menus.cc:187
 msgid "Select All"
 msgstr "Означи све"
 
-#: src/skins/menus.cc:170 src/skins/menus.cc:184
+#: src/skins/menus.cc:195 src/skins/menus.cc:211 src/skins-qt/menus.cc:191
+#: src/skins-qt/menus.cc:207
 msgid "By Track Number"
 msgstr "Према броју нумере"
 
-#: src/skins/menus.cc:172 src/skins/menus.cc:186
+#: src/skins/menus.cc:197 src/skins/menus.cc:213 src/skins-qt/menus.cc:193
+#: src/skins-qt/menus.cc:209
 msgid "By Artist"
 msgstr "Према извођачу"
 
-#: src/skins/menus.cc:173 src/skins/menus.cc:187
+#: src/skins/menus.cc:198 src/skins/menus.cc:214 src/skins-qt/menus.cc:194
+#: src/skins-qt/menus.cc:210
 msgid "By Album"
 msgstr "Према албуму"
 
-#: src/skins/menus.cc:174 src/skins/menus.cc:188
+#: src/skins/menus.cc:199 src/skins/menus.cc:215 src/skins-qt/menus.cc:195
+#: src/skins-qt/menus.cc:211
 msgid "By Album Artist"
 msgstr "Према извођачу албума"
 
-#: src/skins/menus.cc:175 src/skins/menus.cc:190
+#: src/skins/menus.cc:200 src/skins/menus.cc:216 src/skins-qt/menus.cc:196
+#: src/skins-qt/menus.cc:212
 msgid "By Release Date"
 msgstr "Према датуму издавања"
 
-#: src/skins/menus.cc:176 src/skins/menus.cc:189
+#: src/skins/menus.cc:201 src/skins/menus.cc:217 src/skins-qt/menus.cc:197
+#: src/skins-qt/menus.cc:213
 msgid "By Genre"
 msgstr "Према жанру"
 
-#: src/skins/menus.cc:177 src/skins/menus.cc:191
+#: src/skins/menus.cc:202 src/skins/menus.cc:218 src/skins-qt/menus.cc:198
+#: src/skins-qt/menus.cc:214
 msgid "By Length"
 msgstr "Према трајању"
 
-#: src/skins/menus.cc:180 src/skins/menus.cc:194
+#: src/skins/menus.cc:205 src/skins/menus.cc:221 src/skins-qt/menus.cc:201
+#: src/skins-qt/menus.cc:217
 msgid "By Custom Title"
 msgstr "Према произвољном наслову"
 
-#: src/skins/menus.cc:198
+#: src/skins/menus.cc:206 src/skins/menus.cc:222 src/skins-qt/menus.cc:202
+#: src/skins-qt/menus.cc:218
+msgid "By Comment"
+msgstr "Према коментару"
+
+#: src/skins/menus.cc:207 src/skins/menus.cc:223 src/skins-qt/menus.cc:203
+#: src/skins-qt/menus.cc:219
+msgid "By Disc Number"
+msgstr ""
+
+#: src/skins/menus.cc:227 src/skins-qt/menus.cc:223
 msgid "Randomize List"
 msgstr "Насумице испремештај списак"
 
-#: src/skins/menus.cc:199
+#: src/skins/menus.cc:228 src/skins-qt/menus.cc:224
 msgid "Reverse List"
 msgstr "Преокрени списак"
 
-#: src/skins/menus.cc:201
+#: src/skins/menus.cc:230 src/skins-qt/menus.cc:226
 msgid "Sort Selected"
 msgstr "Поређај означене"
 
-#: src/skins/menus.cc:202
+#: src/skins/menus.cc:231 src/skins-qt/menus.cc:227
 msgid "Sort List"
 msgstr "Поређај списак"
 
-#: src/skins/menus.cc:208
+#: src/skins/menus.cc:236 src/skins-qt/menus.cc:232
+msgid "Open Containing Folder"
+msgstr "Отвори садржавајућу фасциклу"
+
+#: src/skins/menus.cc:238 src/skins-qt/menus.cc:234
 msgid "Cut"
 msgstr "Исеци"
 
-#: src/skins/menus.cc:209
+#: src/skins/menus.cc:239 src/skins-qt/menus.cc:235
 msgid "Copy"
 msgstr "Умножи"
 
-#: src/skins/menus.cc:210
+#: src/skins/menus.cc:240 src/skins-qt/menus.cc:236
 msgid "Paste"
 msgstr "Убаци"
 
-#: src/skins/menus.cc:212
+#: src/skins/menus.cc:241 src/skins-qt/menus.cc:237
+msgid "Paste at End"
+msgstr "Убаци на крај"
+
+#: src/skins/menus.cc:243 src/skins-qt/menus.cc:239
 msgid "Queue/Unqueue"
 msgstr "Стави у ред/Избаци из реда"
 
-#: src/skins/menus.cc:218
-msgid "Load Preset ..."
-msgstr "Учитај претподешавање ..."
-
-#: src/skins/menus.cc:219
-msgid "Load Auto Preset ..."
-msgstr "Учитај самостално претподешавање ..."
-
-#: src/skins/menus.cc:220
-msgid "Load Default"
-msgstr "Учитај основно"
-
-#: src/skins/menus.cc:221
-msgid "Load Preset File ..."
-msgstr "Учитај датотеку претподешавања ..."
-
-#: src/skins/menus.cc:222
-msgid "Load EQF File ..."
-msgstr "Учитај ЕКуФ датотеку ..."
-
-#: src/skins/menus.cc:224
-msgid "Save Preset ..."
-msgstr "Сачувај претподешавање ..."
-
-#: src/skins/menus.cc:225
-msgid "Save Auto Preset ..."
-msgstr "Сачувај самостално претподешавање ..."
-
-#: src/skins/menus.cc:226
-msgid "Save Default"
-msgstr "Сачувај основно"
-
-#: src/skins/menus.cc:227
-msgid "Save Preset File ..."
-msgstr "Сачувај датотеку претподешавања ..."
-
-#: src/skins/menus.cc:228
-msgid "Save EQF File ..."
-msgstr "Сачувај ЕКуФ датотеку ..."
-
-#: src/skins/menus.cc:230
-msgid "Delete Preset ..."
-msgstr "Обриши претподешавање ..."
-
-#: src/skins/menus.cc:231
-msgid "Delete Auto Preset ..."
-msgstr "Обриши самостално претподешавање ..."
-
-#: src/skins/menus.cc:233
-msgid "Import Winamp Presets ..."
-msgstr "Увези Винамп претподешавања ..."
-
-#: src/skins/menus.cc:235
-msgid "Reset to Zero"
-msgstr "Врати на нулу"
+#: src/skins/playlist-widget.cc:58 src/skins-qt/playlist-widget.cc:58
+#, c-format
+msgid "%s (%d of %d)"
+msgstr "%s (%d од %d)"
+
+#: src/skins/playlistwin.cc:491 src/skins-qt/playlistwin.cc:478
+msgid "Audacious Playlist Editor"
+msgstr "Уређивач списка нумера"
 
-#: src/skins/plugin.cc:48
+#: src/skins/plugin.cc:53 src/skins-qt/plugin.cc:65
 msgid "Winamp Classic Interface"
 msgstr "Винампово уобичајено сучеље"
 
-#: src/skins/preset-browser.cc:57 src/skins/preset-list.cc:371
-#: src/skins/preset-list.cc:386
-msgid "Save"
-msgstr "Сачувај"
-
-#: src/skins/preset-browser.cc:57 src/skins/preset-list.cc:338
-#: src/skins/preset-list.cc:354
-msgid "Load"
-msgstr "Учитај"
-
-#: src/skins/preset-browser.cc:83
-msgid "Load Preset File"
-msgstr "Учитај датотеку претподешавања"
-
-#: src/skins/preset-browser.cc:100
-msgid "Load EQF File"
-msgstr "Учитај ЕКуФ датотеку"
-
-#: src/skins/preset-browser.cc:119
-msgid "Save Preset File"
-msgstr "Сачувај датотеку претподешавања"
-
-#: src/skins/preset-browser.cc:137
-msgid "Save EQF File"
-msgstr "Сачувај ЕКуФ датотеку"
-
-#: src/skins/preset-browser.cc:151
-msgid "Import Winamp Presets"
-msgstr "Увези Винамп претподешавања"
-
-#: src/skins/preset-list.cc:285
-msgid "Presets"
-msgstr "Претподешавања"
-
-#: src/skins/preset-list.cc:335
-msgid "Load preset"
-msgstr "Учитава претподешавање"
-
-#: src/skins/preset-list.cc:351
-msgid "Load auto-preset"
-msgstr "Учитава самостално претподешавање"
-
-#: src/skins/preset-list.cc:367
-msgid "Save preset"
-msgstr "Чува претподешавање"
-
-#: src/skins/preset-list.cc:382
-msgid "Save auto-preset"
-msgstr "Чува самостално претподешавање"
-
-#: src/skins/preset-list.cc:408
-msgid "Delete preset"
-msgstr "Избриши претподешавање"
-
-#: src/skins/preset-list.cc:424
-msgid "Delete auto-preset"
-msgstr "Брише самостално претподешавање"
+#: src/skins-qt/menus.cc:75
+msgid "Open Folder ..."
+msgstr "Отвори фасциклу ..."
+
+#: src/skins-qt/menus.cc:159
+msgid "Add Folder ..."
+msgstr "Додај фасциклу ..."
+
+#: src/skins-qt/search-select.cc:62 src/skins/search-select.cc:77
+msgid "Search entries in active playlist"
+msgstr "Претражи ставке у активном списку нумера"
 
-#: src/skins/skins_cfg.cc:176
+#: src/skins-qt/search-select.cc:70 src/skins/search-select.cc:83
+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-qt/search-select.cc:75 src/skins/search-select.cc:91
+msgid "Title:"
+msgstr "Наслов:"
+
+#: src/skins-qt/search-select.cc:79 src/skins/search-select.cc:96
+msgid "Album:"
+msgstr "Албум:"
+
+#: src/skins-qt/search-select.cc:82 src/skins/search-select.cc:101
+msgid "Artist:"
+msgstr "Извођач:"
+
+#: src/skins-qt/search-select.cc:85 src/skins/search-select.cc:106
+msgid "File Name:"
+msgstr "Назив датотеке:"
+
+#: src/skins-qt/search-select.cc:88 src/skins/search-select.cc:134
+msgid "Clear previous selection before searching"
+msgstr "Обриши претходни избор пре претраге"
+
+#: src/skins-qt/search-select.cc:89 src/skins/search-select.cc:137
+msgid "Automatically toggle queue for matching entries"
+msgstr "Подударајуће ставке самостално пребаци у ред"
+
+#: src/skins-qt/search-select.cc:90 src/skins/search-select.cc:140
+msgid "Create a new playlist with matching entries"
+msgstr "Направи нови списак нумера са подударајућим ставкама"
+
+#: src/skins-qt/search-select.cc:101 src/skins/search-select.cc:78
+msgid "Search"
+msgstr "Потражи"
+
+#: src/skins-qt/skins_cfg.cc:198 src/skins/skins_cfg.cc:182
 msgid "Player:"
 msgstr "Пуштач:"
 
-#: src/skins/skins_cfg.cc:178
+#: src/skins-qt/skins_cfg.cc:200 src/skins/skins_cfg.cc:184
 msgid "Select main player window font:"
 msgstr "Изаберите словни лик главног прозора програма:"
 
-#: src/skins/skins_cfg.cc:179
+#: src/skins-qt/skins_cfg.cc:201 src/skins/skins_cfg.cc:185
 msgid "Playlist:"
 msgstr "Списак нумера:"
 
-#: src/skins/skins_cfg.cc:181
+#: src/skins-qt/skins_cfg.cc:203 src/skins/skins_cfg.cc:187
 msgid "Select playlist font:"
 msgstr "Изабери словни лик списка нумера:"
 
-#: src/skins/skins_cfg.cc:187
+#: src/skins-qt/skins_cfg.cc:207 src/skins/skins_cfg.cc:191
 msgid "Skin"
 msgstr "Маска"
 
-#: src/skins/skins_cfg.cc:189
+#: src/skins-qt/skins_cfg.cc:211 src/skins/skins_cfg.cc:193
+msgid "Display active titlebar when any window is focused"
+msgstr "Приказује активну траку наслова када је било који прозор у фокусу"
+
+#: src/skins-qt/skins_cfg.cc:213 src/skins/skins_cfg.cc:195
 msgid "Fonts"
 msgstr "Слова"
 
-#: src/skins/skins_cfg.cc:192
+#: src/skins-qt/skins_cfg.cc:215 src/skins/skins_cfg.cc:197
 msgid "Use bitmap fonts (supports ASCII only)"
 msgstr "Користи битмап словне ликове (подржава само АСКРИ)"
 
-#: src/skins/skins_cfg.cc:194
+#: src/skins-qt/skins_cfg.cc:217 src/skins/skins_cfg.cc:199
 msgid "Scroll song title"
 msgstr "Померај наслов песме"
 
-#: src/skins/skins_cfg.cc:196
+#: src/skins-qt/skins_cfg.cc:219 src/skins/skins_cfg.cc:201
 msgid "Scroll song title in both directions"
 msgstr "Померај наслов песме у оба смера"
 
-#: src/skins/skins_cfg.cc:201
+#: src/skins-qt/skins_cfg.cc:224 src/skins/skins_cfg.cc:206
 msgid "Analyzer"
 msgstr "Анализатор"
 
-#: src/skins/skins_cfg.cc:202
+#: src/skins-qt/skins_cfg.cc:225 src/skins/skins_cfg.cc:207
 msgid "Scope"
 msgstr "Досег"
 
-#: src/skins/skins_cfg.cc:203
+#: src/skins-qt/skins_cfg.cc:226 src/skins/skins_cfg.cc:208
 msgid "Voiceprint / VU meter"
 msgstr "Режим отиска гласа / ВУ мерач"
 
-#: src/skins/skins_cfg.cc:204
+#: src/skins-qt/skins_cfg.cc:227 src/skins/skins_cfg.cc:209
 msgid "Off"
 msgstr "Искључено"
 
-#: src/skins/skins_cfg.cc:208 src/skins/skins_cfg.cc:233
-#: src/skins/skins_cfg.cc:239
+#: src/skins-qt/skins_cfg.cc:231 src/skins-qt/skins_cfg.cc:256
+#: src/skins-qt/skins_cfg.cc:262 src/skins/skins_cfg.cc:213
+#: src/skins/skins_cfg.cc:238 src/skins/skins_cfg.cc:244
 msgid "Normal"
 msgstr "Нормалан"
 
-#: src/skins/skins_cfg.cc:209 src/skins/skins_cfg.cc:234
+#: src/skins-qt/skins_cfg.cc:232 src/skins-qt/skins_cfg.cc:257
+#: src/skins/skins_cfg.cc:214 src/skins/skins_cfg.cc:239
 msgid "Fire"
 msgstr "Ватра"
 
-#: src/skins/skins_cfg.cc:210
+#: src/skins-qt/skins_cfg.cc:233 src/skins/skins_cfg.cc:215
 msgid "Vertical lines"
 msgstr "Усправне линије"
 
-#: src/skins/skins_cfg.cc:214
+#: src/skins-qt/skins_cfg.cc:237 src/skins/skins_cfg.cc:219
 msgid "Lines"
 msgstr "Линије"
 
-#: src/skins/skins_cfg.cc:215
+#: src/skins-qt/skins_cfg.cc:238 src/skins/skins_cfg.cc:220
 msgid "Bars"
 msgstr "Траке"
 
-#: src/skins/skins_cfg.cc:219
+#: src/skins-qt/skins_cfg.cc:242 src/skins/skins_cfg.cc:224
 msgid "Slowest"
 msgstr "Најспорије"
 
-#: src/skins/skins_cfg.cc:220
+#: src/skins-qt/skins_cfg.cc:243 src/skins/skins_cfg.cc:225
 msgid "Slow"
 msgstr "Споро"
 
-#: src/skins/skins_cfg.cc:221 src/sox-resampler/sox-resampler.cc:152
+#: src/skins-qt/skins_cfg.cc:244 src/skins/skins_cfg.cc:226
+#: src/soxr/sox-resampler.cc:180
 msgid "Medium"
 msgstr "Средње"
 
-#: src/skins/skins_cfg.cc:222
+#: src/skins-qt/skins_cfg.cc:245 src/skins/skins_cfg.cc:227
 msgid "Fast"
 msgstr "Брзо"
 
-#: src/skins/skins_cfg.cc:223
+#: src/skins-qt/skins_cfg.cc:246 src/skins/skins_cfg.cc:228
 msgid "Fastest"
 msgstr "Најбрже"
 
-#: src/skins/skins_cfg.cc:227
+#: src/skins-qt/skins_cfg.cc:250 src/skins/skins_cfg.cc:232
 msgid "Dots"
 msgstr "Тачке"
 
-#: src/skins/skins_cfg.cc:228
+#: src/skins-qt/skins_cfg.cc:251 src/skins/skins_cfg.cc:233
 msgid "Line"
 msgstr "Линија"
 
-#: src/skins/skins_cfg.cc:229
+#: src/skins-qt/skins_cfg.cc:252 src/skins/skins_cfg.cc:234
 msgid "Solid"
 msgstr "Испуњено"
 
-#: src/skins/skins_cfg.cc:235
+#: src/skins-qt/skins_cfg.cc:258 src/skins/skins_cfg.cc:240
 msgid "Ice"
 msgstr "Лед"
 
-#: src/skins/skins_cfg.cc:240
+#: src/skins-qt/skins_cfg.cc:263 src/skins/skins_cfg.cc:245
 msgid "Smooth"
 msgstr "Глатко"
 
-#: src/skins/skins_cfg.cc:244
-msgid "Type"
-msgstr "Врста"
-
-#: src/skins/skins_cfg.cc:245
-msgid "Visualization type:"
-msgstr "Врста приказивања:"
-
-#: src/skins/skins_cfg.cc:248
-msgid "Analyzer"
-msgstr "Анализатор"
-
-#: src/skins/skins_cfg.cc:249
-msgid "Show peaks"
-msgstr "Прикажи врхунце"
-
-#: src/skins/skins_cfg.cc:251
+#: src/skins-qt/skins_cfg.cc:267 src/skins/skins_cfg.cc:249
 msgid "Coloring:"
 msgstr "Боја:"
 
-#: src/skins/skins_cfg.cc:254
+#: src/skins-qt/skins_cfg.cc:270 src/skins/skins_cfg.cc:252
 msgid "Style:"
 msgstr "Изглед:"
 
-#: src/skins/skins_cfg.cc:257
+#: src/skins-qt/skins_cfg.cc:273 src/skins/skins_cfg.cc:255
 msgid "Falloff:"
 msgstr "Опадање:"
 
-#: src/skins/skins_cfg.cc:260
+#: src/skins-qt/skins_cfg.cc:276 src/skins/skins_cfg.cc:258
 msgid "Peak falloff:"
 msgstr "Опадање врхова:"
 
-#: src/skins/skins_cfg.cc:264
+#: src/skins-qt/skins_cfg.cc:282 src/skins/skins_cfg.cc:264
 msgid "Scope Style:"
 msgstr "Режим досега:"
 
-#: src/skins/skins_cfg.cc:267
+#: src/skins-qt/skins_cfg.cc:285 src/skins/skins_cfg.cc:267
 msgid "Voiceprint Coloring:"
 msgstr "Обојавање отиска гласа:"
 
-#: src/skins/skins_cfg.cc:270
+#: src/skins-qt/skins_cfg.cc:288 src/skins/skins_cfg.cc:270
 msgid "VU Meter Style:"
 msgstr "Стил ВУ мерача:"
 
-#: src/skins/skins_cfg.cc:276
-msgid "General"
-msgstr "Опште"
-
-#: src/skins/skins_cfg.cc:277
-msgid "Visualization"
-msgstr "Приказивање"
-
-#: src/skins/ui_equalizer.cc:282
-msgid "Preamp"
-msgstr "Претпојачање"
-
-#: src/skins/ui_equalizer.cc:286
-msgid "31 Hz"
-msgstr "31 Hz"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "63 Hz"
-msgstr "63 Hz"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "125 Hz"
-msgstr "125 Hz"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "250 Hz"
-msgstr "250 Hz"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "500 Hz"
-msgstr "500 Hz"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "1 kHz"
-msgstr "1 kHz"
-
-#: src/skins/ui_equalizer.cc:288
-msgid "2 kHz"
-msgstr "2 kHz"
-
-#: src/skins/ui_equalizer.cc:288
-msgid "4 kHz"
-msgstr "4 kHz"
-
-#: src/skins/ui_equalizer.cc:288
-msgid "8 kHz"
-msgstr "8 kHz"
-
-#: src/skins/ui_equalizer.cc:288
-msgid "16 kHz"
-msgstr "16 kHz"
-
-#: src/skins/ui_equalizer.cc:330
-msgid "Audacious Equalizer"
-msgstr "Уједначавач Безочника"
-
-#: src/skins/ui_main.cc:688
-#, c-format
-msgid "Seek to %d:%-2.2d / %d:%-2.2d"
-msgstr "Тражи до: %d:%-2.2d / %d:%-2.2d"
-
-#: src/skins/ui_main.cc:709
-#, c-format
-msgid "Volume: %d%%"
-msgstr "Јачина звука: %d%%"
-
-#: src/skins/ui_main.cc:732
-#, c-format
-msgid "Balance: %d%% left"
-msgstr "Уравнотеженост: %d%% леви"
-
-#: src/skins/ui_main.cc:734
-msgid "Balance: center"
-msgstr "Уравнотеженост: центрирано"
-
-#: src/skins/ui_main.cc:736
-#, c-format
-msgid "Balance: %d%% right"
-msgstr "Уравнотеженост: %d%% десни"
-
-#: src/skins/ui_main.cc:842
-msgid "Options Menu"
-msgstr "Изборник опција"
-
-#: src/skins/ui_main.cc:846
-msgid "Disable 'Always On Top'"
-msgstr "Искључи „Увек у првом плану“"
-
-#: src/skins/ui_main.cc:848
-msgid "Enable 'Always On Top'"
-msgstr "Укључи „Увек у првом плану“"
-
-#: src/skins/ui_main.cc:851
-msgid "File Info Box"
-msgstr "Поље података датотеке"
-
-#: src/skins/ui_main.cc:857
-msgid "Visualizations"
-msgstr "Визуализације"
-
-#: src/skins/ui_main.cc:1336
-msgid "Repeat point A set."
-msgstr "Понови скуп тачке А."
-
-#: src/skins/ui_main.cc:1341
-msgid "Repeat point B set."
-msgstr "Понови скуп тачке Б."
-
-#: src/skins/ui_main.cc:1350
-msgid "Repeat points cleared."
-msgstr "Понови очишћене тачке."
-
-#: src/skins/ui_playlist.cc:219
-msgid "Search entries in active playlist"
-msgstr "Претражи ставке у активном списку нумера"
-
-#: src/skins/ui_playlist.cc:226
-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.cc:234
-msgid "Title:"
-msgstr "Наслов:"
-
-#: src/skins/ui_playlist.cc:241
-msgid "Album:"
-msgstr "Албум:"
-
-#: src/skins/ui_playlist.cc:248
-msgid "Artist:"
-msgstr "Извођач:"
-
-#: src/skins/ui_playlist.cc:255
-msgid "File Name:"
-msgstr "Назив датотеке:"
-
-#: src/skins/ui_playlist.cc:263
-msgid "Clear previous selection before searching"
-msgstr "Обриши претходни избор пре претраге"
+#: src/skins-qt/skins_cfg.cc:294 src/skins/skins_cfg.cc:276
+msgid "Type"
+msgstr "Врста"
 
-#: src/skins/ui_playlist.cc:266
-msgid "Automatically toggle queue for matching entries"
-msgstr "Подударајуће ставке самостално пребаци у ред"
+#: src/skins-qt/skins_cfg.cc:295 src/skins/skins_cfg.cc:277
+msgid "Visualization type:"
+msgstr "Врста приказивања:"
 
-#: src/skins/ui_playlist.cc:269
-msgid "Create a new playlist with matching entries"
-msgstr "Направи нови списак нумера са подударајућим ставкама"
+#: src/skins-qt/skins_cfg.cc:298 src/skins/skins_cfg.cc:280
+msgid "Analyzer"
+msgstr "Анализатор"
 
-#: src/skins/ui_playlist.cc:717
-msgid "Audacious Playlist Editor"
-msgstr "Уређивач списка нумера"
+#: src/skins-qt/skins_cfg.cc:299 src/skins/skins_cfg.cc:281
+msgid "Show peaks"
+msgstr "Прикажи врхунце"
 
-#: src/skins/ui_playlist.cc:752
-#, c-format
-msgid "%s (%d of %d)"
-msgstr "%s (%d од %d)"
+#: src/skins-qt/skins_cfg.cc:308 src/skins/skins_cfg.cc:290
+msgid "Visualization"
+msgstr "Приказивање"
 
-#: src/skins/ui_skinselector.cc:167
+#: src/skins-qt/skinselector.cc:98 src/skins/skinselector.cc:111
 msgid "Archived Winamp 2.x skin"
 msgstr "Архивирана Винамп 2.x маска"
 
-#: src/skins/ui_skinselector.cc:172
+#: src/skins-qt/skinselector.cc:102 src/skins/skinselector.cc:115
 msgid "Unarchived Winamp 2.x skin"
 msgstr "Неархивирана Винамп 2.x маска"
 
-#: src/skins/util.cc:430
-#, c-format
-msgid "Could not create directory (%s): %s\n"
-msgstr "Не могу да направим фасциклу (%s): %s\n"
-
-#: src/sndfile/plugin.cc:39
+#: src/sndfile/plugin.cc:38
 msgid "Sndfile Plugin"
 msgstr "Прикључак звучне датотеке"
 
-#: src/sndfile/plugin.cc:336
+#: src/sndfile/plugin.cc:372
 msgid ""
 "Based on the xmms_sndfile plugin:\n"
 "Copyright (C) 2000, 2002 Erik de Castro Lopo\n"
@@ -3967,7 +4182,7 @@
 "Заснован на прикључку иксммс_звучнедатотеке:\n"
 "Ауторска права (C) 2000, 2002 Ерик де Кастро Лопо\n"
 "\n"
-"За Безочника га је прилагодио Тони Врун <chainsaw@gentoo.org>\n"
+"За Аудацијуса га је прилагодио Тони Врун <chainsaw@gentoo.org>\n"
 "\n"
 "Овај програм је слободан софтвер; можете га прослеђивати\n"
 "и/или мењати под условима Гнуове Опште јавне лиценце коју је\n"
@@ -3984,108 +4199,111 @@
 "софтва на адресу: Free Software Foundation, Inc.,\n"
 "51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 
-#: src/sndio-ng/sndio.cc:44
+#: src/sndio/sndio.cc:43
 msgid "Sndio Output"
 msgstr "Излаз звкуи"
 
-#: src/sndio-ng/sndio.cc:98
+#: src/sndio/sndio.cc:98
 msgid "Device (blank for default):"
 msgstr "Уређај (празно за основно):"
 
-#: src/sndio-ng/sndio.cc:100
+#: src/sndio/sndio.cc:100
 msgid "Save and restore volume:"
 msgstr "Сачувај и врати јачину звка:"
 
-#: src/sndio-ng/sndio.cc:181
+#: src/sndio/sndio.cc:181
 #, c-format
 msgid "Sndio error: Unsupported audio format (%d)"
 msgstr "Звкуи грешка: Неподржан запис звука (%d)"
 
-#: src/sndio-ng/sndio.cc:192
+#: src/sndio/sndio.cc:192
 msgid "Sndio error: sio_open() failed"
 msgstr "Звкуи грешка: није успело „sio_open()“"
 
-#: src/sndio-ng/sndio.cc:222
+#: src/sndio/sndio.cc:221
 msgid "Sndio error: sio_setpar() failed"
 msgstr "Звкуи грешка: није успело „sio_setpar()“"
 
-#: src/sndio-ng/sndio.cc:234
+#: src/sndio/sndio.cc:233
 msgid "Sndio error: sio_start() failed"
 msgstr "Звкуи грешка: није успело „sio_start()“"
 
-#: src/song_change/song_change.cc:33
+#: src/songchange/song_change.cc:30
 msgid "Song Change"
 msgstr "Промена песме"
 
-#: src/song_change/song_change.cc:342
-msgid ""
-"Parameters passed to the shell should be encapsulated in "
-"quotes. Doing otherwise is a security risk."
-msgstr ""
-"Параметри прослеђени љусци би требало да буду у "
-"наводницима. Све другачије је безбедносни ризик."
-
-#: src/song_change/song_change.cc:358
+#: src/songchange/song_change.cc:256
 msgid "Commands"
 msgstr "Наредбе"
 
-#: src/song_change/song_change.cc:360
+#: src/songchange/song_change.cc:258
 msgid "Command to run when starting a new song:"
 msgstr "Наредба за покретање приликом почетка нове песме:"
 
-#: src/song_change/song_change.cc:364
+#: src/songchange/song_change.cc:261
+msgid "Command to run when stopping a song:"
+msgstr ""
+
+#: src/songchange/song_change.cc:264
 msgid "Command to run at the end of a song:"
 msgstr "Наредба за покретање при крају песме:"
 
-#: src/song_change/song_change.cc:368
+#: src/songchange/song_change.cc:267
 msgid "Command to run at the end of the playlist:"
 msgstr "Наредба за покретање при крају списка нумера:"
 
-#: src/song_change/song_change.cc:372
+#: src/songchange/song_change.cc:270
 msgid "Command to run when song title changes (for network streams):"
 msgstr "Наредба за покретање када се промени наслов песме (за мрежне токове):"
 
-#: src/song_change/song_change.cc:376
+#: src/songchange/song_change.cc:273
 msgid ""
-"You can use the following format strings which will be substituted before "
-"calling the command (not all are useful for the end-of-playlist command):\n"
-"\n"
-"%F: Frequency (in hertz)\n"
+"You can use the following format codes, which will be replaced before "
+"running the command.\n"
+"Not all are useful though for the song-stopped or end-of-playlist command."
+msgstr ""
+
+#: src/songchange/song_change.cc:276
+msgid ""
+"%a: Artist\n"
+"%b: Album\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"
+"%F: Frequency (Hertz)\n"
+"%l: Length (milliseconds)\n"
+"%n or %s: Formatted title (see playlist settings)\n"
 "%p: Currently playing (1 or 0)\n"
-"%a: Artist\n"
-"%b: Album\n"
-"%T: Track title"
-msgstr ""
-"Можете да користите следеће ниске записа које ће бити замењене пре позивања "
-"наредбе (нису све корисне за наредбу краја-списка-нумера):\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-info-qt/song-info.cc:32
-msgid "Song Info (Qt)"
-msgstr "Подаци о песми (Кут)"
+"%r: Rate (bits per second)\n"
+"%t: Playlist position\n"
+"%T: Title (unformatted)"
+msgstr ""
+"%a: Извођач\n"
+"%b: Албум\n"
+"%c: Број канала\n"
+"%f: Назив датотеке (пуна путања)\n"
+"%F: Учестаност (Херца)\n"
+"%l: Трајање (у милисекундама)\n"
+"%n или %s: Обликовани наслов (видите подешавања списка нумера)\n"
+"%p: Тренутно пуштена (1 или 0)\n"
+"%r: Проток (у битима у секунди)\n"
+"%t: Место на списку нумера\n"
+"%T: Наслов (необликовано)"
+
+#: src/songchange/song_change.cc:287
+msgid ""
+"Parameters passed to the shell should be enclosed in quotation marks.\n"
+"Unquoted parameters may lead to unexpected results."
+msgstr ""
+
+#: src/song-info-qt/song-info.cc:30
+msgid "Song Info"
+msgstr "Подаци о песми"
 
-#: src/sox-resampler/sox-resampler.cc:44
+#: src/soxr/sox-resampler.cc:44
 msgid "SoX Resampler"
 msgstr "СоКС поновни узорковач"
 
-#: src/sox-resampler/sox-resampler.cc:144
+#: src/soxr/sox-resampler.cc:172
 msgid ""
 "SoX Resampler Plugin for Audacious\n"
 "Copyright 2013 Michał Lipski\n"
@@ -4093,102 +4311,150 @@
 "Based on Sample Rate Converter Plugin:\n"
 "Copyright 2010-2012 John Lindgren"
 msgstr ""
-"Прикључак СоКС поновног узорковања за Безочника\n"
+"Прикључак СоКС поновног узорковања за Аудацијуса\n"
 "Ауторска права 2013 Михаљ Липски\n"
 "\n"
 "Засновано на прикључку претварача протока узорка:\n"
 "Ауторска права 2010-2012 Џон Линдгрин"
 
-#: src/sox-resampler/sox-resampler.cc:150
+#: src/soxr/sox-resampler.cc:178
 msgid "Quick"
 msgstr "Брзо"
 
-#: src/sox-resampler/sox-resampler.cc:151
+#: src/soxr/sox-resampler.cc:179
 msgid "Low"
 msgstr "Ниско"
 
-#: src/sox-resampler/sox-resampler.cc:153
+#: src/soxr/sox-resampler.cc:181
 msgid "High"
 msgstr "Високо"
 
-#: src/sox-resampler/sox-resampler.cc:154
+#: src/soxr/sox-resampler.cc:182
 msgid "Very High"
 msgstr "Врло високо"
 
-#: src/sox-resampler/sox-resampler.cc:158
+#: src/soxr/sox-resampler.cc:183
+msgid "Ultra High"
+msgstr "Ултра високо"
+
+#: src/soxr/sox-resampler.cc:187
+msgid "Minimum"
+msgstr "Најмање"
+
+#: src/soxr/sox-resampler.cc:188
+msgid "Intermediate"
+msgstr "Осредње"
+
+#: src/soxr/sox-resampler.cc:193
 msgid "Quality:"
 msgstr "Квалитет:"
 
-#: src/speed-pitch/speed-pitch.cc:51
+#: src/soxr/sox-resampler.cc:196
+msgid "Phase:"
+msgstr "Фаза:"
+
+#: src/soxr/sox-resampler.cc:200
+msgid "Allow aliasing"
+msgstr "Допусти преклапање"
+
+#: src/soxr/sox-resampler.cc:202
+msgid "Use steep filter"
+msgstr "Користи филтер стрмине"
+
+#: src/speedpitch/speed-pitch.cc:54
 msgid "Speed and Pitch"
 msgstr "Брзина и врхунац"
 
-#: src/speed-pitch/speed-pitch.cc:210
-msgid "Speed and Pitch"
-msgstr "Брзина и врхунац"
-
-#: src/speed-pitch/speed-pitch.cc:211
-msgid "Speed:"
-msgstr "Брзина:"
-
-#: src/speed-pitch/speed-pitch.cc:214
-msgid "Pitch:"
-msgstr "Врхунац:"
+#: src/speedpitch/speed-pitch.cc:247
+msgid "Speed"
+msgstr "Брзина"
+
+#: src/speedpitch/speed-pitch.cc:248
+msgid "Decouple from pitch"
+msgstr "Одвој од врхунца"
+
+#: src/speedpitch/speed-pitch.cc:250 src/speedpitch/speed-pitch.cc:258
+msgid "Multiplier:"
+msgstr "Множилац:"
+
+#: src/speedpitch/speed-pitch.cc:254
+msgid "Pitch"
+msgstr "Врхунац"
 
-#: src/statusicon/statusicon.cc:47
+#: src/statusicon-qt/statusicon.cc:45 src/statusicon/statusicon.cc:47
 msgid "Status Icon"
 msgstr "Иконица стања"
 
-#: src/statusicon/statusicon.cc:283
-msgid "Se_ttings ..."
-msgstr "_Подешавања ..."
-
-#: src/statusicon/statusicon.cc:372
+#: src/statusicon-qt/statusicon.cc:68
 msgid ""
-"Status Icon Plugin\n"
+"Status Icon Plugin (partial port for Qt interface)\n"
 "\n"
 "Copyright 2005-2007 Giacomo Lozito <james@develia.org>\n"
 "Copyright 2010 Michał Lipski <tallica@o2.pl>\n"
+"Copyright 2015 Eugene Paskevich <eugene@raptor.kiev.ua>\n"
 "\n"
 "This plugin provides a status icon, placed in\n"
 "the system tray area of the window manager."
 msgstr ""
-"Прикључак иконице стања\n"
+"Прикључак иконице стања (делимични прикључник за Кут сучеље)\n"
 "\n"
-"Ауторска права 2005-2007 Ђакомо Лоцито < james@develia.org >\n"
+"Ауторска права 2005-2007 Ђакомо Лоцито <james@develia.org>\n"
 "Ауторска права 2010 Михал Липски <tallica@o2.pl>\n"
+"Ауторска права 2015 Јуџин Пашкевич <eugene@raptor.kiev.ua>\n"
 "\n"
 "Овај додатак обезбеђује иконицу стања, смештену\n"
 "у области фиоке система управника прозора."
 
-#: src/statusicon/statusicon.cc:379
+#: src/statusicon-qt/statusicon.cc:89 src/statusicon/statusicon.cc:384
 msgid "Mouse Scroll Action"
 msgstr "Радња клизања мишем"
 
-#: src/statusicon/statusicon.cc:380
+#: src/statusicon-qt/statusicon.cc:90 src/statusicon/statusicon.cc:385
 msgid "Change volume"
 msgstr "Промени јачину звука"
 
-#: src/statusicon/statusicon.cc:383
+#: src/statusicon-qt/statusicon.cc:93 src/statusicon/statusicon.cc:388
 msgid "Change playing song"
 msgstr "Промени песму"
 
-#: src/statusicon/statusicon.cc:386
+#: src/statusicon-qt/statusicon.cc:96 src/statusicon/statusicon.cc:391
 msgid "Other Settings"
 msgstr "Остала подешавања"
 
-#: src/statusicon/statusicon.cc:387
+#: src/statusicon-qt/statusicon.cc:97 src/statusicon/statusicon.cc:392
 msgid "Disable the popup window"
 msgstr "Искључи прозор облачића"
 
-#: src/statusicon/statusicon.cc:389
+#: src/statusicon-qt/statusicon.cc:99 src/statusicon/statusicon.cc:394
 msgid "Close to the system tray"
 msgstr "Затвори у системску касету"
 
-#: src/statusicon/statusicon.cc:391
+#: src/statusicon-qt/statusicon.cc:101 src/statusicon/statusicon.cc:396
 msgid "Advance in playlist when scrolling upward"
 msgstr "Напредује у списку нумера када клиза унапред"
 
+#: src/statusicon-qt/statusicon.cc:116 src/statusicon/statusicon.cc:287
+msgid "Se_ttings ..."
+msgstr "_Подешавања ..."
+
+#: src/statusicon/statusicon.cc:377
+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 Ђакомо Лоцито < james@develia.org >\n"
+"Ауторска права 2010 Михал Липски <tallica@o2.pl>\n"
+"\n"
+"Овај додатак обезбеђује иконицу стања, смештену\n"
+"у области фиоке система управника прозора."
+
 #: src/stereo_plugin/stereo.cc:19
 msgid "Extra Stereo"
 msgstr "Додатни стерео"
@@ -4207,20 +4473,160 @@
 msgid "Extra Stereo"
 msgstr "Додатни стерео"
 
+#: src/streamtuner/icecast-model.cc:126 src/streamtuner/shoutcast-model.cc:131
+msgid "Type"
+msgstr "Врста"
+
+#: src/streamtuner/icecast-model.cc:132
+msgid "Current Song"
+msgstr "Текућа песма"
+
+#: src/streamtuner/icecast-model.cc:164
+msgid "Other"
+msgstr "Друго"
+
+#: src/streamtuner/ihr-model.cc:63
+msgid "Market"
+msgstr "Тржница"
+
+#: src/streamtuner/ihr-model.cc:156
+msgid "Call Letters"
+msgstr "Слова позива"
+
+#: src/streamtuner/ihr-model.cc:162
+msgid "Description"
+msgstr "Опис"
+
+#: src/streamtuner/shoutcast-model.cc:128
+msgid "Listeners"
+msgstr "Слушаоци"
+
+#: src/streamtuner/shoutcast-model.cc:188
+msgid "Top 500 Stations"
+msgstr "Топ 500 станица"
+
+#: src/streamtuner/shoutcast-model.cc:189
+msgid "Alternative"
+msgstr "Алтернативна"
+
+#: src/streamtuner/shoutcast-model.cc:190
+msgid "Blues"
+msgstr "Блуз"
+
+#: src/streamtuner/shoutcast-model.cc:191
+msgid "Classical"
+msgstr "Класична"
+
+#: src/streamtuner/shoutcast-model.cc:192
+msgid "Country"
+msgstr "Кантри"
+
+#: src/streamtuner/shoutcast-model.cc:193
+msgid "Decades"
+msgstr "Декадна"
+
+#: src/streamtuner/shoutcast-model.cc:194
+msgid "Easy Listening"
+msgstr "Лако слушање"
+
+#: src/streamtuner/shoutcast-model.cc:195
+msgid "Electronic"
+msgstr "Електронска"
+
+#: src/streamtuner/shoutcast-model.cc:196
+msgid "Folk"
+msgstr "Народна"
+
+#: src/streamtuner/shoutcast-model.cc:197
+msgid "Inspirational"
+msgstr "Надахњујућа"
+
+#: src/streamtuner/shoutcast-model.cc:198
+msgid "International"
+msgstr "Међународна"
+
+#: src/streamtuner/shoutcast-model.cc:199
+msgid "Jazz"
+msgstr "Џез"
+
+#: src/streamtuner/shoutcast-model.cc:200
+msgid "Latin"
+msgstr "Латинска"
+
+#: src/streamtuner/shoutcast-model.cc:201
+msgid "Metal"
+msgstr "Метал"
+
+#: src/streamtuner/shoutcast-model.cc:203
+msgid "New Age"
+msgstr "Ново доба"
+
+#: src/streamtuner/shoutcast-model.cc:204
+msgid "Pop"
+msgstr "Поп"
+
+#: src/streamtuner/shoutcast-model.cc:205
+msgid "Public Radio"
+msgstr "Јавни радио"
+
+#: src/streamtuner/shoutcast-model.cc:206
+msgid "R&B and Urban"
+msgstr "Р&Б и урбана"
+
+#: src/streamtuner/shoutcast-model.cc:207
+msgid "Rap"
+msgstr "Реп"
+
+#: src/streamtuner/shoutcast-model.cc:208
+msgid "Reggae"
+msgstr "Реге"
+
+#: src/streamtuner/shoutcast-model.cc:209
+msgid "Rock"
+msgstr "Рок"
+
+#: src/streamtuner/shoutcast-model.cc:210
+msgid "Seasonal and Holiday"
+msgstr "Сезонска и празнична"
+
+#: src/streamtuner/shoutcast-model.cc:211
+msgid "Soundtracks"
+msgstr "Филмска"
+
+#: src/streamtuner/shoutcast-model.cc:212
+msgid "Talk"
+msgstr "Разговор"
+
+#: src/streamtuner/shoutcast-model.cc:213
+msgid "Themes"
+msgstr "Теме"
+
+#: src/streamtuner/streamtuner.cc:59
+msgid "Shoutcast"
+msgstr "Шоуткаст"
+
+#: src/streamtuner/streamtuner.cc:60
+msgid "Icecast"
+msgstr "Ајскаст"
+
+#: src/streamtuner/streamtuner.cc:71
+msgid "Stream Tuner"
+msgstr "Тјунер тока"
+
 #: src/tonegen/tonegen.cc:45
 msgid "Tone Generator"
 msgstr "Тонски генератор"
 
-#: src/tonegen/tonegen.cc:94
+#: src/tonegen/tonegen.cc:92
 #, c-format
 msgid "%s %.1f Hz"
 msgstr "%s %.1f Hz"
 
-#: src/tonegen/tonegen.cc:94
+#: src/tonegen/tonegen.cc:92
 msgid "Tone Generator: "
 msgstr "Тонски генератор: "
 
-#: src/tonegen/tonegen.cc:160
+#: src/tonegen/tonegen.cc:161
 msgid ""
 "Sine tone generator by Håvard Kvålen <havardk@xmms.org>\n"
 "Modified by Daniel J. Peng <danielpeng@bigfoot.com>\n"
@@ -4235,11 +4641,32 @@
 "учесталост3;...\n"
 "нпр.: tone://2000;2005 да пустите тонове 2000 Hz и 2005 Hz"
 
+#: src/ui-common/dialogs-qt.cc:40
+msgid ""
+"\n"
+"(Further messages have been hidden.)"
+msgstr ""
+"\n"
+"(Додатне поруке су скривене.)"
+
+#: src/ui-common/dialogs-qt.cc:52
+msgid "Working ..."
+msgstr "Радим ..."
+
+#: src/ui-common/dialogs-qt.cc:73
+msgid "Information"
+msgstr "Информације"
+
+#: src/ui-common/menu-ops-gtk.cc:132 src/ui-common/menu-ops-qt.cc:113
+#, c-format
+msgid "%s does not appear to be a valid folder."
+msgstr ""
+
 #: src/voice_removal/voice_removal.cc:28
 msgid "Voice Removal"
 msgstr "Уклањање гласа"
 
-#: src/vorbis/vorbis.cc:465
+#: src/vorbis/vorbis.cc:433
 msgid ""
 "Audacious Ogg Vorbis Decoder\n"
 "\n"
@@ -4259,7 +4686,7 @@
 "Gian-Carlo Pascutto <gcp@sjeng.org>\n"
 "Eugene Zagidullin <e.asphyx@gmail.com>"
 msgstr ""
-"Безочников Огг Ворбис декодер\n"
+"Аудацијусов Огг Ворбис декодер\n"
 "\n"
 "Заснован на Огг Ворбис прикључку Иксиф.орг удружења:\n"
 "http://www.xiph.org/\n"
@@ -4281,12 +4708,12 @@
 msgid "Ogg Vorbis Decoder"
 msgstr "Огг Ворбис декодер"
 
-#: src/vtx/info.cc:22
+#: src/vtx/info.cc:24
 #, c-format
 msgid "Details about %s"
 msgstr "Појединости о „%s“"
 
-#: src/vtx/info.cc:24
+#: src/vtx/info.cc:26
 msgid ""
 "Title: %t\n"
 "Author: %a\n"
@@ -4316,7 +4743,7 @@
 msgid "VTX Decoder"
 msgstr "ВТКС декодер"
 
-#: src/vtx/vtx.cc:184
+#: src/vtx/vtx.cc:178
 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"
@@ -4326,21 +4753,65 @@
 "<sashnov@ngs.ru>\n"
 "Заснован је на „in_vtx.dll“ који је написао Роман Шербаков <v_soft@microfor."
 "ru>\n"
-"Прикључак за Безочника је написао Павел Виметалек <pvymetalek@seznam.cz>"
+"Прикључак за Аудацијуса је написао Павел Виметалек <pvymetalek@seznam.cz>"
+
+#: src/vumeter-qt/vumeter_qt.cc:31
+msgid ""
+"VU Meter Plugin for Audacious\n"
+"Copyright 2017-2019 Marc Sánchez Fauste"
+msgstr ""
+"Прикључак мерача јачине звука за Аудацијуса\n"
+"Ауторска права 2017-2019 Марк Санчез Фаусте"
+
+#: src/vumeter-qt/vumeter_qt.cc:35
+msgid "VU Meter Settings"
+msgstr "Подешавања мерача јачине звука"
+
+#: src/vumeter-qt/vumeter_qt.cc:37
+msgid "Peak hold time:"
+msgstr "Време застоја врхунца:"
+
+#: src/vumeter-qt/vumeter_qt.cc:42
+msgid "Fall-off time:"
+msgstr "Време падања:"
+
+#: src/vumeter-qt/vumeter_qt.cc:44
+msgid "dB/second"
+msgstr "dB/секунди"
+
+#: src/vumeter-qt/vumeter_qt.cc:46
+msgid "Display legend"
+msgstr "Прикажи легенду"
+
+#: src/vumeter-qt/vumeter_qt.h:37
+msgid "VU Meter"
+msgstr "Мерач јачине звука"
 
-#: src/wavpack/wavpack.cc:24
+#: src/waveout/waveout.cc:43
+msgid "Win32 waveOut"
+msgstr "Вин32 вејвАут"
+
+#: src/waveout/waveout.cc:69
+msgid ""
+"Win32 waveOut Plugin for Audacious\n"
+"Copyright 2016 John Lindgren"
+msgstr ""
+"Прикључак Вин32 вејваут за Аудацијус\n"
+"Ауторска права 2016 Џон Линдгрин"
+
+#: src/wavpack/wavpack.cc:25
 msgid "WavPack Decoder"
 msgstr "Вејвпак декодер"
 
-#: src/wavpack/wavpack.cc:211
+#: src/wavpack/wavpack.cc:217
 msgid "lossy (hybrid)"
 msgstr "ослабљено (хибридно)"
 
-#: src/wavpack/wavpack.cc:213
+#: src/wavpack/wavpack.cc:219
 msgid "lossy"
 msgstr "ослабљено"
 
-#: src/wavpack/wavpack.cc:255
+#: src/wavpack/wavpack.cc:259
 msgid ""
 "Copyright 2006 William Pitcock <nenolod@nenolod.net>\n"
 "\n"
@@ -4350,18 +4821,38 @@
 "\n"
 "Нешто кода прикључка је написао Мајлс Иган."
 
-#: src/xsf/plugin.cc:50
+#: src/xsf/plugin.cc:74
 msgid "2SF Decoder"
 msgstr "2СФ декодер"
 
-#: src/xsf/plugin.cc:238
+#: src/xsf/plugin.cc:429
+msgid "32728 Hz"
+msgstr "32728 Hz"
+
+#: src/xsf/plugin.cc:432
+msgid "65456 Hz"
+msgstr "65456 Hz"
+
+#: src/xsf/plugin.cc:438
+msgid "Cosine"
+msgstr "Косинусно"
+
+#: src/xsf/plugin.cc:439
+msgid "Sharp"
+msgstr "Оштро"
+
+#: src/xsf/plugin.cc:443
 msgid "XSF Configuration"
 msgstr "ИксСФ подешавања"
 
-#: src/xsf/plugin.cc:239
-msgid "Ignore length from file"
-msgstr "Занемари трајање из датотеке"
+#: src/xsf/plugin.cc:445
+msgid "Default fade time:"
+msgstr "Основно време ишчезавања:"
+
+#: src/xsf/plugin.cc:447
+msgid "Interpolation mode:"
+msgstr "Режим уметања:"
 
-#: src/xspf/xspf.cc:89
+#: src/xspf/xspf.cc:95
 msgid "XML Shareable Playlists (XSPF)"
 msgstr "ИксМЛ дељиви спискови пуштања (XSPF)"

audacious-plugins-3.6.2-gtk3.tar.bz2/po/sr_RS.po -> audacious-plugins-4.4.1.tar.bz2/po/sr_RS.po Changed

@@ -7,255 +7,75 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Audacious Plugins\n"
-"Report-Msgid-Bugs-To: http://redmine.audacious-media-player.org/\n"
-"POT-Creation-Date: 2015-02-28 19:18+0100\n"
-"PO-Revision-Date: 2015-02-04 21:21+0000\n"
-"Last-Translator: Thomas Lange <thomas-lange2@gmx.de>\n"
-"Language-Team: Serbian (Serbia) (http://www.transifex.com/projects/p/"
+"Report-Msgid-Bugs-To: https://github.com/audacious-media-player/audacious/"
+"issues\n"
+"POT-Creation-Date: 2024-09-26 21:54+0200\n"
+"PO-Revision-Date: 2011-10-10 17:43+0000\n"
+"Last-Translator: Мирослав Николић <miroslavnikolic@rocketmail.com>, "
+"2011-2012\n"
+"Language-Team: Serbian (Serbia) (http://app.transifex.com/audacious/"
 "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"
-"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-raw/aac.cc:18
+#: src/aac/aac.cc:19
 msgid "AAC (Raw) Decoder"
 msgstr ""
 
-#: src/adplug/adplug-xmms.cc:42
+#: src/adplug/adplug-xmms.cc:70
 msgid "AdPlug (AdLib Player)"
 msgstr "Ад прикључак (АдБибл програм)"
 
-#: src/adplug/adplug-xmms.cc:156 src/modplug/modplugbmp.cc:335
-#: src/psf/plugin.cc:138 src/vtx/vtx.cc:87 src/xsf/plugin.cc:113
+#: src/adplug/adplug-xmms.cc:167 src/modplug/modplugbmp.cc:321
+#: src/psf/plugin.cc:161 src/vtx/vtx.cc:89 src/xsf/plugin.cc:204
 msgid "sequenced"
 msgstr "низовни"
 
-#: src/alarm/alarm.cc:55 src/alarm/interface.cc:82
-msgid "Alarm"
-msgstr "Аларм"
-
-#: src/alarm/alarm.cc:782
-msgid "Set Alarm ..."
-msgstr ""
-
-#: src/alarm/alarm.cc:810
-msgid ""
-"A plugin that can be used to start playing at a certain time.\n"
-"\n"
-"Originally written by Adam Feakin and Daniel Stodden."
+#: src/adplug/adplug-xmms.cc:349 src/sid/xs_config.cc:61
+msgid "Output"
 msgstr ""
-"Прикључак који може бити коришћен да започне пуштање у одређено време.\n"
-"\n"
-"Првобитни аутори су Адам Фикин и Данијел Стоден."
 
-#: src/alarm/interface.cc: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"
+#: src/adplug/adplug-xmms.cc:350
+msgid "OPL Emulator:"
 msgstr ""
 
-#: src/alarm/interface.cc: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"
+#: src/adplug/adplug-xmms.cc:353 src/amidiplug/i_configure.cc:153
+#: src/console/plugin.cc:45 src/filewriter/filewriter.cc:481
+#: src/sid/xs_config.cc:65 src/xsf/plugin.cc:446
+msgid "Sample rate:"
 msgstr ""
 
-#: src/alarm/interface.cc: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/adplug/adplug-xmms.cc:354 src/amidiplug/i_configure.cc:155
+#: src/bs2b/plugin.cc:141 src/console/plugin.cc:47
+#: src/modplug/plugin_main.cc:77 src/resample/resample.cc:201
+#: src/resample/resample.cc:207 src/resample/resample.cc:211
+#: src/resample/resample.cc:215 src/resample/resample.cc:219
+#: src/resample/resample.cc:223 src/resample/resample.cc:227
+#: src/resample/resample.cc:231 src/resample/resample.cc:235
+#: src/resample/resample.cc:239 src/resample/resample.cc:243
+#: src/sid/xs_config.cc:67 src/soxr/sox-resampler.cc:205
+msgid "Hz"
+msgstr "Hz"
 
-#: src/alarm/interface.cc:81
-msgid "This is your wakeup call."
-msgstr "Ово је ваш позив за буђење."
+#: src/adplug/adplug-xmms.cc:355 src/gtkui/settings.cc:55
+#: src/modplug/plugin_main.cc:105 src/qtui/settings.cc:85
+#: src/skins-qt/skins_cfg.cc:302 src/skins/skins_cfg.cc:284
+msgid "Miscellaneous"
+msgstr "Разно"
 
-#: src/alarm/interface.cc:99
-msgid "Your reminder for today is..."
+#: src/adplug/adplug-xmms.cc:356
+msgid "Repeat song in endless loop"
 msgstr ""
 
-#: src/alarm/interface.cc:101 src/alarm/interface.cc:386
-msgid "Reminder"
-msgstr "Подсетник"
-
-#: src/alarm/interface.cc:132
-msgid "Monday"
-msgstr "Понедељак"
-
-#: src/alarm/interface.cc:132
-msgid "Tuesday"
-msgstr "Уторак"
-
-#: src/alarm/interface.cc:132
-msgid "Wednesday"
-msgstr "Среда"
-
-#: src/alarm/interface.cc:133
-msgid "Thursday"
-msgstr "Четвртак"
-
-#: src/alarm/interface.cc:133
-msgid "Friday"
-msgstr "Петак"
-
-#: src/alarm/interface.cc:133
-msgid "Saturday"
-msgstr "Субота"
-
-#: src/alarm/interface.cc:133
-msgid "Sunday"
-msgstr "Недеља"
-
-#: src/alarm/interface.cc:171 src/alarm/interface.cc:230
-#: src/alarm/interface.cc:245
-msgid "Time"
-msgstr "Време"
-
-#: src/alarm/interface.cc:178
-msgid "Alarm at (default):"
-msgstr "Активирај аларм у (основно):"
-
-#: src/alarm/interface.cc:200
-msgid "h"
-msgstr "часова"
-
-#: src/alarm/interface.cc:203
-msgid "Quiet after:"
-msgstr "Утишај након:"
-
-#: src/alarm/interface.cc:215
-msgid "hours"
-msgstr "сат(а)"
-
-#: src/alarm/interface.cc:226
-msgid "minutes"
-msgstr "минута"
-
-#: src/alarm/interface.cc:235
-msgid "Choose the days for the alarm to come on"
-msgstr "Изаберите којим данима ће се активирати аларм"
-
-#: src/alarm/interface.cc:242
-msgid "Day"
-msgstr "Дан"
-
-#: src/alarm/interface.cc:259 src/bs2b/plugin.cc:130
-#: src/skins/preset-list.cc:434 src/skins/preset-list.cc:440
-msgid "Default"
-msgstr "Основно"
-
-#: src/alarm/interface.cc:288
-msgid "Days"
-msgstr "Дани"
-
-#: src/alarm/interface.cc:297
-msgid "Fading"
-msgstr "Ишчезавање"
-
-#: src/alarm/interface.cc:305 src/console/plugin.cc:41
-#: src/crossfade/crossfade.cc:53 src/crossfade/crossfade.cc:59
-#: src/gtkui/settings.cc:49 src/lirc/lirc.cc:397 src/sid/xs_config.cc:85
-#: src/sid/xs_config.cc:94 src/sid/xs_config.cc:103
-msgid "seconds"
-msgstr "секунде"
-
-#: src/alarm/interface.cc:312 src/alarm/interface.cc:353
-msgid "Volume"
-msgstr "Јачина"
-
-#: src/alarm/interface.cc:317
-msgid "Start at"
-msgstr "Започни при"
-
-#: src/alarm/interface.cc:333
-msgid "Final"
-msgstr "Заврши при"
-
-#: src/alarm/interface.cc:346
-msgid "Current"
-msgstr "Тренутно"
-
-#: src/alarm/interface.cc:359
-msgid "Additional Command"
-msgstr "Додатна наредба"
-
-#: src/alarm/interface.cc:365 src/alarm/interface.cc:391
-msgid "enable"
-msgstr "укључи"
-
-#: src/alarm/interface.cc:372
-msgid "Playlist (optional)"
-msgstr "Списак нумера (необавезно)"
-
-#: src/alarm/interface.cc:379
-msgid "Select a playlist"
-msgstr "Изаберите списак нумера"
-
-#: src/alarm/interface.cc:399
-msgid "Options"
-msgstr "Опције"
-
-#: src/alarm/interface.cc:404
-msgid "What do these options mean?"
-msgstr "Шта значе ове опције?"
-
-#: src/alarm/interface.cc:420
-msgid "Help"
-msgstr "Помоћ"
-
-#: src/albumart/albumart.cc:31
+#: src/albumart/albumart.cc:31 src/albumart-qt/albumart.cc:35
 msgid "Album Art"
 msgstr "Омот албума"
 
-#: src/albumart-qt/albumart.cc:33
-msgid "Album Art (Qt)"
-msgstr ""
-
-#: src/alsa/alsa.h:70
+#: src/alsa/alsa.h:64
 msgid "ALSA Output"
 msgstr "Излаз АЛСА-е"
 
@@ -297,11 +117,11 @@
 msgid "Mixer element:"
 msgstr "Елемент мешача:"
 
-#: src/amidi-plug/amidi-plug.cc:41
+#: src/amidiplug/amidi-plug.cc:42
 msgid "AMIDI-Plug (MIDI Player)"
 msgstr "АМИДИ-Прикључак (МИДИ програм)"
 
-#: src/amidi-plug/amidi-plug.cc:437
+#: src/amidiplug/amidi-plug.cc:445
 msgid ""
 "AMIDI-Plug\n"
 "modular MIDI music player\n"
@@ -324,157 +144,156 @@
 "for the good help with alpha testing"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:94
+#: src/amidiplug/i_configure.cc:94
 msgid "Override default gain:"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:102
+#: src/amidiplug/i_configure.cc:102
 msgid "Override default polyphony:"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:110
+#: src/amidiplug/i_configure.cc:110
 msgid "Override default reverb:"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:112 src/amidi-plug/i_configure.cc:120
+#: src/amidiplug/i_configure.cc:112 src/amidiplug/i_configure.cc:120
 msgid "On"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:118
+#: src/amidiplug/i_configure.cc:118
 msgid "Override default chorus:"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:128 src/console/plugin.cc:29
+#: src/amidiplug/i_configure.cc:128 src/console/plugin.cc:29
 msgid "Playback"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:129
+#: src/amidiplug/i_configure.cc:129
 msgid "Transpose:"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:131
+#: src/amidiplug/i_configure.cc:131 src/speedpitch/speed-pitch.cc:257
 msgid "semitones"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:132
+#: src/amidiplug/i_configure.cc:132
 msgid "Drum shift:"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:134
+#: src/amidiplug/i_configure.cc:134
 msgid "note numbers"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:135
+#: src/amidiplug/i_configure.cc:135
 msgid "Skip leading silence"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:137
+#: src/amidiplug/i_configure.cc:137
 msgid "Skip trailing silence"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:141
+#: src/amidiplug/i_configure.cc:141
 msgid "SoundFont"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:143
+#: src/amidiplug/i_configure.cc:148
 msgid "Synthesizer"
 msgstr ""
 
-#: src/amidi-plug/i_configure.cc:148 src/console/plugin.cc:45
-#: src/sid/xs_config.cc:65
-msgid "Sample rate:"
-msgstr ""
-
-#: src/amidi-plug/i_configure.cc:150 src/bs2b/plugin.cc:141
-#: src/console/plugin.cc:47 src/modplug/plugin_main.cc:78
-#: src/resample/resample.cc:201 src/resample/resample.cc:207
-#: src/resample/resample.cc:211 src/resample/resample.cc:215
-#: src/resample/resample.cc:219 src/resample/resample.cc:223
-#: src/resample/resample.cc:227 src/resample/resample.cc:231
-#: src/resample/resample.cc:235 src/resample/resample.cc:239
-#: src/resample/resample.cc:243 src/sid/xs_config.cc:67
-#: src/sox-resampler/sox-resampler.cc:163
-msgid "Hz"
-msgstr "Hz"
-
-#: src/amidi-plug/i_configure-fluidsynth.cc:52
+#: src/amidiplug/i_configure-fluidsynth.cc:58
+#: src/amidiplug/i_configure-fluidsynth.cc:527
 msgid "AMIDI-Plug - select SoundFont file"
 msgstr "АМИДИ прикључак — изаберите СаундФонт датотеку"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:55 src/filewriter/mp3.cc:658
+#: src/amidiplug/i_configure-fluidsynth.cc:61
 msgid "_Cancel"
-msgstr ""
+msgstr "_Откажи"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:56
+#: src/amidiplug/i_configure-fluidsynth.cc:62
 msgid "_Open"
-msgstr ""
+msgstr "_Отвори"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:225 src/gtkui/columns.cc:46
+#: src/amidiplug/i_configure-fluidsynth.cc:233
+#: src/amidiplug/i_configure-fluidsynth.cc:461
 msgid "File name"
 msgstr "Назив датотеке"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:229
+#: src/amidiplug/i_configure-fluidsynth.cc:237
+#: src/amidiplug/i_configure-fluidsynth.cc:464
 msgid "Size (bytes)"
 msgstr "Величина (бајтова)"
 
-#: src/amidi-plug/i_fileinfo.cc:163
+#: src/amidiplug/i_fileinfo.cc:184
 msgid "Name:"
 msgstr "Назив:"
 
-#: src/amidi-plug/i_fileinfo.cc:181
+#: src/amidiplug/i_fileinfo.cc:202
 msgid " MIDI Info "
 msgstr " МИДИ Информације "
 
-#: src/amidi-plug/i_fileinfo.cc:195
+#: src/amidiplug/i_fileinfo.cc:216
 msgid "Format:"
 msgstr "Формат:"
 
-#: src/amidi-plug/i_fileinfo.cc:198
+#: src/amidiplug/i_fileinfo.cc:219
 msgid "Length (msec):"
 msgstr "Трајање (msec):"
 
-#: src/amidi-plug/i_fileinfo.cc:201
+#: src/amidiplug/i_fileinfo.cc:222
 msgid "No. of Tracks:"
 msgstr "Број нумера:"
 
-#: src/amidi-plug/i_fileinfo.cc:207
+#: src/amidiplug/i_fileinfo.cc:228
 msgid "variable"
 msgstr "променљиво"
 
-#: src/amidi-plug/i_fileinfo.cc:209
+#: src/amidiplug/i_fileinfo.cc:230
 msgid "BPM:"
 msgstr "БПМ:"
 
-#: src/amidi-plug/i_fileinfo.cc:217
+#: src/amidiplug/i_fileinfo.cc:238
 msgid "BPM (wavg):"
 msgstr "БПМ (wavg):"
 
-#: src/amidi-plug/i_fileinfo.cc:220
+#: src/amidiplug/i_fileinfo.cc:241
 msgid "Time Div:"
 msgstr "Див време:"
 
-#: src/amidi-plug/i_fileinfo.cc:231
+#: src/amidiplug/i_fileinfo.cc:252
 msgid " MIDI Comments and Lyrics "
 msgstr " МИДИ коментари и текстови песама "
 
-#: src/amidi-plug/i_fileinfo.cc:278
+#: src/amidiplug/i_fileinfo.cc:299
 msgid "* no comments available in this MIDI file *"
 msgstr "* нема доступних коментара у овој МИДИ датотеци *"
 
-#: src/amidi-plug/i_fileinfo.cc:290
+#: src/amidiplug/i_fileinfo.cc:311
 msgid "* no lyrics available in this MIDI file *"
 msgstr "* нема доступних текстова песама у овој МИДИ датотеци *"
 
-#: src/amidi-plug/i_fileinfo.cc:300 src/filewriter/vorbis.cc:197
-#: src/ladspa/plugin.cc:416
+#: src/amidiplug/i_fileinfo.cc:321 src/ladspa/plugin.cc:418
+#: src/ui-common/dialogs-qt.cc:32
 msgid "_Close"
 msgstr "_Затвори"
 
-#: src/amidi-plug/i_fileinfo.cc:325
+#: src/amidiplug/i_fileinfo.cc:346
 msgid " (invalid UTF-8)"
 msgstr " (неисправан УТФ-8)"
 
-#: src/aosd/aosd.cc:32
+#: src/ampache/ampache.cc:33
+msgid "Ampache Browser"
+msgstr ""
+
+#: src/ampache/ampache.cc:46
+msgid ""
+"Ampache Browser for Audacious\n"
+"http://ampache-browser.org/\n"
+"\n"
+"Copyright (C) Róbert Čerňanský and John Lindgren\n"
+"License: GNU GPLv3"
+msgstr ""
+
+#: src/aosd/aosd.cc:31
 msgid ""
 "Audacious OSD\n"
 "http://www.develia.org/projects.php?p=audacious#aosd\n"
@@ -501,130 +320,130 @@
 msgid "Concave Rectangle"
 msgstr "Удубљен правоугаоник"
 
-#: src/aosd/aosd_style.cc:69
+#: src/aosd/aosd_style.cc:69 src/openmpt/mptwrap.h:50 src/xsf/plugin.cc:436
 msgid "None"
 msgstr "Ништа"
 
-#: src/aosd/aosd_trigger.cc:50
+#: src/aosd/aosd_trigger.cc:49
 msgid "Playback Start"
 msgstr "Почетак репродукције"
 
-#: src/aosd/aosd_trigger.cc:51
+#: src/aosd/aosd_trigger.cc:50
 msgid "Triggers OSD when a playlist entry is played."
 msgstr "Приказује ОСД када почиње репродукција песме."
 
-#: src/aosd/aosd_trigger.cc:56
+#: src/aosd/aosd_trigger.cc:55
 msgid "Title Change"
 msgstr "Промена наслова"
 
-#: src/aosd/aosd_trigger.cc:57
+#: src/aosd/aosd_trigger.cc:56
 msgid "Triggers OSD when the song title changes (for internet streams)."
 msgstr ""
 
-#: src/aosd/aosd_trigger.cc:62
+#: src/aosd/aosd_trigger.cc:61
 msgid "Pause On"
 msgstr "Паузирање"
 
-#: src/aosd/aosd_trigger.cc:63
+#: src/aosd/aosd_trigger.cc:62
 msgid "Triggers OSD when playback is paused."
 msgstr "Приказује ОСД када је репродукција привремено заустављена."
 
-#: src/aosd/aosd_trigger.cc:68
+#: src/aosd/aosd_trigger.cc:67
 msgid "Pause Off"
 msgstr "Отпаузирање"
 
-#: src/aosd/aosd_trigger.cc:69
+#: src/aosd/aosd_trigger.cc:68
 msgid "Triggers OSD when playback is unpaused."
 msgstr "Приказује ОСД када је репродукција поново покренута."
 
-#: src/aosd/aosd_ui.cc:163
+#: src/aosd/aosd_ui.cc:204
 msgid "Placement"
 msgstr "Постављање"
 
-#: src/aosd/aosd_ui.cc:196
+#: src/aosd/aosd_ui.cc:241
 msgid "Relative X offset:"
 msgstr "Релативан хоризонтални померај:"
 
-#: src/aosd/aosd_ui.cc:203
+#: src/aosd/aosd_ui.cc:245
 msgid "Relative Y offset:"
 msgstr "Релативан вертикални померај:"
 
-#: src/aosd/aosd_ui.cc:210
+#: src/aosd/aosd_ui.cc:249
 msgid "Max OSD width:"
 msgstr "Највећа ширина приказа:"
 
-#: src/aosd/aosd_ui.cc:221
+#: src/aosd/aosd_ui.cc:281
 msgid "Multi-Monitor options"
 msgstr "Опција више монитора"
 
-#: src/aosd/aosd_ui.cc:225
+#: src/aosd/aosd_ui.cc:285
 msgid "Display OSD using:"
 msgstr "Прикажи ОСД на:"
 
-#: src/aosd/aosd_ui.cc:227
+#: src/aosd/aosd_ui.cc:287
 msgid "all monitors"
 msgstr "свим мониторима"
 
-#: src/aosd/aosd_ui.cc:230
+#: src/aosd/aosd_ui.cc:290
 #, c-format
 msgid "monitor %i"
 msgstr "на монитору бр. %i"
 
-#: src/aosd/aosd_ui.cc:282
+#: src/aosd/aosd_ui.cc:342
 msgid "Timing (ms)"
 msgstr "Време трајања (ms)"
 
-#: src/aosd/aosd_ui.cc:287
+#: src/aosd/aosd_ui.cc:347
 msgid "Display:"
 msgstr "Приказ:"
 
-#: src/aosd/aosd_ui.cc:292
+#: src/aosd/aosd_ui.cc:352
 msgid "Fade in:"
 msgstr "Појављивање:"
 
-#: src/aosd/aosd_ui.cc:297
+#: src/aosd/aosd_ui.cc:357
 msgid "Fade out:"
 msgstr "Ишчезавање:"
 
-#: src/aosd/aosd_ui.cc:361
+#: src/aosd/aosd_ui.cc:442
 msgid "Fonts"
 msgstr "Словни ликови"
 
-#: src/aosd/aosd_ui.cc:368
+#: src/aosd/aosd_ui.cc:449
 #, c-format
 msgid "Font %i:"
 msgstr "Писмо %i:"
 
-#: src/aosd/aosd_ui.cc:382
+#: src/aosd/aosd_ui.cc:466
 msgid "Shadow"
 msgstr "Сенка"
 
-#: src/aosd/aosd_ui.cc:486
+#: src/aosd/aosd_ui.cc:589
 msgid "Render Style"
 msgstr "Стил исцртавања"
 
-#: src/aosd/aosd_ui.cc:502
+#: src/aosd/aosd_ui.cc:605
 msgid "Colors"
 msgstr "Боје"
 
-#: src/aosd/aosd_ui.cc:513
+#: src/aosd/aosd_ui.cc:616
 #, c-format
 msgid "Color %i:"
 msgstr "Боја %i:"
 
-#: src/aosd/aosd_ui.cc:600
+#: src/aosd/aosd_ui.cc:714
 msgid "Enable trigger"
 msgstr "Омогући активирање"
 
-#: src/aosd/aosd_ui.cc:627
+#: src/aosd/aosd_ui.cc:741
 msgid "Event"
 msgstr "Догађај"
 
-#: src/aosd/aosd_ui.cc:655
+#: src/aosd/aosd_ui.cc:768
 msgid "Composite manager detected"
 msgstr "Откривен је композитни управник"
 
-#: src/aosd/aosd_ui.cc:662
+#: src/aosd/aosd_ui.cc:775
 msgid ""
 "Composite manager not detected;\n"
 "unless you know that you have one running, please activate a composite "
@@ -634,62 +453,58 @@
 "осим ако знате да је један већ покренут, молим покрените композитног "
 "управника јер у супротном ОСД неће радити исправно"
 
-#: src/aosd/aosd_ui.cc:670
+#: src/aosd/aosd_ui.cc:783
 msgid "Composite manager not required for fake transparency"
 msgstr "Композитни управник није потребан за лажну провидност"
 
-#: src/aosd/aosd_ui.cc:706
+#: src/aosd/aosd_ui.cc:820
 msgid "Transparency"
 msgstr "Провидност"
 
-#: src/aosd/aosd_ui.cc:712
+#: src/aosd/aosd_ui.cc:826
 msgid "Fake transparency"
 msgstr "Лажна провидност"
 
-#: src/aosd/aosd_ui.cc:714
+#: src/aosd/aosd_ui.cc:828
 msgid "Real transparency (requires X Composite Ext.)"
 msgstr "Стварна провидност (захтева Х композитно проширење)"
 
-#: src/aosd/aosd_ui.cc:756
+#: src/aosd/aosd_ui.cc:875
 msgid "Composite extension not loaded"
 msgstr "Композитно проширење није учитано"
 
-#: src/aosd/aosd_ui.cc:764
-msgid "Composite extension not available"
-msgstr "Композитно проширење није доступно"
-
-#: src/aosd/aosd_ui.cc:781
+#: src/aosd/aosd_ui.cc:892
 #, c-format
 msgid "Audacious OSD"
 msgstr "Безочник — ОСД"
 
-#: src/aosd/aosd_ui.cc:844
+#: src/aosd/aosd_ui.cc:955
 msgid "Position"
 msgstr "Положај"
 
-#: src/aosd/aosd_ui.cc:849
+#: src/aosd/aosd_ui.cc:960
 msgid "Animation"
 msgstr "Анимација"
 
-#: src/aosd/aosd_ui.cc:854
+#: src/aosd/aosd_ui.cc:965
 msgid "Text"
 msgstr "Текст"
 
-#: src/aosd/aosd_ui.cc:859
+#: src/aosd/aosd_ui.cc:970
 msgid "Decoration"
 msgstr "Декорација"
 
-#: src/aosd/aosd_ui.cc:864
+#: src/aosd/aosd_ui.cc:975
 msgid "Trigger"
 msgstr "Укључивање"
 
-#: src/aosd/aosd_ui.cc:869
+#: src/aosd/aosd_ui.cc:980 src/streamtuner/shoutcast-model.cc:202
 msgid "Misc"
 msgstr "Остало"
 
-#: src/aosd/aosd_ui.cc:878
+#: src/aosd/aosd_ui.cc:989
 msgid "Test"
-msgstr ""
+msgstr "Испробај"
 
 #: src/asx3/asx3.cc:35
 msgid "ASXv3 Playlists"
@@ -703,11 +518,83 @@
 msgid "Audacious Playlists (audpl)"
 msgstr "Безочникови спискови нумера (audpl)"
 
-#: src/blur_scope/blur_scope.cc:42
+#: src/background_music/background_music.cc:24
+msgid "Background music"
+msgstr ""
+
+#: src/background_music/background_music.cc:25
+msgid "Target level:"
+msgstr ""
+
+#: src/background_music/background_music.cc:28
+#: src/background_music/background_music.cc:33
+#: src/silence-removal/silence-removal.cc:70
+msgid "dB"
+msgstr "dB"
+
+#: src/background_music/background_music.cc:29
+msgid "Maximum amplification:"
+msgstr ""
+
+#: src/background_music/background_music.cc:34 src/mpg123/mpg123.cc:81
+msgid "Advanced"
+msgstr ""
+
+#: src/background_music/background_music.cc:36
+msgid "Slow detection weight:"
+msgstr ""
+
+#: src/background_music/background_music.cc:39
+msgid "Hint"
+msgstr ""
+
+#: src/background_music/background_music.cc:41
+msgid ""
+"Slow detection weight is the relative weight\n"
+"of a long term average detection when compared\n"
+"to the actual, faster loudness detection.\n"
+"A value of zero gives a more radio-like sound\n"
+"where soft passages get \"pulled up\" more quickly,\n"
+"a value of two makes the sound feel less compressed."
+msgstr ""
+
+#: src/background_music/background_music.cc:52
+msgid ""
+"Background Music Plugin for Audacious\n"
+"Copyright 2023;2024 Michel Fleur\n"
+"\n"
+"Controls the volume to make the sound equally loud within and between "
+"tracks.\n"
+" It uses accurate loudness measurement and tries to make the volume changes "
+"sound natural without audible peaks, yet without lowering the volume before "
+"a peak in advance."
+msgstr ""
+
+#: src/background_music/background_music.cc:61
+msgid "Background Music"
+msgstr ""
+
+#: src/bitcrusher/bitcrusher.cc:33
+msgid "Bitcrusher"
+msgstr ""
+
+#: src/bitcrusher/bitcrusher.cc:34
+msgid "Bit Depth:"
+msgstr ""
+
+#: src/bitcrusher/bitcrusher.cc:37
+msgid "Downsample ratio:"
+msgstr ""
+
+#: src/bitcrusher/bitcrusher.cc:48
+msgid "Bitcrusher"
+msgstr ""
+
+#: src/blur_scope/blur_scope.cc:40 src/blur_scope-qt/blur_scope.cc:45
 msgid "Color"
 msgstr "Боје"
 
-#: src/blur_scope/blur_scope.cc:58
+#: src/blur_scope/blur_scope.cc:56 src/blur_scope-qt/blur_scope.cc:158
 msgid "Blur Scope"
 msgstr "Обим замућења"
 
@@ -719,6 +606,10 @@
 msgid "Presets:"
 msgstr "Претподешавања:"
 
+#: src/bs2b/plugin.cc:130
+msgid "Default"
+msgstr "Основно"
+
 #: src/bs2b/plugin.cc:136
 msgid "Feed level:"
 msgstr "Ниво довода:"
@@ -731,15 +622,15 @@
 msgid "Cut frequency:"
 msgstr "Учестаност исецања:"
 
-#: src/cairo-spectrum/cairo-spectrum.cc:41
+#: src/cairo-spectrum/cairo-spectrum.cc:42 src/qt-spectrum/qt-spectrum.cc:107
 msgid "Spectrum Analyzer"
 msgstr "Анализатор спектра"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:72
+#: src/cdaudio/cdaudio-ng.cc:74
 msgid "Audio CD Plugin"
 msgstr "Прикључак звучног ЦД-а"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:121
+#: src/cdaudio/cdaudio-ng.cc:121
 msgid ""
 "Copyright (C) 2007-2012 Calin Crisan <ccrisan@gmail.com> and others.\n"
 "\n"
@@ -759,132 +650,132 @@
 "\n"
 "Беше то Гугл лето пројекта Кôд 2007."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:137
+#: src/cdaudio/cdaudio-ng.cc:140
 msgid "Device"
 msgstr "Уређај"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:138
+#: src/cdaudio/cdaudio-ng.cc:141
 msgid "Read speed:"
 msgstr "Брзина читања:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:141
+#: src/cdaudio/cdaudio-ng.cc:144
 msgid "Override device:"
 msgstr "Препиши уређај:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:143
+#: src/cdaudio/cdaudio-ng.cc:146
 msgid "Metadata"
 msgstr "Метаподаци"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:144
+#: src/cdaudio/cdaudio-ng.cc:147
 msgid "Use CD-Text"
 msgstr "Користи ЦД-текст"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:146
+#: src/cdaudio/cdaudio-ng.cc:150
 msgid "Use CDDB"
 msgstr "Користи ЦДБП"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:148
+#: src/cdaudio/cdaudio-ng.cc:152
 msgid "Use HTTP instead of CDDBP"
 msgstr "Користи ХТТП уместо ЦДДБП-а"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:151
+#: src/cdaudio/cdaudio-ng.cc:155
 msgid "Server:"
 msgstr "Сервер:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:155
+#: src/cdaudio/cdaudio-ng.cc:159
 msgid "Path:"
 msgstr "Путања:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:159
+#: src/cdaudio/cdaudio-ng.cc:163
 msgid "Port:"
 msgstr "Прикључник:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:246
+#: src/cdaudio/cdaudio-ng.cc:228
 msgid "Failed to initialize cdio subsystem."
 msgstr "Нисам успео да започнем цдуи подсистем."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:281
+#: src/cdaudio/cdaudio-ng.cc:260
 #, c-format
 msgid "Invalid URI %s."
 msgstr "Неисправна путања „%s“."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:283
+#: src/cdaudio/cdaudio-ng.cc:262
 #, c-format
 msgid "Track %d not found."
 msgstr "Нисам пронашао нумеру „%d“."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:285
+#: src/cdaudio/cdaudio-ng.cc:264
 #, c-format
 msgid "Track %d is a data track."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:360
+#: src/cdaudio/cdaudio-ng.cc:339
 msgid "Error reading audio CD."
 msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:429
+#: src/cdaudio/cdaudio-ng.cc:410
 msgid "Audio CD"
 msgstr "Аудио ЦД"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:460 src/cdaudio-ng/cdaudio-ng.cc:469
+#: src/cdaudio/cdaudio-ng.cc:446 src/cdaudio/cdaudio-ng.cc:455
 #, c-format
 msgid "Failed to open CD device %s."
 msgstr "Нисам успео да отворим ЦД уређај „%s“."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:472
+#: src/cdaudio/cdaudio-ng.cc:458
 msgid "No audio capable CD drive found."
 msgstr "Нисам пронашао уређај за читање ЦД-а."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:497
+#: src/cdaudio/cdaudio-ng.cc:481
+msgid "Drive is empty."
+msgstr "Уређај је празан."
+
+#: src/cdaudio/cdaudio-ng.cc:483
+msgid "Unsupported disk type."
+msgstr "Неподржана врста диска."
+
+#: src/cdaudio/cdaudio-ng.cc:507
 msgid "Failed to finish initializing opened CD drive."
 msgstr "Нисам успео да завршим покретање отвореног ЦД уређаја."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:510
+#: src/cdaudio/cdaudio-ng.cc:520
 msgid "Failed to retrieve first/last track number."
 msgstr "Нисам успео да пронађем број прве/последње нумере."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:531
+#: src/cdaudio/cdaudio-ng.cc:541
 #, c-format
 msgid "Cannot read start/end LSN for track %d."
 msgstr "Не могу да прочитам почетак/крај ЛСН-а за нумеру „%d“."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:613
-msgid "Failed to create the cddb connection."
-msgstr "Нисам успео да направим везу са цд базом података."
+#: src/cdaudio/cdaudio-ng.cc:624
+msgid "Failed to create the CDDB connection."
+msgstr ""
 
-#: src/cdaudio-ng/cdaudio-ng.cc:679
+#: src/cdaudio/cdaudio-ng.cc:690
 msgid "Failed to query the CDDB server"
 msgstr "Нисам успео да пропитам сервер базе података ЦД-а"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:681
+#: src/cdaudio/cdaudio-ng.cc:692
 #, c-format
 msgid "Failed to query the CDDB server: %s"
 msgstr "Нисам успео да пропитам сервер базе података ЦД-а: %s"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:705
+#: src/cdaudio/cdaudio-ng.cc:716
 #, c-format
-msgid "Failed to read the cddb info: %s"
-msgstr "Нисам успео да прочитам обавештење базе података цд-а: %s"
-
-#: src/cdaudio-ng/cdaudio-ng.cc:765
-msgid "Drive is empty."
-msgstr "Уређај је празан."
-
-#: src/cdaudio-ng/cdaudio-ng.cc:767
-msgid "Unsupported disk type."
-msgstr "Неподржана врста диска."
+msgid "Failed to read the CDDB info: %s"
+msgstr ""
 
-#: src/cd-menu-items/cd-menu-items.cc:35
+#: src/cd-menu-items/cd-menu-items.cc:33
 msgid "Audio CD Menu Items"
 msgstr "Ставке изборника звучног ЦД-а"
 
-#: src/cd-menu-items/cd-menu-items.cc:47
-msgid "Play CD"
-msgstr "Пусти ЦД"
-
-#: src/cd-menu-items/cd-menu-items.cc:47
-msgid "Add CD"
-msgstr "Додај ЦД"
+#: src/cd-menu-items/cd-menu-items.cc:45
+msgid "Pla_y CD"
+msgstr ""
+
+#: src/cd-menu-items/cd-menu-items.cc:45
+msgid "_Add CD"
+msgstr ""
 
 #: src/compressor/compressor.cc:45
 msgid "Compression"
@@ -939,7 +830,14 @@
 msgid "Default song length:"
 msgstr "Основно трајање песме:"
 
-#: src/console/plugin.cc:42 src/modplug/plugin_main.cc:59
+#: src/console/plugin.cc:41 src/crossfade/crossfade.cc:56
+#: src/crossfade/crossfade.cc:62 src/lirc/lirc.cc:395 src/notify/notify.cc:113
+#: src/sid/xs_config.cc:85 src/sid/xs_config.cc:94 src/sid/xs_config.cc:103
+#: src/vumeter-qt/vumeter_qt.cc:39
+msgid "seconds"
+msgstr "секунде"
+
+#: src/console/plugin.cc:42 src/modplug/plugin_main.cc:58
 msgid "Resampling"
 msgstr ""
 
@@ -963,77 +861,82 @@
 msgid "Game Console Music Decoder"
 msgstr "Конзолни музички декодер игре"
 
-#: src/coreaudio/coreaudio.cc:50
+#: src/coreaudio/coreaudio.cc:53
 msgid "CoreAudio output"
 msgstr ""
 
-#: src/coreaudio/coreaudio.cc:131
+#: src/coreaudio/coreaudio.cc:155
 msgid ""
 "CoreAudio Output Plugin for Audacious\n"
 "Copyright 2014 William Pitcock\n"
+"Copyright 2017,18 René J.V. Bertin\n"
+" (original code and code adapted from\n"
+" Apple examples, (C) Apple 2013)\n"
 "\n"
 "Based on SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
 msgstr ""
 
-#: src/coreaudio/coreaudio.cc:143
+#: src/coreaudio/coreaudio.cc:171
 msgid "Use exclusive mode"
 msgstr ""
 
-#: src/crossfade/crossfade.cc:44
+#: src/coreaudio/coreaudio.cc:173
+msgid "Use bit perfect audio (adapt device sampling rate)"
+msgstr ""
+
+#: src/crossfade/crossfade.cc:47
 msgid ""
 "Crossfade Plugin for Audacious\n"
 "Copyright 2010-2014 John Lindgren"
 msgstr ""
 
-#: src/crossfade/crossfade.cc:48
+#: src/crossfade/crossfade.cc:51
 msgid "Crossfade"
 msgstr "Постепени прелаз"
 
-#: src/crossfade/crossfade.cc:49
+#: src/crossfade/crossfade.cc:52
 msgid "On automatic song change"
 msgstr ""
 
-#: src/crossfade/crossfade.cc:51 src/crossfade/crossfade.cc:57
+#: src/crossfade/crossfade.cc:54 src/crossfade/crossfade.cc:60
 msgid "Overlap:"
 msgstr "Преклапање:"
 
-#: src/crossfade/crossfade.cc:55
+#: src/crossfade/crossfade.cc:58
 msgid "On seek or manual song change"
 msgstr ""
 
-#: src/crossfade/crossfade.cc:61
+#: src/crossfade/crossfade.cc:64
+msgid "No fade in"
+msgstr ""
+
+#: src/crossfade/crossfade.cc:66
+msgid "Use S-curve fade"
+msgstr ""
+
+#: src/crossfade/crossfade.cc:68
+msgid "S-curve steepness:"
+msgstr ""
+
+#: src/crossfade/crossfade.cc:70
+msgid "(higher is steeper)"
+msgstr ""
+
+#: src/crossfade/crossfade.cc:72
 msgid "Tip"
 msgstr ""
 
-#: src/crossfade/crossfade.cc:62
+#: src/crossfade/crossfade.cc:73
 msgid ""
 "For better crossfading, enable\n"
 "the Silence Removal effect."
 msgstr ""
 
-#: src/crossfade/crossfade.cc:72
+#: src/crossfade/crossfade.cc:83
 msgid "Crossfade"
 msgstr "Постепени прелаз"
 
-#: src/crossfade/crossfade.cc:161
-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.cc:168
-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/crystalizer/crystalizer.cc:31
 msgid "Crystalizer"
 msgstr "Кристализатор"
@@ -1046,60 +949,61 @@
 msgid "Crystalizer"
 msgstr "Кристализатор"
 
-#: src/cue/cue.cc:37
+#: src/cue/cue.cc:42
 msgid "Cue Sheet Plugin"
 msgstr "Прикључак „cue“ табеле"
 
-#: src/delete-files/delete-files.cc:46 src/delete-files/delete-files.cc:146
+#: src/delete-files/delete-files.cc:53 src/delete-files/delete-files.cc:215
+#: src/delete-files/delete-files.cc:230
 msgid "Delete Files"
 msgstr ""
 
-#: src/delete-files/delete-files.cc:75
-#, c-format
-msgid "Error moving %s to trash: %s."
+#: src/delete-files/delete-files.cc:120
+msgid "No files are selected."
 msgstr ""
 
-#: src/delete-files/delete-files.cc:86
+#: src/delete-files/delete-files.cc:125
 #, c-format
-msgid "Error deleting %s: %s."
+msgid "Do you want to move %s to the trash?"
 msgstr ""
 
-#: src/delete-files/delete-files.cc:117
+#: src/delete-files/delete-files.cc:126
 #, c-format
-msgid "Error deleting %s: not a local file."
+msgid "Do you want to permanently delete %s?"
 msgstr ""
 
-#: src/delete-files/delete-files.cc:134
-msgid "Do you want to move the selected files to the trash?"
+#: src/delete-files/delete-files.cc:133
+#, c-format
+msgid "Do you want to move %d files to the trash?"
 msgstr ""
 
-#: src/delete-files/delete-files.cc:135
-msgid "Move to Trash"
+#: src/delete-files/delete-files.cc:134
+#, c-format
+msgid "Do you want to permanently delete %d files?"
 msgstr ""
 
-#: src/delete-files/delete-files.cc:140
-msgid "Do you want to permanently delete the selected files?"
+#: src/delete-files/delete-files.cc:146
+msgid "Move to trash"
 msgstr ""
 
-#: src/delete-files/delete-files.cc:141 src/skins/preset-list.cc:411
-#: src/skins/preset-list.cc:427
+#: src/delete-files/delete-files.cc:146
 msgid "Delete"
 msgstr "Обриши"
 
-#: src/delete-files/delete-files.cc:145 src/skins/preset-browser.cc:56
-#: src/skins/preset-list.cc:307 src/skins/ui_playlist.cc:221
+#: src/delete-files/delete-files.cc:213 src/delete-files/delete-files.cc:235
+#: src/skins-qt/search-select.cc:102 src/skins/search-select.cc:78
 msgid "Cancel"
 msgstr "Откажи"
 
-#: src/delete-files/delete-files.cc:166
+#: src/delete-files/delete-files.cc:267
 msgid "Delete Selected Files"
 msgstr ""
 
-#: src/delete-files/delete-files.cc:181
+#: src/delete-files/delete-files.cc:287
 msgid "Delete Method"
 msgstr ""
 
-#: src/delete-files/delete-files.cc:182
+#: src/delete-files/delete-files.cc:288
 msgid "Move to trash instead of deleting immediately"
 msgstr ""
 
@@ -1115,13 +1019,13 @@
 msgid "Echo"
 msgstr "Одјек"
 
-#: src/echo_plugin/echo.cc:22 src/modplug/plugin_main.cc:73
-#: src/modplug/plugin_main.cc:83
+#: src/echo_plugin/echo.cc:22 src/modplug/plugin_main.cc:72
+#: src/modplug/plugin_main.cc:82
 msgid "Delay:"
 msgstr "Застој:"
 
-#: src/echo_plugin/echo.cc:24 src/modplug/plugin_main.cc:73
-#: src/modplug/plugin_main.cc:83
+#: src/echo_plugin/echo.cc:24 src/modplug/plugin_main.cc:72
+#: src/modplug/plugin_main.cc:82 src/xsf/plugin.cc:445
 msgid "ms"
 msgstr "ms"
 
@@ -1129,7 +1033,7 @@
 msgid "Feedback:"
 msgstr "Одзив:"
 
-#: src/echo_plugin/echo.cc:28 src/modplug/plugin_main.cc:87
+#: src/echo_plugin/echo.cc:28 src/modplug/plugin_main.cc:86
 msgid "Volume:"
 msgstr "Јачина звука:"
 
@@ -1137,11 +1041,11 @@
 msgid "Echo"
 msgstr "Одјек"
 
-#: src/ffaudio/ffaudio-core.cc:41
+#: src/ffaudio/ffaudio-core.cc:50
 msgid "FFmpeg Plugin"
 msgstr "Прикључак ФФмпег-а"
 
-#: src/ffaudio/ffaudio-core.cc:571
+#: src/ffaudio/ffaudio-core.cc:649
 msgid ""
 "Multi-format audio decoding plugin for Audacious using\n"
 "FFmpeg multimedia framework (http://www.ffmpeg.org/)\n"
@@ -1157,249 +1061,308 @@
 "Вилијам Питкок <nenolod@nenolod.net>\n"
 "Мати Хамалајнен <ccr@tnsp.org>"
 
-#: src/filewriter/filewriter.cc:45
+#: src/filewriter/filewriter.cc:48
 msgid "FileWriter Plugin"
 msgstr "Прикључак записивања датотека"
 
-#: src/filewriter/filewriter.cc:386
+#: src/filewriter/filewriter.cc:316
+#, c-format
+msgid ""
+"Error opening %s:\n"
+"%s"
+msgstr ""
+"Грешка отварања „%s“:\n"
+"%s"
+
+#: src/filewriter/filewriter.cc:358
+msgid ""
+"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/filewriter/filewriter.cc:385
 msgid "Output file format:"
 msgstr "Формат излазне датотеке:"
 
-#: src/filewriter/filewriter.cc:403
-msgid "Configure"
-msgstr "Подеси"
-
-#: src/filewriter/filewriter.cc:413
+#: src/filewriter/filewriter.cc:389
 msgid "Save into original directory"
 msgstr "Сачувај у оригиналном директоријуму"
 
-#: src/filewriter/filewriter.cc:417
-msgid "Save into custom directory"
-msgstr "Сачувај у произвољном директоријуму"
-
-#: src/filewriter/filewriter.cc:427
-msgid "Output file folder:"
-msgstr "Фасцикла излазне датотеке:"
-
-#: src/filewriter/filewriter.cc:431
-msgid "Pick a folder"
-msgstr "Изаберите фасциклу"
+#: src/filewriter/filewriter.cc:392
+msgid "Save into custom directory:"
+msgstr ""
 
-#: src/filewriter/filewriter.cc:444
+#: src/filewriter/filewriter.cc:400
 msgid "Generate file name from:"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:448
-msgid "Original file tag"
+#: src/filewriter/filewriter.cc:401
+msgid "Original file name"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:453
-msgid "Original file name"
+#: src/filewriter/filewriter.cc:404
+msgid "Original file name (no suffix)"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:459
-msgid "Include original file name extension"
+#: src/filewriter/filewriter.cc:407
+msgid "Original file tag"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:468
+#: src/filewriter/filewriter.cc:411
 msgid "Prepend track number to file name"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:484
-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"
-"и мењати под условима ГНУ-ове опште јавне лиценце\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/mp3.cc:40 src/filewriter/mp3.cc:717
+#: src/filewriter/filewriter.cc:417 src/filewriter/filewriter.cc:449
 msgid "Auto"
 msgstr "Самостално"
 
-#: src/filewriter/mp3.cc:40
+#: src/filewriter/filewriter.cc:418
+msgid "8000 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:419
+msgid "11025 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:420
+msgid "12000 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:421
+msgid "16000 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:422
+msgid "22050 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:423
+msgid "24000 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:424
+msgid "32000 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:425 src/xsf/plugin.cc:430
+msgid "44100 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:426 src/xsf/plugin.cc:431
+msgid "48000 Hz"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:430
+msgid "8 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:431
+msgid "16 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:432
+msgid "32 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:433
+msgid "40 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:434
+msgid "48 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:435
+msgid "56 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:436
+msgid "64 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:437
+msgid "80 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:438
+msgid "96 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:439
+msgid "112 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:440
+msgid "128 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:441
+msgid "160 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:442
+msgid "192 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:443
+msgid "224 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:444
+msgid "256 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:445
+msgid "320 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:450
 msgid "Joint Stereo"
 msgstr "Удружени стерео"
 
-#: src/filewriter/mp3.cc:41 src/modplug/plugin_main.cc:58
-#: src/mpg123/mpg123.cc:248
+#: src/filewriter/filewriter.cc:451 src/modplug/plugin_main.cc:57
+#: src/mpg123/mpg123.cc:259
 msgid "Stereo"
 msgstr "Стерео"
 
-#: src/filewriter/mp3.cc:41 src/modplug/plugin_main.cc:57
-#: src/mpg123/mpg123.cc:248
+#: src/filewriter/filewriter.cc:452 src/modplug/plugin_main.cc:56
+#: src/mpg123/mpg123.cc:260
 msgid "Mono"
 msgstr "Моно"
 
-#: src/filewriter/mp3.cc:657
-msgid "MP3 Configuration"
-msgstr "МП3 подешавања"
-
-#: src/filewriter/mp3.cc:658
-msgid "_OK"
+#: src/filewriter/filewriter.cc:456
+msgid "VBR"
 msgstr ""
 
-#: src/filewriter/mp3.cc:681
-msgid "Algorithm Quality:"
-msgstr "Квалитет алгоритма:"
-
-#: src/filewriter/mp3.cc:706
-msgid "Output Sample Rate:"
+#: src/filewriter/filewriter.cc:457
+msgid "ABR"
 msgstr ""
 
-#: src/filewriter/mp3.cc:733
-msgid "(Hz)"
-msgstr "(Hz)"
-
-#: src/filewriter/mp3.cc:740
-msgid "Bitrate / Compression Ratio:"
+#: src/filewriter/filewriter.cc:478
+msgid "Algorithm quality:"
 msgstr ""
 
-#: src/filewriter/mp3.cc:764
-msgid "Bitrate (kbps):"
-msgstr "Проток бита (kbps):"
+#: src/filewriter/filewriter.cc:484
+msgid "Bitrate:"
+msgstr "Проток бита:"
 
-#: src/filewriter/mp3.cc:796
+#: src/filewriter/filewriter.cc:491
 msgid "Compression ratio:"
 msgstr "Однос сажимања:"
 
-#: src/filewriter/mp3.cc:820
-msgid "Audio Mode:"
-msgstr "Режим звука:"
-
-#: src/filewriter/mp3.cc:845
-msgid "Miscellaneous:"
+#: src/filewriter/filewriter.cc:498
+msgid "Audio mode:"
 msgstr ""
 
-#: src/filewriter/mp3.cc:856
+#: src/filewriter/filewriter.cc:501
 msgid "Enforce strict ISO compliance"
 msgstr ""
 
-#: src/filewriter/mp3.cc:867
+#: src/filewriter/filewriter.cc:503
 msgid "Error protection"
 msgstr "Грешка заштите"
 
-#: src/filewriter/mp3.cc:879 src/filewriter/vorbis.cc:206
-msgid "Quality"
-msgstr "Квалитет"
-
-#: src/filewriter/mp3.cc:888
+#: src/filewriter/filewriter.cc:508
 msgid "Enable VBR/ABR"
 msgstr "Укључи ВБР/АБР"
 
-#: src/filewriter/mp3.cc:898
+#: src/filewriter/filewriter.cc:510
 msgid "Type:"
 msgstr "Врста:"
 
-#: src/filewriter/mp3.cc:931
-msgid "VBR Options:"
-msgstr "ВБР опције:"
-
-#: src/filewriter/mp3.cc:947
-msgid "Minimum bitrate (kbps):"
-msgstr "Најмањи проток бита (kb/s):"
-
-#: src/filewriter/mp3.cc:973
-msgid "Maximum bitrate (kbps):"
-msgstr "Највећи проток бита (kb/s):"
+#: src/filewriter/filewriter.cc:514
+msgid "Minimum bitrate:"
+msgstr ""
 
-#: src/filewriter/mp3.cc:995
-msgid "Strictly enforce minimum bitrate"
-msgstr "Строго спроведи најмањи проток бита"
+#: src/filewriter/filewriter.cc:518
+msgid "Maximum bitrate:"
+msgstr ""
 
-#: src/filewriter/mp3.cc:1007
-msgid "ABR Options:"
-msgstr "АБР опције:"
-
-#: src/filewriter/mp3.cc:1017
-msgid "Average bitrate (kbps):"
-msgstr "Просечни проток бита (kb/s):"
+#: src/filewriter/filewriter.cc:522
+msgid "Average bitrate:"
+msgstr ""
 
-#: src/filewriter/mp3.cc:1044
+#: src/filewriter/filewriter.cc:526
 msgid "VBR quality level:"
 msgstr "Ниво ВБР квалитета:"
 
-#: src/filewriter/mp3.cc:1063
+#: src/filewriter/filewriter.cc:530
+msgid "Strictly enforce minimum bitrate"
+msgstr "Строго спроведи најмањи проток бита"
+
+#: src/filewriter/filewriter.cc:533
 msgid "Omit Xing VBR header"
 msgstr ""
 
-#: src/filewriter/mp3.cc:1076
-msgid "VBR/ABR"
-msgstr "ВБР/АБР"
-
-#: src/filewriter/mp3.cc:1085
-msgid "Frame Parameters:"
+#: src/filewriter/filewriter.cc:539
+msgid "Frame Headers"
 msgstr ""
 
-#: src/filewriter/mp3.cc:1097
+#: src/filewriter/filewriter.cc:540
 msgid "Mark as copyright"
 msgstr "Означи као ауторско право"
 
-#: src/filewriter/mp3.cc:1108
+#: src/filewriter/filewriter.cc:542
 msgid "Mark as original"
 msgstr "Означи као оригинал"
 
-#: src/filewriter/mp3.cc:1120
-msgid "ID3 Parameters:"
+#: src/filewriter/filewriter.cc:544
+msgid "ID3 Tags"
 msgstr ""
 
-#: src/filewriter/mp3.cc:1131
+#: src/filewriter/filewriter.cc:545
 msgid "Force addition of version 2 tag"
 msgstr "Присили додавање ознаке издања 2"
 
-#: src/filewriter/mp3.cc:1141
+#: src/filewriter/filewriter.cc:547
 msgid "Only add v1 tag"
 msgstr "Додај само в1 ознаку"
 
-#: src/filewriter/mp3.cc:1148
+#: src/filewriter/filewriter.cc:549
 msgid "Only add v2 tag"
 msgstr "Додај само в2 ознаку"
 
-#: src/filewriter/mp3.cc:1169
+#: src/filewriter/filewriter.cc:554
+msgid "Quality"
+msgstr "Квалитет"
+
+#: src/filewriter/filewriter.cc:555
+msgid "VBR/ABR"
+msgstr "ВБР/АБР"
+
+#: src/filewriter/filewriter.cc:556
 msgid "Tags"
 msgstr "Ознаке"
 
-#: src/filewriter/vorbis.cc:196
-msgid "Vorbis Encoder Configuration"
-msgstr "Подешавање Ворбис шифрера"
-
-#: src/filewriter/vorbis.cc:219
-msgid "Quality level (0 - 10):"
-msgstr "Ниво квалитета (0 — 10):"
+#: src/filewriter/filewriter.cc:566
+msgid "Quality (0-1):"
+msgstr ""
 
-#: src/flacng/flacng.h:35
+#: src/filewriter/filewriter.cc:573 src/skins-qt/skins_cfg.cc:307
+#: src/skins/skins_cfg.cc:289
+msgid "General"
+msgstr "Опште"
+
+#: src/flac/flacng.h:36
 msgid "FLAC Decoder"
 msgstr "ФЛАЦ декодер"
 
-#: src/flacng/metadata.cc:351 src/wavpack/wavpack.cc:209
+#: src/flac/metadata.cc:296 src/wavpack/wavpack.cc:215
 msgid "lossless"
 msgstr "без губитака"
 
-#: src/flacng/plugin.cc:169
+#: src/flac/plugin.cc:214
 msgid ""
 "Original code by\n"
 "Ralf Ertzinger <ralf@skytale.net>\n"
@@ -1423,15 +1386,15 @@
 msgid "GIO Plugin"
 msgstr "ГУИ прикључак"
 
-#: src/gio/gio.cc:153
+#: src/gio/gio.cc:152
 msgid "Read-and-append mode not supported"
 msgstr ""
 
-#: src/gio/gio.cc:166
+#: src/gio/gio.cc:165
 msgid "Invalid open mode"
 msgstr ""
 
-#: src/gl-spectrum/gl-spectrum.cc:51
+#: src/glspectrum/gl-spectrum.cc:52
 msgid ""
 "OpenGL Spectrum Analyzer for Audacious\n"
 "Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
@@ -1443,509 +1406,650 @@
 "License: GPLv2+"
 msgstr ""
 
-#: src/gl-spectrum/gl-spectrum.cc:62
+#: src/glspectrum/gl-spectrum.cc:63 src/qtglspectrum/gl-spectrum.cc:53
 msgid "OpenGL Spectrum Analyzer"
 msgstr ""
 
-#: src/gl-spectrum-qt/gl-spectrum.cc:41
-msgid ""
-"OpenGL Spectrum Analyzer for Audacious\n"
-"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
-"Copyright 2014 William Pitcock\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-qt/gl-spectrum.cc:53
-msgid "OpenGL Spectrum Analyzer (Qt)"
-msgstr ""
-
-#: src/gnomeshortcuts/gnomeshortcuts.cc:38
-msgid "GNOME Shortcuts"
-msgstr ""
-
-#: src/gnomeshortcuts/gnomeshortcuts.cc:54
-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>"
+#: src/gtkui/columns.cc:36 src/moonstone/playlist_model.cc:38
+#: src/qtui/playlist_model.cc:33
+msgid "Entry Number"
 msgstr ""
 
-#: src/gtkui/columns.cc:35
-msgid "Entry number"
-msgstr "Број ставке"
-
-#: src/gtkui/columns.cc:36 src/playlist-manager/playlist-manager.cc:225
-#: src/qtui/playlist_model.cc:123
+#: src/gtkui/columns.cc:37 src/moonstone/playlist_model.cc:38
+#: src/moonstone/playlist_selection.cc:64
+#: src/playlist-manager/playlist-manager.cc:200
+#: src/playlist-manager-qt/playlist-manager-qt.cc:188
+#: src/qtui/playlist_model.cc:33 src/streamtuner/icecast-model.cc:120
+#: src/streamtuner/ihr-model.cc:159 src/streamtuner/shoutcast-model.cc:122
 msgid "Title"
 msgstr "Наслов"
 
-#: src/gtkui/columns.cc:37 src/qtui/playlist_model.cc:125
+#: src/gtkui/columns.cc:38 src/moonstone/playlist_model.cc:39
+#: src/qtui/playlist_model.cc:33
 msgid "Artist"
 msgstr "Извођач"
 
-#: src/gtkui/columns.cc:38
+#: src/gtkui/columns.cc:39 src/moonstone/playlist_model.cc:39
+#: src/qtui/playlist_model.cc:33
 msgid "Year"
 msgstr "Година"
 
-#: src/gtkui/columns.cc:39 src/qtui/playlist_model.cc:127
+#: src/gtkui/columns.cc:40 src/moonstone/playlist_model.cc:39
+#: src/qtui/playlist_model.cc:34
 msgid "Album"
 msgstr "Албум"
 
-#: src/gtkui/columns.cc:40
-msgid "Album artist"
-msgstr ""
+#: src/gtkui/columns.cc:41 src/moonstone/playlist_model.cc:40
+#: src/qtui/playlist_model.cc:34
+msgid "Album Artist"
+msgstr "Извођач албума"
 
-#: src/gtkui/columns.cc:41
+#: src/gtkui/columns.cc:42 src/moonstone/playlist_model.cc:40
+#: src/qtui/playlist_model.cc:34
 msgid "Track"
 msgstr "Нумера"
 
-#: src/gtkui/columns.cc:42
+#: src/gtkui/columns.cc:43 src/moonstone/playlist_model.cc:40
+#: src/qtui/playlist_model.cc:34 src/streamtuner/icecast-model.cc:123
+#: src/streamtuner/shoutcast-model.cc:125
+#: src/streamtuner/shoutcast-model.cc:236
 msgid "Genre"
 msgstr "Жанр"
 
-#: src/gtkui/columns.cc:43
-msgid "Queue position"
-msgstr "Положај колоне"
+#: src/gtkui/columns.cc:44 src/moonstone/playlist_model.cc:41
+#: src/qtui/playlist_model.cc:35
+msgid "Queue Position"
+msgstr ""
 
-#: src/gtkui/columns.cc:44
+#: src/gtkui/columns.cc:45 src/moonstone/playlist_model.cc:41
+#: src/qtui/playlist_model.cc:35
 msgid "Length"
 msgstr "Трајање"
 
-#: src/gtkui/columns.cc:45
-msgid "File path"
-msgstr "Путања датотеке"
-
-#: src/gtkui/columns.cc:47
-msgid "Custom title"
-msgstr "Произвољан наслов"
+#: src/gtkui/columns.cc:46 src/moonstone/playlist_model.cc:41
+#: src/qtui/playlist_model.cc:35
+msgid "File Path"
+msgstr ""
+
+#: src/gtkui/columns.cc:47 src/moonstone/playlist_model.cc:42
+#: src/qtui/playlist_model.cc:35
+msgid "File Name"
+msgstr ""
+
+#: src/gtkui/columns.cc:48 src/moonstone/playlist_model.cc:42
+#: src/qtui/playlist_model.cc:36
+msgid "Custom Title"
+msgstr ""
 
-#: src/gtkui/columns.cc:48
+#: src/gtkui/columns.cc:49 src/moonstone/playlist_model.cc:42
+#: src/qtui/playlist_model.cc:36 src/streamtuner/icecast-model.cc:129
+#: src/streamtuner/shoutcast-model.cc:134
 msgid "Bitrate"
 msgstr "Битски проток"
 
-#: src/gtkui/columns.cc:308
+#: src/gtkui/columns.cc:50 src/moonstone/playlist_model.cc:43
+#: src/qtui/playlist_model.cc:36
+msgid "Comment"
+msgstr "Напомена"
+
+#: src/gtkui/columns.cc:51 src/qtui/playlist_model.cc:36
+msgid "Publisher"
+msgstr ""
+
+#: src/gtkui/columns.cc:52 src/qtui/playlist_model.cc:37
+msgid "Catalog Number"
+msgstr ""
+
+#: src/gtkui/columns.cc:53 src/moonstone/playlist_model.cc:43
+#: src/qtui/playlist_model.cc:37
+msgid "Disc"
+msgstr ""
+
+#: src/gtkui/columns.cc:325
 msgid "Available columns"
 msgstr ""
 
-#: src/gtkui/columns.cc:334
+#: src/gtkui/columns.cc:351
 msgid "Displayed columns"
 msgstr ""
 
-#: src/gtkui/layout.cc:72 src/search-tool/search-tool.cc:40
+#: src/gtkui/layout.cc:74 src/search-tool-qt/search-tool-qt.cc:58
+#: src/search-tool/search-tool.cc:49
 msgid "Search Tool"
 msgstr "Алат за претрагу"
 
-#: src/gtkui/layout.cc:167
+#: src/gtkui/layout.cc:170
 msgid "Dock at Left"
 msgstr "Усидри на лево"
 
-#: src/gtkui/layout.cc:167
+#: src/gtkui/layout.cc:170
 msgid "Dock at Right"
 msgstr "Усидри на десно"
 
-#: src/gtkui/layout.cc:168
+#: src/gtkui/layout.cc:171
 msgid "Dock at Top"
 msgstr "Усидри на врх"
 
-#: src/gtkui/layout.cc:168
+#: src/gtkui/layout.cc:171
 msgid "Dock at Bottom"
 msgstr "Усидри на дно"
 
-#: src/gtkui/layout.cc:168
+#: src/gtkui/layout.cc:171
 msgid "Undock"
 msgstr "Откачи"
 
-#: src/gtkui/layout.cc:168 src/ladspa/plugin.cc:531
+#: src/gtkui/layout.cc:171 src/ladspa/plugin.cc:540
 msgid "Disable"
 msgstr "Искључи"
 
-#: src/gtkui/menus.cc:126 src/qtui/main_window_actions.cc:93
-#: src/statusicon/statusicon.cc:276
+#: src/gtkui/menus.cc:79 src/qtui/menus.cc:107
+#: src/statusicon-qt/statusicon.cc:115 src/statusicon/statusicon.cc:286
 msgid "_Open Files ..."
 msgstr "Отвори _датотеке ..."
 
-#: src/gtkui/menus.cc:127
+#: src/gtkui/menus.cc:80 src/qtui/menus.cc:111
 msgid "Open _URL ..."
 msgstr "Отвори _адресу ..."
 
-#: src/gtkui/menus.cc:128 src/qtui/main_window_actions.cc:95
+#: src/gtkui/menus.cc:81 src/qtui/menus.cc:113
 msgid "_Add Files ..."
 msgstr "Додај да_тотеке ..."
 
-#: src/gtkui/menus.cc:129
+#: src/gtkui/menus.cc:82 src/qtui/menus.cc:118
 msgid "Add U_RL ..."
 msgstr "Додај ад_ресу ..."
 
-#: src/gtkui/menus.cc:131
+#: src/gtkui/menus.cc:84 src/qtui/menus.cc:120
 msgid "Search _Library"
 msgstr ""
 
-#: src/gtkui/menus.cc:133 src/qtui/main_window_actions.cc:98
+#: src/gtkui/menus.cc:86 src/qtui/menus.cc:123
 msgid "A_bout ..."
 msgstr "О _програму ..."
 
-#: src/gtkui/menus.cc:134 src/qtui/main_window_actions.cc:99
+#: src/gtkui/menus.cc:87 src/qtui/menus.cc:125
 msgid "_Settings ..."
 msgstr ""
 
-#: src/gtkui/menus.cc:135 src/qtui/main_window_actions.cc:103
-#: src/statusicon/statusicon.cc:284
+#: src/gtkui/menus.cc:88 src/qtui/menus.cc:131
+#: src/statusicon-qt/statusicon.cc:117 src/statusicon/statusicon.cc:288
 msgid "_Quit"
 msgstr "_Изађи"
 
-#: src/gtkui/menus.cc:139 src/gtkui/menus.cc:262
-#: src/qtui/main_window_actions.cc:107 src/search-tool/search-tool.cc:641
-#: src/statusicon/statusicon.cc:278
+#: src/gtkui/menus.cc:92 src/gtkui/menus.cc:226
+#: src/moonstone/playlist_tabs.cc:306 src/qtui/menus.cc:135
+#: src/qtui/playlist_tabs.cc:331 src/search-tool-qt/search-tool-qt.cc:499
+#: src/search-tool/search-tool.cc:339 src/statusicon-qt/statusicon.cc:109
+#: src/statusicon/statusicon.cc:280
 msgid "_Play"
 msgstr "Пу_сти"
 
-#: src/gtkui/menus.cc:140 src/qtui/main_window_actions.cc:108
-#: src/statusicon/statusicon.cc:279
+#: src/gtkui/menus.cc:93 src/qtui/menus.cc:137
+#: src/statusicon-qt/statusicon.cc:110 src/statusicon/statusicon.cc:281
 msgid "Paus_e"
 msgstr "Па_узирај"
 
-#: src/gtkui/menus.cc:141 src/qtui/main_window_actions.cc:109
-#: src/statusicon/statusicon.cc:280
+#: src/gtkui/menus.cc:94 src/qtui/menus.cc:139
+#: src/statusicon-qt/statusicon.cc:111 src/statusicon/statusicon.cc:282
 msgid "_Stop"
 msgstr "_Заустави"
 
-#: src/gtkui/menus.cc:142 src/qtui/main_window_actions.cc:110
-#: src/statusicon/statusicon.cc:277
+#: src/gtkui/menus.cc:95 src/qtui/menus.cc:141
+#: src/statusicon-qt/statusicon.cc:112 src/statusicon/statusicon.cc:283
 msgid "Pre_vious"
 msgstr "_Претходно"
 
-#: src/gtkui/menus.cc:143 src/qtui/main_window_actions.cc:111
-#: src/statusicon/statusicon.cc:281
+#: src/gtkui/menus.cc:96 src/qtui/menus.cc:143
+#: src/statusicon-qt/statusicon.cc:113 src/statusicon/statusicon.cc:284
 msgid "_Next"
 msgstr "С_ледеће"
 
-#: src/gtkui/menus.cc:145 src/qtui/main_window_actions.cc:113
+#: src/gtkui/menus.cc:97 src/qtui/menus.cc:145 src/skins/menus.cc:114
+#: src/skins-qt/menus.cc:105
+msgid "Previous Album"
+msgstr ""
+
+#: src/gtkui/menus.cc:98 src/qtui/menus.cc:146 src/skins/menus.cc:115
+#: src/skins-qt/menus.cc:106
+msgid "Next Album"
+msgstr ""
+
+#: src/gtkui/menus.cc:100 src/qtui/menus.cc:148
 msgid "_Repeat"
 msgstr "_Понови"
 
-#: src/gtkui/menus.cc:146 src/qtui/main_window_actions.cc:114
+#: src/gtkui/menus.cc:101 src/qtui/menus.cc:150
 msgid "S_huffle"
 msgstr "_Насумично"
 
-#: src/gtkui/menus.cc:147 src/qtui/main_window_actions.cc:115
+#: src/gtkui/menus.cc:102 src/qtui/menus.cc:152
+msgid "Shuffle by Albu_m"
+msgstr ""
+
+#: src/gtkui/menus.cc:103 src/qtui/menus.cc:155
 msgid "N_o Playlist Advance"
 msgstr "Н_е напредуј у списку нумера"
 
-#: src/gtkui/menus.cc:148 src/qtui/main_window_actions.cc:116
+#: src/gtkui/menus.cc:104 src/qtui/menus.cc:157
 msgid "Stop A_fter This Song"
 msgstr ""
 
-#: src/gtkui/menus.cc:150 src/gtkui/menus.cc:247
-#: src/qtui/main_window_actions.cc:118
+#: src/gtkui/menus.cc:106 src/gtkui/menus.cc:210 src/qtui/menus.cc:162
+#: src/qtui/menus.cc:294
 msgid "Song _Info ..."
 msgstr "Подаци о _песми ..."
 
-#: src/gtkui/menus.cc:151
+#: src/gtkui/menus.cc:107
 msgid "Jump to _Time ..."
 msgstr "Пређи на _време ..."
 
-#: src/gtkui/menus.cc:152
+#: src/gtkui/menus.cc:108
 msgid "_Jump to Song ..."
 msgstr "Пређи на _песму ..."
 
-#: src/gtkui/menus.cc:154
+#: src/gtkui/menus.cc:110 src/qtui/menus.cc:165
 msgid "Set Repeat Point _A"
 msgstr ""
 
-#: src/gtkui/menus.cc:155
+#: src/gtkui/menus.cc:111 src/qtui/menus.cc:167
 msgid "Set Repeat Point _B"
 msgstr ""
 
-#: src/gtkui/menus.cc:156
+#: src/gtkui/menus.cc:112 src/qtui/menus.cc:169
 msgid "_Clear Repeat Points"
 msgstr ""
 
-#: src/gtkui/menus.cc:160 src/gtkui/menus.cc:167 src/gtkui/menus.cc:183
-#: src/qtui/main_window_actions.cc:122 src/qtui/main_window_actions.cc:129
-#: src/qtui/main_window_actions.cc:145
+#: src/gtkui/menus.cc:116 src/gtkui/menus.cc:123 src/gtkui/menus.cc:141
+#: src/qtui/menus.cc:173 src/qtui/menus.cc:180 src/qtui/menus.cc:198
 msgid "By _Title"
 msgstr "Према _наслову"
 
-#: src/gtkui/menus.cc:161 src/qtui/main_window_actions.cc:123
+#: src/gtkui/menus.cc:117 src/qtui/menus.cc:174
 msgid "By _File Name"
 msgstr ""
 
-#: src/gtkui/menus.cc:162 src/qtui/main_window_actions.cc:124
+#: src/gtkui/menus.cc:118 src/qtui/menus.cc:175
 msgid "By File _Path"
 msgstr ""
 
-#: src/gtkui/menus.cc:166 src/gtkui/menus.cc:182
-#: src/qtui/main_window_actions.cc:128 src/qtui/main_window_actions.cc:144
+#: src/gtkui/menus.cc:122 src/gtkui/menus.cc:140 src/qtui/menus.cc:179
+#: src/qtui/menus.cc:197
 msgid "By Track _Number"
 msgstr "Према броју _нумере"
 
-#: src/gtkui/menus.cc:168 src/gtkui/menus.cc:184
-#: src/qtui/main_window_actions.cc:130 src/qtui/main_window_actions.cc:146
+#: src/gtkui/menus.cc:124 src/gtkui/menus.cc:142 src/qtui/menus.cc:181
+#: src/qtui/menus.cc:199
 msgid "By _Artist"
 msgstr "Према _извођачу"
 
-#: src/gtkui/menus.cc:169 src/gtkui/menus.cc:185
-#: src/qtui/main_window_actions.cc:131 src/qtui/main_window_actions.cc:147
+#: src/gtkui/menus.cc:125 src/gtkui/menus.cc:143 src/qtui/menus.cc:182
+#: src/qtui/menus.cc:200
 msgid "By Al_bum"
 msgstr ""
 
-#: src/gtkui/menus.cc:170 src/gtkui/menus.cc:186
-#: src/qtui/main_window_actions.cc:132 src/qtui/main_window_actions.cc:148
+#: src/gtkui/menus.cc:126 src/gtkui/menus.cc:144 src/qtui/menus.cc:183
+#: src/qtui/menus.cc:201
 msgid "By Albu_m Artist"
 msgstr ""
 
-#: src/gtkui/menus.cc:171 src/gtkui/menus.cc:187
-#: src/qtui/main_window_actions.cc:133 src/qtui/main_window_actions.cc:149
+#: src/gtkui/menus.cc:127 src/gtkui/menus.cc:145 src/qtui/menus.cc:184
+#: src/qtui/menus.cc:202
 msgid "By Release _Date"
 msgstr "Према _датуму издавања"
 
-#: src/gtkui/menus.cc:172 src/gtkui/menus.cc:188
-#: src/qtui/main_window_actions.cc:134 src/qtui/main_window_actions.cc:150
+#: src/gtkui/menus.cc:128 src/gtkui/menus.cc:146 src/qtui/menus.cc:185
+#: src/qtui/menus.cc:203
 msgid "By _Genre"
 msgstr ""
 
-#: src/gtkui/menus.cc:173 src/gtkui/menus.cc:189
-#: src/qtui/main_window_actions.cc:135 src/qtui/main_window_actions.cc:151
+#: src/gtkui/menus.cc:129 src/gtkui/menus.cc:147 src/qtui/menus.cc:186
+#: src/qtui/menus.cc:204
 msgid "By _Length"
 msgstr ""
 
-#: src/gtkui/menus.cc:174 src/gtkui/menus.cc:190
-#: src/qtui/main_window_actions.cc:136 src/qtui/main_window_actions.cc:152
+#: src/gtkui/menus.cc:130 src/gtkui/menus.cc:148 src/qtui/menus.cc:187
+#: src/qtui/menus.cc:205
 msgid "By _File Path"
 msgstr "Према _путањи датотеке"
 
-#: src/gtkui/menus.cc:175 src/gtkui/menus.cc:191
-#: src/qtui/main_window_actions.cc:137 src/qtui/main_window_actions.cc:153
+#: src/gtkui/menus.cc:131 src/gtkui/menus.cc:149 src/qtui/menus.cc:188
+#: src/qtui/menus.cc:206
 msgid "By _Custom Title"
 msgstr "Према п_роизвољном наслову"
 
-#: src/gtkui/menus.cc:177 src/gtkui/menus.cc:193
-#: src/qtui/main_window_actions.cc:139 src/qtui/main_window_actions.cc:155
+#: src/gtkui/menus.cc:132 src/gtkui/menus.cc:150 src/qtui/menus.cc:189
+#: src/qtui/menus.cc:207
+msgid "By C_omment"
+msgstr ""
+
+#: src/gtkui/menus.cc:133 src/gtkui/menus.cc:151 src/qtui/menus.cc:190
+#: src/qtui/menus.cc:208
+msgid "By D_isc Number"
+msgstr ""
+
+#: src/gtkui/menus.cc:135 src/gtkui/menus.cc:153 src/qtui/menus.cc:192
+#: src/qtui/menus.cc:210
 msgid "R_everse Order"
 msgstr "Преокрени п_оредак"
 
-#: src/gtkui/menus.cc:178 src/gtkui/menus.cc:194
-#: src/qtui/main_window_actions.cc:140 src/qtui/main_window_actions.cc:156
+#: src/gtkui/menus.cc:136 src/gtkui/menus.cc:154 src/qtui/menus.cc:194
+#: src/qtui/menus.cc:212
 msgid "_Random Order"
 msgstr "_Случајан поредак"
 
-#: src/gtkui/menus.cc:198 src/qtui/main_window_actions.cc:160
+#: src/gtkui/menus.cc:158 src/qtui/menus.cc:216
 msgid "_Play/Resume"
 msgstr ""
 
-#: src/gtkui/menus.cc:199 src/gtkui/menus.cc:251
-#: src/qtui/main_window_actions.cc:161
+#: src/gtkui/menus.cc:159 src/qtui/menus.cc:218
 msgid "_Refresh"
 msgstr "_Освежи"
 
-#: src/gtkui/menus.cc:201 src/qtui/main_window_actions.cc:163
+#: src/gtkui/menus.cc:161 src/qtui/menus.cc:222
 msgid "_Sort"
 msgstr "Пор_еђај"
 
-#: src/gtkui/menus.cc:202 src/qtui/main_window_actions.cc:164
+#: src/gtkui/menus.cc:162 src/qtui/menus.cc:223
 msgid "Sort Se_lected"
 msgstr ""
 
-#: src/gtkui/menus.cc:203 src/qtui/main_window_actions.cc:165
+#: src/gtkui/menus.cc:163 src/qtui/menus.cc:225
 msgid "Remove _Duplicates"
 msgstr ""
 
-#: src/gtkui/menus.cc:204 src/qtui/main_window_actions.cc:166
+#: src/gtkui/menus.cc:164 src/qtui/menus.cc:226
 msgid "Remove _Unavailable Files"
 msgstr "Уклони _недоступне датотеке"
 
-#: src/gtkui/menus.cc:206 src/playlist-manager/playlist-manager.cc:244
-#: src/qtui/main_window_actions.cc:168
+#: src/gtkui/menus.cc:166 src/playlist-manager/playlist-manager.cc:219
+#: src/playlist-manager-qt/playlist-manager-qt.cc:348 src/qtui/menus.cc:229
 msgid "_New"
 msgstr "_Ново"
 
-#: src/gtkui/menus.cc:207
+#: src/gtkui/menus.cc:167 src/qtui/menus.cc:230
 msgid "Ren_ame ..."
 msgstr "_Преименуј ..."
 
-#: src/gtkui/menus.cc:208 src/gtkui/menus.cc:264
-#: src/qtui/main_window_actions.cc:170
+#: src/gtkui/menus.cc:168 src/gtkui/menus.cc:228
+#: src/moonstone/playlist_tabs.cc:311 src/qtui/menus.cc:231
+#: src/qtui/playlist_tabs.cc:336
 msgid "Remo_ve"
 msgstr ""
 
-#: src/gtkui/menus.cc:210
+#: src/gtkui/menus.cc:170 src/qtui/menus.cc:233
 msgid "_Import ..."
 msgstr "Ув_ези ..."
 
-#: src/gtkui/menus.cc:211
+#: src/gtkui/menus.cc:171 src/qtui/menus.cc:234
 msgid "_Export ..."
 msgstr "Из_вези ..."
 
-#: src/gtkui/menus.cc:213
+#: src/gtkui/menus.cc:173 src/qtui/menus.cc:237
 msgid "Playlist _Manager ..."
 msgstr "Управник списка _нумера ..."
 
-#: src/gtkui/menus.cc:214 src/qtui/main_window_actions.cc:176
+#: src/gtkui/menus.cc:174 src/qtui/menus.cc:239
 msgid "_Queue Manager ..."
 msgstr "Управник _редоследа ..."
 
-#: src/gtkui/menus.cc:218 src/qtui/main_window_actions.cc:180
+#: src/gtkui/menus.cc:178 src/qtui/menus.cc:243
 msgid "Volume _Up"
 msgstr "По_јачај"
 
-#: src/gtkui/menus.cc:219 src/qtui/main_window_actions.cc:181
+#: src/gtkui/menus.cc:179 src/qtui/menus.cc:245
 msgid "Volume _Down"
 msgstr "У_тишај"
 
-#: src/gtkui/menus.cc:221 src/qtui/main_window_actions.cc:183
-msgid "_Equalizer"
-msgstr "Ује_дначавач"
+#: src/gtkui/menus.cc:181 src/qtui/menus.cc:249
+msgid "_Equalizer ..."
+msgstr ""
 
-#: src/gtkui/menus.cc:223 src/qtui/main_window_actions.cc:185
+#: src/gtkui/menus.cc:182 src/qtui/menus.cc:251
 msgid "E_ffects ..."
 msgstr ""
 
-#: src/gtkui/menus.cc:227
+#: src/gtkui/menus.cc:184
+msgid "_Record Stream"
+msgstr ""
+
+#: src/gtkui/menus.cc:185
+msgid "Audio _Settings ..."
+msgstr ""
+
+#: src/gtkui/menus.cc:189 src/qtui/menus.cc:260
 msgid "Show _Menu Bar"
 msgstr "Прикажи траку _изборника"
 
-#: src/gtkui/menus.cc:228
+#: src/gtkui/menus.cc:190 src/qtui/menus.cc:262
 msgid "Show I_nfo Bar"
 msgstr "Прикажи траку _података"
 
-#: src/gtkui/menus.cc:229
+#: src/gtkui/menus.cc:191 src/qtui/menus.cc:264
+msgid "Show Info Bar _Album Art"
+msgstr ""
+
+#: src/gtkui/menus.cc:192 src/qtui/menus.cc:266
 msgid "Show Info Bar Vis_ualization"
 msgstr "Прикажи _визуелизацију траке обавштења"
 
-#: src/gtkui/menus.cc:230
+#: src/gtkui/menus.cc:193 src/qtui/menus.cc:268
 msgid "Show _Status Bar"
 msgstr "Прикажи траку _стања"
 
-#: src/gtkui/menus.cc:232
+#: src/gtkui/menus.cc:195 src/qtui/menus.cc:272
 msgid "Show _Remaining Time"
 msgstr ""
 
-#: src/gtkui/menus.cc:234
+#: src/gtkui/menus.cc:197 src/qtui/menus.cc:276 src/skins/menus.cc:157
+#: src/skins-qt/menus.cc:152
 msgid "_Visualizations ..."
 msgstr ""
 
-#: src/gtkui/menus.cc:238 src/qtui/main_window_actions.cc:189
+#: src/gtkui/menus.cc:201 src/qtui/menus.cc:280
 msgid "_File"
 msgstr "_Датотека"
 
-#: src/gtkui/menus.cc:239 src/qtui/main_window_actions.cc:190
+#: src/gtkui/menus.cc:202 src/qtui/menus.cc:281
 msgid "_Playback"
 msgstr "_Извођење"
 
-#: src/gtkui/menus.cc:240 src/qtui/main_window_actions.cc:191
+#: src/gtkui/menus.cc:203 src/qtui/menus.cc:282
 msgid "P_laylist"
 msgstr "_Списак нумера"
 
-#: src/gtkui/menus.cc:241 src/gtkui/menus.cc:258
-#: src/qtui/main_window_actions.cc:192
+#: src/gtkui/menus.cc:204 src/gtkui/menus.cc:222 src/qtui/menus.cc:283
+#: src/qtui/menus.cc:312
 msgid "_Services"
 msgstr "_Услуге"
 
-#: src/gtkui/menus.cc:242 src/qtui/main_window_actions.cc:193
+#: src/gtkui/menus.cc:205 src/qtui/menus.cc:284
 msgid "_Output"
 msgstr "_Излаз"
 
-#: src/gtkui/menus.cc:243
+#: src/gtkui/menus.cc:206 src/qtui/menus.cc:285
 msgid "_View"
 msgstr "_Преглед"
 
-#: src/gtkui/menus.cc:248
+#: src/gtkui/menus.cc:211 src/qtui/menus.cc:296
 msgid "_Queue/Unqueue"
 msgstr "_Стави у ред/Избаци из реда"
 
-#: src/gtkui/menus.cc:250
+#: src/gtkui/menus.cc:213 src/qtui/menus.cc:299
 msgid "_Open Containing Folder"
 msgstr ""
 
-#: src/gtkui/menus.cc:253
+#: src/gtkui/menus.cc:214 src/qtui/menus.cc:301
+msgid "_Refresh Selected"
+msgstr ""
+
+#: src/gtkui/menus.cc:216 src/qtui/menus.cc:304
 msgid "Cu_t"
 msgstr "_Исеци"
 
-#: src/gtkui/menus.cc:254
+#: src/gtkui/menus.cc:217 src/qtui/menus.cc:305
 msgid "_Copy"
 msgstr "У_множи"
 
-#: src/gtkui/menus.cc:255
+#: src/gtkui/menus.cc:218 src/qtui/menus.cc:306
 msgid "_Paste"
 msgstr "У_баци"
 
-#: src/gtkui/menus.cc:256
+#: src/gtkui/menus.cc:219 src/qtui/menus.cc:307
+msgid "Paste at _End"
+msgstr ""
+
+#: src/gtkui/menus.cc:220 src/qtui/menus.cc:309
 msgid "Select _All"
 msgstr "_Изабери све"
 
-#: src/gtkui/menus.cc:263
+#: src/gtkui/menus.cc:227 src/moonstone/playlist_tabs.cc:309
+#: src/qtui/playlist_tabs.cc:334
 msgid "_Rename ..."
 msgstr "_Преименуј ..."
 
-#: src/gtkui/settings.cc:35
+#: src/gtkui/settings.cc:35 src/qtui/settings.cc:59
+msgid "Always"
+msgstr ""
+
+#: src/gtkui/settings.cc:36 src/qtui/settings.cc:60
+msgid "Auto-hide"
+msgstr ""
+
+#: src/gtkui/settings.cc:37 src/qtui/settings.cc:61
+msgid "Never"
+msgstr ""
+
+#: src/gtkui/settings.cc:41 src/qtui/settings.cc:64
 msgid "Playlist Tabs"
 msgstr ""
 
-#: src/gtkui/settings.cc:36
-msgid "Always show tabs"
+#: src/gtkui/settings.cc:42 src/qtui/settings.cc:65
+msgid "Show playlist tabs:"
 msgstr ""
 
-#: src/gtkui/settings.cc:38
+#: src/gtkui/settings.cc:45 src/qtui/settings.cc:69
 msgid "Show entry counts"
 msgstr ""
 
-#: src/gtkui/settings.cc:40
+#: src/gtkui/settings.cc:47 src/qtui/settings.cc:72
 msgid "Show close buttons"
 msgstr ""
 
-#: src/gtkui/settings.cc:42
+#: src/gtkui/settings.cc:49 src/qtui/settings.cc:75
 msgid "Playlist Columns"
 msgstr ""
 
-#: src/gtkui/settings.cc:44
+#: src/gtkui/settings.cc:51 src/qtui/settings.cc:77
 msgid "Show column headers"
 msgstr ""
 
-#: src/gtkui/settings.cc:46 src/modplug/plugin_main.cc:106
-#: src/skins/skins_cfg.cc:263
-msgid "Miscellaneous"
+#: src/gtkui/settings.cc:53 src/qtui/settings.cc:82
+msgid "Make column headers clickable for sorting"
 msgstr ""
 
-#: src/gtkui/settings.cc:47
-msgid "Arrow keys seek by:"
+#: src/gtkui/settings.cc:56
+msgid "Use symbolic icons in toolbar"
 msgstr ""
 
-#: src/gtkui/settings.cc:50
+#: src/gtkui/settings.cc:58 src/qtui/settings.cc:86
 msgid "Scroll on song change"
 msgstr ""
 
-#: src/gtkui/ui_gtk.cc:71
+#: src/gtkui/ui_gtk.cc:82
 msgid "GTK Interface"
 msgstr "ГТК сучеље"
 
-#: src/gtkui/ui_gtk.cc:222 src/skins/ui_main.cc:232
+#: src/gtkui/ui_gtk.cc:219 src/skins/main.cc:228 src/skins-qt/main.cc:231
 #, c-format
 msgid "%s - Audacious"
 msgstr "%s — Безочник"
 
-#: src/gtkui/ui_gtk.cc:225 src/qtui/main_window.cc:186
+#: src/gtkui/ui_gtk.cc:221 src/moonstone/main_window.cc:184
+#: src/qtui/main_window.cc:385
 msgid "Buffering ..."
 msgstr "Баферујем ..."
 
-#: src/gtkui/ui_gtk.cc:228 src/skins/ui_main.cc:234 src/skins/ui_main.cc:1164
+#: src/gtkui/ui_gtk.cc:224 src/pipewire/pipewire.cc:402 src/skins/main.cc:230
+#: src/skins-qt/main.cc:233
 msgid "Audacious"
 msgstr "Безочник"
 
-#: src/gtkui/ui_statusbar.cc:63 src/qtui/status_bar.cc:67
+#: src/gtkui/ui_gtk.cc:487 src/gtkui/ui_gtk.cc:518 src/gtkui/ui_gtk.cc:882
+#: src/hotkey/gui.cc:72 src/moonstone/main_window.cc:67
+#: src/moonstone/main_window.cc:145 src/moonstone/main_window.cc:146
+#: src/notify/osd.cc:85 src/qthotkey/gui.cc:67 src/qtui/main_window.cc:154
+#: src/qtui/main_window.cc:347 src/qtui/main_window.cc:348
+#: src/skins/menus.cc:109 src/skins-qt/menus.cc:100
+msgid "Play"
+msgstr "Пусти"
+
+#: src/gtkui/ui_gtk.cc:487 src/moonstone/main_window.cc:151
+#: src/moonstone/main_window.cc:152 src/notify/osd.cc:82
+#: src/qtui/main_window.cc:353 src/qtui/main_window.cc:354
+#: src/skins/menus.cc:110 src/skins-qt/menus.cc:101
+msgid "Pause"
+msgstr "Паузирај"
+
+#: src/gtkui/ui_gtk.cc:868 src/moonstone/main_window.cc:57
+#: src/qtui/main_window.cc:145 src/skins/menus.cc:86 src/skins-qt/menus.cc:77
+msgid "Search Library"
+msgstr ""
+
+#: src/gtkui/ui_gtk.cc:875 src/moonstone/main_window.cc:60
+#: src/qtui/main_window.cc:147
+msgid "Open Files"
+msgstr "Отвори датотеке"
+
+#: src/gtkui/ui_gtk.cc:876 src/moonstone/main_window.cc:62
+#: src/qtui/main_window.cc:149
+msgid "Add Files"
+msgstr "Додај датотеке"
+
+#: src/gtkui/ui_gtk.cc:881 src/moonstone/main_window.cc:65
+#: src/qtui/main_window.cc:152 src/skins/menus.cc:112 src/skins-qt/menus.cc:103
+msgid "Previous"
+msgstr "Претходна"
+
+#: src/gtkui/ui_gtk.cc:883 src/hotkey/gui.cc:74 src/moonstone/main_window.cc:69
+#: src/qthotkey/gui.cc:69 src/qtui/main_window.cc:156 src/skins/menus.cc:111
+#: src/skins-qt/menus.cc:102
+msgid "Stop"
+msgstr "Заустави"
+
+#: src/gtkui/ui_gtk.cc:884 src/moonstone/main_window.cc:76 src/notify/osd.cc:89
+#: src/qtui/main_window.cc:163 src/skins/menus.cc:113 src/skins-qt/menus.cc:104
+msgid "Next"
+msgstr "Следећа"
+
+#: src/gtkui/ui_gtk.cc:886 src/moonstone/main_window.cc:79
+#: src/qtui/main_window.cc:166 src/qtui/menus.cc:254 src/skins/menus.cc:79
+#: src/skins-qt/menus.cc:69
+msgid "Record Stream"
+msgstr ""
+
+#: src/gtkui/ui_gtk.cc:919 src/moonstone/main_window.cc:86
+#: src/qtui/main_window.cc:173 src/skins/menus.cc:103 src/skins-qt/menus.cc:94
+msgid "Repeat"
+msgstr "Понови"
+
+#: src/gtkui/ui_gtk.cc:922 src/moonstone/main_window.cc:89
+#: src/qtui/main_window.cc:176 src/skins/menus.cc:104 src/skins-qt/menus.cc:95
+msgid "Shuffle"
+msgstr "Насумично"
+
+#: src/gtkui/ui_gtk.cc:1114 src/qtui/main_window.cc:123
+msgid "Menu"
+msgstr ""
+
+#: src/gtkui/ui_statusbar.cc:64 src/qtui/status_bar.cc:155
 msgid "mono"
 msgstr "моно"
 
-#: src/gtkui/ui_statusbar.cc:65 src/qtui/status_bar.cc:69
+#: src/gtkui/ui_statusbar.cc:66 src/qtui/status_bar.cc:157
 msgid "stereo"
 msgstr "стерео"
 
-#: src/gtkui/ui_statusbar.cc:67 src/qtui/status_bar.cc:71
+#: src/gtkui/ui_statusbar.cc:68 src/qtui/status_bar.cc:160
 #, c-format
 msgid "%d channel"
 msgid_plural "%d channels"
@@ -1953,113 +2057,104 @@
 msgstr1 "%d канала"
 msgstr2 "%d један канал"
 
-#: src/gtkui/ui_statusbar.cc:81 src/qtui/status_bar.cc:85
+#: src/gtkui/ui_statusbar.cc:76 src/qtui/status_bar.cc:168
+#, c-format
+msgid "%d kHz"
+msgstr ""
+
+#: src/gtkui/ui_statusbar.cc:82 src/qtui/status_bar.cc:174
 #, c-format
-msgid "%d kbps"
-msgstr "%d kb/s"
+msgid "%d kbit/s"
+msgstr ""
 
-#: src/gtkui/ui_statusbar.cc:107 src/skins/ui_main_evlisteners.cc:103
+#: src/gtkui/ui_statusbar.cc:108 src/skins/main.cc:478 src/skins-qt/main.cc:461
 msgid "Single mode."
 msgstr "Једноставни режим."
 
-#: src/gtkui/ui_statusbar.cc:109 src/skins/ui_main_evlisteners.cc:105
+#: src/gtkui/ui_statusbar.cc:110 src/skins/main.cc:480 src/skins-qt/main.cc:463
 msgid "Playlist mode."
 msgstr "Режим списка нумера."
 
-#: src/gtkui/ui_statusbar.cc:117 src/skins/ui_main_evlisteners.cc:111
+#: src/gtkui/ui_statusbar.cc:118 src/skins/main.cc:486 src/skins-qt/main.cc:469
 msgid "Stopping after song."
 msgstr "Зауставља након песме."
 
-#: src/hotkey/gui.cc:71
+#: src/hotkey/gui.cc:71 src/qthotkey/gui.cc:66
 msgid "Previous track"
 msgstr ""
 
-#: src/hotkey/gui.cc:72 src/notify/osd.cc:69 src/qtui/main_window.cc:69
-#: src/qtui/main_window.cc:172 src/qtui/main_window.cc:173
-#: src/skins/menus.cc:87
-msgid "Play"
-msgstr "Пусти"
-
-#: src/hotkey/gui.cc:73
+#: src/hotkey/gui.cc:73 src/qthotkey/gui.cc:68
 msgid "Pause/Resume"
 msgstr "Паузирај/настави"
 
-#: src/hotkey/gui.cc:74 src/qtui/main_window.cc:70 src/skins/menus.cc:89
-msgid "Stop"
-msgstr "Заустави"
-
-#: src/hotkey/gui.cc:75
+#: src/hotkey/gui.cc:75 src/qthotkey/gui.cc:70
 msgid "Next track"
 msgstr ""
 
-#: src/hotkey/gui.cc:76
-msgid "Forward 5 seconds"
+#: src/hotkey/gui.cc:76 src/qthotkey/gui.cc:71
+msgid "Step forward"
 msgstr ""
 
-#: src/hotkey/gui.cc:77
-msgid "Rewind 5 seconds"
+#: src/hotkey/gui.cc:77 src/qthotkey/gui.cc:72
+msgid "Step backward"
 msgstr ""
 
-#: src/hotkey/gui.cc:78
+#: src/hotkey/gui.cc:78 src/qthotkey/gui.cc:73
 msgid "Mute"
 msgstr "Искључи звук"
 
-#: src/hotkey/gui.cc:79
+#: src/hotkey/gui.cc:79 src/qthotkey/gui.cc:74
 msgid "Volume up"
 msgstr ""
 
-#: src/hotkey/gui.cc:80
+#: src/hotkey/gui.cc:80 src/qthotkey/gui.cc:75
 msgid "Volume down"
 msgstr ""
 
-#: src/hotkey/gui.cc:81
+#: src/hotkey/gui.cc:81 src/qthotkey/gui.cc:76
 msgid "Jump to file"
 msgstr ""
 
-#: src/hotkey/gui.cc:82
+#: src/hotkey/gui.cc:82 src/qthotkey/gui.cc:77
 msgid "Toggle player window(s)"
 msgstr ""
 
-#: src/hotkey/gui.cc:83
+#: src/hotkey/gui.cc:83 src/qthotkey/gui.cc:78
 msgid "Show On-Screen-Display"
 msgstr "Прикажи приказ на екрану"
 
-#: src/hotkey/gui.cc:84
+#: src/hotkey/gui.cc:84 src/qthotkey/gui.cc:79
 msgid "Toggle repeat"
 msgstr ""
 
-#: src/hotkey/gui.cc:85
+#: src/hotkey/gui.cc:85 src/qthotkey/gui.cc:80
 msgid "Toggle shuffle"
 msgstr ""
 
-#: src/hotkey/gui.cc:86
+#: src/hotkey/gui.cc:86 src/qthotkey/gui.cc:81
 msgid "Toggle stop after current"
 msgstr ""
 
-#: src/hotkey/gui.cc:87
+#: src/hotkey/gui.cc:87 src/qthotkey/gui.cc:82
 msgid "Raise player window(s)"
 msgstr ""
 
-#: src/hotkey/gui.cc:97
+#: src/hotkey/gui.cc:98 src/qthotkey/gui.cc:100
 msgid "(none)"
 msgstr "(ништа)"
 
-#: src/hotkey/gui.cc:234
+#: src/hotkey/gui.cc:261
 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 modifiers.\n"
 "\n"
 "Do you want to continue?"
 msgstr ""
-"Није препоручљиво повезати главну дугмад миша без измењивача.\n"
-"\n"
-"Да ли желите да наставите?"
 
-#: src/hotkey/gui.cc:236
+#: src/hotkey/gui.cc:264
 msgid "Binding mouse buttons"
 msgstr "Повезујем дугмад миша"
 
-#: src/hotkey/gui.cc:391
+#: src/hotkey/gui.cc:434
 msgid ""
 "Press a key combination inside a text field.\n"
 "You can also bind mouse buttons."
@@ -2067,98 +2162,114 @@
 "Притисните комбинацију тастера унутар поља за текст.\n"
 "Можете такође да повежете дугмад миша."
 
-#: src/hotkey/gui.cc:396
+#: src/hotkey/gui.cc:444 src/qthotkey/gui.cc:179
 msgid "Hotkeys:"
 msgstr "Пречице:"
 
-#: src/hotkey/gui.cc:413
+#: src/hotkey/gui.cc:457 src/qthotkey/gui.cc:181
 msgid "Action:"
 msgstr "Радња:"
 
-#: src/hotkey/gui.cc:420
+#: src/hotkey/gui.cc:461 src/qthotkey/gui.cc:182
 msgid "Key Binding:"
 msgstr "Свезе тастера:"
 
-#: src/hotkey/gui.cc:468
+#: src/hotkey/gui.cc:518 src/qthotkey/gui.cc:184
 msgid "_Add"
-msgstr ""
+msgstr "_Додај"
 
-#: src/hotkey/plugin.cc:61
+#: src/hotkey/plugin.cc:59 src/qthotkey/plugin.cc:78
 msgid "Global Hotkeys"
 msgstr "Опште пречице"
 
-#: src/hotkey/plugin.cc:79
+#: src/hotkey/plugin.cc:74
 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"
+"Contributors 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 Саша Хласјак <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/jack-ng/jack-ng.cc:49
+#: src/jack/jack-ng.cc:54
 msgid "JACK Output"
 msgstr "ЏЕК излаз"
 
-#: src/jack-ng/jack-ng.cc:114
+#: src/jack/jack-ng.cc:126
+msgid "Client name:"
+msgstr ""
+
+#: src/jack/jack-ng.cc:128
 msgid "Automatically connect to output ports"
 msgstr ""
 
-#: src/jack-ng/jack-ng.cc:155
+#: src/jack/jack-ng.cc:130
+msgid "Filter ports (regex, use any port if blank):"
+msgstr ""
+
+#: src/jack/jack-ng.cc:136
+msgid "Connect to physical ports only"
+msgstr ""
+
+#: src/jack/jack-ng.cc:139
+msgid "Upmix to"
+msgstr ""
+
+#: src/jack/jack-ng.cc:141
+msgid "ports if input has fewer channels"
+msgstr ""
+
+#: src/jack/jack-ng.cc:143
+msgid "Ignore insufficient number of ports"
+msgstr ""
+
+#: src/jack/jack-ng.cc:181
+msgid "No JACK output ports were found. Please check settings."
+msgstr ""
+
+#: src/jack/jack-ng.cc:195
 #, c-format
 msgid "Only %d JACK output ports were found but %d are required."
 msgstr ""
 
-#: src/jack-ng/jack-ng.cc:164
+#: src/jack/jack-ng.cc:210
 #, c-format
 msgid "Failed to connect to JACK port %s."
 msgstr ""
 
-#: src/jack-ng/jack-ng.cc:184
+#: src/jack/jack-ng.cc:230
 msgid ""
 "JACK supports only floating-point audio. You must change the output bit "
 "depth to floating-point in Audacious settings."
 msgstr ""
 
-#: src/jack-ng/jack-ng.cc:197
+#: src/jack/jack-ng.cc:245
 msgid "Failed to connect to the JACK server; is it running?"
 msgstr ""
 
-#: src/jack-ng/jack-ng.cc:273
+#: src/jack/jack-ng.cc:321
 #, c-format
 msgid ""
 "The JACK server requires a sample rate of %d Hz, but Audacious is playing at "
 "%d Hz. Please use the Sample Rate Converter effect to correct the mismatch."
 msgstr ""
 
-#: src/ladspa/plugin.cc:414
+#: src/ladspa/plugin.cc:416
 #, c-format
 msgid "%s Settings"
 msgstr "Подешавања за %s"
 
-#: src/ladspa/plugin.cc:478
+#: src/ladspa/plugin.cc:482
 msgid "Module paths:"
 msgstr "Путање модула:"
 
-#: src/ladspa/plugin.cc:483
+#: src/ladspa/plugin.cc:487
 msgid ""
 "Separate multiple paths with a colon.\n"
 "These paths are searched in addition to LADSPA_PATH.\n"
@@ -2169,25 +2280,25 @@
 "Након додавања нових путања, притисните Унеси да потражите нове прикључке.</"
 "small>"
 
-#: src/ladspa/plugin.cc:499
+#: src/ladspa/plugin.cc:508
 msgid "Available plugins:"
 msgstr "Доступни прикључци:"
 
-#: src/ladspa/plugin.cc:512 src/modplug/plugin_main.cc:92
-#: src/modplug/plugin_main.cc:95 src/modplug/plugin_main.cc:98
-#: src/modplug/plugin_main.cc:101
+#: src/ladspa/plugin.cc:521 src/modplug/plugin_main.cc:91
+#: src/modplug/plugin_main.cc:94 src/modplug/plugin_main.cc:97
+#: src/modplug/plugin_main.cc:100
 msgid "Enable"
 msgstr "Укључи"
 
-#: src/ladspa/plugin.cc:518
+#: src/ladspa/plugin.cc:527
 msgid "Enabled plugins:"
 msgstr "Укључени прикључци:"
 
-#: src/ladspa/plugin.cc:534
+#: src/ladspa/plugin.cc:543
 msgid "Settings"
 msgstr "Подешавања"
 
-#: src/ladspa/plugin.cc:551
+#: src/ladspa/plugin.cc:560
 msgid ""
 "LADSPA Host for Audacious\n"
 "Copyright 2011 John Lindgren"
@@ -2203,7 +2314,7 @@
 msgid "LIRC Plugin"
 msgstr "ЛИРЦ прикључак"
 
-#: src/lirc/lirc.cc:381
+#: src/lirc/lirc.cc:379
 msgid ""
 "A simple plugin to control Audacious using the LIRC remote control daemon\n"
 "\n"
@@ -2232,63 +2343,123 @@
 "\n"
 "Да сазнате више о ЛИРЦ-у, погледајте „http://lirc.org“."
 
-#: src/lirc/lirc.cc:392
+#: src/lirc/lirc.cc:390
 msgid "Connection"
 msgstr "Веза"
 
-#: src/lirc/lirc.cc:393
+#: src/lirc/lirc.cc:391
 msgid "Reconnect to LIRC server"
 msgstr "Поново се повежи са ЛИРЦ сервером"
 
-#: src/lirc/lirc.cc:395
+#: src/lirc/lirc.cc:393
 msgid "Wait before reconnecting:"
 msgstr "Сачекај пре поновног повезивања:"
 
-#: src/lyricwiki/lyricwiki.cc:41
-msgid "LyricWiki Plugin"
-msgstr "Прикључак за Лирик вики"
-
-#: src/lyricwiki/lyricwiki.cc:131 src/lyricwiki-qt/lyricwiki.cc:136
-msgid "No lyrics available"
-msgstr "Нема доступних текстова"
-
-#: src/lyricwiki/lyricwiki.cc:217 src/lyricwiki/lyricwiki.cc:226
-#: src/lyricwiki/lyricwiki.cc:243 src/lyricwiki/lyricwiki.cc:252
-#: src/lyricwiki/lyricwiki.cc:267 src/lyricwiki-qt/lyricwiki.cc:222
-#: src/lyricwiki-qt/lyricwiki.cc:231 src/lyricwiki-qt/lyricwiki.cc:248
-#: src/lyricwiki-qt/lyricwiki.cc:257 src/lyricwiki-qt/lyricwiki.cc:272
-msgid "Error"
-msgstr "Грешка"
-
-#: src/lyricwiki/lyricwiki.cc:218 src/lyricwiki/lyricwiki.cc:244
-#: src/lyricwiki-qt/lyricwiki.cc:223 src/lyricwiki-qt/lyricwiki.cc:249
+#: src/lyrics-common/chart_lyrics_provider.cc:93
+#: src/lyrics-common/chart_lyrics_provider.cc:150
+#: src/lyrics-common/lyrics_ovh_provider.cc:50
 #, c-format
 msgid "Unable to fetch %s"
 msgstr "Не могу да довучем „%s“"
 
-#: src/lyricwiki/lyricwiki.cc:227 src/lyricwiki/lyricwiki.cc:253
-#: src/lyricwiki-qt/lyricwiki.cc:232 src/lyricwiki-qt/lyricwiki.cc:258
+#: src/lyrics-common/chart_lyrics_provider.cc:100
+#: src/lyrics-common/chart_lyrics_provider.cc:157
+#: src/lyrics-common/lyrics_ovh_provider.cc:57
 #, c-format
 msgid "Unable to parse %s"
 msgstr "Не могу да обрадим „%s“"
 
-#: src/lyricwiki/lyricwiki.cc:259 src/lyricwiki-qt/lyricwiki.cc:264
+#: src/lyrics-common/chart_lyrics_provider.cc:121
+#: src/lyrics-common/chart_lyrics_provider.cc:194
+#: src/lyrics-common/lyrics_ovh_provider.cc:88
 msgid "Looking for lyrics ..."
 msgstr "Тражим текст песме ..."
 
-#: src/lyricwiki/lyricwiki.cc:267 src/lyricwiki-qt/lyricwiki.cc:272
-msgid "Missing song metadata"
-msgstr "Недостају метаподаци песме"
+#: src/lyrics-common/preferences.h:43
+msgid "Nowhere"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:49
+msgid "Artist is truncated at the start, Title -- at the end"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:50
+msgid "Chars to truncate on:"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:54
+msgid "Chars are ORed in RegExp, surrounded by whitespace"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:55
+msgid "Chars to split on:"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:56
+msgid "Further truncate those on chars"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:62
+msgid "General"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:63
+msgid "Split title into artist and title on chars"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:66
+msgid "Sources"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:67
+msgid "Use embedded lyrics (from Lyrics tag)"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:69
+msgid "Fetch lyrics from internet:"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:72
+msgid "Store fetched lyrics in local cache"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:74
+msgid "Local Storage"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:75
+msgid "Load lyric files (.lrc) from local storage"
+msgstr ""
+
+#: src/lyrics-common/utils.cc:54 src/ui-common/dialogs-qt.cc:63
+msgid "Error"
+msgstr "Грешка"
+
+#: src/lyrics-common/utils.cc:60
+msgid "Lyrics could not be found."
+msgstr ""
 
-#: src/lyricwiki/lyricwiki.cc:278 src/lyricwiki-qt/lyricwiki.cc:283
-msgid "Connecting to lyrics.wikia.com ..."
-msgstr "Повезујем се на „lyrics.wikia.com“ ..."
+#: src/lyrics-common/utils.cc:142
+msgid "Missing title and/or artist."
+msgstr ""
 
-#: src/lyricwiki-qt/lyricwiki.cc:55
-msgid "LyricWiki Plugin (Qt)"
+#: src/lyrics-gtk/lyrics-gtk.cc:37 src/lyrics-qt/lyrics-qt.cc:50
+msgid "Lyrics"
 msgstr ""
 
-#: src/m3u/m3u.cc:32
+#: src/lyrics-gtk/lyrics-gtk.cc:189 src/lyrics-qt/lyrics-qt.cc:171
+msgid "Edit Lyrics ..."
+msgstr ""
+
+#: src/lyrics-gtk/lyrics-gtk.cc:195 src/lyrics-qt/lyrics-qt.cc:178
+msgid "Save Locally"
+msgstr ""
+
+#: src/lyrics-gtk/lyrics-gtk.cc:201 src/lyrics-qt/lyrics-qt.cc:186
+msgid "Refresh"
+msgstr ""
+
+#: src/m3u/m3u.cc:33
 msgid "M3U Playlists"
 msgstr "М3У списак нумера"
 
@@ -2296,17 +2467,17 @@
 msgid "Tact Generator"
 msgstr "Генератор такта"
 
-#: src/metronom/metronom.cc:147
+#: src/metronom/metronom.cc:145
 #, c-format
 msgid "Tact generator: %d bpm"
 msgstr "Генератор такта: %d отк/мин"
 
-#: src/metronom/metronom.cc:149
+#: src/metronom/metronom.cc:147
 #, c-format
 msgid "Tact generator: %d bpm %d/%d"
 msgstr "Генератор такта: %d отк/мин %d/%d"
 
-#: src/metronom/metronom.cc:237
+#: src/metronom/metronom.cc:235
 msgid ""
 "A Tact Generator by Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
 "\n"
@@ -2320,11 +2491,11 @@
 "нпр.: „tact://77“ да добијете 77 откуцаја у минуту\n"
 "или: „tact://60*3/4“ да добијете 60 отк./мин у 3/4 такту"
 
-#: src/mixer/mixer.cc:38
+#: src/mixer/mixer.cc:43
 msgid "Channel Mixer"
 msgstr "Мешач канала"
 
-#: src/mixer/mixer.cc:202
+#: src/mixer/mixer.cc:255
 msgid ""
 "Channel Mixer Plugin for Audacious\n"
 "Copyright 2011-2012 John Lindgren and Michał Lipski"
@@ -2332,11 +2503,11 @@
 "Прикључак мешача канала за Безочника\n"
 "Ауторска права 2011-2012 Џон Линдгрин и Михал Липски"
 
-#: src/mixer/mixer.cc:206
+#: src/mixer/mixer.cc:259
 msgid "Channel Mixer"
 msgstr "Мешач канала"
 
-#: src/mixer/mixer.cc:207
+#: src/mixer/mixer.cc:260
 msgid "Output channels:"
 msgstr "Излазни канали:"
 
@@ -2348,168 +2519,176 @@
 msgid "Error connecting to MMS server"
 msgstr ""
 
-#: src/modplug/modplugbmp.h:53
+#: src/modplug/modplugbmp.h:57
 msgid "ModPlug (Module Player)"
 msgstr "Мод прикључак (Програм за модле)"
 
-#: src/modplug/plugin_main.cc:53
-msgid "Resolution"
-msgstr ""
-
-#: src/modplug/plugin_main.cc:54
-msgid "8-bit"
-msgstr ""
-
 #: src/modplug/plugin_main.cc:55
-msgid "16-bit"
-msgstr ""
-
-#: src/modplug/plugin_main.cc:56
 msgid "Channels"
 msgstr ""
 
-#: src/modplug/plugin_main.cc:60
+#: src/modplug/plugin_main.cc:59
 msgid "Nearest (fastest)"
 msgstr ""
 
-#: src/modplug/plugin_main.cc:61
+#: src/modplug/plugin_main.cc:60
 msgid "Linear (fast)"
 msgstr ""
 
-#: src/modplug/plugin_main.cc:62
+#: src/modplug/plugin_main.cc:61
 msgid "Spline (good)"
 msgstr ""
 
-#: src/modplug/plugin_main.cc:63
+#: src/modplug/plugin_main.cc:62
 msgid "Polyphase (best)"
 msgstr ""
 
-#: src/modplug/plugin_main.cc:64
+#: src/modplug/plugin_main.cc:63
 msgid "Sample rate"
 msgstr ""
 
-#: src/modplug/plugin_main.cc:65
+#: src/modplug/plugin_main.cc:64
 msgid "22 kHz"
 msgstr ""
 
-#: src/modplug/plugin_main.cc:66
+#: src/modplug/plugin_main.cc:65
 msgid "44 kHz"
 msgstr ""
 
-#: src/modplug/plugin_main.cc:67
+#: src/modplug/plugin_main.cc:66
 msgid "48 kHz"
 msgstr ""
 
-#: src/modplug/plugin_main.cc:68
+#: src/modplug/plugin_main.cc:67
 msgid "96 kHz"
 msgstr ""
 
-#: src/modplug/plugin_main.cc:72 src/modplug/plugin_main.cc:77
-#: src/modplug/plugin_main.cc:82
+#: src/modplug/plugin_main.cc:71 src/modplug/plugin_main.cc:76
+#: src/modplug/plugin_main.cc:81
 msgid "Level:"
 msgstr ""
 
-#: src/modplug/plugin_main.cc:78
+#: src/modplug/plugin_main.cc:77
 msgid "Cutoff:"
 msgstr ""
 
-#: src/modplug/plugin_main.cc:91
+#: src/modplug/plugin_main.cc:90
 msgid "Reverb"
 msgstr ""
 
-#: src/modplug/plugin_main.cc:94
+#: src/modplug/plugin_main.cc:93
 msgid "Bass Boost"
 msgstr ""
 
-#: src/modplug/plugin_main.cc:97
+#: src/modplug/plugin_main.cc:96
 msgid "Surround"
 msgstr ""
 
-#: src/modplug/plugin_main.cc:100
+#: src/modplug/plugin_main.cc:99
 msgid "Preamp"
 msgstr ""
 
-#: src/modplug/plugin_main.cc:107
+#: src/modplug/plugin_main.cc:106
 msgid "Oversample"
 msgstr ""
 
-#: src/modplug/plugin_main.cc:108
+#: src/modplug/plugin_main.cc:107
 msgid "Noise reduction"
 msgstr ""
 
-#: src/modplug/plugin_main.cc:109
+#: src/modplug/plugin_main.cc:108
 msgid "Play Amiga MODs"
 msgstr ""
 
-#: src/modplug/plugin_main.cc:110
+#: src/modplug/plugin_main.cc:109
 msgid "Repeat"
 msgstr ""
 
-#: src/modplug/plugin_main.cc:111
+#: src/modplug/plugin_main.cc:110
 msgid "Repeat count:"
 msgstr ""
 
-#: src/modplug/plugin_main.cc:112
+#: src/modplug/plugin_main.cc:111
 msgid "To repeat forever, set the repeat count to -1."
 msgstr ""
 
-#: src/modplug/plugin_main.cc:125 src/sid/xs_config.cc:106
+#: src/modplug/plugin_main.cc:124 src/sid/xs_config.cc:106
 msgid "These settings will take effect when Audacious is restarted."
 msgstr ""
 
+#: src/moonstone/main_window.cc:72 src/moonstone/main_window.cc:73
+#: src/qtui/main_window.cc:159 src/qtui/main_window.cc:160
+#: src/skins/menus.cc:107 src/skins-qt/menus.cc:98
+msgid "Stop After This Song"
+msgstr ""
+
+#: src/moonstone/moonstone.cc:39
+msgid "Moonstone"
+msgstr ""
+
+#: src/moonstone/playlist_header.cc:212 src/qtui/playlist_header.cc:258
+msgid "Reset to Defaults"
+msgstr ""
+
+#: src/moonstone/playlist_model.cc:38 src/qtui/playlist_header.cc:232
+msgid "Now Playing"
+msgstr "Сад пуштам"
+
+#: src/moonstone/playlist_selection.cc:66
+#: src/playlist-manager/playlist-manager.cc:201
+#: src/playlist-manager-qt/playlist-manager-qt.cc:190
+msgid "Entries"
+msgstr "Ставке"
+
 #: src/mpg123/mpg123.cc:54
 msgid "MPG123 Plugin"
 msgstr "МПГ123 прикључак"
 
-#: src/mpg123/mpg123.cc:83
-msgid "Advanced"
-msgstr ""
-
-#: src/mpg123/mpg123.cc:84
+#: src/mpg123/mpg123.cc:82
 msgid "Use accurate length calculation (slow)"
 msgstr ""
 
-#: src/mpg123/mpg123.cc:248
+#: src/mpg123/mpg123.cc:260
 msgid "Surround"
 msgstr "Окружење"
 
-#: src/mpris2/plugin.cc:39
+#: src/mpris2/plugin.cc:40
 msgid "MPRIS 2 Server"
 msgstr "МПРИС 2 сервер"
 
-#: src/neon/neon.cc:97
+#: src/neon/neon.cc:102
 msgid "Neon HTTP/HTTPS Plugin"
 msgstr "Неон ХТТП/ХХТПС прикључак"
 
-#: src/neon/neon.cc:521
+#: src/neon/neon.cc:526
 msgid "Error parsing redirect"
 msgstr ""
 
-#: src/neon/neon.cc:535
+#: src/neon/neon.cc:540
 msgid "Unknown HTTP error"
 msgstr ""
 
-#: src/neon/neon.cc:569
+#: src/neon/neon.cc:614
 msgid "Error parsing URL"
 msgstr ""
 
-#: src/neon/neon.cc:632
+#: src/neon/neon.cc:687
 msgid "Too many redirects"
 msgstr ""
 
-#: src/notify/event.cc:64
+#: src/notify/event.cc:97
 msgid "Stopped"
 msgstr "Заустављено"
 
-#: src/notify/event.cc:64
+#: src/notify/event.cc:97
 msgid "Audacious is not playing."
 msgstr "Безочник не пушта песме."
 
-#: src/notify/notify.cc:42
+#: src/notify/notify.cc:39
 msgid "Desktop Notifications"
 msgstr "Обавештења радне површи"
 
-#: src/notify/notify.cc:60
+#: src/notify/notify.cc:57
 msgid ""
 "Desktop Notifications Plugin for Audacious\n"
 "Copyright (C) 2010 Maximilian Bogner\n"
@@ -2529,36 +2708,76 @@
 "this program. If not, see <http://www.gnu.org/licenses/>."
 msgstr ""
 
-#: src/notify/notify.cc:110
+#: src/notify/notify.cc:104
 msgid "Show playback controls"
 msgstr ""
 
-#: src/notify/notify.cc:112
+#: src/notify/notify.cc:106
 msgid "Always show notification"
 msgstr ""
 
-#: src/notify/notify.cc:114
+#: src/notify/notify.cc:108
 msgid "Include album name in notification"
 msgstr ""
 
-#: src/notify/osd.cc:58
+#: src/notify/notify.cc:110
+msgid "Custom notification duration:"
+msgstr ""
+
+#: src/notify/osd.cc:74
 msgid "Show"
 msgstr ""
 
-#: src/notify/osd.cc:66 src/qtui/main_window.cc:178
-#: src/qtui/main_window.cc:179 src/skins/menus.cc:88
-msgid "Pause"
-msgstr "Паузирај"
+#: src/openmpt/mpt.cc:50
+msgid "OpenMPT (Module Player)"
+msgstr ""
 
-#: src/notify/osd.cc:73 src/qtui/main_window.cc:72 src/skins/menus.cc:91
-msgid "Next"
-msgstr "Следећа"
+#: src/openmpt/mpt.cc:132
+msgid ""
+"Module player based on libopenmpt\n"
+"\n"
+"Written by: Chris Spiegel <cspiegel@gmail.com>"
+msgstr ""
+
+#: src/openmpt/mpt.cc:151
+msgid "Stereo separation:"
+msgstr ""
+
+#: src/openmpt/mpt.cc:153
+msgid "% (0=mono, 100=default, 200=full)"
+msgstr ""
+
+#: src/openmpt/mpt.cc:157
+msgid "Interpolation:"
+msgstr ""
+
+#: src/openmpt/mptwrap.h:51 src/soxr/sox-resampler.cc:189 src/xsf/plugin.cc:437
+msgid "Linear"
+msgstr ""
+
+#: src/openmpt/mptwrap.h:52
+msgid "Cubic"
+msgstr ""
+
+#: src/openmpt/mptwrap.h:53
+msgid "Windowed sinc"
+msgstr ""
 
-#: src/oss4/oss.h:93
+#: src/opus/opus.cc:39
+msgid "Opus Decoder"
+msgstr ""
+
+#: src/opus/opus.cc:336
+msgid ""
+"Opus Decoder Plugin for Audacious\n"
+"Copyright 2022 Thomas Lange"
+msgstr ""
+
+#: src/oss4/oss.h:70
 msgid "OSS4 Output"
 msgstr "ОСС4 излаз"
 
-#: src/oss4/oss.h:95
+#: src/oss4/oss.h:72
 msgid "OSS3 Output"
 msgstr ""
 
@@ -2566,27 +2785,27 @@
 msgid "Default device"
 msgstr ""
 
-#: src/oss4/plugin.cc:77
+#: src/oss4/plugin.cc:78
 msgid "Audio device:"
 msgstr "Звучни уређај:"
 
-#: src/oss4/plugin.cc:80
+#: src/oss4/plugin.cc:81
 msgid "Use alternate device:"
 msgstr "Користи алтернативни уређај:"
 
-#: src/oss4/plugin.cc:84
+#: src/oss4/plugin.cc:85
 msgid "Save volume between sessions."
 msgstr "Сачувајте јачину звука између сесија."
 
-#: src/oss4/plugin.cc:86
+#: src/oss4/plugin.cc:87
 msgid "Enable format conversions made by the OSS software."
 msgstr "Укључује претварање формата направљено ОСС софтвером."
 
-#: src/oss4/plugin.cc:88
+#: src/oss4/plugin.cc:89
 msgid "Enable exclusive mode to prevent virtual mixing."
 msgstr "Укључује искључиви режим да спречи виртуално мешање."
 
-#: src/oss4/plugin.cc:100
+#: src/oss4/plugin.cc:101
 msgid ""
 "OSS4 Output Plugin for Audacious\n"
 "Copyright 2010-2012 Michał Lipski\n"
@@ -2600,76 +2819,90 @@
 "Желим да се захвалим људима на „#audacious“, нарочито Тони Вруну и Џону "
 "Линдгрину и наравно ауторима претходног ОСС прикључка."
 
-#: src/playlist-manager/playlist-manager.cc:37
-msgid "Playlist Manager"
+#: src/pipewire/pipewire.cc:44
+msgid "PipeWire Output"
 msgstr ""
 
-#: src/playlist-manager/playlist-manager.cc:226
-msgid "Entries"
+#: src/pipewire/pipewire.cc:118
+msgid ""
+"PipeWire Output Plugin for Audacious\n"
+"Copyright 2022 Thomas Lange\n"
+"\n"
+"Based on the PipeWire Output Plugin for Qmmp\n"
+"Copyright 2021 Ilya Kotov"
 msgstr ""
 
-#: src/playlist-manager/playlist-manager.cc:245
+#: src/pipewire/pipewire.cc:408 src/skins/menus.cc:88 src/skins-qt/menus.cc:79
+msgid "Playback"
+msgstr "Репродукција"
+
+#: src/playlist-manager/playlist-manager.cc:38
+#: src/playlist-manager-qt/playlist-manager-qt.cc:42
+msgid "Playlist Manager"
+msgstr "Управник списка нумера"
+
+#: src/playlist-manager/playlist-manager.cc:221
+#: src/playlist-manager-qt/playlist-manager-qt.cc:356
 msgid "_Remove"
-msgstr ""
+msgstr "_Уклони"
 
-#: src/playlist-manager/playlist-manager.cc:246
+#: src/playlist-manager/playlist-manager.cc:222
+#: src/playlist-manager-qt/playlist-manager-qt.cc:351
 msgid "Ren_ame"
-msgstr ""
+msgstr "_Преименуј"
 
 #: src/pls/pls.cc:35
 msgid "PLS Playlists"
 msgstr "ПЛС спискови нумера"
 
-#: src/psf/plugin.cc:45
+#: src/psf/plugin.cc:53
 msgid "OpenPSF PSF1/PSF2 Decoder"
 msgstr "ОпенПСФ ПСФ1/ПСФ2 декодер"
 
-#: src/pulse_audio/pulse_audio.cc:38
+#: src/psf/plugin.cc:270
+msgid "OpenPSF Configuration"
+msgstr ""
+
+#: src/psf/plugin.cc:271 src/xsf/plugin.cc:444
+msgid "Ignore length from file"
+msgstr ""
+
+#: src/pulse/pulse_audio.cc:42
 msgid "PulseAudio Output"
 msgstr "Пулс‑аудио излаз"
 
-#: src/pulse_audio/pulse_audio.cc:611
+#: src/pulse/pulse_audio.cc:84
+msgid "Context name:"
+msgstr ""
+
+#: src/pulse/pulse_audio.cc:86
+msgid "Stream name:"
+msgstr ""
+
+#: src/pulse/pulse_audio.cc:596
 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 ""
-"ПулсеАудио излазни прикључак Безочника\n"
-"\n"
-"Овај програм је слободан софтвер; можете га прослеђивати\n"
-"и/или мењати под условима ГНУ Опште јавне лиценце коју је\n"
-"објавила Задужбина слободног софтвера; верзије 2 лиценце\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"
-"Овај програм се расподељује у нади да ће бити користан,\n"
-"али БЕЗ ИКАКВЕ ГАРАНЦИЈЕ; чак и без примењене гаранције\n"
-"ТРЖИШНЕ ВРЕДНОСТИ или ПРИЛАГОЂЕНОСТИ ОДРЕЂЕНОЈ НАМЕНИ.\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"
-"Требали сте да примите примерак ГНУ Опште јавне лиценце\n"
-"уз овај програм; ако нисте, пишите Задужбини слободног\n"
-"софтва на адресу: Free Software Foundation, Inc.,\n"
-"51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,\n"
-"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/qtaudio/qtaudio.cc:49
+#: src/qtaudio/qtaudio.cc:53
 msgid "QtMultimedia Output"
 msgstr ""
 
-#: src/qtaudio/qtaudio.cc:77
+#: src/qtaudio/qtaudio.cc:84
 msgid ""
 "QtMultimedia Audio Output Plugin for Audacious\n"
 "Copyright 2014 William Pitcock\n"
@@ -2678,50 +2911,87 @@
 "Copyright 2010 John Lindgren"
 msgstr ""
 
-#: src/qtui/dialog_windows.cc:31
-msgid "Working ..."
+#: src/qtglspectrum/gl-spectrum.cc:41
+msgid ""
+"OpenGL Spectrum Analyzer for Audacious\n"
+"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
+"Copyright 2014, 2020 Ariadne Conill\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/qtui/filter_input.cc:44 src/skins/ui_playlist.cc:221
-msgid "Search"
+#: src/qthotkey/gui.cc:177
+msgid "Press a key combination inside a text field."
+msgstr ""
+
+#: src/qthotkey/plugin.cc:105
+msgid ""
+"Global Hotkey Plugin\n"
+"Control the player with global key combinations or multimedia keys.\n"
+"\n"
+"Copyright (C) 2020 i.Dark_Templar <darktemplar@dark-templar-archives.net>\n"
+"Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n"
+"\n"
+"Contributors 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/qtui/main_window_actions.cc:94
+#: src/qtui/menus.cc:109
 msgid "_Open Folder ..."
 msgstr ""
 
-#: src/qtui/main_window_actions.cc:96
+#: src/qtui/menus.cc:115
 msgid "_Add Folder ..."
 msgstr ""
 
-#: src/qtui/main_window_actions.cc:101
+#: src/qtui/menus.cc:128
 msgid "_Log Inspector ..."
 msgstr ""
 
-#: src/qtui/main_window.cc:64
-msgid "Open Files"
+#: src/qtui/menus.cc:220
+msgid "_Find ..."
 msgstr ""
 
-#: src/qtui/main_window.cc:66
-msgid "Add Files"
+#: src/qtui/menus.cc:256 src/skins/menus.cc:80 src/skins-qt/menus.cc:70
+msgid "Audio Settings ..."
 msgstr ""
 
-#: src/qtui/main_window.cc:71 src/skins/menus.cc:90
-msgid "Previous"
-msgstr "Претходна"
+#: src/qtui/playlist_model.cc:188
+msgid "Q#"
+msgstr ""
 
-#: src/qtui/main_window.cc:77 src/skins/menus.cc:82
-msgid "Repeat"
-msgstr "Понови"
+#: src/qtui/playlist_model.cc:190
+msgid "T#"
+msgstr ""
 
-#: src/qtui/main_window.cc:79 src/skins/menus.cc:83
-msgid "Shuffle"
-msgstr "Насумично"
+#: src/qtui/playlist_model.cc:192
+msgid "C#"
+msgstr ""
 
-#: src/qtui/qtui.cc:42
+#: src/qtui/playlist_model.cc:194
+msgid "D#"
+msgstr ""
+
+#: src/qtui/qtui.cc:40
 msgid "Qt Interface"
 msgstr ""
 
+#: src/qtui/search_bar.cc:46
+msgid "Search playlist"
+msgstr ""
+
+#: src/qtui/settings.cc:79
+msgid "Use bold font for column headers"
+msgstr ""
+
 #: src/resample/resample.cc:43
 msgid "Sample Rate Converter"
 msgstr "Претварач протока узорка"
@@ -2762,7 +3032,7 @@
 msgid "Method:"
 msgstr "Метод:"
 
-#: src/resample/resample.cc:199 src/sox-resampler/sox-resampler.cc:161
+#: src/resample/resample.cc:199 src/soxr/sox-resampler.cc:203
 msgid "Rate:"
 msgstr "Проток:"
 
@@ -2814,86 +3084,68 @@
 msgid "192 kHz:"
 msgstr "192 kHz:"
 
-#: src/scrobbler2/config_window.cc:41
-#, c-format
-msgid "OK. Scrobbling for user: %s"
-msgstr ""
-
-#: src/scrobbler2/config_window.cc:54
-msgid "Permission Denied"
-msgstr ""
-
-#: src/scrobbler2/config_window.cc:56
-msgid "Access the following link to allow Audacious to scrobble your plays:"
-msgstr ""
-
-#: src/scrobbler2/config_window.cc:66
-msgid "Keep this window open and click 'Check Permission' again.\n"
+#: src/scrobbler2/config_window.cc:29
+msgid "Checking Last.fm access ..."
 msgstr ""
 
-#: src/scrobbler2/config_window.cc:69 src/scrobbler2/config_window.cc:80
+#: src/scrobbler2/config_window.cc:35
 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."
+"Your scrobbles are being saved on your computer temporarily. They will be "
+"submitted as soon as Audacious is allowed access."
 msgstr ""
 
-#: src/scrobbler2/config_window.cc:77
-msgid "Network Problem."
+#: src/scrobbler2/config_window.cc:41
+#, c-format
+msgid "Permission granted. Scrobbling for user %s."
 msgstr ""
 
-#: src/scrobbler2/config_window.cc:78
-msgid "There was a problem contacting Last.fm. Please try again later."
+#: src/scrobbler2/config_window.cc:44
+msgid ""
+"Permission denied. Open the following URL in a browser, allow Audacious "
+"access to your account, and then click 'Check Permission' again:"
 msgstr ""
 
-#: src/scrobbler2/config_window.cc:110
-msgid "Checking..."
+#: src/scrobbler2/config_window.cc:53
+msgid "There was a problem contacting Last.fm."
 msgstr ""
 
-#: src/scrobbler2/config_window.cc:176
-msgid "C_heck Permission"
+#: src/scrobbler2/config_window.cc:92
+msgid "Check Permission"
 msgstr ""
 
-#: src/scrobbler2/config_window.cc:177
-msgid "_Revoke Permission"
+#: src/scrobbler2/config_window.cc:93
+msgid "Revoke Permission"
 msgstr ""
 
-#: src/scrobbler2/config_window.cc:220
-msgid ""
-"You need to allow Audacious to scrobble tracks to your Last.fm account.\n"
+#: src/scrobbler2/config_window.cc:97
+msgid "You need to allow Audacious to scrobble tracks to your Last.fm account."
 msgstr ""
 
 #: src/scrobbler2/scrobbler.cc:29
 msgid "Scrobbler 2.0"
 msgstr ""
 
-#: src/scrobbler2/scrobbler.cc:224
+#: src/scrobbler2/scrobbler.cc:200
 msgid ""
 "The Scrobbler plugin could not be started.\n"
 "There might be a problem with your installation."
 msgstr ""
 
-#: src/scrobbler2/scrobbler.cc:289
+#: src/scrobbler2/scrobbler.cc:245
 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_communication.cc:642
-msgid ""
-"Audacious is now using an improved version of the Last.fm Scrobbler.\n"
-"Please check the Preferences for the Scrobbler plugin."
+"project."
 msgstr ""
 
-#: src/sdlout/sdlout.cc:48
+#: src/sdlout/sdlout.cc:43
 msgid "SDL Output"
 msgstr "СДЛ излаз"
 
-#: src/sdlout/sdlout.cc:77
+#: src/sdlout/sdlout.cc:72
 msgid ""
 "SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
@@ -2901,27 +3153,12 @@
 "Прикључак СДЛ излаза за Безочника\n"
 "Ауторска права 2010 Џон Линдгрин"
 
-#: src/search-tool/search-tool.cc:116 src/search-tool/search-tool.cc:124
+#: src/search-tool/library.cc:35 src/search-tool/library.cc:46
+#: src/search-tool-qt/library.cc:35 src/search-tool-qt/library.cc:46
 msgid "Library"
 msgstr "Библиотека"
 
-#: src/search-tool/search-tool.cc:394
-#, c-format
-msgid "%d result"
-msgid_plural "%d results"
-msgstr0 ""
-msgstr1 ""
-msgstr2 ""
-
-#: src/search-tool/search-tool.cc:400
-#, c-format
-msgid "(%d hidden)"
-msgid_plural "(%d hidden)"
-msgstr0 ""
-msgstr1 ""
-msgstr2 ""
-
-#: src/search-tool/search-tool.cc:594
+#: src/search-tool-qt/search-model.cc:44 src/search-tool/search-tool.cc:287
 #, c-format
 msgid "%d song"
 msgid_plural "%d songs"
@@ -2929,31 +3166,31 @@
 msgstr1 ""
 msgstr2 ""
 
-#: src/search-tool/search-tool.cc:601
+#: src/search-tool-qt/search-model.cc:53 src/search-tool/search-tool.cc:294
 msgid "of this genre"
 msgstr ""
 
-#: src/search-tool/search-tool.cc:607
+#: src/search-tool-qt/search-model.h:47 src/search-tool/search-model.h:45
 msgid "on"
 msgstr ""
 
-#: src/search-tool/search-tool.cc:607
+#: src/search-tool-qt/search-model.h:47 src/search-tool/search-model.h:45
 msgid "by"
 msgstr ""
 
-#: src/search-tool/search-tool.cc:643
-msgid "_Create Playlist"
-msgstr "_Направи списак нумера"
+#: src/search-tool-qt/search-tool-qt.cc:165 src/search-tool/search-tool.cc:74
+msgid "Number of results to show:"
+msgstr ""
 
-#: src/search-tool/search-tool.cc:645
-msgid "_Add to Playlist"
-msgstr "_Додај у списак нумера"
+#: src/search-tool-qt/search-tool-qt.cc:168 src/search-tool/search-tool.cc:77
+msgid "Rescan library at startup"
+msgstr ""
 
-#: src/search-tool/search-tool.cc:684
-msgid "Search library"
-msgstr "Претражите библиотеку"
+#: src/search-tool-qt/search-tool-qt.cc:170
+msgid "Monitor library for changes"
+msgstr ""
 
-#: src/search-tool/search-tool.cc:688
+#: src/search-tool-qt/search-tool-qt.cc:193 src/search-tool/search-tool.cc:450
 msgid ""
 "To import your music library into Audacious, choose a folder and then click "
 "the \"refresh\" icon."
@@ -2961,22 +3198,46 @@
 "Да увезете вашу музичку библиотеку у Безочнику, изаберите фасциклу и затим "
 "кликните на иконицу „освежи“."
 
-#: src/search-tool/search-tool.cc:696
+#: src/search-tool-qt/search-tool-qt.cc:195 src/search-tool/search-tool.cc:459
 msgid "Please wait ..."
 msgstr "Молим сачекајте ..."
 
-#: src/search-tool/search-tool.cc:723
+#: src/search-tool-qt/search-tool-qt.cc:197 src/search-tool/search-tool.cc:487
 msgid "Choose Folder"
 msgstr "Изаберите фасциклу"
 
+#: src/search-tool-qt/search-tool-qt.cc:201 src/search-tool/search-tool.cc:445
+msgid "Search library"
+msgstr "Претражите библиотеку"
+
+#: src/search-tool-qt/search-tool-qt.cc:327 src/search-tool/search-tool.cc:156
+#, c-format
+msgid "%d of %d result shown"
+msgid_plural "%d of %d results shown"
+msgstr0 ""
+msgstr1 ""
+msgstr2 ""
+
+#: src/search-tool-qt/search-tool-qt.cc:331 src/search-tool/search-tool.cc:160
+#, c-format
+msgid "%d result"
+msgid_plural "%d results"
+msgstr0 ""
+msgstr1 ""
+msgstr2 ""
+
+#: src/search-tool-qt/search-tool-qt.cc:501 src/search-tool/search-tool.cc:341
+msgid "_Create Playlist"
+msgstr "_Направи списак нумера"
+
+#: src/search-tool-qt/search-tool-qt.cc:503 src/search-tool/search-tool.cc:343
+msgid "_Add to Playlist"
+msgstr "_Додај у списак нумера"
+
 #: src/sid/xmms-sid.cc:43
 msgid "SID Player"
 msgstr ""
 
-#: src/sid/xs_config.cc:61
-msgid "Output"
-msgstr ""
-
 #: src/sid/xs_config.cc:62
 msgid "Channels:"
 msgstr ""
@@ -3055,741 +3316,684 @@
 msgid "Threshold:"
 msgstr ""
 
-#: src/silence-removal/silence-removal.cc:70
-msgid "dB"
+#: src/skins/actions.cc:45 src/skins-qt/actions.cc:43
+msgid "Repeat points cleared."
 msgstr ""
 
-#: src/skins/menus.cc:64
-msgid "Open Files ..."
+#: src/skins/actions.cc:60 src/skins-qt/actions.cc:58
+msgid "Repeat point A set."
 msgstr ""
 
-#: src/skins/menus.cc:65
-msgid "Open URL ..."
+#: src/skins/actions.cc:65 src/skins-qt/actions.cc:63
+msgid "Repeat point B set."
 msgstr ""
 
-#: src/skins/menus.cc:66
-msgid "Search Library"
+#: src/skins/equalizer.cc:223 src/skins-qt/equalizer.cc:223
+msgid "Preamp"
+msgstr "Претпојачање"
+
+#: src/skins/equalizer.cc:227 src/skins-qt/equalizer.cc:227
+msgid "31 Hz"
+msgstr "31 Hz"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "63 Hz"
+msgstr "63 Hz"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "125 Hz"
+msgstr "125 Hz"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "250 Hz"
+msgstr "250 Hz"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "500 Hz"
+msgstr "500 Hz"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "1 kHz"
+msgstr "1 kHz"
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "2 kHz"
+msgstr "2 kHz"
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "4 kHz"
+msgstr "4 kHz"
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "8 kHz"
+msgstr "8 kHz"
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "16 kHz"
+msgstr "16 kHz"
+
+#: src/skins/equalizer.cc:270 src/skins-qt/equalizer.cc:270
+msgid "Audacious Equalizer"
+msgstr "Уједначавач Безочника"
+
+#: src/skins/main.cc:459 src/skins-qt/main.cc:442
+msgid "Recording on"
 msgstr ""
 
-#: src/skins/menus.cc:68
-msgid "Playback"
-msgstr "Репродукција"
+#: src/skins/main.cc:461 src/skins-qt/main.cc:444
+msgid "Recording off"
+msgstr ""
+
+#: src/skins/main.cc:754 src/skins-qt/main.cc:701
+#, c-format
+msgid "Seek to %d:%-2.2d / %d:%-2.2d"
+msgstr "Тражи до: %d:%-2.2d / %d:%-2.2d"
+
+#: src/skins/main.cc:771 src/skins-qt/main.cc:718
+#, c-format
+msgid "Volume: %d%%"
+msgstr "Јачина звука: %d%%"
+
+#: src/skins/main.cc:784 src/skins-qt/main.cc:731
+#, c-format
+msgid "Balance: %d%% left"
+msgstr "Уравнотеженост: %d%% леви"
+
+#: src/skins/main.cc:786 src/skins-qt/main.cc:733
+msgid "Balance: center"
+msgstr "Уравнотеженост: центрирано"
+
+#: src/skins/main.cc:788 src/skins-qt/main.cc:735
+#, c-format
+msgid "Balance: %d%% right"
+msgstr "Уравнотеженост: %d%% десни"
+
+#: src/skins/main.cc:880 src/skins-qt/main.cc:827
+msgid "Options Menu"
+msgstr "Изборник опција"
+
+#: src/skins/main.cc:884 src/skins-qt/main.cc:831
+msgid "Disable 'Always On Top'"
+msgstr "Искључи „Увек у првом плану“"
+
+#: src/skins/main.cc:886 src/skins-qt/main.cc:833
+msgid "Enable 'Always On Top'"
+msgstr "Укључи „Увек у првом плану“"
+
+#: src/skins/main.cc:889 src/skins-qt/main.cc:836
+msgid "File Info Box"
+msgstr "Поље информација о датотеци"
+
+#: src/skins/main.cc:892 src/skins/menus.cc:149 src/skins-qt/main.cc:839
+#: src/skins-qt/menus.cc:142
+msgid "Double Size"
+msgstr ""
+
+#: src/skins/main.cc:895 src/skins-qt/main.cc:842
+msgid "Visualizations"
+msgstr ""
+
+#: src/skins/menus.cc:74 src/skins-qt/menus.cc:64
+msgid "Volume Up"
+msgstr "Појачај"
+
+#: src/skins/menus.cc:75 src/skins-qt/menus.cc:65
+msgid "Volume Down"
+msgstr "Утишај"
+
+#: src/skins/menus.cc:77 src/skins-qt/menus.cc:67
+msgid "Effects ..."
+msgstr ""
+
+#: src/skins/menus.cc:84 src/skins-qt/menus.cc:74
+msgid "Open Files ..."
+msgstr ""
+
+#: src/skins/menus.cc:85 src/skins-qt/menus.cc:76
+msgid "Open URL ..."
+msgstr ""
 
-#: src/skins/menus.cc:69
+#: src/skins/menus.cc:89 src/skins-qt/menus.cc:80
 msgid "Playlist"
 msgstr "Списак нумера"
 
-#: src/skins/menus.cc:70
+#: src/skins/menus.cc:90 src/skins-qt/menus.cc:81
+msgid "Output"
+msgstr ""
+
+#: src/skins/menus.cc:91 src/skins-qt/menus.cc:82
 msgid "View"
 msgstr "Поглед"
 
-#: src/skins/menus.cc:72 src/skins/menus.cc:136 src/skins/menus.cc:149
-#: src/skins/menus.cc:214
+#: src/skins/menus.cc:93 src/skins/menus.cc:161 src/skins/menus.cc:174
+#: src/skins/menus.cc:245 src/skins-qt/menus.cc:84 src/skins-qt/menus.cc:156
+#: src/skins-qt/menus.cc:170 src/skins-qt/menus.cc:241
 msgid "Services"
-msgstr ""
+msgstr "Услуге"
 
-#: src/skins/menus.cc:74
+#: src/skins/menus.cc:95 src/skins-qt/menus.cc:86
 msgid "About ..."
 msgstr ""
 
-#: src/skins/menus.cc:75
+#: src/skins/menus.cc:96 src/skins-qt/menus.cc:87
 msgid "Settings ..."
 msgstr ""
 
-#: src/skins/menus.cc:76
+#: src/skins/menus.cc:97 src/skins-qt/menus.cc:88
 msgid "Quit"
 msgstr ""
 
-#: src/skins/menus.cc:80 src/skins/menus.cc:206
+#: src/skins/menus.cc:101 src/skins/menus.cc:235 src/skins-qt/menus.cc:92
+#: src/skins-qt/menus.cc:231
 msgid "Song Info ..."
 msgstr ""
 
-#: src/skins/menus.cc:84
+#: src/skins/menus.cc:105 src/skins-qt/menus.cc:96
+msgid "Shuffle by Album"
+msgstr ""
+
+#: src/skins/menus.cc:106 src/skins-qt/menus.cc:97
 msgid "No Playlist Advance"
 msgstr "Не напредуј у списку нумера"
 
-#: src/skins/menus.cc:85
-msgid "Stop After This Song"
-msgstr ""
-
-#: src/skins/menus.cc:93
+#: src/skins/menus.cc:117 src/skins-qt/menus.cc:108
 msgid "Set A-B Repeat"
 msgstr ""
 
-#: src/skins/menus.cc:94
+#: src/skins/menus.cc:118 src/skins-qt/menus.cc:109
 msgid "Clear A-B Repeat"
 msgstr ""
 
-#: src/skins/menus.cc:96
+#: src/skins/menus.cc:120 src/skins-qt/menus.cc:111
 msgid "Jump to Song ..."
 msgstr ""
 
-#: src/skins/menus.cc:97
+#: src/skins/menus.cc:121 src/skins-qt/menus.cc:113
 msgid "Jump to Time ..."
 msgstr ""
 
-#: src/skins/menus.cc:101
+#: src/skins/menus.cc:125 src/skins-qt/menus.cc:118
 msgid "Play/Resume"
 msgstr ""
 
-#: src/skins/menus.cc:103
+#: src/skins/menus.cc:127 src/skins-qt/menus.cc:120
 msgid "New Playlist"
 msgstr "Нови списак нумера"
 
-#: src/skins/menus.cc:104
+#: src/skins/menus.cc:128 src/skins-qt/menus.cc:121
 msgid "Rename Playlist ..."
 msgstr ""
 
-#: src/skins/menus.cc:105
+#: src/skins/menus.cc:129 src/skins-qt/menus.cc:122
 msgid "Remove Playlist"
-msgstr ""
+msgstr "Уклони списак нумера"
 
-#: src/skins/menus.cc:107
+#: src/skins/menus.cc:131 src/skins-qt/menus.cc:124
 msgid "Previous Playlist"
 msgstr ""
 
-#: src/skins/menus.cc:108
+#: src/skins/menus.cc:132 src/skins-qt/menus.cc:125
 msgid "Next Playlist"
 msgstr ""
 
-#: src/skins/menus.cc:110
+#: src/skins/menus.cc:134 src/skins-qt/menus.cc:127
 msgid "Import Playlist ..."
 msgstr ""
 
-#: src/skins/menus.cc:111
+#: src/skins/menus.cc:135 src/skins-qt/menus.cc:128
 msgid "Export Playlist ..."
 msgstr ""
 
-#: src/skins/menus.cc:113
+#: src/skins/menus.cc:137 src/skins-qt/menus.cc:130
 msgid "Playlist Manager ..."
 msgstr ""
 
-#: src/skins/menus.cc:114
+#: src/skins/menus.cc:138 src/skins-qt/menus.cc:131
 msgid "Queue Manager ..."
 msgstr ""
 
-#: src/skins/menus.cc:116
+#: src/skins/menus.cc:140 src/skins-qt/menus.cc:133
 msgid "Refresh Playlist"
 msgstr ""
 
-#: src/skins/menus.cc:120
+#: src/skins/menus.cc:144 src/skins-qt/menus.cc:137
 msgid "Show Playlist Editor"
 msgstr "Прикажи уређивач списка нумера"
 
-#: src/skins/menus.cc:121
+#: src/skins/menus.cc:145 src/skins-qt/menus.cc:138
 msgid "Show Equalizer"
 msgstr "Прикажи уједначавач"
 
-#: src/skins/menus.cc:123
+#: src/skins/menus.cc:147 src/skins-qt/menus.cc:140
 msgid "Show Remaining Time"
 msgstr ""
 
-#: src/skins/menus.cc:125
+#: src/skins/menus.cc:150 src/skins-qt/menus.cc:143
 msgid "Always on Top"
 msgstr "Увек у првом плану"
 
-#: src/skins/menus.cc:126
+#: src/skins/menus.cc:151 src/skins-qt/menus.cc:145
 msgid "On All Workspaces"
 msgstr ""
 
-#: src/skins/menus.cc:128
+#: src/skins/menus.cc:153 src/skins-qt/menus.cc:148
 msgid "Roll Up Player"
 msgstr ""
 
-#: src/skins/menus.cc:129
+#: src/skins/menus.cc:154 src/skins-qt/menus.cc:149
 msgid "Roll Up Playlist Editor"
 msgstr ""
 
-#: src/skins/menus.cc:130
+#: src/skins/menus.cc:155 src/skins-qt/menus.cc:150
 msgid "Roll Up Equalizer"
 msgstr ""
 
-#: src/skins/menus.cc:132 src/skins/ui_main.cc:854
-msgid "Double Size"
-msgstr ""
-
-#: src/skins/menus.cc:138
+#: src/skins/menus.cc:163 src/skins-qt/menus.cc:158
 msgid "Add URL ..."
 msgstr ""
 
-#: src/skins/menus.cc:139
+#: src/skins/menus.cc:164 src/skins-qt/menus.cc:160
 msgid "Add Files ..."
 msgstr ""
 
-#: src/skins/menus.cc:143 src/skins/menus.cc:171 src/skins/menus.cc:185
+#: src/skins/menus.cc:168 src/skins/menus.cc:196 src/skins/menus.cc:212
+#: src/skins-qt/menus.cc:164 src/skins-qt/menus.cc:192
+#: src/skins-qt/menus.cc:208
 msgid "By Title"
 msgstr "Према наслову"
 
-#: src/skins/menus.cc:144 src/skins/menus.cc:178 src/skins/menus.cc:192
+#: src/skins/menus.cc:169 src/skins/menus.cc:203 src/skins/menus.cc:219
+#: src/skins-qt/menus.cc:165 src/skins-qt/menus.cc:199
+#: src/skins-qt/menus.cc:215
 msgid "By File Name"
 msgstr ""
 
-#: src/skins/menus.cc:145 src/skins/menus.cc:179 src/skins/menus.cc:193
+#: src/skins/menus.cc:170 src/skins/menus.cc:204 src/skins/menus.cc:220
+#: src/skins-qt/menus.cc:166 src/skins-qt/menus.cc:200
+#: src/skins-qt/menus.cc:216
 msgid "By File Path"
 msgstr ""
 
-#: src/skins/menus.cc:151
+#: src/skins/menus.cc:176 src/skins-qt/menus.cc:172
 msgid "Remove All"
 msgstr "Уклони све"
 
-#: src/skins/menus.cc:152
+#: src/skins/menus.cc:177 src/skins-qt/menus.cc:173
 msgid "Clear Queue"
 msgstr "Обриши заказано"
 
-#: src/skins/menus.cc:154
+#: src/skins/menus.cc:179 src/skins-qt/menus.cc:175
 msgid "Remove Unavailable Files"
 msgstr "Уклони недоступне датотеке"
 
-#: src/skins/menus.cc:155
+#: src/skins/menus.cc:180 src/skins-qt/menus.cc:176
 msgid "Remove Duplicates"
 msgstr "Уклони дупликате"
 
-#: src/skins/menus.cc:157
+#: src/skins/menus.cc:182 src/skins-qt/menus.cc:178
 msgid "Remove Unselected"
 msgstr "Уклони неозначене"
 
-#: src/skins/menus.cc:158
+#: src/skins/menus.cc:183 src/skins-qt/menus.cc:179
 msgid "Remove Selected"
 msgstr "Уклони означене"
 
-#: src/skins/menus.cc:162
+#: src/skins/menus.cc:187 src/skins-qt/menus.cc:183
 msgid "Search and Select"
 msgstr "Претражи и означи"
 
-#: src/skins/menus.cc:164
+#: src/skins/menus.cc:189 src/skins-qt/menus.cc:185
 msgid "Invert Selection"
 msgstr "Обрни избор"
 
-#: src/skins/menus.cc:165
+#: src/skins/menus.cc:190 src/skins-qt/menus.cc:186
 msgid "Select None"
 msgstr "Означи ништа"
 
-#: src/skins/menus.cc:166
+#: src/skins/menus.cc:191 src/skins-qt/menus.cc:187
 msgid "Select All"
 msgstr "Означи све"
 
-#: src/skins/menus.cc:170 src/skins/menus.cc:184
+#: src/skins/menus.cc:195 src/skins/menus.cc:211 src/skins-qt/menus.cc:191
+#: src/skins-qt/menus.cc:207
 msgid "By Track Number"
 msgstr "Према броју нумере"
 
-#: src/skins/menus.cc:172 src/skins/menus.cc:186
+#: src/skins/menus.cc:197 src/skins/menus.cc:213 src/skins-qt/menus.cc:193
+#: src/skins-qt/menus.cc:209
 msgid "By Artist"
 msgstr "Према извођачу"
 
-#: src/skins/menus.cc:173 src/skins/menus.cc:187
+#: src/skins/menus.cc:198 src/skins/menus.cc:214 src/skins-qt/menus.cc:194
+#: src/skins-qt/menus.cc:210
 msgid "By Album"
 msgstr "Према албуму"
 
-#: src/skins/menus.cc:174 src/skins/menus.cc:188
+#: src/skins/menus.cc:199 src/skins/menus.cc:215 src/skins-qt/menus.cc:195
+#: src/skins-qt/menus.cc:211
 msgid "By Album Artist"
 msgstr ""
 
-#: src/skins/menus.cc:175 src/skins/menus.cc:190
+#: src/skins/menus.cc:200 src/skins/menus.cc:216 src/skins-qt/menus.cc:196
+#: src/skins-qt/menus.cc:212
 msgid "By Release Date"
 msgstr ""
 
-#: src/skins/menus.cc:176 src/skins/menus.cc:189
+#: src/skins/menus.cc:201 src/skins/menus.cc:217 src/skins-qt/menus.cc:197
+#: src/skins-qt/menus.cc:213
 msgid "By Genre"
 msgstr ""
 
-#: src/skins/menus.cc:177 src/skins/menus.cc:191
+#: src/skins/menus.cc:202 src/skins/menus.cc:218 src/skins-qt/menus.cc:198
+#: src/skins-qt/menus.cc:214
 msgid "By Length"
 msgstr ""
 
-#: src/skins/menus.cc:180 src/skins/menus.cc:194
+#: src/skins/menus.cc:205 src/skins/menus.cc:221 src/skins-qt/menus.cc:201
+#: src/skins-qt/menus.cc:217
 msgid "By Custom Title"
 msgstr ""
 
-#: src/skins/menus.cc:198
+#: src/skins/menus.cc:206 src/skins/menus.cc:222 src/skins-qt/menus.cc:202
+#: src/skins-qt/menus.cc:218
+msgid "By Comment"
+msgstr ""
+
+#: src/skins/menus.cc:207 src/skins/menus.cc:223 src/skins-qt/menus.cc:203
+#: src/skins-qt/menus.cc:219
+msgid "By Disc Number"
+msgstr ""
+
+#: src/skins/menus.cc:227 src/skins-qt/menus.cc:223
 msgid "Randomize List"
 msgstr "Насумице испремештај списак"
 
-#: src/skins/menus.cc:199
+#: src/skins/menus.cc:228 src/skins-qt/menus.cc:224
 msgid "Reverse List"
 msgstr "Преокрени списак"
 
-#: src/skins/menus.cc:201
+#: src/skins/menus.cc:230 src/skins-qt/menus.cc:226
 msgid "Sort Selected"
 msgstr "Поређај означене"
 
-#: src/skins/menus.cc:202
+#: src/skins/menus.cc:231 src/skins-qt/menus.cc:227
 msgid "Sort List"
 msgstr "Поређај списак"
 
-#: src/skins/menus.cc:208
+#: src/skins/menus.cc:236 src/skins-qt/menus.cc:232
+msgid "Open Containing Folder"
+msgstr ""
+
+#: src/skins/menus.cc:238 src/skins-qt/menus.cc:234
 msgid "Cut"
 msgstr "Исеци"
 
-#: src/skins/menus.cc:209
+#: src/skins/menus.cc:239 src/skins-qt/menus.cc:235
 msgid "Copy"
 msgstr "Умножи"
 
-#: src/skins/menus.cc:210
+#: src/skins/menus.cc:240 src/skins-qt/menus.cc:236
 msgid "Paste"
 msgstr "Убаци"
 
-#: src/skins/menus.cc:212
-msgid "Queue/Unqueue"
-msgstr ""
-
-#: src/skins/menus.cc:218
-msgid "Load Preset ..."
+#: src/skins/menus.cc:241 src/skins-qt/menus.cc:237
+msgid "Paste at End"
 msgstr ""
 
-#: src/skins/menus.cc:219
-msgid "Load Auto Preset ..."
-msgstr ""
-
-#: src/skins/menus.cc:220
-msgid "Load Default"
-msgstr ""
-
-#: src/skins/menus.cc:221
-msgid "Load Preset File ..."
+#: src/skins/menus.cc:243 src/skins-qt/menus.cc:239
+msgid "Queue/Unqueue"
 msgstr ""
 
-#: src/skins/menus.cc:222
-msgid "Load EQF File ..."
-msgstr ""
+#: src/skins/playlist-widget.cc:58 src/skins-qt/playlist-widget.cc:58
+#, c-format
+msgid "%s (%d of %d)"
+msgstr "%s (%d од %d)"
 
-#: src/skins/menus.cc:224
-msgid "Save Preset ..."
-msgstr ""
+#: src/skins/playlistwin.cc:491 src/skins-qt/playlistwin.cc:478
+msgid "Audacious Playlist Editor"
+msgstr "Уређивач списка нумера"
 
-#: src/skins/menus.cc:225
-msgid "Save Auto Preset ..."
-msgstr ""
+#: src/skins/plugin.cc:53 src/skins-qt/plugin.cc:65
+msgid "Winamp Classic Interface"
+msgstr "Винампово уобичајено сучеље"
 
-#: src/skins/menus.cc:226
-msgid "Save Default"
+#: src/skins-qt/menus.cc:75
+msgid "Open Folder ..."
 msgstr ""
 
-#: src/skins/menus.cc:227
-msgid "Save Preset File ..."
+#: src/skins-qt/menus.cc:159
+msgid "Add Folder ..."
 msgstr ""
 
-#: src/skins/menus.cc:228
-msgid "Save EQF File ..."
-msgstr ""
+#: src/skins-qt/search-select.cc:62 src/skins/search-select.cc:77
+msgid "Search entries in active playlist"
+msgstr "Претражи ставке у активном списку нумера"
 
-#: src/skins/menus.cc:230
-msgid "Delete Preset ..."
+#: src/skins-qt/search-select.cc:70 src/skins/search-select.cc:83
+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/menus.cc:231
-msgid "Delete Auto Preset ..."
+#: src/skins-qt/search-select.cc:75 src/skins/search-select.cc:91
+msgid "Title:"
 msgstr ""
 
-#: src/skins/menus.cc:233
-msgid "Import Winamp Presets ..."
+#: src/skins-qt/search-select.cc:79 src/skins/search-select.cc:96
+msgid "Album:"
 msgstr ""
 
-#: src/skins/menus.cc:235
-msgid "Reset to Zero"
+#: src/skins-qt/search-select.cc:82 src/skins/search-select.cc:101
+msgid "Artist:"
 msgstr ""
 
-#: src/skins/plugin.cc:48
-msgid "Winamp Classic Interface"
-msgstr "Винампово уобичајено сучеље"
-
-#: src/skins/preset-browser.cc:57 src/skins/preset-list.cc:371
-#: src/skins/preset-list.cc:386
-msgid "Save"
-msgstr "Сачувај"
-
-#: src/skins/preset-browser.cc:57 src/skins/preset-list.cc:338
-#: src/skins/preset-list.cc:354
-msgid "Load"
-msgstr "Учитај"
-
-#: src/skins/preset-browser.cc:83
-msgid "Load Preset File"
+#: src/skins-qt/search-select.cc:85 src/skins/search-select.cc:106
+msgid "File Name:"
 msgstr ""
 
-#: src/skins/preset-browser.cc:100
-msgid "Load EQF File"
-msgstr ""
+#: src/skins-qt/search-select.cc:88 src/skins/search-select.cc:134
+msgid "Clear previous selection before searching"
+msgstr "Обриши претходни избор пре претраге"
 
-#: src/skins/preset-browser.cc:119
-msgid "Save Preset File"
-msgstr ""
+#: src/skins-qt/search-select.cc:89 src/skins/search-select.cc:137
+msgid "Automatically toggle queue for matching entries"
+msgstr "Подударајуће ставке самостално пребаци у ред"
 
-#: src/skins/preset-browser.cc:137
-msgid "Save EQF File"
-msgstr ""
+#: src/skins-qt/search-select.cc:90 src/skins/search-select.cc:140
+msgid "Create a new playlist with matching entries"
+msgstr "Направи нови списак нумера са подударајућим ставкама"
 
-#: src/skins/preset-browser.cc:151
-msgid "Import Winamp Presets"
+#: src/skins-qt/search-select.cc:101 src/skins/search-select.cc:78
+msgid "Search"
 msgstr ""
 
-#: src/skins/preset-list.cc:285
-msgid "Presets"
-msgstr "Претподешавања"
-
-#: src/skins/preset-list.cc:335
-msgid "Load preset"
-msgstr "Учитава претподешавање"
-
-#: src/skins/preset-list.cc:351
-msgid "Load auto-preset"
-msgstr "Учитава самостално претподешавање"
-
-#: src/skins/preset-list.cc:367
-msgid "Save preset"
-msgstr "Чува претподешавање"
-
-#: src/skins/preset-list.cc:382
-msgid "Save auto-preset"
-msgstr "Чува самостално претподешавање"
-
-#: src/skins/preset-list.cc:408
-msgid "Delete preset"
-msgstr "Избриши претподешавање"
-
-#: src/skins/preset-list.cc:424
-msgid "Delete auto-preset"
-msgstr "Брише самостално претподешавање"
-
-#: src/skins/skins_cfg.cc:176
+#: src/skins-qt/skins_cfg.cc:198 src/skins/skins_cfg.cc:182
 msgid "Player:"
 msgstr ""
 
-#: src/skins/skins_cfg.cc:178
+#: src/skins-qt/skins_cfg.cc:200 src/skins/skins_cfg.cc:184
 msgid "Select main player window font:"
 msgstr "Изаберите словни лик главног прозора плејера:"
 
-#: src/skins/skins_cfg.cc:179
+#: src/skins-qt/skins_cfg.cc:201 src/skins/skins_cfg.cc:185
 msgid "Playlist:"
 msgstr ""
 
-#: src/skins/skins_cfg.cc:181
+#: src/skins-qt/skins_cfg.cc:203 src/skins/skins_cfg.cc:187
 msgid "Select playlist font:"
 msgstr "Изабери словни лик списка нумера:"
 
-#: src/skins/skins_cfg.cc:187
+#: src/skins-qt/skins_cfg.cc:207 src/skins/skins_cfg.cc:191
 msgid "Skin"
 msgstr ""
 
-#: src/skins/skins_cfg.cc:189
+#: src/skins-qt/skins_cfg.cc:211 src/skins/skins_cfg.cc:193
+msgid "Display active titlebar when any window is focused"
+msgstr ""
+
+#: src/skins-qt/skins_cfg.cc:213 src/skins/skins_cfg.cc:195
 msgid "Fonts"
 msgstr ""
 
-#: src/skins/skins_cfg.cc:192
+#: src/skins-qt/skins_cfg.cc:215 src/skins/skins_cfg.cc:197
 msgid "Use bitmap fonts (supports ASCII only)"
 msgstr "Користи битмап словне ликове (подржава само АСКРИ)"
 
-#: src/skins/skins_cfg.cc:194
+#: src/skins-qt/skins_cfg.cc:217 src/skins/skins_cfg.cc:199
 msgid "Scroll song title"
 msgstr ""
 
-#: src/skins/skins_cfg.cc:196
+#: src/skins-qt/skins_cfg.cc:219 src/skins/skins_cfg.cc:201
 msgid "Scroll song title in both directions"
 msgstr "Померај наслов песме у оба смера"
 
-#: src/skins/skins_cfg.cc:201
+#: src/skins-qt/skins_cfg.cc:224 src/skins/skins_cfg.cc:206
 msgid "Analyzer"
 msgstr "Анализатор"
 
-#: src/skins/skins_cfg.cc:202
+#: src/skins-qt/skins_cfg.cc:225 src/skins/skins_cfg.cc:207
 msgid "Scope"
 msgstr "Досег"
 
-#: src/skins/skins_cfg.cc:203
+#: src/skins-qt/skins_cfg.cc:226 src/skins/skins_cfg.cc:208
 msgid "Voiceprint / VU meter"
 msgstr ""
 
-#: src/skins/skins_cfg.cc:204
+#: src/skins-qt/skins_cfg.cc:227 src/skins/skins_cfg.cc:209
 msgid "Off"
 msgstr "Искључено"
 
-#: src/skins/skins_cfg.cc:208 src/skins/skins_cfg.cc:233
-#: src/skins/skins_cfg.cc:239
+#: src/skins-qt/skins_cfg.cc:231 src/skins-qt/skins_cfg.cc:256
+#: src/skins-qt/skins_cfg.cc:262 src/skins/skins_cfg.cc:213
+#: src/skins/skins_cfg.cc:238 src/skins/skins_cfg.cc:244
 msgid "Normal"
 msgstr "Нормалан"
 
-#: src/skins/skins_cfg.cc:209 src/skins/skins_cfg.cc:234
+#: src/skins-qt/skins_cfg.cc:232 src/skins-qt/skins_cfg.cc:257
+#: src/skins/skins_cfg.cc:214 src/skins/skins_cfg.cc:239
 msgid "Fire"
 msgstr "Ватра"
 
-#: src/skins/skins_cfg.cc:210
+#: src/skins-qt/skins_cfg.cc:233 src/skins/skins_cfg.cc:215
 msgid "Vertical lines"
 msgstr ""
 
-#: src/skins/skins_cfg.cc:214
+#: src/skins-qt/skins_cfg.cc:237 src/skins/skins_cfg.cc:219
 msgid "Lines"
 msgstr "Линије"
 
-#: src/skins/skins_cfg.cc:215
+#: src/skins-qt/skins_cfg.cc:238 src/skins/skins_cfg.cc:220
 msgid "Bars"
 msgstr "Траке"
 
-#: src/skins/skins_cfg.cc:219
+#: src/skins-qt/skins_cfg.cc:242 src/skins/skins_cfg.cc:224
 msgid "Slowest"
 msgstr "Најспорије"
 
-#: src/skins/skins_cfg.cc:220
+#: src/skins-qt/skins_cfg.cc:243 src/skins/skins_cfg.cc:225
 msgid "Slow"
 msgstr "Споро"
 
-#: src/skins/skins_cfg.cc:221 src/sox-resampler/sox-resampler.cc:152
+#: src/skins-qt/skins_cfg.cc:244 src/skins/skins_cfg.cc:226
+#: src/soxr/sox-resampler.cc:180
 msgid "Medium"
 msgstr "Средње"
 
-#: src/skins/skins_cfg.cc:222
+#: src/skins-qt/skins_cfg.cc:245 src/skins/skins_cfg.cc:227
 msgid "Fast"
 msgstr "Брзо"
 
-#: src/skins/skins_cfg.cc:223
+#: src/skins-qt/skins_cfg.cc:246 src/skins/skins_cfg.cc:228
 msgid "Fastest"
 msgstr "Најбрже"
 
-#: src/skins/skins_cfg.cc:227
+#: src/skins-qt/skins_cfg.cc:250 src/skins/skins_cfg.cc:232
 msgid "Dots"
 msgstr ""
 
-#: src/skins/skins_cfg.cc:228
+#: src/skins-qt/skins_cfg.cc:251 src/skins/skins_cfg.cc:233
 msgid "Line"
 msgstr ""
 
-#: src/skins/skins_cfg.cc:229
+#: src/skins-qt/skins_cfg.cc:252 src/skins/skins_cfg.cc:234
 msgid "Solid"
 msgstr ""
 
-#: src/skins/skins_cfg.cc:235
+#: src/skins-qt/skins_cfg.cc:258 src/skins/skins_cfg.cc:240
 msgid "Ice"
 msgstr "Лед"
 
-#: src/skins/skins_cfg.cc:240
+#: src/skins-qt/skins_cfg.cc:263 src/skins/skins_cfg.cc:245
 msgid "Smooth"
 msgstr "Глатко"
 
-#: src/skins/skins_cfg.cc:244
-msgid "Type"
-msgstr ""
-
-#: src/skins/skins_cfg.cc:245
-msgid "Visualization type:"
-msgstr ""
-
-#: src/skins/skins_cfg.cc:248
-msgid "Analyzer"
-msgstr ""
-
-#: src/skins/skins_cfg.cc:249
-msgid "Show peaks"
-msgstr ""
-
-#: src/skins/skins_cfg.cc:251
+#: src/skins-qt/skins_cfg.cc:267 src/skins/skins_cfg.cc:249
 msgid "Coloring:"
 msgstr ""
 
-#: src/skins/skins_cfg.cc:254
+#: src/skins-qt/skins_cfg.cc:270 src/skins/skins_cfg.cc:252
 msgid "Style:"
 msgstr ""
 
-#: src/skins/skins_cfg.cc:257
+#: src/skins-qt/skins_cfg.cc:273 src/skins/skins_cfg.cc:255
 msgid "Falloff:"
 msgstr ""
 
-#: src/skins/skins_cfg.cc:260
+#: src/skins-qt/skins_cfg.cc:276 src/skins/skins_cfg.cc:258
 msgid "Peak falloff:"
 msgstr ""
 
-#: src/skins/skins_cfg.cc:264
+#: src/skins-qt/skins_cfg.cc:282 src/skins/skins_cfg.cc:264
 msgid "Scope Style:"
 msgstr ""
 
-#: src/skins/skins_cfg.cc:267
+#: src/skins-qt/skins_cfg.cc:285 src/skins/skins_cfg.cc:267
 msgid "Voiceprint Coloring:"
 msgstr ""
 
-#: src/skins/skins_cfg.cc:270
+#: src/skins-qt/skins_cfg.cc:288 src/skins/skins_cfg.cc:270
 msgid "VU Meter Style:"
 msgstr ""
 
-#: src/skins/skins_cfg.cc:276
-msgid "General"
-msgstr "Опште"
-
-#: src/skins/skins_cfg.cc:277
-msgid "Visualization"
-msgstr "Приказивање"
-
-#: src/skins/ui_equalizer.cc:282
-msgid "Preamp"
-msgstr "Претпојачање"
-
-#: src/skins/ui_equalizer.cc:286
-msgid "31 Hz"
-msgstr "31 Hz"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "63 Hz"
-msgstr "63 Hz"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "125 Hz"
-msgstr "125 Hz"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "250 Hz"
-msgstr "250 Hz"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "500 Hz"
-msgstr "500 Hz"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "1 kHz"
-msgstr "1 kHz"
-
-#: src/skins/ui_equalizer.cc:288
-msgid "2 kHz"
-msgstr "2 kHz"
-
-#: src/skins/ui_equalizer.cc:288
-msgid "4 kHz"
-msgstr "4 kHz"
-
-#: src/skins/ui_equalizer.cc:288
-msgid "8 kHz"
-msgstr "8 kHz"
-
-#: src/skins/ui_equalizer.cc:288
-msgid "16 kHz"
-msgstr "16 kHz"
-
-#: src/skins/ui_equalizer.cc:330
-msgid "Audacious Equalizer"
-msgstr "Уједначавач Безочника"
-
-#: src/skins/ui_main.cc:688
-#, c-format
-msgid "Seek to %d:%-2.2d / %d:%-2.2d"
-msgstr "Тражи до: %d:%-2.2d / %d:%-2.2d"
-
-#: src/skins/ui_main.cc:709
-#, c-format
-msgid "Volume: %d%%"
-msgstr "Јачина звука: %d%%"
-
-#: src/skins/ui_main.cc:732
-#, c-format
-msgid "Balance: %d%% left"
-msgstr "Уравнотеженост: %d%% леви"
-
-#: src/skins/ui_main.cc:734
-msgid "Balance: center"
-msgstr "Уравнотеженост: центрирано"
-
-#: src/skins/ui_main.cc:736
-#, c-format
-msgid "Balance: %d%% right"
-msgstr "Уравнотеженост: %d%% десни"
-
-#: src/skins/ui_main.cc:842
-msgid "Options Menu"
-msgstr "Изборник опција"
-
-#: src/skins/ui_main.cc:846
-msgid "Disable 'Always On Top'"
-msgstr "Искључи „Увек у првом плану“"
-
-#: src/skins/ui_main.cc:848
-msgid "Enable 'Always On Top'"
-msgstr "Укључи „Увек у првом плану“"
-
-#: src/skins/ui_main.cc:851
-msgid "File Info Box"
-msgstr "Поље информација о датотеци"
-
-#: src/skins/ui_main.cc:857
-msgid "Visualizations"
-msgstr ""
-
-#: src/skins/ui_main.cc:1336
-msgid "Repeat point A set."
-msgstr ""
-
-#: src/skins/ui_main.cc:1341
-msgid "Repeat point B set."
-msgstr ""
-
-#: src/skins/ui_main.cc:1350
-msgid "Repeat points cleared."
-msgstr ""
-
-#: src/skins/ui_playlist.cc:219
-msgid "Search entries in active playlist"
-msgstr "Претражи ставке у активном списку нумера"
-
-#: src/skins/ui_playlist.cc:226
-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.cc:234
-msgid "Title:"
+#: src/skins-qt/skins_cfg.cc:294 src/skins/skins_cfg.cc:276
+msgid "Type"
 msgstr ""
 
-#: src/skins/ui_playlist.cc:241
-msgid "Album:"
+#: src/skins-qt/skins_cfg.cc:295 src/skins/skins_cfg.cc:277
+msgid "Visualization type:"
 msgstr ""
 
-#: src/skins/ui_playlist.cc:248
-msgid "Artist:"
+#: src/skins-qt/skins_cfg.cc:298 src/skins/skins_cfg.cc:280
+msgid "Analyzer"
 msgstr ""
 
-#: src/skins/ui_playlist.cc:255
-msgid "File Name:"
+#: src/skins-qt/skins_cfg.cc:299 src/skins/skins_cfg.cc:281
+msgid "Show peaks"
 msgstr ""
 
-#: src/skins/ui_playlist.cc:263
-msgid "Clear previous selection before searching"
-msgstr "Обриши претходни избор пре претраге"
-
-#: src/skins/ui_playlist.cc:266
-msgid "Automatically toggle queue for matching entries"
-msgstr "Подударајуће ставке самостално пребаци у ред"
-
-#: src/skins/ui_playlist.cc:269
-msgid "Create a new playlist with matching entries"
-msgstr "Направи нови списак нумера са подударајућим ставкама"
-
-#: src/skins/ui_playlist.cc:717
-msgid "Audacious Playlist Editor"
-msgstr "Уређивач списка нумера"
-
-#: src/skins/ui_playlist.cc:752
-#, c-format
-msgid "%s (%d of %d)"
-msgstr "%s (%d од %d)"
+#: src/skins-qt/skins_cfg.cc:308 src/skins/skins_cfg.cc:290
+msgid "Visualization"
+msgstr "Приказивање"
 
-#: src/skins/ui_skinselector.cc:167
+#: src/skins-qt/skinselector.cc:98 src/skins/skinselector.cc:111
 msgid "Archived Winamp 2.x skin"
 msgstr "Архивирана Винамп 2.x маска"
 
-#: src/skins/ui_skinselector.cc:172
+#: src/skins-qt/skinselector.cc:102 src/skins/skinselector.cc:115
 msgid "Unarchived Winamp 2.x skin"
 msgstr "Неархивирана Винамп 2.x маска"
 
-#: src/skins/util.cc:430
-#, c-format
-msgid "Could not create directory (%s): %s\n"
-msgstr "Не могу да направим фасциклу (%s): %s\n"
-
-#: src/sndfile/plugin.cc:39
+#: src/sndfile/plugin.cc:38
 msgid "Sndfile Plugin"
 msgstr "Прикључак звучне датотеке"
 
-#: src/sndfile/plugin.cc:336
+#: src/sndfile/plugin.cc:372
 msgid ""
 "Based on the xmms_sndfile plugin:\n"
 "Copyright (C) 2000, 2002 Erik de Castro Lopo\n"
@@ -3830,94 +4034,100 @@
 "софтва на адресу: Free Software Foundation, Inc.,\n"
 "51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 
-#: src/sndio-ng/sndio.cc:44
+#: src/sndio/sndio.cc:43
 msgid "Sndio Output"
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:98
+#: src/sndio/sndio.cc:98
 msgid "Device (blank for default):"
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:100
+#: src/sndio/sndio.cc:100
 msgid "Save and restore volume:"
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:181
+#: src/sndio/sndio.cc:181
 #, c-format
 msgid "Sndio error: Unsupported audio format (%d)"
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:192
+#: src/sndio/sndio.cc:192
 msgid "Sndio error: sio_open() failed"
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:222
+#: src/sndio/sndio.cc:221
 msgid "Sndio error: sio_setpar() failed"
 msgstr ""
 
-#: src/sndio-ng/sndio.cc:234
+#: src/sndio/sndio.cc:233
 msgid "Sndio error: sio_start() failed"
 msgstr ""
 
-#: src/song_change/song_change.cc:33
+#: src/songchange/song_change.cc:30
 msgid "Song Change"
 msgstr "Промена песме"
 
-#: src/song_change/song_change.cc:342
-msgid ""
-"Parameters passed to the shell should be encapsulated in "
-"quotes. Doing otherwise is a security risk."
-msgstr ""
-"Параметри прослеђени љусци би требало да буду у "
-"наводницима. Све другачије је безбедносни ризик."
-
-#: src/song_change/song_change.cc:358
+#: src/songchange/song_change.cc:256
 msgid "Commands"
 msgstr ""
 
-#: src/song_change/song_change.cc:360
+#: src/songchange/song_change.cc:258
 msgid "Command to run when starting a new song:"
 msgstr ""
 
-#: src/song_change/song_change.cc:364
+#: src/songchange/song_change.cc:261
+msgid "Command to run when stopping a song:"
+msgstr ""
+
+#: src/songchange/song_change.cc:264
 msgid "Command to run at the end of a song:"
 msgstr ""
 
-#: src/song_change/song_change.cc:368
+#: src/songchange/song_change.cc:267
 msgid "Command to run at the end of the playlist:"
 msgstr ""
 
-#: src/song_change/song_change.cc:372
+#: src/songchange/song_change.cc:270
 msgid "Command to run when song title changes (for network streams):"
 msgstr ""
 
-#: src/song_change/song_change.cc:376
+#: src/songchange/song_change.cc:273
 msgid ""
-"You can use the following format strings which will be substituted before "
-"calling the command (not all are useful for the end-of-playlist command):\n"
-"\n"
-"%F: Frequency (in hertz)\n"
+"You can use the following format codes, which will be replaced before "
+"running the command.\n"
+"Not all are useful though for the song-stopped or end-of-playlist command."
+msgstr ""
+
+#: src/songchange/song_change.cc:276
+msgid ""
+"%a: Artist\n"
+"%b: Album\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"
+"%F: Frequency (Hertz)\n"
+"%l: Length (milliseconds)\n"
+"%n or %s: Formatted title (see playlist settings)\n"
 "%p: Currently playing (1 or 0)\n"
-"%a: Artist\n"
-"%b: Album\n"
-"%T: Track title"
+"%r: Rate (bits per second)\n"
+"%t: Playlist position\n"
+"%T: Title (unformatted)"
 msgstr ""
 
-#: src/song-info-qt/song-info.cc:32
-msgid "Song Info (Qt)"
+#: src/songchange/song_change.cc:287
+msgid ""
+"Parameters passed to the shell should be enclosed in quotation marks.\n"
+"Unquoted parameters may lead to unexpected results."
 msgstr ""
 
-#: src/sox-resampler/sox-resampler.cc:44
+#: src/song-info-qt/song-info.cc:30
+msgid "Song Info"
+msgstr "Подаци песме"
+
+#: src/soxr/sox-resampler.cc:44
 msgid "SoX Resampler"
 msgstr ""
 
-#: src/sox-resampler/sox-resampler.cc:144
+#: src/soxr/sox-resampler.cc:172
 msgid ""
 "SoX Resampler Plugin for Audacious\n"
 "Copyright 2013 Michał Lipski\n"
@@ -3926,96 +4136,136 @@
 "Copyright 2010-2012 John Lindgren"
 msgstr ""
 
-#: src/sox-resampler/sox-resampler.cc:150
+#: src/soxr/sox-resampler.cc:178
 msgid "Quick"
 msgstr ""
 
-#: src/sox-resampler/sox-resampler.cc:151
+#: src/soxr/sox-resampler.cc:179
 msgid "Low"
 msgstr ""
 
-#: src/sox-resampler/sox-resampler.cc:153
+#: src/soxr/sox-resampler.cc:181
 msgid "High"
 msgstr ""
 
-#: src/sox-resampler/sox-resampler.cc:154
+#: src/soxr/sox-resampler.cc:182
 msgid "Very High"
 msgstr ""
 
-#: src/sox-resampler/sox-resampler.cc:158
+#: src/soxr/sox-resampler.cc:183
+msgid "Ultra High"
+msgstr ""
+
+#: src/soxr/sox-resampler.cc:187
+msgid "Minimum"
+msgstr ""
+
+#: src/soxr/sox-resampler.cc:188
+msgid "Intermediate"
+msgstr ""
+
+#: src/soxr/sox-resampler.cc:193
 msgid "Quality:"
+msgstr "Квалитет:"
+
+#: src/soxr/sox-resampler.cc:196
+msgid "Phase:"
 msgstr ""
 
-#: src/speed-pitch/speed-pitch.cc:51
+#: src/soxr/sox-resampler.cc:200
+msgid "Allow aliasing"
+msgstr ""
+
+#: src/soxr/sox-resampler.cc:202
+msgid "Use steep filter"
+msgstr ""
+
+#: src/speedpitch/speed-pitch.cc:54
 msgid "Speed and Pitch"
 msgstr "Брзина и врхунац"
 
-#: src/speed-pitch/speed-pitch.cc:210
-msgid "Speed and Pitch"
-msgstr "Брзина и врхунац"
-
-#: src/speed-pitch/speed-pitch.cc:211
-msgid "Speed:"
-msgstr "Брзина:"
-
-#: src/speed-pitch/speed-pitch.cc:214
-msgid "Pitch:"
-msgstr "Врхунац:"
+#: src/speedpitch/speed-pitch.cc:247
+msgid "Speed"
+msgstr ""
 
-#: src/statusicon/statusicon.cc:47
-msgid "Status Icon"
-msgstr "Иконица стања"
+#: src/speedpitch/speed-pitch.cc:248
+msgid "Decouple from pitch"
+msgstr ""
 
-#: src/statusicon/statusicon.cc:283
-msgid "Se_ttings ..."
+#: src/speedpitch/speed-pitch.cc:250 src/speedpitch/speed-pitch.cc:258
+msgid "Multiplier:"
 msgstr ""
 
-#: src/statusicon/statusicon.cc:372
+#: src/speedpitch/speed-pitch.cc:254
+msgid "Pitch"
+msgstr ""
+
+#: src/statusicon-qt/statusicon.cc:45 src/statusicon/statusicon.cc:47
+msgid "Status Icon"
+msgstr "Иконица стања"
+
+#: src/statusicon-qt/statusicon.cc:68
 msgid ""
-"Status Icon Plugin\n"
+"Status Icon Plugin (partial port for Qt interface)\n"
 "\n"
 "Copyright 2005-2007 Giacomo Lozito <james@develia.org>\n"
 "Copyright 2010 Michał Lipski <tallica@o2.pl>\n"
+"Copyright 2015 Eugene Paskevich <eugene@raptor.kiev.ua>\n"
 "\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"
-"у области фиоке система управника прозора."
 
-#: src/statusicon/statusicon.cc:379
+#: src/statusicon-qt/statusicon.cc:89 src/statusicon/statusicon.cc:384
 msgid "Mouse Scroll Action"
 msgstr "Радња клизања мишем"
 
-#: src/statusicon/statusicon.cc:380
+#: src/statusicon-qt/statusicon.cc:90 src/statusicon/statusicon.cc:385
 msgid "Change volume"
 msgstr "Промени јачину звука"
 
-#: src/statusicon/statusicon.cc:383
+#: src/statusicon-qt/statusicon.cc:93 src/statusicon/statusicon.cc:388
 msgid "Change playing song"
 msgstr "Промени песму"
 
-#: src/statusicon/statusicon.cc:386
+#: src/statusicon-qt/statusicon.cc:96 src/statusicon/statusicon.cc:391
 msgid "Other Settings"
 msgstr "Остала подешавања"
 
-#: src/statusicon/statusicon.cc:387
+#: src/statusicon-qt/statusicon.cc:97 src/statusicon/statusicon.cc:392
 msgid "Disable the popup window"
 msgstr "Искључи прозор облачића"
 
-#: src/statusicon/statusicon.cc:389
+#: src/statusicon-qt/statusicon.cc:99 src/statusicon/statusicon.cc:394
 msgid "Close to the system tray"
 msgstr "Затвори у системску касету"
 
-#: src/statusicon/statusicon.cc:391
+#: src/statusicon-qt/statusicon.cc:101 src/statusicon/statusicon.cc:396
 msgid "Advance in playlist when scrolling upward"
 msgstr "Напредује у списку нумера када клиза унапред"
 
+#: src/statusicon-qt/statusicon.cc:116 src/statusicon/statusicon.cc:287
+msgid "Se_ttings ..."
+msgstr ""
+
+#: src/statusicon/statusicon.cc:377
+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 Ђакомо Лоцито < james@develia.org >\n"
+"Ауторска права 2010 Михал Липски <tallica@o2.pl>\n"
+"\n"
+"Овај додатак обезбеђује иконицу стања, смештену\n"
+"у области фиоке система управника прозора."
+
 #: src/stereo_plugin/stereo.cc:19
 msgid "Extra Stereo"
 msgstr "Додатни стерео"
@@ -4034,20 +4284,160 @@
 msgid "Extra Stereo"
 msgstr "Додатни стерео"
 
+#: src/streamtuner/icecast-model.cc:126 src/streamtuner/shoutcast-model.cc:131
+msgid "Type"
+msgstr ""
+
+#: src/streamtuner/icecast-model.cc:132
+msgid "Current Song"
+msgstr ""
+
+#: src/streamtuner/icecast-model.cc:164
+msgid "Other"
+msgstr ""
+
+#: src/streamtuner/ihr-model.cc:63
+msgid "Market"
+msgstr ""
+
+#: src/streamtuner/ihr-model.cc:156
+msgid "Call Letters"
+msgstr ""
+
+#: src/streamtuner/ihr-model.cc:162
+msgid "Description"
+msgstr "Опис"
+
+#: src/streamtuner/shoutcast-model.cc:128
+msgid "Listeners"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:188
+msgid "Top 500 Stations"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:189
+msgid "Alternative"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:190
+msgid "Blues"
+msgstr "Блуз"
+
+#: src/streamtuner/shoutcast-model.cc:191
+msgid "Classical"
+msgstr "Класична"
+
+#: src/streamtuner/shoutcast-model.cc:192
+msgid "Country"
+msgstr "Кантри"
+
+#: src/streamtuner/shoutcast-model.cc:193
+msgid "Decades"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:194
+msgid "Easy Listening"
+msgstr "Лако слушање"
+
+#: src/streamtuner/shoutcast-model.cc:195
+msgid "Electronic"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:196
+msgid "Folk"
+msgstr "Народна"
+
+#: src/streamtuner/shoutcast-model.cc:197
+msgid "Inspirational"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:198
+msgid "International"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:199
+msgid "Jazz"
+msgstr "Џез"
+
+#: src/streamtuner/shoutcast-model.cc:200
+msgid "Latin"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:201
+msgid "Metal"
+msgstr "Метал"
+
+#: src/streamtuner/shoutcast-model.cc:203
+msgid "New Age"
+msgstr "Ново доба"
+
+#: src/streamtuner/shoutcast-model.cc:204
+msgid "Pop"
+msgstr "Поп"
+
+#: src/streamtuner/shoutcast-model.cc:205
+msgid "Public Radio"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:206
+msgid "R&B and Urban"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:207
+msgid "Rap"
+msgstr "Реп"
+
+#: src/streamtuner/shoutcast-model.cc:208
+msgid "Reggae"
+msgstr "Реге"
+
+#: src/streamtuner/shoutcast-model.cc:209
+msgid "Rock"
+msgstr "Рок"
+
+#: src/streamtuner/shoutcast-model.cc:210
+msgid "Seasonal and Holiday"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:211
+msgid "Soundtracks"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:212
+msgid "Talk"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:213
+msgid "Themes"
+msgstr ""
+
+#: src/streamtuner/streamtuner.cc:59
+msgid "Shoutcast"
+msgstr ""
+
+#: src/streamtuner/streamtuner.cc:60
+msgid "Icecast"
+msgstr ""
+
+#: src/streamtuner/streamtuner.cc:71
+msgid "Stream Tuner"
+msgstr ""
+
 #: src/tonegen/tonegen.cc:45
 msgid "Tone Generator"
 msgstr "Тонски генератор"
 
-#: src/tonegen/tonegen.cc:94
+#: src/tonegen/tonegen.cc:92
 #, c-format
 msgid "%s %.1f Hz"
 msgstr "%s %.1f Hz"
 
-#: src/tonegen/tonegen.cc:94
+#: src/tonegen/tonegen.cc:92
 msgid "Tone Generator: "
 msgstr "Тонски генератор: "
 
-#: src/tonegen/tonegen.cc:160
+#: src/tonegen/tonegen.cc:161
 msgid ""
 "Sine tone generator by Håvard Kvålen <havardk@xmms.org>\n"
 "Modified by Daniel J. Peng <danielpeng@bigfoot.com>\n"
@@ -4062,11 +4452,32 @@
 "учесталост3;...\n"
 "нпр.: tone://2000;2005 да пустите тонове 2000 Hz и 2005 Hz"
 
+#: src/ui-common/dialogs-qt.cc:40
+msgid ""
+"\n"
+"(Further messages have been hidden.)"
+msgstr ""
+"\n"
+"(Додатне поруке су скривене.)"
+
+#: src/ui-common/dialogs-qt.cc:52
+msgid "Working ..."
+msgstr "Радим ..."
+
+#: src/ui-common/dialogs-qt.cc:73
+msgid "Information"
+msgstr "Информације"
+
+#: src/ui-common/menu-ops-gtk.cc:132 src/ui-common/menu-ops-qt.cc:113
+#, c-format
+msgid "%s does not appear to be a valid folder."
+msgstr ""
+
 #: src/voice_removal/voice_removal.cc:28
 msgid "Voice Removal"
 msgstr "Уклањање гласа"
 
-#: src/vorbis/vorbis.cc:465
+#: src/vorbis/vorbis.cc:433
 msgid ""
 "Audacious Ogg Vorbis Decoder\n"
 "\n"
@@ -4108,12 +4519,12 @@
 msgid "Ogg Vorbis Decoder"
 msgstr "Огг Ворбис декодер"
 
-#: src/vtx/info.cc:22
+#: src/vtx/info.cc:24
 #, c-format
 msgid "Details about %s"
 msgstr ""
 
-#: src/vtx/info.cc:24
+#: src/vtx/info.cc:26
 msgid ""
 "Title: %t\n"
 "Author: %a\n"
@@ -4132,7 +4543,7 @@
 msgid "VTX Decoder"
 msgstr "ВТКС декодер"
 
-#: src/vtx/vtx.cc:184
+#: src/vtx/vtx.cc:178
 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"
@@ -4144,19 +4555,59 @@
 "ru>\n"
 "Прикључак за Безочника је написао Павел Виметалек <pvymetalek@seznam.cz>"
 
-#: src/wavpack/wavpack.cc:24
+#: src/vumeter-qt/vumeter_qt.cc:31
+msgid ""
+"VU Meter Plugin for Audacious\n"
+"Copyright 2017-2019 Marc Sánchez Fauste"
+msgstr ""
+
+#: src/vumeter-qt/vumeter_qt.cc:35
+msgid "VU Meter Settings"
+msgstr ""
+
+#: src/vumeter-qt/vumeter_qt.cc:37
+msgid "Peak hold time:"
+msgstr ""
+
+#: src/vumeter-qt/vumeter_qt.cc:42
+msgid "Fall-off time:"
+msgstr ""
+
+#: src/vumeter-qt/vumeter_qt.cc:44
+msgid "dB/second"
+msgstr ""
+
+#: src/vumeter-qt/vumeter_qt.cc:46
+msgid "Display legend"
+msgstr ""
+
+#: src/vumeter-qt/vumeter_qt.h:37
+msgid "VU Meter"
+msgstr ""
+
+#: src/waveout/waveout.cc:43
+msgid "Win32 waveOut"
+msgstr ""
+
+#: src/waveout/waveout.cc:69
+msgid ""
+"Win32 waveOut Plugin for Audacious\n"
+"Copyright 2016 John Lindgren"
+msgstr ""
+
+#: src/wavpack/wavpack.cc:25
 msgid "WavPack Decoder"
 msgstr "Вејвпак декодер"
 
-#: src/wavpack/wavpack.cc:211
+#: src/wavpack/wavpack.cc:217
 msgid "lossy (hybrid)"
 msgstr "ослабљено (хибридно)"
 
-#: src/wavpack/wavpack.cc:213
+#: src/wavpack/wavpack.cc:219
 msgid "lossy"
 msgstr "ослабљено"
 
-#: src/wavpack/wavpack.cc:255
+#: src/wavpack/wavpack.cc:259
 msgid ""
 "Copyright 2006 William Pitcock <nenolod@nenolod.net>\n"
 "\n"
@@ -4166,18 +4617,38 @@
 "\n"
 "Нешто кода прикључка је написао Мајлс Иган."
 
-#: src/xsf/plugin.cc:50
+#: src/xsf/plugin.cc:74
 msgid "2SF Decoder"
 msgstr "2СФ декодер"
 
-#: src/xsf/plugin.cc:238
+#: src/xsf/plugin.cc:429
+msgid "32728 Hz"
+msgstr ""
+
+#: src/xsf/plugin.cc:432
+msgid "65456 Hz"
+msgstr ""
+
+#: src/xsf/plugin.cc:438
+msgid "Cosine"
+msgstr ""
+
+#: src/xsf/plugin.cc:439
+msgid "Sharp"
+msgstr ""
+
+#: src/xsf/plugin.cc:443
 msgid "XSF Configuration"
 msgstr ""
 
-#: src/xsf/plugin.cc:239
-msgid "Ignore length from file"
+#: src/xsf/plugin.cc:445
+msgid "Default fade time:"
+msgstr ""
+
+#: src/xsf/plugin.cc:447
+msgid "Interpolation mode:"
 msgstr ""
 
-#: src/xspf/xspf.cc:89
+#: src/xspf/xspf.cc:95
 msgid "XML Shareable Playlists (XSPF)"
 msgstr "ИксМЛ дељиви спискови пуштања (XSPF)"

audacious-plugins-3.6.2-gtk3.tar.bz2/po/sv.po -> audacious-plugins-4.4.1.tar.bz2/po/sv.po Changed

@@ -3,16 +3,27 @@
 # This file is distributed under the same license as the Audacious Plugins package.
 #
 # Translators:
-# Bo Serrander <bserrander@gmail.com>, 2013
-# Martin Jernberg <bittin@cafe8bitar.se>, 2014
+# Anders Jonsson <transifex@norsjovallen.se>, 2017-2018,2022
+# Bo Serrander <bserrander@gmail.com>, 2013,2016
+# cb445fb3dfd1fe3c2b9f58ac5638f478, 2015-2016
+# Henrik Mattsson-Mårn <h@reglage.net>, 2015
+# Jonatan Nyberg, 2021-2022
+# Jonatan Nyberg, 2018-2021
+# efef6ec5b435a041fce803c7f8af77d2_2341d43, 2017-2018
+# Josef Gottlander <josef.gottlander@gmail.com>, 2020
+# Kristoffer Grundström <lovaren@gmail.com>, 2016
+# Luna Jernberg <droidbittin@gmail.com>, 2020-2024
+# Luna Jernberg <droidbittin@gmail.com>, 2024
+# Luna Jernberg <droidbittin@gmail.com>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: Audacious Plugins\n"
-"Report-Msgid-Bugs-To: http://redmine.audacious-media-player.org/\n"
-"POT-Creation-Date: 2015-02-28 19:18+0100\n"
-"PO-Revision-Date: 2015-02-04 21:21+0000\n"
-"Last-Translator: Thomas Lange <thomas-lange2@gmx.de>\n"
-"Language-Team: Swedish (http://www.transifex.com/projects/p/audacious/"
+"Report-Msgid-Bugs-To: https://github.com/audacious-media-player/audacious/"
+"issues\n"
+"POT-Creation-Date: 2024-09-26 21:54+0200\n"
+"PO-Revision-Date: 2011-10-10 17:43+0000\n"
+"Last-Translator: Luna Jernberg <droidbittin@gmail.com>, 2024\n"
+"Language-Team: Swedish (http://app.transifex.com/audacious/audacious/"
 "language/sv/)\n"
 "Language: sv\n"
 "MIME-Version: 1.0\n"
@@ -20,241 +31,62 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/aac-raw/aac.cc:18
+#: src/aac/aac.cc:19
 msgid "AAC (Raw) Decoder"
-msgstr "AAC (Raw) Dekoder"
+msgstr "AAC (Raw)-avkodare"
 
-#: src/adplug/adplug-xmms.cc:42
+#: src/adplug/adplug-xmms.cc:70
 msgid "AdPlug (AdLib Player)"
-msgstr "AdPlug (AdLib Spelare)"
+msgstr "AdPlug (AdLib spelare)"
 
-#: src/adplug/adplug-xmms.cc:156 src/modplug/modplugbmp.cc:335
-#: src/psf/plugin.cc:138 src/vtx/vtx.cc:87 src/xsf/plugin.cc:113
+#: src/adplug/adplug-xmms.cc:167 src/modplug/modplugbmp.cc:321
+#: src/psf/plugin.cc:161 src/vtx/vtx.cc:89 src/xsf/plugin.cc:204
 msgid "sequenced"
-msgstr ""
-
-#: src/alarm/alarm.cc:55 src/alarm/interface.cc:82
-msgid "Alarm"
-msgstr "Alarm"
-
-#: src/alarm/alarm.cc:782
-msgid "Set Alarm ..."
-msgstr "Ställ in Alarm ..."
-
-#: src/alarm/alarm.cc:810
-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/interface.cc: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.cc: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.cc: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.cc:81
-msgid "This is your wakeup call."
-msgstr "Detta är din väckarklocka."
-
-#: src/alarm/interface.cc:99
-msgid "Your reminder for today is..."
-msgstr "Din påminelse idag är ..."
-
-#: src/alarm/interface.cc:101 src/alarm/interface.cc:386
-msgid "Reminder"
-msgstr "Påminelse"
-
-#: src/alarm/interface.cc:132
-msgid "Monday"
-msgstr "Måndag"
-
-#: src/alarm/interface.cc:132
-msgid "Tuesday"
-msgstr "Tisdag"
-
-#: src/alarm/interface.cc:132
-msgid "Wednesday"
-msgstr "Onsdag"
-
-#: src/alarm/interface.cc:133
-msgid "Thursday"
-msgstr "Torsdag"
-
-#: src/alarm/interface.cc:133
-msgid "Friday"
-msgstr "Fredag"
-
-#: src/alarm/interface.cc:133
-msgid "Saturday"
-msgstr "Lördag"
-
-#: src/alarm/interface.cc:133
-msgid "Sunday"
-msgstr "Söndag"
-
-#: src/alarm/interface.cc:171 src/alarm/interface.cc:230
-#: src/alarm/interface.cc:245
-msgid "Time"
-msgstr "Tid"
-
-#: src/alarm/interface.cc:178
-msgid "Alarm at (default):"
-msgstr "Larm på (standard):"
-
-#: src/alarm/interface.cc:200
-msgid "h"
-msgstr "h"
-
-#: src/alarm/interface.cc:203
-msgid "Quiet after:"
-msgstr "Tyst efter:"
-
-#: src/alarm/interface.cc:215
-msgid "hours"
-msgstr "timmar"
+msgstr "sekvensierad"
 
-#: src/alarm/interface.cc:226
-msgid "minutes"
-msgstr "minuter"
-
-#: src/alarm/interface.cc:235
-msgid "Choose the days for the alarm to come on"
-msgstr ""
-
-#: src/alarm/interface.cc:242
-msgid "Day"
-msgstr "Dag"
-
-#: src/alarm/interface.cc:259 src/bs2b/plugin.cc:130
-#: src/skins/preset-list.cc:434 src/skins/preset-list.cc:440
-msgid "Default"
-msgstr "Standard"
-
-#: src/alarm/interface.cc:288
-msgid "Days"
-msgstr "Dagar"
-
-#: src/alarm/interface.cc:297
-msgid "Fading"
-msgstr ""
-
-#: src/alarm/interface.cc:305 src/console/plugin.cc:41
-#: src/crossfade/crossfade.cc:53 src/crossfade/crossfade.cc:59
-#: src/gtkui/settings.cc:49 src/lirc/lirc.cc:397 src/sid/xs_config.cc:85
-#: src/sid/xs_config.cc:94 src/sid/xs_config.cc:103
-msgid "seconds"
-msgstr "sekunder"
-
-#: src/alarm/interface.cc:312 src/alarm/interface.cc:353
-msgid "Volume"
-msgstr "Volym"
-
-#: src/alarm/interface.cc:317
-msgid "Start at"
-msgstr "Börja på"
-
-#: src/alarm/interface.cc:333
-msgid "Final"
-msgstr ""
-
-#: src/alarm/interface.cc:346
-msgid "Current"
-msgstr "Nuvarande"
-
-#: src/alarm/interface.cc:359
-msgid "Additional Command"
-msgstr "Ytterligare Kommando"
-
-#: src/alarm/interface.cc:365 src/alarm/interface.cc:391
-msgid "enable"
-msgstr ""
+#: src/adplug/adplug-xmms.cc:349 src/sid/xs_config.cc:61
+msgid "Output"
+msgstr "Utgång"
 
-#: src/alarm/interface.cc:372
-msgid "Playlist (optional)"
-msgstr "Spellista (valfritt)"
+#: src/adplug/adplug-xmms.cc:350
+msgid "OPL Emulator:"
+msgstr "OPL Emulator:"
+
+#: src/adplug/adplug-xmms.cc:353 src/amidiplug/i_configure.cc:153
+#: src/console/plugin.cc:45 src/filewriter/filewriter.cc:481
+#: src/sid/xs_config.cc:65 src/xsf/plugin.cc:446
+msgid "Sample rate:"
+msgstr "Samplingsfrekvens:"
 
-#: src/alarm/interface.cc:379
-msgid "Select a playlist"
-msgstr "Välj en spellista"
+#: src/adplug/adplug-xmms.cc:354 src/amidiplug/i_configure.cc:155
+#: src/bs2b/plugin.cc:141 src/console/plugin.cc:47
+#: src/modplug/plugin_main.cc:77 src/resample/resample.cc:201
+#: src/resample/resample.cc:207 src/resample/resample.cc:211
+#: src/resample/resample.cc:215 src/resample/resample.cc:219
+#: src/resample/resample.cc:223 src/resample/resample.cc:227
+#: src/resample/resample.cc:231 src/resample/resample.cc:235
+#: src/resample/resample.cc:239 src/resample/resample.cc:243
+#: src/sid/xs_config.cc:67 src/soxr/sox-resampler.cc:205
+msgid "Hz"
+msgstr "Hz"
 
-#: src/alarm/interface.cc:399
-msgid "Options"
-msgstr "Inställningar"
+#: src/adplug/adplug-xmms.cc:355 src/gtkui/settings.cc:55
+#: src/modplug/plugin_main.cc:105 src/qtui/settings.cc:85
+#: src/skins-qt/skins_cfg.cc:302 src/skins/skins_cfg.cc:284
+msgid "Miscellaneous"
+msgstr "Diverse"
 
-#: src/alarm/interface.cc:404
-msgid "What do these options mean?"
-msgstr "Vad betyder dessa inställningar?"
-
-#: src/alarm/interface.cc:420
-msgid "Help"
-msgstr "Hjälp"
+#: src/adplug/adplug-xmms.cc:356
+msgid "Repeat song in endless loop"
+msgstr "Upprepa låt i ändlös slinga"
 
-#: src/albumart/albumart.cc:31
+#: src/albumart/albumart.cc:31 src/albumart-qt/albumart.cc:35
 msgid "Album Art"
 msgstr "Skivomslag"
 
-#: src/albumart-qt/albumart.cc:33
-msgid "Album Art (Qt)"
-msgstr ""
-
-#: src/alsa/alsa.h:70
+#: src/alsa/alsa.h:64
 msgid "ALSA Output"
-msgstr "ALSA Utgång"
+msgstr "ALSA-utgång"
 
 #: src/alsa/config.cc:28
 msgid ""
@@ -264,36 +96,41 @@
 "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 för Audacious\n"
+"Copyright 2009-2012 John Lindgren\n"
+"\n"
+"Mitt tack till William Pitcock, skapare av ALSA-utgångsinsticksmodul NG, "
+"vilkens kod tjänade som referens när ALSA-manualen inte räckte till."
 
 #: src/alsa/config.cc:61
 msgid "(no description)"
-msgstr ""
+msgstr "(ingen beskrivning)"
 
 #: src/alsa/config.cc:166
 msgid "Default PCM device"
-msgstr ""
+msgstr "Standard PCM-enhet"
 
 #: src/alsa/config.cc:188
 msgid "Default mixer device"
-msgstr ""
+msgstr "Standard mixerenhet"
 
 #: src/alsa/config.cc:296
 msgid "PCM device:"
-msgstr ""
+msgstr "PCM-enhet:"
 
 #: src/alsa/config.cc:299
 msgid "Mixer device:"
-msgstr ""
+msgstr "Mixerenhet:"
 
 #: src/alsa/config.cc:302
 msgid "Mixer element:"
-msgstr ""
+msgstr "Mixelelement:"
 
-#: src/amidi-plug/amidi-plug.cc:41
+#: src/amidiplug/amidi-plug.cc:42
 msgid "AMIDI-Plug (MIDI Player)"
-msgstr "AMIDI-Plug (MIDI Spelare)"
+msgstr "AMIDI-Plug (MIDI-spelare)"
 
-#: src/amidi-plug/amidi-plug.cc:437
+#: src/amidiplug/amidi-plug.cc:445
 msgid ""
 "AMIDI-Plug\n"
 "modular MIDI music player\n"
@@ -315,158 +152,181 @@
 "Tony Vroon\n"
 "for the good help with alpha testing"
 msgstr ""
+"AMIDI-Plug\n"
+"modulär MIDI musikspelare\n"
+"http://www.develia.org/projects.php?p=amidiplug\n"
+"\n"
+"skriven av Giacomo Lozito\n"
+"<james@develia.org>\n"
+"\n"
+"speciellt tack till...\n"
+"\n"
+"Clemens Ladisch och Jaroslav Kysela\n"
+"för deras coola program aplaymidi och amixer; dom\n"
+"var väldigt användbara, tillsammans med alsa-lib docs, för\n"
+"att lära sig mer om ALSA API\n"
+"\n"
+"Alfredo Spadafina\n"
+"för den snygga midi-tangentbordslogotypen\n"
+"\n"
+"Tony Vroon\n"
+"för stor hjälp vid alfatestning"
 
-#: src/amidi-plug/i_configure.cc:94
+#: src/amidiplug/i_configure.cc:94
 msgid "Override default gain:"
-msgstr ""
+msgstr "Åsidosätt standard-förstärkning:"
 
-#: src/amidi-plug/i_configure.cc:102
+#: src/amidiplug/i_configure.cc:102
 msgid "Override default polyphony:"
-msgstr ""
+msgstr "Åsidosätt standard polyfoni:"
 
-#: src/amidi-plug/i_configure.cc:110
+#: src/amidiplug/i_configure.cc:110
 msgid "Override default reverb:"
-msgstr ""
+msgstr "Åsidosätt standard-reverb:"
 
-#: src/amidi-plug/i_configure.cc:112 src/amidi-plug/i_configure.cc:120
+#: src/amidiplug/i_configure.cc:112 src/amidiplug/i_configure.cc:120
 msgid "On"
 msgstr "På"
 
-#: src/amidi-plug/i_configure.cc:118
+#: src/amidiplug/i_configure.cc:118
 msgid "Override default chorus:"
-msgstr ""
+msgstr "Åsidosätt standard-refräng:"
 
-#: src/amidi-plug/i_configure.cc:128 src/console/plugin.cc:29
+#: src/amidiplug/i_configure.cc:128 src/console/plugin.cc:29
 msgid "Playback"
-msgstr " Uppspelning "
+msgstr "Uppspelning"
 
-#: src/amidi-plug/i_configure.cc:129
+#: src/amidiplug/i_configure.cc:129
 msgid "Transpose:"
-msgstr ""
+msgstr "Transponera:"
 
-#: src/amidi-plug/i_configure.cc:131
+#: src/amidiplug/i_configure.cc:131 src/speedpitch/speed-pitch.cc:257
 msgid "semitones"
-msgstr ""
+msgstr "halvtoner"
 
-#: src/amidi-plug/i_configure.cc:132
+#: src/amidiplug/i_configure.cc:132
 msgid "Drum shift:"
-msgstr ""
+msgstr "Trumskift:"
 
-#: src/amidi-plug/i_configure.cc:134
+#: src/amidiplug/i_configure.cc:134
 msgid "note numbers"
-msgstr ""
+msgstr "notnummer"
 
-#: src/amidi-plug/i_configure.cc:135
+#: src/amidiplug/i_configure.cc:135
 msgid "Skip leading silence"
-msgstr ""
+msgstr "Hoppa över inledande tystnad"
 
-#: src/amidi-plug/i_configure.cc:137
+#: src/amidiplug/i_configure.cc:137
 msgid "Skip trailing silence"
-msgstr ""
+msgstr "Hoppa över avslutande tystnad"
 
-#: src/amidi-plug/i_configure.cc:141
+#: src/amidiplug/i_configure.cc:141
 msgid "SoundFont"
-msgstr ""
+msgstr "SoundFont"
 
-#: src/amidi-plug/i_configure.cc:143
+#: src/amidiplug/i_configure.cc:148
 msgid "Synthesizer"
 msgstr "Synthesizer"
 
-#: src/amidi-plug/i_configure.cc:148 src/console/plugin.cc:45
-#: src/sid/xs_config.cc:65
-msgid "Sample rate:"
-msgstr ""
-
-#: src/amidi-plug/i_configure.cc:150 src/bs2b/plugin.cc:141
-#: src/console/plugin.cc:47 src/modplug/plugin_main.cc:78
-#: src/resample/resample.cc:201 src/resample/resample.cc:207
-#: src/resample/resample.cc:211 src/resample/resample.cc:215
-#: src/resample/resample.cc:219 src/resample/resample.cc:223
-#: src/resample/resample.cc:227 src/resample/resample.cc:231
-#: src/resample/resample.cc:235 src/resample/resample.cc:239
-#: src/resample/resample.cc:243 src/sid/xs_config.cc:67
-#: src/sox-resampler/sox-resampler.cc:163
-msgid "Hz"
-msgstr "Hz"
-
-#: src/amidi-plug/i_configure-fluidsynth.cc:52
+#: src/amidiplug/i_configure-fluidsynth.cc:58
+#: src/amidiplug/i_configure-fluidsynth.cc:527
 msgid "AMIDI-Plug - select SoundFont file"
-msgstr ""
+msgstr "AMIDI-Plug - välj SoundFont-fil"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:55 src/filewriter/mp3.cc:658
+#: src/amidiplug/i_configure-fluidsynth.cc:61
 msgid "_Cancel"
 msgstr "_Avbryt"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:56
+#: src/amidiplug/i_configure-fluidsynth.cc:62
 msgid "_Open"
 msgstr "_Öppna"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:225 src/gtkui/columns.cc:46
+#: src/amidiplug/i_configure-fluidsynth.cc:233
+#: src/amidiplug/i_configure-fluidsynth.cc:461
 msgid "File name"
 msgstr "Filnamn"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:229
+#: src/amidiplug/i_configure-fluidsynth.cc:237
+#: src/amidiplug/i_configure-fluidsynth.cc:464
 msgid "Size (bytes)"
-msgstr "Storlek (bytes)"
+msgstr "Storlek (byte)"
 
-#: src/amidi-plug/i_fileinfo.cc:163
+#: src/amidiplug/i_fileinfo.cc:184
 msgid "Name:"
 msgstr "Namn:"
 
-#: src/amidi-plug/i_fileinfo.cc:181
+#: src/amidiplug/i_fileinfo.cc:202
 msgid " MIDI Info "
-msgstr " MIDI Info "
+msgstr " MIDI-info "
 
-#: src/amidi-plug/i_fileinfo.cc:195
+#: src/amidiplug/i_fileinfo.cc:216
 msgid "Format:"
 msgstr "Format:"
 
-#: src/amidi-plug/i_fileinfo.cc:198
+#: src/amidiplug/i_fileinfo.cc:219
 msgid "Length (msec):"
-msgstr "Längd (msec):"
+msgstr "Längd (ms):"
 
-#: src/amidi-plug/i_fileinfo.cc:201
+#: src/amidiplug/i_fileinfo.cc:222
 msgid "No. of Tracks:"
-msgstr "Nummer av Spår:"
+msgstr "Antal spår:"
 
-#: src/amidi-plug/i_fileinfo.cc:207
+#: src/amidiplug/i_fileinfo.cc:228
 msgid "variable"
 msgstr "variabel"
 
-#: src/amidi-plug/i_fileinfo.cc:209
+#: src/amidiplug/i_fileinfo.cc:230
 msgid "BPM:"
-msgstr "BPM:"
+msgstr "Slag/minut:"
 
-#: src/amidi-plug/i_fileinfo.cc:217
+#: src/amidiplug/i_fileinfo.cc:238
 msgid "BPM (wavg):"
-msgstr "BPM (wavg):"
+msgstr "Slag/minut (wavg):"
 
-#: src/amidi-plug/i_fileinfo.cc:220
+#: src/amidiplug/i_fileinfo.cc:241
 msgid "Time Div:"
-msgstr ""
+msgstr "Tids division:"
 
-#: src/amidi-plug/i_fileinfo.cc:231
+#: src/amidiplug/i_fileinfo.cc:252
 msgid " MIDI Comments and Lyrics "
-msgstr ""
+msgstr " MIDI-kommentarer och låttexter "
 
-#: src/amidi-plug/i_fileinfo.cc:278
+#: src/amidiplug/i_fileinfo.cc:299
 msgid "* no comments available in this MIDI file *"
-msgstr "* Inga kommentarer finns i denna MIDI-fil *"
+msgstr "* inga kommentarer finns i denna MIDI-fil *"
 
-#: src/amidi-plug/i_fileinfo.cc:290
+#: src/amidiplug/i_fileinfo.cc:311
 msgid "* no lyrics available in this MIDI file *"
-msgstr "* Inga texter finns i denna MIDI-fil *"
+msgstr "* inga låttexter finns i denna MIDI-fil *"
 
-#: src/amidi-plug/i_fileinfo.cc:300 src/filewriter/vorbis.cc:197
-#: src/ladspa/plugin.cc:416
+#: src/amidiplug/i_fileinfo.cc:321 src/ladspa/plugin.cc:418
+#: src/ui-common/dialogs-qt.cc:32
 msgid "_Close"
 msgstr "_Stäng"
 
-#: src/amidi-plug/i_fileinfo.cc:325
+#: src/amidiplug/i_fileinfo.cc:346
 msgid " (invalid UTF-8)"
-msgstr "(ogiltig UTF-8)"
+msgstr " (ogiltig UTF-8)"
+
+#: src/ampache/ampache.cc:33
+msgid "Ampache Browser"
+msgstr "Ampache Browser"
 
-#: src/aosd/aosd.cc:32
+#: src/ampache/ampache.cc:46
+msgid ""
+"Ampache Browser for Audacious\n"
+"http://ampache-browser.org/\n"
+"\n"
+"Copyright (C) Róbert Čerňanský and John Lindgren\n"
+"License: GNU GPLv3"
+msgstr ""
+"Ampache Browser för Audacious\n"
+"http://ampache-browser.org/\n"
+"\n"
+"Copyright (C) Róbert Čerňanský och John Lindgren\n"
+"Licens: GNU GPLv3"
+
+#: src/aosd/aosd.cc:31
 msgid ""
 "Audacious OSD\n"
 "http://www.develia.org/projects.php?p=audacious#aosd\n"
@@ -476,10 +336,17 @@
 "Based in part on Evan Martin's Ghosd library:\n"
 "http://neugierig.org/software/ghosd/"
 msgstr ""
+"Audacious OSD\n"
+"http://www.develia.org/projects.php?p=audacious#aosd\n"
+"\n"
+"Skriven av Giacomo Lozito <james@develia.org>\n"
+"\n"
+"Baserat delvis på Evan Martins Ghosd-bibliotek:\n"
+"http://neugierig.org/software/ghosd/"
 
 #: src/aosd/aosd.h:37
 msgid "AOSD (On-Screen Display)"
-msgstr ""
+msgstr "AOSD (On-Screen Display)"
 
 #: src/aosd/aosd_style.cc:54
 msgid "Rectangle"
@@ -487,248 +354,336 @@
 
 #: src/aosd/aosd_style.cc:59
 msgid "Rounded Rectangle"
-msgstr "Rundad Rektangel"
+msgstr "Rundad rektangel"
 
 #: src/aosd/aosd_style.cc:64
 msgid "Concave Rectangle"
-msgstr "Konkav Rektangel"
+msgstr "Konkav rektangel"
 
-#: src/aosd/aosd_style.cc:69
+#: src/aosd/aosd_style.cc:69 src/openmpt/mptwrap.h:50 src/xsf/plugin.cc:436
 msgid "None"
 msgstr "Ingen"
 
-#: src/aosd/aosd_trigger.cc:50
+#: src/aosd/aosd_trigger.cc:49
 msgid "Playback Start"
-msgstr "Starta Uppspelning"
+msgstr "Starta uppspelning"
 
-#: src/aosd/aosd_trigger.cc:51
+#: src/aosd/aosd_trigger.cc:50
 msgid "Triggers OSD when a playlist entry is played."
-msgstr ""
+msgstr "Startar OSD när en spellistspost spelas."
 
-#: src/aosd/aosd_trigger.cc:56
+#: src/aosd/aosd_trigger.cc:55
 msgid "Title Change"
-msgstr ""
+msgstr "Titeländring"
 
-#: src/aosd/aosd_trigger.cc:57
+#: src/aosd/aosd_trigger.cc:56
 msgid "Triggers OSD when the song title changes (for internet streams)."
-msgstr ""
+msgstr "Startar OSD när låttiteln ändras (för internetflöden)."
 
-#: src/aosd/aosd_trigger.cc:62
+#: src/aosd/aosd_trigger.cc:61
 msgid "Pause On"
-msgstr "Pause på"
+msgstr "Paus På"
 
-#: src/aosd/aosd_trigger.cc:63
+#: src/aosd/aosd_trigger.cc:62
 msgid "Triggers OSD when playback is paused."
-msgstr ""
+msgstr "Startar OSD när uppspelningen pausas."
 
-#: src/aosd/aosd_trigger.cc:68
+#: src/aosd/aosd_trigger.cc:67
 msgid "Pause Off"
-msgstr "Pause Av"
+msgstr "Paus Av"
 
-#: src/aosd/aosd_trigger.cc:69
+#: src/aosd/aosd_trigger.cc:68
 msgid "Triggers OSD when playback is unpaused."
-msgstr ""
+msgstr "Startar OSD när uppspelningen återupptas."
 
-#: src/aosd/aosd_ui.cc:163
+#: src/aosd/aosd_ui.cc:204
 msgid "Placement"
 msgstr "Placering"
 
-#: src/aosd/aosd_ui.cc:196
+#: src/aosd/aosd_ui.cc:241
 msgid "Relative X offset:"
-msgstr ""
+msgstr "Relativ X-utjämning:"
 
-#: src/aosd/aosd_ui.cc:203
+#: src/aosd/aosd_ui.cc:245
 msgid "Relative Y offset:"
-msgstr ""
+msgstr "Relativ Y-utjämning:"
 
-#: src/aosd/aosd_ui.cc:210
+#: src/aosd/aosd_ui.cc:249
 msgid "Max OSD width:"
-msgstr ""
+msgstr "Största OSD-bredd:"
 
-#: src/aosd/aosd_ui.cc:221
+#: src/aosd/aosd_ui.cc:281
 msgid "Multi-Monitor options"
-msgstr ""
+msgstr "Alternativ för flera bildskärmar"
 
-#: src/aosd/aosd_ui.cc:225
+#: src/aosd/aosd_ui.cc:285
 msgid "Display OSD using:"
-msgstr ""
+msgstr "Visa OSD med:"
 
-#: src/aosd/aosd_ui.cc:227
+#: src/aosd/aosd_ui.cc:287
 msgid "all monitors"
 msgstr "alla skärmar"
 
-#: src/aosd/aosd_ui.cc:230
+#: src/aosd/aosd_ui.cc:290
 #, c-format
 msgid "monitor %i"
 msgstr "skärm %i"
 
-#: src/aosd/aosd_ui.cc:282
+#: src/aosd/aosd_ui.cc:342
 msgid "Timing (ms)"
-msgstr ""
+msgstr "Tidtagning (ms)"
 
-#: src/aosd/aosd_ui.cc:287
+#: src/aosd/aosd_ui.cc:347
 msgid "Display:"
-msgstr ""
+msgstr "Skärm:"
 
-#: src/aosd/aosd_ui.cc:292
+#: src/aosd/aosd_ui.cc:352
 msgid "Fade in:"
-msgstr ""
+msgstr "Tona in:"
 
-#: src/aosd/aosd_ui.cc:297
+#: src/aosd/aosd_ui.cc:357
 msgid "Fade out:"
-msgstr ""
+msgstr "Tona ut:"
 
-#: src/aosd/aosd_ui.cc:361
+#: src/aosd/aosd_ui.cc:442
 msgid "Fonts"
 msgstr "Teckensnitt"
 
-#: src/aosd/aosd_ui.cc:368
+#: src/aosd/aosd_ui.cc:449
 #, c-format
 msgid "Font %i:"
 msgstr "Teckensnitt %i:"
 
-#: src/aosd/aosd_ui.cc:382
+#: src/aosd/aosd_ui.cc:466
 msgid "Shadow"
 msgstr "Skugga"
 
-#: src/aosd/aosd_ui.cc:486
+#: src/aosd/aosd_ui.cc:589
 msgid "Render Style"
-msgstr ""
+msgstr "Renderingsstil"
 
-#: src/aosd/aosd_ui.cc:502
+#: src/aosd/aosd_ui.cc:605
 msgid "Colors"
 msgstr "Färger"
 
-#: src/aosd/aosd_ui.cc:513
+#: src/aosd/aosd_ui.cc:616
 #, c-format
 msgid "Color %i:"
 msgstr "Färg %i:"
 
-#: src/aosd/aosd_ui.cc:600
+#: src/aosd/aosd_ui.cc:714
 msgid "Enable trigger"
-msgstr ""
+msgstr "Aktivera utösare"
 
-#: src/aosd/aosd_ui.cc:627
+#: src/aosd/aosd_ui.cc:741
 msgid "Event"
-msgstr "Event"
+msgstr "Evenemang"
 
-#: src/aosd/aosd_ui.cc:655
+#: src/aosd/aosd_ui.cc:768
 msgid "Composite manager detected"
-msgstr ""
+msgstr "Kompositionshanterare upptäckt"
 
-#: src/aosd/aosd_ui.cc:662
+#: src/aosd/aosd_ui.cc:775
 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 ""
+"Kompositionshanterare inte upptäckt;\n"
+"om du inte vet att du har en igång, aktivera en kompositionshanterare annars "
+"fungerar inte OSD korrekt"
 
-#: src/aosd/aosd_ui.cc:670
+#: src/aosd/aosd_ui.cc:783
 msgid "Composite manager not required for fake transparency"
-msgstr ""
+msgstr "Kompositionshanterare krävs inte för falsk transparens"
 
-#: src/aosd/aosd_ui.cc:706
+#: src/aosd/aosd_ui.cc:820
 msgid "Transparency"
 msgstr "Genomskinlighet"
 
-#: src/aosd/aosd_ui.cc:712
+#: src/aosd/aosd_ui.cc:826
 msgid "Fake transparency"
-msgstr ""
+msgstr "Falsk genomskinlighet"
 
-#: src/aosd/aosd_ui.cc:714
+#: src/aosd/aosd_ui.cc:828
 msgid "Real transparency (requires X Composite Ext.)"
-msgstr ""
+msgstr "Verklig transparens (kräver X Composite Ext.)"
 
-#: src/aosd/aosd_ui.cc:756
+#: src/aosd/aosd_ui.cc:875
 msgid "Composite extension not loaded"
-msgstr ""
+msgstr "Kompositutbyggnad ej inläst"
 
-#: src/aosd/aosd_ui.cc:764
-msgid "Composite extension not available"
-msgstr ""
-
-#: src/aosd/aosd_ui.cc:781
+#: src/aosd/aosd_ui.cc:892
 #, c-format
 msgid "Audacious OSD"
-msgstr ""
+msgstr "Audacious OSD"
 
-#: src/aosd/aosd_ui.cc:844
+#: src/aosd/aosd_ui.cc:955
 msgid "Position"
-msgstr ""
+msgstr "Position"
 
-#: src/aosd/aosd_ui.cc:849
+#: src/aosd/aosd_ui.cc:960
 msgid "Animation"
 msgstr "Animation"
 
-#: src/aosd/aosd_ui.cc:854
+#: src/aosd/aosd_ui.cc:965
 msgid "Text"
 msgstr "Text"
 
-#: src/aosd/aosd_ui.cc:859
+#: src/aosd/aosd_ui.cc:970
 msgid "Decoration"
 msgstr "Dekoration"
 
-#: src/aosd/aosd_ui.cc:864
+#: src/aosd/aosd_ui.cc:975
 msgid "Trigger"
-msgstr "Trigger"
+msgstr "Utlösare"
 
-#: src/aosd/aosd_ui.cc:869
+#: src/aosd/aosd_ui.cc:980 src/streamtuner/shoutcast-model.cc:202
 msgid "Misc"
 msgstr "Misc"
 
-#: src/aosd/aosd_ui.cc:878
+#: src/aosd/aosd_ui.cc:989
 msgid "Test"
-msgstr ""
+msgstr "Test"
 
 #: src/asx3/asx3.cc:35
 msgid "ASXv3 Playlists"
-msgstr "ASXv3 Spellistor"
+msgstr "ASXv3-spellistor"
 
 #: src/asx/asx.cc:33
 msgid "ASXv1/ASXv2 Playlists"
-msgstr "ASXv1/ASXv2 Spellistor"
+msgstr "ASXv1/ASXv2-spellistor"
 
 #: src/audpl/audpl.cc:33
 msgid "Audacious Playlists (audpl)"
-msgstr "Audacious Spellistor (audpl)"
+msgstr "Audacious-spellistor (audpl)"
+
+#: src/background_music/background_music.cc:24
+msgid "Background music"
+msgstr "Bakgrundsmusik"
+
+#: src/background_music/background_music.cc:25
+msgid "Target level:"
+msgstr "Målnivå:"
 
-#: src/blur_scope/blur_scope.cc:42
+#: src/background_music/background_music.cc:28
+#: src/background_music/background_music.cc:33
+#: src/silence-removal/silence-removal.cc:70
+msgid "dB"
+msgstr "dB"
+
+#: src/background_music/background_music.cc:29
+msgid "Maximum amplification:"
+msgstr "Maximal förstärkning:"
+
+#: src/background_music/background_music.cc:34 src/mpg123/mpg123.cc:81
+msgid "Advanced"
+msgstr "Avancerat"
+
+#: src/background_music/background_music.cc:36
+msgid "Slow detection weight:"
+msgstr "Långsam detekteringsvikt:"
+
+#: src/background_music/background_music.cc:39
+msgid "Hint"
+msgstr "Antydan"
+
+#: src/background_music/background_music.cc:41
+msgid ""
+"Slow detection weight is the relative weight\n"
+"of a long term average detection when compared\n"
+"to the actual, faster loudness detection.\n"
+"A value of zero gives a more radio-like sound\n"
+"where soft passages get \"pulled up\" more quickly,\n"
+"a value of two makes the sound feel less compressed."
+msgstr ""
+"Långsam detektionsvikt är den relativa vikten\n"
+"av en långtidsgenomsnittlig detektering vid jämförelse\n"
+"till den faktiska, snabbare högljuddhet-detektering. \n"
+" Ett värde på noll ger ett mer radioliknande ljud\n"
+"där mjuka passager \"dras upp\" snabbare, \n"
+"ett värde på två gör att ljudet känns mindre komprimerat."
+
+#: src/background_music/background_music.cc:52
+msgid ""
+"Background Music Plugin for Audacious\n"
+"Copyright 2023;2024 Michel Fleur\n"
+"\n"
+"Controls the volume to make the sound equally loud within and between "
+"tracks.\n"
+" It uses accurate loudness measurement and tries to make the volume changes "
+"sound natural without audible peaks, yet without lowering the volume before "
+"a peak in advance."
+msgstr ""
+"Insticksprogram för bakgrundsmusik för Audacious \n"
+"Copyright 2023;2024 Michel Fleur\n"
+"\n"
+"Styr volymen för att göra ljudet lika högt inom och mellan spår.\n"
+"Det använder noggrann ljudstyrka och försöker få volymändringarna att låta "
+"naturliga utan hörbara toppar, men utan att sänka volymen innan en topp i "
+"förväg."
+
+#: src/background_music/background_music.cc:61
+msgid "Background Music"
+msgstr "Bakgrundsmusik"
+
+#: src/bitcrusher/bitcrusher.cc:33
+msgid "Bitcrusher"
+msgstr "Bitcrusher"
+
+#: src/bitcrusher/bitcrusher.cc:34
+msgid "Bit Depth:"
+msgstr "Överföringsdjup:"
+
+#: src/bitcrusher/bitcrusher.cc:37
+msgid "Downsample ratio:"
+msgstr "Nedsamplingsförhållande:"
+
+#: src/bitcrusher/bitcrusher.cc:48
+msgid "Bitcrusher"
+msgstr "Bitcrusher"
+
+#: src/blur_scope/blur_scope.cc:40 src/blur_scope-qt/blur_scope.cc:45
 msgid "Color"
 msgstr "Färg"
 
-#: src/blur_scope/blur_scope.cc:58
+#: src/blur_scope/blur_scope.cc:56 src/blur_scope-qt/blur_scope.cc:158
 msgid "Blur Scope"
-msgstr ""
+msgstr "Oskärpa omfattning"
 
 #: src/bs2b/plugin.cc:38
 msgid "Bauer Stereophonic-to-Binaural (BS2B)"
-msgstr ""
+msgstr "Bauer Stereophonic-to-Binaural (BS2B)"
 
 #: src/bs2b/plugin.cc:129
 msgid "Presets:"
-msgstr ""
+msgstr "Förinställningar:"
+
+#: src/bs2b/plugin.cc:130
+msgid "Default"
+msgstr "Standard"
 
 #: src/bs2b/plugin.cc:136
 msgid "Feed level:"
-msgstr ""
+msgstr "Flödesnivå:"
 
 #: src/bs2b/plugin.cc:138
 msgid "x1/10 dB"
-msgstr ""
+msgstr "x1/10 dB"
 
 #: src/bs2b/plugin.cc:139
 msgid "Cut frequency:"
-msgstr ""
+msgstr "Klippfrekvens:"
 
-#: src/cairo-spectrum/cairo-spectrum.cc:41
+#: src/cairo-spectrum/cairo-spectrum.cc:42 src/qt-spectrum/qt-spectrum.cc:107
 msgid "Spectrum Analyzer"
 msgstr "Spektrumanalysator"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:72
+#: src/cdaudio/cdaudio-ng.cc:74
 msgid "Audio CD Plugin"
-msgstr "Ljud CD Plugin"
+msgstr "Ljud-CD-insticksmodul"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:121
+#: src/cdaudio/cdaudio-ng.cc:121
 msgid ""
 "Copyright (C) 2007-2012 Calin Crisan <ccrisan@gmail.com> and others.\n"
 "\n"
@@ -739,155 +694,165 @@
 "\n"
 "This was a Google Summer of Code 2007 project."
 msgstr ""
+"Copyright (C) 2007-2012 Calin Crisan <ccrisan@gmail.com> och andra.\n"
+"\n"
+"Många tack till libcdio-utvecklare <http://www.gnu.org/software/libcdio/>\n"
+"och till libcddb-utvecklare <http://libcddb.sourceforge.net/>.\n"
+"\n"
+"Även tack till Tony Vroon för mentorskap och vägledning.\n"
+"\n"
+"Detta var ett Google Summer of Code 2007-projekt."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:137
+#: src/cdaudio/cdaudio-ng.cc:140
 msgid "Device"
 msgstr "Enhet"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:138
+#: src/cdaudio/cdaudio-ng.cc:141
 msgid "Read speed:"
 msgstr "Läshastighet:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:141
+#: src/cdaudio/cdaudio-ng.cc:144
 msgid "Override device:"
-msgstr ""
+msgstr "Åsidosätt enhet:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:143
+#: src/cdaudio/cdaudio-ng.cc:146
 msgid "Metadata"
 msgstr "Metadata"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:144
+#: src/cdaudio/cdaudio-ng.cc:147
 msgid "Use CD-Text"
-msgstr "Använd CD-Text"
+msgstr "Använd CD-text"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:146
+#: src/cdaudio/cdaudio-ng.cc:150
 msgid "Use CDDB"
 msgstr "Använd CDDB"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:148
+#: src/cdaudio/cdaudio-ng.cc:152
 msgid "Use HTTP instead of CDDBP"
 msgstr "Använd HTTP istället för CDDBP"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:151
+#: src/cdaudio/cdaudio-ng.cc:155
 msgid "Server:"
 msgstr "Server:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:155
+#: src/cdaudio/cdaudio-ng.cc:159
 msgid "Path:"
-msgstr ""
+msgstr "Sökväg:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:159
+#: src/cdaudio/cdaudio-ng.cc:163
 msgid "Port:"
 msgstr "Port:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:246
+#: src/cdaudio/cdaudio-ng.cc:228
 msgid "Failed to initialize cdio subsystem."
-msgstr ""
+msgstr "Misslyckades med att initiera cdio-delsystemet."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:281
+#: src/cdaudio/cdaudio-ng.cc:260
 #, c-format
 msgid "Invalid URI %s."
-msgstr "Ogiltig URI %s"
+msgstr "Ogiltig URI %s."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:283
+#: src/cdaudio/cdaudio-ng.cc:262
 #, c-format
 msgid "Track %d not found."
 msgstr "Spår %d kunde inte hittas."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:285
+#: src/cdaudio/cdaudio-ng.cc:264
 #, c-format
 msgid "Track %d is a data track."
 msgstr "Spår %d är ett dataspår."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:360
+#: src/cdaudio/cdaudio-ng.cc:339
 msgid "Error reading audio CD."
-msgstr ""
+msgstr "Fel vid läsning av ljud-CD."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:429
+#: src/cdaudio/cdaudio-ng.cc:410
 msgid "Audio CD"
-msgstr "Ljud CD"
+msgstr "Ljud-CD"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:460 src/cdaudio-ng/cdaudio-ng.cc:469
+#: src/cdaudio/cdaudio-ng.cc:446 src/cdaudio/cdaudio-ng.cc:455
 #, c-format
 msgid "Failed to open CD device %s."
-msgstr ""
+msgstr "Misslyckades med att öppna CD-enheten %s."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:472
+#: src/cdaudio/cdaudio-ng.cc:458
 msgid "No audio capable CD drive found."
-msgstr ""
+msgstr "Ingen ljud kapabel CD-enhet hittades."
+
+#: src/cdaudio/cdaudio-ng.cc:481
+msgid "Drive is empty."
+msgstr "Enheten är tom."
+
+#: src/cdaudio/cdaudio-ng.cc:483
+msgid "Unsupported disk type."
+msgstr "Ogiltig typ av skiva."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:497
+#: src/cdaudio/cdaudio-ng.cc:507
 msgid "Failed to finish initializing opened CD drive."
-msgstr ""
+msgstr "Misslyckades med att slutföra initieringen av den öppna CD-enheten."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:510
+#: src/cdaudio/cdaudio-ng.cc:520
 msgid "Failed to retrieve first/last track number."
-msgstr ""
+msgstr "Misslyckades med mottagandet av det första/sista spårnumret."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:531
+#: src/cdaudio/cdaudio-ng.cc:541
 #, c-format
 msgid "Cannot read start/end LSN for track %d."
-msgstr ""
+msgstr "Kan inte läsa start/slut-LSN för spår %d."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:613
-msgid "Failed to create the cddb connection."
-msgstr ""
+#: src/cdaudio/cdaudio-ng.cc:624
+msgid "Failed to create the CDDB connection."
+msgstr "Misslyckades med att skapa CDDB-anslutning."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:679
+#: src/cdaudio/cdaudio-ng.cc:690
 msgid "Failed to query the CDDB server"
-msgstr ""
+msgstr "Misslyckades med att fråga CDDB-server"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:681
+#: src/cdaudio/cdaudio-ng.cc:692
 #, c-format
 msgid "Failed to query the CDDB server: %s"
-msgstr ""
+msgstr "Misslyckades med att fråga CDDB-server: %s"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:705
+#: src/cdaudio/cdaudio-ng.cc:716
 #, c-format
-msgid "Failed to read the cddb info: %s"
-msgstr ""
-
-#: src/cdaudio-ng/cdaudio-ng.cc:765
-msgid "Drive is empty."
-msgstr ""
+msgid "Failed to read the CDDB info: %s"
+msgstr "Misslyckades med att läsa CDDB-data: %s"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:767
-msgid "Unsupported disk type."
-msgstr ""
-
-#: src/cd-menu-items/cd-menu-items.cc:35
+#: src/cd-menu-items/cd-menu-items.cc:33
 msgid "Audio CD Menu Items"
-msgstr ""
+msgstr "Ljud-CD-menyalternativ"
 
-#: src/cd-menu-items/cd-menu-items.cc:47
-msgid "Play CD"
-msgstr "Spela CD"
-
-#: src/cd-menu-items/cd-menu-items.cc:47
-msgid "Add CD"
-msgstr ""
+#: src/cd-menu-items/cd-menu-items.cc:45
+msgid "Pla_y CD"
+msgstr "Spel_a CD"
+
+#: src/cd-menu-items/cd-menu-items.cc:45
+msgid "_Add CD"
+msgstr "_Lägg till CD"
 
 #: src/compressor/compressor.cc:45
 msgid "Compression"
-msgstr ""
+msgstr "Komprimering"
 
 #: src/compressor/compressor.cc:46
 msgid "Center volume:"
-msgstr ""
+msgstr "Mittenvolym:"
 
 #: src/compressor/compressor.cc:49
 msgid "Dynamic range:"
-msgstr ""
+msgstr "Dynamiskt omfång:"
 
 #: src/compressor/compressor.cc:57
 msgid ""
 "Dynamic Range Compression Plugin for Audacious\n"
 "Copyright 2010-2014 John Lindgren"
 msgstr ""
+"Dynamic Range Compression Plugin för Audacious\n"
+"Copyright 2010-2014 John Lindgren"
 
 #: src/compressor/compressor.cc:64
 msgid "Dynamic Range Compressor"
-msgstr ""
+msgstr "Dynamiskt omfång kompressor"
 
 #: src/console/plugin.cc:15
 msgid ""
@@ -898,14 +863,20 @@
 "William Pitcock <nenolod@dereferenced.org>\n"
 "Shay Green <gblargg@gmail.com>"
 msgstr ""
+"Konsol musikavkodningsmotor baserat på Game_Music_Emu 0.5.2\n"
+"Format som stöds: AY, GBS, GYM, HES, KSS, NSF, NSFE, SAP, SPC, VGM, VGZ\n"
+"\n"
+"Audacious-instickmodul av:\n"
+"William Pitcock <nenolod@dereferenced.org>\n"
+"Shay Green <gblargg@gmail.com>"
 
 #: src/console/plugin.cc:30
 msgid "Bass:"
-msgstr "Bass:"
+msgstr "Bas:"
 
 #: src/console/plugin.cc:33
 msgid "Treble:"
-msgstr ""
+msgstr "Diskant:"
 
 #: src/console/plugin.cc:36
 msgid "Echo:"
@@ -913,15 +884,22 @@
 
 #: src/console/plugin.cc:39
 msgid "Default song length:"
-msgstr "Standard sånglängd:"
+msgstr "Standard låtlängd:"
+
+#: src/console/plugin.cc:41 src/crossfade/crossfade.cc:56
+#: src/crossfade/crossfade.cc:62 src/lirc/lirc.cc:395 src/notify/notify.cc:113
+#: src/sid/xs_config.cc:85 src/sid/xs_config.cc:94 src/sid/xs_config.cc:103
+#: src/vumeter-qt/vumeter_qt.cc:39
+msgid "seconds"
+msgstr "sekunder"
 
-#: src/console/plugin.cc:42 src/modplug/plugin_main.cc:59
+#: src/console/plugin.cc:42 src/modplug/plugin_main.cc:58
 msgid "Resampling"
-msgstr "Resampling"
+msgstr "Återsampling"
 
 #: src/console/plugin.cc:43
 msgid "Enable audio resampling"
-msgstr ""
+msgstr "Aktivera ljudåtersampling"
 
 #: src/console/plugin.cc:49
 msgid "SPC"
@@ -929,148 +907,171 @@
 
 #: src/console/plugin.cc:50
 msgid "Ignore length from SPC tags"
-msgstr ""
+msgstr "Ignorera längd från SPC-taggar"
 
 #: src/console/plugin.cc:52
 msgid "Increase reverb"
-msgstr ""
+msgstr "Öka reverb"
 
 #: src/console/plugin.h:26
 msgid "Game Console Music Decoder"
-msgstr ""
+msgstr "Spelkonsol musikavkodare"
 
-#: src/coreaudio/coreaudio.cc:50
+#: src/coreaudio/coreaudio.cc:53
 msgid "CoreAudio output"
-msgstr ""
+msgstr "CoreAudio-utgång"
 
-#: src/coreaudio/coreaudio.cc:131
+#: src/coreaudio/coreaudio.cc:155
 msgid ""
 "CoreAudio Output Plugin for Audacious\n"
 "Copyright 2014 William Pitcock\n"
+"Copyright 2017,18 René J.V. Bertin\n"
+" (original code and code adapted from\n"
+" Apple examples, (C) Apple 2013)\n"
 "\n"
 "Based on SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
 msgstr ""
+"CoreAudio Output Plugin för Audacious\n"
+"Copyright 2014 William Pitcock\n"
+"Copyright 2017,18 René J.V. Bertin\n"
+"(ursprunglig kod och kod anpassad från\n"
+" Apple examples, (C) Apple 2013)\n"
+"\n"
+"Baserat på SDL Output Plugin för Audacious\n"
+"Copyright 2010 John Lindgren"
 
-#: src/coreaudio/coreaudio.cc:143
+#: src/coreaudio/coreaudio.cc:171
 msgid "Use exclusive mode"
-msgstr ""
+msgstr "Använd exklusivt läge"
 
-#: src/crossfade/crossfade.cc:44
+#: src/coreaudio/coreaudio.cc:173
+msgid "Use bit perfect audio (adapt device sampling rate)"
+msgstr "Använd bit perfekt ljud (anpassa enhetens samplingsfrekvens)"
+
+#: src/crossfade/crossfade.cc:47
 msgid ""
 "Crossfade Plugin for Audacious\n"
 "Copyright 2010-2014 John Lindgren"
 msgstr ""
+"Övertoningsinsticksmodul för Audacious\n"
+"Copyright 2010-2014 John Lindgren"
 
-#: src/crossfade/crossfade.cc:48
+#: src/crossfade/crossfade.cc:51
 msgid "Crossfade"
-msgstr ""
+msgstr "Övertoning"
 
-#: src/crossfade/crossfade.cc:49
+#: src/crossfade/crossfade.cc:52
 msgid "On automatic song change"
-msgstr ""
+msgstr "Vid automatisk låtbyte"
 
-#: src/crossfade/crossfade.cc:51 src/crossfade/crossfade.cc:57
+#: src/crossfade/crossfade.cc:54 src/crossfade/crossfade.cc:60
 msgid "Overlap:"
-msgstr ""
+msgstr "Överlappa:"
 
-#: src/crossfade/crossfade.cc:55
+#: src/crossfade/crossfade.cc:58
 msgid "On seek or manual song change"
-msgstr ""
+msgstr "På sök eller manuell låtbyte"
 
-#: src/crossfade/crossfade.cc:61
+#: src/crossfade/crossfade.cc:64
+msgid "No fade in"
+msgstr "Ingen tona in"
+
+#: src/crossfade/crossfade.cc:66
+msgid "Use S-curve fade"
+msgstr "Använd S-kurva toning"
+
+#: src/crossfade/crossfade.cc:68
+msgid "S-curve steepness:"
+msgstr "S-kurvans branthet:"
+
+#: src/crossfade/crossfade.cc:70
+msgid "(higher is steeper)"
+msgstr "(högre är brantare)"
+
+#: src/crossfade/crossfade.cc:72
 msgid "Tip"
-msgstr ""
+msgstr "Tips"
 
-#: src/crossfade/crossfade.cc:62
+#: src/crossfade/crossfade.cc:73
 msgid ""
 "For better crossfading, enable\n"
 "the Silence Removal effect."
 msgstr ""
+"För bättre övertoning, aktivera\n"
+"avstängningseffekten."
 
-#: src/crossfade/crossfade.cc:72
+#: src/crossfade/crossfade.cc:83
 msgid "Crossfade"
-msgstr ""
-
-#: src/crossfade/crossfade.cc:161
-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.cc:168
-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 "Övertoning"
 
 #: src/crystalizer/crystalizer.cc:31
 msgid "Crystalizer"
-msgstr ""
+msgstr "Kristallisator"
 
 #: src/crystalizer/crystalizer.cc:32 src/stereo_plugin/stereo.cc:45
 msgid "Intensity:"
-msgstr ""
+msgstr "Intensitet:"
 
 #: src/crystalizer/crystalizer.cc:43
 msgid "Crystalizer"
-msgstr ""
+msgstr "Kristallisator"
 
-#: src/cue/cue.cc:37
+#: src/cue/cue.cc:42
 msgid "Cue Sheet Plugin"
 msgstr "Cue Sheet Plugin"
 
-#: src/delete-files/delete-files.cc:46 src/delete-files/delete-files.cc:146
+#: src/delete-files/delete-files.cc:53 src/delete-files/delete-files.cc:215
+#: src/delete-files/delete-files.cc:230
 msgid "Delete Files"
-msgstr "Ta bort Filer"
+msgstr "Ta bort filer"
 
-#: src/delete-files/delete-files.cc:75
+#: src/delete-files/delete-files.cc:120
+msgid "No files are selected."
+msgstr "Inga filer har valts."
+
+#: src/delete-files/delete-files.cc:125
 #, c-format
-msgid "Error moving %s to trash: %s."
-msgstr ""
+msgid "Do you want to move %s to the trash?"
+msgstr "Vill du flytta %s till papperskorgen?"
 
-#: src/delete-files/delete-files.cc:86
+#: src/delete-files/delete-files.cc:126
 #, c-format
-msgid "Error deleting %s: %s."
-msgstr ""
+msgid "Do you want to permanently delete %s?"
+msgstr "Vill du ta bort %s permanent?"
 
-#: src/delete-files/delete-files.cc:117
+#: src/delete-files/delete-files.cc:133
 #, c-format
-msgid "Error deleting %s: not a local file."
-msgstr ""
+msgid "Do you want to move %d files to the trash?"
+msgstr "Vill du flytta %d filer till papperskorgen?"
 
 #: src/delete-files/delete-files.cc:134
-msgid "Do you want to move the selected files to the trash?"
-msgstr ""
-
-#: src/delete-files/delete-files.cc:135
-msgid "Move to Trash"
-msgstr "Flytta till Papperskorgen"
+#, c-format
+msgid "Do you want to permanently delete %d files?"
+msgstr "Vill du ta bort %d filer permanent?"
 
-#: src/delete-files/delete-files.cc:140
-msgid "Do you want to permanently delete the selected files?"
-msgstr ""
+#: src/delete-files/delete-files.cc:146
+msgid "Move to trash"
+msgstr "Flytta till papperskorgen"
 
-#: src/delete-files/delete-files.cc:141 src/skins/preset-list.cc:411
-#: src/skins/preset-list.cc:427
+#: src/delete-files/delete-files.cc:146
 msgid "Delete"
-msgstr "Ta Bort"
+msgstr "Ta bort"
 
-#: src/delete-files/delete-files.cc:145 src/skins/preset-browser.cc:56
-#: src/skins/preset-list.cc:307 src/skins/ui_playlist.cc:221
+#: src/delete-files/delete-files.cc:213 src/delete-files/delete-files.cc:235
+#: src/skins-qt/search-select.cc:102 src/skins/search-select.cc:78
 msgid "Cancel"
 msgstr "Avsluta"
 
-#: src/delete-files/delete-files.cc:166
+#: src/delete-files/delete-files.cc:267
 msgid "Delete Selected Files"
-msgstr ""
+msgstr "Ta bort valda filer"
 
-#: src/delete-files/delete-files.cc:181
+#: src/delete-files/delete-files.cc:287
 msgid "Delete Method"
-msgstr ""
+msgstr "Borttagningsmetod"
 
-#: src/delete-files/delete-files.cc:182
+#: src/delete-files/delete-files.cc:288
 msgid "Move to trash instead of deleting immediately"
 msgstr "Flytta till papperskorgen istället för att ta bort direkt"
 
@@ -1081,26 +1082,30 @@
 "Surround echo by Carl van Schaik, 1999\n"
 "Updated for Audacious by William Pitcock and John Lindgren, 2010-2014"
 msgstr ""
+"Echo Plugin\n"
+"Av Johan Levin, 1999\n"
+"Surround echo av Carl van Schaik, 1999\n"
+"Uppdaterad för Audacious av William Pitcock och John Lindgren, 2010-2014"
 
 #: src/echo_plugin/echo.cc:21
 msgid "Echo"
 msgstr "Eko"
 
-#: src/echo_plugin/echo.cc:22 src/modplug/plugin_main.cc:73
-#: src/modplug/plugin_main.cc:83
+#: src/echo_plugin/echo.cc:22 src/modplug/plugin_main.cc:72
+#: src/modplug/plugin_main.cc:82
 msgid "Delay:"
-msgstr ""
+msgstr "Fördröjning:"
 
-#: src/echo_plugin/echo.cc:24 src/modplug/plugin_main.cc:73
-#: src/modplug/plugin_main.cc:83
+#: src/echo_plugin/echo.cc:24 src/modplug/plugin_main.cc:72
+#: src/modplug/plugin_main.cc:82 src/xsf/plugin.cc:445
 msgid "ms"
 msgstr "ms"
 
 #: src/echo_plugin/echo.cc:25
 msgid "Feedback:"
-msgstr "Feedback:"
+msgstr "Återkoppling:"
 
-#: src/echo_plugin/echo.cc:28 src/modplug/plugin_main.cc:87
+#: src/echo_plugin/echo.cc:28 src/modplug/plugin_main.cc:86
 msgid "Volume:"
 msgstr "Volym:"
 
@@ -1108,11 +1113,11 @@
 msgid "Echo"
 msgstr "Eko"
 
-#: src/ffaudio/ffaudio-core.cc:41
+#: src/ffaudio/ffaudio-core.cc:50
 msgid "FFmpeg Plugin"
 msgstr "FFmpeg Plugin"
 
-#: src/ffaudio/ffaudio-core.cc:571
+#: src/ffaudio/ffaudio-core.cc:649
 msgid ""
 "Multi-format audio decoding plugin for Audacious using\n"
 "FFmpeg multimedia framework (http://www.ffmpeg.org/)\n"
@@ -1121,262 +1126,360 @@
 "William Pitcock <nenolod@nenolod.net>\n"
 "Matti Hämäläinen <ccr@tnsp.org>"
 msgstr ""
+"Multiformat ljudavkodningsinsticksmodul för Audacious med \n"
+"användning av FFmpeg multimedia ramverk (http://www.ffmpeg.org/)\n"
+"\n"
+"Audacious insticksmodul av:\n"
+"William Pitcock <nenolod@nenolod.net>\n"
+"Matti Hämäläinen <ccr@tnsp.org>"
 
-#: src/filewriter/filewriter.cc:45
+#: src/filewriter/filewriter.cc:48
 msgid "FileWriter Plugin"
+msgstr "FileWriter Plugin"
+
+#: src/filewriter/filewriter.cc:316
+#, c-format
+msgid ""
+"Error opening %s:\n"
+"%s"
 msgstr ""
+"Fel vid öppning av %s:\n"
+"%s"
 
-#: src/filewriter/filewriter.cc:386
-msgid "Output file format:"
+#: src/filewriter/filewriter.cc:358
+msgid ""
+"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 ""
+"Detta program är fri programvara; du kan distribuera det och/eller modifiera "
+"det under villkoren i GNU General Public License, publicerad av Free "
+"Software Foundation, antingen version 3 eller (om du så vill) någon senare "
+"version.\n"
+"\n"
+"Detta program distribueras i hopp om att det ska vara användbart, men UTAN "
+"NÅGON SOM HELST GARANTI, även utan underförstådd garanti om SÄLJBARHET eller "
+"LÄMPLIGHET FÖR NÅGOT SPECIELLT ÄNDAMÅL. Se GNU General Public License för "
+"ytterligare information.\n"
+"\n"
+"Du bör ha fått en kopia av GNU General Public License tillsammans med detta "
+"program; om inte, skriv till Free Software Foundation, Inc., 51 Franklin "
+"Street, Fifth Floor, Boston, MA 02110-1301, USA."
 
-#: src/filewriter/filewriter.cc:403
-msgid "Configure"
-msgstr "Konfigurera"
+#: src/filewriter/filewriter.cc:385
+msgid "Output file format:"
+msgstr "Utdatafilformat:"
 
-#: src/filewriter/filewriter.cc:413
+#: src/filewriter/filewriter.cc:389
 msgid "Save into original directory"
-msgstr ""
+msgstr "Spara i ursprunglig katalog"
 
-#: src/filewriter/filewriter.cc:417
-msgid "Save into custom directory"
-msgstr ""
+#: src/filewriter/filewriter.cc:392
+msgid "Save into custom directory:"
+msgstr "Spara i katalog:"
 
-#: src/filewriter/filewriter.cc:427
-msgid "Output file folder:"
-msgstr ""
+#: src/filewriter/filewriter.cc:400
+msgid "Generate file name from:"
+msgstr "Generera filnamn från:"
 
-#: src/filewriter/filewriter.cc:431
-msgid "Pick a folder"
-msgstr "Välj en mapp"
+#: src/filewriter/filewriter.cc:401
+msgid "Original file name"
+msgstr "Ursprungligt filnamn"
 
-#: src/filewriter/filewriter.cc:444
-msgid "Generate file name from:"
-msgstr ""
+#: src/filewriter/filewriter.cc:404
+msgid "Original file name (no suffix)"
+msgstr "Ursprungligt filnamn (utan filtyp)"
 
-#: src/filewriter/filewriter.cc:448
+#: src/filewriter/filewriter.cc:407
 msgid "Original file tag"
-msgstr ""
+msgstr "Ursprunglig filtagg"
 
-#: src/filewriter/filewriter.cc:453
-msgid "Original file name"
-msgstr ""
+#: src/filewriter/filewriter.cc:411
+msgid "Prepend track number to file name"
+msgstr "Förordna spårnummer för filnamn"
 
-#: src/filewriter/filewriter.cc:459
-msgid "Include original file name extension"
-msgstr ""
+#: src/filewriter/filewriter.cc:417 src/filewriter/filewriter.cc:449
+msgid "Auto"
+msgstr "Automatisk"
 
-#: src/filewriter/filewriter.cc:468
-msgid "Prepend track number to file name"
-msgstr ""
+#: src/filewriter/filewriter.cc:418
+msgid "8000 Hz"
+msgstr "8000 Hz"
+
+#: src/filewriter/filewriter.cc:419
+msgid "11025 Hz"
+msgstr "11025 Hz"
+
+#: src/filewriter/filewriter.cc:420
+msgid "12000 Hz"
+msgstr "12000 Hz"
+
+#: src/filewriter/filewriter.cc:421
+msgid "16000 Hz"
+msgstr "16000 Hz"
+
+#: src/filewriter/filewriter.cc:422
+msgid "22050 Hz"
+msgstr "22050 Hz"
+
+#: src/filewriter/filewriter.cc:423
+msgid "24000 Hz"
+msgstr "24000 Hz"
+
+#: src/filewriter/filewriter.cc:424
+msgid "32000 Hz"
+msgstr "32000 Hz"
+
+#: src/filewriter/filewriter.cc:425 src/xsf/plugin.cc:430
+msgid "44100 Hz"
+msgstr "44100 Hz"
+
+#: src/filewriter/filewriter.cc:426 src/xsf/plugin.cc:431
+msgid "48000 Hz"
+msgstr "48000 Hz"
+
+#: src/filewriter/filewriter.cc:430
+msgid "8 kbit/s"
+msgstr "8 kbit/s"
 
-#: src/filewriter/filewriter.cc:484
-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.cc:431
+msgid "16 kbit/s"
+msgstr "16 kbit/s"
 
-#: src/filewriter/mp3.cc:40 src/filewriter/mp3.cc:717
-msgid "Auto"
-msgstr "Auto"
+#: src/filewriter/filewriter.cc:432
+msgid "32 kbit/s"
+msgstr "32 kbit/s"
+
+#: src/filewriter/filewriter.cc:433
+msgid "40 kbit/s"
+msgstr "40 kbit/s"
+
+#: src/filewriter/filewriter.cc:434
+msgid "48 kbit/s"
+msgstr "48 kbit/s"
+
+#: src/filewriter/filewriter.cc:435
+msgid "56 kbit/s"
+msgstr "56 kbit/s"
+
+#: src/filewriter/filewriter.cc:436
+msgid "64 kbit/s"
+msgstr "64 kbit/s"
+
+#: src/filewriter/filewriter.cc:437
+msgid "80 kbit/s"
+msgstr "80 kbit/s"
+
+#: src/filewriter/filewriter.cc:438
+msgid "96 kbit/s"
+msgstr "96 kbit/s"
+
+#: src/filewriter/filewriter.cc:439
+msgid "112 kbit/s"
+msgstr "112 kbit/s"
+
+#: src/filewriter/filewriter.cc:440
+msgid "128 kbit/s"
+msgstr "128 kbit/s"
+
+#: src/filewriter/filewriter.cc:441
+msgid "160 kbit/s"
+msgstr "160 kbit/s"
+
+#: src/filewriter/filewriter.cc:442
+msgid "192 kbit/s"
+msgstr "192 kbit/s"
+
+#: src/filewriter/filewriter.cc:443
+msgid "224 kbit/s"
+msgstr "224 kbit/s"
+
+#: src/filewriter/filewriter.cc:444
+msgid "256 kbit/s"
+msgstr "256 kbit/s"
+
+#: src/filewriter/filewriter.cc:445
+msgid "320 kbit/s"
+msgstr "320 kbit/s"
 
-#: src/filewriter/mp3.cc:40
+#: src/filewriter/filewriter.cc:450
 msgid "Joint Stereo"
 msgstr "Joint Stereo"
 
-#: src/filewriter/mp3.cc:41 src/modplug/plugin_main.cc:58
-#: src/mpg123/mpg123.cc:248
+#: src/filewriter/filewriter.cc:451 src/modplug/plugin_main.cc:57
+#: src/mpg123/mpg123.cc:259
 msgid "Stereo"
 msgstr "Stereo"
 
-#: src/filewriter/mp3.cc:41 src/modplug/plugin_main.cc:57
-#: src/mpg123/mpg123.cc:248
+#: src/filewriter/filewriter.cc:452 src/modplug/plugin_main.cc:56
+#: src/mpg123/mpg123.cc:260
 msgid "Mono"
 msgstr "Mono"
 
-#: src/filewriter/mp3.cc:657
-msgid "MP3 Configuration"
-msgstr "MP3 Konfiguration"
-
-#: src/filewriter/mp3.cc:658
-msgid "_OK"
-msgstr "_OK"
-
-#: src/filewriter/mp3.cc:681
-msgid "Algorithm Quality:"
-msgstr ""
-
-#: src/filewriter/mp3.cc:706
-msgid "Output Sample Rate:"
-msgstr ""
-
-#: src/filewriter/mp3.cc:733
-msgid "(Hz)"
-msgstr "(Hz)"
+#: src/filewriter/filewriter.cc:456
+msgid "VBR"
+msgstr "VBR"
+
+#: src/filewriter/filewriter.cc:457
+msgid "ABR"
+msgstr "ABR"
+
+#: src/filewriter/filewriter.cc:478
+msgid "Algorithm quality:"
+msgstr "Algoritmkvalitet:"
 
-#: src/filewriter/mp3.cc:740
-msgid "Bitrate / Compression Ratio:"
-msgstr ""
-
-#: src/filewriter/mp3.cc:764
-msgid "Bitrate (kbps):"
-msgstr "Bitrate (kbps):"
+#: src/filewriter/filewriter.cc:484
+msgid "Bitrate:"
+msgstr "Överföringskapacitet:"
 
-#: src/filewriter/mp3.cc:796
+#: src/filewriter/filewriter.cc:491
 msgid "Compression ratio:"
-msgstr ""
+msgstr "Kompressionsförhållande:"
 
-#: src/filewriter/mp3.cc:820
-msgid "Audio Mode:"
-msgstr ""
+#: src/filewriter/filewriter.cc:498
+msgid "Audio mode:"
+msgstr "Ljudläge:"
 
-#: src/filewriter/mp3.cc:845
-msgid "Miscellaneous:"
-msgstr ""
-
-#: src/filewriter/mp3.cc:856
+#: src/filewriter/filewriter.cc:501
 msgid "Enforce strict ISO compliance"
-msgstr ""
+msgstr "Genomför strikt ISO-överensstämmelse"
 
-#: src/filewriter/mp3.cc:867
+#: src/filewriter/filewriter.cc:503
 msgid "Error protection"
-msgstr ""
-
-#: src/filewriter/mp3.cc:879 src/filewriter/vorbis.cc:206
-msgid "Quality"
-msgstr "Kvalite"
+msgstr "Fel skydd"
 
-#: src/filewriter/mp3.cc:888
+#: src/filewriter/filewriter.cc:508
 msgid "Enable VBR/ABR"
-msgstr ""
+msgstr "Använd VBR/ABR"
 
-#: src/filewriter/mp3.cc:898
+#: src/filewriter/filewriter.cc:510
 msgid "Type:"
 msgstr "Typ:"
 
-#: src/filewriter/mp3.cc:931
-msgid "VBR Options:"
-msgstr ""
-
-#: src/filewriter/mp3.cc:947
-msgid "Minimum bitrate (kbps):"
-msgstr ""
+#: src/filewriter/filewriter.cc:514
+msgid "Minimum bitrate:"
+msgstr "Minsta överföringskapacitet:"
+
+#: src/filewriter/filewriter.cc:518
+msgid "Maximum bitrate:"
+msgstr "Högsta överföringskapacitet:"
+
+#: src/filewriter/filewriter.cc:522
+msgid "Average bitrate:"
+msgstr "Genomsnittlig överföringskapacitet:"
 
-#: src/filewriter/mp3.cc:973
-msgid "Maximum bitrate (kbps):"
-msgstr ""
+#: src/filewriter/filewriter.cc:526
+msgid "VBR quality level:"
+msgstr "VBR-kvalitetsnivå:"
 
-#: src/filewriter/mp3.cc:995
+#: src/filewriter/filewriter.cc:530
 msgid "Strictly enforce minimum bitrate"
-msgstr ""
-
-#: src/filewriter/mp3.cc:1007
-msgid "ABR Options:"
-msgstr ""
-
-#: src/filewriter/mp3.cc:1017
-msgid "Average bitrate (kbps):"
-msgstr ""
+msgstr "Strikt tillämpa minsta överföringskapacitet"
 
-#: src/filewriter/mp3.cc:1044
-msgid "VBR quality level:"
-msgstr ""
-
-#: src/filewriter/mp3.cc:1063
+#: src/filewriter/filewriter.cc:533
 msgid "Omit Xing VBR header"
-msgstr ""
-
-#: src/filewriter/mp3.cc:1076
-msgid "VBR/ABR"
-msgstr "VBR/ABR"
+msgstr "Utelämna Xing VBR rubrik"
 
-#: src/filewriter/mp3.cc:1085
-msgid "Frame Parameters:"
-msgstr ""
+#: src/filewriter/filewriter.cc:539
+msgid "Frame Headers"
+msgstr "Ramrubriker"
 
-#: src/filewriter/mp3.cc:1097
+#: src/filewriter/filewriter.cc:540
 msgid "Mark as copyright"
-msgstr ""
+msgstr "Märk som copyright"
 
-#: src/filewriter/mp3.cc:1108
+#: src/filewriter/filewriter.cc:542
 msgid "Mark as original"
-msgstr ""
+msgstr "Märk som ursprunglig"
 
-#: src/filewriter/mp3.cc:1120
-msgid "ID3 Parameters:"
-msgstr ""
+#: src/filewriter/filewriter.cc:544
+msgid "ID3 Tags"
+msgstr "ID3-taggar"
 
-#: src/filewriter/mp3.cc:1131
+#: src/filewriter/filewriter.cc:545
 msgid "Force addition of version 2 tag"
-msgstr ""
+msgstr "Tvinga tillägg av version 2-taggen"
 
-#: src/filewriter/mp3.cc:1141
+#: src/filewriter/filewriter.cc:547
 msgid "Only add v1 tag"
-msgstr ""
+msgstr "Lägg endast till v1-tagg"
 
-#: src/filewriter/mp3.cc:1148
+#: src/filewriter/filewriter.cc:549
 msgid "Only add v2 tag"
-msgstr ""
+msgstr "Lägg endast till v2-tagg"
+
+#: src/filewriter/filewriter.cc:554
+msgid "Quality"
+msgstr "Kvalitet"
 
-#: src/filewriter/mp3.cc:1169
+#: src/filewriter/filewriter.cc:555
+msgid "VBR/ABR"
+msgstr "VBR/ABR"
+
+#: src/filewriter/filewriter.cc:556
 msgid "Tags"
 msgstr "Taggar"
 
-#: src/filewriter/vorbis.cc:196
-msgid "Vorbis Encoder Configuration"
-msgstr ""
+#: src/filewriter/filewriter.cc:566
+msgid "Quality (0-1):"
+msgstr "Kvalitet (0-1):"
 
-#: src/filewriter/vorbis.cc:219
-msgid "Quality level (0 - 10):"
-msgstr ""
+#: src/filewriter/filewriter.cc:573 src/skins-qt/skins_cfg.cc:307
+#: src/skins/skins_cfg.cc:289
+msgid "General"
+msgstr "Allmänt"
 
-#: src/flacng/flacng.h:35
+#: src/flac/flacng.h:36
 msgid "FLAC Decoder"
-msgstr "FLAC Dekoder"
+msgstr "FLAC-avkodare"
 
-#: src/flacng/metadata.cc:351 src/wavpack/wavpack.cc:209
+#: src/flac/metadata.cc:296 src/wavpack/wavpack.cc:215
 msgid "lossless"
-msgstr "lossless"
+msgstr "felfri kompression"
 
-#: src/flacng/plugin.cc:169
+#: src/flac/plugin.cc:214
 msgid ""
 "Original code by\n"
 "Ralf Ertzinger <ralf@skytale.net>\n"
 "\n"
 "http://www.skytale.net/projects/bmp-flac2/"
 msgstr ""
+"Ursprunglig kod av\n"
+"Ralf Ertzinger <ralf@skytale.net>\n"
+"\n"
+"http://www.skytale.net/projects/bmp-flac2/"
 
 #: src/gio/gio.cc:34
 msgid ""
 "GIO Plugin for Audacious\n"
 "Copyright 2009-2012 John Lindgren"
 msgstr ""
+"GIO Plugin för Audacious\n"
+"Copyright 2009-2012 John Lindgren"
 
 #: src/gio/gio.cc:42
 msgid "GIO Plugin"
 msgstr "GIO Plugin"
 
-#: src/gio/gio.cc:153
+#: src/gio/gio.cc:152
 msgid "Read-and-append mode not supported"
-msgstr ""
+msgstr "Läget läs-och-lägg till stöds inte"
 
-#: src/gio/gio.cc:166
+#: src/gio/gio.cc:165
 msgid "Invalid open mode"
-msgstr ""
+msgstr "Ogiltigt öppet läge"
 
-#: src/gl-spectrum/gl-spectrum.cc:51
+#: src/glspectrum/gl-spectrum.cc:52
 msgid ""
 "OpenGL Spectrum Analyzer for Audacious\n"
 "Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
@@ -1387,744 +1490,943 @@
 "\n"
 "License: GPLv2+"
 msgstr ""
-
-#: src/gl-spectrum/gl-spectrum.cc:62
-msgid "OpenGL Spectrum Analyzer"
-msgstr ""
-
-#: src/gl-spectrum-qt/gl-spectrum.cc:41
-msgid ""
-"OpenGL Spectrum Analyzer for Audacious\n"
-"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
-"Copyright 2014 William Pitcock\n"
+"OpenGL Spectrum Analyzer för Audacious\n"
+"Copyright 2013 Christophe Budé, John Lindgren och Carlo Bramini\n"
 "\n"
-"Based on the XMMS plugin:\n"
-"Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson, and "
+"Baserat på XMMS-insticksmodul:\n"
+"Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson och "
 "4Front Technologies\n"
 "\n"
-"License: GPLv2+"
-msgstr ""
+"Licens: GPLv2+"
 
-#: src/gl-spectrum-qt/gl-spectrum.cc:53
-msgid "OpenGL Spectrum Analyzer (Qt)"
-msgstr ""
-
-#: src/gnomeshortcuts/gnomeshortcuts.cc:38
-msgid "GNOME Shortcuts"
-msgstr ""
-
-#: src/gnomeshortcuts/gnomeshortcuts.cc:54
-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/gtkui/columns.cc:35
-msgid "Entry number"
-msgstr ""
+#: src/glspectrum/gl-spectrum.cc:63 src/qtglspectrum/gl-spectrum.cc:53
+msgid "OpenGL Spectrum Analyzer"
+msgstr "OpenGL Spectrum Analyzer"
 
-#: src/gtkui/columns.cc:36 src/playlist-manager/playlist-manager.cc:225
-#: src/qtui/playlist_model.cc:123
+#: src/gtkui/columns.cc:36 src/moonstone/playlist_model.cc:38
+#: src/qtui/playlist_model.cc:33
+msgid "Entry Number"
+msgstr "Ingångsnummer"
+
+#: src/gtkui/columns.cc:37 src/moonstone/playlist_model.cc:38
+#: src/moonstone/playlist_selection.cc:64
+#: src/playlist-manager/playlist-manager.cc:200
+#: src/playlist-manager-qt/playlist-manager-qt.cc:188
+#: src/qtui/playlist_model.cc:33 src/streamtuner/icecast-model.cc:120
+#: src/streamtuner/ihr-model.cc:159 src/streamtuner/shoutcast-model.cc:122
 msgid "Title"
 msgstr "Titel"
 
-#: src/gtkui/columns.cc:37 src/qtui/playlist_model.cc:125
+#: src/gtkui/columns.cc:38 src/moonstone/playlist_model.cc:39
+#: src/qtui/playlist_model.cc:33
 msgid "Artist"
 msgstr "Artist"
 
-#: src/gtkui/columns.cc:38
+#: src/gtkui/columns.cc:39 src/moonstone/playlist_model.cc:39
+#: src/qtui/playlist_model.cc:33
 msgid "Year"
 msgstr "År"
 
-#: src/gtkui/columns.cc:39 src/qtui/playlist_model.cc:127
+#: src/gtkui/columns.cc:40 src/moonstone/playlist_model.cc:39
+#: src/qtui/playlist_model.cc:34
 msgid "Album"
 msgstr "Album"
 
-#: src/gtkui/columns.cc:40
-msgid "Album artist"
-msgstr ""
+#: src/gtkui/columns.cc:41 src/moonstone/playlist_model.cc:40
+#: src/qtui/playlist_model.cc:34
+msgid "Album Artist"
+msgstr "Albumartist"
 
-#: src/gtkui/columns.cc:41
+#: src/gtkui/columns.cc:42 src/moonstone/playlist_model.cc:40
+#: src/qtui/playlist_model.cc:34
 msgid "Track"
 msgstr "Spår"
 
-#: src/gtkui/columns.cc:42
+#: src/gtkui/columns.cc:43 src/moonstone/playlist_model.cc:40
+#: src/qtui/playlist_model.cc:34 src/streamtuner/icecast-model.cc:123
+#: src/streamtuner/shoutcast-model.cc:125
+#: src/streamtuner/shoutcast-model.cc:236
 msgid "Genre"
 msgstr "Genre"
 
-#: src/gtkui/columns.cc:43
-msgid "Queue position"
-msgstr ""
+#: src/gtkui/columns.cc:44 src/moonstone/playlist_model.cc:41
+#: src/qtui/playlist_model.cc:35
+msgid "Queue Position"
+msgstr "Köplats"
 
-#: src/gtkui/columns.cc:44
+#: src/gtkui/columns.cc:45 src/moonstone/playlist_model.cc:41
+#: src/qtui/playlist_model.cc:35
 msgid "Length"
 msgstr "Längd"
 
-#: src/gtkui/columns.cc:45
-msgid "File path"
-msgstr ""
+#: src/gtkui/columns.cc:46 src/moonstone/playlist_model.cc:41
+#: src/qtui/playlist_model.cc:35
+msgid "File Path"
+msgstr "Sökväg"
+
+#: src/gtkui/columns.cc:47 src/moonstone/playlist_model.cc:42
+#: src/qtui/playlist_model.cc:35
+msgid "File Name"
+msgstr "Filnamn"
 
-#: src/gtkui/columns.cc:47
-msgid "Custom title"
+#: src/gtkui/columns.cc:48 src/moonstone/playlist_model.cc:42
+#: src/qtui/playlist_model.cc:36
+msgid "Custom Title"
 msgstr "Anpassad titel"
 
-#: src/gtkui/columns.cc:48
+#: src/gtkui/columns.cc:49 src/moonstone/playlist_model.cc:42
+#: src/qtui/playlist_model.cc:36 src/streamtuner/icecast-model.cc:129
+#: src/streamtuner/shoutcast-model.cc:134
 msgid "Bitrate"
-msgstr "Bitrate"
+msgstr "Överföringskapacitet"
+
+#: src/gtkui/columns.cc:50 src/moonstone/playlist_model.cc:43
+#: src/qtui/playlist_model.cc:36
+msgid "Comment"
+msgstr "Kommentar"
+
+#: src/gtkui/columns.cc:51 src/qtui/playlist_model.cc:36
+msgid "Publisher"
+msgstr "Utgivare"
+
+#: src/gtkui/columns.cc:52 src/qtui/playlist_model.cc:37
+msgid "Catalog Number"
+msgstr "Katalognummer"
+
+#: src/gtkui/columns.cc:53 src/moonstone/playlist_model.cc:43
+#: src/qtui/playlist_model.cc:37
+msgid "Disc"
+msgstr "Skiva"
 
-#: src/gtkui/columns.cc:308
+#: src/gtkui/columns.cc:325
 msgid "Available columns"
-msgstr ""
+msgstr "Tillgängliga kolumner"
 
-#: src/gtkui/columns.cc:334
+#: src/gtkui/columns.cc:351
 msgid "Displayed columns"
-msgstr ""
+msgstr "Visade kolumner"
 
-#: src/gtkui/layout.cc:72 src/search-tool/search-tool.cc:40
+#: src/gtkui/layout.cc:74 src/search-tool-qt/search-tool-qt.cc:58
+#: src/search-tool/search-tool.cc:49
 msgid "Search Tool"
-msgstr ""
+msgstr "Sökverktyg"
 
-#: src/gtkui/layout.cc:167
+#: src/gtkui/layout.cc:170
 msgid "Dock at Left"
-msgstr ""
+msgstr "Docka till vänster"
 
-#: src/gtkui/layout.cc:167
+#: src/gtkui/layout.cc:170
 msgid "Dock at Right"
-msgstr ""
+msgstr "Docka till höger"
 
-#: src/gtkui/layout.cc:168
+#: src/gtkui/layout.cc:171
 msgid "Dock at Top"
-msgstr ""
+msgstr "Docka upptill"
 
-#: src/gtkui/layout.cc:168
+#: src/gtkui/layout.cc:171
 msgid "Dock at Bottom"
-msgstr ""
+msgstr "Docka nedtill"
 
-#: src/gtkui/layout.cc:168
+#: src/gtkui/layout.cc:171
 msgid "Undock"
-msgstr ""
+msgstr "Avdocka"
 
-#: src/gtkui/layout.cc:168 src/ladspa/plugin.cc:531
+#: src/gtkui/layout.cc:171 src/ladspa/plugin.cc:540
 msgid "Disable"
-msgstr ""
+msgstr "Inaktivera"
 
-#: src/gtkui/menus.cc:126 src/qtui/main_window_actions.cc:93
-#: src/statusicon/statusicon.cc:276
+#: src/gtkui/menus.cc:79 src/qtui/menus.cc:107
+#: src/statusicon-qt/statusicon.cc:115 src/statusicon/statusicon.cc:286
 msgid "_Open Files ..."
-msgstr "_Öppna filer..."
+msgstr "_Öppna filer ..."
 
-#: src/gtkui/menus.cc:127
+#: src/gtkui/menus.cc:80 src/qtui/menus.cc:111
 msgid "Open _URL ..."
-msgstr "Öppna _URL ..."
+msgstr "Öppna _webbadress ..."
 
-#: src/gtkui/menus.cc:128 src/qtui/main_window_actions.cc:95
+#: src/gtkui/menus.cc:81 src/qtui/menus.cc:113
 msgid "_Add Files ..."
 msgstr "_Lägg till filer ..."
 
-#: src/gtkui/menus.cc:129
+#: src/gtkui/menus.cc:82 src/qtui/menus.cc:118
 msgid "Add U_RL ..."
 msgstr "Lägg till U_RL ..."
 
-#: src/gtkui/menus.cc:131
+#: src/gtkui/menus.cc:84 src/qtui/menus.cc:120
 msgid "Search _Library"
-msgstr ""
+msgstr "Sök i _bibliotek"
 
-#: src/gtkui/menus.cc:133 src/qtui/main_window_actions.cc:98
+#: src/gtkui/menus.cc:86 src/qtui/menus.cc:123
 msgid "A_bout ..."
 msgstr "O_m ..."
 
-#: src/gtkui/menus.cc:134 src/qtui/main_window_actions.cc:99
+#: src/gtkui/menus.cc:87 src/qtui/menus.cc:125
 msgid "_Settings ..."
 msgstr "_Inställningar ..."
 
-#: src/gtkui/menus.cc:135 src/qtui/main_window_actions.cc:103
-#: src/statusicon/statusicon.cc:284
+#: src/gtkui/menus.cc:88 src/qtui/menus.cc:131
+#: src/statusicon-qt/statusicon.cc:117 src/statusicon/statusicon.cc:288
 msgid "_Quit"
 msgstr "_Avsluta"
 
-#: src/gtkui/menus.cc:139 src/gtkui/menus.cc:262
-#: src/qtui/main_window_actions.cc:107 src/search-tool/search-tool.cc:641
-#: src/statusicon/statusicon.cc:278
+#: src/gtkui/menus.cc:92 src/gtkui/menus.cc:226
+#: src/moonstone/playlist_tabs.cc:306 src/qtui/menus.cc:135
+#: src/qtui/playlist_tabs.cc:331 src/search-tool-qt/search-tool-qt.cc:499
+#: src/search-tool/search-tool.cc:339 src/statusicon-qt/statusicon.cc:109
+#: src/statusicon/statusicon.cc:280
 msgid "_Play"
 msgstr "_Spela"
 
-#: src/gtkui/menus.cc:140 src/qtui/main_window_actions.cc:108
-#: src/statusicon/statusicon.cc:279
+#: src/gtkui/menus.cc:93 src/qtui/menus.cc:137
+#: src/statusicon-qt/statusicon.cc:110 src/statusicon/statusicon.cc:281
 msgid "Paus_e"
-msgstr "_Paus_a"
+msgstr "Paus_a"
 
-#: src/gtkui/menus.cc:141 src/qtui/main_window_actions.cc:109
-#: src/statusicon/statusicon.cc:280
+#: src/gtkui/menus.cc:94 src/qtui/menus.cc:139
+#: src/statusicon-qt/statusicon.cc:111 src/statusicon/statusicon.cc:282
 msgid "_Stop"
 msgstr "_Stoppa"
 
-#: src/gtkui/menus.cc:142 src/qtui/main_window_actions.cc:110
-#: src/statusicon/statusicon.cc:277
+#: src/gtkui/menus.cc:95 src/qtui/menus.cc:141
+#: src/statusicon-qt/statusicon.cc:112 src/statusicon/statusicon.cc:283
 msgid "Pre_vious"
-msgstr "Förra"
+msgstr "Före_gående"
 
-#: src/gtkui/menus.cc:143 src/qtui/main_window_actions.cc:111
-#: src/statusicon/statusicon.cc:281
+#: src/gtkui/menus.cc:96 src/qtui/menus.cc:143
+#: src/statusicon-qt/statusicon.cc:113 src/statusicon/statusicon.cc:284
 msgid "_Next"
 msgstr "_Nästa"
 
-#: src/gtkui/menus.cc:145 src/qtui/main_window_actions.cc:113
+#: src/gtkui/menus.cc:97 src/qtui/menus.cc:145 src/skins/menus.cc:114
+#: src/skins-qt/menus.cc:105
+msgid "Previous Album"
+msgstr "Föregående album"
+
+#: src/gtkui/menus.cc:98 src/qtui/menus.cc:146 src/skins/menus.cc:115
+#: src/skins-qt/menus.cc:106
+msgid "Next Album"
+msgstr "Nästa album"
+
+#: src/gtkui/menus.cc:100 src/qtui/menus.cc:148
 msgid "_Repeat"
-msgstr ""
+msgstr "_Upprepa"
 
-#: src/gtkui/menus.cc:146 src/qtui/main_window_actions.cc:114
+#: src/gtkui/menus.cc:101 src/qtui/menus.cc:150
 msgid "S_huffle"
-msgstr ""
+msgstr "B_landa"
 
-#: src/gtkui/menus.cc:147 src/qtui/main_window_actions.cc:115
+#: src/gtkui/menus.cc:102 src/qtui/menus.cc:152
+msgid "Shuffle by Albu_m"
+msgstr "Blanda på albu_m"
+
+#: src/gtkui/menus.cc:103 src/qtui/menus.cc:155
 msgid "N_o Playlist Advance"
-msgstr ""
+msgstr "I_ngen spellista avancera"
 
-#: src/gtkui/menus.cc:148 src/qtui/main_window_actions.cc:116
+#: src/gtkui/menus.cc:104 src/qtui/menus.cc:157
 msgid "Stop A_fter This Song"
-msgstr ""
+msgstr "Stoppa e_fter denna låt"
 
-#: src/gtkui/menus.cc:150 src/gtkui/menus.cc:247
-#: src/qtui/main_window_actions.cc:118
+#: src/gtkui/menus.cc:106 src/gtkui/menus.cc:210 src/qtui/menus.cc:162
+#: src/qtui/menus.cc:294
 msgid "Song _Info ..."
-msgstr "Låtinformation"
+msgstr "Låt_information ..."
 
-#: src/gtkui/menus.cc:151
+#: src/gtkui/menus.cc:107
 msgid "Jump to _Time ..."
-msgstr ""
+msgstr "Hoppa till _tid ..."
 
-#: src/gtkui/menus.cc:152
+#: src/gtkui/menus.cc:108
 msgid "_Jump to Song ..."
-msgstr ""
+msgstr "_Hoppa till låt ..."
 
-#: src/gtkui/menus.cc:154
+#: src/gtkui/menus.cc:110 src/qtui/menus.cc:165
 msgid "Set Repeat Point _A"
-msgstr ""
+msgstr "Ställ in upprepningspunkt _A"
 
-#: src/gtkui/menus.cc:155
+#: src/gtkui/menus.cc:111 src/qtui/menus.cc:167
 msgid "Set Repeat Point _B"
-msgstr ""
+msgstr "Ställ in upprepningspunkt _B"
 
-#: src/gtkui/menus.cc:156
+#: src/gtkui/menus.cc:112 src/qtui/menus.cc:169
 msgid "_Clear Repeat Points"
-msgstr ""
+msgstr "_Rensa upprepningspunkter"
 
-#: src/gtkui/menus.cc:160 src/gtkui/menus.cc:167 src/gtkui/menus.cc:183
-#: src/qtui/main_window_actions.cc:122 src/qtui/main_window_actions.cc:129
-#: src/qtui/main_window_actions.cc:145
+#: src/gtkui/menus.cc:116 src/gtkui/menus.cc:123 src/gtkui/menus.cc:141
+#: src/qtui/menus.cc:173 src/qtui/menus.cc:180 src/qtui/menus.cc:198
 msgid "By _Title"
-msgstr ""
+msgstr "Efter _titel"
 
-#: src/gtkui/menus.cc:161 src/qtui/main_window_actions.cc:123
+#: src/gtkui/menus.cc:117 src/qtui/menus.cc:174
 msgid "By _File Name"
-msgstr ""
+msgstr "Efter _filnamn"
 
-#: src/gtkui/menus.cc:162 src/qtui/main_window_actions.cc:124
+#: src/gtkui/menus.cc:118 src/qtui/menus.cc:175
 msgid "By File _Path"
-msgstr ""
+msgstr "Efter fil_sökväg"
 
-#: src/gtkui/menus.cc:166 src/gtkui/menus.cc:182
-#: src/qtui/main_window_actions.cc:128 src/qtui/main_window_actions.cc:144
+#: src/gtkui/menus.cc:122 src/gtkui/menus.cc:140 src/qtui/menus.cc:179
+#: src/qtui/menus.cc:197
 msgid "By Track _Number"
-msgstr ""
+msgstr "Efter spår_nummer"
 
-#: src/gtkui/menus.cc:168 src/gtkui/menus.cc:184
-#: src/qtui/main_window_actions.cc:130 src/qtui/main_window_actions.cc:146
+#: src/gtkui/menus.cc:124 src/gtkui/menus.cc:142 src/qtui/menus.cc:181
+#: src/qtui/menus.cc:199
 msgid "By _Artist"
-msgstr ""
+msgstr "Efter _artist"
 
-#: src/gtkui/menus.cc:169 src/gtkui/menus.cc:185
-#: src/qtui/main_window_actions.cc:131 src/qtui/main_window_actions.cc:147
+#: src/gtkui/menus.cc:125 src/gtkui/menus.cc:143 src/qtui/menus.cc:182
+#: src/qtui/menus.cc:200
 msgid "By Al_bum"
-msgstr ""
+msgstr "Efter al_bum"
 
-#: src/gtkui/menus.cc:170 src/gtkui/menus.cc:186
-#: src/qtui/main_window_actions.cc:132 src/qtui/main_window_actions.cc:148
+#: src/gtkui/menus.cc:126 src/gtkui/menus.cc:144 src/qtui/menus.cc:183
+#: src/qtui/menus.cc:201
 msgid "By Albu_m Artist"
-msgstr ""
+msgstr "Efter albu_msartist"
 
-#: src/gtkui/menus.cc:171 src/gtkui/menus.cc:187
-#: src/qtui/main_window_actions.cc:133 src/qtui/main_window_actions.cc:149
+#: src/gtkui/menus.cc:127 src/gtkui/menus.cc:145 src/qtui/menus.cc:184
+#: src/qtui/menus.cc:202
 msgid "By Release _Date"
-msgstr ""
+msgstr "Efter utgivnings_datum"
 
-#: src/gtkui/menus.cc:172 src/gtkui/menus.cc:188
-#: src/qtui/main_window_actions.cc:134 src/qtui/main_window_actions.cc:150
+#: src/gtkui/menus.cc:128 src/gtkui/menus.cc:146 src/qtui/menus.cc:185
+#: src/qtui/menus.cc:203
 msgid "By _Genre"
-msgstr ""
+msgstr "Efter _genre"
 
-#: src/gtkui/menus.cc:173 src/gtkui/menus.cc:189
-#: src/qtui/main_window_actions.cc:135 src/qtui/main_window_actions.cc:151
+#: src/gtkui/menus.cc:129 src/gtkui/menus.cc:147 src/qtui/menus.cc:186
+#: src/qtui/menus.cc:204
 msgid "By _Length"
-msgstr ""
+msgstr "Efter _längd"
 
-#: src/gtkui/menus.cc:174 src/gtkui/menus.cc:190
-#: src/qtui/main_window_actions.cc:136 src/qtui/main_window_actions.cc:152
+#: src/gtkui/menus.cc:130 src/gtkui/menus.cc:148 src/qtui/menus.cc:187
+#: src/qtui/menus.cc:205
 msgid "By _File Path"
-msgstr ""
+msgstr "Efter _filsökväg"
 
-#: src/gtkui/menus.cc:175 src/gtkui/menus.cc:191
-#: src/qtui/main_window_actions.cc:137 src/qtui/main_window_actions.cc:153
+#: src/gtkui/menus.cc:131 src/gtkui/menus.cc:149 src/qtui/menus.cc:188
+#: src/qtui/menus.cc:206
 msgid "By _Custom Title"
-msgstr ""
+msgstr "Efter _anpassad titel"
 
-#: src/gtkui/menus.cc:177 src/gtkui/menus.cc:193
-#: src/qtui/main_window_actions.cc:139 src/qtui/main_window_actions.cc:155
+#: src/gtkui/menus.cc:132 src/gtkui/menus.cc:150 src/qtui/menus.cc:189
+#: src/qtui/menus.cc:207
+msgid "By C_omment"
+msgstr "Efter k_ommentar"
+
+#: src/gtkui/menus.cc:133 src/gtkui/menus.cc:151 src/qtui/menus.cc:190
+#: src/qtui/menus.cc:208
+msgid "By D_isc Number"
+msgstr "Efter S_kivnummer"
+
+#: src/gtkui/menus.cc:135 src/gtkui/menus.cc:153 src/qtui/menus.cc:192
+#: src/qtui/menus.cc:210
 msgid "R_everse Order"
-msgstr ""
+msgstr "Omvänd o_rdning"
 
-#: src/gtkui/menus.cc:178 src/gtkui/menus.cc:194
-#: src/qtui/main_window_actions.cc:140 src/qtui/main_window_actions.cc:156
+#: src/gtkui/menus.cc:136 src/gtkui/menus.cc:154 src/qtui/menus.cc:194
+#: src/qtui/menus.cc:212
 msgid "_Random Order"
-msgstr ""
+msgstr "_Slumpmässig ordning"
 
-#: src/gtkui/menus.cc:198 src/qtui/main_window_actions.cc:160
+#: src/gtkui/menus.cc:158 src/qtui/menus.cc:216
 msgid "_Play/Resume"
-msgstr ""
+msgstr "_Spela/Återuppta"
 
-#: src/gtkui/menus.cc:199 src/gtkui/menus.cc:251
-#: src/qtui/main_window_actions.cc:161
+#: src/gtkui/menus.cc:159 src/qtui/menus.cc:218
 msgid "_Refresh"
-msgstr ""
+msgstr "_Uppdatera"
 
-#: src/gtkui/menus.cc:201 src/qtui/main_window_actions.cc:163
+#: src/gtkui/menus.cc:161 src/qtui/menus.cc:222
 msgid "_Sort"
 msgstr "_Sortera"
 
-#: src/gtkui/menus.cc:202 src/qtui/main_window_actions.cc:164
+#: src/gtkui/menus.cc:162 src/qtui/menus.cc:223
 msgid "Sort Se_lected"
-msgstr ""
+msgstr "Sortera va_lda"
 
-#: src/gtkui/menus.cc:203 src/qtui/main_window_actions.cc:165
+#: src/gtkui/menus.cc:163 src/qtui/menus.cc:225
 msgid "Remove _Duplicates"
-msgstr ""
+msgstr "Ta bort _dubbletter"
 
-#: src/gtkui/menus.cc:204 src/qtui/main_window_actions.cc:166
+#: src/gtkui/menus.cc:164 src/qtui/menus.cc:226
 msgid "Remove _Unavailable Files"
-msgstr ""
+msgstr "Ta bort _otillgängliga filer"
 
-#: src/gtkui/menus.cc:206 src/playlist-manager/playlist-manager.cc:244
-#: src/qtui/main_window_actions.cc:168
+#: src/gtkui/menus.cc:166 src/playlist-manager/playlist-manager.cc:219
+#: src/playlist-manager-qt/playlist-manager-qt.cc:348 src/qtui/menus.cc:229
 msgid "_New"
 msgstr "_Ny"
 
-#: src/gtkui/menus.cc:207
+#: src/gtkui/menus.cc:167 src/qtui/menus.cc:230
 msgid "Ren_ame ..."
-msgstr ""
+msgstr "Byt n_amn ..."
 
-#: src/gtkui/menus.cc:208 src/gtkui/menus.cc:264
-#: src/qtui/main_window_actions.cc:170
+#: src/gtkui/menus.cc:168 src/gtkui/menus.cc:228
+#: src/moonstone/playlist_tabs.cc:311 src/qtui/menus.cc:231
+#: src/qtui/playlist_tabs.cc:336
 msgid "Remo_ve"
-msgstr ""
+msgstr "Ta bor_t"
 
-#: src/gtkui/menus.cc:210
+#: src/gtkui/menus.cc:170 src/qtui/menus.cc:233
 msgid "_Import ..."
-msgstr "_Importera"
+msgstr "_Importera ..."
 
-#: src/gtkui/menus.cc:211
+#: src/gtkui/menus.cc:171 src/qtui/menus.cc:234
 msgid "_Export ..."
-msgstr "_Exportera"
+msgstr "_Exportera ..."
 
-#: src/gtkui/menus.cc:213
+#: src/gtkui/menus.cc:173 src/qtui/menus.cc:237
 msgid "Playlist _Manager ..."
-msgstr ""
+msgstr "Spellists_hanterare ..."
 
-#: src/gtkui/menus.cc:214 src/qtui/main_window_actions.cc:176
+#: src/gtkui/menus.cc:174 src/qtui/menus.cc:239
 msgid "_Queue Manager ..."
-msgstr ""
+msgstr "_Köhanterare ..."
 
-#: src/gtkui/menus.cc:218 src/qtui/main_window_actions.cc:180
+#: src/gtkui/menus.cc:178 src/qtui/menus.cc:243
 msgid "Volume _Up"
 msgstr "Volym _Upp"
 
-#: src/gtkui/menus.cc:219 src/qtui/main_window_actions.cc:181
+#: src/gtkui/menus.cc:179 src/qtui/menus.cc:245
 msgid "Volume _Down"
 msgstr "Volym _Ner"
 
-#: src/gtkui/menus.cc:221 src/qtui/main_window_actions.cc:183
-msgid "_Equalizer"
-msgstr "_Equalizer"
+#: src/gtkui/menus.cc:181 src/qtui/menus.cc:249
+msgid "_Equalizer ..."
+msgstr "_Frekvenskorrigerare ..."
 
-#: src/gtkui/menus.cc:223 src/qtui/main_window_actions.cc:185
+#: src/gtkui/menus.cc:182 src/qtui/menus.cc:251
 msgid "E_ffects ..."
-msgstr "Effekter ..."
+msgstr "E_ffekter ..."
+
+#: src/gtkui/menus.cc:184
+msgid "_Record Stream"
+msgstr "_Spela in ström"
 
-#: src/gtkui/menus.cc:227
+#: src/gtkui/menus.cc:185
+msgid "Audio _Settings ..."
+msgstr "Ljud_inställningar ..."
+
+#: src/gtkui/menus.cc:189 src/qtui/menus.cc:260
 msgid "Show _Menu Bar"
-msgstr ""
+msgstr "Visa _menyfält"
 
-#: src/gtkui/menus.cc:228
+#: src/gtkui/menus.cc:190 src/qtui/menus.cc:262
 msgid "Show I_nfo Bar"
-msgstr ""
+msgstr "Visa i_nformationsfält"
+
+#: src/gtkui/menus.cc:191 src/qtui/menus.cc:264
+msgid "Show Info Bar _Album Art"
+msgstr "Visa informationsfält _Skivomslag"
 
-#: src/gtkui/menus.cc:229
+#: src/gtkui/menus.cc:192 src/qtui/menus.cc:266
 msgid "Show Info Bar Vis_ualization"
-msgstr ""
+msgstr "Visa infofältsvisualisering"
 
-#: src/gtkui/menus.cc:230
+#: src/gtkui/menus.cc:193 src/qtui/menus.cc:268
 msgid "Show _Status Bar"
-msgstr ""
+msgstr "Visa _statusfält"
 
-#: src/gtkui/menus.cc:232
+#: src/gtkui/menus.cc:195 src/qtui/menus.cc:272
 msgid "Show _Remaining Time"
-msgstr ""
+msgstr "Visa _återstående tid"
 
-#: src/gtkui/menus.cc:234
+#: src/gtkui/menus.cc:197 src/qtui/menus.cc:276 src/skins/menus.cc:157
+#: src/skins-qt/menus.cc:152
 msgid "_Visualizations ..."
-msgstr ""
+msgstr "_Visualiseringar ..."
 
-#: src/gtkui/menus.cc:238 src/qtui/main_window_actions.cc:189
+#: src/gtkui/menus.cc:201 src/qtui/menus.cc:280
 msgid "_File"
-msgstr "_Fil"
+msgstr "_Arkiv"
 
-#: src/gtkui/menus.cc:239 src/qtui/main_window_actions.cc:190
+#: src/gtkui/menus.cc:202 src/qtui/menus.cc:281
 msgid "_Playback"
-msgstr ""
+msgstr "_Uppspelning"
 
-#: src/gtkui/menus.cc:240 src/qtui/main_window_actions.cc:191
+#: src/gtkui/menus.cc:203 src/qtui/menus.cc:282
 msgid "P_laylist"
-msgstr "Spellista"
+msgstr "Spe_llista"
 
-#: src/gtkui/menus.cc:241 src/gtkui/menus.cc:258
-#: src/qtui/main_window_actions.cc:192
+#: src/gtkui/menus.cc:204 src/gtkui/menus.cc:222 src/qtui/menus.cc:283
+#: src/qtui/menus.cc:312
 msgid "_Services"
-msgstr "_Services"
+msgstr "_Tjänster"
 
-#: src/gtkui/menus.cc:242 src/qtui/main_window_actions.cc:193
+#: src/gtkui/menus.cc:205 src/qtui/menus.cc:284
 msgid "_Output"
-msgstr ""
+msgstr "_Utgång"
 
-#: src/gtkui/menus.cc:243
+#: src/gtkui/menus.cc:206 src/qtui/menus.cc:285
 msgid "_View"
 msgstr "_Visa"
 
-#: src/gtkui/menus.cc:248
+#: src/gtkui/menus.cc:211 src/qtui/menus.cc:296
 msgid "_Queue/Unqueue"
-msgstr ""
+msgstr "_Lägg till i kö/Ta bort från kö"
 
-#: src/gtkui/menus.cc:250
+#: src/gtkui/menus.cc:213 src/qtui/menus.cc:299
 msgid "_Open Containing Folder"
-msgstr ""
+msgstr "_Öppna innehållande mapp"
 
-#: src/gtkui/menus.cc:253
+#: src/gtkui/menus.cc:214 src/qtui/menus.cc:301
+msgid "_Refresh Selected"
+msgstr "_Uppdatera valda"
+
+#: src/gtkui/menus.cc:216 src/qtui/menus.cc:304
 msgid "Cu_t"
-msgstr ""
+msgstr "Klipp _ut"
 
-#: src/gtkui/menus.cc:254
+#: src/gtkui/menus.cc:217 src/qtui/menus.cc:305
 msgid "_Copy"
 msgstr "_Kopiera"
 
-#: src/gtkui/menus.cc:255
+#: src/gtkui/menus.cc:218 src/qtui/menus.cc:306
 msgid "_Paste"
 msgstr "_Klistra in"
 
-#: src/gtkui/menus.cc:256
+#: src/gtkui/menus.cc:219 src/qtui/menus.cc:307
+msgid "Paste at _End"
+msgstr "Klistra in i _slutet"
+
+#: src/gtkui/menus.cc:220 src/qtui/menus.cc:309
 msgid "Select _All"
-msgstr "Välj _Alla"
+msgstr "Välj _alla"
 
-#: src/gtkui/menus.cc:263
+#: src/gtkui/menus.cc:227 src/moonstone/playlist_tabs.cc:309
+#: src/qtui/playlist_tabs.cc:334
 msgid "_Rename ..."
-msgstr "_Döp om ..."
+msgstr "_Byt namn ..."
+
+#: src/gtkui/settings.cc:35 src/qtui/settings.cc:59
+msgid "Always"
+msgstr "Alltid"
+
+#: src/gtkui/settings.cc:36 src/qtui/settings.cc:60
+msgid "Auto-hide"
+msgstr "Dölj automatiskt"
+
+#: src/gtkui/settings.cc:37 src/qtui/settings.cc:61
+msgid "Never"
+msgstr "Aldrig"
 
-#: src/gtkui/settings.cc:35
+#: src/gtkui/settings.cc:41 src/qtui/settings.cc:64
 msgid "Playlist Tabs"
-msgstr ""
+msgstr "Flikar i spellistan"
 
-#: src/gtkui/settings.cc:36
-msgid "Always show tabs"
-msgstr ""
+#: src/gtkui/settings.cc:42 src/qtui/settings.cc:65
+msgid "Show playlist tabs:"
+msgstr "Visa spellistflikar:"
 
-#: src/gtkui/settings.cc:38
+#: src/gtkui/settings.cc:45 src/qtui/settings.cc:69
 msgid "Show entry counts"
-msgstr ""
+msgstr "Visa inmatningsantal"
 
-#: src/gtkui/settings.cc:40
+#: src/gtkui/settings.cc:47 src/qtui/settings.cc:72
 msgid "Show close buttons"
-msgstr ""
+msgstr "Visa stäng-knappar"
 
-#: src/gtkui/settings.cc:42
+#: src/gtkui/settings.cc:49 src/qtui/settings.cc:75
 msgid "Playlist Columns"
-msgstr ""
+msgstr "Spellistskolumner"
 
-#: src/gtkui/settings.cc:44
+#: src/gtkui/settings.cc:51 src/qtui/settings.cc:77
 msgid "Show column headers"
-msgstr ""
+msgstr "Visa kolumnrubriker"
 
-#: src/gtkui/settings.cc:46 src/modplug/plugin_main.cc:106
-#: src/skins/skins_cfg.cc:263
-msgid "Miscellaneous"
-msgstr ""
+#: src/gtkui/settings.cc:53 src/qtui/settings.cc:82
+msgid "Make column headers clickable for sorting"
+msgstr "Gör kolumnrubriker klickbara för sortering"
 
-#: src/gtkui/settings.cc:47
-msgid "Arrow keys seek by:"
-msgstr ""
+#: src/gtkui/settings.cc:56
+msgid "Use symbolic icons in toolbar"
+msgstr "Använd symboliska ikoner i verktygsfältet"
 
-#: src/gtkui/settings.cc:50
+#: src/gtkui/settings.cc:58 src/qtui/settings.cc:86
 msgid "Scroll on song change"
-msgstr ""
+msgstr "Bläddra vid låtbyte"
 
-#: src/gtkui/ui_gtk.cc:71
+#: src/gtkui/ui_gtk.cc:82
 msgid "GTK Interface"
-msgstr "GTK Interface"
+msgstr "GTK-gränssnitt"
 
-#: src/gtkui/ui_gtk.cc:222 src/skins/ui_main.cc:232
+#: src/gtkui/ui_gtk.cc:219 src/skins/main.cc:228 src/skins-qt/main.cc:231
 #, c-format
 msgid "%s - Audacious"
 msgstr "%s - Audacious"
 
-#: src/gtkui/ui_gtk.cc:225 src/qtui/main_window.cc:186
+#: src/gtkui/ui_gtk.cc:221 src/moonstone/main_window.cc:184
+#: src/qtui/main_window.cc:385
 msgid "Buffering ..."
 msgstr "Buffrar ..."
 
-#: src/gtkui/ui_gtk.cc:228 src/skins/ui_main.cc:234 src/skins/ui_main.cc:1164
+#: src/gtkui/ui_gtk.cc:224 src/pipewire/pipewire.cc:402 src/skins/main.cc:230
+#: src/skins-qt/main.cc:233
 msgid "Audacious"
 msgstr "Audacious"
 
-#: src/gtkui/ui_statusbar.cc:63 src/qtui/status_bar.cc:67
+#: src/gtkui/ui_gtk.cc:487 src/gtkui/ui_gtk.cc:518 src/gtkui/ui_gtk.cc:882
+#: src/hotkey/gui.cc:72 src/moonstone/main_window.cc:67
+#: src/moonstone/main_window.cc:145 src/moonstone/main_window.cc:146
+#: src/notify/osd.cc:85 src/qthotkey/gui.cc:67 src/qtui/main_window.cc:154
+#: src/qtui/main_window.cc:347 src/qtui/main_window.cc:348
+#: src/skins/menus.cc:109 src/skins-qt/menus.cc:100
+msgid "Play"
+msgstr "Spela"
+
+#: src/gtkui/ui_gtk.cc:487 src/moonstone/main_window.cc:151
+#: src/moonstone/main_window.cc:152 src/notify/osd.cc:82
+#: src/qtui/main_window.cc:353 src/qtui/main_window.cc:354
+#: src/skins/menus.cc:110 src/skins-qt/menus.cc:101
+msgid "Pause"
+msgstr "Pausa"
+
+#: src/gtkui/ui_gtk.cc:868 src/moonstone/main_window.cc:57
+#: src/qtui/main_window.cc:145 src/skins/menus.cc:86 src/skins-qt/menus.cc:77
+msgid "Search Library"
+msgstr "Sök i bibliotek"
+
+#: src/gtkui/ui_gtk.cc:875 src/moonstone/main_window.cc:60
+#: src/qtui/main_window.cc:147
+msgid "Open Files"
+msgstr "Öppna filer"
+
+#: src/gtkui/ui_gtk.cc:876 src/moonstone/main_window.cc:62
+#: src/qtui/main_window.cc:149
+msgid "Add Files"
+msgstr "Lägg till filer"
+
+#: src/gtkui/ui_gtk.cc:881 src/moonstone/main_window.cc:65
+#: src/qtui/main_window.cc:152 src/skins/menus.cc:112 src/skins-qt/menus.cc:103
+msgid "Previous"
+msgstr "Föregående"
+
+#: src/gtkui/ui_gtk.cc:883 src/hotkey/gui.cc:74 src/moonstone/main_window.cc:69
+#: src/qthotkey/gui.cc:69 src/qtui/main_window.cc:156 src/skins/menus.cc:111
+#: src/skins-qt/menus.cc:102
+msgid "Stop"
+msgstr "Stoppa"
+
+#: src/gtkui/ui_gtk.cc:884 src/moonstone/main_window.cc:76 src/notify/osd.cc:89
+#: src/qtui/main_window.cc:163 src/skins/menus.cc:113 src/skins-qt/menus.cc:104
+msgid "Next"
+msgstr "Nästa"
+
+#: src/gtkui/ui_gtk.cc:886 src/moonstone/main_window.cc:79
+#: src/qtui/main_window.cc:166 src/qtui/menus.cc:254 src/skins/menus.cc:79
+#: src/skins-qt/menus.cc:69
+msgid "Record Stream"
+msgstr "Spela in ström"
+
+#: src/gtkui/ui_gtk.cc:919 src/moonstone/main_window.cc:86
+#: src/qtui/main_window.cc:173 src/skins/menus.cc:103 src/skins-qt/menus.cc:94
+msgid "Repeat"
+msgstr "Upprepa"
+
+#: src/gtkui/ui_gtk.cc:922 src/moonstone/main_window.cc:89
+#: src/qtui/main_window.cc:176 src/skins/menus.cc:104 src/skins-qt/menus.cc:95
+msgid "Shuffle"
+msgstr "Blanda"
+
+#: src/gtkui/ui_gtk.cc:1114 src/qtui/main_window.cc:123
+msgid "Menu"
+msgstr "Meny"
+
+#: src/gtkui/ui_statusbar.cc:64 src/qtui/status_bar.cc:155
 msgid "mono"
 msgstr "mono"
 
-#: src/gtkui/ui_statusbar.cc:65 src/qtui/status_bar.cc:69
+#: src/gtkui/ui_statusbar.cc:66 src/qtui/status_bar.cc:157
 msgid "stereo"
-msgstr "Stereo"
+msgstr "stereo"
 
-#: src/gtkui/ui_statusbar.cc:67 src/qtui/status_bar.cc:71
+#: src/gtkui/ui_statusbar.cc:68 src/qtui/status_bar.cc:160
 #, c-format
 msgid "%d channel"
 msgid_plural "%d channels"
-msgstr0 "%d kanal "
+msgstr0 "%d kanal"
 msgstr1 "%d kanaler"
 
-#: src/gtkui/ui_statusbar.cc:81 src/qtui/status_bar.cc:85
+#: src/gtkui/ui_statusbar.cc:76 src/qtui/status_bar.cc:168
 #, c-format
-msgid "%d kbps"
-msgstr "%d kbps"
+msgid "%d kHz"
+msgstr "%d kHz"
 
-#: src/gtkui/ui_statusbar.cc:107 src/skins/ui_main_evlisteners.cc:103
+#: src/gtkui/ui_statusbar.cc:82 src/qtui/status_bar.cc:174
+#, c-format
+msgid "%d kbit/s"
+msgstr "%d kbit/s"
+
+#: src/gtkui/ui_statusbar.cc:108 src/skins/main.cc:478 src/skins-qt/main.cc:461
 msgid "Single mode."
-msgstr ""
+msgstr "Singelläge."
 
-#: src/gtkui/ui_statusbar.cc:109 src/skins/ui_main_evlisteners.cc:105
+#: src/gtkui/ui_statusbar.cc:110 src/skins/main.cc:480 src/skins-qt/main.cc:463
 msgid "Playlist mode."
-msgstr ""
+msgstr "Spellistsläge"
 
-#: src/gtkui/ui_statusbar.cc:117 src/skins/ui_main_evlisteners.cc:111
+#: src/gtkui/ui_statusbar.cc:118 src/skins/main.cc:486 src/skins-qt/main.cc:469
 msgid "Stopping after song."
-msgstr ""
+msgstr "Stoppar efter låt."
 
-#: src/hotkey/gui.cc:71
+#: src/hotkey/gui.cc:71 src/qthotkey/gui.cc:66
 msgid "Previous track"
-msgstr "Förra låten"
+msgstr "Föregående spår"
 
-#: src/hotkey/gui.cc:72 src/notify/osd.cc:69 src/qtui/main_window.cc:69
-#: src/qtui/main_window.cc:172 src/qtui/main_window.cc:173
-#: src/skins/menus.cc:87
-msgid "Play"
-msgstr "Spela"
-
-#: src/hotkey/gui.cc:73
+#: src/hotkey/gui.cc:73 src/qthotkey/gui.cc:68
 msgid "Pause/Resume"
-msgstr "Pausa/Fortsätta"
+msgstr "Pausa/Återuppta"
 
-#: src/hotkey/gui.cc:74 src/qtui/main_window.cc:70 src/skins/menus.cc:89
-msgid "Stop"
-msgstr "Stoppa"
-
-#: src/hotkey/gui.cc:75
+#: src/hotkey/gui.cc:75 src/qthotkey/gui.cc:70
 msgid "Next track"
-msgstr "Nästa låt"
+msgstr "Nästa spår"
 
-#: src/hotkey/gui.cc:76
-msgid "Forward 5 seconds"
-msgstr "Spola fram 5 sekunder"
+#: src/hotkey/gui.cc:76 src/qthotkey/gui.cc:71
+msgid "Step forward"
+msgstr "Steg framåt"
 
-#: src/hotkey/gui.cc:77
-msgid "Rewind 5 seconds"
-msgstr "Spola bakåt 5 sekunder"
+#: src/hotkey/gui.cc:77 src/qthotkey/gui.cc:72
+msgid "Step backward"
+msgstr "Steg bakåt"
 
-#: src/hotkey/gui.cc:78
+#: src/hotkey/gui.cc:78 src/qthotkey/gui.cc:73
 msgid "Mute"
-msgstr ""
+msgstr "Ljud av"
 
-#: src/hotkey/gui.cc:79
+#: src/hotkey/gui.cc:79 src/qthotkey/gui.cc:74
 msgid "Volume up"
-msgstr "Volym Upp"
+msgstr "Volym upp"
 
-#: src/hotkey/gui.cc:80
+#: src/hotkey/gui.cc:80 src/qthotkey/gui.cc:75
 msgid "Volume down"
-msgstr "Volym Ner"
+msgstr "Volym ner"
 
-#: src/hotkey/gui.cc:81
+#: src/hotkey/gui.cc:81 src/qthotkey/gui.cc:76
 msgid "Jump to file"
 msgstr "Hoppa till fil"
 
-#: src/hotkey/gui.cc:82
+#: src/hotkey/gui.cc:82 src/qthotkey/gui.cc:77
 msgid "Toggle player window(s)"
-msgstr ""
+msgstr "Växla spelarfönster"
 
-#: src/hotkey/gui.cc:83
+#: src/hotkey/gui.cc:83 src/qthotkey/gui.cc:78
 msgid "Show On-Screen-Display"
-msgstr ""
+msgstr "Visa On-Screen-Display"
 
-#: src/hotkey/gui.cc:84
+#: src/hotkey/gui.cc:84 src/qthotkey/gui.cc:79
 msgid "Toggle repeat"
-msgstr ""
+msgstr "Växla upprepa"
 
-#: src/hotkey/gui.cc:85
+#: src/hotkey/gui.cc:85 src/qthotkey/gui.cc:80
 msgid "Toggle shuffle"
-msgstr ""
+msgstr "Växla blandning"
 
-#: src/hotkey/gui.cc:86
+#: src/hotkey/gui.cc:86 src/qthotkey/gui.cc:81
 msgid "Toggle stop after current"
-msgstr ""
+msgstr "Växla stoppa efter aktuell"
 
-#: src/hotkey/gui.cc:87
+#: src/hotkey/gui.cc:87 src/qthotkey/gui.cc:82
 msgid "Raise player window(s)"
-msgstr ""
+msgstr "Höja spelarfönster"
 
-#: src/hotkey/gui.cc:97
+#: src/hotkey/gui.cc:98 src/qthotkey/gui.cc:100
 msgid "(none)"
 msgstr "(ingen)"
 
-#: src/hotkey/gui.cc:234
+#: src/hotkey/gui.cc:261
 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 modifiers.\n"
 "\n"
 "Do you want to continue?"
 msgstr ""
+"Det rekommenderas inte att binda de primära musknapparna utan modifierare.\n"
+"\n"
+"Vill du fortsätta?"
 
-#: src/hotkey/gui.cc:236
+#: src/hotkey/gui.cc:264
 msgid "Binding mouse buttons"
-msgstr ""
+msgstr "Binder musknappar"
 
-#: src/hotkey/gui.cc:391
+#: src/hotkey/gui.cc:434
 msgid ""
 "Press a key combination inside a text field.\n"
 "You can also bind mouse buttons."
 msgstr ""
+"Tryck en tangentkombination i ett textfält.\n"
+"Du kan också binda musknapparna."
 
-#: src/hotkey/gui.cc:396
+#: src/hotkey/gui.cc:444 src/qthotkey/gui.cc:179
 msgid "Hotkeys:"
-msgstr ""
+msgstr "Snabbtangenter:"
 
-#: src/hotkey/gui.cc:413
+#: src/hotkey/gui.cc:457 src/qthotkey/gui.cc:181
 msgid "Action:"
-msgstr ""
+msgstr "Åtgärd:"
 
-#: src/hotkey/gui.cc:420
+#: src/hotkey/gui.cc:461 src/qthotkey/gui.cc:182
 msgid "Key Binding:"
-msgstr ""
+msgstr "Tangentbindning:"
 
-#: src/hotkey/gui.cc:468
+#: src/hotkey/gui.cc:518 src/qthotkey/gui.cc:184
 msgid "_Add"
 msgstr "_Lägg till"
 
-#: src/hotkey/plugin.cc:61
+#: src/hotkey/plugin.cc:59 src/qthotkey/plugin.cc:78
 msgid "Global Hotkeys"
-msgstr ""
+msgstr "Globala snabbtangenter"
 
-#: src/hotkey/plugin.cc:79
+#: src/hotkey/plugin.cc:74
 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"
+"Contributors 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 Plugin\n"
+"Styr spelaren med globala tangentkombinationer eller multimediatangenter.\n"
+"\n"
+"\n"
+"Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n"
+"\n"
+"Bidragsgivare inkluderar:\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/jack-ng/jack-ng.cc:49
+#: src/jack/jack-ng.cc:54
 msgid "JACK Output"
-msgstr ""
+msgstr "JACK-utgång"
+
+#: src/jack/jack-ng.cc:126
+msgid "Client name:"
+msgstr "Klientnamn:"
 
-#: src/jack-ng/jack-ng.cc:114
+#: src/jack/jack-ng.cc:128
 msgid "Automatically connect to output ports"
-msgstr ""
+msgstr "Anslut automatiskt till utgångsportar"
+
+#: src/jack/jack-ng.cc:130
+msgid "Filter ports (regex, use any port if blank):"
+msgstr "Filterportar (regex, använd vilken port som helst om den är tom):"
+
+#: src/jack/jack-ng.cc:136
+msgid "Connect to physical ports only"
+msgstr "Anslut endast till fysiska portar"
+
+#: src/jack/jack-ng.cc:139
+msgid "Upmix to"
+msgstr "Upmix till"
 
-#: src/jack-ng/jack-ng.cc:155
+#: src/jack/jack-ng.cc:141
+msgid "ports if input has fewer channels"
+msgstr "portar om ingången har färre kanaler"
+
+#: src/jack/jack-ng.cc:143
+msgid "Ignore insufficient number of ports"
+msgstr "Ignorera otillräckligt antal portar"
+
+#: src/jack/jack-ng.cc:181
+msgid "No JACK output ports were found. Please check settings."
+msgstr "Inga JACK-utgångsportar hittades. Kontrollera inställningarna."
+
+#: src/jack/jack-ng.cc:195
 #, c-format
 msgid "Only %d JACK output ports were found but %d are required."
-msgstr ""
+msgstr "Endast %d JACK-utgångsportar hittades men %d krävs."
 
-#: src/jack-ng/jack-ng.cc:164
+#: src/jack/jack-ng.cc:210
 #, c-format
 msgid "Failed to connect to JACK port %s."
-msgstr ""
+msgstr "Misslyckades med att ansluta till JACK-port %s."
 
-#: src/jack-ng/jack-ng.cc:184
+#: src/jack/jack-ng.cc:230
 msgid ""
 "JACK supports only floating-point audio. You must change the output bit "
 "depth to floating-point in Audacious settings."
 msgstr ""
+"JACK stöder endast flyttal-ljud. Du måste ändra utmatningsbitdjupet till "
+"flyttal i Audacious-inställningar."
 
-#: src/jack-ng/jack-ng.cc:197
+#: src/jack/jack-ng.cc:245
 msgid "Failed to connect to the JACK server; is it running?"
-msgstr ""
+msgstr "Misslyckades med att ansluta till JACK-server; körs den?"
 
-#: src/jack-ng/jack-ng.cc:273
+#: src/jack/jack-ng.cc:321
 #, c-format
 msgid ""
 "The JACK server requires a sample rate of %d Hz, but Audacious is playing at "
 "%d Hz. Please use the Sample Rate Converter effect to correct the mismatch."
 msgstr ""
+"JACK-servern kräver en samplingshastighet på %d Hz, men Audacious spelar på "
+"%d Hz. Använd Sample Rate Converter-effekten för att korrigera "
+"felmatchningen."
 
-#: src/ladspa/plugin.cc:414
+#: src/ladspa/plugin.cc:416
 #, c-format
 msgid "%s Settings"
-msgstr ""
+msgstr "%s-inställningar"
 
-#: src/ladspa/plugin.cc:478
+#: src/ladspa/plugin.cc:482
 msgid "Module paths:"
-msgstr ""
+msgstr "Modulsökvägar:"
 
-#: src/ladspa/plugin.cc:483
+#: src/ladspa/plugin.cc:487
 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 ""
+"Separera flera sökvägar med ett kolon.\n"
+"Dessa sökvägar söks utöver LADSPA_PATH.\n"
+"Efter att nya sökvägar lagts till, trycka på Enter för att skanna efter nya "
+"insticksmoduler."
 
-#: src/ladspa/plugin.cc:499
+#: src/ladspa/plugin.cc:508
 msgid "Available plugins:"
-msgstr ""
+msgstr "Tillgängliga insticksmoduler:"
 
-#: src/ladspa/plugin.cc:512 src/modplug/plugin_main.cc:92
-#: src/modplug/plugin_main.cc:95 src/modplug/plugin_main.cc:98
-#: src/modplug/plugin_main.cc:101
+#: src/ladspa/plugin.cc:521 src/modplug/plugin_main.cc:91
+#: src/modplug/plugin_main.cc:94 src/modplug/plugin_main.cc:97
+#: src/modplug/plugin_main.cc:100
 msgid "Enable"
-msgstr ""
+msgstr "Aktivera"
 
-#: src/ladspa/plugin.cc:518
+#: src/ladspa/plugin.cc:527
 msgid "Enabled plugins:"
-msgstr ""
+msgstr "Aktiverade insticksmoduler:"
 
-#: src/ladspa/plugin.cc:534
+#: src/ladspa/plugin.cc:543
 msgid "Settings"
 msgstr "Inställningar"
 
-#: src/ladspa/plugin.cc:551
+#: src/ladspa/plugin.cc:560
 msgid ""
 "LADSPA Host for Audacious\n"
 "Copyright 2011 John Lindgren"
 msgstr ""
+"LADSPA Host för Audacious\n"
+"Copyright 2011 John Lindgren"
 
 #: src/ladspa/plugin.h:78
 msgid "LADSPA Host"
-msgstr ""
+msgstr "LADSPA Host"
 
 #: src/lirc/lirc.cc:55
 msgid "LIRC Plugin"
-msgstr ""
+msgstr "LIRC Plugin"
 
-#: src/lirc/lirc.cc:381
+#: src/lirc/lirc.cc:379
 msgid ""
 "A simple plugin to control Audacious using the LIRC remote control daemon\n"
 "\n"
@@ -2139,82 +2441,155 @@
 "\n"
 "For more information about LIRC, see http://lirc.org."
 msgstr ""
+"En enkel insticksmodul för att styra Audacious med LIRC-"
+"fjärrkontrolldemonen\n"
+"\n"
+"Anpassad för Audacious av:\n"
+"Tony Vroon <chainsaw@gentoo.org>\n"
+"Joonas Harjumäki <jharjuma@gmail.com>\n"
+"\n"
+"Baserat på XMMS LIRC-insticksmodulen av:\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 mer information om LIRC, se http://lirc.org."
 
-#: src/lirc/lirc.cc:392
+#: src/lirc/lirc.cc:390
 msgid "Connection"
-msgstr ""
+msgstr "Anslutning"
 
-#: src/lirc/lirc.cc:393
+#: src/lirc/lirc.cc:391
 msgid "Reconnect to LIRC server"
-msgstr ""
+msgstr "Återanslut till LIRC-server"
 
-#: src/lirc/lirc.cc:395
+#: src/lirc/lirc.cc:393
 msgid "Wait before reconnecting:"
-msgstr ""
+msgstr "Vänta innan du ansluter igen:"
 
-#: src/lyricwiki/lyricwiki.cc:41
-msgid "LyricWiki Plugin"
-msgstr ""
-
-#: src/lyricwiki/lyricwiki.cc:131 src/lyricwiki-qt/lyricwiki.cc:136
-msgid "No lyrics available"
-msgstr ""
-
-#: src/lyricwiki/lyricwiki.cc:217 src/lyricwiki/lyricwiki.cc:226
-#: src/lyricwiki/lyricwiki.cc:243 src/lyricwiki/lyricwiki.cc:252
-#: src/lyricwiki/lyricwiki.cc:267 src/lyricwiki-qt/lyricwiki.cc:222
-#: src/lyricwiki-qt/lyricwiki.cc:231 src/lyricwiki-qt/lyricwiki.cc:248
-#: src/lyricwiki-qt/lyricwiki.cc:257 src/lyricwiki-qt/lyricwiki.cc:272
-msgid "Error"
-msgstr "Fel"
-
-#: src/lyricwiki/lyricwiki.cc:218 src/lyricwiki/lyricwiki.cc:244
-#: src/lyricwiki-qt/lyricwiki.cc:223 src/lyricwiki-qt/lyricwiki.cc:249
+#: src/lyrics-common/chart_lyrics_provider.cc:93
+#: src/lyrics-common/chart_lyrics_provider.cc:150
+#: src/lyrics-common/lyrics_ovh_provider.cc:50
 #, c-format
 msgid "Unable to fetch %s"
-msgstr ""
+msgstr "Det gick inte att hämta %s"
 
-#: src/lyricwiki/lyricwiki.cc:227 src/lyricwiki/lyricwiki.cc:253
-#: src/lyricwiki-qt/lyricwiki.cc:232 src/lyricwiki-qt/lyricwiki.cc:258
+#: src/lyrics-common/chart_lyrics_provider.cc:100
+#: src/lyrics-common/chart_lyrics_provider.cc:157
+#: src/lyrics-common/lyrics_ovh_provider.cc:57
 #, c-format
 msgid "Unable to parse %s"
-msgstr ""
+msgstr "Kan inte tolka %s"
 
-#: src/lyricwiki/lyricwiki.cc:259 src/lyricwiki-qt/lyricwiki.cc:264
+#: src/lyrics-common/chart_lyrics_provider.cc:121
+#: src/lyrics-common/chart_lyrics_provider.cc:194
+#: src/lyrics-common/lyrics_ovh_provider.cc:88
 msgid "Looking for lyrics ..."
-msgstr ""
+msgstr "Letar efter låttexter ..."
 
-#: src/lyricwiki/lyricwiki.cc:267 src/lyricwiki-qt/lyricwiki.cc:272
-msgid "Missing song metadata"
-msgstr ""
+#: src/lyrics-common/preferences.h:43
+msgid "Nowhere"
+msgstr "Ingenstans"
 
-#: src/lyricwiki/lyricwiki.cc:278 src/lyricwiki-qt/lyricwiki.cc:283
-msgid "Connecting to lyrics.wikia.com ..."
-msgstr ""
+#: src/lyrics-common/preferences.h:49
+msgid "Artist is truncated at the start, Title -- at the end"
+msgstr "Artist är avkortad i början, Titel -- i slutet"
 
-#: src/lyricwiki-qt/lyricwiki.cc:55
-msgid "LyricWiki Plugin (Qt)"
-msgstr ""
+#: src/lyrics-common/preferences.h:50
+msgid "Chars to truncate on:"
+msgstr "Tecken att avkorta vid:"
+
+#: src/lyrics-common/preferences.h:54
+msgid "Chars are ORed in RegExp, surrounded by whitespace"
+msgstr "Tecken är ORed i RegExp, omgivet av mellanrum"
+
+#: src/lyrics-common/preferences.h:55
+msgid "Chars to split on:"
+msgstr "Tecken att uppdela vid: "
+
+#: src/lyrics-common/preferences.h:56
+msgid "Further truncate those on chars"
+msgstr "Ytterligare avkorta vid dessa tecken"
+
+#: src/lyrics-common/preferences.h:62
+msgid "General"
+msgstr "Allmänt"
+
+#: src/lyrics-common/preferences.h:63
+msgid "Split title into artist and title on chars"
+msgstr "Dela upp titel i artist och titel vid tecken"
+
+#: src/lyrics-common/preferences.h:66
+msgid "Sources"
+msgstr "Källor"
 
-#: src/m3u/m3u.cc:32
+#: src/lyrics-common/preferences.h:67
+msgid "Use embedded lyrics (from Lyrics tag)"
+msgstr "Använd inbäddade sångtexter (från Låttexter-taggen)"
+
+#: src/lyrics-common/preferences.h:69
+msgid "Fetch lyrics from internet:"
+msgstr "Hämta låttexter från internet:"
+
+#: src/lyrics-common/preferences.h:72
+msgid "Store fetched lyrics in local cache"
+msgstr "Lagra hämtade låttexter i lokal cache"
+
+#: src/lyrics-common/preferences.h:74
+msgid "Local Storage"
+msgstr "Lokal lagring"
+
+#: src/lyrics-common/preferences.h:75
+msgid "Load lyric files (.lrc) from local storage"
+msgstr "Läs in låttext-filer (.lrc) från lokal lagring"
+
+#: src/lyrics-common/utils.cc:54 src/ui-common/dialogs-qt.cc:63
+msgid "Error"
+msgstr "Fel"
+
+#: src/lyrics-common/utils.cc:60
+msgid "Lyrics could not be found."
+msgstr "Låttexter kunde inte hittas."
+
+#: src/lyrics-common/utils.cc:142
+msgid "Missing title and/or artist."
+msgstr "Saknar titel och/eller artist."
+
+#: src/lyrics-gtk/lyrics-gtk.cc:37 src/lyrics-qt/lyrics-qt.cc:50
+msgid "Lyrics"
+msgstr "Låttexter"
+
+#: src/lyrics-gtk/lyrics-gtk.cc:189 src/lyrics-qt/lyrics-qt.cc:171
+msgid "Edit Lyrics ..."
+msgstr "Redigera låttexter ..."
+
+#: src/lyrics-gtk/lyrics-gtk.cc:195 src/lyrics-qt/lyrics-qt.cc:178
+msgid "Save Locally"
+msgstr "Spara lokalt"
+
+#: src/lyrics-gtk/lyrics-gtk.cc:201 src/lyrics-qt/lyrics-qt.cc:186
+msgid "Refresh"
+msgstr "Uppdatera"
+
+#: src/m3u/m3u.cc:33
 msgid "M3U Playlists"
-msgstr ""
+msgstr "M3U-spellistor"
 
 #: src/metronom/metronom.cc:44
 msgid "Tact Generator"
-msgstr ""
+msgstr "Taktgenerator"
 
-#: src/metronom/metronom.cc:147
+#: src/metronom/metronom.cc:145
 #, c-format
 msgid "Tact generator: %d bpm"
-msgstr ""
+msgstr "Taktgenerator: %d slag/minut"
 
-#: src/metronom/metronom.cc:149
+#: src/metronom/metronom.cc:147
 #, c-format
 msgid "Tact generator: %d bpm %d/%d"
-msgstr ""
+msgstr "Taktgenerator: %d slag/minut %d/%d"
 
-#: src/metronom/metronom.cc:237
+#: src/metronom/metronom.cc:235
 msgid ""
 "A Tact Generator by Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
 "\n"
@@ -2222,195 +2597,210 @@
 "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"
+"För att använda det, lägg till en webbadress: tact://beats*num/den\n"
+"t.ex. tact://77 för att spela 77 slag per minut\n"
+"eller tact://60*3/4 för att spela 60 slag per minut i 3/4 takt"
 
-#: src/mixer/mixer.cc:38
+#: src/mixer/mixer.cc:43
 msgid "Channel Mixer"
-msgstr ""
+msgstr "Kanalblandare"
 
-#: src/mixer/mixer.cc:202
+#: src/mixer/mixer.cc:255
 msgid ""
 "Channel Mixer Plugin for Audacious\n"
 "Copyright 2011-2012 John Lindgren and Michał Lipski"
 msgstr ""
+"Channel Mixer Plugin för Audacious\n"
+"Copyright 2011-2012 John Lindgren och Michał Lipski"
 
-#: src/mixer/mixer.cc:206
+#: src/mixer/mixer.cc:259
 msgid "Channel Mixer"
-msgstr ""
+msgstr "Kanalblandare"
 
-#: src/mixer/mixer.cc:207
+#: src/mixer/mixer.cc:260
 msgid "Output channels:"
-msgstr ""
+msgstr "Utgångskanaler:"
 
 #: src/mms/mms.cc:35
 msgid "MMS Plugin"
-msgstr ""
+msgstr "MMS Plugin"
 
 #: src/mms/mms.cc:82
 msgid "Error connecting to MMS server"
-msgstr ""
+msgstr "Det gick inte att ansluta till MMS-server"
 
-#: src/modplug/modplugbmp.h:53
+#: src/modplug/modplugbmp.h:57
 msgid "ModPlug (Module Player)"
-msgstr ""
-
-#: src/modplug/plugin_main.cc:53
-msgid "Resolution"
-msgstr ""
-
-#: src/modplug/plugin_main.cc:54
-msgid "8-bit"
-msgstr ""
+msgstr "ModPlug (Modulspelare)"
 
 #: src/modplug/plugin_main.cc:55
-msgid "16-bit"
-msgstr ""
-
-#: src/modplug/plugin_main.cc:56
 msgid "Channels"
-msgstr ""
+msgstr "Kanaler"
 
-#: src/modplug/plugin_main.cc:60
+#: src/modplug/plugin_main.cc:59
 msgid "Nearest (fastest)"
-msgstr ""
+msgstr "Närmaste (snabbaste)"
 
-#: src/modplug/plugin_main.cc:61
+#: src/modplug/plugin_main.cc:60
 msgid "Linear (fast)"
-msgstr ""
+msgstr "Linjär (snabb)"
 
-#: src/modplug/plugin_main.cc:62
+#: src/modplug/plugin_main.cc:61
 msgid "Spline (good)"
-msgstr ""
+msgstr "Spline (bra)"
 
-#: src/modplug/plugin_main.cc:63
+#: src/modplug/plugin_main.cc:62
 msgid "Polyphase (best)"
-msgstr ""
+msgstr "Polyfas (bäst)"
 
-#: src/modplug/plugin_main.cc:64
+#: src/modplug/plugin_main.cc:63
 msgid "Sample rate"
-msgstr ""
+msgstr "Samplingshastighet"
 
-#: src/modplug/plugin_main.cc:65
+#: src/modplug/plugin_main.cc:64
 msgid "22 kHz"
 msgstr "22 kHz"
 
-#: src/modplug/plugin_main.cc:66
+#: src/modplug/plugin_main.cc:65
 msgid "44 kHz"
 msgstr "44 kHz"
 
-#: src/modplug/plugin_main.cc:67
+#: src/modplug/plugin_main.cc:66
 msgid "48 kHz"
 msgstr "48 kHz"
 
-#: src/modplug/plugin_main.cc:68
+#: src/modplug/plugin_main.cc:67
 msgid "96 kHz"
 msgstr "96 kHz"
 
-#: src/modplug/plugin_main.cc:72 src/modplug/plugin_main.cc:77
-#: src/modplug/plugin_main.cc:82
+#: src/modplug/plugin_main.cc:71 src/modplug/plugin_main.cc:76
+#: src/modplug/plugin_main.cc:81
 msgid "Level:"
 msgstr "Nivå:"
 
-#: src/modplug/plugin_main.cc:78
+#: src/modplug/plugin_main.cc:77
 msgid "Cutoff:"
-msgstr ""
+msgstr "Avbrytare:"
 
-#: src/modplug/plugin_main.cc:91
+#: src/modplug/plugin_main.cc:90
 msgid "Reverb"
 msgstr "Reverb"
 
-#: src/modplug/plugin_main.cc:94
+#: src/modplug/plugin_main.cc:93
 msgid "Bass Boost"
-msgstr "Bass Boost"
+msgstr "Basförstärkning"
 
-#: src/modplug/plugin_main.cc:97
+#: src/modplug/plugin_main.cc:96
 msgid "Surround"
 msgstr "Surround"
 
-#: src/modplug/plugin_main.cc:100
+#: src/modplug/plugin_main.cc:99
 msgid "Preamp"
-msgstr ""
+msgstr "Förförstärkare"
 
-#: src/modplug/plugin_main.cc:107
+#: src/modplug/plugin_main.cc:106
 msgid "Oversample"
-msgstr ""
+msgstr "Översampling"
 
-#: src/modplug/plugin_main.cc:108
+#: src/modplug/plugin_main.cc:107
 msgid "Noise reduction"
-msgstr ""
+msgstr "Brusreducering"
 
-#: src/modplug/plugin_main.cc:109
+#: src/modplug/plugin_main.cc:108
 msgid "Play Amiga MODs"
-msgstr "Spela Amiga Moduler"
+msgstr "Spela Amiga MODs"
 
-#: src/modplug/plugin_main.cc:110
+#: src/modplug/plugin_main.cc:109
 msgid "Repeat"
-msgstr ""
+msgstr "Upprepa"
 
-#: src/modplug/plugin_main.cc:111
+#: src/modplug/plugin_main.cc:110
 msgid "Repeat count:"
-msgstr ""
+msgstr "Upprepningsantal:"
 
-#: src/modplug/plugin_main.cc:112
+#: src/modplug/plugin_main.cc:111
 msgid "To repeat forever, set the repeat count to -1."
-msgstr ""
+msgstr "För att upprepa för evigt, ställ in upprepningsantalet till -1."
 
-#: src/modplug/plugin_main.cc:125 src/sid/xs_config.cc:106
+#: src/modplug/plugin_main.cc:124 src/sid/xs_config.cc:106
 msgid "These settings will take effect when Audacious is restarted."
-msgstr ""
+msgstr "Dessa inställningar träder i kraft när Audacious startas om."
+
+#: src/moonstone/main_window.cc:72 src/moonstone/main_window.cc:73
+#: src/qtui/main_window.cc:159 src/qtui/main_window.cc:160
+#: src/skins/menus.cc:107 src/skins-qt/menus.cc:98
+msgid "Stop After This Song"
+msgstr "Sluta efter den här låten"
+
+#: src/moonstone/moonstone.cc:39
+msgid "Moonstone"
+msgstr "Månsten"
+
+#: src/moonstone/playlist_header.cc:212 src/qtui/playlist_header.cc:258
+msgid "Reset to Defaults"
+msgstr "Återställ till standardvärden"
+
+#: src/moonstone/playlist_model.cc:38 src/qtui/playlist_header.cc:232
+msgid "Now Playing"
+msgstr "Spelar nu"
+
+#: src/moonstone/playlist_selection.cc:66
+#: src/playlist-manager/playlist-manager.cc:201
+#: src/playlist-manager-qt/playlist-manager-qt.cc:190
+msgid "Entries"
+msgstr "Poster"
 
 #: src/mpg123/mpg123.cc:54
 msgid "MPG123 Plugin"
 msgstr "MPG123 Plugin"
 
-#: src/mpg123/mpg123.cc:83
-msgid "Advanced"
-msgstr " Avancerat "
-
-#: src/mpg123/mpg123.cc:84
+#: src/mpg123/mpg123.cc:82
 msgid "Use accurate length calculation (slow)"
-msgstr ""
+msgstr "Använd exakt längdberäkning (långsam)"
 
-#: src/mpg123/mpg123.cc:248
+#: src/mpg123/mpg123.cc:260
 msgid "Surround"
 msgstr "Surround"
 
-#: src/mpris2/plugin.cc:39
+#: src/mpris2/plugin.cc:40
 msgid "MPRIS 2 Server"
 msgstr "MPRIS 2 Server"
 
-#: src/neon/neon.cc:97
+#: src/neon/neon.cc:102
 msgid "Neon HTTP/HTTPS Plugin"
 msgstr "Neon HTTP/HTTPS Plugin"
 
-#: src/neon/neon.cc:521
+#: src/neon/neon.cc:526
 msgid "Error parsing redirect"
-msgstr ""
+msgstr "Fel vid tolkning av omdirigering"
 
-#: src/neon/neon.cc:535
+#: src/neon/neon.cc:540
 msgid "Unknown HTTP error"
-msgstr ""
+msgstr "Okänt HTTP-fel"
 
-#: src/neon/neon.cc:569
+#: src/neon/neon.cc:614
 msgid "Error parsing URL"
-msgstr ""
+msgstr "Det gick inte att tolka webbadressen"
 
-#: src/neon/neon.cc:632
+#: src/neon/neon.cc:687
 msgid "Too many redirects"
-msgstr ""
+msgstr "För många omdirigeringar"
 
-#: src/notify/event.cc:64
+#: src/notify/event.cc:97
 msgid "Stopped"
 msgstr "Stoppad"
 
-#: src/notify/event.cc:64
+#: src/notify/event.cc:97
 msgid "Audacious is not playing."
-msgstr ""
+msgstr "Audacious spelar inte."
 
-#: src/notify/notify.cc:42
+#: src/notify/notify.cc:39
 msgid "Desktop Notifications"
-msgstr ""
+msgstr "Skrivbordsaviseringar"
 
-#: src/notify/notify.cc:60
+#: src/notify/notify.cc:57
 msgid ""
 "Desktop Notifications Plugin for Audacious\n"
 "Copyright (C) 2010 Maximilian Bogner\n"
@@ -2429,65 +2819,127 @@
 "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 för Audacious\n"
+"Copyright (C) 2010 Maximilian Bogner\n"
+"Copyright (C) 2011-2013 John Lindgren och 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.cc:110
+#: src/notify/notify.cc:104
 msgid "Show playback controls"
-msgstr ""
+msgstr "Visa uppspelningskontroller"
 
-#: src/notify/notify.cc:112
+#: src/notify/notify.cc:106
 msgid "Always show notification"
-msgstr ""
+msgstr "Visa alltid aviseringar"
 
-#: src/notify/notify.cc:114
+#: src/notify/notify.cc:108
 msgid "Include album name in notification"
-msgstr ""
+msgstr "Inkludera albumnamn i aviseringar"
 
-#: src/notify/osd.cc:58
+#: src/notify/notify.cc:110
+msgid "Custom notification duration:"
+msgstr "Anpassad aviseringstid:"
+
+#: src/notify/osd.cc:74
 msgid "Show"
 msgstr "Visa"
 
-#: src/notify/osd.cc:66 src/qtui/main_window.cc:178
-#: src/qtui/main_window.cc:179 src/skins/menus.cc:88
-msgid "Pause"
-msgstr "Pause"
+#: src/openmpt/mpt.cc:50
+msgid "OpenMPT (Module Player)"
+msgstr "OpenMPT (Modulspelare)"
 
-#: src/notify/osd.cc:73 src/qtui/main_window.cc:72 src/skins/menus.cc:91
-msgid "Next"
-msgstr "Nästa"
+#: src/openmpt/mpt.cc:132
+msgid ""
+"Module player based on libopenmpt\n"
+"\n"
+"Written by: Chris Spiegel <cspiegel@gmail.com>"
+msgstr ""
+"Modulspelare baserad på libopenmpt\n"
+"\n"
+"Skriven av: Chris Spiegel <cspiegel@gmail.com>"
 
-#: src/oss4/oss.h:93
-msgid "OSS4 Output"
+#: src/openmpt/mpt.cc:151
+msgid "Stereo separation:"
+msgstr "Stereo separation:"
+
+#: src/openmpt/mpt.cc:153
+msgid "% (0=mono, 100=default, 200=full)"
+msgstr "% (0=mono, 100=standard, 200=fullständig)"
+
+#: src/openmpt/mpt.cc:157
+msgid "Interpolation:"
+msgstr "Interpolation:"
+
+#: src/openmpt/mptwrap.h:51 src/soxr/sox-resampler.cc:189 src/xsf/plugin.cc:437
+msgid "Linear"
+msgstr "Linjär"
+
+#: src/openmpt/mptwrap.h:52
+msgid "Cubic"
+msgstr "Kubisk"
+
+#: src/openmpt/mptwrap.h:53
+msgid "Windowed sinc"
+msgstr "Fönsterfönster"
+
+#: src/opus/opus.cc:39
+msgid "Opus Decoder"
+msgstr "Opus-avkodare"
+
+#: src/opus/opus.cc:336
+msgid ""
+"Opus Decoder Plugin for Audacious\n"
+"Copyright 2022 Thomas Lange"
 msgstr ""
+"Opus avkodare Plugin för Audacious\n"
+"Copyright 2022 Thomas Lange\n"
+" "
+
+#: src/oss4/oss.h:70
+msgid "OSS4 Output"
+msgstr "OSS4-utgång"
 
-#: src/oss4/oss.h:95
+#: src/oss4/oss.h:72
 msgid "OSS3 Output"
-msgstr ""
+msgstr "OSS3-utgång"
 
 #: src/oss4/plugin.cc:35
 msgid "Default device"
-msgstr ""
+msgstr "Standardenhet"
 
-#: src/oss4/plugin.cc:77
+#: src/oss4/plugin.cc:78
 msgid "Audio device:"
-msgstr ""
+msgstr "Ljudenhet:"
 
-#: src/oss4/plugin.cc:80
+#: src/oss4/plugin.cc:81
 msgid "Use alternate device:"
-msgstr ""
+msgstr "Använd alternativ enhet:"
 
-#: src/oss4/plugin.cc:84
+#: src/oss4/plugin.cc:85
 msgid "Save volume between sessions."
-msgstr ""
+msgstr "Spara volymen mellan sessionerna."
 
-#: src/oss4/plugin.cc:86
+#: src/oss4/plugin.cc:87
 msgid "Enable format conversions made by the OSS software."
-msgstr ""
+msgstr "Aktivera formatkonverteringar som gjorts av OSS-programvaran."
 
-#: src/oss4/plugin.cc:88
+#: src/oss4/plugin.cc:89
 msgid "Enable exclusive mode to prevent virtual mixing."
-msgstr ""
+msgstr "Aktivera exklusivt läge för att förhindra virtuell blandning."
 
-#: src/oss4/plugin.cc:100
+#: src/oss4/plugin.cc:101
 msgid ""
 "OSS4 Output Plugin for Audacious\n"
 "Copyright 2010-2012 Michał Lipski\n"
@@ -2495,60 +2947,116 @@
 "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 för Audacious\n"
+"Copyright 2010-2012 Michał Lipski\n"
+"\n"
+"Jag skulle vilja tacka folk på #audacious, särskilt Tony Vroon och John "
+"Lindgren och naturligtvis författarna till den tidigare OSS-insticksmodulen."
 
-#: src/playlist-manager/playlist-manager.cc:37
-msgid "Playlist Manager"
-msgstr ""
+#: src/pipewire/pipewire.cc:44
+msgid "PipeWire Output"
+msgstr "Pipewire utgång"
 
-#: src/playlist-manager/playlist-manager.cc:226
-msgid "Entries"
+#: src/pipewire/pipewire.cc:118
+msgid ""
+"PipeWire Output Plugin for Audacious\n"
+"Copyright 2022 Thomas Lange\n"
+"\n"
+"Based on the PipeWire Output Plugin for Qmmp\n"
+"Copyright 2021 Ilya Kotov"
 msgstr ""
+"Pipewire utgång plugin för Audacious\n"
+"Copyright 2022 Thomas Lange\n"
+"\n"
+"Baserad på Pipewire utgång plugin för Qmmp\n"
+"Copyright 2021 Ilya Kotov "
+
+#: src/pipewire/pipewire.cc:408 src/skins/menus.cc:88 src/skins-qt/menus.cc:79
+msgid "Playback"
+msgstr "Uppspelning"
 
-#: src/playlist-manager/playlist-manager.cc:245
+#: src/playlist-manager/playlist-manager.cc:38
+#: src/playlist-manager-qt/playlist-manager-qt.cc:42
+msgid "Playlist Manager"
+msgstr "Spellisthanterare"
+
+#: src/playlist-manager/playlist-manager.cc:221
+#: src/playlist-manager-qt/playlist-manager-qt.cc:356
 msgid "_Remove"
-msgstr ""
+msgstr "_Ta bort"
 
-#: src/playlist-manager/playlist-manager.cc:246
+#: src/playlist-manager/playlist-manager.cc:222
+#: src/playlist-manager-qt/playlist-manager-qt.cc:351
 msgid "Ren_ame"
-msgstr ""
+msgstr "_Byt namn"
 
 #: src/pls/pls.cc:35
 msgid "PLS Playlists"
-msgstr "PLS Spellistor"
+msgstr "PLS-spellistor"
 
-#: src/psf/plugin.cc:45
+#: src/psf/plugin.cc:53
 msgid "OpenPSF PSF1/PSF2 Decoder"
-msgstr ""
+msgstr "OpenPSF PSF1/PSF2-avkodare"
 
-#: src/pulse_audio/pulse_audio.cc:38
+#: src/psf/plugin.cc:270
+msgid "OpenPSF Configuration"
+msgstr "OpenPSF konfiguration"
+
+#: src/psf/plugin.cc:271 src/xsf/plugin.cc:444
+msgid "Ignore length from file"
+msgstr "Ignorera längd från fil"
+
+#: src/pulse/pulse_audio.cc:42
 msgid "PulseAudio Output"
-msgstr ""
+msgstr "PulseAudio-utgång"
+
+#: src/pulse/pulse_audio.cc:84
+msgid "Context name:"
+msgstr "Kontext namn:"
 
-#: src/pulse_audio/pulse_audio.cc:611
+#: src/pulse/pulse_audio.cc:86
+msgid "Stream name:"
+msgstr "Ström namn:"
+
+#: src/pulse/pulse_audio.cc:596
 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."
+"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 ""
+"Audacious PulseAudio Output Plugin\n"
+"\n"
+"Detta program är fri programvara; du kan distribuera det och/eller modifiera "
+"det under villkoren i GNU General Public License, publicerad av Free "
+"Software Foundation, antingen version 3 eller (om du så vill) någon senare "
+"version.\n"
+"\n"
+"Detta program distribueras i hopp om att det ska vara användbart, men UTAN "
+"NÅGON SOM HELST GARANTI, även utan underförstådd garanti om SÄLJBARHET eller "
+"LÄMPLIGHET FÖR NÅGOT SPECIELLT ÄNDAMÅL. Se GNU General Public License för "
+"ytterligare information.\n"
+"\n"
+"Du bör ha fått en kopia av GNU General Public License tillsammans med detta "
+"program; om inte, skriv till Free Software Foundation, Inc., 51 Franklin "
+"Street, Fifth Floor, Boston, MA 02110-1301, USA."
 
-#: src/qtaudio/qtaudio.cc:49
+#: src/qtaudio/qtaudio.cc:53
 msgid "QtMultimedia Output"
-msgstr ""
+msgstr "QtMultimedia-utgång"
 
-#: src/qtaudio/qtaudio.cc:77
+#: src/qtaudio/qtaudio.cc:84
 msgid ""
 "QtMultimedia Audio Output Plugin for Audacious\n"
 "Copyright 2014 William Pitcock\n"
@@ -2556,100 +3064,165 @@
 "Based on SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
 msgstr ""
+"QtMultimedia Audio Output Plugin för Audacious\n"
+"Copyright 2014 William Pitcock\n"
+"\n"
+"Baserat på SDL-utgångsinsticksmodul för Audacious\n"
+"Copyright 2010 John Lindgren"
 
-#: src/qtui/dialog_windows.cc:31
-msgid "Working ..."
+#: src/qtglspectrum/gl-spectrum.cc:41
+msgid ""
+"OpenGL Spectrum Analyzer for Audacious\n"
+"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
+"Copyright 2014, 2020 Ariadne Conill\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é, John Lindgren och Carlo Bramini\n"
+"Copyright 2014, 2020 Ariadne Conill\n"
+"\n"
+"Baserat på XMMS-insticksmodul:\n"
+"Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson och "
+"4Front Technologies\n"
+"\n"
+"Licens: GPLv2+"
 
-#: src/qtui/filter_input.cc:44 src/skins/ui_playlist.cc:221
-msgid "Search"
-msgstr "Sök"
+#: src/qthotkey/gui.cc:177
+msgid "Press a key combination inside a text field."
+msgstr "Tryck en tangentkombination inuti ett textfält."
 
-#: src/qtui/main_window_actions.cc:94
-msgid "_Open Folder ..."
+#: src/qthotkey/plugin.cc:105
+msgid ""
+"Global Hotkey Plugin\n"
+"Control the player with global key combinations or multimedia keys.\n"
+"\n"
+"Copyright (C) 2020 i.Dark_Templar <darktemplar@dark-templar-archives.net>\n"
+"Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n"
+"\n"
+"Contributors 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 Plugin\n"
+"Styr spelaren med globala tangentkombinationer eller multimediatangenter.\n"
+"\n"
+"Copyright (C) 2020 i.Dark_Templar <darktemplar@dark-templar-archives.net>\n"
+"Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n"
+"\n"
+"Bidragsgivare inkluderar:\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/qtui/menus.cc:109
+msgid "_Open Folder ..."
+msgstr "_Öppna mapp ..."
 
-#: src/qtui/main_window_actions.cc:96
+#: src/qtui/menus.cc:115
 msgid "_Add Folder ..."
-msgstr ""
+msgstr "_Lägg till mapp"
 
-#: src/qtui/main_window_actions.cc:101
+#: src/qtui/menus.cc:128
 msgid "_Log Inspector ..."
-msgstr ""
+msgstr "_Logginspektör ..."
 
-#: src/qtui/main_window.cc:64
-msgid "Open Files"
-msgstr ""
+#: src/qtui/menus.cc:220
+msgid "_Find ..."
+msgstr "_Hitta ..."
 
-#: src/qtui/main_window.cc:66
-msgid "Add Files"
-msgstr ""
+#: src/qtui/menus.cc:256 src/skins/menus.cc:80 src/skins-qt/menus.cc:70
+msgid "Audio Settings ..."
+msgstr "Ljudinställlningar ..."
 
-#: src/qtui/main_window.cc:71 src/skins/menus.cc:90
-msgid "Previous"
-msgstr "Förra"
+#: src/qtui/playlist_model.cc:188
+msgid "Q#"
+msgstr "Q#"
 
-#: src/qtui/main_window.cc:77 src/skins/menus.cc:82
-msgid "Repeat"
-msgstr ""
+#: src/qtui/playlist_model.cc:190
+msgid "T#"
+msgstr "T#"
 
-#: src/qtui/main_window.cc:79 src/skins/menus.cc:83
-msgid "Shuffle"
-msgstr ""
+#: src/qtui/playlist_model.cc:192
+msgid "C#"
+msgstr "C#"
+
+#: src/qtui/playlist_model.cc:194
+msgid "D#"
+msgstr "D#"
 
-#: src/qtui/qtui.cc:42
+#: src/qtui/qtui.cc:40
 msgid "Qt Interface"
-msgstr ""
+msgstr "Qt-gränssnitt"
+
+#: src/qtui/search_bar.cc:46
+msgid "Search playlist"
+msgstr "Sök efter spellista"
+
+#: src/qtui/settings.cc:79
+msgid "Use bold font for column headers"
+msgstr "Använd fetstil för kolumnrubriker"
 
 #: src/resample/resample.cc:43
 msgid "Sample Rate Converter"
-msgstr ""
+msgstr "Samplingsfrekvensomvandlare"
 
 #: src/resample/resample.cc:183
 msgid ""
 "Sample Rate Converter Plugin for Audacious\n"
 "Copyright 2010-2012 John Lindgren"
 msgstr ""
+"Sample Rate Converter Plugin för Audacious\n"
+"Copyright 2010-2012 John Lindgren"
 
 #: src/resample/resample.cc:187
 msgid "Skip/repeat samples"
-msgstr ""
+msgstr "Hoppa över/upprepa samplingar"
 
 #: src/resample/resample.cc:188
 msgid "Linear interpolation"
-msgstr ""
+msgstr "Linjär interpolation"
 
 #: src/resample/resample.cc:189
 msgid "Fast sinc interpolation"
-msgstr ""
+msgstr "Snabb sinc-interpolering"
 
 #: src/resample/resample.cc:190
 msgid "Medium sinc interpolation"
-msgstr ""
+msgstr "Mellan sinc-interpolation"
 
 #: src/resample/resample.cc:191
 msgid "Best sinc interpolation"
-msgstr ""
+msgstr "Bästa sinc-interpolation"
 
 #: src/resample/resample.cc:195
 msgid "Conversion"
-msgstr ""
+msgstr "Konvertering"
 
 #: src/resample/resample.cc:196
 msgid "Method:"
-msgstr ""
+msgstr "Metod:"
 
-#: src/resample/resample.cc:199 src/sox-resampler/sox-resampler.cc:161
+#: src/resample/resample.cc:199 src/soxr/sox-resampler.cc:203
 msgid "Rate:"
-msgstr ""
+msgstr "Hastighet:"
 
 #: src/resample/resample.cc:202
 msgid "Rate Mappings"
-msgstr ""
+msgstr "Hastighetskartläggningar"
 
 #: src/resample/resample.cc:203
 msgid "Use rate mappings"
-msgstr ""
+msgstr "Använd hastighetskartläggningar"
 
 #: src/resample/resample.cc:205
 msgid "8 kHz:"
@@ -2691,971 +3264,927 @@
 msgid "192 kHz:"
 msgstr "192 kHz:"
 
-#: src/scrobbler2/config_window.cc:41
-#, c-format
-msgid "OK. Scrobbling for user: %s"
-msgstr ""
-
-#: src/scrobbler2/config_window.cc:54
-msgid "Permission Denied"
-msgstr ""
-
-#: src/scrobbler2/config_window.cc:56
-msgid "Access the following link to allow Audacious to scrobble your plays:"
-msgstr ""
-
-#: src/scrobbler2/config_window.cc:66
-msgid "Keep this window open and click 'Check Permission' again.\n"
-msgstr ""
+#: src/scrobbler2/config_window.cc:29
+msgid "Checking Last.fm access ..."
+msgstr "Kontrollerar Last.fm tillgång ..."
 
-#: src/scrobbler2/config_window.cc:69 src/scrobbler2/config_window.cc:80
+#: src/scrobbler2/config_window.cc:35
 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."
+"Your scrobbles are being saved on your computer temporarily. They will be "
+"submitted as soon as Audacious is allowed access."
 msgstr ""
+"Dina skrobblingar sparas tillfälligt på din dator. De kommer att skickas så "
+"snart Audacious får tillgång."
 
-#: src/scrobbler2/config_window.cc:77
-msgid "Network Problem."
-msgstr "Nätverksproblem"
+#: src/scrobbler2/config_window.cc:41
+#, c-format
+msgid "Permission granted. Scrobbling for user %s."
+msgstr "Tillstånd beviljat. Skrobbling för användare %s."
 
-#: src/scrobbler2/config_window.cc:78
-msgid "There was a problem contacting Last.fm. Please try again later."
+#: src/scrobbler2/config_window.cc:44
+msgid ""
+"Permission denied. Open the following URL in a browser, allow Audacious "
+"access to your account, and then click 'Check Permission' again:"
 msgstr ""
+"Åtkomst nekad. Öppna följande webbadress i en webbläsare, tillåt Audacious "
+"tillgång till ditt konto och klicka sedan på \"Kontrollera tillåtelse\" igen:"
 
-#: src/scrobbler2/config_window.cc:110
-msgid "Checking..."
-msgstr ""
+#: src/scrobbler2/config_window.cc:53
+msgid "There was a problem contacting Last.fm."
+msgstr "Det var ett problem med att kontakta Last.fm."
 
-#: src/scrobbler2/config_window.cc:176
-msgid "C_heck Permission"
-msgstr ""
+#: src/scrobbler2/config_window.cc:92
+msgid "Check Permission"
+msgstr "Kontrollera behörighet"
 
-#: src/scrobbler2/config_window.cc:177
-msgid "_Revoke Permission"
-msgstr ""
+#: src/scrobbler2/config_window.cc:93
+msgid "Revoke Permission"
+msgstr "Återkalla behörighet"
 
-#: src/scrobbler2/config_window.cc:220
-msgid ""
-"You need to allow Audacious to scrobble tracks to your Last.fm account.\n"
-msgstr ""
+#: src/scrobbler2/config_window.cc:97
+msgid "You need to allow Audacious to scrobble tracks to your Last.fm account."
+msgstr "Du måste tillåta Audacious att skrobbla spår till ditt Last.fm-konto."
 
 #: src/scrobbler2/scrobbler.cc:29
 msgid "Scrobbler 2.0"
 msgstr "Scrobbler 2.0"
 
-#: src/scrobbler2/scrobbler.cc:224
+#: src/scrobbler2/scrobbler.cc:200
 msgid ""
 "The Scrobbler plugin could not be started.\n"
 "There might be a problem with your installation."
 msgstr ""
+"Scrobbler-insticksmodulen kunde inte startas.\n"
+"Det kan finnas ett problem med din installation."
 
-#: src/scrobbler2/scrobbler.cc:289
+#: src/scrobbler2/scrobbler.cc:245
 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_communication.cc:642
-msgid ""
-"Audacious is now using an improved version of the Last.fm Scrobbler.\n"
-"Please check the Preferences for the Scrobbler plugin."
+"project."
 msgstr ""
+"Audacious Scrobbler Plugin 2.0 av Pitxyoki,\n"
+"\n"
+"Copyright © 2012-2013 Luís M. Picciochi Oliveira <Pitxyoki@Gmail.com>\n"
+"\n"
+"Tack till John Lindgren som gav mig en hjälpande hand i början av detta "
+"projekt."
 
-#: src/sdlout/sdlout.cc:48
+#: src/sdlout/sdlout.cc:43
 msgid "SDL Output"
-msgstr ""
+msgstr "SDL-utgång"
 
-#: src/sdlout/sdlout.cc:77
+#: src/sdlout/sdlout.cc:72
 msgid ""
 "SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
 msgstr ""
+"SDL Output Plugin för Audacious\n"
+"Copyright 2010 John Lindgren"
 
-#: src/search-tool/search-tool.cc:116 src/search-tool/search-tool.cc:124
+#: src/search-tool/library.cc:35 src/search-tool/library.cc:46
+#: src/search-tool-qt/library.cc:35 src/search-tool-qt/library.cc:46
 msgid "Library"
-msgstr ""
+msgstr "Bibliotek"
 
-#: src/search-tool/search-tool.cc:394
-#, c-format
-msgid "%d result"
-msgid_plural "%d results"
-msgstr0 ""
-msgstr1 ""
-
-#: src/search-tool/search-tool.cc:400
-#, c-format
-msgid "(%d hidden)"
-msgid_plural "(%d hidden)"
-msgstr0 ""
-msgstr1 ""
-
-#: src/search-tool/search-tool.cc:594
+#: src/search-tool-qt/search-model.cc:44 src/search-tool/search-tool.cc:287
 #, c-format
 msgid "%d song"
 msgid_plural "%d songs"
-msgstr0 ""
-msgstr1 ""
+msgstr0 "%d sång"
+msgstr1 "%d låtar"
 
-#: src/search-tool/search-tool.cc:601
+#: src/search-tool-qt/search-model.cc:53 src/search-tool/search-tool.cc:294
 msgid "of this genre"
-msgstr ""
+msgstr "av denna genre"
 
-#: src/search-tool/search-tool.cc:607
+#: src/search-tool-qt/search-model.h:47 src/search-tool/search-model.h:45
 msgid "on"
-msgstr ""
+msgstr "på"
 
-#: src/search-tool/search-tool.cc:607
+#: src/search-tool-qt/search-model.h:47 src/search-tool/search-model.h:45
 msgid "by"
-msgstr ""
+msgstr "av"
 
-#: src/search-tool/search-tool.cc:643
-msgid "_Create Playlist"
-msgstr ""
+#: src/search-tool-qt/search-tool-qt.cc:165 src/search-tool/search-tool.cc:74
+msgid "Number of results to show:"
+msgstr "Antal resultat som ska visas:"
 
-#: src/search-tool/search-tool.cc:645
-msgid "_Add to Playlist"
-msgstr ""
+#: src/search-tool-qt/search-tool-qt.cc:168 src/search-tool/search-tool.cc:77
+msgid "Rescan library at startup"
+msgstr "Skanna om biblioteket vid uppstart"
 
-#: src/search-tool/search-tool.cc:684
-msgid "Search library"
-msgstr ""
+#: src/search-tool-qt/search-tool-qt.cc:170
+msgid "Monitor library for changes"
+msgstr "Övervaka bibliotek för ändringar"
 
-#: src/search-tool/search-tool.cc:688
+#: src/search-tool-qt/search-tool-qt.cc:193 src/search-tool/search-tool.cc:450
 msgid ""
 "To import your music library into Audacious, choose a folder and then click "
 "the \"refresh\" icon."
 msgstr ""
+"För att importera ditt musikbibliotek till Audacious, välj en mapp och "
+"klicka sedan på ikonen \"uppdatera\"."
 
-#: src/search-tool/search-tool.cc:696
+#: src/search-tool-qt/search-tool-qt.cc:195 src/search-tool/search-tool.cc:459
 msgid "Please wait ..."
-msgstr ""
+msgstr "Vänta ..."
 
-#: src/search-tool/search-tool.cc:723
+#: src/search-tool-qt/search-tool-qt.cc:197 src/search-tool/search-tool.cc:487
 msgid "Choose Folder"
-msgstr "Välj Mapp"
+msgstr "Välj mapp"
+
+#: src/search-tool-qt/search-tool-qt.cc:201 src/search-tool/search-tool.cc:445
+msgid "Search library"
+msgstr "Sök bibliotek"
+
+#: src/search-tool-qt/search-tool-qt.cc:327 src/search-tool/search-tool.cc:156
+#, c-format
+msgid "%d of %d result shown"
+msgid_plural "%d of %d results shown"
+msgstr0 "%d av %d visat reslutat"
+msgstr1 "%d av %d visade resultat"
+
+#: src/search-tool-qt/search-tool-qt.cc:331 src/search-tool/search-tool.cc:160
+#, c-format
+msgid "%d result"
+msgid_plural "%d results"
+msgstr0 "%d resultat"
+msgstr1 "%d resultat"
+
+#: src/search-tool-qt/search-tool-qt.cc:501 src/search-tool/search-tool.cc:341
+msgid "_Create Playlist"
+msgstr "_Skapa spellista"
+
+#: src/search-tool-qt/search-tool-qt.cc:503 src/search-tool/search-tool.cc:343
+msgid "_Add to Playlist"
+msgstr "_Lägg till spellista"
 
 #: src/sid/xmms-sid.cc:43
 msgid "SID Player"
-msgstr ""
-
-#: src/sid/xs_config.cc:61
-msgid "Output"
-msgstr ""
+msgstr "SID-spelare"
 
 #: src/sid/xs_config.cc:62
 msgid "Channels:"
-msgstr ""
+msgstr "Kanaler:"
 
 #: src/sid/xs_config.cc:68
 msgid "Emulation"
-msgstr ""
+msgstr "Emulation"
 
 #: src/sid/xs_config.cc:69
 msgid "Emulate MOS 8580 (default: MOS 6581)"
-msgstr ""
+msgstr "Emulera MOS 8580 (standard: MOS 6581)"
 
 #: src/sid/xs_config.cc:71
 msgid "Do not automatically select chip model"
-msgstr ""
+msgstr "Välj inte automatiskt chipmodell"
 
 #: src/sid/xs_config.cc:73
 msgid "Emulate filter"
-msgstr ""
+msgstr "Emuleringsfilter"
 
 #: src/sid/xs_config.cc:75
 msgid "Clock speed:"
-msgstr ""
+msgstr "Klockhastighet:"
 
 #: src/sid/xs_config.cc:78
 msgid "Do not automatically select clock speed"
-msgstr ""
+msgstr "Välj inte klockhastighet automatiskt"
 
 #: src/sid/xs_config.cc:80
 msgid "Playback time"
-msgstr ""
+msgstr "Uppspelningstid"
 
 #: src/sid/xs_config.cc:81
 msgid "Set maximum playback time:"
-msgstr ""
+msgstr "Ställ in längsta uppspelningstid:"
 
 #: src/sid/xs_config.cc:87
 msgid "Use only when song length is unknown"
-msgstr ""
+msgstr "Använd endast när låtlängden är okänd"
 
 #: src/sid/xs_config.cc:90
 msgid "Set minimum playback time:"
-msgstr ""
+msgstr "Ställ in kortaste uppspelningstid:"
 
 #: src/sid/xs_config.cc:96
 msgid "Subtunes"
-msgstr ""
+msgstr "Undertoner"
 
 #: src/sid/xs_config.cc:97
 msgid "Enable subtunes"
-msgstr ""
+msgstr "Aktivera undertoner"
 
 #: src/sid/xs_config.cc:99
 msgid "Ignore subtunes shorter than:"
-msgstr ""
+msgstr "Ignorera undertoner kortare än:"
 
 #: src/sid/xs_config.cc:105
 msgid "Note"
-msgstr ""
+msgstr "Not"
 
 #: src/silence-removal/silence-removal.cc:39
 msgid "Silence Removal"
-msgstr ""
+msgstr "Avlägsnande av tystnad"
 
 #: src/silence-removal/silence-removal.cc:58
 msgid ""
 "Silence Removal Plugin for Audacious\n"
 "Copyright 2014 John Lindgren"
 msgstr ""
+"Silence Removal Plugin för Audacious\n"
+"Copyright 2014 John Lindgren"
 
 #: src/silence-removal/silence-removal.cc:67
 msgid "Silence Removal"
-msgstr ""
+msgstr "Avlägsnande av tystnad"
 
 #: src/silence-removal/silence-removal.cc:68
 msgid "Threshold:"
-msgstr ""
+msgstr "Tröskel:"
 
-#: src/silence-removal/silence-removal.cc:70
-msgid "dB"
-msgstr ""
+#: src/skins/actions.cc:45 src/skins-qt/actions.cc:43
+msgid "Repeat points cleared."
+msgstr "Upprepningspunkter rensade."
 
-#: src/skins/menus.cc:64
-msgid "Open Files ..."
-msgstr "Öppna filer..."
+#: src/skins/actions.cc:60 src/skins-qt/actions.cc:58
+msgid "Repeat point A set."
+msgstr "Upprepningspunkt A inställd."
 
-#: src/skins/menus.cc:65
-msgid "Open URL ..."
-msgstr "Öppna URL ..."
+#: src/skins/actions.cc:65 src/skins-qt/actions.cc:63
+msgid "Repeat point B set."
+msgstr "Upprepningspunkt B inställd."
 
-#: src/skins/menus.cc:66
-msgid "Search Library"
-msgstr ""
+#: src/skins/equalizer.cc:223 src/skins-qt/equalizer.cc:223
+msgid "Preamp"
+msgstr "Förförstärkare"
 
-#: src/skins/menus.cc:68
-msgid "Playback"
-msgstr "Uppspelning"
+#: src/skins/equalizer.cc:227 src/skins-qt/equalizer.cc:227
+msgid "31 Hz"
+msgstr "31 Hz"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "63 Hz"
+msgstr "63 Hz"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "125 Hz"
+msgstr "125 Hz"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "250 Hz"
+msgstr "250 Hz"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "500 Hz"
+msgstr "500 Hz"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "1 kHz"
+msgstr "1 kHz"
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "2 kHz"
+msgstr "2 kHz"
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "4 kHz"
+msgstr "4 kHz"
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "8 kHz"
+msgstr "8 kHz"
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "16 kHz"
+msgstr "16 kHz"
+
+#: src/skins/equalizer.cc:270 src/skins-qt/equalizer.cc:270
+msgid "Audacious Equalizer"
+msgstr "Audacious-frekvenskorrigerare"
+
+#: src/skins/main.cc:459 src/skins-qt/main.cc:442
+msgid "Recording on"
+msgstr "Inspelning på"
+
+#: src/skins/main.cc:461 src/skins-qt/main.cc:444
+msgid "Recording off"
+msgstr "Inspelning av"
+
+#: src/skins/main.cc:754 src/skins-qt/main.cc:701
+#, c-format
+msgid "Seek to %d:%-2.2d / %d:%-2.2d"
+msgstr "Söka till %d:%-2.2d / %d:%-2.2d"
+
+#: src/skins/main.cc:771 src/skins-qt/main.cc:718
+#, c-format
+msgid "Volume: %d%%"
+msgstr "Volym: %d%%"
+
+#: src/skins/main.cc:784 src/skins-qt/main.cc:731
+#, c-format
+msgid "Balance: %d%% left"
+msgstr "Balans: %d%% kvar"
+
+#: src/skins/main.cc:786 src/skins-qt/main.cc:733
+msgid "Balance: center"
+msgstr "Balans: centrera"
+
+#: src/skins/main.cc:788 src/skins-qt/main.cc:735
+#, c-format
+msgid "Balance: %d%% right"
+msgstr "Balans: %d%% höger"
+
+#: src/skins/main.cc:880 src/skins-qt/main.cc:827
+msgid "Options Menu"
+msgstr "Alternativmeny"
+
+#: src/skins/main.cc:884 src/skins-qt/main.cc:831
+msgid "Disable 'Always On Top'"
+msgstr "Inaktivera \"Alltid överst\""
+
+#: src/skins/main.cc:886 src/skins-qt/main.cc:833
+msgid "Enable 'Always On Top'"
+msgstr "Aktivera \"Alltid överst\""
+
+#: src/skins/main.cc:889 src/skins-qt/main.cc:836
+msgid "File Info Box"
+msgstr "Filinforuta"
+
+#: src/skins/main.cc:892 src/skins/menus.cc:149 src/skins-qt/main.cc:839
+#: src/skins-qt/menus.cc:142
+msgid "Double Size"
+msgstr "Dubbel storlek"
+
+#: src/skins/main.cc:895 src/skins-qt/main.cc:842
+msgid "Visualizations"
+msgstr "Visualiseringar"
+
+#: src/skins/menus.cc:74 src/skins-qt/menus.cc:64
+msgid "Volume Up"
+msgstr "Volym Upp"
+
+#: src/skins/menus.cc:75 src/skins-qt/menus.cc:65
+msgid "Volume Down"
+msgstr "Volym Ner"
+
+#: src/skins/menus.cc:77 src/skins-qt/menus.cc:67
+msgid "Effects ..."
+msgstr "Effekter ..."
 
-#: src/skins/menus.cc:69
+#: src/skins/menus.cc:84 src/skins-qt/menus.cc:74
+msgid "Open Files ..."
+msgstr "Öppna filer ..."
+
+#: src/skins/menus.cc:85 src/skins-qt/menus.cc:76
+msgid "Open URL ..."
+msgstr "Öppna webbadress ..."
+
+#: src/skins/menus.cc:89 src/skins-qt/menus.cc:80
 msgid "Playlist"
 msgstr "Spellista"
 
-#: src/skins/menus.cc:70
+#: src/skins/menus.cc:90 src/skins-qt/menus.cc:81
+msgid "Output"
+msgstr "Utgång"
+
+#: src/skins/menus.cc:91 src/skins-qt/menus.cc:82
 msgid "View"
 msgstr "Visa"
 
-#: src/skins/menus.cc:72 src/skins/menus.cc:136 src/skins/menus.cc:149
-#: src/skins/menus.cc:214
+#: src/skins/menus.cc:93 src/skins/menus.cc:161 src/skins/menus.cc:174
+#: src/skins/menus.cc:245 src/skins-qt/menus.cc:84 src/skins-qt/menus.cc:156
+#: src/skins-qt/menus.cc:170 src/skins-qt/menus.cc:241
 msgid "Services"
-msgstr ""
+msgstr "Tjänster"
 
-#: src/skins/menus.cc:74
+#: src/skins/menus.cc:95 src/skins-qt/menus.cc:86
 msgid "About ..."
 msgstr "Om ..."
 
-#: src/skins/menus.cc:75
+#: src/skins/menus.cc:96 src/skins-qt/menus.cc:87
 msgid "Settings ..."
-msgstr "Inställningar..."
+msgstr "Inställningar ..."
 
-#: src/skins/menus.cc:76
+#: src/skins/menus.cc:97 src/skins-qt/menus.cc:88
 msgid "Quit"
 msgstr "Avsluta"
 
-#: src/skins/menus.cc:80 src/skins/menus.cc:206
+#: src/skins/menus.cc:101 src/skins/menus.cc:235 src/skins-qt/menus.cc:92
+#: src/skins-qt/menus.cc:231
 msgid "Song Info ..."
 msgstr "Låtinformation ..."
 
-#: src/skins/menus.cc:84
-msgid "No Playlist Advance"
-msgstr ""
+#: src/skins/menus.cc:105 src/skins-qt/menus.cc:96
+msgid "Shuffle by Album"
+msgstr "Blanda album"
 
-#: src/skins/menus.cc:85
-msgid "Stop After This Song"
-msgstr ""
+#: src/skins/menus.cc:106 src/skins-qt/menus.cc:97
+msgid "No Playlist Advance"
+msgstr "Ingen spellista avancera"
 
-#: src/skins/menus.cc:93
+#: src/skins/menus.cc:117 src/skins-qt/menus.cc:108
 msgid "Set A-B Repeat"
-msgstr ""
+msgstr "Ställ in A-B-upprepning"
 
-#: src/skins/menus.cc:94
+#: src/skins/menus.cc:118 src/skins-qt/menus.cc:109
 msgid "Clear A-B Repeat"
-msgstr ""
+msgstr "Rensa A-B-upprepning"
 
-#: src/skins/menus.cc:96
+#: src/skins/menus.cc:120 src/skins-qt/menus.cc:111
 msgid "Jump to Song ..."
 msgstr "Hoppa till låt ..."
 
-#: src/skins/menus.cc:97
+#: src/skins/menus.cc:121 src/skins-qt/menus.cc:113
 msgid "Jump to Time ..."
 msgstr "Hoppa till tid ..."
 
-#: src/skins/menus.cc:101
+#: src/skins/menus.cc:125 src/skins-qt/menus.cc:118
 msgid "Play/Resume"
-msgstr ""
+msgstr "Spela/Återuppta"
 
-#: src/skins/menus.cc:103
+#: src/skins/menus.cc:127 src/skins-qt/menus.cc:120
 msgid "New Playlist"
 msgstr "Ny spellista"
 
-#: src/skins/menus.cc:104
+#: src/skins/menus.cc:128 src/skins-qt/menus.cc:121
 msgid "Rename Playlist ..."
-msgstr "Döp om spellista"
+msgstr "Byt namn på spellista ..."
 
-#: src/skins/menus.cc:105
+#: src/skins/menus.cc:129 src/skins-qt/menus.cc:122
 msgid "Remove Playlist"
-msgstr "Ta Bort Spellista"
+msgstr "Ta bort spellista"
 
-#: src/skins/menus.cc:107
+#: src/skins/menus.cc:131 src/skins-qt/menus.cc:124
 msgid "Previous Playlist"
-msgstr "Förra Spellista"
+msgstr "Föregående spellista"
 
-#: src/skins/menus.cc:108
+#: src/skins/menus.cc:132 src/skins-qt/menus.cc:125
 msgid "Next Playlist"
-msgstr "Nästa Spellista"
+msgstr "Nästa spellista"
 
-#: src/skins/menus.cc:110
+#: src/skins/menus.cc:134 src/skins-qt/menus.cc:127
 msgid "Import Playlist ..."
-msgstr "Importera spellista"
+msgstr "Importera spellista ..."
 
-#: src/skins/menus.cc:111
+#: src/skins/menus.cc:135 src/skins-qt/menus.cc:128
 msgid "Export Playlist ..."
-msgstr "Exportera spellista"
+msgstr "Exportera spellista ..."
 
-#: src/skins/menus.cc:113
+#: src/skins/menus.cc:137 src/skins-qt/menus.cc:130
 msgid "Playlist Manager ..."
-msgstr ""
+msgstr "Spellistahanterare ..."
 
-#: src/skins/menus.cc:114
+#: src/skins/menus.cc:138 src/skins-qt/menus.cc:131
 msgid "Queue Manager ..."
-msgstr ""
+msgstr "Köhanterare ..."
 
-#: src/skins/menus.cc:116
+#: src/skins/menus.cc:140 src/skins-qt/menus.cc:133
 msgid "Refresh Playlist"
-msgstr ""
+msgstr "Uppdatera spellista"
 
-#: src/skins/menus.cc:120
+#: src/skins/menus.cc:144 src/skins-qt/menus.cc:137
 msgid "Show Playlist Editor"
-msgstr ""
+msgstr "Visa redigerare för spellista"
 
-#: src/skins/menus.cc:121
+#: src/skins/menus.cc:145 src/skins-qt/menus.cc:138
 msgid "Show Equalizer"
-msgstr "Visa Equalizer"
+msgstr "Visa frekvenskorrigerare"
 
-#: src/skins/menus.cc:123
+#: src/skins/menus.cc:147 src/skins-qt/menus.cc:140
 msgid "Show Remaining Time"
-msgstr ""
+msgstr "Visa återstående tid"
 
-#: src/skins/menus.cc:125
+#: src/skins/menus.cc:150 src/skins-qt/menus.cc:143
 msgid "Always on Top"
-msgstr ""
+msgstr "Alltid överst"
 
-#: src/skins/menus.cc:126
+#: src/skins/menus.cc:151 src/skins-qt/menus.cc:145
 msgid "On All Workspaces"
-msgstr ""
+msgstr "På alla arbetsytor"
 
-#: src/skins/menus.cc:128
+#: src/skins/menus.cc:153 src/skins-qt/menus.cc:148
 msgid "Roll Up Player"
-msgstr ""
+msgstr "Rulla upp spelare"
 
-#: src/skins/menus.cc:129
+#: src/skins/menus.cc:154 src/skins-qt/menus.cc:149
 msgid "Roll Up Playlist Editor"
-msgstr ""
+msgstr "Rulla upp spellistsredigerare"
 
-#: src/skins/menus.cc:130
+#: src/skins/menus.cc:155 src/skins-qt/menus.cc:150
 msgid "Roll Up Equalizer"
-msgstr ""
-
-#: src/skins/menus.cc:132 src/skins/ui_main.cc:854
-msgid "Double Size"
-msgstr ""
+msgstr "Rulla upp frekvenskorrigeraren"
 
-#: src/skins/menus.cc:138
+#: src/skins/menus.cc:163 src/skins-qt/menus.cc:158
 msgid "Add URL ..."
-msgstr "Lägg till URL ..."
+msgstr "Lägg till webbadress ..."
 
-#: src/skins/menus.cc:139
+#: src/skins/menus.cc:164 src/skins-qt/menus.cc:160
 msgid "Add Files ..."
 msgstr "Lägg till filer ..."
 
-#: src/skins/menus.cc:143 src/skins/menus.cc:171 src/skins/menus.cc:185
+#: src/skins/menus.cc:168 src/skins/menus.cc:196 src/skins/menus.cc:212
+#: src/skins-qt/menus.cc:164 src/skins-qt/menus.cc:192
+#: src/skins-qt/menus.cc:208
 msgid "By Title"
-msgstr ""
+msgstr "Efter titel"
 
-#: src/skins/menus.cc:144 src/skins/menus.cc:178 src/skins/menus.cc:192
+#: src/skins/menus.cc:169 src/skins/menus.cc:203 src/skins/menus.cc:219
+#: src/skins-qt/menus.cc:165 src/skins-qt/menus.cc:199
+#: src/skins-qt/menus.cc:215
 msgid "By File Name"
-msgstr ""
+msgstr "Efter filnamn"
 
-#: src/skins/menus.cc:145 src/skins/menus.cc:179 src/skins/menus.cc:193
+#: src/skins/menus.cc:170 src/skins/menus.cc:204 src/skins/menus.cc:220
+#: src/skins-qt/menus.cc:166 src/skins-qt/menus.cc:200
+#: src/skins-qt/menus.cc:216
 msgid "By File Path"
-msgstr ""
+msgstr "Efter sökväg"
 
-#: src/skins/menus.cc:151
+#: src/skins/menus.cc:176 src/skins-qt/menus.cc:172
 msgid "Remove All"
-msgstr "Ta Bort Alla"
+msgstr "Ta bort alla"
 
-#: src/skins/menus.cc:152
+#: src/skins/menus.cc:177 src/skins-qt/menus.cc:173
 msgid "Clear Queue"
-msgstr ""
+msgstr "Rensa kö"
 
-#: src/skins/menus.cc:154
+#: src/skins/menus.cc:179 src/skins-qt/menus.cc:175
 msgid "Remove Unavailable Files"
-msgstr ""
+msgstr "Ta bort otillgängliga filer"
 
-#: src/skins/menus.cc:155
+#: src/skins/menus.cc:180 src/skins-qt/menus.cc:176
 msgid "Remove Duplicates"
-msgstr ""
+msgstr "Ta bort dubbletter"
 
-#: src/skins/menus.cc:157
+#: src/skins/menus.cc:182 src/skins-qt/menus.cc:178
 msgid "Remove Unselected"
-msgstr ""
+msgstr "Ta bort ovalda"
 
-#: src/skins/menus.cc:158
+#: src/skins/menus.cc:183 src/skins-qt/menus.cc:179
 msgid "Remove Selected"
-msgstr ""
+msgstr "Ta bort valda"
 
-#: src/skins/menus.cc:162
+#: src/skins/menus.cc:187 src/skins-qt/menus.cc:183
 msgid "Search and Select"
-msgstr ""
+msgstr "Sök och välj"
 
-#: src/skins/menus.cc:164
+#: src/skins/menus.cc:189 src/skins-qt/menus.cc:185
 msgid "Invert Selection"
-msgstr ""
+msgstr "Invertera valet"
 
-#: src/skins/menus.cc:165
+#: src/skins/menus.cc:190 src/skins-qt/menus.cc:186
 msgid "Select None"
-msgstr ""
+msgstr "Välj ingen"
 
-#: src/skins/menus.cc:166
+#: src/skins/menus.cc:191 src/skins-qt/menus.cc:187
 msgid "Select All"
-msgstr ""
+msgstr "Välj alla"
 
-#: src/skins/menus.cc:170 src/skins/menus.cc:184
+#: src/skins/menus.cc:195 src/skins/menus.cc:211 src/skins-qt/menus.cc:191
+#: src/skins-qt/menus.cc:207
 msgid "By Track Number"
-msgstr ""
+msgstr "Efter spårnummer"
 
-#: src/skins/menus.cc:172 src/skins/menus.cc:186
+#: src/skins/menus.cc:197 src/skins/menus.cc:213 src/skins-qt/menus.cc:193
+#: src/skins-qt/menus.cc:209
 msgid "By Artist"
-msgstr ""
+msgstr "Efter artist"
 
-#: src/skins/menus.cc:173 src/skins/menus.cc:187
+#: src/skins/menus.cc:198 src/skins/menus.cc:214 src/skins-qt/menus.cc:194
+#: src/skins-qt/menus.cc:210
 msgid "By Album"
-msgstr ""
+msgstr "Efter album"
 
-#: src/skins/menus.cc:174 src/skins/menus.cc:188
+#: src/skins/menus.cc:199 src/skins/menus.cc:215 src/skins-qt/menus.cc:195
+#: src/skins-qt/menus.cc:211
 msgid "By Album Artist"
-msgstr ""
+msgstr "Efter albumartist"
 
-#: src/skins/menus.cc:175 src/skins/menus.cc:190
+#: src/skins/menus.cc:200 src/skins/menus.cc:216 src/skins-qt/menus.cc:196
+#: src/skins-qt/menus.cc:212
 msgid "By Release Date"
-msgstr ""
+msgstr "Efter utgivningsdatum"
 
-#: src/skins/menus.cc:176 src/skins/menus.cc:189
+#: src/skins/menus.cc:201 src/skins/menus.cc:217 src/skins-qt/menus.cc:197
+#: src/skins-qt/menus.cc:213
 msgid "By Genre"
-msgstr ""
+msgstr "Efter genre"
 
-#: src/skins/menus.cc:177 src/skins/menus.cc:191
+#: src/skins/menus.cc:202 src/skins/menus.cc:218 src/skins-qt/menus.cc:198
+#: src/skins-qt/menus.cc:214
 msgid "By Length"
-msgstr ""
+msgstr "Efter längd"
 
-#: src/skins/menus.cc:180 src/skins/menus.cc:194
+#: src/skins/menus.cc:205 src/skins/menus.cc:221 src/skins-qt/menus.cc:201
+#: src/skins-qt/menus.cc:217
 msgid "By Custom Title"
-msgstr ""
+msgstr "Efter anpassad titel"
+
+#: src/skins/menus.cc:206 src/skins/menus.cc:222 src/skins-qt/menus.cc:202
+#: src/skins-qt/menus.cc:218
+msgid "By Comment"
+msgstr "Efter kommentar"
+
+#: src/skins/menus.cc:207 src/skins/menus.cc:223 src/skins-qt/menus.cc:203
+#: src/skins-qt/menus.cc:219
+msgid "By Disc Number"
+msgstr "Efter Skivnummer"
 
-#: src/skins/menus.cc:198
+#: src/skins/menus.cc:227 src/skins-qt/menus.cc:223
 msgid "Randomize List"
-msgstr ""
+msgstr "Slumpmässig lista"
 
-#: src/skins/menus.cc:199
+#: src/skins/menus.cc:228 src/skins-qt/menus.cc:224
 msgid "Reverse List"
-msgstr ""
+msgstr "Omvänd lista"
 
-#: src/skins/menus.cc:201
+#: src/skins/menus.cc:230 src/skins-qt/menus.cc:226
 msgid "Sort Selected"
-msgstr "Sortera vald"
+msgstr "Sortera valda"
 
-#: src/skins/menus.cc:202
+#: src/skins/menus.cc:231 src/skins-qt/menus.cc:227
 msgid "Sort List"
-msgstr "Sortera Lista"
+msgstr "Sortera lista"
+
+#: src/skins/menus.cc:236 src/skins-qt/menus.cc:232
+msgid "Open Containing Folder"
+msgstr "Öppna innehållande mapp"
 
-#: src/skins/menus.cc:208
+#: src/skins/menus.cc:238 src/skins-qt/menus.cc:234
 msgid "Cut"
 msgstr "Klipp"
 
-#: src/skins/menus.cc:209
+#: src/skins/menus.cc:239 src/skins-qt/menus.cc:235
 msgid "Copy"
 msgstr "Kopiera"
 
-#: src/skins/menus.cc:210
+#: src/skins/menus.cc:240 src/skins-qt/menus.cc:236
 msgid "Paste"
 msgstr "Klistra in"
 
-#: src/skins/menus.cc:212
-msgid "Queue/Unqueue"
-msgstr ""
+#: src/skins/menus.cc:241 src/skins-qt/menus.cc:237
+msgid "Paste at End"
+msgstr "Klistra in i slutet"
 
-#: src/skins/menus.cc:218
-msgid "Load Preset ..."
-msgstr ""
-
-#: src/skins/menus.cc:219
-msgid "Load Auto Preset ..."
-msgstr ""
-
-#: src/skins/menus.cc:220
-msgid "Load Default"
-msgstr ""
-
-#: src/skins/menus.cc:221
-msgid "Load Preset File ..."
-msgstr ""
-
-#: src/skins/menus.cc:222
-msgid "Load EQF File ..."
-msgstr ""
-
-#: src/skins/menus.cc:224
-msgid "Save Preset ..."
-msgstr ""
-
-#: src/skins/menus.cc:225
-msgid "Save Auto Preset ..."
-msgstr ""
-
-#: src/skins/menus.cc:226
-msgid "Save Default"
-msgstr ""
-
-#: src/skins/menus.cc:227
-msgid "Save Preset File ..."
-msgstr ""
-
-#: src/skins/menus.cc:228
-msgid "Save EQF File ..."
-msgstr ""
-
-#: src/skins/menus.cc:230
-msgid "Delete Preset ..."
-msgstr ""
-
-#: src/skins/menus.cc:231
-msgid "Delete Auto Preset ..."
-msgstr ""
+#: src/skins/menus.cc:243 src/skins-qt/menus.cc:239
+msgid "Queue/Unqueue"
+msgstr "Lägg till i kö/Ta bort från kö"
 
-#: src/skins/menus.cc:233
-msgid "Import Winamp Presets ..."
-msgstr ""
+#: src/skins/playlist-widget.cc:58 src/skins-qt/playlist-widget.cc:58
+#, c-format
+msgid "%s (%d of %d)"
+msgstr "%s (%d av %d)"
 
-#: src/skins/menus.cc:235
-msgid "Reset to Zero"
-msgstr ""
+#: src/skins/playlistwin.cc:491 src/skins-qt/playlistwin.cc:478
+msgid "Audacious Playlist Editor"
+msgstr "Audacious spellistsredigerare"
 
-#: src/skins/plugin.cc:48
+#: src/skins/plugin.cc:53 src/skins-qt/plugin.cc:65
 msgid "Winamp Classic Interface"
-msgstr ""
+msgstr "Winamps klassiska gränssnitt"
 
-#: src/skins/preset-browser.cc:57 src/skins/preset-list.cc:371
-#: src/skins/preset-list.cc:386
-msgid "Save"
-msgstr ""
+#: src/skins-qt/menus.cc:75
+msgid "Open Folder ..."
+msgstr "Öppna mapp ..."
 
-#: src/skins/preset-browser.cc:57 src/skins/preset-list.cc:338
-#: src/skins/preset-list.cc:354
-msgid "Load"
-msgstr ""
+#: src/skins-qt/menus.cc:159
+msgid "Add Folder ..."
+msgstr "Lägg till mapp ..."
 
-#: src/skins/preset-browser.cc:83
-msgid "Load Preset File"
-msgstr ""
-
-#: src/skins/preset-browser.cc:100
-msgid "Load EQF File"
-msgstr ""
-
-#: src/skins/preset-browser.cc:119
-msgid "Save Preset File"
-msgstr ""
+#: src/skins-qt/search-select.cc:62 src/skins/search-select.cc:77
+msgid "Search entries in active playlist"
+msgstr "Sök poster i aktiv spellista"
 
-#: src/skins/preset-browser.cc:137
-msgid "Save EQF File"
+#: src/skins-qt/search-select.cc:70 src/skins/search-select.cc:83
+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älj poster i spellistan genom att fylla i ett eller flera fält. Fält "
+"använder syntax för regeluttryck, skiftlägeskänslig. Om du inte vet hur "
+"vanliga uttryck fungerar, sätt bara in en bokstavlig del av det du söker "
+"efter."
 
-#: src/skins/preset-browser.cc:151
-msgid "Import Winamp Presets"
-msgstr ""
+#: src/skins-qt/search-select.cc:75 src/skins/search-select.cc:91
+msgid "Title:"
+msgstr "Titel:"
 
-#: src/skins/preset-list.cc:285
-msgid "Presets"
-msgstr ""
+#: src/skins-qt/search-select.cc:79 src/skins/search-select.cc:96
+msgid "Album:"
+msgstr "Album:"
 
-#: src/skins/preset-list.cc:335
-msgid "Load preset"
-msgstr ""
+#: src/skins-qt/search-select.cc:82 src/skins/search-select.cc:101
+msgid "Artist:"
+msgstr "Artist:"
 
-#: src/skins/preset-list.cc:351
-msgid "Load auto-preset"
-msgstr ""
+#: src/skins-qt/search-select.cc:85 src/skins/search-select.cc:106
+msgid "File Name:"
+msgstr "Filnamn:"
 
-#: src/skins/preset-list.cc:367
-msgid "Save preset"
-msgstr ""
+#: src/skins-qt/search-select.cc:88 src/skins/search-select.cc:134
+msgid "Clear previous selection before searching"
+msgstr "Rensa tidigare val innan du söker"
 
-#: src/skins/preset-list.cc:382
-msgid "Save auto-preset"
-msgstr ""
+#: src/skins-qt/search-select.cc:89 src/skins/search-select.cc:137
+msgid "Automatically toggle queue for matching entries"
+msgstr "Växla automatiskt till kö för matchande poster"
 
-#: src/skins/preset-list.cc:408
-msgid "Delete preset"
-msgstr ""
+#: src/skins-qt/search-select.cc:90 src/skins/search-select.cc:140
+msgid "Create a new playlist with matching entries"
+msgstr "Skapa en ny spellista med matchande poster"
 
-#: src/skins/preset-list.cc:424
-msgid "Delete auto-preset"
-msgstr ""
+#: src/skins-qt/search-select.cc:101 src/skins/search-select.cc:78
+msgid "Search"
+msgstr "Sök"
 
-#: src/skins/skins_cfg.cc:176
+#: src/skins-qt/skins_cfg.cc:198 src/skins/skins_cfg.cc:182
 msgid "Player:"
-msgstr ""
+msgstr "Spelare:"
 
-#: src/skins/skins_cfg.cc:178
+#: src/skins-qt/skins_cfg.cc:200 src/skins/skins_cfg.cc:184
 msgid "Select main player window font:"
-msgstr ""
+msgstr "Välj teckensnitt för huvudfönster:"
 
-#: src/skins/skins_cfg.cc:179
+#: src/skins-qt/skins_cfg.cc:201 src/skins/skins_cfg.cc:185
 msgid "Playlist:"
-msgstr ""
+msgstr "Spellista:"
 
-#: src/skins/skins_cfg.cc:181
+#: src/skins-qt/skins_cfg.cc:203 src/skins/skins_cfg.cc:187
 msgid "Select playlist font:"
-msgstr "Välj spelliste teckensnitt:"
+msgstr "Välj teckensnitt för spellista:"
 
-#: src/skins/skins_cfg.cc:187
+#: src/skins-qt/skins_cfg.cc:207 src/skins/skins_cfg.cc:191
 msgid "Skin"
-msgstr "Skin"
+msgstr "Skal"
 
-#: src/skins/skins_cfg.cc:189
+#: src/skins-qt/skins_cfg.cc:211 src/skins/skins_cfg.cc:193
+msgid "Display active titlebar when any window is focused"
+msgstr "Visa aktiv titelrad när något fönster är fokuserat"
+
+#: src/skins-qt/skins_cfg.cc:213 src/skins/skins_cfg.cc:195
 msgid "Fonts"
 msgstr "Teckensnitt"
 
-#: src/skins/skins_cfg.cc:192
+#: src/skins-qt/skins_cfg.cc:215 src/skins/skins_cfg.cc:197
 msgid "Use bitmap fonts (supports ASCII only)"
-msgstr ""
+msgstr "Använd bitmappsteckensnitt (stöder endast ASCII)"
 
-#: src/skins/skins_cfg.cc:194
+#: src/skins-qt/skins_cfg.cc:217 src/skins/skins_cfg.cc:199
 msgid "Scroll song title"
-msgstr ""
+msgstr "Rulla låttitel"
 
-#: src/skins/skins_cfg.cc:196
+#: src/skins-qt/skins_cfg.cc:219 src/skins/skins_cfg.cc:201
 msgid "Scroll song title in both directions"
-msgstr ""
+msgstr "Rulla låttitel i båda riktningarna"
 
-#: src/skins/skins_cfg.cc:201
+#: src/skins-qt/skins_cfg.cc:224 src/skins/skins_cfg.cc:206
 msgid "Analyzer"
-msgstr ""
+msgstr "Analysator"
 
-#: src/skins/skins_cfg.cc:202
+#: src/skins-qt/skins_cfg.cc:225 src/skins/skins_cfg.cc:207
 msgid "Scope"
-msgstr ""
+msgstr "Omfattning"
 
-#: src/skins/skins_cfg.cc:203
+#: src/skins-qt/skins_cfg.cc:226 src/skins/skins_cfg.cc:208
 msgid "Voiceprint / VU meter"
-msgstr ""
+msgstr "Röstavtryck / VU-mätare"
 
-#: src/skins/skins_cfg.cc:204
+#: src/skins-qt/skins_cfg.cc:227 src/skins/skins_cfg.cc:209
 msgid "Off"
 msgstr "Av"
 
-#: src/skins/skins_cfg.cc:208 src/skins/skins_cfg.cc:233
-#: src/skins/skins_cfg.cc:239
+#: src/skins-qt/skins_cfg.cc:231 src/skins-qt/skins_cfg.cc:256
+#: src/skins-qt/skins_cfg.cc:262 src/skins/skins_cfg.cc:213
+#: src/skins/skins_cfg.cc:238 src/skins/skins_cfg.cc:244
 msgid "Normal"
 msgstr "Normal"
 
-#: src/skins/skins_cfg.cc:209 src/skins/skins_cfg.cc:234
+#: src/skins-qt/skins_cfg.cc:232 src/skins-qt/skins_cfg.cc:257
+#: src/skins/skins_cfg.cc:214 src/skins/skins_cfg.cc:239
 msgid "Fire"
 msgstr "Eld"
 
-#: src/skins/skins_cfg.cc:210
+#: src/skins-qt/skins_cfg.cc:233 src/skins/skins_cfg.cc:215
 msgid "Vertical lines"
 msgstr "Vertikala linjer"
 
-#: src/skins/skins_cfg.cc:214
+#: src/skins-qt/skins_cfg.cc:237 src/skins/skins_cfg.cc:219
 msgid "Lines"
 msgstr "Linjer"
 
-#: src/skins/skins_cfg.cc:215
+#: src/skins-qt/skins_cfg.cc:238 src/skins/skins_cfg.cc:220
 msgid "Bars"
-msgstr ""
+msgstr "Staplar"
 
-#: src/skins/skins_cfg.cc:219
+#: src/skins-qt/skins_cfg.cc:242 src/skins/skins_cfg.cc:224
 msgid "Slowest"
-msgstr ""
+msgstr "Långsammast"
 
-#: src/skins/skins_cfg.cc:220
+#: src/skins-qt/skins_cfg.cc:243 src/skins/skins_cfg.cc:225
 msgid "Slow"
-msgstr ""
+msgstr "Långsam"
 
-#: src/skins/skins_cfg.cc:221 src/sox-resampler/sox-resampler.cc:152
+#: src/skins-qt/skins_cfg.cc:244 src/skins/skins_cfg.cc:226
+#: src/soxr/sox-resampler.cc:180
 msgid "Medium"
-msgstr ""
+msgstr "Mellan"
 
-#: src/skins/skins_cfg.cc:222
+#: src/skins-qt/skins_cfg.cc:245 src/skins/skins_cfg.cc:227
 msgid "Fast"
-msgstr ""
+msgstr "Snabb"
 
-#: src/skins/skins_cfg.cc:223
+#: src/skins-qt/skins_cfg.cc:246 src/skins/skins_cfg.cc:228
 msgid "Fastest"
-msgstr ""
+msgstr "Snabbast"
 
-#: src/skins/skins_cfg.cc:227
+#: src/skins-qt/skins_cfg.cc:250 src/skins/skins_cfg.cc:232
 msgid "Dots"
 msgstr "Punkter"
 
-#: src/skins/skins_cfg.cc:228
+#: src/skins-qt/skins_cfg.cc:251 src/skins/skins_cfg.cc:233
 msgid "Line"
 msgstr "Linje"
 
-#: src/skins/skins_cfg.cc:229
+#: src/skins-qt/skins_cfg.cc:252 src/skins/skins_cfg.cc:234
 msgid "Solid"
-msgstr "Solid"
+msgstr "Fast"
 
-#: src/skins/skins_cfg.cc:235
+#: src/skins-qt/skins_cfg.cc:258 src/skins/skins_cfg.cc:240
 msgid "Ice"
 msgstr "Is"
 
-#: src/skins/skins_cfg.cc:240
+#: src/skins-qt/skins_cfg.cc:263 src/skins/skins_cfg.cc:245
 msgid "Smooth"
-msgstr "Smooth"
+msgstr "Mjuk"
 
-#: src/skins/skins_cfg.cc:244
-msgid "Type"
-msgstr " Typ"
-
-#: src/skins/skins_cfg.cc:245
-msgid "Visualization type:"
-msgstr "Visualiserings typ:"
-
-#: src/skins/skins_cfg.cc:248
-msgid "Analyzer"
-msgstr ""
-
-#: src/skins/skins_cfg.cc:249
-msgid "Show peaks"
-msgstr ""
-
-#: src/skins/skins_cfg.cc:251
+#: src/skins-qt/skins_cfg.cc:267 src/skins/skins_cfg.cc:249
 msgid "Coloring:"
-msgstr ""
+msgstr "Färgläggning:"
 
-#: src/skins/skins_cfg.cc:254
+#: src/skins-qt/skins_cfg.cc:270 src/skins/skins_cfg.cc:252
 msgid "Style:"
 msgstr "Stil:"
 
-#: src/skins/skins_cfg.cc:257
+#: src/skins-qt/skins_cfg.cc:273 src/skins/skins_cfg.cc:255
 msgid "Falloff:"
-msgstr ""
+msgstr "Minskning:"
 
-#: src/skins/skins_cfg.cc:260
+#: src/skins-qt/skins_cfg.cc:276 src/skins/skins_cfg.cc:258
 msgid "Peak falloff:"
-msgstr ""
+msgstr "Största minskning:"
 
-#: src/skins/skins_cfg.cc:264
+#: src/skins-qt/skins_cfg.cc:282 src/skins/skins_cfg.cc:264
 msgid "Scope Style:"
-msgstr ""
+msgstr "Omfattningsstil:"
 
-#: src/skins/skins_cfg.cc:267
+#: src/skins-qt/skins_cfg.cc:285 src/skins/skins_cfg.cc:267
 msgid "Voiceprint Coloring:"
-msgstr ""
+msgstr "Röstavtrycksfärgning:"
 
-#: src/skins/skins_cfg.cc:270
+#: src/skins-qt/skins_cfg.cc:288 src/skins/skins_cfg.cc:270
 msgid "VU Meter Style:"
-msgstr ""
-
-#: src/skins/skins_cfg.cc:276
-msgid "General"
-msgstr ""
-
-#: src/skins/skins_cfg.cc:277
-msgid "Visualization"
-msgstr "Visualisering"
-
-#: src/skins/ui_equalizer.cc:282
-msgid "Preamp"
-msgstr ""
-
-#: src/skins/ui_equalizer.cc:286
-msgid "31 Hz"
-msgstr "31 Hz"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "63 Hz"
-msgstr "63 Hz"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "125 Hz"
-msgstr "125 Hz"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "250 Hz"
-msgstr "250 Hz"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "500 Hz"
-msgstr "500 Hz"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "1 kHz"
-msgstr "1 kHz"
-
-#: src/skins/ui_equalizer.cc:288
-msgid "2 kHz"
-msgstr "2 kHz"
-
-#: src/skins/ui_equalizer.cc:288
-msgid "4 kHz"
-msgstr "4 kHz"
-
-#: src/skins/ui_equalizer.cc:288
-msgid "8 kHz"
-msgstr "8 kHz"
-
-#: src/skins/ui_equalizer.cc:288
-msgid "16 kHz"
-msgstr "16 kHz"
-
-#: src/skins/ui_equalizer.cc:330
-msgid "Audacious Equalizer"
-msgstr "Audacious Equalizer"
-
-#: src/skins/ui_main.cc:688
-#, c-format
-msgid "Seek to %d:%-2.2d / %d:%-2.2d"
-msgstr ""
-
-#: src/skins/ui_main.cc:709
-#, c-format
-msgid "Volume: %d%%"
-msgstr ""
-
-#: src/skins/ui_main.cc:732
-#, c-format
-msgid "Balance: %d%% left"
-msgstr ""
-
-#: src/skins/ui_main.cc:734
-msgid "Balance: center"
-msgstr ""
-
-#: src/skins/ui_main.cc:736
-#, c-format
-msgid "Balance: %d%% right"
-msgstr ""
-
-#: src/skins/ui_main.cc:842
-msgid "Options Menu"
-msgstr ""
+msgstr "VU-mätarstil:"
 
-#: src/skins/ui_main.cc:846
-msgid "Disable 'Always On Top'"
-msgstr ""
-
-#: src/skins/ui_main.cc:848
-msgid "Enable 'Always On Top'"
-msgstr ""
-
-#: src/skins/ui_main.cc:851
-msgid "File Info Box"
-msgstr ""
-
-#: src/skins/ui_main.cc:857
-msgid "Visualizations"
-msgstr ""
-
-#: src/skins/ui_main.cc:1336
-msgid "Repeat point A set."
-msgstr ""
-
-#: src/skins/ui_main.cc:1341
-msgid "Repeat point B set."
-msgstr ""
-
-#: src/skins/ui_main.cc:1350
-msgid "Repeat points cleared."
-msgstr ""
-
-#: src/skins/ui_playlist.cc:219
-msgid "Search entries in active playlist"
-msgstr ""
-
-#: src/skins/ui_playlist.cc:226
-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.cc:234
-msgid "Title:"
-msgstr ""
-
-#: src/skins/ui_playlist.cc:241
-msgid "Album:"
-msgstr ""
-
-#: src/skins/ui_playlist.cc:248
-msgid "Artist:"
-msgstr ""
-
-#: src/skins/ui_playlist.cc:255
-msgid "File Name:"
-msgstr ""
-
-#: src/skins/ui_playlist.cc:263
-msgid "Clear previous selection before searching"
-msgstr ""
+#: src/skins-qt/skins_cfg.cc:294 src/skins/skins_cfg.cc:276
+msgid "Type"
+msgstr "Typ"
 
-#: src/skins/ui_playlist.cc:266
-msgid "Automatically toggle queue for matching entries"
-msgstr ""
+#: src/skins-qt/skins_cfg.cc:295 src/skins/skins_cfg.cc:277
+msgid "Visualization type:"
+msgstr "Visualiseringstyp:"
 
-#: src/skins/ui_playlist.cc:269
-msgid "Create a new playlist with matching entries"
-msgstr ""
+#: src/skins-qt/skins_cfg.cc:298 src/skins/skins_cfg.cc:280
+msgid "Analyzer"
+msgstr "Analysator"
 
-#: src/skins/ui_playlist.cc:717
-msgid "Audacious Playlist Editor"
-msgstr ""
+#: src/skins-qt/skins_cfg.cc:299 src/skins/skins_cfg.cc:281
+msgid "Show peaks"
+msgstr "Visa toppar"
 
-#: src/skins/ui_playlist.cc:752
-#, c-format
-msgid "%s (%d of %d)"
-msgstr ""
+#: src/skins-qt/skins_cfg.cc:308 src/skins/skins_cfg.cc:290
+msgid "Visualization"
+msgstr "Visualisering"
 
-#: src/skins/ui_skinselector.cc:167
+#: src/skins-qt/skinselector.cc:98 src/skins/skinselector.cc:111
 msgid "Archived Winamp 2.x skin"
-msgstr ""
+msgstr "Arkiverat Winamp 2.x skal"
 
-#: src/skins/ui_skinselector.cc:172
+#: src/skins-qt/skinselector.cc:102 src/skins/skinselector.cc:115
 msgid "Unarchived Winamp 2.x skin"
-msgstr ""
+msgstr "Oarkiverat Winamp 2.x skal"
 
-#: src/skins/util.cc:430
-#, c-format
-msgid "Could not create directory (%s): %s\n"
-msgstr ""
-
-#: src/sndfile/plugin.cc:39
+#: src/sndfile/plugin.cc:38
 msgid "Sndfile Plugin"
-msgstr ""
+msgstr "Sndfile Plugin"
 
-#: src/sndfile/plugin.cc:336
+#: src/sndfile/plugin.cc:372
 msgid ""
 "Based on the xmms_sndfile plugin:\n"
 "Copyright (C) 2000, 2002 Erik de Castro Lopo\n"
@@ -3676,93 +4205,135 @@
 "this program; if not, write to the Free Software Foundation, Inc., 51 "
 "Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 msgstr ""
+"Baserat på xmms_sndfile-insticksmodulen:\n"
+"Copyright (C) 2000, 2002 Erik de Castro Lopo\n"
+"\n"
+"Anpassad för Audacious av 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/sndio-ng/sndio.cc:44
+#: src/sndio/sndio.cc:43
 msgid "Sndio Output"
-msgstr ""
+msgstr "Sndio Output"
 
-#: src/sndio-ng/sndio.cc:98
+#: src/sndio/sndio.cc:98
 msgid "Device (blank for default):"
-msgstr ""
+msgstr "Enhet (tomt för standard):"
 
-#: src/sndio-ng/sndio.cc:100
+#: src/sndio/sndio.cc:100
 msgid "Save and restore volume:"
-msgstr ""
+msgstr "Spara och återställ volymen:"
 
-#: src/sndio-ng/sndio.cc:181
+#: src/sndio/sndio.cc:181
 #, c-format
 msgid "Sndio error: Unsupported audio format (%d)"
-msgstr ""
+msgstr "Sndio-fel: ljudformat stöds ej (%d)"
 
-#: src/sndio-ng/sndio.cc:192
+#: src/sndio/sndio.cc:192
 msgid "Sndio error: sio_open() failed"
-msgstr ""
+msgstr "Sndio-fel: sio_open() misslyckades"
 
-#: src/sndio-ng/sndio.cc:222
+#: src/sndio/sndio.cc:221
 msgid "Sndio error: sio_setpar() failed"
-msgstr ""
+msgstr "Sndio-fel: sio_setpar() misslyckades"
 
-#: src/sndio-ng/sndio.cc:234
+#: src/sndio/sndio.cc:233
 msgid "Sndio error: sio_start() failed"
-msgstr ""
+msgstr "Sndio-fel: sio_start() misslyckades"
 
-#: src/song_change/song_change.cc:33
+#: src/songchange/song_change.cc:30
 msgid "Song Change"
-msgstr ""
-
-#: src/song_change/song_change.cc:342
-msgid ""
-"Parameters passed to the shell should be encapsulated in "
-"quotes. Doing otherwise is a security risk."
-msgstr ""
+msgstr "Låtbyte"
 
-#: src/song_change/song_change.cc:358
+#: src/songchange/song_change.cc:256
 msgid "Commands"
-msgstr ""
+msgstr "Kommandon"
 
-#: src/song_change/song_change.cc:360
+#: src/songchange/song_change.cc:258
 msgid "Command to run when starting a new song:"
-msgstr ""
+msgstr "Kommando att köra när du börjar en ny låt:"
+
+#: src/songchange/song_change.cc:261
+msgid "Command to run when stopping a song:"
+msgstr "Kommando att köra när en låt stoppas:"
 
-#: src/song_change/song_change.cc:364
+#: src/songchange/song_change.cc:264
 msgid "Command to run at the end of a song:"
-msgstr ""
+msgstr "Kommando att köra i slutet av en låt:"
 
-#: src/song_change/song_change.cc:368
+#: src/songchange/song_change.cc:267
 msgid "Command to run at the end of the playlist:"
-msgstr ""
+msgstr "Kommando att köra i slutet av spellistan:"
 
-#: src/song_change/song_change.cc:372
+#: src/songchange/song_change.cc:270
 msgid "Command to run when song title changes (for network streams):"
+msgstr "Kommando att köra när låttitel ändras (för nätverksflöden):"
+
+#: src/songchange/song_change.cc:273
+msgid ""
+"You can use the following format codes, which will be replaced before "
+"running the command.\n"
+"Not all are useful though for the song-stopped or end-of-playlist command."
 msgstr ""
+"Du kan använda följande formatkoder, som kommer att ersättas innan du kör "
+"kommandot.\n"
+"Alla är dock inte användbara för kommandot stoppad låt eller spellistas slut."
 
-#: src/song_change/song_change.cc:376
+#: src/songchange/song_change.cc:276
 msgid ""
-"You can use the following format strings which will be substituted before "
-"calling the command (not all are useful for the end-of-playlist command):\n"
-"\n"
-"%F: Frequency (in hertz)\n"
+"%a: Artist\n"
+"%b: Album\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"
+"%F: Frequency (Hertz)\n"
+"%l: Length (milliseconds)\n"
+"%n or %s: Formatted title (see playlist settings)\n"
 "%p: Currently playing (1 or 0)\n"
+"%r: Rate (bits per second)\n"
+"%t: Playlist position\n"
+"%T: Title (unformatted)"
+msgstr ""
 "%a: Artist\n"
 "%b: Album\n"
-"%T: Track title"
+"%c: Antal kanaler\n"
+"%f: Filnamn (fullständig sökväg)\n"
+"%F: Frekvens (hertz)\n"
+"%l: Längd (millisekunder)\n"
+"%n or %s: Formaterad titel (se inställningar för spellista)\n"
+"%p: Spelar just nu (1 eller 0)\n"
+"%r: Kapacitet (bitar per sekund)\n"
+"%t: Plats av spellista\n"
+"%T: Titel (oformaterad)"
+
+#: src/songchange/song_change.cc:287
+msgid ""
+"Parameters passed to the shell should be enclosed in quotation marks.\n"
+"Unquoted parameters may lead to unexpected results."
 msgstr ""
+"Parametrar som skickas till skalet bör omges av citattecken.\n"
+"Ociterade parametrar kan leda till oväntade resultat."
 
-#: src/song-info-qt/song-info.cc:32
-msgid "Song Info (Qt)"
-msgstr ""
+#: src/song-info-qt/song-info.cc:30
+msgid "Song Info"
+msgstr "Låtinformation"
 
-#: src/sox-resampler/sox-resampler.cc:44
+#: src/soxr/sox-resampler.cc:44
 msgid "SoX Resampler"
-msgstr ""
+msgstr "SoX Resampler"
 
-#: src/sox-resampler/sox-resampler.cc:144
+#: src/soxr/sox-resampler.cc:172
 msgid ""
 "SoX Resampler Plugin for Audacious\n"
 "Copyright 2013 Michał Lipski\n"
@@ -3770,89 +4341,149 @@
 "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"
+"Baserad på Sample Rate Converter Plugin:\n"
+"Copyright 2010-2012 John Lindgren"
 
-#: src/sox-resampler/sox-resampler.cc:150
+#: src/soxr/sox-resampler.cc:178
 msgid "Quick"
-msgstr ""
+msgstr "Snabb"
 
-#: src/sox-resampler/sox-resampler.cc:151
+#: src/soxr/sox-resampler.cc:179
 msgid "Low"
-msgstr ""
+msgstr "Låg"
 
-#: src/sox-resampler/sox-resampler.cc:153
+#: src/soxr/sox-resampler.cc:181
 msgid "High"
-msgstr ""
+msgstr "Hög"
 
-#: src/sox-resampler/sox-resampler.cc:154
+#: src/soxr/sox-resampler.cc:182
 msgid "Very High"
-msgstr ""
+msgstr "Mycket hög"
+
+#: src/soxr/sox-resampler.cc:183
+msgid "Ultra High"
+msgstr "Ultra hög"
+
+#: src/soxr/sox-resampler.cc:187
+msgid "Minimum"
+msgstr "Minsta"
 
-#: src/sox-resampler/sox-resampler.cc:158
+#: src/soxr/sox-resampler.cc:188
+msgid "Intermediate"
+msgstr "Mellanliggande"
+
+#: src/soxr/sox-resampler.cc:193
 msgid "Quality:"
-msgstr ""
+msgstr "Kvalitet:"
+
+#: src/soxr/sox-resampler.cc:196
+msgid "Phase:"
+msgstr "Fas:"
 
-#: src/speed-pitch/speed-pitch.cc:51
+#: src/soxr/sox-resampler.cc:200
+msgid "Allow aliasing"
+msgstr "Tillåt vikning"
+
+#: src/soxr/sox-resampler.cc:202
+msgid "Use steep filter"
+msgstr "Använd brant filter"
+
+#: src/speedpitch/speed-pitch.cc:54
 msgid "Speed and Pitch"
-msgstr ""
+msgstr "Hastighet och tonhöjd"
 
-#: src/speed-pitch/speed-pitch.cc:210
-msgid "Speed and Pitch"
-msgstr ""
+#: src/speedpitch/speed-pitch.cc:247
+msgid "Speed"
+msgstr "Hastighet"
 
-#: src/speed-pitch/speed-pitch.cc:211
-msgid "Speed:"
-msgstr ""
+#: src/speedpitch/speed-pitch.cc:248
+msgid "Decouple from pitch"
+msgstr "Frikoppla från tonhöjd"
 
-#: src/speed-pitch/speed-pitch.cc:214
-msgid "Pitch:"
-msgstr ""
+#: src/speedpitch/speed-pitch.cc:250 src/speedpitch/speed-pitch.cc:258
+msgid "Multiplier:"
+msgstr "Multiplikator:"
 
-#: src/statusicon/statusicon.cc:47
-msgid "Status Icon"
-msgstr "Status ikon"
+#: src/speedpitch/speed-pitch.cc:254
+msgid "Pitch"
+msgstr "Tonhöjd"
 
-#: src/statusicon/statusicon.cc:283
-msgid "Se_ttings ..."
-msgstr ""
+#: src/statusicon-qt/statusicon.cc:45 src/statusicon/statusicon.cc:47
+msgid "Status Icon"
+msgstr "Statusikon"
 
-#: src/statusicon/statusicon.cc:372
+#: src/statusicon-qt/statusicon.cc:68
 msgid ""
-"Status Icon Plugin\n"
+"Status Icon Plugin (partial port for Qt interface)\n"
 "\n"
 "Copyright 2005-2007 Giacomo Lozito <james@develia.org>\n"
 "Copyright 2010 Michał Lipski <tallica@o2.pl>\n"
+"Copyright 2015 Eugene Paskevich <eugene@raptor.kiev.ua>\n"
 "\n"
 "This plugin provides a status icon, placed in\n"
 "the system tray area of the window manager."
 msgstr ""
+"Status Icon Plugin (partiell port för Qt-gränssnitt)\n"
+"\n"
+"Copyright 2005-2007 Giacomo Lozito <james@develia.org>\n"
+"Copyright 2010 Michał Lipski <tallica@o2.pl>\n"
+"Copyright 2015 Eugene Paskevich <eugene@raptor.kiev.ua>\n"
+"\n"
+"Denna insticksmodul ger en statusikon, placerad i\n"
+"systemfältet av fönsterhanteraren."
 
-#: src/statusicon/statusicon.cc:379
+#: src/statusicon-qt/statusicon.cc:89 src/statusicon/statusicon.cc:384
 msgid "Mouse Scroll Action"
-msgstr ""
+msgstr "Musrullningsåtgärd"
 
-#: src/statusicon/statusicon.cc:380
+#: src/statusicon-qt/statusicon.cc:90 src/statusicon/statusicon.cc:385
 msgid "Change volume"
-msgstr ""
+msgstr "Ändra volym"
 
-#: src/statusicon/statusicon.cc:383
+#: src/statusicon-qt/statusicon.cc:93 src/statusicon/statusicon.cc:388
 msgid "Change playing song"
-msgstr ""
+msgstr "Ändra spelande låt"
 
-#: src/statusicon/statusicon.cc:386
+#: src/statusicon-qt/statusicon.cc:96 src/statusicon/statusicon.cc:391
 msgid "Other Settings"
-msgstr ""
+msgstr "Andra inställningar"
 
-#: src/statusicon/statusicon.cc:387
+#: src/statusicon-qt/statusicon.cc:97 src/statusicon/statusicon.cc:392
 msgid "Disable the popup window"
-msgstr ""
+msgstr "Inaktivera popup-fönstret"
 
-#: src/statusicon/statusicon.cc:389
+#: src/statusicon-qt/statusicon.cc:99 src/statusicon/statusicon.cc:394
 msgid "Close to the system tray"
-msgstr ""
+msgstr "Stäng till systemfältet"
 
-#: src/statusicon/statusicon.cc:391
+#: src/statusicon-qt/statusicon.cc:101 src/statusicon/statusicon.cc:396
 msgid "Advance in playlist when scrolling upward"
+msgstr "Förväg i spellistan när du bläddrar uppåt"
+
+#: src/statusicon-qt/statusicon.cc:116 src/statusicon/statusicon.cc:287
+msgid "Se_ttings ..."
+msgstr "Ins_tällningar ..."
+
+#: src/statusicon/statusicon.cc:377
+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 ""
+"Status Icon Plugin\n"
+"\n"
+"Copyright 2005-2007 Giacomo Lozito <james@develia.org>\n"
+"Copyright 2010 Michał Lipski <tallica@o2.pl>\n"
+"\n"
+"Denna insticksmodul ger en statusikon, placerad i\n"
+"systemfältet av fönsterhanteraren."
 
 #: src/stereo_plugin/stereo.cc:19
 msgid "Extra Stereo"
@@ -3872,20 +4503,160 @@
 msgid "Extra Stereo"
 msgstr "Extra Stereo"
 
+#: src/streamtuner/icecast-model.cc:126 src/streamtuner/shoutcast-model.cc:131
+msgid "Type"
+msgstr "Typ"
+
+#: src/streamtuner/icecast-model.cc:132
+msgid "Current Song"
+msgstr "Aktuell låt"
+
+#: src/streamtuner/icecast-model.cc:164
+msgid "Other"
+msgstr "Annat"
+
+#: src/streamtuner/ihr-model.cc:63
+msgid "Market"
+msgstr "Marknad"
+
+#: src/streamtuner/ihr-model.cc:156
+msgid "Call Letters"
+msgstr "Ringbrev"
+
+#: src/streamtuner/ihr-model.cc:162
+msgid "Description"
+msgstr "Beskrivning"
+
+#: src/streamtuner/shoutcast-model.cc:128
+msgid "Listeners"
+msgstr "Lyssnare"
+
+#: src/streamtuner/shoutcast-model.cc:188
+msgid "Top 500 Stations"
+msgstr "Topp 500 stationer"
+
+#: src/streamtuner/shoutcast-model.cc:189
+msgid "Alternative"
+msgstr "Alternativ"
+
+#: src/streamtuner/shoutcast-model.cc:190
+msgid "Blues"
+msgstr "Blues"
+
+#: src/streamtuner/shoutcast-model.cc:191
+msgid "Classical"
+msgstr "Klassisk"
+
+#: src/streamtuner/shoutcast-model.cc:192
+msgid "Country"
+msgstr "Country"
+
+#: src/streamtuner/shoutcast-model.cc:193
+msgid "Decades"
+msgstr "Decennium"
+
+#: src/streamtuner/shoutcast-model.cc:194
+msgid "Easy Listening"
+msgstr "Lättlyssnat"
+
+#: src/streamtuner/shoutcast-model.cc:195
+msgid "Electronic"
+msgstr "Elektronisk"
+
+#: src/streamtuner/shoutcast-model.cc:196
+msgid "Folk"
+msgstr "Folkdans"
+
+#: src/streamtuner/shoutcast-model.cc:197
+msgid "Inspirational"
+msgstr "Inspirerande"
+
+#: src/streamtuner/shoutcast-model.cc:198
+msgid "International"
+msgstr "Internationell"
+
+#: src/streamtuner/shoutcast-model.cc:199
+msgid "Jazz"
+msgstr "Jazz"
+
+#: src/streamtuner/shoutcast-model.cc:200
+msgid "Latin"
+msgstr "Latinamerikansk musik"
+
+#: src/streamtuner/shoutcast-model.cc:201
+msgid "Metal"
+msgstr "Metal"
+
+#: src/streamtuner/shoutcast-model.cc:203
+msgid "New Age"
+msgstr "New age"
+
+#: src/streamtuner/shoutcast-model.cc:204
+msgid "Pop"
+msgstr "Pop"
+
+#: src/streamtuner/shoutcast-model.cc:205
+msgid "Public Radio"
+msgstr "Offentlig radio"
+
+#: src/streamtuner/shoutcast-model.cc:206
+msgid "R&B and Urban"
+msgstr "R&B och Urban"
+
+#: src/streamtuner/shoutcast-model.cc:207
+msgid "Rap"
+msgstr "Rap"
+
+#: src/streamtuner/shoutcast-model.cc:208
+msgid "Reggae"
+msgstr "Reggae"
+
+#: src/streamtuner/shoutcast-model.cc:209
+msgid "Rock"
+msgstr "Rock"
+
+#: src/streamtuner/shoutcast-model.cc:210
+msgid "Seasonal and Holiday"
+msgstr "Säsong och semester"
+
+#: src/streamtuner/shoutcast-model.cc:211
+msgid "Soundtracks"
+msgstr "Soundtracks"
+
+#: src/streamtuner/shoutcast-model.cc:212
+msgid "Talk"
+msgstr "Prat"
+
+#: src/streamtuner/shoutcast-model.cc:213
+msgid "Themes"
+msgstr "Teman"
+
+#: src/streamtuner/streamtuner.cc:59
+msgid "Shoutcast"
+msgstr "Shoutcast"
+
+#: src/streamtuner/streamtuner.cc:60
+msgid "Icecast"
+msgstr "Icecast"
+
+#: src/streamtuner/streamtuner.cc:71
+msgid "Stream Tuner"
+msgstr "Strömstämmare"
+
 #: src/tonegen/tonegen.cc:45
 msgid "Tone Generator"
-msgstr ""
+msgstr "Tongenerator"
 
-#: src/tonegen/tonegen.cc:94
+#: src/tonegen/tonegen.cc:92
 #, c-format
 msgid "%s %.1f Hz"
 msgstr "%s %.1f Hz"
 
-#: src/tonegen/tonegen.cc:94
+#: src/tonegen/tonegen.cc:92
 msgid "Tone Generator: "
-msgstr ""
+msgstr "Tongenerator: "
 
-#: src/tonegen/tonegen.cc:160
+#: src/tonegen/tonegen.cc:161
 msgid ""
 "Sine tone generator by Håvard Kvålen <havardk@xmms.org>\n"
 "Modified by Daniel J. Peng <danielpeng@bigfoot.com>\n"
@@ -3893,12 +4664,39 @@
 "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 av Håvard Kvålen <havardk@xmms.org>\n"
+"Ändrad av Daniel J. Peng <danielpeng@bigfoot.com>\n"
+"\n"
+"För att använda det, lägg till en webbadress: tone://frequency1;frequency2;"
+"frequency3;...\n"
+"t.ex. tone://2000;2005 to play a 2000 Hz tone and a 2005 Hz tone"
+
+#: src/ui-common/dialogs-qt.cc:40
+msgid ""
+"\n"
+"(Further messages have been hidden.)"
+msgstr ""
+"\n"
+"(Ytterligare meddelanden har dolts.)"
+
+#: src/ui-common/dialogs-qt.cc:52
+msgid "Working ..."
+msgstr "Arbetar ..."
+
+#: src/ui-common/dialogs-qt.cc:73
+msgid "Information"
+msgstr "Information"
+
+#: src/ui-common/menu-ops-gtk.cc:132 src/ui-common/menu-ops-qt.cc:113
+#, c-format
+msgid "%s does not appear to be a valid folder."
+msgstr "%s verkar inte vara en giltig mapp."
 
 #: src/voice_removal/voice_removal.cc:28
 msgid "Voice Removal"
-msgstr ""
+msgstr "Röstavlägsnande"
 
-#: src/vorbis/vorbis.cc:465
+#: src/vorbis/vorbis.cc:433
 msgid ""
 "Audacious Ogg Vorbis Decoder\n"
 "\n"
@@ -3920,10 +4718,10 @@
 msgstr ""
 "Audacious Ogg Vorbis Decoder\n"
 "\n"
-"Baserat på Xiph.org stiftelsens Ogg Vorbis Plugin: \n"
+"Baserat på Xiph.org stiftelsens Ogg Vorbis-insticksmodul: \n"
 "http://www.xiph.org/\n"
 "\n"
-"Original kod av: \n"
+"Ursprunglig kod av: \n"
 "Tony Arcieri <bascule@inferno.tusculum.edu> \n"
 "\n"
 "Bidrag från: \n"
@@ -3938,14 +4736,14 @@
 
 #: src/vorbis/vorbis.h:18
 msgid "Ogg Vorbis Decoder"
-msgstr "Ogg Vorbis Dekoder"
+msgstr "Ogg Vorbis-avkodare"
 
-#: src/vtx/info.cc:22
+#: src/vtx/info.cc:24
 #, c-format
 msgid "Details about %s"
-msgstr ""
+msgstr "Detaljer om %s"
 
-#: src/vtx/info.cc:24
+#: src/vtx/info.cc:26
 msgid ""
 "Title: %t\n"
 "Author: %a\n"
@@ -3959,12 +4757,23 @@
 "Player Freq: %P\n"
 "Year: %y"
 msgstr ""
+"Titel: %t\n"
+"Författare: %a\n"
+"Från: %f\n"
+"Spårare: %T\n"
+"Kommentar: %C\n"
+"Chip-typ: %c\n"
+"Stereo: %s\n"
+"Slinga: %l\n"
+"Chip-frekvens: %F\n"
+"Spelarens frekvens: %P\n"
+"År: %y"
 
 #: src/vtx/vtx.cc:38
 msgid "VTX Decoder"
-msgstr "VTX Dekoder"
+msgstr "VTX-avkodare"
 
-#: src/vtx/vtx.cc:184
+#: src/vtx/vtx.cc:178
 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"
@@ -3972,41 +4781,106 @@
 msgstr ""
 "Vortex filformat spelaren genom Sashnov Alexander <sashnov@ngs.ru> \n"
 "Baserat på in_vtx.dll av Roman Sherbakov <v_soft@microfor.ru> \n"
-"Audacious plugin av Pavel Vymetalek <pvymetalek@seznam.cz>"
+"Audacious-insticksmodul av Pavel Vymetalek <pvymetalek@seznam.cz>"
+
+#: src/vumeter-qt/vumeter_qt.cc:31
+msgid ""
+"VU Meter Plugin for Audacious\n"
+"Copyright 2017-2019 Marc Sánchez Fauste"
+msgstr ""
+"VU Meter Plugin för Audacious\n"
+"Copyright 2017-2019 Marc Sánchez Fauste"
+
+#: src/vumeter-qt/vumeter_qt.cc:35
+msgid "VU Meter Settings"
+msgstr "VU Meter inställningar"
+
+#: src/vumeter-qt/vumeter_qt.cc:37
+msgid "Peak hold time:"
+msgstr "Högsta hålltid:"
+
+#: src/vumeter-qt/vumeter_qt.cc:42
+msgid "Fall-off time:"
+msgstr "Reduktionstid:"
+
+#: src/vumeter-qt/vumeter_qt.cc:44
+msgid "dB/second"
+msgstr "dB/sekund"
+
+#: src/vumeter-qt/vumeter_qt.cc:46
+msgid "Display legend"
+msgstr "Visningslegend"
+
+#: src/vumeter-qt/vumeter_qt.h:37
+msgid "VU Meter"
+msgstr "VU-mätare"
+
+#: src/waveout/waveout.cc:43
+msgid "Win32 waveOut"
+msgstr "Win32 waveOut"
+
+#: src/waveout/waveout.cc:69
+msgid ""
+"Win32 waveOut Plugin for Audacious\n"
+"Copyright 2016 John Lindgren"
+msgstr ""
+"Win32 waveOut Plugin för Audacious\n"
+"Copyright 2016 John Lindgren"
 
-#: src/wavpack/wavpack.cc:24
+#: src/wavpack/wavpack.cc:25
 msgid "WavPack Decoder"
-msgstr "WavPack Dekoder"
+msgstr "WavPack-avkodare"
 
-#: src/wavpack/wavpack.cc:211
+#: src/wavpack/wavpack.cc:217
 msgid "lossy (hybrid)"
-msgstr "lossy (hybrid)"
+msgstr "destruktiv komprimering (hybrid)"
 
-#: src/wavpack/wavpack.cc:213
+#: src/wavpack/wavpack.cc:219
 msgid "lossy"
-msgstr "lossy"
+msgstr "destruktiv komprimering"
 
-#: src/wavpack/wavpack.cc:255
+#: src/wavpack/wavpack.cc:259
 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"
-"En del av plugin-koden var av Miles Egan."
+"Copyright 2006 William Pitcock <nenolod@nenolod.net>\n"
+"\n"
+"En del av insticksmodulskoden var av Miles Egan."
 
-#: src/xsf/plugin.cc:50
+#: src/xsf/plugin.cc:74
 msgid "2SF Decoder"
-msgstr "2SF Dekoder"
+msgstr "2SF-avkodare"
+
+#: src/xsf/plugin.cc:429
+msgid "32728 Hz"
+msgstr "32728 Hz"
+
+#: src/xsf/plugin.cc:432
+msgid "65456 Hz"
+msgstr "65456 Hz"
+
+#: src/xsf/plugin.cc:438
+msgid "Cosine"
+msgstr "Cosinus"
 
-#: src/xsf/plugin.cc:238
+#: src/xsf/plugin.cc:439
+msgid "Sharp"
+msgstr "Skarp"
+
+#: src/xsf/plugin.cc:443
 msgid "XSF Configuration"
-msgstr ""
+msgstr "XSF-konfiguration"
 
-#: src/xsf/plugin.cc:239
-msgid "Ignore length from file"
-msgstr ""
+#: src/xsf/plugin.cc:445
+msgid "Default fade time:"
+msgstr "Standardtoningstid:"
+
+#: src/xsf/plugin.cc:447
+msgid "Interpolation mode:"
+msgstr "Interpolationsläge:"
 
-#: src/xspf/xspf.cc:89
+#: src/xspf/xspf.cc:95
 msgid "XML Shareable Playlists (XSPF)"
-msgstr "XML Delbara Spellistor (XSPF)"
+msgstr "XML-delbara spellistor (XSPF)"

audacious-plugins-3.6.2-gtk3.tar.bz2/po/ta.po -> audacious-plugins-4.4.1.tar.bz2/po/ta.po Changed

@@ -10,11 +10,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Audacious Plugins\n"
-"Report-Msgid-Bugs-To: http://redmine.audacious-media-player.org/\n"
-"POT-Creation-Date: 2015-02-28 19:18+0100\n"
-"PO-Revision-Date: 2015-02-04 21:21+0000\n"
-"Last-Translator: Thomas Lange <thomas-lange2@gmx.de>\n"
-"Language-Team: Tamil (http://www.transifex.com/projects/p/audacious/language/"
+"Report-Msgid-Bugs-To: https://github.com/audacious-media-player/audacious/"
+"issues\n"
+"POT-Creation-Date: 2024-09-26 21:54+0200\n"
+"PO-Revision-Date: 2011-10-10 17:43+0000\n"
+"Last-Translator: Nareshwar Raju Vaneshwar <rajnareshwar@gmail.com>, 2013\n"
+"Language-Team: Tamil (http://app.transifex.com/audacious/audacious/language/"
 "ta/)\n"
 "Language: ta\n"
 "MIME-Version: 1.0\n"
@@ -22,239 +23,60 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: src/aac-raw/aac.cc:18
+#: src/aac/aac.cc:19
 msgid "AAC (Raw) Decoder"
-msgstr ""
+msgstr "aac (மூல) டிகோடர்"
 
-#: src/adplug/adplug-xmms.cc:42
+#: src/adplug/adplug-xmms.cc:70
 msgid "AdPlug (AdLib Player)"
 msgstr "AdPlug (AdLib Player)"
 
-#: src/adplug/adplug-xmms.cc:156 src/modplug/modplugbmp.cc:335
-#: src/psf/plugin.cc:138 src/vtx/vtx.cc:87 src/xsf/plugin.cc:113
+#: src/adplug/adplug-xmms.cc:167 src/modplug/modplugbmp.cc:321
+#: src/psf/plugin.cc:161 src/vtx/vtx.cc:89 src/xsf/plugin.cc:204
 msgid "sequenced"
-msgstr ""
-
-#: src/alarm/alarm.cc:55 src/alarm/interface.cc:82
-msgid "Alarm"
-msgstr "அலாரம்"
-
-#: src/alarm/alarm.cc:782
-msgid "Set Alarm ..."
-msgstr ""
-
-#: src/alarm/alarm.cc:810
-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/interface.cc: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.cc: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.cc: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.cc:81
-msgid "This is your wakeup call."
-msgstr "இது உங்களை எழுப்புவதற்கான அழைப்பு"
-
-#: src/alarm/interface.cc:99
-msgid "Your reminder for today is..."
-msgstr ""
-
-#: src/alarm/interface.cc:101 src/alarm/interface.cc:386
-msgid "Reminder"
-msgstr "நினைவூட்டி"
-
-#: src/alarm/interface.cc:132
-msgid "Monday"
-msgstr "திங்கட்கிழமை "
-
-#: src/alarm/interface.cc:132
-msgid "Tuesday"
-msgstr "செவ்வாய்கிழமை "
+msgstr "வரிசைப்படுத்தப்பட்ட"
 
-#: src/alarm/interface.cc:132
-msgid "Wednesday"
-msgstr "புதன்கிழமை "
-
-#: src/alarm/interface.cc:133
-msgid "Thursday"
-msgstr "வியாழக்கிழமை "
-
-#: src/alarm/interface.cc:133
-msgid "Friday"
-msgstr "வெள்ளிக்கிழமை "
-
-#: src/alarm/interface.cc:133
-msgid "Saturday"
-msgstr "சனிக்கிழமை "
-
-#: src/alarm/interface.cc:133
-msgid "Sunday"
-msgstr "ஞாயிற்றுகிழமை "
-
-#: src/alarm/interface.cc:171 src/alarm/interface.cc:230
-#: src/alarm/interface.cc:245
-msgid "Time"
-msgstr "நேரம் "
-
-#: src/alarm/interface.cc:178
-msgid "Alarm at (default):"
-msgstr "அலாரம் அடிக்கும் நேரம் (இயல்புநிலை) :"
-
-#: src/alarm/interface.cc:200
-msgid "h"
-msgstr "h"
-
-#: src/alarm/interface.cc:203
-msgid "Quiet after:"
-msgstr "பின் நிசப்தமாக்குக: "
-
-#: src/alarm/interface.cc:215
-msgid "hours"
-msgstr "மணித்தியாலங்கள் "
-
-#: src/alarm/interface.cc:226
-msgid "minutes"
-msgstr "நிமிடங்கள் "
-
-#: src/alarm/interface.cc:235
-msgid "Choose the days for the alarm to come on"
-msgstr "அலாரம் வேண்டிய நாட்களை தெரிவு செய்க "
-
-#: src/alarm/interface.cc:242
-msgid "Day"
-msgstr "நாள் "
-
-#: src/alarm/interface.cc:259 src/bs2b/plugin.cc:130
-#: src/skins/preset-list.cc:434 src/skins/preset-list.cc:440
-msgid "Default"
-msgstr "இயல்புநிலை"
-
-#: src/alarm/interface.cc:288
-msgid "Days"
-msgstr "நாட்கள் "
-
-#: src/alarm/interface.cc:297
-msgid "Fading"
-msgstr "மங்குதல் "
-
-#: src/alarm/interface.cc:305 src/console/plugin.cc:41
-#: src/crossfade/crossfade.cc:53 src/crossfade/crossfade.cc:59
-#: src/gtkui/settings.cc:49 src/lirc/lirc.cc:397 src/sid/xs_config.cc:85
-#: src/sid/xs_config.cc:94 src/sid/xs_config.cc:103
-msgid "seconds"
-msgstr "வினாடிகள் "
+#: src/adplug/adplug-xmms.cc:349 src/sid/xs_config.cc:61
+msgid "Output"
+msgstr " வெளியீடு "
 
-#: src/alarm/interface.cc:312 src/alarm/interface.cc:353
-msgid "Volume"
-msgstr "ஒலி அளவு "
+#: src/adplug/adplug-xmms.cc:350
+msgid "OPL Emulator:"
+msgstr "opl முன்மாதிரி:"
+
+#: src/adplug/adplug-xmms.cc:353 src/amidiplug/i_configure.cc:153
+#: src/console/plugin.cc:45 src/filewriter/filewriter.cc:481
+#: src/sid/xs_config.cc:65 src/xsf/plugin.cc:446
+msgid "Sample rate:"
+msgstr "மாதிரி விகிதம்:"
 
-#: src/alarm/interface.cc:317
-msgid "Start at"
-msgstr "இங்கு ஆரம்பிக்குக "
-
-#: src/alarm/interface.cc:333
-msgid "Final"
-msgstr "இறுதி "
-
-#: src/alarm/interface.cc:346
-msgid "Current"
-msgstr "தற்போதைய "
-
-#: src/alarm/interface.cc:359
-msgid "Additional Command"
-msgstr "மேலதிக பின்னூட்டு"
+#: src/adplug/adplug-xmms.cc:354 src/amidiplug/i_configure.cc:155
+#: src/bs2b/plugin.cc:141 src/console/plugin.cc:47
+#: src/modplug/plugin_main.cc:77 src/resample/resample.cc:201
+#: src/resample/resample.cc:207 src/resample/resample.cc:211
+#: src/resample/resample.cc:215 src/resample/resample.cc:219
+#: src/resample/resample.cc:223 src/resample/resample.cc:227
+#: src/resample/resample.cc:231 src/resample/resample.cc:235
+#: src/resample/resample.cc:239 src/resample/resample.cc:243
+#: src/sid/xs_config.cc:67 src/soxr/sox-resampler.cc:205
+msgid "Hz"
+msgstr "Hz"
 
-#: src/alarm/interface.cc:365 src/alarm/interface.cc:391
-msgid "enable"
-msgstr "செயல்படுத்துக "
+#: src/adplug/adplug-xmms.cc:355 src/gtkui/settings.cc:55
+#: src/modplug/plugin_main.cc:105 src/qtui/settings.cc:85
+#: src/skins-qt/skins_cfg.cc:302 src/skins/skins_cfg.cc:284
+msgid "Miscellaneous"
+msgstr " இதர "
 
-#: src/alarm/interface.cc:372
-msgid "Playlist (optional)"
-msgstr "பாடல் பட்டியல் (விரும்பினால் மட்டும்)"
-
-#: src/alarm/interface.cc:379
-msgid "Select a playlist"
-msgstr "பாடல் பட்டியலினை தெரிவு செய்க"
-
-#: src/alarm/interface.cc:399
-msgid "Options"
-msgstr "விருப்பத்தேர்வுகள் "
-
-#: src/alarm/interface.cc:404
-msgid "What do these options mean?"
-msgstr "இவ்விருப்ப தேர்வுகள் எதனை உணர்த்துகின்றன?"
-
-#: src/alarm/interface.cc:420
-msgid "Help"
-msgstr "உதவி "
+#: src/adplug/adplug-xmms.cc:356
+msgid "Repeat song in endless loop"
+msgstr "முடிவில்லாத வளையத்தில் பாடலை மீண்டும் செய்யவும்"
 
-#: src/albumart/albumart.cc:31
+#: src/albumart/albumart.cc:31 src/albumart-qt/albumart.cc:35
 msgid "Album Art"
 msgstr "குறுவட்டு வரைவு "
 
-#: src/albumart-qt/albumart.cc:33
-msgid "Album Art (Qt)"
-msgstr ""
-
-#: src/alsa/alsa.h:70
+#: src/alsa/alsa.h:64
 msgid "ALSA Output"
 msgstr "ALSA வெளியீடு"
 
@@ -266,10 +88,15 @@
 "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"
+"\n"
+" alsa வெளியீட்டு சொருகி ng இன் ஆசிரியர் வில்லியம் பிட்காக்கிற்கு எனது நன்றி, alsa "
+"கையேடு போதுமானதாக இல்லாதபோது அதன் குறியீடு ஒரு குறிப்பாக செயல்பட்டது."
 
 #: src/alsa/config.cc:61
 msgid "(no description)"
-msgstr ""
+msgstr "(விளக்கம் இல்லை)"
 
 #: src/alsa/config.cc:166
 msgid "Default PCM device"
@@ -291,11 +118,11 @@
 msgid "Mixer element:"
 msgstr "கலவை உறுப்பு:"
 
-#: src/amidi-plug/amidi-plug.cc:41
+#: src/amidiplug/amidi-plug.cc:42
 msgid "AMIDI-Plug (MIDI Player)"
 msgstr "AMIDI-சொருகி (MIDI இயக்கி )"
 
-#: src/amidi-plug/amidi-plug.cc:437
+#: src/amidiplug/amidi-plug.cc:445
 msgid ""
 "AMIDI-Plug\n"
 "modular MIDI music player\n"
@@ -317,158 +144,181 @@
 "Tony Vroon\n"
 "for the good help with alpha testing"
 msgstr ""
+"அமிடி-பிளக் \n"
+" மட்டு மிடி மியூசிக் பிளேயர் \n"
+" http://www.develia.org/projects.php?p=amidiplug \n"
+"\n"
+" கியாகோமோ லோசிட்டோ எழுதியது \n"
+" <james@develia.org> \n"
+"\n"
+" சிறப்பு நன்றிகள்... \n"
+"\n"
+" கிளெமென்ச் லேடிச் மற்றும் சரோச்லாவ் கைசெலா \n"
+" அவர்களின் அருமையான நிரல்களுக்கு அப்லேமிடி மற்றும் அமிக்சர்; அவை \n"
+" அல்சா-லிப் டாக்சுடன், ஒழுங்காக மிகவும் பயனுள்ளதாக இருந்தது \n"
+" alsa பநிஇ பற்றி மேலும் அறிய \n"
+"\n"
+" ஆல்ஃபிரடோ ச்பாடாஃபினா \n"
+" நல்ல மிடி விசைப்பலகை லோகோவுக்கு \n"
+"\n"
+" டோனி வ்ரூன் \n"
+" ஆல்பா சோதனைக்கு நல்ல உதவிக்கு"
 
-#: src/amidi-plug/i_configure.cc:94
+#: src/amidiplug/i_configure.cc:94
 msgid "Override default gain:"
-msgstr ""
+msgstr "இயல்புநிலை ஆதாயத்தை மீறவும்:"
 
-#: src/amidi-plug/i_configure.cc:102
+#: src/amidiplug/i_configure.cc:102
 msgid "Override default polyphony:"
-msgstr ""
+msgstr "இயல்புநிலை பாலிஃபோனியை மேலெழுதவும்:"
 
-#: src/amidi-plug/i_configure.cc:110
+#: src/amidiplug/i_configure.cc:110
 msgid "Override default reverb:"
-msgstr ""
+msgstr "இயல்புநிலை எதிரொலியை மேலெழுதவும்:"
 
-#: src/amidi-plug/i_configure.cc:112 src/amidi-plug/i_configure.cc:120
+#: src/amidiplug/i_configure.cc:112 src/amidiplug/i_configure.cc:120
 msgid "On"
-msgstr ""
+msgstr "ஆன்"
 
-#: src/amidi-plug/i_configure.cc:118
+#: src/amidiplug/i_configure.cc:118
 msgid "Override default chorus:"
-msgstr ""
+msgstr "இயல்புநிலை கோரசை மேலெழுதவும்:"
 
-#: src/amidi-plug/i_configure.cc:128 src/console/plugin.cc:29
+#: src/amidiplug/i_configure.cc:128 src/console/plugin.cc:29
 msgid "Playback"
-msgstr ""
+msgstr " பின்னணி "
 
-#: src/amidi-plug/i_configure.cc:129
+#: src/amidiplug/i_configure.cc:129
 msgid "Transpose:"
-msgstr ""
+msgstr "இடமாற்றம்:"
 
-#: src/amidi-plug/i_configure.cc:131
+#: src/amidiplug/i_configure.cc:131 src/speedpitch/speed-pitch.cc:257
 msgid "semitones"
-msgstr ""
+msgstr "செமிடோன்கள்"
 
-#: src/amidi-plug/i_configure.cc:132
+#: src/amidiplug/i_configure.cc:132
 msgid "Drum shift:"
-msgstr ""
+msgstr "டிரம் சிப்ட்:"
 
-#: src/amidi-plug/i_configure.cc:134
+#: src/amidiplug/i_configure.cc:134
 msgid "note numbers"
-msgstr ""
+msgstr "குறிப்பு எண்கள்"
 
-#: src/amidi-plug/i_configure.cc:135
+#: src/amidiplug/i_configure.cc:135
 msgid "Skip leading silence"
-msgstr ""
+msgstr "முன்னணி ம .னத்தைத் தவிர்க்கவும்"
 
-#: src/amidi-plug/i_configure.cc:137
+#: src/amidiplug/i_configure.cc:137
 msgid "Skip trailing silence"
-msgstr ""
+msgstr "பின்னால் செல்லும் ம .னத்தைத் தவிர்க்கவும்"
 
-#: src/amidi-plug/i_configure.cc:141
+#: src/amidiplug/i_configure.cc:141
 msgid "SoundFont"
-msgstr ""
+msgstr " சவுண்ட்ஃபோன்ட் "
 
-#: src/amidi-plug/i_configure.cc:143
+#: src/amidiplug/i_configure.cc:148
 msgid "Synthesizer"
-msgstr ""
-
-#: src/amidi-plug/i_configure.cc:148 src/console/plugin.cc:45
-#: src/sid/xs_config.cc:65
-msgid "Sample rate:"
-msgstr ""
-
-#: src/amidi-plug/i_configure.cc:150 src/bs2b/plugin.cc:141
-#: src/console/plugin.cc:47 src/modplug/plugin_main.cc:78
-#: src/resample/resample.cc:201 src/resample/resample.cc:207
-#: src/resample/resample.cc:211 src/resample/resample.cc:215
-#: src/resample/resample.cc:219 src/resample/resample.cc:223
-#: src/resample/resample.cc:227 src/resample/resample.cc:231
-#: src/resample/resample.cc:235 src/resample/resample.cc:239
-#: src/resample/resample.cc:243 src/sid/xs_config.cc:67
-#: src/sox-resampler/sox-resampler.cc:163
-msgid "Hz"
-msgstr "Hz"
+msgstr " சின்தசைசர் "
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:52
+#: src/amidiplug/i_configure-fluidsynth.cc:58
+#: src/amidiplug/i_configure-fluidsynth.cc:527
 msgid "AMIDI-Plug - select SoundFont file"
 msgstr "AMIDI-சொருகி - ஒலி எழுத்துரு கோப்பினை தெரிவு செய்க "
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:55 src/filewriter/mp3.cc:658
+#: src/amidiplug/i_configure-fluidsynth.cc:61
 msgid "_Cancel"
-msgstr ""
+msgstr "_இரத்து செய் "
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:56
+#: src/amidiplug/i_configure-fluidsynth.cc:62
 msgid "_Open"
-msgstr ""
+msgstr "_திற "
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:225 src/gtkui/columns.cc:46
+#: src/amidiplug/i_configure-fluidsynth.cc:233
+#: src/amidiplug/i_configure-fluidsynth.cc:461
 msgid "File name"
 msgstr "கோப்பின் பெயர் "
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:229
+#: src/amidiplug/i_configure-fluidsynth.cc:237
+#: src/amidiplug/i_configure-fluidsynth.cc:464
 msgid "Size (bytes)"
 msgstr "அளவு (பயிட்ஸ்)"
 
-#: src/amidi-plug/i_fileinfo.cc:163
+#: src/amidiplug/i_fileinfo.cc:184
 msgid "Name:"
 msgstr "பெயர்: "
 
-#: src/amidi-plug/i_fileinfo.cc:181
+#: src/amidiplug/i_fileinfo.cc:202
 msgid " MIDI Info "
 msgstr " MIDI தகவல் "
 
-#: src/amidi-plug/i_fileinfo.cc:195
+#: src/amidiplug/i_fileinfo.cc:216
 msgid "Format:"
 msgstr "வடிவமைப்பு: "
 
-#: src/amidi-plug/i_fileinfo.cc:198
+#: src/amidiplug/i_fileinfo.cc:219
 msgid "Length (msec):"
 msgstr "நீளம் (மில்லி வினாடிகள்): "
 
-#: src/amidi-plug/i_fileinfo.cc:201
+#: src/amidiplug/i_fileinfo.cc:222
 msgid "No. of Tracks:"
 msgstr "பாடல்களின் இலக்கங்கள்:"
 
-#: src/amidi-plug/i_fileinfo.cc:207
+#: src/amidiplug/i_fileinfo.cc:228
 msgid "variable"
 msgstr "மாறி "
 
-#: src/amidi-plug/i_fileinfo.cc:209
+#: src/amidiplug/i_fileinfo.cc:230
 msgid "BPM:"
 msgstr "துடிப்புகள் ஒரு நிமிடத்திற்கு: "
 
-#: src/amidi-plug/i_fileinfo.cc:217
+#: src/amidiplug/i_fileinfo.cc:238
 msgid "BPM (wavg):"
 msgstr "துடிப்புகள் ஒரு நிமிடத்திற்கு (wavg): "
 
-#: src/amidi-plug/i_fileinfo.cc:220
+#: src/amidiplug/i_fileinfo.cc:241
 msgid "Time Div:"
 msgstr "நேரப் பிரிவு:"
 
-#: src/amidi-plug/i_fileinfo.cc:231
+#: src/amidiplug/i_fileinfo.cc:252
 msgid " MIDI Comments and Lyrics "
 msgstr " MIDI பின்னூட்டுகள் மற்றும் பாடல் வரிகள் "
 
-#: src/amidi-plug/i_fileinfo.cc:278
+#: src/amidiplug/i_fileinfo.cc:299
 msgid "* no comments available in this MIDI file *"
 msgstr "*இந்த MIDI கோப்பிற்கான எந்தவொரு பின்னூட்டும் கிடைக்கப்படவில்லை * "
 
-#: src/amidi-plug/i_fileinfo.cc:290
+#: src/amidiplug/i_fileinfo.cc:311
 msgid "* no lyrics available in this MIDI file *"
 msgstr "*இந்த MIDI கோப்பிற்கான எந்தவொரு பாடல்வரிகளும் கிடைக்கப்படவில்லை * "
 
-#: src/amidi-plug/i_fileinfo.cc:300 src/filewriter/vorbis.cc:197
-#: src/ladspa/plugin.cc:416
+#: src/amidiplug/i_fileinfo.cc:321 src/ladspa/plugin.cc:418
+#: src/ui-common/dialogs-qt.cc:32
 msgid "_Close"
 msgstr "_மூடவும்"
 
-#: src/amidi-plug/i_fileinfo.cc:325
+#: src/amidiplug/i_fileinfo.cc:346
 msgid " (invalid UTF-8)"
 msgstr "(செல்லுபடியற்ற UTF-8 )"
 
-#: src/aosd/aosd.cc:32
+#: src/ampache/ampache.cc:33
+msgid "Ampache Browser"
+msgstr "ஆம்பேச் உலாவி"
+
+#: src/ampache/ampache.cc:46
+msgid ""
+"Ampache Browser for Audacious\n"
+"http://ampache-browser.org/\n"
+"\n"
+"Copyright (C) Róbert Čerňanský and John Lindgren\n"
+"License: GNU GPLv3"
+msgstr ""
+"துணிச்சலான ஆம்பாச் உலாவி \n"
+" http://ampache-browser.org/ \n"
+"\n"
+" பதிப்புரிமை (இ) ராபர்ட் čerňanský மற்றும் சான் லிண்ட்கிரென் \n"
+" உரிமம்: gnu gplv3"
+
+#: src/aosd/aosd.cc:31
 msgid ""
 "Audacious OSD\n"
 "http://www.develia.org/projects.php?p=audacious#aosd\n"
@@ -478,6 +328,13 @@
 "Based in part on Evan Martin's Ghosd library:\n"
 "http://neugierig.org/software/ghosd/"
 msgstr ""
+"துணிச்சலான osd \n"
+" http://www.develia.org/projects.php? \n"
+"\n"
+" கியாகோமோ லோசிடோ <james@develia.org> எழுதியது \n"
+"\n"
+" இவான் மார்ட்டினின் கோச்ட் நூலகத்தை அடிப்படையாகக் கொண்டது: \n"
+" http://neugierig.org/software/ghosd/"
 
 #: src/aosd/aosd.h:37
 msgid "AOSD (On-Screen Display)"
@@ -495,130 +352,130 @@
 msgid "Concave Rectangle"
 msgstr "குழிவான செவ்வகம் "
 
-#: src/aosd/aosd_style.cc:69
+#: src/aosd/aosd_style.cc:69 src/openmpt/mptwrap.h:50 src/xsf/plugin.cc:436
 msgid "None"
 msgstr "ஏதுமில்லை "
 
-#: src/aosd/aosd_trigger.cc:50
+#: src/aosd/aosd_trigger.cc:49
 msgid "Playback Start"
 msgstr "மீள் இயக்கினை ஆரம்பிக்குக "
 
-#: src/aosd/aosd_trigger.cc:51
+#: src/aosd/aosd_trigger.cc:50
 msgid "Triggers OSD when a playlist entry is played."
 msgstr "பாடல் பட்டியல் இடுகை இயக்கப்படுகையில் திரையில் தோன்றும் காட்சி தூண்டப்படுகிறது. "
 
-#: src/aosd/aosd_trigger.cc:56
+#: src/aosd/aosd_trigger.cc:55
 msgid "Title Change"
 msgstr "தலைப்பு மாற்றம் "
 
-#: src/aosd/aosd_trigger.cc:57
+#: src/aosd/aosd_trigger.cc:56
 msgid "Triggers OSD when the song title changes (for internet streams)."
-msgstr ""
+msgstr "பாடல் தலைப்பு மாறும்போது (இணைய ச்ட்ரீம்களுக்கு) osd ஐ தூண்டுகிறது."
 
-#: src/aosd/aosd_trigger.cc:62
+#: src/aosd/aosd_trigger.cc:61
 msgid "Pause On"
 msgstr "இடைநிறுத்தத்தை ஆரம்பிக்க "
 
-#: src/aosd/aosd_trigger.cc:63
+#: src/aosd/aosd_trigger.cc:62
 msgid "Triggers OSD when playback is paused."
 msgstr "மீளியக்கம் இடைநிறுத்தப்படும் போது திரையில் தோன்றும் காட்சி தூண்டப்படுகிறது."
 
-#: src/aosd/aosd_trigger.cc:68
+#: src/aosd/aosd_trigger.cc:67
 msgid "Pause Off"
 msgstr "இடைநிறுத்தத்தை நிறுத்துக"
 
-#: src/aosd/aosd_trigger.cc:69
+#: src/aosd/aosd_trigger.cc:68
 msgid "Triggers OSD when playback is unpaused."
 msgstr "மீளியக்கம் நிறுத்தப்படுகையில் திரையில் தோன்றும் காட்சி தூண்டப்படுகிறது. "
 
-#: src/aosd/aosd_ui.cc:163
+#: src/aosd/aosd_ui.cc:204
 msgid "Placement"
 msgstr "ஒன்றின் நிறுத்தப்பட்ட நிலை "
 
-#: src/aosd/aosd_ui.cc:196
+#: src/aosd/aosd_ui.cc:241
 msgid "Relative X offset:"
 msgstr "ஒப்பீட்டு X விலக்கம்:"
 
-#: src/aosd/aosd_ui.cc:203
+#: src/aosd/aosd_ui.cc:245
 msgid "Relative Y offset:"
 msgstr "ஒப்பீட்டு Y விலக்கம்: "
 
-#: src/aosd/aosd_ui.cc:210
+#: src/aosd/aosd_ui.cc:249
 msgid "Max OSD width:"
 msgstr "அதிகூடிய திரையில் தோன்றும் காட்சியின் அகலம்:"
 
-#: src/aosd/aosd_ui.cc:221
+#: src/aosd/aosd_ui.cc:281
 msgid "Multi-Monitor options"
 msgstr "பல்-கணினித்திரை தேர்வுகள் "
 
-#: src/aosd/aosd_ui.cc:225
+#: src/aosd/aosd_ui.cc:285
 msgid "Display OSD using:"
 msgstr "திரையில் தோன்றும் காட்சியினை காட்டுக இதனை பயன்படுத்தி: "
 
-#: src/aosd/aosd_ui.cc:227
+#: src/aosd/aosd_ui.cc:287
 msgid "all monitors"
 msgstr "அனைத்து கணினித்திரைகள் "
 
-#: src/aosd/aosd_ui.cc:230
+#: src/aosd/aosd_ui.cc:290
 #, c-format
 msgid "monitor %i"
 msgstr "கணினித்திரை %i"
 
-#: src/aosd/aosd_ui.cc:282
+#: src/aosd/aosd_ui.cc:342
 msgid "Timing (ms)"
 msgstr "நேரம் (மில்லி வினாடிகளில்) "
 
-#: src/aosd/aosd_ui.cc:287
+#: src/aosd/aosd_ui.cc:347
 msgid "Display:"
 msgstr "காட்சிப்படுத்துக:"
 
-#: src/aosd/aosd_ui.cc:292
+#: src/aosd/aosd_ui.cc:352
 msgid "Fade in:"
 msgstr "உண்மங்கியடைதல்:"
 
-#: src/aosd/aosd_ui.cc:297
+#: src/aosd/aosd_ui.cc:357
 msgid "Fade out:"
 msgstr "வெளிமங்குதல்:"
 
-#: src/aosd/aosd_ui.cc:361
+#: src/aosd/aosd_ui.cc:442
 msgid "Fonts"
 msgstr "எழுத்துருக்கள் "
 
-#: src/aosd/aosd_ui.cc:368
+#: src/aosd/aosd_ui.cc:449
 #, c-format
 msgid "Font %i:"
 msgstr "எழுத்துரு %i:"
 
-#: src/aosd/aosd_ui.cc:382
+#: src/aosd/aosd_ui.cc:466
 msgid "Shadow"
 msgstr "நிழல் "
 
-#: src/aosd/aosd_ui.cc:486
+#: src/aosd/aosd_ui.cc:589
 msgid "Render Style"
 msgstr "வழங்கும் பாங்கு "
 
-#: src/aosd/aosd_ui.cc:502
+#: src/aosd/aosd_ui.cc:605
 msgid "Colors"
 msgstr "நிறங்கள் "
 
-#: src/aosd/aosd_ui.cc:513
+#: src/aosd/aosd_ui.cc:616
 #, c-format
 msgid "Color %i:"
 msgstr "நிறம் %i "
 
-#: src/aosd/aosd_ui.cc:600
+#: src/aosd/aosd_ui.cc:714
 msgid "Enable trigger"
 msgstr "தூண்டுதலினை செயல்படுத்துக "
 
-#: src/aosd/aosd_ui.cc:627
+#: src/aosd/aosd_ui.cc:741
 msgid "Event"
 msgstr "நிகழ்வு "
 
-#: src/aosd/aosd_ui.cc:655
+#: src/aosd/aosd_ui.cc:768
 msgid "Composite manager detected"
 msgstr "தொகுப்பு நிர்வாகி கண்டறியப்பட்டது"
 
-#: src/aosd/aosd_ui.cc:662
+#: src/aosd/aosd_ui.cc:775
 msgid ""
 "Composite manager not detected;\n"
 "unless you know that you have one running, please activate a composite "
@@ -629,66 +486,62 @@
 "கட்டாயமாக தொகுப்பு நிர்வாகியொன்று செயற்படுத்தப்பட வேண்டும். இல்லையெனில் திரையில் "
 "தோன்றும் காட்சி ஒழுங்காக இயங்காது. "
 
-#: src/aosd/aosd_ui.cc:670
+#: src/aosd/aosd_ui.cc:783
 msgid "Composite manager not required for fake transparency"
 msgstr "போலி வெளிப்படைத்தன்மையிற்கு தொகுப்பு நிர்வாகியொன்று தேவையில்லை "
 
-#: src/aosd/aosd_ui.cc:706
+#: src/aosd/aosd_ui.cc:820
 msgid "Transparency"
 msgstr "வெளிப்படைத்தன்மை "
 
-#: src/aosd/aosd_ui.cc:712
+#: src/aosd/aosd_ui.cc:826
 msgid "Fake transparency"
 msgstr "போலி வெளிப்படைத்தன்மை "
 
-#: src/aosd/aosd_ui.cc:714
+#: src/aosd/aosd_ui.cc:828
 msgid "Real transparency (requires X Composite Ext.)"
 msgstr "உண்மையான வெளிப்படைத்தன்மை ( X தொகுப்பு நீடிப்பு தேவைப்படுகிறது.)"
 
-#: src/aosd/aosd_ui.cc:756
+#: src/aosd/aosd_ui.cc:875
 msgid "Composite extension not loaded"
 msgstr "தொகுப்பு நீட்டிப்பு ஏற்றப்படவில்லை "
 
-#: src/aosd/aosd_ui.cc:764
-msgid "Composite extension not available"
-msgstr "தொகுப்பு நீட்டிப்பு காணப்படவில்லை "
-
-#: src/aosd/aosd_ui.cc:781
+#: src/aosd/aosd_ui.cc:892
 #, c-format
 msgid "Audacious OSD"
 msgstr "ஔடகிவஸ் திரையில் தோன்றும் காட்சி "
 
-#: src/aosd/aosd_ui.cc:844
+#: src/aosd/aosd_ui.cc:955
 msgid "Position"
 msgstr "இடம் "
 
-#: src/aosd/aosd_ui.cc:849
+#: src/aosd/aosd_ui.cc:960
 msgid "Animation"
 msgstr "உயிரூட்டுதல் "
 
-#: src/aosd/aosd_ui.cc:854
+#: src/aosd/aosd_ui.cc:965
 msgid "Text"
 msgstr "எழுத்து "
 
-#: src/aosd/aosd_ui.cc:859
+#: src/aosd/aosd_ui.cc:970
 msgid "Decoration"
 msgstr "அலங்காரம் "
 
-#: src/aosd/aosd_ui.cc:864
+#: src/aosd/aosd_ui.cc:975
 msgid "Trigger"
 msgstr "தூண்டுதல் "
 
-#: src/aosd/aosd_ui.cc:869
+#: src/aosd/aosd_ui.cc:980 src/streamtuner/shoutcast-model.cc:202
 msgid "Misc"
 msgstr "மற்றவை"
 
-#: src/aosd/aosd_ui.cc:878
+#: src/aosd/aosd_ui.cc:989
 msgid "Test"
-msgstr ""
+msgstr "பரீட்சிக்க "
 
 #: src/asx3/asx3.cc:35
 msgid "ASXv3 Playlists"
-msgstr ""
+msgstr "asxv3 பிளேலிச்ட்கள்"
 
 #: src/asx/asx.cc:33
 msgid "ASXv1/ASXv2 Playlists"
@@ -698,11 +551,96 @@
 msgid "Audacious Playlists (audpl)"
 msgstr "ஔடகிவஸ் பாடல் பட்டியல்கள் "
 
-#: src/blur_scope/blur_scope.cc:42
+#: src/background_music/background_music.cc:24
+msgid "Background music"
+msgstr " பின்னணி இசை "
+
+#: src/background_music/background_music.cc:25
+msgid "Target level:"
+msgstr "இலக்கு நிலை:"
+
+#: src/background_music/background_music.cc:28
+#: src/background_music/background_music.cc:33
+#: src/silence-removal/silence-removal.cc:70
+msgid "dB"
+msgstr "dB"
+
+#: src/background_music/background_music.cc:29
+msgid "Maximum amplification:"
+msgstr "அதிகபட்ச பெருக்கம்:"
+
+#: src/background_music/background_music.cc:34 src/mpg123/mpg123.cc:81
+msgid "Advanced"
+msgstr " மேம்பட்ட "
+
+#: src/background_music/background_music.cc:36
+msgid "Slow detection weight:"
+msgstr "மெதுவாக கண்டறிதல் எடை:"
+
+#: src/background_music/background_music.cc:39
+msgid "Hint"
+msgstr " குறிப்பு "
+
+#: src/background_music/background_music.cc:41
+msgid ""
+"Slow detection weight is the relative weight\n"
+"of a long term average detection when compared\n"
+"to the actual, faster loudness detection.\n"
+"A value of zero gives a more radio-like sound\n"
+"where soft passages get \"pulled up\" more quickly,\n"
+"a value of two makes the sound feel less compressed."
+msgstr ""
+"மெதுவான கண்டறிதல் எடை என்பது தொடர்புடைய எடை \n"
+" ஒப்பிடும்போது நீண்ட கால சராசரி கண்டறிதல் \n"
+" உண்மையான, வேகமான உரத்த கண்டறிதலுக்கு. \n"
+" பூச்சியத்தின் மதிப்பு மிகவும் வானொலி போன்ற ஒலியைக் கொடுக்கும் \n"
+" மென்மையான பத்திகள் விரைவாக \"இழுக்கப்படுகின்றன\", \n"
+" இரண்டின் மதிப்பு ஒலியை குறைவாக சுருக்குகிறது."
+
+#: src/background_music/background_music.cc:52
+msgid ""
+"Background Music Plugin for Audacious\n"
+"Copyright 2023;2024 Michel Fleur\n"
+"\n"
+"Controls the volume to make the sound equally loud within and between "
+"tracks.\n"
+" It uses accurate loudness measurement and tries to make the volume changes "
+"sound natural without audible peaks, yet without lowering the volume before "
+"a peak in advance."
+msgstr ""
+"துணிச்சலான பின்னணி இசை சொருகி \n"
+" பதிப்புரிமை 2023; 2024 மைக்கேல் ஃப்ளூர் \n"
+"\n"
+" தடங்களுக்கு உள்ளேயும் இடையில் ஒலியை சமமாக சத்தமாக மாற்ற அளவைக் கட்டுப்படுத்துகிறது. \n"
+" இது துல்லியமான உரத்த அளவீட்டைப் பயன்படுத்துகிறது மற்றும் தொகுதி மாற்றங்களை கேட்கக்கூடிய "
+"சிகரங்கள் இல்லாமல் இயற்கையாக ஒலிக்க முயற்சிக்கிறது, ஆனால் முன்கூட்டியே உச்சத்திற்கு முன் "
+"அளவைக் குறைக்காமல்."
+
+#: src/background_music/background_music.cc:61
+msgid "Background Music"
+msgstr "பின்னணி இசை"
+
+#: src/bitcrusher/bitcrusher.cc:33
+msgid "Bitcrusher"
+msgstr " பிட்ரூசர் "
+
+#: src/bitcrusher/bitcrusher.cc:34
+msgid "Bit Depth:"
+msgstr "பிட் ஆழம்:"
+
+#: src/bitcrusher/bitcrusher.cc:37
+msgid "Downsample ratio:"
+msgstr "குறைந்த மாதிரி விகிதம்:"
+
+#: src/bitcrusher/bitcrusher.cc:48
+msgid "Bitcrusher"
+msgstr "பிட்ரூசர்"
+
+#: src/blur_scope/blur_scope.cc:40 src/blur_scope-qt/blur_scope.cc:45
 msgid "Color"
 msgstr "நிறம்"
 
-#: src/blur_scope/blur_scope.cc:58
+#: src/blur_scope/blur_scope.cc:56 src/blur_scope-qt/blur_scope.cc:158
 msgid "Blur Scope"
 msgstr "மங்கலான குறியிலக்கம்"
 
@@ -714,27 +652,31 @@
 msgid "Presets:"
 msgstr "முன்னமைப்புகள்:"
 
+#: src/bs2b/plugin.cc:130
+msgid "Default"
+msgstr "இயல்புநிலை"
+
 #: src/bs2b/plugin.cc:136
 msgid "Feed level:"
 msgstr "நிலை ஊட்டல்:"
 
 #: src/bs2b/plugin.cc:138
 msgid "x1/10 dB"
-msgstr ""
+msgstr "x1/10 db"
 
 #: src/bs2b/plugin.cc:139
 msgid "Cut frequency:"
 msgstr "குறை அதிர்வெண்:"
 
-#: src/cairo-spectrum/cairo-spectrum.cc:41
+#: src/cairo-spectrum/cairo-spectrum.cc:42 src/qt-spectrum/qt-spectrum.cc:107
 msgid "Spectrum Analyzer"
 msgstr "நிறமாலை பகுப்பாய்வி "
 
-#: src/cdaudio-ng/cdaudio-ng.cc:72
+#: src/cdaudio/cdaudio-ng.cc:74
 msgid "Audio CD Plugin"
 msgstr "ஒலி இறுவட்டு சொருகி"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:121
+#: src/cdaudio/cdaudio-ng.cc:121
 msgid ""
 "Copyright (C) 2007-2012 Calin Crisan <ccrisan@gmail.com> and others.\n"
 "\n"
@@ -745,133 +687,141 @@
 "\n"
 "This was a Google Summer of Code 2007 project."
 msgstr ""
+"பதிப்புரிமை (இ) 2007-2012 காலின் கிரிசன் <ccrisan@gmail.com> மற்றும் பிற. \n"
+"\n"
+" லிப்க்டியோ டெவலப்பர்களுக்கு பல நன்றி <http://www.gnu.org/software/libcdio/> \n"
+" மற்றும் libcddb டெவலப்பர்களுக்கு <http://libcddb.sourceforge.net/>. \n"
+"\n"
+" எனக்கு வழிகாட்டுதல் மற்றும் வழிகாட்டியதற்காக டோனி வ்ரூனுக்கும் நன்றி. \n"
+"\n"
+" இது கூகிள் சம்மர் ஆஃப் கோட் 2007 திட்டமாகும்."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:137
+#: src/cdaudio/cdaudio-ng.cc:140
 msgid "Device"
 msgstr "சாதனம்"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:138
+#: src/cdaudio/cdaudio-ng.cc:141
 msgid "Read speed:"
 msgstr "வாசிக்கும் வேகம் :"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:141
+#: src/cdaudio/cdaudio-ng.cc:144
 msgid "Override device:"
 msgstr "சாதனம் மேலெழுது:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:143
+#: src/cdaudio/cdaudio-ng.cc:146
 msgid "Metadata"
 msgstr "மீத்தரவு "
 
-#: src/cdaudio-ng/cdaudio-ng.cc:144
+#: src/cdaudio/cdaudio-ng.cc:147
 msgid "Use CD-Text"
 msgstr "இறுவட்டு எழுத்துகளை உபயோகிக்க"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:146
+#: src/cdaudio/cdaudio-ng.cc:150
 msgid "Use CDDB"
 msgstr "CDDB இனை உபயோகிக்க"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:148
+#: src/cdaudio/cdaudio-ng.cc:152
 msgid "Use HTTP instead of CDDBP"
 msgstr "CDDBP இற்கு பதிலாக HTTP இனை பயன்படுத்துக "
 
-#: src/cdaudio-ng/cdaudio-ng.cc:151
+#: src/cdaudio/cdaudio-ng.cc:155
 msgid "Server:"
 msgstr "சேவையகம்:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:155
+#: src/cdaudio/cdaudio-ng.cc:159
 msgid "Path:"
 msgstr "வழி :"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:159
+#: src/cdaudio/cdaudio-ng.cc:163
 msgid "Port:"
 msgstr "போர்ட் :"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:246
+#: src/cdaudio/cdaudio-ng.cc:228
 msgid "Failed to initialize cdio subsystem."
-msgstr ""
+msgstr "சி.டி.ஐ.ஓ துணை அமைப்பைத் தொடங்குவதில் தோல்வி."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:281
+#: src/cdaudio/cdaudio-ng.cc:260
 #, c-format
 msgid "Invalid URI %s."
-msgstr ""
+msgstr "தவறான யூரி %s."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:283
+#: src/cdaudio/cdaudio-ng.cc:262
 #, c-format
 msgid "Track %d not found."
-msgstr ""
+msgstr "ட்ராக் %d கண்டுபிடிக்கப்படவில்லை."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:285
+#: src/cdaudio/cdaudio-ng.cc:264
 #, c-format
 msgid "Track %d is a data track."
-msgstr ""
+msgstr "ட்ராக் %d என்பது தரவு பாடல்."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:360
+#: src/cdaudio/cdaudio-ng.cc:339
 msgid "Error reading audio CD."
-msgstr ""
+msgstr "ஆடியோ சிடியை வாசிப்பதில் பிழை."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:429
+#: src/cdaudio/cdaudio-ng.cc:410
 msgid "Audio CD"
 msgstr "ஒலி இறுவட்டு"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:460 src/cdaudio-ng/cdaudio-ng.cc:469
+#: src/cdaudio/cdaudio-ng.cc:446 src/cdaudio/cdaudio-ng.cc:455
 #, c-format
 msgid "Failed to open CD device %s."
-msgstr ""
+msgstr "குறுவட்டு சாதனம் %s திறக்கத் தவறிவிட்டது."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:472
+#: src/cdaudio/cdaudio-ng.cc:458
 msgid "No audio capable CD drive found."
-msgstr ""
+msgstr "ஆடியோ திறன் கொண்ட சிடி இயக்கி எதுவும் கிடைக்கவில்லை."
+
+#: src/cdaudio/cdaudio-ng.cc:481
+msgid "Drive is empty."
+msgstr "வட்டு வெறுமையாக உள்ளது."
+
+#: src/cdaudio/cdaudio-ng.cc:483
+msgid "Unsupported disk type."
+msgstr "ஆதரவற்ற வட்டு வகை."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:497
+#: src/cdaudio/cdaudio-ng.cc:507
 msgid "Failed to finish initializing opened CD drive."
-msgstr ""
+msgstr "திறந்த குறுவட்டு இயக்ககத்தைத் தொடங்குவதில் தோல்வி."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:510
+#: src/cdaudio/cdaudio-ng.cc:520
 msgid "Failed to retrieve first/last track number."
-msgstr ""
+msgstr "முதல்/கடைசி தட எண்ணை மீட்டெடுப்பதில் தோல்வி."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:531
+#: src/cdaudio/cdaudio-ng.cc:541
 #, c-format
 msgid "Cannot read start/end LSN for track %d."
-msgstr ""
+msgstr "ட்ராக் %d க்கு start/end lsn ஐப் படிக்க முடியாது."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:613
-msgid "Failed to create the cddb connection."
-msgstr ""
+#: src/cdaudio/cdaudio-ng.cc:624
+msgid "Failed to create the CDDB connection."
+msgstr "சி.டி.டி.பி இணைப்பை உருவாக்குவதில் தோல்வி."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:679
+#: src/cdaudio/cdaudio-ng.cc:690
 msgid "Failed to query the CDDB server"
-msgstr ""
+msgstr "சி.டி.டி.பி சேவையகத்தை வினவுவதில் தோல்வி"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:681
+#: src/cdaudio/cdaudio-ng.cc:692
 #, c-format
 msgid "Failed to query the CDDB server: %s"
-msgstr ""
+msgstr "சி.டி.டி.பி சேவையகத்தை வினவுவதில் தோல்வி: %s"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:705
+#: src/cdaudio/cdaudio-ng.cc:716
 #, c-format
-msgid "Failed to read the cddb info: %s"
-msgstr ""
-
-#: src/cdaudio-ng/cdaudio-ng.cc:765
-msgid "Drive is empty."
-msgstr "வட்டு வெறுமையாக உள்ளது."
-
-#: src/cdaudio-ng/cdaudio-ng.cc:767
-msgid "Unsupported disk type."
-msgstr "ஆதரவற்ற வட்டு வகை."
+msgid "Failed to read the CDDB info: %s"
+msgstr "சி.டி.டி.பி தகவலைப் படிக்கத் தவறிவிட்டது: %s"
 
-#: src/cd-menu-items/cd-menu-items.cc:35
+#: src/cd-menu-items/cd-menu-items.cc:33
 msgid "Audio CD Menu Items"
 msgstr "ஒலி இறுவட்டு பட்டியல் உருப்படிகள்"
 
-#: src/cd-menu-items/cd-menu-items.cc:47
-msgid "Play CD"
-msgstr "இறுவட்டினை இயக்குக "
-
-#: src/cd-menu-items/cd-menu-items.cc:47
-msgid "Add CD"
-msgstr "இறுவட்டினை சேர்க்குக "
+#: src/cd-menu-items/cd-menu-items.cc:45
+msgid "Pla_y CD"
+msgstr "pla_y குறுவட்டு"
+
+#: src/cd-menu-items/cd-menu-items.cc:45
+msgid "_Add CD"
+msgstr "_add cd"
 
 #: src/compressor/compressor.cc:45
 msgid "Compression"
@@ -890,6 +840,8 @@
 "Dynamic Range Compression Plugin for Audacious\n"
 "Copyright 2010-2014 John Lindgren"
 msgstr ""
+"துணிச்சலுக்கான மாறும் ரேஞ்ச் சுருக்க சொருகி \n"
+" பதிப்புரிமை 2010-2014 சான் லிண்ட்கிரென்"
 
 #: src/compressor/compressor.cc:64
 msgid "Dynamic Range Compressor"
@@ -904,6 +856,12 @@
 "William Pitcock <nenolod@dereferenced.org>\n"
 "Shay Green <gblargg@gmail.com>"
 msgstr ""
+"came_music_emu 0.5.2 ஐ அடிப்படையாகக் கொண்ட கன்சோல் மியூசிக் டிகோடர் எஞ்சின் \n"
+" உதவி வடிவங்கள்: ay, gbs, gim, hes, kss, nsf, nsfe, sap, spc, vgm, vgz \n"
+"\n"
+" துணிச்சலான சொருகி வழங்கியவர்: \n"
+" வில்லியம் பிட்காக் <nenolod@derfered.org> \n"
+" சே கிரீன் <gblargg@gmail.com>"
 
 #: src/console/plugin.cc:30
 msgid "Bass:"
@@ -915,15 +873,22 @@
 
 #: src/console/plugin.cc:36
 msgid "Echo:"
-msgstr ""
+msgstr "எதிரொலி:"
 
 #: src/console/plugin.cc:39
 msgid "Default song length:"
 msgstr "இயல்புநிலை பாடல் நீளம்:"
 
-#: src/console/plugin.cc:42 src/modplug/plugin_main.cc:59
+#: src/console/plugin.cc:41 src/crossfade/crossfade.cc:56
+#: src/crossfade/crossfade.cc:62 src/lirc/lirc.cc:395 src/notify/notify.cc:113
+#: src/sid/xs_config.cc:85 src/sid/xs_config.cc:94 src/sid/xs_config.cc:103
+#: src/vumeter-qt/vumeter_qt.cc:39
+msgid "seconds"
+msgstr "வினாடிகள் "
+
+#: src/console/plugin.cc:42 src/modplug/plugin_main.cc:58
 msgid "Resampling"
-msgstr ""
+msgstr " மறுசீரமைப்பு "
 
 #: src/console/plugin.cc:43
 msgid "Enable audio resampling"
@@ -931,7 +896,7 @@
 
 #: src/console/plugin.cc:49
 msgid "SPC"
-msgstr ""
+msgstr " spc "
 
 #: src/console/plugin.cc:50
 msgid "Ignore length from SPC tags"
@@ -945,76 +910,94 @@
 msgid "Game Console Music Decoder"
 msgstr "விளையாட்டு பணியக இசை குறிவிலக்கி"
 
-#: src/coreaudio/coreaudio.cc:50
+#: src/coreaudio/coreaudio.cc:53
 msgid "CoreAudio output"
-msgstr ""
+msgstr "கோரியுடியோ வெளியீடு"
 
-#: src/coreaudio/coreaudio.cc:131
+#: src/coreaudio/coreaudio.cc:155
 msgid ""
 "CoreAudio Output Plugin for Audacious\n"
 "Copyright 2014 William Pitcock\n"
+"Copyright 2017,18 René J.V. Bertin\n"
+" (original code and code adapted from\n"
+" Apple examples, (C) Apple 2013)\n"
 "\n"
 "Based on SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
 msgstr ""
+"துணிச்சலுக்கான கோரியுடியோ வெளியீட்டு சொருகி \n"
+" பதிப்புரிமை 2014 வில்லியம் பிட்காக் \n"
+" பதிப்புரிமை 2017,18 ரெனே சே.வி. பெர்டின் \n"
+" (அசல் குறியீடு மற்றும் குறியீடு தழுவி \n"
+" ஆப்பிள் எடுத்துக்காட்டுகள், (இ) ஆப்பிள் 2013) \n"
+"\n"
+" துணிச்சலுக்கான எச்.டி.எல் வெளியீட்டு சொருகி அடிப்படையில் \n"
+" பதிப்புரிமை 2010 சான் லிண்ட்கிரென்"
 
-#: src/coreaudio/coreaudio.cc:143
+#: src/coreaudio/coreaudio.cc:171
 msgid "Use exclusive mode"
-msgstr ""
+msgstr "பிரத்யேக பயன்முறையைப் பயன்படுத்தவும்"
+
+#: src/coreaudio/coreaudio.cc:173
+msgid "Use bit perfect audio (adapt device sampling rate)"
+msgstr "பிட் சரியான ஆடியோவைப் பயன்படுத்தவும் (சாதன மாதிரி விகிதத்தை மாற்றியமைக்கவும்)"
 
-#: src/crossfade/crossfade.cc:44
+#: src/crossfade/crossfade.cc:47
 msgid ""
 "Crossfade Plugin for Audacious\n"
 "Copyright 2010-2014 John Lindgren"
 msgstr ""
+"துணிச்சலான கிராச்ஃபேட் சொருகி \n"
+" பதிப்புரிமை 2010-2014 சான் லிண்ட்கிரென்"
 
-#: src/crossfade/crossfade.cc:48
+#: src/crossfade/crossfade.cc:51
 msgid "Crossfade"
 msgstr "குறுக்கு மங்கல்"
 
-#: src/crossfade/crossfade.cc:49
+#: src/crossfade/crossfade.cc:52
 msgid "On automatic song change"
-msgstr ""
+msgstr "தானியங்கி பாடல் மாற்றத்தில்"
 
-#: src/crossfade/crossfade.cc:51 src/crossfade/crossfade.cc:57
+#: src/crossfade/crossfade.cc:54 src/crossfade/crossfade.cc:60
 msgid "Overlap:"
 msgstr "மேற்பொருந்தல்:"
 
-#: src/crossfade/crossfade.cc:55
+#: src/crossfade/crossfade.cc:58
 msgid "On seek or manual song change"
-msgstr ""
+msgstr "தேடு அல்லது கையேடு பாடல் மாற்றத்தில்"
 
-#: src/crossfade/crossfade.cc:61
+#: src/crossfade/crossfade.cc:64
+msgid "No fade in"
+msgstr "மங்கவில்லை"
+
+#: src/crossfade/crossfade.cc:66
+msgid "Use S-curve fade"
+msgstr "எச்-வளைவு மங்கலைப் பயன்படுத்தவும்"
+
+#: src/crossfade/crossfade.cc:68
+msgid "S-curve steepness:"
+msgstr "எச்-கர்வ் செங்குத்தானது:"
+
+#: src/crossfade/crossfade.cc:70
+msgid "(higher is steeper)"
+msgstr "(உயர்ந்தது செங்குத்தானது)"
+
+#: src/crossfade/crossfade.cc:72
 msgid "Tip"
-msgstr ""
+msgstr " உதவிக்குறிப்பு "
 
-#: src/crossfade/crossfade.cc:62
+#: src/crossfade/crossfade.cc:73
 msgid ""
 "For better crossfading, enable\n"
 "the Silence Removal effect."
 msgstr ""
+"சிறந்த கிராச்ஃபேடிங்கிற்கு, இயக்கு \n"
+" ம silence னம் அகற்றும் விளைவு."
 
-#: src/crossfade/crossfade.cc:72
+#: src/crossfade/crossfade.cc:83
 msgid "Crossfade"
 msgstr "குறுக்கு மங்கல்"
 
-#: src/crossfade/crossfade.cc:161
-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.cc:168
-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/crystalizer/crystalizer.cc:31
 msgid "Crystalizer"
 msgstr "பளிங்குருவாக்கl"
@@ -1027,62 +1010,63 @@
 msgid "Crystalizer"
 msgstr "palinguruvaathal"
 
-#: src/cue/cue.cc:37
+#: src/cue/cue.cc:42
 msgid "Cue Sheet Plugin"
 msgstr "கோல் தாள் செருகுநிரல்"
 
-#: src/delete-files/delete-files.cc:46 src/delete-files/delete-files.cc:146
+#: src/delete-files/delete-files.cc:53 src/delete-files/delete-files.cc:215
+#: src/delete-files/delete-files.cc:230
 msgid "Delete Files"
-msgstr ""
+msgstr "கோப்புகளை நீக்கு"
+
+#: src/delete-files/delete-files.cc:120
+msgid "No files are selected."
+msgstr "கோப்புகள் எதுவும் தேர்ந்தெடுக்கப்படவில்லை."
 
-#: src/delete-files/delete-files.cc:75
+#: src/delete-files/delete-files.cc:125
 #, c-format
-msgid "Error moving %s to trash: %s."
-msgstr ""
+msgid "Do you want to move %s to the trash?"
+msgstr "நீங்கள் %s குப்பைக்கு நகர்த்த விரும்புகிறீர்களா?"
 
-#: src/delete-files/delete-files.cc:86
+#: src/delete-files/delete-files.cc:126
 #, c-format
-msgid "Error deleting %s: %s."
-msgstr ""
+msgid "Do you want to permanently delete %s?"
+msgstr "%s நிரந்தரமாக நீக்க விரும்புகிறீர்களா?"
 
-#: src/delete-files/delete-files.cc:117
+#: src/delete-files/delete-files.cc:133
 #, c-format
-msgid "Error deleting %s: not a local file."
-msgstr ""
+msgid "Do you want to move %d files to the trash?"
+msgstr "%d கோப்புகளை குப்பைக்கு நகர்த்த விரும்புகிறீர்களா?"
 
 #: src/delete-files/delete-files.cc:134
-msgid "Do you want to move the selected files to the trash?"
-msgstr ""
-
-#: src/delete-files/delete-files.cc:135
-msgid "Move to Trash"
-msgstr ""
+#, c-format
+msgid "Do you want to permanently delete %d files?"
+msgstr "%d கோப்புகளை நிரந்தரமாக நீக்க விரும்புகிறீர்களா?"
 
-#: src/delete-files/delete-files.cc:140
-msgid "Do you want to permanently delete the selected files?"
-msgstr ""
+#: src/delete-files/delete-files.cc:146
+msgid "Move to trash"
+msgstr "குப்பைக்கு நகர்த்தவும்"
 
-#: src/delete-files/delete-files.cc:141 src/skins/preset-list.cc:411
-#: src/skins/preset-list.cc:427
+#: src/delete-files/delete-files.cc:146
 msgid "Delete"
 msgstr "அழிக்குக "
 
-#: src/delete-files/delete-files.cc:145 src/skins/preset-browser.cc:56
-#: src/skins/preset-list.cc:307 src/skins/ui_playlist.cc:221
+#: src/delete-files/delete-files.cc:213 src/delete-files/delete-files.cc:235
+#: src/skins-qt/search-select.cc:102 src/skins/search-select.cc:78
 msgid "Cancel"
 msgstr "ரத்து செய்க "
 
-#: src/delete-files/delete-files.cc:166
+#: src/delete-files/delete-files.cc:267
 msgid "Delete Selected Files"
-msgstr ""
+msgstr "தேர்ந்தெடுக்கப்பட்ட கோப்புகளை நீக்கு"
 
-#: src/delete-files/delete-files.cc:181
+#: src/delete-files/delete-files.cc:287
 msgid "Delete Method"
-msgstr ""
+msgstr " முறை நீக்கு "
 
-#: src/delete-files/delete-files.cc:182
+#: src/delete-files/delete-files.cc:288
 msgid "Move to trash instead of deleting immediately"
-msgstr ""
+msgstr "உடனடியாக நீக்குவதற்கு பதிலாக குப்பைக்கு நகர்த்தவும்"
 
 #: src/echo_plugin/echo.cc:9
 msgid ""
@@ -1091,18 +1075,23 @@
 "Surround echo by Carl van Schaik, 1999\n"
 "Updated for Audacious by William Pitcock and John Lindgren, 2010-2014"
 msgstr ""
+"எதிரொலி சொருகி \n"
+" எழுதியவர் சோஅன் லெவின், 1999 \n"
+" சரவுண்ட் எக்கோ கார்ல் வான் சைக், 1999 \n"
+" வில்லியம் பிட்காக் மற்றும் சான் லிண்ட்கிரென், 2010-2014 ஆல் ஆடியாசிட்டிக்கு "
+"புதுப்பிக்கப்பட்டது"
 
 #: src/echo_plugin/echo.cc:21
 msgid "Echo"
 msgstr "ethiroli"
 
-#: src/echo_plugin/echo.cc:22 src/modplug/plugin_main.cc:73
-#: src/modplug/plugin_main.cc:83
+#: src/echo_plugin/echo.cc:22 src/modplug/plugin_main.cc:72
+#: src/modplug/plugin_main.cc:82
 msgid "Delay:"
 msgstr "தாமதம் :"
 
-#: src/echo_plugin/echo.cc:24 src/modplug/plugin_main.cc:73
-#: src/modplug/plugin_main.cc:83
+#: src/echo_plugin/echo.cc:24 src/modplug/plugin_main.cc:72
+#: src/modplug/plugin_main.cc:82 src/xsf/plugin.cc:445
 msgid "ms"
 msgstr "ms"
 
@@ -1110,7 +1099,7 @@
 msgid "Feedback:"
 msgstr "பின்னூட்டு :"
 
-#: src/echo_plugin/echo.cc:28 src/modplug/plugin_main.cc:87
+#: src/echo_plugin/echo.cc:28 src/modplug/plugin_main.cc:86
 msgid "Volume:"
 msgstr "ஒலி அளவு "
 
@@ -1118,11 +1107,11 @@
 msgid "Echo"
 msgstr "எதிரொலி "
 
-#: src/ffaudio/ffaudio-core.cc:41
+#: src/ffaudio/ffaudio-core.cc:50
 msgid "FFmpeg Plugin"
 msgstr "FFmpeg நீட்சி"
 
-#: src/ffaudio/ffaudio-core.cc:571
+#: src/ffaudio/ffaudio-core.cc:649
 msgid ""
 "Multi-format audio decoding plugin for Audacious using\n"
 "FFmpeg multimedia framework (http://www.ffmpeg.org/)\n"
@@ -1131,262 +1120,359 @@
 "William Pitcock <nenolod@nenolod.net>\n"
 "Matti Hämäläinen <ccr@tnsp.org>"
 msgstr ""
+"மல்டி ஃபார்மேட் ஆடியோ டிகோடிங் சொருகி ஆடம்பரத்தைப் பயன்படுத்தி \n"
+" ffmpeg மல்டிமீடியா கட்டமைப்பானது (http://www.ffmpeg.org/) \n"
+"\n"
+" துணிச்சலான சொருகி வழங்கியவர்: \n"
+" வில்லியம் பிட்காக் <nenolod@nenolod.net> \n"
+" matti hämäläinen <ccr@tnsp.org>"
 
-#: src/filewriter/filewriter.cc:45
+#: src/filewriter/filewriter.cc:48
 msgid "FileWriter Plugin"
 msgstr "FileWriter நீட்சி "
 
-#: src/filewriter/filewriter.cc:386
+#: src/filewriter/filewriter.cc:316
+#, c-format
+msgid ""
+"Error opening %s:\n"
+"%s"
+msgstr ""
+"பிழை திறப்பது %s:\n"
+"%s"
+
+#: src/filewriter/filewriter.cc:358
+msgid ""
+"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 ""
+"இந்த நிரல் இலவச மென்பொருள்; இலவச மென்பொருள் அறக்கட்டளையால் வெளியிடப்பட்ட குனு பொது பொது "
+"உரிமத்தின் விதிமுறைகளின் கீழ் நீங்கள் அதை மறுபகிர்வு செய்யலாம் மற்றும்/அல்லது மாற்றலாம்; "
+"உரிமத்தின் பதிப்பு 2, அல்லது (உங்கள் விருப்பத்தில்) பின்னர் எந்த பதிப்பும். \n"
+"\n"
+" இந்த திட்டம் பயனுள்ளதாக இருக்கும் என்ற நம்பிக்கையில் விநியோகிக்கப்படுகிறது, ஆனால் எந்த "
+"உத்தரவாதமும் இல்லாமல்; ஒரு குறிப்பிட்ட நோக்கத்திற்காக வணிகத்தன்மை அல்லது உடற்தகுதி "
+"ஆகியவற்றின் மறைமுக பொறுப்பு கூட இல்லாமல். மேலும் விவரங்களுக்கு குனு பொது பொது "
+"உரிமத்தைப் பார்க்கவும். \n"
+"\n"
+" இந்த திட்டத்துடன் குனு பொது பொது உரிமத்தின் நகலை நீங்கள் பெற்றிருக்க வேண்டும்; "
+"இல்லையென்றால், இலவச மென்பொருள் அறக்கட்டளை, இன்க்., 51 பிராங்க்ளின் தெரு, ஐந்தாவது மாடி, "
+"பாச்டன், எம்.ஏ 02110-1301, அமெரிக்கா."
+
+#: src/filewriter/filewriter.cc:385
 msgid "Output file format:"
 msgstr "வெளியீட்டு கோப்பு வடிவம்:"
 
-#: src/filewriter/filewriter.cc:403
-msgid "Configure"
-msgstr "கட்டமைக்குக "
-
-#: src/filewriter/filewriter.cc:413
+#: src/filewriter/filewriter.cc:389
 msgid "Save into original directory"
 msgstr "அசல் கோப்பகத்தில் சேமிக்கவும்"
 
-#: src/filewriter/filewriter.cc:417
-msgid "Save into custom directory"
-msgstr "விருப்ப கோப்பகத்தில் சேமிக்கவும்"
-
-#: src/filewriter/filewriter.cc:427
-msgid "Output file folder:"
-msgstr "வெளியீட்டு கோப்பு கோப்பகம்: "
-
-#: src/filewriter/filewriter.cc:431
-msgid "Pick a folder"
-msgstr "ஒரு கோப்புறையை தேர்ந்தெடுக்கவும்"
+#: src/filewriter/filewriter.cc:392
+msgid "Save into custom directory:"
+msgstr "தனிப்பயன் கோப்பகத்தில் சேமிக்கவும்:"
 
-#: src/filewriter/filewriter.cc:444
+#: src/filewriter/filewriter.cc:400
 msgid "Generate file name from:"
-msgstr ""
+msgstr "இதிலிருந்து கோப்பு பெயரை உருவாக்குங்கள்:"
 
-#: src/filewriter/filewriter.cc:448
-msgid "Original file tag"
-msgstr ""
-
-#: src/filewriter/filewriter.cc:453
+#: src/filewriter/filewriter.cc:401
 msgid "Original file name"
-msgstr ""
+msgstr "அசல் கோப்பு பெயர்"
 
-#: src/filewriter/filewriter.cc:459
-msgid "Include original file name extension"
-msgstr ""
+#: src/filewriter/filewriter.cc:404
+msgid "Original file name (no suffix)"
+msgstr "அசல் கோப்பு பெயர் (பின்னொட்டு இல்லை)"
 
-#: src/filewriter/filewriter.cc:468
-msgid "Prepend track number to file name"
-msgstr ""
+#: src/filewriter/filewriter.cc:407
+msgid "Original file tag"
+msgstr "அசல் கோப்பு குறிச்சொல்"
 
-#: src/filewriter/filewriter.cc:484
-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.cc:411
+msgid "Prepend track number to file name"
+msgstr "கோப்பு பெயருக்கு டிராக் எண்ணைத் தயாரிக்கவும்"
 
-#: src/filewriter/mp3.cc:40 src/filewriter/mp3.cc:717
+#: src/filewriter/filewriter.cc:417 src/filewriter/filewriter.cc:449
 msgid "Auto"
 msgstr "தானியங்கு"
 
-#: src/filewriter/mp3.cc:40
+#: src/filewriter/filewriter.cc:418
+msgid "8000 Hz"
+msgstr "8000 எர்ட்ச்"
+
+#: src/filewriter/filewriter.cc:419
+msgid "11025 Hz"
+msgstr "11025 எர்ட்ச்"
+
+#: src/filewriter/filewriter.cc:420
+msgid "12000 Hz"
+msgstr "12000 எர்ட்ச்"
+
+#: src/filewriter/filewriter.cc:421
+msgid "16000 Hz"
+msgstr "16000 எர்ட்ச்"
+
+#: src/filewriter/filewriter.cc:422
+msgid "22050 Hz"
+msgstr "22050 எர்ட்ச்"
+
+#: src/filewriter/filewriter.cc:423
+msgid "24000 Hz"
+msgstr "24000 எர்ட்ச்"
+
+#: src/filewriter/filewriter.cc:424
+msgid "32000 Hz"
+msgstr "32000 எர்ட்ச்"
+
+#: src/filewriter/filewriter.cc:425 src/xsf/plugin.cc:430
+msgid "44100 Hz"
+msgstr "44100 எர்ட்ச்"
+
+#: src/filewriter/filewriter.cc:426 src/xsf/plugin.cc:431
+msgid "48000 Hz"
+msgstr "48000 எர்ட்ச்"
+
+#: src/filewriter/filewriter.cc:430
+msgid "8 kbit/s"
+msgstr "8 kbit/s"
+
+#: src/filewriter/filewriter.cc:431
+msgid "16 kbit/s"
+msgstr "16 kbit/s"
+
+#: src/filewriter/filewriter.cc:432
+msgid "32 kbit/s"
+msgstr "32 kbit/s"
+
+#: src/filewriter/filewriter.cc:433
+msgid "40 kbit/s"
+msgstr "40 kbit/s"
+
+#: src/filewriter/filewriter.cc:434
+msgid "48 kbit/s"
+msgstr "48 kbit/s"
+
+#: src/filewriter/filewriter.cc:435
+msgid "56 kbit/s"
+msgstr "56 kbit/s"
+
+#: src/filewriter/filewriter.cc:436
+msgid "64 kbit/s"
+msgstr "64 kbit/s"
+
+#: src/filewriter/filewriter.cc:437
+msgid "80 kbit/s"
+msgstr "80 kbit/s"
+
+#: src/filewriter/filewriter.cc:438
+msgid "96 kbit/s"
+msgstr "96 kbit/s"
+
+#: src/filewriter/filewriter.cc:439
+msgid "112 kbit/s"
+msgstr "112 kbit/s"
+
+#: src/filewriter/filewriter.cc:440
+msgid "128 kbit/s"
+msgstr "128 kbit/s"
+
+#: src/filewriter/filewriter.cc:441
+msgid "160 kbit/s"
+msgstr "160 kbit/s"
+
+#: src/filewriter/filewriter.cc:442
+msgid "192 kbit/s"
+msgstr "192 kbit/s"
+
+#: src/filewriter/filewriter.cc:443
+msgid "224 kbit/s"
+msgstr "224 kbit/s"
+
+#: src/filewriter/filewriter.cc:444
+msgid "256 kbit/s"
+msgstr "256 kbit/s"
+
+#: src/filewriter/filewriter.cc:445
+msgid "320 kbit/s"
+msgstr "320 kbit/s"
+
+#: src/filewriter/filewriter.cc:450
 msgid "Joint Stereo"
 msgstr "கூட்டு பேரொலி"
 
-#: src/filewriter/mp3.cc:41 src/modplug/plugin_main.cc:58
-#: src/mpg123/mpg123.cc:248
+#: src/filewriter/filewriter.cc:451 src/modplug/plugin_main.cc:57
+#: src/mpg123/mpg123.cc:259
 msgid "Stereo"
 msgstr "பேரொலி"
 
-#: src/filewriter/mp3.cc:41 src/modplug/plugin_main.cc:57
-#: src/mpg123/mpg123.cc:248
+#: src/filewriter/filewriter.cc:452 src/modplug/plugin_main.cc:56
+#: src/mpg123/mpg123.cc:260
 msgid "Mono"
 msgstr "ஒற்றை"
 
-#: src/filewriter/mp3.cc:657
-msgid "MP3 Configuration"
-msgstr "MP3 கட்டமைப்பு "
-
-#: src/filewriter/mp3.cc:658
-msgid "_OK"
-msgstr ""
-
-#: src/filewriter/mp3.cc:681
-msgid "Algorithm Quality:"
-msgstr "படிமுறை தரம்:"
+#: src/filewriter/filewriter.cc:456
+msgid "VBR"
+msgstr "vbr"
+
+#: src/filewriter/filewriter.cc:457
+msgid "ABR"
+msgstr "அப்"
+
+#: src/filewriter/filewriter.cc:478
+msgid "Algorithm quality:"
+msgstr "வழிமுறை தரம்:"
 
-#: src/filewriter/mp3.cc:706
-msgid "Output Sample Rate:"
-msgstr ""
-
-#: src/filewriter/mp3.cc:733
-msgid "(Hz)"
-msgstr "(Hz)"
-
-#: src/filewriter/mp3.cc:740
-msgid "Bitrate / Compression Ratio:"
-msgstr ""
-
-#: src/filewriter/mp3.cc:764
-msgid "Bitrate (kbps):"
-msgstr "பிட்வீதம் (kbps):"
+#: src/filewriter/filewriter.cc:484
+msgid "Bitrate:"
+msgstr "Bit வீதம் "
 
-#: src/filewriter/mp3.cc:796
+#: src/filewriter/filewriter.cc:491
 msgid "Compression ratio:"
 msgstr "அழுத்த விகிதம்:"
 
-#: src/filewriter/mp3.cc:820
-msgid "Audio Mode:"
-msgstr "ஒலி முறைமை:"
-
-#: src/filewriter/mp3.cc:845
-msgid "Miscellaneous:"
-msgstr ""
+#: src/filewriter/filewriter.cc:498
+msgid "Audio mode:"
+msgstr "ஆடியோ பயன்முறை:"
 
-#: src/filewriter/mp3.cc:856
+#: src/filewriter/filewriter.cc:501
 msgid "Enforce strict ISO compliance"
-msgstr ""
+msgstr "கடுமையான ஐஎச்ஓ இணக்கத்தை செயல்படுத்தவும்"
 
-#: src/filewriter/mp3.cc:867
+#: src/filewriter/filewriter.cc:503
 msgid "Error protection"
 msgstr "தவறு பாதுகாப்பு"
 
-#: src/filewriter/mp3.cc:879 src/filewriter/vorbis.cc:206
-msgid "Quality"
-msgstr "தரம் "
-
-#: src/filewriter/mp3.cc:888
+#: src/filewriter/filewriter.cc:508
 msgid "Enable VBR/ABR"
 msgstr "VBR/ABR இனை செயல்படுத்துக "
 
-#: src/filewriter/mp3.cc:898
+#: src/filewriter/filewriter.cc:510
 msgid "Type:"
 msgstr "வகை:"
 
-#: src/filewriter/mp3.cc:931
-msgid "VBR Options:"
-msgstr "VBR தேர்வுகள்:"
-
-#: src/filewriter/mp3.cc:947
-msgid "Minimum bitrate (kbps):"
-msgstr "அதிகுறைந்த பிட்வீதம் (kbps):"
-
-#: src/filewriter/mp3.cc:973
-msgid "Maximum bitrate (kbps):"
-msgstr "அதிகூடிய பிட்வீதம் (kbps):"
+#: src/filewriter/filewriter.cc:514
+msgid "Minimum bitrate:"
+msgstr "குறைந்தபட்ச பிட்ரேட்:"
+
+#: src/filewriter/filewriter.cc:518
+msgid "Maximum bitrate:"
+msgstr "அதிகபட்ச பிட்ரேட்:"
+
+#: src/filewriter/filewriter.cc:522
+msgid "Average bitrate:"
+msgstr "சராசரி பிட்ரேட்:"
 
-#: src/filewriter/mp3.cc:995
-msgid "Strictly enforce minimum bitrate"
-msgstr "கண்டிப்பாக குறைந்த பிட்வீதத்தை செயல்படுத்துக "
-
-#: src/filewriter/mp3.cc:1007
-msgid "ABR Options:"
-msgstr "ABR தேர்வுகள்:"
-
-#: src/filewriter/mp3.cc:1017
-msgid "Average bitrate (kbps):"
-msgstr "சராசரி பிட்வீதம் (kbps):"
-
-#: src/filewriter/mp3.cc:1044
+#: src/filewriter/filewriter.cc:526
 msgid "VBR quality level:"
 msgstr "VBR தர நிலை:"
 
-#: src/filewriter/mp3.cc:1063
-msgid "Omit Xing VBR header"
-msgstr ""
+#: src/filewriter/filewriter.cc:530
+msgid "Strictly enforce minimum bitrate"
+msgstr "கண்டிப்பாக குறைந்த பிட்வீதத்தை செயல்படுத்துக "
 
-#: src/filewriter/mp3.cc:1076
-msgid "VBR/ABR"
-msgstr "VBR/ABR"
+#: src/filewriter/filewriter.cc:533
+msgid "Omit Xing VBR header"
+msgstr "xing vbr தலைப்பைத் தவிர்க்கவும்"
 
-#: src/filewriter/mp3.cc:1085
-msgid "Frame Parameters:"
-msgstr ""
+#: src/filewriter/filewriter.cc:539
+msgid "Frame Headers"
+msgstr " பிரேம் தலைப்புகள் "
 
-#: src/filewriter/mp3.cc:1097
+#: src/filewriter/filewriter.cc:540
 msgid "Mark as copyright"
 msgstr "பதிப்புரிமை என குறிக்குக "
 
-#: src/filewriter/mp3.cc:1108
+#: src/filewriter/filewriter.cc:542
 msgid "Mark as original"
 msgstr "அசலென குriக்குக"
 
-#: src/filewriter/mp3.cc:1120
-msgid "ID3 Parameters:"
-msgstr ""
+#: src/filewriter/filewriter.cc:544
+msgid "ID3 Tags"
+msgstr " ஐடி 3 குறிச்சொற்கள் "
 
-#: src/filewriter/mp3.cc:1131
+#: src/filewriter/filewriter.cc:545
 msgid "Force addition of version 2 tag"
 msgstr "பதிப்பு 2 குறியை பலமாக உள்ளடக்குக "
 
-#: src/filewriter/mp3.cc:1141
+#: src/filewriter/filewriter.cc:547
 msgid "Only add v1 tag"
 msgstr "பதிப்பு 1 குறியை மாத்திரம் உள்ளடக்குக "
 
-#: src/filewriter/mp3.cc:1148
+#: src/filewriter/filewriter.cc:549
 msgid "Only add v2 tag"
 msgstr "பதிப்பு 2 குறியை மாத்திரம் உள்ளடக்குக "
 
-#: src/filewriter/mp3.cc:1169
+#: src/filewriter/filewriter.cc:554
+msgid "Quality"
+msgstr "தரம் "
+
+#: src/filewriter/filewriter.cc:555
+msgid "VBR/ABR"
+msgstr "VBR/ABR"
+
+#: src/filewriter/filewriter.cc:556
 msgid "Tags"
 msgstr "குறி "
 
-#: src/filewriter/vorbis.cc:196
-msgid "Vorbis Encoder Configuration"
-msgstr "Vorbis குறிமுறையாக்கி கட்டமைப்பு"
-
-#: src/filewriter/vorbis.cc:219
-msgid "Quality level (0 - 10):"
-msgstr "தரம் (0 - 10):"
+#: src/filewriter/filewriter.cc:566
+msgid "Quality (0-1):"
+msgstr "தகுதி (0-1):"
 
-#: src/flacng/flacng.h:35
+#: src/filewriter/filewriter.cc:573 src/skins-qt/skins_cfg.cc:307
+#: src/skins/skins_cfg.cc:289
+msgid "General"
+msgstr "பொதுவான"
+
+#: src/flac/flacng.h:36
 msgid "FLAC Decoder"
 msgstr "FLAC குறிவிலக்கி "
 
-#: src/flacng/metadata.cc:351 src/wavpack/wavpack.cc:209
+#: src/flac/metadata.cc:296 src/wavpack/wavpack.cc:215
 msgid "lossless"
-msgstr ""
+msgstr "இழப்பற்றது"
 
-#: src/flacng/plugin.cc:169
+#: src/flac/plugin.cc:214
 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/gio/gio.cc:34
 msgid ""
 "GIO Plugin for Audacious\n"
 "Copyright 2009-2012 John Lindgren"
 msgstr ""
+"துணிச்சலுக்கான சியோ சொருகி \n"
+" பதிப்புரிமை 2009-2012 சான் லிண்ட்கிரென்"
 
 #: src/gio/gio.cc:42
 msgid "GIO Plugin"
 msgstr "GIO நீட்சி"
 
-#: src/gio/gio.cc:153
+#: src/gio/gio.cc:152
 msgid "Read-and-append mode not supported"
-msgstr ""
+msgstr "வாசிப்பு மற்றும் இடர் பயன்முறை ஆதரிக்கப்படவில்லை"
 
-#: src/gio/gio.cc:166
+#: src/gio/gio.cc:165
 msgid "Invalid open mode"
-msgstr ""
+msgstr "தவறான திறந்த பயன்முறை"
 
-#: src/gl-spectrum/gl-spectrum.cc:51
+#: src/glspectrum/gl-spectrum.cc:52
 msgid ""
 "OpenGL Spectrum Analyzer for Audacious\n"
 "Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
@@ -1397,623 +1483,766 @@
 "\n"
 "License: GPLv2+"
 msgstr ""
-
-#: src/gl-spectrum/gl-spectrum.cc:62
-msgid "OpenGL Spectrum Analyzer"
-msgstr "OpenGL நிறமாலை பகுப்பாய்வி"
-
-#: src/gl-spectrum-qt/gl-spectrum.cc:41
-msgid ""
-"OpenGL Spectrum Analyzer for Audacious\n"
-"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
-"Copyright 2014 William Pitcock\n"
-"\n"
-"Based on the XMMS plugin:\n"
-"Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson, and "
-"4Front Technologies\n"
+"துணிச்சலுக்கான ஓபன்சிஎல் ச்பெக்ட்ரம் பகுப்பாய்வி \n"
+" பதிப்புரிமை 2013 கிறிச்டோஃப் புடே, சான் லிண்ட்கிரென் மற்றும் கார்லோ பிராமினி \n"
 "\n"
-"License: GPLv2+"
-msgstr ""
-
-#: src/gl-spectrum-qt/gl-spectrum.cc:53
-msgid "OpenGL Spectrum Analyzer (Qt)"
-msgstr ""
-
-#: src/gnomeshortcuts/gnomeshortcuts.cc:38
-msgid "GNOME Shortcuts"
-msgstr ""
-
-#: src/gnomeshortcuts/gnomeshortcuts.cc:54
-msgid ""
-"GNOME Shortcut Plugin\n"
-"Lets you control the player with GNOME's shortcuts.\n"
+" எக்ச்எம்எம்எச் சொருகி அடிப்படையில்: \n"
+" பதிப்புரிமை 1998-2000 பீட்டர் ஆல்ம், மைக்கேல் ஆல்ம், ஓலே ஆல்னாச், தாமச் நில்சன், மற்றும் 4 "
+"ஃப்ரண்ட் டெக்னாலசிச் \n"
 "\n"
-"Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>"
-msgstr ""
+" உரிமம்: gplv2+"
 
-#: src/gtkui/columns.cc:35
-msgid "Entry number"
-msgstr "பதிவு எண்"
+#: src/glspectrum/gl-spectrum.cc:63 src/qtglspectrum/gl-spectrum.cc:53
+msgid "OpenGL Spectrum Analyzer"
+msgstr "OpenGL நிறமாலை பகுப்பாய்வி"
 
-#: src/gtkui/columns.cc:36 src/playlist-manager/playlist-manager.cc:225
-#: src/qtui/playlist_model.cc:123
+#: src/gtkui/columns.cc:36 src/moonstone/playlist_model.cc:38
+#: src/qtui/playlist_model.cc:33
+msgid "Entry Number"
+msgstr "நுழைவு எண்"
+
+#: src/gtkui/columns.cc:37 src/moonstone/playlist_model.cc:38
+#: src/moonstone/playlist_selection.cc:64
+#: src/playlist-manager/playlist-manager.cc:200
+#: src/playlist-manager-qt/playlist-manager-qt.cc:188
+#: src/qtui/playlist_model.cc:33 src/streamtuner/icecast-model.cc:120
+#: src/streamtuner/ihr-model.cc:159 src/streamtuner/shoutcast-model.cc:122
 msgid "Title"
 msgstr "தலைப்பு"
 
-#: src/gtkui/columns.cc:37 src/qtui/playlist_model.cc:125
+#: src/gtkui/columns.cc:38 src/moonstone/playlist_model.cc:39
+#: src/qtui/playlist_model.cc:33
 msgid "Artist"
 msgstr "பாடகர்"
 
-#: src/gtkui/columns.cc:38
+#: src/gtkui/columns.cc:39 src/moonstone/playlist_model.cc:39
+#: src/qtui/playlist_model.cc:33
 msgid "Year"
 msgstr "வருடம்"
 
-#: src/gtkui/columns.cc:39 src/qtui/playlist_model.cc:127
+#: src/gtkui/columns.cc:40 src/moonstone/playlist_model.cc:39
+#: src/qtui/playlist_model.cc:34
 msgid "Album"
 msgstr "குறுவட்டு"
 
-#: src/gtkui/columns.cc:40
-msgid "Album artist"
-msgstr ""
+#: src/gtkui/columns.cc:41 src/moonstone/playlist_model.cc:40
+#: src/qtui/playlist_model.cc:34
+msgid "Album Artist"
+msgstr "செருகேடு கலைஞர் "
 
-#: src/gtkui/columns.cc:41
+#: src/gtkui/columns.cc:42 src/moonstone/playlist_model.cc:40
+#: src/qtui/playlist_model.cc:34
 msgid "Track"
 msgstr "பாடல் "
 
-#: src/gtkui/columns.cc:42
+#: src/gtkui/columns.cc:43 src/moonstone/playlist_model.cc:40
+#: src/qtui/playlist_model.cc:34 src/streamtuner/icecast-model.cc:123
+#: src/streamtuner/shoutcast-model.cc:125
+#: src/streamtuner/shoutcast-model.cc:236
 msgid "Genre"
 msgstr "இலக்கியநடை"
 
-#: src/gtkui/columns.cc:43
-msgid "Queue position"
-msgstr "வரிசையில் இடம் "
+#: src/gtkui/columns.cc:44 src/moonstone/playlist_model.cc:41
+#: src/qtui/playlist_model.cc:35
+msgid "Queue Position"
+msgstr "வரிசை நிலை"
 
-#: src/gtkui/columns.cc:44
+#: src/gtkui/columns.cc:45 src/moonstone/playlist_model.cc:41
+#: src/qtui/playlist_model.cc:35
 msgid "Length"
 msgstr "நீளம்"
 
-#: src/gtkui/columns.cc:45
-msgid "File path"
-msgstr "கோப்பு vali"
-
-#: src/gtkui/columns.cc:47
-msgid "Custom title"
-msgstr "விருப்ப தலைப்பு "
-
-#: src/gtkui/columns.cc:48
+#: src/gtkui/columns.cc:46 src/moonstone/playlist_model.cc:41
+#: src/qtui/playlist_model.cc:35
+msgid "File Path"
+msgstr "கோப்பு பாதை"
+
+#: src/gtkui/columns.cc:47 src/moonstone/playlist_model.cc:42
+#: src/qtui/playlist_model.cc:35
+msgid "File Name"
+msgstr "கோப்பு பெயர்"
+
+#: src/gtkui/columns.cc:48 src/moonstone/playlist_model.cc:42
+#: src/qtui/playlist_model.cc:36
+msgid "Custom Title"
+msgstr "தனிப்பயன் தலைப்பு"
+
+#: src/gtkui/columns.cc:49 src/moonstone/playlist_model.cc:42
+#: src/qtui/playlist_model.cc:36 src/streamtuner/icecast-model.cc:129
+#: src/streamtuner/shoutcast-model.cc:134
 msgid "Bitrate"
 msgstr "பிட்வீதம்"
 
-#: src/gtkui/columns.cc:308
+#: src/gtkui/columns.cc:50 src/moonstone/playlist_model.cc:43
+#: src/qtui/playlist_model.cc:36
+msgid "Comment"
+msgstr "பின்னூட்டம்"
+
+#: src/gtkui/columns.cc:51 src/qtui/playlist_model.cc:36
+msgid "Publisher"
+msgstr "பதிப்பகத்தார்"
+
+#: src/gtkui/columns.cc:52 src/qtui/playlist_model.cc:37
+msgid "Catalog Number"
+msgstr "அட்டவணை எண்"
+
+#: src/gtkui/columns.cc:53 src/moonstone/playlist_model.cc:43
+#: src/qtui/playlist_model.cc:37
+msgid "Disc"
+msgstr "வட்டு"
+
+#: src/gtkui/columns.cc:325
 msgid "Available columns"
-msgstr ""
+msgstr "கிடைக்கும் நெடுவரிசைகள்"
 
-#: src/gtkui/columns.cc:334
+#: src/gtkui/columns.cc:351
 msgid "Displayed columns"
-msgstr ""
+msgstr "காட்டப்பட்ட நெடுவரிசைகள்"
 
-#: src/gtkui/layout.cc:72 src/search-tool/search-tool.cc:40
+#: src/gtkui/layout.cc:74 src/search-tool-qt/search-tool-qt.cc:58
+#: src/search-tool/search-tool.cc:49
 msgid "Search Tool"
 msgstr "தேடல் கருவி"
 
-#: src/gtkui/layout.cc:167
+#: src/gtkui/layout.cc:170
 msgid "Dock at Left"
 msgstr "இடது பக்கம் தரையிறக்குக "
 
-#: src/gtkui/layout.cc:167
+#: src/gtkui/layout.cc:170
 msgid "Dock at Right"
 msgstr "வலது பக்கம் தரையிறக்குக"
 
-#: src/gtkui/layout.cc:168
+#: src/gtkui/layout.cc:171
 msgid "Dock at Top"
 msgstr "மேல் பக்கம் தரையிறக்குக"
 
-#: src/gtkui/layout.cc:168
+#: src/gtkui/layout.cc:171
 msgid "Dock at Bottom"
 msgstr "கீழ் பக்கம் தரையிறக்குக"
 
-#: src/gtkui/layout.cc:168
+#: src/gtkui/layout.cc:171
 msgid "Undock"
 msgstr "தரையிறக்க வேண்டாம் "
 
-#: src/gtkui/layout.cc:168 src/ladspa/plugin.cc:531
+#: src/gtkui/layout.cc:171 src/ladspa/plugin.cc:540
 msgid "Disable"
 msgstr "முடக்குக "
 
-#: src/gtkui/menus.cc:126 src/qtui/main_window_actions.cc:93
-#: src/statusicon/statusicon.cc:276
+#: src/gtkui/menus.cc:79 src/qtui/menus.cc:107
+#: src/statusicon-qt/statusicon.cc:115 src/statusicon/statusicon.cc:286
 msgid "_Open Files ..."
 msgstr "_கோப்புக்களைத் திற ..."
 
-#: src/gtkui/menus.cc:127
+#: src/gtkui/menus.cc:80 src/qtui/menus.cc:111
 msgid "Open _URL ..."
 msgstr "முகவரியை_திற ..."
 
-#: src/gtkui/menus.cc:128 src/qtui/main_window_actions.cc:95
+#: src/gtkui/menus.cc:81 src/qtui/menus.cc:113
 msgid "_Add Files ..."
 msgstr "கோப்புக்களை _சேர் ..."
 
-#: src/gtkui/menus.cc:129
+#: src/gtkui/menus.cc:82 src/qtui/menus.cc:118
 msgid "Add U_RL ..."
 msgstr "முகவரியை சேர் ..."
 
-#: src/gtkui/menus.cc:131
+#: src/gtkui/menus.cc:84 src/qtui/menus.cc:120
 msgid "Search _Library"
-msgstr ""
+msgstr "தேடல் _ லைப்ரரியை"
 
-#: src/gtkui/menus.cc:133 src/qtui/main_window_actions.cc:98
+#: src/gtkui/menus.cc:86 src/qtui/menus.cc:123
 msgid "A_bout ..."
 msgstr "பற்றி ..."
 
-#: src/gtkui/menus.cc:134 src/qtui/main_window_actions.cc:99
+#: src/gtkui/menus.cc:87 src/qtui/menus.cc:125
 msgid "_Settings ..."
-msgstr ""
+msgstr "_செட்டிங்ச் ..."
 
-#: src/gtkui/menus.cc:135 src/qtui/main_window_actions.cc:103
-#: src/statusicon/statusicon.cc:284
+#: src/gtkui/menus.cc:88 src/qtui/menus.cc:131
+#: src/statusicon-qt/statusicon.cc:117 src/statusicon/statusicon.cc:288
 msgid "_Quit"
 msgstr "_விலகு "
 
-#: src/gtkui/menus.cc:139 src/gtkui/menus.cc:262
-#: src/qtui/main_window_actions.cc:107 src/search-tool/search-tool.cc:641
-#: src/statusicon/statusicon.cc:278
+#: src/gtkui/menus.cc:92 src/gtkui/menus.cc:226
+#: src/moonstone/playlist_tabs.cc:306 src/qtui/menus.cc:135
+#: src/qtui/playlist_tabs.cc:331 src/search-tool-qt/search-tool-qt.cc:499
+#: src/search-tool/search-tool.cc:339 src/statusicon-qt/statusicon.cc:109
+#: src/statusicon/statusicon.cc:280
 msgid "_Play"
 msgstr "_இயக்குக "
 
-#: src/gtkui/menus.cc:140 src/qtui/main_window_actions.cc:108
-#: src/statusicon/statusicon.cc:279
+#: src/gtkui/menus.cc:93 src/qtui/menus.cc:137
+#: src/statusicon-qt/statusicon.cc:110 src/statusicon/statusicon.cc:281
 msgid "Paus_e"
 msgstr "_இடைநிறுத்து"
 
-#: src/gtkui/menus.cc:141 src/qtui/main_window_actions.cc:109
-#: src/statusicon/statusicon.cc:280
+#: src/gtkui/menus.cc:94 src/qtui/menus.cc:139
+#: src/statusicon-qt/statusicon.cc:111 src/statusicon/statusicon.cc:282
 msgid "_Stop"
 msgstr "_நிறுத்துga"
 
-#: src/gtkui/menus.cc:142 src/qtui/main_window_actions.cc:110
-#: src/statusicon/statusicon.cc:277
+#: src/gtkui/menus.cc:95 src/qtui/menus.cc:141
+#: src/statusicon-qt/statusicon.cc:112 src/statusicon/statusicon.cc:283
 msgid "Pre_vious"
 msgstr "_முந்தைய"
 
-#: src/gtkui/menus.cc:143 src/qtui/main_window_actions.cc:111
-#: src/statusicon/statusicon.cc:281
+#: src/gtkui/menus.cc:96 src/qtui/menus.cc:143
+#: src/statusicon-qt/statusicon.cc:113 src/statusicon/statusicon.cc:284
 msgid "_Next"
 msgstr "_அடுத்து "
 
-#: src/gtkui/menus.cc:145 src/qtui/main_window_actions.cc:113
+#: src/gtkui/menus.cc:97 src/qtui/menus.cc:145 src/skins/menus.cc:114
+#: src/skins-qt/menus.cc:105
+msgid "Previous Album"
+msgstr "முந்தைய ஆல்பம்"
+
+#: src/gtkui/menus.cc:98 src/qtui/menus.cc:146 src/skins/menus.cc:115
+#: src/skins-qt/menus.cc:106
+msgid "Next Album"
+msgstr "அடுத்த ஆல்பம்"
+
+#: src/gtkui/menus.cc:100 src/qtui/menus.cc:148
 msgid "_Repeat"
 msgstr "_மறுபடியும்"
 
-#: src/gtkui/menus.cc:146 src/qtui/main_window_actions.cc:114
+#: src/gtkui/menus.cc:101 src/qtui/menus.cc:150
 msgid "S_huffle"
 msgstr "குலுக்குக "
 
-#: src/gtkui/menus.cc:147 src/qtui/main_window_actions.cc:115
+#: src/gtkui/menus.cc:102 src/qtui/menus.cc:152
+msgid "Shuffle by Albu_m"
+msgstr "அல்பு_எம் மூலம் கலக்கவும்"
+
+#: src/gtkui/menus.cc:103 src/qtui/menus.cc:155
 msgid "N_o Playlist Advance"
 msgstr "முன்னோக்கிய பாடல் பட்டியல் alla"
 
-#: src/gtkui/menus.cc:148 src/qtui/main_window_actions.cc:116
+#: src/gtkui/menus.cc:104 src/qtui/menus.cc:157
 msgid "Stop A_fter This Song"
-msgstr ""
+msgstr "இந்த பாடலுக்குப் பிறகு நிறுத்துங்கள்"
 
-#: src/gtkui/menus.cc:150 src/gtkui/menus.cc:247
-#: src/qtui/main_window_actions.cc:118
+#: src/gtkui/menus.cc:106 src/gtkui/menus.cc:210 src/qtui/menus.cc:162
+#: src/qtui/menus.cc:294
 msgid "Song _Info ..."
 msgstr "பாடல் தகவல் "
 
-#: src/gtkui/menus.cc:151
+#: src/gtkui/menus.cc:107
 msgid "Jump to _Time ..."
 msgstr "_நேரத்திற்கு தாவவும் "
 
-#: src/gtkui/menus.cc:152
+#: src/gtkui/menus.cc:108
 msgid "_Jump to Song ..."
 msgstr "பாடலுக்கு _தாவவும்"
 
-#: src/gtkui/menus.cc:154
+#: src/gtkui/menus.cc:110 src/qtui/menus.cc:165
 msgid "Set Repeat Point _A"
-msgstr ""
+msgstr "மீண்டும் புள்ளியை அமைக்கவும் _a"
 
-#: src/gtkui/menus.cc:155
+#: src/gtkui/menus.cc:111 src/qtui/menus.cc:167
 msgid "Set Repeat Point _B"
-msgstr ""
+msgstr "மீண்டும் மீண்டும் புள்ளியை அமைக்கவும் b"
 
-#: src/gtkui/menus.cc:156
+#: src/gtkui/menus.cc:112 src/qtui/menus.cc:169
 msgid "_Clear Repeat Points"
-msgstr ""
+msgstr "_ கூல் மீண்டும் புள்ளிகள்"
 
-#: src/gtkui/menus.cc:160 src/gtkui/menus.cc:167 src/gtkui/menus.cc:183
-#: src/qtui/main_window_actions.cc:122 src/qtui/main_window_actions.cc:129
-#: src/qtui/main_window_actions.cc:145
+#: src/gtkui/menus.cc:116 src/gtkui/menus.cc:123 src/gtkui/menus.cc:141
+#: src/qtui/menus.cc:173 src/qtui/menus.cc:180 src/qtui/menus.cc:198
 msgid "By _Title"
 msgstr "_தலைப்பு அடிப்படையில்"
 
-#: src/gtkui/menus.cc:161 src/qtui/main_window_actions.cc:123
+#: src/gtkui/menus.cc:117 src/qtui/menus.cc:174
 msgid "By _File Name"
-msgstr ""
+msgstr "_ பைல் பெயர்"
 
-#: src/gtkui/menus.cc:162 src/qtui/main_window_actions.cc:124
+#: src/gtkui/menus.cc:118 src/qtui/menus.cc:175
 msgid "By File _Path"
-msgstr ""
+msgstr "கோப்பு _ பாத்"
 
-#: src/gtkui/menus.cc:166 src/gtkui/menus.cc:182
-#: src/qtui/main_window_actions.cc:128 src/qtui/main_window_actions.cc:144
+#: src/gtkui/menus.cc:122 src/gtkui/menus.cc:140 src/qtui/menus.cc:179
+#: src/qtui/menus.cc:197
 msgid "By Track _Number"
 msgstr "பாடல் _இலக்க அடிப்படையில் "
 
-#: src/gtkui/menus.cc:168 src/gtkui/menus.cc:184
-#: src/qtui/main_window_actions.cc:130 src/qtui/main_window_actions.cc:146
+#: src/gtkui/menus.cc:124 src/gtkui/menus.cc:142 src/qtui/menus.cc:181
+#: src/qtui/menus.cc:199
 msgid "By _Artist"
 msgstr "_பாடகர் அடிப்படையில்"
 
-#: src/gtkui/menus.cc:169 src/gtkui/menus.cc:185
-#: src/qtui/main_window_actions.cc:131 src/qtui/main_window_actions.cc:147
+#: src/gtkui/menus.cc:125 src/gtkui/menus.cc:143 src/qtui/menus.cc:182
+#: src/qtui/menus.cc:200
 msgid "By Al_bum"
-msgstr ""
+msgstr "வழங்கியவர் அல்_பம்"
 
-#: src/gtkui/menus.cc:170 src/gtkui/menus.cc:186
-#: src/qtui/main_window_actions.cc:132 src/qtui/main_window_actions.cc:148
+#: src/gtkui/menus.cc:126 src/gtkui/menus.cc:144 src/qtui/menus.cc:183
+#: src/qtui/menus.cc:201
 msgid "By Albu_m Artist"
-msgstr ""
+msgstr "எழுதியவர் அல்பு_எம் கலைஞர்"
 
-#: src/gtkui/menus.cc:171 src/gtkui/menus.cc:187
-#: src/qtui/main_window_actions.cc:133 src/qtui/main_window_actions.cc:149
+#: src/gtkui/menus.cc:127 src/gtkui/menus.cc:145 src/qtui/menus.cc:184
+#: src/qtui/menus.cc:202
 msgid "By Release _Date"
 msgstr "வெளியிட்ட திகதி அடிப்படையில்"
 
-#: src/gtkui/menus.cc:172 src/gtkui/menus.cc:188
-#: src/qtui/main_window_actions.cc:134 src/qtui/main_window_actions.cc:150
+#: src/gtkui/menus.cc:128 src/gtkui/menus.cc:146 src/qtui/menus.cc:185
+#: src/qtui/menus.cc:203
 msgid "By _Genre"
-msgstr ""
+msgstr "வழங்கியவர் _சென்ரே"
 
-#: src/gtkui/menus.cc:173 src/gtkui/menus.cc:189
-#: src/qtui/main_window_actions.cc:135 src/qtui/main_window_actions.cc:151
+#: src/gtkui/menus.cc:129 src/gtkui/menus.cc:147 src/qtui/menus.cc:186
+#: src/qtui/menus.cc:204
 msgid "By _Length"
-msgstr ""
+msgstr "மூலம் _ நீளம்"
 
-#: src/gtkui/menus.cc:174 src/gtkui/menus.cc:190
-#: src/qtui/main_window_actions.cc:136 src/qtui/main_window_actions.cc:152
+#: src/gtkui/menus.cc:130 src/gtkui/menus.cc:148 src/qtui/menus.cc:187
+#: src/qtui/menus.cc:205
 msgid "By _File Path"
 msgstr "_கோப்பு வழி அடிப்படையில்"
 
-#: src/gtkui/menus.cc:175 src/gtkui/menus.cc:191
-#: src/qtui/main_window_actions.cc:137 src/qtui/main_window_actions.cc:153
+#: src/gtkui/menus.cc:131 src/gtkui/menus.cc:149 src/qtui/menus.cc:188
+#: src/qtui/menus.cc:206
 msgid "By _Custom Title"
 msgstr "_விருப்ப தலைப்பு அடிப்படையில்"
 
-#: src/gtkui/menus.cc:177 src/gtkui/menus.cc:193
-#: src/qtui/main_window_actions.cc:139 src/qtui/main_window_actions.cc:155
+#: src/gtkui/menus.cc:132 src/gtkui/menus.cc:150 src/qtui/menus.cc:189
+#: src/qtui/menus.cc:207
+msgid "By C_omment"
+msgstr "c_omment மூலம்"
+
+#: src/gtkui/menus.cc:133 src/gtkui/menus.cc:151 src/qtui/menus.cc:190
+#: src/qtui/menus.cc:208
+msgid "By D_isc Number"
+msgstr "மூலம் d_isc எண்"
+
+#: src/gtkui/menus.cc:135 src/gtkui/menus.cc:153 src/qtui/menus.cc:192
+#: src/qtui/menus.cc:210
 msgid "R_everse Order"
 msgstr "தலைகீழ் ஒழுங்கு"
 
-#: src/gtkui/menus.cc:178 src/gtkui/menus.cc:194
-#: src/qtui/main_window_actions.cc:140 src/qtui/main_window_actions.cc:156
+#: src/gtkui/menus.cc:136 src/gtkui/menus.cc:154 src/qtui/menus.cc:194
+#: src/qtui/menus.cc:212
 msgid "_Random Order"
 msgstr "_தற்போக்கு ஒழுங்கு"
 
-#: src/gtkui/menus.cc:198 src/qtui/main_window_actions.cc:160
+#: src/gtkui/menus.cc:158 src/qtui/menus.cc:216
 msgid "_Play/Resume"
-msgstr ""
+msgstr "_ பிளே/விண்ணப்பம்"
 
-#: src/gtkui/menus.cc:199 src/gtkui/menus.cc:251
-#: src/qtui/main_window_actions.cc:161
+#: src/gtkui/menus.cc:159 src/qtui/menus.cc:218
 msgid "_Refresh"
 msgstr "_புதுப்பிக்குக "
 
-#: src/gtkui/menus.cc:201 src/qtui/main_window_actions.cc:163
+#: src/gtkui/menus.cc:161 src/qtui/menus.cc:222
 msgid "_Sort"
 msgstr "_வரிசைப்படுத்துக "
 
-#: src/gtkui/menus.cc:202 src/qtui/main_window_actions.cc:164
+#: src/gtkui/menus.cc:162 src/qtui/menus.cc:223
 msgid "Sort Se_lected"
-msgstr ""
+msgstr "se_lected வரிசைப்படுத்துதல்"
 
-#: src/gtkui/menus.cc:203 src/qtui/main_window_actions.cc:165
+#: src/gtkui/menus.cc:163 src/qtui/menus.cc:225
 msgid "Remove _Duplicates"
-msgstr ""
+msgstr "_duplicates ஐ அகற்று"
 
-#: src/gtkui/menus.cc:204 src/qtui/main_window_actions.cc:166
+#: src/gtkui/menus.cc:164 src/qtui/menus.cc:226
 msgid "Remove _Unavailable Files"
 msgstr "_கிடைக்கப்பெறாத கோப்புகளை அகற்றுக"
 
-#: src/gtkui/menus.cc:206 src/playlist-manager/playlist-manager.cc:244
-#: src/qtui/main_window_actions.cc:168
+#: src/gtkui/menus.cc:166 src/playlist-manager/playlist-manager.cc:219
+#: src/playlist-manager-qt/playlist-manager-qt.cc:348 src/qtui/menus.cc:229
 msgid "_New"
 msgstr "_புதிய "
 
-#: src/gtkui/menus.cc:207
+#: src/gtkui/menus.cc:167 src/qtui/menus.cc:230
 msgid "Ren_ame ..."
-msgstr ""
+msgstr "ren_ame ..."
 
-#: src/gtkui/menus.cc:208 src/gtkui/menus.cc:264
-#: src/qtui/main_window_actions.cc:170
+#: src/gtkui/menus.cc:168 src/gtkui/menus.cc:228
+#: src/moonstone/playlist_tabs.cc:311 src/qtui/menus.cc:231
+#: src/qtui/playlist_tabs.cc:336
 msgid "Remo_ve"
-msgstr ""
+msgstr "remo_ve"
 
-#: src/gtkui/menus.cc:210
+#: src/gtkui/menus.cc:170 src/qtui/menus.cc:233
 msgid "_Import ..."
 msgstr "_இறக்குமதி ..."
 
-#: src/gtkui/menus.cc:211
+#: src/gtkui/menus.cc:171 src/qtui/menus.cc:234
 msgid "_Export ..."
 msgstr "_ஏற்றுமதி ..."
 
-#: src/gtkui/menus.cc:213
+#: src/gtkui/menus.cc:173 src/qtui/menus.cc:237
 msgid "Playlist _Manager ..."
-msgstr ""
+msgstr "பிளேலிச்ட் _ மேனேசர் ..."
 
-#: src/gtkui/menus.cc:214 src/qtui/main_window_actions.cc:176
+#: src/gtkui/menus.cc:174 src/qtui/menus.cc:239
 msgid "_Queue Manager ..."
 msgstr "_வரிசை நிர்வாகி ..."
 
-#: src/gtkui/menus.cc:218 src/qtui/main_window_actions.cc:180
+#: src/gtkui/menus.cc:178 src/qtui/menus.cc:243
 msgid "Volume _Up"
 msgstr "ஒலிஉரப்பான் _அதிகரிக்குக "
 
-#: src/gtkui/menus.cc:219 src/qtui/main_window_actions.cc:181
+#: src/gtkui/menus.cc:179 src/qtui/menus.cc:245
 msgid "Volume _Down"
 msgstr "ஒலிஉரப்பான் _குறைக்குக "
 
-#: src/gtkui/menus.cc:221 src/qtui/main_window_actions.cc:183
-msgid "_Equalizer"
-msgstr "_சமமாக்கி"
+#: src/gtkui/menus.cc:181 src/qtui/menus.cc:249
+msgid "_Equalizer ..."
+msgstr "_ சமநிலை ..."
 
-#: src/gtkui/menus.cc:223 src/qtui/main_window_actions.cc:185
+#: src/gtkui/menus.cc:182 src/qtui/menus.cc:251
 msgid "E_ffects ..."
-msgstr ""
+msgstr "விளைவுகள் ..."
 
-#: src/gtkui/menus.cc:227
+#: src/gtkui/menus.cc:184
+msgid "_Record Stream"
+msgstr "_ ரெக்கார்ட் ச்ட்ரீம்"
+
+#: src/gtkui/menus.cc:185
+msgid "Audio _Settings ..."
+msgstr "ஆடியோ _செட்டிங்ச் ..."
+
+#: src/gtkui/menus.cc:189 src/qtui/menus.cc:260
 msgid "Show _Menu Bar"
 msgstr "_பட்டியல் பட்டியை காண்பிக்குக "
 
-#: src/gtkui/menus.cc:228
+#: src/gtkui/menus.cc:190 src/qtui/menus.cc:262
 msgid "Show I_nfo Bar"
 msgstr "தகவல் பட்டியை காண்பிக்குக "
 
-#: src/gtkui/menus.cc:229
+#: src/gtkui/menus.cc:191 src/qtui/menus.cc:264
+msgid "Show Info Bar _Album Art"
+msgstr "செய்தி பட்டி _ ஆல்பம் கலையைக் காட்டு"
+
+#: src/gtkui/menus.cc:192 src/qtui/menus.cc:266
 msgid "Show Info Bar Vis_ualization"
 msgstr "தகவல் பட்டி காட்சியாக்கத்தை காண்பிக்குக "
 
-#: src/gtkui/menus.cc:230
+#: src/gtkui/menus.cc:193 src/qtui/menus.cc:268
 msgid "Show _Status Bar"
 msgstr "_நிலைமை பட்டியை காண்பிக்குக"
 
-#: src/gtkui/menus.cc:232
+#: src/gtkui/menus.cc:195 src/qtui/menus.cc:272
 msgid "Show _Remaining Time"
-msgstr ""
+msgstr "மீதமுள்ள நேரத்தைக் காட்டு"
 
-#: src/gtkui/menus.cc:234
+#: src/gtkui/menus.cc:197 src/qtui/menus.cc:276 src/skins/menus.cc:157
+#: src/skins-qt/menus.cc:152
 msgid "_Visualizations ..."
-msgstr ""
+msgstr "_visualizations ..."
 
-#: src/gtkui/menus.cc:238 src/qtui/main_window_actions.cc:189
+#: src/gtkui/menus.cc:201 src/qtui/menus.cc:280
 msgid "_File"
 msgstr "கோப்பு "
 
-#: src/gtkui/menus.cc:239 src/qtui/main_window_actions.cc:190
+#: src/gtkui/menus.cc:202 src/qtui/menus.cc:281
 msgid "_Playback"
 msgstr "_மீள்இயக்குக "
 
-#: src/gtkui/menus.cc:240 src/qtui/main_window_actions.cc:191
+#: src/gtkui/menus.cc:203 src/qtui/menus.cc:282
 msgid "P_laylist"
 msgstr "பாடல் பட்டியல் "
 
-#: src/gtkui/menus.cc:241 src/gtkui/menus.cc:258
-#: src/qtui/main_window_actions.cc:192
+#: src/gtkui/menus.cc:204 src/gtkui/menus.cc:222 src/qtui/menus.cc:283
+#: src/qtui/menus.cc:312
 msgid "_Services"
 msgstr "_சேவைகள் "
 
-#: src/gtkui/menus.cc:242 src/qtui/main_window_actions.cc:193
+#: src/gtkui/menus.cc:205 src/qtui/menus.cc:284
 msgid "_Output"
 msgstr "_வெளியீடு"
 
-#: src/gtkui/menus.cc:243
+#: src/gtkui/menus.cc:206 src/qtui/menus.cc:285
 msgid "_View"
 msgstr "_paarvayiduga"
 
-#: src/gtkui/menus.cc:248
+#: src/gtkui/menus.cc:211 src/qtui/menus.cc:296
 msgid "_Queue/Unqueue"
 msgstr "_வரிசைப்படுத்துக/வரிசைப்படுத்தலை அகற்றுக "
 
-#: src/gtkui/menus.cc:250
+#: src/gtkui/menus.cc:213 src/qtui/menus.cc:299
 msgid "_Open Containing Folder"
-msgstr ""
+msgstr "_ கோப்புறை கொண்ட ஓபன்"
+
+#: src/gtkui/menus.cc:214 src/qtui/menus.cc:301
+msgid "_Refresh Selected"
+msgstr "_refresh தேர்ந்தெடுக்கப்பட்டது"
 
-#: src/gtkui/menus.cc:253
+#: src/gtkui/menus.cc:216 src/qtui/menus.cc:304
 msgid "Cu_t"
 msgstr "வெட்டுக "
 
-#: src/gtkui/menus.cc:254
+#: src/gtkui/menus.cc:217 src/qtui/menus.cc:305
 msgid "_Copy"
 msgstr "நகலெடுக்க "
 
-#: src/gtkui/menus.cc:255
+#: src/gtkui/menus.cc:218 src/qtui/menus.cc:306
 msgid "_Paste"
 msgstr "_ஒட்டவும்"
 
-#: src/gtkui/menus.cc:256
+#: src/gtkui/menus.cc:219 src/qtui/menus.cc:307
+msgid "Paste at _End"
+msgstr "_end இல் ஒட்டவும்"
+
+#: src/gtkui/menus.cc:220 src/qtui/menus.cc:309
 msgid "Select _All"
 msgstr "_அனைத்தையும் தேர்ந்தெடுக்குக "
 
-#: src/gtkui/menus.cc:263
+#: src/gtkui/menus.cc:227 src/moonstone/playlist_tabs.cc:309
+#: src/qtui/playlist_tabs.cc:334
 msgid "_Rename ..."
 msgstr "மறுபெயர்"
 
-#: src/gtkui/settings.cc:35
+#: src/gtkui/settings.cc:35 src/qtui/settings.cc:59
+msgid "Always"
+msgstr "எப்போதும்"
+
+#: src/gtkui/settings.cc:36 src/qtui/settings.cc:60
+msgid "Auto-hide"
+msgstr "ஆட்டோ மறைவு"
+
+#: src/gtkui/settings.cc:37 src/qtui/settings.cc:61
+msgid "Never"
+msgstr "ஒருபோதும்"
+
+#: src/gtkui/settings.cc:41 src/qtui/settings.cc:64
 msgid "Playlist Tabs"
-msgstr ""
+msgstr " பிளேலிச்ட் தாவல்கள் "
 
-#: src/gtkui/settings.cc:36
-msgid "Always show tabs"
-msgstr ""
+#: src/gtkui/settings.cc:42 src/qtui/settings.cc:65
+msgid "Show playlist tabs:"
+msgstr "பிளேலிச்ட் தாவல்களைக் காட்டு:"
 
-#: src/gtkui/settings.cc:38
+#: src/gtkui/settings.cc:45 src/qtui/settings.cc:69
 msgid "Show entry counts"
-msgstr ""
+msgstr "நுழைவு எண்ணிக்கையைக் காட்டு"
 
-#: src/gtkui/settings.cc:40
+#: src/gtkui/settings.cc:47 src/qtui/settings.cc:72
 msgid "Show close buttons"
-msgstr ""
+msgstr "மூடு பொத்தான்களைக் காட்டு"
 
-#: src/gtkui/settings.cc:42
+#: src/gtkui/settings.cc:49 src/qtui/settings.cc:75
 msgid "Playlist Columns"
-msgstr ""
+msgstr " பிளேலிச்ட் நெடுவரிசைகள் "
 
-#: src/gtkui/settings.cc:44
+#: src/gtkui/settings.cc:51 src/qtui/settings.cc:77
 msgid "Show column headers"
-msgstr ""
+msgstr "நெடுவரிசை தலைப்புகளைக் காட்டு"
 
-#: src/gtkui/settings.cc:46 src/modplug/plugin_main.cc:106
-#: src/skins/skins_cfg.cc:263
-msgid "Miscellaneous"
-msgstr ""
+#: src/gtkui/settings.cc:53 src/qtui/settings.cc:82
+msgid "Make column headers clickable for sorting"
+msgstr "வரிசைப்படுத்த நெடுவரிசை தலைப்புகளை சொடுக்கு செய்யவும்"
 
-#: src/gtkui/settings.cc:47
-msgid "Arrow keys seek by:"
-msgstr ""
+#: src/gtkui/settings.cc:56
+msgid "Use symbolic icons in toolbar"
+msgstr "கருவிப்பட்டியில் குறியீட்டு சின்னங்களைப் பயன்படுத்தவும்"
 
-#: src/gtkui/settings.cc:50
+#: src/gtkui/settings.cc:58 src/qtui/settings.cc:86
 msgid "Scroll on song change"
-msgstr ""
+msgstr "பாடல் மாற்றத்தை உருட்டவும்"
 
-#: src/gtkui/ui_gtk.cc:71
+#: src/gtkui/ui_gtk.cc:82
 msgid "GTK Interface"
 msgstr "GTK இடைமுகம் "
 
-#: src/gtkui/ui_gtk.cc:222 src/skins/ui_main.cc:232
+#: src/gtkui/ui_gtk.cc:219 src/skins/main.cc:228 src/skins-qt/main.cc:231
 #, c-format
 msgid "%s - Audacious"
 msgstr "%s - ஔடகிவஸ்"
 
-#: src/gtkui/ui_gtk.cc:225 src/qtui/main_window.cc:186
+#: src/gtkui/ui_gtk.cc:221 src/moonstone/main_window.cc:184
+#: src/qtui/main_window.cc:385
 msgid "Buffering ..."
 msgstr "இடைநிலைப்படுத்துகிறது ..."
 
-#: src/gtkui/ui_gtk.cc:228 src/skins/ui_main.cc:234 src/skins/ui_main.cc:1164
+#: src/gtkui/ui_gtk.cc:224 src/pipewire/pipewire.cc:402 src/skins/main.cc:230
+#: src/skins-qt/main.cc:233
 msgid "Audacious"
 msgstr "ஔடகிவஸ்"
 
-#: src/gtkui/ui_statusbar.cc:63 src/qtui/status_bar.cc:67
+#: src/gtkui/ui_gtk.cc:487 src/gtkui/ui_gtk.cc:518 src/gtkui/ui_gtk.cc:882
+#: src/hotkey/gui.cc:72 src/moonstone/main_window.cc:67
+#: src/moonstone/main_window.cc:145 src/moonstone/main_window.cc:146
+#: src/notify/osd.cc:85 src/qthotkey/gui.cc:67 src/qtui/main_window.cc:154
+#: src/qtui/main_window.cc:347 src/qtui/main_window.cc:348
+#: src/skins/menus.cc:109 src/skins-qt/menus.cc:100
+msgid "Play"
+msgstr "இயக்குக "
+
+#: src/gtkui/ui_gtk.cc:487 src/moonstone/main_window.cc:151
+#: src/moonstone/main_window.cc:152 src/notify/osd.cc:82
+#: src/qtui/main_window.cc:353 src/qtui/main_window.cc:354
+#: src/skins/menus.cc:110 src/skins-qt/menus.cc:101
+msgid "Pause"
+msgstr "இடைநிறுத்துக "
+
+#: src/gtkui/ui_gtk.cc:868 src/moonstone/main_window.cc:57
+#: src/qtui/main_window.cc:145 src/skins/menus.cc:86 src/skins-qt/menus.cc:77
+msgid "Search Library"
+msgstr "தேடல் நூலகம்"
+
+#: src/gtkui/ui_gtk.cc:875 src/moonstone/main_window.cc:60
+#: src/qtui/main_window.cc:147
+msgid "Open Files"
+msgstr "கோப்புக்களைத் திறkkavum"
+
+#: src/gtkui/ui_gtk.cc:876 src/moonstone/main_window.cc:62
+#: src/qtui/main_window.cc:149
+msgid "Add Files"
+msgstr "கோப்புக்களை சேர்kkavum"
+
+#: src/gtkui/ui_gtk.cc:881 src/moonstone/main_window.cc:65
+#: src/qtui/main_window.cc:152 src/skins/menus.cc:112 src/skins-qt/menus.cc:103
+msgid "Previous"
+msgstr "முந்தைய"
+
+#: src/gtkui/ui_gtk.cc:883 src/hotkey/gui.cc:74 src/moonstone/main_window.cc:69
+#: src/qthotkey/gui.cc:69 src/qtui/main_window.cc:156 src/skins/menus.cc:111
+#: src/skins-qt/menus.cc:102
+msgid "Stop"
+msgstr "நிறுத்துக "
+
+#: src/gtkui/ui_gtk.cc:884 src/moonstone/main_window.cc:76 src/notify/osd.cc:89
+#: src/qtui/main_window.cc:163 src/skins/menus.cc:113 src/skins-qt/menus.cc:104
+msgid "Next"
+msgstr "அடுத்தது "
+
+#: src/gtkui/ui_gtk.cc:886 src/moonstone/main_window.cc:79
+#: src/qtui/main_window.cc:166 src/qtui/menus.cc:254 src/skins/menus.cc:79
+#: src/skins-qt/menus.cc:69
+msgid "Record Stream"
+msgstr "பதிவு ச்ட்ரீம்"
+
+#: src/gtkui/ui_gtk.cc:919 src/moonstone/main_window.cc:86
+#: src/qtui/main_window.cc:173 src/skins/menus.cc:103 src/skins-qt/menus.cc:94
+msgid "Repeat"
+msgstr "மறுமுறை"
+
+#: src/gtkui/ui_gtk.cc:922 src/moonstone/main_window.cc:89
+#: src/qtui/main_window.cc:176 src/skins/menus.cc:104 src/skins-qt/menus.cc:95
+msgid "Shuffle"
+msgstr "குலுக்குக "
+
+#: src/gtkui/ui_gtk.cc:1114 src/qtui/main_window.cc:123
+msgid "Menu"
+msgstr "பட்டியல்"
+
+#: src/gtkui/ui_statusbar.cc:64 src/qtui/status_bar.cc:155
 msgid "mono"
 msgstr "தனித்த "
 
-#: src/gtkui/ui_statusbar.cc:65 src/qtui/status_bar.cc:69
+#: src/gtkui/ui_statusbar.cc:66 src/qtui/status_bar.cc:157
 msgid "stereo"
 msgstr "ஒலிப்பிரிப்பு"
 
-#: src/gtkui/ui_statusbar.cc:67 src/qtui/status_bar.cc:71
+#: src/gtkui/ui_statusbar.cc:68 src/qtui/status_bar.cc:160
 #, c-format
 msgid "%d channel"
 msgid_plural "%d channels"
-msgstr0 ""
-msgstr1 ""
+msgstr0 "%d சேனல்"
+msgstr1 "%d சேனல்கள்"
+
+#: src/gtkui/ui_statusbar.cc:76 src/qtui/status_bar.cc:168
+#, c-format
+msgid "%d kHz"
+msgstr "%d khz"
 
-#: src/gtkui/ui_statusbar.cc:81 src/qtui/status_bar.cc:85
+#: src/gtkui/ui_statusbar.cc:82 src/qtui/status_bar.cc:174
 #, c-format
-msgid "%d kbps"
-msgstr "%d kbps"
+msgid "%d kbit/s"
+msgstr "%d kbit/s"
 
-#: src/gtkui/ui_statusbar.cc:107 src/skins/ui_main_evlisteners.cc:103
+#: src/gtkui/ui_statusbar.cc:108 src/skins/main.cc:478 src/skins-qt/main.cc:461
 msgid "Single mode."
 msgstr "ஒற்றை முறை."
 
-#: src/gtkui/ui_statusbar.cc:109 src/skins/ui_main_evlisteners.cc:105
+#: src/gtkui/ui_statusbar.cc:110 src/skins/main.cc:480 src/skins-qt/main.cc:463
 msgid "Playlist mode."
 msgstr "பாடல் பட்டியல் murai"
 
-#: src/gtkui/ui_statusbar.cc:117 src/skins/ui_main_evlisteners.cc:111
+#: src/gtkui/ui_statusbar.cc:118 src/skins/main.cc:486 src/skins-qt/main.cc:469
 msgid "Stopping after song."
 msgstr "பாடலின் பின்னர் நிறுத்துக."
 
-#: src/hotkey/gui.cc:71
+#: src/hotkey/gui.cc:71 src/qthotkey/gui.cc:66
 msgid "Previous track"
-msgstr ""
-
-#: src/hotkey/gui.cc:72 src/notify/osd.cc:69 src/qtui/main_window.cc:69
-#: src/qtui/main_window.cc:172 src/qtui/main_window.cc:173
-#: src/skins/menus.cc:87
-msgid "Play"
-msgstr "இயக்குக "
+msgstr "முந்தைய பாடல்"
 
-#: src/hotkey/gui.cc:73
+#: src/hotkey/gui.cc:73 src/qthotkey/gui.cc:68
 msgid "Pause/Resume"
 msgstr "இடைநிறுத்து / மீண்டும் இயக்கு "
 
-#: src/hotkey/gui.cc:74 src/qtui/main_window.cc:70 src/skins/menus.cc:89
-msgid "Stop"
-msgstr "நிறுத்துக "
-
-#: src/hotkey/gui.cc:75
+#: src/hotkey/gui.cc:75 src/qthotkey/gui.cc:70
 msgid "Next track"
-msgstr ""
+msgstr "அடுத்த பாடல்"
+
+#: src/hotkey/gui.cc:76 src/qthotkey/gui.cc:71
+msgid "Step forward"
+msgstr "முன்வரவேண்டும்"
 
-#: src/hotkey/gui.cc:76
-msgid "Forward 5 seconds"
-msgstr "5 விநாடிகள் முன்னாள் செல்க "
-
-#: src/hotkey/gui.cc:77
-msgid "Rewind 5 seconds"
-msgstr "5 விநாடிகள் பின்னால் செல்க "
+#: src/hotkey/gui.cc:77 src/qthotkey/gui.cc:72
+msgid "Step backward"
+msgstr "பின்தங்கிய நிலையில் செல்லுங்கள்"
 
-#: src/hotkey/gui.cc:78
+#: src/hotkey/gui.cc:78 src/qthotkey/gui.cc:73
 msgid "Mute"
 msgstr "ஒலியடக்கவும்"
 
-#: src/hotkey/gui.cc:79
+#: src/hotkey/gui.cc:79 src/qthotkey/gui.cc:74
 msgid "Volume up"
 msgstr "ஒலிஉரப்பான் அதிகரிக்குக"
 
-#: src/hotkey/gui.cc:80
+#: src/hotkey/gui.cc:80 src/qthotkey/gui.cc:75
 msgid "Volume down"
 msgstr "ஒலிஉரப்பான் குறைக்குக"
 
-#: src/hotkey/gui.cc:81
+#: src/hotkey/gui.cc:81 src/qthotkey/gui.cc:76
 msgid "Jump to file"
 msgstr "கோப்பிற்கு தாவவும்."
 
-#: src/hotkey/gui.cc:82
+#: src/hotkey/gui.cc:82 src/qthotkey/gui.cc:77
 msgid "Toggle player window(s)"
-msgstr ""
+msgstr "பிளேயர் சாளரங்களை மாற்றவும்)"
 
-#: src/hotkey/gui.cc:83
+#: src/hotkey/gui.cc:83 src/qthotkey/gui.cc:78
 msgid "Show On-Screen-Display"
 msgstr " திரையில் தோன்றும் காட்சியினை kaattuga"
 
-#: src/hotkey/gui.cc:84
+#: src/hotkey/gui.cc:84 src/qthotkey/gui.cc:79
 msgid "Toggle repeat"
-msgstr ""
+msgstr "மீண்டும் மீண்டும்"
 
-#: src/hotkey/gui.cc:85
+#: src/hotkey/gui.cc:85 src/qthotkey/gui.cc:80
 msgid "Toggle shuffle"
-msgstr ""
+msgstr "கலக்கு மாற்று"
 
-#: src/hotkey/gui.cc:86
+#: src/hotkey/gui.cc:86 src/qthotkey/gui.cc:81
 msgid "Toggle stop after current"
-msgstr ""
+msgstr "மின்னோட்டத்திற்குப் பிறகு நிறுத்துங்கள்"
 
-#: src/hotkey/gui.cc:87
+#: src/hotkey/gui.cc:87 src/qthotkey/gui.cc:82
 msgid "Raise player window(s)"
-msgstr ""
+msgstr "பிளேயர் சாளரங்களை உயர்த்தவும்)"
 
-#: src/hotkey/gui.cc:97
+#: src/hotkey/gui.cc:98 src/qthotkey/gui.cc:100
 msgid "(none)"
 msgstr "(எதுவுமல்ல)"
 
-#: src/hotkey/gui.cc:234
+#: src/hotkey/gui.cc:261
 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 modifiers.\n"
 "\n"
 "Do you want to continue?"
 msgstr ""
-"மாற்றங்கள் இல்லாமல் முதன்மை சுட்டி பொத்தான்கள் பிணைக்க பரிந்துரைக்கப்படவில்லை,⏎\n"
-"⏎\n"
-"நீங்கள் தொடர விரும்புகிறீர்களா?"
+"முதன்மை சுட்டி பொத்தான்களை மாற்றியமைப்பாளர்கள் இல்லாமல் பிணைக்க பரிந்துரைக்கப்படவில்லை. \n"
+"\n"
+" நீங்கள் தொடர விரும்புகிறீர்களா?"
 
-#: src/hotkey/gui.cc:236
+#: src/hotkey/gui.cc:264
 msgid "Binding mouse buttons"
 msgstr "சுட்டி பொத்தான்களை பிணைத்தல்"
 
-#: src/hotkey/gui.cc:391
+#: src/hotkey/gui.cc:434
 msgid ""
 "Press a key combination inside a text field.\n"
 "You can also bind mouse buttons."
@@ -2021,86 +2250,129 @@
 "எழுத்து புலத்தில் ஒரு விசை சேர்க்கையை அழுத்தவும்.⏎\n"
 "உங்களுக்கு சுட்டி பொத்தான்களை பிணைக்கவும் முடியும்."
 
-#: src/hotkey/gui.cc:396
+#: src/hotkey/gui.cc:444 src/qthotkey/gui.cc:179
 msgid "Hotkeys:"
 msgstr "குறுக்குவிசைகள்:"
 
-#: src/hotkey/gui.cc:413
+#: src/hotkey/gui.cc:457 src/qthotkey/gui.cc:181
 msgid "Action:"
 msgstr "நடவடிக்கை: "
 
-#: src/hotkey/gui.cc:420
+#: src/hotkey/gui.cc:461 src/qthotkey/gui.cc:182
 msgid "Key Binding:"
 msgstr "சாவி பிணைத்தல்:"
 
-#: src/hotkey/gui.cc:468
+#: src/hotkey/gui.cc:518 src/qthotkey/gui.cc:184
 msgid "_Add"
-msgstr ""
+msgstr "_சேர் "
 
-#: src/hotkey/plugin.cc:61
+#: src/hotkey/plugin.cc:59 src/qthotkey/plugin.cc:78
 msgid "Global Hotkeys"
 msgstr "உலகளாவிய குறுக்குவிசைகள்:"
 
-#: src/hotkey/plugin.cc:79
+#: src/hotkey/plugin.cc:74
 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"
+"Contributors 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"
+" பதிப்புரிமை (சி) 2007-2008 சாச்சா அ்லூசியாக் <contact@saschahlusiak.de> \n"
+"\n"
+" பங்களிப்பாளர்கள் பின்வருமாறு: \n"
+" பதிப்புரிமை (சி) 2006-2007 விளாடிமிர் பாச்கோவ் <vlado.paskov@gmail.com> \n"
+" பதிப்புரிமை (இ) 2000-2002 வில்லே சிரசாலா <syrjala@sci.fi>, \n"
+" பிரைன் டேவிச் <cicious@ihug.com.au>, \n"
+" சொனாதன் ஏ. டேவிச் <davis@jdhouse.org>, \n"
+" செர்மி டான் <nsx@nsx.homeip.net>"
 
-#: src/jack-ng/jack-ng.cc:49
+#: src/jack/jack-ng.cc:54
 msgid "JACK Output"
 msgstr "JACK வெளியீடு "
 
-#: src/jack-ng/jack-ng.cc:114
+#: src/jack/jack-ng.cc:126
+msgid "Client name:"
+msgstr "நுகர்வி பெயர்:"
+
+#: src/jack/jack-ng.cc:128
 msgid "Automatically connect to output ports"
-msgstr ""
+msgstr "வெளியீட்டு துறைமுகங்களுடன் தானாக இணைக்கவும்"
+
+#: src/jack/jack-ng.cc:130
+msgid "Filter ports (regex, use any port if blank):"
+msgstr "வடிகட்டி துறைமுகங்கள் (ரீசெக்ச், காலியாக இருந்தால் எந்த போர்ட்டையும் பயன்படுத்தவும்):"
+
+#: src/jack/jack-ng.cc:136
+msgid "Connect to physical ports only"
+msgstr "உடல் துறைமுகங்களுடன் மட்டுமே இணைக்கவும்"
 
-#: src/jack-ng/jack-ng.cc:155
+#: src/jack/jack-ng.cc:139
+msgid "Upmix to"
+msgstr "upmix பெறுநர்"
+
+#: src/jack/jack-ng.cc:141
+msgid "ports if input has fewer channels"
+msgstr "உள்ளீட்டில் குறைவான சேனல்கள் இருந்தால் துறைமுகங்கள்"
+
+#: src/jack/jack-ng.cc:143
+msgid "Ignore insufficient number of ports"
+msgstr "போதிய எண்ணிக்கையிலான துறைமுகங்களை புறக்கணிக்கவும்"
+
+#: src/jack/jack-ng.cc:181
+msgid "No JACK output ports were found. Please check settings."
+msgstr "சாக் வெளியீட்டு துறைமுகங்கள் எதுவும் காணப்படவில்லை. அமைப்புகளை சரிபார்க்கவும்."
+
+#: src/jack/jack-ng.cc:195
 #, c-format
 msgid "Only %d JACK output ports were found but %d are required."
-msgstr ""
+msgstr "%d சாக் வெளியீட்டு துறைமுகங்கள் மட்டுமே காணப்பட்டன, ஆனால் %d தேவை."
 
-#: src/jack-ng/jack-ng.cc:164
+#: src/jack/jack-ng.cc:210
 #, c-format
 msgid "Failed to connect to JACK port %s."
-msgstr ""
+msgstr "சாக் துறைமுகம் %s உடன் இணைக்கத் தவறிவிட்டது."
 
-#: src/jack-ng/jack-ng.cc:184
+#: src/jack/jack-ng.cc:230
 msgid ""
 "JACK supports only floating-point audio. You must change the output bit "
 "depth to floating-point in Audacious settings."
 msgstr ""
+"சாக் மிதக்கும்-புள்ளி ஆடியோவை மட்டுமே ஆதரிக்கிறது. நீங்கள் வெளியீட்டு பிட் ஆழத்தை "
+"துணிச்சலான அமைப்புகளில் மிதக்கும் புள்ளியாக மாற்ற வேண்டும்."
 
-#: src/jack-ng/jack-ng.cc:197
+#: src/jack/jack-ng.cc:245
 msgid "Failed to connect to the JACK server; is it running?"
-msgstr ""
+msgstr "சாக் சேவையகத்துடன் இணைக்கத் தவறிவிட்டது; இது இயங்குகிறதா?"
 
-#: src/jack-ng/jack-ng.cc:273
+#: src/jack/jack-ng.cc:321
 #, c-format
 msgid ""
 "The JACK server requires a sample rate of %d Hz, but Audacious is playing at "
 "%d Hz. Please use the Sample Rate Converter effect to correct the mismatch."
 msgstr ""
+"சாக் சேவையகத்திற்கு %d எர்ட்ச் மாதிரி வீதம் தேவைப்படுகிறது, ஆனால் துணிச்சலான %d எர்ட்சில் "
+"விளையாடுகிறது. பொருந்தாத தன்மையை சரிசெய்ய மாதிரி வீத மாற்றி விளைவைப் பயன்படுத்தவும்."
 
-#: src/ladspa/plugin.cc:414
+#: src/ladspa/plugin.cc:416
 #, c-format
 msgid "%s Settings"
 msgstr "%s அமைப்புகள்"
 
-#: src/ladspa/plugin.cc:478
+#: src/ladspa/plugin.cc:482
 msgid "Module paths:"
 msgstr "தொகுதிக்கூறு பாதைகள்:"
 
-#: src/ladspa/plugin.cc:483
+#: src/ladspa/plugin.cc:487
 msgid ""
 "Separate multiple paths with a colon.\n"
 "These paths are searched in addition to LADSPA_PATH.\n"
@@ -2111,29 +2383,31 @@
 "புதிய பாதைகள் சேர்த்ததன் பின்னர், புதிய செருகுநிரல்கள் வருட உள்ளிடுகவினை அழுத்தக.</"
 "small>"
 
-#: src/ladspa/plugin.cc:499
+#: src/ladspa/plugin.cc:508
 msgid "Available plugins:"
 msgstr "இருப்பிலுள்ள செருகுநிரல்கள்:"
 
-#: src/ladspa/plugin.cc:512 src/modplug/plugin_main.cc:92
-#: src/modplug/plugin_main.cc:95 src/modplug/plugin_main.cc:98
-#: src/modplug/plugin_main.cc:101
+#: src/ladspa/plugin.cc:521 src/modplug/plugin_main.cc:91
+#: src/modplug/plugin_main.cc:94 src/modplug/plugin_main.cc:97
+#: src/modplug/plugin_main.cc:100
 msgid "Enable"
 msgstr "செயல்படுத்துக "
 
-#: src/ladspa/plugin.cc:518
+#: src/ladspa/plugin.cc:527
 msgid "Enabled plugins:"
 msgstr "செருகுநிரல்களினை செயல்ப்படுத்துக:"
 
-#: src/ladspa/plugin.cc:534
+#: src/ladspa/plugin.cc:543
 msgid "Settings"
 msgstr "அமைப்புக்கள்"
 
-#: src/ladspa/plugin.cc:551
+#: src/ladspa/plugin.cc:560
 msgid ""
 "LADSPA Host for Audacious\n"
 "Copyright 2011 John Lindgren"
 msgstr ""
+"துணிச்சலான லாட்ச்பா புரவலன் \n"
+" பதிப்புரிமை 2011 சான் லிண்ட்கிரென்"
 
 #: src/ladspa/plugin.h:78
 msgid "LADSPA Host"
@@ -2143,7 +2417,7 @@
 msgid "LIRC Plugin"
 msgstr "LIRC "
 
-#: src/lirc/lirc.cc:381
+#: src/lirc/lirc.cc:379
 msgid ""
 "A simple plugin to control Audacious using the LIRC remote control daemon\n"
 "\n"
@@ -2158,64 +2432,139 @@
 "\n"
 "For more information about LIRC, see http://lirc.org."
 msgstr ""
+"எல்.ஐ.ஆர்.சி ரிமோட் கண்ட்ரோல் டீமானைப் பயன்படுத்தி துணிச்சலைக் கட்டுப்படுத்த ஒரு எளிய "
+"சொருகி \n"
+"\n"
+" துணிச்சலுக்கு ஏற்றது: \n"
+" டோனி வ்ரூன் <sunansaw@gentoo.org> \n"
+" joonas harjuméki <jharjuma@gmail.com> \n"
+"\n"
+" எக்ச்எம்எம்எச் எல்.ஐ.ஆர்.சி சொருகி அடிப்படையில்: \n"
+" கார்ல் வான் சைக் <carl@leg.uct.ac.za> \n"
+" கிறிச்டோஃப் பார்டெல்மச் <xmms@bartelmus.de> \n"
+" ஆண்ட்ரூ ஓ \n"
+"\n"
+" lirc பற்றிய கூடுதல் தகவலுக்கு, http://lirc.org ஐப் பார்க்கவும்."
 
-#: src/lirc/lirc.cc:392
+#: src/lirc/lirc.cc:390
 msgid "Connection"
 msgstr " இணைப்பு "
 
-#: src/lirc/lirc.cc:393
+#: src/lirc/lirc.cc:391
 msgid "Reconnect to LIRC server"
 msgstr "LIRC சேவைகயத்துக்கு மீள் இணைக்குக "
 
-#: src/lirc/lirc.cc:395
+#: src/lirc/lirc.cc:393
 msgid "Wait before reconnecting:"
 msgstr "மீள் இணைக்க முன் பொறுக்க :"
 
-#: src/lyricwiki/lyricwiki.cc:41
-msgid "LyricWiki Plugin"
-msgstr "LyricWiki நீட்சி "
-
-#: src/lyricwiki/lyricwiki.cc:131 src/lyricwiki-qt/lyricwiki.cc:136
-msgid "No lyrics available"
-msgstr "எந்தவொரு பாடல்வரிகளும் கிடைக்கப்படவில்லை "
-
-#: src/lyricwiki/lyricwiki.cc:217 src/lyricwiki/lyricwiki.cc:226
-#: src/lyricwiki/lyricwiki.cc:243 src/lyricwiki/lyricwiki.cc:252
-#: src/lyricwiki/lyricwiki.cc:267 src/lyricwiki-qt/lyricwiki.cc:222
-#: src/lyricwiki-qt/lyricwiki.cc:231 src/lyricwiki-qt/lyricwiki.cc:248
-#: src/lyricwiki-qt/lyricwiki.cc:257 src/lyricwiki-qt/lyricwiki.cc:272
-msgid "Error"
-msgstr "thavaruthal"
-
-#: src/lyricwiki/lyricwiki.cc:218 src/lyricwiki/lyricwiki.cc:244
-#: src/lyricwiki-qt/lyricwiki.cc:223 src/lyricwiki-qt/lyricwiki.cc:249
+#: src/lyrics-common/chart_lyrics_provider.cc:93
+#: src/lyrics-common/chart_lyrics_provider.cc:150
+#: src/lyrics-common/lyrics_ovh_provider.cc:50
 #, c-format
 msgid "Unable to fetch %s"
-msgstr ""
+msgstr "%s பெற முடியவில்லை"
 
-#: src/lyricwiki/lyricwiki.cc:227 src/lyricwiki/lyricwiki.cc:253
-#: src/lyricwiki-qt/lyricwiki.cc:232 src/lyricwiki-qt/lyricwiki.cc:258
+#: src/lyrics-common/chart_lyrics_provider.cc:100
+#: src/lyrics-common/chart_lyrics_provider.cc:157
+#: src/lyrics-common/lyrics_ovh_provider.cc:57
 #, c-format
 msgid "Unable to parse %s"
-msgstr ""
+msgstr "%s ஐ பாகுபடுத்த முடியவில்லை"
 
-#: src/lyricwiki/lyricwiki.cc:259 src/lyricwiki-qt/lyricwiki.cc:264
+#: src/lyrics-common/chart_lyrics_provider.cc:121
+#: src/lyrics-common/chart_lyrics_provider.cc:194
+#: src/lyrics-common/lyrics_ovh_provider.cc:88
 msgid "Looking for lyrics ..."
-msgstr ""
+msgstr "பாடல் தேடுகிறது ..."
 
-#: src/lyricwiki/lyricwiki.cc:267 src/lyricwiki-qt/lyricwiki.cc:272
-msgid "Missing song metadata"
-msgstr ""
+#: src/lyrics-common/preferences.h:43
+msgid "Nowhere"
+msgstr "எங்கும்"
 
-#: src/lyricwiki/lyricwiki.cc:278 src/lyricwiki-qt/lyricwiki.cc:283
-msgid "Connecting to lyrics.wikia.com ..."
-msgstr ""
+#: src/lyrics-common/preferences.h:49
+msgid "Artist is truncated at the start, Title -- at the end"
+msgstr "<mall> கலைஞர் தொடக்கத்தில் துண்டிக்கப்பட்டுள்ளார், தலைப்பு - இறுதியில் </சிறிய>"
+
+#: src/lyrics-common/preferences.h:50
+msgid "Chars to truncate on:"
+msgstr "துண்டிக்க எழுத்துக்கள்:"
 
-#: src/lyricwiki-qt/lyricwiki.cc:55
-msgid "LyricWiki Plugin (Qt)"
+#: src/lyrics-common/preferences.h:54
+msgid "Chars are ORed in RegExp, surrounded by whitespace"
 msgstr ""
+" எழுத்துக்கள் regexp இல் ஓரெச் செய்யப்படுகின்றன, அவை வைட்ச்பேசால் சூழப்பட்டுள்ளன </"
+"small>"
+
+#: src/lyrics-common/preferences.h:55
+msgid "Chars to split on:"
+msgstr "பிரிக்க சார்ச்:"
+
+#: src/lyrics-common/preferences.h:56
+msgid "Further truncate those on chars"
+msgstr "எழுத்தில் உள்ளவர்களை மேலும் துண்டிக்கவும்"
+
+#: src/lyrics-common/preferences.h:62
+msgid "General"
+msgstr " பொது "
+
+#: src/lyrics-common/preferences.h:63
+msgid "Split title into artist and title on chars"
+msgstr "பட்டத்தை கலைஞராகப் பிரிக்கவும், தலைப்பில் தலைப்பு"
+
+#: src/lyrics-common/preferences.h:66
+msgid "Sources"
+msgstr " ஆதாரங்கள் "
+
+#: src/lyrics-common/preferences.h:67
+msgid "Use embedded lyrics (from Lyrics tag)"
+msgstr "உட்பொதிக்கப்பட்ட பாடல்களைப் பயன்படுத்தவும் (பாடல் குறிச்சொல்லிலிருந்து)"
+
+#: src/lyrics-common/preferences.h:69
+msgid "Fetch lyrics from internet:"
+msgstr "இணையத்திலிருந்து வரிகளை பெறுங்கள்:"
+
+#: src/lyrics-common/preferences.h:72
+msgid "Store fetched lyrics in local cache"
+msgstr "உள்ளக தற்காலிக சேமிப்பில் கடை பெறப்பட்ட பாடல்"
+
+#: src/lyrics-common/preferences.h:74
+msgid "Local Storage"
+msgstr " உள்ளக சேமிப்பு "
+
+#: src/lyrics-common/preferences.h:75
+msgid "Load lyric files (.lrc) from local storage"
+msgstr "உள்ளக சேமிப்பகத்திலிருந்து பாடல் கோப்புகளை (.lrc) ஏற்றவும்"
+
+#: src/lyrics-common/utils.cc:54 src/ui-common/dialogs-qt.cc:63
+msgid "Error"
+msgstr "thavaruthal"
+
+#: src/lyrics-common/utils.cc:60
+msgid "Lyrics could not be found."
+msgstr "பாடல் வரிகளைக் கண்டுபிடிக்க முடியவில்லை."
+
+#: src/lyrics-common/utils.cc:142
+msgid "Missing title and/or artist."
+msgstr "தலைப்பு மற்றும்/அல்லது கலைஞரைக் காணவில்லை."
+
+#: src/lyrics-gtk/lyrics-gtk.cc:37 src/lyrics-qt/lyrics-qt.cc:50
+msgid "Lyrics"
+msgstr "பாடல் வரிகள்"
+
+#: src/lyrics-gtk/lyrics-gtk.cc:189 src/lyrics-qt/lyrics-qt.cc:171
+msgid "Edit Lyrics ..."
+msgstr "பாடல் திருத்து ..."
+
+#: src/lyrics-gtk/lyrics-gtk.cc:195 src/lyrics-qt/lyrics-qt.cc:178
+msgid "Save Locally"
+msgstr "உள்ளூரில் சேமிக்கவும்"
+
+#: src/lyrics-gtk/lyrics-gtk.cc:201 src/lyrics-qt/lyrics-qt.cc:186
+msgid "Refresh"
+msgstr "புதுப்பிப்பு"
 
-#: src/m3u/m3u.cc:32
+#: src/m3u/m3u.cc:33
 msgid "M3U Playlists"
 msgstr "M3U பாடல் பட்டியல்"
 
@@ -2223,17 +2572,17 @@
 msgid "Tact Generator"
 msgstr "திறமை பிறப்பாக்கி"
 
-#: src/metronom/metronom.cc:147
+#: src/metronom/metronom.cc:145
 #, c-format
 msgid "Tact generator: %d bpm"
 msgstr "திறமை பிறப்பாக்கி:% d நிமிடத்திற்கான துடிப்புகள் "
 
-#: src/metronom/metronom.cc:149
+#: src/metronom/metronom.cc:147
 #, c-format
 msgid "Tact generator: %d bpm %d/%d"
 msgstr "திறமை பிறப்பாக்கி:%d நிமிடத்திற்கான துடிப்புகள் %d %d"
 
-#: src/metronom/metronom.cc:237
+#: src/metronom/metronom.cc:235
 msgid ""
 "A Tact Generator by Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
 "\n"
@@ -2241,22 +2590,29 @@
 "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"
+" இதைப் பயன்படுத்த, ஒரு முகவரி ஐச் சேர்க்கவும்: தந்திரம்: // பீட்ச்*எண்/டென் \n"
+" எ.கா. தந்திரம்: // 77 நிமிடத்திற்கு 77 துடிப்புகள் விளையாட \n"
+" அல்லது தந்திரம்: // 60*3/4 3/4 தந்திரங்களில் 60 பிபிஎம் விளையாட"
 
-#: src/mixer/mixer.cc:38
+#: src/mixer/mixer.cc:43
 msgid "Channel Mixer"
 msgstr "தட கலவைப்பான் "
 
-#: src/mixer/mixer.cc:202
+#: src/mixer/mixer.cc:255
 msgid ""
 "Channel Mixer Plugin for Audacious\n"
 "Copyright 2011-2012 John Lindgren and Michał Lipski"
 msgstr ""
+"துணிச்சலான சேனல் மிக்சர் சொருகி \n"
+" பதிப்புரிமை 2011-2012 சான் லிண்ட்கிரென் மற்றும் மைக்கேச் லிப்ச்கி"
 
-#: src/mixer/mixer.cc:206
+#: src/mixer/mixer.cc:259
 msgid "Channel Mixer"
 msgstr "தட கலவை"
 
-#: src/mixer/mixer.cc:207
+#: src/mixer/mixer.cc:260
 msgid "Output channels:"
 msgstr "வெளியீட்டு thadangal"
 
@@ -2266,170 +2622,178 @@
 
 #: src/mms/mms.cc:82
 msgid "Error connecting to MMS server"
-msgstr ""
+msgstr "எம்.எம்.எச் சேவையகத்துடன் இணைப்பதில் பிழை"
 
-#: src/modplug/modplugbmp.h:53
+#: src/modplug/modplugbmp.h:57
 msgid "ModPlug (Module Player)"
 msgstr "ModPlug (தொகுதி இயக்கி )"
 
-#: src/modplug/plugin_main.cc:53
-msgid "Resolution"
-msgstr ""
-
-#: src/modplug/plugin_main.cc:54
-msgid "8-bit"
-msgstr ""
-
 #: src/modplug/plugin_main.cc:55
-msgid "16-bit"
-msgstr ""
-
-#: src/modplug/plugin_main.cc:56
 msgid "Channels"
-msgstr ""
+msgstr " சேனல்கள் "
 
-#: src/modplug/plugin_main.cc:60
+#: src/modplug/plugin_main.cc:59
 msgid "Nearest (fastest)"
-msgstr ""
+msgstr "அருகிலுள்ள (வேகமான)"
 
-#: src/modplug/plugin_main.cc:61
+#: src/modplug/plugin_main.cc:60
 msgid "Linear (fast)"
-msgstr ""
+msgstr "நேரியல் (வேகமாக)"
 
-#: src/modplug/plugin_main.cc:62
+#: src/modplug/plugin_main.cc:61
 msgid "Spline (good)"
-msgstr ""
+msgstr "ச்ப்லைன் (நல்லது)"
 
-#: src/modplug/plugin_main.cc:63
+#: src/modplug/plugin_main.cc:62
 msgid "Polyphase (best)"
-msgstr ""
+msgstr "பாலிஃபேச் (சிறந்தது)"
 
-#: src/modplug/plugin_main.cc:64
+#: src/modplug/plugin_main.cc:63
 msgid "Sample rate"
-msgstr ""
+msgstr " மாதிரி வீதம் "
 
-#: src/modplug/plugin_main.cc:65
+#: src/modplug/plugin_main.cc:64
 msgid "22 kHz"
-msgstr ""
+msgstr "22 khz"
 
-#: src/modplug/plugin_main.cc:66
+#: src/modplug/plugin_main.cc:65
 msgid "44 kHz"
-msgstr ""
+msgstr "44 khz"
 
-#: src/modplug/plugin_main.cc:67
+#: src/modplug/plugin_main.cc:66
 msgid "48 kHz"
-msgstr ""
+msgstr "48 கிலோஎர்ட்ச்"
 
-#: src/modplug/plugin_main.cc:68
+#: src/modplug/plugin_main.cc:67
 msgid "96 kHz"
-msgstr ""
+msgstr "96 கிலோஎர்ட்ச்"
 
-#: src/modplug/plugin_main.cc:72 src/modplug/plugin_main.cc:77
-#: src/modplug/plugin_main.cc:82
+#: src/modplug/plugin_main.cc:71 src/modplug/plugin_main.cc:76
+#: src/modplug/plugin_main.cc:81
 msgid "Level:"
-msgstr ""
+msgstr "நிலை:"
 
-#: src/modplug/plugin_main.cc:78
+#: src/modplug/plugin_main.cc:77
 msgid "Cutoff:"
-msgstr ""
+msgstr "வெட்டு:"
 
-#: src/modplug/plugin_main.cc:91
+#: src/modplug/plugin_main.cc:90
 msgid "Reverb"
-msgstr ""
+msgstr " ரெவெர்ப் "
 
-#: src/modplug/plugin_main.cc:94
+#: src/modplug/plugin_main.cc:93
 msgid "Bass Boost"
-msgstr ""
+msgstr " பாச் பூச்ட் "
 
-#: src/modplug/plugin_main.cc:97
+#: src/modplug/plugin_main.cc:96
 msgid "Surround"
-msgstr ""
+msgstr " சரவுண்ட் "
 
-#: src/modplug/plugin_main.cc:100
+#: src/modplug/plugin_main.cc:99
 msgid "Preamp"
-msgstr ""
+msgstr " preamp "
 
-#: src/modplug/plugin_main.cc:107
+#: src/modplug/plugin_main.cc:106
 msgid "Oversample"
-msgstr ""
+msgstr "மிகைப்படுத்தப்பட்ட மாதிரி"
 
-#: src/modplug/plugin_main.cc:108
+#: src/modplug/plugin_main.cc:107
 msgid "Noise reduction"
-msgstr ""
+msgstr "ஒலி குறைப்பு"
 
-#: src/modplug/plugin_main.cc:109
+#: src/modplug/plugin_main.cc:108
 msgid "Play Amiga MODs"
-msgstr ""
+msgstr "அமிகா மோட்ச் விளையாடுங்கள்"
 
-#: src/modplug/plugin_main.cc:110
+#: src/modplug/plugin_main.cc:109
 msgid "Repeat"
-msgstr ""
+msgstr " மீண்டும் "
 
-#: src/modplug/plugin_main.cc:111
+#: src/modplug/plugin_main.cc:110
 msgid "Repeat count:"
-msgstr ""
+msgstr "எண்ணிக்கை மீண்டும்:"
 
-#: src/modplug/plugin_main.cc:112
+#: src/modplug/plugin_main.cc:111
 msgid "To repeat forever, set the repeat count to -1."
-msgstr ""
+msgstr "என்றென்றும் மீண்டும் செய்ய, மீண்டும் எண்ணிக்கையை -1 ஆக அமைக்கவும்."
 
-#: src/modplug/plugin_main.cc:125 src/sid/xs_config.cc:106
+#: src/modplug/plugin_main.cc:124 src/sid/xs_config.cc:106
 msgid "These settings will take effect when Audacious is restarted."
-msgstr ""
+msgstr "துணிச்சலான மறுதொடக்கம் செய்யப்படும்போது இந்த அமைப்புகள் நடைமுறைக்கு வரும்."
+
+#: src/moonstone/main_window.cc:72 src/moonstone/main_window.cc:73
+#: src/qtui/main_window.cc:159 src/qtui/main_window.cc:160
+#: src/skins/menus.cc:107 src/skins-qt/menus.cc:98
+msgid "Stop After This Song"
+msgstr "இந்த பாடலுக்குப் பிறகு நிறுத்துங்கள்"
+
+#: src/moonstone/moonstone.cc:39
+msgid "Moonstone"
+msgstr "மூன்ச்டோன்"
+
+#: src/moonstone/playlist_header.cc:212 src/qtui/playlist_header.cc:258
+msgid "Reset to Defaults"
+msgstr "இயல்புநிலைகளுக்கு மீட்டமைக்கவும்"
+
+#: src/moonstone/playlist_model.cc:38 src/qtui/playlist_header.cc:232
+msgid "Now Playing"
+msgstr "தற்போது இயக்கப்படுவது"
+
+#: src/moonstone/playlist_selection.cc:66
+#: src/playlist-manager/playlist-manager.cc:201
+#: src/playlist-manager-qt/playlist-manager-qt.cc:190
+msgid "Entries"
+msgstr "varavugal"
 
 #: src/mpg123/mpg123.cc:54
 msgid "MPG123 Plugin"
 msgstr "MPG123 நீட்சி"
 
-#: src/mpg123/mpg123.cc:83
-msgid "Advanced"
-msgstr ""
-
-#: src/mpg123/mpg123.cc:84
+#: src/mpg123/mpg123.cc:82
 msgid "Use accurate length calculation (slow)"
-msgstr ""
+msgstr "துல்லியமான நீள கணக்கீட்டைப் பயன்படுத்தவும் (மெதுவாக)"
 
-#: src/mpg123/mpg123.cc:248
+#: src/mpg123/mpg123.cc:260
 msgid "Surround"
 msgstr "சூழ்ந்த"
 
-#: src/mpris2/plugin.cc:39
+#: src/mpris2/plugin.cc:40
 msgid "MPRIS 2 Server"
 msgstr "MPRIS 2 சேவையகம் "
 
-#: src/neon/neon.cc:97
+#: src/neon/neon.cc:102
 msgid "Neon HTTP/HTTPS Plugin"
 msgstr "Neon HTTP/HTTPS நீட்சி "
 
-#: src/neon/neon.cc:521
+#: src/neon/neon.cc:526
 msgid "Error parsing redirect"
-msgstr ""
+msgstr "பிழையான பாகுபடுத்தல் திருப்பி விடப்படுகிறது"
 
-#: src/neon/neon.cc:535
+#: src/neon/neon.cc:540
 msgid "Unknown HTTP error"
-msgstr ""
+msgstr "தெரியாத http பிழை"
 
-#: src/neon/neon.cc:569
+#: src/neon/neon.cc:614
 msgid "Error parsing URL"
-msgstr ""
+msgstr "முகவரி ஐ பாகுபடுத்துகிறது"
 
-#: src/neon/neon.cc:632
+#: src/neon/neon.cc:687
 msgid "Too many redirects"
-msgstr ""
+msgstr "பல வழிமாற்றுகள்"
 
-#: src/notify/event.cc:64
+#: src/notify/event.cc:97
 msgid "Stopped"
 msgstr "நிறுத்துப்பட்டது "
 
-#: src/notify/event.cc:64
+#: src/notify/event.cc:97
 msgid "Audacious is not playing."
 msgstr "ஔடகிவஸ் இயங்கவில்லை "
 
-#: src/notify/notify.cc:42
+#: src/notify/notify.cc:39
 msgid "Desktop Notifications"
 msgstr "பணிமேடை அறிவிப்புகள்"
 
-#: src/notify/notify.cc:60
+#: src/notify/notify.cc:57
 msgid ""
 "Desktop Notifications Plugin for Audacious\n"
 "Copyright (C) 2010 Maximilian Bogner\n"
@@ -2448,65 +2812,126 @@
 "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 ""
+"டெச்க்டாப் அறிவிப்புகள் துணிச்சலான சொருகி \n"
+" பதிப்புரிமை (இ) 2010 மாக்சிமிலியன் போக்னர் \n"
+" பதிப்புரிமை (சி) 2011-2013 சான் லிண்ட்கிரென் மற்றும் சீன்-அலெக்சாண்ட்ரே ஆங்கிலச் டி "
+"ஆரியாக் \n"
+"\n"
+" இந்த சொருகி இலவச மென்பொருள்: நீங்கள் அதை மறுபகிர்வு செய்யலாம் மற்றும்/அல்லது குனு பொது "
+"பொது உரிமத்தின் விதிமுறைகளின் கீழ் இலவச மென்பொருள் அறக்கட்டளையால் வெளியிடப்பட்டபடி, "
+"உரிமத்தின் பதிப்பு 3 அல்லது (உங்கள் விருப்பத்தில்) பின்னர் எந்த பதிப்பையும் மாற்றலாம். \n"
+"\n"
+" இந்த சொருகி இது பயனுள்ளதாக இருக்கும் என்ற நம்பிக்கையில் விநியோகிக்கப்படுகிறது, ஆனால் "
+"எந்த உத்தரவாதமும் இல்லாமல்; ஒரு குறிப்பிட்ட நோக்கத்திற்காக வணிகத்தன்மை அல்லது உடற்தகுதி "
+"ஆகியவற்றின் மறைமுக பொறுப்பு கூட இல்லாமல். மேலும் விவரங்களுக்கு குனு பொது பொது "
+"உரிமத்தைப் பார்க்கவும். \n"
+"\n"
+" இந்த திட்டத்துடன் குனு பொது பொது உரிமத்தின் நகலை நீங்கள் பெற்றிருக்க வேண்டும். "
+"இல்லையென்றால், <http://www.gnu.org/licenses/> ஐப் பார்க்கவும்."
 
-#: src/notify/notify.cc:110
+#: src/notify/notify.cc:104
 msgid "Show playback controls"
-msgstr ""
+msgstr "பிளேபேக் கட்டுப்பாடுகளைக் காட்டு"
 
-#: src/notify/notify.cc:112
+#: src/notify/notify.cc:106
 msgid "Always show notification"
-msgstr ""
+msgstr "எப்போதும் அறிவிப்பைக் காட்டுங்கள்"
 
-#: src/notify/notify.cc:114
+#: src/notify/notify.cc:108
 msgid "Include album name in notification"
-msgstr ""
+msgstr "அறிவிப்பில் ஆல்பத்தின் பெயரைச் சேர்க்கவும்"
+
+#: src/notify/notify.cc:110
+msgid "Custom notification duration:"
+msgstr "தனிப்பயன் அறிவிப்பு காலம்:"
 
-#: src/notify/osd.cc:58
+#: src/notify/osd.cc:74
 msgid "Show"
 msgstr "காண்பிக்குக "
 
-#: src/notify/osd.cc:66 src/qtui/main_window.cc:178
-#: src/qtui/main_window.cc:179 src/skins/menus.cc:88
-msgid "Pause"
-msgstr "இடைநிறுத்துக "
+#: src/openmpt/mpt.cc:50
+msgid "OpenMPT (Module Player)"
+msgstr "openmpt (தொகுதி பிளேயர்)"
 
-#: src/notify/osd.cc:73 src/qtui/main_window.cc:72 src/skins/menus.cc:91
-msgid "Next"
-msgstr "அடுத்தது "
+#: src/openmpt/mpt.cc:132
+msgid ""
+"Module player based on libopenmpt\n"
+"\n"
+"Written by: Chris Spiegel <cspiegel@gmail.com>"
+msgstr ""
+"லிபோபெம்ப்டை அடிப்படையாகக் கொண்ட தொகுதி பிளேயர் \n"
+"\n"
+" எழுதியவர்: கிறிச் ச்பீகல் <cspiegel@gmail.com>"
 
-#: src/oss4/oss.h:93
+#: src/openmpt/mpt.cc:151
+msgid "Stereo separation:"
+msgstr "ச்டீரியோ பிரிப்பு:"
+
+#: src/openmpt/mpt.cc:153
+msgid "% (0=mono, 100=default, 200=full)"
+msgstr "% (0 = மோனோ, 100 = இயல்புநிலை, 200 = முழு)"
+
+#: src/openmpt/mpt.cc:157
+msgid "Interpolation:"
+msgstr "இடைக்கணிப்பு:"
+
+#: src/openmpt/mptwrap.h:51 src/soxr/sox-resampler.cc:189 src/xsf/plugin.cc:437
+msgid "Linear"
+msgstr "நேரியல்"
+
+#: src/openmpt/mptwrap.h:52
+msgid "Cubic"
+msgstr "கன"
+
+#: src/openmpt/mptwrap.h:53
+msgid "Windowed sinc"
+msgstr "சாளர சின்க்"
+
+#: src/opus/opus.cc:39
+msgid "Opus Decoder"
+msgstr "ஓபச் டிகோடர்"
+
+#: src/opus/opus.cc:336
+msgid ""
+"Opus Decoder Plugin for Audacious\n"
+"Copyright 2022 Thomas Lange"
+msgstr ""
+"துணிச்சலுக்கான ஓபச் டிகோடர் சொருகி \n"
+" பதிப்புரிமை 2022 தாமச் லாங்கே"
+
+#: src/oss4/oss.h:70
 msgid "OSS4 Output"
 msgstr "OSS4 வெளியீடு "
 
-#: src/oss4/oss.h:95
+#: src/oss4/oss.h:72
 msgid "OSS3 Output"
-msgstr ""
+msgstr "oss3 வெளியீடு"
 
 #: src/oss4/plugin.cc:35
 msgid "Default device"
-msgstr ""
+msgstr "இயல்புநிலை சாதனம்"
 
-#: src/oss4/plugin.cc:77
+#: src/oss4/plugin.cc:78
 msgid "Audio device:"
 msgstr "ஒலி சாதனம்:"
 
-#: src/oss4/plugin.cc:80
+#: src/oss4/plugin.cc:81
 msgid "Use alternate device:"
 msgstr "மாற்று சாதனம் பயன்படுத்துக:"
 
-#: src/oss4/plugin.cc:84
+#: src/oss4/plugin.cc:85
 msgid "Save volume between sessions."
 msgstr "அமர்வுகள் இடையே ஒலி அளவை சேமிக்குக."
 
-#: src/oss4/plugin.cc:86
+#: src/oss4/plugin.cc:87
 msgid "Enable format conversions made by the OSS software."
 msgstr "OSS மென்பொருள் மூலம் வடிவமைப்பு மாற்றத்தை செயல்படுத்துக."
 
-#: src/oss4/plugin.cc:88
+#: src/oss4/plugin.cc:89
 msgid "Enable exclusive mode to prevent virtual mixing."
 msgstr "மெய்நிகர் கலப்பினை தடுக்க பிரத்யேக முறையினை செயல்படுத்துக."
 
-#: src/oss4/plugin.cc:100
+#: src/oss4/plugin.cc:101
 msgid ""
 "OSS4 Output Plugin for Audacious\n"
 "Copyright 2010-2012 Michał Lipski\n"
@@ -2514,60 +2939,115 @@
 "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"
+" பதிப்புரிமை 2010-2012 மைக்கே லிப்ச்கி \n"
+"\n"
+" #audiacial, குறிப்பாக டோனி வ்ரூன் மற்றும் சான் லிண்ட்கிரென் ஆகியோருக்கு நான் நன்றி "
+"தெரிவிக்க விரும்புகிறேன், நிச்சயமாக முந்தைய oss சொருகி ஆசிரியர்கள்."
 
-#: src/playlist-manager/playlist-manager.cc:37
-msgid "Playlist Manager"
-msgstr ""
+#: src/pipewire/pipewire.cc:44
+msgid "PipeWire Output"
+msgstr "பைப்வேர் வெளியீடு"
 
-#: src/playlist-manager/playlist-manager.cc:226
-msgid "Entries"
+#: src/pipewire/pipewire.cc:118
+msgid ""
+"PipeWire Output Plugin for Audacious\n"
+"Copyright 2022 Thomas Lange\n"
+"\n"
+"Based on the PipeWire Output Plugin for Qmmp\n"
+"Copyright 2021 Ilya Kotov"
 msgstr ""
+"துணிச்சலுக்கான பைப்வேர் வெளியீட்டு சொருகி \n"
+" பதிப்புரிமை 2022 தாமச் லாங்கே \n"
+"\n"
+" qmmp க்கான பைப்வைர் வெளியீட்டு சொருகி அடிப்படையில் \n"
+" பதிப்புரிமை 2021 இலியா கோட்டோவ்"
 
-#: src/playlist-manager/playlist-manager.cc:245
+#: src/pipewire/pipewire.cc:408 src/skins/menus.cc:88 src/skins-qt/menus.cc:79
+msgid "Playback"
+msgstr "மீள் இயக்கு"
+
+#: src/playlist-manager/playlist-manager.cc:38
+#: src/playlist-manager-qt/playlist-manager-qt.cc:42
+msgid "Playlist Manager"
+msgstr "பாடல் பட்டிய நிர்வாகி "
+
+#: src/playlist-manager/playlist-manager.cc:221
+#: src/playlist-manager-qt/playlist-manager-qt.cc:356
 msgid "_Remove"
-msgstr ""
+msgstr "நீக்கு "
 
-#: src/playlist-manager/playlist-manager.cc:246
+#: src/playlist-manager/playlist-manager.cc:222
+#: src/playlist-manager-qt/playlist-manager-qt.cc:351
 msgid "Ren_ame"
-msgstr ""
+msgstr "ren_ame"
 
 #: src/pls/pls.cc:35
 msgid "PLS Playlists"
 msgstr "PLS பாடல் பட்டியல்"
 
-#: src/psf/plugin.cc:45
+#: src/psf/plugin.cc:53
 msgid "OpenPSF PSF1/PSF2 Decoder"
 msgstr "OpenPSF PSF1/PSF2 குறிவிலக்கி "
 
-#: src/pulse_audio/pulse_audio.cc:38
+#: src/psf/plugin.cc:270
+msgid "OpenPSF Configuration"
+msgstr " openpsf உள்ளமைவு "
+
+#: src/psf/plugin.cc:271 src/xsf/plugin.cc:444
+msgid "Ignore length from file"
+msgstr "கோப்பிலிருந்து நீளத்தை புறக்கணிக்கவும்"
+
+#: src/pulse/pulse_audio.cc:42
 msgid "PulseAudio Output"
 msgstr "PulseAudio வெளியீடு "
 
-#: src/pulse_audio/pulse_audio.cc:611
+#: src/pulse/pulse_audio.cc:84
+msgid "Context name:"
+msgstr "சூழல் பெயர்:"
+
+#: src/pulse/pulse_audio.cc:86
+msgid "Stream name:"
+msgstr "ச்ட்ரீம் பெயர்:"
+
+#: src/pulse/pulse_audio.cc:596
 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."
+"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"
+"\n"
+" இந்த நிரல் இலவச மென்பொருள்; இலவச மென்பொருள் அறக்கட்டளையால் வெளியிடப்பட்ட குனு பொது "
+"பொது உரிமத்தின் விதிமுறைகளின் கீழ் நீங்கள் அதை மறுபகிர்வு செய்யலாம் மற்றும்/அல்லது "
+"மாற்றலாம்; உரிமத்தின் பதிப்பு 2, அல்லது (உங்கள் விருப்பத்தில்) பின்னர் எந்த பதிப்பும். \n"
+"\n"
+" இந்த திட்டம் பயனுள்ளதாக இருக்கும் என்ற நம்பிக்கையில் விநியோகிக்கப்படுகிறது, ஆனால் எந்த "
+"உத்தரவாதமும் இல்லாமல்; ஒரு குறிப்பிட்ட நோக்கத்திற்காக வணிகத்தன்மை அல்லது உடற்தகுதி "
+"ஆகியவற்றின் மறைமுக பொறுப்பு கூட இல்லாமல். மேலும் விவரங்களுக்கு குனு பொது பொது "
+"உரிமத்தைப் பார்க்கவும். \n"
+"\n"
+" இந்த திட்டத்துடன் குனு பொது பொது உரிமத்தின் நகலை நீங்கள் பெற்றிருக்க வேண்டும்; "
+"இல்லையென்றால், இலவச மென்பொருள் அறக்கட்டளை, இன்க்., 51 பிராங்க்ளின் தெரு, ஐந்தாவது மாடி, "
+"பாச்டன், எம்.ஏ 02110-1301, அமெரிக்கா."
 
-#: src/qtaudio/qtaudio.cc:49
+#: src/qtaudio/qtaudio.cc:53
 msgid "QtMultimedia Output"
-msgstr ""
+msgstr "qtmultimedia வெளியீடு"
 
-#: src/qtaudio/qtaudio.cc:77
+#: src/qtaudio/qtaudio.cc:84
 msgid ""
 "QtMultimedia Audio Output Plugin for Audacious\n"
 "Copyright 2014 William Pitcock\n"
@@ -2575,50 +3055,114 @@
 "Based on SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
 msgstr ""
+"துணிச்சலுக்கான qtmultimedia ஆடியோ வெளியீட்டு சொருகி \n"
+" பதிப்புரிமை 2014 வில்லியம் பிட்காக் \n"
+"\n"
+" துணிச்சலுக்கான எச்.டி.எல் வெளியீட்டு சொருகி அடிப்படையில் \n"
+" பதிப்புரிமை 2010 சான் லிண்ட்கிரென்"
 
-#: src/qtui/dialog_windows.cc:31
-msgid "Working ..."
+#: src/qtglspectrum/gl-spectrum.cc:41
+msgid ""
+"OpenGL Spectrum Analyzer for Audacious\n"
+"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
+"Copyright 2014, 2020 Ariadne Conill\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 ""
+"துணிச்சலுக்கான ஓபன்சிஎல் ச்பெக்ட்ரம் பகுப்பாய்வி \n"
+" பதிப்புரிமை 2013 கிறிச்டோஃப் புடே, சான் லிண்ட்கிரென் மற்றும் கார்லோ பிராமினி \n"
+" பதிப்புரிமை 2014, 2020 அரியட்னே கோனில் \n"
+"\n"
+" எக்ச்எம்எம்எச் சொருகி அடிப்படையில்: \n"
+" பதிப்புரிமை 1998-2000 பீட்டர் ஆல்ம், மைக்கேல் ஆல்ம், ஓலே ஆல்னாச், தாமச் நில்சன், மற்றும் 4 "
+"ஃப்ரண்ட் டெக்னாலசிச் \n"
+"\n"
+" உரிமம்: gplv2+"
 
-#: src/qtui/filter_input.cc:44 src/skins/ui_playlist.cc:221
-msgid "Search"
+#: src/qthotkey/gui.cc:177
+msgid "Press a key combination inside a text field."
+msgstr "உரை புலத்திற்குள் ஒரு முக்கிய கலவையை அழுத்தவும்."
+
+#: src/qthotkey/plugin.cc:105
+msgid ""
+"Global Hotkey Plugin\n"
+"Control the player with global key combinations or multimedia keys.\n"
+"\n"
+"Copyright (C) 2020 i.Dark_Templar <darktemplar@dark-templar-archives.net>\n"
+"Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n"
+"\n"
+"Contributors 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"
+" பதிப்புரிமை (சி) 2020 i.dark_templar <slarktemplar@dark-templar-archives."
+"net> \n"
+" பதிப்புரிமை (சி) 2007-2008 சாச்சா அ்லூசியாக் <contact@saschahlusiak.de> \n"
+"\n"
+" பங்களிப்பாளர்கள் பின்வருமாறு: \n"
+" பதிப்புரிமை (சி) 2006-2007 விளாடிமிர் பாச்கோவ் <vlado.paskov@gmail.com> \n"
+" பதிப்புரிமை (இ) 2000-2002 வில்லே சிரசாலா <syrjala@sci.fi>, \n"
+" பிரைன் டேவிச் <cicious@ihug.com.au>, \n"
+" சொனாதன் ஏ. டேவிச் <davis@jdhouse.org>, \n"
+" செர்மி டான் <nsx@nsx.homeip.net>"
 
-#: src/qtui/main_window_actions.cc:94
+#: src/qtui/menus.cc:109
 msgid "_Open Folder ..."
-msgstr ""
+msgstr "_ திறந்த கோப்புறை ..."
 
-#: src/qtui/main_window_actions.cc:96
+#: src/qtui/menus.cc:115
 msgid "_Add Folder ..."
-msgstr ""
+msgstr "_add கோப்புறை ..."
 
-#: src/qtui/main_window_actions.cc:101
+#: src/qtui/menus.cc:128
 msgid "_Log Inspector ..."
-msgstr ""
+msgstr "_ லாக் இன்ச்பெக்டர் ..."
 
-#: src/qtui/main_window.cc:64
-msgid "Open Files"
-msgstr ""
+#: src/qtui/menus.cc:220
+msgid "_Find ..."
+msgstr "_ ஃபைண்ட் ..."
 
-#: src/qtui/main_window.cc:66
-msgid "Add Files"
-msgstr ""
+#: src/qtui/menus.cc:256 src/skins/menus.cc:80 src/skins-qt/menus.cc:70
+msgid "Audio Settings ..."
+msgstr "ஆடியோ அமைப்புகள் ..."
 
-#: src/qtui/main_window.cc:71 src/skins/menus.cc:90
-msgid "Previous"
-msgstr "முந்தைய"
+#: src/qtui/playlist_model.cc:188
+msgid "Q#"
+msgstr "கே#"
 
-#: src/qtui/main_window.cc:77 src/skins/menus.cc:82
-msgid "Repeat"
-msgstr "மறுமுறை"
+#: src/qtui/playlist_model.cc:190
+msgid "T#"
+msgstr "டி#"
 
-#: src/qtui/main_window.cc:79 src/skins/menus.cc:83
-msgid "Shuffle"
-msgstr "குலுக்குக "
+#: src/qtui/playlist_model.cc:192
+msgid "C#"
+msgstr "சி#"
+
+#: src/qtui/playlist_model.cc:194
+msgid "D#"
+msgstr "டி#"
 
-#: src/qtui/qtui.cc:42
+#: src/qtui/qtui.cc:40
 msgid "Qt Interface"
-msgstr ""
+msgstr "கியுடி இடைமுகம்"
+
+#: src/qtui/search_bar.cc:46
+msgid "Search playlist"
+msgstr "பிளேலிச்ட்டைத் தேடுங்கள்"
+
+#: src/qtui/settings.cc:79
+msgid "Use bold font for column headers"
+msgstr "நெடுவரிசை தலைப்புகளுக்கு தைரியமான எழுத்துருவைப் பயன்படுத்தவும்"
 
 #: src/resample/resample.cc:43
 msgid "Sample Rate Converter"
@@ -2629,6 +3173,8 @@
 "Sample Rate Converter Plugin for Audacious\n"
 "Copyright 2010-2012 John Lindgren"
 msgstr ""
+"துணிச்சலான மாதிரி வீத மாற்றி சொருகி \n"
+" பதிப்புரிமை 2010-2012 சான் லிண்ட்கிரென்"
 
 #: src/resample/resample.cc:187
 msgid "Skip/repeat samples"
@@ -2658,7 +3204,7 @@
 msgid "Method:"
 msgstr "முறைமை "
 
-#: src/resample/resample.cc:199 src/sox-resampler/sox-resampler.cc:161
+#: src/resample/resample.cc:199 src/soxr/sox-resampler.cc:203
 msgid "Rate:"
 msgstr "வீதம்:"
 
@@ -2684,7 +3230,7 @@
 
 #: src/resample/resample.cc:217
 msgid "32.0 kHz:"
-msgstr ""
+msgstr "32.0 khz:"
 
 #: src/resample/resample.cc:221
 msgid "44.1 kHz:"
@@ -2696,7 +3242,7 @@
 
 #: src/resample/resample.cc:229
 msgid "88.2 kHz:"
-msgstr ""
+msgstr "88.2 khz:"
 
 #: src/resample/resample.cc:233
 msgid "96 kHz:"
@@ -2704,147 +3250,129 @@
 
 #: src/resample/resample.cc:237
 msgid "176.4 kHz:"
-msgstr ""
+msgstr "176.4 khz:"
 
 #: src/resample/resample.cc:241
 msgid "192 kHz:"
 msgstr "192 kHz: "
 
-#: src/scrobbler2/config_window.cc:41
-#, c-format
-msgid "OK. Scrobbling for user: %s"
-msgstr ""
-
-#: src/scrobbler2/config_window.cc:54
-msgid "Permission Denied"
-msgstr ""
-
-#: src/scrobbler2/config_window.cc:56
-msgid "Access the following link to allow Audacious to scrobble your plays:"
-msgstr ""
-
-#: src/scrobbler2/config_window.cc:66
-msgid "Keep this window open and click 'Check Permission' again.\n"
-msgstr ""
+#: src/scrobbler2/config_window.cc:29
+msgid "Checking Last.fm access ..."
+msgstr "last.fm அணுகலைச் சரிபார்க்கிறது ..."
 
-#: src/scrobbler2/config_window.cc:69 src/scrobbler2/config_window.cc:80
+#: src/scrobbler2/config_window.cc:35
 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."
+"Your scrobbles are being saved on your computer temporarily. They will be "
+"submitted as soon as Audacious is allowed access."
 msgstr ""
+"உங்கள் கணினியில் தற்காலிகமாக சேமிக்கப்படுகிறது. துணிச்சலான அணுகலை அனுமதித்தவுடன் அவை "
+"சமர்ப்பிக்கப்படும்."
 
-#: src/scrobbler2/config_window.cc:77
-msgid "Network Problem."
-msgstr "வலையமைப்பு சிக்கல் "
+#: src/scrobbler2/config_window.cc:41
+#, c-format
+msgid "Permission granted. Scrobbling for user %s."
+msgstr "இசைவு வழங்கப்பட்டது. பயனர் %s."
 
-#: src/scrobbler2/config_window.cc:78
-msgid "There was a problem contacting Last.fm. Please try again later."
+#: src/scrobbler2/config_window.cc:44
+msgid ""
+"Permission denied. Open the following URL in a browser, allow Audacious "
+"access to your account, and then click 'Check Permission' again:"
 msgstr ""
+"இசைவு மறுக்கப்பட்டது. உலாவியில் பின்வரும் முகவரி ஐத் திறந்து, உங்கள் கணக்கிற்கு "
+"துணிச்சலான அணுகலை அனுமதிக்கவும், பின்னர் 'இசைவு சரிபார்க்கவும்' என்பதைக் சொடுக்கு செய்க:"
 
-#: src/scrobbler2/config_window.cc:110
-msgid "Checking..."
-msgstr "சரிபார்க்கப்படுகிறது "
+#: src/scrobbler2/config_window.cc:53
+msgid "There was a problem contacting Last.fm."
+msgstr "கடைசியாக தொடர்பு கொள்வதில் சிக்கல் ஏற்பட்டது."
 
-#: src/scrobbler2/config_window.cc:176
-msgid "C_heck Permission"
-msgstr ""
+#: src/scrobbler2/config_window.cc:92
+msgid "Check Permission"
+msgstr "அனுமதியை சரிபார்க்கவும்"
 
-#: src/scrobbler2/config_window.cc:177
-msgid "_Revoke Permission"
-msgstr ""
+#: src/scrobbler2/config_window.cc:93
+msgid "Revoke Permission"
+msgstr "இசைவு ரத்து"
 
-#: src/scrobbler2/config_window.cc:220
-msgid ""
-"You need to allow Audacious to scrobble tracks to your Last.fm account.\n"
-msgstr ""
+#: src/scrobbler2/config_window.cc:97
+msgid "You need to allow Audacious to scrobble tracks to your Last.fm account."
+msgstr "உங்கள் கடைசி.fm கணக்கிற்கு துணிச்சலான தடங்களை நீங்கள் அனுமதிக்க வேண்டும்."
 
 #: src/scrobbler2/scrobbler.cc:29
 msgid "Scrobbler 2.0"
-msgstr ""
+msgstr "ச்க்ரோப்ளர் 2.0"
 
-#: src/scrobbler2/scrobbler.cc:224
+#: src/scrobbler2/scrobbler.cc:200
 msgid ""
 "The Scrobbler plugin could not be started.\n"
 "There might be a problem with your installation."
 msgstr ""
+"ச்க்ரோப்ளர் சொருகி தொடங்க முடியவில்லை. \n"
+" உங்கள் நிறுவலில் சிக்கல் இருக்கலாம்."
 
-#: src/scrobbler2/scrobbler.cc:289
+#: src/scrobbler2/scrobbler.cc:245
 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_communication.cc:642
-msgid ""
-"Audacious is now using an improved version of the Last.fm Scrobbler.\n"
-"Please check the Preferences for the Scrobbler plugin."
+"project."
 msgstr ""
+"பிட்சிகோகி எழுதிய துணிச்சலான ச்க்ரோப்ளர் சொருகி 2.0, \n"
+"\n"
+" பதிப்புரிமை © 2012-2013 லுச் எம். \n"
+"\n"
+" இந்த திட்டத்தின் தொடக்கத்தில் எனக்கு ஒரு கை கொடுத்ததற்கு சான் லிண்ட்கிரெனுக்கு நன்றி."
 
-#: src/sdlout/sdlout.cc:48
+#: src/sdlout/sdlout.cc:43
 msgid "SDL Output"
 msgstr "SDL வெளியீடு "
 
-#: src/sdlout/sdlout.cc:77
+#: src/sdlout/sdlout.cc:72
 msgid ""
 "SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
 msgstr ""
+"துணிச்சலுக்கான எச்.டி.எல் வெளியீட்டு சொருகி \n"
+" பதிப்புரிமை 2010 சான் லிண்ட்கிரென்"
 
-#: src/search-tool/search-tool.cc:116 src/search-tool/search-tool.cc:124
+#: src/search-tool/library.cc:35 src/search-tool/library.cc:46
+#: src/search-tool-qt/library.cc:35 src/search-tool-qt/library.cc:46
 msgid "Library"
 msgstr "நூலகம்"
 
-#: src/search-tool/search-tool.cc:394
-#, c-format
-msgid "%d result"
-msgid_plural "%d results"
-msgstr0 ""
-msgstr1 ""
-
-#: src/search-tool/search-tool.cc:400
-#, c-format
-msgid "(%d hidden)"
-msgid_plural "(%d hidden)"
-msgstr0 ""
-msgstr1 ""
-
-#: src/search-tool/search-tool.cc:594
+#: src/search-tool-qt/search-model.cc:44 src/search-tool/search-tool.cc:287
 #, c-format
 msgid "%d song"
 msgid_plural "%d songs"
-msgstr0 ""
-msgstr1 ""
+msgstr0 "%d பாடல்"
+msgstr1 "%d பாடல்கள்"
 
-#: src/search-tool/search-tool.cc:601
+#: src/search-tool-qt/search-model.cc:53 src/search-tool/search-tool.cc:294
 msgid "of this genre"
-msgstr ""
+msgstr "இந்த வகையின்"
 
-#: src/search-tool/search-tool.cc:607
+#: src/search-tool-qt/search-model.h:47 src/search-tool/search-model.h:45
 msgid "on"
-msgstr ""
+msgstr "ஆன்"
 
-#: src/search-tool/search-tool.cc:607
+#: src/search-tool-qt/search-model.h:47 src/search-tool/search-model.h:45
 msgid "by"
-msgstr ""
+msgstr "மூலம்"
 
-#: src/search-tool/search-tool.cc:643
-msgid "_Create Playlist"
-msgstr "பாடல் பட்டியலொன்றை _உருவாக்குக "
+#: src/search-tool-qt/search-tool-qt.cc:165 src/search-tool/search-tool.cc:74
+msgid "Number of results to show:"
+msgstr "காட்ட வேண்டிய முடிவுகளின் எண்ணிக்கை:"
 
-#: src/search-tool/search-tool.cc:645
-msgid "_Add to Playlist"
-msgstr "பாடல் பட்டியலிற்கு _சேர்க்க "
+#: src/search-tool-qt/search-tool-qt.cc:168 src/search-tool/search-tool.cc:77
+msgid "Rescan library at startup"
+msgstr "தொடக்கத்தில் ரெச்கான் நூலகம்"
 
-#: src/search-tool/search-tool.cc:684
-msgid "Search library"
-msgstr "நூலகத்தில் தேடுக "
+#: src/search-tool-qt/search-tool-qt.cc:170
+msgid "Monitor library for changes"
+msgstr "மாற்றங்களுக்கு நூலகத்தை கண்காணிக்கவும்"
 
-#: src/search-tool/search-tool.cc:688
+#: src/search-tool-qt/search-tool-qt.cc:193 src/search-tool/search-tool.cc:450
 msgid ""
 "To import your music library into Audacious, choose a folder and then click "
 "the \"refresh\" icon."
@@ -2852,834 +3380,801 @@
 "ஔடகிவஸ் இல் இசை நூகலமொன்றை இறக்குமதி செய்ய கோப்பகமொன்றை தெரிவு செய்து புதுப்பிப்பு "
 "பொத்தானை அழுத்துக. "
 
-#: src/search-tool/search-tool.cc:696
+#: src/search-tool-qt/search-tool-qt.cc:195 src/search-tool/search-tool.cc:459
 msgid "Please wait ..."
 msgstr "தயவு செய்து பொருத்திருக்குக ..."
 
-#: src/search-tool/search-tool.cc:723
+#: src/search-tool-qt/search-tool-qt.cc:197 src/search-tool/search-tool.cc:487
 msgid "Choose Folder"
 msgstr "கோப்பகமொன்றை தேர்க "
 
+#: src/search-tool-qt/search-tool-qt.cc:201 src/search-tool/search-tool.cc:445
+msgid "Search library"
+msgstr "நூலகத்தில் தேடுக "
+
+#: src/search-tool-qt/search-tool-qt.cc:327 src/search-tool/search-tool.cc:156
+#, c-format
+msgid "%d of %d result shown"
+msgid_plural "%d of %d results shown"
+msgstr0 "%d முடிவின் %d காட்டப்பட்டுள்ளது"
+msgstr1 "%d முடிவுகளின் %d காட்டப்பட்டுள்ளது"
+
+#: src/search-tool-qt/search-tool-qt.cc:331 src/search-tool/search-tool.cc:160
+#, c-format
+msgid "%d result"
+msgid_plural "%d results"
+msgstr0 "%d முடிவு"
+msgstr1 "%d முடிவுகள்"
+
+#: src/search-tool-qt/search-tool-qt.cc:501 src/search-tool/search-tool.cc:341
+msgid "_Create Playlist"
+msgstr "பாடல் பட்டியலொன்றை _உருவாக்குக "
+
+#: src/search-tool-qt/search-tool-qt.cc:503 src/search-tool/search-tool.cc:343
+msgid "_Add to Playlist"
+msgstr "பாடல் பட்டியலிற்கு _சேர்க்க "
+
 #: src/sid/xmms-sid.cc:43
 msgid "SID Player"
-msgstr ""
-
-#: src/sid/xs_config.cc:61
-msgid "Output"
-msgstr ""
+msgstr "sid பிளேயர்"
 
 #: src/sid/xs_config.cc:62
 msgid "Channels:"
-msgstr ""
+msgstr "சேனல்கள்:"
 
 #: src/sid/xs_config.cc:68
 msgid "Emulation"
-msgstr ""
+msgstr " எமுலேசன் "
 
 #: src/sid/xs_config.cc:69
 msgid "Emulate MOS 8580 (default: MOS 6581)"
-msgstr ""
+msgstr "mos 8580 ஐப் பின்பற்றுங்கள் (இயல்புநிலை: mos 6581)"
 
 #: src/sid/xs_config.cc:71
 msgid "Do not automatically select chip model"
-msgstr ""
+msgstr "சிப் மாதிரியை தானாகவே தேர்ந்தெடுக்க வேண்டாம்"
 
 #: src/sid/xs_config.cc:73
 msgid "Emulate filter"
-msgstr ""
+msgstr "வடிகட்டியைப் பின்பற்றுங்கள்"
 
 #: src/sid/xs_config.cc:75
 msgid "Clock speed:"
-msgstr ""
+msgstr "கடிகார வேகம்:"
 
 #: src/sid/xs_config.cc:78
 msgid "Do not automatically select clock speed"
-msgstr ""
+msgstr "கடிகார வேகத்தை தானாகவே தேர்ந்தெடுக்க வேண்டாம்"
 
 #: src/sid/xs_config.cc:80
 msgid "Playback time"
-msgstr ""
+msgstr " பின்னணி நேரம் "
 
 #: src/sid/xs_config.cc:81
 msgid "Set maximum playback time:"
-msgstr ""
+msgstr "அதிகபட்ச பின்னணி நேரத்தை அமைக்கவும்:"
 
 #: src/sid/xs_config.cc:87
 msgid "Use only when song length is unknown"
-msgstr ""
+msgstr "பாடல் நீளம் தெரியாதபோது மட்டுமே பயன்படுத்தவும்"
 
 #: src/sid/xs_config.cc:90
 msgid "Set minimum playback time:"
-msgstr ""
+msgstr "குறைந்தபட்ச பின்னணி நேரத்தை அமைக்கவும்:"
 
 #: src/sid/xs_config.cc:96
 msgid "Subtunes"
-msgstr ""
+msgstr " சப்டூன்ச் "
 
 #: src/sid/xs_config.cc:97
 msgid "Enable subtunes"
-msgstr ""
+msgstr "சப்டூன்களை இயக்கவும்"
 
 #: src/sid/xs_config.cc:99
 msgid "Ignore subtunes shorter than:"
-msgstr ""
+msgstr "விட குறைவான சப்டூன்களை புறக்கணிக்கவும்:"
 
 #: src/sid/xs_config.cc:105
 msgid "Note"
-msgstr ""
+msgstr " குறிப்பு "
 
 #: src/silence-removal/silence-removal.cc:39
 msgid "Silence Removal"
-msgstr ""
+msgstr "ம silence னத்தை அகற்றுதல்"
 
 #: src/silence-removal/silence-removal.cc:58
 msgid ""
 "Silence Removal Plugin for Audacious\n"
 "Copyright 2014 John Lindgren"
 msgstr ""
+"துணிச்சலான அகற்றுதல் சொருகி \n"
+" பதிப்புரிமை 2014 சான் லிண்ட்கிரென்"
 
 #: src/silence-removal/silence-removal.cc:67
 msgid "Silence Removal"
-msgstr ""
+msgstr " ம silence னம் அகற்றுதல் "
 
 #: src/silence-removal/silence-removal.cc:68
 msgid "Threshold:"
-msgstr ""
+msgstr "வாசல்:"
 
-#: src/silence-removal/silence-removal.cc:70
-msgid "dB"
-msgstr ""
+#: src/skins/actions.cc:45 src/skins-qt/actions.cc:43
+msgid "Repeat points cleared."
+msgstr "புள்ளிகள் அழிக்க மீண்டும்."
 
-#: src/skins/menus.cc:64
-msgid "Open Files ..."
-msgstr ""
+#: src/skins/actions.cc:60 src/skins-qt/actions.cc:58
+msgid "Repeat point A set."
+msgstr "ஒரு தொகுப்பை மீண்டும் செய்யவும்."
 
-#: src/skins/menus.cc:65
-msgid "Open URL ..."
-msgstr ""
+#: src/skins/actions.cc:65 src/skins-qt/actions.cc:63
+msgid "Repeat point B set."
+msgstr "புள்ளி b கணம் ஐ மீண்டும் செய்யவும்."
 
-#: src/skins/menus.cc:66
-msgid "Search Library"
-msgstr ""
+#: src/skins/equalizer.cc:223 src/skins-qt/equalizer.cc:223
+msgid "Preamp"
+msgstr "முன் விரிவாக்கி "
 
-#: src/skins/menus.cc:68
-msgid "Playback"
-msgstr "மீள் இயக்கு"
+#: src/skins/equalizer.cc:227 src/skins-qt/equalizer.cc:227
+msgid "31 Hz"
+msgstr "31 Hz"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "63 Hz"
+msgstr "63 Hz"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "125 Hz"
+msgstr "125 Hz"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "250 Hz"
+msgstr "250 Hz"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "500 Hz"
+msgstr "500 Hz"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "1 kHz"
+msgstr "1 kHz"
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "2 kHz"
+msgstr "2 kHz"
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "4 kHz"
+msgstr "4 kHz"
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "8 kHz"
+msgstr "8 kHz"
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "16 kHz"
+msgstr "16 kHz"
+
+#: src/skins/equalizer.cc:270 src/skins-qt/equalizer.cc:270
+msgid "Audacious Equalizer"
+msgstr "ஔடகிவஸ் சமமாக்கி "
+
+#: src/skins/main.cc:459 src/skins-qt/main.cc:442
+msgid "Recording on"
+msgstr "பதிவுசெய்தல்"
+
+#: src/skins/main.cc:461 src/skins-qt/main.cc:444
+msgid "Recording off"
+msgstr "பதிவுசெய்தல்"
+
+#: src/skins/main.cc:754 src/skins-qt/main.cc:701
+#, c-format
+msgid "Seek to %d:%-2.2d / %d:%-2.2d"
+msgstr "%d:%-2.2d / %d:%-2.2d இனை நாடுக"
+
+#: src/skins/main.cc:771 src/skins-qt/main.cc:718
+#, c-format
+msgid "Volume: %d%%"
+msgstr "ஒலி அளவு: %d%%"
+
+#: src/skins/main.cc:784 src/skins-qt/main.cc:731
+#, c-format
+msgid "Balance: %d%% left"
+msgstr "சமநிலை:% d%% இடது"
+
+#: src/skins/main.cc:786 src/skins-qt/main.cc:733
+msgid "Balance: center"
+msgstr "சமநிலை:மத்தி "
+
+#: src/skins/main.cc:788 src/skins-qt/main.cc:735
+#, c-format
+msgid "Balance: %d%% right"
+msgstr "சமநிலை:% d%% வலது "
+
+#: src/skins/main.cc:880 src/skins-qt/main.cc:827
+msgid "Options Menu"
+msgstr "தேர்வு பட்டியல்"
+
+#: src/skins/main.cc:884 src/skins-qt/main.cc:831
+msgid "Disable 'Always On Top'"
+msgstr "'எப்போதும் மேலே' என்பதை முடக்குக "
+
+#: src/skins/main.cc:886 src/skins-qt/main.cc:833
+msgid "Enable 'Always On Top'"
+msgstr "'எப்போதும் மேலே' என்பதை செயற்படுத்துக "
+
+#: src/skins/main.cc:889 src/skins-qt/main.cc:836
+msgid "File Info Box"
+msgstr "கோப்பு தகவல் பெட்டி"
+
+#: src/skins/main.cc:892 src/skins/menus.cc:149 src/skins-qt/main.cc:839
+#: src/skins-qt/menus.cc:142
+msgid "Double Size"
+msgstr "இரட்டை அளவு"
+
+#: src/skins/main.cc:895 src/skins-qt/main.cc:842
+msgid "Visualizations"
+msgstr "காட்சிப்படுத்தல்"
+
+#: src/skins/menus.cc:74 src/skins-qt/menus.cc:64
+msgid "Volume Up"
+msgstr "ஒலியை பெருக்கு"
+
+#: src/skins/menus.cc:75 src/skins-qt/menus.cc:65
+msgid "Volume Down"
+msgstr "ஒலியை குறை"
+
+#: src/skins/menus.cc:77 src/skins-qt/menus.cc:67
+msgid "Effects ..."
+msgstr "விளைவுகள் ..."
 
-#: src/skins/menus.cc:69
+#: src/skins/menus.cc:84 src/skins-qt/menus.cc:74
+msgid "Open Files ..."
+msgstr "கோப்புகளைத் திறக்கவும் ..."
+
+#: src/skins/menus.cc:85 src/skins-qt/menus.cc:76
+msgid "Open URL ..."
+msgstr "திறந்த முகவரி ..."
+
+#: src/skins/menus.cc:89 src/skins-qt/menus.cc:80
 msgid "Playlist"
 msgstr "பாடல் பட்டியல்"
 
-#: src/skins/menus.cc:70
+#: src/skins/menus.cc:90 src/skins-qt/menus.cc:81
+msgid "Output"
+msgstr "வெளியீடு"
+
+#: src/skins/menus.cc:91 src/skins-qt/menus.cc:82
 msgid "View"
 msgstr "பார்வையிடுக "
 
-#: src/skins/menus.cc:72 src/skins/menus.cc:136 src/skins/menus.cc:149
-#: src/skins/menus.cc:214
+#: src/skins/menus.cc:93 src/skins/menus.cc:161 src/skins/menus.cc:174
+#: src/skins/menus.cc:245 src/skins-qt/menus.cc:84 src/skins-qt/menus.cc:156
+#: src/skins-qt/menus.cc:170 src/skins-qt/menus.cc:241
 msgid "Services"
-msgstr ""
+msgstr "சேவைகள் "
 
-#: src/skins/menus.cc:74
+#: src/skins/menus.cc:95 src/skins-qt/menus.cc:86
 msgid "About ..."
-msgstr ""
+msgstr "பற்றி ..."
 
-#: src/skins/menus.cc:75
+#: src/skins/menus.cc:96 src/skins-qt/menus.cc:87
 msgid "Settings ..."
-msgstr ""
+msgstr "அமைப்புகள் ..."
 
-#: src/skins/menus.cc:76
+#: src/skins/menus.cc:97 src/skins-qt/menus.cc:88
 msgid "Quit"
-msgstr ""
+msgstr "வெளியேறு"
 
-#: src/skins/menus.cc:80 src/skins/menus.cc:206
+#: src/skins/menus.cc:101 src/skins/menus.cc:235 src/skins-qt/menus.cc:92
+#: src/skins-qt/menus.cc:231
 msgid "Song Info ..."
-msgstr ""
+msgstr "பாடல் செய்தி ..."
+
+#: src/skins/menus.cc:105 src/skins-qt/menus.cc:96
+msgid "Shuffle by Album"
+msgstr "ஆல்பத்தால் கலக்கு"
 
-#: src/skins/menus.cc:84
+#: src/skins/menus.cc:106 src/skins-qt/menus.cc:97
 msgid "No Playlist Advance"
 msgstr "முன்னோக்கிய பாடல் பட்டியலுக்கு செல்ல வேண்டாம்"
 
-#: src/skins/menus.cc:85
-msgid "Stop After This Song"
-msgstr ""
-
-#: src/skins/menus.cc:93
+#: src/skins/menus.cc:117 src/skins-qt/menus.cc:108
 msgid "Set A-B Repeat"
-msgstr ""
+msgstr "a-b மீண்டும் அமைக்கவும்"
 
-#: src/skins/menus.cc:94
+#: src/skins/menus.cc:118 src/skins-qt/menus.cc:109
 msgid "Clear A-B Repeat"
-msgstr ""
+msgstr "a-b ஐ மீண்டும் அழிக்கவும்"
 
-#: src/skins/menus.cc:96
+#: src/skins/menus.cc:120 src/skins-qt/menus.cc:111
 msgid "Jump to Song ..."
-msgstr ""
+msgstr "பாடலுக்கு செல்லவும் ..."
 
-#: src/skins/menus.cc:97
+#: src/skins/menus.cc:121 src/skins-qt/menus.cc:113
 msgid "Jump to Time ..."
-msgstr ""
+msgstr "சரியான நேரத்தில் செல்லவும் ..."
 
-#: src/skins/menus.cc:101
+#: src/skins/menus.cc:125 src/skins-qt/menus.cc:118
 msgid "Play/Resume"
-msgstr ""
+msgstr "விளையாடு/மீண்டும் தொடங்கவும்"
 
-#: src/skins/menus.cc:103
+#: src/skins/menus.cc:127 src/skins-qt/menus.cc:120
 msgid "New Playlist"
 msgstr "புதிய பாடல் பட்டியல்"
 
-#: src/skins/menus.cc:104
+#: src/skins/menus.cc:128 src/skins-qt/menus.cc:121
 msgid "Rename Playlist ..."
-msgstr ""
+msgstr "பிளேலிச்ட்டை மறுபெயரிடுங்கள் ..."
 
-#: src/skins/menus.cc:105
+#: src/skins/menus.cc:129 src/skins-qt/menus.cc:122
 msgid "Remove Playlist"
-msgstr ""
+msgstr "பாடல் பட்டியலை நீக்கு "
 
-#: src/skins/menus.cc:107
+#: src/skins/menus.cc:131 src/skins-qt/menus.cc:124
 msgid "Previous Playlist"
-msgstr ""
+msgstr "முந்தைய பிளேலிச்ட்"
 
-#: src/skins/menus.cc:108
+#: src/skins/menus.cc:132 src/skins-qt/menus.cc:125
 msgid "Next Playlist"
-msgstr ""
+msgstr "அடுத்த பிளேலிச்ட்"
 
-#: src/skins/menus.cc:110
+#: src/skins/menus.cc:134 src/skins-qt/menus.cc:127
 msgid "Import Playlist ..."
-msgstr ""
+msgstr "பிளேலிச்ட்டை இறக்குமதி செய்யுங்கள் ..."
 
-#: src/skins/menus.cc:111
+#: src/skins/menus.cc:135 src/skins-qt/menus.cc:128
 msgid "Export Playlist ..."
-msgstr ""
+msgstr "ஏற்றுமதி பிளேலிச்ட் ..."
 
-#: src/skins/menus.cc:113
+#: src/skins/menus.cc:137 src/skins-qt/menus.cc:130
 msgid "Playlist Manager ..."
-msgstr ""
+msgstr "பிளேலிச்ட் மேலாளர் ..."
 
-#: src/skins/menus.cc:114
+#: src/skins/menus.cc:138 src/skins-qt/menus.cc:131
 msgid "Queue Manager ..."
-msgstr ""
+msgstr "வரிசை மேலாளர் ..."
 
-#: src/skins/menus.cc:116
+#: src/skins/menus.cc:140 src/skins-qt/menus.cc:133
 msgid "Refresh Playlist"
-msgstr ""
+msgstr "பிளேலிச்ட்டைப் புதுப்பிக்கவும்"
 
-#: src/skins/menus.cc:120
+#: src/skins/menus.cc:144 src/skins-qt/menus.cc:137
 msgid "Show Playlist Editor"
 msgstr "பாடல் பட்டியல் திருத்தியை காண்பிக்க "
 
-#: src/skins/menus.cc:121
+#: src/skins/menus.cc:145 src/skins-qt/menus.cc:138
 msgid "Show Equalizer"
 msgstr "சமமாக்கியை காண்பிக்க "
 
-#: src/skins/menus.cc:123
+#: src/skins/menus.cc:147 src/skins-qt/menus.cc:140
 msgid "Show Remaining Time"
-msgstr ""
+msgstr "மீதமுள்ள நேரத்தைக் காட்டு"
 
-#: src/skins/menus.cc:125
+#: src/skins/menus.cc:150 src/skins-qt/menus.cc:143
 msgid "Always on Top"
 msgstr "எப்பொழுதும் மேலே "
 
-#: src/skins/menus.cc:126
+#: src/skins/menus.cc:151 src/skins-qt/menus.cc:145
 msgid "On All Workspaces"
-msgstr ""
+msgstr "அனைத்து பணியிடங்களிலும்"
 
-#: src/skins/menus.cc:128
+#: src/skins/menus.cc:153 src/skins-qt/menus.cc:148
 msgid "Roll Up Player"
-msgstr ""
+msgstr "பிளேயரை உருட்டவும்"
 
-#: src/skins/menus.cc:129
+#: src/skins/menus.cc:154 src/skins-qt/menus.cc:149
 msgid "Roll Up Playlist Editor"
-msgstr ""
+msgstr "பிளேலிச்ட் எடிட்டரை உருட்டவும்"
 
-#: src/skins/menus.cc:130
+#: src/skins/menus.cc:155 src/skins-qt/menus.cc:150
 msgid "Roll Up Equalizer"
-msgstr ""
-
-#: src/skins/menus.cc:132 src/skins/ui_main.cc:854
-msgid "Double Size"
-msgstr ""
+msgstr "சமநிலைப்படுத்தியை உருட்டவும்"
 
-#: src/skins/menus.cc:138
+#: src/skins/menus.cc:163 src/skins-qt/menus.cc:158
 msgid "Add URL ..."
-msgstr ""
+msgstr "முகவரி ஐச் சேர்க்கவும் ..."
 
-#: src/skins/menus.cc:139
+#: src/skins/menus.cc:164 src/skins-qt/menus.cc:160
 msgid "Add Files ..."
-msgstr ""
+msgstr "கோப்புகளைச் சேர்க்கவும் ..."
 
-#: src/skins/menus.cc:143 src/skins/menus.cc:171 src/skins/menus.cc:185
+#: src/skins/menus.cc:168 src/skins/menus.cc:196 src/skins/menus.cc:212
+#: src/skins-qt/menus.cc:164 src/skins-qt/menus.cc:192
+#: src/skins-qt/menus.cc:208
 msgid "By Title"
 msgstr "தலைப்பின் படி "
 
-#: src/skins/menus.cc:144 src/skins/menus.cc:178 src/skins/menus.cc:192
+#: src/skins/menus.cc:169 src/skins/menus.cc:203 src/skins/menus.cc:219
+#: src/skins-qt/menus.cc:165 src/skins-qt/menus.cc:199
+#: src/skins-qt/menus.cc:215
 msgid "By File Name"
-msgstr ""
+msgstr "கோப்பு பெயர் மூலம்"
 
-#: src/skins/menus.cc:145 src/skins/menus.cc:179 src/skins/menus.cc:193
+#: src/skins/menus.cc:170 src/skins/menus.cc:204 src/skins/menus.cc:220
+#: src/skins-qt/menus.cc:166 src/skins-qt/menus.cc:200
+#: src/skins-qt/menus.cc:216
 msgid "By File Path"
-msgstr ""
+msgstr "கோப்பு பாதை மூலம்"
 
-#: src/skins/menus.cc:151
+#: src/skins/menus.cc:176 src/skins-qt/menus.cc:172
 msgid "Remove All"
 msgstr "அனைத்தையும் அகற்றுக. "
 
-#: src/skins/menus.cc:152
+#: src/skins/menus.cc:177 src/skins-qt/menus.cc:173
 msgid "Clear Queue"
 msgstr "வரிசையினை அழிக்குக. "
 
-#: src/skins/menus.cc:154
+#: src/skins/menus.cc:179 src/skins-qt/menus.cc:175
 msgid "Remove Unavailable Files"
 msgstr "கிடைக்கப்பெறாத கோப்புகளை அகற்றுக. "
 
-#: src/skins/menus.cc:155
+#: src/skins/menus.cc:180 src/skins-qt/menus.cc:176
 msgid "Remove Duplicates"
 msgstr "போலிகளை அகற்றுக "
 
-#: src/skins/menus.cc:157
+#: src/skins/menus.cc:182 src/skins-qt/menus.cc:178
 msgid "Remove Unselected"
 msgstr "தெரிவுசெய்யாதவற்றை அகற்றுக. "
 
-#: src/skins/menus.cc:158
+#: src/skins/menus.cc:183 src/skins-qt/menus.cc:179
 msgid "Remove Selected"
 msgstr "தெரிவுசெய்தவற்றை அகற்றுக"
 
-#: src/skins/menus.cc:162
+#: src/skins/menus.cc:187 src/skins-qt/menus.cc:183
 msgid "Search and Select"
 msgstr "தேடி தேர்ந்தெடுக்கவும்"
 
-#: src/skins/menus.cc:164
+#: src/skins/menus.cc:189 src/skins-qt/menus.cc:185
 msgid "Invert Selection"
 msgstr "தலைகீழ் தேர்ந்தெடுப்பு"
 
-#: src/skins/menus.cc:165
+#: src/skins/menus.cc:190 src/skins-qt/menus.cc:186
 msgid "Select None"
 msgstr "எதனையும் தேர்ந்தெடுக்க வேண்டாம்."
 
-#: src/skins/menus.cc:166
+#: src/skins/menus.cc:191 src/skins-qt/menus.cc:187
 msgid "Select All"
 msgstr "அனைத்தையும் தேர்ந்தெடுக்குக "
 
-#: src/skins/menus.cc:170 src/skins/menus.cc:184
+#: src/skins/menus.cc:195 src/skins/menus.cc:211 src/skins-qt/menus.cc:191
+#: src/skins-qt/menus.cc:207
 msgid "By Track Number"
 msgstr "பாடல் இலக்க அடிப்படையில் "
 
-#: src/skins/menus.cc:172 src/skins/menus.cc:186
+#: src/skins/menus.cc:197 src/skins/menus.cc:213 src/skins-qt/menus.cc:193
+#: src/skins-qt/menus.cc:209
 msgid "By Artist"
 msgstr "பாடகர்களின் படி "
 
-#: src/skins/menus.cc:173 src/skins/menus.cc:187
+#: src/skins/menus.cc:198 src/skins/menus.cc:214 src/skins-qt/menus.cc:194
+#: src/skins-qt/menus.cc:210
 msgid "By Album"
 msgstr "குறுவட்டின் படி "
 
-#: src/skins/menus.cc:174 src/skins/menus.cc:188
+#: src/skins/menus.cc:199 src/skins/menus.cc:215 src/skins-qt/menus.cc:195
+#: src/skins-qt/menus.cc:211
 msgid "By Album Artist"
-msgstr ""
+msgstr "ஆல்பம் கலைஞரால்"
 
-#: src/skins/menus.cc:175 src/skins/menus.cc:190
+#: src/skins/menus.cc:200 src/skins/menus.cc:216 src/skins-qt/menus.cc:196
+#: src/skins-qt/menus.cc:212
 msgid "By Release Date"
-msgstr ""
+msgstr "வெளியீட்டு தேதி மூலம்"
 
-#: src/skins/menus.cc:176 src/skins/menus.cc:189
+#: src/skins/menus.cc:201 src/skins/menus.cc:217 src/skins-qt/menus.cc:197
+#: src/skins-qt/menus.cc:213
 msgid "By Genre"
-msgstr ""
+msgstr "வகையால்"
 
-#: src/skins/menus.cc:177 src/skins/menus.cc:191
+#: src/skins/menus.cc:202 src/skins/menus.cc:218 src/skins-qt/menus.cc:198
+#: src/skins-qt/menus.cc:214
 msgid "By Length"
-msgstr ""
+msgstr "நீளத்தால்"
 
-#: src/skins/menus.cc:180 src/skins/menus.cc:194
+#: src/skins/menus.cc:205 src/skins/menus.cc:221 src/skins-qt/menus.cc:201
+#: src/skins-qt/menus.cc:217
 msgid "By Custom Title"
-msgstr ""
+msgstr "தனிப்பயன் தலைப்பு மூலம்"
+
+#: src/skins/menus.cc:206 src/skins/menus.cc:222 src/skins-qt/menus.cc:202
+#: src/skins-qt/menus.cc:218
+msgid "By Comment"
+msgstr "கருத்து மூலம்"
+
+#: src/skins/menus.cc:207 src/skins/menus.cc:223 src/skins-qt/menus.cc:203
+#: src/skins-qt/menus.cc:219
+msgid "By Disc Number"
+msgstr "வட்டு எண் மூலம்"
 
-#: src/skins/menus.cc:198
+#: src/skins/menus.cc:227 src/skins-qt/menus.cc:223
 msgid "Randomize List"
 msgstr "பட்டியலினை தற்போக்காக தோன்றச்செய்க "
 
-#: src/skins/menus.cc:199
+#: src/skins/menus.cc:228 src/skins-qt/menus.cc:224
 msgid "Reverse List"
 msgstr "பட்டியலினை தலைகீழாக்குக"
 
-#: src/skins/menus.cc:201
+#: src/skins/menus.cc:230 src/skins-qt/menus.cc:226
 msgid "Sort Selected"
 msgstr "வரிசையானவற்றை தெரிக."
 
-#: src/skins/menus.cc:202
+#: src/skins/menus.cc:231 src/skins-qt/menus.cc:227
 msgid "Sort List"
 msgstr "பட்டியலை வரிசையாக்குக "
 
-#: src/skins/menus.cc:208
+#: src/skins/menus.cc:236 src/skins-qt/menus.cc:232
+msgid "Open Containing Folder"
+msgstr "கோப்புறை கொண்ட திறந்த"
+
+#: src/skins/menus.cc:238 src/skins-qt/menus.cc:234
 msgid "Cut"
 msgstr "வெட்டுக "
 
-#: src/skins/menus.cc:209
+#: src/skins/menus.cc:239 src/skins-qt/menus.cc:235
 msgid "Copy"
 msgstr "நகleடுக்குக"
 
-#: src/skins/menus.cc:210
+#: src/skins/menus.cc:240 src/skins-qt/menus.cc:236
 msgid "Paste"
 msgstr "ஒட்டுக "
 
-#: src/skins/menus.cc:212
-msgid "Queue/Unqueue"
-msgstr ""
-
-#: src/skins/menus.cc:218
-msgid "Load Preset ..."
-msgstr ""
-
-#: src/skins/menus.cc:219
-msgid "Load Auto Preset ..."
-msgstr ""
-
-#: src/skins/menus.cc:220
-msgid "Load Default"
-msgstr ""
-
-#: src/skins/menus.cc:221
-msgid "Load Preset File ..."
-msgstr ""
-
-#: src/skins/menus.cc:222
-msgid "Load EQF File ..."
-msgstr ""
-
-#: src/skins/menus.cc:224
-msgid "Save Preset ..."
-msgstr ""
-
-#: src/skins/menus.cc:225
-msgid "Save Auto Preset ..."
-msgstr ""
-
-#: src/skins/menus.cc:226
-msgid "Save Default"
-msgstr ""
-
-#: src/skins/menus.cc:227
-msgid "Save Preset File ..."
-msgstr ""
-
-#: src/skins/menus.cc:228
-msgid "Save EQF File ..."
-msgstr ""
-
-#: src/skins/menus.cc:230
-msgid "Delete Preset ..."
-msgstr ""
+#: src/skins/menus.cc:241 src/skins-qt/menus.cc:237
+msgid "Paste at End"
+msgstr "இறுதியில் ஒட்டவும்"
 
-#: src/skins/menus.cc:231
-msgid "Delete Auto Preset ..."
-msgstr ""
+#: src/skins/menus.cc:243 src/skins-qt/menus.cc:239
+msgid "Queue/Unqueue"
+msgstr "வரிசை/அவிழ்த்து"
 
-#: src/skins/menus.cc:233
-msgid "Import Winamp Presets ..."
-msgstr ""
+#: src/skins/playlist-widget.cc:58 src/skins-qt/playlist-widget.cc:58
+#, c-format
+msgid "%s (%d of %d)"
+msgstr "%s (%d இன் %d)"
 
-#: src/skins/menus.cc:235
-msgid "Reset to Zero"
-msgstr ""
+#: src/skins/playlistwin.cc:491 src/skins-qt/playlistwin.cc:478
+msgid "Audacious Playlist Editor"
+msgstr "ஔடகிவஸ் பாடல் பட்டியல் திருத்தி"
 
-#: src/skins/plugin.cc:48
+#: src/skins/plugin.cc:53 src/skins-qt/plugin.cc:65
 msgid "Winamp Classic Interface"
 msgstr "Winamp பாரம்பரிய இடைமுகம்"
 
-#: src/skins/preset-browser.cc:57 src/skins/preset-list.cc:371
-#: src/skins/preset-list.cc:386
-msgid "Save"
-msgstr "சேமிக்குக "
+#: src/skins-qt/menus.cc:75
+msgid "Open Folder ..."
+msgstr "திறந்த கோப்புறை ..."
+
+#: src/skins-qt/menus.cc:159
+msgid "Add Folder ..."
+msgstr "கோப்புறையைச் சேர்க்கவும் ..."
 
-#: src/skins/preset-browser.cc:57 src/skins/preset-list.cc:338
-#: src/skins/preset-list.cc:354
-msgid "Load"
-msgstr "ஏற்றுக "
-
-#: src/skins/preset-browser.cc:83
-msgid "Load Preset File"
-msgstr ""
-
-#: src/skins/preset-browser.cc:100
-msgid "Load EQF File"
-msgstr ""
-
-#: src/skins/preset-browser.cc:119
-msgid "Save Preset File"
-msgstr ""
+#: src/skins-qt/search-select.cc:62 src/skins/search-select.cc:77
+msgid "Search entries in active playlist"
+msgstr "செய்வினை பாடல் பட்டியலிலுள்ள பதிவுகளை தேடுக "
 
-#: src/skins/preset-browser.cc:137
-msgid "Save EQF File"
+#: src/skins-qt/search-select.cc:70 src/skins/search-select.cc:83
+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/preset-browser.cc:151
-msgid "Import Winamp Presets"
-msgstr ""
+#: src/skins-qt/search-select.cc:75 src/skins/search-select.cc:91
+msgid "Title:"
+msgstr "தலைப்பு:"
 
-#: src/skins/preset-list.cc:285
-msgid "Presets"
-msgstr "முன்னமைப்புகள்"
+#: src/skins-qt/search-select.cc:79 src/skins/search-select.cc:96
+msgid "Album:"
+msgstr "ஆல்பம்:"
 
-#: src/skins/preset-list.cc:335
-msgid "Load preset"
-msgstr "முன்னமைப்புகளினை ஏற்றுக "
+#: src/skins-qt/search-select.cc:82 src/skins/search-select.cc:101
+msgid "Artist:"
+msgstr "கலைஞர்:"
 
-#: src/skins/preset-list.cc:351
-msgid "Load auto-preset"
-msgstr "தானியங்கு முன்னமைப்புகளை ஏற்றுக "
+#: src/skins-qt/search-select.cc:85 src/skins/search-select.cc:106
+msgid "File Name:"
+msgstr "கோப்பு பெயர்:"
 
-#: src/skins/preset-list.cc:367
-msgid "Save preset"
-msgstr "முன்னமைப்புகளை சேமிக்க"
+#: src/skins-qt/search-select.cc:88 src/skins/search-select.cc:134
+msgid "Clear previous selection before searching"
+msgstr "தேட முன் முன்னைய தெரிவுகளை துடைத்தழிக்குக "
 
-#: src/skins/preset-list.cc:382
-msgid "Save auto-preset"
-msgstr "தானியங்கு முன்னமைப்புகளை சேமிக்குக"
+#: src/skins-qt/search-select.cc:89 src/skins/search-select.cc:137
+msgid "Automatically toggle queue for matching entries"
+msgstr "தேர்வடையும் பதிவுகளை தானாக நிலைமாற்று வரிசையாக்குக"
 
-#: src/skins/preset-list.cc:408
-msgid "Delete preset"
-msgstr "முன்னமைப்பினை அழிக்குக "
+#: src/skins-qt/search-select.cc:90 src/skins/search-select.cc:140
+msgid "Create a new playlist with matching entries"
+msgstr "தேர்வடையும் பதிவுகளுக்கு புதிய பாடல் பட்டியலொன்றை உருவாக்குக."
 
-#: src/skins/preset-list.cc:424
-msgid "Delete auto-preset"
-msgstr "தானியங்கு முன்னமைப்புகளை அழிக்குக"
+#: src/skins-qt/search-select.cc:101 src/skins/search-select.cc:78
+msgid "Search"
+msgstr "தேடல்"
 
-#: src/skins/skins_cfg.cc:176
+#: src/skins-qt/skins_cfg.cc:198 src/skins/skins_cfg.cc:182
 msgid "Player:"
-msgstr ""
+msgstr "ஆட்டக்காரர்:"
 
-#: src/skins/skins_cfg.cc:178
+#: src/skins-qt/skins_cfg.cc:200 src/skins/skins_cfg.cc:184
 msgid "Select main player window font:"
 msgstr "பிரதான இயக்கி சாளரத்தின் எழுத்துருவை தெரிவு செய்க :"
 
-#: src/skins/skins_cfg.cc:179
+#: src/skins-qt/skins_cfg.cc:201 src/skins/skins_cfg.cc:185
 msgid "Playlist:"
-msgstr ""
+msgstr "பிளேலிச்ட்:"
 
-#: src/skins/skins_cfg.cc:181
+#: src/skins-qt/skins_cfg.cc:203 src/skins/skins_cfg.cc:187
 msgid "Select playlist font:"
 msgstr "பாடல் பட்டியலின் எழுத்துருவை தெரிவு செய்க :"
 
-#: src/skins/skins_cfg.cc:187
+#: src/skins-qt/skins_cfg.cc:207 src/skins/skins_cfg.cc:191
 msgid "Skin"
-msgstr ""
+msgstr " தோல் "
+
+#: src/skins-qt/skins_cfg.cc:211 src/skins/skins_cfg.cc:193
+msgid "Display active titlebar when any window is focused"
+msgstr "எந்த சாளரமும் கவனம் செலுத்தும்போது செயலில் உள்ள தலைப்பைக் காண்பி"
 
-#: src/skins/skins_cfg.cc:189
+#: src/skins-qt/skins_cfg.cc:213 src/skins/skins_cfg.cc:195
 msgid "Fonts"
-msgstr ""
+msgstr " எழுத்துருக்கள் "
 
-#: src/skins/skins_cfg.cc:192
+#: src/skins-qt/skins_cfg.cc:215 src/skins/skins_cfg.cc:197
 msgid "Use bitmap fonts (supports ASCII only)"
 msgstr "பிட்மாப் பட எழுத்துருக்களை உபயோகிக்க (ASCII இணை மட்டும் ஆதரிக்கிறது)"
 
-#: src/skins/skins_cfg.cc:194
+#: src/skins-qt/skins_cfg.cc:217 src/skins/skins_cfg.cc:199
 msgid "Scroll song title"
-msgstr ""
+msgstr "உருள் பாடல் தலைப்பு"
 
-#: src/skins/skins_cfg.cc:196
+#: src/skins-qt/skins_cfg.cc:219 src/skins/skins_cfg.cc:201
 msgid "Scroll song title in both directions"
 msgstr "இரு திசைகளிலும் பாடல் தலைப்பை ururavaikkuga "
 
-#: src/skins/skins_cfg.cc:201
+#: src/skins-qt/skins_cfg.cc:224 src/skins/skins_cfg.cc:206
 msgid "Analyzer"
 msgstr "பகுப்பாய்வி "
 
-#: src/skins/skins_cfg.cc:202
+#: src/skins-qt/skins_cfg.cc:225 src/skins/skins_cfg.cc:207
 msgid "Scope"
 msgstr "குறியிலக்கம்"
 
-#: src/skins/skins_cfg.cc:203
+#: src/skins-qt/skins_cfg.cc:226 src/skins/skins_cfg.cc:208
 msgid "Voiceprint / VU meter"
-msgstr ""
+msgstr "குரல் பிரிண்ட் / வு மீட்டர்"
 
-#: src/skins/skins_cfg.cc:204
+#: src/skins-qt/skins_cfg.cc:227 src/skins/skins_cfg.cc:209
 msgid "Off"
 msgstr "அணைக்குக "
 
-#: src/skins/skins_cfg.cc:208 src/skins/skins_cfg.cc:233
-#: src/skins/skins_cfg.cc:239
+#: src/skins-qt/skins_cfg.cc:231 src/skins-qt/skins_cfg.cc:256
+#: src/skins-qt/skins_cfg.cc:262 src/skins/skins_cfg.cc:213
+#: src/skins/skins_cfg.cc:238 src/skins/skins_cfg.cc:244
 msgid "Normal"
 msgstr "இயல்பான"
 
-#: src/skins/skins_cfg.cc:209 src/skins/skins_cfg.cc:234
+#: src/skins-qt/skins_cfg.cc:232 src/skins-qt/skins_cfg.cc:257
+#: src/skins/skins_cfg.cc:214 src/skins/skins_cfg.cc:239
 msgid "Fire"
 msgstr "நெருப்பு "
 
-#: src/skins/skins_cfg.cc:210
+#: src/skins-qt/skins_cfg.cc:233 src/skins/skins_cfg.cc:215
 msgid "Vertical lines"
-msgstr ""
+msgstr "செங்குத்து கோடுகள்"
 
-#: src/skins/skins_cfg.cc:214
+#: src/skins-qt/skins_cfg.cc:237 src/skins/skins_cfg.cc:219
 msgid "Lines"
 msgstr "கோடுகள் "
 
-#: src/skins/skins_cfg.cc:215
+#: src/skins-qt/skins_cfg.cc:238 src/skins/skins_cfg.cc:220
 msgid "Bars"
 msgstr "பட்டைகள்"
 
-#: src/skins/skins_cfg.cc:219
+#: src/skins-qt/skins_cfg.cc:242 src/skins/skins_cfg.cc:224
 msgid "Slowest"
 msgstr "மெதுவான "
 
-#: src/skins/skins_cfg.cc:220
+#: src/skins-qt/skins_cfg.cc:243 src/skins/skins_cfg.cc:225
 msgid "Slow"
 msgstr "மெதுவாய் "
 
-#: src/skins/skins_cfg.cc:221 src/sox-resampler/sox-resampler.cc:152
+#: src/skins-qt/skins_cfg.cc:244 src/skins/skins_cfg.cc:226
+#: src/soxr/sox-resampler.cc:180
 msgid "Medium"
 msgstr "நடுத்தரம் "
 
-#: src/skins/skins_cfg.cc:222
+#: src/skins-qt/skins_cfg.cc:245 src/skins/skins_cfg.cc:227
 msgid "Fast"
 msgstr "விரைவு "
 
-#: src/skins/skins_cfg.cc:223
+#: src/skins-qt/skins_cfg.cc:246 src/skins/skins_cfg.cc:228
 msgid "Fastest"
 msgstr "மிக விரைவாக "
 
-#: src/skins/skins_cfg.cc:227
+#: src/skins-qt/skins_cfg.cc:250 src/skins/skins_cfg.cc:232
 msgid "Dots"
-msgstr ""
+msgstr "புள்ளிகள்"
 
-#: src/skins/skins_cfg.cc:228
+#: src/skins-qt/skins_cfg.cc:251 src/skins/skins_cfg.cc:233
 msgid "Line"
-msgstr ""
+msgstr "வரி"
 
-#: src/skins/skins_cfg.cc:229
+#: src/skins-qt/skins_cfg.cc:252 src/skins/skins_cfg.cc:234
 msgid "Solid"
-msgstr ""
+msgstr "திட"
 
-#: src/skins/skins_cfg.cc:235
+#: src/skins-qt/skins_cfg.cc:258 src/skins/skins_cfg.cc:240
 msgid "Ice"
 msgstr "பனி "
 
-#: src/skins/skins_cfg.cc:240
+#: src/skins-qt/skins_cfg.cc:263 src/skins/skins_cfg.cc:245
 msgid "Smooth"
 msgstr "மிருதுவான "
 
-#: src/skins/skins_cfg.cc:244
-msgid "Type"
-msgstr ""
-
-#: src/skins/skins_cfg.cc:245
-msgid "Visualization type:"
-msgstr ""
-
-#: src/skins/skins_cfg.cc:248
-msgid "Analyzer"
-msgstr ""
-
-#: src/skins/skins_cfg.cc:249
-msgid "Show peaks"
-msgstr ""
-
-#: src/skins/skins_cfg.cc:251
+#: src/skins-qt/skins_cfg.cc:267 src/skins/skins_cfg.cc:249
 msgid "Coloring:"
-msgstr ""
+msgstr "வண்ணமயமாக்கல்:"
 
-#: src/skins/skins_cfg.cc:254
+#: src/skins-qt/skins_cfg.cc:270 src/skins/skins_cfg.cc:252
 msgid "Style:"
-msgstr ""
+msgstr "ச்டைல்:"
 
-#: src/skins/skins_cfg.cc:257
+#: src/skins-qt/skins_cfg.cc:273 src/skins/skins_cfg.cc:255
 msgid "Falloff:"
-msgstr ""
+msgstr "வீழ்ச்சி:"
 
-#: src/skins/skins_cfg.cc:260
+#: src/skins-qt/skins_cfg.cc:276 src/skins/skins_cfg.cc:258
 msgid "Peak falloff:"
-msgstr ""
+msgstr "உச்ச வீழ்ச்சி:"
 
-#: src/skins/skins_cfg.cc:264
+#: src/skins-qt/skins_cfg.cc:282 src/skins/skins_cfg.cc:264
 msgid "Scope Style:"
-msgstr ""
+msgstr "நோக்கம் நடை:"
 
-#: src/skins/skins_cfg.cc:267
+#: src/skins-qt/skins_cfg.cc:285 src/skins/skins_cfg.cc:267
 msgid "Voiceprint Coloring:"
-msgstr ""
+msgstr "குரல் பிரிண்ட் வண்ணம்:"
 
-#: src/skins/skins_cfg.cc:270
+#: src/skins-qt/skins_cfg.cc:288 src/skins/skins_cfg.cc:270
 msgid "VU Meter Style:"
-msgstr ""
-
-#: src/skins/skins_cfg.cc:276
-msgid "General"
-msgstr "பொதுவான"
-
-#: src/skins/skins_cfg.cc:277
-msgid "Visualization"
-msgstr "உருவக காட்சிப்படுத்தல் "
-
-#: src/skins/ui_equalizer.cc:282
-msgid "Preamp"
-msgstr "முன் விரிவாக்கி "
-
-#: src/skins/ui_equalizer.cc:286
-msgid "31 Hz"
-msgstr "31 Hz"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "63 Hz"
-msgstr "63 Hz"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "125 Hz"
-msgstr "125 Hz"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "250 Hz"
-msgstr "250 Hz"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "500 Hz"
-msgstr "500 Hz"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "1 kHz"
-msgstr "1 kHz"
-
-#: src/skins/ui_equalizer.cc:288
-msgid "2 kHz"
-msgstr "2 kHz"
-
-#: src/skins/ui_equalizer.cc:288
-msgid "4 kHz"
-msgstr ""
-
-#: src/skins/ui_equalizer.cc:288
-msgid "8 kHz"
-msgstr "8 kHz"
-
-#: src/skins/ui_equalizer.cc:288
-msgid "16 kHz"
-msgstr "16 kHz"
-
-#: src/skins/ui_equalizer.cc:330
-msgid "Audacious Equalizer"
-msgstr "ஔடகிவஸ் சமமாக்கி "
-
-#: src/skins/ui_main.cc:688
-#, c-format
-msgid "Seek to %d:%-2.2d / %d:%-2.2d"
-msgstr "%d:%-2.2d / %d:%-2.2d இனை நாடுக"
-
-#: src/skins/ui_main.cc:709
-#, c-format
-msgid "Volume: %d%%"
-msgstr "ஒலி அளவு: %d%%"
-
-#: src/skins/ui_main.cc:732
-#, c-format
-msgid "Balance: %d%% left"
-msgstr "சமநிலை:% d%% இடது"
-
-#: src/skins/ui_main.cc:734
-msgid "Balance: center"
-msgstr "சமநிலை:மத்தி "
-
-#: src/skins/ui_main.cc:736
-#, c-format
-msgid "Balance: %d%% right"
-msgstr "சமநிலை:% d%% வலது "
-
-#: src/skins/ui_main.cc:842
-msgid "Options Menu"
-msgstr "தேர்வு பட்டியல்"
-
-#: src/skins/ui_main.cc:846
-msgid "Disable 'Always On Top'"
-msgstr "'எப்போதும் மேலே' என்பதை முடக்குக "
-
-#: src/skins/ui_main.cc:848
-msgid "Enable 'Always On Top'"
-msgstr "'எப்போதும் மேலே' என்பதை செயற்படுத்துக "
-
-#: src/skins/ui_main.cc:851
-msgid "File Info Box"
-msgstr "கோப்பு தகவல் பெட்டி"
-
-#: src/skins/ui_main.cc:857
-msgid "Visualizations"
-msgstr ""
-
-#: src/skins/ui_main.cc:1336
-msgid "Repeat point A set."
-msgstr ""
-
-#: src/skins/ui_main.cc:1341
-msgid "Repeat point B set."
-msgstr ""
-
-#: src/skins/ui_main.cc:1350
-msgid "Repeat points cleared."
-msgstr ""
-
-#: src/skins/ui_playlist.cc:219
-msgid "Search entries in active playlist"
-msgstr "செய்வினை பாடல் பட்டியலிலுள்ள பதிவுகளை தேடுக "
+msgstr "வு மீட்டர் பாணி:"
 
-#: src/skins/ui_playlist.cc:226
-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.cc:234
-msgid "Title:"
-msgstr ""
-
-#: src/skins/ui_playlist.cc:241
-msgid "Album:"
-msgstr ""
-
-#: src/skins/ui_playlist.cc:248
-msgid "Artist:"
-msgstr ""
-
-#: src/skins/ui_playlist.cc:255
-msgid "File Name:"
-msgstr ""
-
-#: src/skins/ui_playlist.cc:263
-msgid "Clear previous selection before searching"
-msgstr "தேட முன் முன்னைய தெரிவுகளை துடைத்தழிக்குக "
+#: src/skins-qt/skins_cfg.cc:294 src/skins/skins_cfg.cc:276
+msgid "Type"
+msgstr " வகை "
 
-#: src/skins/ui_playlist.cc:266
-msgid "Automatically toggle queue for matching entries"
-msgstr "தேர்வடையும் பதிவுகளை தானாக நிலைமாற்று வரிசையாக்குக"
+#: src/skins-qt/skins_cfg.cc:295 src/skins/skins_cfg.cc:277
+msgid "Visualization type:"
+msgstr "காட்சிப்படுத்தல் வகை:"
 
-#: src/skins/ui_playlist.cc:269
-msgid "Create a new playlist with matching entries"
-msgstr "தேர்வடையும் பதிவுகளுக்கு புதிய பாடல் பட்டியலொன்றை உருவாக்குக."
+#: src/skins-qt/skins_cfg.cc:298 src/skins/skins_cfg.cc:280
+msgid "Analyzer"
+msgstr " அனலைசர் "
 
-#: src/skins/ui_playlist.cc:717
-msgid "Audacious Playlist Editor"
-msgstr "ஔடகிவஸ் பாடல் பட்டியல் திருத்தி"
+#: src/skins-qt/skins_cfg.cc:299 src/skins/skins_cfg.cc:281
+msgid "Show peaks"
+msgstr "சிகரங்களைக் காட்டு"
 
-#: src/skins/ui_playlist.cc:752
-#, c-format
-msgid "%s (%d of %d)"
-msgstr "%s (%d இன் %d)"
+#: src/skins-qt/skins_cfg.cc:308 src/skins/skins_cfg.cc:290
+msgid "Visualization"
+msgstr "உருவக காட்சிப்படுத்தல் "
 
-#: src/skins/ui_skinselector.cc:167
+#: src/skins-qt/skinselector.cc:98 src/skins/skinselector.cc:111
 msgid "Archived Winamp 2.x skin"
 msgstr "ஆவணப்படுத்தப்பட்ட Winamp 2.x தோல் "
 
-#: src/skins/ui_skinselector.cc:172
+#: src/skins-qt/skinselector.cc:102 src/skins/skinselector.cc:115
 msgid "Unarchived Winamp 2.x skin"
 msgstr "ஆவணப்படுத்தப்படாத Winamp 2.x தோல் "
 
-#: src/skins/util.cc:430
-#, c-format
-msgid "Could not create directory (%s): %s\n"
-msgstr "கோப்பகமொன்றை உருவாக்க முடியவில்லை (%s): %s⏎\n"
-
-#: src/sndfile/plugin.cc:39
+#: src/sndfile/plugin.cc:38
 msgid "Sndfile Plugin"
-msgstr ""
+msgstr "sndfile சொருகி"
 
-#: src/sndfile/plugin.cc:336
+#: src/sndfile/plugin.cc:372
 msgid ""
 "Based on the xmms_sndfile plugin:\n"
 "Copyright (C) 2000, 2002 Erik de Castro Lopo\n"
@@ -3700,95 +4195,129 @@
 "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"
+" பதிப்புரிமை (சி) 2000, 2002 எரிக் டி காச்ட்ரோ லோபோ \n"
+"\n"
+" டோனி வ்ரூன் <sunainsaw@gentoo.org> ஆல் துணிச்சலுக்கு ஏற்றது \n"
+"\n"
+" இந்த நிரல் இலவச மென்பொருள்; இலவச மென்பொருள் அறக்கட்டளையால் வெளியிடப்பட்ட குனு பொது "
+"பொது உரிமத்தின் விதிமுறைகளின் கீழ் நீங்கள் அதை மறுபகிர்வு செய்யலாம் மற்றும்/அல்லது "
+"மாற்றலாம்; உரிமத்தின் பதிப்பு 2, அல்லது (உங்கள் விருப்பத்தில்) பின்னர் எந்த பதிப்பும். \n"
+"\n"
+" இந்த திட்டம் பயனுள்ளதாக இருக்கும் என்ற நம்பிக்கையில் விநியோகிக்கப்படுகிறது, ஆனால் எந்த "
+"உத்தரவாதமும் இல்லாமல்; ஒரு குறிப்பிட்ட நோக்கத்திற்காக வணிகத்தன்மை அல்லது உடற்தகுதி "
+"ஆகியவற்றின் மறைமுக பொறுப்பு கூட இல்லாமல். மேலும் விவரங்களுக்கு குனு பொது பொது "
+"உரிமத்தைப் பார்க்கவும். \n"
+"\n"
+" இந்த திட்டத்துடன் குனு பொது பொது உரிமத்தின் நகலை நீங்கள் பெற்றிருக்க வேண்டும்; "
+"இல்லையென்றால், இலவச மென்பொருள் அறக்கட்டளை, இன்க்., 51 பிராங்க்ளின் தெரு, ஐந்தாவது மாடி, "
+"பாச்டன், எம்.ஏ 02110-1301, அமெரிக்கா."
 
-#: src/sndio-ng/sndio.cc:44
+#: src/sndio/sndio.cc:43
 msgid "Sndio Output"
-msgstr ""
+msgstr "sndio வெளியீடு"
 
-#: src/sndio-ng/sndio.cc:98
+#: src/sndio/sndio.cc:98
 msgid "Device (blank for default):"
-msgstr ""
+msgstr "சாதனம் (இயல்புநிலைக்கு வெற்று):"
 
-#: src/sndio-ng/sndio.cc:100
+#: src/sndio/sndio.cc:100
 msgid "Save and restore volume:"
-msgstr ""
+msgstr "அளவை சேமித்து மீட்டெடு:"
 
-#: src/sndio-ng/sndio.cc:181
+#: src/sndio/sndio.cc:181
 #, c-format
 msgid "Sndio error: Unsupported audio format (%d)"
-msgstr ""
+msgstr "sndio பிழை: ஆதரிக்கப்படாத ஆடியோ வடிவம் (%d)"
 
-#: src/sndio-ng/sndio.cc:192
+#: src/sndio/sndio.cc:192
 msgid "Sndio error: sio_open() failed"
-msgstr ""
+msgstr "sndio பிழை: sio_open () தோல்வியடைந்தது"
 
-#: src/sndio-ng/sndio.cc:222
+#: src/sndio/sndio.cc:221
 msgid "Sndio error: sio_setpar() failed"
-msgstr ""
+msgstr "sndio பிழை: sio_setpar () தோல்வியுற்றது"
 
-#: src/sndio-ng/sndio.cc:234
+#: src/sndio/sndio.cc:233
 msgid "Sndio error: sio_start() failed"
-msgstr ""
+msgstr "sndio பிழை: sio_start () தோல்வியுற்றது"
 
-#: src/song_change/song_change.cc:33
+#: src/songchange/song_change.cc:30
 msgid "Song Change"
 msgstr "பாடல் மாற்றம் "
 
-#: src/song_change/song_change.cc:342
-msgid ""
-"Parameters passed to the shell should be encapsulated in "
-"quotes. Doing otherwise is a security risk."
-msgstr ""
-"அளவுருக்கள் ஓட்டுக்குள் மேற்கோள் குறிகளால் உட்பொதிந்திருக்க வேண்டும்."
-"இல்லையெனில் பாதுகாப்பு ஆபத்து இருக்கிறது"
-
-#: src/song_change/song_change.cc:358
+#: src/songchange/song_change.cc:256
 msgid "Commands"
-msgstr ""
+msgstr " கட்டளைகள் "
 
-#: src/song_change/song_change.cc:360
+#: src/songchange/song_change.cc:258
 msgid "Command to run when starting a new song:"
+msgstr "புதிய பாடலைத் தொடங்கும்போது இயக்க கட்டளை:"
+
+#: src/songchange/song_change.cc:261
+msgid "Command to run when stopping a song:"
 msgstr ""
 
-#: src/song_change/song_change.cc:364
+#: src/songchange/song_change.cc:264
 msgid "Command to run at the end of a song:"
-msgstr ""
+msgstr "ஒரு பாடலின் முடிவில் இயக்க கட்டளை:"
 
-#: src/song_change/song_change.cc:368
+#: src/songchange/song_change.cc:267
 msgid "Command to run at the end of the playlist:"
-msgstr ""
+msgstr "பிளேலிச்ட்டின் முடிவில் இயக்க கட்டளை:"
 
-#: src/song_change/song_change.cc:372
+#: src/songchange/song_change.cc:270
 msgid "Command to run when song title changes (for network streams):"
+msgstr "பாடல் தலைப்பு மாறும்போது (பிணைய ச்ட்ரீம்களுக்கு) இயக்க கட்டளை:"
+
+#: src/songchange/song_change.cc:273
+msgid ""
+"You can use the following format codes, which will be replaced before "
+"running the command.\n"
+"Not all are useful though for the song-stopped or end-of-playlist command."
 msgstr ""
 
-#: src/song_change/song_change.cc:376
+#: src/songchange/song_change.cc:276
 msgid ""
-"You can use the following format strings which will be substituted before "
-"calling the command (not all are useful for the end-of-playlist command):\n"
-"\n"
-"%F: Frequency (in hertz)\n"
+"%a: Artist\n"
+"%b: Album\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"
+"%F: Frequency (Hertz)\n"
+"%l: Length (milliseconds)\n"
+"%n or %s: Formatted title (see playlist settings)\n"
 "%p: Currently playing (1 or 0)\n"
-"%a: Artist\n"
-"%b: Album\n"
-"%T: Track title"
-msgstr ""
-
-#: src/song-info-qt/song-info.cc:32
-msgid "Song Info (Qt)"
-msgstr ""
+"%r: Rate (bits per second)\n"
+"%t: Playlist position\n"
+"%T: Title (unformatted)"
+msgstr ""
+"%ஒரு: கலைஞர் \n"
+" %பி: ஆல்பம் \n"
+" %சி: சேனல்களின் எண்ணிக்கை \n"
+" %எஃப்: கோப்பு பெயர் (முழு பாதை) \n"
+" %எஃப்: அதிர்வெண் (எர்ட்ச்) \n"
+" %எல்: நீளம் (மில்லி விநாடிகள்) \n"
+" %n அல்லது %s: வடிவமைக்கப்பட்ட தலைப்பு (பிளேலிச்ட் அமைப்புகளைப் பார்க்கவும்) \n"
+" %பி: தற்போது விளையாடுகிறது (1 அல்லது 0) \n"
+" %r: வீதம் (வினாடிக்கு பிட்கள்) \n"
+" %டி: பிளேலிச்ட் நிலை \n"
+" %டி: தலைப்பு (வடிவமைக்கப்படாதது)"
+
+#: src/songchange/song_change.cc:287
+msgid ""
+"Parameters passed to the shell should be enclosed in quotation marks.\n"
+"Unquoted parameters may lead to unexpected results."
+msgstr ""
+
+#: src/song-info-qt/song-info.cc:30
+msgid "Song Info"
+msgstr "பாடல் விபரம்"
 
-#: src/sox-resampler/sox-resampler.cc:44
+#: src/soxr/sox-resampler.cc:44
 msgid "SoX Resampler"
-msgstr ""
+msgstr "சாக்ச் ரெசாம்ப்ளர்"
 
-#: src/sox-resampler/sox-resampler.cc:144
+#: src/soxr/sox-resampler.cc:172
 msgid ""
 "SoX Resampler Plugin for Audacious\n"
 "Copyright 2013 Michał Lipski\n"
@@ -3796,93 +4325,153 @@
 "Based on Sample Rate Converter Plugin:\n"
 "Copyright 2010-2012 John Lindgren"
 msgstr ""
+"துணிச்சலுக்கான சாக்ச் ரெசாம்ப்ளர் சொருகி \n"
+" பதிப்புரிமை 2013 மைக்கே லிப்ச்கி \n"
+"\n"
+" மாதிரி வீத மாற்றி சொருகி அடிப்படையில்: \n"
+" பதிப்புரிமை 2010-2012 சான் லிண்ட்கிரென்"
 
-#: src/sox-resampler/sox-resampler.cc:150
+#: src/soxr/sox-resampler.cc:178
 msgid "Quick"
 msgstr "விரைவு "
 
-#: src/sox-resampler/sox-resampler.cc:151
+#: src/soxr/sox-resampler.cc:179
 msgid "Low"
 msgstr "குறைவு "
 
-#: src/sox-resampler/sox-resampler.cc:153
+#: src/soxr/sox-resampler.cc:181
 msgid "High"
 msgstr "உயர்"
 
-#: src/sox-resampler/sox-resampler.cc:154
+#: src/soxr/sox-resampler.cc:182
 msgid "Very High"
 msgstr "மிக உயர் "
 
-#: src/sox-resampler/sox-resampler.cc:158
+#: src/soxr/sox-resampler.cc:183
+msgid "Ultra High"
+msgstr "அல்ட்ரா உயர்"
+
+#: src/soxr/sox-resampler.cc:187
+msgid "Minimum"
+msgstr "சிறுமம்"
+
+#: src/soxr/sox-resampler.cc:188
+msgid "Intermediate"
+msgstr "இடைநிலை"
+
+#: src/soxr/sox-resampler.cc:193
 msgid "Quality:"
 msgstr "தரம்:"
 
-#: src/speed-pitch/speed-pitch.cc:51
+#: src/soxr/sox-resampler.cc:196
+msgid "Phase:"
+msgstr "கட்டம்:"
+
+#: src/soxr/sox-resampler.cc:200
+msgid "Allow aliasing"
+msgstr "மாற்றுப்பெயரை அனுமதிக்கவும்"
+
+#: src/soxr/sox-resampler.cc:202
+msgid "Use steep filter"
+msgstr "செங்குத்தான வடிப்பானைப் பயன்படுத்தவும்"
+
+#: src/speedpitch/speed-pitch.cc:54
 msgid "Speed and Pitch"
-msgstr ""
+msgstr "விரைவு மற்றும் சுருதி"
 
-#: src/speed-pitch/speed-pitch.cc:210
-msgid "Speed and Pitch"
-msgstr ""
+#: src/speedpitch/speed-pitch.cc:247
+msgid "Speed"
+msgstr " விரைவு "
 
-#: src/speed-pitch/speed-pitch.cc:211
-msgid "Speed:"
-msgstr "வேகம்:"
+#: src/speedpitch/speed-pitch.cc:248
+msgid "Decouple from pitch"
+msgstr "சுருதியிலிருந்து விலகிச் செல்லுங்கள்"
 
-#: src/speed-pitch/speed-pitch.cc:214
-msgid "Pitch:"
-msgstr "சுருதி:"
+#: src/speedpitch/speed-pitch.cc:250 src/speedpitch/speed-pitch.cc:258
+msgid "Multiplier:"
+msgstr "பெருக்கி:"
 
-#: src/statusicon/statusicon.cc:47
-msgid "Status Icon"
-msgstr ""
+#: src/speedpitch/speed-pitch.cc:254
+msgid "Pitch"
+msgstr " சுருதி "
 
-#: src/statusicon/statusicon.cc:283
-msgid "Se_ttings ..."
-msgstr ""
+#: src/statusicon-qt/statusicon.cc:45 src/statusicon/statusicon.cc:47
+msgid "Status Icon"
+msgstr "நிலை படவுரு"
 
-#: src/statusicon/statusicon.cc:372
+#: src/statusicon-qt/statusicon.cc:68
 msgid ""
-"Status Icon Plugin\n"
+"Status Icon Plugin (partial port for Qt interface)\n"
 "\n"
 "Copyright 2005-2007 Giacomo Lozito <james@develia.org>\n"
 "Copyright 2010 Michał Lipski <tallica@o2.pl>\n"
+"Copyright 2015 Eugene Paskevich <eugene@raptor.kiev.ua>\n"
 "\n"
 "This plugin provides a status icon, placed in\n"
 "the system tray area of the window manager."
 msgstr ""
+"நிலை படவுரு சொருகி (qt இடைமுகத்திற்கான பகுதி போர்ட்) \n"
+"\n"
+" பதிப்புரிமை 2005-2007 கியாகோமோ லோசிடோ <james@develia.org> \n"
+" பதிப்புரிமை 2010 மைக்கேச் லிப்ச்கி <tallica@o2.pl> \n"
+" பதிப்புரிமை 2015 யூசின் பாச்கெவிச் <yugene@raptor.kiev.ua> \n"
+"\n"
+" இந்த சொருகி ஒரு நிலை ஐகானை வழங்குகிறது \n"
+" சாளர மேலாளரின் கணினி தட்டு பகுதி."
 
-#: src/statusicon/statusicon.cc:379
+#: src/statusicon-qt/statusicon.cc:89 src/statusicon/statusicon.cc:384
 msgid "Mouse Scroll Action"
-msgstr ""
+msgstr " சுட்டி உருள் செயல் "
 
-#: src/statusicon/statusicon.cc:380
+#: src/statusicon-qt/statusicon.cc:90 src/statusicon/statusicon.cc:385
 msgid "Change volume"
 msgstr "சப்த அளவை மாற்றுக "
 
-#: src/statusicon/statusicon.cc:383
+#: src/statusicon-qt/statusicon.cc:93 src/statusicon/statusicon.cc:388
 msgid "Change playing song"
 msgstr "இயங்கும் பாடலை மாற்றுக "
 
-#: src/statusicon/statusicon.cc:386
+#: src/statusicon-qt/statusicon.cc:96 src/statusicon/statusicon.cc:391
 msgid "Other Settings"
-msgstr ""
+msgstr " பிற அமைப்புகள் "
 
-#: src/statusicon/statusicon.cc:387
+#: src/statusicon-qt/statusicon.cc:97 src/statusicon/statusicon.cc:392
 msgid "Disable the popup window"
 msgstr "திடீர் சாளரத்தை செயலிழக்க செய்க."
 
-#: src/statusicon/statusicon.cc:389
+#: src/statusicon-qt/statusicon.cc:99 src/statusicon/statusicon.cc:394
 msgid "Close to the system tray"
-msgstr ""
+msgstr "கணினி தட்டுக்கு அருகில்"
 
-#: src/statusicon/statusicon.cc:391
+#: src/statusicon-qt/statusicon.cc:101 src/statusicon/statusicon.cc:396
 msgid "Advance in playlist when scrolling upward"
 msgstr "பாடல் பட்டியலினை உருட்டும் போது முன்னோக்கி செல்லவும் "
 
+#: src/statusicon-qt/statusicon.cc:116 src/statusicon/statusicon.cc:287
+msgid "Se_ttings ..."
+msgstr "se_ttings ..."
+
+#: src/statusicon/statusicon.cc:377
+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 கியாகோமோ லோசிடோ <james@develia.org> \n"
+" பதிப்புரிமை 2010 மைக்கேச் லிப்ச்கி <tallica@o2.pl> \n"
+"\n"
+" இந்த சொருகி ஒரு நிலை ஐகானை வழங்குகிறது \n"
+" சாளர மேலாளரின் கணினி தட்டு பகுதி."
+
 #: src/stereo_plugin/stereo.cc:19
 msgid "Extra Stereo"
-msgstr ""
+msgstr "கூடுதல் ச்டீரியோ"
 
 #: src/stereo_plugin/stereo.cc:36
 msgid ""
@@ -3890,25 +4479,168 @@
 "\n"
 "By Johan Levin, 1999"
 msgstr ""
+"கூடுதல் ச்டீரியோ சொருகி \n"
+"\n"
+" எழுதியவர் சோஅன் லெவின், 1999"
 
 #: src/stereo_plugin/stereo.cc:44
 msgid "Extra Stereo"
 msgstr "கூடுதல் பேரொலி "
 
+#: src/streamtuner/icecast-model.cc:126 src/streamtuner/shoutcast-model.cc:131
+msgid "Type"
+msgstr "வகை"
+
+#: src/streamtuner/icecast-model.cc:132
+msgid "Current Song"
+msgstr "தற்போதைய பாடல்"
+
+#: src/streamtuner/icecast-model.cc:164
+msgid "Other"
+msgstr "மற்றொன்று"
+
+#: src/streamtuner/ihr-model.cc:63
+msgid "Market"
+msgstr "சந்தை"
+
+#: src/streamtuner/ihr-model.cc:156
+msgid "Call Letters"
+msgstr "அழைப்பு கடிதங்கள்"
+
+#: src/streamtuner/ihr-model.cc:162
+msgid "Description"
+msgstr "விளக்கம்"
+
+#: src/streamtuner/shoutcast-model.cc:128
+msgid "Listeners"
+msgstr "கேட்போர்"
+
+#: src/streamtuner/shoutcast-model.cc:188
+msgid "Top 500 Stations"
+msgstr "முதல் 500 நிலையங்கள்"
+
+#: src/streamtuner/shoutcast-model.cc:189
+msgid "Alternative"
+msgstr "மாற்று"
+
+#: src/streamtuner/shoutcast-model.cc:190
+msgid "Blues"
+msgstr "ப்ளூஸ்"
+
+#: src/streamtuner/shoutcast-model.cc:191
+msgid "Classical"
+msgstr "பாரம்பரிய இசை"
+
+#: src/streamtuner/shoutcast-model.cc:192
+msgid "Country"
+msgstr "கிராமப்புறப்பாடல்கள் "
+
+#: src/streamtuner/shoutcast-model.cc:193
+msgid "Decades"
+msgstr "பல தசாப்தங்கள்"
+
+#: src/streamtuner/shoutcast-model.cc:194
+msgid "Easy Listening"
+msgstr "எளிதாக கேட்கக் கூடியவை"
+
+#: src/streamtuner/shoutcast-model.cc:195
+msgid "Electronic"
+msgstr "மின்னணு"
+
+#: src/streamtuner/shoutcast-model.cc:196
+msgid "Folk"
+msgstr "நாட்டுப்புறப் பாடல்கள்"
+
+#: src/streamtuner/shoutcast-model.cc:197
+msgid "Inspirational"
+msgstr "ஊக்கம் அளிக்கும்"
+
+#: src/streamtuner/shoutcast-model.cc:198
+msgid "International"
+msgstr "பன்னாட்டு"
+
+#: src/streamtuner/shoutcast-model.cc:199
+msgid "Jazz"
+msgstr "jaas"
+
+#: src/streamtuner/shoutcast-model.cc:200
+msgid "Latin"
+msgstr "லத்தீன்"
+
+#: src/streamtuner/shoutcast-model.cc:201
+msgid "Metal"
+msgstr "mettal"
+
+#: src/streamtuner/shoutcast-model.cc:203
+msgid "New Age"
+msgstr "புதிய படிப்புகl"
+
+#: src/streamtuner/shoutcast-model.cc:204
+msgid "Pop"
+msgstr "போப் "
+
+#: src/streamtuner/shoutcast-model.cc:205
+msgid "Public Radio"
+msgstr "பொது வானொலி"
+
+#: src/streamtuner/shoutcast-model.cc:206
+msgid "R&B and Urban"
+msgstr "ஆர் & பி மற்றும் நகர்ப்புற"
+
+#: src/streamtuner/shoutcast-model.cc:207
+msgid "Rap"
+msgstr "ராப் "
+
+#: src/streamtuner/shoutcast-model.cc:208
+msgid "Reggae"
+msgstr "rage"
+
+#: src/streamtuner/shoutcast-model.cc:209
+msgid "Rock"
+msgstr "ராக் "
+
+#: src/streamtuner/shoutcast-model.cc:210
+msgid "Seasonal and Holiday"
+msgstr "பருவகால மற்றும் விடுமுறை"
+
+#: src/streamtuner/shoutcast-model.cc:211
+msgid "Soundtracks"
+msgstr "ஒலிப்பதிவுகள்"
+
+#: src/streamtuner/shoutcast-model.cc:212
+msgid "Talk"
+msgstr "பேச்சு"
+
+#: src/streamtuner/shoutcast-model.cc:213
+msgid "Themes"
+msgstr "கருப்பொருள்கள்"
+
+#: src/streamtuner/streamtuner.cc:59
+msgid "Shoutcast"
+msgstr "கத்தி"
+
+#: src/streamtuner/streamtuner.cc:60
+msgid "Icecast"
+msgstr "icecast"
+
+#: src/streamtuner/streamtuner.cc:71
+msgid "Stream Tuner"
+msgstr "ச்ட்ரீம் ட்யூனர்"
+
 #: src/tonegen/tonegen.cc:45
 msgid "Tone Generator"
 msgstr "ஒலி உருவாக்கி "
 
-#: src/tonegen/tonegen.cc:94
+#: src/tonegen/tonegen.cc:92
 #, c-format
 msgid "%s %.1f Hz"
 msgstr "%s %.1f Hz"
 
-#: src/tonegen/tonegen.cc:94
+#: src/tonegen/tonegen.cc:92
 msgid "Tone Generator: "
 msgstr "தொனி பிறப்பாக்கி:"
 
-#: src/tonegen/tonegen.cc:160
+#: src/tonegen/tonegen.cc:161
 msgid ""
 "Sine tone generator by Håvard Kvålen <havardk@xmms.org>\n"
 "Modified by Daniel J. Peng <danielpeng@bigfoot.com>\n"
@@ -3916,12 +4648,39 @@
 "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 ""
+"சைன் டோன் செனரேட்டர் எழுதியது அவார்ட் kválen <havardk@xmms.org> \n"
+" டேனியல் சே \n"
+"\n"
+" இதைப் பயன்படுத்த, ஒரு முகவரி ஐச் சேர்க்கவும்: தொனி: // அதிர்வெண் 1; அதிர்வெண் 2; "
+"அதிர்வெண் 3; ... \n"
+" எ.கா. தொனி: // 2000; 2005 2000 எர்ட்ச் தொனி மற்றும் 2005 எர்ட்ச் தொனியை இயக்க"
+
+#: src/ui-common/dialogs-qt.cc:40
+msgid ""
+"\n"
+"(Further messages have been hidden.)"
+msgstr ""
+"\n"
+"(மேலும் செய்திகள் மறைக்கப்பட்டுள்ளன.)"
+
+#: src/ui-common/dialogs-qt.cc:52
+msgid "Working ..."
+msgstr "வேலை ..."
+
+#: src/ui-common/dialogs-qt.cc:73
+msgid "Information"
+msgstr "தகவல் "
+
+#: src/ui-common/menu-ops-gtk.cc:132 src/ui-common/menu-ops-qt.cc:113
+#, c-format
+msgid "%s does not appear to be a valid folder."
+msgstr "%s செல்லுபடியாகும் கோப்புறையாகத் தெரியவில்லை."
 
 #: src/voice_removal/voice_removal.cc:28
 msgid "Voice Removal"
 msgstr "குரல் நீக்கம்"
 
-#: src/vorbis/vorbis.cc:465
+#: src/vorbis/vorbis.cc:433
 msgid ""
 "Audacious Ogg Vorbis Decoder\n"
 "\n"
@@ -3941,17 +4700,34 @@
 "Gian-Carlo Pascutto <gcp@sjeng.org>\n"
 "Eugene Zagidullin <e.asphyx@gmail.com>"
 msgstr ""
+"துணிச்சலான ஓக் வோர்பிச் டிகோடர் \n"
+"\n"
+" xiph.org அறக்கட்டளையின் ogg வோர்பிச் சொருகி அடிப்படையில்: \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 baayen <jorn@nl.linux.org> \n"
+" அவார்ட் kválen <havardk@xmms.org> \n"
+" கியான்-கார்லோ பாச்கட்டோ <gcp@sjeng.org> \n"
+" யூசின் சாகிடுலின் <e.asphyx@gmail.com>"
 
 #: src/vorbis/vorbis.h:18
 msgid "Ogg Vorbis Decoder"
-msgstr ""
+msgstr "ஓக் வோர்பிச் டிகோடர்"
 
-#: src/vtx/info.cc:22
+#: src/vtx/info.cc:24
 #, c-format
 msgid "Details about %s"
-msgstr ""
+msgstr "%s பற்றிய விவரங்கள்"
 
-#: src/vtx/info.cc:24
+#: src/vtx/info.cc:26
 msgid ""
 "Title: %t\n"
 "Author: %a\n"
@@ -3965,49 +4741,130 @@
 "Player Freq: %P\n"
 "Year: %y"
 msgstr ""
+"தலைப்பு: %டி \n"
+" ஆசிரியர்: %அ \n"
+" இருந்து: %எஃப் \n"
+" டிராக்கர்: %டி \n"
+" கருத்து: %சி \n"
+" சிப் வகை: %சி \n"
+" ச்டீரியோ: %கள் \n"
+" லூப்: %எல் \n"
+" சிப் ஃப்ரீக்: %எஃப் \n"
+" பிளேயர் ஃப்ரீக்: %ப \n"
+" ஆண்டு: %y"
 
 #: src/vtx/vtx.cc:38
 msgid "VTX Decoder"
-msgstr ""
+msgstr "வி.டி.எக்ச் டிகோடர்"
 
-#: src/vtx/vtx.cc:184
+#: src/vtx/vtx.cc:178
 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"
+" பாவெல் விமெட்டலெக் <pvymetaleek@seznam.cz> ஆல் துணிச்சலான சொருகி"
 
-#: src/wavpack/wavpack.cc:24
-msgid "WavPack Decoder"
+#: src/vumeter-qt/vumeter_qt.cc:31
+msgid ""
+"VU Meter Plugin for Audacious\n"
+"Copyright 2017-2019 Marc Sánchez Fauste"
 msgstr ""
+"துணிச்சலுக்கான வு மீட்டர் சொருகி \n"
+" பதிப்புரிமை 2017-2019 மார்க் சான்செச் ஃபாச்டே"
 
-#: src/wavpack/wavpack.cc:211
-msgid "lossy (hybrid)"
+#: src/vumeter-qt/vumeter_qt.cc:35
+msgid "VU Meter Settings"
+msgstr " வு மீட்டர் அமைப்புகள் "
+
+#: src/vumeter-qt/vumeter_qt.cc:37
+msgid "Peak hold time:"
+msgstr "உச்சி நேரம்:"
+
+#: src/vumeter-qt/vumeter_qt.cc:42
+msgid "Fall-off time:"
+msgstr "வீழ்ச்சி நேரம்:"
+
+#: src/vumeter-qt/vumeter_qt.cc:44
+msgid "dB/second"
+msgstr "டி.பி./இரண்டாவது"
+
+#: src/vumeter-qt/vumeter_qt.cc:46
+msgid "Display legend"
+msgstr "காட்சி புராணக்கதை"
+
+#: src/vumeter-qt/vumeter_qt.h:37
+msgid "VU Meter"
+msgstr "வு மீட்டர்"
+
+#: src/waveout/waveout.cc:43
+msgid "Win32 waveOut"
+msgstr "வின் 32 அலைவரிசை"
+
+#: src/waveout/waveout.cc:69
+msgid ""
+"Win32 waveOut Plugin for Audacious\n"
+"Copyright 2016 John Lindgren"
 msgstr ""
+"துணிச்சலான win32 அலைவரிசை சொருகி \n"
+" பதிப்புரிமை 2016 சான் லிண்ட்கிரென்"
+
+#: src/wavpack/wavpack.cc:25
+msgid "WavPack Decoder"
+msgstr "wavpack degoder"
+
+#: src/wavpack/wavpack.cc:217
+msgid "lossy (hybrid)"
+msgstr "இழப்பு (கலப்பின)"
 
-#: src/wavpack/wavpack.cc:213
+#: src/wavpack/wavpack.cc:219
 msgid "lossy"
-msgstr ""
+msgstr "இழப்பு"
 
-#: src/wavpack/wavpack.cc:255
+#: src/wavpack/wavpack.cc:259
 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"
+" சில சொருகி குறியீடு மைல்ச் ஏகன்."
 
-#: src/xsf/plugin.cc:50
+#: src/xsf/plugin.cc:74
 msgid "2SF Decoder"
-msgstr ""
+msgstr "2sf டிகோடர்"
+
+#: src/xsf/plugin.cc:429
+msgid "32728 Hz"
+msgstr "32728 எர்ட்ச்"
 
-#: src/xsf/plugin.cc:238
+#: src/xsf/plugin.cc:432
+msgid "65456 Hz"
+msgstr "65456 எர்ட்ச்"
+
+#: src/xsf/plugin.cc:438
+msgid "Cosine"
+msgstr "துணைசெவ்வளைவு"
+
+#: src/xsf/plugin.cc:439
+msgid "Sharp"
+msgstr "கூர்மையான"
+
+#: src/xsf/plugin.cc:443
 msgid "XSF Configuration"
-msgstr ""
+msgstr " xsf உள்ளமைவு "
 
-#: src/xsf/plugin.cc:239
-msgid "Ignore length from file"
-msgstr ""
+#: src/xsf/plugin.cc:445
+msgid "Default fade time:"
+msgstr "இயல்புநிலை மங்கல் நேரம்:"
 
-#: src/xspf/xspf.cc:89
+#: src/xsf/plugin.cc:447
+msgid "Interpolation mode:"
+msgstr "இடைக்கணிப்பு முறை:"
+
+#: src/xspf/xspf.cc:95
 msgid "XML Shareable Playlists (XSPF)"
-msgstr ""
+msgstr "எக்ச்எம்எல் சேபிள் பிளேலிச்ட்கள் (எக்ச்எச்பிஎஃப்)"

audacious-plugins-3.6.2-gtk3.tar.bz2/po/tr.po -> audacious-plugins-4.4.1.tar.bz2/po/tr.po Changed

@@ -5,30 +5,38 @@
 # Translators:
 # aamet <aaydin159@gmail.com>, 2012
 # aamet <aaydin159@gmail.com>, 2012
+# Dragon Blogger <dodokur@gmail.com>, 2016
 # elmasevmem <drmxmyt@gmail.com>, 2013
 # elmasevmem <drmxmyt@gmail.com>, 2013
 # Emre FIRAT <emrefirat93@gmail.com>, 2013
-# Emin Tufan <etcetin@gmail.com>, 2014
+# Emin Tufan Çetin <etcetin@gmail.com>, 2014,2016
 # Emre FIRAT <emrefirat93@gmail.com>, 2013
+# Fake Name <9d3db4ee@opayq.com>, 2016
 # ferhat elmas <elmas.ferhat@gmail.com>, 2013
 # ferhat elmas <elmas.ferhat@gmail.com>, 2013
 # Murat Senel <muratasenel@gmail.com>, 2007
 # Murat Şenel <muratasenel@gmail.com>, 2007
+# Muzaffer Cagda <cagdamuzaffer@gmail.com>, 2016
 # Onur Küçük <onur@pardus.org.tr>, 2007
+# b83946de5835331df42b9ffcc43e6a33_05e65cd <73a30e0a984b2291d4915f37112ad292_814039>, 2023
 # seckin Yılmaz <seckyn@windowslive.com>, 2013
 # seckin Yılmaz <seckyn@windowslive.com>, 2013
 # tarkan255 <t.oguzman@hotmail.com>, 2012
 # tarkan255 <t.oguzman@hotmail.com>, 2012
 # Tolga <tolsen92@outlook.com>, 2014
 # Volkan Gezer <volkangezer@gmail.com>, 2013,2015
+# Yaşar Çiv <yasarciv@protonmail.com>, 2018
+# Yaşar Çiv <yasarciv@protonmail.com>, 2020
 msgid ""
 msgstr ""
 "Project-Id-Version: Audacious Plugins\n"
-"Report-Msgid-Bugs-To: http://redmine.audacious-media-player.org/\n"
-"POT-Creation-Date: 2015-02-28 19:18+0100\n"
-"PO-Revision-Date: 2015-02-13 00:59+0000\n"
-"Last-Translator: Volkan Gezer <volkangezer@gmail.com>\n"
-"Language-Team: Turkish (http://www.transifex.com/projects/p/audacious/"
+"Report-Msgid-Bugs-To: https://github.com/audacious-media-player/audacious/"
+"issues\n"
+"POT-Creation-Date: 2024-09-26 21:54+0200\n"
+"PO-Revision-Date: 2011-10-10 17:43+0000\n"
+"Last-Translator: b83946de5835331df42b9ffcc43e6a33_05e65cd "
+"<73a30e0a984b2291d4915f37112ad292_814039>, 2023\n"
+"Language-Team: Turkish (http://app.transifex.com/audacious/audacious/"
 "language/tr/)\n"
 "Language: tr\n"
 "MIME-Version: 1.0\n"
@@ -36,241 +44,62 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: src/aac-raw/aac.cc:18
+#: src/aac/aac.cc:19
 msgid "AAC (Raw) Decoder"
 msgstr "AAC(Raw) Çözücü"
 
-#: src/adplug/adplug-xmms.cc:42
+#: src/adplug/adplug-xmms.cc:70
 msgid "AdPlug (AdLib Player)"
 msgstr "AdPlug(AdLib Oynatıcı)"
 
-#: src/adplug/adplug-xmms.cc:156 src/modplug/modplugbmp.cc:335
-#: src/psf/plugin.cc:138 src/vtx/vtx.cc:87 src/xsf/plugin.cc:113
+#: src/adplug/adplug-xmms.cc:167 src/modplug/modplugbmp.cc:321
+#: src/psf/plugin.cc:161 src/vtx/vtx.cc:89 src/xsf/plugin.cc:204
 msgid "sequenced"
-msgstr ""
-
-#: src/alarm/alarm.cc:55 src/alarm/interface.cc:82
-msgid "Alarm"
-msgstr "Alarm"
-
-#: src/alarm/alarm.cc:782
-msgid "Set Alarm ..."
-msgstr "Alarm ayarla..."
-
-#: src/alarm/alarm.cc:810
-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/interface.cc: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.cc: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.cc: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.cc:81
-msgid "This is your wakeup call."
-msgstr "Bu uyandırma çağrısıdır."
-
-#: src/alarm/interface.cc:99
-msgid "Your reminder for today is..."
-msgstr "Bugünkü hatırlatıcınız..."
-
-#: src/alarm/interface.cc:101 src/alarm/interface.cc:386
-msgid "Reminder"
-msgstr "Hatırlatıcı"
-
-#: src/alarm/interface.cc:132
-msgid "Monday"
-msgstr "Pazartesi"
-
-#: src/alarm/interface.cc:132
-msgid "Tuesday"
-msgstr "Salı"
-
-#: src/alarm/interface.cc:132
-msgid "Wednesday"
-msgstr "Çarşamba"
-
-#: src/alarm/interface.cc:133
-msgid "Thursday"
-msgstr "Perşembe"
-
-#: src/alarm/interface.cc:133
-msgid "Friday"
-msgstr "Cuma"
-
-#: src/alarm/interface.cc:133
-msgid "Saturday"
-msgstr "Cumartesi"
-
-#: src/alarm/interface.cc:133
-msgid "Sunday"
-msgstr "Pazar"
-
-#: src/alarm/interface.cc:171 src/alarm/interface.cc:230
-#: src/alarm/interface.cc:245
-msgid "Time"
-msgstr "Zaman"
-
-#: src/alarm/interface.cc:178
-msgid "Alarm at (default):"
-msgstr "Alarm (Varsayılan)"
+msgstr "sıralı"
 
-#: src/alarm/interface.cc:200
-msgid "h"
-msgstr "h"
-
-#: src/alarm/interface.cc:203
-msgid "Quiet after:"
-msgstr "Sonra sessiz:"
-
-#: src/alarm/interface.cc:215
-msgid "hours"
-msgstr "saat"
-
-#: src/alarm/interface.cc:226
-msgid "minutes"
-msgstr "dakika"
-
-#: src/alarm/interface.cc:235
-msgid "Choose the days for the alarm to come on"
-msgstr "Sonraki alarm için günleri seçiniz"
+#: src/adplug/adplug-xmms.cc:349 src/sid/xs_config.cc:61
+msgid "Output"
+msgstr "Çıkış"
 
-#: src/alarm/interface.cc:242
-msgid "Day"
-msgstr "Gün"
+#: src/adplug/adplug-xmms.cc:350
+msgid "OPL Emulator:"
+msgstr "OPL Emülatorü:"
+
+#: src/adplug/adplug-xmms.cc:353 src/amidiplug/i_configure.cc:153
+#: src/console/plugin.cc:45 src/filewriter/filewriter.cc:481
+#: src/sid/xs_config.cc:65 src/xsf/plugin.cc:446
+msgid "Sample rate:"
+msgstr "Örnekleme oranı:"
 
-#: src/alarm/interface.cc:259 src/bs2b/plugin.cc:130
-#: src/skins/preset-list.cc:434 src/skins/preset-list.cc:440
-msgid "Default"
-msgstr "Öntanımlı"
+#: src/adplug/adplug-xmms.cc:354 src/amidiplug/i_configure.cc:155
+#: src/bs2b/plugin.cc:141 src/console/plugin.cc:47
+#: src/modplug/plugin_main.cc:77 src/resample/resample.cc:201
+#: src/resample/resample.cc:207 src/resample/resample.cc:211
+#: src/resample/resample.cc:215 src/resample/resample.cc:219
+#: src/resample/resample.cc:223 src/resample/resample.cc:227
+#: src/resample/resample.cc:231 src/resample/resample.cc:235
+#: src/resample/resample.cc:239 src/resample/resample.cc:243
+#: src/sid/xs_config.cc:67 src/soxr/sox-resampler.cc:205
+msgid "Hz"
+msgstr "Hz"
 
-#: src/alarm/interface.cc:288
-msgid "Days"
-msgstr "Günler"
-
-#: src/alarm/interface.cc:297
-msgid "Fading"
-msgstr "Bozulma"
-
-#: src/alarm/interface.cc:305 src/console/plugin.cc:41
-#: src/crossfade/crossfade.cc:53 src/crossfade/crossfade.cc:59
-#: src/gtkui/settings.cc:49 src/lirc/lirc.cc:397 src/sid/xs_config.cc:85
-#: src/sid/xs_config.cc:94 src/sid/xs_config.cc:103
-msgid "seconds"
-msgstr "saniye"
+#: src/adplug/adplug-xmms.cc:355 src/gtkui/settings.cc:55
+#: src/modplug/plugin_main.cc:105 src/qtui/settings.cc:85
+#: src/skins-qt/skins_cfg.cc:302 src/skins/skins_cfg.cc:284
+msgid "Miscellaneous"
+msgstr "Karışık"
 
-#: src/alarm/interface.cc:312 src/alarm/interface.cc:353
-msgid "Volume"
-msgstr "Ses"
-
-#: src/alarm/interface.cc:317
-msgid "Start at"
-msgstr "İle başla"
-
-#: src/alarm/interface.cc:333
-msgid "Final"
-msgstr "Son"
-
-#: src/alarm/interface.cc:346
-msgid "Current"
-msgstr "Şu anda"
-
-#: src/alarm/interface.cc:359
-msgid "Additional Command"
-msgstr "Ek Komut"
-
-#: src/alarm/interface.cc:365 src/alarm/interface.cc:391
-msgid "enable"
-msgstr "izin ver"
-
-#: src/alarm/interface.cc:372
-msgid "Playlist (optional)"
-msgstr "Çalma Listesi(isteğe bağlı)"
-
-#: src/alarm/interface.cc:379
-msgid "Select a playlist"
-msgstr "Çalma listesi Seç"
-
-#: src/alarm/interface.cc:399
-msgid "Options"
-msgstr "Seçenekler"
-
-#: src/alarm/interface.cc:404
-msgid "What do these options mean?"
-msgstr "Bu ayarlar ne anlama geliyor?"
-
-#: src/alarm/interface.cc:420
-msgid "Help"
-msgstr "Yardım"
+#: src/adplug/adplug-xmms.cc:356
+msgid "Repeat song in endless loop"
+msgstr "Sonsuz döngüde şarkıyı tekrarla"
 
-#: src/albumart/albumart.cc:31
+#: src/albumart/albumart.cc:31 src/albumart-qt/albumart.cc:35
 msgid "Album Art"
-msgstr "Albüm kapağı"
-
-#: src/albumart-qt/albumart.cc:33
-msgid "Album Art (Qt)"
-msgstr "Albüm Kapağı (Qt)"
+msgstr "Albüm Kapağı"
 
-#: src/alsa/alsa.h:70
+#: src/alsa/alsa.h:64
 msgid "ALSA Output"
-msgstr "ALSA Çıktısı"
+msgstr "ALSA Çıkışı"
 
 #: src/alsa/config.cc:28
 msgid ""
@@ -280,6 +109,11 @@
 "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 ""
+"Audacious için ALSA Output Plugin\n"
+"Telif hakkı 2009-2012 John Lindgren\n"
+"\n"
+"ALSA Output Plugin NG'nin yazarı Wiliam Pitcock'a teşekkürlerimi sunarım. "
+"ALSA rehberi yeterli olmadığında yazdığı kod referans görevi görmüştür."
 
 #: src/alsa/config.cc:61
 msgid "(no description)"
@@ -305,11 +139,11 @@
 msgid "Mixer element:"
 msgstr "Karıştırıcı öğesi:"
 
-#: src/amidi-plug/amidi-plug.cc:41
+#: src/amidiplug/amidi-plug.cc:42
 msgid "AMIDI-Plug (MIDI Player)"
-msgstr ""
+msgstr "AMIDI-Plug (MIDI Oynatıcı)"
 
-#: src/amidi-plug/amidi-plug.cc:437
+#: src/amidiplug/amidi-plug.cc:445
 msgid ""
 "AMIDI-Plug\n"
 "modular MIDI music player\n"
@@ -331,158 +165,181 @@
 "Tony Vroon\n"
 "for the good help with alpha testing"
 msgstr ""
+"AMIDI-Plug\n"
+"modüler MIDI müzik oynatıcı\n"
+" http://www.develia.org/projects.php?p=amidiplug\n"
+"\n"
+"yazarı Giacomo Lozito \n"
+"< james@develia.org > \n"
+"\n"
+"teşekkürler... \n"
+"\n"
+"Clemens Ladisch ve Jaroslav Kysela\n"
+"programları aplaymidi ve amixer için; alsa-lib belgeleri\n"
+"ve bu programlar ALSA API'sini öğrenmemde çok \n"
+"faydalı oldular\n"
+"\n"
+"Alfredo Spadafina\n"
+"midi klavye logosu için \n"
+"\n"
+"Tony Vroon\n"
+"alfa testinde yardımlarından dolayı "
 
-#: src/amidi-plug/i_configure.cc:94
+#: src/amidiplug/i_configure.cc:94
 msgid "Override default gain:"
-msgstr ""
+msgstr "Varsayılan ses kazanımını geçersiz kıl:"
 
-#: src/amidi-plug/i_configure.cc:102
+#: src/amidiplug/i_configure.cc:102
 msgid "Override default polyphony:"
-msgstr ""
+msgstr "Varsayılan polifoniyi geçersiz kıl:"
 
-#: src/amidi-plug/i_configure.cc:110
+#: src/amidiplug/i_configure.cc:110
 msgid "Override default reverb:"
-msgstr ""
+msgstr "Varsayılan yankıyı geçersiz kıl:"
 
-#: src/amidi-plug/i_configure.cc:112 src/amidi-plug/i_configure.cc:120
+#: src/amidiplug/i_configure.cc:112 src/amidiplug/i_configure.cc:120
 msgid "On"
-msgstr ""
+msgstr "Açık"
 
-#: src/amidi-plug/i_configure.cc:118
+#: src/amidiplug/i_configure.cc:118
 msgid "Override default chorus:"
-msgstr ""
+msgstr "Varsayılan koroyu geçersiz kıl:"
 
-#: src/amidi-plug/i_configure.cc:128 src/console/plugin.cc:29
+#: src/amidiplug/i_configure.cc:128 src/console/plugin.cc:29
 msgid "Playback"
-msgstr ""
+msgstr "Oynatma"
 
-#: src/amidi-plug/i_configure.cc:129
+#: src/amidiplug/i_configure.cc:129
 msgid "Transpose:"
-msgstr ""
+msgstr "Aktar:"
 
-#: src/amidi-plug/i_configure.cc:131
+#: src/amidiplug/i_configure.cc:131 src/speedpitch/speed-pitch.cc:257
 msgid "semitones"
-msgstr ""
+msgstr "yarım tonlar"
 
-#: src/amidi-plug/i_configure.cc:132
+#: src/amidiplug/i_configure.cc:132
 msgid "Drum shift:"
-msgstr ""
+msgstr "Davul tonlaması:"
 
-#: src/amidi-plug/i_configure.cc:134
+#: src/amidiplug/i_configure.cc:134
 msgid "note numbers"
-msgstr ""
+msgstr "nota sayıları"
 
-#: src/amidi-plug/i_configure.cc:135
+#: src/amidiplug/i_configure.cc:135
 msgid "Skip leading silence"
-msgstr ""
+msgstr "Baştaki sessizliği atla"
 
-#: src/amidi-plug/i_configure.cc:137
+#: src/amidiplug/i_configure.cc:137
 msgid "Skip trailing silence"
-msgstr ""
+msgstr "Sondaki sessizliği atla"
 
-#: src/amidi-plug/i_configure.cc:141
+#: src/amidiplug/i_configure.cc:141
 msgid "SoundFont"
-msgstr ""
+msgstr "SoundFont"
 
-#: src/amidi-plug/i_configure.cc:143
+#: src/amidiplug/i_configure.cc:148
 msgid "Synthesizer"
-msgstr ""
+msgstr "Sentezleyici"
 
-#: src/amidi-plug/i_configure.cc:148 src/console/plugin.cc:45
-#: src/sid/xs_config.cc:65
-msgid "Sample rate:"
-msgstr ""
-
-#: src/amidi-plug/i_configure.cc:150 src/bs2b/plugin.cc:141
-#: src/console/plugin.cc:47 src/modplug/plugin_main.cc:78
-#: src/resample/resample.cc:201 src/resample/resample.cc:207
-#: src/resample/resample.cc:211 src/resample/resample.cc:215
-#: src/resample/resample.cc:219 src/resample/resample.cc:223
-#: src/resample/resample.cc:227 src/resample/resample.cc:231
-#: src/resample/resample.cc:235 src/resample/resample.cc:239
-#: src/resample/resample.cc:243 src/sid/xs_config.cc:67
-#: src/sox-resampler/sox-resampler.cc:163
-msgid "Hz"
-msgstr "Hz"
-
-#: src/amidi-plug/i_configure-fluidsynth.cc:52
+#: src/amidiplug/i_configure-fluidsynth.cc:58
+#: src/amidiplug/i_configure-fluidsynth.cc:527
 msgid "AMIDI-Plug - select SoundFont file"
 msgstr "AMIDI-Plug - SoundFont dosyası seç"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:55 src/filewriter/mp3.cc:658
+#: src/amidiplug/i_configure-fluidsynth.cc:61
 msgid "_Cancel"
 msgstr "_İptal"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:56
+#: src/amidiplug/i_configure-fluidsynth.cc:62
 msgid "_Open"
 msgstr "_Aç"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:225 src/gtkui/columns.cc:46
+#: src/amidiplug/i_configure-fluidsynth.cc:233
+#: src/amidiplug/i_configure-fluidsynth.cc:461
 msgid "File name"
 msgstr "Dosya adı"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:229
+#: src/amidiplug/i_configure-fluidsynth.cc:237
+#: src/amidiplug/i_configure-fluidsynth.cc:464
 msgid "Size (bytes)"
 msgstr "Boyut (bayt)"
 
-#: src/amidi-plug/i_fileinfo.cc:163
+#: src/amidiplug/i_fileinfo.cc:184
 msgid "Name:"
 msgstr "İsim:"
 
-#: src/amidi-plug/i_fileinfo.cc:181
+#: src/amidiplug/i_fileinfo.cc:202
 msgid " MIDI Info "
 msgstr " MIDI Bilgisi "
 
-#: src/amidi-plug/i_fileinfo.cc:195
+#: src/amidiplug/i_fileinfo.cc:216
 msgid "Format:"
 msgstr "Biçim:"
 
-#: src/amidi-plug/i_fileinfo.cc:198
+#: src/amidiplug/i_fileinfo.cc:219
 msgid "Length (msec):"
 msgstr "Uzunluk (ms):"
 
-#: src/amidi-plug/i_fileinfo.cc:201
+#: src/amidiplug/i_fileinfo.cc:222
 msgid "No. of Tracks:"
-msgstr ""
+msgstr "Parça Sayısı:"
 
-#: src/amidi-plug/i_fileinfo.cc:207
+#: src/amidiplug/i_fileinfo.cc:228
 msgid "variable"
 msgstr "değişken"
 
-#: src/amidi-plug/i_fileinfo.cc:209
+#: src/amidiplug/i_fileinfo.cc:230
 msgid "BPM:"
 msgstr "BPM:"
 
-#: src/amidi-plug/i_fileinfo.cc:217
+#: src/amidiplug/i_fileinfo.cc:238
 msgid "BPM (wavg):"
 msgstr "BPM (wavg):"
 
-#: src/amidi-plug/i_fileinfo.cc:220
+#: src/amidiplug/i_fileinfo.cc:241
 msgid "Time Div:"
 msgstr "Zamanı Böl:"
 
-#: src/amidi-plug/i_fileinfo.cc:231
+#: src/amidiplug/i_fileinfo.cc:252
 msgid " MIDI Comments and Lyrics "
 msgstr " MIDI Yorumları ve Sözleri "
 
-#: src/amidi-plug/i_fileinfo.cc:278
+#: src/amidiplug/i_fileinfo.cc:299
 msgid "* no comments available in this MIDI file *"
 msgstr "* bu midi dosyasında yorum bulunamadı *"
 
-#: src/amidi-plug/i_fileinfo.cc:290
+#: src/amidiplug/i_fileinfo.cc:311
 msgid "* no lyrics available in this MIDI file *"
 msgstr "* bu midi dosyasında şarkı sözü bulunamadı *"
 
-#: src/amidi-plug/i_fileinfo.cc:300 src/filewriter/vorbis.cc:197
-#: src/ladspa/plugin.cc:416
+#: src/amidiplug/i_fileinfo.cc:321 src/ladspa/plugin.cc:418
+#: src/ui-common/dialogs-qt.cc:32
 msgid "_Close"
 msgstr "_Kapat"
 
-#: src/amidi-plug/i_fileinfo.cc:325
+#: src/amidiplug/i_fileinfo.cc:346
 msgid " (invalid UTF-8)"
 msgstr " (geçersiz UTF-8)"
 
-#: src/aosd/aosd.cc:32
+#: src/ampache/ampache.cc:33
+msgid "Ampache Browser"
+msgstr "Ampache Tarayıcı"
+
+#: src/ampache/ampache.cc:46
+msgid ""
+"Ampache Browser for Audacious\n"
+"http://ampache-browser.org/\n"
+"\n"
+"Copyright (C) Róbert Čerňanský and John Lindgren\n"
+"License: GNU GPLv3"
+msgstr ""
+"Audacious için Ampache Tarayıcı\n"
+"http://ampache-browser.org/\n"
+"\n"
+"Róbert Čerňanský ve John Lindgren'in Telif Hakları (C)\n"
+"Lisans: GNU GPLv3"
+
+#: src/aosd/aosd.cc:31
 msgid ""
 "Audacious OSD\n"
 "http://www.develia.org/projects.php?p=audacious#aosd\n"
@@ -492,10 +349,17 @@
 "Based in part on Evan Martin's Ghosd library:\n"
 "http://neugierig.org/software/ghosd/"
 msgstr ""
+"Audacious OSD\n"
+"http://www.develia.org/projects.php?p=audacious#aosd\n"
+"\n"
+"Giacomo Lozito tarafından yazıldı <james@develia.org>\n"
+"\n"
+"Evan Martin's Ghosd kütüphanesinde kısmen yer aldı:\n"
+"http://neugierig.org/software/ghosd/"
 
 #: src/aosd/aosd.h:37
 msgid "AOSD (On-Screen Display)"
-msgstr ""
+msgstr "AOSD (On-Screen Display)"
 
 #: src/aosd/aosd_style.cc:54
 msgid "Rectangle"
@@ -509,245 +373,317 @@
 msgid "Concave Rectangle"
 msgstr "İçbükey Dikdörtgen"
 
-#: src/aosd/aosd_style.cc:69
+#: src/aosd/aosd_style.cc:69 src/openmpt/mptwrap.h:50 src/xsf/plugin.cc:436
 msgid "None"
 msgstr "Hiçbiri"
 
-#: src/aosd/aosd_trigger.cc:50
+#: src/aosd/aosd_trigger.cc:49
 msgid "Playback Start"
 msgstr "Çalmayı Başlat"
 
-#: src/aosd/aosd_trigger.cc:51
+#: src/aosd/aosd_trigger.cc:50
 msgid "Triggers OSD when a playlist entry is played."
-msgstr "Parça listesindeki girdi oynatıldığında OSD'yi başlatır."
+msgstr "Çalma listesindeki girdi oynatıldığında OSD'yi başlatır."
 
-#: src/aosd/aosd_trigger.cc:56
+#: src/aosd/aosd_trigger.cc:55
 msgid "Title Change"
 msgstr "Başlık Değiştirme"
 
-#: src/aosd/aosd_trigger.cc:57
+#: src/aosd/aosd_trigger.cc:56
 msgid "Triggers OSD when the song title changes (for internet streams)."
-msgstr ""
+msgstr "Şarkı adı değiştiğinde OSD'yi tetikler (internet akışları için)."
 
-#: src/aosd/aosd_trigger.cc:62
+#: src/aosd/aosd_trigger.cc:61
 msgid "Pause On"
 msgstr "Bekletme Açık"
 
-#: src/aosd/aosd_trigger.cc:63
+#: src/aosd/aosd_trigger.cc:62
 msgid "Triggers OSD when playback is paused."
 msgstr "Çalma bekletildiğinde OSD'yi başlatır."
 
-#: src/aosd/aosd_trigger.cc:68
+#: src/aosd/aosd_trigger.cc:67
 msgid "Pause Off"
 msgstr "Bekletme Kapalı"
 
-#: src/aosd/aosd_trigger.cc:69
+#: src/aosd/aosd_trigger.cc:68
 msgid "Triggers OSD when playback is unpaused."
 msgstr "Çalmaya yeniden başladığında OSD'yi başlatır."
 
-#: src/aosd/aosd_ui.cc:163
+#: src/aosd/aosd_ui.cc:204
 msgid "Placement"
 msgstr "Yerleştirme"
 
-#: src/aosd/aosd_ui.cc:196
+#: src/aosd/aosd_ui.cc:241
 msgid "Relative X offset:"
 msgstr "Değişken X değeri:"
 
-#: src/aosd/aosd_ui.cc:203
+#: src/aosd/aosd_ui.cc:245
 msgid "Relative Y offset:"
 msgstr "Değişken Y değeri:"
 
-#: src/aosd/aosd_ui.cc:210
+#: src/aosd/aosd_ui.cc:249
 msgid "Max OSD width:"
 msgstr "Maksimum OSD genişliği:"
 
-#: src/aosd/aosd_ui.cc:221
+#: src/aosd/aosd_ui.cc:281
 msgid "Multi-Monitor options"
 msgstr "Çoklu Ekran seçenekleri"
 
-#: src/aosd/aosd_ui.cc:225
+#: src/aosd/aosd_ui.cc:285
 msgid "Display OSD using:"
 msgstr "OSD kullanımını göster:"
 
-#: src/aosd/aosd_ui.cc:227
+#: src/aosd/aosd_ui.cc:287
 msgid "all monitors"
 msgstr "tüm ekranlar"
 
-#: src/aosd/aosd_ui.cc:230
+#: src/aosd/aosd_ui.cc:290
 #, c-format
 msgid "monitor %i"
 msgstr "ekran %i"
 
-#: src/aosd/aosd_ui.cc:282
+#: src/aosd/aosd_ui.cc:342
 msgid "Timing (ms)"
 msgstr "Zamanlama (ms)"
 
-#: src/aosd/aosd_ui.cc:287
+#: src/aosd/aosd_ui.cc:347
 msgid "Display:"
 msgstr "Görüntü:"
 
-#: src/aosd/aosd_ui.cc:292
+#: src/aosd/aosd_ui.cc:352
 msgid "Fade in:"
 msgstr "Gecikme:"
 
-#: src/aosd/aosd_ui.cc:297
+#: src/aosd/aosd_ui.cc:357
 msgid "Fade out:"
 msgstr "Kaybolma:"
 
-#: src/aosd/aosd_ui.cc:361
+#: src/aosd/aosd_ui.cc:442
 msgid "Fonts"
 msgstr "Yazı Tipleri"
 
-#: src/aosd/aosd_ui.cc:368
+#: src/aosd/aosd_ui.cc:449
 #, c-format
 msgid "Font %i:"
 msgstr "Yazı tipi %i:"
 
-#: src/aosd/aosd_ui.cc:382
+#: src/aosd/aosd_ui.cc:466
 msgid "Shadow"
 msgstr "Gölge"
 
-#: src/aosd/aosd_ui.cc:486
+#: src/aosd/aosd_ui.cc:589
 msgid "Render Style"
 msgstr "Tarama Biçemi"
 
-#: src/aosd/aosd_ui.cc:502
+#: src/aosd/aosd_ui.cc:605
 msgid "Colors"
 msgstr "Renkler"
 
-#: src/aosd/aosd_ui.cc:513
+#: src/aosd/aosd_ui.cc:616
 #, c-format
 msgid "Color %i:"
-msgstr "Renkler %i:"
+msgstr "Renk %i:"
 
-#: src/aosd/aosd_ui.cc:600
+#: src/aosd/aosd_ui.cc:714
 msgid "Enable trigger"
 msgstr "Tetikleyiciyi etkinleştir"
 
-#: src/aosd/aosd_ui.cc:627
+#: src/aosd/aosd_ui.cc:741
 msgid "Event"
 msgstr "Olay"
 
-#: src/aosd/aosd_ui.cc:655
+#: src/aosd/aosd_ui.cc:768
 msgid "Composite manager detected"
-msgstr "Composite yöneticisi tespit edildi"
+msgstr "Bileşiklik yöneticisi tespit edildi"
 
-#: src/aosd/aosd_ui.cc:662
+#: src/aosd/aosd_ui.cc:775
 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"
+"Bileşiklik yöneticisi tespit edilemedi;\n"
+"Çalışan bir bileşiklik yöneticisinin olduğundan emin değilseniz lütfen "
+"OSD'nin düzgün çalışması için bir bileşiklik yöneticisi çalıştırınız"
 
-#: src/aosd/aosd_ui.cc:670
+#: src/aosd/aosd_ui.cc:783
 msgid "Composite manager not required for fake transparency"
-msgstr "Sahte şeffaflık için composite yöneticisi gerekli değil"
+msgstr "Sahte şeffaflık için bileşiklik yöneticisi gerekli değil"
 
-#: src/aosd/aosd_ui.cc:706
+#: src/aosd/aosd_ui.cc:820
 msgid "Transparency"
 msgstr "Şeffaflık"
 
-#: src/aosd/aosd_ui.cc:712
+#: src/aosd/aosd_ui.cc:826
 msgid "Fake transparency"
 msgstr "Sahte şeffaflık"
 
-#: src/aosd/aosd_ui.cc:714
+#: src/aosd/aosd_ui.cc:828
 msgid "Real transparency (requires X Composite Ext.)"
-msgstr "Gerçek Şeffaflık (X Composite Eklentisi gerekli)"
+msgstr "Gerçek Şeffaflık (X Bileşiklik Eklentisi gerekli)"
 
-#: src/aosd/aosd_ui.cc:756
+#: src/aosd/aosd_ui.cc:875
 msgid "Composite extension not loaded"
-msgstr "Composite eklentisi yüklü değil"
-
-#: src/aosd/aosd_ui.cc:764
-msgid "Composite extension not available"
-msgstr "Composite eklentisi erişilebilir değil"
+msgstr "Bileşiklik eklentisi yüklü değil"
 
-#: src/aosd/aosd_ui.cc:781
+#: src/aosd/aosd_ui.cc:892
 #, c-format
 msgid "Audacious OSD"
 msgstr "Audacious OSD"
 
-#: src/aosd/aosd_ui.cc:844
+#: src/aosd/aosd_ui.cc:955
 msgid "Position"
 msgstr "Konum"
 
-#: src/aosd/aosd_ui.cc:849
+#: src/aosd/aosd_ui.cc:960
 msgid "Animation"
 msgstr "Canlandırma"
 
-#: src/aosd/aosd_ui.cc:854
+#: src/aosd/aosd_ui.cc:965
 msgid "Text"
 msgstr "Metin"
 
-#: src/aosd/aosd_ui.cc:859
+#: src/aosd/aosd_ui.cc:970
 msgid "Decoration"
 msgstr "Dekorasyon"
 
-#: src/aosd/aosd_ui.cc:864
+#: src/aosd/aosd_ui.cc:975
 msgid "Trigger"
 msgstr "Başlat"
 
-#: src/aosd/aosd_ui.cc:869
+#: src/aosd/aosd_ui.cc:980 src/streamtuner/shoutcast-model.cc:202
 msgid "Misc"
 msgstr "Çeşitli"
 
-#: src/aosd/aosd_ui.cc:878
+#: src/aosd/aosd_ui.cc:989
 msgid "Test"
-msgstr ""
+msgstr "Test"
 
 #: src/asx3/asx3.cc:35
 msgid "ASXv3 Playlists"
-msgstr "ASXv3 Parça listesi"
+msgstr "ASXv3 Çalma listesi"
 
 #: src/asx/asx.cc:33
 msgid "ASXv1/ASXv2 Playlists"
-msgstr ""
+msgstr "ASXv1/ASXv2 Çalma Listesi"
 
 #: src/audpl/audpl.cc:33
 msgid "Audacious Playlists (audpl)"
+msgstr "Audacious Çalma Listeleri (audpl)"
+
+#: src/background_music/background_music.cc:24
+msgid "Background music"
+msgstr ""
+
+#: src/background_music/background_music.cc:25
+msgid "Target level:"
+msgstr ""
+
+#: src/background_music/background_music.cc:28
+#: src/background_music/background_music.cc:33
+#: src/silence-removal/silence-removal.cc:70
+msgid "dB"
+msgstr "dB"
+
+#: src/background_music/background_music.cc:29
+msgid "Maximum amplification:"
+msgstr ""
+
+#: src/background_music/background_music.cc:34 src/mpg123/mpg123.cc:81
+msgid "Advanced"
+msgstr "Gelişmiş"
+
+#: src/background_music/background_music.cc:36
+msgid "Slow detection weight:"
+msgstr ""
+
+#: src/background_music/background_music.cc:39
+msgid "Hint"
 msgstr ""
 
-#: src/blur_scope/blur_scope.cc:42
+#: src/background_music/background_music.cc:41
+msgid ""
+"Slow detection weight is the relative weight\n"
+"of a long term average detection when compared\n"
+"to the actual, faster loudness detection.\n"
+"A value of zero gives a more radio-like sound\n"
+"where soft passages get \"pulled up\" more quickly,\n"
+"a value of two makes the sound feel less compressed."
+msgstr ""
+
+#: src/background_music/background_music.cc:52
+msgid ""
+"Background Music Plugin for Audacious\n"
+"Copyright 2023;2024 Michel Fleur\n"
+"\n"
+"Controls the volume to make the sound equally loud within and between "
+"tracks.\n"
+" It uses accurate loudness measurement and tries to make the volume changes "
+"sound natural without audible peaks, yet without lowering the volume before "
+"a peak in advance."
+msgstr ""
+
+#: src/background_music/background_music.cc:61
+msgid "Background Music"
+msgstr ""
+
+#: src/bitcrusher/bitcrusher.cc:33
+msgid "Bitcrusher"
+msgstr "Bitcrusher"
+
+#: src/bitcrusher/bitcrusher.cc:34
+msgid "Bit Depth:"
+msgstr "Bit Derinliği:"
+
+#: src/bitcrusher/bitcrusher.cc:37
+msgid "Downsample ratio:"
+msgstr "Aşağı ölçekleme oranı:"
+
+#: src/bitcrusher/bitcrusher.cc:48
+msgid "Bitcrusher"
+msgstr "Bitcrusher"
+
+#: src/blur_scope/blur_scope.cc:40 src/blur_scope-qt/blur_scope.cc:45
 msgid "Color"
 msgstr "Renk"
 
-#: src/blur_scope/blur_scope.cc:58
+#: src/blur_scope/blur_scope.cc:56 src/blur_scope-qt/blur_scope.cc:158
 msgid "Blur Scope"
-msgstr ""
+msgstr "Bulanıklık Kapsamı"
 
 #: src/bs2b/plugin.cc:38
 msgid "Bauer Stereophonic-to-Binaural (BS2B)"
-msgstr ""
+msgstr "Bauer Stereophonic-to-Binaural (BS2B)"
 
 #: src/bs2b/plugin.cc:129
 msgid "Presets:"
-msgstr ""
+msgstr "Önayarlar:"
+
+#: src/bs2b/plugin.cc:130
+msgid "Default"
+msgstr "Varsayılan"
 
 #: src/bs2b/plugin.cc:136
 msgid "Feed level:"
-msgstr ""
+msgstr "Besleme seviyesi:"
 
 #: src/bs2b/plugin.cc:138
 msgid "x1/10 dB"
-msgstr ""
+msgstr "x1/10 dB"
 
 #: src/bs2b/plugin.cc:139
 msgid "Cut frequency:"
-msgstr ""
+msgstr "Kesim frekansı:"
 
-#: src/cairo-spectrum/cairo-spectrum.cc:41
+#: src/cairo-spectrum/cairo-spectrum.cc:42 src/qt-spectrum/qt-spectrum.cc:107
 msgid "Spectrum Analyzer"
-msgstr ""
+msgstr "İzgesel Çözümleyici"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:72
+#: src/cdaudio/cdaudio-ng.cc:74
 msgid "Audio CD Plugin"
-msgstr ""
+msgstr "Ses CD'si Eklentisi"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:121
+#: src/cdaudio/cdaudio-ng.cc:121
 msgid ""
 "Copyright (C) 2007-2012 Calin Crisan <ccrisan@gmail.com> and others.\n"
 "\n"
@@ -758,155 +694,166 @@
 "\n"
 "This was a Google Summer of Code 2007 project."
 msgstr ""
+"Telif Hakkı (C) 2007-2012 Calin Crisan <ccrisan@gmail.com> ve diğerleri.\n"
+"\n"
+"Libcdio geliştiricilerine çok teşekkürler <http://www.gnu.org/software/"
+"libcdio/>\n"
+"ve libcddb geliştiricilerine <http://libcddb.sourceforge.net/>.\n"
+"\n"
+"Ayrıca bana mentörlük ve rehberlik ettiği için Tony Vroon'a teşekkür "
+"ederim.\n"
+"Bu bir Google Summer of Code 2007 projesiydi."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:137
+#: src/cdaudio/cdaudio-ng.cc:140
 msgid "Device"
-msgstr ""
+msgstr "Aygıt"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:138
+#: src/cdaudio/cdaudio-ng.cc:141
 msgid "Read speed:"
-msgstr ""
+msgstr "Okuma hızı:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:141
+#: src/cdaudio/cdaudio-ng.cc:144
 msgid "Override device:"
-msgstr ""
+msgstr "Aygıtı geçersiz kıl:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:143
+#: src/cdaudio/cdaudio-ng.cc:146
 msgid "Metadata"
-msgstr ""
+msgstr "Parça Bilgisi"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:144
+#: src/cdaudio/cdaudio-ng.cc:147
 msgid "Use CD-Text"
-msgstr ""
+msgstr "CD-Text kullan"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:146
+#: src/cdaudio/cdaudio-ng.cc:150
 msgid "Use CDDB"
-msgstr ""
+msgstr "CDDB kullan"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:148
+#: src/cdaudio/cdaudio-ng.cc:152
 msgid "Use HTTP instead of CDDBP"
 msgstr "CDDBP yerine HTTP kullan"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:151
+#: src/cdaudio/cdaudio-ng.cc:155
 msgid "Server:"
-msgstr ""
+msgstr "Sunucu:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:155
+#: src/cdaudio/cdaudio-ng.cc:159
 msgid "Path:"
-msgstr ""
+msgstr "Yol:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:159
+#: src/cdaudio/cdaudio-ng.cc:163
 msgid "Port:"
 msgstr "Bağlantı Noktası:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:246
+#: src/cdaudio/cdaudio-ng.cc:228
 msgid "Failed to initialize cdio subsystem."
-msgstr ""
+msgstr "Cdio alt sistemi başlatılamadı."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:281
+#: src/cdaudio/cdaudio-ng.cc:260
 #, c-format
 msgid "Invalid URI %s."
-msgstr ""
+msgstr "Geçersiz URL %s."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:283
+#: src/cdaudio/cdaudio-ng.cc:262
 #, c-format
 msgid "Track %d not found."
-msgstr ""
+msgstr "%d parçası bulunamadı."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:285
+#: src/cdaudio/cdaudio-ng.cc:264
 #, c-format
 msgid "Track %d is a data track."
-msgstr ""
+msgstr "%d bir veri parçasıdır."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:360
+#: src/cdaudio/cdaudio-ng.cc:339
 msgid "Error reading audio CD."
-msgstr ""
+msgstr "Ses CD'si okunurken hata oluştu."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:429
+#: src/cdaudio/cdaudio-ng.cc:410
 msgid "Audio CD"
 msgstr "Ses CD'si"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:460 src/cdaudio-ng/cdaudio-ng.cc:469
+#: src/cdaudio/cdaudio-ng.cc:446 src/cdaudio/cdaudio-ng.cc:455
 #, c-format
 msgid "Failed to open CD device %s."
-msgstr ""
+msgstr "%s CD aygıtı açılamadı."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:472
+#: src/cdaudio/cdaudio-ng.cc:458
 msgid "No audio capable CD drive found."
-msgstr ""
+msgstr "Ses özellikli CD sürücüsü bulunamadı."
+
+#: src/cdaudio/cdaudio-ng.cc:481
+msgid "Drive is empty."
+msgstr "Sürücü boş."
+
+#: src/cdaudio/cdaudio-ng.cc:483
+msgid "Unsupported disk type."
+msgstr "Desteklenmeyen disk türü."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:497
+#: src/cdaudio/cdaudio-ng.cc:507
 msgid "Failed to finish initializing opened CD drive."
-msgstr ""
+msgstr "Açılan CD sürücüsü başlatılamadı."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:510
+#: src/cdaudio/cdaudio-ng.cc:520
 msgid "Failed to retrieve first/last track number."
-msgstr ""
+msgstr "İlk/son parça numarası alınamadı."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:531
+#: src/cdaudio/cdaudio-ng.cc:541
 #, c-format
 msgid "Cannot read start/end LSN for track %d."
-msgstr ""
+msgstr "%d parçası için başlangıç/bitiş LSN okunamıyor."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:613
-msgid "Failed to create the cddb connection."
-msgstr ""
+#: src/cdaudio/cdaudio-ng.cc:624
+msgid "Failed to create the CDDB connection."
+msgstr "CDDB bağlantısı oluşturulamadı."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:679
+#: src/cdaudio/cdaudio-ng.cc:690
 msgid "Failed to query the CDDB server"
-msgstr ""
+msgstr "CDDB sunucusu sorgulanamadı"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:681
+#: src/cdaudio/cdaudio-ng.cc:692
 #, c-format
 msgid "Failed to query the CDDB server: %s"
-msgstr ""
+msgstr "CDDB sunucusu sorgulanamadı: %s"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:705
+#: src/cdaudio/cdaudio-ng.cc:716
 #, c-format
-msgid "Failed to read the cddb info: %s"
-msgstr ""
-
-#: src/cdaudio-ng/cdaudio-ng.cc:765
-msgid "Drive is empty."
-msgstr "Sürücü boş."
-
-#: src/cdaudio-ng/cdaudio-ng.cc:767
-msgid "Unsupported disk type."
-msgstr "Desteklenmeyen disk türü."
+msgid "Failed to read the CDDB info: %s"
+msgstr "CDDB bilgisi okunamadı: %s"
 
-#: src/cd-menu-items/cd-menu-items.cc:35
+#: src/cd-menu-items/cd-menu-items.cc:33
 msgid "Audio CD Menu Items"
-msgstr ""
+msgstr "Ses CD'si Menü Öğeleri"
 
-#: src/cd-menu-items/cd-menu-items.cc:47
-msgid "Play CD"
-msgstr "CD çal"
-
-#: src/cd-menu-items/cd-menu-items.cc:47
-msgid "Add CD"
-msgstr "CD Ekle"
+#: src/cd-menu-items/cd-menu-items.cc:45
+msgid "Pla_y CD"
+msgstr "CD'yi o_ynat"
+
+#: src/cd-menu-items/cd-menu-items.cc:45
+msgid "_Add CD"
+msgstr "CD _Ekle"
 
 #: src/compressor/compressor.cc:45
 msgid "Compression"
-msgstr ""
+msgstr "Sıkıştırma"
 
 #: src/compressor/compressor.cc:46
 msgid "Center volume:"
-msgstr ""
+msgstr "Merkez ses seviyesi:"
 
 #: src/compressor/compressor.cc:49
 msgid "Dynamic range:"
-msgstr "Dinamik alan:"
+msgstr "Dinamik aralık:"
 
 #: src/compressor/compressor.cc:57
 msgid ""
 "Dynamic Range Compression Plugin for Audacious\n"
 "Copyright 2010-2014 John Lindgren"
 msgstr ""
+"Audacious için Dinamik Aralık Sıkıştırma Eklentisi\n"
+"Telif Hakkı 2010-2014 John Lindgren"
 
 #: src/compressor/compressor.cc:64
 msgid "Dynamic Range Compressor"
-msgstr ""
+msgstr "Dinamik Aralık Sıkıştırıcısı"
 
 #: src/console/plugin.cc:15
 msgid ""
@@ -917,6 +864,12 @@
 "William Pitcock <nenolod@dereferenced.org>\n"
 "Shay Green <gblargg@gmail.com>"
 msgstr ""
+"Game_Music_Emu 0.5.2 tabanlı konsol müzik kod çözücü motoru\n"
+"Desteklenen biçimler: AY, GBS, GYM, HES, KSS, NSF, NSFE, SAP, SPC, VGM, VGZ\n"
+"\n"
+"Audacious eklentisi:\n"
+"William Pitcock <nenolod@dereferenced.org>\n"
+"Shay Green <gblargg@gmail.com>"
 
 #: src/console/plugin.cc:30
 msgid "Bass:"
@@ -934,9 +887,16 @@
 msgid "Default song length:"
 msgstr "Varsayılan şarkı uzunluğu:"
 
-#: src/console/plugin.cc:42 src/modplug/plugin_main.cc:59
+#: src/console/plugin.cc:41 src/crossfade/crossfade.cc:56
+#: src/crossfade/crossfade.cc:62 src/lirc/lirc.cc:395 src/notify/notify.cc:113
+#: src/sid/xs_config.cc:85 src/sid/xs_config.cc:94 src/sid/xs_config.cc:103
+#: src/vumeter-qt/vumeter_qt.cc:39
+msgid "seconds"
+msgstr "saniye"
+
+#: src/console/plugin.cc:42 src/modplug/plugin_main.cc:58
 msgid "Resampling"
-msgstr ""
+msgstr "Yeniden örnekleme"
 
 #: src/console/plugin.cc:43
 msgid "Enable audio resampling"
@@ -944,7 +904,7 @@
 
 #: src/console/plugin.cc:49
 msgid "SPC"
-msgstr ""
+msgstr "SPC"
 
 #: src/console/plugin.cc:50
 msgid "Ignore length from SPC tags"
@@ -958,140 +918,163 @@
 msgid "Game Console Music Decoder"
 msgstr "Oyun Konsolu Müzik Çözümleyicisi"
 
-#: src/coreaudio/coreaudio.cc:50
+#: src/coreaudio/coreaudio.cc:53
 msgid "CoreAudio output"
-msgstr ""
+msgstr "Çekirdek Ses çıkışı"
 
-#: src/coreaudio/coreaudio.cc:131
+#: src/coreaudio/coreaudio.cc:155
 msgid ""
 "CoreAudio Output Plugin for Audacious\n"
 "Copyright 2014 William Pitcock\n"
+"Copyright 2017,18 René J.V. Bertin\n"
+" (original code and code adapted from\n"
+" Apple examples, (C) Apple 2013)\n"
 "\n"
 "Based on SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
 msgstr ""
+"Audacious için Çekirdek Ses çıkışı eklentisi\n"
+"Telif Hakkı 2014 William Pitcock\n"
+"Telif Hakkı 2017,18 René J.V. Bertin\n"
+" (asıl kod ve Apple örneklerinden\n"
+" uyarlanan kod , (C) Apple 2013)\n"
+"\n"
+"Audacious için SDL Çıkış Eklentisine Dayalı\n"
+"Telif Hakkı 2010 John Lindgren"
 
-#: src/coreaudio/coreaudio.cc:143
+#: src/coreaudio/coreaudio.cc:171
 msgid "Use exclusive mode"
-msgstr ""
+msgstr "Özel mod kullan"
 
-#: src/crossfade/crossfade.cc:44
+#: src/coreaudio/coreaudio.cc:173
+msgid "Use bit perfect audio (adapt device sampling rate)"
+msgstr "Bit mükemmel ses kullan (cihaz örnekleme oranını uyarla)"
+
+#: src/crossfade/crossfade.cc:47
 msgid ""
 "Crossfade Plugin for Audacious\n"
 "Copyright 2010-2014 John Lindgren"
 msgstr ""
+"Audacious için Çapraz Geçiş Eklentisi\n"
+"Telif Hakkı 2010-2014 John Lindgren"
 
-#: src/crossfade/crossfade.cc:48
+#: src/crossfade/crossfade.cc:51
 msgid "Crossfade"
-msgstr ""
+msgstr "Çapraz Geçiş"
 
-#: src/crossfade/crossfade.cc:49
+#: src/crossfade/crossfade.cc:52
 msgid "On automatic song change"
-msgstr ""
+msgstr "Otomatik şarkı değişikliğinde"
 
-#: src/crossfade/crossfade.cc:51 src/crossfade/crossfade.cc:57
+#: src/crossfade/crossfade.cc:54 src/crossfade/crossfade.cc:60
 msgid "Overlap:"
-msgstr ""
+msgstr "Üst üste gelme:"
 
-#: src/crossfade/crossfade.cc:55
+#: src/crossfade/crossfade.cc:58
 msgid "On seek or manual song change"
-msgstr ""
+msgstr "Aramada veya manuel şarkıda değişiklik"
 
-#: src/crossfade/crossfade.cc:61
-msgid "Tip"
+#: src/crossfade/crossfade.cc:64
+msgid "No fade in"
 msgstr ""
 
-#: src/crossfade/crossfade.cc:62
-msgid ""
-"For better crossfading, enable\n"
-"the Silence Removal effect."
+#: src/crossfade/crossfade.cc:66
+msgid "Use S-curve fade"
 msgstr ""
 
-#: src/crossfade/crossfade.cc:72
-msgid "Crossfade"
+#: src/crossfade/crossfade.cc:68
+msgid "S-curve steepness:"
 msgstr ""
 
-#: src/crossfade/crossfade.cc:161
-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."
+#: src/crossfade/crossfade.cc:70
+msgid "(higher is steeper)"
 msgstr ""
 
-#: src/crossfade/crossfade.cc:168
+#: src/crossfade/crossfade.cc:72
+msgid "Tip"
+msgstr "Uç"
+
+#: src/crossfade/crossfade.cc:73
 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."
+"For better crossfading, enable\n"
+"the Silence Removal effect."
 msgstr ""
+"Daha iyi çapraz geçiş için\n"
+"Sessizlik Kaldırma efektini etkinleştirin."
+
+#: src/crossfade/crossfade.cc:83
+msgid "Crossfade"
+msgstr "Çapraz Geçiş"
 
 #: src/crystalizer/crystalizer.cc:31
 msgid "Crystalizer"
-msgstr ""
+msgstr "Billurlaştırıcı"
 
 #: src/crystalizer/crystalizer.cc:32 src/stereo_plugin/stereo.cc:45
 msgid "Intensity:"
-msgstr ""
+msgstr "Yoğunluk:"
 
 #: src/crystalizer/crystalizer.cc:43
 msgid "Crystalizer"
-msgstr ""
+msgstr "Billurlaştırıcı"
 
-#: src/cue/cue.cc:37
+#: src/cue/cue.cc:42
 msgid "Cue Sheet Plugin"
-msgstr ""
+msgstr "İşaret Sayfası Eklentisi"
 
-#: src/delete-files/delete-files.cc:46 src/delete-files/delete-files.cc:146
+#: src/delete-files/delete-files.cc:53 src/delete-files/delete-files.cc:215
+#: src/delete-files/delete-files.cc:230
 msgid "Delete Files"
 msgstr "Dosyaları Sil"
 
-#: src/delete-files/delete-files.cc:75
+#: src/delete-files/delete-files.cc:120
+msgid "No files are selected."
+msgstr "Hiçbir dosya seçilmedi."
+
+#: src/delete-files/delete-files.cc:125
 #, c-format
-msgid "Error moving %s to trash: %s."
-msgstr ""
+msgid "Do you want to move %s to the trash?"
+msgstr "%s'i çöpe taşımak istiyor musunuz?"
 
-#: src/delete-files/delete-files.cc:86
+#: src/delete-files/delete-files.cc:126
 #, c-format
-msgid "Error deleting %s: %s."
-msgstr ""
+msgid "Do you want to permanently delete %s?"
+msgstr "%s'i kalıcı olarak silmek istiyor musunuz?"
 
-#: src/delete-files/delete-files.cc:117
+#: src/delete-files/delete-files.cc:133
 #, c-format
-msgid "Error deleting %s: not a local file."
-msgstr ""
+msgid "Do you want to move %d files to the trash?"
+msgstr "%d dosyalarını çöp kutusuna taşımak istiyor musunuz? "
 
 #: src/delete-files/delete-files.cc:134
-msgid "Do you want to move the selected files to the trash?"
-msgstr ""
-
-#: src/delete-files/delete-files.cc:135
-msgid "Move to Trash"
-msgstr "Çöp kutusuna taşı"
+#, c-format
+msgid "Do you want to permanently delete %d files?"
+msgstr "%d dosyaları kalıcı olarak silmek istiyor musunuz?"
 
-#: src/delete-files/delete-files.cc:140
-msgid "Do you want to permanently delete the selected files?"
-msgstr "Seçilen dosyaları kalıcı olarak silmek istiyor musunuz?"
+#: src/delete-files/delete-files.cc:146
+msgid "Move to trash"
+msgstr "Çöpe taşı"
 
-#: src/delete-files/delete-files.cc:141 src/skins/preset-list.cc:411
-#: src/skins/preset-list.cc:427
+#: src/delete-files/delete-files.cc:146
 msgid "Delete"
 msgstr "Sil"
 
-#: src/delete-files/delete-files.cc:145 src/skins/preset-browser.cc:56
-#: src/skins/preset-list.cc:307 src/skins/ui_playlist.cc:221
+#: src/delete-files/delete-files.cc:213 src/delete-files/delete-files.cc:235
+#: src/skins-qt/search-select.cc:102 src/skins/search-select.cc:78
 msgid "Cancel"
 msgstr "İptal"
 
-#: src/delete-files/delete-files.cc:166
+#: src/delete-files/delete-files.cc:267
 msgid "Delete Selected Files"
 msgstr "Seçilen Dosyaları Sil"
 
-#: src/delete-files/delete-files.cc:181
+#: src/delete-files/delete-files.cc:287
 msgid "Delete Method"
-msgstr ""
+msgstr "Silme Yöntemi"
 
-#: src/delete-files/delete-files.cc:182
+#: src/delete-files/delete-files.cc:288
 msgid "Move to trash instead of deleting immediately"
-msgstr ""
+msgstr "Hemen silmek yerine çöp kutusuna taşı"
 
 #: src/echo_plugin/echo.cc:9
 msgid ""
@@ -1100,38 +1083,43 @@
 "Surround echo by Carl van Schaik, 1999\n"
 "Updated for Audacious by William Pitcock and John Lindgren, 2010-2014"
 msgstr ""
+"Yankı Eklentisi\n"
+"Johan Levin, 1999\n"
+"Surround yankısı Carl van Schaik, 1999\n"
+"Auducious tarafından William Pitcock ve John Lindgren tarafından "
+"güncellendi, 2010-2014"
 
 #: src/echo_plugin/echo.cc:21
 msgid "Echo"
-msgstr ""
+msgstr "Yankı"
 
-#: src/echo_plugin/echo.cc:22 src/modplug/plugin_main.cc:73
-#: src/modplug/plugin_main.cc:83
+#: src/echo_plugin/echo.cc:22 src/modplug/plugin_main.cc:72
+#: src/modplug/plugin_main.cc:82
 msgid "Delay:"
-msgstr ""
+msgstr "Gecikme:"
 
-#: src/echo_plugin/echo.cc:24 src/modplug/plugin_main.cc:73
-#: src/modplug/plugin_main.cc:83
+#: src/echo_plugin/echo.cc:24 src/modplug/plugin_main.cc:72
+#: src/modplug/plugin_main.cc:82 src/xsf/plugin.cc:445
 msgid "ms"
-msgstr ""
+msgstr "ms"
 
 #: src/echo_plugin/echo.cc:25
 msgid "Feedback:"
-msgstr ""
+msgstr "Geribesleme:"
 
-#: src/echo_plugin/echo.cc:28 src/modplug/plugin_main.cc:87
+#: src/echo_plugin/echo.cc:28 src/modplug/plugin_main.cc:86
 msgid "Volume:"
-msgstr ""
+msgstr "Hacim:"
 
 #: src/echo_plugin/echo.cc:39
 msgid "Echo"
-msgstr ""
+msgstr "Yankı"
 
-#: src/ffaudio/ffaudio-core.cc:41
+#: src/ffaudio/ffaudio-core.cc:50
 msgid "FFmpeg Plugin"
-msgstr ""
+msgstr "FFmpeg Eklentisi"
 
-#: src/ffaudio/ffaudio-core.cc:571
+#: src/ffaudio/ffaudio-core.cc:649
 msgid ""
 "Multi-format audio decoding plugin for Audacious using\n"
 "FFmpeg multimedia framework (http://www.ffmpeg.org/)\n"
@@ -1140,262 +1128,359 @@
 "William Pitcock <nenolod@nenolod.net>\n"
 "Matti Hämäläinen <ccr@tnsp.org>"
 msgstr ""
+"FFmpeg multimedya çerçevesini kullanarak Audacious\n"
+" için çok biçimli ses kod çözme eklentisi (http://www.ffmpeg.org/)\n"
+"\n"
+"Audacious eklentisi:\n"
+"William Pitcock <nenolod@nenolod.net>\n"
+"Matti Hämäläinen <ccr@tnsp.org>"
 
-#: src/filewriter/filewriter.cc:45
+#: src/filewriter/filewriter.cc:48
 msgid "FileWriter Plugin"
+msgstr "Dosya Yazma Eklentisi"
+
+#: src/filewriter/filewriter.cc:316
+#, c-format
+msgid ""
+"Error opening %s:\n"
+"%s"
 msgstr ""
+"%s açılırken hata:\n"
+"%s"
 
-#: src/filewriter/filewriter.cc:386
-msgid "Output file format:"
-msgstr "Çıktı dosya biçimi:"
+#: src/filewriter/filewriter.cc:358
+msgid ""
+"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 ""
+"Bu program ücretsiz bir yazılımdır; Özgür Yazılım Vakfı tarafından "
+"yayımlanan GNU Genel Kamu Lisansı şartlarına göre yeniden dağıtabilir ve/"
+"veya değiştirebilirsiniz; lisansın 2 numaralı sürümü veya (seçimlerinize "
+"göre) herhangi bir sonraki sürümü.\n"
+"Bu program yararlı olacağı umuduyla dağıtılır, ancak HERHANGİ BİR GARANTİ "
+"OLMAKSIZIN; SATILABİLİRLİK veya BELİRLİ BİR AMACA UYGUNLUĞU'nun zımni "
+"garantisi dahi olmadan. Daha fazla bilgi için GNU Genel Kamu Lisansına "
+"bakınız.\n"
+"\n"
+"Bu programla birlikte GNU Genel Kamu Lisansının bir kopyasını almış "
+"olmalısınız; eğer değilse, Free Software Foundation, Inc., 51 Franklin "
+"Street, Beşinci Kat, Boston, MA 02110-1301, ABD'ye yazın."
 
-#: src/filewriter/filewriter.cc:403
-msgid "Configure"
-msgstr "Yapılandır"
+#: src/filewriter/filewriter.cc:385
+msgid "Output file format:"
+msgstr "Çıkış dosya biçimi:"
 
-#: src/filewriter/filewriter.cc:413
+#: src/filewriter/filewriter.cc:389
 msgid "Save into original directory"
 msgstr "Orjinal dizine kaydet"
 
-#: src/filewriter/filewriter.cc:417
-msgid "Save into custom directory"
+#: src/filewriter/filewriter.cc:392
+msgid "Save into custom directory:"
 msgstr "Özel dizine kaydet"
 
-#: src/filewriter/filewriter.cc:427
-msgid "Output file folder:"
-msgstr "Çıktı dosya klasörü:"
-
-#: src/filewriter/filewriter.cc:431
-msgid "Pick a folder"
-msgstr "Dizin seçimi"
-
-#: src/filewriter/filewriter.cc:444
+#: src/filewriter/filewriter.cc:400
 msgid "Generate file name from:"
-msgstr ""
+msgstr "Şuradan dosya adı oluştur:"
 
-#: src/filewriter/filewriter.cc:448
-msgid "Original file tag"
-msgstr ""
-
-#: src/filewriter/filewriter.cc:453
+#: src/filewriter/filewriter.cc:401
 msgid "Original file name"
-msgstr ""
+msgstr "Özgün dosya adı"
 
-#: src/filewriter/filewriter.cc:459
-msgid "Include original file name extension"
-msgstr ""
+#: src/filewriter/filewriter.cc:404
+msgid "Original file name (no suffix)"
+msgstr "Özgün dosya adı (son ek yok)"
 
-#: src/filewriter/filewriter.cc:468
-msgid "Prepend track number to file name"
-msgstr ""
+#: src/filewriter/filewriter.cc:407
+msgid "Original file tag"
+msgstr "Özgün dosya etiketi"
 
-#: src/filewriter/filewriter.cc:484
-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.cc:411
+msgid "Prepend track number to file name"
+msgstr "Parça numarasını dosya adına ekle"
 
-#: src/filewriter/mp3.cc:40 src/filewriter/mp3.cc:717
+#: src/filewriter/filewriter.cc:417 src/filewriter/filewriter.cc:449
 msgid "Auto"
 msgstr "Otomatik"
 
-#: src/filewriter/mp3.cc:40
+#: src/filewriter/filewriter.cc:418
+msgid "8000 Hz"
+msgstr "8000 Hz"
+
+#: src/filewriter/filewriter.cc:419
+msgid "11025 Hz"
+msgstr "11025 Hz"
+
+#: src/filewriter/filewriter.cc:420
+msgid "12000 Hz"
+msgstr "12000 Hz"
+
+#: src/filewriter/filewriter.cc:421
+msgid "16000 Hz"
+msgstr "16000 Hz"
+
+#: src/filewriter/filewriter.cc:422
+msgid "22050 Hz"
+msgstr "22050 Hz"
+
+#: src/filewriter/filewriter.cc:423
+msgid "24000 Hz"
+msgstr "24000 Hz"
+
+#: src/filewriter/filewriter.cc:424
+msgid "32000 Hz"
+msgstr "32000 Hz"
+
+#: src/filewriter/filewriter.cc:425 src/xsf/plugin.cc:430
+msgid "44100 Hz"
+msgstr "44100 Hz"
+
+#: src/filewriter/filewriter.cc:426 src/xsf/plugin.cc:431
+msgid "48000 Hz"
+msgstr "48000 Hz"
+
+#: src/filewriter/filewriter.cc:430
+msgid "8 kbit/s"
+msgstr "8 kbit/s"
+
+#: src/filewriter/filewriter.cc:431
+msgid "16 kbit/s"
+msgstr "16 kbit/s"
+
+#: src/filewriter/filewriter.cc:432
+msgid "32 kbit/s"
+msgstr "32 kbit/s"
+
+#: src/filewriter/filewriter.cc:433
+msgid "40 kbit/s"
+msgstr "40 kbit/s"
+
+#: src/filewriter/filewriter.cc:434
+msgid "48 kbit/s"
+msgstr "48 kbit/s"
+
+#: src/filewriter/filewriter.cc:435
+msgid "56 kbit/s"
+msgstr "56 kbit/s"
+
+#: src/filewriter/filewriter.cc:436
+msgid "64 kbit/s"
+msgstr "64 kbit/s"
+
+#: src/filewriter/filewriter.cc:437
+msgid "80 kbit/s"
+msgstr "80 kbit/s"
+
+#: src/filewriter/filewriter.cc:438
+msgid "96 kbit/s"
+msgstr "96 kbit/s"
+
+#: src/filewriter/filewriter.cc:439
+msgid "112 kbit/s"
+msgstr "112 kbit/s"
+
+#: src/filewriter/filewriter.cc:440
+msgid "128 kbit/s"
+msgstr "128 kbit/s"
+
+#: src/filewriter/filewriter.cc:441
+msgid "160 kbit/s"
+msgstr "160 kbit/s"
+
+#: src/filewriter/filewriter.cc:442
+msgid "192 kbit/s"
+msgstr "192 kbit/s"
+
+#: src/filewriter/filewriter.cc:443
+msgid "224 kbit/s"
+msgstr "224 kbit/s"
+
+#: src/filewriter/filewriter.cc:444
+msgid "256 kbit/s"
+msgstr "256 kbit/s"
+
+#: src/filewriter/filewriter.cc:445
+msgid "320 kbit/s"
+msgstr "320 kbit/s"
+
+#: src/filewriter/filewriter.cc:450
 msgid "Joint Stereo"
 msgstr "Birleşik Stereo"
 
-#: src/filewriter/mp3.cc:41 src/modplug/plugin_main.cc:58
-#: src/mpg123/mpg123.cc:248
+#: src/filewriter/filewriter.cc:451 src/modplug/plugin_main.cc:57
+#: src/mpg123/mpg123.cc:259
 msgid "Stereo"
 msgstr "Stereo"
 
-#: src/filewriter/mp3.cc:41 src/modplug/plugin_main.cc:57
-#: src/mpg123/mpg123.cc:248
+#: src/filewriter/filewriter.cc:452 src/modplug/plugin_main.cc:56
+#: src/mpg123/mpg123.cc:260
 msgid "Mono"
 msgstr "Mono"
 
-#: src/filewriter/mp3.cc:657
-msgid "MP3 Configuration"
-msgstr "MP3 Yapılandırması"
-
-#: src/filewriter/mp3.cc:658
-msgid "_OK"
-msgstr ""
-
-#: src/filewriter/mp3.cc:681
-msgid "Algorithm Quality:"
-msgstr "Algoritma Kalitesi:"
-
-#: src/filewriter/mp3.cc:706
-msgid "Output Sample Rate:"
-msgstr ""
+#: src/filewriter/filewriter.cc:456
+msgid "VBR"
+msgstr "VBR"
+
+#: src/filewriter/filewriter.cc:457
+msgid "ABR"
+msgstr "ABR"
+
+#: src/filewriter/filewriter.cc:478
+msgid "Algorithm quality:"
+msgstr "Algoritma kalitesi:"
 
-#: src/filewriter/mp3.cc:733
-msgid "(Hz)"
-msgstr "(Hz)"
-
-#: src/filewriter/mp3.cc:740
-msgid "Bitrate / Compression Ratio:"
-msgstr ""
-
-#: src/filewriter/mp3.cc:764
-msgid "Bitrate (kbps):"
-msgstr "Bit oranı (kbps):"
+#: src/filewriter/filewriter.cc:484
+msgid "Bitrate:"
+msgstr "Bit oranı:"
 
-#: src/filewriter/mp3.cc:796
+#: src/filewriter/filewriter.cc:491
 msgid "Compression ratio:"
 msgstr "Sıkıştırma oranı:"
 
-#: src/filewriter/mp3.cc:820
-msgid "Audio Mode:"
-msgstr "Ses Kipi:"
-
-#: src/filewriter/mp3.cc:845
-msgid "Miscellaneous:"
-msgstr ""
+#: src/filewriter/filewriter.cc:498
+msgid "Audio mode:"
+msgstr "Ses modu:"
 
-#: src/filewriter/mp3.cc:856
+#: src/filewriter/filewriter.cc:501
 msgid "Enforce strict ISO compliance"
-msgstr ""
+msgstr "ISO standartlarına mutlak uyum gözetmeye zorla"
 
-#: src/filewriter/mp3.cc:867
+#: src/filewriter/filewriter.cc:503
 msgid "Error protection"
 msgstr "Hata koruması"
 
-#: src/filewriter/mp3.cc:879 src/filewriter/vorbis.cc:206
-msgid "Quality"
-msgstr "Kalite"
-
-#: src/filewriter/mp3.cc:888
+#: src/filewriter/filewriter.cc:508
 msgid "Enable VBR/ABR"
 msgstr "VBR/ABR etkinleştir"
 
-#: src/filewriter/mp3.cc:898
+#: src/filewriter/filewriter.cc:510
 msgid "Type:"
 msgstr "Tür:"
 
-#: src/filewriter/mp3.cc:931
-msgid "VBR Options:"
-msgstr "VBR Seçenekleri:"
-
-#: src/filewriter/mp3.cc:947
-msgid "Minimum bitrate (kbps):"
-msgstr "En düşük bit oranı (kbps):"
-
-#: src/filewriter/mp3.cc:973
-msgid "Maximum bitrate (kbps):"
-msgstr "En yüksek bit oranı (kbps):"
+#: src/filewriter/filewriter.cc:514
+msgid "Minimum bitrate:"
+msgstr "En düşük bit oranı:"
+
+#: src/filewriter/filewriter.cc:518
+msgid "Maximum bitrate:"
+msgstr "En yüksek bit oranı:"
+
+#: src/filewriter/filewriter.cc:522
+msgid "Average bitrate:"
+msgstr "Ortalama bit oranı:"
 
-#: src/filewriter/mp3.cc:995
-msgid "Strictly enforce minimum bitrate"
-msgstr "En düşük bit oranını tam olarak zorla"
-
-#: src/filewriter/mp3.cc:1007
-msgid "ABR Options:"
-msgstr "ABR Seçenekleri:"
-
-#: src/filewriter/mp3.cc:1017
-msgid "Average bitrate (kbps):"
-msgstr "Ortalama bit oranı (kbps):"
-
-#: src/filewriter/mp3.cc:1044
+#: src/filewriter/filewriter.cc:526
 msgid "VBR quality level:"
 msgstr "VBR kalite seviyesi:"
 
-#: src/filewriter/mp3.cc:1063
-msgid "Omit Xing VBR header"
-msgstr ""
+#: src/filewriter/filewriter.cc:530
+msgid "Strictly enforce minimum bitrate"
+msgstr "En düşük bit oranını tam olarak zorla"
 
-#: src/filewriter/mp3.cc:1076
-msgid "VBR/ABR"
-msgstr "VBR/ABR"
+#: src/filewriter/filewriter.cc:533
+msgid "Omit Xing VBR header"
+msgstr "Xing VBR başlığını atla"
 
-#: src/filewriter/mp3.cc:1085
-msgid "Frame Parameters:"
-msgstr ""
+#: src/filewriter/filewriter.cc:539
+msgid "Frame Headers"
+msgstr "Çerçeve Başlıkları"
 
-#: src/filewriter/mp3.cc:1097
+#: src/filewriter/filewriter.cc:540
 msgid "Mark as copyright"
 msgstr "Telif hakkı olarak işaretle"
 
-#: src/filewriter/mp3.cc:1108
+#: src/filewriter/filewriter.cc:542
 msgid "Mark as original"
-msgstr "Orijinal olarak işaretle"
+msgstr "Özgün olarak işaretle"
 
-#: src/filewriter/mp3.cc:1120
-msgid "ID3 Parameters:"
-msgstr ""
+#: src/filewriter/filewriter.cc:544
+msgid "ID3 Tags"
+msgstr "ID3 Etiketleri"
 
-#: src/filewriter/mp3.cc:1131
+#: src/filewriter/filewriter.cc:545
 msgid "Force addition of version 2 tag"
 msgstr "sürüm 2 etkiketin eklenmesini zorla"
 
-#: src/filewriter/mp3.cc:1141
+#: src/filewriter/filewriter.cc:547
 msgid "Only add v1 tag"
 msgstr "Sadece v1 etiketini ekle"
 
-#: src/filewriter/mp3.cc:1148
+#: src/filewriter/filewriter.cc:549
 msgid "Only add v2 tag"
 msgstr "Sadece v2 etiketini ekle"
 
-#: src/filewriter/mp3.cc:1169
+#: src/filewriter/filewriter.cc:554
+msgid "Quality"
+msgstr "Kalite"
+
+#: src/filewriter/filewriter.cc:555
+msgid "VBR/ABR"
+msgstr "VBR/ABR"
+
+#: src/filewriter/filewriter.cc:556
 msgid "Tags"
 msgstr "Etiketler:"
 
-#: src/filewriter/vorbis.cc:196
-msgid "Vorbis Encoder Configuration"
-msgstr "Vorbis Kodlayıcı Ayarları"
-
-#: src/filewriter/vorbis.cc:219
-msgid "Quality level (0 - 10):"
-msgstr "Kalite seviyesi (0 - 10):"
+#: src/filewriter/filewriter.cc:566
+msgid "Quality (0-1):"
+msgstr "Kalite (0-1):"
 
-#: src/flacng/flacng.h:35
+#: src/filewriter/filewriter.cc:573 src/skins-qt/skins_cfg.cc:307
+#: src/skins/skins_cfg.cc:289
+msgid "General"
+msgstr "Genel"
+
+#: src/flac/flacng.h:36
 msgid "FLAC Decoder"
-msgstr ""
+msgstr "FLAC Çözücü"
 
-#: src/flacng/metadata.cc:351 src/wavpack/wavpack.cc:209
+#: src/flac/metadata.cc:296 src/wavpack/wavpack.cc:215
 msgid "lossless"
 msgstr "kayıpsız"
 
-#: src/flacng/plugin.cc:169
+#: src/flac/plugin.cc:214
 msgid ""
 "Original code by\n"
 "Ralf Ertzinger <ralf@skytale.net>\n"
 "\n"
 "http://www.skytale.net/projects/bmp-flac2/"
 msgstr ""
+"Özgün kod\n"
+"Ralf Ertzinger <ralf@skytale.net> tarafından\n"
+"\n"
+"http://www.skytale.net/projects/bmp-flac2/"
 
 #: src/gio/gio.cc:34
 msgid ""
 "GIO Plugin for Audacious\n"
 "Copyright 2009-2012 John Lindgren"
 msgstr ""
+"Audacious için GIO Eklentisi \n"
+"Telif Hakkı 2009-2012 John Lindgren"
 
 #: src/gio/gio.cc:42
 msgid "GIO Plugin"
-msgstr ""
+msgstr "GIO Eklentisi"
 
-#: src/gio/gio.cc:153
+#: src/gio/gio.cc:152
 msgid "Read-and-append mode not supported"
-msgstr ""
+msgstr "Okuma-ve-ekleme modu desteklenmiyor"
 
-#: src/gio/gio.cc:166
+#: src/gio/gio.cc:165
 msgid "Invalid open mode"
-msgstr ""
+msgstr "Geçersiz açma modu"
 
-#: src/gl-spectrum/gl-spectrum.cc:51
+#: src/glspectrum/gl-spectrum.cc:52
 msgid ""
 "OpenGL Spectrum Analyzer for Audacious\n"
 "Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
@@ -1406,744 +1491,945 @@
 "\n"
 "License: GPLv2+"
 msgstr ""
-
-#: src/gl-spectrum/gl-spectrum.cc:62
-msgid "OpenGL Spectrum Analyzer"
-msgstr ""
-
-#: src/gl-spectrum-qt/gl-spectrum.cc:41
-msgid ""
-"OpenGL Spectrum Analyzer for Audacious\n"
-"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
-"Copyright 2014 William Pitcock\n"
+"Auducious için OpenGL İzgesel Çözümleyici\n"
+"Telif Hakkı 2013 Christophe Budé, John Lindgren ve Carlo Bramini\n"
 "\n"
-"Based on the XMMS plugin:\n"
-"Copyright 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson, and "
+"XMMS eklentisine dayanarak:\n"
+"Telif Hakkı 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson ve "
 "4Front Technologies\n"
 "\n"
-"License: GPLv2+"
-msgstr ""
-
-#: src/gl-spectrum-qt/gl-spectrum.cc:53
-msgid "OpenGL Spectrum Analyzer (Qt)"
-msgstr ""
-
-#: src/gnomeshortcuts/gnomeshortcuts.cc:38
-msgid "GNOME Shortcuts"
-msgstr ""
-
-#: src/gnomeshortcuts/gnomeshortcuts.cc:54
-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 ""
+"Lisans: GPLv2+"
 
-#: src/gtkui/columns.cc:35
-msgid "Entry number"
-msgstr "Sayı girin"
+#: src/glspectrum/gl-spectrum.cc:63 src/qtglspectrum/gl-spectrum.cc:53
+msgid "OpenGL Spectrum Analyzer"
+msgstr "Opengl İzgesel Çözümleyici"
 
-#: src/gtkui/columns.cc:36 src/playlist-manager/playlist-manager.cc:225
-#: src/qtui/playlist_model.cc:123
+#: src/gtkui/columns.cc:36 src/moonstone/playlist_model.cc:38
+#: src/qtui/playlist_model.cc:33
+msgid "Entry Number"
+msgstr "Sayı Girin"
+
+#: src/gtkui/columns.cc:37 src/moonstone/playlist_model.cc:38
+#: src/moonstone/playlist_selection.cc:64
+#: src/playlist-manager/playlist-manager.cc:200
+#: src/playlist-manager-qt/playlist-manager-qt.cc:188
+#: src/qtui/playlist_model.cc:33 src/streamtuner/icecast-model.cc:120
+#: src/streamtuner/ihr-model.cc:159 src/streamtuner/shoutcast-model.cc:122
 msgid "Title"
 msgstr "Başlık"
 
-#: src/gtkui/columns.cc:37 src/qtui/playlist_model.cc:125
+#: src/gtkui/columns.cc:38 src/moonstone/playlist_model.cc:39
+#: src/qtui/playlist_model.cc:33
 msgid "Artist"
 msgstr "Sanatçı"
 
-#: src/gtkui/columns.cc:38
+#: src/gtkui/columns.cc:39 src/moonstone/playlist_model.cc:39
+#: src/qtui/playlist_model.cc:33
 msgid "Year"
 msgstr "Yıl"
 
-#: src/gtkui/columns.cc:39 src/qtui/playlist_model.cc:127
+#: src/gtkui/columns.cc:40 src/moonstone/playlist_model.cc:39
+#: src/qtui/playlist_model.cc:34
 msgid "Album"
 msgstr "Albüm"
 
-#: src/gtkui/columns.cc:40
-msgid "Album artist"
-msgstr ""
+#: src/gtkui/columns.cc:41 src/moonstone/playlist_model.cc:40
+#: src/qtui/playlist_model.cc:34
+msgid "Album Artist"
+msgstr "Albüm Sanatçısı"
 
-#: src/gtkui/columns.cc:41
+#: src/gtkui/columns.cc:42 src/moonstone/playlist_model.cc:40
+#: src/qtui/playlist_model.cc:34
 msgid "Track"
 msgstr "Parça"
 
-#: src/gtkui/columns.cc:42
+#: src/gtkui/columns.cc:43 src/moonstone/playlist_model.cc:40
+#: src/qtui/playlist_model.cc:34 src/streamtuner/icecast-model.cc:123
+#: src/streamtuner/shoutcast-model.cc:125
+#: src/streamtuner/shoutcast-model.cc:236
 msgid "Genre"
-msgstr ""
+msgstr "Tür"
 
-#: src/gtkui/columns.cc:43
-msgid "Queue position"
-msgstr "Liste sırası"
+#: src/gtkui/columns.cc:44 src/moonstone/playlist_model.cc:41
+#: src/qtui/playlist_model.cc:35
+msgid "Queue Position"
+msgstr "Sıra Konumu"
 
-#: src/gtkui/columns.cc:44
+#: src/gtkui/columns.cc:45 src/moonstone/playlist_model.cc:41
+#: src/qtui/playlist_model.cc:35
 msgid "Length"
 msgstr "Uzunluk"
 
-#: src/gtkui/columns.cc:45
-msgid "File path"
-msgstr "Dosya yolu"
-
-#: src/gtkui/columns.cc:47
-msgid "Custom title"
-msgstr "Özel başlık"
+#: src/gtkui/columns.cc:46 src/moonstone/playlist_model.cc:41
+#: src/qtui/playlist_model.cc:35
+msgid "File Path"
+msgstr "Dosya Yolu"
+
+#: src/gtkui/columns.cc:47 src/moonstone/playlist_model.cc:42
+#: src/qtui/playlist_model.cc:35
+msgid "File Name"
+msgstr "Dosya Adı"
+
+#: src/gtkui/columns.cc:48 src/moonstone/playlist_model.cc:42
+#: src/qtui/playlist_model.cc:36
+msgid "Custom Title"
+msgstr "Özel Başlık"
 
-#: src/gtkui/columns.cc:48
+#: src/gtkui/columns.cc:49 src/moonstone/playlist_model.cc:42
+#: src/qtui/playlist_model.cc:36 src/streamtuner/icecast-model.cc:129
+#: src/streamtuner/shoutcast-model.cc:134
 msgid "Bitrate"
 msgstr "Bit oranı"
 
-#: src/gtkui/columns.cc:308
-msgid "Available columns"
+#: src/gtkui/columns.cc:50 src/moonstone/playlist_model.cc:43
+#: src/qtui/playlist_model.cc:36
+msgid "Comment"
+msgstr "Yorum"
+
+#: src/gtkui/columns.cc:51 src/qtui/playlist_model.cc:36
+msgid "Publisher"
+msgstr "Yayıncı"
+
+#: src/gtkui/columns.cc:52 src/qtui/playlist_model.cc:37
+msgid "Catalog Number"
+msgstr "Kalatog Numarası"
+
+#: src/gtkui/columns.cc:53 src/moonstone/playlist_model.cc:43
+#: src/qtui/playlist_model.cc:37
+msgid "Disc"
 msgstr ""
 
-#: src/gtkui/columns.cc:334
+#: src/gtkui/columns.cc:325
+msgid "Available columns"
+msgstr "Kullanılabilir sütunlar"
+
+#: src/gtkui/columns.cc:351
 msgid "Displayed columns"
-msgstr ""
+msgstr "Görüntülenen sütunlar"
 
-#: src/gtkui/layout.cc:72 src/search-tool/search-tool.cc:40
+#: src/gtkui/layout.cc:74 src/search-tool-qt/search-tool-qt.cc:58
+#: src/search-tool/search-tool.cc:49
 msgid "Search Tool"
 msgstr "Arama Aracı"
 
-#: src/gtkui/layout.cc:167
+#: src/gtkui/layout.cc:170
 msgid "Dock at Left"
 msgstr "Sola kenetle"
 
-#: src/gtkui/layout.cc:167
+#: src/gtkui/layout.cc:170
 msgid "Dock at Right"
 msgstr "Sağa kenetle"
 
-#: src/gtkui/layout.cc:168
+#: src/gtkui/layout.cc:171
 msgid "Dock at Top"
 msgstr "Üste kenetle"
 
-#: src/gtkui/layout.cc:168
+#: src/gtkui/layout.cc:171
 msgid "Dock at Bottom"
 msgstr "Aşağıya kenetle"
 
-#: src/gtkui/layout.cc:168
+#: src/gtkui/layout.cc:171
 msgid "Undock"
 msgstr "Çıkar"
 
-#: src/gtkui/layout.cc:168 src/ladspa/plugin.cc:531
+#: src/gtkui/layout.cc:171 src/ladspa/plugin.cc:540
 msgid "Disable"
 msgstr "Devre Dışı"
 
-#: src/gtkui/menus.cc:126 src/qtui/main_window_actions.cc:93
-#: src/statusicon/statusicon.cc:276
+#: src/gtkui/menus.cc:79 src/qtui/menus.cc:107
+#: src/statusicon-qt/statusicon.cc:115 src/statusicon/statusicon.cc:286
 msgid "_Open Files ..."
 msgstr "_Dosya Aç ..."
 
-#: src/gtkui/menus.cc:127
+#: src/gtkui/menus.cc:80 src/qtui/menus.cc:111
 msgid "Open _URL ..."
-msgstr "URL _Aç ..."
+msgstr "_URL Aç ..."
 
-#: src/gtkui/menus.cc:128 src/qtui/main_window_actions.cc:95
+#: src/gtkui/menus.cc:81 src/qtui/menus.cc:113
 msgid "_Add Files ..."
-msgstr ""
+msgstr "Dosy_aları Ekle ..."
 
-#: src/gtkui/menus.cc:129
+#: src/gtkui/menus.cc:82 src/qtui/menus.cc:118
 msgid "Add U_RL ..."
 msgstr "U_RL Ekle ..."
 
-#: src/gtkui/menus.cc:131
+#: src/gtkui/menus.cc:84 src/qtui/menus.cc:120
 msgid "Search _Library"
-msgstr ""
+msgstr "Kitap_lığı Ara"
 
-#: src/gtkui/menus.cc:133 src/qtui/main_window_actions.cc:98
+#: src/gtkui/menus.cc:86 src/qtui/menus.cc:123
 msgid "A_bout ..."
 msgstr "H_akkında"
 
-#: src/gtkui/menus.cc:134 src/qtui/main_window_actions.cc:99
+#: src/gtkui/menus.cc:87 src/qtui/menus.cc:125
 msgid "_Settings ..."
-msgstr ""
+msgstr "_Ayarlar ..."
 
-#: src/gtkui/menus.cc:135 src/qtui/main_window_actions.cc:103
-#: src/statusicon/statusicon.cc:284
+#: src/gtkui/menus.cc:88 src/qtui/menus.cc:131
+#: src/statusicon-qt/statusicon.cc:117 src/statusicon/statusicon.cc:288
 msgid "_Quit"
 msgstr "_Çık"
 
-#: src/gtkui/menus.cc:139 src/gtkui/menus.cc:262
-#: src/qtui/main_window_actions.cc:107 src/search-tool/search-tool.cc:641
-#: src/statusicon/statusicon.cc:278
+#: src/gtkui/menus.cc:92 src/gtkui/menus.cc:226
+#: src/moonstone/playlist_tabs.cc:306 src/qtui/menus.cc:135
+#: src/qtui/playlist_tabs.cc:331 src/search-tool-qt/search-tool-qt.cc:499
+#: src/search-tool/search-tool.cc:339 src/statusicon-qt/statusicon.cc:109
+#: src/statusicon/statusicon.cc:280
 msgid "_Play"
 msgstr "_Oynat"
 
-#: src/gtkui/menus.cc:140 src/qtui/main_window_actions.cc:108
-#: src/statusicon/statusicon.cc:279
+#: src/gtkui/menus.cc:93 src/qtui/menus.cc:137
+#: src/statusicon-qt/statusicon.cc:110 src/statusicon/statusicon.cc:281
 msgid "Paus_e"
 msgstr "_Duraklat"
 
-#: src/gtkui/menus.cc:141 src/qtui/main_window_actions.cc:109
-#: src/statusicon/statusicon.cc:280
+#: src/gtkui/menus.cc:94 src/qtui/menus.cc:139
+#: src/statusicon-qt/statusicon.cc:111 src/statusicon/statusicon.cc:282
 msgid "_Stop"
 msgstr "D_urdur"
 
-#: src/gtkui/menus.cc:142 src/qtui/main_window_actions.cc:110
-#: src/statusicon/statusicon.cc:277
+#: src/gtkui/menus.cc:95 src/qtui/menus.cc:141
+#: src/statusicon-qt/statusicon.cc:112 src/statusicon/statusicon.cc:283
 msgid "Pre_vious"
 msgstr "_Önceki"
 
-#: src/gtkui/menus.cc:143 src/qtui/main_window_actions.cc:111
-#: src/statusicon/statusicon.cc:281
+#: src/gtkui/menus.cc:96 src/qtui/menus.cc:143
+#: src/statusicon-qt/statusicon.cc:113 src/statusicon/statusicon.cc:284
 msgid "_Next"
 msgstr "_Sonraki"
 
-#: src/gtkui/menus.cc:145 src/qtui/main_window_actions.cc:113
+#: src/gtkui/menus.cc:97 src/qtui/menus.cc:145 src/skins/menus.cc:114
+#: src/skins-qt/menus.cc:105
+msgid "Previous Album"
+msgstr "Önceki Albüm"
+
+#: src/gtkui/menus.cc:98 src/qtui/menus.cc:146 src/skins/menus.cc:115
+#: src/skins-qt/menus.cc:106
+msgid "Next Album"
+msgstr "Sonraki Albüm"
+
+#: src/gtkui/menus.cc:100 src/qtui/menus.cc:148
 msgid "_Repeat"
 msgstr "_Tekrarla"
 
-#: src/gtkui/menus.cc:146 src/qtui/main_window_actions.cc:114
+#: src/gtkui/menus.cc:101 src/qtui/menus.cc:150
 msgid "S_huffle"
 msgstr "_Karıştır"
 
-#: src/gtkui/menus.cc:147 src/qtui/main_window_actions.cc:115
+#: src/gtkui/menus.cc:102 src/qtui/menus.cc:152
+msgid "Shuffle by Albu_m"
+msgstr "Albü_me göre karıştır"
+
+#: src/gtkui/menus.cc:103 src/qtui/menus.cc:155
 msgid "N_o Playlist Advance"
-msgstr ""
+msgstr "Oynatılabilir Çalma Listesi y_ok"
 
-#: src/gtkui/menus.cc:148 src/qtui/main_window_actions.cc:116
+#: src/gtkui/menus.cc:104 src/qtui/menus.cc:157
 msgid "Stop A_fter This Song"
-msgstr ""
+msgstr "Bu Şarkıdan Son_ra Dur"
 
-#: src/gtkui/menus.cc:150 src/gtkui/menus.cc:247
-#: src/qtui/main_window_actions.cc:118
+#: src/gtkui/menus.cc:106 src/gtkui/menus.cc:210 src/qtui/menus.cc:162
+#: src/qtui/menus.cc:294
 msgid "Song _Info ..."
 msgstr "_Şarkı Bilgisi ..."
 
-#: src/gtkui/menus.cc:151
+#: src/gtkui/menus.cc:107
 msgid "Jump to _Time ..."
-msgstr "Süre Atla"
+msgstr "Zamana Gi_t ..."
 
-#: src/gtkui/menus.cc:152
+#: src/gtkui/menus.cc:108
 msgid "_Jump to Song ..."
-msgstr "Şarkı Atla"
+msgstr "Şarkıya Git ..."
 
-#: src/gtkui/menus.cc:154
+#: src/gtkui/menus.cc:110 src/qtui/menus.cc:165
 msgid "Set Repeat Point _A"
-msgstr "Tekrarlama Başlancığı _A"
+msgstr "Tekrarlama Başlangıcı _A"
 
-#: src/gtkui/menus.cc:155
+#: src/gtkui/menus.cc:111 src/qtui/menus.cc:167
 msgid "Set Repeat Point _B"
 msgstr "Tekrarlama Sonu _B"
 
-#: src/gtkui/menus.cc:156
+#: src/gtkui/menus.cc:112 src/qtui/menus.cc:169
 msgid "_Clear Repeat Points"
 msgstr "_Tekrarlama Noktalarını Sil"
 
-#: src/gtkui/menus.cc:160 src/gtkui/menus.cc:167 src/gtkui/menus.cc:183
-#: src/qtui/main_window_actions.cc:122 src/qtui/main_window_actions.cc:129
-#: src/qtui/main_window_actions.cc:145
+#: src/gtkui/menus.cc:116 src/gtkui/menus.cc:123 src/gtkui/menus.cc:141
+#: src/qtui/menus.cc:173 src/qtui/menus.cc:180 src/qtui/menus.cc:198
 msgid "By _Title"
 msgstr "_Başlığa Göre"
 
-#: src/gtkui/menus.cc:161 src/qtui/main_window_actions.cc:123
+#: src/gtkui/menus.cc:117 src/qtui/menus.cc:174
 msgid "By _File Name"
-msgstr ""
+msgstr "_Dosya İsmine Göre"
 
-#: src/gtkui/menus.cc:162 src/qtui/main_window_actions.cc:124
+#: src/gtkui/menus.cc:118 src/qtui/menus.cc:175
 msgid "By File _Path"
 msgstr "_Dosya Yoluna Göre"
 
-#: src/gtkui/menus.cc:166 src/gtkui/menus.cc:182
-#: src/qtui/main_window_actions.cc:128 src/qtui/main_window_actions.cc:144
+#: src/gtkui/menus.cc:122 src/gtkui/menus.cc:140 src/qtui/menus.cc:179
+#: src/qtui/menus.cc:197
 msgid "By Track _Number"
 msgstr "Parça_Numarasına Göre"
 
-#: src/gtkui/menus.cc:168 src/gtkui/menus.cc:184
-#: src/qtui/main_window_actions.cc:130 src/qtui/main_window_actions.cc:146
+#: src/gtkui/menus.cc:124 src/gtkui/menus.cc:142 src/qtui/menus.cc:181
+#: src/qtui/menus.cc:199
 msgid "By _Artist"
 msgstr "_Sanatçıya Göre"
 
-#: src/gtkui/menus.cc:169 src/gtkui/menus.cc:185
-#: src/qtui/main_window_actions.cc:131 src/qtui/main_window_actions.cc:147
+#: src/gtkui/menus.cc:125 src/gtkui/menus.cc:143 src/qtui/menus.cc:182
+#: src/qtui/menus.cc:200
 msgid "By Al_bum"
-msgstr ""
+msgstr "Al_büme Göre"
 
-#: src/gtkui/menus.cc:170 src/gtkui/menus.cc:186
-#: src/qtui/main_window_actions.cc:132 src/qtui/main_window_actions.cc:148
+#: src/gtkui/menus.cc:126 src/gtkui/menus.cc:144 src/qtui/menus.cc:183
+#: src/qtui/menus.cc:201
 msgid "By Albu_m Artist"
-msgstr ""
+msgstr "Albü_m Sanatçısına Göre"
 
-#: src/gtkui/menus.cc:171 src/gtkui/menus.cc:187
-#: src/qtui/main_window_actions.cc:133 src/qtui/main_window_actions.cc:149
+#: src/gtkui/menus.cc:127 src/gtkui/menus.cc:145 src/qtui/menus.cc:184
+#: src/qtui/menus.cc:202
 msgid "By Release _Date"
 msgstr "Yayın Tarihi"
 
-#: src/gtkui/menus.cc:172 src/gtkui/menus.cc:188
-#: src/qtui/main_window_actions.cc:134 src/qtui/main_window_actions.cc:150
+#: src/gtkui/menus.cc:128 src/gtkui/menus.cc:146 src/qtui/menus.cc:185
+#: src/qtui/menus.cc:203
 msgid "By _Genre"
-msgstr ""
+msgstr "Türüne _Göre"
 
-#: src/gtkui/menus.cc:173 src/gtkui/menus.cc:189
-#: src/qtui/main_window_actions.cc:135 src/qtui/main_window_actions.cc:151
+#: src/gtkui/menus.cc:129 src/gtkui/menus.cc:147 src/qtui/menus.cc:186
+#: src/qtui/menus.cc:204
 msgid "By _Length"
-msgstr ""
+msgstr "Uzun_luğuna Göre"
 
-#: src/gtkui/menus.cc:174 src/gtkui/menus.cc:190
-#: src/qtui/main_window_actions.cc:136 src/qtui/main_window_actions.cc:152
+#: src/gtkui/menus.cc:130 src/gtkui/menus.cc:148 src/qtui/menus.cc:187
+#: src/qtui/menus.cc:205
 msgid "By _File Path"
-msgstr ""
+msgstr "_Dosya Yoluna Göre"
 
-#: src/gtkui/menus.cc:175 src/gtkui/menus.cc:191
-#: src/qtui/main_window_actions.cc:137 src/qtui/main_window_actions.cc:153
+#: src/gtkui/menus.cc:131 src/gtkui/menus.cc:149 src/qtui/menus.cc:188
+#: src/qtui/menus.cc:206
 msgid "By _Custom Title"
-msgstr "Özel Başlık"
+msgstr "Özel _Başlığa Göre"
 
-#: src/gtkui/menus.cc:177 src/gtkui/menus.cc:193
-#: src/qtui/main_window_actions.cc:139 src/qtui/main_window_actions.cc:155
-msgid "R_everse Order"
+#: src/gtkui/menus.cc:132 src/gtkui/menus.cc:150 src/qtui/menus.cc:189
+#: src/qtui/menus.cc:207
+msgid "By C_omment"
+msgstr "Y_oruma Göre"
+
+#: src/gtkui/menus.cc:133 src/gtkui/menus.cc:151 src/qtui/menus.cc:190
+#: src/qtui/menus.cc:208
+msgid "By D_isc Number"
 msgstr ""
 
-#: src/gtkui/menus.cc:178 src/gtkui/menus.cc:194
-#: src/qtui/main_window_actions.cc:140 src/qtui/main_window_actions.cc:156
+#: src/gtkui/menus.cc:135 src/gtkui/menus.cc:153 src/qtui/menus.cc:192
+#: src/qtui/menus.cc:210
+msgid "R_everse Order"
+msgstr "T_ersine Sıra"
+
+#: src/gtkui/menus.cc:136 src/gtkui/menus.cc:154 src/qtui/menus.cc:194
+#: src/qtui/menus.cc:212
 msgid "_Random Order"
 msgstr "_Rastgele Sipariş"
 
-#: src/gtkui/menus.cc:198 src/qtui/main_window_actions.cc:160
+#: src/gtkui/menus.cc:158 src/qtui/menus.cc:216
 msgid "_Play/Resume"
-msgstr ""
+msgstr "_Oynat/Devam et"
 
-#: src/gtkui/menus.cc:199 src/gtkui/menus.cc:251
-#: src/qtui/main_window_actions.cc:161
+#: src/gtkui/menus.cc:159 src/qtui/menus.cc:218
 msgid "_Refresh"
 msgstr "_Yenile"
 
-#: src/gtkui/menus.cc:201 src/qtui/main_window_actions.cc:163
+#: src/gtkui/menus.cc:161 src/qtui/menus.cc:222
 msgid "_Sort"
 msgstr "_Tür"
 
-#: src/gtkui/menus.cc:202 src/qtui/main_window_actions.cc:164
+#: src/gtkui/menus.cc:162 src/qtui/menus.cc:223
 msgid "Sort Se_lected"
-msgstr ""
+msgstr "Seçi_leni Sırala"
 
-#: src/gtkui/menus.cc:203 src/qtui/main_window_actions.cc:165
+#: src/gtkui/menus.cc:163 src/qtui/menus.cc:225
 msgid "Remove _Duplicates"
-msgstr ""
+msgstr "Kopyaları Kal_dır"
 
-#: src/gtkui/menus.cc:204 src/qtui/main_window_actions.cc:166
+#: src/gtkui/menus.cc:164 src/qtui/menus.cc:226
 msgid "Remove _Unavailable Files"
-msgstr ""
+msgstr "K_ullanılamayan Dosyaları Kaldır"
 
-#: src/gtkui/menus.cc:206 src/playlist-manager/playlist-manager.cc:244
-#: src/qtui/main_window_actions.cc:168
+#: src/gtkui/menus.cc:166 src/playlist-manager/playlist-manager.cc:219
+#: src/playlist-manager-qt/playlist-manager-qt.cc:348 src/qtui/menus.cc:229
 msgid "_New"
 msgstr "_Yeni"
 
-#: src/gtkui/menus.cc:207
+#: src/gtkui/menus.cc:167 src/qtui/menus.cc:230
 msgid "Ren_ame ..."
-msgstr ""
+msgstr "_Adlandır ..."
 
-#: src/gtkui/menus.cc:208 src/gtkui/menus.cc:264
-#: src/qtui/main_window_actions.cc:170
+#: src/gtkui/menus.cc:168 src/gtkui/menus.cc:228
+#: src/moonstone/playlist_tabs.cc:311 src/qtui/menus.cc:231
+#: src/qtui/playlist_tabs.cc:336
 msgid "Remo_ve"
-msgstr ""
+msgstr "_Kaldır"
 
-#: src/gtkui/menus.cc:210
+#: src/gtkui/menus.cc:170 src/qtui/menus.cc:233
 msgid "_Import ..."
 msgstr "_Yükle ..."
 
-#: src/gtkui/menus.cc:211
+#: src/gtkui/menus.cc:171 src/qtui/menus.cc:234
 msgid "_Export ..."
 msgstr "_Çıkart ..."
 
-#: src/gtkui/menus.cc:213
+#: src/gtkui/menus.cc:173 src/qtui/menus.cc:237
 msgid "Playlist _Manager ..."
-msgstr ""
+msgstr "Çal_ma Listesi Yöneticisi"
 
-#: src/gtkui/menus.cc:214 src/qtui/main_window_actions.cc:176
+#: src/gtkui/menus.cc:174 src/qtui/menus.cc:239
 msgid "_Queue Manager ..."
 msgstr "Sıra Yöneticisi ..."
 
-#: src/gtkui/menus.cc:218 src/qtui/main_window_actions.cc:180
+#: src/gtkui/menus.cc:178 src/qtui/menus.cc:243
 msgid "Volume _Up"
 msgstr "Sesi_Arttır"
 
-#: src/gtkui/menus.cc:219 src/qtui/main_window_actions.cc:181
+#: src/gtkui/menus.cc:179 src/qtui/menus.cc:245
 msgid "Volume _Down"
 msgstr "Sesi_Azalt"
 
-#: src/gtkui/menus.cc:221 src/qtui/main_window_actions.cc:183
-msgid "_Equalizer"
-msgstr "_Ekolayzır"
+#: src/gtkui/menus.cc:181 src/qtui/menus.cc:249
+msgid "_Equalizer ..."
+msgstr "_Ekolayzır ..."
 
-#: src/gtkui/menus.cc:223 src/qtui/main_window_actions.cc:185
+#: src/gtkui/menus.cc:182 src/qtui/menus.cc:251
 msgid "E_ffects ..."
-msgstr ""
+msgstr "E_fektler ..."
 
-#: src/gtkui/menus.cc:227
+#: src/gtkui/menus.cc:184
+msgid "_Record Stream"
+msgstr "Akışı _Kaydet"
+
+#: src/gtkui/menus.cc:185
+msgid "Audio _Settings ..."
+msgstr "_Ses Ayarları ..."
+
+#: src/gtkui/menus.cc:189 src/qtui/menus.cc:260
 msgid "Show _Menu Bar"
 msgstr "Menü_Çubuğunu Göster"
 
-#: src/gtkui/menus.cc:228
+#: src/gtkui/menus.cc:190 src/qtui/menus.cc:262
 msgid "Show I_nfo Bar"
 msgstr "Bilgi Çubuğunu Göster"
 
-#: src/gtkui/menus.cc:229
+#: src/gtkui/menus.cc:191 src/qtui/menus.cc:264
+msgid "Show Info Bar _Album Art"
+msgstr "Bilgi Çubuğu _Albüm Resmini Göster"
+
+#: src/gtkui/menus.cc:192 src/qtui/menus.cc:266
 msgid "Show Info Bar Vis_ualization"
-msgstr ""
+msgstr "Bilgi Ç_ubuğu Görselleştirmesini Göster"
 
-#: src/gtkui/menus.cc:230
+#: src/gtkui/menus.cc:193 src/qtui/menus.cc:268
 msgid "Show _Status Bar"
 msgstr "Durum Çubuğunu Göster"
 
-#: src/gtkui/menus.cc:232
+#: src/gtkui/menus.cc:195 src/qtui/menus.cc:272
 msgid "Show _Remaining Time"
-msgstr ""
+msgstr "Kalan Sü_reyi göster"
 
-#: src/gtkui/menus.cc:234
+#: src/gtkui/menus.cc:197 src/qtui/menus.cc:276 src/skins/menus.cc:157
+#: src/skins-qt/menus.cc:152
 msgid "_Visualizations ..."
-msgstr ""
+msgstr "_Görselleştirme ..."
 
-#: src/gtkui/menus.cc:238 src/qtui/main_window_actions.cc:189
+#: src/gtkui/menus.cc:201 src/qtui/menus.cc:280
 msgid "_File"
 msgstr "_Dosya"
 
-#: src/gtkui/menus.cc:239 src/qtui/main_window_actions.cc:190
+#: src/gtkui/menus.cc:202 src/qtui/menus.cc:281
 msgid "_Playback"
 msgstr "_Oynatma"
 
-#: src/gtkui/menus.cc:240 src/qtui/main_window_actions.cc:191
+#: src/gtkui/menus.cc:203 src/qtui/menus.cc:282
 msgid "P_laylist"
 msgstr "Çalma Listesi"
 
-#: src/gtkui/menus.cc:241 src/gtkui/menus.cc:258
-#: src/qtui/main_window_actions.cc:192
+#: src/gtkui/menus.cc:204 src/gtkui/menus.cc:222 src/qtui/menus.cc:283
+#: src/qtui/menus.cc:312
 msgid "_Services"
 msgstr "Servisler"
 
-#: src/gtkui/menus.cc:242 src/qtui/main_window_actions.cc:193
+#: src/gtkui/menus.cc:205 src/qtui/menus.cc:284
 msgid "_Output"
 msgstr "Çıktı"
 
-#: src/gtkui/menus.cc:243
+#: src/gtkui/menus.cc:206 src/qtui/menus.cc:285
 msgid "_View"
 msgstr "_Görünüm"
 
-#: src/gtkui/menus.cc:248
+#: src/gtkui/menus.cc:211 src/qtui/menus.cc:296
 msgid "_Queue/Unqueue"
-msgstr ""
+msgstr "_Kuyruğa Ekle/Kaldır"
 
-#: src/gtkui/menus.cc:250
+#: src/gtkui/menus.cc:213 src/qtui/menus.cc:299
 msgid "_Open Containing Folder"
-msgstr ""
+msgstr "İçeren _Dizini Aç"
 
-#: src/gtkui/menus.cc:253
+#: src/gtkui/menus.cc:214 src/qtui/menus.cc:301
+msgid "_Refresh Selected"
+msgstr "Seçilenle_ri Yenile"
+
+#: src/gtkui/menus.cc:216 src/qtui/menus.cc:304
 msgid "Cu_t"
 msgstr "Ke_s"
 
-#: src/gtkui/menus.cc:254
+#: src/gtkui/menus.cc:217 src/qtui/menus.cc:305
 msgid "_Copy"
 msgstr "_Kopyala"
 
-#: src/gtkui/menus.cc:255
+#: src/gtkui/menus.cc:218 src/qtui/menus.cc:306
 msgid "_Paste"
 msgstr "_Yapıştır"
 
-#: src/gtkui/menus.cc:256
+#: src/gtkui/menus.cc:219 src/qtui/menus.cc:307
+msgid "Paste at _End"
+msgstr "_Sonunda Yapıştır"
+
+#: src/gtkui/menus.cc:220 src/qtui/menus.cc:309
 msgid "Select _All"
 msgstr "Tümünü_Seç"
 
-#: src/gtkui/menus.cc:263
+#: src/gtkui/menus.cc:227 src/moonstone/playlist_tabs.cc:309
+#: src/qtui/playlist_tabs.cc:334
 msgid "_Rename ..."
-msgstr ""
+msgstr "Yeniden adlandı_r ..."
+
+#: src/gtkui/settings.cc:35 src/qtui/settings.cc:59
+msgid "Always"
+msgstr "Her zaman"
+
+#: src/gtkui/settings.cc:36 src/qtui/settings.cc:60
+msgid "Auto-hide"
+msgstr "Otomatik gizle"
 
-#: src/gtkui/settings.cc:35
+#: src/gtkui/settings.cc:37 src/qtui/settings.cc:61
+msgid "Never"
+msgstr "Asla"
+
+#: src/gtkui/settings.cc:41 src/qtui/settings.cc:64
 msgid "Playlist Tabs"
-msgstr ""
+msgstr "Çalma Listesi Sekmeleri"
 
-#: src/gtkui/settings.cc:36
-msgid "Always show tabs"
-msgstr ""
+#: src/gtkui/settings.cc:42 src/qtui/settings.cc:65
+msgid "Show playlist tabs:"
+msgstr "Çalma listesi sekmelerini göster:"
 
-#: src/gtkui/settings.cc:38
+#: src/gtkui/settings.cc:45 src/qtui/settings.cc:69
 msgid "Show entry counts"
-msgstr ""
+msgstr "Giriş sayılarını göster"
 
-#: src/gtkui/settings.cc:40
+#: src/gtkui/settings.cc:47 src/qtui/settings.cc:72
 msgid "Show close buttons"
 msgstr "Kapatma Butonu Göster"
 
-#: src/gtkui/settings.cc:42
+#: src/gtkui/settings.cc:49 src/qtui/settings.cc:75
 msgid "Playlist Columns"
-msgstr ""
+msgstr "Çalma Listesi Sütunları"
 
-#: src/gtkui/settings.cc:44
+#: src/gtkui/settings.cc:51 src/qtui/settings.cc:77
 msgid "Show column headers"
-msgstr ""
+msgstr "Sütun başlıklarını göster"
 
-#: src/gtkui/settings.cc:46 src/modplug/plugin_main.cc:106
-#: src/skins/skins_cfg.cc:263
-msgid "Miscellaneous"
+#: src/gtkui/settings.cc:53 src/qtui/settings.cc:82
+msgid "Make column headers clickable for sorting"
 msgstr ""
 
-#: src/gtkui/settings.cc:47
-msgid "Arrow keys seek by:"
-msgstr ""
+#: src/gtkui/settings.cc:56
+msgid "Use symbolic icons in toolbar"
+msgstr "Araç çubuğunda sembolik simgeler kullan"
 
-#: src/gtkui/settings.cc:50
+#: src/gtkui/settings.cc:58 src/qtui/settings.cc:86
 msgid "Scroll on song change"
-msgstr ""
+msgstr "Şarkı değişikliğinde kaydır"
 
-#: src/gtkui/ui_gtk.cc:71
+#: src/gtkui/ui_gtk.cc:82
 msgid "GTK Interface"
 msgstr "GTK Arayüzü"
 
-#: src/gtkui/ui_gtk.cc:222 src/skins/ui_main.cc:232
+#: src/gtkui/ui_gtk.cc:219 src/skins/main.cc:228 src/skins-qt/main.cc:231
 #, c-format
 msgid "%s - Audacious"
 msgstr "%s - Audacious"
 
-#: src/gtkui/ui_gtk.cc:225 src/qtui/main_window.cc:186
+#: src/gtkui/ui_gtk.cc:221 src/moonstone/main_window.cc:184
+#: src/qtui/main_window.cc:385
 msgid "Buffering ..."
-msgstr ""
+msgstr "Arabelleğe alınıyor ..."
 
-#: src/gtkui/ui_gtk.cc:228 src/skins/ui_main.cc:234 src/skins/ui_main.cc:1164
+#: src/gtkui/ui_gtk.cc:224 src/pipewire/pipewire.cc:402 src/skins/main.cc:230
+#: src/skins-qt/main.cc:233
 msgid "Audacious"
 msgstr "Audacious"
 
-#: src/gtkui/ui_statusbar.cc:63 src/qtui/status_bar.cc:67
+#: src/gtkui/ui_gtk.cc:487 src/gtkui/ui_gtk.cc:518 src/gtkui/ui_gtk.cc:882
+#: src/hotkey/gui.cc:72 src/moonstone/main_window.cc:67
+#: src/moonstone/main_window.cc:145 src/moonstone/main_window.cc:146
+#: src/notify/osd.cc:85 src/qthotkey/gui.cc:67 src/qtui/main_window.cc:154
+#: src/qtui/main_window.cc:347 src/qtui/main_window.cc:348
+#: src/skins/menus.cc:109 src/skins-qt/menus.cc:100
+msgid "Play"
+msgstr "Çal"
+
+#: src/gtkui/ui_gtk.cc:487 src/moonstone/main_window.cc:151
+#: src/moonstone/main_window.cc:152 src/notify/osd.cc:82
+#: src/qtui/main_window.cc:353 src/qtui/main_window.cc:354
+#: src/skins/menus.cc:110 src/skins-qt/menus.cc:101
+msgid "Pause"
+msgstr "Duraklat"
+
+#: src/gtkui/ui_gtk.cc:868 src/moonstone/main_window.cc:57
+#: src/qtui/main_window.cc:145 src/skins/menus.cc:86 src/skins-qt/menus.cc:77
+msgid "Search Library"
+msgstr "Kitaplığı Ara"
+
+#: src/gtkui/ui_gtk.cc:875 src/moonstone/main_window.cc:60
+#: src/qtui/main_window.cc:147
+msgid "Open Files"
+msgstr "Dosyaları Aç"
+
+#: src/gtkui/ui_gtk.cc:876 src/moonstone/main_window.cc:62
+#: src/qtui/main_window.cc:149
+msgid "Add Files"
+msgstr "Dosyaları Ekle"
+
+#: src/gtkui/ui_gtk.cc:881 src/moonstone/main_window.cc:65
+#: src/qtui/main_window.cc:152 src/skins/menus.cc:112 src/skins-qt/menus.cc:103
+msgid "Previous"
+msgstr "Önceki Parça"
+
+#: src/gtkui/ui_gtk.cc:883 src/hotkey/gui.cc:74 src/moonstone/main_window.cc:69
+#: src/qthotkey/gui.cc:69 src/qtui/main_window.cc:156 src/skins/menus.cc:111
+#: src/skins-qt/menus.cc:102
+msgid "Stop"
+msgstr "Dur"
+
+#: src/gtkui/ui_gtk.cc:884 src/moonstone/main_window.cc:76 src/notify/osd.cc:89
+#: src/qtui/main_window.cc:163 src/skins/menus.cc:113 src/skins-qt/menus.cc:104
+msgid "Next"
+msgstr "Sonraki Parça"
+
+#: src/gtkui/ui_gtk.cc:886 src/moonstone/main_window.cc:79
+#: src/qtui/main_window.cc:166 src/qtui/menus.cc:254 src/skins/menus.cc:79
+#: src/skins-qt/menus.cc:69
+msgid "Record Stream"
+msgstr "Canlı Kayıt"
+
+#: src/gtkui/ui_gtk.cc:919 src/moonstone/main_window.cc:86
+#: src/qtui/main_window.cc:173 src/skins/menus.cc:103 src/skins-qt/menus.cc:94
+msgid "Repeat"
+msgstr "Tekrar et"
+
+#: src/gtkui/ui_gtk.cc:922 src/moonstone/main_window.cc:89
+#: src/qtui/main_window.cc:176 src/skins/menus.cc:104 src/skins-qt/menus.cc:95
+msgid "Shuffle"
+msgstr "Karıştır"
+
+#: src/gtkui/ui_gtk.cc:1114 src/qtui/main_window.cc:123
+msgid "Menu"
+msgstr "Menü"
+
+#: src/gtkui/ui_statusbar.cc:64 src/qtui/status_bar.cc:155
 msgid "mono"
 msgstr "mono"
 
-#: src/gtkui/ui_statusbar.cc:65 src/qtui/status_bar.cc:69
+#: src/gtkui/ui_statusbar.cc:66 src/qtui/status_bar.cc:157
 msgid "stereo"
 msgstr "stereo"
 
-#: src/gtkui/ui_statusbar.cc:67 src/qtui/status_bar.cc:71
+#: src/gtkui/ui_statusbar.cc:68 src/qtui/status_bar.cc:160
 #, c-format
 msgid "%d channel"
 msgid_plural "%d channels"
-msgstr0 ""
-msgstr1 ""
+msgstr0 "%d kanal"
+msgstr1 "%d kanallar"
+
+#: src/gtkui/ui_statusbar.cc:76 src/qtui/status_bar.cc:168
+#, c-format
+msgid "%d kHz"
+msgstr "%d kHz"
 
-#: src/gtkui/ui_statusbar.cc:81 src/qtui/status_bar.cc:85
+#: src/gtkui/ui_statusbar.cc:82 src/qtui/status_bar.cc:174
 #, c-format
-msgid "%d kbps"
-msgstr "%d kbps"
+msgid "%d kbit/s"
+msgstr "%d kbit/s"
 
-#: src/gtkui/ui_statusbar.cc:107 src/skins/ui_main_evlisteners.cc:103
+#: src/gtkui/ui_statusbar.cc:108 src/skins/main.cc:478 src/skins-qt/main.cc:461
 msgid "Single mode."
-msgstr ""
+msgstr "Tekli mod."
 
-#: src/gtkui/ui_statusbar.cc:109 src/skins/ui_main_evlisteners.cc:105
+#: src/gtkui/ui_statusbar.cc:110 src/skins/main.cc:480 src/skins-qt/main.cc:463
 msgid "Playlist mode."
 msgstr "Çalma Listesi modu"
 
-#: src/gtkui/ui_statusbar.cc:117 src/skins/ui_main_evlisteners.cc:111
+#: src/gtkui/ui_statusbar.cc:118 src/skins/main.cc:486 src/skins-qt/main.cc:469
 msgid "Stopping after song."
 msgstr "Şarkıdan sonra duruyor."
 
-#: src/hotkey/gui.cc:71
+#: src/hotkey/gui.cc:71 src/qthotkey/gui.cc:66
 msgid "Previous track"
 msgstr "Önceki parça"
 
-#: src/hotkey/gui.cc:72 src/notify/osd.cc:69 src/qtui/main_window.cc:69
-#: src/qtui/main_window.cc:172 src/qtui/main_window.cc:173
-#: src/skins/menus.cc:87
-msgid "Play"
-msgstr "Çal"
-
-#: src/hotkey/gui.cc:73
+#: src/hotkey/gui.cc:73 src/qthotkey/gui.cc:68
 msgid "Pause/Resume"
 msgstr "Ara ver/Devam et"
 
-#: src/hotkey/gui.cc:74 src/qtui/main_window.cc:70 src/skins/menus.cc:89
-msgid "Stop"
-msgstr "Dur"
-
-#: src/hotkey/gui.cc:75
+#: src/hotkey/gui.cc:75 src/qthotkey/gui.cc:70
 msgid "Next track"
 msgstr "Sonraki parça"
 
-#: src/hotkey/gui.cc:76
-msgid "Forward 5 seconds"
-msgstr "5 saniye sonrası"
-
-#: src/hotkey/gui.cc:77
-msgid "Rewind 5 seconds"
-msgstr "5 saniye öncesi"
+#: src/hotkey/gui.cc:76 src/qthotkey/gui.cc:71
+msgid "Step forward"
+msgstr "İleri git"
+
+#: src/hotkey/gui.cc:77 src/qthotkey/gui.cc:72
+msgid "Step backward"
+msgstr "Geri git"
 
-#: src/hotkey/gui.cc:78
+#: src/hotkey/gui.cc:78 src/qthotkey/gui.cc:73
 msgid "Mute"
 msgstr "Sessiz"
 
-#: src/hotkey/gui.cc:79
+#: src/hotkey/gui.cc:79 src/qthotkey/gui.cc:74
 msgid "Volume up"
 msgstr "Sesi aç"
 
-#: src/hotkey/gui.cc:80
+#: src/hotkey/gui.cc:80 src/qthotkey/gui.cc:75
 msgid "Volume down"
 msgstr "Sesi kıs"
 
-#: src/hotkey/gui.cc:81
+#: src/hotkey/gui.cc:81 src/qthotkey/gui.cc:76
 msgid "Jump to file"
 msgstr "Dosyaya Atla"
 
-#: src/hotkey/gui.cc:82
+#: src/hotkey/gui.cc:82 src/qthotkey/gui.cc:77
 msgid "Toggle player window(s)"
-msgstr ""
+msgstr "Oynatıcı pencere(leri)si aç"
 
-#: src/hotkey/gui.cc:83
+#: src/hotkey/gui.cc:83 src/qthotkey/gui.cc:78
 msgid "Show On-Screen-Display"
-msgstr ""
+msgstr "On-Screen-Display Göster"
 
-#: src/hotkey/gui.cc:84
+#: src/hotkey/gui.cc:84 src/qthotkey/gui.cc:79
 msgid "Toggle repeat"
-msgstr ""
+msgstr "Tekrarlama yap"
 
-#: src/hotkey/gui.cc:85
+#: src/hotkey/gui.cc:85 src/qthotkey/gui.cc:80
 msgid "Toggle shuffle"
-msgstr ""
+msgstr "Karıştırmayı aç"
 
-#: src/hotkey/gui.cc:86
+#: src/hotkey/gui.cc:86 src/qthotkey/gui.cc:81
 msgid "Toggle stop after current"
-msgstr ""
+msgstr "Şimdiki çalmadan sonra durdurmayı aç"
 
-#: src/hotkey/gui.cc:87
+#: src/hotkey/gui.cc:87 src/qthotkey/gui.cc:82
 msgid "Raise player window(s)"
-msgstr ""
+msgstr "Oynatma pencere(ler)sini yükselt"
 
-#: src/hotkey/gui.cc:97
+#: src/hotkey/gui.cc:98 src/qthotkey/gui.cc:100
 msgid "(none)"
 msgstr "(hiçbiri)"
 
-#: src/hotkey/gui.cc:234
+#: src/hotkey/gui.cc:261
 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 modifiers.\n"
 "\n"
 "Do you want to continue?"
 msgstr ""
+"Birincil fare düğmelerini değiştiriciler olmadan bağlamak tavsiye edilmez.\n"
+"\n"
+"Devam etmek istiyor musunuz?"
 
-#: src/hotkey/gui.cc:236
+#: src/hotkey/gui.cc:264
 msgid "Binding mouse buttons"
-msgstr ""
+msgstr "Fare düğmeleri bağlaması"
 
-#: src/hotkey/gui.cc:391
+#: src/hotkey/gui.cc:434
 msgid ""
 "Press a key combination inside a text field.\n"
 "You can also bind mouse buttons."
 msgstr ""
+"Bir metin alanının içindeki tuş kombinasyonuna basın.\n"
+"Fare düğmelerini de bağlayabilirsiniz."
 
-#: src/hotkey/gui.cc:396
+#: src/hotkey/gui.cc:444 src/qthotkey/gui.cc:179
 msgid "Hotkeys:"
 msgstr "Kısayollar:"
 
-#: src/hotkey/gui.cc:413
+#: src/hotkey/gui.cc:457 src/qthotkey/gui.cc:181
 msgid "Action:"
-msgstr ""
+msgstr "Eylem:"
 
-#: src/hotkey/gui.cc:420
+#: src/hotkey/gui.cc:461 src/qthotkey/gui.cc:182
 msgid "Key Binding:"
-msgstr ""
+msgstr "Anahtar Bağlama:"
 
-#: src/hotkey/gui.cc:468
+#: src/hotkey/gui.cc:518 src/qthotkey/gui.cc:184
 msgid "_Add"
 msgstr "_Ekle"
 
-#: src/hotkey/plugin.cc:61
+#: src/hotkey/plugin.cc:59 src/qthotkey/plugin.cc:78
 msgid "Global Hotkeys"
-msgstr ""
+msgstr "Genel Kısayollar"
 
-#: src/hotkey/plugin.cc:79
+#: src/hotkey/plugin.cc:74
 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"
+"Contributors 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 ""
+"Küresel Kısayol Tuşu Eklentisi\n"
+"Küresel tuş kombinasyonları veya multimedya tuşları ile oynatıcıyı kontrol "
+"edin.\n"
+"\n"
+"Telif Hakkı (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n"
+"\n"
+"Katkıda bulunanlar şunları içerir:\n"
+"Telif Hakkı (C) 2006-2007 Vladimir Paskov <vlado.paskov@gmail.com>\n"
+"Telif Hakkı (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/jack-ng/jack-ng.cc:49
+#: src/jack/jack-ng.cc:54
 msgid "JACK Output"
-msgstr "Jack Çıkış baglantısı"
+msgstr "JACK Çıkışı"
+
+#: src/jack/jack-ng.cc:126
+msgid "Client name:"
+msgstr "İstemci adı:"
 
-#: src/jack-ng/jack-ng.cc:114
+#: src/jack/jack-ng.cc:128
 msgid "Automatically connect to output ports"
+msgstr "Çıkış bağlantı noktalarına otomatik olarak bağlan"
+
+#: src/jack/jack-ng.cc:130
+msgid "Filter ports (regex, use any port if blank):"
 msgstr ""
+"Bağlantı noktalarını süz (normal ifade, boşsa herhangi bir bağlantı "
+"noktasını kullanın):"
+
+#: src/jack/jack-ng.cc:136
+msgid "Connect to physical ports only"
+msgstr "Yalnızca fiziksel bağlantı noktalarına bağlan"
 
-#: src/jack-ng/jack-ng.cc:155
+#: src/jack/jack-ng.cc:139
+msgid "Upmix to"
+msgstr "Karıştır"
+
+#: src/jack/jack-ng.cc:141
+msgid "ports if input has fewer channels"
+msgstr "girişte daha az kanal varsa bağlantı noktaları"
+
+#: src/jack/jack-ng.cc:143
+msgid "Ignore insufficient number of ports"
+msgstr "Yetersiz sayıda bağlantı noktasını yoksay"
+
+#: src/jack/jack-ng.cc:181
+msgid "No JACK output ports were found. Please check settings."
+msgstr "JACK çıkış bağlantı noktası bulunamadı. Lütfen ayarları kontrol edin."
+
+#: src/jack/jack-ng.cc:195
 #, c-format
 msgid "Only %d JACK output ports were found but %d are required."
-msgstr ""
+msgstr "Sadece %d JACK çıkış portları bulundu, ancak %d gerekiyor."
 
-#: src/jack-ng/jack-ng.cc:164
+#: src/jack/jack-ng.cc:210
 #, c-format
 msgid "Failed to connect to JACK port %s."
 msgstr "Jack girişine baglantı saglanamadı %s.."
 
-#: src/jack-ng/jack-ng.cc:184
+#: src/jack/jack-ng.cc:230
 msgid ""
 "JACK supports only floating-point audio. You must change the output bit "
 "depth to floating-point in Audacious settings."
 msgstr ""
+"JACK yalnızca kayan noktalı sesi destekler. Audacious ayarlarında çıkış biti "
+"derinliğini kayan noktaya değiştirmelisiniz."
 
-#: src/jack-ng/jack-ng.cc:197
+#: src/jack/jack-ng.cc:245
 msgid "Failed to connect to the JACK server; is it running?"
-msgstr ""
+msgstr "JACK sunucusuna bağlanılamadı; çalışıyor mu?"
 
-#: src/jack-ng/jack-ng.cc:273
+#: src/jack/jack-ng.cc:321
 #, c-format
 msgid ""
 "The JACK server requires a sample rate of %d Hz, but Audacious is playing at "
 "%d Hz. Please use the Sample Rate Converter effect to correct the mismatch."
 msgstr ""
+"JACK sunucusu örnek bir %d Hz hızını gerektirir, ancak Audacious %d Hz'de "
+"çalar. Uyumsuzluğu düzeltmek için lütfen Örnek Hızı Dönüştürücü efekti "
+"kullanın."
 
-#: src/ladspa/plugin.cc:414
+#: src/ladspa/plugin.cc:416
 #, c-format
 msgid "%s Settings"
 msgstr "%s Ayarlar"
 
-#: src/ladspa/plugin.cc:478
+#: src/ladspa/plugin.cc:482
 msgid "Module paths:"
 msgstr "Modül Yolu:"
 
-#: src/ladspa/plugin.cc:483
+#: src/ladspa/plugin.cc:487
 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 ""
+"Bir kolon ile birden çok yolu ayırın.\n"
+"Bu yollar LADSPA_PATH'e ek olarak aranır.\n"
+"Yeni yollar ekledikten sonra, yeni eklentileri taramak için Enter tuşuna "
+"basın."
 
-#: src/ladspa/plugin.cc:499
+#: src/ladspa/plugin.cc:508
 msgid "Available plugins:"
 msgstr "Kullanılabilir Eklentiler:"
 
-#: src/ladspa/plugin.cc:512 src/modplug/plugin_main.cc:92
-#: src/modplug/plugin_main.cc:95 src/modplug/plugin_main.cc:98
-#: src/modplug/plugin_main.cc:101
+#: src/ladspa/plugin.cc:521 src/modplug/plugin_main.cc:91
+#: src/modplug/plugin_main.cc:94 src/modplug/plugin_main.cc:97
+#: src/modplug/plugin_main.cc:100
 msgid "Enable"
 msgstr "İzin ver"
 
-#: src/ladspa/plugin.cc:518
+#: src/ladspa/plugin.cc:527
 msgid "Enabled plugins:"
 msgstr "Eklentilere İzin ver:"
 
-#: src/ladspa/plugin.cc:534
+#: src/ladspa/plugin.cc:543
 msgid "Settings"
 msgstr "Ayarlar"
 
-#: src/ladspa/plugin.cc:551
+#: src/ladspa/plugin.cc:560
 msgid ""
 "LADSPA Host for Audacious\n"
 "Copyright 2011 John Lindgren"
 msgstr ""
+"Audacious için LADSPA AnaBilgisayar\n"
+"Telif Hakkı 2011 John Lindgren"
 
 #: src/ladspa/plugin.h:78
 msgid "LADSPA Host"
-msgstr ""
+msgstr "LADSPA AnaBilgisayar"
 
 #: src/lirc/lirc.cc:55
 msgid "LIRC Plugin"
-msgstr ""
+msgstr "LIRC Eklentisi"
 
-#: src/lirc/lirc.cc:381
+#: src/lirc/lirc.cc:379
 msgid ""
 "A simple plugin to control Audacious using the LIRC remote control daemon\n"
 "\n"
@@ -2158,82 +2444,156 @@
 "\n"
 "For more information about LIRC, see http://lirc.org."
 msgstr ""
+"LIRC uzaktan kumanda programı kullanarak Audacious'u kontrol etmek için "
+"basit bir eklenti\n"
+"\n"
+"Audacious için uyarlanmış:\n"
+"Tony Vroon <chainsaw@gentoo.org>\n"
+"Joonas Harjumäki <jharjuma@gmail.com>\n"
+"\n"
+"XMMS LIRC eklentisine dayanarak:LIRC hakkında daha fazla bilgi için bkz. "
+"Http://lirc.org.\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 hakkında daha fazla bilgi için bkz. http://lirc.org."
 
-#: src/lirc/lirc.cc:392
+#: src/lirc/lirc.cc:390
 msgid "Connection"
-msgstr ""
+msgstr "Bağlantı"
 
-#: src/lirc/lirc.cc:393
+#: src/lirc/lirc.cc:391
 msgid "Reconnect to LIRC server"
-msgstr ""
+msgstr "LIRC sunucusuna yeniden bağlan"
 
-#: src/lirc/lirc.cc:395
+#: src/lirc/lirc.cc:393
 msgid "Wait before reconnecting:"
-msgstr ""
-
-#: src/lyricwiki/lyricwiki.cc:41
-msgid "LyricWiki Plugin"
-msgstr ""
-
-#: src/lyricwiki/lyricwiki.cc:131 src/lyricwiki-qt/lyricwiki.cc:136
-msgid "No lyrics available"
-msgstr ""
+msgstr "Yeniden bağlanmadan önce bekleyin:"
 
-#: src/lyricwiki/lyricwiki.cc:217 src/lyricwiki/lyricwiki.cc:226
-#: src/lyricwiki/lyricwiki.cc:243 src/lyricwiki/lyricwiki.cc:252
-#: src/lyricwiki/lyricwiki.cc:267 src/lyricwiki-qt/lyricwiki.cc:222
-#: src/lyricwiki-qt/lyricwiki.cc:231 src/lyricwiki-qt/lyricwiki.cc:248
-#: src/lyricwiki-qt/lyricwiki.cc:257 src/lyricwiki-qt/lyricwiki.cc:272
-msgid "Error"
-msgstr "Hata"
-
-#: src/lyricwiki/lyricwiki.cc:218 src/lyricwiki/lyricwiki.cc:244
-#: src/lyricwiki-qt/lyricwiki.cc:223 src/lyricwiki-qt/lyricwiki.cc:249
+#: src/lyrics-common/chart_lyrics_provider.cc:93
+#: src/lyrics-common/chart_lyrics_provider.cc:150
+#: src/lyrics-common/lyrics_ovh_provider.cc:50
 #, c-format
 msgid "Unable to fetch %s"
-msgstr ""
+msgstr "%s getirilemiyor"
 
-#: src/lyricwiki/lyricwiki.cc:227 src/lyricwiki/lyricwiki.cc:253
-#: src/lyricwiki-qt/lyricwiki.cc:232 src/lyricwiki-qt/lyricwiki.cc:258
+#: src/lyrics-common/chart_lyrics_provider.cc:100
+#: src/lyrics-common/chart_lyrics_provider.cc:157
+#: src/lyrics-common/lyrics_ovh_provider.cc:57
 #, c-format
 msgid "Unable to parse %s"
-msgstr ""
+msgstr "%s ayrıştırılamıyor"
 
-#: src/lyricwiki/lyricwiki.cc:259 src/lyricwiki-qt/lyricwiki.cc:264
+#: src/lyrics-common/chart_lyrics_provider.cc:121
+#: src/lyrics-common/chart_lyrics_provider.cc:194
+#: src/lyrics-common/lyrics_ovh_provider.cc:88
 msgid "Looking for lyrics ..."
-msgstr ""
+msgstr "Şarkı sözü ara ..."
 
-#: src/lyricwiki/lyricwiki.cc:267 src/lyricwiki-qt/lyricwiki.cc:272
-msgid "Missing song metadata"
-msgstr ""
+#: src/lyrics-common/preferences.h:43
+msgid "Nowhere"
+msgstr "Nowhere"
 
-#: src/lyricwiki/lyricwiki.cc:278 src/lyricwiki-qt/lyricwiki.cc:283
-msgid "Connecting to lyrics.wikia.com ..."
-msgstr ""
+#: src/lyrics-common/preferences.h:49
+msgid "Artist is truncated at the start, Title -- at the end"
+msgstr "Sanatçı başlangıçta kısaltılmış, Başlık -- sonunda"
+
+#: src/lyrics-common/preferences.h:50
+msgid "Chars to truncate on:"
+msgstr "Kısaltılacak karakterler:"
 
-#: src/lyricwiki-qt/lyricwiki.cc:55
-msgid "LyricWiki Plugin (Qt)"
+#: src/lyrics-common/preferences.h:54
+msgid "Chars are ORed in RegExp, surrounded by whitespace"
 msgstr ""
 
-#: src/m3u/m3u.cc:32
+#: src/lyrics-common/preferences.h:55
+msgid "Chars to split on:"
+msgstr "Bölünecek karakterler:"
+
+#: src/lyrics-common/preferences.h:56
+msgid "Further truncate those on chars"
+msgstr "Karakterlerde daha fazla kısalt"
+
+#: src/lyrics-common/preferences.h:62
+msgid "General"
+msgstr "Genel"
+
+#: src/lyrics-common/preferences.h:63
+msgid "Split title into artist and title on chars"
+msgstr "Başlığı sanatçıya ve başlığa karakter olarak böl"
+
+#: src/lyrics-common/preferences.h:66
+msgid "Sources"
+msgstr "Kaynaklar"
+
+#: src/lyrics-common/preferences.h:67
+msgid "Use embedded lyrics (from Lyrics tag)"
+msgstr "Gömülü şarkı sözlerini kullan (Lyrics etiketinden)"
+
+#: src/lyrics-common/preferences.h:69
+msgid "Fetch lyrics from internet:"
+msgstr "İnternetten şarkı sözleri al:"
+
+#: src/lyrics-common/preferences.h:72
+msgid "Store fetched lyrics in local cache"
+msgstr "Alınan şarkı sözlerini yerel önbellekte depola"
+
+#: src/lyrics-common/preferences.h:74
+msgid "Local Storage"
+msgstr "Yerel Depolama"
+
+#: src/lyrics-common/preferences.h:75
+msgid "Load lyric files (.lrc) from local storage"
+msgstr "Yerel depodan şarkı sözü dosyaları (.lrc) yükle"
+
+#: src/lyrics-common/utils.cc:54 src/ui-common/dialogs-qt.cc:63
+msgid "Error"
+msgstr "Hata"
+
+#: src/lyrics-common/utils.cc:60
+msgid "Lyrics could not be found."
+msgstr "Şarkı sözleri bulunamadı."
+
+#: src/lyrics-common/utils.cc:142
+msgid "Missing title and/or artist."
+msgstr "Başlık ve/veya sanatçı eksik."
+
+#: src/lyrics-gtk/lyrics-gtk.cc:37 src/lyrics-qt/lyrics-qt.cc:50
+msgid "Lyrics"
+msgstr "Şarkı sözleri"
+
+#: src/lyrics-gtk/lyrics-gtk.cc:189 src/lyrics-qt/lyrics-qt.cc:171
+msgid "Edit Lyrics ..."
+msgstr "Şarkı sözlerini düzenle ..."
+
+#: src/lyrics-gtk/lyrics-gtk.cc:195 src/lyrics-qt/lyrics-qt.cc:178
+msgid "Save Locally"
+msgstr "Yerel Olarak Kaydet"
+
+#: src/lyrics-gtk/lyrics-gtk.cc:201 src/lyrics-qt/lyrics-qt.cc:186
+msgid "Refresh"
+msgstr "Yenile"
+
+#: src/m3u/m3u.cc:33
 msgid "M3U Playlists"
-msgstr ""
+msgstr "M3U Çalma Listeleri"
 
 #: src/metronom/metronom.cc:44
 msgid "Tact Generator"
-msgstr ""
+msgstr "Takt Oluşturucu"
 
-#: src/metronom/metronom.cc:147
+#: src/metronom/metronom.cc:145
 #, c-format
 msgid "Tact generator: %d bpm"
 msgstr "Takt oluşturucu: %d bpm"
 
-#: src/metronom/metronom.cc:149
+#: src/metronom/metronom.cc:147
 #, c-format
 msgid "Tact generator: %d bpm %d/%d"
 msgstr "Takt oluşturucu: %d bpm %d/%d"
 
-#: src/metronom/metronom.cc:237
+#: src/metronom/metronom.cc:235
 msgid ""
 "A Tact Generator by Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
 "\n"
@@ -2241,195 +2601,210 @@
 "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 Üretici, Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
+"\n"
+"Kullanmak için URL ekleyin: tact://beats*num/den\n"
+"örneğin tact://77 ile dakikada 77 vurgu ya da\n"
+"tact://60*3/4 ile 60 bpm yi 3/4 tact ile"
 
-#: src/mixer/mixer.cc:38
+#: src/mixer/mixer.cc:43
 msgid "Channel Mixer"
-msgstr ""
+msgstr "Kanal Değiştirici"
 
-#: src/mixer/mixer.cc:202
+#: src/mixer/mixer.cc:255
 msgid ""
 "Channel Mixer Plugin for Audacious\n"
 "Copyright 2011-2012 John Lindgren and Michał Lipski"
 msgstr ""
+"Audacious için Kanal Değiştirici Eklentisi \n"
+"Telif Hakkı 2011-2012 John Lindgren ve Michał Lipski"
 
-#: src/mixer/mixer.cc:206
+#: src/mixer/mixer.cc:259
 msgid "Channel Mixer"
-msgstr ""
+msgstr "Kanal Değiştirici"
 
-#: src/mixer/mixer.cc:207
+#: src/mixer/mixer.cc:260
 msgid "Output channels:"
 msgstr "Çıkış kanalları:"
 
 #: src/mms/mms.cc:35
 msgid "MMS Plugin"
-msgstr ""
+msgstr "MMS Eklentisi"
 
 #: src/mms/mms.cc:82
 msgid "Error connecting to MMS server"
-msgstr ""
+msgstr "MMS sunucusuna bağlanırken hata oluştu"
 
-#: src/modplug/modplugbmp.h:53
+#: src/modplug/modplugbmp.h:57
 msgid "ModPlug (Module Player)"
-msgstr ""
-
-#: src/modplug/plugin_main.cc:53
-msgid "Resolution"
-msgstr ""
-
-#: src/modplug/plugin_main.cc:54
-msgid "8-bit"
-msgstr "8-bit"
+msgstr "ModPlug (Modül Oynatıcı)"
 
 #: src/modplug/plugin_main.cc:55
-msgid "16-bit"
-msgstr "16-bit"
-
-#: src/modplug/plugin_main.cc:56
 msgid "Channels"
-msgstr ""
+msgstr "Kanallar"
 
-#: src/modplug/plugin_main.cc:60
+#: src/modplug/plugin_main.cc:59
 msgid "Nearest (fastest)"
 msgstr "En Yakın (en hızlı)"
 
-#: src/modplug/plugin_main.cc:61
+#: src/modplug/plugin_main.cc:60
 msgid "Linear (fast)"
 msgstr "Lineer (hızlı)"
 
-#: src/modplug/plugin_main.cc:62
+#: src/modplug/plugin_main.cc:61
 msgid "Spline (good)"
-msgstr ""
+msgstr "Spline (iyi)"
 
-#: src/modplug/plugin_main.cc:63
+#: src/modplug/plugin_main.cc:62
 msgid "Polyphase (best)"
-msgstr ""
+msgstr "Polifaze (en iyi)"
 
-#: src/modplug/plugin_main.cc:64
+#: src/modplug/plugin_main.cc:63
 msgid "Sample rate"
-msgstr ""
+msgstr "Örnekleme oranı"
 
-#: src/modplug/plugin_main.cc:65
+#: src/modplug/plugin_main.cc:64
 msgid "22 kHz"
 msgstr "22 kHz"
 
-#: src/modplug/plugin_main.cc:66
+#: src/modplug/plugin_main.cc:65
 msgid "44 kHz"
 msgstr "44 kHz"
 
-#: src/modplug/plugin_main.cc:67
+#: src/modplug/plugin_main.cc:66
 msgid "48 kHz"
 msgstr "48 kHz"
 
-#: src/modplug/plugin_main.cc:68
+#: src/modplug/plugin_main.cc:67
 msgid "96 kHz"
-msgstr ""
+msgstr "96 kHz"
 
-#: src/modplug/plugin_main.cc:72 src/modplug/plugin_main.cc:77
-#: src/modplug/plugin_main.cc:82
+#: src/modplug/plugin_main.cc:71 src/modplug/plugin_main.cc:76
+#: src/modplug/plugin_main.cc:81
 msgid "Level:"
 msgstr "Seviye:"
 
-#: src/modplug/plugin_main.cc:78
+#: src/modplug/plugin_main.cc:77
 msgid "Cutoff:"
-msgstr ""
+msgstr "Kesme:"
 
-#: src/modplug/plugin_main.cc:91
+#: src/modplug/plugin_main.cc:90
 msgid "Reverb"
-msgstr ""
+msgstr "Yankı"
 
-#: src/modplug/plugin_main.cc:94
+#: src/modplug/plugin_main.cc:93
 msgid "Bass Boost"
-msgstr ""
+msgstr "Bas Kuvvetlendirme"
 
-#: src/modplug/plugin_main.cc:97
+#: src/modplug/plugin_main.cc:96
 msgid "Surround"
-msgstr ""
+msgstr "Kuşatma"
 
-#: src/modplug/plugin_main.cc:100
+#: src/modplug/plugin_main.cc:99
 msgid "Preamp"
-msgstr ""
+msgstr "Ön güçlendirme"
 
-#: src/modplug/plugin_main.cc:107
+#: src/modplug/plugin_main.cc:106
 msgid "Oversample"
-msgstr ""
+msgstr "Örnek üzerinde"
 
-#: src/modplug/plugin_main.cc:108
+#: src/modplug/plugin_main.cc:107
 msgid "Noise reduction"
-msgstr ""
+msgstr "Gürültü azaltma"
 
-#: src/modplug/plugin_main.cc:109
+#: src/modplug/plugin_main.cc:108
 msgid "Play Amiga MODs"
-msgstr ""
+msgstr "Amiga MOD'ları oynat"
 
-#: src/modplug/plugin_main.cc:110
+#: src/modplug/plugin_main.cc:109
 msgid "Repeat"
-msgstr ""
+msgstr "Tekrarla"
 
-#: src/modplug/plugin_main.cc:111
+#: src/modplug/plugin_main.cc:110
 msgid "Repeat count:"
-msgstr ""
+msgstr "Tekrarlama sayısı:"
 
-#: src/modplug/plugin_main.cc:112
+#: src/modplug/plugin_main.cc:111
 msgid "To repeat forever, set the repeat count to -1."
-msgstr ""
+msgstr "Sonsuza kadar tekrarlamak için, tekrar sayısını -1 olarak ayarlayın."
 
-#: src/modplug/plugin_main.cc:125 src/sid/xs_config.cc:106
+#: src/modplug/plugin_main.cc:124 src/sid/xs_config.cc:106
 msgid "These settings will take effect when Audacious is restarted."
-msgstr ""
+msgstr "Audacious yeniden başlatıldığında bu ayarlar yürürlüğe girer."
+
+#: src/moonstone/main_window.cc:72 src/moonstone/main_window.cc:73
+#: src/qtui/main_window.cc:159 src/qtui/main_window.cc:160
+#: src/skins/menus.cc:107 src/skins-qt/menus.cc:98
+msgid "Stop After This Song"
+msgstr "Şarkıdan Sonra Durdur"
+
+#: src/moonstone/moonstone.cc:39
+msgid "Moonstone"
+msgstr "Moonstone"
+
+#: src/moonstone/playlist_header.cc:212 src/qtui/playlist_header.cc:258
+msgid "Reset to Defaults"
+msgstr "Varsayılanlara Dön"
+
+#: src/moonstone/playlist_model.cc:38 src/qtui/playlist_header.cc:232
+msgid "Now Playing"
+msgstr "Şimdi Çalınıyor"
+
+#: src/moonstone/playlist_selection.cc:66
+#: src/playlist-manager/playlist-manager.cc:201
+#: src/playlist-manager-qt/playlist-manager-qt.cc:190
+msgid "Entries"
+msgstr "Girdiler"
 
 #: src/mpg123/mpg123.cc:54
 msgid "MPG123 Plugin"
-msgstr ""
-
-#: src/mpg123/mpg123.cc:83
-msgid "Advanced"
-msgstr "Gelişmiş"
+msgstr "MPG123 Eklentisi"
 
-#: src/mpg123/mpg123.cc:84
+#: src/mpg123/mpg123.cc:82
 msgid "Use accurate length calculation (slow)"
-msgstr ""
+msgstr "Doğru uzunluk hesaplaması kullan (yavaş)"
 
-#: src/mpg123/mpg123.cc:248
+#: src/mpg123/mpg123.cc:260
 msgid "Surround"
 msgstr "Surround"
 
-#: src/mpris2/plugin.cc:39
+#: src/mpris2/plugin.cc:40
 msgid "MPRIS 2 Server"
-msgstr ""
+msgstr "MPRIS 2 Sunucusu"
 
-#: src/neon/neon.cc:97
+#: src/neon/neon.cc:102
 msgid "Neon HTTP/HTTPS Plugin"
-msgstr ""
+msgstr "Neon HTTP/HTTPS Eklentisi"
 
-#: src/neon/neon.cc:521
+#: src/neon/neon.cc:526
 msgid "Error parsing redirect"
-msgstr ""
+msgstr "Yönlendirme ayrıştırılırken hata oluştu"
 
-#: src/neon/neon.cc:535
+#: src/neon/neon.cc:540
 msgid "Unknown HTTP error"
-msgstr ""
+msgstr "Bilinmeyen HTTP hatası"
 
-#: src/neon/neon.cc:569
+#: src/neon/neon.cc:614
 msgid "Error parsing URL"
-msgstr ""
+msgstr "URL ayrıştırılırken hata oluştu"
 
-#: src/neon/neon.cc:632
+#: src/neon/neon.cc:687
 msgid "Too many redirects"
-msgstr ""
+msgstr "Çok fazla yönlendirme var"
 
-#: src/notify/event.cc:64
+#: src/notify/event.cc:97
 msgid "Stopped"
 msgstr "Durdu"
 
-#: src/notify/event.cc:64
+#: src/notify/event.cc:97
 msgid "Audacious is not playing."
 msgstr "Audacious oynatmıyor."
 
-#: src/notify/notify.cc:42
+#: src/notify/notify.cc:39
 msgid "Desktop Notifications"
-msgstr ""
+msgstr "Masaüstü Bildirimleri"
 
-#: src/notify/notify.cc:60
+#: src/notify/notify.cc:57
 msgid ""
 "Desktop Notifications Plugin for Audacious\n"
 "Copyright (C) 2010 Maximilian Bogner\n"
@@ -2448,65 +2823,126 @@
 "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 için Masaüstü Bildirim Eklentisi\n"
+"Telif Hakkı (C) 2010 Maximilian Bogner\n"
+"Telif Hakkı (C) 2011-2013 John Lindgren ve Jean-Alexandre Anglès d'Auriac\n"
+"\n"
+"Bu eklenti ücretsiz bir yazılımdır: Özgür Yazılım Vakfı tarafından "
+"yayımlanan GNU Genel Kamu Lisansı, lisansın 3. sürümü ya da (sizin "
+"tercihinize göre) daha sonraki bir versiyonda bu hakları yeniden dağıtabilir "
+"ve/veya değiştirebilirsiniz.\n"
+"\n"
+"Bu eklenti, yararlı olacağı umuduyla dağıtılır, ancak HERHANGİ BİR GARANTİ "
+"OLMAKSIZIN; SATILABİLİRLİK veya BELİRLİ BİR AMACA UYGUNLUĞU'nun zımni "
+"garantisi dahi olmadan. Daha fazla bilgi için GNU Genel Kamu Lisansına "
+"bakınız.\n"
+"\n"
+"Bu programla birlikte GNU Genel Kamu Lisansının bir kopyasını almış "
+"olmalısınız. Değilse, bkz. <http://www.gnu.org/licenses/>."
 
-#: src/notify/notify.cc:110
+#: src/notify/notify.cc:104
 msgid "Show playback controls"
-msgstr ""
+msgstr "Oynatma kontrollerini göster"
 
-#: src/notify/notify.cc:112
+#: src/notify/notify.cc:106
 msgid "Always show notification"
 msgstr "Her zaman bildirim göster"
 
-#: src/notify/notify.cc:114
+#: src/notify/notify.cc:108
 msgid "Include album name in notification"
-msgstr ""
+msgstr "Bildirimde albüm adını dahil et"
 
-#: src/notify/osd.cc:58
+#: src/notify/notify.cc:110
+msgid "Custom notification duration:"
+msgstr "Özel bildirim süresi:"
+
+#: src/notify/osd.cc:74
 msgid "Show"
 msgstr "Göster"
 
-#: src/notify/osd.cc:66 src/qtui/main_window.cc:178
-#: src/qtui/main_window.cc:179 src/skins/menus.cc:88
-msgid "Pause"
-msgstr "Duraklat"
+#: src/openmpt/mpt.cc:50
+msgid "OpenMPT (Module Player)"
+msgstr "OpenMPT (Modül Oynatıcı)"
 
-#: src/notify/osd.cc:73 src/qtui/main_window.cc:72 src/skins/menus.cc:91
-msgid "Next"
-msgstr "Sonraki Parça"
+#: src/openmpt/mpt.cc:132
+msgid ""
+"Module player based on libopenmpt\n"
+"\n"
+"Written by: Chris Spiegel <cspiegel@gmail.com>"
+msgstr ""
+"Libopenmpt tabanlı modül oynatıcı\n"
+"\n"
+"Yazan: Chris Spiegel <cspiegel@gmail.com>"
 
-#: src/oss4/oss.h:93
-msgid "OSS4 Output"
+#: src/openmpt/mpt.cc:151
+msgid "Stereo separation:"
+msgstr "Stereo ayırma:"
+
+#: src/openmpt/mpt.cc:153
+msgid "% (0=mono, 100=default, 200=full)"
 msgstr ""
 
-#: src/oss4/oss.h:95
-msgid "OSS3 Output"
+#: src/openmpt/mpt.cc:157
+msgid "Interpolation:"
+msgstr "İnterpolasyon:"
+
+#: src/openmpt/mptwrap.h:51 src/soxr/sox-resampler.cc:189 src/xsf/plugin.cc:437
+msgid "Linear"
+msgstr "Doğrusal"
+
+#: src/openmpt/mptwrap.h:52
+msgid "Cubic"
+msgstr "Kübik"
+
+#: src/openmpt/mptwrap.h:53
+msgid "Windowed sinc"
+msgstr "Pencereli sinc"
+
+#: src/opus/opus.cc:39
+msgid "Opus Decoder"
+msgstr "Opus Çözücü"
+
+#: src/opus/opus.cc:336
+msgid ""
+"Opus Decoder Plugin for Audacious\n"
+"Copyright 2022 Thomas Lange"
 msgstr ""
+"Audacious için Opus Çözücü eklentisi\n"
+"Telif Hakkı 2022 Thomas Lange"
+
+#: src/oss4/oss.h:70
+msgid "OSS4 Output"
+msgstr "OSS4 Çıkışı"
+
+#: src/oss4/oss.h:72
+msgid "OSS3 Output"
+msgstr "OSS3 Çıkışı"
 
 #: src/oss4/plugin.cc:35
 msgid "Default device"
-msgstr ""
+msgstr "Varsayılan Aygıt"
 
-#: src/oss4/plugin.cc:77
+#: src/oss4/plugin.cc:78
 msgid "Audio device:"
 msgstr "Ses aygıtı:"
 
-#: src/oss4/plugin.cc:80
+#: src/oss4/plugin.cc:81
 msgid "Use alternate device:"
 msgstr "Farklı aygıt kullan:"
 
-#: src/oss4/plugin.cc:84
+#: src/oss4/plugin.cc:85
 msgid "Save volume between sessions."
-msgstr ""
+msgstr "Oturumlar arasında ses düzeyini kaydet"
 
-#: src/oss4/plugin.cc:86
+#: src/oss4/plugin.cc:87
 msgid "Enable format conversions made by the OSS software."
-msgstr ""
+msgstr "OSS yazılımı tarafından yapılan biçim dönüşümlerini etkinleştir."
 
-#: src/oss4/plugin.cc:88
+#: src/oss4/plugin.cc:89
 msgid "Enable exclusive mode to prevent virtual mixing."
-msgstr ""
+msgstr "Sanal değiştirmeyi önlemek için özel modu etkinleştirin."
 
-#: src/oss4/plugin.cc:100
+#: src/oss4/plugin.cc:101
 msgid ""
 "OSS4 Output Plugin for Audacious\n"
 "Copyright 2010-2012 Michał Lipski\n"
@@ -2514,60 +2950,116 @@
 "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 için OSS4 Çıkış Eklentisi\n"
+"Telif Hakkı 2010-2012 Michał Lipski\n"
+"\n"
+"#audacious için emeği insanlara teşekkür etmek isterim, özellikle Tony Vroon "
+"ve John Lindgren ve tabii ki önceki OSS eklentisinin yazarlarına."
+
+#: src/pipewire/pipewire.cc:44
+msgid "PipeWire Output"
+msgstr "PipeWire Çıkışı"
+
+#: src/pipewire/pipewire.cc:118
+msgid ""
+"PipeWire Output Plugin for Audacious\n"
+"Copyright 2022 Thomas Lange\n"
+"\n"
+"Based on the PipeWire Output Plugin for Qmmp\n"
+"Copyright 2021 Ilya Kotov"
+msgstr ""
+"Audacious için PipeWire Çıktı Eklentisi\n"
+"Telif Hakkı 2022 Thomas Lange\n"
+"\n"
+"Qmmp PipeWire Çıktı Eklentisi temelli\n"
+"Telif Hakkı 2021 Ilya Kotov"
+
+#: src/pipewire/pipewire.cc:408 src/skins/menus.cc:88 src/skins-qt/menus.cc:79
+msgid "Playback"
+msgstr "Çal"
 
-#: src/playlist-manager/playlist-manager.cc:37
+#: src/playlist-manager/playlist-manager.cc:38
+#: src/playlist-manager-qt/playlist-manager-qt.cc:42
 msgid "Playlist Manager"
 msgstr "Çalma Listesi Düzenleyici"
 
-#: src/playlist-manager/playlist-manager.cc:226
-msgid "Entries"
-msgstr "Girdiler"
-
-#: src/playlist-manager/playlist-manager.cc:245
+#: src/playlist-manager/playlist-manager.cc:221
+#: src/playlist-manager-qt/playlist-manager-qt.cc:356
 msgid "_Remove"
 msgstr "_Sil"
 
-#: src/playlist-manager/playlist-manager.cc:246
+#: src/playlist-manager/playlist-manager.cc:222
+#: src/playlist-manager-qt/playlist-manager-qt.cc:351
 msgid "Ren_ame"
-msgstr ""
+msgstr "_Adlandır"
 
 #: src/pls/pls.cc:35
 msgid "PLS Playlists"
-msgstr ""
+msgstr "PLS Çalma listeleri"
 
-#: src/psf/plugin.cc:45
+#: src/psf/plugin.cc:53
 msgid "OpenPSF PSF1/PSF2 Decoder"
-msgstr ""
+msgstr "OpenPSF PSF1/PSF2 Çözücüsü"
+
+#: src/psf/plugin.cc:270
+msgid "OpenPSF Configuration"
+msgstr "OpenPSF Yapılandırması"
 
-#: src/pulse_audio/pulse_audio.cc:38
+#: src/psf/plugin.cc:271 src/xsf/plugin.cc:444
+msgid "Ignore length from file"
+msgstr "Dosyadan uzunluğu yoksay"
+
+#: src/pulse/pulse_audio.cc:42
 msgid "PulseAudio Output"
-msgstr ""
+msgstr "PulseAudio Çıkışı"
 
-#: src/pulse_audio/pulse_audio.cc:611
+#: src/pulse/pulse_audio.cc:84
+msgid "Context name:"
+msgstr "Bağlam adı:"
+
+#: src/pulse/pulse_audio.cc:86
+msgid "Stream name:"
+msgstr "Akış adı:"
+
+#: src/pulse/pulse_audio.cc:596
 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."
+"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 ""
+"Audacious PulseAudio Çıkış Eklentisi\n"
+"\n"
+"Bu program ücretsiz bir yazılımdır; Özgür Yazılım Vakfı tarafından "
+"yayımlanan GNU Genel Kamu Lisansı şartlarına göre yeniden dağıtabilir ve/"
+"veya değiştirebilirsiniz. Lisansın 2 numaralı sürümü veya (seçimlerinize "
+"göre) herhangi bir sonraki sürümü.\n"
+"\n"
+"Bu program yararlı olacağı umuduyla dağıtılır, ancak HERHANGİ BİR GARANTİ "
+"OLMAKSIZIN; SATILABİLİRLİK veya BELİRLİ BİR AMACA UYGUNLUĞU'nun zımni "
+"garantisi dahi olmadan. Daha fazla bilgi için GNU Genel Kamu Lisansına "
+"bakınız.\n"
+"\n"
+"Bu programla birlikte GNU Genel Kamu Lisansının bir kopyasını almış "
+"olmalısınız; eğer değilse, Free Software Foundation, Inc., 51 Franklin "
+"Street, Beşinci Kat, Boston, MA 02110-1301, ABD'ye yazın."
 
-#: src/qtaudio/qtaudio.cc:49
+#: src/qtaudio/qtaudio.cc:53
 msgid "QtMultimedia Output"
-msgstr ""
+msgstr "QtMultimedia Çıkışı"
 
-#: src/qtaudio/qtaudio.cc:77
+#: src/qtaudio/qtaudio.cc:84
 msgid ""
 "QtMultimedia Audio Output Plugin for Audacious\n"
 "Copyright 2014 William Pitcock\n"
@@ -2575,64 +3067,130 @@
 "Based on SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
 msgstr ""
+"Audacious için QtMultimedia Ses Çıkış Eklentisi\n"
+"Telif Hakkı 2014 William Pitcock\n"
+"\n"
+"Audacious için SDL Çıkış Eklentisine Dayalı\n"
+"Telif Hakkı 2010 John Lindgren"
 
-#: src/qtui/dialog_windows.cc:31
-msgid "Working ..."
+#: src/qtglspectrum/gl-spectrum.cc:41
+msgid ""
+"OpenGL Spectrum Analyzer for Audacious\n"
+"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
+"Copyright 2014, 2020 Ariadne Conill\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 için OpenGL İsgesel Çözümleyici\n"
+"Telif Hakkı 2013 Christophe Budé, John Lindgren, ve Carlo Bramini\n"
+"Telif Hakkı 2014, 2020 Ariadne Conill\n"
+"\n"
+"XMMS eklentisi temelli:\n"
+"Telif Hakkı 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson, "
+"ve 4Front Technologies\n"
+"\n"
+"Lisans: GPLv2+"
 
-#: src/qtui/filter_input.cc:44 src/skins/ui_playlist.cc:221
-msgid "Search"
+#: src/qthotkey/gui.cc:177
+msgid "Press a key combination inside a text field."
+msgstr "Metin alanı içinde bir tuş birleşimine bas."
+
+#: src/qthotkey/plugin.cc:105
+msgid ""
+"Global Hotkey Plugin\n"
+"Control the player with global key combinations or multimedia keys.\n"
+"\n"
+"Copyright (C) 2020 i.Dark_Templar <darktemplar@dark-templar-archives.net>\n"
+"Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n"
+"\n"
+"Contributors 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 ""
+"Küresel Kısayol Tuşu Eklentisi\n"
+"Küresel tuş kombinasyonları veya çoklu ortam tuşları ile oynatıcıyı kontrol "
+"edin.\n"
+"\n"
+"Telif Hakkı (C) 2020 i.Dark_Templar <darktemplar@dark-templar-archives.net>\n"
+"Telif Hakkı (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n"
+"\n"
+"Katkıda bulunanlar:\n"
+"Telif Hakkı (C) 2006-2007 Vladimir Paskov <vlado.paskov@gmail.com>\n"
+"Telif Hakkı (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/qtui/main_window_actions.cc:94
+#: src/qtui/menus.cc:109
 msgid "_Open Folder ..."
-msgstr ""
+msgstr "_Klasör Aç ..."
 
-#: src/qtui/main_window_actions.cc:96
+#: src/qtui/menus.cc:115
 msgid "_Add Folder ..."
-msgstr ""
+msgstr "_Klasör Ekle ..."
 
-#: src/qtui/main_window_actions.cc:101
+#: src/qtui/menus.cc:128
 msgid "_Log Inspector ..."
-msgstr ""
+msgstr "Günlük Denet_leyici ..."
 
-#: src/qtui/main_window.cc:64
-msgid "Open Files"
-msgstr ""
+#: src/qtui/menus.cc:220
+msgid "_Find ..."
+msgstr "_Bul ..."
 
-#: src/qtui/main_window.cc:66
-msgid "Add Files"
-msgstr ""
+#: src/qtui/menus.cc:256 src/skins/menus.cc:80 src/skins-qt/menus.cc:70
+msgid "Audio Settings ..."
+msgstr "Ses Ayarları ..."
 
-#: src/qtui/main_window.cc:71 src/skins/menus.cc:90
-msgid "Previous"
-msgstr "Önceki Parça"
+#: src/qtui/playlist_model.cc:188
+msgid "Q#"
+msgstr "Q#"
 
-#: src/qtui/main_window.cc:77 src/skins/menus.cc:82
-msgid "Repeat"
-msgstr "Tekrar et"
+#: src/qtui/playlist_model.cc:190
+msgid "T#"
+msgstr "T#"
 
-#: src/qtui/main_window.cc:79 src/skins/menus.cc:83
-msgid "Shuffle"
-msgstr "Karıştır"
+#: src/qtui/playlist_model.cc:192
+msgid "C#"
+msgstr "C#"
 
-#: src/qtui/qtui.cc:42
-msgid "Qt Interface"
+#: src/qtui/playlist_model.cc:194
+msgid "D#"
 msgstr ""
 
+#: src/qtui/qtui.cc:40
+msgid "Qt Interface"
+msgstr "Qt Arayüzü"
+
+#: src/qtui/search_bar.cc:46
+msgid "Search playlist"
+msgstr "Çalma listesini ara"
+
+#: src/qtui/settings.cc:79
+msgid "Use bold font for column headers"
+msgstr "Sütun başlıkları için kalın yazı tipi kullan"
+
 #: src/resample/resample.cc:43
 msgid "Sample Rate Converter"
-msgstr ""
+msgstr "Örnek Oran Dönüştürücü"
 
 #: src/resample/resample.cc:183
 msgid ""
 "Sample Rate Converter Plugin for Audacious\n"
 "Copyright 2010-2012 John Lindgren"
 msgstr ""
+"Audacious için Örnek Oran Dönüştürücü Eklentisi\n"
+"Telif Hakkı 2010-2012 John Lindgren"
 
 #: src/resample/resample.cc:187
 msgid "Skip/repeat samples"
-msgstr ""
+msgstr "Örnekleri atla/tekrarla"
 
 #: src/resample/resample.cc:188
 msgid "Linear interpolation"
@@ -2640,15 +3198,15 @@
 
 #: src/resample/resample.cc:189
 msgid "Fast sinc interpolation"
-msgstr ""
+msgstr "Hızlı sinc interpolasyon"
 
 #: src/resample/resample.cc:190
 msgid "Medium sinc interpolation"
-msgstr ""
+msgstr "Orta sinc interpolasyonu"
 
 #: src/resample/resample.cc:191
 msgid "Best sinc interpolation"
-msgstr ""
+msgstr "En iyi sinc interpolasyon"
 
 #: src/resample/resample.cc:195
 msgid "Conversion"
@@ -2658,1024 +3216,974 @@
 msgid "Method:"
 msgstr "Metot:"
 
-#: src/resample/resample.cc:199 src/sox-resampler/sox-resampler.cc:161
+#: src/resample/resample.cc:199 src/soxr/sox-resampler.cc:203
 msgid "Rate:"
 msgstr "Derece:"
 
 #: src/resample/resample.cc:202
 msgid "Rate Mappings"
-msgstr ""
+msgstr "Oran Eşlemeleri"
 
 #: src/resample/resample.cc:203
 msgid "Use rate mappings"
-msgstr ""
+msgstr "Oran eşlemelerini kullan"
 
 #: src/resample/resample.cc:205
 msgid "8 kHz:"
-msgstr ""
+msgstr "8 kHz:"
 
 #: src/resample/resample.cc:209
 msgid "16 kHz:"
-msgstr ""
+msgstr "16 kHz:"
 
 #: src/resample/resample.cc:213
 msgid "22.05 kHz:"
-msgstr ""
+msgstr "22.05 kHz:"
 
 #: src/resample/resample.cc:217
 msgid "32.0 kHz:"
-msgstr ""
+msgstr "32.0 kHz:"
 
 #: src/resample/resample.cc:221
 msgid "44.1 kHz:"
-msgstr ""
+msgstr "44.1 kHz:"
 
 #: src/resample/resample.cc:225
 msgid "48 kHz:"
-msgstr ""
+msgstr "48 kHz:"
 
 #: src/resample/resample.cc:229
 msgid "88.2 kHz:"
-msgstr ""
+msgstr "88.2 kHz:"
 
 #: src/resample/resample.cc:233
 msgid "96 kHz:"
-msgstr ""
+msgstr "96 kHz:"
 
 #: src/resample/resample.cc:237
 msgid "176.4 kHz:"
-msgstr ""
+msgstr "176.4 kHz:"
 
 #: src/resample/resample.cc:241
 msgid "192 kHz:"
-msgstr ""
-
-#: src/scrobbler2/config_window.cc:41
-#, c-format
-msgid "OK. Scrobbling for user: %s"
-msgstr ""
+msgstr "192 kHz:"
 
-#: src/scrobbler2/config_window.cc:54
-msgid "Permission Denied"
-msgstr ""
-
-#: src/scrobbler2/config_window.cc:56
-msgid "Access the following link to allow Audacious to scrobble your plays:"
-msgstr ""
-
-#: src/scrobbler2/config_window.cc:66
-msgid "Keep this window open and click 'Check Permission' again.\n"
-msgstr ""
+#: src/scrobbler2/config_window.cc:29
+msgid "Checking Last.fm access ..."
+msgstr "Last.fm erişimi kontrol ediliyor ..."
 
-#: src/scrobbler2/config_window.cc:69 src/scrobbler2/config_window.cc:80
+#: src/scrobbler2/config_window.cc:35
 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."
+"Your scrobbles are being saved on your computer temporarily. They will be "
+"submitted as soon as Audacious is allowed access."
 msgstr ""
+"Skroplamalar geçici olarak bilgisayarınıza kaydediliyor. Audacious erişim "
+"izni verilir verilmez gönderilecektir."
 
-#: src/scrobbler2/config_window.cc:77
-msgid "Network Problem."
-msgstr "Ağ Sorunu."
+#: src/scrobbler2/config_window.cc:41
+#, c-format
+msgid "Permission granted. Scrobbling for user %s."
+msgstr "İzin verildi. %s kullanıcısı için skroblanıyor."
 
-#: src/scrobbler2/config_window.cc:78
-msgid "There was a problem contacting Last.fm. Please try again later."
+#: src/scrobbler2/config_window.cc:44
+msgid ""
+"Permission denied. Open the following URL in a browser, allow Audacious "
+"access to your account, and then click 'Check Permission' again:"
 msgstr ""
-"Last.fm ile iletişimde bir sorun var. Lütfen daha sonra tekrar deneyin."
+"İzin reddedildi. Bir tarayıcıda aşağıdaki URL'yi açın, Hesabınıza Audacious "
+"erişim izni verin ve ardından 'İzin Ver'i tekrar tıklayın:"
 
-#: src/scrobbler2/config_window.cc:110
-msgid "Checking..."
-msgstr ""
+#: src/scrobbler2/config_window.cc:53
+msgid "There was a problem contacting Last.fm."
+msgstr "Last.fm ile bağlantı kurulurken bir sorun oluştu."
 
-#: src/scrobbler2/config_window.cc:176
-msgid "C_heck Permission"
-msgstr ""
+#: src/scrobbler2/config_window.cc:92
+msgid "Check Permission"
+msgstr "İzin Kontrolü"
 
-#: src/scrobbler2/config_window.cc:177
-msgid "_Revoke Permission"
-msgstr ""
+#: src/scrobbler2/config_window.cc:93
+msgid "Revoke Permission"
+msgstr "İzin İptali"
 
-#: src/scrobbler2/config_window.cc:220
-msgid ""
-"You need to allow Audacious to scrobble tracks to your Last.fm account.\n"
+#: src/scrobbler2/config_window.cc:97
+msgid "You need to allow Audacious to scrobble tracks to your Last.fm account."
 msgstr ""
+"Audacious'in Last.fm hesabınıza parçaları karıştırmasına izin vermelisiniz."
 
 #: src/scrobbler2/scrobbler.cc:29
 msgid "Scrobbler 2.0"
-msgstr ""
+msgstr "Scrobbler 2.0"
 
-#: src/scrobbler2/scrobbler.cc:224
+#: src/scrobbler2/scrobbler.cc:200
 msgid ""
 "The Scrobbler plugin could not be started.\n"
 "There might be a problem with your installation."
 msgstr ""
+"Scrobbler eklentisi başlatılamadı.\n"
+"Yüklemenizde bir sorun olabilir."
 
-#: src/scrobbler2/scrobbler.cc:289
+#: src/scrobbler2/scrobbler.cc:245
 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"
+"project."
 msgstr ""
 
-#: src/scrobbler2/scrobbler_communication.cc:642
-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/sdlout.cc:48
+#: src/sdlout/sdlout.cc:43
 msgid "SDL Output"
-msgstr ""
+msgstr "SDL Çıkışı"
 
-#: src/sdlout/sdlout.cc:77
+#: src/sdlout/sdlout.cc:72
 msgid ""
 "SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
 msgstr ""
+"Audacious için SDL Çıkışı Eklentisi\n"
+"Telif Hakkı 2010 John Lindgren"
 
-#: src/search-tool/search-tool.cc:116 src/search-tool/search-tool.cc:124
+#: src/search-tool/library.cc:35 src/search-tool/library.cc:46
+#: src/search-tool-qt/library.cc:35 src/search-tool-qt/library.cc:46
 msgid "Library"
-msgstr ""
-
-#: src/search-tool/search-tool.cc:394
-#, c-format
-msgid "%d result"
-msgid_plural "%d results"
-msgstr0 ""
-msgstr1 ""
-
-#: src/search-tool/search-tool.cc:400
-#, c-format
-msgid "(%d hidden)"
-msgid_plural "(%d hidden)"
-msgstr0 ""
-msgstr1 ""
+msgstr "Kitaplık"
 
-#: src/search-tool/search-tool.cc:594
+#: src/search-tool-qt/search-model.cc:44 src/search-tool/search-tool.cc:287
 #, c-format
 msgid "%d song"
 msgid_plural "%d songs"
-msgstr0 ""
-msgstr1 ""
+msgstr0 "%d şarkı"
+msgstr1 "%d şarkılar"
 
-#: src/search-tool/search-tool.cc:601
+#: src/search-tool-qt/search-model.cc:53 src/search-tool/search-tool.cc:294
 msgid "of this genre"
-msgstr ""
+msgstr "bu türün"
 
-#: src/search-tool/search-tool.cc:607
+#: src/search-tool-qt/search-model.h:47 src/search-tool/search-model.h:45
 msgid "on"
-msgstr ""
+msgstr "üzerinde"
 
-#: src/search-tool/search-tool.cc:607
+#: src/search-tool-qt/search-model.h:47 src/search-tool/search-model.h:45
 msgid "by"
-msgstr ""
+msgstr "tarafından"
 
-#: src/search-tool/search-tool.cc:643
-msgid "_Create Playlist"
-msgstr ""
+#: src/search-tool-qt/search-tool-qt.cc:165 src/search-tool/search-tool.cc:74
+msgid "Number of results to show:"
+msgstr "Gösterilecek sonuç sayısı:"
 
-#: src/search-tool/search-tool.cc:645
-msgid "_Add to Playlist"
-msgstr ""
+#: src/search-tool-qt/search-tool-qt.cc:168 src/search-tool/search-tool.cc:77
+msgid "Rescan library at startup"
+msgstr "Başlangıçta kitaplığı yeniden tara"
 
-#: src/search-tool/search-tool.cc:684
-msgid "Search library"
-msgstr ""
+#: src/search-tool-qt/search-tool-qt.cc:170
+msgid "Monitor library for changes"
+msgstr "Kütüphaneleri değişiklikler için izleyin"
 
-#: src/search-tool/search-tool.cc:688
+#: src/search-tool-qt/search-tool-qt.cc:193 src/search-tool/search-tool.cc:450
 msgid ""
 "To import your music library into Audacious, choose a folder and then click "
 "the \"refresh\" icon."
 msgstr ""
+"Müzik kitaplığınızı Audacious'a aktarmak için bir dizin seçin ve ardından "
+"\"yenileme\" simgesine tıklayın."
 
-#: src/search-tool/search-tool.cc:696
+#: src/search-tool-qt/search-tool-qt.cc:195 src/search-tool/search-tool.cc:459
 msgid "Please wait ..."
-msgstr ""
+msgstr "Lütfen bekleyin ..."
 
-#: src/search-tool/search-tool.cc:723
+#: src/search-tool-qt/search-tool-qt.cc:197 src/search-tool/search-tool.cc:487
 msgid "Choose Folder"
-msgstr ""
+msgstr "Klasör Seçin"
+
+#: src/search-tool-qt/search-tool-qt.cc:201 src/search-tool/search-tool.cc:445
+msgid "Search library"
+msgstr "Kitaplığı ara"
+
+#: src/search-tool-qt/search-tool-qt.cc:327 src/search-tool/search-tool.cc:156
+#, c-format
+msgid "%d of %d result shown"
+msgid_plural "%d of %d results shown"
+msgstr0 "%d sonucun %di gösteriliyor"
+msgstr1 "%d sonuçların %d'si gösteriliyor"
+
+#: src/search-tool-qt/search-tool-qt.cc:331 src/search-tool/search-tool.cc:160
+#, c-format
+msgid "%d result"
+msgid_plural "%d results"
+msgstr0 "%d sonuç"
+msgstr1 "%d sonuçlar"
+
+#: src/search-tool-qt/search-tool-qt.cc:501 src/search-tool/search-tool.cc:341
+msgid "_Create Playlist"
+msgstr "_Çalma Listesi Oluştur"
+
+#: src/search-tool-qt/search-tool-qt.cc:503 src/search-tool/search-tool.cc:343
+msgid "_Add to Playlist"
+msgstr "Ç_alma Listesine Ekle"
 
 #: src/sid/xmms-sid.cc:43
 msgid "SID Player"
-msgstr ""
-
-#: src/sid/xs_config.cc:61
-msgid "Output"
-msgstr ""
+msgstr "SID Oynatıcı"
 
 #: src/sid/xs_config.cc:62
 msgid "Channels:"
-msgstr ""
+msgstr "Kanallar:"
 
 #: src/sid/xs_config.cc:68
 msgid "Emulation"
-msgstr ""
+msgstr "Öykünme"
 
 #: src/sid/xs_config.cc:69
 msgid "Emulate MOS 8580 (default: MOS 6581)"
-msgstr ""
+msgstr "MOS 8580 öykün (varsayılan: MOS 6581)"
 
 #: src/sid/xs_config.cc:71
 msgid "Do not automatically select chip model"
-msgstr ""
+msgstr "Çip modelini otomatik seçmeyin"
 
 #: src/sid/xs_config.cc:73
 msgid "Emulate filter"
-msgstr ""
+msgstr "Süzgeci öykün"
 
 #: src/sid/xs_config.cc:75
 msgid "Clock speed:"
-msgstr ""
+msgstr "Saat hızı:"
 
 #: src/sid/xs_config.cc:78
 msgid "Do not automatically select clock speed"
-msgstr ""
+msgstr "Saat hızını otomatik seçmeyin"
 
 #: src/sid/xs_config.cc:80
 msgid "Playback time"
-msgstr ""
+msgstr "Çalma süresi"
 
 #: src/sid/xs_config.cc:81
 msgid "Set maximum playback time:"
-msgstr ""
+msgstr "En fazla oynatma süresini ayarla:"
 
 #: src/sid/xs_config.cc:87
 msgid "Use only when song length is unknown"
-msgstr ""
+msgstr "Sadece şarkı uzunluğu bilinmiyorsa kullanın"
 
 #: src/sid/xs_config.cc:90
 msgid "Set minimum playback time:"
-msgstr ""
+msgstr "En az oynatma süresini ayarla:"
 
 #: src/sid/xs_config.cc:96
 msgid "Subtunes"
-msgstr ""
+msgstr "AltMelodiler"
 
 #: src/sid/xs_config.cc:97
 msgid "Enable subtunes"
-msgstr ""
+msgstr "AltMelodileri etkinleştir"
 
 #: src/sid/xs_config.cc:99
 msgid "Ignore subtunes shorter than:"
-msgstr ""
+msgstr "Alt melodileri, aşağıdakilerden daha kısa olarak yoksay:"
 
 #: src/sid/xs_config.cc:105
 msgid "Note"
-msgstr ""
+msgstr "Not"
 
 #: src/silence-removal/silence-removal.cc:39
 msgid "Silence Removal"
-msgstr ""
+msgstr "Sessizlik Kaldırma"
 
 #: src/silence-removal/silence-removal.cc:58
 msgid ""
 "Silence Removal Plugin for Audacious\n"
 "Copyright 2014 John Lindgren"
 msgstr ""
+"Audacious için Sessizlik Kaldırma Eklentisi\n"
+"Telif Hakkı 2014 John Lindgren"
 
 #: src/silence-removal/silence-removal.cc:67
 msgid "Silence Removal"
-msgstr ""
+msgstr "Sessizlik Kaldırma"
 
 #: src/silence-removal/silence-removal.cc:68
 msgid "Threshold:"
-msgstr ""
+msgstr "Eşik:"
 
-#: src/silence-removal/silence-removal.cc:70
-msgid "dB"
-msgstr ""
+#: src/skins/actions.cc:45 src/skins-qt/actions.cc:43
+msgid "Repeat points cleared."
+msgstr "Tekrarlanan noktalar temizlendi."
+
+#: src/skins/actions.cc:60 src/skins-qt/actions.cc:58
+msgid "Repeat point A set."
+msgstr "Tekrarlama noktası A ayarlı"
+
+#: src/skins/actions.cc:65 src/skins-qt/actions.cc:63
+msgid "Repeat point B set."
+msgstr "Tekrarlama noktası B ayarlı"
+
+#: src/skins/equalizer.cc:223 src/skins-qt/equalizer.cc:223
+msgid "Preamp"
+msgstr "Ön güçlendirme"
+
+#: src/skins/equalizer.cc:227 src/skins-qt/equalizer.cc:227
+msgid "31 Hz"
+msgstr "31 Hz"
 
-#: src/skins/menus.cc:64
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "63 Hz"
+msgstr "63 Hz"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "125 Hz"
+msgstr "125 Hz"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "250 Hz"
+msgstr "250 Hz"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "500 Hz"
+msgstr "500 Hz"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "1 kHz"
+msgstr "1 kHz"
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "2 kHz"
+msgstr "2 kHz"
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "4 kHz"
+msgstr "4 kHz"
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "8 kHz"
+msgstr "8 kHz"
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "16 kHz"
+msgstr "16 kHz"
+
+#: src/skins/equalizer.cc:270 src/skins-qt/equalizer.cc:270
+msgid "Audacious Equalizer"
+msgstr "Audacious Ekolayzır"
+
+#: src/skins/main.cc:459 src/skins-qt/main.cc:442
+msgid "Recording on"
+msgstr "Kaydetme açık"
+
+#: src/skins/main.cc:461 src/skins-qt/main.cc:444
+msgid "Recording off"
+msgstr "Kaydetme kapalı"
+
+#: src/skins/main.cc:754 src/skins-qt/main.cc:701
+#, c-format
+msgid "Seek to %d:%-2.2d / %d:%-2.2d"
+msgstr "Zıpla %d:%-2.2d / %d:%-2.2d"
+
+#: src/skins/main.cc:771 src/skins-qt/main.cc:718
+#, c-format
+msgid "Volume: %d%%"
+msgstr "Ses: %d%%"
+
+#: src/skins/main.cc:784 src/skins-qt/main.cc:731
+#, c-format
+msgid "Balance: %d%% left"
+msgstr "Denge: %d%% sol"
+
+#: src/skins/main.cc:786 src/skins-qt/main.cc:733
+msgid "Balance: center"
+msgstr "Denge: merkez"
+
+#: src/skins/main.cc:788 src/skins-qt/main.cc:735
+#, c-format
+msgid "Balance: %d%% right"
+msgstr "Denge: %d%% sağ"
+
+#: src/skins/main.cc:880 src/skins-qt/main.cc:827
+msgid "Options Menu"
+msgstr "Seçenekler Menüsü"
+
+#: src/skins/main.cc:884 src/skins-qt/main.cc:831
+msgid "Disable 'Always On Top'"
+msgstr "Devre dışı bırak 'Her Zaman Görünür' "
+
+#: src/skins/main.cc:886 src/skins-qt/main.cc:833
+msgid "Enable 'Always On Top'"
+msgstr "Etkinleştir 'Her Zaman Görünür' "
+
+#: src/skins/main.cc:889 src/skins-qt/main.cc:836
+msgid "File Info Box"
+msgstr "Dosya bilgilendirme kutusu"
+
+#: src/skins/main.cc:892 src/skins/menus.cc:149 src/skins-qt/main.cc:839
+#: src/skins-qt/menus.cc:142
+msgid "Double Size"
+msgstr "Çift Boyut"
+
+#: src/skins/main.cc:895 src/skins-qt/main.cc:842
+msgid "Visualizations"
+msgstr "Görseller"
+
+#: src/skins/menus.cc:74 src/skins-qt/menus.cc:64
+msgid "Volume Up"
+msgstr "Ses Yukarı"
+
+#: src/skins/menus.cc:75 src/skins-qt/menus.cc:65
+msgid "Volume Down"
+msgstr "Ses Aşağı"
+
+#: src/skins/menus.cc:77 src/skins-qt/menus.cc:67
+msgid "Effects ..."
+msgstr "Efektler ..."
+
+#: src/skins/menus.cc:84 src/skins-qt/menus.cc:74
 msgid "Open Files ..."
 msgstr "Dosya Aç ..."
 
-#: src/skins/menus.cc:65
+#: src/skins/menus.cc:85 src/skins-qt/menus.cc:76
 msgid "Open URL ..."
 msgstr "URL Aç ..."
 
-#: src/skins/menus.cc:66
-msgid "Search Library"
-msgstr ""
-
-#: src/skins/menus.cc:68
-msgid "Playback"
-msgstr "Çal"
-
-#: src/skins/menus.cc:69
+#: src/skins/menus.cc:89 src/skins-qt/menus.cc:80
 msgid "Playlist"
-msgstr "Parça Listesi"
+msgstr "Çalma Listesi"
 
-#: src/skins/menus.cc:70
+#: src/skins/menus.cc:90 src/skins-qt/menus.cc:81
+msgid "Output"
+msgstr "Çıkış"
+
+#: src/skins/menus.cc:91 src/skins-qt/menus.cc:82
 msgid "View"
 msgstr "Görünüm"
 
-#: src/skins/menus.cc:72 src/skins/menus.cc:136 src/skins/menus.cc:149
-#: src/skins/menus.cc:214
+#: src/skins/menus.cc:93 src/skins/menus.cc:161 src/skins/menus.cc:174
+#: src/skins/menus.cc:245 src/skins-qt/menus.cc:84 src/skins-qt/menus.cc:156
+#: src/skins-qt/menus.cc:170 src/skins-qt/menus.cc:241
 msgid "Services"
 msgstr "Hizmetler"
 
-#: src/skins/menus.cc:74
+#: src/skins/menus.cc:95 src/skins-qt/menus.cc:86
 msgid "About ..."
 msgstr "Hakkında ..."
 
-#: src/skins/menus.cc:75
+#: src/skins/menus.cc:96 src/skins-qt/menus.cc:87
 msgid "Settings ..."
 msgstr "Ayarlar ..."
 
-#: src/skins/menus.cc:76
+#: src/skins/menus.cc:97 src/skins-qt/menus.cc:88
 msgid "Quit"
 msgstr "Çıkış"
 
-#: src/skins/menus.cc:80 src/skins/menus.cc:206
+#: src/skins/menus.cc:101 src/skins/menus.cc:235 src/skins-qt/menus.cc:92
+#: src/skins-qt/menus.cc:231
 msgid "Song Info ..."
 msgstr "Şarkı Bilgisi ..."
 
-#: src/skins/menus.cc:84
-msgid "No Playlist Advance"
-msgstr ""
+#: src/skins/menus.cc:105 src/skins-qt/menus.cc:96
+msgid "Shuffle by Album"
+msgstr "Albüme göre karıştır"
 
-#: src/skins/menus.cc:85
-msgid "Stop After This Song"
-msgstr "Şarkıdan Sonra Durdur"
+#: src/skins/menus.cc:106 src/skins-qt/menus.cc:97
+msgid "No Playlist Advance"
+msgstr "Oynatılabilir Çalma Listesi yok"
 
-#: src/skins/menus.cc:93
+#: src/skins/menus.cc:117 src/skins-qt/menus.cc:108
 msgid "Set A-B Repeat"
-msgstr ""
+msgstr "A-B Tekrarlama'yı Hazırla"
 
-#: src/skins/menus.cc:94
+#: src/skins/menus.cc:118 src/skins-qt/menus.cc:109
 msgid "Clear A-B Repeat"
-msgstr ""
+msgstr "A-B Tekrarlama'yı Kaldır"
 
-#: src/skins/menus.cc:96
+#: src/skins/menus.cc:120 src/skins-qt/menus.cc:111
 msgid "Jump to Song ..."
-msgstr ""
+msgstr "Şarkı'ya Geç"
 
-#: src/skins/menus.cc:97
+#: src/skins/menus.cc:121 src/skins-qt/menus.cc:113
 msgid "Jump to Time ..."
-msgstr ""
+msgstr "Zaman'a Geç"
 
-#: src/skins/menus.cc:101
+#: src/skins/menus.cc:125 src/skins-qt/menus.cc:118
 msgid "Play/Resume"
-msgstr ""
+msgstr "Oynat/Devam et"
 
-#: src/skins/menus.cc:103
+#: src/skins/menus.cc:127 src/skins-qt/menus.cc:120
 msgid "New Playlist"
 msgstr "Yeni Çalma Listesi"
 
-#: src/skins/menus.cc:104
+#: src/skins/menus.cc:128 src/skins-qt/menus.cc:121
 msgid "Rename Playlist ..."
 msgstr "Çalma Listesini Yeniden Adlandır"
 
-#: src/skins/menus.cc:105
+#: src/skins/menus.cc:129 src/skins-qt/menus.cc:122
 msgid "Remove Playlist"
 msgstr "Çalma Listesini Kaldır"
 
-#: src/skins/menus.cc:107
+#: src/skins/menus.cc:131 src/skins-qt/menus.cc:124
 msgid "Previous Playlist"
 msgstr "Önceki Çalma Listesi"
 
-#: src/skins/menus.cc:108
+#: src/skins/menus.cc:132 src/skins-qt/menus.cc:125
 msgid "Next Playlist"
 msgstr "Sonraki Çalma Listesi"
 
-#: src/skins/menus.cc:110
+#: src/skins/menus.cc:134 src/skins-qt/menus.cc:127
 msgid "Import Playlist ..."
 msgstr "Çalma Listesi İçe Aktar"
 
-#: src/skins/menus.cc:111
+#: src/skins/menus.cc:135 src/skins-qt/menus.cc:128
 msgid "Export Playlist ..."
 msgstr "Çalma Listesi Dışa Aktar"
 
-#: src/skins/menus.cc:113
+#: src/skins/menus.cc:137 src/skins-qt/menus.cc:130
 msgid "Playlist Manager ..."
 msgstr "Çalma Listesi Yöneticisi"
 
-#: src/skins/menus.cc:114
+#: src/skins/menus.cc:138 src/skins-qt/menus.cc:131
 msgid "Queue Manager ..."
 msgstr "Kuyruk Yöneticisi"
 
-#: src/skins/menus.cc:116
+#: src/skins/menus.cc:140 src/skins-qt/menus.cc:133
 msgid "Refresh Playlist"
 msgstr "Çalma Listesini Yenile"
 
-#: src/skins/menus.cc:120
+#: src/skins/menus.cc:144 src/skins-qt/menus.cc:137
 msgid "Show Playlist Editor"
-msgstr ""
+msgstr "Çalma Listesi Düzenleyicisini göster"
 
-#: src/skins/menus.cc:121
+#: src/skins/menus.cc:145 src/skins-qt/menus.cc:138
 msgid "Show Equalizer"
-msgstr ""
+msgstr "Ses Dengeleyiciyi göster"
 
-#: src/skins/menus.cc:123
+#: src/skins/menus.cc:147 src/skins-qt/menus.cc:140
 msgid "Show Remaining Time"
-msgstr ""
+msgstr "Kalan Süre'yi göster"
 
-#: src/skins/menus.cc:125
+#: src/skins/menus.cc:150 src/skins-qt/menus.cc:143
 msgid "Always on Top"
 msgstr "Her Zaman Üstte"
 
-#: src/skins/menus.cc:126
+#: src/skins/menus.cc:151 src/skins-qt/menus.cc:145
 msgid "On All Workspaces"
-msgstr ""
+msgstr "Tüm Çalışma Alanlarında"
 
-#: src/skins/menus.cc:128
+#: src/skins/menus.cc:153 src/skins-qt/menus.cc:148
 msgid "Roll Up Player"
-msgstr ""
+msgstr "Çalıcıyı Topla"
 
-#: src/skins/menus.cc:129
+#: src/skins/menus.cc:154 src/skins-qt/menus.cc:149
 msgid "Roll Up Playlist Editor"
-msgstr ""
+msgstr "Oynatma Listesi Düzenleyicisi'ni Topla"
 
-#: src/skins/menus.cc:130
+#: src/skins/menus.cc:155 src/skins-qt/menus.cc:150
 msgid "Roll Up Equalizer"
-msgstr ""
-
-#: src/skins/menus.cc:132 src/skins/ui_main.cc:854
-msgid "Double Size"
-msgstr ""
+msgstr "Ekolayzır'ı Topla"
 
-#: src/skins/menus.cc:138
+#: src/skins/menus.cc:163 src/skins-qt/menus.cc:158
 msgid "Add URL ..."
-msgstr ""
+msgstr "URL Ekle ..."
 
-#: src/skins/menus.cc:139
+#: src/skins/menus.cc:164 src/skins-qt/menus.cc:160
 msgid "Add Files ..."
-msgstr ""
+msgstr "Dosyaları Ekle ..."
 
-#: src/skins/menus.cc:143 src/skins/menus.cc:171 src/skins/menus.cc:185
+#: src/skins/menus.cc:168 src/skins/menus.cc:196 src/skins/menus.cc:212
+#: src/skins-qt/menus.cc:164 src/skins-qt/menus.cc:192
+#: src/skins-qt/menus.cc:208
 msgid "By Title"
-msgstr ""
+msgstr "Başlığa Göre"
 
-#: src/skins/menus.cc:144 src/skins/menus.cc:178 src/skins/menus.cc:192
+#: src/skins/menus.cc:169 src/skins/menus.cc:203 src/skins/menus.cc:219
+#: src/skins-qt/menus.cc:165 src/skins-qt/menus.cc:199
+#: src/skins-qt/menus.cc:215
 msgid "By File Name"
-msgstr ""
+msgstr "Dosya İsmine Göre"
 
-#: src/skins/menus.cc:145 src/skins/menus.cc:179 src/skins/menus.cc:193
+#: src/skins/menus.cc:170 src/skins/menus.cc:204 src/skins/menus.cc:220
+#: src/skins-qt/menus.cc:166 src/skins-qt/menus.cc:200
+#: src/skins-qt/menus.cc:216
 msgid "By File Path"
-msgstr ""
+msgstr "Dosya Yoluna Göre"
 
-#: src/skins/menus.cc:151
+#: src/skins/menus.cc:176 src/skins-qt/menus.cc:172
 msgid "Remove All"
 msgstr "Tümünü Sil"
 
-#: src/skins/menus.cc:152
+#: src/skins/menus.cc:177 src/skins-qt/menus.cc:173
 msgid "Clear Queue"
-msgstr ""
+msgstr "Kuyruğu Temizle"
 
-#: src/skins/menus.cc:154
+#: src/skins/menus.cc:179 src/skins-qt/menus.cc:175
 msgid "Remove Unavailable Files"
 msgstr "Bulunamayan Dosyaları Sil"
 
-#: src/skins/menus.cc:155
+#: src/skins/menus.cc:180 src/skins-qt/menus.cc:176
 msgid "Remove Duplicates"
 msgstr "Birden Fazla Olanı Sil"
 
-#: src/skins/menus.cc:157
+#: src/skins/menus.cc:182 src/skins-qt/menus.cc:178
 msgid "Remove Unselected"
-msgstr ""
+msgstr "Seçilmeyeni Sil"
 
-#: src/skins/menus.cc:158
+#: src/skins/menus.cc:183 src/skins-qt/menus.cc:179
 msgid "Remove Selected"
 msgstr "Seçilenleri Kaldır"
 
-#: src/skins/menus.cc:162
+#: src/skins/menus.cc:187 src/skins-qt/menus.cc:183
 msgid "Search and Select"
 msgstr "Ara ve Seç"
 
-#: src/skins/menus.cc:164
+#: src/skins/menus.cc:189 src/skins-qt/menus.cc:185
 msgid "Invert Selection"
-msgstr ""
+msgstr "Seçimi Ters Çevir"
 
-#: src/skins/menus.cc:165
+#: src/skins/menus.cc:190 src/skins-qt/menus.cc:186
 msgid "Select None"
 msgstr "Hiçbiri Seçilmedi"
 
-#: src/skins/menus.cc:166
+#: src/skins/menus.cc:191 src/skins-qt/menus.cc:187
 msgid "Select All"
 msgstr "Tümünü_Seç"
 
-#: src/skins/menus.cc:170 src/skins/menus.cc:184
+#: src/skins/menus.cc:195 src/skins/menus.cc:211 src/skins-qt/menus.cc:191
+#: src/skins-qt/menus.cc:207
 msgid "By Track Number"
-msgstr ""
+msgstr "Parça Numarasına Göre"
 
-#: src/skins/menus.cc:172 src/skins/menus.cc:186
+#: src/skins/menus.cc:197 src/skins/menus.cc:213 src/skins-qt/menus.cc:193
+#: src/skins-qt/menus.cc:209
 msgid "By Artist"
-msgstr ""
+msgstr "Sanatçıya Göre"
 
-#: src/skins/menus.cc:173 src/skins/menus.cc:187
+#: src/skins/menus.cc:198 src/skins/menus.cc:214 src/skins-qt/menus.cc:194
+#: src/skins-qt/menus.cc:210
 msgid "By Album"
-msgstr ""
+msgstr "Albüme Göre"
 
-#: src/skins/menus.cc:174 src/skins/menus.cc:188
+#: src/skins/menus.cc:199 src/skins/menus.cc:215 src/skins-qt/menus.cc:195
+#: src/skins-qt/menus.cc:211
 msgid "By Album Artist"
-msgstr ""
+msgstr "Albüm Sanatçısına Göre"
 
-#: src/skins/menus.cc:175 src/skins/menus.cc:190
+#: src/skins/menus.cc:200 src/skins/menus.cc:216 src/skins-qt/menus.cc:196
+#: src/skins-qt/menus.cc:212
 msgid "By Release Date"
-msgstr ""
+msgstr "Yayınlama Tarihine Göre"
 
-#: src/skins/menus.cc:176 src/skins/menus.cc:189
+#: src/skins/menus.cc:201 src/skins/menus.cc:217 src/skins-qt/menus.cc:197
+#: src/skins-qt/menus.cc:213
 msgid "By Genre"
-msgstr ""
+msgstr "Türüne Göre"
 
-#: src/skins/menus.cc:177 src/skins/menus.cc:191
+#: src/skins/menus.cc:202 src/skins/menus.cc:218 src/skins-qt/menus.cc:198
+#: src/skins-qt/menus.cc:214
 msgid "By Length"
-msgstr ""
+msgstr "Uzunluğuna Göre"
 
-#: src/skins/menus.cc:180 src/skins/menus.cc:194
+#: src/skins/menus.cc:205 src/skins/menus.cc:221 src/skins-qt/menus.cc:201
+#: src/skins-qt/menus.cc:217
 msgid "By Custom Title"
+msgstr "Özel Başlığa Göre"
+
+#: src/skins/menus.cc:206 src/skins/menus.cc:222 src/skins-qt/menus.cc:202
+#: src/skins-qt/menus.cc:218
+msgid "By Comment"
+msgstr "Yoruma Göre"
+
+#: src/skins/menus.cc:207 src/skins/menus.cc:223 src/skins-qt/menus.cc:203
+#: src/skins-qt/menus.cc:219
+msgid "By Disc Number"
 msgstr ""
 
-#: src/skins/menus.cc:198
+#: src/skins/menus.cc:227 src/skins-qt/menus.cc:223
 msgid "Randomize List"
 msgstr "Rastgele Listele"
 
-#: src/skins/menus.cc:199
+#: src/skins/menus.cc:228 src/skins-qt/menus.cc:224
 msgid "Reverse List"
-msgstr ""
+msgstr "Ters Liste"
 
-#: src/skins/menus.cc:201
+#: src/skins/menus.cc:230 src/skins-qt/menus.cc:226
 msgid "Sort Selected"
-msgstr ""
+msgstr "Seçileni Sırala"
 
-#: src/skins/menus.cc:202
+#: src/skins/menus.cc:231 src/skins-qt/menus.cc:227
 msgid "Sort List"
 msgstr "Kısa Liste"
 
-#: src/skins/menus.cc:208
+#: src/skins/menus.cc:236 src/skins-qt/menus.cc:232
+msgid "Open Containing Folder"
+msgstr "İçeren Dizini Aç"
+
+#: src/skins/menus.cc:238 src/skins-qt/menus.cc:234
 msgid "Cut"
 msgstr "Kes"
 
-#: src/skins/menus.cc:209
+#: src/skins/menus.cc:239 src/skins-qt/menus.cc:235
 msgid "Copy"
 msgstr "Kopyala"
 
-#: src/skins/menus.cc:210
+#: src/skins/menus.cc:240 src/skins-qt/menus.cc:236
 msgid "Paste"
 msgstr "Yapıştır"
 
-#: src/skins/menus.cc:212
-msgid "Queue/Unqueue"
-msgstr ""
-
-#: src/skins/menus.cc:218
-msgid "Load Preset ..."
-msgstr ""
-
-#: src/skins/menus.cc:219
-msgid "Load Auto Preset ..."
-msgstr ""
-
-#: src/skins/menus.cc:220
-msgid "Load Default"
-msgstr ""
-
-#: src/skins/menus.cc:221
-msgid "Load Preset File ..."
-msgstr ""
+#: src/skins/menus.cc:241 src/skins-qt/menus.cc:237
+msgid "Paste at End"
+msgstr "Sonunda Yapıştır"
 
-#: src/skins/menus.cc:222
-msgid "Load EQF File ..."
-msgstr ""
-
-#: src/skins/menus.cc:224
-msgid "Save Preset ..."
-msgstr ""
-
-#: src/skins/menus.cc:225
-msgid "Save Auto Preset ..."
-msgstr ""
-
-#: src/skins/menus.cc:226
-msgid "Save Default"
-msgstr ""
-
-#: src/skins/menus.cc:227
-msgid "Save Preset File ..."
-msgstr ""
-
-#: src/skins/menus.cc:228
-msgid "Save EQF File ..."
-msgstr ""
-
-#: src/skins/menus.cc:230
-msgid "Delete Preset ..."
-msgstr ""
-
-#: src/skins/menus.cc:231
-msgid "Delete Auto Preset ..."
-msgstr ""
+#: src/skins/menus.cc:243 src/skins-qt/menus.cc:239
+msgid "Queue/Unqueue"
+msgstr "Kuyruğa Ekle/Kaldır"
 
-#: src/skins/menus.cc:233
-msgid "Import Winamp Presets ..."
-msgstr ""
+#: src/skins/playlist-widget.cc:58 src/skins-qt/playlist-widget.cc:58
+#, c-format
+msgid "%s (%d of %d)"
+msgstr "%s (%d 'den %d 'si)"
 
-#: src/skins/menus.cc:235
-msgid "Reset to Zero"
-msgstr ""
+#: src/skins/playlistwin.cc:491 src/skins-qt/playlistwin.cc:478
+msgid "Audacious Playlist Editor"
+msgstr "Audacious Çalma Listesi Düzenleyici"
 
-#: src/skins/plugin.cc:48
+#: src/skins/plugin.cc:53 src/skins-qt/plugin.cc:65
 msgid "Winamp Classic Interface"
-msgstr ""
-
-#: src/skins/preset-browser.cc:57 src/skins/preset-list.cc:371
-#: src/skins/preset-list.cc:386
-msgid "Save"
-msgstr "Kaydet"
-
-#: src/skins/preset-browser.cc:57 src/skins/preset-list.cc:338
-#: src/skins/preset-list.cc:354
-msgid "Load"
-msgstr "Yükle"
+msgstr "Winamp Klasik Arayüzü"
 
-#: src/skins/preset-browser.cc:83
-msgid "Load Preset File"
-msgstr ""
+#: src/skins-qt/menus.cc:75
+msgid "Open Folder ..."
+msgstr "Dizin Aç ..."
 
-#: src/skins/preset-browser.cc:100
-msgid "Load EQF File"
-msgstr ""
+#: src/skins-qt/menus.cc:159
+msgid "Add Folder ..."
+msgstr "Dizin Ekle ..."
 
-#: src/skins/preset-browser.cc:119
-msgid "Save Preset File"
-msgstr ""
+#: src/skins-qt/search-select.cc:62 src/skins/search-select.cc:77
+msgid "Search entries in active playlist"
+msgstr "Etkin oynatma listesinde arama girişleri"
 
-#: src/skins/preset-browser.cc:137
-msgid "Save EQF File"
+#: src/skins-qt/search-select.cc:70 src/skins/search-select.cc:83
+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 ""
+"Bir veya daha fazla alanı doldurarak oynatma listesindeki girişleri seçin. "
+"Alanlarda normal ifadeler sözdizimi, büyük / küçük harf duyarlı değil. "
+"Normal ifadelerin nasıl çalıştığını bilmiyorsanız, aradığınız şeylerin basit "
+"bir kısmını eklemeniz yeterlidir."
 
-#: src/skins/preset-browser.cc:151
-msgid "Import Winamp Presets"
-msgstr ""
+#: src/skins-qt/search-select.cc:75 src/skins/search-select.cc:91
+msgid "Title:"
+msgstr "Başlık:"
 
-#: src/skins/preset-list.cc:285
-msgid "Presets"
-msgstr ""
+#: src/skins-qt/search-select.cc:79 src/skins/search-select.cc:96
+msgid "Album:"
+msgstr "Albüm:"
 
-#: src/skins/preset-list.cc:335
-msgid "Load preset"
-msgstr ""
+#: src/skins-qt/search-select.cc:82 src/skins/search-select.cc:101
+msgid "Artist:"
+msgstr "Sanatçı:"
 
-#: src/skins/preset-list.cc:351
-msgid "Load auto-preset"
-msgstr ""
+#: src/skins-qt/search-select.cc:85 src/skins/search-select.cc:106
+msgid "File Name:"
+msgstr "Dosya Adı:"
 
-#: src/skins/preset-list.cc:367
-msgid "Save preset"
-msgstr ""
+#: src/skins-qt/search-select.cc:88 src/skins/search-select.cc:134
+msgid "Clear previous selection before searching"
+msgstr "Önceki aramaları temizle"
 
-#: src/skins/preset-list.cc:382
-msgid "Save auto-preset"
-msgstr ""
+#: src/skins-qt/search-select.cc:89 src/skins/search-select.cc:137
+msgid "Automatically toggle queue for matching entries"
+msgstr "Eşleşen girişler için sıraya otomatik olarak geçiş yap"
 
-#: src/skins/preset-list.cc:408
-msgid "Delete preset"
-msgstr ""
+#: src/skins-qt/search-select.cc:90 src/skins/search-select.cc:140
+msgid "Create a new playlist with matching entries"
+msgstr "Eşleşen girişlerle yeni bir oynatma listesi oluşturun"
 
-#: src/skins/preset-list.cc:424
-msgid "Delete auto-preset"
-msgstr ""
+#: src/skins-qt/search-select.cc:101 src/skins/search-select.cc:78
+msgid "Search"
+msgstr "Ara"
 
-#: src/skins/skins_cfg.cc:176
+#: src/skins-qt/skins_cfg.cc:198 src/skins/skins_cfg.cc:182
 msgid "Player:"
-msgstr ""
+msgstr "Çalıcı:"
 
-#: src/skins/skins_cfg.cc:178
+#: src/skins-qt/skins_cfg.cc:200 src/skins/skins_cfg.cc:184
 msgid "Select main player window font:"
 msgstr "Arayüz yazı tipini seçiniz:"
 
-#: src/skins/skins_cfg.cc:179
+#: src/skins-qt/skins_cfg.cc:201 src/skins/skins_cfg.cc:185
 msgid "Playlist:"
-msgstr ""
+msgstr "Çalma Listesi:"
 
-#: src/skins/skins_cfg.cc:181
+#: src/skins-qt/skins_cfg.cc:203 src/skins/skins_cfg.cc:187
 msgid "Select playlist font:"
-msgstr ""
+msgstr "Çalma listesi yazıtipi seç:"
 
-#: src/skins/skins_cfg.cc:187
+#: src/skins-qt/skins_cfg.cc:207 src/skins/skins_cfg.cc:191
 msgid "Skin"
-msgstr ""
+msgstr "Kabuk"
 
-#: src/skins/skins_cfg.cc:189
+#: src/skins-qt/skins_cfg.cc:211 src/skins/skins_cfg.cc:193
+msgid "Display active titlebar when any window is focused"
+msgstr "Herhangi bir pencere odaklandığında aktif başlık çubuğunu görüntüle"
+
+#: src/skins-qt/skins_cfg.cc:213 src/skins/skins_cfg.cc:195
 msgid "Fonts"
-msgstr ""
+msgstr "Yazıtipleri"
 
-#: src/skins/skins_cfg.cc:192
+#: src/skins-qt/skins_cfg.cc:215 src/skins/skins_cfg.cc:197
 msgid "Use bitmap fonts (supports ASCII only)"
-msgstr ""
+msgstr "Bitmap yazı tiplerini kullan (yalnızca ASCII'yi destekler)"
 
-#: src/skins/skins_cfg.cc:194
+#: src/skins-qt/skins_cfg.cc:217 src/skins/skins_cfg.cc:199
 msgid "Scroll song title"
-msgstr ""
+msgstr "Şarkı başlığını kaydır"
 
-#: src/skins/skins_cfg.cc:196
+#: src/skins-qt/skins_cfg.cc:219 src/skins/skins_cfg.cc:201
 msgid "Scroll song title in both directions"
-msgstr ""
+msgstr "Her iki yönde şarkı başlığını kaydır"
 
-#: src/skins/skins_cfg.cc:201
+#: src/skins-qt/skins_cfg.cc:224 src/skins/skins_cfg.cc:206
 msgid "Analyzer"
 msgstr "Analiz Et"
 
-#: src/skins/skins_cfg.cc:202
+#: src/skins-qt/skins_cfg.cc:225 src/skins/skins_cfg.cc:207
 msgid "Scope"
-msgstr ""
+msgstr "Kapsam"
 
-#: src/skins/skins_cfg.cc:203
+#: src/skins-qt/skins_cfg.cc:226 src/skins/skins_cfg.cc:208
 msgid "Voiceprint / VU meter"
-msgstr ""
+msgstr "Ses izi / VU metre"
 
-#: src/skins/skins_cfg.cc:204
+#: src/skins-qt/skins_cfg.cc:227 src/skins/skins_cfg.cc:209
 msgid "Off"
 msgstr "Kapalı"
 
-#: src/skins/skins_cfg.cc:208 src/skins/skins_cfg.cc:233
-#: src/skins/skins_cfg.cc:239
+#: src/skins-qt/skins_cfg.cc:231 src/skins-qt/skins_cfg.cc:256
+#: src/skins-qt/skins_cfg.cc:262 src/skins/skins_cfg.cc:213
+#: src/skins/skins_cfg.cc:238 src/skins/skins_cfg.cc:244
 msgid "Normal"
 msgstr "Normal"
 
-#: src/skins/skins_cfg.cc:209 src/skins/skins_cfg.cc:234
+#: src/skins-qt/skins_cfg.cc:232 src/skins-qt/skins_cfg.cc:257
+#: src/skins/skins_cfg.cc:214 src/skins/skins_cfg.cc:239
 msgid "Fire"
 msgstr "Ateş"
 
-#: src/skins/skins_cfg.cc:210
+#: src/skins-qt/skins_cfg.cc:233 src/skins/skins_cfg.cc:215
 msgid "Vertical lines"
-msgstr ""
+msgstr "Dikey çizgiler"
 
-#: src/skins/skins_cfg.cc:214
+#: src/skins-qt/skins_cfg.cc:237 src/skins/skins_cfg.cc:219
 msgid "Lines"
 msgstr "Çizgiler"
 
-#: src/skins/skins_cfg.cc:215
+#: src/skins-qt/skins_cfg.cc:238 src/skins/skins_cfg.cc:220
 msgid "Bars"
 msgstr "Çubuk"
 
-#: src/skins/skins_cfg.cc:219
+#: src/skins-qt/skins_cfg.cc:242 src/skins/skins_cfg.cc:224
 msgid "Slowest"
-msgstr ""
+msgstr "En yavaş"
 
-#: src/skins/skins_cfg.cc:220
+#: src/skins-qt/skins_cfg.cc:243 src/skins/skins_cfg.cc:225
 msgid "Slow"
 msgstr "Yavaş"
 
-#: src/skins/skins_cfg.cc:221 src/sox-resampler/sox-resampler.cc:152
+#: src/skins-qt/skins_cfg.cc:244 src/skins/skins_cfg.cc:226
+#: src/soxr/sox-resampler.cc:180
 msgid "Medium"
 msgstr "Orta"
 
-#: src/skins/skins_cfg.cc:222
+#: src/skins-qt/skins_cfg.cc:245 src/skins/skins_cfg.cc:227
 msgid "Fast"
 msgstr "Hızlı"
 
-#: src/skins/skins_cfg.cc:223
+#: src/skins-qt/skins_cfg.cc:246 src/skins/skins_cfg.cc:228
 msgid "Fastest"
-msgstr ""
+msgstr "En hızlı"
 
-#: src/skins/skins_cfg.cc:227
+#: src/skins-qt/skins_cfg.cc:250 src/skins/skins_cfg.cc:232
 msgid "Dots"
-msgstr ""
+msgstr "Noktalar"
 
-#: src/skins/skins_cfg.cc:228
+#: src/skins-qt/skins_cfg.cc:251 src/skins/skins_cfg.cc:233
 msgid "Line"
-msgstr ""
+msgstr "Satır"
 
-#: src/skins/skins_cfg.cc:229
+#: src/skins-qt/skins_cfg.cc:252 src/skins/skins_cfg.cc:234
 msgid "Solid"
-msgstr ""
+msgstr "Katı"
 
-#: src/skins/skins_cfg.cc:235
+#: src/skins-qt/skins_cfg.cc:258 src/skins/skins_cfg.cc:240
 msgid "Ice"
-msgstr ""
+msgstr "Buz"
 
-#: src/skins/skins_cfg.cc:240
+#: src/skins-qt/skins_cfg.cc:263 src/skins/skins_cfg.cc:245
 msgid "Smooth"
-msgstr ""
+msgstr "Pürüzsüz"
 
-#: src/skins/skins_cfg.cc:244
-msgid "Type"
-msgstr ""
-
-#: src/skins/skins_cfg.cc:245
-msgid "Visualization type:"
-msgstr ""
-
-#: src/skins/skins_cfg.cc:248
-msgid "Analyzer"
-msgstr ""
-
-#: src/skins/skins_cfg.cc:249
-msgid "Show peaks"
-msgstr ""
-
-#: src/skins/skins_cfg.cc:251
+#: src/skins-qt/skins_cfg.cc:267 src/skins/skins_cfg.cc:249
 msgid "Coloring:"
-msgstr ""
+msgstr "Boyama:"
 
-#: src/skins/skins_cfg.cc:254
+#: src/skins-qt/skins_cfg.cc:270 src/skins/skins_cfg.cc:252
 msgid "Style:"
-msgstr ""
+msgstr "Tarz:"
 
-#: src/skins/skins_cfg.cc:257
+#: src/skins-qt/skins_cfg.cc:273 src/skins/skins_cfg.cc:255
 msgid "Falloff:"
-msgstr ""
+msgstr "Düşme:"
 
-#: src/skins/skins_cfg.cc:260
+#: src/skins-qt/skins_cfg.cc:276 src/skins/skins_cfg.cc:258
 msgid "Peak falloff:"
-msgstr ""
+msgstr "Tepe düşme:"
 
-#: src/skins/skins_cfg.cc:264
+#: src/skins-qt/skins_cfg.cc:282 src/skins/skins_cfg.cc:264
 msgid "Scope Style:"
-msgstr ""
+msgstr "Kapsam Tarzı:"
 
-#: src/skins/skins_cfg.cc:267
+#: src/skins-qt/skins_cfg.cc:285 src/skins/skins_cfg.cc:267
 msgid "Voiceprint Coloring:"
-msgstr ""
+msgstr "Ses izi Boyama:"
 
-#: src/skins/skins_cfg.cc:270
+#: src/skins-qt/skins_cfg.cc:288 src/skins/skins_cfg.cc:270
 msgid "VU Meter Style:"
-msgstr ""
-
-#: src/skins/skins_cfg.cc:276
-msgid "General"
-msgstr "Genel"
-
-#: src/skins/skins_cfg.cc:277
-msgid "Visualization"
-msgstr "Görselleştirme"
-
-#: src/skins/ui_equalizer.cc:282
-msgid "Preamp"
-msgstr "Preamp"
-
-#: src/skins/ui_equalizer.cc:286
-msgid "31 Hz"
-msgstr "31 Hz"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "63 Hz"
-msgstr "63 Hz"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "125 Hz"
-msgstr "125 Hz"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "250 Hz"
-msgstr "250 Hz"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "500 Hz"
-msgstr ""
-
-#: src/skins/ui_equalizer.cc:287
-msgid "1 kHz"
-msgstr ""
-
-#: src/skins/ui_equalizer.cc:288
-msgid "2 kHz"
-msgstr ""
-
-#: src/skins/ui_equalizer.cc:288
-msgid "4 kHz"
-msgstr ""
-
-#: src/skins/ui_equalizer.cc:288
-msgid "8 kHz"
-msgstr ""
-
-#: src/skins/ui_equalizer.cc:288
-msgid "16 kHz"
-msgstr ""
-
-#: src/skins/ui_equalizer.cc:330
-msgid "Audacious Equalizer"
-msgstr "Audacious Ekolayzır"
-
-#: src/skins/ui_main.cc:688
-#, c-format
-msgid "Seek to %d:%-2.2d / %d:%-2.2d"
-msgstr "Zıpla %d:%-2.2d / %d:%-2.2d"
-
-#: src/skins/ui_main.cc:709
-#, c-format
-msgid "Volume: %d%%"
-msgstr "Ses: %d%%"
-
-#: src/skins/ui_main.cc:732
-#, c-format
-msgid "Balance: %d%% left"
-msgstr ""
-
-#: src/skins/ui_main.cc:734
-msgid "Balance: center"
-msgstr ""
-
-#: src/skins/ui_main.cc:736
-#, c-format
-msgid "Balance: %d%% right"
-msgstr ""
-
-#: src/skins/ui_main.cc:842
-msgid "Options Menu"
-msgstr "Seçenekler Menüsü"
-
-#: src/skins/ui_main.cc:846
-msgid "Disable 'Always On Top'"
-msgstr "Devre dışı bırak 'Her Zaman Görünür' "
-
-#: src/skins/ui_main.cc:848
-msgid "Enable 'Always On Top'"
-msgstr "Etkinleştir 'Her Zaman Görünür' "
-
-#: src/skins/ui_main.cc:851
-msgid "File Info Box"
-msgstr ""
-
-#: src/skins/ui_main.cc:857
-msgid "Visualizations"
-msgstr ""
-
-#: src/skins/ui_main.cc:1336
-msgid "Repeat point A set."
-msgstr ""
+msgstr "VU Metre Tarzı:"
 
-#: src/skins/ui_main.cc:1341
-msgid "Repeat point B set."
-msgstr ""
-
-#: src/skins/ui_main.cc:1350
-msgid "Repeat points cleared."
-msgstr ""
-
-#: src/skins/ui_playlist.cc:219
-msgid "Search entries in active playlist"
-msgstr ""
-
-#: src/skins/ui_playlist.cc:226
-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.cc:234
-msgid "Title:"
-msgstr ""
-
-#: src/skins/ui_playlist.cc:241
-msgid "Album:"
-msgstr ""
-
-#: src/skins/ui_playlist.cc:248
-msgid "Artist:"
-msgstr ""
-
-#: src/skins/ui_playlist.cc:255
-msgid "File Name:"
-msgstr ""
-
-#: src/skins/ui_playlist.cc:263
-msgid "Clear previous selection before searching"
-msgstr "Önceki aramaları temizle"
+#: src/skins-qt/skins_cfg.cc:294 src/skins/skins_cfg.cc:276
+msgid "Type"
+msgstr "Tür"
 
-#: src/skins/ui_playlist.cc:266
-msgid "Automatically toggle queue for matching entries"
-msgstr ""
+#: src/skins-qt/skins_cfg.cc:295 src/skins/skins_cfg.cc:277
+msgid "Visualization type:"
+msgstr "Görselleştirme türü:"
 
-#: src/skins/ui_playlist.cc:269
-msgid "Create a new playlist with matching entries"
-msgstr ""
+#: src/skins-qt/skins_cfg.cc:298 src/skins/skins_cfg.cc:280
+msgid "Analyzer"
+msgstr "Çözümleyici"
 
-#: src/skins/ui_playlist.cc:717
-msgid "Audacious Playlist Editor"
-msgstr ""
+#: src/skins-qt/skins_cfg.cc:299 src/skins/skins_cfg.cc:281
+msgid "Show peaks"
+msgstr "Tepeleri göster"
 
-#: src/skins/ui_playlist.cc:752
-#, c-format
-msgid "%s (%d of %d)"
-msgstr ""
+#: src/skins-qt/skins_cfg.cc:308 src/skins/skins_cfg.cc:290
+msgid "Visualization"
+msgstr "Görselleştirme"
 
-#: src/skins/ui_skinselector.cc:167
+#: src/skins-qt/skinselector.cc:98 src/skins/skinselector.cc:111
 msgid "Archived Winamp 2.x skin"
-msgstr ""
+msgstr "Arşivlenmiş Winamp 2.x kabuğu"
 
-#: src/skins/ui_skinselector.cc:172
+#: src/skins-qt/skinselector.cc:102 src/skins/skinselector.cc:115
 msgid "Unarchived Winamp 2.x skin"
-msgstr ""
-
-#: src/skins/util.cc:430
-#, c-format
-msgid "Could not create directory (%s): %s\n"
-msgstr ""
+msgstr "Arşivlenmemiş Winamp 2.x kabuğu"
 
-#: src/sndfile/plugin.cc:39
+#: src/sndfile/plugin.cc:38
 msgid "Sndfile Plugin"
-msgstr ""
+msgstr "Sndfile Eklentisi"
 
-#: src/sndfile/plugin.cc:336
+#: src/sndfile/plugin.cc:372
 msgid ""
 "Based on the xmms_sndfile plugin:\n"
 "Copyright (C) 2000, 2002 Erik de Castro Lopo\n"
@@ -3696,95 +4204,130 @@
 "this program; if not, write to the Free Software Foundation, Inc., 51 "
 "Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 msgstr ""
+"Xmms_sndfile eklentisine dayanarak:\n"
+"Telif Hakkı (C) 2000, 2002 Erik de Castro Lopo\n"
+"\n"
+"Audacious için Tony Vroon tarafından uyarlanmıştır <chainsaw@gentoo.org>\n"
+"\n"
+"Bu program ücretsiz bir yazılımdır; Özgür Yazılım Vakfı tarafından "
+"yayımlanan GNU Genel Kamu Lisansı şartlarına göre yeniden dağıtabilir ve / "
+"veya değiştirebilirsiniz. Lisansın 2 numaralı sürümü veya (seçimlerinize "
+"göre) herhangi bir sonraki sürümü.\n"
+"\n"
+"Bu program yararlı olacağı umuduyla dağıtılır, ancak HERHANGİ BİR GARANTİ "
+"OLMAKSIZIN; SATILABİLİRLİK veya BELİRLİ BİR AMACA UYGUNLUĞU'nun zımni "
+"garantisi dahi olmadan. Daha fazla bilgi için GNU Genel Kamu Lisansına "
+"bakınız.\n"
+"\n"
+"Bu programla birlikte GNU Genel Kamu Lisansının bir kopyasını almış "
+"olmalısınız; eğer değilse, Free Software Foundation, Inc., 51 Franklin "
+"Street, Beşinci Kat, Boston, MA 02110-1301, ABD'ye yazın."
 
-#: src/sndio-ng/sndio.cc:44
+#: src/sndio/sndio.cc:43
 msgid "Sndio Output"
-msgstr ""
+msgstr "Sndio Çıkışı"
 
-#: src/sndio-ng/sndio.cc:98
+#: src/sndio/sndio.cc:98
 msgid "Device (blank for default):"
-msgstr ""
+msgstr "Aygıt (varsayılan olarak boş):"
 
-#: src/sndio-ng/sndio.cc:100
+#: src/sndio/sndio.cc:100
 msgid "Save and restore volume:"
-msgstr ""
+msgstr "Sesi kaydet ve geri yükle:"
 
-#: src/sndio-ng/sndio.cc:181
+#: src/sndio/sndio.cc:181
 #, c-format
 msgid "Sndio error: Unsupported audio format (%d)"
-msgstr ""
+msgstr "Sndio hatası: Desteklenmeyen ses biçimi (%d)"
 
-#: src/sndio-ng/sndio.cc:192
+#: src/sndio/sndio.cc:192
 msgid "Sndio error: sio_open() failed"
-msgstr ""
+msgstr "Sndio hatası: sio_open () başarısız oldu"
 
-#: src/sndio-ng/sndio.cc:222
+#: src/sndio/sndio.cc:221
 msgid "Sndio error: sio_setpar() failed"
-msgstr ""
+msgstr "Sndio hatası: sio_setpar () başarısız oldu"
 
-#: src/sndio-ng/sndio.cc:234
+#: src/sndio/sndio.cc:233
 msgid "Sndio error: sio_start() failed"
-msgstr ""
+msgstr "Sndio hatası: sio_start () başarısız oldu"
 
-#: src/song_change/song_change.cc:33
+#: src/songchange/song_change.cc:30
 msgid "Song Change"
 msgstr "Şarkıyı değiştir"
 
-#: src/song_change/song_change.cc:342
-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.cc:358
+#: src/songchange/song_change.cc:256
 msgid "Commands"
-msgstr ""
+msgstr "Komutlar"
 
-#: src/song_change/song_change.cc:360
+#: src/songchange/song_change.cc:258
 msgid "Command to run when starting a new song:"
+msgstr "Yeni bir şarkı başlatırken çalıştırılacak komut:"
+
+#: src/songchange/song_change.cc:261
+msgid "Command to run when stopping a song:"
 msgstr ""
 
-#: src/song_change/song_change.cc:364
+#: src/songchange/song_change.cc:264
 msgid "Command to run at the end of a song:"
-msgstr ""
+msgstr "Bir şarkının sonunda çalıştırmak için komut:"
 
-#: src/song_change/song_change.cc:368
+#: src/songchange/song_change.cc:267
 msgid "Command to run at the end of the playlist:"
-msgstr ""
+msgstr "Çalma listesinin sonunda çalıştırılacak komut:"
 
-#: src/song_change/song_change.cc:372
+#: src/songchange/song_change.cc:270
 msgid "Command to run when song title changes (for network streams):"
+msgstr "Şarkı adı değiştiğinde çalıştırılacak komut (ağ akışları için):"
+
+#: src/songchange/song_change.cc:273
+msgid ""
+"You can use the following format codes, which will be replaced before "
+"running the command.\n"
+"Not all are useful though for the song-stopped or end-of-playlist command."
 msgstr ""
 
-#: src/song_change/song_change.cc:376
+#: src/songchange/song_change.cc:276
 msgid ""
-"You can use the following format strings which will be substituted before "
-"calling the command (not all are useful for the end-of-playlist command):\n"
-"\n"
-"%F: Frequency (in hertz)\n"
+"%a: Artist\n"
+"%b: Album\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"
+"%F: Frequency (Hertz)\n"
+"%l: Length (milliseconds)\n"
+"%n or %s: Formatted title (see playlist settings)\n"
 "%p: Currently playing (1 or 0)\n"
-"%a: Artist\n"
-"%b: Album\n"
-"%T: Track title"
-msgstr ""
-
-#: src/song-info-qt/song-info.cc:32
-msgid "Song Info (Qt)"
-msgstr ""
+"%r: Rate (bits per second)\n"
+"%t: Playlist position\n"
+"%T: Title (unformatted)"
+msgstr ""
+"%a: Sanatçı\n"
+"%b: Albüm\n"
+"%c: Kanalların Sayısı\n"
+"%f: Dosya adı (tam yol)\n"
+"%F: Frekans (Hertz)\n"
+"%l: Uzunluk (milisaniye)\n"
+"%n or %s: Biçimlendirilmiş başlık (çalma listesi ayarlarına bakın)\n"
+"%p: Şu anda çalan (1 veya 0)\n"
+"%r: Oran (Saniye başına bit)\n"
+"%t: Çalma listesi konumu\n"
+"%T: Başlık (biçimlendirilmemiş)"
+
+#: src/songchange/song_change.cc:287
+msgid ""
+"Parameters passed to the shell should be enclosed in quotation marks.\n"
+"Unquoted parameters may lead to unexpected results."
+msgstr ""
+
+#: src/song-info-qt/song-info.cc:30
+msgid "Song Info"
+msgstr "Şarkı Bilgisi"
 
-#: src/sox-resampler/sox-resampler.cc:44
+#: src/soxr/sox-resampler.cc:44
 msgid "SoX Resampler"
-msgstr ""
+msgstr "SoX Resampler"
 
-#: src/sox-resampler/sox-resampler.cc:144
+#: src/soxr/sox-resampler.cc:172
 msgid ""
 "SoX Resampler Plugin for Audacious\n"
 "Copyright 2013 Michał Lipski\n"
@@ -3792,89 +4335,148 @@
 "Based on Sample Rate Converter Plugin:\n"
 "Copyright 2010-2012 John Lindgren"
 msgstr ""
+"Audacious için Sox Resampler Eklentisi\n"
+"Telif Hakkı 2013 Michał Lipski\n"
+"\n"
+"Örnekleme Hızı Dönüştürücü Eklentisine dayalı:\n"
+"Copyright 2010-2012 John Lindgren"
 
-#: src/sox-resampler/sox-resampler.cc:150
+#: src/soxr/sox-resampler.cc:178
 msgid "Quick"
 msgstr "Hızlı"
 
-#: src/sox-resampler/sox-resampler.cc:151
+#: src/soxr/sox-resampler.cc:179
 msgid "Low"
 msgstr "Düşük"
 
-#: src/sox-resampler/sox-resampler.cc:153
+#: src/soxr/sox-resampler.cc:181
 msgid "High"
 msgstr "Yüksek"
 
-#: src/sox-resampler/sox-resampler.cc:154
+#: src/soxr/sox-resampler.cc:182
 msgid "Very High"
 msgstr "Daha Yüksek"
 
-#: src/sox-resampler/sox-resampler.cc:158
+#: src/soxr/sox-resampler.cc:183
+msgid "Ultra High"
+msgstr "Çok Yüksek"
+
+#: src/soxr/sox-resampler.cc:187
+msgid "Minimum"
+msgstr "En az"
+
+#: src/soxr/sox-resampler.cc:188
+msgid "Intermediate"
+msgstr "Orta düzey"
+
+#: src/soxr/sox-resampler.cc:193
 msgid "Quality:"
 msgstr "Kalite:"
 
-#: src/speed-pitch/speed-pitch.cc:51
+#: src/soxr/sox-resampler.cc:196
+msgid "Phase:"
+msgstr "Faz:"
+
+#: src/soxr/sox-resampler.cc:200
+msgid "Allow aliasing"
+msgstr "Allow aliasing"
+
+#: src/soxr/sox-resampler.cc:202
+msgid "Use steep filter"
+msgstr "Dik filtre kullan"
+
+#: src/speedpitch/speed-pitch.cc:54
 msgid "Speed and Pitch"
-msgstr ""
+msgstr "Hız ve Saha"
 
-#: src/speed-pitch/speed-pitch.cc:210
-msgid "Speed and Pitch"
-msgstr ""
+#: src/speedpitch/speed-pitch.cc:247
+msgid "Speed"
+msgstr "Hız"
 
-#: src/speed-pitch/speed-pitch.cc:211
-msgid "Speed:"
-msgstr "Hız:"
+#: src/speedpitch/speed-pitch.cc:248
+msgid "Decouple from pitch"
+msgstr "Sahadan çözme"
 
-#: src/speed-pitch/speed-pitch.cc:214
-msgid "Pitch:"
-msgstr ""
+#: src/speedpitch/speed-pitch.cc:250 src/speedpitch/speed-pitch.cc:258
+msgid "Multiplier:"
+msgstr "Çarpan:"
 
-#: src/statusicon/statusicon.cc:47
-msgid "Status Icon"
-msgstr "Durum iconu"
+#: src/speedpitch/speed-pitch.cc:254
+msgid "Pitch"
+msgstr "Saha"
 
-#: src/statusicon/statusicon.cc:283
-msgid "Se_ttings ..."
-msgstr ""
+#: src/statusicon-qt/statusicon.cc:45 src/statusicon/statusicon.cc:47
+msgid "Status Icon"
+msgstr "Durum Simgesi"
 
-#: src/statusicon/statusicon.cc:372
+#: src/statusicon-qt/statusicon.cc:68
 msgid ""
-"Status Icon Plugin\n"
+"Status Icon Plugin (partial port for Qt interface)\n"
 "\n"
 "Copyright 2005-2007 Giacomo Lozito <james@develia.org>\n"
 "Copyright 2010 Michał Lipski <tallica@o2.pl>\n"
+"Copyright 2015 Eugene Paskevich <eugene@raptor.kiev.ua>\n"
 "\n"
 "This plugin provides a status icon, placed in\n"
 "the system tray area of the window manager."
 msgstr ""
+"Durum Simgesi Eklentisi (Qt arabirimi için kısmi bağlantı noktası)\n"
+"Telif Hakkı 2005-2007 Giacomo Lozito <james@develia.org>\n"
+"Telif Hakkı 2010 Michał Lipski <tallica@o2.pl>\n"
+"Telif Hakkı 2015 Eugene Paskevich <eugene@raptor.kiev.ua>\n"
+"\n"
+"Bu eklenti, pencere yöneticisinin sistem tepsisi\n"
+"alanına yerleştirilmiş bir durum simgesi sağlar."
 
-#: src/statusicon/statusicon.cc:379
+#: src/statusicon-qt/statusicon.cc:89 src/statusicon/statusicon.cc:384
 msgid "Mouse Scroll Action"
 msgstr "Mouse kaydırma hareketi"
 
-#: src/statusicon/statusicon.cc:380
+#: src/statusicon-qt/statusicon.cc:90 src/statusicon/statusicon.cc:385
 msgid "Change volume"
 msgstr "Ses seviyesini değiştir"
 
-#: src/statusicon/statusicon.cc:383
+#: src/statusicon-qt/statusicon.cc:93 src/statusicon/statusicon.cc:388
 msgid "Change playing song"
 msgstr "Çalan şarkıyı değiştir"
 
-#: src/statusicon/statusicon.cc:386
+#: src/statusicon-qt/statusicon.cc:96 src/statusicon/statusicon.cc:391
 msgid "Other Settings"
 msgstr "Diğer Ayarlar"
 
-#: src/statusicon/statusicon.cc:387
+#: src/statusicon-qt/statusicon.cc:97 src/statusicon/statusicon.cc:392
 msgid "Disable the popup window"
 msgstr "Açılır pencereleri engelle"
 
-#: src/statusicon/statusicon.cc:389
+#: src/statusicon-qt/statusicon.cc:99 src/statusicon/statusicon.cc:394
 msgid "Close to the system tray"
 msgstr "Sistem tepsisinden çıkar"
 
-#: src/statusicon/statusicon.cc:391
+#: src/statusicon-qt/statusicon.cc:101 src/statusicon/statusicon.cc:396
 msgid "Advance in playlist when scrolling upward"
+msgstr "Yukarı kaydırma yaparken çalma listesinde ilerleyin"
+
+#: src/statusicon-qt/statusicon.cc:116 src/statusicon/statusicon.cc:287
+msgid "Se_ttings ..."
+msgstr "A_yarlar ..."
+
+#: src/statusicon/statusicon.cc:377
+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 ""
+"Durum Simgesi Eklentisi\n"
+"\n"
+"Telif Hakkı 2005-2007 Giacomo Lozito <james@develia.org>\n"
+"Telif Hakkı 2010 Michał Lipski <tallica@o2.pl>\n"
+"\n"
+"Bu eklenti, pencere yöneticisinin sistem tepsisi\n"
+"alanına yerleştirilmiş bir durum simgesi sağlar."
 
 #: src/stereo_plugin/stereo.cc:19
 msgid "Extra Stereo"
@@ -3886,25 +4488,168 @@
 "\n"
 "By Johan Levin, 1999"
 msgstr ""
+"Stereo Artırma Eklentisi\n"
+"\n"
+"Johan Levin tarafından, 1999"
 
 #: src/stereo_plugin/stereo.cc:44
 msgid "Extra Stereo"
 msgstr "Extra Stereo"
 
+#: src/streamtuner/icecast-model.cc:126 src/streamtuner/shoutcast-model.cc:131
+msgid "Type"
+msgstr "Tür"
+
+#: src/streamtuner/icecast-model.cc:132
+msgid "Current Song"
+msgstr "Geçerli Şarkı"
+
+#: src/streamtuner/icecast-model.cc:164
+msgid "Other"
+msgstr "Diğer"
+
+#: src/streamtuner/ihr-model.cc:63
+msgid "Market"
+msgstr "Market"
+
+#: src/streamtuner/ihr-model.cc:156
+msgid "Call Letters"
+msgstr "Çağrı Mektupları"
+
+#: src/streamtuner/ihr-model.cc:162
+msgid "Description"
+msgstr "Açıklama"
+
+#: src/streamtuner/shoutcast-model.cc:128
+msgid "Listeners"
+msgstr "Dinleyiciler"
+
+#: src/streamtuner/shoutcast-model.cc:188
+msgid "Top 500 Stations"
+msgstr "En İyi 500 İstasyon"
+
+#: src/streamtuner/shoutcast-model.cc:189
+msgid "Alternative"
+msgstr "Alternatif"
+
+#: src/streamtuner/shoutcast-model.cc:190
+msgid "Blues"
+msgstr "Blues"
+
+#: src/streamtuner/shoutcast-model.cc:191
+msgid "Classical"
+msgstr "Klasik"
+
+#: src/streamtuner/shoutcast-model.cc:192
+msgid "Country"
+msgstr "Country"
+
+#: src/streamtuner/shoutcast-model.cc:193
+msgid "Decades"
+msgstr "Yıllar"
+
+#: src/streamtuner/shoutcast-model.cc:194
+msgid "Easy Listening"
+msgstr "Kolay Dinleme"
+
+#: src/streamtuner/shoutcast-model.cc:195
+msgid "Electronic"
+msgstr "Elektronik"
+
+#: src/streamtuner/shoutcast-model.cc:196
+msgid "Folk"
+msgstr "Folk"
+
+#: src/streamtuner/shoutcast-model.cc:197
+msgid "Inspirational"
+msgstr "İlham"
+
+#: src/streamtuner/shoutcast-model.cc:198
+msgid "International"
+msgstr "Uluslararası"
+
+#: src/streamtuner/shoutcast-model.cc:199
+msgid "Jazz"
+msgstr "Caz"
+
+#: src/streamtuner/shoutcast-model.cc:200
+msgid "Latin"
+msgstr "Latin"
+
+#: src/streamtuner/shoutcast-model.cc:201
+msgid "Metal"
+msgstr "Metal"
+
+#: src/streamtuner/shoutcast-model.cc:203
+msgid "New Age"
+msgstr "New Age"
+
+#: src/streamtuner/shoutcast-model.cc:204
+msgid "Pop"
+msgstr "Pop"
+
+#: src/streamtuner/shoutcast-model.cc:205
+msgid "Public Radio"
+msgstr "Genel Radyo"
+
+#: src/streamtuner/shoutcast-model.cc:206
+msgid "R&B and Urban"
+msgstr "R&B ve Kentsel"
+
+#: src/streamtuner/shoutcast-model.cc:207
+msgid "Rap"
+msgstr "Rap"
+
+#: src/streamtuner/shoutcast-model.cc:208
+msgid "Reggae"
+msgstr "Reggae"
+
+#: src/streamtuner/shoutcast-model.cc:209
+msgid "Rock"
+msgstr "Rock"
+
+#: src/streamtuner/shoutcast-model.cc:210
+msgid "Seasonal and Holiday"
+msgstr "Sezonluk ve Tatil"
+
+#: src/streamtuner/shoutcast-model.cc:211
+msgid "Soundtracks"
+msgstr "Film Müzikleri"
+
+#: src/streamtuner/shoutcast-model.cc:212
+msgid "Talk"
+msgstr "Konuşma"
+
+#: src/streamtuner/shoutcast-model.cc:213
+msgid "Themes"
+msgstr "Temalar"
+
+#: src/streamtuner/streamtuner.cc:59
+msgid "Shoutcast"
+msgstr "Shoutcast"
+
+#: src/streamtuner/streamtuner.cc:60
+msgid "Icecast"
+msgstr "Icecast"
+
+#: src/streamtuner/streamtuner.cc:71
+msgid "Stream Tuner"
+msgstr "Akış Ayarlayıcı"
+
 #: src/tonegen/tonegen.cc:45
 msgid "Tone Generator"
-msgstr ""
+msgstr "Ton Oluşturucu"
 
-#: src/tonegen/tonegen.cc:94
+#: src/tonegen/tonegen.cc:92
 #, c-format
 msgid "%s %.1f Hz"
 msgstr "%s %.1f Hz"
 
-#: src/tonegen/tonegen.cc:94
+#: src/tonegen/tonegen.cc:92
 msgid "Tone Generator: "
 msgstr "Ton Oluşturucu: "
 
-#: src/tonegen/tonegen.cc:160
+#: src/tonegen/tonegen.cc:161
 msgid ""
 "Sine tone generator by Håvard Kvålen <havardk@xmms.org>\n"
 "Modified by Daniel J. Peng <danielpeng@bigfoot.com>\n"
@@ -3912,12 +4657,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 ""
+"Håvard Kvålen'in ton üreteci <havardk@xmms.org>\n"
+"Daniel J. Peng tarafından değiştirildi <danielpeng@bigfoot.com>\n"
+"\n"
+"Kullanmak için bir URL ekleyin: tone://frequency1;frequency2;frequency3;...\n"
+"örneğin tone://2000;2005 bir 2000 Hz ton ve bir 2005 Hz ton çalmak için"
+
+#: src/ui-common/dialogs-qt.cc:40
+msgid ""
+"\n"
+"(Further messages have been hidden.)"
+msgstr ""
+"\n"
+"(Devam eden iletiler gizlendi.)"
+
+#: src/ui-common/dialogs-qt.cc:52
+msgid "Working ..."
+msgstr "Çalışıyor..."
+
+#: src/ui-common/dialogs-qt.cc:73
+msgid "Information"
+msgstr "Bilgi"
+
+#: src/ui-common/menu-ops-gtk.cc:132 src/ui-common/menu-ops-qt.cc:113
+#, c-format
+msgid "%s does not appear to be a valid folder."
+msgstr "%s geçerli bir klasör görünmüyor."
 
 #: src/voice_removal/voice_removal.cc:28
 msgid "Voice Removal"
 msgstr "Ses yok etme"
 
-#: src/vorbis/vorbis.cc:465
+#: src/vorbis/vorbis.cc:433
 msgid ""
 "Audacious Ogg Vorbis Decoder\n"
 "\n"
@@ -3937,17 +4708,34 @@
 "Gian-Carlo Pascutto <gcp@sjeng.org>\n"
 "Eugene Zagidullin <e.asphyx@gmail.com>"
 msgstr ""
+"Audacious Ogg Vorbis Çözücü\n"
+"\n"
+"Xiph.org Vakfı’nın Ogg Vorbis Eklentisine dayanarak:\n"
+"http://www.xiph.org/\n"
+"\n"
+"Özgün kod:\n"
+"Tony Arcieri tarafından <bascule@inferno.tusculum.edu>\n"
+"\n"
+"Katkıcılar:\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.h:18
 msgid "Ogg Vorbis Decoder"
 msgstr "Ogg Vorbis Çözücü"
 
-#: src/vtx/info.cc:22
+#: src/vtx/info.cc:24
 #, c-format
 msgid "Details about %s"
-msgstr ""
+msgstr "%s hakkında ayrıntılar"
 
-#: src/vtx/info.cc:24
+#: src/vtx/info.cc:26
 msgid ""
 "Title: %t\n"
 "Author: %a\n"
@@ -3961,49 +4749,131 @@
 "Player Freq: %P\n"
 "Year: %y"
 msgstr ""
+"Başlık: %t\n"
+"Yazar: %a\n"
+"İtibaren: %f\n"
+"Takipçi: %T\n"
+"Yorum: %C\n"
+"Çip türü: %c\n"
+"Stereo: %s\n"
+"Döngü: %l\n"
+"Çip Frekansı: %F\n"
+"Çalıcı Frekansı: %P\n"
+"Yıl: %y"
 
 #: src/vtx/vtx.cc:38
 msgid "VTX Decoder"
 msgstr "VTC Çözücü"
 
-#: src/vtx/vtx.cc:184
+#: src/vtx/vtx.cc:178
 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 tarafından Vortex dosya biçimi çalıcı <sashnov@ngs.ru>\n"
+"Roman Sherbakov tarafından in_vtx.dll dayanarak <v_soft@microfor.ru>\n"
+"Pavel Vymetalek tarafından Audacious eklentisi <pvymetalek@seznam.cz>"
+
+#: src/vumeter-qt/vumeter_qt.cc:31
+msgid ""
+"VU Meter Plugin for Audacious\n"
+"Copyright 2017-2019 Marc Sánchez Fauste"
+msgstr ""
+"Audacious için VU Metre Eklentisi\n"
+"Telif Hakkı 2017-2019 Marc Sánchez Fauste"
 
-#: src/wavpack/wavpack.cc:24
+#: src/vumeter-qt/vumeter_qt.cc:35
+msgid "VU Meter Settings"
+msgstr "VU Metre Ayarları"
+
+#: src/vumeter-qt/vumeter_qt.cc:37
+msgid "Peak hold time:"
+msgstr "Pik tutma süresi:"
+
+#: src/vumeter-qt/vumeter_qt.cc:42
+msgid "Fall-off time:"
+msgstr "Düşme zamanı:"
+
+#: src/vumeter-qt/vumeter_qt.cc:44
+msgid "dB/second"
+msgstr "dB/saniye"
+
+#: src/vumeter-qt/vumeter_qt.cc:46
+msgid "Display legend"
+msgstr "Zirveyi göster"
+
+#: src/vumeter-qt/vumeter_qt.h:37
+msgid "VU Meter"
+msgstr "VU Metre"
+
+#: src/waveout/waveout.cc:43
+msgid "Win32 waveOut"
+msgstr "Win32 waveOut"
+
+#: src/waveout/waveout.cc:69
+msgid ""
+"Win32 waveOut Plugin for Audacious\n"
+"Copyright 2016 John Lindgren"
+msgstr ""
+"Audacious için Win32 waveOut eklentisi\n"
+"Telif Hakkı 2016 John Lindgren"
+
+#: src/wavpack/wavpack.cc:25
 msgid "WavPack Decoder"
 msgstr "Wav Çözücü"
 
-#: src/wavpack/wavpack.cc:211
+#: src/wavpack/wavpack.cc:217
 msgid "lossy (hybrid)"
-msgstr ""
+msgstr "yozlaşmış (melez)"
 
-#: src/wavpack/wavpack.cc:213
+#: src/wavpack/wavpack.cc:219
 msgid "lossy"
-msgstr ""
+msgstr "yozlaşmış"
 
-#: src/wavpack/wavpack.cc:255
+#: src/wavpack/wavpack.cc:259
 msgid ""
 "Copyright 2006 William Pitcock <nenolod@nenolod.net>\n"
 "\n"
 "Some of the plugin code was by Miles Egan."
 msgstr ""
+"Telif Hakkı 2006 William Pitcock <nenolod@nenolod.net>\n"
+"\n"
+"\n"
+"Bazı eklentiler Miles Egan tarafından kodlanmıştır."
 
-#: src/xsf/plugin.cc:50
+#: src/xsf/plugin.cc:74
 msgid "2SF Decoder"
 msgstr "2SF Çözücü"
 
-#: src/xsf/plugin.cc:238
+#: src/xsf/plugin.cc:429
+msgid "32728 Hz"
+msgstr "32728 Hz"
+
+#: src/xsf/plugin.cc:432
+msgid "65456 Hz"
+msgstr "65456 Hz"
+
+#: src/xsf/plugin.cc:438
+msgid "Cosine"
+msgstr "Kosinüs"
+
+#: src/xsf/plugin.cc:439
+msgid "Sharp"
+msgstr "Keskin"
+
+#: src/xsf/plugin.cc:443
 msgid "XSF Configuration"
-msgstr ""
+msgstr "XSF Yapılandırması"
 
-#: src/xsf/plugin.cc:239
-msgid "Ignore length from file"
-msgstr ""
+#: src/xsf/plugin.cc:445
+msgid "Default fade time:"
+msgstr "Varsayılan ses azalma süresi:"
+
+#: src/xsf/plugin.cc:447
+msgid "Interpolation mode:"
+msgstr "Ara değerleme kipi:"
 
-#: src/xspf/xspf.cc:89
+#: src/xspf/xspf.cc:95
 msgid "XML Shareable Playlists (XSPF)"
-msgstr "XML Paylaşılabilir müzik listesi (XSPF)"
+msgstr "XML Paylaşılabilir çalma listesi (XSPF)"

audacious-plugins-3.6.2-gtk3.tar.bz2/po/uk.po -> audacious-plugins-4.4.1.tar.bz2/po/uk.po Changed

@@ -3,10 +3,14 @@
 # This file is distributed under the same license as the Audacious Plugins package.
 #
 # Translators:
-# Dennis <tymbood@gmail.com>, 2014-2015
+# Alexander B <beliy@yandex.ru>, 2019
+# Denys, 2014-2015
+# Eugene Paskevich <eugene@raptor.kiev.ua>, 2016
 # Kostyantyn Fedenko <fedenko@ukr.net>, 2011
+# First Last <xxbxxozo@10mail.org>, 2020
 # Kostyantyn Fedenko <fedenko@ukr.net>, 2011
 # Oleg <kvantarium@gmail.com>, 2012
+# Max Prylutsky, 2017
 # NaiLi (aka jamesjames) Rootaerc <theism@mail.ru>, 2012
 # NaiLi (aka jamesjames) Rootaerc <theism@mail.ru>, 2012
 # Rax Garfield <admin@dvizho.ks.ua>, 2012
@@ -16,306 +20,83 @@
 # Rustam Tsurik <rustam.tsurik@gmail.com>, 2013
 # Rustam Tsurik <rustam.tsurik@gmail.com>, 2013
 # Oleg <kvantarium@gmail.com>, 2012
+# f6d3887df5c5bcb13fc1d4fb04e37f17, 2017-2018
 # Yuri Chornoivan <yurchor@ukr.net>, 2012
+# Олександр С <aleniksenin@gmail.com>, 2016
+# Ярослав Смук <Smuk.Slavko@yandex.ua>, 2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Audacious Plugins\n"
-"Report-Msgid-Bugs-To: http://redmine.audacious-media-player.org/\n"
-"POT-Creation-Date: 2015-04-03 11:52+0200\n"
-"PO-Revision-Date: 2015-03-07 09:36+0000\n"
-"Last-Translator: Dennis <tymbood@gmail.com>\n"
-"Language-Team: Ukrainian (http://www.transifex.com/projects/p/audacious/"
+"Report-Msgid-Bugs-To: https://github.com/audacious-media-player/audacious/"
+"issues\n"
+"POT-Creation-Date: 2024-09-26 21:54+0200\n"
+"PO-Revision-Date: 2011-10-10 17:43+0000\n"
+"Last-Translator: First Last <xxbxxozo@10mail.org>, 2020\n"
+"Language-Team: Ukrainian (http://app.transifex.com/audacious/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"
-"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=4; plural=(n % 1 == 0 && n % 10 == 1 && n % 100 != "
+"11 ? 0 : n % 1 == 0 && n % 10 >= 2 && n % 10 <= 4 && (n % 100 < 12 || n % "
+"100 > 14) ? 1 : n % 1 == 0 && (n % 10 ==0 || (n % 10 >=5 && n % 10 <=9) || "
+"(n % 100 >=11 && n % 100 <=14 )) ? 2: 3);\n"
 
-#: src/aac-raw/aac.cc:18
+#: src/aac/aac.cc:19
 msgid "AAC (Raw) Decoder"
-msgstr "Декодер AAC (Raw)"
+msgstr "Декодер AAC (Сирий)"
 
-#: src/adplug/adplug-xmms.cc:42
+#: src/adplug/adplug-xmms.cc:70
 msgid "AdPlug (AdLib Player)"
 msgstr "AdPlug (програвач AdLib)"
 
-#: src/adplug/adplug-xmms.cc:156 src/modplug/modplugbmp.cc:335
-#: src/psf/plugin.cc:138 src/vtx/vtx.cc:87 src/xsf/plugin.cc:113
+#: src/adplug/adplug-xmms.cc:167 src/modplug/modplugbmp.cc:321
+#: src/psf/plugin.cc:161 src/vtx/vtx.cc:89 src/xsf/plugin.cc:204
 msgid "sequenced"
 msgstr "послідовний"
 
-#: src/alarm/alarm.cc:55 src/alarm/interface.cc:82
-msgid "Alarm"
-msgstr "Будильник"
-
-#: src/alarm/alarm.cc:782
-msgid "Set Alarm ..."
-msgstr "Встановити Будильник..."
-
-#: src/alarm/alarm.cc:810
-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/interface.cc: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.cc: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.cc: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.cc:81
-msgid "This is your wakeup call."
-msgstr "Вставай, Україно! Вставай, рідна ненько! Москаль вже годину не спить!"
-
-#: src/alarm/interface.cc:99
-msgid "Your reminder for today is..."
-msgstr "Нагадування на сьогодні..."
-
-#: src/alarm/interface.cc:101 src/alarm/interface.cc:386
-msgid "Reminder"
-msgstr "Повідомлення"
-
-#: src/alarm/interface.cc:132
-msgid "Monday"
-msgstr "Понеділок"
-
-#: src/alarm/interface.cc:132
-msgid "Tuesday"
-msgstr "Вівторок"
-
-#: src/alarm/interface.cc:132
-msgid "Wednesday"
-msgstr "Середа"
-
-#: src/alarm/interface.cc:133
-msgid "Thursday"
-msgstr "Четвер"
-
-#: src/alarm/interface.cc:133
-msgid "Friday"
-msgstr "П’ятниця"
-
-#: src/alarm/interface.cc:133
-msgid "Saturday"
-msgstr "Субота"
-
-#: src/alarm/interface.cc:133
-msgid "Sunday"
-msgstr "Неділя"
-
-#: src/alarm/interface.cc:171 src/alarm/interface.cc:230
-#: src/alarm/interface.cc:245
-msgid "Time"
-msgstr "Час"
-
-#: src/alarm/interface.cc:178
-msgid "Alarm at (default):"
-msgstr "Починати о (типово):"
-
-#: src/alarm/interface.cc:200
-msgid "h"
-msgstr " г"
-
-#: src/alarm/interface.cc:203
-msgid "Quiet after:"
-msgstr "Закінчити через:"
-
-#: src/alarm/interface.cc:215
-msgid "hours"
-msgstr "год"
-
-#: src/alarm/interface.cc:226
-msgid "minutes"
-msgstr "хв"
-
-#: src/alarm/interface.cc:235
-msgid "Choose the days for the alarm to come on"
-msgstr "Налаштуйте дні тижня, в які працюватиме будильник."
-
-#: src/alarm/interface.cc:242
-msgid "Day"
-msgstr "День"
-
-#: src/alarm/interface.cc:259 src/bs2b/plugin.cc:130
-#: src/skins/preset-list.cc:434 src/skins/preset-list.cc:440
-msgid "Default"
-msgstr "Як типово"
-
-#: src/alarm/interface.cc:288
-msgid "Days"
-msgstr "Дні"
-
-#: src/alarm/interface.cc:297
-msgid "Fading"
-msgstr "Наростання"
-
-#: src/alarm/interface.cc:305 src/console/plugin.cc:41
-#: src/crossfade/crossfade.cc:53 src/crossfade/crossfade.cc:59
-#: src/gtkui/settings.cc:49 src/lirc/lirc.cc:397 src/sid/xs_config.cc:85
-#: src/sid/xs_config.cc:94 src/sid/xs_config.cc:103
-msgid "seconds"
-msgstr "сек"
-
-#: src/alarm/interface.cc:312 src/alarm/interface.cc:353
-msgid "Volume"
-msgstr "Гучність"
-
-#: src/alarm/interface.cc:317
-msgid "Start at"
-msgstr "На початку:"
-
-#: src/alarm/interface.cc:333
-msgid "Final"
-msgstr "По закінченню:"
-
-#: src/alarm/interface.cc:346
-msgid "Current"
-msgstr "Як зараз"
-
-#: src/alarm/interface.cc:359
-msgid "Additional Command"
-msgstr "Виконувати команду"
-
-#: src/alarm/interface.cc:365 src/alarm/interface.cc:391
-msgid "enable"
-msgstr "увімкнути"
-
-#: src/alarm/interface.cc:372
-msgid "Playlist (optional)"
-msgstr "Список відтворення (необов’язково)"
+#: src/adplug/adplug-xmms.cc:349 src/sid/xs_config.cc:61
+msgid "Output"
+msgstr "Виведення"
 
-#: src/alarm/interface.cc:379
-msgid "Select a playlist"
-msgstr "Обрати список відтворення"
+#: src/adplug/adplug-xmms.cc:350
+msgid "OPL Emulator:"
+msgstr "Емулятор OPL:"
+
+#: src/adplug/adplug-xmms.cc:353 src/amidiplug/i_configure.cc:153
+#: src/console/plugin.cc:45 src/filewriter/filewriter.cc:481
+#: src/sid/xs_config.cc:65 src/xsf/plugin.cc:446
+msgid "Sample rate:"
+msgstr "Висота семплів:"
 
-#: src/alarm/interface.cc:399
-msgid "Options"
-msgstr "Опції"
+#: src/adplug/adplug-xmms.cc:354 src/amidiplug/i_configure.cc:155
+#: src/bs2b/plugin.cc:141 src/console/plugin.cc:47
+#: src/modplug/plugin_main.cc:77 src/resample/resample.cc:201
+#: src/resample/resample.cc:207 src/resample/resample.cc:211
+#: src/resample/resample.cc:215 src/resample/resample.cc:219
+#: src/resample/resample.cc:223 src/resample/resample.cc:227
+#: src/resample/resample.cc:231 src/resample/resample.cc:235
+#: src/resample/resample.cc:239 src/resample/resample.cc:243
+#: src/sid/xs_config.cc:67 src/soxr/sox-resampler.cc:205
+msgid "Hz"
+msgstr "Гц"
 
-#: src/alarm/interface.cc:404
-msgid "What do these options mean?"
-msgstr "Як це все налаштувати?"
+#: src/adplug/adplug-xmms.cc:355 src/gtkui/settings.cc:55
+#: src/modplug/plugin_main.cc:105 src/qtui/settings.cc:85
+#: src/skins-qt/skins_cfg.cc:302 src/skins/skins_cfg.cc:284
+msgid "Miscellaneous"
+msgstr "Різне"
 
-#: src/alarm/interface.cc:420
-msgid "Help"
-msgstr "Як налаштувати?"
+#: src/adplug/adplug-xmms.cc:356
+msgid "Repeat song in endless loop"
+msgstr "Зациклити пісню у вічному повторенні"
 
-#: src/albumart/albumart.cc:31
+#: src/albumart/albumart.cc:31 src/albumart-qt/albumart.cc:35
 msgid "Album Art"
 msgstr "Обкладинка альбому"
 
-#: src/albumart-qt/albumart.cc:33
-msgid "Album Art (Qt)"
-msgstr ""
-
-#: src/alsa/alsa.h:70
+#: src/alsa/alsa.h:64
 msgid "ALSA Output"
 msgstr "ALSA-вивід"
 
@@ -327,7 +108,7 @@
 "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"
+" Виводний втулок ALSA,\n"
 "написаний Джоном Ліндґреном у 2010–2012 роках.\n"
 "\n"
 "Дякую авторові ALSA Output Plugin NG (William Pitcock), чий код допомагав, "
@@ -335,7 +116,7 @@
 
 #: src/alsa/config.cc:61
 msgid "(no description)"
-msgstr ""
+msgstr "(опис відсутній)"
 
 #: src/alsa/config.cc:166
 msgid "Default PCM device"
@@ -355,13 +136,13 @@
 
 #: src/alsa/config.cc:302
 msgid "Mixer element:"
-msgstr "Елемент мікшера:"
+msgstr "Елемент мікшеру:"
 
-#: src/amidi-plug/amidi-plug.cc:41
+#: src/amidiplug/amidi-plug.cc:42
 msgid "AMIDI-Plug (MIDI Player)"
 msgstr "AMIDI-Plug (MIDI-програвач)"
 
-#: src/amidi-plug/amidi-plug.cc:437
+#: src/amidiplug/amidi-plug.cc:445
 msgid ""
 "AMIDI-Plug\n"
 "modular MIDI music player\n"
@@ -383,158 +164,180 @@
 "Tony Vroon\n"
 "for the good help with alpha testing"
 msgstr ""
+"AMIDI-Plug\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"
+"окрема подяка...\n"
+"\n"
+"Клеменсу Ладишу та Ярославові Киселі\n"
+"за їхні кульні програми aplaymidi та amixer;\n"
+"вони дійсно стали в нагоді\n"
+"\n"
+"Альфредові Спадафіні\n"
+"за найсовий лоґотип міді клавіатури\n"
+"\n"
+"Тоні Вруну\n"
+"за добру поміч в альфа-тестуванні"
 
-#: src/amidi-plug/i_configure.cc:94
+#: src/amidiplug/i_configure.cc:94
 msgid "Override default gain:"
 msgstr "Змінити типовий підсилювач на:"
 
-#: src/amidi-plug/i_configure.cc:102
+#: src/amidiplug/i_configure.cc:102
 msgid "Override default polyphony:"
 msgstr "Змінити типову поліфонію на:"
 
-#: src/amidi-plug/i_configure.cc:110
+#: src/amidiplug/i_configure.cc:110
 msgid "Override default reverb:"
 msgstr "Змінити типову реверберацію:"
 
-#: src/amidi-plug/i_configure.cc:112 src/amidi-plug/i_configure.cc:120
+#: src/amidiplug/i_configure.cc:112 src/amidiplug/i_configure.cc:120
 msgid "On"
 msgstr "Увімк."
 
-#: src/amidi-plug/i_configure.cc:118
+#: src/amidiplug/i_configure.cc:118
 msgid "Override default chorus:"
-msgstr "Змінити типовий хор:"
+msgstr "Змінити типовий хорус:"
 
-#: src/amidi-plug/i_configure.cc:128 src/console/plugin.cc:29
+#: src/amidiplug/i_configure.cc:128 src/console/plugin.cc:29
 msgid "Playback"
 msgstr "Відтворення"
 
-#: src/amidi-plug/i_configure.cc:129
+#: src/amidiplug/i_configure.cc:129
 msgid "Transpose:"
 msgstr "Транспозиція: "
 
-#: src/amidi-plug/i_configure.cc:131
+#: src/amidiplug/i_configure.cc:131 src/speedpitch/speed-pitch.cc:257
 msgid "semitones"
-msgstr ""
+msgstr "напівтони"
 
-#: src/amidi-plug/i_configure.cc:132
+#: src/amidiplug/i_configure.cc:132
 msgid "Drum shift:"
 msgstr "Зсув ударних: "
 
-#: src/amidi-plug/i_configure.cc:134
+#: src/amidiplug/i_configure.cc:134
 msgid "note numbers"
-msgstr ""
+msgstr "Примітки номерів"
 
-#: src/amidi-plug/i_configure.cc:135
+#: src/amidiplug/i_configure.cc:135
 msgid "Skip leading silence"
-msgstr ""
+msgstr "Пропустити тишу попереду"
 
-#: src/amidi-plug/i_configure.cc:137
+#: src/amidiplug/i_configure.cc:137
 msgid "Skip trailing silence"
-msgstr ""
+msgstr "Пропустити кінцеву тишу"
 
-#: src/amidi-plug/i_configure.cc:141
+#: src/amidiplug/i_configure.cc:141
 msgid "SoundFont"
 msgstr "Шрифт"
 
-#: src/amidi-plug/i_configure.cc:143
+#: src/amidiplug/i_configure.cc:148
 msgid "Synthesizer"
 msgstr "Синтезатор"
 
-#: src/amidi-plug/i_configure.cc:148 src/console/plugin.cc:45
-#: src/sid/xs_config.cc:65
-msgid "Sample rate:"
-msgstr ""
-
-#: src/amidi-plug/i_configure.cc:150 src/bs2b/plugin.cc:141
-#: src/console/plugin.cc:47 src/modplug/plugin_main.cc:78
-#: src/resample/resample.cc:201 src/resample/resample.cc:207
-#: src/resample/resample.cc:211 src/resample/resample.cc:215
-#: src/resample/resample.cc:219 src/resample/resample.cc:223
-#: src/resample/resample.cc:227 src/resample/resample.cc:231
-#: src/resample/resample.cc:235 src/resample/resample.cc:239
-#: src/resample/resample.cc:243 src/sid/xs_config.cc:67
-#: src/sox-resampler/sox-resampler.cc:163
-msgid "Hz"
-msgstr "Гц"
-
-#: src/amidi-plug/i_configure-fluidsynth.cc:52
+#: src/amidiplug/i_configure-fluidsynth.cc:58
+#: src/amidiplug/i_configure-fluidsynth.cc:527
 msgid "AMIDI-Plug - select SoundFont file"
 msgstr "AMIDI-Plug - вибір файлу SoundFont"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:55 src/filewriter/mp3.cc:658
+#: src/amidiplug/i_configure-fluidsynth.cc:61
 msgid "_Cancel"
 msgstr "_Скасувати"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:56
+#: src/amidiplug/i_configure-fluidsynth.cc:62
 msgid "_Open"
 msgstr "_Відкрити"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:225 src/gtkui/columns.cc:46
+#: src/amidiplug/i_configure-fluidsynth.cc:233
+#: src/amidiplug/i_configure-fluidsynth.cc:461
 msgid "File name"
 msgstr "Назва файлу"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:229
+#: src/amidiplug/i_configure-fluidsynth.cc:237
+#: src/amidiplug/i_configure-fluidsynth.cc:464
 msgid "Size (bytes)"
 msgstr "Розмір (у байтах)"
 
-#: src/amidi-plug/i_fileinfo.cc:163
+#: src/amidiplug/i_fileinfo.cc:184
 msgid "Name:"
 msgstr "Назва:"
 
-#: src/amidi-plug/i_fileinfo.cc:181
+#: src/amidiplug/i_fileinfo.cc:202
 msgid " MIDI Info "
 msgstr " Інформація MIDI "
 
-#: src/amidi-plug/i_fileinfo.cc:195
+#: src/amidiplug/i_fileinfo.cc:216
 msgid "Format:"
-msgstr "Назва:"
+msgstr "Формат:"
 
-#: src/amidi-plug/i_fileinfo.cc:198
+#: src/amidiplug/i_fileinfo.cc:219
 msgid "Length (msec):"
 msgstr "Тривалість (мс):"
 
-#: src/amidi-plug/i_fileinfo.cc:201
+#: src/amidiplug/i_fileinfo.cc:222
 msgid "No. of Tracks:"
-msgstr "Кількість доріжок:"
+msgstr "Кількість стежок:"
 
-#: src/amidi-plug/i_fileinfo.cc:207
+#: src/amidiplug/i_fileinfo.cc:228
 msgid "variable"
 msgstr "змінна"
 
-#: src/amidi-plug/i_fileinfo.cc:209
+#: src/amidiplug/i_fileinfo.cc:230
 msgid "BPM:"
 msgstr "Темп (BMP):"
 
-#: src/amidi-plug/i_fileinfo.cc:217
+#: src/amidiplug/i_fileinfo.cc:238
 msgid "BPM (wavg):"
 msgstr "BPM (wavg):"
 
-#: src/amidi-plug/i_fileinfo.cc:220
+#: src/amidiplug/i_fileinfo.cc:241
 msgid "Time Div:"
 msgstr "Часовий код MIDI:"
 
-#: src/amidi-plug/i_fileinfo.cc:231
+#: src/amidiplug/i_fileinfo.cc:252
 msgid " MIDI Comments and Lyrics "
 msgstr " Коментарі й слова пісні в MIDI "
 
-#: src/amidi-plug/i_fileinfo.cc:278
+#: src/amidiplug/i_fileinfo.cc:299
 msgid "* no comments available in this MIDI file *"
-msgstr "* у цьому MIDI-файлі немає коментарів *"
+msgstr "* цей MIDI-файл не має коментарів *"
 
-#: src/amidi-plug/i_fileinfo.cc:290
+#: src/amidiplug/i_fileinfo.cc:311
 msgid "* no lyrics available in this MIDI file *"
-msgstr "* у цьому MIDI-файлі немає слів пісні *"
+msgstr "* цей MIDI-файл не має тексту пісні *"
 
-#: src/amidi-plug/i_fileinfo.cc:300 src/filewriter/vorbis.cc:197
-#: src/ladspa/plugin.cc:416
+#: src/amidiplug/i_fileinfo.cc:321 src/ladspa/plugin.cc:418
+#: src/ui-common/dialogs-qt.cc:32
 msgid "_Close"
 msgstr "_Закрити"
 
-#: src/amidi-plug/i_fileinfo.cc:325
+#: src/amidiplug/i_fileinfo.cc:346
 msgid " (invalid UTF-8)"
 msgstr " (недійсний UTF-8)"
 
-#: src/aosd/aosd.cc:32
+#: src/ampache/ampache.cc:33
+msgid "Ampache Browser"
+msgstr "Переглядач Ampache"
+
+#: src/ampache/ampache.cc:46
+msgid ""
+"Ampache Browser for Audacious\n"
+"http://ampache-browser.org/\n"
+"\n"
+"Copyright (C) Róbert Čerňanský and John Lindgren\n"
+"License: GNU GPLv3"
+msgstr ""
+"Перглядач Ampache для Audacious\n"
+"http://ampache-browser.org/\n"
+"\n"
+"Копірайт (C) Роберт Чернянський та Джон Ліндґрен\n"
+"Ліцензія: GNU GPLv3"
+
+#: src/aosd/aosd.cc:31
 msgid ""
 "Audacious OSD\n"
 "http://www.develia.org/projects.php?p=audacious#aosd\n"
@@ -568,130 +371,130 @@
 msgid "Concave Rectangle"
 msgstr "Увігнутий прямокутник"
 
-#: src/aosd/aosd_style.cc:69
+#: src/aosd/aosd_style.cc:69 src/openmpt/mptwrap.h:50 src/xsf/plugin.cc:436
 msgid "None"
 msgstr "Тільки текст"
 
-#: src/aosd/aosd_trigger.cc:50
+#: src/aosd/aosd_trigger.cc:49
 msgid "Playback Start"
 msgstr "Відтворення"
 
-#: src/aosd/aosd_trigger.cc:51
+#: src/aosd/aosd_trigger.cc:50
 msgid "Triggers OSD when a playlist entry is played."
 msgstr "Показує повідомлення на початку відтворення."
 
-#: src/aosd/aosd_trigger.cc:56
+#: src/aosd/aosd_trigger.cc:55
 msgid "Title Change"
 msgstr "Зміна назви"
 
-#: src/aosd/aosd_trigger.cc:57
+#: src/aosd/aosd_trigger.cc:56
 msgid "Triggers OSD when the song title changes (for internet streams)."
-msgstr ""
+msgstr "Триґерити OSD під час зміни назв пісень (для інтернетових стримів)."
 
-#: src/aosd/aosd_trigger.cc:62
+#: src/aosd/aosd_trigger.cc:61
 msgid "Pause On"
-msgstr "Пауза"
+msgstr "Павза"
 
-#: src/aosd/aosd_trigger.cc:63
+#: src/aosd/aosd_trigger.cc:62
 msgid "Triggers OSD when playback is paused."
 msgstr "Показує повідомлення при призупиненні відтворення."
 
-#: src/aosd/aosd_trigger.cc:68
+#: src/aosd/aosd_trigger.cc:67
 msgid "Pause Off"
-msgstr "Продовження"
+msgstr "Продовжити"
 
-#: src/aosd/aosd_trigger.cc:69
+#: src/aosd/aosd_trigger.cc:68
 msgid "Triggers OSD when playback is unpaused."
 msgstr "Показує повідомлення при продовженні відтворення."
 
-#: src/aosd/aosd_ui.cc:163
+#: src/aosd/aosd_ui.cc:204
 msgid "Placement"
 msgstr "Розташування"
 
-#: src/aosd/aosd_ui.cc:196
+#: src/aosd/aosd_ui.cc:241
 msgid "Relative X offset:"
 msgstr "Відносний горизонтальний зсув:"
 
-#: src/aosd/aosd_ui.cc:203
+#: src/aosd/aosd_ui.cc:245
 msgid "Relative Y offset:"
 msgstr "Відносний вертикальний зсув:"
 
-#: src/aosd/aosd_ui.cc:210
+#: src/aosd/aosd_ui.cc:249
 msgid "Max OSD width:"
 msgstr "Максимальна ширина повідомлення:"
 
-#: src/aosd/aosd_ui.cc:221
+#: src/aosd/aosd_ui.cc:281
 msgid "Multi-Monitor options"
 msgstr "Опції для кількох моніторів"
 
-#: src/aosd/aosd_ui.cc:225
+#: src/aosd/aosd_ui.cc:285
 msgid "Display OSD using:"
 msgstr "Показувати на:"
 
-#: src/aosd/aosd_ui.cc:227
+#: src/aosd/aosd_ui.cc:287
 msgid "all monitors"
 msgstr "всіх моніторах"
 
-#: src/aosd/aosd_ui.cc:230
+#: src/aosd/aosd_ui.cc:290
 #, c-format
 msgid "monitor %i"
-msgstr "моніторі %i"
+msgstr "моніторові %i"
 
-#: src/aosd/aosd_ui.cc:282
+#: src/aosd/aosd_ui.cc:342
 msgid "Timing (ms)"
 msgstr "Часова витримка (мс)"
 
-#: src/aosd/aosd_ui.cc:287
+#: src/aosd/aosd_ui.cc:347
 msgid "Display:"
 msgstr "Показ:"
 
-#: src/aosd/aosd_ui.cc:292
+#: src/aosd/aosd_ui.cc:352
 msgid "Fade in:"
 msgstr "Поява:"
 
-#: src/aosd/aosd_ui.cc:297
+#: src/aosd/aosd_ui.cc:357
 msgid "Fade out:"
 msgstr "Зникнення:"
 
-#: src/aosd/aosd_ui.cc:361
+#: src/aosd/aosd_ui.cc:442
 msgid "Fonts"
 msgstr "Шрифти"
 
-#: src/aosd/aosd_ui.cc:368
+#: src/aosd/aosd_ui.cc:449
 #, c-format
 msgid "Font %i:"
 msgstr "Шрифт %i:"
 
-#: src/aosd/aosd_ui.cc:382
+#: src/aosd/aosd_ui.cc:466
 msgid "Shadow"
 msgstr "Тінь"
 
-#: src/aosd/aosd_ui.cc:486
+#: src/aosd/aosd_ui.cc:589
 msgid "Render Style"
 msgstr "Показати стиль"
 
-#: src/aosd/aosd_ui.cc:502
+#: src/aosd/aosd_ui.cc:605
 msgid "Colors"
 msgstr "Кольори"
 
-#: src/aosd/aosd_ui.cc:513
+#: src/aosd/aosd_ui.cc:616
 #, c-format
 msgid "Color %i:"
 msgstr "Колір %i:"
 
-#: src/aosd/aosd_ui.cc:600
+#: src/aosd/aosd_ui.cc:714
 msgid "Enable trigger"
 msgstr "Задіяти спусковий гачок"
 
-#: src/aosd/aosd_ui.cc:627
+#: src/aosd/aosd_ui.cc:741
 msgid "Event"
 msgstr "Подія"
 
-#: src/aosd/aosd_ui.cc:655
+#: src/aosd/aosd_ui.cc:768
 msgid "Composite manager detected"
 msgstr "Композитний "
 
-#: src/aosd/aosd_ui.cc:662
+#: src/aosd/aosd_ui.cc:775
 msgid ""
 "Composite manager not detected;\n"
 "unless you know that you have one running, please activate a composite "
@@ -701,112 +504,184 @@
 "Якщо він не запущений, увімкніть його, інакше екранне меню працюватиме "
 "неправильно."
 
-#: src/aosd/aosd_ui.cc:670
+#: src/aosd/aosd_ui.cc:783
 msgid "Composite manager not required for fake transparency"
 msgstr "Композитний менеджер не потрібен для фальшивої прозорості"
 
-#: src/aosd/aosd_ui.cc:706
+#: src/aosd/aosd_ui.cc:820
 msgid "Transparency"
 msgstr "Прозорість"
 
-#: src/aosd/aosd_ui.cc:712
+#: src/aosd/aosd_ui.cc:826
 msgid "Fake transparency"
 msgstr "Фальшива прозорість"
 
-#: src/aosd/aosd_ui.cc:714
+#: src/aosd/aosd_ui.cc:828
 msgid "Real transparency (requires X Composite Ext.)"
 msgstr "Справжня прозорість (потребує композитні розширення X)"
 
-#: src/aosd/aosd_ui.cc:756
+#: src/aosd/aosd_ui.cc:875
 msgid "Composite extension not loaded"
 msgstr "Композитне розширення вимкнене"
 
-#: src/aosd/aosd_ui.cc:764
-msgid "Composite extension not available"
-msgstr "Композитне розширення недоступне"
-
-#: src/aosd/aosd_ui.cc:781
+#: src/aosd/aosd_ui.cc:892
 #, c-format
 msgid "Audacious OSD"
 msgstr "OSD-повідомлення Audacious"
 
-#: src/aosd/aosd_ui.cc:844
+#: src/aosd/aosd_ui.cc:955
 msgid "Position"
 msgstr "Розташування"
 
-#: src/aosd/aosd_ui.cc:849
+#: src/aosd/aosd_ui.cc:960
 msgid "Animation"
 msgstr "Анімація"
 
-#: src/aosd/aosd_ui.cc:854
+#: src/aosd/aosd_ui.cc:965
 msgid "Text"
 msgstr "Текст"
 
-#: src/aosd/aosd_ui.cc:859
+#: src/aosd/aosd_ui.cc:970
 msgid "Decoration"
 msgstr "Оздоблення"
 
-#: src/aosd/aosd_ui.cc:864
+#: src/aosd/aosd_ui.cc:975
 msgid "Trigger"
 msgstr "Спусковий гачок"
 
-#: src/aosd/aosd_ui.cc:869
+#: src/aosd/aosd_ui.cc:980 src/streamtuner/shoutcast-model.cc:202
 msgid "Misc"
 msgstr "Різне"
 
-#: src/aosd/aosd_ui.cc:878
+#: src/aosd/aosd_ui.cc:989
 msgid "Test"
 msgstr "Тест"
 
 #: src/asx3/asx3.cc:35
 msgid "ASXv3 Playlists"
-msgstr "ASXv3 Плейлісти"
+msgstr "ASXv3-плейлисти"
 
 #: src/asx/asx.cc:33
 msgid "ASXv1/ASXv2 Playlists"
-msgstr "ASXv1/ASXv2-списки відтворення"
+msgstr "ASXv1/ASXv2-плейлисти"
 
 #: src/audpl/audpl.cc:33
 msgid "Audacious Playlists (audpl)"
 msgstr "Списки відтворення Audacious (audpl)"
 
-#: src/blur_scope/blur_scope.cc:42
+#: src/background_music/background_music.cc:24
+msgid "Background music"
+msgstr ""
+
+#: src/background_music/background_music.cc:25
+msgid "Target level:"
+msgstr ""
+
+#: src/background_music/background_music.cc:28
+#: src/background_music/background_music.cc:33
+#: src/silence-removal/silence-removal.cc:70
+msgid "dB"
+msgstr "дБ"
+
+#: src/background_music/background_music.cc:29
+msgid "Maximum amplification:"
+msgstr ""
+
+#: src/background_music/background_music.cc:34 src/mpg123/mpg123.cc:81
+msgid "Advanced"
+msgstr "Розширені"
+
+#: src/background_music/background_music.cc:36
+msgid "Slow detection weight:"
+msgstr ""
+
+#: src/background_music/background_music.cc:39
+msgid "Hint"
+msgstr ""
+
+#: src/background_music/background_music.cc:41
+msgid ""
+"Slow detection weight is the relative weight\n"
+"of a long term average detection when compared\n"
+"to the actual, faster loudness detection.\n"
+"A value of zero gives a more radio-like sound\n"
+"where soft passages get \"pulled up\" more quickly,\n"
+"a value of two makes the sound feel less compressed."
+msgstr ""
+
+#: src/background_music/background_music.cc:52
+msgid ""
+"Background Music Plugin for Audacious\n"
+"Copyright 2023;2024 Michel Fleur\n"
+"\n"
+"Controls the volume to make the sound equally loud within and between "
+"tracks.\n"
+" It uses accurate loudness measurement and tries to make the volume changes "
+"sound natural without audible peaks, yet without lowering the volume before "
+"a peak in advance."
+msgstr ""
+
+#: src/background_music/background_music.cc:61
+msgid "Background Music"
+msgstr ""
+
+#: src/bitcrusher/bitcrusher.cc:33
+msgid "Bitcrusher"
+msgstr ""
+
+#: src/bitcrusher/bitcrusher.cc:34
+msgid "Bit Depth:"
+msgstr ""
+
+#: src/bitcrusher/bitcrusher.cc:37
+msgid "Downsample ratio:"
+msgstr ""
+
+#: src/bitcrusher/bitcrusher.cc:48
+msgid "Bitcrusher"
+msgstr ""
+
+#: src/blur_scope/blur_scope.cc:40 src/blur_scope-qt/blur_scope.cc:45
 msgid "Color"
 msgstr "Колір"
 
-#: src/blur_scope/blur_scope.cc:58
+#: src/blur_scope/blur_scope.cc:56 src/blur_scope-qt/blur_scope.cc:158
 msgid "Blur Scope"
 msgstr "Осцилоскоп"
 
 #: src/bs2b/plugin.cc:38
 msgid "Bauer Stereophonic-to-Binaural (BS2B)"
-msgstr "Перетворення стереозвуку в бінауральний за Бауером (BS2B)"
+msgstr "Перетворення стереозвуку до бінаврального за Бавером (BS2B)"
 
 #: src/bs2b/plugin.cc:129
 msgid "Presets:"
 msgstr "Пресети:"
 
+#: src/bs2b/plugin.cc:130
+msgid "Default"
+msgstr "Як типово"
+
 #: src/bs2b/plugin.cc:136
 msgid "Feed level:"
 msgstr "Рівень змішування каналів:"
 
 #: src/bs2b/plugin.cc:138
 msgid "x1/10 dB"
-msgstr ""
+msgstr "x1/10 дБ"
 
 #: src/bs2b/plugin.cc:139
 msgid "Cut frequency:"
 msgstr "Частота зрізу:"
 
-#: src/cairo-spectrum/cairo-spectrum.cc:41
+#: src/cairo-spectrum/cairo-spectrum.cc:42 src/qt-spectrum/qt-spectrum.cc:107
 msgid "Spectrum Analyzer"
 msgstr "Стовпці (аналізатор спектру)"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:72
+#: src/cdaudio/cdaudio-ng.cc:74
 msgid "Audio CD Plugin"
-msgstr "Плаґін аудіодисків"
+msgstr "Втулок авдіодисків"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:121
+#: src/cdaudio/cdaudio-ng.cc:121
 msgid ""
 "Copyright (C) 2007-2012 Calin Crisan <ccrisan@gmail.com> and others.\n"
 "\n"
@@ -826,132 +701,132 @@
 "\n"
 "Цей проект брав участь у Google Summer of Code 2007."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:137
+#: src/cdaudio/cdaudio-ng.cc:140
 msgid "Device"
 msgstr "Пристрій"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:138
+#: src/cdaudio/cdaudio-ng.cc:141
 msgid "Read speed:"
 msgstr "Швидкість читання:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:141
+#: src/cdaudio/cdaudio-ng.cc:144
 msgid "Override device:"
 msgstr "Перевизначення пристроїв:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:143
+#: src/cdaudio/cdaudio-ng.cc:146
 msgid "Metadata"
 msgstr "Метадані"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:144
+#: src/cdaudio/cdaudio-ng.cc:147
 msgid "Use CD-Text"
 msgstr "Використовувати CD-Text"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:146
+#: src/cdaudio/cdaudio-ng.cc:150
 msgid "Use CDDB"
 msgstr "Використовувати CDDB"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:148
+#: src/cdaudio/cdaudio-ng.cc:152
 msgid "Use HTTP instead of CDDBP"
 msgstr "Використовувати HTTP замість CDDBP"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:151
+#: src/cdaudio/cdaudio-ng.cc:155
 msgid "Server:"
 msgstr "Сервер:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:155
+#: src/cdaudio/cdaudio-ng.cc:159
 msgid "Path:"
 msgstr "Шлях:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:159
+#: src/cdaudio/cdaudio-ng.cc:163
 msgid "Port:"
 msgstr "Порт:"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:246
+#: src/cdaudio/cdaudio-ng.cc:228
 msgid "Failed to initialize cdio subsystem."
 msgstr "Не вдалося задіяти підсистему cdio."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:281
+#: src/cdaudio/cdaudio-ng.cc:260
 #, c-format
 msgid "Invalid URI %s."
-msgstr "Хибне посилання: %s."
+msgstr "Хибна ланка: %s."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:283
+#: src/cdaudio/cdaudio-ng.cc:262
 #, c-format
 msgid "Track %d not found."
-msgstr "Доріжки %d не знайдено."
+msgstr "Стежки %d не знайдено."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:285
+#: src/cdaudio/cdaudio-ng.cc:264
 #, c-format
 msgid "Track %d is a data track."
-msgstr "Доріжка %d — не музичні дані."
+msgstr "Стежка %d — не музичні дані."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:360
+#: src/cdaudio/cdaudio-ng.cc:339
 msgid "Error reading audio CD."
-msgstr "Стався збій при читанні аудіодиску."
+msgstr "Стався збій при читанні авдіодиску."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:429
+#: src/cdaudio/cdaudio-ng.cc:410
 msgid "Audio CD"
-msgstr "Аудіодиск"
+msgstr "Авдіодиск"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:460 src/cdaudio-ng/cdaudio-ng.cc:469
+#: src/cdaudio/cdaudio-ng.cc:446 src/cdaudio/cdaudio-ng.cc:455
 #, c-format
 msgid "Failed to open CD device %s."
 msgstr "Не вдалося відкрити CD-пристрій %s."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:472
+#: src/cdaudio/cdaudio-ng.cc:458
 msgid "No audio capable CD drive found."
-msgstr "Не знайдено CD-пристрою з підтримкою аудіо."
+msgstr "Не знайдено CD-пристрою з підтримкою авдіо."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:497
+#: src/cdaudio/cdaudio-ng.cc:481
+msgid "Drive is empty."
+msgstr "Привід порожній."
+
+#: src/cdaudio/cdaudio-ng.cc:483
+msgid "Unsupported disk type."
+msgstr "Непідтримуваний тип диску."
+
+#: src/cdaudio/cdaudio-ng.cc:507
 msgid "Failed to finish initializing opened CD drive."
 msgstr "Не вдалося задіяти відкритий CD-привід."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:510
+#: src/cdaudio/cdaudio-ng.cc:520
 msgid "Failed to retrieve first/last track number."
-msgstr "Не вдалося отримати номер першої/останньої доріжки."
+msgstr "Не вдалося отримати номер першої/останньої стежки."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:531
+#: src/cdaudio/cdaudio-ng.cc:541
 #, c-format
 msgid "Cannot read start/end LSN for track %d."
-msgstr "Не вдалося прочитати LSN початку/кінця доріжки %d."
+msgstr "Не вдалося прочитати LSN початку/кінця стежки %d."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:613
-msgid "Failed to create the cddb connection."
-msgstr "Не вдалося з’єднатися з cddb."
+#: src/cdaudio/cdaudio-ng.cc:624
+msgid "Failed to create the CDDB connection."
+msgstr "Не вдалося створити з'єднання з CDDB."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:679
+#: src/cdaudio/cdaudio-ng.cc:690
 msgid "Failed to query the CDDB server"
 msgstr "Не вдалося запитати сервер CDDB."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:681
+#: src/cdaudio/cdaudio-ng.cc:692
 #, c-format
 msgid "Failed to query the CDDB server: %s"
 msgstr "Не вдалося запитати сервер CDDB: %s."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:705
+#: src/cdaudio/cdaudio-ng.cc:716
 #, c-format
-msgid "Failed to read the cddb info: %s"
-msgstr "Не вдалося прочитати інформацію CDDB: %s."
-
-#: src/cdaudio-ng/cdaudio-ng.cc:765
-msgid "Drive is empty."
-msgstr "Привід порожній."
-
-#: src/cdaudio-ng/cdaudio-ng.cc:767
-msgid "Unsupported disk type."
-msgstr "Непідтримуваний тип диску."
+msgid "Failed to read the CDDB info: %s"
+msgstr "Не вдалося прочитати дані з CDDB: %s"
 
-#: src/cd-menu-items/cd-menu-items.cc:35
+#: src/cd-menu-items/cd-menu-items.cc:33
 msgid "Audio CD Menu Items"
-msgstr "Пункти меню для аудіодисків"
+msgstr "Пункти меню для авдіодисків"
 
-#: src/cd-menu-items/cd-menu-items.cc:47
-msgid "Play CD"
-msgstr "Відтворити диск"
-
-#: src/cd-menu-items/cd-menu-items.cc:47
-msgid "Add CD"
-msgstr "Додати диск"
+#: src/cd-menu-items/cd-menu-items.cc:45
+msgid "Pla_y CD"
+msgstr "Програ_ти КД"
+
+#: src/cd-menu-items/cd-menu-items.cc:45
+msgid "_Add CD"
+msgstr "_Додати КД"
 
 #: src/compressor/compressor.cc:45
 msgid "Compression"
@@ -970,6 +845,8 @@
 "Dynamic Range Compression Plugin for Audacious\n"
 "Copyright 2010-2014 John Lindgren"
 msgstr ""
+"Втулок стиснення динамічного діапазону для Audacious\n"
+"Copyright 2010-2014 Джон Ліндґрен"
 
 #: src/compressor/compressor.cc:64
 msgid "Dynamic Range Compressor"
@@ -984,7 +861,7 @@
 "William Pitcock <nenolod@dereferenced.org>\n"
 "Shay Green <gblargg@gmail.com>"
 msgstr ""
-"Двигун відтворення консольної музики в наступних форматах:\n"
+"Рушій відтворення консольної музики в наступних форматах:\n"
 "AY, GBS, GYM, HES, KSS, NSF, NSFE, SAP, SPC, VGM, VGZ.\n"
 "\n"
 "Заснований на Game_Music_Emu 0.5.2.\n"
@@ -1001,13 +878,20 @@
 
 #: src/console/plugin.cc:36
 msgid "Echo:"
-msgstr "Ехо:"
+msgstr "Луна:"
 
 #: src/console/plugin.cc:39
 msgid "Default song length:"
 msgstr "Типова тривалість пісні:"
 
-#: src/console/plugin.cc:42 src/modplug/plugin_main.cc:59
+#: src/console/plugin.cc:41 src/crossfade/crossfade.cc:56
+#: src/crossfade/crossfade.cc:62 src/lirc/lirc.cc:395 src/notify/notify.cc:113
+#: src/sid/xs_config.cc:85 src/sid/xs_config.cc:94 src/sid/xs_config.cc:103
+#: src/vumeter-qt/vumeter_qt.cc:39
+msgid "seconds"
+msgstr "секунд"
+
+#: src/console/plugin.cc:42 src/modplug/plugin_main.cc:58
 msgid "Resampling"
 msgstr "Ресемплінг"
 
@@ -1021,7 +905,7 @@
 
 #: src/console/plugin.cc:50
 msgid "Ignore length from SPC tags"
-msgstr "Ігнорувати тривалість із теґів SPC"
+msgstr "Ігнорувати тривалість з міток SPC"
 
 #: src/console/plugin.cc:52
 msgid "Increase reverb"
@@ -1031,76 +915,94 @@
 msgid "Game Console Music Decoder"
 msgstr "Декодер ігроконсольної музики"
 
-#: src/coreaudio/coreaudio.cc:50
+#: src/coreaudio/coreaudio.cc:53
 msgid "CoreAudio output"
-msgstr ""
+msgstr "Вивід CoreAudio"
 
-#: src/coreaudio/coreaudio.cc:131
+#: src/coreaudio/coreaudio.cc:155
 msgid ""
 "CoreAudio Output Plugin for Audacious\n"
 "Copyright 2014 William Pitcock\n"
+"Copyright 2017,18 René J.V. Bertin\n"
+" (original code and code adapted from\n"
+" Apple examples, (C) Apple 2013)\n"
 "\n"
 "Based on SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
 msgstr ""
+"Вихідний втулок CoreAudio для Audacious\n"
+"Копірайт 2014 William Pitcock\n"
+"Копірайт 2017,18 René J.V. Bertin\n"
+"(початковий та адаптований коди з\n"
+"Apple examples, (C) Apple 2013)\n"
+"\n"
+"Основано на вихідному втулкові SDL для Audacious\n"
+"Копірайт 2010 John Lindgren"
 
-#: src/coreaudio/coreaudio.cc:143
+#: src/coreaudio/coreaudio.cc:171
 msgid "Use exclusive mode"
+msgstr "Користати винятковий режим"
+
+#: src/coreaudio/coreaudio.cc:173
+msgid "Use bit perfect audio (adapt device sampling rate)"
 msgstr ""
+"Використовувати покращення звуку (адаптацiя частоти дискредитації пристрою )"
 
-#: src/crossfade/crossfade.cc:44
+#: src/crossfade/crossfade.cc:47
 msgid ""
 "Crossfade Plugin for Audacious\n"
 "Copyright 2010-2014 John Lindgren"
 msgstr ""
+"Втулок \"перехресного затихання\" для Audacious\n"
+"Copyright 2010-2014 Джон Ліндґрен"
 
-#: src/crossfade/crossfade.cc:48
+#: src/crossfade/crossfade.cc:51
 msgid "Crossfade"
 msgstr "Перехресне затихання"
 
-#: src/crossfade/crossfade.cc:49
+#: src/crossfade/crossfade.cc:52
 msgid "On automatic song change"
-msgstr ""
+msgstr "За автоматичною зміною пісень"
 
-#: src/crossfade/crossfade.cc:51 src/crossfade/crossfade.cc:57
+#: src/crossfade/crossfade.cc:54 src/crossfade/crossfade.cc:60
 msgid "Overlap:"
 msgstr "Перекриття:"
 
-#: src/crossfade/crossfade.cc:55
+#: src/crossfade/crossfade.cc:58
 msgid "On seek or manual song change"
+msgstr "Перемикання пісень стандартно або навмання"
+
+#: src/crossfade/crossfade.cc:64
+msgid "No fade in"
 msgstr ""
 
-#: src/crossfade/crossfade.cc:61
-msgid "Tip"
+#: src/crossfade/crossfade.cc:66
+msgid "Use S-curve fade"
 msgstr ""
 
-#: src/crossfade/crossfade.cc:62
-msgid ""
-"For better crossfading, enable\n"
-"the Silence Removal effect."
+#: src/crossfade/crossfade.cc:68
+msgid "S-curve steepness:"
+msgstr ""
+
+#: src/crossfade/crossfade.cc:70
+msgid "(higher is steeper)"
 msgstr ""
 
 #: src/crossfade/crossfade.cc:72
-msgid "Crossfade"
-msgstr "Перехресне затихання"
+msgid "Tip"
+msgstr "Порада"
 
-#: src/crossfade/crossfade.cc:161
+#: src/crossfade/crossfade.cc:73
 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."
+"For better crossfading, enable\n"
+"the Silence Removal effect."
 msgstr ""
-"Збій при перехресному затиханні: композиції мають різну кількість каналів.\n"
-"Виправте це плаґіном-мікшером каналів."
+"Для ліпшого перехідного затухання ввімкніть\n"
+"ефект усування тиші"
 
-#: src/crossfade/crossfade.cc:168
-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"
-"Виправте це плаґіном-конвертором частоти дискретизації."
+#: src/crossfade/crossfade.cc:83
+msgid "Crossfade"
+msgstr "Перехресне затихання"
 
 #: src/crystalizer/crystalizer.cc:31
 msgid "Crystalizer"
@@ -1114,62 +1016,63 @@
 msgid "Crystalizer"
 msgstr "Кристалізатор"
 
-#: src/cue/cue.cc:37
+#: src/cue/cue.cc:42
 msgid "Cue Sheet Plugin"
-msgstr "Плаґін cue-листів"
+msgstr "Втулок списків розмічування"
 
-#: src/delete-files/delete-files.cc:46 src/delete-files/delete-files.cc:146
+#: src/delete-files/delete-files.cc:53 src/delete-files/delete-files.cc:215
+#: src/delete-files/delete-files.cc:230
 msgid "Delete Files"
 msgstr "Видалення файлів"
 
-#: src/delete-files/delete-files.cc:75
+#: src/delete-files/delete-files.cc:120
+msgid "No files are selected."
+msgstr "Жодного файлу не вибрано."
+
+#: src/delete-files/delete-files.cc:125
 #, c-format
-msgid "Error moving %s to trash: %s."
-msgstr "Помилка при переміщенні %s в смітник: %s."
+msgid "Do you want to move %s to the trash?"
+msgstr "Чи ви хочете перемістити %s до смітнику?"
 
-#: src/delete-files/delete-files.cc:86
+#: src/delete-files/delete-files.cc:126
 #, c-format
-msgid "Error deleting %s: %s."
-msgstr "Помилка при видаленні %s: %s."
+msgid "Do you want to permanently delete %s?"
+msgstr "Чи ви хочете назавжди видалити %s?"
 
-#: src/delete-files/delete-files.cc:117
+#: src/delete-files/delete-files.cc:133
 #, c-format
-msgid "Error deleting %s: not a local file."
-msgstr "Помилка при видаленні %s: це не локальний файл."
+msgid "Do you want to move %d files to the trash?"
+msgstr "Чи ви хочете перемістити файли %d до смітнику?"
 
 #: src/delete-files/delete-files.cc:134
-msgid "Do you want to move the selected files to the trash?"
-msgstr "Ви хочете перемістити вибрані файли до смітника?"
+#, c-format
+msgid "Do you want to permanently delete %d files?"
+msgstr "Чи ви хочете назавжди видалити файли %d?"
 
-#: src/delete-files/delete-files.cc:135
-msgid "Move to Trash"
-msgstr "Перемістити до смітника"
-
-#: src/delete-files/delete-files.cc:140
-msgid "Do you want to permanently delete the selected files?"
-msgstr "Ви хочете безповоротно видалити вибрані файли?"
+#: src/delete-files/delete-files.cc:146
+msgid "Move to trash"
+msgstr "Перемістити до смітнику"
 
-#: src/delete-files/delete-files.cc:141 src/skins/preset-list.cc:411
-#: src/skins/preset-list.cc:427
+#: src/delete-files/delete-files.cc:146
 msgid "Delete"
 msgstr "Вилучити"
 
-#: src/delete-files/delete-files.cc:145 src/skins/preset-browser.cc:56
-#: src/skins/preset-list.cc:307 src/skins/ui_playlist.cc:221
+#: src/delete-files/delete-files.cc:213 src/delete-files/delete-files.cc:235
+#: src/skins-qt/search-select.cc:102 src/skins/search-select.cc:78
 msgid "Cancel"
 msgstr "Скасувати"
 
-#: src/delete-files/delete-files.cc:166
+#: src/delete-files/delete-files.cc:267
 msgid "Delete Selected Files"
-msgstr "Видалити вибрані файли"
+msgstr "Видалити обрані файли"
 
-#: src/delete-files/delete-files.cc:181
+#: src/delete-files/delete-files.cc:287
 msgid "Delete Method"
-msgstr "Метод Видалення"
+msgstr "Метод видалення"
 
-#: src/delete-files/delete-files.cc:182
+#: src/delete-files/delete-files.cc:288
 msgid "Move to trash instead of deleting immediately"
-msgstr "Перемістити до смітника замість видалення відразу"
+msgstr "Перемістити до смітнику замість негайного видалення"
 
 #: src/echo_plugin/echo.cc:9
 msgid ""
@@ -1178,18 +1081,22 @@
 "Surround echo by Carl van Schaik, 1999\n"
 "Updated for Audacious by William Pitcock and John Lindgren, 2010-2014"
 msgstr ""
+"Втулок Echo \n"
+"Створено Джоан Левін, 1999\n"
+"Surround echo створено Карлом ван Шайком, 1999\n"
+"Оновлено для Audacious Вільямом Піткоком та Джоном Ліндґреном, 2010-2014"
 
 #: src/echo_plugin/echo.cc:21
 msgid "Echo"
 msgstr "Відлуння"
 
-#: src/echo_plugin/echo.cc:22 src/modplug/plugin_main.cc:73
-#: src/modplug/plugin_main.cc:83
+#: src/echo_plugin/echo.cc:22 src/modplug/plugin_main.cc:72
+#: src/modplug/plugin_main.cc:82
 msgid "Delay:"
 msgstr "Затримка:"
 
-#: src/echo_plugin/echo.cc:24 src/modplug/plugin_main.cc:73
-#: src/modplug/plugin_main.cc:83
+#: src/echo_plugin/echo.cc:24 src/modplug/plugin_main.cc:72
+#: src/modplug/plugin_main.cc:82 src/xsf/plugin.cc:445
 msgid "ms"
 msgstr "мс"
 
@@ -1197,7 +1104,7 @@
 msgid "Feedback:"
 msgstr "Сила:"
 
-#: src/echo_plugin/echo.cc:28 src/modplug/plugin_main.cc:87
+#: src/echo_plugin/echo.cc:28 src/modplug/plugin_main.cc:86
 msgid "Volume:"
 msgstr "Гучність:"
 
@@ -1205,11 +1112,11 @@
 msgid "Echo"
 msgstr "Відлуння"
 
-#: src/ffaudio/ffaudio-core.cc:41
+#: src/ffaudio/ffaudio-core.cc:50
 msgid "FFmpeg Plugin"
-msgstr "Плаґін FFmpeg"
+msgstr "Втулок FFmpeg"
 
-#: src/ffaudio/ffaudio-core.cc:571
+#: src/ffaudio/ffaudio-core.cc:649
 msgid ""
 "Multi-format audio decoding plugin for Audacious using\n"
 "FFmpeg multimedia framework (http://www.ffmpeg.org/)\n"
@@ -1218,260 +1125,331 @@
 "William Pitcock <nenolod@nenolod.net>\n"
 "Matti Hämäläinen <ccr@tnsp.org>"
 msgstr ""
-"Відтворення звуку в різних форматах\n"
+"Відтворення звуку у різних форматах\n"
 "за допомогою фреймворку FFmpeg\n"
 "\n"
 "http://www.ffmpeg.org/\n"
 "\n"
-"Автори плаґіну:\n"
+"Автори втулку:\n"
 "William Pitcock <nenolod@nenolod.net>\n"
 "Matti Hämäläinen <ccr@tnsp.org>"
 
-#: src/filewriter/filewriter.cc:45
+#: src/filewriter/filewriter.cc:48
 msgid "FileWriter Plugin"
-msgstr "Плаґін запису у файл"
+msgstr "Втулок запису у файл"
+
+#: src/filewriter/filewriter.cc:316
+#, c-format
+msgid ""
+"Error opening %s:\n"
+"%s"
+msgstr ""
+"Неможливо відкрити %s:\n"
+"%s"
+
+#: src/filewriter/filewriter.cc:358
+msgid ""
+"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 ""
+"Ця програма є вільним програмним забезпеченням — ви можете розповсюджувати "
+"та/чи модифікувати її відповідно до умов Загальної публічної ліцензії GNU, 2-"
+"ої або (на вашу думку) будь-якої новішої версії у тому вигляді, якому її "
+"опублікувано\n"
+"\n"
+"Програма розповсюджується зі сподіванням, що вона виявиться корисною, але "
+"БЕЗ ЖОДНОЇ ГАРАНТІЇ; навіть без умовної гарантії КОМЕРЦІЙНОЇ ПРИДАТНОСТІ чи "
+"ПРИДАТНОСТІ ДО ПЕВНОГО ЗАСТОСУВАННЯ. Зверніться до Загальної публічної "
+"ліцензії GNU за подробицями.\n"
+"\n"
+"Ви мали отримати копію Загальної публічної ліцензії GNU разом із цією "
+"програмою. Якщо ви не отримали копії, зверніться за наступною адресою: Free "
+"Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA "
+"02110-1301, USA"
 
-#: src/filewriter/filewriter.cc:386
+#: src/filewriter/filewriter.cc:385
 msgid "Output file format:"
 msgstr "Тип файлу виводу:"
 
-#: src/filewriter/filewriter.cc:403
-msgid "Configure"
-msgstr "Налаштування..."
-
-#: src/filewriter/filewriter.cc:413
+#: src/filewriter/filewriter.cc:389
 msgid "Save into original directory"
-msgstr "Зберігати в теку оригіналу"
+msgstr "Зберігати до первісної теки"
 
-#: src/filewriter/filewriter.cc:417
-msgid "Save into custom directory"
-msgstr "Обрати теку самостійно"
-
-#: src/filewriter/filewriter.cc:427
-msgid "Output file folder:"
-msgstr "Зберігати вивід до:"
-
-#: src/filewriter/filewriter.cc:431
-msgid "Pick a folder"
-msgstr "Вибір теки виводу"
+#: src/filewriter/filewriter.cc:392
+msgid "Save into custom directory:"
+msgstr "Зберегти до обраної теки:"
 
-#: src/filewriter/filewriter.cc:444
+#: src/filewriter/filewriter.cc:400
 msgid "Generate file name from:"
-msgstr ""
+msgstr "Створити назву назву фалу з:"
+
+#: src/filewriter/filewriter.cc:401
+msgid "Original file name"
+msgstr "Початкова назва файлу"
 
-#: src/filewriter/filewriter.cc:448
+#: src/filewriter/filewriter.cc:404
+msgid "Original file name (no suffix)"
+msgstr "Початкова назва файлу (без наростку)"
+
+#: src/filewriter/filewriter.cc:407
 msgid "Original file tag"
+msgstr "Початкова мітка файлу"
+
+#: src/filewriter/filewriter.cc:411
+msgid "Prepend track number to file name"
+msgstr "Номер стежки на початку назви файлу"
+
+#: src/filewriter/filewriter.cc:417 src/filewriter/filewriter.cc:449
+msgid "Auto"
+msgstr "Авто"
+
+#: src/filewriter/filewriter.cc:418
+msgid "8000 Hz"
+msgstr "8000 Гц"
+
+#: src/filewriter/filewriter.cc:419
+msgid "11025 Hz"
+msgstr "11025 Гц"
+
+#: src/filewriter/filewriter.cc:420
+msgid "12000 Hz"
+msgstr "12000 Гц"
+
+#: src/filewriter/filewriter.cc:421
+msgid "16000 Hz"
+msgstr "16000 Гц"
+
+#: src/filewriter/filewriter.cc:422
+msgid "22050 Hz"
+msgstr "22050 Гц"
+
+#: src/filewriter/filewriter.cc:423
+msgid "24000 Hz"
+msgstr "24000 Гц"
+
+#: src/filewriter/filewriter.cc:424
+msgid "32000 Hz"
+msgstr "32000 Гц"
+
+#: src/filewriter/filewriter.cc:425 src/xsf/plugin.cc:430
+msgid "44100 Hz"
+msgstr "44100 Гц"
+
+#: src/filewriter/filewriter.cc:426 src/xsf/plugin.cc:431
+msgid "48000 Hz"
+msgstr "48000 Гц"
+
+#: src/filewriter/filewriter.cc:430
+msgid "8 kbit/s"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:453
-msgid "Original file name"
+#: src/filewriter/filewriter.cc:431
+msgid "16 kbit/s"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:459
-msgid "Include original file name extension"
+#: src/filewriter/filewriter.cc:432
+msgid "32 kbit/s"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:468
-msgid "Prepend track number to file name"
+#: src/filewriter/filewriter.cc:433
+msgid "40 kbit/s"
 msgstr ""
 
-#: src/filewriter/filewriter.cc:484
-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."
+#: src/filewriter/filewriter.cc:434
+msgid "48 kbit/s"
 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/mp3.cc:40 src/filewriter/mp3.cc:717
-msgid "Auto"
-msgstr "Авто"
+#: src/filewriter/filewriter.cc:435
+msgid "56 kbit/s"
+msgstr ""
 
-#: src/filewriter/mp3.cc:40
-msgid "Joint Stereo"
-msgstr "Об’єднане стерео"
+#: src/filewriter/filewriter.cc:436
+msgid "64 kbit/s"
+msgstr ""
 
-#: src/filewriter/mp3.cc:41 src/modplug/plugin_main.cc:58
-#: src/mpg123/mpg123.cc:248
-msgid "Stereo"
-msgstr "Стерео"
+#: src/filewriter/filewriter.cc:437
+msgid "80 kbit/s"
+msgstr ""
 
-#: src/filewriter/mp3.cc:41 src/modplug/plugin_main.cc:57
-#: src/mpg123/mpg123.cc:248
-msgid "Mono"
-msgstr "Моно"
+#: src/filewriter/filewriter.cc:438
+msgid "96 kbit/s"
+msgstr ""
 
-#: src/filewriter/mp3.cc:657
-msgid "MP3 Configuration"
-msgstr "Налаштування MP3"
+#: src/filewriter/filewriter.cc:439
+msgid "112 kbit/s"
+msgstr ""
 
-#: src/filewriter/mp3.cc:658
-msgid "_OK"
-msgstr "_Гаразд"
+#: src/filewriter/filewriter.cc:440
+msgid "128 kbit/s"
+msgstr ""
 
-#: src/filewriter/mp3.cc:681
-msgid "Algorithm Quality:"
-msgstr "Швидкість стиснення:"
+#: src/filewriter/filewriter.cc:441
+msgid "160 kbit/s"
+msgstr ""
 
-#: src/filewriter/mp3.cc:706
-msgid "Output Sample Rate:"
+#: src/filewriter/filewriter.cc:442
+msgid "192 kbit/s"
 msgstr ""
 
-#: src/filewriter/mp3.cc:733
-msgid "(Hz)"
-msgstr "(Гц)"
+#: src/filewriter/filewriter.cc:443
+msgid "224 kbit/s"
+msgstr ""
 
-#: src/filewriter/mp3.cc:740
-msgid "Bitrate / Compression Ratio:"
+#: src/filewriter/filewriter.cc:444
+msgid "256 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:445
+msgid "320 kbit/s"
 msgstr ""
 
-#: src/filewriter/mp3.cc:764
-msgid "Bitrate (kbps):"
-msgstr "Бітрейт (Кбіт/с)"
+#: src/filewriter/filewriter.cc:450
+msgid "Joint Stereo"
+msgstr "Об’єднане стерео"
 
-#: src/filewriter/mp3.cc:796
+#: src/filewriter/filewriter.cc:451 src/modplug/plugin_main.cc:57
+#: src/mpg123/mpg123.cc:259
+msgid "Stereo"
+msgstr "Стерео"
+
+#: src/filewriter/filewriter.cc:452 src/modplug/plugin_main.cc:56
+#: src/mpg123/mpg123.cc:260
+msgid "Mono"
+msgstr "Моно"
+
+#: src/filewriter/filewriter.cc:456
+msgid "VBR"
+msgstr "VBR"
+
+#: src/filewriter/filewriter.cc:457
+msgid "ABR"
+msgstr "ABR"
+
+#: src/filewriter/filewriter.cc:478
+msgid "Algorithm quality:"
+msgstr "Алґоритм якости:"
+
+#: src/filewriter/filewriter.cc:484
+msgid "Bitrate:"
+msgstr "Бітрейт:"
+
+#: src/filewriter/filewriter.cc:491
 msgid "Compression ratio:"
-msgstr "Коефіцієнт стиснення:"
+msgstr "Коєфіцієнт стиснення:"
 
-#: src/filewriter/mp3.cc:820
-msgid "Audio Mode:"
+#: src/filewriter/filewriter.cc:498
+msgid "Audio mode:"
 msgstr "Тип звуку:"
 
-#: src/filewriter/mp3.cc:845
-msgid "Miscellaneous:"
-msgstr ""
-
-#: src/filewriter/mp3.cc:856
+#: src/filewriter/filewriter.cc:501
 msgid "Enforce strict ISO compliance"
-msgstr ""
+msgstr "Примусова відповідність до ISO"
 
-#: src/filewriter/mp3.cc:867
+#: src/filewriter/filewriter.cc:503
 msgid "Error protection"
 msgstr "CRC-захист від збоїв (дещо менша якість)"
 
-#: src/filewriter/mp3.cc:879 src/filewriter/vorbis.cc:206
-msgid "Quality"
-msgstr "Якість"
-
-#: src/filewriter/mp3.cc:888
+#: src/filewriter/filewriter.cc:508
 msgid "Enable VBR/ABR"
-msgstr "Увімкнути змінний чи усереднений бітрейт"
+msgstr "Ввімкнути змінний чи усереднений бітрейт"
 
-#: src/filewriter/mp3.cc:898
+#: src/filewriter/filewriter.cc:510
 msgid "Type:"
 msgstr "Тип бітрейту:"
 
-#: src/filewriter/mp3.cc:931
-msgid "VBR Options:"
-msgstr "Опції VBR (змінний бітрейт):"
-
-#: src/filewriter/mp3.cc:947
-msgid "Minimum bitrate (kbps):"
-msgstr "Мінімальний бітрейт (Кбіт/c):"
-
-#: src/filewriter/mp3.cc:973
-msgid "Maximum bitrate (kbps):"
-msgstr "Максимальний бітрейт (Кбіт/c):"
-
-#: src/filewriter/mp3.cc:995
-msgid "Strictly enforce minimum bitrate"
-msgstr "Примусово встановити мінімальний бітрейт"
+#: src/filewriter/filewriter.cc:514
+msgid "Minimum bitrate:"
+msgstr "Найменша швидкість потоку:"
+
+#: src/filewriter/filewriter.cc:518
+msgid "Maximum bitrate:"
+msgstr "Найбільша швидкість потоку:"
+
+#: src/filewriter/filewriter.cc:522
+msgid "Average bitrate:"
+msgstr "Середня швидкість потоку:"
 
-#: src/filewriter/mp3.cc:1007
-msgid "ABR Options:"
-msgstr "Опції ABR (усереднений бітрейт):"
-
-#: src/filewriter/mp3.cc:1017
-msgid "Average bitrate (kbps):"
-msgstr "Середній бітрейт (Кбіт/с):"
-
-#: src/filewriter/mp3.cc:1044
+#: src/filewriter/filewriter.cc:526
 msgid "VBR quality level:"
 msgstr "Рівень якості VBR (менше - краще):"
 
-#: src/filewriter/mp3.cc:1063
-msgid "Omit Xing VBR header"
-msgstr ""
+#: src/filewriter/filewriter.cc:530
+msgid "Strictly enforce minimum bitrate"
+msgstr "Примусово встановити мінімальний бітрейт"
 
-#: src/filewriter/mp3.cc:1076
-msgid "VBR/ABR"
-msgstr "VBR/ABR"
+#: src/filewriter/filewriter.cc:533
+msgid "Omit Xing VBR header"
+msgstr "Опустити заголовок Xing VBR"
 
-#: src/filewriter/mp3.cc:1085
-msgid "Frame Parameters:"
-msgstr ""
+#: src/filewriter/filewriter.cc:539
+msgid "Frame Headers"
+msgstr "Заголовки"
 
-#: src/filewriter/mp3.cc:1097
+#: src/filewriter/filewriter.cc:540
 msgid "Mark as copyright"
 msgstr "«Під авторськими правами»"
 
-#: src/filewriter/mp3.cc:1108
+#: src/filewriter/filewriter.cc:542
 msgid "Mark as original"
 msgstr "«Є оригіналом»"
 
-#: src/filewriter/mp3.cc:1120
-msgid "ID3 Parameters:"
-msgstr ""
+#: src/filewriter/filewriter.cc:544
+msgid "ID3 Tags"
+msgstr "ID3 Мітки"
 
-#: src/filewriter/mp3.cc:1131
+#: src/filewriter/filewriter.cc:545
 msgid "Force addition of version 2 tag"
-msgstr "Примусово додавати теґ другої версії"
+msgstr "Примусово додавати мітку другої версії"
 
-#: src/filewriter/mp3.cc:1141
+#: src/filewriter/filewriter.cc:547
 msgid "Only add v1 tag"
-msgstr "Додавати лише v1-теґ"
+msgstr "Додавати лише v1-мітку"
 
-#: src/filewriter/mp3.cc:1148
+#: src/filewriter/filewriter.cc:549
 msgid "Only add v2 tag"
-msgstr "Додавати лише v2-теґ"
+msgstr "Додавати лише v2-мітку"
 
-#: src/filewriter/mp3.cc:1169
+#: src/filewriter/filewriter.cc:554
+msgid "Quality"
+msgstr "Якість"
+
+#: src/filewriter/filewriter.cc:555
+msgid "VBR/ABR"
+msgstr "VBR/ABR"
+
+#: src/filewriter/filewriter.cc:556
 msgid "Tags"
-msgstr "Теґи"
+msgstr "Мітки"
 
-#: src/filewriter/vorbis.cc:196
-msgid "Vorbis Encoder Configuration"
-msgstr "Налаштування кодувальника Vorbis"
+#: src/filewriter/filewriter.cc:566
+msgid "Quality (0-1):"
+msgstr "Якість (0-1):"
 
-#: src/filewriter/vorbis.cc:219
-msgid "Quality level (0 - 10):"
-msgstr "Рівень якості (0-10, менше - краще):"
+#: src/filewriter/filewriter.cc:573 src/skins-qt/skins_cfg.cc:307
+#: src/skins/skins_cfg.cc:289
+msgid "General"
+msgstr "Загальне"
 
-#: src/flacng/flacng.h:35
+#: src/flac/flacng.h:36
 msgid "FLAC Decoder"
 msgstr "Декодер FLAC"
 
-#: src/flacng/metadata.cc:351 src/wavpack/wavpack.cc:209
+#: src/flac/metadata.cc:296 src/wavpack/wavpack.cc:215
 msgid "lossless"
 msgstr "без втрат"
 
-#: src/flacng/plugin.cc:169
+#: src/flac/plugin.cc:214
 msgid ""
 "Original code by\n"
 "Ralf Ertzinger <ralf@skytale.net>\n"
@@ -1488,22 +1466,22 @@
 "GIO Plugin for Audacious\n"
 "Copyright 2009-2012 John Lindgren"
 msgstr ""
-"Плаґін GIO,\n"
+"Втулок GIO,\n"
 "написаний Джоном Ліндґреном у 2010–2012 роках."
 
 #: src/gio/gio.cc:42
 msgid "GIO Plugin"
-msgstr "Плаґін GIO"
+msgstr "Втулок GIO"
 
-#: src/gio/gio.cc:153
+#: src/gio/gio.cc:152
 msgid "Read-and-append mode not supported"
-msgstr ""
+msgstr "Режим читання-додавання не підтримується"
 
-#: src/gio/gio.cc:166
+#: src/gio/gio.cc:165
 msgid "Invalid open mode"
-msgstr ""
+msgstr "Недійсний режим відкривання"
 
-#: src/gl-spectrum/gl-spectrum.cc:51
+#: src/glspectrum/gl-spectrum.cc:52
 msgid ""
 "OpenGL Spectrum Analyzer for Audacious\n"
 "Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
@@ -1514,620 +1492,756 @@
 "\n"
 "License: GPLv2+"
 msgstr ""
-"OpenGL Аналізатор Спектру для Audacious\n"
+"OpenGL Спектровий аналізатор для Audacious\n"
 "Авторське право 2013 Christophe Budé, John Lindgren, та Carlo Bramini\n"
 "\n"
-"На основі плаґіну для XMMS:\n"
+"На основі втулку для XMMS:\n"
 "Авторське право 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas "
 "Nilsson, та 4Front Technologies\n"
 "\n"
 "Ліцензія: GPLv2+"
 
-#: src/gl-spectrum/gl-spectrum.cc:62
+#: src/glspectrum/gl-spectrum.cc:63 src/qtglspectrum/gl-spectrum.cc:53
 msgid "OpenGL Spectrum Analyzer"
-msgstr "OpenGL аналізатор спектру"
+msgstr "OpenGL спектровий аналізатор"
 
-#: src/gl-spectrum-qt/gl-spectrum.cc:41
-msgid ""
-"OpenGL Spectrum Analyzer for Audacious\n"
-"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
-"Copyright 2014 William Pitcock\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-qt/gl-spectrum.cc:53
-msgid "OpenGL Spectrum Analyzer (Qt)"
-msgstr ""
-
-#: src/gnomeshortcuts/gnomeshortcuts.cc:38
-msgid "GNOME Shortcuts"
-msgstr ""
-
-#: src/gnomeshortcuts/gnomeshortcuts.cc:54
-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/gtkui/columns.cc:35
-msgid "Entry number"
-msgstr "Номер у списку"
-
-#: src/gtkui/columns.cc:36 src/playlist-manager/playlist-manager.cc:225
-#: src/qtui/playlist_model.cc:123
+#: src/gtkui/columns.cc:36 src/moonstone/playlist_model.cc:38
+#: src/qtui/playlist_model.cc:33
+msgid "Entry Number"
+msgstr "Списковий номер"
+
+#: src/gtkui/columns.cc:37 src/moonstone/playlist_model.cc:38
+#: src/moonstone/playlist_selection.cc:64
+#: src/playlist-manager/playlist-manager.cc:200
+#: src/playlist-manager-qt/playlist-manager-qt.cc:188
+#: src/qtui/playlist_model.cc:33 src/streamtuner/icecast-model.cc:120
+#: src/streamtuner/ihr-model.cc:159 src/streamtuner/shoutcast-model.cc:122
 msgid "Title"
 msgstr "Назва"
 
-#: src/gtkui/columns.cc:37 src/qtui/playlist_model.cc:125
+#: src/gtkui/columns.cc:38 src/moonstone/playlist_model.cc:39
+#: src/qtui/playlist_model.cc:33
 msgid "Artist"
 msgstr "Виконавець"
 
-#: src/gtkui/columns.cc:38
+#: src/gtkui/columns.cc:39 src/moonstone/playlist_model.cc:39
+#: src/qtui/playlist_model.cc:33
 msgid "Year"
 msgstr "Рік"
 
-#: src/gtkui/columns.cc:39 src/qtui/playlist_model.cc:127
+#: src/gtkui/columns.cc:40 src/moonstone/playlist_model.cc:39
+#: src/qtui/playlist_model.cc:34
 msgid "Album"
 msgstr "Альбом"
 
-#: src/gtkui/columns.cc:40
-msgid "Album artist"
+#: src/gtkui/columns.cc:41 src/moonstone/playlist_model.cc:40
+#: src/qtui/playlist_model.cc:34
+msgid "Album Artist"
 msgstr "Виконавець альбому"
 
-#: src/gtkui/columns.cc:41
+#: src/gtkui/columns.cc:42 src/moonstone/playlist_model.cc:40
+#: src/qtui/playlist_model.cc:34
 msgid "Track"
-msgstr "Доріжка"
+msgstr "Стежка"
 
-#: src/gtkui/columns.cc:42
+#: src/gtkui/columns.cc:43 src/moonstone/playlist_model.cc:40
+#: src/qtui/playlist_model.cc:34 src/streamtuner/icecast-model.cc:123
+#: src/streamtuner/shoutcast-model.cc:125
+#: src/streamtuner/shoutcast-model.cc:236
 msgid "Genre"
-msgstr "Жанр"
+msgstr "Напрямок"
 
-#: src/gtkui/columns.cc:43
-msgid "Queue position"
-msgstr "Позиція у черзі"
+#: src/gtkui/columns.cc:44 src/moonstone/playlist_model.cc:41
+#: src/qtui/playlist_model.cc:35
+msgid "Queue Position"
+msgstr "Місце у черзі"
 
-#: src/gtkui/columns.cc:44
+#: src/gtkui/columns.cc:45 src/moonstone/playlist_model.cc:41
+#: src/qtui/playlist_model.cc:35
 msgid "Length"
 msgstr "Тривалість"
 
-#: src/gtkui/columns.cc:45
-msgid "File path"
-msgstr "Шлях до файлу"
-
-#: src/gtkui/columns.cc:47
-msgid "Custom title"
+#: src/gtkui/columns.cc:46 src/moonstone/playlist_model.cc:41
+#: src/qtui/playlist_model.cc:35
+msgid "File Path"
+msgstr "Шлях файлу"
+
+#: src/gtkui/columns.cc:47 src/moonstone/playlist_model.cc:42
+#: src/qtui/playlist_model.cc:35
+msgid "File Name"
 msgstr "Назва файлу"
 
-#: src/gtkui/columns.cc:48
+#: src/gtkui/columns.cc:48 src/moonstone/playlist_model.cc:42
+#: src/qtui/playlist_model.cc:36
+msgid "Custom Title"
+msgstr "Користувацько-налаштовна назва"
+
+#: src/gtkui/columns.cc:49 src/moonstone/playlist_model.cc:42
+#: src/qtui/playlist_model.cc:36 src/streamtuner/icecast-model.cc:129
+#: src/streamtuner/shoutcast-model.cc:134
 msgid "Bitrate"
 msgstr "Бітова швидкість"
 
-#: src/gtkui/columns.cc:308
+#: src/gtkui/columns.cc:50 src/moonstone/playlist_model.cc:43
+#: src/qtui/playlist_model.cc:36
+msgid "Comment"
+msgstr "Коментар"
+
+#: src/gtkui/columns.cc:51 src/qtui/playlist_model.cc:36
+msgid "Publisher"
+msgstr ""
+
+#: src/gtkui/columns.cc:52 src/qtui/playlist_model.cc:37
+msgid "Catalog Number"
+msgstr ""
+
+#: src/gtkui/columns.cc:53 src/moonstone/playlist_model.cc:43
+#: src/qtui/playlist_model.cc:37
+msgid "Disc"
+msgstr ""
+
+#: src/gtkui/columns.cc:325
 msgid "Available columns"
 msgstr "Доступні колонки"
 
-#: src/gtkui/columns.cc:334
+#: src/gtkui/columns.cc:351
 msgid "Displayed columns"
 msgstr "Відображені колонки"
 
-#: src/gtkui/layout.cc:72 src/search-tool/search-tool.cc:40
+#: src/gtkui/layout.cc:74 src/search-tool-qt/search-tool-qt.cc:58
+#: src/search-tool/search-tool.cc:49
 msgid "Search Tool"
 msgstr "Пошуковий інструмент"
 
-#: src/gtkui/layout.cc:167
+#: src/gtkui/layout.cc:170
 msgid "Dock at Left"
 msgstr "Прикріпити зліва"
 
-#: src/gtkui/layout.cc:167
+#: src/gtkui/layout.cc:170
 msgid "Dock at Right"
 msgstr "Прикріпити справа"
 
-#: src/gtkui/layout.cc:168
+#: src/gtkui/layout.cc:171
 msgid "Dock at Top"
 msgstr "Прикріпити вгорі"
 
-#: src/gtkui/layout.cc:168
+#: src/gtkui/layout.cc:171
 msgid "Dock at Bottom"
-msgstr "Прикріпити внизу"
+msgstr "Прикріпити долі"
 
-#: src/gtkui/layout.cc:168
+#: src/gtkui/layout.cc:171
 msgid "Undock"
 msgstr "Відкріпити"
 
-#: src/gtkui/layout.cc:168 src/ladspa/plugin.cc:531
+#: src/gtkui/layout.cc:171 src/ladspa/plugin.cc:540
 msgid "Disable"
 msgstr "Вимкнути"
 
-#: src/gtkui/menus.cc:126 src/qtui/main_window_actions.cc:93
-#: src/statusicon/statusicon.cc:276
+#: src/gtkui/menus.cc:79 src/qtui/menus.cc:107
+#: src/statusicon-qt/statusicon.cc:115 src/statusicon/statusicon.cc:286
 msgid "_Open Files ..."
-msgstr "Відтворити _файли..."
+msgstr "_Відтворити файли ..."
 
-#: src/gtkui/menus.cc:127
+#: src/gtkui/menus.cc:80 src/qtui/menus.cc:111
 msgid "Open _URL ..."
-msgstr "Відтворити файли за _посиланням..."
+msgstr "Відтворити файли за _ланкою ..."
 
-#: src/gtkui/menus.cc:128 src/qtui/main_window_actions.cc:95
+#: src/gtkui/menus.cc:81 src/qtui/menus.cc:113
 msgid "_Add Files ..."
-msgstr "_Додати файли..."
+msgstr "_Додати файли ..."
 
-#: src/gtkui/menus.cc:129
+#: src/gtkui/menus.cc:82 src/qtui/menus.cc:118
 msgid "Add U_RL ..."
-msgstr "Додати файли _за посиланням..."
+msgstr "Додати файли за ла_нкою ..."
 
-#: src/gtkui/menus.cc:131
+#: src/gtkui/menus.cc:84 src/qtui/menus.cc:120
 msgid "Search _Library"
 msgstr "Шукати в _бібліотеці"
 
-#: src/gtkui/menus.cc:133 src/qtui/main_window_actions.cc:98
+#: src/gtkui/menus.cc:86 src/qtui/menus.cc:123
 msgid "A_bout ..."
-msgstr "П_ро Audacious..."
+msgstr "П_ро Audacious ..."
 
-#: src/gtkui/menus.cc:134 src/qtui/main_window_actions.cc:99
+#: src/gtkui/menus.cc:87 src/qtui/menus.cc:125
 msgid "_Settings ..."
 msgstr "_Налаштування ..."
 
-#: src/gtkui/menus.cc:135 src/qtui/main_window_actions.cc:103
-#: src/statusicon/statusicon.cc:284
+#: src/gtkui/menus.cc:88 src/qtui/menus.cc:131
+#: src/statusicon-qt/statusicon.cc:117 src/statusicon/statusicon.cc:288
 msgid "_Quit"
-msgstr "_Вихід"
+msgstr "_Вийти"
 
-#: src/gtkui/menus.cc:139 src/gtkui/menus.cc:262
-#: src/qtui/main_window_actions.cc:107 src/search-tool/search-tool.cc:641
-#: src/statusicon/statusicon.cc:278
+#: src/gtkui/menus.cc:92 src/gtkui/menus.cc:226
+#: src/moonstone/playlist_tabs.cc:306 src/qtui/menus.cc:135
+#: src/qtui/playlist_tabs.cc:331 src/search-tool-qt/search-tool-qt.cc:499
+#: src/search-tool/search-tool.cc:339 src/statusicon-qt/statusicon.cc:109
+#: src/statusicon/statusicon.cc:280
 msgid "_Play"
 msgstr "_Відтворити"
 
-#: src/gtkui/menus.cc:140 src/qtui/main_window_actions.cc:108
-#: src/statusicon/statusicon.cc:279
+#: src/gtkui/menus.cc:93 src/qtui/menus.cc:137
+#: src/statusicon-qt/statusicon.cc:110 src/statusicon/statusicon.cc:281
 msgid "Paus_e"
-msgstr "_Призупинити"
+msgstr "Призупини_ти"
 
-#: src/gtkui/menus.cc:141 src/qtui/main_window_actions.cc:109
-#: src/statusicon/statusicon.cc:280
+#: src/gtkui/menus.cc:94 src/qtui/menus.cc:139
+#: src/statusicon-qt/statusicon.cc:111 src/statusicon/statusicon.cc:282
 msgid "_Stop"
 msgstr "_Зупинити"
 
-#: src/gtkui/menus.cc:142 src/qtui/main_window_actions.cc:110
-#: src/statusicon/statusicon.cc:277
+#: src/gtkui/menus.cc:95 src/qtui/menus.cc:141
+#: src/statusicon-qt/statusicon.cc:112 src/statusicon/statusicon.cc:283
 msgid "Pre_vious"
-msgstr "П_опередня"
+msgstr "По_передня"
 
-#: src/gtkui/menus.cc:143 src/qtui/main_window_actions.cc:111
-#: src/statusicon/statusicon.cc:281
+#: src/gtkui/menus.cc:96 src/qtui/menus.cc:143
+#: src/statusicon-qt/statusicon.cc:113 src/statusicon/statusicon.cc:284
 msgid "_Next"
 msgstr "_Наступна"
 
-#: src/gtkui/menus.cc:145 src/qtui/main_window_actions.cc:113
+#: src/gtkui/menus.cc:97 src/qtui/menus.cc:145 src/skins/menus.cc:114
+#: src/skins-qt/menus.cc:105
+msgid "Previous Album"
+msgstr "Попередній альбом"
+
+#: src/gtkui/menus.cc:98 src/qtui/menus.cc:146 src/skins/menus.cc:115
+#: src/skins-qt/menus.cc:106
+msgid "Next Album"
+msgstr "Наступний альбом"
+
+#: src/gtkui/menus.cc:100 src/qtui/menus.cc:148
 msgid "_Repeat"
-msgstr "Повто_рювати"
+msgstr "_Повторювати"
 
-#: src/gtkui/menus.cc:146 src/qtui/main_window_actions.cc:114
+#: src/gtkui/menus.cc:101 src/qtui/menus.cc:150
 msgid "S_huffle"
 msgstr "В_ипадково"
 
-#: src/gtkui/menus.cc:147 src/qtui/main_window_actions.cc:115
+#: src/gtkui/menus.cc:102 src/qtui/menus.cc:152
+msgid "Shuffle by Albu_m"
+msgstr "Сортувати за альбомо_м"
+
+#: src/gtkui/menus.cc:103 src/qtui/menus.cc:155
 msgid "N_o Playlist Advance"
 msgstr "Н_е просуватися списком"
 
-#: src/gtkui/menus.cc:148 src/qtui/main_window_actions.cc:116
+#: src/gtkui/menus.cc:104 src/qtui/menus.cc:157
 msgid "Stop A_fter This Song"
-msgstr "Зупинити після _цієї пісні"
+msgstr "Зупинити пі_сля цієї пісні"
 
-#: src/gtkui/menus.cc:150 src/gtkui/menus.cc:247
-#: src/qtui/main_window_actions.cc:118
+#: src/gtkui/menus.cc:106 src/gtkui/menus.cc:210 src/qtui/menus.cc:162
+#: src/qtui/menus.cc:294
 msgid "Song _Info ..."
-msgstr "_Інформація про доріжку..."
+msgstr "_Інформація про стежку ..."
 
-#: src/gtkui/menus.cc:151
+#: src/gtkui/menus.cc:107
 msgid "Jump to _Time ..."
-msgstr "Перейти до _часу..."
+msgstr "Перейти до _часу ..."
 
-#: src/gtkui/menus.cc:152
+#: src/gtkui/menus.cc:108
 msgid "_Jump to Song ..."
-msgstr "Перейти до _доріжки..."
+msgstr "Перейти до _стежки ..."
 
-#: src/gtkui/menus.cc:154
+#: src/gtkui/menus.cc:110 src/qtui/menus.cc:165
 msgid "Set Repeat Point _A"
 msgstr "Встановити точку повтору _A"
 
-#: src/gtkui/menus.cc:155
+#: src/gtkui/menus.cc:111 src/qtui/menus.cc:167
 msgid "Set Repeat Point _B"
 msgstr "Встановити точку повтору _B"
 
-#: src/gtkui/menus.cc:156
+#: src/gtkui/menus.cc:112 src/qtui/menus.cc:169
 msgid "_Clear Repeat Points"
 msgstr "_Скинути точки повтору"
 
-#: src/gtkui/menus.cc:160 src/gtkui/menus.cc:167 src/gtkui/menus.cc:183
-#: src/qtui/main_window_actions.cc:122 src/qtui/main_window_actions.cc:129
-#: src/qtui/main_window_actions.cc:145
+#: src/gtkui/menus.cc:116 src/gtkui/menus.cc:123 src/gtkui/menus.cc:141
+#: src/qtui/menus.cc:173 src/qtui/menus.cc:180 src/qtui/menus.cc:198
 msgid "By _Title"
 msgstr "За _назвою"
 
-#: src/gtkui/menus.cc:161 src/qtui/main_window_actions.cc:123
+#: src/gtkui/menus.cc:117 src/qtui/menus.cc:174
 msgid "By _File Name"
-msgstr ""
+msgstr "За _назвою файлу"
 
-#: src/gtkui/menus.cc:162 src/qtui/main_window_actions.cc:124
+#: src/gtkui/menus.cc:118 src/qtui/menus.cc:175
 msgid "By File _Path"
 msgstr "За _шляхом до файлу"
 
-#: src/gtkui/menus.cc:166 src/gtkui/menus.cc:182
-#: src/qtui/main_window_actions.cc:128 src/qtui/main_window_actions.cc:144
+#: src/gtkui/menus.cc:122 src/gtkui/menus.cc:140 src/qtui/menus.cc:179
+#: src/qtui/menus.cc:197
 msgid "By Track _Number"
-msgstr "_За номером доріжки"
+msgstr "_За номером стежки"
 
-#: src/gtkui/menus.cc:168 src/gtkui/menus.cc:184
-#: src/qtui/main_window_actions.cc:130 src/qtui/main_window_actions.cc:146
+#: src/gtkui/menus.cc:124 src/gtkui/menus.cc:142 src/qtui/menus.cc:181
+#: src/qtui/menus.cc:199
 msgid "By _Artist"
 msgstr "За _виконавцем"
 
-#: src/gtkui/menus.cc:169 src/gtkui/menus.cc:185
-#: src/qtui/main_window_actions.cc:131 src/qtui/main_window_actions.cc:147
+#: src/gtkui/menus.cc:125 src/gtkui/menus.cc:143 src/qtui/menus.cc:182
+#: src/qtui/menus.cc:200
 msgid "By Al_bum"
 msgstr "За а_льбомом"
 
-#: src/gtkui/menus.cc:170 src/gtkui/menus.cc:186
-#: src/qtui/main_window_actions.cc:132 src/qtui/main_window_actions.cc:148
+#: src/gtkui/menus.cc:126 src/gtkui/menus.cc:144 src/qtui/menus.cc:183
+#: src/qtui/menus.cc:201
 msgid "By Albu_m Artist"
-msgstr ""
+msgstr "За альбо_мом виконавця"
 
-#: src/gtkui/menus.cc:171 src/gtkui/menus.cc:187
-#: src/qtui/main_window_actions.cc:133 src/qtui/main_window_actions.cc:149
+#: src/gtkui/menus.cc:127 src/gtkui/menus.cc:145 src/qtui/menus.cc:184
+#: src/qtui/menus.cc:202
 msgid "By Release _Date"
 msgstr "За _датою видання"
 
-#: src/gtkui/menus.cc:172 src/gtkui/menus.cc:188
-#: src/qtui/main_window_actions.cc:134 src/qtui/main_window_actions.cc:150
+#: src/gtkui/menus.cc:128 src/gtkui/menus.cc:146 src/qtui/menus.cc:185
+#: src/qtui/menus.cc:203
 msgid "By _Genre"
-msgstr ""
+msgstr "За _напрямком"
 
-#: src/gtkui/menus.cc:173 src/gtkui/menus.cc:189
-#: src/qtui/main_window_actions.cc:135 src/qtui/main_window_actions.cc:151
+#: src/gtkui/menus.cc:129 src/gtkui/menus.cc:147 src/qtui/menus.cc:186
+#: src/qtui/menus.cc:204
 msgid "By _Length"
 msgstr "За _тривалістю"
 
-#: src/gtkui/menus.cc:174 src/gtkui/menus.cc:190
-#: src/qtui/main_window_actions.cc:136 src/qtui/main_window_actions.cc:152
+#: src/gtkui/menus.cc:130 src/gtkui/menus.cc:148 src/qtui/menus.cc:187
+#: src/qtui/menus.cc:205
 msgid "By _File Path"
 msgstr "За _шляхом до файлу"
 
-#: src/gtkui/menus.cc:175 src/gtkui/menus.cc:191
-#: src/qtui/main_window_actions.cc:137 src/qtui/main_window_actions.cc:153
+#: src/gtkui/menus.cc:131 src/gtkui/menus.cc:149 src/qtui/menus.cc:188
+#: src/qtui/menus.cc:206
 msgid "By _Custom Title"
 msgstr "За назвою _файлу"
 
-#: src/gtkui/menus.cc:177 src/gtkui/menus.cc:193
-#: src/qtui/main_window_actions.cc:139 src/qtui/main_window_actions.cc:155
+#: src/gtkui/menus.cc:132 src/gtkui/menus.cc:150 src/qtui/menus.cc:189
+#: src/qtui/menus.cc:207
+msgid "By C_omment"
+msgstr "По ко_ментарю"
+
+#: src/gtkui/menus.cc:133 src/gtkui/menus.cc:151 src/qtui/menus.cc:190
+#: src/qtui/menus.cc:208
+msgid "By D_isc Number"
+msgstr ""
+
+#: src/gtkui/menus.cc:135 src/gtkui/menus.cc:153 src/qtui/menus.cc:192
+#: src/qtui/menus.cc:210
 msgid "R_everse Order"
-msgstr "_У зворотньому порядку"
+msgstr "_У зворотньому порядкові"
 
-#: src/gtkui/menus.cc:178 src/gtkui/menus.cc:194
-#: src/qtui/main_window_actions.cc:140 src/qtui/main_window_actions.cc:156
+#: src/gtkui/menus.cc:136 src/gtkui/menus.cc:154 src/qtui/menus.cc:194
+#: src/qtui/menus.cc:212
 msgid "_Random Order"
-msgstr "У випадковому по_рядку"
+msgstr "У випадковому по_рядкові"
 
-#: src/gtkui/menus.cc:198 src/qtui/main_window_actions.cc:160
+#: src/gtkui/menus.cc:158 src/qtui/menus.cc:216
 msgid "_Play/Resume"
 msgstr "_Відтворити/продовжити"
 
-#: src/gtkui/menus.cc:199 src/gtkui/menus.cc:251
-#: src/qtui/main_window_actions.cc:161
+#: src/gtkui/menus.cc:159 src/qtui/menus.cc:218
 msgid "_Refresh"
 msgstr "_Оновити"
 
-#: src/gtkui/menus.cc:201 src/qtui/main_window_actions.cc:163
+#: src/gtkui/menus.cc:161 src/qtui/menus.cc:222
 msgid "_Sort"
 msgstr "_Сортувати"
 
-#: src/gtkui/menus.cc:202 src/qtui/main_window_actions.cc:164
+#: src/gtkui/menus.cc:162 src/qtui/menus.cc:223
 msgid "Sort Se_lected"
 msgstr "Сортувати ви_бране"
 
-#: src/gtkui/menus.cc:203 src/qtui/main_window_actions.cc:165
+#: src/gtkui/menus.cc:163 src/qtui/menus.cc:225
 msgid "Remove _Duplicates"
 msgstr "Видалити _дублікати"
 
-#: src/gtkui/menus.cc:204 src/qtui/main_window_actions.cc:166
+#: src/gtkui/menus.cc:164 src/qtui/menus.cc:226
 msgid "Remove _Unavailable Files"
 msgstr "Прибрати _недоступні файли"
 
-#: src/gtkui/menus.cc:206 src/playlist-manager/playlist-manager.cc:244
-#: src/qtui/main_window_actions.cc:168
+#: src/gtkui/menus.cc:166 src/playlist-manager/playlist-manager.cc:219
+#: src/playlist-manager-qt/playlist-manager-qt.cc:348 src/qtui/menus.cc:229
 msgid "_New"
 msgstr "_Новий"
 
-#: src/gtkui/menus.cc:207
+#: src/gtkui/menus.cc:167 src/qtui/menus.cc:230
 msgid "Ren_ame ..."
-msgstr "Пере_йменувати..."
+msgstr "Змінити_назву ..."
 
-#: src/gtkui/menus.cc:208 src/gtkui/menus.cc:264
-#: src/qtui/main_window_actions.cc:170
+#: src/gtkui/menus.cc:168 src/gtkui/menus.cc:228
+#: src/moonstone/playlist_tabs.cc:311 src/qtui/menus.cc:231
+#: src/qtui/playlist_tabs.cc:336
 msgid "Remo_ve"
-msgstr "Видали_ти"
+msgstr "Усуну_ти"
 
-#: src/gtkui/menus.cc:210
+#: src/gtkui/menus.cc:170 src/qtui/menus.cc:233
 msgid "_Import ..."
-msgstr "_Імпортувати..."
+msgstr "_Імпортувати ..."
 
-#: src/gtkui/menus.cc:211
+#: src/gtkui/menus.cc:171 src/qtui/menus.cc:234
 msgid "_Export ..."
-msgstr "_Експортувати..."
+msgstr "_Експортувати ..."
 
-#: src/gtkui/menus.cc:213
+#: src/gtkui/menus.cc:173 src/qtui/menus.cc:237
 msgid "Playlist _Manager ..."
-msgstr "Керування списками _відтворення..."
+msgstr "Керування списками _відтворення ..."
 
-#: src/gtkui/menus.cc:214 src/qtui/main_window_actions.cc:176
+#: src/gtkui/menus.cc:174 src/qtui/menus.cc:239
 msgid "_Queue Manager ..."
-msgstr "Керування _чергою..."
+msgstr "Керування _чергою ..."
 
-#: src/gtkui/menus.cc:218 src/qtui/main_window_actions.cc:180
+#: src/gtkui/menus.cc:178 src/qtui/menus.cc:243
 msgid "Volume _Up"
 msgstr "З_більшити гучність"
 
-#: src/gtkui/menus.cc:219 src/qtui/main_window_actions.cc:181
+#: src/gtkui/menus.cc:179 src/qtui/menus.cc:245
 msgid "Volume _Down"
 msgstr "З_меншити гучність"
 
-#: src/gtkui/menus.cc:221 src/qtui/main_window_actions.cc:183
-msgid "_Equalizer"
-msgstr "_Еквалайзер"
+#: src/gtkui/menus.cc:181 src/qtui/menus.cc:249
+msgid "_Equalizer ..."
+msgstr "_Еквалайзер ..."
 
-#: src/gtkui/menus.cc:223 src/qtui/main_window_actions.cc:185
+#: src/gtkui/menus.cc:182 src/qtui/menus.cc:251
 msgid "E_ffects ..."
-msgstr "Е_фекти..."
+msgstr "Е_фекти ..."
+
+#: src/gtkui/menus.cc:184
+msgid "_Record Stream"
+msgstr "_записування стриму"
+
+#: src/gtkui/menus.cc:185
+msgid "Audio _Settings ..."
+msgstr "Звукові _налаштування ..."
 
-#: src/gtkui/menus.cc:227
+#: src/gtkui/menus.cc:189 src/qtui/menus.cc:260
 msgid "Show _Menu Bar"
 msgstr "Показувати панель _меню"
 
-#: src/gtkui/menus.cc:228
+#: src/gtkui/menus.cc:190 src/qtui/menus.cc:262
 msgid "Show I_nfo Bar"
 msgstr "Показувати панель і_нформації"
 
-#: src/gtkui/menus.cc:229
+#: src/gtkui/menus.cc:191 src/qtui/menus.cc:264
+msgid "Show Info Bar _Album Art"
+msgstr ""
+
+#: src/gtkui/menus.cc:192 src/qtui/menus.cc:266
 msgid "Show Info Bar Vis_ualization"
 msgstr "П_оказувати візуалізацію"
 
-#: src/gtkui/menus.cc:230
+#: src/gtkui/menus.cc:193 src/qtui/menus.cc:268
 msgid "Show _Status Bar"
 msgstr "Показувати рядок _стану"
 
-#: src/gtkui/menus.cc:232
+#: src/gtkui/menus.cc:195 src/qtui/menus.cc:272
 msgid "Show _Remaining Time"
 msgstr "Показати час до _завершення"
 
-#: src/gtkui/menus.cc:234
+#: src/gtkui/menus.cc:197 src/qtui/menus.cc:276 src/skins/menus.cc:157
+#: src/skins-qt/menus.cc:152
 msgid "_Visualizations ..."
 msgstr "_Візуалізації ..."
 
-#: src/gtkui/menus.cc:238 src/qtui/main_window_actions.cc:189
+#: src/gtkui/menus.cc:201 src/qtui/menus.cc:280
 msgid "_File"
 msgstr "_Файл"
 
-#: src/gtkui/menus.cc:239 src/qtui/main_window_actions.cc:190
+#: src/gtkui/menus.cc:202 src/qtui/menus.cc:281
 msgid "_Playback"
 msgstr "_Відтворення"
 
-#: src/gtkui/menus.cc:240 src/qtui/main_window_actions.cc:191
+#: src/gtkui/menus.cc:203 src/qtui/menus.cc:282
 msgid "P_laylist"
 msgstr "_Список відтворення"
 
-#: src/gtkui/menus.cc:241 src/gtkui/menus.cc:258
-#: src/qtui/main_window_actions.cc:192
+#: src/gtkui/menus.cc:204 src/gtkui/menus.cc:222 src/qtui/menus.cc:283
+#: src/qtui/menus.cc:312
 msgid "_Services"
-msgstr "С_лужби"
+msgstr "_Служби"
 
-#: src/gtkui/menus.cc:242 src/qtui/main_window_actions.cc:193
+#: src/gtkui/menus.cc:205 src/qtui/menus.cc:284
 msgid "_Output"
-msgstr "В_ивід"
+msgstr "_Вивід"
 
-#: src/gtkui/menus.cc:243
+#: src/gtkui/menus.cc:206 src/qtui/menus.cc:285
 msgid "_View"
-msgstr "Ви_гляд"
+msgstr "_Вигляд"
 
-#: src/gtkui/menus.cc:248
+#: src/gtkui/menus.cc:211 src/qtui/menus.cc:296
 msgid "_Queue/Unqueue"
 msgstr "_Елемент черги"
 
-#: src/gtkui/menus.cc:250
+#: src/gtkui/menus.cc:213 src/qtui/menus.cc:299
 msgid "_Open Containing Folder"
-msgstr ""
+msgstr "_відкрити теку вмісту"
+
+#: src/gtkui/menus.cc:214 src/qtui/menus.cc:301
+msgid "_Refresh Selected"
+msgstr "_оновити обране"
 
-#: src/gtkui/menus.cc:253
+#: src/gtkui/menus.cc:216 src/qtui/menus.cc:304
 msgid "Cu_t"
-msgstr "_Вирізати"
+msgstr "Виріза_ти"
 
-#: src/gtkui/menus.cc:254
+#: src/gtkui/menus.cc:217 src/qtui/menus.cc:305
 msgid "_Copy"
 msgstr "_Копіювати"
 
-#: src/gtkui/menus.cc:255
+#: src/gtkui/menus.cc:218 src/qtui/menus.cc:306
 msgid "_Paste"
-msgstr "Вст_авити"
+msgstr "_Вставити"
 
-#: src/gtkui/menus.cc:256
+#: src/gtkui/menus.cc:219 src/qtui/menus.cc:307
+msgid "Paste at _End"
+msgstr "Унести на _кінець"
+
+#: src/gtkui/menus.cc:220 src/qtui/menus.cc:309
 msgid "Select _All"
 msgstr "Виді_лити все"
 
-#: src/gtkui/menus.cc:263
+#: src/gtkui/menus.cc:227 src/moonstone/playlist_tabs.cc:309
+#: src/qtui/playlist_tabs.cc:334
 msgid "_Rename ..."
-msgstr "Пере_йменувати..."
+msgstr "_Змінити назву ..."
+
+#: src/gtkui/settings.cc:35 src/qtui/settings.cc:59
+msgid "Always"
+msgstr "Завжди"
+
+#: src/gtkui/settings.cc:36 src/qtui/settings.cc:60
+msgid "Auto-hide"
+msgstr "Автоматичне приховування"
+
+#: src/gtkui/settings.cc:37 src/qtui/settings.cc:61
+msgid "Never"
+msgstr "Ніколи"
 
-#: src/gtkui/settings.cc:35
+#: src/gtkui/settings.cc:41 src/qtui/settings.cc:64
 msgid "Playlist Tabs"
 msgstr "Вкладки плейлисту"
 
-#: src/gtkui/settings.cc:36
-msgid "Always show tabs"
-msgstr "Завжди показувати вкладки"
+#: src/gtkui/settings.cc:42 src/qtui/settings.cc:65
+msgid "Show playlist tabs:"
+msgstr "Показувати табуляції списків відтворення:"
 
-#: src/gtkui/settings.cc:38
+#: src/gtkui/settings.cc:45 src/qtui/settings.cc:69
 msgid "Show entry counts"
 msgstr "Показувати лічильник файлів"
 
-#: src/gtkui/settings.cc:40
+#: src/gtkui/settings.cc:47 src/qtui/settings.cc:72
 msgid "Show close buttons"
 msgstr "Показувати кнопку закриття"
 
-#: src/gtkui/settings.cc:42
+#: src/gtkui/settings.cc:49 src/qtui/settings.cc:75
 msgid "Playlist Columns"
 msgstr "Колонки плейлисту"
 
-#: src/gtkui/settings.cc:44
+#: src/gtkui/settings.cc:51 src/qtui/settings.cc:77
 msgid "Show column headers"
 msgstr "Показувати заголовки колонок"
 
-#: src/gtkui/settings.cc:46 src/modplug/plugin_main.cc:106
-#: src/skins/skins_cfg.cc:263
-msgid "Miscellaneous"
-msgstr "Різне"
+#: src/gtkui/settings.cc:53 src/qtui/settings.cc:82
+msgid "Make column headers clickable for sorting"
+msgstr ""
 
-#: src/gtkui/settings.cc:47
-msgid "Arrow keys seek by:"
-msgstr "Крок перемотування стрілками:"
+#: src/gtkui/settings.cc:56
+msgid "Use symbolic icons in toolbar"
+msgstr ""
 
-#: src/gtkui/settings.cc:50
+#: src/gtkui/settings.cc:58 src/qtui/settings.cc:86
 msgid "Scroll on song change"
 msgstr "Прокручувати плейлист при зміні доріжки"
 
-#: src/gtkui/ui_gtk.cc:71
+#: src/gtkui/ui_gtk.cc:82
 msgid "GTK Interface"
 msgstr "Інтерфейс GTK"
 
-#: src/gtkui/ui_gtk.cc:222 src/skins/ui_main.cc:232
+#: src/gtkui/ui_gtk.cc:219 src/skins/main.cc:228 src/skins-qt/main.cc:231
 #, c-format
 msgid "%s - Audacious"
 msgstr "%s - Audacious"
 
-#: src/gtkui/ui_gtk.cc:225 src/qtui/main_window.cc:186
+#: src/gtkui/ui_gtk.cc:221 src/moonstone/main_window.cc:184
+#: src/qtui/main_window.cc:385
 msgid "Buffering ..."
-msgstr "Буферую..."
+msgstr "Буферую ..."
 
-#: src/gtkui/ui_gtk.cc:228 src/skins/ui_main.cc:234 src/skins/ui_main.cc:1164
+#: src/gtkui/ui_gtk.cc:224 src/pipewire/pipewire.cc:402 src/skins/main.cc:230
+#: src/skins-qt/main.cc:233
 msgid "Audacious"
 msgstr "Audacious"
 
-#: src/gtkui/ui_statusbar.cc:63 src/qtui/status_bar.cc:67
+#: src/gtkui/ui_gtk.cc:487 src/gtkui/ui_gtk.cc:518 src/gtkui/ui_gtk.cc:882
+#: src/hotkey/gui.cc:72 src/moonstone/main_window.cc:67
+#: src/moonstone/main_window.cc:145 src/moonstone/main_window.cc:146
+#: src/notify/osd.cc:85 src/qthotkey/gui.cc:67 src/qtui/main_window.cc:154
+#: src/qtui/main_window.cc:347 src/qtui/main_window.cc:348
+#: src/skins/menus.cc:109 src/skins-qt/menus.cc:100
+msgid "Play"
+msgstr "Відтворити"
+
+#: src/gtkui/ui_gtk.cc:487 src/moonstone/main_window.cc:151
+#: src/moonstone/main_window.cc:152 src/notify/osd.cc:82
+#: src/qtui/main_window.cc:353 src/qtui/main_window.cc:354
+#: src/skins/menus.cc:110 src/skins-qt/menus.cc:101
+msgid "Pause"
+msgstr "Призупинити відтворення"
+
+#: src/gtkui/ui_gtk.cc:868 src/moonstone/main_window.cc:57
+#: src/qtui/main_window.cc:145 src/skins/menus.cc:86 src/skins-qt/menus.cc:77
+msgid "Search Library"
+msgstr "Шукати бібліотеку"
+
+#: src/gtkui/ui_gtk.cc:875 src/moonstone/main_window.cc:60
+#: src/qtui/main_window.cc:147
+msgid "Open Files"
+msgstr "Відкрити файли"
+
+#: src/gtkui/ui_gtk.cc:876 src/moonstone/main_window.cc:62
+#: src/qtui/main_window.cc:149
+msgid "Add Files"
+msgstr "Додати файли"
+
+#: src/gtkui/ui_gtk.cc:881 src/moonstone/main_window.cc:65
+#: src/qtui/main_window.cc:152 src/skins/menus.cc:112 src/skins-qt/menus.cc:103
+msgid "Previous"
+msgstr "Попередня cтежка"
+
+#: src/gtkui/ui_gtk.cc:883 src/hotkey/gui.cc:74 src/moonstone/main_window.cc:69
+#: src/qthotkey/gui.cc:69 src/qtui/main_window.cc:156 src/skins/menus.cc:111
+#: src/skins-qt/menus.cc:102
+msgid "Stop"
+msgstr "Зупинити"
+
+#: src/gtkui/ui_gtk.cc:884 src/moonstone/main_window.cc:76 src/notify/osd.cc:89
+#: src/qtui/main_window.cc:163 src/skins/menus.cc:113 src/skins-qt/menus.cc:104
+msgid "Next"
+msgstr "Наступна стежка"
+
+#: src/gtkui/ui_gtk.cc:886 src/moonstone/main_window.cc:79
+#: src/qtui/main_window.cc:166 src/qtui/menus.cc:254 src/skins/menus.cc:79
+#: src/skins-qt/menus.cc:69
+msgid "Record Stream"
+msgstr "Записування потоку"
+
+#: src/gtkui/ui_gtk.cc:919 src/moonstone/main_window.cc:86
+#: src/qtui/main_window.cc:173 src/skins/menus.cc:103 src/skins-qt/menus.cc:94
+msgid "Repeat"
+msgstr "Повторювати"
+
+#: src/gtkui/ui_gtk.cc:922 src/moonstone/main_window.cc:89
+#: src/qtui/main_window.cc:176 src/skins/menus.cc:104 src/skins-qt/menus.cc:95
+msgid "Shuffle"
+msgstr "Випадково"
+
+#: src/gtkui/ui_gtk.cc:1114 src/qtui/main_window.cc:123
+msgid "Menu"
+msgstr ""
+
+#: src/gtkui/ui_statusbar.cc:64 src/qtui/status_bar.cc:155
 msgid "mono"
 msgstr "моно"
 
-#: src/gtkui/ui_statusbar.cc:65 src/qtui/status_bar.cc:69
+#: src/gtkui/ui_statusbar.cc:66 src/qtui/status_bar.cc:157
 msgid "stereo"
 msgstr "стерео"
 
-#: src/gtkui/ui_statusbar.cc:67 src/qtui/status_bar.cc:71
+#: src/gtkui/ui_statusbar.cc:68 src/qtui/status_bar.cc:160
 #, c-format
 msgid "%d channel"
 msgid_plural "%d channels"
 msgstr0 "%d канал"
 msgstr1 "%d канали"
 msgstr2 "%d каналів"
+msgstr3 "%d каналів"
+
+#: src/gtkui/ui_statusbar.cc:76 src/qtui/status_bar.cc:168
+#, c-format
+msgid "%d kHz"
+msgstr "%d кГц"
 
-#: src/gtkui/ui_statusbar.cc:81 src/qtui/status_bar.cc:85
+#: src/gtkui/ui_statusbar.cc:82 src/qtui/status_bar.cc:174
 #, c-format
-msgid "%d kbps"
-msgstr "%d кб/с"
+msgid "%d kbit/s"
+msgstr ""
 
-#: src/gtkui/ui_statusbar.cc:107 src/skins/ui_main_evlisteners.cc:103
+#: src/gtkui/ui_statusbar.cc:108 src/skins/main.cc:478 src/skins-qt/main.cc:461
 msgid "Single mode."
-msgstr "Однодоріжковий режим."
+msgstr "Одностежковий режим."
 
-#: src/gtkui/ui_statusbar.cc:109 src/skins/ui_main_evlisteners.cc:105
+#: src/gtkui/ui_statusbar.cc:110 src/skins/main.cc:480 src/skins-qt/main.cc:463
 msgid "Playlist mode."
-msgstr "Режим списка відтворення."
+msgstr "Режим списку відтворення."
 
-#: src/gtkui/ui_statusbar.cc:117 src/skins/ui_main_evlisteners.cc:111
+#: src/gtkui/ui_statusbar.cc:118 src/skins/main.cc:486 src/skins-qt/main.cc:469
 msgid "Stopping after song."
-msgstr "Зупинити після цієї доріжки."
+msgstr "Зупинити після цієї стежки."
 
-#: src/hotkey/gui.cc:71
+#: src/hotkey/gui.cc:71 src/qthotkey/gui.cc:66
 msgid "Previous track"
-msgstr "Попередня доріжка"
-
-#: src/hotkey/gui.cc:72 src/notify/osd.cc:69 src/qtui/main_window.cc:69
-#: src/qtui/main_window.cc:172 src/qtui/main_window.cc:173
-#: src/skins/menus.cc:87
-msgid "Play"
-msgstr "Відтворити"
+msgstr "Попередня стежка"
 
-#: src/hotkey/gui.cc:73
+#: src/hotkey/gui.cc:73 src/qthotkey/gui.cc:68
 msgid "Pause/Resume"
 msgstr "Призупинити/продовжити"
 
-#: src/hotkey/gui.cc:74 src/qtui/main_window.cc:70 src/skins/menus.cc:89
-msgid "Stop"
-msgstr "Зупинити"
-
-#: src/hotkey/gui.cc:75
+#: src/hotkey/gui.cc:75 src/qthotkey/gui.cc:70
 msgid "Next track"
-msgstr "Наступна доріжка"
+msgstr "Наступна стежка"
 
-#: src/hotkey/gui.cc:76
-msgid "Forward 5 seconds"
-msgstr "На 5 секунд вперед"
+#: src/hotkey/gui.cc:76 src/qthotkey/gui.cc:71
+msgid "Step forward"
+msgstr "Крок уперед"
 
-#: src/hotkey/gui.cc:77
-msgid "Rewind 5 seconds"
-msgstr "На 5 секунд назад"
+#: src/hotkey/gui.cc:77 src/qthotkey/gui.cc:72
+msgid "Step backward"
+msgstr "Крок назад"
 
-#: src/hotkey/gui.cc:78
+#: src/hotkey/gui.cc:78 src/qthotkey/gui.cc:73
 msgid "Mute"
 msgstr "Вимкнути звук"
 
-#: src/hotkey/gui.cc:79
+#: src/hotkey/gui.cc:79 src/qthotkey/gui.cc:74
 msgid "Volume up"
 msgstr "Збільшити гучність"
 
-#: src/hotkey/gui.cc:80
+#: src/hotkey/gui.cc:80 src/qthotkey/gui.cc:75
 msgid "Volume down"
 msgstr "Зменшити гучність"
 
-#: src/hotkey/gui.cc:81
+#: src/hotkey/gui.cc:81 src/qthotkey/gui.cc:76
 msgid "Jump to file"
 msgstr "Перейти до файлу"
 
-#: src/hotkey/gui.cc:82
+#: src/hotkey/gui.cc:82 src/qthotkey/gui.cc:77
 msgid "Toggle player window(s)"
 msgstr "Перемкнути стан вікон програвача"
 
-#: src/hotkey/gui.cc:83
+#: src/hotkey/gui.cc:83 src/qthotkey/gui.cc:78
 msgid "Show On-Screen-Display"
 msgstr "Показати OSD-повідомлення"
 
-#: src/hotkey/gui.cc:84
+#: src/hotkey/gui.cc:84 src/qthotkey/gui.cc:79
 msgid "Toggle repeat"
 msgstr "Перемкнути повтор"
 
-#: src/hotkey/gui.cc:85
+#: src/hotkey/gui.cc:85 src/qthotkey/gui.cc:80
 msgid "Toggle shuffle"
 msgstr "Перемкнути тасування"
 
-#: src/hotkey/gui.cc:86
+#: src/hotkey/gui.cc:86 src/qthotkey/gui.cc:81
 msgid "Toggle stop after current"
 msgstr "Перемкнути зупинку після поточної"
 
-#: src/hotkey/gui.cc:87
+#: src/hotkey/gui.cc:87 src/qthotkey/gui.cc:82
 msgid "Raise player window(s)"
 msgstr "Підняти вікна програвача"
 
-#: src/hotkey/gui.cc:97
+#: src/hotkey/gui.cc:98 src/qthotkey/gui.cc:100
 msgid "(none)"
 msgstr "(немає)"
 
-#: src/hotkey/gui.cc:234
+#: src/hotkey/gui.cc:261
 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 modifiers.\n"
 "\n"
 "Do you want to continue?"
 msgstr ""
@@ -2135,11 +2249,11 @@
 "\n"
 "Продовжувати попри це?"
 
-#: src/hotkey/gui.cc:236
+#: src/hotkey/gui.cc:264
 msgid "Binding mouse buttons"
 msgstr "Пов’язування кнопок миші"
 
-#: src/hotkey/gui.cc:391
+#: src/hotkey/gui.cc:434
 msgid ""
 "Press a key combination inside a text field.\n"
 "You can also bind mouse buttons."
@@ -2148,98 +2262,130 @@
 "поля.\n"
 "Можна також прив’язувати кнопки миші."
 
-#: src/hotkey/gui.cc:396
+#: src/hotkey/gui.cc:444 src/qthotkey/gui.cc:179
 msgid "Hotkeys:"
 msgstr "Гарячі клавіші:"
 
-#: src/hotkey/gui.cc:413
+#: src/hotkey/gui.cc:457 src/qthotkey/gui.cc:181
 msgid "Action:"
 msgstr "Дія:"
 
-#: src/hotkey/gui.cc:420
+#: src/hotkey/gui.cc:461 src/qthotkey/gui.cc:182
 msgid "Key Binding:"
 msgstr "Прив’язка до клавіш:"
 
-#: src/hotkey/gui.cc:468
+#: src/hotkey/gui.cc:518 src/qthotkey/gui.cc:184
 msgid "_Add"
 msgstr "_Додати"
 
-#: src/hotkey/plugin.cc:61
+#: src/hotkey/plugin.cc:59 src/qthotkey/plugin.cc:78
 msgid "Global Hotkeys"
 msgstr "Гарячі клавіші"
 
-#: src/hotkey/plugin.cc:79
+#: src/hotkey/plugin.cc:74
 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"
+"Contributors 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"
+"Global Hotkey Plugin\n"
+"Control the player with global key combinations or multimedia keys.\n"
 "\n"
-"Автор у 2007–2008 роках — Sascha Hlusiak <contact@saschahlusiak.de>.\n"
+"Copyright (C) 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"
+"Contributors 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>\n"
-"також брали участь у розробці."
+"Jeremy Tan <nsx@nsx.homeip.net>"
 
-#: src/jack-ng/jack-ng.cc:49
+#: src/jack/jack-ng.cc:54
 msgid "JACK Output"
 msgstr "JACK-вивід"
 
-#: src/jack-ng/jack-ng.cc:114
+#: src/jack/jack-ng.cc:126
+msgid "Client name:"
+msgstr "Клієнтова назва:"
+
+#: src/jack/jack-ng.cc:128
 msgid "Automatically connect to output ports"
-msgstr ""
+msgstr "Автоматично під'єдунувати до вивідних портів"
+
+#: src/jack/jack-ng.cc:130
+msgid "Filter ports (regex, use any port if blank):"
+msgstr "Фільтрувати порти (regex, усталено використовувати будь-який): "
+
+#: src/jack/jack-ng.cc:136
+msgid "Connect to physical ports only"
+msgstr "Під'єднати лише до фізично-наявних портів"
 
-#: src/jack-ng/jack-ng.cc:155
+#: src/jack/jack-ng.cc:139
+msgid "Upmix to"
+msgstr "Upmix до"
+
+#: src/jack/jack-ng.cc:141
+msgid "ports if input has fewer channels"
+msgstr "Портує лише коли ввід має менше каналів"
+
+#: src/jack/jack-ng.cc:143
+msgid "Ignore insufficient number of ports"
+msgstr "Ігнорувати неефективну кількість портів"
+
+#: src/jack/jack-ng.cc:181
+msgid "No JACK output ports were found. Please check settings."
+msgstr "JACK-вихідні порти не знайдено. Перевірте налаштування."
+
+#: src/jack/jack-ng.cc:195
 #, c-format
 msgid "Only %d JACK output ports were found but %d are required."
-msgstr ""
+msgstr "Знайдено лише %d вивідні JACK-порти, але необхідно знайти %d."
 
-#: src/jack-ng/jack-ng.cc:164
+#: src/jack/jack-ng.cc:210
 #, c-format
 msgid "Failed to connect to JACK port %s."
-msgstr ""
+msgstr "Не вдалося підключитися до порту %s JACK"
 
-#: src/jack-ng/jack-ng.cc:184
+#: src/jack/jack-ng.cc:230
 msgid ""
 "JACK supports only floating-point audio. You must change the output bit "
 "depth to floating-point in Audacious settings."
 msgstr ""
+"JACK підтримує лише floating-point звук. Ви маєте змінити вивідну бітову "
+"глибину на floating-point у Audacious'ових налаштуваннях."
 
-#: src/jack-ng/jack-ng.cc:197
+#: src/jack/jack-ng.cc:245
 msgid "Failed to connect to the JACK server; is it running?"
-msgstr ""
+msgstr "Не вдалося під'єднатися до серверу JACK; чи він працює?"
 
-#: src/jack-ng/jack-ng.cc:273
+#: src/jack/jack-ng.cc:321
 #, c-format
 msgid ""
 "The JACK server requires a sample rate of %d Hz, but Audacious is playing at "
 "%d Hz. Please use the Sample Rate Converter effect to correct the mismatch."
 msgstr ""
+"JACK-сервер потребує частоту дискредитації у %d Гц, проте відтворення в "
+"Audacious має %d Гц. Будь ласка, використайте ефект конвертору частоти "
+"дискретизації для усунення невідповідності."
 
-#: src/ladspa/plugin.cc:414
+#: src/ladspa/plugin.cc:416
 #, c-format
 msgid "%s Settings"
 msgstr "Налаштування %s"
 
-#: src/ladspa/plugin.cc:478
+#: src/ladspa/plugin.cc:482
 msgid "Module paths:"
 msgstr "Шляхи до модулів:"
 
-#: src/ladspa/plugin.cc:483
+#: src/ladspa/plugin.cc:487
 msgid ""
 "Separate multiple paths with a colon.\n"
 "These paths are searched in addition to LADSPA_PATH.\n"
@@ -2247,43 +2393,43 @@
 msgstr ""
 "Якщо шляхів кілька, розділяйте їх двокрапками.\n"
 "Пошук відбувається за вказаними шляхами та змінною LADSPA_PATH.\n"
-"Вказавши шляхи, натисніть Enter для пошуку плаґінів."
+"Вказавши шляхи, натисніть Enter для пошуку втулків."
 
-#: src/ladspa/plugin.cc:499
+#: src/ladspa/plugin.cc:508
 msgid "Available plugins:"
-msgstr "Наявні плаґіни:"
+msgstr "Наявні втулки:"
 
-#: src/ladspa/plugin.cc:512 src/modplug/plugin_main.cc:92
-#: src/modplug/plugin_main.cc:95 src/modplug/plugin_main.cc:98
-#: src/modplug/plugin_main.cc:101
+#: src/ladspa/plugin.cc:521 src/modplug/plugin_main.cc:91
+#: src/modplug/plugin_main.cc:94 src/modplug/plugin_main.cc:97
+#: src/modplug/plugin_main.cc:100
 msgid "Enable"
 msgstr "Увімкнути"
 
-#: src/ladspa/plugin.cc:518
+#: src/ladspa/plugin.cc:527
 msgid "Enabled plugins:"
-msgstr "Увімкнені плаґіни:"
+msgstr "Ввімкнені втулки:"
 
-#: src/ladspa/plugin.cc:534
+#: src/ladspa/plugin.cc:543
 msgid "Settings"
 msgstr "Налаштування"
 
-#: src/ladspa/plugin.cc:551
+#: src/ladspa/plugin.cc:560
 msgid ""
 "LADSPA Host for Audacious\n"
 "Copyright 2011 John Lindgren"
 msgstr ""
-"Хост LADSPA,\n"
+"Гост LADSPA,\n"
 "написаний Джоном Ліндґреном у 2011 році."
 
 #: src/ladspa/plugin.h:78
 msgid "LADSPA Host"
-msgstr "Хост LADSPA"
+msgstr "Гост LADSPA"
 
 #: src/lirc/lirc.cc:55
 msgid "LIRC Plugin"
-msgstr "Плаґін LIRC"
+msgstr "Втулок LIRC"
 
-#: src/lirc/lirc.cc:381
+#: src/lirc/lirc.cc:379
 msgid ""
 "A simple plugin to control Audacious using the LIRC remote control daemon\n"
 "\n"
@@ -2298,7 +2444,7 @@
 "\n"
 "For more information about LIRC, see http://lirc.org."
 msgstr ""
-"Плаґін надає можливість керувати відтворенням\n"
+"Втулок надає можливість керувати відтворенням\n"
 "дистанційно (за допомогою LIRC).\n"
 "\n"
 "Автори портування до Audacious:\n"
@@ -2312,63 +2458,123 @@
 "\n"
 "http://lirc.org/"
 
-#: src/lirc/lirc.cc:392
+#: src/lirc/lirc.cc:390
 msgid "Connection"
 msgstr "З’еднання"
 
-#: src/lirc/lirc.cc:393
+#: src/lirc/lirc.cc:391
 msgid "Reconnect to LIRC server"
-msgstr "Переприєднатись до LIRC серверу"
+msgstr "Переприєднатись до LIRC-серверу"
 
-#: src/lirc/lirc.cc:395
+#: src/lirc/lirc.cc:393
 msgid "Wait before reconnecting:"
 msgstr "Чекати перед перез’єднанням:"
 
-#: src/lyricwiki/lyricwiki.cc:41
-msgid "LyricWiki Plugin"
-msgstr "Плаґін LyricWiki"
-
-#: src/lyricwiki/lyricwiki.cc:131 src/lyricwiki-qt/lyricwiki.cc:136
-msgid "No lyrics available"
-msgstr "Тексту пісні не знайдено"
-
-#: src/lyricwiki/lyricwiki.cc:217 src/lyricwiki/lyricwiki.cc:226
-#: src/lyricwiki/lyricwiki.cc:243 src/lyricwiki/lyricwiki.cc:252
-#: src/lyricwiki/lyricwiki.cc:267 src/lyricwiki-qt/lyricwiki.cc:222
-#: src/lyricwiki-qt/lyricwiki.cc:231 src/lyricwiki-qt/lyricwiki.cc:248
-#: src/lyricwiki-qt/lyricwiki.cc:257 src/lyricwiki-qt/lyricwiki.cc:272
-msgid "Error"
-msgstr "Помилка"
-
-#: src/lyricwiki/lyricwiki.cc:218 src/lyricwiki/lyricwiki.cc:244
-#: src/lyricwiki-qt/lyricwiki.cc:223 src/lyricwiki-qt/lyricwiki.cc:249
+#: src/lyrics-common/chart_lyrics_provider.cc:93
+#: src/lyrics-common/chart_lyrics_provider.cc:150
+#: src/lyrics-common/lyrics_ovh_provider.cc:50
 #, c-format
 msgid "Unable to fetch %s"
 msgstr "Не вдалося отримати %s"
 
-#: src/lyricwiki/lyricwiki.cc:227 src/lyricwiki/lyricwiki.cc:253
-#: src/lyricwiki-qt/lyricwiki.cc:232 src/lyricwiki-qt/lyricwiki.cc:258
+#: src/lyrics-common/chart_lyrics_provider.cc:100
+#: src/lyrics-common/chart_lyrics_provider.cc:157
+#: src/lyrics-common/lyrics_ovh_provider.cc:57
 #, c-format
 msgid "Unable to parse %s"
 msgstr "Не вдалося проаналізувати %s"
 
-#: src/lyricwiki/lyricwiki.cc:259 src/lyricwiki-qt/lyricwiki.cc:264
+#: src/lyrics-common/chart_lyrics_provider.cc:121
+#: src/lyrics-common/chart_lyrics_provider.cc:194
+#: src/lyrics-common/lyrics_ovh_provider.cc:88
 msgid "Looking for lyrics ..."
 msgstr "Шукаю текст пісні..."
 
-#: src/lyricwiki/lyricwiki.cc:267 src/lyricwiki-qt/lyricwiki.cc:272
-msgid "Missing song metadata"
-msgstr "Відсутні метадані пісні"
+#: src/lyrics-common/preferences.h:43
+msgid "Nowhere"
+msgstr "Ніде"
+
+#: src/lyrics-common/preferences.h:49
+msgid "Artist is truncated at the start, Title -- at the end"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:50
+msgid "Chars to truncate on:"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:54
+msgid "Chars are ORed in RegExp, surrounded by whitespace"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:55
+msgid "Chars to split on:"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:56
+msgid "Further truncate those on chars"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:62
+msgid "General"
+msgstr ""
 
-#: src/lyricwiki/lyricwiki.cc:278 src/lyricwiki-qt/lyricwiki.cc:283
-msgid "Connecting to lyrics.wikia.com ..."
-msgstr "З’єднуюся з lyrics.wikia.com..."
+#: src/lyrics-common/preferences.h:63
+msgid "Split title into artist and title on chars"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:66
+msgid "Sources"
+msgstr ""
 
-#: src/lyricwiki-qt/lyricwiki.cc:55
-msgid "LyricWiki Plugin (Qt)"
+#: src/lyrics-common/preferences.h:67
+msgid "Use embedded lyrics (from Lyrics tag)"
 msgstr ""
 
-#: src/m3u/m3u.cc:32
+#: src/lyrics-common/preferences.h:69
+msgid "Fetch lyrics from internet:"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:72
+msgid "Store fetched lyrics in local cache"
+msgstr "Зберігати завантажені тексти пісень у локальному кешеві"
+
+#: src/lyrics-common/preferences.h:74
+msgid "Local Storage"
+msgstr "Локальний пам'ять"
+
+#: src/lyrics-common/preferences.h:75
+msgid "Load lyric files (.lrc) from local storage"
+msgstr "Завантажити файли текстів (.lrc) пісень з локальної пам'яті"
+
+#: src/lyrics-common/utils.cc:54 src/ui-common/dialogs-qt.cc:63
+msgid "Error"
+msgstr "Помилка"
+
+#: src/lyrics-common/utils.cc:60
+msgid "Lyrics could not be found."
+msgstr "Не вдалося знайти тексти пісень"
+
+#: src/lyrics-common/utils.cc:142
+msgid "Missing title and/or artist."
+msgstr "Відсутня назва файлу та/або ім'я співака"
+
+#: src/lyrics-gtk/lyrics-gtk.cc:37 src/lyrics-qt/lyrics-qt.cc:50
+msgid "Lyrics"
+msgstr "Тексти пісень"
+
+#: src/lyrics-gtk/lyrics-gtk.cc:189 src/lyrics-qt/lyrics-qt.cc:171
+msgid "Edit Lyrics ..."
+msgstr "Редагувати текст пісні ..."
+
+#: src/lyrics-gtk/lyrics-gtk.cc:195 src/lyrics-qt/lyrics-qt.cc:178
+msgid "Save Locally"
+msgstr "Зберегти локально"
+
+#: src/lyrics-gtk/lyrics-gtk.cc:201 src/lyrics-qt/lyrics-qt.cc:186
+msgid "Refresh"
+msgstr "Оновити"
+
+#: src/m3u/m3u.cc:33
 msgid "M3U Playlists"
 msgstr "M3U-списки відтворення"
 
@@ -2376,17 +2582,17 @@
 msgid "Tact Generator"
 msgstr "Генератор такту"
 
-#: src/metronom/metronom.cc:147
+#: src/metronom/metronom.cc:145
 #, c-format
 msgid "Tact generator: %d bpm"
 msgstr "Генератор такту: %d BPM"
 
-#: src/metronom/metronom.cc:149
+#: src/metronom/metronom.cc:147
 #, c-format
 msgid "Tact generator: %d bpm %d/%d"
 msgstr "Генератор такту: %d BPM, %d/%d"
 
-#: src/metronom/metronom.cc:237
+#: src/metronom/metronom.cc:235
 msgid ""
 "A Tact Generator by Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
 "\n"
@@ -2395,204 +2601,212 @@
 "or tact://60*3/4 to play 60 bpm in 3/4 tacts"
 msgstr ""
 "Генератор такту,\n"
-"написаний Мартіном Штраусом <mys@faveve.uni-stuttgart.de>.\n"
+"написаний Мартіном Штравсом <mys@faveve.uni-stuttgart.de>.\n"
 "\n"
-"Використовується при відкритті посилання в форматі:\n"
+"Використовується при відкритті ланки у форматі:\n"
 "tact://bpm*чисельник/знаменник\n"
 "\n"
 "Наприклад, tact://77 — 77 ударів за хвилину,\n"
-"tact://60*3/4 — 60 ударів за хвилину з тактом 3/4."
+"tact://60*3/4 — 60 ударів на хвилину з тактом 3/4."
 
-#: src/mixer/mixer.cc:38
+#: src/mixer/mixer.cc:43
 msgid "Channel Mixer"
 msgstr "Мікшер каналів"
 
-#: src/mixer/mixer.cc:202
+#: src/mixer/mixer.cc:255
 msgid ""
 "Channel Mixer Plugin for Audacious\n"
 "Copyright 2011-2012 John Lindgren and Michał Lipski"
 msgstr ""
 "Мікшер каналів,\n"
-"написаний у 2011–2012 роках Джоном Ліндґреном та Michał Lipski."
+"написаний у 2011–2012 роках Джоном Ліндґреном та Михайлом Липським."
 
-#: src/mixer/mixer.cc:206
+#: src/mixer/mixer.cc:259
 msgid "Channel Mixer"
 msgstr "Мікшер каналів"
 
-#: src/mixer/mixer.cc:207
+#: src/mixer/mixer.cc:260
 msgid "Output channels:"
 msgstr "Каналів на виході:"
 
 #: src/mms/mms.cc:35
 msgid "MMS Plugin"
-msgstr "Плаґін MMS"
+msgstr "Втулок MMS"
 
 #: src/mms/mms.cc:82
 msgid "Error connecting to MMS server"
-msgstr ""
+msgstr "Хиба підключення до MMS-серверу"
 
-#: src/modplug/modplugbmp.h:53
+#: src/modplug/modplugbmp.h:57
 msgid "ModPlug (Module Player)"
 msgstr "ModPlug (програвач модулів)"
 
-#: src/modplug/plugin_main.cc:53
-msgid "Resolution"
-msgstr "Роздільна здатність"
-
-#: src/modplug/plugin_main.cc:54
-msgid "8-bit"
-msgstr "8-біт"
-
 #: src/modplug/plugin_main.cc:55
-msgid "16-bit"
-msgstr "16-біт"
-
-#: src/modplug/plugin_main.cc:56
 msgid "Channels"
 msgstr "Канали"
 
-#: src/modplug/plugin_main.cc:60
+#: src/modplug/plugin_main.cc:59
 msgid "Nearest (fastest)"
 msgstr "Найближчий (найшвидший)"
 
-#: src/modplug/plugin_main.cc:61
+#: src/modplug/plugin_main.cc:60
 msgid "Linear (fast)"
 msgstr "Лінійний (швидкий)"
 
-#: src/modplug/plugin_main.cc:62
+#: src/modplug/plugin_main.cc:61
 msgid "Spline (good)"
 msgstr "Сплайн (якісний)"
 
-#: src/modplug/plugin_main.cc:63
+#: src/modplug/plugin_main.cc:62
 msgid "Polyphase (best)"
 msgstr "Поліфазний (найкращий)"
 
-#: src/modplug/plugin_main.cc:64
+#: src/modplug/plugin_main.cc:63
 msgid "Sample rate"
-msgstr ""
+msgstr "Частота дискретизації"
 
-#: src/modplug/plugin_main.cc:65
+#: src/modplug/plugin_main.cc:64
 msgid "22 kHz"
 msgstr "22 кГц"
 
-#: src/modplug/plugin_main.cc:66
+#: src/modplug/plugin_main.cc:65
 msgid "44 kHz"
 msgstr "44 кГц"
 
-#: src/modplug/plugin_main.cc:67
+#: src/modplug/plugin_main.cc:66
 msgid "48 kHz"
 msgstr "48 кГц"
 
-#: src/modplug/plugin_main.cc:68
+#: src/modplug/plugin_main.cc:67
 msgid "96 kHz"
 msgstr "96 кГц"
 
-#: src/modplug/plugin_main.cc:72 src/modplug/plugin_main.cc:77
-#: src/modplug/plugin_main.cc:82
+#: src/modplug/plugin_main.cc:71 src/modplug/plugin_main.cc:76
+#: src/modplug/plugin_main.cc:81
 msgid "Level:"
 msgstr "Рівень:"
 
-#: src/modplug/plugin_main.cc:78
+#: src/modplug/plugin_main.cc:77
 msgid "Cutoff:"
-msgstr "Границя:"
+msgstr "Зріз:"
 
-#: src/modplug/plugin_main.cc:91
+#: src/modplug/plugin_main.cc:90
 msgid "Reverb"
 msgstr "Реверберація"
 
-#: src/modplug/plugin_main.cc:94
+#: src/modplug/plugin_main.cc:93
 msgid "Bass Boost"
 msgstr "Додатковий бас"
 
-#: src/modplug/plugin_main.cc:97
+#: src/modplug/plugin_main.cc:96
 msgid "Surround"
 msgstr "Об’ємне звучання"
 
-#: src/modplug/plugin_main.cc:100
+#: src/modplug/plugin_main.cc:99
 msgid "Preamp"
 msgstr "Попереднє підсилення"
 
-#: src/modplug/plugin_main.cc:107
+#: src/modplug/plugin_main.cc:106
 msgid "Oversample"
 msgstr "Передискретизація"
 
-#: src/modplug/plugin_main.cc:108
+#: src/modplug/plugin_main.cc:107
 msgid "Noise reduction"
 msgstr "Зменшення шуму"
 
-#: src/modplug/plugin_main.cc:109
+#: src/modplug/plugin_main.cc:108
 msgid "Play Amiga MODs"
 msgstr "Грати Amiga MOD-файли"
 
-#: src/modplug/plugin_main.cc:110
+#: src/modplug/plugin_main.cc:109
 msgid "Repeat"
 msgstr "Повторення"
 
-#: src/modplug/plugin_main.cc:111
+#: src/modplug/plugin_main.cc:110
 msgid "Repeat count:"
 msgstr "Кількість повторень:"
 
-#: src/modplug/plugin_main.cc:112
+#: src/modplug/plugin_main.cc:111
 msgid "To repeat forever, set the repeat count to -1."
-msgstr "Для безкінечного повторення, встановіть кількість повторень в -1."
+msgstr "Для нескінченного повторення, встановіть кількість повторень в -1."
 
-#: src/modplug/plugin_main.cc:125 src/sid/xs_config.cc:106
+#: src/modplug/plugin_main.cc:124 src/sid/xs_config.cc:106
 msgid "These settings will take effect when Audacious is restarted."
+msgstr "Налаштування вступлять у дію після перезапуску."
+
+#: src/moonstone/main_window.cc:72 src/moonstone/main_window.cc:73
+#: src/qtui/main_window.cc:159 src/qtui/main_window.cc:160
+#: src/skins/menus.cc:107 src/skins-qt/menus.cc:98
+msgid "Stop After This Song"
+msgstr "Зупинити після цієї стежки"
+
+#: src/moonstone/moonstone.cc:39
+msgid "Moonstone"
 msgstr ""
 
+#: src/moonstone/playlist_header.cc:212 src/qtui/playlist_header.cc:258
+msgid "Reset to Defaults"
+msgstr "Скинути до всталених налаштувань"
+
+#: src/moonstone/playlist_model.cc:38 src/qtui/playlist_header.cc:232
+msgid "Now Playing"
+msgstr "Зараз відтворюється"
+
+#: src/moonstone/playlist_selection.cc:66
+#: src/playlist-manager/playlist-manager.cc:201
+#: src/playlist-manager-qt/playlist-manager-qt.cc:190
+msgid "Entries"
+msgstr "Елементи"
+
 #: src/mpg123/mpg123.cc:54
 msgid "MPG123 Plugin"
-msgstr "Плаґін MPG123"
-
-#: src/mpg123/mpg123.cc:83
-msgid "Advanced"
-msgstr "Додаткові"
+msgstr "Втулок MPG123"
 
-#: src/mpg123/mpg123.cc:84
+#: src/mpg123/mpg123.cc:82
 msgid "Use accurate length calculation (slow)"
-msgstr ""
+msgstr "Використовувати точне підрахування часу (повільно)"
 
-#: src/mpg123/mpg123.cc:248
+#: src/mpg123/mpg123.cc:260
 msgid "Surround"
 msgstr "Об’ємний звук"
 
-#: src/mpris2/plugin.cc:39
+#: src/mpris2/plugin.cc:40
 msgid "MPRIS 2 Server"
 msgstr "Сервер MPRIS 2"
 
-#: src/neon/neon.cc:97
+#: src/neon/neon.cc:102
 msgid "Neon HTTP/HTTPS Plugin"
-msgstr "Плаґін Neon HTTP/HTTPS"
+msgstr "Втулок Neon HTTP/HTTPS"
 
-#: src/neon/neon.cc:521
+#: src/neon/neon.cc:526
 msgid "Error parsing redirect"
-msgstr ""
+msgstr "Хиба парсування перенаправлень"
 
-#: src/neon/neon.cc:535
+#: src/neon/neon.cc:540
 msgid "Unknown HTTP error"
-msgstr ""
+msgstr "Невідома хиба HTTP "
 
-#: src/neon/neon.cc:569
+#: src/neon/neon.cc:614
 msgid "Error parsing URL"
-msgstr ""
+msgstr "Хиба парсування URL"
 
-#: src/neon/neon.cc:632
+#: src/neon/neon.cc:687
 msgid "Too many redirects"
-msgstr ""
+msgstr "Забагато перепосилань"
 
-#: src/notify/event.cc:64
+#: src/notify/event.cc:97
 msgid "Stopped"
 msgstr "Зупинено"
 
-#: src/notify/event.cc:64
+#: src/notify/event.cc:97
 msgid "Audacious is not playing."
 msgstr "Audacious нічого не відтворює."
 
-#: src/notify/notify.cc:42
+#: src/notify/notify.cc:39
 msgid "Desktop Notifications"
 msgstr "Сповіщення"
 
-#: src/notify/notify.cc:60
+#: src/notify/notify.cc:57
 msgid ""
 "Desktop Notifications Plugin for Audacious\n"
 "Copyright (C) 2010 Maximilian Bogner\n"
@@ -2611,82 +2825,125 @@
 "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"
+"Плагін сповіщень для Audacious\n"
+"Авторське право (C) 2010 Maximilian Bogner\n"
 "Авторське право (C) 2011-2013 John Lindgren та Jean-Alexandre Anglès "
-"d'Auriac⏎\n"
-"⏎\n"
-"Цей плагін є вільним програмним забезпеченням — ви можете розповсюджувати та/"
+"d'Auriac\n"
+"\n"
+"Цей втулок є вільним програмним забезпеченням — ви можете розповсюджувати та/"
 "чи модифікувати його відповідно до умов Загальної публічної ліцензії GNU "
 "третьої або (на ваш розсуд) будь-якої новішої версії у тому вигляді, в якому "
-"її опублікував Фонд вільного програмного забезпечення.⏎\n"
-"⏎\n"
-"Цей плагін розповсюджується зі сподіванням, що він виявиться корисним, але "
+"її опублікував Фонд вільного програмного забезпечення.\n"
+"\n"
+"Цей втулок розповсюджується зі сподіванням, що він виявиться корисним, але "
 "БЕЗ ЖОДНОЇ ГАРАНТІЇ; навіть без умовної гарантії КОМЕРЦІЙНОЇ ПРИДАТНОСТІ чи "
 "ПРИДАТНОСТІ ДО ПЕВНОГО ЗАСТОСУВАННЯ. Зверніться до Загальної публічної "
-"ліцензії GNU за подробицями.⏎\n"
-"⏎\n"
+"ліцензії GNU за подробицями.\n"
+"\n"
 "Ви мали отримати копію Загальної публічної ліцензії GNU разом із цією "
 "програмою. В іншому випадку, дивіться <http://www.gnu.org/licenses/>."
 
-#: src/notify/notify.cc:110
+#: src/notify/notify.cc:104
 msgid "Show playback controls"
 msgstr "Показати елементи керування відтворенням"
 
-#: src/notify/notify.cc:112
+#: src/notify/notify.cc:106
 msgid "Always show notification"
 msgstr "Завжди показувати повідомлення"
 
-#: src/notify/notify.cc:114
+#: src/notify/notify.cc:108
 msgid "Include album name in notification"
+msgstr "Включати назву платівки у сповіщеннях"
+
+#: src/notify/notify.cc:110
+msgid "Custom notification duration:"
 msgstr ""
 
-#: src/notify/osd.cc:58
+#: src/notify/osd.cc:74
 msgid "Show"
 msgstr "Показати"
 
-#: src/notify/osd.cc:66 src/qtui/main_window.cc:178
-#: src/qtui/main_window.cc:179 src/skins/menus.cc:88
-msgid "Pause"
-msgstr "Призупинити відтворення"
+#: src/openmpt/mpt.cc:50
+msgid "OpenMPT (Module Player)"
+msgstr "OpenMPT (Module Player)"
 
-#: src/notify/osd.cc:73 src/qtui/main_window.cc:72 src/skins/menus.cc:91
-msgid "Next"
-msgstr "Наступна доріжка"
+#: src/openmpt/mpt.cc:132
+msgid ""
+"Module player based on libopenmpt\n"
+"\n"
+"Written by: Chris Spiegel <cspiegel@gmail.com>"
+msgstr ""
+"Module player основано на libopenmpt\n"
+"\n"
+"Створив: Chris Spiegel <cspiegel@gmail.com>"
+
+#: src/openmpt/mpt.cc:151
+msgid "Stereo separation:"
+msgstr "Стереорозділення:"
+
+#: src/openmpt/mpt.cc:153
+msgid "% (0=mono, 100=default, 200=full)"
+msgstr ""
+
+#: src/openmpt/mpt.cc:157
+msgid "Interpolation:"
+msgstr "Інтерполяція:"
+
+#: src/openmpt/mptwrap.h:51 src/soxr/sox-resampler.cc:189 src/xsf/plugin.cc:437
+msgid "Linear"
+msgstr "Лінійна"
+
+#: src/openmpt/mptwrap.h:52
+msgid "Cubic"
+msgstr "Кубкова"
+
+#: src/openmpt/mptwrap.h:53
+msgid "Windowed sinc"
+msgstr "Вікнова sinc"
 
-#: src/oss4/oss.h:93
+#: src/opus/opus.cc:39
+msgid "Opus Decoder"
+msgstr ""
+
+#: src/opus/opus.cc:336
+msgid ""
+"Opus Decoder Plugin for Audacious\n"
+"Copyright 2022 Thomas Lange"
+msgstr ""
+
+#: src/oss4/oss.h:70
 msgid "OSS4 Output"
 msgstr "OSS4-вивід"
 
-#: src/oss4/oss.h:95
+#: src/oss4/oss.h:72
 msgid "OSS3 Output"
-msgstr ""
+msgstr "Вихід OSS3"
 
 #: src/oss4/plugin.cc:35
 msgid "Default device"
-msgstr ""
+msgstr "Усталений пристрій"
 
-#: src/oss4/plugin.cc:77
+#: src/oss4/plugin.cc:78
 msgid "Audio device:"
-msgstr "Аудіоприлад:"
+msgstr "Авдіоприлад:"
 
-#: src/oss4/plugin.cc:80
+#: src/oss4/plugin.cc:81
 msgid "Use alternate device:"
 msgstr "Використати інший прилад:"
 
-#: src/oss4/plugin.cc:84
+#: src/oss4/plugin.cc:85
 msgid "Save volume between sessions."
 msgstr "Зберігати гучність між сеансами."
 
-#: src/oss4/plugin.cc:86
+#: src/oss4/plugin.cc:87
 msgid "Enable format conversions made by the OSS software."
 msgstr "Задіяти зміни формату, здійснені програмами OSS."
 
-#: src/oss4/plugin.cc:88
+#: src/oss4/plugin.cc:89
 msgid "Enable exclusive mode to prevent virtual mixing."
-msgstr "Діяти в ексклюзивному режимі, уникаючи віртуального мікшування."
+msgstr "Діяти в ексклюзивному режимові, уникаючи віртуального мікшування."
 
-#: src/oss4/plugin.cc:100
+#: src/oss4/plugin.cc:101
 msgid ""
 "OSS4 Output Plugin for Audacious\n"
 "Copyright 2010-2012 Michał Lipski\n"
@@ -2694,84 +2951,113 @@
 "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"
+"Втулок виводу OSS4 для Audacious,\n"
 "за авторством Michał Lipski,\n"
 "написаний у 2010–2012 роках\n"
 "\n"
 "Дякуємо #audacious, особливо Тоні Врунові, Джонові Ліндґрену й, звісно, "
-"авторам попереднього плаґіну OSS."
+"авторам попереднього втулку OSS."
 
-#: src/playlist-manager/playlist-manager.cc:37
-msgid "Playlist Manager"
+#: src/pipewire/pipewire.cc:44
+msgid "PipeWire Output"
 msgstr ""
 
-#: src/playlist-manager/playlist-manager.cc:226
-msgid "Entries"
+#: src/pipewire/pipewire.cc:118
+msgid ""
+"PipeWire Output Plugin for Audacious\n"
+"Copyright 2022 Thomas Lange\n"
+"\n"
+"Based on the PipeWire Output Plugin for Qmmp\n"
+"Copyright 2021 Ilya Kotov"
 msgstr ""
 
-#: src/playlist-manager/playlist-manager.cc:245
+#: src/pipewire/pipewire.cc:408 src/skins/menus.cc:88 src/skins-qt/menus.cc:79
+msgid "Playback"
+msgstr "Відтворення"
+
+#: src/playlist-manager/playlist-manager.cc:38
+#: src/playlist-manager-qt/playlist-manager-qt.cc:42
+msgid "Playlist Manager"
+msgstr "Керування списками відтворення"
+
+#: src/playlist-manager/playlist-manager.cc:221
+#: src/playlist-manager-qt/playlist-manager-qt.cc:356
 msgid "_Remove"
-msgstr ""
+msgstr "_Усунути"
 
-#: src/playlist-manager/playlist-manager.cc:246
+#: src/playlist-manager/playlist-manager.cc:222
+#: src/playlist-manager-qt/playlist-manager-qt.cc:351
 msgid "Ren_ame"
-msgstr ""
+msgstr "Змінити_назву"
 
 #: src/pls/pls.cc:35
 msgid "PLS Playlists"
 msgstr "PLS-списки відтворення"
 
-#: src/psf/plugin.cc:45
+#: src/psf/plugin.cc:53
 msgid "OpenPSF PSF1/PSF2 Decoder"
 msgstr "Декодер OpenPSF PSF1/PSF2"
 
-#: src/pulse_audio/pulse_audio.cc:38
+#: src/psf/plugin.cc:270
+msgid "OpenPSF Configuration"
+msgstr "Конфігурація OpenPSF"
+
+#: src/psf/plugin.cc:271 src/xsf/plugin.cc:444
+msgid "Ignore length from file"
+msgstr "Іґнорувати час програвання з файлу"
+
+#: src/pulse/pulse_audio.cc:42
 msgid "PulseAudio Output"
 msgstr "PulseAudio-вивід"
 
-#: src/pulse_audio/pulse_audio.cc:611
+#: src/pulse/pulse_audio.cc:84
+msgid "Context name:"
+msgstr "Назва контексту:"
+
+#: src/pulse/pulse_audio.cc:86
+msgid "Stream name:"
+msgstr "Назва потоку:"
+
+#: src/pulse/pulse_audio.cc:596
 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."
+"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 ""
-"Плаґін виводу PulseAudio\n"
+"Втулок виводу PulseAudio\n"
 "\n"
-"Ця програма є вільним програмним забезпеченням — ви можете розповсюджувати\n"
-"та/чи модифікувати її відповідно до умов Загальної публічної ліцензії GNU\n"
-"другої або будь-якої новішої версії у тому вигляді, в якому її опублікував\n"
+"Ця програма є вільним програмним забезпеченням — ви можете розповсюджувати "
+"та/чи модифікувати її відповідно до умов Загальної публічної ліцензії 2-гої "
+"GNU (або будь-якої новішої версії) у тому вигляді, в якому її опублікував. "
 "Фонд вільного програмного забезпечення.\n"
 "\n"
-"Програма розповсюджується зі сподіванням, що вона виявиться корисною,\n"
-"але БЕЗ ЖОДНОЇ ГАРАНТІЇ; навіть без умовної гарантії КОМЕРЦІЙНОЇ "
-"ПРИДАТНОСТІ\n"
-"чи ПРИДАТНОСТІ ДО ПЕВНОГО ЗАСТОСУВАННЯ. \n"
-"Зверніться до Загальної публічної ліцензії GNU за подробицями.\n"
+"Програма розповсюджується зі сподіванням, що вона виявиться корисною, але "
+"БЕЗ ЖОДНОЇ ГАРАНТІЇ; навіть без умовної гарантії КОМЕРЦІЙНОЇ ПРИДАТНОСТІ чи "
+"ПРИДАТНОСТІ ДО ПЕВНОГО ЗАСТОСУВАННЯ. Зверніться до Загальної публічної "
+"ліцензії GNU за подробицями.\n"
 "\n"
 "Ви мали отримати копію Загальної публічної ліцензії GNU разом із цією "
-"програмою.\n"
-"Якщо ви не отримали копії, зверніться за наступною адресою:\n"
-"Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA "
+"програмою. Якщо ви не отримали копії, зверніться за наступною адресою: Free "
+"Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA "
 "02110-1301, USA"
 
-#: src/qtaudio/qtaudio.cc:49
+#: src/qtaudio/qtaudio.cc:53
 msgid "QtMultimedia Output"
-msgstr ""
+msgstr "Вивід QtMultimedia"
 
-#: src/qtaudio/qtaudio.cc:77
+#: src/qtaudio/qtaudio.cc:84
 msgid ""
 "QtMultimedia Audio Output Plugin for Audacious\n"
 "Copyright 2014 William Pitcock\n"
@@ -2779,49 +3065,91 @@
 "Based on SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
 msgstr ""
+"Вивідний втулок QtMultimedia Audio для Audacious\n"
+"Копірайт 2014 William Pitcock\n"
+"\n"
+"Побудовано не виводовому втулкові SDL для Audacious\n"
+"Копірайт 2010 John Lindgren"
 
-#: src/qtui/dialog_windows.cc:31
-msgid "Working ..."
+#: src/qtglspectrum/gl-spectrum.cc:41
+msgid ""
+"OpenGL Spectrum Analyzer for Audacious\n"
+"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
+"Copyright 2014, 2020 Ariadne Conill\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/qtui/filter_input.cc:44 src/skins/ui_playlist.cc:221
-msgid "Search"
-msgstr "Пошук"
+#: src/qthotkey/gui.cc:177
+msgid "Press a key combination inside a text field."
+msgstr ""
 
-#: src/qtui/main_window_actions.cc:94
-msgid "_Open Folder ..."
+#: src/qthotkey/plugin.cc:105
+msgid ""
+"Global Hotkey Plugin\n"
+"Control the player with global key combinations or multimedia keys.\n"
+"\n"
+"Copyright (C) 2020 i.Dark_Templar <darktemplar@dark-templar-archives.net>\n"
+"Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n"
+"\n"
+"Contributors 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/qtui/main_window_actions.cc:96
+#: src/qtui/menus.cc:109
+msgid "_Open Folder ..."
+msgstr "_Відкрити теку ..."
+
+#: src/qtui/menus.cc:115
 msgid "_Add Folder ..."
-msgstr ""
+msgstr "_Додати теку ..."
 
-#: src/qtui/main_window_actions.cc:101
+#: src/qtui/menus.cc:128
 msgid "_Log Inspector ..."
+msgstr "_Перевіряльник лоґу ..."
+
+#: src/qtui/menus.cc:220
+msgid "_Find ..."
+msgstr "_Знайти ..."
+
+#: src/qtui/menus.cc:256 src/skins/menus.cc:80 src/skins-qt/menus.cc:70
+msgid "Audio Settings ..."
+msgstr "Звукові налаштування ..."
+
+#: src/qtui/playlist_model.cc:188
+msgid "Q#"
 msgstr ""
 
-#: src/qtui/main_window.cc:64
-msgid "Open Files"
+#: src/qtui/playlist_model.cc:190
+msgid "T#"
 msgstr ""
 
-#: src/qtui/main_window.cc:66
-msgid "Add Files"
+#: src/qtui/playlist_model.cc:192
+msgid "C#"
 msgstr ""
 
-#: src/qtui/main_window.cc:71 src/skins/menus.cc:90
-msgid "Previous"
-msgstr "Попередня доріжка"
+#: src/qtui/playlist_model.cc:194
+msgid "D#"
+msgstr ""
 
-#: src/qtui/main_window.cc:77 src/skins/menus.cc:82
-msgid "Repeat"
-msgstr "Повторювати"
+#: src/qtui/qtui.cc:40
+msgid "Qt Interface"
+msgstr "Вигляд Qt"
 
-#: src/qtui/main_window.cc:79 src/skins/menus.cc:83
-msgid "Shuffle"
-msgstr "Випадково"
+#: src/qtui/search_bar.cc:46
+msgid "Search playlist"
+msgstr "Шукати список відтворення"
 
-#: src/qtui/qtui.cc:42
-msgid "Qt Interface"
+#: src/qtui/settings.cc:79
+msgid "Use bold font for column headers"
 msgstr ""
 
 #: src/resample/resample.cc:43
@@ -2838,7 +3166,7 @@
 
 #: src/resample/resample.cc:187
 msgid "Skip/repeat samples"
-msgstr "Пропуск/повтор фрагментів"
+msgstr "Пропуск/повтор фраґментів"
 
 #: src/resample/resample.cc:188
 msgid "Linear interpolation"
@@ -2864,7 +3192,7 @@
 msgid "Method:"
 msgstr "Метод:"
 
-#: src/resample/resample.cc:199 src/sox-resampler/sox-resampler.cc:161
+#: src/resample/resample.cc:199 src/soxr/sox-resampler.cc:203
 msgid "Rate:"
 msgstr "Частота:"
 
@@ -2916,999 +3244,929 @@
 msgid "192 kHz:"
 msgstr "192 кГц:"
 
-#: src/scrobbler2/config_window.cc:41
-#, c-format
-msgid "OK. Scrobbling for user: %s"
-msgstr "Ок. Скроблінг для користувача: %s"
-
-#: src/scrobbler2/config_window.cc:54
-msgid "Permission Denied"
-msgstr "Відмовлено у доступі"
-
-#: src/scrobbler2/config_window.cc:56
-msgid "Access the following link to allow Audacious to scrobble your plays:"
-msgstr ""
-"Відвідайте наступне посилання щоб дозволити Audacious скроблінг ваших "
-"доріжок:"
-
-#: src/scrobbler2/config_window.cc:66
-msgid "Keep this window open and click 'Check Permission' again.\n"
-msgstr ""
-"Лишіть це вікно відкритим та ще раз натисніть 'Перевірити права доступу'.\n"
+#: src/scrobbler2/config_window.cc:29
+msgid "Checking Last.fm access ..."
+msgstr "Перевірка доступу до Last.fm ..."
 
-#: src/scrobbler2/config_window.cc:69 src/scrobbler2/config_window.cc:80
+#: src/scrobbler2/config_window.cc:35
 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."
+"Your scrobbles are being saved on your computer temporarily. They will be "
+"submitted as soon as Audacious is allowed access."
 msgstr ""
-"Не хвилюйтесь. Дані для скроблінгу збережені на комп’ютері.\n"
-"Вони будуть відправлені, як тільки Audacious'у буде дозволено це зробити."
+"Прослуховування збережено на комп'ютерові. Вони будуть відіслані щойно "
+"Audacious дозволить доступ."
 
-#: src/scrobbler2/config_window.cc:77
-msgid "Network Problem."
-msgstr "Проблема мережі."
+#: src/scrobbler2/config_window.cc:41
+#, c-format
+msgid "Permission granted. Scrobbling for user %s."
+msgstr "Дозвіл надано. Скроблення для користувача %s."
 
-#: src/scrobbler2/config_window.cc:78
-msgid "There was a problem contacting Last.fm. Please try again later."
+#: src/scrobbler2/config_window.cc:44
+msgid ""
+"Permission denied. Open the following URL in a browser, allow Audacious "
+"access to your account, and then click 'Check Permission' again:"
 msgstr ""
-"Виникла проблема зі з’єднанням до Last.fm. Будь ласка спробуйте пізніше."
+"Дозвіл відхилено. Відкрийте сторінку в переглядачеві, дозвольте "
+"Audacious'осові доступ до вашої обліківки, а потім знову клацніть "
+"\"Перевірка дозволу\":"
 
-#: src/scrobbler2/config_window.cc:110
-msgid "Checking..."
-msgstr "Перевірка..."
+#: src/scrobbler2/config_window.cc:53
+msgid "There was a problem contacting Last.fm."
+msgstr "Проблема зі зв'язком до Last.fm."
 
-#: src/scrobbler2/config_window.cc:176
-msgid "C_heck Permission"
-msgstr "П_еревірити права доступу"
+#: src/scrobbler2/config_window.cc:92
+msgid "Check Permission"
+msgstr "Перевірка дозволу"
 
-#: src/scrobbler2/config_window.cc:177
-msgid "_Revoke Permission"
-msgstr "_Видалити права доступу"
+#: src/scrobbler2/config_window.cc:93
+msgid "Revoke Permission"
+msgstr "Вилучення дозволу"
 
-#: src/scrobbler2/config_window.cc:220
-msgid ""
-"You need to allow Audacious to scrobble tracks to your Last.fm account.\n"
+#: src/scrobbler2/config_window.cc:97
+msgid "You need to allow Audacious to scrobble tracks to your Last.fm account."
 msgstr ""
-"Вам потрібно дозволити Audacious скроблити доріжки у ваш акаунт на Last.fm.\n"
+"Ви маєте надати дозвіл Audacious'ові для скроблення стежок до обліківки Last."
+"fm."
 
 #: src/scrobbler2/scrobbler.cc:29
 msgid "Scrobbler 2.0"
 msgstr "Скроблер 2.0"
 
-#: src/scrobbler2/scrobbler.cc:224
+#: src/scrobbler2/scrobbler.cc:200
 msgid ""
 "The Scrobbler plugin could not be started.\n"
 "There might be a problem with your installation."
 msgstr ""
-"Модуль скроблера не може бути запущений.\n"
-"Можливо це проблема з встановленою програмою."
+"Втулок скроблеру не можливо запустити.\n"
+"Можливо це проблема зі встановленою програмою."
 
-#: src/scrobbler2/scrobbler.cc:289
+#: src/scrobbler2/scrobbler.cc:245
 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_communication.cc:642
-msgid ""
-"Audacious is now using an improved version of the Last.fm Scrobbler.\n"
-"Please check the Preferences for the Scrobbler plugin."
+"project."
 msgstr ""
-"На даний час Audacious використовує покращену версію скробблера Last.fm.⏎\n"
-"Будь-ласка перевірте Налаштування для плаґіна Scrobbler."
 
-#: src/sdlout/sdlout.cc:48
+#: src/sdlout/sdlout.cc:43
 msgid "SDL Output"
 msgstr "SDL-вивід"
 
-#: src/sdlout/sdlout.cc:77
+#: src/sdlout/sdlout.cc:72
 msgid ""
 "SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
 msgstr ""
-"Плаґін виводу в SDL,\n"
+"Втулок виводу в SDL,\n"
 "написаний Джоном Ліндґреном у 2010 році."
 
-#: src/search-tool/search-tool.cc:116 src/search-tool/search-tool.cc:124
+#: src/search-tool/library.cc:35 src/search-tool/library.cc:46
+#: src/search-tool-qt/library.cc:35 src/search-tool-qt/library.cc:46
 msgid "Library"
 msgstr "Бібліотека"
 
-#: src/search-tool/search-tool.cc:394
-#, c-format
-msgid "%d result"
-msgid_plural "%d results"
-msgstr0 ""
-msgstr1 ""
-msgstr2 ""
-
-#: src/search-tool/search-tool.cc:400
-#, c-format
-msgid "(%d hidden)"
-msgid_plural "(%d hidden)"
-msgstr0 ""
-msgstr1 ""
-msgstr2 ""
-
-#: src/search-tool/search-tool.cc:594
+#: src/search-tool-qt/search-model.cc:44 src/search-tool/search-tool.cc:287
 #, c-format
 msgid "%d song"
 msgid_plural "%d songs"
-msgstr0 ""
-msgstr1 ""
-msgstr2 ""
+msgstr0 "%dпісня"
+msgstr1 "%dпісні"
+msgstr2 "%dпісень"
+msgstr3 "%dпісень"
 
-#: src/search-tool/search-tool.cc:601
+#: src/search-tool-qt/search-model.cc:53 src/search-tool/search-tool.cc:294
 msgid "of this genre"
-msgstr ""
+msgstr "За напрямком"
 
-#: src/search-tool/search-tool.cc:607
+#: src/search-tool-qt/search-model.h:47 src/search-tool/search-model.h:45
 msgid "on"
-msgstr ""
+msgstr "on"
 
-#: src/search-tool/search-tool.cc:607
+#: src/search-tool-qt/search-model.h:47 src/search-tool/search-model.h:45
 msgid "by"
-msgstr ""
+msgstr "by"
 
-#: src/search-tool/search-tool.cc:643
-msgid "_Create Playlist"
-msgstr "_Створити список відтворення"
+#: src/search-tool-qt/search-tool-qt.cc:165 src/search-tool/search-tool.cc:74
+msgid "Number of results to show:"
+msgstr "Кількість результатів для показу:"
 
-#: src/search-tool/search-tool.cc:645
-msgid "_Add to Playlist"
-msgstr "_Додати до списку відтворення"
+#: src/search-tool-qt/search-tool-qt.cc:168 src/search-tool/search-tool.cc:77
+msgid "Rescan library at startup"
+msgstr "Пересканувати каталог при запускові"
 
-#: src/search-tool/search-tool.cc:684
-msgid "Search library"
-msgstr "Шукати в бібліотеці"
+#: src/search-tool-qt/search-tool-qt.cc:170
+msgid "Monitor library for changes"
+msgstr "Спостерігати за бібліотекою на наявність змін"
 
-#: src/search-tool/search-tool.cc:688
+#: src/search-tool-qt/search-tool-qt.cc:193 src/search-tool/search-tool.cc:450
 msgid ""
 "To import your music library into Audacious, choose a folder and then click "
 "the \"refresh\" icon."
 msgstr ""
-"Щоб імпортувати свою музичну бібліотеку до Audacious, виберіть теку й "
+"Аби імпортувати свою музичну бібліотеку до Audacious, виберіть теку й "
 "натисніть на значок оновлення."
 
-#: src/search-tool/search-tool.cc:696
+#: src/search-tool-qt/search-tool-qt.cc:195 src/search-tool/search-tool.cc:459
 msgid "Please wait ..."
-msgstr "Зачекайте..."
+msgstr "Зачекайте ..."
 
-#: src/search-tool/search-tool.cc:723
+#: src/search-tool-qt/search-tool-qt.cc:197 src/search-tool/search-tool.cc:487
 msgid "Choose Folder"
 msgstr "Вибрати теку"
 
+#: src/search-tool-qt/search-tool-qt.cc:201 src/search-tool/search-tool.cc:445
+msgid "Search library"
+msgstr "Шукати в бібліотеці"
+
+#: src/search-tool-qt/search-tool-qt.cc:327 src/search-tool/search-tool.cc:156
+#, c-format
+msgid "%d of %d result shown"
+msgid_plural "%d of %d results shown"
+msgstr0 "Показано результатів %dз%d"
+msgstr1 "Показано результатів %dз%d"
+msgstr2 "Показано результатів %dз%d"
+msgstr3 "Показано результатів %dз%d"
+
+#: src/search-tool-qt/search-tool-qt.cc:331 src/search-tool/search-tool.cc:160
+#, c-format
+msgid "%d result"
+msgid_plural "%d results"
+msgstr0 "%dрезультат"
+msgstr1 "%dрезультати"
+msgstr2 "%dрезультатів"
+msgstr3 "%dрезультатів"
+
+#: src/search-tool-qt/search-tool-qt.cc:501 src/search-tool/search-tool.cc:341
+msgid "_Create Playlist"
+msgstr "_Створити список відтворення"
+
+#: src/search-tool-qt/search-tool-qt.cc:503 src/search-tool/search-tool.cc:343
+msgid "_Add to Playlist"
+msgstr "_Додати до списку відтворення"
+
 #: src/sid/xmms-sid.cc:43
 msgid "SID Player"
 msgstr "Програвач SID"
 
-#: src/sid/xs_config.cc:61
-msgid "Output"
-msgstr ""
-
 #: src/sid/xs_config.cc:62
 msgid "Channels:"
-msgstr ""
+msgstr "Каналів:"
 
 #: src/sid/xs_config.cc:68
 msgid "Emulation"
-msgstr ""
+msgstr "Емулювання"
 
 #: src/sid/xs_config.cc:69
 msgid "Emulate MOS 8580 (default: MOS 6581)"
-msgstr ""
+msgstr "Емулювати MOS 8580 (усталено: MOS 6581)"
 
 #: src/sid/xs_config.cc:71
 msgid "Do not automatically select chip model"
-msgstr ""
+msgstr "Не обирати модель чипу автоматично"
 
 #: src/sid/xs_config.cc:73
 msgid "Emulate filter"
-msgstr ""
+msgstr "Емулювати фільтр"
 
 #: src/sid/xs_config.cc:75
 msgid "Clock speed:"
-msgstr ""
+msgstr "Швидкість годинника:"
 
 #: src/sid/xs_config.cc:78
 msgid "Do not automatically select clock speed"
-msgstr ""
+msgstr "Не обирати швидкість годинника автоматично"
 
 #: src/sid/xs_config.cc:80
 msgid "Playback time"
-msgstr ""
+msgstr "Час програвання"
 
 #: src/sid/xs_config.cc:81
 msgid "Set maximum playback time:"
-msgstr ""
+msgstr "Налаштувати найбільший час програвання:"
 
 #: src/sid/xs_config.cc:87
 msgid "Use only when song length is unknown"
-msgstr ""
+msgstr "Користати лише коли тривалість пісні не є відомою"
 
 #: src/sid/xs_config.cc:90
 msgid "Set minimum playback time:"
-msgstr ""
+msgstr "Налаштувати найменший час програвання:"
 
 #: src/sid/xs_config.cc:96
 msgid "Subtunes"
-msgstr ""
+msgstr "Підмелодії"
 
 #: src/sid/xs_config.cc:97
 msgid "Enable subtunes"
-msgstr ""
+msgstr "Увімкнути підмелодії"
 
 #: src/sid/xs_config.cc:99
 msgid "Ignore subtunes shorter than:"
-msgstr ""
+msgstr "Іґнорувати підмелодії коротші за:"
 
 #: src/sid/xs_config.cc:105
 msgid "Note"
-msgstr ""
+msgstr "Примітка"
 
 #: src/silence-removal/silence-removal.cc:39
 msgid "Silence Removal"
-msgstr ""
+msgstr "Усувач тиші"
 
 #: src/silence-removal/silence-removal.cc:58
 msgid ""
 "Silence Removal Plugin for Audacious\n"
 "Copyright 2014 John Lindgren"
 msgstr ""
+"Втулок усунення тиші для Audacious\n"
+"Copyright 2014 Джон Ліндґрен"
 
 #: src/silence-removal/silence-removal.cc:67
 msgid "Silence Removal"
-msgstr ""
+msgstr "Усувач тиші"
 
 #: src/silence-removal/silence-removal.cc:68
 msgid "Threshold:"
-msgstr ""
+msgstr "Початок:"
 
-#: src/silence-removal/silence-removal.cc:70
-msgid "dB"
-msgstr ""
+#: src/skins/actions.cc:45 src/skins-qt/actions.cc:43
+msgid "Repeat points cleared."
+msgstr "Точки повтору скинуті."
 
-#: src/skins/menus.cc:64
-msgid "Open Files ..."
-msgstr "Відкрити файли..."
+#: src/skins/actions.cc:60 src/skins-qt/actions.cc:58
+msgid "Repeat point A set."
+msgstr "Точку повтору A встановлено."
 
-#: src/skins/menus.cc:65
-msgid "Open URL ..."
-msgstr "Відкрити адресу..."
+#: src/skins/actions.cc:65 src/skins-qt/actions.cc:63
+msgid "Repeat point B set."
+msgstr "Точку повтору B встановлено."
 
-#: src/skins/menus.cc:66
-msgid "Search Library"
-msgstr ""
+#: src/skins/equalizer.cc:223 src/skins-qt/equalizer.cc:223
+msgid "Preamp"
+msgstr "Попередній підсилювач"
 
-#: src/skins/menus.cc:68
-msgid "Playback"
-msgstr "Відтворення"
+#: src/skins/equalizer.cc:227 src/skins-qt/equalizer.cc:227
+msgid "31 Hz"
+msgstr "31 Гц"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "63 Hz"
+msgstr "63 Гц"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "125 Hz"
+msgstr "125 Гц"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "250 Hz"
+msgstr "250 Гц"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "500 Hz"
+msgstr "500 Гц"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "1 kHz"
+msgstr "1 кГц"
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "2 kHz"
+msgstr "2 кГц"
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "4 kHz"
+msgstr "4 кГц"
 
-#: src/skins/menus.cc:69
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "8 kHz"
+msgstr "8 кГц"
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "16 kHz"
+msgstr "16 кГц"
+
+#: src/skins/equalizer.cc:270 src/skins-qt/equalizer.cc:270
+msgid "Audacious Equalizer"
+msgstr "Еквалайзер Audacious"
+
+#: src/skins/main.cc:459 src/skins-qt/main.cc:442
+msgid "Recording on"
+msgstr "Увімкнути записування"
+
+#: src/skins/main.cc:461 src/skins-qt/main.cc:444
+msgid "Recording off"
+msgstr "Вимкнути записування"
+
+#: src/skins/main.cc:754 src/skins-qt/main.cc:701
+#, c-format
+msgid "Seek to %d:%-2.2d / %d:%-2.2d"
+msgstr "Перехід до %d:%-2.2d / %d:%-2.2d"
+
+#: src/skins/main.cc:771 src/skins-qt/main.cc:718
+#, c-format
+msgid "Volume: %d%%"
+msgstr "Гучність: %d%%"
+
+#: src/skins/main.cc:784 src/skins-qt/main.cc:731
+#, c-format
+msgid "Balance: %d%% left"
+msgstr "Баланс: %d%% вліво"
+
+#: src/skins/main.cc:786 src/skins-qt/main.cc:733
+msgid "Balance: center"
+msgstr "Баланс: центр"
+
+#: src/skins/main.cc:788 src/skins-qt/main.cc:735
+#, c-format
+msgid "Balance: %d%% right"
+msgstr "Баланс: %d%% вправо"
+
+#: src/skins/main.cc:880 src/skins-qt/main.cc:827
+msgid "Options Menu"
+msgstr "Меню опцій"
+
+#: src/skins/main.cc:884 src/skins-qt/main.cc:831
+msgid "Disable 'Always On Top'"
+msgstr "Вимкнути відображення над іншими вікнами"
+
+#: src/skins/main.cc:886 src/skins-qt/main.cc:833
+msgid "Enable 'Always On Top'"
+msgstr "Відображати над іншими вікнами"
+
+#: src/skins/main.cc:889 src/skins-qt/main.cc:836
+msgid "File Info Box"
+msgstr "Редактор інформації про доріжку"
+
+#: src/skins/main.cc:892 src/skins/menus.cc:149 src/skins-qt/main.cc:839
+#: src/skins-qt/menus.cc:142
+msgid "Double Size"
+msgstr "Збільшити вдвічі"
+
+#: src/skins/main.cc:895 src/skins-qt/main.cc:842
+msgid "Visualizations"
+msgstr "Візерунки"
+
+#: src/skins/menus.cc:74 src/skins-qt/menus.cc:64
+msgid "Volume Up"
+msgstr "Збільшити гучність"
+
+#: src/skins/menus.cc:75 src/skins-qt/menus.cc:65
+msgid "Volume Down"
+msgstr "Зменшити гучність"
+
+#: src/skins/menus.cc:77 src/skins-qt/menus.cc:67
+msgid "Effects ..."
+msgstr "Ефекти ..."
+
+#: src/skins/menus.cc:84 src/skins-qt/menus.cc:74
+msgid "Open Files ..."
+msgstr "Відкрити файли ..."
+
+#: src/skins/menus.cc:85 src/skins-qt/menus.cc:76
+msgid "Open URL ..."
+msgstr "Відкрити адресу ..."
+
+#: src/skins/menus.cc:89 src/skins-qt/menus.cc:80
 msgid "Playlist"
 msgstr "Список відтворення"
 
-#: src/skins/menus.cc:70
+#: src/skins/menus.cc:90 src/skins-qt/menus.cc:81
+msgid "Output"
+msgstr "Вивід"
+
+#: src/skins/menus.cc:91 src/skins-qt/menus.cc:82
 msgid "View"
 msgstr "Перегляд"
 
-#: src/skins/menus.cc:72 src/skins/menus.cc:136 src/skins/menus.cc:149
-#: src/skins/menus.cc:214
+#: src/skins/menus.cc:93 src/skins/menus.cc:161 src/skins/menus.cc:174
+#: src/skins/menus.cc:245 src/skins-qt/menus.cc:84 src/skins-qt/menus.cc:156
+#: src/skins-qt/menus.cc:170 src/skins-qt/menus.cc:241
 msgid "Services"
 msgstr "Служби"
 
-#: src/skins/menus.cc:74
+#: src/skins/menus.cc:95 src/skins-qt/menus.cc:86
 msgid "About ..."
-msgstr "Про ..."
+msgstr "Візитівка ..."
 
-#: src/skins/menus.cc:75
+#: src/skins/menus.cc:96 src/skins-qt/menus.cc:87
 msgid "Settings ..."
 msgstr "Налаштування ..."
 
-#: src/skins/menus.cc:76
+#: src/skins/menus.cc:97 src/skins-qt/menus.cc:88
 msgid "Quit"
 msgstr "Вихід"
 
-#: src/skins/menus.cc:80 src/skins/menus.cc:206
+#: src/skins/menus.cc:101 src/skins/menus.cc:235 src/skins-qt/menus.cc:92
+#: src/skins-qt/menus.cc:231
 msgid "Song Info ..."
-msgstr "Інформація про доріжку..."
+msgstr "Інформація про стежку ..."
 
-#: src/skins/menus.cc:84
-msgid "No Playlist Advance"
-msgstr "Не просуватися у списку відтворення"
+#: src/skins/menus.cc:105 src/skins-qt/menus.cc:96
+msgid "Shuffle by Album"
+msgstr "Сортувати за альбомом"
 
-#: src/skins/menus.cc:85
-msgid "Stop After This Song"
-msgstr "Зупинити після цієї доріжки"
+#: src/skins/menus.cc:106 src/skins-qt/menus.cc:97
+msgid "No Playlist Advance"
+msgstr "Не просуватися у спискові відтворення"
 
-#: src/skins/menus.cc:93
+#: src/skins/menus.cc:117 src/skins-qt/menus.cc:108
 msgid "Set A-B Repeat"
 msgstr "Встановити A-B повтор"
 
-#: src/skins/menus.cc:94
+#: src/skins/menus.cc:118 src/skins-qt/menus.cc:109
 msgid "Clear A-B Repeat"
 msgstr "Скинути A-B повтор"
 
-#: src/skins/menus.cc:96
+#: src/skins/menus.cc:120 src/skins-qt/menus.cc:111
 msgid "Jump to Song ..."
-msgstr "Перейти до доріжки..."
+msgstr "Перейти до стежки ..."
 
-#: src/skins/menus.cc:97
+#: src/skins/menus.cc:121 src/skins-qt/menus.cc:113
 msgid "Jump to Time ..."
-msgstr "Перейти до часу..."
+msgstr "Перейти до часу ..."
 
-#: src/skins/menus.cc:101
+#: src/skins/menus.cc:125 src/skins-qt/menus.cc:118
 msgid "Play/Resume"
 msgstr "Відтворити/продовжити"
 
-#: src/skins/menus.cc:103
+#: src/skins/menus.cc:127 src/skins-qt/menus.cc:120
 msgid "New Playlist"
-msgstr "Новий список відтворення"
+msgstr "Новий список відтворення"
 
-#: src/skins/menus.cc:104
+#: src/skins/menus.cc:128 src/skins-qt/menus.cc:121
 msgid "Rename Playlist ..."
-msgstr "Перейменувати список..."
+msgstr "Змінити плейлистову назву ..."
 
-#: src/skins/menus.cc:105
+#: src/skins/menus.cc:129 src/skins-qt/menus.cc:122
 msgid "Remove Playlist"
-msgstr "Видалити список"
+msgstr "Усунути список"
 
-#: src/skins/menus.cc:107
+#: src/skins/menus.cc:131 src/skins-qt/menus.cc:124
 msgid "Previous Playlist"
 msgstr "Попередній список"
 
-#: src/skins/menus.cc:108
+#: src/skins/menus.cc:132 src/skins-qt/menus.cc:125
 msgid "Next Playlist"
 msgstr "Наступний список"
 
-#: src/skins/menus.cc:110
+#: src/skins/menus.cc:134 src/skins-qt/menus.cc:127
 msgid "Import Playlist ..."
-msgstr "Імпортувати список відтворення..."
+msgstr "Імпортувати список відтворення ..."
 
-#: src/skins/menus.cc:111
+#: src/skins/menus.cc:135 src/skins-qt/menus.cc:128
 msgid "Export Playlist ..."
-msgstr "Експортувати список відтворення..."
+msgstr "Експортувати список відтворення ..."
 
-#: src/skins/menus.cc:113
+#: src/skins/menus.cc:137 src/skins-qt/menus.cc:130
 msgid "Playlist Manager ..."
-msgstr "Керування списками відтворення..."
+msgstr "Керування списками відтворення ..."
 
-#: src/skins/menus.cc:114
+#: src/skins/menus.cc:138 src/skins-qt/menus.cc:131
 msgid "Queue Manager ..."
-msgstr "Керування чергою..."
+msgstr "Керування чергою ..."
 
-#: src/skins/menus.cc:116
+#: src/skins/menus.cc:140 src/skins-qt/menus.cc:133
 msgid "Refresh Playlist"
 msgstr "Оновити список відтворення"
 
-#: src/skins/menus.cc:120
+#: src/skins/menus.cc:144 src/skins-qt/menus.cc:137
 msgid "Show Playlist Editor"
 msgstr "Показати редактор списків відтворення"
 
-#: src/skins/menus.cc:121
+#: src/skins/menus.cc:145 src/skins-qt/menus.cc:138
 msgid "Show Equalizer"
 msgstr "Показати еквалайзер"
 
-#: src/skins/menus.cc:123
+#: src/skins/menus.cc:147 src/skins-qt/menus.cc:140
 msgid "Show Remaining Time"
 msgstr "Показати час до завершення"
 
-#: src/skins/menus.cc:125
+#: src/skins/menus.cc:150 src/skins-qt/menus.cc:143
 msgid "Always on Top"
 msgstr "Завжди згори"
 
-#: src/skins/menus.cc:126
+#: src/skins/menus.cc:151 src/skins-qt/menus.cc:145
 msgid "On All Workspaces"
-msgstr "На всіх робочих столах"
+msgstr "На всіх робочих просторах"
 
-#: src/skins/menus.cc:128
+#: src/skins/menus.cc:153 src/skins-qt/menus.cc:148
 msgid "Roll Up Player"
 msgstr "Згорнути плеєр"
 
-#: src/skins/menus.cc:129
+#: src/skins/menus.cc:154 src/skins-qt/menus.cc:149
 msgid "Roll Up Playlist Editor"
 msgstr "Згорнути редактор списку відтворення"
 
-#: src/skins/menus.cc:130
+#: src/skins/menus.cc:155 src/skins-qt/menus.cc:150
 msgid "Roll Up Equalizer"
 msgstr "Згорнути еквалайзер"
 
-#: src/skins/menus.cc:132 src/skins/ui_main.cc:854
-msgid "Double Size"
-msgstr ""
-
-#: src/skins/menus.cc:138
+#: src/skins/menus.cc:163 src/skins-qt/menus.cc:158
 msgid "Add URL ..."
-msgstr "Додати адресу..."
+msgstr "Додати адресу ..."
 
-#: src/skins/menus.cc:139
+#: src/skins/menus.cc:164 src/skins-qt/menus.cc:160
 msgid "Add Files ..."
-msgstr "Додати файли..."
+msgstr "Додати файли ..."
 
-#: src/skins/menus.cc:143 src/skins/menus.cc:171 src/skins/menus.cc:185
+#: src/skins/menus.cc:168 src/skins/menus.cc:196 src/skins/menus.cc:212
+#: src/skins-qt/menus.cc:164 src/skins-qt/menus.cc:192
+#: src/skins-qt/menus.cc:208
 msgid "By Title"
 msgstr "За назвою"
 
-#: src/skins/menus.cc:144 src/skins/menus.cc:178 src/skins/menus.cc:192
+#: src/skins/menus.cc:169 src/skins/menus.cc:203 src/skins/menus.cc:219
+#: src/skins-qt/menus.cc:165 src/skins-qt/menus.cc:199
+#: src/skins-qt/menus.cc:215
 msgid "By File Name"
-msgstr ""
+msgstr "За назвою файлу"
 
-#: src/skins/menus.cc:145 src/skins/menus.cc:179 src/skins/menus.cc:193
+#: src/skins/menus.cc:170 src/skins/menus.cc:204 src/skins/menus.cc:220
+#: src/skins-qt/menus.cc:166 src/skins-qt/menus.cc:200
+#: src/skins-qt/menus.cc:216
 msgid "By File Path"
 msgstr "За шляхом до файлу"
 
-#: src/skins/menus.cc:151
+#: src/skins/menus.cc:176 src/skins-qt/menus.cc:172
 msgid "Remove All"
 msgstr "Вилучити всі"
 
-#: src/skins/menus.cc:152
+#: src/skins/menus.cc:177 src/skins-qt/menus.cc:173
 msgid "Clear Queue"
 msgstr "Очистити чергу"
 
-#: src/skins/menus.cc:154
+#: src/skins/menus.cc:179 src/skins-qt/menus.cc:175
 msgid "Remove Unavailable Files"
 msgstr "Прибрати недоступні файли."
 
-#: src/skins/menus.cc:155
+#: src/skins/menus.cc:180 src/skins-qt/menus.cc:176
 msgid "Remove Duplicates"
-msgstr "Видалити дублікати"
+msgstr "Вилучити дублікати"
 
-#: src/skins/menus.cc:157
+#: src/skins/menus.cc:182 src/skins-qt/menus.cc:178
 msgid "Remove Unselected"
 msgstr "Вилучити невідмічені "
 
-#: src/skins/menus.cc:158
+#: src/skins/menus.cc:183 src/skins-qt/menus.cc:179
 msgid "Remove Selected"
 msgstr "Вилучити виділені"
 
-#: src/skins/menus.cc:162
+#: src/skins/menus.cc:187 src/skins-qt/menus.cc:183
 msgid "Search and Select"
-msgstr "Пошук і виділення"
+msgstr "Пошук і вибрання"
 
-#: src/skins/menus.cc:164
+#: src/skins/menus.cc:189 src/skins-qt/menus.cc:185
 msgid "Invert Selection"
-msgstr "Інвертувати виділення"
+msgstr "Інвертувати вибрання"
 
-#: src/skins/menus.cc:165
+#: src/skins/menus.cc:190 src/skins-qt/menus.cc:186
 msgid "Select None"
-msgstr "Зняти виділення"
+msgstr "Зняти вибрання"
 
-#: src/skins/menus.cc:166
+#: src/skins/menus.cc:191 src/skins-qt/menus.cc:187
 msgid "Select All"
 msgstr "Виділити все"
 
-#: src/skins/menus.cc:170 src/skins/menus.cc:184
+#: src/skins/menus.cc:195 src/skins/menus.cc:211 src/skins-qt/menus.cc:191
+#: src/skins-qt/menus.cc:207
 msgid "By Track Number"
-msgstr "За номером доріжки"
+msgstr "За номером стежки"
 
-#: src/skins/menus.cc:172 src/skins/menus.cc:186
+#: src/skins/menus.cc:197 src/skins/menus.cc:213 src/skins-qt/menus.cc:193
+#: src/skins-qt/menus.cc:209
 msgid "By Artist"
 msgstr "За виконавцем"
 
-#: src/skins/menus.cc:173 src/skins/menus.cc:187
+#: src/skins/menus.cc:198 src/skins/menus.cc:214 src/skins-qt/menus.cc:194
+#: src/skins-qt/menus.cc:210
 msgid "By Album"
 msgstr "За альбомом"
 
-#: src/skins/menus.cc:174 src/skins/menus.cc:188
+#: src/skins/menus.cc:199 src/skins/menus.cc:215 src/skins-qt/menus.cc:195
+#: src/skins-qt/menus.cc:211
 msgid "By Album Artist"
 msgstr "За виконавцем альбому"
 
-#: src/skins/menus.cc:175 src/skins/menus.cc:190
+#: src/skins/menus.cc:200 src/skins/menus.cc:216 src/skins-qt/menus.cc:196
+#: src/skins-qt/menus.cc:212
 msgid "By Release Date"
 msgstr "За датою видання"
 
-#: src/skins/menus.cc:176 src/skins/menus.cc:189
+#: src/skins/menus.cc:201 src/skins/menus.cc:217 src/skins-qt/menus.cc:197
+#: src/skins-qt/menus.cc:213
 msgid "By Genre"
-msgstr ""
+msgstr "За напрямком"
 
-#: src/skins/menus.cc:177 src/skins/menus.cc:191
+#: src/skins/menus.cc:202 src/skins/menus.cc:218 src/skins-qt/menus.cc:198
+#: src/skins-qt/menus.cc:214
 msgid "By Length"
-msgstr ""
+msgstr "За часом"
 
-#: src/skins/menus.cc:180 src/skins/menus.cc:194
+#: src/skins/menus.cc:205 src/skins/menus.cc:221 src/skins-qt/menus.cc:201
+#: src/skins-qt/menus.cc:217
 msgid "By Custom Title"
+msgstr "За налаштовною назвою"
+
+#: src/skins/menus.cc:206 src/skins/menus.cc:222 src/skins-qt/menus.cc:202
+#: src/skins-qt/menus.cc:218
+msgid "By Comment"
+msgstr "За коментарями"
+
+#: src/skins/menus.cc:207 src/skins/menus.cc:223 src/skins-qt/menus.cc:203
+#: src/skins-qt/menus.cc:219
+msgid "By Disc Number"
 msgstr ""
 
-#: src/skins/menus.cc:198
+#: src/skins/menus.cc:227 src/skins-qt/menus.cc:223
 msgid "Randomize List"
 msgstr "Порушити порядок"
 
-#: src/skins/menus.cc:199
+#: src/skins/menus.cc:228 src/skins-qt/menus.cc:224
 msgid "Reverse List"
 msgstr "Обернути список"
 
-#: src/skins/menus.cc:201
+#: src/skins/menus.cc:230 src/skins-qt/menus.cc:226
 msgid "Sort Selected"
 msgstr "Сортувати виділене"
 
-#: src/skins/menus.cc:202
+#: src/skins/menus.cc:231 src/skins-qt/menus.cc:227
 msgid "Sort List"
 msgstr "Сортувати список..."
 
-#: src/skins/menus.cc:208
+#: src/skins/menus.cc:236 src/skins-qt/menus.cc:232
+msgid "Open Containing Folder"
+msgstr "За текою вмісту"
+
+#: src/skins/menus.cc:238 src/skins-qt/menus.cc:234
 msgid "Cut"
 msgstr "Вирізати"
 
-#: src/skins/menus.cc:209
+#: src/skins/menus.cc:239 src/skins-qt/menus.cc:235
 msgid "Copy"
 msgstr "Копіювати"
 
-#: src/skins/menus.cc:210
+#: src/skins/menus.cc:240 src/skins-qt/menus.cc:236
 msgid "Paste"
 msgstr "Вставити"
 
-#: src/skins/menus.cc:212
+#: src/skins/menus.cc:241 src/skins-qt/menus.cc:237
+msgid "Paste at End"
+msgstr "Унести у кінці"
+
+#: src/skins/menus.cc:243 src/skins-qt/menus.cc:239
 msgid "Queue/Unqueue"
 msgstr "В чергу/З черги"
 
-#: src/skins/menus.cc:218
-msgid "Load Preset ..."
-msgstr "Завантажити пресет..."
-
-#: src/skins/menus.cc:219
-msgid "Load Auto Preset ..."
-msgstr "Завантажити авто-пресет..."
-
-#: src/skins/menus.cc:220
-msgid "Load Default"
-msgstr "Завантажити за замовчуванням"
-
-#: src/skins/menus.cc:221
-msgid "Load Preset File ..."
-msgstr "Завантажити пресет із файлу..."
-
-#: src/skins/menus.cc:222
-msgid "Load EQF File ..."
-msgstr "Завантажити EQF файл.."
-
-#: src/skins/menus.cc:224
-msgid "Save Preset ..."
-msgstr "Зберегти пресет..."
-
-#: src/skins/menus.cc:225
-msgid "Save Auto Preset ..."
-msgstr "Зберегти авто-пресет..."
-
-#: src/skins/menus.cc:226
-msgid "Save Default"
-msgstr "Зберегти за замовчуванням"
-
-#: src/skins/menus.cc:227
-msgid "Save Preset File ..."
-msgstr "Зберегти пресет до файлу..."
-
-#: src/skins/menus.cc:228
-msgid "Save EQF File ..."
-msgstr "Зберегти EQF файл..."
-
-#: src/skins/menus.cc:230
-msgid "Delete Preset ..."
-msgstr "Видалити пресет..."
-
-#: src/skins/menus.cc:231
-msgid "Delete Auto Preset ..."
-msgstr "Видалити авто-пресет..."
-
-#: src/skins/menus.cc:233
-msgid "Import Winamp Presets ..."
-msgstr "Імпортувати пресети WinAMP..."
-
-#: src/skins/menus.cc:235
-msgid "Reset to Zero"
-msgstr "Скинути на нуль"
+#: src/skins/playlist-widget.cc:58 src/skins-qt/playlist-widget.cc:58
+#, c-format
+msgid "%s (%d of %d)"
+msgstr "%s (%d із %d)"
+
+#: src/skins/playlistwin.cc:491 src/skins-qt/playlistwin.cc:478
+msgid "Audacious Playlist Editor"
+msgstr "Редактор списків відтворення Audacious"
 
-#: src/skins/plugin.cc:48
+#: src/skins/plugin.cc:53 src/skins-qt/plugin.cc:65
 msgid "Winamp Classic Interface"
 msgstr "Класичний інтерфейс Winamp"
 
-#: src/skins/preset-browser.cc:57 src/skins/preset-list.cc:371
-#: src/skins/preset-list.cc:386
-msgid "Save"
-msgstr "Зберегти"
-
-#: src/skins/preset-browser.cc:57 src/skins/preset-list.cc:338
-#: src/skins/preset-list.cc:354
-msgid "Load"
-msgstr "Завантажити"
-
-#: src/skins/preset-browser.cc:83
-msgid "Load Preset File"
-msgstr "Завантажити пресет із файлу"
-
-#: src/skins/preset-browser.cc:100
-msgid "Load EQF File"
-msgstr "Завантажити EQF файл"
-
-#: src/skins/preset-browser.cc:119
-msgid "Save Preset File"
-msgstr "Зберегти пресет до файлу"
-
-#: src/skins/preset-browser.cc:137
-msgid "Save EQF File"
-msgstr "Зберегти EQF файл"
-
-#: src/skins/preset-browser.cc:151
-msgid "Import Winamp Presets"
-msgstr "Імпортувати пресети WinAMP"
-
-#: src/skins/preset-list.cc:285
-msgid "Presets"
-msgstr "Типові налаштування"
-
-#: src/skins/preset-list.cc:335
-msgid "Load preset"
-msgstr "Вибір пресету"
-
-#: src/skins/preset-list.cc:351
-msgid "Load auto-preset"
-msgstr "Завантажити відповідний доріжці пресет"
-
-#: src/skins/preset-list.cc:367
-msgid "Save preset"
-msgstr "Збереження пресету"
-
-#: src/skins/preset-list.cc:382
-msgid "Save auto-preset"
-msgstr "Зберегти пресет як відповідний доріжці"
-
-#: src/skins/preset-list.cc:408
-msgid "Delete preset"
-msgstr "Видалення пресету"
-
-#: src/skins/preset-list.cc:424
-msgid "Delete auto-preset"
-msgstr "Видалити відповідний доріжці пресет"
+#: src/skins-qt/menus.cc:75
+msgid "Open Folder ..."
+msgstr "Відкрити теку ..."
+
+#: src/skins-qt/menus.cc:159
+msgid "Add Folder ..."
+msgstr "Додати теку ..."
+
+#: src/skins-qt/search-select.cc:62 src/skins/search-select.cc:77
+msgid "Search entries in active playlist"
+msgstr "Пошук у чинному спискові відтворення"
+
+#: src/skins-qt/search-select.cc:70 src/skins/search-select.cc:83
+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-qt/search-select.cc:75 src/skins/search-select.cc:91
+msgid "Title:"
+msgstr "Назва:"
+
+#: src/skins-qt/search-select.cc:79 src/skins/search-select.cc:96
+msgid "Album:"
+msgstr "Альбом:"
 
-#: src/skins/skins_cfg.cc:176
+#: src/skins-qt/search-select.cc:82 src/skins/search-select.cc:101
+msgid "Artist:"
+msgstr "Виконавець:"
+
+#: src/skins-qt/search-select.cc:85 src/skins/search-select.cc:106
+msgid "File Name:"
+msgstr "Назва файлу:"
+
+#: src/skins-qt/search-select.cc:88 src/skins/search-select.cc:134
+msgid "Clear previous selection before searching"
+msgstr "Зняти попереднє вибрання перед пошуком"
+
+#: src/skins-qt/search-select.cc:89 src/skins/search-select.cc:137
+msgid "Automatically toggle queue for matching entries"
+msgstr "Автоматично перемикати стан черги знайдених елементів"
+
+#: src/skins-qt/search-select.cc:90 src/skins/search-select.cc:140
+msgid "Create a new playlist with matching entries"
+msgstr "Виділити знайдене в новий список відтворення"
+
+#: src/skins-qt/search-select.cc:101 src/skins/search-select.cc:78
+msgid "Search"
+msgstr "Пошук"
+
+#: src/skins-qt/skins_cfg.cc:198 src/skins/skins_cfg.cc:182
 msgid "Player:"
 msgstr "Програвач:"
 
-#: src/skins/skins_cfg.cc:178
+#: src/skins-qt/skins_cfg.cc:200 src/skins/skins_cfg.cc:184
 msgid "Select main player window font:"
 msgstr "Шрифт основного вікна програвача"
 
-#: src/skins/skins_cfg.cc:179
+#: src/skins-qt/skins_cfg.cc:201 src/skins/skins_cfg.cc:185
 msgid "Playlist:"
 msgstr "Плейлист:"
 
-#: src/skins/skins_cfg.cc:181
+#: src/skins-qt/skins_cfg.cc:203 src/skins/skins_cfg.cc:187
 msgid "Select playlist font:"
 msgstr "Шрифт списку відтворення:"
 
-#: src/skins/skins_cfg.cc:187
+#: src/skins-qt/skins_cfg.cc:207 src/skins/skins_cfg.cc:191
 msgid "Skin"
-msgstr "Оболонка"
+msgstr "Жупан"
+
+#: src/skins-qt/skins_cfg.cc:211 src/skins/skins_cfg.cc:193
+msgid "Display active titlebar when any window is focused"
+msgstr ""
 
-#: src/skins/skins_cfg.cc:189
+#: src/skins-qt/skins_cfg.cc:213 src/skins/skins_cfg.cc:195
 msgid "Fonts"
 msgstr "Шрифти"
 
-#: src/skins/skins_cfg.cc:192
+#: src/skins-qt/skins_cfg.cc:215 src/skins/skins_cfg.cc:197
 msgid "Use bitmap fonts (supports ASCII only)"
 msgstr "Використовувати растрові шрифти (підтримується тільки ASCII)"
 
-#: src/skins/skins_cfg.cc:194
+#: src/skins-qt/skins_cfg.cc:217 src/skins/skins_cfg.cc:199
 msgid "Scroll song title"
 msgstr "Прокручувати назву пісні"
 
-#: src/skins/skins_cfg.cc:196
+#: src/skins-qt/skins_cfg.cc:219 src/skins/skins_cfg.cc:201
 msgid "Scroll song title in both directions"
 msgstr "Прокручувати назву пісні в обох напрямках"
 
-#: src/skins/skins_cfg.cc:201
+#: src/skins-qt/skins_cfg.cc:224 src/skins/skins_cfg.cc:206
 msgid "Analyzer"
 msgstr "Аналізатор"
 
-#: src/skins/skins_cfg.cc:202
+#: src/skins-qt/skins_cfg.cc:225 src/skins/skins_cfg.cc:207
 msgid "Scope"
 msgstr "Осцилограф"
 
-#: src/skins/skins_cfg.cc:203
+#: src/skins-qt/skins_cfg.cc:226 src/skins/skins_cfg.cc:208
 msgid "Voiceprint / VU meter"
 msgstr "Спектрограма / VU-вимірювач"
 
-#: src/skins/skins_cfg.cc:204
+#: src/skins-qt/skins_cfg.cc:227 src/skins/skins_cfg.cc:209
 msgid "Off"
 msgstr "Вимкнено"
 
-#: src/skins/skins_cfg.cc:208 src/skins/skins_cfg.cc:233
-#: src/skins/skins_cfg.cc:239
+#: src/skins-qt/skins_cfg.cc:231 src/skins-qt/skins_cfg.cc:256
+#: src/skins-qt/skins_cfg.cc:262 src/skins/skins_cfg.cc:213
+#: src/skins/skins_cfg.cc:238 src/skins/skins_cfg.cc:244
 msgid "Normal"
 msgstr "Звичайний"
 
-#: src/skins/skins_cfg.cc:209 src/skins/skins_cfg.cc:234
+#: src/skins-qt/skins_cfg.cc:232 src/skins-qt/skins_cfg.cc:257
+#: src/skins/skins_cfg.cc:214 src/skins/skins_cfg.cc:239
 msgid "Fire"
 msgstr "Вогонь"
 
-#: src/skins/skins_cfg.cc:210
+#: src/skins-qt/skins_cfg.cc:233 src/skins/skins_cfg.cc:215
 msgid "Vertical lines"
 msgstr "Вертикальні лінії"
 
-#: src/skins/skins_cfg.cc:214
+#: src/skins-qt/skins_cfg.cc:237 src/skins/skins_cfg.cc:219
 msgid "Lines"
 msgstr "Лінії"
 
-#: src/skins/skins_cfg.cc:215
+#: src/skins-qt/skins_cfg.cc:238 src/skins/skins_cfg.cc:220
 msgid "Bars"
 msgstr "Стовпчики"
 
-#: src/skins/skins_cfg.cc:219
+#: src/skins-qt/skins_cfg.cc:242 src/skins/skins_cfg.cc:224
 msgid "Slowest"
 msgstr "Дуже повільне"
 
-#: src/skins/skins_cfg.cc:220
+#: src/skins-qt/skins_cfg.cc:243 src/skins/skins_cfg.cc:225
 msgid "Slow"
 msgstr "Повільне"
 
-#: src/skins/skins_cfg.cc:221 src/sox-resampler/sox-resampler.cc:152
+#: src/skins-qt/skins_cfg.cc:244 src/skins/skins_cfg.cc:226
+#: src/soxr/sox-resampler.cc:180
 msgid "Medium"
 msgstr "Помірне"
 
-#: src/skins/skins_cfg.cc:222
+#: src/skins-qt/skins_cfg.cc:245 src/skins/skins_cfg.cc:227
 msgid "Fast"
 msgstr "Швидке"
 
-#: src/skins/skins_cfg.cc:223
+#: src/skins-qt/skins_cfg.cc:246 src/skins/skins_cfg.cc:228
 msgid "Fastest"
-msgstr "Дуже швидке"
+msgstr "Найшвидше"
 
-#: src/skins/skins_cfg.cc:227
+#: src/skins-qt/skins_cfg.cc:250 src/skins/skins_cfg.cc:232
 msgid "Dots"
 msgstr "Точки"
 
-#: src/skins/skins_cfg.cc:228
+#: src/skins-qt/skins_cfg.cc:251 src/skins/skins_cfg.cc:233
 msgid "Line"
 msgstr "Лінія"
 
-#: src/skins/skins_cfg.cc:229
+#: src/skins-qt/skins_cfg.cc:252 src/skins/skins_cfg.cc:234
 msgid "Solid"
 msgstr "Суцільна"
 
-#: src/skins/skins_cfg.cc:235
+#: src/skins-qt/skins_cfg.cc:258 src/skins/skins_cfg.cc:240
 msgid "Ice"
 msgstr "Лід"
 
-#: src/skins/skins_cfg.cc:240
+#: src/skins-qt/skins_cfg.cc:263 src/skins/skins_cfg.cc:245
 msgid "Smooth"
 msgstr "Плавний"
 
-#: src/skins/skins_cfg.cc:244
-msgid "Type"
-msgstr "Тип"
-
-#: src/skins/skins_cfg.cc:245
-msgid "Visualization type:"
-msgstr "Тип візуалізації:"
-
-#: src/skins/skins_cfg.cc:248
-msgid "Analyzer"
-msgstr "Аналізатор"
-
-#: src/skins/skins_cfg.cc:249
-msgid "Show peaks"
-msgstr "Показувати піки"
-
-#: src/skins/skins_cfg.cc:251
+#: src/skins-qt/skins_cfg.cc:267 src/skins/skins_cfg.cc:249
 msgid "Coloring:"
 msgstr "Забарвлення:"
 
-#: src/skins/skins_cfg.cc:254
+#: src/skins-qt/skins_cfg.cc:270 src/skins/skins_cfg.cc:252
 msgid "Style:"
 msgstr "Стиль:"
 
-#: src/skins/skins_cfg.cc:257
+#: src/skins-qt/skins_cfg.cc:273 src/skins/skins_cfg.cc:255
 msgid "Falloff:"
 msgstr "Спад"
 
-#: src/skins/skins_cfg.cc:260
+#: src/skins-qt/skins_cfg.cc:276 src/skins/skins_cfg.cc:258
 msgid "Peak falloff:"
-msgstr "Спад піку:"
+msgstr "Спадання часового піку"
 
-#: src/skins/skins_cfg.cc:264
+#: src/skins-qt/skins_cfg.cc:282 src/skins/skins_cfg.cc:264
 msgid "Scope Style:"
 msgstr "Стиль осцилограми:"
 
-#: src/skins/skins_cfg.cc:267
+#: src/skins-qt/skins_cfg.cc:285 src/skins/skins_cfg.cc:267
 msgid "Voiceprint Coloring:"
 msgstr "Забарвлення спектрограми:"
 
-#: src/skins/skins_cfg.cc:270
+#: src/skins-qt/skins_cfg.cc:288 src/skins/skins_cfg.cc:270
 msgid "VU Meter Style:"
 msgstr "Стиль VU-вимірювача:"
 
-#: src/skins/skins_cfg.cc:276
-msgid "General"
-msgstr "Загальне"
-
-#: src/skins/skins_cfg.cc:277
-msgid "Visualization"
-msgstr "Візуалізація"
-
-#: src/skins/ui_equalizer.cc:282
-msgid "Preamp"
-msgstr "Попередній підсилювач"
-
-#: src/skins/ui_equalizer.cc:286
-msgid "31 Hz"
-msgstr "31 Гц"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "63 Hz"
-msgstr "63 Гц"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "125 Hz"
-msgstr "125 Гц"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "250 Hz"
-msgstr "250 Гц"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "500 Hz"
-msgstr "500 Гц"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "1 kHz"
-msgstr "1 кГц"
-
-#: src/skins/ui_equalizer.cc:288
-msgid "2 kHz"
-msgstr "2 кГц"
-
-#: src/skins/ui_equalizer.cc:288
-msgid "4 kHz"
-msgstr "4 кГц"
-
-#: src/skins/ui_equalizer.cc:288
-msgid "8 kHz"
-msgstr "8 кГц"
-
-#: src/skins/ui_equalizer.cc:288
-msgid "16 kHz"
-msgstr "16 кГц"
-
-#: src/skins/ui_equalizer.cc:330
-msgid "Audacious Equalizer"
-msgstr "Еквалайзер Audacious"
-
-#: src/skins/ui_main.cc:688
-#, c-format
-msgid "Seek to %d:%-2.2d / %d:%-2.2d"
-msgstr "Перехід до %d:%-2.2d / %d:%-2.2d"
-
-#: src/skins/ui_main.cc:709
-#, c-format
-msgid "Volume: %d%%"
-msgstr "Гучність: %d%%"
-
-#: src/skins/ui_main.cc:732
-#, c-format
-msgid "Balance: %d%% left"
-msgstr "Баланс: %d%% вліво"
-
-#: src/skins/ui_main.cc:734
-msgid "Balance: center"
-msgstr "Баланс: центр"
-
-#: src/skins/ui_main.cc:736
-#, c-format
-msgid "Balance: %d%% right"
-msgstr "Баланс: %d%% вправо"
-
-#: src/skins/ui_main.cc:842
-msgid "Options Menu"
-msgstr "Меню опцій"
-
-#: src/skins/ui_main.cc:846
-msgid "Disable 'Always On Top'"
-msgstr "Вимкнути відображення над іншими вікнами"
-
-#: src/skins/ui_main.cc:848
-msgid "Enable 'Always On Top'"
-msgstr "Відображати над іншими вікнами"
-
-#: src/skins/ui_main.cc:851
-msgid "File Info Box"
-msgstr "Редактор інформації про доріжку"
-
-#: src/skins/ui_main.cc:857
-msgid "Visualizations"
-msgstr ""
-
-#: src/skins/ui_main.cc:1336
-msgid "Repeat point A set."
-msgstr "Точку повтору A встановлено."
-
-#: src/skins/ui_main.cc:1341
-msgid "Repeat point B set."
-msgstr "Точку повтору B встановлено."
-
-#: src/skins/ui_main.cc:1350
-msgid "Repeat points cleared."
-msgstr "Точки повтору скинуті."
-
-#: src/skins/ui_playlist.cc:219
-msgid "Search entries in active playlist"
-msgstr "Пошук в активному списку відтворення"
-
-#: src/skins/ui_playlist.cc:226
-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.cc:234
-msgid "Title:"
-msgstr ""
-
-#: src/skins/ui_playlist.cc:241
-msgid "Album:"
-msgstr ""
-
-#: src/skins/ui_playlist.cc:248
-msgid "Artist:"
-msgstr ""
-
-#: src/skins/ui_playlist.cc:255
-msgid "File Name:"
-msgstr ""
-
-#: src/skins/ui_playlist.cc:263
-msgid "Clear previous selection before searching"
-msgstr "Зняти попереднє виділення перед пошуком"
+#: src/skins-qt/skins_cfg.cc:294 src/skins/skins_cfg.cc:276
+msgid "Type"
+msgstr "Тип"
 
-#: src/skins/ui_playlist.cc:266
-msgid "Automatically toggle queue for matching entries"
-msgstr "Автоматично перемикати стан черги знайдених елементів"
+#: src/skins-qt/skins_cfg.cc:295 src/skins/skins_cfg.cc:277
+msgid "Visualization type:"
+msgstr "Тип візуалізації:"
 
-#: src/skins/ui_playlist.cc:269
-msgid "Create a new playlist with matching entries"
-msgstr "Виділити знайдене в новий список відтворення"
+#: src/skins-qt/skins_cfg.cc:298 src/skins/skins_cfg.cc:280
+msgid "Analyzer"
+msgstr "Аналізатор"
 
-#: src/skins/ui_playlist.cc:717
-msgid "Audacious Playlist Editor"
-msgstr "Редактор списків відтворення Audacious"
+#: src/skins-qt/skins_cfg.cc:299 src/skins/skins_cfg.cc:281
+msgid "Show peaks"
+msgstr "Показувати піки часу"
 
-#: src/skins/ui_playlist.cc:752
-#, c-format
-msgid "%s (%d of %d)"
-msgstr "%s (%d із %d)"
+#: src/skins-qt/skins_cfg.cc:308 src/skins/skins_cfg.cc:290
+msgid "Visualization"
+msgstr "Візуалізація"
 
-#: src/skins/ui_skinselector.cc:167
+#: src/skins-qt/skinselector.cc:98 src/skins/skinselector.cc:111
 msgid "Archived Winamp 2.x skin"
-msgstr "Заархівований жупан Winamp 2.x"
+msgstr "Заархівлений жупан Winamp 2.x"
 
-#: src/skins/ui_skinselector.cc:172
+#: src/skins-qt/skinselector.cc:102 src/skins/skinselector.cc:115
 msgid "Unarchived Winamp 2.x skin"
-msgstr "Неархівований жупан Winamp 2.x"
-
-#: src/skins/util.cc:430
-#, c-format
-msgid "Could not create directory (%s): %s\n"
-msgstr "Неможливо створити теку (%s): %s\n"
+msgstr "Розархівлений жупан Winamp 2.x"
 
-#: src/sndfile/plugin.cc:39
+#: src/sndfile/plugin.cc:38
 msgid "Sndfile Plugin"
-msgstr "Плаґін Sndfile"
+msgstr "Втулок Sndfile"
 
-#: src/sndfile/plugin.cc:336
+#: src/sndfile/plugin.cc:372
 msgid ""
 "Based on the xmms_sndfile plugin:\n"
 "Copyright (C) 2000, 2002 Erik de Castro Lopo\n"
@@ -3929,7 +4187,7 @@
 "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"
+"Автор втулку — Тоні Врун <chainsaw@gentoo.org>.\n"
 "\n"
 "За основу взято xmms_sndfile,\n"
 "написаний у 2000–2002 роках Еріком де Кастро Лопо.\n"
@@ -3951,94 +4209,113 @@
 "Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA "
 "02110-1301, USA"
 
-#: src/sndio-ng/sndio.cc:44
+#: src/sndio/sndio.cc:43
 msgid "Sndio Output"
-msgstr ""
+msgstr "Вивід Sndio"
 
-#: src/sndio-ng/sndio.cc:98
+#: src/sndio/sndio.cc:98
 msgid "Device (blank for default):"
-msgstr ""
+msgstr "Пристрій (полиште для всталених налаштувань):"
 
-#: src/sndio-ng/sndio.cc:100
+#: src/sndio/sndio.cc:100
 msgid "Save and restore volume:"
-msgstr ""
+msgstr "Зберегти та відновити гучність:"
 
-#: src/sndio-ng/sndio.cc:181
+#: src/sndio/sndio.cc:181
 #, c-format
 msgid "Sndio error: Unsupported audio format (%d)"
-msgstr ""
+msgstr "Хиба sndio: звуковий формат не має підтримування (%d)"
 
-#: src/sndio-ng/sndio.cc:192
+#: src/sndio/sndio.cc:192
 msgid "Sndio error: sio_open() failed"
-msgstr ""
+msgstr "Хиба sndio: невдача sio_open() "
 
-#: src/sndio-ng/sndio.cc:222
+#: src/sndio/sndio.cc:221
 msgid "Sndio error: sio_setpar() failed"
-msgstr ""
+msgstr "Хиба sndio: невдача sio_setpar()"
 
-#: src/sndio-ng/sndio.cc:234
+#: src/sndio/sndio.cc:233
 msgid "Sndio error: sio_start() failed"
-msgstr ""
+msgstr "Хиба sndio: невдача sio_start()"
 
-#: src/song_change/song_change.cc:33
+#: src/songchange/song_change.cc:30
 msgid "Song Change"
-msgstr "Зміна доріжки"
+msgstr "Зміна стежки"
 
-#: src/song_change/song_change.cc:342
-msgid ""
-"Parameters passed to the shell should be encapsulated in "
-"quotes. Doing otherwise is a security risk."
-msgstr ""
-"Параметри подавати слід у лапках. Робити інакше "
-"небезпечно для системи."
-
-#: src/song_change/song_change.cc:358
+#: src/songchange/song_change.cc:256
 msgid "Commands"
-msgstr ""
+msgstr "Команди"
 
-#: src/song_change/song_change.cc:360
+#: src/songchange/song_change.cc:258
 msgid "Command to run when starting a new song:"
+msgstr "Наказати програвання за початком нової пісні:"
+
+#: src/songchange/song_change.cc:261
+msgid "Command to run when stopping a song:"
 msgstr ""
 
-#: src/song_change/song_change.cc:364
+#: src/songchange/song_change.cc:264
 msgid "Command to run at the end of a song:"
-msgstr ""
+msgstr "Оберіть команду, яку задіяти наприкінці пісні:"
 
-#: src/song_change/song_change.cc:368
+#: src/songchange/song_change.cc:267
 msgid "Command to run at the end of the playlist:"
-msgstr ""
+msgstr "Оберіть команду, яку задіяти наприкінці списку відтворення:"
 
-#: src/song_change/song_change.cc:372
+#: src/songchange/song_change.cc:270
 msgid "Command to run when song title changes (for network streams):"
 msgstr ""
+"Оберіть команду, яку задіяти коли змінюється назва пісні (для стримового "
+"прослуховування):"
 
-#: src/song_change/song_change.cc:376
+#: src/songchange/song_change.cc:273
 msgid ""
-"You can use the following format strings which will be substituted before "
-"calling the command (not all are useful for the end-of-playlist command):\n"
-"\n"
-"%F: Frequency (in hertz)\n"
+"You can use the following format codes, which will be replaced before "
+"running the command.\n"
+"Not all are useful though for the song-stopped or end-of-playlist command."
+msgstr ""
+
+#: src/songchange/song_change.cc:276
+msgid ""
+"%a: Artist\n"
+"%b: Album\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"
+"%F: Frequency (Hertz)\n"
+"%l: Length (milliseconds)\n"
+"%n or %s: Formatted title (see playlist settings)\n"
 "%p: Currently playing (1 or 0)\n"
-"%a: Artist\n"
-"%b: Album\n"
-"%T: Track title"
-msgstr ""
-
-#: src/song-info-qt/song-info.cc:32
-msgid "Song Info (Qt)"
-msgstr ""
+"%r: Rate (bits per second)\n"
+"%t: Playlist position\n"
+"%T: Title (unformatted)"
+msgstr ""
+"%a: Виконавець\n"
+"%b: Альбом\n"
+"%c: Кількість каналів\n"
+"%f: Назва файлу (весь шлях)\n"
+"%F: Частота (Герців)\n"
+"%l: Довжина (мілісекунд)\n"
+"%n або %s: Змінена назва (див. налаштування списку відтворення)\n"
+"%p: Наразі грає (1 або 0)\n"
+"%r: Рівень (бітів на секунду)\n"
+"%t: Положення списку відтворення\n"
+"%T: Назва (незмінена)"
+
+#: src/songchange/song_change.cc:287
+msgid ""
+"Parameters passed to the shell should be enclosed in quotation marks.\n"
+"Unquoted parameters may lead to unexpected results."
+msgstr ""
+
+#: src/song-info-qt/song-info.cc:30
+msgid "Song Info"
+msgstr "Інформація про композицію"
 
-#: src/sox-resampler/sox-resampler.cc:44
+#: src/soxr/sox-resampler.cc:44
 msgid "SoX Resampler"
 msgstr "Ресемплер SoX"
 
-#: src/sox-resampler/sox-resampler.cc:144
+#: src/soxr/sox-resampler.cc:172
 msgid ""
 "SoX Resampler Plugin for Audacious\n"
 "Copyright 2013 Michał Lipski\n"
@@ -4046,99 +4323,147 @@
 "Based on Sample Rate Converter Plugin:\n"
 "Copyright 2010-2012 John Lindgren"
 msgstr ""
-"Модуль ресемплера SoX для Audacious\n"
+"Втулок ресемплеру SoX для Audacious\n"
 "Авторське право 2013 Michał Lipski\n"
 "\n"
-"Базується на коді модуля Sample Rate Converter:\n"
+"Базується на кодові втулку Sample Rate Converter:\n"
 "Авторське право 2010-2012 John Lindgren"
 
-#: src/sox-resampler/sox-resampler.cc:150
+#: src/soxr/sox-resampler.cc:178
 msgid "Quick"
 msgstr "Швидка"
 
-#: src/sox-resampler/sox-resampler.cc:151
+#: src/soxr/sox-resampler.cc:179
 msgid "Low"
 msgstr "Низька"
 
-#: src/sox-resampler/sox-resampler.cc:153
+#: src/soxr/sox-resampler.cc:181
 msgid "High"
 msgstr "Висока"
 
-#: src/sox-resampler/sox-resampler.cc:154
+#: src/soxr/sox-resampler.cc:182
 msgid "Very High"
 msgstr "Дуже висока"
 
-#: src/sox-resampler/sox-resampler.cc:158
+#: src/soxr/sox-resampler.cc:183
+msgid "Ultra High"
+msgstr "Найвища"
+
+#: src/soxr/sox-resampler.cc:187
+msgid "Minimum"
+msgstr "Мінімальна"
+
+#: src/soxr/sox-resampler.cc:188
+msgid "Intermediate"
+msgstr "Середня"
+
+#: src/soxr/sox-resampler.cc:193
 msgid "Quality:"
 msgstr "Якість:"
 
-#: src/speed-pitch/speed-pitch.cc:51
+#: src/soxr/sox-resampler.cc:196
+msgid "Phase:"
+msgstr "Фейзер:"
+
+#: src/soxr/sox-resampler.cc:200
+msgid "Allow aliasing"
+msgstr "Дозволити аліаси"
+
+#: src/soxr/sox-resampler.cc:202
+msgid "Use steep filter"
+msgstr "Використовувати стрімкий фільтр"
+
+#: src/speedpitch/speed-pitch.cc:54
 msgid "Speed and Pitch"
-msgstr "Швидкість та висота"
+msgstr "Швидкість i частота"
 
-#: src/speed-pitch/speed-pitch.cc:210
-msgid "Speed and Pitch"
-msgstr "Швидкість та висота"
+#: src/speedpitch/speed-pitch.cc:247
+msgid "Speed"
+msgstr "Швидкість"
 
-#: src/speed-pitch/speed-pitch.cc:211
-msgid "Speed:"
-msgstr "Швидкість:"
+#: src/speedpitch/speed-pitch.cc:248
+msgid "Decouple from pitch"
+msgstr "Подiл по частотi"
 
-#: src/speed-pitch/speed-pitch.cc:214
-msgid "Pitch:"
-msgstr "Висота:"
+#: src/speedpitch/speed-pitch.cc:250 src/speedpitch/speed-pitch.cc:258
+msgid "Multiplier:"
+msgstr "Множник:"
 
-#: src/statusicon/statusicon.cc:47
-msgid "Status Icon"
-msgstr "Значок у лотку"
+#: src/speedpitch/speed-pitch.cc:254
+msgid "Pitch"
+msgstr "Частота"
 
-#: src/statusicon/statusicon.cc:283
-msgid "Se_ttings ..."
-msgstr "Н_алаштування ..."
+#: src/statusicon-qt/statusicon.cc:45 src/statusicon/statusicon.cc:47
+msgid "Status Icon"
+msgstr "Значок у смужці стану"
 
-#: src/statusicon/statusicon.cc:372
+#: src/statusicon-qt/statusicon.cc:68
 msgid ""
-"Status Icon Plugin\n"
+"Status Icon Plugin (partial port for Qt interface)\n"
 "\n"
 "Copyright 2005-2007 Giacomo Lozito <james@develia.org>\n"
 "Copyright 2010 Michał Lipski <tallica@o2.pl>\n"
+"Copyright 2015 Eugene Paskevich <eugene@raptor.kiev.ua>\n"
 "\n"
 "This plugin provides a status icon, placed in\n"
 "the system tray area of the window manager."
 msgstr ""
-"Плаґін сповіщення й керування Audacious через системний лоток\n"
+"Втулок смужки стану (частковий порт з інтефейсу Qt)\n"
 "\n"
-"2005–2007 — Джакомо Лоціто <james@develia.org>\n"
-"2010 — Michał Lipski <tallica@o2.pl>"
+"Копірайт 2005-2007 Giacomo Lozito <james@develia.org>\n"
+"Копірайт 2010 Міхайло Липський <tallica@o2.pl>\n"
+"Copyright 2015 Євген Паскевич <eugene@raptor.kiev.ua>\n"
+"\n"
+"Втулок надає ікону стану, яка знаходиться на\n"
+"смужці стану віндовс-менеджеру"
 
-#: src/statusicon/statusicon.cc:379
+#: src/statusicon-qt/statusicon.cc:89 src/statusicon/statusicon.cc:384
 msgid "Mouse Scroll Action"
 msgstr "Дія коліщатка миші"
 
-#: src/statusicon/statusicon.cc:380
+#: src/statusicon-qt/statusicon.cc:90 src/statusicon/statusicon.cc:385
 msgid "Change volume"
 msgstr "Зміна гучності"
 
-#: src/statusicon/statusicon.cc:383
+#: src/statusicon-qt/statusicon.cc:93 src/statusicon/statusicon.cc:388
 msgid "Change playing song"
-msgstr "Зміна поточної доріжки"
+msgstr "Зміна поточної стежки"
 
-#: src/statusicon/statusicon.cc:386
+#: src/statusicon-qt/statusicon.cc:96 src/statusicon/statusicon.cc:391
 msgid "Other Settings"
 msgstr "Інші налаштування"
 
-#: src/statusicon/statusicon.cc:387
+#: src/statusicon-qt/statusicon.cc:97 src/statusicon/statusicon.cc:392
 msgid "Disable the popup window"
 msgstr "Вимкнути спливне вікно"
 
-#: src/statusicon/statusicon.cc:389
+#: src/statusicon-qt/statusicon.cc:99 src/statusicon/statusicon.cc:394
 msgid "Close to the system tray"
-msgstr "Замість закриття згортати до лотка"
+msgstr "Замість закриття згортати до смужки стану"
 
-#: src/statusicon/statusicon.cc:391
+#: src/statusicon-qt/statusicon.cc:101 src/statusicon/statusicon.cc:396
 msgid "Advance in playlist when scrolling upward"
 msgstr "Просуватися списком відтворення при прокручуванні догори"
 
+#: src/statusicon-qt/statusicon.cc:116 src/statusicon/statusicon.cc:287
+msgid "Se_ttings ..."
+msgstr "Н_алаштування ..."
+
+#: src/statusicon/statusicon.cc:377
+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 ""
+"Втулок сповіщення й керування Audacious через смужку стану\n"
+"\n"
+"2005–2007 — Джакомо Лоцито <james@develia.org>\n"
+"2010 — Michał Lipski <tallica@o2.pl>"
+
 #: src/stereo_plugin/stereo.cc:19
 msgid "Extra Stereo"
 msgstr "Розширене стерео"
@@ -4150,26 +4475,166 @@
 "By Johan Levin, 1999"
 msgstr ""
 "Розширене стерео,\n"
-"плаґін написаний у 1999 році (автор — Johan Levin)."
+"втулок написаний у 1999 році (автор — Johan Levin)."
 
 #: src/stereo_plugin/stereo.cc:44
 msgid "Extra Stereo"
 msgstr "Розширене стерео"
 
+#: src/streamtuner/icecast-model.cc:126 src/streamtuner/shoutcast-model.cc:131
+msgid "Type"
+msgstr "Вид"
+
+#: src/streamtuner/icecast-model.cc:132
+msgid "Current Song"
+msgstr "Поточна пісня"
+
+#: src/streamtuner/icecast-model.cc:164
+msgid "Other"
+msgstr "Інша"
+
+#: src/streamtuner/ihr-model.cc:63
+msgid "Market"
+msgstr "Маркет"
+
+#: src/streamtuner/ihr-model.cc:156
+msgid "Call Letters"
+msgstr "Позивні знаки"
+
+#: src/streamtuner/ihr-model.cc:162
+msgid "Description"
+msgstr "Опис"
+
+#: src/streamtuner/shoutcast-model.cc:128
+msgid "Listeners"
+msgstr "Слухачів"
+
+#: src/streamtuner/shoutcast-model.cc:188
+msgid "Top 500 Stations"
+msgstr "Топ 500 станцій"
+
+#: src/streamtuner/shoutcast-model.cc:189
+msgid "Alternative"
+msgstr "Альтернатива"
+
+#: src/streamtuner/shoutcast-model.cc:190
+msgid "Blues"
+msgstr "Блюз"
+
+#: src/streamtuner/shoutcast-model.cc:191
+msgid "Classical"
+msgstr "Класична музика"
+
+#: src/streamtuner/shoutcast-model.cc:192
+msgid "Country"
+msgstr "Кантрі"
+
+#: src/streamtuner/shoutcast-model.cc:193
+msgid "Decades"
+msgstr "Десятиріччя"
+
+#: src/streamtuner/shoutcast-model.cc:194
+msgid "Easy Listening"
+msgstr "Легка музика"
+
+#: src/streamtuner/shoutcast-model.cc:195
+msgid "Electronic"
+msgstr "Електронна"
+
+#: src/streamtuner/shoutcast-model.cc:196
+msgid "Folk"
+msgstr "Народна музика"
+
+#: src/streamtuner/shoutcast-model.cc:197
+msgid "Inspirational"
+msgstr "Яка надихає"
+
+#: src/streamtuner/shoutcast-model.cc:198
+msgid "International"
+msgstr "Міжнаціональна"
+
+#: src/streamtuner/shoutcast-model.cc:199
+msgid "Jazz"
+msgstr "Джаз"
+
+#: src/streamtuner/shoutcast-model.cc:200
+msgid "Latin"
+msgstr "Латинська"
+
+#: src/streamtuner/shoutcast-model.cc:201
+msgid "Metal"
+msgstr "Метал"
+
+#: src/streamtuner/shoutcast-model.cc:203
+msgid "New Age"
+msgstr "Ню-ейдж"
+
+#: src/streamtuner/shoutcast-model.cc:204
+msgid "Pop"
+msgstr "Поп-музика"
+
+#: src/streamtuner/shoutcast-model.cc:205
+msgid "Public Radio"
+msgstr "Громадське радіо"
+
+#: src/streamtuner/shoutcast-model.cc:206
+msgid "R&B and Urban"
+msgstr "Сучасна та R&B"
+
+#: src/streamtuner/shoutcast-model.cc:207
+msgid "Rap"
+msgstr "Реп"
+
+#: src/streamtuner/shoutcast-model.cc:208
+msgid "Reggae"
+msgstr "Реґей"
+
+#: src/streamtuner/shoutcast-model.cc:209
+msgid "Rock"
+msgstr "Рок"
+
+#: src/streamtuner/shoutcast-model.cc:210
+msgid "Seasonal and Holiday"
+msgstr "Святкова та сезонна"
+
+#: src/streamtuner/shoutcast-model.cc:211
+msgid "Soundtracks"
+msgstr "Саундтреки"
+
+#: src/streamtuner/shoutcast-model.cc:212
+msgid "Talk"
+msgstr "Розмовне"
+
+#: src/streamtuner/shoutcast-model.cc:213
+msgid "Themes"
+msgstr "Теми"
+
+#: src/streamtuner/streamtuner.cc:59
+msgid "Shoutcast"
+msgstr "Shoutcast"
+
+#: src/streamtuner/streamtuner.cc:60
+msgid "Icecast"
+msgstr "Icecast"
+
+#: src/streamtuner/streamtuner.cc:71
+msgid "Stream Tuner"
+msgstr "Stream Tuner"
+
 #: src/tonegen/tonegen.cc:45
 msgid "Tone Generator"
 msgstr "Генератор тону"
 
-#: src/tonegen/tonegen.cc:94
+#: src/tonegen/tonegen.cc:92
 #, c-format
 msgid "%s %.1f Hz"
 msgstr "%s %.1f Гц"
 
-#: src/tonegen/tonegen.cc:94
+#: src/tonegen/tonegen.cc:92
 msgid "Tone Generator: "
 msgstr "Генератор тону: "
 
-#: src/tonegen/tonegen.cc:160
+#: src/tonegen/tonegen.cc:161
 msgid ""
 "Sine tone generator by Håvard Kvålen <havardk@xmms.org>\n"
 "Modified by Daniel J. Peng <danielpeng@bigfoot.com>\n"
@@ -4181,17 +4646,38 @@
 "автори: Håvard Kvålen <mys@faveve.uni-stuttgart.de>,\n"
 "Daniel J. Peng <danielpeng@bigfoot.com>.\n"
 "\n"
-"Використовується при відкритті посилання в форматі:\n"
+"Використовується при відкритті ланки у форматі:\n"
 "tone://частота1;частота2;...\n"
 "\n"
 "Наприклад, tone://2000;2005 — послідовне відтворення тонів з частотою 2000 "
 "Гц і 2005 Гц."
 
+#: src/ui-common/dialogs-qt.cc:40
+msgid ""
+"\n"
+"(Further messages have been hidden.)"
+msgstr ""
+"\n"
+"(Наступні повідомлення були приховані.)"
+
+#: src/ui-common/dialogs-qt.cc:52
+msgid "Working ..."
+msgstr "Опрацювання ..."
+
+#: src/ui-common/dialogs-qt.cc:73
+msgid "Information"
+msgstr "Інформація"
+
+#: src/ui-common/menu-ops-gtk.cc:132 src/ui-common/menu-ops-qt.cc:113
+#, c-format
+msgid "%s does not appear to be a valid folder."
+msgstr ""
+
 #: src/voice_removal/voice_removal.cc:28
 msgid "Voice Removal"
 msgstr "Видалення голосу"
 
-#: src/vorbis/vorbis.cc:465
+#: src/vorbis/vorbis.cc:433
 msgid ""
 "Audacious Ogg Vorbis Decoder\n"
 "\n"
@@ -4213,32 +4699,32 @@
 msgstr ""
 "Декодер Ogg Vorbis\n"
 "\n"
-"на основі плаґіну від Xiph.org Foundation:\n"
+"на основі втулку від Xiph.org Foundation:\n"
 "http://www.xiph.org/\n"
 "\n"
-"Автор початкового коду —\n"
-"Tony Arcieri <bascule@inferno.tusculum.edu>\n"
+"Автор джерельного коду —\n"
+"Тоні Арчері <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>"
+"Крис Монтґомері <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.h:18
 msgid "Ogg Vorbis Decoder"
 msgstr "Декодер Ogg Vorbis"
 
-#: src/vtx/info.cc:22
+#: src/vtx/info.cc:24
 #, c-format
 msgid "Details about %s"
-msgstr ""
+msgstr "Більше про %s"
 
-#: src/vtx/info.cc:24
+#: src/vtx/info.cc:26
 msgid ""
 "Title: %t\n"
 "Author: %a\n"
@@ -4252,12 +4738,23 @@
 "Player Freq: %P\n"
 "Year: %y"
 msgstr ""
+"Назва: %t\n"
+"Автор: %a\n"
+"З: %f\n"
+"Трекер: %T\n"
+"Коментар: %C\n"
+"Тип чипу: %c\n"
+"Стерео: %s\n"
+"Зациклення: %l\n"
+"Чипова част.: %F\n"
+"Програвачева част.: %P\n"
+"Рік: %y"
 
 #: src/vtx/vtx.cc:38
 msgid "VTX Decoder"
 msgstr "Декодер VTX"
 
-#: src/vtx/vtx.cc:184
+#: src/vtx/vtx.cc:178
 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"
@@ -4266,21 +4763,65 @@
 "Відтворювач файлів Vortex Сашнова Олександра <sashnov@ngs.ru>.\n"
 "За основу взято in_vtx.dll Романа Щербакова <v_soft@microfor.ru>.\n"
 "\n"
-"Плаґін для Audacious створив Павел Виметалек <pvymetalek@seznam.cz>."
+"Втулок для Audacious'у створив Павел Виметалек <pvymetalek@seznam.cz>."
+
+#: src/vumeter-qt/vumeter_qt.cc:31
+msgid ""
+"VU Meter Plugin for Audacious\n"
+"Copyright 2017-2019 Marc Sánchez Fauste"
+msgstr ""
+"VU Meter Plugin для Audacious\n"
+"Copyright 2017-2019 Marc Sánchez Fauste"
+
+#: src/vumeter-qt/vumeter_qt.cc:35
+msgid "VU Meter Settings"
+msgstr "Налаштування VU Meter"
+
+#: src/vumeter-qt/vumeter_qt.cc:37
+msgid "Peak hold time:"
+msgstr "Час тримання піку:"
+
+#: src/vumeter-qt/vumeter_qt.cc:42
+msgid "Fall-off time:"
+msgstr "Час спадання:"
+
+#: src/vumeter-qt/vumeter_qt.cc:44
+msgid "dB/second"
+msgstr "дБ/сек"
 
-#: src/wavpack/wavpack.cc:24
+#: src/vumeter-qt/vumeter_qt.cc:46
+msgid "Display legend"
+msgstr "Відображати легенду"
+
+#: src/vumeter-qt/vumeter_qt.h:37
+msgid "VU Meter"
+msgstr "VU Meter"
+
+#: src/waveout/waveout.cc:43
+msgid "Win32 waveOut"
+msgstr "Win32 waveOut"
+
+#: src/waveout/waveout.cc:69
+msgid ""
+"Win32 waveOut Plugin for Audacious\n"
+"Copyright 2016 John Lindgren"
+msgstr ""
+"Втулок Win32 waveOut для Audacious\n"
+"Copyright 2016 Джон Ліндґрен"
+
+#: src/wavpack/wavpack.cc:25
 msgid "WavPack Decoder"
 msgstr "Декодер WavPack"
 
-#: src/wavpack/wavpack.cc:211
+#: src/wavpack/wavpack.cc:217
 msgid "lossy (hybrid)"
-msgstr "зі втратами (гібрид)"
+msgstr "з втратами (гібрид)"
 
-#: src/wavpack/wavpack.cc:213
+#: src/wavpack/wavpack.cc:219
 msgid "lossy"
-msgstr "зі втратами"
+msgstr "з втратами"
 
-#: src/wavpack/wavpack.cc:255
+#: src/wavpack/wavpack.cc:259
 msgid ""
 "Copyright 2006 William Pitcock <nenolod@nenolod.net>\n"
 "\n"
@@ -4288,20 +4829,40 @@
 msgstr ""
 "Автор — Вільям Піткок <nenolod@nenolod.net> (2006 рік).\n"
 "\n"
-"Деякий код написав Майлс Еґан."
+"Деякий код написав Майлс Еґен."
 
-#: src/xsf/plugin.cc:50
+#: src/xsf/plugin.cc:74
 msgid "2SF Decoder"
 msgstr "Декодер 2SF"
 
-#: src/xsf/plugin.cc:238
+#: src/xsf/plugin.cc:429
+msgid "32728 Hz"
+msgstr ""
+
+#: src/xsf/plugin.cc:432
+msgid "65456 Hz"
+msgstr ""
+
+#: src/xsf/plugin.cc:438
+msgid "Cosine"
+msgstr ""
+
+#: src/xsf/plugin.cc:439
+msgid "Sharp"
+msgstr ""
+
+#: src/xsf/plugin.cc:443
 msgid "XSF Configuration"
+msgstr "Конфіґурація XSF"
+
+#: src/xsf/plugin.cc:445
+msgid "Default fade time:"
 msgstr ""
 
-#: src/xsf/plugin.cc:239
-msgid "Ignore length from file"
+#: src/xsf/plugin.cc:447
+msgid "Interpolation mode:"
 msgstr ""
 
-#: src/xspf/xspf.cc:89
+#: src/xspf/xspf.cc:95
 msgid "XML Shareable Playlists (XSPF)"
 msgstr "XML-списки відтворення (XSPF)"

audacious-plugins-4.4.1.tar.bz2/po/uz.po Added

@@ -0,0 +1,4789 @@
+# Uzbek translation for Audacious Plugins
+# Copyright (C) Audacious translators
+# This file is distributed under the same license as the Audacious Plugins package.
+#
+# Translators:
+# Umidjon Almasov <umidjon@almasov.uz>, 2022
+# Umidjon Almasov <umidjon@almasov.uz>, 2013
+# Umidjon Almasov <umidjon@almasov.uz>, 2022
+# 9ce67d7e9a84f219fd63ae516bbe9dee_5a4e663 <a742c1cf3329adaf6cfd74d7f32449f9_621413>, 2022
+msgid ""
+msgstr ""
+"Project-Id-Version: Audacious Plugins\n"
+"Report-Msgid-Bugs-To: https://github.com/audacious-media-player/audacious/"
+"issues\n"
+"POT-Creation-Date: 2024-09-26 21:54+0200\n"
+"PO-Revision-Date: 2011-10-10 17:43+0000\n"
+"Last-Translator: Umidjon Almasov <umidjon@almasov.uz>, 2022\n"
+"Language-Team: Uzbek (http://app.transifex.com/audacious/audacious/language/"
+"uz/)\n"
+"Language: uz\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: src/aac/aac.cc:19
+msgid "AAC (Raw) Decoder"
+msgstr "AAC (Raw) dekoder"
+
+#: src/adplug/adplug-xmms.cc:70
+msgid "AdPlug (AdLib Player)"
+msgstr "AdPlug (AdLib pleyer)"
+
+#: src/adplug/adplug-xmms.cc:167 src/modplug/modplugbmp.cc:321
+#: src/psf/plugin.cc:161 src/vtx/vtx.cc:89 src/xsf/plugin.cc:204
+msgid "sequenced"
+msgstr "ketma-ket"
+
+#: src/adplug/adplug-xmms.cc:349 src/sid/xs_config.cc:61
+msgid "Output"
+msgstr "Chiqarish"
+
+#: src/adplug/adplug-xmms.cc:350
+msgid "OPL Emulator:"
+msgstr "OPL emulyatori:"
+
+#: src/adplug/adplug-xmms.cc:353 src/amidiplug/i_configure.cc:153
+#: src/console/plugin.cc:45 src/filewriter/filewriter.cc:481
+#: src/sid/xs_config.cc:65 src/xsf/plugin.cc:446
+msgid "Sample rate:"
+msgstr "Namuna tezligi:"
+
+#: src/adplug/adplug-xmms.cc:354 src/amidiplug/i_configure.cc:155
+#: src/bs2b/plugin.cc:141 src/console/plugin.cc:47
+#: src/modplug/plugin_main.cc:77 src/resample/resample.cc:201
+#: src/resample/resample.cc:207 src/resample/resample.cc:211
+#: src/resample/resample.cc:215 src/resample/resample.cc:219
+#: src/resample/resample.cc:223 src/resample/resample.cc:227
+#: src/resample/resample.cc:231 src/resample/resample.cc:235
+#: src/resample/resample.cc:239 src/resample/resample.cc:243
+#: src/sid/xs_config.cc:67 src/soxr/sox-resampler.cc:205
+msgid "Hz"
+msgstr "Gts"
+
+#: src/adplug/adplug-xmms.cc:355 src/gtkui/settings.cc:55
+#: src/modplug/plugin_main.cc:105 src/qtui/settings.cc:85
+#: src/skins-qt/skins_cfg.cc:302 src/skins/skins_cfg.cc:284
+msgid "Miscellaneous"
+msgstr "Turli xil"
+
+#: src/adplug/adplug-xmms.cc:356
+msgid "Repeat song in endless loop"
+msgstr "Qo'shiqni cheksiz siklda takrorlash"
+
+#: src/albumart/albumart.cc:31 src/albumart-qt/albumart.cc:35
+msgid "Album Art"
+msgstr "Albom qoplamasi"
+
+#: src/alsa/alsa.h:64
+msgid "ALSA Output"
+msgstr "ALSA chiqishi"
+
+#: src/alsa/config.cc:28
+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 ""
+"Audacious uchun ALSA chiqish plagini\n"
+"Mualliflik huquqi 2009-2012 Jon Lindgren\n"
+"\n"
+"ALSA qoʻllanmasi yetarli boʻlmaganda kodi maʼlumotnoma boʻlib xizmat qilgan "
+"ALSA Output Plugin NG muallifi Uilyam Pitkokka rahmat."
+
+#: src/alsa/config.cc:61
+msgid "(no description)"
+msgstr "(tavsif yo'q)"
+
+#: src/alsa/config.cc:166
+msgid "Default PCM device"
+msgstr "Standart PCM qurilmasi"
+
+#: src/alsa/config.cc:188
+msgid "Default mixer device"
+msgstr "Standart mikser qurilmasi"
+
+#: src/alsa/config.cc:296
+msgid "PCM device:"
+msgstr "PCM qurilmasi:"
+
+#: src/alsa/config.cc:299
+msgid "Mixer device:"
+msgstr "Mikser qurilmasi:"
+
+#: src/alsa/config.cc:302
+msgid "Mixer element:"
+msgstr "Mikser elementi:"
+
+#: src/amidiplug/amidi-plug.cc:42
+msgid "AMIDI-Plug (MIDI Player)"
+msgstr "AMIDI-Plug (MIDI pleyer)"
+
+#: src/amidiplug/amidi-plug.cc:445
+msgid ""
+"AMIDI-Plug\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 ""
+"AMIDI-Plug\n"
+"modulli MIDI musiqa pleyeri\n"
+"http://www.develia.org/projects.php?p=amidiplug\n"
+"\n"
+"Giakomo Lozito tomonidan yozilgan\n"
+"<james@develia.org>\n"
+"\n"
+"alohida rahmat...\n"
+"\n"
+"Klemens Ladish va Yaroslav Kisela\n"
+"aplaymidi va amikser ajoyib dasturlari uchun; bular\n"
+"alsa-lib hujjatlari bilan bir qatorda haqiqatdan ham foydali edi\n"
+"ALSA API haqida ko'proq ma'lumot olish uchun\n"
+"\n"
+"Alfredo Spadafina\n"
+"Chiroyli midi klaviatura logotipi uchun\n"
+"\n"
+"Toni Vroon\n"
+"alfa sinovida yaxshi yordam uchun"
+
+#: src/amidiplug/i_configure.cc:94
+msgid "Override default gain:"
+msgstr "Standart kuchayishni o'zgartirish"
+
+#: src/amidiplug/i_configure.cc:102
+msgid "Override default polyphony:"
+msgstr "Standart polifoniyani o'zgartirish:"
+
+#: src/amidiplug/i_configure.cc:110
+msgid "Override default reverb:"
+msgstr "Standart reverberatsiyani o'zgartirish:"
+
+#: src/amidiplug/i_configure.cc:112 src/amidiplug/i_configure.cc:120
+msgid "On"
+msgstr "Yoqilgan"
+
+#: src/amidiplug/i_configure.cc:118
+msgid "Override default chorus:"
+msgstr "Standart xorni o'zgartirish:"
+
+#: src/amidiplug/i_configure.cc:128 src/console/plugin.cc:29
+msgid "Playback"
+msgstr "Ijro"
+
+#: src/amidiplug/i_configure.cc:129
+msgid "Transpose:"
+msgstr "Ko'chirish:"
+
+#: src/amidiplug/i_configure.cc:131 src/speedpitch/speed-pitch.cc:257
+msgid "semitones"
+msgstr "yarim tonlar"
+
+#: src/amidiplug/i_configure.cc:132
+msgid "Drum shift:"
+msgstr "Baraban almashinuvi:"
+
+#: src/amidiplug/i_configure.cc:134
+msgid "note numbers"
+msgstr "raqamlarga e'tibor berish"
+
+#: src/amidiplug/i_configure.cc:135
+msgid "Skip leading silence"
+msgstr "Oldingi jimlikni o'tkazib yuborish"
+
+#: src/amidiplug/i_configure.cc:137
+msgid "Skip trailing silence"
+msgstr "Keyingi jimlikni o'tkazib yuborish"
+
+#: src/amidiplug/i_configure.cc:141
+msgid "SoundFont"
+msgstr "SoundFont"
+
+#: src/amidiplug/i_configure.cc:148
+msgid "Synthesizer"
+msgstr "Sintezator"
+
+#: src/amidiplug/i_configure-fluidsynth.cc:58
+#: src/amidiplug/i_configure-fluidsynth.cc:527
+msgid "AMIDI-Plug - select SoundFont file"
+msgstr "AMIDI-Plug - SoundFont faylini tanlang"
+
+#: src/amidiplug/i_configure-fluidsynth.cc:61
+msgid "_Cancel"
+msgstr "_Bekor qilish"
+
+#: src/amidiplug/i_configure-fluidsynth.cc:62
+msgid "_Open"
+msgstr "_Ochish"
+
+#: src/amidiplug/i_configure-fluidsynth.cc:233
+#: src/amidiplug/i_configure-fluidsynth.cc:461
+msgid "File name"
+msgstr "Fayl nomi"
+
+#: src/amidiplug/i_configure-fluidsynth.cc:237
+#: src/amidiplug/i_configure-fluidsynth.cc:464
+msgid "Size (bytes)"
+msgstr "Hajmi (bayt)"
+
+#: src/amidiplug/i_fileinfo.cc:184
+msgid "Name:"
+msgstr "Nomi:"
+
+#: src/amidiplug/i_fileinfo.cc:202
+msgid " MIDI Info "
+msgstr "MIDI haqida ma'lumot"
+
+#: src/amidiplug/i_fileinfo.cc:216
+msgid "Format:"
+msgstr "Format:"
+
+#: src/amidiplug/i_fileinfo.cc:219
+msgid "Length (msec):"
+msgstr "Uzunlik (msek):"
+
+#: src/amidiplug/i_fileinfo.cc:222
+msgid "No. of Tracks:"
+msgstr "Qo'shiqlar raqami:"
+
+#: src/amidiplug/i_fileinfo.cc:228
+msgid "variable"
+msgstr "o'zgaruvchan"
+
+#: src/amidiplug/i_fileinfo.cc:230
+msgid "BPM:"
+msgstr "BPM:"
+
+#: src/amidiplug/i_fileinfo.cc:238
+msgid "BPM (wavg):"
+msgstr "BPM (wavg):"
+
+#: src/amidiplug/i_fileinfo.cc:241
+msgid "Time Div:"
+msgstr "Vaqt taqsimoti:"
+
+#: src/amidiplug/i_fileinfo.cc:252
+msgid " MIDI Comments and Lyrics "
+msgstr "MIDI izohlari va matni"
+
+#: src/amidiplug/i_fileinfo.cc:299
+msgid "* no comments available in this MIDI file *"
+msgstr "* ushbu MIDI faylida hech qanday izoh mavjud emas *"
+
+#: src/amidiplug/i_fileinfo.cc:311
+msgid "* no lyrics available in this MIDI file *"
+msgstr "* ushbu MIDI faylda hech qanday matn mavjud emas *"
+
+#: src/amidiplug/i_fileinfo.cc:321 src/ladspa/plugin.cc:418
+#: src/ui-common/dialogs-qt.cc:32
+msgid "_Close"
+msgstr "_Yopish"
+
+#: src/amidiplug/i_fileinfo.cc:346
+msgid " (invalid UTF-8)"
+msgstr "(yaroqsiz UTF-8)"
+
+#: src/ampache/ampache.cc:33
+msgid "Ampache Browser"
+msgstr "Ampache brauzeri"
+
+#: src/ampache/ampache.cc:46
+msgid ""
+"Ampache Browser for Audacious\n"
+"http://ampache-browser.org/\n"
+"\n"
+"Copyright (C) Róbert Čerňanský and John Lindgren\n"
+"License: GNU GPLv3"
+msgstr ""
+"Audacious uchun Ampache brauzeri\n"
+"http://ampache-browser.org/\n"
+"\n"
+"Mualliflik huquqi (C) Róbert Čerňanski va Jon Lindgren\n"
+"Litsenziya: GNU GPLv3"
+
+#: src/aosd/aosd.cc:31
+msgid ""
+"Audacious OSD\n"
+"http://www.develia.org/projects.php?p=audacious#aosd\n"
+"\n"
+"Written by Giacomo Lozito <james@develia.org>\n"
+"\n"
+"Based in part on Evan Martin's Ghosd library:\n"
+"http://neugierig.org/software/ghosd/"
+msgstr ""
+"Audacious OSD\n"
+"http://www.develia.org/projects.php?p=audacious#aosd\n"
+"\n"
+"Giakomo Lozito tomonidan yozilgan <james@develia.org>\n"
+"\n"
+"Qisman Evan Martinning Ghosd kutubxonasiga asoslangan:\n"
+"http://neugierig.org/software/ghosd/"
+
+#: src/aosd/aosd.h:37
+msgid "AOSD (On-Screen Display)"
+msgstr "AOSD (ekrandagi displey)"
+
+#: src/aosd/aosd_style.cc:54
+msgid "Rectangle"
+msgstr "To'rtburchak"
+
+#: src/aosd/aosd_style.cc:59
+msgid "Rounded Rectangle"
+msgstr "Dumaloq to'rtburchak"
+
+#: src/aosd/aosd_style.cc:64
+msgid "Concave Rectangle"
+msgstr "Botiq to'rtburchak"
+
+#: src/aosd/aosd_style.cc:69 src/openmpt/mptwrap.h:50 src/xsf/plugin.cc:436
+msgid "None"
+msgstr "Yo'q"
+
+#: src/aosd/aosd_trigger.cc:49
+msgid "Playback Start"
+msgstr "Ijroni boshlash"
+
+#: src/aosd/aosd_trigger.cc:50
+msgid "Triggers OSD when a playlist entry is played."
+msgstr "Pleylist yozuvi ijro etilganda OSD ni ishga tushiradi."
+
+#: src/aosd/aosd_trigger.cc:55
+msgid "Title Change"
+msgstr "Sarlavhani o'zgartirish"
+
+#: src/aosd/aosd_trigger.cc:56
+msgid "Triggers OSD when the song title changes (for internet streams)."
+msgstr ""
+"Qo'shiq nomi o'zgarganda OSD ni ishga tushiradi (internet oqimlari uchun)."
+
+#: src/aosd/aosd_trigger.cc:61
+msgid "Pause On"
+msgstr "Pauza yoqilgan"
+
+#: src/aosd/aosd_trigger.cc:62
+msgid "Triggers OSD when playback is paused."
+msgstr "Ijro toʻxtatilganda OSD ni ishga tushiradi."
+
+#: src/aosd/aosd_trigger.cc:67
+msgid "Pause Off"
+msgstr "Pauza oʻchirilgan"
+
+#: src/aosd/aosd_trigger.cc:68
+msgid "Triggers OSD when playback is unpaused."
+msgstr "Ijro davom etganda OSD ni ishga tushiradi."
+
+#: src/aosd/aosd_ui.cc:204
+msgid "Placement"
+msgstr "Joylashuv"
+
+#: src/aosd/aosd_ui.cc:241
+msgid "Relative X offset:"
+msgstr "Nisbiy X ofset:"
+
+#: src/aosd/aosd_ui.cc:245
+msgid "Relative Y offset:"
+msgstr "Nisbiy Y ofset:"
+
+#: src/aosd/aosd_ui.cc:249
+msgid "Max OSD width:"
+msgstr "Maksimal OSD kengligi:"
+
+#: src/aosd/aosd_ui.cc:281
+msgid "Multi-Monitor options"
+msgstr "Ko'p monitorli variantlar"
+
+#: src/aosd/aosd_ui.cc:285
+msgid "Display OSD using:"
+msgstr "OSD ni ko'rsatish:"
+
+#: src/aosd/aosd_ui.cc:287
+msgid "all monitors"
+msgstr "hamma monitorlarda"
+
+#: src/aosd/aosd_ui.cc:290
+#, c-format
+msgid "monitor %i"
+msgstr "%i monitorda"
+
+#: src/aosd/aosd_ui.cc:342
+msgid "Timing (ms)"
+msgstr "Vaqt (ms)"
+
+#: src/aosd/aosd_ui.cc:347
+msgid "Display:"
+msgstr "Displey:"
+
+#: src/aosd/aosd_ui.cc:352
+msgid "Fade in:"
+msgstr "Paydo bo'lish"
+
+#: src/aosd/aosd_ui.cc:357
+msgid "Fade out:"
+msgstr "Yo'qolish"
+
+#: src/aosd/aosd_ui.cc:442
+msgid "Fonts"
+msgstr "Shriftlar"
+
+#: src/aosd/aosd_ui.cc:449
+#, c-format
+msgid "Font %i:"
+msgstr "Shrift %i:"
+
+#: src/aosd/aosd_ui.cc:466
+msgid "Shadow"
+msgstr "Soya"
+
+#: src/aosd/aosd_ui.cc:589
+msgid "Render Style"
+msgstr "Render uslubi"
+
+#: src/aosd/aosd_ui.cc:605
+msgid "Colors"
+msgstr "Ranglar"
+
+#: src/aosd/aosd_ui.cc:616
+#, c-format
+msgid "Color %i:"
+msgstr "Rang %i:"
+
+#: src/aosd/aosd_ui.cc:714
+msgid "Enable trigger"
+msgstr "Triggerni yoqish"
+
+#: src/aosd/aosd_ui.cc:741
+msgid "Event"
+msgstr "Voqea"
+
+#: src/aosd/aosd_ui.cc:768
+msgid "Composite manager detected"
+msgstr "Kompozit boshqaruvchi aniqlandi"
+
+#: src/aosd/aosd_ui.cc:775
+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 boshqaruvchi aniqlanmadi;\n"
+"Agar siz uni ishlayotganini bilmangiz, kompozit boshqaruvchini "
+"faollashtiring, aks holda OSD to‘g‘ri ishlamaydi."
+
+#: src/aosd/aosd_ui.cc:783
+msgid "Composite manager not required for fake transparency"
+msgstr "Soxta shaffoflik uchun kompozit menejer talab qilinmaydi"
+
+#: src/aosd/aosd_ui.cc:820
+msgid "Transparency"
+msgstr "Shaffoflik"
+
+#: src/aosd/aosd_ui.cc:826
+msgid "Fake transparency"
+msgstr "Soxta shaffoflik"
+
+#: src/aosd/aosd_ui.cc:828
+msgid "Real transparency (requires X Composite Ext.)"
+msgstr "Haqiqiy shaffoflik (X Composite Ext. talab qilinadi)"
+
+#: src/aosd/aosd_ui.cc:875
+msgid "Composite extension not loaded"
+msgstr "Kompozit kengaytma yuklanmagan"
+
+#: src/aosd/aosd_ui.cc:892
+#, c-format
+msgid "Audacious OSD"
+msgstr "Audacious OSD"
+
+#: src/aosd/aosd_ui.cc:955
+msgid "Position"
+msgstr "Joy"
+
+#: src/aosd/aosd_ui.cc:960
+msgid "Animation"
+msgstr "Animatsiya"
+
+#: src/aosd/aosd_ui.cc:965
+msgid "Text"
+msgstr "Matn"
+
+#: src/aosd/aosd_ui.cc:970
+msgid "Decoration"
+msgstr "Bezatish"
+
+#: src/aosd/aosd_ui.cc:975
+msgid "Trigger"
+msgstr "Trigger"
+
+#: src/aosd/aosd_ui.cc:980 src/streamtuner/shoutcast-model.cc:202
+msgid "Misc"
+msgstr "Boshqa"
+
+#: src/aosd/aosd_ui.cc:989
+msgid "Test"
+msgstr "Sinov"
+
+#: src/asx3/asx3.cc:35
+msgid "ASXv3 Playlists"
+msgstr "ASXv3 pleylistlari"
+
+#: src/asx/asx.cc:33
+msgid "ASXv1/ASXv2 Playlists"
+msgstr "ASXv1/ASXv2 pleylistlari"
+
+#: src/audpl/audpl.cc:33
+msgid "Audacious Playlists (audpl)"
+msgstr "Audacious pleylistlari (audpl)"
+
+#: src/background_music/background_music.cc:24
+msgid "Background music"
+msgstr ""
+
+#: src/background_music/background_music.cc:25
+msgid "Target level:"
+msgstr ""
+
+#: src/background_music/background_music.cc:28
+#: src/background_music/background_music.cc:33
+#: src/silence-removal/silence-removal.cc:70
+msgid "dB"
+msgstr "dB"
+
+#: src/background_music/background_music.cc:29
+msgid "Maximum amplification:"
+msgstr ""
+
+#: src/background_music/background_music.cc:34 src/mpg123/mpg123.cc:81
+msgid "Advanced"
+msgstr "Kengaytirilgan"
+
+#: src/background_music/background_music.cc:36
+msgid "Slow detection weight:"
+msgstr ""
+
+#: src/background_music/background_music.cc:39
+msgid "Hint"
+msgstr ""
+
+#: src/background_music/background_music.cc:41
+msgid ""
+"Slow detection weight is the relative weight\n"
+"of a long term average detection when compared\n"
+"to the actual, faster loudness detection.\n"
+"A value of zero gives a more radio-like sound\n"
+"where soft passages get \"pulled up\" more quickly,\n"
+"a value of two makes the sound feel less compressed."
+msgstr ""
+
+#: src/background_music/background_music.cc:52
+msgid ""
+"Background Music Plugin for Audacious\n"
+"Copyright 2023;2024 Michel Fleur\n"
+"\n"
+"Controls the volume to make the sound equally loud within and between "
+"tracks.\n"
+" It uses accurate loudness measurement and tries to make the volume changes "
+"sound natural without audible peaks, yet without lowering the volume before "
+"a peak in advance."
+msgstr ""
+
+#: src/background_music/background_music.cc:61
+msgid "Background Music"
+msgstr ""
+
+#: src/bitcrusher/bitcrusher.cc:33
+msgid "Bitcrusher"
+msgstr ""
+
+#: src/bitcrusher/bitcrusher.cc:34
+msgid "Bit Depth:"
+msgstr ""
+
+#: src/bitcrusher/bitcrusher.cc:37
+msgid "Downsample ratio:"
+msgstr ""
+
+#: src/bitcrusher/bitcrusher.cc:48
+msgid "Bitcrusher"
+msgstr ""
+
+#: src/blur_scope/blur_scope.cc:40 src/blur_scope-qt/blur_scope.cc:45
+msgid "Color"
+msgstr "Rang"
+
+#: src/blur_scope/blur_scope.cc:56 src/blur_scope-qt/blur_scope.cc:158
+msgid "Blur Scope"
+msgstr "Blur Scope"
+
+#: src/bs2b/plugin.cc:38
+msgid "Bauer Stereophonic-to-Binaural (BS2B)"
+msgstr "Bauer Stereophonic-to-Binaural (BS2B)"
+
+#: src/bs2b/plugin.cc:129
+msgid "Presets:"
+msgstr "Sozlamalar:"
+
+#: src/bs2b/plugin.cc:130
+msgid "Default"
+msgstr "Standart"
+
+#: src/bs2b/plugin.cc:136
+msgid "Feed level:"
+msgstr "Ta'minot darajasi:"
+
+#: src/bs2b/plugin.cc:138
+msgid "x1/10 dB"
+msgstr "x1/10 dB"
+
+#: src/bs2b/plugin.cc:139
+msgid "Cut frequency:"
+msgstr "Kesish chastotasi:"
+
+#: src/cairo-spectrum/cairo-spectrum.cc:42 src/qt-spectrum/qt-spectrum.cc:107
+msgid "Spectrum Analyzer"
+msgstr "Spektr analizatori"
+
+#: src/cdaudio/cdaudio-ng.cc:74
+msgid "Audio CD Plugin"
+msgstr "Audio CD plagini"
+
+#: src/cdaudio/cdaudio-ng.cc:121
+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 ""
+"Mualliflik huquqi (C) 2007-2012 Calin Crisan <ccrisan@gmail.com> va "
+"boshqalar.\n"
+"\n"
+"Libcdio dasturchilariga katta rahmat <http://www.gnu.org/software/libcdio/>\n"
+"va libcddb dasturchilariga <http://libcddb.sourceforge.net/>.\n"
+"\n"
+"Toni Vroonga ham menga maslahat bergani va yo'l-yo'riq ko'rsatgani uchun "
+"rahmat.\n"
+"\n"
+"Bu Google Summer of Code 2007 loyihasi edi."
+
+#: src/cdaudio/cdaudio-ng.cc:140
+msgid "Device"
+msgstr "Qurilma"
+
+#: src/cdaudio/cdaudio-ng.cc:141
+msgid "Read speed:"
+msgstr "O'qish tezligi:"
+
+#: src/cdaudio/cdaudio-ng.cc:144
+msgid "Override device:"
+msgstr "Qurilmani o'zgartirish"
+
+#: src/cdaudio/cdaudio-ng.cc:146
+msgid "Metadata"
+msgstr "Metamaʼlumot"
+
+#: src/cdaudio/cdaudio-ng.cc:147
+msgid "Use CD-Text"
+msgstr "CD-Text dan foydalanish"
+
+#: src/cdaudio/cdaudio-ng.cc:150
+msgid "Use CDDB"
+msgstr "CDDB dan foydalanish"
+
+#: src/cdaudio/cdaudio-ng.cc:152
+msgid "Use HTTP instead of CDDBP"
+msgstr "CDDBP o'rniga HTTP dan foydalanish"
+
+#: src/cdaudio/cdaudio-ng.cc:155
+msgid "Server:"
+msgstr "Server:"
+
+#: src/cdaudio/cdaudio-ng.cc:159
+msgid "Path:"
+msgstr "Yoʻl:"
+
+#: src/cdaudio/cdaudio-ng.cc:163
+msgid "Port:"
+msgstr "Port:"
+
+#: src/cdaudio/cdaudio-ng.cc:228
+msgid "Failed to initialize cdio subsystem."
+msgstr "cdio quyi tizimini ishga tushirib boʻlmadi."
+
+#: src/cdaudio/cdaudio-ng.cc:260
+#, c-format
+msgid "Invalid URI %s."
+msgstr "Yaroqsiz URI %s."
+
+#: src/cdaudio/cdaudio-ng.cc:262
+#, c-format
+msgid "Track %d not found."
+msgstr "Trek %d topilmadi."
+
+#: src/cdaudio/cdaudio-ng.cc:264
+#, c-format
+msgid "Track %d is a data track."
+msgstr "Trek %d bu ma'lumotlar treki."
+
+#: src/cdaudio/cdaudio-ng.cc:339
+msgid "Error reading audio CD."
+msgstr "Audio CD ni o'qishda xatolik yuz berdi."
+
+#: src/cdaudio/cdaudio-ng.cc:410
+msgid "Audio CD"
+msgstr "Audio CD"
+
+#: src/cdaudio/cdaudio-ng.cc:446 src/cdaudio/cdaudio-ng.cc:455
+#, c-format
+msgid "Failed to open CD device %s."
+msgstr "%s CD qurilmasini ochib bo'lmadi."
+
+#: src/cdaudio/cdaudio-ng.cc:458
+msgid "No audio capable CD drive found."
+msgstr "Hech qanday audio moslamasi mavjud CD drayvi topilmadi."
+
+#: src/cdaudio/cdaudio-ng.cc:481
+msgid "Drive is empty."
+msgstr "Drayv bo'sh."
+
+#: src/cdaudio/cdaudio-ng.cc:483
+msgid "Unsupported disk type."
+msgstr "Qo'llab-quvvatlanmaydigan disk turi."
+
+#: src/cdaudio/cdaudio-ng.cc:507
+msgid "Failed to finish initializing opened CD drive."
+msgstr "Ochiq CD diskini ishga tushirishni tugatib bo'lmadi."
+
+#: src/cdaudio/cdaudio-ng.cc:520
+msgid "Failed to retrieve first/last track number."
+msgstr "Birinchi/oxirgi trek raqamini olib bo‘lmadi."
+
+#: src/cdaudio/cdaudio-ng.cc:541
+#, c-format
+msgid "Cannot read start/end LSN for track %d."
+msgstr "%d Trek uchun boshlash/tugatish LSNni o'qib bo'lmadi."
+
+#: src/cdaudio/cdaudio-ng.cc:624
+msgid "Failed to create the CDDB connection."
+msgstr "CDDB ulanishini yaratib bo‘lmadi."
+
+#: src/cdaudio/cdaudio-ng.cc:690
+msgid "Failed to query the CDDB server"
+msgstr "CDDB serverini so‘rash bajarilmadi"
+
+#: src/cdaudio/cdaudio-ng.cc:692
+#, c-format
+msgid "Failed to query the CDDB server: %s"
+msgstr "CDDB serverini so'rash bajarilmadi: %s"
+
+#: src/cdaudio/cdaudio-ng.cc:716
+#, c-format
+msgid "Failed to read the CDDB info: %s"
+msgstr "CDDB ma'lumotlarini o'qib bo'lmadi: %s"
+
+#: src/cd-menu-items/cd-menu-items.cc:33
+msgid "Audio CD Menu Items"
+msgstr "Audio CD menyu bandlari"
+
+#: src/cd-menu-items/cd-menu-items.cc:45
+msgid "Pla_y CD"
+msgstr "CD ni ijro ettirish"
+
+#: src/cd-menu-items/cd-menu-items.cc:45
+msgid "_Add CD"
+msgstr "CD qo'shish"
+
+#: src/compressor/compressor.cc:45
+msgid "Compression"
+msgstr "Siqish"
+
+#: src/compressor/compressor.cc:46
+msgid "Center volume:"
+msgstr "Markaz ovoz balandligi:"
+
+#: src/compressor/compressor.cc:49
+msgid "Dynamic range:"
+msgstr "Dinamik diapazon:"
+
+#: src/compressor/compressor.cc:57
+msgid ""
+"Dynamic Range Compression Plugin for Audacious\n"
+"Copyright 2010-2014 John Lindgren"
+msgstr ""
+"Audacious uchun dinamik diapazonni siqish plagini\n"
+"Mualliflik huquqi 2010-2014 Jon Lindgren"
+
+#: src/compressor/compressor.cc:64
+msgid "Dynamic Range Compressor"
+msgstr "Dinamik diapazon kompressori"
+
+#: src/console/plugin.cc:15
+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 asosidagi konsol musiqa dekoder mexanizmi\n"
+"Qo'llab-quvvatlanadigan formatlar: AY, GBS, GYM, HES, KSS, NSF, NSFE, SAP, "
+"SPC, VGM, VGZ\n"
+"\n"
+"Audacious plagin mualliflari:\n"
+"Uilyam Pitkok <nenolod@dereferenced.org>\n"
+"Shay Green <gblargg@gmail.com>"
+
+#: src/console/plugin.cc:30
+msgid "Bass:"
+msgstr "Bass:"
+
+#: src/console/plugin.cc:33
+msgid "Treble:"
+msgstr "Treble:"
+
+#: src/console/plugin.cc:36
+msgid "Echo:"
+msgstr "Aks sado:"
+
+#: src/console/plugin.cc:39
+msgid "Default song length:"
+msgstr "Standart qo‘shiq uzunligi:"
+
+#: src/console/plugin.cc:41 src/crossfade/crossfade.cc:56
+#: src/crossfade/crossfade.cc:62 src/lirc/lirc.cc:395 src/notify/notify.cc:113
+#: src/sid/xs_config.cc:85 src/sid/xs_config.cc:94 src/sid/xs_config.cc:103
+#: src/vumeter-qt/vumeter_qt.cc:39
+msgid "seconds"
+msgstr "soniya"
+
+#: src/console/plugin.cc:42 src/modplug/plugin_main.cc:58
+msgid "Resampling"
+msgstr "Qayta namuna olish"
+
+#: src/console/plugin.cc:43
+msgid "Enable audio resampling"
+msgstr "Ovozni qayta namuna olishni yoqish"
+
+#: src/console/plugin.cc:49
+msgid "SPC"
+msgstr "SPC"
+
+#: src/console/plugin.cc:50
+msgid "Ignore length from SPC tags"
+msgstr "SPC teglaridan uzunlikni e'tiborsiz qoldirish"
+
+#: src/console/plugin.cc:52
+msgid "Increase reverb"
+msgstr "Reverberatsiyani ko'paytirish"
+
+#: src/console/plugin.h:26
+msgid "Game Console Music Decoder"
+msgstr "O'yin konsoli musiqa dekoderi"
+
+#: src/coreaudio/coreaudio.cc:53
+msgid "CoreAudio output"
+msgstr "CoreAudio chiqishi"
+
+#: src/coreaudio/coreaudio.cc:155
+msgid ""
+"CoreAudio Output Plugin for Audacious\n"
+"Copyright 2014 William Pitcock\n"
+"Copyright 2017,18 René J.V. Bertin\n"
+" (original code and code adapted from\n"
+" Apple examples, (C) Apple 2013)\n"
+"\n"
+"Based on SDL Output Plugin for Audacious\n"
+"Copyright 2010 John Lindgren"
+msgstr ""
+"Audacious uchun CoreAudio chiqish plagini\n"
+"Mualliflik huquqi 2014 Uilyam Pitkok\n"
+"Mualliflik huquqi 2017,18 René J.V. Bertin\n"
+"(asl kod va kod moslashtirilgan\n"
+"Apple misollari, (C) Apple 2013)\n"
+"\n"
+"Audacious uchun SDL chiqish plaginiga asoslangan\n"
+"Mualliflik huquqi 2010 Jon Lindgren"
+
+#: src/coreaudio/coreaudio.cc:171
+msgid "Use exclusive mode"
+msgstr "Maxsus rejimdan foydalanish"
+
+#: src/coreaudio/coreaudio.cc:173
+msgid "Use bit perfect audio (adapt device sampling rate)"
+msgstr ""
+"Bit mukammal audiodan foydalanish (qurilma namuna olish tezligini "
+"moslashtirish)"
+
+#: src/crossfade/crossfade.cc:47
+msgid ""
+"Crossfade Plugin for Audacious\n"
+"Copyright 2010-2014 John Lindgren"
+msgstr ""
+"Audacious uchun Crossfade plagini\n"
+"Mualliflik huquqi 2010-2014 Jon Lindgren"
+
+#: src/crossfade/crossfade.cc:51
+msgid "Crossfade"
+msgstr "Oʻzaro oʻtish"
+
+#: src/crossfade/crossfade.cc:52
+msgid "On automatic song change"
+msgstr "Qo'shiqni avtomatik o'zgartirishda"
+
+#: src/crossfade/crossfade.cc:54 src/crossfade/crossfade.cc:60
+msgid "Overlap:"
+msgstr "Overlap:"
+
+#: src/crossfade/crossfade.cc:58
+msgid "On seek or manual song change"
+msgstr "Qidiruv yoki qo'lda qo'shiqni o'zgartirishda"
+
+#: src/crossfade/crossfade.cc:64
+msgid "No fade in"
+msgstr ""
+
+#: src/crossfade/crossfade.cc:66
+msgid "Use S-curve fade"
+msgstr ""
+
+#: src/crossfade/crossfade.cc:68
+msgid "S-curve steepness:"
+msgstr ""
+
+#: src/crossfade/crossfade.cc:70
+msgid "(higher is steeper)"
+msgstr ""
+
+#: src/crossfade/crossfade.cc:72
+msgid "Tip"
+msgstr "Maslahat"
+
+#: src/crossfade/crossfade.cc:73
+msgid ""
+"For better crossfading, enable\n"
+"the Silence Removal effect."
+msgstr ""
+"Yaxshiroq oʻzaro oʻtish uchun\n"
+"jimlikni olib tashlash effektini yoqing."
+
+#: src/crossfade/crossfade.cc:83
+msgid "Crossfade"
+msgstr "Oʻzaro oʻtish"
+
+#: src/crystalizer/crystalizer.cc:31
+msgid "Crystalizer"
+msgstr "Kristalizator"
+
+#: src/crystalizer/crystalizer.cc:32 src/stereo_plugin/stereo.cc:45
+msgid "Intensity:"
+msgstr "Intensivlik:"
+
+#: src/crystalizer/crystalizer.cc:43
+msgid "Crystalizer"
+msgstr "Kristalizator"
+
+#: src/cue/cue.cc:42
+msgid "Cue Sheet Plugin"
+msgstr "Cue Sheet plagini"
+
+#: src/delete-files/delete-files.cc:53 src/delete-files/delete-files.cc:215
+#: src/delete-files/delete-files.cc:230
+msgid "Delete Files"
+msgstr "Fayllarni o'chirish"
+
+#: src/delete-files/delete-files.cc:120
+msgid "No files are selected."
+msgstr "Hech qanday fayl tanlanmagan."
+
+#: src/delete-files/delete-files.cc:125
+#, c-format
+msgid "Do you want to move %s to the trash?"
+msgstr "%s chiqindiga o'tkazmoqchimisiz?"
+
+#: src/delete-files/delete-files.cc:126
+#, c-format
+msgid "Do you want to permanently delete %s?"
+msgstr "%s butunlay o'chirib tashlamoqchimisiz?"
+
+#: src/delete-files/delete-files.cc:133
+#, c-format
+msgid "Do you want to move %d files to the trash?"
+msgstr "%dfayllarni chiqindiga o'tkazmoqchimisiz?"
+
+#: src/delete-files/delete-files.cc:134
+#, c-format
+msgid "Do you want to permanently delete %d files?"
+msgstr "%d fayllarni butunlay oʻchirib tashlamoqchimisiz?"
+
+#: src/delete-files/delete-files.cc:146
+msgid "Move to trash"
+msgstr "Chiqindiga o'tkazish"
+
+#: src/delete-files/delete-files.cc:146
+msgid "Delete"
+msgstr "Oʻchirish"
+
+#: src/delete-files/delete-files.cc:213 src/delete-files/delete-files.cc:235
+#: src/skins-qt/search-select.cc:102 src/skins/search-select.cc:78
+msgid "Cancel"
+msgstr "Bekor qilish"
+
+#: src/delete-files/delete-files.cc:267
+msgid "Delete Selected Files"
+msgstr "Tanlangan fayllarni o'chirish"
+
+#: src/delete-files/delete-files.cc:287
+msgid "Delete Method"
+msgstr "O'chirish usuli"
+
+#: src/delete-files/delete-files.cc:288
+msgid "Move to trash instead of deleting immediately"
+msgstr "Darhol oʻchirish oʻrniga chiqindiga oʻtkazish"
+
+#: src/echo_plugin/echo.cc:9
+msgid ""
+"Echo Plugin\n"
+"By Johan Levin, 1999\n"
+"Surround echo by Carl van Schaik, 1999\n"
+"Updated for Audacious by William Pitcock and John Lindgren, 2010-2014"
+msgstr ""
+"Aks sado plagini\n"
+"Yohan Levin tomonidan, 1999 yil\n"
+"Surround echo Karl van Schaik tomonidan, 1999 yil\n"
+"Uilyam Pitkok va Jon Lindgren tomonidan Audacious uchun yangilangan, "
+"2010-2014"
+
+#: src/echo_plugin/echo.cc:21
+msgid "Echo"
+msgstr "Aks sado"
+
+#: src/echo_plugin/echo.cc:22 src/modplug/plugin_main.cc:72
+#: src/modplug/plugin_main.cc:82
+msgid "Delay:"
+msgstr "Kechikish:"
+
+#: src/echo_plugin/echo.cc:24 src/modplug/plugin_main.cc:72
+#: src/modplug/plugin_main.cc:82 src/xsf/plugin.cc:445
+msgid "ms"
+msgstr "ms"
+
+#: src/echo_plugin/echo.cc:25
+msgid "Feedback:"
+msgstr "Fikr-mulohaza:"
+
+#: src/echo_plugin/echo.cc:28 src/modplug/plugin_main.cc:86
+msgid "Volume:"
+msgstr "Ovoz balandligi:"
+
+#: src/echo_plugin/echo.cc:39
+msgid "Echo"
+msgstr "Aks sado"
+
+#: src/ffaudio/ffaudio-core.cc:50
+msgid "FFmpeg Plugin"
+msgstr "FFmpeg plagini"
+
+#: src/ffaudio/ffaudio-core.cc:649
+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 foydalanish uchun ko'p formatli audio dekodlash plagini\n"
+"FFmpeg multimedia freymvorki (http://www.ffmpeg.org/)\n"
+"\n"
+"Audacious plagin mualliflari:\n"
+"William Pitcock <nenolod@nenolod.net>\n"
+"Matti Hämäläinen <ccr@tnsp.org>"
+
+#: src/filewriter/filewriter.cc:48
+msgid "FileWriter Plugin"
+msgstr "FileWriter plagini"
+
+#: src/filewriter/filewriter.cc:316
+#, c-format
+msgid ""
+"Error opening %s:\n"
+"%s"
+msgstr ""
+" %s ochilishda xatolik:\n"
+"%s"
+
+#: src/filewriter/filewriter.cc:358
+msgid ""
+"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 ""
+"Bu dastur bepul dastur hisoblanadi; siz uni qayta tarqatishingiz va/yoki uni "
+"Free Software Foundation tomonidan nashr etilgan GNU General Public License "
+"shartlariga muvofiq o'zgartirishingiz mumkin; Litsenziyaning 2-versiyasi "
+"yoki (sizning xohishingizga ko'ra) har qanday keyingi versiyasi.\n"
+"\n"
+"Ushbu dastur foydali bo'ladi degan umidda tarqatiladi, lekin HECH QANDAY "
+"KAFOLATSIZ; SOVLASH MUVOFIQligi yoki MAQSUS MAQSADGA MUVOFIQligi haqidagi "
+"nazarda tutilgan kafolatsiz. Batafsil ma'lumot uchun GNU General Public "
+"License-ga qarang.\n"
+"\n"
+"Siz ushbu dastur bilan birga GNU General Public License nusxasini olishingiz "
+"kerak edi; bo'lmasa, Free Software Foundation, Inc., 51 Franklin Street, "
+"Fifth Floor, Boston, MA 02110-1301, AQSH ga yozing."
+
+#: src/filewriter/filewriter.cc:385
+msgid "Output file format:"
+msgstr "Chiqarish fayl formati:"
+
+#: src/filewriter/filewriter.cc:389
+msgid "Save into original directory"
+msgstr "Asl katalogga saqlash"
+
+#: src/filewriter/filewriter.cc:392
+msgid "Save into custom directory:"
+msgstr "Maxsus katalogga saqlash:"
+
+#: src/filewriter/filewriter.cc:400
+msgid "Generate file name from:"
+msgstr "Fayl nomini quyidagidan yarating:"
+
+#: src/filewriter/filewriter.cc:401
+msgid "Original file name"
+msgstr "Asl fayl nomi"
+
+#: src/filewriter/filewriter.cc:404
+msgid "Original file name (no suffix)"
+msgstr "Asl fayl nomi (qo'shimchasi yo'q)"
+
+#: src/filewriter/filewriter.cc:407
+msgid "Original file tag"
+msgstr "Asl fayl yorlig'i"
+
+#: src/filewriter/filewriter.cc:411
+msgid "Prepend track number to file name"
+msgstr "Fayl nomiga trek raqamini qo'ying"
+
+#: src/filewriter/filewriter.cc:417 src/filewriter/filewriter.cc:449
+msgid "Auto"
+msgstr "Avtomatik"
+
+#: src/filewriter/filewriter.cc:418
+msgid "8000 Hz"
+msgstr "8000 Gts"
+
+#: src/filewriter/filewriter.cc:419
+msgid "11025 Hz"
+msgstr "11025 Gts"
+
+#: src/filewriter/filewriter.cc:420
+msgid "12000 Hz"
+msgstr "12000 Gts"
+
+#: src/filewriter/filewriter.cc:421
+msgid "16000 Hz"
+msgstr "16000 Gts"
+
+#: src/filewriter/filewriter.cc:422
+msgid "22050 Hz"
+msgstr "22050 Gts"
+
+#: src/filewriter/filewriter.cc:423
+msgid "24000 Hz"
+msgstr "24000 Gts"
+
+#: src/filewriter/filewriter.cc:424
+msgid "32000 Hz"
+msgstr "32000 Gts"
+
+#: src/filewriter/filewriter.cc:425 src/xsf/plugin.cc:430
+msgid "44100 Hz"
+msgstr "44100 Gts"
+
+#: src/filewriter/filewriter.cc:426 src/xsf/plugin.cc:431
+msgid "48000 Hz"
+msgstr "48000 Gts"
+
+#: src/filewriter/filewriter.cc:430
+msgid "8 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:431
+msgid "16 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:432
+msgid "32 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:433
+msgid "40 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:434
+msgid "48 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:435
+msgid "56 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:436
+msgid "64 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:437
+msgid "80 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:438
+msgid "96 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:439
+msgid "112 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:440
+msgid "128 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:441
+msgid "160 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:442
+msgid "192 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:443
+msgid "224 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:444
+msgid "256 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:445
+msgid "320 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:450
+msgid "Joint Stereo"
+msgstr "Joint Stereo"
+
+#: src/filewriter/filewriter.cc:451 src/modplug/plugin_main.cc:57
+#: src/mpg123/mpg123.cc:259
+msgid "Stereo"
+msgstr "Stereo"
+
+#: src/filewriter/filewriter.cc:452 src/modplug/plugin_main.cc:56
+#: src/mpg123/mpg123.cc:260
+msgid "Mono"
+msgstr "Mono"
+
+#: src/filewriter/filewriter.cc:456
+msgid "VBR"
+msgstr "VBR"
+
+#: src/filewriter/filewriter.cc:457
+msgid "ABR"
+msgstr "ABR"
+
+#: src/filewriter/filewriter.cc:478
+msgid "Algorithm quality:"
+msgstr "Algoritm sifati:"
+
+#: src/filewriter/filewriter.cc:484
+msgid "Bitrate:"
+msgstr "Bit tezligi:"
+
+#: src/filewriter/filewriter.cc:491
+msgid "Compression ratio:"
+msgstr "Siqish nisbati:"
+
+#: src/filewriter/filewriter.cc:498
+msgid "Audio mode:"
+msgstr "Audio rejimi:"
+
+#: src/filewriter/filewriter.cc:501
+msgid "Enforce strict ISO compliance"
+msgstr "ISO talablariga qat'iy rioya qilish"
+
+#: src/filewriter/filewriter.cc:503
+msgid "Error protection"
+msgstr "Xatolardan himoya qilish"
+
+#: src/filewriter/filewriter.cc:508
+msgid "Enable VBR/ABR"
+msgstr "VBR/ABR ni yoqish"
+
+#: src/filewriter/filewriter.cc:510
+msgid "Type:"
+msgstr "Turi:"
+
+#: src/filewriter/filewriter.cc:514
+msgid "Minimum bitrate:"
+msgstr "Minimal bit tezligi:"
+
+#: src/filewriter/filewriter.cc:518
+msgid "Maximum bitrate:"
+msgstr "Maksimal bit tezligi:"
+
+#: src/filewriter/filewriter.cc:522
+msgid "Average bitrate:"
+msgstr "O'rtacha bit tezligi:"
+
+#: src/filewriter/filewriter.cc:526
+msgid "VBR quality level:"
+msgstr "VBR sifat darajasi:"
+
+#: src/filewriter/filewriter.cc:530
+msgid "Strictly enforce minimum bitrate"
+msgstr "Minimal bit tezligiga qat'iy rioya qilish"
+
+#: src/filewriter/filewriter.cc:533
+msgid "Omit Xing VBR header"
+msgstr "Xing VBR sarlavhasini o'tkazib yubormaslik"
+
+#: src/filewriter/filewriter.cc:539
+msgid "Frame Headers"
+msgstr "Kadr sarlavhalari"
+
+#: src/filewriter/filewriter.cc:540
+msgid "Mark as copyright"
+msgstr "Mualliflik huquqi sifatida belgilash"
+
+#: src/filewriter/filewriter.cc:542
+msgid "Mark as original"
+msgstr "Asl sifatida belgilash"
+
+#: src/filewriter/filewriter.cc:544
+msgid "ID3 Tags"
+msgstr "ID3 teglari"
+
+#: src/filewriter/filewriter.cc:545
+msgid "Force addition of version 2 tag"
+msgstr "2 versiya tegini majburan qo‘shish"
+
+#: src/filewriter/filewriter.cc:547
+msgid "Only add v1 tag"
+msgstr "Faqat v1 tegini qo'shish"
+
+#: src/filewriter/filewriter.cc:549
+msgid "Only add v2 tag"
+msgstr "Faqat v2 tegini qo'shish"
+
+#: src/filewriter/filewriter.cc:554
+msgid "Quality"
+msgstr "Sifat"
+
+#: src/filewriter/filewriter.cc:555
+msgid "VBR/ABR"
+msgstr "VBR/ABR"
+
+#: src/filewriter/filewriter.cc:556
+msgid "Tags"
+msgstr "Teglar"
+
+#: src/filewriter/filewriter.cc:566
+msgid "Quality (0-1):"
+msgstr "Sifat (0-1):"
+
+#: src/filewriter/filewriter.cc:573 src/skins-qt/skins_cfg.cc:307
+#: src/skins/skins_cfg.cc:289
+msgid "General"
+msgstr "Umumiy"
+
+#: src/flac/flacng.h:36
+msgid "FLAC Decoder"
+msgstr "FLAC dekoder"
+
+#: src/flac/metadata.cc:296 src/wavpack/wavpack.cc:215
+msgid "lossless"
+msgstr "yo'qotishsiz"
+
+#: src/flac/plugin.cc:214
+msgid ""
+"Original code by\n"
+"Ralf Ertzinger <ralf@skytale.net>\n"
+"\n"
+"http://www.skytale.net/projects/bmp-flac2/"
+msgstr ""
+"Asl kod muallifi\n"
+"Ralf Ertzinger <ralf@skytale.net>\n"
+"\n"
+"http://www.skytale.net/projects/bmp-flac2/"
+
+#: src/gio/gio.cc:34
+msgid ""
+"GIO Plugin for Audacious\n"
+"Copyright 2009-2012 John Lindgren"
+msgstr ""
+"Audacious uchun GIO plagini\n"
+"Mualliflik huquqi 2009-2012 Jon Lindgren"
+
+#: src/gio/gio.cc:42
+msgid "GIO Plugin"
+msgstr "GIO plagini"
+
+#: src/gio/gio.cc:152
+msgid "Read-and-append mode not supported"
+msgstr "O‘qish va qo‘shish rejimi qo‘llab-quvvatlanmaydi"
+
+#: src/gio/gio.cc:165
+msgid "Invalid open mode"
+msgstr "Yaroqsiz ochiq rejim"
+
+#: src/glspectrum/gl-spectrum.cc:52
+msgid ""
+"OpenGL Spectrum Analyzer for Audacious\n"
+"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\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 uchun OpenGL spektr analizatori\n"
+"Mualliflik huquqi 2013 Kristof Bude, Jon Lindgren va Karlo Bramini\n"
+"\n"
+"XMMS plagini asosida:\n"
+"Mualliflik huquqi 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Tomas "
+"Nilsson va 4Front Technologies\n"
+"\n"
+"Litsenziya: GPLv2+"
+
+#: src/glspectrum/gl-spectrum.cc:63 src/qtglspectrum/gl-spectrum.cc:53
+msgid "OpenGL Spectrum Analyzer"
+msgstr "OpenGL spektr analizatori"
+
+#: src/gtkui/columns.cc:36 src/moonstone/playlist_model.cc:38
+#: src/qtui/playlist_model.cc:33
+msgid "Entry Number"
+msgstr "Kiritish raqami"
+
+#: src/gtkui/columns.cc:37 src/moonstone/playlist_model.cc:38
+#: src/moonstone/playlist_selection.cc:64
+#: src/playlist-manager/playlist-manager.cc:200
+#: src/playlist-manager-qt/playlist-manager-qt.cc:188
+#: src/qtui/playlist_model.cc:33 src/streamtuner/icecast-model.cc:120
+#: src/streamtuner/ihr-model.cc:159 src/streamtuner/shoutcast-model.cc:122
+msgid "Title"
+msgstr "Sarlavha"
+
+#: src/gtkui/columns.cc:38 src/moonstone/playlist_model.cc:39
+#: src/qtui/playlist_model.cc:33
+msgid "Artist"
+msgstr "Artist"
+
+#: src/gtkui/columns.cc:39 src/moonstone/playlist_model.cc:39
+#: src/qtui/playlist_model.cc:33
+msgid "Year"
+msgstr "Yil"
+
+#: src/gtkui/columns.cc:40 src/moonstone/playlist_model.cc:39
+#: src/qtui/playlist_model.cc:34
+msgid "Album"
+msgstr "Albom"
+
+#: src/gtkui/columns.cc:41 src/moonstone/playlist_model.cc:40
+#: src/qtui/playlist_model.cc:34
+msgid "Album Artist"
+msgstr "Albom artisti"
+
+#: src/gtkui/columns.cc:42 src/moonstone/playlist_model.cc:40
+#: src/qtui/playlist_model.cc:34
+msgid "Track"
+msgstr "Trek"
+
+#: src/gtkui/columns.cc:43 src/moonstone/playlist_model.cc:40
+#: src/qtui/playlist_model.cc:34 src/streamtuner/icecast-model.cc:123
+#: src/streamtuner/shoutcast-model.cc:125
+#: src/streamtuner/shoutcast-model.cc:236
+msgid "Genre"
+msgstr "Janr"
+
+#: src/gtkui/columns.cc:44 src/moonstone/playlist_model.cc:41
+#: src/qtui/playlist_model.cc:35
+msgid "Queue Position"
+msgstr "Navbatdagi joylashuv"
+
+#: src/gtkui/columns.cc:45 src/moonstone/playlist_model.cc:41
+#: src/qtui/playlist_model.cc:35
+msgid "Length"
+msgstr "Uzunligi"
+
+#: src/gtkui/columns.cc:46 src/moonstone/playlist_model.cc:41
+#: src/qtui/playlist_model.cc:35
+msgid "File Path"
+msgstr "Fayl yo'li"
+
+#: src/gtkui/columns.cc:47 src/moonstone/playlist_model.cc:42
+#: src/qtui/playlist_model.cc:35
+msgid "File Name"
+msgstr "Fayl nomi"
+
+#: src/gtkui/columns.cc:48 src/moonstone/playlist_model.cc:42
+#: src/qtui/playlist_model.cc:36
+msgid "Custom Title"
+msgstr "Maxsus sarlavha"
+
+#: src/gtkui/columns.cc:49 src/moonstone/playlist_model.cc:42
+#: src/qtui/playlist_model.cc:36 src/streamtuner/icecast-model.cc:129
+#: src/streamtuner/shoutcast-model.cc:134
+msgid "Bitrate"
+msgstr "Bit tezligi"
+
+#: src/gtkui/columns.cc:50 src/moonstone/playlist_model.cc:43
+#: src/qtui/playlist_model.cc:36
+msgid "Comment"
+msgstr "Izoh"
+
+#: src/gtkui/columns.cc:51 src/qtui/playlist_model.cc:36
+msgid "Publisher"
+msgstr ""
+
+#: src/gtkui/columns.cc:52 src/qtui/playlist_model.cc:37
+msgid "Catalog Number"
+msgstr ""
+
+#: src/gtkui/columns.cc:53 src/moonstone/playlist_model.cc:43
+#: src/qtui/playlist_model.cc:37
+msgid "Disc"
+msgstr ""
+
+#: src/gtkui/columns.cc:325
+msgid "Available columns"
+msgstr "Mavjud ustunlar"
+
+#: src/gtkui/columns.cc:351
+msgid "Displayed columns"
+msgstr "Ko'rsatilgan ustunlar"
+
+#: src/gtkui/layout.cc:74 src/search-tool-qt/search-tool-qt.cc:58
+#: src/search-tool/search-tool.cc:49
+msgid "Search Tool"
+msgstr "Qidiruv vositasi"
+
+#: src/gtkui/layout.cc:170
+msgid "Dock at Left"
+msgstr "Chapga o'rnatish"
+
+#: src/gtkui/layout.cc:170
+msgid "Dock at Right"
+msgstr "Oʻngga oʻrnatish"
+
+#: src/gtkui/layout.cc:171
+msgid "Dock at Top"
+msgstr "Yuqoriga oʻrnatish"
+
+#: src/gtkui/layout.cc:171
+msgid "Dock at Bottom"
+msgstr "Pastga o'rnatish"
+
+#: src/gtkui/layout.cc:171
+msgid "Undock"
+msgstr "Yechish"
+
+#: src/gtkui/layout.cc:171 src/ladspa/plugin.cc:540
+msgid "Disable"
+msgstr "Oʻchirish"
+
+#: src/gtkui/menus.cc:79 src/qtui/menus.cc:107
+#: src/statusicon-qt/statusicon.cc:115 src/statusicon/statusicon.cc:286
+msgid "_Open Files ..."
+msgstr "_Fayllarni ochish..."
+
+#: src/gtkui/menus.cc:80 src/qtui/menus.cc:111
+msgid "Open _URL ..."
+msgstr "URL ochish..."
+
+#: src/gtkui/menus.cc:81 src/qtui/menus.cc:113
+msgid "_Add Files ..."
+msgstr "Fayllarni qo'shish..."
+
+#: src/gtkui/menus.cc:82 src/qtui/menus.cc:118
+msgid "Add U_RL ..."
+msgstr "URL qo'shish..."
+
+#: src/gtkui/menus.cc:84 src/qtui/menus.cc:120
+msgid "Search _Library"
+msgstr "Kutubxonani qidirish"
+
+#: src/gtkui/menus.cc:86 src/qtui/menus.cc:123
+msgid "A_bout ..."
+msgstr "Haqida..."
+
+#: src/gtkui/menus.cc:87 src/qtui/menus.cc:125
+msgid "_Settings ..."
+msgstr "Sozlamalar..."
+
+#: src/gtkui/menus.cc:88 src/qtui/menus.cc:131
+#: src/statusicon-qt/statusicon.cc:117 src/statusicon/statusicon.cc:288
+msgid "_Quit"
+msgstr "Chiqish"
+
+#: src/gtkui/menus.cc:92 src/gtkui/menus.cc:226
+#: src/moonstone/playlist_tabs.cc:306 src/qtui/menus.cc:135
+#: src/qtui/playlist_tabs.cc:331 src/search-tool-qt/search-tool-qt.cc:499
+#: src/search-tool/search-tool.cc:339 src/statusicon-qt/statusicon.cc:109
+#: src/statusicon/statusicon.cc:280
+msgid "_Play"
+msgstr "Ijro ettirish"
+
+#: src/gtkui/menus.cc:93 src/qtui/menus.cc:137
+#: src/statusicon-qt/statusicon.cc:110 src/statusicon/statusicon.cc:281
+msgid "Paus_e"
+msgstr "Pauza"
+
+#: src/gtkui/menus.cc:94 src/qtui/menus.cc:139
+#: src/statusicon-qt/statusicon.cc:111 src/statusicon/statusicon.cc:282
+msgid "_Stop"
+msgstr "To'xtatish"
+
+#: src/gtkui/menus.cc:95 src/qtui/menus.cc:141
+#: src/statusicon-qt/statusicon.cc:112 src/statusicon/statusicon.cc:283
+msgid "Pre_vious"
+msgstr "Oldingi"
+
+#: src/gtkui/menus.cc:96 src/qtui/menus.cc:143
+#: src/statusicon-qt/statusicon.cc:113 src/statusicon/statusicon.cc:284
+msgid "_Next"
+msgstr "_Keyingi"
+
+#: src/gtkui/menus.cc:97 src/qtui/menus.cc:145 src/skins/menus.cc:114
+#: src/skins-qt/menus.cc:105
+msgid "Previous Album"
+msgstr "Oldingi albom"
+
+#: src/gtkui/menus.cc:98 src/qtui/menus.cc:146 src/skins/menus.cc:115
+#: src/skins-qt/menus.cc:106
+msgid "Next Album"
+msgstr "Keyingi albom"
+
+#: src/gtkui/menus.cc:100 src/qtui/menus.cc:148
+msgid "_Repeat"
+msgstr "Takrorlash"
+
+#: src/gtkui/menus.cc:101 src/qtui/menus.cc:150
+msgid "S_huffle"
+msgstr "Aralashtirish"
+
+#: src/gtkui/menus.cc:102 src/qtui/menus.cc:152
+msgid "Shuffle by Albu_m"
+msgstr "Albom bo'yicha aralashtirish"
+
+#: src/gtkui/menus.cc:103 src/qtui/menus.cc:155
+msgid "N_o Playlist Advance"
+msgstr "Pleylist harakati yo'q"
+
+#: src/gtkui/menus.cc:104 src/qtui/menus.cc:157
+msgid "Stop A_fter This Song"
+msgstr "Ushbu qo'shiqdan keyin to'xtash"
+
+#: src/gtkui/menus.cc:106 src/gtkui/menus.cc:210 src/qtui/menus.cc:162
+#: src/qtui/menus.cc:294
+msgid "Song _Info ..."
+msgstr "Qo'shiq haqida ma'lumot..."
+
+#: src/gtkui/menus.cc:107
+msgid "Jump to _Time ..."
+msgstr "Vaqtga o'tish..."
+
+#: src/gtkui/menus.cc:108
+msgid "_Jump to Song ..."
+msgstr "Qo'shiqqa o'tish..."
+
+#: src/gtkui/menus.cc:110 src/qtui/menus.cc:165
+msgid "Set Repeat Point _A"
+msgstr "A takrorlash nuqtasini sozlash"
+
+#: src/gtkui/menus.cc:111 src/qtui/menus.cc:167
+msgid "Set Repeat Point _B"
+msgstr "B takrorlash nuqtasini sozlash"
+
+#: src/gtkui/menus.cc:112 src/qtui/menus.cc:169
+msgid "_Clear Repeat Points"
+msgstr "Takrorlash nuqtalarini tozalash"
+
+#: src/gtkui/menus.cc:116 src/gtkui/menus.cc:123 src/gtkui/menus.cc:141
+#: src/qtui/menus.cc:173 src/qtui/menus.cc:180 src/qtui/menus.cc:198
+msgid "By _Title"
+msgstr "Sarlavha bo'yicha"
+
+#: src/gtkui/menus.cc:117 src/qtui/menus.cc:174
+msgid "By _File Name"
+msgstr "Fayl nomi bo'yicha"
+
+#: src/gtkui/menus.cc:118 src/qtui/menus.cc:175
+msgid "By File _Path"
+msgstr "Fayl yo'li bo'yicha"
+
+#: src/gtkui/menus.cc:122 src/gtkui/menus.cc:140 src/qtui/menus.cc:179
+#: src/qtui/menus.cc:197
+msgid "By Track _Number"
+msgstr "Trek raqami bo'yicha"
+
+#: src/gtkui/menus.cc:124 src/gtkui/menus.cc:142 src/qtui/menus.cc:181
+#: src/qtui/menus.cc:199
+msgid "By _Artist"
+msgstr "Artist bo'yicha"
+
+#: src/gtkui/menus.cc:125 src/gtkui/menus.cc:143 src/qtui/menus.cc:182
+#: src/qtui/menus.cc:200
+msgid "By Al_bum"
+msgstr "Albom bo'yicha"
+
+#: src/gtkui/menus.cc:126 src/gtkui/menus.cc:144 src/qtui/menus.cc:183
+#: src/qtui/menus.cc:201
+msgid "By Albu_m Artist"
+msgstr "Albom artisti bo'yicha"
+
+#: src/gtkui/menus.cc:127 src/gtkui/menus.cc:145 src/qtui/menus.cc:184
+#: src/qtui/menus.cc:202
+msgid "By Release _Date"
+msgstr "Chiqarilgan sana bo'yicha"
+
+#: src/gtkui/menus.cc:128 src/gtkui/menus.cc:146 src/qtui/menus.cc:185
+#: src/qtui/menus.cc:203
+msgid "By _Genre"
+msgstr "Janr bo'yicha"
+
+#: src/gtkui/menus.cc:129 src/gtkui/menus.cc:147 src/qtui/menus.cc:186
+#: src/qtui/menus.cc:204
+msgid "By _Length"
+msgstr "Uzunlik bo'yicha"
+
+#: src/gtkui/menus.cc:130 src/gtkui/menus.cc:148 src/qtui/menus.cc:187
+#: src/qtui/menus.cc:205
+msgid "By _File Path"
+msgstr "Fayl yo'li bo'yicha"
+
+#: src/gtkui/menus.cc:131 src/gtkui/menus.cc:149 src/qtui/menus.cc:188
+#: src/qtui/menus.cc:206
+msgid "By _Custom Title"
+msgstr "Maxsus sarlavha bo'yicha"
+
+#: src/gtkui/menus.cc:132 src/gtkui/menus.cc:150 src/qtui/menus.cc:189
+#: src/qtui/menus.cc:207
+msgid "By C_omment"
+msgstr "Izoh bo'yicha"
+
+#: src/gtkui/menus.cc:133 src/gtkui/menus.cc:151 src/qtui/menus.cc:190
+#: src/qtui/menus.cc:208
+msgid "By D_isc Number"
+msgstr ""
+
+#: src/gtkui/menus.cc:135 src/gtkui/menus.cc:153 src/qtui/menus.cc:192
+#: src/qtui/menus.cc:210
+msgid "R_everse Order"
+msgstr "Teskari tartib"
+
+#: src/gtkui/menus.cc:136 src/gtkui/menus.cc:154 src/qtui/menus.cc:194
+#: src/qtui/menus.cc:212
+msgid "_Random Order"
+msgstr "Tasodifiy tartib"
+
+#: src/gtkui/menus.cc:158 src/qtui/menus.cc:216
+msgid "_Play/Resume"
+msgstr "Ijro ettirish/Davom etish"
+
+#: src/gtkui/menus.cc:159 src/qtui/menus.cc:218
+msgid "_Refresh"
+msgstr "Yangilash"
+
+#: src/gtkui/menus.cc:161 src/qtui/menus.cc:222
+msgid "_Sort"
+msgstr "Saralash"
+
+#: src/gtkui/menus.cc:162 src/qtui/menus.cc:223
+msgid "Sort Se_lected"
+msgstr "Tanlangan saralash"
+
+#: src/gtkui/menus.cc:163 src/qtui/menus.cc:225
+msgid "Remove _Duplicates"
+msgstr "Dublikatlarni olib tashlash"
+
+#: src/gtkui/menus.cc:164 src/qtui/menus.cc:226
+msgid "Remove _Unavailable Files"
+msgstr "Mavjud bo'lmagan fayllarni olib tashlash"
+
+#: src/gtkui/menus.cc:166 src/playlist-manager/playlist-manager.cc:219
+#: src/playlist-manager-qt/playlist-manager-qt.cc:348 src/qtui/menus.cc:229
+msgid "_New"
+msgstr "Yangi"
+
+#: src/gtkui/menus.cc:167 src/qtui/menus.cc:230
+msgid "Ren_ame ..."
+msgstr "Nomini o'zgartirish..."
+
+#: src/gtkui/menus.cc:168 src/gtkui/menus.cc:228
+#: src/moonstone/playlist_tabs.cc:311 src/qtui/menus.cc:231
+#: src/qtui/playlist_tabs.cc:336
+msgid "Remo_ve"
+msgstr "O'chirish"
+
+#: src/gtkui/menus.cc:170 src/qtui/menus.cc:233
+msgid "_Import ..."
+msgstr "Import..."
+
+#: src/gtkui/menus.cc:171 src/qtui/menus.cc:234
+msgid "_Export ..."
+msgstr "Eksport..."
+
+#: src/gtkui/menus.cc:173 src/qtui/menus.cc:237
+msgid "Playlist _Manager ..."
+msgstr "Pleylist menejeri..."
+
+#: src/gtkui/menus.cc:174 src/qtui/menus.cc:239
+msgid "_Queue Manager ..."
+msgstr "Navbat menejeri..."
+
+#: src/gtkui/menus.cc:178 src/qtui/menus.cc:243
+msgid "Volume _Up"
+msgstr "Ovozni oshirish"
+
+#: src/gtkui/menus.cc:179 src/qtui/menus.cc:245
+msgid "Volume _Down"
+msgstr "Ovozni pasaytirish"
+
+#: src/gtkui/menus.cc:181 src/qtui/menus.cc:249
+msgid "_Equalizer ..."
+msgstr "Ekvalayzer..."
+
+#: src/gtkui/menus.cc:182 src/qtui/menus.cc:251
+msgid "E_ffects ..."
+msgstr "Effektlar..."
+
+#: src/gtkui/menus.cc:184
+msgid "_Record Stream"
+msgstr "Oqim yozib olish"
+
+#: src/gtkui/menus.cc:185
+msgid "Audio _Settings ..."
+msgstr "Audio sozlamalari..."
+
+#: src/gtkui/menus.cc:189 src/qtui/menus.cc:260
+msgid "Show _Menu Bar"
+msgstr "Menyu panelini ko'rsatish"
+
+#: src/gtkui/menus.cc:190 src/qtui/menus.cc:262
+msgid "Show I_nfo Bar"
+msgstr "Ma'lumot panelini ko'rsatish"
+
+#: src/gtkui/menus.cc:191 src/qtui/menus.cc:264
+msgid "Show Info Bar _Album Art"
+msgstr "Ma'lumot panelidagi albom qoplamasini ko'rsatish"
+
+#: src/gtkui/menus.cc:192 src/qtui/menus.cc:266
+msgid "Show Info Bar Vis_ualization"
+msgstr "Ma'lumot paneli vizualizatsiyasini ko'rsatish"
+
+#: src/gtkui/menus.cc:193 src/qtui/menus.cc:268
+msgid "Show _Status Bar"
+msgstr "Holat panelini ko‘rsatish"
+
+#: src/gtkui/menus.cc:195 src/qtui/menus.cc:272
+msgid "Show _Remaining Time"
+msgstr "Qolgan vaqtni ko'rsatish"
+
+#: src/gtkui/menus.cc:197 src/qtui/menus.cc:276 src/skins/menus.cc:157
+#: src/skins-qt/menus.cc:152
+msgid "_Visualizations ..."
+msgstr "Vizualizatsiya..."
+
+#: src/gtkui/menus.cc:201 src/qtui/menus.cc:280
+msgid "_File"
+msgstr "Fayl"
+
+#: src/gtkui/menus.cc:202 src/qtui/menus.cc:281
+msgid "_Playback"
+msgstr "Ijro ettirish"
+
+#: src/gtkui/menus.cc:203 src/qtui/menus.cc:282
+msgid "P_laylist"
+msgstr "Pleylist"
+
+#: src/gtkui/menus.cc:204 src/gtkui/menus.cc:222 src/qtui/menus.cc:283
+#: src/qtui/menus.cc:312
+msgid "_Services"
+msgstr "Xizmatlar"
+
+#: src/gtkui/menus.cc:205 src/qtui/menus.cc:284
+msgid "_Output"
+msgstr "Chiqarish"
+
+#: src/gtkui/menus.cc:206 src/qtui/menus.cc:285
+msgid "_View"
+msgstr "Ko'rinish"
+
+#: src/gtkui/menus.cc:211 src/qtui/menus.cc:296
+msgid "_Queue/Unqueue"
+msgstr "Navbat/navbatni bekor qilish"
+
+#: src/gtkui/menus.cc:213 src/qtui/menus.cc:299
+msgid "_Open Containing Folder"
+msgstr "O'z ichiga olgan jildni ochish"
+
+#: src/gtkui/menus.cc:214 src/qtui/menus.cc:301
+msgid "_Refresh Selected"
+msgstr "Tanlanganni yangilash"
+
+#: src/gtkui/menus.cc:216 src/qtui/menus.cc:304
+msgid "Cu_t"
+msgstr "Kesish"
+
+#: src/gtkui/menus.cc:217 src/qtui/menus.cc:305
+msgid "_Copy"
+msgstr "Nusxalash"
+
+#: src/gtkui/menus.cc:218 src/qtui/menus.cc:306
+msgid "_Paste"
+msgstr "Joylashtirish"
+
+#: src/gtkui/menus.cc:219 src/qtui/menus.cc:307
+msgid "Paste at _End"
+msgstr "Oxirida joylashtirish"
+
+#: src/gtkui/menus.cc:220 src/qtui/menus.cc:309
+msgid "Select _All"
+msgstr "Hammasini belgilash"
+
+#: src/gtkui/menus.cc:227 src/moonstone/playlist_tabs.cc:309
+#: src/qtui/playlist_tabs.cc:334
+msgid "_Rename ..."
+msgstr "Nomini oʻzgartirish..."
+
+#: src/gtkui/settings.cc:35 src/qtui/settings.cc:59
+msgid "Always"
+msgstr "Har doim"
+
+#: src/gtkui/settings.cc:36 src/qtui/settings.cc:60
+msgid "Auto-hide"
+msgstr "Avtomatik yashirish"
+
+#: src/gtkui/settings.cc:37 src/qtui/settings.cc:61
+msgid "Never"
+msgstr "Hech qachon"
+
+#: src/gtkui/settings.cc:41 src/qtui/settings.cc:64
+msgid "Playlist Tabs"
+msgstr "Pleylist yorliqlari"
+
+#: src/gtkui/settings.cc:42 src/qtui/settings.cc:65
+msgid "Show playlist tabs:"
+msgstr "Pleylist yorliqlarini ko'rsatish:"
+
+#: src/gtkui/settings.cc:45 src/qtui/settings.cc:69
+msgid "Show entry counts"
+msgstr "Kiritilgan sonlarni ko'rsatish"
+
+#: src/gtkui/settings.cc:47 src/qtui/settings.cc:72
+msgid "Show close buttons"
+msgstr "Yopish tugmalarini ko'rsatish"
+
+#: src/gtkui/settings.cc:49 src/qtui/settings.cc:75
+msgid "Playlist Columns"
+msgstr "Pleylist ustunlari"
+
+#: src/gtkui/settings.cc:51 src/qtui/settings.cc:77
+msgid "Show column headers"
+msgstr "Ustun sarlavhalarini ko'rsatish"
+
+#: src/gtkui/settings.cc:53 src/qtui/settings.cc:82
+msgid "Make column headers clickable for sorting"
+msgstr ""
+
+#: src/gtkui/settings.cc:56
+msgid "Use symbolic icons in toolbar"
+msgstr ""
+
+#: src/gtkui/settings.cc:58 src/qtui/settings.cc:86
+msgid "Scroll on song change"
+msgstr "Qo'shiqni o'zgartirish uchun aylantiring"
+
+#: src/gtkui/ui_gtk.cc:82
+msgid "GTK Interface"
+msgstr "GTK interfeysi"
+
+#: src/gtkui/ui_gtk.cc:219 src/skins/main.cc:228 src/skins-qt/main.cc:231
+#, c-format
+msgid "%s - Audacious"
+msgstr "%s - Audacious"
+
+#: src/gtkui/ui_gtk.cc:221 src/moonstone/main_window.cc:184
+#: src/qtui/main_window.cc:385
+msgid "Buffering ..."
+msgstr "Buferlash..."
+
+#: src/gtkui/ui_gtk.cc:224 src/pipewire/pipewire.cc:402 src/skins/main.cc:230
+#: src/skins-qt/main.cc:233
+msgid "Audacious"
+msgstr "Audacious"
+
+#: src/gtkui/ui_gtk.cc:487 src/gtkui/ui_gtk.cc:518 src/gtkui/ui_gtk.cc:882
+#: src/hotkey/gui.cc:72 src/moonstone/main_window.cc:67
+#: src/moonstone/main_window.cc:145 src/moonstone/main_window.cc:146
+#: src/notify/osd.cc:85 src/qthotkey/gui.cc:67 src/qtui/main_window.cc:154
+#: src/qtui/main_window.cc:347 src/qtui/main_window.cc:348
+#: src/skins/menus.cc:109 src/skins-qt/menus.cc:100
+msgid "Play"
+msgstr "Ijro ettirish"
+
+#: src/gtkui/ui_gtk.cc:487 src/moonstone/main_window.cc:151
+#: src/moonstone/main_window.cc:152 src/notify/osd.cc:82
+#: src/qtui/main_window.cc:353 src/qtui/main_window.cc:354
+#: src/skins/menus.cc:110 src/skins-qt/menus.cc:101
+msgid "Pause"
+msgstr "Pauza"
+
+#: src/gtkui/ui_gtk.cc:868 src/moonstone/main_window.cc:57
+#: src/qtui/main_window.cc:145 src/skins/menus.cc:86 src/skins-qt/menus.cc:77
+msgid "Search Library"
+msgstr "Kutubxonani qidirish"
+
+#: src/gtkui/ui_gtk.cc:875 src/moonstone/main_window.cc:60
+#: src/qtui/main_window.cc:147
+msgid "Open Files"
+msgstr "Fayllarni ochish"
+
+#: src/gtkui/ui_gtk.cc:876 src/moonstone/main_window.cc:62
+#: src/qtui/main_window.cc:149
+msgid "Add Files"
+msgstr "Fayllarni qo'shish"
+
+#: src/gtkui/ui_gtk.cc:881 src/moonstone/main_window.cc:65
+#: src/qtui/main_window.cc:152 src/skins/menus.cc:112 src/skins-qt/menus.cc:103
+msgid "Previous"
+msgstr "Oldingi"
+
+#: src/gtkui/ui_gtk.cc:883 src/hotkey/gui.cc:74 src/moonstone/main_window.cc:69
+#: src/qthotkey/gui.cc:69 src/qtui/main_window.cc:156 src/skins/menus.cc:111
+#: src/skins-qt/menus.cc:102
+msgid "Stop"
+msgstr "To'xtatish"
+
+#: src/gtkui/ui_gtk.cc:884 src/moonstone/main_window.cc:76 src/notify/osd.cc:89
+#: src/qtui/main_window.cc:163 src/skins/menus.cc:113 src/skins-qt/menus.cc:104
+msgid "Next"
+msgstr "Keyingi"
+
+#: src/gtkui/ui_gtk.cc:886 src/moonstone/main_window.cc:79
+#: src/qtui/main_window.cc:166 src/qtui/menus.cc:254 src/skins/menus.cc:79
+#: src/skins-qt/menus.cc:69
+msgid "Record Stream"
+msgstr "Oqim yozib olish"
+
+#: src/gtkui/ui_gtk.cc:919 src/moonstone/main_window.cc:86
+#: src/qtui/main_window.cc:173 src/skins/menus.cc:103 src/skins-qt/menus.cc:94
+msgid "Repeat"
+msgstr "Takrorlash"
+
+#: src/gtkui/ui_gtk.cc:922 src/moonstone/main_window.cc:89
+#: src/qtui/main_window.cc:176 src/skins/menus.cc:104 src/skins-qt/menus.cc:95
+msgid "Shuffle"
+msgstr "Aralashtirish"
+
+#: src/gtkui/ui_gtk.cc:1114 src/qtui/main_window.cc:123
+msgid "Menu"
+msgstr "Menyu"
+
+#: src/gtkui/ui_statusbar.cc:64 src/qtui/status_bar.cc:155
+msgid "mono"
+msgstr "mono"
+
+#: src/gtkui/ui_statusbar.cc:66 src/qtui/status_bar.cc:157
+msgid "stereo"
+msgstr "stereo"
+
+#: src/gtkui/ui_statusbar.cc:68 src/qtui/status_bar.cc:160
+#, c-format
+msgid "%d channel"
+msgid_plural "%d channels"
+msgstr0 "%d kanal"
+
+#: src/gtkui/ui_statusbar.cc:76 src/qtui/status_bar.cc:168
+#, c-format
+msgid "%d kHz"
+msgstr "%d kGts"
+
+#: src/gtkui/ui_statusbar.cc:82 src/qtui/status_bar.cc:174
+#, c-format
+msgid "%d kbit/s"
+msgstr ""
+
+#: src/gtkui/ui_statusbar.cc:108 src/skins/main.cc:478 src/skins-qt/main.cc:461
+msgid "Single mode."
+msgstr "Yagona rejim."
+
+#: src/gtkui/ui_statusbar.cc:110 src/skins/main.cc:480 src/skins-qt/main.cc:463
+msgid "Playlist mode."
+msgstr "Pleylist rejimi."
+
+#: src/gtkui/ui_statusbar.cc:118 src/skins/main.cc:486 src/skins-qt/main.cc:469
+msgid "Stopping after song."
+msgstr "Qo'shiqdan keyin to'xtash."
+
+#: src/hotkey/gui.cc:71 src/qthotkey/gui.cc:66
+msgid "Previous track"
+msgstr "Oldingi trek"
+
+#: src/hotkey/gui.cc:73 src/qthotkey/gui.cc:68
+msgid "Pause/Resume"
+msgstr "To'xtatib turish/Davom ettirish"
+
+#: src/hotkey/gui.cc:75 src/qthotkey/gui.cc:70
+msgid "Next track"
+msgstr "Keyingi trek"
+
+#: src/hotkey/gui.cc:76 src/qthotkey/gui.cc:71
+msgid "Step forward"
+msgstr "Oldinga qadam"
+
+#: src/hotkey/gui.cc:77 src/qthotkey/gui.cc:72
+msgid "Step backward"
+msgstr "Orqaga qadam"
+
+#: src/hotkey/gui.cc:78 src/qthotkey/gui.cc:73
+msgid "Mute"
+msgstr "Ovozsiz"
+
+#: src/hotkey/gui.cc:79 src/qthotkey/gui.cc:74
+msgid "Volume up"
+msgstr "Ovozni ko'tarish"
+
+#: src/hotkey/gui.cc:80 src/qthotkey/gui.cc:75
+msgid "Volume down"
+msgstr "Ovozni pasaytirish"
+
+#: src/hotkey/gui.cc:81 src/qthotkey/gui.cc:76
+msgid "Jump to file"
+msgstr "Faylga o'tish"
+
+#: src/hotkey/gui.cc:82 src/qthotkey/gui.cc:77
+msgid "Toggle player window(s)"
+msgstr "Pleyer oynasini (oynalarini) almashtirish"
+
+#: src/hotkey/gui.cc:83 src/qthotkey/gui.cc:78
+msgid "Show On-Screen-Display"
+msgstr "Ekrandagi displeyni ko'rsatish"
+
+#: src/hotkey/gui.cc:84 src/qthotkey/gui.cc:79
+msgid "Toggle repeat"
+msgstr "Takrorlashni yoqish/o‘chirish"
+
+#: src/hotkey/gui.cc:85 src/qthotkey/gui.cc:80
+msgid "Toggle shuffle"
+msgstr "Aralashtirishni yoqish/o‘chirish"
+
+#: src/hotkey/gui.cc:86 src/qthotkey/gui.cc:81
+msgid "Toggle stop after current"
+msgstr "Joriydan keyin almashtirishni to'xtatish"
+
+#: src/hotkey/gui.cc:87 src/qthotkey/gui.cc:82
+msgid "Raise player window(s)"
+msgstr "Pleyer oynasini (oynalarini) ko'tarish"
+
+#: src/hotkey/gui.cc:98 src/qthotkey/gui.cc:100
+msgid "(none)"
+msgstr "(yo'q)"
+
+#: src/hotkey/gui.cc:261
+msgid ""
+"It is not recommended to bind the primary mouse buttons without modifiers.\n"
+"\n"
+"Do you want to continue?"
+msgstr ""
+"Sichqonchaning asosiy tugmalarini modifikatorlarsiz bog'lash tavsiya "
+"etilmaydi.\n"
+"\n"
+"Davom etishni xohlaysizmi?"
+
+#: src/hotkey/gui.cc:264
+msgid "Binding mouse buttons"
+msgstr "Sichqoncha tugmachalarini bog'lash"
+
+#: src/hotkey/gui.cc:434
+msgid ""
+"Press a key combination inside a text field.\n"
+"You can also bind mouse buttons."
+msgstr ""
+"Matn maydonidagi tugmalar birikmasini bosing.\n"
+"Sichqoncha tugmachalarini ham bog'lashingiz mumkin."
+
+#: src/hotkey/gui.cc:444 src/qthotkey/gui.cc:179
+msgid "Hotkeys:"
+msgstr "Tezkor tugmalar:"
+
+#: src/hotkey/gui.cc:457 src/qthotkey/gui.cc:181
+msgid "Action:"
+msgstr "Harakat:"
+
+#: src/hotkey/gui.cc:461 src/qthotkey/gui.cc:182
+msgid "Key Binding:"
+msgstr "Kalit bog'lash:"
+
+#: src/hotkey/gui.cc:518 src/qthotkey/gui.cc:184
+msgid "_Add"
+msgstr "_Qo'shish"
+
+#: src/hotkey/plugin.cc:59 src/qthotkey/plugin.cc:78
+msgid "Global Hotkeys"
+msgstr "Global tezkor tugmalar"
+
+#: src/hotkey/plugin.cc:74
+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"
+"Contributors 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 tezkor tugmalar plagini\n"
+"Pleyerni global tugmalar birikmalari yoki multimedia tugmalari bilan "
+"boshqarish.\n"
+"\n"
+"Mualliflik huquqi (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n"
+"\n"
+"Ishtirokchilar:\n"
+"Mualliflik huquqi (C) 2006-2007 Vladimir Paskov <vlado.paskov@gmail.com>\n"
+"Mualliflik huquqi (C) 2000-2002 Ville Syrjälä <syrjala@sci.fi>,\n"
+"Bryn Davies <curious@ihug.com.au>,\n"
+"Jonatan A. Davis <davis@jdhouse.org>,\n"
+"Jeremi Tan <nsx@nsx.homeip.net>"
+
+#: src/jack/jack-ng.cc:54
+msgid "JACK Output"
+msgstr "JACK chiqishi"
+
+#: src/jack/jack-ng.cc:126
+msgid "Client name:"
+msgstr "Mijoz nomi:"
+
+#: src/jack/jack-ng.cc:128
+msgid "Automatically connect to output ports"
+msgstr "Chiqarish portlariga avtomatik ulanish"
+
+#: src/jack/jack-ng.cc:130
+msgid "Filter ports (regex, use any port if blank):"
+msgstr ""
+"Portlarni filtrlash (regex, bo'sh bo'lsa, istalgan portdan foydalaning):"
+
+#: src/jack/jack-ng.cc:136
+msgid "Connect to physical ports only"
+msgstr "Faqat jismoniy portlarga ulanish"
+
+#: src/jack/jack-ng.cc:139
+msgid "Upmix to"
+msgstr "Upmix to"
+
+#: src/jack/jack-ng.cc:141
+msgid "ports if input has fewer channels"
+msgstr "ports if input has fewer channels"
+
+#: src/jack/jack-ng.cc:143
+msgid "Ignore insufficient number of ports"
+msgstr "Portlar soni yetarli emasligiga e'tibor bermaslik"
+
+#: src/jack/jack-ng.cc:181
+msgid "No JACK output ports were found. Please check settings."
+msgstr "JACK chiqish portlari topilmadi. Iltimos, sozlamalarni tekshiring."
+
+#: src/jack/jack-ng.cc:195
+#, c-format
+msgid "Only %d JACK output ports were found but %d are required."
+msgstr "Faqat %d JACK chiqish portlari topildi, lekin %d talab qilinadi."
+
+#: src/jack/jack-ng.cc:210
+#, c-format
+msgid "Failed to connect to JACK port %s."
+msgstr "%s JACK portiga ulanib bo‘lmadi.."
+
+#: src/jack/jack-ng.cc:230
+msgid ""
+"JACK supports only floating-point audio. You must change the output bit "
+"depth to floating-point in Audacious settings."
+msgstr ""
+"JACK faqat suzuvchi nuqtali audioni qo'llab-quvvatlaydi. Audacious "
+"sozlamalarida chiqish bit chuqurligini suzuvchi nuqtaga o'zgartirishingiz "
+"kerak."
+
+#: src/jack/jack-ng.cc:245
+msgid "Failed to connect to the JACK server; is it running?"
+msgstr "JACK serveriga ulanib bo'lmadi, ishga tushirilganmi?"
+
+#: src/jack/jack-ng.cc:321
+#, c-format
+msgid ""
+"The JACK server requires a sample rate of %d Hz, but Audacious is playing at "
+"%d Hz. Please use the Sample Rate Converter effect to correct the mismatch."
+msgstr ""
+"JACK serveri %dGts namuna tezligini talab qiladi, lekin Audacious %d Gts da "
+"ijro ettirmoqda. Iltimos, nomuvofiqlikni tuzatish uchun Sample Rate "
+"Converter effektidan foydalaning."
+
+#: src/ladspa/plugin.cc:416
+#, c-format
+msgid "%s Settings"
+msgstr "%s sozlamalari"
+
+#: src/ladspa/plugin.cc:482
+msgid "Module paths:"
+msgstr "Modul yo'llari:"
+
+#: src/ladspa/plugin.cc:487
+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 ""
+"Ikki nuqta bilan bir nechta yo'llarni ajrating.\n"
+"Bu yoʻllar LADSPA_PATH ga qoʻshimcha ravishda qidiriladi.\n"
+"Yangi yo'llarni qo'shgandan so'ng, yangi plaginlarni skanerlash uchun Enter "
+"tugmasini bosing."
+
+#: src/ladspa/plugin.cc:508
+msgid "Available plugins:"
+msgstr "Mavjud plaginlar:"
+
+#: src/ladspa/plugin.cc:521 src/modplug/plugin_main.cc:91
+#: src/modplug/plugin_main.cc:94 src/modplug/plugin_main.cc:97
+#: src/modplug/plugin_main.cc:100
+msgid "Enable"
+msgstr "Yoqish"
+
+#: src/ladspa/plugin.cc:527
+msgid "Enabled plugins:"
+msgstr "Yoqilgan plaginlar:"
+
+#: src/ladspa/plugin.cc:543
+msgid "Settings"
+msgstr "Sozlamalar"
+
+#: src/ladspa/plugin.cc:560
+msgid ""
+"LADSPA Host for Audacious\n"
+"Copyright 2011 John Lindgren"
+msgstr ""
+"Audacious uchun LADSPA xosti\n"
+"Mualliflik huquqi 2011 Jon Lindgren"
+
+#: src/ladspa/plugin.h:78
+msgid "LADSPA Host"
+msgstr "LADSPA xosti"
+
+#: src/lirc/lirc.cc:55
+msgid "LIRC Plugin"
+msgstr "LIRC plagini"
+
+#: src/lirc/lirc.cc:379
+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 masofadan boshqarish pulti yordamida Audacious ni boshqarish uchun "
+"oddiy plagin\n"
+"\n"
+"Audacious uchun moslashtirilgan:\n"
+"Toni Vroon <chainsaw@gentoo.org>\n"
+"Joonas Harjumäki <jharjuma@gmail.com>\n"
+"\n"
+"XMMS LIRC plaginida asoslangan:\n"
+"Karl van Schaik <carl@leg.uct.ac.za>\n"
+"Kristof Bartelmus <xmms@bartelmus.de>\n"
+"Endryu O. Shadoura <bugzilla@tut.by>\n"
+"\n"
+"LIRC haqida ko'proq ma'lumot olish uchun http://lirc.org ga qarang."
+
+#: src/lirc/lirc.cc:390
+msgid "Connection"
+msgstr "Ulanish"
+
+#: src/lirc/lirc.cc:391
+msgid "Reconnect to LIRC server"
+msgstr "LIRC serveriga qayta ulanish"
+
+#: src/lirc/lirc.cc:393
+msgid "Wait before reconnecting:"
+msgstr "Qayta ulanishdan oldin kutish:"
+
+#: src/lyrics-common/chart_lyrics_provider.cc:93
+#: src/lyrics-common/chart_lyrics_provider.cc:150
+#: src/lyrics-common/lyrics_ovh_provider.cc:50
+#, c-format
+msgid "Unable to fetch %s"
+msgstr "%s olib bo‘lmadi"
+
+#: src/lyrics-common/chart_lyrics_provider.cc:100
+#: src/lyrics-common/chart_lyrics_provider.cc:157
+#: src/lyrics-common/lyrics_ovh_provider.cc:57
+#, c-format
+msgid "Unable to parse %s"
+msgstr "%s tahlil qilib boʻlmadi"
+
+#: src/lyrics-common/chart_lyrics_provider.cc:121
+#: src/lyrics-common/chart_lyrics_provider.cc:194
+#: src/lyrics-common/lyrics_ovh_provider.cc:88
+msgid "Looking for lyrics ..."
+msgstr "Qo'shiq matni qidirilmoqda..."
+
+#: src/lyrics-common/preferences.h:43
+msgid "Nowhere"
+msgstr "Hech qayerda"
+
+#: src/lyrics-common/preferences.h:49
+msgid "Artist is truncated at the start, Title -- at the end"
+msgstr "Artist boshida, sarlavha - oxirida qisqartiriladi"
+
+#: src/lyrics-common/preferences.h:50
+msgid "Chars to truncate on:"
+msgstr "Kesish uchun belgilar:"
+
+#: src/lyrics-common/preferences.h:54
+msgid "Chars are ORed in RegExp, surrounded by whitespace"
+msgstr "Chars are ORed in RegExp, surrounded by whitespace"
+
+#: src/lyrics-common/preferences.h:55
+msgid "Chars to split on:"
+msgstr "Bo'lish uchun belgilar:"
+
+#: src/lyrics-common/preferences.h:56
+msgid "Further truncate those on chars"
+msgstr "Belgilardagilarni yanada qisqartirish"
+
+#: src/lyrics-common/preferences.h:62
+msgid "General"
+msgstr "Umumiy"
+
+#: src/lyrics-common/preferences.h:63
+msgid "Split title into artist and title on chars"
+msgstr "Sarlavhani artistga va sarlavhani belgilarga ajrating"
+
+#: src/lyrics-common/preferences.h:66
+msgid "Sources"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:67
+msgid "Use embedded lyrics (from Lyrics tag)"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:69
+msgid "Fetch lyrics from internet:"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:72
+msgid "Store fetched lyrics in local cache"
+msgstr "Olingan qo'shiq matnlarini mahalliy keshda saqlash"
+
+#: src/lyrics-common/preferences.h:74
+msgid "Local Storage"
+msgstr "Mahalliy saqlash joyi"
+
+#: src/lyrics-common/preferences.h:75
+msgid "Load lyric files (.lrc) from local storage"
+msgstr "Qo'shiq matnlarini fayllarni (.lrc) mahalliy xotiradan yuklash"
+
+#: src/lyrics-common/utils.cc:54 src/ui-common/dialogs-qt.cc:63
+msgid "Error"
+msgstr "Xato"
+
+#: src/lyrics-common/utils.cc:60
+msgid "Lyrics could not be found."
+msgstr "Qoʻshiq matni topilmadi."
+
+#: src/lyrics-common/utils.cc:142
+msgid "Missing title and/or artist."
+msgstr "Sarlavha va/yoki artist yetishmayapti."
+
+#: src/lyrics-gtk/lyrics-gtk.cc:37 src/lyrics-qt/lyrics-qt.cc:50
+msgid "Lyrics"
+msgstr "Qo'shiq matni"
+
+#: src/lyrics-gtk/lyrics-gtk.cc:189 src/lyrics-qt/lyrics-qt.cc:171
+msgid "Edit Lyrics ..."
+msgstr ""
+
+#: src/lyrics-gtk/lyrics-gtk.cc:195 src/lyrics-qt/lyrics-qt.cc:178
+msgid "Save Locally"
+msgstr "Mahalliy ravishda saqlash"
+
+#: src/lyrics-gtk/lyrics-gtk.cc:201 src/lyrics-qt/lyrics-qt.cc:186
+msgid "Refresh"
+msgstr "Yangilash"
+
+#: src/m3u/m3u.cc:33
+msgid "M3U Playlists"
+msgstr "M3U pleylistlari"
+
+#: src/metronom/metronom.cc:44
+msgid "Tact Generator"
+msgstr "Takt generatori"
+
+#: src/metronom/metronom.cc:145
+#, c-format
+msgid "Tact generator: %d bpm"
+msgstr "Takt generatori: %d zarba/daq "
+
+#: src/metronom/metronom.cc:147
+#, c-format
+msgid "Tact generator: %d bpm %d/%d"
+msgstr " Takt generatori: %d zarba/daq %d/%d"
+
+#: src/metronom/metronom.cc:235
+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 tomonidan Takt generatori <mys@faveve.uni-stuttgart.de>\n"
+"\n"
+"Undan foydalanish uchun URL manzilini qo'shing: tact://beats*num/den\n"
+"masalan daqiqada 77 zarba ijro ettirish uchun tact://77\n"
+"yoki tact://60*3/4 3/4 taktda 60 zarba/daqiqada ijro ettirish uchun"
+
+#: src/mixer/mixer.cc:43
+msgid "Channel Mixer"
+msgstr "Kanal mikser"
+
+#: src/mixer/mixer.cc:255
+msgid ""
+"Channel Mixer Plugin for Audacious\n"
+"Copyright 2011-2012 John Lindgren and Michał Lipski"
+msgstr ""
+"Audacious uchun kanal mikser plagini\n"
+"Mualliflik huquqi 2011-2012 Jon Lindgren va Mixal Lipski"
+
+#: src/mixer/mixer.cc:259
+msgid "Channel Mixer"
+msgstr "Kanal mikser"
+
+#: src/mixer/mixer.cc:260
+msgid "Output channels:"
+msgstr "Chiqish kanallari:"
+
+#: src/mms/mms.cc:35
+msgid "MMS Plugin"
+msgstr "MMS plagin"
+
+#: src/mms/mms.cc:82
+msgid "Error connecting to MMS server"
+msgstr "MMS serveriga ulanishda xatolik yuz berdi"
+
+#: src/modplug/modplugbmp.h:57
+msgid "ModPlug (Module Player)"
+msgstr "ModPlug (modul pleyer)"
+
+#: src/modplug/plugin_main.cc:55
+msgid "Channels"
+msgstr "Kanallar"
+
+#: src/modplug/plugin_main.cc:59
+msgid "Nearest (fastest)"
+msgstr "Eng yaqin (eng tez)"
+
+#: src/modplug/plugin_main.cc:60
+msgid "Linear (fast)"
+msgstr "Chiziqli (tez)"
+
+#: src/modplug/plugin_main.cc:61
+msgid "Spline (good)"
+msgstr "Splayn (yaxshi)"
+
+#: src/modplug/plugin_main.cc:62
+msgid "Polyphase (best)"
+msgstr "Ko'p fazali (eng yaxshi)"
+
+#: src/modplug/plugin_main.cc:63
+msgid "Sample rate"
+msgstr "Namuna tezligi"
+
+#: src/modplug/plugin_main.cc:64
+msgid "22 kHz"
+msgstr "22 kGts"
+
+#: src/modplug/plugin_main.cc:65
+msgid "44 kHz"
+msgstr "44 kGts"
+
+#: src/modplug/plugin_main.cc:66
+msgid "48 kHz"
+msgstr "48 kGts"
+
+#: src/modplug/plugin_main.cc:67
+msgid "96 kHz"
+msgstr "96 kGts"
+
+#: src/modplug/plugin_main.cc:71 src/modplug/plugin_main.cc:76
+#: src/modplug/plugin_main.cc:81
+msgid "Level:"
+msgstr "Daraja:"
+
+#: src/modplug/plugin_main.cc:77
+msgid "Cutoff:"
+msgstr "Kesish:"
+
+#: src/modplug/plugin_main.cc:90
+msgid "Reverb"
+msgstr "Reverberatsiya"
+
+#: src/modplug/plugin_main.cc:93
+msgid "Bass Boost"
+msgstr "Bass kuchaytirish"
+
+#: src/modplug/plugin_main.cc:96
+msgid "Surround"
+msgstr "Surround"
+
+#: src/modplug/plugin_main.cc:99
+msgid "Preamp"
+msgstr "Oldindan kuchaytirgich"
+
+#: src/modplug/plugin_main.cc:106
+msgid "Oversample"
+msgstr "Ortiqcha namuna"
+
+#: src/modplug/plugin_main.cc:107
+msgid "Noise reduction"
+msgstr "Shovqinni kamaytirish"
+
+#: src/modplug/plugin_main.cc:108
+msgid "Play Amiga MODs"
+msgstr "Amiga MOD larini ijro ettirish"
+
+#: src/modplug/plugin_main.cc:109
+msgid "Repeat"
+msgstr "Takrorlash"
+
+#: src/modplug/plugin_main.cc:110
+msgid "Repeat count:"
+msgstr "Takrorlanish soni:"
+
+#: src/modplug/plugin_main.cc:111
+msgid "To repeat forever, set the repeat count to -1."
+msgstr "Abadiy takrorlash uchun takrorlash sonini -1 ga o'rnating."
+
+#: src/modplug/plugin_main.cc:124 src/sid/xs_config.cc:106
+msgid "These settings will take effect when Audacious is restarted."
+msgstr "Ushbu sozlamalar Audacious qayta ishga tushirilganda kuchga kiradi."
+
+#: src/moonstone/main_window.cc:72 src/moonstone/main_window.cc:73
+#: src/qtui/main_window.cc:159 src/qtui/main_window.cc:160
+#: src/skins/menus.cc:107 src/skins-qt/menus.cc:98
+msgid "Stop After This Song"
+msgstr "Bu qo'shiqdan keyin to'xtatish"
+
+#: src/moonstone/moonstone.cc:39
+msgid "Moonstone"
+msgstr "Moonstone"
+
+#: src/moonstone/playlist_header.cc:212 src/qtui/playlist_header.cc:258
+msgid "Reset to Defaults"
+msgstr "Asl holatiga qaytarish"
+
+#: src/moonstone/playlist_model.cc:38 src/qtui/playlist_header.cc:232
+msgid "Now Playing"
+msgstr "Hozir ijro etilmoqda"
+
+#: src/moonstone/playlist_selection.cc:66
+#: src/playlist-manager/playlist-manager.cc:201
+#: src/playlist-manager-qt/playlist-manager-qt.cc:190
+msgid "Entries"
+msgstr "Yozuvlar"
+
+#: src/mpg123/mpg123.cc:54
+msgid "MPG123 Plugin"
+msgstr "MPG123 plagin"
+
+#: src/mpg123/mpg123.cc:82
+msgid "Use accurate length calculation (slow)"
+msgstr "To'g'ri uzunlik hisobini ishlatish (sekin)"
+
+#: src/mpg123/mpg123.cc:260
+msgid "Surround"
+msgstr "Surround"
+
+#: src/mpris2/plugin.cc:40
+msgid "MPRIS 2 Server"
+msgstr "MPRIS 2 serveri"
+
+#: src/neon/neon.cc:102
+msgid "Neon HTTP/HTTPS Plugin"
+msgstr "Neon HTTP/HTTPS plagini"
+
+#: src/neon/neon.cc:526
+msgid "Error parsing redirect"
+msgstr "Qayta yoʻnaltirishni tahlil qilishda xatolik yuz berdi"
+
+#: src/neon/neon.cc:540
+msgid "Unknown HTTP error"
+msgstr "Noma'lum HTTP xatosi"
+
+#: src/neon/neon.cc:614
+msgid "Error parsing URL"
+msgstr "URL ni tahlil qilishda xatolik yuz berdi"
+
+#: src/neon/neon.cc:687
+msgid "Too many redirects"
+msgstr "Yo‘naltirishlar juda ko‘p"
+
+#: src/notify/event.cc:97
+msgid "Stopped"
+msgstr "To'xtatildi"
+
+#: src/notify/event.cc:97
+msgid "Audacious is not playing."
+msgstr "Audacious ijro ettirilmayapti."
+
+#: src/notify/notify.cc:39
+msgid "Desktop Notifications"
+msgstr "Ish stoli bildirishnomalari"
+
+#: src/notify/notify.cc:57
+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 uchun ish stoli bildirishnomalari plagini\n"
+"Mualliflik huquqi (C) 2010 Maksimilian Bogner\n"
+"Mualliflik huquqi (C) 2011-2013 Jon Lindgren va Jan-Aleksandr Angles "
+"d'Auriak\n"
+"\n"
+"Ushbu plagin bepul dasturiy ta'minotdir: siz uni qayta tarqatishingiz va/"
+"yoki uni Free Software Foundation tomonidan e'lon qilingan GNU General "
+"Public License shartlariga muvofiq, Litsenziyaning 3-versiyasi yoki (sizning "
+"xohishingizga ko'ra) har qanday keyingi versiyada o'zgartirishingiz mumkin.\n"
+"\n"
+"Ushbu plagin foydali bo'ladi degan umidda tarqatiladi, lekin HAR QANDAY "
+"KAFOLATSIZ; SOVLASH MUVOFIQligi yoki MAQSUS MAQSADGA MUVOFIQligi "
+"to'g'risidagi nazarda tutilgan kafolatsiz ham. Batafsil ma'lumot uchun GNU "
+"General Public License-ga qarang.\n"
+"\n"
+"Siz ushbu dastur bilan birga GNU General Public License nusxasini olishingiz "
+"kerak edi. Aks holda, <http://www.gnu.org/licenses/> ga qarang. "
+
+#: src/notify/notify.cc:104
+msgid "Show playback controls"
+msgstr "Ijro qilish boshqaruvlarini ko‘rsatish"
+
+#: src/notify/notify.cc:106
+msgid "Always show notification"
+msgstr "Har doim bildirishnomani ko'rsatish"
+
+#: src/notify/notify.cc:108
+msgid "Include album name in notification"
+msgstr "Bildirishnomaga albom nomini kiritish"
+
+#: src/notify/notify.cc:110
+msgid "Custom notification duration:"
+msgstr "Moslashtirilgan bildirishnoma muddati:"
+
+#: src/notify/osd.cc:74
+msgid "Show"
+msgstr "Ko'rsatish"
+
+#: src/openmpt/mpt.cc:50
+msgid "OpenMPT (Module Player)"
+msgstr "OpenMPT (modul pleyer)"
+
+#: src/openmpt/mpt.cc:132
+msgid ""
+"Module player based on libopenmpt\n"
+"\n"
+"Written by: Chris Spiegel <cspiegel@gmail.com>"
+msgstr ""
+"Libopenmpt asosidagi modul pleer\n"
+"\n"
+"Muallif: Chris Spiegel <cspiegel@gmail.com> "
+
+#: src/openmpt/mpt.cc:151
+msgid "Stereo separation:"
+msgstr "Stereo ajratish:"
+
+#: src/openmpt/mpt.cc:153
+msgid "% (0=mono, 100=default, 200=full)"
+msgstr ""
+
+#: src/openmpt/mpt.cc:157
+msgid "Interpolation:"
+msgstr "Interpolyatsiya:"
+
+#: src/openmpt/mptwrap.h:51 src/soxr/sox-resampler.cc:189 src/xsf/plugin.cc:437
+msgid "Linear"
+msgstr "Chiziqli"
+
+#: src/openmpt/mptwrap.h:52
+msgid "Cubic"
+msgstr "Kubik"
+
+#: src/openmpt/mptwrap.h:53
+msgid "Windowed sinc"
+msgstr "Oynali sinc"
+
+#: src/opus/opus.cc:39
+msgid "Opus Decoder"
+msgstr ""
+
+#: src/opus/opus.cc:336
+msgid ""
+"Opus Decoder Plugin for Audacious\n"
+"Copyright 2022 Thomas Lange"
+msgstr ""
+
+#: src/oss4/oss.h:70
+msgid "OSS4 Output"
+msgstr "OSS4 chiqishi"
+
+#: src/oss4/oss.h:72
+msgid "OSS3 Output"
+msgstr "OSS3 chiqishi"
+
+#: src/oss4/plugin.cc:35
+msgid "Default device"
+msgstr "Standart qurilma"
+
+#: src/oss4/plugin.cc:78
+msgid "Audio device:"
+msgstr "Audio qurilma:"
+
+#: src/oss4/plugin.cc:81
+msgid "Use alternate device:"
+msgstr "Muqobil qurilmadan foydalanish:"
+
+#: src/oss4/plugin.cc:85
+msgid "Save volume between sessions."
+msgstr "Seanslar orasidagi ovoz balandligini saqlash."
+
+#: src/oss4/plugin.cc:87
+msgid "Enable format conversions made by the OSS software."
+msgstr ""
+"OSS dasturi tomonidan amalga oshirilgan formatni o'zgartirishni yoqish."
+
+#: src/oss4/plugin.cc:89
+msgid "Enable exclusive mode to prevent virtual mixing."
+msgstr ""
+"Virtual aralashtirishning oldini olish uchun eksklyuziv rejimni yoqish."
+
+#: src/oss4/plugin.cc:101
+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 uchun OSS4 chiqish plagini\n"
+"Mualliflik huquqi 2010-2012 Michał Lipski\n"
+"\n"
+"Men #audacious-dagi odamlarga, ayniqsa Toni Vroon va Jon Lindgrenga va, "
+"albatta, avvalgi OSS plaginining mualliflariga minnatdorchilik "
+"bildirmoqchiman. "
+
+#: src/pipewire/pipewire.cc:44
+msgid "PipeWire Output"
+msgstr ""
+
+#: src/pipewire/pipewire.cc:118
+msgid ""
+"PipeWire Output Plugin for Audacious\n"
+"Copyright 2022 Thomas Lange\n"
+"\n"
+"Based on the PipeWire Output Plugin for Qmmp\n"
+"Copyright 2021 Ilya Kotov"
+msgstr ""
+
+#: src/pipewire/pipewire.cc:408 src/skins/menus.cc:88 src/skins-qt/menus.cc:79
+msgid "Playback"
+msgstr "Ijro"
+
+#: src/playlist-manager/playlist-manager.cc:38
+#: src/playlist-manager-qt/playlist-manager-qt.cc:42
+msgid "Playlist Manager"
+msgstr "Pleylist menejeri"
+
+#: src/playlist-manager/playlist-manager.cc:221
+#: src/playlist-manager-qt/playlist-manager-qt.cc:356
+msgid "_Remove"
+msgstr "_O'chirish"
+
+#: src/playlist-manager/playlist-manager.cc:222
+#: src/playlist-manager-qt/playlist-manager-qt.cc:351
+msgid "Ren_ame"
+msgstr "Nomini o'zgartirish"
+
+#: src/pls/pls.cc:35
+msgid "PLS Playlists"
+msgstr "PLS pleylistlari"
+
+#: src/psf/plugin.cc:53
+msgid "OpenPSF PSF1/PSF2 Decoder"
+msgstr "OpenPSF PSF1/PSF2 dekoderi"
+
+#: src/psf/plugin.cc:270
+msgid "OpenPSF Configuration"
+msgstr "OpenPSF konfiguratsiyasi"
+
+#: src/psf/plugin.cc:271 src/xsf/plugin.cc:444
+msgid "Ignore length from file"
+msgstr "Fayldagi uzunlikka e'tibor bermaslik"
+
+#: src/pulse/pulse_audio.cc:42
+msgid "PulseAudio Output"
+msgstr "PulseAudio chiqishi"
+
+#: src/pulse/pulse_audio.cc:84
+msgid "Context name:"
+msgstr "Kontekst nomi:"
+
+#: src/pulse/pulse_audio.cc:86
+msgid "Stream name:"
+msgstr "Oqim nomi:"
+
+#: src/pulse/pulse_audio.cc:596
+msgid ""
+"Audacious PulseAudio Output Plugin\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 ""
+"Audacious PulseAudio chiqish plagini\n"
+"\n"
+"Bu dastur bepul dastur hisoblanadi; siz uni qayta tarqatishingiz va/yoki uni "
+"Free Software Foundation tomonidan e'lon qilingan GNU General Public License "
+"shartlariga muvofiq o'zgartirishingiz mumkin; Litsenziyaning 2-versiyasi "
+"yoki (sizning xohishingizga ko'ra) har qanday keyingi versiyasi.\n"
+"\n"
+"Ushbu dastur foydali bo'ladi degan umidda tarqatiladi, lekin HAR QANDAY "
+"KAFOLATSIZ; SOVLASH MUVOFIQligi yoki MAQSUS MAQSADGA MUVOFIQligi "
+"to'g'risidagi nazarda tutilgan kafolatsiz ham. Batafsil ma'lumot uchun GNU "
+"General Public License-ga qarang.\n"
+"\n"
+"Siz ushbu dastur bilan birga GNU General Public License nusxasini olishingiz "
+"kerak edi; bo'lmasa, Free Software Foundation, Inc., 51 Franklin Street, "
+"Fifth Floor, Boston, MA 02110-1301, AQSH ga yozing."
+
+#: src/qtaudio/qtaudio.cc:53
+msgid "QtMultimedia Output"
+msgstr "QtMultimedia chiqishi"
+
+#: src/qtaudio/qtaudio.cc:84
+msgid ""
+"QtMultimedia Audio Output Plugin for Audacious\n"
+"Copyright 2014 William Pitcock\n"
+"\n"
+"Based on SDL Output Plugin for Audacious\n"
+"Copyright 2010 John Lindgren"
+msgstr ""
+"Audacious uchun QtMultimedia audio chiqish plagini\n"
+"Mualliflik huquqi 2014 Uilyam Pitkok\n"
+"\n"
+"Audacious uchun SDL chiqish plaginiga asoslangan\n"
+"Mualliflik huquqi 2010 Jon Lindgren"
+
+#: src/qtglspectrum/gl-spectrum.cc:41
+msgid ""
+"OpenGL Spectrum Analyzer for Audacious\n"
+"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
+"Copyright 2014, 2020 Ariadne Conill\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 uchun OpenGL Spektr analizatori\n"
+"Mualliflik huquqi 2013 Kristof Bude, Jon Lindgren va Karlo Bramini\n"
+"Mualliflik huquqi 2014, 2020 Ariadne Conill\n"
+"\n"
+"XMMS plagini asosida:\n"
+"Mualliflik huquqi 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Tomas "
+"Nilsson va 4Front Technologies\n"
+"\n"
+"Litsenziya: GPLv2+ "
+
+#: src/qthotkey/gui.cc:177
+msgid "Press a key combination inside a text field."
+msgstr "Matn maydoni ichiga tugmalar birikmasini bosing."
+
+#: src/qthotkey/plugin.cc:105
+msgid ""
+"Global Hotkey Plugin\n"
+"Control the player with global key combinations or multimedia keys.\n"
+"\n"
+"Copyright (C) 2020 i.Dark_Templar <darktemplar@dark-templar-archives.net>\n"
+"Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n"
+"\n"
+"Contributors 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 tezkor tugma plagini\n"
+"Pleyerni global tugmalar birikmalari yoki multimedia tugmalari bilan "
+"boshqaring.\n"
+"\n"
+"Mualliflik huquqi (C) 2020 i.Dark_Templar <darktemplar@dark-templar-archives."
+"net>\n"
+"Mualliflik huquqi (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n"
+"\n"
+"Ishtirokchilar:\n"
+"Mualliflik huquqi (C) 2006-2007 Vladimir Paskov <vlado.paskov@gmail.com>\n"
+"Mualliflik huquqi (C) 2000-2002 Ville Syrjälä <syrjala@sci.fi>,\n"
+"Bryn Davies <curious@ihug.com.au>,\n"
+"Jonatan A. Devis <davis@jdhouse.org>,\n"
+"Jeremi Tan <nsx@nsx.homeip.net> "
+
+#: src/qtui/menus.cc:109
+msgid "_Open Folder ..."
+msgstr "Jildni ochish..."
+
+#: src/qtui/menus.cc:115
+msgid "_Add Folder ..."
+msgstr "Jild qo'shish..."
+
+#: src/qtui/menus.cc:128
+msgid "_Log Inspector ..."
+msgstr "Jurnal inspektori..."
+
+#: src/qtui/menus.cc:220
+msgid "_Find ..."
+msgstr "Topish..."
+
+#: src/qtui/menus.cc:256 src/skins/menus.cc:80 src/skins-qt/menus.cc:70
+msgid "Audio Settings ..."
+msgstr "Audio sozlamalari..."
+
+#: src/qtui/playlist_model.cc:188
+msgid "Q#"
+msgstr "Q#"
+
+#: src/qtui/playlist_model.cc:190
+msgid "T#"
+msgstr "T#"
+
+#: src/qtui/playlist_model.cc:192
+msgid "C#"
+msgstr ""
+
+#: src/qtui/playlist_model.cc:194
+msgid "D#"
+msgstr ""
+
+#: src/qtui/qtui.cc:40
+msgid "Qt Interface"
+msgstr "Qt interfeysi"
+
+#: src/qtui/search_bar.cc:46
+msgid "Search playlist"
+msgstr "Pleylistni qidirish"
+
+#: src/qtui/settings.cc:79
+msgid "Use bold font for column headers"
+msgstr "Ustun sarlavhalari uchun qalin shriftdan foydalanish"
+
+#: src/resample/resample.cc:43
+msgid "Sample Rate Converter"
+msgstr "Namuna tezligi konvertori"
+
+#: src/resample/resample.cc:183
+msgid ""
+"Sample Rate Converter Plugin for Audacious\n"
+"Copyright 2010-2012 John Lindgren"
+msgstr ""
+"Audacious uchun namuna tezligi plagini\n"
+"Mualliflik huquqi 2010-2012 Jon Lindgren "
+
+#: src/resample/resample.cc:187
+msgid "Skip/repeat samples"
+msgstr "Namunalarni o'tkazib yuborish/takrorlash"
+
+#: src/resample/resample.cc:188
+msgid "Linear interpolation"
+msgstr "Chiziqli interpolyatsiya"
+
+#: src/resample/resample.cc:189
+msgid "Fast sinc interpolation"
+msgstr "Tez sink interpolatsiyasi"
+
+#: src/resample/resample.cc:190
+msgid "Medium sinc interpolation"
+msgstr "O'rta sink interpolyatsiyasi"
+
+#: src/resample/resample.cc:191
+msgid "Best sinc interpolation"
+msgstr "Eng yaxshi sink interpolyatsiyasi"
+
+#: src/resample/resample.cc:195
+msgid "Conversion"
+msgstr "Konvertatsiya"
+
+#: src/resample/resample.cc:196
+msgid "Method:"
+msgstr "Usul:"
+
+#: src/resample/resample.cc:199 src/soxr/sox-resampler.cc:203
+msgid "Rate:"
+msgstr "Baho:"
+
+#: src/resample/resample.cc:202
+msgid "Rate Mappings"
+msgstr "Baholash xaritalari"
+
+#: src/resample/resample.cc:203
+msgid "Use rate mappings"
+msgstr "Daraja xaritalashdan foydalanish"
+
+#: src/resample/resample.cc:205
+msgid "8 kHz:"
+msgstr "8 kGts:"
+
+#: src/resample/resample.cc:209
+msgid "16 kHz:"
+msgstr "16 kGts:"
+
+#: src/resample/resample.cc:213
+msgid "22.05 kHz:"
+msgstr "22.05 kGts:"
+
+#: src/resample/resample.cc:217
+msgid "32.0 kHz:"
+msgstr "32.0 kGts:"
+
+#: src/resample/resample.cc:221
+msgid "44.1 kHz:"
+msgstr "44.1 kGts:"
+
+#: src/resample/resample.cc:225
+msgid "48 kHz:"
+msgstr "48 kGts:"
+
+#: src/resample/resample.cc:229
+msgid "88.2 kHz:"
+msgstr "88.2 kGts:"
+
+#: src/resample/resample.cc:233
+msgid "96 kHz:"
+msgstr "96 kGts:"
+
+#: src/resample/resample.cc:237
+msgid "176.4 kHz:"
+msgstr "176.4 kGts:"
+
+#: src/resample/resample.cc:241
+msgid "192 kHz:"
+msgstr "192 kGts:"
+
+#: src/scrobbler2/config_window.cc:29
+msgid "Checking Last.fm access ..."
+msgstr "Last.fm ga kirish tekshirilmoqda..."
+
+#: src/scrobbler2/config_window.cc:35
+msgid ""
+"Your scrobbles are being saved on your computer temporarily. They will be "
+"submitted as soon as Audacious is allowed access."
+msgstr ""
+"Scrobbllar kompyuteringizda vaqtinchalik saqlanmoqda. Ular Audacious ga "
+"kirishga ruxsat berilgan zahoti yuboriladi."
+
+#: src/scrobbler2/config_window.cc:41
+#, c-format
+msgid "Permission granted. Scrobbling for user %s."
+msgstr "Ruxsat berildi. %s foydalanuvchi uchun scrobbling."
+
+#: src/scrobbler2/config_window.cc:44
+msgid ""
+"Permission denied. Open the following URL in a browser, allow Audacious "
+"access to your account, and then click 'Check Permission' again:"
+msgstr ""
+"Ruxsat berilmadi. Brauzerda quyidagi URL manzilini oching, Audacious ga "
+"hisobingizga kirishga ruxsat bering va “Ruxsatni tekshirish” tugmasini yana "
+"bir marta bosing:"
+
+#: src/scrobbler2/config_window.cc:53
+msgid "There was a problem contacting Last.fm."
+msgstr "Last.fm bilan bog‘lanishda muammo yuz berdi."
+
+#: src/scrobbler2/config_window.cc:92
+msgid "Check Permission"
+msgstr "Ruxsatni tekshiring"
+
+#: src/scrobbler2/config_window.cc:93
+msgid "Revoke Permission"
+msgstr "Ruxsatni bekor qilish"
+
+#: src/scrobbler2/config_window.cc:97
+msgid "You need to allow Audacious to scrobble tracks to your Last.fm account."
+msgstr ""
+"Audacious ga Last.fm hisobingizga treklarni siljitishga ruxsat berishingiz "
+"kerak."
+
+#: src/scrobbler2/scrobbler.cc:29
+msgid "Scrobbler 2.0"
+msgstr "Scrobbler 2.0"
+
+#: src/scrobbler2/scrobbler.cc:200
+msgid ""
+"The Scrobbler plugin could not be started.\n"
+"There might be a problem with your installation."
+msgstr ""
+"Scrobbler plaginini ishga tushirib bo‘lmadi.\n"
+"O'rnatishingizda muammo bo'lishi mumkin."
+
+#: src/scrobbler2/scrobbler.cc:245
+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."
+msgstr ""
+
+#: src/sdlout/sdlout.cc:43
+msgid "SDL Output"
+msgstr "SDL chiqishi"
+
+#: src/sdlout/sdlout.cc:72
+msgid ""
+"SDL Output Plugin for Audacious\n"
+"Copyright 2010 John Lindgren"
+msgstr ""
+"Audacious uchun SDL chiqish plagini\n"
+"Mualliflik huquqi 2010 Jon Lindgren"
+
+#: src/search-tool/library.cc:35 src/search-tool/library.cc:46
+#: src/search-tool-qt/library.cc:35 src/search-tool-qt/library.cc:46
+msgid "Library"
+msgstr "Kutubxona"
+
+#: src/search-tool-qt/search-model.cc:44 src/search-tool/search-tool.cc:287
+#, c-format
+msgid "%d song"
+msgid_plural "%d songs"
+msgstr0 "%d qo'shiq "
+
+#: src/search-tool-qt/search-model.cc:53 src/search-tool/search-tool.cc:294
+msgid "of this genre"
+msgstr "ushbu janrdan"
+
+#: src/search-tool-qt/search-model.h:47 src/search-tool/search-model.h:45
+msgid "on"
+msgstr ""
+
+#: src/search-tool-qt/search-model.h:47 src/search-tool/search-model.h:45
+msgid "by"
+msgstr ""
+
+#: src/search-tool-qt/search-tool-qt.cc:165 src/search-tool/search-tool.cc:74
+msgid "Number of results to show:"
+msgstr "Ko'rsatiladigan natijalar soni:"
+
+#: src/search-tool-qt/search-tool-qt.cc:168 src/search-tool/search-tool.cc:77
+msgid "Rescan library at startup"
+msgstr "Ishga tushganda kutubxonani qayta ko'rib chiqish"
+
+#: src/search-tool-qt/search-tool-qt.cc:170
+msgid "Monitor library for changes"
+msgstr "O'zgarishlar uchun kutubxonani kuzatib borish"
+
+#: src/search-tool-qt/search-tool-qt.cc:193 src/search-tool/search-tool.cc:450
+msgid ""
+"To import your music library into Audacious, choose a folder and then click "
+"the \"refresh\" icon."
+msgstr ""
+"Musiqa kutubxonangizni Audacious ga import qilish uchun jildni tanlang va "
+"keyin “yangilash” belgisini bosing."
+
+#: src/search-tool-qt/search-tool-qt.cc:195 src/search-tool/search-tool.cc:459
+msgid "Please wait ..."
+msgstr "Iltimos kuting... "
+
+#: src/search-tool-qt/search-tool-qt.cc:197 src/search-tool/search-tool.cc:487
+msgid "Choose Folder"
+msgstr "Jildni tanlang"
+
+#: src/search-tool-qt/search-tool-qt.cc:201 src/search-tool/search-tool.cc:445
+msgid "Search library"
+msgstr "Kutubxonani qidirish"
+
+#: src/search-tool-qt/search-tool-qt.cc:327 src/search-tool/search-tool.cc:156
+#, c-format
+msgid "%d of %d result shown"
+msgid_plural "%d of %d results shown"
+msgstr0 "%d %d dan natijalari ko'rsatilgan"
+
+#: src/search-tool-qt/search-tool-qt.cc:331 src/search-tool/search-tool.cc:160
+#, c-format
+msgid "%d result"
+msgid_plural "%d results"
+msgstr0 "%d natija"
+
+#: src/search-tool-qt/search-tool-qt.cc:501 src/search-tool/search-tool.cc:341
+msgid "_Create Playlist"
+msgstr "Pleylist yaratish"
+
+#: src/search-tool-qt/search-tool-qt.cc:503 src/search-tool/search-tool.cc:343
+msgid "_Add to Playlist"
+msgstr "Pleylistga qo'shish"
+
+#: src/sid/xmms-sid.cc:43
+msgid "SID Player"
+msgstr "SID pleyer"
+
+#: src/sid/xs_config.cc:62
+msgid "Channels:"
+msgstr "Kanallar:"
+
+#: src/sid/xs_config.cc:68
+msgid "Emulation"
+msgstr "Emulyatsiya"
+
+#: src/sid/xs_config.cc:69
+msgid "Emulate MOS 8580 (default: MOS 6581)"
+msgstr "MOS 8580 ni emulyatsiya qilish (standart: MOS 6581)"
+
+#: src/sid/xs_config.cc:71
+msgid "Do not automatically select chip model"
+msgstr "Chip modelini avtomatik tanlamaslik"
+
+#: src/sid/xs_config.cc:73
+msgid "Emulate filter"
+msgstr "Filtrni emulyatsiya qilish"
+
+#: src/sid/xs_config.cc:75
+msgid "Clock speed:"
+msgstr "Soat tezligi:"
+
+#: src/sid/xs_config.cc:78
+msgid "Do not automatically select clock speed"
+msgstr "Soat tezligini avtomatik tanlamaslik"
+
+#: src/sid/xs_config.cc:80
+msgid "Playback time"
+msgstr "Ijro vaqti"
+
+#: src/sid/xs_config.cc:81
+msgid "Set maximum playback time:"
+msgstr "Maksimal ijro vaqtini sozlash:"
+
+#: src/sid/xs_config.cc:87
+msgid "Use only when song length is unknown"
+msgstr "Faqat qo'shiq uzunligi noma'lum bo'lganda foydalanish"
+
+#: src/sid/xs_config.cc:90
+msgid "Set minimum playback time:"
+msgstr "Minimal ijro vaqtini sozlash:"
+
+#: src/sid/xs_config.cc:96
+msgid "Subtunes"
+msgstr "Subtunes"
+
+#: src/sid/xs_config.cc:97
+msgid "Enable subtunes"
+msgstr "Subtunes yoqish"
+
+#: src/sid/xs_config.cc:99
+msgid "Ignore subtunes shorter than:"
+msgstr ""
+
+#: src/sid/xs_config.cc:105
+msgid "Note"
+msgstr "Eslatma"
+
+#: src/silence-removal/silence-removal.cc:39
+msgid "Silence Removal"
+msgstr "Sukunatni olib tashlash"
+
+#: src/silence-removal/silence-removal.cc:58
+msgid ""
+"Silence Removal Plugin for Audacious\n"
+"Copyright 2014 John Lindgren"
+msgstr ""
+"Audacious uchun Sukunatni olib tashlash plagini\n"
+"Mualliflik huquqi 2014 Jon Lindgren "
+
+#: src/silence-removal/silence-removal.cc:67
+msgid "Silence Removal"
+msgstr "Sukunatni olib tashlash"
+
+#: src/silence-removal/silence-removal.cc:68
+msgid "Threshold:"
+msgstr "Chegara:"
+
+#: src/skins/actions.cc:45 src/skins-qt/actions.cc:43
+msgid "Repeat points cleared."
+msgstr "Takrorlash nuqtalari tozalandi."
+
+#: src/skins/actions.cc:60 src/skins-qt/actions.cc:58
+msgid "Repeat point A set."
+msgstr "A nuqta to'plamini takrorlash."
+
+#: src/skins/actions.cc:65 src/skins-qt/actions.cc:63
+msgid "Repeat point B set."
+msgstr "B nuqta to'plamini takrorlash."
+
+#: src/skins/equalizer.cc:223 src/skins-qt/equalizer.cc:223
+msgid "Preamp"
+msgstr "Kuchaytirgich"
+
+#: src/skins/equalizer.cc:227 src/skins-qt/equalizer.cc:227
+msgid "31 Hz"
+msgstr "31 Gts"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "63 Hz"
+msgstr "63 Gts"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "125 Hz"
+msgstr "125 Gts"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "250 Hz"
+msgstr "250 Gts"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "500 Hz"
+msgstr "500 Gts"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "1 kHz"
+msgstr "1 kGts"
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "2 kHz"
+msgstr "2 kGts"
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "4 kHz"
+msgstr "4 kGts"
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "8 kHz"
+msgstr "8 kGts"
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "16 kHz"
+msgstr "16 kGts"
+
+#: src/skins/equalizer.cc:270 src/skins-qt/equalizer.cc:270
+msgid "Audacious Equalizer"
+msgstr "Audacious ekvalayzeri"
+
+#: src/skins/main.cc:459 src/skins-qt/main.cc:442
+msgid "Recording on"
+msgstr "Yozib olish yoqilgan"
+
+#: src/skins/main.cc:461 src/skins-qt/main.cc:444
+msgid "Recording off"
+msgstr "Yozib olish oʻchirilgan"
+
+#: src/skins/main.cc:754 src/skins-qt/main.cc:701
+#, c-format
+msgid "Seek to %d:%-2.2d / %d:%-2.2d"
+msgstr "Izlash %d:%-2.2d / %d:%-2.2d"
+
+#: src/skins/main.cc:771 src/skins-qt/main.cc:718
+#, c-format
+msgid "Volume: %d%%"
+msgstr "Ovoz balandligi: %d%%"
+
+#: src/skins/main.cc:784 src/skins-qt/main.cc:731
+#, c-format
+msgid "Balance: %d%% left"
+msgstr "Balans: %d%% chap"
+
+#: src/skins/main.cc:786 src/skins-qt/main.cc:733
+msgid "Balance: center"
+msgstr "Balans: markaz"
+
+#: src/skins/main.cc:788 src/skins-qt/main.cc:735
+#, c-format
+msgid "Balance: %d%% right"
+msgstr "Balans: %d%% oʻng"
+
+#: src/skins/main.cc:880 src/skins-qt/main.cc:827
+msgid "Options Menu"
+msgstr "Variantlar menyusi"
+
+#: src/skins/main.cc:884 src/skins-qt/main.cc:831
+msgid "Disable 'Always On Top'"
+msgstr "\"Har doim ustida\" ni o'chirish"
+
+#: src/skins/main.cc:886 src/skins-qt/main.cc:833
+msgid "Enable 'Always On Top'"
+msgstr "“Har doim ustida”ni yoqish"
+
+#: src/skins/main.cc:889 src/skins-qt/main.cc:836
+msgid "File Info Box"
+msgstr "Fayl ma'lumotlar qutisi"
+
+#: src/skins/main.cc:892 src/skins/menus.cc:149 src/skins-qt/main.cc:839
+#: src/skins-qt/menus.cc:142
+msgid "Double Size"
+msgstr "Ikki o'lchamli"
+
+#: src/skins/main.cc:895 src/skins-qt/main.cc:842
+msgid "Visualizations"
+msgstr "Vizualizatsiya"
+
+#: src/skins/menus.cc:74 src/skins-qt/menus.cc:64
+msgid "Volume Up"
+msgstr "Ovozni oshirish"
+
+#: src/skins/menus.cc:75 src/skins-qt/menus.cc:65
+msgid "Volume Down"
+msgstr "Ovozni pasaytirish"
+
+#: src/skins/menus.cc:77 src/skins-qt/menus.cc:67
+msgid "Effects ..."
+msgstr "Effektlar..."
+
+#: src/skins/menus.cc:84 src/skins-qt/menus.cc:74
+msgid "Open Files ..."
+msgstr "Fayllarni ochish..."
+
+#: src/skins/menus.cc:85 src/skins-qt/menus.cc:76
+msgid "Open URL ..."
+msgstr "URL ni ochish..."
+
+#: src/skins/menus.cc:89 src/skins-qt/menus.cc:80
+msgid "Playlist"
+msgstr "Pleylist"
+
+#: src/skins/menus.cc:90 src/skins-qt/menus.cc:81
+msgid "Output"
+msgstr "Chiqarish"
+
+#: src/skins/menus.cc:91 src/skins-qt/menus.cc:82
+msgid "View"
+msgstr "Ko'rinish"
+
+#: src/skins/menus.cc:93 src/skins/menus.cc:161 src/skins/menus.cc:174
+#: src/skins/menus.cc:245 src/skins-qt/menus.cc:84 src/skins-qt/menus.cc:156
+#: src/skins-qt/menus.cc:170 src/skins-qt/menus.cc:241
+msgid "Services"
+msgstr "Xizmatlar"
+
+#: src/skins/menus.cc:95 src/skins-qt/menus.cc:86
+msgid "About ..."
+msgstr "Haqida..."
+
+#: src/skins/menus.cc:96 src/skins-qt/menus.cc:87
+msgid "Settings ..."
+msgstr "Sozlamalar..."
+
+#: src/skins/menus.cc:97 src/skins-qt/menus.cc:88
+msgid "Quit"
+msgstr "Chiqish"
+
+#: src/skins/menus.cc:101 src/skins/menus.cc:235 src/skins-qt/menus.cc:92
+#: src/skins-qt/menus.cc:231
+msgid "Song Info ..."
+msgstr "Qo'shiq haqida ma'lumot..."
+
+#: src/skins/menus.cc:105 src/skins-qt/menus.cc:96
+msgid "Shuffle by Album"
+msgstr "Albom bo'yicha aralashtirish"
+
+#: src/skins/menus.cc:106 src/skins-qt/menus.cc:97
+msgid "No Playlist Advance"
+msgstr ""
+
+#: src/skins/menus.cc:117 src/skins-qt/menus.cc:108
+msgid "Set A-B Repeat"
+msgstr ""
+
+#: src/skins/menus.cc:118 src/skins-qt/menus.cc:109
+msgid "Clear A-B Repeat"
+msgstr ""
+
+#: src/skins/menus.cc:120 src/skins-qt/menus.cc:111
+msgid "Jump to Song ..."
+msgstr "Qo'shiqqa o'tish..."
+
+#: src/skins/menus.cc:121 src/skins-qt/menus.cc:113
+msgid "Jump to Time ..."
+msgstr "Jump to Time..."
+
+#: src/skins/menus.cc:125 src/skins-qt/menus.cc:118
+msgid "Play/Resume"
+msgstr "Ijro etish/Davom etish"
+
+#: src/skins/menus.cc:127 src/skins-qt/menus.cc:120
+msgid "New Playlist"
+msgstr "Yangi pleylist"
+
+#: src/skins/menus.cc:128 src/skins-qt/menus.cc:121
+msgid "Rename Playlist ..."
+msgstr "Pleylist nomini oʻzgartirish..."
+
+#: src/skins/menus.cc:129 src/skins-qt/menus.cc:122
+msgid "Remove Playlist"
+msgstr "Pleylistni olib tashlash"
+
+#: src/skins/menus.cc:131 src/skins-qt/menus.cc:124
+msgid "Previous Playlist"
+msgstr "Oldingi pleylist"
+
+#: src/skins/menus.cc:132 src/skins-qt/menus.cc:125
+msgid "Next Playlist"
+msgstr "Keyingi pleylist"
+
+#: src/skins/menus.cc:134 src/skins-qt/menus.cc:127
+msgid "Import Playlist ..."
+msgstr "Pleylistni import qilish..."
+
+#: src/skins/menus.cc:135 src/skins-qt/menus.cc:128
+msgid "Export Playlist ..."
+msgstr "Pleylistni eksport qilish..."
+
+#: src/skins/menus.cc:137 src/skins-qt/menus.cc:130
+msgid "Playlist Manager ..."
+msgstr "Pleylist menejeri..."
+
+#: src/skins/menus.cc:138 src/skins-qt/menus.cc:131
+msgid "Queue Manager ..."
+msgstr "Navbat menejeri..."
+
+#: src/skins/menus.cc:140 src/skins-qt/menus.cc:133
+msgid "Refresh Playlist"
+msgstr "Pleylistni yangilash"
+
+#: src/skins/menus.cc:144 src/skins-qt/menus.cc:137
+msgid "Show Playlist Editor"
+msgstr "Pleylist muharririni ko'rsatish"
+
+#: src/skins/menus.cc:145 src/skins-qt/menus.cc:138
+msgid "Show Equalizer"
+msgstr "Ekvalayzerni ko'rsatish"
+
+#: src/skins/menus.cc:147 src/skins-qt/menus.cc:140
+msgid "Show Remaining Time"
+msgstr "Qolgan vaqtni ko'rsatish"
+
+#: src/skins/menus.cc:150 src/skins-qt/menus.cc:143
+msgid "Always on Top"
+msgstr "Har doim ustida"
+
+#: src/skins/menus.cc:151 src/skins-qt/menus.cc:145
+msgid "On All Workspaces"
+msgstr "Barcha ish joylarida"
+
+#: src/skins/menus.cc:153 src/skins-qt/menus.cc:148
+msgid "Roll Up Player"
+msgstr "Roll Up pleyeri"
+
+#: src/skins/menus.cc:154 src/skins-qt/menus.cc:149
+msgid "Roll Up Playlist Editor"
+msgstr "Roll Up pleylist muharriri"
+
+#: src/skins/menus.cc:155 src/skins-qt/menus.cc:150
+msgid "Roll Up Equalizer"
+msgstr "Roll Up ekvalayzeri"
+
+#: src/skins/menus.cc:163 src/skins-qt/menus.cc:158
+msgid "Add URL ..."
+msgstr "URL qo‘shish..."
+
+#: src/skins/menus.cc:164 src/skins-qt/menus.cc:160
+msgid "Add Files ..."
+msgstr "Fayllarni qo'shish..."
+
+#: src/skins/menus.cc:168 src/skins/menus.cc:196 src/skins/menus.cc:212
+#: src/skins-qt/menus.cc:164 src/skins-qt/menus.cc:192
+#: src/skins-qt/menus.cc:208
+msgid "By Title"
+msgstr "Sarlavha bo'yicha"
+
+#: src/skins/menus.cc:169 src/skins/menus.cc:203 src/skins/menus.cc:219
+#: src/skins-qt/menus.cc:165 src/skins-qt/menus.cc:199
+#: src/skins-qt/menus.cc:215
+msgid "By File Name"
+msgstr "Fayl nomi bo'yicha"
+
+#: src/skins/menus.cc:170 src/skins/menus.cc:204 src/skins/menus.cc:220
+#: src/skins-qt/menus.cc:166 src/skins-qt/menus.cc:200
+#: src/skins-qt/menus.cc:216
+msgid "By File Path"
+msgstr "Fayl yo'li bo'yicha"
+
+#: src/skins/menus.cc:176 src/skins-qt/menus.cc:172
+msgid "Remove All"
+msgstr "Hammasini o'chirish"
+
+#: src/skins/menus.cc:177 src/skins-qt/menus.cc:173
+msgid "Clear Queue"
+msgstr "Navbatni tozalash"
+
+#: src/skins/menus.cc:179 src/skins-qt/menus.cc:175
+msgid "Remove Unavailable Files"
+msgstr "Mavjud bo'lmagan fayllarni o'chirish"
+
+#: src/skins/menus.cc:180 src/skins-qt/menus.cc:176
+msgid "Remove Duplicates"
+msgstr "Dublikatlarni o'chirish"
+
+#: src/skins/menus.cc:182 src/skins-qt/menus.cc:178
+msgid "Remove Unselected"
+msgstr "Tanlanmaganni o'chirish"
+
+#: src/skins/menus.cc:183 src/skins-qt/menus.cc:179
+msgid "Remove Selected"
+msgstr "Tanlanganni o'chirish"
+
+#: src/skins/menus.cc:187 src/skins-qt/menus.cc:183
+msgid "Search and Select"
+msgstr "Qidirish va tanlash"
+
+#: src/skins/menus.cc:189 src/skins-qt/menus.cc:185
+msgid "Invert Selection"
+msgstr "Tanlovni teskari aylantirish"
+
+#: src/skins/menus.cc:190 src/skins-qt/menus.cc:186
+msgid "Select None"
+msgstr "Hech birini tanlamaslik"
+
+#: src/skins/menus.cc:191 src/skins-qt/menus.cc:187
+msgid "Select All"
+msgstr "Hammasini belgilash"
+
+#: src/skins/menus.cc:195 src/skins/menus.cc:211 src/skins-qt/menus.cc:191
+#: src/skins-qt/menus.cc:207
+msgid "By Track Number"
+msgstr "Trek raqami bo'yicha"
+
+#: src/skins/menus.cc:197 src/skins/menus.cc:213 src/skins-qt/menus.cc:193
+#: src/skins-qt/menus.cc:209
+msgid "By Artist"
+msgstr "Artist bo'yicha"
+
+#: src/skins/menus.cc:198 src/skins/menus.cc:214 src/skins-qt/menus.cc:194
+#: src/skins-qt/menus.cc:210
+msgid "By Album"
+msgstr "Albom bo'yicha"
+
+#: src/skins/menus.cc:199 src/skins/menus.cc:215 src/skins-qt/menus.cc:195
+#: src/skins-qt/menus.cc:211
+msgid "By Album Artist"
+msgstr "Albom artisti bo'yicha"
+
+#: src/skins/menus.cc:200 src/skins/menus.cc:216 src/skins-qt/menus.cc:196
+#: src/skins-qt/menus.cc:212
+msgid "By Release Date"
+msgstr "Chiqarilgan sana bo'yicha"
+
+#: src/skins/menus.cc:201 src/skins/menus.cc:217 src/skins-qt/menus.cc:197
+#: src/skins-qt/menus.cc:213
+msgid "By Genre"
+msgstr "Janr bo'yicha"
+
+#: src/skins/menus.cc:202 src/skins/menus.cc:218 src/skins-qt/menus.cc:198
+#: src/skins-qt/menus.cc:214
+msgid "By Length"
+msgstr "Uzunlik bo'yicha"
+
+#: src/skins/menus.cc:205 src/skins/menus.cc:221 src/skins-qt/menus.cc:201
+#: src/skins-qt/menus.cc:217
+msgid "By Custom Title"
+msgstr "Maxsus sarlavha bo'yicha"
+
+#: src/skins/menus.cc:206 src/skins/menus.cc:222 src/skins-qt/menus.cc:202
+#: src/skins-qt/menus.cc:218
+msgid "By Comment"
+msgstr "Izoh bo'yicha"
+
+#: src/skins/menus.cc:207 src/skins/menus.cc:223 src/skins-qt/menus.cc:203
+#: src/skins-qt/menus.cc:219
+msgid "By Disc Number"
+msgstr ""
+
+#: src/skins/menus.cc:227 src/skins-qt/menus.cc:223
+msgid "Randomize List"
+msgstr "Ro'yxatni tasodifiy qilish"
+
+#: src/skins/menus.cc:228 src/skins-qt/menus.cc:224
+msgid "Reverse List"
+msgstr "Ro'yxatni teskari qilish"
+
+#: src/skins/menus.cc:230 src/skins-qt/menus.cc:226
+msgid "Sort Selected"
+msgstr "Tanlanganlarni saralash"
+
+#: src/skins/menus.cc:231 src/skins-qt/menus.cc:227
+msgid "Sort List"
+msgstr "Roʻyxatni saralash"
+
+#: src/skins/menus.cc:236 src/skins-qt/menus.cc:232
+msgid "Open Containing Folder"
+msgstr "O'z ichiga olgan jildni ochish"
+
+#: src/skins/menus.cc:238 src/skins-qt/menus.cc:234
+msgid "Cut"
+msgstr "Kesish"
+
+#: src/skins/menus.cc:239 src/skins-qt/menus.cc:235
+msgid "Copy"
+msgstr "Nusxalash"
+
+#: src/skins/menus.cc:240 src/skins-qt/menus.cc:236
+msgid "Paste"
+msgstr "Joylashtirish"
+
+#: src/skins/menus.cc:241 src/skins-qt/menus.cc:237
+msgid "Paste at End"
+msgstr "Oxirida joylashtirish"
+
+#: src/skins/menus.cc:243 src/skins-qt/menus.cc:239
+msgid "Queue/Unqueue"
+msgstr "Navbat/navbatni bekor qilish"
+
+#: src/skins/playlist-widget.cc:58 src/skins-qt/playlist-widget.cc:58
+#, c-format
+msgid "%s (%d of %d)"
+msgstr "%s (%d %d dan)"
+
+#: src/skins/playlistwin.cc:491 src/skins-qt/playlistwin.cc:478
+msgid "Audacious Playlist Editor"
+msgstr "Audacious pleylist muharriri"
+
+#: src/skins/plugin.cc:53 src/skins-qt/plugin.cc:65
+msgid "Winamp Classic Interface"
+msgstr "Winamp klassik interfeysi"
+
+#: src/skins-qt/menus.cc:75
+msgid "Open Folder ..."
+msgstr "Jildni ochish..."
+
+#: src/skins-qt/menus.cc:159
+msgid "Add Folder ..."
+msgstr "Jild qo'shish..."
+
+#: src/skins-qt/search-select.cc:62 src/skins/search-select.cc:77
+msgid "Search entries in active playlist"
+msgstr ""
+
+#: src/skins-qt/search-select.cc:70 src/skins/search-select.cc:83
+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-qt/search-select.cc:75 src/skins/search-select.cc:91
+msgid "Title:"
+msgstr ""
+
+#: src/skins-qt/search-select.cc:79 src/skins/search-select.cc:96
+msgid "Album:"
+msgstr ""
+
+#: src/skins-qt/search-select.cc:82 src/skins/search-select.cc:101
+msgid "Artist:"
+msgstr ""
+
+#: src/skins-qt/search-select.cc:85 src/skins/search-select.cc:106
+msgid "File Name:"
+msgstr ""
+
+#: src/skins-qt/search-select.cc:88 src/skins/search-select.cc:134
+msgid "Clear previous selection before searching"
+msgstr ""
+
+#: src/skins-qt/search-select.cc:89 src/skins/search-select.cc:137
+msgid "Automatically toggle queue for matching entries"
+msgstr ""
+
+#: src/skins-qt/search-select.cc:90 src/skins/search-select.cc:140
+msgid "Create a new playlist with matching entries"
+msgstr ""
+
+#: src/skins-qt/search-select.cc:101 src/skins/search-select.cc:78
+msgid "Search"
+msgstr ""
+
+#: src/skins-qt/skins_cfg.cc:198 src/skins/skins_cfg.cc:182
+msgid "Player:"
+msgstr "Pleyer:"
+
+#: src/skins-qt/skins_cfg.cc:200 src/skins/skins_cfg.cc:184
+msgid "Select main player window font:"
+msgstr "Asosiy pleyer oynasi shriftini tanlash:"
+
+#: src/skins-qt/skins_cfg.cc:201 src/skins/skins_cfg.cc:185
+msgid "Playlist:"
+msgstr "Pleylist:"
+
+#: src/skins-qt/skins_cfg.cc:203 src/skins/skins_cfg.cc:187
+msgid "Select playlist font:"
+msgstr "Pleylist shriftini tanlash:"
+
+#: src/skins-qt/skins_cfg.cc:207 src/skins/skins_cfg.cc:191
+msgid "Skin"
+msgstr "Skin"
+
+#: src/skins-qt/skins_cfg.cc:211 src/skins/skins_cfg.cc:193
+msgid "Display active titlebar when any window is focused"
+msgstr "Har qanday oyna fokuslanganda faol sarlavha panelini ko'rsatish"
+
+#: src/skins-qt/skins_cfg.cc:213 src/skins/skins_cfg.cc:195
+msgid "Fonts"
+msgstr "Shriftlar"
+
+#: src/skins-qt/skins_cfg.cc:215 src/skins/skins_cfg.cc:197
+msgid "Use bitmap fonts (supports ASCII only)"
+msgstr "Bitmap shriftlaridan foydalaning (faqat ASCII ni qo'llab-quvvatlaydi)"
+
+#: src/skins-qt/skins_cfg.cc:217 src/skins/skins_cfg.cc:199
+msgid "Scroll song title"
+msgstr ""
+
+#: src/skins-qt/skins_cfg.cc:219 src/skins/skins_cfg.cc:201
+msgid "Scroll song title in both directions"
+msgstr ""
+
+#: src/skins-qt/skins_cfg.cc:224 src/skins/skins_cfg.cc:206
+msgid "Analyzer"
+msgstr ""
+
+#: src/skins-qt/skins_cfg.cc:225 src/skins/skins_cfg.cc:207
+msgid "Scope"
+msgstr ""
+
+#: src/skins-qt/skins_cfg.cc:226 src/skins/skins_cfg.cc:208
+msgid "Voiceprint / VU meter"
+msgstr ""
+
+#: src/skins-qt/skins_cfg.cc:227 src/skins/skins_cfg.cc:209
+msgid "Off"
+msgstr ""
+
+#: src/skins-qt/skins_cfg.cc:231 src/skins-qt/skins_cfg.cc:256
+#: src/skins-qt/skins_cfg.cc:262 src/skins/skins_cfg.cc:213
+#: src/skins/skins_cfg.cc:238 src/skins/skins_cfg.cc:244
+msgid "Normal"
+msgstr ""
+
+#: src/skins-qt/skins_cfg.cc:232 src/skins-qt/skins_cfg.cc:257
+#: src/skins/skins_cfg.cc:214 src/skins/skins_cfg.cc:239
+msgid "Fire"
+msgstr ""
+
+#: src/skins-qt/skins_cfg.cc:233 src/skins/skins_cfg.cc:215
+msgid "Vertical lines"
+msgstr ""
+
+#: src/skins-qt/skins_cfg.cc:237 src/skins/skins_cfg.cc:219
+msgid "Lines"
+msgstr ""
+
+#: src/skins-qt/skins_cfg.cc:238 src/skins/skins_cfg.cc:220
+msgid "Bars"
+msgstr ""
+
+#: src/skins-qt/skins_cfg.cc:242 src/skins/skins_cfg.cc:224
+msgid "Slowest"
+msgstr ""
+
+#: src/skins-qt/skins_cfg.cc:243 src/skins/skins_cfg.cc:225
+msgid "Slow"
+msgstr ""
+
+#: src/skins-qt/skins_cfg.cc:244 src/skins/skins_cfg.cc:226
+#: src/soxr/sox-resampler.cc:180
+msgid "Medium"
+msgstr ""
+
+#: src/skins-qt/skins_cfg.cc:245 src/skins/skins_cfg.cc:227
+msgid "Fast"
+msgstr ""
+
+#: src/skins-qt/skins_cfg.cc:246 src/skins/skins_cfg.cc:228
+msgid "Fastest"
+msgstr ""
+
+#: src/skins-qt/skins_cfg.cc:250 src/skins/skins_cfg.cc:232
+msgid "Dots"
+msgstr ""
+
+#: src/skins-qt/skins_cfg.cc:251 src/skins/skins_cfg.cc:233
+msgid "Line"
+msgstr "Satr"
+
+#: src/skins-qt/skins_cfg.cc:252 src/skins/skins_cfg.cc:234
+msgid "Solid"
+msgstr ""
+
+#: src/skins-qt/skins_cfg.cc:258 src/skins/skins_cfg.cc:240
+msgid "Ice"
+msgstr ""
+
+#: src/skins-qt/skins_cfg.cc:263 src/skins/skins_cfg.cc:245
+msgid "Smooth"
+msgstr ""
+
+#: src/skins-qt/skins_cfg.cc:267 src/skins/skins_cfg.cc:249
+msgid "Coloring:"
+msgstr ""
+
+#: src/skins-qt/skins_cfg.cc:270 src/skins/skins_cfg.cc:252
+msgid "Style:"
+msgstr ""
+
+#: src/skins-qt/skins_cfg.cc:273 src/skins/skins_cfg.cc:255
+msgid "Falloff:"
+msgstr ""
+
+#: src/skins-qt/skins_cfg.cc:276 src/skins/skins_cfg.cc:258
+msgid "Peak falloff:"
+msgstr ""
+
+#: src/skins-qt/skins_cfg.cc:282 src/skins/skins_cfg.cc:264
+msgid "Scope Style:"
+msgstr ""
+
+#: src/skins-qt/skins_cfg.cc:285 src/skins/skins_cfg.cc:267
+msgid "Voiceprint Coloring:"
+msgstr ""
+
+#: src/skins-qt/skins_cfg.cc:288 src/skins/skins_cfg.cc:270
+msgid "VU Meter Style:"
+msgstr ""
+
+#: src/skins-qt/skins_cfg.cc:294 src/skins/skins_cfg.cc:276
+msgid "Type"
+msgstr ""
+
+#: src/skins-qt/skins_cfg.cc:295 src/skins/skins_cfg.cc:277
+msgid "Visualization type:"
+msgstr ""
+
+#: src/skins-qt/skins_cfg.cc:298 src/skins/skins_cfg.cc:280
+msgid "Analyzer"
+msgstr ""
+
+#: src/skins-qt/skins_cfg.cc:299 src/skins/skins_cfg.cc:281
+msgid "Show peaks"
+msgstr ""
+
+#: src/skins-qt/skins_cfg.cc:308 src/skins/skins_cfg.cc:290
+msgid "Visualization"
+msgstr "Vizualizatsiya"
+
+#: src/skins-qt/skinselector.cc:98 src/skins/skinselector.cc:111
+msgid "Archived Winamp 2.x skin"
+msgstr ""
+
+#: src/skins-qt/skinselector.cc:102 src/skins/skinselector.cc:115
+msgid "Unarchived Winamp 2.x skin"
+msgstr ""
+
+#: src/sndfile/plugin.cc:38
+msgid "Sndfile Plugin"
+msgstr ""
+
+#: src/sndfile/plugin.cc:372
+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/sndio/sndio.cc:43
+msgid "Sndio Output"
+msgstr ""
+
+#: src/sndio/sndio.cc:98
+msgid "Device (blank for default):"
+msgstr ""
+
+#: src/sndio/sndio.cc:100
+msgid "Save and restore volume:"
+msgstr ""
+
+#: src/sndio/sndio.cc:181
+#, c-format
+msgid "Sndio error: Unsupported audio format (%d)"
+msgstr ""
+
+#: src/sndio/sndio.cc:192
+msgid "Sndio error: sio_open() failed"
+msgstr ""
+
+#: src/sndio/sndio.cc:221
+msgid "Sndio error: sio_setpar() failed"
+msgstr ""
+
+#: src/sndio/sndio.cc:233
+msgid "Sndio error: sio_start() failed"
+msgstr ""
+
+#: src/songchange/song_change.cc:30
+msgid "Song Change"
+msgstr ""
+
+#: src/songchange/song_change.cc:256
+msgid "Commands"
+msgstr ""
+
+#: src/songchange/song_change.cc:258
+msgid "Command to run when starting a new song:"
+msgstr ""
+
+#: src/songchange/song_change.cc:261
+msgid "Command to run when stopping a song:"
+msgstr ""
+
+#: src/songchange/song_change.cc:264
+msgid "Command to run at the end of a song:"
+msgstr ""
+
+#: src/songchange/song_change.cc:267
+msgid "Command to run at the end of the playlist:"
+msgstr ""
+
+#: src/songchange/song_change.cc:270
+msgid "Command to run when song title changes (for network streams):"
+msgstr ""
+
+#: src/songchange/song_change.cc:273
+msgid ""
+"You can use the following format codes, which will be replaced before "
+"running the command.\n"
+"Not all are useful though for the song-stopped or end-of-playlist command."
+msgstr ""
+
+#: src/songchange/song_change.cc:276
+msgid ""
+"%a: Artist\n"
+"%b: Album\n"
+"%c: Number of channels\n"
+"%f: File name (full path)\n"
+"%F: Frequency (Hertz)\n"
+"%l: Length (milliseconds)\n"
+"%n or %s: Formatted title (see playlist settings)\n"
+"%p: Currently playing (1 or 0)\n"
+"%r: Rate (bits per second)\n"
+"%t: Playlist position\n"
+"%T: Title (unformatted)"
+msgstr ""
+
+#: src/songchange/song_change.cc:287
+msgid ""
+"Parameters passed to the shell should be enclosed in quotation marks.\n"
+"Unquoted parameters may lead to unexpected results."
+msgstr ""
+
+#: src/song-info-qt/song-info.cc:30
+msgid "Song Info"
+msgstr "Qo'shiq haqida ma'lumot"
+
+#: src/soxr/sox-resampler.cc:44
+msgid "SoX Resampler"
+msgstr ""
+
+#: src/soxr/sox-resampler.cc:172
+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/soxr/sox-resampler.cc:178
+msgid "Quick"
+msgstr ""
+
+#: src/soxr/sox-resampler.cc:179
+msgid "Low"
+msgstr ""
+
+#: src/soxr/sox-resampler.cc:181
+msgid "High"
+msgstr ""
+
+#: src/soxr/sox-resampler.cc:182
+msgid "Very High"
+msgstr ""
+
+#: src/soxr/sox-resampler.cc:183
+msgid "Ultra High"
+msgstr ""
+
+#: src/soxr/sox-resampler.cc:187
+msgid "Minimum"
+msgstr ""
+
+#: src/soxr/sox-resampler.cc:188
+msgid "Intermediate"
+msgstr ""
+
+#: src/soxr/sox-resampler.cc:193
+msgid "Quality:"
+msgstr "Sifat:"
+
+#: src/soxr/sox-resampler.cc:196
+msgid "Phase:"
+msgstr ""
+
+#: src/soxr/sox-resampler.cc:200
+msgid "Allow aliasing"
+msgstr ""
+
+#: src/soxr/sox-resampler.cc:202
+msgid "Use steep filter"
+msgstr ""
+
+#: src/speedpitch/speed-pitch.cc:54
+msgid "Speed and Pitch"
+msgstr ""
+
+#: src/speedpitch/speed-pitch.cc:247
+msgid "Speed"
+msgstr ""
+
+#: src/speedpitch/speed-pitch.cc:248
+msgid "Decouple from pitch"
+msgstr ""
+
+#: src/speedpitch/speed-pitch.cc:250 src/speedpitch/speed-pitch.cc:258
+msgid "Multiplier:"
+msgstr ""
+
+#: src/speedpitch/speed-pitch.cc:254
+msgid "Pitch"
+msgstr ""
+
+#: src/statusicon-qt/statusicon.cc:45 src/statusicon/statusicon.cc:47
+msgid "Status Icon"
+msgstr ""
+
+#: src/statusicon-qt/statusicon.cc:68
+msgid ""
+"Status Icon Plugin (partial port for Qt interface)\n"
+"\n"
+"Copyright 2005-2007 Giacomo Lozito <james@develia.org>\n"
+"Copyright 2010 Michał Lipski <tallica@o2.pl>\n"
+"Copyright 2015 Eugene Paskevich <eugene@raptor.kiev.ua>\n"
+"\n"
+"This plugin provides a status icon, placed in\n"
+"the system tray area of the window manager."
+msgstr ""
+
+#: src/statusicon-qt/statusicon.cc:89 src/statusicon/statusicon.cc:384
+msgid "Mouse Scroll Action"
+msgstr ""
+
+#: src/statusicon-qt/statusicon.cc:90 src/statusicon/statusicon.cc:385
+msgid "Change volume"
+msgstr ""
+
+#: src/statusicon-qt/statusicon.cc:93 src/statusicon/statusicon.cc:388
+msgid "Change playing song"
+msgstr ""
+
+#: src/statusicon-qt/statusicon.cc:96 src/statusicon/statusicon.cc:391
+msgid "Other Settings"
+msgstr ""
+
+#: src/statusicon-qt/statusicon.cc:97 src/statusicon/statusicon.cc:392
+msgid "Disable the popup window"
+msgstr ""
+
+#: src/statusicon-qt/statusicon.cc:99 src/statusicon/statusicon.cc:394
+msgid "Close to the system tray"
+msgstr ""
+
+#: src/statusicon-qt/statusicon.cc:101 src/statusicon/statusicon.cc:396
+msgid "Advance in playlist when scrolling upward"
+msgstr ""
+
+#: src/statusicon-qt/statusicon.cc:116 src/statusicon/statusicon.cc:287
+msgid "Se_ttings ..."
+msgstr ""
+
+#: src/statusicon/statusicon.cc:377
+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/stereo_plugin/stereo.cc:19
+msgid "Extra Stereo"
+msgstr ""
+
+#: src/stereo_plugin/stereo.cc:36
+msgid ""
+"Extra Stereo Plugin\n"
+"\n"
+"By Johan Levin, 1999"
+msgstr ""
+
+#: src/stereo_plugin/stereo.cc:44
+msgid "Extra Stereo"
+msgstr ""
+
+#: src/streamtuner/icecast-model.cc:126 src/streamtuner/shoutcast-model.cc:131
+msgid "Type"
+msgstr ""
+
+#: src/streamtuner/icecast-model.cc:132
+msgid "Current Song"
+msgstr ""
+
+#: src/streamtuner/icecast-model.cc:164
+msgid "Other"
+msgstr ""
+
+#: src/streamtuner/ihr-model.cc:63
+msgid "Market"
+msgstr ""
+
+#: src/streamtuner/ihr-model.cc:156
+msgid "Call Letters"
+msgstr ""
+
+#: src/streamtuner/ihr-model.cc:162
+msgid "Description"
+msgstr "Tavsif"
+
+#: src/streamtuner/shoutcast-model.cc:128
+msgid "Listeners"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:188
+msgid "Top 500 Stations"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:189
+msgid "Alternative"
+msgstr "Alternative"
+
+#: src/streamtuner/shoutcast-model.cc:190
+msgid "Blues"
+msgstr "Blues"
+
+#: src/streamtuner/shoutcast-model.cc:191
+msgid "Classical"
+msgstr "Classical"
+
+#: src/streamtuner/shoutcast-model.cc:192
+msgid "Country"
+msgstr "Country"
+
+#: src/streamtuner/shoutcast-model.cc:193
+msgid "Decades"
+msgstr "Decades"
+
+#: src/streamtuner/shoutcast-model.cc:194
+msgid "Easy Listening"
+msgstr "Easy Listening"
+
+#: src/streamtuner/shoutcast-model.cc:195
+msgid "Electronic"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:196
+msgid "Folk"
+msgstr "Folk"
+
+#: src/streamtuner/shoutcast-model.cc:197
+msgid "Inspirational"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:198
+msgid "International"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:199
+msgid "Jazz"
+msgstr "Jazz"
+
+#: src/streamtuner/shoutcast-model.cc:200
+msgid "Latin"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:201
+msgid "Metal"
+msgstr "Metal"
+
+#: src/streamtuner/shoutcast-model.cc:203
+msgid "New Age"
+msgstr "New Age"
+
+#: src/streamtuner/shoutcast-model.cc:204
+msgid "Pop"
+msgstr "Pop"
+
+#: src/streamtuner/shoutcast-model.cc:205
+msgid "Public Radio"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:206
+msgid "R&B and Urban"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:207
+msgid "Rap"
+msgstr "Rap"
+
+#: src/streamtuner/shoutcast-model.cc:208
+msgid "Reggae"
+msgstr "Reggae"
+
+#: src/streamtuner/shoutcast-model.cc:209
+msgid "Rock"
+msgstr "Rock"
+
+#: src/streamtuner/shoutcast-model.cc:210
+msgid "Seasonal and Holiday"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:211
+msgid "Soundtracks"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:212
+msgid "Talk"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:213
+msgid "Themes"
+msgstr ""
+
+#: src/streamtuner/streamtuner.cc:59
+msgid "Shoutcast"
+msgstr ""
+
+#: src/streamtuner/streamtuner.cc:60
+msgid "Icecast"
+msgstr "Icecast"
+
+#: src/streamtuner/streamtuner.cc:71
+msgid "Stream Tuner"
+msgstr "Stream Tuner"
+
+#: src/tonegen/tonegen.cc:45
+msgid "Tone Generator"
+msgstr "Ohang generatori"
+
+#: src/tonegen/tonegen.cc:92
+#, c-format
+msgid "%s %.1f Hz"
+msgstr "%s %.1f Gts"
+
+#: src/tonegen/tonegen.cc:92
+msgid "Tone Generator: "
+msgstr "Ohang generatori:"
+
+#: src/tonegen/tonegen.cc:161
+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 ""
+"Håvard Kvålen tomonidan sinus ohang generatori <havardk@xmms.org>\n"
+"Daniel J. Peng tomonidan tahrirlangan <danielpeng@bigfoot.com>\n"
+"\n"
+"Undan foydalanish uchun URL manzilini qo'shing: tone://frequency1;frequency2;"
+"frequency3;...\n"
+"masalan tone://2000;2005 2000 Gts ohang va 2005 Gts ohangni ijro etish uchun "
+
+#: src/ui-common/dialogs-qt.cc:40
+msgid ""
+"\n"
+"(Further messages have been hidden.)"
+msgstr ""
+"\n"
+"(Qo'shimcha xabarlar yashirilgan.)"
+
+#: src/ui-common/dialogs-qt.cc:52
+msgid "Working ..."
+msgstr "Ishlamoqda..."
+
+#: src/ui-common/dialogs-qt.cc:73
+msgid "Information"
+msgstr "Ma'lumot"
+
+#: src/ui-common/menu-ops-gtk.cc:132 src/ui-common/menu-ops-qt.cc:113
+#, c-format
+msgid "%s does not appear to be a valid folder."
+msgstr ""
+
+#: src/voice_removal/voice_removal.cc:28
+msgid "Voice Removal"
+msgstr "Ovozni olib tashlash"
+
+#: src/vorbis/vorbis.cc:433
+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 dekoderi\n"
+"\n"
+"Xiph.org fondining Ogg Vorbis plaginiga asoslangan:\n"
+"http://www.xiph.org/\n"
+"\n"
+"Asl kod:\n"
+"Tony Arcieri <bascule@inferno.tusculum.edu>\n"
+"\n"
+"Quyidagilardan hissalar:\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.h:18
+msgid "Ogg Vorbis Decoder"
+msgstr ""
+
+#: src/vtx/info.cc:24
+#, c-format
+msgid "Details about %s"
+msgstr ""
+
+#: src/vtx/info.cc:26
+msgid ""
+"Title: %t\n"
+"Author: %a\n"
+"From: %f\n"
+"Tracker: %T\n"
+"Comment: %C\n"
+"Chip type: %c\n"
+"Stereo: %s\n"
+"Loop: %l\n"
+"Chip freq: %F\n"
+"Player Freq: %P\n"
+"Year: %y"
+msgstr ""
+
+#: src/vtx/vtx.cc:38
+msgid "VTX Decoder"
+msgstr ""
+
+#: src/vtx/vtx.cc:178
+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/vumeter-qt/vumeter_qt.cc:31
+msgid ""
+"VU Meter Plugin for Audacious\n"
+"Copyright 2017-2019 Marc Sánchez Fauste"
+msgstr ""
+
+#: src/vumeter-qt/vumeter_qt.cc:35
+msgid "VU Meter Settings"
+msgstr ""
+
+#: src/vumeter-qt/vumeter_qt.cc:37
+msgid "Peak hold time:"
+msgstr "Maksimal ushlab turish vaqti:"
+
+#: src/vumeter-qt/vumeter_qt.cc:42
+msgid "Fall-off time:"
+msgstr "Tushish vaqti:"
+
+#: src/vumeter-qt/vumeter_qt.cc:44
+msgid "dB/second"
+msgstr "dB/sekund"
+
+#: src/vumeter-qt/vumeter_qt.cc:46
+msgid "Display legend"
+msgstr "Afsonani ko'rsatish"
+
+#: src/vumeter-qt/vumeter_qt.h:37
+msgid "VU Meter"
+msgstr "VU metr"
+
+#: src/waveout/waveout.cc:43
+msgid "Win32 waveOut"
+msgstr "Win32 waveOut"
+
+#: src/waveout/waveout.cc:69
+msgid ""
+"Win32 waveOut Plugin for Audacious\n"
+"Copyright 2016 John Lindgren"
+msgstr ""
+"Audacious uchun Win32 waveOut plagini\n"
+"Mualliflik huquqi 2016 John Lindgren "
+
+#: src/wavpack/wavpack.cc:25
+msgid "WavPack Decoder"
+msgstr "WavPack dekoder"
+
+#: src/wavpack/wavpack.cc:217
+msgid "lossy (hybrid)"
+msgstr "yo'qotadigan (gibrid)"
+
+#: src/wavpack/wavpack.cc:219
+msgid "lossy"
+msgstr "yo'qotadigan"
+
+#: src/wavpack/wavpack.cc:259
+msgid ""
+"Copyright 2006 William Pitcock <nenolod@nenolod.net>\n"
+"\n"
+"Some of the plugin code was by Miles Egan."
+msgstr ""
+"Mualliflik huquqi 2006 William Pitcock <nenolod@nenolod.net>\n"
+"\n"
+"Plagin kodlarining ba'zilari Miles Egan tomonidan yaratilgan."
+
+#: src/xsf/plugin.cc:74
+msgid "2SF Decoder"
+msgstr "2SF dekoder"
+
+#: src/xsf/plugin.cc:429
+msgid "32728 Hz"
+msgstr "32728 Gts"
+
+#: src/xsf/plugin.cc:432
+msgid "65456 Hz"
+msgstr "65456 Gts"
+
+#: src/xsf/plugin.cc:438
+msgid "Cosine"
+msgstr "Kosinus"
+
+#: src/xsf/plugin.cc:439
+msgid "Sharp"
+msgstr "Keskin"
+
+#: src/xsf/plugin.cc:443
+msgid "XSF Configuration"
+msgstr "XSF konfiguratsiyasi"
+
+#: src/xsf/plugin.cc:445
+msgid "Default fade time:"
+msgstr "Odatiy o'chirish vaqti:"
+
+#: src/xsf/plugin.cc:447
+msgid "Interpolation mode:"
+msgstr "Interpolatsiya rejimi:"
+
+#: src/xspf/xspf.cc:95
+msgid "XML Shareable Playlists (XSPF)"
+msgstr "XML almashish mumkin pleylistlar (XSPF)"

audacious-plugins-3.6.2-gtk3.tar.bz2/po/zh_CN.po -> audacious-plugins-4.4.1.tar.bz2/po/zh_CN.po Changed

@@ -5,309 +5,97 @@
 # Translators:
 # 周嘉韡 <btchina@live.com>, 2013
 # Chasye <chasye@gmail.com>, 2010
+# dylanchu <chudongyu@126.com>, 2022
 # yinsigan <ganweiliang886@gmail.com>, 2012
-# 白铭骢 <jeffbaichina@members.fsf.org>, 2014
-# 白铭骢 <jeffbaichina@members.fsf.org>, 2014
+# Mingcong Bai <jeffbai@aosc.xyz>, 2014
+# Mingcong Bai <jeffbai@aosc.xyz>, 2014
 # Luke <runningwaterpro@gmail.com>, 2012
 # Michael Jay Tong <michaeljayt@gmail.com>, 2013
 # Michael Jay Tong <michaeljayt@gmail.com>, 2013-2014
+# Mingcong Bai <jeffbai@aosc.xyz>, 2014-2017
 # zhangmin <zm1990s@gmail.com>, 2013-2014
 # Luke <runningwaterpro@gmail.com>, 2012
 # shan dong <sd542927172@live.cn>, 2013
 # shan dong <sd542927172@live.cn>, 2013
+# WhiredPlanck <whiredplanck@outlook.com>, 2020
+# WhiredPlanck <whiredplanck@outlook.com>, 2022
 # yinsigan <ganweiliang886@gmail.com>, 2012
 # zhangmin <zm1990s@gmail.com>, 2013-2015
 # zhangmin <zm1990s@gmail.com>, 2013
 # 周嘉韡 <btchina@live.com>, 2013
+# 玉堂白鹤 <yjwork@qq.com>, 2021
+# Mingcong Bai <jeffbai@aosc.xyz>, 2015
 # 蒋浩海 <jhaohai@foxmail.com>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: Audacious Plugins\n"
-"Report-Msgid-Bugs-To: http://redmine.audacious-media-player.org/\n"
-"POT-Creation-Date: 2015-02-28 19:18+0100\n"
-"PO-Revision-Date: 2015-02-05 10:15+0000\n"
-"Last-Translator: zhangmin <zm1990s@gmail.com>\n"
-"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/"
-"audacious/language/zh_CN/)\n"
+"Report-Msgid-Bugs-To: https://github.com/audacious-media-player/audacious/"
+"issues\n"
+"POT-Creation-Date: 2024-09-26 21:54+0200\n"
+"PO-Revision-Date: 2011-10-10 17:43+0000\n"
+"Last-Translator: dylanchu <chudongyu@126.com>, 2022\n"
+"Language-Team: Chinese (China) (http://app.transifex.com/audacious/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"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: src/aac-raw/aac.cc:18
+#: src/aac/aac.cc:19
 msgid "AAC (Raw) Decoder"
 msgstr "AAC (Raw) 解码器"
 
-#: src/adplug/adplug-xmms.cc:42
+#: src/adplug/adplug-xmms.cc:70
 msgid "AdPlug (AdLib Player)"
 msgstr "AdPlug (AdLib 播放器)"
 
-#: src/adplug/adplug-xmms.cc:156 src/modplug/modplugbmp.cc:335
-#: src/psf/plugin.cc:138 src/vtx/vtx.cc:87 src/xsf/plugin.cc:113
+#: src/adplug/adplug-xmms.cc:167 src/modplug/modplugbmp.cc:321
+#: src/psf/plugin.cc:161 src/vtx/vtx.cc:89 src/xsf/plugin.cc:204
 msgid "sequenced"
 msgstr "连续的"
 
-#: src/alarm/alarm.cc:55 src/alarm/interface.cc:82
-msgid "Alarm"
-msgstr "闹钟"
-
-#: src/alarm/alarm.cc:782
-msgid "Set Alarm ..."
-msgstr "设置闹钟"
-
-#: src/alarm/alarm.cc:810
-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/interface.cc: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"
-
-#: src/alarm/interface.cc: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"
-"在此刻音量淡出至 0。\n"
-"\n"
-"\n"
-"选项:\n"
-"附加命令:\n"
-"在设定的时间运行命令。\n"
-"\n"
-
-#: src/alarm/interface.cc: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"
-"mp3/ogg 的 URL 也可以在此输入。\n"
-"\n"
-"备忘录: \n"
-"在闹铃响后显示一个备忘录。\n"
-"在此输入框输入备忘录并打开开关按钮。"
-
-#: src/alarm/interface.cc:81
-msgid "This is your wakeup call."
-msgstr "此为起床闹钟"
-
-#: src/alarm/interface.cc:99
-msgid "Your reminder for today is..."
-msgstr "你今日的备忘录是……"
-
-#: src/alarm/interface.cc:101 src/alarm/interface.cc:386
-msgid "Reminder"
-msgstr "提醒器"
-
-#: src/alarm/interface.cc:132
-msgid "Monday"
-msgstr "星期一"
-
-#: src/alarm/interface.cc:132
-msgid "Tuesday"
-msgstr "星期二"
-
-#: src/alarm/interface.cc:132
-msgid "Wednesday"
-msgstr "星期三"
-
-#: src/alarm/interface.cc:133
-msgid "Thursday"
-msgstr "星期四"
-
-#: src/alarm/interface.cc:133
-msgid "Friday"
-msgstr "星期五"
-
-#: src/alarm/interface.cc:133
-msgid "Saturday"
-msgstr "星期六"
-
-#: src/alarm/interface.cc:133
-msgid "Sunday"
-msgstr "星期日"
-
-#: src/alarm/interface.cc:171 src/alarm/interface.cc:230
-#: src/alarm/interface.cc:245
-msgid "Time"
-msgstr "时间"
-
-#: src/alarm/interface.cc:178
-msgid "Alarm at (default):"
-msgstr "响闹钟 (默认) : "
-
-#: src/alarm/interface.cc:200
-msgid "h"
-msgstr "点"
-
-#: src/alarm/interface.cc:203
-msgid "Quiet after:"
-msgstr "静音时间："
-
-#: src/alarm/interface.cc:215
-msgid "hours"
-msgstr "小时"
-
-#: src/alarm/interface.cc:226
-msgid "minutes"
-msgstr "分"
-
-#: src/alarm/interface.cc:235
-msgid "Choose the days for the alarm to come on"
-msgstr "选择响闹钟的日期"
-
-#: src/alarm/interface.cc:242
-msgid "Day"
-msgstr "日期"
-
-#: src/alarm/interface.cc:259 src/bs2b/plugin.cc:130
-#: src/skins/preset-list.cc:434 src/skins/preset-list.cc:440
-msgid "Default"
-msgstr "默认"
+#: src/adplug/adplug-xmms.cc:349 src/sid/xs_config.cc:61
+msgid "Output"
+msgstr "输出"
 
-#: src/alarm/interface.cc:288
-msgid "Days"
-msgstr "日期"
-
-#: src/alarm/interface.cc:297
-msgid "Fading"
-msgstr "渐隐"
-
-#: src/alarm/interface.cc:305 src/console/plugin.cc:41
-#: src/crossfade/crossfade.cc:53 src/crossfade/crossfade.cc:59
-#: src/gtkui/settings.cc:49 src/lirc/lirc.cc:397 src/sid/xs_config.cc:85
-#: src/sid/xs_config.cc:94 src/sid/xs_config.cc:103
-msgid "seconds"
-msgstr "秒"
+#: src/adplug/adplug-xmms.cc:350
+msgid "OPL Emulator:"
+msgstr "OPL 仿真器："
+
+#: src/adplug/adplug-xmms.cc:353 src/amidiplug/i_configure.cc:153
+#: src/console/plugin.cc:45 src/filewriter/filewriter.cc:481
+#: src/sid/xs_config.cc:65 src/xsf/plugin.cc:446
+msgid "Sample rate:"
+msgstr "采样率："
 
-#: src/alarm/interface.cc:312 src/alarm/interface.cc:353
-msgid "Volume"
-msgstr "音量"
-
-#: src/alarm/interface.cc:317
-msgid "Start at"
-msgstr "开始于"
-
-#: src/alarm/interface.cc:333
-msgid "Final"
-msgstr "完成于"
-
-#: src/alarm/interface.cc:346
-msgid "Current"
-msgstr "当前"
-
-#: src/alarm/interface.cc:359
-msgid "Additional Command"
-msgstr "附加命令"
+#: src/adplug/adplug-xmms.cc:354 src/amidiplug/i_configure.cc:155
+#: src/bs2b/plugin.cc:141 src/console/plugin.cc:47
+#: src/modplug/plugin_main.cc:77 src/resample/resample.cc:201
+#: src/resample/resample.cc:207 src/resample/resample.cc:211
+#: src/resample/resample.cc:215 src/resample/resample.cc:219
+#: src/resample/resample.cc:223 src/resample/resample.cc:227
+#: src/resample/resample.cc:231 src/resample/resample.cc:235
+#: src/resample/resample.cc:239 src/resample/resample.cc:243
+#: src/sid/xs_config.cc:67 src/soxr/sox-resampler.cc:205
+msgid "Hz"
+msgstr "赫兹"
 
-#: src/alarm/interface.cc:365 src/alarm/interface.cc:391
-msgid "enable"
-msgstr "启用"
+#: src/adplug/adplug-xmms.cc:355 src/gtkui/settings.cc:55
+#: src/modplug/plugin_main.cc:105 src/qtui/settings.cc:85
+#: src/skins-qt/skins_cfg.cc:302 src/skins/skins_cfg.cc:284
+msgid "Miscellaneous"
+msgstr "杂项"
 
-#: src/alarm/interface.cc:372
-msgid "Playlist (optional)"
-msgstr "播放列表(可选)"
-
-#: src/alarm/interface.cc:379
-msgid "Select a playlist"
-msgstr "选择一个播放列表"
-
-#: src/alarm/interface.cc:399
-msgid "Options"
-msgstr "选项"
-
-#: src/alarm/interface.cc:404
-msgid "What do these options mean?"
-msgstr "这些选项代表什么？"
-
-#: src/alarm/interface.cc:420
-msgid "Help"
-msgstr "帮助"
+#: src/adplug/adplug-xmms.cc:356
+msgid "Repeat song in endless loop"
+msgstr "循环播放歌曲"
 
-#: src/albumart/albumart.cc:31
+#: src/albumart/albumart.cc:31 src/albumart-qt/albumart.cc:35
 msgid "Album Art"
 msgstr "专辑封面"
 
-#: src/albumart-qt/albumart.cc:33
-msgid "Album Art (Qt)"
-msgstr "专辑封面(Qt)"
-
-#: src/alsa/alsa.h:70
+#: src/alsa/alsa.h:64
 msgid "ALSA Output"
 msgstr "ALSA 输出"
 
@@ -322,8 +110,8 @@
 "Audacious 的 ALSA Output 插件\n"
 "版权所有 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."
+"衷心感谢 ALSA 输出插件 NG 的作者 William Pitcock，当初 ALSA 的手册不够用时，"
+"他的代码给了我很大的参考价值。"
 
 #: src/alsa/config.cc:61
 msgid "(no description)"
@@ -343,17 +131,17 @@
 
 #: src/alsa/config.cc:299
 msgid "Mixer device:"
-msgstr "混音设备"
+msgstr "混音设备："
 
 #: src/alsa/config.cc:302
 msgid "Mixer element:"
 msgstr "混音单元："
 
-#: src/amidi-plug/amidi-plug.cc:41
+#: src/amidiplug/amidi-plug.cc:42
 msgid "AMIDI-Plug (MIDI Player)"
 msgstr "AMIDI-Plug (MIDI 播放器)"
 
-#: src/amidi-plug/amidi-plug.cc:437
+#: src/amidiplug/amidi-plug.cc:445
 msgid ""
 "AMIDI-Plug\n"
 "modular MIDI music player\n"
@@ -385,167 +173,171 @@
 "特别感谢...\n"
 "\n"
 "Clemens Ladisch ， Jaroslav Kysela\n"
-"编写的超帅的 aplaymidi 和 amixer；这两个\n"
-"以及 alsa-lib docs 对我们学习 ALSA API 有很大帮助\n"
+"编写的超酷的 aplaymidi 和 amixer；这两个程序\n"
+"以及 alsa-lib 文档对我们了解学习 ALSA API 有很大帮助\n"
 "\n"
 "\n"
 "Alfredo Spadafina\n"
-"贡献了很漂亮的 midi 键盘标志\n"
+"贡献了很漂亮的 MIDI 键盘标志\n"
 "\n"
 "Tony Vroon\n"
-"帮助我们进行测试"
+"帮助我们进行了测试"
 
-#: src/amidi-plug/i_configure.cc:94
+#: src/amidiplug/i_configure.cc:94
 msgid "Override default gain:"
-msgstr "覆盖默认增益: "
+msgstr "覆盖默认增益："
 
-#: src/amidi-plug/i_configure.cc:102
+#: src/amidiplug/i_configure.cc:102
 msgid "Override default polyphony:"
-msgstr "覆盖默认复调: "
+msgstr "覆盖默认复调："
 
-#: src/amidi-plug/i_configure.cc:110
+#: src/amidiplug/i_configure.cc:110
 msgid "Override default reverb:"
-msgstr "覆盖默认回响: "
+msgstr "覆盖默认回响："
 
-#: src/amidi-plug/i_configure.cc:112 src/amidi-plug/i_configure.cc:120
+#: src/amidiplug/i_configure.cc:112 src/amidiplug/i_configure.cc:120
 msgid "On"
 msgstr "开启"
 
-#: src/amidi-plug/i_configure.cc:118
+#: src/amidiplug/i_configure.cc:118
 msgid "Override default chorus:"
-msgstr "覆盖默认和声: "
+msgstr "覆盖默认和声："
 
-#: src/amidi-plug/i_configure.cc:128 src/console/plugin.cc:29
+#: src/amidiplug/i_configure.cc:128 src/console/plugin.cc:29
 msgid "Playback"
 msgstr "回放"
 
-#: src/amidi-plug/i_configure.cc:129
+#: src/amidiplug/i_configure.cc:129
 msgid "Transpose:"
-msgstr "转置: "
+msgstr "转置："
 
-#: src/amidi-plug/i_configure.cc:131
+#: src/amidiplug/i_configure.cc:131 src/speedpitch/speed-pitch.cc:257
 msgid "semitones"
 msgstr "半音"
 
-#: src/amidi-plug/i_configure.cc:132
+#: src/amidiplug/i_configure.cc:132
 msgid "Drum shift:"
-msgstr "鼓移: "
+msgstr "鼓移："
 
-#: src/amidi-plug/i_configure.cc:134
+#: src/amidiplug/i_configure.cc:134
 msgid "note numbers"
 msgstr "音符数字"
 
-#: src/amidi-plug/i_configure.cc:135
+#: src/amidiplug/i_configure.cc:135
 msgid "Skip leading silence"
 msgstr "跳过开头的静音"
 
-#: src/amidi-plug/i_configure.cc:137
+#: src/amidiplug/i_configure.cc:137
 msgid "Skip trailing silence"
 msgstr "跳过尾部静音"
 
-#: src/amidi-plug/i_configure.cc:141
+#: src/amidiplug/i_configure.cc:141
 msgid "SoundFont"
 msgstr "SoundFont"
 
-#: src/amidi-plug/i_configure.cc:143
+#: src/amidiplug/i_configure.cc:148
 msgid "Synthesizer"
 msgstr "合成器"
 
-#: src/amidi-plug/i_configure.cc:148 src/console/plugin.cc:45
-#: src/sid/xs_config.cc:65
-msgid "Sample rate:"
-msgstr "采样率："
-
-#: src/amidi-plug/i_configure.cc:150 src/bs2b/plugin.cc:141
-#: src/console/plugin.cc:47 src/modplug/plugin_main.cc:78
-#: src/resample/resample.cc:201 src/resample/resample.cc:207
-#: src/resample/resample.cc:211 src/resample/resample.cc:215
-#: src/resample/resample.cc:219 src/resample/resample.cc:223
-#: src/resample/resample.cc:227 src/resample/resample.cc:231
-#: src/resample/resample.cc:235 src/resample/resample.cc:239
-#: src/resample/resample.cc:243 src/sid/xs_config.cc:67
-#: src/sox-resampler/sox-resampler.cc:163
-msgid "Hz"
-msgstr "赫兹"
-
-#: src/amidi-plug/i_configure-fluidsynth.cc:52
+#: src/amidiplug/i_configure-fluidsynth.cc:58
+#: src/amidiplug/i_configure-fluidsynth.cc:527
 msgid "AMIDI-Plug - select SoundFont file"
-msgstr "AMIDI-Plug - 选择SoundFont文件"
+msgstr "AMIDI-Plug - 选择 SoundFont 文件"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:55 src/filewriter/mp3.cc:658
+#: src/amidiplug/i_configure-fluidsynth.cc:61
 msgid "_Cancel"
 msgstr "取消 (_C)"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:56
+#: src/amidiplug/i_configure-fluidsynth.cc:62
 msgid "_Open"
 msgstr "打开 (_O)"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:225 src/gtkui/columns.cc:46
+#: src/amidiplug/i_configure-fluidsynth.cc:233
+#: src/amidiplug/i_configure-fluidsynth.cc:461
 msgid "File name"
 msgstr "文件名"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:229
+#: src/amidiplug/i_configure-fluidsynth.cc:237
+#: src/amidiplug/i_configure-fluidsynth.cc:464
 msgid "Size (bytes)"
 msgstr "大小(bytes)"
 
-#: src/amidi-plug/i_fileinfo.cc:163
+#: src/amidiplug/i_fileinfo.cc:184
 msgid "Name:"
 msgstr "名称："
 
-#: src/amidi-plug/i_fileinfo.cc:181
+#: src/amidiplug/i_fileinfo.cc:202
 msgid " MIDI Info "
 msgstr " MIDI 信息 "
 
-#: src/amidi-plug/i_fileinfo.cc:195
+#: src/amidiplug/i_fileinfo.cc:216
 msgid "Format:"
 msgstr "格式："
 
-#: src/amidi-plug/i_fileinfo.cc:198
+#: src/amidiplug/i_fileinfo.cc:219
 msgid "Length (msec):"
 msgstr "长度(毫秒)："
 
-#: src/amidi-plug/i_fileinfo.cc:201
+#: src/amidiplug/i_fileinfo.cc:222
 msgid "No. of Tracks:"
 msgstr "音轨数："
 
-#: src/amidi-plug/i_fileinfo.cc:207
+#: src/amidiplug/i_fileinfo.cc:228
 msgid "variable"
 msgstr "变体"
 
-#: src/amidi-plug/i_fileinfo.cc:209
+#: src/amidiplug/i_fileinfo.cc:230
 msgid "BPM:"
-msgstr "每分钟节拍: "
+msgstr "每分钟节拍："
 
-#: src/amidi-plug/i_fileinfo.cc:217
+#: src/amidiplug/i_fileinfo.cc:238
 msgid "BPM (wavg):"
-msgstr "每分钟节拍 (wavg): "
+msgstr "每分钟节拍 (加权平均)："
 
-#: src/amidi-plug/i_fileinfo.cc:220
+#: src/amidiplug/i_fileinfo.cc:241
 msgid "Time Div:"
-msgstr "时间格: "
+msgstr "时间格："
 
-#: src/amidi-plug/i_fileinfo.cc:231
+#: src/amidiplug/i_fileinfo.cc:252
 msgid " MIDI Comments and Lyrics "
 msgstr " MIDI备注与歌词"
 
-#: src/amidi-plug/i_fileinfo.cc:278
+#: src/amidiplug/i_fileinfo.cc:299
 msgid "* no comments available in this MIDI file *"
 msgstr "* MIDI文件不包含备注 *"
 
-#: src/amidi-plug/i_fileinfo.cc:290
+#: src/amidiplug/i_fileinfo.cc:311
 msgid "* no lyrics available in this MIDI file *"
 msgstr "* MIDI文件不包含歌词 *"
 
-#: src/amidi-plug/i_fileinfo.cc:300 src/filewriter/vorbis.cc:197
-#: src/ladspa/plugin.cc:416
+#: src/amidiplug/i_fileinfo.cc:321 src/ladspa/plugin.cc:418
+#: src/ui-common/dialogs-qt.cc:32
 msgid "_Close"
 msgstr "关闭(_C)"
 
-#: src/amidi-plug/i_fileinfo.cc:325
+#: src/amidiplug/i_fileinfo.cc:346
 msgid " (invalid UTF-8)"
 msgstr " (非法的UTF-8编码)"
 
-#: src/aosd/aosd.cc:32
+#: src/ampache/ampache.cc:33
+msgid "Ampache Browser"
+msgstr "Ampache 浏览器"
+
+#: src/ampache/ampache.cc:46
+msgid ""
+"Ampache Browser for Audacious\n"
+"http://ampache-browser.org/\n"
+"\n"
+"Copyright (C) Róbert Čerňanský and John Lindgren\n"
+"License: GNU GPLv3"
+msgstr ""
+"用于 Audacious 的 Ampache 浏览器\n"
+"http://ampache-browser.org\n"
+"\n"
+"版权所有 (C) Róbert Čerňanský 和 John Lindgren\n"
+"许可协议：GNU GPLv3"
+
+#: src/aosd/aosd.cc:31
 msgid ""
 "Audacious OSD\n"
 "http://www.develia.org/projects.php?p=audacious#aosd\n"
@@ -579,192 +371,188 @@
 msgid "Concave Rectangle"
 msgstr "凹角矩形"
 
-#: src/aosd/aosd_style.cc:69
+#: src/aosd/aosd_style.cc:69 src/openmpt/mptwrap.h:50 src/xsf/plugin.cc:436
 msgid "None"
 msgstr "无"
 
-#: src/aosd/aosd_trigger.cc:50
+#: src/aosd/aosd_trigger.cc:49
 msgid "Playback Start"
 msgstr "播放开始"
 
-#: src/aosd/aosd_trigger.cc:51
+#: src/aosd/aosd_trigger.cc:50
 msgid "Triggers OSD when a playlist entry is played."
-msgstr "开始播放时触发OSD"
+msgstr "开始播放时触发 OSD。"
 
-#: src/aosd/aosd_trigger.cc:56
+#: src/aosd/aosd_trigger.cc:55
 msgid "Title Change"
 msgstr "标题改变"
 
-#: src/aosd/aosd_trigger.cc:57
+#: src/aosd/aosd_trigger.cc:56
 msgid "Triggers OSD when the song title changes (for internet streams)."
 msgstr "在曲目标题改变时触发 OSD（用于互联网流媒体）。"
 
-#: src/aosd/aosd_trigger.cc:62
+#: src/aosd/aosd_trigger.cc:61
 msgid "Pause On"
 msgstr "暂停播放"
 
-#: src/aosd/aosd_trigger.cc:63
+#: src/aosd/aosd_trigger.cc:62
 msgid "Triggers OSD when playback is paused."
-msgstr "暂停播放时触发OSD"
+msgstr "暂停播放时触发 OSD。"
 
-#: src/aosd/aosd_trigger.cc:68
+#: src/aosd/aosd_trigger.cc:67
 msgid "Pause Off"
 msgstr "恢复播放"
 
-#: src/aosd/aosd_trigger.cc:69
+#: src/aosd/aosd_trigger.cc:68
 msgid "Triggers OSD when playback is unpaused."
-msgstr "恢复播放时触发OSD"
+msgstr "恢复播放时触发 OSD。"
 
-#: src/aosd/aosd_ui.cc:163
+#: src/aosd/aosd_ui.cc:204
 msgid "Placement"
 msgstr "位置"
 
-#: src/aosd/aosd_ui.cc:196
+#: src/aosd/aosd_ui.cc:241
 msgid "Relative X offset:"
-msgstr "X相对位移："
+msgstr "X 相对位移："
 
-#: src/aosd/aosd_ui.cc:203
+#: src/aosd/aosd_ui.cc:245
 msgid "Relative Y offset:"
-msgstr "Y相对位移："
+msgstr "Y 相对位移："
 
-#: src/aosd/aosd_ui.cc:210
+#: src/aosd/aosd_ui.cc:249
 msgid "Max OSD width:"
 msgstr "最大OSD宽度："
 
-#: src/aosd/aosd_ui.cc:221
+#: src/aosd/aosd_ui.cc:281
 msgid "Multi-Monitor options"
 msgstr "多屏选项"
 
-#: src/aosd/aosd_ui.cc:225
+#: src/aosd/aosd_ui.cc:285
 msgid "Display OSD using:"
 msgstr "OSD显示于："
 
-#: src/aosd/aosd_ui.cc:227
+#: src/aosd/aosd_ui.cc:287
 msgid "all monitors"
 msgstr "所有显示器"
 
-#: src/aosd/aosd_ui.cc:230
+#: src/aosd/aosd_ui.cc:290
 #, c-format
 msgid "monitor %i"
-msgstr "显示器%i"
+msgstr "显示器 %i"
 
-#: src/aosd/aosd_ui.cc:282
+#: src/aosd/aosd_ui.cc:342
 msgid "Timing (ms)"
 msgstr "延时(ms)"
 
-#: src/aosd/aosd_ui.cc:287
+#: src/aosd/aosd_ui.cc:347
 msgid "Display:"
 msgstr "显示："
 
-#: src/aosd/aosd_ui.cc:292
+#: src/aosd/aosd_ui.cc:352
 msgid "Fade in:"
 msgstr "淡入："
 
-#: src/aosd/aosd_ui.cc:297
+#: src/aosd/aosd_ui.cc:357
 msgid "Fade out:"
 msgstr "淡出："
 
-#: src/aosd/aosd_ui.cc:361
+#: src/aosd/aosd_ui.cc:442
 msgid "Fonts"
 msgstr "字体"
 
-#: src/aosd/aosd_ui.cc:368
+#: src/aosd/aosd_ui.cc:449
 #, c-format
 msgid "Font %i:"
 msgstr "字体 %i："
 
-#: src/aosd/aosd_ui.cc:382
+#: src/aosd/aosd_ui.cc:466
 msgid "Shadow"
 msgstr "阴影"
 
-#: src/aosd/aosd_ui.cc:486
+#: src/aosd/aosd_ui.cc:589
 msgid "Render Style"
 msgstr "渲染风格"
 
-#: src/aosd/aosd_ui.cc:502
+#: src/aosd/aosd_ui.cc:605
 msgid "Colors"
 msgstr "颜色"
 
-#: src/aosd/aosd_ui.cc:513
+#: src/aosd/aosd_ui.cc:616
 #, c-format
 msgid "Color %i:"
 msgstr "颜色 %i："
 
-#: src/aosd/aosd_ui.cc:600
+#: src/aosd/aosd_ui.cc:714
 msgid "Enable trigger"
 msgstr "启用触发器"
 
-#: src/aosd/aosd_ui.cc:627
+#: src/aosd/aosd_ui.cc:741
 msgid "Event"
 msgstr "事件"
 
-#: src/aosd/aosd_ui.cc:655
+#: src/aosd/aosd_ui.cc:768
 msgid "Composite manager detected"
 msgstr "检测到混合管理器"
 
-#: src/aosd/aosd_ui.cc:662
+#: src/aosd/aosd_ui.cc:775
 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无法正常工作，除非你激活混合管理器。"
+"除非激活混合管理器，否则 OSD 无法正常工作。"
 
-#: src/aosd/aosd_ui.cc:670
+#: src/aosd/aosd_ui.cc:783
 msgid "Composite manager not required for fake transparency"
-msgstr "假透明无需混合管理支持"
+msgstr "伪透明效果无需混成管理支持"
 
-#: src/aosd/aosd_ui.cc:706
+#: src/aosd/aosd_ui.cc:820
 msgid "Transparency"
 msgstr "透明"
 
-#: src/aosd/aosd_ui.cc:712
+#: src/aosd/aosd_ui.cc:826
 msgid "Fake transparency"
-msgstr "假透明"
+msgstr "伪透明"
 
-#: src/aosd/aosd_ui.cc:714
+#: src/aosd/aosd_ui.cc:828
 msgid "Real transparency (requires X Composite Ext.)"
-msgstr "真透明(需要X Composite扩展)"
+msgstr "真透明 (需要 X Composite 扩展)"
 
-#: src/aosd/aosd_ui.cc:756
+#: src/aosd/aosd_ui.cc:875
 msgid "Composite extension not loaded"
-msgstr "X Composite扩展未加载"
-
-#: src/aosd/aosd_ui.cc:764
-msgid "Composite extension not available"
-msgstr "X Composite扩展不可用"
+msgstr "X Composite 扩展未加载"
 
-#: src/aosd/aosd_ui.cc:781
+#: src/aosd/aosd_ui.cc:892
 #, c-format
 msgid "Audacious OSD"
 msgstr "Audacious OSD"
 
-#: src/aosd/aosd_ui.cc:844
+#: src/aosd/aosd_ui.cc:955
 msgid "Position"
 msgstr "位置"
 
-#: src/aosd/aosd_ui.cc:849
+#: src/aosd/aosd_ui.cc:960
 msgid "Animation"
 msgstr "动画"
 
-#: src/aosd/aosd_ui.cc:854
+#: src/aosd/aosd_ui.cc:965
 msgid "Text"
 msgstr "字体"
 
-#: src/aosd/aosd_ui.cc:859
+#: src/aosd/aosd_ui.cc:970
 msgid "Decoration"
 msgstr "装饰器"
 
-#: src/aosd/aosd_ui.cc:864
+#: src/aosd/aosd_ui.cc:975
 msgid "Trigger"
 msgstr "触发器"
 
-#: src/aosd/aosd_ui.cc:869
+#: src/aosd/aosd_ui.cc:980 src/streamtuner/shoutcast-model.cc:202
 msgid "Misc"
 msgstr "其它"
 
-#: src/aosd/aosd_ui.cc:878
+#: src/aosd/aosd_ui.cc:989
 msgid "Test"
 msgstr "测试"
 
@@ -780,11 +568,83 @@
 msgid "Audacious Playlists (audpl)"
 msgstr "Audacious 播放列表 (audpl)"
 
-#: src/blur_scope/blur_scope.cc:42
+#: src/background_music/background_music.cc:24
+msgid "Background music"
+msgstr ""
+
+#: src/background_music/background_music.cc:25
+msgid "Target level:"
+msgstr ""
+
+#: src/background_music/background_music.cc:28
+#: src/background_music/background_music.cc:33
+#: src/silence-removal/silence-removal.cc:70
+msgid "dB"
+msgstr "dB"
+
+#: src/background_music/background_music.cc:29
+msgid "Maximum amplification:"
+msgstr ""
+
+#: src/background_music/background_music.cc:34 src/mpg123/mpg123.cc:81
+msgid "Advanced"
+msgstr "高级设置"
+
+#: src/background_music/background_music.cc:36
+msgid "Slow detection weight:"
+msgstr ""
+
+#: src/background_music/background_music.cc:39
+msgid "Hint"
+msgstr ""
+
+#: src/background_music/background_music.cc:41
+msgid ""
+"Slow detection weight is the relative weight\n"
+"of a long term average detection when compared\n"
+"to the actual, faster loudness detection.\n"
+"A value of zero gives a more radio-like sound\n"
+"where soft passages get \"pulled up\" more quickly,\n"
+"a value of two makes the sound feel less compressed."
+msgstr ""
+
+#: src/background_music/background_music.cc:52
+msgid ""
+"Background Music Plugin for Audacious\n"
+"Copyright 2023;2024 Michel Fleur\n"
+"\n"
+"Controls the volume to make the sound equally loud within and between "
+"tracks.\n"
+" It uses accurate loudness measurement and tries to make the volume changes "
+"sound natural without audible peaks, yet without lowering the volume before "
+"a peak in advance."
+msgstr ""
+
+#: src/background_music/background_music.cc:61
+msgid "Background Music"
+msgstr ""
+
+#: src/bitcrusher/bitcrusher.cc:33
+msgid "Bitcrusher"
+msgstr "比特失真器"
+
+#: src/bitcrusher/bitcrusher.cc:34
+msgid "Bit Depth:"
+msgstr "位深度："
+
+#: src/bitcrusher/bitcrusher.cc:37
+msgid "Downsample ratio:"
+msgstr "降采样比率："
+
+#: src/bitcrusher/bitcrusher.cc:48
+msgid "Bitcrusher"
+msgstr "比特失真器"
+
+#: src/blur_scope/blur_scope.cc:40 src/blur_scope-qt/blur_scope.cc:45
 msgid "Color"
 msgstr "颜色"
 
-#: src/blur_scope/blur_scope.cc:58
+#: src/blur_scope/blur_scope.cc:56 src/blur_scope-qt/blur_scope.cc:158
 msgid "Blur Scope"
 msgstr "模糊范围"
 
@@ -796,9 +656,13 @@
 msgid "Presets:"
 msgstr "预置:"
 
+#: src/bs2b/plugin.cc:130
+msgid "Default"
+msgstr "默认"
+
 #: src/bs2b/plugin.cc:136
 msgid "Feed level:"
-msgstr "评级: "
+msgstr "评级："
 
 #: src/bs2b/plugin.cc:138
 msgid "x1/10 dB"
@@ -806,17 +670,17 @@
 
 #: src/bs2b/plugin.cc:139
 msgid "Cut frequency:"
-msgstr "截止频率: "
+msgstr "截止频率："
 
-#: src/cairo-spectrum/cairo-spectrum.cc:41
+#: src/cairo-spectrum/cairo-spectrum.cc:42 src/qt-spectrum/qt-spectrum.cc:107
 msgid "Spectrum Analyzer"
 msgstr "频谱分析器"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:72
+#: src/cdaudio/cdaudio-ng.cc:74
 msgid "Audio CD Plugin"
 msgstr "音频 CD 插件"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:121
+#: src/cdaudio/cdaudio-ng.cc:121
 msgid ""
 "Copyright (C) 2007-2012 Calin Crisan <ccrisan@gmail.com> and others.\n"
 "\n"
@@ -827,141 +691,141 @@
 "\n"
 "This was a Google Summer of Code 2007 project."
 msgstr ""
-"版权所有 (C) 2007-2012 Calin Crisan <ccrisan@gmail.com> 以及其他人。\n"
+"版权所有 (C) 2007-2012 Calin Crisan <ccrisan@gmail.com> 以及其他作者。\n"
 "\n"
-"Many thanks to libcdio developers <http://www.gnu.org/software/libcdio/>\n"
-"and to libcddb developers <http://libcddb.sourceforge.net/>.\n"
+"非常感谢 libcdio 的开发者们 <http://www.gnu.org/software/libcdio/>\n"
+"和 libcddb 的开发者们 <http://libcddb.sourceforge.net/>。\n"
 "\n"
-"Also thank you to Tony Vroon for mentoring and guiding me.\n"
+"还要感谢 Tony Vroon 的指导。\n"
 "\n"
-"This was a Google Summer of Code 2007 project."
+"这是在 2007 年 Google 编程之夏（Summer of Code）的作品。"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:137
+#: src/cdaudio/cdaudio-ng.cc:140
 msgid "Device"
 msgstr "设备"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:138
+#: src/cdaudio/cdaudio-ng.cc:141
 msgid "Read speed:"
 msgstr "读取速度："
 
-#: src/cdaudio-ng/cdaudio-ng.cc:141
+#: src/cdaudio/cdaudio-ng.cc:144
 msgid "Override device:"
 msgstr "覆盖设备："
 
-#: src/cdaudio-ng/cdaudio-ng.cc:143
+#: src/cdaudio/cdaudio-ng.cc:146
 msgid "Metadata"
-msgstr "Metadata"
+msgstr "元数据"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:144
+#: src/cdaudio/cdaudio-ng.cc:147
 msgid "Use CD-Text"
 msgstr "使用 CD 文本"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:146
+#: src/cdaudio/cdaudio-ng.cc:150
 msgid "Use CDDB"
 msgstr "使用 CDDB"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:148
+#: src/cdaudio/cdaudio-ng.cc:152
 msgid "Use HTTP instead of CDDBP"
-msgstr "使用HTTP代替CDDBP"
+msgstr "使用 HTTP 代替 CDDBP"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:151
+#: src/cdaudio/cdaudio-ng.cc:155
 msgid "Server:"
 msgstr "服务器："
 
-#: src/cdaudio-ng/cdaudio-ng.cc:155
+#: src/cdaudio/cdaudio-ng.cc:159
 msgid "Path:"
 msgstr "路径："
 
-#: src/cdaudio-ng/cdaudio-ng.cc:159
+#: src/cdaudio/cdaudio-ng.cc:163
 msgid "Port:"
 msgstr "端口："
 
-#: src/cdaudio-ng/cdaudio-ng.cc:246
+#: src/cdaudio/cdaudio-ng.cc:228
 msgid "Failed to initialize cdio subsystem."
 msgstr "初始化 cdio 子系统失败。"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:281
+#: src/cdaudio/cdaudio-ng.cc:260
 #, c-format
 msgid "Invalid URI %s."
 msgstr "无效的 URI %s。"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:283
+#: src/cdaudio/cdaudio-ng.cc:262
 #, c-format
 msgid "Track %d not found."
 msgstr "未找到音轨 %d。"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:285
+#: src/cdaudio/cdaudio-ng.cc:264
 #, c-format
 msgid "Track %d is a data track."
-msgstr "磁道 %d 是一个数据磁道"
+msgstr "磁道 %d 是一个数据磁道。"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:360
+#: src/cdaudio/cdaudio-ng.cc:339
 msgid "Error reading audio CD."
 msgstr "读取音频 CD 时出错。"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:429
+#: src/cdaudio/cdaudio-ng.cc:410
 msgid "Audio CD"
-msgstr "音频CD"
+msgstr "音频 CD"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:460 src/cdaudio-ng/cdaudio-ng.cc:469
+#: src/cdaudio/cdaudio-ng.cc:446 src/cdaudio/cdaudio-ng.cc:455
 #, c-format
 msgid "Failed to open CD device %s."
 msgstr "打开 CD 设备 %s 失败。"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:472
+#: src/cdaudio/cdaudio-ng.cc:458
 msgid "No audio capable CD drive found."
 msgstr "没有找到合适的 CD 音频驱动器。"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:497
+#: src/cdaudio/cdaudio-ng.cc:481
+msgid "Drive is empty."
+msgstr "设备为空。"
+
+#: src/cdaudio/cdaudio-ng.cc:483
+msgid "Unsupported disk type."
+msgstr "未支持光盘类型。"
+
+#: src/cdaudio/cdaudio-ng.cc:507
 msgid "Failed to finish initializing opened CD drive."
 msgstr "完成打开的 CD 驱动器初始化失败。"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:510
+#: src/cdaudio/cdaudio-ng.cc:520
 msgid "Failed to retrieve first/last track number."
 msgstr "取得第一首/最后一首音频音轨号失败。"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:531
+#: src/cdaudio/cdaudio-ng.cc:541
 #, c-format
 msgid "Cannot read start/end LSN for track %d."
 msgstr "不能读取音频 %d 开始/结束的 LSN 信息。"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:613
-msgid "Failed to create the cddb connection."
-msgstr "创建 CDDB 连接失败。"
+#: src/cdaudio/cdaudio-ng.cc:624
+msgid "Failed to create the CDDB connection."
+msgstr "无法创建 CDDB 连接。"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:679
+#: src/cdaudio/cdaudio-ng.cc:690
 msgid "Failed to query the CDDB server"
 msgstr "查询 CDDB 服务器失败"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:681
+#: src/cdaudio/cdaudio-ng.cc:692
 #, c-format
 msgid "Failed to query the CDDB server: %s"
 msgstr "查询 CDDB 服务器失败：%s"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:705
+#: src/cdaudio/cdaudio-ng.cc:716
 #, c-format
-msgid "Failed to read the cddb info: %s"
-msgstr "读取 CDDB 信息失败：%s"
-
-#: src/cdaudio-ng/cdaudio-ng.cc:765
-msgid "Drive is empty."
-msgstr "设备为空"
-
-#: src/cdaudio-ng/cdaudio-ng.cc:767
-msgid "Unsupported disk type."
-msgstr "未支持光盘类型"
+msgid "Failed to read the CDDB info: %s"
+msgstr "无法读取 CDDB 信息: %s"
 
-#: src/cd-menu-items/cd-menu-items.cc:35
+#: src/cd-menu-items/cd-menu-items.cc:33
 msgid "Audio CD Menu Items"
 msgstr "音频 CD 目录项"
 
-#: src/cd-menu-items/cd-menu-items.cc:47
-msgid "Play CD"
-msgstr "播放CD"
-
-#: src/cd-menu-items/cd-menu-items.cc:47
-msgid "Add CD"
-msgstr "添加CD"
+#: src/cd-menu-items/cd-menu-items.cc:45
+msgid "Pla_y CD"
+msgstr "播放 CD (_Y)"
+
+#: src/cd-menu-items/cd-menu-items.cc:45
+msgid "_Add CD"
+msgstr "_添加 CD"
 
 #: src/compressor/compressor.cc:45
 msgid "Compression"
@@ -1014,13 +878,20 @@
 
 #: src/console/plugin.cc:36
 msgid "Echo:"
-msgstr "回响: "
+msgstr "回响："
 
 #: src/console/plugin.cc:39
 msgid "Default song length:"
 msgstr "默认歌曲长度："
 
-#: src/console/plugin.cc:42 src/modplug/plugin_main.cc:59
+#: src/console/plugin.cc:41 src/crossfade/crossfade.cc:56
+#: src/crossfade/crossfade.cc:62 src/lirc/lirc.cc:395 src/notify/notify.cc:113
+#: src/sid/xs_config.cc:85 src/sid/xs_config.cc:94 src/sid/xs_config.cc:103
+#: src/vumeter-qt/vumeter_qt.cc:39
+msgid "seconds"
+msgstr "秒"
+
+#: src/console/plugin.cc:42 src/modplug/plugin_main.cc:58
 msgid "Resampling"
 msgstr "重取样"
 
@@ -1044,29 +915,39 @@
 msgid "Game Console Music Decoder"
 msgstr "游戏机音乐解码器"
 
-#: src/coreaudio/coreaudio.cc:50
+#: src/coreaudio/coreaudio.cc:53
 msgid "CoreAudio output"
 msgstr "CoreAudio 输出"
 
-#: src/coreaudio/coreaudio.cc:131
+#: src/coreaudio/coreaudio.cc:155
 msgid ""
 "CoreAudio Output Plugin for Audacious\n"
 "Copyright 2014 William Pitcock\n"
+"Copyright 2017,18 René J.V. Bertin\n"
+" (original code and code adapted from\n"
+" Apple examples, (C) Apple 2013)\n"
 "\n"
 "Based on SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
 msgstr ""
-"Audacious CoreAudio 输出插件\n"
-"William Pitcock 2014 版权所有\n"
+"Audacious CoreAudio 输出插件 \n"
+"版权所有 2014 William Pitcock\n"
+"版权所有 2017,18 René J.V. Bertin\n"
+"（原始代码及改编自\n"
+" Apple 示例代码, (C) Apple 2013）\n"
 "\n"
-"基于 Audacious SDL 输出插件\n"
-"John Lindgren 2010 版权所有"
+"基于 Audacious 的 SDL 输出插件\n"
+"版权所有 2010 John Lindgren"
 
-#: src/coreaudio/coreaudio.cc:143
+#: src/coreaudio/coreaudio.cc:171
 msgid "Use exclusive mode"
 msgstr "使用排除模式"
 
-#: src/crossfade/crossfade.cc:44
+#: src/coreaudio/coreaudio.cc:173
+msgid "Use bit perfect audio (adapt device sampling rate)"
+msgstr "使用位完美音频 (自适应设备采样率)"
+
+#: src/crossfade/crossfade.cc:47
 msgid ""
 "Crossfade Plugin for Audacious\n"
 "Copyright 2010-2014 John Lindgren"
@@ -1074,55 +955,52 @@
 "Audacious Crossfade 插件\n"
 "John Lindgren 2010-2014 版权所有"
 
-#: src/crossfade/crossfade.cc:48
+#: src/crossfade/crossfade.cc:51
 msgid "Crossfade"
 msgstr "淡出"
 
-#: src/crossfade/crossfade.cc:49
+#: src/crossfade/crossfade.cc:52
 msgid "On automatic song change"
 msgstr "在自动切换歌曲时"
 
-#: src/crossfade/crossfade.cc:51 src/crossfade/crossfade.cc:57
+#: src/crossfade/crossfade.cc:54 src/crossfade/crossfade.cc:60
 msgid "Overlap:"
 msgstr "重叠："
 
-#: src/crossfade/crossfade.cc:55
+#: src/crossfade/crossfade.cc:58
 msgid "On seek or manual song change"
 msgstr "在定位或者手动改变歌曲时"
 
-#: src/crossfade/crossfade.cc:61
+#: src/crossfade/crossfade.cc:64
+msgid "No fade in"
+msgstr ""
+
+#: src/crossfade/crossfade.cc:66
+msgid "Use S-curve fade"
+msgstr ""
+
+#: src/crossfade/crossfade.cc:68
+msgid "S-curve steepness:"
+msgstr ""
+
+#: src/crossfade/crossfade.cc:70
+msgid "(higher is steeper)"
+msgstr ""
+
+#: src/crossfade/crossfade.cc:72
 msgid "Tip"
 msgstr "提示"
 
-#: src/crossfade/crossfade.cc:62
+#: src/crossfade/crossfade.cc:73
 msgid ""
 "For better crossfading, enable\n"
 "the Silence Removal effect."
-msgstr "为了让淡出更好地工作，启用静音移除特效"
+msgstr "为了让淡出更好地工作，启用静音移除特效。"
 
-#: src/crossfade/crossfade.cc:72
+#: src/crossfade/crossfade.cc:83
 msgid "Crossfade"
 msgstr "淡出"
 
-#: src/crossfade/crossfade.cc:161
-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"
-"\n"
-"你可以尝试使用”声道混音器“使歌曲的通道数保持一致。"
-
-#: src/crossfade/crossfade.cc:168
-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"
-"\n"
-"你可以尝试使用”采样率转换器“使歌曲的采样保持一致。"
-
 #: src/crystalizer/crystalizer.cc:31
 msgid "Crystalizer"
 msgstr "保真音效"
@@ -1135,60 +1013,61 @@
 msgid "Crystalizer"
 msgstr "Crystalizer"
 
-#: src/cue/cue.cc:37
+#: src/cue/cue.cc:42
 msgid "Cue Sheet Plugin"
 msgstr "Cue 表插件"
 
-#: src/delete-files/delete-files.cc:46 src/delete-files/delete-files.cc:146
+#: src/delete-files/delete-files.cc:53 src/delete-files/delete-files.cc:215
+#: src/delete-files/delete-files.cc:230
 msgid "Delete Files"
 msgstr "删除文件"
 
-#: src/delete-files/delete-files.cc:75
+#: src/delete-files/delete-files.cc:120
+msgid "No files are selected."
+msgstr "没有选择文件。"
+
+#: src/delete-files/delete-files.cc:125
 #, c-format
-msgid "Error moving %s to trash: %s."
-msgstr "将 %s 移动至垃圾箱时出错: %s."
+msgid "Do you want to move %s to the trash?"
+msgstr "您想将 %s 移到垃圾箱吗？"
 
-#: src/delete-files/delete-files.cc:86
+#: src/delete-files/delete-files.cc:126
 #, c-format
-msgid "Error deleting %s: %s."
-msgstr "删除 %s 时出错: %s."
+msgid "Do you want to permanently delete %s?"
+msgstr "您要永久删除 %s 吗？"
 
-#: src/delete-files/delete-files.cc:117
+#: src/delete-files/delete-files.cc:133
 #, c-format
-msgid "Error deleting %s: not a local file."
-msgstr "删除 %s 时出错: 不是一个本地文件。"
+msgid "Do you want to move %d files to the trash?"
+msgstr "是否要将 %d 个文件移至回收站？"
 
 #: src/delete-files/delete-files.cc:134
-msgid "Do you want to move the selected files to the trash?"
-msgstr "你希望将选中的文件移至垃圾箱吗？"
+#, c-format
+msgid "Do you want to permanently delete %d files?"
+msgstr "您要永久删除这 %d 个文件吗？"
 
-#: src/delete-files/delete-files.cc:135
-msgid "Move to Trash"
-msgstr "移至垃圾箱"
-
-#: src/delete-files/delete-files.cc:140
-msgid "Do you want to permanently delete the selected files?"
-msgstr "你希望永久删除选中的文件吗？"
+#: src/delete-files/delete-files.cc:146
+msgid "Move to trash"
+msgstr "移至回收站"
 
-#: src/delete-files/delete-files.cc:141 src/skins/preset-list.cc:411
-#: src/skins/preset-list.cc:427
+#: src/delete-files/delete-files.cc:146
 msgid "Delete"
 msgstr "删除"
 
-#: src/delete-files/delete-files.cc:145 src/skins/preset-browser.cc:56
-#: src/skins/preset-list.cc:307 src/skins/ui_playlist.cc:221
+#: src/delete-files/delete-files.cc:213 src/delete-files/delete-files.cc:235
+#: src/skins-qt/search-select.cc:102 src/skins/search-select.cc:78
 msgid "Cancel"
 msgstr "取消"
 
-#: src/delete-files/delete-files.cc:166
+#: src/delete-files/delete-files.cc:267
 msgid "Delete Selected Files"
 msgstr "删除选中的文件"
 
-#: src/delete-files/delete-files.cc:181
+#: src/delete-files/delete-files.cc:287
 msgid "Delete Method"
 msgstr "删除方式"
 
-#: src/delete-files/delete-files.cc:182
+#: src/delete-files/delete-files.cc:288
 msgid "Move to trash instead of deleting immediately"
 msgstr "移动到垃圾箱而不是直接删除"
 
@@ -1208,13 +1087,13 @@
 msgid "Echo"
 msgstr "回响"
 
-#: src/echo_plugin/echo.cc:22 src/modplug/plugin_main.cc:73
-#: src/modplug/plugin_main.cc:83
+#: src/echo_plugin/echo.cc:22 src/modplug/plugin_main.cc:72
+#: src/modplug/plugin_main.cc:82
 msgid "Delay:"
 msgstr "延迟："
 
-#: src/echo_plugin/echo.cc:24 src/modplug/plugin_main.cc:73
-#: src/modplug/plugin_main.cc:83
+#: src/echo_plugin/echo.cc:24 src/modplug/plugin_main.cc:72
+#: src/modplug/plugin_main.cc:82 src/xsf/plugin.cc:445
 msgid "ms"
 msgstr "毫秒"
 
@@ -1222,7 +1101,7 @@
 msgid "Feedback:"
 msgstr "反馈："
 
-#: src/echo_plugin/echo.cc:28 src/modplug/plugin_main.cc:87
+#: src/echo_plugin/echo.cc:28 src/modplug/plugin_main.cc:86
 msgid "Volume:"
 msgstr "音量："
 
@@ -1230,11 +1109,11 @@
 msgid "Echo"
 msgstr "回响"
 
-#: src/ffaudio/ffaudio-core.cc:41
+#: src/ffaudio/ffaudio-core.cc:50
 msgid "FFmpeg Plugin"
 msgstr "FFmpeg 插件"
 
-#: src/ffaudio/ffaudio-core.cc:571
+#: src/ffaudio/ffaudio-core.cc:649
 msgid ""
 "Multi-format audio decoding plugin for Audacious using\n"
 "FFmpeg multimedia framework (http://www.ffmpeg.org/)\n"
@@ -1251,249 +1130,317 @@
 "Matti Hämäläinen <ccr@tnsp.org>\n"
 "编写"
 
-#: src/filewriter/filewriter.cc:45
+#: src/filewriter/filewriter.cc:48
 msgid "FileWriter Plugin"
 msgstr "FileWriter 插件"
 
-#: src/filewriter/filewriter.cc:386
+#: src/filewriter/filewriter.cc:316
+#, c-format
+msgid ""
+"Error opening %s:\n"
+"%s"
+msgstr ""
+"打开 %s 时错误：\n"
+"%s"
+
+#: src/filewriter/filewriter.cc:358
+msgid ""
+"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 ""
+"此软件是自由软件，您可以在遵守 GNU 通用公用许可的情况下自由分发/编辑此软件，"
+"使用此许可的版本二或者之后的版本等。\n"
+"\n"
+"此程序旨在成为一个有意义的软件，但是没有任何保证。甚至没有可销性或者指定用途"
+"的的说明。详细信息请查看 GNU 通用公用许可。\n"
+"\n"
+"您应该会随软件受到一份 GNU 通用公用许可，如果没有收到，请致信自由软件基金会"
+"（Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, "
+"MA 02110-1301, USA）。"
+
+#: src/filewriter/filewriter.cc:385
 msgid "Output file format:"
 msgstr "输出文件格式："
 
-#: src/filewriter/filewriter.cc:403
-msgid "Configure"
-msgstr "设置"
-
-#: src/filewriter/filewriter.cc:413
+#: src/filewriter/filewriter.cc:389
 msgid "Save into original directory"
 msgstr "保存到原来的目录"
 
-#: src/filewriter/filewriter.cc:417
-msgid "Save into custom directory"
-msgstr "保存到自定义目录"
-
-#: src/filewriter/filewriter.cc:427
-msgid "Output file folder:"
-msgstr "输出文件目录："
+#: src/filewriter/filewriter.cc:392
+msgid "Save into custom directory:"
+msgstr "保存到自定义目录："
 
-#: src/filewriter/filewriter.cc:431
-msgid "Pick a folder"
-msgstr "选择目录"
-
-#: src/filewriter/filewriter.cc:444
+#: src/filewriter/filewriter.cc:400
 msgid "Generate file name from:"
 msgstr "文件名生成来源："
 
-#: src/filewriter/filewriter.cc:448
-msgid "Original file tag"
-msgstr "原始文件标签"
-
-#: src/filewriter/filewriter.cc:453
+#: src/filewriter/filewriter.cc:401
 msgid "Original file name"
 msgstr "原始文件名"
 
-#: src/filewriter/filewriter.cc:459
-msgid "Include original file name extension"
-msgstr "包含原始文件的扩展名"
+#: src/filewriter/filewriter.cc:404
+msgid "Original file name (no suffix)"
+msgstr "原始文件名(无后缀)"
+
+#: src/filewriter/filewriter.cc:407
+msgid "Original file tag"
+msgstr "原始文件标签"
 
-#: src/filewriter/filewriter.cc:468
+#: src/filewriter/filewriter.cc:411
 msgid "Prepend track number to file name"
 msgstr "文件名前加上音轨号"
 
-#: src/filewriter/filewriter.cc:484
-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/mp3.cc:40 src/filewriter/mp3.cc:717
+#: src/filewriter/filewriter.cc:417 src/filewriter/filewriter.cc:449
 msgid "Auto"
 msgstr "自动"
 
-#: src/filewriter/mp3.cc:40
+#: src/filewriter/filewriter.cc:418
+msgid "8000 Hz"
+msgstr "8000 Hz"
+
+#: src/filewriter/filewriter.cc:419
+msgid "11025 Hz"
+msgstr "11025 Hz"
+
+#: src/filewriter/filewriter.cc:420
+msgid "12000 Hz"
+msgstr "12000 Hz"
+
+#: src/filewriter/filewriter.cc:421
+msgid "16000 Hz"
+msgstr "16000 Hz"
+
+#: src/filewriter/filewriter.cc:422
+msgid "22050 Hz"
+msgstr "22050 Hz"
+
+#: src/filewriter/filewriter.cc:423
+msgid "24000 Hz"
+msgstr "24000 Hz"
+
+#: src/filewriter/filewriter.cc:424
+msgid "32000 Hz"
+msgstr "32000 Hz"
+
+#: src/filewriter/filewriter.cc:425 src/xsf/plugin.cc:430
+msgid "44100 Hz"
+msgstr "44100 Hz"
+
+#: src/filewriter/filewriter.cc:426 src/xsf/plugin.cc:431
+msgid "48000 Hz"
+msgstr "48000 Hz"
+
+#: src/filewriter/filewriter.cc:430
+msgid "8 kbit/s"
+msgstr "8 千比特/秒"
+
+#: src/filewriter/filewriter.cc:431
+msgid "16 kbit/s"
+msgstr "16 千比特/秒"
+
+#: src/filewriter/filewriter.cc:432
+msgid "32 kbit/s"
+msgstr "32 千比特/秒"
+
+#: src/filewriter/filewriter.cc:433
+msgid "40 kbit/s"
+msgstr "40 千比特/秒"
+
+#: src/filewriter/filewriter.cc:434
+msgid "48 kbit/s"
+msgstr "48 千比特/秒"
+
+#: src/filewriter/filewriter.cc:435
+msgid "56 kbit/s"
+msgstr "56 千比特/秒"
+
+#: src/filewriter/filewriter.cc:436
+msgid "64 kbit/s"
+msgstr "64 千比特/秒"
+
+#: src/filewriter/filewriter.cc:437
+msgid "80 kbit/s"
+msgstr "80 千比特/秒"
+
+#: src/filewriter/filewriter.cc:438
+msgid "96 kbit/s"
+msgstr "96 千比特/秒"
+
+#: src/filewriter/filewriter.cc:439
+msgid "112 kbit/s"
+msgstr "112 千比特/秒"
+
+#: src/filewriter/filewriter.cc:440
+msgid "128 kbit/s"
+msgstr "128 千比特/秒"
+
+#: src/filewriter/filewriter.cc:441
+msgid "160 kbit/s"
+msgstr "160 千比特/秒"
+
+#: src/filewriter/filewriter.cc:442
+msgid "192 kbit/s"
+msgstr "192 千比特/秒"
+
+#: src/filewriter/filewriter.cc:443
+msgid "224 kbit/s"
+msgstr "224 千比特/秒"
+
+#: src/filewriter/filewriter.cc:444
+msgid "256 kbit/s"
+msgstr "256 千比特/秒"
+
+#: src/filewriter/filewriter.cc:445
+msgid "320 kbit/s"
+msgstr "320 千比特/秒"
+
+#: src/filewriter/filewriter.cc:450
 msgid "Joint Stereo"
 msgstr "联合立体声"
 
-#: src/filewriter/mp3.cc:41 src/modplug/plugin_main.cc:58
-#: src/mpg123/mpg123.cc:248
+#: src/filewriter/filewriter.cc:451 src/modplug/plugin_main.cc:57
+#: src/mpg123/mpg123.cc:259
 msgid "Stereo"
 msgstr "立体声"
 
-#: src/filewriter/mp3.cc:41 src/modplug/plugin_main.cc:57
-#: src/mpg123/mpg123.cc:248
+#: src/filewriter/filewriter.cc:452 src/modplug/plugin_main.cc:56
+#: src/mpg123/mpg123.cc:260
 msgid "Mono"
 msgstr "单声道"
 
-#: src/filewriter/mp3.cc:657
-msgid "MP3 Configuration"
-msgstr "MP3设置"
-
-#: src/filewriter/mp3.cc:658
-msgid "_OK"
-msgstr "好的 (_O)"
-
-#: src/filewriter/mp3.cc:681
-msgid "Algorithm Quality:"
-msgstr "音质"
-
-#: src/filewriter/mp3.cc:706
-msgid "Output Sample Rate:"
-msgstr "输出取样："
-
-#: src/filewriter/mp3.cc:733
-msgid "(Hz)"
-msgstr "（赫兹）"
-
-#: src/filewriter/mp3.cc:740
-msgid "Bitrate / Compression Ratio:"
-msgstr "码率/压缩率："
-
-#: src/filewriter/mp3.cc:764
-msgid "Bitrate (kbps):"
-msgstr "码率(kbps)："
+#: src/filewriter/filewriter.cc:456
+msgid "VBR"
+msgstr "VBR"
+
+#: src/filewriter/filewriter.cc:457
+msgid "ABR"
+msgstr "ABR"
+
+#: src/filewriter/filewriter.cc:478
+msgid "Algorithm quality:"
+msgstr "算法质量："
 
-#: src/filewriter/mp3.cc:796
+#: src/filewriter/filewriter.cc:484
+msgid "Bitrate:"
+msgstr "比特率："
+
+#: src/filewriter/filewriter.cc:491
 msgid "Compression ratio:"
 msgstr "压缩率："
 
-#: src/filewriter/mp3.cc:820
-msgid "Audio Mode:"
+#: src/filewriter/filewriter.cc:498
+msgid "Audio mode:"
 msgstr "音频模式："
 
-#: src/filewriter/mp3.cc:845
-msgid "Miscellaneous:"
-msgstr "杂项："
-
-#: src/filewriter/mp3.cc:856
+#: src/filewriter/filewriter.cc:501
 msgid "Enforce strict ISO compliance"
 msgstr "强制严格遵从ISO"
 
-#: src/filewriter/mp3.cc:867
+#: src/filewriter/filewriter.cc:503
 msgid "Error protection"
 msgstr "错误保护"
 
-#: src/filewriter/mp3.cc:879 src/filewriter/vorbis.cc:206
-msgid "Quality"
-msgstr "质量"
-
-#: src/filewriter/mp3.cc:888
+#: src/filewriter/filewriter.cc:508
 msgid "Enable VBR/ABR"
 msgstr "启用VBR/ABR"
 
-#: src/filewriter/mp3.cc:898
+#: src/filewriter/filewriter.cc:510
 msgid "Type:"
 msgstr "类型："
 
-#: src/filewriter/mp3.cc:931
-msgid "VBR Options:"
-msgstr "VBR选项："
-
-#: src/filewriter/mp3.cc:947
-msgid "Minimum bitrate (kbps):"
-msgstr "最小码率(kbps)："
-
-#: src/filewriter/mp3.cc:973
-msgid "Maximum bitrate (kbps):"
-msgstr "最大码率(kbps)："
+#: src/filewriter/filewriter.cc:514
+msgid "Minimum bitrate:"
+msgstr "最低比特率："
+
+#: src/filewriter/filewriter.cc:518
+msgid "Maximum bitrate:"
+msgstr "最高比特率："
+
+#: src/filewriter/filewriter.cc:522
+msgid "Average bitrate:"
+msgstr "平均比特率："
 
-#: src/filewriter/mp3.cc:995
-msgid "Strictly enforce minimum bitrate"
-msgstr "严格执行最小码率"
-
-#: src/filewriter/mp3.cc:1007
-msgid "ABR Options:"
-msgstr "ABR选项："
-
-#: src/filewriter/mp3.cc:1017
-msgid "Average bitrate (kbps):"
-msgstr "平均码率(kbps)："
-
-#: src/filewriter/mp3.cc:1044
+#: src/filewriter/filewriter.cc:526
 msgid "VBR quality level:"
 msgstr "VBR质量等级："
 
-#: src/filewriter/mp3.cc:1063
+#: src/filewriter/filewriter.cc:530
+msgid "Strictly enforce minimum bitrate"
+msgstr "严格执行最小码率"
+
+#: src/filewriter/filewriter.cc:533
 msgid "Omit Xing VBR header"
 msgstr "忽略Xing VBR头"
 
-#: src/filewriter/mp3.cc:1076
-msgid "VBR/ABR"
-msgstr "VBR/ABR"
+#: src/filewriter/filewriter.cc:539
+msgid "Frame Headers"
+msgstr "边框头"
 
-#: src/filewriter/mp3.cc:1085
-msgid "Frame Parameters:"
-msgstr "帧参数："
-
-#: src/filewriter/mp3.cc:1097
+#: src/filewriter/filewriter.cc:540
 msgid "Mark as copyright"
 msgstr "标记为版权"
 
-#: src/filewriter/mp3.cc:1108
+#: src/filewriter/filewriter.cc:542
 msgid "Mark as original"
 msgstr "标记为原始文件"
 
-#: src/filewriter/mp3.cc:1120
-msgid "ID3 Parameters:"
-msgstr "ID3参数："
+#: src/filewriter/filewriter.cc:544
+msgid "ID3 Tags"
+msgstr "ID3 标签"
 
-#: src/filewriter/mp3.cc:1131
+#: src/filewriter/filewriter.cc:545
 msgid "Force addition of version 2 tag"
 msgstr "强制添加V2标签"
 
-#: src/filewriter/mp3.cc:1141
+#: src/filewriter/filewriter.cc:547
 msgid "Only add v1 tag"
 msgstr "仅添加v1标签"
 
-#: src/filewriter/mp3.cc:1148
+#: src/filewriter/filewriter.cc:549
 msgid "Only add v2 tag"
 msgstr "仅添加v2标签"
 
-#: src/filewriter/mp3.cc:1169
+#: src/filewriter/filewriter.cc:554
+msgid "Quality"
+msgstr "质量"
+
+#: src/filewriter/filewriter.cc:555
+msgid "VBR/ABR"
+msgstr "VBR/ABR"
+
+#: src/filewriter/filewriter.cc:556
 msgid "Tags"
 msgstr "标签"
 
-#: src/filewriter/vorbis.cc:196
-msgid "Vorbis Encoder Configuration"
-msgstr "Vorbis编码器设置"
-
-#: src/filewriter/vorbis.cc:219
-msgid "Quality level (0 - 10):"
-msgstr "质量等级(0-10)："
+#: src/filewriter/filewriter.cc:566
+msgid "Quality (0-1):"
+msgstr "质量（0-1）："
+
+#: src/filewriter/filewriter.cc:573 src/skins-qt/skins_cfg.cc:307
+#: src/skins/skins_cfg.cc:289
+msgid "General"
+msgstr "常规"
 
-#: src/flacng/flacng.h:35
+#: src/flac/flacng.h:36
 msgid "FLAC Decoder"
 msgstr "FLAC 解码器"
 
-#: src/flacng/metadata.cc:351 src/wavpack/wavpack.cc:209
+#: src/flac/metadata.cc:296 src/wavpack/wavpack.cc:215
 msgid "lossless"
 msgstr "无损的"
 
-#: src/flacng/plugin.cc:169
+#: src/flac/plugin.cc:214
 msgid ""
 "Original code by\n"
 "Ralf Ertzinger <ralf@skytale.net>\n"
@@ -1517,15 +1464,15 @@
 msgid "GIO Plugin"
 msgstr "GIO 插件"
 
-#: src/gio/gio.cc:153
+#: src/gio/gio.cc:152
 msgid "Read-and-append mode not supported"
 msgstr "读取-追加模式不受支持"
 
-#: src/gio/gio.cc:166
+#: src/gio/gio.cc:165
 msgid "Invalid open mode"
 msgstr "打开模式不可用"
 
-#: src/gl-spectrum/gl-spectrum.cc:51
+#: src/glspectrum/gl-spectrum.cc:52
 msgid ""
 "OpenGL Spectrum Analyzer for Audacious\n"
 "Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
@@ -1545,729 +1492,882 @@
 "\n"
 "许可: GPLv2+"
 
-#: src/gl-spectrum/gl-spectrum.cc:62
+#: src/glspectrum/gl-spectrum.cc:63 src/qtglspectrum/gl-spectrum.cc:53
 msgid "OpenGL Spectrum Analyzer"
 msgstr "OpenGL 频谱分析器"
 
-#: src/gl-spectrum-qt/gl-spectrum.cc:41
-msgid ""
-"OpenGL Spectrum Analyzer for Audacious\n"
-"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
-"Copyright 2014 William Pitcock\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"
-"Christophe Budé, John Lindgren, Carlo Bramini. 2013 版权所有\n"
-"William Pitcock. 2014 版权所有\n"
-"\n"
-"基于 XMMS 插件：\n"
-"Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson，4Front Technologies. "
-"1998-2000 版权所有\n"
-"\n"
-"许可: GPLv2+"
-
-#: src/gl-spectrum-qt/gl-spectrum.cc:53
-msgid "OpenGL Spectrum Analyzer (Qt)"
-msgstr "OpenGL 频谱分析器(Qt)"
-
-#: src/gnomeshortcuts/gnomeshortcuts.cc:38
-msgid "GNOME Shortcuts"
-msgstr "GNOME 快捷键"
-
-#: src/gnomeshortcuts/gnomeshortcuts.cc:54
-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"
-"Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>"
-
-#: src/gtkui/columns.cc:35
-msgid "Entry number"
-msgstr "序号"
-
-#: src/gtkui/columns.cc:36 src/playlist-manager/playlist-manager.cc:225
-#: src/qtui/playlist_model.cc:123
+#: src/gtkui/columns.cc:36 src/moonstone/playlist_model.cc:38
+#: src/qtui/playlist_model.cc:33
+msgid "Entry Number"
+msgstr "条目编号"
+
+#: src/gtkui/columns.cc:37 src/moonstone/playlist_model.cc:38
+#: src/moonstone/playlist_selection.cc:64
+#: src/playlist-manager/playlist-manager.cc:200
+#: src/playlist-manager-qt/playlist-manager-qt.cc:188
+#: src/qtui/playlist_model.cc:33 src/streamtuner/icecast-model.cc:120
+#: src/streamtuner/ihr-model.cc:159 src/streamtuner/shoutcast-model.cc:122
 msgid "Title"
 msgstr "标题"
 
-#: src/gtkui/columns.cc:37 src/qtui/playlist_model.cc:125
+#: src/gtkui/columns.cc:38 src/moonstone/playlist_model.cc:39
+#: src/qtui/playlist_model.cc:33
 msgid "Artist"
 msgstr "艺术家"
 
-#: src/gtkui/columns.cc:38
+#: src/gtkui/columns.cc:39 src/moonstone/playlist_model.cc:39
+#: src/qtui/playlist_model.cc:33
 msgid "Year"
 msgstr "年份"
 
-#: src/gtkui/columns.cc:39 src/qtui/playlist_model.cc:127
+#: src/gtkui/columns.cc:40 src/moonstone/playlist_model.cc:39
+#: src/qtui/playlist_model.cc:34
 msgid "Album"
 msgstr "专辑"
 
-#: src/gtkui/columns.cc:40
-msgid "Album artist"
+#: src/gtkui/columns.cc:41 src/moonstone/playlist_model.cc:40
+#: src/qtui/playlist_model.cc:34
+msgid "Album Artist"
 msgstr "专辑艺术家"
 
-#: src/gtkui/columns.cc:41
+#: src/gtkui/columns.cc:42 src/moonstone/playlist_model.cc:40
+#: src/qtui/playlist_model.cc:34
 msgid "Track"
 msgstr "音轨"
 
-#: src/gtkui/columns.cc:42
+#: src/gtkui/columns.cc:43 src/moonstone/playlist_model.cc:40
+#: src/qtui/playlist_model.cc:34 src/streamtuner/icecast-model.cc:123
+#: src/streamtuner/shoutcast-model.cc:125
+#: src/streamtuner/shoutcast-model.cc:236
 msgid "Genre"
 msgstr "流派"
 
-#: src/gtkui/columns.cc:43
-msgid "Queue position"
+#: src/gtkui/columns.cc:44 src/moonstone/playlist_model.cc:41
+#: src/qtui/playlist_model.cc:35
+msgid "Queue Position"
 msgstr "队列位置"
 
-#: src/gtkui/columns.cc:44
+#: src/gtkui/columns.cc:45 src/moonstone/playlist_model.cc:41
+#: src/qtui/playlist_model.cc:35
 msgid "Length"
 msgstr "长度"
 
-#: src/gtkui/columns.cc:45
-msgid "File path"
+#: src/gtkui/columns.cc:46 src/moonstone/playlist_model.cc:41
+#: src/qtui/playlist_model.cc:35
+msgid "File Path"
 msgstr "文件路径"
 
-#: src/gtkui/columns.cc:47
-msgid "Custom title"
-msgstr "自定标题"
+#: src/gtkui/columns.cc:47 src/moonstone/playlist_model.cc:42
+#: src/qtui/playlist_model.cc:35
+msgid "File Name"
+msgstr "文件名"
 
-#: src/gtkui/columns.cc:48
+#: src/gtkui/columns.cc:48 src/moonstone/playlist_model.cc:42
+#: src/qtui/playlist_model.cc:36
+msgid "Custom Title"
+msgstr "自定义标题"
+
+#: src/gtkui/columns.cc:49 src/moonstone/playlist_model.cc:42
+#: src/qtui/playlist_model.cc:36 src/streamtuner/icecast-model.cc:129
+#: src/streamtuner/shoutcast-model.cc:134
 msgid "Bitrate"
 msgstr "比率"
 
-#: src/gtkui/columns.cc:308
+#: src/gtkui/columns.cc:50 src/moonstone/playlist_model.cc:43
+#: src/qtui/playlist_model.cc:36
+msgid "Comment"
+msgstr "备注"
+
+#: src/gtkui/columns.cc:51 src/qtui/playlist_model.cc:36
+msgid "Publisher"
+msgstr "出版商"
+
+#: src/gtkui/columns.cc:52 src/qtui/playlist_model.cc:37
+msgid "Catalog Number"
+msgstr "目录编号"
+
+#: src/gtkui/columns.cc:53 src/moonstone/playlist_model.cc:43
+#: src/qtui/playlist_model.cc:37
+msgid "Disc"
+msgstr "唱片"
+
+#: src/gtkui/columns.cc:325
 msgid "Available columns"
 msgstr "可用列"
 
-#: src/gtkui/columns.cc:334
+#: src/gtkui/columns.cc:351
 msgid "Displayed columns"
 msgstr "显示列"
 
-#: src/gtkui/layout.cc:72 src/search-tool/search-tool.cc:40
+#: src/gtkui/layout.cc:74 src/search-tool-qt/search-tool-qt.cc:58
+#: src/search-tool/search-tool.cc:49
 msgid "Search Tool"
 msgstr "搜索工具"
 
-#: src/gtkui/layout.cc:167
+#: src/gtkui/layout.cc:170
 msgid "Dock at Left"
 msgstr "面板在左"
 
-#: src/gtkui/layout.cc:167
+#: src/gtkui/layout.cc:170
 msgid "Dock at Right"
 msgstr "面板在右"
 
-#: src/gtkui/layout.cc:168
+#: src/gtkui/layout.cc:171
 msgid "Dock at Top"
 msgstr "面板在上"
 
-#: src/gtkui/layout.cc:168
+#: src/gtkui/layout.cc:171
 msgid "Dock at Bottom"
 msgstr "面板在下"
 
-#: src/gtkui/layout.cc:168
+#: src/gtkui/layout.cc:171
 msgid "Undock"
 msgstr "无面板"
 
-#: src/gtkui/layout.cc:168 src/ladspa/plugin.cc:531
+#: src/gtkui/layout.cc:171 src/ladspa/plugin.cc:540
 msgid "Disable"
 msgstr "禁用"
 
-#: src/gtkui/menus.cc:126 src/qtui/main_window_actions.cc:93
-#: src/statusicon/statusicon.cc:276
+#: src/gtkui/menus.cc:79 src/qtui/menus.cc:107
+#: src/statusicon-qt/statusicon.cc:115 src/statusicon/statusicon.cc:286
 msgid "_Open Files ..."
 msgstr "打开文件...(_O)"
 
-#: src/gtkui/menus.cc:127
+#: src/gtkui/menus.cc:80 src/qtui/menus.cc:111
 msgid "Open _URL ..."
 msgstr "打开URL...(_U)"
 
-#: src/gtkui/menus.cc:128 src/qtui/main_window_actions.cc:95
+#: src/gtkui/menus.cc:81 src/qtui/menus.cc:113
 msgid "_Add Files ..."
 msgstr "添加文件(_A)"
 
-#: src/gtkui/menus.cc:129
+#: src/gtkui/menus.cc:82 src/qtui/menus.cc:118
 msgid "Add U_RL ..."
 msgstr "添加URL...(_R)"
 
-#: src/gtkui/menus.cc:131
+#: src/gtkui/menus.cc:84 src/qtui/menus.cc:120
 msgid "Search _Library"
 msgstr "搜索库 (_L)"
 
-#: src/gtkui/menus.cc:133 src/qtui/main_window_actions.cc:98
+#: src/gtkui/menus.cc:86 src/qtui/menus.cc:123
 msgid "A_bout ..."
 msgstr "关于(_b)"
 
-#: src/gtkui/menus.cc:134 src/qtui/main_window_actions.cc:99
+#: src/gtkui/menus.cc:87 src/qtui/menus.cc:125
 msgid "_Settings ..."
 msgstr "设置 ... (_S)"
 
-#: src/gtkui/menus.cc:135 src/qtui/main_window_actions.cc:103
-#: src/statusicon/statusicon.cc:284
+#: src/gtkui/menus.cc:88 src/qtui/menus.cc:131
+#: src/statusicon-qt/statusicon.cc:117 src/statusicon/statusicon.cc:288
 msgid "_Quit"
 msgstr "退出(_Q)"
 
-#: src/gtkui/menus.cc:139 src/gtkui/menus.cc:262
-#: src/qtui/main_window_actions.cc:107 src/search-tool/search-tool.cc:641
-#: src/statusicon/statusicon.cc:278
+#: src/gtkui/menus.cc:92 src/gtkui/menus.cc:226
+#: src/moonstone/playlist_tabs.cc:306 src/qtui/menus.cc:135
+#: src/qtui/playlist_tabs.cc:331 src/search-tool-qt/search-tool-qt.cc:499
+#: src/search-tool/search-tool.cc:339 src/statusicon-qt/statusicon.cc:109
+#: src/statusicon/statusicon.cc:280
 msgid "_Play"
 msgstr "播放(_P)"
 
-#: src/gtkui/menus.cc:140 src/qtui/main_window_actions.cc:108
-#: src/statusicon/statusicon.cc:279
+#: src/gtkui/menus.cc:93 src/qtui/menus.cc:137
+#: src/statusicon-qt/statusicon.cc:110 src/statusicon/statusicon.cc:281
 msgid "Paus_e"
 msgstr "暂停(_e)"
 
-#: src/gtkui/menus.cc:141 src/qtui/main_window_actions.cc:109
-#: src/statusicon/statusicon.cc:280
+#: src/gtkui/menus.cc:94 src/qtui/menus.cc:139
+#: src/statusicon-qt/statusicon.cc:111 src/statusicon/statusicon.cc:282
 msgid "_Stop"
 msgstr "停止(_S)"
 
-#: src/gtkui/menus.cc:142 src/qtui/main_window_actions.cc:110
-#: src/statusicon/statusicon.cc:277
+#: src/gtkui/menus.cc:95 src/qtui/menus.cc:141
+#: src/statusicon-qt/statusicon.cc:112 src/statusicon/statusicon.cc:283
 msgid "Pre_vious"
 msgstr "上一首(_v)"
 
-#: src/gtkui/menus.cc:143 src/qtui/main_window_actions.cc:111
-#: src/statusicon/statusicon.cc:281
+#: src/gtkui/menus.cc:96 src/qtui/menus.cc:143
+#: src/statusicon-qt/statusicon.cc:113 src/statusicon/statusicon.cc:284
 msgid "_Next"
 msgstr "下一首(_N)"
 
-#: src/gtkui/menus.cc:145 src/qtui/main_window_actions.cc:113
+#: src/gtkui/menus.cc:97 src/qtui/menus.cc:145 src/skins/menus.cc:114
+#: src/skins-qt/menus.cc:105
+msgid "Previous Album"
+msgstr "上一张专辑"
+
+#: src/gtkui/menus.cc:98 src/qtui/menus.cc:146 src/skins/menus.cc:115
+#: src/skins-qt/menus.cc:106
+msgid "Next Album"
+msgstr "下一张专辑"
+
+#: src/gtkui/menus.cc:100 src/qtui/menus.cc:148
 msgid "_Repeat"
 msgstr "重复(_R)"
 
-#: src/gtkui/menus.cc:146 src/qtui/main_window_actions.cc:114
+#: src/gtkui/menus.cc:101 src/qtui/menus.cc:150
 msgid "S_huffle"
 msgstr "随机(_h)"
 
-#: src/gtkui/menus.cc:147 src/qtui/main_window_actions.cc:115
+#: src/gtkui/menus.cc:102 src/qtui/menus.cc:152
+msgid "Shuffle by Albu_m"
+msgstr "专辑随机(_m)"
+
+#: src/gtkui/menus.cc:103 src/qtui/menus.cc:155
 msgid "N_o Playlist Advance"
 msgstr "禁止自动播放下一首(_o)"
 
-#: src/gtkui/menus.cc:148 src/qtui/main_window_actions.cc:116
+#: src/gtkui/menus.cc:104 src/qtui/menus.cc:157
 msgid "Stop A_fter This Song"
 msgstr "在这首歌后停止"
 
-#: src/gtkui/menus.cc:150 src/gtkui/menus.cc:247
-#: src/qtui/main_window_actions.cc:118
+#: src/gtkui/menus.cc:106 src/gtkui/menus.cc:210 src/qtui/menus.cc:162
+#: src/qtui/menus.cc:294
 msgid "Song _Info ..."
 msgstr "歌曲信息...(_I)"
 
-#: src/gtkui/menus.cc:151
+#: src/gtkui/menus.cc:107
 msgid "Jump to _Time ..."
 msgstr "跳到时间...(_T)"
 
-#: src/gtkui/menus.cc:152
+#: src/gtkui/menus.cc:108
 msgid "_Jump to Song ..."
 msgstr "跳到歌曲...(_J)"
 
-#: src/gtkui/menus.cc:154
+#: src/gtkui/menus.cc:110 src/qtui/menus.cc:165
 msgid "Set Repeat Point _A"
 msgstr "设置重复点 _A"
 
-#: src/gtkui/menus.cc:155
+#: src/gtkui/menus.cc:111 src/qtui/menus.cc:167
 msgid "Set Repeat Point _B"
 msgstr "设置重复点 _B"
 
-#: src/gtkui/menus.cc:156
+#: src/gtkui/menus.cc:112 src/qtui/menus.cc:169
 msgid "_Clear Repeat Points"
 msgstr "清除重复点(_C)"
 
-#: src/gtkui/menus.cc:160 src/gtkui/menus.cc:167 src/gtkui/menus.cc:183
-#: src/qtui/main_window_actions.cc:122 src/qtui/main_window_actions.cc:129
-#: src/qtui/main_window_actions.cc:145
+#: src/gtkui/menus.cc:116 src/gtkui/menus.cc:123 src/gtkui/menus.cc:141
+#: src/qtui/menus.cc:173 src/qtui/menus.cc:180 src/qtui/menus.cc:198
 msgid "By _Title"
 msgstr "按标题(_T)"
 
-#: src/gtkui/menus.cc:161 src/qtui/main_window_actions.cc:123
+#: src/gtkui/menus.cc:117 src/qtui/menus.cc:174
 msgid "By _File Name"
 msgstr "按文件名(_F)"
 
-#: src/gtkui/menus.cc:162 src/qtui/main_window_actions.cc:124
+#: src/gtkui/menus.cc:118 src/qtui/menus.cc:175
 msgid "By File _Path"
 msgstr "按文件路径(_P)"
 
-#: src/gtkui/menus.cc:166 src/gtkui/menus.cc:182
-#: src/qtui/main_window_actions.cc:128 src/qtui/main_window_actions.cc:144
+#: src/gtkui/menus.cc:122 src/gtkui/menus.cc:140 src/qtui/menus.cc:179
+#: src/qtui/menus.cc:197
 msgid "By Track _Number"
 msgstr "按音轨序号(_N)"
 
-#: src/gtkui/menus.cc:168 src/gtkui/menus.cc:184
-#: src/qtui/main_window_actions.cc:130 src/qtui/main_window_actions.cc:146
+#: src/gtkui/menus.cc:124 src/gtkui/menus.cc:142 src/qtui/menus.cc:181
+#: src/qtui/menus.cc:199
 msgid "By _Artist"
 msgstr "按艺术家(_A)"
 
-#: src/gtkui/menus.cc:169 src/gtkui/menus.cc:185
-#: src/qtui/main_window_actions.cc:131 src/qtui/main_window_actions.cc:147
+#: src/gtkui/menus.cc:125 src/gtkui/menus.cc:143 src/qtui/menus.cc:182
+#: src/qtui/menus.cc:200
 msgid "By Al_bum"
 msgstr "按专辑(_b)"
 
-#: src/gtkui/menus.cc:170 src/gtkui/menus.cc:186
-#: src/qtui/main_window_actions.cc:132 src/qtui/main_window_actions.cc:148
+#: src/gtkui/menus.cc:126 src/gtkui/menus.cc:144 src/qtui/menus.cc:183
+#: src/qtui/menus.cc:201
 msgid "By Albu_m Artist"
 msgstr "按专辑艺术家(_m)"
 
-#: src/gtkui/menus.cc:171 src/gtkui/menus.cc:187
-#: src/qtui/main_window_actions.cc:133 src/qtui/main_window_actions.cc:149
+#: src/gtkui/menus.cc:127 src/gtkui/menus.cc:145 src/qtui/menus.cc:184
+#: src/qtui/menus.cc:202
 msgid "By Release _Date"
 msgstr "按发表日期(_D)"
 
-#: src/gtkui/menus.cc:172 src/gtkui/menus.cc:188
-#: src/qtui/main_window_actions.cc:134 src/qtui/main_window_actions.cc:150
+#: src/gtkui/menus.cc:128 src/gtkui/menus.cc:146 src/qtui/menus.cc:185
+#: src/qtui/menus.cc:203
 msgid "By _Genre"
 msgstr "按照类型 (_G)"
 
-#: src/gtkui/menus.cc:173 src/gtkui/menus.cc:189
-#: src/qtui/main_window_actions.cc:135 src/qtui/main_window_actions.cc:151
+#: src/gtkui/menus.cc:129 src/gtkui/menus.cc:147 src/qtui/menus.cc:186
+#: src/qtui/menus.cc:204
 msgid "By _Length"
 msgstr "按长度(_L)"
 
-#: src/gtkui/menus.cc:174 src/gtkui/menus.cc:190
-#: src/qtui/main_window_actions.cc:136 src/qtui/main_window_actions.cc:152
+#: src/gtkui/menus.cc:130 src/gtkui/menus.cc:148 src/qtui/menus.cc:187
+#: src/qtui/menus.cc:205
 msgid "By _File Path"
 msgstr "按文件路径(_F)"
 
-#: src/gtkui/menus.cc:175 src/gtkui/menus.cc:191
-#: src/qtui/main_window_actions.cc:137 src/qtui/main_window_actions.cc:153
+#: src/gtkui/menus.cc:131 src/gtkui/menus.cc:149 src/qtui/menus.cc:188
+#: src/qtui/menus.cc:206
 msgid "By _Custom Title"
 msgstr "按自定义标题(_C)"
 
-#: src/gtkui/menus.cc:177 src/gtkui/menus.cc:193
-#: src/qtui/main_window_actions.cc:139 src/qtui/main_window_actions.cc:155
+#: src/gtkui/menus.cc:132 src/gtkui/menus.cc:150 src/qtui/menus.cc:189
+#: src/qtui/menus.cc:207
+msgid "By C_omment"
+msgstr "根据评论(_O)"
+
+#: src/gtkui/menus.cc:133 src/gtkui/menus.cc:151 src/qtui/menus.cc:190
+#: src/qtui/menus.cc:208
+msgid "By D_isc Number"
+msgstr ""
+
+#: src/gtkui/menus.cc:135 src/gtkui/menus.cc:153 src/qtui/menus.cc:192
+#: src/qtui/menus.cc:210
 msgid "R_everse Order"
 msgstr "逆序(_e)"
 
-#: src/gtkui/menus.cc:178 src/gtkui/menus.cc:194
-#: src/qtui/main_window_actions.cc:140 src/qtui/main_window_actions.cc:156
+#: src/gtkui/menus.cc:136 src/gtkui/menus.cc:154 src/qtui/menus.cc:194
+#: src/qtui/menus.cc:212
 msgid "_Random Order"
 msgstr "随机(_R)"
 
-#: src/gtkui/menus.cc:198 src/qtui/main_window_actions.cc:160
+#: src/gtkui/menus.cc:158 src/qtui/menus.cc:216
 msgid "_Play/Resume"
 msgstr "播放/继续 (_P)"
 
-#: src/gtkui/menus.cc:199 src/gtkui/menus.cc:251
-#: src/qtui/main_window_actions.cc:161
+#: src/gtkui/menus.cc:159 src/qtui/menus.cc:218
 msgid "_Refresh"
 msgstr "刷新(_R)"
 
-#: src/gtkui/menus.cc:201 src/qtui/main_window_actions.cc:163
+#: src/gtkui/menus.cc:161 src/qtui/menus.cc:222
 msgid "_Sort"
 msgstr "排序(_S)"
 
-#: src/gtkui/menus.cc:202 src/qtui/main_window_actions.cc:164
+#: src/gtkui/menus.cc:162 src/qtui/menus.cc:223
 msgid "Sort Se_lected"
 msgstr "排序选中项(_l)"
 
-#: src/gtkui/menus.cc:203 src/qtui/main_window_actions.cc:165
+#: src/gtkui/menus.cc:163 src/qtui/menus.cc:225
 msgid "Remove _Duplicates"
 msgstr "删除重复(_D)"
 
-#: src/gtkui/menus.cc:204 src/qtui/main_window_actions.cc:166
+#: src/gtkui/menus.cc:164 src/qtui/menus.cc:226
 msgid "Remove _Unavailable Files"
 msgstr "移除无效文件(_U)"
 
-#: src/gtkui/menus.cc:206 src/playlist-manager/playlist-manager.cc:244
-#: src/qtui/main_window_actions.cc:168
+#: src/gtkui/menus.cc:166 src/playlist-manager/playlist-manager.cc:219
+#: src/playlist-manager-qt/playlist-manager-qt.cc:348 src/qtui/menus.cc:229
 msgid "_New"
 msgstr "新建(_N)"
 
-#: src/gtkui/menus.cc:207
+#: src/gtkui/menus.cc:167 src/qtui/menus.cc:230
 msgid "Ren_ame ..."
 msgstr "重命名(_a) ..."
 
-#: src/gtkui/menus.cc:208 src/gtkui/menus.cc:264
-#: src/qtui/main_window_actions.cc:170
+#: src/gtkui/menus.cc:168 src/gtkui/menus.cc:228
+#: src/moonstone/playlist_tabs.cc:311 src/qtui/menus.cc:231
+#: src/qtui/playlist_tabs.cc:336
 msgid "Remo_ve"
 msgstr "移除 (_v)"
 
-#: src/gtkui/menus.cc:210
+#: src/gtkui/menus.cc:170 src/qtui/menus.cc:233
 msgid "_Import ..."
 msgstr "导入...(_I)"
 
-#: src/gtkui/menus.cc:211
+#: src/gtkui/menus.cc:171 src/qtui/menus.cc:234
 msgid "_Export ..."
 msgstr "导出...(_E)"
 
-#: src/gtkui/menus.cc:213
+#: src/gtkui/menus.cc:173 src/qtui/menus.cc:237
 msgid "Playlist _Manager ..."
 msgstr "播放列表管理器（_M）..."
 
-#: src/gtkui/menus.cc:214 src/qtui/main_window_actions.cc:176
+#: src/gtkui/menus.cc:174 src/qtui/menus.cc:239
 msgid "_Queue Manager ..."
 msgstr "队列管理器(_Q)..."
 
-#: src/gtkui/menus.cc:218 src/qtui/main_window_actions.cc:180
+#: src/gtkui/menus.cc:178 src/qtui/menus.cc:243
 msgid "Volume _Up"
 msgstr "调高音量(_U)"
 
-#: src/gtkui/menus.cc:219 src/qtui/main_window_actions.cc:181
+#: src/gtkui/menus.cc:179 src/qtui/menus.cc:245
 msgid "Volume _Down"
 msgstr "调低音量(_D)"
 
-#: src/gtkui/menus.cc:221 src/qtui/main_window_actions.cc:183
-msgid "_Equalizer"
-msgstr "均衡器(_E)"
+#: src/gtkui/menus.cc:181 src/qtui/menus.cc:249
+msgid "_Equalizer ..."
+msgstr "均衡器... (_E)"
 
-#: src/gtkui/menus.cc:223 src/qtui/main_window_actions.cc:185
+#: src/gtkui/menus.cc:182 src/qtui/menus.cc:251
 msgid "E_ffects ..."
 msgstr "音效 ... (_E)"
 
-#: src/gtkui/menus.cc:227
+#: src/gtkui/menus.cc:184
+msgid "_Record Stream"
+msgstr "录制(_R)"
+
+#: src/gtkui/menus.cc:185
+msgid "Audio _Settings ..."
+msgstr "音频设置...(_S)"
+
+#: src/gtkui/menus.cc:189 src/qtui/menus.cc:260
 msgid "Show _Menu Bar"
 msgstr "显示菜单(_M)"
 
-#: src/gtkui/menus.cc:228
+#: src/gtkui/menus.cc:190 src/qtui/menus.cc:262
 msgid "Show I_nfo Bar"
 msgstr "显示信息区域(_n)"
 
-#: src/gtkui/menus.cc:229
+#: src/gtkui/menus.cc:191 src/qtui/menus.cc:264
+msgid "Show Info Bar _Album Art"
+msgstr "显示专辑封面信息栏(_A)"
+
+#: src/gtkui/menus.cc:192 src/qtui/menus.cc:266
 msgid "Show Info Bar Vis_ualization"
 msgstr "显示可视化信息栏（_U）"
 
-#: src/gtkui/menus.cc:230
+#: src/gtkui/menus.cc:193 src/qtui/menus.cc:268
 msgid "Show _Status Bar"
 msgstr "显示状态栏(_S)"
 
-#: src/gtkui/menus.cc:232
+#: src/gtkui/menus.cc:195 src/qtui/menus.cc:272
 msgid "Show _Remaining Time"
 msgstr "显示剩余时间(_R)"
 
-#: src/gtkui/menus.cc:234
+#: src/gtkui/menus.cc:197 src/qtui/menus.cc:276 src/skins/menus.cc:157
+#: src/skins-qt/menus.cc:152
 msgid "_Visualizations ..."
 msgstr "可视化 ... (_V)"
 
-#: src/gtkui/menus.cc:238 src/qtui/main_window_actions.cc:189
+#: src/gtkui/menus.cc:201 src/qtui/menus.cc:280
 msgid "_File"
 msgstr "文件(_F)"
 
-#: src/gtkui/menus.cc:239 src/qtui/main_window_actions.cc:190
+#: src/gtkui/menus.cc:202 src/qtui/menus.cc:281
 msgid "_Playback"
 msgstr "回放(_P)"
 
-#: src/gtkui/menus.cc:240 src/qtui/main_window_actions.cc:191
+#: src/gtkui/menus.cc:203 src/qtui/menus.cc:282
 msgid "P_laylist"
 msgstr "播放列表(_l)"
 
-#: src/gtkui/menus.cc:241 src/gtkui/menus.cc:258
-#: src/qtui/main_window_actions.cc:192
+#: src/gtkui/menus.cc:204 src/gtkui/menus.cc:222 src/qtui/menus.cc:283
+#: src/qtui/menus.cc:312
 msgid "_Services"
 msgstr "服务(_S)"
 
-#: src/gtkui/menus.cc:242 src/qtui/main_window_actions.cc:193
+#: src/gtkui/menus.cc:205 src/qtui/menus.cc:284
 msgid "_Output"
 msgstr "输出(_O)"
 
-#: src/gtkui/menus.cc:243
+#: src/gtkui/menus.cc:206 src/qtui/menus.cc:285
 msgid "_View"
 msgstr "外观(_V)"
 
-#: src/gtkui/menus.cc:248
+#: src/gtkui/menus.cc:211 src/qtui/menus.cc:296
 msgid "_Queue/Unqueue"
 msgstr "入队／出列(_Q)"
 
-#: src/gtkui/menus.cc:250
+#: src/gtkui/menus.cc:213 src/qtui/menus.cc:299
 msgid "_Open Containing Folder"
 msgstr "打开所属文件夹 (_O)"
 
-#: src/gtkui/menus.cc:253
+#: src/gtkui/menus.cc:214 src/qtui/menus.cc:301
+msgid "_Refresh Selected"
+msgstr "刷新选中项(_R)"
+
+#: src/gtkui/menus.cc:216 src/qtui/menus.cc:304
 msgid "Cu_t"
 msgstr "剪切(_t)"
 
-#: src/gtkui/menus.cc:254
+#: src/gtkui/menus.cc:217 src/qtui/menus.cc:305
 msgid "_Copy"
 msgstr "复制(_C)"
 
-#: src/gtkui/menus.cc:255
+#: src/gtkui/menus.cc:218 src/qtui/menus.cc:306
 msgid "_Paste"
 msgstr "粘贴(_P)"
 
-#: src/gtkui/menus.cc:256
+#: src/gtkui/menus.cc:219 src/qtui/menus.cc:307
+msgid "Paste at _End"
+msgstr "在末尾粘贴(_E)"
+
+#: src/gtkui/menus.cc:220 src/qtui/menus.cc:309
 msgid "Select _All"
 msgstr "选中全部(_A)"
 
-#: src/gtkui/menus.cc:263
+#: src/gtkui/menus.cc:227 src/moonstone/playlist_tabs.cc:309
+#: src/qtui/playlist_tabs.cc:334
 msgid "_Rename ..."
 msgstr "重命名...(_R)"
 
-#: src/gtkui/settings.cc:35
+#: src/gtkui/settings.cc:35 src/qtui/settings.cc:59
+msgid "Always"
+msgstr "总是"
+
+#: src/gtkui/settings.cc:36 src/qtui/settings.cc:60
+msgid "Auto-hide"
+msgstr "自动隐藏"
+
+#: src/gtkui/settings.cc:37 src/qtui/settings.cc:61
+msgid "Never"
+msgstr "从不"
+
+#: src/gtkui/settings.cc:41 src/qtui/settings.cc:64
 msgid "Playlist Tabs"
 msgstr "播放列表标签页"
 
-#: src/gtkui/settings.cc:36
-msgid "Always show tabs"
-msgstr "总是显示标签页"
+#: src/gtkui/settings.cc:42 src/qtui/settings.cc:65
+msgid "Show playlist tabs:"
+msgstr "显示播放列表标签页："
 
-#: src/gtkui/settings.cc:38
+#: src/gtkui/settings.cc:45 src/qtui/settings.cc:69
 msgid "Show entry counts"
 msgstr "显示条目数量"
 
-#: src/gtkui/settings.cc:40
+#: src/gtkui/settings.cc:47 src/qtui/settings.cc:72
 msgid "Show close buttons"
 msgstr "显示关闭按钮"
 
-#: src/gtkui/settings.cc:42
+#: src/gtkui/settings.cc:49 src/qtui/settings.cc:75
 msgid "Playlist Columns"
 msgstr "播放列表列"
 
-#: src/gtkui/settings.cc:44
+#: src/gtkui/settings.cc:51 src/qtui/settings.cc:77
 msgid "Show column headers"
 msgstr "显示列头"
 
-#: src/gtkui/settings.cc:46 src/modplug/plugin_main.cc:106
-#: src/skins/skins_cfg.cc:263
-msgid "Miscellaneous"
-msgstr "杂项"
+#: src/gtkui/settings.cc:53 src/qtui/settings.cc:82
+msgid "Make column headers clickable for sorting"
+msgstr ""
 
-#: src/gtkui/settings.cc:47
-msgid "Arrow keys seek by:"
-msgstr "箭头键排序:"
+#: src/gtkui/settings.cc:56
+msgid "Use symbolic icons in toolbar"
+msgstr ""
 
-#: src/gtkui/settings.cc:50
+#: src/gtkui/settings.cc:58 src/qtui/settings.cc:86
 msgid "Scroll on song change"
 msgstr "歌曲改变时滚动"
 
-#: src/gtkui/ui_gtk.cc:71
+#: src/gtkui/ui_gtk.cc:82
 msgid "GTK Interface"
 msgstr "GTK界面"
 
-#: src/gtkui/ui_gtk.cc:222 src/skins/ui_main.cc:232
+#: src/gtkui/ui_gtk.cc:219 src/skins/main.cc:228 src/skins-qt/main.cc:231
 #, c-format
 msgid "%s - Audacious"
 msgstr "%s - Audacious"
 
-#: src/gtkui/ui_gtk.cc:225 src/qtui/main_window.cc:186
+#: src/gtkui/ui_gtk.cc:221 src/moonstone/main_window.cc:184
+#: src/qtui/main_window.cc:385
 msgid "Buffering ..."
 msgstr "缓冲中..."
 
-#: src/gtkui/ui_gtk.cc:228 src/skins/ui_main.cc:234 src/skins/ui_main.cc:1164
+#: src/gtkui/ui_gtk.cc:224 src/pipewire/pipewire.cc:402 src/skins/main.cc:230
+#: src/skins-qt/main.cc:233
 msgid "Audacious"
 msgstr "Audacious"
 
-#: src/gtkui/ui_statusbar.cc:63 src/qtui/status_bar.cc:67
+#: src/gtkui/ui_gtk.cc:487 src/gtkui/ui_gtk.cc:518 src/gtkui/ui_gtk.cc:882
+#: src/hotkey/gui.cc:72 src/moonstone/main_window.cc:67
+#: src/moonstone/main_window.cc:145 src/moonstone/main_window.cc:146
+#: src/notify/osd.cc:85 src/qthotkey/gui.cc:67 src/qtui/main_window.cc:154
+#: src/qtui/main_window.cc:347 src/qtui/main_window.cc:348
+#: src/skins/menus.cc:109 src/skins-qt/menus.cc:100
+msgid "Play"
+msgstr "播放"
+
+#: src/gtkui/ui_gtk.cc:487 src/moonstone/main_window.cc:151
+#: src/moonstone/main_window.cc:152 src/notify/osd.cc:82
+#: src/qtui/main_window.cc:353 src/qtui/main_window.cc:354
+#: src/skins/menus.cc:110 src/skins-qt/menus.cc:101
+msgid "Pause"
+msgstr "暂停"
+
+#: src/gtkui/ui_gtk.cc:868 src/moonstone/main_window.cc:57
+#: src/qtui/main_window.cc:145 src/skins/menus.cc:86 src/skins-qt/menus.cc:77
+msgid "Search Library"
+msgstr "搜索库"
+
+#: src/gtkui/ui_gtk.cc:875 src/moonstone/main_window.cc:60
+#: src/qtui/main_window.cc:147
+msgid "Open Files"
+msgstr "打开文件"
+
+#: src/gtkui/ui_gtk.cc:876 src/moonstone/main_window.cc:62
+#: src/qtui/main_window.cc:149
+msgid "Add Files"
+msgstr "添加文件"
+
+#: src/gtkui/ui_gtk.cc:881 src/moonstone/main_window.cc:65
+#: src/qtui/main_window.cc:152 src/skins/menus.cc:112 src/skins-qt/menus.cc:103
+msgid "Previous"
+msgstr "上一首"
+
+#: src/gtkui/ui_gtk.cc:883 src/hotkey/gui.cc:74 src/moonstone/main_window.cc:69
+#: src/qthotkey/gui.cc:69 src/qtui/main_window.cc:156 src/skins/menus.cc:111
+#: src/skins-qt/menus.cc:102
+msgid "Stop"
+msgstr "停止"
+
+#: src/gtkui/ui_gtk.cc:884 src/moonstone/main_window.cc:76 src/notify/osd.cc:89
+#: src/qtui/main_window.cc:163 src/skins/menus.cc:113 src/skins-qt/menus.cc:104
+msgid "Next"
+msgstr "下一首"
+
+#: src/gtkui/ui_gtk.cc:886 src/moonstone/main_window.cc:79
+#: src/qtui/main_window.cc:166 src/qtui/menus.cc:254 src/skins/menus.cc:79
+#: src/skins-qt/menus.cc:69
+msgid "Record Stream"
+msgstr "录制"
+
+#: src/gtkui/ui_gtk.cc:919 src/moonstone/main_window.cc:86
+#: src/qtui/main_window.cc:173 src/skins/menus.cc:103 src/skins-qt/menus.cc:94
+msgid "Repeat"
+msgstr "重复"
+
+#: src/gtkui/ui_gtk.cc:922 src/moonstone/main_window.cc:89
+#: src/qtui/main_window.cc:176 src/skins/menus.cc:104 src/skins-qt/menus.cc:95
+msgid "Shuffle"
+msgstr "随机"
+
+#: src/gtkui/ui_gtk.cc:1114 src/qtui/main_window.cc:123
+msgid "Menu"
+msgstr "菜单"
+
+#: src/gtkui/ui_statusbar.cc:64 src/qtui/status_bar.cc:155
 msgid "mono"
 msgstr "单声道"
 
-#: src/gtkui/ui_statusbar.cc:65 src/qtui/status_bar.cc:69
+#: src/gtkui/ui_statusbar.cc:66 src/qtui/status_bar.cc:157
 msgid "stereo"
 msgstr "立体声"
 
-#: src/gtkui/ui_statusbar.cc:67 src/qtui/status_bar.cc:71
+#: src/gtkui/ui_statusbar.cc:68 src/qtui/status_bar.cc:160
 #, c-format
 msgid "%d channel"
 msgid_plural "%d channels"
 msgstr0 "%d声道"
 
-#: src/gtkui/ui_statusbar.cc:81 src/qtui/status_bar.cc:85
+#: src/gtkui/ui_statusbar.cc:76 src/qtui/status_bar.cc:168
 #, c-format
-msgid "%d kbps"
-msgstr "%d kbps"
+msgid "%d kHz"
+msgstr "%d kHz"
 
-#: src/gtkui/ui_statusbar.cc:107 src/skins/ui_main_evlisteners.cc:103
+#: src/gtkui/ui_statusbar.cc:82 src/qtui/status_bar.cc:174
+#, c-format
+msgid "%d kbit/s"
+msgstr "%d 千比特/秒"
+
+#: src/gtkui/ui_statusbar.cc:108 src/skins/main.cc:478 src/skins-qt/main.cc:461
 msgid "Single mode."
-msgstr "单一窗口模式"
+msgstr "单一窗口模式。"
 
-#: src/gtkui/ui_statusbar.cc:109 src/skins/ui_main_evlisteners.cc:105
+#: src/gtkui/ui_statusbar.cc:110 src/skins/main.cc:480 src/skins-qt/main.cc:463
 msgid "Playlist mode."
-msgstr "播放列表模式"
+msgstr "播放列表模式。"
 
-#: src/gtkui/ui_statusbar.cc:117 src/skins/ui_main_evlisteners.cc:111
+#: src/gtkui/ui_statusbar.cc:118 src/skins/main.cc:486 src/skins-qt/main.cc:469
 msgid "Stopping after song."
-msgstr "完成后停止"
+msgstr "完成后停止。"
 
-#: src/hotkey/gui.cc:71
+#: src/hotkey/gui.cc:71 src/qthotkey/gui.cc:66
 msgid "Previous track"
 msgstr "上一首"
 
-#: src/hotkey/gui.cc:72 src/notify/osd.cc:69 src/qtui/main_window.cc:69
-#: src/qtui/main_window.cc:172 src/qtui/main_window.cc:173
-#: src/skins/menus.cc:87
-msgid "Play"
-msgstr "播放"
-
-#: src/hotkey/gui.cc:73
+#: src/hotkey/gui.cc:73 src/qthotkey/gui.cc:68
 msgid "Pause/Resume"
 msgstr "暂停/继续"
 
-#: src/hotkey/gui.cc:74 src/qtui/main_window.cc:70 src/skins/menus.cc:89
-msgid "Stop"
-msgstr "停止"
-
-#: src/hotkey/gui.cc:75
+#: src/hotkey/gui.cc:75 src/qthotkey/gui.cc:70
 msgid "Next track"
 msgstr "下一首"
 
-#: src/hotkey/gui.cc:76
-msgid "Forward 5 seconds"
-msgstr "快进 5 秒"
-
-#: src/hotkey/gui.cc:77
-msgid "Rewind 5 seconds"
-msgstr "快退 5 秒"
+#: src/hotkey/gui.cc:76 src/qthotkey/gui.cc:71
+msgid "Step forward"
+msgstr "向前快进"
+
+#: src/hotkey/gui.cc:77 src/qthotkey/gui.cc:72
+msgid "Step backward"
+msgstr "向后倒带"
 
-#: src/hotkey/gui.cc:78
+#: src/hotkey/gui.cc:78 src/qthotkey/gui.cc:73
 msgid "Mute"
 msgstr "静音"
 
-#: src/hotkey/gui.cc:79
+#: src/hotkey/gui.cc:79 src/qthotkey/gui.cc:74
 msgid "Volume up"
 msgstr "提高音量"
 
-#: src/hotkey/gui.cc:80
+#: src/hotkey/gui.cc:80 src/qthotkey/gui.cc:75
 msgid "Volume down"
 msgstr "降低音量"
 
-#: src/hotkey/gui.cc:81
+#: src/hotkey/gui.cc:81 src/qthotkey/gui.cc:76
 msgid "Jump to file"
 msgstr "跳到文件"
 
-#: src/hotkey/gui.cc:82
+#: src/hotkey/gui.cc:82 src/qthotkey/gui.cc:77
 msgid "Toggle player window(s)"
 msgstr "播放窗口切换"
 
-#: src/hotkey/gui.cc:83
+#: src/hotkey/gui.cc:83 src/qthotkey/gui.cc:78
 msgid "Show On-Screen-Display"
 msgstr "显示On-Screen-Display"
 
-#: src/hotkey/gui.cc:84
+#: src/hotkey/gui.cc:84 src/qthotkey/gui.cc:79
 msgid "Toggle repeat"
 msgstr "打开重复"
 
-#: src/hotkey/gui.cc:85
+#: src/hotkey/gui.cc:85 src/qthotkey/gui.cc:80
 msgid "Toggle shuffle"
 msgstr "打开随机播放"
 
-#: src/hotkey/gui.cc:86
+#: src/hotkey/gui.cc:86 src/qthotkey/gui.cc:81
 msgid "Toggle stop after current"
 msgstr "打开当前曲目后停止"
 
-#: src/hotkey/gui.cc:87
+#: src/hotkey/gui.cc:87 src/qthotkey/gui.cc:82
 msgid "Raise player window(s)"
 msgstr "提出播放器窗口"
 
-#: src/hotkey/gui.cc:97
+#: src/hotkey/gui.cc:98 src/qthotkey/gui.cc:100
 msgid "(none)"
 msgstr "(无)"
 
-#: src/hotkey/gui.cc:234
+#: src/hotkey/gui.cc:261
 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 modifiers.\n"
 "\n"
 "Do you want to continue?"
-msgstr "并不建议绑定鼠标主键。要继续吗？"
+msgstr ""
+"不建议绑定没有修饰符的鼠标主键。\n"
+"\n"
+"要继续吗？"
 
-#: src/hotkey/gui.cc:236
+#: src/hotkey/gui.cc:264
 msgid "Binding mouse buttons"
 msgstr "绑定鼠标按键"
 
-#: src/hotkey/gui.cc:391
+#: src/hotkey/gui.cc:434
 msgid ""
 "Press a key combination inside a text field.\n"
 "You can also bind mouse buttons."
-msgstr "请在文本区按下要绑定的组合键，你亦可以绑定鼠标键"
+msgstr "请在文本区按下要绑定的组合键，你亦可以绑定鼠标键。"
 
-#: src/hotkey/gui.cc:396
+#: src/hotkey/gui.cc:444 src/qthotkey/gui.cc:179
 msgid "Hotkeys:"
 msgstr "热键："
 
-#: src/hotkey/gui.cc:413
+#: src/hotkey/gui.cc:457 src/qthotkey/gui.cc:181
 msgid "Action:"
 msgstr "动作："
 
-#: src/hotkey/gui.cc:420
+#: src/hotkey/gui.cc:461 src/qthotkey/gui.cc:182
 msgid "Key Binding:"
 msgstr "键位绑定："
 
-#: src/hotkey/gui.cc:468
+#: src/hotkey/gui.cc:518 src/qthotkey/gui.cc:184
 msgid "_Add"
 msgstr "添加 (_A)"
 
-#: src/hotkey/plugin.cc:61
+#: src/hotkey/plugin.cc:59 src/qthotkey/plugin.cc:78
 msgid "Global Hotkeys"
 msgstr "全局热键"
 
-#: src/hotkey/plugin.cc:79
+#: src/hotkey/plugin.cc:74
 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"
+"Contributors 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"
+"使用全局组合键或多媒体键控制播放器。\n"
 "\n"
 "Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n"
 "\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>"
+" Bryn Davies <curious@ihug.com.au>,\n"
+" Jonathan A. Davis <davis@jdhouse.org>,\n"
+" Jeremy Tan <nsx@nsx.homeip.net>"
 
-#: src/jack-ng/jack-ng.cc:49
+#: src/jack/jack-ng.cc:54
 msgid "JACK Output"
 msgstr "JACK 输出"
 
-#: src/jack-ng/jack-ng.cc:114
+#: src/jack/jack-ng.cc:126
+msgid "Client name:"
+msgstr "客户端名称："
+
+#: src/jack/jack-ng.cc:128
 msgid "Automatically connect to output ports"
 msgstr "自动连接到输出端口"
 
-#: src/jack-ng/jack-ng.cc:155
+#: src/jack/jack-ng.cc:130
+msgid "Filter ports (regex, use any port if blank):"
+msgstr "过滤端口 (正则表达式，如果为空则使用任意端口)："
+
+#: src/jack/jack-ng.cc:136
+msgid "Connect to physical ports only"
+msgstr "仅连接到物理端口"
+
+#: src/jack/jack-ng.cc:139
+msgid "Upmix to"
+msgstr "上混至"
+
+#: src/jack/jack-ng.cc:141
+msgid "ports if input has fewer channels"
+msgstr "如果输入通道较少，则端口"
+
+#: src/jack/jack-ng.cc:143
+msgid "Ignore insufficient number of ports"
+msgstr "忽略端口数量不足"
+
+#: src/jack/jack-ng.cc:181
+msgid "No JACK output ports were found. Please check settings."
+msgstr "找不到 JACK 输出端口。请检查设置。"
+
+#: src/jack/jack-ng.cc:195
 #, c-format
 msgid "Only %d JACK output ports were found but %d are required."
 msgstr "仅发现 %d 个 JACK 端口，但是需要 %d 个。"
 
-#: src/jack-ng/jack-ng.cc:164
+#: src/jack/jack-ng.cc:210
 #, c-format
 msgid "Failed to connect to JACK port %s."
 msgstr "连接到 JACK 端口 %s 失败。"
 
-#: src/jack-ng/jack-ng.cc:184
+#: src/jack/jack-ng.cc:230
 msgid ""
 "JACK supports only floating-point audio. You must change the output bit "
 "depth to floating-point in Audacious settings."
 msgstr "JACK 仅支持浮点音频。你必须在 Audacious 设置中将输出位深改为浮点。"
 
-#: src/jack-ng/jack-ng.cc:197
+#: src/jack/jack-ng.cc:245
 msgid "Failed to connect to the JACK server; is it running?"
 msgstr "连接到 JACK 服务器失败，服务是否在运行？"
 
-#: src/jack-ng/jack-ng.cc:273
+#: src/jack/jack-ng.cc:321
 #, c-format
 msgid ""
 "The JACK server requires a sample rate of %d Hz, but Audacious is playing at "
 "%d Hz. Please use the Sample Rate Converter effect to correct the mismatch."
 msgstr ""
 "JACK 服务要求采样率为 %d Hz，但是 Audacious 以 %d Hz 播放。请使用采样率转换特"
-"效插件纠正此错误"
+"效插件纠正此错误。"
 
-#: src/ladspa/plugin.cc:414
+#: src/ladspa/plugin.cc:416
 #, c-format
 msgid "%s Settings"
 msgstr "%s 设置"
 
-#: src/ladspa/plugin.cc:478
+#: src/ladspa/plugin.cc:482
 msgid "Module paths:"
 msgstr "模块路径："
 
-#: src/ladspa/plugin.cc:483
+#: src/ladspa/plugin.cc:487
 msgid ""
 "Separate multiple paths with a colon.\n"
 "These paths are searched in addition to LADSPA_PATH.\n"
@@ -2277,25 +2377,25 @@
 "这些路径将附加于 LADSPA_PATH 进行搜索。\n"
 "在添加这些新的路径后，按下 Enter 以扫描新插件。"
 
-#: src/ladspa/plugin.cc:499
+#: src/ladspa/plugin.cc:508
 msgid "Available plugins:"
 msgstr "可用插件："
 
-#: src/ladspa/plugin.cc:512 src/modplug/plugin_main.cc:92
-#: src/modplug/plugin_main.cc:95 src/modplug/plugin_main.cc:98
-#: src/modplug/plugin_main.cc:101
+#: src/ladspa/plugin.cc:521 src/modplug/plugin_main.cc:91
+#: src/modplug/plugin_main.cc:94 src/modplug/plugin_main.cc:97
+#: src/modplug/plugin_main.cc:100
 msgid "Enable"
 msgstr "启用"
 
-#: src/ladspa/plugin.cc:518
+#: src/ladspa/plugin.cc:527
 msgid "Enabled plugins:"
 msgstr "已启用插件："
 
-#: src/ladspa/plugin.cc:534
+#: src/ladspa/plugin.cc:543
 msgid "Settings"
 msgstr "设置"
 
-#: src/ladspa/plugin.cc:551
+#: src/ladspa/plugin.cc:560
 msgid ""
 "LADSPA Host for Audacious\n"
 "Copyright 2011 John Lindgren"
@@ -2311,7 +2411,7 @@
 msgid "LIRC Plugin"
 msgstr "LIRC 插件"
 
-#: src/lirc/lirc.cc:381
+#: src/lirc/lirc.cc:379
 msgid ""
 "A simple plugin to control Audacious using the LIRC remote control daemon\n"
 "\n"
@@ -2339,63 +2439,123 @@
 "\n"
 "欲获知更多关于 LIRC 的信息，请访问 http://lirc.org ."
 
-#: src/lirc/lirc.cc:392
+#: src/lirc/lirc.cc:390
 msgid "Connection"
 msgstr "连接"
 
-#: src/lirc/lirc.cc:393
+#: src/lirc/lirc.cc:391
 msgid "Reconnect to LIRC server"
 msgstr "重新连接 LIRC 服务器"
 
-#: src/lirc/lirc.cc:395
+#: src/lirc/lirc.cc:393
 msgid "Wait before reconnecting:"
 msgstr "重连前等待："
 
-#: src/lyricwiki/lyricwiki.cc:41
-msgid "LyricWiki Plugin"
-msgstr "LyricWiki 插件"
-
-#: src/lyricwiki/lyricwiki.cc:131 src/lyricwiki-qt/lyricwiki.cc:136
-msgid "No lyrics available"
-msgstr "没有相符歌词"
-
-#: src/lyricwiki/lyricwiki.cc:217 src/lyricwiki/lyricwiki.cc:226
-#: src/lyricwiki/lyricwiki.cc:243 src/lyricwiki/lyricwiki.cc:252
-#: src/lyricwiki/lyricwiki.cc:267 src/lyricwiki-qt/lyricwiki.cc:222
-#: src/lyricwiki-qt/lyricwiki.cc:231 src/lyricwiki-qt/lyricwiki.cc:248
-#: src/lyricwiki-qt/lyricwiki.cc:257 src/lyricwiki-qt/lyricwiki.cc:272
-msgid "Error"
-msgstr "错误"
-
-#: src/lyricwiki/lyricwiki.cc:218 src/lyricwiki/lyricwiki.cc:244
-#: src/lyricwiki-qt/lyricwiki.cc:223 src/lyricwiki-qt/lyricwiki.cc:249
+#: src/lyrics-common/chart_lyrics_provider.cc:93
+#: src/lyrics-common/chart_lyrics_provider.cc:150
+#: src/lyrics-common/lyrics_ovh_provider.cc:50
 #, c-format
 msgid "Unable to fetch %s"
 msgstr "无法取回 %s"
 
-#: src/lyricwiki/lyricwiki.cc:227 src/lyricwiki/lyricwiki.cc:253
-#: src/lyricwiki-qt/lyricwiki.cc:232 src/lyricwiki-qt/lyricwiki.cc:258
+#: src/lyrics-common/chart_lyrics_provider.cc:100
+#: src/lyrics-common/chart_lyrics_provider.cc:157
+#: src/lyrics-common/lyrics_ovh_provider.cc:57
 #, c-format
 msgid "Unable to parse %s"
 msgstr "无法解析 %s"
 
-#: src/lyricwiki/lyricwiki.cc:259 src/lyricwiki-qt/lyricwiki.cc:264
+#: src/lyrics-common/chart_lyrics_provider.cc:121
+#: src/lyrics-common/chart_lyrics_provider.cc:194
+#: src/lyrics-common/lyrics_ovh_provider.cc:88
 msgid "Looking for lyrics ..."
 msgstr "正在搜索歌词..."
 
-#: src/lyricwiki/lyricwiki.cc:267 src/lyricwiki-qt/lyricwiki.cc:272
-msgid "Missing song metadata"
-msgstr "缺少歌曲元信息"
-
-#: src/lyricwiki/lyricwiki.cc:278 src/lyricwiki-qt/lyricwiki.cc:283
-msgid "Connecting to lyrics.wikia.com ..."
-msgstr "正在连接到 lyrics.wikia.com ..."
-
-#: src/lyricwiki-qt/lyricwiki.cc:55
-msgid "LyricWiki Plugin (Qt)"
-msgstr "LyricWiki 插件(Qt)"
+#: src/lyrics-common/preferences.h:43
+msgid "Nowhere"
+msgstr "哪里都不"
+
+#: src/lyrics-common/preferences.h:49
+msgid "Artist is truncated at the start, Title -- at the end"
+msgstr "艺术家名称截断于开头处，标题 -- 于末尾处"
+
+#: src/lyrics-common/preferences.h:50
+msgid "Chars to truncate on:"
+msgstr "要截断的字符:"
+
+#: src/lyrics-common/preferences.h:54
+msgid "Chars are ORed in RegExp, surrounded by whitespace"
+msgstr "字符以正则表达式表达并进行或运算，由空白字符包围"
+
+#: src/lyrics-common/preferences.h:55
+msgid "Chars to split on:"
+msgstr "用以拆分的字符："
+
+#: src/lyrics-common/preferences.h:56
+msgid "Further truncate those on chars"
+msgstr "进一步用字符截断标题"
+
+#: src/lyrics-common/preferences.h:62
+msgid "General"
+msgstr "常规"
+
+#: src/lyrics-common/preferences.h:63
+msgid "Split title into artist and title on chars"
+msgstr "用字符将标题分割为艺术家名称和标题"
+
+#: src/lyrics-common/preferences.h:66
+msgid "Sources"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:67
+msgid "Use embedded lyrics (from Lyrics tag)"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:69
+msgid "Fetch lyrics from internet:"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:72
+msgid "Store fetched lyrics in local cache"
+msgstr "将获取的歌词存储在本地缓存中"
+
+#: src/lyrics-common/preferences.h:74
+msgid "Local Storage"
+msgstr "本地存储"
+
+#: src/lyrics-common/preferences.h:75
+msgid "Load lyric files (.lrc) from local storage"
+msgstr "从本地存储加载歌词文件 (.lrc)"
+
+#: src/lyrics-common/utils.cc:54 src/ui-common/dialogs-qt.cc:63
+msgid "Error"
+msgstr "错误"
+
+#: src/lyrics-common/utils.cc:60
+msgid "Lyrics could not be found."
+msgstr "找不到歌词。"
+
+#: src/lyrics-common/utils.cc:142
+msgid "Missing title and/or artist."
+msgstr "缺少标题和/或艺术家。"
+
+#: src/lyrics-gtk/lyrics-gtk.cc:37 src/lyrics-qt/lyrics-qt.cc:50
+msgid "Lyrics"
+msgstr "歌词"
+
+#: src/lyrics-gtk/lyrics-gtk.cc:189 src/lyrics-qt/lyrics-qt.cc:171
+msgid "Edit Lyrics ..."
+msgstr "编辑歌词 ..."
+
+#: src/lyrics-gtk/lyrics-gtk.cc:195 src/lyrics-qt/lyrics-qt.cc:178
+msgid "Save Locally"
+msgstr "本地保存"
+
+#: src/lyrics-gtk/lyrics-gtk.cc:201 src/lyrics-qt/lyrics-qt.cc:186
+msgid "Refresh"
+msgstr "刷新"
 
-#: src/m3u/m3u.cc:32
+#: src/m3u/m3u.cc:33
 msgid "M3U Playlists"
 msgstr "M3U 播放列表"
 
@@ -2403,17 +2563,17 @@
 msgid "Tact Generator"
 msgstr "Tact 生成器"
 
-#: src/metronom/metronom.cc:147
+#: src/metronom/metronom.cc:145
 #, c-format
 msgid "Tact generator: %d bpm"
 msgstr "节拍生成器: 每分钟节拍为 %d"
 
-#: src/metronom/metronom.cc:149
+#: src/metronom/metronom.cc:147
 #, c-format
 msgid "Tact generator: %d bpm %d/%d"
 msgstr "节拍生成器: 每分钟节拍为 %d %d/%d"
 
-#: src/metronom/metronom.cc:237
+#: src/metronom/metronom.cc:235
 msgid ""
 "A Tact Generator by Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
 "\n"
@@ -2427,11 +2587,11 @@
 "例如 tact://77 则每分钟播放 77 个节拍\n"
 "或 tact://60*3/4 每分钟播放 60 个节拍于 3/4 拍"
 
-#: src/mixer/mixer.cc:38
+#: src/mixer/mixer.cc:43
 msgid "Channel Mixer"
 msgstr "通道混合器"
 
-#: src/mixer/mixer.cc:202
+#: src/mixer/mixer.cc:255
 msgid ""
 "Channel Mixer Plugin for Audacious\n"
 "Copyright 2011-2012 John Lindgren and Michał Lipski"
@@ -2439,11 +2599,11 @@
 "Audacious 的声道混合器插件\n"
 "Copyright 2011-2012 John Lindgren 及 Michał Lipski"
 
-#: src/mixer/mixer.cc:206
+#: src/mixer/mixer.cc:259
 msgid "Channel Mixer"
 msgstr "通道混音器"
 
-#: src/mixer/mixer.cc:207
+#: src/mixer/mixer.cc:260
 msgid "Output channels:"
 msgstr "输出通道："
 
@@ -2455,168 +2615,176 @@
 msgid "Error connecting to MMS server"
 msgstr "连接到 MMS 服务错误"
 
-#: src/modplug/modplugbmp.h:53
+#: src/modplug/modplugbmp.h:57
 msgid "ModPlug (Module Player)"
 msgstr "ModPlug (Module 播放器)"
 
-#: src/modplug/plugin_main.cc:53
-msgid "Resolution"
-msgstr "分辨率"
-
-#: src/modplug/plugin_main.cc:54
-msgid "8-bit"
-msgstr "8 位"
-
 #: src/modplug/plugin_main.cc:55
-msgid "16-bit"
-msgstr "16 位"
-
-#: src/modplug/plugin_main.cc:56
 msgid "Channels"
 msgstr "声道"
 
-#: src/modplug/plugin_main.cc:60
+#: src/modplug/plugin_main.cc:59
 msgid "Nearest (fastest)"
 msgstr "最近的 (最快的)"
 
-#: src/modplug/plugin_main.cc:61
+#: src/modplug/plugin_main.cc:60
 msgid "Linear (fast)"
 msgstr "线性 (快速)"
 
-#: src/modplug/plugin_main.cc:62
+#: src/modplug/plugin_main.cc:61
 msgid "Spline (good)"
 msgstr "仿样 (较好)"
 
-#: src/modplug/plugin_main.cc:63
+#: src/modplug/plugin_main.cc:62
 msgid "Polyphase (best)"
 msgstr "多相 (最好的)"
 
-#: src/modplug/plugin_main.cc:64
+#: src/modplug/plugin_main.cc:63
 msgid "Sample rate"
 msgstr "采样率"
 
-#: src/modplug/plugin_main.cc:65
+#: src/modplug/plugin_main.cc:64
 msgid "22 kHz"
 msgstr "22 kHz"
 
-#: src/modplug/plugin_main.cc:66
+#: src/modplug/plugin_main.cc:65
 msgid "44 kHz"
 msgstr "44 kHz"
 
-#: src/modplug/plugin_main.cc:67
+#: src/modplug/plugin_main.cc:66
 msgid "48 kHz"
 msgstr "48 kHz"
 
-#: src/modplug/plugin_main.cc:68
+#: src/modplug/plugin_main.cc:67
 msgid "96 kHz"
 msgstr "96 kHz"
 
-#: src/modplug/plugin_main.cc:72 src/modplug/plugin_main.cc:77
-#: src/modplug/plugin_main.cc:82
+#: src/modplug/plugin_main.cc:71 src/modplug/plugin_main.cc:76
+#: src/modplug/plugin_main.cc:81
 msgid "Level:"
-msgstr "层级: "
+msgstr "层级："
 
-#: src/modplug/plugin_main.cc:78
+#: src/modplug/plugin_main.cc:77
 msgid "Cutoff:"
-msgstr "截断: "
+msgstr "截断："
 
-#: src/modplug/plugin_main.cc:91
+#: src/modplug/plugin_main.cc:90
 msgid "Reverb"
 msgstr "回音"
 
-#: src/modplug/plugin_main.cc:94
+#: src/modplug/plugin_main.cc:93
 msgid "Bass Boost"
 msgstr "重低音增强"
 
-#: src/modplug/plugin_main.cc:97
+#: src/modplug/plugin_main.cc:96
 msgid "Surround"
 msgstr "环绕"
 
-#: src/modplug/plugin_main.cc:100
+#: src/modplug/plugin_main.cc:99
 msgid "Preamp"
 msgstr "前置放大器"
 
-#: src/modplug/plugin_main.cc:107
+#: src/modplug/plugin_main.cc:106
 msgid "Oversample"
 msgstr "过度采样"
 
-#: src/modplug/plugin_main.cc:108
+#: src/modplug/plugin_main.cc:107
 msgid "Noise reduction"
 msgstr "减少噪声"
 
-#: src/modplug/plugin_main.cc:109
+#: src/modplug/plugin_main.cc:108
 msgid "Play Amiga MODs"
 msgstr "播放 Amiga MOD 文件"
 
-#: src/modplug/plugin_main.cc:110
+#: src/modplug/plugin_main.cc:109
 msgid "Repeat"
 msgstr "重复"
 
-#: src/modplug/plugin_main.cc:111
+#: src/modplug/plugin_main.cc:110
 msgid "Repeat count:"
-msgstr "重复计数: "
+msgstr "重复计数："
 
-#: src/modplug/plugin_main.cc:112
+#: src/modplug/plugin_main.cc:111
 msgid "To repeat forever, set the repeat count to -1."
-msgstr "要永远重复，将重复计数调整为 -1"
+msgstr "要永远重复，将重复计数调整为 -1。"
 
-#: src/modplug/plugin_main.cc:125 src/sid/xs_config.cc:106
+#: src/modplug/plugin_main.cc:124 src/sid/xs_config.cc:106
 msgid "These settings will take effect when Audacious is restarted."
 msgstr "这些设置会在重启 Audacious 后生效。"
 
+#: src/moonstone/main_window.cc:72 src/moonstone/main_window.cc:73
+#: src/qtui/main_window.cc:159 src/qtui/main_window.cc:160
+#: src/skins/menus.cc:107 src/skins-qt/menus.cc:98
+msgid "Stop After This Song"
+msgstr "在这首歌后停止"
+
+#: src/moonstone/moonstone.cc:39
+msgid "Moonstone"
+msgstr "月光石"
+
+#: src/moonstone/playlist_header.cc:212 src/qtui/playlist_header.cc:258
+msgid "Reset to Defaults"
+msgstr "重置为默认值"
+
+#: src/moonstone/playlist_model.cc:38 src/qtui/playlist_header.cc:232
+msgid "Now Playing"
+msgstr "正在播放"
+
+#: src/moonstone/playlist_selection.cc:66
+#: src/playlist-manager/playlist-manager.cc:201
+#: src/playlist-manager-qt/playlist-manager-qt.cc:190
+msgid "Entries"
+msgstr "条目"
+
 #: src/mpg123/mpg123.cc:54
 msgid "MPG123 Plugin"
 msgstr "MPG123 插件"
 
-#: src/mpg123/mpg123.cc:83
-msgid "Advanced"
-msgstr "高级设置"
-
-#: src/mpg123/mpg123.cc:84
+#: src/mpg123/mpg123.cc:82
 msgid "Use accurate length calculation (slow)"
 msgstr "使用精确长度计算（慢）"
 
-#: src/mpg123/mpg123.cc:248
+#: src/mpg123/mpg123.cc:260
 msgid "Surround"
 msgstr "环绕音"
 
-#: src/mpris2/plugin.cc:39
+#: src/mpris2/plugin.cc:40
 msgid "MPRIS 2 Server"
 msgstr "MPRIS 2 服务器"
 
-#: src/neon/neon.cc:97
+#: src/neon/neon.cc:102
 msgid "Neon HTTP/HTTPS Plugin"
 msgstr "Neon HTTP/HTTPS 插件"
 
-#: src/neon/neon.cc:521
+#: src/neon/neon.cc:526
 msgid "Error parsing redirect"
 msgstr "重定向解析错误"
 
-#: src/neon/neon.cc:535
+#: src/neon/neon.cc:540
 msgid "Unknown HTTP error"
 msgstr "未知 HTTP 错误"
 
-#: src/neon/neon.cc:569
+#: src/neon/neon.cc:614
 msgid "Error parsing URL"
 msgstr "解析网址错误"
 
-#: src/neon/neon.cc:632
+#: src/neon/neon.cc:687
 msgid "Too many redirects"
 msgstr "太多重定向"
 
-#: src/notify/event.cc:64
+#: src/notify/event.cc:97
 msgid "Stopped"
 msgstr "已停止"
 
-#: src/notify/event.cc:64
+#: src/notify/event.cc:97
 msgid "Audacious is not playing."
-msgstr "Audacious未开始播放"
+msgstr "Audacious 未开始播放。"
 
-#: src/notify/notify.cc:42
+#: src/notify/notify.cc:39
 msgid "Desktop Notifications"
 msgstr "桌面提醒"
 
-#: src/notify/notify.cc:60
+#: src/notify/notify.cc:57
 msgid ""
 "Desktop Notifications Plugin for Audacious\n"
 "Copyright (C) 2010 Maximilian Bogner\n"
@@ -2652,36 +2820,79 @@
 "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.cc:110
+#: src/notify/notify.cc:104
 msgid "Show playback controls"
 msgstr "显示回放控制"
 
-#: src/notify/notify.cc:112
+#: src/notify/notify.cc:106
 msgid "Always show notification"
 msgstr "总是显示消息提醒"
 
-#: src/notify/notify.cc:114
+#: src/notify/notify.cc:108
 msgid "Include album name in notification"
 msgstr "在通知中显示专辑名"
 
-#: src/notify/osd.cc:58
+#: src/notify/notify.cc:110
+msgid "Custom notification duration:"
+msgstr "自定义通知持续时间："
+
+#: src/notify/osd.cc:74
 msgid "Show"
 msgstr "显示"
 
-#: src/notify/osd.cc:66 src/qtui/main_window.cc:178
-#: src/qtui/main_window.cc:179 src/skins/menus.cc:88
-msgid "Pause"
-msgstr "暂停"
+#: src/openmpt/mpt.cc:50
+msgid "OpenMPT (Module Player)"
+msgstr "OpenMPT (模块播放器)"
 
-#: src/notify/osd.cc:73 src/qtui/main_window.cc:72 src/skins/menus.cc:91
-msgid "Next"
-msgstr "下一首"
+#: src/openmpt/mpt.cc:132
+msgid ""
+"Module player based on libopenmpt\n"
+"\n"
+"Written by: Chris Spiegel <cspiegel@gmail.com>"
+msgstr ""
+"模块播放器，基于 libopenmpt\n"
+"\n"
+"作者: Chris Spiegel <cspiegel@gmail.com>"
+
+#: src/openmpt/mpt.cc:151
+msgid "Stereo separation:"
+msgstr "立体声分离："
+
+#: src/openmpt/mpt.cc:153
+msgid "% (0=mono, 100=default, 200=full)"
+msgstr ""
+
+#: src/openmpt/mpt.cc:157
+msgid "Interpolation:"
+msgstr "插值："
+
+#: src/openmpt/mptwrap.h:51 src/soxr/sox-resampler.cc:189 src/xsf/plugin.cc:437
+msgid "Linear"
+msgstr "线性"
 
-#: src/oss4/oss.h:93
+#: src/openmpt/mptwrap.h:52
+msgid "Cubic"
+msgstr "立方函数"
+
+#: src/openmpt/mptwrap.h:53
+msgid "Windowed sinc"
+msgstr "Sinc 窗函数滤波"
+
+#: src/opus/opus.cc:39
+msgid "Opus Decoder"
+msgstr ""
+
+#: src/opus/opus.cc:336
+msgid ""
+"Opus Decoder Plugin for Audacious\n"
+"Copyright 2022 Thomas Lange"
+msgstr ""
+
+#: src/oss4/oss.h:70
 msgid "OSS4 Output"
 msgstr "OSS4 输出"
 
-#: src/oss4/oss.h:95
+#: src/oss4/oss.h:72
 msgid "OSS3 Output"
 msgstr "OSS3 输出"
 
@@ -2689,27 +2900,27 @@
 msgid "Default device"
 msgstr "默认设备"
 
-#: src/oss4/plugin.cc:77
+#: src/oss4/plugin.cc:78
 msgid "Audio device:"
 msgstr "音频设备："
 
-#: src/oss4/plugin.cc:80
+#: src/oss4/plugin.cc:81
 msgid "Use alternate device:"
-msgstr "使用其它设备"
+msgstr "使用其它设备："
 
-#: src/oss4/plugin.cc:84
+#: src/oss4/plugin.cc:85
 msgid "Save volume between sessions."
-msgstr "会话中保存音量"
+msgstr "会话中保存音量。"
 
-#: src/oss4/plugin.cc:86
+#: src/oss4/plugin.cc:87
 msgid "Enable format conversions made by the OSS software."
 msgstr "使用OSS的格式转换。"
 
-#: src/oss4/plugin.cc:88
+#: src/oss4/plugin.cc:89
 msgid "Enable exclusive mode to prevent virtual mixing."
 msgstr "开启独占模式以避免虚拟混合。"
 
-#: src/oss4/plugin.cc:100
+#: src/oss4/plugin.cc:101
 msgid ""
 "OSS4 Output Plugin for Audacious\n"
 "Copyright 2010-2012 Michał Lipski\n"
@@ -2723,19 +2934,35 @@
 "我希望感谢 #audacious 上的人们，尤其 Tony Vroon 及 John Lindgren，当然，还有"
 "之前 OSS 插件的作者们。"
 
-#: src/playlist-manager/playlist-manager.cc:37
+#: src/pipewire/pipewire.cc:44
+msgid "PipeWire Output"
+msgstr ""
+
+#: src/pipewire/pipewire.cc:118
+msgid ""
+"PipeWire Output Plugin for Audacious\n"
+"Copyright 2022 Thomas Lange\n"
+"\n"
+"Based on the PipeWire Output Plugin for Qmmp\n"
+"Copyright 2021 Ilya Kotov"
+msgstr ""
+
+#: src/pipewire/pipewire.cc:408 src/skins/menus.cc:88 src/skins-qt/menus.cc:79
+msgid "Playback"
+msgstr "回放"
+
+#: src/playlist-manager/playlist-manager.cc:38
+#: src/playlist-manager-qt/playlist-manager-qt.cc:42
 msgid "Playlist Manager"
 msgstr "播放列表管理器"
 
-#: src/playlist-manager/playlist-manager.cc:226
-msgid "Entries"
-msgstr "条目"
-
-#: src/playlist-manager/playlist-manager.cc:245
+#: src/playlist-manager/playlist-manager.cc:221
+#: src/playlist-manager-qt/playlist-manager-qt.cc:356
 msgid "_Remove"
 msgstr "移除(_R)"
 
-#: src/playlist-manager/playlist-manager.cc:246
+#: src/playlist-manager/playlist-manager.cc:222
+#: src/playlist-manager-qt/playlist-manager-qt.cc:351
 msgid "Ren_ame"
 msgstr "重命名(_a)"
 
@@ -2743,55 +2970,69 @@
 msgid "PLS Playlists"
 msgstr "PLS 播放列表"
 
-#: src/psf/plugin.cc:45
+#: src/psf/plugin.cc:53
 msgid "OpenPSF PSF1/PSF2 Decoder"
 msgstr "OpenPSF PSF1/PSF2 解码器"
 
-#: src/pulse_audio/pulse_audio.cc:38
+#: src/psf/plugin.cc:270
+msgid "OpenPSF Configuration"
+msgstr "OpenPSF 配置"
+
+#: src/psf/plugin.cc:271 src/xsf/plugin.cc:444
+msgid "Ignore length from file"
+msgstr "忽略文件长度"
+
+#: src/pulse/pulse_audio.cc:42
 msgid "PulseAudio Output"
 msgstr "PulseAudio 输出"
 
-#: src/pulse_audio/pulse_audio.cc:611
+#: src/pulse/pulse_audio.cc:84
+msgid "Context name:"
+msgstr "上下文名称："
+
+#: src/pulse/pulse_audio.cc:86
+msgid "Stream name:"
+msgstr "回放流名称："
+
+#: src/pulse/pulse_audio.cc:596
 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"
-"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."
+"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 ""
+"Audacious PulseAudio 输出插件\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/qtaudio/qtaudio.cc:49
+#: src/qtaudio/qtaudio.cc:53
 msgid "QtMultimedia Output"
 msgstr "QtMultimedia 输出"
 
-#: src/qtaudio/qtaudio.cc:77
+#: src/qtaudio/qtaudio.cc:84
 msgid ""
 "QtMultimedia Audio Output Plugin for Audacious\n"
 "Copyright 2014 William Pitcock\n"
@@ -2805,50 +3046,107 @@
 "基于Audacious SDL 输出插件\n"
 "John Lindgren 2010 版权所有"
 
-#: src/qtui/dialog_windows.cc:31
-msgid "Working ..."
-msgstr "工作中 ..."
+#: src/qtglspectrum/gl-spectrum.cc:41
+msgid ""
+"OpenGL Spectrum Analyzer for Audacious\n"
+"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
+"Copyright 2014, 2020 Ariadne Conill\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"
+"Christophe Budé, John Lindgren, Carlo Bramini. 2013 版权所有\n"
+"Ariadne Conill. 2014, 2020 版权所有\n"
+"\n"
+"基于 XMMS 插件：\n"
+"Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson，4Front Technologies. "
+"1998-2000 版权所有\n"
+"\n"
+"许可: GPLv2+"
 
-#: src/qtui/filter_input.cc:44 src/skins/ui_playlist.cc:221
-msgid "Search"
-msgstr "搜索"
+#: src/qthotkey/gui.cc:177
+msgid "Press a key combination inside a text field."
+msgstr "请在文本区按下要绑定的组合键。"
 
-#: src/qtui/main_window_actions.cc:94
+#: src/qthotkey/plugin.cc:105
+msgid ""
+"Global Hotkey Plugin\n"
+"Control the player with global key combinations or multimedia keys.\n"
+"\n"
+"Copyright (C) 2020 i.Dark_Templar <darktemplar@dark-templar-archives.net>\n"
+"Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n"
+"\n"
+"Contributors 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"
+"Copyright (C) 2020 i.Dark_Templar <darktemplar@dark-templar-archives.net>\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/qtui/menus.cc:109
 msgid "_Open Folder ..."
 msgstr "打开文件夹 ... (&O)"
 
-#: src/qtui/main_window_actions.cc:96
+#: src/qtui/menus.cc:115
 msgid "_Add Folder ..."
 msgstr "添加文件夹 ... (Add)"
 
-#: src/qtui/main_window_actions.cc:101
+#: src/qtui/menus.cc:128
 msgid "_Log Inspector ..."
 msgstr "日志监视(_L) ..."
 
-#: src/qtui/main_window.cc:64
-msgid "Open Files"
-msgstr "打开文件"
+#: src/qtui/menus.cc:220
+msgid "_Find ..."
+msgstr "查找(_F) ..."
 
-#: src/qtui/main_window.cc:66
-msgid "Add Files"
-msgstr "添加文件"
+#: src/qtui/menus.cc:256 src/skins/menus.cc:80 src/skins-qt/menus.cc:70
+msgid "Audio Settings ..."
+msgstr "音频设置..."
 
-#: src/qtui/main_window.cc:71 src/skins/menus.cc:90
-msgid "Previous"
-msgstr "上一首"
+#: src/qtui/playlist_model.cc:188
+msgid "Q#"
+msgstr "Q#"
 
-#: src/qtui/main_window.cc:77 src/skins/menus.cc:82
-msgid "Repeat"
-msgstr "重复"
+#: src/qtui/playlist_model.cc:190
+msgid "T#"
+msgstr "T#"
 
-#: src/qtui/main_window.cc:79 src/skins/menus.cc:83
-msgid "Shuffle"
-msgstr "随机"
+#: src/qtui/playlist_model.cc:192
+msgid "C#"
+msgstr ""
 
-#: src/qtui/qtui.cc:42
+#: src/qtui/playlist_model.cc:194
+msgid "D#"
+msgstr ""
+
+#: src/qtui/qtui.cc:40
 msgid "Qt Interface"
 msgstr "Qt 界面"
 
+#: src/qtui/search_bar.cc:46
+msgid "Search playlist"
+msgstr "搜索播放列表"
+
+#: src/qtui/settings.cc:79
+msgid "Use bold font for column headers"
+msgstr "列标题使用粗体字"
+
 #: src/resample/resample.cc:43
 msgid "Sample Rate Converter"
 msgstr "采样率转换器"
@@ -2889,7 +3187,7 @@
 msgid "Method:"
 msgstr "方法："
 
-#: src/resample/resample.cc:199 src/sox-resampler/sox-resampler.cc:161
+#: src/resample/resample.cc:199 src/soxr/sox-resampler.cc:203
 msgid "Rate:"
 msgstr "比率："
 
@@ -2899,7 +3197,7 @@
 
 #: src/resample/resample.cc:203
 msgid "Use rate mappings"
-msgstr "比率映射："
+msgstr "使用比率映射"
 
 #: src/resample/resample.cc:205
 msgid "8 kHz:"
@@ -2941,61 +3239,52 @@
 msgid "192 kHz:"
 msgstr "192 kHz:"
 
-#: src/scrobbler2/config_window.cc:41
-#, c-format
-msgid "OK. Scrobbling for user: %s"
-msgstr "搞定。正在为用户 %s Scrobble"
-
-#: src/scrobbler2/config_window.cc:54
-msgid "Permission Denied"
-msgstr "权限阻止"
-
-#: src/scrobbler2/config_window.cc:56
-msgid "Access the following link to allow Audacious to scrobble your plays:"
-msgstr "请访问如下链接以允许 Audacious Scrobble 你的播放列表: "
-
-#: src/scrobbler2/config_window.cc:66
-msgid "Keep this window open and click 'Check Permission' again.\n"
-msgstr "保持此窗口并再次点击 '检查权限'。\n"
+#: src/scrobbler2/config_window.cc:29
+msgid "Checking Last.fm access ..."
+msgstr "正在检查 Last.fm 访问 ..."
 
-#: src/scrobbler2/config_window.cc:69 src/scrobbler2/config_window.cc:80
+#: src/scrobbler2/config_window.cc:35
 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."
+"Your scrobbles are being saved on your computer temporarily. They will be "
+"submitted as soon as Audacious is allowed access."
 msgstr ""
-"不要担心。你的 Scrobble 已保存到了计算机上。\n"
-"他们将在 Audacious 被允许时提交。"
+"您的 Scrobble 正在临时保存到您的计算机上。\n"
+"他们将在 Audacious 被允许访问时提交。"
 
-#: src/scrobbler2/config_window.cc:77
-msgid "Network Problem."
-msgstr "网络问题。"
+#: src/scrobbler2/config_window.cc:41
+#, c-format
+msgid "Permission granted. Scrobbling for user %s."
+msgstr "已获得访问权限。正在为用户 %s Scrobble。"
 
-#: src/scrobbler2/config_window.cc:78
-msgid "There was a problem contacting Last.fm. Please try again later."
-msgstr "在访问 Last.fm 时遇到问题。请稍候重试。"
+#: src/scrobbler2/config_window.cc:44
+msgid ""
+"Permission denied. Open the following URL in a browser, allow Audacious "
+"access to your account, and then click 'Check Permission' again:"
+msgstr ""
+"访问权限被拒绝。请在您的浏览器中打开如下 URL，并允许 Audacious 访问您的帐号，"
+"然后再次点击“检查权限”："
 
-#: src/scrobbler2/config_window.cc:110
-msgid "Checking..."
-msgstr "正在检索……"
+#: src/scrobbler2/config_window.cc:53
+msgid "There was a problem contacting Last.fm."
+msgstr "在访问 Last.fm 时遇到问题。"
 
-#: src/scrobbler2/config_window.cc:176
-msgid "C_heck Permission"
-msgstr "检查权限(_C)"
+#: src/scrobbler2/config_window.cc:92
+msgid "Check Permission"
+msgstr "检查权限"
 
-#: src/scrobbler2/config_window.cc:177
-msgid "_Revoke Permission"
-msgstr "吊销权限(_R)"
+#: src/scrobbler2/config_window.cc:93
+msgid "Revoke Permission"
+msgstr "吊销权限"
 
-#: src/scrobbler2/config_window.cc:220
-msgid ""
-"You need to allow Audacious to scrobble tracks to your Last.fm account.\n"
-msgstr "你需要允许 Audacious 以 Scrobble 你 Last.fm 帐户上的音乐。\n"
+#: src/scrobbler2/config_window.cc:97
+msgid "You need to allow Audacious to scrobble tracks to your Last.fm account."
+msgstr "您需要允许 Audacious 对您的 Last.fm 帐号上的曲目进行 scrobble。"
 
 #: src/scrobbler2/scrobbler.cc:29
 msgid "Scrobbler 2.0"
 msgstr "Scrobbler 2.0"
 
-#: src/scrobbler2/scrobbler.cc:224
+#: src/scrobbler2/scrobbler.cc:200
 msgid ""
 "The Scrobbler plugin could not be started.\n"
 "There might be a problem with your installation."
@@ -3003,36 +3292,21 @@
 "Scrobbler 插件无法启动。\n"
 "你的安装可能存在问题。"
 
-#: src/scrobbler2/scrobbler.cc:289
+#: src/scrobbler2/scrobbler.cc:245
 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"
+"project."
 msgstr ""
-"Audacious 的 Scrobbler 插件，版本 2.0，作者为 Pitxyoki，\n"
-"\n"
-"Copyright © 2012-2013 Luís M. Picciochi Oliveira <Pitxyoki@Gmail.com>\n"
-"\n"
-"感谢 John Lindgren 在项目初始阶段提供的帮助\n"
-"\n"
 
-#: src/scrobbler2/scrobbler_communication.cc:642
-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/sdlout.cc:48
+#: src/sdlout/sdlout.cc:43
 msgid "SDL Output"
 msgstr "SDL 输出"
 
-#: src/sdlout/sdlout.cc:77
+#: src/sdlout/sdlout.cc:72
 msgid ""
 "SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
@@ -3040,74 +3314,83 @@
 "Audacious 的 SDL 输出插件\n"
 "Copyright 2010 John Lindgren"
 
-#: src/search-tool/search-tool.cc:116 src/search-tool/search-tool.cc:124
+#: src/search-tool/library.cc:35 src/search-tool/library.cc:46
+#: src/search-tool-qt/library.cc:35 src/search-tool-qt/library.cc:46
 msgid "Library"
 msgstr "库"
 
-#: src/search-tool/search-tool.cc:394
-#, c-format
-msgid "%d result"
-msgid_plural "%d results"
-msgstr0 "%d 个结果"
-
-#: src/search-tool/search-tool.cc:400
-#, c-format
-msgid "(%d hidden)"
-msgid_plural "(%d hidden)"
-msgstr0 "(%d 个隐藏的)"
-
-#: src/search-tool/search-tool.cc:594
+#: src/search-tool-qt/search-model.cc:44 src/search-tool/search-tool.cc:287
 #, c-format
 msgid "%d song"
 msgid_plural "%d songs"
 msgstr0 "%d 首歌"
 
-#: src/search-tool/search-tool.cc:601
+#: src/search-tool-qt/search-model.cc:53 src/search-tool/search-tool.cc:294
 msgid "of this genre"
 msgstr "属于此风格"
 
-#: src/search-tool/search-tool.cc:607
+#: src/search-tool-qt/search-model.h:47 src/search-tool/search-model.h:45
 msgid "on"
 msgstr "在"
 
-#: src/search-tool/search-tool.cc:607
+#: src/search-tool-qt/search-model.h:47 src/search-tool/search-model.h:45
 msgid "by"
 msgstr "-"
 
-#: src/search-tool/search-tool.cc:643
-msgid "_Create Playlist"
-msgstr "创建播放列表(_C)"
-
-#: src/search-tool/search-tool.cc:645
-msgid "_Add to Playlist"
-msgstr "添加到播放列表(_A)"
-
-#: src/search-tool/search-tool.cc:684
-msgid "Search library"
-msgstr "搜索库"
+#: src/search-tool-qt/search-tool-qt.cc:165 src/search-tool/search-tool.cc:74
+msgid "Number of results to show:"
+msgstr "显示的结果数："
+
+#: src/search-tool-qt/search-tool-qt.cc:168 src/search-tool/search-tool.cc:77
+msgid "Rescan library at startup"
+msgstr "启动时重新扫描库"
+
+#: src/search-tool-qt/search-tool-qt.cc:170
+msgid "Monitor library for changes"
+msgstr "监视库中的更改"
 
-#: src/search-tool/search-tool.cc:688
+#: src/search-tool-qt/search-tool-qt.cc:193 src/search-tool/search-tool.cc:450
 msgid ""
 "To import your music library into Audacious, choose a folder and then click "
 "the \"refresh\" icon."
 msgstr "要将您的音乐库导入Audacious，选择一个文件夹，然后点击“刷新”图标。"
 
-#: src/search-tool/search-tool.cc:696
+#: src/search-tool-qt/search-tool-qt.cc:195 src/search-tool/search-tool.cc:459
 msgid "Please wait ..."
 msgstr "请稍等...."
 
-#: src/search-tool/search-tool.cc:723
+#: src/search-tool-qt/search-tool-qt.cc:197 src/search-tool/search-tool.cc:487
 msgid "Choose Folder"
 msgstr "选择文件夹"
 
+#: src/search-tool-qt/search-tool-qt.cc:201 src/search-tool/search-tool.cc:445
+msgid "Search library"
+msgstr "搜索库"
+
+#: src/search-tool-qt/search-tool-qt.cc:327 src/search-tool/search-tool.cc:156
+#, c-format
+msgid "%d of %d result shown"
+msgid_plural "%d of %d results shown"
+msgstr0 "显示了 %d 个结果，共 %d 个"
+
+#: src/search-tool-qt/search-tool-qt.cc:331 src/search-tool/search-tool.cc:160
+#, c-format
+msgid "%d result"
+msgid_plural "%d results"
+msgstr0 "%d 个结果"
+
+#: src/search-tool-qt/search-tool-qt.cc:501 src/search-tool/search-tool.cc:341
+msgid "_Create Playlist"
+msgstr "创建播放列表(_C)"
+
+#: src/search-tool-qt/search-tool-qt.cc:503 src/search-tool/search-tool.cc:343
+msgid "_Add to Playlist"
+msgstr "添加到播放列表(_A)"
+
 #: src/sid/xmms-sid.cc:43
 msgid "SID Player"
 msgstr "SID 播放器"
 
-#: src/sid/xs_config.cc:61
-msgid "Output"
-msgstr "输出"
-
 #: src/sid/xs_config.cc:62
 msgid "Channels:"
 msgstr "声道数："
@@ -3188,739 +3471,682 @@
 msgid "Threshold:"
 msgstr "阈值："
 
-#: src/silence-removal/silence-removal.cc:70
-msgid "dB"
-msgstr "dB"
+#: src/skins/actions.cc:45 src/skins-qt/actions.cc:43
+msgid "Repeat points cleared."
+msgstr "重复点已清除。"
+
+#: src/skins/actions.cc:60 src/skins-qt/actions.cc:58
+msgid "Repeat point A set."
+msgstr "重复点 A 已设置。"
+
+#: src/skins/actions.cc:65 src/skins-qt/actions.cc:63
+msgid "Repeat point B set."
+msgstr "重复点 B 已设置。"
+
+#: src/skins/equalizer.cc:223 src/skins-qt/equalizer.cc:223
+msgid "Preamp"
+msgstr "前置放大"
 
-#: src/skins/menus.cc:64
+#: src/skins/equalizer.cc:227 src/skins-qt/equalizer.cc:227
+msgid "31 Hz"
+msgstr "31 赫兹"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "63 Hz"
+msgstr "63 赫兹"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "125 Hz"
+msgstr "125 赫兹"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "250 Hz"
+msgstr "250 赫兹"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "500 Hz"
+msgstr "200 赫兹"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "1 kHz"
+msgstr "1000 赫兹"
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "2 kHz"
+msgstr "2000 赫兹"
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "4 kHz"
+msgstr "4000 赫兹"
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "8 kHz"
+msgstr "8000 赫兹"
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "16 kHz"
+msgstr "16000 赫兹"
+
+#: src/skins/equalizer.cc:270 src/skins-qt/equalizer.cc:270
+msgid "Audacious Equalizer"
+msgstr "Audacious均衡器"
+
+#: src/skins/main.cc:459 src/skins-qt/main.cc:442
+msgid "Recording on"
+msgstr "录制开启"
+
+#: src/skins/main.cc:461 src/skins-qt/main.cc:444
+msgid "Recording off"
+msgstr "录制关闭"
+
+#: src/skins/main.cc:754 src/skins-qt/main.cc:701
+#, c-format
+msgid "Seek to %d:%-2.2d / %d:%-2.2d"
+msgstr "查找： %d:%-2.2d/%d:%-2.2d"
+
+#: src/skins/main.cc:771 src/skins-qt/main.cc:718
+#, c-format
+msgid "Volume: %d%%"
+msgstr "音量：%d%%"
+
+#: src/skins/main.cc:784 src/skins-qt/main.cc:731
+#, c-format
+msgid "Balance: %d%% left"
+msgstr "平衡：%d%% 左"
+
+#: src/skins/main.cc:786 src/skins-qt/main.cc:733
+msgid "Balance: center"
+msgstr "平衡：中间"
+
+#: src/skins/main.cc:788 src/skins-qt/main.cc:735
+#, c-format
+msgid "Balance: %d%% right"
+msgstr "平衡：%d%% 右"
+
+#: src/skins/main.cc:880 src/skins-qt/main.cc:827
+msgid "Options Menu"
+msgstr "选项菜单"
+
+#: src/skins/main.cc:884 src/skins-qt/main.cc:831
+msgid "Disable 'Always On Top'"
+msgstr "禁用“顶置窗口”"
+
+#: src/skins/main.cc:886 src/skins-qt/main.cc:833
+msgid "Enable 'Always On Top'"
+msgstr "启用“顶置窗口”"
+
+#: src/skins/main.cc:889 src/skins-qt/main.cc:836
+msgid "File Info Box"
+msgstr "文件信息"
+
+#: src/skins/main.cc:892 src/skins/menus.cc:149 src/skins-qt/main.cc:839
+#: src/skins-qt/menus.cc:142
+msgid "Double Size"
+msgstr "双倍大小"
+
+#: src/skins/main.cc:895 src/skins-qt/main.cc:842
+msgid "Visualizations"
+msgstr "可视化效果"
+
+#: src/skins/menus.cc:74 src/skins-qt/menus.cc:64
+msgid "Volume Up"
+msgstr "增加音量"
+
+#: src/skins/menus.cc:75 src/skins-qt/menus.cc:65
+msgid "Volume Down"
+msgstr "减小音量"
+
+#: src/skins/menus.cc:77 src/skins-qt/menus.cc:67
+msgid "Effects ..."
+msgstr "效果..."
+
+#: src/skins/menus.cc:84 src/skins-qt/menus.cc:74
 msgid "Open Files ..."
 msgstr "打开文件 ..."
 
-#: src/skins/menus.cc:65
+#: src/skins/menus.cc:85 src/skins-qt/menus.cc:76
 msgid "Open URL ..."
 msgstr "打开 URL ..."
 
-#: src/skins/menus.cc:66
-msgid "Search Library"
-msgstr "搜索库"
-
-#: src/skins/menus.cc:68
-msgid "Playback"
-msgstr "回放"
-
-#: src/skins/menus.cc:69
+#: src/skins/menus.cc:89 src/skins-qt/menus.cc:80
 msgid "Playlist"
 msgstr "播放列表"
 
-#: src/skins/menus.cc:70
+#: src/skins/menus.cc:90 src/skins-qt/menus.cc:81
+msgid "Output"
+msgstr "输出"
+
+#: src/skins/menus.cc:91 src/skins-qt/menus.cc:82
 msgid "View"
 msgstr "外观"
 
-#: src/skins/menus.cc:72 src/skins/menus.cc:136 src/skins/menus.cc:149
-#: src/skins/menus.cc:214
+#: src/skins/menus.cc:93 src/skins/menus.cc:161 src/skins/menus.cc:174
+#: src/skins/menus.cc:245 src/skins-qt/menus.cc:84 src/skins-qt/menus.cc:156
+#: src/skins-qt/menus.cc:170 src/skins-qt/menus.cc:241
 msgid "Services"
 msgstr "服务"
 
-#: src/skins/menus.cc:74
+#: src/skins/menus.cc:95 src/skins-qt/menus.cc:86
 msgid "About ..."
 msgstr "关于 ..."
 
-#: src/skins/menus.cc:75
+#: src/skins/menus.cc:96 src/skins-qt/menus.cc:87
 msgid "Settings ..."
 msgstr "设置 ..."
 
-#: src/skins/menus.cc:76
+#: src/skins/menus.cc:97 src/skins-qt/menus.cc:88
 msgid "Quit"
 msgstr "退出"
 
-#: src/skins/menus.cc:80 src/skins/menus.cc:206
+#: src/skins/menus.cc:101 src/skins/menus.cc:235 src/skins-qt/menus.cc:92
+#: src/skins-qt/menus.cc:231
 msgid "Song Info ..."
 msgstr "歌曲信息 ..."
 
-#: src/skins/menus.cc:84
+#: src/skins/menus.cc:105 src/skins-qt/menus.cc:96
+msgid "Shuffle by Album"
+msgstr "专辑随机"
+
+#: src/skins/menus.cc:106 src/skins-qt/menus.cc:97
 msgid "No Playlist Advance"
 msgstr "禁止自动播放下一首"
 
-#: src/skins/menus.cc:85
-msgid "Stop After This Song"
-msgstr "在这首歌后停止"
-
-#: src/skins/menus.cc:93
+#: src/skins/menus.cc:117 src/skins-qt/menus.cc:108
 msgid "Set A-B Repeat"
 msgstr "设置 A-B 点重复"
 
-#: src/skins/menus.cc:94
+#: src/skins/menus.cc:118 src/skins-qt/menus.cc:109
 msgid "Clear A-B Repeat"
 msgstr "清除 A-B 点重复"
 
-#: src/skins/menus.cc:96
+#: src/skins/menus.cc:120 src/skins-qt/menus.cc:111
 msgid "Jump to Song ..."
 msgstr "跳至曲目 ..."
 
-#: src/skins/menus.cc:97
+#: src/skins/menus.cc:121 src/skins-qt/menus.cc:113
 msgid "Jump to Time ..."
 msgstr "跳至时间 ..."
 
-#: src/skins/menus.cc:101
+#: src/skins/menus.cc:125 src/skins-qt/menus.cc:118
 msgid "Play/Resume"
 msgstr "播放/继续"
 
-#: src/skins/menus.cc:103
+#: src/skins/menus.cc:127 src/skins-qt/menus.cc:120
 msgid "New Playlist"
 msgstr "新建播放列表"
 
-#: src/skins/menus.cc:104
+#: src/skins/menus.cc:128 src/skins-qt/menus.cc:121
 msgid "Rename Playlist ..."
 msgstr "重命名播放列表 ..."
 
-#: src/skins/menus.cc:105
+#: src/skins/menus.cc:129 src/skins-qt/menus.cc:122
 msgid "Remove Playlist"
 msgstr "移除播放列表"
 
-#: src/skins/menus.cc:107
+#: src/skins/menus.cc:131 src/skins-qt/menus.cc:124
 msgid "Previous Playlist"
 msgstr "上一个播放列表"
 
-#: src/skins/menus.cc:108
+#: src/skins/menus.cc:132 src/skins-qt/menus.cc:125
 msgid "Next Playlist"
 msgstr "下一个播放列表"
 
-#: src/skins/menus.cc:110
+#: src/skins/menus.cc:134 src/skins-qt/menus.cc:127
 msgid "Import Playlist ..."
-msgstr "导入播放列表"
+msgstr "导入播放列表 ..."
 
-#: src/skins/menus.cc:111
+#: src/skins/menus.cc:135 src/skins-qt/menus.cc:128
 msgid "Export Playlist ..."
 msgstr "导出播放列表 ..."
 
-#: src/skins/menus.cc:113
+#: src/skins/menus.cc:137 src/skins-qt/menus.cc:130
 msgid "Playlist Manager ..."
 msgstr "播放列表管理器 ..."
 
-#: src/skins/menus.cc:114
+#: src/skins/menus.cc:138 src/skins-qt/menus.cc:131
 msgid "Queue Manager ..."
 msgstr "队列管理器 ..."
 
-#: src/skins/menus.cc:116
+#: src/skins/menus.cc:140 src/skins-qt/menus.cc:133
 msgid "Refresh Playlist"
 msgstr "刷新播放列表"
 
-#: src/skins/menus.cc:120
+#: src/skins/menus.cc:144 src/skins-qt/menus.cc:137
 msgid "Show Playlist Editor"
 msgstr "显示播放列表编辑器"
 
-#: src/skins/menus.cc:121
+#: src/skins/menus.cc:145 src/skins-qt/menus.cc:138
 msgid "Show Equalizer"
 msgstr "显示均衡器"
 
-#: src/skins/menus.cc:123
+#: src/skins/menus.cc:147 src/skins-qt/menus.cc:140
 msgid "Show Remaining Time"
 msgstr "显示重命名时间"
 
-#: src/skins/menus.cc:125
+#: src/skins/menus.cc:150 src/skins-qt/menus.cc:143
 msgid "Always on Top"
 msgstr "顶置窗口"
 
-#: src/skins/menus.cc:126
+#: src/skins/menus.cc:151 src/skins-qt/menus.cc:145
 msgid "On All Workspaces"
 msgstr "所有工作区可见"
 
-#: src/skins/menus.cc:128
+#: src/skins/menus.cc:153 src/skins-qt/menus.cc:148
 msgid "Roll Up Player"
 msgstr "收起播放器"
 
-#: src/skins/menus.cc:129
+#: src/skins/menus.cc:154 src/skins-qt/menus.cc:149
 msgid "Roll Up Playlist Editor"
 msgstr "收起播放列表编辑器"
 
-#: src/skins/menus.cc:130
+#: src/skins/menus.cc:155 src/skins-qt/menus.cc:150
 msgid "Roll Up Equalizer"
 msgstr "收起均衡器"
 
-#: src/skins/menus.cc:132 src/skins/ui_main.cc:854
-msgid "Double Size"
-msgstr "双倍大小"
-
-#: src/skins/menus.cc:138
+#: src/skins/menus.cc:163 src/skins-qt/menus.cc:158
 msgid "Add URL ..."
 msgstr "添加 URL ..."
 
-#: src/skins/menus.cc:139
+#: src/skins/menus.cc:164 src/skins-qt/menus.cc:160
 msgid "Add Files ..."
 msgstr "添加文件 ..."
 
-#: src/skins/menus.cc:143 src/skins/menus.cc:171 src/skins/menus.cc:185
+#: src/skins/menus.cc:168 src/skins/menus.cc:196 src/skins/menus.cc:212
+#: src/skins-qt/menus.cc:164 src/skins-qt/menus.cc:192
+#: src/skins-qt/menus.cc:208
 msgid "By Title"
 msgstr "按标题"
 
-#: src/skins/menus.cc:144 src/skins/menus.cc:178 src/skins/menus.cc:192
+#: src/skins/menus.cc:169 src/skins/menus.cc:203 src/skins/menus.cc:219
+#: src/skins-qt/menus.cc:165 src/skins-qt/menus.cc:199
+#: src/skins-qt/menus.cc:215
 msgid "By File Name"
 msgstr "按文件名"
 
-#: src/skins/menus.cc:145 src/skins/menus.cc:179 src/skins/menus.cc:193
+#: src/skins/menus.cc:170 src/skins/menus.cc:204 src/skins/menus.cc:220
+#: src/skins-qt/menus.cc:166 src/skins-qt/menus.cc:200
+#: src/skins-qt/menus.cc:216
 msgid "By File Path"
 msgstr "按文件路径"
 
-#: src/skins/menus.cc:151
+#: src/skins/menus.cc:176 src/skins-qt/menus.cc:172
 msgid "Remove All"
 msgstr "清空"
 
-#: src/skins/menus.cc:152
+#: src/skins/menus.cc:177 src/skins-qt/menus.cc:173
 msgid "Clear Queue"
 msgstr "清空队列"
 
-#: src/skins/menus.cc:154
+#: src/skins/menus.cc:179 src/skins-qt/menus.cc:175
 msgid "Remove Unavailable Files"
 msgstr "删除不可用文件"
 
-#: src/skins/menus.cc:155
+#: src/skins/menus.cc:180 src/skins-qt/menus.cc:176
 msgid "Remove Duplicates"
 msgstr "删除重复的条目"
 
-#: src/skins/menus.cc:157
+#: src/skins/menus.cc:182 src/skins-qt/menus.cc:178
 msgid "Remove Unselected"
 msgstr "删除未被选中的"
 
-#: src/skins/menus.cc:158
+#: src/skins/menus.cc:183 src/skins-qt/menus.cc:179
 msgid "Remove Selected"
 msgstr "删除已选中的"
 
-#: src/skins/menus.cc:162
+#: src/skins/menus.cc:187 src/skins-qt/menus.cc:183
 msgid "Search and Select"
 msgstr "搜索/选择"
 
-#: src/skins/menus.cc:164
+#: src/skins/menus.cc:189 src/skins-qt/menus.cc:185
 msgid "Invert Selection"
 msgstr "反选"
 
-#: src/skins/menus.cc:165
+#: src/skins/menus.cc:190 src/skins-qt/menus.cc:186
 msgid "Select None"
 msgstr "取消选中"
 
-#: src/skins/menus.cc:166
+#: src/skins/menus.cc:191 src/skins-qt/menus.cc:187
 msgid "Select All"
 msgstr "选中全部"
 
-#: src/skins/menus.cc:170 src/skins/menus.cc:184
+#: src/skins/menus.cc:195 src/skins/menus.cc:211 src/skins-qt/menus.cc:191
+#: src/skins-qt/menus.cc:207
 msgid "By Track Number"
 msgstr "按音轨号码"
 
-#: src/skins/menus.cc:172 src/skins/menus.cc:186
+#: src/skins/menus.cc:197 src/skins/menus.cc:213 src/skins-qt/menus.cc:193
+#: src/skins-qt/menus.cc:209
 msgid "By Artist"
 msgstr "按艺术家"
 
-#: src/skins/menus.cc:173 src/skins/menus.cc:187
+#: src/skins/menus.cc:198 src/skins/menus.cc:214 src/skins-qt/menus.cc:194
+#: src/skins-qt/menus.cc:210
 msgid "By Album"
 msgstr "按专辑"
 
-#: src/skins/menus.cc:174 src/skins/menus.cc:188
+#: src/skins/menus.cc:199 src/skins/menus.cc:215 src/skins-qt/menus.cc:195
+#: src/skins-qt/menus.cc:211
 msgid "By Album Artist"
 msgstr "按专辑艺术家"
 
-#: src/skins/menus.cc:175 src/skins/menus.cc:190
+#: src/skins/menus.cc:200 src/skins/menus.cc:216 src/skins-qt/menus.cc:196
+#: src/skins-qt/menus.cc:212
 msgid "By Release Date"
 msgstr "按发表日期"
 
-#: src/skins/menus.cc:176 src/skins/menus.cc:189
+#: src/skins/menus.cc:201 src/skins/menus.cc:217 src/skins-qt/menus.cc:197
+#: src/skins-qt/menus.cc:213
 msgid "By Genre"
 msgstr "按照类型"
 
-#: src/skins/menus.cc:177 src/skins/menus.cc:191
+#: src/skins/menus.cc:202 src/skins/menus.cc:218 src/skins-qt/menus.cc:198
+#: src/skins-qt/menus.cc:214
 msgid "By Length"
 msgstr "按照长度"
 
-#: src/skins/menus.cc:180 src/skins/menus.cc:194
+#: src/skins/menus.cc:205 src/skins/menus.cc:221 src/skins-qt/menus.cc:201
+#: src/skins-qt/menus.cc:217
 msgid "By Custom Title"
 msgstr "按照自定义标题"
 
-#: src/skins/menus.cc:198
+#: src/skins/menus.cc:206 src/skins/menus.cc:222 src/skins-qt/menus.cc:202
+#: src/skins-qt/menus.cc:218
+msgid "By Comment"
+msgstr "根据评论"
+
+#: src/skins/menus.cc:207 src/skins/menus.cc:223 src/skins-qt/menus.cc:203
+#: src/skins-qt/menus.cc:219
+msgid "By Disc Number"
+msgstr ""
+
+#: src/skins/menus.cc:227 src/skins-qt/menus.cc:223
 msgid "Randomize List"
 msgstr "打乱列表"
 
-#: src/skins/menus.cc:199
+#: src/skins/menus.cc:228 src/skins-qt/menus.cc:224
 msgid "Reverse List"
 msgstr "反转列表"
 
-#: src/skins/menus.cc:201
+#: src/skins/menus.cc:230 src/skins-qt/menus.cc:226
 msgid "Sort Selected"
 msgstr "排序已选中的"
 
-#: src/skins/menus.cc:202
+#: src/skins/menus.cc:231 src/skins-qt/menus.cc:227
 msgid "Sort List"
 msgstr "排序列表"
 
-#: src/skins/menus.cc:208
+#: src/skins/menus.cc:236 src/skins-qt/menus.cc:232
+msgid "Open Containing Folder"
+msgstr "打开包含的文件夹"
+
+#: src/skins/menus.cc:238 src/skins-qt/menus.cc:234
 msgid "Cut"
 msgstr "剪切"
 
-#: src/skins/menus.cc:209
+#: src/skins/menus.cc:239 src/skins-qt/menus.cc:235
 msgid "Copy"
 msgstr "复制"
 
-#: src/skins/menus.cc:210
+#: src/skins/menus.cc:240 src/skins-qt/menus.cc:236
 msgid "Paste"
 msgstr "粘贴"
 
-#: src/skins/menus.cc:212
+#: src/skins/menus.cc:241 src/skins-qt/menus.cc:237
+msgid "Paste at End"
+msgstr "在末尾粘贴"
+
+#: src/skins/menus.cc:243 src/skins-qt/menus.cc:239
 msgid "Queue/Unqueue"
 msgstr "加入/移出列表"
 
-#: src/skins/menus.cc:218
-msgid "Load Preset ..."
-msgstr "载入预设 ..."
-
-#: src/skins/menus.cc:219
-msgid "Load Auto Preset ..."
-msgstr "载入自动载入预设 ..."
-
-#: src/skins/menus.cc:220
-msgid "Load Default"
-msgstr "载入预设值"
-
-#: src/skins/menus.cc:221
-msgid "Load Preset File ..."
-msgstr "载入预设文件 ..."
-
-#: src/skins/menus.cc:222
-msgid "Load EQF File ..."
-msgstr "载入 EQF 文件 ..."
-
-#: src/skins/menus.cc:224
-msgid "Save Preset ..."
-msgstr "保存预设 ..."
-
-#: src/skins/menus.cc:225
-msgid "Save Auto Preset ..."
-msgstr "保存自动加载预设 ..."
-
-#: src/skins/menus.cc:226
-msgid "Save Default"
-msgstr "保存为默认值"
-
-#: src/skins/menus.cc:227
-msgid "Save Preset File ..."
-msgstr "保存预设文件 ..."
-
-#: src/skins/menus.cc:228
-msgid "Save EQF File ..."
-msgstr "保存 EQF 文件 ..."
-
-#: src/skins/menus.cc:230
-msgid "Delete Preset ..."
-msgstr "删除预设 ..."
-
-#: src/skins/menus.cc:231
-msgid "Delete Auto Preset ..."
-msgstr "删除自动预设 ..."
-
-#: src/skins/menus.cc:233
-msgid "Import Winamp Presets ..."
-msgstr "导入 WinAMP 预设 ..."
-
-#: src/skins/menus.cc:235
-msgid "Reset to Zero"
-msgstr "归零"
+#: src/skins/playlist-widget.cc:58 src/skins-qt/playlist-widget.cc:58
+#, c-format
+msgid "%s (%d of %d)"
+msgstr "%s (%d of %d)"
 
-#: src/skins/plugin.cc:48
+#: src/skins/playlistwin.cc:491 src/skins-qt/playlistwin.cc:478
+msgid "Audacious Playlist Editor"
+msgstr "Audacious播放列表编辑器"
+
+#: src/skins/plugin.cc:53 src/skins-qt/plugin.cc:65
 msgid "Winamp Classic Interface"
 msgstr "Winamp 经典界面"
 
-#: src/skins/preset-browser.cc:57 src/skins/preset-list.cc:371
-#: src/skins/preset-list.cc:386
-msgid "Save"
-msgstr "保存"
-
-#: src/skins/preset-browser.cc:57 src/skins/preset-list.cc:338
-#: src/skins/preset-list.cc:354
-msgid "Load"
-msgstr "载入"
-
-#: src/skins/preset-browser.cc:83
-msgid "Load Preset File"
-msgstr "载入预设文件"
-
-#: src/skins/preset-browser.cc:100
-msgid "Load EQF File"
-msgstr "载入 EQF 文件"
-
-#: src/skins/preset-browser.cc:119
-msgid "Save Preset File"
-msgstr "保存预设文件"
-
-#: src/skins/preset-browser.cc:137
-msgid "Save EQF File"
-msgstr "保存 EQF 文件"
-
-#: src/skins/preset-browser.cc:151
-msgid "Import Winamp Presets"
-msgstr "导入 WinAMP 预设"
-
-#: src/skins/preset-list.cc:285
-msgid "Presets"
-msgstr "预设"
-
-#: src/skins/preset-list.cc:335
-msgid "Load preset"
-msgstr "载入预设"
-
-#: src/skins/preset-list.cc:351
-msgid "Load auto-preset"
-msgstr "载入自动载入预设"
-
-#: src/skins/preset-list.cc:367
-msgid "Save preset"
-msgstr "保存预设"
-
-#: src/skins/preset-list.cc:382
-msgid "Save auto-preset"
-msgstr "保存自动加载预设"
-
-#: src/skins/preset-list.cc:408
-msgid "Delete preset"
-msgstr "删除预设"
-
-#: src/skins/preset-list.cc:424
-msgid "Delete auto-preset"
-msgstr "删除自动加载预设"
+#: src/skins-qt/menus.cc:75
+msgid "Open Folder ..."
+msgstr "打开文件夹 ..."
+
+#: src/skins-qt/menus.cc:159
+msgid "Add Folder ..."
+msgstr "添加文件夹 ..."
+
+#: src/skins-qt/search-select.cc:62 src/skins/search-select.cc:77
+msgid "Search entries in active playlist"
+msgstr "从当前播放列表中搜索条目"
+
+#: src/skins-qt/search-select.cc:70 src/skins/search-select.cc:83
+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-qt/search-select.cc:75 src/skins/search-select.cc:91
+msgid "Title:"
+msgstr "标题："
+
+#: src/skins-qt/search-select.cc:79 src/skins/search-select.cc:96
+msgid "Album:"
+msgstr "专辑："
+
+#: src/skins-qt/search-select.cc:82 src/skins/search-select.cc:101
+msgid "Artist:"
+msgstr "艺术家："
+
+#: src/skins-qt/search-select.cc:85 src/skins/search-select.cc:106
+msgid "File Name:"
+msgstr "文件名："
+
+#: src/skins-qt/search-select.cc:88 src/skins/search-select.cc:134
+msgid "Clear previous selection before searching"
+msgstr "搜索前清空之前的结果"
+
+#: src/skins-qt/search-select.cc:89 src/skins/search-select.cc:137
+msgid "Automatically toggle queue for matching entries"
+msgstr "自动为区配条目切换队列"
+
+#: src/skins-qt/search-select.cc:90 src/skins/search-select.cc:140
+msgid "Create a new playlist with matching entries"
+msgstr "用匹配的条目创建新的播放列表"
+
+#: src/skins-qt/search-select.cc:101 src/skins/search-select.cc:78
+msgid "Search"
+msgstr "搜索"
 
-#: src/skins/skins_cfg.cc:176
+#: src/skins-qt/skins_cfg.cc:198 src/skins/skins_cfg.cc:182
 msgid "Player:"
 msgstr "播放器："
 
-#: src/skins/skins_cfg.cc:178
+#: src/skins-qt/skins_cfg.cc:200 src/skins/skins_cfg.cc:184
 msgid "Select main player window font:"
-msgstr "选择主界面字体"
+msgstr "选择主界面字体："
 
-#: src/skins/skins_cfg.cc:179
+#: src/skins-qt/skins_cfg.cc:201 src/skins/skins_cfg.cc:185
 msgid "Playlist:"
 msgstr "播放列表："
 
-#: src/skins/skins_cfg.cc:181
+#: src/skins-qt/skins_cfg.cc:203 src/skins/skins_cfg.cc:187
 msgid "Select playlist font:"
 msgstr "选择播放列表字体："
 
-#: src/skins/skins_cfg.cc:187
+#: src/skins-qt/skins_cfg.cc:207 src/skins/skins_cfg.cc:191
 msgid "Skin"
 msgstr "皮肤"
 
-#: src/skins/skins_cfg.cc:189
+#: src/skins-qt/skins_cfg.cc:211 src/skins/skins_cfg.cc:193
+msgid "Display active titlebar when any window is focused"
+msgstr "当聚焦到任意窗口时显示活动的标题栏"
+
+#: src/skins-qt/skins_cfg.cc:213 src/skins/skins_cfg.cc:195
 msgid "Fonts"
 msgstr "字体"
 
-#: src/skins/skins_cfg.cc:192
+#: src/skins-qt/skins_cfg.cc:215 src/skins/skins_cfg.cc:197
 msgid "Use bitmap fonts (supports ASCII only)"
 msgstr "使用点阵字体（仅支持ASCII字符）"
 
-#: src/skins/skins_cfg.cc:194
+#: src/skins-qt/skins_cfg.cc:217 src/skins/skins_cfg.cc:199
 msgid "Scroll song title"
 msgstr "滚动曲目标题"
 
-#: src/skins/skins_cfg.cc:196
+#: src/skins-qt/skins_cfg.cc:219 src/skins/skins_cfg.cc:201
 msgid "Scroll song title in both directions"
 msgstr "来回滚动歌曲标题"
 
-#: src/skins/skins_cfg.cc:201
+#: src/skins-qt/skins_cfg.cc:224 src/skins/skins_cfg.cc:206
 msgid "Analyzer"
 msgstr "分析器"
 
-#: src/skins/skins_cfg.cc:202
+#: src/skins-qt/skins_cfg.cc:225 src/skins/skins_cfg.cc:207
 msgid "Scope"
 msgstr "示波器"
 
-#: src/skins/skins_cfg.cc:203
+#: src/skins-qt/skins_cfg.cc:226 src/skins/skins_cfg.cc:208
 msgid "Voiceprint / VU meter"
 msgstr "声纹 / VU 表"
 
-#: src/skins/skins_cfg.cc:204
+#: src/skins-qt/skins_cfg.cc:227 src/skins/skins_cfg.cc:209
 msgid "Off"
 msgstr "关闭"
 
-#: src/skins/skins_cfg.cc:208 src/skins/skins_cfg.cc:233
-#: src/skins/skins_cfg.cc:239
+#: src/skins-qt/skins_cfg.cc:231 src/skins-qt/skins_cfg.cc:256
+#: src/skins-qt/skins_cfg.cc:262 src/skins/skins_cfg.cc:213
+#: src/skins/skins_cfg.cc:238 src/skins/skins_cfg.cc:244
 msgid "Normal"
 msgstr "一般"
 
-#: src/skins/skins_cfg.cc:209 src/skins/skins_cfg.cc:234
+#: src/skins-qt/skins_cfg.cc:232 src/skins-qt/skins_cfg.cc:257
+#: src/skins/skins_cfg.cc:214 src/skins/skins_cfg.cc:239
 msgid "Fire"
 msgstr "火炎"
 
-#: src/skins/skins_cfg.cc:210
+#: src/skins-qt/skins_cfg.cc:233 src/skins/skins_cfg.cc:215
 msgid "Vertical lines"
 msgstr "竖线"
 
-#: src/skins/skins_cfg.cc:214
+#: src/skins-qt/skins_cfg.cc:237 src/skins/skins_cfg.cc:219
 msgid "Lines"
 msgstr "细线"
 
-#: src/skins/skins_cfg.cc:215
+#: src/skins-qt/skins_cfg.cc:238 src/skins/skins_cfg.cc:220
 msgid "Bars"
 msgstr "柱状"
 
-#: src/skins/skins_cfg.cc:219
+#: src/skins-qt/skins_cfg.cc:242 src/skins/skins_cfg.cc:224
 msgid "Slowest"
 msgstr "最慢"
 
-#: src/skins/skins_cfg.cc:220
+#: src/skins-qt/skins_cfg.cc:243 src/skins/skins_cfg.cc:225
 msgid "Slow"
 msgstr "慢"
 
-#: src/skins/skins_cfg.cc:221 src/sox-resampler/sox-resampler.cc:152
+#: src/skins-qt/skins_cfg.cc:244 src/skins/skins_cfg.cc:226
+#: src/soxr/sox-resampler.cc:180
 msgid "Medium"
 msgstr "中速"
 
-#: src/skins/skins_cfg.cc:222
+#: src/skins-qt/skins_cfg.cc:245 src/skins/skins_cfg.cc:227
 msgid "Fast"
 msgstr "快"
 
-#: src/skins/skins_cfg.cc:223
+#: src/skins-qt/skins_cfg.cc:246 src/skins/skins_cfg.cc:228
 msgid "Fastest"
 msgstr "最快"
 
-#: src/skins/skins_cfg.cc:227
+#: src/skins-qt/skins_cfg.cc:250 src/skins/skins_cfg.cc:232
 msgid "Dots"
 msgstr "点"
 
-#: src/skins/skins_cfg.cc:228
+#: src/skins-qt/skins_cfg.cc:251 src/skins/skins_cfg.cc:233
 msgid "Line"
 msgstr "线"
 
-#: src/skins/skins_cfg.cc:229
+#: src/skins-qt/skins_cfg.cc:252 src/skins/skins_cfg.cc:234
 msgid "Solid"
 msgstr "色块"
 
-#: src/skins/skins_cfg.cc:235
+#: src/skins-qt/skins_cfg.cc:258 src/skins/skins_cfg.cc:240
 msgid "Ice"
 msgstr "冷蓝"
 
-#: src/skins/skins_cfg.cc:240
+#: src/skins-qt/skins_cfg.cc:263 src/skins/skins_cfg.cc:245
 msgid "Smooth"
 msgstr "平滑"
 
-#: src/skins/skins_cfg.cc:244
-msgid "Type"
-msgstr "类型"
-
-#: src/skins/skins_cfg.cc:245
-msgid "Visualization type:"
-msgstr "可视化类型: "
-
-#: src/skins/skins_cfg.cc:248
-msgid "Analyzer"
-msgstr "分析器"
-
-#: src/skins/skins_cfg.cc:249
-msgid "Show peaks"
-msgstr "显示峰值"
-
-#: src/skins/skins_cfg.cc:251
+#: src/skins-qt/skins_cfg.cc:267 src/skins/skins_cfg.cc:249
 msgid "Coloring:"
-msgstr "上色: "
+msgstr "上色："
 
-#: src/skins/skins_cfg.cc:254
+#: src/skins-qt/skins_cfg.cc:270 src/skins/skins_cfg.cc:252
 msgid "Style:"
-msgstr "风格: "
+msgstr "风格："
 
-#: src/skins/skins_cfg.cc:257
+#: src/skins-qt/skins_cfg.cc:273 src/skins/skins_cfg.cc:255
 msgid "Falloff:"
-msgstr "减退: "
+msgstr "减退："
 
-#: src/skins/skins_cfg.cc:260
+#: src/skins-qt/skins_cfg.cc:276 src/skins/skins_cfg.cc:258
 msgid "Peak falloff:"
-msgstr "峰值减退速度: "
+msgstr "峰值减退速度："
 
-#: src/skins/skins_cfg.cc:264
+#: src/skins-qt/skins_cfg.cc:282 src/skins/skins_cfg.cc:264
 msgid "Scope Style:"
-msgstr "示波器风格: "
+msgstr "示波器风格："
 
-#: src/skins/skins_cfg.cc:267
+#: src/skins-qt/skins_cfg.cc:285 src/skins/skins_cfg.cc:267
 msgid "Voiceprint Coloring:"
-msgstr "声纹上色: "
+msgstr "声纹上色："
 
-#: src/skins/skins_cfg.cc:270
+#: src/skins-qt/skins_cfg.cc:288 src/skins/skins_cfg.cc:270
 msgid "VU Meter Style:"
-msgstr "VU 表风格: "
+msgstr "VU 表风格："
 
-#: src/skins/skins_cfg.cc:276
-msgid "General"
-msgstr "常规"
-
-#: src/skins/skins_cfg.cc:277
-msgid "Visualization"
-msgstr "可视化效果"
-
-#: src/skins/ui_equalizer.cc:282
-msgid "Preamp"
-msgstr "前置放大"
-
-#: src/skins/ui_equalizer.cc:286
-msgid "31 Hz"
-msgstr "31 赫兹"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "63 Hz"
-msgstr "63 赫兹"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "125 Hz"
-msgstr "125 赫兹"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "250 Hz"
-msgstr "250 赫兹"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "500 Hz"
-msgstr "200 赫兹"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "1 kHz"
-msgstr "1000 赫兹"
-
-#: src/skins/ui_equalizer.cc:288
-msgid "2 kHz"
-msgstr "2000 赫兹"
-
-#: src/skins/ui_equalizer.cc:288
-msgid "4 kHz"
-msgstr "4000 赫兹"
-
-#: src/skins/ui_equalizer.cc:288
-msgid "8 kHz"
-msgstr "8000 赫兹"
-
-#: src/skins/ui_equalizer.cc:288
-msgid "16 kHz"
-msgstr "16000 赫兹"
-
-#: src/skins/ui_equalizer.cc:330
-msgid "Audacious Equalizer"
-msgstr "Audacious均衡器"
-
-#: src/skins/ui_main.cc:688
-#, c-format
-msgid "Seek to %d:%-2.2d / %d:%-2.2d"
-msgstr "查找： %d:%-2.2d/%d:%-2.2d"
-
-#: src/skins/ui_main.cc:709
-#, c-format
-msgid "Volume: %d%%"
-msgstr "音量：%d%%"
-
-#: src/skins/ui_main.cc:732
-#, c-format
-msgid "Balance: %d%% left"
-msgstr "平衡：%d%% 左"
-
-#: src/skins/ui_main.cc:734
-msgid "Balance: center"
-msgstr "平衡：中间"
-
-#: src/skins/ui_main.cc:736
-#, c-format
-msgid "Balance: %d%% right"
-msgstr "平衡：%d%% 右"
-
-#: src/skins/ui_main.cc:842
-msgid "Options Menu"
-msgstr "选项菜单"
+#: src/skins-qt/skins_cfg.cc:294 src/skins/skins_cfg.cc:276
+msgid "Type"
+msgstr "类型"
 
-#: src/skins/ui_main.cc:846
-msgid "Disable 'Always On Top'"
-msgstr "禁用“顶置窗口”"
+#: src/skins-qt/skins_cfg.cc:295 src/skins/skins_cfg.cc:277
+msgid "Visualization type:"
+msgstr "可视化类型："
 
-#: src/skins/ui_main.cc:848
-msgid "Enable 'Always On Top'"
-msgstr "启用“顶置窗口”"
+#: src/skins-qt/skins_cfg.cc:298 src/skins/skins_cfg.cc:280
+msgid "Analyzer"
+msgstr "分析器"
 
-#: src/skins/ui_main.cc:851
-msgid "File Info Box"
-msgstr "文件信息"
+#: src/skins-qt/skins_cfg.cc:299 src/skins/skins_cfg.cc:281
+msgid "Show peaks"
+msgstr "显示峰值"
 
-#: src/skins/ui_main.cc:857
-msgid "Visualizations"
+#: src/skins-qt/skins_cfg.cc:308 src/skins/skins_cfg.cc:290
+msgid "Visualization"
 msgstr "可视化效果"
 
-#: src/skins/ui_main.cc:1336
-msgid "Repeat point A set."
-msgstr "重复点 A 已设置。"
-
-#: src/skins/ui_main.cc:1341
-msgid "Repeat point B set."
-msgstr "重复点 B 已设置。"
-
-#: src/skins/ui_main.cc:1350
-msgid "Repeat points cleared."
-msgstr "重复点已清除。"
-
-#: src/skins/ui_playlist.cc:219
-msgid "Search entries in active playlist"
-msgstr "从当前播放列表中搜索条目"
-
-#: src/skins/ui_playlist.cc:226
-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.cc:234
-msgid "Title:"
-msgstr "标题："
-
-#: src/skins/ui_playlist.cc:241
-msgid "Album:"
-msgstr "专辑："
-
-#: src/skins/ui_playlist.cc:248
-msgid "Artist:"
-msgstr "艺术家："
-
-#: src/skins/ui_playlist.cc:255
-msgid "File Name:"
-msgstr "文件名："
-
-#: src/skins/ui_playlist.cc:263
-msgid "Clear previous selection before searching"
-msgstr "搜索前清空之前的结果"
-
-#: src/skins/ui_playlist.cc:266
-msgid "Automatically toggle queue for matching entries"
-msgstr "自动为区配条目切换队列"
-
-#: src/skins/ui_playlist.cc:269
-msgid "Create a new playlist with matching entries"
-msgstr "用匹配的条目创建新的播放列表"
-
-#: src/skins/ui_playlist.cc:717
-msgid "Audacious Playlist Editor"
-msgstr "Audacious播放列表编辑器"
-
-#: src/skins/ui_playlist.cc:752
-#, c-format
-msgid "%s (%d of %d)"
-msgstr "%s (%d of %d)"
-
-#: src/skins/ui_skinselector.cc:167
+#: src/skins-qt/skinselector.cc:98 src/skins/skinselector.cc:111
 msgid "Archived Winamp 2.x skin"
 msgstr "已打包的Winamp 2.x主题"
 
-#: src/skins/ui_skinselector.cc:172
+#: src/skins-qt/skinselector.cc:102 src/skins/skinselector.cc:115
 msgid "Unarchived Winamp 2.x skin"
 msgstr "未打包的Winamp 2.x主题"
 
-#: src/skins/util.cc:430
-#, c-format
-msgid "Could not create directory (%s): %s\n"
-msgstr "无法创建目录(%s)：%s\n"
-
-#: src/sndfile/plugin.cc:39
+#: src/sndfile/plugin.cc:38
 msgid "Sndfile Plugin"
 msgstr "Sndfile 插件"
 
-#: src/sndfile/plugin.cc:336
+#: src/sndfile/plugin.cc:372
 msgid ""
 "Based on the xmms_sndfile plugin:\n"
 "Copyright (C) 2000, 2002 Erik de Castro Lopo\n"
@@ -3960,107 +4186,111 @@
 "this program; if not, write to the Free Software Foundation, Inc., 51 "
 "Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 
-#: src/sndio-ng/sndio.cc:44
+#: src/sndio/sndio.cc:43
 msgid "Sndio Output"
 msgstr "Sndio 输出"
 
-#: src/sndio-ng/sndio.cc:98
+#: src/sndio/sndio.cc:98
 msgid "Device (blank for default):"
 msgstr "设备(默认为空)："
 
-#: src/sndio-ng/sndio.cc:100
+#: src/sndio/sndio.cc:100
 msgid "Save and restore volume:"
 msgstr "保存并恢复音量："
 
-#: src/sndio-ng/sndio.cc:181
+#: src/sndio/sndio.cc:181
 #, c-format
 msgid "Sndio error: Unsupported audio format (%d)"
 msgstr "Sndio 错误：不支持音频格式(%d)"
 
-#: src/sndio-ng/sndio.cc:192
+#: src/sndio/sndio.cc:192
 msgid "Sndio error: sio_open() failed"
 msgstr "Sndio 错误： sio_open() failed"
 
-#: src/sndio-ng/sndio.cc:222
+#: src/sndio/sndio.cc:221
 msgid "Sndio error: sio_setpar() failed"
 msgstr "Sndio 错误： sio_setpar() failed"
 
-#: src/sndio-ng/sndio.cc:234
+#: src/sndio/sndio.cc:233
 msgid "Sndio error: sio_start() failed"
 msgstr "Sndio 错误： sio_start() failed"
 
-#: src/song_change/song_change.cc:33
+#: src/songchange/song_change.cc:30
 msgid "Song Change"
 msgstr "歌曲改变"
 
-#: src/song_change/song_change.cc:342
-msgid ""
-"Parameters passed to the shell should be encapsulated in "
-"quotes. Doing otherwise is a security risk."
-msgstr ""
-"传递到Shell的参数一定要用引号包围，否则会是一件相当危险的"
-"事。"
-
-#: src/song_change/song_change.cc:358
+#: src/songchange/song_change.cc:256
 msgid "Commands"
 msgstr "命令"
 
-#: src/song_change/song_change.cc:360
+#: src/songchange/song_change.cc:258
 msgid "Command to run when starting a new song:"
 msgstr "开始播放新歌曲时运行命令："
 
-#: src/song_change/song_change.cc:364
+#: src/songchange/song_change.cc:261
+msgid "Command to run when stopping a song:"
+msgstr ""
+
+#: src/songchange/song_change.cc:264
 msgid "Command to run at the end of a song:"
 msgstr "歌曲结束播放时运行命令："
 
-#: src/song_change/song_change.cc:368
+#: src/songchange/song_change.cc:267
 msgid "Command to run at the end of the playlist:"
 msgstr "播放列表结束时运行命令："
 
-#: src/song_change/song_change.cc:372
+#: src/songchange/song_change.cc:270
 msgid "Command to run when song title changes (for network streams):"
 msgstr "歌曲标题改变时运行命令(用于网络流媒体)："
 
-#: src/song_change/song_change.cc:376
+#: src/songchange/song_change.cc:273
 msgid ""
-"You can use the following format strings which will be substituted before "
-"calling the command (not all are useful for the end-of-playlist command):\n"
-"\n"
-"%F: Frequency (in hertz)\n"
+"You can use the following format codes, which will be replaced before "
+"running the command.\n"
+"Not all are useful though for the song-stopped or end-of-playlist command."
+msgstr ""
+
+#: src/songchange/song_change.cc:276
+msgid ""
+"%a: Artist\n"
+"%b: Album\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"
+"%F: Frequency (Hertz)\n"
+"%l: Length (milliseconds)\n"
+"%n or %s: Formatted title (see playlist settings)\n"
 "%p: Currently playing (1 or 0)\n"
-"%a: Artist\n"
-"%b: Album\n"
-"%T: Track title"
+"%r: Rate (bits per second)\n"
+"%t: Playlist position\n"
+"%T: Title (unformatted)"
 msgstr ""
-"你可以使用下列格式的替代符 (并非所有都适用于“播放列表结束后执行命令”):\n"
-"\n"
-"%F: 频率 (Hz)\n"
-"%c: 声道数\n"
-"%f: 文件名 (完整路径)\n"
-"%l: 长度 (毫秒)\n"
-"%n 或 %s: 歌曲名\n"
-"%r: 比特率 (每秒比特数)\n"
-"%t: 播放列表位置 (%02d)\n"
-"%p: 当前正在播放(1 或 0)\n"
 "%a: 艺术家\n"
 "%b: 专辑\n"
-"%T: 曲目标题"
+"%c: 频道数\n"
+"%f: 文件名（完整路径）\n"
+"%F: 频率（赫兹）\n"
+"%l: 长度（毫秒）\n"
+"%n or %s: 经过格式化的标题（参见播放列表设置）\n"
+"%p: 是否正在播放（1 或 0）\n"
+"%r: 编码率（比特每秒）\n"
+"%t: 播放列表位置\n"
+"%T: 标题（未经格式化）"
+
+#: src/songchange/song_change.cc:287
+msgid ""
+"Parameters passed to the shell should be enclosed in quotation marks.\n"
+"Unquoted parameters may lead to unexpected results."
+msgstr ""
+
+#: src/song-info-qt/song-info.cc:30
+msgid "Song Info"
+msgstr "歌曲信息"
 
-#: src/song-info-qt/song-info.cc:32
-msgid "Song Info (Qt)"
-msgstr "歌曲信息 (Qt)"
-
-#: src/sox-resampler/sox-resampler.cc:44
+#: src/soxr/sox-resampler.cc:44
 msgid "SoX Resampler"
 msgstr "SoX 重采样器"
 
-#: src/sox-resampler/sox-resampler.cc:144
+#: src/soxr/sox-resampler.cc:172
 msgid ""
 "SoX Resampler Plugin for Audacious\n"
 "Copyright 2013 Michał Lipski\n"
@@ -4074,95 +4304,143 @@
 "基于取样率转换器插件:\n"
 "Copyright 2010-2012 John Lindgren"
 
-#: src/sox-resampler/sox-resampler.cc:150
+#: src/soxr/sox-resampler.cc:178
 msgid "Quick"
 msgstr "快速"
 
-#: src/sox-resampler/sox-resampler.cc:151
+#: src/soxr/sox-resampler.cc:179
 msgid "Low"
 msgstr "低"
 
-#: src/sox-resampler/sox-resampler.cc:153
+#: src/soxr/sox-resampler.cc:181
 msgid "High"
 msgstr "高"
 
-#: src/sox-resampler/sox-resampler.cc:154
+#: src/soxr/sox-resampler.cc:182
 msgid "Very High"
 msgstr "非常高"
 
-#: src/sox-resampler/sox-resampler.cc:158
+#: src/soxr/sox-resampler.cc:183
+msgid "Ultra High"
+msgstr "非常高"
+
+#: src/soxr/sox-resampler.cc:187
+msgid "Minimum"
+msgstr "最小限度"
+
+#: src/soxr/sox-resampler.cc:188
+msgid "Intermediate"
+msgstr "中间"
+
+#: src/soxr/sox-resampler.cc:193
 msgid "Quality:"
-msgstr "音质: "
+msgstr "音质："
+
+#: src/soxr/sox-resampler.cc:196
+msgid "Phase:"
+msgstr "相位："
 
-#: src/speed-pitch/speed-pitch.cc:51
+#: src/soxr/sox-resampler.cc:200
+msgid "Allow aliasing"
+msgstr "允许别名"
+
+#: src/soxr/sox-resampler.cc:202
+msgid "Use steep filter"
+msgstr "使用陡峭过滤器"
+
+#: src/speedpitch/speed-pitch.cc:54
 msgid "Speed and Pitch"
 msgstr "速度和音调"
 
-#: src/speed-pitch/speed-pitch.cc:210
-msgid "Speed and Pitch"
-msgstr "速度和音调"
-
-#: src/speed-pitch/speed-pitch.cc:211
-msgid "Speed:"
-msgstr "速度："
-
-#: src/speed-pitch/speed-pitch.cc:214
-msgid "Pitch:"
-msgstr "音调："
+#: src/speedpitch/speed-pitch.cc:247
+msgid "Speed"
+msgstr "速度"
+
+#: src/speedpitch/speed-pitch.cc:248
+msgid "Decouple from pitch"
+msgstr "从音调解开"
+
+#: src/speedpitch/speed-pitch.cc:250 src/speedpitch/speed-pitch.cc:258
+msgid "Multiplier:"
+msgstr "乘数："
+
+#: src/speedpitch/speed-pitch.cc:254
+msgid "Pitch"
+msgstr "音调"
 
-#: src/statusicon/statusicon.cc:47
+#: src/statusicon-qt/statusicon.cc:45 src/statusicon/statusicon.cc:47
 msgid "Status Icon"
 msgstr "状态图标"
 
-#: src/statusicon/statusicon.cc:283
-msgid "Se_ttings ..."
-msgstr "设置... (_t)"
-
-#: src/statusicon/statusicon.cc:372
+#: src/statusicon-qt/statusicon.cc:68
 msgid ""
-"Status Icon Plugin\n"
+"Status Icon Plugin (partial port for Qt interface)\n"
 "\n"
 "Copyright 2005-2007 Giacomo Lozito <james@develia.org>\n"
 "Copyright 2010 Michał Lipski <tallica@o2.pl>\n"
+"Copyright 2015 Eugene Paskevich <eugene@raptor.kiev.ua>\n"
 "\n"
 "This plugin provides a status icon, placed in\n"
 "the system tray area of the window manager."
 msgstr ""
-"状态图标插件\n"
+"状态图标插件 \n"
 "\n"
 "Copyright 2005-2007 Giacomo Lozito <james@develia.org>\n"
 "Copyright 2010 Michał Lipski <tallica@o2.pl>\n"
+"Copyright 2015 Eugene Paskevich <eugene@raptor.kiev.ua>\n"
 "\n"
-"此插件提供一个状态图标，放置于系统托盘位置。"
+"此插件提供一个状态图标，\n"
+"位于系统窗口管理器的托盘中。"
 
-#: src/statusicon/statusicon.cc:379
+#: src/statusicon-qt/statusicon.cc:89 src/statusicon/statusicon.cc:384
 msgid "Mouse Scroll Action"
 msgstr "鼠标滚轮动作"
 
-#: src/statusicon/statusicon.cc:380
+#: src/statusicon-qt/statusicon.cc:90 src/statusicon/statusicon.cc:385
 msgid "Change volume"
 msgstr "调整音量"
 
-#: src/statusicon/statusicon.cc:383
+#: src/statusicon-qt/statusicon.cc:93 src/statusicon/statusicon.cc:388
 msgid "Change playing song"
 msgstr "改变歌曲"
 
-#: src/statusicon/statusicon.cc:386
+#: src/statusicon-qt/statusicon.cc:96 src/statusicon/statusicon.cc:391
 msgid "Other Settings"
 msgstr "其他设置"
 
-#: src/statusicon/statusicon.cc:387
+#: src/statusicon-qt/statusicon.cc:97 src/statusicon/statusicon.cc:392
 msgid "Disable the popup window"
 msgstr "禁用弹出窗口"
 
-#: src/statusicon/statusicon.cc:389
+#: src/statusicon-qt/statusicon.cc:99 src/statusicon/statusicon.cc:394
 msgid "Close to the system tray"
-msgstr "关闭系统托盘"
+msgstr "关闭至系统托盘"
 
-#: src/statusicon/statusicon.cc:391
+#: src/statusicon-qt/statusicon.cc:101 src/statusicon/statusicon.cc:396
 msgid "Advance in playlist when scrolling upward"
 msgstr "向上卷动时显示在播放列表顶部"
 
+#: src/statusicon-qt/statusicon.cc:116 src/statusicon/statusicon.cc:287
+msgid "Se_ttings ..."
+msgstr "设置... (_t)"
+
+#: src/statusicon/statusicon.cc:377
+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"
+"Copyright 2005-2007 Giacomo Lozito <james@develia.org>\n"
+"Copyright 2010 Michał Lipski <tallica@o2.pl>\n"
+"\n"
+"此插件提供一个状态图标，放置于系统托盘位置。"
+
 #: src/stereo_plugin/stereo.cc:19
 msgid "Extra Stereo"
 msgstr "Extra Stereo"
@@ -4175,26 +4453,166 @@
 msgstr ""
 "Extra Stereo 插件\n"
 "\n"
-"作者: Johan Levin 1999."
+"作者: Johan Levin 1999"
 
 #: src/stereo_plugin/stereo.cc:44
 msgid "Extra Stereo"
 msgstr "Extra Stereo"
 
+#: src/streamtuner/icecast-model.cc:126 src/streamtuner/shoutcast-model.cc:131
+msgid "Type"
+msgstr "类型"
+
+#: src/streamtuner/icecast-model.cc:132
+msgid "Current Song"
+msgstr "当前歌曲"
+
+#: src/streamtuner/icecast-model.cc:164
+msgid "Other"
+msgstr "其他"
+
+#: src/streamtuner/ihr-model.cc:63
+msgid "Market"
+msgstr "市场"
+
+#: src/streamtuner/ihr-model.cc:156
+msgid "Call Letters"
+msgstr "通话信"
+
+#: src/streamtuner/ihr-model.cc:162
+msgid "Description"
+msgstr "描述"
+
+#: src/streamtuner/shoutcast-model.cc:128
+msgid "Listeners"
+msgstr "听众"
+
+#: src/streamtuner/shoutcast-model.cc:188
+msgid "Top 500 Stations"
+msgstr "Top 500 站"
+
+#: src/streamtuner/shoutcast-model.cc:189
+msgid "Alternative"
+msgstr "另类"
+
+#: src/streamtuner/shoutcast-model.cc:190
+msgid "Blues"
+msgstr "蓝调"
+
+#: src/streamtuner/shoutcast-model.cc:191
+msgid "Classical"
+msgstr "古典"
+
+#: src/streamtuner/shoutcast-model.cc:192
+msgid "Country"
+msgstr "乡村音乐"
+
+#: src/streamtuner/shoutcast-model.cc:193
+msgid "Decades"
+msgstr "年代"
+
+#: src/streamtuner/shoutcast-model.cc:194
+msgid "Easy Listening"
+msgstr "轻音乐"
+
+#: src/streamtuner/shoutcast-model.cc:195
+msgid "Electronic"
+msgstr "电子"
+
+#: src/streamtuner/shoutcast-model.cc:196
+msgid "Folk"
+msgstr "民谣"
+
+#: src/streamtuner/shoutcast-model.cc:197
+msgid "Inspirational"
+msgstr "励志"
+
+#: src/streamtuner/shoutcast-model.cc:198
+msgid "International"
+msgstr "国际"
+
+#: src/streamtuner/shoutcast-model.cc:199
+msgid "Jazz"
+msgstr "爵士"
+
+#: src/streamtuner/shoutcast-model.cc:200
+msgid "Latin"
+msgstr "拉丁"
+
+#: src/streamtuner/shoutcast-model.cc:201
+msgid "Metal"
+msgstr "金属"
+
+#: src/streamtuner/shoutcast-model.cc:203
+msgid "New Age"
+msgstr "新世纪"
+
+#: src/streamtuner/shoutcast-model.cc:204
+msgid "Pop"
+msgstr "流行"
+
+#: src/streamtuner/shoutcast-model.cc:205
+msgid "Public Radio"
+msgstr "公共广播"
+
+#: src/streamtuner/shoutcast-model.cc:206
+msgid "R&B and Urban"
+msgstr "R&B 和 Urban"
+
+#: src/streamtuner/shoutcast-model.cc:207
+msgid "Rap"
+msgstr "说唱"
+
+#: src/streamtuner/shoutcast-model.cc:208
+msgid "Reggae"
+msgstr "雷盖舞曲"
+
+#: src/streamtuner/shoutcast-model.cc:209
+msgid "Rock"
+msgstr "摇滚"
+
+#: src/streamtuner/shoutcast-model.cc:210
+msgid "Seasonal and Holiday"
+msgstr "季节性和假日"
+
+#: src/streamtuner/shoutcast-model.cc:211
+msgid "Soundtracks"
+msgstr "原声带"
+
+#: src/streamtuner/shoutcast-model.cc:212
+msgid "Talk"
+msgstr "声谈"
+
+#: src/streamtuner/shoutcast-model.cc:213
+msgid "Themes"
+msgstr "主题"
+
+#: src/streamtuner/streamtuner.cc:59
+msgid "Shoutcast"
+msgstr "网络广播 (Shoutcast)"
+
+#: src/streamtuner/streamtuner.cc:60
+msgid "Icecast"
+msgstr "语音广播 (Icecast)"
+
+#: src/streamtuner/streamtuner.cc:71
+msgid "Stream Tuner"
+msgstr "流调谐器"
+
 #: src/tonegen/tonegen.cc:45
 msgid "Tone Generator"
 msgstr "Tone Generator"
 
-#: src/tonegen/tonegen.cc:94
+#: src/tonegen/tonegen.cc:92
 #, c-format
 msgid "%s %.1f Hz"
 msgstr "%s %.1f Hz"
 
-#: src/tonegen/tonegen.cc:94
+#: src/tonegen/tonegen.cc:92
 msgid "Tone Generator: "
 msgstr "音调生成器: "
 
-#: src/tonegen/tonegen.cc:160
+#: src/tonegen/tonegen.cc:161
 msgid ""
 "Sine tone generator by Håvard Kvålen <havardk@xmms.org>\n"
 "Modified by Daniel J. Peng <danielpeng@bigfoot.com>\n"
@@ -4208,11 +4626,32 @@
 "要使用这个生成器，添加一个 URL：tone://frequency1;frequency2;frequency3;...\n"
 "实例 tone://2000;2005 以播放一个 2000 Hz 以及 2005 Hz 的音调"
 
+#: src/ui-common/dialogs-qt.cc:40
+msgid ""
+"\n"
+"(Further messages have been hidden.)"
+msgstr ""
+"\n"
+"（详细信息已隐藏。）"
+
+#: src/ui-common/dialogs-qt.cc:52
+msgid "Working ..."
+msgstr "工作中 ..."
+
+#: src/ui-common/dialogs-qt.cc:73
+msgid "Information"
+msgstr "信息"
+
+#: src/ui-common/menu-ops-gtk.cc:132 src/ui-common/menu-ops-qt.cc:113
+#, c-format
+msgid "%s does not appear to be a valid folder."
+msgstr "%s 似乎不是有效的文件夹。"
+
 #: src/voice_removal/voice_removal.cc:28
 msgid "Voice Removal"
 msgstr "人声消除"
 
-#: src/vorbis/vorbis.cc:465
+#: src/vorbis/vorbis.cc:433
 msgid ""
 "Audacious Ogg Vorbis Decoder\n"
 "\n"
@@ -4254,12 +4693,12 @@
 msgid "Ogg Vorbis Decoder"
 msgstr "Ogg Vorbis 解码器"
 
-#: src/vtx/info.cc:22
+#: src/vtx/info.cc:24
 #, c-format
 msgid "Details about %s"
 msgstr "%s 的细节"
 
-#: src/vtx/info.cc:24
+#: src/vtx/info.cc:26
 msgid ""
 "Title: %t\n"
 "Author: %a\n"
@@ -4289,7 +4728,7 @@
 msgid "VTX Decoder"
 msgstr "VTX 解码器"
 
-#: src/vtx/vtx.cc:184
+#: src/vtx/vtx.cc:178
 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"
@@ -4299,40 +4738,104 @@
 "基于 Roman Sherbakov <v_soft@microfor.ru> 制作的 in_vtx.dll\n"
 "Audacious 插件作者为 Pavel Vymetalek <pvymetalek@seznam.cz>"
 
-#: src/wavpack/wavpack.cc:24
+#: src/vumeter-qt/vumeter_qt.cc:31
+msgid ""
+"VU Meter Plugin for Audacious\n"
+"Copyright 2017-2019 Marc Sánchez Fauste"
+msgstr ""
+"Audacious VU 表插件 \n"
+"版权所有 2017-2019 Marc Sánchez Fauste"
+
+#: src/vumeter-qt/vumeter_qt.cc:35
+msgid "VU Meter Settings"
+msgstr "VU 表设置"
+
+#: src/vumeter-qt/vumeter_qt.cc:37
+msgid "Peak hold time:"
+msgstr "峰值保持时间："
+
+#: src/vumeter-qt/vumeter_qt.cc:42
+msgid "Fall-off time:"
+msgstr "下降时间："
+
+#: src/vumeter-qt/vumeter_qt.cc:44
+msgid "dB/second"
+msgstr "分贝/秒"
+
+#: src/vumeter-qt/vumeter_qt.cc:46
+msgid "Display legend"
+msgstr "显示图例"
+
+#: src/vumeter-qt/vumeter_qt.h:37
+msgid "VU Meter"
+msgstr "VU 表"
+
+#: src/waveout/waveout.cc:43
+msgid "Win32 waveOut"
+msgstr "Win32 waveOut"
+
+#: src/waveout/waveout.cc:69
+msgid ""
+"Win32 waveOut Plugin for Audacious\n"
+"Copyright 2016 John Lindgren"
+msgstr ""
+"用于 Audacious 的 Win32 waveOut 插件\n"
+"版权所有 2016 John Lindgren"
+
+#: src/wavpack/wavpack.cc:25
 msgid "WavPack Decoder"
 msgstr "WavPack 解码器"
 
-#: src/wavpack/wavpack.cc:211
+#: src/wavpack/wavpack.cc:217
 msgid "lossy (hybrid)"
 msgstr "有损的 (混合)"
 
-#: src/wavpack/wavpack.cc:213
+#: src/wavpack/wavpack.cc:219
 msgid "lossy"
 msgstr "有损的"
 
-#: src/wavpack/wavpack.cc:255
+#: src/wavpack/wavpack.cc:259
 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"
+"版权所有 2006 William Pitcock <nenolod@nenolod.net>\n"
 "\n"
 "一部分插件代码由 Miles Egan 编写。"
 
-#: src/xsf/plugin.cc:50
+#: src/xsf/plugin.cc:74
 msgid "2SF Decoder"
 msgstr "2SF 解码器"
 
-#: src/xsf/plugin.cc:238
+#: src/xsf/plugin.cc:429
+msgid "32728 Hz"
+msgstr "32728 赫兹"
+
+#: src/xsf/plugin.cc:432
+msgid "65456 Hz"
+msgstr "65456 赫兹"
+
+#: src/xsf/plugin.cc:438
+msgid "Cosine"
+msgstr "余弦"
+
+#: src/xsf/plugin.cc:439
+msgid "Sharp"
+msgstr "尖波"
+
+#: src/xsf/plugin.cc:443
 msgid "XSF Configuration"
 msgstr "XSF 设置"
 
-#: src/xsf/plugin.cc:239
-msgid "Ignore length from file"
-msgstr "忽略文件长度"
+#: src/xsf/plugin.cc:445
+msgid "Default fade time:"
+msgstr "默认淡出时间："
+
+#: src/xsf/plugin.cc:447
+msgid "Interpolation mode:"
+msgstr "插值模式："
 
-#: src/xspf/xspf.cc:89
+#: src/xspf/xspf.cc:95
 msgid "XML Shareable Playlists (XSPF)"
 msgstr "可分享的 XML 播放列表 (XSPF)"

audacious-plugins-3.6.2-gtk3.tar.bz2/po/zh_TW.po -> audacious-plugins-4.4.1.tar.bz2/po/zh_TW.po Changed

@@ -3,16 +3,20 @@
 # This file is distributed under the same license as the Audacious Plugins package.
 #
 # Translators:
-# Ruei-Yuan Lu <rueiyuan.lu@gmail.com>, 2014
+# pan93412 <pan93412@gmail.com>, 2019
+# 盧瑞元（R. Y. Lu） <rueiyuan.lu@gmail.com>, 2014
 # Ruei-Yuan Lu <RueiYuan.Lu@gmail.com>, 2011
+# 盧瑞元（R. Y. Lu） <rueiyuan.lu@gmail.com>, 2020
+# 盧瑞元（R. Y. Lu） <rueiyuan.lu@gmail.com>, 2016-2017,2019
 msgid ""
 msgstr ""
 "Project-Id-Version: Audacious Plugins\n"
-"Report-Msgid-Bugs-To: http://redmine.audacious-media-player.org/\n"
-"POT-Creation-Date: 2015-02-28 19:18+0100\n"
-"PO-Revision-Date: 2015-02-25 03:48+0000\n"
-"Last-Translator: Ruei-Yuan Lu <rueiyuan.lu@gmail.com>\n"
-"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/"
+"Report-Msgid-Bugs-To: https://github.com/audacious-media-player/audacious/"
+"issues\n"
+"POT-Creation-Date: 2024-09-26 21:54+0200\n"
+"PO-Revision-Date: 2011-10-10 17:43+0000\n"
+"Last-Translator: 盧瑞元（R. Y. Lu） <rueiyuan.lu@gmail.com>, 2020\n"
+"Language-Team: Chinese (Taiwan) (http://app.transifex.com/audacious/"
 "audacious/language/zh_TW/)\n"
 "Language: zh_TW\n"
 "MIME-Version: 1.0\n"
@@ -20,288 +24,60 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: src/aac-raw/aac.cc:18
+#: src/aac/aac.cc:19
 msgid "AAC (Raw) Decoder"
 msgstr "AAC (Raw) 解碼器"
 
-#: src/adplug/adplug-xmms.cc:42
+#: src/adplug/adplug-xmms.cc:70
 msgid "AdPlug (AdLib Player)"
 msgstr "AdPlug (AdLib 播放器)"
 
-#: src/adplug/adplug-xmms.cc:156 src/modplug/modplugbmp.cc:335
-#: src/psf/plugin.cc:138 src/vtx/vtx.cc:87 src/xsf/plugin.cc:113
+#: src/adplug/adplug-xmms.cc:167 src/modplug/modplugbmp.cc:321
+#: src/psf/plugin.cc:161 src/vtx/vtx.cc:89 src/xsf/plugin.cc:204
 msgid "sequenced"
 msgstr "編曲機"
 
-#: src/alarm/alarm.cc:55 src/alarm/interface.cc:82
-msgid "Alarm"
-msgstr "鬧鐘"
-
-#: src/alarm/alarm.cc:782
-msgid "Set Alarm ..."
-msgstr "設定鬧鐘 ..."
-
-#: src/alarm/alarm.cc:810
-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/interface.cc: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.cc: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.cc: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.cc:81
-msgid "This is your wakeup call."
-msgstr "這是您的喚醒。"
-
-#: src/alarm/interface.cc:99
-msgid "Your reminder for today is..."
-msgstr "您今天的提醒"
-
-#: src/alarm/interface.cc:101 src/alarm/interface.cc:386
-msgid "Reminder"
-msgstr "提醒"
-
-#: src/alarm/interface.cc:132
-msgid "Monday"
-msgstr "星期一"
-
-#: src/alarm/interface.cc:132
-msgid "Tuesday"
-msgstr "星期二"
-
-#: src/alarm/interface.cc:132
-msgid "Wednesday"
-msgstr "星期三"
-
-#: src/alarm/interface.cc:133
-msgid "Thursday"
-msgstr "星期四"
-
-#: src/alarm/interface.cc:133
-msgid "Friday"
-msgstr "星期五"
-
-#: src/alarm/interface.cc:133
-msgid "Saturday"
-msgstr "星期六"
-
-#: src/alarm/interface.cc:133
-msgid "Sunday"
-msgstr "星期日"
-
-#: src/alarm/interface.cc:171 src/alarm/interface.cc:230
-#: src/alarm/interface.cc:245
-msgid "Time"
-msgstr "時間"
-
-#: src/alarm/interface.cc:178
-msgid "Alarm at (default):"
-msgstr "鈴響於 (預設)"
-
-#: src/alarm/interface.cc:200
-msgid "h"
-msgstr "h"
-
-#: src/alarm/interface.cc:203
-msgid "Quiet after:"
-msgstr "多久後靜音："
-
-#: src/alarm/interface.cc:215
-msgid "hours"
-msgstr "小時"
-
-#: src/alarm/interface.cc:226
-msgid "minutes"
-msgstr "分鐘"
-
-#: src/alarm/interface.cc:235
-msgid "Choose the days for the alarm to come on"
-msgstr "選擇想要在哪幾天啟用鬧鐘"
-
-#: src/alarm/interface.cc:242
-msgid "Day"
-msgstr "哪幾天"
-
-#: src/alarm/interface.cc:259 src/bs2b/plugin.cc:130
-#: src/skins/preset-list.cc:434 src/skins/preset-list.cc:440
-msgid "Default"
-msgstr "預設"
-
-#: src/alarm/interface.cc:288
-msgid "Days"
-msgstr "週排程"
-
-#: src/alarm/interface.cc:297
-msgid "Fading"
-msgstr "淡出"
-
-#: src/alarm/interface.cc:305 src/console/plugin.cc:41
-#: src/crossfade/crossfade.cc:53 src/crossfade/crossfade.cc:59
-#: src/gtkui/settings.cc:49 src/lirc/lirc.cc:397 src/sid/xs_config.cc:85
-#: src/sid/xs_config.cc:94 src/sid/xs_config.cc:103
-msgid "seconds"
-msgstr "秒"
+#: src/adplug/adplug-xmms.cc:349 src/sid/xs_config.cc:61
+msgid "Output"
+msgstr "輸出"
 
-#: src/alarm/interface.cc:312 src/alarm/interface.cc:353
-msgid "Volume"
-msgstr "音量"
-
-#: src/alarm/interface.cc:317
-msgid "Start at"
-msgstr "初始音量"
-
-#: src/alarm/interface.cc:333
-msgid "Final"
-msgstr "最終音量"
-
-#: src/alarm/interface.cc:346
-msgid "Current"
-msgstr "目前音量"
-
-#: src/alarm/interface.cc:359
-msgid "Additional Command"
-msgstr "額外命令"
+#: src/adplug/adplug-xmms.cc:350
+msgid "OPL Emulator:"
+msgstr "OPL 模擬器："
+
+#: src/adplug/adplug-xmms.cc:353 src/amidiplug/i_configure.cc:153
+#: src/console/plugin.cc:45 src/filewriter/filewriter.cc:481
+#: src/sid/xs_config.cc:65 src/xsf/plugin.cc:446
+msgid "Sample rate:"
+msgstr "取樣率："
 
-#: src/alarm/interface.cc:365 src/alarm/interface.cc:391
-msgid "enable"
-msgstr "啟用"
+#: src/adplug/adplug-xmms.cc:354 src/amidiplug/i_configure.cc:155
+#: src/bs2b/plugin.cc:141 src/console/plugin.cc:47
+#: src/modplug/plugin_main.cc:77 src/resample/resample.cc:201
+#: src/resample/resample.cc:207 src/resample/resample.cc:211
+#: src/resample/resample.cc:215 src/resample/resample.cc:219
+#: src/resample/resample.cc:223 src/resample/resample.cc:227
+#: src/resample/resample.cc:231 src/resample/resample.cc:235
+#: src/resample/resample.cc:239 src/resample/resample.cc:243
+#: src/sid/xs_config.cc:67 src/soxr/sox-resampler.cc:205
+msgid "Hz"
+msgstr "Hz"
 
-#: src/alarm/interface.cc:372
-msgid "Playlist (optional)"
-msgstr "播放清單 (選用)"
-
-#: src/alarm/interface.cc:379
-msgid "Select a playlist"
-msgstr "請選擇播放清單"
-
-#: src/alarm/interface.cc:399
-msgid "Options"
-msgstr "選項"
-
-#: src/alarm/interface.cc:404
-msgid "What do these options mean?"
-msgstr "這些選項代表什麼意思？"
+#: src/adplug/adplug-xmms.cc:355 src/gtkui/settings.cc:55
+#: src/modplug/plugin_main.cc:105 src/qtui/settings.cc:85
+#: src/skins-qt/skins_cfg.cc:302 src/skins/skins_cfg.cc:284
+msgid "Miscellaneous"
+msgstr "其他選項"
 
-#: src/alarm/interface.cc:420
-msgid "Help"
-msgstr "說明"
+#: src/adplug/adplug-xmms.cc:356
+msgid "Repeat song in endless loop"
+msgstr "無限地重複播放歌曲"
 
-#: src/albumart/albumart.cc:31
+#: src/albumart/albumart.cc:31 src/albumart-qt/albumart.cc:35
 msgid "Album Art"
 msgstr "專輯封面"
 
-#: src/albumart-qt/albumart.cc:33
-msgid "Album Art (Qt)"
-msgstr "專輯封面 (Qt)"
-
-#: src/alsa/alsa.h:70
+#: src/alsa/alsa.h:64
 msgid "ALSA Output"
 msgstr "ALSA 輸出"
 
@@ -343,11 +119,11 @@
 msgid "Mixer element:"
 msgstr "混音器元件："
 
-#: src/amidi-plug/amidi-plug.cc:41
+#: src/amidiplug/amidi-plug.cc:42
 msgid "AMIDI-Plug (MIDI Player)"
 msgstr "AMIDI-Plug (MIDI 播放器)"
 
-#: src/amidi-plug/amidi-plug.cc:437
+#: src/amidiplug/amidi-plug.cc:445
 msgid ""
 "AMIDI-Plug\n"
 "modular MIDI music player\n"
@@ -389,157 +165,161 @@
 "Tony Vroon\n"
 "for the good help with alpha testing"
 
-#: src/amidi-plug/i_configure.cc:94
+#: src/amidiplug/i_configure.cc:94
 msgid "Override default gain:"
 msgstr "覆載預設的增益值："
 
-#: src/amidi-plug/i_configure.cc:102
+#: src/amidiplug/i_configure.cc:102
 msgid "Override default polyphony:"
 msgstr "覆載預設的同時發音數："
 
-#: src/amidi-plug/i_configure.cc:110
+#: src/amidiplug/i_configure.cc:110
 msgid "Override default reverb:"
 msgstr "覆載預設的殘響強度："
 
-#: src/amidi-plug/i_configure.cc:112 src/amidi-plug/i_configure.cc:120
+#: src/amidiplug/i_configure.cc:112 src/amidiplug/i_configure.cc:120
 msgid "On"
 msgstr "啟用"
 
-#: src/amidi-plug/i_configure.cc:118
+#: src/amidiplug/i_configure.cc:118
 msgid "Override default chorus:"
 msgstr "覆載預設和聲強度："
 
-#: src/amidi-plug/i_configure.cc:128 src/console/plugin.cc:29
+#: src/amidiplug/i_configure.cc:128 src/console/plugin.cc:29
 msgid "Playback"
 msgstr "播放"
 
-#: src/amidi-plug/i_configure.cc:129
+#: src/amidiplug/i_configure.cc:129
 msgid "Transpose:"
 msgstr "移調："
 
-#: src/amidi-plug/i_configure.cc:131
+#: src/amidiplug/i_configure.cc:131 src/speedpitch/speed-pitch.cc:257
 msgid "semitones"
 msgstr "半音"
 
-#: src/amidi-plug/i_configure.cc:132
+#: src/amidiplug/i_configure.cc:132
 msgid "Drum shift:"
 msgstr "鼓移："
 
-#: src/amidi-plug/i_configure.cc:134
+#: src/amidiplug/i_configure.cc:134
 msgid "note numbers"
 msgstr "音符數量"
 
-#: src/amidi-plug/i_configure.cc:135
+#: src/amidiplug/i_configure.cc:135
 msgid "Skip leading silence"
 msgstr "跳過開頭的靜音"
 
-#: src/amidi-plug/i_configure.cc:137
+#: src/amidiplug/i_configure.cc:137
 msgid "Skip trailing silence"
 msgstr "跳過結尾的靜音"
 
-#: src/amidi-plug/i_configure.cc:141
+#: src/amidiplug/i_configure.cc:141
 msgid "SoundFont"
 msgstr "SoundFont"
 
-#: src/amidi-plug/i_configure.cc:143
+#: src/amidiplug/i_configure.cc:148
 msgid "Synthesizer"
 msgstr "合成器"
 
-#: src/amidi-plug/i_configure.cc:148 src/console/plugin.cc:45
-#: src/sid/xs_config.cc:65
-msgid "Sample rate:"
-msgstr "取樣率："
-
-#: src/amidi-plug/i_configure.cc:150 src/bs2b/plugin.cc:141
-#: src/console/plugin.cc:47 src/modplug/plugin_main.cc:78
-#: src/resample/resample.cc:201 src/resample/resample.cc:207
-#: src/resample/resample.cc:211 src/resample/resample.cc:215
-#: src/resample/resample.cc:219 src/resample/resample.cc:223
-#: src/resample/resample.cc:227 src/resample/resample.cc:231
-#: src/resample/resample.cc:235 src/resample/resample.cc:239
-#: src/resample/resample.cc:243 src/sid/xs_config.cc:67
-#: src/sox-resampler/sox-resampler.cc:163
-msgid "Hz"
-msgstr "Hz"
-
-#: src/amidi-plug/i_configure-fluidsynth.cc:52
+#: src/amidiplug/i_configure-fluidsynth.cc:58
+#: src/amidiplug/i_configure-fluidsynth.cc:527
 msgid "AMIDI-Plug - select SoundFont file"
 msgstr "AMIDI-Plug - 選擇 SoundFont 檔案"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:55 src/filewriter/mp3.cc:658
+#: src/amidiplug/i_configure-fluidsynth.cc:61
 msgid "_Cancel"
 msgstr "取消(_C)"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:56
+#: src/amidiplug/i_configure-fluidsynth.cc:62
 msgid "_Open"
 msgstr "開啟(_O)"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:225 src/gtkui/columns.cc:46
+#: src/amidiplug/i_configure-fluidsynth.cc:233
+#: src/amidiplug/i_configure-fluidsynth.cc:461
 msgid "File name"
 msgstr "檔案名稱"
 
-#: src/amidi-plug/i_configure-fluidsynth.cc:229
+#: src/amidiplug/i_configure-fluidsynth.cc:237
+#: src/amidiplug/i_configure-fluidsynth.cc:464
 msgid "Size (bytes)"
 msgstr "大小 (位元組)"
 
-#: src/amidi-plug/i_fileinfo.cc:163
+#: src/amidiplug/i_fileinfo.cc:184
 msgid "Name:"
 msgstr "名稱："
 
-#: src/amidi-plug/i_fileinfo.cc:181
+#: src/amidiplug/i_fileinfo.cc:202
 msgid " MIDI Info "
 msgstr " MIDI 資訊 "
 
-#: src/amidi-plug/i_fileinfo.cc:195
+#: src/amidiplug/i_fileinfo.cc:216
 msgid "Format:"
 msgstr "格式："
 
-#: src/amidi-plug/i_fileinfo.cc:198
+#: src/amidiplug/i_fileinfo.cc:219
 msgid "Length (msec):"
 msgstr "長度 (毫秒)："
 
-#: src/amidi-plug/i_fileinfo.cc:201
+#: src/amidiplug/i_fileinfo.cc:222
 msgid "No. of Tracks:"
 msgstr "音軌編號："
 
-#: src/amidi-plug/i_fileinfo.cc:207
+#: src/amidiplug/i_fileinfo.cc:228
 msgid "variable"
 msgstr "變動的"
 
-#: src/amidi-plug/i_fileinfo.cc:209
+#: src/amidiplug/i_fileinfo.cc:230
 msgid "BPM:"
 msgstr "BPM："
 
-#: src/amidi-plug/i_fileinfo.cc:217
+#: src/amidiplug/i_fileinfo.cc:238
 msgid "BPM (wavg):"
 msgstr "BPM (wavg)："
 
-#: src/amidi-plug/i_fileinfo.cc:220
+#: src/amidiplug/i_fileinfo.cc:241
 msgid "Time Div:"
 msgstr "時間分割："
 
-#: src/amidi-plug/i_fileinfo.cc:231
+#: src/amidiplug/i_fileinfo.cc:252
 msgid " MIDI Comments and Lyrics "
 msgstr " MIDI 備註與歌詞 "
 
-#: src/amidi-plug/i_fileinfo.cc:278
+#: src/amidiplug/i_fileinfo.cc:299
 msgid "* no comments available in this MIDI file *"
 msgstr "* 這個 MIDI 檔不包含備註資料 *"
 
-#: src/amidi-plug/i_fileinfo.cc:290
+#: src/amidiplug/i_fileinfo.cc:311
 msgid "* no lyrics available in this MIDI file *"
 msgstr "* 這個 MIDI 檔不包含歌詞資料 *"
 
-#: src/amidi-plug/i_fileinfo.cc:300 src/filewriter/vorbis.cc:197
-#: src/ladspa/plugin.cc:416
+#: src/amidiplug/i_fileinfo.cc:321 src/ladspa/plugin.cc:418
+#: src/ui-common/dialogs-qt.cc:32
 msgid "_Close"
 msgstr "關閉(_C)"
 
-#: src/amidi-plug/i_fileinfo.cc:325
+#: src/amidiplug/i_fileinfo.cc:346
 msgid " (invalid UTF-8)"
 msgstr " (無效的 UTF-8 字串)"
 
-#: src/aosd/aosd.cc:32
+#: src/ampache/ampache.cc:33
+msgid "Ampache Browser"
+msgstr "Ampache 瀏覽器"
+
+#: src/ampache/ampache.cc:46
+msgid ""
+"Ampache Browser for Audacious\n"
+"http://ampache-browser.org/\n"
+"\n"
+"Copyright (C) Róbert Čerňanský and John Lindgren\n"
+"License: GNU GPLv3"
+msgstr ""
+"Ampache Browser for Audacious\n"
+"http://ampache-browser.org/\n"
+"\n"
+"Copyright (C) Róbert Čerňanský and John Lindgren\n"
+"License: GNU GPLv3"
+
+#: src/aosd/aosd.cc:31
 msgid ""
 "Audacious OSD\n"
 "http://www.develia.org/projects.php?p=audacious#aosd\n"
@@ -573,130 +353,130 @@
 msgid "Concave Rectangle"
 msgstr "角落凹陷的矩形"
 
-#: src/aosd/aosd_style.cc:69
+#: src/aosd/aosd_style.cc:69 src/openmpt/mptwrap.h:50 src/xsf/plugin.cc:436
 msgid "None"
 msgstr "無"
 
-#: src/aosd/aosd_trigger.cc:50
+#: src/aosd/aosd_trigger.cc:49
 msgid "Playback Start"
 msgstr "開始播放"
 
-#: src/aosd/aosd_trigger.cc:51
+#: src/aosd/aosd_trigger.cc:50
 msgid "Triggers OSD when a playlist entry is played."
 msgstr "當播放清單中的項目被播放時觸發 OSD"
 
-#: src/aosd/aosd_trigger.cc:56
+#: src/aosd/aosd_trigger.cc:55
 msgid "Title Change"
 msgstr "標題變更"
 
-#: src/aosd/aosd_trigger.cc:57
+#: src/aosd/aosd_trigger.cc:56
 msgid "Triggers OSD when the song title changes (for internet streams)."
 msgstr "歌曲標題改變時顯示 OSD (網路串流用)。"
 
-#: src/aosd/aosd_trigger.cc:62
+#: src/aosd/aosd_trigger.cc:61
 msgid "Pause On"
 msgstr "暫停播放"
 
-#: src/aosd/aosd_trigger.cc:63
+#: src/aosd/aosd_trigger.cc:62
 msgid "Triggers OSD when playback is paused."
 msgstr "當播放暫停時觸發 OSD"
 
-#: src/aosd/aosd_trigger.cc:68
+#: src/aosd/aosd_trigger.cc:67
 msgid "Pause Off"
 msgstr "解除暫停"
 
-#: src/aosd/aosd_trigger.cc:69
+#: src/aosd/aosd_trigger.cc:68
 msgid "Triggers OSD when playback is unpaused."
 msgstr "當解除暫停時觸發 OSD"
 
-#: src/aosd/aosd_ui.cc:163
+#: src/aosd/aosd_ui.cc:204
 msgid "Placement"
 msgstr "放置位置"
 
-#: src/aosd/aosd_ui.cc:196
+#: src/aosd/aosd_ui.cc:241
 msgid "Relative X offset:"
 msgstr "X 軸相對位移："
 
-#: src/aosd/aosd_ui.cc:203
+#: src/aosd/aosd_ui.cc:245
 msgid "Relative Y offset:"
 msgstr "Y 軸相對位移："
 
-#: src/aosd/aosd_ui.cc:210
+#: src/aosd/aosd_ui.cc:249
 msgid "Max OSD width:"
 msgstr "最大 OSD 寬度："
 
-#: src/aosd/aosd_ui.cc:221
+#: src/aosd/aosd_ui.cc:281
 msgid "Multi-Monitor options"
 msgstr "多螢幕選項"
 
-#: src/aosd/aosd_ui.cc:225
+#: src/aosd/aosd_ui.cc:285
 msgid "Display OSD using:"
 msgstr "顯示 OSD："
 
-#: src/aosd/aosd_ui.cc:227
+#: src/aosd/aosd_ui.cc:287
 msgid "all monitors"
 msgstr "所有螢幕"
 
-#: src/aosd/aosd_ui.cc:230
+#: src/aosd/aosd_ui.cc:290
 #, c-format
 msgid "monitor %i"
 msgstr "螢幕 %i"
 
-#: src/aosd/aosd_ui.cc:282
+#: src/aosd/aosd_ui.cc:342
 msgid "Timing (ms)"
 msgstr "計時 (毫秒)"
 
-#: src/aosd/aosd_ui.cc:287
+#: src/aosd/aosd_ui.cc:347
 msgid "Display:"
 msgstr "顯示："
 
-#: src/aosd/aosd_ui.cc:292
+#: src/aosd/aosd_ui.cc:352
 msgid "Fade in:"
 msgstr "淡入："
 
-#: src/aosd/aosd_ui.cc:297
+#: src/aosd/aosd_ui.cc:357
 msgid "Fade out:"
 msgstr "淡出："
 
-#: src/aosd/aosd_ui.cc:361
+#: src/aosd/aosd_ui.cc:442
 msgid "Fonts"
 msgstr "字型"
 
-#: src/aosd/aosd_ui.cc:368
+#: src/aosd/aosd_ui.cc:449
 #, c-format
 msgid "Font %i:"
 msgstr "字型 %i："
 
-#: src/aosd/aosd_ui.cc:382
+#: src/aosd/aosd_ui.cc:466
 msgid "Shadow"
 msgstr "陰影"
 
-#: src/aosd/aosd_ui.cc:486
+#: src/aosd/aosd_ui.cc:589
 msgid "Render Style"
 msgstr "呈現樣式"
 
-#: src/aosd/aosd_ui.cc:502
+#: src/aosd/aosd_ui.cc:605
 msgid "Colors"
 msgstr "顏色"
 
-#: src/aosd/aosd_ui.cc:513
+#: src/aosd/aosd_ui.cc:616
 #, c-format
 msgid "Color %i:"
 msgstr "顏色 %i："
 
-#: src/aosd/aosd_ui.cc:600
+#: src/aosd/aosd_ui.cc:714
 msgid "Enable trigger"
 msgstr "啟用觸發器"
 
-#: src/aosd/aosd_ui.cc:627
+#: src/aosd/aosd_ui.cc:741
 msgid "Event"
 msgstr "事件"
 
-#: src/aosd/aosd_ui.cc:655
+#: src/aosd/aosd_ui.cc:768
 msgid "Composite manager detected"
 msgstr "已偵測到合成特效管理程式"
 
-#: src/aosd/aosd_ui.cc:662
+#: src/aosd/aosd_ui.cc:775
 msgid ""
 "Composite manager not detected;\n"
 "unless you know that you have one running, please activate a composite "
@@ -705,60 +485,56 @@
 "未偵測到合成特效管理程式；\n"
 "除非您確定已經執行，否則 OSD 將無法正確啟用。"
 
-#: src/aosd/aosd_ui.cc:670
+#: src/aosd/aosd_ui.cc:783
 msgid "Composite manager not required for fake transparency"
 msgstr "假的透明特效不需要 Composite manager"
 
-#: src/aosd/aosd_ui.cc:706
+#: src/aosd/aosd_ui.cc:820
 msgid "Transparency"
 msgstr "透明"
 
-#: src/aosd/aosd_ui.cc:712
+#: src/aosd/aosd_ui.cc:826
 msgid "Fake transparency"
 msgstr "假的透明特效"
 
-#: src/aosd/aosd_ui.cc:714
+#: src/aosd/aosd_ui.cc:828
 msgid "Real transparency (requires X Composite Ext.)"
 msgstr "真的透明特效 (需要 X Composite 延伸功能)"
 
-#: src/aosd/aosd_ui.cc:756
+#: src/aosd/aosd_ui.cc:875
 msgid "Composite extension not loaded"
 msgstr "Composite 延伸功能未載入"
 
-#: src/aosd/aosd_ui.cc:764
-msgid "Composite extension not available"
-msgstr "Composite 延伸功能不存在"
-
-#: src/aosd/aosd_ui.cc:781
+#: src/aosd/aosd_ui.cc:892
 #, c-format
 msgid "Audacious OSD"
 msgstr "Audacious OSD"
 
-#: src/aosd/aosd_ui.cc:844
+#: src/aosd/aosd_ui.cc:955
 msgid "Position"
 msgstr "位置"
 
-#: src/aosd/aosd_ui.cc:849
+#: src/aosd/aosd_ui.cc:960
 msgid "Animation"
 msgstr "動畫"
 
-#: src/aosd/aosd_ui.cc:854
+#: src/aosd/aosd_ui.cc:965
 msgid "Text"
 msgstr "文字"
 
-#: src/aosd/aosd_ui.cc:859
+#: src/aosd/aosd_ui.cc:970
 msgid "Decoration"
 msgstr "裝飾"
 
-#: src/aosd/aosd_ui.cc:864
+#: src/aosd/aosd_ui.cc:975
 msgid "Trigger"
 msgstr "觸發"
 
-#: src/aosd/aosd_ui.cc:869
+#: src/aosd/aosd_ui.cc:980 src/streamtuner/shoutcast-model.cc:202
 msgid "Misc"
 msgstr "雜項"
 
-#: src/aosd/aosd_ui.cc:878
+#: src/aosd/aosd_ui.cc:989
 msgid "Test"
 msgstr "測試"
 
@@ -774,11 +550,83 @@
 msgid "Audacious Playlists (audpl)"
 msgstr "Audacious 播放清單 (audpl)"
 
-#: src/blur_scope/blur_scope.cc:42
+#: src/background_music/background_music.cc:24
+msgid "Background music"
+msgstr ""
+
+#: src/background_music/background_music.cc:25
+msgid "Target level:"
+msgstr ""
+
+#: src/background_music/background_music.cc:28
+#: src/background_music/background_music.cc:33
+#: src/silence-removal/silence-removal.cc:70
+msgid "dB"
+msgstr "dB"
+
+#: src/background_music/background_music.cc:29
+msgid "Maximum amplification:"
+msgstr ""
+
+#: src/background_music/background_music.cc:34 src/mpg123/mpg123.cc:81
+msgid "Advanced"
+msgstr "進階"
+
+#: src/background_music/background_music.cc:36
+msgid "Slow detection weight:"
+msgstr ""
+
+#: src/background_music/background_music.cc:39
+msgid "Hint"
+msgstr ""
+
+#: src/background_music/background_music.cc:41
+msgid ""
+"Slow detection weight is the relative weight\n"
+"of a long term average detection when compared\n"
+"to the actual, faster loudness detection.\n"
+"A value of zero gives a more radio-like sound\n"
+"where soft passages get \"pulled up\" more quickly,\n"
+"a value of two makes the sound feel less compressed."
+msgstr ""
+
+#: src/background_music/background_music.cc:52
+msgid ""
+"Background Music Plugin for Audacious\n"
+"Copyright 2023;2024 Michel Fleur\n"
+"\n"
+"Controls the volume to make the sound equally loud within and between "
+"tracks.\n"
+" It uses accurate loudness measurement and tries to make the volume changes "
+"sound natural without audible peaks, yet without lowering the volume before "
+"a peak in advance."
+msgstr ""
+
+#: src/background_music/background_music.cc:61
+msgid "Background Music"
+msgstr ""
+
+#: src/bitcrusher/bitcrusher.cc:33
+msgid "Bitcrusher"
+msgstr ""
+
+#: src/bitcrusher/bitcrusher.cc:34
+msgid "Bit Depth:"
+msgstr ""
+
+#: src/bitcrusher/bitcrusher.cc:37
+msgid "Downsample ratio:"
+msgstr ""
+
+#: src/bitcrusher/bitcrusher.cc:48
+msgid "Bitcrusher"
+msgstr ""
+
+#: src/blur_scope/blur_scope.cc:40 src/blur_scope-qt/blur_scope.cc:45
 msgid "Color"
 msgstr "色彩"
 
-#: src/blur_scope/blur_scope.cc:58
+#: src/blur_scope/blur_scope.cc:56 src/blur_scope-qt/blur_scope.cc:158
 msgid "Blur Scope"
 msgstr "模糊波形"
 
@@ -788,7 +636,11 @@
 
 #: src/bs2b/plugin.cc:129
 msgid "Presets:"
-msgstr "樣式"
+msgstr "預設集："
+
+#: src/bs2b/plugin.cc:130
+msgid "Default"
+msgstr "預設"
 
 #: src/bs2b/plugin.cc:136
 msgid "Feed level:"
@@ -802,15 +654,15 @@
 msgid "Cut frequency:"
 msgstr "截斷頻率："
 
-#: src/cairo-spectrum/cairo-spectrum.cc:41
+#: src/cairo-spectrum/cairo-spectrum.cc:42 src/qt-spectrum/qt-spectrum.cc:107
 msgid "Spectrum Analyzer"
 msgstr "頻譜分析儀"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:72
+#: src/cdaudio/cdaudio-ng.cc:74
 msgid "Audio CD Plugin"
 msgstr "音樂 CD 外掛"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:121
+#: src/cdaudio/cdaudio-ng.cc:121
 msgid ""
 "Copyright (C) 2007-2012 Calin Crisan <ccrisan@gmail.com> and others.\n"
 "\n"
@@ -830,132 +682,132 @@
 "\n"
 "This was a Google Summer of Code 2007 project."
 
-#: src/cdaudio-ng/cdaudio-ng.cc:137
+#: src/cdaudio/cdaudio-ng.cc:140
 msgid "Device"
 msgstr "裝置"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:138
+#: src/cdaudio/cdaudio-ng.cc:141
 msgid "Read speed:"
 msgstr "讀取速度："
 
-#: src/cdaudio-ng/cdaudio-ng.cc:141
+#: src/cdaudio/cdaudio-ng.cc:144
 msgid "Override device:"
 msgstr "覆載裝置："
 
-#: src/cdaudio-ng/cdaudio-ng.cc:143
+#: src/cdaudio/cdaudio-ng.cc:146
 msgid "Metadata"
 msgstr "詮釋資料"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:144
+#: src/cdaudio/cdaudio-ng.cc:147
 msgid "Use CD-Text"
 msgstr "使用 CD-Text"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:146
+#: src/cdaudio/cdaudio-ng.cc:150
 msgid "Use CDDB"
 msgstr "使用 CDDB"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:148
+#: src/cdaudio/cdaudio-ng.cc:152
 msgid "Use HTTP instead of CDDBP"
 msgstr "使用 HTTP 而非 CDDBP"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:151
+#: src/cdaudio/cdaudio-ng.cc:155
 msgid "Server:"
 msgstr "伺服器："
 
-#: src/cdaudio-ng/cdaudio-ng.cc:155
+#: src/cdaudio/cdaudio-ng.cc:159
 msgid "Path:"
 msgstr "路徑："
 
-#: src/cdaudio-ng/cdaudio-ng.cc:159
+#: src/cdaudio/cdaudio-ng.cc:163
 msgid "Port:"
 msgstr "連接埠："
 
-#: src/cdaudio-ng/cdaudio-ng.cc:246
+#: src/cdaudio/cdaudio-ng.cc:228
 msgid "Failed to initialize cdio subsystem."
 msgstr "無法初始化 cdio 子系統。"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:281
+#: src/cdaudio/cdaudio-ng.cc:260
 #, c-format
 msgid "Invalid URI %s."
 msgstr "無效的 URI %s。"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:283
+#: src/cdaudio/cdaudio-ng.cc:262
 #, c-format
 msgid "Track %d not found."
 msgstr "找不到音軌 %d。"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:285
+#: src/cdaudio/cdaudio-ng.cc:264
 #, c-format
 msgid "Track %d is a data track."
 msgstr "軌道 %d 是資料軌。"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:360
+#: src/cdaudio/cdaudio-ng.cc:339
 msgid "Error reading audio CD."
 msgstr "讀取音樂 CD 時發生錯誤。"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:429
+#: src/cdaudio/cdaudio-ng.cc:410
 msgid "Audio CD"
 msgstr "音樂 CD"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:460 src/cdaudio-ng/cdaudio-ng.cc:469
+#: src/cdaudio/cdaudio-ng.cc:446 src/cdaudio/cdaudio-ng.cc:455
 #, c-format
 msgid "Failed to open CD device %s."
 msgstr "無法開啟 CD 裝置 %s。"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:472
+#: src/cdaudio/cdaudio-ng.cc:458
 msgid "No audio capable CD drive found."
 msgstr "找不到可以播放音訊的光碟機。"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:497
+#: src/cdaudio/cdaudio-ng.cc:481
+msgid "Drive is empty."
+msgstr "光碟機是空的。"
+
+#: src/cdaudio/cdaudio-ng.cc:483
+msgid "Unsupported disk type."
+msgstr "未支援的光碟類型"
+
+#: src/cdaudio/cdaudio-ng.cc:507
 msgid "Failed to finish initializing opened CD drive."
 msgstr "開啟的光碟機無法完成初始化。"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:510
+#: src/cdaudio/cdaudio-ng.cc:520
 msgid "Failed to retrieve first/last track number."
 msgstr "無法取得第一個或最後的音軌編號。"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:531
+#: src/cdaudio/cdaudio-ng.cc:541
 #, c-format
 msgid "Cannot read start/end LSN for track %d."
 msgstr "無法讀取音軌 %d 的起始／結束邏輯磁區編號。"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:613
-msgid "Failed to create the cddb connection."
-msgstr "無法建立 cddb 的連線。"
+#: src/cdaudio/cdaudio-ng.cc:624
+msgid "Failed to create the CDDB connection."
+msgstr "無法建立 CDDB 的連線。"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:679
+#: src/cdaudio/cdaudio-ng.cc:690
 msgid "Failed to query the CDDB server"
 msgstr "無法查詢 CDDB 伺服器"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:681
+#: src/cdaudio/cdaudio-ng.cc:692
 #, c-format
 msgid "Failed to query the CDDB server: %s"
 msgstr "無法查詢 CDDB 伺服器：%s"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:705
+#: src/cdaudio/cdaudio-ng.cc:716
 #, c-format
-msgid "Failed to read the cddb info: %s"
-msgstr "無法讀取 cddb 資訊：%s"
+msgid "Failed to read the CDDB info: %s"
+msgstr "無法讀取 CDDB 資訊：%s"
 
-#: src/cdaudio-ng/cdaudio-ng.cc:765
-msgid "Drive is empty."
-msgstr "光碟機是空的。"
-
-#: src/cdaudio-ng/cdaudio-ng.cc:767
-msgid "Unsupported disk type."
-msgstr "未支援的光碟類型"
-
-#: src/cd-menu-items/cd-menu-items.cc:35
+#: src/cd-menu-items/cd-menu-items.cc:33
 msgid "Audio CD Menu Items"
 msgstr "音樂 CD 選單項目"
 
-#: src/cd-menu-items/cd-menu-items.cc:47
-msgid "Play CD"
-msgstr "播放 CD"
-
-#: src/cd-menu-items/cd-menu-items.cc:47
-msgid "Add CD"
-msgstr "加入 CD"
+#: src/cd-menu-items/cd-menu-items.cc:45
+msgid "Pla_y CD"
+msgstr "播放 CD(_Y)"
+
+#: src/cd-menu-items/cd-menu-items.cc:45
+msgid "_Add CD"
+msgstr "加入 CD(_A)"
 
 #: src/compressor/compressor.cc:45
 msgid "Compression"
@@ -1013,7 +865,14 @@
 msgid "Default song length:"
 msgstr "預設歌曲長度："
 
-#: src/console/plugin.cc:42 src/modplug/plugin_main.cc:59
+#: src/console/plugin.cc:41 src/crossfade/crossfade.cc:56
+#: src/crossfade/crossfade.cc:62 src/lirc/lirc.cc:395 src/notify/notify.cc:113
+#: src/sid/xs_config.cc:85 src/sid/xs_config.cc:94 src/sid/xs_config.cc:103
+#: src/vumeter-qt/vumeter_qt.cc:39
+msgid "seconds"
+msgstr "秒"
+
+#: src/console/plugin.cc:42 src/modplug/plugin_main.cc:58
 msgid "Resampling"
 msgstr "重取樣"
 
@@ -1037,29 +896,39 @@
 msgid "Game Console Music Decoder"
 msgstr "遊戲主機音樂解碼器"
 
-#: src/coreaudio/coreaudio.cc:50
+#: src/coreaudio/coreaudio.cc:53
 msgid "CoreAudio output"
 msgstr "CoreAudio 輸出"
 
-#: src/coreaudio/coreaudio.cc:131
+#: src/coreaudio/coreaudio.cc:155
 msgid ""
 "CoreAudio Output Plugin for Audacious\n"
 "Copyright 2014 William Pitcock\n"
+"Copyright 2017,18 René J.V. Bertin\n"
+" (original code and code adapted from\n"
+" Apple examples, (C) Apple 2013)\n"
 "\n"
 "Based on SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
 msgstr ""
 "CoreAudio Output Plugin for Audacious\n"
 "Copyright 2014 William Pitcock\n"
+"Copyright 2017,18 René J.V. Bertin\n"
+" (original code and code adapted from\n"
+" Apple examples, (C) Apple 2013)\n"
 "\n"
 "Based on SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
 
-#: src/coreaudio/coreaudio.cc:143
+#: src/coreaudio/coreaudio.cc:171
 msgid "Use exclusive mode"
 msgstr "使用獨占模式"
 
-#: src/crossfade/crossfade.cc:44
+#: src/coreaudio/coreaudio.cc:173
+msgid "Use bit perfect audio (adapt device sampling rate)"
+msgstr "使用 bit perfect 音訊（配合裝置的取樣率）"
+
+#: src/crossfade/crossfade.cc:47
 msgid ""
 "Crossfade Plugin for Audacious\n"
 "Copyright 2010-2014 John Lindgren"
@@ -1067,53 +936,52 @@
 "Crossfade Plugin for Audacious\n"
 "Copyright 2010-2014 John Lindgren"
 
-#: src/crossfade/crossfade.cc:48
+#: src/crossfade/crossfade.cc:51
 msgid "Crossfade"
 msgstr "淡入淡出"
 
-#: src/crossfade/crossfade.cc:49
+#: src/crossfade/crossfade.cc:52
 msgid "On automatic song change"
 msgstr "自動切換歌曲時"
 
-#: src/crossfade/crossfade.cc:51 src/crossfade/crossfade.cc:57
+#: src/crossfade/crossfade.cc:54 src/crossfade/crossfade.cc:60
 msgid "Overlap:"
 msgstr "重疊："
 
-#: src/crossfade/crossfade.cc:55
+#: src/crossfade/crossfade.cc:58
 msgid "On seek or manual song change"
 msgstr "跳轉或手動切換歌曲時"
 
-#: src/crossfade/crossfade.cc:61
+#: src/crossfade/crossfade.cc:64
+msgid "No fade in"
+msgstr ""
+
+#: src/crossfade/crossfade.cc:66
+msgid "Use S-curve fade"
+msgstr ""
+
+#: src/crossfade/crossfade.cc:68
+msgid "S-curve steepness:"
+msgstr ""
+
+#: src/crossfade/crossfade.cc:70
+msgid "(higher is steeper)"
+msgstr ""
+
+#: src/crossfade/crossfade.cc:72
 msgid "Tip"
 msgstr "提示"
 
-#: src/crossfade/crossfade.cc:62
+#: src/crossfade/crossfade.cc:73
 msgid ""
 "For better crossfading, enable\n"
 "the Silence Removal effect."
 msgstr "為了有較佳的效果，請一併啟用移除靜音。"
 
-#: src/crossfade/crossfade.cc:72
+#: src/crossfade/crossfade.cc:83
 msgid "Crossfade"
 msgstr "淡入淡出"
 
-#: src/crossfade/crossfade.cc:161
-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.cc:168
-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/crystalizer/crystalizer.cc:31
 msgid "Crystalizer"
 msgstr "Crystalizer"
@@ -1126,60 +994,61 @@
 msgid "Crystalizer"
 msgstr "Crystalizer"
 
-#: src/cue/cue.cc:37
+#: src/cue/cue.cc:42
 msgid "Cue Sheet Plugin"
 msgstr "Cue Sheet 外掛"
 
-#: src/delete-files/delete-files.cc:46 src/delete-files/delete-files.cc:146
+#: src/delete-files/delete-files.cc:53 src/delete-files/delete-files.cc:215
+#: src/delete-files/delete-files.cc:230
 msgid "Delete Files"
 msgstr "刪除檔案"
 
-#: src/delete-files/delete-files.cc:75
+#: src/delete-files/delete-files.cc:120
+msgid "No files are selected."
+msgstr "尚未選擇檔案。"
+
+#: src/delete-files/delete-files.cc:125
 #, c-format
-msgid "Error moving %s to trash: %s."
-msgstr "移動「%s」到垃圾桶時發生錯誤：%s。"
+msgid "Do you want to move %s to the trash?"
+msgstr "您確定要將 %s 移動到垃圾桶嗎？"
 
-#: src/delete-files/delete-files.cc:86
+#: src/delete-files/delete-files.cc:126
 #, c-format
-msgid "Error deleting %s: %s."
-msgstr "刪除「%s」時發生錯誤：%s。"
+msgid "Do you want to permanently delete %s?"
+msgstr "您確定要永久地刪除 %s ？"
 
-#: src/delete-files/delete-files.cc:117
+#: src/delete-files/delete-files.cc:133
 #, c-format
-msgid "Error deleting %s: not a local file."
-msgstr "刪除「%s」時發生錯誤：這不是本機檔案。"
+msgid "Do you want to move %d files to the trash?"
+msgstr "您確定要將這 %d 個檔案移動到垃圾桶嗎？"
 
 #: src/delete-files/delete-files.cc:134
-msgid "Do you want to move the selected files to the trash?"
-msgstr "您確定要將選擇的檔案移動到垃圾桶嗎？"
+#, c-format
+msgid "Do you want to permanently delete %d files?"
+msgstr "您確定要永久地刪除這 %d 個檔案嗎？"
 
-#: src/delete-files/delete-files.cc:135
-msgid "Move to Trash"
+#: src/delete-files/delete-files.cc:146
+msgid "Move to trash"
 msgstr "移動到垃圾桶"
 
-#: src/delete-files/delete-files.cc:140
-msgid "Do you want to permanently delete the selected files?"
-msgstr "您確定要永久地刪除選擇的檔案嗎？"
-
-#: src/delete-files/delete-files.cc:141 src/skins/preset-list.cc:411
-#: src/skins/preset-list.cc:427
+#: src/delete-files/delete-files.cc:146
 msgid "Delete"
 msgstr "刪除"
 
-#: src/delete-files/delete-files.cc:145 src/skins/preset-browser.cc:56
-#: src/skins/preset-list.cc:307 src/skins/ui_playlist.cc:221
+#: src/delete-files/delete-files.cc:213 src/delete-files/delete-files.cc:235
+#: src/skins-qt/search-select.cc:102 src/skins/search-select.cc:78
 msgid "Cancel"
 msgstr "取消"
 
-#: src/delete-files/delete-files.cc:166
+#: src/delete-files/delete-files.cc:267
 msgid "Delete Selected Files"
 msgstr "刪除選擇的檔案"
 
-#: src/delete-files/delete-files.cc:181
+#: src/delete-files/delete-files.cc:287
 msgid "Delete Method"
 msgstr "刪除方式"
 
-#: src/delete-files/delete-files.cc:182
+#: src/delete-files/delete-files.cc:288
 msgid "Move to trash instead of deleting immediately"
 msgstr "移動到垃圾桶而不是直接刪除"
 
@@ -1199,13 +1068,13 @@
 msgid "Echo"
 msgstr "回音"
 
-#: src/echo_plugin/echo.cc:22 src/modplug/plugin_main.cc:73
-#: src/modplug/plugin_main.cc:83
+#: src/echo_plugin/echo.cc:22 src/modplug/plugin_main.cc:72
+#: src/modplug/plugin_main.cc:82
 msgid "Delay:"
 msgstr "延遲："
 
-#: src/echo_plugin/echo.cc:24 src/modplug/plugin_main.cc:73
-#: src/modplug/plugin_main.cc:83
+#: src/echo_plugin/echo.cc:24 src/modplug/plugin_main.cc:72
+#: src/modplug/plugin_main.cc:82 src/xsf/plugin.cc:445
 msgid "ms"
 msgstr "毫秒"
 
@@ -1213,7 +1082,7 @@
 msgid "Feedback:"
 msgstr "反饋："
 
-#: src/echo_plugin/echo.cc:28 src/modplug/plugin_main.cc:87
+#: src/echo_plugin/echo.cc:28 src/modplug/plugin_main.cc:86
 msgid "Volume:"
 msgstr "音量："
 
@@ -1221,11 +1090,11 @@
 msgid "Echo"
 msgstr "回音"
 
-#: src/ffaudio/ffaudio-core.cc:41
+#: src/ffaudio/ffaudio-core.cc:50
 msgid "FFmpeg Plugin"
 msgstr "FFmpeg 外掛"
 
-#: src/ffaudio/ffaudio-core.cc:571
+#: src/ffaudio/ffaudio-core.cc:649
 msgid ""
 "Multi-format audio decoding plugin for Audacious using\n"
 "FFmpeg multimedia framework (http://www.ffmpeg.org/)\n"
@@ -1241,249 +1110,321 @@
 "William Pitcock <nenolod@nenolod.net>\n"
 "Matti Hämäläinen <ccr@tnsp.org>"
 
-#: src/filewriter/filewriter.cc:45
+#: src/filewriter/filewriter.cc:48
 msgid "FileWriter Plugin"
 msgstr "檔案輸出外掛"
 
-#: src/filewriter/filewriter.cc:386
+#: src/filewriter/filewriter.cc:316
+#, c-format
+msgid ""
+"Error opening %s:\n"
+"%s"
+msgstr ""
+"開啟 %s 時發生錯誤：\n"
+"%s"
+
+#: src/filewriter/filewriter.cc:358
+msgid ""
+"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."
+
+#: src/filewriter/filewriter.cc:385
 msgid "Output file format:"
 msgstr "輸出檔案格式："
 
-#: src/filewriter/filewriter.cc:403
-msgid "Configure"
-msgstr "設定"
-
-#: src/filewriter/filewriter.cc:413
+#: src/filewriter/filewriter.cc:389
 msgid "Save into original directory"
 msgstr "儲存到原始資料夾"
 
-#: src/filewriter/filewriter.cc:417
-msgid "Save into custom directory"
-msgstr "儲存到自訂資料夾"
-
-#: src/filewriter/filewriter.cc:427
-msgid "Output file folder:"
-msgstr "輸出檔案資料夾："
-
-#: src/filewriter/filewriter.cc:431
-msgid "Pick a folder"
-msgstr "選擇一個資料夾"
+#: src/filewriter/filewriter.cc:392
+msgid "Save into custom directory:"
+msgstr "儲存到自訂資料夾："
 
-#: src/filewriter/filewriter.cc:444
+#: src/filewriter/filewriter.cc:400
 msgid "Generate file name from:"
 msgstr "產生檔名自："
 
-#: src/filewriter/filewriter.cc:448
-msgid "Original file tag"
-msgstr "原始檔案的標籤"
-
-#: src/filewriter/filewriter.cc:453
+#: src/filewriter/filewriter.cc:401
 msgid "Original file name"
 msgstr "原始檔案的檔名"
 
-#: src/filewriter/filewriter.cc:459
-msgid "Include original file name extension"
-msgstr "包含原始檔案的副檔名"
+#: src/filewriter/filewriter.cc:404
+msgid "Original file name (no suffix)"
+msgstr "原始的檔案名稱(移除原本的副檔名)"
+
+#: src/filewriter/filewriter.cc:407
+msgid "Original file tag"
+msgstr "原始檔案的標籤"
 
-#: src/filewriter/filewriter.cc:468
+#: src/filewriter/filewriter.cc:411
 msgid "Prepend track number to file name"
 msgstr "在檔案名稱前加入音軌編號"
 
-#: src/filewriter/filewriter.cc:484
-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/mp3.cc:40 src/filewriter/mp3.cc:717
+#: src/filewriter/filewriter.cc:417 src/filewriter/filewriter.cc:449
 msgid "Auto"
 msgstr "自動"
 
-#: src/filewriter/mp3.cc:40
+#: src/filewriter/filewriter.cc:418
+msgid "8000 Hz"
+msgstr "8000 Hz"
+
+#: src/filewriter/filewriter.cc:419
+msgid "11025 Hz"
+msgstr "11025 Hz"
+
+#: src/filewriter/filewriter.cc:420
+msgid "12000 Hz"
+msgstr "12000 Hz"
+
+#: src/filewriter/filewriter.cc:421
+msgid "16000 Hz"
+msgstr "16000 Hz"
+
+#: src/filewriter/filewriter.cc:422
+msgid "22050 Hz"
+msgstr "22050 Hz"
+
+#: src/filewriter/filewriter.cc:423
+msgid "24000 Hz"
+msgstr "24000 Hz"
+
+#: src/filewriter/filewriter.cc:424
+msgid "32000 Hz"
+msgstr "32000 Hz"
+
+#: src/filewriter/filewriter.cc:425 src/xsf/plugin.cc:430
+msgid "44100 Hz"
+msgstr "44100 Hz"
+
+#: src/filewriter/filewriter.cc:426 src/xsf/plugin.cc:431
+msgid "48000 Hz"
+msgstr "48000 Hz"
+
+#: src/filewriter/filewriter.cc:430
+msgid "8 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:431
+msgid "16 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:432
+msgid "32 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:433
+msgid "40 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:434
+msgid "48 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:435
+msgid "56 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:436
+msgid "64 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:437
+msgid "80 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:438
+msgid "96 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:439
+msgid "112 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:440
+msgid "128 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:441
+msgid "160 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:442
+msgid "192 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:443
+msgid "224 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:444
+msgid "256 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:445
+msgid "320 kbit/s"
+msgstr ""
+
+#: src/filewriter/filewriter.cc:450
 msgid "Joint Stereo"
 msgstr "聯合立體聲"
 
-#: src/filewriter/mp3.cc:41 src/modplug/plugin_main.cc:58
-#: src/mpg123/mpg123.cc:248
+#: src/filewriter/filewriter.cc:451 src/modplug/plugin_main.cc:57
+#: src/mpg123/mpg123.cc:259
 msgid "Stereo"
 msgstr "立體聲"
 
-#: src/filewriter/mp3.cc:41 src/modplug/plugin_main.cc:57
-#: src/mpg123/mpg123.cc:248
+#: src/filewriter/filewriter.cc:452 src/modplug/plugin_main.cc:56
+#: src/mpg123/mpg123.cc:260
 msgid "Mono"
 msgstr "單聲道"
 
-#: src/filewriter/mp3.cc:657
-msgid "MP3 Configuration"
-msgstr "MP3 設定"
-
-#: src/filewriter/mp3.cc:658
-msgid "_OK"
-msgstr "確認(_O)"
+#: src/filewriter/filewriter.cc:456
+msgid "VBR"
+msgstr "VBR"
+
+#: src/filewriter/filewriter.cc:457
+msgid "ABR"
+msgstr "ABR"
 
-#: src/filewriter/mp3.cc:681
-msgid "Algorithm Quality:"
+#: src/filewriter/filewriter.cc:478
+msgid "Algorithm quality:"
 msgstr "演算法品質："
 
-#: src/filewriter/mp3.cc:706
-msgid "Output Sample Rate:"
-msgstr "輸出取樣率："
-
-#: src/filewriter/mp3.cc:733
-msgid "(Hz)"
-msgstr "(Hz)"
-
-#: src/filewriter/mp3.cc:740
-msgid "Bitrate / Compression Ratio:"
-msgstr "位元率／壓縮比："
-
-#: src/filewriter/mp3.cc:764
-msgid "Bitrate (kbps):"
-msgstr "位元率 (kbps)："
+#: src/filewriter/filewriter.cc:484
+msgid "Bitrate:"
+msgstr "位元率："
 
-#: src/filewriter/mp3.cc:796
+#: src/filewriter/filewriter.cc:491
 msgid "Compression ratio:"
 msgstr "壓縮比率："
 
-#: src/filewriter/mp3.cc:820
-msgid "Audio Mode:"
+#: src/filewriter/filewriter.cc:498
+msgid "Audio mode:"
 msgstr "音訊模式："
 
-#: src/filewriter/mp3.cc:845
-msgid "Miscellaneous:"
-msgstr "其他選項："
-
-#: src/filewriter/mp3.cc:856
+#: src/filewriter/filewriter.cc:501
 msgid "Enforce strict ISO compliance"
 msgstr "強制要求 ISO 相容"
 
-#: src/filewriter/mp3.cc:867
+#: src/filewriter/filewriter.cc:503
 msgid "Error protection"
 msgstr "錯誤保護"
 
-#: src/filewriter/mp3.cc:879 src/filewriter/vorbis.cc:206
-msgid "Quality"
-msgstr "品質"
-
-#: src/filewriter/mp3.cc:888
+#: src/filewriter/filewriter.cc:508
 msgid "Enable VBR/ABR"
 msgstr "啟用 VBR／ABR"
 
-#: src/filewriter/mp3.cc:898
+#: src/filewriter/filewriter.cc:510
 msgid "Type:"
 msgstr "類型："
 
-#: src/filewriter/mp3.cc:931
-msgid "VBR Options:"
-msgstr "VBR 選項："
-
-#: src/filewriter/mp3.cc:947
-msgid "Minimum bitrate (kbps):"
-msgstr "最小位元率 (kbps)："
-
-#: src/filewriter/mp3.cc:973
-msgid "Maximum bitrate (kbps):"
-msgstr "最大位元率 (kbps)："
-
-#: src/filewriter/mp3.cc:995
-msgid "Strictly enforce minimum bitrate"
-msgstr "強制使用最小位元率"
+#: src/filewriter/filewriter.cc:514
+msgid "Minimum bitrate:"
+msgstr "最低位元率："
+
+#: src/filewriter/filewriter.cc:518
+msgid "Maximum bitrate:"
+msgstr "最高位元率："
+
+#: src/filewriter/filewriter.cc:522
+msgid "Average bitrate:"
+msgstr "平均位元率："
 
-#: src/filewriter/mp3.cc:1007
-msgid "ABR Options:"
-msgstr "ABR 選項："
-
-#: src/filewriter/mp3.cc:1017
-msgid "Average bitrate (kbps):"
-msgstr "平均位元率 (kbps)："
-
-#: src/filewriter/mp3.cc:1044
+#: src/filewriter/filewriter.cc:526
 msgid "VBR quality level:"
 msgstr "VBR 品質等級："
 
-#: src/filewriter/mp3.cc:1063
+#: src/filewriter/filewriter.cc:530
+msgid "Strictly enforce minimum bitrate"
+msgstr "強制使用最小位元率"
+
+#: src/filewriter/filewriter.cc:533
 msgid "Omit Xing VBR header"
 msgstr "省略 Xing VBR 檔頭"
 
-#: src/filewriter/mp3.cc:1076
-msgid "VBR/ABR"
-msgstr "VBR／ABR"
-
-#: src/filewriter/mp3.cc:1085
-msgid "Frame Parameters:"
-msgstr "音框參數："
+#: src/filewriter/filewriter.cc:539
+msgid "Frame Headers"
+msgstr "音格標頭"
 
-#: src/filewriter/mp3.cc:1097
+#: src/filewriter/filewriter.cc:540
 msgid "Mark as copyright"
 msgstr "標示為版權"
 
-#: src/filewriter/mp3.cc:1108
+#: src/filewriter/filewriter.cc:542
 msgid "Mark as original"
 msgstr "標示為原創"
 
-#: src/filewriter/mp3.cc:1120
-msgid "ID3 Parameters:"
-msgstr "ID3 參數："
+#: src/filewriter/filewriter.cc:544
+msgid "ID3 Tags"
+msgstr "ID3 標籤"
 
-#: src/filewriter/mp3.cc:1131
+#: src/filewriter/filewriter.cc:545
 msgid "Force addition of version 2 tag"
 msgstr "強制加入第二版標籤"
 
-#: src/filewriter/mp3.cc:1141
+#: src/filewriter/filewriter.cc:547
 msgid "Only add v1 tag"
 msgstr "只加入第一版標籤"
 
-#: src/filewriter/mp3.cc:1148
+#: src/filewriter/filewriter.cc:549
 msgid "Only add v2 tag"
 msgstr "只加入第二版標籤"
 
-#: src/filewriter/mp3.cc:1169
+#: src/filewriter/filewriter.cc:554
+msgid "Quality"
+msgstr "品質"
+
+#: src/filewriter/filewriter.cc:555
+msgid "VBR/ABR"
+msgstr "VBR／ABR"
+
+#: src/filewriter/filewriter.cc:556
 msgid "Tags"
 msgstr "標籤"
 
-#: src/filewriter/vorbis.cc:196
-msgid "Vorbis Encoder Configuration"
-msgstr "Vorbis 編碼器設定"
-
-#: src/filewriter/vorbis.cc:219
-msgid "Quality level (0 - 10):"
-msgstr "品質等級 (0 - 10)："
+#: src/filewriter/filewriter.cc:566
+msgid "Quality (0-1):"
+msgstr "品質 (0-1)："
 
-#: src/flacng/flacng.h:35
+#: src/filewriter/filewriter.cc:573 src/skins-qt/skins_cfg.cc:307
+#: src/skins/skins_cfg.cc:289
+msgid "General"
+msgstr "一般"
+
+#: src/flac/flacng.h:36
 msgid "FLAC Decoder"
 msgstr "FLAC 解碼器"
 
-#: src/flacng/metadata.cc:351 src/wavpack/wavpack.cc:209
+#: src/flac/metadata.cc:296 src/wavpack/wavpack.cc:215
 msgid "lossless"
 msgstr "無損"
 
-#: src/flacng/plugin.cc:169
+#: src/flac/plugin.cc:214
 msgid ""
 "Original code by\n"
 "Ralf Ertzinger <ralf@skytale.net>\n"
@@ -1507,15 +1448,15 @@
 msgid "GIO Plugin"
 msgstr "GIO 外掛"
 
-#: src/gio/gio.cc:153
+#: src/gio/gio.cc:152
 msgid "Read-and-append mode not supported"
 msgstr "不支援讀取並附加的存取模式"
 
-#: src/gio/gio.cc:166
+#: src/gio/gio.cc:165
 msgid "Invalid open mode"
 msgstr "無效的開啟模式"
 
-#: src/gl-spectrum/gl-spectrum.cc:51
+#: src/glspectrum/gl-spectrum.cc:52
 msgid ""
 "OpenGL Spectrum Analyzer for Audacious\n"
 "Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
@@ -1535,622 +1476,744 @@
 "\n"
 "License: GPLv2+"
 
-#: src/gl-spectrum/gl-spectrum.cc:62
+#: src/glspectrum/gl-spectrum.cc:63 src/qtglspectrum/gl-spectrum.cc:53
 msgid "OpenGL Spectrum Analyzer"
 msgstr "OpenGL 頻譜分析儀"
 
-#: src/gl-spectrum-qt/gl-spectrum.cc:41
-msgid ""
-"OpenGL Spectrum Analyzer for Audacious\n"
-"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
-"Copyright 2014 William Pitcock\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é, John Lindgren, and Carlo Bramini\n"
-"Copyright 2014 William Pitcock\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-qt/gl-spectrum.cc:53
-msgid "OpenGL Spectrum Analyzer (Qt)"
-msgstr "OpenGL 頻譜分析儀 (Qt)"
-
-#: src/gnomeshortcuts/gnomeshortcuts.cc:38
-msgid "GNOME Shortcuts"
-msgstr "Gnome 快速鍵"
-
-#: src/gnomeshortcuts/gnomeshortcuts.cc:54
-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"
-"Lets you control the player with GNOME's shortcuts.\n"
-"\n"
-"Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>"
-
-#: src/gtkui/columns.cc:35
-msgid "Entry number"
+#: src/gtkui/columns.cc:36 src/moonstone/playlist_model.cc:38
+#: src/qtui/playlist_model.cc:33
+msgid "Entry Number"
 msgstr "項目編號"
 
-#: src/gtkui/columns.cc:36 src/playlist-manager/playlist-manager.cc:225
-#: src/qtui/playlist_model.cc:123
+#: src/gtkui/columns.cc:37 src/moonstone/playlist_model.cc:38
+#: src/moonstone/playlist_selection.cc:64
+#: src/playlist-manager/playlist-manager.cc:200
+#: src/playlist-manager-qt/playlist-manager-qt.cc:188
+#: src/qtui/playlist_model.cc:33 src/streamtuner/icecast-model.cc:120
+#: src/streamtuner/ihr-model.cc:159 src/streamtuner/shoutcast-model.cc:122
 msgid "Title"
 msgstr "標題"
 
-#: src/gtkui/columns.cc:37 src/qtui/playlist_model.cc:125
+#: src/gtkui/columns.cc:38 src/moonstone/playlist_model.cc:39
+#: src/qtui/playlist_model.cc:33
 msgid "Artist"
 msgstr "藝人"
 
-#: src/gtkui/columns.cc:38
+#: src/gtkui/columns.cc:39 src/moonstone/playlist_model.cc:39
+#: src/qtui/playlist_model.cc:33
 msgid "Year"
 msgstr "年份"
 
-#: src/gtkui/columns.cc:39 src/qtui/playlist_model.cc:127
+#: src/gtkui/columns.cc:40 src/moonstone/playlist_model.cc:39
+#: src/qtui/playlist_model.cc:34
 msgid "Album"
 msgstr "專輯"
 
-#: src/gtkui/columns.cc:40
-msgid "Album artist"
+#: src/gtkui/columns.cc:41 src/moonstone/playlist_model.cc:40
+#: src/qtui/playlist_model.cc:34
+msgid "Album Artist"
 msgstr "專輯藝人"
 
-#: src/gtkui/columns.cc:41
+#: src/gtkui/columns.cc:42 src/moonstone/playlist_model.cc:40
+#: src/qtui/playlist_model.cc:34
 msgid "Track"
 msgstr "音軌"
 
-#: src/gtkui/columns.cc:42
+#: src/gtkui/columns.cc:43 src/moonstone/playlist_model.cc:40
+#: src/qtui/playlist_model.cc:34 src/streamtuner/icecast-model.cc:123
+#: src/streamtuner/shoutcast-model.cc:125
+#: src/streamtuner/shoutcast-model.cc:236
 msgid "Genre"
 msgstr "類型"
 
-#: src/gtkui/columns.cc:43
-msgid "Queue position"
+#: src/gtkui/columns.cc:44 src/moonstone/playlist_model.cc:41
+#: src/qtui/playlist_model.cc:35
+msgid "Queue Position"
 msgstr "佇列位置"
 
-#: src/gtkui/columns.cc:44
+#: src/gtkui/columns.cc:45 src/moonstone/playlist_model.cc:41
+#: src/qtui/playlist_model.cc:35
 msgid "Length"
 msgstr "長度"
 
-#: src/gtkui/columns.cc:45
-msgid "File path"
+#: src/gtkui/columns.cc:46 src/moonstone/playlist_model.cc:41
+#: src/qtui/playlist_model.cc:35
+msgid "File Path"
 msgstr "檔案路徑"
 
-#: src/gtkui/columns.cc:47
-msgid "Custom title"
+#: src/gtkui/columns.cc:47 src/moonstone/playlist_model.cc:42
+#: src/qtui/playlist_model.cc:35
+msgid "File Name"
+msgstr "檔案名稱"
+
+#: src/gtkui/columns.cc:48 src/moonstone/playlist_model.cc:42
+#: src/qtui/playlist_model.cc:36
+msgid "Custom Title"
 msgstr "自訂標題"
 
-#: src/gtkui/columns.cc:48
+#: src/gtkui/columns.cc:49 src/moonstone/playlist_model.cc:42
+#: src/qtui/playlist_model.cc:36 src/streamtuner/icecast-model.cc:129
+#: src/streamtuner/shoutcast-model.cc:134
 msgid "Bitrate"
 msgstr "位元率"
 
-#: src/gtkui/columns.cc:308
+#: src/gtkui/columns.cc:50 src/moonstone/playlist_model.cc:43
+#: src/qtui/playlist_model.cc:36
+msgid "Comment"
+msgstr "備註"
+
+#: src/gtkui/columns.cc:51 src/qtui/playlist_model.cc:36
+msgid "Publisher"
+msgstr ""
+
+#: src/gtkui/columns.cc:52 src/qtui/playlist_model.cc:37
+msgid "Catalog Number"
+msgstr ""
+
+#: src/gtkui/columns.cc:53 src/moonstone/playlist_model.cc:43
+#: src/qtui/playlist_model.cc:37
+msgid "Disc"
+msgstr ""
+
+#: src/gtkui/columns.cc:325
 msgid "Available columns"
 msgstr "可用的欄位"
 
-#: src/gtkui/columns.cc:334
+#: src/gtkui/columns.cc:351
 msgid "Displayed columns"
 msgstr "顯示的欄位"
 
-#: src/gtkui/layout.cc:72 src/search-tool/search-tool.cc:40
+#: src/gtkui/layout.cc:74 src/search-tool-qt/search-tool-qt.cc:58
+#: src/search-tool/search-tool.cc:49
 msgid "Search Tool"
 msgstr "搜尋工具"
 
-#: src/gtkui/layout.cc:167
+#: src/gtkui/layout.cc:170
 msgid "Dock at Left"
 msgstr "嵌入左方"
 
-#: src/gtkui/layout.cc:167
+#: src/gtkui/layout.cc:170
 msgid "Dock at Right"
 msgstr "嵌入右方"
 
-#: src/gtkui/layout.cc:168
+#: src/gtkui/layout.cc:171
 msgid "Dock at Top"
 msgstr "嵌入頂端"
 
-#: src/gtkui/layout.cc:168
+#: src/gtkui/layout.cc:171
 msgid "Dock at Bottom"
 msgstr "嵌入底端"
 
-#: src/gtkui/layout.cc:168
+#: src/gtkui/layout.cc:171
 msgid "Undock"
 msgstr "解除嵌入"
 
-#: src/gtkui/layout.cc:168 src/ladspa/plugin.cc:531
+#: src/gtkui/layout.cc:171 src/ladspa/plugin.cc:540
 msgid "Disable"
 msgstr "關閉"
 
-#: src/gtkui/menus.cc:126 src/qtui/main_window_actions.cc:93
-#: src/statusicon/statusicon.cc:276
+#: src/gtkui/menus.cc:79 src/qtui/menus.cc:107
+#: src/statusicon-qt/statusicon.cc:115 src/statusicon/statusicon.cc:286
 msgid "_Open Files ..."
 msgstr "開啟檔案(_O) ..."
 
-#: src/gtkui/menus.cc:127
+#: src/gtkui/menus.cc:80 src/qtui/menus.cc:111
 msgid "Open _URL ..."
 msgstr "開啟網址(_U) ..."
 
-#: src/gtkui/menus.cc:128 src/qtui/main_window_actions.cc:95
+#: src/gtkui/menus.cc:81 src/qtui/menus.cc:113
 msgid "_Add Files ..."
 msgstr "加入檔案(_A) ... "
 
-#: src/gtkui/menus.cc:129
+#: src/gtkui/menus.cc:82 src/qtui/menus.cc:118
 msgid "Add U_RL ..."
 msgstr "加入網址(_R) ..."
 
-#: src/gtkui/menus.cc:131
+#: src/gtkui/menus.cc:84 src/qtui/menus.cc:120
 msgid "Search _Library"
 msgstr "搜尋媒體櫃(_L)"
 
-#: src/gtkui/menus.cc:133 src/qtui/main_window_actions.cc:98
+#: src/gtkui/menus.cc:86 src/qtui/menus.cc:123
 msgid "A_bout ..."
 msgstr "關於(_B) ..."
 
-#: src/gtkui/menus.cc:134 src/qtui/main_window_actions.cc:99
+#: src/gtkui/menus.cc:87 src/qtui/menus.cc:125
 msgid "_Settings ..."
 msgstr "設定(_S) ..."
 
-#: src/gtkui/menus.cc:135 src/qtui/main_window_actions.cc:103
-#: src/statusicon/statusicon.cc:284
+#: src/gtkui/menus.cc:88 src/qtui/menus.cc:131
+#: src/statusicon-qt/statusicon.cc:117 src/statusicon/statusicon.cc:288
 msgid "_Quit"
 msgstr "離開(_Q)"
 
-#: src/gtkui/menus.cc:139 src/gtkui/menus.cc:262
-#: src/qtui/main_window_actions.cc:107 src/search-tool/search-tool.cc:641
-#: src/statusicon/statusicon.cc:278
+#: src/gtkui/menus.cc:92 src/gtkui/menus.cc:226
+#: src/moonstone/playlist_tabs.cc:306 src/qtui/menus.cc:135
+#: src/qtui/playlist_tabs.cc:331 src/search-tool-qt/search-tool-qt.cc:499
+#: src/search-tool/search-tool.cc:339 src/statusicon-qt/statusicon.cc:109
+#: src/statusicon/statusicon.cc:280
 msgid "_Play"
 msgstr "播放(_P)"
 
-#: src/gtkui/menus.cc:140 src/qtui/main_window_actions.cc:108
-#: src/statusicon/statusicon.cc:279
+#: src/gtkui/menus.cc:93 src/qtui/menus.cc:137
+#: src/statusicon-qt/statusicon.cc:110 src/statusicon/statusicon.cc:281
 msgid "Paus_e"
 msgstr "暫停(_E)"
 
-#: src/gtkui/menus.cc:141 src/qtui/main_window_actions.cc:109
-#: src/statusicon/statusicon.cc:280
+#: src/gtkui/menus.cc:94 src/qtui/menus.cc:139
+#: src/statusicon-qt/statusicon.cc:111 src/statusicon/statusicon.cc:282
 msgid "_Stop"
 msgstr "停止(_S)"
 
-#: src/gtkui/menus.cc:142 src/qtui/main_window_actions.cc:110
-#: src/statusicon/statusicon.cc:277
+#: src/gtkui/menus.cc:95 src/qtui/menus.cc:141
+#: src/statusicon-qt/statusicon.cc:112 src/statusicon/statusicon.cc:283
 msgid "Pre_vious"
 msgstr "上一個(_V)"
 
-#: src/gtkui/menus.cc:143 src/qtui/main_window_actions.cc:111
-#: src/statusicon/statusicon.cc:281
+#: src/gtkui/menus.cc:96 src/qtui/menus.cc:143
+#: src/statusicon-qt/statusicon.cc:113 src/statusicon/statusicon.cc:284
 msgid "_Next"
 msgstr "下一個(_N)"
 
-#: src/gtkui/menus.cc:145 src/qtui/main_window_actions.cc:113
+#: src/gtkui/menus.cc:97 src/qtui/menus.cc:145 src/skins/menus.cc:114
+#: src/skins-qt/menus.cc:105
+msgid "Previous Album"
+msgstr "上一張專輯"
+
+#: src/gtkui/menus.cc:98 src/qtui/menus.cc:146 src/skins/menus.cc:115
+#: src/skins-qt/menus.cc:106
+msgid "Next Album"
+msgstr "下一張專輯"
+
+#: src/gtkui/menus.cc:100 src/qtui/menus.cc:148
 msgid "_Repeat"
-msgstr "重複"
+msgstr "重複(_R)"
 
-#: src/gtkui/menus.cc:146 src/qtui/main_window_actions.cc:114
+#: src/gtkui/menus.cc:101 src/qtui/menus.cc:150
 msgid "S_huffle"
-msgstr "隨機"
+msgstr "亂序(_H)"
+
+#: src/gtkui/menus.cc:102 src/qtui/menus.cc:152
+msgid "Shuffle by Albu_m"
+msgstr "以專輯為單位亂序播放(_M)"
 
-#: src/gtkui/menus.cc:147 src/qtui/main_window_actions.cc:115
+#: src/gtkui/menus.cc:103 src/qtui/menus.cc:155
 msgid "N_o Playlist Advance"
-msgstr "不要切換播放清單"
+msgstr "不要切換播放清單(_O)"
 
-#: src/gtkui/menus.cc:148 src/qtui/main_window_actions.cc:116
+#: src/gtkui/menus.cc:104 src/qtui/menus.cc:157
 msgid "Stop A_fter This Song"
 msgstr "播放完目前歌曲後停止(_F)"
 
-#: src/gtkui/menus.cc:150 src/gtkui/menus.cc:247
-#: src/qtui/main_window_actions.cc:118
+#: src/gtkui/menus.cc:106 src/gtkui/menus.cc:210 src/qtui/menus.cc:162
+#: src/qtui/menus.cc:294
 msgid "Song _Info ..."
 msgstr "歌曲資訊(_I) ..."
 
-#: src/gtkui/menus.cc:151
+#: src/gtkui/menus.cc:107
 msgid "Jump to _Time ..."
 msgstr "跳轉到指定時間(_T) ..."
 
-#: src/gtkui/menus.cc:152
+#: src/gtkui/menus.cc:108
 msgid "_Jump to Song ..."
 msgstr "跳轉到指定歌曲(_J) ..."
 
-#: src/gtkui/menus.cc:154
+#: src/gtkui/menus.cc:110 src/qtui/menus.cc:165
 msgid "Set Repeat Point _A"
 msgstr "設定重複點 _A"
 
-#: src/gtkui/menus.cc:155
+#: src/gtkui/menus.cc:111 src/qtui/menus.cc:167
 msgid "Set Repeat Point _B"
 msgstr "設定重複點 _B"
 
-#: src/gtkui/menus.cc:156
+#: src/gtkui/menus.cc:112 src/qtui/menus.cc:169
 msgid "_Clear Repeat Points"
 msgstr "清除重複點(_C)"
 
-#: src/gtkui/menus.cc:160 src/gtkui/menus.cc:167 src/gtkui/menus.cc:183
-#: src/qtui/main_window_actions.cc:122 src/qtui/main_window_actions.cc:129
-#: src/qtui/main_window_actions.cc:145
+#: src/gtkui/menus.cc:116 src/gtkui/menus.cc:123 src/gtkui/menus.cc:141
+#: src/qtui/menus.cc:173 src/qtui/menus.cc:180 src/qtui/menus.cc:198
 msgid "By _Title"
 msgstr "標題(_T)"
 
-#: src/gtkui/menus.cc:161 src/qtui/main_window_actions.cc:123
+#: src/gtkui/menus.cc:117 src/qtui/menus.cc:174
 msgid "By _File Name"
 msgstr "檔案名稱(_F)"
 
-#: src/gtkui/menus.cc:162 src/qtui/main_window_actions.cc:124
+#: src/gtkui/menus.cc:118 src/qtui/menus.cc:175
 msgid "By File _Path"
 msgstr "檔案路徑(_P)"
 
-#: src/gtkui/menus.cc:166 src/gtkui/menus.cc:182
-#: src/qtui/main_window_actions.cc:128 src/qtui/main_window_actions.cc:144
+#: src/gtkui/menus.cc:122 src/gtkui/menus.cc:140 src/qtui/menus.cc:179
+#: src/qtui/menus.cc:197
 msgid "By Track _Number"
 msgstr "音軌編號(_N)"
 
-#: src/gtkui/menus.cc:168 src/gtkui/menus.cc:184
-#: src/qtui/main_window_actions.cc:130 src/qtui/main_window_actions.cc:146
+#: src/gtkui/menus.cc:124 src/gtkui/menus.cc:142 src/qtui/menus.cc:181
+#: src/qtui/menus.cc:199
 msgid "By _Artist"
 msgstr "藝人(_A)"
 
-#: src/gtkui/menus.cc:169 src/gtkui/menus.cc:185
-#: src/qtui/main_window_actions.cc:131 src/qtui/main_window_actions.cc:147
+#: src/gtkui/menus.cc:125 src/gtkui/menus.cc:143 src/qtui/menus.cc:182
+#: src/qtui/menus.cc:200
 msgid "By Al_bum"
 msgstr "專輯(_B)"
 
-#: src/gtkui/menus.cc:170 src/gtkui/menus.cc:186
-#: src/qtui/main_window_actions.cc:132 src/qtui/main_window_actions.cc:148
+#: src/gtkui/menus.cc:126 src/gtkui/menus.cc:144 src/qtui/menus.cc:183
+#: src/qtui/menus.cc:201
 msgid "By Albu_m Artist"
 msgstr "專輯藝人(_M)"
 
-#: src/gtkui/menus.cc:171 src/gtkui/menus.cc:187
-#: src/qtui/main_window_actions.cc:133 src/qtui/main_window_actions.cc:149
+#: src/gtkui/menus.cc:127 src/gtkui/menus.cc:145 src/qtui/menus.cc:184
+#: src/qtui/menus.cc:202
 msgid "By Release _Date"
 msgstr "發行日期(_D)"
 
-#: src/gtkui/menus.cc:172 src/gtkui/menus.cc:188
-#: src/qtui/main_window_actions.cc:134 src/qtui/main_window_actions.cc:150
+#: src/gtkui/menus.cc:128 src/gtkui/menus.cc:146 src/qtui/menus.cc:185
+#: src/qtui/menus.cc:203
 msgid "By _Genre"
 msgstr "類型(_G)"
 
-#: src/gtkui/menus.cc:173 src/gtkui/menus.cc:189
-#: src/qtui/main_window_actions.cc:135 src/qtui/main_window_actions.cc:151
+#: src/gtkui/menus.cc:129 src/gtkui/menus.cc:147 src/qtui/menus.cc:186
+#: src/qtui/menus.cc:204
 msgid "By _Length"
 msgstr "長度(_L)"
 
-#: src/gtkui/menus.cc:174 src/gtkui/menus.cc:190
-#: src/qtui/main_window_actions.cc:136 src/qtui/main_window_actions.cc:152
+#: src/gtkui/menus.cc:130 src/gtkui/menus.cc:148 src/qtui/menus.cc:187
+#: src/qtui/menus.cc:205
 msgid "By _File Path"
 msgstr "檔案路徑(_F)"
 
-#: src/gtkui/menus.cc:175 src/gtkui/menus.cc:191
-#: src/qtui/main_window_actions.cc:137 src/qtui/main_window_actions.cc:153
+#: src/gtkui/menus.cc:131 src/gtkui/menus.cc:149 src/qtui/menus.cc:188
+#: src/qtui/menus.cc:206
 msgid "By _Custom Title"
 msgstr "自訂標題(_C)"
 
-#: src/gtkui/menus.cc:177 src/gtkui/menus.cc:193
-#: src/qtui/main_window_actions.cc:139 src/qtui/main_window_actions.cc:155
+#: src/gtkui/menus.cc:132 src/gtkui/menus.cc:150 src/qtui/menus.cc:189
+#: src/qtui/menus.cc:207
+msgid "By C_omment"
+msgstr "備註(_O)"
+
+#: src/gtkui/menus.cc:133 src/gtkui/menus.cc:151 src/qtui/menus.cc:190
+#: src/qtui/menus.cc:208
+msgid "By D_isc Number"
+msgstr ""
+
+#: src/gtkui/menus.cc:135 src/gtkui/menus.cc:153 src/qtui/menus.cc:192
+#: src/qtui/menus.cc:210
 msgid "R_everse Order"
 msgstr "反向順序(_E)"
 
-#: src/gtkui/menus.cc:178 src/gtkui/menus.cc:194
-#: src/qtui/main_window_actions.cc:140 src/qtui/main_window_actions.cc:156
+#: src/gtkui/menus.cc:136 src/gtkui/menus.cc:154 src/qtui/menus.cc:194
+#: src/qtui/menus.cc:212
 msgid "_Random Order"
 msgstr "隨機順序(_R)"
 
-#: src/gtkui/menus.cc:198 src/qtui/main_window_actions.cc:160
+#: src/gtkui/menus.cc:158 src/qtui/menus.cc:216
 msgid "_Play/Resume"
 msgstr "播放／回復(_P)"
 
-#: src/gtkui/menus.cc:199 src/gtkui/menus.cc:251
-#: src/qtui/main_window_actions.cc:161
+#: src/gtkui/menus.cc:159 src/qtui/menus.cc:218
 msgid "_Refresh"
 msgstr "重新整理(_R)"
 
-#: src/gtkui/menus.cc:201 src/qtui/main_window_actions.cc:163
+#: src/gtkui/menus.cc:161 src/qtui/menus.cc:222
 msgid "_Sort"
 msgstr "排序(_S)"
 
-#: src/gtkui/menus.cc:202 src/qtui/main_window_actions.cc:164
+#: src/gtkui/menus.cc:162 src/qtui/menus.cc:223
 msgid "Sort Se_lected"
 msgstr "排序選擇的項目(_L)"
 
-#: src/gtkui/menus.cc:203 src/qtui/main_window_actions.cc:165
+#: src/gtkui/menus.cc:163 src/qtui/menus.cc:225
 msgid "Remove _Duplicates"
 msgstr "移除重複的項目(_D)"
 
-#: src/gtkui/menus.cc:204 src/qtui/main_window_actions.cc:166
+#: src/gtkui/menus.cc:164 src/qtui/menus.cc:226
 msgid "Remove _Unavailable Files"
 msgstr "移除不存在的檔案(_U)"
 
-#: src/gtkui/menus.cc:206 src/playlist-manager/playlist-manager.cc:244
-#: src/qtui/main_window_actions.cc:168
+#: src/gtkui/menus.cc:166 src/playlist-manager/playlist-manager.cc:219
+#: src/playlist-manager-qt/playlist-manager-qt.cc:348 src/qtui/menus.cc:229
 msgid "_New"
 msgstr "新增(_N)"
 
-#: src/gtkui/menus.cc:207
+#: src/gtkui/menus.cc:167 src/qtui/menus.cc:230
 msgid "Ren_ame ..."
 msgstr "重新命名(_A) ..."
 
-#: src/gtkui/menus.cc:208 src/gtkui/menus.cc:264
-#: src/qtui/main_window_actions.cc:170
+#: src/gtkui/menus.cc:168 src/gtkui/menus.cc:228
+#: src/moonstone/playlist_tabs.cc:311 src/qtui/menus.cc:231
+#: src/qtui/playlist_tabs.cc:336
 msgid "Remo_ve"
 msgstr "移除(_V)"
 
-#: src/gtkui/menus.cc:210
+#: src/gtkui/menus.cc:170 src/qtui/menus.cc:233
 msgid "_Import ..."
 msgstr "匯入(_I) ..."
 
-#: src/gtkui/menus.cc:211
+#: src/gtkui/menus.cc:171 src/qtui/menus.cc:234
 msgid "_Export ..."
 msgstr "匯出(_E) ..."
 
-#: src/gtkui/menus.cc:213
+#: src/gtkui/menus.cc:173 src/qtui/menus.cc:237
 msgid "Playlist _Manager ..."
 msgstr "播放清單管理(_M) ..."
 
-#: src/gtkui/menus.cc:214 src/qtui/main_window_actions.cc:176
+#: src/gtkui/menus.cc:174 src/qtui/menus.cc:239
 msgid "_Queue Manager ..."
 msgstr "佇列管理(_Q) ..."
 
-#: src/gtkui/menus.cc:218 src/qtui/main_window_actions.cc:180
+#: src/gtkui/menus.cc:178 src/qtui/menus.cc:243
 msgid "Volume _Up"
 msgstr "提高音量(_U)"
 
-#: src/gtkui/menus.cc:219 src/qtui/main_window_actions.cc:181
+#: src/gtkui/menus.cc:179 src/qtui/menus.cc:245
 msgid "Volume _Down"
 msgstr "降低音量(_D)"
 
-#: src/gtkui/menus.cc:221 src/qtui/main_window_actions.cc:183
-msgid "_Equalizer"
-msgstr "等化器(_E)"
+#: src/gtkui/menus.cc:181 src/qtui/menus.cc:249
+msgid "_Equalizer ..."
+msgstr "等化器(_E) ..."
 
-#: src/gtkui/menus.cc:223 src/qtui/main_window_actions.cc:185
+#: src/gtkui/menus.cc:182 src/qtui/menus.cc:251
 msgid "E_ffects ..."
 msgstr "特效(_F) ..."
 
-#: src/gtkui/menus.cc:227
+#: src/gtkui/menus.cc:184
+msgid "_Record Stream"
+msgstr "錄製串流(_R)"
+
+#: src/gtkui/menus.cc:185
+msgid "Audio _Settings ..."
+msgstr "音訊設定(_S) ..."
+
+#: src/gtkui/menus.cc:189 src/qtui/menus.cc:260
 msgid "Show _Menu Bar"
 msgstr "顯示選單列(_M)"
 
-#: src/gtkui/menus.cc:228
+#: src/gtkui/menus.cc:190 src/qtui/menus.cc:262
 msgid "Show I_nfo Bar"
 msgstr "顯示資訊列(_N)"
 
-#: src/gtkui/menus.cc:229
+#: src/gtkui/menus.cc:191 src/qtui/menus.cc:264
+msgid "Show Info Bar _Album Art"
+msgstr ""
+
+#: src/gtkui/menus.cc:192 src/qtui/menus.cc:266
 msgid "Show Info Bar Vis_ualization"
 msgstr "顯示資訊列的視覺特效(_U)"
 
-#: src/gtkui/menus.cc:230
+#: src/gtkui/menus.cc:193 src/qtui/menus.cc:268
 msgid "Show _Status Bar"
 msgstr "顯示狀態列(_S)"
 
-#: src/gtkui/menus.cc:232
+#: src/gtkui/menus.cc:195 src/qtui/menus.cc:272
 msgid "Show _Remaining Time"
 msgstr "顯示剩餘時間(_R)"
 
-#: src/gtkui/menus.cc:234
+#: src/gtkui/menus.cc:197 src/qtui/menus.cc:276 src/skins/menus.cc:157
+#: src/skins-qt/menus.cc:152
 msgid "_Visualizations ..."
 msgstr "視覺特效(_V) ..."
 
-#: src/gtkui/menus.cc:238 src/qtui/main_window_actions.cc:189
+#: src/gtkui/menus.cc:201 src/qtui/menus.cc:280
 msgid "_File"
 msgstr "檔案(_F)"
 
-#: src/gtkui/menus.cc:239 src/qtui/main_window_actions.cc:190
+#: src/gtkui/menus.cc:202 src/qtui/menus.cc:281
 msgid "_Playback"
 msgstr "播放(_P)"
 
-#: src/gtkui/menus.cc:240 src/qtui/main_window_actions.cc:191
+#: src/gtkui/menus.cc:203 src/qtui/menus.cc:282
 msgid "P_laylist"
 msgstr "播放清單(_L)"
 
-#: src/gtkui/menus.cc:241 src/gtkui/menus.cc:258
-#: src/qtui/main_window_actions.cc:192
+#: src/gtkui/menus.cc:204 src/gtkui/menus.cc:222 src/qtui/menus.cc:283
+#: src/qtui/menus.cc:312
 msgid "_Services"
 msgstr "服務(_S)"
 
-#: src/gtkui/menus.cc:242 src/qtui/main_window_actions.cc:193
+#: src/gtkui/menus.cc:205 src/qtui/menus.cc:284
 msgid "_Output"
 msgstr "輸出(_O)"
 
-#: src/gtkui/menus.cc:243
+#: src/gtkui/menus.cc:206 src/qtui/menus.cc:285
 msgid "_View"
 msgstr "檢視(_V)"
 
-#: src/gtkui/menus.cc:248
+#: src/gtkui/menus.cc:211 src/qtui/menus.cc:296
 msgid "_Queue/Unqueue"
 msgstr "排入／移出佇列(_Q)"
 
-#: src/gtkui/menus.cc:250
+#: src/gtkui/menus.cc:213 src/qtui/menus.cc:299
 msgid "_Open Containing Folder"
 msgstr "開啟該資料夾(_O)"
 
-#: src/gtkui/menus.cc:253
+#: src/gtkui/menus.cc:214 src/qtui/menus.cc:301
+msgid "_Refresh Selected"
+msgstr "重新整理選擇的項目(_R)"
+
+#: src/gtkui/menus.cc:216 src/qtui/menus.cc:304
 msgid "Cu_t"
 msgstr "剪下(_T)"
 
-#: src/gtkui/menus.cc:254
+#: src/gtkui/menus.cc:217 src/qtui/menus.cc:305
 msgid "_Copy"
 msgstr "複製(_C)"
 
-#: src/gtkui/menus.cc:255
+#: src/gtkui/menus.cc:218 src/qtui/menus.cc:306
 msgid "_Paste"
 msgstr "貼上(_P)"
 
-#: src/gtkui/menus.cc:256
+#: src/gtkui/menus.cc:219 src/qtui/menus.cc:307
+msgid "Paste at _End"
+msgstr "貼到最後(_E)"
+
+#: src/gtkui/menus.cc:220 src/qtui/menus.cc:309
 msgid "Select _All"
 msgstr "選擇全部(_A)"
 
-#: src/gtkui/menus.cc:263
+#: src/gtkui/menus.cc:227 src/moonstone/playlist_tabs.cc:309
+#: src/qtui/playlist_tabs.cc:334
 msgid "_Rename ..."
 msgstr "重新命名(_R) ..."
 
-#: src/gtkui/settings.cc:35
+#: src/gtkui/settings.cc:35 src/qtui/settings.cc:59
+msgid "Always"
+msgstr "總是"
+
+#: src/gtkui/settings.cc:36 src/qtui/settings.cc:60
+msgid "Auto-hide"
+msgstr "自動隱藏"
+
+#: src/gtkui/settings.cc:37 src/qtui/settings.cc:61
+msgid "Never"
+msgstr "從不"
+
+#: src/gtkui/settings.cc:41 src/qtui/settings.cc:64
 msgid "Playlist Tabs"
 msgstr "播放清單分頁"
 
-#: src/gtkui/settings.cc:36
-msgid "Always show tabs"
-msgstr "永遠顯示分頁"
+#: src/gtkui/settings.cc:42 src/qtui/settings.cc:65
+msgid "Show playlist tabs:"
+msgstr "顯示播放清單分頁："
 
-#: src/gtkui/settings.cc:38
+#: src/gtkui/settings.cc:45 src/qtui/settings.cc:69
 msgid "Show entry counts"
 msgstr "顯示項目數量"
 
-#: src/gtkui/settings.cc:40
+#: src/gtkui/settings.cc:47 src/qtui/settings.cc:72
 msgid "Show close buttons"
 msgstr "顯示關閉按鈕"
 
-#: src/gtkui/settings.cc:42
+#: src/gtkui/settings.cc:49 src/qtui/settings.cc:75
 msgid "Playlist Columns"
 msgstr "播放清單欄位"
 
-#: src/gtkui/settings.cc:44
+#: src/gtkui/settings.cc:51 src/qtui/settings.cc:77
 msgid "Show column headers"
 msgstr "顯示欄位標頭"
 
-#: src/gtkui/settings.cc:46 src/modplug/plugin_main.cc:106
-#: src/skins/skins_cfg.cc:263
-msgid "Miscellaneous"
-msgstr "其他選項"
+#: src/gtkui/settings.cc:53 src/qtui/settings.cc:82
+msgid "Make column headers clickable for sorting"
+msgstr ""
 
-#: src/gtkui/settings.cc:47
-msgid "Arrow keys seek by:"
-msgstr "按下方向鍵時跳轉的時間長度："
+#: src/gtkui/settings.cc:56
+msgid "Use symbolic icons in toolbar"
+msgstr ""
 
-#: src/gtkui/settings.cc:50
+#: src/gtkui/settings.cc:58 src/qtui/settings.cc:86
 msgid "Scroll on song change"
 msgstr "切換歌曲時捲動清單"
 
-#: src/gtkui/ui_gtk.cc:71
+#: src/gtkui/ui_gtk.cc:82
 msgid "GTK Interface"
 msgstr "GTK 介面"
 
-#: src/gtkui/ui_gtk.cc:222 src/skins/ui_main.cc:232
+#: src/gtkui/ui_gtk.cc:219 src/skins/main.cc:228 src/skins-qt/main.cc:231
 #, c-format
 msgid "%s - Audacious"
 msgstr "%s - Audacious"
 
-#: src/gtkui/ui_gtk.cc:225 src/qtui/main_window.cc:186
+#: src/gtkui/ui_gtk.cc:221 src/moonstone/main_window.cc:184
+#: src/qtui/main_window.cc:385
 msgid "Buffering ..."
 msgstr "緩衝中 ..."
 
-#: src/gtkui/ui_gtk.cc:228 src/skins/ui_main.cc:234 src/skins/ui_main.cc:1164
+#: src/gtkui/ui_gtk.cc:224 src/pipewire/pipewire.cc:402 src/skins/main.cc:230
+#: src/skins-qt/main.cc:233
 msgid "Audacious"
 msgstr "Audacious"
 
-#: src/gtkui/ui_statusbar.cc:63 src/qtui/status_bar.cc:67
+#: src/gtkui/ui_gtk.cc:487 src/gtkui/ui_gtk.cc:518 src/gtkui/ui_gtk.cc:882
+#: src/hotkey/gui.cc:72 src/moonstone/main_window.cc:67
+#: src/moonstone/main_window.cc:145 src/moonstone/main_window.cc:146
+#: src/notify/osd.cc:85 src/qthotkey/gui.cc:67 src/qtui/main_window.cc:154
+#: src/qtui/main_window.cc:347 src/qtui/main_window.cc:348
+#: src/skins/menus.cc:109 src/skins-qt/menus.cc:100
+msgid "Play"
+msgstr "播放"
+
+#: src/gtkui/ui_gtk.cc:487 src/moonstone/main_window.cc:151
+#: src/moonstone/main_window.cc:152 src/notify/osd.cc:82
+#: src/qtui/main_window.cc:353 src/qtui/main_window.cc:354
+#: src/skins/menus.cc:110 src/skins-qt/menus.cc:101
+msgid "Pause"
+msgstr "暫停"
+
+#: src/gtkui/ui_gtk.cc:868 src/moonstone/main_window.cc:57
+#: src/qtui/main_window.cc:145 src/skins/menus.cc:86 src/skins-qt/menus.cc:77
+msgid "Search Library"
+msgstr "搜尋媒體櫃"
+
+#: src/gtkui/ui_gtk.cc:875 src/moonstone/main_window.cc:60
+#: src/qtui/main_window.cc:147
+msgid "Open Files"
+msgstr "開啟檔案"
+
+#: src/gtkui/ui_gtk.cc:876 src/moonstone/main_window.cc:62
+#: src/qtui/main_window.cc:149
+msgid "Add Files"
+msgstr "加入檔案"
+
+#: src/gtkui/ui_gtk.cc:881 src/moonstone/main_window.cc:65
+#: src/qtui/main_window.cc:152 src/skins/menus.cc:112 src/skins-qt/menus.cc:103
+msgid "Previous"
+msgstr "上一個"
+
+#: src/gtkui/ui_gtk.cc:883 src/hotkey/gui.cc:74 src/moonstone/main_window.cc:69
+#: src/qthotkey/gui.cc:69 src/qtui/main_window.cc:156 src/skins/menus.cc:111
+#: src/skins-qt/menus.cc:102
+msgid "Stop"
+msgstr "停止"
+
+#: src/gtkui/ui_gtk.cc:884 src/moonstone/main_window.cc:76 src/notify/osd.cc:89
+#: src/qtui/main_window.cc:163 src/skins/menus.cc:113 src/skins-qt/menus.cc:104
+msgid "Next"
+msgstr "下一個"
+
+#: src/gtkui/ui_gtk.cc:886 src/moonstone/main_window.cc:79
+#: src/qtui/main_window.cc:166 src/qtui/menus.cc:254 src/skins/menus.cc:79
+#: src/skins-qt/menus.cc:69
+msgid "Record Stream"
+msgstr "錄音"
+
+#: src/gtkui/ui_gtk.cc:919 src/moonstone/main_window.cc:86
+#: src/qtui/main_window.cc:173 src/skins/menus.cc:103 src/skins-qt/menus.cc:94
+msgid "Repeat"
+msgstr "重複"
+
+#: src/gtkui/ui_gtk.cc:922 src/moonstone/main_window.cc:89
+#: src/qtui/main_window.cc:176 src/skins/menus.cc:104 src/skins-qt/menus.cc:95
+msgid "Shuffle"
+msgstr "隨機"
+
+#: src/gtkui/ui_gtk.cc:1114 src/qtui/main_window.cc:123
+msgid "Menu"
+msgstr ""
+
+#: src/gtkui/ui_statusbar.cc:64 src/qtui/status_bar.cc:155
 msgid "mono"
 msgstr "單聲道"
 
-#: src/gtkui/ui_statusbar.cc:65 src/qtui/status_bar.cc:69
+#: src/gtkui/ui_statusbar.cc:66 src/qtui/status_bar.cc:157
 msgid "stereo"
 msgstr "立體聲"
 
-#: src/gtkui/ui_statusbar.cc:67 src/qtui/status_bar.cc:71
+#: src/gtkui/ui_statusbar.cc:68 src/qtui/status_bar.cc:160
 #, c-format
 msgid "%d channel"
 msgid_plural "%d channels"
 msgstr0 "%d 聲道"
 
-#: src/gtkui/ui_statusbar.cc:81 src/qtui/status_bar.cc:85
+#: src/gtkui/ui_statusbar.cc:76 src/qtui/status_bar.cc:168
+#, c-format
+msgid "%d kHz"
+msgstr "%d kHz"
+
+#: src/gtkui/ui_statusbar.cc:82 src/qtui/status_bar.cc:174
 #, c-format
-msgid "%d kbps"
-msgstr "%d kbps"
+msgid "%d kbit/s"
+msgstr ""
 
-#: src/gtkui/ui_statusbar.cc:107 src/skins/ui_main_evlisteners.cc:103
+#: src/gtkui/ui_statusbar.cc:108 src/skins/main.cc:478 src/skins-qt/main.cc:461
 msgid "Single mode."
 msgstr "單一模式。"
 
-#: src/gtkui/ui_statusbar.cc:109 src/skins/ui_main_evlisteners.cc:105
+#: src/gtkui/ui_statusbar.cc:110 src/skins/main.cc:480 src/skins-qt/main.cc:463
 msgid "Playlist mode."
 msgstr "播放清單模式。"
 
-#: src/gtkui/ui_statusbar.cc:117 src/skins/ui_main_evlisteners.cc:111
+#: src/gtkui/ui_statusbar.cc:118 src/skins/main.cc:486 src/skins-qt/main.cc:469
 msgid "Stopping after song."
 msgstr "播放完成後停止。"
 
-#: src/hotkey/gui.cc:71
+#: src/hotkey/gui.cc:71 src/qthotkey/gui.cc:66
 msgid "Previous track"
 msgstr "上一個音軌"
 
-#: src/hotkey/gui.cc:72 src/notify/osd.cc:69 src/qtui/main_window.cc:69
-#: src/qtui/main_window.cc:172 src/qtui/main_window.cc:173
-#: src/skins/menus.cc:87
-msgid "Play"
-msgstr "播放"
-
-#: src/hotkey/gui.cc:73
+#: src/hotkey/gui.cc:73 src/qthotkey/gui.cc:68
 msgid "Pause/Resume"
 msgstr "暫停／回復"
 
-#: src/hotkey/gui.cc:74 src/qtui/main_window.cc:70 src/skins/menus.cc:89
-msgid "Stop"
-msgstr "停止"
-
-#: src/hotkey/gui.cc:75
+#: src/hotkey/gui.cc:75 src/qthotkey/gui.cc:70
 msgid "Next track"
 msgstr "下一個音軌"
 
-#: src/hotkey/gui.cc:76
-msgid "Forward 5 seconds"
-msgstr "快轉五秒"
-
-#: src/hotkey/gui.cc:77
-msgid "Rewind 5 seconds"
-msgstr "倒轉五秒"
+#: src/hotkey/gui.cc:76 src/qthotkey/gui.cc:71
+msgid "Step forward"
+msgstr "往前跳轉"
+
+#: src/hotkey/gui.cc:77 src/qthotkey/gui.cc:72
+msgid "Step backward"
+msgstr "往回跳轉"
 
-#: src/hotkey/gui.cc:78
+#: src/hotkey/gui.cc:78 src/qthotkey/gui.cc:73
 msgid "Mute"
 msgstr "靜音"
 
-#: src/hotkey/gui.cc:79
+#: src/hotkey/gui.cc:79 src/qthotkey/gui.cc:74
 msgid "Volume up"
 msgstr "提高音量"
 
-#: src/hotkey/gui.cc:80
+#: src/hotkey/gui.cc:80 src/qthotkey/gui.cc:75
 msgid "Volume down"
 msgstr "降低音量"
 
-#: src/hotkey/gui.cc:81
+#: src/hotkey/gui.cc:81 src/qthotkey/gui.cc:76
 msgid "Jump to file"
 msgstr "跳轉到指定檔案"
 
-#: src/hotkey/gui.cc:82
+#: src/hotkey/gui.cc:82 src/qthotkey/gui.cc:77
 msgid "Toggle player window(s)"
 msgstr "切換顯示播放器視窗"
 
-#: src/hotkey/gui.cc:83
+#: src/hotkey/gui.cc:83 src/qthotkey/gui.cc:78
 msgid "Show On-Screen-Display"
 msgstr "顯示 OSD"
 
-#: src/hotkey/gui.cc:84
+#: src/hotkey/gui.cc:84 src/qthotkey/gui.cc:79
 msgid "Toggle repeat"
 msgstr "切換重複播放"
 
-#: src/hotkey/gui.cc:85
+#: src/hotkey/gui.cc:85 src/qthotkey/gui.cc:80
 msgid "Toggle shuffle"
 msgstr "切換隨機播放"
 
-#: src/hotkey/gui.cc:86
+#: src/hotkey/gui.cc:86 src/qthotkey/gui.cc:81
 msgid "Toggle stop after current"
 msgstr "播放完目前歌曲後停止"
 
-#: src/hotkey/gui.cc:87
+#: src/hotkey/gui.cc:87 src/qthotkey/gui.cc:82
 msgid "Raise player window(s)"
 msgstr "將播放器視窗放到最上層"
 
-#: src/hotkey/gui.cc:97
+#: src/hotkey/gui.cc:98 src/qthotkey/gui.cc:100
 msgid "(none)"
 msgstr "(無)"
 
-#: src/hotkey/gui.cc:234
+#: src/hotkey/gui.cc:261
 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 modifiers.\n"
 "\n"
 "Do you want to continue?"
 msgstr ""
@@ -2158,11 +2221,11 @@
 "\n"
 "您想要繼續嗎？"
 
-#: src/hotkey/gui.cc:236
+#: src/hotkey/gui.cc:264
 msgid "Binding mouse buttons"
 msgstr "綁定滑鼠按鈕"
 
-#: src/hotkey/gui.cc:391
+#: src/hotkey/gui.cc:434
 msgid ""
 "Press a key combination inside a text field.\n"
 "You can also bind mouse buttons."
@@ -2170,82 +2233,110 @@
 "請在輸入欄位中按下想要的按鍵組合。\n"
 "您也可以綁定滑鼠按鈕。"
 
-#: src/hotkey/gui.cc:396
+#: src/hotkey/gui.cc:444 src/qthotkey/gui.cc:179
 msgid "Hotkeys:"
 msgstr "熱鍵："
 
-#: src/hotkey/gui.cc:413
+#: src/hotkey/gui.cc:457 src/qthotkey/gui.cc:181
 msgid "Action:"
 msgstr "動作："
 
-#: src/hotkey/gui.cc:420
+#: src/hotkey/gui.cc:461 src/qthotkey/gui.cc:182
 msgid "Key Binding:"
 msgstr "按鍵綁定："
 
-#: src/hotkey/gui.cc:468
+#: src/hotkey/gui.cc:518 src/qthotkey/gui.cc:184
 msgid "_Add"
 msgstr "加入(_A)"
 
-#: src/hotkey/plugin.cc:61
+#: src/hotkey/plugin.cc:59 src/qthotkey/plugin.cc:78
 msgid "Global Hotkeys"
 msgstr "全域熱鍵"
 
-#: src/hotkey/plugin.cc:79
+#: src/hotkey/plugin.cc:74
 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"
+"Contributors 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 Plugin\n"
-"Control the player with global key combinations or multimedia keys.\n"
+"全域熱鍵外掛\n"
+"使用全域按鍵組合或者多媒體鍵來控制播放器。\n"
 "\n"
 "Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n"
 "\n"
-"Contributers include:\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/jack-ng/jack-ng.cc:49
+#: src/jack/jack-ng.cc:54
 msgid "JACK Output"
 msgstr "JACK 輸出"
 
-#: src/jack-ng/jack-ng.cc:114
+#: src/jack/jack-ng.cc:126
+msgid "Client name:"
+msgstr "客戶端名稱："
+
+#: src/jack/jack-ng.cc:128
 msgid "Automatically connect to output ports"
 msgstr "自動連接到輸出埠"
 
-#: src/jack-ng/jack-ng.cc:155
+#: src/jack/jack-ng.cc:130
+msgid "Filter ports (regex, use any port if blank):"
+msgstr "篩選輸出埠（正規表示法。若留空則不篩選）"
+
+#: src/jack/jack-ng.cc:136
+msgid "Connect to physical ports only"
+msgstr "只連接到實體輸出埠"
+
+#: src/jack/jack-ng.cc:139
+msgid "Upmix to"
+msgstr "若輸入音源的聲道數較少的話，將訊號重混到"
+
+#: src/jack/jack-ng.cc:141
+msgid "ports if input has fewer channels"
+msgstr "個輸入埠"
+
+#: src/jack/jack-ng.cc:143
+msgid "Ignore insufficient number of ports"
+msgstr "忽略不足數量的輸出埠"
+
+#: src/jack/jack-ng.cc:181
+msgid "No JACK output ports were found. Please check settings."
+msgstr "找不到任何 JACK 輸出埠。請檢查設定值。"
+
+#: src/jack/jack-ng.cc:195
 #, c-format
 msgid "Only %d JACK output ports were found but %d are required."
 msgstr "只找到 %d 個 JACK 輸出埠，但系統需要 %d 個。"
 
-#: src/jack-ng/jack-ng.cc:164
+#: src/jack/jack-ng.cc:210
 #, c-format
 msgid "Failed to connect to JACK port %s."
 msgstr "無法連接到 JACK 埠 %s 。"
 
-#: src/jack-ng/jack-ng.cc:184
+#: src/jack/jack-ng.cc:230
 msgid ""
 "JACK supports only floating-point audio. You must change the output bit "
 "depth to floating-point in Audacious settings."
 msgstr ""
 "JACK 只支援浮點數音訊。您必須在 Audacious 設定中將輸出的取樣格式改為浮點數。"
 
-#: src/jack-ng/jack-ng.cc:197
+#: src/jack/jack-ng.cc:245
 msgid "Failed to connect to the JACK server; is it running?"
 msgstr "無法連接到 JACK 伺服器。請確認它是否正常運作。"
 
-#: src/jack-ng/jack-ng.cc:273
+#: src/jack/jack-ng.cc:321
 #, c-format
 msgid ""
 "The JACK server requires a sample rate of %d Hz, but Audacious is playing at "
@@ -2254,16 +2345,16 @@
 "JACK 伺服器需要使用 %d Hz 的取樣率，但 Audacious 目前正以 %d Hz 播放中。請使"
 "用「取樣率轉換」特效修正這個問題。"
 
-#: src/ladspa/plugin.cc:414
+#: src/ladspa/plugin.cc:416
 #, c-format
 msgid "%s Settings"
 msgstr "%s 設定"
 
-#: src/ladspa/plugin.cc:478
+#: src/ladspa/plugin.cc:482
 msgid "Module paths:"
 msgstr "模組路徑："
 
-#: src/ladspa/plugin.cc:483
+#: src/ladspa/plugin.cc:487
 msgid ""
 "Separate multiple paths with a colon.\n"
 "These paths are searched in addition to LADSPA_PATH.\n"
@@ -2273,25 +2364,25 @@
 "系統除了 LADSPA_PATH 之外也會搜尋這些路徑。\n"
 "加入新路徑之後請按 Enter 掃描新的外掛。"
 
-#: src/ladspa/plugin.cc:499
+#: src/ladspa/plugin.cc:508
 msgid "Available plugins:"
 msgstr "可用的外掛："
 
-#: src/ladspa/plugin.cc:512 src/modplug/plugin_main.cc:92
-#: src/modplug/plugin_main.cc:95 src/modplug/plugin_main.cc:98
-#: src/modplug/plugin_main.cc:101
+#: src/ladspa/plugin.cc:521 src/modplug/plugin_main.cc:91
+#: src/modplug/plugin_main.cc:94 src/modplug/plugin_main.cc:97
+#: src/modplug/plugin_main.cc:100
 msgid "Enable"
 msgstr "啟用"
 
-#: src/ladspa/plugin.cc:518
+#: src/ladspa/plugin.cc:527
 msgid "Enabled plugins:"
 msgstr "啟用外掛："
 
-#: src/ladspa/plugin.cc:534
+#: src/ladspa/plugin.cc:543
 msgid "Settings"
 msgstr "設定"
 
-#: src/ladspa/plugin.cc:551
+#: src/ladspa/plugin.cc:560
 msgid ""
 "LADSPA Host for Audacious\n"
 "Copyright 2011 John Lindgren"
@@ -2307,7 +2398,7 @@
 msgid "LIRC Plugin"
 msgstr "Linux 紅外線遙控器外掛"
 
-#: src/lirc/lirc.cc:381
+#: src/lirc/lirc.cc:379
 msgid ""
 "A simple plugin to control Audacious using the LIRC remote control daemon\n"
 "\n"
@@ -2335,63 +2426,123 @@
 "\n"
 "For more information about LIRC, see http://lirc.org."
 
-#: src/lirc/lirc.cc:392
+#: src/lirc/lirc.cc:390
 msgid "Connection"
 msgstr "連線"
 
-#: src/lirc/lirc.cc:393
+#: src/lirc/lirc.cc:391
 msgid "Reconnect to LIRC server"
 msgstr "重新連線到 LIRC 伺服器"
 
-#: src/lirc/lirc.cc:395
+#: src/lirc/lirc.cc:393
 msgid "Wait before reconnecting:"
 msgstr "重新連線前的等待時間："
 
-#: src/lyricwiki/lyricwiki.cc:41
-msgid "LyricWiki Plugin"
-msgstr "LyricWiki 歌詞外掛"
-
-#: src/lyricwiki/lyricwiki.cc:131 src/lyricwiki-qt/lyricwiki.cc:136
-msgid "No lyrics available"
-msgstr "無可用的歌詞"
-
-#: src/lyricwiki/lyricwiki.cc:217 src/lyricwiki/lyricwiki.cc:226
-#: src/lyricwiki/lyricwiki.cc:243 src/lyricwiki/lyricwiki.cc:252
-#: src/lyricwiki/lyricwiki.cc:267 src/lyricwiki-qt/lyricwiki.cc:222
-#: src/lyricwiki-qt/lyricwiki.cc:231 src/lyricwiki-qt/lyricwiki.cc:248
-#: src/lyricwiki-qt/lyricwiki.cc:257 src/lyricwiki-qt/lyricwiki.cc:272
-msgid "Error"
-msgstr "錯誤"
-
-#: src/lyricwiki/lyricwiki.cc:218 src/lyricwiki/lyricwiki.cc:244
-#: src/lyricwiki-qt/lyricwiki.cc:223 src/lyricwiki-qt/lyricwiki.cc:249
+#: src/lyrics-common/chart_lyrics_provider.cc:93
+#: src/lyrics-common/chart_lyrics_provider.cc:150
+#: src/lyrics-common/lyrics_ovh_provider.cc:50
 #, c-format
 msgid "Unable to fetch %s"
 msgstr "無法取得 %s"
 
-#: src/lyricwiki/lyricwiki.cc:227 src/lyricwiki/lyricwiki.cc:253
-#: src/lyricwiki-qt/lyricwiki.cc:232 src/lyricwiki-qt/lyricwiki.cc:258
+#: src/lyrics-common/chart_lyrics_provider.cc:100
+#: src/lyrics-common/chart_lyrics_provider.cc:157
+#: src/lyrics-common/lyrics_ovh_provider.cc:57
 #, c-format
 msgid "Unable to parse %s"
 msgstr "無法分析 %s"
 
-#: src/lyricwiki/lyricwiki.cc:259 src/lyricwiki-qt/lyricwiki.cc:264
+#: src/lyrics-common/chart_lyrics_provider.cc:121
+#: src/lyrics-common/chart_lyrics_provider.cc:194
+#: src/lyrics-common/lyrics_ovh_provider.cc:88
 msgid "Looking for lyrics ..."
 msgstr "尋找歌詞中 ..."
 
-#: src/lyricwiki/lyricwiki.cc:267 src/lyricwiki-qt/lyricwiki.cc:272
-msgid "Missing song metadata"
-msgstr "找不到歌曲詮釋資料"
-
-#: src/lyricwiki/lyricwiki.cc:278 src/lyricwiki-qt/lyricwiki.cc:283
-msgid "Connecting to lyrics.wikia.com ..."
-msgstr "連線到 lyrics.wikia.com 中 ..."
-
-#: src/lyricwiki-qt/lyricwiki.cc:55
-msgid "LyricWiki Plugin (Qt)"
-msgstr "LyricWiki 歌詞外掛 (Qt)"
+#: src/lyrics-common/preferences.h:43
+msgid "Nowhere"
+msgstr "Nowhere"
+
+#: src/lyrics-common/preferences.h:49
+msgid "Artist is truncated at the start, Title -- at the end"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:50
+msgid "Chars to truncate on:"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:54
+msgid "Chars are ORed in RegExp, surrounded by whitespace"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:55
+msgid "Chars to split on:"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:56
+msgid "Further truncate those on chars"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:62
+msgid "General"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:63
+msgid "Split title into artist and title on chars"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:66
+msgid "Sources"
+msgstr ""
 
-#: src/m3u/m3u.cc:32
+#: src/lyrics-common/preferences.h:67
+msgid "Use embedded lyrics (from Lyrics tag)"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:69
+msgid "Fetch lyrics from internet:"
+msgstr ""
+
+#: src/lyrics-common/preferences.h:72
+msgid "Store fetched lyrics in local cache"
+msgstr "在本地快取中儲存擷取到的歌詞"
+
+#: src/lyrics-common/preferences.h:74
+msgid "Local Storage"
+msgstr "本地儲存空間"
+
+#: src/lyrics-common/preferences.h:75
+msgid "Load lyric files (.lrc) from local storage"
+msgstr "從本地儲存空間載入歌詞檔（.lrc）"
+
+#: src/lyrics-common/utils.cc:54 src/ui-common/dialogs-qt.cc:63
+msgid "Error"
+msgstr "錯誤"
+
+#: src/lyrics-common/utils.cc:60
+msgid "Lyrics could not be found."
+msgstr "找不到歌詞。"
+
+#: src/lyrics-common/utils.cc:142
+msgid "Missing title and/or artist."
+msgstr "缺少標題與（或）藝人。"
+
+#: src/lyrics-gtk/lyrics-gtk.cc:37 src/lyrics-qt/lyrics-qt.cc:50
+msgid "Lyrics"
+msgstr "歌詞"
+
+#: src/lyrics-gtk/lyrics-gtk.cc:189 src/lyrics-qt/lyrics-qt.cc:171
+msgid "Edit Lyrics ..."
+msgstr "編輯歌詞 ..."
+
+#: src/lyrics-gtk/lyrics-gtk.cc:195 src/lyrics-qt/lyrics-qt.cc:178
+msgid "Save Locally"
+msgstr "儲存於本機"
+
+#: src/lyrics-gtk/lyrics-gtk.cc:201 src/lyrics-qt/lyrics-qt.cc:186
+msgid "Refresh"
+msgstr "重新整理"
+
+#: src/m3u/m3u.cc:33
 msgid "M3U Playlists"
 msgstr "M3U 播放清單"
 
@@ -2399,17 +2550,17 @@
 msgid "Tact Generator"
 msgstr "節拍產生器"
 
-#: src/metronom/metronom.cc:147
+#: src/metronom/metronom.cc:145
 #, c-format
 msgid "Tact generator: %d bpm"
 msgstr "節拍產生器：%d bpm"
 
-#: src/metronom/metronom.cc:149
+#: src/metronom/metronom.cc:147
 #, c-format
 msgid "Tact generator: %d bpm %d/%d"
 msgstr "節拍產生器：%d bpm %d／%d"
 
-#: src/metronom/metronom.cc:237
+#: src/metronom/metronom.cc:235
 msgid ""
 "A Tact Generator by Martin Strauss <mys@faveve.uni-stuttgart.de>\n"
 "\n"
@@ -2423,11 +2574,11 @@
 "範例：tact://77 播放 77 BPM\n"
 "或 tact://60*3/4 以 3/4 拍播放 60 BPM"
 
-#: src/mixer/mixer.cc:38
+#: src/mixer/mixer.cc:43
 msgid "Channel Mixer"
 msgstr "聲道混合"
 
-#: src/mixer/mixer.cc:202
+#: src/mixer/mixer.cc:255
 msgid ""
 "Channel Mixer Plugin for Audacious\n"
 "Copyright 2011-2012 John Lindgren and Michał Lipski"
@@ -2435,11 +2586,11 @@
 "Channel Mixer Plugin for Audacious\n"
 "Copyright 2011-2012 John Lindgren and Michał Lipski"
 
-#: src/mixer/mixer.cc:206
+#: src/mixer/mixer.cc:259
 msgid "Channel Mixer"
 msgstr "聲道混合"
 
-#: src/mixer/mixer.cc:207
+#: src/mixer/mixer.cc:260
 msgid "Output channels:"
 msgstr "輸出聲道數目："
 
@@ -2451,168 +2602,176 @@
 msgid "Error connecting to MMS server"
 msgstr "連線到 MMS 伺服器時發生錯誤"
 
-#: src/modplug/modplugbmp.h:53
+#: src/modplug/modplugbmp.h:57
 msgid "ModPlug (Module Player)"
 msgstr "ModPlug (MOD 播放器)"
 
-#: src/modplug/plugin_main.cc:53
-msgid "Resolution"
-msgstr "解析度"
-
-#: src/modplug/plugin_main.cc:54
-msgid "8-bit"
-msgstr "8-bit"
-
 #: src/modplug/plugin_main.cc:55
-msgid "16-bit"
-msgstr "16-bit"
-
-#: src/modplug/plugin_main.cc:56
 msgid "Channels"
 msgstr "聲道"
 
-#: src/modplug/plugin_main.cc:60
+#: src/modplug/plugin_main.cc:59
 msgid "Nearest (fastest)"
 msgstr "最近點取樣(最快)"
 
-#: src/modplug/plugin_main.cc:61
+#: src/modplug/plugin_main.cc:60
 msgid "Linear (fast)"
 msgstr "線性取樣(快)"
 
-#: src/modplug/plugin_main.cc:62
+#: src/modplug/plugin_main.cc:61
 msgid "Spline (good)"
 msgstr "曲線函數(佳)"
 
-#: src/modplug/plugin_main.cc:63
+#: src/modplug/plugin_main.cc:62
 msgid "Polyphase (best)"
 msgstr "多相位取樣(最佳)"
 
-#: src/modplug/plugin_main.cc:64
+#: src/modplug/plugin_main.cc:63
 msgid "Sample rate"
 msgstr "取樣率"
 
-#: src/modplug/plugin_main.cc:65
+#: src/modplug/plugin_main.cc:64
 msgid "22 kHz"
 msgstr "22 kHz"
 
-#: src/modplug/plugin_main.cc:66
+#: src/modplug/plugin_main.cc:65
 msgid "44 kHz"
 msgstr "44 kHz"
 
-#: src/modplug/plugin_main.cc:67
+#: src/modplug/plugin_main.cc:66
 msgid "48 kHz"
 msgstr "48 kHz"
 
-#: src/modplug/plugin_main.cc:68
+#: src/modplug/plugin_main.cc:67
 msgid "96 kHz"
 msgstr "96 kHz"
 
-#: src/modplug/plugin_main.cc:72 src/modplug/plugin_main.cc:77
-#: src/modplug/plugin_main.cc:82
+#: src/modplug/plugin_main.cc:71 src/modplug/plugin_main.cc:76
+#: src/modplug/plugin_main.cc:81
 msgid "Level:"
 msgstr "強度："
 
-#: src/modplug/plugin_main.cc:78
+#: src/modplug/plugin_main.cc:77
 msgid "Cutoff:"
 msgstr "裁切："
 
-#: src/modplug/plugin_main.cc:91
+#: src/modplug/plugin_main.cc:90
 msgid "Reverb"
 msgstr "殘響"
 
-#: src/modplug/plugin_main.cc:94
+#: src/modplug/plugin_main.cc:93
 msgid "Bass Boost"
 msgstr "重低音強化"
 
-#: src/modplug/plugin_main.cc:97
+#: src/modplug/plugin_main.cc:96
 msgid "Surround"
 msgstr "環繞音效"
 
-#: src/modplug/plugin_main.cc:100
+#: src/modplug/plugin_main.cc:99
 msgid "Preamp"
 msgstr "前置放大"
 
-#: src/modplug/plugin_main.cc:107
+#: src/modplug/plugin_main.cc:106
 msgid "Oversample"
 msgstr "超取樣"
 
-#: src/modplug/plugin_main.cc:108
+#: src/modplug/plugin_main.cc:107
 msgid "Noise reduction"
 msgstr "降噪"
 
-#: src/modplug/plugin_main.cc:109
+#: src/modplug/plugin_main.cc:108
 msgid "Play Amiga MODs"
 msgstr "播放 Amiga MOD 檔案"
 
-#: src/modplug/plugin_main.cc:110
+#: src/modplug/plugin_main.cc:109
 msgid "Repeat"
 msgstr "重複"
 
-#: src/modplug/plugin_main.cc:111
+#: src/modplug/plugin_main.cc:110
 msgid "Repeat count:"
 msgstr "重複次數："
 
-#: src/modplug/plugin_main.cc:112
+#: src/modplug/plugin_main.cc:111
 msgid "To repeat forever, set the repeat count to -1."
 msgstr "將重複次數設定為 -1 表示永遠重複播放。"
 
-#: src/modplug/plugin_main.cc:125 src/sid/xs_config.cc:106
+#: src/modplug/plugin_main.cc:124 src/sid/xs_config.cc:106
 msgid "These settings will take effect when Audacious is restarted."
 msgstr "這些設定值將在 Audacious 重新啟動後生效。"
 
+#: src/moonstone/main_window.cc:72 src/moonstone/main_window.cc:73
+#: src/qtui/main_window.cc:159 src/qtui/main_window.cc:160
+#: src/skins/menus.cc:107 src/skins-qt/menus.cc:98
+msgid "Stop After This Song"
+msgstr "播放完目前歌曲後停止"
+
+#: src/moonstone/moonstone.cc:39
+msgid "Moonstone"
+msgstr ""
+
+#: src/moonstone/playlist_header.cc:212 src/qtui/playlist_header.cc:258
+msgid "Reset to Defaults"
+msgstr "重置回預設值"
+
+#: src/moonstone/playlist_model.cc:38 src/qtui/playlist_header.cc:232
+msgid "Now Playing"
+msgstr "正在播放"
+
+#: src/moonstone/playlist_selection.cc:66
+#: src/playlist-manager/playlist-manager.cc:201
+#: src/playlist-manager-qt/playlist-manager-qt.cc:190
+msgid "Entries"
+msgstr "項目數"
+
 #: src/mpg123/mpg123.cc:54
 msgid "MPG123 Plugin"
 msgstr "MPG123 外掛"
 
-#: src/mpg123/mpg123.cc:83
-msgid "Advanced"
-msgstr "進階"
-
-#: src/mpg123/mpg123.cc:84
+#: src/mpg123/mpg123.cc:82
 msgid "Use accurate length calculation (slow)"
 msgstr "啟用精確長度計算(慢)"
 
-#: src/mpg123/mpg123.cc:248
+#: src/mpg123/mpg123.cc:260
 msgid "Surround"
 msgstr "環繞"
 
-#: src/mpris2/plugin.cc:39
+#: src/mpris2/plugin.cc:40
 msgid "MPRIS 2 Server"
 msgstr "MPRIS 2 伺服器"
 
-#: src/neon/neon.cc:97
+#: src/neon/neon.cc:102
 msgid "Neon HTTP/HTTPS Plugin"
 msgstr "Neon HTTP／HTTPS 外掛"
 
-#: src/neon/neon.cc:521
+#: src/neon/neon.cc:526
 msgid "Error parsing redirect"
 msgstr "解析重新導向時發生錯誤"
 
-#: src/neon/neon.cc:535
+#: src/neon/neon.cc:540
 msgid "Unknown HTTP error"
 msgstr "發生未知的 HTTP 錯誤"
 
-#: src/neon/neon.cc:569
+#: src/neon/neon.cc:614
 msgid "Error parsing URL"
 msgstr "解析網址時發生錯誤"
 
-#: src/neon/neon.cc:632
+#: src/neon/neon.cc:687
 msgid "Too many redirects"
 msgstr "過多的重新導向"
 
-#: src/notify/event.cc:64
+#: src/notify/event.cc:97
 msgid "Stopped"
 msgstr "已停止"
 
-#: src/notify/event.cc:64
+#: src/notify/event.cc:97
 msgid "Audacious is not playing."
 msgstr "Audacious 非播放中。"
 
-#: src/notify/notify.cc:42
+#: src/notify/notify.cc:39
 msgid "Desktop Notifications"
 msgstr "桌面通知"
 
-#: src/notify/notify.cc:60
+#: src/notify/notify.cc:57
 msgid ""
 "Desktop Notifications Plugin for Audacious\n"
 "Copyright (C) 2010 Maximilian Bogner\n"
@@ -2648,36 +2807,76 @@
 "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.cc:110
+#: src/notify/notify.cc:104
 msgid "Show playback controls"
 msgstr "顯示播放控制元件"
 
-#: src/notify/notify.cc:112
+#: src/notify/notify.cc:106
 msgid "Always show notification"
 msgstr "永遠顯示通知"
 
-#: src/notify/notify.cc:114
+#: src/notify/notify.cc:108
 msgid "Include album name in notification"
 msgstr "在通知訊息中顯示專輯名稱"
 
-#: src/notify/osd.cc:58
+#: src/notify/notify.cc:110
+msgid "Custom notification duration:"
+msgstr ""
+
+#: src/notify/osd.cc:74
 msgid "Show"
 msgstr "顯示"
 
-#: src/notify/osd.cc:66 src/qtui/main_window.cc:178
-#: src/qtui/main_window.cc:179 src/skins/menus.cc:88
-msgid "Pause"
-msgstr "暫停"
+#: src/openmpt/mpt.cc:50
+msgid "OpenMPT (Module Player)"
+msgstr ""
 
-#: src/notify/osd.cc:73 src/qtui/main_window.cc:72 src/skins/menus.cc:91
-msgid "Next"
-msgstr "下一個"
+#: src/openmpt/mpt.cc:132
+msgid ""
+"Module player based on libopenmpt\n"
+"\n"
+"Written by: Chris Spiegel <cspiegel@gmail.com>"
+msgstr ""
+
+#: src/openmpt/mpt.cc:151
+msgid "Stereo separation:"
+msgstr ""
+
+#: src/openmpt/mpt.cc:153
+msgid "% (0=mono, 100=default, 200=full)"
+msgstr ""
+
+#: src/openmpt/mpt.cc:157
+msgid "Interpolation:"
+msgstr "內插："
+
+#: src/openmpt/mptwrap.h:51 src/soxr/sox-resampler.cc:189 src/xsf/plugin.cc:437
+msgid "Linear"
+msgstr "線形"
+
+#: src/openmpt/mptwrap.h:52
+msgid "Cubic"
+msgstr ""
 
-#: src/oss4/oss.h:93
+#: src/openmpt/mptwrap.h:53
+msgid "Windowed sinc"
+msgstr ""
+
+#: src/opus/opus.cc:39
+msgid "Opus Decoder"
+msgstr ""
+
+#: src/opus/opus.cc:336
+msgid ""
+"Opus Decoder Plugin for Audacious\n"
+"Copyright 2022 Thomas Lange"
+msgstr ""
+
+#: src/oss4/oss.h:70
 msgid "OSS4 Output"
 msgstr "OSS4 輸出"
 
-#: src/oss4/oss.h:95
+#: src/oss4/oss.h:72
 msgid "OSS3 Output"
 msgstr "OSS3 輸出"
 
@@ -2685,27 +2884,27 @@
 msgid "Default device"
 msgstr "預設裝置"
 
-#: src/oss4/plugin.cc:77
+#: src/oss4/plugin.cc:78
 msgid "Audio device:"
 msgstr "音訊裝置："
 
-#: src/oss4/plugin.cc:80
+#: src/oss4/plugin.cc:81
 msgid "Use alternate device:"
 msgstr "使用替代裝置："
 
-#: src/oss4/plugin.cc:84
+#: src/oss4/plugin.cc:85
 msgid "Save volume between sessions."
 msgstr "儲存不同工作階段的音量。"
 
-#: src/oss4/plugin.cc:86
+#: src/oss4/plugin.cc:87
 msgid "Enable format conversions made by the OSS software."
 msgstr "啟用格式轉換 (使用 OSS 軟體)。"
 
-#: src/oss4/plugin.cc:88
+#: src/oss4/plugin.cc:89
 msgid "Enable exclusive mode to prevent virtual mixing."
 msgstr "啟用獨占模式以防止虛擬混音。"
 
-#: src/oss4/plugin.cc:100
+#: src/oss4/plugin.cc:101
 msgid ""
 "OSS4 Output Plugin for Audacious\n"
 "Copyright 2010-2012 Michał Lipski\n"
@@ -2719,19 +2918,35 @@
 "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/playlist-manager/playlist-manager.cc:37
+#: src/pipewire/pipewire.cc:44
+msgid "PipeWire Output"
+msgstr ""
+
+#: src/pipewire/pipewire.cc:118
+msgid ""
+"PipeWire Output Plugin for Audacious\n"
+"Copyright 2022 Thomas Lange\n"
+"\n"
+"Based on the PipeWire Output Plugin for Qmmp\n"
+"Copyright 2021 Ilya Kotov"
+msgstr ""
+
+#: src/pipewire/pipewire.cc:408 src/skins/menus.cc:88 src/skins-qt/menus.cc:79
+msgid "Playback"
+msgstr "播放"
+
+#: src/playlist-manager/playlist-manager.cc:38
+#: src/playlist-manager-qt/playlist-manager-qt.cc:42
 msgid "Playlist Manager"
 msgstr "播放清單管理"
 
-#: src/playlist-manager/playlist-manager.cc:226
-msgid "Entries"
-msgstr "項目數"
-
-#: src/playlist-manager/playlist-manager.cc:245
+#: src/playlist-manager/playlist-manager.cc:221
+#: src/playlist-manager-qt/playlist-manager-qt.cc:356
 msgid "_Remove"
 msgstr "移除(_R)"
 
-#: src/playlist-manager/playlist-manager.cc:246
+#: src/playlist-manager/playlist-manager.cc:222
+#: src/playlist-manager-qt/playlist-manager-qt.cc:351
 msgid "Ren_ame"
 msgstr "重新命名(_A)"
 
@@ -2739,55 +2954,69 @@
 msgid "PLS Playlists"
 msgstr "PLS 播放清單"
 
-#: src/psf/plugin.cc:45
+#: src/psf/plugin.cc:53
 msgid "OpenPSF PSF1/PSF2 Decoder"
 msgstr "OpenPSF PSF1／PSF2 解碼器"
 
-#: src/pulse_audio/pulse_audio.cc:38
+#: src/psf/plugin.cc:270
+msgid "OpenPSF Configuration"
+msgstr "OpenPSF 組態"
+
+#: src/psf/plugin.cc:271 src/xsf/plugin.cc:444
+msgid "Ignore length from file"
+msgstr "忽略來自檔案的長度資訊"
+
+#: src/pulse/pulse_audio.cc:42
 msgid "PulseAudio Output"
 msgstr "PulseAudio 輸出"
 
-#: src/pulse_audio/pulse_audio.cc:611
+#: src/pulse/pulse_audio.cc:84
+msgid "Context name:"
+msgstr ""
+
+#: src/pulse/pulse_audio.cc:86
+msgid "Stream name:"
+msgstr ""
+
+#: src/pulse/pulse_audio.cc:596
 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."
+"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 ""
 "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."
+"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/qtaudio/qtaudio.cc:49
+#: src/qtaudio/qtaudio.cc:53
 msgid "QtMultimedia Output"
 msgstr "QtMultimedia 輸出"
 
-#: src/qtaudio/qtaudio.cc:77
+#: src/qtaudio/qtaudio.cc:84
 msgid ""
 "QtMultimedia Audio Output Plugin for Audacious\n"
 "Copyright 2014 William Pitcock\n"
@@ -2801,50 +3030,87 @@
 "Based on SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
 
-#: src/qtui/dialog_windows.cc:31
-msgid "Working ..."
-msgstr "處理中 ..."
+#: src/qtglspectrum/gl-spectrum.cc:41
+msgid ""
+"OpenGL Spectrum Analyzer for Audacious\n"
+"Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
+"Copyright 2014, 2020 Ariadne Conill\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/qtui/filter_input.cc:44 src/skins/ui_playlist.cc:221
-msgid "Search"
-msgstr "搜尋"
+#: src/qthotkey/gui.cc:177
+msgid "Press a key combination inside a text field."
+msgstr ""
+
+#: src/qthotkey/plugin.cc:105
+msgid ""
+"Global Hotkey Plugin\n"
+"Control the player with global key combinations or multimedia keys.\n"
+"\n"
+"Copyright (C) 2020 i.Dark_Templar <darktemplar@dark-templar-archives.net>\n"
+"Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n"
+"\n"
+"Contributors 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/qtui/main_window_actions.cc:94
+#: src/qtui/menus.cc:109
 msgid "_Open Folder ..."
 msgstr "開啟資料夾(_O) ..."
 
-#: src/qtui/main_window_actions.cc:96
+#: src/qtui/menus.cc:115
 msgid "_Add Folder ..."
 msgstr "加入資料夾(_A) ..."
 
-#: src/qtui/main_window_actions.cc:101
+#: src/qtui/menus.cc:128
 msgid "_Log Inspector ..."
 msgstr "監控記錄(_L) ..."
 
-#: src/qtui/main_window.cc:64
-msgid "Open Files"
-msgstr "開啟檔案"
+#: src/qtui/menus.cc:220
+msgid "_Find ..."
+msgstr "搜尋(_F) ..."
 
-#: src/qtui/main_window.cc:66
-msgid "Add Files"
-msgstr "加入檔案"
+#: src/qtui/menus.cc:256 src/skins/menus.cc:80 src/skins-qt/menus.cc:70
+msgid "Audio Settings ..."
+msgstr "音訊設定 ..."
 
-#: src/qtui/main_window.cc:71 src/skins/menus.cc:90
-msgid "Previous"
-msgstr "上一個"
+#: src/qtui/playlist_model.cc:188
+msgid "Q#"
+msgstr ""
 
-#: src/qtui/main_window.cc:77 src/skins/menus.cc:82
-msgid "Repeat"
-msgstr "重複"
+#: src/qtui/playlist_model.cc:190
+msgid "T#"
+msgstr ""
 
-#: src/qtui/main_window.cc:79 src/skins/menus.cc:83
-msgid "Shuffle"
-msgstr "隨機"
+#: src/qtui/playlist_model.cc:192
+msgid "C#"
+msgstr ""
 
-#: src/qtui/qtui.cc:42
+#: src/qtui/playlist_model.cc:194
+msgid "D#"
+msgstr ""
+
+#: src/qtui/qtui.cc:40
 msgid "Qt Interface"
 msgstr "Qt 介面"
 
+#: src/qtui/search_bar.cc:46
+msgid "Search playlist"
+msgstr "搜尋播放清單"
+
+#: src/qtui/settings.cc:79
+msgid "Use bold font for column headers"
+msgstr ""
+
 #: src/resample/resample.cc:43
 msgid "Sample Rate Converter"
 msgstr "取樣率轉換"
@@ -2885,7 +3151,7 @@
 msgid "Method:"
 msgstr "演算法："
 
-#: src/resample/resample.cc:199 src/sox-resampler/sox-resampler.cc:161
+#: src/resample/resample.cc:199 src/soxr/sox-resampler.cc:203
 msgid "Rate:"
 msgstr "取樣率："
 
@@ -2937,61 +3203,51 @@
 msgid "192 kHz:"
 msgstr "192 kHz："
 
-#: src/scrobbler2/config_window.cc:41
-#, c-format
-msgid "OK. Scrobbling for user: %s"
-msgstr "確認。上傳使用者 %s 的播放資訊"
+#: src/scrobbler2/config_window.cc:29
+msgid "Checking Last.fm access ..."
+msgstr "正在檢查 Last.fm 存取權限 ..."
 
-#: src/scrobbler2/config_window.cc:54
-msgid "Permission Denied"
-msgstr "存取被拒"
-
-#: src/scrobbler2/config_window.cc:56
-msgid "Access the following link to allow Audacious to scrobble your plays:"
-msgstr "點選下列連結允許 Audacious 上傳您的播放資訊："
-
-#: src/scrobbler2/config_window.cc:66
-msgid "Keep this window open and click 'Check Permission' again.\n"
-msgstr "請保持這個視窗的開啟並再次點選「檢查權限」。\n"
-
-#: src/scrobbler2/config_window.cc:69 src/scrobbler2/config_window.cc:80
+#: src/scrobbler2/config_window.cc:35
 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."
+"Your scrobbles are being saved on your computer temporarily. They will be "
+"submitted as soon as Audacious is allowed access."
 msgstr ""
-"別擔心。您的資訊已經儲存在電腦上。\n"
-"Audacious 會在狀況允許下盡快地將它們上傳。"
+"您的播放記錄已暫時儲存在電腦上。Audacious 會在狀況允許下盡快地將它們上傳。"
 
-#: src/scrobbler2/config_window.cc:77
-msgid "Network Problem."
-msgstr "網路發生問題。"
+#: src/scrobbler2/config_window.cc:41
+#, c-format
+msgid "Permission granted. Scrobbling for user %s."
+msgstr "已取得授權。上傳使用者 %s 的播放記錄。"
 
-#: src/scrobbler2/config_window.cc:78
-msgid "There was a problem contacting Last.fm. Please try again later."
-msgstr "存取 Last.fm 時發生問題。請稍候再試。"
+#: src/scrobbler2/config_window.cc:44
+msgid ""
+"Permission denied. Open the following URL in a browser, allow Audacious "
+"access to your account, and then click 'Check Permission' again:"
+msgstr ""
+"存取被拒。請用瀏覽器開啟以下連結並允許 Audacious 存取您的帳號，然後再點一次"
+"「檢查授權」："
 
-#: src/scrobbler2/config_window.cc:110
-msgid "Checking..."
-msgstr "檢查中..."
+#: src/scrobbler2/config_window.cc:53
+msgid "There was a problem contacting Last.fm."
+msgstr "存取 Last.fm 時發生問題。"
 
-#: src/scrobbler2/config_window.cc:176
-msgid "C_heck Permission"
-msgstr "檢查權限(_H)"
+#: src/scrobbler2/config_window.cc:92
+msgid "Check Permission"
+msgstr "檢查授權"
 
-#: src/scrobbler2/config_window.cc:177
-msgid "_Revoke Permission"
-msgstr "撤銷授權(_R)"
+#: src/scrobbler2/config_window.cc:93
+msgid "Revoke Permission"
+msgstr "撤銷授權"
 
-#: src/scrobbler2/config_window.cc:220
-msgid ""
-"You need to allow Audacious to scrobble tracks to your Last.fm account.\n"
-msgstr "您需要允許 Audacious 上傳音軌的播放資訊到您的 Last.fm 帳號。\n"
+#: src/scrobbler2/config_window.cc:97
+msgid "You need to allow Audacious to scrobble tracks to your Last.fm account."
+msgstr "您必須允許 Audacious 上傳音軌的播放記錄到您的 Last.fm 帳號。"
 
 #: src/scrobbler2/scrobbler.cc:29
 msgid "Scrobbler 2.0"
 msgstr "Scrobbler 2.0"
 
-#: src/scrobbler2/scrobbler.cc:224
+#: src/scrobbler2/scrobbler.cc:200
 msgid ""
 "The Scrobbler plugin could not be started.\n"
 "There might be a problem with your installation."
@@ -2999,37 +3255,21 @@
 "無法啟動 Scrobbler 外掛。\n"
 "您的安裝可能有些問題。"
 
-#: src/scrobbler2/scrobbler.cc:289
+#: src/scrobbler2/scrobbler.cc:245
 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"
+"project."
 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_communication.cc:642
-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/sdlout.cc:48
+#: src/sdlout/sdlout.cc:43
 msgid "SDL Output"
 msgstr "SDL 輸出"
 
-#: src/sdlout/sdlout.cc:77
+#: src/sdlout/sdlout.cc:72
 msgid ""
 "SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
@@ -3037,75 +3277,84 @@
 "SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren"
 
-#: src/search-tool/search-tool.cc:116 src/search-tool/search-tool.cc:124
+#: src/search-tool/library.cc:35 src/search-tool/library.cc:46
+#: src/search-tool-qt/library.cc:35 src/search-tool-qt/library.cc:46
 msgid "Library"
 msgstr "媒體櫃"
 
-#: src/search-tool/search-tool.cc:394
-#, c-format
-msgid "%d result"
-msgid_plural "%d results"
-msgstr0 "%d 項結果"
-
-#: src/search-tool/search-tool.cc:400
-#, c-format
-msgid "(%d hidden)"
-msgid_plural "(%d hidden)"
-msgstr0 "(%d 項隱藏)"
-
-#: src/search-tool/search-tool.cc:594
+#: src/search-tool-qt/search-model.cc:44 src/search-tool/search-tool.cc:287
 #, c-format
 msgid "%d song"
 msgid_plural "%d songs"
 msgstr0 "%d 首歌曲"
 
-#: src/search-tool/search-tool.cc:601
+#: src/search-tool-qt/search-model.cc:53 src/search-tool/search-tool.cc:294
 msgid "of this genre"
 msgstr "符合此分類"
 
-#: src/search-tool/search-tool.cc:607
+#: src/search-tool-qt/search-model.h:47 src/search-tool/search-model.h:45
 msgid "on"
 msgstr "收錄於"
 
-#: src/search-tool/search-tool.cc:607
+#: src/search-tool-qt/search-model.h:47 src/search-tool/search-model.h:45
 msgid "by"
 msgstr "-"
 
-#: src/search-tool/search-tool.cc:643
-msgid "_Create Playlist"
-msgstr "建立播放清單(_C)"
-
-#: src/search-tool/search-tool.cc:645
-msgid "_Add to Playlist"
-msgstr "加到播放清單(_A)"
+#: src/search-tool-qt/search-tool-qt.cc:165 src/search-tool/search-tool.cc:74
+msgid "Number of results to show:"
+msgstr "顯示多少搜尋結果："
+
+#: src/search-tool-qt/search-tool-qt.cc:168 src/search-tool/search-tool.cc:77
+msgid "Rescan library at startup"
+msgstr "啟動時重新掃瞄媒體櫃"
+
+#: src/search-tool-qt/search-tool-qt.cc:170
+msgid "Monitor library for changes"
+msgstr "偵測媒體櫃的異動"
 
-#: src/search-tool/search-tool.cc:684
-msgid "Search library"
-msgstr "搜尋媒體櫃"
-
-#: src/search-tool/search-tool.cc:688
+#: src/search-tool-qt/search-tool-qt.cc:193 src/search-tool/search-tool.cc:450
 msgid ""
 "To import your music library into Audacious, choose a folder and then click "
 "the \"refresh\" icon."
 msgstr ""
 "要將您的媒體櫃匯入 Audacious，請選擇目標資料夾並且按下 \"重新整理\" 圖示。"
 
-#: src/search-tool/search-tool.cc:696
+#: src/search-tool-qt/search-tool-qt.cc:195 src/search-tool/search-tool.cc:459
 msgid "Please wait ..."
 msgstr "請稍候 ..."
 
-#: src/search-tool/search-tool.cc:723
+#: src/search-tool-qt/search-tool-qt.cc:197 src/search-tool/search-tool.cc:487
 msgid "Choose Folder"
 msgstr "選擇資料夾"
 
+#: src/search-tool-qt/search-tool-qt.cc:201 src/search-tool/search-tool.cc:445
+msgid "Search library"
+msgstr "搜尋媒體櫃"
+
+#: src/search-tool-qt/search-tool-qt.cc:327 src/search-tool/search-tool.cc:156
+#, c-format
+msgid "%d of %d result shown"
+msgid_plural "%d of %d results shown"
+msgstr0 "顯示 %d 項結果，共 %d 項"
+
+#: src/search-tool-qt/search-tool-qt.cc:331 src/search-tool/search-tool.cc:160
+#, c-format
+msgid "%d result"
+msgid_plural "%d results"
+msgstr0 "%d 項結果"
+
+#: src/search-tool-qt/search-tool-qt.cc:501 src/search-tool/search-tool.cc:341
+msgid "_Create Playlist"
+msgstr "建立播放清單(_C)"
+
+#: src/search-tool-qt/search-tool-qt.cc:503 src/search-tool/search-tool.cc:343
+msgid "_Add to Playlist"
+msgstr "加到播放清單(_A)"
+
 #: src/sid/xmms-sid.cc:43
 msgid "SID Player"
 msgstr "SID 播放器"
 
-#: src/sid/xs_config.cc:61
-msgid "Output"
-msgstr "輸出"
-
 #: src/sid/xs_config.cc:62
 msgid "Channels:"
 msgstr "聲道數："
@@ -3186,739 +3435,682 @@
 msgid "Threshold:"
 msgstr "閥值："
 
-#: src/silence-removal/silence-removal.cc:70
-msgid "dB"
-msgstr "dB"
+#: src/skins/actions.cc:45 src/skins-qt/actions.cc:43
+msgid "Repeat points cleared."
+msgstr "已清除重複點。"
 
-#: src/skins/menus.cc:64
+#: src/skins/actions.cc:60 src/skins-qt/actions.cc:58
+msgid "Repeat point A set."
+msgstr "已設定重複點 A。"
+
+#: src/skins/actions.cc:65 src/skins-qt/actions.cc:63
+msgid "Repeat point B set."
+msgstr "已設定重複點 B。"
+
+#: src/skins/equalizer.cc:223 src/skins-qt/equalizer.cc:223
+msgid "Preamp"
+msgstr "前置放大"
+
+#: src/skins/equalizer.cc:227 src/skins-qt/equalizer.cc:227
+msgid "31 Hz"
+msgstr "31 Hz"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "63 Hz"
+msgstr "63 Hz"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "125 Hz"
+msgstr "125 Hz"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "250 Hz"
+msgstr "250 Hz"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "500 Hz"
+msgstr "500 Hz"
+
+#: src/skins/equalizer.cc:228 src/skins-qt/equalizer.cc:228
+msgid "1 kHz"
+msgstr "1 kHz"
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "2 kHz"
+msgstr "2 kHz"
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "4 kHz"
+msgstr "4 kHz"
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "8 kHz"
+msgstr "8 kHz"
+
+#: src/skins/equalizer.cc:229 src/skins-qt/equalizer.cc:229
+msgid "16 kHz"
+msgstr "16 kHz"
+
+#: src/skins/equalizer.cc:270 src/skins-qt/equalizer.cc:270
+msgid "Audacious Equalizer"
+msgstr "Audacious 等化器"
+
+#: src/skins/main.cc:459 src/skins-qt/main.cc:442
+msgid "Recording on"
+msgstr "錄音開啟"
+
+#: src/skins/main.cc:461 src/skins-qt/main.cc:444
+msgid "Recording off"
+msgstr "錄音關閉"
+
+#: src/skins/main.cc:754 src/skins-qt/main.cc:701
+#, c-format
+msgid "Seek to %d:%-2.2d / %d:%-2.2d"
+msgstr "移動到 %d:%-2.2d／%d:%-2.2d"
+
+#: src/skins/main.cc:771 src/skins-qt/main.cc:718
+#, c-format
+msgid "Volume: %d%%"
+msgstr "音量：%d％"
+
+#: src/skins/main.cc:784 src/skins-qt/main.cc:731
+#, c-format
+msgid "Balance: %d%% left"
+msgstr "平衡：%d％ 偏左"
+
+#: src/skins/main.cc:786 src/skins-qt/main.cc:733
+msgid "Balance: center"
+msgstr "平衡：中間"
+
+#: src/skins/main.cc:788 src/skins-qt/main.cc:735
+#, c-format
+msgid "Balance: %d%% right"
+msgstr "平衡：%d％ 偏右"
+
+#: src/skins/main.cc:880 src/skins-qt/main.cc:827
+msgid "Options Menu"
+msgstr "選單選項"
+
+#: src/skins/main.cc:884 src/skins-qt/main.cc:831
+msgid "Disable 'Always On Top'"
+msgstr "關閉置頂"
+
+#: src/skins/main.cc:886 src/skins-qt/main.cc:833
+msgid "Enable 'Always On Top'"
+msgstr "啟用置頂"
+
+#: src/skins/main.cc:889 src/skins-qt/main.cc:836
+msgid "File Info Box"
+msgstr "檔案資訊視窗"
+
+#: src/skins/main.cc:892 src/skins/menus.cc:149 src/skins-qt/main.cc:839
+#: src/skins-qt/menus.cc:142
+msgid "Double Size"
+msgstr "兩倍大小"
+
+#: src/skins/main.cc:895 src/skins-qt/main.cc:842
+msgid "Visualizations"
+msgstr "視覺特效"
+
+#: src/skins/menus.cc:74 src/skins-qt/menus.cc:64
+msgid "Volume Up"
+msgstr "提高音量"
+
+#: src/skins/menus.cc:75 src/skins-qt/menus.cc:65
+msgid "Volume Down"
+msgstr "降低音量"
+
+#: src/skins/menus.cc:77 src/skins-qt/menus.cc:67
+msgid "Effects ..."
+msgstr "特效 ..."
+
+#: src/skins/menus.cc:84 src/skins-qt/menus.cc:74
 msgid "Open Files ..."
 msgstr "開啟檔案 ..."
 
-#: src/skins/menus.cc:65
+#: src/skins/menus.cc:85 src/skins-qt/menus.cc:76
 msgid "Open URL ..."
 msgstr "開啟網址 ..."
 
-#: src/skins/menus.cc:66
-msgid "Search Library"
-msgstr "搜尋媒體櫃"
-
-#: src/skins/menus.cc:68
-msgid "Playback"
-msgstr "播放"
-
-#: src/skins/menus.cc:69
+#: src/skins/menus.cc:89 src/skins-qt/menus.cc:80
 msgid "Playlist"
 msgstr "播放清單"
 
-#: src/skins/menus.cc:70
+#: src/skins/menus.cc:90 src/skins-qt/menus.cc:81
+msgid "Output"
+msgstr "輸出"
+
+#: src/skins/menus.cc:91 src/skins-qt/menus.cc:82
 msgid "View"
 msgstr "檢視"
 
-#: src/skins/menus.cc:72 src/skins/menus.cc:136 src/skins/menus.cc:149
-#: src/skins/menus.cc:214
+#: src/skins/menus.cc:93 src/skins/menus.cc:161 src/skins/menus.cc:174
+#: src/skins/menus.cc:245 src/skins-qt/menus.cc:84 src/skins-qt/menus.cc:156
+#: src/skins-qt/menus.cc:170 src/skins-qt/menus.cc:241
 msgid "Services"
 msgstr "服務"
 
-#: src/skins/menus.cc:74
+#: src/skins/menus.cc:95 src/skins-qt/menus.cc:86
 msgid "About ..."
 msgstr "關於 ..."
 
-#: src/skins/menus.cc:75
+#: src/skins/menus.cc:96 src/skins-qt/menus.cc:87
 msgid "Settings ..."
 msgstr "設定 ..."
 
-#: src/skins/menus.cc:76
+#: src/skins/menus.cc:97 src/skins-qt/menus.cc:88
 msgid "Quit"
 msgstr "離開"
 
-#: src/skins/menus.cc:80 src/skins/menus.cc:206
+#: src/skins/menus.cc:101 src/skins/menus.cc:235 src/skins-qt/menus.cc:92
+#: src/skins-qt/menus.cc:231
 msgid "Song Info ..."
 msgstr "歌曲資訊 ..."
 
-#: src/skins/menus.cc:84
+#: src/skins/menus.cc:105 src/skins-qt/menus.cc:96
+msgid "Shuffle by Album"
+msgstr "以專輯為單位亂序播放"
+
+#: src/skins/menus.cc:106 src/skins-qt/menus.cc:97
 msgid "No Playlist Advance"
 msgstr "不要切換播放清單"
 
-#: src/skins/menus.cc:85
-msgid "Stop After This Song"
-msgstr "播放完目前歌曲後停止"
-
-#: src/skins/menus.cc:93
+#: src/skins/menus.cc:117 src/skins-qt/menus.cc:108
 msgid "Set A-B Repeat"
 msgstr "設定 A-B 循環"
 
-#: src/skins/menus.cc:94
+#: src/skins/menus.cc:118 src/skins-qt/menus.cc:109
 msgid "Clear A-B Repeat"
 msgstr "清除 A-B 循環"
 
-#: src/skins/menus.cc:96
+#: src/skins/menus.cc:120 src/skins-qt/menus.cc:111
 msgid "Jump to Song ..."
 msgstr "跳轉到指定歌曲 ..."
 
-#: src/skins/menus.cc:97
+#: src/skins/menus.cc:121 src/skins-qt/menus.cc:113
 msgid "Jump to Time ..."
 msgstr "跳轉到指定時間 ..."
 
-#: src/skins/menus.cc:101
+#: src/skins/menus.cc:125 src/skins-qt/menus.cc:118
 msgid "Play/Resume"
 msgstr "播放／回復"
 
-#: src/skins/menus.cc:103
+#: src/skins/menus.cc:127 src/skins-qt/menus.cc:120
 msgid "New Playlist"
 msgstr "新增播放清單"
 
-#: src/skins/menus.cc:104
+#: src/skins/menus.cc:128 src/skins-qt/menus.cc:121
 msgid "Rename Playlist ..."
 msgstr "重新命名播放清單 ..."
 
-#: src/skins/menus.cc:105
+#: src/skins/menus.cc:129 src/skins-qt/menus.cc:122
 msgid "Remove Playlist"
 msgstr "移除播放清單"
 
-#: src/skins/menus.cc:107
+#: src/skins/menus.cc:131 src/skins-qt/menus.cc:124
 msgid "Previous Playlist"
 msgstr "上一個播放清單"
 
-#: src/skins/menus.cc:108
+#: src/skins/menus.cc:132 src/skins-qt/menus.cc:125
 msgid "Next Playlist"
 msgstr "下一個播放清單"
 
-#: src/skins/menus.cc:110
+#: src/skins/menus.cc:134 src/skins-qt/menus.cc:127
 msgid "Import Playlist ..."
 msgstr "匯入播放清單 ..."
 
-#: src/skins/menus.cc:111
+#: src/skins/menus.cc:135 src/skins-qt/menus.cc:128
 msgid "Export Playlist ..."
 msgstr "匯出播放清單 ..."
 
-#: src/skins/menus.cc:113
+#: src/skins/menus.cc:137 src/skins-qt/menus.cc:130
 msgid "Playlist Manager ..."
 msgstr "播放清單管理 ..."
 
-#: src/skins/menus.cc:114
+#: src/skins/menus.cc:138 src/skins-qt/menus.cc:131
 msgid "Queue Manager ..."
 msgstr "佇列管理 ..."
 
-#: src/skins/menus.cc:116
+#: src/skins/menus.cc:140 src/skins-qt/menus.cc:133
 msgid "Refresh Playlist"
 msgstr "重整播放清單"
 
-#: src/skins/menus.cc:120
+#: src/skins/menus.cc:144 src/skins-qt/menus.cc:137
 msgid "Show Playlist Editor"
 msgstr "顯示播放清單編輯器"
 
-#: src/skins/menus.cc:121
+#: src/skins/menus.cc:145 src/skins-qt/menus.cc:138
 msgid "Show Equalizer"
 msgstr "顯示等化器"
 
-#: src/skins/menus.cc:123
+#: src/skins/menus.cc:147 src/skins-qt/menus.cc:140
 msgid "Show Remaining Time"
 msgstr "顯示剩餘時間"
 
-#: src/skins/menus.cc:125
+#: src/skins/menus.cc:150 src/skins-qt/menus.cc:143
 msgid "Always on Top"
 msgstr "永遠在最上層"
 
-#: src/skins/menus.cc:126
+#: src/skins/menus.cc:151 src/skins-qt/menus.cc:145
 msgid "On All Workspaces"
 msgstr "在所有工作區顯示"
 
-#: src/skins/menus.cc:128
+#: src/skins/menus.cc:153 src/skins-qt/menus.cc:148
 msgid "Roll Up Player"
 msgstr "捲起播放器"
 
-#: src/skins/menus.cc:129
+#: src/skins/menus.cc:154 src/skins-qt/menus.cc:149
 msgid "Roll Up Playlist Editor"
 msgstr "捲起播放清單編輯器"
 
-#: src/skins/menus.cc:130
+#: src/skins/menus.cc:155 src/skins-qt/menus.cc:150
 msgid "Roll Up Equalizer"
 msgstr "捲起等化器"
 
-#: src/skins/menus.cc:132 src/skins/ui_main.cc:854
-msgid "Double Size"
-msgstr "兩倍大小"
-
-#: src/skins/menus.cc:138
+#: src/skins/menus.cc:163 src/skins-qt/menus.cc:158
 msgid "Add URL ..."
 msgstr "加入網址 ..."
 
-#: src/skins/menus.cc:139
+#: src/skins/menus.cc:164 src/skins-qt/menus.cc:160
 msgid "Add Files ..."
 msgstr "加入檔案 ... "
 
-#: src/skins/menus.cc:143 src/skins/menus.cc:171 src/skins/menus.cc:185
+#: src/skins/menus.cc:168 src/skins/menus.cc:196 src/skins/menus.cc:212
+#: src/skins-qt/menus.cc:164 src/skins-qt/menus.cc:192
+#: src/skins-qt/menus.cc:208
 msgid "By Title"
 msgstr "標題"
 
-#: src/skins/menus.cc:144 src/skins/menus.cc:178 src/skins/menus.cc:192
+#: src/skins/menus.cc:169 src/skins/menus.cc:203 src/skins/menus.cc:219
+#: src/skins-qt/menus.cc:165 src/skins-qt/menus.cc:199
+#: src/skins-qt/menus.cc:215
 msgid "By File Name"
 msgstr "檔案名稱"
 
-#: src/skins/menus.cc:145 src/skins/menus.cc:179 src/skins/menus.cc:193
+#: src/skins/menus.cc:170 src/skins/menus.cc:204 src/skins/menus.cc:220
+#: src/skins-qt/menus.cc:166 src/skins-qt/menus.cc:200
+#: src/skins-qt/menus.cc:216
 msgid "By File Path"
 msgstr "檔案路徑"
 
-#: src/skins/menus.cc:151
+#: src/skins/menus.cc:176 src/skins-qt/menus.cc:172
 msgid "Remove All"
 msgstr "全部移除"
 
-#: src/skins/menus.cc:152
+#: src/skins/menus.cc:177 src/skins-qt/menus.cc:173
 msgid "Clear Queue"
 msgstr "清除佇列"
 
-#: src/skins/menus.cc:154
+#: src/skins/menus.cc:179 src/skins-qt/menus.cc:175
 msgid "Remove Unavailable Files"
 msgstr "移除無法使用的檔案"
 
-#: src/skins/menus.cc:155
+#: src/skins/menus.cc:180 src/skins-qt/menus.cc:176
 msgid "Remove Duplicates"
 msgstr "移除重複的項目"
 
-#: src/skins/menus.cc:157
+#: src/skins/menus.cc:182 src/skins-qt/menus.cc:178
 msgid "Remove Unselected"
 msgstr "移除未選擇的項目"
 
-#: src/skins/menus.cc:158
+#: src/skins/menus.cc:183 src/skins-qt/menus.cc:179
 msgid "Remove Selected"
 msgstr "移除選擇的項目"
 
-#: src/skins/menus.cc:162
+#: src/skins/menus.cc:187 src/skins-qt/menus.cc:183
 msgid "Search and Select"
 msgstr "搜尋並選擇"
 
-#: src/skins/menus.cc:164
+#: src/skins/menus.cc:189 src/skins-qt/menus.cc:185
 msgid "Invert Selection"
 msgstr "反向選擇"
 
-#: src/skins/menus.cc:165
+#: src/skins/menus.cc:190 src/skins-qt/menus.cc:186
 msgid "Select None"
 msgstr "取消選擇"
 
-#: src/skins/menus.cc:166
+#: src/skins/menus.cc:191 src/skins-qt/menus.cc:187
 msgid "Select All"
 msgstr "選擇全部"
 
-#: src/skins/menus.cc:170 src/skins/menus.cc:184
+#: src/skins/menus.cc:195 src/skins/menus.cc:211 src/skins-qt/menus.cc:191
+#: src/skins-qt/menus.cc:207
 msgid "By Track Number"
 msgstr "音軌編號"
 
-#: src/skins/menus.cc:172 src/skins/menus.cc:186
+#: src/skins/menus.cc:197 src/skins/menus.cc:213 src/skins-qt/menus.cc:193
+#: src/skins-qt/menus.cc:209
 msgid "By Artist"
 msgstr "藝人"
 
-#: src/skins/menus.cc:173 src/skins/menus.cc:187
+#: src/skins/menus.cc:198 src/skins/menus.cc:214 src/skins-qt/menus.cc:194
+#: src/skins-qt/menus.cc:210
 msgid "By Album"
 msgstr "專輯"
 
-#: src/skins/menus.cc:174 src/skins/menus.cc:188
+#: src/skins/menus.cc:199 src/skins/menus.cc:215 src/skins-qt/menus.cc:195
+#: src/skins-qt/menus.cc:211
 msgid "By Album Artist"
 msgstr "專輯藝人"
 
-#: src/skins/menus.cc:175 src/skins/menus.cc:190
+#: src/skins/menus.cc:200 src/skins/menus.cc:216 src/skins-qt/menus.cc:196
+#: src/skins-qt/menus.cc:212
 msgid "By Release Date"
 msgstr "發行日期"
 
-#: src/skins/menus.cc:176 src/skins/menus.cc:189
+#: src/skins/menus.cc:201 src/skins/menus.cc:217 src/skins-qt/menus.cc:197
+#: src/skins-qt/menus.cc:213
 msgid "By Genre"
 msgstr "類型"
 
-#: src/skins/menus.cc:177 src/skins/menus.cc:191
+#: src/skins/menus.cc:202 src/skins/menus.cc:218 src/skins-qt/menus.cc:198
+#: src/skins-qt/menus.cc:214
 msgid "By Length"
 msgstr "長度"
 
-#: src/skins/menus.cc:180 src/skins/menus.cc:194
+#: src/skins/menus.cc:205 src/skins/menus.cc:221 src/skins-qt/menus.cc:201
+#: src/skins-qt/menus.cc:217
 msgid "By Custom Title"
 msgstr "自訂標題"
 
-#: src/skins/menus.cc:198
+#: src/skins/menus.cc:206 src/skins/menus.cc:222 src/skins-qt/menus.cc:202
+#: src/skins-qt/menus.cc:218
+msgid "By Comment"
+msgstr "備註"
+
+#: src/skins/menus.cc:207 src/skins/menus.cc:223 src/skins-qt/menus.cc:203
+#: src/skins-qt/menus.cc:219
+msgid "By Disc Number"
+msgstr ""
+
+#: src/skins/menus.cc:227 src/skins-qt/menus.cc:223
 msgid "Randomize List"
 msgstr "清單隨機排序"
 
-#: src/skins/menus.cc:199
+#: src/skins/menus.cc:228 src/skins-qt/menus.cc:224
 msgid "Reverse List"
 msgstr "清單反向排序"
 
-#: src/skins/menus.cc:201
+#: src/skins/menus.cc:230 src/skins-qt/menus.cc:226
 msgid "Sort Selected"
 msgstr "排序選擇的項目"
 
-#: src/skins/menus.cc:202
+#: src/skins/menus.cc:231 src/skins-qt/menus.cc:227
 msgid "Sort List"
 msgstr "排序清單"
 
-#: src/skins/menus.cc:208
+#: src/skins/menus.cc:236 src/skins-qt/menus.cc:232
+msgid "Open Containing Folder"
+msgstr "開啟所在的資料夾"
+
+#: src/skins/menus.cc:238 src/skins-qt/menus.cc:234
 msgid "Cut"
 msgstr "剪下"
 
-#: src/skins/menus.cc:209
+#: src/skins/menus.cc:239 src/skins-qt/menus.cc:235
 msgid "Copy"
 msgstr "複製"
 
-#: src/skins/menus.cc:210
+#: src/skins/menus.cc:240 src/skins-qt/menus.cc:236
 msgid "Paste"
 msgstr "貼上"
 
-#: src/skins/menus.cc:212
+#: src/skins/menus.cc:241 src/skins-qt/menus.cc:237
+msgid "Paste at End"
+msgstr "貼到最後"
+
+#: src/skins/menus.cc:243 src/skins-qt/menus.cc:239
 msgid "Queue/Unqueue"
 msgstr "排入／移出佇列"
 
-#: src/skins/menus.cc:218
-msgid "Load Preset ..."
-msgstr "載入樣式 ..."
-
-#: src/skins/menus.cc:219
-msgid "Load Auto Preset ..."
-msgstr "讀取自動載入樣式 ..."
-
-#: src/skins/menus.cc:220
-msgid "Load Default"
-msgstr "載入預設值"
-
-#: src/skins/menus.cc:221
-msgid "Load Preset File ..."
-msgstr "從檔案載入樣式 ..."
-
-#: src/skins/menus.cc:222
-msgid "Load EQF File ..."
-msgstr "載入 EQF 檔 ..."
-
-#: src/skins/menus.cc:224
-msgid "Save Preset ..."
-msgstr "儲存樣式 ..."
-
-#: src/skins/menus.cc:225
-msgid "Save Auto Preset ..."
-msgstr "儲存自動載入樣式 ..."
-
-#: src/skins/menus.cc:226
-msgid "Save Default"
-msgstr "儲存預設值"
-
-#: src/skins/menus.cc:227
-msgid "Save Preset File ..."
-msgstr "儲存樣式到檔案 ..."
-
-#: src/skins/menus.cc:228
-msgid "Save EQF File ..."
-msgstr "儲存 EQF 檔 ..."
-
-#: src/skins/menus.cc:230
-msgid "Delete Preset ..."
-msgstr "刪除樣式 ..."
-
-#: src/skins/menus.cc:231
-msgid "Delete Auto Preset ..."
-msgstr "刪除自動載入樣式 ..."
-
-#: src/skins/menus.cc:233
-msgid "Import Winamp Presets ..."
-msgstr "匯入 Winamp 樣式 ..."
-
-#: src/skins/menus.cc:235
-msgid "Reset to Zero"
-msgstr "重置為零"
+#: src/skins/playlist-widget.cc:58 src/skins-qt/playlist-widget.cc:58
+#, c-format
+msgid "%s (%d of %d)"
+msgstr "%s (%d／%d)"
 
-#: src/skins/plugin.cc:48
+#: src/skins/playlistwin.cc:491 src/skins-qt/playlistwin.cc:478
+msgid "Audacious Playlist Editor"
+msgstr "Audacious 播放清單編輯器"
+
+#: src/skins/plugin.cc:53 src/skins-qt/plugin.cc:65
 msgid "Winamp Classic Interface"
 msgstr "Winamp 傳統介面"
 
-#: src/skins/preset-browser.cc:57 src/skins/preset-list.cc:371
-#: src/skins/preset-list.cc:386
-msgid "Save"
-msgstr "儲存"
-
-#: src/skins/preset-browser.cc:57 src/skins/preset-list.cc:338
-#: src/skins/preset-list.cc:354
-msgid "Load"
-msgstr "載入"
-
-#: src/skins/preset-browser.cc:83
-msgid "Load Preset File"
-msgstr "從檔案載入樣式"
-
-#: src/skins/preset-browser.cc:100
-msgid "Load EQF File"
-msgstr "載入 EQF 檔"
-
-#: src/skins/preset-browser.cc:119
-msgid "Save Preset File"
-msgstr "儲存樣式到檔案"
-
-#: src/skins/preset-browser.cc:137
-msgid "Save EQF File"
-msgstr "儲存 EQF 檔"
-
-#: src/skins/preset-browser.cc:151
-msgid "Import Winamp Presets"
-msgstr "匯入 Winamp 樣式"
-
-#: src/skins/preset-list.cc:285
-msgid "Presets"
-msgstr "樣式"
-
-#: src/skins/preset-list.cc:335
-msgid "Load preset"
-msgstr "載入樣式"
-
-#: src/skins/preset-list.cc:351
-msgid "Load auto-preset"
-msgstr "讀取自動載入樣式"
-
-#: src/skins/preset-list.cc:367
-msgid "Save preset"
-msgstr "儲存樣式"
-
-#: src/skins/preset-list.cc:382
-msgid "Save auto-preset"
-msgstr "儲存自動載入樣式"
-
-#: src/skins/preset-list.cc:408
-msgid "Delete preset"
-msgstr "刪除樣式"
-
-#: src/skins/preset-list.cc:424
-msgid "Delete auto-preset"
-msgstr "刪除自動載入樣式"
+#: src/skins-qt/menus.cc:75
+msgid "Open Folder ..."
+msgstr "開啟資料夾 ..."
+
+#: src/skins-qt/menus.cc:159
+msgid "Add Folder ..."
+msgstr "加入資料夾 ..."
+
+#: src/skins-qt/search-select.cc:62 src/skins/search-select.cc:77
+msgid "Search entries in active playlist"
+msgstr "在使用中的播放清單裡搜尋播放項目"
+
+#: src/skins-qt/search-select.cc:70 src/skins/search-select.cc:83
+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-qt/search-select.cc:75 src/skins/search-select.cc:91
+msgid "Title:"
+msgstr "標題："
+
+#: src/skins-qt/search-select.cc:79 src/skins/search-select.cc:96
+msgid "Album:"
+msgstr "專輯："
 
-#: src/skins/skins_cfg.cc:176
+#: src/skins-qt/search-select.cc:82 src/skins/search-select.cc:101
+msgid "Artist:"
+msgstr "藝人："
+
+#: src/skins-qt/search-select.cc:85 src/skins/search-select.cc:106
+msgid "File Name:"
+msgstr "檔名："
+
+#: src/skins-qt/search-select.cc:88 src/skins/search-select.cc:134
+msgid "Clear previous selection before searching"
+msgstr "進行搜尋前清空上次的選擇項目"
+
+#: src/skins-qt/search-select.cc:89 src/skins/search-select.cc:137
+msgid "Automatically toggle queue for matching entries"
+msgstr "自動切換到符合項目的佇列"
+
+#: src/skins-qt/search-select.cc:90 src/skins/search-select.cc:140
+msgid "Create a new playlist with matching entries"
+msgstr "以符合的項目建立新的播放清單"
+
+#: src/skins-qt/search-select.cc:101 src/skins/search-select.cc:78
+msgid "Search"
+msgstr "搜尋"
+
+#: src/skins-qt/skins_cfg.cc:198 src/skins/skins_cfg.cc:182
 msgid "Player:"
 msgstr "播放器："
 
-#: src/skins/skins_cfg.cc:178
+#: src/skins-qt/skins_cfg.cc:200 src/skins/skins_cfg.cc:184
 msgid "Select main player window font:"
 msgstr "選擇播放器主視窗字型："
 
-#: src/skins/skins_cfg.cc:179
+#: src/skins-qt/skins_cfg.cc:201 src/skins/skins_cfg.cc:185
 msgid "Playlist:"
 msgstr "播放清單："
 
-#: src/skins/skins_cfg.cc:181
+#: src/skins-qt/skins_cfg.cc:203 src/skins/skins_cfg.cc:187
 msgid "Select playlist font:"
 msgstr "選擇播放清單字型："
 
-#: src/skins/skins_cfg.cc:187
+#: src/skins-qt/skins_cfg.cc:207 src/skins/skins_cfg.cc:191
 msgid "Skin"
 msgstr "面板"
 
-#: src/skins/skins_cfg.cc:189
+#: src/skins-qt/skins_cfg.cc:211 src/skins/skins_cfg.cc:193
+msgid "Display active titlebar when any window is focused"
+msgstr ""
+
+#: src/skins-qt/skins_cfg.cc:213 src/skins/skins_cfg.cc:195
 msgid "Fonts"
 msgstr "字型"
 
-#: src/skins/skins_cfg.cc:192
+#: src/skins-qt/skins_cfg.cc:215 src/skins/skins_cfg.cc:197
 msgid "Use bitmap fonts (supports ASCII only)"
 msgstr "使用點陣字型 (只支援 ASCII)"
 
-#: src/skins/skins_cfg.cc:194
+#: src/skins-qt/skins_cfg.cc:217 src/skins/skins_cfg.cc:199
 msgid "Scroll song title"
 msgstr "捲動歌曲標題"
 
-#: src/skins/skins_cfg.cc:196
+#: src/skins-qt/skins_cfg.cc:219 src/skins/skins_cfg.cc:201
 msgid "Scroll song title in both directions"
 msgstr "雙向捲動歌曲標題"
 
-#: src/skins/skins_cfg.cc:201
+#: src/skins-qt/skins_cfg.cc:224 src/skins/skins_cfg.cc:206
 msgid "Analyzer"
 msgstr "分析儀"
 
-#: src/skins/skins_cfg.cc:202
+#: src/skins-qt/skins_cfg.cc:225 src/skins/skins_cfg.cc:207
 msgid "Scope"
 msgstr "示波器"
 
-#: src/skins/skins_cfg.cc:203
+#: src/skins-qt/skins_cfg.cc:226 src/skins/skins_cfg.cc:208
 msgid "Voiceprint / VU meter"
 msgstr "聲紋／VU 計"
 
-#: src/skins/skins_cfg.cc:204
+#: src/skins-qt/skins_cfg.cc:227 src/skins/skins_cfg.cc:209
 msgid "Off"
 msgstr "關閉"
 
-#: src/skins/skins_cfg.cc:208 src/skins/skins_cfg.cc:233
-#: src/skins/skins_cfg.cc:239
+#: src/skins-qt/skins_cfg.cc:231 src/skins-qt/skins_cfg.cc:256
+#: src/skins-qt/skins_cfg.cc:262 src/skins/skins_cfg.cc:213
+#: src/skins/skins_cfg.cc:238 src/skins/skins_cfg.cc:244
 msgid "Normal"
 msgstr "標準"
 
-#: src/skins/skins_cfg.cc:209 src/skins/skins_cfg.cc:234
+#: src/skins-qt/skins_cfg.cc:232 src/skins-qt/skins_cfg.cc:257
+#: src/skins/skins_cfg.cc:214 src/skins/skins_cfg.cc:239
 msgid "Fire"
 msgstr "火焰"
 
-#: src/skins/skins_cfg.cc:210
+#: src/skins-qt/skins_cfg.cc:233 src/skins/skins_cfg.cc:215
 msgid "Vertical lines"
 msgstr "垂直線條"
 
-#: src/skins/skins_cfg.cc:214
+#: src/skins-qt/skins_cfg.cc:237 src/skins/skins_cfg.cc:219
 msgid "Lines"
 msgstr "線條"
 
-#: src/skins/skins_cfg.cc:215
+#: src/skins-qt/skins_cfg.cc:238 src/skins/skins_cfg.cc:220
 msgid "Bars"
 msgstr "棒狀"
 
-#: src/skins/skins_cfg.cc:219
+#: src/skins-qt/skins_cfg.cc:242 src/skins/skins_cfg.cc:224
 msgid "Slowest"
 msgstr "最慢"
 
-#: src/skins/skins_cfg.cc:220
+#: src/skins-qt/skins_cfg.cc:243 src/skins/skins_cfg.cc:225
 msgid "Slow"
 msgstr "慢"
 
-#: src/skins/skins_cfg.cc:221 src/sox-resampler/sox-resampler.cc:152
+#: src/skins-qt/skins_cfg.cc:244 src/skins/skins_cfg.cc:226
+#: src/soxr/sox-resampler.cc:180
 msgid "Medium"
 msgstr "中等"
 
-#: src/skins/skins_cfg.cc:222
+#: src/skins-qt/skins_cfg.cc:245 src/skins/skins_cfg.cc:227
 msgid "Fast"
 msgstr "快"
 
-#: src/skins/skins_cfg.cc:223
+#: src/skins-qt/skins_cfg.cc:246 src/skins/skins_cfg.cc:228
 msgid "Fastest"
 msgstr "最快"
 
-#: src/skins/skins_cfg.cc:227
+#: src/skins-qt/skins_cfg.cc:250 src/skins/skins_cfg.cc:232
 msgid "Dots"
 msgstr "點狀"
 
-#: src/skins/skins_cfg.cc:228
+#: src/skins-qt/skins_cfg.cc:251 src/skins/skins_cfg.cc:233
 msgid "Line"
 msgstr "線條"
 
-#: src/skins/skins_cfg.cc:229
+#: src/skins-qt/skins_cfg.cc:252 src/skins/skins_cfg.cc:234
 msgid "Solid"
 msgstr "實心"
 
-#: src/skins/skins_cfg.cc:235
+#: src/skins-qt/skins_cfg.cc:258 src/skins/skins_cfg.cc:240
 msgid "Ice"
 msgstr "冰霜"
 
-#: src/skins/skins_cfg.cc:240
+#: src/skins-qt/skins_cfg.cc:263 src/skins/skins_cfg.cc:245
 msgid "Smooth"
 msgstr "平滑"
 
-#: src/skins/skins_cfg.cc:244
-msgid "Type"
-msgstr "類型"
-
-#: src/skins/skins_cfg.cc:245
-msgid "Visualization type:"
-msgstr "視覺特效類型："
-
-#: src/skins/skins_cfg.cc:248
-msgid "Analyzer"
-msgstr "分析儀"
-
-#: src/skins/skins_cfg.cc:249
-msgid "Show peaks"
-msgstr "顯示峰值標記"
-
-#: src/skins/skins_cfg.cc:251
+#: src/skins-qt/skins_cfg.cc:267 src/skins/skins_cfg.cc:249
 msgid "Coloring:"
 msgstr "顏色："
 
-#: src/skins/skins_cfg.cc:254
+#: src/skins-qt/skins_cfg.cc:270 src/skins/skins_cfg.cc:252
 msgid "Style:"
 msgstr "樣式："
 
-#: src/skins/skins_cfg.cc:257
+#: src/skins-qt/skins_cfg.cc:273 src/skins/skins_cfg.cc:255
 msgid "Falloff:"
 msgstr "陷落："
 
-#: src/skins/skins_cfg.cc:260
+#: src/skins-qt/skins_cfg.cc:276 src/skins/skins_cfg.cc:258
 msgid "Peak falloff:"
 msgstr "峰值陷落："
 
-#: src/skins/skins_cfg.cc:264
+#: src/skins-qt/skins_cfg.cc:282 src/skins/skins_cfg.cc:264
 msgid "Scope Style:"
 msgstr "示波器樣式："
 
-#: src/skins/skins_cfg.cc:267
+#: src/skins-qt/skins_cfg.cc:285 src/skins/skins_cfg.cc:267
 msgid "Voiceprint Coloring:"
 msgstr "聲紋顏色："
 
-#: src/skins/skins_cfg.cc:270
+#: src/skins-qt/skins_cfg.cc:288 src/skins/skins_cfg.cc:270
 msgid "VU Meter Style:"
 msgstr "VU 計樣式："
 
-#: src/skins/skins_cfg.cc:276
-msgid "General"
-msgstr "一般"
-
-#: src/skins/skins_cfg.cc:277
-msgid "Visualization"
-msgstr "視覺特效"
-
-#: src/skins/ui_equalizer.cc:282
-msgid "Preamp"
-msgstr "前置放大"
-
-#: src/skins/ui_equalizer.cc:286
-msgid "31 Hz"
-msgstr "31 Hz"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "63 Hz"
-msgstr "63 Hz"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "125 Hz"
-msgstr "125 Hz"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "250 Hz"
-msgstr "250 Hz"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "500 Hz"
-msgstr "500 Hz"
-
-#: src/skins/ui_equalizer.cc:287
-msgid "1 kHz"
-msgstr "1 kHz"
-
-#: src/skins/ui_equalizer.cc:288
-msgid "2 kHz"
-msgstr "2 kHz"
-
-#: src/skins/ui_equalizer.cc:288
-msgid "4 kHz"
-msgstr "4 kHz"
-
-#: src/skins/ui_equalizer.cc:288
-msgid "8 kHz"
-msgstr "8 kHz"
-
-#: src/skins/ui_equalizer.cc:288
-msgid "16 kHz"
-msgstr "16 kHz"
-
-#: src/skins/ui_equalizer.cc:330
-msgid "Audacious Equalizer"
-msgstr "Audacious 等化器"
-
-#: src/skins/ui_main.cc:688
-#, c-format
-msgid "Seek to %d:%-2.2d / %d:%-2.2d"
-msgstr "移動到 %d:%-2.2d／%d:%-2.2d"
-
-#: src/skins/ui_main.cc:709
-#, c-format
-msgid "Volume: %d%%"
-msgstr "音量：%d％"
-
-#: src/skins/ui_main.cc:732
-#, c-format
-msgid "Balance: %d%% left"
-msgstr "平衡：%d％ 偏左"
-
-#: src/skins/ui_main.cc:734
-msgid "Balance: center"
-msgstr "平衡：中間"
-
-#: src/skins/ui_main.cc:736
-#, c-format
-msgid "Balance: %d%% right"
-msgstr "平衡：%d％ 偏右"
-
-#: src/skins/ui_main.cc:842
-msgid "Options Menu"
-msgstr "選單選項"
+#: src/skins-qt/skins_cfg.cc:294 src/skins/skins_cfg.cc:276
+msgid "Type"
+msgstr "類型"
 
-#: src/skins/ui_main.cc:846
-msgid "Disable 'Always On Top'"
-msgstr "關閉置頂"
+#: src/skins-qt/skins_cfg.cc:295 src/skins/skins_cfg.cc:277
+msgid "Visualization type:"
+msgstr "視覺特效類型："
 
-#: src/skins/ui_main.cc:848
-msgid "Enable 'Always On Top'"
-msgstr "啟用置頂"
+#: src/skins-qt/skins_cfg.cc:298 src/skins/skins_cfg.cc:280
+msgid "Analyzer"
+msgstr "分析儀"
 
-#: src/skins/ui_main.cc:851
-msgid "File Info Box"
-msgstr "檔案資訊視窗"
+#: src/skins-qt/skins_cfg.cc:299 src/skins/skins_cfg.cc:281
+msgid "Show peaks"
+msgstr "顯示峰值標記"
 
-#: src/skins/ui_main.cc:857
-msgid "Visualizations"
+#: src/skins-qt/skins_cfg.cc:308 src/skins/skins_cfg.cc:290
+msgid "Visualization"
 msgstr "視覺特效"
 
-#: src/skins/ui_main.cc:1336
-msgid "Repeat point A set."
-msgstr "已設定重複點 A。"
-
-#: src/skins/ui_main.cc:1341
-msgid "Repeat point B set."
-msgstr "已設定重複點 B。"
-
-#: src/skins/ui_main.cc:1350
-msgid "Repeat points cleared."
-msgstr "已清除重複點。"
-
-#: src/skins/ui_playlist.cc:219
-msgid "Search entries in active playlist"
-msgstr "在使用中的播放清單裡搜尋播放項目"
-
-#: src/skins/ui_playlist.cc:226
-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.cc:234
-msgid "Title:"
-msgstr "標題："
-
-#: src/skins/ui_playlist.cc:241
-msgid "Album:"
-msgstr "專輯："
-
-#: src/skins/ui_playlist.cc:248
-msgid "Artist:"
-msgstr "藝人："
-
-#: src/skins/ui_playlist.cc:255
-msgid "File Name:"
-msgstr "檔名："
-
-#: src/skins/ui_playlist.cc:263
-msgid "Clear previous selection before searching"
-msgstr "進行搜尋前清空上次的選擇項目"
-
-#: src/skins/ui_playlist.cc:266
-msgid "Automatically toggle queue for matching entries"
-msgstr "自動切換到符合項目的佇列"
-
-#: src/skins/ui_playlist.cc:269
-msgid "Create a new playlist with matching entries"
-msgstr "以符合的項目建立新的播放清單"
-
-#: src/skins/ui_playlist.cc:717
-msgid "Audacious Playlist Editor"
-msgstr "Audacious 播放清單編輯器"
-
-#: src/skins/ui_playlist.cc:752
-#, c-format
-msgid "%s (%d of %d)"
-msgstr "%s (%d／%d)"
-
-#: src/skins/ui_skinselector.cc:167
+#: src/skins-qt/skinselector.cc:98 src/skins/skinselector.cc:111
 msgid "Archived Winamp 2.x skin"
 msgstr "壓縮的 Winamp 2.x 面板"
 
-#: src/skins/ui_skinselector.cc:172
+#: src/skins-qt/skinselector.cc:102 src/skins/skinselector.cc:115
 msgid "Unarchived Winamp 2.x skin"
 msgstr "未壓縮的 Winamp 2.x skin"
 
-#: src/skins/util.cc:430
-#, c-format
-msgid "Could not create directory (%s): %s\n"
-msgstr "無法建立資料夾 (%s)：%s\n"
-
-#: src/sndfile/plugin.cc:39
+#: src/sndfile/plugin.cc:38
 msgid "Sndfile Plugin"
 msgstr "Sndfile 外掛"
 
-#: src/sndfile/plugin.cc:336
+#: src/sndfile/plugin.cc:372
 msgid ""
 "Based on the xmms_sndfile plugin:\n"
 "Copyright (C) 2000, 2002 Erik de Castro Lopo\n"
@@ -3958,108 +4150,111 @@
 "this program; if not, write to the Free Software Foundation, Inc., 51 "
 "Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA."
 
-#: src/sndio-ng/sndio.cc:44
+#: src/sndio/sndio.cc:43
 msgid "Sndio Output"
 msgstr "Sndio 輸出"
 
-#: src/sndio-ng/sndio.cc:98
+#: src/sndio/sndio.cc:98
 msgid "Device (blank for default):"
 msgstr "裝置 (空白表示預設)："
 
-#: src/sndio-ng/sndio.cc:100
+#: src/sndio/sndio.cc:100
 msgid "Save and restore volume:"
 msgstr "儲存與還原音量："
 
-#: src/sndio-ng/sndio.cc:181
+#: src/sndio/sndio.cc:181
 #, c-format
 msgid "Sndio error: Unsupported audio format (%d)"
 msgstr "Sndio 錯誤：未支援的音訊格式 (%d)"
 
-#: src/sndio-ng/sndio.cc:192
+#: src/sndio/sndio.cc:192
 msgid "Sndio error: sio_open() failed"
 msgstr "Sndio 錯誤：sio_open() 失敗"
 
-#: src/sndio-ng/sndio.cc:222
+#: src/sndio/sndio.cc:221
 msgid "Sndio error: sio_setpar() failed"
 msgstr "Sndio 錯誤：sio_setpar() 失敗"
 
-#: src/sndio-ng/sndio.cc:234
+#: src/sndio/sndio.cc:233
 msgid "Sndio error: sio_start() failed"
 msgstr "Sndio 錯誤：sio_start() 失敗"
 
-#: src/song_change/song_change.cc:33
+#: src/songchange/song_change.cc:30
 msgid "Song Change"
 msgstr "歌曲切換"
 
-#: src/song_change/song_change.cc:342
-msgid ""
-"Parameters passed to the shell should be encapsulated in "
-"quotes. Doing otherwise is a security risk."
-msgstr ""
-"傳給 shell 的參數應該用雙引號包起來，否則會有安全風險。</"
-"span>"
-
-#: src/song_change/song_change.cc:358
+#: src/songchange/song_change.cc:256
 msgid "Commands"
 msgstr "命令"
 
-#: src/song_change/song_change.cc:360
+#: src/songchange/song_change.cc:258
 msgid "Command to run when starting a new song:"
 msgstr "開始播放新歌曲時執行此命令："
 
-#: src/song_change/song_change.cc:364
+#: src/songchange/song_change.cc:261
+msgid "Command to run when stopping a song:"
+msgstr ""
+
+#: src/songchange/song_change.cc:264
 msgid "Command to run at the end of a song:"
 msgstr "當某首個播放完時執行此命令："
 
-#: src/song_change/song_change.cc:368
+#: src/songchange/song_change.cc:267
 msgid "Command to run at the end of the playlist:"
 msgstr "播放至播放清單的結尾時執行此命令："
 
-#: src/song_change/song_change.cc:372
+#: src/songchange/song_change.cc:270
 msgid "Command to run when song title changes (for network streams):"
 msgstr "當歌曲標題改變時執行此命令 (網路串流用)："
 
-#: src/song_change/song_change.cc:376
+#: src/songchange/song_change.cc:273
 msgid ""
-"You can use the following format strings which will be substituted before "
-"calling the command (not all are useful for the end-of-playlist command):\n"
-"\n"
-"%F: Frequency (in hertz)\n"
+"You can use the following format codes, which will be replaced before "
+"running the command.\n"
+"Not all are useful though for the song-stopped or end-of-playlist command."
+msgstr ""
+
+#: src/songchange/song_change.cc:276
+msgid ""
+"%a: Artist\n"
+"%b: Album\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"
+"%F: Frequency (Hertz)\n"
+"%l: Length (milliseconds)\n"
+"%n or %s: Formatted title (see playlist settings)\n"
 "%p: Currently playing (1 or 0)\n"
-"%a: Artist\n"
-"%b: Album\n"
-"%T: Track title"
+"%r: Rate (bits per second)\n"
+"%t: Playlist position\n"
+"%T: Title (unformatted)"
 msgstr ""
-"您可以使用以下的格式字串來表示特殊欄位（不是全部都能在播放清單結束命令中使"
-"用）：\n"
-"\n"
-"%F：頻率 (HZ)\n"
+"%a：藝人\n"
+"%b：專輯\n"
 "%c：聲道數\n"
 "%f：檔案名稱 (完整路徑)\n"
+"%F：頻率 (HZ)\n"
 "%l：長度 (毫秒)\n"
 "%n 或 %s：歌曲名稱\n"
+"%p：播放中 (1 或 0)\n"
 "%r：位元率 (bps)\n"
 "%t：播放清單的位置 (%02d)\n"
-"%p：播放中 (1 或 0)\n"
-"%a：藝人\n"
-"%b：專輯\n"
-"%T：音軌標題"
+"%T：音軌標題 (未格式化)"
 
-#: src/song-info-qt/song-info.cc:32
-msgid "Song Info (Qt)"
-msgstr "歌曲資訊 (Qt)"
+#: src/songchange/song_change.cc:287
+msgid ""
+"Parameters passed to the shell should be enclosed in quotation marks.\n"
+"Unquoted parameters may lead to unexpected results."
+msgstr ""
+
+#: src/song-info-qt/song-info.cc:30
+msgid "Song Info"
+msgstr "歌曲資訊"
 
-#: src/sox-resampler/sox-resampler.cc:44
+#: src/soxr/sox-resampler.cc:44
 msgid "SoX Resampler"
 msgstr "SoX 重取樣"
 
-#: src/sox-resampler/sox-resampler.cc:144
+#: src/soxr/sox-resampler.cc:172
 msgid ""
 "SoX Resampler Plugin for Audacious\n"
 "Copyright 2013 Michał Lipski\n"
@@ -4073,95 +4268,142 @@
 "Based on Sample Rate Converter Plugin:\n"
 "Copyright 2010-2012 John Lindgren"
 
-#: src/sox-resampler/sox-resampler.cc:150
+#: src/soxr/sox-resampler.cc:178
 msgid "Quick"
 msgstr "快速"
 
-#: src/sox-resampler/sox-resampler.cc:151
+#: src/soxr/sox-resampler.cc:179
 msgid "Low"
 msgstr "低"
 
-#: src/sox-resampler/sox-resampler.cc:153
+#: src/soxr/sox-resampler.cc:181
 msgid "High"
 msgstr "高"
 
-#: src/sox-resampler/sox-resampler.cc:154
+#: src/soxr/sox-resampler.cc:182
 msgid "Very High"
 msgstr "非常高"
 
-#: src/sox-resampler/sox-resampler.cc:158
+#: src/soxr/sox-resampler.cc:183
+msgid "Ultra High"
+msgstr "極高"
+
+#: src/soxr/sox-resampler.cc:187
+msgid "Minimum"
+msgstr "最小"
+
+#: src/soxr/sox-resampler.cc:188
+msgid "Intermediate"
+msgstr "中間"
+
+#: src/soxr/sox-resampler.cc:193
 msgid "Quality:"
 msgstr "品質："
 
-#: src/speed-pitch/speed-pitch.cc:51
+#: src/soxr/sox-resampler.cc:196
+msgid "Phase:"
+msgstr "相位："
+
+#: src/soxr/sox-resampler.cc:200
+msgid "Allow aliasing"
+msgstr "允許別名"
+
+#: src/soxr/sox-resampler.cc:202
+msgid "Use steep filter"
+msgstr ""
+
+#: src/speedpitch/speed-pitch.cc:54
 msgid "Speed and Pitch"
-msgstr "速度與音高"
+msgstr "速度與音調"
+
+#: src/speedpitch/speed-pitch.cc:247
+msgid "Speed"
+msgstr "速度"
 
-#: src/speed-pitch/speed-pitch.cc:210
-msgid "Speed and Pitch"
-msgstr "速度與音高"
+#: src/speedpitch/speed-pitch.cc:248
+msgid "Decouple from pitch"
+msgstr "分離音調"
 
-#: src/speed-pitch/speed-pitch.cc:211
-msgid "Speed:"
-msgstr "速度："
+#: src/speedpitch/speed-pitch.cc:250 src/speedpitch/speed-pitch.cc:258
+msgid "Multiplier:"
+msgstr "倍率："
 
-#: src/speed-pitch/speed-pitch.cc:214
-msgid "Pitch:"
-msgstr "音高："
+#: src/speedpitch/speed-pitch.cc:254
+msgid "Pitch"
+msgstr "音調"
 
-#: src/statusicon/statusicon.cc:47
+#: src/statusicon-qt/statusicon.cc:45 src/statusicon/statusicon.cc:47
 msgid "Status Icon"
 msgstr "狀態圖示"
 
-#: src/statusicon/statusicon.cc:283
-msgid "Se_ttings ..."
-msgstr "設定(_T) ..."
-
-#: src/statusicon/statusicon.cc:372
+#: src/statusicon-qt/statusicon.cc:68
 msgid ""
-"Status Icon Plugin\n"
+"Status Icon Plugin (partial port for Qt interface)\n"
 "\n"
 "Copyright 2005-2007 Giacomo Lozito <james@develia.org>\n"
 "Copyright 2010 Michał Lipski <tallica@o2.pl>\n"
+"Copyright 2015 Eugene Paskevich <eugene@raptor.kiev.ua>\n"
 "\n"
 "This plugin provides a status icon, placed in\n"
 "the system tray area of the window manager."
 msgstr ""
-"Status Icon Plugin\n"
+"Status Icon Plugin (給 Qt 介面的部份移植)\n"
 "\n"
 "Copyright 2005-2007 Giacomo Lozito <james@develia.org>\n"
 "Copyright 2010 Michał Lipski <tallica@o2.pl>\n"
+"Copyright 2015 Eugene Paskevich <eugene@raptor.kiev.ua>\n"
 "\n"
-"這個外掛提供一個狀態圖示並放在系統通知區。"
+"這個外掛提供一個放在系統通知區的狀態圖示。"
 
-#: src/statusicon/statusicon.cc:379
+#: src/statusicon-qt/statusicon.cc:89 src/statusicon/statusicon.cc:384
 msgid "Mouse Scroll Action"
 msgstr "滑鼠滾輪動作"
 
-#: src/statusicon/statusicon.cc:380
+#: src/statusicon-qt/statusicon.cc:90 src/statusicon/statusicon.cc:385
 msgid "Change volume"
 msgstr "調整音量"
 
-#: src/statusicon/statusicon.cc:383
+#: src/statusicon-qt/statusicon.cc:93 src/statusicon/statusicon.cc:388
 msgid "Change playing song"
 msgstr "切換播放歌曲"
 
-#: src/statusicon/statusicon.cc:386
+#: src/statusicon-qt/statusicon.cc:96 src/statusicon/statusicon.cc:391
 msgid "Other Settings"
 msgstr "其他設定"
 
-#: src/statusicon/statusicon.cc:387
+#: src/statusicon-qt/statusicon.cc:97 src/statusicon/statusicon.cc:392
 msgid "Disable the popup window"
 msgstr "關閉彈出式視窗"
 
-#: src/statusicon/statusicon.cc:389
+#: src/statusicon-qt/statusicon.cc:99 src/statusicon/statusicon.cc:394
 msgid "Close to the system tray"
 msgstr "縮到系統列"
 
-#: src/statusicon/statusicon.cc:391
+#: src/statusicon-qt/statusicon.cc:101 src/statusicon/statusicon.cc:396
 msgid "Advance in playlist when scrolling upward"
 msgstr "以與滑鼠滾輪的反方向切換歌曲"
 
+#: src/statusicon-qt/statusicon.cc:116 src/statusicon/statusicon.cc:287
+msgid "Se_ttings ..."
+msgstr "設定(_T) ..."
+
+#: src/statusicon/statusicon.cc:377
+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 ""
+"Status Icon Plugin\n"
+"\n"
+"Copyright 2005-2007 Giacomo Lozito <james@develia.org>\n"
+"Copyright 2010 Michał Lipski <tallica@o2.pl>\n"
+"\n"
+"這個外掛提供一個放在系統通知區的狀態圖示。"
+
 #: src/stereo_plugin/stereo.cc:19
 msgid "Extra Stereo"
 msgstr "額外立體聲效果"
@@ -4180,20 +4422,160 @@
 msgid "Extra Stereo"
 msgstr "額外立體聲效果"
 
+#: src/streamtuner/icecast-model.cc:126 src/streamtuner/shoutcast-model.cc:131
+msgid "Type"
+msgstr "類型"
+
+#: src/streamtuner/icecast-model.cc:132
+msgid "Current Song"
+msgstr "目前的歌曲"
+
+#: src/streamtuner/icecast-model.cc:164
+msgid "Other"
+msgstr "其他"
+
+#: src/streamtuner/ihr-model.cc:63
+msgid "Market"
+msgstr ""
+
+#: src/streamtuner/ihr-model.cc:156
+msgid "Call Letters"
+msgstr "無線電台呼號"
+
+#: src/streamtuner/ihr-model.cc:162
+msgid "Description"
+msgstr "說明"
+
+#: src/streamtuner/shoutcast-model.cc:128
+msgid "Listeners"
+msgstr "聽眾"
+
+#: src/streamtuner/shoutcast-model.cc:188
+msgid "Top 500 Stations"
+msgstr "前 500 名站台"
+
+#: src/streamtuner/shoutcast-model.cc:189
+msgid "Alternative"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:190
+msgid "Blues"
+msgstr "藍調"
+
+#: src/streamtuner/shoutcast-model.cc:191
+msgid "Classical"
+msgstr "古典"
+
+#: src/streamtuner/shoutcast-model.cc:192
+msgid "Country"
+msgstr "鄉村"
+
+#: src/streamtuner/shoutcast-model.cc:193
+msgid "Decades"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:194
+msgid "Easy Listening"
+msgstr "輕音樂"
+
+#: src/streamtuner/shoutcast-model.cc:195
+msgid "Electronic"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:196
+msgid "Folk"
+msgstr "民謠"
+
+#: src/streamtuner/shoutcast-model.cc:197
+msgid "Inspirational"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:198
+msgid "International"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:199
+msgid "Jazz"
+msgstr "爵士"
+
+#: src/streamtuner/shoutcast-model.cc:200
+msgid "Latin"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:201
+msgid "Metal"
+msgstr "金屬"
+
+#: src/streamtuner/shoutcast-model.cc:203
+msgid "New Age"
+msgstr "新世紀"
+
+#: src/streamtuner/shoutcast-model.cc:204
+msgid "Pop"
+msgstr "流行"
+
+#: src/streamtuner/shoutcast-model.cc:205
+msgid "Public Radio"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:206
+msgid "R&B and Urban"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:207
+msgid "Rap"
+msgstr "說唱"
+
+#: src/streamtuner/shoutcast-model.cc:208
+msgid "Reggae"
+msgstr "雷鬼"
+
+#: src/streamtuner/shoutcast-model.cc:209
+msgid "Rock"
+msgstr "搖滾 (Rock)"
+
+#: src/streamtuner/shoutcast-model.cc:210
+msgid "Seasonal and Holiday"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:211
+msgid "Soundtracks"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:212
+msgid "Talk"
+msgstr ""
+
+#: src/streamtuner/shoutcast-model.cc:213
+msgid "Themes"
+msgstr ""
+
+#: src/streamtuner/streamtuner.cc:59
+msgid "Shoutcast"
+msgstr "Shoutcast"
+
+#: src/streamtuner/streamtuner.cc:60
+msgid "Icecast"
+msgstr "Icecast"
+
+#: src/streamtuner/streamtuner.cc:71
+msgid "Stream Tuner"
+msgstr ""
+
 #: src/tonegen/tonegen.cc:45
 msgid "Tone Generator"
 msgstr "音調產生器"
 
-#: src/tonegen/tonegen.cc:94
+#: src/tonegen/tonegen.cc:92
 #, c-format
 msgid "%s %.1f Hz"
 msgstr "%s %.1f Hz"
 
-#: src/tonegen/tonegen.cc:94
+#: src/tonegen/tonegen.cc:92
 msgid "Tone Generator: "
 msgstr "音調產生器："
 
-#: src/tonegen/tonegen.cc:160
+#: src/tonegen/tonegen.cc:161
 msgid ""
 "Sine tone generator by Håvard Kvålen <havardk@xmms.org>\n"
 "Modified by Daniel J. Peng <danielpeng@bigfoot.com>\n"
@@ -4207,11 +4589,32 @@
 "用法：加入網址：tone://frequency1;frequency2;frequency3;...\n"
 "範例：tone://2000;2005 會播放 2000 HZ 和 2005HZ 的正弦波"
 
+#: src/ui-common/dialogs-qt.cc:40
+msgid ""
+"\n"
+"(Further messages have been hidden.)"
+msgstr ""
+"\n"
+"(詳細訊息已被隱藏。)"
+
+#: src/ui-common/dialogs-qt.cc:52
+msgid "Working ..."
+msgstr "處理中 ..."
+
+#: src/ui-common/dialogs-qt.cc:73
+msgid "Information"
+msgstr "資訊"
+
+#: src/ui-common/menu-ops-gtk.cc:132 src/ui-common/menu-ops-qt.cc:113
+#, c-format
+msgid "%s does not appear to be a valid folder."
+msgstr ""
+
 #: src/voice_removal/voice_removal.cc:28
 msgid "Voice Removal"
 msgstr "人聲移除"
 
-#: src/vorbis/vorbis.cc:465
+#: src/vorbis/vorbis.cc:433
 msgid ""
 "Audacious Ogg Vorbis Decoder\n"
 "\n"
@@ -4253,12 +4656,12 @@
 msgid "Ogg Vorbis Decoder"
 msgstr "Ogg Vorbis 解碼器"
 
-#: src/vtx/info.cc:22
+#: src/vtx/info.cc:24
 #, c-format
 msgid "Details about %s"
 msgstr "關於 %s 的詳細資訊"
 
-#: src/vtx/info.cc:24
+#: src/vtx/info.cc:26
 msgid ""
 "Title: %t\n"
 "Author: %a\n"
@@ -4288,7 +4691,7 @@
 msgid "VTX Decoder"
 msgstr "VTX 解碼器"
 
-#: src/vtx/vtx.cc:184
+#: src/vtx/vtx.cc:178
 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"
@@ -4298,19 +4701,61 @@
 "Based on in_vtx.dll by Roman Sherbakov <v_soft@microfor.ru>\n"
 "Audacious plugin by Pavel Vymetalek <pvymetalek@seznam.cz>"
 
-#: src/wavpack/wavpack.cc:24
+#: src/vumeter-qt/vumeter_qt.cc:31
+msgid ""
+"VU Meter Plugin for Audacious\n"
+"Copyright 2017-2019 Marc Sánchez Fauste"
+msgstr ""
+
+#: src/vumeter-qt/vumeter_qt.cc:35
+msgid "VU Meter Settings"
+msgstr ""
+
+#: src/vumeter-qt/vumeter_qt.cc:37
+msgid "Peak hold time:"
+msgstr "峰值停留時間："
+
+#: src/vumeter-qt/vumeter_qt.cc:42
+msgid "Fall-off time:"
+msgstr "消退時間："
+
+#: src/vumeter-qt/vumeter_qt.cc:44
+msgid "dB/second"
+msgstr "dB/秒"
+
+#: src/vumeter-qt/vumeter_qt.cc:46
+msgid "Display legend"
+msgstr ""
+
+#: src/vumeter-qt/vumeter_qt.h:37
+msgid "VU Meter"
+msgstr ""
+
+#: src/waveout/waveout.cc:43
+msgid "Win32 waveOut"
+msgstr "Win32 waveOut"
+
+#: src/waveout/waveout.cc:69
+msgid ""
+"Win32 waveOut Plugin for Audacious\n"
+"Copyright 2016 John Lindgren"
+msgstr ""
+"Win32 waveOut Plugin for Audacious\n"
+"Copyright 2016 John Lindgren"
+
+#: src/wavpack/wavpack.cc:25
 msgid "WavPack Decoder"
 msgstr "WavPack 解碼器"
 
-#: src/wavpack/wavpack.cc:211
+#: src/wavpack/wavpack.cc:217
 msgid "lossy (hybrid)"
 msgstr "失真 (混合)"
 
-#: src/wavpack/wavpack.cc:213
+#: src/wavpack/wavpack.cc:219
 msgid "lossy"
 msgstr "失真"
 
-#: src/wavpack/wavpack.cc:255
+#: src/wavpack/wavpack.cc:259
 msgid ""
 "Copyright 2006 William Pitcock <nenolod@nenolod.net>\n"
 "\n"
@@ -4320,18 +4765,38 @@
 "\n"
 "Some of the plugin code was by Miles Egan."
 
-#: src/xsf/plugin.cc:50
+#: src/xsf/plugin.cc:74
 msgid "2SF Decoder"
 msgstr "2SF 解碼器"
 
-#: src/xsf/plugin.cc:238
+#: src/xsf/plugin.cc:429
+msgid "32728 Hz"
+msgstr ""
+
+#: src/xsf/plugin.cc:432
+msgid "65456 Hz"
+msgstr ""
+
+#: src/xsf/plugin.cc:438
+msgid "Cosine"
+msgstr ""
+
+#: src/xsf/plugin.cc:439
+msgid "Sharp"
+msgstr ""
+
+#: src/xsf/plugin.cc:443
 msgid "XSF Configuration"
 msgstr "XSF 組態"
 
-#: src/xsf/plugin.cc:239
-msgid "Ignore length from file"
-msgstr "忽略來自檔案的長度資訊"
+#: src/xsf/plugin.cc:445
+msgid "Default fade time:"
+msgstr ""
+
+#: src/xsf/plugin.cc:447
+msgid "Interpolation mode:"
+msgstr ""
 
-#: src/xspf/xspf.cc:89
+#: src/xspf/xspf.cc:95
 msgid "XML Shareable Playlists (XSPF)"
 msgstr "XML 可分享式播放清單 (XSPF)"

audacious-plugins-4.4.1.tar.bz2/src/aac Added

audacious-plugins-4.4.1.tar.bz2/src/aac/Makefile Added

audacious-plugins-4.4.1.tar.bz2/src/aac/aac.cc Added

@@ -0,0 +1,486 @@
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include <neaacdec.h>
+
+#include <audacious/audtag.h>
+#include <libaudcore/i18n.h>
+#include <libaudcore/plugin.h>
+#include <libaudcore/runtime.h>
+
+class AACDecoder : public InputPlugin
+{
+public:
+ static const char * const exts;
+ static const char * const mimes;
+
+ static constexpr PluginInfo info = {
+ N_("AAC (Raw) Decoder"),
+ PACKAGE
+ };
+
+ constexpr AACDecoder () : InputPlugin (info, InputInfo ()
+ .with_exts (exts)
+ .with_mimes (mimes)) {}
+
+ bool is_our_file (const char * filename, VFSFile & file);
+ bool read_tag (const char * filename, VFSFile & file, Tuple & tuple, Index<char> * image);
+ bool play (const char * filename, VFSFile & file);
+};
+
+EXPORT AACDecoder aud_plugin_instance;
+
+const char * const AACDecoder::exts = {"aac", nullptr};
+const char * const AACDecoder::mimes = {"audio/aac", nullptr};
+
+/*
+ * BUFFER_SIZE is the highest amount of memory that can be pulled.
+ * We use this for sanity checks, among other things, as mp4ff needs
+ * a labotomy sometimes.
+ */
+#define BUFFER_SIZE (FAAD_MIN_STREAMSIZE * 16)
+
+/*
+ * These routines are derived from MPlayer.
+ */
+
+/// \param srate (out) sample rate
+/// \param num (out) number of audio frames in this ADTS frame
+/// \return size of the ADTS frame in bytes
+/// aac_parse_frames needs a buffer at least 8 bytes long
+int aac_parse_frame (unsigned char * buf, int *srate, int *num)
+{
+ int i = 0, sr, fl = 0;
+ static int srates =
+ { 96000, 88200, 64000, 48000, 44100, 32000, 24000, 22050, 16000, 12000,
+ 11025, 8000, 0, 0, 0 };
+
+ if ((bufi != 0xFF) || ((bufi + 1 & 0xF6) != 0xF0))
+ return 0;
+
+/* We currently have no use for the id below.
+ id = (bufi+1 >> 3) & 0x01; //id=1 mpeg2, 0: mpeg4
+*/
+ sr = (bufi + 2 >> 2) & 0x0F;
+ if (sr > 11)
+ return 0;
+ *srate = sratessr;
+
+ fl =
+ ((bufi + 3 & 0x03) << 11) | (bufi + 4 << 3) | ((bufi +
+ 5 >> 5) & 0x07);
+ *num = (bufi + 6 & 0x02) + 1;
+
+ return fl;
+}
+
+#define PROBE_DEBUG(...)
+
+/* Searches <length> bytes of data for an ADTS header. Returns the offset of
+ * the first header or -1 if none is found. Sets <size> to the length of the
+ * frame. */
+static int find_aac_header (unsigned char * data, int length, int * size)
+{
+ int offset, a, b;
+
+ for (offset = 0; offset <= length - 8; offset++)
+ {
+ if (dataoffset != 255)
+ continue;
+
+ *size = aac_parse_frame (data + offset, &a, &b);
+
+ if (*size < 8)
+ continue;
+
+ return offset;
+ }
+
+ return -1;
+}
+
+bool AACDecoder::is_our_file (const char * filename, VFSFile & stream)
+{
+ unsigned char data8192;
+ int offset, found, inner, size;
+
+ size = 0; /* avoid bogus uninitialized variable warning */
+
+ if (stream.fread (data, 1, sizeof data) != sizeof data)
+ {
+ PROBE_DEBUG ("Read failed.\n");
+ return false;
+ }
+
+ offset = 0;
+
+ for (found = 0; found < 3; found++)
+ {
+ inner = find_aac_header (data + offset, sizeof data - offset, &size);
+
+ if (!(inner == 0 || (found == 0 && inner > 0)))
+ {
+ PROBE_DEBUG ("Only %d ADTS headers.\n", found);
+ return false;
+ }
+
+ offset += inner + size;
+ }
+
+ PROBE_DEBUG ("Accepted.\n");
+ return true;
+}
+
+/* Quick search for an ADTS or ADIF header in the first <len> bytes of <buf>.
+ * Returns the byte offset of the header or <len> if none is found. */
+
+static int aac_probe (unsigned char * buf, int len)
+{
+ for (int i = 0; i <= len - 4; i ++)
+ {
+ if ((bufi == 0xff && (bufi + 1 & 0xf6) == 0xf0) || ! strncmp
+ ((char *) buf + i, "ADIF", 4))
+ return i;
+ }
+
+ return len;
+}
+
+/* Gets info (some approximated) from an AAC/ADTS file. <length> is
+ * milliseconds, <bitrate> is kilobits per second. Any parameters that cannot
+ * be read are set to -1. */
+static void calc_aac_info (VFSFile & handle, int * length, int * bitrate,
+ int * samplerate, int * channels)
+{
+ NeAACDecHandle decoder;
+ NeAACDecFrameInfo frame;
+ bool initted = false;
+ int size = handle.fsize ();
+ unsigned char bufferBUFFER_SIZE;
+ int offset = 0, filled = 0;
+ int found, bytes_used = 0, time_used = 0;
+
+ decoder = nullptr; /* avoid bogus uninitialized variable warning */
+
+ *length = -1;
+ *bitrate = -1;
+ *samplerate = -1;
+ *channels = -1;
+
+ /* look for a representative bitrate in the middle of the file */
+ if (size < 0 || handle.fseek (size / 2, VFS_SEEK_SET) < 0)
+ goto DONE;
+
+ for (found = 0; found < 32; found++)
+ {
+ if (filled < BUFFER_SIZE / 2)
+ {
+ memmove (buffer, buffer + offset, filled);
+ offset = 0;
+
+ if (handle.fread (buffer + filled, 1, BUFFER_SIZE - filled)
+ != BUFFER_SIZE - filled)
+ {
+ PROBE_DEBUG ("Read failed.\n");
+ goto DONE;
+ }
+
+ filled = BUFFER_SIZE;
+ }
+
+ if (!initted)
+ {
+ int inner, a;
+ unsigned long r;
+ unsigned char ch;
+
+ inner = find_aac_header (buffer + offset, filled, &a);
+
+ if (inner < 0)
+ {
+ PROBE_DEBUG ("No ADTS header.\n");
+ goto DONE;
+ }
+
+ offset += inner;
+ filled -= inner;
+
+ decoder = NeAACDecOpen ();
+ inner = NeAACDecInit (decoder, buffer + offset, filled, &r, &ch);
+
+ if (inner < 0)
+ {
+ PROBE_DEBUG ("Decoder init failed.\n");
+ NeAACDecClose (decoder);
+ goto DONE;
+ }
+
+ offset += inner;
+ filled -= inner;
+ bytes_used += inner;
+
+ *samplerate = r;
+ *channels = ch;
+ initted = true;
+ }
+
+ if (NeAACDecDecode (decoder, &frame, buffer + offset, filled) == nullptr)
+ {
+ PROBE_DEBUG ("Decode failed.\n");
+ goto DONE;
+ }
+
+ if ((int)frame.samplerate != *samplerate || (int)frame.channels != *channels)
+ {
+ PROBE_DEBUG ("Parameter mismatch.\n");
+ goto DONE;
+ }
+
+ offset += frame.bytesconsumed;
+ filled -= frame.bytesconsumed;
+ bytes_used += frame.bytesconsumed;
+ time_used += frame.samples / frame.channels * (int64_t) 1000 /
+ frame.samplerate;
+ }
+
+ /* bits per millisecond = kilobits per second */
+ *bitrate = bytes_used * 8 / time_used;
+
+ if (size > 0)
+ *length = size * (int64_t) time_used / bytes_used;
+
+ DONE:
+ if (initted)
+ NeAACDecClose (decoder);
+}
+
+bool AACDecoder::read_tag (const char * filename, VFSFile & file, Tuple & tuple,
+ Index<char> * image)
+{
+ int length, bitrate, samplerate, channels;
+
+ tuple.set_str (Tuple::Codec, "MPEG-2/4 AAC");
+
+ // TODO: error handling
+ calc_aac_info (file, &length, &bitrate, &samplerate, &channels);
+
+ if (length > 0)
+ tuple.set_int (Tuple::Length, length);
+ if (bitrate > 0)
+ tuple.set_int (Tuple::Bitrate, bitrate);
+ if (channels > 0)
+ tuple.set_int (Tuple::Channels, channels);
+
+ tuple.fetch_stream_info (file);
+
+ return true;
+}
+
+static void aac_seek (VFSFile & file, NeAACDecHandle dec, int time, int len,
+ void * buf, int size, int * buflen)
+{
+ /* == ESTIMATE BYTE OFFSET == */
+
+ int64_t total = file.fsize ();
+ if (total < 0)
+ {
+ AUDERR ("File is not seekable.\n");
+ return;
+ }
+
+ /* == SEEK == */
+
+ if (file.fseek (total * time / len, VFS_SEEK_SET))
+ return;
+
+ * buflen = file.fread (buf, 1, size);
+
+ /* == FIND FRAME HEADER == */
+
+ int used = aac_probe ((unsigned char *) buf, * buflen);
+
+ if (used == * buflen)
+ {
+ AUDERR ("No valid frame header found.\n");
+ * buflen = 0;
+ return;
+ }
+
+ if (used)
+ {
+ * buflen -= used;
+ memmove (buf, (char *) buf + used, * buflen);
+ * buflen += file.fread ((char *) buf + * buflen, 1, size - * buflen);
+ }
+
+ /* == START DECODING == */
+
+ unsigned char chan;
+ unsigned long rate;
+
+ if ((used = NeAACDecInit (dec, (unsigned char *) buf, * buflen, & rate, & chan)) < 0)
+ {
+ AUDERR ("Failed to initialize AAC decoder.\n");
+ * buflen = 0;
+ return;
+ }
+
+ if (used)
+ {
+ * buflen -= used;
+ memmove (buf, (char *) buf + used, * buflen);
+ * buflen += file.fread ((char *) buf + * buflen, 1, size - * buflen);
+ }
+}
+
+bool AACDecoder::play (const char * filename, VFSFile & file)
+{
+ NeAACDecHandle decoder = 0;
+ NeAACDecConfigurationPtr decoder_config;
+ unsigned long samplerate = 0;
+ unsigned char channels = 0;
+
+ Tuple tuple = get_playback_tuple ();
+ int bitrate = 1000 * aud::max (0, tuple.get_int (Tuple::Bitrate));
+
+ if ((decoder = NeAACDecOpen ()) == nullptr)
+ {
+ AUDERR ("Open Decoder Error\n");
+ return false;
+ }
+
+ decoder_config = NeAACDecGetCurrentConfiguration (decoder);
+ decoder_config->outputFormat = FAAD_FMT_FLOAT;
+ NeAACDecSetConfiguration (decoder, decoder_config);
+
+ /* == FILL BUFFER == */
+
+ unsigned char bufBUFFER_SIZE;
+ int buflen;
+ buflen = file.fread (buf, 1, sizeof buf);
+
+ /* == SKIP ID3 TAG == */
+
+ if (buflen >= 10 && ! strncmp ((char *) buf, "ID3", 3))
+ {
+ int tagsize = 10 + (buf6 << 21) + (buf7 << 14) + (buf8 << 7) + buf9;
+
+ if (file.fseek (tagsize, VFS_SEEK_SET))
+ {
+ AUDERR ("Failed to seek past ID3v2 tag.\n");
+ goto ERR_CLOSE_DECODER;
+ }
+
+ buflen = file.fread (buf, 1, sizeof buf);
+ }
+
+ /* == FIND FRAME HEADER == */
+
+ int used;
+ used = aac_probe (buf, buflen);
+
+ if (used == buflen)
+ {
+ AUDERR ("No valid frame header found.\n");
+ goto ERR_CLOSE_DECODER;
+ }
+
+ if (used)
+ {
+ buflen -= used;
+ memmove (buf, buf + used, buflen);
+ buflen += file.fread (buf + buflen, 1, sizeof buf - buflen);
+ }
+
+ /* == START DECODING == */
+
+ if ((used = NeAACDecInit (decoder, buf, buflen, & samplerate, & channels)) < 0)
+ {
+ AUDERR ("Failed to initialize AAC decoder.\n");
+ goto ERR_CLOSE_DECODER;
+ }
+
+ if (used)
+ {
+ buflen -= used;
+ memmove (buf, buf + used, buflen);
+ buflen += file.fread (buf + buflen, 1, sizeof buf - buflen);
+ }
+
+ /* == CHECK FOR METADATA == */
+
+ if (tuple.fetch_stream_info (file))
+ set_playback_tuple (tuple.ref ());
+
+ set_stream_bitrate (bitrate);
+
+ /* == START PLAYBACK == */
+
+ open_audio (FMT_FLOAT, samplerate, channels);
+
+ /* == MAIN LOOP == */
+
+ while (! check_stop ())
+ {
+ /* == HANDLE SEEK REQUESTS == */
+
+ int seek_value = check_seek ();
+
+ if (seek_value >= 0)
+ {
+ int length = tuple.get_int (Tuple::Length);
+ if (length > 0)
+ aac_seek (file, decoder, seek_value, length, buf, sizeof buf, & buflen);
+ }
+
+ /* == CHECK FOR END OF FILE == */
+
+ if (! buflen)
+ break;
+
+ /* == CHECK FOR METADATA == */
+
+ if (tuple.fetch_stream_info (file))
+ set_playback_tuple (tuple.ref ());
+
+ /* == DECODE A FRAME == */
+
+ NeAACDecFrameInfo info;
+ void * audio = NeAACDecDecode (decoder, & info, buf, buflen);
+
+ if (info.error)
+ {
+ AUDERR ("%s.\n", NeAACDecGetErrorMessage (info.error));
+
+ if (buflen)
+ {
+ used = 1 + aac_probe (buf + 1, buflen - 1);
+ buflen -= used;
+ memmove (buf, buf + used, buflen);
+ buflen += file.fread (buf + buflen, 1, sizeof buf - buflen);
+ }
+
+ continue;
+ }
+
+ if ((used = info.bytesconsumed))
+ {
+ buflen -= used;
+ memmove (buf, buf + used, buflen);
+ buflen += file.fread (buf + buflen, 1, sizeof buf - buflen);
+ }
+
+ /* == PLAY THE SOUND == */
+
+ if (audio && info.samples)
+ write_audio (audio, sizeof (float) * info.samples);
+ }
+
+ NeAACDecClose (decoder);
+ return true;
+
+ERR_CLOSE_DECODER:
+ NeAACDecClose (decoder);
+ return false;
+}

audacious-plugins-4.4.1.tar.bz2/src/aac/meson.build Added

audacious-plugins-3.6.2-gtk3.tar.bz2/src/adplug/Makefile -> audacious-plugins-4.4.1.tar.bz2/src/adplug/Makefile Changed

@@ -1,58 +1,6 @@
 PLUGIN = adplug${PLUGIN_SUFFIX}
 
-SRCS = adplug-xmms.cc		\
-       core/fmopl.cc		\
-       core/debug.cc		\
-       core/adlibemu.cc		\
-       core/adplug.cc		\
-       core/emuopl.cc		\
-       core/fprovide.cc	\
-       core/player.cc		\
-       core/database.cc	\
-       core/hsc.cc		\
-       core/sng.cc		\
-       core/imf.cc		\
-       core/players.cc		\
-       core/protrack.cc	\
-       core/a2m.cc		\
-       core/adtrack.cc		\
-       core/amd.cc		\
-       core/bam.cc		\
-       core/cmf.cc		\
-       core/d00.cc		\
-       core/dfm.cc		\
-       core/dmo.cc		\
-       core/hsp.cc		\
-       core/ksm.cc		\
-       core/mad.cc		\
-       core/mid.cc		\
-       core/mkj.cc		\
-       core/cff.cc		\
-       core/dtm.cc		\
-       core/fmc.cc		\
-       core/mtk.cc		\
-       core/rad.cc		\
-       core/raw.cc		\
-       core/sa2.cc		\
-       core/s3m.cc		\
-       core/xad.cc		\
-       core/flash.cc		\
-       core/bmf.cc		\
-       core/hybrid.cc		\
-       core/hyp.cc		\
-       core/psi.cc		\
-       core/rat.cc		\
-       core/u6m.cc		\
-       core/rol.cc		\
-       core/xsm.cc		\
-       core/dro.cc		\
-       core/dro2.cc		\
-       core/lds.cc		\
-       core/temuopl.cc		\
-       core/msc.cc		\
-       core/rix.cc		\
-       core/adl.cc		\
-       core/jbm.cc
+SRCS = adplug-xmms.cc
 
 include ../../buildsys.mk
 include ../../extra.mk
@@ -61,6 +9,6 @@
 
 LD = ${CXX}
 CFLAGS += ${PLUGIN_CFLAGS}
-CXXFLAGS += ${PLUGIN_CFLAGS} -Wno-sign-compare
-CPPFLAGS += ${PLUGIN_CPPFLAGS} ${BINIO_CFLAGS} -I../.. -I./core
-LIBS += ${BINIO_LIBS}
+CXXFLAGS += ${PLUGIN_CFLAGS}
+CPPFLAGS += ${PLUGIN_CPPFLAGS} ${ADLIB_CFLAGS} -I../..
+LIBS += ${ADLIB_LIBS}

audacious-plugins-3.6.2-gtk3.tar.bz2/src/adplug/adplug-xmms.cc -> audacious-plugins-4.4.1.tar.bz2/src/adplug/adplug-xmms.cc Changed

@@ -23,46 +23,74 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "adplug.h"
-#include "emuopl.h"
-#include "silentopl.h"
-#include "players.h"
+#include <adplug/adplug.h>
+#include <adplug/emuopl.h>
+#include <adplug/silentopl.h>
+#ifdef HAVE_ADPLUG_NEMUOPL_H
+# include <adplug/nemuopl.h>
+#endif
+#ifdef HAVE_ADPLUG_WEMUOPL_H
+# include <adplug/wemuopl.h>
+#endif
+#ifdef HAVE_ADPLUG_KEMUOPL_H
+# include <adplug/kemuopl.h>
+#endif
+#include <adplug/players.h>
 
 #include <libaudcore/audstrings.h>
 #include <libaudcore/i18n.h>
 #include <libaudcore/plugin.h>
 #include <libaudcore/runtime.h>
+#include <libaudcore/preferences.h>
 
-class AdPlugXMMS : public InputPlugin
-{
-public:
- static const char * const exts;
-
- static constexpr PluginInfo info = {
- N_("AdPlug (AdLib Player)"),
- PACKAGE
- };
+#include "adplug-xmms.h"
 
- static constexpr auto iinfo = InputInfo ()
- .with_exts (exts);
+#define CFG_ID "AdPlug"
 
- constexpr AdPlugXMMS () : InputPlugin (info, iinfo) {}
-
- bool init ();
- void cleanup ();
+#define ADPLUG_MAME 0
+#ifdef HAVE_ADPLUG_NEMUOPL_H
+# define ADPLUG_NUKED 1
+#endif
+#ifdef HAVE_ADPLUG_WEMUOPL_H
+# define ADPLUG_WOODY 2
+#endif
+#ifdef HAVE_ADPLUG_KEMUOPL_H
+# define ADPLUG_KS 3
+#endif
 
- bool is_our_file (const char * filename, VFSFile & file);
- Tuple read_tuple (const char * filename, VFSFile & file);
- bool play (const char * filename, VFSFile & file);
+class AdPlugXMMS : public InputPlugin
+{
+public:
+ static const char * const exts;
+ static const char * const defaults;
+ static const PreferencesWidget widgets;
+ static const PluginPreferences prefs;
+
+ static constexpr PluginInfo info = {
+ N_("AdPlug (AdLib Player)"),
+ PACKAGE,
+ nullptr,
+ & prefs
+ };
+
+ constexpr AdPlugXMMS () : InputPlugin (info, InputInfo ()
+ .with_exts (exts)) {}
+
+ bool init ();
+ void cleanup ();
+
+ bool is_our_file (const char * filename, VFSFile & file);
+ bool read_tag (const char * filename, VFSFile & file, Tuple & tuple, Index<char> * image);
+ bool play (const char * filename, VFSFile & file);
 };
 
 EXPORT AdPlugXMMS aud_plugin_instance;
 
 const char * const AdPlugXMMS::exts = {
- "a2m", "adl", "amd", "bam", "cff", "cmf", "d00", "dfm", "dmo", "dro",
- "dtm", "hsc", "hsp", "ins", "jbm", "ksm", "laa", "lds", "m", "mad",
- "mkj", "msc", "rad", "raw", "rix", "rol", "s3m", "sa2", "sat", "sci",
- "sng", "wlf", "xad", "xsm", nullptr
+ "a2m", "adl", "amd", "bam", "cff", "cmf", "d00", "dfm", "dmo", "dro",
+ "dtm", "hsc", "hsp", "ins", "jbm", "ksm", "laa", "lds", "m", "mad",
+ "mkj", "msc", "rad", "raw", "rix", "rol", "s3m", "sa2", "sat", "sci",
+ "sng", "wlf", "xad", "xsm", nullptr
 };
 
 /***** Defines *****/
@@ -70,9 +98,8 @@
 // Sound buffer size in samples
 #define SNDBUFSIZE	512
 
-// AdPlug's 8 and 16 bit audio formats
-#define FORMAT_8	FMT_U8
-#define FORMAT_16	FMT_S16_NE
+// 4 byte sample size (16 bit depth & stereo)
+#define SAMPLESIZE 4
 
 // Default file name of AdPlug's database file
 #define ADPLUGDB_FILE		"adplug.db"
@@ -82,17 +109,10 @@
 
 /***** Global variables *****/
 
-// Configuration (and defaults)
-static struct {
- int freq = 44100l;
- bool bit16 = true, stereo = false, endless = false;
- CPlayers players = CAdPlug::getPlayers();
-} conf;
-
 // Player variables
 static struct {
- CPlayer *p = nullptr;
- CAdPlugDatabase *db = nullptr;
+ SmartPtr<CPlayer> p;
+ SmartPtr<CAdPlugDatabase> db;
 unsigned int subsong = 0, songlength = 0;
 String filename;
 } plr;
@@ -122,43 +142,34 @@
 
 #endif
 
-static CPlayer *
-factory (VFSFile & fd, Copl * newopl)
-{
- return CAdPlug::factory (fd, newopl, conf.players);
-}
-
 /***** Main player (!! threaded !!) *****/
 
-Tuple AdPlugXMMS::read_tuple (const char * filename, VFSFile & fd)
+bool AdPlugXMMS::read_tag (const char * filename, VFSFile & file, Tuple & tuple,
+ Index<char> * image)
 {
- Tuple tuple;
 CSilentopl tmpopl;
 
- if (!fd)
- return tuple;
-
- CPlayer *p = factory (fd, &tmpopl);
+ CFileVFSProvider fp (file);
+ CPlayer *p = CAdPlug::factory (filename, &tmpopl, CAdPlug::players, fp);
 
- if (p)
- {
- tuple.set_filename (filename);
+ if (! p)
+ return false;
 
- if (! p->getauthor().empty())
- tuple.set_str (Tuple::Artist, p->getauthor().c_str());
+ if (! p->getauthor().empty())
+ tuple.set_str (Tuple::Artist, p->getauthor().c_str());
 
- if (! p->gettitle().empty())
- tuple.set_str (Tuple::Title, p->gettitle().c_str());
- else if (! p->getdesc().empty())
- tuple.set_str (Tuple::Title, p->getdesc().c_str());
+ if (! p->gettitle().empty())
+ tuple.set_str (Tuple::Title, p->gettitle().c_str());
+ else if (! p->getdesc().empty())
+ tuple.set_str (Tuple::Title, p->getdesc().c_str());
 
- tuple.set_str (Tuple::Codec, p->gettype().c_str());
- tuple.set_str (Tuple::Quality, _("sequenced"));
- tuple.set_int (Tuple::Length, p->songlength (plr.subsong));
- delete p;
- }
+ tuple.set_str (Tuple::Codec, p->gettype().c_str());
+ tuple.set_str (Tuple::Quality, _("sequenced"));
+ tuple.set_int (Tuple::Length, p->songlength (plr.subsong));
+ tuple.set_int (Tuple::Channels, 2);
+ delete p;
 
- return tuple;
+ return true;
 }
 
 /* Main playback thread. Takes the filename to play as argument. */
@@ -166,23 +177,50 @@
 {
 dbg_printf ("adplug_play(\"%s\"): ", filename);
 
+ int emulator = aud_get_int (CFG_ID, "Emulator");
+ int freq = aud_get_int (CFG_ID, "Frequency");
+ bool endless = aud_get_bool (CFG_ID, "Endless");
+
 // Set XMMS main window information
 dbg_printf ("xmms, ");
- int sampsize = (conf.bit16 ? 2 : 1) * (conf.stereo ? 2 : 1);
- set_stream_bitrate (conf.freq * sampsize * 8);
+ set_stream_bitrate (freq * SAMPLESIZE * 8);
 
 // open output plugin
 dbg_printf ("open, ");
- open_audio (conf.bit16 ? FORMAT_16 : FORMAT_8, conf.freq, conf.stereo ? 2 : 1);
+ open_audio (FMT_S16_NE, freq, 2);
+
+ SmartPtr<Copl> opl;
+ switch (emulator) {
+#ifdef HAVE_ADPLUG_NEMUOPL_H
+ case ADPLUG_NUKED:
+ opl.capture(new CNemuopl (freq));
+ break;
+#endif
+#ifdef HAVE_ADPLUG_WEMUOPL_H
+ case ADPLUG_WOODY:
+ opl.capture(new CWemuopl (freq, true, true));
+ break;
+#endif
+#ifdef HAVE_ADPLUG_KEMUOPL_H
+ case ADPLUG_KS:
+ opl.capture(new CKemuopl (freq, true, true));
+ break;
+#endif
+ case ADPLUG_MAME:
+ default:
+ opl.capture(new CEmuopl (freq, true, true));
+ // otherwise sound only comes out of left
+ static_cast<CEmuopl *>(opl.get())->settype(Copl::TYPE_OPL2);
+ }
 
- CEmuopl opl (conf.freq, conf.bit16, conf.stereo);
 long toadd = 0, i, towrite;
 char *sndbuf, *sndbufpos;
 bool playing = true; // Song self-end indicator.
 
 // Try to load module
 dbg_printf ("factory, ");
- if (!(plr.p = factory (fd, &opl)))
+ CFileVFSProvider fp (fd);
+ if (!(plr.p.capture(CAdPlug::factory (filename, opl.get (), CAdPlug::players, fp))))
 {
 dbg_printf ("error!\n");
 // MessageBox("AdPlug :: Error", "File could not be opened!", "Ok");
@@ -199,7 +237,8 @@
 
 // Allocate audio buffer
 dbg_printf ("buffer, ");
- sndbuf = (char *) malloc (SNDBUFSIZE * sampsize);
+ // 4 byte sample size
+ sndbuf = (char *) malloc (SNDBUFSIZE * 4);
 
 // Rewind player to right subsong
 dbg_printf ("rewind, ");
@@ -209,7 +248,7 @@
 
 // main playback loop
 dbg_printf ("loop.\n");
- while ((playing || conf.endless))
+ while ((playing || endless))
 {
 if (check_stop ())
 break;
@@ -238,40 +277,37 @@
 {
 while (toadd < 0)
 {
- toadd += conf.freq;
+ toadd += freq;
 playing = plr.p->update ();
 if (playing)
 time += (int) (1000 / plr.p->getrefresh ());
 }
 i = std::min (towrite, (long) (toadd / plr.p->getrefresh () + 4) & ~3);
- opl.update ((short *) sndbufpos, i);
- sndbufpos += i * sampsize;
+ opl->update ((short *) sndbufpos, i);
+ sndbufpos += i * SAMPLESIZE;
 towrite -= i;
 toadd -= (long) (plr.p->getrefresh () * i);
 }
 
- write_audio (sndbuf, SNDBUFSIZE * sampsize);
+ write_audio (sndbuf, SNDBUFSIZE * SAMPLESIZE);
 }
 
 // free everything and exit
 dbg_printf ("free");
- delete plr.p;
- plr.p = 0;
+ plr.p.clear ();
 free (sndbuf);
 dbg_printf (".\n");
 return true;
 }
 
-// sampsize macro not useful anymore.
-#undef sampsize
-
 /***** Informational *****/
 
 bool AdPlugXMMS::is_our_file (const char * filename, VFSFile & fd)
 {
 CSilentopl tmpopl;
 
- CPlayer *p = factory (fd, &tmpopl);
+ CFileVFSProvider fp (fd);
+ CPlayer *p = CAdPlug::factory (filename, &tmpopl, CAdPlug::players, fp);
 
 dbg_printf ("adplug_is_our_file(\"%s\"): returned ", filename);
 
@@ -288,38 +324,44 @@
 
 /***** Configuration file handling *****/
 
-#define CFG_VERSION "AdPlug"
-
-static const char * const adplug_defaults = {
- "16bit", "TRUE",
- "Stereo", "FALSE",
+const char * const AdPlugXMMS::defaults = {
 "Frequency", "44100",
 "Endless", "FALSE",
+ "Emulator", "0",
 nullptr};
 
-bool AdPlugXMMS::init ()
-{
- aud_config_set_defaults (CFG_VERSION, adplug_defaults);
+/***** Configuration UI *****/
 
- conf.bit16 = aud_get_bool (CFG_VERSION, "16bit");
- conf.stereo = aud_get_bool (CFG_VERSION, "Stereo");
- conf.freq = aud_get_int (CFG_VERSION, "Frequency");
- conf.endless = aud_get_bool (CFG_VERSION, "Endless");
+static const ComboItem plugin_combo = {
+ ComboItem ("Tatsuyuki Satoh 0.72 (MAME, 2003)", ADPLUG_MAME),
+#ifdef HAVE_ADPLUG_NEMUOPL_H
+ ComboItem ("Nuked OPL3 (Nuke.YKT, 2018)", ADPLUG_NUKED),
+#endif
+#ifdef HAVE_ADPLUG_WEMUOPL_H
+ ComboItem ("WoodyOPL (DOSBox, 2016)", ADPLUG_WOODY),
+#endif
+#ifdef HAVE_ADPLUG_KEMUOPL_H
+ ComboItem ("Ken Silverman (2001)", ADPLUG_KS),
+#endif
+};
 
- // Read file type exclusion list
- dbg_printf ("exclusion, ");
- {
- String cfgstr = aud_get_str (CFG_VERSION, "Exclude");
+const PreferencesWidget AdPlugXMMS::widgets = {
+ WidgetLabel (N_("Output")),
+ WidgetCombo (N_("OPL Emulator:"),
+ WidgetInt (CFG_ID, "Emulator"),
+ {{plugin_combo}}),
+ WidgetSpin (N_("Sample rate:"),
+ WidgetInt (CFG_ID, "Frequency"), {8000, 192000, 50, N_("Hz")}),
+ WidgetLabel (N_("Miscellaneous")),
+ WidgetCheck (N_("Repeat song in endless loop"),
+ WidgetBool (CFG_ID, "Endless"))
+};
 
- if (cfgstr0)
- {
- StringBuf exclude = str_concat ({cfgstr, ":"});
- str_replace_char (exclude, ':', 0);
+const PluginPreferences AdPlugXMMS::prefs = {{widgets}};
 
- for (char * p = exclude; * p; p += strlen (p) + 1)
- conf.players.remove (conf.players.lookup_filetype (p));
- }
- }
+bool AdPlugXMMS::init ()
+{
+ aud_config_set_defaults (CFG_ID, defaults);
 
 // Load database from disk and hand it to AdPlug
 dbg_printf ("database");
@@ -333,10 +375,10 @@
 
 if (VFSFile::test_file (userdb.c_str (), VFS_EXISTS))
 {
- plr.db = new CAdPlugDatabase;
+ plr.db.capture(new CAdPlugDatabase);
 plr.db->load (userdb); // load user's database
 dbg_printf (" (userdb=\"%s\")", userdb.c_str());
- CAdPlug::set_database (plr.db);
+ CAdPlug::set_database (plr.db.get ());
 }
 }
 }
@@ -349,27 +391,6 @@
 {
 // Close database
 dbg_printf ("db, ");
- if (plr.db)
- delete plr.db;
-
+ plr.db.clear ();
 plr.filename = String ();
-
- aud_set_bool (CFG_VERSION, "16bit", conf.bit16);
- aud_set_bool (CFG_VERSION, "Stereo", conf.stereo);
- aud_set_int (CFG_VERSION, "Frequency", conf.freq);
- aud_set_bool (CFG_VERSION, "Endless", conf.endless);
-
- dbg_printf ("exclude, ");
- std::string exclude;
- for (CPlayers::const_iterator i = CAdPlug::getPlayers().begin ();
- i != CAdPlug::getPlayers().end (); i++)
- if (find (conf.players.begin (), conf.players.end (), *i) ==
- conf.players.end ())
- {
- if (!exclude.empty ())
- exclude += ":";
- exclude += (*i)->filetype;
- }
-
- aud_set_str (CFG_VERSION, "Exclude", exclude.c_str ());
 }

audacious-plugins-4.4.1.tar.bz2/src/adplug/adplug-xmms.h Added

@@ -0,0 +1,106 @@
+/*
+ AdPlug/XMMS - AdPlug XMMS Plugin
+ Copyright (C) 2002, 2003 Simon Peter <dn.tlp@gmx.net>
+
+ AdPlug/XMMS 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 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
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this plugin; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+*/
+
+#ifndef ADPLUG_XMMS_H
+#define ADPLUG_XMMS_H
+
+#include "config.h"
+
+#include <libbinio/binio.h>
+#include <adplug/fprovide.h>
+
+#include <libaudcore/vfs.h>
+
+class vfsistream : public binistream
+{
+public:
+ vfsistream(VFSFile *fd = nullptr) :
+ fd(fd) {}
+
+ vfsistream(std::string &file)
+ {
+ if ((own = VFSFile(file.c_str(), "r")))
+ fd = &own;
+ else
+ err |= NotFound;
+ }
+
+ Byte getByte()
+ {
+ Byte b = (Byte)-1;
+ if (fd->fread(&b, 1, 1) != 1)
+ err |= Eof;
+ return b;
+ }
+
+ void seek(long pos, Offset offs = Set)
+ {
+ VFSSeekType wh = (offs == Add) ? VFS_SEEK_CUR : (offs == End) ? VFS_SEEK_END : VFS_SEEK_SET;
+ if (fd->fseek (pos, wh))
+ err |= Eof;
+ }
+
+ long pos()
+ {
+ return fd->ftell ();
+ }
+
+ unsigned long size()
+ {
+ return aud::max(fd->fsize(), (int64_t)0);
+ }
+
+private:
+ VFSFile *fd = nullptr;
+ VFSFile own;
+};
+
+class CFileVFSProvider : public CFileProvider
+{
+public:
+ CFileVFSProvider(VFSFile &file) :
+ m_file(file) {}
+
+ binistream *open(std::string filename) const
+ {
+ binistream *f;
+
+ if (!strcmp(filename.c_str(), m_file.filename()) && !m_file.fseek(0, VFS_SEEK_SET))
+ f = new vfsistream(&m_file);
+ else
+ f = new vfsistream(filename);
+
+ if(f->error()) { delete f; return 0; }
+
+ // Open all files as little endian with IEEE floats by default
+ f->setFlag(binio::BigEndian, false); f->setFlag(binio::FloatIEEE);
+
+ return f;
+ }
+
+ void close(binistream *f) const
+ {
+ delete f;
+ }
+
+private:
+ VFSFile &m_file;
+};
+
+#endif

audacious-plugins-4.4.1.tar.bz2/src/adplug/meson.build Added

audacious-plugins-3.6.2-gtk3.tar.bz2/src/albumart-qt/albumart.cc -> audacious-plugins-4.4.1.tar.bz2/src/albumart-qt/albumart.cc Changed

@@ -17,6 +17,7 @@
 * the use of this software.
 */
 
+#include <QApplication>
 #include <QLabel>
 #include <QPixmap>
 
@@ -24,66 +25,133 @@
 #include <libaudcore/i18n.h>
 #include <libaudcore/plugin.h>
 #include <libaudcore/hook.h>
+#include <libaudcore/templates.h>
 
 #include <libaudqt/libaudqt.h>
 
 class AlbumArtQt : public GeneralPlugin {
 public:
 static constexpr PluginInfo info = {
- N_("Album Art (Qt)"),
- PACKAGE
+ N_("Album Art"),
+ PACKAGE,
+ nullptr, // about
+ nullptr, // prefs
+ PluginQtOnly
 };
 
 constexpr AlbumArtQt () : GeneralPlugin (info, false) {}
 void * get_qt_widget ();
-
-private:
- static void update (void * unused, QLabel * widget);
- static void clear (void * unused, QLabel * widget);
- static void widget_cleanup (QObject * widget);
 };
 
-void AlbumArtQt::update (void * unused, QLabel * widget)
-{
- if (! aud_drct_get_playing ())
- return;
-
- if (! widget)
- return;
-
- QSize size = widget->size ();
- widget->setPixmap (audqt::art_request_current (size.width (), size.height ()));
-}
-
-void AlbumArtQt::clear (void * unused, QLabel * widget)
-{
- if (! widget)
- return;
-
- widget->setPixmap (QPixmap ());
-}
+class ArtLabel : public QLabel {
+public:
+#if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0)
+ ArtLabel (QWidget * parent = nullptr, Qt::WindowFlags f = Qt::WindowFlags()) : QLabel (parent, f)
+#else
+ ArtLabel (QWidget * parent = nullptr, Qt::WindowFlags f = 0) : QLabel (parent, f)
+#endif
+ {
+ init ();
+ }
+
+#if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0)
+ ArtLabel (const QString & text, QWidget * parent = nullptr, Qt::WindowFlags f = Qt::WindowFlags()) : QLabel (text, parent, f)
+#else
+ ArtLabel (const QString & text, QWidget * parent = nullptr, Qt::WindowFlags f = 0) : QLabel (text, parent, f)
+#endif
+ {
+ init ();
+ }
+
+ void update_art ()
+ {
+ origPixmap = QPixmap (audqt::art_request_current (0, 0));
+ qreal r = qApp->devicePixelRatio ();
+ origPixmap.setDevicePixelRatio (r);
+ origSize = origPixmap.size ();
+ drawArt ();
+ }
+
+ void clear ()
+ {
+ QLabel::clear ();
+ origPixmap = QPixmap ();
+ }
+
+protected:
+ virtual void resizeEvent (QResizeEvent * event)
+ {
+ QLabel::resizeEvent (event);
+
+#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0)
+ QPixmap pm = pixmap (Qt::ReturnByValue);
+ if (! origPixmap.isNull () && ! pm.isNull () &&
+ (size ().width () <= origSize.width () + MARGIN ||
+ size ().height () <= origSize.height () + MARGIN ||
+ pm.size ().width () != origSize.width () ||
+ pm.size ().height () != origSize.height ()))
+ drawArt ();
+#else
+ const QPixmap * pm = pixmap ();
+ if (! origPixmap.isNull () && pm && ! pm->isNull () &&
+ (size ().width () <= origSize.width () + MARGIN ||
+ size ().height () <= origSize.height () + MARGIN ||
+ pm->size ().width () != origSize.width () ||
+ pm->size ().height () != origSize.height ()))
+ drawArt ();
+#endif
+ }
 
-void AlbumArtQt::widget_cleanup (QObject * widget)
-{
- hook_dissociate ("playback begin", (HookFunction) update, widget);
- hook_dissociate ("current art ready", (HookFunction) update, widget);
- hook_dissociate ("playback stop", (HookFunction) clear, widget);
-}
+private:
+ static constexpr int MARGIN = 4;
+
+ const HookReceiver<ArtLabel>
+ update_hook{"playback ready", this, &ArtLabel::update_art},
+ clear_hook{"playback stop", this, &ArtLabel::clear};
+
+ QPixmap origPixmap;
+ QSize origSize;
+
+ void init ()
+ {
+ clear ();
+ setMinimumSize (MARGIN + 1, MARGIN + 1);
+ setAlignment (Qt::AlignCenter);
+
+ if (aud_drct_get_ready())
+ update_art();
+ }
+
+ void drawArt ()
+ {
+ qreal r = qApp->devicePixelRatio();
+ if (aud::abs(r - 1.0) <= 0.01 &&
+ origSize.width () <= size ().width () - MARGIN &&
+ origSize.height () <= size ().height() - MARGIN) {
+ // If device pixel ratio is close to 1:1 (within 1%) and art is
+ // smaller than widget, set pixels directly w/o scaling
+ setPixmap (origPixmap);
+ } else {
+ // Otherwise scale image with device pixel ratio, but limit size to
+ // widget dimensions.
+ auto width = std::min(r * (size().width() - MARGIN),
+ r * origSize.width());
+ auto height = std::min(r * (size().height() - MARGIN),
+ r * origSize.height());
+
+ setPixmap (origPixmap.scaled (width, height, Qt::KeepAspectRatio,
+ Qt::SmoothTransformation));
+ }
+
+#ifdef Q_OS_MAC
+ repaint();
+#endif
+ }
+};
 
 void * AlbumArtQt::get_qt_widget ()
 {
- QLabel * widget = new QLabel;
-
- QObject::connect (widget, &QObject::destroyed, widget_cleanup);
-
- hook_associate ("playback begin", (HookFunction) update, widget);
- hook_associate ("current art ready", (HookFunction) update, widget);
- hook_associate ("playback stop", (HookFunction) clear, widget);
-
- widget->resize (96, 96);
- update (nullptr, widget);
-
- return widget;
+ return new ArtLabel;
 }
 
 EXPORT AlbumArtQt aud_plugin_instance;

audacious-plugins-4.4.1.tar.bz2/src/albumart-qt/meson.build Added

audacious-plugins-3.6.2-gtk3.tar.bz2/src/albumart/albumart.cc -> audacious-plugins-4.4.1.tar.bz2/src/albumart/albumart.cc Changed

@@ -29,7 +29,10 @@
 public:
     static constexpr PluginInfo info = {
         N_("Album Art"),
-        PACKAGE
+        PACKAGE,
+        nullptr, // about
+        nullptr, // prefs
+        PluginGLibOnly
     };
 
     constexpr AlbumArtPlugin () : GeneralPlugin (info, false) {}
@@ -39,31 +42,24 @@
 
 EXPORT AlbumArtPlugin aud_plugin_instance;
 
-static void album_update (void * unused, GtkWidget * widget)
+static void album_update (void *, GtkWidget * widget)
 {
-    if (! aud_drct_get_playing ())
-        return;
-
-    GdkPixbuf * pixbuf = audgui_pixbuf_request_current ();
+    AudguiPixbuf pixbuf = audgui_pixbuf_request_current ();
 
     if (! pixbuf)
         pixbuf = audgui_pixbuf_fallback ();
 
-    audgui_scaled_image_set (widget, pixbuf);
-
-    if (pixbuf)
-        g_object_unref (pixbuf);
+    audgui_scaled_image_set (widget, pixbuf.get ());
 }
 
-static void album_clear (void * unused, GtkWidget * widget)
+static void album_clear (void *, GtkWidget * widget)
 {
     audgui_scaled_image_set (widget, nullptr);
 }
 
 static void album_cleanup (GtkWidget * widget)
 {
-    hook_dissociate ("playback begin", (HookFunction) album_update, widget);
-    hook_dissociate ("current art ready", (HookFunction) album_update, widget);
+    hook_dissociate ("playback ready", (HookFunction) album_update, widget);
     hook_dissociate ("playback stop", (HookFunction) album_clear, widget);
 
     audgui_cleanup ();
@@ -74,15 +70,14 @@
     audgui_init ();
 
     GtkWidget * widget = audgui_scaled_image_new (nullptr);
-    gtk_widget_set_size_request (widget, 96, 96);
 
     g_signal_connect (widget, "destroy", (GCallback) album_cleanup, nullptr);
 
-    hook_associate ("playback begin", (HookFunction) album_update, widget);
-    hook_associate ("current art ready", (HookFunction) album_update, widget);
+    hook_associate ("playback ready", (HookFunction) album_update, widget);
     hook_associate ("playback stop", (HookFunction) album_clear, widget);
 
-    album_update (nullptr, widget);
+    if (aud_drct_get_ready ())
+        album_update (nullptr, widget);
 
     return widget;
 }

audacious-plugins-4.4.1.tar.bz2/src/albumart/meson.build Added

audacious-plugins-3.6.2-gtk3.tar.bz2/src/alsa/Makefile -> audacious-plugins-4.4.1.tar.bz2/src/alsa/Makefile Changed

audacious-plugins-3.6.2-gtk3.tar.bz2/src/alsa/alsa.cc -> audacious-plugins-4.4.1.tar.bz2/src/alsa/alsa.cc Changed

@@ -94,13 +94,13 @@
 {
 if (pipe (poll_pipe))
 {
- ERROR ("Failed to create pipe: %s.\n", strerror (errno));
+ AUDERR ("Failed to create pipe: %s.\n", strerror (errno));
 return false;
 }
 
 if (fcntl (poll_pipe0, F_SETFL, O_NONBLOCK))
 {
- ERROR ("Failed to set O_NONBLOCK on pipe: %s.\n", strerror (errno));
+ AUDERR ("Failed to set O_NONBLOCK on pipe: %s.\n", strerror (errno));
 close (poll_pipe0);
 close (poll_pipe1);
 return false;
@@ -120,7 +120,7 @@
 {
 if (poll (poll_handles, poll_count, -1) < 0)
 {
- ERROR ("Failed to poll: %s.\n", strerror (errno));
+ AUDERR ("Failed to poll: %s.\n", strerror (errno));
 return;
 }
 
@@ -136,7 +136,7 @@
 {
 const char c = 0;
 if (write (poll_pipe1, & c, 1) < 0)
- ERROR ("Failed to write to pipe: %s.\n", strerror (errno));
+ AUDERR ("Failed to write to pipe: %s.\n", strerror (errno));
 }
 
 static void poll_cleanup ()
@@ -149,7 +149,6 @@
 static void * pump (void *)
 {
 pthread_mutex_lock (& alsa_mutex);
- pthread_cond_broadcast (& alsa_cond); /* signal thread started */
 
 bool failed_once = false;
 bool use_timed_wait = false;
@@ -224,15 +223,14 @@
 {
 AUDDBG ("Starting pump.\n");
 pthread_create (& pump_thread, nullptr, pump, nullptr);
- pthread_cond_wait (& alsa_cond, & alsa_mutex);
 }
 
 static void pump_stop ()
 {
 AUDDBG ("Stopping pump.\n");
 pump_quit = true;
- pthread_cond_broadcast (& alsa_cond);
 poll_wake ();
+ pthread_cond_broadcast (& alsa_cond);
 pthread_mutex_unlock (& alsa_mutex);
 pthread_join (pump_thread, nullptr);
 pthread_mutex_lock (& alsa_mutex);
@@ -296,6 +294,10 @@
 {FMT_S32_BE, SND_PCM_FORMAT_S32_BE},
 {FMT_U32_LE, SND_PCM_FORMAT_U32_LE},
 {FMT_U32_BE, SND_PCM_FORMAT_U32_BE},
+ {FMT_S24_3LE, SND_PCM_FORMAT_S24_3LE},
+ {FMT_S24_3BE, SND_PCM_FORMAT_S24_3BE},
+ {FMT_U24_3LE, SND_PCM_FORMAT_U24_3LE},
+ {FMT_U24_3BE, SND_PCM_FORMAT_U24_3BE},
 };
 
 for (auto & conv : table)
@@ -307,7 +309,7 @@
 return SND_PCM_FORMAT_UNKNOWN;
 }
 
-bool ALSAPlugin::open_audio (int aud_format, int rate, int channels)
+bool ALSAPlugin::open_audio (int aud_format, int rate, int channels, String & error)
 {
 int total_buffer, hard_buffer, soft_buffer, buffer_frames;
 unsigned useconds;
@@ -319,41 +321,48 @@
 
 String pcm = aud_get_str ("alsa", "pcm");
 snd_pcm_format_t format = convert_aud_format (aud_format);
- AUDDBG ("Opening PCM device %s for %s, %d channels, %d Hz.\n",
+
+ if (format == SND_PCM_FORMAT_UNKNOWN)
+ {
+ error = String ("Unsupported audio format");
+ goto FAILED;
+ }
+
+ AUDINFO ("Opening PCM device %s for %s, %d channels, %d Hz.\n",
 (const char *) pcm, snd_pcm_format_name (format), channels, rate);
- CHECK_NOISY (snd_pcm_open, & alsa_handle, pcm, SND_PCM_STREAM_PLAYBACK, 0);
+ CHECK_STR (error, snd_pcm_open, & alsa_handle, pcm, SND_PCM_STREAM_PLAYBACK, 0);
 
 snd_pcm_hw_params_t * params;
 snd_pcm_hw_params_alloca (& params);
- CHECK_NOISY (snd_pcm_hw_params_any, alsa_handle, params);
- CHECK_NOISY (snd_pcm_hw_params_set_access, alsa_handle, params,
+ CHECK_STR (error, snd_pcm_hw_params_any, alsa_handle, params);
+ CHECK_STR (error, snd_pcm_hw_params_set_access, alsa_handle, params,
 SND_PCM_ACCESS_RW_INTERLEAVED);
 
- CHECK_NOISY (snd_pcm_hw_params_set_format, alsa_handle, params, format);
- CHECK_NOISY (snd_pcm_hw_params_set_channels, alsa_handle, params, channels);
- CHECK_NOISY (snd_pcm_hw_params_set_rate, alsa_handle, params, rate, 0);
+ CHECK_STR (error, snd_pcm_hw_params_set_format, alsa_handle, params, format);
+ CHECK_STR (error, snd_pcm_hw_params_set_channels, alsa_handle, params, channels);
+ CHECK_STR (error, snd_pcm_hw_params_set_rate, alsa_handle, params, rate, 0);
 
 alsa_format = format;
 alsa_channels = channels;
 alsa_rate = rate;
 
- total_buffer = aud_get_int (nullptr, "output_buffer_size");
+ total_buffer = aud_get_int ("output_buffer_size");
 useconds = 1000 * aud::min (1000, total_buffer / 2);
 direction = 0;
- CHECK_NOISY (snd_pcm_hw_params_set_buffer_time_near, alsa_handle, params,
- & useconds, & direction);
+ CHECK_STR (error, snd_pcm_hw_params_set_buffer_time_near, alsa_handle,
+ params, & useconds, & direction);
 hard_buffer = useconds / 1000;
 
 useconds = 1000 * (hard_buffer / 4);
 direction = 0;
- CHECK_NOISY (snd_pcm_hw_params_set_period_time_near, alsa_handle, params,
- & useconds, & direction);
+ CHECK_STR (error, snd_pcm_hw_params_set_period_time_near, alsa_handle,
+ params, & useconds, & direction);
 alsa_period = useconds / 1000;
 
- CHECK_NOISY (snd_pcm_hw_params, alsa_handle, params);
+ CHECK_STR (error, snd_pcm_hw_params, alsa_handle, params);
 
 soft_buffer = aud::max (total_buffer / 2, total_buffer - hard_buffer);
- AUDDBG ("Buffer: hardware %d ms, software %d ms, period %d ms.\n",
+ AUDINFO ("Buffer: hardware %d ms, software %d ms, period %d ms.\n",
 hard_buffer, soft_buffer, alsa_period);
 
 buffer_frames = aud::rescale<int64_t> (soft_buffer, 1000, rate);
@@ -408,7 +417,11 @@
 length = aud::min (length, alsa_buffer.space ());
 alsa_buffer.copy_in ((const char *) data, length);
 
- if (! alsa_paused)
+ AUDDBG ("Buffer fill levels: low = %d%%, high = %d%%.\n",
+ (alsa_buffer.len () - length) * 100 / alsa_buffer.size (),
+ alsa_buffer.len () * 100 / alsa_buffer.size ());
+
+ if (! alsa_prebuffer && ! alsa_paused)
 pthread_cond_broadcast (& alsa_cond);
 
 pthread_mutex_unlock (& alsa_mutex);
@@ -448,16 +461,29 @@
 while (snd_pcm_bytes_to_frames (alsa_handle, alsa_buffer.len ()))
 pthread_cond_wait (& alsa_cond, & alsa_mutex);
 
- pump_stop ();
+ if (! alsa_prebuffer)
+ {
+ timespec ts {};
+ clock_gettime (CLOCK_REALTIME, & ts);
 
- int d = get_delay_locked ();
- timespec delay = {d / 1000, d % 1000 * 1000000};
+ int d = get_delay_locked ();
+ ts.tv_sec += d / 1000;
+ ts.tv_nsec += d % 1000 * 1000000;
 
- pthread_mutex_unlock (& alsa_mutex);
- nanosleep (& delay, nullptr);
- pthread_mutex_lock (& alsa_mutex);
+ if (ts.tv_nsec >= 1000000000)
+ {
+ ts.tv_sec ++;
+ ts.tv_nsec -= 1000000000;
+ }
 
- pump_start ();
+ /* Avoid calling snd_pcm_delay() after this point, otherwise it
+ * prints a warning that underrun has occurred */
+ alsa_prebuffer = true;
+ alsa_paused_delay = 0;
+
+ poll_wake (); /* wake pump so it's ready */
+ pthread_cond_timedwait (& alsa_cond, & alsa_mutex, & ts);
+ }
 
 pthread_mutex_unlock (& alsa_mutex);
 }
@@ -483,7 +509,6 @@
 AUDDBG ("Seek requested; discarding buffer.\n");
 pthread_mutex_lock (& alsa_mutex);
 
- pump_stop ();
 CHECK (snd_pcm_drop, alsa_handle);
 
 FAILED:
@@ -492,10 +517,8 @@
 alsa_prebuffer = true;
 alsa_paused_delay = 0;
 
+ poll_wake (); /* wake pump so it's ready */
 pthread_cond_broadcast (& alsa_cond); /* interrupt period wait */
-
- pump_start ();
-
 pthread_mutex_unlock (& alsa_mutex);
 }
 
@@ -515,7 +538,7 @@
 }
 
 DONE:
- if (! pause)
+ if (! alsa_prebuffer && ! pause)
 pthread_cond_broadcast (& alsa_cond);
 
 pthread_mutex_unlock (& alsa_mutex);
@@ -543,10 +566,10 @@
 goto FAILED;
 
 AUDDBG ("Opening mixer card %s.\n", (const char *) mixer);
- CHECK_NOISY (snd_mixer_open, & alsa_mixer, 0);
- CHECK_NOISY (snd_mixer_attach, alsa_mixer, mixer);
- CHECK_NOISY (snd_mixer_selem_register, alsa_mixer, nullptr, nullptr);
- CHECK_NOISY (snd_mixer_load, alsa_mixer);
+ CHECK (snd_mixer_open, & alsa_mixer, 0);
+ CHECK (snd_mixer_attach, alsa_mixer, mixer);
+ CHECK (snd_mixer_selem_register, alsa_mixer, nullptr, nullptr);
+ CHECK (snd_mixer_load, alsa_mixer);
 
 snd_mixer_selem_id_t * selem_id;
 snd_mixer_selem_id_alloca (& selem_id);
@@ -555,7 +578,7 @@
 
 if (! alsa_mixer_element)
 {
- ERROR_NOISY ("snd_mixer_find_selem failed.\n");
+ AUDERR ("snd_mixer_find_selem failed.\n");
 goto FAILED;
 }

audacious-plugins-3.6.2-gtk3.tar.bz2/src/alsa/alsa.h -> audacious-plugins-4.4.1.tar.bz2/src/alsa/alsa.h Changed

@@ -22,21 +22,14 @@
 
 #include <libaudcore/audstrings.h>
 #include <libaudcore/i18n.h>
-#include <libaudcore/interface.h>
 #include <libaudcore/plugin.h>
 #include <libaudcore/runtime.h>
 
-#define ERROR AUDERR
-
-#define ERROR_NOISY(...) do { \
- aud_ui_show_error (str_printf ("ALSA error: " __VA_ARGS__)); \
-} while (0)
-
 #define CHECK_VAL(value, function, ...) \
 do { \
 (value) = function (__VA_ARGS__); \
 if ((value) < 0) { \
- ERROR ("%s failed: %s.\n", #function, snd_strerror (value)); \
+ AUDERR ("%s failed: %s.\n", #function, snd_strerror (value)); \
 goto FAILED; \
 } \
 } while (0)
@@ -47,11 +40,12 @@
 CHECK_VAL (CHECK_error, function, __VA_ARGS__); \
 } while (0)
 
-#define CHECK_NOISY(function, ...) \
+#define CHECK_STR(str, function, ...) \
 do { \
- int CHECK_NOISY_error = function (__VA_ARGS__); \
- if (CHECK_NOISY_error < 0) { \
- ERROR_NOISY ("%s failed: %s.\n", #function, snd_strerror (CHECK_NOISY_error)); \
+ int CHECK_STR_error = function (__VA_ARGS__); \
+ if (CHECK_STR_error < 0) { \
+ str = String (str_printf ("ALSA error: %s failed: %s.\n", #function, \
+ snd_strerror (CHECK_STR_error))); \
 goto FAILED; \
 } \
 } while (0)
@@ -81,7 +75,7 @@
 StereoVolume get_volume ();
 void set_volume (StereoVolume v);
 
- bool open_audio (int aud_format, int rate, int chans);
+ bool open_audio (int aud_format, int rate, int chans, String & error);
 void close_audio ();
 
 void period_wait ();

audacious-plugins-3.6.2-gtk3.tar.bz2/src/alsa/config.cc -> audacious-plugins-4.4.1.tar.bz2/src/alsa/config.cc Changed

audacious-plugins-4.4.1.tar.bz2/src/alsa/meson.build Added

audacious-plugins-4.4.1.tar.bz2/src/amidiplug Added

audacious-plugins-4.4.1.tar.bz2/src/amidiplug/Makefile Added

audacious-plugins-4.4.1.tar.bz2/src/amidiplug/amidi-plug.cc Added

@@ -0,0 +1,458 @@
+/*
+*
+* Author: Giacomo Lozito <james@develia.org>, (C) 2005-2007
+*
+* 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 <stdlib.h>
+#include <string.h>
+
+#include <libaudcore/runtime.h>
+#include <libaudcore/i18n.h>
+#include <libaudcore/plugin.h>
+
+#include "i_backend.h"
+#include "i_configure.h"
+#include "i_fileinfo.h"
+#include "i_midi.h"
+
+class AMIDIPlug : public InputPlugin
+{
+public:
+ static const char about;
+ static const char * const exts;
+ static const char * const mimes;
+
+ static constexpr PluginInfo info = {
+ N_("AMIDI-Plug (MIDI Player)"),
+ PACKAGE,
+ about,
+ & amidiplug_prefs
+ };
+
+ constexpr AMIDIPlug () : InputPlugin (info, InputInfo ()
+ .with_exts (exts)
+ .with_mimes (mimes)) {}
+
+ bool init ();
+ void cleanup ();
+
+ bool is_our_file (const char * filename, VFSFile & file);
+ bool read_tag (const char * filename, VFSFile & file, Tuple & tuple, Index<char> * image);
+ bool play (const char * filename, VFSFile & file);
+
+#ifdef USE_GTK
+ bool file_info_box (const char * filename, VFSFile & file)
+ { return i_fileinfo_gui (filename, file); }
+#endif
+
+protected:
+ bool m_backend_initialized = false;
+
+ static bool audio_init ();
+ static void audio_generate (double seconds);
+ static void audio_cleanup ();
+
+ static void generate_ticks (midifile_t & midifile, int num_ticks);
+ static void play_loop (midifile_t & midifile);
+ static int skip_to (midifile_t & midifile, int seektime);
+};
+
+EXPORT AMIDIPlug aud_plugin_instance;
+
+const char * const AMIDIPlug::exts = {"mid", "midi", "rmi", "rmid", nullptr};
+const char * const AMIDIPlug::mimes = {"audio/midi", nullptr};
+
+void AMIDIPlug::cleanup ()
+{
+ if (m_backend_initialized)
+ {
+ backend_cleanup ();
+ m_backend_initialized = false;
+ }
+}
+
+bool AMIDIPlug::init ()
+{
+ static const char * const defaults =
+ {
+ "ap_opts_transpose_value", "0",
+ "ap_opts_drumshift_value", "0",
+ "fsyn_synth_samplerate", "44100",
+ "fsyn_synth_gain", "-1",
+ "fsyn_synth_polyphony", "-1",
+ "fsyn_synth_reverb", "-1",
+ "fsyn_synth_chorus", "-1",
+ "skip_leading", "FALSE",
+ "skip_trailing", "FALSE",
+ nullptr
+ };
+
+ aud_config_set_defaults ("amidiplug", defaults);
+
+ return true;
+}
+
+bool AMIDIPlug::is_our_file (const char * filename, VFSFile & file)
+{
+ char magic_bytes4;
+
+ if (file.fread (magic_bytes, 1, 4) != 4)
+ return false;
+
+ if (!strncmp (magic_bytes, "MThd", 4))
+ {
+ AUDDBG ("MIDI found, %s is a standard midi file\n", filename);
+ return true;
+ }
+
+ if (!strncmp (magic_bytes, "RIFF", 4))
+ {
+ /* skip the four bytes after RIFF,
+ then read the next four */
+ if (file.fseek (4, VFS_SEEK_CUR) != 0)
+ return false;
+
+ if (file.fread (magic_bytes, 1, 4) != 4)
+ return false;
+
+ if (!strncmp (magic_bytes, "RMID", 4))
+ {
+ AUDDBG ("MIDI found, %s is a riff midi file\n", filename);
+ return true;
+ }
+ }
+
+ return false;
+}
+
+bool AMIDIPlug::read_tag (const char * filename, VFSFile & file, Tuple & tuple,
+ Index<char> * image)
+{
+ midifile_t mf;
+ if (! mf.parse_from_file (filename, file))
+ return false;
+
+ int channels;
+ int bitdepth;
+ int samplerate;
+
+ backend_audio_info (& channels, & bitdepth, & samplerate);
+
+ tuple.set_str (Tuple::Codec, "MIDI");
+ tuple.set_int (Tuple::Length, mf.length / 1000);
+ tuple.set_int (Tuple::Channels, channels);
+
+ return true;
+}
+
+
+static int s_samplerate, s_channels;
+static int s_bufsize;
+static int16_t * s_buf;
+
+bool AMIDIPlug::audio_init ()
+{
+ int bitdepth;
+
+ backend_audio_info (& s_channels, & bitdepth, & s_samplerate);
+
+ if (bitdepth != 16)
+ return false;
+
+ open_audio (FMT_S16_NE, s_samplerate, s_channels);
+
+ s_bufsize = 2 * s_channels * (s_samplerate / 4);
+ s_buf = new int16_ts_bufsize / 2;
+
+ return true;
+}
+
+void AMIDIPlug::audio_generate (double seconds)
+{
+ int total = 2 * s_channels * (int) round (seconds * s_samplerate);
+
+ while (total)
+ {
+ int chunk = (total < s_bufsize) ? total : s_bufsize;
+
+ backend_generate_audio (s_buf, chunk);
+ write_audio (s_buf, chunk);
+
+ total -= chunk;
+ }
+}
+
+void AMIDIPlug::audio_cleanup ()
+{
+ delete s_buf;
+}
+
+bool AMIDIPlug::play (const char * filename, VFSFile & file)
+{
+ if (__sync_bool_compare_and_swap (& backend_settings_changed, true, false)
+ && m_backend_initialized)
+ {
+ AUDDBG ("Settings changed, reinitializing backend\n");
+ backend_cleanup ();
+ m_backend_initialized = false;
+ }
+
+ if (! m_backend_initialized)
+ {
+ backend_init ();
+ m_backend_initialized = true;
+ }
+
+ if (! audio_init ())
+ return false;
+
+ AUDDBG ("PLAY requested, midifile init\n");
+ /* midifile init */
+ midifile_t midifile;
+
+ if (! midifile.parse_from_file (filename, file))
+ {
+ audio_cleanup ();
+ return false;
+ }
+
+ AUDDBG ("PLAY requested, starting play thread\n");
+ play_loop (midifile);
+
+ audio_cleanup ();
+ return true;
+}
+
+void AMIDIPlug::generate_ticks (midifile_t & midifile, int num_ticks)
+{
+ double ticksecs = (double) midifile.current_tempo / midifile.ppq / 1000000;
+ audio_generate (ticksecs * num_ticks);
+}
+
+void AMIDIPlug::play_loop (midifile_t & midifile)
+{
+ int tick = midifile.start_tick;
+ bool stopped = false;
+
+ /* initialize current position in each track */
+ for (midifile_track_t & track : midifile.tracks)
+ track.current_event = track.events.head ();
+
+ while (! (stopped = check_stop ()))
+ {
+ int seektime = check_seek ();
+ if (seektime >= 0)
+ tick = skip_to (midifile, seektime);
+
+ midievent_t * event = nullptr;
+ midifile_track_t * event_track = nullptr;
+ int min_tick = midifile.max_tick + 1;
+
+ /* search next event */
+ for (midifile_track_t & track : midifile.tracks)
+ {
+ 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_track->events.next (event);
+
+ if (event->tick > tick)
+ {
+ generate_ticks (midifile, event->tick - tick);
+ tick = event->tick;
+ }
+
+ switch (event->type)
+ {
+ case SND_SEQ_EVENT_NOTEON:
+ seq_event_noteon (event);
+ break;
+
+ case SND_SEQ_EVENT_NOTEOFF:
+ seq_event_noteoff (event);
+ break;
+
+ case SND_SEQ_EVENT_KEYPRESS:
+ seq_event_keypress (event);
+ break;
+
+ case SND_SEQ_EVENT_CONTROLLER:
+ seq_event_controller (event);
+ break;
+
+ case SND_SEQ_EVENT_PGMCHANGE:
+ seq_event_pgmchange (event);
+ break;
+
+ case SND_SEQ_EVENT_CHANPRESS:
+ seq_event_chanpress (event);
+ break;
+
+ case SND_SEQ_EVENT_PITCHBEND:
+ seq_event_pitchbend (event);
+ break;
+
+ case SND_SEQ_EVENT_SYSEX:
+ seq_event_sysex (event);
+ break;
+
+ case SND_SEQ_EVENT_TEMPO:
+ seq_event_tempo (event);
+ AUDDBG ("PLAY thread, processing tempo event with value %i on tick %i\n",
+ event->tempo, event->tick);
+ midifile.current_tempo = event->tempo;
+ break;
+
+ case SND_SEQ_EVENT_META_TEXT:
+ /* do nothing */
+ break;
+
+ case SND_SEQ_EVENT_META_LYRIC:
+ /* do nothing */
+ break;
+
+ default:
+ AUDDBG ("PLAY thread, encountered invalid event type %i\n", event->type);
+ break;
+ }
+ }
+
+ if (! stopped)
+ generate_ticks (midifile, midifile.max_tick - tick);
+
+ backend_reset ();
+}
+
+
+/* amidigplug_skipto: re-do all events that influence the playing of our
+ 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 */
+int AMIDIPlug::skip_to (midifile_t & midifile, int seektime)
+{
+ backend_reset ();
+
+ int tick = midifile.start_tick;
+ if (midifile.avg_microsec_per_tick > 0)
+ tick += (int64_t) seektime * 1000 / midifile.avg_microsec_per_tick;
+
+ /* initialize current position in each track */
+ for (midifile_track_t & track : midifile.tracks)
+ track.current_event = track.events.head ();
+
+ for (;;)
+ {
+ midievent_t * event = nullptr;
+ midifile_track_t * event_track = nullptr;
+ int min_tick = midifile.max_tick + 1;
+
+ /* search next event */
+ for (midifile_track_t & track : midifile.tracks)
+ {
+ midievent_t * e2 = track.current_event;
+
+ if ((e2) && (e2->tick < min_tick))
+ {
+ min_tick = e2->tick;
+ event = e2;
+ event_track = & track;
+ }
+ }
+
+ /* unlikely here... unless very strange MIDI files are played :) */
+ if (!event)
+ {
+ AUDDBG ("SKIPTO request, reached the last event but not the requested tick (!)\n");
+ break; /* end of song reached */
+ }
+
+ /* reached the requested tick, job done */
+ if (event->tick >= tick)
+ {
+ AUDDBG ("SKIPTO request, reached the requested tick, exiting from skipto loop\n");
+ break;
+ }
+
+ /* advance pointer to next event */
+ event_track->current_event = event_track->events.next (event);
+
+ 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:
+ seq_event_controller (event);
+ break;
+
+ case SND_SEQ_EVENT_PGMCHANGE:
+ seq_event_pgmchange (event);
+ break;
+
+ case SND_SEQ_EVENT_CHANPRESS:
+ seq_event_chanpress (event);
+ break;
+
+ case SND_SEQ_EVENT_PITCHBEND:
+ seq_event_pitchbend (event);
+ break;
+
+ case SND_SEQ_EVENT_SYSEX:
+ seq_event_sysex (event);
+ break;
+
+ case SND_SEQ_EVENT_TEMPO:
+ seq_event_tempo (event);
+ midifile.current_tempo = event->tempo;
+ break;
+ }
+ }
+
+ return tick;
+}
+
+const char AMIDIPlug::about =
+ N_("AMIDI-Plug\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");

audacious-plugins-4.4.1.tar.bz2/src/amidiplug/amidi-plug.midiicon.xpm Changed

audacious-plugins-4.4.1.tar.bz2/src/amidiplug/backend-fluidsynth Added

audacious-plugins-4.4.1.tar.bz2/src/amidiplug/backend-fluidsynth/b-fluidsynth.cc Added

@@ -0,0 +1,229 @@
+/*
+*
+* 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 <stdlib.h>
+#include <string.h>
+
+#include <fluidsynth.h>
+
+#include <libaudcore/audstrings.h>
+#include <libaudcore/i18n.h>
+#include <libaudcore/index.h>
+#include <libaudcore/runtime.h>
+
+#include "../i_backend.h"
+#include "../i_configure.h"
+#include "../i_midievent.h"
+
+typedef struct
+{
+ fluid_settings_t * settings;
+ fluid_synth_t * synth;
+
+ Index<int> soundfont_ids;
+}
+sequencer_client_t;
+
+/* sequencer instance */
+static sequencer_client_t sc;
+/* options */
+
+static void i_soundfont_load ();
+
+void backend_init ()
+{
+ sc.settings = new_fluid_settings();
+
+ fluid_settings_setnum (sc.settings, "synth.sample-rate",
+ aud_get_int ("amidiplug", "fsyn_synth_samplerate"));
+
+ int gain = aud_get_int ("amidiplug", "fsyn_synth_gain");
+ int polyphony = aud_get_int ("amidiplug", "fsyn_synth_polyphony");
+ int reverb = aud_get_int ("amidiplug", "fsyn_synth_reverb");
+ int chorus = aud_get_int ("amidiplug", "fsyn_synth_chorus");
+
+ if (gain != -1)
+ fluid_settings_setnum (sc.settings, "synth.gain", gain / 10.0);
+
+ if (polyphony != -1)
+ fluid_settings_setint (sc.settings, "synth.polyphony", polyphony);
+
+ if (reverb != -1)
+ fluid_settings_setint (sc.settings, "synth.reverb.active", reverb);
+
+ if (chorus != -1)
+ fluid_settings_setint (sc.settings, "synth.chorus.active", chorus);
+
+ sc.synth = new_fluid_synth (sc.settings);
+
+ /* load soundfonts */
+ i_soundfont_load();
+}
+
+
+void backend_cleanup ()
+{
+ /* unload soundfonts */
+ for (int id : sc.soundfont_ids)
+ fluid_synth_sfunload (sc.synth, id, 0);
+
+ sc.soundfont_ids.clear ();
+ delete_fluid_synth (sc.synth);
+ delete_fluid_settings (sc.settings);
+}
+
+
+void backend_reset ()
+{
+ fluid_synth_system_reset (sc.synth); /* all notes off and channels reset */
+}
+
+
+void seq_event_noteon (midievent_t * event)
+{
+ fluid_synth_noteon (sc.synth,
+ event->d0,
+ event->d1,
+ event->d2);
+}
+
+
+void seq_event_noteoff (midievent_t * event)
+{
+ fluid_synth_noteoff (sc.synth,
+ event->d0,
+ event->d1);
+}
+
+
+void seq_event_keypress (midievent_t * event)
+{
+ /* KEY PRESSURE events are not handled by FluidSynth sequencer? */
+ AUDDBG ("KEYPRESS EVENT with FluidSynth backend (unhandled)\n");
+}
+
+
+void seq_event_controller (midievent_t * event)
+{
+ fluid_synth_cc (sc.synth,
+ event->d0,
+ event->d1,
+ event->d2);
+}
+
+
+void seq_event_pgmchange (midievent_t * event)
+{
+ fluid_synth_program_change (sc.synth,
+ event->d0,
+ event->d1);
+}
+
+
+void seq_event_chanpress (midievent_t * event)
+{
+ /* CHANNEL PRESSURE events are not handled by FluidSynth sequencer? */
+ AUDDBG ("CHANPRESS EVENT with FluidSynth backend (unhandled)\n");
+}
+
+
+void seq_event_pitchbend (midievent_t * event)
+{
+ int pb_value = (( (event->d2) & 0x7f) << 7) | ((event->d1) & 0x7f);
+ fluid_synth_pitch_bend (sc.synth,
+ event->d0,
+ pb_value);
+}
+
+
+void seq_event_sysex (midievent_t * event)
+{
+ AUDDBG ("SYSEX EVENT with FluidSynth backend (unhandled)\n");
+}
+
+
+void seq_event_tempo (midievent_t * event)
+{
+ /* unhandled */
+}
+
+
+void seq_event_other (midievent_t * event)
+{
+ /* unhandled */
+}
+
+
+void seq_event_allnoteoff (int unused)
+{
+ int c = 0;
+
+ for (c = 0 ; c < 16 ; c++)
+ {
+ fluid_synth_cc (sc.synth, c, 123 /* all notes off */, 0);
+ }
+}
+
+
+void backend_generate_audio (void * buf, int bufsize)
+{
+ fluid_synth_write_s16 (sc.synth, bufsize / 4, buf, 0, 2, buf, 1, 2);
+}
+
+
+void backend_audio_info (int * channels, int * bitdepth, int * samplerate)
+{
+ *channels = 2;
+ *bitdepth = 16; /* always 16 bit, we use fluid_synth_write_s16() */
+ *samplerate = aud_get_int ("amidiplug", "fsyn_synth_samplerate");
+}
+
+
+/* ******************************************************************
+ *** INTERNALS ****************************************************
+ ****************************************************************** */
+
+static void i_soundfont_load ()
+{
+ String soundfont_file = aud_get_str ("amidiplug", "fsyn_soundfont_file");
+
+ if (soundfont_file0)
+ {
+ Index<String> sffiles = str_list_to_index (soundfont_file, ";");
+
+ for (const char * sffile : sffiles)
+ {
+ AUDDBG ("loading soundfont %s\n", sffile);
+ int sf_id = fluid_synth_sfload (sc.synth, sffile, 0);
+
+ if (sf_id == -1)
+ AUDWARN ("unable to load SoundFont file %s\n", sffile);
+ else
+ {
+ AUDDBG ("soundfont %s successfully loaded\n", sffile);
+ sc.soundfont_ids.append (sf_id);
+ }
+ }
+
+ fluid_synth_system_reset (sc.synth);
+ }
+ else
+ AUDWARN ("FluidSynth backend was selected, but no SoundFont has been specified\n");
+}

audacious-plugins-4.4.1.tar.bz2/src/amidiplug/i_backend.h Added

@@ -0,0 +1,45 @@
+/*
+*
+* 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_BACKEND_H
+#define _I_BACKEND_H 1
+
+struct midievent_t;
+
+void backend_init ();
+void backend_cleanup ();
+void backend_reset ();
+
+void backend_audio_info (int *, int *, int *);
+void backend_generate_audio (void * buf, int bufsize);
+
+void seq_event_noteon (midievent_t *);
+void seq_event_noteoff (midievent_t *);
+void seq_event_allnoteoff (int);
+void seq_event_keypress (midievent_t *);
+void seq_event_controller (midievent_t *);
+void seq_event_pgmchange (midievent_t *);
+void seq_event_chanpress (midievent_t *);
+void seq_event_pitchbend (midievent_t *);
+void seq_event_sysex (midievent_t *);
+void seq_event_tempo (midievent_t *);
+void seq_event_other (midievent_t *);
+
+#endif /* !_I_BACKEND_H */

audacious-plugins-4.4.1.tar.bz2/src/amidiplug/i_configure-fluidsynth.cc Added

@@ -0,0 +1,555 @@
+/*
+*
+* 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_configure-fluidsynth.h"
+
+#include <stdlib.h>
+#include <string.h>
+#include <sys/stat.h>
+
+#include <libaudcore/audstrings.h>
+#include <libaudcore/i18n.h>
+#include <libaudcore/runtime.h>
+#include <libaudcore/index.h>
+
+#include <glib/gstdio.h>
+
+#include "i_configure.h"
+
+#ifdef USE_GTK
+
+#include <libaudgui/gtk-compat.h>
+#include <gtk/gtk.h>
+
+enum
+{
+ LISTSFONT_FILENAME_COLUMN = 0,
+ LISTSFONT_FILESIZE_COLUMN,
+ LISTSFONT_N_COLUMNS
+};
+
+static void i_configure_ev_sflist_commit (void * sfont_lv);
+
+void i_configure_ev_sflist_add (void * sfont_lv)
+{
+ GtkWidget * parent_window = gtk_widget_get_toplevel ((GtkWidget *) 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,
+ _("_Cancel"), GTK_RESPONSE_CANCEL,
+ _("_Open"), GTK_RESPONSE_ACCEPT, nullptr);
+
+ if (gtk_tree_selection_get_selected (listsel, nullptr, &itersel))
+ {
+ char * selfilename = nullptr, *selfiledir = nullptr;
+ 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)
+ {
+ GStatBuf 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 (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);
+
+ g_free (filename);
+ }
+
+ gtk_widget_destroy (browse_dialog);
+ }
+
+ i_configure_ev_sflist_commit (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);
+
+ i_configure_ev_sflist_commit (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))
+ {
+ 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);
+ }
+ }
+
+ i_configure_ev_sflist_commit (sfont_lv);
+}
+
+
+void i_configure_ev_sflist_commit (void * sfont_lv)
+{
+ 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
+ {
+ 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);
+ g_free (fname);
+ iter_is_valid = gtk_tree_model_iter_next (GTK_TREE_MODEL (store), &iter);
+ }
+ while (iter_is_valid == true);
+ }
+
+ if (sflist_string->len > 0)
+ g_string_truncate (sflist_string, sflist_string->len - 1);
+
+ aud_set_str ("amidiplug", "fsyn_soundfont_file", sflist_string->str);
+
+ g_string_free (sflist_string, true);
+
+ /* reset backend at beginning of next song to apply changes */
+ __sync_bool_compare_and_swap (& backend_settings_changed, false, true);
+}
+
+
+void * create_soundfont_list ()
+{
+ 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;
+
+ /* soundfont settings - soundfont files - listview */
+ soundfont_file_store = gtk_list_store_new (LISTSFONT_N_COLUMNS, G_TYPE_STRING, G_TYPE_INT);
+
+ String soundfont_file = aud_get_str ("amidiplug", "fsyn_soundfont_file");
+
+ if (soundfont_file0)
+ {
+ /* fill soundfont list with fsyn_soundfont_file information */
+ char ** sffiles = g_strsplit (soundfont_file, ";", 0);
+ GtkTreeIter iter;
+ int i = 0;
+
+ while (sffilesi != nullptr)
+ {
+ int filesize = -1;
+ GStatBuf finfo;
+
+ if (g_stat (sffilesi, &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, sffilesi,
+ LISTSFONT_FILESIZE_COLUMN, filesize, -1);
+ i++;
+ }
+
+ g_strfreev (sffiles);
+ }
+
+ soundfont_file_hbox = audgui_hbox_new (2);
+ soundfont_file_lv = gtk_tree_view_new_with_model (GTK_TREE_MODEL (soundfont_file_store));
+#ifndef USE_GTK3
+ gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (soundfont_file_lv), true);
+#endif
+ 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 (
+ _("File name"), soundfont_file_lv_text_rndr, "text",
+ LISTSFONT_FILENAME_COLUMN, nullptr);
+ 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, nullptr);
+ 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 (nullptr, nullptr);
+ 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 = audgui_vbox_new (0);
+ soundfont_file_bbox_addbt = gtk_button_new();
+ gtk_button_set_image (GTK_BUTTON (soundfont_file_bbox_addbt),
+ gtk_image_new_from_icon_name ("list-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_icon_name ("list-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_icon_name ("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_icon_name ("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);
+
+ return soundfont_file_hbox;
+}
+
+#endif // USE_GTK
+
+#ifdef USE_QT
+
+#include <QHBoxLayout>
+#include <QHeaderView>
+#include <QVBoxLayout>
+#include <QAbstractListModel>
+#include <QTreeView>
+#include <QPushButton>
+
+#include <libaudqt/libaudqt.h>
+
+/* soundfont settings - soundfont files - listview */
+class SoundFontListModel : public QAbstractListModel
+{
+public:
+ enum {
+ FileName = 0,
+ FileSize,
+ NColumns
+ };
+
+ void update ();
+ void commit ();
+ void delete_selected (QModelIndexList);
+ void shift_selected (QModelIndexList, int);
+ void append (const char *);
+
+ SoundFontListModel (QObject * parent = nullptr) : QAbstractListModel (parent) { update (); }
+ ~SoundFontListModel ();
+
+protected:
+ int rowCount (const QModelIndex & parent) const
+ {
+ return parent.isValid() ? 0 : m_file_names.len();
+ }
+
+ int columnCount (const QModelIndex &) const { return NColumns; }
+ QVariant data (const QModelIndex & index, int role) const;
+ QVariant headerData (int section, Qt::Orientation, int role) const;
+
+ Qt::ItemFlags flags (const QModelIndex & index) const
+ {
+ if (index.isValid ())
+ return Qt::ItemIsSelectable | Qt::ItemIsDragEnabled | Qt::ItemIsEnabled;
+ else
+ return Qt::ItemIsSelectable | Qt::ItemIsEnabled;
+ }
+
+private:
+ Index <String> m_file_names;
+ Index <int> m_file_sizes;
+};
+
+SoundFontListModel::~SoundFontListModel ()
+{
+ m_file_names.clear ();
+ m_file_sizes.clear ();
+}
+
+void SoundFontListModel::append (const char * filename)
+{
+ QAbstractItemModel::beginResetModel ();
+
+ int filesize = -1;
+ GStatBuf finfo;
+
+ if (g_stat (filename, &finfo) == 0)
+ filesize = finfo.st_size;
+
+ m_file_names.append (String (filename));
+ m_file_sizes.append (filesize);
+
+ commit ();
+ QAbstractItemModel::endResetModel ();
+}
+
+void SoundFontListModel::update ()
+{
+ String soundfont_file = aud_get_str ("amidiplug", "fsyn_soundfont_file");
+ Index<String> sffiles = str_list_to_index (soundfont_file, ";");
+
+ for (const char * sffile : sffiles)
+ append (sffile);
+}
+
+void SoundFontListModel::commit ()
+{
+ aud_set_str ("amidiplug", "fsyn_soundfont_file",
+ index_to_str_list (m_file_names, ";"));
+
+ /* reset backend at beginning of next song to apply changes */
+ __sync_bool_compare_and_swap (& backend_settings_changed, false, true);
+}
+
+void SoundFontListModel::delete_selected (QModelIndexList selections)
+{
+ if (selections.empty ())
+ return;
+
+ QAbstractItemModel::beginResetModel ();
+
+ auto index = selections.first ();
+
+ m_file_names.remove (index.row (), 1);
+ m_file_sizes.remove (index.row (), 1);
+
+ commit ();
+ QAbstractItemModel::endResetModel ();
+}
+
+void SoundFontListModel::shift_selected (QModelIndexList selections, int direction)
+{
+ if (selections.empty ())
+ return;
+
+ QAbstractItemModel::beginResetModel ();
+
+ auto index = selections.first ();
+
+ int from_row = index.row ();
+ int to_row = index.row () + direction;
+
+ if (to_row < 0)
+ return;
+
+ String filename2 = { m_file_namesfrom_row, m_file_namesto_row };
+ int filesize2 = { m_file_sizesfrom_row, m_file_sizesto_row };
+
+ m_file_namesfrom_row = filename1;
+ m_file_namesto_row = filename0;
+
+ m_file_sizesfrom_row = filesize1;
+ m_file_sizesto_row = filesize0;
+
+ commit ();
+ QAbstractItemModel::endResetModel ();
+}
+
+QVariant SoundFontListModel::data (const QModelIndex & index, int role) const
+{
+ int col = index.column ();
+ if (col < 0 || col >= NColumns)
+ return QVariant ();
+
+ switch (role)
+ {
+ case Qt::DisplayRole:
+ switch (col)
+ {
+ case FileName:
+ return QString ((const char *) m_file_namesindex.row ());
+
+ case FileSize:
+ return QString (int_to_str (m_file_sizesindex.row ()));
+
+ default:
+ return QVariant ();
+ }
+
+ break;
+ default:
+ break;
+ }
+
+ return QVariant ();
+}
+
+QVariant SoundFontListModel::headerData (int section, Qt::Orientation, int role) const
+{
+ if (role != Qt::DisplayRole)
+ return QVariant ();
+
+ switch (section) {
+ case FileName:
+ return QString (_("File name"));
+
+ case FileSize:
+ return QString (_("Size (bytes)"));
+
+ default:
+ return QVariant ();
+ }
+}
+
+class SoundFontWidget : public QWidget
+{
+public:
+ SoundFontWidget (QWidget * parent = nullptr);
+
+private:
+ QVBoxLayout * m_vbox_layout;
+ QTreeView * m_view;
+ SoundFontListModel * m_model;
+ QWidget * m_bbox;
+ QHBoxLayout * m_bbox_layout;
+ QPushButton * m_button_sf_add;
+ QPushButton * m_button_sf_del;
+ QPushButton * m_button_sf_up;
+ QPushButton * m_button_sf_down;
+};
+
+SoundFontWidget::SoundFontWidget (QWidget * parent) :
+ QWidget (parent),
+ m_vbox_layout (audqt::make_vbox (this)),
+ m_view (new QTreeView (this)),
+ m_model (new SoundFontListModel (m_view)),
+ m_bbox (new QWidget (this)),
+ m_bbox_layout (audqt::make_hbox (m_bbox)),
+ m_button_sf_add (new QPushButton (m_bbox)),
+ m_button_sf_del (new QPushButton (m_bbox)),
+ m_button_sf_up (new QPushButton (m_bbox)),
+ m_button_sf_down (new QPushButton (m_bbox))
+{
+ m_button_sf_add->setIcon (QIcon::fromTheme ("list-add"));
+ m_button_sf_del->setIcon (QIcon::fromTheme ("list-remove"));
+ m_button_sf_up->setIcon (QIcon::fromTheme ("go-up"));
+ m_button_sf_down->setIcon (QIcon::fromTheme ("go-down"));
+
+ m_bbox_layout->addWidget (m_button_sf_add);
+ m_bbox_layout->addWidget (m_button_sf_del);
+ m_bbox_layout->addWidget (m_button_sf_up);
+ m_bbox_layout->addWidget (m_button_sf_down);
+
+ m_bbox->setLayout (m_bbox_layout);
+
+ m_view->setModel (m_model);
+ m_view->setRootIsDecorated (false);
+ m_view->setUniformRowHeights (true);
+
+ QHeaderView * header = m_view->header ();
+ header->setSectionResizeMode (0, QHeaderView::Stretch);
+ header->setSectionResizeMode (1, QHeaderView::Fixed);
+ header->setStretchLastSection (false);
+
+ m_vbox_layout->addWidget (m_view);
+ m_vbox_layout->addWidget (m_bbox);
+
+ setLayout (m_vbox_layout);
+
+ QObject::connect (m_button_sf_add, & QPushButton::clicked, this () {
+ auto dialog = new QFileDialog (this, _("AMIDI-Plug - select SoundFont file"));
+ dialog->setFileMode (QFileDialog::ExistingFiles);
+ audqt::window_bring_to_front (dialog);
+
+ QObject::connect (dialog, & QFileDialog::accepted, this, dialog () {
+ for (auto & fn : dialog->selectedFiles ())
+ m_model->append (fn.toUtf8 ());
+ });
+ });
+
+ QObject::connect (m_button_sf_del, & QPushButton::clicked, this () {
+ m_model->delete_selected (m_view->selectionModel ()->selectedIndexes ());
+ });
+
+ QObject::connect (m_button_sf_up, & QPushButton::clicked, this () {
+ m_model->shift_selected (m_view->selectionModel ()->selectedIndexes (), -1);
+ });
+
+ QObject::connect (m_button_sf_down, & QPushButton::clicked, this () {
+ m_model->shift_selected (m_view->selectionModel ()->selectedIndexes (), 1);
+ });
+}
+
+void * create_soundfont_list_qt ()
+{
+ return new SoundFontWidget;
+}
+
+#endif // USE_QT

audacious-plugins-4.4.1.tar.bz2/src/amidiplug/i_configure-fluidsynth.h Added

@@ -0,0 +1,27 @@
+/*
+*
+* 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_FLUIDSYNTH_H
+#define _I_CONFIGURE_FLUIDSYNTH_H 1
+
+void * create_soundfont_list ();
+void * create_soundfont_list_qt ();
+
+#endif /* !_I_CONFIGURE_FLUIDSYNTH_H */

audacious-plugins-4.4.1.tar.bz2/src/amidiplug/i_configure.cc Added

@@ -0,0 +1,161 @@
+/*
+*
+* 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_configure.h"
+
+#include <libaudcore/i18n.h>
+#include <libaudcore/runtime.h>
+#include <libaudcore/preferences.h>
+
+#include "i_configure-fluidsynth.h"
+
+bool backend_settings_changed = false; /* atomic */
+
+static bool override_gain = false;
+static double gain_setting = 0.2;
+static bool override_polyphony = false;
+static int polyphony_setting = 256;
+static bool override_reverb = false;
+static bool reverb_setting = true;
+static bool override_chorus = false;
+static bool chorus_setting = true;
+
+static void get_values ()
+{
+ int gain = aud_get_int ("amidiplug", "fsyn_synth_gain");
+ int polyphony = aud_get_int ("amidiplug", "fsyn_synth_polyphony");
+ int reverb = aud_get_int ("amidiplug", "fsyn_synth_reverb");
+ int chorus = aud_get_int ("amidiplug", "fsyn_synth_chorus");
+
+ if (gain != -1)
+ {
+ override_gain = true;
+ gain_setting = gain / 10.0;
+ }
+
+ if (polyphony != -1)
+ {
+ override_polyphony = true;
+ polyphony_setting = polyphony;
+ }
+
+ if (reverb != -1)
+ {
+ override_reverb = true;
+ reverb_setting = reverb;
+ }
+
+ if (chorus != -1)
+ {
+ override_chorus = true;
+ chorus_setting = chorus;
+ }
+}
+
+static void set_values ()
+{
+ int gain = override_gain ? (int) (gain_setting * 10 + 0.5) : -1;
+ int polyphony = override_polyphony ? polyphony_setting : -1;
+ int reverb = override_reverb ? reverb_setting : -1;
+ int chorus = override_chorus ? chorus_setting : -1;
+
+ aud_set_int ("amidiplug", "fsyn_synth_gain", gain);
+ aud_set_int ("amidiplug", "fsyn_synth_polyphony", polyphony);
+ aud_set_int ("amidiplug", "fsyn_synth_reverb", reverb);
+ aud_set_int ("amidiplug", "fsyn_synth_chorus", chorus);
+}
+
+static void backend_change ()
+{
+ set_values ();
+
+ /* reset backend at beginning of next song to apply changes */
+ __sync_bool_compare_and_swap (& backend_settings_changed, false, true);
+}
+
+static const PreferencesWidget gain_widgets = {
+ WidgetCheck (N_("Override default gain:"),
+ WidgetBool (override_gain, backend_change)),
+ WidgetSpin (0, WidgetFloat (gain_setting, backend_change),
+ {0, 10, 0.1},
+ WIDGET_CHILD)
+};
+
+static const PreferencesWidget polyphony_widgets = {
+ WidgetCheck (N_("Override default polyphony:"),
+ WidgetBool (override_polyphony, backend_change)),
+ WidgetSpin (0, WidgetInt (polyphony_setting, backend_change),
+ {16, 4096, 1},
+ WIDGET_CHILD)
+};
+
+static const PreferencesWidget reverb_widgets = {
+ WidgetCheck (N_("Override default reverb:"),
+ WidgetBool (override_reverb, backend_change)),
+ WidgetCheck (N_("On"),
+ WidgetBool (reverb_setting, backend_change),
+ WIDGET_CHILD)
+};
+
+static const PreferencesWidget chorus_widgets = {
+ WidgetCheck (N_("Override default chorus:"),
+ WidgetBool (override_chorus, backend_change)),
+ WidgetCheck (N_("On"),
+ WidgetBool (chorus_setting, backend_change),
+ WIDGET_CHILD)
+};
+
+static const PreferencesWidget amidiplug_widgets = {
+
+ /* global settings */
+ WidgetLabel (N_("Playback")),
+ WidgetSpin (N_("Transpose:"),
+ WidgetInt ("amidiplug", "ap_opts_transpose_value"),
+ {-20, 20, 1, N_("semitones")}),
+ WidgetSpin (N_("Drum shift:"),
+ WidgetInt ("amidiplug", "ap_opts_drumshift_value"),
+ {0, 127, 1, N_("note numbers")}),
+ WidgetCheck (N_("Skip leading silence"),
+ WidgetBool ("amidiplug", "skip_leading")),
+ WidgetCheck (N_("Skip trailing silence"),
+ WidgetBool ("amidiplug", "skip_trailing")),
+
+ /* backend settings */
+ WidgetLabel (N_("SoundFont")),
+#ifdef USE_GTK
+ WidgetCustomGTK (create_soundfont_list),
+#endif
+#ifdef USE_QT
+ WidgetCustomQt (create_soundfont_list_qt),
+#endif
+ WidgetLabel (N_("Synthesizer")),
+ WidgetBox ({{gain_widgets}, true}),
+ WidgetBox ({{polyphony_widgets}, true}),
+ WidgetBox ({{reverb_widgets}, true}),
+ WidgetBox ({{chorus_widgets}, true}),
+ WidgetSpin (N_("Sample rate:"),
+ WidgetInt ("amidiplug", "fsyn_synth_samplerate", backend_change),
+ {22050, 96000, 1, N_("Hz")})
+};
+
+const PluginPreferences amidiplug_prefs = {
+ {amidiplug_widgets},
+ get_values
+};

audacious-plugins-4.4.1.tar.bz2/src/amidiplug/i_configure.h Changed

audacious-plugins-4.4.1.tar.bz2/src/amidiplug/i_fileinfo.cc Added

@@ -0,0 +1,365 @@
+/*
+*
+* 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_fileinfo.h"
+
+#ifdef USE_GTK
+
+#include <limits.h>
+#include <stdlib.h>
+#include <string.h>
+#include <gtk/gtk.h>
+
+#include <libaudcore/i18n.h>
+#include <libaudcore/runtime.h>
+#include <libaudgui/gtk-compat.h>
+
+/* this is needed to retrieve information */
+#include "i_midi.h"
+/* icon from gnome-mime-audio-midi.png of the GNOME ICON SET */
+#include "amidi-plug.midiicon.xpm"
+
+
+void i_fileinfo_ev_close (GtkWidget * button, void * fileinfowin)
+{
+ gtk_widget_destroy (GTK_WIDGET (fileinfowin));
+}
+
+
+void i_fileinfo_grid_add_entry (const char * field_text, const 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);
+ value = gtk_label_new (value_text);
+
+#ifdef USE_GTK3
+ gtk_widget_set_halign (field, GTK_ALIGN_START);
+ gtk_label_set_justify (GTK_LABEL (field), GTK_JUSTIFY_LEFT);
+ gtk_grid_attach (GTK_GRID (grid), field, 0, line, 1, 1);
+
+ gtk_widget_set_halign (value, GTK_ALIGN_START);
+ gtk_label_set_justify (GTK_LABEL (value), GTK_JUSTIFY_LEFT);
+ gtk_grid_attach (GTK_GRID (grid), value, 1, line, 1, 1);
+#else
+ gtk_misc_set_alignment (GTK_MISC (field), 0, 0);
+ gtk_table_attach (GTK_TABLE (grid), field, 0, 1, line, line + 1, GTK_FILL, GTK_FILL, 0, 0);
+
+ gtk_misc_set_alignment (GTK_MISC (value), 0, 0);
+ gtk_table_attach (GTK_TABLE (grid), value, 1, 2, line, line + 1, GTK_FILL, GTK_FILL, 0, 0);
+#endif
+}
+
+
+/* COMMENT: this will also reset current position in each track! */
+void i_fileinfo_text_fill (midifile_t * mf, GtkTextBuffer * text_tb, GtkTextBuffer * lyrics_tb)
+{
+ /* initialize current position in each track */
+ for (midifile_track_t & track : mf->tracks)
+ track.current_event = track.events.head ();
+
+ for (;;)
+ {
+ midievent_t * event = nullptr;
+ midifile_track_t * event_track = nullptr;
+ int min_tick = INT_MAX; /* meta-events may go past max_tick */
+
+ /* search next event */
+ for (midifile_track_t & track : mf->tracks)
+ {
+ 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_track->events.next (event);
+
+ switch (event->type)
+ {
+ case SND_SEQ_EVENT_META_TEXT:
+ gtk_text_buffer_insert_at_cursor (text_tb, event->metat, -1);
+ break;
+
+ case SND_SEQ_EVENT_META_LYRIC:
+ gtk_text_buffer_insert_at_cursor (lyrics_tb, event->metat, -1);
+ break;
+ }
+ }
+}
+
+
+bool i_fileinfo_gui (const char * filename_uri, VFSFile & file)
+{
+ // TODO: Qt support
+ if (aud_get_mainloop_type () != MainloopType::GLib)
+ return false;
+
+ static GtkWidget * fileinfowin = nullptr;
+ 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;
+
+ if (fileinfowin)
+ return true;
+
+ midifile_t mf;
+
+ /****************** midifile parser ******************/
+ if (! mf.parse_from_file (filename_uri, file))
+ return false;
+
+ /* midifile is filled with information at this point,
+ bpm information is needed too */
+ mf.get_bpm (& bpm, & wavg_bpm);
+ /*****************************************************/
+
+ fileinfowin = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+ gtk_window_set_role (GTK_WINDOW (fileinfowin), "fileinfo");
+ gtk_window_set_default_size (GTK_WINDOW (fileinfowin), 500, 400);
+ gtk_window_set_type_hint (GTK_WINDOW (fileinfowin), GDK_WINDOW_TYPE_HINT_DIALOG);
+ g_signal_connect (G_OBJECT (fileinfowin), "destroy", G_CALLBACK (gtk_widget_destroyed), &fileinfowin);
+ gtk_container_set_border_width (GTK_CONTAINER (fileinfowin), 10);
+
+ fileinfowin_vbox = audgui_vbox_new (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 = audgui_hbox_new (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);
+#ifndef USE_GTK3
+ gtk_misc_set_alignment (GTK_MISC (title_icon_image), 0, 0);
+#endif
+ 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 = audgui_hbox_new (2);
+ gtk_box_pack_start (GTK_BOX (fileinfowin_vbox), fileinfowin_columns_hbox, true, true, 0);
+
+ /*********************
+ *** MIDI INFO BOX ***/
+ midiinfoboxes_vbox = audgui_vbox_new (2);
+ 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 (nullptr);
+ gtk_box_pack_start (GTK_BOX (midiinfoboxes_vbox), info_frame, true, true, 0);
+ info_grid = audgui_grid_new ();
+ audgui_grid_set_row_spacing (info_grid, 2);
+ audgui_grid_set_column_spacing (info_grid, 6);
+ gtk_container_set_border_width (GTK_CONTAINER (info_grid), 6);
+ 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.tracks.len ());
+ 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 = audgui_vbox_new (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 = audgui_paned_new (GTK_ORIENTATION_VERTICAL);
+ gtk_box_pack_start (GTK_BOX (miditextboxes_vbox), miditextboxes_paned, true, true, 0);
+
+ text_frame = gtk_frame_new (nullptr);
+ 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 (nullptr, nullptr);
+ gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (text_tv_sw),
+ GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
+ 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 (nullptr);
+ 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 (nullptr, nullptr);
+ gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (lyrics_tv_sw),
+ GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
+ 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));
+
+ i_fileinfo_text_fill (& mf, text_tb, lyrics_tb);
+
+ if (! gtk_text_buffer_get_char_count (text_tb))
+ {
+ GtkTextIter start, end;
+ GtkTextTag * tag = gtk_text_buffer_create_tag (text_tb, "italicstyle",
+ "style", PANGO_STYLE_ITALIC, nullptr);
+ /*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 (! gtk_text_buffer_get_char_count (lyrics_tb))
+ {
+ GtkTextIter start, end;
+ GtkTextTag * tag = gtk_text_buffer_create_tag (lyrics_tb, "italicstyle",
+ "style", PANGO_STYLE_ITALIC, nullptr);
+ /*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);
+ }
+
+ /**************
+ *** FOOTER ***/
+ footer_hbbox = audgui_button_box_new (GTK_ORIENTATION_HORIZONTAL);
+ gtk_button_box_set_layout (GTK_BUTTON_BOX (footer_hbbox), GTK_BUTTONBOX_END);
+ footer_bclose = gtk_button_new_with_mnemonic (_("_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, nullptr, nullptr);
+
+ if (!filename)
+ filename = g_strdup (filename_uri);
+
+ filename_utf8 = g_strdup (g_filename_to_utf8 (filename, -1, nullptr, nullptr, nullptr));
+
+ if (!filename_utf8)
+ {
+ /* 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)"), nullptr);
+ 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);
+
+ return true;
+}
+
+#endif // USE_GTK

audacious-plugins-4.4.1.tar.bz2/src/amidiplug/i_fileinfo.h Added

audacious-plugins-4.4.1.tar.bz2/src/amidiplug/i_midi.cc Added

@@ -0,0 +1,797 @@
+/*
+*
+* Author: Giacomo Lozito <james@develia.org>, (C) 2005-2006
+*
+* MIDI (SMF) parser based on aplaymidi.c from ALSA-utils
+* aplaymidi.c is Copyright (c) 2004 Clemens Ladisch <clemens@ladisch.de>
+*
+* 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_midi.h"
+
+#include <libaudcore/audstrings.h>
+#include <libaudcore/runtime.h>
+#include <libaudcore/vfs.h>
+
+#define MAKE_ID(c1, c2, c3, c4) ((c1) | ((c2) << 8) | ((c3) << 16) | ((c4) << 24))
+
+#define WARNANDBREAK(...) { AUDERR (__VA_ARGS__); break; }
+
+#define ERRMSG_MIDITRACK() { AUDERR ("%s: invalid MIDI data (offset %#x)", \
+ (const char *) file_name, file_offset); return false; }
+
+
+/* skip a certain number of bytes */
+void midifile_t::skip_bytes (int bytes)
+{
+ while (bytes > 0)
+ {
+ read_byte ();
+ --bytes;
+ }
+}
+
+
+/* reads a single byte */
+int midifile_t::read_byte ()
+{
+ if (file_offset >= file_data.len ())
+ {
+ file_eof = true;
+ return -1;
+ }
+
+ return (unsigned char) file_datafile_offset ++;
+}
+
+
+/* reads a little-endian 32-bit integer */
+int midifile_t::read_32_le ()
+{
+ int value;
+ value = (read_byte () & 0xFF);
+ value |= (read_byte () & 0xFF) << 8;
+ value |= (read_byte () & 0xFF) << 16;
+ value |= (read_byte () & 0xFF) << 24;
+ return !file_eof ? value : -1;
+}
+
+
+/* reads a 4-character identifier */
+int midifile_t::read_id ()
+{
+ return read_32_le ();
+}
+
+
+/* reads a fixed-size big-endian number */
+int midifile_t::read_int (int bytes)
+{
+ int c, value = 0;
+
+ do
+ {
+ c = read_byte ();
+
+ if (c < 0) return -1;
+
+ value = (value << 8) | c;
+ }
+ while (--bytes);
+
+ return value;
+}
+
+
+/* reads a variable-length number */
+int midifile_t::read_var ()
+{
+ int value, c;
+
+ c = read_byte ();
+ value = c & 0x7f;
+
+ if (c & 0x80)
+ {
+ c = read_byte ();
+ value = (value << 7) | (c & 0x7f);
+
+ if (c & 0x80)
+ {
+ c = read_byte ();
+ value = (value << 7) | (c & 0x7f);
+
+ if (c & 0x80)
+ {
+ c = read_byte ();
+ value = (value << 7) | c;
+
+ if (c & 0x80)
+ return -1;
+ }
+ }
+ }
+
+ return value;
+}
+
+
+/* reads one complete track from the file */
+bool midifile_t::read_track (midifile_track_t & track, int track_end, int port_count)
+{
+ int tick = 0;
+ unsigned char last_cmd = 0;
+ unsigned char port = 0;
+
+ track.start_tick = -1;
+ track.end_tick = -1;
+
+ /* the current file position is after the track ID and length */
+ while (file_offset < track_end)
+ {
+ unsigned char cmd;
+ midievent_t * event;
+ int delta_ticks, len, c;
+
+ delta_ticks = read_var ();
+
+ if (delta_ticks < 0)
+ break;
+
+ tick += delta_ticks;
+
+ c = read_byte ();
+
+ if (c < 0)
+ break;
+
+ if (c & 0x80)
+ {
+ /* have command */
+ cmd = c;
+
+ if (cmd < 0xf0)
+ last_cmd = cmd;
+ }
+ else
+ {
+ /* running status */
+ file_offset--;
+ cmd = last_cmd;
+
+ if (!cmd)
+ ERRMSG_MIDITRACK();
+ }
+
+ switch (cmd >> 4)
+ {
+ /* maps SMF events to ALSA sequencer events */
+ static unsigned char cmd_type16 =
+ {
+ 0, 0, 0, 0, 0, 0, 0, 0,
+ SND_SEQ_EVENT_NOTEOFF, // 08h
+ SND_SEQ_EVENT_NOTEON, // 09h
+ SND_SEQ_EVENT_KEYPRESS, // 0ah
+ SND_SEQ_EVENT_CONTROLLER, // 0bh
+ SND_SEQ_EVENT_PGMCHANGE, // 0ch
+ SND_SEQ_EVENT_CHANPRESS, // 0dh
+ SND_SEQ_EVENT_PITCHBEND // 0eh
+ };
+
+ case 0x8: /* channel msg with 2 parameter bytes */
+ case 0x9:
+ case 0xa:
+ {
+ event = track.add_event ();
+ event->type = cmd_typecmd >> 4;
+ event->port = port;
+ event->tick = tick;
+ event->d0 = cmd & 0x0f;
+
+ /* if this note is not in standard drum channel (10), apply transpose */
+ if (event->d0 != 9)
+ {
+ int transpose = aud_get_int ("amidiplug", "ap_opts_transpose_value");
+ int data_tr = (read_byte () & 0x7f) + transpose;
+
+ if (data_tr > 127) data_tr = 127;
+ else if (data_tr < 0) data_tr = 0;
+
+ event->d1 = (unsigned char) data_tr;
+ }
+ else /* this note is in standard drum channel (10), apply drum shift */
+ {
+ int drumshift = aud_get_int ("amidiplug", "ap_opts_drumshift_value");
+ int data_ds = (read_byte () & 0x7f) + drumshift; /* always > 0 */
+
+ if (data_ds > 127) data_ds -= 127;
+
+ event->d1 = (unsigned char) data_ds;
+ }
+
+ event->d2 = read_byte () & 0x7f;
+
+ if (event->type == SND_SEQ_EVENT_NOTEON && track.start_tick < 0)
+ track.start_tick = tick;
+ if (track.start_tick >= 0 && tick >= track.start_tick)
+ track.end_tick = tick;
+ }
+ break;
+
+ case 0xb: /* channel msg with 2 parameter bytes */
+ case 0xe:
+ {
+ event = track.add_event ();
+ event->type = cmd_typecmd >> 4;
+ event->port = port;
+ event->tick = tick;
+ event->d0 = cmd & 0x0f;
+ event->d1 = read_byte () & 0x7f;
+ event->d2 = read_byte () & 0x7f;
+
+ if (track.start_tick >= 0 && tick >= track.start_tick)
+ track.end_tick = tick;
+ }
+ break;
+
+ case 0xc: /* channel msg with 1 parameter byte */
+ case 0xd:
+ {
+ event = track.add_event ();
+ event->type = cmd_typecmd >> 4;
+ event->port = port;
+ event->tick = tick;
+ event->d0 = cmd & 0x0f;
+ event->d1 = read_byte () & 0x7f;
+
+ if (track.start_tick >= 0 && tick >= track.start_tick)
+ track.end_tick = tick;
+ }
+ break;
+
+ case 0xf:
+ {
+ switch (cmd)
+ {
+ case 0xf0: /* sysex */
+ case 0xf7: /* continued sysex, or escaped commands */
+ {
+ len = read_var ();
+
+ if (len < 0)
+ ERRMSG_MIDITRACK();
+
+ /* skip sysex */
+ skip_bytes (len);
+ }
+ break;
+
+ case 0xff: /* meta event */
+ {
+ c = read_byte ();
+ len = read_var ();
+
+ if (len < 0)
+ ERRMSG_MIDITRACK();
+
+ switch (c)
+ {
+ case 0x21: /* port number */
+ {
+ if (len < 1)
+ ERRMSG_MIDITRACK();
+
+ port = read_byte () % port_count;
+ skip_bytes (len - 1);
+ }
+ break;
+
+ case 0x2f: /* end of track */
+ {
+ if (! aud_get_bool ("amidiplug", "skip_leading"))
+ track.start_tick = 0;
+ if (! aud_get_bool ("amidiplug", "skip_trailing"))
+ track.end_tick = tick;
+
+ skip_bytes (track_end - file_offset);
+ return true;
+ }
+
+ case 0x51: /* tempo */
+ {
+ if (len < 3)
+ ERRMSG_MIDITRACK();
+
+ if (smpte_timing)
+ {
+ /* SMPTE timing doesn't change */
+ skip_bytes (len);
+ }
+ else
+ {
+ event = track.add_event ();
+ event->type = SND_SEQ_EVENT_TEMPO;
+ event->port = port;
+ event->tick = tick;
+ event->tempo = read_byte () << 16;
+ event->tempo |= read_byte () << 8;
+ event->tempo |= read_byte ();
+ skip_bytes (len - 3);
+ }
+ }
+ break;
+
+ case 0x01: /* text comments */
+ {
+ if (len < 0)
+ ERRMSG_MIDITRACK();
+
+ event = track.add_event ();
+ event->type = SND_SEQ_EVENT_META_TEXT;
+ event->tick = tick;
+
+ StringBuf buf (len);
+ for (int i = 0; i < len; i ++)
+ bufi = read_byte ();
+
+ event->metat = String (str_to_utf8 (std::move (buf)));
+ }
+ break;
+
+ case 0x05: /* lyrics */
+ {
+ if (len < 0)
+ ERRMSG_MIDITRACK();
+
+ event = track.add_event ();
+ event->type = SND_SEQ_EVENT_META_LYRIC;
+ event->tick = tick;
+
+ StringBuf buf (len);
+ for (int i = 0; i < len; i ++)
+ bufi = read_byte ();
+
+ event->metat = String (str_to_utf8 (std::move (buf)));
+ }
+ break;
+
+ default: /* ignore all other meta events */
+ {
+ skip_bytes (len);
+ }
+ break;
+ }
+ }
+ break;
+
+ default: /* invalid Fx command */
+ ERRMSG_MIDITRACK();
+ }
+ }
+ break;
+
+ default: /* cannot happen */
+ ERRMSG_MIDITRACK();
+ }
+ }
+
+ ERRMSG_MIDITRACK();
+}
+
+
+/* read a MIDI file in Standard MIDI Format */
+/* return values: 0 = error, 1 = ok */
+bool midifile_t::parse_smf (int port_count)
+{
+ int header_len;
+
+ /* the curren position is immediately after the "MThd" id */
+ header_len = read_int (4);
+
+ if (header_len < 6)
+ {
+ AUDERR ("%s: invalid file format\n", (const char *) file_name);
+ return false;
+ }
+
+ format = read_int (2);
+
+ if (format != 0 && format != 1)
+ {
+ AUDERR ("%s: type %d format is not supported\n", (const char *) file_name, format);
+ return false;
+ }
+
+ int num_tracks = read_int (2);
+
+ if (num_tracks < 1 || num_tracks > 1000)
+ {
+ AUDERR ("%s: invalid number of tracks (%d)\n", (const char *) file_name, num_tracks);
+ return false;
+ }
+
+ tracks.insert (0, num_tracks);
+
+ time_division = read_int (2);
+
+ if (time_division < 0)
+ {
+ AUDERR ("%s: invalid file format\n", (const char *) file_name);
+ return false;
+ }
+
+ smpte_timing = !! (time_division & 0x8000);
+
+ /* read tracks */
+ for (midifile_track_t & track : tracks)
+ {
+ int len;
+
+ /* search for MTrk chunk */
+ for (;;)
+ {
+ int id = read_id ();
+ len = read_int (4);
+
+ if (file_eof)
+ {
+ AUDERR ("%s: unexpected end of file\n", (const char *) file_name);
+ return false;
+ }
+
+ if (len < 0 || len >= 0x10000000)
+ {
+ AUDERR ("%s: invalid chunk length %d\n", (const char *) file_name, len);
+ return false;
+ }
+
+ if (id == MAKE_ID ('M', 'T', 'r', 'k'))
+ break;
+
+ skip_bytes (len);
+ }
+
+ if (! read_track (track, file_offset + len, port_count))
+ return false;
+ }
+
+ /* calculate the max_tick for the entire file */
+ start_tick = -1;
+ max_tick = 0;
+
+ for (midifile_track_t & track : tracks)
+ {
+ if (track.start_tick >= 0 && (start_tick < 0 || track.start_tick < start_tick))
+ start_tick = track.start_tick;
+ if (track.end_tick > max_tick)
+ max_tick = track.end_tick;
+ }
+
+ if (start_tick < 0)
+ start_tick = 0;
+
+ /* ok, success */
+ return true;
+}
+
+
+/* read a MIDI file enclosed in RIFF format */
+/* return values: 0 = error, 1 = ok */
+bool midifile_t::parse_riff ()
+{
+ /* skip file length (4 bytes) */
+ skip_bytes (4);
+
+ /* check file type ("RMID" = RIFF MIDI) */
+ if (read_id () != MAKE_ID ('R', 'M', 'I', 'D'))
+ return false;
+
+ /* search for "data" chunk */
+ for (;;)
+ {
+ int id = read_id ();
+ int len = read_32_le ();
+
+ if (file_eof)
+ return false;
+
+ if (id == MAKE_ID ('d', 'a', 't', 'a'))
+ break;
+
+ if (len < 0)
+ return false;
+
+ skip_bytes ((len + 1) & ~1);
+ }
+
+ /* the "data" chunk must contain data in SMF format */
+ if (read_id () != MAKE_ID ('M', 'T', 'h', 'd'))
+ return false;
+
+ /* ok, success */
+ return true;
+}
+
+
+/* queue set tempo */
+bool midifile_t::setget_tempo ()
+{
+ /* interpret and set tempo */
+ bool smpte_timing = !! (time_division & 0x8000);
+
+ if (!smpte_timing)
+ {
+ /* time_division is ticks per quarter */
+ current_tempo = 500000;
+ ppq = time_division;
+ }
+ else
+ {
+ /* upper byte is negative frames per second */
+ int fps = 0x80 - ((time_division >> 8) & 0x7f);
+ /* lower byte is ticks per frame */
+ int tpf = time_division & 0xff;
+
+ /* now pretend that we have quarter-note based timing */
+ switch (fps)
+ {
+ case 24:
+ current_tempo = 500000;
+ ppq = 12 * tpf;
+ break;
+
+ case 25:
+ current_tempo = 400000;
+ ppq = 10 * tpf;
+ break;
+
+ case 29: /* 30 drop-frame */
+ current_tempo = 100000000;
+ ppq = 2997 * tpf;
+ break;
+
+ case 30:
+ current_tempo = 500000;
+ ppq = 15 * tpf;
+ break;
+
+ default:
+ AUDERR ("Invalid number of SMPTE frames per second (%d)\n", fps);
+ return false;
+ }
+ }
+
+ AUDDBG ("MIDI tempo set -> time division: %i\n", time_division);
+ AUDDBG ("MIDI tempo set -> tempo: %i\n", current_tempo);
+ AUDDBG ("MIDI tempo set -> ppq: %i\n", ppq);
+ return true;
+}
+
+
+/* this will set the midi length in microseconds
+ COMMENT: this will also reset current position in each track! */
+void midifile_t::setget_length ()
+{
+ int64_t length_microsec = 0;
+ int last_tick = start_tick;
+ /* get the first microsec_per_tick ratio */
+ int microsec_per_tick = (int) (current_tempo / ppq);
+
+ /* initialize current position in each track */
+ for (midifile_track_t & track : tracks)
+ track.current_event = track.events.head ();
+
+ /* 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 */
+ AUDDBG ("LENGTH calc: starting calc loop\n");
+
+ for (;;)
+ {
+ midievent_t * event = nullptr;
+ midifile_track_t * event_track = nullptr;
+ int min_tick = max_tick + 1;
+
+ /* search next event */
+ for (midifile_track_t & track : tracks)
+ {
+ 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 * (max_tick - last_tick));
+ break; /* end of song reached */
+ }
+
+ /* advance pointer to next event */
+ event_track->current_event = event_track->events.next (event);
+
+ /* check if this is a tempo event */
+ if (event->type == SND_SEQ_EVENT_TEMPO)
+ {
+ int tick = aud::max (event->tick, start_tick);
+ AUDDBG ("LENGTH calc: tempo event (%i) on tick %i\n", event->tempo, tick);
+
+ /* increment length_microsec with the amount of microsec before tempo change */
+ length_microsec += (microsec_per_tick * (tick - last_tick));
+ /* now update last_tick and the microsec_per_tick ratio */
+ last_tick = tick;
+ microsec_per_tick = (int) (event->tempo / ppq);
+ }
+ }
+
+ /* IMPORTANT
+ this couple of important values is set by midifile_t::set_length */
+ length = length_microsec;
+
+ if (max_tick > start_tick)
+ avg_microsec_per_tick = (int) (length_microsec / (max_tick - start_tick));
+ else
+ avg_microsec_per_tick = 0;
+
+ 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 midifile_t::get_bpm (int * bpm, int * wavg_bpm)
+{
+ int last_tick = start_tick;
+ unsigned weighted_avg_tempo = 0;
+ bool is_monotempo = true;
+ int last_tempo = current_tempo;
+
+ /* initialize current position in each track */
+ for (midifile_track_t & track : tracks)
+ track.current_event = track.events.head ();
+
+ /* 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 */
+ AUDDBG ("BPM calc: starting calc loop\n");
+
+ for (;;)
+ {
+ midievent_t * event = nullptr;
+ midifile_track_t * event_track = nullptr;
+ int min_tick = max_tick + 1;
+
+ /* search next event */
+ for (midifile_track_t & track : tracks)
+ {
+ 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 */
+ if (max_tick > start_tick)
+ weighted_avg_tempo += (unsigned) (last_tempo *
+ ((float) (max_tick - last_tick) / (float) (max_tick - start_tick)));
+
+ break; /* end of song reached */
+ }
+
+ /* advance pointer to next event */
+ event_track->current_event = event_track->events.next (event);
+
+ /* check if this is a tempo event */
+ if (event->type == SND_SEQ_EVENT_TEMPO)
+ {
+ int tick = aud::max (event->tick, start_tick);
+ AUDDBG ("BPM calc: tempo event (%i) on tick %i\n", event->tempo, tick);
+
+ /* 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 && tick > start_tick && event->tempo != last_tempo)
+ is_monotempo = false;
+
+ /* add the previous tempo change multiplied for its weight (the tick interval for the tempo ) */
+ if (max_tick > start_tick)
+ weighted_avg_tempo += (unsigned) (last_tempo *
+ ((float) (tick - last_tick) / (float) (max_tick - start_tick)));
+
+ /* now update last_tick and the microsec_per_tick ratio */
+ last_tick = tick;
+ last_tempo = event->tempo;
+ }
+ }
+
+ AUDDBG ("BPM calc: weighted average tempo: %i\n", weighted_avg_tempo);
+
+ if (weighted_avg_tempo > 0)
+ *wavg_bpm = (int) (60000000 / weighted_avg_tempo);
+ else
+ *wavg_bpm = 0;
+
+ AUDDBG ("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 */
+}
+
+
+/* helper function that parses a midi file; returns 1 on success, 0 otherwise */
+bool midifile_t::parse_from_file (const char * filename, VFSFile & file)
+{
+ bool success = false;
+
+ file_name = String (filename);
+ file_data = file.read_all ();
+
+ switch (read_id ())
+ {
+ case MAKE_ID ('R', 'I', 'F', 'F') :
+ AUDDBG ("PARSE_FROM_FILENAME requested, RIFF chunk found, processing...\n");
+
+ /* read riff chunk */
+ if (!parse_riff ())
+ 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') :
+ AUDDBG ("PARSE_FROM_FILENAME requested, MThd chunk found, processing...\n");
+
+ /* we don't care about port count here, pass 1 */
+ if (!parse_smf (1))
+ WARNANDBREAK ("%s: invalid file format (smf parser)\n", filename);
+
+ if (time_division < 1)
+ WARNANDBREAK ("%s: invalid time division (%i)\n", filename, time_division);
+
+ /* fill ppq and tempo using time_division */
+ if (!setget_tempo ())
+ WARNANDBREAK ("%s: invalid values while setting ppq and tempo\n", filename);
+
+ /* fill length, keeping in count tempo-changes */
+ setget_length ();
+
+ /* ok, mf has been filled with information; successfully return */
+ success = true;
+ break;
+
+ default:
+ AUDERR ("%s is not a Standard MIDI File\n", filename);
+ break;
+ }
+
+ file_name = String ();
+ file_data.clear ();
+
+ return success;
+}

audacious-plugins-4.4.1.tar.bz2/src/amidiplug/i_midi.h Changed

audacious-plugins-4.4.1.tar.bz2/src/amidiplug/i_midievent.h Changed

audacious-plugins-4.4.1.tar.bz2/src/amidiplug/meson.build Added

audacious-plugins-4.4.1.tar.bz2/src/ampache Added

audacious-plugins-4.4.1.tar.bz2/src/ampache/Makefile Added

audacious-plugins-4.4.1.tar.bz2/src/ampache/ampache.cc Added

@@ -0,0 +1,131 @@
+// ampache.cc
+//
+// Project: Ampache Browser Audacious Plugin
+// License: GNU GPLv3
+//
+// Copyright (C) 2015-2016 Róbert Čerňanský and John Lindgren
+
+#include <QWidget>
+
+#include <libaudcore/audstrings.h>
+#include <libaudcore/drct.h>
+#include <libaudcore/i18n.h>
+#include <libaudcore/runtime.h>
+#include <libaudcore/plugin.h>
+#include <libaudcore/playlist.h>
+#include <libaudcore/vfs_async.h>
+
+#include <ampache_browser/settings.h>
+#include <ampache_browser/ampache_browser.h>
+#include <ampache_browser/application_qt.h>
+
+#define CFG_SECT "ampache_browser"
+
+using NetworkCb = ampache_browser::ApplicationQt::NetworkRequestCb;
+using UrlList = std::vector<std::string>;
+
+class AmpacheBrowserPlugin: public GeneralPlugin
+{
+public:
+ static const char about;
+
+ static constexpr PluginInfo pluginInfo = {
+ N_("Ampache Browser"),
+ PACKAGE,
+ about,
+ nullptr,
+ PluginQtOnly
+ };
+
+ constexpr AmpacheBrowserPlugin(): GeneralPlugin(pluginInfo, false) {}
+
+ void* get_qt_widget() override;
+};
+
+const char AmpacheBrowserPlugin::about =
+ N_("Ampache Browser for Audacious\n"
+ "http://ampache-browser.org/\n\n"
+ "Copyright (C) Róbert Čerňanský and John Lindgren\n"
+ "License: GNU GPLv3");
+
+static SmartPtr<ampache_browser::ApplicationQt> s_app;
+
+static void vfsAsyncCb(const char* url, const Index<char>& data, void* callback)
+{
+ if (s_app) // ignore callbacks after cleanup()
+ (*(NetworkCb*)callback)(url, data.begin(), data.len());
+}
+
+static Index<PlaylistAddItem> toAddItems(const UrlList& urls)
+{
+ Index<PlaylistAddItem> addItems;
+ for (auto& url: urls)
+ addItems.append(String(url.c_str()));
+
+ return addItems;
+}
+
+static void initSettings(ampache_browser::Settings &settings)
+{
+ static const std::string bool_settings = {
+ settings.USE_DEMO_SERVER
+ };
+
+ static const std::string str_settings = {
+ settings.SERVER_URL,
+ settings.USER_NAME,
+ settings.PASSWORD_HASH
+ };
+
+ auto verbosity = getenv("AMPACHE_BROWSER_PLUGIN_VERBOSITY");
+ settings.setInt(settings.LOGGING_VERBOSITY, verbosity ? str_to_int(verbosity) : 0);
+
+ for (auto& name: bool_settings)
+ settings.setBool(name, aud_get_bool(CFG_SECT, name.c_str()));
+ for (auto& name: str_settings)
+ settings.setString(name, (const char*)aud_get_str(CFG_SECT, name.c_str()));
+
+ settings.connectChanged(&settings() {
+ for (auto& name: bool_settings)
+ aud_set_bool(CFG_SECT, name.c_str(), settings.getBool(name));
+ for (auto& name: str_settings)
+ aud_set_str(CFG_SECT, name.c_str(), settings.getString(name).c_str());
+ });
+}
+
+void* AmpacheBrowserPlugin::get_qt_widget()
+{
+ s_app.capture(new ampache_browser::ApplicationQt);
+
+ s_app->setNetworkRequestFunction((const std::string& url, NetworkCb& networkCb) {
+ using namespace std::placeholders;
+ vfs_async_file_get_contents(url.c_str(), std::bind(vfsAsyncCb, _1, _2, &networkCb));
+ });
+
+ auto& browser = s_app->getAmpacheBrowser();
+
+ browser.connectPlay((const UrlList& urls) {
+ aud_drct_pl_open_list(toAddItems(urls));
+ });
+
+ browser.connectCreatePlaylist((const UrlList& urls) {
+ Playlist::new_playlist().insert_items(-1, toAddItems(urls), false);
+ });
+
+ browser.connectAddToPlaylist((const UrlList& urls) {
+ Playlist::active_playlist().insert_items(-1, toAddItems(urls), false);
+ });
+
+ initSettings(s_app->getSettings());
+
+ s_app->run();
+ auto widget = s_app->getMainWidget();
+
+ QObject::connect(widget, &QObject::destroyed, {
+ s_app.clear();
+ });
+
+ return widget;
+}
+
+EXPORT AmpacheBrowserPlugin aud_plugin_instance;

audacious-plugins-4.4.1.tar.bz2/src/ampache/meson.build Added

audacious-plugins-3.6.2-gtk3.tar.bz2/src/aosd/Makefile -> audacious-plugins-4.4.1.tar.bz2/src/aosd/Makefile Changed

audacious-plugins-3.6.2-gtk3.tar.bz2/src/aosd/aosd.cc -> audacious-plugins-4.4.1.tar.bz2/src/aosd/aosd.cc Changed

audacious-plugins-3.6.2-gtk3.tar.bz2/src/aosd/aosd.h -> audacious-plugins-4.4.1.tar.bz2/src/aosd/aosd.h Changed

audacious-plugins-3.6.2-gtk3.tar.bz2/src/aosd/aosd_cfg.cc -> audacious-plugins-4.4.1.tar.bz2/src/aosd/aosd_cfg.cc Changed

audacious-plugins-3.6.2-gtk3.tar.bz2/src/aosd/aosd_osd.cc -> audacious-plugins-4.4.1.tar.bz2/src/aosd/aosd_osd.cc Changed

@@ -26,7 +26,7 @@
 #include <X11/Xlib.h>
 #include <cairo/cairo.h>
 #include <pango/pangocairo.h>
-#include <gdk/gdk.h>
+#include <gtk/gtk.h>
 #include <stdlib.h>
 #include <string.h>
 #include <sys/time.h>
@@ -157,7 +157,15 @@
 {
 /* adjust coordinates and size according to selected monitor */
 GdkRectangle rect;
+
+#if GTK_CHECK_VERSION(3, 22, 0)
+ GdkDisplay *display = gdk_screen_get_display( screen );
+ GdkMonitor *monitor = gdk_display_get_monitor( display, osd_data->cfg_osd->position.multimon_id );
+ gdk_monitor_get_geometry( monitor, &rect );
+#else
 gdk_screen_get_monitor_geometry( screen , osd_data->cfg_osd->position.multimon_id , &rect );
+#endif
+
 pos_x = rect.x;
 pos_y = rect.y;
 screen_width = rect.width;
@@ -165,9 +173,12 @@
 }
 else
 {
- /* use total space available, even when composed by multiple monitor */
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
+ /* use total space available, even when composed by multiple monitor,
+ unfortunately there is no non-deprecated method for the aggregation */
 screen_width = gdk_screen_get_width( screen );
 screen_height = gdk_screen_get_height( screen );
+G_GNUC_END_IGNORE_DEPRECATIONS
 pos_x = 0;
 pos_y = 0;
 }
@@ -194,7 +205,7 @@
 osd_data->pango_layout = pango_layout_new(osd_data->pango_context);
 pango_layout_set_markup( osd_data->pango_layout, osd_data->markup_message , -1 );
 pango_layout_set_ellipsize( osd_data->pango_layout , PANGO_ELLIPSIZE_NONE );
- pango_layout_set_justify( osd_data->pango_layout , FALSE );
+ pango_layout_set_justify( osd_data->pango_layout , false );
 pango_layout_set_width( osd_data->pango_layout , PANGO_SCALE * max_width );
 pango_layout_get_pixel_extents( osd_data->pango_layout , &ink , &log );
 layout_width = ink.width;
@@ -296,7 +307,7 @@
 ghosd_render( osd );
 ghosd_main_iterations( osd );
 }
- return TRUE;
+ return true;
 }
 
 case AOSD_STATUS_SHOW:
@@ -311,7 +322,7 @@
 {
 ghosd_main_iterations( osd );
 }
- return TRUE;
+ return true;
 }
 
 case AOSD_STATUS_FADEOUT:
@@ -330,7 +341,7 @@
 ghosd_render( osd );
 ghosd_main_iterations( osd );
 }
- return TRUE;
+ return true;
 }
 
 case AOSD_STATUS_DESTROY:
@@ -340,11 +351,11 @@
 
 osd_status = AOSD_STATUS_HIDDEN; /* reset status */
 osd_source_id = 0;
- return FALSE;
+ return false;
 }
 }
 
- return TRUE;
+ return true;
 }
 
 
@@ -416,7 +427,6 @@
 if ( transparency_mode == AOSD_MISC_TRANSPARENCY_FAKE )
 osd = ghosd_new();
 else
-#ifdef HAVE_XCOMPOSITE
 {
 /* check if the composite module is actually loaded */
 if ( aosd_osd_check_composite_ext() )
@@ -427,9 +437,6 @@
 osd = ghosd_new(); /* fall back to fake transparency */
 }
 }
-#else
- osd = ghosd_new();
-#endif
 
 if ( osd == nullptr )
 g_warning( "Unable to load osd object; OSD will not work properly!\n" );
@@ -450,7 +457,6 @@
 return;
 }
 
-#ifdef HAVE_XCOMPOSITE
 int
 aosd_osd_check_composite_ext ( void )
 {
@@ -482,7 +488,7 @@
 int exit_status;
 
 if ( g_spawn_command_line_sync( "ps -eo comm" ,
- &soutput , &serror , &exit_status , nullptr ) == TRUE )
+ &soutput , &serror , &exit_status , nullptr ) == true )
 {
 if (( soutput != nullptr ) && ( strstr( soutput , "\nxcompmgr\n" ) != nullptr ))
 {
@@ -506,4 +512,3 @@
 return have_comp_mgr;
 }
 }
-#endif

audacious-plugins-3.6.2-gtk3.tar.bz2/src/aosd/aosd_osd.h -> audacious-plugins-4.4.1.tar.bz2/src/aosd/aosd_osd.h Changed

audacious-plugins-3.6.2-gtk3.tar.bz2/src/aosd/aosd_style.cc -> audacious-plugins-4.4.1.tar.bz2/src/aosd/aosd_style.cc Changed

@@ -161,7 +161,7 @@
     (double)color1.blue / 65535 , (double)color1.alpha / 65535 );
   cairo_stroke( cr );
 
-  if ( draw_shadow == TRUE )
+  if ( draw_shadow == true )
   {
     /* draw text shadow */
     cairo_set_source_rgba( cr , (double)shadowcolor0.red / 65535 , (double)shadowcolor0.green / 65535 ,
@@ -222,7 +222,7 @@
     (double)color1.blue / 65535 , (double)color1.alpha / 65535 );
   cairo_stroke( cr );
 
-  if ( draw_shadow == TRUE )
+  if ( draw_shadow == true )
   {
     /* draw text shadow */
     cairo_set_source_rgba( cr , (double)shadowcolor0.red / 65535 , (double)shadowcolor0.green / 65535 ,
@@ -283,7 +283,7 @@
     (double)color1.blue / 65535 , (double)color1.alpha / 65535 );
   cairo_stroke( cr );
 
-  if ( draw_shadow == TRUE )
+  if ( draw_shadow == true )
   {
     /* draw text shadow */
     cairo_set_source_rgba( cr , (double)shadowcolor0.red / 65535 , (double)shadowcolor0.green / 65535 ,
@@ -320,7 +320,7 @@
 
   aosd_layout_size( osd_layout , &width , &height , &bearing );
 
-  if ( draw_shadow == TRUE )
+  if ( draw_shadow == true )
   {
     /* draw text shadow */
     cairo_set_source_rgba( cr , (double)shadowcolor0.red / 65535 , (double)shadowcolor0.green / 65535 ,

audacious-plugins-3.6.2-gtk3.tar.bz2/src/aosd/aosd_trigger.cc -> audacious-plugins-4.4.1.tar.bz2/src/aosd/aosd_trigger.cc Changed

@@ -23,7 +23,6 @@
 
 #include <libaudcore/drct.h>
 #include <libaudcore/i18n.h>
-#include <libaudcore/plugin.h>
 #include <libaudcore/audstrings.h>
 #include <libaudcore/hook.h>
 
@@ -124,7 +123,7 @@
 static void
 aosd_trigger_func_pb_start_onoff ( bool turn_on )
 {
- if (turn_on == TRUE)
+ if (turn_on == true)
 hook_associate("playback ready", aosd_trigger_func_pb_start_cb, nullptr);
 else
 hook_dissociate("playback ready", aosd_trigger_func_pb_start_cb);
@@ -137,7 +136,7 @@
 char * markup = g_markup_printf_escaped ("%s",
 (const char *) global_config.text.fonts_name0, (const char *) title);
 
- aosd_osd_display (markup, & global_config, FALSE);
+ aosd_osd_display (markup, & global_config, false);
 g_free (markup);
 }
 
@@ -153,7 +152,7 @@
 {
 static aosd_pb_titlechange_prevs_t *prevs = nullptr;
 
- if ( turn_on == TRUE )
+ if ( turn_on == true )
 {
 prevs = new aosd_pb_titlechange_prevs_t;
 hook_associate( "title change" , aosd_trigger_func_pb_titlechange_cb , prevs );
@@ -181,11 +180,11 @@
 
 /* same filename but title changed, useful to detect http stream song changes */
 
- if ( ( prevs->title != nullptr ) && ( prevs->filename != nullptr ) )
+ if (prevs->title && prevs->filename)
 {
- if ( ( pl_entry_filename != nullptr ) && ( !strcmp(pl_entry_filename,prevs->filename) ) )
+ if (pl_entry_filename && ! strcmp (pl_entry_filename, prevs->filename))
 {
- if ( ( pl_entry_title != nullptr ) && ( strcmp(pl_entry_title,prevs->title) ) )
+ if (pl_entry_title && strcmp (pl_entry_title, prevs->title))
 {
 /* string formatting is done here a.t.m. - TODO - improve this area */
 char * markup = g_markup_printf_escaped
@@ -193,7 +192,7 @@
 (const char *) global_config.text.fonts_name0,
 (const char *) pl_entry_title);
 
- aosd_osd_display (markup, & global_config, FALSE);
+ aosd_osd_display (markup, & global_config, false);
 g_free (markup);
 
 prevs->title = pl_entry_title;
@@ -217,7 +216,7 @@
 static void
 aosd_trigger_func_pb_pauseon_onoff ( bool turn_on )
 {
- if ( turn_on == TRUE )
+ if ( turn_on == true )
 hook_associate( "playback pause" , aosd_trigger_func_pb_pauseon_cb , nullptr );
 else
 hook_dissociate( "playback pause" , aosd_trigger_func_pb_pauseon_cb );
@@ -228,7 +227,7 @@
 {
 char * markup = g_markup_printf_escaped ("Paused",
 (const char *) global_config.text.fonts_name0);
- aosd_osd_display (markup, & global_config, FALSE);
+ aosd_osd_display (markup, & global_config, false);
 g_free (markup);
 }
 
@@ -236,7 +235,7 @@
 static void
 aosd_trigger_func_pb_pauseoff_onoff ( bool turn_on )
 {
- if ( turn_on == TRUE )
+ if ( turn_on == true )
 hook_associate( "playback unpause" , aosd_trigger_func_pb_pauseoff_cb , nullptr );
 else
 hook_dissociate( "playback unpause" , aosd_trigger_func_pb_pauseoff_cb );
@@ -262,7 +261,7 @@
 (const char *) global_config.text.fonts_name0, (const char *) title,
 time_cur_m, time_cur_s, time_tot_m, time_tot_s);
 
- aosd_osd_display (markup, & global_config, FALSE);
+ aosd_osd_display (markup, & global_config, false);
 g_free (markup);
 }
 
@@ -276,7 +275,7 @@
 if ( markup_text != nullptr )
 {
 /* Display text from caller */
- aosd_osd_display ((char *) markup_text, & global_config, FALSE);
+ aosd_osd_display ((char *) markup_text, & global_config, false);
 } else {
 /* Display currently playing song */
 aosd_trigger_func_pb_start_cb (nullptr, nullptr);

audacious-plugins-3.6.2-gtk3.tar.bz2/src/aosd/aosd_ui.cc -> audacious-plugins-4.4.1.tar.bz2/src/aosd/aosd_ui.cc Changed

@@ -22,9 +22,11 @@
 
 #include <gtk/gtk.h>
 
+#define AUD_GLIB_INTEGRATION
 #include <libaudcore/i18n.h>
 #include <libaudcore/index.h>
 #include <libaudcore/preferences.h>
+#include <libaudgui/gtk-compat.h>
 
 #include "aosd.h"
 #include "aosd_style.h"
@@ -32,7 +34,7 @@
 #include "aosd_cfg.h"
 #include "aosd_osd.h"
 
-
+#ifdef USE_GTK3
 static void chooser_get_aosd_color (GtkColorChooser * chooser, aosd_color_t * color)
 {
 GdkRGBA rgba;
@@ -54,9 +56,31 @@
 color->alpha / 65535.0
 };
 
- gtk_color_chooser_set_use_alpha (chooser, TRUE);
+ gtk_color_chooser_set_use_alpha (chooser, true);
 gtk_color_chooser_set_rgba (chooser, & rgba);
 }
+#else
+static void chooser_get_aosd_color (GtkColorButton * chooser, aosd_color_t * color)
+{
+ GdkColor gdk_color;
+ gtk_color_button_get_color (chooser, & gdk_color);
+
+ color->red = gdk_color.red;
+ color->green = gdk_color.green;
+ color->blue = gdk_color.blue;
+ color->alpha = gtk_color_button_get_alpha (chooser);
+}
+
+
+static void chooser_set_aosd_color (GtkColorButton * chooser, const aosd_color_t * color)
+{
+ GdkColor gdk_color = {0, (uint16_t) color->red, (uint16_t) color->green, (uint16_t) color->blue};
+
+ gtk_color_button_set_color (chooser, & gdk_color);
+ gtk_color_button_set_use_alpha (chooser, true);
+ gtk_color_button_set_alpha (chooser, color->alpha);
+}
+#endif
 
 
 /*************************************************************/
@@ -84,16 +108,27 @@
 
 static gboolean
 aosd_cb_configure_position_expose ( GtkWidget * darea ,
+#ifdef USE_GTK3
 cairo_t * cr ,
+#else
+ GdkEventExpose * event ,
+#endif
 void * coord_gp )
 {
 int coord = GPOINTER_TO_INT(coord_gp);
 
+#ifdef USE_GTK3
 cairo_set_source_rgb ( cr , 0 , 0 , 0 );
 cairo_rectangle ( cr , (coord % 3) * 10 , (coord / 3) * 16 , 20 , 8 );
 cairo_fill ( cr );
-
- return FALSE;
+#else
+ cairo_t * cr = gdk_cairo_create (gtk_widget_get_window (darea));
+ cairo_set_source_rgb ( cr , 0 , 0 , 0 );
+ cairo_rectangle ( cr , (coord % 3) * 10 , (coord / 3) * 16 , 20 , 8 );
+ cairo_fill ( cr );
+ cairo_destroy (cr);
+#endif
+ return false;
 }
 
 
@@ -101,17 +136,16 @@
 aosd_cb_configure_position_placement_commit ( GtkWidget * grid , aosd_cfg_t * cfg )
 {
 GList *placbt_list = gtk_container_get_children( GTK_CONTAINER(grid) );
- GList *list_iter = placbt_list;
 
- while ( list_iter != nullptr )
+ for ( GList *iter = placbt_list; iter != nullptr; iter = iter->next )
 {
- GtkWidget *placbt = (GtkWidget *) list_iter->data;
- if ( gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON(placbt) ) == TRUE )
+ GtkWidget *placbt = (GtkWidget *) iter->data;
+
+ if ( gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON(placbt) ) == true )
 {
 cfg->position.placement = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(placbt),"value"));
 break;
 }
- list_iter = g_list_next( list_iter );
 }
 
 g_list_free( placbt_list );
@@ -156,71 +190,96 @@
 GtkWidget *pos_multimon_frame, *pos_multimon_hbox;
 GtkWidget *pos_multimon_label;
 GtkWidget *pos_multimon_combobox;
- int monitors_num = gdk_screen_get_n_monitors( gdk_screen_get_default() );
 int i = 0;
 
- pos_vbox = gtk_box_new( GTK_ORIENTATION_VERTICAL , 4 );
+#if GTK_CHECK_VERSION(3, 22, 0)
+ int monitors_num = gdk_display_get_n_monitors ( gdk_display_get_default() );
+#else
+ int monitors_num = gdk_screen_get_n_monitors( gdk_screen_get_default() );
+#endif
+
+ pos_vbox = audgui_vbox_new( 4 );
 gtk_container_set_border_width( GTK_CONTAINER(pos_vbox) , 6 );
 
 pos_placement_frame = gtk_frame_new( _("Placement") );
- pos_placement_hbox = gtk_box_new( GTK_ORIENTATION_HORIZONTAL , 0 );
+ pos_placement_hbox = audgui_hbox_new( 0 );
 gtk_container_set_border_width( GTK_CONTAINER(pos_placement_hbox) , 6 );
 gtk_container_add( GTK_CONTAINER(pos_placement_frame) , pos_placement_hbox );
- gtk_box_pack_start( GTK_BOX(pos_vbox) , pos_placement_frame , FALSE , FALSE , 0 );
+ gtk_box_pack_start( GTK_BOX(pos_vbox) , pos_placement_frame , false , false , 0 );
 
- pos_placement_grid = gtk_grid_new();
+ pos_placement_grid = audgui_grid_new();
 for ( i = 0 ; i < 9 ; i++ )
 {
 if ( i == 0 )
 pos_placement_bti = gtk_radio_button_new( nullptr );
 else
 pos_placement_bti = gtk_radio_button_new_from_widget( GTK_RADIO_BUTTON(pos_placement_bt0) );
- gtk_toggle_button_set_mode( GTK_TOGGLE_BUTTON(pos_placement_bti) , FALSE );
+ gtk_toggle_button_set_mode( GTK_TOGGLE_BUTTON(pos_placement_bti) , false );
 pos_placement_bt_dareai = gtk_drawing_area_new();
 gtk_widget_set_size_request( pos_placement_bt_dareai , 40 , 40 );
 gtk_container_add( GTK_CONTAINER(pos_placement_bti) , pos_placement_bt_dareai );
- g_signal_connect( G_OBJECT(pos_placement_bt_dareai) , "draw" ,
+ g_signal_connect( G_OBJECT(pos_placement_bt_dareai) , AUDGUI_DRAW_SIGNAL ,
 G_CALLBACK(aosd_cb_configure_position_expose) , GINT_TO_POINTER(i) );
+#ifdef USE_GTK3
 gtk_grid_attach( GTK_GRID(pos_placement_grid) , pos_placement_bti , (i % 3) , (i / 3) , 1 , 1 );
+#else
+ gtk_table_attach_defaults( GTK_TABLE(pos_placement_grid) , pos_placement_bti ,
+ (i % 3) , (i % 3) + 1 , (i / 3) , (i / 3) + 1 );
+#endif
 g_object_set_data( G_OBJECT(pos_placement_bti) , "value" , GINT_TO_POINTER(i+1) );
 if ( cfg->position.placement == (i+1) )
- gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON(pos_placement_bti) , TRUE );
+ gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON(pos_placement_bti) , true );
 }
- gtk_box_pack_start( GTK_BOX(pos_placement_hbox) , pos_placement_grid , FALSE , FALSE , 0 );
+ gtk_box_pack_start( GTK_BOX(pos_placement_hbox) , pos_placement_grid , false , false , 0 );
 aosd_cb_list.append( pos_placement_grid , aosd_cb_configure_position_placement_commit );
 
- gtk_box_pack_start( GTK_BOX(pos_placement_hbox) , gtk_separator_new(GTK_ORIENTATION_VERTICAL) , FALSE , FALSE , 6 );
+ gtk_box_pack_start( GTK_BOX(pos_placement_hbox) , audgui_separator_new( GTK_ORIENTATION_VERTICAL ) , false , false , 6 );
 
- pos_offset_grid = gtk_grid_new();
- gtk_grid_set_row_spacing( GTK_GRID(pos_offset_grid) , 4 );
- gtk_grid_set_column_spacing( GTK_GRID(pos_offset_grid) , 4 );
+ pos_offset_grid = audgui_grid_new();
+ audgui_grid_set_row_spacing( pos_offset_grid , 4 );
+ audgui_grid_set_column_spacing( pos_offset_grid , 4 );
 pos_offset_x_label = gtk_label_new( _( "Relative X offset:" ) );
- gtk_widget_set_halign( pos_offset_x_label , GTK_ALIGN_START );
- gtk_grid_attach( GTK_GRID(pos_offset_grid) , pos_offset_x_label , 0 , 0 , 1 , 1 );
 pos_offset_x_spinbt = gtk_spin_button_new_with_range( -9999 , 9999 , 1 );
 gtk_spin_button_set_value( GTK_SPIN_BUTTON(pos_offset_x_spinbt) , cfg->position.offset_x );
- gtk_grid_attach( GTK_GRID(pos_offset_grid) , pos_offset_x_spinbt , 1 , 0 , 1 , 1 );
 g_object_set_data( G_OBJECT(pos_offset_grid) , "offx" , pos_offset_x_spinbt );
 pos_offset_y_label = gtk_label_new( _( "Relative Y offset:" ) );
- gtk_widget_set_halign( pos_offset_y_label , GTK_ALIGN_START );
- gtk_grid_attach( GTK_GRID(pos_offset_grid) , pos_offset_y_label , 0 , 1 , 1 , 1 );
 pos_offset_y_spinbt = gtk_spin_button_new_with_range( -9999 , 9999 , 1 );
 gtk_spin_button_set_value( GTK_SPIN_BUTTON(pos_offset_y_spinbt) , cfg->position.offset_y );
- gtk_grid_attach( GTK_GRID(pos_offset_grid) , pos_offset_y_spinbt , 1 , 1 , 1 , 1 );
 g_object_set_data( G_OBJECT(pos_offset_grid) , "offy" , pos_offset_y_spinbt );
 pos_maxsize_width_label = gtk_label_new( _("Max OSD width:") );
- gtk_widget_set_halign( pos_maxsize_width_label , GTK_ALIGN_START );
- gtk_grid_attach( GTK_GRID(pos_offset_grid) , pos_maxsize_width_label , 0 , 2 , 1 , 1 );
 pos_maxsize_width_spinbt = gtk_spin_button_new_with_range( 0 , 99999 , 1 );
 g_object_set_data( G_OBJECT(pos_offset_grid) , "maxsize_width" , pos_maxsize_width_spinbt );
 gtk_spin_button_set_value( GTK_SPIN_BUTTON(pos_maxsize_width_spinbt) , cfg->position.maxsize_width );
- gtk_grid_attach( GTK_GRID(pos_offset_grid) , pos_maxsize_width_spinbt , 1 , 2 , 1 , 1 );
- gtk_box_pack_start( GTK_BOX(pos_placement_hbox) , pos_offset_grid , FALSE , FALSE , 0 );
+ gtk_box_pack_start( GTK_BOX(pos_placement_hbox) , pos_offset_grid , false , false , 0 );
 aosd_cb_list.append( pos_offset_grid , aosd_cb_configure_position_offset_commit );
 aosd_cb_list.append( pos_offset_grid , aosd_cb_configure_position_maxsize_commit );
 
+#ifdef USE_GTK3
+ gtk_widget_set_halign( pos_offset_x_label , GTK_ALIGN_START );
+ gtk_widget_set_halign( pos_offset_y_label , GTK_ALIGN_START );
+ gtk_widget_set_halign( pos_maxsize_width_label , GTK_ALIGN_START );
+
+ gtk_grid_attach( GTK_GRID(pos_offset_grid) , pos_offset_x_label , 0 , 0 , 1 , 1 );
+ gtk_grid_attach( GTK_GRID(pos_offset_grid) , pos_offset_x_spinbt , 1 , 0 , 1 , 1 );
+ gtk_grid_attach( GTK_GRID(pos_offset_grid) , pos_offset_y_label , 0 , 1 , 1 , 1 );
+ gtk_grid_attach( GTK_GRID(pos_offset_grid) , pos_offset_y_spinbt , 1 , 1 , 1 , 1 );
+ gtk_grid_attach( GTK_GRID(pos_offset_grid) , pos_maxsize_width_label , 0 , 2 , 1 , 1 );
+ gtk_grid_attach( GTK_GRID(pos_offset_grid) , pos_maxsize_width_spinbt , 1 , 2 , 1 , 1 );
+#else
+ gtk_misc_set_alignment( GTK_MISC(pos_offset_x_label) , 0 , 0.5 );
+ gtk_misc_set_alignment( GTK_MISC(pos_offset_y_label) , 0 , 0.5 );
+ gtk_misc_set_alignment( GTK_MISC(pos_maxsize_width_label) , 0 , 0.5 );
+
+ gtk_table_attach_defaults( GTK_TABLE(pos_offset_grid) , pos_offset_x_label , 0 , 1 , 0 , 1 );
+ gtk_table_attach_defaults( GTK_TABLE(pos_offset_grid) , pos_offset_x_spinbt , 1 , 2 , 0 , 1 );
+ gtk_table_attach_defaults( GTK_TABLE(pos_offset_grid) , pos_offset_y_label , 0 , 1 , 1 , 2 );
+ gtk_table_attach_defaults( GTK_TABLE(pos_offset_grid) , pos_offset_y_spinbt , 1 , 2 , 1 , 2 );
+ gtk_table_attach_defaults( GTK_TABLE(pos_offset_grid) , pos_maxsize_width_label , 0 , 1 , 2 , 3 );
+ gtk_table_attach_defaults( GTK_TABLE(pos_offset_grid) , pos_maxsize_width_spinbt , 1 , 2 , 2 , 3 );
+#endif
+
 pos_multimon_frame = gtk_frame_new( _("Multi-Monitor options") );
- pos_multimon_hbox = gtk_box_new( GTK_ORIENTATION_HORIZONTAL , 4 );
+ pos_multimon_hbox = audgui_hbox_new( 4 );
 gtk_container_set_border_width( GTK_CONTAINER(pos_multimon_hbox) , 6 );
 gtk_container_add( GTK_CONTAINER(pos_multimon_frame), pos_multimon_hbox );
 pos_multimon_label = gtk_label_new( _("Display OSD using:") );
@@ -234,23 +293,23 @@
 }
 gtk_combo_box_set_active( GTK_COMBO_BOX(pos_multimon_combobox) , (cfg->position.multimon_id + 1) );
 aosd_cb_list.append( pos_multimon_combobox , aosd_cb_configure_position_multimon_commit );
- gtk_box_pack_start( GTK_BOX(pos_multimon_hbox) , pos_multimon_label , FALSE , FALSE , 0 );
- gtk_box_pack_start( GTK_BOX(pos_multimon_hbox) , pos_multimon_combobox , FALSE , FALSE , 0 );
- gtk_box_pack_start( GTK_BOX(pos_vbox) , pos_multimon_frame , FALSE , FALSE , 0 );
+ gtk_box_pack_start( GTK_BOX(pos_multimon_hbox) , pos_multimon_label , false , false , 0 );
+ gtk_box_pack_start( GTK_BOX(pos_multimon_hbox) , pos_multimon_combobox , false , false , 0 );
+ gtk_box_pack_start( GTK_BOX(pos_vbox) , pos_multimon_frame , false , false , 0 );
 
 return pos_vbox;
 }
 
 
 static GtkWidget *
-aosd_ui_configure_animation_timing ( char * label_string )
+aosd_ui_configure_animation_timing ( const char * label_string )
 {
 GtkWidget *hbox, *desc_label, *spinbt;
- hbox = gtk_box_new( GTK_ORIENTATION_HORIZONTAL , 4 );
+ hbox = audgui_hbox_new( 4 );
 desc_label = gtk_label_new( label_string );
 spinbt = gtk_spin_button_new_with_range( 0 , 99999 , 1 );
- gtk_box_pack_start( GTK_BOX(hbox) , desc_label , FALSE , FALSE , 0 );
- gtk_box_pack_start( GTK_BOX(hbox) , spinbt , FALSE , FALSE , 0 );
+ gtk_box_pack_start( GTK_BOX(hbox) , desc_label , false , false , 0 );
+ gtk_box_pack_start( GTK_BOX(hbox) , spinbt , false , false , 0 );
 g_object_set_data( G_OBJECT(hbox) , "spinbt" , spinbt );
 return hbox;
 }
@@ -276,29 +335,29 @@
 GtkWidget *ani_timing_fadein_widget, *ani_timing_fadeout_widget, *ani_timing_stay_widget;
 GtkSizeGroup *sizegroup;
 
- ani_vbox = gtk_box_new( GTK_ORIENTATION_VERTICAL , 0 );
+ ani_vbox = audgui_vbox_new( 0 );
 gtk_container_set_border_width( GTK_CONTAINER(ani_vbox) , 6 );
 
- ani_timing_hbox = gtk_box_new( GTK_ORIENTATION_HORIZONTAL , 0 );
+ ani_timing_hbox = audgui_hbox_new( 0 );
 ani_timing_frame = gtk_frame_new( _("Timing (ms)") );
 gtk_container_set_border_width( GTK_CONTAINER(ani_timing_hbox) , 6 );
 gtk_container_add( GTK_CONTAINER(ani_timing_frame) , ani_timing_hbox );
- gtk_box_pack_start( GTK_BOX(ani_vbox) , ani_timing_frame , FALSE , FALSE , 0 );
+ gtk_box_pack_start( GTK_BOX(ani_vbox) , ani_timing_frame , false , false , 0 );
 
 ani_timing_stay_widget = aosd_ui_configure_animation_timing( _("Display:") );
 gtk_spin_button_set_value( GTK_SPIN_BUTTON(g_object_get_data(
 G_OBJECT(ani_timing_stay_widget),"spinbt")) , cfg->animation.timing_display );
- gtk_box_pack_start( GTK_BOX(ani_timing_hbox) , ani_timing_stay_widget , TRUE , TRUE , 0 );
- gtk_box_pack_start( GTK_BOX(ani_timing_hbox) , gtk_separator_new(GTK_ORIENTATION_VERTICAL) , FALSE , FALSE , 4 );
+ gtk_box_pack_start( GTK_BOX(ani_timing_hbox) , ani_timing_stay_widget , true , true , 0 );
+ gtk_box_pack_start( GTK_BOX(ani_timing_hbox) , audgui_separator_new( GTK_ORIENTATION_VERTICAL ) , false , false , 4 );
 ani_timing_fadein_widget = aosd_ui_configure_animation_timing( _("Fade in:") );
 gtk_spin_button_set_value( GTK_SPIN_BUTTON(g_object_get_data(
 G_OBJECT(ani_timing_fadein_widget),"spinbt")) , cfg->animation.timing_fadein );
- gtk_box_pack_start( GTK_BOX(ani_timing_hbox) , ani_timing_fadein_widget , TRUE , TRUE , 0 );
- gtk_box_pack_start( GTK_BOX(ani_timing_hbox) , gtk_separator_new(GTK_ORIENTATION_VERTICAL) , FALSE , FALSE , 4 );
+ gtk_box_pack_start( GTK_BOX(ani_timing_hbox) , ani_timing_fadein_widget , true , true , 0 );
+ gtk_box_pack_start( GTK_BOX(ani_timing_hbox) , audgui_separator_new( GTK_ORIENTATION_VERTICAL ) , false , false , 4 );
 ani_timing_fadeout_widget = aosd_ui_configure_animation_timing( _("Fade out:") );
 gtk_spin_button_set_value( GTK_SPIN_BUTTON(g_object_get_data(
 G_OBJECT(ani_timing_fadeout_widget),"spinbt")) , cfg->animation.timing_fadeout );
- gtk_box_pack_start( GTK_BOX(ani_timing_hbox) , ani_timing_fadeout_widget , TRUE , TRUE , 0 );
+ gtk_box_pack_start( GTK_BOX(ani_timing_hbox) , ani_timing_fadeout_widget , true , true , 0 );
 g_object_set_data( G_OBJECT(ani_timing_hbox) , "display" ,
 g_object_get_data(G_OBJECT(ani_timing_stay_widget),"spinbt") );
 g_object_set_data( G_OBJECT(ani_timing_hbox) , "fadein" ,
@@ -319,21 +378,22 @@
 aosd_cb_configure_text_font_shadow_toggle ( GtkToggleButton * shadow_togglebt ,
 void * shadow_colorbt )
 {
- if ( gtk_toggle_button_get_active( shadow_togglebt ) == TRUE )
- gtk_widget_set_sensitive( GTK_WIDGET(shadow_colorbt) , TRUE );
+ if ( gtk_toggle_button_get_active( shadow_togglebt ) == true )
+ gtk_widget_set_sensitive( GTK_WIDGET(shadow_colorbt) , true );
 else
- gtk_widget_set_sensitive( GTK_WIDGET(shadow_colorbt) , FALSE );
+ gtk_widget_set_sensitive( GTK_WIDGET(shadow_colorbt) , false );
 }
 
 
+#ifdef USE_GTK3
 static void
 aosd_cb_configure_text_font_commit ( GtkWidget * fontbt , aosd_cfg_t * cfg )
 {
 int fontnum = GPOINTER_TO_INT(g_object_get_data( G_OBJECT(fontbt) , "fontnum" ));
 GtkColorChooser * chooser;
 
- cfg->text.fonts_namefontnum =
- String (gtk_font_button_get_font_name (GTK_FONT_BUTTON (fontbt)));
+ CharPtr font_name (gtk_font_chooser_get_font (GTK_FONT_CHOOSER (fontbt)));
+ cfg->text.fonts_namefontnum = String (font_name);
 
 cfg->text.fonts_draw_shadowfontnum = gtk_toggle_button_get_active(
 GTK_TOGGLE_BUTTON(g_object_get_data(G_OBJECT(fontbt),"use_shadow")) );
@@ -344,6 +404,26 @@
 chooser = (GtkColorChooser *) g_object_get_data ((GObject *) fontbt, "shadow_color");
 chooser_get_aosd_color (chooser, & cfg->text.fonts_shadow_colorfontnum);
 }
+#else
+static void
+aosd_cb_configure_text_font_commit ( GtkWidget * fontbt , aosd_cfg_t * cfg )
+{
+ int fontnum = GPOINTER_TO_INT(g_object_get_data( G_OBJECT(fontbt) , "fontnum" ));
+ GtkColorButton * chooser;
+
+ cfg->text.fonts_namefontnum =
+ String (gtk_font_button_get_font_name (GTK_FONT_BUTTON (fontbt)));
+
+ cfg->text.fonts_draw_shadowfontnum = gtk_toggle_button_get_active(
+ GTK_TOGGLE_BUTTON(g_object_get_data(G_OBJECT(fontbt),"use_shadow")) );
+
+ chooser = (GtkColorButton *) g_object_get_data ((GObject *) fontbt, "color");
+ chooser_get_aosd_color (chooser, & cfg->text.fonts_colorfontnum);
+
+ chooser = (GtkColorButton *) g_object_get_data ((GObject *) fontbt, "shadow_color");
+ chooser_get_aosd_color (chooser, & cfg->text.fonts_shadow_colorfontnum);
+}
+#endif
 
 
 static GtkWidget *
@@ -356,49 +436,65 @@
 GtkWidget *tex_font_shadow_colorbt3;
 int i = 0;
 
- tex_vbox = gtk_box_new( GTK_ORIENTATION_VERTICAL , 4 );
+ tex_vbox = audgui_vbox_new( 4 );
 gtk_container_set_border_width( GTK_CONTAINER(tex_vbox) , 6 );
 
 tex_font_frame = gtk_frame_new( _("Fonts") );
- tex_font_grid = gtk_grid_new();
+ tex_font_grid = audgui_grid_new();
 gtk_container_set_border_width( GTK_CONTAINER(tex_font_grid) , 6 );
- gtk_grid_set_row_spacing ( GTK_GRID(tex_font_grid) , 4 );
- gtk_grid_set_column_spacing ( GTK_GRID(tex_font_grid) , 4 );
+ audgui_grid_set_row_spacing( tex_font_grid , 4 );
+ audgui_grid_set_column_spacing( tex_font_grid , 4 );
 for ( i = 0 ; i < AOSD_TEXT_FONTS_NUM ; i++ )
 {
 char *label_str = g_strdup_printf( _("Font %i:") , i+1 );
 tex_font_labeli = gtk_label_new( label_str );
 g_free( label_str );
 tex_font_fontbti = gtk_font_button_new();
- gtk_font_button_set_show_style( GTK_FONT_BUTTON(tex_font_fontbti) , TRUE );
- gtk_font_button_set_show_size( GTK_FONT_BUTTON(tex_font_fontbti) , TRUE );
- gtk_font_button_set_use_font( GTK_FONT_BUTTON(tex_font_fontbti) , FALSE );
- gtk_font_button_set_use_size( GTK_FONT_BUTTON(tex_font_fontbti) , FALSE );
+ gtk_font_button_set_show_style( GTK_FONT_BUTTON(tex_font_fontbti) , true );
+ gtk_font_button_set_show_size( GTK_FONT_BUTTON(tex_font_fontbti) , true );
+ gtk_font_button_set_use_font( GTK_FONT_BUTTON(tex_font_fontbti) , false );
+ gtk_font_button_set_use_size( GTK_FONT_BUTTON(tex_font_fontbti) , false );
+
+#ifdef USE_GTK3
+ gtk_font_chooser_set_font( GTK_FONT_CHOOSER(tex_font_fontbti) , cfg->text.fonts_namei );
+#else
 gtk_font_button_set_font_name( GTK_FONT_BUTTON(tex_font_fontbti) , cfg->text.fonts_namei );
- gtk_widget_set_hexpand( tex_font_fontbti , TRUE );
+#endif
 
 tex_font_colorbti = gtk_color_button_new ();
- chooser_set_aosd_color ((GtkColorChooser *) tex_font_colorbti,
- & cfg->text.fonts_colori);
 
 tex_font_shadow_togglebti = gtk_toggle_button_new_with_label( _("Shadow") );
- gtk_toggle_button_set_mode( GTK_TOGGLE_BUTTON(tex_font_shadow_togglebti) , FALSE );
+ gtk_toggle_button_set_mode( GTK_TOGGLE_BUTTON(tex_font_shadow_togglebti) , false );
 
 tex_font_shadow_colorbti = gtk_color_button_new ();
- chooser_set_aosd_color ((GtkColorChooser *) tex_font_shadow_colorbti,
- & cfg->text.fonts_shadow_colori);
 
- gtk_widget_set_sensitive( tex_font_shadow_colorbti , FALSE );
+ gtk_widget_set_sensitive( tex_font_shadow_colorbti , false );
 g_signal_connect( G_OBJECT(tex_font_shadow_togglebti) , "toggled" ,
 G_CALLBACK(aosd_cb_configure_text_font_shadow_toggle) ,
 tex_font_shadow_colorbti );
 gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON(tex_font_shadow_togglebti) ,
 cfg->text.fonts_draw_shadowi );
+
+#ifdef USE_GTK3
+ chooser_set_aosd_color( GTK_COLOR_CHOOSER(tex_font_colorbti) , &cfg->text.fonts_colori );
+ chooser_set_aosd_color( GTK_COLOR_CHOOSER(tex_font_shadow_colorbti) , &cfg->text.fonts_shadow_colori );
+
 gtk_grid_attach( GTK_GRID(tex_font_grid) , tex_font_labeli , 0 , 0 , 1 , 1 );
 gtk_grid_attach( GTK_GRID(tex_font_grid) , tex_font_fontbti , 1 , 0 , 1 , 1 );
 gtk_grid_attach( GTK_GRID(tex_font_grid) , tex_font_colorbti , 2 , 0 , 1 , 1 );
 gtk_grid_attach( GTK_GRID(tex_font_grid) , tex_font_shadow_togglebti , 3 , 0 , 1 , 1 );
 gtk_grid_attach( GTK_GRID(tex_font_grid) , tex_font_shadow_colorbti , 4 , 0 , 1 , 1 );
+#else
+ chooser_set_aosd_color( GTK_COLOR_BUTTON(tex_font_colorbti) , &cfg->text.fonts_colori );
+ chooser_set_aosd_color( GTK_COLOR_BUTTON(tex_font_shadow_colorbti) , &cfg->text.fonts_shadow_colori );
+
+ gtk_table_attach_defaults( GTK_TABLE(tex_font_grid) , tex_font_labeli , 0 , 1 , i , i + 1 );
+ gtk_table_attach_defaults( GTK_TABLE(tex_font_grid) , tex_font_fontbti , 1 , 2 , i , i + 1 );
+ gtk_table_attach_defaults( GTK_TABLE(tex_font_grid) , tex_font_colorbti , 2 , 3 , i , i + 1 );
+ gtk_table_attach_defaults( GTK_TABLE(tex_font_grid) , tex_font_shadow_togglebti , 3 , 4 , i , i + 1 );
+ gtk_table_attach_defaults( GTK_TABLE(tex_font_grid) , tex_font_shadow_colorbti , 4 , 5 , i , i + 1 );
+#endif
+
 g_object_set_data( G_OBJECT(tex_font_fontbti) , "fontnum" , GINT_TO_POINTER(i) );
 g_object_set_data( G_OBJECT(tex_font_fontbti) , "color" , tex_font_colorbti );
 g_object_set_data( G_OBJECT(tex_font_fontbti) , "use_shadow" , tex_font_shadow_togglebti );
@@ -406,7 +502,7 @@
 aosd_cb_list.append( tex_font_fontbti , aosd_cb_configure_text_font_commit );
 }
 gtk_container_add( GTK_CONTAINER(tex_font_frame) , tex_font_grid );
- gtk_box_pack_start( GTK_BOX(tex_vbox) , tex_font_frame , FALSE , FALSE , 0 );
+ gtk_box_pack_start( GTK_BOX(tex_vbox) , tex_font_frame , false , false , 0 );
 
 return tex_vbox;
 }
@@ -419,7 +515,7 @@
 GtkTreeModel *model;
 GtkTreeIter iter;
 
- if ( gtk_tree_selection_get_selected( sel , &model , &iter ) == TRUE )
+ if ( gtk_tree_selection_get_selected( sel , &model , &iter ) == true )
 {
 int deco_code = 0;
 gtk_tree_model_get( model , &iter , 1 , &deco_code , -1 );
@@ -432,7 +528,12 @@
 aosd_cb_configure_decoration_color_commit ( GtkWidget * colorbt , aosd_cfg_t * cfg )
 {
 aosd_color_t color;
- chooser_get_aosd_color ((GtkColorChooser *) colorbt, & color);
+
+#ifdef USE_GTK3
+ chooser_get_aosd_color( GTK_COLOR_CHOOSER(colorbt), &color );
+#else
+ chooser_get_aosd_color( GTK_COLOR_BUTTON(colorbt), &color );
+#endif
 
 int colnum = GPOINTER_TO_INT( g_object_get_data( G_OBJECT(colorbt) , "colnum" ) );
 cfg->decoration.colorscolnum = color;
@@ -449,11 +550,11 @@
 GtkTreeViewColumn *dec_rstyle_lv_col_desc;
 GtkTreeSelection *dec_rstyle_lv_sel;
 GtkTreeIter iter, iter_sel;
- GtkWidget *dec_rstyle_hbox;
+ GtkWidget *dec_rstyle_vbox;
 GtkWidget *dec_rstyleopts_frame, *dec_rstyleopts_grid;
 int colors_max_num = 0, i = 0;
 
- dec_hbox = gtk_box_new( GTK_ORIENTATION_HORIZONTAL , 4 );
+ dec_hbox = audgui_hbox_new( 4 );
 gtk_container_set_border_width( GTK_CONTAINER(dec_hbox) , 6 );
 
 /* decoration style model
@@ -494,38 +595,45 @@
 gtk_container_add( GTK_CONTAINER(dec_rstyle_lv_frame) , dec_rstyle_lv_sw );
 
 gtk_tree_selection_select_iter( dec_rstyle_lv_sel , &iter_sel );
- gtk_box_pack_start( GTK_BOX(dec_hbox) , dec_rstyle_lv_frame , FALSE , FALSE , 0 );
+ gtk_box_pack_start( GTK_BOX(dec_hbox) , dec_rstyle_lv_frame , false , false , 0 );
 aosd_cb_list.append( dec_rstyle_lv , aosd_cb_configure_decoration_style_commit );
 
- dec_rstyle_hbox = gtk_box_new( GTK_ORIENTATION_VERTICAL , 4 );
- gtk_box_pack_start( GTK_BOX(dec_hbox) , dec_rstyle_hbox , TRUE , TRUE , 0 );
+ dec_rstyle_vbox = audgui_vbox_new( 4 );
+ gtk_box_pack_start( GTK_BOX(dec_hbox) , dec_rstyle_vbox , true , true , 0 );
 
 /* in colors_max_num now there's the maximum number of colors used by decoration styles */
 dec_rstyleopts_frame = gtk_frame_new( _("Colors") );
- dec_rstyleopts_grid = gtk_grid_new();
+ dec_rstyleopts_grid = audgui_grid_new();
 gtk_container_set_border_width( GTK_CONTAINER(dec_rstyleopts_grid) , 6 );
- gtk_grid_set_row_spacing( GTK_GRID(dec_rstyleopts_grid) , 4 );
- gtk_grid_set_column_spacing( GTK_GRID(dec_rstyleopts_grid) , 8 );
+ audgui_grid_set_row_spacing( dec_rstyleopts_grid , 4 );
+ audgui_grid_set_column_spacing( dec_rstyleopts_grid , 8 );
 gtk_container_add( GTK_CONTAINER(dec_rstyleopts_frame) , dec_rstyleopts_grid );
 for ( i = 0 ; i < colors_max_num ; i++ )
 {
 GtkWidget *hbox, *label;
 char *label_str = nullptr;
- hbox = gtk_box_new( GTK_ORIENTATION_HORIZONTAL , 4 );
+ hbox = audgui_hbox_new( 4 );
 label_str = g_strdup_printf( _("Color %i:") , i+1 );
 label = gtk_label_new( label_str );
 g_free( label_str );
 
 GtkWidget * colorbt = gtk_color_button_new ();
- chooser_set_aosd_color ((GtkColorChooser *) colorbt, & cfg->decoration.colorsi);
 
- gtk_box_pack_start( GTK_BOX(hbox) , label , FALSE , FALSE , 0 );
- gtk_box_pack_start( GTK_BOX(hbox) , colorbt , FALSE , FALSE , 0 );
+ gtk_box_pack_start( GTK_BOX(hbox) , label , false , false , 0 );
+ gtk_box_pack_start( GTK_BOX(hbox) , colorbt , false , false , 0 );
+
+#ifdef USE_GTK3
+ chooser_set_aosd_color( GTK_COLOR_CHOOSER(colorbt) , &cfg->decoration.colorsi );
 gtk_grid_attach( GTK_GRID(dec_rstyleopts_grid) , hbox , (i % 3) , (i / 3) , 1 , 1 );
+#else
+ chooser_set_aosd_color( GTK_COLOR_BUTTON(colorbt) , &cfg->decoration.colorsi );
+ gtk_table_attach_defaults( GTK_TABLE(dec_rstyleopts_grid) , hbox , (i % 3) , (i % 3) + 1, (i / 3) , (i / 3) + 1 );
+#endif
+
 g_object_set_data( G_OBJECT(colorbt) , "colnum" , GINT_TO_POINTER(i) );
 aosd_cb_list.append( colorbt , aosd_cb_configure_decoration_color_commit );
 }
- gtk_box_pack_start( GTK_BOX(dec_rstyle_hbox) , dec_rstyleopts_frame , FALSE , FALSE , 0 );
+ gtk_box_pack_start( GTK_BOX(dec_rstyle_vbox) , dec_rstyleopts_frame , false , false , 0 );
 
 return dec_hbox;
 }
@@ -537,7 +645,7 @@
 GtkTreeModel *model;
 GtkTreeIter iter;
 
- if ( gtk_tree_selection_get_selected( sel , &model , &iter ) == TRUE )
+ if ( gtk_tree_selection_get_selected( sel , &model , &iter ) == true )
 {
 int page_num = 0;
 gtk_tree_model_get( model , &iter , 2 , &page_num , -1 );
@@ -549,7 +657,7 @@
 static void
 aosd_cb_configure_trigger_commit ( GtkWidget * cbt , aosd_cfg_t * cfg )
 {
- if ( gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON(cbt) ) == TRUE )
+ if ( gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON(cbt) ) == true )
 {
 int value = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(cbt),"code"));
 cfg->trigger.enabledvalue = true;
@@ -572,10 +680,10 @@
 
 tri_event_nb = gtk_notebook_new();
 gtk_notebook_set_tab_pos( GTK_NOTEBOOK(tri_event_nb) , GTK_POS_LEFT );
- gtk_notebook_set_show_tabs( GTK_NOTEBOOK(tri_event_nb) , FALSE );
- gtk_notebook_set_show_border( GTK_NOTEBOOK(tri_event_nb) , FALSE );
+ gtk_notebook_set_show_tabs( GTK_NOTEBOOK(tri_event_nb) , false );
+ gtk_notebook_set_show_border( GTK_NOTEBOOK(tri_event_nb) , false );
 
- tri_hbox = gtk_box_new( GTK_ORIENTATION_HORIZONTAL , 4 );
+ tri_hbox = audgui_hbox_new( 4 );
 gtk_container_set_border_width( GTK_CONTAINER(tri_hbox) , 6 );
 
 /* trigger model
@@ -593,20 +701,24 @@
 gtk_list_store_set( tri_event_store , &iter ,
 0 , _(aosd_trigger_get_name( i )) ,
 1 , i , 2 , i , -1 );
- vbox = gtk_box_new( GTK_ORIENTATION_VERTICAL , 0 );
+ vbox = audgui_vbox_new( 0 );
 gtk_container_set_border_width( GTK_CONTAINER(vbox) , 6 );
 label = gtk_label_new( _(aosd_trigger_get_desc( i )) );
- gtk_label_set_line_wrap( GTK_LABEL(label) , TRUE );
+ gtk_label_set_line_wrap( GTK_LABEL(label) , true );
 gtk_label_set_max_width_chars( GTK_LABEL(label), 40 );
+#ifdef USE_GTK3
 gtk_widget_set_halign( label , GTK_ALIGN_START );
+#else
+ gtk_misc_set_alignment( GTK_MISC(label) , 0.0 , 0.0 );
+#endif
 checkbt = gtk_check_button_new_with_label( _("Enable trigger") );
 if ( cfg->trigger.enabledi )
- gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON(checkbt) , TRUE );
+ gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON(checkbt) , true );
 else
- gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON(checkbt) , FALSE );
- gtk_box_pack_start( GTK_BOX(vbox) , checkbt , FALSE , FALSE , 0 );
- gtk_box_pack_start( GTK_BOX(vbox) , gtk_separator_new(GTK_ORIENTATION_HORIZONTAL) , FALSE , FALSE , 4 );
- gtk_box_pack_start( GTK_BOX(vbox) , label , FALSE , FALSE , 0 );
+ gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON(checkbt) , false );
+ gtk_box_pack_start( GTK_BOX(vbox) , checkbt , false , false , 0 );
+ gtk_box_pack_start( GTK_BOX(vbox) , audgui_separator_new( GTK_ORIENTATION_HORIZONTAL ) , false , false , 4 );
+ gtk_box_pack_start( GTK_BOX(vbox) , label , false , false , 0 );
 frame = gtk_frame_new( nullptr );
 gtk_container_add( GTK_CONTAINER(frame) , vbox );
 gtk_notebook_append_page( GTK_NOTEBOOK(tri_event_nb) , frame , nullptr );
@@ -621,7 +733,7 @@
 gtk_tree_selection_set_mode( tri_event_lv_sel , GTK_SELECTION_BROWSE );
 g_signal_connect( G_OBJECT(tri_event_lv_sel) , "changed" ,
 G_CALLBACK(aosd_cb_configure_trigger_lvchanged) , tri_event_nb );
- if ( gtk_tree_model_get_iter_first( GTK_TREE_MODEL(tri_event_store) , &iter ) == TRUE )
+ if ( gtk_tree_model_get_iter_first( GTK_TREE_MODEL(tri_event_store) , &iter ) == true )
 gtk_tree_selection_select_iter( tri_event_lv_sel , &iter );
 
 tri_event_lv_rndr_text = gtk_cell_renderer_text_new();
@@ -635,15 +747,14 @@
 gtk_container_add( GTK_CONTAINER(tri_event_lv_frame) , tri_event_lv_sw );
 gtk_tree_selection_select_iter( tri_event_lv_sel , &iter );
 
- gtk_box_pack_start( GTK_BOX(tri_hbox) , tri_event_lv_frame , FALSE , FALSE , 0 );
+ gtk_box_pack_start( GTK_BOX(tri_hbox) , tri_event_lv_frame , false , false , 0 );
 
- gtk_box_pack_start( GTK_BOX(tri_hbox) , tri_event_nb , TRUE , TRUE , 0 );
+ gtk_box_pack_start( GTK_BOX(tri_hbox) , tri_event_nb , true , true , 0 );
 
 return tri_hbox;
 }
 
 
-#ifdef HAVE_XCOMPOSITE
 static void
 aosd_cb_configure_misc_transp_real_clicked ( GtkToggleButton * real_rbt , void * status_hbox )
 {
@@ -655,7 +766,7 @@
 {
 gtk_image_set_from_icon_name( GTK_IMAGE(img) , "face-smile" , GTK_ICON_SIZE_MENU );
 gtk_label_set_text( GTK_LABEL(label) , _("Composite manager detected") );
- gtk_widget_set_sensitive( GTK_WIDGET(status_hbox) , TRUE );
+ gtk_widget_set_sensitive( GTK_WIDGET(status_hbox) , true );
 }
 else
 {
@@ -663,32 +774,33 @@
 gtk_label_set_text( GTK_LABEL(label) ,
 _("Composite manager not detected;\nunless you know that you have one running, "
 "please activate a composite manager otherwise the OSD won't work properly") );
- gtk_widget_set_sensitive( GTK_WIDGET(status_hbox) , TRUE );
+ gtk_widget_set_sensitive( GTK_WIDGET(status_hbox) , true );
 }
 }
 else
 {
 gtk_image_set_from_icon_name( GTK_IMAGE(img) , "dialog-information" , GTK_ICON_SIZE_MENU );
 gtk_label_set_text( GTK_LABEL(label) , _("Composite manager not required for fake transparency") );
- gtk_widget_set_sensitive( GTK_WIDGET(status_hbox) , FALSE );
+ gtk_widget_set_sensitive( GTK_WIDGET(status_hbox) , false );
 }
 }
-#endif
 
 
 static void
 aosd_cb_configure_misc_transp_commit ( GtkWidget * mis_transp_vbox , aosd_cfg_t * cfg )
 {
 GList *child_list = gtk_container_get_children( GTK_CONTAINER(mis_transp_vbox) );
- while (child_list != nullptr)
+
+ for ( GList *iter = child_list; iter != nullptr; iter = iter->next )
 {
- if ( gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON(child_list->data) ) )
+ if ( gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON(iter->data) ) )
 {
- cfg->misc.transparency_mode = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(child_list->data),"val"));
+ cfg->misc.transparency_mode = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(iter->data), "val"));
 break;
 }
- child_list = g_list_next(child_list);
 }
+
+ g_list_free( child_list );
 }
 
 
@@ -701,14 +813,14 @@
 GtkWidget *mis_transp_status_frame, *mis_transp_status_hbox;
 GtkWidget *mis_transp_status_img, *mis_transp_status_label;
 
- mis_vbox = gtk_box_new( GTK_ORIENTATION_VERTICAL , 0 );
+ mis_vbox = audgui_vbox_new( 0 );
 gtk_container_set_border_width( GTK_CONTAINER(mis_vbox) , 6 );
 
- mis_transp_vbox = gtk_box_new( GTK_ORIENTATION_VERTICAL , 0 );
+ mis_transp_vbox = audgui_vbox_new( 0 );
 mis_transp_frame = gtk_frame_new( _("Transparency") );
 gtk_container_set_border_width( GTK_CONTAINER(mis_transp_vbox) , 6 );
 gtk_container_add( GTK_CONTAINER(mis_transp_frame) , mis_transp_vbox );
- gtk_box_pack_start( GTK_BOX(mis_vbox) , mis_transp_frame , FALSE , FALSE , 0 );
+ gtk_box_pack_start( GTK_BOX(mis_vbox) , mis_transp_frame , false , false , 0 );
 
 mis_transp_fake_rbt = gtk_radio_button_new_with_label( nullptr ,
 _("Fake transparency") );
@@ -718,25 +830,31 @@
 GINT_TO_POINTER(AOSD_MISC_TRANSPARENCY_FAKE) );
 g_object_set_data( G_OBJECT(mis_transp_real_rbt) , "val" ,
 GINT_TO_POINTER(AOSD_MISC_TRANSPARENCY_REAL) );
- gtk_box_pack_start( GTK_BOX(mis_transp_vbox) , mis_transp_fake_rbt , TRUE , TRUE , 0 );
- gtk_box_pack_start( GTK_BOX(mis_transp_vbox) , mis_transp_real_rbt , TRUE , TRUE , 0 );
+ gtk_box_pack_start( GTK_BOX(mis_transp_vbox) , mis_transp_fake_rbt , true , true , 0 );
+ gtk_box_pack_start( GTK_BOX(mis_transp_vbox) , mis_transp_real_rbt , true , true , 0 );
 
- mis_transp_status_hbox = gtk_box_new( GTK_ORIENTATION_HORIZONTAL , 4 );
+ mis_transp_status_hbox = audgui_hbox_new( 4 );
 mis_transp_status_frame = gtk_frame_new( nullptr );
 gtk_container_set_border_width( GTK_CONTAINER(mis_transp_status_hbox) , 3 );
 gtk_container_add( GTK_CONTAINER(mis_transp_status_frame) , mis_transp_status_hbox );
- gtk_box_pack_start( GTK_BOX(mis_transp_vbox) , mis_transp_status_frame , TRUE , TRUE , 0 );
+ gtk_box_pack_start( GTK_BOX(mis_transp_vbox) , mis_transp_status_frame , true , true , 0 );
 
 mis_transp_status_img = gtk_image_new();
 mis_transp_status_label = gtk_label_new( "" );
+
+#ifdef USE_GTK3
 gtk_widget_set_halign( mis_transp_status_label , GTK_ALIGN_START );
- gtk_label_set_line_wrap( GTK_LABEL(mis_transp_status_label) , TRUE );
- gtk_box_pack_start( GTK_BOX(mis_transp_status_hbox) , mis_transp_status_img , FALSE , FALSE , 0 );
- gtk_box_pack_start( GTK_BOX(mis_transp_status_hbox) , mis_transp_status_label , TRUE , TRUE , 0 );
+#else
+ gtk_misc_set_alignment( GTK_MISC(mis_transp_status_img) , 0.5 , 0 );
+ gtk_misc_set_alignment( GTK_MISC(mis_transp_status_label) , 0 , 0.5 );
+#endif
+
+ gtk_label_set_line_wrap( GTK_LABEL(mis_transp_status_label) , true );
+ gtk_box_pack_start( GTK_BOX(mis_transp_status_hbox) , mis_transp_status_img , false , false , 0 );
+ gtk_box_pack_start( GTK_BOX(mis_transp_status_hbox) , mis_transp_status_label , true , true , 0 );
 g_object_set_data( G_OBJECT(mis_transp_status_hbox) , "img" , mis_transp_status_img );
 g_object_set_data( G_OBJECT(mis_transp_status_hbox) , "label" , mis_transp_status_label );
 
-#ifdef HAVE_XCOMPOSITE
 g_signal_connect( G_OBJECT(mis_transp_real_rbt) , "toggled" ,
 G_CALLBACK(aosd_cb_configure_misc_transp_real_clicked) , mis_transp_status_hbox );
 
@@ -744,27 +862,19 @@
 if ( aosd_osd_check_composite_ext() )
 {
 if ( cfg->misc.transparency_mode == AOSD_MISC_TRANSPARENCY_FAKE )
- gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON(mis_transp_fake_rbt) , TRUE );
+ gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON(mis_transp_fake_rbt) , true );
 else
- gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON(mis_transp_real_rbt) , TRUE );
+ gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON(mis_transp_real_rbt) , true );
 }
 else
 {
- gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON(mis_transp_fake_rbt) , TRUE );
- gtk_widget_set_sensitive( GTK_WIDGET(mis_transp_real_rbt) , FALSE );
+ gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON(mis_transp_fake_rbt) , true );
+ gtk_widget_set_sensitive( GTK_WIDGET(mis_transp_real_rbt) , false );
 gtk_image_set_from_icon_name( GTK_IMAGE(mis_transp_status_img) ,
 "dialog-error" , GTK_ICON_SIZE_MENU );
 gtk_label_set_text( GTK_LABEL(mis_transp_status_label) , _("Composite extension not loaded") );
- gtk_widget_set_sensitive( GTK_WIDGET(mis_transp_status_hbox) , FALSE );
+ gtk_widget_set_sensitive( GTK_WIDGET(mis_transp_status_hbox) , false );
 }
-#else
- gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON(mis_transp_fake_rbt) , TRUE );
- gtk_widget_set_sensitive( GTK_WIDGET(mis_transp_real_rbt) , FALSE );
- gtk_image_set_from_icon_name( GTK_IMAGE(mis_transp_status_img) ,
- "dialog-error" , GTK_ICON_SIZE_MENU );
- gtk_label_set_text( GTK_LABEL(mis_transp_status_label) , _("Composite extension not available") );
- gtk_widget_set_sensitive( GTK_WIDGET(mis_transp_status_hbox) , FALSE );
-#endif
 
 aosd_cb_list.append( mis_transp_vbox , aosd_cb_configure_misc_transp_commit );

audacious-plugins-3.6.2-gtk3.tar.bz2/src/aosd/ghosd.c -> audacious-plugins-4.4.1.tar.bz2/src/aosd/ghosd.c Changed

audacious-plugins-3.6.2-gtk3.tar.bz2/src/aosd/ghosd.h -> audacious-plugins-4.4.1.tar.bz2/src/aosd/ghosd.h Changed

audacious-plugins-4.4.1.tar.bz2/src/aosd/meson.build Added

audacious-plugins-4.4.1.tar.bz2/src/asx/meson.build Added

audacious-plugins-4.4.1.tar.bz2/src/asx3/meson.build Added

audacious-plugins-3.6.2-gtk3.tar.bz2/src/audpl/audpl.cc -> audacious-plugins-4.4.1.tar.bz2/src/audpl/audpl.cc Changed

@@ -1,6 +1,6 @@
 /*
 * Audacious playlist format plugin
- * Copyright 2011 John Lindgren
+ * Copyright 2011-2016 John Lindgren
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions are met:
@@ -20,10 +20,10 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <libaudcore/i18n.h>
-#include <libaudcore/plugin.h>
 #include <libaudcore/audstrings.h>
+#include <libaudcore/i18n.h>
 #include <libaudcore/inifile.h>
+#include <libaudcore/plugin.h>
 
 static const char * const audpl_exts = {"audpl"};
 
@@ -65,7 +65,12 @@
 Tuple tuple;
 
 void finish_item ()
- { items.append (std::move (uri), std::move (tuple)); }
+ {
+ if (tuple.valid ())
+ tuple.set_filename (uri);
+
+ items.append (std::move (uri), std::move (tuple));
+ }
 
 /* no headings */
 void handle_heading (const char * heading) {}
@@ -83,21 +88,30 @@
 }
 else if (uri)
 {
- /* item field */
- if (! tuple)
- tuple.set_filename (uri);
-
- if (strcmp (key, "empty"))
+ if (! strcmp (key, "state"))
 {
+ /* item state */
+ if (! strcmp (value, "good"))
+ tuple.set_state (Tuple::Valid);
+ else if (! strcmp (value, "failed"))
+ tuple.set_state (Tuple::Failed);
+ }
+ else
+ {
+ /* item field */
 auto field = Tuple::field_by_name (key);
 if (field == Tuple::Invalid)
 return;
 
 auto type = Tuple::field_get_type (field);
 if (type == Tuple::String)
- tuple.set_str (field, str_decode_percent (value));
+ tuple.set_str (field, (field == Tuple::AudioFile) ? value :
+ str_decode_percent (value));
 else if (type == Tuple::Int)
 tuple.set_int (field, atoi (value));
+
+ /* state is implicitly Valid if any field is present */
+ tuple.set_state (Tuple::Valid);
 }
 }
 else
@@ -127,12 +141,15 @@
 if (! inifile_write_entry (file, "uri", item.filename))
 return false;
 
- const Tuple & tuple = item.tuple;
+ int keys = 0;
 
- if (tuple)
+ switch (item.tuple.state ())
 {
- int keys = 0;
+ case Tuple::Initial:
+ /* state is implicitly Initial if no fields are present */
+ break;
 
+ case Tuple::Valid:
 for (auto f : Tuple::all_fields ())
 {
 if (f == Tuple::Path || f == Tuple::Basename ||
@@ -140,19 +157,20 @@
 continue;
 
 const char * key = Tuple::field_get_name (f);
- Tuple::ValueType type = tuple.get_value_type (f);
+ Tuple::ValueType type = item.tuple.get_value_type (f);
 
 if (type == Tuple::String)
 {
- String str = tuple.get_str (f);
- if (! inifile_write_entry (file, key, str_encode_percent (str)))
+ String str = item.tuple.get_str (f);
+ if (! inifile_write_entry (file, key,
+ (f == Tuple::AudioFile) ? str : str_encode_percent (str)))
 return false;
 
 keys ++;
 }
 else if (type == Tuple::Int)
 {
- int val = tuple.get_int (f);
+ int val = item.tuple.get_int (f);
 if (! inifile_write_entry (file, key, int_to_str (val)))
 return false;
 
@@ -160,9 +178,17 @@
 }
 }
 
- /* distinguish between an empty tuple and no tuple at all */
- if (! keys && ! inifile_write_entry (file, "empty", "1"))
+ /* for an actual empty tuple, record state explicity */
+ if (! keys && ! inifile_write_entry (file, "state", "good"))
 return false;
+
+ break;
+
+ case Tuple::Failed:
+ if (! inifile_write_entry (file, "state", "failed"))
+ return false;
+
+ break;
 }
 }

audacious-plugins-4.4.1.tar.bz2/src/audpl/meson.build Added

audacious-plugins-4.4.1.tar.bz2/src/background_music Added

audacious-plugins-4.4.1.tar.bz2/src/background_music/FrameBasedEffectPlugin.h Added

@@ -0,0 +1,115 @@
+#ifndef AUDACIOUS_PLUGINS_BGM_FRAMEBASEDEFFECTPLUGIN_H
+#define AUDACIOUS_PLUGINS_BGM_FRAMEBASEDEFFECTPLUGIN_H
+/*
+ * Background music (equal loudness) Plugin for Audacious
+ * Copyright 2023 Michel Fleur
+ *
+ * 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 "LoudnessFrameProcessor.h"
+#include <libaudcore/plugin.h>
+
+class FrameBasedEffectPlugin : public EffectPlugin
+{
+ Index<float> frame_in;
+ Index<float> frame_out;
+ Index<float> output;
+ int current_channels = 0, current_rate = 0, channel_last_read = 0;
+ LoudnessFrameProcessor detection;
+
+public:
+ FrameBasedEffectPlugin(const PluginInfo & info, int order)
+ : EffectPlugin(info, order, true)
+ {
+ }
+
+ virtual ~FrameBasedEffectPlugin() = default;
+
+ bool init() final
+ {
+ detection.init();
+ return true;
+ }
+
+ void cleanup() final
+ {
+ output.clear();
+ frame_in.clear();
+ frame_out.clear();
+ }
+
+ void start(int & channels, int & rate) final
+ {
+ current_channels = channels;
+ current_rate = rate;
+ channel_last_read = 0;
+
+ detection.start(channels, rate);
+ frame_in.resize(current_channels);
+ frame_out.resize(current_channels);
+
+ flush(false);
+ }
+
+ Index<float> & process(Index<float> & data) final
+ {
+ detection.update_config();
+
+ int output_samples = 0;
+ output.resize(0);
+
+ // It is assumed data always contains a multiple of channels, but we
+ // don't care.
+ for (const float sample : data)
+ {
+ frame_inchannel_last_read++ = sample;
+ if (channel_last_read == current_channels)
+ {
+ // Processing happens per frame. Because of read-ahead there is
+ // not always output available yet.
+ if (detection.process_has_output(frame_in, frame_out))
+ {
+ output.move_from(frame_out, 0, output_samples,
+ current_channels, true, false);
+ output_samples += current_channels;
+ }
+ channel_last_read = 0;
+ }
+ }
+
+ return output;
+ }
+
+ bool flush(bool force) final
+ {
+ detection.flush();
+ return true;
+ }
+
+ Index<float> & finish(Index<float> & data, bool end_of_playlist) final
+ {
+ return process(data);
+ }
+
+ int adjust_delay(int delay) final
+ {
+ auto result =
+ aud::rescale<int64_t>(detection.latency(), current_rate, 1000);
+ result += delay;
+ return static_cast<int>(result);
+ }
+};
+
+#endif // AUDACIOUS_PLUGINS_BGM_FRAMEBASEDEFFECTPLUGIN_H

audacious-plugins-4.4.1.tar.bz2/src/background_music/Integrator.h Added

@@ -0,0 +1,165 @@
+#ifndef AUDACIOUS_PLUGINS_BGM_INTEGRATOR_H
+#define AUDACIOUS_PLUGINS_BGM_INTEGRATOR_H
+/*
+ * Background music (equal loudness) Plugin for Audacious
+ * Copyright 2023 Michel Fleur
+ *
+ * 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 <algorithm>
+#include <cmath>
+#include <type_traits>
+
+/**
+ * Implements a classic RC-filter using an recursive filter with one input and
+ * one feedback coefficient.
+ * The impulse response of the filter is a decaying exponent that will reach
+ * \em 1/e of its original value after the number of "characteristic" samples.
+ * Characteristic samples larger than about 400M may yield inaccurate results
+ * due to repeated calculations and floating point precision.
+ */
+class IntegratorCoefficients
+{
+ /*
+ * The constructed defaults constitute an integrator that has zero
+ * characteristic samples, meaning it just echoes the input.
+ */
+ double history_multiplier_ = 0;
+ double input_multiplier_ = 1;
+
+public:
+ constexpr IntegratorCoefficients() = default;
+
+ void set_samples(const double characteristic_samples,
+ const double scale = 1.0)
+ {
+ const double count = fabs(characteristic_samples);
+ history_multiplier_ = count > 0 ? exp(-1.0 / count) : 0.0;
+ set_scale(scale);
+ }
+
+ void set_seconds_for_rate(const double seconds, const int rate,
+ const double scale = 1.0)
+ {
+ set_samples(seconds * static_cast<double>(rate), scale);
+ }
+
+ void set_scale(const double scale)
+ {
+ input_multiplier_ = fabs(scale) * (1.0 - history_multiplier_);
+ }
+
+ /**
+ * Integrates value input using history as integrated value.
+ * @param history The historic integrated value
+ * @param input The new input
+ */
+ void integrate(double & history, const double input) const
+ {
+ history = history_multiplier_ * history + input_multiplier_ * input;
+ }
+};
+
+class Integrator : public IntegratorCoefficients
+{
+ double integrated_ = 0;
+
+public:
+ double integrate(const double input)
+ {
+ IntegratorCoefficients::integrate(integrated_, input);
+ return integrated_;
+ }
+
+ template<typename T>
+ T integrate(const T input)
+ {
+ return static_cast<T>(integrate(static_cast<double>(input)));
+ }
+
+ void set_output(const double new_value) { integrated_ = new_value; }
+};
+
+/**
+ * Implements an envelope function that follows rises in input - attack -
+ * immediately and on input that is lower than the current output, optionally
+ * the value for a number of samples and then smoothly integrates towards the
+ * lower input value using a double integrator.
+ */
+class FastAttackSmoothRelease
+{
+ IntegratorCoefficients coefficients_;
+ double integrated_1 = 0;
+ double integrated_2 = 0;
+ int hold_samples_ = 0;
+ int hold_count_ = 0;
+
+public:
+ /**
+ * Applying double integration, to be really smooth, effectively increases
+ * the number of characteristic samples in the impulse response of the
+ * output. This factor compensates for that.
+ */
+ static constexpr double CHARACTERISTIC_SAMPLE_CORRECTION = 0.465941272863;
+
+ void set_samples(const double samples, int hold_samples)
+ {
+ coefficients_.set_samples(samples * CHARACTERISTIC_SAMPLE_CORRECTION,
+ 1.0);
+ hold_samples_ = std::max(0, hold_samples);
+ }
+
+ void set_seconds_for_rate(const double seconds, const int rate,
+ int hold_samples)
+ {
+ coefficients_.set_seconds_for_rate(
+ seconds * CHARACTERISTIC_SAMPLE_CORRECTION, rate, 1.0);
+ hold_samples_ = std::max(0, hold_samples);
+ }
+
+ void set_output(const double output)
+ {
+ integrated_2 = output;
+ integrated_1 = output;
+ hold_count_ = hold_samples_;
+ }
+
+ double get_envelope(double signal)
+ {
+ if (signal > integrated_2)
+ {
+ set_output(signal);
+ }
+ else if (hold_count_)
+ {
+ hold_count_--;
+ }
+ else
+ {
+ coefficients_.integrate(integrated_1, signal);
+ coefficients_.integrate(integrated_2, integrated_1);
+ }
+ return integrated_2;
+ }
+
+ template<typename T>
+ T get_envelope(const T signal)
+ {
+ return static_cast<T>(get_envelope(static_cast<double>(signal)));
+ }
+};
+
+#endif // AUDACIOUS_PLUGINS_BGM_INTEGRATOR_H

audacious-plugins-4.4.1.tar.bz2/src/background_music/Loudness.h Added

@@ -0,0 +1,194 @@
+#ifndef AUDACIOUS_PLUGINS_BGM_LOUDNESS_H
+#define AUDACIOUS_PLUGINS_BGM_LOUDNESS_H
+/*
+ * Background music (equal loudness) Plugin for Audacious
+ * Copyright 2023 Michel Fleur
+ *
+ * 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 "Integrator.h"
+#include <algorithm>
+#include <cmath>
+#include <cstdint>
+#include <libaudcore/ringbuf.h>
+
+/**
+ * Tools to detect perceived loudness.
+ */
+struct Loudness
+{
+ static constexpr float perception_center_seconds = 0.400;
+ static constexpr float perception_fast_seconds = 0.001;
+ static constexpr float perception_peak_seconds = 0.00001;
+ static constexpr float perception_weight_power = 0.25;
+ static constexpr float max_prediction = 0.03;
+ static constexpr float window_percentage = 1.0;
+
+ struct Metrics
+ {
+ int window_samples = 1;
+ int latency_samples = 0;
+ float weight = 0;
+ };
+
+ static constexpr float get_weight(const float seconds)
+ {
+ const float relative = aud::clamp(seconds, perception_peak_seconds,
+ perception_center_seconds) /
+ perception_center_seconds;
+ return powf(relative, perception_weight_power);
+ }
+
+ static int get_samples(const float seconds, const int rate)
+ {
+ return std::max(
+ 1, static_cast<int>(roundf(seconds * static_cast<float>(rate))));
+ }
+
+ static Metrics get_metrics(const int step, const int of, const int rate)
+ {
+ static constexpr float peak_perception_ratio =
+ perception_fast_seconds / perception_center_seconds;
+
+ const float log_ratio =
+ of > 0 ? static_cast<float>(aud::clamp(step, 0, of)) /
+ static_cast<float>(of)
+ : 1.0f;
+ const float seconds =
+ perception_center_seconds * powf(peak_perception_ratio, log_ratio);
+
+ const float latency =
+ std::min(seconds * window_percentage, max_prediction);
+
+ return {get_samples(seconds, rate), get_samples(latency, rate),
+ get_weight(seconds)};
+ }
+};
+
+class PerceptiveRMS
+{
+ static constexpr int STEPS = 24;
+ static constexpr float INPUT_SCALE = 4e9f;
+ static constexpr float OUTPUT_SCALE = 1.0f / INPUT_SCALE;
+
+ class WindowedRMS
+ {
+ uint64_t window_sum_ = 0;
+ int window_size_ = 0;
+ int latency_minus_one = 0;
+ float scale_ = 0.0;
+ float output_ = 0.0;
+
+ public:
+
+ float add_and_take_and_get(uint64_t add, uint64_t take)
+ {
+ window_sum_ += add;
+ window_sum_ -= take;
+ const auto sum = static_cast<float>(window_sum_);
+ output_ = scale_ * sum;
+ return output_;
+ }
+
+ void configure(const Loudness::Metrics & metrics)
+ {
+ window_size_ = metrics.window_samples;
+ latency_minus_one = std::max(0, metrics.latency_samples - 1);
+ scale_ = metrics.weight * metrics.weight /
+ static_cast<float>(window_size_);
+ window_sum_ = 0;
+ output_ = 0;
+ }
+
+ nodiscard int delayed_sample_index() const
+ {
+ return latency_minus_one;
+ }
+ };
+
+ RingBuf<uint64_t> buffer_;
+ WindowedRMS rms_STEPS + 1;
+ int sample_rate_ = 0;
+ int latency_ = 0;
+ FastAttackSmoothRelease smooth_release_;
+ const float peak_weight_ = Loudness::get_weight(0.0);
+
+ void init_detection()
+ {
+ const auto max_metrics = Loudness::get_metrics(0, STEPS, sample_rate_);
+ latency_ = max_metrics.latency_samples;
+ smooth_release_.set_samples(max_metrics.window_samples,
+ max_metrics.window_samples);
+
+ for (int step = 0; step <= STEPS; step++)
+ {
+ rms_step.configure(
+ Loudness::get_metrics(step, STEPS, sample_rate_));
+ }
+ }
+
+ nodiscard uint64_t static squared_value_to_internal_value(
+ const float squared_value)
+ {
+ return static_cast<uint64_t>(
+ fabsf(std::round(squared_value * INPUT_SCALE)));
+ }
+
+public:
+ void set_rate_and_value(int sample_rate, float squared_initial_value)
+ {
+ if (sample_rate_ == sample_rate)
+ {
+ return;
+ }
+ sample_rate_ = sample_rate;
+ init_detection();
+ buffer_.discard();
+ buffer_.alloc(latency_);
+ buffer_.fill_with(0);
+
+ for (int i = 0; i <= latency_; i++)
+ {
+ get_mean_squared(squared_initial_value);
+ }
+ }
+
+ nodiscard int latency() const { return latency_; }
+
+ float get_mean_squared(const float squared_input)
+ {
+ const uint64_t internal_value =
+ squared_value_to_internal_value(squared_input);
+ const uint64_t oldest = buffer_.pop();
+ buffer_.push(internal_value);
+
+ float max = rms_0.add_and_take_and_get(internal_value, oldest);
+ max = std::max(max, static_cast<float>(internal_value) * peak_weight_);
+
+ for (int step = 1; step <= STEPS; step++)
+ {
+ WindowedRMS & rms = rms_step;
+ const auto delayed_input =
+ buffer_.nth_from_last(rms.delayed_sample_index());
+ const auto step_value =
+ rms.add_and_take_and_get(internal_value, delayed_input);
+ max = std::max(max, step_value);
+ }
+ max *= OUTPUT_SCALE;
+ return smooth_release_.get_envelope(max);
+ }
+};
+
+#endif // AUDACIOUS_PLUGINS_BGM_LOUDNESS_H

audacious-plugins-4.4.1.tar.bz2/src/background_music/LoudnessFrameProcessor.h Added

@@ -0,0 +1,184 @@
+#ifndef AUDACIOUS_PLUGINS_BGM_LOUDNESS_FRAME_PROCESSOR_H
+#define AUDACIOUS_PLUGINS_BGM_LOUDNESS_FRAME_PROCESSOR_H
+/*
+ * Background music (equal loudness) Plugin for Audacious
+ * Copyright 2023 Michel Fleur
+ *
+ * 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 "Integrator.h"
+#include "Loudness.h"
+#include "basic_config.h"
+#include <cmath>
+#include <libaudcore/runtime.h>
+
+class LoudnessFrameProcessor
+{
+ static constexpr float SHORT_INTEGRATION = 0.4;
+ static constexpr float LONG_INTEGRATION = 6.3;
+ /*
+ * This adjusts the slow RMS measurement so that it's displayed correctly
+ * in the audacious VU meter. This only helps for expectation management.
+ */
+ static constexpr float SLOW_VU_FUDGE_FACTOR = 2.0f;
+ static constexpr float FAST_VU_FUDGE_FACTOR = 3.0f;
+
+ FastAttackSmoothRelease release_integration;
+ Integrator long_integration;
+ PerceptiveRMS perceivedLoudness;
+ float slow_weight = 0;
+ float target_level = 0.1;
+ float maximum_amplification = 1;
+ float perception_slow_balance = 0.3;
+ float minimum_detection = 1e-6;
+ RingBuf<float> read_ahead_buffer;
+ int channels_ = 0;
+ int processed_frames = 0;
+
+ static float get_clamped_value(const char * variable, const double minimum,
+ const double maximum)
+ {
+ return static_cast<float>(aud::clamp(
+ aud_get_double(CONFIG_SECTION_BACKGROUND_MUSIC, variable),
+ minimum, maximum));
+ }
+
+ static float get_clamped_decibel_value(const char * variable,
+ const double minimum,
+ const double maximum)
+ {
+ const float decibels = get_clamped_value(variable, minimum, maximum);
+ return powf(10.0f, 0.05f * decibels);
+ }
+
+public:
+ nodiscard int latency() const { return perceivedLoudness.latency(); }
+
+ LoudnessFrameProcessor()
+ {
+ aud_config_set_defaults(CONFIG_SECTION_BACKGROUND_MUSIC,
+ background_music_defaults);
+ }
+
+ void init()
+ {
+ update_config();
+ long_integration.set_output(0);
+ release_integration.set_output(target_level * target_level);
+ minimum_detection = target_level / maximum_amplification;
+ }
+
+ void start(const int channels, int rate)
+ {
+ update_config();
+ channels_ = channels;
+ processed_frames = 0;
+ release_integration.set_seconds_for_rate(SHORT_INTEGRATION, rate, 0);
+ long_integration.set_seconds_for_rate(LONG_INTEGRATION / 2.0, rate,
+ slow_weight);
+ /*
+ * This RMS (Root-mean-square) calculation integrates squared samples
+ * with the RC-style integrator and then draws the square root. This has
+ * the effect that rises in averages are tracked twice as fast while
+ * decreases are tracked twice as slow. As the decrease is what "counts"
+ * for the effective time the signal climbs back up after a peak, we
+ * must therefore half the integration time.
+ */
+ perceivedLoudness.set_rate_and_value(rate, target_level);
+ const int alloc_size = channels_ * latency();
+
+ if (read_ahead_buffer.size() < alloc_size)
+ {
+ read_ahead_buffer.alloc(alloc_size);
+ }
+ }
+
+ void update_config()
+ {
+ target_level = get_clamped_decibel_value(CONF_TARGET_LEVEL_VARIABLE,
+ CONF_TARGET_LEVEL_MIN,
+ CONF_TARGET_LEVEL_MAX);
+ maximum_amplification = get_clamped_decibel_value(
+ CONF_MAX_AMPLIFICATION_VARIABLE, CONF_MAX_AMPLIFICATION_MIN,
+ CONF_MAX_AMPLIFICATION_MAX);
+ perception_slow_balance = get_clamped_value(
+ CONF_SLOW_WEIGHT_VARIABLE, CONF_SLOW_WEIGHT_MIN,
+ CONF_SLOW_WEIGHT_MAX);
+ minimum_detection = target_level / maximum_amplification;
+ slow_weight = 2.0f * perception_slow_balance * SLOW_VU_FUDGE_FACTOR;
+ slow_weight *= slow_weight;
+ long_integration.set_scale(slow_weight);
+ }
+
+ bool process_has_output(const Index<float> & frame_in,
+ Index<float> & frame_out)
+ {
+ bool has_output_data = processed_frames >= latency();
+ if (has_output_data)
+ {
+ read_ahead_buffer.move_out(frame_out.begin(), channels_);
+ }
+ else
+ {
+ processed_frames++;
+ }
+ read_ahead_buffer.copy_in(frame_in.begin(), channels_);
+
+ /*
+ * Following calculations need to happen to anticipate the (future)
+ * output.
+ */
+
+ float square_sum = 0.0;
+ float square_max = 0.0;
+ for (const float sample : frame_in)
+ {
+ const float square = sample * sample;
+ square_max = std::max(square_max, square);
+ square_sum += square;
+ }
+ square_sum /= static_cast<float>(channels_);
+ square_sum += square_max;
+ const float perceived = FAST_VU_FUDGE_FACTOR *
+ perceivedLoudness.get_mean_squared(square_sum);
+ const double weighted =
+ std::max(long_integration.integrate(square_sum), perceived);
+
+ const double rms = sqrt(weighted);
+
+ const float gain =
+ target_level /
+ std::max(minimum_detection,
+ static_cast<float>(release_integration.get_envelope(rms)));
+
+ if (has_output_data)
+ {
+ for (float & sample : frame_out)
+ {
+ sample *= gain;
+ }
+ }
+
+ return has_output_data;
+ }
+
+ void flush()
+ {
+ processed_frames = 0;
+ read_ahead_buffer.discard();
+ }
+};
+
+#endif // AUDACIOUS_PLUGINS_BGM_LOUDNESS_FRAME_PROCESSOR_H

audacious-plugins-4.4.1.tar.bz2/src/background_music/Makefile Added

audacious-plugins-4.4.1.tar.bz2/src/background_music/background_music.cc Added

@@ -0,0 +1,63 @@
+/*
+ * Background music (equal loudness) Plugin for Audacious
+ * Copyright 2023 Michel Fleur
+ *
+ * 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 "FrameBasedEffectPlugin.h"
+#include <libaudcore/i18n.h>
+#include <libaudcore/preferences.h>
+
+static constexpr const PreferencesWidget background_music_widgets = {
+ WidgetLabel(N_("Background music")),
+ WidgetSpin(N_("Target level:"),
+ WidgetFloat(CONFIG_SECTION_BACKGROUND_MUSIC,
+ CONF_TARGET_LEVEL_VARIABLE),
+ {CONF_TARGET_LEVEL_MIN, CONF_TARGET_LEVEL_MAX, 1.0, N_("dB")}),
+ WidgetSpin(N_("Maximum amplification:"),
+ WidgetFloat(CONFIG_SECTION_BACKGROUND_MUSIC,
+ CONF_MAX_AMPLIFICATION_VARIABLE),
+ {CONF_MAX_AMPLIFICATION_MIN, CONF_MAX_AMPLIFICATION_MAX, 1.0,
+ N_("dB")}),
+ WidgetLabel(N_("Advanced")),
+ WidgetSpin(
+ N_("Slow detection weight:"),
+ WidgetFloat(CONFIG_SECTION_BACKGROUND_MUSIC, CONF_SLOW_WEIGHT_VARIABLE),
+ {CONF_SLOW_WEIGHT_MIN, CONF_SLOW_WEIGHT_MAX, 0.1}),
+ WidgetLabel(N_("Hint")),
+ WidgetLabel(
+ N_("Slow detection weight is the relative weight\n"
+ "of a long term average detection when compared\n"
+ "to the actual, faster loudness detection.\n"
+ "A value of zero gives a more radio-like sound\n"
+ "where soft passages get \"pulled up\" more quickly,\n"
+ "a value of two makes the sound feel less compressed."))};
+
+static constexpr const PluginPreferences background_music_preferences = {
+ {background_music_widgets}};
+
+static constexpr const char background_music_about =
+ N_("Background Music Plugin for Audacious\n"
+ "Copyright 2023;2024 Michel Fleur\n\n"
+ "Controls the volume to make the sound equally loud within and between "
+ "tracks.\n "
+ "It uses accurate loudness measurement and tries to make the volume "
+ "changes sound natural without audible peaks, yet without lowering "
+ "the volume before a peak in advance.");
+
+maybe_unused EXPORT FrameBasedEffectPlugin
+ aud_plugin_instance({N_("Background Music"), PACKAGE,
+ background_music_about, &background_music_preferences},
+ 10);

audacious-plugins-4.4.1.tar.bz2/src/background_music/basic_config.h Added

@@ -0,0 +1,50 @@
+#ifndef AUDACIOUS_PLUGINS_BGM_BASIC_CONFIG_H
+#define AUDACIOUS_PLUGINS_BGM_BASIC_CONFIG_H
+/*
+ * Background music (equal loudness) Plugin for Audacious
+ * Copyright 2023 Michel Fleur
+ *
+ * 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.
+ */
+
+static constexpr const char * const CONFIG_SECTION_BACKGROUND_MUSIC =
+    "background_music";
+
+static constexpr const char * CONF_TARGET_LEVEL_VARIABLE = "target_level";
+static constexpr const char * CONF_TARGET_LEVEL_DEFAULT_STRING = "-12.0";
+static constexpr double CONF_TARGET_LEVEL_MIN = -30.0;
+static constexpr double CONF_TARGET_LEVEL_MAX = -6.0;
+
+static constexpr const char * CONF_MAX_AMPLIFICATION_VARIABLE =
+    "maximum_amplification";
+static constexpr const char * CONF_MAX_AMPLIFICATION_DEFAULT_STRING = "10.0";
+static constexpr double CONF_MAX_AMPLIFICATION_MIN = 0.0;
+static constexpr double CONF_MAX_AMPLIFICATION_MAX = 40.0;
+
+static constexpr const char * CONF_SLOW_WEIGHT_VARIABLE = "perception_slow_weight";
+static constexpr const char * CONF_SLOW_WEIGHT_DEFAULT_STRING = "0.5";
+static constexpr double CONF_SLOW_WEIGHT_MIN = 0.0;
+static constexpr double CONF_SLOW_WEIGHT_MAX = 2.0;
+
+static constexpr const char * const background_music_defaults = {
+    CONF_TARGET_LEVEL_VARIABLE, CONF_TARGET_LEVEL_DEFAULT_STRING,
+    //
+    CONF_MAX_AMPLIFICATION_VARIABLE, CONF_MAX_AMPLIFICATION_DEFAULT_STRING,
+    //
+    CONF_SLOW_WEIGHT_VARIABLE, CONF_SLOW_WEIGHT_DEFAULT_STRING,
+    //
+    nullptr};
+
+#endif // AUDACIOUS_PLUGINS_BGM_BASIC_CONFIG_H

audacious-plugins-4.4.1.tar.bz2/src/background_music/meson.build Added

audacious-plugins-4.4.1.tar.bz2/src/bitcrusher Added

audacious-plugins-4.4.1.tar.bz2/src/bitcrusher/Makefile Added

audacious-plugins-4.4.1.tar.bz2/src/bitcrusher/bitcrusher.cc Added

@@ -0,0 +1,132 @@
+/*
+ * Copyright (c) 2021 Ariadne Conill <ariadne@dereferenced.org>
+ *
+ * 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 is present in all copies.
+ *
+ * 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 OWNER 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.
+ */
+
+#include <cmath>
+
+#include <libaudcore/i18n.h>
+#include <libaudcore/runtime.h>
+#include <libaudcore/plugin.h>
+#include <libaudcore/preferences.h>
+
+static const char * const bitcrusher_defaults = {
+ "depth", "32",
+ "downsample", "1.0",
+ nullptr};
+
+static const PreferencesWidget bitcrusher_widgets = {
+ WidgetLabel (N_("Bitcrusher")),
+ WidgetSpin (N_("Bit Depth:"),
+ WidgetFloat ("bitcrusher", "depth"),
+ {2, 32, 0.1}),
+ WidgetSpin (N_("Downsample ratio:"),
+ WidgetFloat ("bitcrusher", "downsample"),
+ {0.02, 1.0, 0.02}),
+};
+
+static const PluginPreferences bitcrusher_prefs = {{bitcrusher_widgets}};
+
+class Bitcrusher : public EffectPlugin
+{
+public:
+ static constexpr PluginInfo info = {
+ N_("Bitcrusher"),
+ PACKAGE,
+ nullptr,
+ & bitcrusher_prefs
+ };
+
+ constexpr Bitcrusher () : EffectPlugin (info, 0, true) {}
+
+ bool init ();
+ void cleanup ();
+
+ void start (int & channels, int & rate);
+ Index<float> & process (Index<float> & data);
+ bool flush (bool force);
+
+private:
+ float m_accumulator = 0.0;
+ int m_channels = 0;
+ Index<float> m_hold;
+};
+
+EXPORT Bitcrusher aud_plugin_instance;
+
+bool
+Bitcrusher::init ()
+{
+ aud_config_set_defaults ("bitcrusher", bitcrusher_defaults);
+ return true;
+}
+
+void
+Bitcrusher::cleanup ()
+{
+ m_hold.clear ();
+}
+
+void
+Bitcrusher::start (int & channels, int & rate)
+{
+ m_accumulator = 0.0f;
+ m_channels = channels;
+
+ m_hold.resize (m_channels);
+ m_hold.erase (0, m_channels);
+}
+
+Index<float> &
+Bitcrusher::process (Index<float> & data)
+{
+ float downsample_ratio = aud_get_double ("bitcrusher", "downsample");
+ float bit_depth = aud_get_double ("bitcrusher", "depth");
+
+ float scale = pow (2., bit_depth) / 2.;
+ float gain = (33. - bit_depth) / 8.;
+
+ float * f = data.begin ();
+ float * end = data.end ();
+
+ while (f < end)
+ {
+ m_accumulator += downsample_ratio;
+
+ for (int channel = 0; channel < m_channels; channel ++)
+ {
+ float current = * f;
+
+ if (m_accumulator >= 1.0)
+ m_hold channel = floorf ((current * gain) * scale + 0.5) / scale / gain;
+
+ * f ++ = m_hold channel;
+ }
+
+ if (m_accumulator >= 1.0)
+ m_accumulator -= 1.0;
+ }
+
+ return data;
+}
+
+bool
+Bitcrusher::flush (bool force)
+{
+ m_hold.erase (0, m_channels);
+ return true;
+}

audacious-plugins-4.4.1.tar.bz2/src/bitcrusher/meson.build Added

audacious-plugins-4.4.1.tar.bz2/src/blur_scope-qt Added

audacious-plugins-4.4.1.tar.bz2/src/blur_scope-qt/Makefile Added

audacious-plugins-4.4.1.tar.bz2/src/blur_scope-qt/blur_scope.cc Added

@@ -0,0 +1,259 @@
+/*
+ * Blur Scope plugin for Audacious
+ * Copyright (C) 2010-2012 John Lindgren
+ * Copyright (C) 2019 William Pitcock
+ *
+ * Based on BMP - Cross-platform multimedia player:
+ * Copyright (C) 2003-2004 BMP development team.
+ *
+ * Based on XMMS:
+ * Copyright (C) 1998-2003 XMMS development team.
+ *
+ * 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 <glib.h>
+
+#include <QWidget>
+#include <QImage>
+#include <QPainter>
+
+#include "libaudqt/colorbutton.h"
+
+#include <libaudcore/i18n.h>
+#include <libaudcore/runtime.h>
+#include <libaudcore/plugin.h>
+#include <libaudcore/preferences.h>
+
+static void /* QWidget */ * bscope_get_color_chooser ();
+
+static const PreferencesWidget bscope_widgets = {
+ WidgetLabel (N_("Color")),
+ WidgetCustomQt (bscope_get_color_chooser)
+};
+
+static const PluginPreferences bscope_prefs = {{bscope_widgets}};
+
+static const char * const bscope_defaults = {
+ "color", aud::numeric_string<0xFF3F7F>::str,
+ nullptr};
+
+static int bscope_color;
+
+class BlurScopeWidget : public QWidget {
+public:
+ BlurScopeWidget (QWidget * parent = nullptr);
+ ~BlurScopeWidget ();
+
+ void resize (int w, int h);
+
+ void clear ();
+ void blur ();
+ void draw_vert_line (int x, int y1, int y2);
+
+protected:
+ void resizeEvent (QResizeEvent *);
+ void paintEvent (QPaintEvent *);
+
+private:
+ int m_width = 0, m_height = 0, m_image_size = 0;
+ uint32_t * m_image = nullptr, * m_corner = nullptr;
+};
+
+static BlurScopeWidget *s_widget = nullptr;
+
+BlurScopeWidget::BlurScopeWidget (QWidget * parent) :
+ QWidget (parent)
+{
+ resize (width (), height ());
+}
+
+BlurScopeWidget::~BlurScopeWidget ()
+{
+ g_free(m_image);
+ m_image = nullptr;
+ s_widget = nullptr;
+}
+
+void BlurScopeWidget::paintEvent (QPaintEvent *)
+{
+ QImage img((unsigned char *) m_image, m_width, m_height, QImage::Format_RGB32);
+ QPainter p (this);
+
+ p.drawImage (0, 0, img);
+}
+
+void BlurScopeWidget::resizeEvent (QResizeEvent *)
+{
+ resize (width (), height ());
+}
+
+void BlurScopeWidget::resize (int w, int h)
+{
+ m_width = w;
+ m_height = h;
+ m_image_size = (m_width << 2) * (m_height + 2);
+ m_image = (uint32_t *) g_realloc (m_image, m_image_size);
+ memset (m_image, 0, m_image_size);
+ m_corner = m_image + m_width + 1;
+}
+
+void BlurScopeWidget::clear ()
+{
+ memset (m_image, 0, m_image_size);
+ update ();
+}
+
+void BlurScopeWidget::blur ()
+{
+ for (int y = 0; y < m_height; y ++)
+ {
+ uint32_t * p = m_corner + m_width * y;
+ uint32_t * end = p + m_width;
+ uint32_t * plast = p - m_width;
+ uint32_t * pnext = p + m_width;
+
+ /* We do a quick and dirty average of four color values, first masking
+ * off the lowest two bits. Over a large area, this masking has the net
+ * effect of subtracting 1.5 from each value, which by a happy chance
+ * is just right for a gradual fade effect. */
+ for (; p < end; p ++)
+ * p = ((* plast ++ & 0xFCFCFC) + (p-1 & 0xFCFCFC) + (p1 &
+ 0xFCFCFC) + (* pnext ++ & 0xFCFCFC)) >> 2;
+ }
+}
+
+void BlurScopeWidget::draw_vert_line (int x, int y1, int y2)
+{
+ int y, h;
+
+ if (y1 < y2) {y = y1 + 1; h = y2 - y1;}
+ else if (y2 < y1) {y = y2; h = y1 - y2;}
+ else {y = y1; h = 1;}
+
+ uint32_t * p = m_corner + y * m_width + x;
+
+ for (; h --; p += m_width)
+ * p = bscope_color;
+}
+
+class BlurScopeQt : public VisPlugin
+{
+public:
+ static constexpr PluginInfo info = {
+ N_("Blur Scope"),
+ PACKAGE,
+ nullptr,
+ & bscope_prefs,
+ PluginQtOnly
+ };
+
+ constexpr BlurScopeQt () : VisPlugin (info, Visualizer::MonoPCM) {}
+
+ bool init ();
+ void cleanup ();
+
+ void * get_qt_widget ();
+
+ void clear ();
+ void render_mono_pcm (const float * pcm);
+};
+
+EXPORT BlurScopeQt aud_plugin_instance;
+
+bool BlurScopeQt::init ()
+{
+ aud_config_set_defaults ("BlurScope", bscope_defaults);
+ bscope_color = aud_get_int ("BlurScope", "color");
+
+ return true;
+}
+
+void BlurScopeQt::cleanup ()
+{
+ aud_set_int ("BlurScope", "color", bscope_color);
+}
+
+void BlurScopeQt::clear ()
+{
+ if (s_widget)
+ s_widget->clear ();
+}
+
+void BlurScopeQt::render_mono_pcm (const float * pcm)
+{
+ g_assert(s_widget);
+
+ s_widget->blur ();
+
+ int width = s_widget->width ();
+ int height = s_widget->height ();
+
+ int prev_y = (0.5 + pcm0) * height;
+ prev_y = aud::clamp (prev_y, 0, height - 1);
+
+ for (int i = 0; i < width; i ++)
+ {
+ int y = (0.5 + pcmi * 512 / width) * height;
+ y = aud::clamp (y, 0, height - 1);
+ s_widget->draw_vert_line (i, prev_y, y);
+ prev_y = y;
+ }
+
+ s_widget->update ();
+}
+
+void * BlurScopeQt::get_qt_widget ()
+{
+ if (s_widget)
+ return s_widget;
+
+ s_widget = new BlurScopeWidget ();
+ return s_widget;
+}
+
+class ColorChooserWidget : public audqt::ColorButton
+{
+protected:
+ void onColorChanged () override;
+};
+
+void ColorChooserWidget::onColorChanged ()
+{
+ QColor col (color ());
+ int r, g, b;
+
+ col.getRgb(&r, &g, &b);
+
+ bscope_color = r << 16 | g << 8 | b;
+}
+
+static void * bscope_get_color_chooser ()
+{
+ int r, g, b;
+
+ r = (bscope_color & 0xff0000) >> 16;
+ g = (bscope_color & 0xff00) >> 8;
+ b = (bscope_color & 0xff);
+
+ QColor color = QColor::fromRgb(r, g, b);
+
+ auto chooser = new ColorChooserWidget ();
+ chooser->setColor (color);
+
+ return chooser;
+}

audacious-plugins-4.4.1.tar.bz2/src/blur_scope-qt/meson.build Added

audacious-plugins-3.6.2-gtk3.tar.bz2/src/blur_scope/blur_scope.cc -> audacious-plugins-4.4.1.tar.bz2/src/blur_scope/blur_scope.cc Changed

@@ -32,11 +32,9 @@
 #include <libaudcore/runtime.h>
 #include <libaudcore/plugin.h>
 #include <libaudcore/preferences.h>
+#include <libaudgui/gtk-compat.h>
 
-#define D_WIDTH 64
-#define D_HEIGHT 32
-
-static void /* GtkWidget */ * bscope_get_color_chooser (void);
+static void /* GtkWidget */ * bscope_get_color_chooser ();
 
 static const PreferencesWidget bscope_widgets = {
 WidgetLabel (N_("Color")),
@@ -46,7 +44,7 @@
 static const PluginPreferences bscope_prefs = {{bscope_widgets}};
 
 static const char * const bscope_defaults = {
- "color", "16727935", /* 0xFF3F7F */
+ "color", aud::numeric_string<0xFF3F7F>::str,
 nullptr};
 
 static int bscope_color;
@@ -58,7 +56,8 @@
 N_("Blur Scope"),
 PACKAGE,
 nullptr,
- & bscope_prefs
+ & bscope_prefs,
+ PluginGLibOnly
 };
 
 constexpr BlurScope () : VisPlugin (info, Visualizer::MonoPCM) {}
@@ -80,7 +79,11 @@
 void draw_vert_line (int x, int y1, int y2);
 
 static gboolean configure_event (GtkWidget * widget, GdkEventConfigure * event, void * user);
- static gboolean draw_cb (GtkWidget * widget, cairo_t * cr, void * user);
+#ifdef USE_GTK3
+ static gboolean draw_event (GtkWidget * widget, cairo_t * cr, void * user);
+#else
+ static gboolean draw_event (GtkWidget * widget, GdkEventExpose * event, void * user);
+#endif
 
 GtkWidget * area = nullptr;
 int width = 0, height = 0, stride = 0, image_size = 0;
@@ -94,7 +97,7 @@
 aud_config_set_defaults ("BlurScope", bscope_defaults);
 bscope_color = aud_get_int ("BlurScope", "color");
 
- return TRUE;
+ return true;
 }
 
 void BlurScope::cleanup ()
@@ -130,30 +133,48 @@
 if (! area || ! gtk_widget_get_window (area))
 return;
 
+#if GTK_CHECK_VERSION(3, 22, 0)
+ GdkWindow * window = gtk_widget_get_window (area);
+ cairo_region_t * cr_region = cairo_region_create ();
+
+ GdkDrawingContext * drawing_context = gdk_window_begin_draw_frame (window, cr_region);
+ cairo_t * cr = gdk_drawing_context_get_cairo_context (drawing_context);
+ draw_to_cairo (cr);
+ gdk_window_end_draw_frame (window, drawing_context);
+
+ cairo_region_destroy (cr_region);
+#else
 cairo_t * cr = gdk_cairo_create (gtk_widget_get_window (area));
 draw_to_cairo (cr);
 cairo_destroy (cr);
+#endif
 }
 
 gboolean BlurScope::configure_event (GtkWidget * widget, GdkEventConfigure * event, void * user)
 {
 ((BlurScope *) user)->resize (event->width, event->height);
- return TRUE;
+ return true;
 }
 
-gboolean BlurScope::draw_cb (GtkWidget * widget, cairo_t * cr, void * user)
+#ifdef USE_GTK3
+gboolean BlurScope::draw_event (GtkWidget * widget, cairo_t * cr, void * user)
 {
 ((BlurScope *) user)->draw_to_cairo (cr);
- return TRUE;
+ return true;
 }
+#else
+gboolean BlurScope::draw_event (GtkWidget * widget, GdkEventExpose * event, void * user)
+{
+ ((BlurScope *) user)->draw ();
+ return true;
+}
+#endif
 
 void * BlurScope::get_gtk_widget ()
 {
 area = gtk_drawing_area_new ();
- gtk_widget_set_size_request (area, D_WIDTH, D_HEIGHT);
- resize (D_WIDTH, D_HEIGHT);
 
- g_signal_connect (area, "draw_cb", (GCallback) draw_cb, this);
+ g_signal_connect (area, AUDGUI_DRAW_SIGNAL, (GCallback) draw_event, this);
 g_signal_connect (area, "configure-event", (GCallback) configure_event, this);
 g_signal_connect (area, "destroy", (GCallback) gtk_widget_destroyed, & area);
 
@@ -222,6 +243,7 @@
 
 static void color_set_cb (GtkWidget * chooser)
 {
+#ifdef USE_GTK3
 GdkRGBA rgba;
 gtk_color_chooser_get_rgba ((GtkColorChooser *) chooser, & rgba);
 
@@ -229,18 +251,36 @@
 int green = round (rgba.green * 255);
 int blue = round (rgba.blue * 255);
 bscope_color = (red << 16) | (green << 8) | blue;
+#else
+ GdkColor gdk_color;
+ gtk_color_button_get_color ((GtkColorButton *) chooser, & gdk_color);
+ bscope_color = ((gdk_color.red & 0xff00) << 8) | (gdk_color.green & 0xff00) | (gdk_color.blue >> 8);
+#endif
 }
 
-static void /* GtkWidget */ * bscope_get_color_chooser (void)
+static void /* GtkWidget */ * bscope_get_color_chooser ()
 {
+#ifdef USE_GTK3
 GdkRGBA rgba = {
 ((bscope_color & 0xff0000) >> 16) / 255.0,
 ((bscope_color & 0xff00) >> 8) / 255.0,
- (bscope_color & 0xff) / 255.0
+ (bscope_color & 0xff) / 255.0,
+ 1.0
 };
 
 GtkWidget * chooser = gtk_color_button_new_with_rgba (& rgba);
 gtk_color_chooser_set_use_alpha ((GtkColorChooser *) chooser, false);
+#else
+ GdkColor gdk_color = {
+ 0,
+ (uint16_t) ((bscope_color & 0xff0000) >> 8),
+ (uint16_t) (bscope_color & 0xff00),
+ (uint16_t) ((bscope_color & 0xff) << 8)
+ };
+
+ GtkWidget * chooser = gtk_color_button_new_with_color (& gdk_color);
+ gtk_color_button_set_use_alpha ((GtkColorButton *) chooser, false);
+#endif
 
 g_signal_connect (chooser, "color-set", (GCallback) color_set_cb, nullptr);

audacious-plugins-4.4.1.tar.bz2/src/blur_scope/meson.build Added

audacious-plugins-4.4.1.tar.bz2/src/bs2b/meson.build Added

audacious-plugins-3.6.2-gtk3.tar.bz2/src/cairo-spectrum/Makefile -> audacious-plugins-4.4.1.tar.bz2/src/cairo-spectrum/Makefile Changed

audacious-plugins-3.6.2-gtk3.tar.bz2/src/cairo-spectrum/cairo-spectrum.cc -> audacious-plugins-4.4.1.tar.bz2/src/cairo-spectrum/cairo-spectrum.cc Changed

@@ -27,6 +27,7 @@
 #include <libaudcore/i18n.h>
 #include <libaudcore/interface.h>
 #include <libaudcore/plugin.h>
+#include <libaudgui/gtk-compat.h>
 #include <libaudgui/libaudgui.h>
 #include <libaudgui/libaudgui-gtk.h>
 
@@ -39,7 +40,10 @@
 public:
 static constexpr PluginInfo info = {
 N_("Spectrum Analyzer"),
- PACKAGE
+ PACKAGE,
+ nullptr, // about
+ nullptr, // prefs
+ PluginGLibOnly
 };
 
 constexpr CairoSpectrum () : VisPlugin (info, Visualizer::Freq) {}
@@ -58,12 +62,6 @@
 static int barsMAX_BANDS + 1;
 static int delayMAX_BANDS + 1;
 
-static void calculate_xscale ()
-{
- for (int i = 0; i <= bands; i ++)
- xscalei = powf (256, (float) i / bands) - 0.5f;
-}
-
 void CairoSpectrum::render_freq (const float * freq)
 {
 if (! bands)
@@ -71,28 +69,8 @@
 
 for (int i = 0; i < bands; i ++)
 {
- int a = ceilf (xscalei);
- int b = floorf (xscalei + 1);
- float n = 0;
-
- if (b < a)
- n += freqb * (xscalei + 1 - xscalei);
- else
- {
- if (a > 0)
- n += freqa - 1 * (a - xscalei);
- for (; a < b; a ++)
- n += freqa;
- if (b < 256)
- n += freqb * (xscalei + 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 *= (float) bands / 12;
-
 /* 40 dB range */
- int x = 40 + 20 * log10f (n);
+ int x = 40 + compute_freq_band (freq, xscale, i, bands);
 x = aud::clamp (x, 0, 40);
 
 barsi -= aud::max (0, VIS_FALLOFF - delayi);
@@ -120,106 +98,6 @@
 gtk_widget_queue_draw (spect_widget);
 }
 
-static void rgb_to_hsv (float r, float g, float b, float * h, float * s, float * v)
-{
- float max, min;
-
- max = r;
- if (g > max)
- max = g;
- if (b > max)
- max = b;
-
- min = r;
- if (g < min)
- min = g;
- if (b < min)
- min = b;
-
- * v = max;
-
- if (max == min)
- {
- * h = 0;
- * s = 0;
- return;
- }
-
- if (r == max)
- * h = 1 + (g - b) / (max - min);
- else if (g == max)
- * h = 3 + (b - r) / (max - min);
- else
- * h = 5 + (r - g) / (max - min);
-
- * s = (max - min) / max;
-}
-
-static void hsv_to_rgb (float h, float s, float v, float * r, float * g, float * b)
-{
- for (; h >= 2; h -= 2)
- {
- float * p = r;
- r = g;
- g = b;
- b = p;
- }
-
- if (h < 1)
- {
- * r = 1;
- * g = 0;
- * b = 1 - h;
- }
- else
- {
- * r = 1;
- * g = h - 1;
- * b = 0;
- }
-
- * r = v * (1 - s * (1 - * r));
- * g = v * (1 - s * (1 - * g));
- * b = v * (1 - s * (1 - * b));
-}
-
-static void get_color (gint i, gfloat * r, gfloat * g, gfloat * b)
-{
- static GdkRGBA c;
- static gboolean valid = FALSE;
- gfloat h, s, v, n;
-
- if (! valid)
- {
- /* we want a color that matches the current theme
- * selected color of a GtkEntry should be reasonable */
- GtkStyleContext * style = gtk_style_context_new ();
- GtkWidgetPath * path = gtk_widget_path_new ();
- gtk_widget_path_append_type (path, GTK_TYPE_ENTRY);
- gtk_style_context_set_path (style, path);
- gtk_widget_path_free (path);
- gtk_style_context_add_class (style, "entry");
- gtk_style_context_get_background_color (style,
- (GtkStateFlags) (GTK_STATE_FLAG_FOCUSED | GTK_STATE_FLAG_SELECTED), & c);
- g_object_unref (style);
- valid = TRUE;
- }
-
- rgb_to_hsv (c.red, c.green, c.blue, & h, & s, & v);
-
- if (s < 0.1) /* monochrome theme? use blue instead */
- {
- h = 5;
- s = 0.75;
- }
-
- n = i / (gfloat) (bands - 1);
- s = 1 - 0.9 * n;
- v = 0.75 + 0.25 * n;
-
- hsv_to_rgb (h, s, v, r, g, b);
-}
-
 static void draw_background (GtkWidget * area, cairo_t * cr)
 {
 GtkAllocation alloc;
@@ -231,12 +109,16 @@
 
 static void draw_visualizer (GtkWidget *widget, cairo_t *cr)
 {
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
+ auto & c = (gtk_widget_get_style (widget))->baseGTK_STATE_SELECTED;
+G_GNUC_END_IGNORE_DEPRECATIONS
+
 for (int i = 0; i < bands; i++)
 {
 int x = ((width / bands) * i) + 2;
 float r, g, b;
 
- get_color (i, & r, & g, & b);
+ audgui_vis_bar_color (c, i, bands, r, g, b);
 cairo_set_source_rgb (cr, r, g, b);
 cairo_rectangle (cr, x + 1, height - (barsi * height / 40),
 (width / bands) - 1, (barsi * height / 40));
@@ -252,25 +134,38 @@
 
 bands = width / 10;
 bands = aud::clamp(bands, 12, MAX_BANDS);
- calculate_xscale ();
+ Visualizer::compute_log_xscale (xscale, bands);
 
- return TRUE;
+ return true;
 }
 
+#ifdef USE_GTK3
 static gboolean draw_event (GtkWidget * widget, cairo_t * cr, GtkWidget * area)
 {
 draw_background (widget, cr);
 draw_visualizer (widget, cr);
 
- return TRUE;
+ return true;
+}
+#else
+static gboolean draw_event (GtkWidget * widget)
+{
+ cairo_t * cr = gdk_cairo_create (gtk_widget_get_window (widget));
+
+ draw_background (widget, cr);
+ draw_visualizer (widget, cr);
+
+ cairo_destroy (cr);
+ return true;
 }
+#endif
 
 void * CairoSpectrum::get_gtk_widget ()
 {
 GtkWidget *area = gtk_drawing_area_new();
 spect_widget = area;
 
- g_signal_connect(area, "draw", (GCallback) draw_event, nullptr);
+ g_signal_connect(area, AUDGUI_DRAW_SIGNAL, (GCallback) draw_event, nullptr);
 g_signal_connect(area, "configure-event", (GCallback) configure_event, nullptr);
 g_signal_connect(area, "destroy", (GCallback) gtk_widget_destroyed, & spect_widget);

audacious-plugins-4.4.1.tar.bz2/src/cairo-spectrum/meson.build Added

audacious-plugins-3.6.2-gtk3.tar.bz2/src/cd-menu-items/Makefile -> audacious-plugins-4.4.1.tar.bz2/src/cd-menu-items/Makefile Changed

audacious-plugins-3.6.2-gtk3.tar.bz2/src/cd-menu-items/cd-menu-items.cc -> audacious-plugins-4.4.1.tar.bz2/src/cd-menu-items/cd-menu-items.cc Changed

audacious-plugins-4.4.1.tar.bz2/src/cd-menu-items/meson.build Added

audacious-plugins-4.4.1.tar.bz2/src/cdaudio Added

audacious-plugins-4.4.1.tar.bz2/src/cdaudio/Makefile Added

audacious-plugins-4.4.1.tar.bz2/src/cdaudio/cdaudio-ng.cc Added

@@ -0,0 +1,809 @@
+/*
+ * Audacious CD Digital Audio plugin
+ *
+ * Copyright (c) 2007 Calin Crisan <ccrisan@gmail.com>
+ * Copyright (c) 2009-2012 John Lindgren <john.lindgren@aol.com>
+ * Copyright (c) 2009 Tomasz Moń <desowin@gmail.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; under version 3 of the License.
+ *
+ * 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>.
+ */
+
+#include <errno.h>
+#include <pthread.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+/* prevent libcdio from redefining PACKAGE, VERSION, etc. */
+#define EXTERNAL_LIBCDIO_CONFIG_H
+
+#include <cdio/cdio.h>
+#include <cdio/cdtext.h>
+#include <cdio/track.h>
+#include <cdio/audio.h>
+#include <cdio/sector.h>
+#include <cdio/cd_types.h>
+
+#if LIBCDIO_VERSION_NUM >= 90
+#include <cdio/paranoia/cdda.h>
+#else
+#include <cdio/cdda.h>
+#endif
+
+#ifdef HAVE_LIBCDDB
+#include <cddb/cddb.h>
+#endif
+
+#include <libaudcore/audstrings.h>
+#include <libaudcore/hook.h>
+#include <libaudcore/i18n.h>
+#include <libaudcore/interface.h>
+#include <libaudcore/mainloop.h>
+#include <libaudcore/playlist.h>
+#include <libaudcore/plugin.h>
+#include <libaudcore/preferences.h>
+#include <libaudcore/runtime.h>
+
+#define MIN_DISC_SPEED 2
+#define MAX_DISC_SPEED 24
+
+#define MAX_RETRIES 10
+#define MAX_SKIPS 10
+
+static const char * const cdaudio_schemes = {"cdda", nullptr};
+
+class CDAudio : public InputPlugin
+{
+public:
+ static const char about;
+ static const char * const defaults;
+ static const PreferencesWidget widgets;
+ static const PluginPreferences prefs;
+
+ static constexpr PluginInfo info = {
+ N_("Audio CD Plugin"),
+ PACKAGE,
+ about,
+ & prefs
+ };
+
+ constexpr CDAudio () : InputPlugin (info, InputInfo (FlagSubtunes)
+ .with_schemes (cdaudio_schemes)) {}
+
+ bool init ();
+ void cleanup ();
+
+ bool is_our_file (const char * filename, VFSFile & file);
+ bool read_tag (const char * filename, VFSFile & file, Tuple & tuple, Index<char> * image);
+ bool play (const char * filename, VFSFile & file);
+};
+
+EXPORT CDAudio aud_plugin_instance;
+
+typedef struct
+{
+ String performer;
+ String name;
+ String genre;
+ int startlsn;
+ int endlsn;
+}
+trackinfo_t;
+
+static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
+static bool playing;
+
+/* lock mutex to read / set these variables */
+static int firsttrackno = -1;
+static int lasttrackno = -1;
+static int n_audio_tracks;
+static cdrom_drive_t *pcdrom_drive = nullptr;
+static Index<trackinfo_t> trackinfo;
+static QueuedFunc purge_func;
+
+static bool scan_cd ();
+static bool refresh_trackinfo (bool warning);
+static void reset_trackinfo ();
+static int calculate_track_length (int startlsn, int endlsn);
+static int find_trackno_from_filename (const char * filename);
+
+const char CDAudio::about =
+ N_("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.");
+
+const char * const CDAudio::defaults = {
+ "disc_speed", "2",
+ "use_cdtext", "TRUE",
+#ifdef HAVE_LIBCDDB
+ "use_cddb", "TRUE",
+ "cddbhttp", "FALSE",
+ "cddbserver", "gnudb.gnudb.org",
+ "cddbport", "8880",
+#endif
+ nullptr
+};
+
+const PreferencesWidget CDAudio::widgets = {
+ WidgetLabel (N_("Device")),
+ WidgetSpin (N_("Read speed:"),
+ WidgetInt ("CDDA", "disc_speed"),
+ {MIN_DISC_SPEED, MAX_DISC_SPEED, 1}),
+ WidgetEntry (N_("Override device:"),
+ WidgetString ("CDDA", "device")),
+ WidgetLabel (N_("Metadata")),
+ WidgetCheck (N_("Use CD-Text"),
+ WidgetBool ("CDDA", "use_cdtext")),
+#ifdef HAVE_LIBCDDB
+ WidgetCheck (N_("Use CDDB"),
+ WidgetBool ("CDDA", "use_cddb")),
+ WidgetCheck (N_("Use HTTP instead of CDDBP"),
+ WidgetBool ("CDDA", "cddbhttp"),
+ WIDGET_CHILD),
+ WidgetEntry (N_("Server:"),
+ WidgetString ("CDDA", "cddbserver"),
+ {false},
+ WIDGET_CHILD),
+ WidgetEntry (N_("Path:"),
+ WidgetString ("CDDA", "cddbpath"),
+ {false},
+ WIDGET_CHILD),
+ WidgetSpin (N_("Port:"),
+ WidgetInt ("CDDA", "cddbport"),
+ {0, 65535, 1},
+ WIDGET_CHILD)
+#endif
+};
+
+const PluginPreferences CDAudio::prefs = {{widgets}};
+
+static void cdaudio_error (const char * message_format, ...)
+{
+ va_list args;
+ va_start (args, message_format);
+ StringBuf msg = str_vprintf (message_format, args);
+ va_end (args);
+
+ aud_ui_show_error (msg);
+}
+
+/* main thread only */
+static void purge_playlist (Playlist playlist)
+{
+ int length = playlist.n_entries ();
+
+ for (int i = 0; i < length; i ++)
+ {
+ String filename = playlist.entry_filename (i);
+
+ if (! strncmp (filename, "cdda://", 7))
+ {
+ playlist.remove_entry (i);
+ i--;
+ length--;
+ }
+ }
+}
+
+/* main thread only */
+static void purge_all_playlists ()
+{
+ int playlists = Playlist::n_playlists ();
+
+ for (int i = 0; i < playlists; i++)
+ purge_playlist (Playlist::by_index (i));
+}
+
+/* main thread only */
+static void monitor (void *)
+{
+ pthread_mutex_lock (& mutex);
+
+ /* make sure not to close drive handle while playing */
+ if (! playing)
+ refresh_trackinfo (false);
+
+ pthread_mutex_unlock (& mutex);
+}
+
+/* main thread only */
+bool CDAudio::init ()
+{
+ aud_config_set_defaults ("CDDA", defaults);
+
+ if (!cdio_init ())
+ {
+ cdaudio_error (_("Failed to initialize cdio subsystem."));
+ return false;
+ }
+
+#ifdef HAVE_LIBCDDB
+ libcddb_init ();
+#endif
+
+ return true;
+}
+
+/* thread safe (mutex may be locked) */
+bool CDAudio::is_our_file (const char * filename, VFSFile & file)
+{
+ return !strncmp (filename, "cdda://", 7);
+}
+
+/* play thread only */
+bool CDAudio::play (const char * name, VFSFile & file)
+{
+ pthread_mutex_lock (& mutex);
+
+ if (! trackinfo.len () && ! refresh_trackinfo (true))
+ {
+ pthread_mutex_unlock (& mutex);
+ return false;
+ }
+
+ bool okay = false;
+ int trackno = find_trackno_from_filename (name);
+
+ if (trackno < 0)
+ cdaudio_error (_("Invalid URI %s."), name);
+ else if (trackno < firsttrackno || trackno > lasttrackno)
+ cdaudio_error (_("Track %d not found."), trackno);
+ else if (! cdda_track_audiop (pcdrom_drive, trackno))
+ cdaudio_error (_("Track %d is a data track."), trackno);
+ else
+ okay = true;
+
+ if (! okay)
+ {
+ pthread_mutex_unlock (& mutex);
+ return false;
+ }
+
+ set_stream_bitrate (1411200);
+ open_audio (FMT_S16_LE, 44100, 2);
+
+ int startlsn = trackinfotrackno.startlsn;
+ int endlsn = trackinfotrackno.endlsn;
+
+ playing = true;
+
+ int buffer_size = aud_get_int ("output_buffer_size");
+ int speed = aud_get_int ("CDDA", "disc_speed");
+ speed = aud::clamp (speed, MIN_DISC_SPEED, MAX_DISC_SPEED);
+ int sectors = aud::clamp (buffer_size / 2, 50, 250) * speed * 75 / 1000;
+ int currlsn = startlsn;
+ int retry_count = 0, skip_count = 0;
+
+ Index<unsigned char> buffer;
+ buffer.insert (0, 2352 * sectors);
+
+ while (! check_stop ())
+ {
+ int seek_time = check_seek ();
+ if (seek_time >= 0)
+ currlsn = startlsn + (seek_time * 75 / 1000);
+
+ sectors = aud::min (sectors, endlsn + 1 - currlsn);
+ if (sectors < 1)
+ break;
+
+ /* unlock mutex here to avoid blocking
+ * other threads must be careful not to close drive handle */
+ pthread_mutex_unlock (& mutex);
+
+ int ret = cdio_read_audio_sectors (pcdrom_drive->p_cdio,
+ buffer.begin (), currlsn, sectors);
+
+ if (ret == DRIVER_OP_SUCCESS)
+ write_audio (buffer.begin (), 2352 * sectors);
+
+ pthread_mutex_lock (& mutex);
+
+ if (ret == DRIVER_OP_SUCCESS)
+ {
+ currlsn += sectors;
+ retry_count = 0;
+ skip_count = 0;
+ }
+ else if (sectors > 16)
+ {
+ /* maybe a smaller read size will help */
+ sectors /= 2;
+ }
+ else if (retry_count < MAX_RETRIES)
+ {
+ /* still failed; retry a few times */
+ retry_count ++;
+ }
+ else if (skip_count < MAX_SKIPS)
+ {
+ /* maybe the disk is scratched; try skipping ahead */
+ currlsn = aud::min (currlsn + 75, endlsn + 1);
+ skip_count ++;
+ }
+ else
+ {
+ /* still failed; give it up */
+ cdaudio_error (_("Error reading audio CD."));
+ break;
+ }
+ }
+
+ playing = false;
+
+ pthread_mutex_unlock (& mutex);
+ return true;
+}
+
+/* main thread only */
+void CDAudio::cleanup ()
+{
+ pthread_mutex_lock (& mutex);
+
+ reset_trackinfo ();
+ purge_func.stop ();
+
+#ifdef HAVE_LIBCDDB
+ libcddb_shutdown ();
+#endif
+
+ pthread_mutex_unlock (& mutex);
+}
+
+/* thread safe */
+bool CDAudio::read_tag (const char * filename, VFSFile & file, Tuple & tuple,
+ Index<char> * image)
+{
+ bool whole_disk = ! strcmp (filename, "cdda://");
+ bool valid = false;
+
+ pthread_mutex_lock (& mutex);
+
+ /* reset cached info when adding CD to the playlist */
+ if (whole_disk && ! playing)
+ reset_trackinfo ();
+
+ if (! trackinfo.len () && ! refresh_trackinfo (true))
+ goto DONE;
+
+ if (whole_disk)
+ {
+ Index<short> subtunes;
+
+ /* only add the audio tracks to the playlist */
+ for (int trackno = firsttrackno; trackno <= lasttrackno; trackno++)
+ if (cdda_track_audiop (pcdrom_drive, trackno))
+ subtunes.append (trackno);
+
+ tuple.set_subtunes (subtunes.len (), subtunes.begin ());
+
+ valid = true;
+ }
+ else
+ {
+ int trackno = find_trackno_from_filename (filename);
+
+ if (trackno < firsttrackno || trackno > lasttrackno)
+ {
+ AUDERR ("Track %d not found.\n", trackno);
+ goto DONE;
+ }
+
+ if (!cdda_track_audiop (pcdrom_drive, trackno))
+ {
+ AUDERR ("Track %d is a data track.\n", trackno);
+ goto DONE;
+ }
+
+ tuple.set_format (_("Audio CD"), 2, 44100, 1411);
+ tuple.set_int (Tuple::Track, trackno);
+ tuple.set_int (Tuple::Length, calculate_track_length
+ (trackinfotrackno.startlsn, trackinfotrackno.endlsn));
+
+ if (trackinfotrackno.name)
+ tuple.set_str (Tuple::Title, trackinfotrackno.name);
+ if (trackinfotrackno.performer)
+ tuple.set_str (Tuple::Artist, trackinfotrackno.performer);
+ if (trackinfo0.name)
+ tuple.set_str (Tuple::Album, trackinfo0.name);
+ if (trackinfo0.performer)
+ tuple.set_str (Tuple::AlbumArtist, trackinfo0.performer);
+ if (trackinfotrackno.genre)
+ tuple.set_str (Tuple::Genre, trackinfotrackno.genre);
+
+ valid = true;
+ }
+
+ DONE:
+ pthread_mutex_unlock (& mutex);
+ return valid;
+}
+
+/* mutex must be locked */
+static bool open_cd ()
+{
+ if (pcdrom_drive)
+ return true;
+
+ AUDDBG ("Opening CD drive.\n");
+ String device = aud_get_str ("CDDA", "device");
+
+ if (device0)
+ {
+ if (! (pcdrom_drive = cdda_identify (device, 1, nullptr)))
+ cdaudio_error (_("Failed to open CD device %s."), (const char *) device);
+ }
+ else
+ {
+ char * * ppcd_drives = cdio_get_devices_with_cap (nullptr, CDIO_FS_AUDIO, false);
+
+ if (ppcd_drives && ppcd_drives0)
+ {
+ if (! (pcdrom_drive = cdda_identify (ppcd_drives0, 1, nullptr)))
+ cdaudio_error (_("Failed to open CD device %s."), ppcd_drives0);
+ }
+ else
+ cdaudio_error (_("No audio capable CD drive found."));
+
+ if (ppcd_drives)
+ cdio_free_device_list (ppcd_drives);
+ }
+
+ return (bool) pcdrom_drive;
+}
+
+/* mutex must be locked */
+static bool check_disc_mode (bool warning)
+{
+ int mode = cdio_get_discmode (pcdrom_drive->p_cdio);
+
+#ifdef _WIN32 /* cdio_get_discmode reports the wrong disk type sometimes */
+ if (mode == CDIO_DISC_MODE_NO_INFO || mode == CDIO_DISC_MODE_ERROR)
+#else
+ if (mode != CDIO_DISC_MODE_CD_DA && mode != CDIO_DISC_MODE_CD_MIXED)
+#endif
+ {
+ if (warning)
+ {
+ if (mode == CDIO_DISC_MODE_NO_INFO)
+ cdaudio_error (_("Drive is empty."));
+ else
+ cdaudio_error (_("Unsupported disk type."));
+ }
+
+ return false;
+ }
+
+ return true;
+}
+
+/* mutex must be locked */
+static bool scan_cd ()
+{
+ AUDDBG ("Scanning CD drive.\n");
+ trackinfo.clear ();
+
+ /* general track initialization */
+
+ /* skip endianness detection (because it only affects cdda_read, and we use
+ * cdio_read_audio_sectors instead) */
+ pcdrom_drive->bigendianp = 0;
+
+ /* finish initialization of drive/disc (performs disc TOC sanitization) */
+ if (cdda_open (pcdrom_drive) != 0)
+ {
+ cdaudio_error (_("Failed to finish initializing opened CD drive."));
+ return false;
+ }
+
+ int speed = aud_get_int ("CDDA", "disc_speed");
+ speed = aud::clamp (speed, MIN_DISC_SPEED, MAX_DISC_SPEED);
+ if (cdda_speed_set (pcdrom_drive, speed) != DRIVER_OP_SUCCESS)
+ AUDERR ("Cannot set drive speed.\n");
+
+ firsttrackno = cdio_get_first_track_num (pcdrom_drive->p_cdio);
+ lasttrackno = cdio_get_last_track_num (pcdrom_drive->p_cdio);
+ if (firsttrackno == CDIO_INVALID_TRACK || lasttrackno == CDIO_INVALID_TRACK)
+ {
+ cdaudio_error (_("Failed to retrieve first/last track number."));
+ return false;
+ }
+ AUDDBG ("first track is %d and last track is %d\n", firsttrackno,
+ lasttrackno);
+
+ trackinfo.insert (0, lasttrackno + 1);
+
+ trackinfo0.startlsn = cdda_track_firstsector (pcdrom_drive, 0);
+ trackinfo0.endlsn = cdda_track_lastsector (pcdrom_drive, lasttrackno);
+
+ n_audio_tracks = 0;
+
+ for (int trackno = firsttrackno; trackno <= lasttrackno; trackno++)
+ {
+ trackinfotrackno.startlsn = cdda_track_firstsector (pcdrom_drive, trackno);
+ trackinfotrackno.endlsn = cdda_track_lastsector (pcdrom_drive, trackno);
+
+ if (trackinfotrackno.startlsn == CDIO_INVALID_LSN
+ || trackinfotrackno.endlsn == CDIO_INVALID_LSN)
+ {
+ cdaudio_error (_("Cannot read start/end LSN for track %d."), trackno);
+ return false;
+ }
+
+ /* count how many tracks are audio tracks */
+ if (cdda_track_audiop (pcdrom_drive, trackno))
+ n_audio_tracks++;
+ }
+
+ /* get trackinfo0 cdtext information (the disc) */
+ cdtext_t *pcdtext = nullptr;
+ if (aud_get_bool ("CDDA", "use_cdtext"))
+ {
+ AUDDBG ("getting cd-text information for disc\n");
+#if LIBCDIO_VERSION_NUM >= 90
+ pcdtext = cdio_get_cdtext (pcdrom_drive->p_cdio);
+ if (pcdtext == nullptr)
+#else
+ pcdtext = cdio_get_cdtext (pcdrom_drive->p_cdio, 0);
+ if (pcdtext == nullptr || pcdtext->fieldCDTEXT_TITLE == nullptr)
+#endif
+ {
+ AUDDBG ("no cd-text available for disc\n");
+ }
+ else
+ {
+#if LIBCDIO_VERSION_NUM >= 90
+ trackinfo0.performer = String (cdtext_get_const (pcdtext, CDTEXT_FIELD_PERFORMER, 0));
+ trackinfo0.name = String (cdtext_get_const (pcdtext, CDTEXT_FIELD_TITLE, 0));
+ trackinfo0.genre = String (cdtext_get_const (pcdtext, CDTEXT_FIELD_GENRE, 0));
+#else
+ trackinfo0.performer = String (pcdtext->fieldCDTEXT_PERFORMER);
+ trackinfo0.name = String (pcdtext->fieldCDTEXT_TITLE);
+ trackinfo0.genre = String (pcdtext->fieldCDTEXT_GENRE);
+#endif
+ }
+ }
+
+ /* get track information from cdtext */
+ bool cdtext_was_available = false;
+ for (int trackno = firsttrackno; trackno <= lasttrackno; trackno++)
+ {
+#if LIBCDIO_VERSION_NUM < 90
+ if (aud_get_bool ("CDDA", "use_cdtext"))
+ {
+ AUDDBG ("getting cd-text information for track %d\n", trackno);
+ pcdtext = cdio_get_cdtext (pcdrom_drive->p_cdio, trackno);
+ if (pcdtext == nullptr || pcdtext->fieldCDTEXT_PERFORMER == nullptr)
+ {
+ AUDDBG ("no cd-text available for track %d\n", trackno);
+ pcdtext = nullptr;
+ }
+ }
+#endif
+
+ if (pcdtext != nullptr)
+ {
+#if LIBCDIO_VERSION_NUM >= 90
+ trackinfotrackno.performer = String (cdtext_get_const (pcdtext, CDTEXT_FIELD_PERFORMER, trackno));
+ trackinfotrackno.name = String (cdtext_get_const (pcdtext, CDTEXT_FIELD_TITLE, trackno));
+ trackinfotrackno.genre = String (cdtext_get_const (pcdtext, CDTEXT_FIELD_GENRE, trackno));
+#else
+ trackinfotrackno.performer = String (pcdtext->fieldCDTEXT_PERFORMER);
+ trackinfotrackno.name = String (pcdtext->fieldCDTEXT_TITLE);
+ trackinfotrackno.genre = String (pcdtext->fieldCDTEXT_GENRE);
+#endif
+ cdtext_was_available = true;
+ }
+ }
+
+ if (!cdtext_was_available)
+ {
+#ifdef HAVE_LIBCDDB
+ /* initialize de cddb subsystem */
+ cddb_conn_t *pcddb_conn = nullptr;
+ cddb_disc_t *pcddb_disc = nullptr;
+ cddb_track_t *pcddb_track = nullptr;
+ lba_t lba; /* Logical Block Address */
+
+ if (aud_get_bool ("CDDA", "use_cddb"))
+ {
+ pcddb_conn = cddb_new ();
+ if (pcddb_conn == nullptr)
+ cdaudio_error (_("Failed to create the CDDB connection."));
+ else
+ {
+ AUDDBG ("getting CDDB info\n");
+
+ cddb_cache_enable (pcddb_conn);
+ // cddb_cache_set_dir(pcddb_conn, "~/.cddbslave");
+
+ String server = aud_get_str ("CDDA", "cddbserver");
+ String path = aud_get_str ("CDDA", "cddbpath");
+ int port = aud_get_int ("CDDA", "cddbport");
+
+ if (aud_get_bool ("use_proxy"))
+ {
+ String prhost = aud_get_str ("proxy_host");
+ int prport = aud_get_int ("proxy_port");
+ String pruser = aud_get_str ("proxy_user");
+ String prpass = aud_get_str ("proxy_pass");
+
+ cddb_http_proxy_enable (pcddb_conn);
+ cddb_set_http_proxy_server_name (pcddb_conn, prhost);
+ cddb_set_http_proxy_server_port (pcddb_conn, prport);
+ cddb_set_http_proxy_username (pcddb_conn, pruser);
+ cddb_set_http_proxy_password (pcddb_conn, prpass);
+
+ cddb_set_server_name (pcddb_conn, server);
+ cddb_set_server_port (pcddb_conn, port);
+ }
+ else if (aud_get_bool ("CDDA", "cddbhttp"))
+ {
+ cddb_http_enable (pcddb_conn);
+ cddb_set_server_name (pcddb_conn, server);
+ cddb_set_server_port (pcddb_conn, port);
+ cddb_set_http_path_query (pcddb_conn, path);
+ }
+ else
+ {
+ cddb_set_server_name (pcddb_conn, server);
+ cddb_set_server_port (pcddb_conn, port);
+ }
+
+ pcddb_disc = cddb_disc_new ();
+
+ lba = cdio_get_track_lba (pcdrom_drive->p_cdio,
+ CDIO_CDROM_LEADOUT_TRACK);
+ cddb_disc_set_length (pcddb_disc, FRAMES_TO_SECONDS (lba));
+
+ for (int trackno = firsttrackno; trackno <= lasttrackno; trackno++)
+ {
+ pcddb_track = cddb_track_new ();
+ cddb_track_set_frame_offset (pcddb_track,
+ cdio_get_track_lba (
+ pcdrom_drive->p_cdio,
+ trackno));
+ cddb_disc_add_track (pcddb_disc, pcddb_track);
+ }
+
+ cddb_disc_calc_discid (pcddb_disc);
+
+ unsigned discid = cddb_disc_get_discid (pcddb_disc);
+ AUDDBG ("CDDB disc id = %x\n", discid);
+
+ int matches;
+ if ((matches = cddb_query (pcddb_conn, pcddb_disc)) == -1)
+ {
+ if (cddb_errno (pcddb_conn) == CDDB_ERR_OK)
+ cdaudio_error (_("Failed to query the CDDB server"));
+ else
+ cdaudio_error (_("Failed to query the CDDB server: %s"),
+ cddb_error_str (cddb_errno
+ (pcddb_conn)));
+
+ cddb_disc_destroy (pcddb_disc);
+ pcddb_disc = nullptr;
+ }
+ else
+ {
+ if (matches == 0)
+ {
+ AUDDBG ("no CDDB info available for this disc\n");
+
+ cddb_disc_destroy (pcddb_disc);
+ pcddb_disc = nullptr;
+ }
+ else
+ {
+ AUDDBG ("CDDB disc category = \"%s\"\n",
+ cddb_disc_get_category_str (pcddb_disc));
+
+ cddb_read (pcddb_conn, pcddb_disc);
+ if (cddb_errno (pcddb_conn) != CDDB_ERR_OK)
+ {
+ cdaudio_error (_("Failed to read the CDDB info: %s"),
+ cddb_error_str (cddb_errno
+ (pcddb_conn)));
+ cddb_disc_destroy (pcddb_disc);
+ pcddb_disc = nullptr;
+ }
+ else
+ {
+ trackinfo0.performer = String (cddb_disc_get_artist (pcddb_disc));
+ trackinfo0.name = String (cddb_disc_get_title (pcddb_disc));
+ trackinfo0.genre = String (cddb_disc_get_genre (pcddb_disc));
+
+ int trackno;
+ for (trackno = firsttrackno; trackno <= lasttrackno;
+ trackno++)
+ {
+ cddb_track_t *pcddb_track =
+ cddb_disc_get_track (pcddb_disc,
+ trackno - 1);
+
+ trackinfotrackno.performer = String (cddb_track_get_artist (pcddb_track));
+ trackinfotrackno.name = String (cddb_track_get_title (pcddb_track));
+ trackinfotrackno.genre = String (cddb_disc_get_genre (pcddb_disc));
+ }
+ }
+ }
+ }
+ }
+ }
+
+ if (pcddb_disc != nullptr)
+ cddb_disc_destroy (pcddb_disc);
+
+ if (pcddb_conn != nullptr)
+ cddb_destroy (pcddb_conn);
+#endif /* HAVE_LIBCDDB */
+ }
+
+ return true;
+}
+
+/* mutex must be locked */
+static bool refresh_trackinfo (bool warning)
+{
+ if (! open_cd () || ! check_disc_mode (warning))
+ goto fail;
+
+ if (! trackinfo.len () || cdio_get_media_changed (pcdrom_drive->p_cdio))
+ {
+ if (! scan_cd ())
+ goto fail;
+
+ timer_add (TimerRate::Hz1, monitor);
+ }
+
+ return true;
+
+fail:
+ reset_trackinfo ();
+ purge_func.queue (purge_all_playlists);
+ return false;
+}
+
+/* mutex must be locked */
+static void reset_trackinfo ()
+{
+ timer_remove (TimerRate::Hz1, monitor);
+
+ if (pcdrom_drive != nullptr)
+ {
+ cdda_close (pcdrom_drive);
+ pcdrom_drive = nullptr;
+ }
+
+ trackinfo.clear ();
+}
+
+/* thread safe (mutex may be locked) */
+static int calculate_track_length (int startlsn, int endlsn)
+{
+ return ((endlsn - startlsn + 1) * 1000) / 75;
+}
+
+/* thread safe (mutex may be locked) */
+static int find_trackno_from_filename (const char * filename)
+{
+ int track;
+
+ if (strncmp (filename, "cdda://?", 8) || sscanf (filename + 8, "%d",
+ &track) != 1)
+ return -1;
+
+ return track;
+}

audacious-plugins-4.4.1.tar.bz2/src/cdaudio/meson.build Added

audacious-plugins-4.4.1.tar.bz2/src/compressor/meson.build Added

audacious-plugins-4.4.1.tar.bz2/src/config.h.meson Added

audacious-plugins-3.6.2-gtk3.tar.bz2/src/console/Audacious_Driver.cc -> audacious-plugins-4.4.1.tar.bz2/src/console/Audacious_Driver.cc Changed

@@ -144,54 +144,57 @@
 return 0;
 }
 
-static Tuple get_track_ti(const char *path, const track_info_t *info, const int track)
+static int get_track_length(const track_info_t &info)
 {
- Tuple tuple;
- tuple.set_filename (path);
-
- tuple.set_str (Tuple::Artist, info->author);
- tuple.set_str (Tuple::Album, info->game);
- tuple.set_str (Tuple::Title, info->song);
- tuple.set_str (Tuple::Copyright, info->copyright);
- tuple.set_str (Tuple::Codec, info->system);
- tuple.set_str (Tuple::Comment, info->comment);
-
- if (track >= 0)
- {
- tuple.set_int (Tuple::Track, track + 1);
- tuple.set_int (Tuple::Subtune, track + 1);
- tuple.set_int (Tuple::NumSubtunes, info->track_count);
- }
- else
- tuple.set_subtunes (info->track_count, nullptr);
-
- int length = info->length;
+ int length = info.length;
 if (length <= 0)
- length = info->intro_length + 2 * info->loop_length;
+ length = info.intro_length + 2 * info.loop_length;
+
 if (length <= 0)
 length = audcfg.loop_length * 1000;
 else if (length >= fade_threshold)
 length += fade_length;
- tuple.set_int (Tuple::Length, length);
 
- return tuple;
+ return length;
 }
 
-Tuple ConsolePlugin::read_tuple(const char *filename, VFSFile &file)
+bool ConsolePlugin::read_tag(const char *filename, VFSFile &file, Tuple &tuple, Index<char> *image)
 {
 ConsoleFileHandler fh(filename, file);
 
 if (!fh.m_type)
- return Tuple ();
+ return false;
+
+ if (fh.load(gme_info_only))
+ return false;
 
- if (!fh.load(gme_info_only))
+ track_info_t info;
+ if (log_err(fh.m_emu->track_info(&info, fh.m_track < 0 ? 0 : fh.m_track)))
+ return false;
+
+ auto set_str = &tuple(Tuple::Field f, const char *s)
+ { if (s0) tuple.set_str(f, s); };
+
+ set_str(Tuple::Artist, info.author);
+ set_str(Tuple::Album, info.game);
+ set_str(Tuple::Title, info.song);
+ set_str(Tuple::Copyright, info.copyright);
+ set_str(Tuple::Codec, info.system);
+ set_str(Tuple::Comment, info.comment);
+
+ if (fh.m_track >= 0)
 {
- track_info_t info;
- if (!log_err(fh.m_emu->track_info(&info, fh.m_track < 0 ? 0 : fh.m_track)))
- return get_track_ti(fh.m_path, &info, fh.m_track);
+ tuple.set_int(Tuple::Track, fh.m_track + 1);
+ tuple.set_int(Tuple::Subtune, fh.m_track + 1);
+ tuple.set_int(Tuple::NumSubtunes, info.track_count);
 }
+ else
+ tuple.set_subtunes(info.track_count, nullptr);
+
+ tuple.set_int (Tuple::Length, get_track_length (info));
+ tuple.set_int (Tuple::Channels, 2);
 
- return Tuple ();
+ return true;
 }
 
 bool ConsolePlugin::play(const char *filename, VFSFile &file)
@@ -246,12 +249,8 @@
 if (fh.m_type == gme_spc_type && audcfg.ignore_spc_length)
 info.length = -1;
 
- Tuple tuple = get_track_ti(fh.m_path, &info, fh.m_track);
- if (tuple)
- {
- length = tuple.get_int (Tuple::Length);
- set_stream_bitrate(fh.m_emu->voice_count() * 1000);
- }
+ length = get_track_length(info);
+ set_stream_bitrate(fh.m_emu->voice_count() * 1000);
 }
 
 // start track

audacious-plugins-3.6.2-gtk3.tar.bz2/src/console/Gb_Apu.cc -> audacious-plugins-4.4.1.tar.bz2/src/console/Gb_Apu.cc Changed

audacious-plugins-3.6.2-gtk3.tar.bz2/src/console/Makefile -> audacious-plugins-4.4.1.tar.bz2/src/console/Makefile Changed

audacious-plugins-3.6.2-gtk3.tar.bz2/src/console/Spc_Cpu.cc -> audacious-plugins-4.4.1.tar.bz2/src/console/Spc_Cpu.cc Changed

audacious-plugins-3.6.2-gtk3.tar.bz2/src/console/Spc_Cpu.h -> audacious-plugins-4.4.1.tar.bz2/src/console/Spc_Cpu.h Changed

@@ -76,8 +76,8 @@
 // TODO: remove non-wrapping versions?
 #define SPC_NO_SP_WRAPAROUND 0
 
-#define SET_SP( v )     (sp = ram + 0x101 + (v))
-#define GET_SP()        (sp - 0x101 - ram)
+#define SET_SP( v )     (sp = ram + 0x101 + ((uint8_t) v))
+#define GET_SP()        (uint8_t) (sp - 0x101 - ram)
 
 #if SPC_NO_SP_WRAPAROUND
 #define PUSH16( v )     (sp -= 2, SET_LE16( sp, v ))
@@ -485,7 +485,7 @@
 
 	case 0xAF: // MOV (X)+,A
 		WRITE_DP( 0, x, a + no_read_before_write  );
-		x++;
+		x = (uint8_t) (x + 1);
 		goto loop;
 
 // 5. 8-BIT LOGIC OPERATION COMMANDS
@@ -808,7 +808,7 @@
 		unsigned temp = y * a;
 		a = (uint8_t) temp;
 		nz = ((temp >> 1) | temp) & 0x7F;
-		y = temp >> 8;
+		y = (uint8_t) (temp >> 8);
 		nz |= y;
 		goto loop;
 	}
@@ -838,6 +838,7 @@
 
 		nz = (uint8_t) a;
 		a = (uint8_t) a;
+		y = (uint8_t) y;
 
 		goto loop;
 	}
@@ -1004,7 +1005,7 @@
 	case 0x7F: // RET1
 		temp = *sp;
 		SET_PC( GET_LE16( sp + 1 ) );
-		sp += 3;
+		SET_SP( GET_SP() + 3 );
 		goto set_psw;
 	case 0x8E: // POP PSW
 		POP( temp );

audacious-plugins-3.6.2-gtk3.tar.bz2/src/console/Spc_Dsp.cc -> audacious-plugins-4.4.1.tar.bz2/src/console/Spc_Dsp.cc Changed

audacious-plugins-4.4.1.tar.bz2/src/console/meson.build Added

@@ -0,0 +1,74 @@
+gme_sources = 
+  'Ay_Apu.cc',
+  'Ay_Cpu.cc',
+  'Ay_Emu.cc',
+  'Blip_Buffer.cc',
+  'Classic_Emu.cc',
+  'Data_Reader.cc',
+  'Dual_Resampler.cc',
+  'Effects_Buffer.cc',
+  'Fir_Resampler.cc',
+  'Gbs_Emu.cc',
+  'Gb_Apu.cc',
+  'Gb_Cpu.cc',
+  'Gb_Oscs.cc',
+  'gme.cc',
+  'Gme_File.cc',
+  'Gym_Emu.cc',
+  'Gzip_Reader.cc',
+  'Hes_Apu.cc',
+  'Hes_Cpu.cc',
+  'Hes_Emu.cc',
+  'Kss_Cpu.cc',
+  'Kss_Emu.cc',
+  'Kss_Scc_Apu.cc',
+  'M3u_Playlist.cc',
+  'Multi_Buffer.cc',
+  'Music_Emu.cc',
+  'Nes_Apu.cc',
+  'Nes_Cpu.cc',
+  'Nes_Fme7_Apu.cc',
+  'Nes_Namco_Apu.cc',
+  'Nes_Oscs.cc',
+  'Nes_Vrc6_Apu.cc',
+  'Nsfe_Emu.cc',
+  'Nsf_Emu.cc',
+  'Sap_Apu.cc',
+  'Sap_Cpu.cc',
+  'Sap_Emu.cc',
+  'Sms_Apu.cc',
+  'Snes_Spc.cc',
+  'Spc_Cpu.cc',
+  'Spc_Dsp.cc',
+  'Spc_Emu.cc',
+  'Spc_Filter.cc',
+  'Vgm_Emu.cc',
+  'Vgm_Emu_Impl.cc',
+  'Ym2413_Emu.cc',
+  'Ym2612_Emu.cc',
+  'Zlib_Inflater.cc'
+
+
+
+plugin_sources = 
+  'Vfs_File.cc',
+  'Audacious_Driver.cc',
+  'configure.cc',
+  'plugin.cc'
+
+
+
+cpp_args = cxx.get_supported_arguments(
+  '-Wno-shift-negative-value'
+)
+
+
+shared_module('console',
+  gme_sources,
+  plugin_sources,
+  dependencies: audacious_dep, zlib_dep,
+  cpp_args: cpp_args,
+  name_prefix: '',
+  install: true,
+  install_dir: input_plugin_dir
+)

audacious-plugins-3.6.2-gtk3.tar.bz2/src/console/plugin.h -> audacious-plugins-4.4.1.tar.bz2/src/console/plugin.h Changed

audacious-plugins-3.6.2-gtk3.tar.bz2/src/coreaudio/Makefile -> audacious-plugins-4.4.1.tar.bz2/src/coreaudio/Makefile Changed

audacious-plugins-4.4.1.tar.bz2/src/coreaudio/audiodevice.h Added

@@ -0,0 +1,162 @@
+/*
+ File: AudioDevice.h
+ Adapted from the CAPlayThough example
+ Version: 1.2.2
+
+ Disclaimer: IMPORTANT: This Apple software is supplied to you by Apple
+ Inc. ("Apple") in consideration of your agreement to the following
+ terms, and your use, installation, modification or redistribution of
+ this Apple software constitutes acceptance of these terms. If you do
+ not agree with these terms, please do not use, install, modify or
+ redistribute this Apple software.
+
+ In consideration of your agreement to abide by the following terms, and
+ subject to these terms, Apple grants you a personal, non-exclusive
+ license, under Apple's copyrights in this original Apple software (the
+ "Apple Software"), to use, reproduce, modify and redistribute the Apple
+ Software, with or without modifications, in source and/or binary forms;
+ provided that if you redistribute the Apple Software in its entirety and
+ without modifications, you must retain this notice and the following
+ text and disclaimers in all such redistributions of the Apple Software.
+ Neither the name, trademarks, service marks or logos of Apple Inc. may
+ be used to endorse or promote products derived from the Apple Software
+ without specific prior written permission from Apple. Except as
+ expressly stated in this notice, no other rights or licenses, express or
+ implied, are granted by Apple herein, including but not limited to any
+ patent rights that may be infringed by your derivative works or by other
+ works in which the Apple Software may be incorporated.
+
+ The Apple Software is provided by Apple on an "AS IS" basis. APPLE
+ MAKES NO WARRANTIES, EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION
+ THE IMPLIED WARRANTIES OF NON-INFRINGEMENT, MERCHANTABILITY AND FITNESS
+ FOR A PARTICULAR PURPOSE, REGARDING THE APPLE SOFTWARE OR ITS USE AND
+ OPERATION ALONE OR IN COMBINATION WITH YOUR PRODUCTS.
+
+ IN NO EVENT SHALL APPLE BE LIABLE FOR ANY SPECIAL, INDIRECT, INCIDENTAL
+ OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ INTERRUPTION) ARISING IN ANY WAY OUT OF THE USE, REPRODUCTION,
+ MODIFICATION AND/OR DISTRIBUTION OF THE APPLE SOFTWARE, HOWEVER CAUSED
+ AND WHETHER UNDER THEORY OF CONTRACT, TORT (INCLUDING NEGLIGENCE),
+ STRICT LIABILITY OR OTHERWISE, EVEN IF APPLE HAS BEEN ADVISED OF THE
+ POSSIBILITY OF SUCH DAMAGE.
+
+ Copyright (C) 2013 Apple Inc. All Rights Reserved.
+ Copyright (C) 2017 René J.V. Bertin All Rights Reserved.
+
+*/
+
+#ifndef __AudioDevice_h__
+#define __AudioDevice_h__
+
+#include <CoreServices/CoreServices.h>
+#include <CoreAudio/CoreAudio.h>
+#include <AvailabilityMacros.h>
+
+#if !defined(MAC_OS_VERSION_12_0) || (MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_VERSION_12_0)
+#define kAudioObjectPropertyElementMain kAudioObjectPropertyElementMaster
+#endif
+
+#ifndef DEPRECATED_LISTENER_API
+# if !(defined(MAC_OS_X_VERSION_10_11) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_11)
+# define DEPRECATED_LISTENER_API 1
+# warning "Using the deprecated PropertyListener API; at least it works"
+# endif
+#endif
+
+#if DEPRECATED_LISTENER_API
+using AudioPropertyListenerProc = AudioDevicePropertyListenerProc;
+#else
+using AudioPropertyListenerProc = AudioObjectPropertyListenerProc;
+#endif
+
+class AudioDeviceList;
+
+class AudioDevice {
+public:
+
+ typedef void (DefaultDeviceChangeHandler)(AudioObjectID newID, void *data);
+
+ AudioDevice();
+ AudioDevice(AudioObjectID devid, bool isInput=false);
+ AudioDevice(AudioObjectID devid, bool quick, bool isInput);
+ AudioDevice(AudioObjectID devid, AudioPropertyListenerProc lProc, bool isInput=false);
+ ~AudioDevice();
+
+ void Init();
+ void Init(AudioPropertyListenerProc lProc);
+
+ bool Valid() { return mID != kAudioDeviceUnknown; }
+
+ void SetBufferSize(UInt32 size);
+ OSStatus NominalSampleRate(Float64 &sampleRate);
+ inline Float64 ClosestNominalSampleRate(Float64 sampleRate);
+ OSStatus SetNominalSampleRate(Float64 sampleRate, bool force=false);
+ OSStatus ResetNominalSampleRate(bool force=false);
+ OSStatus SetStreamBasicDescription(AudioStreamBasicDescription *desc);
+ int CountChannels();
+ char *GetName(char *buf=NULL, UInt32 maxlen=0);
+
+ void SetInitialNominalSampleRate(Float64 sampleRate)
+ {
+ mInitialFormat.mSampleRate = sampleRate;
+ }
+
+ Float64 CurrentNominalSampleRate()
+ {
+ return currentNominalSR;
+ }
+
+ AudioObjectID ID()
+ {
+ return mID;
+ }
+
+ bool isDefaultDevice()
+ {
+ return mDefaultDevice;
+ }
+ void setDefaultDevice(bool isDefault)
+ {
+ mDefaultDevice = isDefault;
+ }
+
+ void installDefaultDeviceChangeHandler(DefaultDeviceChangeHandler *handler, void *data);
+ void callDefaultDeviceChangeHandler(AudioObjectID newID);
+
+ static AudioDevice *GetDefaultDevice(bool forInput, OSStatus &err, AudioDevice *dev=NULL);
+ static AudioDevice *GetDevice(AudioObjectID devId, bool forInput, AudioDevice *dev=NULL, bool quick=false);
+
+protected:
+ AudioStreamBasicDescription mInitialFormat;
+ AudioPropertyListenerProc listenerProc;
+ OSStatus GetPropertyDataSize( AudioObjectPropertySelector property, UInt32 *size, AudioObjectPropertyAddress *propertyAddress=NULL );
+ Float64 currentNominalSR;
+ Float64 minNominalSR, maxNominalSR;
+ UInt32 nominalSampleRates;
+ Float64 *nominalSampleRateList = NULL;
+ bool discreteSampleRateList;
+ const AudioObjectID mID;
+ const bool mForInput;
+ UInt32 mSafetyOffset;
+ UInt32 mBufferSizeFrames;
+ AudioStreamBasicDescription mFormat;
+ char mDevName256 = "";
+
+ bool mInitialised = false;
+ bool mDefaultDevice = false;
+
+ DefaultDeviceChangeHandler *defDeviceChangeHandler = nullptr;
+ void *defDeviceChangeHanderData = nullptr;
+
+private:
+ bool gettingDevName = false;
+
+friend class AudioDeviceList;
+
+public:
+ UInt32 listenerSilentFor;
+};
+
+
+#endif // __AudioDevice_h__

audacious-plugins-4.4.1.tar.bz2/src/coreaudio/audiodevice.mm Added

@@ -0,0 +1,723 @@
+/*
+ File: AudioDevice.cpp
+ Adapted from the CAPlayThough example
+ Version: 1.2.2
+
+ Disclaimer: IMPORTANT: This Apple software is supplied to you by Apple
+ Inc. ("Apple") in consideration of your agreement to the following
+ terms, and your use, installation, modification or redistribution of
+ this Apple software constitutes acceptance of these terms. If you do
+ not agree with these terms, please do not use, install, modify or
+ redistribute this Apple software.
+
+ In consideration of your agreement to abide by the following terms, and
+ subject to these terms, Apple grants you a personal, non-exclusive
+ license, under Apple's copyrights in this original Apple software (the
+ "Apple Software"), to use, reproduce, modify and redistribute the Apple
+ Software, with or without modifications, in source and/or binary forms;
+ provided that if you redistribute the Apple Software in its entirety and
+ without modifications, you must retain this notice and the following
+ text and disclaimers in all such redistributions of the Apple Software.
+ Neither the name, trademarks, service marks or logos of Apple Inc. may
+ be used to endorse or promote products derived from the Apple Software
+ without specific prior written permission from Apple. Except as
+ expressly stated in this notice, no other rights or licenses, express or
+ implied, are granted by Apple herein, including but not limited to any
+ patent rights that may be infringed by your derivative works or by other
+ works in which the Apple Software may be incorporated.
+
+ The Apple Software is provided by Apple on an "AS IS" basis. APPLE
+ MAKES NO WARRANTIES, EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION
+ THE IMPLIED WARRANTIES OF NON-INFRINGEMENT, MERCHANTABILITY AND FITNESS
+ FOR A PARTICULAR PURPOSE, REGARDING THE APPLE SOFTWARE OR ITS USE AND
+ OPERATION ALONE OR IN COMBINATION WITH YOUR PRODUCTS.
+
+ IN NO EVENT SHALL APPLE BE LIABLE FOR ANY SPECIAL, INDIRECT, INCIDENTAL
+ OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ INTERRUPTION) ARISING IN ANY WAY OUT OF THE USE, REPRODUCTION,
+ MODIFICATION AND/OR DISTRIBUTION OF THE APPLE SOFTWARE, HOWEVER CAUSED
+ AND WHETHER UNDER THEORY OF CONTRACT, TORT (INCLUDING NEGLIGENCE),
+ STRICT LIABILITY OR OTHERWISE, EVEN IF APPLE HAS BEEN ADVISED OF THE
+ POSSIBILITY OF SUCH DAMAGE.
+
+ Copyright (C) 2013 Apple Inc. All Rights Reserved.
+ Copyright (C) 2017 René J.V. Bertin All Rights Reserved.
+
+*/
+
+#define __ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES 1
+
+#include "audiodevice.h"
+#import <Cocoa/Cocoa.h>
+
+#include <libaudcore/runtime.h>
+
+char *OSTStr(OSType type)
+{
+ static union OSTStr {
+ uint32_t four;
+ char str5;
+ } ltype;
+ ltype.four = EndianU32_BtoN(type);
+ ltype.str4 = '\0';
+ return ltype.str;
+}
+
+// the sample rates that can be found in the selections proposed by Audio Midi Setup. Are these representative
+// for the devices I have at my disposal, or are they determined by discrete supported values hardcoded into
+// CoreAudio or the HAL? Is there any advantage in using one of these rates, as opposed to using a different rate
+// on devices that support any rate in an interval?
+static Float64 supportedSRateList = {6400, 8000, 11025, 12000, 16000, 22050,
+ 24000, 32000, 44100, 48000, 64000, 88200, 96000, 128000, 176400, 192000
+ };
+static UInt32 supportedSRates = sizeof(supportedSRateList) / sizeof(Float64);
+
+#if DEPRECATED_LISTENER_API
+
+OSStatus DefaultListener(AudioObjectID inDevice, UInt32 inChannel, Boolean forInput,
+ AudioDevicePropertyID inPropertyID,
+ void *inClientData)
+{
+ UInt32 size;
+ Float64 sampleRate;
+ AudioDevice *dev = (AudioDevice *) inClientData;
+ NSAutoreleasePool *pool = NSAutoreleasePool alloc init;
+ NSString *msg = NSString stringWithFormat:@"Property %s for %s device %u changed; data=%p",
+ OSTStr((OSType)inPropertyID),
+ forInput ? "input from" : "output to",
+ (unsigned int)inDevice, inClientData ;
+ AudioObjectPropertyAddress theAddress = { inPropertyID,
+ forInput ? kAudioDevicePropertyScopeInput : kAudioDevicePropertyScopeOutput,
+ kAudioObjectPropertyElementMain
+ };
+
+ switch (inPropertyID) {
+ case kAudioDevicePropertyNominalSampleRate:
+ size = sizeof(sampleRate);
+ if (AudioObjectGetPropertyData(inPropertyID, &theAddress, 0, NULL, &size, &sampleRate) == noErr
+ && (dev && !dev->listenerSilentFor)) {
+ NSLog(@"%@\n\tkAudioDevicePropertyNominalSampleRate=%g\n", msg, sampleRate);
+ }
+ break;
+ case kAudioDevicePropertyActualSampleRate:
+ size = sizeof(sampleRate);
+ if (AudioObjectGetPropertyData(inPropertyID, &theAddress, 0, NULL, &size, &sampleRate) == noErr && dev) {
+ // update the rate we should reset to
+ dev->SetInitialNominalSampleRate(sampleRate);
+ if (!dev->listenerSilentFor) {
+ NSLog(@"%@\n\tkAudioDevicePropertyActualSampleRate=%g\n", msg, sampleRate);
+ }
+ }
+ break;
+ case kAudioHardwarePropertyDefaultOutputDevice:
+ if (dev) {
+ if (dev->isDefaultDevice()) {
+ UInt32 propsize;
+ AudioObjectID defaultDeviceID;
+
+ propsize = sizeof(AudioObjectID);
+ AudioObjectPropertyAddress theAddress = {
+ kAudioHardwarePropertyDefaultOutputDevice,
+ kAudioObjectPropertyScopeGlobal,
+ kAudioObjectPropertyElementMain
+ };
+ if (AudioObjectGetPropertyData(kAudioObjectSystemObject, &theAddress, 0, NULL, &propsize, &defaultDeviceID) == noErr) {
+ if (dev->ID() != defaultDeviceID) {
+ AUDWARN ("Default device changed from %d to %d\n", dev->ID(), defaultDeviceID);
+ dev->callDefaultDeviceChangeHandler(defaultDeviceID);
+ }
+ }
+ }
+ }
+ // fallthrough
+ default:
+ if ((dev && !dev->listenerSilentFor)) {
+ NSLog(@"%@", msg);
+ }
+ break;
+ }
+ if (dev && dev->listenerSilentFor) {
+ dev->listenerSilentFor -= 1;
+ }
+ if (pool) {
+ pool drain;
+ }
+ return noErr;
+}
+
+#else // !DEPRECATED_LISTENER_API
+
+static OSStatus DefaultListener(AudioObjectID inObjectID, UInt32 inNumberProperties,
+ const AudioObjectPropertyAddress propTable,
+ void *inClientData)
+{
+ UInt32 size;
+ Float64 sampleRate;
+ AudioDevice *dev = static_cast<AudioDevice *>(inClientData);
+ NSAutoreleasePool *pool = NSAutoreleasePool alloc init;
+ for (int i = 0 ; i < inNumberProperties ; ++i) {
+ NSString *msg = NSString stringWithFormat:@"#%d Property %s of device %u changed; data=%p", i,
+ OSTStr((OSType)propTablei.mElement), (unsigned int)inObjectID, inClientData ;
+ switch (propTablei.mElement) {
+ case kAudioDevicePropertyNominalSampleRate:
+ size = sizeof(sampleRate);
+ if (AudioObjectGetPropertyData(inObjectID, &propTablei, 0, NULL, &size, &sampleRate) == noErr
+ && (dev && !dev->listenerSilentFor)
+ ) {
+ NSLog(@"%@\n\tkAudioDevicePropertyNominalSampleRate=%g\n", msg, sampleRate);
+ }
+ break;
+ case kAudioDevicePropertyActualSampleRate:
+ size = sizeof(sampleRate);
+ if (AudioObjectGetPropertyData(inObjectID, &propTablei, 0, NULL, &size, &sampleRate) == noErr && dev) {
+ // update the rate we should reset to
+ dev->SetInitialNominalSampleRate(sampleRate);
+ if (!dev->listenerSilentFor) {
+ NSLog(@"%@\n\tkAudioDevicePropertyActualSampleRate=%g\n", msg, sampleRate);
+ }
+ }
+ break;
+ case kAudioHardwarePropertyDefaultOutputDevice:
+ if (dev) {
+ if (dev->isDefaultDevice()) {
+ UInt32 propsize;
+ AudioObjectID defaultDeviceID;
+
+ propsize = sizeof(AudioObjectID);
+ AudioObjectPropertyAddress theAddress = {
+ kAudioHardwarePropertyDefaultOutputDevice,
+ kAudioObjectPropertyScopeGlobal,
+ kAudioObjectPropertyElementMain
+ };
+ if (AudioObjectGetPropertyData(kAudioObjectSystemObject, &theAddress, 0, NULL, &propsize, &defaultDeviceID) == noErr) {
+ if (dev->ID() != defaultDeviceID) {
+ AUDWARN ("Default device changed from %d to %d\n", dev->ID(), defaultDeviceID);
+ }
+ }
+ }
+ }
+ // fallthrough
+ default:
+ if ((dev && !dev->listenerSilentFor)) {
+ NSLog(@"%@", msg);
+ }
+ break;
+ }
+ }
+ if (dev && dev->listenerSilentFor) {
+ dev->listenerSilentFor -= 1;
+ }
+ if (pool) {
+ pool drain;
+ }
+ return noErr;
+}
+#endif
+
+void AudioDevice::Init()
+{
+ Init(DefaultListener);
+}
+
+void AudioDevice::Init(AudioPropertyListenerProc lProc)
+{
+ if (mID == kAudioDeviceUnknown) {
+ return;
+ }
+ OSStatus err = noErr;
+
+ // getting the device name can be surprisingly slow, so we get and cache it here
+ GetName();
+
+ UInt32 propsize = sizeof(Float32);
+
+ AudioObjectPropertyAddress theAddress = { kAudioDevicePropertySafetyOffset,
+ mForInput ? kAudioDevicePropertyScopeInput : kAudioDevicePropertyScopeOutput,
+ kAudioObjectPropertyElementMain
+ }; // channel
+ verify_noerr(AudioObjectGetPropertyData(mID, &theAddress, 0, NULL, &propsize, &mSafetyOffset));
+
+ propsize = sizeof(UInt32);
+ theAddress.mSelector = kAudioDevicePropertyBufferFrameSize;
+ verify_noerr(AudioObjectGetPropertyData(mID, &theAddress, 0, NULL, &propsize, &mBufferSizeFrames));
+
+ listenerProc = lProc;
+ listenerSilentFor = 0;
+ if (lProc) {
+#if DEPRECATED_LISTENER_API
+ AUDDBG ("Installing CoreAudio listener procedure (legacy mode).\n");
+ if ((err = AudioDeviceAddPropertyListener(mID, 0, false, kAudioDevicePropertyActualSampleRate, lProc, this)) != noErr) {
+ AUDERR ("Couldn't register property listener for actual sample rate: %d (%s)\n", err, OSTStr(err));
+ }
+ if ((err = AudioDeviceAddPropertyListener(mID, 0, false, kAudioDevicePropertyNominalSampleRate, lProc, this)) != noErr) {
+ AUDERR ("Couldn't register property listener for nominal sample rate: %d (%s)\n", err, OSTStr(err));
+ }
+ if ((err = AudioDeviceAddPropertyListener(kAudioObjectSystemObject, 0, false, kAudioHardwarePropertyDefaultOutputDevice, lProc, this)) != noErr) {
+ AUDERR ("Couldn't register property listener for selected default device: %d (%s)\n", err, OSTStr(err));
+ }
+#else
+ AudioObjectPropertyAddress prop = { kAudioDevicePropertyActualSampleRate,
+ kAudioObjectPropertyScopeGlobal,
+ kAudioObjectPropertyElementMain
+ };
+ if ((err = AudioObjectAddPropertyListener(mID, &prop, lProc, this)) != noErr) {
+ AUDERR ("Couldn't register property listener for actual sample rate: %d (%s)\n", err, OSTStr(err));
+ }
+ prop.mElement = kAudioDevicePropertyNominalSampleRate;
+ if ((err = AudioObjectAddPropertyListener(mID, &prop, lProc, this)) != noErr) {
+ AUDERR ("Couldn't register property listener for nominal sample rate: %d (%s)\n", err, OSTStr(err));
+ }
+ prop.mElement = kAudioHardwarePropertyDefaultOutputDevice;
+ if ((err = AudioObjectAddPropertyListener(kAudioObjectSystemObject, &prop, lProc, this)) != noErr) {
+ AUDERR ("Couldn't register property listener for selected default device: %d (%s)\n", err, OSTStr(err));
+ }
+#endif
+ } else {
+ AUDWARN ("Warning: no CoreAudio event listener has been defined.\n");
+ }
+ propsize = sizeof(Float64);
+ theAddress.mSelector = kAudioDevicePropertyNominalSampleRate;
+ verify_noerr(AudioObjectGetPropertyData(mID, &theAddress, 0, NULL, &propsize, &currentNominalSR));
+ propsize = sizeof(AudioStreamBasicDescription);
+ theAddress.mSelector = kAudioDevicePropertyStreamFormat;
+ verify_noerr(AudioObjectGetPropertyData(mID, &theAddress, 0, NULL, &propsize, &mInitialFormat));
+ mFormat = mInitialFormat;
+ propsize = 0;
+ theAddress.mSelector = kAudioDevicePropertyAvailableNominalSampleRates;
+ // attempt to build a list of the supported sample rates
+ if ((err = AudioObjectGetPropertyDataSize(mID, &theAddress, 0, NULL, &propsize)) == noErr) {
+ AudioValueRange *list;
+ // use a fall-back value of 100 supported rates:
+ if (propsize == 0) {
+ propsize = 100 * sizeof(AudioValueRange);
+ }
+ if ((list = (AudioValueRange *) calloc(1, propsize))) {
+ // this can be slow too, but we cannot really do a background lookup.
+// fprintf(stderr, "Fetching %d nomrates\n", propsize/sizeof(AudioValueRange)); fflush(stderr);
+ theAddress.mSelector = kAudioDevicePropertyAvailableNominalSampleRates;
+ err = AudioObjectGetPropertyData(mID, &theAddress, 0, NULL, &propsize, list);
+ if (err == noErr) {
+ UInt32 i;
+ NSAutoreleasePool *pool = NSAutoreleasePool alloc init;
+ nominalSampleRates = propsize / sizeof(AudioValueRange);
+ NSMutableArray *a = NSMutableArray arrayWithCapacity:nominalSampleRates;
+ minNominalSR = list0.mMinimum;
+ maxNominalSR = list0.mMaximum;
+ // store the returned sample rates in a and record the extreme values
+ for (i = 0 ; i < nominalSampleRates ; i++) {
+ if (minNominalSR > listi.mMinimum) {
+ minNominalSR = listi.mMinimum;
+ }
+ if (maxNominalSR < listi.mMaximum) {
+ maxNominalSR = listi.mMaximum;
+ }
+ if (a) {
+ if (listi.mMinimum != listi.mMaximum) {
+ UInt32 j;
+ AUDDBG ("device sample rate #%d is an interval: %g,%g\n", i, listi.mMinimum, listi.mMaximum);
+ discreteSampleRateList = false;
+ // the 'guessing' case: the device specifies one or more ranges, without
+ // indicating which rates in that range(s) are supported. We assume the
+ // rates that Audio Midi Setup shows.
+ for (j = 0 ; j < supportedSRates ; j++) {
+ if (supportedSRateListj >= listi.mMinimum
+ && supportedSRateListj <= listi.mMaximum
+ ) {
+ a addObject:NSNumber numberWithDouble:supportedSRateListj;
+ }
+ }
+ } else {
+ // there's at least one part of the sample rate list that contains discrete
+ // supported values. I don't know if there are devices that "do this" or if they all
+ // either give discrete rates or a single continuous range. So we take the easy
+ // opt-out solution: this only costs a few cycles attempting to match a requested
+ // non-listed rate (with the potential "risk" of matching to a listed integer multiple,
+ // which should not cause any aliasing).
+ discreteSampleRateList = true;
+ // the easy case: the device specifies one or more discrete rates
+ if (!a containsObject:NSNumber numberWithDouble:listi.mMinimum) {
+ a addObject:NSNumber numberWithDouble:listi.mMinimum;
+ }
+ }
+ }
+ }
+ if (a) {
+ // sort the array (should be the case but one never knows)
+ a sortUsingSelector:@selector(compare:);
+ // retrieve the number of unique rates:
+ nominalSampleRates = a count;
+ // now copy the rates into a simple C array for faster access
+ if ((nominalSampleRateList = new Float64nominalSampleRates)) {
+ for (i = 0 ; i < nominalSampleRates ; i++) {
+ nominalSampleRateListi = a objectAtIndex:i doubleValue;
+ }
+ }
+ if (discreteSampleRateList) {
+ NSLog(@"Using audio device %u \"%s\", %u sample rates in %lu range(s); %g,%g %@; current sample rate %gHz",
+ mID, GetName(), nominalSampleRates, propsize / sizeof(AudioValueRange),
+ minNominalSR, maxNominalSR, a description, currentNominalSR);
+ } else {
+ NSLog(@"Using audio device %u \"%s\", %u supported sample rates in %lu range(s); %g,%g continuous; current sample rate %gHz",
+ mID, GetName(), nominalSampleRates, propsize / sizeof(AudioValueRange),
+ minNominalSR, maxNominalSR, currentNominalSR);
+ }
+ } else {
+ AUDINFO ("Using audio device %u \"%s\", %u sample rates in %lu range(s); %g,%g %s; current sample rate %gHz",
+ mID, GetName(), nominalSampleRates, propsize / sizeof(AudioValueRange),
+ minNominalSR, maxNominalSR, (discreteSampleRateList) ? "" : "continuous", currentNominalSR);
+ }
+ // a will be flushed down the drain:
+ pool drain;
+ }
+ free(list);
+ }
+ mInitialised = true;
+ }
+}
+
+AudioDevice::AudioDevice()
+ : mID(kAudioDeviceUnknown)
+ , mForInput(false)
+{
+ listenerProc = NULL;
+}
+
+AudioDevice::AudioDevice(AudioObjectID devid, bool forInput)
+ : mID(devid)
+ , mForInput(forInput)
+{
+ Init(DefaultListener);
+}
+
+AudioDevice::AudioDevice(AudioObjectID devid, bool quick, bool forInput)
+ : mID(devid)
+ , mForInput(forInput)
+{
+ if (!quick) {
+ Init(DefaultListener);
+ }/* else if (mID != kAudioDeviceUnknown) {
+ GetName();
+ }*/
+}
+
+AudioDevice::AudioDevice(AudioObjectID devid, AudioPropertyListenerProc lProc, bool forInput)
+ : mID(devid)
+ , mForInput(forInput)
+{
+ Init(lProc);
+}
+
+AudioDevice::~AudioDevice()
+{
+ if (mID != kAudioDeviceUnknown && mInitialised) {
+ OSStatus err;
+ AudioObjectID devId = mID;
+ // RJVB 20120902: setting the StreamFormat to the initially read values will set the channel bitdepth to 16??
+ // so we reset just the nominal sample rate.
+ err = SetNominalSampleRate(mInitialFormat.mSampleRate);
+ if (err != noErr) {
+ AUDERR ("Cannot reset initial settings for device %u (%s): err %s, %ld\n",
+ (unsigned int) mID, GetName(), OSTStr(err), (long) err);
+ }
+ if (listenerProc) {
+#if DEPRECATED_LISTENER_API
+ AudioDeviceRemovePropertyListener(mID, 0, false, kAudioDevicePropertyActualSampleRate, listenerProc);
+ AudioDeviceRemovePropertyListener(mID, 0, false, kAudioDevicePropertyNominalSampleRate, listenerProc);
+ AudioDeviceRemovePropertyListener(kAudioObjectSystemObject, 0, false, kAudioHardwarePropertyDefaultOutputDevice, listenerProc);
+#else
+ AudioObjectPropertyAddress prop = { kAudioDevicePropertyActualSampleRate,
+ kAudioObjectPropertyScopeGlobal,
+ kAudioObjectPropertyElementMain
+ };
+ verify_noerr(AudioObjectRemovePropertyListener(mID, &prop, listenerProc, this));
+ prop.mElement = kAudioDevicePropertyNominalSampleRate;
+ verify_noerr(AudioObjectRemovePropertyListener(mID, &prop, listenerProc, this));
+ prop.mElement = kAudioHardwarePropertyDefaultOutputDevice;
+ verify_noerr(AudioObjectRemovePropertyListener(kAudioObjectSystemObject, &prop, listenerProc, this));
+#endif
+ }
+ if (nominalSampleRateList) {
+ delete nominalSampleRateList;
+ }
+ AUDDBG ("AudioDevice %s (%u) released", mDevName, devId);
+ }
+}
+
+void AudioDevice::SetBufferSize(UInt32 size)
+{
+ UInt32 propsize = sizeof(UInt32);
+ AudioObjectPropertyAddress theAddress = { kAudioDevicePropertyBufferFrameSize,
+ mForInput ? kAudioDevicePropertyScopeInput : kAudioDevicePropertyScopeOutput,
+ kAudioObjectPropertyElementMain
+ }; // channel
+
+ verify_noerr(AudioObjectSetPropertyData(mID, &theAddress, 0, NULL, propsize, &size));
+ verify_noerr(AudioObjectGetPropertyData(mID, &theAddress, 0, NULL, &propsize, &mBufferSizeFrames));
+}
+
+OSStatus AudioDevice::NominalSampleRate(Float64 &sampleRate)
+{
+ UInt32 size = sizeof(Float64);
+ OSStatus err;
+ AudioObjectPropertyAddress theAddress = { kAudioDevicePropertyNominalSampleRate,
+ mForInput ? kAudioDevicePropertyScopeInput : kAudioDevicePropertyScopeOutput,
+ kAudioObjectPropertyElementMain
+ };
+ err = AudioObjectGetPropertyData(mID, &theAddress, 0, NULL, &size, &sampleRate);
+ if (err == noErr) {
+ currentNominalSR = sampleRate;
+ }
+ return err;
+}
+
+inline Float64 AudioDevice::ClosestNominalSampleRate(Float64 sampleRate)
+{
+ if (sampleRate > 0) {
+#ifndef FORCE_STANDARD_SAMPLERATES
+ if (!discreteSampleRateList && sampleRate >= minNominalSR && sampleRate <= maxNominalSR) {
+ // the device suggests it supports this exact sample rate; use it.
+ listenerSilentFor = 0;
+ return sampleRate;
+ }
+#endif
+ if (nominalSampleRateList && sampleRate >= minNominalSR && sampleRate <= maxNominalSR) {
+ Float64 minRemainder = 1;
+ Float64 closest = 0;
+ for (UInt32 i = 0 ; i < nominalSampleRates ; i++) {
+ // check if we have a hit:
+ if (sampleRate == nominalSampleRateListi) {
+ return sampleRate;
+ }
+ double dec, ent;
+ dec = modf(nominalSampleRateListi / sampleRate, &ent);
+ // if the rate at i is an integer multiple of the requested sample rate.
+ if (dec == 0) {
+ listenerSilentFor = 0;
+ return nominalSampleRateListi;
+ } else if ((1 - dec) < minRemainder) {
+ // find the match that is closest to either 1*sampleRate or 2*sampleRate
+ // IOW, the fractional part of nominalSampleRate/sampleRate is closest
+ // either to 0 or to 1 .
+ minRemainder = dec;
+ closest = nominalSampleRateListi;
+ }
+ }
+ if (closest > 0) {
+ listenerSilentFor = 0;
+ return closest;
+ }
+ }
+ static bool pass2 = false;
+ if (!pass2) {
+ Float64 sr = sampleRate;
+ int fact = 1;
+ // if we're here it's either because there's no list of known supported rates,
+ // or we didn't find an integer multiple of the requested rate in the list.
+ // scale up as required in steps of 2
+ while (sampleRate * fact < minNominalSR && sampleRate * (fact + 1) <= maxNominalSR) {
+ fact += 1;
+ }
+ sampleRate *= fact;
+ fact = 1;
+ // scale down as required in steps of 2
+ while (sampleRate / fact > maxNominalSR && sampleRate / (fact + 1) >= minNominalSR) {
+ fact += 1;
+ }
+ sampleRate /= fact;
+ if (sr != sampleRate) {
+ pass2 = true;
+ // we're now in range, do another pass to find a matching supported rate
+ sampleRate = ClosestNominalSampleRate(sampleRate);
+ pass2 = false;
+ listenerSilentFor = 0;
+ } else {
+ if (sampleRate > maxNominalSR) {
+ sampleRate = maxNominalSR;
+ } else {
+ sampleRate = minNominalSR;
+ }
+ }
+ // note that we really ought to resample the content if we're sending it to a 
+ // device running at a lower sample rate!
+ }
+ }
+ return sampleRate;
+}
+
+OSStatus AudioDevice::SetNominalSampleRate(Float64 sampleRate, bool force)
+{
+ UInt32 size = sizeof(Float64);
+ OSStatus err;
+ if (sampleRate <= 0) {
+ return paramErr;
+ }
+ listenerSilentFor = 3;
+ Float64 sampleRate2 = ClosestNominalSampleRate(sampleRate);
+ AUDINFO ("SetNominalSampleRate(%g) setting rate to %gHz", sampleRate, sampleRate2);
+ if (sampleRate2 != currentNominalSR || force) {
+ AudioObjectPropertyAddress theAddress = { kAudioDevicePropertyNominalSampleRate,
+ mForInput ? kAudioDevicePropertyScopeInput : kAudioDevicePropertyScopeOutput,
+ kAudioObjectPropertyElementMain
+ };
+ err = AudioObjectSetPropertyData(mID, &theAddress, 0, NULL, size, &sampleRate2);
+ if (err == noErr) {
+ currentNominalSR = sampleRate2;
+ } else {
+ AUDERR ("Failure setting device \"%s\" to %gHz: %d (%s)\n", GetName(), sampleRate2, err, OSTStr(err));
+ }
+ } else {
+ err = noErr;
+ }
+ return err;
+}
+
+/*!
+ Reset the nominal sample rate to the value found when opening the device
+ */
+OSStatus AudioDevice::ResetNominalSampleRate(bool force)
+{
+ UInt32 size = sizeof(Float64);
+ Float64 sampleRate = mInitialFormat.mSampleRate;
+ OSStatus err = noErr;
+ if (sampleRate != currentNominalSR || force) {
+ listenerSilentFor = 3;
+ AudioObjectPropertyAddress theAddress = { kAudioDevicePropertyNominalSampleRate,
+ mForInput ? kAudioDevicePropertyScopeInput : kAudioDevicePropertyScopeOutput,
+ kAudioObjectPropertyElementMain
+ };
+ err = AudioObjectSetPropertyData(mID, &theAddress, 0, NULL, size, &sampleRate);
+ if (err == noErr) {
+ currentNominalSR = sampleRate;
+ }
+ }
+ return err;
+}
+
+OSStatus AudioDevice::SetStreamBasicDescription(AudioStreamBasicDescription *desc)
+{
+ UInt32 size = sizeof(AudioStreamBasicDescription);
+ OSStatus err;
+ listenerSilentFor = 1;
+ AudioObjectPropertyAddress theAddress = { kAudioDevicePropertyStreamFormat,
+ mForInput ? kAudioDevicePropertyScopeInput : kAudioDevicePropertyScopeOutput,
+ kAudioObjectPropertyElementMain
+ };
+ err = AudioObjectSetPropertyData(mID, &theAddress, 0, NULL, size, desc);
+ if (err == noErr) {
+ currentNominalSR = desc->mSampleRate;
+ }
+ return err;
+}
+
+// AudioDeviceGetPropertyInfo() is deprecated, so we wrap AudioObjectGetPropertyDataSize().
+OSStatus AudioDevice::GetPropertyDataSize(AudioObjectPropertySelector property, UInt32 *size, AudioObjectPropertyAddress *propertyAddress)
+{
+ AudioObjectPropertyAddress l_propertyAddress;
+ if (!propertyAddress) {
+ propertyAddress = &l_propertyAddress;
+ }
+ propertyAddress->mSelector = property;
+ propertyAddress->mScope = (mForInput) ? kAudioDevicePropertyScopeInput : kAudioDevicePropertyScopeOutput;
+ propertyAddress->mElement = kAudioObjectPropertyElementMain;
+
+ return AudioObjectGetPropertyDataSize(mID, propertyAddress, 0, NULL, size);
+}
+
+int AudioDevice::CountChannels()
+{
+ OSStatus err;
+ UInt32 propSize;
+ AudioObjectPropertyAddress theAddress;
+ int result = 0;
+
+ err = GetPropertyDataSize(kAudioDevicePropertyStreamConfiguration, &propSize, &theAddress);
+ if (err) {
+ return 0;
+ }
+
+ AudioBufferList *buflist = (AudioBufferList *)malloc(propSize);
+ err = AudioObjectGetPropertyData(mID, &theAddress, 0, NULL, &propSize, buflist);
+ if (!err) {
+ for (UInt32 i = 0; i < buflist->mNumberBuffers; ++i) {
+ result += buflist->mBuffersi.mNumberChannels;
+ }
+ }
+ free(buflist);
+ return result;
+}
+
+char *AudioDevice::GetName(char *buf, UInt32 maxlen)
+{
+ if (!buf) {
+ buf = mDevName;
+ if (*buf) {
+ return buf;
+ }
+ maxlen = sizeof(mDevName) / sizeof(char);
+ }
+ AudioObjectPropertyAddress theAddress = { kAudioDevicePropertyDeviceName,
+ mForInput ? kAudioDevicePropertyScopeInput : kAudioDevicePropertyScopeOutput,
+ kAudioObjectPropertyElementMain
+ }; // channel
+
+ verify_noerr(AudioObjectGetPropertyData(mID, &theAddress, 0, NULL, &maxlen, buf));
+
+ return buf;
+}
+
+void AudioDevice::installDefaultDeviceChangeHandler(DefaultDeviceChangeHandler *handler, void *data)
+{
+ defDeviceChangeHandler = handler;
+ defDeviceChangeHanderData = data;
+}
+
+void AudioDevice::callDefaultDeviceChangeHandler(AudioObjectID newID)
+{
+ if (defDeviceChangeHandler) {
+ (*defDeviceChangeHandler)(newID, defDeviceChangeHanderData);
+ }
+}
+
+AudioDevice *AudioDevice::GetDefaultDevice(bool forInput, OSStatus &err, AudioDevice *dev)
+{
+ UInt32 propsize;
+ AudioObjectID defaultDeviceID;
+
+ propsize = sizeof(AudioObjectID);
+ AudioObjectPropertyAddress theAddress = {
+ forInput ? kAudioHardwarePropertyDefaultInputDevice : kAudioHardwarePropertyDefaultOutputDevice,
+ kAudioObjectPropertyScopeGlobal,
+ kAudioObjectPropertyElementMain
+ };
+ err = AudioObjectGetPropertyData(kAudioObjectSystemObject, &theAddress, 0, NULL, &propsize, &defaultDeviceID);
+ if (err == noErr) {
+ if (dev) {
+ if (dev->ID() != defaultDeviceID) {
+ delete dev;
+ } else {
+ goto bail;
+ }
+ }
+ dev = new AudioDevice(defaultDeviceID, forInput);
+ dev->mDefaultDevice = true;
+ }
+bail:
+ ;
+ return dev;
+}
+
+AudioDevice *AudioDevice::GetDevice(AudioObjectID devId, bool forInput, AudioDevice *dev, bool quick)
+{
+ if (dev) {
+ if (dev->ID() != devId) {
+ delete dev;
+ } else {
+ return dev;
+ }
+ }
+ dev = new AudioDevice(devId, quick, forInput);
+ return dev;
+}
+
+// kate: indent-mode cstyle; indent-width 4; replace-tabs on;

audacious-plugins-3.6.2-gtk3.tar.bz2/src/coreaudio/coreaudio.cc -> audacious-plugins-4.4.1.tar.bz2/src/coreaudio/coreaudio.cc Changed

@@ -35,10 +35,13 @@
 #include <libaudcore/ringbuf.h>
 #include <libaudcore/i18n.h>
 #include <libaudcore/preferences.h>
+#include <libaudcore/drct.h>
 
 #include <CoreAudio/CoreAudio.h>
 #include <AudioUnit/AudioUnit.h>
 
+#include "audiodevice.h"
+
 class CoreAudioPlugin : public OutputPlugin {
 public:
 static const char about;
@@ -53,15 +56,18 @@
 & prefs,
 };
 
- constexpr CoreAudioPlugin () : OutputPlugin (info, 5) {}
+ constexpr CoreAudioPlugin () :
+ OutputPlugin (info, 5)
+ {}
 
 bool init ();
 void cleanup ();
+ void handle_new_default_device(AudioObjectID newID);
 
 StereoVolume get_volume ();
 void set_volume (StereoVolume vol);
 
- bool open_audio (int format, int rate_, int chan_);
+ bool open_audio (int format, int rate_, int chan_, String & err);
 void close_audio ();
 
 void period_wait ();
@@ -74,7 +80,16 @@
 
 protected:
 static OSStatus callback (void *inRefCon, AudioUnitRenderActionFlags *ioActionFlags, const AudioTimeStamp *inTimeStamp, UInt32 inBusNumber, UInt32 inNumberFrames, AudioBufferList *ioData);
+ static OSStatus callback_noop (void *inRefCon, AudioUnitRenderActionFlags *ioActionFlags, const AudioTimeStamp *inTimeStamp, UInt32 inBusNumber, UInt32 inNumberFrames, AudioBufferList *ioData)
+ {
+ return notOpenErr;
+ }
+
 void check_started ();
+
+ bool set_device_samplerate(Float64 rate = 0.0);
+ AudioDevice *coreAudioDevice = nullptr;
+ bool caDeviceInitialised = false;
 };
 
 EXPORT CoreAudioPlugin aud_plugin_instance;
@@ -85,6 +100,15 @@
 aud_ui_show_error (str_printf ("CoreAudio error: " __VA_ARGS__)); \
 } while (0)
 
+static void callDefaultDeviceChangeHandler(AudioObjectID newID, void *data)
+{
+ CoreAudioPlugin *cap = static_cast<CoreAudioPlugin*>(data);
+ if (cap)
+ {
+ cap->handle_new_default_device(newID);
+ }
+}
+
 struct AudioUnitFormatDescriptionMap {
 int aud_format;
 unsigned int mBitsPerChannel;
@@ -120,7 +144,7 @@
 static struct timeval block_time = {0, 0};
 
 static AudioComponent output_comp = nullptr;
-static AudioComponentInstance output_instance = nullptr;
+static AudioUnit output_instance = nullptr;
 
 static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
 static pthread_cond_t cond = PTHREAD_COND_INITIALIZER;
@@ -129,7 +153,10 @@
 
 const char CoreAudioPlugin::about =
 N_("CoreAudio Output Plugin for Audacious\n"
- "Copyright 2014 William Pitcock\n\n"
+ "Copyright 2014 William Pitcock\n"
+ "Copyright 2017,18 René J.V. Bertin\n"
+ " (original code and code adapted from\n"
+ " Apple examples, (C) Apple 2013)\n\n"
 "Based on SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren");
 
@@ -137,11 +164,14 @@
 "vol_left", "100",
 "vol_right", "100",
 "exclusive_mode", "FALSE",
+ "bitperfect_mode", "FALSE",
 nullptr};
 
 const PreferencesWidget CoreAudioPlugin::widgets = {
 WidgetCheck (N_("Use exclusive mode"),
 WidgetBool ("coreaudio", "exclusive_mode")),
+ WidgetCheck (N_("Use bit perfect audio (adapt device sampling rate)"),
+ WidgetBool ("coreaudio", "bitperfect_mode")),
 };
 
 const PluginPreferences CoreAudioPlugin::prefs = {
@@ -151,7 +181,7 @@
 nullptr
 };
 
-bool CoreAudioPlugin::init (void)
+bool CoreAudioPlugin::init ()
 {
 aud_config_set_defaults ("coreaudio", defaults);
 
@@ -166,16 +196,17 @@
 desc.componentFlagsMask = 0;
 desc.componentManufacturer = 0;
 
- output_comp = AudioComponentFindNext (NULL, & desc);
+ output_comp = AudioComponentFindNext (nullptr, & desc);
 if (! output_comp)
 {
 error ("Failed to open default audio device.\n");
 return 0;
 }
 
- if (AudioComponentInstanceNew (output_comp, & output_instance))
+ OSStatus err = AudioComponentInstanceNew (output_comp, & output_instance);
+ if (err != noErr)
 {
- error ("Failed to open default audio device.\n");
+ error ("Failed to open default audio device (error %d).\n", err);
 return 0;
 }
 
@@ -189,11 +220,127 @@
 return 0;
 }
 
+ AudioObjectPropertyAddress prop = { kAudioHardwarePropertyDefaultOutputDevice,
+ kAudioObjectPropertyScopeGlobal,
+ kAudioObjectPropertyElementMain };
+
+ UInt32 size = sizeof(AudioObjectID);
+ AudioObjectID defaultOutputDeviceID;
+ err = AudioObjectGetPropertyData(kAudioObjectSystemObject, &prop, 0, nullptr, &size, &defaultOutputDeviceID);
+ if (err == noErr)
+ {
+ if (coreAudioDevice) {
+ // TODO: check, can this ever happen?
+ coreAudioDevice->ResetNominalSampleRate();
+ delete coreAudioDevice;
+ coreAudioDevice = nullptr;
+ }
+ coreAudioDevice = AudioDevice::GetDevice(defaultOutputDeviceID, false, coreAudioDevice, true);
+ if (coreAudioDevice != nullptr)
+ {
+ coreAudioDevice->installDefaultDeviceChangeHandler(callDefaultDeviceChangeHandler, static_cast<void*>(this));
+ coreAudioDevice->setDefaultDevice(true);
+
+ set_device_samplerate();
+
+ AUDINFO ("Using default output device #%d=\"%s\" (%p).\n",
+ defaultOutputDeviceID, coreAudioDevice->GetName(), coreAudioDevice);
+ }
+ else
+ AUDERR ("Failed to obtain a handle on the default device (%p)\n", coreAudioDevice);
+ }
+ else
+ AUDERR ("Failed to obtain the default device ID (%d) (no bit perfect audio).\n", err);
+
 return 1;
 }
 
-void CoreAudioPlugin::cleanup (void)
+// combined initialisation and rate-setter:
+// initialises the CoreAudio device handle if not yet done
+// @p rate <= 0 : reset the device sampling rate unless the handle was NOT initialised
+// @p rate > 0 : set the device sampling rate after initialisation.
+bool CoreAudioPlugin::set_device_samplerate(Float64 rate)
 {
+ bool ret = false;
+ if (coreAudioDevice)
+ {
+ if (!caDeviceInitialised)
+ {
+ // use the warning loglevel to inform the user this operation can take a while (up to a few seconds)
+ AUDWARN ("Preparing the \"%s\" for bit perfect output (this can take a moment)\n", coreAudioDevice->GetName());
+ coreAudioDevice->Init();
+ caDeviceInitialised = true;
+ }
+ else if (rate <= 0)
+ {
+ coreAudioDevice->ResetNominalSampleRate();
+ }
+ ret = coreAudioDevice->SetNominalSampleRate(rate) == noErr;
+ }
+ return ret;
+}
+
+void CoreAudioPlugin::handle_new_default_device(AudioObjectID newID)
+{
+ int currentPosition = aud_drct_get_position();
+ int currentTime = aud_drct_get_time();
+
+ aud_drct_stop();
+
+ Float64 rate = 0;
+ if (coreAudioDevice)
+ {
+ if (coreAudioDevice->NominalSampleRate(rate) != noErr)
+ {
+ rate = coreAudioDevice->CurrentNominalSampleRate();
+ }
+ }
+
+ AURenderCallbackStruct input = { callback_noop, nullptr };
+ AudioUnitSetProperty (output_instance, kAudioUnitProperty_SetRenderCallback, kAudioUnitScope_Input, 0, & input, sizeof input);
+ AudioUnitReset(output_instance, kAudioUnitScope_Global, 0);
+
+ cleanup();
+
+ AudioComponentInstanceDispose(output_instance);
+ output_instance = nullptr;
+
+ init();
+ if (currentPosition > 0 && currentTime > 0)
+ {
+ dispatch_block_t restart_playback = ^{
+ aud_drct_play();
+ aud_drct_seek(currentTime);
+ };
+ if (coreAudioDevice && rate > 0 && aud_get_bool ("coreaudio", "bitperfect_mode"))
+ {
+ // set the rate before starting playback to avoid hickups
+ AUDDBG ("Setting device to content's samplerate %gHz\n", rate);
+ set_device_samplerate(rate);
+ // give the device some time, again to avoid a hickup. A lossless
+ // playback gap is less annoying than a stutter to my ears.
+ // We use GCD to avoid a blocking wait (even if 400ms is hardly
+ // noticeable when you're busy switching the default output device
+ // via a system utility).
+ dispatch_after(dispatch_time(DISPATCH_TIME_NOW, 0.4 * NSEC_PER_SEC),
+ dispatch_get_main_queue(), restart_playback);
+ }
+ else
+ {
+ // playback can be started immediately, just invoke the block.
+ restart_playback();
+ }
+ }
+}
+
+void CoreAudioPlugin::cleanup ()
+{
+ if (coreAudioDevice) {
+ coreAudioDevice->ResetNominalSampleRate();
+ }
+ delete coreAudioDevice;
+ coreAudioDevice = nullptr;
+ caDeviceInitialised = false;
 }
 
 StereoVolume CoreAudioPlugin::get_volume ()
@@ -245,51 +392,54 @@
 return 0;
 }
 
-bool CoreAudioPlugin::open_audio (int format, int rate_, int chan_)
+// TODO: return error message to core instead of calling aud_ui_show_error
+bool CoreAudioPlugin::open_audio (int format, int rate_, int chan_, String & err)
 {
- struct AudioUnitFormatDescriptionMap * m = nullptr;
+ struct AudioUnitFormatDescriptionMap m;
 
+ m.aud_format = -1;
 for (struct AudioUnitFormatDescriptionMap it : AUFormatMap)
 {
 if (it.aud_format == format)
 {
- m = & it;
+ m = it;
 break;
 }
 }
 
- if (! m)
+ if (m.aud_format != format)
 {
 error ("The requested audio format %d is unsupported.\n", format);
 return 0;
 }
 
- AUDDBG ("Opening audio for %d channels, %d Hz.\n", chan, rate);
+ AUDDBG ("Opening audio for %d channels, %d Hz.\n", chan_, rate_);
 
 chan = chan_;
 rate = rate_;
 
- buffer_bytes_per_channel = m->mBytesPerChannel;
+ buffer_bytes_per_channel = m.mBytesPerChannel;
 
- int buffer_size = buffer_bytes_per_channel * chan * (aud_get_int (nullptr, "output_buffer_size") * rate / 1000);
+ int buffer_size = buffer_bytes_per_channel * chan * (aud_get_int ("output_buffer_size") * rate / 1000);
 buffer.alloc (buffer_size);
 
 prebuffer_flag = true;
 paused_flag = false;
 
- if (AudioUnitInitialize (output_instance))
+ OSStatus result = AudioUnitInitialize (output_instance);
+ if (result != noErr)
 {
- error ("Unable to initialize audio unit instance\n");
+ error ("Unable to initialize audio unit instance, error=%d\n", result);
 return 0;
 }
 
 AudioStreamBasicDescription streamFormat;
 streamFormat.mSampleRate = rate;
 streamFormat.mFormatID = kAudioFormatLinearPCM;
- streamFormat.mFormatFlags = m->mFormatFlags;
+ streamFormat.mFormatFlags = m.mFormatFlags;
 streamFormat.mFramesPerPacket = 1;
 streamFormat.mChannelsPerFrame = chan;
- streamFormat.mBitsPerChannel = m->mBitsPerChannel;
+ streamFormat.mBitsPerChannel = m.mBitsPerChannel;
 streamFormat.mBytesPerPacket = chan * buffer_bytes_per_channel;
 streamFormat.mBytesPerFrame = chan * buffer_bytes_per_channel;
 
@@ -299,13 +449,16 @@
 AUDDBG(" Bits per channel: %d\n", streamFormat.mBitsPerChannel);
 AUDDBG(" Bytes per frame: %d\n", streamFormat.mBytesPerFrame);
 
- if (AudioUnitSetProperty (output_instance, kAudioUnitProperty_StreamFormat, kAudioUnitScope_Input, 0, &streamFormat, sizeof(streamFormat)))
+ result = AudioUnitSetProperty (output_instance, kAudioUnitProperty_StreamFormat, kAudioUnitScope_Input, 0, &streamFormat, sizeof(streamFormat));
+ if (result)
 {
- error ("Failed to set audio unit input property.\n");
+ error ("Failed to set audio unit input property (stream format); error=%d.\n", result);
 buffer.destroy ();
 return 0;
 }
 
+ set_volume (get_volume ());
+
 bool exclusive = aud_get_bool ("coreaudio", "exclusive_mode");
 if (exclusive)
 {
@@ -315,18 +468,24 @@
 
 prop.mSelector = kAudioDevicePropertyHogMode;
 prop.mScope = kAudioObjectPropertyScopeGlobal;
- prop.mElement = kAudioObjectPropertyElementMaster;
+ prop.mElement = kAudioObjectPropertyElementMain;
 
- OSStatus err = AudioObjectSetPropertyData (kAudioObjectSystemObject, & prop, 0, NULL, sizeof hog_mode, & hog_mode);
- if (err != noErr)
+ OSStatus result = AudioObjectSetPropertyData (kAudioObjectSystemObject, & prop, 0, nullptr, sizeof hog_mode, & hog_mode);
+ if (result != noErr)
 {
- AUDWARN ("Failed to open device for exclusive mode, continuing anyway... %d\n", err);
+ AUDWARN ("Failed to open device for exclusive mode, continuing anyway... %d\n", result);
 is_exclusive = false;
 }
 else
 is_exclusive = true;
 }
 
+ if (coreAudioDevice && aud_get_bool ("coreaudio", "bitperfect_mode") && rate != coreAudioDevice->CurrentNominalSampleRate())
+ {
+ AUDDBG ("Setting device to content's samplerate %dHz\n", rate);
+ set_device_samplerate(Float64(rate));
+ }
+
 if (AudioOutputUnitStart (output_instance))
 {
 error ("Unable to start audio unit.\n");
@@ -343,6 +502,12 @@
 
 AudioOutputUnitStop (output_instance);
 
+ if (coreAudioDevice) {
+ // always restore the device samplerate when we're done playing
+ // (it's a noop when there's nothing to reset)
+ coreAudioDevice->ResetNominalSampleRate();
+ }
+
 if (is_exclusive)
 {
 UInt32 hog_mode = 0;
@@ -351,9 +516,9 @@
 
 prop.mSelector = kAudioDevicePropertyHogMode;
 prop.mScope = kAudioObjectPropertyScopeGlobal;
- prop.mElement = kAudioObjectPropertyElementMaster;
+ prop.mElement = kAudioObjectPropertyElementMain;
 
- OSStatus err = AudioObjectSetPropertyData (kAudioObjectSystemObject, & prop, 0, NULL, sizeof hog_mode, & hog_mode);
+ OSStatus err = AudioObjectSetPropertyData (kAudioObjectSystemObject, & prop, 0, nullptr, sizeof hog_mode, & hog_mode);
 if (err != noErr)
 AUDWARN ("Failed to release device from exclusive mode, continuing anyway...");

audacious-plugins-4.4.1.tar.bz2/src/coreaudio/meson.build Added

audacious-plugins-3.6.2-gtk3.tar.bz2/src/crossfade/crossfade.cc -> audacious-plugins-4.4.1.tar.bz2/src/crossfade/crossfade.cc Changed

@@ -17,8 +17,8 @@
 * the use of this software.
 */
 
+#include <math.h>
 #include <libaudcore/i18n.h>
-#include <libaudcore/interface.h>
 #include <libaudcore/plugin.h>
 #include <libaudcore/preferences.h>
 #include <libaudcore/runtime.h>
@@ -37,6 +37,9 @@
 "length", "5",
 "manual", "TRUE",
 "manual_length", "0.2",
+ "no_fade_in", "FALSE",
+ "use_sigmoid", "FALSE",
+ "sigmoid_steepness", "6",
 nullptr
 };
 
@@ -58,6 +61,14 @@
 WidgetFloat ("crossfade", "manual_length"),
 {0.1, 3.0, 0.1, N_("seconds")},
 WIDGET_CHILD),
+ WidgetCheck (N_("No fade in"),
+ WidgetBool ("crossfade", "no_fade_in")),
+ WidgetCheck (N_("Use S-curve fade"),
+ WidgetBool ("crossfade", "use_sigmoid")),
+ WidgetSpin (N_("S-curve steepness:"),
+ WidgetFloat ("crossfade", "sigmoid_steepness"),
+ {2.0, 16.0, 0.5, N_("(higher is steeper)")},
+ WIDGET_CHILD),
 WidgetLabel (N_("Tip")),
 WidgetLabel (N_("For better crossfading, enable\n"
 "the Silence Removal effect."))
@@ -91,19 +102,10 @@
 EXPORT Crossfade aud_plugin_instance;
 
 static char state = STATE_OFF;
-static int current_channels = 0, current_rate = 0;
+static int current_channels, current_rate;
 static Index<float> buffer, output;
 static int fadein_point;
 
-static void reset ()
-{
- state = STATE_OFF;
- current_channels = 0;
- current_rate = 0;
- buffer.clear ();
- output.clear ();
-}
-
 bool Crossfade::init ()
 {
 aud_config_set_defaults ("crossfade", crossfade_defaults);
@@ -112,24 +114,70 @@
 
 void Crossfade::cleanup ()
 {
- reset ();
+ state = STATE_OFF;
+ buffer.clear ();
+ output.clear ();
 }
 
-static void do_ramp (float * data, int length, float a, float b)
+static void do_linear_ramp (float * data, int length, float a, float b)
 {
 for (int i = 0; i < length; i ++)
+ (* data ++) *= (a * (length - i) + b * i) / length;
+}
+
+static void do_sigmoid_ramp (float * data, int length, float a, float b)
+{
+ float steepness = aud_get_double ("crossfade", "sigmoid_steepness");
+ for (int i = 0; i < length; i ++)
 {
- * data = (* data) * (a * (length - i) + b * i) / length;
- data ++;
+ float linear = (a * (length - i) + b * i) / length;
+ (* data ++) *= 0.5f + 0.5f * tanhf (steepness * (linear - 0.5f));
 }
 }
 
+static void do_ramp (float * data, int length, float a, float b)
+{
+ if (aud_get_bool ("crossfade", "use_sigmoid"))
+ do_sigmoid_ramp (data, length, a, b);
+ else
+ do_linear_ramp (data, length, a, b);
+}
+
 static void mix (float * data, float * add, int length)
 {
 while (length --)
 (* data ++) += (* add ++);
 }
 
+/* stupid simple resampling/rechanneling algorithm */
+static void reformat (int channels, int rate)
+{
+ if (channels == current_channels && rate == current_rate)
+ return;
+
+ int old_frames = buffer.len () / current_channels;
+ int new_frames = (int64_t) old_frames * rate / current_rate;
+
+ int mapAUD_MAX_CHANNELS;
+ for (int c = 0; c < channels; c ++)
+ mapc = c * current_channels / channels;
+
+ Index<float> new_buffer;
+ new_buffer.resize (new_frames * channels);
+
+ for (int f = 0; f < new_frames; f ++)
+ {
+ int f0 = (int64_t) f * current_rate / rate;
+ int s0 = f0 * current_channels;
+ int s = f * channels;
+
+ for (int c = 0; c < channels; c ++)
+ new_buffers + c = buffers0 + mapc;
+ }
+
+ buffer = std::move (new_buffer);
+}
+
 static int buffer_needed_for_state ()
 {
 double overlap = 0;
@@ -155,30 +203,13 @@
 void Crossfade::start (int & channels, int & rate)
 {
 if (state != STATE_OFF)
- {
- if (channels != current_channels)
- {
- aud_ui_show_error (_("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."));
- state = STATE_OFF;
- }
- else if (rate != current_rate)
- {
- aud_ui_show_error (_("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."));
- state = STATE_OFF;
- }
- }
+ reformat (channels, rate);
+
+ current_channels = channels;
+ current_rate = rate;
 
 if (state == STATE_OFF)
 {
- reset ();
-
- current_channels = channels;
- current_rate = rate;
-
 if (aud_get_bool ("crossfade", "manual"))
 {
 state = STATE_FLUSHED;
@@ -207,7 +238,9 @@
 float a = (float) fadein_point / length;
 float b = (float) (fadein_point + copy) / length;
 
- do_ramp (data.begin (), copy, a, b);
+ if (! aud_get_bool ("crossfade", "no_fade_in"))
+ do_ramp (data.begin (), copy, a, b);
+
 mix (& bufferfadein_point, data.begin (), copy);
 data.remove (0, copy);

audacious-plugins-4.4.1.tar.bz2/src/crossfade/meson.build Added

audacious-plugins-4.4.1.tar.bz2/src/crystalizer/meson.build Added

audacious-plugins-3.6.2-gtk3.tar.bz2/src/cue/cue.cc -> audacious-plugins-4.4.1.tar.bz2/src/cue/cue.cc Changed

@@ -1,6 +1,6 @@
 /*
 * Cue Sheet Plugin for Audacious
- * Copyright (c) 2009-2011 William Pitcock and John Lindgren
+ * Copyright (c) 2009-2015 William Pitcock and John Lindgren
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions are met:
@@ -17,17 +17,22 @@
 * the use of this software.
 */
 
-#include <stdlib.h>
 #include <string.h>
+#include <pthread.h>
 
+#ifdef HAVE_LIBCUE2
+#include <libcue.h>
+#else
 extern "C" {
 #include <libcue/libcue.h>
 }
+#endif
 
 #include <libaudcore/audstrings.h>
 #include <libaudcore/i18n.h>
 #include <libaudcore/plugin.h>
 #include <libaudcore/probe.h>
+#include <libaudcore/runtime.h>
 
 static const char * const cue_exts = {"cue"};
 
@@ -35,7 +40,6 @@
 {
 public:
 static constexpr PluginInfo info = {N_("Cue Sheet Plugin"), PACKAGE};
-
 constexpr CueLoader () : PlaylistPlugin (info, cue_exts, false) {}
 
 bool load (const char * filename, VFSFile & file, String & title,
@@ -44,111 +48,162 @@
 
 EXPORT CueLoader aud_plugin_instance;
 
-static const struct {
- Tuple::Field field;
- int pti;
-} pti_map = {
- { Tuple::Artist, PTI_PERFORMER },
- { Tuple::Title, PTI_TITLE },
-};
-
-static void
-tuple_attach_cdtext(Tuple &tuple, Track *track, Tuple::Field field, int pti)
+static bool is_year (const char * s)
 {
- Cdtext *cdtext;
- const char *text;
-
- cdtext = track_get_cdtext(track);
- if (cdtext == nullptr)
- return;
-
- text = cdtext_get(pti, cdtext);
- if (text == nullptr)
- return;
+ auto is_digit = (char c)
+ { return c >= '0' && c <= '9'; };
 
- tuple.set_str (field, text);
+ return is_digit (s0) && is_digit (s1) &&
+ is_digit (s2) && is_digit (s3) && ! s4;
 }
 
 bool CueLoader::load (const char * cue_filename, VFSFile & file, String & title,
 Index<PlaylistAddItem> & items)
 {
+ // XXX: cue_parse_string crashes if called concurrently
+ static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
+
 Index<char> buffer = file.read_all ();
 if (! buffer.len ())
 return false;
 
- buffer.append (0); /* null-terminated */
+ buffer.append (0); /* null-terminate */
 
+ pthread_mutex_lock (& mutex);
 Cd * cd = cue_parse_string (buffer.begin ());
- if (cd == nullptr)
- return false;
+ pthread_mutex_unlock (& mutex);
 
- int tracks = cd_get_ntrack (cd);
- if (tracks == 0)
+ int tracks = cd ? cd_get_ntrack (cd) : 0;
+ if (tracks < 1)
 return false;
 
- Track * current = cd_get_track (cd, 1);
- if (current == nullptr)
- return false;
+ Track * cur = cd_get_track (cd, 1);
+ const char * cur_name = cur ? track_get_filename (cur) : nullptr;
 
- char * track_filename = track_get_filename (current);
- if (track_filename == nullptr)
+ if (! cur_name)
 return false;
 
- String filename = String (uri_construct (track_filename, cue_filename));
-
+ bool same_file = false;
+ String filename;
+ PluginHandle * decoder = nullptr;
 Tuple base_tuple;
- bool base_tuple_scanned = false;
 
 for (int track = 1; track <= tracks; track ++)
 {
- if (current == nullptr || ! filename)
- return false;
-
- if (! base_tuple_scanned)
+ if (! same_file)
 {
- base_tuple_scanned = true;
- PluginHandle * decoder = aud_file_find_decoder (filename, false);
- if (decoder != nullptr)
- base_tuple = aud_file_read_tuple (filename, decoder);
+ filename = String (uri_construct (cur_name, cue_filename));
+ decoder = nullptr;
+ base_tuple = Tuple ();
+
+ VFSFile file;
+
+ if (filename)
+ decoder = aud_file_find_decoder (filename, false, file);
+ else
+ AUDWARN ("Unable to construct URI for track '%s' in cuesheet '%s'\n",
+ cur_name, cue_filename);
+
+ if (decoder && aud_file_read_tag (filename, decoder, file, base_tuple))
+ {
+ Cdtext * cdtext = cd_get_cdtext (cd);
+
+ if (cdtext)
+ {
+ const char * s;
+ if ((s = cdtext_get (PTI_PERFORMER, cdtext)))
+ base_tuple.set_str (Tuple::AlbumArtist, s);
+ if ((s = cdtext_get (PTI_TITLE, cdtext)))
+ base_tuple.set_str (Tuple::Album, s);
+ if ((s = cdtext_get (PTI_GENRE, cdtext)))
+ base_tuple.set_str (Tuple::Genre, s);
+ if ((s = cdtext_get (PTI_COMPOSER, cdtext)))
+ base_tuple.set_str (Tuple::Composer, s);
+ }
+
+ Rem * rem = cd_get_rem (cd);
+
+ if (rem)
+ {
+ const char * s;
+
+ if ((s = rem_get (REM_DATE, rem)))
+ {
+ if (is_year (s))
+ base_tuple.set_int (Tuple::Year, str_to_int (s));
+ else
+ base_tuple.set_str (Tuple::Date, s);
+ }
+
+ if ((s = rem_get (REM_REPLAYGAIN_ALBUM_GAIN, rem)))
+ base_tuple.set_gain (Tuple::AlbumGain, Tuple::GainDivisor, s);
+ if ((s = rem_get (REM_REPLAYGAIN_ALBUM_PEAK, rem)))
+ base_tuple.set_gain (Tuple::AlbumPeak, Tuple::PeakDivisor, s);
+ }
+ }
 }
 
 Track * next = (track + 1 <= tracks) ? cd_get_track (cd, track + 1) : nullptr;
- String next_filename = (next != nullptr) ? String (uri_construct
- (track_get_filename (next), cue_filename)) : String ();
- bool last_track = (! next_filename || strcmp (next_filename, filename));
-
- Tuple tuple = base_tuple.ref ();
- tuple.set_filename (filename);
- tuple.set_int (Tuple::Track, track);
+ const char * next_name = next ? track_get_filename (next) : nullptr;
 
- int begin = (int64_t) track_get_start (current) * 1000 / 75;
- tuple.set_int (Tuple::StartTime, begin);
+ same_file = (next_name && ! strcmp (next_name, cur_name));
 
- if (last_track)
- {
- if (base_tuple.get_value_type (Tuple::Length) == Tuple::Int)
- tuple.set_int (Tuple::Length, base_tuple.get_int (Tuple::Length) - begin);
- }
- else
+ if (base_tuple.valid ())
 {
- int length = (int64_t) track_get_length (current) * 1000 / 75;
- tuple.set_int (Tuple::Length, length);
- tuple.set_int (Tuple::EndTime, begin + length);
+ StringBuf tfilename = str_printf ("%s?%d", (const char *) cue_filename, track);
+ Tuple tuple = base_tuple.ref ();
+ tuple.set_filename (tfilename);
+ tuple.set_int (Tuple::Track, track);
+ tuple.set_str (Tuple::AudioFile, filename);
+
+ int begin = (int64_t) track_get_start (cur) * 1000 / 75;
+ tuple.set_int (Tuple::StartTime, begin);
+
+ if (same_file)
+ {
+ int end = (int64_t) track_get_start (next) * 1000 / 75;
+ tuple.set_int (Tuple::EndTime, end);
+ tuple.set_int (Tuple::Length, end - begin);
+ }
+ else
+ {
+ int length = base_tuple.get_int (Tuple::Length);
+ if (length > 0)
+ tuple.set_int (Tuple::Length, length - begin);
+ }
+
+ Cdtext * cdtext = track_get_cdtext (cur);
+
+ if (cdtext)
+ {
+ const char * s;
+ if ((s = cdtext_get (PTI_PERFORMER, cdtext)))
+ tuple.set_str (Tuple::Artist, s);
+ if ((s = cdtext_get (PTI_TITLE, cdtext)))
+ tuple.set_str (Tuple::Title, s);
+ if ((s = cdtext_get (PTI_GENRE, cdtext)))
+ tuple.set_str (Tuple::Genre, s);
+ }
+
+ Rem * rem = track_get_rem (cur);
+
+ if (rem)
+ {
+ const char * s;
+ if ((s = rem_get (REM_REPLAYGAIN_TRACK_GAIN, rem)))
+ tuple.set_gain (Tuple::TrackGain, Tuple::GainDivisor, s);
+ if ((s = rem_get (REM_REPLAYGAIN_TRACK_PEAK, rem)))
+ tuple.set_gain (Tuple::TrackPeak, Tuple::PeakDivisor, s);
+ }
+
+ items.append (String (tfilename), std::move (tuple), decoder);
 }
 
- for (auto & pti : pti_map)
- tuple_attach_cdtext (tuple, current, pti.field, pti.pti);
+ if (! next_name)
+ break;
 
- items.append (filename, std::move (tuple));
-
- current = next;
- filename = next_filename;
-
- if (last_track)
- {
- base_tuple = Tuple ();
- base_tuple_scanned = false;
- }
+ cur = next;
+ cur_name = next_name;
 }
 
 return true;

audacious-plugins-4.4.1.tar.bz2/src/cue/meson.build Added

audacious-plugins-3.6.2-gtk3.tar.bz2/src/delete-files/Makefile -> audacious-plugins-4.4.1.tar.bz2/src/delete-files/Makefile Changed

audacious-plugins-3.6.2-gtk3.tar.bz2/src/delete-files/delete-files.cc -> audacious-plugins-4.4.1.tar.bz2/src/delete-files/delete-files.cc Changed

@@ -24,7 +24,6 @@
 
 #include <gio/gio.h>
 #include <glib/gstdio.h>
-#include <gtk/gtk.h>
 
 #include <libaudcore/audstrings.h>
 #include <libaudcore/i18n.h>
@@ -33,7 +32,15 @@
 #include <libaudcore/plugin.h>
 #include <libaudcore/preferences.h>
 #include <libaudcore/runtime.h>
+
+#ifdef USE_GTK
 #include <libaudgui/libaudgui-gtk.h>
+#endif
+#ifdef USE_QT
+#include <QMessageBox>
+#include <QPushButton>
+#include <libaudqt/libaudqt.h>
+#endif
 
 class DeleteFiles : public GeneralPlugin
 {
@@ -63,115 +70,214 @@
 AudMenuID::PlaylistRemove
 };
 
+#ifdef USE_GTK
 static GtkWidget * dialog = nullptr;
+#endif
+#ifdef USE_QT
+static QMessageBox * qdialog = nullptr;
+#endif
 
-static void move_to_trash (const char * filename)
+static bool delete_uri (const char * uri, bool use_trash)
 {
- GFile * gfile = g_file_new_for_path (filename);
+ GFile * gfile = g_file_new_for_uri (uri);
 GError * gerror = nullptr;
 
- if (! g_file_trash (gfile, nullptr, & gerror))
+ bool success = use_trash ?
+ g_file_trash (gfile, nullptr, & gerror) :
+ g_file_delete (gfile, nullptr, & gerror);
+
+ if (! success)
 {
- aud_ui_show_error (str_printf (_("Error moving %s to trash: %s."),
- filename, gerror->message));
+ aud_ui_show_error (gerror->message);
 g_error_free (gerror);
 }
 
 g_object_unref ((GObject *) gfile);
+ return success;
 }
 
-static void really_delete (const char * filename)
+class DeleteOperation
 {
- if (g_unlink (filename) < 0)
- aud_ui_show_error (str_printf (_("Error deleting %s: %s."), filename, strerror (errno)));
-}
+public:
+ DeleteOperation (Playlist playlist) :
+ m_playlist (playlist),
+ m_use_trash (aud_get_bool ("delete_files", "use_trash"))
+ {
+ int num_entries = playlist.n_entries ();
+ for (int i = 0; i < num_entries; i ++)
+ {
+ if (playlist.entry_selected (i))
+ m_files.append (playlist.entry_filename (i));
+ }
+ }
 
-static void confirm_delete (void)
-{
- Index<String> files;
+ StringBuf prompt () const
+ {
+ StringBuf buf;
 
- int playlist = aud_playlist_get_active ();
- int entry_count = aud_playlist_entry_count (playlist);
+ if (! m_files.len ())
+ {
+ buf.insert (-1, _("No files are selected."));
+ }
+ else if (m_files.len () == 1)
+ {
+ const char * format = m_use_trash ?
+ _("Do you want to move %s to the trash?") :
+ _("Do you want to permanently delete %s?");
+ StringBuf display = uri_to_display (m_files0);
+ str_append_printf (buf, format, (const char *) display);
+ }
+ else
+ {
+ const char * format = m_use_trash ?
+ _("Do you want to move %d files to the trash?") :
+ _("Do you want to permanently delete %d files?");
+ str_append_printf (buf, format, m_files.len ());
+ }
 
- for (int i = 0; i < entry_count; i ++)
+ return buf;
+ }
+
+ const char * action () const
 {
- if (aud_playlist_entry_get_selected (playlist, i))
- files.append (aud_playlist_entry_get_filename (playlist, i));
+ if (! m_files.len ())
+ return nullptr;
+
+ return m_use_trash ? _("Move to trash") : _("Delete");
 }
 
- aud_playlist_delete_selected (playlist);
+ const char * icon () const
+ {
+ if (! m_files.len ())
+ return nullptr;
 
- for (const String & uri : files)
+ return m_use_trash ? "user-trash" : "edit-delete";
+ }
+
+ void run () const
 {
- StringBuf filename = uri_to_filename (uri);
+ /* work around -Wignored-attributes on MinGW */
+ auto string_compare = (const String & a, const String & b)
+ { return strcmp (a, b); };
+
+ Index<String> deleted;
 
- if (filename)
+ for (auto & uri: m_files)
 {
- if (aud_get_bool ("delete_files", "use_trash"))
- move_to_trash (filename);
- else
- really_delete (filename);
+ if (delete_uri (uri, m_use_trash))
+ deleted.append (uri);
 }
- else
- aud_ui_show_error (str_printf
- (_("Error deleting %s: not a local file."), (const char *) uri));
+
+ deleted.sort (string_compare);
+
+ /* make sure selection matches what we actually deleted */
+ int num_entries = m_playlist.n_entries ();
+ for (int i = 0; i < num_entries; i++)
+ {
+ int j = deleted.bsearch (m_playlist.entry_filename (i), string_compare);
+ m_playlist.select_entry (i, (j >= 0));
+ }
+
+ m_playlist.remove_selected ();
 }
-}
 
-static void start_delete (void)
+private:
+ const Playlist m_playlist;
+ const bool m_use_trash;
+ Index<String> m_files;
+};
+
+static void start_delete ()
 {
- if (dialog)
+ auto op = new DeleteOperation (Playlist::active_playlist ());
+
+ StringBuf prompt = op->prompt ();
+ const char * action = op->action ();
+ const char * icon = op->icon ();
+
+ if (! action)
 {
- gtk_window_present ((GtkWindow *) dialog);
+ aud_ui_show_error (prompt);
+ delete op;
 return;
 }
 
- const char * message;
- GtkWidget * button1, * button2;
-
- if (aud_get_bool ("delete_files", "use_trash"))
+#ifdef USE_GTK
+ if (aud_get_mainloop_type () == MainloopType::GLib)
 {
- message = _("Do you want to move the selected files to the trash?");
- button1 = audgui_button_new (_("Move to Trash"), "user-trash",
- (AudguiCallback) confirm_delete, nullptr);
+ if (dialog)
+ gtk_widget_destroy (dialog);
+
+ auto run_cb = aud::obj_member<DeleteOperation, & DeleteOperation::run>;
+ auto button1 = audgui_button_new (action, icon, run_cb, op);
+ auto button2 = audgui_button_new (_("Cancel"), "process-stop", nullptr, nullptr);
+
+ dialog = audgui_dialog_new (GTK_MESSAGE_QUESTION, _("Delete Files"), prompt, button1, button2);
+
+ g_signal_connect (dialog, "destroy", (GCallback) gtk_widget_destroyed, & dialog);
+ g_signal_connect_swapped (dialog, "destroy", (GCallback) aud::delete_obj<DeleteOperation>, op);
+ gtk_widget_show_all (dialog);
 }
- else
+#endif
+#ifdef USE_QT
+ if (aud_get_mainloop_type () == MainloopType::Qt)
 {
- message = _("Do you want to permanently delete the selected files?");
- button1 = audgui_button_new (_("Delete"), "edit-delete",
- (AudguiCallback) confirm_delete, nullptr);
- }
+ delete qdialog;
+
+ qdialog = new QMessageBox;
+ qdialog->setAttribute (Qt::WA_DeleteOnClose);
+ qdialog->setIcon (QMessageBox::Question);
+ qdialog->setWindowTitle (_("Delete Files"));
+ qdialog->setWindowRole ("message");
+ qdialog->setText ((const char *) prompt);
+
+ auto remove = new QPushButton (action, qdialog);
+ auto cancel = new QPushButton (_("Cancel"), qdialog);
+
+ remove->setIcon (QIcon::fromTheme (icon));
+ cancel->setIcon (QIcon::fromTheme ("process-stop"));
 
- button2 = audgui_button_new (_("Cancel"), "process-stop", nullptr, nullptr);
- dialog = audgui_dialog_new (GTK_MESSAGE_QUESTION, _("Delete Files"),
- message, button1, button2);
+ qdialog->addButton (remove, QMessageBox::AcceptRole);
+ qdialog->addButton (cancel, QMessageBox::RejectRole);
 
- g_signal_connect (dialog, "destroy", (GCallback) gtk_widget_destroyed, & dialog);
- gtk_widget_show_all (dialog);
+ QObject::connect (remove, & QPushButton::clicked, op () {
+ op->run ();
+ });
+ QObject::connect (qdialog, & QObject::destroyed, op () {
+ qdialog = nullptr;
+ delete op;
+ });
+
+ qdialog->show ();
+ }
+#endif
 }
 
 const char * const DeleteFiles::defaults = {
 "use_trash", "TRUE",
 nullptr};
 
-bool DeleteFiles::init (void)
+bool DeleteFiles::init ()
 {
-#if ! GLIB_CHECK_VERSION (2, 36, 0)
 g_type_init ();
-#endif
 
 aud_config_set_defaults ("delete_files", defaults);
 
 for (AudMenuID menu : menus)
 aud_plugin_menu_add (menu, start_delete, _("Delete Selected Files"), "edit-delete");
 
- return TRUE;
+ return true;
 }
 
-void DeleteFiles::cleanup (void)
+void DeleteFiles::cleanup ()
 {
+#ifdef USE_GTK
 if (dialog)
 gtk_widget_destroy (dialog);
+#endif
+#ifdef USE_QT
+ delete qdialog;
+#endif
 
 for (AudMenuID menu : menus)
 aud_plugin_menu_remove (menu, start_delete);

audacious-plugins-4.4.1.tar.bz2/src/delete-files/meson.build Added

audacious-plugins-4.4.1.tar.bz2/src/echo_plugin/meson.build Added

audacious-plugins-3.6.2-gtk3.tar.bz2/src/ffaudio/Makefile -> audacious-plugins-4.4.1.tar.bz2/src/ffaudio/Makefile Changed

audacious-plugins-3.6.2-gtk3.tar.bz2/src/ffaudio/TODO -> audacious-plugins-4.4.1.tar.bz2/src/ffaudio/TODO Changed

audacious-plugins-3.6.2-gtk3.tar.bz2/src/ffaudio/ffaudio-core.cc -> audacious-plugins-4.4.1.tar.bz2/src/ffaudio/ffaudio-core.cc Changed

@@ -2,7 +2,7 @@
 * Audacious FFaudio Plugin
 * Copyright © 2009 William Pitcock <nenolod@dereferenced.org>
 * Matti Hämäläinen <ccr@tnsp.org>
- * Copyright © 2011 John Lindgren <john.lindgren@tds.net>
+ * Copyright © 2011-2016 John Lindgren <john.lindgren@aol.com>
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions are met:
@@ -18,19 +18,28 @@
 * implied. In no event shall the authors be liable for any damages arising from
 */
 
-#include <pthread.h>
-
 #undef FFAUDIO_DOUBLECHECK /* Doublecheck probing result for debugging purposes */
 #undef FFAUDIO_NO_BLACKLIST /* Don't blacklist any recognized codecs/formats */
 
 #include "ffaudio-stdinc.h"
 
+#include <limits.h>
+#include <pthread.h>
+
 #include <audacious/audtag.h>
 #include <libaudcore/audstrings.h>
 #include <libaudcore/i18n.h>
 #include <libaudcore/multihash.h>
 #include <libaudcore/runtime.h>
 
+#if CHECK_LIBAVFORMAT_VERSION (57, 33, 100)
+#define ALLOC_CONTEXT 1
+#endif
+
+#if CHECK_LIBAVCODEC_VERSION (57, 37, 100)
+#define SEND_PACKET 1
+#endif
+
 class FFaudio : public InputPlugin
 {
 public:
@@ -43,19 +52,16 @@
 about
 };
 
- static constexpr auto iinfo = InputInfo (FlagWritesTag)
+ constexpr FFaudio () : InputPlugin (info, InputInfo (FlagWritesTag)
 .with_priority (10) /* lowest priority fallback */
 .with_exts (exts)
- .with_mimes (mimes);
-
- constexpr FFaudio () : InputPlugin (info, iinfo) {}
+ .with_mimes (mimes)) {}
 
 bool init ();
 void cleanup ();
 
 bool is_our_file (const char * filename, VFSFile & file);
- Tuple read_tuple (const char * filename, VFSFile & file);
- Index<char> read_image (const char * filename, VFSFile & file);
+ bool read_tag (const char * filename, VFSFile & file, Tuple & tuple, Index<char> * image);
 bool write_tuple (const char * filename, VFSFile & file, const Tuple & tuple);
 bool play (const char * filename, VFSFile & file);
 };
@@ -66,15 +72,86 @@
 {
 int stream_idx;
 AVStream * stream;
- AVCodecContext * context;
 AVCodec * codec;
 }
 CodecInfo;
 
+struct ScopedContext
+{
+ AVCodecContext * ptr;
+ AVCodecContext * operator-> () { return ptr; }
+
+ ScopedContext (const CodecInfo & cinfo)
+ {
+#ifdef ALLOC_CONTEXT
+ ptr = avcodec_alloc_context3 (cinfo.codec);
+ avcodec_parameters_to_context (ptr, cinfo.stream->codecpar);
+#else
+ ptr = cinfo.stream->codec;
+#endif
+
+#if CHECK_LIBAVCODEC_VERSION(58, 9, 100)
+ ptr->pkt_timebase = cinfo.stream->time_base;
+#else
+ av_codec_set_pkt_timebase (ptr, cinfo.stream->time_base);
+#endif
+ }
+
+#ifdef ALLOC_CONTEXT
+ ~ScopedContext () { avcodec_free_context (& ptr); }
+#else
+ ~ScopedContext () { avcodec_close (ptr); }
+#endif
+};
+
+struct ScopedPacket
+{
+ AVPacket * ptr;
+ AVPacket * operator-> () { return ptr; }
+
+#if CHECK_LIBAVCODEC_VERSION(57, 12, 100)
+ ScopedPacket () { ptr = av_packet_alloc (); }
+ ~ScopedPacket () { av_packet_free (& ptr); }
+
+ void clear ()
+ {
+ av_packet_free (& ptr);
+ ptr = av_packet_alloc ();
+ }
+#else
+ ScopedPacket ()
+ {
+ ptr = new AVPacket ();
+ av_init_packet (ptr);
+ }
+
+ ~ScopedPacket ()
+ {
+ av_packet_unref (ptr);
+ delete ptr;
+ }
+
+ void clear ()
+ {
+ av_packet_unref (ptr);
+ * ptr = AVPacket ();
+ av_init_packet (ptr);
+ }
+#endif
+};
+
+struct ScopedFrame
+{
+ AVFrame * ptr = av_frame_alloc ();
+ AVFrame * operator-> () { return ptr; }
+ ~ScopedFrame () { av_frame_free (& ptr); }
+};
+
 static SimpleHash<String, AVInputFormat *> extension_dict;
 
 static void create_extension_dict ();
 
+#if ! CHECK_LIBAVCODEC_VERSION(58, 9, 100)
 static int lockmgr (void * * mutexp, enum AVLockOp op)
 {
 switch (op)
@@ -97,6 +174,7 @@
 
 return 0;
 }
+#endif
 
 static void ffaudio_log_cb (void * avcl, int av_level, const char * fmt, va_list va)
 {
@@ -132,8 +210,12 @@
 
 bool FFaudio::init ()
 {
+#if ! CHECK_LIBAVFORMAT_VERSION(58, 9, 100)
 av_register_all();
+#endif
+#if ! CHECK_LIBAVCODEC_VERSION(58, 9, 100)
 av_lockmgr_register (lockmgr);
+#endif
 
 create_extension_dict ();
 
@@ -146,19 +228,36 @@
 {
 extension_dict.clear ();
 
+#if ! CHECK_LIBAVCODEC_VERSION(58, 9, 100)
 av_lockmgr_register (nullptr);
+#endif
 }
 
-static const char * ffaudio_strerror (int error)
+static int log_result (const char * func, int ret)
 {
- static char buf256;
- return (! av_strerror (error, buf, sizeof buf)) ? buf : "unknown error";
+ if (ret < 0 && ret != (int) AVERROR_EOF && ret != AVERROR (EAGAIN))
+ {
+ static char buf256;
+ if (! av_strerror (ret, buf, sizeof buf))
+ AUDERR ("%s failed: %s\n", func, buf);
+ else
+ AUDERR ("%s failed\n", func);
+ }
+
+ return ret;
 }
 
+#define LOG(function, ...) log_result (#function, function (__VA_ARGS__))
+
 static void create_extension_dict ()
 {
 AVInputFormat * f;
+#if CHECK_LIBAVFORMAT_VERSION(58, 9, 100)
+ void * iter = nullptr;
+ while ((f = const_cast<AVInputFormat *> (av_demuxer_iterate (& iter))))
+#else
 for (f = av_iformat_next (nullptr); f; f = av_iformat_next (f))
+#endif
 {
 if (! f->extensions)
 continue;
@@ -177,20 +276,19 @@
 if (! ext)
 return nullptr;
 
- AUDDBG ("Get format by extension: %s\n", name);
 AVInputFormat * * f = extension_dict.lookup (String (str_tolower (ext)));
 
 if (f && * f)
- AUDDBG ("Format %s.\n", (* f)->name);
+ AUDINFO ("Matched format %s by extension.\n", (* f)->name);
 else
- AUDDBG ("Format unknown.\n");
+ AUDINFO ("No format matched by extension.\n");
 
 return f ? * f : nullptr;
 }
 
 static AVInputFormat * get_format_by_content (const char * name, VFSFile & file)
 {
- AUDDBG ("Get format by content: %s\n", name);
+ AUDDBG ("Probing content: %s\n", name);
 
 AVInputFormat * f = nullptr;
 
@@ -209,7 +307,7 @@
 AVProbeData d = {name, buf, filled};
 score = target;
 
- f = av_probe_input_format2 (& d, true, & score);
+ f = (AVInputFormat *) av_probe_input_format2 (& d, true, & score);
 if (f)
 break;
 
@@ -222,9 +320,9 @@
 }
 
 if (f)
- AUDDBG ("Format %s, buffer size %d, score %d.\n", f->name, filled, score);
+ AUDINFO ("Probe matched format %s, buffer size %d, score %d.\n", f->name, filled, score);
 else
- AUDDBG ("Format unknown.\n");
+ AUDINFO ("Probe did not match any known formats.\n");
 
 if (file.fseek (0, VFS_SEEK_SET) < 0)
 ; /* ignore errors here */
@@ -252,11 +350,8 @@
 AVIOContext * io = io_context_new (file);
 c->pb = io;
 
- int ret = avformat_open_input (& c, name, f, nullptr);
-
- if (ret < 0)
+ if (LOG (avformat_open_input, & c, name, f, nullptr) < 0)
 {
- AUDERR ("avformat_open_input failed for %s: %s.\n", name, ffaudio_strerror (ret));
 io_context_free (io);
 return nullptr;
 }
@@ -268,12 +363,7 @@
 {
 AVIOContext * io = c->pb;
 
-#if CHECK_LIBAVFORMAT_VERSION (53, 25, 0, 53, 17, 0)
 avformat_close_input (&c);
-#else
- av_close_input_file (c);
-#endif
-
 io_context_free (io);
 }
 
@@ -285,20 +375,23 @@
 {
 AVStream * stream = c->streamsi;
 
- if (stream && stream->codec && stream->codec->codec_type == AVMEDIA_TYPE_AUDIO)
+#ifndef ALLOC_CONTEXT
+#define codecpar codec
+#endif
+ if (stream && stream->codecpar && stream->codecpar->codec_type == AVMEDIA_TYPE_AUDIO)
 {
- AVCodec * codec = avcodec_find_decoder (stream->codec->codec_id);
+ AVCodec * codec = (AVCodec *) avcodec_find_decoder (stream->codecpar->codec_id);
 
 if (codec)
 {
 cinfo->stream_idx = i;
 cinfo->stream = stream;
- cinfo->context = stream->codec;
 cinfo->codec = codec;
 
 return true;
 }
 }
+#undef codecpar
 }
 
 return false;
@@ -317,6 +410,7 @@
 {Tuple::String, Tuple::Artist, {"author", "hor", "artist", nullptr}},
 {Tuple::String, Tuple::Title, {"title", "le", nullptr}},
 {Tuple::String, Tuple::Album, {"album", "WM/AlbumTitle", nullptr}},
+ {Tuple::String, Tuple::AlbumArtist, {"album_artist", nullptr}},
 {Tuple::String, Tuple::Performer, {"performer", nullptr}},
 {Tuple::String, Tuple::Copyright, {"copyright", nullptr}},
 {Tuple::String, Tuple::Genre, {"genre", "WM/Genre", nullptr}},
@@ -324,6 +418,7 @@
 {Tuple::String, Tuple::Composer, {"composer", nullptr}},
 {Tuple::Int, Tuple::Year, {"year", "WM/Year", "date", nullptr}},
 {Tuple::Int, Tuple::Track, {"track", "WM/TrackNumber", nullptr}},
+ {Tuple::Int, Tuple::Disc, {"disc", "WM/PartOfSet", nullptr}},
 };
 
 static void read_metadata_dict (Tuple & tuple, AVDictionary * dict)
@@ -345,191 +440,193 @@
 }
 }
 
-Tuple FFaudio::read_tuple (const char * filename, VFSFile & file)
+bool FFaudio::read_tag (const char * filename, VFSFile & file, Tuple & tuple, Index<char> * image)
 {
- Tuple tuple;
- AVFormatContext * ic = open_input_file (filename, file);
+ SmartPtr<AVFormatContext, close_input_file>
+ ic (open_input_file (filename, file));
 
- if (ic)
- {
- CodecInfo cinfo;
+ if (! ic)
+ return false;
 
- if (find_codec (ic, & cinfo))
- {
- tuple.set_filename (filename);
+ CodecInfo cinfo;
+ if (! find_codec (ic.get (), & cinfo))
+ return false;
 
- tuple.set_int (Tuple::Length, ic->duration / 1000);
- tuple.set_int (Tuple::Bitrate, ic->bit_rate / 1000);
+ if (ic->duration > 0 && ic->duration / 1000 <= INT_MAX)
+ tuple.set_int (Tuple::Length, ic->duration / 1000);
+ if (ic->bit_rate > 0 && ic->bit_rate / 1000 <= INT_MAX)
+ tuple.set_int (Tuple::Bitrate, ic->bit_rate / 1000);
 
- if (cinfo.codec->long_name)
- tuple.set_str (Tuple::Codec, cinfo.codec->long_name);
+ if (cinfo.codec->long_name)
+ tuple.set_str (Tuple::Codec, cinfo.codec->long_name);
 
- if (ic->metadata)
- read_metadata_dict (tuple, ic->metadata);
- if (cinfo.stream->metadata)
- read_metadata_dict (tuple, cinfo.stream->metadata);
- }
+ if (ic->metadata)
+ read_metadata_dict (tuple, ic->metadata);
+ if (cinfo.stream->metadata)
+ read_metadata_dict (tuple, cinfo.stream->metadata);
 
- close_input_file (ic);
- }
+ if (! file.fseek (0, VFS_SEEK_SET))
+ audtag::read_tag (file, tuple, image);
 
- if (tuple && ! file.fseek (0, VFS_SEEK_SET))
- audtag::tuple_read (tuple, file);
+ if (image && ! image->len ())
+ {
+ for (unsigned i = 0; i < ic->nb_streams; i ++)
+ {
+ if (ic->streamsi->attached_pic.size > 0)
+ {
+ image->insert ((char *) ic->streamsi->attached_pic.data, 0,
+ ic->streamsi->attached_pic.size);
+ break;
+ }
+ }
+ }
 
- return tuple;
+ return true;
 }
 
 bool FFaudio::write_tuple (const char * filename, VFSFile & file, const Tuple & tuple)
 {
 if (str_has_suffix_nocase (filename, ".ape"))
- return audtag::tuple_write (tuple, file, audtag::TagType::APE);
+ return audtag::write_tuple (file, tuple, audtag::TagType::APE);
 
- return audtag::tuple_write (tuple, file, audtag::TagType::None);
+ return audtag::write_tuple (file, tuple, audtag::TagType::None);
 }
 
-Index<char> FFaudio::read_image (const char * filename, VFSFile & file)
+static bool convert_format (int ff_fmt, int & aud_fmt, bool & planar)
 {
- if (str_has_suffix_nocase (filename, ".m4a") || str_has_suffix_nocase (filename, ".mp4"))
- return read_itunes_cover (filename, file);
+ switch (ff_fmt)
+ {
+ case AV_SAMPLE_FMT_U8: aud_fmt = FMT_U8; planar = false; break;
+ case AV_SAMPLE_FMT_S16: aud_fmt = FMT_S16_NE; planar = false; break;
+ case AV_SAMPLE_FMT_S32: aud_fmt = FMT_S32_NE; planar = false; break;
+ case AV_SAMPLE_FMT_FLT: aud_fmt = FMT_FLOAT; planar = false; break;
+
+ case AV_SAMPLE_FMT_U8P: aud_fmt = FMT_U8; planar = true; break;
+ case AV_SAMPLE_FMT_S16P: aud_fmt = FMT_S16_NE; planar = true; break;
+ case AV_SAMPLE_FMT_S32P: aud_fmt = FMT_S32_NE; planar = true; break;
+ case AV_SAMPLE_FMT_FLTP: aud_fmt = FMT_FLOAT; planar = true; break;
+
+ default:
+ AUDERR ("Unsupported audio format %d\n", (int) ff_fmt);
+ return false;
+ }
 
- return Index<char> ();
+ return true;
 }
 
 bool FFaudio::play (const char * filename, VFSFile & file)
 {
- AUDDBG ("Playing %s.\n", filename);
-
- AVPacket pkt = AVPacket();
- int errcount;
- bool codec_opened = false;
- int out_fmt;
- bool planar;
- bool error = false;
+ SmartPtr<AVFormatContext, close_input_file>
+ ic (open_input_file (filename, file));
 
- Index<char> buf;
-
- AVFormatContext * ic = open_input_file (filename, file);
 if (! ic)
 return false;
 
 CodecInfo cinfo;
-
- if (! find_codec (ic, & cinfo))
+ if (! find_codec (ic.get (), & cinfo))
 {
 AUDERR ("No codec found for %s.\n", filename);
- goto error_exit;
+ return false;
 }
 
 AUDDBG("got codec %s for stream index %d, opening\n", cinfo.codec->name, cinfo.stream_idx);
 
- if (avcodec_open2 (cinfo.context, cinfo.codec, nullptr) < 0)
- goto error_exit;
-
- codec_opened = true;
-
- 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;
+ ScopedContext context (cinfo);
+ if (LOG (avcodec_open2, context.ptr, cinfo.codec, nullptr) < 0)
+ return false;
 
- 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;
+ int out_fmt; bool planar;
+ if (! convert_format (context->sample_fmt, out_fmt, planar))
+ return false;
 
- default:
- AUDERR ("Unsupported audio format %d\n", (int) cinfo.context->sample_fmt);
- goto error_exit;
- }
+#if CHECK_LIBAVCODEC_VERSION(59, 37, 100)
+ int channels = context->ch_layout.nb_channels;
+#else
+ int channels = context->channels;
+#endif
 
 /* Open audio output */
- AUDDBG("opening audio output\n");
-
 set_stream_bitrate(ic->bit_rate);
- open_audio(out_fmt, cinfo.context->sample_rate, cinfo.context->channels);
+ open_audio(out_fmt, context->sample_rate, channels);
+
+ int errcount = 0;
+ bool eof = false;
 
- errcount = 0;
+ Index<char> buf;
 
- while (! check_stop ())
+ while (! eof && ! check_stop ())
 {
 int seek_value = check_seek ();
 
 if (seek_value >= 0)
 {
- if (av_seek_frame (ic, -1, (int64_t) seek_value * AV_TIME_BASE /
- 1000, AVSEEK_FLAG_ANY) < 0)
- {
- AUDERR ("error while seeking\n");
- } else
+ if (LOG (av_seek_frame, ic.get (), -1, (int64_t) seek_value *
+ AV_TIME_BASE / 1000, AVSEEK_FLAG_ANY) >= 0)
 errcount = 0;
-
- seek_value = -1;
 }
 
- AVPacket tmp;
- int ret;
-
 /* Read next frame (or more) of data */
- if ((ret = av_read_frame(ic, &pkt)) < 0)
+ ScopedPacket pkt;
+ int ret = LOG (av_read_frame, ic.get (), pkt.ptr);
+
+ if (ret < 0)
 {
 if (ret == (int) AVERROR_EOF)
 {
- AUDDBG("eof reached\n");
- break;
+ /* On EOF, send an empty packet to "flush" the decoder */
+ pkt.clear ();
+ eof = true;
 }
+ else if (++ errcount > 4)
+ return false;
 else
- {
- if (++errcount > 4)
- {
- AUDERR ("av_read_frame error %d, giving up.\n", ret);
- break;
- } else
- continue;
- }
- } else
+ continue;
+ }
+ else
+ {
 errcount = 0;
 
- /* Ignore any other substreams */
- if (pkt.stream_index != cinfo.stream_idx)
- {
- av_free_packet(&pkt);
- continue;
+ /* Ignore any other substreams */
+ if (pkt->stream_index != cinfo.stream_idx)
+ continue;
 }
 
 /* Decode and play packet/frame */
- memcpy(&tmp, &pkt, sizeof(tmp));
- while (tmp.size > 0 && ! check_stop ())
- {
- /* Check for seek request and bail out if we have one */
- if (seek_value < 0)
- seek_value = check_seek ();
+#ifdef SEND_PACKET
+ if (LOG (avcodec_send_packet, context.ptr, pkt.ptr) < 0)
+ return false; /* defensive, errors not expected here */
+#else
+ /* Make a mutable (shallow) copy of the real packet */
+ AVPacket tmp = * pkt.ptr;
+#endif
 
- if (seek_value >= 0)
- break;
+ while (! check_stop ())
+ {
+ ScopedFrame frame;
 
-#if CHECK_LIBAVCODEC_VERSION (55, 45, 101, 55, 28, 1)
- AVFrame * frame = av_frame_alloc ();
+#ifdef SEND_PACKET
+ if (LOG (avcodec_receive_frame, context.ptr, frame.ptr) < 0)
+ break; /* read next packet (continue past errors) */
 #else
- AVFrame * frame = avcodec_alloc_frame ();
-#endif
 int decoded = 0;
- int len = avcodec_decode_audio4 (cinfo.context, frame, & decoded, & tmp);
+ int len = LOG (avcodec_decode_audio4, context.ptr, frame.ptr, & decoded, & tmp);
 
 if (len < 0)
- {
- AUDERR ("decode_audio() failed, code %d\n", len);
- break;
- }
+ break; /* read next packet (continue past errors) */
 
 tmp.size -= len;
 tmp.data += len;
 
 if (! decoded)
- continue;
+ {
+ if (tmp.size > 0)
+ continue; /* process more of current packet */
 
- int size = FMT_SIZEOF (out_fmt) * cinfo.context->channels * frame->nb_samples;
+ break; /* read next packet */
+ }
+#endif
+
+ int size = FMT_SIZEOF (out_fmt) * channels * frame->nb_samples;
 
 if (planar)
 {
@@ -537,34 +634,15 @@
 buf.resize (size);
 
 audio_interlace ((const void * *) frame->data, out_fmt,
- cinfo.context->channels, buf.begin (), frame->nb_samples);
+ channels, buf.begin (), frame->nb_samples);
 write_audio (buf.begin (), size);
 }
 else
 write_audio (frame->data0, size);
-
-#if CHECK_LIBAVCODEC_VERSION (55, 45, 101, 55, 28, 1)
- av_frame_free (& frame);
-#elif CHECK_LIBAVCODEC_VERSION (54, 59, 100, 54, 28, 0)
- avcodec_free_frame (& frame);
-#else
- av_free (frame);
-#endif
 }
-
- if (pkt.data)
- av_free_packet(&pkt);
 }
 
-error_exit:
- if (pkt.data)
- av_free_packet(&pkt);
- if (codec_opened)
- avcodec_close(cinfo.context);
- if (ic != nullptr)
- close_input_file(ic);
-
- return ! error;
+ return true;
 }
 
 const char FFaudio::about =
@@ -591,6 +669,9 @@
 /* MPEG 2/4 AC3 */
 "ac3",
 
+ /* CRI ADX */
+ "adx",
+
 /* monkey's audio */
 "ape",
 
@@ -601,7 +682,7 @@
 "vqf",
 
 /* MPEG-4 */
- "m4a", "mp4",
+ "m4a", "m4v", "mp4",
 
 /* WAV (there are some WAV formats sndfile can't handle) */
 "wav",
@@ -618,8 +699,19 @@
 /* True Audio */
 "tta",
 
+ /* WebM */
+ "webm",
+
+ /* Matroska */
+ "mka", "mkv",
+
 /* end of table */
 nullptr
 };
 
-const char * const FFaudio::mimes = {"application/ogg", nullptr};
+const char * const FFaudio::mimes = {
+ "application/ogg",
+ "audio/mp4",
+ "audio/ogg",
+ nullptr
+};

audacious-plugins-3.6.2-gtk3.tar.bz2/src/ffaudio/ffaudio-io.cc -> audacious-plugins-4.4.1.tar.bz2/src/ffaudio/ffaudio-io.cc Changed

audacious-plugins-3.6.2-gtk3.tar.bz2/src/ffaudio/ffaudio-stdinc.h -> audacious-plugins-4.4.1.tar.bz2/src/ffaudio/ffaudio-stdinc.h Changed

@@ -28,23 +28,11 @@
 #include <libavutil/avutil.h>
 }
 
-/* FFmpeg and libav remain mostly compatible but have different version numbers.
- * The first three numbers are the required FFmpeg version; the last three are for libav. */
-#ifdef HAVE_FFMPEG
-#define CHECK_LIBAVCODEC_VERSION(a, b, c, a2, b2, c2) (LIBAVCODEC_VERSION_INT >= AV_VERSION_INT (a, b, c))
-#define CHECK_LIBAVFORMAT_VERSION(a, b, c, a2, b2, c2) (LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT (a, b, c))
-#define CHECK_LIBAVUTIL_VERSION(a, b, c, a2, b2, c2) (LIBAVUTIL_VERSION_INT >= AV_VERSION_INT (a, b, c))
-#elif defined HAVE_LIBAV
-#define CHECK_LIBAVCODEC_VERSION(a, b, c, a2, b2, c2) (LIBAVCODEC_VERSION_INT >= AV_VERSION_INT (a2, b2, c2))
-#define CHECK_LIBAVFORMAT_VERSION(a, b, c, a2, b2, c2) (LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT (a2, b2, c2))
-#define CHECK_LIBAVUTIL_VERSION(a, b, c, a2, b2, c2) (LIBAVUTIL_VERSION_INT >= AV_VERSION_INT (a2, b2, c2))
-#else
-#error Please define either HAVE_FFMPEG or HAVE_LIBAV
-#endif
+#define CHECK_LIBAVCODEC_VERSION(a, b, c) (LIBAVCODEC_VERSION_INT >= AV_VERSION_INT (a, b, c))
+#define CHECK_LIBAVFORMAT_VERSION(a, b, c) (LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT (a, b, c))
+#define CHECK_LIBAVUTIL_VERSION(a, b, c) (LIBAVUTIL_VERSION_INT >= AV_VERSION_INT (a, b, c))
 
 AVIOContext * io_context_new (VFSFile & file);
 void io_context_free (AVIOContext * context);
 
-Index<char> read_itunes_cover (const char * filename, VFSFile & file);
-
 #endif

audacious-plugins-4.4.1.tar.bz2/src/ffaudio/meson.build Added

audacious-plugins-3.6.2-gtk3.tar.bz2/src/filewriter/Makefile -> audacious-plugins-4.4.1.tar.bz2/src/filewriter/Makefile Changed

audacious-plugins-3.6.2-gtk3.tar.bz2/src/filewriter/filewriter.cc -> audacious-plugins-4.4.1.tar.bz2/src/filewriter/filewriter.cc Changed

@@ -20,8 +20,8 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
+#include <glib.h>
 #include <string.h>
-#include <gtk/gtk.h>
 
 #include <libaudcore/audstrings.h>
 #include <libaudcore/i18n.h>
@@ -29,8 +29,11 @@
 #include <libaudcore/preferences.h>
 #include <libaudcore/runtime.h>
 
+#ifdef FILEWRITER_MP3
+#include <lame/lame.h>
+#endif
+
 #include "filewriter.h"
-#include "plugins.h"
 #include "convert.h"
 
 class FileWriter : public OutputPlugin
@@ -51,13 +54,12 @@
 constexpr FileWriter () : OutputPlugin (info, 0, true) {}
 
 bool init ();
- void cleanup ();
 
 StereoVolume get_volume () { return {0, 0}; }
 void set_volume (StereoVolume v) {}
 
 void set_info (const char * filename, const Tuple & tuple);
- bool open_audio (int fmt, int rate, int nch);
+ bool open_audio (int fmt, int rate, int nch, String & error);
 void close_audio ();
 
 void period_wait () {}
@@ -73,13 +75,29 @@
 
 EXPORT FileWriter aud_plugin_instance;
 
-static String in_filename;
-static Tuple in_tuple;
+enum {
+ FILENAME_ORIGINAL,
+ FILENAME_ORIGINAL_NO_SUFFIX,
+ FILENAME_FROM_TAG
+};
+
+/* really a boolean, but stored here as an integer
+ * since WidgetRadio supports only integer settings */
+static int save_original;
+
+/* stored as two separate booleans in the config file */
+static int filename_mode;
 
-struct format_info input;
+#ifdef FILEWRITER_MP3
+/* stored as integers (0 or 1) in the config file */
+static bool mp3_enforce_iso, mp3_error_protect;
+static bool mp3_vbr_on, mp3_enforce_min, mp3_omit_xing;
+static bool mp3_frame_copyright, mp3_frame_original;
+static bool mp3_id3_force_v2, mp3_id3_only_v1, mp3_id3_only_v2;
+#endif
 
-static GtkWidget * path_hbox, * path_dirbrowser;
-static GtkWidget * fileext_combo, * plugin_button;
+static String in_filename;
+static Tuple in_tuple;
 
 enum fileext_t
 {
@@ -96,36 +114,21 @@
 FILEEXT_MAX
 };
 
-static int fileext;
 static const char *fileext_strFILEEXT_MAX =
 {
- "wav",
+ ".wav",
 #ifdef FILEWRITER_MP3
- "mp3",
+ ".mp3",
 #endif
 #ifdef FILEWRITER_VORBIS
- "ogg",
+ ".ogg",
 #endif
 #ifdef FILEWRITER_FLAC
- "flac"
+ ".flac"
 #endif
 };
 
 static FileWriterImpl *plugin;
-
-static gboolean save_original;
-
-static GtkWidget *filenamefrom_hbox, *filenamefrom_label;
-static gboolean filenamefromtags;
-
-static GtkWidget *use_suffix_toggle = nullptr;
-static gboolean use_suffix;
-
-static GtkWidget *prependnumber_toggle;
-static gboolean prependnumber;
-
-static String file_path;
-
 static VFSFile output_file;
 
 FileWriterImpl *pluginsFILEEXT_MAX = {
@@ -141,19 +144,15 @@
 #endif
 };
 
-static void set_plugin(void)
-{
- if (fileext < 0 || fileext >= FILEEXT_MAX)
- fileext = 0;
-
- plugin = pluginsfileext;
-}
-
 const char * const FileWriter::defaults = {
- "fileext", "0", /* WAV */
+#ifdef FILEWRITER_MP3
+ "fileext", aud::numeric_string<MP3>::str,
+#else
+ "fileext", aud::numeric_string<WAV>::str,
+#endif
 "filenamefromtags", "TRUE",
 "prependnumber", "FALSE",
- "save_original", "TRUE",
+ "save_original", "FALSE",
 "use_suffix", "FALSE",
 nullptr};
 
@@ -161,29 +160,44 @@
 {
 aud_config_set_defaults ("filewriter", defaults);
 
- fileext = aud_get_int ("filewriter", "fileext");
- filenamefromtags = aud_get_bool ("filewriter", "filenamefromtags");
- file_path = aud_get_str ("filewriter", "file_path");
- prependnumber = aud_get_bool ("filewriter", "prependnumber");
 save_original = aud_get_bool ("filewriter", "save_original");
- use_suffix = aud_get_bool ("filewriter", "use_suffix");
 
- if (! file_path0)
+ if (aud_get_bool ("filewriter", "filenamefromtags"))
+ filename_mode = FILENAME_FROM_TAG;
+ else if (aud_get_bool ("filewriter", "use_suffix"))
+ filename_mode = FILENAME_ORIGINAL;
+ else
+ filename_mode = FILENAME_ORIGINAL_NO_SUFFIX;
+
+ for (auto p : plugins)
 {
- file_path = String (filename_to_uri (g_get_home_dir ()));
- g_return_val_if_fail (file_path != nullptr, false);
+ if (p->init)
+ p->init ();
 }
 
- set_plugin();
- if (plugin->init)
- plugin->init();
+#ifdef FILEWRITER_MP3
+ mp3_enforce_iso = aud_get_int ("filewriter_mp3", "enforce_iso_val");
+ mp3_error_protect = aud_get_int ("filewriter_mp3", "error_protect_val");
+
+ mp3_vbr_on = aud_get_int ("filewriter_mp3", "vbr_on");
+ mp3_enforce_min = aud_get_int ("filewriter_mp3", "enforce_min_val");
+ mp3_omit_xing = ! aud_get_int ("filewriter_mp3", "toggle_xing_val");
+
+ mp3_frame_copyright = aud_get_int ("filewriter_mp3", "mark_copyright_val");
+ mp3_frame_original = aud_get_int ("filewriter_mp3", "mark_original_val");
+
+ mp3_id3_force_v2 = aud_get_int ("filewriter_mp3", "force_v2_val");
+ mp3_id3_only_v1 = aud_get_int ("filewriter_mp3", "only_v1_val");
+ mp3_id3_only_v2 = aud_get_int ("filewriter_mp3", "only_v2_val");
+#endif
 
 return true;
 }
 
-void FileWriter::cleanup ()
+static StringBuf get_file_path ()
 {
- file_path = String ();
+ String path = aud_get_str ("filewriter", "file_path");
+ return path0 ? str_copy (path) : filename_to_uri (g_get_home_dir ());
 }
 
 static VFSFile safe_create (const char * filename)
@@ -212,70 +226,99 @@
 in_tuple = tuple.ref ();
 }
 
-bool FileWriter::open_audio (int fmt, int rate, int nch)
+static StringBuf format_filename (const char * suffix)
 {
- String filename, directory;
+ const char * slash = in_filename ? strrchr (in_filename, '/') : nullptr;
+ const char * base = slash ? slash + 1 : nullptr;
 
- input.format = fmt;
- input.frequency = rate;
- input.channels = nch;
+ StringBuf filename;
 
- if (filenamefromtags)
+ if (save_original)
 {
- String title = in_tuple.get_str (Tuple::FormattedTitle);
- StringBuf buf = str_encode_percent (title);
- str_replace_char (buf, '/', '-');
- filename = String (buf);
+ g_return_val_if_fail (base, StringBuf ());
+ filename = str_copy (in_filename, base - in_filename);
 }
 else
 {
- const char * original = strrchr (in_filename, '/');
- g_return_val_if_fail (original != nullptr, 0);
- filename = String (original + 1);
-
- if (! use_suffix)
- {
- const char * temp;
- if ((temp = strrchr (filename, '.')))
- filename = String (str_copy (filename, temp - filename));
- }
+ filename = get_file_path ();
+ if (filenamefilename.len () - 1 != '/')
+ filename.insert (-1, "/");
 }
 
- if (prependnumber)
+ if (aud_get_bool ("filewriter", "prependnumber"))
 {
 int number = in_tuple.get_int (Tuple::Track);
 if (number >= 0)
- filename = String (str_printf ("%d%%20%s", number, (const char *) filename));
+ str_append_printf (filename, "%d%%20", number);
 }
 
- if (save_original)
+ if (aud_get_bool ("filewriter", "filenamefromtags"))
 {
- const char * temp = strrchr (in_filename, '/');
- g_return_val_if_fail (temp != nullptr, 0);
- directory = String (str_copy (in_filename, temp + 1 - in_filename));
+ String title = in_tuple.get_str (Tuple::FormattedTitle);
+
+ /* truncate title at 200 bytes to avoid hitting filesystem limits */
+ int len = aud::min ((int) strlen (title), 200);
+
+ /* prevent truncation in middle of UTF-8 character */
+ while ((titlelen & 0xc0) == 0x80)
+ len ++;
+
+ StringBuf buf = str_copy (title, len);
+
+ /* replace non-portable characters */
+ const char * reserved = "<>:\"/\\|?*";
+ for (char * c = buf; * c; c ++)
+ {
+ if (strchr (reserved, * c))
+ * c = ' ';
+ }
+
+ /* URI-encode */
+ filename.insert (-1, str_encode_percent (buf));
 }
 else
 {
- g_return_val_if_fail (file_path0, 0);
- if (file_pathstrlen (file_path) - 1 == '/')
- directory = String (file_path);
- else
- directory = String (str_concat ({file_path, "/"}));
+ g_return_val_if_fail (base, StringBuf ());
+
+ const char * end = nullptr;
+ if (! aud_get_bool ("filewriter", "use_suffix"))
+ end = strrchr (base, '.');
+
+ filename.insert (-1, base, end ? end - base : -1);
 }
 
- filename = String (str_printf ("%s%s.%s", (const char *) directory,
- (const char *) filename, fileext_strfileext));
+ filename.insert (-1, suffix);
+ return filename.settle ();
+}
+
+bool FileWriter::open_audio (int fmt, int rate, int nch, String & error)
+{
+ int ext = aud_get_int ("filewriter", "fileext");
+ g_return_val_if_fail (ext >= 0 && ext < FILEEXT_MAX, false);
+
+ StringBuf filename = format_filename (fileext_strext);
+ if (! filename)
+ return false;
 
- output_file = safe_create (filename);
- if (! output_file)
- goto err;
+ plugin = pluginsext;
 
- convert_init (fmt, plugin->format_required (fmt));
+ int out_fmt = plugin->format_required (fmt);
+ convert_init (fmt, out_fmt);
 
- if (plugin->open (output_file, input, in_tuple))
- return true;
+ output_file = safe_create (filename);
+ if (output_file)
+ {
+ if (plugin->open (output_file, {out_fmt, rate, nch}, in_tuple))
+ return true;
+ }
+ else
+ {
+ error = String (str_printf (_("Error opening %s:\n%s"),
+ (const char *) filename, output_file.error ()));
+ }
 
-err:
+ plugin = nullptr;
+ output_file = VFSFile ();
 in_filename = String ();
 in_tuple = Tuple ();
 return false;
@@ -294,214 +337,250 @@
 plugin->close (output_file);
 convert_free ();
 
+ plugin = nullptr;
 output_file = VFSFile ();
 in_filename = String ();
 in_tuple = Tuple ();
 }
 
-static void configure_response_cb (void)
+static void save_original_cb ()
 {
- fileext = gtk_combo_box_get_active(GTK_COMBO_BOX(fileext_combo));
-
- char * temp = gtk_file_chooser_get_uri ((GtkFileChooser *) path_dirbrowser);
- file_path = String (temp);
- g_free (temp);
-
- use_suffix =
- gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(use_suffix_toggle));
-
- prependnumber =
- gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(prependnumber_toggle));
-
- aud_set_int ("filewriter", "fileext", fileext);
- aud_set_bool ("filewriter", "filenamefromtags", filenamefromtags);
- aud_set_str ("filewriter", "file_path", file_path);
- aud_set_bool ("filewriter", "prependnumber", prependnumber);
 aud_set_bool ("filewriter", "save_original", save_original);
- aud_set_bool ("filewriter", "use_suffix", use_suffix);
-}
-
-static void fileext_cb(GtkWidget *combo, void * data)
-{
- fileext = gtk_combo_box_get_active(GTK_COMBO_BOX(fileext_combo));
- set_plugin();
- if (plugin->init)
- plugin->init();
-
- gtk_widget_set_sensitive(plugin_button, plugin->configure != nullptr);
-}
-
-static void plugin_configure_cb(GtkWidget *button, void * data)
-{
- if (plugin->configure)
- plugin->configure();
-}
-
-
-static void saveplace_original_cb(GtkWidget *button, void * data)
-{
- if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(button)))
- {
- gtk_widget_set_sensitive(path_hbox, FALSE);
- save_original = TRUE;
- }
-}
-
-static void saveplace_custom_cb(GtkWidget *button, void * data)
-{
- if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(button)))
- {
- gtk_widget_set_sensitive(path_hbox, TRUE);
- save_original = FALSE;
- }
-}
-
-static void filenamefromtags_cb(GtkWidget *button, void * data)
-{
- if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(button)))
- {
- gtk_widget_set_sensitive(use_suffix_toggle, FALSE);
- gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(use_suffix_toggle), FALSE);
- use_suffix = FALSE;
- filenamefromtags = TRUE;
- }
 }
 
-static void filenamefromfilename_cb(GtkWidget *button, void * data)
+static void filename_mode_cb ()
 {
- if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(button)))
- {
- gtk_widget_set_sensitive(use_suffix_toggle, TRUE);
- filenamefromtags = FALSE;
- }
+ aud_set_bool ("filewriter", "filenamefromtags", (filename_mode == FILENAME_FROM_TAG));
+ aud_set_bool ("filewriter", "use_suffix", (filename_mode == FILENAME_ORIGINAL));
 }
 
-static void * file_configure (void)
-{
- GtkWidget * configure_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
-
- GtkWidget * fileext_hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5);
- gtk_box_pack_start(GTK_BOX(configure_vbox), fileext_hbox, FALSE, FALSE, 0);
-
- GtkWidget * fileext_label = gtk_label_new (_("Output file format:"));
- gtk_box_pack_start(GTK_BOX(fileext_hbox), fileext_label, FALSE, FALSE, 0);
+const char FileWriter::about =
+ 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.");
 
- fileext_combo = gtk_combo_box_text_new ();
- gtk_combo_box_text_append_text ((GtkComboBoxText *) fileext_combo, "WAV");
+static const ComboItem plugin_combo = {
+ ComboItem ("WAV", WAV)
 #ifdef FILEWRITER_MP3
- gtk_combo_box_text_append_text ((GtkComboBoxText *) fileext_combo, "MP3");
+ ,ComboItem ("MP3", MP3)
 #endif
 #ifdef FILEWRITER_VORBIS
- gtk_combo_box_text_append_text ((GtkComboBoxText *) fileext_combo, "Vorbis");
+ ,ComboItem ("Vorbis", VORBIS)
 #endif
 #ifdef FILEWRITER_FLAC
- gtk_combo_box_text_append_text ((GtkComboBoxText *) fileext_combo, "FLAC");
+ ,ComboItem ("FLAC", FLAC)
 #endif
- gtk_box_pack_start(GTK_BOX(fileext_hbox), fileext_combo, FALSE, FALSE, 0);
- gtk_combo_box_set_active(GTK_COMBO_BOX(fileext_combo), fileext);
-
- plugin_button = gtk_button_new_with_label(_("Configure"));
- gtk_widget_set_sensitive(plugin_button, plugin->configure != nullptr);
- gtk_box_pack_end(GTK_BOX(fileext_hbox), plugin_button, FALSE, FALSE, 0);
-
- gtk_box_pack_start(GTK_BOX(configure_vbox), gtk_separator_new(GTK_ORIENTATION_HORIZONTAL), FALSE, FALSE, 0);
-
- GtkWidget * saveplace_hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5);
- gtk_container_add(GTK_CONTAINER(configure_vbox), saveplace_hbox);
-
- GtkWidget * saveplace1 = gtk_radio_button_new_with_label (nullptr,
- _("Save into original directory"));
- gtk_box_pack_start ((GtkBox *) saveplace_hbox, saveplace1, FALSE, FALSE, 0);
-
- GtkWidget * saveplace2 = gtk_radio_button_new_with_label_from_widget
- ((GtkRadioButton *) saveplace1, _("Save into custom directory"));
-
- if (!save_original)
- gtk_toggle_button_set_active ((GtkToggleButton *) saveplace2, TRUE);
-
- gtk_box_pack_start ((GtkBox *) saveplace_hbox, saveplace2, FALSE, FALSE, 0);
-
- path_hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 5);
- gtk_box_pack_start(GTK_BOX(configure_vbox), path_hbox, FALSE, FALSE, 0);
+};
 
- GtkWidget * path_label = gtk_label_new (_("Output file folder:"));
- gtk_box_pack_start ((GtkBox *) path_hbox, path_label, FALSE, FALSE, 0);
+static const PreferencesWidget main_widgets = {
+ WidgetCombo (N_("Output file format:"),
+ WidgetInt ("filewriter", "fileext"),
+ {{plugin_combo}}),
+ WidgetSeparator ({true}),
+ WidgetRadio (N_("Save into original directory"),
+ WidgetInt (save_original, save_original_cb),
+ {true}),
+ WidgetRadio (N_("Save into custom directory:"),
+ WidgetInt (save_original, save_original_cb),
+ {false}),
+ WidgetFileEntry (nullptr,
+ WidgetString ("filewriter", "file_path"),
+ {FileSelectMode::Folder},
+ WIDGET_CHILD),
+ WidgetSeparator ({true}),
+ WidgetLabel (N_("Generate file name from:")),
+ WidgetRadio (N_("Original file name"),
+ WidgetInt (filename_mode, filename_mode_cb),
+ {FILENAME_ORIGINAL}),
+ WidgetRadio (N_("Original file name (no suffix)"),
+ WidgetInt (filename_mode, filename_mode_cb),
+ {FILENAME_ORIGINAL_NO_SUFFIX}),
+ WidgetRadio (N_("Original file tag"),
+ WidgetInt (filename_mode, filename_mode_cb),
+ {FILENAME_FROM_TAG}),
+ WidgetSeparator ({true}),
+ WidgetCheck (N_("Prepend track number to file name"),
+ WidgetBool ("filewriter", "prependnumber"))
+};
 
- path_dirbrowser =
- gtk_file_chooser_button_new (_("Pick a folder"),
- GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER);
- gtk_file_chooser_set_uri ((GtkFileChooser *) path_dirbrowser, file_path);
- gtk_box_pack_start(GTK_BOX(path_hbox), path_dirbrowser, TRUE, TRUE, 0);
+#ifdef FILEWRITER_MP3
+static const ComboItem mp3_sample_rates = {
+ ComboItem(N_("Auto"), 0),
+ ComboItem(N_("8000 Hz"), 8000),
+ ComboItem(N_("11025 Hz"), 11025),
+ ComboItem(N_("12000 Hz"), 12000),
+ ComboItem(N_("16000 Hz"), 16000),
+ ComboItem(N_("22050 Hz"), 22050),
+ ComboItem(N_("24000 Hz"), 24000),
+ ComboItem(N_("32000 Hz"), 32000),
+ ComboItem(N_("44100 Hz"), 44100),
+ ComboItem(N_("48000 Hz"), 48000)
+};
 
- if (save_original)
- gtk_widget_set_sensitive(path_hbox, FALSE);
+static const ComboItem mp3_bitrates = {
+ ComboItem(N_("8 kbit/s"), 8),
+ ComboItem(N_("16 kbit/s"), 16),
+ ComboItem(N_("32 kbit/s"), 32),
+ ComboItem(N_("40 kbit/s"), 40),
+ ComboItem(N_("48 kbit/s"), 48),
+ ComboItem(N_("56 kbit/s"), 56),
+ ComboItem(N_("64 kbit/s"), 64),
+ ComboItem(N_("80 kbit/s"), 80),
+ ComboItem(N_("96 kbit/s"), 96),
+ ComboItem(N_("112 kbit/s"), 112),
+ ComboItem(N_("128 kbit/s"), 128),
+ ComboItem(N_("160 kbit/s"), 160),
+ ComboItem(N_("192 kbit/s"), 192),
+ ComboItem(N_("224 kbit/s"), 224),
+ ComboItem(N_("256 kbit/s"), 256),
+ ComboItem(N_("320 kbit/s"), 320)
+};
 
- gtk_box_pack_start(GTK_BOX(configure_vbox), gtk_separator_new(GTK_ORIENTATION_HORIZONTAL), FALSE, FALSE, 0);
+static const ComboItem mp3_modes = {
+ ComboItem(N_("Auto"), NOT_SET),
+ ComboItem(N_("Joint Stereo"), JOINT_STEREO),
+ ComboItem(N_("Stereo"), STEREO),
+ ComboItem(N_("Mono"), MONO)
+};
 
- filenamefrom_hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 5);
- gtk_container_add(GTK_CONTAINER(configure_vbox), filenamefrom_hbox);
+static const ComboItem mp3_vbr_modes = {
+ ComboItem(N_("VBR"), 0),
+ ComboItem(N_("ABR"), 1)
+};
 
- filenamefrom_label = gtk_label_new(_("Generate file name from:"));
- gtk_box_pack_start(GTK_BOX(filenamefrom_hbox), filenamefrom_label, FALSE, FALSE, 0);
+static void mp3_bools_changed ()
+{
+ aud_set_int ("filewriter_mp3", "enforce_iso_val", mp3_enforce_iso);
+ aud_set_int ("filewriter_mp3", "error_protect_val", mp3_error_protect);
 
- GtkWidget * filenamefrom_toggle1 = gtk_radio_button_new_with_label
- (nullptr, _("Original file tag"));
- gtk_box_pack_start ((GtkBox *) filenamefrom_hbox, filenamefrom_toggle1, FALSE, FALSE, 0);
+ aud_set_int ("filewriter_mp3", "vbr_on", mp3_vbr_on);
+ aud_set_int ("filewriter_mp3", "enforce_min_val", mp3_enforce_min);
+ aud_set_int ("filewriter_mp3", "toggle_xing_val", ! mp3_omit_xing);
 
- GtkWidget * filenamefrom_toggle2 =
- gtk_radio_button_new_with_label_from_widget
- ((GtkRadioButton *) filenamefrom_toggle1, _("Original file name"));
- gtk_box_pack_start ((GtkBox *) filenamefrom_hbox, filenamefrom_toggle2, FALSE, FALSE, 0);
+ aud_set_int ("filewriter_mp3", "mark_copyright_val", mp3_frame_copyright);
+ aud_set_int ("filewriter_mp3", "mark_original_val", mp3_frame_original);
 
- if (!filenamefromtags)
- gtk_toggle_button_set_active ((GtkToggleButton *) filenamefrom_toggle2, TRUE);
+ aud_set_int ("filewriter_mp3", "force_v2_val", mp3_id3_force_v2);
+ aud_set_int ("filewriter_mp3", "only_v1_val", mp3_id3_only_v1);
+ aud_set_int ("filewriter_mp3", "only_v2_val", mp3_id3_only_v2);
+}
 
- use_suffix_toggle = gtk_check_button_new_with_label(_("Include original file name extension"));
- gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(use_suffix_toggle), use_suffix);
- gtk_box_pack_start(GTK_BOX(configure_vbox), use_suffix_toggle, FALSE, FALSE, 0);
+static const PreferencesWidget mp3_quality_widgets = {
+ WidgetSpin(N_("Algorithm quality:"),
+ WidgetInt("filewriter_mp3", "algo_quality_val"),
+ {0, 9, 1}),
+ WidgetCombo(N_("Sample rate:"),
+ WidgetInt("filewriter_mp3", "out_samplerate_val"),
+ {{mp3_sample_rates}}),
+ WidgetRadio(N_("Bitrate:"),
+ WidgetInt("filewriter_mp3", "enc_toggle_val"),
+ {0}),
+ WidgetCombo(nullptr,
+ WidgetInt("filewriter_mp3", "bitrate_val"),
+ {{mp3_bitrates}},
+ WIDGET_CHILD),
+ WidgetRadio(N_("Compression ratio:"),
+ WidgetInt("filewriter_mp3", "enc_toggle_val"),
+ {1}),
+ WidgetSpin(nullptr,
+ WidgetFloat("filewriter_mp3", "compression_val"),
+ {0, 100, 1},
+ WIDGET_CHILD),
+ WidgetCombo(N_("Audio mode:"),
+ WidgetInt("filewriter_mp3", "audio_mode_val"),
+ {{mp3_modes}}),
+ WidgetCheck(N_("Enforce strict ISO compliance"),
+ WidgetBool(mp3_enforce_iso, mp3_bools_changed)),
+ WidgetCheck(N_("Error protection"),
+ WidgetBool(mp3_error_protect, mp3_bools_changed)),
+};
 
- if (filenamefromtags)
- gtk_widget_set_sensitive(use_suffix_toggle, FALSE);
+static const PreferencesWidget mp3_vbr_abr_widgets = {
+ WidgetCheck(N_("Enable VBR/ABR"),
+ WidgetBool(mp3_vbr_on, mp3_bools_changed)),
+ WidgetCombo(N_("Type:"),
+ WidgetInt("filewriter_mp3", "vbr_type"),
+ {{mp3_vbr_modes}},
+ WIDGET_CHILD),
+ WidgetCombo(N_("Minimum bitrate:"),
+ WidgetInt("filewriter_mp3", "vbr_min_val"),
+ {{mp3_bitrates}},
+ WIDGET_CHILD),
+ WidgetCombo(N_("Maximum bitrate:"),
+ WidgetInt("filewriter_mp3", "vbr_max_val"),
+ {{mp3_bitrates}},
+ WIDGET_CHILD),
+ WidgetCombo(N_("Average bitrate:"),
+ WidgetInt("filewriter_mp3", "abr_val"),
+ {{mp3_bitrates}},
+ WIDGET_CHILD),
+ WidgetSpin(N_("VBR quality level:"),
+ WidgetInt("filewriter_mp3", "vbr_quality_val"),
+ {0, 9, 1},
+ WIDGET_CHILD),
+ WidgetCheck(N_("Strictly enforce minimum bitrate"),
+ WidgetBool(mp3_enforce_min, mp3_bools_changed),
+ WIDGET_CHILD),
+ WidgetCheck(N_("Omit Xing VBR header"),
+ WidgetBool(mp3_omit_xing, mp3_bools_changed),
+ WIDGET_CHILD)
+};
 
- gtk_box_pack_start(GTK_BOX(configure_vbox), gtk_separator_new(GTK_ORIENTATION_HORIZONTAL), FALSE, FALSE, 0);
+static const PreferencesWidget mp3_tag_widgets = {
+ WidgetLabel(N_("Frame Headers")),
+ WidgetCheck(N_("Mark as copyright"),
+ WidgetBool(mp3_frame_copyright, mp3_bools_changed)),
+ WidgetCheck(N_("Mark as original"),
+ WidgetBool(mp3_frame_original, mp3_bools_changed)),
+ WidgetLabel(N_("ID3 Tags")),
+ WidgetCheck(N_("Force addition of version 2 tag"),
+ WidgetBool(mp3_id3_force_v2, mp3_bools_changed)),
+ WidgetCheck(N_("Only add v1 tag"),
+ WidgetBool(mp3_id3_only_v1, mp3_bools_changed)),
+ WidgetCheck(N_("Only add v2 tag"),
+ WidgetBool(mp3_id3_only_v2, mp3_bools_changed)),
+};
 
- prependnumber_toggle = gtk_check_button_new_with_label(_("Prepend track number to file name"));
- gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(prependnumber_toggle), prependnumber);
- gtk_box_pack_start(GTK_BOX(configure_vbox), prependnumber_toggle, FALSE, FALSE, 0);
+static const NotebookTab mp3_tabs = {
+ {N_("Quality"), {mp3_quality_widgets}},
+ {N_("VBR/ABR"), {mp3_vbr_abr_widgets}},
+ {N_("Tags"), {mp3_tag_widgets}}
+};
 
- g_signal_connect (fileext_combo, "changed", (GCallback) fileext_cb, nullptr);
- g_signal_connect (plugin_button, "clicked", (GCallback) plugin_configure_cb, nullptr);
- g_signal_connect (saveplace1, "toggled", (GCallback) saveplace_original_cb, nullptr);
- g_signal_connect (saveplace2, "toggled", (GCallback) saveplace_custom_cb, nullptr);
- g_signal_connect (filenamefrom_toggle1, "toggled", (GCallback) filenamefromtags_cb, nullptr);
- g_signal_connect (filenamefrom_toggle2, "toggled",
- (GCallback) filenamefromfilename_cb, nullptr);
+static const PreferencesWidget mp3_widgets = {
+ WidgetNotebook ({{mp3_tabs}})
+};
+#endif
 
- return configure_vbox;
-}
+#ifdef FILEWRITER_VORBIS
+static const PreferencesWidget vorbis_widgets = {
+ WidgetSpin(N_("Quality (0-1):"),
+ WidgetFloat("filewriter_vorbis", "base_quality"),
+ {0, 1, 0.01})
+};
+#endif
 
-const char FileWriter::about =
- 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.");
+static const NotebookTab tabs = {
+ {N_("General"), {main_widgets}}
+#ifdef FILEWRITER_MP3
+ ,{"MP3", {mp3_widgets}}
+#endif
+#ifdef FILEWRITER_VORBIS
+ ,{"Vorbis", {vorbis_widgets}}
+#endif
+};
 
 const PreferencesWidget FileWriter::widgets = {
- WidgetCustomGTK (file_configure)
+ WidgetNotebook ({{tabs}})
 };
 
-const PluginPreferences FileWriter::prefs = {
- {widgets},
- nullptr, // init
- configure_response_cb
-};
+const PluginPreferences FileWriter::prefs = {{widgets}};

audacious-plugins-3.6.2-gtk3.tar.bz2/src/filewriter/filewriter.h -> audacious-plugins-4.4.1.tar.bz2/src/filewriter/filewriter.h Changed

audacious-plugins-3.6.2-gtk3.tar.bz2/src/filewriter/flac.cc -> audacious-plugins-4.4.1.tar.bz2/src/filewriter/flac.cc Changed

@@ -19,7 +19,7 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
-#include "plugins.h"
+#include "filewriter.h"
 
 #ifdef FILEWRITER_FLAC
 
@@ -75,17 +75,13 @@
     switch (type)
     {
     case Tuple::Int:
-    {
-        int ival = tuple.get_int (field);
-        temp.steal (str_printf ("%s=%d", name, ival));
+        temp = str_printf ("%s=%d", name, tuple.get_int (field));
         break;
-    }
+
     case Tuple::String:
-    {
-        String sval = tuple.get_str (field);
-        temp.steal (str_printf ("%s=%s", name, (const char *) sval));
+        temp = str_printf ("%s=%s", name, (const char *) tuple.get_str (field));
         break;
-    }
+
     default:
         return;
     }
@@ -115,6 +111,7 @@
     insert_vorbis_comment (flac_metadata, "DATE", tuple, Tuple::Date);
     insert_vorbis_comment (flac_metadata, "YEAR", tuple, Tuple::Year);
     insert_vorbis_comment (flac_metadata, "TRACKNUMBER", tuple, Tuple::Track);
+    insert_vorbis_comment (flac_metadata, "DISCNUMBER", tuple, Tuple::Disc);
 
     FLAC__stream_encoder_set_metadata(flac_encoder, &flac_metadata, 1);
 
@@ -196,7 +193,6 @@
 
 FileWriterImpl flac_plugin = {
     nullptr,  // init
-    nullptr,  // configure
     flac_open,
     flac_write,
     flac_close,

audacious-plugins-4.4.1.tar.bz2/src/filewriter/meson.build Added

@@ -0,0 +1,58 @@
+filewriter_deps = audacious_dep, glib_dep
+filewriter_srcs = 
+  'convert.cc',
+  'filewriter.cc',
+  'wav.cc'
+
+
+
+if get_option('filewriter-flac')
+  flac_dep = dependency('flac', version: '>= 1.2.1', required: false)
+
+  if flac_dep.found()
+    filewriter_deps += flac_dep
+    filewriter_srcs += 'flac.cc'
+
+    conf.set10('FILEWRITER_FLAC', true)
+  endif
+endif
+
+
+if get_option('filewriter-ogg')
+  ogg_dep = dependency('ogg', version: '>= 1.0', required: false)
+  vorbis_dep = dependency('vorbis', version: '>= 1.0', required: false)
+  vorbisenc_dep = dependency('vorbisenc', version: '>= 1.0', required: false)
+  vorbisfile_dep = dependency('vorbisfile', version: '>= 1.0', required: false)
+
+  if ogg_dep.found() and vorbis_dep.found()
+    filewriter_deps += ogg_dep, vorbis_dep, vorbisenc_dep, vorbisfile_dep
+    filewriter_srcs += 'vorbis.cc'
+
+    conf.set10('FILEWRITER_VORBIS', true)
+  endif
+endif
+
+
+if get_option('filewriter-mp3')
+  lame_dep = dependency('lame', required: false)
+
+  if not lame_dep.found()
+    lame_dep = cxx.find_library('mp3lame', has_headers: 'lame/lame.h', required: false)
+  endif
+
+  if lame_dep.found()
+    filewriter_deps += lame_dep
+    filewriter_srcs += 'mp3.cc'
+
+    conf.set10('FILEWRITER_MP3', true)
+  endif
+endif
+
+
+shared_module('filewriter',
+  filewriter_srcs,
+  dependencies: filewriter_deps,
+  name_prefix: '',
+  install: true,
+  install_dir: output_plugin_dir
+)

audacious-plugins-3.6.2-gtk3.tar.bz2/src/filewriter/mp3.cc -> audacious-plugins-4.4.1.tar.bz2/src/filewriter/mp3.cc Changed

@@ -22,79 +22,21 @@
 
 /* #define AUD_DEBUG 1 */
 
-#include "plugins.h"
+#include "filewriter.h"
 
 #ifdef FILEWRITER_MP3
 
-#include <string.h>
 #include <lame/lame.h>
-#include <gtk/gtk.h>
 
 #include <libaudcore/audstrings.h>
-#include <libaudcore/i18n.h>
 #include <libaudcore/runtime.h>
 
-#define MODES 4
-enum {MODE_AUTO = 4, MODE_JOINT = 1, MODE_STEREO = 0, MODE_MONO = 3};
-static const int modesMODES = {MODE_AUTO, MODE_JOINT, MODE_STEREO, MODE_MONO};
-static const char * const mode_namesMODES = {N_("Auto"), N_("Joint Stereo"),
- N_("Stereo"), N_("Mono")};
-
-static GtkWidget *configure_win = nullptr;
-static GtkWidget *alg_quality_spin;
-static GtkWidget *alg_quality_hbox;
-static GtkAdjustment * alg_quality_adj;
-static GtkWidget *vbox, *notebook;
-static GtkWidget *quality_vbox, *quality_hbox1, *alg_quality_frame;
-static GtkWidget *enc_quality_frame, *enc_quality_label1, *enc_quality_label2;
-static GtkWidget * enc_radio1, * enc_radio2;
-static GtkWidget *compression_spin;
-static GtkAdjustment * compression_adj;
-static GtkWidget * mode_hbox, * mode_frame;
-static GtkWidget * samplerate_hbox, * samplerate_label, * samplerate_frame;
-static GtkWidget *misc_frame, *misc_vbox, *enforce_iso_toggle,
- *error_protection_toggle;
-static GtkWidget *vbr_vbox, *vbr_toggle, *vbr_options_vbox, *vbr_type_frame,
- *vbr_type_hbox, *vbr_type_radio1, *vbr_type_radio2;
-static GtkWidget * abr_frame, * abr_hbox, * abr_label;
-static GtkWidget *vbr_frame, *vbr_options_vbox2;
-static GtkWidget * vbr_options_hbox1, * vbr_min_label;
-static GtkWidget * vbr_options_hbox2, * vbr_max_label, * enforce_min_toggle;
-static GtkWidget *vbr_options_hbox3, *vbr_quality_spin, *vbr_quality_label;
-static GtkAdjustment * vbr_quality_adj;
-static GtkWidget *xing_header_toggle;
-static GtkWidget *tags_vbox, *tags_frames_frame, *tags_frames_hbox,
- *tags_copyright_toggle, *tags_original_toggle;
-static GtkWidget *tags_id3_frame, *tags_id3_vbox, *tags_id3_hbox,
- *tags_force_id3v2_toggle, *tags_only_v1_toggle, *tags_only_v2_toggle;
-
-static GtkWidget *enc_quality_vbox, *hbox1, *hbox2;
-
-static unsigned long numsamples = 0;
-static int inside;
-
-static int available_samplerates =
-{ 8000, 11025, 12000, 16000, 22050, 24000, 32000, 44100, 48000 } ;
-
-static int available_bitrates =
-{ 8, 16, 32, 40, 48, 56, 64, 80, 96, 112, 128, 160, 192, 224, 256, 320 } ;
-
-struct lameid3_t {
- String track_name;
- String album_name;
- String performer;
- String genre;
- String year;
- String track_number;
-};
-
-static lameid3_t lameid3;
-
 static lame_global_flags *gfp;
 static unsigned char encbufferLAME_MAXMP3BUFFER;
 static int id3v2_size;
 
 static int channels;
+static unsigned long numsamples;
 static Index<unsigned char> write_buffer;
 
 static void lame_debugf(const char *format, va_list ap)
@@ -121,43 +63,17 @@
 "bitrate_val", "128",
 "compression_val", "11",
 "enc_toggle_val", "0",
- "audio_mode_val", "4", /* MODE_AUTO */
+ "audio_mode_val", aud::numeric_string<NOT_SET>::str,
 "enforce_iso_val", "0",
 "error_protect_val", "0",
 nullptr};
 
-static int vbr_on, vbr_type, vbr_min_val, vbr_max_val, enforce_min_val,
- vbr_quality_val, abr_val, toggle_xing_val, mark_original_val,
- mark_copyright_val, force_v2_val, only_v1_val, only_v2_val, algo_quality_val,
- out_samplerate_val, bitrate_val;
-static float compression_val;
-static int enc_toggle_val, audio_mode_val, enforce_iso_val, error_protect_val;
+#define GET_INT(n) aud_get_int("filewriter_mp3", n)
+#define GET_DOUBLE(n) aud_get_double("filewriter_mp3", n)
 
 static void mp3_init ()
 {
 aud_config_set_defaults ("filewriter_mp3", mp3_defaults);
-
- vbr_on = aud_get_int ("filewriter_mp3", "vbr_on");
- vbr_type = aud_get_int ("filewriter_mp3", "vbr_type");
- vbr_min_val = aud_get_int ("filewriter_mp3", "vbr_min_val");
- vbr_max_val = aud_get_int ("filewriter_mp3", "vbr_max_val");
- enforce_min_val = aud_get_int ("filewriter_mp3", "enforce_min_val");
- vbr_quality_val = aud_get_int ("filewriter_mp3", "vbr_quality_val");
- abr_val = aud_get_int ("filewriter_mp3", "abr_val");
- toggle_xing_val = aud_get_int ("filewriter_mp3", "toggle_xing_val");
- mark_original_val = aud_get_int ("filewriter_mp3", "mark_original_val");
- mark_copyright_val = aud_get_int ("filewriter_mp3", "mark_copyright_val");
- force_v2_val = aud_get_int ("filewriter_mp3", "force_v2_val");
- only_v1_val = aud_get_int ("filewriter_mp3", "only_v1_val");
- only_v2_val = aud_get_int ("filewriter_mp3", "only_v2_val");
- algo_quality_val = aud_get_int ("filewriter_mp3", "algo_quality_val");
- out_samplerate_val = aud_get_int ("filewriter_mp3", "out_samplerate_val");
- bitrate_val = aud_get_int ("filewriter_mp3", "bitrate_val");
- compression_val = aud_get_double ("filewriter_mp3", "compression_val");
- enc_toggle_val = aud_get_int ("filewriter_mp3", "enc_toggle_val");
- audio_mode_val = aud_get_int ("filewriter_mp3", "audio_mode_val");
- enforce_iso_val = aud_get_int ("filewriter_mp3", "enforce_iso_val");
- error_protect_val = aud_get_int ("filewriter_mp3", "error_protect_val");
 }
 
 static bool mp3_open (VFSFile & file, const format_info & info, const Tuple & tuple)
@@ -172,44 +88,33 @@
 id3tag_init(gfp);
 
 /* XXX write UTF-8 even though libmp3lame does id3v2.3. --yaz */
- lameid3.track_name = tuple.get_str (Tuple::Title);
- id3tag_set_title(gfp, lameid3.track_name);
-
- lameid3.performer = tuple.get_str (Tuple::Artist);
- id3tag_set_artist(gfp, lameid3.performer);
-
- lameid3.album_name = tuple.get_str (Tuple::Album);
- id3tag_set_album(gfp, lameid3.album_name);
-
- lameid3.genre = tuple.get_str (Tuple::Genre);
- id3tag_set_genre(gfp, lameid3.genre);
-
- lameid3.year = String (int_to_str (tuple.get_int (Tuple::Year)));
- id3tag_set_year(gfp, lameid3.year);
-
- lameid3.track_number = String (int_to_str (tuple.get_int (Tuple::Track)));
- id3tag_set_track(gfp, lameid3.track_number);
-
- if (force_v2_val)
+ id3tag_set_title(gfp, tuple.get_str (Tuple::Title));
+ id3tag_set_artist(gfp, tuple.get_str (Tuple::Artist));
+ id3tag_set_album(gfp, tuple.get_str (Tuple::Album));
+ id3tag_set_genre(gfp, tuple.get_str (Tuple::Genre));
+ id3tag_set_year(gfp, int_to_str (tuple.get_int (Tuple::Year)));
+ id3tag_set_track(gfp, int_to_str (tuple.get_int (Tuple::Track)));
+
+ if (GET_INT("force_v2_val"))
 id3tag_add_v2(gfp);
- if (only_v1_val)
+ if (GET_INT("only_v1_val"))
 id3tag_v1_only(gfp);
- if (only_v2_val)
+ if (GET_INT("only_v2_val"))
 id3tag_v2_only(gfp);
 
 /* input stream description */
 
 lame_set_in_samplerate(gfp, info.frequency);
 lame_set_num_channels(gfp, info.channels);
- /* Maybe implement this? */
- /* lame_set_scale(lame_global_flags *, float); */
- lame_set_out_samplerate(gfp, out_samplerate_val);
+ lame_set_out_samplerate(gfp, GET_INT("out_samplerate_val"));
 
 /* general control parameters */
 
- lame_set_bWriteVbrTag(gfp, toggle_xing_val);
- lame_set_quality(gfp, algo_quality_val);
- if (audio_mode_val != 4) {
+ lame_set_bWriteVbrTag(gfp, GET_INT("toggle_xing_val"));
+ lame_set_quality(gfp, GET_INT("algo_quality_val"));
+
+ const int audio_mode_val = GET_INT("audio_mode_val");
+ if (audio_mode_val != NOT_SET) {
 AUDDBG("set mode to %d\n", audio_mode_val);
 lame_set_mode(gfp, (MPEG_mode) audio_mode_val);
 }
@@ -218,28 +123,35 @@
 lame_set_debugf(gfp, lame_debugf);
 lame_set_msgf(gfp, lame_debugf);
 
- if (enc_toggle_val == 0 && vbr_on == 0)
- lame_set_brate(gfp, bitrate_val);
- else if (vbr_on == 0)
- lame_set_compression_ratio(gfp, compression_val);
+ const int vbr_on = GET_INT("vbr_on");
+ if (vbr_on == 0) {
+ if (GET_INT("enc_toggle_val") == 0)
+ lame_set_brate(gfp, GET_INT("bitrate_val"));
+ else
+ lame_set_compression_ratio(gfp, GET_DOUBLE("compression_val"));
+ }
 
 /* frame params */
 
- lame_set_copyright(gfp, mark_copyright_val);
- lame_set_original(gfp, mark_original_val);
- lame_set_error_protection(gfp, error_protect_val);
- lame_set_strict_ISO(gfp, enforce_iso_val);
+ lame_set_copyright(gfp, GET_INT("mark_copyright_val"));
+ lame_set_original(gfp, GET_INT("mark_original_val"));
+ lame_set_error_protection(gfp, GET_INT("error_protect_val"));
+ lame_set_strict_ISO(gfp, GET_INT("enforce_iso_val"));
 
 if (vbr_on != 0) {
- if (vbr_type == 0)
- lame_set_VBR(gfp, (vbr_mode) 2);
+ const int vbr_min_val = GET_INT("vbr_min_val");
+ const int vbr_max_val = GET_INT("vbr_max_val");
+
+ if (GET_INT("vbr_type") == 0)
+ lame_set_VBR(gfp, vbr_rh);
 else
- lame_set_VBR(gfp, (vbr_mode) 3);
- lame_set_VBR_q(gfp, vbr_quality_val);
- lame_set_VBR_mean_bitrate_kbps(gfp, abr_val);
+ lame_set_VBR(gfp, vbr_abr);
+
+ lame_set_VBR_q(gfp, GET_INT("vbr_quality_val"));
+ lame_set_VBR_mean_bitrate_kbps(gfp, GET_INT("abr_val"));
 lame_set_VBR_min_bitrate_kbps(gfp, vbr_min_val);
- lame_set_VBR_max_bitrate_kbps(gfp, vbr_max_val);
- lame_set_VBR_hard_min(gfp, enforce_min_val);
+ lame_set_VBR_max_bitrate_kbps(gfp, aud::max(vbr_min_val, vbr_max_val));
+ lame_set_VBR_hard_min(gfp, GET_INT("enforce_min_val"));
 }
 
 /* not to write id3 tag automatically. */
@@ -261,6 +173,7 @@
 }
 
 channels = info.channels;
+ numsamples = 0;
 return true;
 }
 
@@ -274,11 +187,13 @@
 while (1)
 {
 if (channels == 1)
- encoded = lame_encode_buffer (gfp, (int16_t *) data, (int16_t *) data,
- length / 2, write_buffer.begin (), write_buffer.len ());
+ encoded = lame_encode_buffer_ieee_float (gfp, (const float *) data,
+ (const float *) data, length / sizeof (float),
+ write_buffer.begin (), write_buffer.len ());
 else
- encoded = lame_encode_buffer_interleaved (gfp, (int16_t *) data,
- length / 4, write_buffer.begin (), write_buffer.len ());
+ encoded = lame_encode_buffer_interleaved_ieee_float (gfp,
+ (const float *) data, length / (2 * sizeof (float)),
+ write_buffer.begin (), write_buffer.len ());
 
 if (encoded != -1)
 break;
@@ -333,864 +248,15 @@
 
 lame_close(gfp);
 AUDDBG("lame_close() done\n");
-
- lameid3 = lameid3_t ();
- numsamples = 0;
-}
-
-/*****************/
-/* Configuration */
-/*****************/
-
-/* Various Signal-Fuctions */
-
-static void algo_qual(GtkAdjustment * adjustment, void * user_data)
-{
-
- algo_quality_val =
- gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON
- (alg_quality_spin));
-
-}
-
-static void samplerate_changed (GtkComboBox * combo)
-{
- int i = gtk_combo_box_get_active (combo) - 1;
-
- if (i >= 0 && i < aud::n_elems (available_samplerates))
- out_samplerate_val = available_sampleratesi;
- else
- out_samplerate_val = 0;
-}
-
-static void bitrate_changed (GtkComboBox * combo)
-{
- int i = gtk_combo_box_get_active (combo);
-
- if (i >= 0 && i < aud::n_elems (available_bitrates))
- bitrate_val = available_bitratesi;
- else
- bitrate_val = 128;
-}
-
-static void compression_change(GtkAdjustment * adjustment,
- void * user_data)
-{
- compression_val = gtk_spin_button_get_value ((GtkSpinButton *)
- compression_spin);
-}
-
-static void encoding_toggle(GtkToggleButton * togglebutton,
- void * user_data)
-{
-
- enc_toggle_val = GPOINTER_TO_INT(user_data);
-
-}
-
-static void mode_changed (GtkComboBox * combo)
-{
- int i = gtk_combo_box_get_active (combo);
-
- if (i >= 0 && i < MODES)
- audio_mode_val = modesi;
- else
- audio_mode_val = MODE_AUTO;
-}
-
-static void toggle_enforce_iso(GtkToggleButton * togglebutton,
- void * user_data)
-{
-
- if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(enforce_iso_toggle))
- == TRUE)
- enforce_iso_val = 1;
- else
- enforce_iso_val = 0;
-
-}
-
-static void toggle_error_protect(GtkToggleButton * togglebutton,
- void * user_data)
-{
-
- if (gtk_toggle_button_get_active
- (GTK_TOGGLE_BUTTON(error_protection_toggle)) == TRUE)
- error_protect_val = 1;
- else
- error_protect_val = 0;
-
-}
-
-static void toggle_vbr(GtkToggleButton * togglebutton, void * user_data)
-{
- if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(vbr_toggle)) ==
- TRUE) {
- gtk_widget_set_sensitive(vbr_options_vbox, TRUE);
- gtk_widget_set_sensitive(enc_quality_frame, FALSE);
- vbr_on = 1;
-
- if (vbr_type == 0) {
- gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON
- (vbr_type_radio1), TRUE);
- gtk_widget_set_sensitive(abr_frame, FALSE);
- gtk_widget_set_sensitive(vbr_frame, TRUE);
- }
- else if (vbr_type == 1) {
- gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON
- (vbr_type_radio2), TRUE);
- gtk_widget_set_sensitive(abr_frame, TRUE);
- gtk_widget_set_sensitive(vbr_frame, FALSE);
- }
-
- }
- else {
- gtk_widget_set_sensitive(vbr_options_vbox, FALSE);
- gtk_widget_set_sensitive(enc_quality_frame, TRUE);
- vbr_on = 0;
- }
-}
-
-static void vbr_abr_toggle(GtkToggleButton * togglebutton,
- void * user_data)
-{
- if (!strcmp((char *) user_data, "VBR")) {
- gtk_widget_set_sensitive(abr_frame, FALSE);
- gtk_widget_set_sensitive(vbr_frame, TRUE);
- vbr_type = 0;
- }
- else if (!strcmp((char *) user_data, "ABR")) {
- gtk_widget_set_sensitive(abr_frame, TRUE);
- gtk_widget_set_sensitive(vbr_frame, FALSE);
- vbr_type = 1;
- }
-}
-
-static void vbr_min_changed (GtkComboBox * combo)
-{
- int i = gtk_combo_box_get_active (combo);
-
- if (i >= 0 && i < aud::n_elems (available_bitrates))
- vbr_min_val = available_bitratesi;
- else
- vbr_min_val = 32;
-}
-
-static void vbr_max_changed (GtkComboBox * combo)
-{
- int i = gtk_combo_box_get_active (combo);
-
- if (i >= 0 && i < aud::n_elems (available_bitrates))
- vbr_max_val = available_bitratesi;
- else
- vbr_max_val = 320;
-}
-
-static void toggle_enforce_min(GtkToggleButton * togglebutton,
- void * user_data)
-{
-
- if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(enforce_min_toggle))
- == TRUE)
- enforce_min_val = 1;
- else
- enforce_min_val = 0;
-
-}
-
-static void vbr_qual(GtkAdjustment * adjustment, void * user_data)
-{
-
- vbr_quality_val =
- gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON
- (vbr_quality_spin));
-
-}
-
-static void abr_changed (GtkComboBox * combo)
-{
- int i = gtk_combo_box_get_active (combo);
-
- if (i >= 0 && i < aud::n_elems (available_bitrates))
- abr_val = available_bitratesi;
- else
- abr_val = 128;
-}
-
-static void toggle_xing(GtkToggleButton * togglebutton, void * user_data)
-{
-
- if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(xing_header_toggle)) == TRUE)
- toggle_xing_val = 0;
- else
- toggle_xing_val = 1;
-
-}
-
-static void toggle_original(GtkToggleButton * togglebutton,
- void * user_data)
-{
-
- if (gtk_toggle_button_get_active
- (GTK_TOGGLE_BUTTON(tags_original_toggle)) == TRUE)
- mark_original_val = 1;
- else
- mark_original_val = 0;
-
-}
-
-static void toggle_copyright(GtkToggleButton * togglebutton,
- void * user_data)
-{
-
- if (gtk_toggle_button_get_active
- (GTK_TOGGLE_BUTTON(tags_copyright_toggle)) == TRUE)
- mark_copyright_val = 1;
- else
- mark_copyright_val = 0;
-
-}
-
-static void force_v2_toggle(GtkToggleButton * togglebutton,
- void * user_data)
-{
-
- if (gtk_toggle_button_get_active
- (GTK_TOGGLE_BUTTON(tags_force_id3v2_toggle)) == TRUE) {
- force_v2_val = 1;
- if (gtk_toggle_button_get_active
- (GTK_TOGGLE_BUTTON(tags_only_v1_toggle)) == TRUE) {
- inside = 1;
- gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON
- (tags_only_v1_toggle), FALSE);
- only_v1_val = 0;
- inside = 0;
- }
- }
- else
- force_v2_val = 0;
-
-}
-
-static void id3_only_version(GtkToggleButton * togglebutton,
- void * user_data)
-{
- if (!strcmp((char *) user_data, "v1") && inside != 1) {
- if (gtk_toggle_button_get_active
- (GTK_TOGGLE_BUTTON(tags_only_v1_toggle)) == TRUE)
- {
- inside = 1;
- gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON
- (tags_only_v2_toggle), FALSE);
- only_v1_val = 1;
- only_v2_val = 0;
- gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON
- (tags_force_id3v2_toggle), FALSE);
- inside = 0;
- }
- }
- else if (!strcmp((char *) user_data, "v2") && inside != 1) {
- if (gtk_toggle_button_get_active
- (GTK_TOGGLE_BUTTON(tags_only_v2_toggle)) == TRUE)
- {
- inside = 1;
- gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON
- (tags_only_v1_toggle), FALSE);
- only_v1_val = 0;
- only_v2_val = 1;
- inside = 0;
- }
- }
-
-}
-
-
-
-/* Save Configuration */
-
-static void configure_response_cb (GtkWidget * window, int response)
-{
- if (response != GTK_RESPONSE_OK)
- {
- gtk_widget_destroy (window);
- return;
- }
-
- if (vbr_min_val > vbr_max_val)
- vbr_max_val = vbr_min_val;
-
- aud_set_int ("filewriter_mp3", "vbr_on", vbr_on);
- aud_set_int ("filewriter_mp3", "vbr_type", vbr_type);
- aud_set_int ("filewriter_mp3", "vbr_min_val", vbr_min_val);
- aud_set_int ("filewriter_mp3", "vbr_max_val", vbr_max_val);
- aud_set_int ("filewriter_mp3", "enforce_min_val", enforce_min_val);
- aud_set_int ("filewriter_mp3", "vbr_quality_val", vbr_quality_val);
- aud_set_int ("filewriter_mp3", "abr_val", abr_val);
- aud_set_int ("filewriter_mp3", "toggle_xing_val", toggle_xing_val);
- aud_set_int ("filewriter_mp3", "mark_original_val", mark_original_val);
- aud_set_int ("filewriter_mp3", "mark_copyright_val", mark_copyright_val);
- aud_set_int ("filewriter_mp3", "force_v2_val", force_v2_val);
- aud_set_int ("filewriter_mp3", "only_v1_val", only_v1_val);
- aud_set_int ("filewriter_mp3", "only_v2_val", only_v2_val);
- aud_set_int ("filewriter_mp3", "algo_quality_val", algo_quality_val);
- aud_set_int ("filewriter_mp3", "out_samplerate_val", out_samplerate_val);
- aud_set_int ("filewriter_mp3", "bitrate_val", bitrate_val);
- aud_set_double ("filewriter_mp3", "compression_val", compression_val);
- aud_set_int ("filewriter_mp3", "enc_toggle_val", enc_toggle_val);
- aud_set_int ("filewriter_mp3", "audio_mode_val", audio_mode_val);
- aud_set_int ("filewriter_mp3", "enforce_iso_val", enforce_iso_val);
- aud_set_int ("filewriter_mp3", "error_protect_val", error_protect_val);
-
- gtk_widget_destroy (window);
-}
-
-
-/************************/
-/* Configuration Widget */
-/************************/
-
-
-static void mp3_configure(void)
-{
- if (! configure_win)
- {
- configure_win = gtk_dialog_new_with_buttons (_("MP3 Configuration"),
- nullptr, (GtkDialogFlags) 0, _("_Cancel"), GTK_RESPONSE_CANCEL, _("_OK"),
- GTK_RESPONSE_OK, nullptr);
-
- g_signal_connect (configure_win, "response", (GCallback) configure_response_cb, nullptr);
- g_signal_connect (configure_win, "destroy", (GCallback)
- gtk_widget_destroyed, & configure_win);
-
- vbox = gtk_dialog_get_content_area ((GtkDialog *) configure_win);
-
- notebook = gtk_notebook_new();
- gtk_box_pack_start(GTK_BOX(vbox), notebook, TRUE, TRUE, 0);
-
- /* Quality */
-
- quality_vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 5);
- gtk_container_set_border_width(GTK_CONTAINER(quality_vbox), 5);
-
- quality_hbox1 = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 5);
- gtk_box_pack_start(GTK_BOX(quality_vbox), quality_hbox1, FALSE,
- FALSE, 0);
-
- /* Algorithm Quality */
-
- alg_quality_frame = gtk_frame_new(_("Algorithm Quality:"));
- gtk_container_set_border_width(GTK_CONTAINER(alg_quality_frame),
- 5);
- gtk_box_pack_start(GTK_BOX(quality_hbox1), alg_quality_frame,
- FALSE, FALSE, 0);
-
- alg_quality_hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 5);
- gtk_container_set_border_width(GTK_CONTAINER(alg_quality_hbox),
- 10);
- gtk_container_add(GTK_CONTAINER(alg_quality_frame),
- alg_quality_hbox);
-
- alg_quality_adj = (GtkAdjustment *) gtk_adjustment_new (5, 0, 9, 1, 1, 0);
- alg_quality_spin =
- gtk_spin_button_new(GTK_ADJUSTMENT(alg_quality_adj), 8, 0);
- gtk_box_pack_start(GTK_BOX(alg_quality_hbox), alg_quality_spin,
- TRUE, TRUE, 0);
- g_signal_connect (alg_quality_adj, "value-changed", (GCallback)
- algo_qual, nullptr);
-
- gtk_spin_button_set_value(GTK_SPIN_BUTTON(alg_quality_spin),
- algo_quality_val);
-
- /* Output Samplerate */
-
- samplerate_frame = gtk_frame_new(_("Output Sample Rate:"));
- gtk_container_set_border_width(GTK_CONTAINER(samplerate_frame), 5);
- gtk_box_pack_start(GTK_BOX(quality_hbox1), samplerate_frame, FALSE,
- FALSE, 0);
-
- samplerate_hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 5);
- gtk_container_set_border_width(GTK_CONTAINER(samplerate_hbox), 10);
- gtk_container_add(GTK_CONTAINER(samplerate_frame),
- samplerate_hbox);
-
- GtkWidget * combo = gtk_combo_box_text_new ();
- gtk_combo_box_text_append_text ((GtkComboBoxText *) combo, _("Auto"));
- if (! out_samplerate_val)
- gtk_combo_box_set_active ((GtkComboBox *) combo, 0);
-
- for (int i = 0; i < aud::n_elems (available_samplerates); i ++)
- {
- gtk_combo_box_text_append_text ((GtkComboBoxText *) combo,
- int_to_str (available_sampleratesi));
-
- if (out_samplerate_val == available_sampleratesi)
- gtk_combo_box_set_active ((GtkComboBox *) combo, 1 + i);
- }
-
- gtk_box_pack_start ((GtkBox *) samplerate_hbox, combo, FALSE, FALSE, 0);
- g_signal_connect (combo, "changed", (GCallback) samplerate_changed, nullptr);
-
- samplerate_label = gtk_label_new(_("(Hz)"));
- gtk_widget_set_halign(samplerate_label, GTK_ALIGN_START);
- gtk_box_pack_start(GTK_BOX(samplerate_hbox), samplerate_label,
- FALSE, FALSE, 0);
-
- /* Encoder Quality */
-
- enc_quality_frame = gtk_frame_new(_("Bitrate / Compression Ratio:"));
- gtk_container_set_border_width(GTK_CONTAINER(enc_quality_frame),
- 5);
- gtk_box_pack_start(GTK_BOX(quality_vbox), enc_quality_frame, FALSE,
- FALSE, 0);
-
- // vbox sorrounding hbox1 and hbox2
- enc_quality_vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 5);
- gtk_container_set_border_width(GTK_CONTAINER(enc_quality_vbox), 10);
-
- // pack vbox to frame
- gtk_container_add(GTK_CONTAINER(enc_quality_frame), enc_quality_vbox);
-
- // hbox1 for bitrate
- hbox1 = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 5);
- gtk_container_add(GTK_CONTAINER(enc_quality_vbox), hbox1);
-
- // radio 1
- enc_radio1 = gtk_radio_button_new(nullptr);
- if (enc_toggle_val == 0)
- gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(enc_radio1), TRUE);
- gtk_box_pack_start(GTK_BOX(hbox1), enc_radio1, FALSE, FALSE, 0);
-
- // label 1
- enc_quality_label1 = gtk_label_new(_("Bitrate (kbps):"));
- gtk_box_pack_start(GTK_BOX(hbox1), enc_quality_label1, FALSE, FALSE, 0);
-
- // bitrate menu
-
- combo = gtk_combo_box_text_new ();
-
- for (int i = 0; i < aud::n_elems (available_bitrates); i ++)
- {
- gtk_combo_box_text_append_text ((GtkComboBoxText *) combo,
- int_to_str (available_bitratesi));
-
- if (bitrate_val == available_bitratesi)
- gtk_combo_box_set_active ((GtkComboBox *) combo, i);
- }
-
- gtk_box_pack_start ((GtkBox *) hbox1, combo, FALSE, FALSE, 0);
- g_signal_connect (combo, "changed", (GCallback) bitrate_changed, nullptr);
-
- // hbox2 for compression ratio
- hbox2 = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 5);
- gtk_container_add(GTK_CONTAINER(enc_quality_vbox), hbox2);
-
- // radio 2
- enc_radio2 = gtk_radio_button_new_from_widget(GTK_RADIO_BUTTON(enc_radio1));
- if (enc_toggle_val == 1)
- gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(enc_radio2),
- TRUE);
- // pack radio 2
- gtk_box_pack_start(GTK_BOX(hbox2), enc_radio2, FALSE, FALSE, 0);
-
- // label
- enc_quality_label2 = gtk_label_new(_("Compression ratio:"));
- gtk_box_pack_start(GTK_BOX(hbox2), enc_quality_label2, FALSE, FALSE, 0);
-
- // comp-ratio spin
- compression_adj = (GtkAdjustment *) gtk_adjustment_new (11, 0, 100, 1,
- 1, 0);
- compression_spin =
- gtk_spin_button_new(GTK_ADJUSTMENT(compression_adj), 8, 0);
- gtk_box_pack_end(GTK_BOX(hbox2), compression_spin, FALSE, FALSE, 0);
-
- g_signal_connect (compression_adj, "value-changed", (GCallback)
- compression_change, nullptr);
-
- gtk_spin_button_set_value(GTK_SPIN_BUTTON(compression_spin),
- compression_val);
-
- // radio button signale connect
- g_signal_connect (enc_radio1, "toggled", (GCallback) encoding_toggle,
- GINT_TO_POINTER (0));
- g_signal_connect (enc_radio2, "toggled", (GCallback) encoding_toggle,
- GINT_TO_POINTER (1));
-
- /* Audio Mode */
-
- mode_frame = gtk_frame_new(_("Audio Mode:"));
- gtk_container_set_border_width(GTK_CONTAINER(mode_frame), 5);
- gtk_box_pack_start(GTK_BOX(quality_vbox), mode_frame, FALSE, FALSE,
- 0);
-
- mode_hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 10);
- gtk_container_set_border_width(GTK_CONTAINER(mode_hbox), 10);
- gtk_container_add(GTK_CONTAINER(mode_frame), mode_hbox);
-
- combo = gtk_combo_box_text_new ();
-
- for (int i = 0; i < MODES; i ++)
- {
- gtk_combo_box_text_append_text ((GtkComboBoxText *) combo,
- _(mode_namesi));
-
- if (audio_mode_val == modesi)
- gtk_combo_box_set_active ((GtkComboBox *) combo, i);
- }
-
- gtk_box_pack_start ((GtkBox *) mode_hbox, combo, FALSE, FALSE, 0);
- g_signal_connect (combo, "changed", (GCallback) mode_changed, nullptr);
-
- /* Misc */
-
- misc_frame = gtk_frame_new(_("Miscellaneous:"));
- gtk_container_set_border_width(GTK_CONTAINER(misc_frame), 5);
- gtk_box_pack_start(GTK_BOX(quality_vbox), misc_frame, FALSE, FALSE,
- 0);
-
- misc_vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 5);
- gtk_container_set_border_width(GTK_CONTAINER(misc_vbox), 5);
- gtk_container_add(GTK_CONTAINER(misc_frame), misc_vbox);
-
- enforce_iso_toggle =
- gtk_check_button_new_with_label
- (_("Enforce strict ISO compliance"));
- gtk_box_pack_start(GTK_BOX(misc_vbox), enforce_iso_toggle, TRUE,
- TRUE, 2);
- g_signal_connect (enforce_iso_toggle, "toggled", (GCallback)
- toggle_enforce_iso, nullptr);
-
- if (enforce_iso_val == 1)
- gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON
- (enforce_iso_toggle), TRUE);
-
- error_protection_toggle =
- gtk_check_button_new_with_label(_("Error protection"));
- gtk_box_pack_start(GTK_BOX(misc_vbox), error_protection_toggle,
- TRUE, TRUE, 2);
- g_signal_connect (error_protection_toggle, "toggled", (GCallback)
- toggle_error_protect, nullptr);
-
- if (error_protect_val == 1)
- gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON
- (error_protection_toggle), TRUE);
-
- /* Add the Notebook */
- gtk_notebook_append_page(GTK_NOTEBOOK(notebook), quality_vbox,
- gtk_label_new(_("Quality")));
-
- /* VBR/ABR */
-
- vbr_vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 5);
- gtk_container_set_border_width(GTK_CONTAINER(vbr_vbox), 5);
-
- /* Toggle VBR */
-
- vbr_toggle = gtk_check_button_new_with_label(_("Enable VBR/ABR"));
- gtk_box_pack_start(GTK_BOX(vbr_vbox), vbr_toggle, FALSE, FALSE, 2);
- g_signal_connect (vbr_toggle, "toggled", (GCallback) toggle_vbr, nullptr);
-
- vbr_options_vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
- gtk_container_add(GTK_CONTAINER(vbr_vbox), vbr_options_vbox);
- gtk_widget_set_sensitive(vbr_options_vbox, FALSE);
-
- /* Choose VBR/ABR */
-
- vbr_type_frame = gtk_frame_new(_("Type:"));
- gtk_container_set_border_width(GTK_CONTAINER(vbr_type_frame), 5);
- gtk_box_pack_start(GTK_BOX(vbr_options_vbox), vbr_type_frame,
- FALSE, FALSE, 2);
-
- vbr_type_hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 5);
- gtk_container_set_border_width(GTK_CONTAINER(vbr_type_hbox), 5);
- gtk_container_add(GTK_CONTAINER(vbr_type_frame), vbr_type_hbox);
-
- vbr_type_radio1 = gtk_radio_button_new_with_label(nullptr, "VBR");
- gtk_box_pack_start(GTK_BOX(vbr_type_hbox), vbr_type_radio1, TRUE,
- TRUE, 2);
- if (vbr_type == 0)
- gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON
- (vbr_type_radio1), TRUE);
-
- vbr_type_radio2 =
- gtk_radio_button_new_with_label_from_widget(GTK_RADIO_BUTTON
- (vbr_type_radio1),
- "ABR");
- gtk_box_pack_start(GTK_BOX(vbr_type_hbox), vbr_type_radio2, TRUE,
- TRUE, 2);
- if (vbr_type == 1)
- gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON
- (vbr_type_radio2), TRUE);
-
- g_signal_connect (vbr_type_radio1, "toggled", (GCallback)
- vbr_abr_toggle, (void *) "VBR");
- g_signal_connect (vbr_type_radio2, "toggled", (GCallback)
- vbr_abr_toggle, (void *) "ABR");
-
- /* VBR Options */
-
- vbr_frame = gtk_frame_new(_("VBR Options:"));
- gtk_container_set_border_width(GTK_CONTAINER(vbr_frame), 5);
- gtk_box_pack_start(GTK_BOX(vbr_options_vbox), vbr_frame, FALSE,
- FALSE, 2);
-
- vbr_options_vbox2 = gtk_box_new(GTK_ORIENTATION_VERTICAL, 5);
- gtk_container_set_border_width(GTK_CONTAINER(vbr_options_vbox2),
- 5);
- gtk_container_add(GTK_CONTAINER(vbr_frame), vbr_options_vbox2);
-
- vbr_options_hbox1 = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 5);
- gtk_container_set_border_width(GTK_CONTAINER(vbr_options_hbox1),
- 5);
- gtk_container_add(GTK_CONTAINER(vbr_options_vbox2),
- vbr_options_hbox1);
-
- vbr_min_label = gtk_label_new(_("Minimum bitrate (kbps):"));
- gtk_widget_set_halign(vbr_min_label, GTK_ALIGN_START);
- gtk_box_pack_start(GTK_BOX(vbr_options_hbox1), vbr_min_label, TRUE,
- TRUE, 0);
-
- combo = gtk_combo_box_text_new ();
-
- for (int i = 0; i < aud::n_elems (available_bitrates); i ++)
- {
- gtk_combo_box_text_append_text ((GtkComboBoxText *) combo,
- int_to_str (available_bitratesi));
-
- if (vbr_min_val == available_bitratesi)
- gtk_combo_box_set_active ((GtkComboBox *) combo, i);
- }
-
- gtk_box_pack_start ((GtkBox *) vbr_options_hbox1, combo, FALSE, FALSE,
- 0);
- g_signal_connect (combo, "changed", (GCallback) vbr_min_changed, nullptr);
-
- vbr_options_hbox2 = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 5);
- gtk_container_set_border_width(GTK_CONTAINER(vbr_options_hbox2),
- 5);
- gtk_container_add(GTK_CONTAINER(vbr_options_vbox2),
- vbr_options_hbox2);
-
- vbr_max_label = gtk_label_new(_("Maximum bitrate (kbps):"));
- gtk_widget_set_halign(vbr_max_label, GTK_ALIGN_START);
- gtk_box_pack_start(GTK_BOX(vbr_options_hbox2), vbr_max_label, TRUE,
- TRUE, 0);
-
- combo = gtk_combo_box_text_new ();
-
- for (int i = 0; i < aud::n_elems (available_bitrates); i ++)
- {
- gtk_combo_box_text_append_text ((GtkComboBoxText *) combo,
- int_to_str (available_bitratesi));
-
- if (vbr_max_val == available_bitratesi)
- gtk_combo_box_set_active ((GtkComboBox *) combo, i);
- }
-
- gtk_box_pack_start ((GtkBox *) vbr_options_hbox2, combo, FALSE, FALSE,
- 0);
- g_signal_connect (combo, "changed", (GCallback) vbr_max_changed, nullptr);
-
- enforce_min_toggle =
- gtk_check_button_new_with_label
- (_("Strictly enforce minimum bitrate"));
- gtk_box_pack_start(GTK_BOX(vbr_options_vbox2), enforce_min_toggle,
- FALSE, FALSE, 2);
- g_signal_connect (enforce_min_toggle, "toggled", (GCallback)
- toggle_enforce_min, nullptr);
-
- if (enforce_min_val == 1)
- gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON
- (enforce_min_toggle), TRUE);
-
- /* ABR Options */
-
- abr_frame = gtk_frame_new(_("ABR Options:"));
- gtk_container_set_border_width(GTK_CONTAINER(abr_frame), 5);
- gtk_box_pack_start(GTK_BOX(vbr_options_vbox), abr_frame, FALSE,
- FALSE, 2);
- gtk_widget_set_sensitive(abr_frame, FALSE);
-
- abr_hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 5);
- gtk_container_set_border_width(GTK_CONTAINER(abr_hbox), 5);
- gtk_container_add(GTK_CONTAINER(abr_frame), abr_hbox);
-
- abr_label = gtk_label_new(_("Average bitrate (kbps):"));
- gtk_widget_set_halign(abr_label, GTK_ALIGN_START);
- gtk_box_pack_start(GTK_BOX(abr_hbox), abr_label, TRUE, TRUE, 0);
-
- combo = gtk_combo_box_text_new ();
-
- for (int i = 0; i < aud::n_elems (available_bitrates); i ++)
- {
- gtk_combo_box_text_append_text ((GtkComboBoxText *) combo,
- int_to_str (available_bitratesi));
-
- if (abr_val == available_bitratesi)
- gtk_combo_box_set_active ((GtkComboBox *) combo, i);
- }
-
- gtk_box_pack_start ((GtkBox *) abr_hbox, combo, FALSE, FALSE,
- 0);
- g_signal_connect (combo, "changed", (GCallback) abr_changed, nullptr);
-
- /* Quality Level */
-
- vbr_options_hbox3 = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 5);
- gtk_container_set_border_width(GTK_CONTAINER(vbr_options_hbox3),
- 5);
- gtk_container_add(GTK_CONTAINER(vbr_options_vbox),
- vbr_options_hbox3);
-
- vbr_quality_label = gtk_label_new(_("VBR quality level:"));
- gtk_widget_set_halign(vbr_quality_label, GTK_ALIGN_START);
- gtk_box_pack_start(GTK_BOX(vbr_options_hbox3), vbr_quality_label,
- TRUE, TRUE, 0);
-
- vbr_quality_adj = (GtkAdjustment *) gtk_adjustment_new (4, 0, 9, 1, 1, 0);
- vbr_quality_spin =
- gtk_spin_button_new(GTK_ADJUSTMENT(vbr_quality_adj), 8, 0);
- gtk_box_pack_start(GTK_BOX(vbr_options_hbox3), vbr_quality_spin,
- TRUE, TRUE, 0);
- g_signal_connect (vbr_quality_adj, "value-changed", (GCallback)
- vbr_qual, nullptr);
-
- gtk_spin_button_set_value(GTK_SPIN_BUTTON(vbr_quality_spin),
- vbr_quality_val);
-
- /* Xing Header */
-
- xing_header_toggle =
- gtk_check_button_new_with_label(_("Omit Xing VBR header"));
- gtk_box_pack_start(GTK_BOX(vbr_options_vbox), xing_header_toggle,
- FALSE, FALSE, 2);
- g_signal_connect (xing_header_toggle, "toggled", (GCallback)
- toggle_xing, nullptr);
-
- if (toggle_xing_val == 0)
- gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON
- (xing_header_toggle), TRUE);
-
- /* Add the Notebook */
-
- gtk_notebook_append_page(GTK_NOTEBOOK(notebook), vbr_vbox,
- gtk_label_new(_("VBR/ABR")));
-
- /* Tags */
-
- tags_vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 5);
- gtk_container_set_border_width(GTK_CONTAINER(tags_vbox), 5);
-
- /* Frame Params */
-
- tags_frames_frame = gtk_frame_new(_("Frame Parameters:"));
- gtk_container_set_border_width(GTK_CONTAINER(tags_frames_frame),
- 5);
- gtk_box_pack_start(GTK_BOX(tags_vbox), tags_frames_frame, FALSE,
- FALSE, 2);
-
- tags_frames_hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 5);
- gtk_container_set_border_width(GTK_CONTAINER(tags_frames_hbox), 5);
- gtk_container_add(GTK_CONTAINER(tags_frames_frame),
- tags_frames_hbox);
-
- tags_copyright_toggle =
- gtk_check_button_new_with_label(_("Mark as copyright"));
- gtk_box_pack_start(GTK_BOX(tags_frames_hbox),
- tags_copyright_toggle, FALSE, FALSE, 2);
- g_signal_connect (tags_copyright_toggle, "toggled", (GCallback)
- toggle_copyright, nullptr);
-
- if (mark_copyright_val == 1)
- gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON
- (tags_copyright_toggle), TRUE);
-
- tags_original_toggle =
- gtk_check_button_new_with_label(_("Mark as original"));
- gtk_box_pack_start(GTK_BOX(tags_frames_hbox), tags_original_toggle,
- FALSE, FALSE, 2);
- g_signal_connect (tags_original_toggle, "toggled", (GCallback)
- toggle_original, nullptr);
-
- if (mark_original_val == 1)
- gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON
- (tags_original_toggle), TRUE);
-
- /* ID3 Params */
-
- tags_id3_frame = gtk_frame_new(_("ID3 Parameters:"));
- gtk_container_set_border_width(GTK_CONTAINER(tags_id3_frame), 5);
- gtk_box_pack_start(GTK_BOX(tags_vbox), tags_id3_frame, FALSE,
- FALSE, 2);
-
- tags_id3_vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 5);
- gtk_container_set_border_width(GTK_CONTAINER(tags_id3_vbox), 5);
- gtk_container_add(GTK_CONTAINER(tags_id3_frame), tags_id3_vbox);
-
- tags_force_id3v2_toggle =
- gtk_check_button_new_with_label
- (_("Force addition of version 2 tag"));
- gtk_box_pack_start(GTK_BOX(tags_id3_vbox), tags_force_id3v2_toggle,
- FALSE, FALSE, 2);
- g_signal_connect (tags_force_id3v2_toggle, "toggled", (GCallback)
- force_v2_toggle, nullptr);
-
- tags_id3_hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 5);
- gtk_container_add(GTK_CONTAINER(tags_id3_vbox), tags_id3_hbox);
-
- tags_only_v1_toggle =
- gtk_check_button_new_with_label(_("Only add v1 tag"));
- gtk_box_pack_start(GTK_BOX(tags_id3_hbox), tags_only_v1_toggle,
- FALSE, FALSE, 2);
- g_signal_connect (tags_only_v1_toggle, "toggled", (GCallback)
- id3_only_version, (void *) "v1");
-
- tags_only_v2_toggle =
- gtk_check_button_new_with_label(_("Only add v2 tag"));
- gtk_box_pack_start(GTK_BOX(tags_id3_hbox), tags_only_v2_toggle,
- FALSE, FALSE, 2);
- g_signal_connect (tags_only_v2_toggle, "toggled", (GCallback)
- id3_only_version, (void *) "v2");
-
- if (force_v2_val == 1)
- gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON
- (tags_force_id3v2_toggle), TRUE);
-
- if (only_v1_val == 1)
- gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON
- (tags_only_v1_toggle), TRUE);
-
- if (only_v2_val == 1)
- gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON
- (tags_only_v2_toggle), TRUE);
-
- /* Add the Notebook */
-
- gtk_notebook_append_page(GTK_NOTEBOOK(notebook), tags_vbox,
- gtk_label_new(_("Tags")));
-
- /* Set States */
-
- if (vbr_on == 1)
- gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(vbr_toggle),
- TRUE);
- else
- gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(vbr_toggle),
- FALSE);
-
- /* Show it! */
-
- gtk_widget_show_all(configure_win);
- }
 }
 
 static int mp3_format_required (int fmt)
 {
- return FMT_S16_NE;
+ return FMT_FLOAT;
 }
 
 FileWriterImpl mp3_plugin = {
 mp3_init,
- mp3_configure,
 mp3_open,
 mp3_write,
 mp3_close,

audacious-plugins-3.6.2-gtk3.tar.bz2/src/filewriter/vorbis.cc -> audacious-plugins-4.4.1.tar.bz2/src/filewriter/vorbis.cc Changed

@@ -19,13 +19,12 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
-#include "plugins.h"
+#include "filewriter.h"
 
 #ifdef FILEWRITER_VORBIS
 
 #include <stdlib.h>
 #include <vorbis/vorbisenc.h>
-#include <gtk/gtk.h>
 
 #include <libaudcore/audstrings.h>
 #include <libaudcore/i18n.h>
@@ -44,14 +43,13 @@
 "base_quality", "0.5",
 nullptr};
 
-static double v_base_quality;
+#define GET_DOUBLE(n) aud_get_double("filewriter_vorbis", n)
+
 static int channels;
 
 static void vorbis_init ()
 {
 aud_config_set_defaults ("filewriter_vorbis", vorbis_defaults);
-
- v_base_quality = aud_get_double ("filewriter_vorbis", "base_quality");
 }
 
 static void add_string_from_tuple (vorbis_comment * vc, const char * name,
@@ -88,7 +86,10 @@
 if ((scrint = tuple.get_int (Tuple::Year)) > 0)
 vorbis_comment_add_tag(&vc, "year", int_to_str (scrint));
 
- if (vorbis_encode_init_vbr (& vi, info.channels, info.frequency, v_base_quality))
+ if ((scrint = tuple.get_int (Tuple::Disc)) > 0)
+ vorbis_comment_add_tag(&vc, "discnumber", int_to_str (scrint));
+
+ if (vorbis_encode_init_vbr(& vi, info.channels, info.frequency, GET_DOUBLE("base_quality")))
 {
 vorbis_info_clear(&vi);
 return false;
@@ -177,60 +178,6 @@
 vorbis_info_clear(&vi);
 }
 
-/* configuration stuff */
-static GtkWidget *configure_win = nullptr;
-static GtkWidget *quality_frame, *quality_vbox, *quality_hbox1, *quality_spin, *quality_label;
-static GtkAdjustment * quality_adj;
-
-static void quality_change(GtkAdjustment *adjustment, void * user_data)
-{
- v_base_quality = gtk_spin_button_get_value ((GtkSpinButton *) quality_spin) / 10;
- aud_set_double ("filewriter_vorbis", "base_quality", v_base_quality);
-}
-
-static void vorbis_configure(void)
-{
- if (! configure_win)
- {
- configure_win = gtk_dialog_new_with_buttons
- (_("Vorbis Encoder Configuration"), nullptr, (GtkDialogFlags) 0,
- _("_Close"), GTK_RESPONSE_CLOSE, nullptr);
-
- g_signal_connect (configure_win, "response", (GCallback) gtk_widget_destroy, nullptr);
- g_signal_connect (configure_win, "destroy", (GCallback)
- gtk_widget_destroyed, & configure_win);
-
- GtkWidget * vbox = gtk_dialog_get_content_area ((GtkDialog *) configure_win);
-
- /* quality options */
- quality_frame = gtk_frame_new(_("Quality"));
- gtk_container_set_border_width(GTK_CONTAINER(quality_frame), 5);
- gtk_box_pack_start(GTK_BOX(vbox), quality_frame, FALSE, FALSE, 2);
-
- quality_vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 5);
- gtk_container_set_border_width(GTK_CONTAINER(quality_vbox), 10);
- gtk_container_add(GTK_CONTAINER(quality_frame), quality_vbox);
-
- /* quality option: vbr level */
- quality_hbox1 = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 5);
- gtk_container_set_border_width(GTK_CONTAINER(quality_hbox1), 10);
- gtk_container_add(GTK_CONTAINER(quality_vbox), quality_hbox1);
-
- quality_label = gtk_label_new(_("Quality level (0 - 10):"));
- gtk_widget_set_halign(quality_label, GTK_ALIGN_START);
- gtk_box_pack_start(GTK_BOX(quality_hbox1), quality_label, TRUE, TRUE, 0);
-
- quality_adj = (GtkAdjustment *) gtk_adjustment_new (5, 0, 10, 0.1, 1, 0);
- quality_spin = gtk_spin_button_new(GTK_ADJUSTMENT(quality_adj), 1, 2);
- gtk_box_pack_start(GTK_BOX(quality_hbox1), quality_spin, TRUE, TRUE, 0);
- g_signal_connect(G_OBJECT(quality_adj), "value-changed", G_CALLBACK(quality_change), nullptr);
-
- gtk_spin_button_set_value(GTK_SPIN_BUTTON(quality_spin), (v_base_quality * 10));
- }
-
- gtk_widget_show_all(configure_win);
-}
-
 static int vorbis_format_required (int fmt)
 {
 return FMT_FLOAT;
@@ -238,7 +185,6 @@
 
 FileWriterImpl vorbis_plugin = {
 vorbis_init,
- vorbis_configure,
 vorbis_open,
 vorbis_write,
 vorbis_close,

audacious-plugins-3.6.2-gtk3.tar.bz2/src/filewriter/wav.cc -> audacious-plugins-4.4.1.tar.bz2/src/filewriter/wav.cc Changed

audacious-plugins-4.4.1.tar.bz2/src/flac Added

audacious-plugins-4.4.1.tar.bz2/src/flac/Makefile Changed

audacious-plugins-4.4.1.tar.bz2/src/flac/flacng.h Added

@@ -0,0 +1,105 @@
+/*
+ * A FLAC decoder plugin for the Audacious Media Player
+ * Copyright (C) 2005 Ralf Ertzinger
+ *
+ * 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 FLACNG_H
+#define FLACNG_H
+
+#include <FLAC/all.h>
+
+#include <libaudcore/i18n.h>
+#include <libaudcore/plugin.h>
+
+class FLACng : public InputPlugin
+{
+public:
+ static const char about;
+ static const char *const exts;
+ static const char *const mimes;
+
+ static constexpr PluginInfo info = {
+ N_("FLAC Decoder"),
+ PACKAGE,
+ about
+ };
+
+ constexpr FLACng() : InputPlugin(info, InputInfo(FlagWritesTag)
+ .with_priority(_AUD_PLUGIN_DEFAULT_PRIO + 1)
+ .with_exts(exts)
+ .with_mimes(mimes)) {}
+
+ bool init();
+ void cleanup();
+
+ bool is_our_file(const char *filename, VFSFile &file);
+ bool read_tag(const char *filename, VFSFile &file, Tuple &tuple, Index<char> *image);
+ bool write_tuple(const char *filename, VFSFile &file, const Tuple &tuple);
+ bool play(const char *filename, VFSFile &file);
+};
+
+#define BUFFER_SIZE_SAMP (FLAC__MAX_BLOCK_SIZE * FLAC__MAX_CHANNELS)
+#define BUFFER_SIZE_BYTE (BUFFER_SIZE_SAMP * (FLAC__MAX_BITS_PER_SAMPLE/8))
+
+#define SAMPLE_SIZE(a) (a == 8 ? 1 : (a == 16 ? 2 : 4))
+#define SAMPLE_FMT(a) (a == 8 ? FMT_S8 : (a == 16 ? FMT_S16_NE : (a == 24 ? FMT_S24_NE : FMT_S32_NE)))
+
+struct callback_info
+{
+ unsigned bits_per_sample = 0;
+ unsigned sample_rate = 0;
+ unsigned channels = 0;
+ unsigned long total_samples = 0;
+ Index<int32_t> output_buffer;
+ int32_t *write_pointer = nullptr;
+ unsigned buffer_used = 0;
+ VFSFile *fd = nullptr;
+ int bitrate = 0;
+
+ void alloc()
+ {
+ output_buffer.resize(BUFFER_SIZE_SAMP);
+ reset();
+ }
+
+ void reset()
+ {
+ buffer_used = 0;
+ write_pointer = output_buffer.begin();
+ }
+};
+
+/* metadata.c */
+bool flac_update_song_tuple(const char *filename, VFSFile &fd, const Tuple &tuple);
+Index<char> flac_get_image(const char *filename, VFSFile &fd);
+Tuple flac_probe_for_tuple(const char *filename, VFSFile &fd);
+
+/* seekable_stream_callbacks.c */
+FLAC__StreamDecoderReadStatus read_callback(const FLAC__StreamDecoder *decoder, FLAC__byte buffer, size_t *bytes, void *client_data);
+FLAC__StreamDecoderSeekStatus seek_callback(const FLAC__StreamDecoder *decoder, FLAC__uint64 absolute_byte_offset, void *client_data);
+FLAC__StreamDecoderTellStatus tell_callback(const FLAC__StreamDecoder *decoder, FLAC__uint64 *absolute_byte_offset, void *client_data);
+FLAC__bool eof_callback(const FLAC__StreamDecoder *decoder, void *client_data);
+FLAC__StreamDecoderLengthStatus length_callback(const FLAC__StreamDecoder *decoder, FLAC__uint64 *stream_length, void *client_data);
+FLAC__StreamDecoderWriteStatus write_callback(const FLAC__StreamDecoder *decoder, const FLAC__Frame *frame, const FLAC__int32 * const buffer, void *client_data);
+void error_callback(const FLAC__StreamDecoder *decoder, FLAC__StreamDecoderErrorStatus status, void *client_data);
+void metadata_callback(const FLAC__StreamDecoder *decoder, const FLAC__StreamMetadata *metadata, void *client_data);
+
+/* tools.c */
+bool is_ogg_flac(VFSFile &file);
+bool read_metadata(FLAC__StreamDecoder* decoder, callback_info* info);
+
+#endif

audacious-plugins-4.4.1.tar.bz2/src/flac/meson.build Added

audacious-plugins-4.4.1.tar.bz2/src/flac/metadata.cc Added

@@ -0,0 +1,404 @@
+/*
+ * A FLAC decoder plugin for the Audacious Media Player
+ * Copyright (C) 2005 Ralf Ertzinger
+ * Copyright (C) 2010 John Lindgren
+ * Copyright (C) 2010 Michał Lipski <tallica@o2.pl>
+ *
+ * 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/>.
+ *
+ */
+
+#include <stdlib.h>
+#include <string.h>
+
+#define WANT_VFS_STDIO_COMPAT
+#include <libaudcore/runtime.h>
+#include <libaudcore/i18n.h>
+#include <libaudcore/audstrings.h>
+
+#include "flacng.h"
+
+static size_t read_cb(void *ptr, size_t size, size_t nmemb, FLAC__IOHandle handle)
+{
+ int64_t read;
+
+ if (handle == nullptr)
+ {
+ AUDERR("Trying to read data from an uninitialized file!\n");
+ return -1;
+ }
+
+ read = ((VFSFile *) handle)->fread (ptr, size, nmemb);
+
+ switch (read)
+ {
+ case -1:
+ AUDERR("Error while reading from stream!\n");
+ return -1;
+
+ case 0:
+ AUDDBG("Stream reached EOF\n");
+ return 0;
+
+ default:
+ return read;
+ }
+}
+
+static size_t write_cb(const void *ptr, size_t size, size_t nmemb, FLAC__IOHandle handle)
+{
+ return ((VFSFile *) handle)->fwrite (ptr, size, nmemb);
+}
+
+static int seek_cb(FLAC__IOHandle handle, FLAC__int64 offset, int whence)
+{
+ if (((VFSFile *) handle)->fseek (offset, to_vfs_seek_type (whence)) != 0)
+ {
+ AUDERR("Could not seek to %ld!\n", (long)offset);
+ return -1;
+ }
+
+ return 0;
+}
+
+static FLAC__int64 tell_cb(FLAC__IOHandle handle)
+{
+ int64_t offset;
+
+ if ((offset = ((VFSFile *) handle)->ftell ()) < 0)
+ {
+ AUDERR("Could not tell current position!\n");
+ return -1;
+ }
+
+ AUDDBG ("Current position: %d\n", (int) offset);
+ return offset;
+}
+
+static int eof_cb(FLAC__IOHandle handle)
+{
+ return ((VFSFile *) handle)->feof ();
+}
+
+static FLAC__IOCallbacks io_callbacks = {
+ read_cb,
+ write_cb,
+ seek_cb,
+ tell_cb,
+ eof_cb,
+ nullptr
+};
+
+static void insert_str_tuple_to_vc (FLAC__StreamMetadata * vc_block,
+ const Tuple & tuple, Tuple::Field field, const char * field_name)
+{
+ FLAC__StreamMetadata_VorbisComment_Entry entry;
+ String val = tuple.get_str (field);
+
+ FLAC__metadata_object_vorbiscomment_remove_entries_matching(vc_block,
+ field_name);
+
+ if (! val)
+ return;
+
+ StringBuf str = str_printf ("%s=%s", field_name, (const char *) val);
+ entry.entry = (FLAC__byte *) (char *) str;
+ entry.length = strlen(str);
+ FLAC__metadata_object_vorbiscomment_insert_comment(vc_block,
+ vc_block->data.vorbis_comment.num_comments, entry, true);
+}
+
+static void insert_int_tuple_to_vc (FLAC__StreamMetadata * vc_block,
+ const Tuple & tuple, Tuple::Field field, const char * field_name)
+{
+ FLAC__StreamMetadata_VorbisComment_Entry entry;
+ int val = tuple.get_int (field);
+
+ FLAC__metadata_object_vorbiscomment_remove_entries_matching(vc_block,
+ field_name);
+
+ if (val <= 0)
+ return;
+
+ StringBuf str = str_printf ("%s=%d", field_name, val);
+ entry.entry = (FLAC__byte *) (char *) str;
+ entry.length = strlen(str);
+ FLAC__metadata_object_vorbiscomment_insert_comment(vc_block,
+ vc_block->data.vorbis_comment.num_comments, entry, true);
+}
+
+bool FLACng::write_tuple(const char *filename, VFSFile &file, const Tuple &tuple)
+{
+ if (is_ogg_flac(file))
+ {
+ AUDERR("Writing Ogg FLAC tags is not currently supported!\n");
+ return false;
+ }
+
+ AUDDBG("Update song tuple.\n");
+
+ FLAC__Metadata_Iterator *iter;
+ FLAC__Metadata_Chain *chain;
+ FLAC__StreamMetadata *vc_block = nullptr;
+ FLAC__Metadata_ChainStatus status;
+
+ chain = FLAC__metadata_chain_new();
+
+ if (!FLAC__metadata_chain_read_with_callbacks(chain, &file, io_callbacks))
+ goto ERR;
+
+ iter = FLAC__metadata_iterator_new();
+
+ FLAC__metadata_iterator_init(iter, chain);
+
+ while (FLAC__metadata_iterator_next(iter))
+ {
+ if (FLAC__metadata_iterator_get_block_type(iter) == FLAC__METADATA_TYPE_VORBIS_COMMENT)
+ {
+ vc_block = FLAC__metadata_iterator_get_block(iter);
+ break;
+ }
+ }
+
+ if (!vc_block)
+ {
+ vc_block = FLAC__metadata_object_new(FLAC__METADATA_TYPE_VORBIS_COMMENT);
+ FLAC__metadata_iterator_insert_block_after(iter, vc_block);
+ }
+
+ insert_str_tuple_to_vc(vc_block, tuple, Tuple::Title, "TITLE");
+ insert_str_tuple_to_vc(vc_block, tuple, Tuple::Artist, "ARTIST");
+ insert_str_tuple_to_vc(vc_block, tuple, Tuple::Album, "ALBUM");
+ insert_str_tuple_to_vc(vc_block, tuple, Tuple::AlbumArtist, "ALBUMARTIST");
+ insert_str_tuple_to_vc(vc_block, tuple, Tuple::Genre, "GENRE");
+ insert_str_tuple_to_vc(vc_block, tuple, Tuple::Comment, "COMMENT");
+ insert_str_tuple_to_vc(vc_block, tuple, Tuple::Description, "DESCRIPTION");
+ insert_str_tuple_to_vc(vc_block, tuple, Tuple::MusicBrainzID, "musicbrainz_trackid");
+
+ insert_int_tuple_to_vc(vc_block, tuple, Tuple::Year, "DATE");
+ insert_int_tuple_to_vc(vc_block, tuple, Tuple::Track, "TRACKNUMBER");
+ insert_int_tuple_to_vc(vc_block, tuple, Tuple::Disc, "DISCNUMBER");
+
+ insert_str_tuple_to_vc(vc_block, tuple, Tuple::Publisher, "publisher");
+ insert_str_tuple_to_vc(vc_block, tuple, Tuple::CatalogNum, "CATALOGNUMBER");
+
+ FLAC__metadata_iterator_delete(iter);
+ FLAC__metadata_chain_sort_padding(chain);
+
+ if (FLAC__metadata_chain_check_if_tempfile_needed(chain, true))
+ {
+ auto temp = VFSFile::tmpfile();
+ if (!temp)
+ goto ERR_RETURN;
+
+ if (!FLAC__metadata_chain_write_with_callbacks_and_tempfile(chain, true,
+ &file, io_callbacks, &temp, io_callbacks))
+ goto ERR;
+
+ if (!file.replace_with(temp))
+ goto ERR_RETURN;
+ }
+ else /* no tempfile needed */
+ {
+ if (!FLAC__metadata_chain_write_with_callbacks(chain, true, &file, io_callbacks))
+ goto ERR;
+ }
+
+ FLAC__metadata_chain_delete(chain);
+ return true;
+
+ERR:
+ status = FLAC__metadata_chain_status(chain);
+ AUDERR("An error occurred: %s\n", FLAC__Metadata_ChainStatusStringstatus);
+ERR_RETURN:
+ FLAC__metadata_chain_delete(chain);
+ return false;
+}
+
+static void add_text (Tuple & tuple, Tuple::Field field, const char * value)
+{
+ String cur = tuple.get_str (field);
+ if (cur)
+ tuple.set_str (field, str_concat ({cur, ", ", value}));
+ else
+ tuple.set_str (field, value);
+}
+
+static void parse_comment (Tuple & tuple, const char * key, const char * value)
+{
+ AUDDBG ("Found key %s <%s>\n", key, value);
+
+ static const struct {
+ const char * key;
+ Tuple::Field field;
+ } tfields = {
+ {"ARTIST", Tuple::Artist},
+ {"ALBUM", Tuple::Album},
+ {"ALBUMARTIST", Tuple::AlbumArtist},
+ {"TITLE", Tuple::Title},
+ {"COMMENT", Tuple::Comment},
+ {"GENRE", Tuple::Genre},
+ {"DESCRIPTION", Tuple::Description},
+ {"musicbrainz_trackid", Tuple::MusicBrainzID},
+ {"publisher", Tuple::Publisher},
+ {"CATALOGNUMBER", Tuple::CatalogNum},
+ };
+
+ for (auto & tfield : tfields)
+ {
+ if (!strcmp_nocase(key, tfield.key))
+ {
+ add_text (tuple, tfield.field, value);
+ return;
+ }
+ }
+
+ if (!strcmp_nocase(key, "TRACKNUMBER"))
+ tuple.set_int(Tuple::Track, atoi(value));
+ else if (!strcmp_nocase(key, "DISCNUMBER"))
+ tuple.set_int(Tuple::Disc, atoi(value));
+ else if (!strcmp_nocase(key, "DATE"))
+ tuple.set_int(Tuple::Year, atoi(value));
+ else if (!strcmp_nocase(key, "REPLAYGAIN_TRACK_GAIN"))
+ tuple.set_gain(Tuple::TrackGain, Tuple::GainDivisor, value);
+ else if (!strcmp_nocase(key, "REPLAYGAIN_TRACK_PEAK"))
+ tuple.set_gain(Tuple::TrackPeak, Tuple::PeakDivisor, value);
+ else if (!strcmp_nocase(key, "REPLAYGAIN_ALBUM_GAIN"))
+ tuple.set_gain(Tuple::AlbumGain, Tuple::GainDivisor, value);
+ else if (!strcmp_nocase(key, "REPLAYGAIN_ALBUM_PEAK"))
+ tuple.set_gain(Tuple::AlbumPeak, Tuple::PeakDivisor, value);
+}
+
+bool FLACng::read_tag (const char * filename, VFSFile & file, Tuple & tuple, Index<char> * image)
+{
+ AUDDBG("Probe for tuple.\n");
+
+ FLAC__Metadata_Iterator *iter;
+ FLAC__Metadata_Chain *chain;
+ FLAC__StreamMetadata *metadata = nullptr;
+ FLAC__Metadata_ChainStatus status;
+ FLAC__StreamMetadata_VorbisComment_Entry *entry;
+ char *key;
+ char *value;
+
+ tuple.set_str (Tuple::Codec, "Free Lossless Audio Codec (FLAC)");
+ tuple.set_str (Tuple::Quality, _("lossless"));
+
+ chain = FLAC__metadata_chain_new();
+
+ auto metadata_chain_read = is_ogg_flac(file) ?
+ FLAC__metadata_chain_read_ogg_with_callbacks :
+ FLAC__metadata_chain_read_with_callbacks;
+
+ if (!metadata_chain_read(chain, &file, io_callbacks))
+ goto ERR;
+
+ iter = FLAC__metadata_iterator_new();
+
+ FLAC__metadata_iterator_init(iter, chain);
+
+ do
+ {
+ switch (FLAC__metadata_iterator_get_block_type(iter))
+ {
+ case FLAC__METADATA_TYPE_VORBIS_COMMENT:
+ {
+ metadata = FLAC__metadata_iterator_get_block(iter);
+
+ AUDDBG("Vorbis comment contains %d fields\n", metadata->data.vorbis_comment.num_comments);
+ AUDDBG("Vendor string: %s\n", metadata->data.vorbis_comment.vendor_string.entry);
+
+ entry = metadata->data.vorbis_comment.comments;
+
+ for (unsigned i = 0; i < metadata->data.vorbis_comment.num_comments; i++, entry++)
+ {
+ if (FLAC__metadata_object_vorbiscomment_entry_to_name_value_pair(*entry, &key, &value) == false)
+ AUDDBG("Could not parse comment\n");
+ else
+ {
+ parse_comment(tuple, key, value);
+ free(key);
+ free(value);
+ }
+ }
+ break;
+ }
+
+ case FLAC__METADATA_TYPE_STREAMINFO:
+ {
+ metadata = FLAC__metadata_iterator_get_block(iter);
+
+ /* Calculate the stream length (milliseconds) */
+ if (metadata->data.stream_info.sample_rate == 0)
+ {
+ AUDERR("Invalid sample rate for stream!\n");
+ tuple.set_int (Tuple::Length, -1);
+ }
+ else
+ {
+ tuple.set_int (Tuple::Length,
+ (metadata->data.stream_info.total_samples / metadata->data.stream_info.sample_rate) * 1000);
+ AUDDBG("Stream length: %d seconds\n", tuple.get_int (Tuple::Length));
+ }
+
+ int64_t size = file.fsize ();
+
+ if (size < 0 || metadata->data.stream_info.total_samples == 0)
+ tuple.set_int (Tuple::Bitrate, 0);
+ else
+ {
+ int bitrate = 8 * size *
+ (int64_t) metadata->data.stream_info.sample_rate / metadata->data.stream_info.total_samples;
+
+ tuple.set_int (Tuple::Bitrate, (bitrate + 500) / 1000);
+ }
+
+ if (metadata->data.stream_info.channels > 0)
+ tuple.set_int(Tuple::Channels, metadata->data.stream_info.channels);
+ break;
+ }
+
+ case FLAC__METADATA_TYPE_PICTURE:
+ {
+ if (image && !image->len())
+ {
+ metadata = FLAC__metadata_iterator_get_block(iter);
+
+ if (metadata->data.picture.type == FLAC__STREAM_METADATA_PICTURE_TYPE_FRONT_COVER)
+ {
+ AUDDBG("FLAC__STREAM_METADATA_PICTURE_TYPE_FRONT_COVER found.");
+ image->insert((const char *) metadata->data.picture.data, 0,
+ metadata->data.picture.data_length);
+ }
+ }
+ break;
+ }
+
+ default:
+ ;
+ }
+ } while (FLAC__metadata_iterator_next(iter));
+
+ FLAC__metadata_iterator_delete(iter);
+ FLAC__metadata_chain_delete(chain);
+
+ return true;
+
+ERR:
+ status = FLAC__metadata_chain_status(chain);
+ FLAC__metadata_chain_delete(chain);
+
+ AUDERR("An error occurred: %s\n", FLAC__Metadata_ChainStatusStringstatus);
+ return false;
+}

audacious-plugins-4.4.1.tar.bz2/src/flac/plugin.cc Added

@@ -0,0 +1,221 @@
+/*
+ * A FLAC decoder plugin for the Audacious Media Player
+ * Copyright (C) 2005 Ralf Ertzinger
+ * Copyright (C) 2010-2012 Michał Lipski
+ *
+ * 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 <string.h>
+
+#include <libaudcore/runtime.h>
+
+#include "flacng.h"
+
+EXPORT FLACng aud_plugin_instance;
+
+using StreamDecoderPtr = SmartPtr<FLAC__StreamDecoder, FLAC__stream_decoder_delete>;
+static StreamDecoderPtr s_decoder, s_ogg_decoder;
+static callback_info s_cinfo;
+
+bool FLACng::init()
+{
+ /* Callback structure and decoder for main decoding loop */
+ auto flac_decoder = StreamDecoderPtr(FLAC__stream_decoder_new());
+ if (!flac_decoder)
+ {
+ AUDERR("Could not create the main FLAC decoder instance!\n");
+ return false;
+ }
+
+ auto ret1 = FLAC__stream_decoder_init_stream(flac_decoder.get(),
+ read_callback, seek_callback, tell_callback, length_callback,
+ eof_callback, write_callback, metadata_callback, error_callback,
+ &s_cinfo);
+
+ if (ret1 != FLAC__STREAM_DECODER_INIT_STATUS_OK)
+ {
+ AUDERR("Could not initialize the main FLAC decoder!\n");
+ return false;
+ }
+
+ if (FLAC_API_SUPPORTS_OGG_FLAC)
+ {
+ auto ogg_flac_decoder = StreamDecoderPtr(FLAC__stream_decoder_new());
+ if (!ogg_flac_decoder)
+ {
+ AUDERR("Could not create the Ogg FLAC decoder instance!\n");
+ return false;
+ }
+
+ auto ret2 = FLAC__stream_decoder_init_ogg_stream(ogg_flac_decoder.get(),
+ read_callback, seek_callback, tell_callback, length_callback,
+ eof_callback, write_callback, metadata_callback, error_callback,
+ &s_cinfo);
+
+ if (ret2 != FLAC__STREAM_DECODER_INIT_STATUS_OK)
+ {
+ AUDERR("Could not initialize the Ogg FLAC decoder!\n");
+ return false;
+ }
+
+ s_ogg_decoder = std::move(ogg_flac_decoder);
+ }
+
+ s_decoder = std::move(flac_decoder);
+
+ return true;
+}
+
+void FLACng::cleanup()
+{
+ s_decoder.clear();
+ s_ogg_decoder.clear();
+}
+
+bool FLACng::is_our_file(const char *filename, VFSFile &file)
+{
+ AUDDBG("Probe for FLAC.\n");
+
+ char buf4;
+ if (file.fread (buf, 1, sizeof buf) != sizeof buf)
+ return false;
+
+ return ! strncmp (buf, "fLaC", sizeof buf);
+}
+
+static void squeeze_audio(int32_t* src, void* dst, unsigned count, unsigned res)
+{
+ int32_t* rp = src;
+ int8_t* wp = (int8_t*) dst;
+ int16_t* wp2 = (int16_t*) dst;
+ int32_t* wp4 = (int32_t*) dst;
+
+ switch (res)
+ {
+ case 8:
+ for (unsigned i = 0; i < count; i++, wp++, rp++)
+ *wp = *rp & 0xff;
+ break;
+
+ case 16:
+ for (unsigned i = 0; i < count; i++, wp2++, rp++)
+ *wp2 = *rp & 0xffff;
+ break;
+
+ case 24:
+ case 32:
+ for (unsigned i = 0; i < count; i++, wp4++, rp++)
+ *wp4 = *rp;
+ break;
+
+ default:
+ AUDERR("Can not convert to %u bps\n", res);
+ }
+}
+
+bool FLACng::play(const char *filename, VFSFile &file)
+{
+ Index<char> play_buffer;
+ bool error = false;
+ bool stream = (file.fsize() < 0);
+ bool _is_ogg_flac = is_ogg_flac(file);
+ auto tuple = stream ? get_playback_tuple() : Tuple();
+ auto decoder = _is_ogg_flac && FLAC_API_SUPPORTS_OGG_FLAC
+ ? s_ogg_decoder.get() : s_decoder.get();
+
+ if (_is_ogg_flac && !FLAC_API_SUPPORTS_OGG_FLAC)
+ {
+ AUDWARN("Ogg FLAC file detected, but your FLAC library does not support "
+ "this format. Falling back to the main FLAC decoder.\n");
+ }
+
+ s_cinfo.fd = &file;
+
+ if (read_metadata(decoder, &s_cinfo) == false)
+ {
+ AUDERR("Could not prepare file for playing!\n");
+ error = true;
+ goto ERR;
+ }
+
+ play_buffer.resize(BUFFER_SIZE_BYTE);
+
+ if (stream && tuple.fetch_stream_info(file))
+ set_playback_tuple(tuple.ref());
+
+ set_stream_bitrate(s_cinfo.bitrate);
+ open_audio(SAMPLE_FMT(s_cinfo.bits_per_sample), s_cinfo.sample_rate, s_cinfo.channels);
+
+ while (FLAC__stream_decoder_get_state(decoder) != FLAC__STREAM_DECODER_END_OF_STREAM)
+ {
+ if (check_stop ())
+ break;
+
+ int seek_value = check_seek ();
+ if (seek_value >= 0)
+ {
+ uint64_t sample = (uint64_t) seek_value * s_cinfo.sample_rate / 1000;
+
+ /* Avoid error when seeking to a sample >= total_samples */
+ if (s_cinfo.total_samples > 0)
+ sample = aud::min<uint64_t>(sample, s_cinfo.total_samples - 1);
+
+ if (! FLAC__stream_decoder_seek_absolute(decoder, sample))
+ {
+ AUDERR("Error while seeking!\n");
+ error = true;
+ break;
+ }
+ }
+
+ /* Try to decode a single frame of audio */
+ if (FLAC__stream_decoder_process_single(decoder) == false)
+ {
+ AUDERR("Error while decoding!\n");
+ error = true;
+ break;
+ }
+
+ if (stream && tuple.fetch_stream_info(file))
+ set_playback_tuple(tuple.ref());
+
+ squeeze_audio(s_cinfo.output_buffer.begin(), play_buffer.begin(),
+ s_cinfo.buffer_used, s_cinfo.bits_per_sample);
+ write_audio(play_buffer.begin(), s_cinfo.buffer_used *
+ SAMPLE_SIZE(s_cinfo.bits_per_sample));
+
+ s_cinfo.reset();
+ }
+
+ERR:
+ s_cinfo.reset();
+
+ if (FLAC__stream_decoder_flush(decoder) == false)
+ AUDERR("Could not flush decoder state!\n");
+
+ s_cinfo = callback_info();
+ return ! error;
+}
+
+const char FLACng::about =
+ N_("Original code by\n"
+ "Ralf Ertzinger <ralf@skytale.net>\n\n"
+ "http://www.skytale.net/projects/bmp-flac2/");
+
+const char *const FLACng::exts = { "flac", "fla", nullptr };
+
+const char *const FLACng::mimes = { "audio/flac", "audio/x-flac", "audio/ogg",
+ "application/ogg", nullptr };

audacious-plugins-4.4.1.tar.bz2/src/flac/seekable_stream_callbacks.cc Added

@@ -0,0 +1,173 @@
+/*
+ * A FLAC decoder plugin for the Audacious Media Player
+ * Copyright (C) 2005 Ralf Ertzinger
+ * Copyright (C) 2010-2012 Michał Lipski
+ *
+ * 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 <string.h>
+#include <FLAC/all.h>
+
+#include <libaudcore/runtime.h>
+
+#include "flacng.h"
+
+FLAC__StreamDecoderReadStatus read_callback(const FLAC__StreamDecoder *decoder, FLAC__byte buffer, size_t *bytes, void *client_data)
+{
+ callback_info* info = (callback_info*) client_data;
+ int64_t read;
+
+ if (*bytes == 0)
+ return FLAC__STREAM_DECODER_READ_STATUS_END_OF_STREAM;
+
+ read = info->fd->fread (buffer, 1, *bytes);
+ *bytes = read;
+
+ switch (read)
+ {
+ case -1:
+ AUDERR("Error while reading from stream!\n");
+ return FLAC__STREAM_DECODER_READ_STATUS_ABORT;
+
+ case 0:
+ AUDDBG("Stream reached EOF\n");
+ return FLAC__STREAM_DECODER_READ_STATUS_END_OF_STREAM;
+
+ default:
+ return FLAC__STREAM_DECODER_READ_STATUS_CONTINUE;
+ }
+}
+
+FLAC__StreamDecoderSeekStatus seek_callback(const FLAC__StreamDecoder *decoder, FLAC__uint64 offset, void *client_data)
+{
+ callback_info *info = (callback_info*) client_data;
+
+ if (info->fd->fseek (offset, VFS_SEEK_SET) != 0)
+ {
+ AUDERR("Could not seek to %ld!\n", (long)offset);
+ return FLAC__STREAM_DECODER_SEEK_STATUS_ERROR;
+ }
+
+ return FLAC__STREAM_DECODER_SEEK_STATUS_OK;
+}
+
+FLAC__StreamDecoderTellStatus tell_callback(const FLAC__StreamDecoder *decoder, FLAC__uint64 *offset, void *client_data)
+{
+ callback_info *info = (callback_info*) client_data;
+
+ int64_t result = info->fd->ftell ();
+ if (result < 0)
+ {
+ AUDERR("Could not tell current position!\n");
+ return FLAC__STREAM_DECODER_TELL_STATUS_ERROR;
+ }
+
+ *offset = result;
+
+ AUDDBG ("Current position: %d\n", (int) * offset);
+
+ return FLAC__STREAM_DECODER_TELL_STATUS_OK;
+}
+
+FLAC__bool eof_callback(const FLAC__StreamDecoder *decoder, void *client_data)
+{
+ callback_info *info = (callback_info*) client_data;
+ return info->fd->feof ();
+}
+
+FLAC__StreamDecoderLengthStatus length_callback(const FLAC__StreamDecoder *decoder, FLAC__uint64 *length, void *client_data)
+{
+ callback_info *info = (callback_info*) client_data;
+
+ int64_t result = info->fd->fsize ();
+ if (result < 0)
+ {
+ /*
+ * Could not get the stream size. This is not necessarily an
+ * error, maybe the stream has no fixed size (think streaming
+ * audio)
+ */
+ AUDDBG("Stream length is unknown.\n");
+ *length = 0;
+ return FLAC__STREAM_DECODER_LENGTH_STATUS_UNSUPPORTED;
+ }
+
+ *length = result;
+
+ AUDDBG ("Stream length is %d bytes\n", (int) * length);
+
+ return FLAC__STREAM_DECODER_LENGTH_STATUS_OK;
+}
+
+FLAC__StreamDecoderWriteStatus write_callback(const FLAC__StreamDecoder *decoder, const FLAC__Frame *frame, const FLAC__int32 *const buffer, void *client_data)
+{
+ callback_info *info = (callback_info*) client_data;
+
+ if (info->channels != frame->header.channels ||
+ info->sample_rate != frame->header.sample_rate)
+ {
+ return FLAC__STREAM_DECODER_WRITE_STATUS_ABORT;
+ }
+
+ if (!info->output_buffer.len())
+ info->alloc();
+
+ for (unsigned sample = 0; sample < frame->header.blocksize; sample++)
+ {
+ for (unsigned channel = 0; channel < frame->header.channels; channel++)
+ {
+ *(info->write_pointer++) = bufferchannelsample;
+ info->buffer_used += 1;
+ }
+ }
+
+ return FLAC__STREAM_DECODER_WRITE_STATUS_CONTINUE;
+}
+
+void error_callback(const FLAC__StreamDecoder *decoder, FLAC__StreamDecoderErrorStatus status, void *client_data)
+{
+ AUDERR("FLAC decoder error callback was called: %d\n", status);
+}
+
+void metadata_callback(const FLAC__StreamDecoder *decoder, const FLAC__StreamMetadata *metadata, void *client_data)
+{
+ callback_info *info = (callback_info*) client_data;
+ int64_t size;
+
+ if (metadata->type == FLAC__METADATA_TYPE_STREAMINFO)
+ {
+ info->total_samples = metadata->data.stream_info.total_samples;
+ AUDDBG("total_samples=%ld\n", (long) metadata->data.stream_info.total_samples);
+
+ info->bits_per_sample = metadata->data.stream_info.bits_per_sample;
+ AUDDBG("bits_per_sample=%d\n", metadata->data.stream_info.bits_per_sample);
+
+ info->channels = metadata->data.stream_info.channels;
+ AUDDBG("channels=%d\n", metadata->data.stream_info.channels);
+
+ info->sample_rate = metadata->data.stream_info.sample_rate;
+ AUDDBG("sample_rate=%d\n", metadata->data.stream_info.sample_rate);
+
+ size = info->fd->fsize ();
+
+ if (size == -1 || info->total_samples == 0)
+ info->bitrate = 0;
+ else
+ info->bitrate = 8 * size * (int64_t) info->sample_rate / info->total_samples;
+
+ AUDDBG("bitrate=%d\n", info->bitrate);
+ }
+}

audacious-plugins-4.4.1.tar.bz2/src/flac/tools.cc Added

@@ -0,0 +1,59 @@
+/*
+ * A FLAC decoder plugin for the Audacious Media Player
+ * Copyright (C) 2005 Ralf Ertzinger
+ * Copyright (C) 2010 John Lindgren
+ * Copyright (C) 2010-2012 Michał Lipski
+ *
+ * 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 <string.h>
+
+#include <libaudcore/runtime.h>
+
+#include "flacng.h"
+
+bool is_ogg_flac(VFSFile &file)
+{
+ /* TODO: detect Ogg FLAC by content too (not just MIME type) */
+ String mime = file.get_metadata("content-type");
+ return (mime && strstr(mime, "ogg"));
+}
+
+bool read_metadata(FLAC__StreamDecoder *decoder, callback_info *info)
+{
+ FLAC__StreamDecoderState ret;
+
+ info->reset();
+
+ /* Reset the decoder */
+ if (FLAC__stream_decoder_reset(decoder) == false)
+ {
+ AUDERR("Could not reset the decoder!\n");
+ return false;
+ }
+
+ /* Try to decode the metadata */
+ if (FLAC__stream_decoder_process_until_end_of_metadata(decoder) == false)
+ {
+ ret = FLAC__stream_decoder_get_state(decoder);
+ AUDDBG("Could not read the metadata: %s(%d)!\n",
+ FLAC__StreamDecoderStateStringret, ret);
+ info->reset();
+ return false;
+ }
+
+ return true;
+}

audacious-plugins-3.6.2-gtk3.tar.bz2/src/gio/gio.cc -> audacious-plugins-4.4.1.tar.bz2/src/gio/gio.cc Changed

@@ -20,6 +20,7 @@
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
+#include <sys/stat.h>
 
 #include <gio/gio.h>
 
@@ -29,12 +30,11 @@
 #include <libaudcore/plugin.h>
 #include <libaudcore/runtime.h>
 
-
 static const char gio_about =
 N_("GIO Plugin for Audacious\n"
 "Copyright 2009-2012 John Lindgren");
 
-static const char * const gio_schemes = {"ftp", "sftp", "smb"};
+static const char * const gio_schemes = {"ftp", "sftp", "smb", "mtp"};
 
 class GIOTransport : public TransportPlugin
 {
@@ -44,6 +44,8 @@
 constexpr GIOTransport () : TransportPlugin (info, gio_schemes) {}
 
 VFSImpl * fopen (const char * path, const char * mode, String & error);
+ VFSFileTest test_file (const char * filename, VFSFileTest test, String & error);
+ Index<String> read_folder (const char * filename, String & error);
 };
 
 EXPORT GIOTransport aud_plugin_instance;
@@ -65,10 +67,6 @@
 
 int fseek (int64_t offset, VFSSeekType whence);
 int64_t ftell ();
-
- int getc ();
- int ungetc (int c);
-
 bool feof ();
 
 int ftruncate (int64_t length);
@@ -83,6 +81,7 @@
 GInputStream * m_istream = nullptr;
 GOutputStream * m_ostream = nullptr;
 GSeekable * m_seekable = nullptr;
+ bool m_eof = false;
 };
 
 #define CHECK_ERROR(op, name) do { \
@@ -176,7 +175,7 @@
 
 GIOFile::~GIOFile ()
 {
- GError * error = 0;
+ GError * error = nullptr;
 
 if (m_iostream)
 {
@@ -203,9 +202,7 @@
 
 VFSImpl * GIOTransport::fopen (const char * filename, const char * mode, String & error)
 {
-#if ! GLIB_CHECK_VERSION (2, 36, 0)
 g_type_init ();
-#endif
 
 try { return new GIOFile (filename, mode); }
 catch (GIOFile::OpenError & ex)
@@ -217,7 +214,7 @@
 
 int64_t GIOFile::fread (void * buf, int64_t size, int64_t nitems)
 {
- GError * error = 0;
+ GError * error = nullptr;
 
 if (! m_istream)
 {
@@ -233,6 +230,8 @@
 int64_t part = g_input_stream_read (m_istream, buf, remain, 0, & error);
 CHECK_ERROR ("read from", m_filename);
 
+ m_eof = (part == 0);
+
 if (part <= 0)
 break;
 
@@ -247,7 +246,7 @@
 
 int64_t GIOFile::fwrite (const void * buf, int64_t size, int64_t nitems)
 {
- GError * error = 0;
+ GError * error = nullptr;
 
 if (! m_ostream)
 {
@@ -277,7 +276,7 @@
 
 int GIOFile::fseek (int64_t offset, VFSSeekType whence)
 {
- GError * error = 0;
+ GError * error = nullptr;
 GSeekType gwhence;
 
 switch (whence)
@@ -299,6 +298,8 @@
 g_seekable_seek (m_seekable, offset, gwhence, nullptr, & error);
 CHECK_ERROR ("seek within", m_filename);
 
+ m_eof = (whence == VFS_SEEK_END && offset == 0);
+
 return 0;
 
 FAILED:
@@ -310,35 +311,20 @@
 return g_seekable_tell (m_seekable);
 }
 
-int GIOFile::getc ()
-{
- unsigned char c;
- return (fread (& c, 1, 1) == 1) ? c : -1;
-}
-
-int GIOFile::ungetc (int c)
-{
- return (! fseek (-1, VFS_SEEK_CUR)) ? c : -1;
-}
-
 bool GIOFile::feof ()
 {
- int test = getc ();
-
- if (test < 0)
- return TRUE;
-
- ungetc (test);
- return FALSE;
+ return m_eof;
 }
 
 int GIOFile::ftruncate (int64_t length)
 {
- GError * error = 0;
+ GError * error = nullptr;
 
 g_seekable_truncate (m_seekable, length, nullptr, & error);
 CHECK_ERROR ("truncate", m_filename);
 
+ m_eof = (g_seekable_tell (m_seekable) >= length);
+
 return 0;
 
 FAILED:
@@ -347,42 +333,119 @@
 
 int64_t GIOFile::fsize ()
 {
- GError * error = 0;
- int64_t size;
-
- /* Audacious core expects one of two cases:
- * 1) File size is known and file is seekable.
- * 2) File size is unknown and file is not seekable.
- * Therefore, we return -1 for size if file is not seekable. */
 if (! g_seekable_can_seek (m_seekable))
 return -1;
 
- GFileInfo * info = g_file_query_info (m_file,
- G_FILE_ATTRIBUTE_STANDARD_SIZE, (GFileQueryInfoFlags) 0, 0, & error);
- CHECK_ERROR ("get size of", m_filename);
+ GError * error = nullptr;
+ int64_t saved_pos = g_seekable_tell (m_seekable);
+ int64_t size = -1;
+
+ g_seekable_seek (m_seekable, 0, G_SEEK_END, nullptr, & error);
+ CHECK_ERROR ("seek within", m_filename);
 
- size = g_file_info_get_attribute_uint64 (info, G_FILE_ATTRIBUTE_STANDARD_SIZE);
+ size = g_seekable_tell (m_seekable);
 
- g_object_unref (info);
- return size;
+ g_seekable_seek (m_seekable, saved_pos, G_SEEK_SET, nullptr, & error);
+ CHECK_ERROR ("seek within", m_filename);
+
+ m_eof = (saved_pos >= size);
 
 FAILED:
- return -1;
+ return size;
 }
 
 int GIOFile::fflush ()
 {
- int result;
- GError * error = nullptr;
-
 if (! m_ostream)
 return 0; /* no-op */
 
- result = g_output_stream_flush (m_ostream, nullptr, & error);
+ GError * error = nullptr;
+
+ g_output_stream_flush (m_ostream, nullptr, & error);
 CHECK_ERROR ("flush", m_filename);
 
- return result;
+ return 0;
 
 FAILED:
 return -1;
 }
+
+VFSFileTest GIOTransport::test_file (const char * filename, VFSFileTest test, String & error)
+{
+ GFile * file = g_file_new_for_uri (filename);
+ Index<String> attrs;
+ int passed = 0;
+
+ if (test & (VFS_IS_REGULAR | VFS_IS_DIR))
+ attrs.append (G_FILE_ATTRIBUTE_STANDARD_TYPE);
+ if (test & VFS_IS_SYMLINK)
+ attrs.append (G_FILE_ATTRIBUTE_STANDARD_IS_SYMLINK);
+ if (test & VFS_IS_EXECUTABLE)
+ attrs.append (G_FILE_ATTRIBUTE_UNIX_MODE);
+
+ GError * gerr = nullptr;
+ GFileInfo * info = g_file_query_info (file, index_to_str_list (attrs, ","),
+ G_FILE_QUERY_INFO_NONE, nullptr, & gerr);
+
+ if (! info)
+ {
+ passed |= VFS_NO_ACCESS;
+ error = String (gerr->message);
+ g_error_free (gerr);
+ }
+ else
+ {
+ passed |= VFS_EXISTS;
+
+ switch (g_file_info_get_file_type (info))
+ {
+ case G_FILE_TYPE_REGULAR: passed |= VFS_IS_REGULAR; break;
+ case G_FILE_TYPE_DIRECTORY: passed |= VFS_IS_DIR; break;
+ default: break;
+ };
+
+ if (g_file_info_get_is_symlink (info))
+ passed |= VFS_IS_SYMLINK;
+ if (g_file_info_get_attribute_uint32 (info, G_FILE_ATTRIBUTE_UNIX_MODE) & S_IXUSR)
+ passed |= VFS_IS_EXECUTABLE;
+
+ g_object_unref (info);
+ }
+
+ g_object_unref (file);
+ return VFSFileTest (test & passed);
+}
+
+Index<String> GIOTransport::read_folder (const char * filename, String & error)
+{
+ GFile * file = g_file_new_for_uri (filename);
+ Index<String> files;
+
+ GError * gerr = nullptr;
+ GFileEnumerator * dir = g_file_enumerate_children (file,
+ G_FILE_ATTRIBUTE_STANDARD_NAME "," G_FILE_ATTRIBUTE_STANDARD_IS_HIDDEN,
+ G_FILE_QUERY_INFO_NONE, nullptr, & gerr);
+
+ if (! dir)
+ {
+ error = String (gerr->message);
+ g_error_free (gerr);
+ }
+ else
+ {
+ GFileInfo * info;
+ while ((info = g_file_enumerator_next_file (dir, nullptr, nullptr)))
+ {
+ if (g_file_info_get_is_hidden (info))
+ continue;
+ StringBuf enc = str_encode_percent (g_file_info_get_name (info));
+ files.append (String (str_concat ({filename, "/", enc})));
+ g_object_unref (info);
+ }
+
+ g_object_unref (dir);
+ }
+
+ g_object_unref (file);
+ return files;
+}

audacious-plugins-4.4.1.tar.bz2/src/gio/meson.build Added

audacious-plugins-4.4.1.tar.bz2/src/glspectrum Added

audacious-plugins-4.4.1.tar.bz2/src/glspectrum/Makefile Changed

audacious-plugins-4.4.1.tar.bz2/src/glspectrum/gl-spectrum.cc Added

@@ -0,0 +1,435 @@
+/*
+ * OpenGL Spectrum Analyzer for Audacious
+ * Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini
+ *
+ * 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 <libaudcore/i18n.h>
+#include <libaudcore/plugin.h>
+#include <libaudgui/gtk-compat.h>
+
+#include <gdk/gdk.h>
+#include <gtk/gtk.h>
+
+#include <GL/gl.h>
+
+#ifdef GDK_WINDOWING_X11
+#include <GL/glx.h>
+#include <gdk/gdkx.h>
+#endif
+
+#ifdef GDK_WINDOWING_WIN32
+#include <gdk/gdkwin32.h>
+#endif
+
+#define NUM_BANDS 32
+#define DB_RANGE 40
+
+#define BAR_SPACING (3.2f / NUM_BANDS)
+#define BAR_WIDTH (0.8f * BAR_SPACING)
+
+static const char gl_about =
+ N_("OpenGL Spectrum Analyzer for Audacious\n"
+ "Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\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+");
+
+class GLSpectrum : public VisPlugin
+{
+public:
+ static constexpr PluginInfo info = {
+ N_("OpenGL Spectrum Analyzer"),
+ PACKAGE,
+ gl_about,
+ nullptr, // prefs
+ PluginGLibOnly
+ };
+
+ constexpr GLSpectrum () : VisPlugin (info, Visualizer::Freq) {}
+
+ bool init ();
+
+ void * get_gtk_widget ();
+
+ void clear ();
+ void render_freq (const float * freq);
+};
+
+EXPORT GLSpectrum aud_plugin_instance;
+
+static float logscaleNUM_BANDS + 1;
+static float colorsNUM_BANDSNUM_BANDS3;
+
+#ifdef GDK_WINDOWING_X11
+static Display * s_display;
+static Window s_xwindow;
+static GLXContext s_context;
+#endif
+
+#ifdef GDK_WINDOWING_WIN32
+static HWND s_hwnd;
+static HDC s_hdc;
+static HGLRC s_glrc;
+#endif
+
+static GtkWidget * s_widget = nullptr;
+
+static int s_pos = 0;
+static float s_angle = 25, s_anglespeed = 0.05f;
+static float s_barsNUM_BANDSNUM_BANDS;
+
+bool GLSpectrum::init ()
+{
+ for (int i = 0; i <= NUM_BANDS; i ++)
+ logscalei = 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);
+
+ colorsxy0 = (1 - xf) * (1 - yf);
+ colorsxy1 = xf;
+ colorsxy2 = 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 logscalei and logscalei + 1,
+ including fractional parts */
+ int a = ceilf (logscalei);
+ int b = floorf (logscalei + 1);
+ float sum = 0;
+
+ if (b < a)
+ sum += freqb * (logscalei + 1 - logscalei);
+ else
+ {
+ if (a > 0)
+ sum += freqa - 1 * (a - logscalei);
+ for (; a < b; a ++)
+ sum += freqa;
+ if (b < 256)
+ sum += freqb * (logscalei + 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;
+
+ graphi = aud::clamp (val, 0.0f, 1.0f);
+ }
+}
+
+void GLSpectrum::render_freq (const float * freq)
+{
+ make_log_graph (freq, s_barss_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);
+}
+
+void GLSpectrum::clear ()
+{
+ 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 ()
+{
+ 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);
+
+ 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_BANDSj * 1.6,
+ colorsij0, colorsij1, colorsij2);
+ }
+ }
+
+ glPopMatrix ();
+}
+
+#ifdef USE_GTK3
+static gboolean draw_cb (GtkWidget * widget, cairo_t * cr)
+#else
+static gboolean draw_cb (GtkWidget * widget)
+#endif
+{
+#ifdef GDK_WINDOWING_X11
+ if (! s_context)
+ return false;
+#endif
+
+#ifdef GDK_WINDOWING_WIN32
+ if (! s_glrc)
+ return false;
+#endif
+
+ glClear (GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+
+ draw_bars ();
+
+#ifdef GDK_WINDOWING_X11
+ glXSwapBuffers (s_display, s_xwindow);
+#endif
+
+#ifdef GDK_WINDOWING_WIN32
+ SwapBuffers (s_hdc);
+#endif
+
+ return true;
+}
+
+static void aspect_viewport(GLint width, GLint height)
+{
+ glViewport (0, 0, width, height);
+ glMatrixMode (GL_PROJECTION);
+ glLoadIdentity ();
+ glFrustum (-1.1f, 1, -1.5f, 1, 2, 10);
+ glMatrixMode (GL_MODELVIEW);
+ glLoadIdentity ();
+}
+
+static void widget_realized ()
+{
+ GdkWindow * window = gtk_widget_get_window (s_widget);
+
+#ifdef GDK_WINDOWING_X11
+ GdkScreen * screen = gdk_window_get_screen (window);
+ int nscreen = GDK_SCREEN_XNUMBER (screen);
+
+ s_display = GDK_SCREEN_XDISPLAY (screen);
+ s_xwindow = GDK_WINDOW_XID (window);
+
+ /* Create s_context */
+ int attribs = {
+ GLX_RGBA,
+ GLX_RED_SIZE, 1,
+ GLX_GREEN_SIZE, 1,
+ GLX_BLUE_SIZE, 1,
+ GLX_ALPHA_SIZE, 0,
+ GLX_DOUBLEBUFFER,
+ GLX_DEPTH_SIZE, 1,
+ None
+ };
+
+ XVisualInfo * xvinfo = glXChooseVisual (s_display, nscreen, attribs);
+ g_return_if_fail (xvinfo);
+
+ /* Fix up visual/colormap */
+ GdkVisual * visual = gdk_x11_screen_lookup_visual (screen, xvinfo->visualid);
+ g_return_if_fail (visual);
+
+ gtk_widget_set_visual (s_widget, visual);
+
+ s_context = glXCreateContext (s_display, xvinfo, 0, true);
+ g_return_if_fail (s_context);
+
+ XFree (xvinfo);
+
+ glXMakeCurrent (s_display, s_xwindow, s_context);
+#endif
+
+#ifdef GDK_WINDOWING_WIN32
+ s_hwnd = (HWND) GDK_WINDOW_HWND (window);
+ s_hdc = GetDC (s_hwnd);
+
+ PIXELFORMATDESCRIPTOR desc = {
+ sizeof (PIXELFORMATDESCRIPTOR),
+ 1, // version number (?)
+ PFD_DRAW_TO_WINDOW | // format must support window
+ PFD_SUPPORT_OPENGL | // format must support OpenGL
+ PFD_DOUBLEBUFFER, // must support double buffering
+ PFD_TYPE_RGBA, // request an RGBA format
+ 24, // select a 8:8:8 bit color depth
+ 0, 0, 0, 0, 0, 0, // color bits ignored (?)
+ 0, // no alpha buffer
+ 0, // shift bit ignored (?)
+ 0, // no accumulation buffer
+ 0, 0, 0, 0, // accumulation bits ignored (?)
+ 16, // 16-bit z-buffer (depth buffer)
+ 0, // no stencil buffer
+ 0, // no auxiliary buffer (?)
+ PFD_MAIN_PLANE, // main drawing layer
+ 0, // reserved (?)
+ 0, 0, 0 // layer masks ignored (?)
+ };
+
+ int format = ChoosePixelFormat (s_hdc, & desc);
+ g_return_if_fail (format != 0);
+
+ SetPixelFormat (s_hdc, format, & desc);
+
+ s_glrc = wglCreateContext (s_hdc);
+ g_return_if_fail (s_glrc);
+
+ wglMakeCurrent (s_hdc, s_glrc);
+#endif
+
+ /* Initialize OpenGL */
+ GtkAllocation alloc;
+ gtk_widget_get_allocation (s_widget, & alloc);
+
+ aspect_viewport (alloc.width, alloc.height);
+
+ glEnable (GL_DEPTH_TEST);
+ glDepthFunc (GL_LESS);
+ glDepthMask (GL_TRUE);
+ glPolygonMode (GL_FRONT_AND_BACK, GL_FILL);
+ glClearColor (0, 0, 0, 1);
+}
+
+static void widget_destroyed ()
+{
+ s_widget = nullptr;
+
+#ifdef GDK_WINDOWING_X11
+ if (s_context)
+ {
+ glXMakeCurrent (s_display, None, nullptr);
+ glXDestroyContext (s_display, s_context);
+ s_context = nullptr;
+ }
+
+ s_display = nullptr;
+#endif
+
+#ifdef GDK_WINDOWING_WIN32
+ if (s_glrc)
+ {
+ wglMakeCurrent (s_hdc, nullptr);
+ wglDeleteContext (s_glrc);
+ s_glrc = nullptr;
+ }
+
+ if (s_hdc)
+ {
+ ReleaseDC (s_hwnd, s_hdc);
+ s_hdc = nullptr;
+ }
+
+ s_hwnd = nullptr;
+#endif
+}
+
+static void widget_resize (GtkWidget * widget, GdkEvent * event, gpointer data)
+{
+ aspect_viewport (event->configure.width, event->configure.height);
+}
+
+void * GLSpectrum::get_gtk_widget ()
+{
+ if (s_widget)
+ return s_widget;
+
+ s_widget = gtk_drawing_area_new ();
+
+ g_signal_connect (s_widget, AUDGUI_DRAW_SIGNAL, (GCallback) draw_cb, nullptr);
+ g_signal_connect (s_widget, "realize", (GCallback) widget_realized, nullptr);
+ g_signal_connect (s_widget, "destroy", (GCallback) widget_destroyed, nullptr);
+ g_signal_connect (s_widget, "configure-event", (GCallback) widget_resize, nullptr);
+
+#ifndef USE_GTK3
+ gtk_widget_set_double_buffered (s_widget, false);
+#endif
+
+ return s_widget;
+}

audacious-plugins-4.4.1.tar.bz2/src/glspectrum/meson.build Added

audacious-plugins-3.6.2-gtk3.tar.bz2/src/gtkui/Makefile -> audacious-plugins-4.4.1.tar.bz2/src/gtkui/Makefile Changed

audacious-plugins-3.6.2-gtk3.tar.bz2/src/gtkui/columns.cc -> audacious-plugins-4.4.1.tar.bz2/src/gtkui/columns.cc Changed

@@ -25,6 +25,7 @@
 #include <libaudcore/runtime.h>
 #include <libaudcore/index.h>
 #include <libaudcore/audstrings.h>
+#include <libaudgui/gtk-compat.h>
 #include <libaudgui/libaudgui-gtk.h>
 #include <libaudgui/list.h>
 
@@ -32,20 +33,24 @@
 #include "ui_playlist_widget.h"
 
 const char * const pw_col_namesPW_COLS = {
- N_("Entry number"),
+ N_("Entry Number"),
 N_("Title"),
 N_("Artist"),
 N_("Year"),
 N_("Album"),
- N_("Album artist"),
+ N_("Album Artist"),
 N_("Track"),
 N_("Genre"),
- N_("Queue position"),
+ N_("Queue Position"),
 N_("Length"),
- N_("File path"),
- N_("File name"),
- N_("Custom title"),
- N_("Bitrate")
+ N_("File Path"),
+ N_("File Name"),
+ N_("Custom Title"),
+ N_("Bitrate"),
+ N_("Comment"),
+ N_("Publisher"),
+ N_("Catalog Number"),
+ N_("Disc")
 };
 
 int pw_num_cols;
@@ -66,7 +71,11 @@
 "path",
 "filename",
 "custom",
- "bitrate"
+ "bitrate",
+ "comment",
+ "publisher",
+ "catalog-number",
+ "disc"
 };
 
 static const int pw_default_widthsPW_COLS = {
@@ -83,7 +92,11 @@
 275, // path
 275, // filename
 275, // custom title
- 10 // bitrate
+ 10, // bitrate
+ 275, // comment
+ 175, // publisher
+ 75, // catalog number
+ 10 // disc
 };
 
 void pw_col_init ()
@@ -111,9 +124,13 @@
 pw_colspw_num_cols ++ = i;
 }
 
- String widths = aud_get_str ("gtkui", "column_widths");
- if (! str_to_int_array (widths, pw_col_widths, PW_COLS))
- memcpy (pw_col_widths, pw_default_widths, sizeof pw_col_widths);
+ auto widths = str_list_to_index (aud_get_str ("gtkui", "column_widths"), ", ");
+ int nwidths = aud::min (widths.len (), (int) PW_COLS);
+
+ for (int i = 0; i < nwidths; i ++)
+ pw_col_widthsi = audgui_to_native_dpi (str_to_int (widthsi));
+ for (int i = nwidths; i < PW_COLS; i ++)
+ pw_col_widthsi = audgui_to_native_dpi (pw_default_widthsi);
 }
 
 struct Column {
@@ -129,12 +146,12 @@
 int cols = chosen.len ();
 g_return_if_fail (cols <= PW_COLS);
 
- ui_playlist_notebook_empty ();
+ pl_notebook_purge ();
 
 for (pw_num_cols = 0; pw_num_cols < cols; pw_num_cols ++)
 pw_colspw_num_cols = chosenpw_num_cols.column;
 
- ui_playlist_notebook_populate ();
+ pl_notebook_populate ();
 }
 
 static void get_value (void * user, int row, int column, GValue * value)
@@ -294,8 +311,8 @@
 avail.append (i, false);
 }
 
- GtkWidget * hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
- gtk_widget_set_size_request (hbox, -1, 160);
+ GtkWidget * hbox = audgui_hbox_new (6);
+ gtk_widget_set_size_request (hbox, -1, audgui_get_dpi () * 5 / 4);
 
 GtkWidget * scroll = gtk_scrolled_window_new (nullptr, nullptr);
 gtk_scrolled_window_set_policy ((GtkScrolledWindow *) scroll,
@@ -308,7 +325,7 @@
 audgui_list_add_column (avail_list, _("Available columns"), 0, G_TYPE_STRING, -1);
 gtk_container_add ((GtkContainer *) scroll, avail_list);
 
- GtkWidget * vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
+ GtkWidget * vbox = audgui_vbox_new (6);
 gtk_box_pack_start ((GtkBox *) hbox, vbox, false, false, 0);
 
 GtkWidget * button = gtk_button_new ();
@@ -345,6 +362,10 @@
 for (int i = 0; i < pw_num_cols; i ++)
 index.append (String (pw_col_keyspw_colsi));
 
+ int widthsPW_COLS;
+ for (int i = 0; i < PW_COLS; i ++)
+ widthsi = audgui_to_portable_dpi (pw_col_widthsi);
+
 aud_set_str ("gtkui", "playlist_columns", index_to_str_list (index, " "));
- aud_set_str ("gtkui", "column_widths", int_array_to_str (pw_col_widths, PW_COLS));
+ aud_set_str ("gtkui", "column_widths", int_array_to_str (widths, PW_COLS));
 }

audacious-plugins-3.6.2-gtk3.tar.bz2/src/gtkui/gtkui.h -> audacious-plugins-4.4.1.tar.bz2/src/gtkui/gtkui.h Changed

@@ -23,6 +23,7 @@
 #include <stdint.h>
 #include <gtk/gtk.h>
 
+class Playlist;
 struct PluginPreferences;
 
 /* menus.c */
@@ -30,23 +31,22 @@
 GtkWidget * make_menu_main (GtkAccelGroup * accel);
 GtkWidget * make_menu_rclick (GtkAccelGroup * accel);
 GtkWidget * make_menu_tab (GtkAccelGroup * accel);
-extern int menu_tab_playlist_id;
+extern Playlist menu_tab_playlist;
 
 /* settings.c */
 extern const PluginPreferences gtkui_prefs;
 
 /* ui_gtk.c */
-void set_ab_repeat_a ();
-void set_ab_repeat_b ();
-void clear_ab_repeat ();
+GtkWindow * get_main_window ();
 void show_hide_menu ();
 void show_hide_infoarea ();
+void show_hide_infoarea_art ();
 void show_hide_infoarea_vis ();
 void show_hide_statusbar ();
-void popup_menu_rclick (unsigned button, uint32_t time);
-void popup_menu_tab (unsigned button, uint32_t time, int playlist);
+void popup_menu_rclick (const GdkEvent * event);
+void popup_menu_tab (const GdkEvent * event, Playlist playlist);
 void activate_search_tool ();
 void activate_playlist_manager ();
-void update_step_size ();
+void update_toolbar_icons ();
 
 #endif

audacious-plugins-3.6.2-gtk3.tar.bz2/src/gtkui/layout.cc -> audacious-plugins-4.4.1.tar.bz2/src/gtkui/layout.cc Changed

@@ -22,15 +22,15 @@
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
 
+#define AUD_GLIB_INTEGRATION
 #include <libaudcore/i18n.h>
 #include <libaudcore/runtime.h>
 #include <libaudcore/plugins.h>
+#include <libaudgui/gtk-compat.h>
+#include <libaudgui/libaudgui-gtk.h>
 
 #include "layout.h"
 
-#define DEFAULT_WIDTH 300
-#define DEFAULT_HEIGHT 200
-
 enum {
 DOCK_LEFT,
 DOCK_RIGHT,
@@ -61,18 +61,20 @@
 
 static Item * item_new (const char * name)
 {
+ int dpi = audgui_get_dpi ();
+
 Item * item = new Item ();
 item->name = String (name);
 item->plugin = nullptr;
 item->widget = item->vbox = item->paned = item->window = nullptr;
 item->dock = item->x = item->y = -1;
- item->w = DEFAULT_WIDTH;
- item->h = DEFAULT_HEIGHT;
+ item->w = 3 * dpi;
+ item->h = 2 * dpi;
 
 if (! strcmp (name, _("Search Tool")))
 {
 item->dock = DOCK_LEFT;
- item->w = 200;
+ item->w = 2 * dpi;
 }
 
 items = g_list_append (items, item);
@@ -97,7 +99,7 @@
 GtkWidget * layout_new ()
 {
 g_return_val_if_fail (! layout, nullptr);
- layout = gtk_frame_new (NULL);
+ layout = gtk_frame_new (nullptr);
 gtk_frame_set_shadow_type ((GtkFrame *) layout, GTK_SHADOW_NONE);
 gtk_container_set_border_width ((GtkContainer *) layout, 3);
 NULL_ON_DESTROY (layout);
@@ -179,7 +181,12 @@
 }
 
 gtk_widget_show_all (menu);
+
+#if GTK_CHECK_VERSION(3, 22, 0)
+ gtk_menu_popup_at_pointer ((GtkMenu *) menu, (const GdkEvent *) event);
+#else
 gtk_menu_popup ((GtkMenu *) menu, nullptr, nullptr, nullptr, nullptr, event->button, event->time);
+#endif
 
 return true;
 }
@@ -188,7 +195,7 @@
 {
 g_return_val_if_fail (widget && name, nullptr);
 
- GtkWidget * vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
+ GtkWidget * vbox = audgui_vbox_new (2);
 
 GtkWidget * ebox = gtk_event_box_new ();
 gtk_box_pack_start ((GtkBox *) vbox, ebox, false, false, 0);
@@ -196,12 +203,16 @@
 widget);
 
 GtkWidget * label = gtk_label_new (nullptr);
- char * markup = g_markup_printf_escaped ("%s", name);
+ CharPtr markup (g_markup_printf_escaped ("%s", name));
 gtk_label_set_markup ((GtkLabel *) label, markup);
- g_free (markup);
+
+#ifdef USE_GTK3
 gtk_widget_set_halign (label, GTK_ALIGN_START);
- gtk_container_add ((GtkContainer *) ebox, label);
+#else
+ gtk_misc_set_alignment ((GtkMisc *) label, 0, 0);
+#endif
 
+ gtk_container_add ((GtkContainer *) ebox, label);
 gtk_box_pack_start ((GtkBox *) vbox, widget, true, true, 0);
 
 gtk_widget_show_all (vbox);
@@ -210,27 +221,26 @@
 }
 
 typedef struct {
- GtkWidget * paned;
 GtkWidget * widget;
 bool vertical;
 int w, h;
 } RestoreSizeData;
 
-static gboolean restore_size_cb (RestoreSizeData * d)
+static void restore_size_cb (GtkPaned * paned, GdkRectangle *, RestoreSizeData * d)
 {
 GtkAllocation rect;
 gtk_widget_get_allocation (d->widget, & rect);
- int pos = gtk_paned_get_position ((GtkPaned *) d->paned);
+
+ int pos = gtk_paned_get_position (paned);
 pos -= d->vertical ? d->h - rect.height : d->w - rect.width;
- gtk_paned_set_position ((GtkPaned *) d->paned, pos);
+ gtk_paned_set_position (paned, pos);
 
- g_slice_free (RestoreSizeData, d);
- return false;
+ g_signal_handlers_disconnect_by_data (paned, d);
 }
 
 static GtkWidget * paned_new (bool vertical, bool after, int w, int h)
 {
- GtkWidget * paned = gtk_paned_new (vertical ? GTK_ORIENTATION_VERTICAL :
+ GtkWidget * paned = audgui_paned_new (vertical ? GTK_ORIENTATION_VERTICAL :
 GTK_ORIENTATION_HORIZONTAL);
 
 GtkWidget * mine = gtk_frame_new (nullptr);
@@ -250,13 +260,14 @@
 if (after)
 {
 /* hack to set the size of the second pane */
- RestoreSizeData * d = g_slice_new (RestoreSizeData);
- d->paned = paned;
+ auto d = g_new (RestoreSizeData, 1);
 d->widget = mine;
 d->vertical = vertical;
 d->w = w;
 d->h = h;
- g_idle_add ((GSourceFunc) restore_size_cb, d);
+
+ g_signal_connect_data (paned, "size-allocate", (GCallback)
+ restore_size_cb, d, (GClosureNotify) g_free, (GConnectFlags) 0);
 }
 else
 gtk_paned_set_position ((GtkPaned *) paned, vertical ? h : w);
@@ -346,6 +357,7 @@
 NULL_ON_DESTROY (item->window);
 
 gtk_window_set_title ((GtkWindow *) item->window, item->name);
+ gtk_window_set_role ((GtkWindow *) item->window, "plugin");
 gtk_container_set_border_width ((GtkContainer *) item->window, 2);
 
 g_signal_connect_swapped (item->window, "delete-event", (GCallback)
@@ -356,8 +368,7 @@
 if (item->x >= 0 && item->y >= 0)
 gtk_window_move ((GtkWindow *) item->window, item->x, item->y);
 if (item->w > 0 && item->h > 0)
- gtk_window_set_default_size ((GtkWindow *) item->window, item->w,
- item->h);
+ gtk_window_set_default_size ((GtkWindow *) item->window, item->w, item->h);
 
 gtk_container_add ((GtkContainer *) item->window, item->vbox);
 gtk_widget_show_all (item->window);
@@ -382,8 +393,7 @@
 parent = item_get_parent (where);
 g_return_if_fail (parent);
 
- paned = paned_new (! IS_VERTICAL (where->dock), false, where->w,
- where->h);
+ paned = paned_new (! IS_VERTICAL (where->dock), false, where->w, where->h);
 where->paned = paned;
 NULL_ON_DESTROY (where->paned);
 }
@@ -392,8 +402,7 @@
 parent = dock_get_parent (item->dock);
 g_return_if_fail (parent);
 
- paned = paned_new (IS_VERTICAL (item->dock), IS_AFTER (item->dock),
- item->w, item->h);
+ paned = paned_new (IS_VERTICAL (item->dock), IS_AFTER (item->dock), item->w, item->h);
 docksitem->dock = paned;
 NULL_ON_DESTROY (docksitem->dock);
 }
@@ -570,14 +579,17 @@
 Item * item = (Item *) node->data;
 g_return_if_fail (item && item->name);
 
- char key16, value64;
+ char key32, value64;
 
 snprintf (key, sizeof key, "item%d_name", i);
 aud_set_str ("gtkui-layout", key, item->name);
 
+ int temp_w = audgui_to_portable_dpi (item->w);
+ int temp_h = audgui_to_portable_dpi (item->h);
+
 snprintf (key, sizeof key, "item%d_pos", i);
 snprintf (value, sizeof value, "%d,%d,%d,%d,%d", item->dock, item->x,
- item->y, item->w, item->h);
+ item->y, temp_w, temp_h);
 aud_set_str ("gtkui-layout", key, value);
 
 i ++;
@@ -594,15 +606,22 @@
 
 for (int i = 0; i < count; i ++)
 {
- char key16;
+ char key32;
 
 snprintf (key, sizeof key, "item%d_name", i);
 String name = aud_get_str ("gtkui-layout", key);
 Item * item = item_new (name);
 
+ int temp_w = 0, temp_h = 0;
+
 snprintf (key, sizeof key, "item%d_pos", i);
 String pos = aud_get_str ("gtkui-layout", key);
- sscanf (pos, "%d,%d,%d,%d,%d", & item->dock, & item->x, & item->y, & item->w, & item->h);
+ sscanf (pos, "%d,%d,%d,%d,%d", & item->dock, & item->x, & item->y, & temp_w, & temp_h);
+
+ if (temp_w)
+ item->w = audgui_to_native_dpi (temp_w);
+ if (temp_h)
+ item->h = audgui_to_native_dpi (temp_h);
 }
 }

audacious-plugins-4.4.1.tar.bz2/src/gtkui/menu-ops.cc Added

audacious-plugins-3.6.2-gtk3.tar.bz2/src/gtkui/menus.cc -> audacious-plugins-4.4.1.tar.bz2/src/gtkui/menus.cc Changed

@@ -21,6 +21,7 @@
 #include <gtk/gtk.h>
 
 #include <libaudcore/drct.h>
+#include <libaudcore/hook.h>
 #include <libaudcore/i18n.h>
 #include <libaudcore/interface.h>
 #include <libaudcore/playlist.h>
@@ -31,10 +32,11 @@
 #include <libaudgui/menu.h>
 
 #include "gtkui.h"
-#include "playlist_util.h"
 #include "ui_playlist_notebook.h"
 #include "ui_playlist_widget.h"
 
+#include "../ui-common/menu-ops.h"
+
 #define SHIFT GDK_SHIFT_MASK
 #define CTRL GDK_CONTROL_MASK
 #define ALT GDK_MOD1_MASK
@@ -42,7 +44,7 @@
 #define SHIFT_CTRL (GdkModifierType) (SHIFT | CTRL)
 #define NONE 0, (GdkModifierType) 0
 
-int menu_tab_playlist_id = -1; /* should really be stored in the menu somehow */
+Playlist menu_tab_playlist; /* should really be stored in the menu somehow */
 
 static void open_files () { audgui_run_filebrowser (true); }
 static void open_url () { audgui_show_add_url_window (true); }
@@ -50,78 +52,29 @@
 static void add_url () { audgui_show_add_url_window (false); }
 
 static void configure_effects () { audgui_show_prefs_for_plugin_type (PluginType::Effect); }
+static void configure_output () { audgui_show_prefs_for_plugin_type (PluginType::Output); }
 static void configure_visualizations () { audgui_show_prefs_for_plugin_type (PluginType::Vis); }
 
-static void pl_sort_track () { aud_playlist_sort_by_scheme (aud_playlist_get_active (), Playlist::Track); }
-static void pl_sort_title () { aud_playlist_sort_by_scheme (aud_playlist_get_active (), Playlist::Title); }
-static void pl_sort_artist () { aud_playlist_sort_by_scheme (aud_playlist_get_active (), Playlist::Artist); }
-static void pl_sort_album () { aud_playlist_sort_by_scheme (aud_playlist_get_active (), Playlist::Album); }
-static void pl_sort_album_artist () { aud_playlist_sort_by_scheme (aud_playlist_get_active (), Playlist::AlbumArtist); }
-static void pl_sort_date () { aud_playlist_sort_by_scheme (aud_playlist_get_active (), Playlist::Date); }
-static void pl_sort_genre () { aud_playlist_sort_by_scheme (aud_playlist_get_active (), Playlist::Genre); }
-static void pl_sort_length () { aud_playlist_sort_by_scheme (aud_playlist_get_active (), Playlist::Length); }
-static void pl_sort_path () { aud_playlist_sort_by_scheme (aud_playlist_get_active (), Playlist::Path); }
-static void pl_sort_custom () { aud_playlist_sort_by_scheme (aud_playlist_get_active (), Playlist::FormattedTitle); }
-static void pl_reverse () { aud_playlist_reverse (aud_playlist_get_active ()); }
-static void pl_random () { aud_playlist_randomize (aud_playlist_get_active ()); }
-
-static void pl_sort_selected_track () { aud_playlist_sort_selected_by_scheme (aud_playlist_get_active (), Playlist::Track); }
-static void pl_sort_selected_title () { aud_playlist_sort_selected_by_scheme (aud_playlist_get_active (), Playlist::Title); }
-static void pl_sort_selected_artist () { aud_playlist_sort_selected_by_scheme (aud_playlist_get_active (), Playlist::Artist); }
-static void pl_sort_selected_album () { aud_playlist_sort_selected_by_scheme (aud_playlist_get_active (), Playlist::Album); }
-static void pl_sort_selected_album_artist () { aud_playlist_sort_selected_by_scheme (aud_playlist_get_active (), Playlist::AlbumArtist); }
-static void pl_sort_selected_date () { aud_playlist_sort_selected_by_scheme (aud_playlist_get_active (), Playlist::Date); }
-static void pl_sort_selected_genre () { aud_playlist_sort_selected_by_scheme (aud_playlist_get_active (), Playlist::Genre); }
-static void pl_sort_selected_length () { aud_playlist_sort_selected_by_scheme (aud_playlist_get_active (), Playlist::Length); }
-static void pl_sort_selected_path () { aud_playlist_sort_selected_by_scheme (aud_playlist_get_active (), Playlist::Path); }
-static void pl_sort_selected_custom () { aud_playlist_sort_selected_by_scheme (aud_playlist_get_active (), Playlist::FormattedTitle); }
-static void pl_reverse_selected () { aud_playlist_reverse_selected (aud_playlist_get_active ()); }
-static void pl_random_selected () { aud_playlist_randomize_selected (aud_playlist_get_active ()); }
-
-static void pl_new ()
-{
- aud_playlist_insert (-1);
- aud_playlist_set_active (aud_playlist_count () - 1);
-}
+static void pl_rename () { start_rename_playlist (Playlist::active_playlist ()); }
+static void pl_close () { audgui_confirm_playlist_delete (Playlist::active_playlist ()); }
 
-static void pl_play () { aud_playlist_play (aud_playlist_get_active ()); }
-static void pl_refresh () { aud_playlist_rescan (aud_playlist_get_active ()); }
-static void pl_remove_failed () { aud_playlist_remove_failed (aud_playlist_get_active ()); }
-static void pl_remove_dupes_by_title () { aud_playlist_remove_duplicates_by_scheme (aud_playlist_get_active (), Playlist::Title); }
-static void pl_remove_dupes_by_filename () { aud_playlist_remove_duplicates_by_scheme (aud_playlist_get_active (), Playlist::Filename); }
-static void pl_remove_dupes_by_path () { aud_playlist_remove_duplicates_by_scheme (aud_playlist_get_active (), Playlist::Path); }
-static void pl_rename () { start_rename_playlist (aud_playlist_get_active ()); }
-static void pl_close () { audgui_confirm_playlist_delete (aud_playlist_get_active ()); }
-static void pl_refresh_sel () { aud_playlist_rescan_selected (aud_playlist_get_active ()); }
-static void pl_select_all () { aud_playlist_select_all (aud_playlist_get_active (), true); }
-
-static void pl_tab_play ()
-{
- int playlist = aud_playlist_by_unique_id (menu_tab_playlist_id);
- if (playlist >= 0)
- aud_playlist_play (playlist);
-}
+static void pl_tab_play () { menu_tab_playlist.start_playback (); }
 
 static void pl_tab_rename ()
 {
- int playlist = aud_playlist_by_unique_id (menu_tab_playlist_id);
- if (playlist >= 0)
- start_rename_playlist (playlist);
+ if (menu_tab_playlist.exists ())
+ start_rename_playlist (menu_tab_playlist);
 }
 
 static void pl_tab_close ()
 {
- int playlist = aud_playlist_by_unique_id (menu_tab_playlist_id);
- if (playlist >= 0)
- audgui_confirm_playlist_delete (playlist);
+ if (menu_tab_playlist.exists ())
+ audgui_confirm_playlist_delete (menu_tab_playlist);
 }
 
 static GtkWidget * get_services_main () { return audgui_get_plugin_menu (AudMenuID::Main); }
 static GtkWidget * get_services_pl () { return audgui_get_plugin_menu (AudMenuID::Playlist); }
 
-static void volume_up () { aud_drct_set_volume_main (aud_drct_get_volume_main () + 5); }
-static void volume_down () { aud_drct_set_volume_main (aud_drct_get_volume_main () - 5); }
-
 static const AudguiMenuItem file_items = {
 MenuCommand (N_("_Open Files ..."), "document-open", 'o', CTRL, open_files),
 MenuCommand (N_("Open _URL ..."), "folder-remote", 'l', CTRL, open_url),
@@ -141,9 +94,12 @@
 MenuCommand (N_("_Stop"), "media-playback-stop", '.', CTRL, aud_drct_stop),
 MenuCommand (N_("Pre_vious"), "media-skip-backward", GDK_KEY_Up, ALT, aud_drct_pl_prev),
 MenuCommand (N_("_Next"), "media-skip-forward", GDK_KEY_Down, ALT, aud_drct_pl_next),
+ MenuCommand (N_("Previous Album"), nullptr, NONE, aud_drct_pl_prev_album),
+ MenuCommand (N_("Next Album"), nullptr, NONE, aud_drct_pl_next_album),
 MenuSep (),
 MenuToggle (N_("_Repeat"), nullptr, 'r', CTRL, nullptr, "repeat", nullptr, "set repeat"),
 MenuToggle (N_("S_huffle"), nullptr, 's', CTRL, nullptr, "shuffle", nullptr, "set shuffle"),
+ MenuToggle (N_("Shuffle by Albu_m"), nullptr, NONE, nullptr, "album_shuffle", nullptr, "set album_shuffle"),
 MenuToggle (N_("N_o Playlist Advance"), nullptr, 'n', CTRL, nullptr, "no_playlist_advance", nullptr, "set no_playlist_advance"),
 MenuToggle (N_("Stop A_fter This Song"), nullptr, 'm', CTRL, nullptr, "stop_after_current_song", nullptr, "set stop_after_current_song"),
 MenuSep (),
@@ -157,41 +113,45 @@
 };
 
 static const AudguiMenuItem dupe_items = {
- MenuCommand (N_("By _Title"), nullptr, NONE, pl_remove_dupes_by_title),
- MenuCommand (N_("By _File Name"), nullptr, NONE, pl_remove_dupes_by_filename),
- MenuCommand (N_("By File _Path"), nullptr, NONE, pl_remove_dupes_by_path)
+ MenuCommand (N_("By _Title"), nullptr, NONE, rm_dupes_title),
+ MenuCommand (N_("By _File Name"), nullptr, NONE, rm_dupes_filename),
+ MenuCommand (N_("By File _Path"), nullptr, NONE, rm_dupes_path)
 };
 
 static const AudguiMenuItem sort_items = {
- MenuCommand (N_("By Track _Number"), nullptr, NONE, pl_sort_track),
- MenuCommand (N_("By _Title"), nullptr, NONE, pl_sort_title),
- MenuCommand (N_("By _Artist"), nullptr, NONE, pl_sort_artist),
- MenuCommand (N_("By Al_bum"), nullptr, NONE, pl_sort_album),
- MenuCommand (N_("By Albu_m Artist"), nullptr, NONE, pl_sort_album_artist),
- MenuCommand (N_("By Release _Date"), nullptr, NONE, pl_sort_date),
- MenuCommand (N_("By _Genre"), nullptr, NONE, pl_sort_genre),
- MenuCommand (N_("By _Length"), nullptr, NONE, pl_sort_length),
- MenuCommand (N_("By _File Path"), nullptr, NONE, pl_sort_path),
- MenuCommand (N_("By _Custom Title"), nullptr, NONE, pl_sort_custom),
+ MenuCommand (N_("By Track _Number"), nullptr, NONE, sort_track),
+ MenuCommand (N_("By _Title"), nullptr, NONE, sort_title),
+ MenuCommand (N_("By _Artist"), nullptr, NONE, sort_artist),
+ MenuCommand (N_("By Al_bum"), nullptr, NONE, sort_album),
+ MenuCommand (N_("By Albu_m Artist"), nullptr, NONE, sort_album_artist),
+ MenuCommand (N_("By Release _Date"), nullptr, NONE, sort_date),
+ MenuCommand (N_("By _Genre"), nullptr, NONE, sort_genre),
+ MenuCommand (N_("By _Length"), nullptr, NONE, sort_length),
+ MenuCommand (N_("By _File Path"), nullptr, NONE, sort_path),
+ MenuCommand (N_("By _Custom Title"), nullptr, NONE, sort_custom_title),
+ MenuCommand (N_("By C_omment"), nullptr, NONE, sort_comment),
+ MenuCommand (N_("By D_isc Number"), nullptr, NONE, sort_disc),
 MenuSep (),
- MenuCommand (N_("R_everse Order"), "view-sort-descending", NONE, pl_reverse),
- MenuCommand (N_("_Random Order"), nullptr, NONE, pl_random)
+ MenuCommand (N_("R_everse Order"), "view-sort-descending", NONE, sort_reverse),
+ MenuCommand (N_("_Random Order"), nullptr, NONE, sort_random)
 };
 
-static const AudguiMenuItem sort_selected_items = {
- MenuCommand (N_("By Track _Number"), nullptr, NONE, pl_sort_selected_track),
- MenuCommand (N_("By _Title"), nullptr, NONE, pl_sort_selected_title),
- MenuCommand (N_("By _Artist"), nullptr, NONE, pl_sort_selected_artist),
- MenuCommand (N_("By Al_bum"), nullptr, NONE, pl_sort_selected_album),
- MenuCommand (N_("By Albu_m Artist"), nullptr, NONE, pl_sort_selected_album_artist),
- MenuCommand (N_("By Release _Date"), nullptr, NONE, pl_sort_selected_date),
- MenuCommand (N_("By _Genre"), nullptr, NONE, pl_sort_selected_genre),
- MenuCommand (N_("By _Length"), nullptr, NONE, pl_sort_selected_length),
- MenuCommand (N_("By _File Path"), nullptr, NONE, pl_sort_selected_path),
- MenuCommand (N_("By _Custom Title"), nullptr, NONE, pl_sort_selected_custom),
+static const AudguiMenuItem sort_sel_items = {
+ MenuCommand (N_("By Track _Number"), nullptr, NONE, sort_sel_track),
+ MenuCommand (N_("By _Title"), nullptr, NONE, sort_sel_title),
+ MenuCommand (N_("By _Artist"), nullptr, NONE, sort_sel_artist),
+ MenuCommand (N_("By Al_bum"), nullptr, NONE, sort_sel_album),
+ MenuCommand (N_("By Albu_m Artist"), nullptr, NONE, sort_sel_album_artist),
+ MenuCommand (N_("By Release _Date"), nullptr, NONE, sort_sel_date),
+ MenuCommand (N_("By _Genre"), nullptr, NONE, sort_sel_genre),
+ MenuCommand (N_("By _Length"), nullptr, NONE, sort_sel_length),
+ MenuCommand (N_("By _File Path"), nullptr, NONE, sort_sel_path),
+ MenuCommand (N_("By _Custom Title"), nullptr, NONE, sort_sel_custom_title),
+ MenuCommand (N_("By C_omment"), nullptr, NONE, sort_sel_comment),
+ MenuCommand (N_("By D_isc Number"), nullptr, NONE, sort_sel_disc),
 MenuSep (),
- MenuCommand (N_("R_everse Order"), "view-sort-descending", NONE, pl_reverse_selected),
- MenuCommand (N_("_Random Order"), nullptr, NONE, pl_random_selected)
+ MenuCommand (N_("R_everse Order"), "view-sort-descending", NONE, sort_sel_reverse),
+ MenuCommand (N_("_Random Order"), nullptr, NONE, sort_sel_random)
 };
 
 static const AudguiMenuItem playlist_items = {
@@ -199,7 +159,7 @@
 MenuCommand (N_("_Refresh"), "view-refresh", GDK_KEY_F5, (GdkModifierType) 0, pl_refresh),
 MenuSep (),
 MenuSub (N_("_Sort"), "view-sort-ascending", {sort_items}),
- MenuSub (N_("Sort Se_lected"), "view-sort-ascending", {sort_selected_items}),
+ MenuSub (N_("Sort Se_lected"), "view-sort-ascending", {sort_sel_items}),
 MenuSub (N_("Remove _Duplicates"), "edit-copy", {dupe_items}),
 MenuCommand (N_("Remove _Unavailable Files"), "dialog-warning", NONE, pl_remove_failed),
 MenuSep (),
@@ -218,20 +178,23 @@
 MenuCommand (N_("Volume _Up"), "audio-volume-high", '+', CTRL, volume_up),
 MenuCommand (N_("Volume _Down"), "audio-volume-low", '-', CTRL, volume_down),
 MenuSep (),
- MenuCommand (N_("_Equalizer"), "multimedia-volume-control", 'e', CTRL, audgui_show_equalizer_window),
+ MenuCommand (N_("_Equalizer ..."), "multimedia-volume-control", 'e', CTRL, audgui_show_equalizer_window),
+ MenuCommand (N_("E_ffects ..."), "preferences-system", NONE, configure_effects),
 MenuSep (),
- MenuCommand (N_("E_ffects ..."), nullptr, NONE, configure_effects)
+ MenuToggle (N_("_Record Stream"), nullptr, 'd', CTRL, nullptr, "record", nullptr, "set record"),
+ MenuCommand (N_("Audio _Settings ..."), "audio-card", NONE, configure_output)
 };
 
 static const AudguiMenuItem view_items = {
 MenuToggle (N_("Show _Menu Bar"), nullptr, 'm', SHIFT_CTRL, "gtkui", "menu_visible", show_hide_menu),
 MenuToggle (N_("Show I_nfo Bar"), nullptr, 'i', SHIFT_CTRL, "gtkui", "infoarea_visible", show_hide_infoarea),
+ MenuToggle (N_("Show Info Bar _Album Art"), nullptr, NONE, "gtkui", "infoarea_show_art", show_hide_infoarea_art),
 MenuToggle (N_("Show Info Bar Vis_ualization"), nullptr, NONE, "gtkui", "infoarea_show_vis", show_hide_infoarea_vis),
 MenuToggle (N_("Show _Status Bar"), nullptr, 's', SHIFT_CTRL, "gtkui", "statusbar_visible", show_hide_statusbar),
 MenuSep (),
 MenuToggle (N_("Show _Remaining Time"), nullptr, 'r', SHIFT_CTRL, "gtkui", "show_remaining_time"),
 MenuSep (),
- MenuCommand (N_("_Visualizations ..."), nullptr, NONE, configure_visualizations)
+ MenuCommand (N_("_Visualizations ..."), "preferences-system", NONE, configure_visualizations)
 };
 
 static const AudguiMenuItem main_items = {
@@ -244,15 +207,16 @@
 };
 
 static const AudguiMenuItem rclick_items = {
- MenuCommand (N_("Song _Info ..."), "dialog-information", 'i', ALT, playlist_song_info),
- MenuCommand (N_("_Queue/Unqueue"), nullptr, 'q', ALT, playlist_queue_toggle),
+ MenuCommand (N_("Song _Info ..."), "dialog-information", 'i', ALT, pl_song_info),
+ MenuCommand (N_("_Queue/Unqueue"), nullptr, 'q', ALT, pl_queue_toggle),
 MenuSep (),
- MenuCommand (N_("_Open Containing Folder"), "folder", NONE, playlist_open_folder),
- MenuCommand (N_("_Refresh"), "view-refresh", GDK_KEY_F6, (GdkModifierType) 0, pl_refresh_sel),
+ MenuCommand (N_("_Open Containing Folder"), "folder", NONE, pl_open_folder),
+ MenuCommand (N_("_Refresh Selected"), "view-refresh", GDK_KEY_F6, (GdkModifierType) 0, pl_refresh_sel),
 MenuSep (),
- MenuCommand (N_("Cu_t"), "edit-cut", NONE, playlist_cut),
- MenuCommand (N_("_Copy"), "edit-copy", NONE, playlist_copy),
- MenuCommand (N_("_Paste"), "edit-paste", NONE, playlist_paste),
+ MenuCommand (N_("Cu_t"), "edit-cut", NONE, pl_cut),
+ MenuCommand (N_("_Copy"), "edit-copy", NONE, pl_copy),
+ MenuCommand (N_("_Paste"), "edit-paste", NONE, pl_paste),
+ MenuCommand (N_("Paste at _End"), "edit-paste", 'v', SHIFT_CTRL, pl_paste_end),
 MenuCommand (N_("Select _All"), "edit-select-all", NONE, pl_select_all),
 MenuSep (),
 MenuSub (N_("_Services"), nullptr, get_services_pl)

audacious-plugins-4.4.1.tar.bz2/src/gtkui/meson.build Added

audacious-plugins-3.6.2-gtk3.tar.bz2/src/gtkui/settings.cc -> audacious-plugins-4.4.1.tar.bz2/src/gtkui/settings.cc Changed

@@ -27,14 +27,21 @@
 
 static void redisplay_playlists ()
 {
- ui_playlist_notebook_empty ();
- ui_playlist_notebook_populate ();
+ pl_notebook_purge ();
+ pl_notebook_populate ();
 }
 
+static const ComboItem playlist_tabs_options = {
+ ComboItem (N_("Always"), PlaylistTabVisibility::Always),
+ ComboItem (N_("Auto-hide"), PlaylistTabVisibility::AutoHide),
+ ComboItem (N_("Never"), PlaylistTabVisibility::Never)
+};
+
 static const PreferencesWidget gtkui_widgets = {
 WidgetLabel (N_("Playlist Tabs")),
- WidgetCheck (N_("Always show tabs"),
- WidgetBool ("gtkui", "playlist_tabs_visible", show_hide_playlist_tabs)),
+ WidgetCombo (N_("Show playlist tabs:"),
+ WidgetInt ("gtkui", "playlist_tabs_visible", show_hide_playlist_tabs),
+ {{playlist_tabs_options}}),
 WidgetCheck (N_("Show entry counts"),
 WidgetBool ("gtkui", "entry_count_visible", redisplay_playlists)),
 WidgetCheck (N_("Show close buttons"),
@@ -43,10 +50,11 @@
 WidgetCustomGTK (pw_col_create_chooser),
 WidgetCheck (N_("Show column headers"),
 WidgetBool ("gtkui", "playlist_headers", redisplay_playlists)),
+ WidgetCheck (N_("Make column headers clickable for sorting"),
+ WidgetBool ("gtkui", "playlist_headers_sortable", redisplay_playlists)),
 WidgetLabel (N_("Miscellaneous")),
- WidgetSpin (N_("Arrow keys seek by:"),
- WidgetFloat ("gtkui", "step_size", update_step_size),
- {0.1, 60, 0.1, N_("seconds")}),
+ WidgetCheck (N_("Use symbolic icons in toolbar"),
+ WidgetBool ("gtkui", "symbolic_icons", update_toolbar_icons)),
 WidgetCheck (N_("Scroll on song change"),
 WidgetBool ("gtkui", "autoscroll"))
 };

audacious-plugins-3.6.2-gtk3.tar.bz2/src/gtkui/ui_gtk.cc -> audacious-plugins-4.4.1.tar.bz2/src/gtkui/ui_gtk.cc Changed

@@ -22,16 +22,18 @@
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
 
-#include <libaudcore/runtime.h>
+#include <libaudcore/audstrings.h>
 #include <libaudcore/drct.h>
+#include <libaudcore/hook.h>
 #include <libaudcore/i18n.h>
+#include <libaudcore/mainloop.h>
 #include <libaudcore/playlist.h>
 #include <libaudcore/plugin.h>
 #include <libaudcore/plugins.h>
 #include <libaudcore/runtime.h>
-#include <libaudcore/audstrings.h>
-#include <libaudcore/hook.h>
+#include <libaudgui/gtk-compat.h>
 #include <libaudgui/libaudgui.h>
+#include <libaudgui/libaudgui-gtk.h>
 
 #include "gtkui.h"
 #include "layout.h"
@@ -39,13 +41,15 @@
 #include "ui_playlist_widget.h"
 #include "ui_infoarea.h"
 #include "ui_statusbar.h"
-#include "playlist_util.h"
+
+#include "../ui-common/menu-ops.h"
 
 static const char * const gtkui_defaults = {
+ "infoarea_show_art", "TRUE",
 "infoarea_show_vis", "TRUE",
 "infoarea_visible", "TRUE",
 "menu_visible", "TRUE",
- "playlist_tabs_visible", "TRUE",
+ "playlist_tabs_visible", aud::numeric_string<PlaylistTabVisibility::Always>::str,
 "statusbar_visible", "TRUE",
 "entry_count_visible", "FALSE",
 "close_button_visible", "TRUE",
@@ -53,13 +57,20 @@
 "autoscroll", "TRUE",
 "playlist_columns", "title artist album queued length",
 "playlist_headers", "TRUE",
+ "playlist_headers_sortable", "TRUE",
 "show_remaining_time", "FALSE",
- "step_size", "5",
+
+#ifdef USE_GTK3
+ "symbolic_icons", "TRUE",
+#else
+ "symbolic_icons", "FALSE",
+#endif
 
 "player_x", "-1000",
 "player_y", "-1000",
- "player_width", "760",
- "player_height", "460",
+ "player_width", "768",
+ "player_height", "480",
+ "player_maximized", "FALSE",
 
 nullptr
 };
@@ -71,7 +82,8 @@
 N_("GTK Interface"),
 PACKAGE,
 nullptr,
- & gtkui_prefs
+ & gtkui_prefs,
+ PluginGLibOnly
 };
 
 constexpr GtkUI () : IfacePlugin (info) {}
@@ -105,6 +117,9 @@
 { audgui_plugin_menu_add (id, func, name, icon); }
 void plugin_menu_remove (AudMenuID id, void func ())
 { audgui_plugin_menu_remove (id, func); }
+
+ void startup_notify (const char * id)
+ { gdk_notify_startup_complete_with_id (id); }
 };
 
 EXPORT GtkUI aud_plugin_instance;
@@ -113,46 +128,60 @@
 
 static GtkWidget * volume;
 static bool volume_slider_is_moving = false;
-static unsigned update_volume_timeout_source = 0;
 static unsigned long volume_change_handler_id;
 
 static GtkAccelGroup * accel;
 
 static GtkWidget * window, * vbox_outer, * menu_box, * menu, * toolbar, * vbox,
 * infoarea, * statusbar;
-static GtkToolItem * menu_button, * search_button, * button_play, * button_stop,
- * button_shuffle, * button_repeat;
+static GtkToolItem * menu_button, * search_button, * button_open, * button_add,
+ * button_prev, * button_play, * button_stop, * button_next, * button_record,
+ * button_repeat, * button_shuffle;
 static GtkWidget * slider, * label_time;
 static GtkWidget * menu_main, * menu_rclick, * menu_tab;
 
-static gboolean slider_is_moving = false;
+static bool slider_is_moving = false;
 static int slider_seek_time = -1;
-static unsigned delayed_title_change_source = 0;
-static unsigned update_song_timeout_source = 0;
+static QueuedFunc delayed_title_change;
 
 static void save_window_size ()
 {
+ if (aud_get_bool ("gtkui", "player_maximized"))
+ return;
+
 int x, y, w, h;
 gtk_window_get_position ((GtkWindow *) window, & x, & y);
 gtk_window_get_size ((GtkWindow *) window, & w, & h);
 
 aud_set_int ("gtkui", "player_x", x);
 aud_set_int ("gtkui", "player_y", y);
- aud_set_int ("gtkui", "player_width", w);
- aud_set_int ("gtkui", "player_height", h);
+ aud_set_int ("gtkui", "player_width", audgui_to_portable_dpi (w));
+ aud_set_int ("gtkui", "player_height", audgui_to_portable_dpi (h));
 }
 
 static void restore_window_size ()
 {
 int x = aud_get_int ("gtkui", "player_x");
 int y = aud_get_int ("gtkui", "player_y");
- int w = aud_get_int ("gtkui", "player_width");
- int h = aud_get_int ("gtkui", "player_height");
+ int w = audgui_to_native_dpi (aud_get_int ("gtkui", "player_width"));
+ int h = audgui_to_native_dpi (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);
+
+ if (aud_get_bool ("gtkui", "player_maximized"))
+ gtk_window_maximize ((GtkWindow *) window);
+}
+
+static gboolean window_state_cb (GtkWidget *, GdkEventWindowState * event)
+{
+ if (event->changed_mask & GDK_WINDOW_STATE_MAXIMIZED)
+ aud_set_bool ("gtkui", "player_maximized",
+ !! (event->new_window_state & GDK_WINDOW_STATE_MAXIMIZED));
+
+ return false;
 }
 
 static gboolean window_delete ()
@@ -178,56 +207,27 @@
 audgui_run_filebrowser (false);
 }
 
-void set_ab_repeat_a ()
+static void title_change ()
 {
- if (! aud_drct_get_playing ())
- return;
+ delayed_title_change.stop ();
 
- 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 ()
-{
- 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 ()
-{
- aud_drct_set_ab_repeat (-1, -1);
-}
-
-static gboolean title_change_cb ()
-{
- if (delayed_title_change_source)
- {
- g_source_remove (delayed_title_change_source);
- delayed_title_change_source = 0;
- }
+ StringBuf title;
 
 if (aud_drct_get_playing ())
 {
 if (aud_drct_get_ready ())
- {
- String title = aud_drct_get_title ();
- gtk_window_set_title ((GtkWindow *) window,
- str_printf (_("%s - Audacious"), (const char *) title));
- }
+ title = str_printf (_("%s - Audacious"), (const char *) aud_drct_get_title ());
 else
- gtk_window_set_title ((GtkWindow *) window, _("Buffering ..."));
+ title = str_copy (_("Buffering ..."));
 }
 else
- gtk_window_set_title ((GtkWindow *) window, _("Audacious"));
+ title = str_copy (_("Audacious"));
 
- return false;
+ int instance = aud_get_instance ();
+ if (instance != 1)
+ str_append_printf (title, " (%d)", instance);
+
+ gtk_window_set_title ((GtkWindow *) window, title);
 }
 
 void GtkUI::show (bool show)
@@ -259,12 +259,12 @@
 {
 char s128 = "";
 
- if (len && aud_get_bool ("gtkui", "show_remaining_time"))
+ if (len > 0 && aud_get_bool ("gtkui", "show_remaining_time"))
 append_str (s, sizeof s, str_format_time (len - time));
 else
 append_str (s, sizeof s, str_format_time (time));
 
- if (len)
+ if (len > 0)
 {
 append_str (s, sizeof s, " / ");
 append_str (s, sizeof s, str_format_time (len));
@@ -297,10 +297,10 @@
 gtk_range_set_value ((GtkRange *) slider, time);
 }
 
-static gboolean time_counter_cb ()
+static void time_counter_cb (void * = nullptr)
 {
 if (slider_is_moving)
- return true;
+ return;
 
 slider_seek_time = -1; // delayed reset to avoid seeking twice
 
@@ -311,50 +311,44 @@
 set_slider (time);
 
 set_time_label (time, length);
-
- return true;
 }
 
 static void do_seek (int time)
 {
- int length = aud_drct_get_length ();
- time = aud::clamp (time, 0, length);
-
- set_slider (time);
- set_time_label (time, length);
 aud_drct_seek (time);
-
- // Trick: Unschedule and then schedule the update function. This gives the
- // player 1/4 second to perform the seek before we update the display again,
- // in an attempt to reduce flickering.
- if (update_song_timeout_source)
- {
- g_source_remove (update_song_timeout_source);
- update_song_timeout_source = g_timeout_add (250, (GSourceFunc) time_counter_cb, nullptr);
- }
+ time_counter_cb ();
 }
 
-static gboolean ui_slider_change_value_cb (GtkRange * range,
- GtkScrollType scroll, double value)
+static gboolean ui_slider_change_value_cb (GtkRange *, GtkScrollType, double value)
 {
 int length = aud_drct_get_length ();
 int time = aud::clamp ((int) value, 0, length);
 
- set_time_label (time, length);
-
 if (slider_is_moving)
+ {
 slider_seek_time = time;
+ set_time_label (time, length);
+ }
 else if (time != slider_seek_time) // avoid seeking twice
 do_seek (time);
 
 return false;
 }
 
+/* return an object property if it exists, otherwise false */
+static bool get_boolean_prop (void * obj, const char * prop)
+{
+ gboolean value = false;
+ if (g_object_class_find_property (G_OBJECT_GET_CLASS (obj), prop))
+ g_object_get (obj, prop, & value, nullptr);
+
+ return value;
+}
+
 static gboolean ui_slider_button_press_cb (GtkWidget * widget, GdkEventButton * event)
 {
- gboolean primary_warps = false;
- g_object_get (gtk_widget_get_settings (widget),
- "gtk-primary-button-warps-slider", & primary_warps, nullptr);
+ bool primary_warps = get_boolean_prop (gtk_widget_get_settings (widget),
+ "gtk-primary-button-warps-slider");
 
 if (event->button == 1 && ! primary_warps)
 event->button = 2;
@@ -365,9 +359,8 @@
 
 static gboolean ui_slider_button_release_cb (GtkWidget * widget, GdkEventButton * event)
 {
- gboolean primary_warps = false;
- g_object_get (gtk_widget_get_settings (widget),
- "gtk-primary-button-warps-slider", & primary_warps, nullptr);
+ bool primary_warps = get_boolean_prop (gtk_widget_get_settings (widget),
+ "gtk-primary-button-warps-slider");
 
 if (event->button == 1 && ! primary_warps)
 event->button = 2;
@@ -379,37 +372,69 @@
 return false;
 }
 
-static gboolean ui_volume_value_changed_cb (GtkButton * button, double volume)
+static gboolean ui_volume_value_changed_cb (GtkButton *, double volume)
 {
 aud_drct_set_volume_main (volume);
 return true;
 }
 
-static void ui_volume_pressed_cb (GtkButton * button)
+static gboolean ui_volume_button_press_cb (GtkWidget *, GdkEvent * event)
 {
- volume_slider_is_moving = true;
+ static int old_volume = 0;
+ GdkEventButton * button_event = (GdkEventButton *) event;
+
+ /* ignore double and triple clicks */
+ if (button_event->type != GDK_BUTTON_PRESS)
+ return false;
+
+ /* handle left mouse button */
+ if (button_event->button == 1)
+ {
+ volume_slider_is_moving = true;
+ return false;
+ }
+
+ /* (un)mute with middle mouse button */
+ if (button_event->button == 2)
+ {
+ int current_volume = aud_drct_get_volume_main ();
+ if (current_volume)
+ {
+ old_volume = current_volume;
+ aud_drct_set_volume_main (0);
+ }
+ else
+ aud_drct_set_volume_main (old_volume);
+
+ return true;
+ }
+
+ return false;
 }
 
-static void ui_volume_released_cb (GtkButton * button)
+static gboolean ui_volume_button_release_cb (GtkWidget *, GdkEvent * event)
 {
- volume_slider_is_moving = false;
+ GdkEventButton * button_event = (GdkEventButton *) event;
+
+ if (button_event->button == 1)
+ volume_slider_is_moving = false;
+
+ return false;
 }
 
-static gboolean ui_volume_slider_update (void * button)
+static void ui_volume_slider_update (void * button)
 {
- if (volume_slider_is_moving || ! button)
- return true;
+ if (volume_slider_is_moving)
+ return;
 
 int volume = aud_drct_get_volume_main ();
 
 if (volume == (int) gtk_scale_button_get_value ((GtkScaleButton *) button))
- return true;
+ return;
 
 g_signal_handler_block (button, volume_change_handler_id);
 gtk_scale_button_set_value ((GtkScaleButton *) button, volume);
 g_signal_handler_unblock (button, volume_change_handler_id);
-
- return true;
 }
 
 static void set_slider_length (int length)
@@ -423,16 +448,43 @@
 gtk_widget_hide (slider);
 }
 
-void update_step_size ()
+static void update_step_size ()
+{
+ int step_size = aud_get_int ("step_size");
+ // set half the step size because GTK doubles it for scroll events
+ gtk_range_set_increments ((GtkRange *) slider, step_size * 500, step_size * 500);
+}
+
+static void update_volume_delta ()
 {
- double step_size = aud_get_double ("gtkui", "step_size");
- gtk_range_set_increments ((GtkRange *) slider, step_size * 1000, step_size * 1000);
+ int volume_delta = aud_get_int ("volume_delta");
+ GtkAdjustment * adjustment = gtk_scale_button_get_adjustment ((GtkScaleButton *) volume);
+ gtk_adjustment_set_step_increment (adjustment, volume_delta);
+ gtk_adjustment_set_page_increment (adjustment, volume_delta);
+}
+
+static void set_menu_button_icon (GtkToolButton * button)
+{
+ if (aud_get_bool ("gtkui", "symbolic_icons"))
+ gtk_tool_button_set_icon_name (button, "open-menu-symbolic");
+ else
+ gtk_tool_button_set_icon_name (button, "audacious");
+}
+
+static void set_button_icon (GtkToolButton * button, const char * icon)
+{
+ if (aud_get_bool ("gtkui", "symbolic_icons"))
+ gtk_tool_button_set_icon_name (button, str_concat ({icon, "-symbolic"}));
+ else
+ gtk_tool_button_set_icon_name (button, icon);
 }
 
 static void pause_cb ()
 {
- gtk_tool_button_set_icon_name ((GtkToolButton *) button_play,
- aud_drct_get_paused () ? "media-playback-start" : "media-playback-pause");
+ bool paused = aud_drct_get_paused ();
+ set_button_icon ((GtkToolButton *) button_play,
+ paused ? "media-playback-start" : "media-playback-pause");
+ gtk_tool_item_set_tooltip_text (button_play, paused ? _("Play") : _("Pause"));
 }
 
 static void ui_playback_begin ()
@@ -440,65 +492,53 @@
 pause_cb ();
 gtk_widget_set_sensitive ((GtkWidget *) button_stop, true);
 
- if (delayed_title_change_source)
- g_source_remove (delayed_title_change_source);
-
 /* If "title change" is not called by 1/4 second after starting playback,
 * show "Buffering ..." as the window title. */
- delayed_title_change_source = g_timeout_add (250, (GSourceFunc)
- title_change_cb, nullptr);
+ delayed_title_change.queue (250, title_change);
 }
 
 static void ui_playback_ready ()
 {
- title_change_cb ();
+ title_change ();
 set_slider_length (aud_drct_get_length ());
 time_counter_cb ();
 
 /* update time counter 4 times a second */
- if (! update_song_timeout_source)
- update_song_timeout_source = g_timeout_add (250, (GSourceFunc)
- time_counter_cb, nullptr);
+ timer_add (TimerRate::Hz4, time_counter_cb);
 
 gtk_widget_show (label_time);
 }
 
 static void ui_playback_stop ()
 {
- if (update_song_timeout_source)
- {
- g_source_remove (update_song_timeout_source);
- update_song_timeout_source = 0;
- }
-
- if (delayed_title_change_source)
- g_source_remove (delayed_title_change_source);
+ timer_remove (TimerRate::Hz4, time_counter_cb);
 
- /* Don't update the window title immediately; we may be about to start
- * another song. */
- delayed_title_change_source = g_idle_add ((GSourceFunc) title_change_cb, nullptr);
-
- gtk_tool_button_set_icon_name ((GtkToolButton *) button_play, "media-playback-start");
+ title_change ();
+ set_button_icon ((GtkToolButton *) button_play, "media-playback-start");
+ gtk_tool_item_set_tooltip_text (button_play, _("Play"));
 gtk_widget_set_sensitive ((GtkWidget *) button_stop, false);
 gtk_widget_hide (slider);
 gtk_widget_hide (label_time);
 }
 
 static GtkToolItem * toolbar_button_add (GtkWidget * toolbar,
- void (* callback) (), const char * icon)
+ void (* callback) (), const char * icon, const char * tooltip)
 {
 GtkToolItem * item = gtk_tool_button_new (nullptr, nullptr);
- gtk_tool_button_set_icon_name ((GtkToolButton *) item, icon);
+ set_button_icon ((GtkToolButton *) item, icon);
+ gtk_tool_item_set_tooltip_text (item, tooltip);
 gtk_toolbar_insert ((GtkToolbar *) toolbar, item, -1);
 g_signal_connect (item, "clicked", callback, nullptr);
 return item;
 }
 
-static GtkToolItem * toggle_button_new (const char * icon,
- void (* toggled) (GtkToggleToolButton * button))
+static GtkToolItem * toggle_button_new (const char * icon, const char * tooltip,
+ void (* toggled) (GtkToggleToolButton *), bool is_toggled)
 {
 GtkToolItem * item = gtk_toggle_tool_button_new ();
- gtk_tool_button_set_icon_name ((GtkToolButton *) item, icon);
+ set_button_icon ((GtkToolButton *) item, icon);
+ gtk_tool_item_set_tooltip_text (item, tooltip);
+ gtk_toggle_tool_button_set_active ((GtkToggleToolButton *) item, is_toggled);
 g_signal_connect (item, "toggled", (GCallback) toggled, nullptr);
 return item;
 }
@@ -510,12 +550,7 @@
 return label;
 }
 
-static void window_mapped_cb (GtkWidget * widget)
-{
- gtk_widget_grab_focus (playlist_get_treeview (aud_playlist_get_active ()));
-}
-
-static gboolean window_keypress_cb (GtkWidget * widget, GdkEventKey * event)
+static gboolean window_keypress_cb (GtkWidget *, GdkEventKey * event)
 {
 switch (event->state & (GDK_SHIFT_MASK | GDK_CONTROL_MASK | GDK_MOD1_MASK))
 {
@@ -526,8 +561,8 @@
 /* escape key returns focus to playlist */
 if (event->keyval == GDK_KEY_Escape)
 {
- if (! focused || ! gtk_widget_is_ancestor (focused, (GtkWidget *) UI_PLAYLIST_NOTEBOOK))
- gtk_widget_grab_focus (playlist_get_treeview (aud_playlist_get_active ()));
+ if (! focused || ! gtk_widget_is_ancestor (focused, pl_notebook))
+ pl_notebook_grab_focus ();
 
 return false;
 }
@@ -556,11 +591,11 @@
 return true;
 case GDK_KEY_Left:
 if (aud_drct_get_playing ())
- do_seek (aud_drct_get_time () - aud_get_double ("gtkui", "step_size") * 1000);
+ do_seek (aud_drct_get_time () - aud_get_int ("step_size") * 1000);
 return true;
 case GDK_KEY_Right:
 if (aud_drct_get_playing ())
- do_seek (aud_drct_get_time () + aud_get_double ("gtkui", "step_size") * 1000);
+ do_seek (aud_drct_get_time () + aud_get_int ("step_size") * 1000);
 return true;
 }
 
@@ -572,8 +607,7 @@
 {
 case GDK_KEY_ISO_Left_Tab:
 case GDK_KEY_Tab:
- aud_playlist_set_active ((aud_playlist_get_active () + 1) %
- aud_playlist_count ());
+ pl_next ();
 break;
 
 default:
@@ -585,8 +619,7 @@
 {
 case GDK_KEY_ISO_Left_Tab:
 case GDK_KEY_Tab:
- aud_playlist_set_active (aud_playlist_get_active () ?
- aud_playlist_get_active () - 1 : aud_playlist_count () - 1);
+ pl_prev ();
 break;
 default:
 return false;
@@ -597,11 +630,11 @@
 {
 case GDK_KEY_Left:
 if (aud_drct_get_playing ())
- do_seek (aud_drct_get_time () - aud_get_double ("gtkui", "step_size") * 1000);
+ do_seek (aud_drct_get_time () - aud_get_int ("step_size") * 1000);
 break;
 case GDK_KEY_Right:
 if (aud_drct_get_playing ())
- do_seek (aud_drct_get_time () + aud_get_double ("gtkui", "step_size") * 1000);
+ do_seek (aud_drct_get_time () + aud_get_int ("step_size") * 1000);
 break;
 default:
 return false;
@@ -613,7 +646,7 @@
 return true;
 }
 
-static gboolean playlist_keypress_cb (GtkWidget * widget, GdkEventKey * event)
+static gboolean playlist_keypress_cb (GtkWidget *, GdkEventKey * event)
 {
 switch (event->state & (GDK_SHIFT_MASK | GDK_CONTROL_MASK | GDK_MOD1_MASK))
 {
@@ -621,13 +654,13 @@
 switch (event->keyval)
 {
 case GDK_KEY_Escape:
- ui_playlist_notebook_position (aud::to_ptr (aud_playlist_get_active ()), nullptr);
+ pl_notebook_set_position (aud::to_ptr (Playlist::active_playlist ()), nullptr);
 return true;
 case GDK_KEY_Delete:
- playlist_delete_selected ();
+ pl_remove_selected ();
 return true;
 case GDK_KEY_Menu:
- popup_menu_rclick (0, event->time);
+ popup_menu_rclick ((const GdkEvent *) event);
 return true;
 }
 
@@ -636,16 +669,16 @@
 switch (event->keyval)
 {
 case 'x':
- playlist_cut ();
+ pl_cut ();
 return true;
 case 'c':
- playlist_copy ();
+ pl_copy ();
 return true;
 case 'v':
- playlist_paste ();
+ pl_paste ();
 return true;
 case 'a':
- aud_playlist_select_all (aud_playlist_get_active (), true);
+ pl_select_all ();
 return true;
 }
 
@@ -655,27 +688,40 @@
 return false;
 }
 
-static void update_toggles (void * data, void * user)
+static void update_toggles (void * = nullptr, void * = nullptr)
 {
+ gtk_widget_set_visible ((GtkWidget *) button_record, aud_drct_get_record_enabled ());
+
+ gtk_toggle_tool_button_set_active ((GtkToggleToolButton *) button_record,
+ aud_get_bool ("record"));
 gtk_toggle_tool_button_set_active ((GtkToggleToolButton *) button_repeat,
- aud_get_bool (nullptr, "repeat"));
+ aud_get_bool ("repeat"));
 gtk_toggle_tool_button_set_active ((GtkToggleToolButton *) button_shuffle,
- aud_get_bool (nullptr, "shuffle"));
+ aud_get_bool ("shuffle"));
 }
 
 static void toggle_repeat (GtkToggleToolButton * button)
 {
- aud_set_bool (nullptr, "repeat", gtk_toggle_tool_button_get_active (button));
+ aud_set_bool ("repeat", gtk_toggle_tool_button_get_active (button));
 }
 
 static void toggle_shuffle (GtkToggleToolButton * button)
 {
- aud_set_bool (nullptr, "shuffle", gtk_toggle_tool_button_get_active (button));
+ aud_set_bool ("shuffle", gtk_toggle_tool_button_get_active (button));
+}
+
+static void toggle_record (GtkToggleToolButton * button)
+{
+ aud_set_bool ("record", gtk_toggle_tool_button_get_active (button));
 }
 
 static void toggle_search_tool (GtkToggleToolButton * button)
 {
- aud_plugin_enable (search_tool, gtk_toggle_tool_button_get_active (button));
+ bool enable = gtk_toggle_tool_button_get_active (button);
+ aud_plugin_enable (search_tool, enable);
+
+ if (enable)
+ layout_focus (search_tool);
 }
 
 static bool search_tool_toggled (PluginHandle * plugin, void *)
@@ -696,35 +742,43 @@
 
 static void ui_hooks_associate ()
 {
- hook_associate ("title change", (HookFunction) title_change_cb, nullptr);
+ hook_associate ("title change", (HookFunction) title_change, nullptr);
 hook_associate ("playback begin", (HookFunction) ui_playback_begin, nullptr);
 hook_associate ("playback ready", (HookFunction) ui_playback_ready, nullptr);
 hook_associate ("playback pause", (HookFunction) pause_cb, nullptr);
 hook_associate ("playback unpause", (HookFunction) pause_cb, nullptr);
 hook_associate ("playback stop", (HookFunction) ui_playback_stop, nullptr);
- hook_associate ("playlist update", ui_playlist_notebook_update, nullptr);
- hook_associate ("playlist activate", ui_playlist_notebook_activate, nullptr);
- hook_associate ("playlist set playing", ui_playlist_notebook_set_playing, nullptr);
- hook_associate ("playlist position", ui_playlist_notebook_position, nullptr);
+ hook_associate ("playlist update", pl_notebook_update, nullptr);
+ hook_associate ("playlist activate", pl_notebook_activate, nullptr);
+ hook_associate ("playlist set playing", pl_notebook_set_playing, nullptr);
+ hook_associate ("playlist position", pl_notebook_set_position, nullptr);
+ hook_associate ("enable record", update_toggles, nullptr);
+ hook_associate ("set record", update_toggles, nullptr);
 hook_associate ("set shuffle", update_toggles, nullptr);
 hook_associate ("set repeat", update_toggles, nullptr);
+ hook_associate ("set step_size", (HookFunction) update_step_size, nullptr);
+ hook_associate ("set volume_delta", (HookFunction) update_volume_delta, nullptr);
 hook_associate ("config save", (HookFunction) config_save, nullptr);
 }
 
 static void ui_hooks_disassociate ()
 {
- hook_dissociate ("title change", (HookFunction) title_change_cb);
+ hook_dissociate ("title change", (HookFunction) title_change);
 hook_dissociate ("playback begin", (HookFunction) ui_playback_begin);
 hook_dissociate ("playback ready", (HookFunction) ui_playback_ready);
 hook_dissociate ("playback pause", (HookFunction) pause_cb);
 hook_dissociate ("playback unpause", (HookFunction) pause_cb);
 hook_dissociate ("playback stop", (HookFunction) ui_playback_stop);
- hook_dissociate ("playlist update", ui_playlist_notebook_update);
- hook_dissociate ("playlist activate", ui_playlist_notebook_activate);
- hook_dissociate ("playlist set playing", ui_playlist_notebook_set_playing);
- hook_dissociate ("playlist position", ui_playlist_notebook_position);
+ hook_dissociate ("playlist update", pl_notebook_update);
+ hook_dissociate ("playlist activate", pl_notebook_activate);
+ hook_dissociate ("playlist set playing", pl_notebook_set_playing);
+ hook_dissociate ("playlist position", pl_notebook_set_position);
+ hook_dissociate ("enable record", update_toggles);
+ hook_dissociate ("set record", update_toggles);
 hook_dissociate ("set shuffle", update_toggles);
 hook_dissociate ("set repeat", update_toggles);
+ hook_dissociate ("set step_size", (HookFunction) update_step_size);
+ hook_dissociate ("set volume_delta", (HookFunction) update_volume_delta);
 hook_dissociate ("config save", (HookFunction) config_save);
 }
 
@@ -778,9 +832,6 @@
 
 bool GtkUI::init ()
 {
- if (aud_get_mainloop_type () != MainloopType::GLib)
- return false;
-
 audgui_init ();
 
 search_tool = aud_plugin_lookup_basename ("search-tool");
@@ -790,52 +841,67 @@
 pw_col_init ();
 
 window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+ gtk_window_set_role ((GtkWindow *) window, "mainwindow");
 
 accel = gtk_accel_group_new ();
 gtk_window_add_accel_group ((GtkWindow *) window, accel);
 
- vbox_outer = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+ vbox_outer = audgui_vbox_new (0);
 gtk_container_add ((GtkContainer *) window, vbox_outer);
 
- menu_box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
+ menu_box = audgui_hbox_new (0);
 gtk_box_pack_start ((GtkBox *) vbox_outer, menu_box, false, false, 0);
 
 toolbar = gtk_toolbar_new ();
 gtk_toolbar_set_style ((GtkToolbar *) toolbar, GTK_TOOLBAR_ICONS);
+ gtk_toolbar_set_show_arrow ((GtkToolbar *) toolbar, false);
+ gtk_box_pack_start ((GtkBox *) vbox_outer, toolbar, false, false, 0);
+
+#ifdef USE_GTK3
 GtkStyleContext * context = gtk_widget_get_style_context (toolbar);
 gtk_style_context_add_class (context, GTK_STYLE_CLASS_PRIMARY_TOOLBAR);
- gtk_box_pack_start ((GtkBox *) vbox_outer, toolbar, false, false, 0);
+#endif
 
 /* search button */
 if (search_tool)
 {
- search_button = toggle_button_new ("edit-find", toggle_search_tool);
+ search_button = toggle_button_new ("edit-find", _("Search Library"),
+ toggle_search_tool, aud_plugin_get_enabled (search_tool));
 gtk_toolbar_insert ((GtkToolbar *) toolbar, search_button, -1);
- gtk_toggle_tool_button_set_active ((GtkToggleToolButton *) search_button,
- aud_plugin_get_enabled (search_tool));
 aud_plugin_add_watch (search_tool, search_tool_toggled, nullptr);
 }
 
+ /* open/add buttons */
+ button_open = toolbar_button_add (toolbar, button_open_pressed, "document-open", _("Open Files"));
+ button_add = toolbar_button_add (toolbar, button_add_pressed, "list-add", _("Add Files"));
+
+ gtk_toolbar_insert ((GtkToolbar *) toolbar, gtk_separator_tool_item_new (), -1);
+
 /* playback buttons */
- toolbar_button_add (toolbar, button_open_pressed, "document-open");
- toolbar_button_add (toolbar, button_add_pressed, "list-add");
- button_play = toolbar_button_add (toolbar, aud_drct_play_pause, "media-playback-start");
- button_stop = toolbar_button_add (toolbar, aud_drct_stop, "media-playback-stop");
- toolbar_button_add (toolbar, aud_drct_pl_prev, "media-skip-backward");
- toolbar_button_add (toolbar, aud_drct_pl_next, "media-skip-forward");
+ button_prev = toolbar_button_add (toolbar, aud_drct_pl_prev, "media-skip-backward", _("Previous"));
+ button_play = toolbar_button_add (toolbar, aud_drct_play_pause, "media-playback-start", _("Play"));
+ button_stop = toolbar_button_add (toolbar, aud_drct_stop, "media-playback-stop", _("Stop"));
+ button_next = toolbar_button_add (toolbar, aud_drct_pl_next, "media-skip-forward", _("Next"));
+
+ button_record = toggle_button_new ("media-record", _("Record Stream"),
+ toggle_record, aud_get_bool ("record"));
+ gtk_widget_set_no_show_all ((GtkWidget *) button_record, true);
+ gtk_widget_set_visible ((GtkWidget *) button_record, aud_drct_get_record_enabled ());
+ gtk_toolbar_insert ((GtkToolbar *) toolbar, button_record, -1);
+
+ gtk_toolbar_insert ((GtkToolbar *) toolbar, gtk_separator_tool_item_new (), -1);
 
 /* time slider and label */
 GtkToolItem * boxitem1 = gtk_tool_item_new ();
 gtk_tool_item_set_expand (boxitem1, true);
 gtk_toolbar_insert ((GtkToolbar *) toolbar, boxitem1, -1);
 
- GtkWidget * box1 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
+ GtkWidget * box1 = audgui_hbox_new (0);
 gtk_container_add ((GtkContainer *) boxitem1, box1);
 
- slider = gtk_scale_new (GTK_ORIENTATION_HORIZONTAL, nullptr);
+ slider = audgui_scale_new (GTK_ORIENTATION_HORIZONTAL, nullptr);
 gtk_scale_set_draw_value ((GtkScale *) slider, false);
- gtk_widget_set_size_request (slider, 120, -1);
- gtk_widget_set_valign (slider, GTK_ALIGN_CENTER);
+ gtk_widget_set_size_request (slider, audgui_get_dpi () * 5 / 4, -1);
 gtk_widget_set_can_focus (slider, false);
 gtk_box_pack_start ((GtkBox *) box1, slider, true, true, 6);
 
@@ -847,24 +913,35 @@
 gtk_widget_set_no_show_all (slider, true);
 gtk_widget_set_no_show_all (label_time, true);
 
+ gtk_toolbar_insert ((GtkToolbar *) toolbar, gtk_separator_tool_item_new (), -1);
+
 /* repeat and shuffle buttons */
- button_repeat = toggle_button_new ("media-playlist-repeat", toggle_repeat);
+ button_repeat = toggle_button_new ("media-playlist-repeat", _("Repeat"),
+ toggle_repeat, aud_get_bool ("repeat"));
 gtk_toolbar_insert ((GtkToolbar *) toolbar, button_repeat, -1);
- button_shuffle = toggle_button_new ("media-playlist-shuffle", toggle_shuffle);
+ button_shuffle = toggle_button_new ("media-playlist-shuffle", _("Shuffle"),
+ toggle_shuffle, aud_get_bool ("shuffle"));
 gtk_toolbar_insert ((GtkToolbar *) toolbar, button_shuffle, -1);
 
 /* volume button */
 GtkToolItem * boxitem2 = gtk_tool_item_new ();
 gtk_toolbar_insert ((GtkToolbar *) toolbar, boxitem2, -1);
 
- GtkWidget * box2 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
+ GtkWidget * box2 = audgui_hbox_new (0);
 gtk_container_add ((GtkContainer *) boxitem2, box2);
 
 volume = gtk_volume_button_new ();
- g_object_set ((GObject *) volume, "size", GTK_ICON_SIZE_LARGE_TOOLBAR, nullptr);
+ GtkIconSize icon_size = gtk_tool_shell_get_icon_size ((GtkToolShell *) toolbar);
+#ifdef USE_GTK3
+ g_object_set ((GObject *) volume, "size", icon_size,
+ "use-symbolic", aud_get_bool ("gtkui", "symbolic_icons"), nullptr);
+#else
+ g_object_set ((GObject *) volume, "size", icon_size, nullptr);
+#endif
 gtk_button_set_relief ((GtkButton *) volume, GTK_RELIEF_NONE);
+ int delta = aud_get_int ("volume_delta");
 gtk_scale_button_set_adjustment ((GtkScaleButton *) volume,
- (GtkAdjustment *) gtk_adjustment_new (0, 0, 100, 1, 5, 0));
+ (GtkAdjustment *) gtk_adjustment_new (0, 0, 100, delta, delta, 0));
 gtk_widget_set_can_focus (volume, false);
 
 gtk_scale_button_set_value ((GtkScaleButton *) volume, aud_drct_get_volume_main ());
@@ -877,11 +954,10 @@
 GtkWidget * layout = layout_new ();
 gtk_box_pack_start ((GtkBox *) vbox_outer, layout, true, true, 0);
 
- vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
+ vbox = audgui_vbox_new (6);
 layout_add_center (vbox);
 
- ui_playlist_notebook_new ();
- gtk_box_pack_start ((GtkBox *) vbox, (GtkWidget *) UI_PLAYLIST_NOTEBOOK, true, true, 0);
+ gtk_box_pack_start ((GtkBox *) vbox, pl_notebook_new (), true, true, 0);
 
 /* optional UI elements */
 show_hide_menu ();
@@ -892,21 +968,22 @@
 ui_hooks_associate ();
 
 AUDDBG ("playlist associate\n");
- ui_playlist_notebook_populate ();
+ pl_notebook_populate ();
 
- g_signal_connect (slider, "change-value", (GCallback) ui_slider_change_value_cb , nullptr);
+ g_signal_connect (slider, "change-value", (GCallback) ui_slider_change_value_cb, nullptr);
 g_signal_connect (slider, "button-press-event", (GCallback) ui_slider_button_press_cb, nullptr);
 g_signal_connect (slider, "button-release-event", (GCallback) ui_slider_button_release_cb, nullptr);
 
 volume_change_handler_id = g_signal_connect (volume, "value-changed", (GCallback) ui_volume_value_changed_cb, nullptr);
- g_signal_connect (volume, "pressed", (GCallback) ui_volume_pressed_cb, nullptr);
- g_signal_connect (volume, "released", (GCallback) ui_volume_released_cb, nullptr);
- update_volume_timeout_source = g_timeout_add (250, (GSourceFunc) ui_volume_slider_update, volume);
+ g_signal_connect (volume, "button-press-event", (GCallback) ui_volume_button_press_cb, nullptr);
+ g_signal_connect (volume, "button-release-event", (GCallback) ui_volume_button_release_cb, nullptr);
+
+ timer_add (TimerRate::Hz4, ui_volume_slider_update, volume);
 
- g_signal_connect (window, "map-event", (GCallback) window_mapped_cb, nullptr);
 g_signal_connect (window, "delete-event", (GCallback) window_delete, nullptr);
+ g_signal_connect (window, "window-state-event", (GCallback) window_state_cb, nullptr);
 g_signal_connect (window, "key-press-event", (GCallback) window_keypress_cb, nullptr);
- g_signal_connect (UI_PLAYLIST_NOTEBOOK, "key-press-event", (GCallback) playlist_keypress_cb, nullptr);
+ g_signal_connect (pl_notebook, "key-press-event", (GCallback) playlist_keypress_cb, nullptr);
 
 if (aud_drct_get_playing ())
 {
@@ -917,12 +994,10 @@
 else
 ui_playback_stop ();
 
- title_change_cb ();
+ title_change ();
 
 gtk_widget_show_all (vbox_outer);
 
- update_toggles (nullptr, nullptr);
-
 menu_rclick = make_menu_rclick (accel);
 menu_tab = make_menu_tab (accel);
 
@@ -941,23 +1016,9 @@
 gtk_widget_destroy (menu_rclick);
 gtk_widget_destroy (menu_tab);
 
- if (update_song_timeout_source)
- {
- g_source_remove (update_song_timeout_source);
- update_song_timeout_source = 0;
- }
-
- if (update_volume_timeout_source)
- {
- g_source_remove (update_volume_timeout_source);
- update_volume_timeout_source = 0;
- }
-
- if (delayed_title_change_source)
- {
- g_source_remove (delayed_title_change_source);
- delayed_title_change_source = 0;
- }
+ timer_remove (TimerRate::Hz4, time_counter_cb);
+ timer_remove (TimerRate::Hz4, ui_volume_slider_update);
+ delayed_title_change.stop ();
 
 ui_hooks_disassociate ();
 
@@ -970,25 +1031,42 @@
 audgui_cleanup ();
 }
 
-static void menu_position_cb (GtkMenu * menu, int * x, int * y, int * push, void * button)
+GtkWindow * get_main_window ()
 {
+ return (GtkWindow *) window;
+}
+
+#if !GTK_CHECK_VERSION(3, 22, 0)
+static void menu_position_cb (GtkMenu *, int * x, int * y, int * push, void * button)
+{
+ GtkAllocation alloc;
 int xorig, yorig, xwin, ywin;
 
+ gtk_widget_get_allocation ((GtkWidget *) button, & alloc);
 gdk_window_get_origin (gtk_widget_get_window (window), & xorig, & yorig);
 gtk_widget_translate_coordinates ((GtkWidget *) button, window, 0, 0, & xwin, & ywin);
 
 * x = xorig + xwin;
- * y = yorig + ywin + gtk_widget_get_allocated_height ((GtkWidget *) button);
+ * y = yorig + ywin + alloc.height;
 * push = true;
 }
+#endif
 
 static void menu_button_cb ()
 {
- if (gtk_toggle_tool_button_get_active ((GtkToggleToolButton *) menu_button))
- gtk_menu_popup ((GtkMenu *) menu_main, nullptr, nullptr, menu_position_cb,
- menu_button, 0, gtk_get_current_event_time ());
- else
+ if (! gtk_toggle_tool_button_get_active ((GtkToggleToolButton *) menu_button))
+ {
 gtk_widget_hide (menu_main);
+ return;
+ }
+
+#if GTK_CHECK_VERSION(3, 22, 0)
+ gtk_menu_popup_at_widget ((GtkMenu *) menu_main, (GtkWidget *) menu_button,
+ GDK_GRAVITY_SOUTH_WEST, GDK_GRAVITY_STATIC, nullptr);
+#else
+ gtk_menu_popup ((GtkMenu *) menu_main, nullptr, nullptr, menu_position_cb,
+ menu_button, 0, gtk_get_current_event_time ());
+#endif
 }
 
 static void menu_hide_cb ()
@@ -1032,7 +1110,8 @@
 if (! menu_button)
 {
 menu_button = gtk_toggle_tool_button_new ();
- gtk_tool_button_set_icon_name ((GtkToolButton *) menu_button, "audacious");
+ set_menu_button_icon ((GtkToolButton *) menu_button);
+ gtk_tool_item_set_tooltip_text (menu_button, _("Menu"));
 g_signal_connect (menu_button, "destroy", (GCallback)
 gtk_widget_destroyed, & menu_button);
 gtk_widget_show ((GtkWidget *) menu_button);
@@ -1053,6 +1132,7 @@
 gtk_box_pack_end ((GtkBox *) vbox, infoarea, false, false, 0);
 gtk_widget_show_all (infoarea);
 
+ show_hide_infoarea_art ();
 show_hide_infoarea_vis ();
 }
 
@@ -1063,6 +1143,11 @@
 }
 }
 
+void show_hide_infoarea_art ()
+{
+ ui_infoarea_show_art (aud_get_bool ("gtkui", "infoarea_show_art"));
+}
+
 void show_hide_infoarea_vis ()
 {
 /* only turn on visualization if interface is shown */
@@ -1089,16 +1174,26 @@
 }
 }
 
-void popup_menu_rclick (unsigned button, uint32_t time)
+static void popup_menu (GtkMenu * menu, const GdkEvent * event)
+{
+#if GTK_CHECK_VERSION(3, 22, 0)
+ gtk_menu_popup_at_pointer (menu, event);
+#else
+ GdkEventButton * button_event = (GdkEventButton *) event;
+ gtk_menu_popup (menu, nullptr, nullptr, nullptr, nullptr,
+ button_event->button, button_event->time);
+#endif
+}
+
+void popup_menu_rclick (const GdkEvent * event)
 {
- gtk_menu_popup ((GtkMenu *) menu_rclick, nullptr, nullptr, nullptr, nullptr, button,
- time);
+ popup_menu ((GtkMenu *) menu_rclick, event);
 }
 
-void popup_menu_tab (unsigned button, uint32_t time, int playlist)
+void popup_menu_tab (const GdkEvent * event, Playlist playlist)
 {
- menu_tab_playlist_id = aud_playlist_get_unique_id (playlist);
- gtk_menu_popup ((GtkMenu *) menu_tab, nullptr, nullptr, nullptr, nullptr, button, time);
+ menu_tab_playlist = playlist;
+ popup_menu ((GtkMenu *) menu_tab, event);
 }
 
 void activate_search_tool ()
@@ -1119,3 +1214,26 @@
 aud_plugin_enable (manager, true);
 layout_focus (manager);
 }
+
+void update_toolbar_icons ()
+{
+ if (menu_button)
+ set_menu_button_icon ((GtkToolButton *) menu_button);
+
+ set_button_icon ((GtkToolButton *) search_button, "edit-find");
+ set_button_icon ((GtkToolButton *) button_open, "document-open");
+ set_button_icon ((GtkToolButton *) button_add, "list-add");
+ set_button_icon ((GtkToolButton *) button_prev, "media-skip-backward");
+ set_button_icon ((GtkToolButton *) button_play, aud_drct_get_playing ()
+ ? "media-playback-pause" : "media-playback-start");
+ set_button_icon ((GtkToolButton *) button_stop, "media-playback-stop");
+ set_button_icon ((GtkToolButton *) button_next, "media-skip-forward");
+ set_button_icon ((GtkToolButton *) button_record, "media-record");
+ set_button_icon ((GtkToolButton *) button_repeat, "media-playlist-repeat");
+ set_button_icon ((GtkToolButton *) button_shuffle, "media-playlist-shuffle");
+
+#ifdef USE_GTK3
+ bool use_symbolic = aud_get_bool ("gtkui", "symbolic_icons");
+ g_object_set ((GObject *) volume, "use-symbolic", use_symbolic, nullptr);
+#endif
+}

audacious-plugins-3.6.2-gtk3.tar.bz2/src/gtkui/ui_infoarea.cc -> audacious-plugins-4.4.1.tar.bz2/src/gtkui/ui_infoarea.cc Changed

@@ -25,31 +25,41 @@
 #include <libaudcore/drct.h>
 #include <libaudcore/hook.h>
 #include <libaudcore/interface.h>
+#include <libaudgui/gtk-compat.h>
 #include <libaudgui/libaudgui-gtk.h>
 
 #include "ui_infoarea.h"
 
-#define SPACING 8
-#define ICON_SIZE 64
-#define HEIGHT (ICON_SIZE + 2 * SPACING)
-
 #define VIS_BANDS 12
-#define VIS_WIDTH (8 * VIS_BANDS - 2)
-#define VIS_CENTER (ICON_SIZE * 5 / 8 + SPACING)
 #define VIS_DELAY 2 /* delay before falloff in frames */
-#define VIS_FALLOFF 2 /* falloff in pixels per frame */
+#define VIS_FALLOFF 2 /* falloff in decibels per frame */
+
+int SPACING, ICON_SIZE, HEIGHT, BAND_WIDTH, BAND_SPACING, VIS_WIDTH, VIS_SCALE, VIS_CENTER;
+
+static void compute_sizes ()
+{
+ int dpi = audgui_get_dpi ();
+
+ SPACING = aud::rescale (dpi, 12, 1);
+ ICON_SIZE = 2 * aud::rescale (dpi, 3, 1); // should be divisible by 2
+ HEIGHT = ICON_SIZE + 2 * SPACING;
+ BAND_WIDTH = aud::rescale (dpi, 16, 1);
+ BAND_SPACING = aud::rescale (dpi, 48, 1);
+ VIS_WIDTH = VIS_BANDS * (BAND_WIDTH + BAND_SPACING) - BAND_SPACING + 2 * SPACING;
+ VIS_SCALE = aud::rescale (ICON_SIZE, 8, 5);
+ VIS_CENTER = VIS_SCALE + SPACING;
+}
 
 typedef struct {
 GtkWidget * box, * main;
 
 String title, artist, album;
 String last_title, last_artist, last_album;
+ AudguiPixbuf pb, last_pb;
 float alpha, last_alpha;
 
+ bool show_art;
 bool stopped;
- int fade_timeout;
-
- GdkPixbuf * pb, * last_pb;
 } UIInfoArea;
 
 class InfoAreaVis : public Visualizer
@@ -59,7 +69,7 @@
 Visualizer (Freq) {}
 
 GtkWidget * widget = nullptr;
- char barsVIS_BANDS {};
+ float barsVIS_BANDS {};
 char delayVIS_BANDS {};
 
 void clear ();
@@ -80,25 +90,8 @@
 
 for (int i = 0; i < VIS_BANDS; i ++)
 {
- int a = ceilf (xscalei);
- int b = floorf (xscalei + 1);
- float n = 0;
-
- if (b < a)
- n += freqb * (xscalei + 1 - xscalei);
- else
- {
- if (a > 0)
- n += freqa - 1 * (a - xscalei);
- for (; a < b; a ++)
- n += freqa;
- if (b < 256)
- n += freqb * (xscalei + 1 - b);
- }
-
 /* 40 dB range */
- int x = 40 + 20 * log10f (n);
- x = aud::clamp (x, 0, 40);
+ float x = 40 + compute_freq_band (freq, xscale, i, VIS_BANDS);
 
 barsi -= aud::max (0, VIS_FALLOFF - delayi);
 
@@ -132,12 +125,11 @@
 GtkAllocation alloc;
 gtk_widget_get_allocation (widget, & alloc);
 
- cairo_pattern_t * gradient = cairo_pattern_create_linear (0, 0, 0, alloc.height);
- cairo_pattern_add_color_stop_rgb (gradient, 0, 0.25, 0.25, 0.25);
- cairo_pattern_add_color_stop_rgb (gradient, 0.5, 0.15, 0.15, 0.15);
- cairo_pattern_add_color_stop_rgb (gradient, 0.5, 0.1, 0.1, 0.1);
- cairo_pattern_add_color_stop_rgb (gradient, 1, 0, 0, 0);
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
+ auto & c = (gtk_widget_get_style (widget))->baseGTK_STATE_NORMAL;
+G_GNUC_END_IGNORE_DEPRECATIONS
 
+ cairo_pattern_t * gradient = audgui_dark_bg_gradient (c, alloc.height);
 cairo_set_source (cr, gradient);
 cairo_rectangle (cr, 0, 0, alloc.width, alloc.height);
 cairo_fill (cr);
@@ -167,129 +159,42 @@
 
 /****************************************************************************/
 
-static void rgb_to_hsv (float r, float g, float b, float * h, float * s,
- float * v)
-{
- float max, min;
-
- max = r;
- if (g > max)
- max = g;
- if (b > max)
- max = b;
-
- min = r;
- if (g < min)
- min = g;
- if (b < min)
- min = b;
-
- * v = max;
-
- if (max == min)
- {
- * h = 0;
- * s = 0;
- return;
- }
-
- if (r == max)
- * h = 1 + (g - b) / (max - min);
- else if (g == max)
- * h = 3 + (b - r) / (max - min);
- else
- * h = 5 + (r - g) / (max - min);
-
- * s = (max - min) / max;
-}
-
-static void hsv_to_rgb (float h, float s, float v, float * r, float * g,
- float * b)
+#ifdef USE_GTK3
+static gboolean draw_vis_cb (GtkWidget * widget, cairo_t * cr)
 {
- for (; h >= 2; h -= 2)
- {
- float * p = r;
- r = g;
- g = b;
- b = p;
- }
-
- if (h < 1)
- {
- * r = 1;
- * g = 0;
- * b = 1 - h;
- }
- else
- {
- * r = 1;
- * g = h - 1;
- * b = 0;
- }
-
- * r = v * (1 - s * (1 - * r));
- * g = v * (1 - s * (1 - * g));
- * b = v * (1 - s * (1 - * b));
-}
-
-static void get_color (int i, float * r, float * g, float * b)
+#else
+static gboolean draw_vis_cb (GtkWidget * widget, GdkEventExpose * event)
 {
- static GdkRGBA c;
- static gboolean valid = FALSE;
-
- if (! valid)
- {
- /* we want a color that matches the current theme
- * selected color of a GtkEntry should be reasonable */
- GtkStyleContext * style = gtk_style_context_new ();
- GtkWidgetPath * path = gtk_widget_path_new ();
- gtk_widget_path_append_type (path, GTK_TYPE_ENTRY);
- gtk_style_context_set_path (style, path);
- gtk_widget_path_free (path);
- gtk_style_context_add_class (style, "entry");
- gtk_style_context_get_background_color (style,
- (GtkStateFlags) (GTK_STATE_FLAG_FOCUSED | GTK_STATE_FLAG_SELECTED), & c);
- g_object_unref (style);
- valid = TRUE;
- }
-
- float h, s, v;
- rgb_to_hsv (c.red, c.green, c.blue, & h, & s, & v);
+ cairo_t * cr = gdk_cairo_create (gtk_widget_get_window (widget));
+#endif
 
- if (s < 0.1) /* monochrome theme? use blue instead */
- {
- h = 5;
- s = 0.75;
- }
-
- s = 1 - 0.9 * i / (VIS_BANDS - 1);
- v = 0.75 + 0.25 * i / (VIS_BANDS - 1);
-
- hsv_to_rgb (h, s, v, r, g, b);
-}
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
+ auto & c = (gtk_widget_get_style (widget))->baseGTK_STATE_SELECTED;
+G_GNUC_END_IGNORE_DEPRECATIONS
 
-static gboolean draw_vis_cb (GtkWidget * widget, cairo_t * cr)
-{
 clear (widget, cr);
 
 for (int i = 0; i < VIS_BANDS; i++)
 {
- int x = SPACING + 8 * i;
- int t = VIS_CENTER - vis.barsi;
- int m = aud::min (VIS_CENTER + vis.barsi, HEIGHT);
+ int x = SPACING + i * (BAND_WIDTH + BAND_SPACING);
+ int v = aud::clamp ((int) (vis.barsi * VIS_SCALE / 40), 0, VIS_SCALE);
+ int m = aud::min (VIS_CENTER + v, HEIGHT);
 
 float r, g, b;
- get_color (i, & r, & g, & b);
+ audgui_vis_bar_color (c, i, VIS_BANDS, r, g, b);
 
 cairo_set_source_rgb (cr, r, g, b);
- cairo_rectangle (cr, x, t, 6, VIS_CENTER - t);
+ cairo_rectangle (cr, x, VIS_CENTER - v, BAND_WIDTH, v);
 cairo_fill (cr);
 
 cairo_set_source_rgb (cr, r * 0.3, g * 0.3, b * 0.3);
- cairo_rectangle (cr, x, VIS_CENTER, 6, m - VIS_CENTER);
+ cairo_rectangle (cr, x, VIS_CENTER, BAND_WIDTH, m - VIS_CENTER);
 cairo_fill (cr);
 }
 
+#ifndef USE_GTK3
+ cairo_destroy (cr);
+#endif
 return true;
 }
 
@@ -299,13 +204,17 @@
 
 if (area->pb)
 {
- gdk_cairo_set_source_pixbuf (cr, area->pb, SPACING, SPACING);
+ int left = SPACING + (ICON_SIZE - area->pb.width ()) / 2;
+ int top = SPACING + (ICON_SIZE - area->pb.height ()) / 2;
+ gdk_cairo_set_source_pixbuf (cr, area->pb.get (), left, top);
 cairo_paint_with_alpha (cr, area->alpha);
 }
 
 if (area->last_pb)
 {
- gdk_cairo_set_source_pixbuf (cr, area->last_pb, SPACING, SPACING);
+ int left = SPACING + (ICON_SIZE - area->last_pb.width ()) / 2;
+ int top = SPACING + (ICON_SIZE - area->last_pb.height ()) / 2;
+ gdk_cairo_set_source_pixbuf (cr, area->last_pb.get (), left, top);
 cairo_paint_with_alpha (cr, area->last_alpha);
 }
 }
@@ -317,7 +226,9 @@
 GtkAllocation alloc;
 gtk_widget_get_allocation (area->main, & alloc);
 
- int x = ICON_SIZE + SPACING * 2;
+ int x = area->show_art ? HEIGHT : SPACING;
+ int y_offset1 = ICON_SIZE / 2;
+ int y_offset2 = ICON_SIZE * 3 / 4;
 int width = alloc.width - x;
 
 if (area->title)
@@ -327,54 +238,60 @@
 draw_text (area->main, cr, x, SPACING, width, 1, 1, 1, area->last_alpha,
 "18", area->last_title);
 if (area->artist)
- draw_text (area->main, cr, x, SPACING + ICON_SIZE / 2, width, 1, 1, 1,
+ draw_text (area->main, cr, x, SPACING + y_offset1, width, 1, 1, 1,
 area->alpha, "9", area->artist);
 if (area->last_artist)
- draw_text (area->main, cr, x, SPACING + ICON_SIZE / 2, width, 1, 1, 1,
+ draw_text (area->main, cr, x, SPACING + y_offset1, width, 1, 1, 1,
 area->last_alpha, "9", area->last_artist);
 if (area->album)
- draw_text (area->main, cr, x, SPACING + ICON_SIZE * 3 / 4, width, 0.7,
+ draw_text (area->main, cr, x, SPACING + y_offset2, width, 0.7,
 0.7, 0.7, area->alpha, "9", area->album);
 if (area->last_album)
- draw_text (area->main, cr, x, SPACING + ICON_SIZE * 3 / 4, width, 0.7,
+ draw_text (area->main, cr, x, SPACING + y_offset2, width, 0.7,
 0.7, 0.7, area->last_alpha, "9", area->last_album);
 }
 
+#ifdef USE_GTK3
 static gboolean draw_cb (GtkWidget * widget, cairo_t * cr)
 {
- g_return_val_if_fail (area, FALSE);
-
+ g_return_val_if_fail (area, false);
+#else
+static gboolean draw_cb (GtkWidget * widget, GdkEventExpose * event)
+{
+ cairo_t * cr = gdk_cairo_create (gtk_widget_get_window (widget));
+#endif
 clear (widget, cr);
 
 draw_album_art (cr);
 draw_title (cr);
 
+#ifndef USE_GTK3
+ cairo_destroy (cr);
+#endif
 return true;
 }
 
-static gboolean ui_infoarea_do_fade ()
+static void ui_infoarea_do_fade (void *)
 {
- g_return_val_if_fail (area, false);
- gboolean ret = false;
+ g_return_if_fail (area);
+ bool done = true;
 
 if (aud_drct_get_playing () && area->alpha < 1)
 {
 area->alpha += 0.1;
- ret = true;
+ done = false;
 }
 
 if (area->last_alpha > 0)
 {
 area->last_alpha -= 0.1;
- ret = true;
+ done = false;
 }
 
 gtk_widget_queue_draw (area->main);
 
- if (! ret)
- area->fade_timeout = 0;
-
- return ret;
+ if (done)
+ timer_remove (TimerRate::Hz30, ui_infoarea_do_fade);
 }
 
 static void ui_infoarea_set_title ()
@@ -401,39 +318,27 @@
 {
 g_return_if_fail (area);
 
- if (area->pb)
- g_object_unref (area->pb);
+ if (! area->show_art)
+ {
+ area->pb = AudguiPixbuf ();
+ return;
+ }
 
 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 ()
-{
- g_return_if_fail (area);
-
- if (! aud_drct_get_playing ())
- return;
-
- set_album_art ();
- gtk_widget_queue_draw (area->main);
+ audgui_pixbuf_scale_within (area->pb, ICON_SIZE);
+ else
+ area->pb = audgui_pixbuf_fallback ();
 }
 
 static void infoarea_next ()
 {
 g_return_if_fail (area);
 
- if (area->last_pb)
- g_object_unref (area->last_pb);
- area->last_pb = area->pb;
- area->pb = nullptr;
-
 area->last_title = std::move (area->title);
 area->last_artist = std::move (area->artist);
 area->last_album = std::move (area->album);
+ area->last_pb = std::move (area->pb);
 
 area->last_alpha = area->alpha;
 area->alpha = 0;
@@ -452,9 +357,7 @@
 ui_infoarea_set_title ();
 set_album_art ();
 
- if (! area->fade_timeout)
- area->fade_timeout = g_timeout_add (30, (GSourceFunc)
- ui_infoarea_do_fade, area);
+ timer_add (TimerRate::Hz30, ui_infoarea_do_fade);
 }
 
 static void ui_infoarea_playback_stop ()
@@ -464,15 +367,17 @@
 infoarea_next ();
 area->stopped = true;
 
- if (! area->fade_timeout)
- area->fade_timeout = g_timeout_add (30, (GSourceFunc)
- ui_infoarea_do_fade, area);
+ timer_add (TimerRate::Hz30, ui_infoarea_do_fade);
 }
 
-static void realize_cb (GtkWidget * widget)
+void ui_infoarea_show_art (bool show)
 {
- /* using a native window avoids redrawing parent widgets */
- gdk_window_ensure_native (gtk_widget_get_window (widget));
+ if (! area)
+ return;
+
+ area->show_art = show;
+ set_album_art ();
+ gtk_widget_queue_draw (area->main);
 }
 
 void ui_infoarea_show_vis (bool show)
@@ -487,13 +392,10 @@
 
 vis.widget = gtk_drawing_area_new ();
 
- /* note: "realize" signal must be connected before adding to box */
- g_signal_connect (vis.widget, "realize", (GCallback) realize_cb, nullptr);
-
- gtk_widget_set_size_request (vis.widget, VIS_WIDTH + 2 * SPACING, HEIGHT);
+ gtk_widget_set_size_request (vis.widget, VIS_WIDTH, HEIGHT);
 gtk_box_pack_start ((GtkBox *) area->box, vis.widget, false, false, 0);
 
- g_signal_connect (vis.widget, "draw", (GCallback) draw_vis_cb, nullptr);
+ g_signal_connect (vis.widget, AUDGUI_DRAW_SIGNAL, (GCallback) draw_vis_cb, nullptr);
 gtk_widget_show (vis.widget);
 
 aud_visualizer_add (& vis);
@@ -521,18 +423,8 @@
 hook_dissociate ("tuple change", (HookFunction) ui_infoarea_set_title);
 hook_dissociate ("playback ready", (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)
- {
- g_source_remove (area->fade_timeout);
- area->fade_timeout = 0;
- }
-
- if (area->pb)
- g_object_unref (area->pb);
- if (area->last_pb)
- g_object_unref (area->last_pb);
+ timer_remove (TimerRate::Hz30, ui_infoarea_do_fade);
 
 delete area;
 area = nullptr;
@@ -541,35 +433,31 @@
 GtkWidget * ui_infoarea_new ()
 {
 g_return_val_if_fail (! area, nullptr);
- area = new UIInfoArea ();
 
- area->box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
+ compute_sizes ();
+
+ area = new UIInfoArea ();
+ area->box = audgui_hbox_new (0);
 
 area->main = gtk_drawing_area_new ();
- gtk_widget_set_size_request (area->main, ICON_SIZE + 2 * SPACING, HEIGHT);
+ gtk_widget_set_size_request (area->main, HEIGHT, HEIGHT);
 gtk_box_pack_start ((GtkBox *) area->box, area->main, true, true, 0);
 
- g_signal_connect (area->main, "draw", (GCallback) draw_cb, nullptr);
+ g_signal_connect (area->main, AUDGUI_DRAW_SIGNAL, (GCallback) draw_cb, nullptr);
 
 hook_associate ("tuple change", (HookFunction) ui_infoarea_set_title, nullptr);
 hook_associate ("playback ready", (HookFunction) ui_infoarea_playback_start, nullptr);
 hook_associate ("playback stop", (HookFunction) ui_infoarea_playback_stop, nullptr);
- hook_associate ("current art ready", (HookFunction) album_art_ready, nullptr);
 
 g_signal_connect (area->box, "destroy", (GCallback) destroy_cb, nullptr);
 
 if (aud_drct_get_ready ())
 {
- ui_infoarea_playback_start ();
+ ui_infoarea_set_title ();
+ set_album_art ();
 
 /* skip fade-in */
 area->alpha = 1;
-
- if (area->fade_timeout)
- {
- g_source_remove (area->fade_timeout);
- area->fade_timeout = 0;
- }
 }
 
 GtkWidget * frame = gtk_frame_new (nullptr);

audacious-plugins-3.6.2-gtk3.tar.bz2/src/gtkui/ui_infoarea.h -> audacious-plugins-4.4.1.tar.bz2/src/gtkui/ui_infoarea.h Changed

audacious-plugins-3.6.2-gtk3.tar.bz2/src/gtkui/ui_playlist_notebook.cc -> audacious-plugins-4.4.1.tar.bz2/src/gtkui/ui_playlist_notebook.cc Changed

@@ -1,6 +1,6 @@
 /*
 * ui_playlist_notebook.c
- * Copyright 2010-2012 Michał Lipski and John Lindgren
+ * Copyright 2010-2017 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:
@@ -22,25 +22,37 @@
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
 
+#define AUD_GLIB_INTEGRATION
 #include <libaudcore/runtime.h>
 #include <libaudcore/playlist.h>
-#include <libaudcore/plugin.h>
 #include <libaudcore/audstrings.h>
 #include <libaudcore/hook.h>
+#include <libaudgui/gtk-compat.h>
 #include <libaudgui/list.h>
 #include <libaudgui/libaudgui.h>
 
+#include "../ui-common/menu-ops.h"
+
 #include "gtkui.h"
 #include "ui_playlist_notebook.h"
 #include "ui_playlist_widget.h"
-#include "playlist_util.h"
 
-static GtkWidget * notebook = nullptr;
-static int highlighted = -1;
+GtkWidget * pl_notebook = nullptr;
+
+static Playlist highlighted;
 
 static int switch_handler = 0;
 static int reorder_handler = 0;
 
+static GtkWidget * treeview_of (GtkWidget * page)
+ { return (GtkWidget *) g_object_get_data ((GObject *) page, "treeview"); }
+
+static GtkWidget * treeview_at_idx (int idx)
+ { return treeview_of (gtk_notebook_get_nth_page ((GtkNotebook *) pl_notebook, idx)); }
+
+static Playlist list_of (GtkWidget * widget)
+ { return aud::from_ptr<Playlist> (g_object_get_data ((GObject *) widget, "playlist")); }
+
 void apply_column_widths (GtkWidget * treeview)
 {
 /* skip righthand column since it expands with the window */
@@ -48,15 +60,18 @@
 {
 GtkTreeViewColumn * col = gtk_tree_view_get_column ((GtkTreeView *) treeview, i);
 gtk_tree_view_column_set_fixed_width (col, pw_col_widthspw_colsi);
- gtk_tree_view_column_set_expand (col, FALSE);
+
+#ifdef USE_GTK3
+ gtk_tree_view_column_set_expand (col, false);
+#endif
 }
 }
 
 static void size_allocate_cb (GtkWidget * treeview)
 {
- int current = gtk_notebook_get_current_page ((GtkNotebook *) notebook);
+ int current = gtk_notebook_get_current_page ((GtkNotebook *) pl_notebook);
 
- if (current < 0 || treeview != playlist_get_treeview (current))
+ if (current < 0 || treeview != treeview_at_idx (current))
 return;
 
 bool changed = false;
@@ -76,22 +91,16 @@
 
 if (changed)
 {
- int count = gtk_notebook_get_n_pages ((GtkNotebook *) notebook);
+ int count = gtk_notebook_get_n_pages ((GtkNotebook *) pl_notebook);
 
 for (int i = 0; i < count; i ++)
 {
 if (i != current)
- apply_column_widths (playlist_get_treeview (i));
+ apply_column_widths (treeview_at_idx (i));
 }
 }
 }
 
-static void add_button_cb (GtkButton * button)
-{
- aud_playlist_insert (-1);
- aud_playlist_set_active (aud_playlist_count () - 1);
-}
-
 static void make_add_button (GtkWidget * notebook)
 {
 GtkWidget * button = gtk_button_new ();
@@ -100,37 +109,47 @@
 ("list-add", GTK_ICON_SIZE_MENU));
 gtk_widget_set_can_focus (button, false);
 
- g_signal_connect (button, "clicked", (GCallback) add_button_cb, nullptr);
+ g_signal_connect (button, "clicked", pl_new, nullptr);
 gtk_widget_show_all (button);
 
 gtk_notebook_set_action_widget ((GtkNotebook *) notebook, button, GTK_PACK_END);
 }
 
-static void close_button_cb (GtkWidget * button, void * id)
+static void close_button_cb (GtkWidget * button, void * data)
 {
- audgui_confirm_playlist_delete (aud_playlist_by_unique_id (GPOINTER_TO_INT (id)));
+ audgui_confirm_playlist_delete (aud::from_ptr<Playlist> (data));
 }
 
-static GtkWidget * make_close_button (GtkWidget * ebox, int list)
+#ifndef USE_GTK3
+static void close_button_style_set (GtkWidget * button)
+{
+ int w, h;
+ gtk_icon_size_lookup_for_settings (gtk_widget_get_settings (button),
+ GTK_ICON_SIZE_MENU, & w, & h);
+ gtk_widget_set_size_request (button, w + 2, h + 2);
+}
+#endif
+
+static GtkWidget * make_close_button (GtkWidget * ebox, Playlist list)
 {
 GtkWidget * button = gtk_button_new ();
 GtkWidget * image = gtk_image_new_from_icon_name ("window-close", GTK_ICON_SIZE_MENU);
 gtk_button_set_image ((GtkButton *) button, image);
 gtk_button_set_relief ((GtkButton *) button, GTK_RELIEF_NONE);
- gtk_button_set_focus_on_click ((GtkButton *) button, false);
 gtk_widget_set_name (button, "gtkui-tab-close-button");
 
- g_signal_connect (button, "clicked", (GCallback) close_button_cb,
- GINT_TO_POINTER (aud_playlist_get_unique_id (list)));
+ g_signal_connect (button, "clicked", (GCallback) close_button_cb, aud::to_ptr (list));
 
+#if GTK_CHECK_VERSION(3, 20, 0)
+ gtk_widget_set_focus_on_click (button, false);
+#else
+ gtk_button_set_focus_on_click ((GtkButton *) button, false);
+#endif
+
+#ifdef USE_GTK3
 GtkCssProvider * provider = gtk_css_provider_new ();
 gtk_css_provider_load_from_data (provider,
 "#gtkui-tab-close-button {"
- " -GtkButton-default-border: 0;"
- " -GtkButton-default-outside-border: 0;"
- " -GtkButton-inner-border: 0;"
- " -GtkWidget-focus-padding: 0;"
- " -GtkWidget-focus-line-width: 0;"
 " margin: 0;"
 " padding: 0; }",
 -1, nullptr);
@@ -139,15 +158,31 @@
 GTK_STYLE_PROVIDER (provider),
 GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
 g_object_unref (provider);
+#else
+ gtk_rc_parse_string (
+ "style \"gtkui-tab-close-button-style\" {"
+ " GtkButton::default-border = {0, 0, 0, 0}"
+ " GtkButton::default-outside-border = {0, 0, 0, 0}"
+ " GtkButton::inner-border = {0, 0, 0, 0}"
+ " GtkWidget::focus-padding = 0"
+ " GtkWidget::focus-line-width = 0"
+ " xthickness = 0"
+ " ythickness = 0 }"
+ "widget \"*.gtkui-tab-close-button\" style \"gtkui-tab-close-button-style\""
+ );
+
+ g_signal_connect (button, "style-set", (GCallback) close_button_style_set, nullptr);
+#endif
 
 gtk_widget_show (button);
 
 return button;
 }
 
-GtkNotebook * ui_playlist_get_notebook ()
+void pl_notebook_grab_focus ()
 {
- return (GtkNotebook *) notebook;
+ int idx = gtk_notebook_get_current_page ((GtkNotebook *) pl_notebook);
+ gtk_widget_grab_focus (treeview_at_idx (idx));
 }
 
 static void tab_title_reset (GtkWidget * ebox)
@@ -158,12 +193,10 @@
 gtk_widget_show (label);
 }
 
-static void tab_title_save (GtkEntry * entry, void * ebox)
+static void tab_title_save (GtkEntry * entry, GtkWidget * ebox)
 {
- int id = GPOINTER_TO_INT (g_object_get_data ((GObject *) ebox, "playlist-id"));
 GtkWidget * label = (GtkWidget *) g_object_get_data ((GObject *) ebox, "label");
-
- aud_playlist_set_title (aud_playlist_by_unique_id (id), gtk_entry_get_text (entry));
+ list_of (ebox).set_title (gtk_entry_get_text (entry));
 gtk_widget_hide ((GtkWidget *) entry);
 gtk_widget_show (label);
 }
@@ -178,17 +211,16 @@
 
 static gboolean tab_button_press_cb (GtkWidget * ebox, GdkEventButton * event)
 {
- int id = GPOINTER_TO_INT (g_object_get_data ((GObject *) ebox, "playlist-id"));
- int playlist = aud_playlist_by_unique_id (id);
+ auto list = list_of (ebox);
 
 if (event->type == GDK_2BUTTON_PRESS && event->button == 1)
- aud_playlist_play (playlist);
+ list.start_playback ();
 
 if (event->type == GDK_BUTTON_PRESS && event->button == 2)
- audgui_confirm_playlist_delete (playlist);
+ audgui_confirm_playlist_delete (list);
 
 if (event->type == GDK_BUTTON_PRESS && event->button == 3)
- popup_menu_tab (event->button, event->time, playlist);
+ popup_menu_tab ((const GdkEvent *) event, list);
 
 return false;
 }
@@ -199,12 +231,12 @@
 {
 case GDK_SCROLL_UP:
 case GDK_SCROLL_LEFT:
- aud_playlist_set_active (aud_playlist_get_active () - 1);
+ pl_prev ();
 return true;
 
 case GDK_SCROLL_DOWN:
 case GDK_SCROLL_RIGHT:
- aud_playlist_set_active (aud_playlist_get_active () + 1);
+ pl_next ();
 return true;
 
 default:
@@ -219,73 +251,69 @@
 
 static void tab_changed (GtkNotebook * notebook, GtkWidget * page, unsigned page_num)
 {
- aud_playlist_set_active (page_num);
+ Playlist::by_index (page_num).activate ();
 }
 
-static void tab_reordered (GtkNotebook * notebook, GtkWidget * child, unsigned page_num)
+static void tab_reordered (GtkNotebook * notebook, GtkWidget * page, unsigned page_num)
 {
- GtkWidget * widget = (GtkWidget *) g_object_get_data ((GObject *) child, "treeview");
- g_return_if_fail (widget);
- aud_playlist_reorder (ui_playlist_widget_get_playlist (widget), page_num, 1);
+ auto list = list_of (treeview_of (page));
+ Playlist::reorder_playlists (list.index (), page_num, 1);
 }
 
-static GtkLabel * get_tab_label (int playlist)
+static GtkLabel * get_tab_label (int list_idx)
 {
- GtkWidget * page = gtk_notebook_get_nth_page (UI_PLAYLIST_NOTEBOOK, playlist);
- GtkWidget * ebox = gtk_notebook_get_tab_label (UI_PLAYLIST_NOTEBOOK, page);
+ GtkWidget * page = gtk_notebook_get_nth_page ((GtkNotebook *) pl_notebook, list_idx);
+ GtkWidget * ebox = gtk_notebook_get_tab_label ((GtkNotebook *) pl_notebook, page);
 return (GtkLabel *) g_object_get_data ((GObject *) ebox, "label");
 }
 
-static void set_tab_label (int list, GtkLabel * label)
+static void update_tab_label (GtkLabel * label, Playlist list)
 {
- String title0 = aud_playlist_get_title (list);
+ String title0 = list.get_title ();
 StringBuf title = aud_get_bool ("gtkui", "entry_count_visible") ?
- str_printf ("%s (%d)", (const char *) title0, aud_playlist_entry_count (list)) :
+ str_printf ("%s (%d)", (const char *) title0, list.n_entries ()) :
 str_copy (title0);
 
- if (list == aud_playlist_get_playing ())
+ if (list == Playlist::playing_playlist ())
 {
- char * markup = g_markup_printf_escaped ("%s", (const char *) title);
+ CharPtr markup (g_markup_printf_escaped ("%s", (const char *) title));
 gtk_label_set_markup (label, markup);
- g_free (markup);
 }
 else
 gtk_label_set_text (label, title);
 }
 
-void start_rename_playlist (int playlist)
+void start_rename_playlist (Playlist playlist)
 {
- if (! gtk_notebook_get_show_tabs ((GtkNotebook *) notebook))
+ if (! gtk_notebook_get_show_tabs ((GtkNotebook *) pl_notebook))
 {
 audgui_show_playlist_rename (playlist);
 return;
 }
 
- GtkWidget * page = gtk_notebook_get_nth_page (UI_PLAYLIST_NOTEBOOK, playlist);
- GtkWidget * ebox = gtk_notebook_get_tab_label (UI_PLAYLIST_NOTEBOOK, page);
+ GtkWidget * page = gtk_notebook_get_nth_page ((GtkNotebook *) pl_notebook, playlist.index ());
+ GtkWidget * ebox = gtk_notebook_get_tab_label ((GtkNotebook *) pl_notebook, page);
 
 GtkWidget * label = (GtkWidget *) g_object_get_data ((GObject *) ebox, "label");
 GtkWidget * entry = (GtkWidget *) g_object_get_data ((GObject *) ebox, "entry");
 gtk_widget_hide (label);
 
- gtk_entry_set_text ((GtkEntry *) entry, aud_playlist_get_title (playlist));
+ gtk_entry_set_text ((GtkEntry *) entry, playlist.get_title ());
 
 gtk_widget_grab_focus (entry);
 gtk_editable_select_region ((GtkEditable *) entry, 0, -1);
 gtk_widget_show (entry);
 }
 
-void ui_playlist_notebook_create_tab (int playlist)
+static void create_tab (int list_idx, Playlist list)
 {
- int position = aud_playlist_get_position (playlist);
-
 GtkWidget * scrollwin = gtk_scrolled_window_new (nullptr, nullptr);
 GtkAdjustment * vscroll = gtk_scrolled_window_get_vadjustment ((GtkScrolledWindow *) scrollwin);
 
 /* do not allow scroll events to propagate up to the notebook */
 g_signal_connect_after (scrollwin, "scroll-event", (GCallback) scroll_ignore_cb, nullptr);
 
- GtkWidget * treeview = ui_playlist_widget_new (playlist);
+ GtkWidget * treeview = ui_playlist_widget_new (list);
 
 apply_column_widths (treeview);
 g_signal_connect (treeview, "size-allocate", (GCallback) size_allocate_cb, nullptr);
@@ -300,10 +328,10 @@
 GtkWidget * ebox = gtk_event_box_new ();
 gtk_event_box_set_visible_window ((GtkEventBox *) ebox, false);
 
- GtkWidget * hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 2);
+ GtkWidget * hbox = audgui_hbox_new (2);
 
 GtkWidget * label = gtk_label_new ("");
- set_tab_label (playlist, (GtkLabel *) label);
+ update_tab_label ((GtkLabel *) label, list);
 gtk_box_pack_start ((GtkBox *) hbox, label, false, false, 0);
 
 GtkWidget * entry = gtk_entry_new ();
@@ -316,7 +344,7 @@
 
 if (aud_get_bool ("gtkui", "close_button_visible"))
 {
- button = make_close_button (ebox, playlist);
+ button = make_close_button (ebox, list);
 gtk_box_pack_end ((GtkBox *) hbox, button, false, false, 0);
 }
 
@@ -324,21 +352,19 @@
 g_object_set_data ((GObject *) ebox, "entry", entry);
 g_object_set_data ((GObject *) ebox, "page", scrollwin);
 
- gtk_notebook_insert_page (UI_PLAYLIST_NOTEBOOK, scrollwin, ebox, playlist);
- gtk_notebook_set_tab_reorderable (UI_PLAYLIST_NOTEBOOK, scrollwin, true);
+ gtk_notebook_insert_page ((GtkNotebook *) pl_notebook, scrollwin, ebox, list_idx);
+ gtk_notebook_set_tab_reorderable ((GtkNotebook *) pl_notebook, scrollwin, true);
 
- int id = aud_playlist_get_unique_id (playlist);
- g_object_set_data ((GObject *) ebox, "playlist-id", GINT_TO_POINTER (id));
- g_object_set_data ((GObject *) treeview, "playlist-id", GINT_TO_POINTER (id));
+ g_object_set_data ((GObject *) ebox, "playlist", aud::to_ptr (list));
+ g_object_set_data ((GObject *) treeview, "playlist", aud::to_ptr (list));
 
+ int position = list.get_position ();
 if (position >= 0)
- {
- 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);
+
+ int focus = list.get_focus ();
+ if (focus >= 0)
 audgui_list_set_focus (treeview, position);
- }
 
 g_signal_connect (ebox, "button-press-event", (GCallback) tab_button_press_cb, nullptr);
 g_signal_connect (ebox, "key-press-event", (GCallback) tab_key_press_cb, nullptr);
@@ -358,69 +384,71 @@
 }
 }
 
-void ui_playlist_notebook_populate ()
+static void switch_to_active ()
 {
- int playlist = aud_playlist_get_active ();
+ int active_idx = Playlist::active_playlist ().index ();
+ gtk_notebook_set_current_page ((GtkNotebook *) pl_notebook, active_idx);
+}
 
- for (int count = 0; count < aud_playlist_count (); count ++)
- ui_playlist_notebook_create_tab (count);
+void pl_notebook_populate ()
+{
+ int n_playlists = Playlist::n_playlists ();
+ for (int idx = 0; idx < n_playlists; idx ++)
+ create_tab (idx, Playlist::by_index (idx));
 
- gtk_notebook_set_current_page (UI_PLAYLIST_NOTEBOOK, playlist);
- highlighted = aud_playlist_get_unique_id (aud_playlist_get_playing ());
+ switch_to_active ();
+ highlighted = Playlist::playing_playlist ();
 
 if (! switch_handler)
- switch_handler = g_signal_connect (notebook, "switch-page", (GCallback)
- tab_changed, nullptr);
+ switch_handler = g_signal_connect (pl_notebook, "switch-page",
+ (GCallback) tab_changed, nullptr);
 if (! reorder_handler)
- reorder_handler = g_signal_connect (notebook, "page-reordered",
+ reorder_handler = g_signal_connect (pl_notebook, "page-reordered",
 (GCallback) tab_reordered, nullptr);
 
- gtk_widget_grab_focus (playlist_get_treeview (playlist));
+ pl_notebook_grab_focus ();
 }
 
-void ui_playlist_notebook_empty ()
+void pl_notebook_purge ()
 {
 if (switch_handler)
- g_signal_handler_disconnect (notebook, switch_handler);
+ g_signal_handler_disconnect (pl_notebook, switch_handler);
 switch_handler = 0;
 if (reorder_handler)
- g_signal_handler_disconnect (notebook, reorder_handler);
+ g_signal_handler_disconnect (pl_notebook, reorder_handler);
 reorder_handler = 0;
 
- int n_pages = gtk_notebook_get_n_pages ((GtkNotebook *) notebook);
+ int n_pages = gtk_notebook_get_n_pages ((GtkNotebook *) pl_notebook);
 while (n_pages)
- gtk_notebook_remove_page ((GtkNotebook *) notebook, -- n_pages);
+ gtk_notebook_remove_page ((GtkNotebook *) pl_notebook, -- n_pages);
 }
 
 static void add_remove_pages ()
 {
- g_signal_handlers_block_by_func (notebook, (void *) tab_changed, nullptr);
- g_signal_handlers_block_by_func (notebook, (void *) tab_reordered, nullptr);
+ g_signal_handlers_block_by_func (pl_notebook, (void *) tab_changed, nullptr);
+ g_signal_handlers_block_by_func (pl_notebook, (void *) tab_reordered, nullptr);
 
- int lists = aud_playlist_count ();
- int pages = gtk_notebook_get_n_pages ((GtkNotebook *) notebook);
+ int lists = Playlist::n_playlists ();
+ int pages = gtk_notebook_get_n_pages ((GtkNotebook *) pl_notebook);
 
 /* scan through existing treeviews */
 for (int i = 0; i < pages; )
 {
- GtkWidget * page = gtk_notebook_get_nth_page ((GtkNotebook *) notebook, i);
- GtkWidget * tree = (GtkWidget *) g_object_get_data ((GObject *) page, "treeview");
- int tree_id = GPOINTER_TO_INT (g_object_get_data ((GObject *) tree, "playlist-id"));
+ auto list0 = list_of (treeview_at_idx (i));
 
 /* do we have an orphaned treeview? */
- if (aud_playlist_by_unique_id (tree_id) < 0)
+ if (! list0.exists ())
 {
- gtk_notebook_remove_page ((GtkNotebook *) notebook, i);
+ gtk_notebook_remove_page ((GtkNotebook *) pl_notebook, i);
 pages --;
 continue;
 }
 
 /* do we have the right treeview? */
- int list_id = aud_playlist_get_unique_id (i);
+ auto list = Playlist::by_index (i);
 
- if (tree_id == list_id)
+ if (list0 == list)
 {
- ui_playlist_widget_set_playlist (tree, i);
 i ++;
 continue;
 }
@@ -430,14 +458,13 @@
 
 for (int j = i + 1; j < pages; j ++)
 {
- page = gtk_notebook_get_nth_page ((GtkNotebook *) notebook, j);
- tree = (GtkWidget *) g_object_get_data ((GObject *) page, "treeview");
- tree_id = GPOINTER_TO_INT (g_object_get_data ((GObject *) tree, "playlist-id"));
+ GtkWidget * page = gtk_notebook_get_nth_page ((GtkNotebook *) pl_notebook, j);
+ auto list2 = list_of (treeview_of (page));
 
 /* found it? move it to the right place */
- if (tree_id == list_id)
+ if (list2 == list)
 {
- gtk_notebook_reorder_child ((GtkNotebook *) notebook, page, i);
+ gtk_notebook_reorder_child ((GtkNotebook *) pl_notebook, page, i);
 found = true;
 break;
 }
@@ -446,7 +473,7 @@
 /* didn't find it? create it */
 if (! found)
 {
- ui_playlist_notebook_create_tab (i);
+ create_tab (i, list);
 pages ++;
 continue;
 }
@@ -455,115 +482,108 @@
 /* create new treeviews */
 while (pages < lists)
 {
- ui_playlist_notebook_create_tab (pages);
+ create_tab (pages, Playlist::by_index (pages));
 pages ++;
 }
 
- gtk_notebook_set_current_page ((GtkNotebook *) notebook, aud_playlist_get_active ());
-
+ switch_to_active ();
 show_hide_playlist_tabs ();
 
- g_signal_handlers_unblock_by_func (notebook, (void *) tab_changed, nullptr);
- g_signal_handlers_unblock_by_func (notebook, (void *) tab_reordered, nullptr);
+ g_signal_handlers_unblock_by_func (pl_notebook, (void *) tab_changed, nullptr);
+ g_signal_handlers_unblock_by_func (pl_notebook, (void *) tab_reordered, nullptr);
 }
 
-void ui_playlist_notebook_update (void * data, void * user)
+void pl_notebook_update (void * data, void * user)
 {
 auto global_level = aud::from_ptr<Playlist::UpdateLevel> (data);
 if (global_level == Playlist::Structure)
 add_remove_pages ();
 
- int lists = aud_playlist_count ();
+ int n_pages = gtk_notebook_get_n_pages ((GtkNotebook *) pl_notebook);
 
- for (int list = 0; list < lists; list ++)
+ for (int i = 0; i < n_pages; i ++)
 {
- if (global_level >= Playlist::Metadata)
- set_tab_label (list, get_tab_label (list));
+ GtkWidget * treeview = treeview_at_idx (i);
 
- GtkWidget * treeview = playlist_get_treeview (list);
-
- auto update = aud_playlist_update_detail (list);
- if (update.level)
- ui_playlist_widget_update (treeview, update);
+ if (global_level >= Playlist::Metadata)
+ update_tab_label (get_tab_label (i), list_of (treeview));
 
- audgui_list_set_highlight (treeview, aud_playlist_get_position (list));
+ ui_playlist_widget_update (treeview);
 }
 
- gtk_notebook_set_current_page ((GtkNotebook *) notebook, aud_playlist_get_active ());
+ switch_to_active ();
 }
 
-void ui_playlist_notebook_position (void * data, void * user)
+void pl_notebook_set_position (void * data, void * user)
 {
- int list = aud::from_ptr<int> (data);
- int row = aud_playlist_get_position (list);
+ auto list = aud::from_ptr<Playlist> (data);
+ int row = list.get_position ();
 
 if (aud_get_bool ("gtkui", "autoscroll"))
 {
- aud_playlist_select_all (list, false);
- aud_playlist_entry_set_selected (list, row, true);
- aud_playlist_set_focus (list, row);
+ list.select_all (false);
+ list.select_entry (row, true);
+ list.set_focus (row);
 }
 
- if (! aud_playlist_update_pending ())
- audgui_list_set_highlight (playlist_get_treeview (list), row);
+ audgui_list_set_highlight (treeview_at_idx (list.index ()), row);
 }
 
-void ui_playlist_notebook_activate (void * data, void * user)
+void pl_notebook_activate (void * data, void * user)
 {
- if (! aud_playlist_update_pending ())
- gtk_notebook_set_current_page ((GtkNotebook *) notebook, aud_playlist_get_active ());
+ switch_to_active ();
 }
 
-void ui_playlist_notebook_set_playing (void * data, void * user)
+void pl_notebook_set_playing (void * data, void * user)
 {
- int id = aud_playlist_get_unique_id (aud_playlist_get_playing ());
+ auto playing = Playlist::playing_playlist ();
 
 // if the previous playing playlist was deleted, ignore it
- if (aud_playlist_by_unique_id (highlighted) < 0)
- highlighted = -1;
+ if (! highlighted.exists ())
+ highlighted = Playlist ();
 
- if (highlighted == id)
+ if (highlighted == playing)
 return;
 
- int pages = gtk_notebook_get_n_pages ((GtkNotebook *) notebook);
+ int pages = gtk_notebook_get_n_pages ((GtkNotebook *) pl_notebook);
 
 for (int i = 0; i < pages; i ++)
 {
- GtkWidget * page = gtk_notebook_get_nth_page ((GtkNotebook *) notebook, i);
- GtkWidget * tree = (GtkWidget *) g_object_get_data ((GObject *) page, "treeview");
- int tree_id = GPOINTER_TO_INT (g_object_get_data ((GObject *) tree, "playlist-id"));
-
- if (tree_id == highlighted || tree_id == id)
- set_tab_label (i, get_tab_label (i));
+ auto list = list_of (treeview_at_idx (i));
+ if (list == highlighted || list == playing)
+ update_tab_label (get_tab_label (i), list);
 }
 
- highlighted = id;
+ highlighted = playing;
 }
 
 static void destroy_cb ()
 {
- notebook = nullptr;
+ pl_notebook = nullptr;
 switch_handler = 0;
 reorder_handler = 0;
 }
 
-GtkWidget * ui_playlist_notebook_new ()
+GtkWidget * pl_notebook_new ()
 {
- notebook = gtk_notebook_new ();
- gtk_notebook_set_scrollable ((GtkNotebook *) notebook, true);
- make_add_button (notebook);
+ pl_notebook = gtk_notebook_new ();
+ gtk_notebook_set_scrollable ((GtkNotebook *) pl_notebook, true);
+ make_add_button (pl_notebook);
 
 show_hide_playlist_tabs ();
 
- gtk_widget_add_events (notebook, GDK_SCROLL_MASK);
- g_signal_connect (notebook, "scroll-event", (GCallback) scroll_cb, nullptr);
- g_signal_connect (notebook, "destroy", (GCallback) destroy_cb, nullptr);
+ gtk_widget_add_events (pl_notebook, GDK_SCROLL_MASK);
+ g_signal_connect (pl_notebook, "scroll-event", (GCallback) scroll_cb, nullptr);
+ g_signal_connect (pl_notebook, "destroy", (GCallback) destroy_cb, nullptr);
 
- return notebook;
+ return pl_notebook;
 }
 
 void show_hide_playlist_tabs ()
 {
- gtk_notebook_set_show_tabs ((GtkNotebook *) notebook, aud_get_bool ("gtkui",
- "playlist_tabs_visible") || aud_playlist_count () > 1);
+ int playlist_tabs_visible = aud_get_int ("gtkui", "playlist_tabs_visible");
+ bool show_tabs = playlist_tabs_visible != PlaylistTabVisibility::Never &&
+ (playlist_tabs_visible != PlaylistTabVisibility::AutoHide ||
+ Playlist::n_playlists () > 1);
+ gtk_notebook_set_show_tabs ((GtkNotebook *) pl_notebook, show_tabs);
 }

audacious-plugins-3.6.2-gtk3.tar.bz2/src/gtkui/ui_playlist_notebook.h -> audacious-plugins-4.4.1.tar.bz2/src/gtkui/ui_playlist_notebook.h Changed

@@ -22,20 +22,28 @@
 
 #include <gtk/gtk.h>
 
-#define UI_PLAYLIST_NOTEBOOK ui_playlist_get_notebook ()
+class Playlist;
 
-GtkNotebook * ui_playlist_get_notebook ();
-GtkWidget * ui_playlist_notebook_new ();
+enum PlaylistTabVisibility {
+ Always,
+ AutoHide,
+ Never
+};
 
-void ui_playlist_notebook_create_tab (int playlist);
-void ui_playlist_notebook_populate ();
-void ui_playlist_notebook_empty ();
-void ui_playlist_notebook_update (void * data, void * user);
-void ui_playlist_notebook_activate (void * data, void * user);
-void ui_playlist_notebook_set_playing (void * data, void * user);
-void ui_playlist_notebook_position (void * data, void * user);
+extern GtkWidget * pl_notebook;
 
-void start_rename_playlist (int playlist);
+GtkWidget * pl_notebook_new ();
+
+void pl_notebook_grab_focus ();
+void pl_notebook_populate ();
+void pl_notebook_purge ();
+
+void pl_notebook_update (void * data, void * user);
+void pl_notebook_activate (void * data, void * user);
+void pl_notebook_set_playing (void * data, void * user);
+void pl_notebook_set_position (void * data, void * user);
+
+void start_rename_playlist (Playlist playlist);
 void show_hide_playlist_tabs ();
 
 #endif

audacious-plugins-3.6.2-gtk3.tar.bz2/src/gtkui/ui_playlist_widget.cc -> audacious-plugins-4.4.1.tar.bz2/src/gtkui/ui_playlist_widget.cc Changed

@@ -23,6 +23,7 @@
 
 #include <libaudcore/audstrings.h>
 #include <libaudcore/i18n.h>
+#include <libaudcore/mainloop.h>
 #include <libaudcore/playlist.h>
 #include <libaudcore/runtime.h>
 #include <libaudcore/tuple.h>
@@ -31,7 +32,6 @@
 #include <libaudgui/list.h>
 
 #include "gtkui.h"
-#include "playlist_util.h"
 #include "ui_playlist_widget.h"
 
 static const GType pw_col_typesPW_COLS =
@@ -49,7 +49,11 @@
 G_TYPE_STRING, // path
 G_TYPE_STRING, // file name
 G_TYPE_STRING, // custom title
- G_TYPE_STRING // bitrate
+ G_TYPE_STRING, // bitrate
+ G_TYPE_STRING, // comment
+ G_TYPE_STRING, // publisher
+ G_TYPE_STRING, // catalog number
+ G_TYPE_STRING // disc
 };
 
 static const int pw_col_min_widthsPW_COLS = {
@@ -66,7 +70,11 @@
 10, // path
 10, // file name
 10, // custom title
- 3 // bitrate
+ 3, // bitrate
+ 10, // comment,
+ 10, // publisher
+ 3, // catalog number
+ 2 // disc
 };
 
 static const bool pw_col_labelPW_COLS = {
@@ -83,18 +91,50 @@
 true, // path
 true, // file name
 true, // custom title
- false // bitrate
+ false, // bitrate
+ true, // comment
+ true, // publisher
+ false, // catalog number
+ false // disc
 };
 
-typedef struct {
- int list;
- int popup_source, popup_pos;
- bool popup_shown;
-} PlaylistWidgetData;
+static const Playlist::SortType pw_col_sort_typesPW_COLS = {
+ Playlist::n_sort_types, // entry number
+ Playlist::Title, // title
+ Playlist::Artist, // artist
+ Playlist::Date, // year
+ Playlist::Album, // album
+ Playlist::AlbumArtist, // album artist
+ Playlist::Track, // track
+ Playlist::Genre, // genre
+ Playlist::n_sort_types, // queue position
+ Playlist::Length, // length
+ Playlist::Path, // path
+ Playlist::Filename, // file name
+ Playlist::FormattedTitle, // custom title
+ Playlist::n_sort_types, // bitrate
+ Playlist::Comment, // comment
+ Playlist::Publisher, // publisher
+ Playlist::CatalogNum, // catalog number
+ Playlist::Disc // disc
+};
+
+struct PlaylistWidgetData
+{
+ Playlist list;
+ int popup_pos = -1;
+ QueuedFunc popup_timer;
+
+ void show_popup ()
+ {
+ GtkWindow * parent = get_main_window ();
+ audgui_infopopup_show (parent, list, popup_pos);
+ }
+};
 
 static void set_int_from_tuple (GValue * value, const Tuple & tuple, Tuple::Field field)
 {
- int i = tuple ? tuple.get_int (field) : 0;
+ int i = tuple.get_int (field);
 if (i > 0)
 g_value_take_string (value, g_strdup_printf ("%d", i));
 else
@@ -103,13 +143,12 @@
 
 static void set_string_from_tuple (GValue * value, const Tuple & tuple, Tuple::Field field)
 {
- String str = tuple ? tuple.get_str (field) : String ();
- g_value_set_string (value, str);
+ g_value_set_string (value, tuple.get_str (field));
 }
 
-static void set_queued (GValue * value, int list, int row)
+static void set_queued (GValue * value, Playlist list, int row)
 {
- int q = aud_playlist_queue_find_entry (list, row);
+ int q = list.queue_find_entry (row);
 if (q < 0)
 g_value_set_string (value, "");
 else
@@ -129,29 +168,14 @@
 {
 PlaylistWidgetData * data = (PlaylistWidgetData *) user;
 g_return_if_fail (column >= 0 && column < pw_num_cols);
- g_return_if_fail (row >= 0 && row < aud_playlist_entry_count (data->list));
+ g_return_if_fail (row >= 0 && row < data->list.n_entries ());
 
 column = pw_colscolumn;
 
 Tuple tuple;
 
- switch (column)
- {
- case PW_COL_TITLE:
- case PW_COL_ARTIST:
- case PW_COL_ALBUM:
- case PW_COL_YEAR:
- case PW_COL_ALBUM_ARTIST:
- case PW_COL_TRACK:
- case PW_COL_GENRE:
- case PW_COL_LENGTH:
- case PW_COL_FILENAME:
- case PW_COL_PATH:
- case PW_COL_CUSTOM:
- case PW_COL_BITRATE:
- tuple = aud_playlist_entry_get_tuple (data->list, row, Playlist::Guess);
- break;
- }
+ if (column != PW_COL_NUMBER && column != PW_COL_QUEUED)
+ tuple = data->list.entry_tuple (row, Playlist::NoWait);
 
 switch (column)
 {
@@ -197,91 +221,82 @@
 case PW_COL_BITRATE:
 set_int_from_tuple (value, tuple, Tuple::Bitrate);
 break;
+ case PW_COL_COMMENT:
+ set_string_from_tuple (value, tuple, Tuple::Comment);
+ break;
+ case PW_COL_PUBLISHER:
+ set_string_from_tuple (value, tuple, Tuple::Publisher);
+ break;
+ case PW_COL_CATALOG_NUM:
+ set_string_from_tuple (value, tuple, Tuple::CatalogNum);
+ break;
+ case PW_COL_DISC:
+ set_int_from_tuple (value, tuple, Tuple::Disc);
+ break;
 }
 }
 
 static bool get_selected (void * user, int row)
 {
- return aud_playlist_entry_get_selected (((PlaylistWidgetData *) user)->list,
- row);
+ return ((PlaylistWidgetData *) user)->list.entry_selected (row);
 }
 
 static void set_selected (void * user, int row, bool selected)
 {
- aud_playlist_entry_set_selected (((PlaylistWidgetData *) user)->list, row,
- selected);
+ ((PlaylistWidgetData *) user)->list.select_entry (row, selected);
 }
 
 static void select_all (void * user, bool selected)
 {
- aud_playlist_select_all (((PlaylistWidgetData *) user)->list, selected);
+ ((PlaylistWidgetData *) user)->list.select_all (selected);
 }
 
 static void focus_change (void * user, int row)
 {
- aud_playlist_set_focus (((PlaylistWidgetData *) user)->list, row);
+ ((PlaylistWidgetData *) user)->list.set_focus (row);
 }
 
 static void activate_row (void * user, int row)
 {
- int list = ((PlaylistWidgetData *) user)->list;
- aud_playlist_set_position (list, row);
- aud_playlist_play (list);
+ auto list = ((PlaylistWidgetData *) user)->list;
+ list.set_position (row);
+ list.start_playback ();
 }
 
 static void right_click (void * user, GdkEventButton * event)
 {
- popup_menu_rclick (event->button, event->time);
+ popup_menu_rclick ((const GdkEvent *) event);
 }
 
 static void shift_rows (void * user, int row, int before)
 {
- int list = ((PlaylistWidgetData *) user)->list;
+ auto list = ((PlaylistWidgetData *) user)->list;
 
 /* Adjust the shift amount so that the selected entry closest to the
 * destination ends up at the destination. */
 if (before > row)
- before -= playlist_count_selected_in_range (list, row, before - row);
+ before -= list.n_selected (row, before - row);
 else
- before += playlist_count_selected_in_range (list, before, row - before);
+ before += list.n_selected (before, row - before);
 
- aud_playlist_shift (list, row, before - row);
-}
-
-static gboolean popup_show (PlaylistWidgetData * data)
-{
- audgui_infopopup_show (data->list, data->popup_pos);
- data->popup_shown = true;
-
- g_source_remove (data->popup_source);
- data->popup_source = 0;
- return false;
+ list.shift_entries (row, before - row);
 }
 
 static void popup_hide (PlaylistWidgetData * data)
 {
- if (data->popup_source)
- {
- g_source_remove (data->popup_source);
- data->popup_source = 0;
- }
-
- if (data->popup_shown)
- {
- audgui_infopopup_hide ();
- data->popup_shown = false;
- }
+ audgui_infopopup_hide ();
 
 data->popup_pos = -1;
+ data->popup_timer.stop ();
 }
 
 static void popup_trigger (PlaylistWidgetData * data, int pos)
 {
- popup_hide (data);
+ audgui_infopopup_hide ();
 
 data->popup_pos = pos;
- data->popup_source = g_timeout_add (aud_get_int (nullptr, "filepopup_delay") *
- 100, (GSourceFunc) popup_show, data);
+ data->popup_timer.queue (aud_get_int ("filepopup_delay") * 100,
+ data () { data->show_popup (); });
 }
 
 static void mouse_motion (void * user, GdkEventMotion * event, int row)
@@ -294,7 +309,7 @@
 return;
 }
 
- if (aud_get_bool (nullptr, "show_filepopup_for_tuple") && data->popup_pos != row)
+ if (aud_get_bool ("show_filepopup_for_tuple") && data->popup_pos != row)
 popup_trigger (data, row);
 }
 
@@ -305,14 +320,15 @@
 
 static Index<char> get_data (void * user)
 {
- int playlist = ((PlaylistWidgetData *) user)->list;
+ auto playlist = ((PlaylistWidgetData *) user)->list;
 return audgui_urilist_create_from_selected (playlist);
 }
 
-static void receive_data (void * user, int row, const char * data, int length)
+// length is ignored; GtkSelectionData null-terminates the data for us
+static void receive_data (void * user, int row, const char * data, int /*length*/)
 {
- int playlist = ((PlaylistWidgetData *) user)->list;
- audgui_urilist_insert (playlist, row, str_copy (data, length));
+ auto playlist = ((PlaylistWidgetData *) user)->list;
+ audgui_urilist_insert (playlist, row, data);
 }
 
 static const AudguiListCallbacks callbacks = {
@@ -346,8 +362,8 @@
 
 if (keys.len ())
 {
- int list = ((PlaylistWidgetData *) user)->list;
- Tuple tuple = aud_playlist_entry_get_tuple (list, row);
+ auto list = ((PlaylistWidgetData *) user)->list;
+ Tuple tuple = list.entry_tuple (row);
 
 String strings3 = {
 tuple.get_str (Tuple::Title),
@@ -377,16 +393,21 @@
 delete data;
 }
 
-GtkWidget * ui_playlist_widget_new (int playlist)
+static void column_clicked_cb (GtkTreeViewColumn * column, PlaylistWidgetData * data)
+{
+ auto sort_type_ptr = g_object_get_data ((GObject *) column, "playlist-sort-type");
+ auto sort_type = aud::from_ptr<Playlist::SortType> (sort_type_ptr);
+
+ data->list.sort_entries (sort_type);
+}
+
+GtkWidget * ui_playlist_widget_new (Playlist playlist)
 {
 PlaylistWidgetData * data = new PlaylistWidgetData;
 data->list = playlist;
- data->popup_source = 0;
- data->popup_pos = -1;
- data->popup_shown = false;
 
 GtkWidget * list = audgui_list_new (& callbacks, data,
- aud_playlist_entry_count (playlist));
+ playlist.n_entries ());
 
 gtk_tree_view_set_headers_visible ((GtkTreeView *) list,
 aud_get_bool ("gtkui", "playlist_headers"));
@@ -404,31 +425,33 @@
 int n = pw_colsi;
 audgui_list_add_column (list, pw_col_labeln ? _(pw_col_namesn) :
 nullptr, i, pw_col_typesn, pw_col_min_widthsn);
+
+ if (aud_get_bool ("gtkui", "playlist_headers_sortable") &&
+ pw_col_sort_typesn < Playlist::n_sort_types)
+ {
+ auto column = gtk_tree_view_get_column ((GtkTreeView *) list, i);
+ auto sort_type_ptr = aud::to_ptr (pw_col_sort_typesn);
+
+ gtk_tree_view_column_set_clickable (column, true);
+ g_object_set_data ((GObject *) column, "playlist-sort-type", sort_type_ptr);
+ g_signal_connect (column, "clicked", (GCallback) column_clicked_cb, data);
+ }
 }
 
 return list;
 }
 
-int ui_playlist_widget_get_playlist (GtkWidget * widget)
-{
- PlaylistWidgetData * data = (PlaylistWidgetData *) audgui_list_get_user (widget);
- g_return_val_if_fail (data, -1);
- return data->list;
-}
-
-void ui_playlist_widget_set_playlist (GtkWidget * widget, int list)
+void ui_playlist_widget_update (GtkWidget * widget)
 {
 PlaylistWidgetData * data = (PlaylistWidgetData *) audgui_list_get_user (widget);
 g_return_if_fail (data);
- data->list = list;
-}
 
-void ui_playlist_widget_update (GtkWidget * widget, const Playlist::Update & update)
-{
- PlaylistWidgetData * data = (PlaylistWidgetData *) audgui_list_get_user (widget);
- g_return_if_fail (data);
+ auto update = data->list.update_detail ();
+
+ if (update.level == Playlist::NoUpdate)
+ return;
 
- int entries = aud_playlist_entry_count (data->list);
+ int entries = data->list.n_entries ();
 int changed = entries - update.before - update.after;
 
 if (update.level == Playlist::Structure)
@@ -441,9 +464,8 @@
 
 /* scroll to end of playlist if entries were added there
 (but not if a newly added entry is playing) */
- if (entries > old_entries && ! update.after &&
- aud_playlist_get_focus (data->list) < old_entries)
- aud_playlist_set_focus (data->list, entries - 1);
+ if (entries > old_entries && ! update.after && data->list.get_focus () < old_entries)
+ data->list.set_focus (entries - 1);
 
 ui_playlist_widget_scroll (widget);
 }
@@ -452,16 +474,17 @@
 
 if (update.queue_changed)
 {
- for (int i = aud_playlist_queue_count (data->list); i --; )
+ for (int i = data->list.n_queued (); i --; )
 {
- int entry = aud_playlist_queue_get_entry (data->list, i);
+ int entry = data->list.queue_get_entry (i);
 if (entry < update.before || entry >= entries - update.after)
 audgui_list_update_rows (widget, entry, 1);
 }
 }
 
 audgui_list_update_selection (widget, update.before, changed);
- audgui_list_set_focus (widget, aud_playlist_get_focus (data->list));
+ audgui_list_set_highlight (widget, data->list.get_position ());
+ audgui_list_set_focus (widget, data->list.get_focus ());
 }
 
 void ui_playlist_widget_scroll (GtkWidget * widget)
@@ -481,7 +504,7 @@
 /* Only update the info popup if it is already shown or about to be shown;
 * this makes sure that it doesn't pop up when the Audacious window isn't
 * even visible. */
- if (row >= 0 && (data->popup_source || data->popup_shown))
+ if (row >= 0 && data->popup_pos >= 0)
 popup_trigger (data, row);
 else
 popup_hide (data);

audacious-plugins-3.6.2-gtk3.tar.bz2/src/gtkui/ui_playlist_widget.h -> audacious-plugins-4.4.1.tar.bz2/src/gtkui/ui_playlist_widget.h Changed

audacious-plugins-3.6.2-gtk3.tar.bz2/src/gtkui/ui_statusbar.cc -> audacious-plugins-4.4.1.tar.bz2/src/gtkui/ui_statusbar.cc Changed

@@ -24,6 +24,7 @@
 #include <libaudcore/mainloop.h>
 #include <libaudcore/playlist.h>
 #include <libaudcore/runtime.h>
+#include <libaudgui/gtk-compat.h>
 
 #include "ui_statusbar.h"
 
@@ -31,9 +32,9 @@
 
 static void ui_statusbar_update_playlist_length (void *, void * label)
 {
- int playlist = aud_playlist_get_active ();
- StringBuf s1 = str_format_time (aud_playlist_get_selected_length (playlist));
- StringBuf s2 = str_format_time (aud_playlist_get_total_length (playlist));
+ auto playlist = Playlist::active_playlist ();
+ StringBuf s1 = str_format_time (playlist.selected_length_ms ());
+ StringBuf s2 = str_format_time (playlist.total_length_ms ());
 gtk_label_set_text ((GtkLabel *) label, str_concat ({s1, " / ", s2}));
 }
 
@@ -64,7 +65,7 @@
 else if (channels == 2)
 buf.insert (-1, _("stereo"));
 else
- buf.combine (str_printf (ngettext ("%d channel", "%d channels", channels), channels));
+ str_append_printf (buf, ngettext ("%d channel", "%d channels", channels), channels);
 
 if (samplerate > 0 || bitrate > 0)
 buf.insert (-1, ", ");
@@ -72,13 +73,13 @@
 
 if (samplerate > 0)
 {
- buf.combine (str_printf ("%d kHz", samplerate / 1000));
+ str_append_printf (buf, _("%d kHz"), samplerate / 1000);
 if (bitrate > 0)
 buf.insert (-1, ", ");
 }
 
 if (bitrate > 0)
- buf.combine (str_printf (_("%d kbps"), bitrate / 1000));
+ str_append_printf (buf, _("%d kbit/s"), bitrate / 1000);
 
 gtk_label_set_text ((GtkLabel *) label, buf);
 }
@@ -103,20 +104,20 @@
 
 static void no_advance_toggled (void *, void * label)
 {
- if (aud_get_bool (nullptr, "no_playlist_advance"))
+ if (aud_get_bool ("no_playlist_advance"))
 gtk_label_set_text ((GtkLabel *) label, _("Single mode."));
 else
 gtk_label_set_text ((GtkLabel *) label, _("Playlist mode."));
 
- clear_timeout.start (1000, clear_message, label);
+ clear_timeout.start (1000, std::bind (clear_message, label));
 }
 
 static void stop_after_song_toggled (void *, void * label)
 {
- if (aud_get_bool (nullptr, "stop_after_current_song"))
+ if (aud_get_bool ("stop_after_current_song"))
 gtk_label_set_text ((GtkLabel *) label, _("Stopping after song."));
 
- clear_timeout.start (1000, clear_message, label);
+ clear_timeout.start (1000, std::bind (clear_message, label));
 }
 
 static void ui_statusbar_destroy_cb ()
@@ -135,7 +136,7 @@
 
 GtkWidget * ui_statusbar_new ()
 {
- GtkWidget * hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3);
+ GtkWidget * hbox = audgui_hbox_new (3);
 GtkWidget * status = gtk_widget_new (GTK_TYPE_LABEL, "xalign", 0.0, nullptr);
 GtkWidget * length = gtk_widget_new (GTK_TYPE_LABEL, "xalign", 1.0, nullptr);

audacious-plugins-3.6.2-gtk3.tar.bz2/src/hotkey/Makefile -> audacious-plugins-4.4.1.tar.bz2/src/hotkey/Makefile Changed

audacious-plugins-3.6.2-gtk3.tar.bz2/src/hotkey/grab.cc -> audacious-plugins-4.4.1.tar.bz2/src/hotkey/grab.cc Changed

@@ -30,42 +30,39 @@
 *
 * You should have received a copy of the GNU General Public License
 * along with audacious-hotkey; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
 */
 
-#include <gtk/gtk.h>
 #include <gdk/gdkx.h>
+#include <gtk/gtk.h>
 
 #include "grab.h"
 #include "plugin.h"
 
-
 static int grabbed = 0;
 static unsigned int numlock_mask = 0;
 static unsigned int scrolllock_mask = 0;
 static unsigned int capslock_mask = 0;
 
-
 /* Taken from xbindkeys */
-static void get_offending_modifiers (Display * dpy)
+static void get_offending_modifiers(Display * dpy)
 {
 int i;
- XModifierKeymap *modmap;
+ XModifierKeymap * modmap;
 KeyCode nlock, slock;
 
- static int mask_table8 = {
- ShiftMask, LockMask, ControlMask, Mod1Mask,
- Mod2Mask, Mod3Mask, Mod4Mask, Mod5Mask
- };
+ static int mask_table8 = {ShiftMask, LockMask, ControlMask, Mod1Mask,
+ Mod2Mask, Mod3Mask, Mod4Mask, Mod5Mask};
 
- nlock = XKeysymToKeycode (dpy, XK_Num_Lock);
- slock = XKeysymToKeycode (dpy, XK_Scroll_Lock);
+ nlock = XKeysymToKeycode(dpy, XK_Num_Lock);
+ slock = XKeysymToKeycode(dpy, XK_Scroll_Lock);
 
 /*
- * Find out the masks for the NumLock and ScrollLock modifiers,
- * so that we can bind the grabs for when they are enabled too.
- */
- modmap = XGetModifierMapping (dpy);
+ * Find out the masks for the NumLock and ScrollLock modifiers,
+ * so that we can bind the grabs for when they are enabled too.
+ */
+ modmap = XGetModifierMapping(dpy);
 
 if (modmap != nullptr && modmap->max_keypermod > 0)
 {
@@ -81,133 +78,132 @@
 capslock_mask = LockMask;
 
 if (modmap)
- XFreeModifiermap (modmap);
+ XFreeModifiermap(modmap);
 }
 
-
-static int x11_error_handler (Display *dpy, XErrorEvent *error)
-{
- return 0;
-}
+static int x11_error_handler(Display * dpy, XErrorEvent * error) { return 0; }
 
 /* grab required keys */
-static void grab_key(const HotkeyConfiguration *hotkey, Display *xdisplay, Window x_root_window)
+static void grab_key(const HotkeyConfiguration * hotkey, Display * xdisplay,
+ Window x_root_window)
 {
- unsigned int modifier = hotkey->mask & ~(numlock_mask | capslock_mask | scrolllock_mask);
+ unsigned int modifier =
+ hotkey->mask & ~(numlock_mask | capslock_mask | scrolllock_mask);
 
- if (hotkey->key == 0) return;
+ if (hotkey->key == 0)
+ return;
 
 if (hotkey->type == TYPE_KEY)
 {
- XGrabKey (xdisplay, hotkey->key, modifier, x_root_window,
- False, GrabModeAsync, GrabModeAsync);
+ XGrabKey(xdisplay, hotkey->key, modifier, x_root_window, False,
+ GrabModeAsync, GrabModeAsync);
 
 if (modifier == AnyModifier)
 return;
 
 if (numlock_mask)
- XGrabKey (xdisplay, hotkey->key, modifier | numlock_mask,
- x_root_window,
- False, GrabModeAsync, GrabModeAsync);
+ XGrabKey(xdisplay, hotkey->key, modifier | numlock_mask,
+ x_root_window, False, GrabModeAsync, GrabModeAsync);
 
 if (capslock_mask)
- XGrabKey (xdisplay, hotkey->key, modifier | capslock_mask,
- x_root_window,
- False, GrabModeAsync, GrabModeAsync);
+ XGrabKey(xdisplay, hotkey->key, modifier | capslock_mask,
+ x_root_window, False, GrabModeAsync, GrabModeAsync);
 
 if (scrolllock_mask)
- XGrabKey (xdisplay, hotkey->key, modifier | scrolllock_mask,
- x_root_window,
- False, GrabModeAsync, GrabModeAsync);
+ XGrabKey(xdisplay, hotkey->key, modifier | scrolllock_mask,
+ x_root_window, False, GrabModeAsync, GrabModeAsync);
 
 if (numlock_mask && capslock_mask)
- XGrabKey (xdisplay, hotkey->key, modifier | numlock_mask | capslock_mask,
- x_root_window,
- False, GrabModeAsync, GrabModeAsync);
+ XGrabKey(xdisplay, hotkey->key,
+ modifier | numlock_mask | capslock_mask, x_root_window,
+ False, GrabModeAsync, GrabModeAsync);
 
 if (numlock_mask && scrolllock_mask)
- XGrabKey (xdisplay, hotkey->key, modifier | numlock_mask | scrolllock_mask,
- x_root_window,
- False, GrabModeAsync, GrabModeAsync);
+ XGrabKey(xdisplay, hotkey->key,
+ modifier | numlock_mask | scrolllock_mask, x_root_window,
+ False, GrabModeAsync, GrabModeAsync);
 
 if (capslock_mask && scrolllock_mask)
- XGrabKey (xdisplay, hotkey->key, modifier | capslock_mask | scrolllock_mask,
- x_root_window,
- False, GrabModeAsync, GrabModeAsync);
+ XGrabKey(xdisplay, hotkey->key,
+ modifier | capslock_mask | scrolllock_mask, x_root_window,
+ False, GrabModeAsync, GrabModeAsync);
 
 if (numlock_mask && capslock_mask && scrolllock_mask)
- XGrabKey (xdisplay, hotkey->key,
- modifier | numlock_mask | capslock_mask | scrolllock_mask,
- x_root_window, False, GrabModeAsync,
- GrabModeAsync);
+ XGrabKey(xdisplay, hotkey->key,
+ modifier | numlock_mask | capslock_mask | scrolllock_mask,
+ x_root_window, False, GrabModeAsync, GrabModeAsync);
 }
 if (hotkey->type == TYPE_MOUSE)
 {
- XGrabButton (xdisplay, hotkey->key, modifier, x_root_window,
- False, ButtonPressMask, GrabModeAsync, GrabModeAsync, None, None);
+ XGrabButton(xdisplay, hotkey->key, modifier, x_root_window, False,
+ ButtonPressMask, GrabModeAsync, GrabModeAsync, None, None);
 
 if (modifier == AnyModifier)
 return;
 
 if (numlock_mask)
- XGrabButton (xdisplay, hotkey->key, modifier | numlock_mask,
- x_root_window,
- False, ButtonPressMask, GrabModeAsync, GrabModeAsync, None, None);
+ XGrabButton(xdisplay, hotkey->key, modifier | numlock_mask,
+ x_root_window, False, ButtonPressMask, GrabModeAsync,
+ GrabModeAsync, None, None);
 
 if (capslock_mask)
- XGrabButton (xdisplay, hotkey->key, modifier | capslock_mask,
- x_root_window,
- False, ButtonPressMask, GrabModeAsync, GrabModeAsync, None, None);
+ XGrabButton(xdisplay, hotkey->key, modifier | capslock_mask,
+ x_root_window, False, ButtonPressMask, GrabModeAsync,
+ GrabModeAsync, None, None);
 
 if (scrolllock_mask)
- XGrabButton (xdisplay, hotkey->key, modifier | scrolllock_mask,
- x_root_window,
- False, ButtonPressMask, GrabModeAsync, GrabModeAsync, None, None);
+ XGrabButton(xdisplay, hotkey->key, modifier | scrolllock_mask,
+ x_root_window, False, ButtonPressMask, GrabModeAsync,
+ GrabModeAsync, None, None);
 
 if (numlock_mask && capslock_mask)
- XGrabButton (xdisplay, hotkey->key, modifier | numlock_mask | capslock_mask,
- x_root_window,
- False, ButtonPressMask, GrabModeAsync, GrabModeAsync, None, None);
+ XGrabButton(xdisplay, hotkey->key,
+ modifier | numlock_mask | capslock_mask, x_root_window,
+ False, ButtonPressMask, GrabModeAsync, GrabModeAsync,
+ None, None);
 
 if (numlock_mask && scrolllock_mask)
- XGrabButton (xdisplay, hotkey->key, modifier | numlock_mask | scrolllock_mask,
- x_root_window,
- False, ButtonPressMask, GrabModeAsync, GrabModeAsync, None, None);
+ XGrabButton(xdisplay, hotkey->key,
+ modifier | numlock_mask | scrolllock_mask,
+ x_root_window, False, ButtonPressMask, GrabModeAsync,
+ GrabModeAsync, None, None);
 
 if (capslock_mask && scrolllock_mask)
- XGrabButton (xdisplay, hotkey->key, modifier | capslock_mask | scrolllock_mask,
- x_root_window,
- False, ButtonPressMask, GrabModeAsync, GrabModeAsync, None, None);
+ XGrabButton(xdisplay, hotkey->key,
+ modifier | capslock_mask | scrolllock_mask,
+ x_root_window, False, ButtonPressMask, GrabModeAsync,
+ GrabModeAsync, None, None);
 
 if (numlock_mask && capslock_mask && scrolllock_mask)
- XGrabButton (xdisplay, hotkey->key,
- modifier | numlock_mask | capslock_mask | scrolllock_mask,
- x_root_window, False, ButtonPressMask, GrabModeAsync,
- GrabModeAsync, None, None);
+ XGrabButton(xdisplay, hotkey->key,
+ modifier | numlock_mask | capslock_mask |
+ scrolllock_mask,
+ x_root_window, False, ButtonPressMask, GrabModeAsync,
+ GrabModeAsync, None, None);
 }
 }
 
-void grab_keys ( )
+void grab_keys()
 {
- Display* xdisplay;
+ Display * xdisplay;
 int screen;
- PluginConfig* plugin_cfg = get_config();
- HotkeyConfiguration *hotkey;
+ PluginConfig * plugin_cfg = get_config();
+ HotkeyConfiguration * hotkey;
 
 XErrorHandler old_handler = 0;
- xdisplay = GDK_DISPLAY_XDISPLAY(gdk_display_get_default());
-
- if (grabbed) return;
+ xdisplay = GDK_DISPLAY_XDISPLAY(gdk_display_get_default());
 
+ if (grabbed)
+ return;
 
 XSync(xdisplay, False);
- old_handler = XSetErrorHandler (x11_error_handler);
+ old_handler = XSetErrorHandler(x11_error_handler);
 
 get_offending_modifiers(xdisplay);
 hotkey = &(plugin_cfg->first);
 while (hotkey)
 {
- for (screen=0;screen<ScreenCount(xdisplay);screen++)
+ for (screen = 0; screen < ScreenCount(xdisplay); screen++)
 {
 grab_key(hotkey, xdisplay, RootWindow(xdisplay, screen));
 }
@@ -215,100 +211,126 @@
 }
 
 XSync(xdisplay, False);
- XSetErrorHandler (old_handler);
+ XSetErrorHandler(old_handler);
 
 grabbed = 1;
 }
 
-
-
 /* grab required keys */
-static void ungrab_key(HotkeyConfiguration *hotkey, Display* xdisplay, Window x_root_window)
+static void ungrab_key(HotkeyConfiguration * hotkey, Display * xdisplay,
+ Window x_root_window)
 {
- unsigned int modifier = hotkey->mask & ~(numlock_mask | capslock_mask | scrolllock_mask);
+ unsigned int modifier =
+ hotkey->mask & ~(numlock_mask | capslock_mask | scrolllock_mask);
 
- if (hotkey->key == 0) return;
+ if (hotkey->key == 0)
+ return;
 
 if (hotkey->type == TYPE_KEY)
 {
- XUngrabKey (xdisplay, hotkey->key, modifier, x_root_window);
+ XUngrabKey(xdisplay, hotkey->key, modifier, x_root_window);
 
 if (modifier == AnyModifier)
 return;
 
 if (numlock_mask)
- XUngrabKey (xdisplay, hotkey->key, modifier | numlock_mask, x_root_window);
+ XUngrabKey(xdisplay, hotkey->key, modifier | numlock_mask,
+ x_root_window);
 
 if (capslock_mask)
- XUngrabKey (xdisplay, hotkey->key, modifier | capslock_mask, x_root_window);
+ XUngrabKey(xdisplay, hotkey->key, modifier | capslock_mask,
+ x_root_window);
 
 if (scrolllock_mask)
- XUngrabKey (xdisplay, hotkey->key, modifier | scrolllock_mask, x_root_window);
+ XUngrabKey(xdisplay, hotkey->key, modifier | scrolllock_mask,
+ x_root_window);
 
 if (numlock_mask && capslock_mask)
- XUngrabKey (xdisplay, hotkey->key, modifier | numlock_mask | capslock_mask, x_root_window);
+ XUngrabKey(xdisplay, hotkey->key,
+ modifier | numlock_mask | capslock_mask, x_root_window);
 
 if (numlock_mask && scrolllock_mask)
- XUngrabKey (xdisplay, hotkey->key, modifier | numlock_mask | scrolllock_mask, x_root_window);
+ XUngrabKey(xdisplay, hotkey->key,
+ modifier | numlock_mask | scrolllock_mask,
+ x_root_window);
 
 if (capslock_mask && scrolllock_mask)
- XUngrabKey (xdisplay, hotkey->key, modifier | capslock_mask | scrolllock_mask, x_root_window);
+ XUngrabKey(xdisplay, hotkey->key,
+ modifier | capslock_mask | scrolllock_mask,
+ x_root_window);
 
 if (numlock_mask && capslock_mask && scrolllock_mask)
- XUngrabKey (xdisplay, hotkey->key, modifier | numlock_mask | capslock_mask | scrolllock_mask, x_root_window);
+ XUngrabKey(xdisplay, hotkey->key,
+ modifier | numlock_mask | capslock_mask |
+ scrolllock_mask,
+ x_root_window);
 }
 if (hotkey->type == TYPE_MOUSE)
 {
- XUngrabButton (xdisplay, hotkey->key, modifier, x_root_window);
+ XUngrabButton(xdisplay, hotkey->key, modifier, x_root_window);
 
 if (modifier == AnyModifier)
 return;
 
 if (numlock_mask)
- XUngrabButton (xdisplay, hotkey->key, modifier | numlock_mask, x_root_window);
+ XUngrabButton(xdisplay, hotkey->key, modifier | numlock_mask,
+ x_root_window);
 
 if (capslock_mask)
- XUngrabButton (xdisplay, hotkey->key, modifier | capslock_mask, x_root_window);
+ XUngrabButton(xdisplay, hotkey->key, modifier | capslock_mask,
+ x_root_window);
 
 if (scrolllock_mask)
- XUngrabButton (xdisplay, hotkey->key, modifier | scrolllock_mask, x_root_window);
+ XUngrabButton(xdisplay, hotkey->key, modifier | scrolllock_mask,
+ x_root_window);
 
 if (numlock_mask && capslock_mask)
- XUngrabButton (xdisplay, hotkey->key, modifier | numlock_mask | capslock_mask, x_root_window);
+ XUngrabButton(xdisplay, hotkey->key,
+ modifier | numlock_mask | capslock_mask,
+ x_root_window);
 
 if (numlock_mask && scrolllock_mask)
- XUngrabButton (xdisplay, hotkey->key, modifier | numlock_mask | scrolllock_mask, x_root_window);
+ XUngrabButton(xdisplay, hotkey->key,
+ modifier | numlock_mask | scrolllock_mask,
+ x_root_window);
 
 if (capslock_mask && scrolllock_mask)
- XUngrabButton (xdisplay, hotkey->key, modifier | capslock_mask | scrolllock_mask, x_root_window);
+ XUngrabButton(xdisplay, hotkey->key,
+ modifier | capslock_mask | scrolllock_mask,
+ x_root_window);
 
 if (numlock_mask && capslock_mask && scrolllock_mask)
- XUngrabButton (xdisplay, hotkey->key, modifier | numlock_mask | capslock_mask | scrolllock_mask, x_root_window);
+ XUngrabButton(xdisplay, hotkey->key,
+ modifier | numlock_mask | capslock_mask |
+ scrolllock_mask,
+ x_root_window);
 }
 }
 
-void ungrab_keys ( )
+void ungrab_keys()
 {
- Display* xdisplay;
+ Display * xdisplay;
 int screen;
- PluginConfig* plugin_cfg = get_config();
- HotkeyConfiguration *hotkey;
+ PluginConfig * plugin_cfg = get_config();
+ HotkeyConfiguration * hotkey;
 
 XErrorHandler old_handler = 0;
- xdisplay = GDK_DISPLAY_XDISPLAY(gdk_display_get_default());
+ xdisplay = GDK_DISPLAY_XDISPLAY(gdk_display_get_default());
 
- if (!grabbed) return;
- if (!xdisplay) return;
+ if (!grabbed)
+ return;
+ if (!xdisplay)
+ return;
 
 XSync(xdisplay, False);
- old_handler = XSetErrorHandler (x11_error_handler);
+ old_handler = XSetErrorHandler(x11_error_handler);
 
 get_offending_modifiers(xdisplay);
 
 hotkey = &(plugin_cfg->first);
 while (hotkey)
 {
- for (screen=0;screen<ScreenCount(xdisplay);screen++)
+ for (screen = 0; screen < ScreenCount(xdisplay); screen++)
 {
 ungrab_key(hotkey, xdisplay, RootWindow(xdisplay, screen));
 }
@@ -316,73 +338,73 @@
 }
 
 XSync(xdisplay, False);
- XSetErrorHandler (old_handler);
+ XSetErrorHandler(old_handler);
 
 grabbed = 0;
 }
 
-
-static GdkFilterReturn
-gdk_filter(GdkXEvent *xevent,
- GdkEvent *event,
- void * data)
+static GdkFilterReturn gdk_filter(GdkXEvent * xevent, GdkEvent * event,
+ void * data)
 {
- HotkeyConfiguration *hotkey;
+ HotkeyConfiguration * hotkey;
 hotkey = &(get_config()->first);
- switch (((XEvent*)xevent)->type)
+ switch (((XEvent *)xevent)->type)
 {
 case KeyPress:
+ {
+ XKeyEvent * keyevent = (XKeyEvent *)xevent;
+ while (hotkey)
 {
- XKeyEvent *keyevent = (XKeyEvent*)xevent;
- while (hotkey)
+ if ((hotkey->key == keyevent->keycode) &&
+ (hotkey->mask ==
+ (keyevent->state &
+ ~(scrolllock_mask | numlock_mask | capslock_mask))) &&
+ (hotkey->type == TYPE_KEY))
 {
- if ((hotkey->key == keyevent->keycode) &&
- (hotkey->mask == (keyevent->state & ~(scrolllock_mask | numlock_mask | capslock_mask))) &&
- (hotkey->type == TYPE_KEY))
- {
- if (handle_keyevent(hotkey->event))
- return GDK_FILTER_REMOVE;
- break;
- }
-
- hotkey = hotkey->next;
+ if (handle_keyevent(hotkey->event))
+ return GDK_FILTER_REMOVE;
+ break;
 }
- break;
+
+ hotkey = hotkey->next;
 }
+ break;
+ }
 case ButtonPress:
+ {
+ XButtonEvent * buttonevent = (XButtonEvent *)xevent;
+ while (hotkey)
 {
- XButtonEvent *buttonevent = (XButtonEvent*)xevent;
- while (hotkey)
+ if ((hotkey->key == buttonevent->button) &&
+ (hotkey->mask ==
+ (buttonevent->state &
+ ~(scrolllock_mask | numlock_mask | capslock_mask))) &&
+ (hotkey->type == TYPE_MOUSE))
 {
- if ((hotkey->key == buttonevent->button) &&
- (hotkey->mask == (buttonevent->state & ~(scrolllock_mask | numlock_mask | capslock_mask))) &&
- (hotkey->type == TYPE_MOUSE))
- {
- if (handle_keyevent(hotkey->event))
- return GDK_FILTER_REMOVE;
- break;
- }
-
- hotkey = hotkey->next;
+ if (handle_keyevent(hotkey->event))
+ return GDK_FILTER_REMOVE;
+ break;
 }
 
- break;
+ hotkey = hotkey->next;
 }
+
+ break;
+ }
 }
 
 return GDK_FILTER_CONTINUE;
 }
 
-gboolean setup_filter()
+void setup_filter()
 {
- gdk_window_add_filter (gdk_screen_get_root_window
- (gdk_screen_get_default ()), gdk_filter, nullptr);
-
- return TRUE;
+ gdk_window_add_filter(gdk_screen_get_root_window(gdk_screen_get_default()),
+ gdk_filter, nullptr);
 }
 
 void release_filter()
 {
- gdk_window_remove_filter (gdk_screen_get_root_window
- (gdk_screen_get_default ()), gdk_filter, nullptr);
+ gdk_window_remove_filter(
+ gdk_screen_get_root_window(gdk_screen_get_default()), gdk_filter,
+ nullptr);
 }

audacious-plugins-3.6.2-gtk3.tar.bz2/src/hotkey/grab.h -> audacious-plugins-4.4.1.tar.bz2/src/hotkey/grab.h Changed

audacious-plugins-3.6.2-gtk3.tar.bz2/src/hotkey/gui.cc -> audacious-plugins-4.4.1.tar.bz2/src/hotkey/gui.cc Changed

@@ -30,85 +30,94 @@
 *
 * You should have received a copy of the GNU General Public License
 * along with audacious-hotkey; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
 */
 
 #include <libaudcore/i18n.h>
 #include <libaudcore/preferences.h>
 
+#include <libaudgui/gtk-compat.h>
 #include <libaudgui/libaudgui-gtk.h>
 
-#include <gtk/gtk.h>
-#include <gdk/gdkx.h>
 #include <gdk/gdkkeysyms-compat.h>
+#include <gdk/gdkx.h>
+#include <gtk/gtk.h>
 
 #include <X11/XKBlib.h>
 
-#include "plugin.h"
-#include "gui.h"
 #include "grab.h"
+#include "gui.h"
+#include "plugin.h"
 
-typedef struct _KeyControls {
- GtkWidget *keytext;
- GtkWidget *grid;
- GtkWidget *button;
- GtkWidget *combobox;
+typedef struct _KeyControls
+{
+ GtkWidget * keytext;
+ GtkWidget * grid;
+ GtkWidget * button;
+ GtkWidget * combobox;
 
 HotkeyConfiguration hotkey;
 struct _KeyControls *next, *prev, *first;
 } KeyControls;
 
-static KeyControls *first_controls;
-
-
-static void clear_keyboard (GtkWidget *widget, void * data);
-static void add_callback (GtkWidget *widget, void * data);
-static void destroy_callback ();
-static void ok_callback ();
-
-
-static const char * event_descEVENT_MAX = {
- 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_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_SHOW_AOSD = N_("Show On-Screen-Display"),
- 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)")
-};
-
-
-static void set_keytext (GtkWidget *entry, int key, int mask, int type)
+static KeyControls * first_controls;
+
+static void clear_keyboard(GtkWidget * widget, void * data);
+static void add_callback(GtkWidget * widget, void * data);
+static void destroy_callback();
+static void ok_callback();
+
+static const char * event_desc = {N_("Previous track"),
+ N_("Play"),
+ N_("Pause/Resume"),
+ N_("Stop"),
+ N_("Next track"),
+ N_("Step forward"),
+ N_("Step backward"),
+ N_("Mute"),
+ N_("Volume up"),
+ N_("Volume down"),
+ N_("Jump to file"),
+ N_("Toggle player window(s)"),
+ N_("Show On-Screen-Display"),
+ N_("Toggle repeat"),
+ N_("Toggle shuffle"),
+ N_("Toggle stop after current"),
+ N_("Raise player window(s)")};
+
+static_assert(aud::n_elems(event_desc) == EVENT_MAX,
+ "event_desc table is not up to date");
+
+static void set_keytext(GtkWidget * entry, int key, int mask, int type)
 {
- char *text = nullptr;
+ char * text = nullptr;
 
 if (key == 0 && mask == 0)
 {
 text = g_strdup(_("(none)"));
- } else {
- static const char *modifier_string = { "Control", "Shift", "Alt", "Mod2", "Mod3", "Super", "Mod5" };
- static const unsigned int modifiers = { ControlMask, ShiftMask, Mod1Mask, Mod2Mask, Mod3Mask, Mod4Mask, Mod5Mask };
- const char *strings9;
- char *keytext = nullptr;
+ }
+ else
+ {
+ static const char * modifier_string = {
+ "Control", "Shift", "Alt", "Mod2", "Mod3", "Super", "Mod5"};
+ static const unsigned int modifiers = {
+ ControlMask, ShiftMask, Mod1Mask, Mod2Mask,
+ Mod3Mask, Mod4Mask, Mod5Mask};
+ const char * strings9;
+ char * keytext = nullptr;
 int i, j;
 if (type == TYPE_KEY)
 {
 KeySym keysym;
- keysym = XkbKeycodeToKeysym(GDK_DISPLAY_XDISPLAY(gdk_display_get_default()), key, 0, 0);
+ keysym = XkbKeycodeToKeysym(
+ GDK_DISPLAY_XDISPLAY(gdk_display_get_default()), key, 0, 0);
 if (keysym == 0 || keysym == NoSymbol)
 {
 keytext = g_strdup_printf("#%d", key);
- } else {
+ }
+ else
+ {
 keytext = g_strdup(XKeysymToString(keysym));
 }
 }
@@ -117,12 +126,13 @@
 keytext = g_strdup_printf("Button%d", key);
 }
 
- for (i = 0, j=0; j<7; j++)
+ for (i = 0, j = 0; j < 7; j++)
 {
 if (mask & modifiersj)
- stringsi++ = modifier_stringj;
+ stringsi++ = modifier_stringj;
 }
- if (key != 0) stringsi++ = keytext;
+ if (key != 0)
+ stringsi++ = keytext;
 stringsi = nullptr;
 
 text = g_strjoinv(" + ", (char **)strings);
@@ -131,149 +141,169 @@
 
 gtk_entry_set_text(GTK_ENTRY(entry), text);
 gtk_editable_set_position(GTK_EDITABLE(entry), -1);
- if (text) g_free(text);
+ if (text)
+ g_free(text);
 }
 
-static gboolean
-on_entry_key_press_event(GtkWidget * widget,
- GdkEventKey * event,
- void * user_data)
+static gboolean on_entry_key_press_event(GtkWidget * widget,
+ GdkEventKey * event, void * user_data)
 {
- KeyControls *controls = (KeyControls*) user_data;
+ KeyControls * controls = (KeyControls *)user_data;
 int is_mod;
 int mod;
 
- if (event->keyval == GDK_Tab) return FALSE;
- if (event->keyval == GDK_Escape && ((event->state & ~GDK_LOCK_MASK) == 0)) return FALSE;
- if (event->keyval == GDK_Return && ((event->state & ~GDK_LOCK_MASK) == 0)) return FALSE;
+ if (event->keyval == GDK_Tab)
+ return false;
+ if (event->keyval == GDK_Escape && ((event->state & ~GDK_LOCK_MASK) == 0))
+ return false;
+ if (event->keyval == GDK_Return && ((event->state & ~GDK_LOCK_MASK) == 0))
+ return false;
 if (event->keyval == GDK_ISO_Left_Tab)
 {
- set_keytext(controls->keytext, controls->hotkey.key, controls->hotkey.mask, controls->hotkey.type);
- return FALSE;
+ set_keytext(controls->keytext, controls->hotkey.key,
+ controls->hotkey.mask, controls->hotkey.type);
+ return false;
 }
- if (event->keyval == GDK_Up && ((event->state & ~GDK_LOCK_MASK) == 0)) return FALSE;
- if (event->keyval == GDK_Down && ((event->state & ~GDK_LOCK_MASK) == 0)) return FALSE;
+ if (event->keyval == GDK_Up && ((event->state & ~GDK_LOCK_MASK) == 0))
+ return false;
+ if (event->keyval == GDK_Down && ((event->state & ~GDK_LOCK_MASK) == 0))
+ return false;
 
 mod = 0;
 is_mod = 0;
 
- if ((event->state & GDK_CONTROL_MASK) | (!is_mod && (is_mod = (event->keyval == GDK_Control_L || event->keyval == GDK_Control_R))))
- mod |= ControlMask;
+ if ((event->state & GDK_CONTROL_MASK) |
+ (!is_mod && (is_mod = (event->keyval == GDK_Control_L ||
+ event->keyval == GDK_Control_R))))
+ mod |= ControlMask;
 
- if ((event->state & GDK_MOD1_MASK) | (!is_mod && (is_mod = (event->keyval == GDK_Alt_L || event->keyval == GDK_Alt_R))))
- mod |= Mod1Mask;
+ if ((event->state & GDK_MOD1_MASK) |
+ (!is_mod &&
+ (is_mod = (event->keyval == GDK_Alt_L || event->keyval == GDK_Alt_R))))
+ mod |= Mod1Mask;
 
- if ((event->state & GDK_SHIFT_MASK) | (!is_mod && (is_mod = (event->keyval == GDK_Shift_L || event->keyval == GDK_Shift_R))))
- mod |= ShiftMask;
+ if ((event->state & GDK_SHIFT_MASK) |
+ (!is_mod && (is_mod = (event->keyval == GDK_Shift_L ||
+ event->keyval == GDK_Shift_R))))
+ mod |= ShiftMask;
 
- if ((event->state & GDK_MOD5_MASK) | (!is_mod && (is_mod = (event->keyval == GDK_ISO_Level3_Shift))))
- mod |= Mod5Mask;
+ if ((event->state & GDK_MOD5_MASK) |
+ (!is_mod && (is_mod = (event->keyval == GDK_ISO_Level3_Shift))))
+ mod |= Mod5Mask;
 
- if ((event->state & GDK_MOD4_MASK) | (!is_mod && (is_mod = (event->keyval == GDK_Super_L || event->keyval == GDK_Super_R))))
- mod |= Mod4Mask;
+ if ((event->state & GDK_MOD4_MASK) |
+ (!is_mod && (is_mod = (event->keyval == GDK_Super_L ||
+ event->keyval == GDK_Super_R))))
+ mod |= Mod4Mask;
 
- if (!is_mod) {
+ if (!is_mod)
+ {
 controls->hotkey.key = event->hardware_keycode;
 controls->hotkey.mask = mod;
 controls->hotkey.type = TYPE_KEY;
 if (controls->next == nullptr)
- add_callback (nullptr, (void *) controls);
- else gtk_widget_grab_focus(GTK_WIDGET(controls->next->keytext));
+ add_callback(nullptr, (void *)controls);
+ else
+ gtk_widget_grab_focus(GTK_WIDGET(controls->next->keytext));
 }
 
- set_keytext(controls->keytext, is_mod ? 0 : event->hardware_keycode, mod, TYPE_KEY);
- return TRUE;
+ set_keytext(controls->keytext, is_mod ? 0 : event->hardware_keycode, mod,
+ TYPE_KEY);
+ return true;
 }
 
-static gboolean
-on_entry_key_release_event(GtkWidget * widget,
- GdkEventKey * event,
- void * user_data)
+static gboolean on_entry_key_release_event(GtkWidget * widget,
+ GdkEventKey * event,
+ void * user_data)
 {
- KeyControls *controls = (KeyControls*) user_data;
- if (!gtk_widget_is_focus(widget)) return FALSE;
- set_keytext(controls->keytext, controls->hotkey.key, controls->hotkey.mask, controls->hotkey.type);
+ KeyControls * controls = (KeyControls *)user_data;
+ if (!gtk_widget_is_focus(widget))
+ return false;
+ set_keytext(controls->keytext, controls->hotkey.key, controls->hotkey.mask,
+ controls->hotkey.type);
 
- return TRUE;
+ return true;
 }
 
-static gboolean
-on_entry_button_press_event(GtkWidget * widget,
- GdkEventButton * event,
- void * user_data)
+static gboolean on_entry_button_press_event(GtkWidget * widget,
+ GdkEventButton * event,
+ void * user_data)
 {
- KeyControls *controls = (KeyControls*) user_data;
+ KeyControls * controls = (KeyControls *)user_data;
 int mod;
 
- if (!gtk_widget_is_focus(widget)) return FALSE;
+ if (!gtk_widget_is_focus(widget))
+ return false;
 
 mod = 0;
 if (event->state & GDK_CONTROL_MASK)
- mod |= ControlMask;
+ mod |= ControlMask;
 
 if (event->state & GDK_MOD1_MASK)
- mod |= Mod1Mask;
+ mod |= Mod1Mask;
 
 if (event->state & GDK_SHIFT_MASK)
- mod |= ShiftMask;
+ mod |= ShiftMask;
 
 if (event->state & GDK_MOD5_MASK)
- mod |= Mod5Mask;
+ mod |= Mod5Mask;
 
 if (event->state & GDK_MOD4_MASK)
- mod |= Mod4Mask;
+ mod |= Mod4Mask;
 
 if ((event->button <= 3) && (mod == 0))
 {
- GtkWidget* dialog;
+ GtkWidget * dialog;
 int response;
- dialog = gtk_message_dialog_new (GTK_WINDOW(gtk_widget_get_toplevel(widget)),
- GTK_DIALOG_MODAL,
- GTK_MESSAGE_WARNING,
- GTK_BUTTONS_YES_NO,
- _("It is not recommended to bind the primary mouse buttons without modificators.\n\n"
+ dialog = gtk_message_dialog_new(
+ GTK_WINDOW(gtk_widget_get_toplevel(widget)), GTK_DIALOG_MODAL,
+ GTK_MESSAGE_WARNING, GTK_BUTTONS_YES_NO,
+ _("It is not recommended to bind the primary mouse buttons without "
+ "modifiers.\n\n"
 "Do you want to continue?"));
 gtk_window_set_title(GTK_WINDOW(dialog), _("Binding mouse buttons"));
+ gtk_window_set_role(GTK_WINDOW(dialog), "message");
 response = gtk_dialog_run(GTK_DIALOG(dialog));
- gtk_widget_destroy (dialog);
- if (response != GTK_RESPONSE_YES) return TRUE;
+ gtk_widget_destroy(dialog);
+ if (response != GTK_RESPONSE_YES)
+ return true;
 }
 
 controls->hotkey.key = event->button;
 controls->hotkey.mask = mod;
- controls->hotkey.type = TYPE_MOUSE;
- set_keytext(controls->keytext, controls->hotkey.key, controls->hotkey.mask, controls->hotkey.type);
+ controls->hotkey.type = TYPE_MOUSE;
+ set_keytext(controls->keytext, controls->hotkey.key, controls->hotkey.mask,
+ controls->hotkey.type);
 if (controls->next == nullptr)
- add_callback (nullptr, (void *) controls);
+ add_callback(nullptr, (void *)controls);
 
- return TRUE;
+ return true;
 }
 
-static gboolean
-on_entry_scroll_event(GtkWidget * widget,
- GdkEventScroll * event,
- void * user_data)
+static gboolean on_entry_scroll_event(GtkWidget * widget,
+ GdkEventScroll * event, void * user_data)
 {
- KeyControls *controls = (KeyControls*) user_data;
+ KeyControls * controls = (KeyControls *)user_data;
 int mod;
 
- if (!gtk_widget_is_focus(widget)) return FALSE;
+ if (!gtk_widget_is_focus(widget))
+ return false;
 
 mod = 0;
 if (event->state & GDK_CONTROL_MASK)
- mod |= ControlMask;
+ mod |= ControlMask;
 
 if (event->state & GDK_MOD1_MASK)
- mod |= Mod1Mask;
+ mod |= Mod1Mask;
 
 if (event->state & GDK_SHIFT_MASK)
- mod |= ShiftMask;
+ mod |= ShiftMask;
 
 if (event->state & GDK_MOD5_MASK)
- mod |= Mod5Mask;
+ mod |= Mod5Mask;
 
 if (event->state & GDK_MOD4_MASK)
- mod |= Mod4Mask;
+ mod |= Mod4Mask;
 
 if (event->direction == GDK_SCROLL_UP)
 controls->hotkey.key = 4;
@@ -283,25 +313,25 @@
 controls->hotkey.key = 6;
 else if (event->direction == GDK_SCROLL_RIGHT)
 controls->hotkey.key = 7;
- else return FALSE;
+ else
+ return false;
 
 controls->hotkey.mask = mod;
- controls->hotkey.type = TYPE_MOUSE;
- set_keytext(controls->keytext, controls->hotkey.key, controls->hotkey.mask, controls->hotkey.type);
+ controls->hotkey.type = TYPE_MOUSE;
+ set_keytext(controls->keytext, controls->hotkey.key, controls->hotkey.mask,
+ controls->hotkey.type);
 if (controls->next == nullptr)
- add_callback (nullptr, (void *) controls);
- return TRUE;
+ add_callback(nullptr, (void *)controls);
+ return true;
 }
 
-KeyControls* add_event_controls(KeyControls* list,
- GtkWidget *grid,
- int row,
- HotkeyConfiguration *hotkey)
+KeyControls * add_event_controls(KeyControls * list, GtkWidget * grid, int row,
+ HotkeyConfiguration * hotkey)
 {
- KeyControls *controls;
+ KeyControls * controls;
 int i;
 
- controls = (KeyControls*) g_malloc(sizeof(KeyControls));
+ controls = (KeyControls *)g_malloc(sizeof(KeyControls));
 controls->next = nullptr;
 controls->prev = list;
 controls->first = list->first;
@@ -316,108 +346,134 @@
 controls->hotkey.event = hotkey->event;
 if (controls->hotkey.key == 0)
 controls->hotkey.mask = 0;
- } else {
+ }
+ else
+ {
 controls->hotkey.key = 0;
 controls->hotkey.mask = 0;
 controls->hotkey.type = TYPE_KEY;
- controls->hotkey.event = (EVENT) 0;
+ controls->hotkey.event = (EVENT)0;
 }
 
 controls->combobox = gtk_combo_box_text_new();
- gtk_widget_set_hexpand(controls->combobox, TRUE);
- for (i=0;i<EVENT_MAX;i++)
+ for (i = 0; i < EVENT_MAX; i++)
 {
- gtk_combo_box_text_append_text((GtkComboBoxText *) controls->combobox, _(event_desci));
+ gtk_combo_box_text_append_text((GtkComboBoxText *)controls->combobox,
+ _(event_desci));
 }
- gtk_combo_box_set_active(GTK_COMBO_BOX(controls->combobox), controls->hotkey.event);
- gtk_grid_attach (GTK_GRID (grid), controls->combobox, 0, row, 1, 1);
+ gtk_combo_box_set_active(GTK_COMBO_BOX(controls->combobox),
+ controls->hotkey.event);
 
+ controls->keytext = gtk_entry_new();
+ gtk_editable_set_editable(GTK_EDITABLE(controls->keytext), false);
 
- controls->keytext = gtk_entry_new ();
- gtk_widget_set_hexpand (controls->keytext, TRUE);
- gtk_grid_attach (GTK_GRID (grid), controls->keytext, 1, row, 1, 1);
- gtk_editable_set_editable(GTK_EDITABLE(controls->keytext), FALSE);
-
-
- set_keytext(controls->keytext, controls->hotkey.key, controls->hotkey.mask, controls->hotkey.type);
+ set_keytext(controls->keytext, controls->hotkey.key, controls->hotkey.mask,
+ controls->hotkey.type);
 g_signal_connect((void *)controls->keytext, "key_press_event",
- G_CALLBACK(on_entry_key_press_event), controls);
+ G_CALLBACK(on_entry_key_press_event), controls);
 g_signal_connect((void *)controls->keytext, "key_release_event",
- G_CALLBACK(on_entry_key_release_event), controls);
+ G_CALLBACK(on_entry_key_release_event), controls);
 g_signal_connect((void *)controls->keytext, "button_press_event",
- G_CALLBACK(on_entry_button_press_event), controls);
+ G_CALLBACK(on_entry_button_press_event), controls);
 g_signal_connect((void *)controls->keytext, "scroll_event",
- G_CALLBACK(on_entry_scroll_event), controls);
-
+ G_CALLBACK(on_entry_scroll_event), controls);
 
 controls->button = gtk_button_new();
- gtk_button_set_image (GTK_BUTTON (controls->button),
- gtk_image_new_from_icon_name ("edit-delete", GTK_ICON_SIZE_BUTTON));
- gtk_grid_attach (GTK_GRID (grid), controls->button, 2, row, 1, 1);
- g_signal_connect (G_OBJECT (controls->button), "clicked",
- G_CALLBACK (clear_keyboard), controls);
+ gtk_button_set_image(
+ GTK_BUTTON(controls->button),
+ gtk_image_new_from_icon_name("edit-delete", GTK_ICON_SIZE_BUTTON));
+ g_signal_connect(G_OBJECT(controls->button), "clicked",
+ G_CALLBACK(clear_keyboard), controls);
+
+#ifdef USE_GTK3
+ gtk_widget_set_hexpand(controls->combobox, true);
+ gtk_widget_set_hexpand(controls->keytext, true);
+
+ gtk_grid_attach(GTK_GRID(grid), controls->combobox, 0, row, 1, 1);
+ gtk_grid_attach(GTK_GRID(grid), controls->keytext, 1, row, 1, 1);
+ gtk_grid_attach(GTK_GRID(grid), controls->button, 2, row, 1, 1);
+#else
+ gtk_table_attach_defaults(GTK_TABLE(grid), controls->combobox, 0, 1, row,
+ row + 1);
+ gtk_table_attach_defaults(GTK_TABLE(grid), controls->keytext, 1, 2, row,
+ row + 1);
+ gtk_table_attach_defaults(GTK_TABLE(grid), controls->button, 2, 3, row,
+ row + 1);
+#endif
 
 gtk_widget_grab_focus(GTK_WIDGET(controls->keytext));
 return controls;
 }
 
-void *make_config_widget ()
+void * make_config_widget()
 {
- KeyControls *current_controls;
- GtkWidget *main_vbox, *hbox;
- GtkWidget *frame;
- GtkWidget *label;
- GtkWidget *image;
- GtkWidget *grid;
- GtkWidget *button_box, *button;
- PluginConfig* plugin_cfg;
- HotkeyConfiguration *hotkey, temphotkey;
+ KeyControls * current_controls;
+ GtkWidget * main_vbox, * hbox;
+ GtkWidget * frame;
+ GtkWidget * label1, * label2, * label3;
+ GtkWidget * image;
+ GtkWidget * grid;
+ GtkWidget * button_box, * button;
+ PluginConfig * plugin_cfg;
+ HotkeyConfiguration * hotkey, temphotkey;
 int i;
 
- load_config ( );
+ load_config();
 
 plugin_cfg = get_config();
 
 ungrab_keys();
 
- main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 4);
-
- hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 2);
- gtk_box_pack_start (GTK_BOX (main_vbox), hbox, FALSE, TRUE, 0);
- image = gtk_image_new_from_icon_name ("dialog-information", GTK_ICON_SIZE_DIALOG);
- gtk_box_pack_start (GTK_BOX (hbox), image, FALSE, TRUE, 0);
- label = gtk_label_new (_("Press a key combination inside a text field.\nYou can also bind mouse buttons."));
- gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, TRUE, 0);
- gtk_widget_set_halign (label, GTK_ALIGN_START);
-
- label = gtk_label_new (nullptr);
- gtk_label_set_markup (GTK_LABEL (label), _("Hotkeys:"));
- frame = gtk_frame_new (nullptr);
- gtk_frame_set_label_widget (GTK_FRAME (frame), label);
- gtk_box_pack_start (GTK_BOX (main_vbox), frame, TRUE, TRUE, 0);
- gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_ETCHED_IN);
-
- grid = gtk_grid_new ();
- gtk_container_set_border_width (GTK_CONTAINER (grid), 3);
- gtk_grid_set_column_spacing (GTK_GRID (grid), 2);
- gtk_container_add (GTK_CONTAINER (frame), grid);
-
- label = gtk_label_new (nullptr);
- gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_CENTER);
- gtk_label_set_markup (GTK_LABEL (label),
- _("Action:"));
- gtk_grid_attach (GTK_GRID (grid), label, 0, 0, 1, 1);
-
- label = gtk_label_new (nullptr);
- gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_CENTER);
- gtk_label_set_markup (GTK_LABEL (label),
- _("Key Binding:"));
- gtk_grid_attach (GTK_GRID (grid), label, 1, 0, 1, 1);
-
+ main_vbox = audgui_vbox_new(4);
+
+ hbox = audgui_hbox_new(2);
+ gtk_box_pack_start(GTK_BOX(main_vbox), hbox, false, true, 0);
+ image = gtk_image_new_from_icon_name("dialog-information",
+ GTK_ICON_SIZE_DIALOG);
+ gtk_box_pack_start(GTK_BOX(hbox), image, false, true, 0);
+ label1 = gtk_label_new(_("Press a key combination inside a text field.\nYou "
+ "can also bind mouse buttons."));
+#ifdef USE_GTK3
+ gtk_widget_set_halign(label1, GTK_ALIGN_START);
+#else
+ gtk_misc_set_alignment(GTK_MISC(label1), 0, 0.5);
+#endif
+ gtk_box_pack_start(GTK_BOX(hbox), label1, true, true, 0);
+
+ label1 = gtk_label_new(nullptr);
+ gtk_label_set_markup(GTK_LABEL(label1), _("Hotkeys:"));
+ frame = gtk_frame_new(nullptr);
+ gtk_frame_set_label_widget(GTK_FRAME(frame), label1);
+ gtk_box_pack_start(GTK_BOX(main_vbox), frame, true, true, 0);
+ gtk_frame_set_shadow_type(GTK_FRAME(frame), GTK_SHADOW_ETCHED_IN);
+
+ grid = audgui_grid_new();
+ audgui_grid_set_column_spacing(grid, 2);
+ gtk_container_set_border_width(GTK_CONTAINER(grid), 3);
+ gtk_container_add(GTK_CONTAINER(frame), grid);
+
+ label2 = gtk_label_new(nullptr);
+ gtk_label_set_justify(GTK_LABEL(label2), GTK_JUSTIFY_CENTER);
+ gtk_label_set_markup(GTK_LABEL(label2), _("Action:"));
+
+ label3 = gtk_label_new(nullptr);
+ gtk_label_set_justify(GTK_LABEL(label3), GTK_JUSTIFY_CENTER);
+ gtk_label_set_markup(GTK_LABEL(label3), _("Key Binding:"));
+
+#ifdef USE_GTK3
+ gtk_grid_attach(GTK_GRID(grid), label2, 0, 0, 1, 1);
+ gtk_grid_attach(GTK_GRID(grid), label3, 1, 0, 1, 1);
+#else
+ gtk_misc_set_alignment(GTK_MISC(label2), 0.5, 0.5);
+ gtk_misc_set_alignment(GTK_MISC(label3), 0.5, 0.5);
+
+ gtk_table_attach_defaults(GTK_TABLE(grid), label2, 0, 1, 0, 1);
+ gtk_table_attach_defaults(GTK_TABLE(grid), label3, 1, 2, 0, 1);
+#endif
 
 hotkey = &(plugin_cfg->first);
 i = 1;
- first_controls = (KeyControls*) g_malloc(sizeof(KeyControls));
+ first_controls = (KeyControls *)g_malloc(sizeof(KeyControls));
 first_controls->next = nullptr;
 first_controls->prev = nullptr;
 first_controls->grid = grid;
@@ -427,14 +483,15 @@
 first_controls->first = first_controls;
 first_controls->hotkey.key = 0;
 first_controls->hotkey.mask = 0;
- first_controls->hotkey.event = (EVENT) 0;
+ first_controls->hotkey.event = (EVENT)0;
 first_controls->hotkey.type = TYPE_KEY;
 current_controls = first_controls;
- if (hotkey -> key != 0)
+ if (hotkey->key != 0)
 {
 while (hotkey)
 {
- current_controls = add_event_controls(current_controls, grid, i, hotkey);
+ current_controls =
+ add_event_controls(current_controls, grid, i, hotkey);
 hotkey = hotkey->next;
 i++;
 }
@@ -443,33 +500,32 @@
 temphotkey.mask = 0;
 temphotkey.type = TYPE_KEY;
 if (current_controls != first_controls)
- temphotkey.event = (EVENT) (current_controls->hotkey.event + 1);
+ temphotkey.event = (EVENT)(current_controls->hotkey.event + 1);
 else
- temphotkey.event = (EVENT) 0;
+ temphotkey.event = (EVENT)0;
 if (temphotkey.event >= EVENT_MAX)
- temphotkey.event = (EVENT) 0;
+ temphotkey.event = (EVENT)0;
 add_event_controls(current_controls, grid, i, &temphotkey);
 
+ hbox = audgui_hbox_new(0);
+ gtk_box_pack_start(GTK_BOX(main_vbox), hbox, false, true, 0);
 
- hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
- gtk_box_pack_start (GTK_BOX (main_vbox), hbox, FALSE, TRUE, 0);
-
- button_box = gtk_button_box_new (GTK_ORIENTATION_HORIZONTAL);
- gtk_box_pack_start (GTK_BOX (hbox), button_box, FALSE, TRUE, 0);
- gtk_button_box_set_layout (GTK_BUTTON_BOX (button_box), GTK_BUTTONBOX_START);
- gtk_box_set_spacing (GTK_BOX (button_box), 4);
+ button_box = audgui_button_box_new(GTK_ORIENTATION_HORIZONTAL);
+ gtk_box_pack_start(GTK_BOX(hbox), button_box, false, true, 0);
+ gtk_button_box_set_layout(GTK_BUTTON_BOX(button_box), GTK_BUTTONBOX_START);
+ gtk_box_set_spacing(GTK_BOX(button_box), 4);
 
- button = audgui_button_new (_("_Add"), "list-add", nullptr, nullptr);
- gtk_container_add (GTK_CONTAINER (button_box), button);
- g_signal_connect (G_OBJECT (button), "clicked",
- G_CALLBACK (add_callback), first_controls);
+ button = audgui_button_new(_("_Add"), "list-add", nullptr, nullptr);
+ gtk_container_add(GTK_CONTAINER(button_box), button);
+ g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(add_callback),
+ first_controls);
 
 return main_vbox;
 }
 
-static void clear_keyboard (GtkWidget *widget, void * data)
+static void clear_keyboard(GtkWidget * widget, void * data)
 {
- KeyControls *controls= (KeyControls*)data;
+ KeyControls * controls = (KeyControls *)data;
 
 if ((controls->next == nullptr) && (controls->prev->keytext == nullptr))
 {
@@ -477,24 +533,26 @@
 controls->hotkey.mask = 0;
 controls->hotkey.type = TYPE_KEY;
 set_keytext(controls->keytext, 0, 0, TYPE_KEY);
- gtk_combo_box_set_active( GTK_COMBO_BOX(controls->combobox), 0);
+ gtk_combo_box_set_active(GTK_COMBO_BOX(controls->combobox), 0);
 return;
 }
 
 if (controls->prev)
 {
- KeyControls* c;
- GtkWidget* grid;
+ KeyControls * c;
+ GtkWidget * grid;
 int row;
 
 gtk_widget_destroy(GTK_WIDGET(controls->button));
 gtk_widget_destroy(GTK_WIDGET(controls->keytext));
 gtk_widget_destroy(GTK_WIDGET(controls->combobox));
 
- row=0;
+ row = 0;
 c = controls->first;
- while (c) {
- if (c == controls) break;
+ while (c)
+ {
+ if (c == controls)
+ break;
 row++;
 c = c->next;
 }
@@ -503,21 +561,32 @@
 if (controls->next)
 controls->next->prev = controls->prev;
 g_free(controls);
- if (c) grid = c->grid; else grid = nullptr;
+ if (c)
+ grid = c->grid;
+ else
+ grid = nullptr;
 while (c)
 {
 g_object_ref(c->combobox);
 g_object_ref(c->keytext);
 g_object_ref(c->button);
 
- gtk_container_remove( GTK_CONTAINER(c->grid) , c->combobox);
- gtk_container_remove( GTK_CONTAINER(c->grid) , c->keytext);
- gtk_container_remove( GTK_CONTAINER(c->grid) , c->button);
-
- gtk_grid_attach (GTK_GRID (c->grid), c->combobox, 0, row, 1, 1);
- gtk_grid_attach (GTK_GRID (c->grid), c->keytext, 1, row, 1, 1);
- gtk_grid_attach (GTK_GRID (c->grid), c->button, 2, row, 1, 1);
-
+ gtk_container_remove(GTK_CONTAINER(c->grid), c->combobox);
+ gtk_container_remove(GTK_CONTAINER(c->grid), c->keytext);
+ gtk_container_remove(GTK_CONTAINER(c->grid), c->button);
+
+#ifdef USE_GTK3
+ gtk_grid_attach(GTK_GRID(c->grid), c->combobox, 0, row, 1, 1);
+ gtk_grid_attach(GTK_GRID(c->grid), c->keytext, 1, row, 1, 1);
+ gtk_grid_attach(GTK_GRID(c->grid), c->button, 2, row, 1, 1);
+#else
+ gtk_table_attach_defaults(GTK_TABLE(c->grid), c->combobox, 0, 1,
+ row, row + 1);
+ gtk_table_attach_defaults(GTK_TABLE(c->grid), c->keytext, 1, 2, row,
+ row + 1);
+ gtk_table_attach_defaults(GTK_TABLE(c->grid), c->button, 2, 3, row,
+ row + 1);
+#endif
 g_object_unref(c->combobox);
 g_object_unref(c->keytext);
 g_object_unref(c->button);
@@ -526,44 +595,50 @@
 row++;
 }
 if (grid)
- gtk_widget_show_all (GTK_WIDGET (grid));
+ gtk_widget_show_all(GTK_WIDGET(grid));
 
 return;
 }
 }
 
-void add_callback (GtkWidget *widget, void * data)
+void add_callback(GtkWidget * widget, void * data)
 {
- KeyControls* controls = (KeyControls*)data;
+ KeyControls * controls = (KeyControls *)data;
 HotkeyConfiguration temphotkey;
 int count;
- if (controls == nullptr) return;
- if ((controls->next == nullptr)&&(controls->hotkey.event+1 == EVENT_MAX)) return;
+ if (controls == nullptr)
+ return;
+ if ((controls->next == nullptr) &&
+ (controls->hotkey.event + 1 == EVENT_MAX))
+ return;
 controls = controls->first;
- if (controls == nullptr) return;
+ if (controls == nullptr)
+ return;
 count = 1;
- while (controls->next) {
+ while (controls->next)
+ {
 controls = controls->next;
 count = count + 1;
 }
 temphotkey.key = 0;
 temphotkey.mask = 0;
 temphotkey.type = TYPE_KEY;
- temphotkey.event = (EVENT) (controls->hotkey.event + 1);
+ temphotkey.event = (EVENT)(controls->hotkey.event + 1);
 if (temphotkey.event >= EVENT_MAX)
- temphotkey.event = (EVENT) 0;
+ temphotkey.event = (EVENT)0;
 add_event_controls(controls, controls->grid, count, &temphotkey);
- gtk_widget_show_all (GTK_WIDGET (controls->grid));
+ gtk_widget_show_all(GTK_WIDGET(controls->grid));
 }
 
-void destroy_callback ()
+void destroy_callback()
 {
- KeyControls* controls = first_controls;
+ KeyControls * controls = first_controls;
 
- grab_keys ();
+ grab_keys();
 
- while (controls) {
- KeyControls *old;
+ while (controls)
+ {
+ KeyControls * old;
 old = controls;
 controls = controls->next;
 g_free(old);
@@ -572,11 +647,11 @@
 first_controls = nullptr;
 }
 
-void ok_callback ()
+void ok_callback()
 {
- KeyControls *controls = first_controls;
- PluginConfig* plugin_cfg = get_config();
- HotkeyConfiguration *hotkey;
+ KeyControls * controls = first_controls;
+ PluginConfig * plugin_cfg = get_config();
+ HotkeyConfiguration * hotkey;
 
 hotkey = &(plugin_cfg->first);
 hotkey = hotkey->next;
@@ -589,37 +664,36 @@
 }
 plugin_cfg->first.next = nullptr;
 plugin_cfg->first.key = 0;
- plugin_cfg->first.event = (EVENT) 0;
+ plugin_cfg->first.event = (EVENT)0;
 plugin_cfg->first.mask = 0;
 
 hotkey = &(plugin_cfg->first);
 while (controls)
 {
- if (controls->hotkey.key) {
- if (hotkey->key) {
+ if (controls->hotkey.key)
+ {
+ if (hotkey->key)
+ {
 hotkey->next = g_new(HotkeyConfiguration, 1);
 hotkey = hotkey->next;
 hotkey->next = nullptr;
 }
 hotkey->key = controls->hotkey.key;
 hotkey->mask = controls->hotkey.mask;
- hotkey->event = (EVENT) gtk_combo_box_get_active( GTK_COMBO_BOX(controls->combobox) );
+ hotkey->event = (EVENT)gtk_combo_box_get_active(
+ GTK_COMBO_BOX(controls->combobox));
 hotkey->type = controls->hotkey.type;
 }
 controls = controls->next;
 }
 
- save_config ( );
+ save_config();
 }
 
-
 static const PreferencesWidget hotkey_widgets = {
- WidgetCustomGTK (make_config_widget)
-};
-
-const PluginPreferences hotkey_prefs = {
- {hotkey_widgets},
- nullptr, // init
- ok_callback,
- destroy_callback
-};
+ WidgetCustomGTK(make_config_widget)};
+
+const PluginPreferences hotkey_prefs = {{hotkey_widgets},
+ nullptr, // init
+ ok_callback,
+ destroy_callback};

audacious-plugins-4.4.1.tar.bz2/src/hotkey/meson.build Added

audacious-plugins-3.6.2-gtk3.tar.bz2/src/hotkey/plugin.cc -> audacious-plugins-4.4.1.tar.bz2/src/hotkey/plugin.cc Changed

@@ -30,11 +30,10 @@
 *
 * You should have received a copy of the GNU General Public License
 * along with audacious-hotkey; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
 */
 
-#include <stdlib.h>
-
 #include <X11/XF86keysym.h>
 
 #include <gdk/gdk.h>
@@ -48,26 +47,22 @@
 #include <libaudcore/plugin.h>
 #include <libaudcore/runtime.h>
 
-#include "plugin.h"
-#include "gui.h"
 #include "grab.h"
+#include "gui.h"
+#include "plugin.h"
 
 class GlobalHotkeys : public GeneralPlugin
 {
 public:
 static const char about;
 
- static constexpr PluginInfo info = {
- N_("Global Hotkeys"),
- PACKAGE,
- about,
- & hotkey_prefs
- };
+ static constexpr PluginInfo info = {N_("Global Hotkeys"), PACKAGE, about,
+ &hotkey_prefs, PluginGLibOnly};
 
- constexpr GlobalHotkeys () : GeneralPlugin (info, false) {}
+ constexpr GlobalHotkeys() : GeneralPlugin(info, false) {}
 
- bool init ();
- void cleanup ();
+ bool init();
+ void cleanup();
 };
 
 EXPORT GlobalHotkeys aud_plugin_instance;
@@ -76,236 +71,217 @@
 static PluginConfig plugin_cfg;
 
 const char GlobalHotkeys::about =
- N_("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>");
-
-PluginConfig* get_config(void)
-{
- return &plugin_cfg;
-}
-
+ N_("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"
+ "Contributors 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>");
+
+PluginConfig * get_config() { return &plugin_cfg; }
 
 /*
 * plugin activated
 */
-bool GlobalHotkeys::init ()
+bool GlobalHotkeys::init()
 {
- if (aud_get_mainloop_type () != MainloopType::GLib)
+ if (!gtk_init_check(nullptr, nullptr))
+ {
+ AUDERR("GTK+ initialization failed.\n");
 return false;
+ }
 
- if (! gtk_init_check (nullptr, nullptr))
+#ifdef USE_GTK3
+ /* Check for X11 to prevent segfaults on Wayland, supported since GTK 3 */
+ if (!GDK_IS_X11_DISPLAY(gdk_display_get_default()))
 {
- AUDERR ("GTK+ initialization failed.\n");
+ AUDERR("Global Hotkeys plugin only supports X11, not Wayland.\n");
 return false;
 }
+#endif
 
 setup_filter();
- load_config ( );
- grab_keys ( );
+ load_config();
+ grab_keys();
 
 return true;
 }
 
 /* handle keys */
-gboolean handle_keyevent (EVENT event)
+bool handle_keyevent(EVENT event)
 {
 int current_volume, old_volume;
 static int volume_static = 0;
- gboolean mute;
 
 /* get current volume */
- current_volume = aud_drct_get_volume_main ();
+ current_volume = aud_drct_get_volume_main();
 old_volume = current_volume;
- if (current_volume)
- {
- /* volume is not mute */
- mute = FALSE;
- } else {
- /* volume is mute */
- mute = TRUE;
- }
 
 /* mute the playback */
 if (event == EVENT_MUTE)
 {
- if (!mute)
+ if (current_volume != 0)
 {
 volume_static = current_volume;
- aud_drct_set_volume_main (0);
- mute = TRUE;
- } else {
- aud_drct_set_volume_main (volume_static);
- mute = FALSE;
+ aud_drct_set_volume_main(0);
+ }
+ else
+ {
+ aud_drct_set_volume_main(volume_static);
 }
- return TRUE;
+ return true;
 }
 
- /* decreace volume */
+ /* decrease volume */
 if (event == EVENT_VOL_DOWN)
 {
- if (mute)
- {
- current_volume = old_volume;
- old_volume = 0;
- mute = FALSE;
- }
-
- if ((current_volume -= plugin_cfg.vol_decrement) < 0)
+ if ((current_volume -= aud_get_int("volume_delta")) < 0)
 {
 current_volume = 0;
 }
 
 if (current_volume != old_volume)
 {
- aud_drct_set_volume_main (current_volume);
+ aud_drct_set_volume_main(current_volume);
 }
 
- old_volume = current_volume;
- return TRUE;
+ return true;
 }
 
 /* increase volume */
 if (event == EVENT_VOL_UP)
 {
- if (mute)
- {
- current_volume = old_volume;
- old_volume = 0;
- mute = FALSE;
- }
-
- if ((current_volume += plugin_cfg.vol_increment) > 100)
+ if ((current_volume += aud_get_int("volume_delta")) > 100)
 {
 current_volume = 100;
 }
 
 if (current_volume != old_volume)
 {
- aud_drct_set_volume_main (current_volume);
+ aud_drct_set_volume_main(current_volume);
 }
 
- old_volume = current_volume;
- return TRUE;
+ return true;
 }
 
 /* play */
 if (event == EVENT_PLAY)
 {
- aud_drct_play ();
- return TRUE;
+ aud_drct_play();
+ return true;
 }
 
 /* pause */
 if (event == EVENT_PAUSE)
 {
- aud_drct_play_pause ();
- return TRUE;
+ aud_drct_play_pause();
+ return true;
 }
 
 /* stop */
 if (event == EVENT_STOP)
 {
- aud_drct_stop ();
- return TRUE;
+ aud_drct_stop();
+ return true;
 }
 
 /* prev track */
 if (event == EVENT_PREV_TRACK)
 {
- aud_drct_pl_prev ();
- return TRUE;
+ aud_drct_pl_prev();
+ return true;
 }
 
 /* next track */
 if (event == EVENT_NEXT_TRACK)
 {
- aud_drct_pl_next ();
- return TRUE;
+ aud_drct_pl_next();
+ return true;
 }
 
 /* forward */
 if (event == EVENT_FORWARD)
 {
- aud_drct_seek (aud_drct_get_time () + 5000);
- return TRUE;
+ aud_drct_seek(aud_drct_get_time() + aud_get_int("step_size") * 1000);
+ return true;
 }
 
 /* backward */
 if (event == EVENT_BACKWARD)
 {
- int time = aud_drct_get_time ();
- if (time > 5000) time -= 5000; /* Jump 5s back */
- else time = 0;
- aud_drct_seek (time);
- return TRUE;
+ aud_drct_seek(aud_drct_get_time() - aud_get_int("step_size") * 1000);
+ return true;
 }
 
 /* Open Jump-To-File dialog */
- if (event == EVENT_JUMP_TO_FILE && ! aud_get_headless_mode ())
+ if (event == EVENT_JUMP_TO_FILE && !aud_get_headless_mode())
 {
- aud_ui_show_jump_to_song ();
- return TRUE;
+ aud_ui_show_jump_to_song();
+ return true;
 }
 
 /* Toggle Windows */
- if (event == EVENT_TOGGLE_WIN && ! aud_get_headless_mode ())
+ if (event == EVENT_TOGGLE_WIN && !aud_get_headless_mode())
 {
- aud_ui_show (! aud_ui_is_shown ());
- return TRUE;
+ aud_ui_show(!aud_ui_is_shown());
+ return true;
 }
 
 /* Show OSD through AOSD plugin*/
 if (event == EVENT_SHOW_AOSD)
 {
 hook_call("aosd toggle", nullptr);
- return TRUE;
+ return true;
 }
 
 if (event == EVENT_TOGGLE_REPEAT)
 {
- aud_set_bool (nullptr, "repeat", ! aud_get_bool (nullptr, "repeat"));
- return TRUE;
+ aud_toggle_bool("repeat");
+ return true;
 }
 
 if (event == EVENT_TOGGLE_SHUFFLE)
 {
- aud_set_bool (nullptr, "shuffle", ! aud_get_bool (nullptr, "shuffle"));
- return TRUE;
+ aud_toggle_bool("shuffle");
+ return true;
 }
 
 if (event == EVENT_TOGGLE_STOP)
 {
- aud_set_bool (nullptr, "stop_after_current_song", ! aud_get_bool (nullptr, "stop_after_current_song"));
- return TRUE;
+ aud_toggle_bool("stop_after_current_song");
+ return true;
 }
 
 if (event == EVENT_RAISE)
 {
- aud_ui_show (TRUE);
- return TRUE;
+ aud_ui_show(true);
+ return true;
 }
 
- return FALSE;
+ return false;
 }
 
-void add_hotkey(HotkeyConfiguration** pphotkey, KeySym keysym, int mask, int type, EVENT event)
+void add_hotkey(HotkeyConfiguration ** pphotkey, KeySym keysym, int mask,
+ int type, EVENT event)
 {
 KeyCode keycode;
- HotkeyConfiguration *photkey;
- if (keysym == 0) return;
- if (pphotkey == nullptr) return;
+ HotkeyConfiguration * photkey;
+ if (keysym == 0)
+ return;
+ if (pphotkey == nullptr)
+ return;
 photkey = *pphotkey;
- if (photkey == nullptr) return;
- keycode = XKeysymToKeycode(GDK_DISPLAY_XDISPLAY(gdk_display_get_default()), keysym);
- if (keycode == 0) return;
- if (photkey->key) {
+ if (photkey == nullptr)
+ return;
+ keycode = XKeysymToKeycode(GDK_DISPLAY_XDISPLAY(gdk_display_get_default()),
+ keysym);
+ if (keycode == 0)
+ return;
+ if (photkey->key)
+ {
 photkey->next = g_new(HotkeyConfiguration, 1);
 photkey = photkey->next;
 *pphotkey = photkey;
@@ -317,9 +293,9 @@
 photkey->type = type;
 }
 
-void load_defaults (void)
+void load_defaults()
 {
- HotkeyConfiguration* hotkey;
+ HotkeyConfiguration * hotkey;
 
 hotkey = &(plugin_cfg.first);
 
@@ -329,92 +305,94 @@
 add_hotkey(&hotkey, XF86XK_AudioStop, 0, TYPE_KEY, EVENT_STOP);
 add_hotkey(&hotkey, XF86XK_AudioNext, 0, TYPE_KEY, EVENT_NEXT_TRACK);
 
-/* add_hotkey(&hotkey, XF86XK_AudioRewind, 0, TYPE_KEY, EVENT_BACKWARD); */
+ /* add_hotkey(&hotkey, XF86XK_AudioRewind, 0, TYPE_KEY, EVENT_BACKWARD);
+ */
 
 add_hotkey(&hotkey, XF86XK_AudioMute, 0, TYPE_KEY, EVENT_MUTE);
 add_hotkey(&hotkey, XF86XK_AudioRaiseVolume, 0, TYPE_KEY, EVENT_VOL_UP);
 add_hotkey(&hotkey, XF86XK_AudioLowerVolume, 0, TYPE_KEY, EVENT_VOL_DOWN);
 
-/* add_hotkey(&hotkey, XF86XK_AudioMedia, 0, TYPE_KEY, EVENT_JUMP_TO_FILE);
- add_hotkey(&hotkey, XF86XK_Music, 0, TYPE_KEY, EVENT_TOGGLE_WIN); */
+ /* add_hotkey(&hotkey, XF86XK_AudioMedia, 0, TYPE_KEY,
+ EVENT_JUMP_TO_FILE); add_hotkey(&hotkey, XF86XK_Music, 0, TYPE_KEY,
+ EVENT_TOGGLE_WIN); */
 }
 
 /* load plugin configuration */
-void load_config (void)
+void load_config()
 {
- HotkeyConfiguration *hotkey;
- int i,max;
-
- /* default volume level */
- plugin_cfg.vol_increment = 4;
- plugin_cfg.vol_decrement = 4;
+ HotkeyConfiguration * hotkey;
+ int i, max;
 
 hotkey = &(plugin_cfg.first);
 hotkey->next = nullptr;
 hotkey->key = 0;
 hotkey->mask = 0;
- hotkey->event = (EVENT) 0;
+ hotkey->event = (EVENT)0;
 hotkey->type = TYPE_KEY;
 
- max = aud_get_int ("globalHotkey", "NumHotkeys");
+ max = aud_get_int("globalHotkey", "NumHotkeys");
 if (max == 0)
 load_defaults();
- else for (i=0; i<max; i++)
- {
- char *text = nullptr;
-
- if (hotkey->key) {
- hotkey->next = g_new(HotkeyConfiguration, 1);
- hotkey = hotkey->next;
- hotkey->next = nullptr;
- hotkey->key = 0;
- hotkey->mask = 0;
- hotkey->event = (EVENT) 0;
- hotkey->type = TYPE_KEY;
- }
- text = g_strdup_printf("Hotkey_%d_key", i);
- hotkey->key = aud_get_int ("globalHotkey", text);
- g_free(text);
+ else
+ for (i = 0; i < max; i++)
+ {
+ char * text = nullptr;
+
+ if (hotkey->key)
+ {
+ hotkey->next = g_new(HotkeyConfiguration, 1);
+ hotkey = hotkey->next;
+ hotkey->next = nullptr;
+ hotkey->key = 0;
+ hotkey->mask = 0;
+ hotkey->event = (EVENT)0;
+ hotkey->type = TYPE_KEY;
+ }
+ text = g_strdup_printf("Hotkey_%d_key", i);
+ hotkey->key = aud_get_int("globalHotkey", text);
+ g_free(text);
 
- text = g_strdup_printf("Hotkey_%d_mask", i);
- hotkey->mask = aud_get_int ("globalHotkey", text);
- g_free(text);
+ text = g_strdup_printf("Hotkey_%d_mask", i);
+ hotkey->mask = aud_get_int("globalHotkey", text);
+ g_free(text);
 
- text = g_strdup_printf("Hotkey_%d_type", i);
- hotkey->type = aud_get_int ("globalHotkey", text);
- g_free(text);
+ text = g_strdup_printf("Hotkey_%d_type", i);
+ hotkey->type = aud_get_int("globalHotkey", text);
+ g_free(text);
 
- text = g_strdup_printf("Hotkey_%d_event", i);
- hotkey->event = (EVENT) aud_get_int ("globalHotkey", text);
- g_free(text);
- }
+ text = g_strdup_printf("Hotkey_%d_event", i);
+ hotkey->event = (EVENT)aud_get_int("globalHotkey", text);
+ g_free(text);
+ }
 }
 
 /* save plugin configuration */
-void save_config (void)
+void save_config()
 {
 int max;
- HotkeyConfiguration *hotkey;
+ HotkeyConfiguration * hotkey;
 
 hotkey = &(plugin_cfg.first);
 max = 0;
- while (hotkey) {
- char *text = nullptr;
- if (hotkey->key) {
+ while (hotkey)
+ {
+ char * text = nullptr;
+ if (hotkey->key)
+ {
 text = g_strdup_printf("Hotkey_%d_key", max);
- aud_set_int ("globalHotkey", text, hotkey->key);
+ aud_set_int("globalHotkey", text, hotkey->key);
 g_free(text);
 
 text = g_strdup_printf("Hotkey_%d_mask", max);
- aud_set_int ("globalHotkey", text, hotkey->mask);
+ aud_set_int("globalHotkey", text, hotkey->mask);
 g_free(text);
 
 text = g_strdup_printf("Hotkey_%d_type", max);
- aud_set_int ("globalHotkey", text, hotkey->type);
+ aud_set_int("globalHotkey", text, hotkey->type);
 g_free(text);
 
 text = g_strdup_printf("Hotkey_%d_event", max);
- aud_set_int ("globalHotkey", text, hotkey->event);
+ aud_set_int("globalHotkey", text, hotkey->event);
 g_free(text);
 max++;
 }
@@ -422,13 +400,13 @@
 hotkey = hotkey->next;
 }
 
- aud_set_int ("globalHotkey", "NumHotkeys", max);
+ aud_set_int("globalHotkey", "NumHotkeys", max);
 }
 
-void GlobalHotkeys::cleanup ()
+void GlobalHotkeys::cleanup()
 {
- HotkeyConfiguration* hotkey;
- ungrab_keys ();
+ HotkeyConfiguration * hotkey;
+ ungrab_keys();
 release_filter();
 hotkey = &(plugin_cfg.first);
 hotkey = hotkey->next;
@@ -441,6 +419,6 @@
 }
 plugin_cfg.first.next = nullptr;
 plugin_cfg.first.key = 0;
- plugin_cfg.first.event = (EVENT) 0;
+ plugin_cfg.first.event = (EVENT)0;
 plugin_cfg.first.mask = 0;
 }

audacious-plugins-3.6.2-gtk3.tar.bz2/src/hotkey/plugin.h -> audacious-plugins-4.4.1.tar.bz2/src/hotkey/plugin.h Changed

audacious-plugins-4.4.1.tar.bz2/src/jack Added

audacious-plugins-4.4.1.tar.bz2/src/jack/Makefile Changed

audacious-plugins-4.4.1.tar.bz2/src/jack/jack-ng.cc Added

@@ -0,0 +1,450 @@
+/*
+ * JACK Output Plugin for Audacious
+ * Copyright 2014 John Lindgren
+ *
+ * Based on the SDL Output Plugin and the previous JACK Output Plugin.
+ *
+ * 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 <libaudcore/audstrings.h>
+#include <libaudcore/i18n.h>
+#include <libaudcore/interface.h>
+#include <libaudcore/plugin.h>
+#include <libaudcore/preferences.h>
+#include <libaudcore/ringbuf.h>
+#include <libaudcore/runtime.h>
+
+#include <algorithm>
+#include <iterator>
+
+#include <assert.h>
+#include <pthread.h>
+#include <sys/time.h>
+
+/* jack/types.h uses "register" as a parameter name :( */
+#define register register_
+#include <jack/jack.h>
+#undef register
+
+static_assert(std::is_same<jack_default_audio_sample_t, float>::value,
+ "JACK must be compiled to use float samples");
+
+class JACKOutput : public OutputPlugin
+{
+public:
+ static const char client_name_default;
+ static const char * const defaults;
+ static const PreferencesWidget widgets;
+ static const PluginPreferences prefs;
+
+ static constexpr PluginInfo info = {
+ N_("JACK Output"),
+ PACKAGE,
+ nullptr,
+ & prefs
+ };
+
+ constexpr JACKOutput (RingBuf<float> & buffer) :
+ OutputPlugin (info, 0),
+ m_buffer (buffer) {}
+
+ bool init ();
+
+ StereoVolume get_volume ();
+ void set_volume (StereoVolume v);
+
+ bool open_audio (int format, int rate, int channels, String & error);
+ void close_audio ();
+
+ void period_wait ();
+ int write_audio (const void * data, int size);
+ void drain ();
+
+ int get_delay ();
+
+ void pause (bool pause);
+ void flush ();
+
+private:
+ bool connect_ports (int channels, String & error);
+ void generate (jack_nframes_t frames);
+
+ static void error_cb (const char * error)
+ { AUDWARN ("%s\n", error); }
+ static int generate_cb (jack_nframes_t frames, void * obj)
+ { ((JACKOutput *) obj)->generate (frames); return 0; }
+
+ int m_rate = 0, m_channels = 0;
+ bool m_paused = false, m_prebuffer = false;
+
+ int m_last_write_frames = 0;
+ timeval m_last_write_time = timeval ();
+ bool m_rate_mismatch = false;
+
+ RingBuf<float> & m_buffer;
+
+ jack_client_t * m_client = nullptr;
+ jack_port_t * m_portsAUD_MAX_CHANNELS = {};
+
+ pthread_mutex_t m_mutex = PTHREAD_MUTEX_INITIALIZER;
+ pthread_cond_t m_cond = PTHREAD_COND_INITIALIZER;
+};
+
+// must be separate in order for JACKOutput() to be constexpr
+static RingBuf<float> s_buffer;
+
+EXPORT JACKOutput aud_plugin_instance (s_buffer);
+
+const char JACKOutput::client_name_default = "audacious";
+
+const char * const JACKOutput::defaults = {
+ "auto_connect", "TRUE",
+ "client_name", JACKOutput::client_name_default,
+ "ports_filter", "",
+ "ports_ignore", "FALSE",
+ "ports_physical", "TRUE",
+ "ports_upmix", "2",
+ "volume_left", "100",
+ "volume_right", "100",
+ nullptr
+};
+
+const PreferencesWidget JACKOutput::widgets = {
+ WidgetEntry (N_("Client name:"),
+ WidgetString ("jack", "client_name")),
+ WidgetCheck (N_("Automatically connect to output ports"),
+ WidgetBool ("jack", "auto_connect")),
+ WidgetLabel (N_("Filter ports (regex, use any port if blank):"),
+ WIDGET_CHILD),
+ WidgetEntry (nullptr,
+ WidgetString ("jack", "ports_filter"),
+ {false},
+ WIDGET_CHILD),
+ WidgetCheck (N_("Connect to physical ports only"),
+ WidgetBool ("jack", "ports_physical"),
+ WIDGET_CHILD),
+ WidgetSpin (N_("Upmix to"),
+ WidgetInt ("jack", "ports_upmix"),
+ {1, 96, 1, N_("ports if input has fewer channels")},
+ WIDGET_CHILD),
+ WidgetCheck (N_("Ignore insufficient number of ports"),
+ WidgetBool ("jack", "ports_ignore"),
+ WIDGET_CHILD)
+};
+
+const PluginPreferences JACKOutput::prefs = {{widgets}};
+
+bool JACKOutput::init ()
+{
+ aud_config_set_defaults ("jack", defaults);
+ return true;
+}
+
+void JACKOutput::set_volume (StereoVolume v)
+{
+ aud_set_int ("jack", "volume_left", v.left);
+ aud_set_int ("jack", "volume_right", v.right);
+}
+
+StereoVolume JACKOutput::get_volume ()
+{
+ return {aud_get_int ("jack", "volume_left"), aud_get_int ("jack", "volume_right")};
+}
+
+bool JACKOutput::connect_ports (int channels, String & error)
+{
+ bool success = false;
+ const char * * ports = nullptr;
+ int count = 0;
+
+ unsigned long ports_flags = JackPortIsInput;
+ if (aud_get_bool ("jack", "ports_physical"))
+ ports_flags |= JackPortIsPhysical;
+
+ if (! (ports = jack_get_ports (m_client, aud_get_str ("jack", "ports_filter"), nullptr, ports_flags)))
+ {
+ if (! aud_get_bool ("jack", "ports_ignore"))
+ {
+ error = String (_("No JACK output ports were found. Please check settings."));
+ goto fail;
+ }
+ }
+ else
+ {
+ while (portscount)
+ count ++;
+ }
+
+ if (count < channels)
+ {
+ if (! aud_get_bool ("jack", "ports_ignore"))
+ {
+ error = String (str_printf (_("Only %d JACK output ports were "
+ "found but %d are required."), count, channels));
+ goto fail;
+ }
+ else
+ AUDWARN ("Not enough output ports available. Playing %d of %d channels.\n", count, channels);
+ }
+
+ // upmix
+ count = aud::min (count, aud::max (aud_get_int ("jack", "ports_upmix"), channels));
+
+ for (int i = 0; i < count; i ++)
+ {
+ if (jack_connect (m_client, jack_port_name (m_portsi % channels), portsi) != 0)
+ {
+ error = String (str_printf (_("Failed to connect to JACK port %s."), portsi));
+ goto fail;
+ }
+ }
+
+ success = true;
+
+fail:
+ if (ports)
+ jack_free (ports);
+
+ return success;
+}
+
+bool JACKOutput::open_audio (int format, int rate, int channels, String & error)
+{
+ int buffer_time;
+
+ if (format != FMT_FLOAT)
+ {
+ error = String (_("JACK supports only floating-point audio. You "
+ "must change the output bit depth to floating-point in Audacious "
+ "settings."));
+ return false;
+ }
+
+ assert (rate > 0 && channels > 0 && channels < AUD_MAX_CHANNELS);
+ assert (! m_client);
+
+ jack_set_error_function (error_cb);
+
+ StringBuf client_name = str_copy (aud_get_str ("jack", "client_name"), jack_client_name_size () - 1);
+
+ if (! (m_client = jack_client_open (client_name0 ? client_name : JACKOutput::client_name_default, JackNoStartServer, nullptr)))
+ {
+ error = String (_("Failed to connect to the JACK server; is it running?"));
+ goto fail;
+ }
+
+ for (int i = 0; i < channels; i ++)
+ {
+ StringBuf name = str_printf ("out_%d", i);
+ if (! (m_portsi = jack_port_register (m_client, name,
+ JACK_DEFAULT_AUDIO_TYPE, JackPortIsOutput, 0)))
+ {
+ AUDERR ("jack_port_register() failed\n");
+ goto fail;
+ }
+ }
+
+ buffer_time = aud_get_int ("output_buffer_size");
+ m_buffer.alloc (aud::rescale (buffer_time, 1000, rate) * channels);
+
+ m_rate = rate;
+ m_channels = channels;
+ m_paused = false;
+ m_prebuffer = true;
+
+ m_last_write_frames = 0;
+ m_last_write_time = timeval ();
+ m_rate_mismatch = false;
+
+ jack_set_process_callback (m_client, generate_cb, this);
+
+ if (jack_activate (m_client) != 0)
+ {
+ AUDERR ("jack_activate() failed\n");
+ goto fail;
+ }
+
+ if (aud_get_bool ("jack", "auto_connect"))
+ {
+ if (! connect_ports (channels, error))
+ goto fail;
+ }
+
+ return true;
+
+fail:
+ close_audio ();
+ return false;
+}
+
+void JACKOutput::close_audio ()
+{
+ if (m_client)
+ jack_client_close (m_client);
+
+ m_buffer.destroy ();
+
+ std::fill (m_ports, std::end (m_ports), nullptr);
+ m_client = nullptr;
+}
+
+void JACKOutput::generate (jack_nframes_t frames)
+{
+ pthread_mutex_lock (& m_mutex);
+
+ m_last_write_frames = 0;
+ gettimeofday (& m_last_write_time, nullptr);
+
+ float * outAUD_MAX_CHANNELS;
+ for (int i = 0; i < m_channels; i ++)
+ outi = (float *) jack_port_get_buffer (m_portsi, frames);
+
+ int jack_rate = jack_get_sample_rate (m_client);
+
+ if (jack_rate != m_rate)
+ {
+ if (! m_rate_mismatch)
+ {
+ aud_ui_show_error (str_printf (_("The JACK server requires a "
+ "sample rate of %d Hz, but Audacious is playing at %d Hz. Please "
+ "use the Sample Rate Converter effect to correct the mismatch."),
+ jack_rate, m_rate));
+ m_rate_mismatch = true;
+ }
+
+ goto silence;
+ }
+
+ m_rate_mismatch = false;
+
+ if (m_paused || m_prebuffer)
+ goto silence;
+
+ while (frames && m_buffer.len ())
+ {
+ int linear_samples = m_buffer.linear ();
+ assert (linear_samples % m_channels == 0);
+
+ int frames_to_copy = aud::min (frames, (jack_nframes_t) linear_samples / m_channels);
+
+ audio_amplify (& m_buffer0, m_channels, frames_to_copy, get_volume ());
+ audio_deinterlace (& m_buffer0, FMT_FLOAT, m_channels,
+ (void * const *) out, frames_to_copy);
+
+ m_last_write_frames += frames_to_copy;
+ m_buffer.discard (frames_to_copy * m_channels);
+
+ for (int i = 0; i < m_channels; i ++)
+ outi += frames_to_copy;
+
+ frames -= frames_to_copy;
+ }
+
+silence:
+ for (int i = 0; i < m_channels; i ++)
+ std::fill (outi, outi + frames, 0.0);
+
+ pthread_cond_broadcast (& m_cond);
+ pthread_mutex_unlock (& m_mutex);
+}
+
+void JACKOutput::period_wait ()
+{
+ pthread_mutex_lock (& m_mutex);
+
+ while (! m_buffer.space ())
+ {
+ m_prebuffer = false;
+ pthread_cond_wait (& m_cond, & m_mutex);
+ }
+
+ pthread_mutex_unlock (& m_mutex);
+}
+
+int JACKOutput::write_audio (const void * data, int size)
+{
+ pthread_mutex_lock (& m_mutex);
+
+ int samples = size / sizeof (float);
+ assert (samples % m_channels == 0);
+
+ samples = aud::min (samples, m_buffer.space ());
+
+ m_buffer.copy_in ((const float *) data, samples);
+
+ if (m_buffer.len () >= m_buffer.size () / 4)
+ m_prebuffer = false;
+
+ pthread_mutex_unlock (& m_mutex);
+ return samples * sizeof (float);
+}
+
+void JACKOutput::drain ()
+{
+ pthread_mutex_lock (& m_mutex);
+
+ m_prebuffer = false;
+
+ while (m_buffer.len () || m_last_write_frames)
+ pthread_cond_wait (& m_cond, & m_mutex);
+
+ pthread_mutex_unlock (& m_mutex);
+}
+
+int JACKOutput::get_delay ()
+{
+ auto timediff = (const timeval & a, const timeval & b) -> int64_t
+ { return 1000 * (int64_t) (b.tv_sec - a.tv_sec) + (b.tv_usec - a.tv_usec) / 1000; };
+
+ pthread_mutex_lock (& m_mutex);
+
+ int delay = aud::rescale (m_buffer.len (), m_channels * m_rate, 1000);
+
+ if (m_last_write_frames)
+ {
+ timeval now;
+ gettimeofday (& now, nullptr);
+
+ int written = aud::rescale (m_last_write_frames, m_rate, 1000);
+ delay += aud::max (written - timediff (m_last_write_time, now), (int64_t) 0);
+ }
+
+ pthread_mutex_unlock (& m_mutex);
+ return delay;
+}
+
+void JACKOutput::pause (bool pause)
+{
+ pthread_mutex_lock (& m_mutex);
+ m_paused = pause;
+ pthread_cond_broadcast (& m_cond);
+ pthread_mutex_unlock (& m_mutex);
+}
+
+void JACKOutput::flush ()
+{
+ pthread_mutex_lock (& m_mutex);
+
+ m_buffer.discard ();
+
+ m_prebuffer = true;
+
+ m_last_write_frames = 0;
+ m_last_write_time = timeval ();
+
+ pthread_cond_broadcast (& m_cond);
+ pthread_mutex_unlock (& m_mutex);
+}

audacious-plugins-4.4.1.tar.bz2/src/jack/meson.build Added

audacious-plugins-4.4.1.tar.bz2/src/ladspa/meson.build Added

audacious-plugins-3.6.2-gtk3.tar.bz2/src/ladspa/plugin.cc -> audacious-plugins-4.4.1.tar.bz2/src/ladspa/plugin.cc Changed

@@ -30,13 +30,11 @@
 #include <libaudcore/audstrings.h>
 #include <libaudcore/preferences.h>
 #include <libaudcore/runtime.h>
+#include <libaudgui/gtk-compat.h>
+#include <libaudgui/libaudgui-gtk.h>
 
 #include "plugin.h"
 
-#if GTK_CHECK_VERSION (3, 12, 0)
-#define gtk_widget_set_margin_left gtk_widget_set_margin_start
-#endif
-
 const char * const LADSPAHost::defaults = {
 "plugin_count", "0",
 nullptr};
@@ -113,7 +111,7 @@
 g_return_if_fail (slash && slash1);
 g_return_if_fail (desc.Label && desc.Name);
 
- PluginData & plugin = * plugins.append (SmartNew<PluginData> (slash + 1, desc));
+ PluginData & plugin = * plugins.append (new PluginData (slash + 1, desc));
 
 for (unsigned i = 0; i < desc.PortCount; i ++)
 {
@@ -207,7 +205,7 @@
 
 LoadedPlugin & enable_plugin_locked (PluginData & plugin)
 {
- LoadedPlugin & loaded = * loadeds.append (SmartNew<LoadedPlugin> (plugin));
+ LoadedPlugin & loaded = * loadeds.append (new LoadedPlugin (plugin));
 
 for (auto & control : plugin.controls)
 loaded.values.append (control.def);
@@ -427,7 +425,7 @@
 {
 ControlData & control = plugin.controlsi;
 
- GtkWidget * hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
+ GtkWidget * hbox = audgui_hbox_new (6);
 gtk_box_pack_start ((GtkBox *) vbox, hbox, 0, 0, 0);
 
 if (control.is_toggle)
@@ -473,10 +471,12 @@
 
 static void * make_config_widget ()
 {
- GtkWidget * vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
- gtk_widget_set_size_request (vbox, 480, 360);
+ int dpi = audgui_get_dpi ();
 
- GtkWidget * hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
+ GtkWidget * vbox = audgui_vbox_new (6);
+ gtk_widget_set_size_request (vbox, 5 * dpi, 4 * dpi);
+
+ GtkWidget * hbox = audgui_hbox_new (6);
 gtk_box_pack_start ((GtkBox *) vbox, hbox, 0, 0, 0);
 
 GtkWidget * label = gtk_label_new (_("Module paths:"));
@@ -487,17 +487,22 @@
 _("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."));
- gtk_widget_set_margin_left (label, 12);
+#ifdef USE_GTK3
+ gtk_widget_set_margin_start (label, 12);
 gtk_widget_set_halign (label, GTK_ALIGN_START);
+#else
+ gtk_misc_set_padding ((GtkMisc *) label, 12, 6);
+ gtk_misc_set_alignment ((GtkMisc *) label, 0, 0);
+#endif
 gtk_box_pack_start ((GtkBox *) vbox, label, 0, 0, 0);
 
 GtkWidget * entry = gtk_entry_new ();
 gtk_box_pack_start ((GtkBox *) hbox, entry, 1, 1, 0);
 
- hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
+ hbox = audgui_hbox_new (6);
 gtk_box_pack_start ((GtkBox *) vbox, hbox, 1, 1, 0);
 
- GtkWidget * vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
+ GtkWidget * vbox2 = audgui_vbox_new (6);
 gtk_box_pack_start ((GtkBox *) hbox, vbox2, 1, 1, 0);
 
 label = gtk_label_new (_("Available plugins:"));
@@ -510,13 +515,13 @@
 plugin_list = create_plugin_list ();
 gtk_container_add ((GtkContainer *) scrolled, plugin_list);
 
- GtkWidget * hbox2 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
+ GtkWidget * hbox2 = audgui_hbox_new (6);
 gtk_box_pack_start ((GtkBox *) vbox2, hbox2, 0, 0, 0);
 
 GtkWidget * enable_button = gtk_button_new_with_label (_("Enable"));
 gtk_box_pack_end ((GtkBox *) hbox2, enable_button, 0, 0, 0);
 
- vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
+ vbox2 = audgui_vbox_new (6);
 gtk_box_pack_start ((GtkBox *) hbox, vbox2, 1, 1, 0);
 
 label = gtk_label_new (_("Enabled plugins:"));
@@ -529,7 +534,7 @@
 loaded_list = create_loaded_list ();
 gtk_container_add ((GtkContainer *) scrolled, loaded_list);
 
- hbox2 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
+ hbox2 = audgui_hbox_new (6);
 gtk_box_pack_start ((GtkBox *) vbox2, hbox2, 0, 0, 0);
 
 GtkWidget * disable_button = gtk_button_new_with_label (_("Disable"));

audacious-plugins-3.6.2-gtk3.tar.bz2/src/lirc/lirc.cc -> audacious-plugins-4.4.1.tar.bz2/src/lirc/lirc.cc Changed

@@ -85,7 +85,7 @@
 int track_no_pos;
 int tid;
 
-void init_lirc (void)
+void init_lirc ()
 {
     int flags;
 
@@ -147,8 +147,8 @@
 
 gboolean jump_to (void * data)
 {
-    int playlist = aud_playlist_get_active ();
-    aud_playlist_set_position (playlist, atoi (track_no) - 1);
+    auto playlist = Playlist::active_playlist ();
+    playlist.set_position (atoi (track_no) - 1);
     track_no_pos = 0;
     tid = 0;
     return false;
@@ -209,9 +209,9 @@
                 }
             }
             else if (g_ascii_strcasecmp ("SHUFFLE", c) == 0)
-                aud_set_bool (nullptr, "shuffle", ! aud_get_bool (nullptr, "shuffle"));
+                aud_toggle_bool ("shuffle");
             else if (g_ascii_strcasecmp ("REPEAT", c) == 0)
-                aud_set_bool (nullptr, "repeat", ! aud_get_bool (nullptr, "repeat"));
+                aud_toggle_bool ("repeat");
             else if (g_ascii_strncasecmp ("FWD", c, 3) == 0)
             {
                 ptr = c + 3;
@@ -330,10 +330,7 @@
             else if (g_ascii_strcasecmp ("PLAYLIST_CLEAR", c) == 0)
             {
                 aud_drct_stop ();
-                int playlist = aud_playlist_get_active ();
-                aud_playlist_entry_delete (playlist, 0,
-                                           aud_playlist_entry_count
-                                           (playlist));
+                Playlist::active_playlist ().remove_all_entries ();
             }
             else if (g_ascii_strncasecmp ("PLAYLIST_ADD ", c, 13) == 0)
             {
@@ -350,6 +347,7 @@
                     tid = g_timeout_add (1500, jump_to, nullptr);
                     utf8_title_markup = g_markup_printf_escaped ("%s", track_no);
                     hook_call ("aosd toggle", utf8_title_markup);
+                    g_free (utf8_title_markup);
                 }
             }
             else

audacious-plugins-4.4.1.tar.bz2/src/lirc/meson.build Added

audacious-plugins-4.4.1.tar.bz2/src/lyrics-common Added

audacious-plugins-4.4.1.tar.bz2/src/lyrics-common/chart_lyrics_provider.cc Added

@@ -0,0 +1,195 @@
+/*
+ * Copyright (c) 2024 Thomas Lange <thomas-lange2@gmx.de>
+ *
+ * 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.
+ *
+ * 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.
+ */
+
+#include "lyrics.h"
+
+void ChartLyricsProvider::reset_lyric_metadata ()
+{
+ m_lyric_id = -1;
+ m_lyric_checksum = String ();
+ m_lyric_url = String ();
+ m_lyrics = String ();
+}
+
+String ChartLyricsProvider::match_uri (LyricsState state)
+{
+ auto artist = str_copy (state.artist);
+ artist = str_encode_percent (artist, -1);
+
+ auto title = str_copy (state.title);
+ title = str_encode_percent (title, -1);
+
+ return String (str_concat ({m_base_url, "/SearchLyric?artist=", artist, "&song=", title}));
+}
+
+bool ChartLyricsProvider::has_match (LyricsState state, xmlNodePtr node)
+{
+ String lyric_id, checksum, url, artist, title;
+
+ for (xmlNodePtr cur_node = node->xmlChildrenNode; cur_node; cur_node = cur_node->next)
+ {
+ if (cur_node->type != XML_ELEMENT_NODE)
+ continue;
+
+ xmlChar * content = xmlNodeGetContent (cur_node);
+
+ if (xmlStrEqual (cur_node->name, (xmlChar *) "LyricId"))
+ lyric_id = String ((const char *) content);
+ else if (xmlStrEqual (cur_node->name, (xmlChar *) "LyricChecksum"))
+ checksum = String ((const char *) content);
+ else if (xmlStrEqual (cur_node->name, (xmlChar *) "SongUrl"))
+ url = String ((const char *) content);
+ else if (xmlStrEqual (cur_node->name, (xmlChar *) "Artist"))
+ artist = String ((const char *) content);
+ else if (xmlStrEqual (cur_node->name, (xmlChar *) "Song"))
+ title = String ((const char *) content);
+
+ xmlFree (content);
+ }
+
+ if (lyric_id && checksum && artist && title) // url is optional
+ {
+ int id = str_to_int (lyric_id);
+
+ if (id > 0 &&
+ ! strcmp_nocase (artist, state.artist) &&
+ ! strcmp_nocase (title, state.title))
+ {
+ m_lyric_id = id;
+ m_lyric_checksum = checksum;
+ m_lyric_url = url;
+
+ return true;
+ }
+ }
+
+ return false;
+}
+
+bool ChartLyricsProvider::match (LyricsState state)
+{
+ reset_lyric_metadata ();
+
+ auto handle_result_cb = = (const char * uri, const Index<char> & buf) {
+ if (! buf.len ())
+ {
+ update_lyrics_window_error (str_printf (_("Unable to fetch %s"), uri));
+ return;
+ }
+
+ xmlDocPtr doc = xmlReadMemory (buf.begin (), buf.len (), nullptr, nullptr, 0);
+ if (! doc)
+ {
+ update_lyrics_window_error (str_printf (_("Unable to parse %s"), uri));
+ return;
+ }
+
+ xmlNodePtr root = xmlDocGetRootElement (doc);
+
+ for (xmlNodePtr cur_node = root->xmlChildrenNode; cur_node; cur_node = cur_node->next)
+ {
+ if (cur_node->type != XML_ELEMENT_NODE)
+ continue;
+
+ if (has_match (state, cur_node))
+ break;
+ }
+
+ xmlFreeDoc (doc);
+
+ fetch (state);
+ };
+
+ vfs_async_file_get_contents (match_uri (state), handle_result_cb);
+ update_lyrics_window_message (state, _("Looking for lyrics ..."));
+
+ return true;
+}
+
+String ChartLyricsProvider::fetch_uri (LyricsState state)
+{
+ if (m_lyric_id <= 0 || ! m_lyric_checksum)
+ return String ();
+
+ auto id = int_to_str (m_lyric_id);
+ auto checksum = str_copy (m_lyric_checksum);
+ checksum = str_encode_percent (checksum, -1);
+
+ return String (str_concat ({m_base_url, "/GetLyric?lyricId=", id, "&lyricCheckSum=", checksum}));
+}
+
+void ChartLyricsProvider::fetch (LyricsState state)
+{
+ String _fetch_uri = fetch_uri (state);
+ if (! _fetch_uri)
+ {
+ update_lyrics_window_notfound (state);
+ return;
+ }
+
+ auto handle_result_cb = = (const char * uri, const Index<char> & buf) {
+ if (! buf.len ())
+ {
+ update_lyrics_window_error (str_printf (_("Unable to fetch %s"), uri));
+ return;
+ }
+
+ xmlDocPtr doc = xmlReadMemory (buf.begin (), buf.len (), nullptr, nullptr, 0);
+ if (! doc)
+ {
+ update_lyrics_window_error (str_printf (_("Unable to parse %s"), uri));
+ return;
+ }
+
+ xmlNodePtr root = xmlDocGetRootElement (doc);
+
+ for (xmlNodePtr cur_node = root->xmlChildrenNode; cur_node; cur_node = cur_node->next)
+ {
+ if (cur_node->type == XML_ELEMENT_NODE &&
+ xmlStrEqual (cur_node->name, (xmlChar *) "Lyric"))
+ {
+ xmlChar * content = xmlNodeGetContent (cur_node);
+ m_lyrics = String ((const char *) content);
+ xmlFree (content);
+ break;
+ }
+ }
+
+ xmlFreeDoc (doc);
+
+ LyricsState new_state = g_state;
+ new_state.lyrics = String ();
+
+ if (! m_lyrics || ! m_lyrics0)
+ {
+ update_lyrics_window_notfound (new_state);
+ return;
+ }
+
+ new_state.lyrics = m_lyrics;
+ new_state.source = LyricsState::Source::ChartLyrics;
+
+ update_lyrics_window (new_state.title, new_state.artist, new_state.lyrics);
+ persist_state (new_state);
+ };
+
+ vfs_async_file_get_contents (_fetch_uri, handle_result_cb);
+ update_lyrics_window_message (state, _("Looking for lyrics ..."));
+}

audacious-plugins-4.4.1.tar.bz2/src/lyrics-common/file_provider.cc Added

@@ -0,0 +1,159 @@
+/*
+ * Copyright (c) 2010-2019 Ariadne Conill <ariadne@dereferenced.org>
+ *
+ * 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.
+ *
+ * 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.
+ */
+
+#include <errno.h>
+#include <glib/gstdio.h>
+
+#include "lyrics.h"
+#include "preferences.h"
+
+void FileProvider::cache (LyricsState state)
+{
+ auto uri = cache_uri_for_entry (state);
+ if (! uri)
+ return;
+
+ bool exists = VFSFile::test_file (uri, VFS_IS_REGULAR);
+ if (exists)
+ return;
+
+ AUDINFO ("Add to cache: %s\n", (const char *) uri);
+ VFSFile::write_file (uri, state.lyrics, strlen (state.lyrics));
+}
+
+#ifdef S_IRGRP
+#define DIRMODE (S_IRWXU | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH)
+#else
+#define DIRMODE (S_IRWXU)
+#endif
+
+String FileProvider::cache_uri_for_entry (LyricsState state)
+{
+ if (! state.artist)
+ return String ();
+
+ auto user_dir = aud_get_path (AudPath::UserDir);
+ StringBuf base_path = filename_build ({user_dir, "lyrics"});
+ StringBuf artist_path = filename_build ({base_path, state.artist});
+
+ if (aud_get_bool (CFG_SECTION, "enable-cache"))
+ {
+ if (g_mkdir_with_parents (artist_path, DIRMODE) < 0)
+ AUDERR ("Failed to create '%s': %s\n", (const char *) artist_path, strerror (errno));
+ }
+
+ StringBuf title_path = str_concat ({filename_build({artist_path, state.title}), ".lrc"});
+
+ return String (filename_to_uri (title_path));
+}
+
+String FileProvider::local_uri_for_entry (LyricsState state)
+{
+ if (strcmp (uri_get_scheme (state.filename), "file"))
+ return String ();
+
+ // it's a local file: convert our URI to a local path
+ StringBuf filename = uri_to_filename (state.filename);
+
+ // strip off the extension
+ char * ext = strrchr ((char *) filename, '.');
+ if (! ext)
+ return String ();
+ * ext = '\0';
+
+ // combine the mangled filename and '.lrc' extension
+ return String (filename_to_uri (str_concat ({filename, ".lrc"})));
+}
+
+void FileProvider::fetch (LyricsState state)
+{
+ String path = local_uri_for_entry (state);
+ if (! path)
+ return;
+
+ auto data = VFSFile::read_file (path, VFS_APPEND_NULL);
+ if (! data.len ())
+ return;
+
+ state.lyrics = String (data.begin ());
+ state.source = LyricsState::Source::Local;
+
+ update_lyrics_window (state.title, state.artist, state.lyrics);
+ persist_state (state);
+}
+
+void FileProvider::cache_fetch (LyricsState state)
+{
+ String path = cache_uri_for_entry (state);
+ if (! path)
+ return;
+
+ auto data = VFSFile::read_file (path, VFS_APPEND_NULL);
+ if (! data.len ())
+ return;
+
+ state.lyrics = String (data.begin ());
+ state.source = LyricsState::Source::Local;
+
+ update_lyrics_window (state.title, state.artist, state.lyrics);
+ persist_state (state);
+}
+
+bool FileProvider::match (LyricsState state)
+{
+ String path = local_uri_for_entry (state);
+ if (! path)
+ return false;
+
+ AUDINFO ("Checking for local lyric file: '%s'\n", (const char *) path);
+
+ bool exists = VFSFile::test_file (path, VFS_IS_REGULAR);
+ if (exists)
+ {
+ fetch (state);
+ return true;
+ }
+
+ path = cache_uri_for_entry (state);
+ if (! path)
+ return false;
+
+ AUDINFO ("Checking for cache lyric file: '%s'\n", (const char *) path);
+
+ exists = VFSFile::test_file (path, VFS_IS_REGULAR);
+ if (exists)
+ cache_fetch (state);
+
+ return exists;
+}
+
+void FileProvider::save (LyricsState state)
+{
+ if (! state.lyrics)
+ return;
+
+ String path = local_uri_for_entry (state);
+ if (! path)
+ return;
+
+ AUDINFO ("Saving lyrics to local file: '%s'\n", (const char *) path);
+
+ VFSFile::write_file (path, state.lyrics, strlen (state.lyrics));
+}

audacious-plugins-4.4.1.tar.bz2/src/lyrics-common/lyrics.h Added

@@ -0,0 +1,145 @@
+/*
+ * Copyright (c) 2010-2019 Ariadne Conill <ariadne@dereferenced.org>
+ * Copyright (c) 2024 Thomas Lange <thomas-lange2@gmx.de>
+ *
+ * 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.
+ *
+ * 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.
+ */
+
+#ifndef AUDACIOUS_LYRICS_H
+#define AUDACIOUS_LYRICS_H
+
+#include <string.h>
+#include <libxml/parser.h>
+
+#define AUD_GLIB_INTEGRATION
+#include <libaudcore/audstrings.h>
+#include <libaudcore/drct.h>
+#include <libaudcore/i18n.h>
+#include <libaudcore/runtime.h>
+#include <libaudcore/vfs.h>
+#include <libaudcore/vfs_async.h>
+
+struct LyricsState {
+ String filename; // of song file
+ String title, artist;
+ String lyrics;
+
+ enum Source {
+ None,
+ Embedded,
+ Local,
+ LyricsOVH,
+ ChartLyrics
+ } source = None;
+
+ bool error = false;
+};
+
+
+// LyricProvider encapsulates an entire strategy for fetching lyrics,
+// for example from chartlyrics.com, lyrics.ovh or local storage.
+class LyricProvider
+{
+public:
+ virtual bool match (LyricsState state) = 0;
+ virtual void fetch (LyricsState state) = 0;
+ virtual String edit_uri (LyricsState state) = 0;
+};
+
+
+// FileProvider provides a strategy for fetching and saving lyrics
+// in local files. It also manages the local lyrics cache.
+class FileProvider : public LyricProvider
+{
+public:
+ FileProvider () {};
+
+ bool match (LyricsState state) override;
+ void fetch (LyricsState state) override;
+ String edit_uri (LyricsState state) override { return String (); }
+
+ void save (LyricsState state);
+ void cache (LyricsState state);
+ void cache_fetch (LyricsState state);
+
+private:
+ String local_uri_for_entry (LyricsState state);
+ String cache_uri_for_entry (LyricsState state);
+};
+
+
+// ChartLyricsProvider provides a strategy for fetching lyrics using the API
+// from chartlyrics.com. It uses the two-step approach since the endpoint
+// "SearchLyricDirect" may sometimes return incorrect data. One example is
+// "Metallica - Unforgiven II" which leads to the lyrics of "Unforgiven".
+class ChartLyricsProvider : public LyricProvider
+{
+public:
+ ChartLyricsProvider () {};
+
+ bool match (LyricsState state) override;
+ void fetch (LyricsState state) override;
+ String edit_uri (LyricsState state) override { return m_lyric_url; }
+
+private:
+ String match_uri (LyricsState state);
+ String fetch_uri (LyricsState state);
+
+ void reset_lyric_metadata ();
+ bool has_match (LyricsState state, xmlNodePtr node);
+
+ int m_lyric_id = -1;
+ String m_lyric_checksum, m_lyric_url, m_lyrics;
+
+ const char * m_base_url = "http://api.chartlyrics.com/apiv1.asmx";
+};
+
+
+// LyricsOVHProvider provides a strategy for fetching lyrics using the
+// lyrics.ovh search engine.
+class LyricsOVHProvider : public LyricProvider
+{
+public:
+ LyricsOVHProvider () {};
+
+ bool match (LyricsState state) override;
+ void fetch (LyricsState state) override;
+ String edit_uri (LyricsState state) override { return String (); }
+
+private:
+ const char * m_base_url = "https://api.lyrics.ovh";
+};
+
+
+extern FileProvider file_provider;
+extern ChartLyricsProvider chart_lyrics_provider;
+extern LyricsOVHProvider lyrics_ovh_provider;
+LyricProvider * remote_source ();
+
+extern LyricsState g_state;
+void persist_state (LyricsState state);
+
+void update_lyrics_window (const char * title, const char * artist, const char * lyrics);
+void update_lyrics_window_message (LyricsState state, const char * message);
+void update_lyrics_window_error (const char * message);
+void update_lyrics_window_notfound (LyricsState state);
+
+bool try_parse_json (const Index<char> & buf, const char * key, String & output);
+
+void lyrics_playback_began ();
+
+#endif // AUDACIOUS_LYRICS_H

audacious-plugins-4.4.1.tar.bz2/src/lyrics-common/lyrics_ovh_provider.cc Added

@@ -0,0 +1,89 @@
+/*
+ * Copyright (c) 2010-2019 Ariadne Conill <ariadne@dereferenced.org>
+ * Copyright (c) 2024 Thomas Lange <thomas-lange2@gmx.de>
+ *
+ * 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.
+ *
+ * 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.
+ */
+
+#include "lyrics.h"
+
+static String truncate_prefix (const String & lyrics, const char * prefix)
+{
+ if (! str_has_prefix_nocase (lyrics, prefix))
+ return lyrics;
+
+ const char * truncated = strstr (lyrics, "\r\n");
+ if (! truncated || ! g_utf8_validate (truncated, -1, nullptr))
+ return lyrics;
+
+ while ((* truncated) && g_unichar_isspace (g_utf8_get_char (truncated)))
+ truncated = g_utf8_next_char (truncated);
+
+ return String (truncated);
+}
+
+bool LyricsOVHProvider::match (LyricsState state)
+{
+ fetch (state);
+ return true;
+}
+
+void LyricsOVHProvider::fetch (LyricsState state)
+{
+ auto handle_result_cb = = (const char * uri, const Index<char> & buf) {
+ if (! buf.len ())
+ {
+ update_lyrics_window_error (str_printf (_("Unable to fetch %s"), uri));
+ return;
+ }
+
+ String lyrics;
+ if (! try_parse_json (buf, "lyrics", lyrics))
+ {
+ update_lyrics_window_error (str_printf (_("Unable to parse %s"), uri));
+ return;
+ }
+
+ LyricsState new_state = g_state;
+ new_state.lyrics = lyrics;
+
+ if (! lyrics)
+ {
+ update_lyrics_window_notfound (new_state);
+ return;
+ }
+
+ // Remove French prefix for "Lyrics of the song {title} by {artist}"
+ // which lyrics.ovh embeds into every lyrics, regardless of the language.
+ new_state.lyrics = truncate_prefix (lyrics, "Paroles de la chanson");
+ new_state.source = LyricsState::Source::LyricsOVH;
+
+ update_lyrics_window (new_state.title, new_state.artist, new_state.lyrics);
+ persist_state (new_state);
+ };
+
+ auto artist = str_copy (state.artist);
+ artist = str_encode_percent (state.artist, -1);
+
+ auto title = str_copy (state.title);
+ title = str_encode_percent (state.title, -1);
+
+ auto fetch_uri = str_concat ({m_base_url, "/v1/", artist, "/", title});
+
+ vfs_async_file_get_contents (fetch_uri, handle_result_cb);
+ update_lyrics_window_message (state, _("Looking for lyrics ..."));
+}

audacious-plugins-4.4.1.tar.bz2/src/lyrics-common/preferences.h Added

@@ -0,0 +1,79 @@
+/*
+ * Copyright (c) 2010-2019 Ariadne Conill <ariadne@dereferenced.org>
+ *
+ * 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.
+ *
+ * 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.
+ */
+
+#ifndef AUDACIOUS_LYRICS_PREFERENCES_H
+#define AUDACIOUS_LYRICS_PREFERENCES_H
+
+#include <libaudcore/i18n.h>
+#include <libaudcore/preferences.h>
+
+// Use former plugin name to stay backwards compatible
+static constexpr const char * CFG_SECTION = "lyricwiki";
+
+static const char * const defaults = {
+ "remote-source", "lyrics.ovh",
+ "enable-file-provider", "TRUE",
+ "enable-cache", "TRUE",
+ "split-title-on-chars", "FALSE",
+ "split-on-chars", "-",
+ "truncate-fields-on-chars", "FALSE",
+ "truncate-on-chars", "|",
+ "use-embedded", "TRUE",
+ nullptr
+};
+
+static const ComboItem remote_sources = {
+ ComboItem (N_("Nowhere"), "nowhere"),
+ ComboItem ("chartlyrics.com", "chartlyrics.com"),
+ ComboItem ("lyrics.ovh", "lyrics.ovh")
+};
+
+static const PreferencesWidget truncate_elements = {
+ WidgetLabel (N_("Artist is truncated at the start, Title -- at the end")),
+ WidgetEntry (N_("Chars to truncate on:"), WidgetString (CFG_SECTION, "truncate-on-chars"))
+};
+
+static const PreferencesWidget split_elements = {
+ WidgetLabel (N_("Chars are ORed in RegExp, surrounded by whitespace")),
+ WidgetEntry (N_("Chars to split on:"), WidgetString (CFG_SECTION, "split-on-chars")),
+ WidgetCheck (N_("Further truncate those on chars"),
+ WidgetBool (CFG_SECTION, "truncate-fields-on-chars")),
+ WidgetTable ({{truncate_elements}}, WIDGET_CHILD)
+};
+
+static const PreferencesWidget widgets = {
+ WidgetLabel (N_("General")),
+ WidgetCheck (N_("Split title into artist and title on chars"),
+ WidgetBool (CFG_SECTION, "split-title-on-chars")),
+ WidgetTable ({{split_elements}}, WIDGET_CHILD),
+ WidgetLabel (N_("Sources")),
+ WidgetCheck (N_("Use embedded lyrics (from Lyrics tag)"),
+ WidgetBool (CFG_SECTION, "use-embedded")),
+ WidgetCombo (N_("Fetch lyrics from internet:"),
+ WidgetString (CFG_SECTION, "remote-source"),
+ {{remote_sources}}),
+ WidgetCheck (N_("Store fetched lyrics in local cache"),
+ WidgetBool (CFG_SECTION, "enable-cache")),
+ WidgetLabel (N_("Local Storage")),
+ WidgetCheck (N_("Load lyric files (.lrc) from local storage"),
+ WidgetBool (CFG_SECTION, "enable-file-provider"))
+};
+
+#endif // AUDACIOUS_LYRICS_PREFERENCES_H

audacious-plugins-4.4.1.tar.bz2/src/lyrics-common/utils.cc Added

@@ -0,0 +1,156 @@
+/*
+ * Copyright (c) 2010-2019 Ariadne Conill <ariadne@dereferenced.org>
+ * Copyright (c) 2024 Thomas Lange <thomas-lange2@gmx.de>
+ *
+ * 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.
+ *
+ * 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.
+ */
+
+#include "lyrics.h"
+#include "preferences.h"
+
+LyricProvider * remote_source ()
+{
+ String source = aud_get_str (CFG_SECTION, "remote-source");
+
+ if (! strcmp (source, "chartlyrics.com"))
+ return & chart_lyrics_provider;
+
+ if (! strcmp (source, "lyrics.ovh"))
+ return & lyrics_ovh_provider;
+
+ return nullptr;
+}
+
+void persist_state (LyricsState state)
+{
+ g_state = state;
+ g_state.error = false;
+
+ if (g_state.source != LyricsState::Source::Local && aud_get_bool (CFG_SECTION, "enable-cache"))
+ file_provider.cache (state);
+}
+
+void update_lyrics_window_message (LyricsState state, const char * message)
+{
+ update_lyrics_window (state.title, state.artist, message);
+}
+
+void update_lyrics_window_error (const char * message)
+{
+ update_lyrics_window (_("Error"), nullptr, message);
+ g_state.error = true;
+}
+
+void update_lyrics_window_notfound (LyricsState state)
+{
+ update_lyrics_window (state.title, state.artist, _("Lyrics could not be found."));
+ g_state.error = true;
+}
+
+static char * truncate_by_pattern (const char * input, const char * pattern)
+{
+ GRegex * regex = g_regex_new (pattern, G_REGEX_CASELESS, (GRegexMatchFlags) 0, nullptr);
+ char * result = g_regex_replace (regex, input, -1, 0, "", (GRegexMatchFlags) 0, nullptr);
+ g_regex_unref (regex);
+ return result;
+}
+
+static void split_title_and_truncate ()
+{
+ StringBuf split_pattern = str_concat ({
+ "^(.*)\\s+", aud_get_str (CFG_SECTION, "split-on-chars"), "\\s+(.*)$"
+ });
+
+ GMatchInfo * match_info;
+ GRegex * split_regex = g_regex_new (split_pattern, G_REGEX_CASELESS, (GRegexMatchFlags) 0, nullptr);
+
+ if (g_regex_match (split_regex, g_state.title, (GRegexMatchFlags) 0, & match_info))
+ {
+ CharPtr artist (g_match_info_fetch (match_info, 1));
+ CharPtr title (g_match_info_fetch (match_info, 2));
+
+ if (aud_get_bool (CFG_SECTION, "truncate-fields-on-chars"))
+ {
+ StringBuf artist_pattern = str_concat ({
+ "^.*\\s+", aud_get_str (CFG_SECTION, "truncate-on-chars"), "\\s+"
+ });
+
+ StringBuf title_pattern = str_concat ({
+ "\\s+", aud_get_str (CFG_SECTION, "truncate-on-chars"), "\\s+.*$"
+ });
+
+ artist = CharPtr (truncate_by_pattern (artist, artist_pattern));
+ title = CharPtr (truncate_by_pattern (title, title_pattern));
+ }
+
+ g_state.artist = String ();
+ g_state.title = String ();
+ g_state.artist = String (artist);
+ g_state.title = String (title);
+ }
+
+ g_match_info_free (match_info);
+ g_regex_unref (split_regex);
+}
+
+void lyrics_playback_began ()
+{
+ // FIXME: Cancel previous VFS requests (not possible with current API)
+
+ g_state.filename = aud_drct_get_filename ();
+
+ Tuple tuple = aud_drct_get_tuple ();
+ g_state.title = tuple.get_str (Tuple::Title);
+ g_state.artist = tuple.get_str (Tuple::Artist);
+ g_state.lyrics = String ();
+
+ if (aud_get_bool (CFG_SECTION, "use-embedded"))
+ {
+ String embedded_lyrics = tuple.get_str (Tuple::Lyrics);
+ if (embedded_lyrics && embedded_lyrics0)
+ {
+ g_state.lyrics = embedded_lyrics;
+ g_state.source = LyricsState::Source::Embedded;
+ g_state.error = false;
+
+ update_lyrics_window (g_state.title, g_state.artist, g_state.lyrics);
+ return;
+ }
+ }
+
+ if (aud_get_bool (CFG_SECTION, "split-title-on-chars"))
+ split_title_and_truncate ();
+
+ if (! aud_get_bool (CFG_SECTION, "enable-file-provider") || ! file_provider.match (g_state))
+ {
+ if (! g_state.artist || ! g_state.title)
+ {
+ update_lyrics_window_error (_("Missing title and/or artist."));
+ return;
+ }
+
+ LyricProvider * remote_provider = remote_source ();
+ if (remote_provider)
+ {
+ remote_provider->match (g_state);
+ return;
+ }
+ }
+
+ if (! g_state.lyrics)
+ update_lyrics_window_notfound (g_state);
+}

audacious-plugins-4.4.1.tar.bz2/src/lyrics-gtk Added

audacious-plugins-4.4.1.tar.bz2/src/lyrics-gtk/Makefile Added

audacious-plugins-4.4.1.tar.bz2/src/lyrics-gtk/lyrics-gtk.cc Added

@@ -0,0 +1,251 @@
+/*
+ * Copyright (c) 2010-2019 Ariadne Conill <ariadne@dereferenced.org>
+ * Copyright (c) 2024 Thomas Lange <thomas-lange2@gmx.de>
+ *
+ * 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.
+ *
+ * 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.
+ */
+
+#include <json-glib/json-glib.h>
+
+#include <libaudcore/hook.h>
+#include <libaudcore/plugin.h>
+#include <libaudcore/plugins.h>
+#include <libaudgui/gtk-compat.h>
+
+#include "../lyrics-common/lyrics.h"
+#include "../lyrics-common/preferences.h"
+
+class LyricsGtk : public GeneralPlugin
+{
+public:
+ static const PluginPreferences prefs;
+ static constexpr PluginInfo info = {
+ N_("Lyrics"),
+ PACKAGE,
+ nullptr, // about
+ & prefs,
+ PluginGLibOnly
+ };
+
+ constexpr LyricsGtk () : GeneralPlugin (info, false) {}
+
+ bool init ();
+ void * get_gtk_widget ();
+};
+
+EXPORT LyricsGtk aud_plugin_instance;
+
+const PluginPreferences LyricsGtk::prefs = {{widgets}};
+
+FileProvider file_provider;
+ChartLyricsProvider chart_lyrics_provider;
+LyricsOVHProvider lyrics_ovh_provider;
+
+LyricsState g_state;
+
+static GtkTextView * textview;
+static GtkTextBuffer * textbuffer;
+
+bool LyricsGtk::init ()
+{
+ aud_config_set_defaults (CFG_SECTION, defaults);
+ return true;
+}
+
+void update_lyrics_window (const char * title, const char * artist, const char * lyrics)
+{
+ GtkTextIter iter;
+
+ if (! textbuffer)
+ return;
+
+ gtk_text_buffer_set_text (textbuffer, "", -1);
+ gtk_text_buffer_get_start_iter (textbuffer, & iter);
+ gtk_text_buffer_insert_with_tags_by_name (textbuffer, & iter, title, -1,
+ "weight_bold", "scale_large", nullptr);
+
+ if (artist)
+ {
+ gtk_text_buffer_insert (textbuffer, & iter, "\n", -1);
+ gtk_text_buffer_insert_with_tags_by_name (textbuffer, & iter, artist, -1,
+ "style_italic", nullptr);
+ }
+
+ gtk_text_buffer_insert (textbuffer, & iter, "\n\n", -1);
+ gtk_text_buffer_insert (textbuffer, & iter, lyrics, -1);
+
+ gtk_text_buffer_get_start_iter (textbuffer, & iter);
+ gtk_text_view_scroll_to_iter (textview, & iter, 0, true, 0, 0);
+}
+
+bool try_parse_json (const Index<char> & buf, const char * key, String & output)
+{
+ JsonParser * parser = json_parser_new ();
+
+ if (! json_parser_load_from_data (parser, buf.begin (), buf.len (), nullptr))
+ {
+ g_object_unref (parser);
+ return false;
+ }
+
+ JsonNode * root = json_parser_get_root (parser);
+ JsonReader * reader = json_reader_new (root);
+
+ json_reader_read_member (reader, key);
+ output = String (json_reader_get_string_value (reader));
+ json_reader_end_member (reader);
+
+ g_object_unref (reader);
+ g_object_unref (parser);
+
+ return true;
+}
+
+static void destroy_cb ()
+{
+ g_state.filename = String ();
+ g_state.title = String ();
+ g_state.artist = String ();
+ g_state.lyrics = String ();
+
+ hook_dissociate ("tuple change", (HookFunction) lyrics_playback_began);
+ hook_dissociate ("playback ready", (HookFunction) lyrics_playback_began);
+
+ textview = nullptr;
+ textbuffer = nullptr;
+}
+
+static GtkWidget * append_item_to_menu (GtkWidget * menu, const char * label)
+{
+ GtkWidget * menu_item = (label != nullptr)
+ ? gtk_menu_item_new_with_label (label)
+ : gtk_separator_menu_item_new ();
+
+ gtk_menu_shell_append ((GtkMenuShell *) menu, menu_item);
+ gtk_widget_show (menu_item);
+
+ return menu_item;
+}
+
+static void append_separator_to_menu (GtkWidget * menu)
+{
+ append_item_to_menu (menu, nullptr);
+}
+
+static void edit_lyrics_cb (GtkMenuItem * menu_item, void * data)
+{
+ const char * edit_uri = (const char *) data;
+#if GTK_CHECK_VERSION(3, 22, 0)
+ gtk_show_uri_on_window (nullptr, edit_uri, GDK_CURRENT_TIME, nullptr);
+#else
+ gtk_show_uri (nullptr, edit_uri, GDK_CURRENT_TIME, nullptr);
+#endif
+}
+
+static void save_locally_cb (GtkMenuItem * menu_item, void * data)
+{
+ file_provider.save (g_state);
+}
+
+static void refresh_cb (GtkMenuItem * menu_item, void * data)
+{
+ LyricProvider * remote_provider = remote_source ();
+ if (remote_provider)
+ remote_provider->match (g_state);
+}
+
+static void populate_popup_cb (GtkTextView * text_view, GtkWidget * menu, void * data)
+{
+ if (! g_state.artist || ! g_state.title || ! GTK_IS_MENU (menu))
+ return;
+
+ GtkWidget * menu_item;
+ append_separator_to_menu (menu);
+
+ if (g_state.lyrics && g_state.source != LyricsState::Source::Local && ! g_state.error)
+ {
+ LyricProvider * remote_provider = remote_source ();
+
+ if (remote_provider)
+ {
+ String edit_uri = remote_provider->edit_uri (g_state);
+
+ if (edit_uri && edit_uri0)
+ {
+ menu_item = append_item_to_menu (menu, _("Edit Lyrics ..."));
+ g_signal_connect_data (menu_item, "activate", (GCallback) edit_lyrics_cb,
+ g_strdup (edit_uri), (GClosureNotify) g_free, (GConnectFlags) 0);
+ }
+ }
+
+ menu_item = append_item_to_menu (menu, _("Save Locally"));
+ g_signal_connect (menu_item, "activate", (GCallback) save_locally_cb, nullptr);
+ }
+
+ if (g_state.source == LyricsState::Source::Local || g_state.error)
+ {
+ menu_item = append_item_to_menu (menu, _("Refresh"));
+ g_signal_connect (menu_item, "activate", (GCallback) refresh_cb, nullptr);
+ }
+}
+
+static GtkWidget * build_widget ()
+{
+ textview = (GtkTextView *) gtk_text_view_new ();
+ gtk_text_view_set_editable (textview, false);
+ gtk_text_view_set_cursor_visible (textview, false);
+ gtk_text_view_set_left_margin (textview, 4);
+ gtk_text_view_set_right_margin (textview, 4);
+ gtk_text_view_set_wrap_mode (textview, GTK_WRAP_WORD);
+ textbuffer = gtk_text_view_get_buffer (textview);
+
+ GtkWidget * scrollview = gtk_scrolled_window_new (nullptr, nullptr);
+ gtk_scrolled_window_set_shadow_type ((GtkScrolledWindow *) scrollview, GTK_SHADOW_IN);
+ gtk_scrolled_window_set_policy ((GtkScrolledWindow *) scrollview, GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
+ GtkWidget * vbox = audgui_vbox_new (6);
+
+ g_signal_connect (textview, "populate-popup", (GCallback) populate_popup_cb, nullptr);
+
+ gtk_container_add ((GtkContainer *) scrollview, (GtkWidget *) textview);
+ gtk_box_pack_start ((GtkBox *) vbox, scrollview, true, true, 0);
+
+ gtk_widget_show_all (vbox);
+
+ gtk_text_buffer_create_tag (textbuffer, "weight_bold", "weight", PANGO_WEIGHT_BOLD, nullptr);
+ gtk_text_buffer_create_tag (textbuffer, "scale_large", "scale", PANGO_SCALE_LARGE, nullptr);
+ gtk_text_buffer_create_tag (textbuffer, "style_italic", "style", PANGO_STYLE_ITALIC, nullptr);
+
+ GtkWidget * hbox = audgui_hbox_new (6);
+ gtk_box_pack_start ((GtkBox *) vbox, hbox, false, false, 0);
+
+ return vbox;
+}
+
+void * LyricsGtk::get_gtk_widget ()
+{
+ GtkWidget * vbox = build_widget ();
+
+ hook_associate ("tuple change", (HookFunction) lyrics_playback_began, nullptr);
+ hook_associate ("playback ready", (HookFunction) lyrics_playback_began, nullptr);
+
+ if (aud_drct_get_ready ())
+ lyrics_playback_began ();
+
+ g_signal_connect (vbox, "destroy", (GCallback) destroy_cb, nullptr);
+
+ return vbox;
+}

audacious-plugins-4.4.1.tar.bz2/src/lyrics-gtk/meson.build Added

audacious-plugins-4.4.1.tar.bz2/src/lyrics-qt Added

audacious-plugins-4.4.1.tar.bz2/src/lyrics-qt/Makefile Added

audacious-plugins-4.4.1.tar.bz2/src/lyrics-qt/lyrics-qt.cc Added

@@ -0,0 +1,195 @@
+/*
+ * Copyright (c) 2010-2019 Ariadne Conill <ariadne@dereferenced.org>
+ *
+ * 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.
+ *
+ * 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.
+ */
+
+#include <QApplication>
+#include <QContextMenuEvent>
+#include <QDesktopServices>
+#include <QJsonDocument>
+#include <QJsonObject>
+#include <QMenu>
+#include <QTextEdit>
+
+#include <libaudcore/hook.h>
+#include <libaudcore/plugin.h>
+#include <libaudcore/plugins.h>
+
+#include "../lyrics-common/lyrics.h"
+#include "../lyrics-common/preferences.h"
+
+class TextEdit : public QTextEdit
+{
+public:
+ TextEdit (QWidget * parent = nullptr) : QTextEdit (parent) {}
+
+protected:
+ void contextMenuEvent (QContextMenuEvent * event);
+};
+
+class LyricsQt : public GeneralPlugin
+{
+public:
+ static const PluginPreferences prefs;
+ static constexpr PluginInfo info = {
+ N_("Lyrics"),
+ PACKAGE,
+ nullptr, // about
+ & prefs,
+ PluginQtOnly
+ };
+
+ constexpr LyricsQt () : GeneralPlugin (info, false) {}
+
+ bool init ();
+ void * get_qt_widget ();
+};
+
+EXPORT LyricsQt aud_plugin_instance;
+
+const PluginPreferences LyricsQt::prefs = {{widgets}};
+
+FileProvider file_provider;
+ChartLyricsProvider chart_lyrics_provider;
+LyricsOVHProvider lyrics_ovh_provider;
+
+LyricsState g_state;
+
+static QTextEdit * textedit;
+
+bool LyricsQt::init ()
+{
+ aud_config_set_defaults (CFG_SECTION, defaults);
+ return true;
+}
+
+void update_lyrics_window (const char * title, const char * artist, const char * lyrics)
+{
+ if (! textedit)
+ return;
+
+ textedit->document ()->clear ();
+
+ QTextCursor cursor (textedit->document ());
+ cursor.insertHtml (QString ("<big>") + QString (title) + QString ("</big>"));
+
+ if (artist)
+ cursor.insertHtml (QString (" ") + QString (artist) + QString (""));
+
+ cursor.insertHtml (" ");
+ cursor.insertText (lyrics);
+}
+
+bool try_parse_json (const Index<char> & buf, const char * key, String & output)
+{
+ QByteArray json = QByteArray (buf.begin (), buf.len ());
+ QJsonDocument doc = QJsonDocument::fromJson (json);
+
+ if (doc.isNull () || ! doc.isObject ())
+ return false;
+
+ QJsonObject obj = doc.object ();
+ if (obj.contains (key))
+ {
+ QString str = objkey.toString ();
+ if (! str.isNull ())
+ {
+ QByteArray raw_data = str.toLocal8Bit ();
+ output = String (raw_data.data ());
+ }
+ }
+
+ return true;
+}
+
+static void lyrics_cleanup (QObject * object = nullptr)
+{
+ g_state.filename = String ();
+ g_state.title = String ();
+ g_state.artist = String ();
+ g_state.lyrics = String ();
+
+ hook_dissociate ("tuple change", (HookFunction) lyrics_playback_began);
+ hook_dissociate ("playback ready", (HookFunction) lyrics_playback_began);
+
+ textedit = nullptr;
+}
+
+void * LyricsQt::get_qt_widget ()
+{
+ textedit = new TextEdit;
+ textedit->setReadOnly (true);
+
+#ifdef Q_OS_MAC // Mac-specific font tweaks
+ textedit->document ()->setDefaultFont (QApplication::font ("QTipLabel"));
+#endif
+
+ hook_associate ("tuple change", (HookFunction) lyrics_playback_began, nullptr);
+ hook_associate ("playback ready", (HookFunction) lyrics_playback_began, nullptr);
+
+ if (aud_drct_get_ready ())
+ lyrics_playback_began ();
+
+ QObject::connect (textedit, & QObject::destroyed, lyrics_cleanup);
+
+ return textedit;
+}
+
+void TextEdit::contextMenuEvent (QContextMenuEvent * event)
+{
+ if (! g_state.artist || ! g_state.title)
+ return QTextEdit::contextMenuEvent (event);
+
+ LyricProvider * remote_provider = remote_source ();
+
+ QMenu * menu = createStandardContextMenu ();
+ menu->addSeparator ();
+
+ if (g_state.lyrics && g_state.source != LyricsState::Source::Local && ! g_state.error)
+ {
+ if (remote_provider)
+ {
+ String edit_uri = remote_provider->edit_uri (g_state);
+
+ if (edit_uri && edit_uri0)
+ {
+ QAction * edit = menu->addAction (_("Edit Lyrics ..."));
+ QObject::connect (edit, & QAction::triggered, edit_uri () {
+ QDesktopServices::openUrl (QUrl ((const char *) edit_uri));
+ });
+ }
+ }
+
+ QAction * save = menu->addAction (_("Save Locally"));
+ QObject::connect (save, & QAction::triggered, () {
+ file_provider.save (g_state);
+ });
+ }
+
+ if (g_state.source == LyricsState::Source::Local || g_state.error)
+ {
+ QAction * refresh = menu->addAction (_("Refresh"));
+ QObject::connect (refresh, & QAction::triggered, remote_provider () {
+ if (remote_provider)
+ remote_provider->match (g_state);
+ });
+ }
+
+ menu->exec (event->globalPos ());
+ menu->deleteLater ();
+}

audacious-plugins-4.4.1.tar.bz2/src/lyrics-qt/meson.build Added

audacious-plugins-3.6.2-gtk3.tar.bz2/src/m3u/m3u.cc -> audacious-plugins-4.4.1.tar.bz2/src/m3u/m3u.cc Changed

@@ -23,6 +23,7 @@
 #include <libaudcore/audstrings.h>
 #include <libaudcore/i18n.h>
 #include <libaudcore/plugin.h>
+#include <libaudcore/runtime.h>
 
 static const char * const m3u_exts = {"m3u", "m3u8"};
 
@@ -41,47 +42,35 @@
 
 EXPORT M3ULoader aud_plugin_instance;
 
-static void strip_char (char * text, char c)
-{
- char * set = text;
- char a;
-
- while ((a = * text ++))
- if (a != c)
- * set ++ = a;
-
- * set = 0;
-}
-
-static Index<char> read_win_text (VFSFile & file)
-{
- Index<char> raw = file.read_all ();
- if (! raw.len ())
- return raw;
-
- raw.append (0); /* null-terminated */
- strip_char (raw.begin (), '\r');
- return raw;
-}
-
 static char * split_line (char * line)
 {
 char * feed = strchr (line, '\n');
 if (! feed)
 return nullptr;
 
- * feed = 0;
+ if (feed > line && feed-1 == '\r')
+ feed-1 = 0;
+ else
+ feed0 = 0;
+
 return feed + 1;
 }
 
-bool M3ULoader::load (const char * path, VFSFile & file, String & title,
+bool M3ULoader::load (const char * filename, VFSFile & file, String & title,
 Index<PlaylistAddItem> & items)
 {
- Index<char> text = read_win_text (file);
+ Index<char> text = file.read_all ();
 if (! text.len ())
 return false;
 
+ text.append (0); /* null-terminate */
+
+ bool firstline = true;
+ bool extm3u = false;
+
 char * parse = text.begin ();
+ if (! strncmp (parse, "\xef\xbb\xbf", 3)) /* byte order mark */
+ parse += 3;
 
 while (parse)
 {
@@ -90,25 +79,43 @@
 while (* parse == ' ' || * parse == '\t')
 parse ++;
 
- if (* parse && * parse != '#')
+ if (* parse == '#')
 {
- StringBuf s = uri_construct (parse, path);
+ if (firstline && ! strncmp (parse, "#EXTM3U", 7))
+ extm3u = true;
+ else if (extm3u && ! strncmp (parse, "#EXT-X-", 7))
+ goto HLS;
+ }
+ else if (* parse)
+ {
+ StringBuf s = uri_construct (parse, filename);
 if (s)
 items.append (String (s));
 }
 
+ firstline = false;
 parse = next;
 }
 
 return true;
+
+HLS:
+ AUDINFO ("Detected HLS stream: %s\n", filename);
+ /* Though it shares the .m3u8 extension, an HLS stream is not really
+ * a playlist at all. Add (only) the original .m3u8 filename to the
+ * playlist and let an input plugin (e.g. ffaudio) handle it. */
+ items.clear ();
+ items.append (String (filename));
+ return true;
 }
 
-bool M3ULoader::save (const char * path, VFSFile & file, const char * title,
+bool M3ULoader::save (const char * filename, VFSFile & file, const char * title,
 const Index<PlaylistAddItem> & items)
 {
 for (auto & item : items)
 {
- StringBuf line = str_concat ({item.filename, "\n"});
+ StringBuf path = uri_deconstruct (item.filename, filename);
+ StringBuf line = str_concat ({path, "\n"});
 if (file.fwrite (line, 1, line.len ()) != line.len ())
 return false;
 }

audacious-plugins-4.4.1.tar.bz2/src/m3u/meson.build Added

audacious-plugins-3.6.2-gtk3.tar.bz2/src/mac-media-keys/Makefile -> audacious-plugins-4.4.1.tar.bz2/src/mac-media-keys/Makefile Changed

audacious-plugins-4.4.1.tar.bz2/src/mac-media-keys/meson.build Added

audacious-plugins-4.4.1.tar.bz2/src/meson.build Added

@@ -0,0 +1,294 @@
+src_inc = include_directories('.')
+
+
+config_h_full_path = join_paths(meson.current_build_dir(), 'config.h')
+
+
+if cc.get_id() in 'gcc', 'clang'
+  add_project_arguments('-include', config_h_full_path, language: 'c', 'cpp')
+
+  if have_darwin
+    add_project_arguments('-include', config_h_full_path, language: 'objc', 'objcpp')
+  endif
+else
+  error('Please implement -include handling for your chosen compiler.')
+endif
+
+
+# input plugins
+subdir('metronom')
+subdir('psf')
+subdir('tonegen')
+subdir('vtx')
+subdir('xsf')
+
+if get_option('console')
+  subdir('console')
+endif
+
+
+# effect plugins
+subdir('background_music')
+subdir('bitcrusher')
+subdir('compressor')
+subdir('crossfade')
+subdir('crystalizer')
+subdir('echo_plugin')
+subdir('mixer')
+subdir('silence-removal')
+subdir('stereo_plugin')
+subdir('voice_removal')
+
+if get_option('bs2b')
+  subdir('bs2b')
+endif
+
+if get_option('resample')
+  subdir('resample')
+endif
+
+if get_option('soxr')
+  subdir('soxr')
+endif
+
+if get_option('speedpitch')
+  subdir('speedpitch')
+endif
+
+
+# transport plugins
+subdir('gio')
+
+if get_option('mms')
+  subdir('mms')
+endif
+
+if get_option('neon')
+  subdir('neon')
+endif
+
+
+# playlist (container) plugins
+subdir('asx')
+subdir('asx3')
+subdir('audpl')
+subdir('m3u')
+subdir('pls')
+subdir('xspf')
+
+if get_option('cue')
+  subdir('cue')
+endif
+
+
+# Qt/GTK-specific plugins
+if conf.has('USE_GTK_OR_QT')
+  subdir('delete-files')
+  subdir('skins-data')
+
+  if get_option('notify')
+    subdir('notify')
+  endif
+endif
+
+
+# Qt-specific plugins
+if conf.has('USE_QT')
+  subdir('albumart-qt')
+  subdir('blur_scope-qt')
+  subdir('lyrics-qt')
+  subdir('playlist-manager-qt')
+  subdir('qt-spectrum')
+  subdir('qtui')
+  subdir('search-tool-qt')
+  subdir('skins-qt')
+  subdir('song-info-qt')
+  subdir('statusicon-qt')
+
+  if get_option('ampache')
+    subdir('ampache')
+  endif
+
+  if get_option('gl-spectrum')
+    subdir('qtglspectrum')
+  endif
+
+  if get_option('hotkey')
+    subdir('qthotkey')
+  endif
+
+  if get_option('moonstone')
+    subdir('moonstone')
+  endif
+
+  if get_option('qtaudio')
+    subdir('qtaudio')
+  endif
+
+  if get_option('streamtuner')
+    subdir('streamtuner')
+  endif
+
+  if get_option('vumeter')
+    subdir('vumeter-qt')
+  endif
+endif
+
+
+# GTK-specific plugins
+if conf.has('USE_GTK')
+  subdir('albumart')
+  subdir('blur_scope')
+  subdir('cairo-spectrum')
+  subdir('gtkui')
+  subdir('ladspa')
+  subdir('lyrics-gtk')
+  subdir('playlist-manager')
+  subdir('search-tool')
+  subdir('skins')
+  subdir('statusicon')
+
+  if get_option('aosd')
+    subdir('aosd')
+  endif
+
+  if get_option('gl-spectrum') and not have_darwin
+    subdir('glspectrum')
+  endif
+
+  if get_option('hotkey')
+    subdir('hotkey')
+  endif
+endif
+
+
+# general plugins
+if get_option('lirc')
+  subdir('lirc')
+endif
+
+if get_option('mac-media-keys') and have_darwin
+  subdir('mac-media-keys')
+endif
+
+if get_option('mpris2') and not have_windows
+  subdir('mpris2')
+endif
+
+if get_option('scrobbler2')
+  subdir('scrobbler2')
+endif
+
+if get_option('songchange')
+  subdir('songchange')
+endif
+
+
+# input plugins
+if get_option('aac')
+  subdir('aac')
+endif
+
+if get_option('adplug')
+  subdir('adplug')
+endif
+
+if get_option('amidiplug')
+  subdir('amidiplug')
+endif
+
+if get_option('cdaudio')
+  subdir('cdaudio')
+
+  if have_cdaudio
+    subdir('cd-menu-items')
+  endif
+endif
+
+if get_option('ffaudio')
+  subdir('ffaudio')
+endif
+
+if get_option('flac')
+  subdir('flac')
+endif
+
+if get_option('modplug')
+  subdir('modplug')
+endif
+
+if get_option('mpg123')
+  subdir('mpg123')
+endif
+
+if get_option('openmpt')
+  subdir('openmpt')
+endif
+
+if get_option('opus')
+  subdir('opus')
+endif
+
+if get_option('sid')
+  subdir('sid')
+endif
+
+if get_option('sndfile')
+  subdir('sndfile')
+endif
+
+if get_option('vorbis')
+  subdir('vorbis')
+endif
+
+if get_option('wavpack')
+  subdir('wavpack')
+endif
+
+
+# output plugins
+if get_option('alsa')
+  subdir('alsa')
+endif
+
+if get_option('coreaudio') and have_darwin
+  subdir('coreaudio')
+endif
+
+if get_option('filewriter')
+  subdir('filewriter')
+endif
+
+if get_option('jack')
+  subdir('jack')
+endif
+
+if get_option('oss')
+  subdir('oss4')
+endif
+
+if get_option('pipewire')
+  subdir('pipewire')
+endif
+
+if get_option('pulse')
+  subdir('pulse')
+endif
+
+if get_option('sdlout')
+  subdir('sdlout')
+endif
+
+if get_option('sndio')
+  subdir('sndio')
+endif
+
+if have_windows or have_cygwin
+  subdir('waveout')
+endif
+
+
+# config.h stuff
+configure_file(input: 'config.h.meson',
+  output: 'config.h',
+  configuration: conf)

audacious-plugins-4.4.1.tar.bz2/src/metronom/meson.build Added

audacious-plugins-3.6.2-gtk3.tar.bz2/src/metronom/metronom.cc -> audacious-plugins-4.4.1.tar.bz2/src/metronom/metronom.cc Changed

@@ -46,13 +46,11 @@
 about
 };
 
- static constexpr auto iinfo = InputInfo()
- .with_schemes(schemes);
-
- constexpr Metronome() : InputPlugin(info, iinfo) {}
+ constexpr Metronome() : InputPlugin(info, InputInfo()
+ .with_schemes(schemes)) {}
 
 bool is_our_file(const char *filename, VFSFile &);
- Tuple read_tuple(const char *filename, VFSFile &);
+ bool read_tag(const char *filename, VFSFile &file, Tuple &tuple, Index<char> *image);
 bool play(const char *filename, VFSFile &);
 };
 
@@ -220,17 +218,17 @@
 return true;
 }
 
-Tuple Metronome::read_tuple(const char *filename, VFSFile &)
+bool Metronome::read_tag(const char *filename, VFSFile &file, Tuple &tuple, Index<char> *image)
 {
- Tuple tuple;
 metronom_t metronom;
 String desc;
 
- tuple.set_filename (filename);
- if (metronom_get_cp(filename, &metronom, desc))
- tuple.set_str (Tuple::Title, desc);
+ if (!metronom_get_cp(filename, &metronom, desc))
+ return false;
 
- return tuple;
+ tuple.set_str(Tuple::Title, desc);
+ tuple.set_int(Tuple::Channels, 1);
+ return true;
 }
 
 const char Metronome::about =

audacious-plugins-4.4.1.tar.bz2/src/mixer/meson.build Added

audacious-plugins-3.6.2-gtk3.tar.bz2/src/mixer/mixer.cc -> audacious-plugins-4.4.1.tar.bz2/src/mixer/mixer.cc Changed

@@ -17,7 +17,12 @@
 * the use of this software.
 */
 
-/* TODO: implement more surround converters */
+/* TODO: implement more surround converters.
+ There should be more options for in * out cases (for example,
+ the user may wish to mix stereo up to quadro but keep 5.1 as-is,
+ rather than downmixing 5.1 to quadro). A possible design might
+ be a choice of output channels for each input channel count that
+ we care about. */
 
 #include <stdlib.h>
 
@@ -114,6 +119,27 @@
 return mixer_buf;
 }
 
+static Index<float> & stereo_to_quadro (Index<float> & data)
+{
+ int frames = data.len () / 2;
+ mixer_buf.resize (4 * frames);
+
+ float * get = data.begin ();
+ float * set = mixer_buf.begin();
+
+ while (frames --)
+ {
+ float left = * get ++;
+ float right = * get ++;
+ * set ++ = left; // front left
+ * set ++ = right; // front right
+ * set ++ = left; // rear left
+ * set ++ = right; // rear right
+ }
+
+ return mixer_buf;
+}
+
 static Index<float> & surround_5p1_to_stereo (Index<float> & data)
 {
 int frames = data.len () / 6;
@@ -137,14 +163,41 @@
 return mixer_buf;
 }
 
+/* 5 channels case. Quad + center channel */
+static Index<float> & quadro_5_to_stereo (Index<float> & data)
+{
+ int frames = data.len () / 5;
+ mixer_buf.resize (2 * frames);
+
+ float * get = data.begin ();
+ float * set = mixer_buf.begin ();
+
+ while (frames --)
+ {
+ float front_left = * get ++;
+ float front_right = * get ++;
+ float center = * get ++;
+ float rear_left = * get ++;
+ float rear_right = * get ++;
+ * set ++ = front_left + (center * 0.5) + rear_left;
+ * set ++ = front_right + (center * 0.5) + rear_right;
+ }
+
+ return mixer_buf;
+}
+
 static Converter get_converter (int in, int out)
 {
 if (in == 1 && out == 2)
 return mono_to_stereo;
 if (in == 2 && out == 1)
 return stereo_to_mono;
+ if (in == 2 && out == 4)
+ return stereo_to_quadro;
 if (in == 4 && out == 2)
 return quadro_to_stereo;
+ if (in == 5 && out == 2)
+ return quadro_5_to_stereo;
 if (in == 6 && out == 2)
 return surround_5p1_to_stereo;

audacious-plugins-4.4.1.tar.bz2/src/mms/meson.build Added

audacious-plugins-4.4.1.tar.bz2/src/modplug/meson.build Added

audacious-plugins-3.6.2-gtk3.tar.bz2/src/modplug/modplugbmp.cc -> audacious-plugins-4.4.1.tar.bz2/src/modplug/modplugbmp.cc Changed

@@ -51,6 +51,12 @@
 return true;
 if (!memcmp(magic, PSM_MAGIC, 4))
 return true;
+ if (!memcmp(magic, MMD0_MAGIC, 4))
+ return true;
+ if (!memcmp(magic, MMD1_MAGIC, 4))
+ return true;
+ if (!memcmp(magic, OKTA_MAGIC, 8))
+ return true;
 
 if (file.fseek (44, VFS_SEEK_SET))
 return false;
@@ -58,6 +64,8 @@
 return false;
 if (!memcmp(magic, S3M_MAGIC, 4))
 return true;
+ if (!memcmp(magic, PTM_MAGIC, 4))
+ return true;
 
 if (file.fseek (1080, VFS_SEEK_SET))
 return false;
@@ -157,30 +165,15 @@
 
 if(mModProps.mPreamp)
 {
- //apply preamp
- if(mModProps.mBits == 16)
- {
- unsigned n = mBufSize >> 1;
- for(unsigned i = 0; i < n; i++) {
- short old = ((short*)mBuffer)i;
- ((short*)mBuffer)i *= (short int)mPreampFactor;
- // detect overflow and clip!
- if ((old & 0x8000) !=
- (((short*)mBuffer)i & 0x8000))
- ((short*)mBuffer)i = old | 0x7FFF;
-
- }
- }
- else
- {
- for(unsigned i = 0; i < mBufSize; i++) {
- unsigned char old = ((unsigned char*)mBuffer)i;
- ((unsigned char*)mBuffer)i *= (short int)mPreampFactor;
- // detect overflow and clip!
- if ((old & 0x80) !=
- (((unsigned char*)mBuffer)i & 0x80))
- ((unsigned char*)mBuffer)i = old | 0x7F;
- }
+ unsigned n = mBufSize >> 1;
+
+ for(unsigned i = 0; i < n; i++) {
+ short old = ((short*)mBuffer)i;
+ ((short*)mBuffer)i *= (short int)mPreampFactor;
+
+ // detect overflow and clip!
+ if ((old & 0x8000) != (((short*)mBuffer)i & 0x8000))
+ ((short*)mBuffer)i = old | 0x7FFF;
 }
 }
 
@@ -207,14 +200,14 @@
 mBufSize *= mModProps.mFrequency;
 mBufSize /= 1000; //milliseconds
 mBufSize *= mModProps.mChannels;
- mBufSize *= mModProps.mBits / 8;
+ mBufSize *= 2;
 
 mBuffer = new unsigned charmBufSize;
 
 CSoundFile::SetWaveConfig
 (
 mModProps.mFrequency,
- mModProps.mBits,
+ 16,
 mModProps.mChannels
 );
 CSoundFile::SetWaveConfigEx
@@ -265,14 +258,9 @@
 mArchive->Size()
 );
 
- Tuple ti = read_tuple (filename, file);
- if (ti)
- set_playback_tuple (std::move (ti));
-
 set_stream_bitrate(mSoundFile->GetNumChannels() * 1000);
 
- int fmt = (mModProps.mBits == 16) ? FMT_S16_NE : FMT_U8;
- open_audio(fmt, mModProps.mFrequency, mModProps.mChannels);
+ open_audio(FMT_S16_NE, mModProps.mFrequency, mModProps.mChannels);
 
 PlayLoop();
 
@@ -286,7 +274,8 @@
 return true;
 }
 
-Tuple ModplugXMMS::read_tuple (const char * filename, VFSFile & file)
+bool ModplugXMMS::read_tag (const char * filename, VFSFile & file, Tuple & tuple,
+ Index<char> * image)
 {
 CSoundFile* lSoundFile;
 Archive* lArchive;
@@ -297,12 +286,9 @@
 if(lArchive->Size() == 0)
 {
 delete lArchive;
- return Tuple ();
+ return false;
 }
 
- Tuple ti;
- ti.set_filename (filename);
-
 lSoundFile = new CSoundFile;
 lSoundFile->Create((unsigned char*)lArchive->Map(), lArchive->Size());
 
@@ -331,22 +317,23 @@
 case MOD_TYPE_PSM: tmps = "Protracker Studio Module"; break;
 default: tmps = "ModPlug unknown"; break;
 }
- ti.set_str (Tuple::Codec, tmps);
- ti.set_str (Tuple::Quality, _("sequenced"));
- ti.set_int (Tuple::Length, lSoundFile->GetSongTime() * 1000);
+ tuple.set_str (Tuple::Codec, tmps);
+ tuple.set_str (Tuple::Quality, _("sequenced"));
+ tuple.set_int (Tuple::Length, lSoundFile->GetSongTime() * 1000);
+ tuple.set_int (Tuple::Channels, lSoundFile->GetNumChannels());
 
 const char *tmps2 = lSoundFile->GetTitle();
 // Chop any leading spaces off. They are annoying in the playlist.
 while (tmps20 == ' ')
 tmps2++;
 if (tmps20)
- ti.set_str(Tuple::Title, tmps2);
+ tuple.set_str(Tuple::Title, tmps2);
 
 //unload the file
 lSoundFile->Destroy();
 delete lSoundFile;
 delete lArchive;
- return ti;
+ return true;
 }
 
 void ModplugXMMS::apply_settings ()

audacious-plugins-3.6.2-gtk3.tar.bz2/src/modplug/modplugbmp.h -> audacious-plugins-4.4.1.tar.bz2/src/modplug/modplugbmp.h Changed

@@ -27,6 +27,7 @@
 #define MOD_MAGIC_TAKETRACKER32 "32CN" // Taketracker 32 channel
 
 #define S3M_MAGIC "SCRM" /* This is the SCRM string at offset 44 to 47 in the S3M header */
+#define PTM_MAGIC "PTMF" /* Same position for Polytracker magic string */
 
 /* These nicer formats have the magic bytes at the front of the file where they belong */
 #define UMX_MAGIC "\xC1\x83\x2A\x9E"
@@ -35,6 +36,9 @@
 #define IT_MAGIC "IMPM" /* IMPM */
 #define MTM_MAGIC "\x4D\x54\x4D\x10"
 #define PSM_MAGIC "PSM "
+#define MMD0_MAGIC "MMD0" /* Med MoDule 0 */
+#define MMD1_MAGIC "MMD1" /* OctaMED Professional */
+#define OKTA_MAGIC "OKTASONG" /* Oktalyzer */
 
 class CSoundFile;
 class Archive;
@@ -56,15 +60,14 @@
 & prefs
 };
 
- static constexpr auto iinfo = InputInfo (FlagSubtunes)
- .with_exts (exts);
-
- constexpr ModplugXMMS () : InputPlugin (info, iinfo) {}
+ constexpr ModplugXMMS () : InputPlugin (info, InputInfo (FlagSubtunes)
+ .with_priority(_AUD_PLUGIN_DEFAULT_PRIO + 1) // prefer openmpt
+ .with_exts (exts)) {}
 
 bool init ();
 
 bool is_our_file (const char * filename, VFSFile & file);
- Tuple read_tuple (const char * filename, VFSFile & file);
+ bool read_tag (const char * filename, VFSFile & file, Tuple & tuple, Index<char> * image);
 bool play (const char * filename, VFSFile & file);
 
 private:

audacious-plugins-3.6.2-gtk3.tar.bz2/src/modplug/plugin_main.cc -> audacious-plugins-4.4.1.tar.bz2/src/modplug/plugin_main.cc Changed

@@ -8,6 +8,9 @@
 
 #include "modplugbmp.h"
 
+#include <libmodplug/stdafx.h>
+#include <libmodplug/sndfile.h>
+
 #include <libaudcore/runtime.h>
 #include <libaudcore/preferences.h>
 
@@ -21,9 +24,8 @@
 nullptr };
 
 const char * const ModplugXMMS::defaults = {
- "Bits", "16",
 "Channels", "2",
- "ResamplingMode", "3", /* SRCMODE_POLYPHASE */
+ "ResamplingMode", aud::numeric_string<SRCMODE_POLYPHASE>::str,
 "Frequency", "44100",
 
 "Reverb", "FALSE",
@@ -50,9 +52,6 @@
 };
 
 static const PreferencesWidget quality_widgets = {
- WidgetLabel (N_("Resolution")),
- WidgetRadio (N_("8-bit"), WidgetInt (MODPLUG_CFGID, "Bits"), {8}),
- WidgetRadio (N_("16-bit"), WidgetInt (MODPLUG_CFGID, "Bits"), {16}),
 WidgetLabel (N_("Channels")),
 WidgetRadio (N_("Mono"), WidgetInt (MODPLUG_CFGID, "Channels"), {1}),
 WidgetRadio (N_("Stereo"), WidgetInt (MODPLUG_CFGID, "Channels"), {2}),
@@ -131,7 +130,6 @@
 {
 aud_config_set_defaults (MODPLUG_CFGID, defaults);
 
- mModProps.mBits = aud_get_int (MODPLUG_CFGID, "Bits");
 mModProps.mChannels = aud_get_int (MODPLUG_CFGID, "Channels");
 mModProps.mResamplingMode = aud_get_int (MODPLUG_CFGID, "ResamplingMode");
 mModProps.mFrequency = aud_get_int (MODPLUG_CFGID, "Frequency");

audacious-plugins-3.6.2-gtk3.tar.bz2/src/modplug/settings.h -> audacious-plugins-4.4.1.tar.bz2/src/modplug/settings.h Changed

audacious-plugins-4.4.1.tar.bz2/src/moonstone Added

audacious-plugins-4.4.1.tar.bz2/src/moonstone/Makefile Added

audacious-plugins-4.4.1.tar.bz2/src/moonstone/info_bar.cc Added

@@ -0,0 +1,351 @@
+/*
+ * info_bar.cc
+ * Copyright 2014, 2020 Ariadne Conill
+ *
+ * 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 <cmath>
+
+#include "info_bar.h"
+
+#include <libaudcore/drct.h>
+#include <libaudcore/interface.h>
+#include <libaudcore/runtime.h>
+#include <libaudqt/libaudqt.h>
+
+#include <QToolButton>
+#include <QEvent>
+#include <QPainter>
+
+namespace Moonstone {
+
+static constexpr int FadeSteps = 10;
+
+static constexpr int VisBands = 12;
+static constexpr int VisDelay = 2; /* delay before falloff in frames */
+static constexpr int VisFalloff = 2; /* falloff in decibels per frame */
+
+struct BarColors
+{
+ QColor main, shadow;
+};
+
+struct PixelSizes
+{
+ int Spacing, IconSize, Height, BandWidth, BandSpacing, VisWidth, VisScale,
+ VisCenter;
+
+ PixelSizes(int dpi)
+ : Spacing(aud::rescale(dpi, 12, 1)),
+ IconSize(2 * aud::rescale(dpi, 3, 1)), // should be divisible by 2
+ Height(IconSize + 2 * Spacing), BandWidth(aud::rescale(dpi, 16, 1)),
+ BandSpacing(aud::rescale(dpi, 48, 1)),
+ VisWidth(VisBands * (BandWidth + BandSpacing) - BandSpacing +
+ 2 * Spacing),
+ VisScale(aud::rescale(IconSize, 8, 5)), VisCenter(VisScale + Spacing)
+ {
+ }
+};
+
+class InfoVis : public QWidget, Visualizer
+{
+public:
+ InfoVis(QWidget * parent = nullptr);
+ ~InfoVis();
+
+ void enable(bool enabled);
+
+ const QGradient & gradient() const { return m_gradient; }
+ const PixelSizes & pixelSizes() const { return ps; }
+
+protected:
+ void render_freq(const float * freq);
+ void clear();
+
+ void changeEvent(QEvent * event);
+ void paintEvent(QPaintEvent *);
+
+private:
+ void update_colors();
+
+ const PixelSizes ps;
+ QLinearGradient m_gradient;
+ BarColors m_bar_colorsVisBands;
+
+ float m_barsVisBands{};
+ char m_delayVisBands{};
+};
+
+void InfoVis::update_colors()
+{
+ auto & base = palette().color(QPalette::Window);
+ auto & highlight = palette().color(QPalette::Highlight);
+
+ m_gradient.setStops(audqt::dark_bg_gradient(base));
+
+ for (int i = 0; i < VisBands; i++)
+ {
+ m_bar_colorsi.main = audqt::vis_bar_color(highlight, i, VisBands);
+ m_bar_colorsi.shadow = m_bar_colorsi.main.darker(333);
+ }
+}
+
+InfoVis::InfoVis(QWidget * parent)
+ : QWidget(parent), Visualizer(Freq), ps(audqt::sizes.OneInch),
+ m_gradient(0, 0, 0, ps.Height)
+{
+ update_colors();
+ setAttribute(Qt::WA_OpaquePaintEvent);
+ setMinimumHeight(ps.Height);
+ resize(ps.VisWidth + 2 * ps.Spacing, parentWidget()->height());
+}
+
+InfoVis::~InfoVis() { enable(false); }
+
+void InfoVis::render_freq(const float * freq)
+{
+ /* xscalei = pow (256, i / VIS_BANDS) - 0.5; */
+ const float xscaleVisBands + 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 (int i = 0; i < VisBands; i++)
+ {
+ /* 40 dB range */
+ float x = 40 + compute_freq_band(freq, xscale, i, VisBands);
+
+ m_barsi -= aud::max(0, VisFalloff - m_delayi);
+
+ if (m_delayi)
+ m_delayi--;
+
+ if (x > m_barsi)
+ {
+ m_barsi = x;
+ m_delayi = VisDelay;
+ }
+ }
+
+ repaint();
+}
+
+void InfoVis::clear()
+{
+ memset(m_bars, 0, sizeof m_bars);
+ memset(m_delay, 0, sizeof m_delay);
+
+ update();
+}
+
+void InfoVis::changeEvent(QEvent * event)
+{
+ if (event->type() == QEvent::PaletteChange)
+ update_colors();
+
+ QWidget::changeEvent(event);
+}
+
+void InfoVis::paintEvent(QPaintEvent *)
+{
+ QPainter p(this);
+ p.fillRect(0, 0, ps.VisWidth, height(), m_gradient);
+
+ for (int i = 0; i < VisBands; i++)
+ {
+ int x = ps.Spacing + i * (ps.BandWidth + ps.BandSpacing);
+ int v = aud::clamp((int)(m_barsi * ps.VisScale / 40), 0, ps.VisScale);
+ int m = aud::min(ps.VisCenter + v, ps.Height);
+
+ p.fillRect(x, ps.VisCenter - v, ps.BandWidth, v, m_bar_colorsi.main);
+ p.fillRect(x, ps.VisCenter, ps.BandWidth, m - ps.VisCenter,
+ m_bar_colorsi.shadow);
+ }
+}
+
+void InfoVis::enable(bool enabled)
+{
+ if (enabled)
+ aud_visualizer_add(this);
+ else
+ {
+ aud_visualizer_remove(this);
+ clear();
+ }
+}
+
+InfoBar::InfoBar(QWidget * parent, ToolBar * toolbar)
+ : QWidget(parent), m_vis(new InfoVis(this)), ps(m_vis->pixelSizes()),
+ m_stopped(true)
+{
+ update_vis();
+ setFixedHeight(ps.Height + toolbar->height());
+
+ m_vis->raise();
+
+ for (SongData & d : sd)
+ {
+ d.title.setTextFormat(Qt::PlainText);
+ d.artist.setTextFormat(Qt::PlainText);
+ d.album.setTextFormat(Qt::PlainText);
+ d.alpha = 0;
+ }
+
+ if (aud_drct_get_ready())
+ {
+ m_stopped = false;
+ update_title();
+ update_album_art();
+
+ /* skip fade-in */
+ sdCur.alpha = FadeSteps;
+ }
+
+ m_toolbar = toolbar;
+ m_toolbar->setParent(this);
+
+ m_toolbar->move(0, height() - m_toolbar->height());
+ m_toolbar->resize(width(), m_toolbar->height());
+ m_toolbar->raise();
+}
+
+void InfoBar::resizeEvent(QResizeEvent *)
+{
+ for (SongData & d : sd)
+ d.title.setText(QString());
+
+ m_vis->move(width() - ps.VisWidth, 0);
+ m_vis->resize(ps.VisWidth, height());
+
+ m_toolbar->move(0, height() - m_toolbar->height());
+ m_toolbar->resize(width(), m_toolbar->height());
+}
+
+void InfoBar::paintEvent(QPaintEvent *)
+{
+ QPainter p(this);
+
+ p.fillRect(0, 0, width() - ps.VisWidth, height(), m_vis->gradient());
+
+ for (SongData & d : sd)
+ {
+ p.setOpacity((qreal)d.alpha / FadeSteps);
+
+ if (!d.art.isNull())
+ {
+ auto sz = d.art.size() / d.art.devicePixelRatio();
+ int left = ps.Spacing + (ps.IconSize - sz.width()) / 2;
+ int top = ps.Spacing + (ps.IconSize - sz.height()) / 2;
+ p.drawPixmap(left, top, d.art);
+ }
+
+ QFont font = p.font();
+ font.setPointSize(18);
+ p.setFont(font);
+
+ if (d.title.text().isNull() && !d.orig_title.isNull())
+ {
+ QFontMetrics metrics = p.fontMetrics();
+ d.title = QStaticText(metrics.elidedText(
+ d.orig_title, Qt::ElideRight,
+ width() - ps.VisWidth - ps.Height - ps.Spacing));
+ }
+
+ p.setPen(QColor(255, 255, 255));
+ p.drawStaticText(ps.Height, ps.Spacing, d.title);
+
+ font.setPointSize(9);
+ p.setFont(font);
+
+ p.drawStaticText(ps.Height, ps.Spacing + ps.IconSize / 2, d.artist);
+
+ p.setPen(QColor(179, 179, 179));
+ p.drawStaticText(ps.Height, ps.Spacing + ps.IconSize * 3 / 4, d.album);
+ }
+}
+
+void InfoBar::update_title()
+{
+ Tuple tuple = aud_drct_get_tuple();
+
+ sdCur.title.setText(QString());
+ sdCur.orig_title = tuple.get_str(Tuple::Title);
+ sdCur.artist.setText((const char *)tuple.get_str(Tuple::Artist));
+ sdCur.album.setText((const char *)tuple.get_str(Tuple::Album));
+
+ update();
+}
+
+void InfoBar::update_album_art()
+{
+ sdCur.art = audqt::art_request_current(ps.IconSize, ps.IconSize);
+}
+
+void InfoBar::next_song()
+{
+ sdPrev = std::move(sdCur);
+ sdCur.alpha = 0;
+}
+
+void InfoBar::do_fade()
+{
+ bool done = true;
+
+ if (aud_drct_get_playing() && sdCur.alpha < FadeSteps)
+ {
+ sdCur.alpha++;
+ done = false;
+ }
+
+ if (sdPrev.alpha > 0)
+ {
+ sdPrev.alpha--;
+ done = false;
+ }
+
+ update();
+
+ if (done)
+ fade_timer.stop();
+}
+
+void InfoBar::playback_ready_cb()
+{
+ if (!m_stopped)
+ next_song();
+
+ m_stopped = false;
+ update_title();
+ update_album_art();
+
+ update();
+ fade_timer.start();
+}
+
+void InfoBar::playback_stop_cb()
+{
+ next_song();
+ m_stopped = true;
+
+ update();
+ fade_timer.start();
+}
+
+void InfoBar::update_vis()
+{
+ m_vis->enable(aud_get_bool("qtui", "infoarea_show_vis"));
+}
+
+}

audacious-plugins-4.4.1.tar.bz2/src/moonstone/info_bar.h Added

@@ -0,0 +1,87 @@
+/*
+ * info_bar.h
+ * Copyright 2014, 2020 Ariadne Conill
+ *
+ * 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.
+ */
+
+#ifndef INFO_BAR_H
+#define INFO_BAR_H
+
+#include "tool_bar.h"
+
+#include <QStaticText>
+#include <QWidget>
+#include <QLabel>
+
+#include <libaudcore/hook.h>
+
+namespace Moonstone {
+
+class InfoVis;
+struct PixelSizes;
+
+class InfoBar : public QWidget
+{
+public:
+ InfoBar(QWidget * parent = nullptr, ToolBar * toolbar = nullptr);
+
+ void resizeEvent(QResizeEvent *);
+ void paintEvent(QPaintEvent *);
+
+private:
+ void update_title();
+ void update_album_art();
+ void next_song();
+ void do_fade();
+
+ void playback_ready_cb();
+ void playback_stop_cb();
+ void update_vis();
+
+ const HookReceiver<InfoBar> hook1{"tuple change", this,
+ &InfoBar::update_title},
+ hook2{"playback ready", this, &InfoBar::playback_ready_cb},
+ hook3{"playback stop", this, &InfoBar::playback_stop_cb},
+ hook4{"qtui toggle infoarea_vis", this, &InfoBar::update_vis};
+
+ const Timer<InfoBar> fade_timer{TimerRate::Hz30, this, &InfoBar::do_fade};
+
+ InfoVis * m_vis;
+ const PixelSizes & ps;
+
+ struct SongData
+ {
+ QPixmap art;
+ QString orig_title;
+ QStaticText title, artist, album;
+ int alpha;
+ };
+
+ enum
+ {
+ Prev = 0,
+ Cur = 1
+ }; /* index into SongData array */
+
+ SongData sd2;
+ bool m_stopped;
+
+ ToolBar * m_toolbar;
+};
+
+}
+
+#endif

audacious-plugins-4.4.1.tar.bz2/src/moonstone/main_window.cc Added

@@ -0,0 +1,220 @@
+/*
+ * main_window.cc
+ * Copyright 2014 Michał Lipski
+ * Copyright 2020 Ariadne Conill
+ *
+ * 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 <QCloseEvent>
+#include <QSplitter>
+#include <QToolButton>
+
+#include <libaudcore/drct.h>
+#include <libaudcore/i18n.h>
+#include <libaudcore/plugins.h>
+#include <libaudcore/runtime.h>
+
+#include <libaudqt/libaudqt.h>
+
+#include "main_window.h"
+#include "info_bar.h"
+#include "tool_bar.h"
+#include "time_slider.h"
+#include "playlist.h"
+#include "playlist_tabs.h"
+#include "playlist_selection.h"
+
+namespace Moonstone {
+
+MainWindow::MainWindow() :
+ m_center_widget(new QWidget(this)),
+ m_center_layout(audqt::make_vbox(m_center_widget, 0)),
+ m_splitter(new QSplitter(this)),
+ m_playlist_tabs(new PlaylistTabs),
+ m_playlists_view(new PlaylistsView)
+{
+ resize(1000, 600);
+
+ setCentralWidget(m_center_widget);
+
+ auto slider = new TimeSlider(this);
+
+ const ToolBarItem items = {
+#if 0
+ ToolBarAction("edit-find", N_("Search Library"), N_("Search Library"),
+ toggle_search_tool, &m_search_action),
+#endif
+ ToolBarAction("document-open", N_("Open Files"), N_("Open Files"),
+ () { audqt::fileopener_show(audqt::FileMode::Open); }),
+ ToolBarAction("list-add", N_("Add Files"), N_("Add Files"),
+ () { audqt::fileopener_show(audqt::FileMode::Add); }),
+ ToolBarSeparator(),
+ ToolBarAction("media-skip-backward", N_("Previous"), N_("Previous"),
+ aud_drct_pl_prev),
+ ToolBarAction("media-playback-start", N_("Play"), N_("Play"),
+ aud_drct_play_pause, &m_play_pause_action),
+ ToolBarAction("media-playback-stop", N_("Stop"), N_("Stop"),
+ aud_drct_stop, &m_stop_action),
+ ToolBarAction(
+ "media-playback-stop", N_("Stop After This Song"),
+ N_("Stop After This Song"),
+ (bool on) { aud_set_bool("stop_after_current_song", on); },
+ &m_stop_after_action),
+ ToolBarAction("media-skip-forward", N_("Next"), N_("Next"),
+ aud_drct_pl_next),
+ ToolBarAction(
+ "media-record", N_("Record Stream"), N_("Record Stream"),
+ (bool on) { aud_set_bool("record", on); }, &m_record_action),
+ ToolBarSeparator(),
+ ToolBarCustom(slider),
+ ToolBarCustom(slider->label()),
+ ToolBarSeparator(),
+ ToolBarAction(
+ "media-playlist-repeat", N_("Repeat"), N_("Repeat"),
+ (bool on) { aud_set_bool("repeat", on); }, &m_repeat_action),
+ ToolBarAction(
+ "media-playlist-shuffle", N_("Shuffle"), N_("Shuffle"),
+ (bool on) { aud_set_bool("shuffle", on); }, &m_shuffle_action),
+ ToolBarCustom(audqt::volume_button_new(this))};
+
+ m_toolbar = new ToolBar(this, items);
+ m_infobar = new InfoBar(this, m_toolbar);
+
+ m_center_layout->addWidget(m_infobar);
+ m_center_layout->addWidget(m_splitter);
+
+ m_splitter->addWidget(m_playlists_view);
+ m_splitter->addWidget(m_playlist_tabs);
+ m_splitter->setStretchFactor(1, 2);
+
+ update_toggles();
+}
+
+void MainWindow::closeEvent(QCloseEvent * e)
+{
+ bool handled = false;
+
+ hook_call("window close", &handled);
+
+ if (!handled)
+ {
+ e->accept();
+ aud_quit();
+ }
+ else
+ e->ignore();
+}
+
+void MainWindow::update_toggles()
+{
+#if 0
+ if (m_search_tool)
+ m_search_action->setChecked(aud_plugin_get_enabled(m_search_tool));
+#endif
+
+ bool stop_after = aud_get_bool("stop_after_current_song");
+ m_stop_action->setVisible(!stop_after);
+ m_stop_after_action->setVisible(stop_after);
+ m_stop_after_action->setChecked(stop_after);
+
+ m_record_action->setVisible(aud_drct_get_record_enabled());
+ m_record_action->setChecked(aud_get_bool("record"));
+
+ m_repeat_action->setChecked(aud_get_bool("repeat"));
+ m_shuffle_action->setChecked(aud_get_bool("shuffle"));
+}
+
+void MainWindow::update_play_pause()
+{
+ if (!aud_drct_get_playing() || aud_drct_get_paused())
+ {
+ m_play_pause_action->setIcon(QIcon::fromTheme("media-playback-start"));
+ m_play_pause_action->setText(_("Play"));
+ m_play_pause_action->setToolTip(_("Play"));
+ }
+ else
+ {
+ m_play_pause_action->setIcon(QIcon::fromTheme("media-playback-pause"));
+ m_play_pause_action->setText(_("Pause"));
+ m_play_pause_action->setToolTip(_("Pause"));
+ }
+}
+
+void MainWindow::title_change_cb()
+{
+ auto title = aud_drct_get_title();
+ if (title)
+ {
+ set_title(QString(title) + QString(" - Audacious"));
+ m_buffering_timer.stop();
+ }
+}
+
+void MainWindow::playback_begin_cb()
+{
+ update_play_pause();
+
+ auto last_widget = m_playlist_tabs->playlistWidget(m_last_playing.index());
+ if (last_widget)
+ last_widget->updatePlaybackIndicator();
+
+ auto playing = Playlist::playing_playlist();
+
+ auto widget = m_playlist_tabs->playlistWidget(playing.index());
+ if (widget)
+ widget->scrollToCurrent();
+ if (widget && widget != last_widget)
+ widget->updatePlaybackIndicator();
+
+ m_last_playing = playing;
+
+ m_buffering_timer.queue(250, this() { set_title(_("Buffering ...")); });
+}
+
+void MainWindow::pause_cb()
+{
+ update_play_pause();
+
+ auto widget = m_playlist_tabs->playlistWidget(m_last_playing.index());
+ if (widget)
+ widget->updatePlaybackIndicator();
+}
+
+void MainWindow::playback_stop_cb()
+{
+ set_title("Audacious");
+ m_buffering_timer.stop();
+
+ update_play_pause();
+
+ auto last_widget = m_playlist_tabs->playlistWidget(m_last_playing.index());
+ if (last_widget)
+ last_widget->updatePlaybackIndicator();
+
+ m_last_playing = Playlist();
+}
+
+void MainWindow::set_title(const QString & title)
+{
+ int instance = aud_get_instance();
+ if (instance == 1)
+ QMainWindow::setWindowTitle(title);
+ else
+ QMainWindow::setWindowTitle(
+ QString("%1 (%2)").arg(title).arg(instance));
+}
+
+}

audacious-plugins-4.4.1.tar.bz2/src/moonstone/main_window.h Added

@@ -0,0 +1,92 @@
+/*
+ * main_window.h
+ * Copyright 2014 Michał Lipski
+ * Copyright 2020 Ariadne Conill
+ *
+ * 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.
+ */
+
+#ifndef MAIN_WINDOW_H
+#define MAIN_WINDOW_H
+
+#include <libaudcore/hook.h>
+#include <libaudcore/mainloop.h>
+#include <libaudcore/playlist.h>
+
+#include "../ui-common/dialogs-qt.h"
+
+#include <QMainWindow>
+#include <QVBoxLayout>
+#include <QSplitter>
+
+namespace Moonstone {
+
+class InfoBar;
+class ToolBar;
+class PlaylistTabs;
+class PlaylistsView;
+
+class MainWindow : public QMainWindow {
+public:
+ MainWindow();
+
+private:
+ QWidget * m_center_widget;
+ QVBoxLayout * m_center_layout;
+ InfoBar * m_infobar;
+ ToolBar * m_toolbar;
+
+ QSplitter * m_splitter;
+ PlaylistTabs * m_playlist_tabs;
+ PlaylistsView * m_playlists_view;
+
+ QAction *m_search_action;
+ QAction *m_play_pause_action, *m_stop_action, *m_stop_after_action;
+ QAction *m_record_action;
+ QAction *m_repeat_action, *m_shuffle_action;
+
+ QueuedFunc m_buffering_timer;
+ Playlist m_last_playing;
+
+ void closeEvent(QCloseEvent * e) override;
+
+ void set_title(const QString & title);
+
+ void update_toggles();
+ void update_play_pause();
+
+ void title_change_cb();
+ void playback_begin_cb();
+ void playback_ready_cb();
+ void pause_cb();
+ void playback_stop_cb();
+
+ const HookReceiver<MainWindow> //
+ hook1{"title change", this, &MainWindow::title_change_cb},
+ hook2{"playback begin", this, &MainWindow::playback_begin_cb},
+ hook3{"playback ready", this, &MainWindow::title_change_cb},
+ hook4{"playback pause", this, &MainWindow::pause_cb},
+ hook5{"playback unpause", this, &MainWindow::pause_cb},
+ hook6{"playback stop", this, &MainWindow::playback_stop_cb},
+ hook7{"set stop_after_current_song", this, &MainWindow::update_toggles},
+ hook8{"enable record", this, &MainWindow::update_toggles},
+ hook9{"set record", this, &MainWindow::update_toggles},
+ hook10{"set repeat", this, &MainWindow::update_toggles},
+ hook11{"set shuffle", this, &MainWindow::update_toggles};
+};
+
+}
+
+#endif

audacious-plugins-4.4.1.tar.bz2/src/moonstone/meson.build Added

audacious-plugins-4.4.1.tar.bz2/src/moonstone/moonstone.cc Added

@@ -0,0 +1,80 @@
+/*
+ * moonstone.cc
+ * Copyright 2020 Ariadne Conill
+ *
+ * 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 <QApplication>
+#include <QPointer>
+
+#include <libaudcore/i18n.h>
+#include <libaudcore/plugin.h>
+#include <libaudcore/runtime.h>
+
+#include <libaudqt/iface.h>
+#include <libaudqt/libaudqt.h>
+
+#include "main_window.h"
+
+static QPointer<Moonstone::MainWindow> s_window;
+
+class MoonstoneUI : public audqt::QtIfacePlugin
+{
+public:
+ constexpr MoonstoneUI()
+ : audqt::QtIfacePlugin(
+ {N_("Moonstone"), PACKAGE, nullptr, nullptr, PluginQtOnly})
+ {
+ }
+
+ bool init()
+ {
+ audqt::init();
+// aud_config_set_defaults("moonstoneui", moonstoneui_defaults);
+ s_window = new Moonstone::MainWindow;
+ return true;
+ }
+
+ void cleanup()
+ {
+ delete s_window;
+ audqt::cleanup();
+ }
+
+ void run() { QApplication::exec(); }
+
+ void show(bool show)
+ {
+ if (!s_window)
+ return;
+
+ s_window->setVisible(show);
+
+ if (show)
+ {
+ s_window->activateWindow();
+ s_window->raise();
+ }
+ }
+
+ void quit()
+ {
+ QObject::connect(s_window.data(), &QObject::destroyed, QApplication::quit);
+ s_window->deleteLater();
+ }
+};
+
+EXPORT MoonstoneUI aud_plugin_instance;

audacious-plugins-4.4.1.tar.bz2/src/moonstone/playlist.cc Added

@@ -0,0 +1,494 @@
+/*
+ * playlist.cc
+ * Copyright 2014 Michał Lipski
+ *
+ * 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 <QHeaderView>
+#include <QKeyEvent>
+#include <QMenu>
+#include <QSortFilterProxyModel>
+#include <QProxyStyle>
+
+#include <libaudcore/audstrings.h>
+#include <libaudcore/drct.h>
+#include <libaudcore/runtime.h>
+#include <libaudqt/libaudqt.h>
+
+#include "playlist.h"
+#include "playlist_header.h"
+#include "playlist_model.h"
+
+#include "../ui-common/menu-ops.h"
+#include "../ui-common/qt-compat.h"
+
+namespace Moonstone {
+
+PlaylistWidget::PlaylistWidget(QWidget * parent, Playlist playlist)
+ : audqt::TreeView(parent), m_playlist(playlist),
+ model(new PlaylistModel(this, playlist)),
+ proxyModel(new PlaylistProxyModel(this, playlist))
+{
+ /* setting up filtering model */
+ proxyModel->setSourceModel(model);
+
+ inUpdate = true; /* prevents changing focused row */
+ setModel(proxyModel);
+ inUpdate = false;
+
+ auto header = new PlaylistHeader(this);
+ setHeader(header);
+ /* this has to come after setHeader() to take effect */
+ header->setSectionsClickable(true);
+
+ setAllColumnsShowFocus(true);
+ setAlternatingRowColors(true);
+ setAttribute(Qt::WA_MacShowFocusRect, false);
+ setUniformRowHeights(true);
+ setFrameShape(QFrame::NoFrame);
+ setSelectionMode(ExtendedSelection);
+ setDragDropMode(DragDrop);
+ setMouseTracking(true);
+
+ connect(this, &QTreeView::activated, this, &PlaylistWidget::activate);
+
+ updateSettings();
+ header->updateColumns();
+
+ /* get initial selection and focus from core */
+ inUpdate = true;
+ updateSelection(0, 0);
+ inUpdate = false;
+}
+
+PlaylistWidget::~PlaylistWidget()
+{
+ delete model;
+ delete proxyModel;
+}
+
+QModelIndex PlaylistWidget::rowToIndex(int row)
+{
+ if (row < 0)
+ return QModelIndex();
+
+ return proxyModel->mapFromSource(model->index(row, firstVisibleColumn));
+}
+
+int PlaylistWidget::indexToRow(const QModelIndex & index)
+{
+ if (!index.isValid())
+ return -1;
+
+ return proxyModel->mapToSource(index).row();
+}
+
+QModelIndex PlaylistWidget::visibleIndexNear(int row)
+{
+ QModelIndex index = rowToIndex(row);
+ if (index.isValid())
+ return index;
+
+ int n_entries = m_playlist.n_entries();
+
+ for (int r = row + 1; r < n_entries; r++)
+ {
+ index = rowToIndex(r);
+ if (index.isValid())
+ return index;
+ }
+
+ for (int r = row - 1; r >= 0; r--)
+ {
+ index = rowToIndex(r);
+ if (index.isValid())
+ return index;
+ }
+
+ return index;
+}
+
+void PlaylistWidget::activate(const QModelIndex & index)
+{
+ if (index.isValid())
+ {
+ m_playlist.set_position(indexToRow(index));
+ m_playlist.start_playback();
+ }
+}
+
+void PlaylistWidget::contextMenuEvent(QContextMenuEvent * event)
+{
+ if (contextMenu)
+ contextMenu->popup(event->globalPos());
+}
+
+void PlaylistWidget::keyPressEvent(QKeyEvent * event)
+{
+ auto CtrlShiftAlt =
+ Qt::ShiftModifier | Qt::ControlModifier | Qt::AltModifier;
+ if (!(event->modifiers() & CtrlShiftAlt))
+ {
+ switch (event->key())
+ {
+ case Qt::Key_Right:
+ aud_drct_seek(aud_drct_get_time() +
+ aud_get_int("step_size") * 1000);
+ return;
+ case Qt::Key_Left:
+ aud_drct_seek(aud_drct_get_time() -
+ aud_get_int("step_size") * 1000);
+ return;
+ case Qt::Key_Space:
+ aud_drct_play_pause();
+ return;
+ case Qt::Key_Delete:
+ //pl_remove_selected();
+ return;
+ case Qt::Key_Z:
+ aud_drct_pl_prev();
+ return;
+ case Qt::Key_X:
+ aud_drct_play();
+ return;
+ case Qt::Key_C:
+ aud_drct_pause();
+ return;
+ case Qt::Key_V:
+ aud_drct_stop();
+ return;
+ case Qt::Key_B:
+ aud_drct_pl_next();
+ return;
+ }
+ }
+
+ audqt::TreeView::keyPressEvent(event);
+}
+
+void PlaylistWidget::mouseMoveEvent(QMouseEvent * event)
+{
+ int row = indexToRow(indexAt(event->pos()));
+
+ if (row < 0)
+ hidePopup();
+ else if (aud_get_bool("show_filepopup_for_tuple") && m_popup_pos != row)
+ triggerPopup(row);
+
+ audqt::TreeView::mouseMoveEvent(event);
+}
+
+void PlaylistWidget::leaveEvent(QEvent * event)
+{
+ hidePopup();
+
+ audqt::TreeView::leaveEvent(event);
+}
+
+/* Since Qt doesn't support both DragDrop and InternalMove at once,
+ * this hack is needed to set the drag icon to "move" for internal drags. */
+void PlaylistWidget::dragMoveEvent(QDragMoveEvent * event)
+{
+ if (event->source() == this)
+ event->setDropAction(Qt::MoveAction);
+
+ audqt::TreeView::dragMoveEvent(event);
+
+ if (event->source() == this)
+ event->setDropAction(Qt::MoveAction);
+}
+
+void PlaylistWidget::dropEvent(QDropEvent * event)
+{
+ /* let Qt forward external drops to the PlaylistModel */
+ if (event->source() != this)
+ return audqt::TreeView::dropEvent(event);
+
+ int from = indexToRow(currentIndex());
+ if (from < 0)
+ return;
+
+ int to;
+ switch (dropIndicatorPosition())
+ {
+ case AboveItem:
+ to = indexToRow(indexAt(QtCompat::pos(event)));
+ break;
+ case BelowItem:
+ to = indexToRow(indexAt(QtCompat::pos(event))) + 1;
+ break;
+ case OnViewport:
+ to = m_playlist.n_entries();
+ break;
+ default:
+ return;
+ }
+
+ /* Adjust the shift amount so that the selected entry closest to the
+ * destination ends up at the destination. */
+ if (to > from)
+ to -= m_playlist.n_selected(from, to - from);
+ else
+ to += m_playlist.n_selected(to, from - to);
+
+ m_playlist.shift_entries(from, to - from);
+
+ event->acceptProposedAction();
+}
+
+void PlaylistWidget::currentChanged(const QModelIndex & current,
+ const QModelIndex & previous)
+{
+ audqt::TreeView::currentChanged(current, previous);
+
+ if (!inUpdate)
+ m_playlist.set_focus(indexToRow(current));
+}
+
+void PlaylistWidget::selectionChanged(const QItemSelection & selected,
+ const QItemSelection & deselected)
+{
+ audqt::TreeView::selectionChanged(selected, deselected);
+
+ if (!inUpdate)
+ {
+ for (const QModelIndex & idx : selected.indexes())
+ m_playlist.select_entry(indexToRow(idx), true);
+ for (const QModelIndex & idx : deselected.indexes())
+ m_playlist.select_entry(indexToRow(idx), false);
+ }
+}
+
+/* returns true if the focus changed or the playlist scrolled */
+bool PlaylistWidget::scrollToCurrent(bool force)
+{
+ bool scrolled = false;
+ int entry = m_playlist.get_position();
+
+ if (entry >= 0 && (aud_get_bool("qtui", "autoscroll") || force))
+ {
+ if (m_playlist.get_focus() != entry)
+ scrolled = true;
+
+ m_playlist.select_all(false);
+ m_playlist.select_entry(entry, true);
+ m_playlist.set_focus(entry);
+
+ auto index = rowToIndex(entry);
+ auto rect = visualRect(index);
+
+ scrollTo(index);
+
+ if (visualRect(index) != rect)
+ scrolled = true;
+ }
+
+ return scrolled;
+}
+
+void PlaylistWidget::updatePlaybackIndicator()
+{
+ if (currentPos >= 0)
+ model->entriesChanged(currentPos, 1);
+}
+
+void PlaylistWidget::getSelectedRanges(int rowsBefore, int rowsAfter,
+ QItemSelection & selected,
+ QItemSelection & deselected)
+{
+ int entries = m_playlist.n_entries();
+
+ QItemSelection ranges2;
+ QModelIndex first, last;
+ bool prev = false;
+
+ for (int row = rowsBefore; row < entries - rowsAfter; row++)
+ {
+ auto idx = rowToIndex(row);
+ if (!idx.isValid())
+ continue;
+
+ bool sel = m_playlist.entry_selected(row);
+
+ if (sel != prev && first.isValid())
+ rangesprev.merge(QItemSelection(first, last),
+ QItemSelectionModel::Select);
+
+ if (sel != prev || !first.isValid())
+ first = idx;
+
+ last = idx;
+ prev = sel;
+ }
+
+ if (first.isValid())
+ rangesprev.merge(QItemSelection(first, last),
+ QItemSelectionModel::Select);
+
+ selected = std::move(rangestrue);
+ deselected = std::move(rangesfalse);
+}
+
+void PlaylistWidget::updateSelection(int rowsBefore, int rowsAfter)
+{
+ QItemSelection selected, deselected;
+ getSelectedRanges(rowsBefore, rowsAfter, selected, deselected);
+
+ auto sel = selectionModel();
+
+ if (!selected.isEmpty())
+ sel->select(selected, sel->Select | sel->Rows);
+ if (!deselected.isEmpty())
+ sel->select(deselected, sel->Deselect | sel->Rows);
+
+ sel->setCurrentIndex(rowToIndex(m_playlist.get_focus()), sel->NoUpdate);
+}
+
+void PlaylistWidget::playlistUpdate()
+{
+ auto update = m_playlist.update_detail();
+
+ if (update.level == Playlist::NoUpdate)
+ return;
+
+ inUpdate = true;
+
+ int entries = m_playlist.n_entries();
+ int changed = entries - update.before - update.after;
+
+ if (update.level == Playlist::Structure)
+ {
+ int old_entries = model->rowCount();
+ int removed = old_entries - update.before - update.after;
+
+ if (currentPos >= old_entries - update.after)
+ currentPos += entries - old_entries;
+ else if (currentPos >= update.before)
+ currentPos = -1;
+
+ model->entriesRemoved(update.before, removed);
+ model->entriesAdded(update.before, changed);
+ }
+ else if (update.level == Playlist::Metadata || update.queue_changed)
+ model->entriesChanged(update.before, changed);
+
+ if (update.queue_changed)
+ {
+ for (int i = m_playlist.n_queued(); i--;)
+ {
+ int entry = m_playlist.queue_get_entry(i);
+ if (entry < update.before || entry >= entries - update.after)
+ model->entriesChanged(entry, 1);
+ }
+ }
+
+ int pos = m_playlist.get_position();
+
+ if (pos != currentPos)
+ {
+ if (currentPos >= 0)
+ model->entriesChanged(currentPos, 1);
+ if (pos >= 0)
+ model->entriesChanged(pos, 1);
+
+ currentPos = pos;
+ }
+
+ updateSelection(update.before, update.after);
+
+ inUpdate = false;
+}
+
+void PlaylistWidget::setFilter(const char * text)
+{
+ // Save the current focus before filtering
+ int focus = m_playlist.get_focus();
+
+ // Empty the model before updating the filter. This prevents Qt from
+ // performing a series of "rows added" or "rows deleted" updates, which can
+ // be very slow (worst case O(N^2) complexity) on a large playlist.
+ model->entriesRemoved(0, model->rowCount());
+
+ // Update the filter
+ proxyModel->setFilter(text);
+
+ // Repopulate the model
+ model->entriesAdded(0, m_playlist.n_entries());
+
+ // If the previously focused row is no longer visible with the new filter,
+ // try to find a nearby one that is, and focus it.
+ auto index = visibleIndexNear(focus);
+
+ if (index.isValid())
+ {
+ focus = indexToRow(index);
+ m_playlist.set_focus(focus);
+ m_playlist.select_all(false);
+ m_playlist.select_entry(focus, true);
+ scrollTo(index);
+ }
+}
+
+void PlaylistWidget::setFirstVisibleColumn(int col)
+{
+ inUpdate = true;
+ firstVisibleColumn = col;
+
+ // make sure current and selected indexes point to a visible column
+ updateSelection(0, 0);
+
+ inUpdate = false;
+}
+
+void PlaylistWidget::moveFocus(int distance)
+{
+ int visibleRows = proxyModel->rowCount();
+ if (!visibleRows)
+ return;
+
+ int row = currentIndex().row();
+ row = aud::clamp(row + distance, 0, visibleRows - 1);
+ setCurrentIndex(proxyModel->index(row, 0));
+}
+
+void PlaylistWidget::showPopup()
+{
+ audqt::infopopup_show(m_playlist, m_popup_pos);
+}
+
+void PlaylistWidget::triggerPopup(int pos)
+{
+ audqt::infopopup_hide();
+
+ m_popup_pos = pos;
+ m_popup_timer.queue(aud_get_int("filepopup_delay") * 100,
+ this() { showPopup(); });
+}
+
+void PlaylistWidget::hidePopup()
+{
+ audqt::infopopup_hide();
+
+ m_popup_pos = -1;
+ m_popup_timer.stop();
+}
+
+void PlaylistWidget::updateSettings()
+{
+ setHeaderHidden(true);
+}
+
+}

audacious-plugins-4.4.1.tar.bz2/src/moonstone/playlist.h Added

@@ -0,0 +1,100 @@
+/*
+ * playlist.h
+ * Copyright 2014 Michał Lipski
+ * Copyright 2020 Ariadne Conill
+ *
+ * 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.
+ */
+
+#ifndef PLAYLIST_H
+#define PLAYLIST_H
+
+#include <libaudcore/hook.h>
+#include <libaudcore/mainloop.h>
+#include <libaudcore/playlist.h>
+#include <libaudqt/treeview.h>
+
+class QContextMenuEvent;
+class QMenu;
+
+namespace Moonstone {
+
+class PlaylistModel;
+class PlaylistProxyModel;
+
+class PlaylistWidget : public audqt::TreeView
+{
+public:
+ PlaylistWidget(QWidget * parent, Playlist playlist);
+ ~PlaylistWidget();
+
+ Playlist playlist() const { return m_playlist; }
+
+ bool scrollToCurrent(bool force = false);
+ void updatePlaybackIndicator();
+ void playlistUpdate();
+ void setFilter(const char * text);
+ void setFirstVisibleColumn(int col);
+ void moveFocus(int distance);
+
+ void setContextMenu(QMenu * menu) { contextMenu = menu; }
+
+private:
+ Playlist m_playlist;
+ PlaylistModel * model;
+ PlaylistProxyModel * proxyModel;
+ QMenu * contextMenu = nullptr;
+
+ int currentPos = -1;
+ bool inUpdate = false;
+ int firstVisibleColumn = 0;
+
+ int m_popup_pos = -1;
+ QueuedFunc m_popup_timer;
+
+ QModelIndex rowToIndex(int row);
+ int indexToRow(const QModelIndex & index);
+ QModelIndex visibleIndexNear(int row);
+
+ void getSelectedRanges(int rowsBefore, int rowsAfter,
+ QItemSelection & selected,
+ QItemSelection & deselected);
+ void updateSelection(int rowsBefore, int rowsAfter);
+
+ void activate(const QModelIndex & index);
+ void contextMenuEvent(QContextMenuEvent * event);
+ void keyPressEvent(QKeyEvent * event);
+ void mouseMoveEvent(QMouseEvent * event);
+ void leaveEvent(QEvent * event);
+ void dragMoveEvent(QDragMoveEvent * event);
+ void dropEvent(QDropEvent * event);
+ void currentChanged(const QModelIndex & current,
+ const QModelIndex & previous);
+ void selectionChanged(const QItemSelection & selected,
+ const QItemSelection & deselected);
+
+ void showPopup();
+ void triggerPopup(int pos);
+ void hidePopup();
+
+ void updateSettings();
+
+ const HookReceiver<PlaylistWidget> hook1{
+ "moonstone update playlist settings", this, &PlaylistWidget::updateSettings};
+};
+
+}
+
+#endif

audacious-plugins-4.4.1.tar.bz2/src/moonstone/playlist_header.cc Added

@@ -0,0 +1,323 @@
+/*
+ * playlist_header.cc
+ * Copyright 2017 John Lindgren and Eugene Paskevich
+ *
+ * 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 "playlist_header.h"
+#include "playlist.h"
+#include "playlist_model.h"
+
+#include <string.h>
+
+#include <QAction>
+#include <QContextMenuEvent>
+#include <QMenu>
+
+#include <libaudcore/audstrings.h>
+#include <libaudcore/hook.h>
+#include <libaudcore/i18n.h>
+#include <libaudcore/runtime.h>
+#include <libaudqt/libaudqt.h>
+
+namespace Moonstone {
+
+static const char * const s_col_keys = {
+ "playing", "number", "title", "artist", "year", "album",
+ "album-artist", "track", "genre", "queued", "length", "path",
+ "filename", "custom", "bitrate", "comment", "disc"};
+
+static const int s_default_widths = {
+ 25, // now playing
+ 25, // entry number
+ 275, // title
+ 175, // artist
+ 50, // year
+ 175, // album
+ 175, // album artist
+ 75, // track
+ 100, // genre
+ 25, // queue position
+ 75, // length
+ 275, // path
+ 275, // filename
+ 275, // custom title
+ 75, // bitrate
+ 275, // comment
+ 75 // disc
+};
+
+static const Playlist::SortType s_sort_types = {
+ Playlist::n_sort_types, // now playing
+ Playlist::n_sort_types, // entry number
+ Playlist::Title, // title
+ Playlist::Artist, // artist
+ Playlist::Date, // year
+ Playlist::Album, // album
+ Playlist::AlbumArtist, // album artist
+ Playlist::Track, // track
+ Playlist::Genre, // genre
+ Playlist::n_sort_types, // queue position
+ Playlist::Length, // length
+ Playlist::Path, // path
+ Playlist::Filename, // file name
+ Playlist::FormattedTitle, // custom title
+ Playlist::n_sort_types, // bitrate
+ Playlist::Comment, // comment
+ Playlist::Disc // disc
+};
+
+static_assert(aud::n_elems(s_col_keys) == PlaylistModel::n_cols,
+ "update s_col_keys");
+static_assert(aud::n_elems(s_default_widths) == PlaylistModel::n_cols,
+ "update s_default_widths");
+static_assert(aud::n_elems(s_sort_types) == PlaylistModel::n_cols,
+ "update s_sort_types");
+
+static Index<int> s_cols;
+static int s_col_widthsPlaylistModel::n_cols;
+
+static void loadConfig(bool force = false)
+{
+ static bool loaded = false;
+
+ if (loaded && !force)
+ return;
+
+ auto columns =
+ str_list_to_index("playing number artist album title length", " ");
+ int n_columns = aud::min(columns.len(), (int)PlaylistModel::n_cols);
+
+ s_cols.clear();
+
+ for (int c = 0; c < n_columns; c++)
+ {
+ int i = 0;
+ while (i < PlaylistModel::n_cols && strcmp(columnsc, s_col_keysi))
+ i++;
+
+ if (i < PlaylistModel::n_cols)
+ s_cols.append(i);
+ }
+
+ for (int i = 0; i < PlaylistModel::n_cols; i++)
+ s_col_widthsi = audqt::to_native_dpi(s_default_widthsi);
+
+ loaded = true;
+}
+
+static void saveConfig()
+{
+ Index<String> index;
+ for (int col : s_cols)
+ index.append(String(s_col_keyscol));
+
+ int widthsPlaylistModel::n_cols;
+ for (int i = 0; i < PlaylistModel::n_cols; i++)
+ widthsi = audqt::to_portable_dpi(s_col_widthsi);
+
+ aud_set_str("qtui", "playlist_columns", index_to_str_list(index, " "));
+ aud_set_str("qtui", "column_widths",
+ int_array_to_str(widths, PlaylistModel::n_cols));
+}
+
+PlaylistHeader::PlaylistHeader(PlaylistWidget * playlist)
+ : QHeaderView(Qt::Horizontal, playlist), m_playlist(playlist)
+{
+ loadConfig();
+
+ setSectionsMovable(true);
+ setStretchLastSection(true);
+
+ connect(this, &QHeaderView::sectionClicked, this,
+ &PlaylistHeader::sectionClicked);
+ connect(this, &QHeaderView::sectionResized, this,
+ &PlaylistHeader::sectionResized);
+ connect(this, &QHeaderView::sectionMoved, this,
+ &PlaylistHeader::sectionMoved);
+}
+
+static void toggleColumn(int col, bool on)
+{
+ int pos = s_cols.find(col);
+
+ if (on)
+ {
+ if (pos >= 0)
+ return;
+
+ s_cols.append(col);
+ }
+ else
+ {
+ if (pos < 0)
+ return;
+
+ s_cols.remove(pos, 1);
+ }
+
+ saveConfig();
+
+ // update all playlists
+ hook_call("qtui update playlist columns", nullptr);
+}
+
+static void resetToDefaults()
+{
+ aud_set_str("qtui", "playlist_columns", "artist title");
+ aud_set_str("qtui", "column_widths", "");
+
+ loadConfig(true);
+
+ // update all playlists
+ hook_call("qtui update playlist columns", nullptr);
+}
+
+void PlaylistHeader::contextMenuEvent(QContextMenuEvent * event)
+{
+ auto menu = new QMenu(this);
+ QAction * actionsPlaylistModel::n_cols;
+
+ for (int col = 0; col < PlaylistModel::n_cols; col++)
+ {
+ actionscol = new QAction(_(PlaylistModel::labelscol), menu);
+ actionscol->setCheckable(true);
+
+ connect(actionscol, &QAction::toggled,
+ col(bool on) { toggleColumn(col, on); });
+
+ menu->addAction(actionscol);
+ }
+
+ for (int col : s_cols)
+ actionscol->setChecked(true);
+
+ auto sep = new QAction(menu);
+ sep->setSeparator(true);
+ menu->addAction(sep);
+
+ auto reset = new QAction(_("Reset to Defaults"), menu);
+ connect(reset, &QAction::triggered, resetToDefaults);
+ menu->addAction(reset);
+
+ menu->popup(event->globalPos());
+}
+
+void PlaylistHeader::updateColumns()
+{
+ m_inUpdate = true;
+
+ int n_shown = s_cols.len();
+
+ // Due to QTBUG-33974, column #0 cannot be moved by the user.
+ // As a workaround, hide column #0 and start the real columns at #1.
+ // However, Qt will hide the header completely if no columns are visible.
+ // This is bad since the user can't right-click to add any columns again.
+ // To prevent this, show column #0 if no real columns are visible.
+ m_playlist->setColumnHidden(0, (n_shown > 0));
+
+ bool shownPlaylistModel::n_cols{};
+
+ for (int i = 0; i < n_shown; i++)
+ {
+ int col = s_colsi;
+ moveSection(visualIndex(1 + col), 1 + i);
+ showncol = true;
+ }
+
+ // last column expands to fit, so size is not restored
+ int last = (n_shown > 0) ? s_colsn_shown - 1 : -1;
+
+ for (int col = 0; col < PlaylistModel::n_cols; col++)
+ {
+ if (col != last)
+ m_playlist->setColumnWidth(1 + col, s_col_widthscol);
+
+ m_playlist->setColumnHidden(1 + col, !showncol);
+ }
+
+ // width of last column should be set to 0 initially,
+ // but doing so repeatedly causes flicker
+ if (last >= 0 && last != m_lastCol)
+ m_playlist->setColumnWidth(1 + last, 0);
+
+ // this should come after all setColumnHidden() calls
+ m_playlist->setFirstVisibleColumn((n_shown > 0) ? 1 + s_cols0 : 0);
+
+ m_inUpdate = false;
+ m_lastCol = last;
+}
+
+void PlaylistHeader::sectionClicked(int logicalIndex)
+{
+ int col = logicalIndex - 1;
+ if (col < 0 || col >= PlaylistModel::n_cols)
+ return;
+
+ if (s_sort_typescol != Playlist::n_sort_types)
+ m_playlist->playlist().sort_entries(s_sort_typescol);
+}
+
+void PlaylistHeader::sectionMoved(int logicalIndex, int oldVisualIndex,
+ int newVisualIndex)
+{
+ if (m_inUpdate)
+ return;
+
+ int old_pos = oldVisualIndex - 1;
+ int new_pos = newVisualIndex - 1;
+
+ if (old_pos < 0 || old_pos > s_cols.len() || new_pos < 0 ||
+ new_pos > s_cols.len())
+ return;
+
+ int col = logicalIndex - 1;
+ if (col != s_colsold_pos)
+ return;
+
+ s_cols.remove(old_pos, 1);
+ s_cols.insert(&col, new_pos, 1);
+
+ saveConfig();
+
+ // update all the other playlists
+ hook_call("qtui update playlist columns", nullptr);
+}
+
+void PlaylistHeader::sectionResized(int logicalIndex, int /*oldSize*/,
+ int newSize)
+{
+ if (m_inUpdate)
+ return;
+
+ int col = logicalIndex - 1;
+ if (col < 0 || col >= PlaylistModel::n_cols)
+ return;
+
+ // last column expands to fit, so size is not saved
+ int pos = s_cols.find(col);
+ if (pos < 0 || pos == s_cols.len() - 1)
+ return;
+
+ s_col_widthscol = newSize;
+
+ saveConfig();
+
+ // update all the other playlists
+ hook_call("qtui update playlist columns", nullptr);
+}
+
+}

audacious-plugins-4.4.1.tar.bz2/src/moonstone/playlist_header.h Added

@@ -0,0 +1,60 @@
+/*
+ * playlist_header.h
+ * Copyright 2017 John Lindgren and Eugene Paskevich
+ * Copyright 2020 Ariadne Conill
+ *
+ * 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.
+ */
+
+#ifndef PLAYLIST_HEADER_H
+#define PLAYLIST_HEADER_H
+
+#include <QHeaderView>
+#include <libaudcore/hook.h>
+
+class QAction;
+class QContextMenuEvent;
+class QMenu;
+
+namespace Moonstone {
+
+class PlaylistWidget;
+
+class PlaylistHeader : public QHeaderView
+{
+public:
+ PlaylistHeader(PlaylistWidget * parent);
+
+ /* this should be called by the playlist after adding the header */
+ void updateColumns();
+
+private:
+ PlaylistWidget * m_playlist;
+ bool m_inUpdate = false;
+ int m_lastCol = -1;
+
+ void sectionClicked(int logicalIndex);
+ void sectionMoved(int logicalIndex, int oldVisualIndex, int newVisualIndex);
+ void sectionResized(int logicalIndex, int /*oldSize*/, int newSize);
+
+ void contextMenuEvent(QContextMenuEvent * event);
+
+ const HookReceiver<PlaylistHeader> hook1{
+ "qtui update playlist columns", this, &PlaylistHeader::updateColumns};
+};
+
+}
+
+#endif // PLAYLIST_HEADER_H

audacious-plugins-4.4.1.tar.bz2/src/moonstone/playlist_model.cc Added

@@ -0,0 +1,329 @@
+/*
+ * playlist_model.cc
+ * Copyright 2014 Michał Lipski
+ *
+ * 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 <QApplication>
+#include <QIcon>
+#include <QMimeData>
+#include <QUrl>
+
+#include <libaudcore/audstrings.h>
+#include <libaudcore/drct.h>
+#include <libaudcore/i18n.h>
+#include <libaudcore/runtime.h>
+#include <libaudqt/libaudqt.h>
+
+#include "playlist_model.h"
+
+#define ICON_SIZE 16
+
+namespace Moonstone {
+
+const char * const PlaylistModel::labels = {
+ N_("Now Playing"), N_("Entry Number"), N_("Title"),
+ N_("Artist"), N_("Year"), N_("Album"),
+ N_("Album Artist"), N_("Track"), N_("Genre"),
+ N_("Queue Position"), N_("Length"), N_("File Path"),
+ N_("File Name"), N_("Custom Title"), N_("Bitrate"),
+ N_("Comment"), N_("Disc")};
+
+static const Tuple::Field s_fields = {
+ Tuple::Invalid, Tuple::Invalid, Tuple::Title, Tuple::Artist,
+ Tuple::Year, Tuple::Album, Tuple::AlbumArtist, Tuple::Track,
+ Tuple::Genre, Tuple::Invalid, Tuple::Length, Tuple::Path,
+ Tuple::Basename, Tuple::FormattedTitle, Tuple::Bitrate, Tuple::Comment,
+ Tuple::Disc};
+
+static_assert(aud::n_elems(PlaylistModel::labels) == PlaylistModel::n_cols,
+ "update PlaylistModel::labels");
+static_assert(aud::n_elems(s_fields) == PlaylistModel::n_cols,
+ "update s_fields");
+
+static inline QPixmap get_icon(const char * name)
+{
+ return QIcon::fromTheme(name).pixmap(audqt::to_native_dpi(ICON_SIZE));
+}
+
+PlaylistModel::PlaylistModel(QObject * parent, Playlist playlist)
+ : QAbstractListModel(parent), m_playlist(playlist),
+ m_rows(playlist.n_entries())
+{
+}
+
+int PlaylistModel::rowCount(const QModelIndex & parent) const { return m_rows; }
+
+int PlaylistModel::columnCount(const QModelIndex & parent) const
+{
+ return 1 + n_cols;
+}
+
+QVariant PlaylistModel::alignment(int col) const
+{
+ switch (col)
+ {
+ case NowPlaying:
+ return Qt::AlignCenter;
+ case Length:
+ return static_cast<Qt::Alignment::Int>(Qt::AlignRight |
+ Qt::AlignVCenter);
+ default:
+ return static_cast<Qt::Alignment::Int>(Qt::AlignLeft |
+ Qt::AlignVCenter);
+ }
+}
+
+QVariant PlaylistModel::data(const QModelIndex & index, int role) const
+{
+ int col = index.column() - 1;
+ if (col < 0 || col >= n_cols)
+ return QVariant();
+
+ Tuple tuple;
+ int val = -1;
+
+ switch (role)
+ {
+ case Qt::DisplayRole:
+ if (s_fieldscol != Tuple::Invalid)
+ {
+ tuple = m_playlist.entry_tuple(index.row(), Playlist::NoWait);
+
+ switch (tuple.get_value_type(s_fieldscol))
+ {
+ case Tuple::Empty:
+ return QVariant();
+ case Tuple::String:
+ return QString(tuple.get_str(s_fieldscol));
+ case Tuple::Int:
+ val = tuple.get_int(s_fieldscol);
+ break;
+ }
+ }
+
+ switch (col)
+ {
+ case NowPlaying:
+ return QVariant();
+ case EntryNumber:
+ return QString("%1").arg(index.row() + 1);
+ case QueuePos:
+ return queuePos(index.row());
+ case Length:
+ return QString(str_format_time(val));
+ case Bitrate:
+ return QString("%1 kbit/s").arg(val);
+ default:
+ return QString("%1").arg(val);
+ }
+
+ case Qt::TextAlignmentRole:
+ return alignment(col);
+
+ case Qt::DecorationRole:
+ if (col == NowPlaying && index.row() == m_playlist.get_position())
+ {
+ const char * icon_name = "media-playback-stop";
+
+ if (m_playlist == Playlist::playing_playlist())
+ icon_name = aud_drct_get_paused() ? "media-playback-pause"
+ : "media-playback-start";
+
+ return get_icon(icon_name);
+ }
+ else if (col == NowPlaying && index.row() == 0)
+ {
+ /* put a blank pixmap in the top row for size calculations */
+ QPixmap blank(ICON_SIZE, ICON_SIZE);
+ blank.fill(Qt::transparent);
+ return blank;
+ }
+ break;
+ }
+ return QVariant();
+}
+
+QVariant PlaylistModel::headerData(int section, Qt::Orientation orientation,
+ int role) const
+{
+ if (orientation != Qt::Horizontal)
+ return QVariant();
+
+ int col = section - 1;
+ if (col < 0 || col >= n_cols)
+ return QVariant();
+
+ switch (role)
+ {
+ case Qt::DisplayRole:
+ switch (col)
+ {
+ case NowPlaying:
+ case EntryNumber:
+ case QueuePos:
+ return QVariant();
+ }
+
+ return QString(_(labelscol));
+
+ case Qt::TextAlignmentRole:
+ return alignment(col);
+
+ default:
+ return QVariant();
+ }
+}
+
+Qt::DropActions PlaylistModel::supportedDropActions() const
+{
+ return Qt::CopyAction | Qt::MoveAction;
+}
+
+Qt::ItemFlags PlaylistModel::flags(const QModelIndex & index) const
+{
+ if (index.isValid())
+ return Qt::ItemIsSelectable | Qt::ItemIsDragEnabled | Qt::ItemIsEnabled;
+ else
+ return Qt::ItemIsSelectable | Qt::ItemIsDropEnabled | Qt::ItemIsEnabled;
+}
+
+QStringList PlaylistModel::mimeTypes() const
+{
+ return QStringList("text/uri-list");
+}
+
+QMimeData * PlaylistModel::mimeData(const QModelIndexList & indexes) const
+{
+ /* we assume that <indexes> contains the selected entries */
+ m_playlist.cache_selected();
+
+ QList<QUrl> urls;
+ int prev = -1;
+
+ for (auto & index : indexes)
+ {
+ int row = index.row();
+ if (row != prev) /* skip multiple cells in same row */
+ {
+ urls.append(QString(m_playlist.entry_filename(row)));
+ prev = row;
+ }
+ }
+
+ auto data = new QMimeData;
+ data->setUrls(urls);
+ return data;
+}
+
+bool PlaylistModel::dropMimeData(const QMimeData * data, Qt::DropAction action,
+ int row, int column,
+ const QModelIndex & parent)
+{
+ if (action != Qt::CopyAction || !data->hasUrls())
+ return false;
+
+ Index<PlaylistAddItem> items;
+ for (auto & url : data->urls())
+ items.append(String(url.toEncoded()));
+
+ m_playlist.insert_items(row, std::move(items), false);
+ return true;
+}
+
+void PlaylistModel::entriesAdded(int row, int count)
+{
+ if (count < 1)
+ return;
+
+ int last = row + count - 1;
+ beginInsertRows(QModelIndex(), row, last);
+ m_rows += count;
+ endInsertRows();
+}
+
+void PlaylistModel::entriesRemoved(int row, int count)
+{
+ if (count < 1)
+ return;
+
+ int last = row + count - 1;
+ beginRemoveRows(QModelIndex(), row, last);
+ m_rows -= count;
+ endRemoveRows();
+}
+
+void PlaylistModel::entriesChanged(int row, int count)
+{
+ if (count < 1)
+ return;
+
+ int bottom = row + count - 1;
+ auto topLeft = createIndex(row, 0);
+ auto bottomRight = createIndex(bottom, columnCount() - 1);
+ emit dataChanged(topLeft, bottomRight);
+}
+
+QString PlaylistModel::queuePos(int row) const
+{
+ int at = m_playlist.queue_find_entry(row);
+ if (at < 0)
+ return QString();
+ else
+ return QString("#%1").arg(at + 1);
+}
+
+/* ---------------------------------- */
+
+void PlaylistProxyModel::setFilter(const char * filter)
+{
+ m_searchTerms = str_list_to_index(filter, " ");
+ invalidateFilter();
+}
+
+bool PlaylistProxyModel::filterAcceptsRow(int source_row,
+ const QModelIndex &) const
+{
+ if (!m_searchTerms.len())
+ return true;
+
+ Tuple tuple = m_playlist.entry_tuple(source_row);
+
+ String strings = {tuple.get_str(Tuple::Title),
+ tuple.get_str(Tuple::Artist),
+ tuple.get_str(Tuple::Album)};
+
+ for (auto & term : m_searchTerms)
+ {
+ bool found = false;
+
+ for (auto & s : strings)
+ {
+ if (s && strstr_nocase_utf8(s, term))
+ {
+ found = true;
+ break;
+ }
+ }
+
+ if (!found)
+ return false;
+ }
+
+ return true;
+}
+
+}

audacious-plugins-4.4.1.tar.bz2/src/moonstone/playlist_model.h Added

@@ -0,0 +1,105 @@
+/*
+ * playlist_model.h
+ * Copyright 2014 Michał Lipski
+ * Copyright 2020 Ariadne Conill
+ *
+ * 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.
+ */
+
+#ifndef PLAYLIST_MODEL_H
+#define PLAYLIST_MODEL_H
+
+#include <QAbstractListModel>
+#include <QSortFilterProxyModel>
+
+#include <libaudcore/playlist.h>
+
+namespace Moonstone {
+
+class PlaylistModel : public QAbstractListModel
+{
+public:
+ enum
+ {
+ NowPlaying,
+ EntryNumber,
+ Title,
+ Artist,
+ Year,
+ Album,
+ AlbumArtist,
+ Track,
+ Genre,
+ QueuePos,
+ Length,
+ Path,
+ Filename,
+ CustomTitle,
+ Bitrate,
+ Comment,
+ Disc,
+ n_cols
+ };
+
+ static const char * const labels;
+
+ PlaylistModel(QObject * parent, Playlist playlist);
+
+ int rowCount(const QModelIndex & parent = QModelIndex()) const;
+ int columnCount(const QModelIndex & parent = QModelIndex()) const;
+ QVariant data(const QModelIndex & index, int role = Qt::DisplayRole) const;
+ QVariant headerData(int section, Qt::Orientation orientation,
+ int role = Qt::DisplayRole) const;
+
+ Qt::DropActions supportedDropActions() const;
+ Qt::ItemFlags flags(const QModelIndex & index) const;
+
+ QStringList mimeTypes() const;
+ QMimeData * mimeData(const QModelIndexList & indexes) const;
+ bool dropMimeData(const QMimeData * data, Qt::DropAction action, int row,
+ int column, const QModelIndex & parent);
+
+ void entriesAdded(int row, int count);
+ void entriesRemoved(int row, int count);
+ void entriesChanged(int row, int count);
+
+private:
+ Playlist m_playlist;
+ int m_rows;
+
+ QVariant alignment(int col) const;
+ QString queuePos(int row) const;
+};
+
+class PlaylistProxyModel : public QSortFilterProxyModel
+{
+public:
+ PlaylistProxyModel(QObject * parent, Playlist playlist)
+ : QSortFilterProxyModel(parent), m_playlist(playlist)
+ {
+ }
+
+ void setFilter(const char * filter);
+
+private:
+ bool filterAcceptsRow(int source_row, const QModelIndex &) const;
+
+ Playlist m_playlist;
+ Index<String> m_searchTerms;
+};
+
+}
+
+#endif

audacious-plugins-4.4.1.tar.bz2/src/moonstone/playlist_selection.cc Added

@@ -0,0 +1,196 @@
+/*
+ * playlist_selection.cc
+ * Copyright 2020 Ariadne Conill
+ *
+ * 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 "playlist_selection.h"
+
+#include "../ui-common/qt-compat.h"
+
+namespace Moonstone {
+
+QVariant PlaylistsModel::data (const QModelIndex & index, int role) const
+{
+ switch (role)
+ {
+ case Qt::DisplayRole:
+ {
+ auto list = Playlist::by_index (index.row ());
+ switch (index.column ())
+ {
+ case ColumnTitle:
+ return QString (list.get_title ());
+ case ColumnEntries:
+ return list.n_entries ();
+ }
+ }
+ break;
+
+ case Qt::FontRole:
+ if (index.row () == m_playing)
+ return m_bold;
+ break;
+
+ case Qt::TextAlignmentRole:
+ if (index.column () == ColumnEntries)
+ return Qt::AlignRight;
+ break;
+ }
+
+ return QVariant ();
+}
+
+QVariant PlaylistsModel::headerData (int section, Qt::Orientation orientation, int role) const
+{
+ if (orientation == Qt::Horizontal && role == Qt::DisplayRole)
+ {
+ switch (section)
+ {
+ case ColumnTitle:
+ return QString (_("Title"));
+ case ColumnEntries:
+ return QString (_("Entries"));
+ }
+ }
+
+ return QVariant ();
+}
+
+void PlaylistsModel::update_rows (int row, int count)
+{
+ if (count < 1)
+ return;
+
+ auto topLeft = createIndex (row, 0);
+ auto bottomRight = createIndex (row + count - 1, NColumns - 1);
+ emit dataChanged (topLeft, bottomRight);
+}
+
+void PlaylistsModel::update_playing ()
+{
+ int playing = Playlist::playing_playlist ().index ();
+
+ if (playing != m_playing)
+ {
+ if (m_playing >= 0)
+ update_rows (m_playing, 1);
+ if (playing >= 0)
+ update_rows (playing, 1);
+
+ m_playing = playing;
+ }
+}
+
+void PlaylistsModel::update (const Playlist::UpdateLevel level)
+{
+ int rows = Playlist::n_playlists ();
+
+ if (level == Playlist::Structure)
+ {
+ if (rows < m_rows)
+ {
+ beginRemoveRows (QModelIndex (), rows, m_rows - 1);
+ m_rows = rows;
+ endRemoveRows ();
+ }
+ else if (rows > m_rows)
+ {
+ beginInsertRows (QModelIndex (), m_rows, rows - 1);
+ m_rows = rows;
+ endInsertRows ();
+ }
+ }
+
+ if (level >= Playlist::Metadata)
+ {
+ update_rows (0, m_rows);
+ m_playing = Playlist::playing_playlist ().index ();
+ }
+ else
+ update_playing ();
+}
+
+PlaylistsView::PlaylistsView ()
+{
+ m_model.setFont (font ());
+
+ m_in_update ++;
+ setModel (& m_model);
+ update_sel ();
+ m_in_update --;
+
+ auto hdr = header ();
+ hdr->setStretchLastSection (false);
+ hdr->setSectionResizeMode (PlaylistsModel::ColumnTitle, QHeaderView::Stretch);
+ hdr->setSectionResizeMode (PlaylistsModel::ColumnEntries, QHeaderView::Interactive);
+ hdr->resizeSection (PlaylistsModel::ColumnEntries, audqt::to_native_dpi (64));
+
+ setDragDropMode (InternalMove);
+ setFrameShape (QFrame::NoFrame);
+ setIndentation (0);
+ setHeaderHidden (true);
+
+ connect (this, &QTreeView::activated, this, &PlaylistsView::activate);
+}
+
+void PlaylistsView::currentChanged (const QModelIndex & current, const QModelIndex & previous)
+{
+ audqt::TreeView::currentChanged (current, previous);
+ if (! m_in_update)
+ Playlist::by_index (current.row ()).activate ();
+}
+
+void PlaylistsView::dropEvent (QDropEvent * event)
+{
+ if (event->source () != this || event->proposedAction () != Qt::MoveAction)
+ return;
+
+ int from = currentIndex ().row ();
+ if (from < 0)
+ return;
+
+ int to;
+ switch (dropIndicatorPosition ())
+ {
+ case AboveItem: to = indexAt (QtCompat::pos(event)).row (); break;
+ case BelowItem: to = indexAt (QtCompat::pos(event)).row () + 1; break;
+ case OnViewport: to = Playlist::n_playlists (); break;
+ default: return;
+ }
+
+ Playlist::reorder_playlists (from, (to > from) ? to - 1 : to, 1);
+ event->acceptProposedAction ();
+}
+
+void PlaylistsView::update (Playlist::UpdateLevel level)
+{
+ m_in_update ++;
+ m_model.update (level);
+ update_sel ();
+ m_in_update --;
+}
+
+void PlaylistsView::update_sel ()
+{
+ m_in_update ++;
+ auto sel = selectionModel ();
+ auto current = m_model.index (Playlist::active_playlist ().index (), 0);
+ sel->setCurrentIndex (current, sel->ClearAndSelect | sel->Rows);
+ m_in_update --;
+}
+
+}

audacious-plugins-4.4.1.tar.bz2/src/moonstone/playlist_selection.h Added

@@ -0,0 +1,135 @@
+/*
+ * playlist_selection.h
+ * Copyright 2015 John Lindgren
+ * Copyright 2020 Ariadne Conill
+ *
+ * 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.
+ */
+
+#ifndef PLAYLIST_SELECTION_H
+
+#include <QAbstractListModel>
+#include <QBoxLayout>
+#include <QFont>
+#include <QGuiApplication>
+#include <QHeaderView>
+#include <QIcon>
+#include <QMouseEvent>
+#include <QToolButton>
+
+#include <libaudcore/hook.h>
+#include <libaudcore/i18n.h>
+#include <libaudcore/playlist.h>
+#include <libaudcore/plugin.h>
+
+#include <libaudqt/libaudqt.h>
+#include <libaudqt/treeview.h>
+
+namespace Moonstone {
+
+class PlaylistsModel : public QAbstractListModel
+{
+public:
+ enum {
+ ColumnTitle,
+ ColumnEntries,
+ NColumns
+ };
+
+ PlaylistsModel () :
+ m_rows (Playlist::n_playlists ()),
+ m_playing (Playlist::playing_playlist ().index ())
+ {
+ }
+
+ void setFont (const QFont & font)
+ {
+ m_bold = font;
+ m_bold.setBold (true);
+
+ if (m_playing >= 0)
+ update_rows (m_playing, 1);
+ }
+
+ void update (Playlist::UpdateLevel level);
+
+protected:
+ int rowCount (const QModelIndex & parent) const { return m_rows; }
+ int columnCount (const QModelIndex & parent) const { return NColumns; }
+
+ Qt::DropActions supportedDropActions () const { return Qt::MoveAction; }
+
+ Qt::ItemFlags flags (const QModelIndex & index) const
+ {
+ if (index.isValid ())
+ return Qt::ItemIsSelectable | Qt::ItemIsDragEnabled | Qt::ItemIsEnabled;
+ else
+ return Qt::ItemIsSelectable | Qt::ItemIsDropEnabled | Qt::ItemIsEnabled;
+ }
+
+ QVariant data (const QModelIndex & index, int role) const;
+ QVariant headerData (int section, Qt::Orientation orientation, int role) const;
+
+private:
+ void update_rows (int row, int count);
+ void update_playing ();
+
+ const HookReceiver<PlaylistsModel>
+ activate_hook {"playlist set playing", this, & PlaylistsModel::update_playing};
+
+ int m_rows, m_playing;
+ QFont m_bold;
+};
+
+class PlaylistsView : public audqt::TreeView
+{
+public:
+ PlaylistsView ();
+
+protected:
+ void changeEvent (QEvent * event) override
+ {
+ if (event->type () == QEvent::FontChange)
+ m_model.setFont (font ());
+
+ audqt::TreeView::changeEvent (event);
+ }
+
+ void currentChanged (const QModelIndex & current, const QModelIndex & previous) override;
+ void dropEvent (QDropEvent * event) override;
+
+private:
+ PlaylistsModel m_model;
+
+ void update (Playlist::UpdateLevel level);
+ void update_sel ();
+
+ void activate (const QModelIndex & index)
+ {
+ if (index.isValid ())
+ Playlist::by_index (index.row ()).start_playback ();
+ }
+
+ const HookReceiver<PlaylistsView, Playlist::UpdateLevel>
+ update_hook {"playlist update", this, & PlaylistsView::update};
+ const HookReceiver<PlaylistsView>
+ activate_hook {"playlist activate", this, & PlaylistsView::update_sel};
+
+ int m_in_update = 0;
+};
+
+}
+
+#endif

audacious-plugins-4.4.1.tar.bz2/src/moonstone/playlist_tabs.cc Added

@@ -0,0 +1,375 @@
+/*
+ * playlist_tabs.cc
+ * Copyright 2014 Michał Lipski
+ *
+ * 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 "playlist_tabs.h"
+#include "playlist.h"
+
+#include <QBoxLayout>
+#include <QKeyEvent>
+#include <QLineEdit>
+#include <QMenu>
+
+#include <libaudcore/drct.h>
+#include <libaudcore/i18n.h>
+#include <libaudcore/playlist.h>
+#include <libaudcore/runtime.h>
+
+#include <libaudqt/libaudqt.h>
+
+namespace Moonstone {
+
+class LayoutWidget : public QWidget
+{
+public:
+ LayoutWidget(QWidget * parent, Playlist playlist, QMenu * contextMenu);
+
+ PlaylistWidget * playlistWidget() const { return m_playlistWidget; }
+
+private:
+ PlaylistWidget * m_playlistWidget;
+};
+
+LayoutWidget::LayoutWidget(QWidget * parent, Playlist playlist,
+ QMenu * contextMenu)
+ : QWidget(parent), m_playlistWidget(new PlaylistWidget(this, playlist))
+{
+ auto layout = audqt::make_vbox(this, 0);
+ layout->addWidget(m_playlistWidget);
+
+ m_playlistWidget->setContextMenu(contextMenu);
+}
+
+/* --------------------------------- */
+
+PlaylistTabs::PlaylistTabs(QWidget * parent)
+ : QTabWidget(parent),
+ m_pl_menu(new QMenu(this)),
+ m_tabbar(new PlaylistTabBar(this))
+{
+ installEventFilter(this);
+
+ // set up tab bar
+ m_tabbar->setFocusPolicy(Qt::NoFocus);
+ setTabBar(m_tabbar);
+
+ addRemovePlaylists();
+ m_tabbar->updateTitles();
+ m_tabbar->updateIcons();
+ setCurrentIndex(Playlist::active_playlist().index());
+
+ connect(this, &QTabWidget::currentChanged, this,
+ &PlaylistTabs::currentChangedTrigger);
+}
+
+PlaylistWidget * PlaylistTabs::currentPlaylistWidget() const
+{
+ return ((LayoutWidget *)currentWidget())->playlistWidget();
+}
+
+PlaylistWidget * PlaylistTabs::playlistWidget(int idx) const
+{
+ auto w = (LayoutWidget *)widget(idx);
+ return w ? w->playlistWidget() : nullptr;
+}
+
+void PlaylistTabs::addRemovePlaylists()
+{
+ int tabs = count();
+ int playlists = Playlist::n_playlists();
+
+ for (int i = 0; i < tabs; i++)
+ {
+ auto w = (LayoutWidget *)widget(i);
+ int list_idx = w->playlistWidget()->playlist().index();
+
+ if (list_idx < 0)
+ {
+ removeTab(i);
+ delete w;
+ tabs--;
+ i--;
+ }
+ else if (list_idx != i)
+ {
+ bool found = false;
+
+ for (int j = i + 1; j < tabs; j++)
+ {
+ w = (LayoutWidget *)widget(j);
+ list_idx = w->playlistWidget()->playlist().index();
+
+ if (list_idx == i)
+ {
+ removeTab(j);
+ insertTab(i, w, QString());
+ found = true;
+ break;
+ }
+ }
+
+ if (!found)
+ {
+ insertTab(
+ i, new LayoutWidget(this, Playlist::by_index(i), m_pl_menu),
+ QString());
+ tabs++;
+ }
+ }
+ }
+
+ while (tabs < playlists)
+ {
+ addTab(new LayoutWidget(this, Playlist::by_index(tabs), m_pl_menu),
+ QString());
+ tabs++;
+ }
+}
+
+void PlaylistTabs::currentChangedTrigger(int idx)
+{
+ Playlist::by_index(idx).activate();
+}
+
+bool PlaylistTabs::eventFilter(QObject * obj, QEvent * e)
+{
+ if (e->type() == QEvent::KeyPress)
+ {
+ QKeyEvent * ke = (QKeyEvent *)e;
+
+ if (ke->key() == Qt::Key_Escape)
+ return m_tabbar->cancelRename();
+ }
+
+ return QTabWidget::eventFilter(obj, e);
+}
+
+void PlaylistTabs::renameCurrent()
+{
+ auto playlist = currentPlaylistWidget()->playlist();
+
+ if (m_tabbar->isVisible())
+ m_tabbar->startRename(playlist);
+ else
+ audqt::playlist_show_rename(playlist);
+}
+
+void PlaylistTabs::playlist_activate_cb()
+{
+ setCurrentIndex(Playlist::active_playlist().index());
+ m_tabbar->cancelRename();
+}
+
+void PlaylistTabs::playlist_update_cb(Playlist::UpdateLevel global_level)
+{
+ if (global_level == Playlist::Structure)
+ addRemovePlaylists();
+ if (global_level >= Playlist::Metadata)
+ m_tabbar->updateTitles();
+
+ for (int i = 0; i < count(); i++)
+ playlistWidget(i)->playlistUpdate();
+
+ setCurrentIndex(Playlist::active_playlist().index());
+}
+
+void PlaylistTabs::playlist_position_cb(Playlist list)
+{
+ auto widget = playlistWidget(list.index());
+ if (widget)
+ widget->scrollToCurrent();
+}
+
+PlaylistTabBar::PlaylistTabBar(QWidget * parent) : QTabBar(parent)
+{
+ hide();
+
+ connect(this, &QTabBar::tabMoved, this, &PlaylistTabBar::tabMoved);
+ connect(this, &QTabBar::tabCloseRequested, (int idx) {
+ audqt::playlist_confirm_delete(Playlist::by_index(idx));
+ });
+}
+
+void PlaylistTabBar::updateTitles()
+{
+ int tabs = count();
+ for (int i = 0; i < tabs; i++)
+ updateTabText(i);
+}
+
+void PlaylistTabBar::updateIcons()
+{
+ QIcon icon;
+ int playing = Playlist::playing_playlist().index();
+ if (playing >= 0)
+ icon = QIcon::fromTheme(aud_drct_get_paused() ? "media-playback-pause"
+ : "media-playback-start");
+
+ int tabs = count();
+ for (int i = 0; i < tabs; i++)
+ {
+ /* hide icon when editing so it doesn't get shown on the wrong side */
+ setTabIcon(i, (i == playing && !getTabEdit(i)) ? icon : QIcon());
+ }
+}
+
+void PlaylistTabBar::startRename(Playlist playlist)
+{
+ int idx = playlist.index();
+ QLineEdit * edit = getTabEdit(idx);
+
+ if (!edit)
+ {
+ edit = new QLineEdit((const char *)playlist.get_title());
+
+ connect(edit, &QLineEdit::returnPressed, this, playlist, edit() {
+ playlist.set_title(edit->text().toUtf8());
+ cancelRename();
+ });
+
+ setupTab(idx, edit, &m_leftbtn);
+ updateIcons();
+ }
+
+ edit->selectAll();
+ edit->setFocus();
+}
+
+bool PlaylistTabBar::cancelRename()
+{
+ bool cancelled = false;
+
+ for (int i = 0; i < count(); i++)
+ {
+ QLineEdit * edit = getTabEdit(i);
+ if (!edit)
+ continue;
+
+ setupTab(i, m_leftbtn, nullptr);
+ m_leftbtn = nullptr;
+ cancelled = true;
+ updateIcons();
+ }
+
+ return cancelled;
+}
+
+void PlaylistTabBar::mousePressEvent(QMouseEvent * e)
+{
+ if (e->button() == Qt::MiddleButton)
+ {
+ int index = tabAt(e->pos());
+ if (index >= 0)
+ {
+ audqt::playlist_confirm_delete(Playlist::by_index(index));
+ e->accept();
+ }
+ }
+
+ QTabBar::mousePressEvent(e);
+}
+
+void PlaylistTabBar::mouseDoubleClickEvent(QMouseEvent * e)
+{
+ int idx = tabAt(e->pos());
+ if (idx < 0 || e->button() != Qt::LeftButton)
+ return;
+
+ Playlist::by_index(idx).start_playback();
+}
+
+void PlaylistTabBar::contextMenuEvent(QContextMenuEvent * e)
+{
+ int idx = tabAt(e->pos());
+ if (idx < 0)
+ return;
+
+ auto menu = new QMenu(this);
+ auto playlist = Playlist::by_index(idx);
+
+ auto play_act = new QAction(QIcon::fromTheme("media-playback-start"),
+ audqt::translate_str(N_("_Play")), menu);
+ auto rename_act =
+ new QAction(QIcon::fromTheme("insert-text"),
+ audqt::translate_str(N_("_Rename ...")), menu);
+ auto remove_act = new QAction(QIcon::fromTheme("edit-delete"),
+ audqt::translate_str(N_("Remo_ve")), menu);
+
+ QObject::connect(play_act, &QAction::triggered,
+ playlist() { playlist.start_playback(); });
+ QObject::connect(rename_act, &QAction::triggered, this, playlist() {
+ if (playlist.exists())
+ startRename(playlist);
+ });
+ QObject::connect(remove_act, &QAction::triggered, playlist() {
+ if (playlist.exists())
+ audqt::playlist_confirm_delete(playlist);
+ });
+
+ menu->addAction(play_act);
+ menu->addAction(rename_act);
+ menu->addAction(remove_act);
+ menu->setAttribute(Qt::WA_DeleteOnClose);
+ menu->popup(e->globalPos());
+}
+
+QLineEdit * PlaylistTabBar::getTabEdit(int idx)
+{
+ return dynamic_cast<QLineEdit *>(tabButton(idx, QTabBar::LeftSide));
+}
+
+void PlaylistTabBar::updateTabText(int idx)
+{
+ QString title;
+
+ if (!getTabEdit(idx))
+ {
+ auto playlist = Playlist::by_index(idx);
+
+ // escape ampersands for setTabText ()
+ title = QString(playlist.get_title()).replace("&", "&&");
+
+ if (aud_get_bool("qtui", "entry_count_visible"))
+ title += QString(" (%1)").arg(playlist.n_entries());
+ }
+
+ setTabText(idx, title);
+}
+
+void PlaylistTabBar::setupTab(int idx, QWidget * button, QWidget ** oldp)
+{
+ QWidget * old = tabButton(idx, QTabBar::LeftSide);
+ setTabButton(idx, QTabBar::LeftSide, button);
+
+ if (oldp)
+ *oldp = old;
+ else
+ {
+ old->setParent(nullptr);
+ old->deleteLater();
+ }
+
+ updateTabText(idx);
+}
+
+void PlaylistTabBar::tabMoved(int from, int to)
+{
+ Playlist::reorder_playlists(from, to, 1);
+}
+
+}

audacious-plugins-4.4.1.tar.bz2/src/moonstone/playlist_tabs.h Added

@@ -0,0 +1,102 @@
+/*
+ * playlist_tabs.h
+ * Copyright 2014 Michał Lipski
+ *
+ * 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.
+ */
+
+#ifndef PLAYLIST_TABS_H
+#define PLAYLIST_TABS_H
+
+#include <QTabBar>
+#include <QTabWidget>
+
+#include <libaudcore/hook.h>
+#include <libaudcore/playlist.h>
+
+class QLineEdit;
+class QMenu;
+
+namespace Moonstone {
+
+class PlaylistTabBar;
+class PlaylistWidget;
+
+class PlaylistTabs : public QTabWidget
+{
+public:
+ PlaylistTabs(QWidget * parent = nullptr);
+
+ PlaylistWidget * currentPlaylistWidget() const;
+ PlaylistWidget * playlistWidget(int idx) const;
+
+ void currentChangedTrigger(int idx);
+ void tabEditedTrigger();
+
+protected:
+ bool eventFilter(QObject * obj, QEvent * e);
+
+private:
+ QMenu * m_pl_menu;
+ PlaylistTabBar * m_tabbar;
+
+ void addRemovePlaylists();
+ void renameCurrent();
+
+ void playlist_activate_cb();
+ void playlist_update_cb(Playlist::UpdateLevel global_level);
+ void playlist_position_cb(Playlist list);
+
+ const HookReceiver<PlaylistTabs> activate_hook{
+ "playlist activate", this, &PlaylistTabs::playlist_activate_cb};
+ const HookReceiver<PlaylistTabs, Playlist::UpdateLevel> update_hook{
+ "playlist update", this, &PlaylistTabs::playlist_update_cb};
+ const HookReceiver<PlaylistTabs, Playlist> position_hook{
+ "playlist position", this, &PlaylistTabs::playlist_position_cb};
+};
+
+class PlaylistTabBar : public QTabBar
+{
+public:
+ PlaylistTabBar(QWidget * parent = nullptr);
+
+ void updateTitles();
+ void updateIcons();
+ void startRename(Playlist playlist);
+ bool cancelRename();
+
+protected:
+ void mousePressEvent(QMouseEvent * e) override;
+ void mouseDoubleClickEvent(QMouseEvent * e) override;
+ void contextMenuEvent(QContextMenuEvent * e) override;
+
+private:
+ QLineEdit * getTabEdit(int idx);
+ void updateTabText(int idx);
+ void setupTab(int idx, QWidget * button, QWidget ** oldp);
+ void tabMoved(int from, int to);
+
+ const HookReceiver<PlaylistTabBar> pause_hook{"playback pause", this,
+ &PlaylistTabBar::updateIcons},
+ unpause_hook{"playback unpause", this, &PlaylistTabBar::updateIcons},
+ set_playing_hook{"playlist set playing", this,
+ &PlaylistTabBar::updateIcons};
+
+ QWidget * m_leftbtn = nullptr;
+};
+
+}
+
+#endif

audacious-plugins-4.4.1.tar.bz2/src/moonstone/time_slider.cc Added

@@ -0,0 +1,144 @@
+/*
+ * time_slider.cc
+ * Copyright 2014 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 "time_slider.h"
+
+#include <libaudcore/audstrings.h>
+#include <libaudcore/drct.h>
+#include <libaudcore/runtime.h>
+#include <libaudqt/libaudqt.h>
+
+#include <QMouseEvent>
+#include <QProxyStyle>
+#include <QStyle>
+
+TimeSliderLabel::TimeSliderLabel(QWidget * parent) : QLabel(parent)
+{
+ setStyleSheet("font-weight: bold");
+}
+TimeSliderLabel::~TimeSliderLabel() {}
+
+void TimeSliderLabel::mouseDoubleClickEvent(QMouseEvent * event)
+{
+ if (event->button() == Qt::LeftButton)
+ {
+ aud_toggle_bool("qtui", "show_remaining_time");
+ hook_call("qtui toggle remaining time", nullptr);
+ event->accept();
+ }
+
+ QLabel::mouseDoubleClickEvent(event);
+}
+
+class TimeSliderStyle : public QProxyStyle
+{
+public:
+ int styleHint(QStyle::StyleHint hint, const QStyleOption * option = nullptr,
+ const QWidget * widget = nullptr,
+ QStyleHintReturn * returnData = nullptr) const
+ {
+ int styleHint =
+ QProxyStyle::styleHint(hint, option, widget, returnData);
+
+ if (hint == QStyle::SH_Slider_AbsoluteSetButtons)
+ styleHint |= Qt::LeftButton;
+
+ return styleHint;
+ }
+};
+
+TimeSlider::TimeSlider(QWidget * parent)
+ : QSlider(Qt::Horizontal, parent), m_label(new TimeSliderLabel(parent))
+{
+ setFocusPolicy(Qt::NoFocus);
+ setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
+ setStyle(new TimeSliderStyle());
+
+ m_label->setContentsMargins(audqt::sizes.FourPt, 0, 0, 0);
+ m_label->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::MinimumExpanding);
+
+ connect(this, &QSlider::sliderMoved, this, &TimeSlider::moved);
+ connect(this, &QSlider::sliderPressed, this, &TimeSlider::pressed);
+ connect(this, &QSlider::sliderReleased, this, &TimeSlider::released);
+
+ start_stop();
+}
+
+TimeSlider::~TimeSlider() {}
+
+void TimeSlider::set_label(int time, int length)
+{
+ QString text;
+
+ if (length >= 0)
+ if (aud_get_bool("qtui", "show_remaining_time"))
+ text = str_concat({str_format_time(time - length), " / ",
+ str_format_time(length)});
+ else
+ text = str_concat(
+ {str_format_time(time), " / ", str_format_time(length)});
+ else
+ text = str_format_time(time);
+
+ m_label->setText(text);
+}
+
+void TimeSlider::start_stop()
+{
+ bool ready = aud_drct_get_ready();
+ bool paused = aud_drct_get_paused();
+
+ setEnabled(ready);
+ m_label->setEnabled(ready);
+
+ update();
+
+ if (ready && !paused)
+ m_timer.start();
+ else
+ m_timer.stop();
+}
+
+void TimeSlider::update()
+{
+ if (aud_drct_get_ready())
+ {
+ if (!isSliderDown())
+ {
+ int time = aud_drct_get_time();
+ int length = aud_drct_get_length();
+
+ setRange(0, length);
+ setValue(time);
+
+ set_label(time, length);
+ }
+ }
+ else
+ {
+ setRange(0, 0);
+ set_label(0, 0);
+ }
+}
+
+void TimeSlider::moved(int value) { set_label(value, aud_drct_get_length()); }
+
+void TimeSlider::pressed() { set_label(value(), aud_drct_get_length()); }
+
+void TimeSlider::released() { aud_drct_seek(value()); }

audacious-plugins-4.4.1.tar.bz2/src/moonstone/time_slider.h Added

@@ -0,0 +1,70 @@
+/*
+ * time_slider.h
+ * Copyright 2014 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.
+ */
+
+#ifndef TIME_SLIDER_H
+#define TIME_SLIDER_H
+
+#include <QLabel>
+#include <QSlider>
+
+#include <libaudcore/hook.h>
+
+class QMouseEvent;
+
+class TimeSliderLabel : public QLabel
+{
+public:
+ TimeSliderLabel(QWidget * parent);
+ ~TimeSliderLabel();
+
+protected:
+ void mouseDoubleClickEvent(QMouseEvent * event);
+};
+
+class TimeSlider : public QSlider
+{
+public:
+ TimeSlider(QWidget * parent);
+ ~TimeSlider();
+
+ TimeSliderLabel * label() { return m_label; }
+
+private:
+ void set_label(int time, int length);
+
+ void start_stop();
+ void update();
+ void moved(int value);
+ void pressed();
+ void released();
+
+ TimeSliderLabel * m_label;
+
+ const Timer<TimeSlider> m_timer{TimerRate::Hz4, this, &TimeSlider::update};
+
+ const HookReceiver<TimeSlider> hook1{"playback ready", this,
+ &TimeSlider::start_stop},
+ hook2{"playback pause", this, &TimeSlider::start_stop},
+ hook3{"playback unpause", this, &TimeSlider::start_stop},
+ hook4{"playback seek", this, &TimeSlider::update},
+ hook5{"playback stop", this, &TimeSlider::start_stop},
+ hook6{"qtui toggle remaining time", this, &TimeSlider::start_stop};
+};
+
+#endif

audacious-plugins-4.4.1.tar.bz2/src/moonstone/tool_bar.cc Added

@@ -0,0 +1,69 @@
+/*
+ * tool_bar.cc
+ * Copyright 2014, 2020 Ariadne Conill
+ *
+ * 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 "tool_bar.h"
+
+#include <QAction>
+#include <QIcon>
+
+#include <libaudcore/runtime.h>
+#include <libaudqt/libaudqt.h>
+
+namespace Moonstone {
+
+ToolBar::ToolBar(QWidget * parent, ArrayRef<ToolBarItem> items)
+ : QToolBar(parent)
+{
+ setContextMenuPolicy(Qt::PreventContextMenu);
+ setMovable(false);
+
+ for (const ToolBarItem & item : items)
+ {
+ if (item.widget)
+ addWidget(item.widget);
+ else if (item.sep)
+ addSeparator();
+ else if (item.icon_name)
+ {
+ QAction * a = new QAction(QIcon::fromTheme(item.icon_name),
+ audqt::translate_str(item.name), this);
+
+ if (item.tooltip_text)
+ a->setToolTip(audqt::translate_str(item.tooltip_text));
+
+ if (item.callback)
+ connect(a, &QAction::triggered, item.callback);
+
+ if (item.toggled)
+ {
+ a->setCheckable(true);
+ connect(a, &QAction::toggled, item.toggled);
+ }
+
+ addAction(a);
+
+ if (item.action_ptr)
+ *item.action_ptr = a;
+ }
+ }
+
+ setStyleSheet("QToolBar { background: rgba(255, 255, 255, 0.6); }");
+}
+
+}

audacious-plugins-4.4.1.tar.bz2/src/moonstone/tool_bar.h Added

@@ -0,0 +1,81 @@
+/*
+ * tool_bar.h
+ * Copyright 2014, 2020 Ariadne Conill
+ *
+ * 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.
+ */
+
+#ifndef TOOL_BAR_H
+#define TOOL_BAR_H
+
+#include <QToolBar>
+
+#include <libaudcore/objects.h>
+
+namespace Moonstone {
+
+struct ToolBarItem
+{
+ const char * icon_name;
+ const char * name;
+ const char * tooltip_text;
+
+ void (*callback)();
+ void (*toggled)(bool on);
+
+ QWidget * widget;
+
+ bool sep;
+
+ QAction ** action_ptr;
+};
+
+class ToolBar : public QToolBar
+{
+public:
+ ToolBar(QWidget * parent, ArrayRef<ToolBarItem> items);
+};
+
+constexpr ToolBarItem ToolBarAction(const char * icon_name, const char * name,
+ const char * tooltip_text,
+ void (*callback)(),
+ QAction ** action_ptr = nullptr)
+{
+ return {icon_name, name, tooltip_text, callback,
+ nullptr, nullptr, false, action_ptr};
+}
+
+constexpr ToolBarItem ToolBarAction(const char * icon_name, const char * name,
+ const char * tooltip_text,
+ void (*toggled)(bool),
+ QAction ** action_ptr = nullptr)
+{
+ return {icon_name, name, tooltip_text, nullptr,
+ toggled, nullptr, false, action_ptr};
+}
+
+constexpr ToolBarItem ToolBarCustom(QWidget * item)
+{
+ return {nullptr, nullptr, nullptr, nullptr, nullptr, item};
+}
+
+constexpr ToolBarItem ToolBarSeparator()
+{
+ return {nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, true};
+}
+
+}
+
+#endif

audacious-plugins-4.4.1.tar.bz2/src/mpg123/meson.build Added

audacious-plugins-3.6.2-gtk3.tar.bz2/src/mpg123/mpg123.cc -> audacious-plugins-4.4.1.tar.bz2/src/mpg123/mpg123.cc Changed

@@ -29,87 +29,89 @@
 #include "config.h"
 
 #ifdef DEBUG_MPG123_IO
-# define MPG123_IODBG(...) AUDDBG(__VA_ARGS__)
+#define MPG123_IODBG(...) AUDDBG(__VA_ARGS__)
 #else
-# define MPG123_IODBG(...) do { } while (0)
+#define MPG123_IODBG(...)
 #endif
 
 #define WANT_VFS_STDIO_COMPAT
+#include <audacious/audtag.h>
 #include <libaudcore/audstrings.h>
-#include <libaudcore/runtime.h>
 #include <libaudcore/i18n.h>
 #include <libaudcore/plugin.h>
 #include <libaudcore/preferences.h>
-#include <audacious/audtag.h>
+#include <libaudcore/runtime.h>
 
 class MPG123Plugin : public InputPlugin
 {
 public:
 static const char * const exts;
 static const char * const defaults;
+ static const char * const mimes;
 static const PreferencesWidget widgets;
 static const PluginPreferences prefs;
 
- static constexpr PluginInfo info = {
- N_("MPG123 Plugin"),
- PACKAGE,
- nullptr,
- & prefs
- };
-
- static constexpr auto iinfo = InputInfo (FlagWritesTag)
- .with_exts (exts);
+ static constexpr PluginInfo info = {N_("MPG123 Plugin"), PACKAGE, nullptr,
+ &prefs};
+ static constexpr InputInfo iinfo =
+ InputInfo(FlagWritesTag).with_exts(exts).with_mimes(mimes);
 
- constexpr MPG123Plugin() : InputPlugin (info, iinfo) {}
+ constexpr MPG123Plugin() : InputPlugin(info, iinfo) {}
 
- bool init ();
- void cleanup ();
+ bool init();
+ void cleanup();
 
- bool is_our_file (const char * filename, VFSFile & file);
- Tuple read_tuple (const char * filename, VFSFile & file);
- Index<char> read_image (const char * filename, VFSFile & file);
- bool write_tuple (const char * filename, VFSFile & file, const Tuple & tuple);
- bool play (const char * filename, VFSFile & file);
+ bool is_our_file(const char * filename, VFSFile & file);
+ bool read_tag(const char * filename, VFSFile & file, Tuple & tuple,
+ Index<char> * image);
+ bool write_tuple(const char * filename, VFSFile & file,
+ const Tuple & tuple);
+ bool play(const char * filename, VFSFile & file);
 };
 
 EXPORT MPG123Plugin aud_plugin_instance;
 
-const char * const MPG123Plugin::defaults = {
- "full_scan", "FALSE",
- nullptr
-};
+const char * const MPG123Plugin::mimes = {
+ "audio/mp3", "audio/mpeg", "audio/x-mp3", "audio/x-mpeg", nullptr};
+
+const char * const MPG123Plugin::defaults = {"full_scan", "FALSE", //
+ nullptr};
 
 const PreferencesWidget MPG123Plugin::widgets = {
- WidgetLabel (N_("Advanced")),
- WidgetCheck (N_("Use accurate length calculation (slow)"),
- WidgetBool ("mpg123", "full_scan"))
-};
+ WidgetLabel(N_("Advanced")),
+ WidgetCheck(N_("Use accurate length calculation (slow)"),
+ WidgetBool("mpg123", "full_scan"))};
 
 const PluginPreferences MPG123Plugin::prefs = {{widgets}};
 
-#define DECODE_OPTIONS (MPG123_QUIET | MPG123_GAPLESS | MPG123_SEEKBUFFER | MPG123_FUZZY)
+#define DECODE_OPTIONS \
+ (MPG123_QUIET | MPG123_GAPLESS | MPG123_SEEKBUFFER | MPG123_FUZZY)
+
+// this is a macro so that the printed line number is meaningful
+#define print_mpg123_error(filename, decoder) \
+ AUDERR("mpg123 error in %s: %s\n", filename, mpg123_strerror(decoder))
 
-static ssize_t replace_read (void * file, void * buffer, size_t length)
+static ssize_t replace_read(void * file, void * buffer, size_t length)
 {
- return ((VFSFile *) file)->fread (buffer, 1, length);
+ return ((VFSFile *)file)->fread(buffer, 1, length);
 }
 
-static off_t replace_lseek (void * file, off_t to, int whence)
+static off_t replace_lseek(void * file, off_t to, int whence)
 {
- if (((VFSFile *) file)->fseek (to, to_vfs_seek_type (whence)) < 0)
+ if (((VFSFile *)file)->fseek(to, to_vfs_seek_type(whence)) < 0)
 return -1;
 
- return ((VFSFile *) file)->ftell ();
+ return ((VFSFile *)file)->ftell();
 }
 
-static off_t replace_lseek_dummy (void * file, off_t to, int whence)
+static off_t replace_lseek_dummy(void * file, off_t to, int whence)
 {
 return -1;
 }
 
-bool MPG123Plugin::init ()
+bool MPG123Plugin::init()
 {
- aud_config_set_defaults ("mpg123", defaults);
+ aud_config_set_defaults("mpg123", defaults);
 
 AUDDBG("initializing mpg123 library\n");
 mpg123_init();
@@ -117,310 +119,284 @@
 return true;
 }
 
-void MPG123Plugin::cleanup ()
+void MPG123Plugin::cleanup()
 {
 AUDDBG("deinitializing mpg123 library\n");
 mpg123_exit();
 }
 
-static void set_format (mpg123_handle * dec)
+struct DecodeState
 {
- mpg123_format_none (dec);
+ mpg123_handle * dec = nullptr;
 
- for (int rate : {8000, 11025, 12000, 16000, 22050, 24000, 32000, 44100, 48000})
- mpg123_format (dec, rate, MPG123_MONO | MPG123_STEREO, MPG123_ENC_FLOAT_32);
-}
-
-static void make_format_string (const struct mpg123_frameinfo * info, char *
- buf, int bsize)
-{
- static const char * vers = {"1", "2", "2.5"};
- snprintf (buf, bsize, "MPEG-%s layer %d", versinfo->version, info->layer);
-}
+ DecodeState(const char * filename, VFSFile & file, bool probing,
+ bool stream);
+ ~DecodeState() { mpg123_delete(dec); }
 
-bool MPG123Plugin::is_our_file (const char * fname, VFSFile & file)
-{
- /* MPG123 likes to grab WMA streams, so blacklist anything that starts with
- * mms://. If there are mms:// streams out there carrying MP3, they will
- * just have to play in ffaudio. --jlindgren */
- if (! strncmp (fname, "mms://", 6))
- return false;
+ bool valid() const { return dec != nullptr; }
 
- bool is_streaming = (file.fsize () < 0);
+ long rate;
+ int channels, encoding;
+ mpg123_frameinfo info;
+ size_t bytes_read;
+ float buf4096;
+};
 
- /* 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 id3buf3;
- if (file.fread (id3buf, 1, 3) != 3)
- return false;
+DecodeState::DecodeState(const char * filename, VFSFile & file, bool probing,
+ bool stream)
+{
+ dec = mpg123_new(nullptr, nullptr);
+ mpg123_param(dec, MPG123_ADD_FLAGS, DECODE_OPTIONS, 0);
+ mpg123_replace_reader_handle(dec, replace_read,
+ stream ? replace_lseek_dummy : replace_lseek,
+ nullptr);
 
- if (! memcmp (id3buf, "ID3", 3))
- return true;
+ /* be strict about junk data in file during content probe */
+ if (probing)
+ mpg123_param(dec, MPG123_RESYNC_LIMIT, 0, 0);
 
- if (file.fseek (0, VFS_SEEK_SET) < 0)
- return false;
- }
+ mpg123_format_none(dec);
 
- mpg123_handle * dec = mpg123_new (nullptr, nullptr);
- mpg123_param (dec, MPG123_ADD_FLAGS, DECODE_OPTIONS, 0);
+ auto rates = {8000, 11025, 12000, 16000, 22050, 24000, 32000, 44100, 48000};
+ for (int rate : rates)
+ mpg123_format(dec, rate, MPG123_MONO | MPG123_STEREO,
+ MPG123_ENC_FLOAT_32);
 
- if (is_streaming)
- mpg123_replace_reader_handle (dec, replace_read, replace_lseek_dummy, nullptr);
- else
- mpg123_replace_reader_handle (dec, replace_read, replace_lseek, nullptr);
+ if (mpg123_open_handle(dec, &file) < 0)
+ goto err;
 
- set_format (dec);
+ if (!stream && aud_get_bool("mpg123", "full_scan") && mpg123_scan(dec) < 0)
+ goto err;
 
- int res;
- if ((res = mpg123_open_handle (dec, & file)) < 0)
+ while (1)
 {
-ERR:
- AUDDBG ("Probe error: %s\n", mpg123_plain_strerror (res));
- mpg123_delete (dec);
- return false;
- }
+ if (mpg123_getformat(dec, &rate, &channels, &encoding) < 0)
+ goto err;
 
- if (! is_streaming && aud_get_bool ("mpg123", "full_scan") && mpg123_scan (dec) < 0)
- goto ERR;
+ int ret =
+ mpg123_read(dec, (unsigned char *)buf, sizeof buf, &bytes_read);
 
-RETRY:;
- long rate;
- int chan, enc;
- if ((res = mpg123_getformat (dec, & rate, & chan, & enc)) < 0)
- goto ERR;
+ if (ret == MPG123_NEW_FORMAT)
+ continue;
+ if (ret < 0)
+ goto err;
 
- struct mpg123_frameinfo info;
- if ((res = mpg123_info (dec, & info)) < 0)
- goto ERR;
+ if (mpg123_info(dec, &info) < 0)
+ goto err;
 
- float out8192;
- size_t done;
- while ((res = mpg123_read (dec, (unsigned char *) out, sizeof out, & done)) < 0)
- {
- if (res == MPG123_NEW_FORMAT)
- goto RETRY;
- goto ERR;
+ // heuristic/sanity check to avoid false positives
+ if (probing && !stream && info.vbr == MPG123_CBR && info.bitrate <= 0)
+ goto err;
+
+ return;
 }
 
- char str32;
- make_format_string (& info, str, sizeof str);
- AUDDBG ("Accepted as %s: %s.\n", str, fname);
+err:
+ if (probing)
+ AUDDBG("mpg123 error in %s: %s\n", filename, mpg123_strerror(dec));
+ else
+ AUDERR("mpg123 error in %s: %s\n", filename, mpg123_strerror(dec));
 
- mpg123_delete (dec);
- return true;
+ mpg123_delete(dec);
+ dec = nullptr;
 }
 
-Tuple MPG123Plugin::read_tuple (const char * filename, VFSFile & file)
+// with better buffering in Audacious 3.7, this is now safe for streams
+static bool detect_id3(VFSFile & file)
 {
- bool stream = (file.fsize () < 0);
- mpg123_handle * decoder = mpg123_new (nullptr, nullptr);
- int result;
- long rate;
- int channels, encoding;
- struct mpg123_frameinfo info;
- char scratch32;
-
- mpg123_param (decoder, MPG123_ADD_FLAGS, DECODE_OPTIONS, 0);
+ bool is_id3 = false;
+ char id3buf3;
 
- if (stream)
- mpg123_replace_reader_handle (decoder, replace_read, replace_lseek_dummy, nullptr);
- else
- mpg123_replace_reader_handle (decoder, replace_read, replace_lseek, nullptr);
+ if (file.fread(id3buf, 1, 3) == 3)
+ is_id3 = !memcmp(id3buf, "ID3", 3);
 
- if ((result = mpg123_open_handle (decoder, & file)) < 0
- || (! stream && aud_get_bool ("mpg123", "full_scan") && (result = mpg123_scan (decoder)) < 0)
- || (result = mpg123_getformat (decoder, & rate, & channels, & encoding)) < 0
- || (result = mpg123_info (decoder, & info)) < 0)
- {
- AUDERR ("mpg123 probe error for %s: %s\n", filename, mpg123_plain_strerror (result));
- mpg123_delete (decoder);
- return Tuple ();
- }
+ if (file.fseek(0, VFS_SEEK_SET) < 0)
+ is_id3 = false;
 
- Tuple tuple;
- tuple.set_filename (filename);
- make_format_string (& info, scratch, sizeof scratch);
- tuple.set_str (Tuple::Codec, scratch);
- snprintf (scratch, sizeof scratch, "%s, %d Hz", (channels == 2)
- ? _("Stereo") : (channels > 2) ? _("Surround") : _("Mono"), (int) rate);
- tuple.set_str (Tuple::Quality, scratch);
- tuple.set_int (Tuple::Bitrate, info.bitrate);
-
- if (! stream)
- {
- int64_t size = file.fsize ();
- int64_t samples = mpg123_length (decoder);
- int length = (samples > 0 && rate > 0) ? samples * 1000 / rate : 0;
+ return is_id3;
+}
 
- if (length > 0)
- tuple.set_int (Tuple::Length, length);
- if (size > 0 && length > 0)
- tuple.set_int (Tuple::Bitrate, 8 * size / length);
- }
+static StringBuf make_format_string(const mpg123_frameinfo * info)
+{
+ static const char * vers = {"1", "2", "2.5"};
+ return str_printf("MPEG-%s layer %d", versinfo->version, info->layer);
+}
 
- mpg123_delete (decoder);
+bool MPG123Plugin::is_our_file(const char * filename, VFSFile & file)
+{
+ bool stream = (file.fsize() < 0);
 
- if (! stream && ! file.fseek (0, VFS_SEEK_SET))
- audtag::tuple_read (tuple, 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 (detect_id3(file))
+ return true;
 
- if (stream)
- tuple.fetch_stream_info (file);
+ DecodeState s(filename, file, true, stream);
+ if (!s.valid())
+ return false;
 
- return tuple;
+ auto fmt = make_format_string(&s.info);
+ AUDDBG("Accepted as %s: %s.\n", &fmt0, filename);
+ return true;
 }
 
-typedef struct {
- mpg123_handle *decoder;
- long rate;
- int channels;
- int encoding;
- bool stream;
- Tuple tu;
-} MPG123PlaybackContext;
-
-static void print_mpg123_error (const char * filename, mpg123_handle * decoder)
+static bool read_mpg123_info(const char * filename, VFSFile & file,
+ Tuple & tuple)
 {
- AUDERR ("mpg123 error in %s: %s\n", filename, mpg123_strerror (decoder));
-}
+ int64_t size = file.fsize();
+ bool stream = (size < 0);
 
-bool MPG123Plugin::play (const char * filename, VFSFile & file)
-{
- bool error = false;
- MPG123PlaybackContext ctx;
- int ret;
- int bitrate = 0, bitrate_sum = 0, bitrate_count = 0;
- struct mpg123_frameinfo fi;
- int error_count = 0;
+ DecodeState s(filename, file, false, stream);
+ if (!s.valid())
+ return false;
 
- memset(&ctx, 0, sizeof(MPG123PlaybackContext));
- memset(&fi, 0, sizeof(struct mpg123_frameinfo));
+ tuple.set_int(Tuple::Bitrate, s.info.bitrate);
+ tuple.set_str(Tuple::Codec, make_format_string(&s.info));
+ tuple.set_int(Tuple::Channels, s.channels);
 
- AUDDBG("playback worker started for %s\n", filename);
+ const char * chan_str = (s.channels == 2)
+ ? _("Stereo")
+ : (s.channels > 2) ? _("Surround") : _("Mono");
+ tuple.set_str(Tuple::Quality,
+ str_printf("%s, %d Hz", chan_str, (int)s.rate));
 
- AUDDBG ("Checking for streaming ...\n");
- ctx.stream = (file.fsize () < 0);
- ctx.tu = ctx.stream ? get_playback_tuple () : Tuple ();
+ if (!stream && s.rate > 0)
+ {
+ int64_t samples = mpg123_length(s.dec);
+ int length = aud::rescale<int64_t>(samples, s.rate, 1000);
 
- ctx.decoder = mpg123_new (nullptr, nullptr);
- mpg123_param (ctx.decoder, MPG123_ADD_FLAGS, DECODE_OPTIONS, 0);
+ if (length > 0)
+ {
+ tuple.set_int(Tuple::Length, length);
+ tuple.set_int(Tuple::Bitrate, aud::rdiv<int64_t>(8 * size, length));
+ }
+ }
 
- if (ctx.stream)
- mpg123_replace_reader_handle (ctx.decoder, replace_read, replace_lseek_dummy, nullptr);
- else
- mpg123_replace_reader_handle (ctx.decoder, replace_read, replace_lseek, nullptr);
+ return true;
+}
 
- set_format (ctx.decoder);
+bool MPG123Plugin::read_tag(const char * filename, VFSFile & file,
+ Tuple & tuple, Index<char> * image)
+{
+ bool stream = (file.fsize() < 0);
 
- float outbuf8192;
- size_t outbuf_size = 0;
+ if (!read_mpg123_info(filename, file, tuple))
+ return false;
 
- if (mpg123_open_handle (ctx.decoder, & file) < 0)
+ if (stream)
+ tuple.fetch_stream_info(file);
+ else
 {
-OPEN_ERROR:
- print_mpg123_error (filename, ctx.decoder);
- error = true;
- goto cleanup;
+ if (file.fseek(0, VFS_SEEK_SET) != 0)
+ return false;
+
+ audtag::read_tag(file, tuple, image);
 }
 
- if (! ctx.stream && aud_get_bool ("mpg123", "full_scan") && mpg123_scan (ctx.decoder) < 0)
- goto OPEN_ERROR;
+ return true;
+}
 
-GET_FORMAT:
- if (mpg123_getformat (ctx.decoder, & ctx.rate, & ctx.channels,
- & ctx.encoding) < 0)
- goto OPEN_ERROR;
+bool MPG123Plugin::play(const char * filename, VFSFile & file)
+{
+ bool stream = (file.fsize() < 0);
 
- while ((ret = mpg123_read (ctx.decoder, (unsigned char *) outbuf,
- sizeof outbuf, & outbuf_size)) < 0)
+ Tuple tuple;
+ if (stream)
 {
- if (ret == MPG123_NEW_FORMAT)
- goto GET_FORMAT;
- goto OPEN_ERROR;
+ tuple = get_playback_tuple();
+ if (detect_id3(file) && audtag::read_tag(file, tuple, nullptr))
+ set_playback_tuple(tuple.ref());
 }
 
- if (mpg123_info (ctx.decoder, & fi) < 0)
- goto OPEN_ERROR;
+ DecodeState s(filename, file, false, stream);
+ if (!s.valid())
+ return false;
+
+ int bitrate = s.info.bitrate * 1000;
+ int bitrate_sum = 0, bitrate_count = 0;
+ int error_count = 0;
 
- bitrate = fi.bitrate * 1000;
- set_stream_bitrate (bitrate);
+ set_stream_bitrate(bitrate);
 
- if (ctx.tu && ctx.tu.fetch_stream_info (file))
- set_playback_tuple (ctx.tu.ref ());
+ if (stream && tuple.fetch_stream_info(file))
+ set_playback_tuple(tuple.ref());
 
- open_audio (FMT_FLOAT, ctx.rate, ctx.channels);
+ open_audio(FMT_FLOAT, s.rate, s.channels);
 
- while (! check_stop ())
+ while (!check_stop())
 {
- int seek = check_seek ();
+ int seek = check_seek();
 
 if (seek >= 0)
 {
- if (mpg123_seek (ctx.decoder, (int64_t) seek * ctx.rate / 1000, SEEK_SET) < 0)
- print_mpg123_error (filename, ctx.decoder);
+ int64_t sample = aud::rescale<int64_t>(seek, 1000, s.rate);
+ if (mpg123_seek(s.dec, sample, SEEK_SET) < 0)
+ print_mpg123_error(filename, s.dec);
 
- outbuf_size = 0;
+ s.bytes_read = 0;
 }
 
- mpg123_info(ctx.decoder, &fi);
- bitrate_sum += fi.bitrate;
- bitrate_count ++;
+ mpg123_info(s.dec, &s.info);
+ bitrate_sum += s.info.bitrate;
+ bitrate_count++;
 
- if (bitrate_sum / bitrate_count != bitrate && bitrate_count >= 16)
+ int new_bitrate = aud::rdiv(bitrate_sum, bitrate_count);
+ if (new_bitrate != bitrate && bitrate_count >= 16)
 {
- set_stream_bitrate (bitrate_sum / bitrate_count * 1000);
- bitrate = bitrate_sum / bitrate_count;
+ set_stream_bitrate(new_bitrate * 1000);
+ bitrate = new_bitrate;
 bitrate_sum = 0;
 bitrate_count = 0;
 }
 
- if (ctx.tu && ctx.tu.fetch_stream_info (file))
- set_playback_tuple (ctx.tu.ref ());
+ if (stream && tuple.fetch_stream_info(file))
+ set_playback_tuple(tuple.ref());
 
- if (! outbuf_size && (ret = mpg123_read (ctx.decoder,
- (unsigned char *) outbuf, sizeof outbuf, & outbuf_size)) < 0)
+ if (!s.bytes_read)
 {
+ int ret = mpg123_read(s.dec, (unsigned char *)s.buf, sizeof s.buf,
+ &s.bytes_read);
+
 if (ret == MPG123_DONE || ret == MPG123_ERR_READER)
 break;
 
- print_mpg123_error (filename, ctx.decoder);
+ if (ret == MPG123_NEW_FORMAT)
+ continue;
 
- if (++ error_count >= 10)
+ if (ret < 0)
 {
- error = true;
- break;
+ // log only the first error
+ if (!error_count)
+ print_mpg123_error(filename, s.dec);
+
+ // generally unreported errors are bad, but due to the number of
+ // MP3s with junk data at the end, RESYNC_FAIL just becomes a
+ // nuisance, so silence it
+ if (++error_count >= 10)
+ return (mpg123_errcode(s.dec) == MPG123_RESYNC_FAIL);
 }
 }
- else
+
+ if (s.bytes_read)
 {
 error_count = 0;
 
- write_audio (outbuf, outbuf_size);
- outbuf_size = 0;
+ write_audio(s.buf, s.bytes_read);
+ s.bytes_read = 0;
 }
 }
 
-cleanup:
- mpg123_delete(ctx.decoder);
- return ! error;
+ return true;
 }
 
-bool MPG123Plugin::write_tuple (const char * filename, VFSFile & file, const Tuple & tuple)
+bool MPG123Plugin::write_tuple(const char * filename, VFSFile & file,
+ const Tuple & tuple)
 {
- if (file.fsize () < 0) // stream?
+ if (file.fsize() < 0) // stream?
 return false;
 
- return audtag::tuple_write (tuple, file, audtag::TagType::ID3v2);
-}
-
-Index<char> MPG123Plugin::read_image (const char * filename, VFSFile & file)
-{
- if (file.fsize () < 0) // stream?
- return Index<char> ();
-
- return audtag::image_read (file);
+ return audtag::write_tuple(file, tuple, audtag::TagType::ID3v2);
 }
 
-const char * const MPG123Plugin::exts = { "mp3", "mp2", "mp1", "bmu", nullptr };
+const char * const MPG123Plugin::exts = {"mp3", "mp2", "mp1", "bmu", nullptr};

audacious-plugins-4.4.1.tar.bz2/src/mpris2/meson.build Added

audacious-plugins-3.6.2-gtk3.tar.bz2/src/mpris2/mpris2-player.xml -> audacious-plugins-4.4.1.tar.bz2/src/mpris2/mpris2-player.xml Changed

audacious-plugins-3.6.2-gtk3.tar.bz2/src/mpris2/mpris2.xml -> audacious-plugins-4.4.1.tar.bz2/src/mpris2/mpris2.xml Changed

audacious-plugins-3.6.2-gtk3.tar.bz2/src/mpris2/plugin.cc -> audacious-plugins-4.4.1.tar.bz2/src/mpris2/plugin.cc Changed

@@ -20,11 +20,12 @@
 #include <math.h>
 #include <stdint.h>
 
+#include <libaudcore/audstrings.h>
 #include <libaudcore/drct.h>
 #include <libaudcore/hook.h>
 #include <libaudcore/i18n.h>
+#include <libaudcore/index.h>
 #include <libaudcore/interface.h>
-#include <libaudcore/playlist.h>
 #include <libaudcore/plugin.h>
 #include <libaudcore/probe.h>
 #include <libaudcore/runtime.h>
@@ -47,13 +48,7 @@
 };
 
 EXPORT MPRIS2Plugin aud_plugin_instance;
-
 static GObject * object_core, * object_player;
-static String last_title, last_artist, last_album, last_file;
-static int last_length;
-static const char * image_file;
-static gboolean recheck_image;
-static int update_timer;
 
 static gboolean quit_cb (MprisMediaPlayer2 * object, GDBusMethodInvocation * call,
 void * unused)
@@ -71,109 +66,182 @@
 return true;
 }
 
-static void update_metadata (void * data, GObject * object)
+/**
+ * @brief Struct for MPRIS2 metadata.
+ */
+struct MPRIS2Metadata
 {
- String title, artist, album, file;
- int length = 0;
-
- int playlist = aud_playlist_get_playing ();
- int entry = (playlist >= 0) ? aud_playlist_get_position (playlist) : -1;
+ String title;
+ String artist;
+ String album;
+ String album_artist;
+ String comment;
+ String genre;
+ String rec_date;
+ String composer;
+ String lyrics;
+ String file;
+ int32_t track = -1;
+ int64_t length = -1;
+ int32_t disc = -1;
+ AudArtPtr image;
+
+ bool operator== (const MPRIS2Metadata & other) const
+ {
+ return title == other.title && artist == other.artist
+ && album == other.album && album_artist == other.album_artist
+ && comment == other.comment && genre == other.genre
+ && composer == other.composer && file == other.file
+ && track == other.track && length == other.length
+ && disc == other.disc && rec_date == other.rec_date;
+ }
 
- if (entry >= 0)
+ bool operator!= (const MPRIS2Metadata & other) const
 {
- Tuple tuple = aud_playlist_entry_get_tuple (playlist, entry, Playlist::Guess);
+ return ! (*this == other);
+ }
+};
 
- title = tuple.get_str (Tuple::Title);
- artist = tuple.get_str (Tuple::Artist);
- album = tuple.get_str (Tuple::Album);
- length = tuple.get_int (Tuple::Length);
+static MPRIS2Metadata last_meta;
 
- file = aud_playlist_entry_get_filename (playlist, entry);
- }
+/* Helper functions to handle GVariant creation */
 
- if (title == last_title && artist == last_artist && album == last_album
- && file == last_file && length == last_length && ! recheck_image)
+void add_g_variant_str (const char * key_str, const char * value_str,
+ Index<GVariant *> & elems)
+{
+ if (! value_str || strlen (value_str) == 0)
 return;
 
- if (file != last_file || recheck_image)
- {
- if (image_file)
- aud_art_unref (last_file);
- image_file = file ? aud_art_request_file (file) : nullptr;
- recheck_image = false;
- }
+ GVariant * key = g_variant_new_string (key_str);
+ GVariant * str = g_variant_new_string (value_str);
+ GVariant * var = g_variant_new_variant (str);
+ elems.append (g_variant_new_dict_entry (key, var));
+}
 
- last_title = title;
- last_artist = artist;
- last_album = album;
- last_file = file;
- last_length = length;
+void add_g_variant_int32 (const char * key_str, int32_t value_int,
+ Index<GVariant *> & elems)
+{
+ GVariant * key = g_variant_new_string (key_str);
+ GVariant * num = g_variant_new_int32 (value_int);
+ GVariant * var = g_variant_new_variant (num);
+ elems.append (g_variant_new_dict_entry (key, var));
+}
 
- GVariant * elems7;
- int nelems = 0;
+void add_g_variant_int64 (const char * key_str, int64_t value_int,
+ Index<GVariant *> & elems)
+{
+ GVariant * key = g_variant_new_string (key_str);
+ GVariant * num = g_variant_new_int64 (value_int);
+ GVariant * var = g_variant_new_variant (num);
+ elems.append (g_variant_new_dict_entry (key, var));
+}
 
- if (title)
- {
- GVariant * key = g_variant_new_string ("xesam:title");
- GVariant * str = g_variant_new_string (title);
- GVariant * var = g_variant_new_variant (str);
- elemsnelems ++ = g_variant_new_dict_entry (key, var);
- }
+void add_g_variant_arr_str (const char * key_str,
+ ArrayRef<String> value_arr,
+ Index<GVariant *> & elems)
+{
+ if (value_arr.len == 0)
+ return;
 
- if (artist)
+ GVariant * key = g_variant_new_string (key_str);
+ Index<GVariant *> g_variant_arr;
+ for (const auto & item : value_arr)
 {
- GVariant * key = g_variant_new_string ("xesam:artist");
- GVariant * str = g_variant_new_string (artist);
- GVariant * array = g_variant_new_array (G_VARIANT_TYPE_STRING, & str, 1);
- GVariant * var = g_variant_new_variant (array);
- elemsnelems ++ = g_variant_new_dict_entry (key, var);
+ if (! item || strlen (item) == 0)
+ continue;
+ g_variant_arr.append (g_variant_new_string (item));
 }
+ GVariant * array = g_variant_new_array (
+ G_VARIANT_TYPE_STRING, g_variant_arr.begin (), g_variant_arr.len ());
+ GVariant * var = g_variant_new_variant (array);
+ elems.append (g_variant_new_dict_entry (key, var));
+}
 
- if (album)
- {
- GVariant * key = g_variant_new_string ("xesam:album");
- GVariant * str = g_variant_new_string (album);
- GVariant * var = g_variant_new_variant (str);
- elemsnelems ++ = g_variant_new_dict_entry (key, var);
- }
+static void update_metadata (void * data, GObject * object)
+{
+ MPRIS2Metadata meta;
 
- if (file)
+ if (aud_drct_get_ready ())
 {
- GVariant * key = g_variant_new_string ("xesam:url");
- GVariant * str = g_variant_new_string (file);
- GVariant * var = g_variant_new_variant (str);
- elemsnelems ++ = g_variant_new_dict_entry (key, var);
+ Tuple tuple = aud_drct_get_tuple ();
+
+ meta.title = tuple.get_str (Tuple::Title);
+ meta.artist = tuple.get_str (Tuple::Artist);
+ meta.album = tuple.get_str (Tuple::Album);
+ meta.album_artist = tuple.get_str (Tuple::AlbumArtist);
+ meta.comment = tuple.get_str (Tuple::Comment);
+ meta.genre = tuple.get_str (Tuple::Genre);
+ meta.composer = tuple.get_str (Tuple::Composer);
+ meta.lyrics = tuple.get_str (Tuple::Lyrics);
+ meta.track = tuple.get_int (Tuple::Track);
+ meta.length = tuple.get_int (Tuple::Length);
+ meta.disc = tuple.get_int (Tuple::Disc);
+ meta.file = aud_drct_get_filename ();
+
+ int rec_year = tuple.get_int (Tuple::Year);
+ if (rec_year && rec_year > 0 && rec_year < 10000)
+ {
+ StringBuf rec_year_str = int_to_str (rec_year);
+ if (rec_year < 1000)
+ {
+ int zero_pad = 4 - rec_year_str.len ();
+ for (int i = 0; i < zero_pad; i++)
+ rec_year_str.insert (0, "0", 1);
+ }
+ meta.rec_date = String (rec_year_str);
+ }
 }
 
- if (length > 0)
- {
- GVariant * key = g_variant_new_string ("mpris:length");
- GVariant * val = g_variant_new_int64 ((int64_t) length * 1000);
- GVariant * var = g_variant_new_variant (val);
- elemsnelems ++ = g_variant_new_dict_entry (key, var);
- }
+ if (meta == last_meta)
+ return;
 
- if (image_file)
- {
- GVariant * key = g_variant_new_string ("mpris:artUrl");
- GVariant * str = g_variant_new_string (image_file);
- GVariant * var = g_variant_new_variant (str);
- elemsnelems ++ = g_variant_new_dict_entry (key, var);
- }
+ if (meta.file != last_meta.file)
+ meta.image =
+ meta.file ? aud_art_request (meta.file, AUD_ART_FILE) : AudArtPtr ();
+
+ Index<GVariant *> elems;
+
+ if (meta.title)
+ add_g_variant_str ("xesam:title", meta.title, elems);
+ if (meta.artist)
+ add_g_variant_arr_str ("xesam:artist", {{meta.artist}}, elems);
+ if (meta.album)
+ add_g_variant_str ("xesam:album", meta.album, elems);
+ if (meta.album_artist)
+ add_g_variant_arr_str ("xesam:albumArtist", {{meta.album_artist}}, elems);
+ if (meta.comment)
+ add_g_variant_arr_str ("xesam:comment", {{meta.comment}}, elems);
+ if (meta.genre)
+ add_g_variant_arr_str ("xesam:genre", {{meta.genre}}, elems);
+ if (meta.rec_date)
+ add_g_variant_str ("xesam:contentCreated", meta.rec_date, elems);
+ if (meta.composer)
+ add_g_variant_arr_str ("xesam:composer", {{meta.composer}}, elems);
+ if (meta.lyrics)
+ add_g_variant_str ("xesam:asText", meta.lyrics, elems);
+ if (meta.file)
+ add_g_variant_str ("xesam:url", meta.file, elems);
+ if (meta.track > 0)
+ add_g_variant_int32 ("xesam:trackNumber", meta.track, elems);
+ if (meta.length > 0)
+ add_g_variant_int64 ("mpris:length", meta.length * 1000, elems);
+ if (meta.disc > 0)
+ add_g_variant_int32 ("xesam:discNumber", meta.disc, elems);
+
+ auto image_file = meta.image.file ();
+ add_g_variant_str ("mpris:artUrl", image_file, elems);
 
 GVariant * key = g_variant_new_string ("mpris:trackid");
- GVariant * str = g_variant_new_string ("/org/mpris/MediaPlayer2/CurrentTrack");
+ GVariant * str =
+ g_variant_new_object_path ("/org/mpris/MediaPlayer2/CurrentTrack");
 GVariant * var = g_variant_new_variant (str);
- elemsnelems ++ = g_variant_new_dict_entry (key, var);
+ elems.append (g_variant_new_dict_entry (key, var));
 
- GVariant * array = g_variant_new_array (G_VARIANT_TYPE ("{sv}"), elems, nelems);
+ GVariant * array =
+ g_variant_new_array (G_VARIANT_TYPE ("{sv}"), elems.begin (), elems.len ());
 g_object_set (object, "metadata", array, nullptr);
-}
 
-static void update_image (void * data, GObject * object)
-{
- recheck_image = true;
- update_metadata (data, object);
+ last_meta = std::move (meta);
 }
 
 static void volume_changed (GObject * object)
@@ -183,7 +251,7 @@
 aud_drct_set_volume_main (round (vol * 100));
 }
 
-static gboolean update (GObject * object)
+static void update (void * object)
 {
 int64_t pos = 0;
 int vol = 0;
@@ -194,9 +262,8 @@
 vol = aud_drct_get_volume_main ();
 
 g_signal_handlers_block_by_func (object, (void *) volume_changed, nullptr);
- g_object_set (object, "position", pos, "volume", (double) vol / 100, nullptr);
+ g_object_set ((GObject *) object, "position", pos, "volume", (double) vol / 100, nullptr);
 g_signal_handlers_unblock_by_func (object, (void *) volume_changed, nullptr);
- return true;
 }
 
 static void update_playback_status (void * data, GObject * object)
@@ -294,42 +361,24 @@
 hook_dissociate ("playback stop", (HookFunction) update_playback_status);
 hook_dissociate ("playback unpause", (HookFunction) update_playback_status);
 
- hook_dissociate ("playlist set playing", (HookFunction) update_metadata);
- 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) update_metadata);
+ hook_dissociate ("playback stop", (HookFunction) update_metadata);
+ hook_dissociate ("tuple change", (HookFunction) update_metadata);
 
 hook_dissociate ("playback ready", (HookFunction) emit_seek);
 hook_dissociate ("playback seek", (HookFunction) emit_seek);
 
- if (update_timer)
- {
- g_source_remove (update_timer);
- update_timer = 0;
- }
+ timer_remove (TimerRate::Hz4, update, object_player);
 
 g_object_unref (object_core);
 g_object_unref (object_player);
 
- if (image_file)
- {
- aud_art_unref (last_file);
- image_file = nullptr;
- }
-
- last_title = String ();
- last_artist = String ();
- last_album = String ();
- last_file = String ();
- last_length = 0;
+ last_meta = MPRIS2Metadata();
 }
 
 bool MPRIS2Plugin::init ()
 {
-#if ! GLIB_CHECK_VERSION (2, 36, 0)
 g_type_init ();
-#endif
 
 GError * error = nullptr;
 GDBusConnection * bus = g_bus_get_sync (G_BUS_TYPE_SESSION, nullptr, & error);
@@ -346,11 +395,17 @@
 
 object_core = (GObject *) mpris_media_player2_skeleton_new ();
 
+ // build the schemes array
+ auto schemes = VFSFile::supported_uri_schemes ();
+ auto mimes = aud_plugin_get_supported_mime_types ();
+
 g_object_set (object_core,
 "can-quit", (gboolean) true,
 "can-raise", (gboolean) true,
 "desktop-entry", "audacious",
 "identity", "Audacious",
+ "supported-uri-schemes", schemes.begin (),
+ "supported-mime-types", mimes.begin (),
 nullptr);
 
 g_signal_connect (object_core, "handle-quit", (GCallback) quit_cb, nullptr);
@@ -367,7 +422,6 @@
 "can-seek", (gboolean) true,
 nullptr);
 
- update_timer = g_timeout_add (250, (GSourceFunc) update, object_player);
 update_playback_status (nullptr, object_player);
 
 if (aud_drct_get_playing () && aud_drct_get_ready ())
@@ -378,15 +432,15 @@
 hook_associate ("playback stop", (HookFunction) update_playback_status, object_player);
 hook_associate ("playback unpause", (HookFunction) update_playback_status, object_player);
 
- hook_associate ("playlist set playing", (HookFunction) update_metadata, object_player);
- 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) update_metadata, object_player);
+ hook_associate ("playback stop", (HookFunction) update_metadata, object_player);
+ hook_associate ("tuple change", (HookFunction) update_metadata, object_player);
 
 hook_associate ("playback ready", (HookFunction) emit_seek, object_player);
 hook_associate ("playback seek", (HookFunction) emit_seek, object_player);
 
+ timer_add (TimerRate::Hz4, update, object_player);
+
 g_signal_connect (object_player, "handle-next", (GCallback) next_cb, nullptr);
 g_signal_connect (object_player, "handle-pause", (GCallback) pause_cb, nullptr);
 g_signal_connect (object_player, "handle-play", (GCallback) play_cb, nullptr);

audacious-plugins-3.6.2-gtk3.tar.bz2/src/neon/Makefile -> audacious-plugins-4.4.1.tar.bz2/src/neon/Makefile Changed

audacious-plugins-3.6.2-gtk3.tar.bz2/src/neon/cert_verification.cc -> audacious-plugins-4.4.1.tar.bz2/src/neon/cert_verification.cc Changed

@@ -100,7 +100,7 @@
 enum AsnType * out_type)
 {
 if (in_bufferEnd - in_buffer < 2)
- return FALSE;
+ return false;
 
 unsigned char typeOctet = in_buffer0;
 enum AsnType typeCode = (AsnType) (typeOctet & ASNTYPE_CODE_MASK);
@@ -108,12 +108,12 @@
 
 // Variable length types are not supported.
 if (typeCode == ASNTYPE_VARLEN_IDENTIFIER)
- return FALSE;
+ return false;
 
 * out_type = typeCode;
 * out_lengthStart = in_buffer + typeCodeLength;
 
- return TRUE;
+ return true;
 }
 
 /**
@@ -125,7 +125,7 @@
 unsigned char * * out_end, unsigned char * * out_nextStart)
 {
 if (in_bufferEnd - in_buffer < 1)
- return FALSE;
+ return false;
 
 unsigned char lengthDescription = in_buffer0;
 
@@ -135,10 +135,10 @@
 * out_end = * out_start + lengthDescription;
 
 if (in_bufferEnd < * out_end)
- return FALSE;
+ return false;
 
 * out_nextStart = * out_end;
- return TRUE;
+ return true;
 }
 
 if (lengthDescription == LENGTH_INDEFINITE_VALUE)
@@ -152,21 +152,21 @@
 {
 * out_end = currentPos;
 * out_nextStart = * out_end + 1;
- return TRUE;
+ return true;
 }
 }
 
- return FALSE;
+ return false;
 }
 
 size_t lengthOctets = lengthDescription & LENGTH_LONGFORM_MASK;
 
 // We can't handle longer objects than size_t can represent.
 if (lengthOctets > sizeof (size_t))
- return FALSE;
+ return false;
 
 if (in_bufferEnd < in_buffer + 1 + lengthOctets)
- return FALSE;
+ return false;
 
 size_t contentLength = 0;
 size_t i = 0;
@@ -181,10 +181,10 @@
 * out_end = * out_start + contentLength;
 
 if (in_bufferEnd < * out_end)
- return FALSE;
+ return false;
 
 * out_nextStart = * out_end;
- return TRUE;
+ return true;
 }
 
 /**
@@ -197,7 +197,7 @@
 & lengthStart, & content->type);
 
 if (! typeOk)
- return FALSE;
+ return false;
 
 content->bufferEnd = data->bufferEnd;
 return der_read_content_length (lengthStart, data->bufferEnd,
@@ -216,7 +216,7 @@
 currentContent->bufferEnd, & lengthStart, & nextContent->type);
 
 if (! typeOk)
- return FALSE;
+ return false;
 
 unsigned char * nextContentStart = nullptr;
 return der_read_content_length (lengthStart, currentContent->bufferEnd,
@@ -250,26 +250,26 @@
 // Walk through certificate content until we reach subject field.
 
 // certificate
- g_return_val_if_fail (der_read_content (& data, & content), FALSE);
- g_return_val_if_fail (ASNTYPE_SEQUENCE == content.type, FALSE);
+ g_return_val_if_fail (der_read_content (& data, & content), false);
+ g_return_val_if_fail (ASNTYPE_SEQUENCE == content.type, false);
 // tbsCertificate
- g_return_val_if_fail (der_read_content (& content, & content), FALSE);
- g_return_val_if_fail (ASNTYPE_SEQUENCE == content.type, FALSE);
+ g_return_val_if_fail (der_read_content (& content, & content), false);
+ g_return_val_if_fail (ASNTYPE_SEQUENCE == content.type, false);
 // version + serialNumber
- g_return_val_if_fail (der_read_content (& content, & content), FALSE);
- g_return_val_if_fail (ASNTYPE_INTEGER == content.type, FALSE);
+ g_return_val_if_fail (der_read_content (& content, & content), false);
+ g_return_val_if_fail (ASNTYPE_INTEGER == content.type, false);
 // signature
- g_return_val_if_fail (der_read_next (& content, & content), FALSE);
- g_return_val_if_fail (ASNTYPE_SEQUENCE == content.type, FALSE);
+ g_return_val_if_fail (der_read_next (& content, & content), false);
+ g_return_val_if_fail (ASNTYPE_SEQUENCE == content.type, false);
 // issuer
- g_return_val_if_fail (der_read_next (& content, & content), FALSE);
- g_return_val_if_fail (ASNTYPE_SEQUENCE == content.type, FALSE);
+ g_return_val_if_fail (der_read_next (& content, & content), false);
+ g_return_val_if_fail (ASNTYPE_SEQUENCE == content.type, false);
 // validity
- g_return_val_if_fail (der_read_next (& content, & content), FALSE);
- g_return_val_if_fail (ASNTYPE_SEQUENCE == content.type, FALSE);
+ g_return_val_if_fail (der_read_next (& content, & content), false);
+ g_return_val_if_fail (ASNTYPE_SEQUENCE == content.type, false);
 // subject
- g_return_val_if_fail (der_read_next (& content, & content), FALSE);
- g_return_val_if_fail (ASNTYPE_SEQUENCE == content.type, FALSE);
+ g_return_val_if_fail (der_read_next (& content, & content), false);
+ g_return_val_if_fail (ASNTYPE_SEQUENCE == content.type, false);
 
 // Calculate MD5 sum of subject.
 unsigned char md5pword16;
@@ -293,7 +293,7 @@
 * out_hash = hash;
 
 g_free (certDer);
- return TRUE;
+ return true;
 }
 
 /**
@@ -309,12 +309,12 @@
 while (certSigner != nullptr)
 {
 if (ne_ssl_cert_cmp (signer, certSigner) == 0)
- return TRUE;
+ return true;
 
 certSigner = ne_ssl_cert_signedby (certSigner);
 }
 
- return FALSE;
+ return false;
 }
 
 /**
@@ -330,10 +330,10 @@
 ne_ssl_cert_free (signer);
 
 if (signOk)
- return TRUE;
+ return true;
 }
 
- return FALSE;
+ return false;
 }
 
 /**
@@ -356,12 +356,12 @@
 g_free (certPath);
 
 if (signOk)
- return TRUE;
+ return true;
 
 certId ++;
 }
 
- return FALSE;
+ return false;
 }
 
 /**

audacious-plugins-4.4.1.tar.bz2/src/neon/meson.build Added

audacious-plugins-3.6.2-gtk3.tar.bz2/src/neon/neon.cc -> audacious-plugins-4.4.1.tar.bz2/src/neon/neon.cc Changed

@@ -39,6 +39,11 @@
 #include <ne_uri.h>
 #include <ne_utils.h>
 
+#ifdef _WIN32
+#include <windows.h>
+#include <wincrypt.h>
+#endif
+
 #include "cert_verification.h"
 
 #define NEON_NETBLKSIZE (4096)
@@ -130,7 +135,7 @@
 NeonFile (const char * url);
 ~NeonFile ();
 
- int open_handle (uint64_t startbyte, String * error = nullptr);
+ int open_handle (int64_t startbyte, String * error = nullptr);
 
 protected:
 int64_t fread (void * ptr, int64_t size, int64_t nmemb);
@@ -151,16 +156,21 @@
 ne_uri m_purl = ne_uri (); /* The URL, parsed into a structure */
 
 unsigned char m_redircount = 0; /* Redirect count for the opened URL */
- long m_pos = 0; /* Current position in the stream (number of last byte delivered to the player) */
- unsigned long m_content_start = 0; /* Start position in the stream */
- long m_content_length = -1; /* Total content length, counting from content_start, if known. -1 if unknown */
+ int64_t m_pos = 0; /* Current position in the stream
+ (number of last byte delivered to the player) */
+ int64_t m_content_start = 0; /* Start position in the stream */
+ int64_t m_content_length = -1; /* Total content length, counting from
+ content_start, if known. -1 if unknown */
 bool m_can_ranges = false; /* true if the webserver advertised accept-range: bytes */
- int64_t m_icy_metaint = 0; /* Interval in which the server will send metadata announcements. 0 if no announcments */
+ int64_t m_icy_metaint = 0; /* Interval in which the server will
+ send metadata announcements. 0 if no announcments */
 int64_t m_icy_metaleft = 0; /* Bytes left until the next metadata block */
+ int m_icy_len = 0; /* Bytes in current metadata block */
 
 bool m_eof = false;
 
 RingBuf<char> m_rb; /* Ringbuffer for our data */
+ Index<char> m_icy_buf; /* Buffer for ICY metadata */
 icy_metadata m_icy_metadata; /* Current ICY metadata */
 
 ne_session * m_session = nullptr;
@@ -172,10 +182,10 @@
 void kill_reader ();
 int server_auth (const char * realm, int attempt, char * username, char * password);
 void handle_headers ();
- int open_request (uint64_t startbyte, String * error);
+ int open_request (int64_t startbyte, String * error);
 FillBufferResult fill_buffer ();
 void reader ();
- int64_t try_fread (void * ptr, int64_t size, int64_t nmemb);
+ int64_t try_fread (void * ptr, int64_t size, int64_t nmemb, bool & data_read);
 
 static int server_auth_callback (void * data, const char * realm, int attempt,
 char * username, char * password)
@@ -188,7 +198,7 @@
 NeonFile::NeonFile (const char * url) :
 m_url (url)
 {
- int buffer_kb = aud_get_int (nullptr, "net_buffer_kb");
+ int buffer_kb = aud_get_int ("net_buffer_kb");
 m_rb.alloc (1024 * aud::clamp (buffer_kb, 16, 1024));
 }
 
@@ -205,27 +215,22 @@
 ne_uri_free (& m_purl);
 }
 
-static bool neon_strcmp (const char * str, const char * cmp)
-{
- return ! g_ascii_strncasecmp (str, cmp, strlen (cmp));
-}
-
 static void add_icy (struct icy_metadata * m, const char * name, const char * value)
 {
- if (neon_strcmp (name, "StreamTitle"))
+ if (str_has_prefix_nocase (name, "StreamTitle"))
 {
 AUDDBG ("Found StreamTitle: %s\n", value);
 m->stream_title = String (str_to_utf8 (value, -1));
 }
 
- if (neon_strcmp (name, "StreamUrl"))
+ if (str_has_prefix_nocase (name, "StreamUrl"))
 {
 AUDDBG ("Found StreamUrl: %s\n", value);
 m->stream_url = String (str_to_utf8 (value, -1));
 }
 }
 
-static void parse_icy (struct icy_metadata * m, char * metadata, size_t len)
+static void parse_icy (struct icy_metadata * m, char * metadata, int len)
 {
 enum TagReadState
 {
@@ -239,7 +244,7 @@
 
 char * p = metadata;
 char * tstart = metadata;
- size_t pos = 1;
+ int pos = 1;
 
 char nameNEON_ICY_BUFSIZE;
 char valueNEON_ICY_BUFSIZE;
@@ -365,7 +370,7 @@
 {
 AUDDBG ("HEADER: %s: %s\n", name, value);
 
- if (neon_strcmp (name, "accept-ranges"))
+ if (str_has_prefix_nocase (name, "accept-ranges"))
 {
 /* The server advertises range capability. we need "bytes" */
 if (strstr (value, "bytes"))
@@ -374,50 +379,50 @@
 m_can_ranges = true;
 }
 }
- else if (neon_strcmp (name, "content-length"))
+ else if (str_has_prefix_nocase (name, "content-length"))
 {
 /* The server sent us the content length. Parse and store. */
 char * endptr;
- long len = strtol (value, & endptr, 10);
+ int64_t len = strtoll (value, & endptr, 10);
 
 if (value0 && ! endptr0 && len >= 0)
 {
 /* Valid data. */
- AUDDBG ("Content length as advertised by server: %ld\n", len);
+ AUDDBG ("Content length as advertised by server: %" PRId64 "\n", len);
 m_content_length = len;
 }
 else
 AUDERR ("Invalid content length header: %s\n", value);
 }
- else if (neon_strcmp (name, "content-type"))
+ else if (str_has_prefix_nocase (name, "content-type"))
 {
 /* The server sent us a content type. Save it for later */
 AUDDBG ("Content-Type: %s\n", value);
 m_icy_metadata.stream_contenttype = String (str_to_utf8 (value, -1));
 }
- else if (neon_strcmp (name, "icy-metaint"))
+ else if (str_has_prefix_nocase (name, "icy-metaint"))
 {
 /* The server sent us a ICY metaint header. Parse and store. */
 char * endptr;
- long len = strtol (value, & endptr, 10);
+ int64_t len = strtoll (value, & endptr, 10);
 
 if (value0 && ! endptr0 && len > 0)
 {
 /* Valid data */
- AUDDBG ("ICY MetaInt as advertised by server: %ld\n", len);
+ AUDDBG ("ICY MetaInt as advertised by server: %" PRId64 "\n", len);
 m_icy_metaint = len;
 m_icy_metaleft = len;
 }
 else
 AUDERR ("Invalid ICY MetaInt header: %s\n", value);
 }
- else if (neon_strcmp (name, "icy-name"))
+ else if (str_has_prefix_nocase (name, "icy-name"))
 {
 /* The server sent us a ICY name. Save it for later */
 AUDDBG ("ICY stream name: %s\n", value);
 m_icy_metadata.stream_name = String (value);
 }
- else if (neon_strcmp (name, "icy-br"))
+ else if (str_has_prefix_nocase (name, "icy-br"))
 {
 /* The server sent us a bitrate. We might want to use it. */
 AUDDBG ("ICY bitrate: %d\n", atoi (value));
@@ -429,16 +434,16 @@
 static int neon_proxy_auth_cb (void * userdata, const char * realm, int attempt,
 char * username, char * password)
 {
- String value = aud_get_str (nullptr, "proxy_user");
+ String value = aud_get_str ("proxy_user");
 g_strlcpy (username, value, NE_ABUFSIZ);
 
- value = aud_get_str (nullptr, "proxy_pass");
+ value = aud_get_str ("proxy_pass");
 g_strlcpy (password, value, NE_ABUFSIZ);
 
 return attempt;
 }
 
-int NeonFile::open_request (uint64_t startbyte, String * error)
+int NeonFile::open_request (int64_t startbyte, String * error)
 {
 int ret;
 const ne_status * status;
@@ -453,9 +458,9 @@
 m_request = ne_request_create (m_session, "GET", m_purl.path);
 
 if (startbyte > 0)
- ne_print_request_header (m_request, "Range", "bytes=%" PRIu64 "-", startbyte);
+ ne_add_request_header (m_request, "Range", str_printf ("bytes=%" PRIu64 "-", startbyte));
 
- ne_print_request_header (m_request, "Icy-MetaData", "1");
+ ne_add_request_header (m_request, "Icy-MetaData", "1");
 
 /* Try to connect to the server. */
 AUDDBG ("<%p> Connecting...\n", this);
@@ -544,19 +549,59 @@
 return -1;
 }
 
-int NeonFile::open_handle (uint64_t startbyte, String * error)
+#ifdef _WIN32
+static void trust_win32_root_certs (ne_session * m_session)
+{
+ auto store = CertOpenSystemStore (0, "ROOT");
+ if (! store)
+ return;
+
+ const CERT_CONTEXT * ctx = NULL;
+ while ((ctx = CertEnumCertificatesInStore (store, ctx)))
+ {
+ char * enc = g_base64_encode (ctx->pbCertEncoded, ctx->cbCertEncoded);
+ ne_ssl_certificate * cert = ne_ssl_cert_import (enc);
+ if (cert)
+ {
+ ne_ssl_trust_cert (m_session, cert);
+ ne_ssl_cert_free (cert);
+ }
+ g_free (enc);
+ }
+
+ CertCloseStore (store, 0);
+}
+#endif
+
+int NeonFile::open_handle (int64_t startbyte, String * error)
 {
 int ret;
 String proxy_host;
 int proxy_port = 0;
+ String proxy_user (""); // ne_session_socks_proxy requires non NULL user and password
+ String proxy_pass ("");
+ bool socks_proxy = false;
+ ne_sock_sversion socks_type = NE_SOCK_SOCKSV4A;
 
- bool use_proxy = aud_get_bool (nullptr, "use_proxy");
- bool use_proxy_auth = aud_get_bool (nullptr, "use_proxy_auth");
+ bool use_proxy = aud_get_bool ("use_proxy");
+ bool use_proxy_auth = aud_get_bool ("use_proxy_auth");
 
 if (use_proxy)
 {
- proxy_host = aud_get_str (nullptr, "proxy_host");
- proxy_port = aud_get_int (nullptr, "proxy_port");
+ proxy_host = aud_get_str ("proxy_host");
+ proxy_port = aud_get_int ("proxy_port");
+ socks_proxy = aud_get_bool ("socks_proxy");
+
+ if (use_proxy_auth)
+ {
+ proxy_user = aud_get_str ("proxy_user");
+ proxy_pass = aud_get_str ("proxy_pass");
+ }
+
+ if (socks_proxy)
+ {
+ socks_type = aud_get_int ("socks_type") == 0 ? NE_SOCK_SOCKSV4A : NE_SOCK_SOCKSV5;
+ }
 }
 
 m_redircount = 0;
@@ -592,7 +637,14 @@
 if (use_proxy)
 {
 AUDDBG ("<%p> Using proxy: %s:%d\n", this, (const char *) proxy_host, proxy_port);
- ne_session_proxy (m_session, proxy_host, proxy_port);
+ if (socks_proxy)
+ {
+ ne_session_socks_proxy (m_session, socks_type, proxy_host, proxy_port, proxy_user, proxy_pass);
+ }
+ else
+ {
+ ne_session_proxy (m_session, proxy_host, proxy_port);
+ }
 
 if (use_proxy_auth)
 {
@@ -605,6 +657,9 @@
 if (! strcmp ("https", m_purl.scheme))
 {
 ne_ssl_trust_default_ca (m_session);
+#ifdef _WIN32
+ trust_win32_root_certs (m_session);
+#endif
 ne_ssl_set_verify (m_session,
 neon_vfs_verify_environment_ssl_certs, m_session);
 }
@@ -733,7 +788,7 @@
 return file;
 }
 
-int64_t NeonFile::try_fread (void * ptr, int64_t size, int64_t nmemb)
+int64_t NeonFile::try_fread (void * ptr, int64_t size, int64_t nmemb, bool & data_read)
 {
 if (! m_request)
 {
@@ -852,7 +907,9 @@
 /* Deliver data from the buffer */
 pthread_mutex_lock (& m_reader_status.mutex);
 
- if (! m_rb.len ())
+ if (m_rb.len ())
+ data_read = true;
+ else
 {
 /* The buffer is still empty, we can deliver no data! */
 AUDERR ("<%p> Buffer still underrun, fatal.\n", this);
@@ -866,31 +923,27 @@
 {
 if (! m_icy_metaleft)
 {
- /* The next data in the buffer is a ICY metadata announcement.
- * Get the length byte */
- unsigned char icy_metalen = m_rb.head ();
- m_rb.pop ();
-
- /* We need enough data in the buffer to
- * a) Read the complete ICY metadata block
- * b) deliver at least one byte to the reader */
- AUDDBG ("<%p> Expecting %d bytes of ICY metadata\n", this, (icy_metalen*16));
-
- if (m_rb.len () < icy_metalen * 16 + size)
+ if (! m_icy_len)
 {
- /* There is not enough data. We do not have much choice at this point,
- * so we'll deliver the metadata as normal data to the reader and
- * hope for the best. */
- AUDERR ("<%p> Buffer underrun when reading metadata. Expect "
- "audio degradation\n", this);
- m_icy_metaleft = m_icy_metaint + icy_metalen * 16;
+ /* The next data in the buffer is a ICY metadata announcement.
+ * Get the length byte */
+ m_icy_len = 16 * (unsigned char) m_rb.head ();
+ m_rb.pop ();
+
+ AUDDBG ("<%p> Expecting %d bytes of ICY metadata\n", this, m_icy_len);
 }
- else
+
+ if (m_icy_buf.len () < m_icy_len)
+ m_rb.move_out (m_icy_buf, -1, aud::min (m_icy_len - m_icy_buf.len (), m_rb.len ()));
+
+ if (m_icy_buf.len () >= m_icy_len)
 {
 /* Grab the metadata from the buffer and send it to the parser */
- char icy_metadataNEON_ICY_BUFSIZE;
- m_rb.move_out (icy_metadata, icy_metalen * 16);
- parse_icy (& m_icy_metadata, icy_metadata, icy_metalen * 16);
+ parse_icy (& m_icy_metadata, m_icy_buf.begin (), m_icy_buf.len ());
+
+ /* Reset countdown to next announcement */
+ m_icy_buf.clear ();
+ m_icy_len = 0;
 m_icy_metaleft = m_icy_metaint;
 }
 }
@@ -927,12 +980,17 @@
 * must call it repeatedly until we have read the full request. */
 int64_t NeonFile::fread (void * buffer, int64_t size, int64_t count)
 {
- size_t total = 0, part;
+ int64_t total = 0;
 
 AUDDBG ("<%p> fread %d x %d\n", this, (int) size, (int) count);
 
- while (count > 0 && (part = try_fread (buffer, size, count)) > 0)
+ while (count > 0)
 {
+ bool data_read = false;
+ int64_t part = try_fread (buffer, size, count, data_read);
+ if (! data_read)
+ break;
+
 buffer = (char *) buffer + size * part;
 total += part;
 count -= part;
@@ -952,7 +1010,7 @@
 
 int64_t NeonFile::ftell ()
 {
- AUDDBG ("<%p> Current file position: %ld\n", this, m_pos);
+ AUDDBG ("<%p> Current file position: %" PRId64 "\n", this, m_pos);
 
 return m_pos;
 }
@@ -978,7 +1036,7 @@
 
 int NeonFile::fseek (int64_t offset, VFSSeekType whence)
 {
- AUDDBG ("<%p> Seek requested: offset %ld, whence %d\n", this, offset, whence);
+ AUDDBG ("<%p> Seek requested: offset %" PRId64 ", whence %d\n", this, offset, whence);
 
 /* To seek to a non-zero offset, two things must be satisfied:
 * - the server must advertise a content-length
@@ -1018,7 +1076,7 @@
 return -1;
 }
 
- AUDDBG ("<%p> Position to seek to: %ld, current: %ld\n", this, newpos, m_pos);
+ AUDDBG ("<%p> Position to seek to: %" PRId64 ", current: %" PRId64 "\n", this, newpos, m_pos);
 
 if (newpos < 0)
 {
@@ -1028,8 +1086,8 @@
 
 if (newpos && newpos >= content_length)
 {
- AUDERR ("<%p> Can not seek beyond end of stream (%ld >= %ld)\n",
- this, (long) newpos, (long) content_length);
+ AUDERR ("<%p> Can not seek beyond end of stream (%" PRId64 " >= %"
+ PRId64 "\n", this, newpos, content_length);
 return -1;
 }
 
@@ -1057,6 +1115,8 @@
 }
 
 m_rb.discard ();
+ m_icy_buf.clear ();
+ m_icy_len = 0;
 
 if (open_handle (newpos) != 0)
 {

audacious-plugins-3.6.2-gtk3.tar.bz2/src/notify/Makefile -> audacious-plugins-4.4.1.tar.bz2/src/notify/Makefile Changed

audacious-plugins-3.6.2-gtk3.tar.bz2/src/notify/event.cc -> audacious-plugins-4.4.1.tar.bz2/src/notify/event.cc Changed

@@ -19,20 +19,30 @@
 */
 
 #include "event.h"
+#include "osd.h"
 
 #include <libaudcore/drct.h>
 #include <libaudcore/i18n.h>
 #include <libaudcore/runtime.h>
 #include <libaudcore/audstrings.h>
 #include <libaudcore/hook.h>
-#include <libaudgui/libaudgui-gtk.h>
 
-#include "osd.h"
+#ifdef USE_GTK
+#include <libaudgui/libaudgui.h>
+#include <libaudgui/libaudgui-gtk.h>
+#endif
+#ifdef USE_QT
+#include <libaudqt/libaudqt.h>
+#endif
 
 static String last_title, last_message;
 static GdkPixbuf * last_pixbuf = nullptr;
 
-static void clear_cache (void)
+#ifdef USE_QT
+static QImage qimage;
+#endif
+
+static void clear_cache ()
 {
 last_title = String ();
 last_message = String ();
@@ -43,34 +53,57 @@
 last_pixbuf = nullptr;
 }
 
+#ifdef USE_QT
+ qimage = QImage ();
+#endif
+
 osd_hide ();
 }
 
-static gboolean get_album_art (void)
+static void get_album_art ()
 {
 if (last_pixbuf)
- return FALSE;
+ return;
 
- last_pixbuf = audgui_pixbuf_request_current ();
- if (! last_pixbuf)
- return FALSE;
+#ifdef USE_GTK
+ if (aud_get_mainloop_type () == MainloopType::GLib)
+ {
+ AudguiPixbuf pb = audgui_pixbuf_request_current ();
+ if (pb)
+ audgui_pixbuf_scale_within (pb, audgui_get_dpi ());
 
- audgui_pixbuf_scale_within (& last_pixbuf, 96);
- return TRUE;
+ last_pixbuf = pb.release ();
+ }
+#endif
+#ifdef USE_QT
+ if (aud_get_mainloop_type () == MainloopType::Qt)
+ {
+ QImage image = audqt::art_request_current (96, 96, false).toImage ();
+ if (! image.isNull ())
+ qimage = image.convertToFormat (QImage::Format_RGBA8888);
+
+ // convert QImage to GdkPixbuf.
+ // note that the GdkPixbuf shares the same internal image data.
+ if (! qimage.isNull ())
+ last_pixbuf = gdk_pixbuf_new_from_data (qimage.bits (),
+ GDK_COLORSPACE_RGB, true, 8, qimage.width (), qimage.height (),
+ qimage.bytesPerLine (), nullptr, nullptr);
+ }
+#endif
 }
 
-static void show_stopped (void)
+static void show_stopped ()
 {
 osd_show (_("Stopped"), _("Audacious is not playing."), "audacious", nullptr);
 }
 
-static void show_playing (void)
+static void show_playing ()
 {
 if (last_title && last_message)
 osd_show (last_title, last_message, "audio-x-generic", last_pixbuf);
 }
 
-static void playback_update (void)
+static void playback_update ()
 {
 Tuple tuple = aud_drct_get_tuple ();
 String title = tuple.get_str (Tuple::Title);
@@ -100,19 +133,13 @@
 show_playing ();
 }
 
-static void art_ready (void)
-{
- if (aud_drct_get_playing () && get_album_art ())
- show_playing ();
-}
-
-static void playback_paused (void)
+static void playback_paused ()
 {
 if (aud_get_bool ("notify", "resident"))
 show_playing ();
 }
 
-static void playback_stopped (void)
+static void playback_stopped ()
 {
 clear_cache ();
 
@@ -120,7 +147,7 @@
 show_stopped ();
 }
 
-static void force_show (void)
+static void force_show ()
 {
 if (aud_drct_get_playing ())
 show_playing ();
@@ -128,8 +155,17 @@
 show_stopped ();
 }
 
-void event_init (void)
+void event_init ()
 {
+#ifdef USE_GTK
+ if (aud_get_mainloop_type () == MainloopType::GLib)
+ audgui_init ();
+#endif
+#ifdef USE_QT
+ if (aud_get_mainloop_type () == MainloopType::Qt)
+ audqt::init ();
+#endif
+
 if (aud_drct_get_ready ())
 playback_update ();
 else
@@ -138,7 +174,6 @@
 hook_associate ("playback begin", (HookFunction) clear_cache, nullptr);
 hook_associate ("playback ready", (HookFunction) playback_update, nullptr);
 hook_associate ("tuple change", (HookFunction) playback_update, nullptr);
- hook_associate ("current art ready", (HookFunction) art_ready, nullptr);
 hook_associate ("playback pause", (HookFunction) playback_paused, nullptr);
 hook_associate ("playback unpause", (HookFunction) playback_paused, nullptr);
 hook_associate ("playback stop", (HookFunction) playback_stopped, nullptr);
@@ -146,12 +181,11 @@
 hook_associate ("aosd toggle", (HookFunction) force_show, nullptr);
 }
 
-void event_uninit (void)
+void event_uninit ()
 {
 hook_dissociate ("playback begin", (HookFunction) clear_cache);
 hook_dissociate ("playback ready", (HookFunction) playback_update);
 hook_dissociate ("tuple change", (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);
@@ -159,4 +193,13 @@
 hook_dissociate ("aosd toggle", (HookFunction) force_show);
 
 clear_cache ();
+
+#ifdef USE_GTK
+ if (aud_get_mainloop_type () == MainloopType::GLib)
+ audgui_cleanup ();
+#endif
+#ifdef USE_QT
+ if (aud_get_mainloop_type () == MainloopType::Qt)
+ audqt::cleanup ();
+#endif
 }

audacious-plugins-3.6.2-gtk3.tar.bz2/src/notify/event.h -> audacious-plugins-4.4.1.tar.bz2/src/notify/event.h Changed

audacious-plugins-4.4.1.tar.bz2/src/notify/meson.build Added

audacious-plugins-3.6.2-gtk3.tar.bz2/src/notify/notify.cc -> audacious-plugins-4.4.1.tar.bz2/src/notify/notify.cc Changed

@@ -18,15 +18,12 @@
 * along with this program; if not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <gtk/gtk.h>
-
 #include <libnotify/notify.h>
 
 #include <libaudcore/plugin.h>
 #include <libaudcore/preferences.h>
 #include <libaudcore/i18n.h>
 #include <libaudcore/runtime.h>
-#include <libaudgui/libaudgui.h>
 
 #include "event.h"
 
@@ -75,20 +72,18 @@
 "actions", "TRUE",
 "resident", "FALSE",
 "album", "TRUE",
+ "custom_duration_enabled", "FALSE",
+ "custom_duration", "1",
 nullptr
 };
 
 bool NotifyPlugin::init ()
 {
- if (aud_get_mainloop_type () != MainloopType::GLib)
- return false;
-
 aud_config_set_defaults ("notify", defaults);
 
 if (! notify_init ("Audacious"))
 return false;
 
- audgui_init ();
 event_init ();
 return true;
 }
@@ -96,7 +91,6 @@
 void NotifyPlugin::cleanup ()
 {
 event_uninit ();
- audgui_cleanup ();
 notify_uninit ();
 }
 
@@ -112,7 +106,11 @@
 WidgetCheck (N_("Always show notification"),
 WidgetBool ("notify", "resident", reinit)),
 WidgetCheck (N_("Include album name in notification"),
- WidgetBool ("notify", "album", reinit))
+ WidgetBool ("notify", "album", reinit)),
+ WidgetCheck (N_("Custom notification duration:"),
+ WidgetBool ("notify", "custom_duration_enabled")),
+ WidgetSpin (nullptr,
+ WidgetInt ("notify", "custom_duration"), {1, 100, 1, N_("seconds")}, WIDGET_CHILD)
 };
 
 const PluginPreferences NotifyPlugin::prefs = {{widgets}};

audacious-plugins-3.6.2-gtk3.tar.bz2/src/notify/osd.cc -> audacious-plugins-4.4.1.tar.bz2/src/notify/osd.cc Changed

@@ -22,30 +22,46 @@
 
 #include <libnotify/notify.h>
 
+#define AUD_GLIB_INTEGRATION
 #include <libaudcore/drct.h>
 #include <libaudcore/i18n.h>
 #include <libaudcore/interface.h>
 #include <libaudcore/runtime.h>
 
-static void show_cb (void)
+static void show_cb ()
 {
- aud_ui_show (TRUE);
+ aud_ui_show (true);
+}
+
+static int get_notification_timeout (bool resident)
+{
+ if (resident)
+ {
+ return NOTIFY_EXPIRES_NEVER;
+ }
+ else if (aud_get_bool("notify", "custom_duration_enabled"))
+ {
+ return aud_get_int("notify", "custom_duration") * 1000;
+ }
+ else
+ {
+ return NOTIFY_EXPIRES_DEFAULT;
+ }
 }
 
 static void osd_setup (NotifyNotification *notification)
 {
- gboolean resident = aud_get_bool ("notify", "resident");
+ bool 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, "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_notification_set_urgency (notification, NOTIFY_URGENCY_LOW);
- notify_notification_set_timeout (notification, resident ?
- NOTIFY_EXPIRES_NEVER : NOTIFY_EXPIRES_DEFAULT);
+ notify_notification_set_timeout (notification, get_notification_timeout (resident));
 }
 
 void osd_setup_buttons (NotifyNotification *notification)
@@ -58,8 +74,8 @@
 notify_notification_add_action (notification, "default", _("Show"),
 NOTIFY_ACTION_CALLBACK (show_cb), nullptr, nullptr);
 
- gboolean playing = aud_drct_get_playing ();
- gboolean paused = aud_drct_get_paused ();
+ bool playing = aud_drct_get_playing ();
+ bool paused = aud_drct_get_paused ();
 
 if (playing && ! paused)
 notify_notification_add_action (notification, "media-playback-pause",
@@ -78,7 +94,7 @@
 void osd_show (const char * title, const char * _message, const char * icon,
 GdkPixbuf * pixbuf)
 {
- char * message = g_markup_escape_text (_message, -1);
+ CharPtr message (g_markup_escape_text (_message, -1));
 
 if (pixbuf)
 icon = nullptr;
@@ -96,11 +112,9 @@
 
 osd_setup_buttons (notification);
 notify_notification_show (notification, nullptr);
-
- g_free (message);
 }
 
-void osd_hide (void)
+void osd_hide ()
 {
 if (! notification)
 return;

audacious-plugins-3.6.2-gtk3.tar.bz2/src/notify/osd.h -> audacious-plugins-4.4.1.tar.bz2/src/notify/osd.h Changed

audacious-plugins-4.4.1.tar.bz2/src/openmpt Added

audacious-plugins-4.4.1.tar.bz2/src/openmpt/Makefile Added

audacious-plugins-4.4.1.tar.bz2/src/openmpt/meson.build Added

audacious-plugins-4.4.1.tar.bz2/src/openmpt/mpt.cc Added

@@ -0,0 +1,165 @@
+/*-
+ * Copyright (c) 2015-2019 Chris Spiegel
+ * All rights reserved.
+ *
+ * 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 and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR 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 AUTHOR 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.
+ */
+
+#include <libaudcore/i18n.h>
+#include <libaudcore/plugin.h>
+#include <libaudcore/preferences.h>
+#include <libaudcore/runtime.h>
+
+#include "mptwrap.h"
+
+static bool force_apply = false;
+
+static constexpr const char *CFG_SECTION = "openmpt";
+static constexpr const char *SETTING_STEREO_SEPARATION = "stereo_separation";
+static constexpr const char *SETTING_INTERPOLATOR = "interpolator";
+
+class MPTPlugin : public InputPlugin
+{
+public:
+ static const char about;
+ static const char *const exts;
+ static const PreferencesWidget widgets;
+ static const PluginPreferences prefs;
+
+ static constexpr PluginInfo info =
+ {
+ N_("OpenMPT (Module Player)"),
+ PACKAGE,
+ about,
+ &prefs,
+ };
+
+ static constexpr auto iinfo = InputInfo(0)
+ .with_exts(exts);
+
+ constexpr MPTPlugin() : InputPlugin(info, iinfo) { }
+
+ bool init()
+ {
+ static constexpr const char * defaults =
+ {
+ SETTING_STEREO_SEPARATION, aud::numeric_string<MPTWrap::default_stereo_separation>::str,
+ SETTING_INTERPOLATOR, aud::numeric_string<MPTWrap::default_interpolator>::str,
+ nullptr,
+ };
+
+ aud_config_set_defaults(CFG_SECTION, defaults);
+
+ return true;
+ }
+
+ bool is_our_file(const char *filename, VFSFile &file)
+ {
+ MPTWrap mpt;
+ return mpt.open(file);
+ }
+
+ bool read_tag(const char *filename, VFSFile &file, Tuple &tuple, Index<char> *)
+ {
+ MPTWrap mpt;
+ if (!mpt.open(file))
+ return false;
+
+ tuple.set_filename(filename);
+ tuple.set_format(mpt.format(), mpt.channels(), mpt.rate(), 0);
+
+ tuple.set_int(Tuple::Length, mpt.duration());
+ tuple.set_str(Tuple::Title, mpt.title());
+
+ return true;
+ }
+
+ bool play(const char *filename, VFSFile &file)
+ {
+ MPTWrap mpt;
+ if (!mpt.open(file))
+ return false;
+
+ force_apply = true;
+
+ open_audio(FMT_FLOAT, mpt.rate(), mpt.channels());
+
+ while (!check_stop())
+ {
+ float buffer16384;
+ int seek_value = check_seek();
+
+ if (seek_value >= 0)
+ mpt.seek(seek_value);
+
+ if (force_apply)
+ {
+ mpt.set_interpolator(aud_get_int(CFG_SECTION, SETTING_INTERPOLATOR));
+ mpt.set_stereo_separation(aud_get_int(CFG_SECTION, SETTING_STEREO_SEPARATION));
+ force_apply = false;
+ }
+
+ auto n = mpt.read(buffer, aud::n_elems(buffer));
+ if (n == 0)
+ break;
+
+ write_audio(buffer, n * sizeof buffer0);
+ }
+
+ return true;
+ }
+};
+
+const char MPTPlugin::about = N_("Module player based on libopenmpt\n\nWritten by: Chris Spiegel <cspiegel@gmail.com>");
+
+const char *const MPTPlugin::exts =
+{
+ "669", "amf", "ams", "dbm", "digi", "dmf", "dsm", "far", "gdm", "ice", "imf",
+ "it", "j2b", "m15", "mdl", "med", "mmcmp", "mms", "mo3", "mod", "mptm", "mt2",
+ "mtm", "nst", "okt", "plm", "ppm", "psm", "pt36", "ptm", "s3m", "sfx", "sfx2",
+ "st26", "stk", "stm", "ult", "umx", "wow", "xm", "xpk",
+ nullptr
+};
+
+static void values_changed()
+{
+ force_apply = true;
+}
+
+const PreferencesWidget MPTPlugin::widgets =
+{
+ WidgetSpin(
+ N_("Stereo separation:"),
+ WidgetInt(CFG_SECTION, SETTING_STEREO_SEPARATION, values_changed),
+ { 0.0, 200.0, 1.0, N_("% (0=mono, 100=default, 200=full)") }
+ ),
+
+ WidgetCombo(
+ N_("Interpolation:"),
+ WidgetInt(CFG_SECTION, SETTING_INTERPOLATOR, values_changed),
+ { MPTWrap::interpolators }
+ )
+};
+
+const PluginPreferences MPTPlugin::prefs = {{ widgets }};
+
+EXPORT MPTPlugin aud_plugin_instance;

audacious-plugins-4.4.1.tar.bz2/src/openmpt/mptwrap.cc Added

@@ -0,0 +1,120 @@
+/*-
+ * Copyright (c) 2015-2019 Chris Spiegel
+ * All rights reserved.
+ *
+ * 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 and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR 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 AUTHOR 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.
+ */
+
+#include <algorithm>
+#include <iterator>
+
+#define WANT_VFS_STDIO_COMPAT
+#include <libopenmpt/libopenmpt_version.h>
+#include "mptwrap.h"
+
+constexpr ComboItem MPTWrap::interpolators;
+constexpr openmpt_stream_callbacks MPTWrap::callbacks;
+
+static String to_aud_str(const char * str)
+{
+ String aud_str(str);
+ openmpt_free_string(str);
+ return aud_str;
+}
+
+bool MPTWrap::open(VFSFile &file)
+{
+#if OPENMPT_API_VERSION_MAJOR <= 0 && OPENMPT_API_VERSION_MINOR < 3
+ auto m = openmpt_module_create(callbacks, &file, openmpt_log_func_silent,
+ nullptr, nullptr);
+#else
+ auto m = openmpt_module_create2(callbacks, &file, openmpt_log_func_silent,
+ nullptr, nullptr, nullptr, nullptr, nullptr, nullptr);
+#endif
+
+ if (m == nullptr)
+ return false;
+
+ mod.capture(m);
+
+ openmpt_module_select_subsong(mod.get(), -1);
+
+ m_duration = openmpt_module_get_duration_seconds(mod.get()) * 1000;
+ m_title = to_aud_str(openmpt_module_get_metadata(mod.get(), "title"));
+ m_format = to_aud_str(openmpt_module_get_metadata(mod.get(), "type_long"));
+
+ return true;
+}
+
+size_t MPTWrap::stream_read(void *instance, void *buf, size_t n)
+{
+ return VFS(instance)->fread(buf, 1, n);
+}
+
+int MPTWrap::stream_seek(void *instance, int64_t offset, int whence)
+{
+ VFSSeekType w = to_vfs_seek_type(whence);
+ return VFS(instance)->fseek(offset, w) >= 0 ? 0 : -1;
+}
+
+int64_t MPTWrap::stream_tell(void *instance)
+{
+ return VFS(instance)->ftell();
+}
+
+bool MPTWrap::is_valid_interpolator(int interpolator_value)
+{
+ return std::any_of(std::begin(interpolators), std::end(interpolators),
+ interpolator_value(const ComboItem &ci) { return ci.num == interpolator_value; });
+}
+
+void MPTWrap::set_interpolator(int interpolator_value)
+{
+ if (is_valid_interpolator(interpolator_value))
+ openmpt_module_set_render_param(mod.get(),
+ OPENMPT_MODULE_RENDER_INTERPOLATIONFILTER_LENGTH, interpolator_value);
+}
+
+bool MPTWrap::is_valid_stereo_separation(int separation)
+{
+ return separation >= 0 && separation <= 200;
+}
+
+void MPTWrap::set_stereo_separation(int separation)
+{
+ if (is_valid_stereo_separation(separation))
+ openmpt_module_set_render_param(mod.get(),
+ OPENMPT_MODULE_RENDER_STEREOSEPARATION_PERCENT, separation);
+}
+
+int64_t MPTWrap::read(float *buf, int64_t bufcnt)
+{
+ auto n = openmpt_module_read_interleaved_float_stereo(mod.get(), rate(),
+ bufcnt / channels(), buf);
+
+ return n * channels();
+}
+
+void MPTWrap::seek(int pos)
+{
+ openmpt_module_set_position_seconds(mod.get(), pos / 1000.0);
+}

audacious-plugins-4.4.1.tar.bz2/src/openmpt/mptwrap.h Added

@@ -0,0 +1,88 @@
+/*-
+ * Copyright (c) 2015-2019 Chris Spiegel
+ * All rights reserved.
+ *
+ * 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 and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR 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 AUTHOR 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.
+ */
+
+#ifndef AUDACIOUS_MPT_MPTWRAP_H
+#define AUDACIOUS_MPT_MPTWRAP_H
+
+#include <libaudcore/i18n.h>
+#include <libaudcore/preferences.h>
+#include <libaudcore/vfs.h>
+
+#include <libopenmpt/libopenmpt.h>
+#include <libopenmpt/libopenmpt_stream_callbacks_file.h>
+
+class MPTWrap
+{
+public:
+ static constexpr int interp_none = 1;
+ static constexpr int interp_linear = 2;
+ static constexpr int interp_cubic = 4;
+ static constexpr int interp_windowed = 8;
+
+ static constexpr int default_interpolator = interp_windowed;
+ static constexpr int default_stereo_separation = 100;
+
+ static constexpr ComboItem interpolators =
+ {
+ {N_("None"), interp_none},
+ {N_("Linear"), interp_linear},
+ {N_("Cubic"), interp_cubic},
+ {N_("Windowed sinc"), interp_windowed}
+ };
+
+ static bool is_valid_interpolator(int);
+ void set_interpolator(int);
+
+ static bool is_valid_stereo_separation(int);
+ void set_stereo_separation(int);
+
+ bool open(VFSFile &);
+ int64_t read(float *, int64_t);
+ void seek(int pos);
+
+ static constexpr int rate() { return 48000; }
+ static constexpr int channels() { return 2; }
+
+ int duration() const { return m_duration; }
+ const String & title() const { return m_title; }
+ const String & format() const { return m_format; }
+
+private:
+ static size_t stream_read(void *, void *, size_t);
+ static int stream_seek(void *, int64_t, int);
+ static int64_t stream_tell(void *);
+ static VFSFile *VFS(void *instance) { return reinterpret_cast<VFSFile *>(instance); }
+
+ static constexpr openmpt_stream_callbacks callbacks = { stream_read, stream_seek, stream_tell };
+
+ SmartPtr<openmpt_module, openmpt_module_destroy> mod;
+
+ int m_duration = 0;
+ String m_title;
+ String m_format;
+};
+
+#endif

audacious-plugins-4.4.1.tar.bz2/src/opus Added

audacious-plugins-4.4.1.tar.bz2/src/opus/Makefile Added

audacious-plugins-4.4.1.tar.bz2/src/opus/meson.build Added

audacious-plugins-4.4.1.tar.bz2/src/opus/opus.cc Added

@@ -0,0 +1,347 @@
+/*
+ * Opus Decoder Plugin for Audacious
+ * Copyright 2022 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 <cstdlib>
+#include <cstring>
+
+#include <opus/opusfile.h>
+
+#define WANT_VFS_STDIO_COMPAT
+#include <libaudcore/audstrings.h>
+#include <libaudcore/i18n.h>
+#include <libaudcore/plugin.h>
+#include <libaudcore/runtime.h>
+
+class OpusPlugin : public InputPlugin
+{
+public:
+ static const char about;
+ static const char * const exts;
+ static const char * const mimes;
+
+ static constexpr PluginInfo info = {
+ N_("Opus Decoder"),
+ PACKAGE,
+ about
+ };
+
+ constexpr OpusPlugin() : InputPlugin(info, InputInfo()
+ .with_exts(exts)
+ .with_mimes(mimes)) {}
+
+ bool is_our_file(const char * filename, VFSFile & file);
+ bool read_tag(const char * filename, VFSFile & file, Tuple & tuple,
+ Index<char> * image);
+ bool play(const char * filename, VFSFile & file);
+
+private:
+ static const int pcm_frames = 1024;
+ static const int pcm_bufsize = 2 * pcm_frames;
+ static const int sample_rate = 48000; /* Opus supports 48 kHz only */
+
+ int m_bitrate = 0;
+ int m_channels = 0;
+};
+
+EXPORT OpusPlugin aud_plugin_instance;
+
+static int opcb_read(void * stream, unsigned char * buf, int size)
+{
+ VFSFile * file = static_cast<VFSFile *>(stream);
+ return file->fread(buf, 1, size);
+}
+
+static int opcb_seek(void * stream, opus_int64 offset, int whence)
+{
+ VFSFile * file = static_cast<VFSFile *>(stream);
+ return file->fseek(offset, to_vfs_seek_type(whence));
+}
+
+static opus_int64 opcb_tell(void * stream)
+{
+ VFSFile * file = static_cast<VFSFile *>(stream);
+ return file->ftell();
+}
+
+static OggOpusFile * open_file(VFSFile & file)
+{
+ bool stream = file.fsize() < 0;
+
+ OpusFileCallbacks opus_callbacks = {
+ opcb_read,
+ stream ? nullptr : opcb_seek,
+ stream ? nullptr : opcb_tell,
+ nullptr,
+ };
+
+ return op_open_callbacks(&file, &opus_callbacks, nullptr, 0, nullptr);
+}
+
+static void read_tags(const OpusTags * tags, Tuple & tuple)
+{
+ const char * title = opus_tags_query(tags, "TITLE", 0);
+ const char * artist = opus_tags_query(tags, "ARTIST", 0);
+ const char * album = opus_tags_query(tags, "ALBUM", 0);
+ const char * album_artist = opus_tags_query(tags, "ALBUMARTIST", 0);
+ const char * genre = opus_tags_query(tags, "GENRE", 0);
+ const char * comment = opus_tags_query(tags, "COMMENT", 0);
+ const char * description = opus_tags_query(tags, "DESCRIPTION", 0);
+ const char * music_brainz_id = opus_tags_query(tags, "musicbrainz_trackid", 0);
+ const char * publisher = opus_tags_query(tags, "publisher", 0);
+ const char * catalog_num = opus_tags_query(tags, "CATALOGNUMBER", 0);
+ const char * track = opus_tags_query(tags, "TRACKNUMBER", 0);
+ const char * disc = opus_tags_query(tags, "DISCNUMBER", 0);
+ const char * date = opus_tags_query(tags, "DATE", 0);
+
+ tuple.set_str(Tuple::Title, title);
+ tuple.set_str(Tuple::Artist, artist);
+ tuple.set_str(Tuple::Album, album);
+ tuple.set_str(Tuple::AlbumArtist, album_artist);
+ tuple.set_str(Tuple::Genre, genre);
+ tuple.set_str(Tuple::Comment, comment);
+ tuple.set_str(Tuple::Description, description);
+ tuple.set_str(Tuple::MusicBrainzID, music_brainz_id);
+ tuple.set_str(Tuple::Publisher, publisher);
+ tuple.set_str(Tuple::CatalogNum, catalog_num);
+
+ if (track)
+ tuple.set_int(Tuple::Track, std::atoi(track));
+ if (disc)
+ tuple.set_int(Tuple::Disc, std::atoi(disc));
+ if (date)
+ tuple.set_int(Tuple::Year, std::atoi(date));
+}
+
+static Index<char> read_image_from_tags(const OpusTags * tags,
+ const char * filename)
+{
+ Index<char> data;
+
+ const char * image = opus_tags_query(tags, "METADATA_BLOCK_PICTURE", 0);
+ if (!image)
+ return data;
+
+ OpusPictureTag picture_tag;
+ if (opus_picture_tag_parse(&picture_tag, image) < 0)
+ {
+ AUDERR("Error parsing METADATA_BLOCK_PICTURE in %s.\n", filename);
+ return data;
+ }
+
+ if (picture_tag.format == OP_PIC_FORMAT_JPEG ||
+ picture_tag.format == OP_PIC_FORMAT_PNG ||
+ picture_tag.format == OP_PIC_FORMAT_GIF)
+ {
+ data.insert(reinterpret_cast<const char *>(picture_tag.data), 0,
+ picture_tag.data_length);
+ }
+
+ opus_picture_tag_clear(&picture_tag);
+ return data;
+}
+
+static bool update_tuple(OggOpusFile * opus_file, Tuple & tuple)
+{
+ const OpusTags * tags = op_tags(opus_file, -1);
+ if (!tags)
+ return false;
+
+ String old_title = tuple.get_str(Tuple::Title);
+ const char * new_title = opus_tags_query(tags, "TITLE", 0);
+
+ if (!new_title || (old_title && !std::strcmp(old_title, new_title)))
+ return false;
+
+ read_tags(tags, tuple);
+ return true;
+}
+
+static bool update_replay_gain(OggOpusFile * opus_file,
+ ReplayGainInfo * rg_info)
+{
+ const OpusTags * tags = op_tags(opus_file, -1);
+ if (!tags)
+ return false;
+
+ const char * album_gain = opus_tags_query(tags, "R128_ALBUM_GAIN", 0);
+ const char * track_gain = opus_tags_query(tags, "R128_TRACK_GAIN", 0);
+
+ /* stop if we have no gain values */
+ if (!album_gain && !track_gain)
+ return false;
+
+ /* fill in missing values if we can */
+ if (!album_gain)
+ album_gain = track_gain;
+ if (!track_gain)
+ track_gain = album_gain;
+
+ /* Q7.8 number to float .. 2^8 = 256 */
+ /* EBU-R128 (-23 LUFS) to RG 2.0 (-18 LUFS) .. +5 dB */
+ rg_info->album_gain = str_to_double(album_gain) / 256 + 5.0f;
+ rg_info->track_gain = str_to_double(track_gain) / 256 + 5.0f;
+
+ /* Opus intentionally does not support peak tags */
+ rg_info->album_peak = 0;
+ rg_info->track_peak = 0;
+
+ AUDDBG("Album gain: %s (%f)\n", album_gain, rg_info->album_gain);
+ AUDDBG("Track gain: %s (%f)\n", track_gain, rg_info->track_gain);
+
+ return true;
+}
+
+bool OpusPlugin::is_our_file(const char * filename, VFSFile & file)
+{
+ char buf36;
+
+ if (file.fread(buf, 1, sizeof buf) != sizeof buf)
+ return false;
+
+ if (!std::strncmp(buf, "OggS", 4))
+ {
+ if (!std::strncmp(buf + 28, "OpusHead", 8))
+ return true;
+ }
+
+ return false;
+}
+
+bool OpusPlugin::read_tag(const char * filename, VFSFile & file, Tuple & tuple,
+ Index<char> * image)
+{
+ OggOpusFile * opus_file = open_file(file);
+ if (!opus_file)
+ {
+ AUDERR("Failed to open Opus file\n");
+ return false;
+ }
+
+ m_channels = op_channel_count(opus_file, -1);
+ m_bitrate = op_bitrate(opus_file, -1);
+ tuple.set_format("Opus", m_channels, sample_rate, m_bitrate / 1000);
+
+ ogg_int64_t total_time = op_pcm_total(opus_file, -1);
+ if (total_time > 0)
+ tuple.set_int(Tuple::Length, total_time / (sample_rate / 1000));
+
+ const OpusTags * tags = op_tags(opus_file, -1);
+ if (tags)
+ read_tags(tags, tuple);
+ if (image && tags)
+ *image = read_image_from_tags(tags, filename);
+
+ op_free(opus_file);
+ return true;
+}
+
+bool OpusPlugin::play(const char * filename, VFSFile & file)
+{
+ OggOpusFile * opus_file = open_file(file);
+ if (!opus_file)
+ {
+ AUDERR("Failed to open Opus file\n");
+ return false;
+ }
+
+ Index<float> pcm_out;
+ pcm_out.resize(pcm_bufsize * sizeof(float));
+
+ bool error = false;
+ int last_section = -1;
+ Tuple tuple = get_playback_tuple();
+ ReplayGainInfo rg_info;
+
+ set_stream_bitrate(m_bitrate);
+
+ if (update_tuple(opus_file, tuple))
+ set_playback_tuple(tuple.ref());
+
+ if (update_replay_gain(opus_file, &rg_info))
+ set_replay_gain(rg_info);
+
+ open_audio(FMT_FLOAT, sample_rate, m_channels);
+
+ while (!check_stop())
+ {
+ int seek_value = check_seek();
+
+ if (seek_value >= 0 &&
+ op_pcm_seek(opus_file, seek_value * (sample_rate / 1000)) < 0)
+ {
+ AUDERR("Failed to seek Opus file\n");
+ error = true;
+ break;
+ }
+
+ int current_section = last_section;
+ int bytes = op_read_float(opus_file, pcm_out.begin(), pcm_frames,
+ &current_section);
+ if (bytes == OP_HOLE)
+ continue;
+
+ if (bytes <= 0)
+ break;
+
+ if (update_tuple(opus_file, tuple))
+ set_playback_tuple(tuple.ref());
+
+ if (current_section != last_section)
+ {
+ int channels = op_channel_count(opus_file, -1);
+
+ if (channels != m_channels)
+ {
+ m_channels = channels;
+
+ if (update_replay_gain(opus_file, &rg_info))
+ set_replay_gain(rg_info);
+
+ open_audio(FMT_FLOAT, sample_rate, m_channels);
+ }
+ }
+
+ write_audio(pcm_out.begin(), bytes * m_channels * sizeof(float));
+
+ if (current_section != last_section)
+ {
+ m_bitrate = op_bitrate(opus_file, -1);
+ set_stream_bitrate(m_bitrate);
+
+ last_section = current_section;
+ }
+ }
+
+ op_free(opus_file);
+ return !error;
+}
+
+const char OpusPlugin::about =
+ N_("Opus Decoder Plugin for Audacious\n"
+ "Copyright 2022 Thomas Lange");
+
+const char * const OpusPlugin::exts = {"opus", nullptr};
+
+const char * const OpusPlugin::mimes = {
+ "application/ogg",
+ "audio/ogg",
+ "audio/opus",
+ "audio/x-opus+ogg",
+ nullptr
+};

audacious-plugins-4.4.1.tar.bz2/src/oss4/meson.build Added

audacious-plugins-3.6.2-gtk3.tar.bz2/src/oss4/oss.cc -> audacious-plugins-4.4.1.tar.bz2/src/oss4/oss.cc Changed

@@ -54,7 +54,7 @@
 return oss_hardware_present();
 }
 
-bool OSSPlugin::set_format(int format, int rate, int channels)
+bool OSSPlugin::set_format(int format, int rate, int channels, String &error)
 {
 int param;
 
@@ -69,17 +69,31 @@
 #endif
 
 param = format;
- CHECK_NOISY(ioctl, m_fd, SNDCTL_DSP_SETFMT, &param);
- CHECK_VAL(param == format, ERROR_NOISY, "Selected audio format is not supported by the device.\n");
+ CHECK_STR(error, ioctl, m_fd, SNDCTL_DSP_SETFMT, &param);
+
+ if (param != format)
+ {
+ error = String("Selected audio format is not supported by the device.");
+ goto FAILED;
+ }
 
 param = rate;
- CHECK_NOISY(ioctl, m_fd, SNDCTL_DSP_SPEED, &param);
- CHECK_VAL(param >= rate * 9 / 10 && param <= rate * 11 / 10, ERROR_NOISY,
- "Selected sample rate is not supported by the device.\n");
+ CHECK_STR(error, ioctl, m_fd, SNDCTL_DSP_SPEED, &param);
+
+ if (param < rate * 9 / 10 || param > rate * 11 / 10)
+ {
+ error = String("Selected sample rate is not supported by the device.");
+ goto FAILED;
+ }
 
 param = channels;
- CHECK_NOISY(ioctl, m_fd, SNDCTL_DSP_CHANNELS, &param);
- CHECK_VAL(param == channels, ERROR_NOISY, "Selected number of channels is not supported by the device.\n");
+ CHECK_STR(error, ioctl, m_fd, SNDCTL_DSP_CHANNELS, &param);
+
+ if (param != channels)
+ {
+ error = String("Selected number of channels is not supported by the device.");
+ goto FAILED;
+ }
 
 m_format = format;
 m_rate = rate;
@@ -102,15 +116,15 @@
 return y;
 }
 
-bool OSSPlugin::set_buffer()
+bool OSSPlugin::set_buffer(String &error)
 {
- int milliseconds = aud_get_int(nullptr, "output_buffer_size");
+ int milliseconds = aud_get_int("output_buffer_size");
 int bytes = frames_to_bytes(aud::rescale(milliseconds, 1000, m_rate));
 int fragorder = aud::clamp(log2(bytes / 4), 9, 15);
 int numfrags = aud::clamp(aud::rdiv(bytes, 1 << fragorder), 4, 32767);
 
 int param = (numfrags << 16) | fragorder;
- CHECK_NOISY(ioctl, m_fd, SNDCTL_DSP_SETFRAGMENT, &param);
+ CHECK_STR(error, ioctl, m_fd, SNDCTL_DSP_SETFRAGMENT, &param);
 
 return true;
 
@@ -131,9 +145,9 @@
 flags |= O_EXCL;
 }
 
- if (aud_get_bool("oss4", "use_alt_device") && alt_device != nullptr)
+ if (aud_get_bool("oss4", "use_alt_device") && alt_device)
 res = open(alt_device, flags);
- else if (device != nullptr)
+ else if (device)
 res = open(device, flags);
 else
 res = open(DEFAULT_DSP, flags);
@@ -200,35 +214,41 @@
 close(poll_pipe1);
 }
 
-bool OSSPlugin::open_audio(int aud_format, int rate, int channels)
+bool OSSPlugin::open_audio(int aud_format, int rate, int channels, String &error)
 {
 AUDDBG("Opening audio.\n");
 
 int format;
 audio_buf_info buf_info;
+ bool poll_was_setup = false;
 
- CHECK_NOISY(m_fd = open_device);
+ CHECK_STR(error, m_fd = open_device);
 
- if (!poll_setup(m_fd))
- goto CLOSE;
+ if (poll_setup(m_fd))
+ poll_was_setup = true;
+ else
+ goto FAILED;
 
- format = oss_convert_aud_format(aud_format);
+ if ((format = oss_convert_aud_format(aud_format)) < 0)
+ {
+ error = String("Unsupported audio format");
+ goto FAILED;
+ }
 
- if (!set_format(format, rate, channels))
+ if (!set_format(format, rate, channels, error))
 goto FAILED;
 
- if (!set_buffer())
+ if (!set_buffer(error))
 goto FAILED;
 
 memset(&buf_info, 0, sizeof buf_info);
- CHECK_NOISY(ioctl, m_fd, SNDCTL_DSP_GETOSPACE, &buf_info);
+ CHECK_STR(error, ioctl, m_fd, SNDCTL_DSP_GETOSPACE, &buf_info);
 
 AUDINFO("Buffer information, fragstotal: %d, fragsize: %d, bytes: %d.\n",
 buf_info.fragstotal,
 buf_info.fragsize,
 buf_info.bytes);
 
- m_paused = false;
 m_ioctl_vol = true;
 
 if (aud_get_bool("oss4", "save_volume"))
@@ -237,9 +257,10 @@
 return true;
 
 FAILED:
- poll_cleanup();
-CLOSE:
- close_device(m_fd);
+ if (poll_was_setup)
+ poll_cleanup();
+ if (m_fd >= 0)
+ close_device(m_fd);
 return false;
 }
 
@@ -253,9 +274,6 @@
 
 int OSSPlugin::write_audio(const void *data, int length)
 {
- if (m_paused)
- return 0;
-
 int written = write(m_fd, data, length);
 
 if (written < 0)
@@ -312,8 +330,8 @@
 CHECK(ioctl, m_fd, SNDCTL_DSP_SKIP, nullptr);
 
 FAILED:
+ return;
 #endif
- m_paused = pause;
 }
 
 StereoVolume OSSPlugin::get_volume()

audacious-plugins-3.6.2-gtk3.tar.bz2/src/oss4/oss.h -> audacious-plugins-4.4.1.tar.bz2/src/oss4/oss.h Changed

@@ -26,51 +26,28 @@
 #include <errno.h>
 #include <string.h>
 #include <sys/ioctl.h>
-
-#ifdef HAVE_SYS_SOUNDCARD_H
 #include <sys/soundcard.h>
-#else
-#include <soundcard.h>
-#endif
 
 #include <libaudcore/i18n.h>
-#include <libaudcore/interface.h>
 #include <libaudcore/plugin.h>
 #include <libaudcore/runtime.h>
 
-#define ERROR AUDERR
-
-#define ERROR_NOISY(...) \
-do { \
- aud_ui_show_error(str_printf("OSS4 error: " __VA_ARGS__)); \
- ERROR(__VA_ARGS__); \
-} while (0) \
-
-#define DESCRIBE_ERROR ERROR("%s\n", oss_describe_error())
-#define DESCRIBE_ERROR_NOISY ERROR_NOISY("%s\n", oss_describe_error())
+#define DESCRIBE_ERROR AUDERR("%s\n", oss_describe_error())
 
 #define CHECK(function, ...) \
 do { \
- int error = function(__VA_ARGS__); \
- if (error < 0) { \
+ int CHECK_error = function(__VA_ARGS__); \
+ if (CHECK_error < 0) { \
 DESCRIBE_ERROR; \
 goto FAILED; \
 } \
 } while (0)
 
-#define CHECK_NOISY(function, ...) \
-do { \
- int error = function(__VA_ARGS__); \
- if (error < 0) { \
- DESCRIBE_ERROR_NOISY; \
- goto FAILED; \
- } \
-} while (0)
-
-#define CHECK_VAL(value, function, ...) \
+#define CHECK_STR(str, function, ...) \
 do { \
- if (!(value)) { \
- function(__VA_ARGS__); \
+ int CHECK_STR_error = function(__VA_ARGS__); \
+ if (CHECK_STR_error < 0) { \
+ str = String(str_printf("OSS error: %s\n", oss_describe_error())); \
 goto FAILED; \
 } \
 } while (0)
@@ -112,7 +89,7 @@
 StereoVolume get_volume();
 void set_volume(StereoVolume v);
 
- bool open_audio(int aud_format, int rate, int chans);
+ bool open_audio(int aud_format, int rate, int chans, String &error);
 void close_audio();
 
 void period_wait();
@@ -125,8 +102,8 @@
 void flush();
 
 private:
- bool set_format(int format, int rate, int channels);
- bool set_buffer();
+ bool set_format(int format, int rate, int channels, String &error);
+ bool set_buffer(String &error);
 
 int frames_to_bytes(int frames) const
 { return frames * (m_bytes_per_sample * m_channels); }
@@ -139,7 +116,6 @@
 int m_channels = 0;
 int m_bytes_per_sample = 0;
 
- bool m_paused = false;
 bool m_ioctl_vol = false;
 };

audacious-plugins-3.6.2-gtk3.tar.bz2/src/oss4/plugin.cc -> audacious-plugins-4.4.1.tar.bz2/src/oss4/plugin.cc Changed

audacious-plugins-3.6.2-gtk3.tar.bz2/src/oss4/utils.cc -> audacious-plugins-4.4.1.tar.bz2/src/oss4/utils.cc Changed

audacious-plugins-4.4.1.tar.bz2/src/pipewire Added

audacious-plugins-4.4.1.tar.bz2/src/pipewire/Makefile Added

audacious-plugins-4.4.1.tar.bz2/src/pipewire/meson.build Added

audacious-plugins-4.4.1.tar.bz2/src/pipewire/pipewire.cc Added

@@ -0,0 +1,594 @@
+/*
+ * PipeWire Output Plugin for Audacious
+ * Copyright 2022 Thomas Lange
+ *
+ * Based on the PipeWire Output Plugin for Qmmp
+ * Copyright 2021 Ilya Kotov
+ *
+ * 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 <cmath>
+
+#include <pipewire/pipewire.h>
+#include <spa/param/audio/format-utils.h>
+#include <spa/param/props.h>
+
+#include <libaudcore/i18n.h>
+#include <libaudcore/plugin.h>
+#include <libaudcore/runtime.h>
+
+#if !PW_CHECK_VERSION(0, 3, 33)
+ #define PW_KEY_NODE_RATE "node.rate"
+#endif
+
+class PipeWireOutput : public OutputPlugin
+{
+public:
+ static const char about;
+ static const char * const defaults;
+
+ static constexpr PluginInfo info = {
+ N_("PipeWire Output"),
+ PACKAGE,
+ about,
+ nullptr
+ };
+
+ constexpr PipeWireOutput() : OutputPlugin(info, 8) {}
+
+ bool init();
+ void cleanup();
+
+ StereoVolume get_volume();
+ void set_volume(StereoVolume v);
+
+ bool open_audio(int format, int rate, int channels, String & error);
+ void close_audio();
+
+ void period_wait();
+ int write_audio(const void * data, int length);
+ void drain();
+
+ int get_delay();
+
+ void pause(bool pause);
+ void flush();
+
+private:
+ bool init_core();
+ bool init_stream();
+
+ struct pw_stream * create_stream();
+ bool connect_stream(enum spa_audio_format format);
+
+ static void on_core_event_done(void * data, uint32_t id, int seq);
+ static void on_registry_event_global(void * data, uint32_t id, uint32_t permissions,
+ const char * type, uint32_t version,
+ const struct spa_dict * props);
+ static void on_state_changed(void * data, enum pw_stream_state old,
+ enum pw_stream_state state, const char * error);
+ static void on_process(void * data);
+ static void on_drained(void * data);
+
+ static enum spa_audio_format to_pipewire_format(int format);
+ static void set_channel_map(struct spa_audio_info_raw * info, int channels);
+
+ struct pw_thread_loop * m_loop = nullptr;
+ struct pw_stream * m_stream = nullptr;
+ struct pw_context * m_context = nullptr;
+ struct pw_core * m_core = nullptr;
+ struct pw_registry * m_registry = nullptr;
+
+ struct spa_hook m_core_listener = {};
+ struct spa_hook m_stream_listener = {};
+ struct spa_hook m_registry_listener = {};
+
+ bool m_inited = false;
+ bool m_has_sinks = false;
+ bool m_ignore_state_change = false;
+
+ int m_aud_format = 0;
+ int m_core_init_seq = 0;
+
+ unsigned char * m_buffer = nullptr;
+ unsigned int m_buffer_at = 0;
+ unsigned int m_buffer_size = 0;
+ unsigned int m_frames = 0;
+ unsigned int m_stride = 0;
+ unsigned int m_rate = 0;
+ unsigned int m_channels = 0;
+};
+
+EXPORT PipeWireOutput aud_plugin_instance;
+
+const char PipeWireOutput::about =
+ N_("PipeWire Output Plugin for Audacious\n"
+ "Copyright 2022 Thomas Lange\n\n"
+ "Based on the PipeWire Output Plugin for Qmmp\n"
+ "Copyright 2021 Ilya Kotov");
+
+const char * const PipeWireOutput::defaults = {
+ "volume_left", "50",
+ "volume_right", "50",
+ nullptr
+};
+
+StereoVolume PipeWireOutput::get_volume()
+{
+ return {aud_get_int("pipewire", "volume_left"),
+ aud_get_int("pipewire", "volume_right")};
+}
+
+void PipeWireOutput::set_volume(StereoVolume v)
+{
+ aud_set_int("pipewire", "volume_left", v.left);
+ aud_set_int("pipewire", "volume_right", v.right);
+
+ if (!m_loop)
+ return;
+
+ // Re-use libaudcore's decibel-to-linear translation by passing
+ // full-scale PCM values (1.0) to audio_amplify(). This also
+ // translates the StereoVolume to an arbitrary number of channels.
+ float * values = new floatm_channels;
+ for (unsigned int i = 0; i < m_channels; i++)
+ valuesi = 1.0f;
+ audio_amplify(values, m_channels, 1, v);
+
+ pw_thread_loop_lock(m_loop);
+ pw_stream_set_control(m_stream, SPA_PROP_channelVolumes, m_channels, values, nullptr);
+ pw_thread_loop_unlock(m_loop);
+
+ delete values;
+}
+
+void PipeWireOutput::pause(bool pause)
+{
+ pw_thread_loop_lock(m_loop);
+ pw_stream_set_active(m_stream, !pause);
+ pw_thread_loop_unlock(m_loop);
+}
+
+int PipeWireOutput::get_delay()
+{
+ return (m_buffer_at / m_stride + m_frames) * 1000 / m_rate;
+}
+
+void PipeWireOutput::drain()
+{
+ pw_thread_loop_lock(m_loop);
+ if (m_buffer_at > 0)
+ pw_thread_loop_timed_wait(m_loop, 2);
+
+ pw_stream_flush(m_stream, true);
+ pw_thread_loop_timed_wait(m_loop, 2);
+ pw_thread_loop_unlock(m_loop);
+}
+
+void PipeWireOutput::flush()
+{
+ pw_thread_loop_lock(m_loop);
+ m_buffer_at = 0;
+ pw_thread_loop_unlock(m_loop);
+ pw_stream_flush(m_stream, false);
+}
+
+void PipeWireOutput::period_wait()
+{
+ if (m_buffer_at != m_buffer_size)
+ return;
+
+ pw_thread_loop_lock(m_loop);
+ pw_thread_loop_timed_wait(m_loop, 1);
+ pw_thread_loop_unlock(m_loop);
+}
+
+int PipeWireOutput::write_audio(const void * data, int length)
+{
+ pw_thread_loop_lock(m_loop);
+
+ auto size = aud::min<size_t>(m_buffer_size - m_buffer_at, length);
+ memcpy(m_buffer + m_buffer_at, data, size);
+ m_buffer_at += size;
+
+ pw_thread_loop_unlock(m_loop);
+ return size;
+}
+
+void PipeWireOutput::close_audio()
+{
+ if (m_stream)
+ {
+ pw_thread_loop_lock(m_loop);
+ m_ignore_state_change = true;
+ pw_stream_disconnect(m_stream);
+ pw_stream_destroy(m_stream);
+ m_ignore_state_change = false;
+ m_stream = nullptr;
+ pw_thread_loop_unlock(m_loop);
+ }
+
+ if (m_loop)
+ pw_thread_loop_stop(m_loop);
+
+ if (m_registry)
+ {
+ pw_proxy_destroy(reinterpret_cast<pw_proxy *>(m_registry));
+ m_registry = nullptr;
+ }
+
+ if (m_core)
+ {
+ pw_core_disconnect(m_core);
+ m_core = nullptr;
+ }
+
+ if (m_context)
+ {
+ pw_context_destroy(m_context);
+ m_context = nullptr;
+ }
+
+ if (m_loop)
+ {
+ pw_thread_loop_destroy(m_loop);
+ m_loop = nullptr;
+ }
+
+ if (m_buffer)
+ {
+ delete m_buffer;
+ m_buffer = nullptr;
+ }
+}
+
+bool PipeWireOutput::open_audio(int format, int rate, int channels, String & error)
+{
+ m_aud_format = format;
+ m_rate = rate;
+ m_channels = channels;
+
+ if (!init_core() || !init_stream())
+ {
+ close_audio();
+ return false;
+ }
+
+ return true;
+}
+
+bool PipeWireOutput::init()
+{
+ aud_config_set_defaults("pipewire", defaults);
+ pw_init(nullptr, nullptr);
+ return true;
+}
+
+void PipeWireOutput::cleanup()
+{
+ pw_deinit();
+}
+
+bool PipeWireOutput::init_core()
+{
+ static const struct pw_core_events core_events = {
+ .version = PW_VERSION_CORE_EVENTS,
+ .done = PipeWireOutput::on_core_event_done
+ };
+
+ static const struct pw_registry_events registry_events = {
+ .version = PW_VERSION_REGISTRY_EVENTS,
+ .global = PipeWireOutput::on_registry_event_global
+ };
+
+ if (!(m_loop = pw_thread_loop_new("pipewire-main-loop", nullptr)))
+ {
+ AUDERR("PipeWireOutput: unable to create main loop\n");
+ return false;
+ }
+
+ if (!(m_context = pw_context_new(pw_thread_loop_get_loop(m_loop), nullptr, 0)))
+ {
+ AUDERR("PipeWireOutput: unable to create context\n");
+ return false;
+ }
+
+ if (!(m_core = pw_context_connect(m_context, nullptr, 0)))
+ {
+ AUDERR("PipeWireOutput: unable to connect context\n");
+ return false;
+ }
+
+ if (!(m_registry = pw_core_get_registry(m_core, PW_VERSION_REGISTRY, 0)))
+ {
+ AUDERR("PipeWireOutput: unable to get registry interface\n");
+ return false;
+ }
+
+ pw_core_add_listener(m_core, &m_core_listener, &core_events, this);
+ pw_registry_add_listener(m_registry, &m_registry_listener, &registry_events, this);
+
+ m_core_init_seq = pw_core_sync(m_core, PW_ID_CORE, m_core_init_seq);
+
+ if (pw_thread_loop_start(m_loop) != 0)
+ {
+ AUDERR("PipeWireOutput: unable to start loop\n");
+ return false;
+ }
+
+ pw_thread_loop_lock(m_loop);
+ while (!m_inited)
+ {
+ if (pw_thread_loop_timed_wait(m_loop, 2) != 0)
+ break;
+ }
+ pw_thread_loop_unlock(m_loop);
+
+ if (!m_inited || !m_has_sinks)
+ {
+ AUDERR("PipeWireOutput: unable to initialize loop\n");
+ return false;
+ }
+
+ m_stride = FMT_SIZEOF(m_aud_format) * m_channels;
+ m_frames = aud::clamp<int>(64, ceilf(2048 * m_rate / 48000.0f), 8192);
+ m_buffer_size = m_frames * m_stride;
+ m_buffer = new unsigned charm_buffer_size;
+
+ return true;
+}
+
+bool PipeWireOutput::init_stream()
+{
+ static const struct pw_stream_events stream_events = {
+ .version = PW_VERSION_STREAM_EVENTS,
+ .state_changed = PipeWireOutput::on_state_changed,
+ .process = PipeWireOutput::on_process,
+ .drained = PipeWireOutput::on_drained
+ };
+
+ pw_thread_loop_lock(m_loop);
+
+ if (!(m_stream = create_stream()))
+ {
+ AUDERR("PipeWireOutput: unable to create stream\n");
+ pw_thread_loop_unlock(m_loop);
+ return false;
+ }
+
+ m_stream_listener = {};
+ pw_stream_add_listener(m_stream, &m_stream_listener, &stream_events, this);
+
+ auto pw_format = to_pipewire_format(m_aud_format);
+ if (pw_format == SPA_AUDIO_FORMAT_UNKNOWN)
+ {
+ AUDERR("PipeWireOutput: unknown audio format\n");
+ pw_thread_loop_unlock(m_loop);
+ return false;
+ }
+
+ if (!connect_stream(pw_format))
+ {
+ AUDERR("PipeWireOutput: unable to connect stream\n");
+ pw_thread_loop_unlock(m_loop);
+ return false;
+ }
+
+ pw_thread_loop_unlock(m_loop);
+ return true;
+}
+
+struct pw_stream * PipeWireOutput::create_stream()
+{
+ struct pw_properties * props =
+ pw_properties_new(PW_KEY_MEDIA_TYPE, "Audio",
+ PW_KEY_MEDIA_CATEGORY, "Playback",
+ PW_KEY_MEDIA_ROLE, "Music",
+ PW_KEY_APP_ID, "audacious",
+ PW_KEY_APP_ICON_NAME, "audacious",
+ PW_KEY_APP_NAME, _("Audacious"),
+ nullptr);
+
+ pw_properties_setf(props, PW_KEY_NODE_RATE, "1/%u", m_rate);
+ pw_properties_setf(props, PW_KEY_NODE_LATENCY, "%u/%u", m_frames, m_rate);
+
+ return pw_stream_new(m_core, _("Playback"), props);
+}
+
+bool PipeWireOutput::connect_stream(enum spa_audio_format format)
+{
+ uint8_t buffer1024;
+ struct spa_pod_builder b = SPA_POD_BUILDER_INIT(buffer, sizeof buffer);
+
+ struct spa_audio_info_raw audio_info = {
+ .format = format,
+ .flags = SPA_AUDIO_FLAG_NONE,
+ .rate = m_rate,
+ .channels = m_channels
+ };
+
+ set_channel_map(&audio_info, m_channels);
+
+ const struct spa_pod * params1;
+ params0 = spa_format_audio_raw_build(&b, SPA_PARAM_EnumFormat, &audio_info);
+
+ auto stream_flags = static_cast<pw_stream_flags>(PW_STREAM_FLAG_AUTOCONNECT |
+ PW_STREAM_FLAG_MAP_BUFFERS |
+ PW_STREAM_FLAG_RT_PROCESS);
+
+ return pw_stream_connect(m_stream, PW_DIRECTION_OUTPUT, PW_ID_ANY,
+ stream_flags, params, aud::n_elems(params)) == 0;
+}
+
+void PipeWireOutput::on_core_event_done(void * data, uint32_t id, int seq)
+{
+ PipeWireOutput * o = static_cast<PipeWireOutput *>(data);
+
+ if (id != PW_ID_CORE || seq != o->m_core_init_seq)
+ return;
+
+ spa_hook_remove(&o->m_registry_listener);
+ spa_hook_remove(&o->m_core_listener);
+
+ o->m_inited = true;
+ pw_thread_loop_signal(o->m_loop, false);
+}
+
+void PipeWireOutput::on_registry_event_global(void * data, uint32_t id, uint32_t permissions,
+ const char * type, uint32_t version,
+ const struct spa_dict * props)
+{
+ PipeWireOutput * o = static_cast<PipeWireOutput *>(data);
+
+ if (strcmp(type, PW_TYPE_INTERFACE_Node) != 0)
+ return;
+
+ const char * media_class = spa_dict_lookup(props, PW_KEY_MEDIA_CLASS);
+ if (!media_class)
+ return;
+
+ if (strcmp(media_class, "Audio/Sink") != 0)
+ return;
+
+ o->m_has_sinks = true;
+ o->m_core_init_seq = pw_core_sync(o->m_core, PW_ID_CORE, o->m_core_init_seq);
+}
+
+void PipeWireOutput::on_state_changed(void * data, enum pw_stream_state old,
+ enum pw_stream_state state, const char * error)
+{
+ PipeWireOutput * o = static_cast<PipeWireOutput *>(data);
+
+ if (o->m_ignore_state_change)
+ return;
+
+ if (state == PW_STREAM_STATE_UNCONNECTED ||
+ state == PW_STREAM_STATE_PAUSED ||
+ state == PW_STREAM_STATE_STREAMING)
+ {
+ pw_thread_loop_signal(o->m_loop, false);
+ }
+}
+
+void PipeWireOutput::on_process(void * data)
+{
+ PipeWireOutput * o = static_cast<PipeWireOutput *>(data);
+ struct pw_buffer * b;
+ struct spa_buffer * buf;
+ void * dst;
+
+ if (!o->m_buffer_at)
+ {
+ pw_thread_loop_signal(o->m_loop, false);
+ return;
+ }
+
+ if (!(b = pw_stream_dequeue_buffer(o->m_stream)))
+ {
+ AUDWARN("PipeWireOutput: out of buffers\n");
+ return;
+ }
+
+ buf = b->buffer;
+
+ if (!(dst = buf->datas0.data))
+ {
+ AUDWARN("PipeWireOutput: no data pointer\n");
+ return;
+ }
+
+ auto size = aud::min<uint32_t>(buf->datas0.maxsize, o->m_buffer_at);
+ memcpy(dst, o->m_buffer, size);
+ o->m_buffer_at -= size;
+ memmove(o->m_buffer, o->m_buffer + size, o->m_buffer_at);
+
+ b->buffer->datas0.chunk->offset = 0;
+ b->buffer->datas0.chunk->size = o->m_buffer_size;
+ b->buffer->datas0.chunk->stride = o->m_stride;
+
+ pw_stream_queue_buffer(o->m_stream, b);
+ pw_thread_loop_signal(o->m_loop, false);
+}
+
+void PipeWireOutput::on_drained(void * data)
+{
+ PipeWireOutput * o = static_cast<PipeWireOutput *>(data);
+ pw_thread_loop_signal(o->m_loop, false);
+}
+
+enum spa_audio_format PipeWireOutput::to_pipewire_format(int format)
+{
+ switch (format)
+ {
+ case FMT_FLOAT: return SPA_AUDIO_FORMAT_F32_LE;
+
+ case FMT_S8: return SPA_AUDIO_FORMAT_S8;
+ case FMT_U8: return SPA_AUDIO_FORMAT_U8;
+
+ case FMT_S16_LE: return SPA_AUDIO_FORMAT_S16_LE;
+ case FMT_S16_BE: return SPA_AUDIO_FORMAT_S16_BE;
+ case FMT_U16_LE: return SPA_AUDIO_FORMAT_U16_LE;
+ case FMT_U16_BE: return SPA_AUDIO_FORMAT_U16_BE;
+
+ case FMT_S24_LE: return SPA_AUDIO_FORMAT_S24_32_LE;
+ case FMT_S24_BE: return SPA_AUDIO_FORMAT_S24_32_BE;
+ case FMT_U24_LE: return SPA_AUDIO_FORMAT_U24_32_LE;
+ case FMT_U24_BE: return SPA_AUDIO_FORMAT_U24_32_BE;
+
+ case FMT_S24_3LE: return SPA_AUDIO_FORMAT_S24_LE;
+ case FMT_S24_3BE: return SPA_AUDIO_FORMAT_S24_BE;
+ case FMT_U24_3LE: return SPA_AUDIO_FORMAT_U24_LE;
+ case FMT_U24_3BE: return SPA_AUDIO_FORMAT_U24_BE;
+
+ case FMT_S32_LE: return SPA_AUDIO_FORMAT_S32_LE;
+ case FMT_S32_BE: return SPA_AUDIO_FORMAT_S32_BE;
+ case FMT_U32_LE: return SPA_AUDIO_FORMAT_U32_LE;
+ case FMT_U32_BE: return SPA_AUDIO_FORMAT_U32_BE;
+
+ default: return SPA_AUDIO_FORMAT_UNKNOWN;
+ }
+}
+
+void PipeWireOutput::set_channel_map(struct spa_audio_info_raw * info, int channels)
+{
+ switch (channels)
+ {
+ case 9:
+ info->position8 = SPA_AUDIO_CHANNEL_RC;
+ // Fall through
+ case 8:
+ info->position6 = SPA_AUDIO_CHANNEL_FLC;
+ info->position7 = SPA_AUDIO_CHANNEL_FRC;
+ // Fall through
+ case 6:
+ info->position4 = SPA_AUDIO_CHANNEL_RL;
+ info->position5 = SPA_AUDIO_CHANNEL_RR;
+ // Fall through
+ case 4:
+ info->position3 = SPA_AUDIO_CHANNEL_LFE;
+ // Fall through
+ case 3:
+ info->position2 = SPA_AUDIO_CHANNEL_FC;
+ // Fall through
+ case 2:
+ info->position0 = SPA_AUDIO_CHANNEL_FL;
+ info->position1 = SPA_AUDIO_CHANNEL_FR;
+ break;
+ case 1:
+ info->position0 = SPA_AUDIO_CHANNEL_MONO;
+ break;
+ }
+}

audacious-plugins-4.4.1.tar.bz2/src/playlist-manager-qt Added

audacious-plugins-4.4.1.tar.bz2/src/playlist-manager-qt/Makefile Added

audacious-plugins-4.4.1.tar.bz2/src/playlist-manager-qt/meson.build Added

audacious-plugins-4.4.1.tar.bz2/src/playlist-manager-qt/playlist-manager-qt.cc Added

@@ -0,0 +1,387 @@
+/*
+ * playlist-manager-qt.cc
+ * Copyright 2015 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 <QAbstractListModel>
+#include <QBoxLayout>
+#include <QFont>
+#include <QGuiApplication>
+#include <QHeaderView>
+#include <QIcon>
+#include <QMouseEvent>
+#include <QPointer>
+#include <QToolButton>
+
+#include <libaudcore/hook.h>
+#include <libaudcore/i18n.h>
+#include <libaudcore/playlist.h>
+#include <libaudcore/plugin.h>
+#include <libaudqt/libaudqt.h>
+#include <libaudqt/treeview.h>
+
+#include "../ui-common/qt-compat.h"
+
+class PlaylistManagerQt : public GeneralPlugin
+{
+public:
+ static constexpr PluginInfo info = {N_("Playlist Manager"), PACKAGE,
+ nullptr, // about
+ nullptr, // prefs
+ PluginQtOnly};
+
+ constexpr PlaylistManagerQt() : GeneralPlugin(info, false) {}
+
+ void * get_qt_widget();
+ int take_message(const char * code, const void *, int);
+};
+
+EXPORT PlaylistManagerQt aud_plugin_instance;
+
+class PlaylistsModel : public QAbstractListModel
+{
+public:
+ enum
+ {
+ ColumnTitle,
+ ColumnEntries,
+ NColumns
+ };
+
+ PlaylistsModel()
+ : m_rows(Playlist::n_playlists()),
+ m_playing(Playlist::playing_playlist().index())
+ {
+ }
+
+ void setFont(const QFont & font)
+ {
+ m_bold = font;
+ m_bold.setBold(true);
+
+ if (m_playing >= 0)
+ update_rows(m_playing, 1);
+ }
+
+ void update(Playlist::UpdateLevel level);
+
+protected:
+ int rowCount(const QModelIndex & parent) const
+ {
+ return parent.isValid() ? 0 : m_rows;
+ }
+
+ int columnCount(const QModelIndex & parent) const { return NColumns; }
+
+ Qt::DropActions supportedDropActions() const { return Qt::MoveAction; }
+
+ Qt::ItemFlags flags(const QModelIndex & index) const
+ {
+ if (index.isValid())
+ return Qt::ItemIsSelectable | Qt::ItemIsDragEnabled |
+ Qt::ItemIsEnabled;
+ else
+ return Qt::ItemIsSelectable | Qt::ItemIsDropEnabled |
+ Qt::ItemIsEnabled;
+ }
+
+ QVariant data(const QModelIndex & index, int role) const;
+ QVariant headerData(int section, Qt::Orientation orientation,
+ int role) const;
+
+private:
+ void update_rows(int row, int count);
+ void update_playing();
+
+ const HookReceiver<PlaylistsModel> activate_hook{
+ "playlist set playing", this, &PlaylistsModel::update_playing};
+
+ int m_rows, m_playing;
+ QFont m_bold;
+};
+
+class PlaylistsView : public audqt::TreeView
+{
+public:
+ PlaylistsView();
+
+protected:
+ void changeEvent(QEvent * event) override
+ {
+ if (event->type() == QEvent::FontChange)
+ m_model.setFont(font());
+
+ audqt::TreeView::changeEvent(event);
+ }
+
+ void currentChanged(const QModelIndex & current,
+ const QModelIndex & previous) override;
+ void dropEvent(QDropEvent * event) override;
+
+private:
+ PlaylistsModel m_model;
+
+ void update(Playlist::UpdateLevel level);
+ void update_sel();
+
+ const HookReceiver<PlaylistsView, Playlist::UpdateLevel> //
+ update_hook{"playlist update", this, &PlaylistsView::update};
+ const HookReceiver<PlaylistsView> //
+ activate_hook{"playlist activate", this, &PlaylistsView::update_sel};
+
+ int m_in_update = 0;
+};
+
+QVariant PlaylistsModel::data(const QModelIndex & index, int role) const
+{
+ switch (role)
+ {
+ case Qt::DisplayRole:
+ {
+ auto list = Playlist::by_index(index.row());
+ switch (index.column())
+ {
+ case ColumnTitle:
+ return QString(list.get_title());
+ case ColumnEntries:
+ return list.n_entries();
+ }
+ }
+ break;
+
+ case Qt::FontRole:
+ if (index.row() == m_playing)
+ return m_bold;
+ break;
+
+ case Qt::TextAlignmentRole:
+ if (index.column() == ColumnEntries)
+ return Qt::AlignRight;
+ break;
+ }
+
+ return QVariant();
+}
+
+QVariant PlaylistsModel::headerData(int section, Qt::Orientation orientation,
+ int role) const
+{
+ if (orientation == Qt::Horizontal && role == Qt::DisplayRole)
+ {
+ switch (section)
+ {
+ case ColumnTitle:
+ return QString(_("Title"));
+ case ColumnEntries:
+ return QString(_("Entries"));
+ }
+ }
+
+ return QVariant();
+}
+
+void PlaylistsModel::update_rows(int row, int count)
+{
+ if (count < 1)
+ return;
+
+ auto topLeft = createIndex(row, 0);
+ auto bottomRight = createIndex(row + count - 1, NColumns - 1);
+ emit dataChanged(topLeft, bottomRight);
+}
+
+void PlaylistsModel::update_playing()
+{
+ int playing = Playlist::playing_playlist().index();
+
+ if (playing != m_playing)
+ {
+ if (m_playing >= 0)
+ update_rows(m_playing, 1);
+ if (playing >= 0)
+ update_rows(playing, 1);
+
+ m_playing = playing;
+ }
+}
+
+void PlaylistsModel::update(const Playlist::UpdateLevel level)
+{
+ int rows = Playlist::n_playlists();
+
+ if (level == Playlist::Structure)
+ {
+ if (rows < m_rows)
+ {
+ beginRemoveRows(QModelIndex(), rows, m_rows - 1);
+ m_rows = rows;
+ endRemoveRows();
+ }
+ else if (rows > m_rows)
+ {
+ beginInsertRows(QModelIndex(), m_rows, rows - 1);
+ m_rows = rows;
+ endInsertRows();
+ }
+ }
+
+ if (level >= Playlist::Metadata)
+ {
+ update_rows(0, m_rows);
+ m_playing = Playlist::playing_playlist().index();
+ }
+ else
+ update_playing();
+}
+
+PlaylistsView::PlaylistsView()
+{
+ m_model.setFont(font());
+
+ m_in_update++;
+ setModel(&m_model);
+ update_sel();
+ m_in_update--;
+
+ auto hdr = header();
+ hdr->setStretchLastSection(false);
+ hdr->setSectionResizeMode(PlaylistsModel::ColumnTitle,
+ QHeaderView::Stretch);
+ hdr->setSectionResizeMode(PlaylistsModel::ColumnEntries,
+ QHeaderView::Interactive);
+ hdr->resizeSection(PlaylistsModel::ColumnEntries, audqt::to_native_dpi(64));
+
+ setAllColumnsShowFocus(true);
+ setDragDropMode(InternalMove);
+ setFrameShape(QFrame::NoFrame);
+ setIndentation(0);
+
+ connect(this, &QTreeView::activated, (const QModelIndex & index) {
+ if (index.isValid())
+ Playlist::by_index(index.row()).start_playback();
+ });
+}
+
+void PlaylistsView::currentChanged(const QModelIndex & current,
+ const QModelIndex & previous)
+{
+ audqt::TreeView::currentChanged(current, previous);
+ if (!m_in_update)
+ Playlist::by_index(current.row()).activate();
+}
+
+void PlaylistsView::dropEvent(QDropEvent * event)
+{
+ if (event->source() != this || event->proposedAction() != Qt::MoveAction)
+ return;
+
+ int from = currentIndex().row();
+ if (from < 0)
+ return;
+
+ int to;
+ switch (dropIndicatorPosition())
+ {
+ case AboveItem:
+ to = indexAt(QtCompat::pos(event)).row();
+ break;
+ case BelowItem:
+ to = indexAt(QtCompat::pos(event)).row() + 1;
+ break;
+ case OnViewport:
+ to = Playlist::n_playlists();
+ break;
+ default:
+ return;
+ }
+
+ Playlist::reorder_playlists(from, (to > from) ? to - 1 : to, 1);
+ event->acceptProposedAction();
+}
+
+void PlaylistsView::update(Playlist::UpdateLevel level)
+{
+ m_in_update++;
+ m_model.update(level);
+ update_sel();
+ m_in_update--;
+}
+
+void PlaylistsView::update_sel()
+{
+ m_in_update++;
+ auto sel = selectionModel();
+ auto current = m_model.index(Playlist::active_playlist().index(), 0);
+ sel->setCurrentIndex(current, sel->ClearAndSelect | sel->Rows);
+ m_in_update--;
+}
+
+static QPointer<PlaylistsView> s_playlists_view;
+
+static QToolButton * new_tool_button(const char * text, const char * icon)
+{
+ auto button = new QToolButton;
+ button->setIcon(QIcon::fromTheme(icon));
+ button->setText(audqt::translate_str(text));
+ button->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
+ return button;
+}
+
+void * PlaylistManagerQt::get_qt_widget()
+{
+ s_playlists_view = new PlaylistsView;
+
+ auto new_button = new_tool_button(N_("_New"), "document-new");
+ QObject::connect(new_button, &QToolButton::clicked, Playlist::new_playlist);
+
+ auto rename_button = new_tool_button(N_("Ren_ame"), "insert-text");
+ QObject::connect(rename_button, &QToolButton::clicked, () {
+ audqt::playlist_show_rename(Playlist::active_playlist());
+ });
+
+ auto remove_button = new_tool_button(N_("_Remove"), "edit-delete");
+ QObject::connect(remove_button, &QToolButton::clicked, () {
+ audqt::playlist_confirm_delete(Playlist::active_playlist());
+ });
+
+ auto hbox = audqt::make_hbox(nullptr);
+ hbox->setContentsMargins(audqt::margins.TwoPt);
+
+ hbox->addWidget(new_button);
+ hbox->addWidget(rename_button);
+ hbox->addStretch(1);
+ hbox->addWidget(remove_button);
+
+ auto widget = new QWidget;
+ auto vbox = audqt::make_vbox(widget, 0);
+
+ vbox->addWidget(s_playlists_view, 1);
+ vbox->addLayout(hbox);
+
+ return widget;
+}
+
+int PlaylistManagerQt::take_message(const char * code, const void *, int)
+{
+ if (!strcmp(code, "grab focus") && s_playlists_view)
+ {
+ s_playlists_view->setFocus(Qt::OtherFocusReason);
+ return 0;
+ }
+
+ return -1;
+}

audacious-plugins-4.4.1.tar.bz2/src/playlist-manager/meson.build Added

audacious-plugins-3.6.2-gtk3.tar.bz2/src/playlist-manager/playlist-manager.cc -> audacious-plugins-4.4.1.tar.bz2/src/playlist-manager/playlist-manager.cc Changed

@@ -24,6 +24,7 @@
 #include <libaudcore/plugin.h>
 #include <libaudcore/runtime.h>
 
+#include <libaudgui/gtk-compat.h>
 #include <libaudgui/libaudgui.h>
 #include <libaudgui/libaudgui-gtk.h>
 #include <libaudgui/list.h>
@@ -35,7 +36,10 @@
 public:
 static constexpr PluginInfo info = {
 N_("Playlist Manager"),
- PACKAGE
+ PACKAGE,
+ nullptr, // about
+ nullptr, // prefs
+ PluginGLibOnly
 };
 
 constexpr PlaylistManager () : GeneralPlugin (info, false) {}
@@ -52,44 +56,39 @@
 
 static void rename_cb (void * unused)
 {
- audgui_show_playlist_rename (aud_playlist_get_active ());
-}
-
-static void new_cb (void * unused)
-{
- aud_playlist_insert (aud_playlist_get_active () + 1);
- aud_playlist_set_active (aud_playlist_get_active () + 1);
+ audgui_show_playlist_rename (Playlist::active_playlist ());
 }
 
 static void delete_cb (void * unused)
 {
- audgui_confirm_playlist_delete (aud_playlist_get_active ());
+ audgui_confirm_playlist_delete (Playlist::active_playlist ());
 }
 
 static void get_value (void * user, int row, int column, GValue * value)
 {
+ auto list = Playlist::by_index (row);
+
 switch (column)
 {
 case 0:
- {
- g_value_set_string (value, aud_playlist_get_title (row));
+ g_value_set_string (value, list.get_title ());
 break;
- }
+
 case 1:
- g_value_set_int (value, aud_playlist_entry_count (row));
+ g_value_set_int (value, list.n_entries ());
 break;
 }
 }
 
 static bool get_selected (void * user, int row)
 {
- return (row == aud_playlist_get_active ());
+ return (row == Playlist::active_playlist ().index ());
 }
 
 static void set_selected (void * user, int row, bool selected)
 {
 if (selected)
- aud_playlist_set_active (row);
+ Playlist::by_index (row).activate ();
 }
 
 static void select_all (void * user, bool selected)
@@ -98,16 +97,17 @@
 
 static void activate_row (void * user, int row)
 {
- aud_playlist_set_active (row);
- aud_playlist_play (row);
+ auto playlist = Playlist::by_index (row);
+ playlist.activate ();
+ playlist.start_playback ();
 }
 
 static void shift_rows (void * user, int row, int before)
 {
 if (before < row)
- aud_playlist_reorder (row, before, 1);
+ Playlist::reorder_playlists (row, before, 1);
 else if (before - 1 > row)
- aud_playlist_reorder (row, before - 1, 1);
+ Playlist::reorder_playlists (row, before - 1, 1);
 }
 
 static const AudguiListCallbacks callbacks = {
@@ -128,7 +128,7 @@
 int row = gtk_tree_path_get_indices (path)0;
 gtk_tree_path_free (path);
 
- String title = aud_playlist_get_title (row);
+ String title = Playlist::by_index (row).get_title ();
 g_return_val_if_fail (title, true);
 
 Index<String> keys = str_list_to_index (key, " ");
@@ -145,14 +145,11 @@
 return false; /* matched */
 }
 
-static gboolean position_changed = false;
-static gboolean playlist_activated = false;
-
 static void update_hook (void * data, void * list_)
 {
 auto level = aud::from_ptr<Playlist::UpdateLevel> (data);
 GtkWidget * list = (GtkWidget *) list_;
- int rows = aud_playlist_count ();
+ int rows = Playlist::n_playlists ();
 
 if (level == Playlist::Structure)
 {
@@ -163,48 +160,26 @@
 else if (rows > old_rows)
 audgui_list_insert_rows (list, old_rows, rows - old_rows);
 
- position_changed = true;
- playlist_activated = true;
+ audgui_list_set_focus (list, Playlist::active_playlist ().index ());
+ audgui_list_set_highlight (list, Playlist::playing_playlist ().index ());
+ audgui_list_update_selection (list, 0, rows);
 }
 
 if (level >= Playlist::Metadata)
 audgui_list_update_rows (list, 0, rows);
-
- if (playlist_activated)
- {
- audgui_list_set_focus (list, aud_playlist_get_active ());
- audgui_list_update_selection (list, 0, rows);
- playlist_activated = false;
- }
-
- if (position_changed)
- {
- audgui_list_set_highlight (list, aud_playlist_get_playing ());
- position_changed = false;
- }
 }
 
 static void activate_hook (void * data, void * list_)
 {
 GtkWidget * list = (GtkWidget *) list_;
-
- if (aud_playlist_update_pending ())
- playlist_activated = true;
- else
- {
- audgui_list_set_focus (list, aud_playlist_get_active ());
- audgui_list_update_selection (list, 0, aud_playlist_count ());
- }
+ audgui_list_set_focus (list, Playlist::active_playlist ().index ());
+ audgui_list_update_selection (list, 0, Playlist::n_playlists ());
 }
 
 static void position_hook (void * data, void * list_)
 {
 GtkWidget * list = (GtkWidget *) list_;
-
- if (aud_playlist_update_pending ())
- position_changed = true;
- else
- audgui_list_set_highlight (list, aud_playlist_get_playing ());
+ audgui_list_set_highlight (list, Playlist::playing_playlist ().index ());
 }
 
 static void destroy_cb (GtkWidget * window)
@@ -218,13 +193,13 @@
 
 void * PlaylistManager::get_gtk_widget ()
 {
- GtkWidget * playman_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
+ GtkWidget * playman_vbox = audgui_vbox_new (6);
 
 /* ListView */
- GtkWidget * playman_pl_lv = audgui_list_new (& callbacks, nullptr, aud_playlist_count ());
+ GtkWidget * playman_pl_lv = audgui_list_new (& callbacks, nullptr, Playlist::n_playlists ());
 audgui_list_add_column (playman_pl_lv, _("Title"), 0, G_TYPE_STRING, -1);
 audgui_list_add_column (playman_pl_lv, _("Entries"), 1, G_TYPE_INT, 7);
- audgui_list_set_highlight (playman_pl_lv, aud_playlist_get_playing ());
+ audgui_list_set_highlight (playman_pl_lv, Playlist::playing_playlist ().index ());
 gtk_tree_view_set_search_equal_func ((GtkTreeView *) playman_pl_lv,
 search_cb, nullptr, nullptr);
 hook_associate ("playlist update", update_hook, playman_pl_lv);
@@ -240,8 +215,9 @@
 gtk_box_pack_start ((GtkBox *) playman_vbox, playman_pl_lv_sw, true, true, 0);
 
 /* ButtonBox */
- GtkWidget * playman_button_hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
- GtkWidget * new_button = audgui_button_new (_("_New"), "document-new", new_cb, nullptr);
+ GtkWidget * playman_button_hbox = audgui_hbox_new (6);
+ GtkWidget * new_button = audgui_button_new (_("_New"), "document-new",
+ (void *) { Playlist::new_playlist (); }, nullptr);
 GtkWidget * delete_button = audgui_button_new (_("_Remove"), "edit-delete", delete_cb, nullptr);
 GtkWidget * rename_button = audgui_button_new (_("Ren_ame"), "insert-text", rename_cb, nullptr);

audacious-plugins-4.4.1.tar.bz2/src/pls/meson.build Added

audacious-plugins-3.6.2-gtk3.tar.bz2/src/pls/pls.cc -> audacious-plugins-4.4.1.tar.bz2/src/pls/pls.cc Changed

audacious-plugins-3.6.2-gtk3.tar.bz2/src/psf/eng_psf.cc -> audacious-plugins-4.4.1.tar.bz2/src/psf/eng_psf.cc Changed

@@ -31,13 +31,11 @@
 #include <libaudcore/audstrings.h>
 
 #include "ao.h"
-#include "eng_protos.h"
 #include "cpuintrf.h"
 #include "psx.h"
 
 #include "peops/stdafx.h"
 #include "peops/externals.h"
-#include "peops/regs.h"
 #include "peops/registers.h"
 #include "peops/spu.h"
 
@@ -51,23 +49,8 @@
 static char 		psfby256;
 int			psf_refresh = -1;
 
-
-// main RAM
-extern uint32_t psx_ram((2*1024*1024)/4)+4;
-extern uint32_t psx_scratch0x400;
-extern uint32_t initial_ram((2*1024*1024)/4)+4;
-extern uint32_t initial_scratch0x400;
 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_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_t stop, int32_t fade);
-
 int32_t psf_start(uint8_t *buffer, uint32_t length)
 {
 	uint8_t *file, *lib_decoded, *alib_decoded;

audacious-plugins-3.6.2-gtk3.tar.bz2/src/psf/eng_psf2.cc -> audacious-plugins-4.4.1.tar.bz2/src/psf/eng_psf2.cc Changed

@@ -50,7 +50,6 @@
 #include <libaudcore/audstrings.h>
 
 #include "ao.h"
-#include "eng_protos.h"
 #include "cpuintrf.h"
 #include "psx.h"
 
@@ -74,8 +73,6 @@
 static corlett_t	*c = nullptr;
 
 // main RAM
-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;
 
@@ -84,15 +81,6 @@
 static uint32_t fssizeMAX_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_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_t stop, int32_t fade);
-
 static void do_iopmod(uint8_t *start, uint32_t offset)
 {
 	#if DEBUG_LOADER
@@ -118,7 +106,8 @@
 	uint32_t type, addr, offset, size, shent;
 //	uint32_t phoff, phentsize, phnum, shstrndx, name, flags;
 	uint32_t totallen;
-	int i, rec;
+	uint32_t i;
+	uint32_t rec;
 //	FILE *f;
 
 	if (loadAddr & 3)
@@ -272,7 +261,7 @@
 
 static uint32_t load_file_ex(uint8_t *top, uint8_t *start, uint32_t len, const char *file, uint8_t *buf, uint32_t buflen)
 {
-	int32_t numfiles, i, j;
+	uint32_t numfiles, i, j;
 	uint8_t *cptr;
 	uint32_t offs, uncomp, bsize, cofs, uofs;
 	uint32_t X;
@@ -410,7 +399,7 @@
 				uofs += dlength;
 			}
 
-			sprintf(tfn, "iopfiles/%s", cptr);
+			snprintf(tfn, sizeof tfn, "iopfiles/%s", cptr);
 			f = fopen(tfn, "wb");
 			fwrite(buf, uncomp, 1, f);
 			fclose(f);

audacious-plugins-3.6.2-gtk3.tar.bz2/src/psf/eng_spx.cc -> audacious-plugins-4.4.1.tar.bz2/src/psf/eng_spx.cc Changed

audacious-plugins-4.4.1.tar.bz2/src/psf/meson.build Added

audacious-plugins-3.6.2-gtk3.tar.bz2/src/psf/peops/dma.cc -> audacious-plugins-4.4.1.tar.bz2/src/psf/peops/dma.cc Changed

audacious-plugins-3.6.2-gtk3.tar.bz2/src/psf/peops/dma.h -> audacious-plugins-4.4.1.tar.bz2/src/psf/peops/dma.h Changed

audacious-plugins-3.6.2-gtk3.tar.bz2/src/psf/peops/registers.cc -> audacious-plugins-4.4.1.tar.bz2/src/psf/peops/registers.cc Changed

audacious-plugins-3.6.2-gtk3.tar.bz2/src/psf/peops/registers.h -> audacious-plugins-4.4.1.tar.bz2/src/psf/peops/registers.h Changed

audacious-plugins-3.6.2-gtk3.tar.bz2/src/psf/peops/reverb.cc -> audacious-plugins-4.4.1.tar.bz2/src/psf/peops/reverb.cc Changed

audacious-plugins-3.6.2-gtk3.tar.bz2/src/psf/peops/spu.cc -> audacious-plugins-4.4.1.tar.bz2/src/psf/peops/spu.cc Changed

@@ -81,17 +81,14 @@
 
 #include "../peops/stdafx.h"
 #include "../peops/externals.h"
-#include "../peops/regs.h"
 #include "../peops/registers.h"
 #include "../peops/spu.h"
 
 // Enable experimental silence skipping
 // Currently it is too aggressive, destroying the rhythm of some songs
-// See http://redmine.audacious-media-player.org/issues/201
+// See https://github.com/audacious-media-player/audacious/issues/335
 // #define ENABLE_SILENCE_SKIPPING
 
-void SPUirq(void) ;
-
 //#include "PsxMem.h"
 //#include "driver.h"
 
@@ -193,14 +190,20 @@
 int psf_seek(u32 t)
 {
 seektime=t*441/10;
- if(seektime>sampcount) return(1);
+ if(seektime>=sampcount) return(1);
 return(0);
 }
 
+static int endless;
+void setendless(int e)
+{
+ endless=e;
+}
+
 // Counting to 65536 results in full volume offage.
 void setlength(s32 stop, s32 fade)
 {
- if(stop==~0)
+ if(stop==~0 || endless)
 {
 decaybegin=~0;
 }
@@ -461,7 +464,7 @@
 if(sampcount>=decaybegin)
 {
 s32 dmul;
- if(decaybegin!=~0) // Is anyone REALLY going to be playing a song
+ if(decaybegin!=~0U) // Is anyone REALLY going to be playing a song
 		 // for 13 hours?
 {
 if(sampcount>=decayend)
@@ -493,8 +496,10 @@
 // if(sr>32767 || sr < -32767) printf("Right: %d, %f\n",sl,asl);
 //}
 
- if(sl>32767) sl=32767; if(sl<-32767) sl=-32767;
- if(sr>32767) sr=32767; if(sr<-32767) sr=-32767;
+ if(sl>32767) sl=32767;
+ if(sl<-32767) sl=-32767;
+ if(sr>32767) sr=32767;
+ if(sr<-32767) sr=-32767;
 
 *pS++=sl;
 *pS++=sr;
@@ -560,6 +565,7 @@
 memset(spuMem,0,sizeof(spuMem));
 InitADSR();
 sampcount=ttemp=0;
+ seektime=0;
 #ifdef TIMEO
 begintime=gettime64();
 #endif
@@ -570,7 +576,7 @@
 // SETUPSTREAMS: init most of the spu buffers
 ////////////////////////////////////////////////////////////////////////
 
-void SetupStreams(void)
+static void SetupStreams(void)
 {
 int i;
 
@@ -591,7 +597,7 @@
 // REMOVESTREAMS: free most buffer
 ////////////////////////////////////////////////////////////////////////
 
-void RemoveStreams(void)
+static void RemoveStreams(void)
 {
 free(pSpuBuffer); // free mixing buffer
 pSpuBuffer=nullptr;

audacious-plugins-3.6.2-gtk3.tar.bz2/src/psf/peops/spu.h -> audacious-plugins-4.4.1.tar.bz2/src/psf/peops/spu.h Changed

audacious-plugins-3.6.2-gtk3.tar.bz2/src/psf/peops2/adsr.cc -> audacious-plugins-4.4.1.tar.bz2/src/psf/peops2/adsr.cc Changed

audacious-plugins-3.6.2-gtk3.tar.bz2/src/psf/peops2/dma.cc -> audacious-plugins-4.4.1.tar.bz2/src/psf/peops2/dma.cc Changed

audacious-plugins-3.6.2-gtk3.tar.bz2/src/psf/peops2/dma.h -> audacious-plugins-4.4.1.tar.bz2/src/psf/peops2/dma.h Changed

audacious-plugins-3.6.2-gtk3.tar.bz2/src/psf/peops2/externals.h -> audacious-plugins-4.4.1.tar.bz2/src/psf/peops2/externals.h Changed

@@ -106,7 +106,7 @@
  long           ReleaseVol;
  long           lTime;
  long           lVolume;
-} ADSRInfo;
+} ADSRInfo2;
 
 typedef struct
 {
@@ -124,7 +124,7 @@
  long           lVolume;
  long           lDummy1;
  long           lDummy2;
-} ADSRInfoEx;
+} ADSRInfoEx2;
 
 ///////////////////////////////////////////////////////////
 
@@ -186,10 +186,10 @@
  int               bNoise;                             // noise active flag
  int               bFMod;                              // freq mod (0=off, 1=sound channel, 2=freq channel)
  int               iOldNoise;                          // old noise val for this channel
- ADSRInfo          ADSR;                               // active ADSR settings
- ADSRInfoEx        ADSRX;                              // next ADSR settings (will be moved to active on sample start)
+ ADSRInfo2          ADSR;                               // active ADSR settings
+ ADSRInfoEx2        ADSRX;                              // next ADSR settings (will be moved to active on sample start)
 
-} SPUCHAN;
+} SPUCHAN2;
 
 ///////////////////////////////////////////////////////////
 
@@ -239,7 +239,7 @@
  int MIX_DEST_B1;    // (offset)
  int IN_COEF_L;      // (coef.)
  int IN_COEF_R;      // (coef.)
-} REVERBInfo;
+} REVERBInfo2;
 
 #ifdef _WINDOWS
 //extern HINSTANCE hInst;
@@ -274,8 +274,8 @@
 extern int        iDisStereo;
 // MISC
 
-extern SPUCHAN s_chan;
-extern REVERBInfo rvb;
+extern SPUCHAN2 s_chan;
+extern REVERBInfo2 rvb;
 
 extern unsigned long dwNoiseVal;
 extern unsigned short spuCtrl2;

audacious-plugins-3.6.2-gtk3.tar.bz2/src/psf/peops2/registers.cc -> audacious-plugins-4.4.1.tar.bz2/src/psf/peops2/registers.cc Changed

audacious-plugins-3.6.2-gtk3.tar.bz2/src/psf/peops2/registers.h -> audacious-plugins-4.4.1.tar.bz2/src/psf/peops2/registers.h Changed

@@ -104,43 +104,43 @@
 #define PS2_C1_SPUend2 (0x400 + 0x342)
 
 #define H_SPUReverbAddr 0x0da2
- 
+
 #define H_SPUirqAddr 0x0da4
- 
+
 #define H_SPUaddr 0x0da6
- 
+
 #define H_SPUdata 0x0da8
- 
+
 #define H_SPUctrl 0x0daa
- 
+
 #define H_SPUstat 0x0dae
- 
+
 #define H_SPUmvolL 0x0d80
- 
+
 #define H_SPUmvolR 0x0d82
- 
+
 #define H_SPUrvolL 0x0d84
- 
+
 #define H_SPUrvolR 0x0d86
- 
+
 #define H_SPUon1 0x0d88
- 
+
 #define H_SPUon2 0x0d8a
- 
+
 #define H_SPUoff1 0x0d8c
- 
+
 #define H_SPUoff2 0x0d8e
- 
+
 #define H_FMod1 0x0d90
- 
+
 #define H_FMod2 0x0d92
- 
+
 #define H_Noise1 0x0d94
- 
+
 #define H_Noise2 0x0d96
- 
+
 #define H_RVBon1 0x0d98
- 
+
 #define H_RVBon2 0x0d9a
 #define H_SPUMute1 0x0d9c
 #define H_SPUMute2 0x0d9e
@@ -150,6 +150,8 @@
 #define H_ExtRight 0x0db6
 #define H_Reverb 0x0dc0
 
+unsigned short SPU2read(unsigned long reg);
+void SPU2write(unsigned long reg, unsigned short val);
 
 //###########################################################################
 
@@ -175,7 +177,7 @@
 
 SD_S_PMON - Pitch mod; assuming identical to PS1
 SD_S_NON - Noise; assuming identical to PS1
- SD_S_VMIXL, SD_S_VMIXR - Voice mix L/R. Guessing this is just a separate L/R version 
+ SD_S_VMIXL, SD_S_VMIXR - Voice mix L/R. Guessing this is just a separate L/R version
 of the "voice enable" bits on the PS1.
 SD_S_VMIXEL, SD_S_VMIXER - Voice effect mix L/R. Guessing this is just a separate L/R
 version of the "voice reverb enable" bits on the PS1.
@@ -245,7 +247,7 @@
 SPU CORE1's DMA channel is 7
 
 DMA channel 10 is SIF
- 
+
 Original INTR controller at 1F801000-1F80107F
 
 All interrupt handling seems to be done using the old INTR, but
@@ -368,7 +370,7 @@
 1D000030 (word) - read counter of some sort?
 1D000040 (word) - read bits 0x20, 0x40 mean something
 1D000060 (word) - used to detect whether the SIF interface exists
- read must be 0x1D000060, or the top 20 bits must be zero 
+ read must be 0x1D000060, or the top 20 bits must be zero
 */
 
 /*
@@ -412,7 +414,7 @@
 #define IOP_INT_USB (1<<22)
 #define IOP_INT_EXTR (1<<23)
 #define IOP_INT_FWRE (1<<24)
- #define IOP_INT_FDMA (1<<25) 
+ #define IOP_INT_FDMA (1<<25)
 
 // CORE0 => +0x000, CORE1 => +0x400
 
@@ -441,7 +443,7 @@
 #define S_VMIXER(cr) (0x400 * cr + 0x194) // voice output mixing (wet right)
 #define P_MMIX(cr) (0x400 * cr + 0x198) // output type after voice mixing (See paragraph below)
 #define P_ATTR(cr) (0x400 * cr + 0x19A) // core attributes (See paragraph below)
-#define A_IRQA(cr) (0x400 * cr + 0x19C) // IRQ address 
+#define A_IRQA(cr) (0x400 * cr + 0x19C) // IRQ address
 #define S_KON(cr) (0x400 * cr + 0x1A0) // key on (start voice sound generation)
 #define S_KOFF(cr) (0x400 * cr + 0x1A4) // key off (end voice sound generation)
 #define A_TSA(cr) (0x400 * cr + 0x1A8) // DMA transfer start address
@@ -451,30 +453,30 @@
 
 #define A_ESA(cr) (0x400 * cr + 0x2E0) // effects work area start address
 
-#define FB_SRC_A(cr) (0x400 * cr + 0x2E4) 
-#define FB_SRC_B(cr) (0x400 * cr + 0x2E8) 
-#define IIR_DEST_A0(cr) (0x400 * cr + 0x2EC) 
-#define IIR_DEST_A1(cr) (0x400 * cr + 0x2F0) 
-#define ACC_SRC_A0(cr) (0x400 * cr + 0x2F4) 
+#define FB_SRC_A(cr) (0x400 * cr + 0x2E4)
+#define FB_SRC_B(cr) (0x400 * cr + 0x2E8)
+#define IIR_DEST_A0(cr) (0x400 * cr + 0x2EC)
+#define IIR_DEST_A1(cr) (0x400 * cr + 0x2F0)
+#define ACC_SRC_A0(cr) (0x400 * cr + 0x2F4)
 #define ACC_SRC_A1(cr) (0x400 * cr + 0x2F8)
-#define ACC_SRC_B0(cr) (0x400 * cr + 0x2FC) 
-
-#define ACC_SRC_B1(cr) (0x400 * cr + 0x300) 
-#define IIR_SRC_A0(cr) (0x400 * cr + 0x304) 
-#define IIR_SRC_A1(cr) (0x400 * cr + 0x308) 
-#define IIR_DEST_B0(cr) (0x400 * cr + 0x30C) 
-#define IIR_DEST_B1(cr) (0x400 * cr + 0x310) 
-#define ACC_SRC_C0(cr) (0x400 * cr + 0x314) 
-#define ACC_SRC_C1(cr) (0x400 * cr + 0x318) 
-
-#define ACC_SRC_D0(cr) (0x400 * cr + 0x31C) 
-#define ACC_SRC_D1(cr) (0x400 * cr + 0x320) 
-#define IIR_SRC_B1(cr) (0x400 * cr + 0x324) 
-#define IIR_SRC_B0(cr) (0x400 * cr + 0x328) 
-#define MIX_DEST_A0(cr) (0x400 * cr + 0x32C) 
-#define MIX_DEST_A1(cr) (0x400 * cr + 0x330) 
-#define MIX_DEST_B0(cr) (0x400 * cr + 0x334) 
-#define MIX_DEST_B1(cr) (0x400 * cr + 0x338) 
+#define ACC_SRC_B0(cr) (0x400 * cr + 0x2FC)
+
+#define ACC_SRC_B1(cr) (0x400 * cr + 0x300)
+#define IIR_SRC_A0(cr) (0x400 * cr + 0x304)
+#define IIR_SRC_A1(cr) (0x400 * cr + 0x308)
+#define IIR_DEST_B0(cr) (0x400 * cr + 0x30C)
+#define IIR_DEST_B1(cr) (0x400 * cr + 0x310)
+#define ACC_SRC_C0(cr) (0x400 * cr + 0x314)
+#define ACC_SRC_C1(cr) (0x400 * cr + 0x318)
+
+#define ACC_SRC_D0(cr) (0x400 * cr + 0x31C)
+#define ACC_SRC_D1(cr) (0x400 * cr + 0x320)
+#define IIR_SRC_B1(cr) (0x400 * cr + 0x324)
+#define IIR_SRC_B0(cr) (0x400 * cr + 0x328)
+#define MIX_DEST_A0(cr) (0x400 * cr + 0x32C)
+#define MIX_DEST_A1(cr) (0x400 * cr + 0x330)
+#define MIX_DEST_B0(cr) (0x400 * cr + 0x334)
+#define MIX_DEST_B1(cr) (0x400 * cr + 0x338)
 
 #define A_EEA(cr) (0x400 * cr + 0x33C) // effects work area end address
 
@@ -495,22 +497,22 @@
 #define P_MVOLXL(cr) (0x28 * cr + 0x770) // current master volume (left)
 #define P_MVOLXR(cr) (0x28 * cr + 0x772) // current master volume (right)
 
-#define IIR_ALPHA(cr) (0x28 * cr + 0x774) 
-#define ACC_COEF_A(cr) (0x28 * cr + 0x776) 
-#define ACC_COEF_B(cr) (0x28 * cr + 0x778) 
-#define ACC_COEF_C(cr) (0x28 * cr + 0x77A) 
-#define ACC_COEF_D(cr) (0x28 * cr + 0x77C) 
-#define IIR_COEF(cr) (0x28 * cr + 0x77E) 
-#define FB_ALPHA(cr) (0x28 * cr + 0x780) 
-#define FB_X(cr) (0x28 * cr + 0x782) 
-#define IN_COEF_L(cr) (0x28 * cr + 0x784) 
-#define IN_COEF_R(cr) (0x28 * cr + 0x786) 
+#define IIR_ALPHA(cr) (0x28 * cr + 0x774)
+#define ACC_COEF_A(cr) (0x28 * cr + 0x776)
+#define ACC_COEF_B(cr) (0x28 * cr + 0x778)
+#define ACC_COEF_C(cr) (0x28 * cr + 0x77A)
+#define ACC_COEF_D(cr) (0x28 * cr + 0x77C)
+#define IIR_COEF(cr) (0x28 * cr + 0x77E)
+#define FB_ALPHA(cr) (0x28 * cr + 0x780)
+#define FB_X(cr) (0x28 * cr + 0x782)
+#define IN_COEF_L(cr) (0x28 * cr + 0x784)
+#define IN_COEF_R(cr) (0x28 * cr + 0x786)
 
 // CORE1 only => +0x400
 
-#define SPDIF_OUT 0x7C0 // SPDIF Out: OFF/'PCM'/Bitstream/Bypass 
+#define SPDIF_OUT 0x7C0 // SPDIF Out: OFF/'PCM'/Bitstream/Bypass
 #define SPDIF_MODE 0x7C6
-#define SPDIF_MEDIA 0x7C8 // SPDIF Media: 'CD'/DVD	
+#define SPDIF_MEDIA 0x7C8 // SPDIF Media: 'CD'/DVD
 #define SPDIF_COPY 0x7CA // SPDIF Copy Protection
 
 // PS1 SPU CORE
@@ -529,17 +531,17 @@
 #define SPU_P_RVOLL 0xD84 // effect return volume (left)
 #define SPU_P_RVOLR 0xD86 // effect return volume (right)
 #define SPU_S_KON1 0xD88 // key on
-#define SPU_S_KON2 0xD8A // 
+#define SPU_S_KON2 0xD8A //
 #define SPU_S_KOFF1 0xD8C // key off
-#define SPU_S_KOFF2 0xD8E // 
+#define SPU_S_KOFF2 0xD8E //
 #define SPU_S_PMON1 0xD90 // pitch modulation on
-#define SPU_S_PMON2 0xD92 // 
+#define SPU_S_PMON2 0xD92 //
 #define SPU_S_NON1 0xD94 // noise generator on
-#define SPU_S_NON2 0xD96 // 
+#define SPU_S_NON2 0xD96 //
 #define SPU_S_RVBON1 0xD98 // effects on
-#define SPU_S_RVBON2 0xD9A // 
+#define SPU_S_RVBON2 0xD9A //
 #define SPU_S_MUTE1 0xD9C // voice mute
-#define SPU_S_MUTE2 0xD9E // 
+#define SPU_S_MUTE2 0xD9E //
 
 #define SPU_A_ESA 0xDA2 // effects work area start
 #define SPU_A_IRQA 0xDA4 // IRQ address
@@ -585,7 +587,7 @@
 #define S_VMIXER(cr) (0x400 * cr + 0x194) // voice output mixing (wet right)
 #define P_MMIX(cr) (0x400 * cr + 0x198) // output type after voice mixing (See paragraph below)
 #define P_ATTR(cr) (0x400 * cr + 0x19A) // core attributes (See paragraph below)
-#define A_IRQA(cr) (0x400 * cr + 0x19C) // IRQ address 
+#define A_IRQA(cr) (0x400 * cr + 0x19C) // IRQ address
 #define S_KON(cr) (0x400 * cr + 0x1A0) // key on (start voice sound generation)
 #define S_KOFF(cr) (0x400 * cr + 0x1A4) // key off (end voice sound generation)
 #define A_TSA(cr) (0x400 * cr + 0x1A8) // DMA transfer start address
@@ -599,30 +601,30 @@
 // Core 0 Reverb Addresses
 
 
-#define FB_SRC_A(cr) (0x400 * cr + 0x2E4) 
-#define FB_SRC_B(cr) (0x400 * cr + 0x2E8) 
-#define IIR_DEST_A0(cr) (0x400 * cr + 0x2EC) 
-#define IIR_DEST_A1(cr) (0x400 * cr + 0x2F0) 
-#define ACC_SRC_A0(cr) (0x400 * cr + 0x2F4) 
+#define FB_SRC_A(cr) (0x400 * cr + 0x2E4)
+#define FB_SRC_B(cr) (0x400 * cr + 0x2E8)
+#define IIR_DEST_A0(cr) (0x400 * cr + 0x2EC)
+#define IIR_DEST_A1(cr) (0x400 * cr + 0x2F0)
+#define ACC_SRC_A0(cr) (0x400 * cr + 0x2F4)
 #define ACC_SRC_A1(cr) (0x400 * cr + 0x2F8)
-#define ACC_SRC_B0(cr) (0x400 * cr + 0x2FC) 
-
-#define ACC_SRC_B1(cr) (0x400 * cr + 0x300) 
-#define IIR_SRC_A0(cr) (0x400 * cr + 0x304) 
-#define IIR_SRC_A1(cr) (0x400 * cr + 0x308) 
-#define IIR_DEST_B0(cr) (0x400 * cr + 0x30C) 
-#define IIR_DEST_B1(cr) (0x400 * cr + 0x310) 
-#define ACC_SRC_C0(cr) (0x400 * cr + 0x314) 
-#define ACC_SRC_C1(cr) (0x400 * cr + 0x318) 
-
-#define ACC_SRC_D0(cr) (0x400 * cr + 0x31C) 
-#define ACC_SRC_D1(cr) (0x400 * cr + 0x320) 
-#define IIR_SRC_B1(cr) (0x400 * cr + 0x324) 
-#define IIR_SRC_B0(cr) (0x400 * cr + 0x328) 
-#define MIX_DEST_A0(cr) (0x400 * cr + 0x32C) 
-#define MIX_DEST_A1(cr) (0x400 * cr + 0x330) 
-#define MIX_DEST_B0(cr) (0x400 * cr + 0x334) 
-#define MIX_DEST_B1(cr) (0x400 * cr + 0x338) 
+#define ACC_SRC_B0(cr) (0x400 * cr + 0x2FC)
+
+#define ACC_SRC_B1(cr) (0x400 * cr + 0x300)
+#define IIR_SRC_A0(cr) (0x400 * cr + 0x304)
+#define IIR_SRC_A1(cr) (0x400 * cr + 0x308)
+#define IIR_DEST_B0(cr) (0x400 * cr + 0x30C)
+#define IIR_DEST_B1(cr) (0x400 * cr + 0x310)
+#define ACC_SRC_C0(cr) (0x400 * cr + 0x314)
+#define ACC_SRC_C1(cr) (0x400 * cr + 0x318)
+
+#define ACC_SRC_D0(cr) (0x400 * cr + 0x31C)
+#define ACC_SRC_D1(cr) (0x400 * cr + 0x320)
+#define IIR_SRC_B1(cr) (0x400 * cr + 0x324)
+#define IIR_SRC_B0(cr) (0x400 * cr + 0x328)
+#define MIX_DEST_A0(cr) (0x400 * cr + 0x32C)
+#define MIX_DEST_A1(cr) (0x400 * cr + 0x330)
+#define MIX_DEST_B0(cr) (0x400 * cr + 0x334)
+#define MIX_DEST_B1(cr) (0x400 * cr + 0x338)
 
 #define A_EEA(cr) (0x400 * cr + 0x33C) // effects work area end address
 
@@ -649,23 +651,23 @@
 // More CORE 0 Reverb
 
 
-#define IIR_ALPHA(cr) (0x28 * cr + 0x774) 
-#define ACC_COEF_A(cr) (0x28 * cr + 0x776) 
-#define ACC_COEF_B(cr) (0x28 * cr + 0x778) 
-#define ACC_COEF_C(cr) (0x28 * cr + 0x77A) 
-#define ACC_COEF_D(cr) (0x28 * cr + 0x77C) 
-#define IIR_COEF(cr) (0x28 * cr + 0x77E) 
-#define FB_ALPHA(cr) (0x28 * cr + 0x780) 
-#define FB_X(cr) (0x28 * cr + 0x782) 
-#define IN_COEF_L(cr) (0x28 * cr + 0x784) 
-#define IN_COEF_R(cr) (0x28 * cr + 0x786) 
+#define IIR_ALPHA(cr) (0x28 * cr + 0x774)
+#define ACC_COEF_A(cr) (0x28 * cr + 0x776)
+#define ACC_COEF_B(cr) (0x28 * cr + 0x778)
+#define ACC_COEF_C(cr) (0x28 * cr + 0x77A)
+#define ACC_COEF_D(cr) (0x28 * cr + 0x77C)
+#define IIR_COEF(cr) (0x28 * cr + 0x77E)
+#define FB_ALPHA(cr) (0x28 * cr + 0x780)
+#define FB_X(cr) (0x28 * cr + 0x782)
+#define IN_COEF_L(cr) (0x28 * cr + 0x784)
+#define IN_COEF_R(cr) (0x28 * cr + 0x786)
 
 
 // CORE 1 only
 
-#define SPDIF_OUT 0x7C0 // SPDIF Out: OFF/'PCM'/Bitstream/Bypass 
-#define SPDIF_MODE 0x7C6 
-#define SPDIF_MEDIA 0x7C8 // SPDIF Media: 'CD'/DVD	
+#define SPDIF_OUT 0x7C0 // SPDIF Out: OFF/'PCM'/Bitstream/Bypass
+#define SPDIF_MODE 0x7C6
+#define SPDIF_MEDIA 0x7C8 // SPDIF Media: 'CD'/DVD
 #define SPDIF_COPY 0x7CA // SPDIF Copy Protection
 */
 
@@ -688,17 +690,17 @@
 #define SPU_P_RVOLL 0xD84 // effect return volume (left)
 #define SPU_P_RVOLR 0xD86 // effect return volume (right)
 #define SPU_S_KON1 0xD88 // key on
-#define SPU_S_KON2 0xD8A // 
+#define SPU_S_KON2 0xD8A //
 #define SPU_S_KOFF1 0xD8C // key off
-#define SPU_S_KOFF2 0xD8E // 
+#define SPU_S_KOFF2 0xD8E //
 #define SPU_S_PMON1 0xD90 // pitch modulation on
-#define SPU_S_PMON2 0xD92 // 
+#define SPU_S_PMON2 0xD92 //
 #define SPU_S_NON1 0xD94 // noise generator on
-#define SPU_S_NON2 0xD96 // 
+#define SPU_S_NON2 0xD96 //
 #define SPU_S_RVBON1 0xD98 // effects on
-#define SPU_S_RVBON2 0xD9A // 
+#define SPU_S_RVBON2 0xD9A //
 #define SPU_S_MUTE1 0xD9C // voice mute
-#define SPU_S_MUTE2 0xD9E // 
+#define SPU_S_MUTE2 0xD9E //
 
 #define SPU_A_ESA 0xDA2 // effects work area start
 #define SPU_A_IRQA 0xDA4 // IRQ address

audacious-plugins-3.6.2-gtk3.tar.bz2/src/psf/peops2/regs.h -> audacious-plugins-4.4.1.tar.bz2/src/psf/peops2/regs.h Changed

audacious-plugins-3.6.2-gtk3.tar.bz2/src/psf/peops2/reverb.cc -> audacious-plugins-4.4.1.tar.bz2/src/psf/peops2/reverb.cc Changed

@@ -57,7 +57,7 @@
 // START REVERB
 ////////////////////////////////////////////////////////////////////////
 
-void StartREVERB(int ch)
+static void StartREVERB(int ch)
 {
 int core=ch/24;
 
@@ -85,7 +85,7 @@
 // STORE REVERB
 ////////////////////////////////////////////////////////////////////////
 
-void StoreREVERB(int ch,int ns)
+static void StoreREVERB(int ch,int ns)
 {
 int core=ch/24;
 
@@ -122,7 +122,8 @@
 iOff=(iOff)+rvbcore.CurrAddr;
 while(iOff>rvbcore.EndAddr) iOff=rvbcore.StartAddr+(iOff-(rvbcore.EndAddr+1));
 while(iOff<rvbcore.StartAddr) iOff=rvbcore.EndAddr-(rvbcore.StartAddr-iOff);
- if(iVal<-32768L) iVal=-32768L;if(iVal>32767L) iVal=32767L;
+ if(iVal<-32768L) iVal=-32768L;
+ if(iVal>32767L) iVal=32767L;
 *(p+iOff)=(short)iVal;
 }
 
@@ -134,13 +135,14 @@
 iOff=(iOff)+rvbcore.CurrAddr+1;
 while(iOff>rvbcore.EndAddr) iOff=rvbcore.StartAddr+(iOff-(rvbcore.EndAddr+1));
 while(iOff<rvbcore.StartAddr) iOff=rvbcore.EndAddr-(rvbcore.StartAddr-iOff);
- if(iVal<-32768L) iVal=-32768L;if(iVal>32767L) iVal=32767L;
+ if(iVal<-32768L) iVal=-32768L;
+ if(iVal>32767L) iVal=32767L;
 *(p+iOff)=(short)iVal;
 }
 
 ////////////////////////////////////////////////////////////////////////
 
-int MixREVERBLeft(int ns,int core)
+static int MixREVERBLeft(int ns,int core)
 {
 if(iUseReverb==1)
 {
@@ -227,7 +229,7 @@
 
 ////////////////////////////////////////////////////////////////////////
 
-int MixREVERBRight(int core)
+static int MixREVERBRight(int core)
 {
 if(iUseReverb==1) // Neill's reverb:
 {

audacious-plugins-3.6.2-gtk3.tar.bz2/src/psf/peops2/spu.cc -> audacious-plugins-4.4.1.tar.bz2/src/psf/peops2/spu.cc Changed

@@ -102,6 +102,7 @@
 #include "../peops2/externals.h"
 #include "../peops2/regs.h"
 #include "../peops2/dma.h"
+#include "../peops2/spu.h"
 
 ////////////////////////////////////////////////////////////////////////
 // globals
@@ -128,8 +129,8 @@
 
 // MAIN infos struct for each channel
 
-SPUCHAN s_chanMAXCHAN+1; // channel + 1 infos (1 is security for fmod handling)
-REVERBInfo rvb2;
+SPUCHAN2 s_chanMAXCHAN+1; // channel + 1 infos (1 is security for fmod handling)
+REVERBInfo2 rvb2;
 
 unsigned long dwNoiseVal=1; // global noise generator
 
@@ -332,15 +333,20 @@
 int psf2_seek(u32 t)
 {
 seektime=t*441/10;
- if(seektime>sampcount) return(1);
+ if(seektime>=sampcount) return(1);
 return(0);
 }
 
+static int endless;
+void setendless2(int e)
+{
+ endless=e;
+}
+
 // Counting to 65536 results in full volume offage.
 void setlength2(s32 stop, s32 fade)
 {
- seektime = 0;
- if(stop==~0)
+ if(stop==~0 || endless)
 {
 decaybegin=~0;
 }
@@ -735,13 +741,15 @@
 d=SSumL0;SSumL0=0;
 d2=SSumR0;SSumR0=0;
 
- if(d<-32767) d=-32767;if(d>32767) d=32767;
- if(d2<-32767) d2=-32767;if(d2>32767) d2=32767;
+ if(d<-32767) d=-32767;
+ if(d>32767) d=32767;
+ if(d2<-32767) d2=-32767;
+ if(d2>32767) d2=32767;
 
 if(sampcount>=decaybegin)
 {
 s32 dmul;
- if(decaybegin!=~0) // Is anyone REALLY going to be playing a song
+ if(decaybegin!=~0U) // Is anyone REALLY going to be playing a song
 // for 13 hours?
 {
 if(sampcount>=decayend)
@@ -829,10 +837,11 @@
 EXPORT_GCC long CALLBACK SPU2init(void)
 {
 spuMemC=(unsigned char *)spuMem; // just small setup
- memset((void *)s_chan,0,MAXCHAN*sizeof(SPUCHAN));
- memset(rvb,0,2*sizeof(REVERBInfo));
+ memset((void *)s_chan,0,MAXCHAN*sizeof(SPUCHAN2));
+ memset(rvb,0,2*sizeof(REVERBInfo2));
 
 sampcount = 0;
+ seektime = 0;
 
 InitADSR();
 
@@ -938,7 +947,7 @@
 bEndThread=0;
 bThreadEnded=0;
 spuMemC=(unsigned char *)spuMem;
- memset((void *)s_chan,0,(MAXCHAN+1)*sizeof(SPUCHAN));
+ memset((void *)s_chan,0,(MAXCHAN+1)*sizeof(SPUCHAN2));
 pSpuIrq0=0;
 pSpuIrq1=0;
 iSPUIRQWait=1;
@@ -991,6 +1000,7 @@
 RemoveStreams(); // no more streaming
 }
 
+#if 0
 ////////////////////////////////////////////////////////////////////////
 // SPUSHUTDOWN: called by main emu on final exit
 ////////////////////////////////////////////////////////////////////////
@@ -1032,3 +1042,4 @@
 {
 cddavCallback = CDDAVcallback;
 }
+#endif

audacious-plugins-3.6.2-gtk3.tar.bz2/src/psf/peops2/spu.h -> audacious-plugins-4.4.1.tar.bz2/src/psf/peops2/spu.h Changed

audacious-plugins-3.6.2-gtk3.tar.bz2/src/psf/plugin.cc -> audacious-plugins-4.4.1.tar.bz2/src/psf/plugin.cc Changed

@@ -1,27 +1,27 @@
 /*
-	Audio Overload SDK - main driver. for demonstration only, not user friendly!
+ Audio Overload SDK - main driver. for demonstration only, not user friendly!
 
-	Copyright (c) 2007-2008 R. Belmont and Richard Bannister.
+ Copyright (c) 2007-2008 R. Belmont and Richard Bannister.
 
-	All rights reserved.
+ All rights reserved.
 
-	Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+ 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.
-	* Neither the names of R. Belmont and Richard Bannister nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+ * 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.
+ * Neither the names of R. Belmont and Richard Bannister nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
 
-	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 OWNER 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.
+ 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 OWNER 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.
 */
 
 #include <stdio.h>
@@ -30,186 +30,245 @@
 
 #include <libaudcore/i18n.h>
 #include <libaudcore/plugin.h>
+#include <libaudcore/preferences.h>
 #include <libaudcore/audstrings.h>
+#include <libaudcore/runtime.h>
 
 #include "ao.h"
 #include "corlett.h"
-#include "eng_protos.h"
+#include "psx.h"
+
+#include "peops/spu.h"
+#include "peops2/spu.h"
 
 class PSFPlugin : public InputPlugin
 {
 public:
-	static const char *const exts;
+ static const char *const exts;
+ static const char *const defaults;
+ static const PreferencesWidget widgets;
+ static const PluginPreferences prefs;
+
+ static constexpr PluginInfo info = {
+ N_("OpenPSF PSF1/PSF2 Decoder"),
+ PACKAGE,
+ nullptr,
+ & prefs
 
-	static constexpr PluginInfo info = {
-		N_("OpenPSF PSF1/PSF2 Decoder"),
-		PACKAGE
-	};
+ };
 
-	static constexpr auto iinfo = InputInfo()
-		.with_exts(exts);
+ constexpr PSFPlugin() : InputPlugin(info, InputInfo()
+ .with_exts(exts)) {}
 
-	constexpr PSFPlugin() : InputPlugin(info, iinfo) {}
+ bool init();
 
-	bool is_our_file(const char *filename, VFSFile &file);
-	Tuple read_tuple(const char *filename, VFSFile &file);
-	bool play(const char *filename, VFSFile &file);
+ bool is_our_file(const char *filename, VFSFile &file);
+ bool read_tag(const char *filename, VFSFile &file, Tuple &tuple, Index<char> *image);
+ bool play(const char *filename, VFSFile &file);
 
 protected:
-	static void update(const void *data, int bytes);
+ static void update(const void *data, int bytes);
 };
 
 EXPORT PSFPlugin aud_plugin_instance;
 
 typedef enum {
-	ENG_NONE = 0,
-	ENG_PSF1,
-	ENG_PSF2,
-	ENG_SPX,
-	ENG_COUNT
+ ENG_NONE = 0,
+ ENG_PSF1,
+ ENG_PSF2,
+ ENG_SPX,
+ ENG_COUNT
 } PSFEngine;
 
 typedef struct {
-	int32_t (*start)(uint8_t *buffer, uint32_t length);
-	int32_t (*stop)(void);
-	int32_t (*seek)(uint32_t);
-	int32_t (*execute)(void (*update)(const void *, int));
+ int32_t (*start)(uint8_t *buffer, uint32_t length);
+ int32_t (*stop)(void);
+ int32_t (*seek)(uint32_t);
+ int32_t (*execute)(void (*update)(const void *, int));
 } PSFEngineFunctors;
 
 static PSFEngineFunctors psf_functor_mapENG_COUNT = {
-	{nullptr, nullptr, nullptr, nullptr},
-	{psf_start, psf_stop, psf_seek, psf_execute},
-	{psf2_start, psf2_stop, psf2_seek, psf2_execute},
-	{spx_start, spx_stop, psf_seek, spx_execute},
+ {nullptr, nullptr, nullptr, nullptr},
+ {psf_start, psf_stop, psf_seek, psf_execute},
+ {psf2_start, psf2_stop, psf2_seek, psf2_execute},
+ {spx_start, spx_stop, psf_seek, spx_execute},
+};
+
+const char* const PSFPlugin::defaults =
+{
+ "ignore_length", "FALSE",
+ nullptr
 };
 
+bool PSFPlugin::init()
+{
+ aud_config_set_defaults("psf", defaults);
+ return true;
+}
+
 static PSFEngineFunctors *f;
 static String dirpath;
 
 bool stop_flag = false;
 
+/* The emulation engine can only seek forward, not back. This variable is set
+ * a non-negative time (milliseconds) when the song is to be restarted in order
+ * to seek backward. */
+static int reverse_seek;
+
 static PSFEngine psf_probe(const char *buf, int len)
 {
-	if (len < 4)
-		return ENG_NONE;
+ if (len < 4)
+ return ENG_NONE;
 
-	if (!memcmp(buf, "PSF\x01", 4))
-		return ENG_PSF1;
+ if (!memcmp(buf, "PSF\x01", 4))
+ return ENG_PSF1;
 
-	if (!memcmp(buf, "PSF\x02", 4))
-		return ENG_PSF2;
+ if (!memcmp(buf, "PSF\x02", 4))
+ return ENG_PSF2;
 
-	if (!memcmp(buf, "SPU", 3))
-		return ENG_SPX;
+ if (!memcmp(buf, "SPU", 3))
+ return ENG_SPX;
 
-	if (!memcmp(buf, "SPX", 3))
-		return ENG_SPX;
+ if (!memcmp(buf, "SPX", 3))
+ return ENG_SPX;
 
-	return ENG_NONE;
+ return ENG_NONE;
 }
 
 /* ao_get_lib: called to load secondary files */
 Index<char> ao_get_lib(char *filename)
 {
-	VFSFile file(filename_build({dirpath, filename}), "r");
-	return file ? file.read_all() : Index<char>();
+ VFSFile file(filename_build({dirpath, filename}), "r");
+ return file ? file.read_all() : Index<char>();
 }
 
-Tuple PSFPlugin::read_tuple(const char *filename, VFSFile &file)
+bool PSFPlugin::read_tag(const char *filename, VFSFile &file, Tuple &tuple, Index<char> *image)
 {
-	Tuple t;
-	corlett_t *c;
-
-	Index<char> buf = file.read_all ();
+ Index<char> buf = file.read_all ();
+ if (!buf.len())
+ return false;
+
+ corlett_t *c;
+ if (corlett_decode((uint8_t *)buf.begin(), buf.len(), nullptr, nullptr, &c) != AO_SUCCESS)
+ return false;
+
+ tuple.set_int(Tuple::Length, psfTimeToMS(c->inf_length) + psfTimeToMS(c->inf_fade));
+ tuple.set_str(Tuple::Artist, c->inf_artist);
+ tuple.set_str(Tuple::Album, c->inf_game);
+ tuple.set_str(Tuple::Title, c->inf_title);
+ tuple.set_str(Tuple::Copyright, c->inf_copy);
+ tuple.set_str(Tuple::Quality, _("sequenced"));
+ tuple.set_str(Tuple::Codec, "PlayStation 1/2 Audio");
+ tuple.set_int(Tuple::Channels, 2);
+
+ free(c);
+
+ return true;
+}
 
-	if (!buf.len())
-		return t;
+bool PSFPlugin::play(const char *filename, VFSFile &file)
+{
+ bool error = false;
 
-	if (corlett_decode((uint8_t *)buf.begin(), buf.len(), nullptr, nullptr, &c) != AO_SUCCESS)
-		return t;
+ const char * slash = strrchr (filename, '/');
+ if (! slash)
+ return false;
 
-	t.set_filename (filename);
+ dirpath = String (str_copy (filename, slash + 1 - filename));
 
-	t.set_int (Tuple::Length, psfTimeToMS(c->inf_length) + psfTimeToMS(c->inf_fade));
-	t.set_str (Tuple::Artist, c->inf_artist);
-	t.set_str (Tuple::Album, c->inf_game);
-	t.set_str (Tuple::Title, c->inf_title);
-	t.set_str (Tuple::Copyright, c->inf_copy);
-	t.set_str (Tuple::Quality, _("sequenced"));
-	t.set_str (Tuple::Codec, "PlayStation 1/2 Audio");
+ Index<char> buf = file.read_all ();
 
-	free(c);
+ bool ignore_len = aud_get_bool("psf", "ignore_length");
 
-	return t;
-}
+ PSFEngine eng = psf_probe(buf.begin(), buf.len());
+ if (eng == ENG_NONE || eng == ENG_COUNT)
+ {
+ error = true;
+ goto cleanup;
+ }
 
-bool PSFPlugin::play(const char *filename, VFSFile &file)
-{
-	bool error = false;
+ if(eng == ENG_PSF1 || eng == ENG_SPX)
+ setendless(ignore_len);
 
-	const char * slash = strrchr (filename, '/');
-	if (! slash)
-		return false;
+ if(eng == ENG_PSF2)
+ setendless2(ignore_len);
 
-	dirpath = String (str_copy (filename, slash + 1 - filename));
+ f = &psf_functor_mapeng;
 
-	Index<char> buf = file.read_all ();
+ set_stream_bitrate(44100*2*2*8);
+ open_audio(FMT_S16_NE, 44100, 2);
 
-	PSFEngine eng = psf_probe(buf.begin(), buf.len());
-	if (eng == ENG_NONE || eng == ENG_COUNT)
-	{
-		error = true;
-		goto cleanup;
-	}
+ reverse_seek = -1;
 
-	f = &psf_functor_mapeng;
-	if (f->start((uint8_t *)buf.begin(), buf.len()) != AO_SUCCESS)
-	{
-		error = true;
-		goto cleanup;
-	}
+ /* This loop will restart playback from the beginning when necessary to seek
+ * backwards in the file (reverse_seek >= 0). */
+ do
+ {
+ if (f->start((uint8_t *)buf.begin(), buf.len()) != AO_SUCCESS)
+ {
+ error = true;
+ goto cleanup;
+ }
 
-	set_stream_bitrate(44100*2*2*8);
-	open_audio(FMT_S16_NE, 44100, 2);
+ if (reverse_seek >= 0)
+ {
+ f->seek(reverse_seek); /* should never fail here */
+ reverse_seek = -1;
+ }
 
-	stop_flag = false;
+ stop_flag = false;
 
-	f->execute(update);
-	f->stop();
+ f->execute(update);
+ f->stop();
+ }
+ while (reverse_seek >= 0);
 
 cleanup:
-	f = nullptr;
-	dirpath = String ();
+ f = nullptr;
+ dirpath = String ();
 
-	return ! error;
+ return ! error;
 }
 
 void PSFPlugin::update(const void *data, int bytes)
 {
-	if (!data || check_stop())
-	{
-		stop_flag = true;
-		return;
-	}
-
-	int seek = check_seek();
-
-	if (seek >= 0)
-	{
-		f->seek(seek);
-		return;
-	}
-
-	write_audio(data, bytes);
+ if (!data || check_stop())
+ {
+ stop_flag = true;
+ return;
+ }
+
+ int seek = check_seek();
+
+ if (seek >= 0)
+ {
+ if (!f->seek(seek))
+ {
+ reverse_seek = seek;
+ stop_flag = true;
+ }
+
+ return;
+ }
+
+ write_audio(data, bytes);
 }
 
 bool PSFPlugin::is_our_file(const char *filename, VFSFile &file)
 {
-	char magic4;
-	if (file.fread (magic, 1, 4) < 4)
-		return false;
+ char magic4;
+ if (file.fread (magic, 1, 4) < 4)
+ return false;
 
-	return (psf_probe(magic, 4) != ENG_NONE);
+ return (psf_probe(magic, 4) != ENG_NONE);
 }
 
 const char *const PSFPlugin::exts = { "psf", "minipsf", "psf2", "minipsf2", "spu", "spx", nullptr };
+
+const PreferencesWidget PSFPlugin::widgets = {
+ WidgetLabel(N_("OpenPSF Configuration")),
+ WidgetCheck(N_("Ignore length from file"), WidgetBool("psf", "ignore_length")),
+};
+
+const PluginPreferences PSFPlugin::prefs = {{widgets}};

audacious-plugins-3.6.2-gtk3.tar.bz2/src/psf/psx.cc -> audacious-plugins-4.4.1.tar.bz2/src/psf/psx.cc Changed

@@ -61,15 +61,6 @@
 #define CAUSE_CE2 ( 2L << 28 )
 #define CAUSE_BD ( 1L << 31 )
 
-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_t mips_reg_layout =
 {
 	MIPS_PC, 0xFF,
@@ -213,12 +204,12 @@
 };
 
 #if 1
-void GTELOG(const char *a,...)
+static void GTELOG(const char *a,...)
 {
 	va_list va;
 	char s_text 1024 ;
 	va_start( va, a );
-	vsprintf( s_text, a, va );
+	vsnprintf( s_text, sizeof s_text, a, va );
 	va_end( va );
 	logerror( "%08x: GTE: %08x %s\n", mipscpu.pc, INS_COFUN( mipscpu.op ), s_text );
 }
@@ -233,7 +224,7 @@
 static void docop2( int gteop );
 static void mips_exception( int exception );
 
-void mips_stop( void )
+static void mips_stop( void )
 {
 #ifdef MAME_DEBUG
 	extern int debug_key_pressed;
@@ -1723,14 +1714,14 @@
 * Return a formatted string for a register
 ****************************************************************************/
 
-offs_t mips_dasm( char *buffer, offs_t pc )
+static offs_t mips_dasm( char *buffer, offs_t pc )
 {
 	offs_t ret;
 	change_pc( pc );
 #ifdef MAME_DEBUG
 	ret = DasmMIPS( buffer, pc );
 #else
-	sprintf( buffer, "$%08x", cpu_readop32( pc ) );
+	snprintf( buffer, 10, "$%08x", cpu_readop32( pc ) );
 	ret = 4;
 #endif
 	change_pc( mipscpu.pc );

audacious-plugins-3.6.2-gtk3.tar.bz2/src/psf/psx.h -> audacious-plugins-4.4.1.tar.bz2/src/psf/psx.h Changed

@@ -5,7 +5,7 @@
 //#include "driver.h"
 
 typedef void genf(void);
-typedef int offs_t;
+typedef uint32_t offs_t;
 
 #define cpu_readop32(pc) program_read_dword_32le(pc)
 #define change_pc(pc)																	\
@@ -285,4 +285,68 @@
 extern void psxcpu_get_info(uint32_t state, union cpuinfo *info);
 #endif
 
+/* eng_psf.cc */
+extern int psf_refresh;
+
+int32_t psf_start(uint8_t *buffer, uint32_t length);
+int32_t psf_execute(void (*update)(const void *, int));
+int32_t psf_stop(void);
+
+/* eng_psf2.cc */
+uint32_t psf2_load_elf(uint8_t *start, uint32_t len);
+uint32_t psf2_load_file(const char *file, uint8_t *buf, uint32_t buflen);
+int32_t psf2_start(uint8_t *, uint32_t length);
+int32_t psf2_execute(void (*update)(const void *, int));
+int32_t psf2_stop(void);
+int32_t psf2_command(int32_t, int32_t);
+uint32_t psf2_get_loadaddr(void);
+void psf2_set_loadaddr(uint32_t addr);
+
+/* eng_spx.cc */
+int32_t spx_start(uint8_t *buffer, uint32_t length);
+int32_t spx_execute(void (*update)(const void *, int));
+int32_t spx_stop(void);
+
+/* plugin.cc */
+extern bool stop_flag;
+
+/* psx.cc */
+void mips_init(void);
+void mips_reset(void *param);
+void mips_shorten_frame(void);
+int mips_execute(int cycles);
+void mips_set_info(uint32_t state, union cpuinfo *info);
+void mips_get_info(uint32_t state, union cpuinfo *info);
+uint32_t mips_get_cause(void);
+uint32_t mips_get_status(void);
+void mips_set_status(uint32_t status);
+uint32_t mips_get_ePC(void);
+int mips_get_icount(void);
+void mips_set_icount(int count);
+
+/* psx_hw.cc */
+extern uint32_t psx_ram((2*1024*1024)/4)+4;
+extern uint32_t psx_scratch0x400;
+extern uint32_t initial_ram((2*1024*1024)/4)+4;
+extern uint32_t initial_scratch0x400;
+
+void psx_hw_slice(void);
+void ps2_hw_slice(void);
+void psx_hw_frame(void);
+void ps2_hw_frame(void);
+
+void psx_hw_init(void);
+void psx_bios_hle(uint32_t pc);
+void psx_hw_runcounters(void);
+
+uint8_t program_read_byte_32le(offs_t address);
+uint16_t program_read_word_32le(offs_t address);
+uint32_t program_read_dword_32le(offs_t address);
+
+void program_write_byte_32le(offs_t address, uint8_t data);
+void program_write_word_32le(offs_t address, uint16_t data);
+void program_write_dword_32le(offs_t address, uint32_t data);
+
+void psx_iop_call(uint32_t pc, uint32_t callnum);
+
 #endif

audacious-plugins-3.6.2-gtk3.tar.bz2/src/psf/psx_hw.cc -> audacious-plugins-4.4.1.tar.bz2/src/psf/psx_hw.cc Changed

@@ -52,6 +52,12 @@
 #include "cpuintrf.h"
 #include "psx.h"
 
+#include "peops/dma.h"
+#include "peops/registers.h"
+#include "peops/spu.h"
+#include "peops2/dma.h"
+#include "peops2/registers.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
@@ -61,41 +67,12 @@
 
 #define LE32(x) FROM_LE32(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_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_t psf2_load_file(const 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);
-
-extern int psf_refresh;
-
-// SPU2
-extern void SPU2write(unsigned long reg, unsigned short val);
-extern unsigned short SPU2read(unsigned long reg);
-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);
-
 #define MAX_FILE_SLOTS	(32)
 
 static volatile int softcall_target = 0;
 static int filestatMAX_FILE_SLOTS;
 static uint8_t *filedataMAX_FILE_SLOTS;
 static uint32_t filesizeMAX_FILE_SLOTS, fileposMAX_FILE_SLOTS;
-uint32_t psf2_get_loadaddr(void);
-void psf2_set_loadaddr(uint32_t addr);
 static void call_irq_routine(uint32_t routine, uint32_t parameter);
 static int intr_susp = 0;
 
@@ -236,10 +213,10 @@
 #define EvMdNOINTR	0x2000
 
 // PSX main RAM
-uint32_t psx_ram(2*1024*1024)/4;
+uint32_t psx_ram(2*1024*1024)/4+4;
 uint32_t psx_scratch0x400;
 // backup image to restart songs
-uint32_t initial_ram(2*1024*1024)/4;
+uint32_t initial_ram(2*1024*1024)/4+4;
 uint32_t initial_scratch0x400;
 
 static uint32_t spu_delay, dma_icr, irq_data, irq_mask, dma_timer, WAI;
@@ -468,7 +445,7 @@
 	}
 }
 
-void psx_irq_set(uint32_t irq)
+static void psx_irq_set(uint32_t irq)
 {
 	irq_data |= irq;
 
@@ -477,9 +454,9 @@
 
 static uint32_t gpu_stat = 0;
 
-uint32_t psx_hw_read(offs_t offset, uint32_t mem_mask)
+static uint32_t psx_hw_read(offs_t offset, uint32_t mem_mask)
 {
-	if (offset >= 0x00000000 && offset <= 0x007fffff)
+	if (offset <= 0x007fffff)
 	{
 		offset &= 0x1fffff;
 		return LE32(psx_ramoffset>>2);
@@ -670,11 +647,11 @@
 	dma7_delay = 80;
 }
 
-void psx_hw_write(offs_t offset, uint32_t data, uint32_t mem_mask)
+static void psx_hw_write(offs_t offset, uint32_t data, uint32_t mem_mask)
 {
 	union cpuinfo mipsinfo;
 
-	if (offset >= 0x00000000 && offset <= 0x007fffff)
+	if (offset <= 0x007fffff)
 	{
 		offset &= 0x1fffff;
 //		if (offset < 0x10000) printf("Write %x to kernel @ %x\n", data, offset);
@@ -953,11 +930,6 @@
 
 static uint32_t heap_addr, entry_int = 0;
 
-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_t irq_regs37;
 
 static int irq_mutex = 0;
@@ -1038,7 +1010,7 @@
 	irq_mutex = 0;
 }
 
-void psx_bios_exception(uint32_t pc)
+static void psx_bios_exception(uint32_t pc)
 {
 	uint32_t a0, status;
 	union cpuinfo mipsinfo;
@@ -2120,7 +2092,7 @@
 				mips_get_info(curparm, &mipsinfo);
 //				printf("parameter %d = %x\n", curparm-pstart, mipsinfo.i);
 				curparm++;
-				sprintf(temp, tfmt, (int32_t)mipsinfo.i);
+				snprintf(temp, sizeof temp, tfmt, (int32_t)mipsinfo.i);
 			}
 			else
 			{
@@ -2130,7 +2102,7 @@
 				pstr = (char *)psx_ram;
 				pstr += (mipsinfo.i & 0x1fffff);
 
-				sprintf(temp, tfmt, pstr);
+				snprintf(temp, sizeof temp, tfmt, pstr);
 			}
 
 			pstr = &temp0;
@@ -3216,7 +3188,7 @@
 
 				// filter out ESC characters
 				{
-					int ch;
+					size_t ch;
 
 					for (ch = 0; ch < strlen(out); ch++)
 					{
@@ -3267,7 +3239,7 @@
 				if (psf2_load_file(mname, tempmem, 2*1024*1024) != 0xffffffff)
 				{
 					uint32_t start;
-					int i;
+					uint32_t i;
 
 					start = psf2_load_elf(tempmem, 2*1024*1024);

audacious-plugins-4.4.1.tar.bz2/src/pulse Added

audacious-plugins-4.4.1.tar.bz2/src/pulse/Makefile Changed

audacious-plugins-4.4.1.tar.bz2/src/pulse/meson.build Added

audacious-plugins-4.4.1.tar.bz2/src/pulse/pulse_audio.cc Added

@@ -0,0 +1,608 @@
+/***
+ This file is part of xmms-pulse.
+
+ Updates for Audacious are:
+ Copyright 2016 John Lindgren
+
+ xmms-pulse 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.
+
+ xmms-pulse 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 xmms-pulse; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+ USA.
+***/
+
+#include <pulse/pulseaudio.h>
+
+#include <libaudcore/i18n.h>
+#include <libaudcore/plugin.h>
+#include <libaudcore/runtime.h>
+#include <libaudcore/threads.h>
+#include <libaudcore/preferences.h>
+
+class PulseOutput : public OutputPlugin
+{
+public:
+ static const char about;
+ static const PreferencesWidget widgets;
+ static const PluginPreferences prefs;
+ static const char * const prefs_defaults;
+ static const String default_context_name;
+ static const String default_stream_name;
+
+ static constexpr PluginInfo info = {
+ N_("PulseAudio Output"),
+ PACKAGE,
+ about,
+ & prefs
+ };
+
+ /*
+ * Set a higher priority to that of PipeWire. Under a PulseAudio setup,
+ * the PipeWire output may be selected by default, which would promptly
+ * fail to work, as there is no PipeWire server/proxy running.
+ *
+ * On the other hand, under a PipeWire setup, PulseAudio output would
+ * still work normally, as pipewire-pulse acts as a PulseAudio server.
+ *
+ * Making PulseAudio the top preference allows for better compatibility
+ * for different setups, especially for distributions that have not (yet)
+ * switched to PipeWire as the default audio server.
+ */
+ constexpr PulseOutput () : OutputPlugin (info, 9) {}
+
+ bool init ();
+ void cleanup ();
+
+ StereoVolume get_volume ();
+ void set_volume (StereoVolume v);
+
+ bool open_audio (int fmt, int rate, int nch, String & error);
+ void close_audio ();
+
+ void period_wait ();
+ int write_audio (const void * ptr, int length);
+ void drain ();
+
+ int get_delay ();
+
+ void pause (bool pause);
+ void flush ();
+};
+
+EXPORT PulseOutput aud_plugin_instance;
+
+const PreferencesWidget PulseOutput::widgets = {
+ WidgetEntry (N_("Context name:"),
+ WidgetString ("pulse", "context_name")),
+ WidgetEntry (N_("Stream name:"),
+ WidgetString ("pulse", "stream_name")),
+};
+
+const PluginPreferences PulseOutput::prefs = {{widgets}};
+
+const String PulseOutput::default_context_name = String ("Audacious");
+const String PulseOutput::default_stream_name = String ("Audacious");
+
+const char * const PulseOutput::prefs_defaults = {
+ "context_name", PulseOutput::default_context_name,
+ "stream_name", PulseOutput::default_stream_name,
+ nullptr
+};
+
+static aud::mutex pulse_mutex;
+static aud::condvar pulse_cond;
+
+static pa_context * context = nullptr;
+static pa_stream * stream = nullptr;
+static pa_mainloop * mainloop = nullptr;
+
+static bool connected, flushed, polling;
+
+static pa_cvolume volume;
+
+static StereoVolume saved_volume = {0, 0};
+static bool saved_volume_changed = false;
+
+/* Check whether the connection is still alive. */
+static bool alive ()
+{
+ return pa_context_get_state (context) == PA_CONTEXT_READY &&
+ pa_stream_get_state (stream) == PA_STREAM_READY;
+}
+
+/* Cooperative polling method. Only one thread calls the actual poll function,
+ * and dispatches the events received. Any other threads simply wait for the
+ * first thread to finish. */
+static void poll_events (aud::mutex::holder & lock)
+{
+ if (polling)
+ pulse_cond.wait (lock);
+ else
+ {
+ pa_mainloop_prepare (mainloop, -1);
+
+ polling = true;
+ lock.unlock ();
+
+ pa_mainloop_poll (mainloop);
+
+ lock.lock ();
+ polling = false;
+
+ pa_mainloop_dispatch (mainloop);
+
+ pulse_cond.notify_all ();
+ }
+}
+
+/* Wait for an asynchronous operation to complete. Return immediately if the
+ * connection dies. */
+static bool finish (pa_operation * op, aud::mutex::holder & lock)
+{
+ pa_operation_state_t state;
+ while ((state = pa_operation_get_state (op)) != PA_OPERATION_DONE && alive ())
+ poll_events (lock);
+
+ pa_operation_unref (op);
+ return (state == PA_OPERATION_DONE);
+}
+
+#define REPORT(function) do { \
+ AUDERR ("%s() failed: %s\n", function, pa_strerror (pa_context_errno (context))); \
+} while (0)
+
+#define CHECK(function, ...) do { \
+ auto op = function (__VA_ARGS__, & success); \
+ if (! op || ! finish (op, lock) || ! success) \
+ REPORT (#function); \
+} while (0)
+
+static void info_cb (pa_context *, const pa_sink_input_info * i, int, void * userdata)
+{
+ if (! i)
+ return;
+
+ volume = i->volume;
+
+ if (userdata)
+ * (int *) userdata = 1;
+}
+
+static void subscribe_cb (pa_context * c, pa_subscription_event_type t, uint32_t index, void *)
+{
+ pa_operation * o;
+
+ if (! stream || index != pa_stream_get_index (stream) ||
+ (t != (PA_SUBSCRIPTION_EVENT_SINK_INPUT | PA_SUBSCRIPTION_EVENT_CHANGE) &&
+ t != (PA_SUBSCRIPTION_EVENT_SINK_INPUT | PA_SUBSCRIPTION_EVENT_NEW)))
+ return;
+
+ if (! (o = pa_context_get_sink_input_info (c, index, info_cb, nullptr)))
+ {
+ REPORT ("pa_context_get_sink_input_info");
+ return;
+ }
+
+ pa_operation_unref (o);
+}
+
+static void stream_success_cb (pa_stream *, int success, void * userdata)
+{
+ if (userdata)
+ * (int * ) userdata = success;
+}
+
+static void context_success_cb (pa_context *, int success, void * userdata)
+{
+ if (userdata)
+ * (int * ) userdata = success;
+}
+
+static void get_volume_locked (aud::mutex::holder & lock)
+{
+ if (! polling)
+ {
+ /* read any pending events to get the lastest volume */
+ while (pa_mainloop_iterate (mainloop, 0, nullptr) > 0)
+ continue;
+ }
+
+ if (volume.channels == 2)
+ {
+ saved_volume.left = aud::rescale<int> (volume.values0, PA_VOLUME_NORM, 100);
+ saved_volume.right = aud::rescale<int> (volume.values1, PA_VOLUME_NORM, 100);
+ }
+ else
+ {
+ saved_volume.left = aud::rescale<int> (pa_cvolume_avg (& volume), PA_VOLUME_NORM, 100);
+ saved_volume.right = saved_volume.left;
+ }
+
+ saved_volume_changed = false;
+}
+
+StereoVolume PulseOutput::get_volume ()
+{
+ auto lock = pulse_mutex.take ();
+
+ if (connected)
+ get_volume_locked (lock);
+
+ return saved_volume;
+}
+
+static void set_volume_locked (aud::mutex::holder & lock)
+{
+ if (volume.channels != 1)
+ {
+ volume.values0 = aud::rescale<int> (saved_volume.left, 100, PA_VOLUME_NORM);
+ volume.values1 = aud::rescale<int> (saved_volume.right, 100, PA_VOLUME_NORM);
+ volume.channels = 2;
+ }
+ else
+ {
+ int mono = aud::max (saved_volume.left, saved_volume.right);
+ volume.values0 = aud::rescale<int> (mono, 100, PA_VOLUME_NORM);
+ volume.channels = 1;
+ }
+
+ int success = 0;
+ CHECK (pa_context_set_sink_input_volume, context,
+ pa_stream_get_index (stream), & volume, context_success_cb);
+
+ saved_volume_changed = false;
+}
+
+void PulseOutput::set_volume (StereoVolume v)
+{
+ auto lock = pulse_mutex.take ();
+
+ saved_volume = v;
+ saved_volume_changed = true;
+
+ if (connected)
+ set_volume_locked (lock);
+}
+
+void PulseOutput::pause (bool pause)
+{
+ auto lock = pulse_mutex.take ();
+
+ int success = 0;
+ CHECK (pa_stream_cork, stream, pause, stream_success_cb);
+}
+
+int PulseOutput::get_delay ()
+{
+ auto lock = pulse_mutex.take ();
+
+ pa_usec_t usec;
+ int neg;
+
+ if (pa_stream_get_latency (stream, & usec, & neg) == PA_OK)
+ return usec / 1000;
+ else
+ return 0;
+}
+
+void PulseOutput::drain ()
+{
+ auto lock = pulse_mutex.take ();
+
+ int success = 0;
+ CHECK (pa_stream_drain, stream, stream_success_cb);
+}
+
+void PulseOutput::flush ()
+{
+ auto lock = pulse_mutex.take ();
+
+ int success = 0;
+ CHECK (pa_stream_flush, stream, stream_success_cb);
+
+ /* wake up period_wait() */
+ flushed = true;
+ if (polling)
+ pa_mainloop_wakeup (mainloop);
+}
+
+void PulseOutput::period_wait ()
+{
+ auto lock = pulse_mutex.take ();
+
+ int success = 0;
+ CHECK (pa_stream_trigger, stream, stream_success_cb);
+
+ /* if the connection dies, wait until flush() is called */
+ while ((! pa_stream_writable_size (stream) || ! alive ()) && ! flushed)
+ poll_events (lock);
+}
+
+int PulseOutput::write_audio (const void * ptr, int length)
+{
+ auto lock = pulse_mutex.take ();
+ int ret = 0;
+
+ length = aud::min ((size_t) length, pa_stream_writable_size (stream));
+
+ if (pa_stream_write (stream, ptr, length, nullptr, 0, PA_SEEK_RELATIVE) < 0)
+ REPORT ("pa_stream_write");
+ else
+ ret = length;
+
+ flushed = false;
+ return ret;
+}
+
+static void close_audio_locked (aud::mutex::holder & lock)
+{
+ /* wait for any parallel tasks (e.g. set_volume()) to complete */
+ while (polling)
+ pulse_cond.wait (lock);
+
+ connected = false;
+
+ if (stream)
+ {
+ pa_stream_disconnect (stream);
+ pa_stream_unref (stream);
+ stream = nullptr;
+ }
+
+ if (context)
+ {
+ pa_context_disconnect (context);
+ pa_context_unref (context);
+ context = nullptr;
+ }
+
+ if (mainloop)
+ {
+ pa_mainloop_free (mainloop);
+ mainloop = nullptr;
+ }
+}
+
+void PulseOutput::close_audio ()
+{
+ auto lock = pulse_mutex.take ();
+ close_audio_locked (lock);
+}
+
+static pa_sample_format_t to_pulse_format (int aformat)
+{
+ switch (aformat)
+ {
+ case FMT_U8: return PA_SAMPLE_U8;
+ case FMT_S16_LE: return PA_SAMPLE_S16LE;
+ case FMT_S16_BE: return PA_SAMPLE_S16BE;
+#ifdef PA_SAMPLE_S24_32LE
+ case FMT_S24_LE: return PA_SAMPLE_S24_32LE;
+ case FMT_S24_BE: return PA_SAMPLE_S24_32BE;
+#endif
+#ifdef PA_SAMPLE_S32LE
+ case FMT_S32_LE: return PA_SAMPLE_S32LE;
+ case FMT_S32_BE: return PA_SAMPLE_S32BE;
+#endif
+ case FMT_FLOAT: return PA_SAMPLE_FLOAT32NE;
+ default: return PA_SAMPLE_INVALID;
+ }
+}
+
+static bool set_sample_spec (pa_sample_spec & ss, int fmt, int rate, int nch)
+{
+ ss.format = to_pulse_format (fmt);
+ if (ss.format == PA_SAMPLE_INVALID)
+ return false;
+
+ ss.rate = rate;
+ ss.channels = nch;
+
+ return pa_sample_spec_valid (& ss);
+}
+
+static void set_buffer_attr (pa_buffer_attr & buffer, const pa_sample_spec & ss)
+{
+ int buffer_ms = aud_get_int ("output_buffer_size");
+ size_t buffer_size = pa_usec_to_bytes ((pa_usec_t) 1000 * buffer_ms, & ss);
+
+ buffer.maxlength = (uint32_t) -1;
+ buffer.tlength = buffer_size;
+ buffer.prebuf = (uint32_t) -1;
+ buffer.minreq = (uint32_t) -1;
+ buffer.fragsize = buffer_size;
+}
+
+static String get_context_name ()
+{
+ String context_name = aud_get_str ("pulse", "context_name");
+ if (context_name == String (""))
+ {
+ return PulseOutput::default_context_name;
+ }
+ return context_name;
+}
+
+static bool create_context (aud::mutex::holder & lock)
+{
+ if (! (mainloop = pa_mainloop_new ()))
+ {
+ AUDERR ("Failed to allocate main loop\n");
+ return false;
+ }
+
+ pa_proplist * proplist = pa_proplist_new ();
+ pa_proplist_sets (proplist, PA_PROP_APPLICATION_ID, "audacious");
+ pa_proplist_sets (proplist, PA_PROP_APPLICATION_ICON_NAME, "audacious");
+
+ context = pa_context_new_with_proplist (pa_mainloop_get_api (mainloop),
+ get_context_name (), proplist);
+
+ pa_proplist_free (proplist);
+
+ if (! context)
+ {
+ AUDERR ("Failed to allocate context\n");
+ return false;
+ }
+
+ if (pa_context_connect (context, nullptr, (pa_context_flags_t) 0, nullptr) < 0)
+ {
+ REPORT ("pa_context_connect");
+ return false;
+ }
+
+ /* Wait until the context is ready */
+ pa_context_state_t cstate;
+ while ((cstate = pa_context_get_state (context)) != PA_CONTEXT_READY)
+ {
+ if (cstate == PA_CONTEXT_TERMINATED || cstate == PA_CONTEXT_FAILED)
+ {
+ REPORT ("pa_context_connect");
+ return false;
+ }
+
+ poll_events (lock);
+ }
+
+ return true;
+}
+
+static String get_stream_name ()
+{
+ String stream_name = aud_get_str ("pulse", "stream_name");
+ if (stream_name == String (""))
+ {
+ return PulseOutput::default_stream_name;
+ }
+ return stream_name;
+}
+
+static bool create_stream (aud::mutex::holder & lock, const pa_sample_spec & ss)
+{
+ if (! (stream = pa_stream_new (context, get_stream_name (), & ss, nullptr)))
+ {
+ REPORT ("pa_stream_new");
+ return false;
+ }
+
+ /* Connect stream with sink and default volume */
+ pa_buffer_attr buffer;
+ set_buffer_attr (buffer, ss);
+
+ auto flags = pa_stream_flags_t (PA_STREAM_INTERPOLATE_TIMING | PA_STREAM_AUTO_TIMING_UPDATE);
+ if (pa_stream_connect_playback (stream, nullptr, & buffer, flags, nullptr, nullptr) < 0)
+ {
+ REPORT ("pa_stream_connect_playback");
+ return false;
+ }
+
+ /* Wait until the stream is ready */
+ pa_stream_state_t sstate;
+ while ((sstate = pa_stream_get_state (stream)) != PA_STREAM_READY)
+ {
+ if (sstate == PA_STREAM_FAILED || sstate == PA_STREAM_TERMINATED)
+ {
+ REPORT ("pa_stream_connect_playback");
+ return false;
+ }
+
+ poll_events (lock);
+ }
+
+ return true;
+}
+
+static bool subscribe_events (aud::mutex::holder & lock)
+{
+ pa_context_set_subscribe_callback (context, subscribe_cb, nullptr);
+
+ /* Now subscribe to events */
+ int success = 0;
+ CHECK (pa_context_subscribe, context, PA_SUBSCRIPTION_MASK_SINK_INPUT, context_success_cb);
+ if (! success)
+ return false;
+
+ /* Now request the initial stream info */
+ success = 0;
+ CHECK (pa_context_get_sink_input_info, context, pa_stream_get_index (stream), info_cb);
+ if (! success)
+ return false;
+
+ return true;
+}
+
+bool PulseOutput::open_audio (int fmt, int rate, int nch, String & error)
+{
+ auto lock = pulse_mutex.take ();
+
+ pa_sample_spec ss;
+ if (! set_sample_spec (ss, fmt, rate, nch))
+ return false;
+
+ if (! create_context (lock) ||
+ ! create_stream (lock, ss) ||
+ ! subscribe_events (lock))
+ {
+ close_audio_locked (lock);
+ return false;
+ }
+
+ connected = true;
+ flushed = true;
+
+ if (saved_volume_changed)
+ set_volume_locked (lock);
+ else
+ get_volume_locked (lock);
+
+ return true;
+}
+
+bool PulseOutput::init ()
+{
+ aud_config_set_defaults ("pulse", prefs_defaults);
+
+ /* check for a running server and get initial volume */
+ String error;
+ if (! open_audio (FMT_S16_NE, 44100, 2, error))
+ return false;
+
+ close_audio ();
+ return true;
+}
+
+void PulseOutput::cleanup ()
+{
+ if (saved_volume_changed)
+ {
+ /* save final volume */
+ String error;
+ if (open_audio (FMT_S16_NE, 44100, 2, error))
+ close_audio ();
+ }
+}
+
+const char PulseOutput::about =
+ N_("Audacious PulseAudio Output Plugin\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.");

audacious-plugins-4.4.1.tar.bz2/src/qt-spectrum Added

audacious-plugins-4.4.1.tar.bz2/src/qt-spectrum/Makefile Added

audacious-plugins-4.4.1.tar.bz2/src/qt-spectrum/meson.build Added

audacious-plugins-4.4.1.tar.bz2/src/qt-spectrum/qt-spectrum.cc Added

@@ -0,0 +1,167 @@
+/*
+ * Copyright (c) 2011 William Pitcock <nenolod@dereferenced.org>.
+ *
+ * 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.
+ *
+ * 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.
+ */
+
+#include <math.h>
+#include <string.h>
+
+#include <QWidget>
+#include <QPainter>
+
+#include <libaudcore/hook.h>
+#include <libaudcore/i18n.h>
+#include <libaudcore/interface.h>
+#include <libaudcore/plugin.h>
+#include <libaudqt/libaudqt.h>
+
+#define MAX_BANDS (256)
+#define VIS_DELAY 2 /* delay before falloff in frames */
+#define VIS_FALLOFF 2 /* falloff in pixels per frame */
+
+static float xscaleMAX_BANDS + 1;
+static int bands;
+static int barsMAX_BANDS + 1;
+static int delayMAX_BANDS + 1;
+
+class SpectrumWidget : public QWidget
+{
+public:
+ SpectrumWidget (QWidget * parent = nullptr);
+ ~SpectrumWidget ();
+
+protected:
+ void resizeEvent (QResizeEvent *);
+ void paintEvent (QPaintEvent *);
+
+private:
+ void paint_background (QPainter &);
+ void paint_spectrum (QPainter &);
+};
+
+static SpectrumWidget * spect_widget = nullptr;
+
+SpectrumWidget::SpectrumWidget (QWidget * parent) :
+ QWidget (parent)
+{
+}
+
+SpectrumWidget::~SpectrumWidget ()
+{
+ spect_widget = nullptr;
+}
+
+void SpectrumWidget::paint_background (QPainter & p)
+{
+ auto & base = palette ().color (QPalette::Window);
+ p.fillRect (0, 0, width (), height (), base);
+}
+
+void SpectrumWidget::paint_spectrum (QPainter & p)
+{
+ for (int i = 0; i < bands; i++)
+ {
+ int x = ((width () / bands) * i) + 2;
+ auto color = audqt::vis_bar_color (palette ().color (QPalette::Highlight), i, bands);
+
+ p.fillRect (x + 1, height () - (barsi * height () / 40),
+ (width () / bands) - 1, (barsi * height () / 40), color);
+ }
+}
+
+void SpectrumWidget::resizeEvent (QResizeEvent * event)
+{
+ bands = width () / 10;
+ bands = aud::clamp(bands, 12, MAX_BANDS);
+ Visualizer::compute_log_xscale (xscale, bands);
+ update ();
+}
+
+void SpectrumWidget::paintEvent (QPaintEvent * event)
+{
+ QPainter p (this);
+
+ paint_background (p);
+ paint_spectrum (p);
+}
+
+class QtSpectrum : public VisPlugin
+{
+public:
+ static constexpr PluginInfo info = {
+ N_("Spectrum Analyzer"),
+ PACKAGE,
+ nullptr, // about
+ nullptr, // prefs
+ PluginQtOnly
+ };
+
+ constexpr QtSpectrum () : VisPlugin (info, Visualizer::Freq) {}
+
+ void * get_qt_widget ();
+
+ void clear ();
+ void render_freq (const float * freq);
+};
+
+EXPORT QtSpectrum aud_plugin_instance;
+
+void QtSpectrum::render_freq (const float * freq)
+{
+ if (! bands)
+ return;
+
+ for (int i = 0; i < bands; i ++)
+ {
+ /* 40 dB range */
+ int x = 40 + compute_freq_band (freq, xscale, i, bands);
+ x = aud::clamp (x, 0, 40);
+
+ barsi -= aud::max (0, VIS_FALLOFF - delayi);
+
+ if (delayi)
+ delayi--;
+
+ if (x > barsi)
+ {
+ barsi = x;
+ delayi = VIS_DELAY;
+ }
+ }
+
+ if (spect_widget)
+ spect_widget->update ();
+}
+
+void QtSpectrum::clear ()
+{
+ memset (bars, 0, sizeof bars);
+ memset (delay, 0, sizeof delay);
+
+ if (spect_widget)
+ spect_widget->update ();
+}
+
+void * QtSpectrum::get_qt_widget ()
+{
+ if (spect_widget)
+ return spect_widget;
+
+ spect_widget = new SpectrumWidget ();
+ return spect_widget;
+}

audacious-plugins-3.6.2-gtk3.tar.bz2/src/qtaudio/Makefile -> audacious-plugins-4.4.1.tar.bz2/src/qtaudio/Makefile Changed

audacious-plugins-4.4.1.tar.bz2/src/qtaudio/meson.build Added

audacious-plugins-3.6.2-gtk3.tar.bz2/src/qtaudio/qtaudio.cc -> audacious-plugins-4.4.1.tar.bz2/src/qtaudio/qtaudio.cc Changed

@@ -27,19 +27,23 @@
 
 #include <libaudcore/audstrings.h>
 #include <libaudcore/i18n.h>
-#include <libaudcore/interface.h>
 #include <libaudcore/plugin.h>
 #include <libaudcore/runtime.h>
 
+#include <QtGlobal>
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+#include <QAudioDevice>
+#include <QAudioFormat>
+#include <QAudioSink>
+#include <QMediaDevices>
+#else
 #include <QAudioOutput>
+#endif
 
 #define VOLUME_RANGE 40 /* decibels */
+#define NS_PER_SECOND 1000000000
 
-#define error(...) do { \
- aud_ui_show_error (str_printf ("QtAudio error: " __VA_ARGS__)); \
-} while (0)
-
-class QtAudio : public OutputPlugin
+class QtAudioOutput : public OutputPlugin
 {
 public:
 static const char about;
@@ -51,14 +55,14 @@
 about
 };
 
- constexpr QtAudio () : OutputPlugin (info, 1) {}
+ constexpr QtAudioOutput () : OutputPlugin (info, 1) {}
 
 bool init ();
 
 StereoVolume get_volume ();
 void set_volume (StereoVolume v);
 
- bool open_audio (int aud_format, int rate, int chan);
+ bool open_audio (int aud_format, int rate, int chan, String & error);
 void close_audio ();
 
 void period_wait ();
@@ -69,20 +73,24 @@
 
 void pause (bool pause);
 void flush ();
+
+private:
+ timespec calc_abs_time (const timespec & rel_time);
 };
 
-EXPORT QtAudio aud_plugin_instance;
+EXPORT QtAudioOutput aud_plugin_instance;
 
-const char QtAudio::about =
+const char QtAudioOutput::about =
 N_("QtMultimedia Audio Output Plugin for Audacious\n"
 "Copyright 2014 William Pitcock\n\n"
 "Based on SDL Output Plugin for Audacious\n"
 "Copyright 2010 John Lindgren");
 
-const char * const QtAudio::defaults = {
- "vol_left", "100",
- "vol_right", "100",
- nullptr};
+const char * const QtAudioOutput::defaults = {
+ "vol_left", "100",
+ "vol_right", "100",
+ nullptr
+};
 
 static const timespec fifty_ms = {0, 50000000};
 
@@ -94,41 +102,49 @@
 static int last_buffered, delay_estimate;
 static timeval last_system_time;
 
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+static QAudioSink * output_instance = nullptr;
+#else
 static QAudioOutput * output_instance = nullptr;
+#endif
 static QIODevice * buffer_instance = nullptr;
 
 struct FormatDescriptionMap {
 int aud_format;
-
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+ enum QAudioFormat::SampleFormat sample_format;
+#else
 unsigned int sample_size;
 enum QAudioFormat::SampleType sample_type;
- enum QAudioFormat::Endian endian; 
+#endif
 };
 
 static constexpr FormatDescriptionMap FormatMap = {
- {FMT_S16_LE, 16, QAudioFormat::SignedInt, QAudioFormat::LittleEndian},
- {FMT_S16_BE, 16, QAudioFormat::SignedInt, QAudioFormat::BigEndian},
- {FMT_U16_LE, 16, QAudioFormat::UnSignedInt, QAudioFormat::LittleEndian},
- {FMT_U16_BE, 16, QAudioFormat::UnSignedInt, QAudioFormat::BigEndian},
- {FMT_S32_LE, 32, QAudioFormat::SignedInt, QAudioFormat::LittleEndian},
- {FMT_S32_BE, 32, QAudioFormat::SignedInt, QAudioFormat::BigEndian},
- {FMT_U32_LE, 32, QAudioFormat::UnSignedInt, QAudioFormat::LittleEndian},
- {FMT_U32_BE, 32, QAudioFormat::UnSignedInt, QAudioFormat::BigEndian},
- {FMT_FLOAT, 32, QAudioFormat::Float, QAudioFormat::LittleEndian},
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+ {FMT_S16_NE, QAudioFormat::Int16},
+ {FMT_S32_NE, QAudioFormat::Int32},
+ {FMT_FLOAT, QAudioFormat::Float},
+#else
+ {FMT_S16_NE, 16, QAudioFormat::SignedInt},
+ {FMT_U16_NE, 16, QAudioFormat::UnSignedInt},
+ {FMT_S32_NE, 32, QAudioFormat::SignedInt},
+ {FMT_U32_NE, 32, QAudioFormat::UnSignedInt},
+ {FMT_FLOAT, 32, QAudioFormat::Float},
+#endif
 };
 
-bool QtAudio::init ()
+bool QtAudioOutput::init ()
 {
 aud_config_set_defaults ("qtaudio", defaults);
 return true;
 }
 
-StereoVolume QtAudio::get_volume ()
+StereoVolume QtAudioOutput::get_volume ()
 {
 return {aud_get_int ("qtaudio", "vol_left"), aud_get_int ("qtaudio", "vol_right")};
 }
 
-void QtAudio::set_volume (StereoVolume v)
+void QtAudioOutput::set_volume (StereoVolume v)
 {
 int vol_max = aud::max (v.left, v.right);
 
@@ -143,7 +159,7 @@
 }
 }
 
-bool QtAudio::open_audio (int format, int rate, int chan)
+bool QtAudioOutput::open_audio (int format, int rate, int chan, String & error)
 {
 const FormatDescriptionMap * m = nullptr;
 
@@ -158,7 +174,8 @@
 
 if (! m)
 {
- error ("The requested audio format %d is unsupported.\n", format);
+ error = String (str_printf ("QtAudio error: The requested audio format "
+ "%d is unsupported.", format));
 return false;
 }
 
@@ -166,7 +183,7 @@
 
 bytes_per_sec = FMT_SIZEOF (format) * chan * rate;
 
- int buffer_ms = aud_get_int (nullptr, "output_buffer_size");
+ int buffer_ms = aud_get_int ("output_buffer_size");
 int buffer_size = FMT_SIZEOF (format) * chan * aud::rescale (buffer_ms, 1000, rate);
 
 paused = false;
@@ -178,19 +195,35 @@
 QAudioFormat fmt;
 fmt.setSampleRate (rate);
 fmt.setChannelCount (chan);
- fmt.setSampleSize (m->sample_size);
+
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+ fmt.setSampleFormat (m->sample_format);
+ QAudioDevice info = QMediaDevices::defaultAudioOutput ();
+#else
 fmt.setCodec ("audio/pcm");
- fmt.setByteOrder (m->endian);
+ fmt.setSampleSize (m->sample_size);
 fmt.setSampleType (m->sample_type);
 
+#ifdef WORDS_BIGENDIAN
+ fmt.setByteOrder (QAudioFormat::BigEndian);
+#else
+ fmt.setByteOrder (QAudioFormat::LittleEndian);
+#endif
+
 QAudioDeviceInfo info (QAudioDeviceInfo::defaultOutputDevice ());
+#endif
+
 if (! info.isFormatSupported (fmt))
 {
- error ("Format not supported by backend.\n");
+ error = String ("QtAudio error: Format not supported by backend.");
 return false;
 }
 
- output_instance = new QAudioOutput (fmt, nullptr);
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+ output_instance = new QAudioSink (info, fmt);
+#else
+ output_instance = new QAudioOutput (fmt);
+#endif
 output_instance->setBufferSize (buffer_size);
 buffer_instance = output_instance->start ();
 
@@ -199,7 +232,7 @@
 return true;
 }
 
-void QtAudio::close_audio ()
+void QtAudioOutput::close_audio ()
 {
 AUDDBG ("Closing audio.\n");
 
@@ -209,21 +242,24 @@
 output_instance = nullptr;
 }
 
-void QtAudio::period_wait ()
+void QtAudioOutput::period_wait ()
 {
 pthread_mutex_lock (& mutex);
 
- while (output_instance->bytesFree () < output_instance->periodSize ())
- pthread_cond_timedwait (& cond, & mutex, & fifty_ms);
+ while (output_instance->bytesFree () == 0)
+ {
+ timespec ts = calc_abs_time (fifty_ms);
+ pthread_cond_timedwait (& cond, & mutex, & ts);
+ }
 
 pthread_mutex_unlock (& mutex);
 }
 
-int QtAudio::write_audio (const void * data, int len)
+int QtAudioOutput::write_audio (const void * data, int len)
 {
 pthread_mutex_lock (& mutex);
 
- len = aud::min (len, output_instance->bytesFree ());
+ len = aud::min<int> (len, output_instance->bytesFree ());
 buffer_instance->write ((const char *) data, len);
 last_buffered += len;
 
@@ -231,18 +267,21 @@
 return len;
 }
 
-void QtAudio::drain ()
+void QtAudioOutput::drain ()
 {
 AUDDBG ("Draining.\n");
 pthread_mutex_lock (& mutex);
 
 while (output_instance->bytesFree () < output_instance->bufferSize ())
- pthread_cond_timedwait (& cond, & mutex, & fifty_ms);
+ {
+ timespec ts = calc_abs_time (fifty_ms);
+ pthread_cond_timedwait (& cond, & mutex, & ts);
+ }
 
 pthread_mutex_unlock (& mutex);
 }
 
-int QtAudio::get_delay ()
+int QtAudioOutput::get_delay ()
 {
 auto timediff = (const timeval & a, const timeval & b) -> int64_t
 { return 1000 * (int64_t) (b.tv_sec - a.tv_sec) + (b.tv_usec - a.tv_usec) / 1000; };
@@ -269,7 +308,7 @@
 return delay;
 }
 
-void QtAudio::pause (bool pause)
+void QtAudioOutput::pause (bool pause)
 {
 AUDDBG ("%sause.\n", pause ? "P" : "Unp");
 pthread_mutex_lock (& mutex);
@@ -285,7 +324,7 @@
 pthread_mutex_unlock (& mutex);
 }
 
-void QtAudio::flush ()
+void QtAudioOutput::flush ()
 {
 AUDDBG ("Seek requested; discarding buffer.\n");
 pthread_mutex_lock (& mutex);
@@ -301,3 +340,20 @@
 pthread_cond_broadcast (& cond); /* wake up period wait */
 pthread_mutex_unlock (& mutex);
 }
+
+timespec QtAudioOutput::calc_abs_time (const timespec & rel_time)
+{
+ timespec ts {};
+ clock_gettime (CLOCK_REALTIME, & ts);
+
+ ts.tv_sec += rel_time.tv_sec;
+ ts.tv_nsec += rel_time.tv_nsec;
+
+ if (ts.tv_nsec >= NS_PER_SECOND)
+ {
+ ts.tv_sec ++;
+ ts.tv_nsec -= NS_PER_SECOND;
+ }
+
+ return ts;
+}

audacious-plugins-4.4.1.tar.bz2/src/qtglspectrum Added

audacious-plugins-4.4.1.tar.bz2/src/qtglspectrum/Makefile Added

audacious-plugins-4.4.1.tar.bz2/src/qtglspectrum/gl-spectrum.cc Added

@@ -0,0 +1,305 @@
+/*
+ * OpenGL Spectrum Analyzer for Audacious
+ * Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini
+ * Copyright 2014, 2020 Ariadne Conill
+ *
+ * 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 <libaudcore/i18n.h>
+#include <libaudcore/plugin.h>
+
+#include <QOpenGLWidget>
+#include <QOpenGLFunctions_2_0>
+
+#define NUM_BANDS 32
+#define DB_RANGE 40
+
+#define BAR_SPACING (3.2f / NUM_BANDS)
+#define BAR_WIDTH (0.8f * BAR_SPACING)
+
+static const char gl_about =
+ N_("OpenGL Spectrum Analyzer for Audacious\n"
+ "Copyright 2013 Christophe Budé, John Lindgren, and Carlo Bramini\n"
+ "Copyright 2014, 2020 Ariadne Conill\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+");
+
+class GLSpectrumQt : public VisPlugin
+{
+public:
+ static constexpr PluginInfo info = {
+ N_("OpenGL Spectrum Analyzer"),
+ PACKAGE,
+ gl_about,
+ nullptr, // prefs
+ PluginQtOnly
+ };
+
+ constexpr GLSpectrumQt () : VisPlugin (info, Visualizer::Freq) {}
+
+ bool init ();
+
+ void * get_qt_widget ();
+
+ void clear ();
+ void render_freq (const float * freq);
+};
+
+EXPORT GLSpectrumQt aud_plugin_instance;
+
+static float logscaleNUM_BANDS + 1;
+static float colorsNUM_BANDSNUM_BANDS3;
+
+static int s_pos = 0;
+static float s_angle = 25, s_anglespeed = 0.05f;
+static float s_barsNUM_BANDSNUM_BANDS;
+
+class GLSpectrumWidget : public QOpenGLWidget, protected QOpenGLFunctions_2_0
+{
+public:
+ GLSpectrumWidget (QWidget *parent = nullptr);
+ ~GLSpectrumWidget ();
+
+private:
+ void paintGL ();
+ void resizeGL (int w, int h);
+ void initializeGL ();
+
+ void draw_bars ();
+ void draw_bar (float x, float z, float h, float r, float g, float b);
+ void draw_rectangle (float x1, float y1, float z1, float x2, float y2,
+ float z2, float r, float g, float b);
+};
+
+GLSpectrumWidget * s_widget = nullptr;
+
+bool GLSpectrumQt::init ()
+{
+ for (int i = 0; i <= NUM_BANDS; i ++)
+ logscalei = 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);
+
+ colorsxy0 = (1 - xf) * (1 - yf);
+ colorsxy1 = xf;
+ colorsxy2 = 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 logscalei and logscalei + 1,
+ including fractional parts */
+ int a = ceilf (logscalei);
+ int b = floorf (logscalei + 1);
+ float sum = 0;
+
+ if (b < a)
+ sum += freqb * (logscalei + 1 - logscalei);
+ else
+ {
+ if (a > 0)
+ sum += freqa - 1 * (a - logscalei);
+ for (; a < b; a ++)
+ sum += freqa;
+ if (b < 256)
+ sum += freqb * (logscalei + 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;
+
+ graphi = aud::clamp (val, 0.0f, 1.0f);
+ }
+}
+
+void GLSpectrumQt::render_freq (const float * freq)
+{
+ make_log_graph (freq, s_barss_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)
+ s_widget->update ();
+}
+
+void GLSpectrumQt::clear ()
+{
+ memset (s_bars, 0, sizeof s_bars);
+
+ if (s_widget)
+ s_widget->update ();
+}
+
+void GLSpectrumWidget::draw_rectangle (float x1, float y1, float z1, float x2, float y2,
+ float z2, float r, float g, float b)
+{
+ glColor4f (r, g, b, 1.0f);
+
+ glBegin (GL_POLYGON);
+ glVertex3f (x1, y2, z1);
+ glVertex3f (x2, y2, z1);
+ glVertex3f (x2, y2, z2);
+ glVertex3f (x1, y2, z2);
+ glEnd ();
+
+ glColor4f (0.65f * r, 0.65f * g, 0.65f * b, 1.0f);
+
+ 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 ();
+
+ glColor4f (0.8f * r, 0.8f * g, 0.8f * b, 1.0f);
+
+ glBegin (GL_POLYGON);
+ glVertex3f (x1, y1, z1);
+ glVertex3f (x2, y1, z1);
+ glVertex3f (x2, y2, z1);
+ glVertex3f (x1, y2, z1);
+ glEnd ();
+}
+
+void GLSpectrumWidget::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));
+}
+
+void GLSpectrumWidget::draw_bars ()
+{
+ 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_BANDSj * 1.6,
+ colorsij0, colorsij1, colorsij2);
+ }
+ }
+
+ glPolygonMode (GL_FRONT_AND_BACK, GL_FILL);
+ glPopMatrix ();
+}
+
+GLSpectrumWidget::GLSpectrumWidget (QWidget * parent) : QOpenGLWidget (parent)
+{
+ QSurfaceFormat format;
+
+ format.setDepthBufferSize (24);
+ setFormat (format);
+}
+
+GLSpectrumWidget::~GLSpectrumWidget ()
+{
+ s_widget = nullptr;
+}
+
+void GLSpectrumWidget::paintGL ()
+{
+ 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);
+}
+
+void GLSpectrumWidget::resizeGL (int w, int h)
+{
+}
+
+void GLSpectrumWidget::initializeGL ()
+{
+ initializeOpenGLFunctions ();
+}
+
+void * GLSpectrumQt::get_qt_widget ()
+{
+ if (s_widget)
+ return s_widget;
+
+ s_widget = new GLSpectrumWidget;
+ return s_widget;
+}

audacious-plugins-4.4.1.tar.bz2/src/qtglspectrum/meson.build Added

audacious-plugins-4.4.1.tar.bz2/src/qthotkey Added

audacious-plugins-4.4.1.tar.bz2/src/qthotkey/Makefile Added

audacious-plugins-4.4.1.tar.bz2/src/qthotkey/gui.cc Added

@@ -0,0 +1,348 @@
+/*
+ * This file is part of audacious-hotkey plugin for audacious
+ *
+ * Copyright (C) 2020 i.Dark_Templar <darktemplar@dark-templar-archives.net>
+ * Copyright (c) 2007 - 2008 Sascha Hlusiak <contact@saschahlusiak.de>
+ * Name: gui.c
+ * Description: gui.c
+ *
+ * Part of this code is from itouch-ctrl plugin.
+ * Authors of itouch-ctrl are listed below:
+ *
+ * Copyright (c) 2006 - 2007 Vladimir Paskov <vlado.paskov@gmail.com>
+ *
+ * Part of this code are from xmms-itouch plugin.
+ * Authors of xmms-itouch are listed below:
+ *
+ * Copyright (C) 2000-2002 Ville Syrjälä <syrjala@sci.fi>
+ * Bryn Davies <curious@ihug.com.au>
+ * Jonathan A. Davis <davis@jdhouse.org>
+ * Jeremy Tan <nsx@nsx.homeip.net>
+ *
+ * audacious-hotkey 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.
+ *
+ * audacious-hotkey 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 audacious-hotkey; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
+ */
+
+#include "gui.h"
+#include "plugin.h"
+
+#include <QtCore/QMap>
+#include <QtCore/QStringList>
+#include <QtGui/QGuiApplication>
+#include <QtGui/QKeyEvent>
+#include <QtGui/QMouseEvent>
+#include <QtWidgets/QApplication>
+#include <QtWidgets/QStyle>
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
+#include <QtX11Extras/QX11Info>
+#endif
+
+#include <libaudcore/i18n.h>
+#include <libaudcore/preferences.h>
+#include <libaudcore/templates.h>
+
+#include <libaudqt/libaudqt.h>
+
+#include <X11/XKBlib.h>
+
+namespace GlobalHotkeys
+{
+
+static PrefWidget * last_instance = nullptr;
+
+static const QMap<Event, const char *> event_desc = {
+ {Event::PrevTrack, N_("Previous track")},
+ {Event::Play, N_("Play")},
+ {Event::Pause, N_("Pause/Resume")},
+ {Event::Stop, N_("Stop")},
+ {Event::NextTrack, N_("Next track")},
+ {Event::Forward, N_("Step forward")},
+ {Event::Backward, N_("Step backward")},
+ {Event::Mute, N_("Mute")},
+ {Event::VolumeUp, N_("Volume up")},
+ {Event::VolumeDown, N_("Volume down")},
+ {Event::JumpToFile, N_("Jump to file")},
+ {Event::ToggleWindow, N_("Toggle player window(s)")},
+ {Event::ShowAOSD, N_("Show On-Screen-Display")},
+ {Event::ToggleRepeat, N_("Toggle repeat")},
+ {Event::ToggleShuffle, N_("Toggle shuffle")},
+ {Event::ToggleStop, N_("Toggle stop after current")},
+ {Event::Raise, N_("Raise player window(s)")},
+};
+
+class LineKeyEdit : public QLineEdit
+{
+public:
+ explicit LineKeyEdit(QWidget * parent, HotkeyConfiguration & hotkey)
+ : QLineEdit(parent), m_hotkey(hotkey)
+ {
+ set_keytext(0, 0);
+ }
+
+ void set_keytext(int key, int mask)
+ {
+ QString text;
+
+ if ((key == 0) && (mask == 0))
+ {
+ text = _("(none)");
+ }
+ else
+ {
+ static const char * modifier_string = {
+ "Control", "Shift", "Alt", "Mod2", "Mod3", "Super", "Mod5"};
+ static const unsigned int modifiers = {
+ ControlMask, ShiftMask, Mod1Mask, Mod2Mask,
+ Mod3Mask, Mod4Mask, Mod5Mask};
+
+ QStringList strings;
+
+#if QT_VERSION >= QT_VERSION_CHECK(6, 2, 0)
+ Display * xdisplay = reinterpret_cast<Display *>(qApp
+ ->nativeInterface<QNativeInterface::QX11Application>()
+ ->display());
+#elif QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+ // should never be reached
+ Display * xdisplay = nullptr;
+#else
+ Display * xdisplay = QX11Info::display();
+#endif
+ KeySym keysym = XkbKeycodeToKeysym(xdisplay, key, 0, 0);
+ if (keysym == 0 || keysym == NoSymbol)
+ {
+ text = QString::fromLocal8Bit("#%1").arg(key);
+ }
+ else
+ {
+ text = QString::fromLocal8Bit(XKeysymToString(keysym));
+ }
+
+ for (int j = 0; j < aud::n_elems(modifiers); ++j)
+ {
+ if (mask & modifiersj)
+ {
+ strings.push_back(QString::fromLatin1(modifier_stringj));
+ }
+ }
+
+ if (key != 0)
+ {
+ strings.push_back(text);
+ }
+
+ text = strings.join(QLatin1String(" + "));
+ }
+
+ setText(text);
+
+ m_hotkey.key = key;
+ m_hotkey.mask = mask;
+ }
+
+protected:
+ void keyPressEvent(QKeyEvent * event) override
+ {
+ set_keytext(event->nativeScanCode(),
+ event->nativeModifiers() &
+ ~(scrolllock_mask | numlock_mask | capslock_mask));
+ }
+
+private:
+ HotkeyConfiguration & m_hotkey;
+};
+
+KeyControls::~KeyControls()
+{
+ delete combobox;
+ delete keytext;
+ delete button;
+}
+
+PrefWidget::PrefWidget(QWidget * parent)
+ : QWidget(parent), main_widget_layout(new QVBoxLayout(this)),
+ information_pixmap(new QLabel(this)),
+ information_label(
+ new QLabel(_("Press a key combination inside a text field."), this)),
+ information_layout(new QHBoxLayout()),
+ group_box(new QGroupBox(_("Hotkeys:"), this)),
+ group_box_layout(new QGridLayout(group_box)),
+ action_label(new QLabel(_("Action:"), group_box)),
+ key_binding_label(new QLabel(_("Key Binding:"), group_box)),
+ add_button(new QPushButton(QIcon::fromTheme("list-add"),
+ audqt::translate_str(N_("_Add")), this)),
+ add_button_layout(new QHBoxLayout)
+{
+ int icon_size =
+ QApplication::style()->pixelMetric(QStyle::PM_MessageBoxIconSize);
+ information_pixmap->setPixmap(
+ QApplication::style()
+ ->standardIcon(QStyle::SP_MessageBoxInformation)
+ .pixmap(QSize(icon_size, icon_size)));
+
+ information_layout->addWidget(information_pixmap, 0, Qt::AlignLeft);
+ information_layout->addWidget(information_label, 0, Qt::AlignLeft);
+ information_layout->addStretch();
+
+ action_label->setAlignment(Qt::AlignHCenter);
+ key_binding_label->setAlignment(Qt::AlignHCenter);
+
+ group_box->setLayout(group_box_layout);
+ group_box_layout->addWidget(action_label, 0, 0);
+ group_box_layout->addWidget(key_binding_label, 0, 1);
+
+ for (const auto & hotkey : get_config()->hotkeys_list)
+ {
+ add_event_control(&hotkey);
+ }
+
+ add_button_layout->addWidget(add_button);
+ add_button_layout->addStretch();
+
+ this->setLayout(main_widget_layout);
+
+ main_widget_layout->addLayout(information_layout);
+ main_widget_layout->addWidget(group_box);
+ main_widget_layout->addLayout(add_button_layout);
+
+ QObject::connect(add_button, &QPushButton::clicked,
+ this() { add_event_control(nullptr); });
+
+ last_instance = this;
+}
+
+PrefWidget::~PrefWidget()
+{
+ delete information_layout;
+
+ for (auto control : controls_list)
+ {
+ delete control;
+ }
+
+ controls_list.clear();
+
+ if (last_instance == this)
+ {
+ last_instance = nullptr;
+ }
+}
+
+void PrefWidget::add_event_control(const HotkeyConfiguration * hotkey)
+{
+ KeyControls * control = new KeyControls;
+
+ if (hotkey != nullptr)
+ {
+ control->hotkey.key = hotkey->key;
+ control->hotkey.mask = hotkey->mask;
+ control->hotkey.event = hotkey->event;
+
+ if (control->hotkey.key == 0)
+ {
+ control->hotkey.mask = 0;
+ }
+ }
+ else
+ {
+ control->hotkey.key = 0;
+ control->hotkey.mask = 0;
+ control->hotkey.event = static_cast<Event>(0);
+ }
+
+ control->combobox = new QComboBox(group_box);
+
+ for (const auto & desc_item : event_desc)
+ {
+ control->combobox->addItem(_(desc_item));
+ }
+
+ if (hotkey != nullptr)
+ {
+ control->combobox->setCurrentIndex(static_cast<int>(hotkey->event));
+ }
+
+ control->keytext = new LineKeyEdit(group_box, control->hotkey);
+ control->keytext->setFocus(Qt::OtherFocusReason);
+
+ if (hotkey != nullptr)
+ {
+ control->keytext->set_keytext(hotkey->key, hotkey->mask);
+ }
+
+ control->button = new QToolButton(group_box);
+ control->button->setIcon(QIcon::fromTheme("edit-delete"));
+
+ int row = group_box_layout->rowCount();
+
+ controls_list.push_back(control);
+
+ group_box_layout->addWidget(control->combobox, row, 0);
+ group_box_layout->addWidget(control->keytext, row, 1);
+ group_box_layout->addWidget(control->button, row, 2);
+
+ QObject::connect(control->button, &QToolButton::clicked, this, control() {
+ controls_list.removeAll(control);
+ delete control;
+ });
+}
+
+QList<HotkeyConfiguration> PrefWidget::getConfig() const
+{
+ QList<HotkeyConfiguration> result;
+
+ for (const auto & control : controls_list)
+ {
+ HotkeyConfiguration hotkey;
+
+ hotkey.key = control->hotkey.key;
+ hotkey.mask = control->hotkey.mask;
+ hotkey.event = static_cast<Event>(control->combobox->currentIndex());
+
+ result.push_back(hotkey);
+ }
+
+ return result;
+}
+
+void * PrefWidget::make_config_widget()
+{
+ ungrab_keys();
+
+ QWidget * main_widget = new PrefWidget;
+
+ return main_widget;
+}
+
+void PrefWidget::ok_callback()
+{
+ if (last_instance != nullptr)
+ {
+ PluginConfig * plugin_cfg = get_config();
+ plugin_cfg->hotkeys_list = last_instance->getConfig();
+ save_config();
+ }
+}
+
+void PrefWidget::destroy_callback() { grab_keys(); }
+
+static const PreferencesWidget hotkey_widgets = {
+ WidgetCustomQt(PrefWidget::make_config_widget)};
+
+const PluginPreferences hotkey_prefs = {{hotkey_widgets},
+ nullptr, // init
+ PrefWidget::ok_callback,
+ PrefWidget::destroy_callback};
+
+} /* namespace GlobalHotkeys */

audacious-plugins-4.4.1.tar.bz2/src/qthotkey/gui.h Added

@@ -0,0 +1,69 @@
+#ifndef _GUI_H_INCLUDED_
+#define _GUI_H_INCLUDED_
+
+#include <QtCore/QList>
+#include <QtWidgets/QComboBox>
+#include <QtWidgets/QGridLayout>
+#include <QtWidgets/QGroupBox>
+#include <QtWidgets/QHBoxLayout>
+#include <QtWidgets/QLabel>
+#include <QtWidgets/QLineEdit>
+#include <QtWidgets/QPushButton>
+#include <QtWidgets/QToolButton>
+#include <QtWidgets/QVBoxLayout>
+#include <QtWidgets/QWidget>
+
+#include "plugin.h"
+
+struct PluginPreferences;
+
+namespace GlobalHotkeys
+{
+
+class LineKeyEdit;
+
+extern const PluginPreferences hotkey_prefs;
+
+struct KeyControls
+{
+ QComboBox * combobox;
+ LineKeyEdit * keytext;
+ QToolButton * button;
+
+ HotkeyConfiguration hotkey;
+
+ ~KeyControls();
+};
+
+class PrefWidget : public QWidget
+{
+public:
+ explicit PrefWidget(QWidget * parent = nullptr);
+ ~PrefWidget();
+
+ QList<HotkeyConfiguration> getConfig() const;
+
+ static void * make_config_widget();
+ static void ok_callback();
+ static void destroy_callback();
+
+private:
+ QVBoxLayout * main_widget_layout;
+ QLabel * information_pixmap;
+ QLabel * information_label;
+ QHBoxLayout * information_layout;
+ QGroupBox * group_box;
+ QGridLayout * group_box_layout;
+ QLabel * action_label;
+ QLabel * key_binding_label;
+ QPushButton * add_button;
+ QHBoxLayout * add_button_layout;
+
+ QList<KeyControls *> controls_list;
+
+ void add_event_control(const HotkeyConfiguration * hotkey);
+};
+
+} /* namespace GlobalHotkeys */
+
+#endif

audacious-plugins-4.4.1.tar.bz2/src/qthotkey/meson.build Added

audacious-plugins-4.4.1.tar.bz2/src/qthotkey/plugin.cc Added

@@ -0,0 +1,725 @@
+/*
+ * This file is part of audacious-hotkey plugin for audacious
+ *
+ * Copyright (C) 2020 i.Dark_Templar <darktemplar@dark-templar-archives.net>
+ * Copyright (c) 2007 - 2008 Sascha Hlusiak <contact@saschahlusiak.de>
+ * Name: plugin.c
+ * Description: plugin.c
+ *
+ * Part of this code is from itouch-ctrl plugin.
+ * Authors of itouch-ctrl are listed below:
+ *
+ * Copyright (c) 2006 - 2007 Vladimir Paskov <vlado.paskov@gmail.com>
+ *
+ * Part of this code are from xmms-itouch plugin.
+ * Authors of xmms-itouch are listed below:
+ *
+ * Copyright (C) 2000-2002 Ville Syrjälä <syrjala@sci.fi>
+ * Bryn Davies <curious@ihug.com.au>
+ * Jonathan A. Davis <davis@jdhouse.org>
+ * Jeremy Tan <nsx@nsx.homeip.net>
+ *
+ * audacious-hotkey 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.
+ *
+ * audacious-hotkey 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 audacious-hotkey; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+ * USA.
+ */
+
+#include "plugin.h"
+#include "gui.h"
+
+#include <QtCore/QAbstractNativeEventFilter>
+#include <QtCore/QCoreApplication>
+#include <QtCore/QString>
+#include <QtCore/QTimer>
+#include <QtGui/QGuiApplication>
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
+#include <QtX11Extras/QX11Info>
+#endif
+
+#include <libaudcore/drct.h>
+#include <libaudcore/hook.h>
+#include <libaudcore/i18n.h>
+#include <libaudcore/interface.h>
+#include <libaudcore/plugin.h>
+#include <libaudcore/runtime.h>
+
+#include <libaudqt/libaudqt.h>
+
+#include <X11/XF86keysym.h>
+#include <X11/Xlib.h>
+#include <X11/keysym.h>
+#include <xcb/xproto.h>
+
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+typedef qintptr filter_result_t;
+#else
+typedef long filter_result_t;
+#endif
+
+namespace GlobalHotkeys
+{
+
+class GlobalHotkeys : public GeneralPlugin
+{
+public:
+ static const char about;
+
+ static constexpr PluginInfo info = {N_("Global Hotkeys"), PACKAGE, about,
+ &hotkey_prefs, PluginQtOnly};
+
+ constexpr GlobalHotkeys() : GeneralPlugin(info, false) {}
+
+ bool init() override;
+ void cleanup() override;
+};
+
+class GlobalHotkeysEventFilter : public QAbstractNativeEventFilter
+{
+private:
+ bool nativeEventFilter(const QByteArray & eventType, void * message,
+ filter_result_t * result) override;
+};
+
+/* global vars */
+static GlobalHotkeysEventFilter event_filter;
+static PluginConfig plugin_cfg;
+
+static int grabbed = 0;
+static Display * xdisplay = nullptr;
+unsigned int numlock_mask = 0;
+unsigned int scrolllock_mask = 0;
+unsigned int capslock_mask = 0;
+
+const char GlobalHotkeys::about =
+ N_("Global Hotkey Plugin\n"
+ "Control the player with global key combinations or multimedia keys.\n\n"
+ "Copyright (C) 2020 i.Dark_Templar "
+ "<darktemplar@dark-templar-archives.net>\n"
+ "Copyright (C) 2007-2008 Sascha Hlusiak <contact@saschahlusiak.de>\n\n"
+ "Contributors 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>");
+
+PluginConfig * get_config() { return &plugin_cfg; }
+
+/* handle keys */
+bool handle_keyevent(Event event)
+{
+ int current_volume, old_volume;
+ static int volume_static = 0;
+
+ /* get current volume */
+ current_volume = aud_drct_get_volume_main();
+ old_volume = current_volume;
+
+ switch (event)
+ {
+ /* mute the playback */
+ case Event::Mute:
+ {
+ if (current_volume != 0)
+ {
+ volume_static = current_volume;
+ aud_drct_set_volume_main(0);
+ }
+ else
+ {
+ aud_drct_set_volume_main(volume_static);
+ }
+
+ return true;
+ }
+ break;
+
+ /* decrease volume */
+ case Event::VolumeDown:
+ {
+ if ((current_volume -= aud_get_int("volume_delta")) < 0)
+ {
+ current_volume = 0;
+ }
+
+ if (current_volume != old_volume)
+ {
+ aud_drct_set_volume_main(current_volume);
+ }
+
+ return true;
+ }
+ break;
+
+ /* increase volume */
+ case Event::VolumeUp:
+ {
+ if ((current_volume += aud_get_int("volume_delta")) > 100)
+ {
+ current_volume = 100;
+ }
+
+ if (current_volume != old_volume)
+ {
+ aud_drct_set_volume_main(current_volume);
+ }
+
+ return true;
+ }
+ break;
+
+ /* play */
+ case Event::Play:
+ {
+ aud_drct_play();
+ return true;
+ }
+ break;
+
+ /* pause */
+ case Event::Pause:
+ {
+ aud_drct_play_pause();
+ return true;
+ }
+ break;
+
+ /* stop */
+ case Event::Stop:
+ {
+ aud_drct_stop();
+ return true;
+ }
+ break;
+
+ /* prev track */
+ case Event::PrevTrack:
+ {
+ aud_drct_pl_prev();
+ return true;
+ }
+ break;
+
+ /* next track */
+ case Event::NextTrack:
+ {
+ aud_drct_pl_next();
+ return true;
+ }
+ break;
+
+ /* forward */
+ case Event::Forward:
+ {
+ aud_drct_seek(aud_drct_get_time() + aud_get_int("step_size") * 1000);
+ return true;
+ }
+ break;
+
+ /* backward */
+ case Event::Backward:
+ {
+ aud_drct_seek(aud_drct_get_time() - aud_get_int("step_size") * 1000);
+ return true;
+ }
+ break;
+
+ /* Open Jump-To-File dialog */
+ case Event::JumpToFile:
+ if (!aud_get_headless_mode())
+ {
+ aud_ui_show_jump_to_song();
+ return true;
+ }
+ break;
+
+ /* Toggle Windows */
+ case Event::ToggleWindow:
+ if (!aud_get_headless_mode())
+ {
+ aud_ui_show(!aud_ui_is_shown());
+ return true;
+ }
+ break;
+
+ /* Show OSD through AOSD plugin*/
+ case Event::ShowAOSD:
+ {
+ hook_call("aosd toggle", nullptr);
+ return true;
+ }
+ break;
+
+ case Event::ToggleRepeat:
+ {
+ aud_toggle_bool("repeat");
+ return true;
+ }
+ break;
+
+ case Event::ToggleShuffle:
+ {
+ aud_toggle_bool("shuffle");
+ return true;
+ }
+ break;
+
+ case Event::ToggleStop:
+ {
+ aud_toggle_bool("stop_after_current_song");
+ return true;
+ }
+ break;
+
+ case Event::Raise:
+ {
+ aud_ui_show(true);
+ return true;
+ }
+ break;
+
+ /* silence warning */
+ case Event::Max:
+ break;
+ }
+
+ return false;
+}
+
+void add_hotkey(QList<HotkeyConfiguration> & hotkeys_list, KeySym keysym,
+ int mask, Event event)
+{
+ KeyCode keycode;
+ HotkeyConfiguration hotkey;
+
+ if (keysym == 0)
+ {
+ return;
+ }
+
+ keycode = XKeysymToKeycode(xdisplay, keysym);
+ if (keycode == 0)
+ {
+ return;
+ }
+
+ hotkey.key = static_cast<int>(keycode);
+ hotkey.mask = mask;
+ hotkey.event = event;
+
+ hotkeys_list.push_back(hotkey);
+}
+
+void load_defaults()
+{
+ add_hotkey(plugin_cfg.hotkeys_list, XF86XK_AudioPrev, 0, Event::PrevTrack);
+ add_hotkey(plugin_cfg.hotkeys_list, XF86XK_AudioPlay, 0, Event::Play);
+ add_hotkey(plugin_cfg.hotkeys_list, XF86XK_AudioPause, 0, Event::Pause);
+ add_hotkey(plugin_cfg.hotkeys_list, XF86XK_AudioStop, 0, Event::Stop);
+ add_hotkey(plugin_cfg.hotkeys_list, XF86XK_AudioNext, 0, Event::NextTrack);
+ add_hotkey(plugin_cfg.hotkeys_list, XF86XK_AudioMute, 0, Event::Mute);
+ add_hotkey(plugin_cfg.hotkeys_list, XF86XK_AudioRaiseVolume, 0,
+ Event::VolumeUp);
+ add_hotkey(plugin_cfg.hotkeys_list, XF86XK_AudioLowerVolume, 0,
+ Event::VolumeDown);
+}
+
+/* load plugin configuration */
+void load_config()
+{
+ int max = aud_get_int("globalHotkey", "NumHotkeys");
+ if (max == 0)
+ {
+ load_defaults();
+ }
+ else
+ {
+ for (int i = 0; i < max; ++i)
+ {
+ HotkeyConfiguration hotkey;
+
+ hotkey.key =
+ aud_get_int("globalHotkey", QString::fromLatin1("Hotkey_%1_key")
+ .arg(i)
+ .toLocal8Bit()
+ .data());
+ hotkey.mask = aud_get_int("globalHotkey",
+ QString::fromLatin1("Hotkey_%1_mask")
+ .arg(i)
+ .toLocal8Bit()
+ .data());
+ hotkey.event = static_cast<Event>(aud_get_int(
+ "globalHotkey", QString::fromLatin1("Hotkey_%1_event")
+ .arg(i)
+ .toLocal8Bit()
+ .data()));
+
+ plugin_cfg.hotkeys_list.push_back(hotkey);
+ }
+ }
+}
+
+/* save plugin configuration */
+void save_config()
+{
+ int max = 0;
+
+ for (const auto & hotkey : plugin_cfg.hotkeys_list)
+ {
+ if (hotkey.key != 0)
+ {
+ aud_set_int("globalHotkey",
+ QString::fromLatin1("Hotkey_%1_key")
+ .arg(max)
+ .toLocal8Bit()
+ .data(),
+ hotkey.key);
+ aud_set_int("globalHotkey",
+ QString::fromLatin1("Hotkey_%1_mask")
+ .arg(max)
+ .toLocal8Bit()
+ .data(),
+ hotkey.mask);
+ aud_set_int("globalHotkey",
+ QString::fromLatin1("Hotkey_%1_event")
+ .arg(max)
+ .toLocal8Bit()
+ .data(),
+ static_cast<int>(hotkey.event));
+ ++max;
+ }
+ }
+
+ aud_set_int("globalHotkey", "NumHotkeys", max);
+}
+
+bool GlobalHotkeys::init()
+{
+ audqt::init();
+
+#if QT_VERSION >= QT_VERSION_CHECK(6, 2, 0) && defined(Q_OS_UNIX)
+ auto * x11_interface =
+ qApp->nativeInterface<QNativeInterface::QX11Application>();
+ bool has_x11 = x11_interface != nullptr;
+#elif QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+ // the interface is not implemented
+ bool has_x11 = false;
+#else
+ bool has_x11 = QX11Info::isPlatformX11();
+#endif
+
+ if (!has_x11)
+ {
+ AUDERR("Global Hotkey plugin only supports X11.\n");
+ audqt::cleanup();
+ return false;
+ }
+
+#if QT_VERSION >= QT_VERSION_CHECK(6, 2, 0)
+ xdisplay = reinterpret_cast<Display *>(x11_interface->display());
+#elif QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+ Q_UNREACHABLE();
+ xdisplay = nullptr;
+#else
+ xdisplay = QX11Info::display();
+#endif
+
+ load_config();
+ grab_keys();
+ QCoreApplication::instance()->installNativeEventFilter(&event_filter);
+
+ return true;
+}
+
+void GlobalHotkeys::cleanup()
+{
+ QCoreApplication::instance()->removeNativeEventFilter(&event_filter);
+ ungrab_keys();
+ plugin_cfg.hotkeys_list.clear();
+
+ audqt::cleanup();
+}
+
+bool GlobalHotkeysEventFilter::nativeEventFilter(const QByteArray & eventType,
+ void * message,
+ filter_result_t * result)
+{
+ Q_UNUSED(eventType);
+ Q_UNUSED(result);
+
+ if (!grabbed)
+ {
+ return false;
+ }
+
+ xcb_generic_event_t * e = static_cast<xcb_generic_event_t *>(message);
+
+ if (e->response_type != XCB_KEY_PRESS)
+ {
+ return false;
+ }
+
+ xcb_key_press_event_t * ke = (xcb_key_press_event_t *)e;
+
+ for (const auto & hotkey : plugin_cfg.hotkeys_list)
+ {
+ if ((hotkey.key == ke->detail) &&
+ (hotkey.mask ==
+ (ke->state & ~(scrolllock_mask | numlock_mask | capslock_mask))))
+ {
+ if (handle_keyevent(hotkey.event))
+ {
+ return true;
+ }
+ }
+ }
+
+ return false;
+}
+
+/* Taken from xbindkeys */
+static void get_offending_modifiers(Display * dpy)
+{
+ XModifierKeymap * modmap;
+ KeyCode nlock, slock;
+
+ static int mask_table8 = {ShiftMask, LockMask, ControlMask, Mod1Mask,
+ Mod2Mask, Mod3Mask, Mod4Mask, Mod5Mask};
+
+ nlock = XKeysymToKeycode(dpy, XK_Num_Lock);
+ slock = XKeysymToKeycode(dpy, XK_Scroll_Lock);
+
+ /*
+ * Find out the masks for the NumLock and ScrollLock modifiers,
+ * so that we can bind the grabs for when they are enabled too.
+ */
+ modmap = XGetModifierMapping(dpy);
+
+ if ((modmap != nullptr) && (modmap->max_keypermod > 0))
+ {
+ for (int i = 0; i < 8 * modmap->max_keypermod; ++i)
+ {
+ if ((modmap->modifiermapi == nlock) && (nlock != 0))
+ {
+ numlock_mask = mask_tablei / modmap->max_keypermod;
+ }
+ else if ((modmap->modifiermapi == slock) && (slock != 0))
+ {
+ scrolllock_mask = mask_tablei / modmap->max_keypermod;
+ }
+ }
+ }
+
+ capslock_mask = LockMask;
+
+ if (modmap)
+ {
+ XFreeModifiermap(modmap);
+ }
+}
+
+static int x11_error_handler(Display * dpy, XErrorEvent * error) { return 0; }
+
+/* grab required keys */
+static void grab_key(const HotkeyConfiguration & hotkey, Display * xdisplay,
+ Window x_root_window)
+{
+ unsigned int modifier =
+ hotkey.mask & ~(numlock_mask | capslock_mask | scrolllock_mask);
+
+ if (hotkey.key == 0)
+ {
+ return;
+ }
+
+ XGrabKey(xdisplay, hotkey.key, modifier, x_root_window, False,
+ GrabModeAsync, GrabModeAsync);
+
+ if (modifier == AnyModifier)
+ {
+ return;
+ }
+
+ if (numlock_mask)
+ {
+ XGrabKey(xdisplay, hotkey.key, modifier | numlock_mask, x_root_window,
+ False, GrabModeAsync, GrabModeAsync);
+ }
+
+ if (capslock_mask)
+ {
+ XGrabKey(xdisplay, hotkey.key, modifier | capslock_mask, x_root_window,
+ False, GrabModeAsync, GrabModeAsync);
+ }
+
+ if (scrolllock_mask)
+ {
+ XGrabKey(xdisplay, hotkey.key, modifier | scrolllock_mask,
+ x_root_window, False, GrabModeAsync, GrabModeAsync);
+ }
+
+ if (numlock_mask && capslock_mask)
+ {
+ XGrabKey(xdisplay, hotkey.key, modifier | numlock_mask | capslock_mask,
+ x_root_window, False, GrabModeAsync, GrabModeAsync);
+ }
+
+ if (numlock_mask && scrolllock_mask)
+ {
+ XGrabKey(xdisplay, hotkey.key,
+ modifier | numlock_mask | scrolllock_mask, x_root_window,
+ False, GrabModeAsync, GrabModeAsync);
+ }
+
+ if (capslock_mask && scrolllock_mask)
+ {
+ XGrabKey(xdisplay, hotkey.key,
+ modifier | capslock_mask | scrolllock_mask, x_root_window,
+ False, GrabModeAsync, GrabModeAsync);
+ }
+
+ if (numlock_mask && capslock_mask && scrolllock_mask)
+ {
+ XGrabKey(xdisplay, hotkey.key,
+ modifier | numlock_mask | capslock_mask | scrolllock_mask,
+ x_root_window, False, GrabModeAsync, GrabModeAsync);
+ }
+}
+
+void grab_keys()
+{
+ PluginConfig * plugin_cfg = get_config();
+
+ XErrorHandler old_handler = nullptr;
+
+ if (grabbed || (!xdisplay))
+ {
+ return;
+ }
+
+ XSync(xdisplay, False);
+ old_handler = XSetErrorHandler(x11_error_handler);
+
+ get_offending_modifiers(xdisplay);
+
+ for (const auto & hotkey : plugin_cfg->hotkeys_list)
+ {
+ for (int screen = 0; screen < ScreenCount(xdisplay); ++screen)
+ {
+ grab_key(hotkey, xdisplay, RootWindow(xdisplay, screen));
+ }
+ }
+
+ XSync(xdisplay, False);
+ XSetErrorHandler(old_handler);
+
+ grabbed = 1;
+}
+
+/* grab required keys */
+static void ungrab_key(const HotkeyConfiguration & hotkey, Display * xdisplay,
+ Window x_root_window)
+{
+ unsigned int modifier =
+ hotkey.mask & ~(numlock_mask | capslock_mask | scrolllock_mask);
+
+ if (hotkey.key == 0)
+ {
+ return;
+ }
+
+ XUngrabKey(xdisplay, hotkey.key, modifier, x_root_window);
+
+ if (modifier == AnyModifier)
+ {
+ return;
+ }
+
+ if (numlock_mask)
+ {
+ XUngrabKey(xdisplay, hotkey.key, modifier | numlock_mask,
+ x_root_window);
+ }
+
+ if (capslock_mask)
+ {
+ XUngrabKey(xdisplay, hotkey.key, modifier | capslock_mask,
+ x_root_window);
+ }
+
+ if (scrolllock_mask)
+ {
+ XUngrabKey(xdisplay, hotkey.key, modifier | scrolllock_mask,
+ x_root_window);
+ }
+
+ if (numlock_mask && capslock_mask)
+ {
+ XUngrabKey(xdisplay, hotkey.key,
+ modifier | numlock_mask | capslock_mask, x_root_window);
+ }
+
+ if (numlock_mask && scrolllock_mask)
+ {
+ XUngrabKey(xdisplay, hotkey.key,
+ modifier | numlock_mask | scrolllock_mask, x_root_window);
+ }
+
+ if (capslock_mask && scrolllock_mask)
+ {
+ XUngrabKey(xdisplay, hotkey.key,
+ modifier | capslock_mask | scrolllock_mask, x_root_window);
+ }
+
+ if (numlock_mask && capslock_mask && scrolllock_mask)
+ {
+ XUngrabKey(xdisplay, hotkey.key,
+ modifier | numlock_mask | capslock_mask | scrolllock_mask,
+ x_root_window);
+ }
+}
+
+void ungrab_keys()
+{
+ PluginConfig * plugin_cfg = get_config();
+
+ XErrorHandler old_handler = nullptr;
+
+ if ((!grabbed) || (!xdisplay))
+ {
+ return;
+ }
+
+ XSync(xdisplay, False);
+ old_handler = XSetErrorHandler(x11_error_handler);
+
+ get_offending_modifiers(xdisplay);
+
+ for (const auto & hotkey : plugin_cfg->hotkeys_list)
+ {
+ for (int screen = 0; screen < ScreenCount(xdisplay); ++screen)
+ {
+ ungrab_key(hotkey, xdisplay, RootWindow(xdisplay, screen));
+ }
+ }
+
+ XSync(xdisplay, False);
+ XSetErrorHandler(old_handler);
+
+ grabbed = 0;
+}
+
+} /* namespace GlobalHotkeys */
+
+EXPORT GlobalHotkeys::GlobalHotkeys aud_plugin_instance;

audacious-plugins-4.4.1.tar.bz2/src/qthotkey/plugin.h Added

@@ -0,0 +1,66 @@
+#ifndef _PLUGIN_H_INCLUDED_
+#define _PLUGIN_H_INCLUDED_
+
+#include <QtCore/QList>
+
+namespace GlobalHotkeys
+{
+
+/*
+ * Values in this enum must not be skipped and must start with 0,
+ * otherwise event_desc in gui.cc and it's use must be updated.
+ * All values except for Event::Max must be present in event_desc map.
+ */
+enum class Event
+{
+ PrevTrack = 0,
+ Play,
+ Pause,
+ Stop,
+ NextTrack,
+
+ Forward,
+ Backward,
+ Mute,
+ VolumeUp,
+ VolumeDown,
+ JumpToFile,
+ ToggleWindow,
+ ShowAOSD,
+
+ ToggleRepeat,
+ ToggleShuffle,
+ ToggleStop,
+
+ Raise,
+
+ Max
+};
+
+struct HotkeyConfiguration
+{
+ unsigned key, mask;
+ Event event;
+};
+
+struct PluginConfig
+{
+ /* keyboard */
+ QList<HotkeyConfiguration> hotkeys_list;
+};
+
+extern unsigned int numlock_mask;
+extern unsigned int scrolllock_mask;
+extern unsigned int capslock_mask;
+
+void load_config();
+void save_config();
+PluginConfig * get_config();
+bool handle_keyevent(Event event);
+
+void grab_keys();
+void ungrab_keys();
+
+} /* namespace GlobalHotkeys */
+
+#endif

audacious-plugins-3.6.2-gtk3.tar.bz2/src/qtui/Makefile -> audacious-plugins-4.4.1.tar.bz2/src/qtui/Makefile Changed

@@ -1,97 +1,24 @@
 PLUGIN = qtui${PLUGIN_SUFFIX}
 
 SRCS = qtui.cc \
-       dialog_windows.cc \
+       dialogs-qt.cc \
        main_window.cc \
-       main_window_actions.cc \
-       playlist.cc \
+       menu-ops.cc \
+       menus.cc \
+       playlist-qt.cc \
+       playlist_header.cc \
        playlist_model.cc \
        playlist_tabs.cc \
-       filter_input.cc \
        info_bar.cc \
+       search_bar.cc \
        status_bar.cc \
        tool_bar.cc \
-       time_slider.cc
+       time_slider.cc \
+       settings.cc
 
 include ../../buildsys.mk
 include ../../extra.mk
 
-# These overrides variables in buildsys.mk and so must come after it.
-PACKAGE_NAME = audacious
-
-CUSTOM_ICONS=no
-ifeq ($(HAVE_MSWINDOWS),yes)
-CUSTOM_ICONS=yes
-endif
-ifeq ($(HAVE_DARWIN),yes)
-CUSTOM_ICONS=yes
-endif
-
-ifeq ($(CUSTOM_ICONS),yes)
-DATA = QtUi/16/audio-volume-high.png \
-       QtUi/16/audio-volume-low.png \
-       QtUi/16/audio-volume-medium.png \
-       QtUi/16/audio-volume-muted.png \
-       QtUi/16/audio-volume-off.png \
-       QtUi/16/document-open.png \
-       QtUi/16/edit-find.png \
-       QtUi/16/list-add.png \
-       QtUi/16/media-playback-pause.png \
-       QtUi/16/media-playback-start.png \
-       QtUi/16/media-playback-stop.png \
-       QtUi/16/media-playlist-repeat.png \
-       QtUi/16/media-playlist-shuffle.png \
-       QtUi/16/media-skip-backward.png \
-       QtUi/16/media-skip-forward.png \
-       QtUi/22/audio-volume-high.png \
-       QtUi/22/audio-volume-low.png \
-       QtUi/22/audio-volume-medium.png \
-       QtUi/22/audio-volume-muted.png \
-       QtUi/22/audio-volume-off.png \
-       QtUi/22/document-open.png \
-       QtUi/22/edit-find.png \
-       QtUi/22/list-add.png \
-       QtUi/22/media-playback-pause.png \
-       QtUi/22/media-playback-start.png \
-       QtUi/22/media-playback-stop.png \
-       QtUi/22/media-playlist-repeat.png \
-       QtUi/22/media-playlist-shuffle.png \
-       QtUi/22/media-skip-backward.png \
-       QtUi/22/media-skip-forward.png \
-       QtUi/32/audio-volume-high.png \
-       QtUi/32/audio-volume-low.png \
-       QtUi/32/audio-volume-medium.png \
-       QtUi/32/audio-volume-muted.png \
-       QtUi/32/audio-volume-off.png \
-       QtUi/32/document-open.png \
-       QtUi/32/edit-find.png \
-       QtUi/32/list-add.png \
-       QtUi/32/media-playback-pause.png \
-       QtUi/32/media-playback-start.png \
-       QtUi/32/media-playback-stop.png \
-       QtUi/32/media-playlist-repeat.png \
-       QtUi/32/media-playlist-shuffle.png \
-       QtUi/32/media-skip-backward.png \
-       QtUi/32/media-skip-forward.png \
-       QtUi/44/audio-volume-high.png \
-       QtUi/44/audio-volume-low.png \
-       QtUi/44/audio-volume-medium.png \
-       QtUi/44/audio-volume-muted.png \
-       QtUi/44/audio-volume-off.png \
-       QtUi/44/document-open.png \
-       QtUi/44/edit-find.png \
-       QtUi/44/list-add.png \
-       QtUi/44/media-playback-pause.png \
-       QtUi/44/media-playback-start.png \
-       QtUi/44/media-playback-stop.png \
-       QtUi/44/media-playlist-repeat.png \
-       QtUi/44/media-playlist-shuffle.png \
-       QtUi/44/media-skip-backward.png \
-       QtUi/44/media-skip-forward.png \
-       QtUi/AUTHORS \
-       QtUi/index.theme
-endif
-
 plugindir := ${plugindir}/${GENERAL_PLUGIN_DIR}
 
 LD = ${CXX}

audacious-plugins-4.4.1.tar.bz2/src/qtui/dialogs-qt.cc Added

audacious-plugins-3.6.2-gtk3.tar.bz2/src/qtui/info_bar.cc -> audacious-plugins-4.4.1.tar.bz2/src/qtui/info_bar.cc Changed

@@ -20,192 +20,335 @@
 #include <cmath>
 
 #include "info_bar.h"
+#include "settings.h"
 
-#include <libaudcore/hook.h>
-#include <libaudcore/index.h>
-#include <libaudcore/objects.h>
-#include <libaudcore/runtime.h>
-#include <libaudcore/interface.h>
-#include <libaudcore/tuple.h>
 #include <libaudcore/drct.h>
+#include <libaudcore/interface.h>
+#include <libaudcore/runtime.h>
 #include <libaudqt/libaudqt.h>
 
-#include <QGraphicsItem>
-#include <QGraphicsPixmapItem>
-#include <QFont>
+#include <QEvent>
+#include <QPainter>
+
+static constexpr int FadeSteps = 10;
+
+static constexpr int VisBands = 12;
+static constexpr int VisDelay = 2; /* delay before falloff in frames */
+static constexpr int VisFalloff = 2; /* falloff in decibels per frame */
 
-VisItem::VisItem (QGraphicsItem * parent) :
- QGraphicsItem (parent),
- Visualizer (Freq)
+struct BarColors
 {
- aud_visualizer_add (this);
-}
+ QColor main, shadow;
+};
 
-VisItem::~VisItem ()
+struct PixelSizes
 {
- aud_visualizer_remove (this);
-}
+ int Spacing, IconSize, Height, BandWidth, BandSpacing, VisWidth, VisScale,
+ VisCenter;
+
+ PixelSizes(int dpi)
+ : Spacing(aud::rescale(dpi, 12, 1)),
+ IconSize(2 * aud::rescale(dpi, 3, 1)), // should be divisible by 2
+ Height(IconSize + 2 * Spacing), BandWidth(aud::rescale(dpi, 16, 1)),
+ BandSpacing(aud::rescale(dpi, 48, 1)),
+ VisWidth(VisBands * (BandWidth + BandSpacing) - BandSpacing +
+ 2 * Spacing),
+ VisScale(aud::rescale(IconSize, 8, 5)), VisCenter(VisScale + Spacing)
+ {
+ }
+};
 
-QRectF VisItem::boundingRect () const
+class InfoVis : public QWidget, Visualizer
 {
- return QRectF (0.0, 0.0, InfoBar::VisWidth, InfoBar::Height);
-}
+public:
+ InfoVis(QWidget * parent = nullptr);
+ ~InfoVis();
+
+ void enable(bool enabled);
 
-void VisItem::paint (QPainter * painter, const QStyleOptionGraphicsItem * option, QWidget * widget)
+ const QGradient & gradient() const { return m_gradient; }
+ const PixelSizes & pixelSizes() const { return ps; }
+
+protected:
+ void render_freq(const float * freq);
+ void clear();
+
+ void changeEvent(QEvent * event);
+ void paintEvent(QPaintEvent *);
+
+private:
+ void update_colors();
+
+ const PixelSizes ps;
+ QLinearGradient m_gradient;
+ BarColors m_bar_colorsVisBands;
+
+ float m_barsVisBands{};
+ char m_delayVisBands{};
+};
+
+void InfoVis::update_colors()
 {
- QColor c = Qt::blue;
+ auto & base = palette().color(QPalette::Window);
+ auto & highlight = palette().color(QPalette::Highlight);
 
- painter->fillRect (boundingRect (), QColor (0, 0, 0, 0));
- painter->setPen (QPen (c, 1, Qt::SolidLine, Qt::SquareCap, Qt::BevelJoin));
+ m_gradient.setStops(audqt::dark_bg_gradient(base));
 
- for (int i = 0; i < InfoBar::VisBands; i++)
+ for (int i = 0; i < VisBands; i++)
 {
- int x = InfoBar::Spacing + 8 * i;
- int q = InfoBar::IconSize - m_barsi;
- int t = -(InfoBar::IconSize - q);
-
- painter->fillRect (x, InfoBar::IconSize, 6, t, c);
+ m_bar_colorsi.main = audqt::vis_bar_color(highlight, i, VisBands);
+ m_bar_colorsi.shadow = m_bar_colorsi.main.darker(333);
 }
 }
 
-void VisItem::render_freq (const float * freq)
+InfoVis::InfoVis(QWidget * parent)
+ : QWidget(parent), Visualizer(Freq), ps(audqt::sizes.OneInch),
+ m_gradient(0, 0, 0, ps.Height)
 {
- /* xscalei = pow (256, i / VIS_BANDS) - 0.5; */
- const float xscaleInfoBar::VisBands + 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};
+ update_colors();
+ setAttribute(Qt::WA_OpaquePaintEvent);
+ resize(ps.VisWidth + 2 * ps.Spacing, ps.Height);
+}
 
- for (int i = 0; i < InfoBar::VisBands; i ++)
- {
- int a = ceilf (xscalei);
- int b = floorf (xscalei + 1);
- float n = 0;
+InfoVis::~InfoVis() { enable(false); }
 
- if (b < a)
- n += freqb * (xscalei + 1 - xscalei);
- else
- {
- if (a > 0)
- n += freqa - 1 * (a - xscalei);
- for (; a < b; a ++)
- n += freqa;
- if (b < 256)
- n += freqb * (xscalei + 1 - b);
- }
+void InfoVis::render_freq(const float * freq)
+{
+ /* xscalei = pow (256, i / VIS_BANDS) - 0.5; */
+ const float xscaleVisBands + 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 (int i = 0; i < VisBands; i++)
+ {
 /* 40 dB range */
- int x = 40 + 20 * log10f (n);
- x = aud::clamp (x, 0, 40);
+ float x = 40 + compute_freq_band(freq, xscale, i, VisBands);
 
- m_barsi -= aud::max (0, InfoBar::VisFalloff - m_delayi);
+ m_barsi -= aud::max(0, VisFalloff - m_delayi);
 
 if (m_delayi)
- m_delayi --;
+ m_delayi--;
 
 if (x > m_barsi)
 {
 m_barsi = x;
- m_delayi = InfoBar::VisDelay;
+ m_delayi = VisDelay;
 }
 }
 
- update ();
+ repaint();
 }
 
-void VisItem::clear ()
+void InfoVis::clear()
 {
- memset (m_bars, 0, sizeof m_bars);
- memset (m_delay, 0, sizeof m_delay);
+ memset(m_bars, 0, sizeof m_bars);
+ memset(m_delay, 0, sizeof m_delay);
 
- update ();
+ update();
 }
 
-void AlbumArtItem::update_cb ()
+void InfoVis::changeEvent(QEvent * event)
 {
- setPixmap (audqt::art_request_current (InfoBar::IconSize, InfoBar::IconSize));
+ if (event->type() == QEvent::PaletteChange)
+ update_colors();
+
+ QWidget::changeEvent(event);
 }
 
-InfoBar::InfoBar (QWidget * parent) : QGraphicsView (parent),
- m_scene (new QGraphicsScene (this)),
- m_art (new AlbumArtItem),
- m_title_text (new QGraphicsTextItem),
- m_album_text (new QGraphicsTextItem),
- m_artist_text (new QGraphicsTextItem)
-#ifdef XXX_NOTYET
- m_vis (new VisItem)
-#endif
+void InfoVis::paintEvent(QPaintEvent *)
 {
- setAlignment (Qt::AlignLeft | Qt::AlignTop);
- setScene (m_scene);
- setFixedHeight (InfoBar::Height);
- setCacheMode (QGraphicsView::CacheBackground);
+ QPainter p(this);
+ p.fillRect(0, 0, ps.VisWidth, ps.Height, m_gradient);
 
- m_scene->addItem (m_art);
- m_scene->addItem (m_title_text);
- m_scene->addItem (m_album_text);
- m_scene->addItem (m_artist_text);
-#ifdef XXX_NOTYET
- m_scene->addItem (m_vis);
-#endif
+ for (int i = 0; i < VisBands; i++)
+ {
+ int x = ps.Spacing + i * (ps.BandWidth + ps.BandSpacing);
+ int v = aud::clamp((int)(m_barsi * ps.VisScale / 40), 0, ps.VisScale);
+ int m = aud::min(ps.VisCenter + v, ps.Height);
 
- m_title_text->setDefaultTextColor (QColor (255, 255, 255));
- m_artist_text->setDefaultTextColor (QColor (255, 255, 255));
- m_album_text->setDefaultTextColor (QColor (179, 179, 179));
+ p.fillRect(x, ps.VisCenter - v, ps.BandWidth, v, m_bar_colorsi.main);
+ p.fillRect(x, ps.VisCenter, ps.BandWidth, m - ps.VisCenter,
+ m_bar_colorsi.shadow);
+ }
+}
 
- QFont f = m_title_text->font ();
- f.setPointSize (18);
- m_title_text->setFont (f);
+void InfoVis::enable(bool enabled)
+{
+ if (enabled)
+ aud_visualizer_add(this);
+ else
+ {
+ aud_visualizer_remove(this);
+ clear();
+ }
 
- f = m_artist_text->font ();
- f.setPointSize (9);
- m_artist_text->setFont (f);
+ setVisible(enabled);
+}
 
- f = m_album_text->font ();
- f.setPointSize (9);
- m_album_text->setFont (f);
+InfoBar::InfoBar(QWidget * parent)
+ : QWidget(parent), m_vis(new InfoVis(this)), ps(m_vis->pixelSizes()),
+ m_stopped(true)
+{
+ update_vis();
+ setFixedHeight(ps.Height);
+
+ m_art_enabled = aud_get_bool("qtui", "infoarea_show_art");
+
+ for (SongData & d : sd)
+ {
+ d.title.setTextFormat(Qt::PlainText);
+ d.artist.setTextFormat(Qt::PlainText);
+ d.album.setTextFormat(Qt::PlainText);
+ d.alpha = 0;
+ }
+
+ if (aud_drct_get_ready())
+ {
+ m_stopped = false;
+ update_title();
+ update_album_art();
+
+ /* skip fade-in */
+ sdCur.alpha = FadeSteps;
+ }
 }
 
-QSize InfoBar::minimumSizeHint () const
+void InfoBar::resizeEvent(QResizeEvent *)
 {
- return QSize (InfoBar::IconSize + (2 * InfoBar::Spacing), InfoBar::Height);
+ reellipsize_title();
+ m_vis->move(width() - ps.VisWidth, 0);
 }
 
-void InfoBar::resizeEvent (QResizeEvent * event)
+void InfoBar::paintEvent(QPaintEvent *)
 {
- QGraphicsView::resizeEvent (event);
+ QPainter p(this);
 
- QRect rect = contentsRect ();
- setSceneRect (rect);
+ int viswidth = m_vis->isVisible() ? ps.VisWidth : 0;
+ int offset = m_art_enabled ? ps.Height : ps.Spacing;
 
- QLinearGradient gradient (0, 0, 0, rect.height ());
- gradient.setStops ({
- {0, QColor (64, 64, 64)},
- {0.499, QColor (38, 38, 38)},
- {0.5, QColor (26, 26, 26)},
- {1, QColor (0, 0, 0)}
- });
- m_scene->setBackgroundBrush (gradient);
+ p.fillRect(0, 0, width() - viswidth, ps.Height, m_vis->gradient());
 
- m_art->setPos (InfoBar::Spacing, InfoBar::Spacing);
+ for (SongData & d : sd)
+ {
+ p.setOpacity((qreal)d.alpha / FadeSteps);
 
- qreal x = InfoBar::IconSize + (InfoBar::Spacing * 1.5);
- qreal y = InfoBar::Spacing / 2;
- m_title_text->setPos (x, y);
- m_artist_text->setPos (x, y + (InfoBar::IconSize / 2));
- m_album_text->setPos (x, y + ((InfoBar::IconSize * 3) / 4));
+ if (m_art_enabled && !d.art.isNull())
+ {
+ auto sz = d.art.size() / d.art.devicePixelRatio();
+ int left = ps.Spacing + (ps.IconSize - sz.width()) / 2;
+ int top = ps.Spacing + (ps.IconSize - sz.height()) / 2;
+ p.drawPixmap(left, top, d.art);
+ }
+
+ QFont font = p.font();
+ font.setPointSize(18);
+ p.setFont(font);
+
+ if (d.title.text().isNull() && !d.orig_title.isNull())
+ {
+ QFontMetrics metrics = p.fontMetrics();
+ d.title = QStaticText(metrics.elidedText(
+ d.orig_title, Qt::ElideRight,
+ width() - viswidth - offset - ps.Spacing));
+ }
+
+ p.setPen(QColor(255, 255, 255));
+ p.drawStaticText(offset, ps.Spacing, d.title);
 
-#ifdef XXX_NOTYET
- m_vis->setPos ((rect.width () - InfoBar::VisWidth) - (InfoBar::Spacing * 2), 0);
-#endif
+ font.setPointSize(9);
+ p.setFont(font);
+
+ p.drawStaticText(offset, ps.Spacing + ps.IconSize / 2, d.artist);
+
+ p.setPen(QColor(179, 179, 179));
+ p.drawStaticText(offset, ps.Spacing + ps.IconSize * 3 / 4, d.album);
+ }
 }
 
-void InfoBar::update_metadata_cb ()
+void InfoBar::update_title()
 {
- Tuple tuple = aud_drct_get_tuple ();
- String title = tuple.get_str (Tuple::Title);
- String artist = tuple.get_str (Tuple::Artist);
- String album = tuple.get_str (Tuple::Album);
+ Tuple tuple = aud_drct_get_tuple();
+
+ sdCur.title.setText(QString());
+ sdCur.orig_title = tuple.get_str(Tuple::Title);
+ sdCur.artist.setText((const char *)tuple.get_str(Tuple::Artist));
+ sdCur.album.setText((const char *)tuple.get_str(Tuple::Album));
+
+ update();
+}
+
+void InfoBar::update_album_art()
+{
+ sdCur.art = audqt::art_request_current(ps.IconSize, ps.IconSize);
+}
+
+void InfoBar::next_song()
+{
+ sdPrev = std::move(sdCur);
+ sdCur.alpha = 0;
+}
+
+void InfoBar::do_fade()
+{
+ bool done = true;
+
+ if (aud_drct_get_playing() && sdCur.alpha < FadeSteps)
+ {
+ sdCur.alpha++;
+ done = false;
+ }
 
- m_title_text->setPlainText (QString ((const char *) title));
- m_artist_text->setPlainText (QString ((const char *) artist));
- m_album_text->setPlainText (QString ((const char *) album));
+ if (sdPrev.alpha > 0)
+ {
+ sdPrev.alpha--;
+ done = false;
+ }
+
+ update();
+
+ if (done)
+ fade_timer.stop();
+}
+
+void InfoBar::playback_ready_cb()
+{
+ if (!m_stopped)
+ next_song();
+
+ m_stopped = false;
+ update_title();
+ update_album_art();
+
+ update();
+ fade_timer.start();
+}
+
+void InfoBar::playback_stop_cb()
+{
+ next_song();
+ m_stopped = true;
+
+ update();
+ fade_timer.start();
+}
+
+void InfoBar::reellipsize_title()
+{
+ // re-ellipsize text on next paintEvent
+ for (SongData & d : sd)
+ d.title.setText(QString());
+}
+
+void InfoBar::update_vis()
+{
+ reellipsize_title();
+ m_vis->enable(aud_get_bool("qtui", "infoarea_show_vis"));
+ update();
+}
+
+void InfoBar::update_art()
+{
+ reellipsize_title();
+ m_art_enabled = aud_get_bool("qtui", "infoarea_show_art");
+ update();
 }

audacious-plugins-3.6.2-gtk3.tar.bz2/src/qtui/info_bar.h -> audacious-plugins-4.4.1.tar.bz2/src/qtui/info_bar.h Changed

@@ -17,80 +17,66 @@
 * the use of this software.
 */
 
-#include <QWidget>
-#include <QPainter>
-#include <QGraphicsView>
-#include <QGraphicsPixmapItem>
-#include <QGraphicsTextItem>
-
-#include <libaudcore/hook.h>
-#include <libaudcore/runtime.h>
-#include <libaudcore/visualizer.h>
-
 #ifndef INFO_BAR_H
 #define INFO_BAR_H
 
-class VisItem : public QGraphicsItem, public Visualizer {
-public:
- VisItem (QGraphicsItem * parent = nullptr);
- ~VisItem ();
-
- QRectF boundingRect () const;
- void paint (QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = nullptr);
-
-private:
- void render_freq (const float * freq);
- void clear ();
-
- char m_bars12;
- char m_delay12;
-};
+#include <QStaticText>
+#include <QWidget>
 
-class AlbumArtItem : public QGraphicsPixmapItem {
-private:
- void update_cb ();
+#include <libaudcore/hook.h>
 
- const HookReceiver<AlbumArtItem>
- hook1 {"playback ready", this, & AlbumArtItem::update_cb},
- hook2 {"playback stop", this, & AlbumArtItem::update_cb},
- hook3 {"current art ready", this, & AlbumArtItem::update_cb};
-};
+class InfoVis;
+struct PixelSizes;
 
-class InfoBar : public QGraphicsView {
+class InfoBar : public QWidget
+{
 public:
- InfoBar (QWidget * parent = nullptr);
-
- static constexpr int Spacing = 8;
- static constexpr int IconSize = 64;
- static constexpr int Height = IconSize + (2 * Spacing);
+ InfoBar(QWidget * parent = nullptr);
 
- static constexpr int VisBands = 12;
- static constexpr int VisWidth = (8 * VisBands) + Spacing;
- static constexpr int VisCenter = (IconSize * 5 / 8 + Spacing);
- static constexpr int VisDelay = 2;
- static constexpr int VisFalloff = 2;
-
- QSize minimumSizeHint () const;
- void resizeEvent (QResizeEvent *);
+ void resizeEvent(QResizeEvent *);
+ void paintEvent(QPaintEvent *);
 
 private:
- QGraphicsScene * m_scene;
- AlbumArtItem * m_art;
-
- QGraphicsTextItem * m_title_text;
- QGraphicsTextItem * m_album_text;
- QGraphicsTextItem * m_artist_text;
-
-#ifdef XXX_NOTYET
- VisItem * m_vis;
-#endif
+ void update_title();
+ void update_album_art();
+ void next_song();
+ void do_fade();
 
- void update_metadata_cb ();
+ void playback_ready_cb();
+ void playback_stop_cb();
+ void reellipsize_title();
+ void update_vis();
+ void update_art();
 
 const HookReceiver<InfoBar>
- hook1 {"tuple change", this, & InfoBar::update_metadata_cb},
- hook2 {"playback ready", this, & InfoBar::update_metadata_cb},
- hook3 {"playback stop", this, & InfoBar::update_metadata_cb};
+ hook1{"tuple change", this, &InfoBar::update_title},
+ hook2{"playback ready", this, &InfoBar::playback_ready_cb},
+ hook3{"playback stop", this, &InfoBar::playback_stop_cb},
+ hook4{"qtui toggle infoarea_vis", this, &InfoBar::update_vis},
+ hook5{"qtui toggle infoarea_art", this, &InfoBar::update_art};
+
+ const Timer<InfoBar> fade_timer{TimerRate::Hz30, this, &InfoBar::do_fade};
+
+ InfoVis * m_vis;
+ const PixelSizes & ps;
+
+ struct SongData
+ {
+ QPixmap art;
+ QString orig_title;
+ QStaticText title, artist, album;
+ int alpha;
+ };
+
+ enum
+ {
+ Prev = 0,
+ Cur = 1
+ }; /* index into SongData array */
+
+ SongData sd2;
+ bool m_stopped;
+ bool m_art_enabled;
 };
 
 #endif

audacious-plugins-3.6.2-gtk3.tar.bz2/src/qtui/main_window.cc -> audacious-plugins-4.4.1.tar.bz2/src/qtui/main_window.cc Changed

@@ -21,297 +21,431 @@
 
 #include <libaudcore/drct.h>
 #include <libaudcore/i18n.h>
-#include <libaudcore/runtime.h>
-#include <libaudcore/plugin.h>
 #include <libaudcore/plugins.h>
+#include <libaudcore/runtime.h>
 
 #include <libaudqt/libaudqt.h>
-#include <libaudqt/volumebutton.h>
 
-#include "filter_input.h"
-#include "playlist.h"
-#include "time_slider.h"
-#include "status_bar.h"
+#include "info_bar.h"
+#include "menus.h"
+#include "playlist-qt.h"
 #include "playlist_tabs.h"
+#include "status_bar.h"
+#include "time_slider.h"
 #include "tool_bar.h"
 
-#include <QApplication>
-#include <QDockWidget>
 #include <QAction>
+#include <QBoxLayout>
+#include <QCloseEvent>
+#include <QDockWidget>
+#include <QLabel>
+#include <QMenuBar>
 #include <QSettings>
+#include <QToolButton>
 
-MainWindow::MainWindow () :
- m_dialogs (this),
- filterInput (new FilterInput (this)),
- playlistTabs (new PlaylistTabs (this)),
- infoBar (new InfoBar (this)),
- centralWidget (new QWidget (this)),
- centralLayout (new QVBoxLayout (centralWidget))
+class DockWidget : public QDockWidget
 {
-#if defined(Q_OS_WIN32) || defined(Q_OS_MAC)
- QIcon::setThemeName ("QtUi");
+public:
+ DockWidget(QWidget * parent, audqt::DockItem * item)
+ : QDockWidget(parent), m_item(item)
+ {
+ setObjectName(item->id());
+ setWindowTitle(item->name());
+ setWindowRole("plugin");
+ setWidget(item->widget());
+ setContextMenuPolicy(Qt::PreventContextMenu);
 
- QStringList paths = QIcon::themeSearchPaths ();
- paths.prepend (aud_get_path (AudPath::DataDir));
- QIcon::setThemeSearchPaths (paths);
-#else
- QApplication::setWindowIcon (QIcon::fromTheme ("audacious"));
-#endif
+ item->set_host_data(this);
+ }
 
- auto slider = new TimeSlider (this);
+ void destroy()
+ {
+ if (in_event)
+ deleteLater();
+ else
+ delete this;
+ }
 
- const ToolBarItem items = {
- ToolBarAction ("document-open", N_("Open Files"), N_("Open Files"),
- () { audqt::fileopener_show (audqt::FileMode::Open); }),
- ToolBarAction ("list-add", N_("Add Files"), N_("Add Files"),
- () { audqt::fileopener_show (audqt::FileMode::Add); }),
- ToolBarSeparator (),
- ToolBarAction ("media-playback-play", N_("Play"), N_("Play"), aud_drct_play_pause, & toolButtonPlayPause),
- ToolBarAction ("media-playback-stop", N_("Stop"), N_("Stop"), aud_drct_stop),
- ToolBarAction ("media-skip-backward", N_("Previous"), N_("Previous"), aud_drct_pl_prev),
- ToolBarAction ("media-skip-forward", N_("Next"), N_("Next"), aud_drct_pl_next),
- ToolBarSeparator (),
- ToolBarCustom (slider),
- ToolBarCustom (slider->label ()),
- ToolBarSeparator (),
- ToolBarAction ("media-playlist-repeat", N_("Repeat"), N_("Repeat"),
- (bool on) { aud_set_bool (nullptr, "repeat", on); }, & toolButtonRepeat),
- ToolBarAction ("media-playlist-shuffle", N_("Shuffle"), N_("Shuffle"),
- (bool on) { aud_set_bool (nullptr, "shuffle", on); }, & toolButtonShuffle),
- ToolBarCustom (new audqt::VolumeButton (this)),
- ToolBarCustom (filterInput),
- };
-
- addToolBar (Qt::TopToolBarArea, new ToolBar (this, items));
-
- setUnifiedTitleAndToolBarOnMac (true);
-
- updateToggles ();
-
- setStatusBar (new StatusBar (this));
- setCentralWidget (centralWidget);
-
- centralLayout->addWidget (playlistTabs);
- centralLayout->addWidget (infoBar);
-
- centralLayout->setContentsMargins (0, 0, 0, 0);
- centralLayout->setSpacing (4);
-
- connect (filterInput, &QLineEdit::textChanged, playlistTabs, &PlaylistTabs::filterTrigger);
-
- setupActions ();
- add_dock_plugins ();
-
- buffering_timer.setSingleShot (true);
- connect (& buffering_timer, & QTimer::timeout, this, & MainWindow::show_buffering);
-
- if (aud_drct_get_playing ())
+protected:
+ void closeEvent(QCloseEvent * event) override { close_for_event(event); }
+
+ void keyPressEvent(QKeyEvent * event) override
 {
- playback_begin_cb ();
- if (aud_drct_get_ready ())
- playback_ready_cb ();
+ auto mods = Qt::ShiftModifier | Qt::ControlModifier | Qt::AltModifier;
+ if (!(event->modifiers() & mods) && event->key() == Qt::Key_Escape &&
+ isFloating())
+ {
+ close_for_event(event);
+ return;
+ }
+
+ QDockWidget::keyPressEvent(event);
 }
- else
- playback_stop_cb ();
 
- title_change_cb ();
+private:
+ void close_for_event(QEvent * event)
+ {
+ in_event = true;
+ m_item->user_close();
+ in_event = false;
+ event->accept();
+ }
 
- readSettings ();
-}
+ audqt::DockItem * m_item;
+ bool in_event = false;
+};
 
-MainWindow::~MainWindow ()
+static QString get_config_name()
 {
- remove_dock_plugins ();
+ int instance = aud_get_instance();
+ return (instance == 1) ? QString("audacious")
+ : QString("audacious-%1").arg(instance);
 }
 
-void MainWindow::closeEvent (QCloseEvent * e)
+static void toggle_search_tool(bool enable)
 {
- QSettings settings ("audacious", "QtUi");
- settings.setValue ("geometry", saveGeometry());
- settings.setValue ("windowState", saveState());
-
- aud_quit ();
- e->ignore ();
+ if (enable)
+ hook_call("qtui show search tool", nullptr);
+ else
+ {
+ auto search_tool = aud_plugin_lookup_basename("search-tool-qt");
+ if (search_tool)
+ aud_plugin_enable(search_tool, false);
+ }
 }
 
-void MainWindow::readSettings ()
+static QToolButton * create_menu_button(QWidget * parent, QMenuBar * menubar)
 {
- QSettings settings ("audacious", "QtUi");
- restoreGeometry (settings.value ("geometry").toByteArray());
- restoreState (settings.value ("windowState").toByteArray());
+ auto button = new QToolButton(parent);
+ button->setIcon(QIcon::fromTheme("audacious"));
+ button->setPopupMode(QToolButton::InstantPopup);
+ button->setStyleSheet("QToolButton::menu-indicator { image: none; }");
+ button->setToolTip(_("Menu"));
+
+ for (auto action : menubar->actions())
+ button->addAction(action);
+
+ return button;
 }
 
-void MainWindow::keyPressEvent (QKeyEvent * e)
+MainWindow::MainWindow()
+ : m_config_name(get_config_name()), m_dialogs(this),
+ m_menubar(qtui_build_menubar(this)),
+ m_playlist_tabs(new PlaylistTabs(this)),
+ m_center_widget(new QWidget(this)),
+ m_center_layout(audqt::make_vbox(m_center_widget, 0)),
+ m_infobar(new InfoBar(this)), m_statusbar(new StatusBar(this)),
+ m_search_tool(aud_plugin_lookup_basename("search-tool-qt")),
+ m_playlist_manager(aud_plugin_lookup_basename("playlist-manager-qt"))
 {
- switch (e->modifiers ())
+ auto slider = new TimeSlider(this);
+
+ const ToolBarItem items = {
+ ToolBarCustom(create_menu_button(this, m_menubar), &m_menu_action),
+ ToolBarAction("edit-find", N_("Search Library"), N_("Search Library"),
+ toggle_search_tool, &m_search_action),
+ ToolBarAction("document-open", N_("Open Files"), N_("Open Files"),
+ () { audqt::fileopener_show(audqt::FileMode::Open); }),
+ ToolBarAction("list-add", N_("Add Files"), N_("Add Files"),
+ () { audqt::fileopener_show(audqt::FileMode::Add); }),
+ ToolBarSeparator(),
+ ToolBarAction("media-skip-backward", N_("Previous"), N_("Previous"),
+ aud_drct_pl_prev),
+ ToolBarAction("media-playback-start", N_("Play"), N_("Play"),
+ aud_drct_play_pause, &m_play_pause_action),
+ ToolBarAction("media-playback-stop", N_("Stop"), N_("Stop"),
+ aud_drct_stop, &m_stop_action),
+ ToolBarAction(
+ "media-playback-stop", N_("Stop After This Song"),
+ N_("Stop After This Song"),
+ (bool on) { aud_set_bool("stop_after_current_song", on); },
+ &m_stop_after_action),
+ ToolBarAction("media-skip-forward", N_("Next"), N_("Next"),
+ aud_drct_pl_next),
+ ToolBarAction(
+ "media-record", N_("Record Stream"), N_("Record Stream"),
+ (bool on) { aud_set_bool("record", on); }, &m_record_action),
+ ToolBarSeparator(),
+ ToolBarCustom(slider),
+ ToolBarCustom(slider->label()),
+ ToolBarSeparator(),
+ ToolBarAction(
+ "media-playlist-repeat", N_("Repeat"), N_("Repeat"),
+ (bool on) { aud_set_bool("repeat", on); }, &m_repeat_action),
+ ToolBarAction(
+ "media-playlist-shuffle", N_("Shuffle"), N_("Shuffle"),
+ (bool on) { aud_set_bool("shuffle", on); }, &m_shuffle_action),
+ ToolBarCustom(audqt::volume_button_new(this))};
+
+ auto toolbar = new ToolBar(this, items);
+ addToolBar(Qt::TopToolBarArea, toolbar);
+
+ if (m_search_tool)
+ aud_plugin_add_watch(m_search_tool, plugin_watcher, this);
+ else
+ m_search_action->setVisible(false);
+
+ update_toggles();
+
+ setStatusBar(m_statusbar);
+ setCentralWidget(m_center_widget);
+
+ m_center_layout->addWidget(m_playlist_tabs);
+ m_center_layout->addWidget(m_infobar);
+
+ setMenuBar(m_menubar);
+ setDockNestingEnabled(true);
+ setWindowRole("mainwindow");
+
+ audqt::register_dock_host(this);
+
+ if (aud_drct_get_playing())
 {
- case Qt::ControlModifier:
- switch (e->key ())
- {
- case Qt::Key_F:
- filterInput->setFocus ();
- break;
- }
- break;
+ playback_begin_cb();
+ if (aud_drct_get_ready())
+ title_change_cb();
 }
+ else
+ playback_stop_cb();
 
- QMainWindow::keyPressEvent (e);
+ read_settings();
+ update_visibility();
+
+ /* Make sure UI elements are visible, in case restoreState() hid
+ * them. It's not clear exactly how they can get hidden in the first
+ * place, but user screenshots show that it somehow happens, and in
+ * that case we don't want them to be gone forever. */
+ toolbar->show();
+ for (auto w : findChildren<QDockWidget *>())
+ w->show();
+
+ /* set initial keyboard focus on the playlist */
+ m_playlist_tabs->currentPlaylistWidget()->setFocus(Qt::OtherFocusReason);
 }
 
-void MainWindow::updateToggles ()
+MainWindow::~MainWindow()
 {
- toolButtonRepeat->setChecked (aud_get_bool (nullptr, "repeat"));
- toolButtonShuffle->setChecked (aud_get_bool (nullptr, "shuffle"));
+ QSettings settings(m_config_name, "QtUi");
+ settings.setValue("geometry", saveGeometry());
+ settings.setValue("windowState", saveState());
+
+ aud_set_int("qtui", "player_width", audqt::to_portable_dpi(width()));
+ aud_set_int("qtui", "player_height", audqt::to_portable_dpi(height()));
+
+ audqt::unregister_dock_host();
+
+ if (m_search_tool)
+ aud_plugin_remove_watch(m_search_tool, plugin_watcher, this);
 }
 
-void MainWindow::update_play_pause ()
+void MainWindow::closeEvent(QCloseEvent * e)
 {
- if (! aud_drct_get_playing () || aud_drct_get_paused ())
+ bool handled = false;
+
+ hook_call("window close", &handled);
+
+ if (!handled)
 {
- toolButtonPlayPause->setIcon (QIcon::fromTheme ("media-playback-start"));
- toolButtonPlayPause->setText (_("Play"));
- toolButtonPlayPause->setToolTip (_("Play"));
+ e->accept();
+ aud_quit();
 }
 else
+ e->ignore();
+}
+
+void MainWindow::keyPressEvent(QKeyEvent * event)
+{
+ auto CtrlShiftAlt =
+ Qt::ShiftModifier | Qt::ControlModifier | Qt::AltModifier;
+ if (!(event->modifiers() & CtrlShiftAlt) && event->key() == Qt::Key_Escape)
 {
- toolButtonPlayPause->setIcon (QIcon::fromTheme ("media-playback-pause"));
- toolButtonPlayPause->setText (_("Pause"));
- toolButtonPlayPause->setToolTip (_("Pause"));
+ auto widget = m_playlist_tabs->currentPlaylistWidget();
+
+ /* on the first press, set focus to the playlist */
+ if (!widget->hasFocus())
+ {
+ widget->setFocus(Qt::OtherFocusReason);
+ return;
+ }
+
+ /* on the second press, scroll to the current entry */
+ if (widget->scrollToCurrent(true))
+ return;
+
+ /* on the third press, switch to the playing playlist */
+ Playlist::playing_playlist().activate();
+
+ /* ensure currentPlaylistWidget() is up to date */
+ Playlist::process_pending_update();
+ widget = m_playlist_tabs->currentPlaylistWidget();
+
+ widget->scrollToCurrent(true);
+ return;
 }
+
+ QMainWindow::keyPressEvent(event);
 }
 
-void MainWindow::show_buffering ()
+void MainWindow::read_settings()
 {
- if (aud_drct_get_playing () && ! aud_drct_get_ready ())
- setWindowTitle (_("Buffering ..."));
+ QSettings settings(m_config_name, "QtUi");
+
+ if (!restoreGeometry(settings.value("geometry").toByteArray()))
+ {
+ // QWidget::restoreGeometry() can sometimes fail, e.g. due to
+ // https://bugreports.qt.io/browse/QTBUG-86087. Try to at least
+ // restore the correct player size in that case.
+ resize(audqt::to_native_dpi(aud_get_int("qtui", "player_width")),
+ audqt::to_native_dpi(aud_get_int("qtui", "player_height")));
+ }
+
+ restoreState(settings.value("windowState").toByteArray());
 }
 
-void MainWindow::title_change_cb ()
+void MainWindow::set_title(const QString & title)
 {
- auto title = aud_drct_get_title ();
- if (title)
- setWindowTitle (QString (title) + QString (" - Audacious"));
+ int instance = aud_get_instance();
+ if (instance == 1)
+ QMainWindow::setWindowTitle(title);
+ else
+ QMainWindow::setWindowTitle(
+ QString("%1 (%2)").arg(title).arg(instance));
 }
 
-void MainWindow::playback_begin_cb ()
+void MainWindow::update_toggles()
 {
- update_play_pause ();
-
- int last_list = aud_playlist_by_unique_id (playing_id);
- auto last_widget = playlistTabs->playlistWidget (last_list);
- if (last_widget)
- last_widget->updatePlaybackIndicator ();
+ if (m_search_tool)
+ m_search_action->setChecked(aud_plugin_get_enabled(m_search_tool));
 
- int list = aud_playlist_get_playing ();
- auto widget = playlistTabs->playlistWidget (list);
- if (widget)
- widget->scrollToCurrent ();
- if (widget && widget != last_widget)
- widget->updatePlaybackIndicator ();
+ bool stop_after = aud_get_bool("stop_after_current_song");
+ m_stop_action->setVisible(!stop_after);
+ m_stop_after_action->setVisible(stop_after);
+ m_stop_after_action->setChecked(stop_after);
 
- playing_id = aud_playlist_get_unique_id (list);
+ m_record_action->setVisible(aud_drct_get_record_enabled());
+ m_record_action->setChecked(aud_get_bool("record"));
 
- buffering_timer.start (250);
+ m_repeat_action->setChecked(aud_get_bool("repeat"));
+ m_shuffle_action->setChecked(aud_get_bool("shuffle"));
 }
 
-void MainWindow::playback_ready_cb ()
+void MainWindow::update_visibility()
 {
- title_change_cb ();
+ bool menu_visible = aud_get_bool("qtui", "menu_visible");
+ m_menubar->setVisible(menu_visible);
+ m_menu_action->setVisible(!menu_visible);
+
+ m_infobar->setVisible(aud_get_bool("qtui", "infoarea_visible"));
+ m_statusbar->setVisible(aud_get_bool("qtui", "statusbar_visible"));
 }
 
-void MainWindow::pause_cb ()
+void MainWindow::update_play_pause()
 {
- update_play_pause ();
+ if (!aud_drct_get_playing() || aud_drct_get_paused())
+ {
+ m_play_pause_action->setIcon(QIcon::fromTheme("media-playback-start"));
+ m_play_pause_action->setText(_("Play"));
+ m_play_pause_action->setToolTip(_("Play"));
+ }
+ else
+ {
+ m_play_pause_action->setIcon(QIcon::fromTheme("media-playback-pause"));
+ m_play_pause_action->setText(_("Pause"));
+ m_play_pause_action->setToolTip(_("Pause"));
+ }
+}
 
- int list = aud_playlist_by_unique_id (playing_id);
- auto widget = playlistTabs->playlistWidget (list);
- if (widget)
- widget->updatePlaybackIndicator ();
+void MainWindow::title_change_cb()
+{
+ auto title = aud_drct_get_title();
+ if (title)
+ {
+ set_title(QString(title) + QString(" - Audacious"));
+ m_buffering_timer.stop();
+ }
 }
 
-void MainWindow::playback_stop_cb ()
+void MainWindow::playback_begin_cb()
 {
- setWindowTitle ("Audacious");
- update_play_pause ();
+ update_play_pause();
 
- int last_list = aud_playlist_by_unique_id (playing_id);
- auto last_widget = playlistTabs->playlistWidget (last_list);
+ auto last_widget = m_playlist_tabs->playlistWidget(m_last_playing.index());
 if (last_widget)
- last_widget->updatePlaybackIndicator ();
+ last_widget->updatePlaybackIndicator();
+
+ auto playing = Playlist::playing_playlist();
+ auto widget = m_playlist_tabs->playlistWidget(playing.index());
+ if (widget)
+ widget->scrollToCurrent();
+ if (widget && widget != last_widget)
+ widget->updatePlaybackIndicator();
 
- playing_id = -1;
+ m_last_playing = playing;
+
+ m_buffering_timer.queue(250, this() { set_title(_("Buffering ...")); });
 }
 
-void MainWindow::update_toggles_cb ()
+void MainWindow::pause_cb()
 {
- updateToggles ();
-}
+ update_play_pause();
 
-struct DockWidget {
- QDockWidget * w;
- PluginHandle * pl;
-};
+ auto widget = m_playlist_tabs->playlistWidget(m_last_playing.index());
+ if (widget)
+ widget->updatePlaybackIndicator();
+}
 
-void MainWindow::add_dock_plugin_cb (PluginHandle * plugin)
+void MainWindow::playback_stop_cb()
 {
- QWidget * widget = (QWidget *) aud_plugin_get_qt_widget (plugin);
+ set_title("Audacious");
+ m_buffering_timer.stop();
 
- if (widget)
- {
- widget->resize (320, 240);
+ update_play_pause();
 
- auto w = new QDockWidget;
- w->setWindowTitle (aud_plugin_get_name (plugin));
- w->setObjectName (aud_plugin_get_basename (plugin));
- w->setWidget (widget);
- addDockWidget (Qt::LeftDockWidgetArea, w);
+ auto last_widget = m_playlist_tabs->playlistWidget(m_last_playing.index());
+ if (last_widget)
+ last_widget->updatePlaybackIndicator();
 
- dock_widgets.append (w, plugin);
- }
+ m_last_playing = Playlist();
 }
 
-void MainWindow::remove_dock_plugin_cb (PluginHandle * plugin)
+void MainWindow::show_dock_plugin(PluginHandle * plugin)
 {
- auto remove_cb = & (DockWidget & dw)
- {
- if (dw.pl != plugin)
- return false;
-
- removeDockWidget (dw.w);
+ aud_plugin_enable(plugin, true);
 
- delete dw.w;
- return true;
- };
-
- dock_widgets.remove_if (remove_cb);
+ auto item = audqt::DockItem::find_by_plugin(plugin);
+ if (item)
+ item->grab_focus();
 }
 
-void MainWindow::add_dock_plugins ()
+void MainWindow::add_dock_item(audqt::DockItem * item)
 {
- for (PluginHandle * plugin : aud_plugin_list (PluginType::General))
- {
- if (aud_plugin_get_enabled (plugin))
- add_dock_plugin_cb (plugin);
- }
+ auto w = new DockWidget(this, item);
 
- for (PluginHandle * plugin : aud_plugin_list (PluginType::Vis))
+ if (!restoreDockWidget(w))
 {
- if (aud_plugin_get_enabled (plugin))
- add_dock_plugin_cb (plugin);
+ addDockWidget(Qt::LeftDockWidgetArea, w);
+ // only the search tool is docked by default
+ if (strcmp(item->id(), "search-tool-qt"))
+ w->setFloating(true);
 }
+
+ /* workaround for QTBUG-89144 */
+ auto flags = w->windowFlags();
+ if (flags & Qt::X11BypassWindowManagerHint)
+ w->setWindowFlags(flags & ~Qt::X11BypassWindowManagerHint);
+
+ w->show(); /* in case restoreDockWidget() hid it */
 }
 
-void MainWindow::remove_dock_plugins ()
+void MainWindow::focus_dock_item(audqt::DockItem * item)
 {
- for (PluginHandle * plugin : aud_plugin_list (PluginType::General))
- {
- if (aud_plugin_get_enabled (plugin))
- remove_dock_plugin_cb (plugin);
- }
+ auto w = (DockWidget *)item->host_data();
+ if (w->isFloating())
+ w->activateWindow();
+}
 
- for (PluginHandle * plugin : aud_plugin_list (PluginType::Vis))
- {
- if (aud_plugin_get_enabled (plugin))
- remove_dock_plugin_cb (plugin);
- }
+void MainWindow::remove_dock_item(audqt::DockItem * item)
+{
+ auto w = (DockWidget *)item->host_data();
+ w->destroy();
 }

audacious-plugins-3.6.2-gtk3.tar.bz2/src/qtui/main_window.h -> audacious-plugins-4.4.1.tar.bz2/src/qtui/main_window.h Changed

@@ -21,83 +21,102 @@
 #define MAIN_WINDOW_H
 
 #include <libaudcore/hook.h>
-#include <libaudcore/index.h>
-#include <libaudcore/objects.h>
+#include <libaudcore/mainloop.h>
+#include <libaudcore/playlist.h>
+#include <libaudqt/dock.h>
 
-#include "dialog_windows.h"
-#include "info_bar.h"
+#include "../ui-common/dialogs-qt.h"
 
 #include <QMainWindow>
-#include <QTimer>
-#include <QVBoxLayout>
 
-class FilterInput;
+class InfoBar;
 class PlaylistTabs;
 class PluginHandle;
+class QVBoxLayout;
+class StatusBar;
 
-struct DockWidget;
-
-class MainWindow : public QMainWindow
+class MainWindow : public QMainWindow, audqt::DockHost
 {
 public:
- MainWindow ();
- ~MainWindow ();
+ MainWindow();
+ ~MainWindow();
 
 private:
+ QString m_config_name;
 DialogWindows m_dialogs;
- FilterInput * filterInput;
- PlaylistTabs * playlistTabs;
- InfoBar * infoBar;
- QWidget * centralWidget;
- QVBoxLayout * centralLayout;
-
- QAction * toolButtonPlayPause;
- QAction * toolButtonRepeat;
- QAction * toolButtonShuffle;
-
- QTimer buffering_timer;
-
- void closeEvent (QCloseEvent * e);
- void keyPressEvent (QKeyEvent * e);
-
- void updateToggles ();
- void setupActions ();
- void readSettings ();
-
- void update_play_pause ();
- void show_buffering ();
-
- void add_dock_plugins ();
- void remove_dock_plugins ();
-
- void title_change_cb ();
- void playback_begin_cb ();
- void playback_ready_cb ();
- void pause_cb ();
- void playback_stop_cb ();
- void update_toggles_cb ();
-
- void add_dock_plugin_cb (PluginHandle * plugin);
- void remove_dock_plugin_cb (PluginHandle * plugin);
-
- const HookReceiver<MainWindow>
- hook1 {"title change", this, & MainWindow::title_change_cb},
- hook2 {"playback begin", this, & MainWindow::playback_begin_cb},
- hook3 {"playback ready", this, & MainWindow::playback_ready_cb},
- hook4 {"playback pause", this, & MainWindow::pause_cb},
- hook5 {"playback unpause", this, & MainWindow::pause_cb},
- hook6 {"playback stop", this, & MainWindow::playback_stop_cb},
- hook7 {"set repeat", this, & MainWindow::update_toggles_cb},
- hook8 {"set shuffle", this, & MainWindow::update_toggles_cb},
- hook9 {"set no_playlist_advance", this, & MainWindow::update_toggles_cb},
- hook10 {"set stop_after_current_song", this, & MainWindow::update_toggles_cb};
-
- const HookReceiver<MainWindow, PluginHandle *>
- plugin_hook1 {"dock plugin enabled", this, & MainWindow::add_dock_plugin_cb},
- plugin_hook2 {"dock plugin disabled", this, & MainWindow::remove_dock_plugin_cb};
-
- Index<DockWidget> dock_widgets;
- int playing_id = -1;
+ QMenuBar * m_menubar;
+ PlaylistTabs * m_playlist_tabs;
+ QWidget * m_center_widget;
+ QVBoxLayout * m_center_layout;
+ InfoBar * m_infobar;
+ StatusBar * m_statusbar;
+
+ PluginHandle *m_search_tool, *m_playlist_manager;
+
+ QAction *m_menu_action, *m_search_action;
+ QAction *m_play_pause_action, *m_stop_action, *m_stop_after_action;
+ QAction * m_record_action;
+ QAction *m_repeat_action, *m_shuffle_action;
+
+ QueuedFunc m_buffering_timer;
+ Playlist m_last_playing;
+
+ void closeEvent(QCloseEvent * e) override;
+ void keyPressEvent(QKeyEvent * event) override;
+
+ void read_settings();
+ void set_title(const QString & title);
+ void update_toggles();
+ void update_visibility();
+ void update_play_pause();
+
+ void title_change_cb();
+ void playback_begin_cb();
+ void playback_ready_cb();
+ void pause_cb();
+ void playback_stop_cb();
+
+ void show_dock_plugin(PluginHandle * plugin);
+
+ void add_dock_item(audqt::DockItem * item) override;
+ void focus_dock_item(audqt::DockItem * item) override;
+ void remove_dock_item(audqt::DockItem * item) override;
+
+ void show_search_tool()
+ {
+ if (m_search_tool)
+ show_dock_plugin(m_search_tool);
+ }
+ void show_playlist_manager()
+ {
+ if (m_playlist_manager)
+ show_dock_plugin(m_playlist_manager);
+ }
+
+ static bool plugin_watcher(PluginHandle *, void * me)
+ {
+ ((MainWindow *)me)->update_toggles();
+ return true;
+ }
+
+ const HookReceiver<MainWindow> //
+ hook1{"title change", this, &MainWindow::title_change_cb},
+ hook2{"playback begin", this, &MainWindow::playback_begin_cb},
+ hook3{"playback ready", this, &MainWindow::title_change_cb},
+ hook4{"playback pause", this, &MainWindow::pause_cb},
+ hook5{"playback unpause", this, &MainWindow::pause_cb},
+ hook6{"playback stop", this, &MainWindow::playback_stop_cb},
+ hook7{"set stop_after_current_song", this, &MainWindow::update_toggles},
+ hook8{"enable record", this, &MainWindow::update_toggles},
+ hook9{"set record", this, &MainWindow::update_toggles},
+ hook10{"set repeat", this, &MainWindow::update_toggles},
+ hook11{"set shuffle", this, &MainWindow::update_toggles},
+ hook12{"qtui toggle menubar", this, &MainWindow::update_visibility},
+ hook13{"qtui toggle infoarea", this, &MainWindow::update_visibility},
+ hook14{"qtui toggle statusbar", this, &MainWindow::update_visibility},
+ hook15{"qtui show search tool", this, &MainWindow::show_search_tool},
+ hook16{"qtui show playlist manager", this,
+ &MainWindow::show_playlist_manager};
 };
 
 #endif

audacious-plugins-4.4.1.tar.bz2/src/qtui/menu-ops.cc Added

audacious-plugins-4.4.1.tar.bz2/src/qtui/menus.cc Added

@@ -0,0 +1,315 @@
+/*
+ * menus.cc
+ * Copyright 2014 Michał Lipski and William Pitcock
+ *
+ * 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 "menus.h"
+#include "../ui-common/menu-ops.h"
+
+#include <QMenuBar>
+
+#include <libaudcore/drct.h>
+#include <libaudcore/hook.h>
+#include <libaudcore/i18n.h>
+#include <libaudcore/interface.h>
+#include <libaudcore/playlist.h>
+#include <libaudcore/plugins.h>
+#include <libaudcore/runtime.h>
+
+#include <libaudqt/libaudqt.h>
+#include <libaudqt/menu.h>
+
+static QMenu * services_menu()
+{
+ return audqt::menu_get_by_id(AudMenuID::Main);
+}
+static QMenu * services_menu_pl()
+{
+ return audqt::menu_get_by_id(AudMenuID::Playlist);
+}
+
+static void open_files() { audqt::fileopener_show(audqt::FileMode::Open); }
+static void add_files() { audqt::fileopener_show(audqt::FileMode::Add); }
+static void open_folder()
+{
+ audqt::fileopener_show(audqt::FileMode::OpenFolder);
+}
+static void add_folder() { audqt::fileopener_show(audqt::FileMode::AddFolder); }
+static void open_url() { audqt::urlopener_show(true); }
+static void add_url() { audqt::urlopener_show(false); }
+
+static void pl_find() { hook_call("qtui find", nullptr); }
+static void pl_rename() { hook_call("qtui rename playlist", nullptr); }
+static void pl_close()
+{
+ audqt::playlist_confirm_delete(Playlist::active_playlist());
+}
+static void pl_import()
+{
+ audqt::fileopener_show(audqt::FileMode::ImportPlaylist);
+}
+static void pl_export()
+{
+ audqt::fileopener_show(audqt::FileMode::ExportPlaylist);
+}
+
+static void configure_effects()
+{
+ audqt::prefswin_show_plugin_page(PluginType::Effect);
+}
+static void configure_output()
+{
+ audqt::prefswin_show_plugin_page(PluginType::Output);
+}
+static void configure_visualizations()
+{
+ audqt::prefswin_show_plugin_page(PluginType::Vis);
+}
+
+static void show_search_tool() { hook_call("qtui show search tool", nullptr); }
+static void show_playlist_manager()
+{
+ hook_call("qtui show playlist manager", nullptr);
+}
+static void toggle_menubar() { hook_call("qtui toggle menubar", nullptr); }
+static void toggle_infoarea() { hook_call("qtui toggle infoarea", nullptr); }
+static void toggle_infoarea_vis()
+{
+ hook_call("qtui toggle infoarea_vis", nullptr);
+}
+static void toggle_infoarea_art()
+{
+ hook_call("qtui toggle infoarea_art", nullptr);
+}
+static void toggle_statusbar() { hook_call("qtui toggle statusbar", nullptr); }
+static void toggle_remaining_time()
+{
+ hook_call("qtui toggle remaining time", nullptr);
+}
+
+QMenuBar * qtui_build_menubar(QWidget * parent)
+{
+ static const audqt::MenuItem file_items = {
+ audqt::MenuCommand({N_("_Open Files ..."), "document-open", "Ctrl+O"},
+ open_files),
+ audqt::MenuCommand({N_("_Open Folder ..."), "document-open", "Ctrl+K"},
+ open_folder),
+ audqt::MenuCommand({N_("Open _URL ..."), "folder-remote", "Ctrl+L"},
+ open_url),
+ audqt::MenuCommand({N_("_Add Files ..."), "list-add", "Ctrl+Shift+O"},
+ add_files),
+ audqt::MenuCommand({N_("_Add Folder ..."), "list-add", "Ctrl+Shift+K"},
+ add_folder),
+ audqt::MenuCommand(
+ {N_("Add U_RL ..."), "folder-remote", "Ctrl+Shift+L"}, add_url),
+ audqt::MenuSep(),
+ audqt::MenuCommand({N_("Search _Library"), "edit-find", "Ctrl+Y"},
+ show_search_tool),
+ audqt::MenuSep(),
+ audqt::MenuCommand({N_("A_bout ..."), "help-about"},
+ aud_ui_show_about_window),
+ audqt::MenuCommand({N_("_Settings ..."), "preferences-system"},
+ aud_ui_show_prefs_window),
+ audqt::MenuSep(),
+ audqt::MenuCommand({N_("_Log Inspector ...")},
+ audqt::log_inspector_show),
+ audqt::MenuSep(),
+ audqt::MenuCommand({N_("_Quit"), "application-exit", "Ctrl+Q"},
+ aud_quit)};
+
+ static const audqt::MenuItem playback_items = {
+ audqt::MenuCommand({N_("_Play"), "media-playback-start", "Ctrl+Return"},
+ aud_drct_play),
+ audqt::MenuCommand({N_("Paus_e"), "media-playback-pause", "Ctrl+,"},
+ aud_drct_pause),
+ audqt::MenuCommand({N_("_Stop"), "media-playback-stop", "Ctrl+."},
+ aud_drct_stop),
+ audqt::MenuCommand({N_("Pre_vious"), "media-skip-backward", "Alt+Up"},
+ aud_drct_pl_prev),
+ audqt::MenuCommand({N_("_Next"), "media-skip-forward", "Alt+Down"},
+ aud_drct_pl_next),
+ audqt::MenuCommand({N_("Previous Album")}, aud_drct_pl_prev_album),
+ audqt::MenuCommand({N_("Next Album")}, aud_drct_pl_next_album),
+ audqt::MenuSep(),
+ audqt::MenuToggle({N_("_Repeat"), "media-playlist-repeat", "Ctrl+R"},
+ {nullptr, "repeat", "set repeat"}),
+ audqt::MenuToggle({N_("S_huffle"), "media-playlist-shuffle", "Ctrl+S"},
+ {nullptr, "shuffle", "set shuffle"}),
+ audqt::MenuToggle({N_("Shuffle by Albu_m")},
+ {nullptr, "album_shuffle", "set album_shuffle"}),
+ audqt::MenuToggle(
+ {N_("N_o Playlist Advance"), nullptr, "Ctrl+N"},
+ {nullptr, "no_playlist_advance", "set no_playlist_advance"}),
+ audqt::MenuToggle({N_("Stop A_fter This Song"), nullptr, "Ctrl+M"},
+ {nullptr, "stop_after_current_song",
+ "set stop_after_current_song"}),
+ audqt::MenuSep(),
+ audqt::MenuCommand(
+ {N_("Song _Info ..."), "dialog-information", "Ctrl+I"},
+ audqt::infowin_show_current),
+ audqt::MenuSep(),
+ audqt::MenuCommand({N_("Set Repeat Point _A"), nullptr, "Ctrl+1"},
+ set_ab_repeat_a),
+ audqt::MenuCommand({N_("Set Repeat Point _B"), nullptr, "Ctrl+2"},
+ set_ab_repeat_b),
+ audqt::MenuCommand({N_("_Clear Repeat Points"), nullptr, "Ctrl+3"},
+ clear_ab_repeat)};
+
+ static const audqt::MenuItem dupe_items = {
+ audqt::MenuCommand({N_("By _Title")}, rm_dupes_title),
+ audqt::MenuCommand({N_("By _File Name")}, rm_dupes_filename),
+ audqt::MenuCommand({N_("By File _Path")}, rm_dupes_path),
+ };
+
+ static const audqt::MenuItem sort_items = {
+ audqt::MenuCommand({N_("By Track _Number")}, sort_track),
+ audqt::MenuCommand({N_("By _Title")}, sort_title),
+ audqt::MenuCommand({N_("By _Artist")}, sort_artist),
+ audqt::MenuCommand({N_("By Al_bum")}, sort_album),
+ audqt::MenuCommand({N_("By Albu_m Artist")}, sort_album_artist),
+ audqt::MenuCommand({N_("By Release _Date")}, sort_date),
+ audqt::MenuCommand({N_("By _Genre")}, sort_genre),
+ audqt::MenuCommand({N_("By _Length")}, sort_length),
+ audqt::MenuCommand({N_("By _File Path")}, sort_path),
+ audqt::MenuCommand({N_("By _Custom Title")}, sort_custom_title),
+ audqt::MenuCommand({N_("By C_omment")}, sort_comment),
+ audqt::MenuCommand({N_("By D_isc Number")}, sort_disc),
+ audqt::MenuSep(),
+ audqt::MenuCommand({N_("R_everse Order"), "view-sort-descending"},
+ sort_reverse),
+ audqt::MenuCommand({N_("_Random Order")}, sort_random)};
+
+ static const audqt::MenuItem sort_selected_items = {
+ audqt::MenuCommand({N_("By Track _Number")}, sort_sel_track),
+ audqt::MenuCommand({N_("By _Title")}, sort_sel_title),
+ audqt::MenuCommand({N_("By _Artist")}, sort_sel_artist),
+ audqt::MenuCommand({N_("By Al_bum")}, sort_sel_album),
+ audqt::MenuCommand({N_("By Albu_m Artist")}, sort_sel_album_artist),
+ audqt::MenuCommand({N_("By Release _Date")}, sort_sel_date),
+ audqt::MenuCommand({N_("By _Genre")}, sort_sel_genre),
+ audqt::MenuCommand({N_("By _Length")}, sort_sel_length),
+ audqt::MenuCommand({N_("By _File Path")}, sort_sel_path),
+ audqt::MenuCommand({N_("By _Custom Title")}, sort_sel_custom_title),
+ audqt::MenuCommand({N_("By C_omment")}, sort_sel_comment),
+ audqt::MenuCommand({N_("By D_isc Number")}, sort_sel_disc),
+ audqt::MenuSep(),
+ audqt::MenuCommand({N_("R_everse Order"), "view-sort-descending"},
+ sort_sel_reverse),
+ audqt::MenuCommand({N_("_Random Order")}, sort_sel_random)};
+
+ static const audqt::MenuItem playlist_items = {
+ audqt::MenuCommand(
+ {N_("_Play/Resume"), "media-playback-start", "Shift+Return"},
+ pl_play),
+ audqt::MenuCommand({N_("_Refresh"), "view-refresh", "F5"}, pl_refresh),
+ audqt::MenuSep(),
+ audqt::MenuCommand({N_("_Find ..."), "edit-find", "Ctrl+F"}, pl_find),
+ audqt::MenuSep(),
+ audqt::MenuSub({N_("_Sort"), "view-sort-ascending"}, sort_items),
+ audqt::MenuSub({N_("Sort Se_lected"), "view-sort-ascending"},
+ sort_selected_items),
+ audqt::MenuSub({N_("Remove _Duplicates"), "edit-copy"}, dupe_items),
+ audqt::MenuCommand({N_("Remove _Unavailable Files"), "dialog-warning"},
+ pl_remove_failed),
+ audqt::MenuSep(),
+ audqt::MenuCommand({N_("_New"), "document-new", "Ctrl+T"}, pl_new),
+ audqt::MenuCommand({N_("Ren_ame ..."), "insert-text", "F2"}, pl_rename),
+ audqt::MenuCommand({N_("Remo_ve"), "edit-delete", "Ctrl+W"}, pl_close),
+ audqt::MenuSep(),
+ audqt::MenuCommand({N_("_Import ..."), "document-open"}, pl_import),
+ audqt::MenuCommand({N_("_Export ..."), "document-save"}, pl_export),
+ audqt::MenuSep(),
+ audqt::MenuCommand(
+ {N_("Playlist _Manager ..."), "audio-x-generic", "Ctrl+P"},
+ show_playlist_manager),
+ audqt::MenuCommand({N_("_Queue Manager ..."), nullptr, "Ctrl+U"},
+ audqt::queue_manager_show)};
+
+ static const audqt::MenuItem output_items = {
+ audqt::MenuCommand({N_("Volume _Up"), "audio-volume-high", "Ctrl++"},
+ volume_up),
+ audqt::MenuCommand({N_("Volume _Down"), "audio-volume-low", "Ctrl+-"},
+ volume_down),
+ audqt::MenuSep(),
+ audqt::MenuCommand(
+ {N_("_Equalizer ..."), "multimedia-volume-control", "Ctrl+E"},
+ audqt::equalizer_show),
+ audqt::MenuCommand({N_("E_ffects ..."), "preferences-system"},
+ configure_effects),
+ audqt::MenuSep(),
+ audqt::MenuToggle({N_("Record Stream"), "media-record", "Ctrl+D"},
+ {nullptr, "record", "set record"}),
+ audqt::MenuCommand({N_("Audio Settings ..."), "audio-card"},
+ configure_output)};
+
+ static const audqt::MenuItem view_items = {
+ audqt::MenuToggle({N_("Show _Menu Bar"), nullptr, "Shift+Ctrl+M"},
+ {"qtui", "menu_visible"}, toggle_menubar),
+ audqt::MenuToggle({N_("Show I_nfo Bar"), nullptr, "Shift+Ctrl+I"},
+ {"qtui", "infoarea_visible"}, toggle_infoarea),
+ audqt::MenuToggle({N_("Show Info Bar _Album Art")},
+ {"qtui", "infoarea_show_art"}, toggle_infoarea_art),
+ audqt::MenuToggle({N_("Show Info Bar Vis_ualization")},
+ {"qtui", "infoarea_show_vis"}, toggle_infoarea_vis),
+ audqt::MenuToggle({N_("Show _Status Bar"), nullptr, "Shift+Ctrl+S"},
+ {"qtui", "statusbar_visible"}, toggle_statusbar),
+ audqt::MenuSep(),
+ audqt::MenuToggle(
+ {N_("Show _Remaining Time"), nullptr, "Shift+Ctrl+R"},
+ {"qtui", "show_remaining_time", "qtui toggle remaining time"},
+ toggle_remaining_time),
+ audqt::MenuSep(),
+ audqt::MenuCommand({N_("_Visualizations ..."), "preferences-system"},
+ configure_visualizations)};
+
+ static const audqt::MenuItem main_items = {
+ audqt::MenuSub({N_("_File")}, file_items),
+ audqt::MenuSub({N_("_Playback")}, playback_items),
+ audqt::MenuSub({N_("P_laylist")}, playlist_items),
+ audqt::MenuSub({N_("_Services")}, services_menu),
+ audqt::MenuSub({N_("_Output")}, output_items),
+ audqt::MenuSub({N_("_View")}, view_items)};
+
+ return audqt::menubar_build(main_items, parent);
+}
+
+QMenu * qtui_build_pl_menu(QWidget * parent)
+{
+ static const audqt::MenuItem pl_items = {
+ audqt::MenuCommand(
+ {N_("Song _Info ..."), "dialog-information", "Alt+I"},
+ pl_song_info),
+ audqt::MenuCommand({N_("_Queue/Unqueue"), nullptr, "Alt+Q"},
+ pl_queue_toggle),
+ audqt::MenuSep(),
+ audqt::MenuCommand({N_("_Open Containing Folder"), "folder"},
+ pl_open_folder),
+ audqt::MenuCommand({N_("_Refresh Selected"), "view-refresh", "F6"},
+ pl_refresh_sel),
+ audqt::MenuSep(),
+ audqt::MenuCommand({N_("Cu_t"), "edit-cut", "Ctrl+X"}, pl_cut),
+ audqt::MenuCommand({N_("_Copy"), "edit-copy", "Ctrl+C"}, pl_copy),
+ audqt::MenuCommand({N_("_Paste"), "edit-paste", "Ctrl+V"}, pl_paste),
+ audqt::MenuCommand({N_("Paste at _End"), "edit-paste", "Shift+Ctrl+V"},
+ pl_paste_end),
+ audqt::MenuCommand({N_("Select _All"), "edit-select-all"},
+ pl_select_all),
+ audqt::MenuSep(),
+ audqt::MenuSub({N_("_Services")}, services_menu_pl)};
+
+ return audqt::menu_build(pl_items, parent);
+}

audacious-plugins-4.4.1.tar.bz2/src/qtui/menus.h Added

audacious-plugins-4.4.1.tar.bz2/src/qtui/meson.build Added

audacious-plugins-4.4.1.tar.bz2/src/qtui/playlist-qt.cc Added

@@ -0,0 +1,546 @@
+/*
+ * playlist.cc
+ * Copyright 2014 Michał Lipski
+ *
+ * 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 <QHeaderView>
+#include <QKeyEvent>
+#include <QMenu>
+#include <QSortFilterProxyModel>
+
+#include <libaudcore/audstrings.h>
+#include <libaudcore/drct.h>
+#include <libaudcore/runtime.h>
+#include <libaudqt/libaudqt.h>
+
+#include "playlist-qt.h"
+#include "playlist_header.h"
+#include "playlist_model.h"
+
+#include "../ui-common/menu-ops.h"
+#include "../ui-common/qt-compat.h"
+
+PlaylistWidget::PlaylistWidget(QWidget * parent, Playlist playlist)
+ : audqt::TreeView(parent), m_playlist(playlist),
+ model(new PlaylistModel(this, playlist)),
+ proxyModel(new PlaylistProxyModel(this, playlist))
+{
+ model->setFont(font());
+
+ /* setting up filtering model */
+ proxyModel->setSourceModel(model);
+
+ inUpdate = true; /* prevents changing focused row */
+ setModel(proxyModel);
+ inUpdate = false;
+
+ auto header = new PlaylistHeader(this);
+ setHeader(header);
+
+ setAllColumnsShowFocus(true);
+ setAlternatingRowColors(true);
+ setAttribute(Qt::WA_MacShowFocusRect, false);
+ setUniformRowHeights(true);
+ setFrameShape(QFrame::NoFrame);
+ setSelectionMode(ExtendedSelection);
+ setDragDropMode(DragDrop);
+ setMouseTracking(true);
+
+ updateSettings();
+ header->updateColumns();
+
+ /* get initial selection and focus from core */
+ inUpdate = true;
+ updateSelection(0, 0);
+ inUpdate = false;
+
+ connect(this, &QTreeView::activated, this(const QModelIndex & index) {
+ if (index.isValid())
+ {
+ m_playlist.set_position(indexToRow(index));
+ m_playlist.start_playback();
+ }
+ });
+}
+
+PlaylistWidget::~PlaylistWidget()
+{
+ delete model;
+ delete proxyModel;
+}
+
+QModelIndex PlaylistWidget::rowToIndex(int row)
+{
+ if (row < 0)
+ return QModelIndex();
+
+ return proxyModel->mapFromSource(model->index(row, firstVisibleColumn));
+}
+
+int PlaylistWidget::indexToRow(const QModelIndex & index)
+{
+ if (!index.isValid())
+ return -1;
+
+ return proxyModel->mapToSource(index).row();
+}
+
+QModelIndex PlaylistWidget::visibleIndexNear(int row)
+{
+ QModelIndex index = rowToIndex(row);
+ if (index.isValid())
+ return index;
+
+ int n_entries = m_playlist.n_entries();
+
+ for (int r = row + 1; r < n_entries; r++)
+ {
+ index = rowToIndex(r);
+ if (index.isValid())
+ return index;
+ }
+
+ for (int r = row - 1; r >= 0; r--)
+ {
+ index = rowToIndex(r);
+ if (index.isValid())
+ return index;
+ }
+
+ return index;
+}
+
+void PlaylistWidget::changeEvent(QEvent * event)
+{
+ if (event->type() == QEvent::FontChange)
+ model->setFont(font());
+
+ audqt::TreeView::changeEvent(event);
+}
+
+void PlaylistWidget::contextMenuEvent(QContextMenuEvent * event)
+{
+ if (contextMenu)
+ contextMenu->popup(event->globalPos());
+}
+
+void PlaylistWidget::keyPressEvent(QKeyEvent * event)
+{
+ auto CtrlShiftAlt =
+ Qt::ShiftModifier | Qt::ControlModifier | Qt::AltModifier;
+ if (!(event->modifiers() & CtrlShiftAlt))
+ {
+ switch (event->key())
+ {
+ case Qt::Key_Right:
+ aud_drct_seek(aud_drct_get_time() +
+ aud_get_int("step_size") * 1000);
+ return;
+ case Qt::Key_Left:
+ aud_drct_seek(aud_drct_get_time() -
+ aud_get_int("step_size") * 1000);
+ return;
+ case Qt::Key_Space:
+ aud_drct_play_pause();
+ return;
+ case Qt::Key_Delete:
+ pl_remove_selected();
+ return;
+ case Qt::Key_Z:
+ aud_drct_pl_prev();
+ return;
+ case Qt::Key_X:
+ aud_drct_play();
+ return;
+ case Qt::Key_C:
+ aud_drct_pause();
+ return;
+ case Qt::Key_V:
+ aud_drct_stop();
+ return;
+ case Qt::Key_B:
+ aud_drct_pl_next();
+ return;
+ }
+ }
+
+ audqt::TreeView::keyPressEvent(event);
+}
+
+void PlaylistWidget::mouseMoveEvent(QMouseEvent * event)
+{
+ int row = indexToRow(indexAt(event->pos()));
+
+ if (row < 0)
+ hidePopup();
+ else if (aud_get_bool("show_filepopup_for_tuple") && m_popup_pos != row)
+ triggerPopup(row);
+
+ audqt::TreeView::mouseMoveEvent(event);
+}
+
+void PlaylistWidget::leaveEvent(QEvent * event)
+{
+ hidePopup();
+
+ audqt::TreeView::leaveEvent(event);
+}
+
+/* Since Qt doesn't support both DragDrop and InternalMove at once,
+ * this hack is needed to set the drag icon to "move" for internal drags. */
+void PlaylistWidget::dragMoveEvent(QDragMoveEvent * event)
+{
+ if (event->source() == this)
+ event->setDropAction(Qt::MoveAction);
+
+ audqt::TreeView::dragMoveEvent(event);
+
+ if (event->source() == this)
+ event->setDropAction(Qt::MoveAction);
+}
+
+void PlaylistWidget::dropEvent(QDropEvent * event)
+{
+ /* let Qt forward external drops to the PlaylistModel */
+ if (event->source() != this)
+ return audqt::TreeView::dropEvent(event);
+
+ int from = indexToRow(currentIndex());
+ if (from < 0)
+ return;
+
+ int to;
+ switch (dropIndicatorPosition())
+ {
+ case AboveItem:
+ to = indexToRow(indexAt(QtCompat::pos(event)));
+ break;
+ case BelowItem:
+ to = indexToRow(indexAt(QtCompat::pos(event))) + 1;
+ break;
+ case OnViewport:
+ to = m_playlist.n_entries();
+ break;
+ default:
+ return;
+ }
+
+ /* Adjust the shift amount so that the selected entry closest to the
+ * destination ends up at the destination. */
+ if (to > from)
+ to -= m_playlist.n_selected(from, to - from);
+ else
+ to += m_playlist.n_selected(to, from - to);
+
+ m_playlist.shift_entries(from, to - from);
+
+ event->acceptProposedAction();
+}
+
+void PlaylistWidget::currentChanged(const QModelIndex & current,
+ const QModelIndex & previous)
+{
+ audqt::TreeView::currentChanged(current, previous);
+
+ if (!inUpdate)
+ m_playlist.set_focus(indexToRow(current));
+}
+
+void PlaylistWidget::selectionChanged(const QItemSelection & selected,
+ const QItemSelection & deselected)
+{
+ audqt::TreeView::selectionChanged(selected, deselected);
+
+ if (!inUpdate)
+ {
+ for (const QModelIndex & idx : selected.indexes())
+ m_playlist.select_entry(indexToRow(idx), true);
+ for (const QModelIndex & idx : deselected.indexes())
+ m_playlist.select_entry(indexToRow(idx), false);
+ }
+}
+
+/* returns true if the focus changed or the playlist scrolled */
+bool PlaylistWidget::scrollToCurrent(bool force)
+{
+ bool scrolled = false;
+ int entry = m_playlist.get_position();
+
+ if (entry >= 0 && (aud_get_bool("qtui", "autoscroll") || force))
+ {
+ if (m_playlist.get_focus() != entry)
+ scrolled = true;
+
+ m_playlist.select_all(false);
+ m_playlist.select_entry(entry, true);
+ m_playlist.set_focus(entry);
+
+ auto index = rowToIndex(entry);
+ auto rect = visualRect(index);
+
+ scrollTo(index);
+
+ if (visualRect(index) != rect)
+ scrolled = true;
+ }
+
+ return scrolled;
+}
+
+void PlaylistWidget::updatePlaybackIndicator()
+{
+ if (currentPos >= 0)
+ model->entriesChanged(currentPos, 1);
+}
+
+void PlaylistWidget::getSelectedRanges(int rowsBefore, int rowsAfter,
+ QItemSelection & selected,
+ QItemSelection & deselected)
+{
+ int entries = m_playlist.n_entries();
+ int last_col = model->columnCount() - 1;
+
+ auto make_range = last_col(const QModelIndex & first,
+ const QModelIndex & last) {
+ // expand the range to cover all columns
+ return QItemSelectionRange(first.sibling(first.row(), 0),
+ last.sibling(last.row(), last_col));
+ };
+
+ QItemSelection ranges2;
+ QModelIndex first, last;
+ bool prev = false;
+
+ for (int row = rowsBefore; row < entries - rowsAfter; row++)
+ {
+ auto idx = rowToIndex(row);
+ if (!idx.isValid())
+ continue;
+
+ bool sel = m_playlist.entry_selected(row);
+
+ if (sel != prev && first.isValid())
+ rangesprev += make_range(first, last);
+
+ if (sel != prev || !first.isValid())
+ first = idx;
+
+ last = idx;
+ prev = sel;
+ }
+
+ if (first.isValid())
+ rangesprev += make_range(first, last);
+
+ selected = std::move(rangestrue);
+ deselected = std::move(rangesfalse);
+}
+
+void PlaylistWidget::updateSelection(int rowsBefore, int rowsAfter)
+{
+ QItemSelection selected, deselected;
+ getSelectedRanges(rowsBefore, rowsAfter, selected, deselected);
+
+ auto sel = selectionModel();
+ auto old = sel->selection();
+
+ // Qt's selection model is complex, with two layers that our internal
+ // playlist selection model doesn't mirror. To avoid interfering with
+ // interactive selections, we need to avoid changing Qt's model unless
+ // it's actually out of sync. So, we start by computing the difference
+ // between the two models.
+ auto diff = old;
+ diff.merge(selected, sel->Select);
+ diff.merge(deselected, sel->Deselect);
+ diff.merge(old, sel->Toggle);
+
+ if (!diff.isEmpty())
+ {
+ // Toggle any cells that need to be toggled to bring the two
+ // models in sync.
+ sel->select(diff, sel->Toggle);
+
+ // The prior call will have left any cells that were toggled
+ // sitting in the interactive layer. Force Qt to finalize this
+ // layer by making an empty selection, so that the next interactive
+ // selection doesn't behave unexpectedly.
+ sel->select(QModelIndex(), sel->Select);
+ }
+
+ auto focus = rowToIndex(m_playlist.get_focus());
+ if (sel->currentIndex().row() != focus.row())
+ {
+ // The documentation for QAbstractItemView::setCurrentIndex says:
+ //
+ // Unless the current selection mode is NoSelection, the
+ // item is also selected. Note that this function also updates
+ // the starting position for any new selections the user
+ // performs.
+ //
+ // To set an item as the current item without selecting it,
+ // call:
+ //
+ // selectionModel()->
+ // setCurrentIndex(index, QItemSelectionModel::NoUpdate);
+ //
+ // We need to update that starting position (see bug #981), so
+ // selectionModel()->setCurrentIndex() isn't enough here, but
+ // we don't want to change the selection. Temporarily changing
+ // the selection mode to NoSelection accomplishes what we want.
+ //
+ setSelectionMode(NoSelection);
+ setCurrentIndex(focus);
+ setSelectionMode(ExtendedSelection);
+ }
+}
+
+void PlaylistWidget::playlistUpdate()
+{
+ auto update = m_playlist.update_detail();
+
+ if (update.level == Playlist::NoUpdate)
+ return;
+
+ inUpdate = true;
+
+ int entries = m_playlist.n_entries();
+ int changed = entries - update.before - update.after;
+
+ if (update.level == Playlist::Structure)
+ {
+ int old_entries = model->rowCount();
+ int removed = old_entries - update.before - update.after;
+
+ if (currentPos >= old_entries - update.after)
+ currentPos += entries - old_entries;
+ else if (currentPos >= update.before)
+ currentPos = -1;
+
+ model->entriesRemoved(update.before, removed);
+ model->entriesAdded(update.before, changed);
+ }
+ else if (update.level == Playlist::Metadata || update.queue_changed)
+ model->entriesChanged(update.before, changed);
+
+ if (update.queue_changed)
+ {
+ for (int i = m_playlist.n_queued(); i--;)
+ {
+ int entry = m_playlist.queue_get_entry(i);
+ if (entry < update.before || entry >= entries - update.after)
+ model->entriesChanged(entry, 1);
+ }
+ }
+
+ int pos = m_playlist.get_position();
+
+ if (pos != currentPos)
+ {
+ if (currentPos >= 0)
+ model->entriesChanged(currentPos, 1);
+ if (pos >= 0)
+ model->entriesChanged(pos, 1);
+
+ currentPos = pos;
+ }
+
+ updateSelection(update.before, update.after);
+
+ inUpdate = false;
+}
+
+void PlaylistWidget::setFilter(const char * text)
+{
+ // Save the current focus before filtering
+ int focus = m_playlist.get_focus();
+
+ // Empty the model before updating the filter. This prevents Qt from
+ // performing a series of "rows added" or "rows deleted" updates, which can
+ // be very slow (worst case O(N^2) complexity) on a large playlist.
+ model->entriesRemoved(0, model->rowCount());
+
+ // Update the filter
+ proxyModel->setFilter(text);
+
+ // Repopulate the model
+ model->entriesAdded(0, m_playlist.n_entries());
+
+ // If the previously focused row is no longer visible with the new filter,
+ // try to find a nearby one that is, and focus it.
+ auto index = visibleIndexNear(focus);
+
+ if (index.isValid())
+ {
+ focus = indexToRow(index);
+ m_playlist.set_focus(focus);
+ m_playlist.select_all(false);
+ m_playlist.select_entry(focus, true);
+ scrollTo(index);
+ }
+}
+
+void PlaylistWidget::setFirstVisibleColumn(int col)
+{
+ inUpdate = true;
+ firstVisibleColumn = col;
+
+ // make sure current and selected indexes point to a visible column
+ updateSelection(0, 0);
+
+ inUpdate = false;
+}
+
+void PlaylistWidget::moveFocus(int distance)
+{
+ int visibleRows = proxyModel->rowCount();
+ if (!visibleRows)
+ return;
+
+ int row = currentIndex().row();
+ row = aud::clamp(row + distance, 0, visibleRows - 1);
+ setCurrentIndex(proxyModel->index(row, 0));
+}
+
+void PlaylistWidget::showPopup()
+{
+ audqt::infopopup_show(m_playlist, m_popup_pos);
+}
+
+void PlaylistWidget::triggerPopup(int pos)
+{
+ audqt::infopopup_hide();
+
+ m_popup_pos = pos;
+ m_popup_timer.queue(aud_get_int("filepopup_delay") * 100,
+ this() { showPopup(); });
+}
+
+void PlaylistWidget::hidePopup()
+{
+ audqt::infopopup_hide();
+
+ m_popup_pos = -1;
+ m_popup_timer.stop();
+}
+
+void PlaylistWidget::updateSettings()
+{
+ header()->setSectionsClickable(
+ aud_get_bool("qtui", "playlist_headers_sortable"));
+
+ setHeaderHidden(!aud_get_bool("qtui", "playlist_headers"));
+}

audacious-plugins-4.4.1.tar.bz2/src/qtui/playlist-qt.h Added

@@ -0,0 +1,95 @@
+/*
+ * playlist.h
+ * Copyright 2014 Michał Lipski
+ *
+ * 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.
+ */
+
+#ifndef PLAYLIST_H
+#define PLAYLIST_H
+
+#include <libaudcore/hook.h>
+#include <libaudcore/mainloop.h>
+#include <libaudcore/playlist.h>
+#include <libaudqt/treeview.h>
+
+class PlaylistModel;
+class PlaylistProxyModel;
+class QContextMenuEvent;
+class QMenu;
+
+class PlaylistWidget : public audqt::TreeView
+{
+public:
+ PlaylistWidget(QWidget * parent, Playlist playlist);
+ ~PlaylistWidget();
+
+ Playlist playlist() const { return m_playlist; }
+ PlaylistModel * playlistModel() const { return model; }
+
+ bool scrollToCurrent(bool force = false);
+ void updatePlaybackIndicator();
+ void playlistUpdate();
+ void setFilter(const char * text);
+ void setFirstVisibleColumn(int col);
+ void moveFocus(int distance);
+
+ void setContextMenu(QMenu * menu) { contextMenu = menu; }
+
+private:
+ Playlist m_playlist;
+ PlaylistModel * model;
+ PlaylistProxyModel * proxyModel;
+ QMenu * contextMenu = nullptr;
+
+ int currentPos = -1;
+ bool inUpdate = false;
+ int firstVisibleColumn = 0;
+
+ int m_popup_pos = -1;
+ QueuedFunc m_popup_timer;
+
+ QModelIndex rowToIndex(int row);
+ int indexToRow(const QModelIndex & index);
+ QModelIndex visibleIndexNear(int row);
+
+ void getSelectedRanges(int rowsBefore, int rowsAfter,
+ QItemSelection & selected,
+ QItemSelection & deselected);
+ void updateSelection(int rowsBefore, int rowsAfter);
+
+ void changeEvent(QEvent * event);
+ void contextMenuEvent(QContextMenuEvent * event);
+ void keyPressEvent(QKeyEvent * event);
+ void mouseMoveEvent(QMouseEvent * event);
+ void leaveEvent(QEvent * event);
+ void dragMoveEvent(QDragMoveEvent * event);
+ void dropEvent(QDropEvent * event);
+ void currentChanged(const QModelIndex & current,
+ const QModelIndex & previous);
+ void selectionChanged(const QItemSelection & selected,
+ const QItemSelection & deselected);
+
+ void showPopup();
+ void triggerPopup(int pos);
+ void hidePopup();
+
+ void updateSettings();
+
+ const HookReceiver<PlaylistWidget> hook1{
+ "qtui update playlist settings", this, &PlaylistWidget::updateSettings};
+};
+
+#endif

audacious-plugins-4.4.1.tar.bz2/src/qtui/playlist_header.cc Added

@@ -0,0 +1,394 @@
+/*
+ * playlist_header.cc
+ * Copyright 2017 John Lindgren and Eugene Paskevich
+ *
+ * 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 "playlist_header.h"
+#include "playlist-qt.h"
+#include "playlist_model.h"
+#include "settings.h"
+
+#include <string.h>
+
+#include <QAction>
+#include <QContextMenuEvent>
+#include <QMenu>
+
+#include <libaudcore/audstrings.h>
+#include <libaudcore/hook.h>
+#include <libaudcore/i18n.h>
+#include <libaudcore/runtime.h>
+#include <libaudqt/libaudqt.h>
+
+static const char * const s_col_keys = {
+ "number", "title", "artist", "year", "album",
+ "album-artist", "track", "genre", "queued", "length",
+ "path", "filename", "custom", "bitrate", "comment",
+ "publisher", "catalog-number", "disc"};
+
+static const int s_default_widths = {
+ 25, // entry number
+ 275, // title
+ 175, // artist
+ 50, // year
+ 175, // album
+ 175, // album artist
+ 25, // track
+ 100, // genre
+ 25, // queue position
+ 75, // length
+ 275, // path
+ 275, // filename
+ 275, // custom title
+ 75, // bitrate
+ 275, // comment
+ 175, // publisher
+ 75, // catalog number
+ 25 // disc
+};
+
+static const Playlist::SortType s_sort_types = {
+ Playlist::n_sort_types, // entry number
+ Playlist::Title, // title
+ Playlist::Artist, // artist
+ Playlist::Date, // year
+ Playlist::Album, // album
+ Playlist::AlbumArtist, // album artist
+ Playlist::Track, // track
+ Playlist::Genre, // genre
+ Playlist::n_sort_types, // queue position
+ Playlist::Length, // length
+ Playlist::Path, // path
+ Playlist::Filename, // file name
+ Playlist::FormattedTitle, // custom title
+ Playlist::n_sort_types, // bitrate
+ Playlist::Comment, // comment,
+ Playlist::Publisher, // publisher
+ Playlist::CatalogNum, // catalog number
+ Playlist::Disc // disc
+};
+
+static_assert(aud::n_elems(s_col_keys) == PlaylistModel::n_cols,
+ "update s_col_keys");
+static_assert(aud::n_elems(s_default_widths) == PlaylistModel::n_cols,
+ "update s_default_widths");
+static_assert(aud::n_elems(s_sort_types) == PlaylistModel::n_cols,
+ "update s_sort_types");
+
+static Index<int> s_cols;
+static int s_col_widthsPlaylistModel::n_cols;
+static bool s_show_playing = false;
+
+static void loadConfig(bool force = false)
+{
+ static bool loaded = false;
+
+ if (loaded && !force)
+ return;
+
+ auto columns =
+ str_list_to_index(aud_get_str("qtui", "playlist_columns"), " ");
+ int n_columns = aud::min(columns.len(), (int)PlaylistModel::n_cols);
+
+ s_cols.clear();
+
+ for (int c = 0; c < n_columns; c++)
+ {
+ /* "playing" used to be a separate column */
+ if (!strcmp(columnsc, "playing"))
+ {
+ s_show_playing = true;
+ continue;
+ }
+
+ int i = 0;
+ while (i < PlaylistModel::n_cols && strcmp(columnsc, s_col_keysi))
+ i++;
+
+ if (i < PlaylistModel::n_cols)
+ s_cols.append(i);
+ }
+
+ auto widths = str_list_to_index(aud_get_str("qtui", "column_widths"), ", ");
+ /* ignore width of former "playing" column */
+ if (widths.len() >= 1)
+ widths.remove(0, 1);
+
+ int n_widths = aud::min(widths.len(), (int)PlaylistModel::n_cols);
+
+ for (int i = 0; i < n_widths; i++)
+ s_col_widthsi = audqt::to_native_dpi(str_to_int(widthsi));
+ for (int i = n_widths; i < PlaylistModel::n_cols; i++)
+ s_col_widthsi = audqt::to_native_dpi(s_default_widthsi);
+
+ loaded = true;
+}
+
+static void saveConfig()
+{
+ Index<String> index;
+
+ if (s_show_playing)
+ index.append(String("playing"));
+ for (int col : s_cols)
+ index.append(String(s_col_keyscol));
+
+ int widths1 + PlaylistModel::n_cols;
+ /* set dummy width for former "playing" column */
+ widths0 = 25;
+
+ for (int i = 0; i < PlaylistModel::n_cols; i++)
+ widths1 + i = audqt::to_portable_dpi(s_col_widthsi);
+
+ aud_set_str("qtui", "playlist_columns", index_to_str_list(index, " "));
+ aud_set_str("qtui", "column_widths",
+ int_array_to_str(widths, PlaylistModel::n_cols));
+}
+
+PlaylistHeader::PlaylistHeader(PlaylistWidget * playlist)
+ : QHeaderView(Qt::Horizontal, playlist), m_playlist(playlist)
+{
+ loadConfig();
+ updateStyle();
+
+ setSectionsMovable(true);
+ setStretchLastSection(true);
+
+ connect(this, &QHeaderView::sectionClicked, this,
+ &PlaylistHeader::sectionClicked);
+ connect(this, &QHeaderView::sectionResized, this,
+ &PlaylistHeader::sectionResized);
+ connect(this, &QHeaderView::sectionMoved, this,
+ &PlaylistHeader::sectionMoved);
+}
+
+static void toggleShowPlaying(bool on)
+{
+ if (s_show_playing == on)
+ return;
+
+ s_show_playing = on;
+
+ saveConfig();
+
+ // update all playlists
+ hook_call("qtui update playlist columns", nullptr);
+}
+
+static void toggleColumn(int col, bool on)
+{
+ int pos = s_cols.find(col);
+
+ if (on)
+ {
+ if (pos >= 0)
+ return;
+
+ s_cols.append(col);
+ }
+ else
+ {
+ if (pos < 0)
+ return;
+
+ s_cols.remove(pos, 1);
+ }
+
+ saveConfig();
+
+ // update all playlists
+ hook_call("qtui update playlist columns", nullptr);
+}
+
+static void resetToDefaults()
+{
+ aud_set_str("qtui", "playlist_columns", DEFAULT_COLUMNS);
+ aud_set_str("qtui", "column_widths", "");
+
+ loadConfig(true);
+
+ // update all playlists
+ hook_call("qtui update playlist columns", nullptr);
+}
+
+void PlaylistHeader::contextMenuEvent(QContextMenuEvent * event)
+{
+ auto menu = new QMenu(this);
+
+ auto playing = new QAction(_("Now Playing"), menu);
+ playing->setCheckable(true);
+ playing->setChecked(s_show_playing);
+ connect(playing, &QAction::toggled, toggleShowPlaying);
+ menu->addAction(playing);
+
+ QAction * actionsPlaylistModel::n_cols;
+
+ for (int col = 0; col < PlaylistModel::n_cols; col++)
+ {
+ actionscol = new QAction(_(PlaylistModel::labelscol), menu);
+ actionscol->setCheckable(true);
+
+ connect(actionscol, &QAction::toggled,
+ col(bool on) { toggleColumn(col, on); });
+
+ menu->addAction(actionscol);
+ }
+
+ for (int col : s_cols)
+ actionscol->setChecked(true);
+
+ auto sep = new QAction(menu);
+ sep->setSeparator(true);
+ menu->addAction(sep);
+
+ auto reset = new QAction(_("Reset to Defaults"), menu);
+ connect(reset, &QAction::triggered, resetToDefaults);
+ menu->addAction(reset);
+
+ menu->popup(event->globalPos());
+}
+
+bool PlaylistHeader::event(QEvent * event)
+{
+ // Work around Qt 6 resetting column widths during StyleChange
+ // (happens at least with 6.6.2, did not happen with Qt 5.x)
+ m_inStyleChange = (event->type() == QEvent::StyleChange);
+
+ bool ret = QHeaderView::event(event);
+
+ if (m_inStyleChange)
+ {
+ updateColumns();
+ m_inStyleChange = false;
+ }
+
+ return ret;
+}
+
+void PlaylistHeader::updateColumns()
+{
+ m_inUpdate = true;
+
+ int n_shown = s_cols.len();
+
+ // Due to QTBUG-33974, column #0 cannot be moved by the user.
+ // As a workaround, hide column #0 and start the real columns at #1.
+ // However, Qt will hide the header completely if no columns are visible.
+ // This is bad since the user can't right-click to add any columns again.
+ // To prevent this, show column #0 if no real columns are visible.
+ m_playlist->setColumnHidden(0, (n_shown > 0));
+
+ bool shownPlaylistModel::n_cols{};
+
+ for (int i = 0; i < n_shown; i++)
+ {
+ int col = s_colsi;
+ moveSection(visualIndex(1 + col), 1 + i);
+ showncol = true;
+ }
+
+ // last column expands to fit, so size is not restored
+ int last = (n_shown > 0) ? s_colsn_shown - 1 : -1;
+
+ for (int col = 0; col < PlaylistModel::n_cols; col++)
+ {
+ if (col != last)
+ m_playlist->setColumnWidth(1 + col, s_col_widthscol);
+
+ m_playlist->setColumnHidden(1 + col, !showncol);
+ }
+
+ // width of last column should be set to 0 initially,
+ // but doing so repeatedly causes flicker
+ if (last >= 0 && last != m_lastCol)
+ m_playlist->setColumnWidth(1 + last, 0);
+
+ // this should come after all setColumnHidden() calls
+ m_playlist->setFirstVisibleColumn((n_shown > 0) ? 1 + s_cols0 : 0);
+ m_playlist->playlistModel()->setPlayingCol(
+ (n_shown > 0 && s_show_playing) ? s_cols0 : -1);
+
+ m_inUpdate = false;
+ m_lastCol = last;
+}
+
+void PlaylistHeader::updateStyle()
+{
+ if (aud_get_bool("qtui", "playlist_headers_bold"))
+ setStyleSheet("QHeaderView { font-weight: bold; }");
+ else
+ setStyleSheet(nullptr);
+}
+
+void PlaylistHeader::sectionClicked(int logicalIndex)
+{
+ int col = logicalIndex - 1;
+ if (col < 0 || col >= PlaylistModel::n_cols)
+ return;
+
+ if (s_sort_typescol != Playlist::n_sort_types)
+ m_playlist->playlist().sort_entries(s_sort_typescol);
+}
+
+void PlaylistHeader::sectionMoved(int logicalIndex, int oldVisualIndex,
+ int newVisualIndex)
+{
+ if (m_inUpdate || m_inStyleChange)
+ return;
+
+ int old_pos = oldVisualIndex - 1;
+ int new_pos = newVisualIndex - 1;
+
+ if (old_pos < 0 || old_pos > s_cols.len() || new_pos < 0 ||
+ new_pos > s_cols.len())
+ return;
+
+ int col = logicalIndex - 1;
+ if (col != s_colsold_pos)
+ return;
+
+ s_cols.remove(old_pos, 1);
+ s_cols.insert(&col, new_pos, 1);
+
+ saveConfig();
+
+ // update all the other playlists
+ hook_call("qtui update playlist columns", nullptr);
+}
+
+void PlaylistHeader::sectionResized(int logicalIndex, int /*oldSize*/,
+ int newSize)
+{
+ if (m_inUpdate || m_inStyleChange)
+ return;
+
+ int col = logicalIndex - 1;
+ if (col < 0 || col >= PlaylistModel::n_cols)
+ return;
+
+ // last column expands to fit, so size is not saved
+ int pos = s_cols.find(col);
+ if (pos < 0 || pos == s_cols.len() - 1)
+ return;
+
+ s_col_widthscol = newSize;
+
+ saveConfig();
+
+ // update all the other playlists
+ hook_call("qtui update playlist columns", nullptr);
+}

audacious-plugins-4.4.1.tar.bz2/src/qtui/playlist_header.h Added

@@ -0,0 +1,61 @@
+/*
+ * playlist_header.h
+ * Copyright 2017 John Lindgren and Eugene Paskevich
+ *
+ * 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.
+ */
+
+#ifndef PLAYLIST_HEADER_H
+#define PLAYLIST_HEADER_H
+
+#include <QHeaderView>
+#include <libaudcore/hook.h>
+
+class PlaylistWidget;
+class QAction;
+class QContextMenuEvent;
+class QMenu;
+
+class PlaylistHeader : public QHeaderView
+{
+public:
+ PlaylistHeader(PlaylistWidget * parent);
+
+ /* this should be called by the playlist after adding the header */
+ void updateColumns();
+
+private:
+ PlaylistWidget * m_playlist;
+ bool m_inUpdate = false;
+ bool m_inStyleChange = false;
+ int m_lastCol = -1;
+
+ void sectionClicked(int logicalIndex);
+ void sectionMoved(int logicalIndex, int oldVisualIndex, int newVisualIndex);
+ void sectionResized(int logicalIndex, int /*oldSize*/, int newSize);
+
+ void contextMenuEvent(QContextMenuEvent * event);
+ bool event(QEvent * event);
+
+ void updateStyle();
+
+ const HookReceiver<PlaylistHeader> //
+ hook1{"qtui update playlist columns", this,
+ &PlaylistHeader::updateColumns},
+ hook2{"qtui update playlist headers", this,
+ &PlaylistHeader::updateStyle};
+};
+
+#endif // PLAYLIST_HEADER_H

audacious-plugins-3.6.2-gtk3.tar.bz2/src/qtui/playlist_model.cc -> audacious-plugins-4.4.1.tar.bz2/src/qtui/playlist_model.cc Changed

@@ -19,163 +19,321 @@
 
 #include <QApplication>
 #include <QIcon>
+#include <QMimeData>
+#include <QUrl>
 
-#include <libaudcore/i18n.h>
 #include <libaudcore/audstrings.h>
 #include <libaudcore/drct.h>
-#include <libaudcore/playlist.h>
-#include <libaudcore/tuple.h>
+#include <libaudcore/i18n.h>
+#include <libaudqt/libaudqt.h>
 
 #include "playlist_model.h"
 
-static inline QPixmap get_icon (const char * name)
+const char * const PlaylistModel::labels = {
+ N_("Entry Number"), N_("Title"), N_("Artist"), N_("Year"),
+ N_("Album"), N_("Album Artist"), N_("Track"), N_("Genre"),
+ N_("Queue Position"), N_("Length"), N_("File Path"), N_("File Name"),
+ N_("Custom Title"), N_("Bitrate"), N_("Comment"), N_("Publisher"),
+ N_("Catalog Number"), N_("Disc")};
+
+static const Tuple::Field s_fields = {
+ Tuple::Invalid, Tuple::Title, Tuple::Artist, Tuple::Year,
+ Tuple::Album, Tuple::AlbumArtist, Tuple::Track, Tuple::Genre,
+ Tuple::Invalid, Tuple::Length, Tuple::Path, Tuple::Basename,
+ Tuple::FormattedTitle, Tuple::Bitrate, Tuple::Comment, Tuple::Publisher,
+ Tuple::CatalogNum, Tuple::Disc};
+
+static_assert(aud::n_elems(PlaylistModel::labels) == PlaylistModel::n_cols,
+ "update PlaylistModel::labels");
+static_assert(aud::n_elems(s_fields) == PlaylistModel::n_cols,
+ "update s_fields");
+
+PlaylistModel::PlaylistModel(QObject * parent, Playlist playlist)
+ : QAbstractListModel(parent), m_playlist(playlist),
+ m_rows(playlist.n_entries())
 {
- qreal r = qApp->devicePixelRatio ();
- QPixmap pm = QIcon::fromTheme (name).pixmap (16 * r);
- pm.setDevicePixelRatio (r);
- return pm;
 }
 
-PlaylistModel::PlaylistModel (QObject * parent, int id) : QAbstractListModel (parent),
- m_uniqueId (id)
+int PlaylistModel::rowCount(const QModelIndex & parent) const
 {
- m_rows = aud_playlist_entry_count (playlist ());
+ return parent.isValid() ? 0 : m_rows;
 }
 
-PlaylistModel::~PlaylistModel ()
+int PlaylistModel::columnCount(const QModelIndex & parent) const
 {
+ return 1 + n_cols;
+}
 
+void PlaylistModel::setFont(const QFont & font)
+{
+ m_bold = font;
+ m_bold.setBold(true);
 }
 
-int PlaylistModel::rowCount (const QModelIndex & parent) const
+void PlaylistModel::setPlayingCol(int playing_col)
 {
- return m_rows;
+ m_playing_col = playing_col;
+ entriesChanged(0, m_rows);
 }
 
-int PlaylistModel::columnCount (const QModelIndex & parent) const
+QVariant PlaylistModel::alignment(int col) const
 {
- return PL_COLS;
+ switch (col)
+ {
+ case Length:
+ return static_cast<Qt::Alignment::Int>(Qt::AlignRight |
+ Qt::AlignVCenter);
+ default:
+ return static_cast<Qt::Alignment::Int>(Qt::AlignLeft |
+ Qt::AlignVCenter);
+ }
 }
 
-QVariant PlaylistModel::data (const QModelIndex &index, int role) const
+QVariant PlaylistModel::data(const QModelIndex & index, int role) const
 {
- String title, artist, album;
+ int col = index.column() - 1;
+ if (col < 0 || col >= n_cols)
+ return QVariant();
+
 Tuple tuple;
+ int val = -1;
 
 switch (role)
 {
 case Qt::DisplayRole:
- switch (index.column ())
+ if (s_fieldscol != Tuple::Invalid)
 {
- case PL_COL_TITLE:
- case PL_COL_ARTIST:
- case PL_COL_ALBUM:
- case PL_COL_LENGTH:
- tuple = aud_playlist_entry_get_tuple (playlist (), index.row (), Playlist::Guess);
- break;
+ tuple = m_playlist.entry_tuple(index.row(), Playlist::NoWait);
+
+ switch (tuple.get_value_type(s_fieldscol))
+ {
+ case Tuple::Empty:
+ return QVariant();
+ case Tuple::String:
+ return QString(tuple.get_str(s_fieldscol));
+ case Tuple::Int:
+ val = tuple.get_int(s_fieldscol);
+ break;
+ }
 }
 
- switch (index.column ())
+ switch (col)
 {
- case PL_COL_TITLE:
- return QString (tuple.get_str (Tuple::Title));
- case PL_COL_ARTIST:
- return QString (tuple.get_str (Tuple::Artist));
- case PL_COL_ALBUM:
- return QString (tuple.get_str (Tuple::Album));
- case PL_COL_QUEUED:
- return getQueued (index.row ());
- case PL_COL_LENGTH:
- return QString (str_format_time (tuple.get_int (Tuple::Length)));
+ case EntryNumber:
+ return QString("%1").arg(index.row() + 1);
+ case QueuePos:
+ return queuePos(index.row());
+ case Length:
+ return QString(str_format_time(val));
+ case Bitrate:
+ return QString("%1 kbit/s").arg(val);
+ default:
+ return QString("%1").arg(val);
 }
 
+ case Qt::FontRole:
+ if (index.row() == m_playlist.get_position())
+ return m_bold;
+ break;
+
 case Qt::TextAlignmentRole:
- switch (index.column ())
- {
- case PL_COL_LENGTH:
- return Qt::AlignRight;
- }
+ return alignment(col);
 
 case Qt::DecorationRole:
- if (index.column () == 0 && index.row () == aud_playlist_get_position (playlist ()))
+ if (col == m_playing_col && index.row() == m_playlist.get_position())
+ {
+ const char * icon_name = "media-playback-stop";
+
+ if (m_playlist == Playlist::playing_playlist())
+ icon_name = aud_drct_get_paused() ? "media-playback-pause"
+ : "media-playback-start";
+
+ return QIcon::fromTheme(icon_name);
+ }
+ else if (col == m_playing_col)
 {
- if (aud_playlist_get_playing () == playlist ())
- if (aud_drct_get_paused ())
- return get_icon ("media-playback-pause");
- else
- return get_icon ("media-playback-start");
- else
- return get_icon ("media-playback-stop");
+ // Reserve space for the icon in other rows so that row
+ // heights don't change at song change. Undocumented but
+ // longstanding Qt behavior is that any isValid(),
+ // non-isNull() variant in the DecorationRole will set the
+ // QStyleOptionViewItem::HasDecoration feature, which will
+ // generally cause the QStyle to reserve space for an icon.
+ // See QStyledItemDelegate::initStyleOption() and
+ // QCommonStylePrivate::viewItemSize().
+ return QVariant(true);
 }
+ break;
 }
- return QVariant ();
+ return QVariant();
 }
 
-QVariant PlaylistModel::headerData (int section, Qt::Orientation orientation, int role) const
+QVariant PlaylistModel::headerData(int section, Qt::Orientation orientation,
+ int role) const
 {
- if (role == Qt::DisplayRole)
+ if (orientation != Qt::Horizontal)
+ return QVariant();
+
+ int col = section - 1;
+ if (col < 0 || col >= n_cols)
+ return QVariant();
+
+ switch (role)
 {
- if (orientation == Qt::Horizontal)
+ case Qt::DisplayRole:
+ switch (col)
 {
- switch (section)
- {
- case PL_COL_TITLE:
- return QString (_("Title"));
- case PL_COL_ARTIST:
- return QString (_("Artist"));
- case PL_COL_ALBUM:
- return QString (_("Album"));
- case PL_COL_QUEUED:
- return QString ();
- case PL_COL_LENGTH:
- return QString ();
- }
+ case EntryNumber:
+ return QString("#");
+ case QueuePos:
+ return QString(_("Q#"));
+ case Track:
+ return QString(_("T#"));
+ case CatalogNum:
+ return QString(_("C#"));
+ case Disc:
+ return QString(_("D#"));
 }
+
+ return QString(_(labelscol));
+
+ case Qt::TextAlignmentRole:
+ return alignment(col);
+
+ default:
+ return QVariant();
 }
- return QVariant ();
 }
 
-int PlaylistModel::playlist () const
+Qt::ItemFlags PlaylistModel::flags(const QModelIndex & index) const
 {
- return aud_playlist_by_unique_id (m_uniqueId);
+ if (index.isValid())
+ return Qt::ItemIsSelectable | Qt::ItemIsDragEnabled | Qt::ItemIsEnabled;
+ else
+ return Qt::ItemIsSelectable | Qt::ItemIsDropEnabled | Qt::ItemIsEnabled;
 }
 
-int PlaylistModel::uniqueId () const
+QStringList PlaylistModel::mimeTypes() const
 {
- return m_uniqueId;
+ return QStringList("text/uri-list");
 }
 
-bool PlaylistModel::insertRows (int row, int count, const QModelIndex & parent)
+QMimeData * PlaylistModel::mimeData(const QModelIndexList & indexes) const
 {
- int last = row + count - 1;
- beginInsertRows (parent, row, last);
- m_rows = aud_playlist_entry_count (playlist ());
- endInsertRows ();
+ /* we assume that <indexes> contains the selected entries */
+ m_playlist.cache_selected();
+
+ QList<QUrl> urls;
+ int prev = -1;
+
+ for (auto & index : indexes)
+ {
+ int row = index.row();
+ if (row != prev) /* skip multiple cells in same row */
+ {
+ urls.append(QString(m_playlist.entry_filename(row)));
+ prev = row;
+ }
+ }
+
+ auto data = new QMimeData;
+ data->setUrls(urls);
+ return data;
+}
+
+bool PlaylistModel::dropMimeData(const QMimeData * data, Qt::DropAction action,
+ int row, int column,
+ const QModelIndex & parent)
+{
+ if (action != Qt::CopyAction || !data->hasUrls())
+ return false;
+
+ Index<PlaylistAddItem> items;
+ for (auto & url : data->urls())
+ items.append(String(url.toEncoded()));
+
+ m_playlist.insert_items(row, std::move(items), false);
 return true;
 }
 
-bool PlaylistModel::removeRows (int row, int count, const QModelIndex & parent)
+void PlaylistModel::entriesAdded(int row, int count)
+{
+ if (count < 1)
+ return;
+
+ int last = row + count - 1;
+ beginInsertRows(QModelIndex(), row, last);
+ m_rows += count;
+ endInsertRows();
+}
+
+void PlaylistModel::entriesRemoved(int row, int count)
 {
+ if (count < 1)
+ return;
+
 int last = row + count - 1;
- beginRemoveRows (parent, row, last);
- m_rows = aud_playlist_entry_count (playlist ());
- endRemoveRows ();
- return true;
+ beginRemoveRows(QModelIndex(), row, last);
+ m_rows -= count;
+ endRemoveRows();
 }
 
-void PlaylistModel::updateRows (int row, int count)
+void PlaylistModel::entriesChanged(int row, int count)
 {
+ if (count < 1)
+ return;
+
 int bottom = row + count - 1;
- auto topLeft = createIndex (row, 0);
- auto bottomRight = createIndex (bottom, columnCount () - 1);
- emit dataChanged (topLeft, bottomRight);
+ auto topLeft = createIndex(row, 0);
+ auto bottomRight = createIndex(bottom, columnCount() - 1);
+ emit dataChanged(topLeft, bottomRight);
 }
 
-QString PlaylistModel::getQueued (int row) const
+QString PlaylistModel::queuePos(int row) const
 {
- int at = aud_playlist_queue_find_entry (playlist (), row);
+ int at = m_playlist.queue_find_entry(row);
 if (at < 0)
- return QString ("");
+ return QString();
 else
- return QString ("#%1").arg (at + 1);
+ return QString("#%1").arg(at + 1);
+}
+
+/* ---------------------------------- */
+
+void PlaylistProxyModel::setFilter(const char * filter)
+{
+ m_searchTerms = str_list_to_index(filter, " ");
+ invalidateFilter();
+}
+
+bool PlaylistProxyModel::filterAcceptsRow(int source_row,
+ const QModelIndex &) const
+{
+ if (!m_searchTerms.len())
+ return true;
+
+ Tuple tuple = m_playlist.entry_tuple(source_row);
+
+ String strings = {tuple.get_str(Tuple::Title),
+ tuple.get_str(Tuple::Artist),
+ tuple.get_str(Tuple::Album),
+ tuple.get_str(Tuple::Basename)};
+
+ for (auto & term : m_searchTerms)
+ {
+ bool found = false;
+
+ for (auto & s : strings)
+ {
+ if (s && strstr_nocase_utf8(s, term))
+ {
+ found = true;
+ break;
+ }
+ }
+
+ if (!found)
+ return false;
+ }
+
+ return true;
 }

audacious-plugins-3.6.2-gtk3.tar.bz2/src/qtui/playlist_model.h -> audacious-plugins-4.4.1.tar.bz2/src/qtui/playlist_model.h Changed

@@ -21,34 +21,85 @@
 #define PLAYLIST_MODEL_H
 
 #include <QAbstractListModel>
+#include <QSortFilterProxyModel>
 
-enum {
- PL_COL_NOW_PLAYING,
- PL_COL_TITLE,
- PL_COL_ARTIST,
- PL_COL_ALBUM,
- PL_COL_QUEUED,
- PL_COL_LENGTH,
- PL_COLS
-};
+#include <libaudcore/playlist.h>
 
 class PlaylistModel : public QAbstractListModel
 {
 public:
- PlaylistModel (QObject * parent = nullptr, int id = -1);
- ~PlaylistModel ();
- int rowCount (const QModelIndex & parent = QModelIndex ()) const;
- int columnCount (const QModelIndex & parent = QModelIndex ()) const;
- QVariant data (const QModelIndex & index, int role = Qt::DisplayRole) const;
- QVariant headerData (int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const;
- bool insertRows (int row, int count, const QModelIndex & parent = QModelIndex ());
- bool removeRows (int row, int count, const QModelIndex & parent = QModelIndex ());
- void updateRows (int row, int count);
- QString getQueued (int row) const;
- int playlist () const;
- int uniqueId () const;
- int m_uniqueId;
+ enum
+ {
+ EntryNumber,
+ Title,
+ Artist,
+ Year,
+ Album,
+ AlbumArtist,
+ Track,
+ Genre,
+ QueuePos,
+ Length,
+ Path,
+ Filename,
+ CustomTitle,
+ Bitrate,
+ Comment,
+ Publisher,
+ CatalogNum,
+ Disc,
+ n_cols
+ };
+
+ static const char * const labels;
+
+ PlaylistModel(QObject * parent, Playlist playlist);
+
+ int rowCount(const QModelIndex & parent = QModelIndex()) const;
+ int columnCount(const QModelIndex & parent = QModelIndex()) const;
+ QVariant data(const QModelIndex & index, int role = Qt::DisplayRole) const;
+ QVariant headerData(int section, Qt::Orientation orientation,
+ int role = Qt::DisplayRole) const;
+
+ Qt::ItemFlags flags(const QModelIndex & index) const;
+
+ QStringList mimeTypes() const;
+ QMimeData * mimeData(const QModelIndexList & indexes) const;
+ bool dropMimeData(const QMimeData * data, Qt::DropAction action, int row,
+ int column, const QModelIndex & parent);
+
+ void entriesAdded(int row, int count);
+ void entriesRemoved(int row, int count);
+ void entriesChanged(int row, int count);
+
+ void setFont(const QFont & font);
+ void setPlayingCol(int playing_col);
+
+private:
+ Playlist m_playlist;
 int m_rows;
+ QFont m_bold;
+ int m_playing_col = -1;
+
+ QVariant alignment(int col) const;
+ QString queuePos(int row) const;
+};
+
+class PlaylistProxyModel : public QSortFilterProxyModel
+{
+public:
+ PlaylistProxyModel(QObject * parent, Playlist playlist)
+ : QSortFilterProxyModel(parent), m_playlist(playlist)
+ {
+ }
+
+ void setFilter(const char * filter);
+
+private:
+ bool filterAcceptsRow(int source_row, const QModelIndex &) const;
+
+ Playlist m_playlist;
+ Index<String> m_searchTerms;
 };
 
 #endif

audacious-plugins-3.6.2-gtk3.tar.bz2/src/qtui/playlist_tabs.cc -> audacious-plugins-4.4.1.tar.bz2/src/qtui/playlist_tabs.cc Changed

@@ -17,223 +17,408 @@
 * the use of this software.
 */
 
-#include "playlist.h"
 #include "playlist_tabs.h"
+#include "menus.h"
+#include "playlist-qt.h"
+#include "search_bar.h"
+#include "settings.h"
 
+#include <QBoxLayout>
 #include <QKeyEvent>
 #include <QLineEdit>
+#include <QMenu>
 
+#include <libaudcore/drct.h>
+#include <libaudcore/i18n.h>
 #include <libaudcore/playlist.h>
 #include <libaudcore/runtime.h>
 
 #include <libaudqt/libaudqt.h>
 
-PlaylistTabs::PlaylistTabs (QWidget * parent) :
- QTabWidget (parent),
- m_leftbtn (nullptr),
- m_tabbar (new PlaylistTabBar (this))
+class LayoutWidget : public QWidget
 {
- installEventFilter (this);
+public:
+ LayoutWidget(QWidget * parent, Playlist playlist, QMenu * contextMenu);
+
+ PlaylistWidget * playlistWidget() const { return m_playlistWidget; }
+
+ void activateSearch()
+ {
+ m_searchBar->show();
+ // use ShortcutFocusReason to select text in the search entry
+ // (the default OtherFocusReason does not select text)
+ m_searchBar->setFocus(Qt::ShortcutFocusReason);
+ }
+
+private:
+ PlaylistWidget * m_playlistWidget;
+ SearchBar * m_searchBar;
+};
+
+LayoutWidget::LayoutWidget(QWidget * parent, Playlist playlist,
+ QMenu * contextMenu)
+ : QWidget(parent), m_playlistWidget(new PlaylistWidget(this, playlist)),
+ m_searchBar(new SearchBar(this, m_playlistWidget))
+{
+ auto layout = audqt::make_vbox(this, 0);
+ layout->addWidget(m_playlistWidget);
+ layout->addWidget(m_searchBar);
+
+ m_playlistWidget->setContextMenu(contextMenu);
+ m_searchBar->hide();
+}
+
+/* --------------------------------- */
+
+PlaylistTabs::PlaylistTabs(QWidget * parent)
+ : QTabWidget(parent), m_pl_menu(qtui_build_pl_menu(this)),
+ m_tabbar(new PlaylistTabBar(this))
+{
+ installEventFilter(this);
 
 // set up tab bar
- m_tabbar->setFocusPolicy (Qt::NoFocus);
- setTabBar (m_tabbar);
+ m_tabbar->setFocusPolicy(Qt::NoFocus);
+ setTabBar(m_tabbar);
+
+ addRemovePlaylists();
+ m_tabbar->updateTitles();
+ m_tabbar->updateIcons();
+ setCurrentIndex(Playlist::active_playlist().index());
 
- populatePlaylists ();
- setCurrentIndex (aud_playlist_get_active ());
+ connect(this, &QTabWidget::currentChanged, this,
+ &PlaylistTabs::currentChangedTrigger);
+}
 
- connect (this, &QTabWidget::currentChanged, this, &PlaylistTabs::currentChangedTrigger);
+PlaylistWidget * PlaylistTabs::currentPlaylistWidget() const
+{
+ return ((LayoutWidget *)currentWidget())->playlistWidget();
 }
 
-PlaylistTabs::~PlaylistTabs ()
+PlaylistWidget * PlaylistTabs::playlistWidget(int idx) const
 {
- // TODO: cleanup playlists
+ auto w = (LayoutWidget *)widget(idx);
+ return w ? w->playlistWidget() : nullptr;
 }
 
-void PlaylistTabs::maybeCreateTab (int count_, int uniq_id)
+void PlaylistTabs::activateSearch()
 {
- int tabs = count ();
+ ((LayoutWidget *)currentWidget())->activateSearch();
+}
+
+void PlaylistTabs::addRemovePlaylists()
+{
+ int tabs = count();
+ int playlists = Playlist::n_playlists();
 
 for (int i = 0; i < tabs; i++)
 {
- PlaylistWidget * playlistWidget = (PlaylistWidget *) widget (i);
- if (uniq_id == playlistWidget->uniqueId())
- return;
+ auto w = (LayoutWidget *)widget(i);
+ int list_idx = w->playlistWidget()->playlist().index();
+
+ if (list_idx < 0)
+ {
+ removeTab(i);
+ delete w;
+ tabs--;
+ i--;
+ }
+ else if (list_idx != i)
+ {
+ bool found = false;
+
+ for (int j = i + 1; j < tabs; j++)
+ {
+ w = (LayoutWidget *)widget(j);
+ list_idx = w->playlistWidget()->playlist().index();
+
+ if (list_idx == i)
+ {
+ removeTab(j);
+ insertTab(i, w, QString());
+ found = true;
+ break;
+ }
+ }
+
+ if (!found)
+ {
+ insertTab(
+ i, new LayoutWidget(this, Playlist::by_index(i), m_pl_menu),
+ QString());
+ tabs++;
+ }
+ }
 }
 
- auto playlistWidget = new PlaylistWidget (0, uniq_id);
- addTab ((QWidget *) playlistWidget, QString (aud_playlist_get_title (count_)));
+ while (tabs < playlists)
+ {
+ addTab(new LayoutWidget(this, Playlist::by_index(tabs), m_pl_menu),
+ QString());
+ tabs++;
+ }
 }
 
-void PlaylistTabs::cullPlaylists ()
+void PlaylistTabs::currentChangedTrigger(int idx)
 {
- int tabs = count ();
+ if (!m_in_update)
+ Playlist::by_index(idx).activate();
+}
 
- for (int i = 0; i < tabs; i++)
+bool PlaylistTabs::eventFilter(QObject * obj, QEvent * e)
+{
+ if (e->type() == QEvent::KeyPress)
 {
- PlaylistWidget * playlistWidget = (PlaylistWidget *) widget (i);
-
- if (playlistWidget == nullptr || playlistWidget->playlist() < 0)
- {
- removeTab(i);
- delete playlistWidget;
- }
- else
- setTabText(i, QString (aud_playlist_get_title (playlistWidget->playlist())));
+ QKeyEvent * ke = (QKeyEvent *)e;
+
+ if (ke->key() == Qt::Key_Escape)
+ return m_tabbar->cancelRename();
 }
+
+ return QTabWidget::eventFilter(obj, e);
 }
 
-void PlaylistTabs::populatePlaylists ()
+void PlaylistTabs::renameCurrent()
 {
- int playlists = aud_playlist_count ();
+ auto playlist = currentPlaylistWidget()->playlist();
 
- for (int count = 0; count < playlists; count++)
- maybeCreateTab(count, aud_playlist_get_unique_id (count));
+ if (m_tabbar->isVisible())
+ m_tabbar->startRename(playlist);
+ else
+ audqt::playlist_show_rename(playlist);
+}
 
- cullPlaylists();
+void PlaylistTabs::playlist_activate_cb()
+{
+ m_in_update = true;
+ setCurrentIndex(Playlist::active_playlist().index());
+ m_tabbar->cancelRename();
+ m_in_update = false;
 }
 
-PlaylistWidget * PlaylistTabs::playlistWidget (int num)
+void PlaylistTabs::playlist_update_cb(Playlist::UpdateLevel global_level)
 {
- return (PlaylistWidget *) widget (num);
+ m_in_update = true;
+ if (global_level == Playlist::Structure)
+ addRemovePlaylists();
+ if (global_level >= Playlist::Metadata)
+ m_tabbar->updateTitles();
+
+ for (int i = 0; i < count(); i++)
+ playlistWidget(i)->playlistUpdate();
+
+ setCurrentIndex(Playlist::active_playlist().index());
+ m_in_update = false;
 }
 
-void PlaylistTabs::filterTrigger (const QString &text)
+void PlaylistTabs::playlist_position_cb(Playlist list)
 {
- ((PlaylistWidget *) currentWidget ())->setFilter (text);
+ auto widget = playlistWidget(list.index());
+ if (widget)
+ widget->scrollToCurrent();
 }
 
-void PlaylistTabs::currentChangedTrigger (int idx)
+PlaylistTabBar::PlaylistTabBar(QWidget * parent) : QTabBar(parent)
 {
- cancelRename ();
- aud_playlist_set_active (idx);
+ setMovable(true);
+ setDocumentMode(true);
+ setUsesScrollButtons(true);
+ updateSettings();
+
+ connect(this, &QTabBar::tabMoved, this, &PlaylistTabBar::tabMoved);
+ connect(this, &QTabBar::tabCloseRequested, (int idx) {
+ audqt::playlist_confirm_delete(Playlist::by_index(idx));
+ });
 }
 
-QLineEdit * PlaylistTabs::getTabEdit (int idx)
+void PlaylistTabBar::updateTitles()
 {
- return dynamic_cast<QLineEdit *> (m_tabbar->tabButton (idx, QTabBar::LeftSide));
+ int tabs = count();
+ for (int i = 0; i < tabs; i++)
+ updateTabText(i);
 }
 
-void PlaylistTabs::setupTab (int idx, QWidget * button, const QString & text, QWidget * * oldp)
+void PlaylistTabBar::updateIcons()
 {
- QWidget * old = m_tabbar->tabButton (idx, QTabBar::LeftSide);
- m_tabbar->setTabButton (idx, QTabBar::LeftSide, button);
- setTabText (idx, text);
+ QIcon icon;
+ int playing = Playlist::playing_playlist().index();
+ if (playing >= 0)
+ icon = QIcon::fromTheme(aud_drct_get_paused() ? "media-playback-pause"
+ : "media-playback-start");
 
- if (oldp)
- * oldp = old;
- else
+ int tabs = count();
+ for (int i = 0; i < tabs; i++)
 {
- old->setParent (nullptr);
- old->deleteLater ();
+ /* hide icon when editing so it doesn't get shown on the wrong side */
+ setTabIcon(i, (i == playing && !getTabEdit(i)) ? icon : QIcon());
 }
 }
 
-void PlaylistTabs::tabEditedTrigger ()
+void PlaylistTabBar::startRename(Playlist playlist)
 {
- int idx = currentIndex ();
- if (idx < 0)
- return;
+ int idx = playlist.index();
+ QLineEdit * edit = getTabEdit(idx);
 
- QLineEdit * edit = getTabEdit (idx);
- if (! edit)
- return;
+ if (!edit)
+ {
+ edit = new QLineEdit((const char *)playlist.get_title());
 
- QString title = edit->text ();
- aud_playlist_set_title (idx, title.toUtf8 ());
+ connect(edit, &QLineEdit::returnPressed, this, playlist, edit() {
+ playlist.set_title(edit->text().toUtf8());
+ cancelRename();
+ });
 
- setupTab (idx, m_leftbtn, title, nullptr);
- m_leftbtn = nullptr;
+ setupTab(idx, edit, &m_leftbtn);
+ updateIcons();
+ }
+
+ edit->selectAll();
+ edit->setFocus();
 }
 
-void PlaylistTabs::editTab (int idx)
+bool PlaylistTabBar::cancelRename()
 {
- QLineEdit * edit = new QLineEdit (tabText (idx));
+ bool cancelled = false;
 
- connect (edit, & QLineEdit::returnPressed, this, & PlaylistTabs::tabEditedTrigger);
+ for (int i = 0; i < count(); i++)
+ {
+ QLineEdit * edit = getTabEdit(i);
+ if (!edit)
+ continue;
 
- setupTab (idx, edit, QString (), & m_leftbtn);
+ setupTab(i, m_leftbtn, nullptr);
+ m_leftbtn = nullptr;
+ cancelled = true;
+ updateIcons();
+ }
 
- edit->selectAll ();
- edit->setFocus ();
+ return cancelled;
 }
 
-bool PlaylistTabs::eventFilter (QObject * obj, QEvent * e)
+void PlaylistTabBar::mousePressEvent(QMouseEvent * e)
 {
- if (e->type() == QEvent::KeyPress)
+ if (e->button() == Qt::MiddleButton)
 {
- QKeyEvent *ke = (QKeyEvent *) e;
-
- if (ke->key() == Qt::Key_Escape)
+ int index = tabAt(e->pos());
+ if (index >= 0)
 {
- cancelRename ();
- return true;
+ audqt::playlist_confirm_delete(Playlist::by_index(index));
+ e->accept();
 }
 }
 
- return QTabWidget::eventFilter(obj, e);
+ QTabBar::mousePressEvent(e);
 }
 
-void PlaylistTabs::cancelRename ()
+void PlaylistTabBar::mouseDoubleClickEvent(QMouseEvent * e)
 {
- for (int i = 0; i < count (); i ++)
- {
- QLineEdit * edit = getTabEdit (i);
- if (! edit)
- continue;
+ int idx = tabAt(e->pos());
+ if (idx < 0 || e->button() != Qt::LeftButton)
+ return;
 
- setupTab (i, m_leftbtn, (const char *) aud_playlist_get_title (i), nullptr);
- m_leftbtn = nullptr;
- }
+ Playlist::by_index(idx).start_playback();
 }
 
-void PlaylistTabs::playlist_update_cb (Playlist::UpdateLevel global_level)
+void PlaylistTabBar::contextMenuEvent(QContextMenuEvent * e)
 {
- if (global_level == Playlist::Structure)
- populatePlaylists ();
+ int idx = tabAt(e->pos());
+ if (idx < 0)
+ return;
 
- int lists = aud_playlist_count ();
- for (int list = 0; list < lists; list ++)
- {
- auto update = aud_playlist_update_detail (list);
- if (update.level)
- playlistWidget (list)->update (update);
- }
+ auto menu = new QMenu(this);
+ auto playlist = Playlist::by_index(idx);
+
+ auto play_act = new QAction(QIcon::fromTheme("media-playback-start"),
+ audqt::translate_str(N_("_Play")), menu);
+ auto rename_act =
+ new QAction(QIcon::fromTheme("insert-text"),
+ audqt::translate_str(N_("_Rename ...")), menu);
+ auto remove_act = new QAction(QIcon::fromTheme("edit-delete"),
+ audqt::translate_str(N_("Remo_ve")), menu);
+
+ QObject::connect(play_act, &QAction::triggered,
+ playlist() { playlist.start_playback(); });
+ QObject::connect(rename_act, &QAction::triggered, this, playlist() {
+ if (playlist.exists())
+ startRename(playlist);
+ });
+ QObject::connect(remove_act, &QAction::triggered, playlist() {
+ if (playlist.exists())
+ audqt::playlist_confirm_delete(playlist);
+ });
+
+ menu->addAction(play_act);
+ menu->addAction(rename_act);
+ menu->addAction(remove_act);
+ menu->setAttribute(Qt::WA_DeleteOnClose);
+ menu->popup(e->globalPos());
 }
 
-void PlaylistTabs::playlist_position_cb (int list)
+QLineEdit * PlaylistTabBar::getTabEdit(int idx)
 {
- auto widget = playlistWidget (list);
- if (widget)
- widget->scrollToCurrent ();
+ return dynamic_cast<QLineEdit *>(tabButton(idx, QTabBar::LeftSide));
 }
 
-PlaylistTabBar::PlaylistTabBar (QWidget * parent) : QTabBar (parent)
+void PlaylistTabBar::updateTabText(int idx)
 {
- setDocumentMode (true);
- setTabsClosable (true);
+ QString title;
+
+ if (!getTabEdit(idx))
+ {
+ auto playlist = Playlist::by_index(idx);
 
- connect (this, &QTabBar::tabCloseRequested, this, &PlaylistTabBar::handleCloseRequest);
+ // escape ampersands for setTabText ()
+ title = QString(playlist.get_title()).replace("&", "&&");
+
+ if (aud_get_bool("qtui", "entry_count_visible"))
+ title += QString(" (%1)").arg(playlist.n_entries());
+ }
+
+ setTabText(idx, title);
 }
 
-void PlaylistTabBar::mouseDoubleClickEvent (QMouseEvent *e)
+void PlaylistTabBar::setupTab(int idx, QWidget * button, QWidget ** oldp)
 {
- PlaylistTabs *p = (PlaylistTabs *) parent();
+ QWidget * old = tabButton(idx, QTabBar::LeftSide);
+ setTabButton(idx, QTabBar::LeftSide, button);
 
- int idx = tabAt (e->pos());
- if (idx < 0)
- return;
+ if (oldp)
+ *oldp = old;
+ else
+ {
+ old->setParent(nullptr);
+ old->deleteLater();
+ }
+
+ updateTabText(idx);
+}
 
- p->editTab (idx);
+void PlaylistTabBar::tabMoved(int from, int to)
+{
+ Playlist::reorder_playlists(from, to, 1);
 }
 
-void PlaylistTabBar::handleCloseRequest (int idx)
+void PlaylistTabBar::updateSettings()
 {
- PlaylistTabs *p = (PlaylistTabs *) parent ();
- PlaylistWidget *pl = (PlaylistWidget *) p->widget (idx);
+#if QT_VERSION >= QT_VERSION_CHECK(5, 4, 0)
+ setAutoHide(false);
+#endif
 
- if (! pl)
- return;
+ switch (aud_get_int("qtui", "playlist_tabs_visible"))
+ {
+#if QT_VERSION >= QT_VERSION_CHECK(5, 4, 0)
+ case PlaylistTabVisibility::AutoHide:
+ setAutoHide(true);
+ break;
+#endif
+ case PlaylistTabVisibility::Always:
+ show();
+ break;
+
+ case PlaylistTabVisibility::Never:
+ hide();
+ break;
+ }
 
- audqt::playlist_confirm_delete (pl->playlist ());
+ setTabsClosable(aud_get_bool("qtui", "close_button_visible"));
+ updateTitles();
 }

audacious-plugins-3.6.2-gtk3.tar.bz2/src/qtui/playlist_tabs.h -> audacious-plugins-4.4.1.tar.bz2/src/qtui/playlist_tabs.h Changed

@@ -20,63 +20,87 @@
 #ifndef PLAYLIST_TABS_H
 #define PLAYLIST_TABS_H
 
+#include <QTabBar>
 #include <QTabWidget>
 
 #include <libaudcore/hook.h>
 #include <libaudcore/playlist.h>
 
-#include "playlist.h"
-#include "filter_input.h"
-
 class PlaylistTabBar;
 class PlaylistWidget;
 class QLineEdit;
+class QMenu;
 
 class PlaylistTabs : public QTabWidget
 {
 public:
- PlaylistTabs (QWidget * parent = nullptr);
- ~PlaylistTabs ();
+ PlaylistTabs(QWidget * parent = nullptr);
 
- PlaylistWidget * playlistWidget (int num);
+ PlaylistWidget * currentPlaylistWidget() const;
+ PlaylistWidget * playlistWidget(int idx) const;
 
- void editTab (int idx);
- void filterTrigger (const QString &text);
- void currentChangedTrigger (int idx);
- void tabEditedTrigger ();
+ void currentChangedTrigger(int idx);
+ void tabEditedTrigger();
 
 protected:
- bool eventFilter (QObject * obj, QEvent *e);
+ bool eventFilter(QObject * obj, QEvent * e);
 
 private:
- QWidget *m_leftbtn;
- PlaylistTabBar *m_tabbar;
-
- QLineEdit * getTabEdit (int idx);
- void setupTab (int idx, QWidget * button, const QString & text, QWidget * * oldp);
-
- void populatePlaylists ();
- void maybeCreateTab (int count_, int uniq_id);
- void cullPlaylists ();
- void cancelRename ();
-
- void playlist_update_cb (Playlist::UpdateLevel global_level);
- void playlist_position_cb (int list);
-
- const HookReceiver<PlaylistTabs, Playlist::UpdateLevel>
- update_hook {"playlist update", this, & PlaylistTabs::playlist_update_cb};
- const HookReceiver<PlaylistTabs, int>
- position_hook {"playlist position", this, & PlaylistTabs::playlist_position_cb};
+ QMenu * m_pl_menu;
+ PlaylistTabBar * m_tabbar;
+ bool m_in_update = false;
+
+ void activateSearch();
+ void addRemovePlaylists();
+ void renameCurrent();
+
+ void playlist_activate_cb();
+ void playlist_update_cb(Playlist::UpdateLevel global_level);
+ void playlist_position_cb(Playlist list);
+
+ const HookReceiver<PlaylistTabs> //
+ hook1{"qtui find", this, &PlaylistTabs::activateSearch},
+ hook2{"qtui rename playlist", this, &PlaylistTabs::renameCurrent};
+
+ const HookReceiver<PlaylistTabs> activate_hook{
+ "playlist activate", this, &PlaylistTabs::playlist_activate_cb};
+ const HookReceiver<PlaylistTabs, Playlist::UpdateLevel> update_hook{
+ "playlist update", this, &PlaylistTabs::playlist_update_cb};
+ const HookReceiver<PlaylistTabs, Playlist> position_hook{
+ "playlist position", this, &PlaylistTabs::playlist_position_cb};
 };
 
 class PlaylistTabBar : public QTabBar
 {
 public:
- PlaylistTabBar (QWidget * parent = nullptr);
- void handleCloseRequest (int idx);
+ PlaylistTabBar(QWidget * parent = nullptr);
+
+ void updateTitles();
+ void updateIcons();
+ void startRename(Playlist playlist);
+ bool cancelRename();
 
 protected:
- void mouseDoubleClickEvent (QMouseEvent *e);
+ void mousePressEvent(QMouseEvent * e) override;
+ void mouseDoubleClickEvent(QMouseEvent * e) override;
+ void contextMenuEvent(QContextMenuEvent * e) override;
+
+private:
+ QLineEdit * getTabEdit(int idx);
+ void updateTabText(int idx);
+ void setupTab(int idx, QWidget * button, QWidget ** oldp);
+ void tabMoved(int from, int to);
+ void updateSettings();
+
+ const HookReceiver<PlaylistTabBar> //
+ pause_hook{"playback pause", this, &PlaylistTabBar::updateIcons},
+ unpause_hook{"playback unpause", this, &PlaylistTabBar::updateIcons},
+ set_playing_hook{"playlist set playing", this,
+ &PlaylistTabBar::updateIcons},
+ settings_hook{"qtui update playlist settings", this,
+ &PlaylistTabBar::updateSettings};
+
+ QWidget * m_leftbtn = nullptr;
 };
 
 #endif

audacious-plugins-3.6.2-gtk3.tar.bz2/src/qtui/qtui.cc -> audacious-plugins-4.4.1.tar.bz2/src/qtui/qtui.cc Changed

@@ -18,65 +18,63 @@
 */
 
 #include <QApplication>
+#include <QPointer>
 
 #include <libaudcore/i18n.h>
 #include <libaudcore/plugin.h>
 #include <libaudcore/runtime.h>
 
-#include <libaudqt/libaudqt.h>
 #include <libaudqt/iface.h>
+#include <libaudqt/libaudqt.h>
 
 #include "main_window.h"
+#include "settings.h"
 
-static char app_name = "audacious";
-static int dummy_argc = 1;
-static char * dummy_argv = {app_name, nullptr};
+static QPointer<MainWindow> window;
 
 class QtUI : public audqt::QtIfacePlugin
 {
-private:
- QApplication * qapp = nullptr;
- MainWindow * window = nullptr;
-
 public:
- constexpr QtUI () : audqt::QtIfacePlugin ({N_("Qt Interface"), PACKAGE}) {}
-
- bool init ()
+ constexpr QtUI()
+ : audqt::QtIfacePlugin(
+ {N_("Qt Interface"), PACKAGE, nullptr, &qtui_prefs, PluginQtOnly})
 {
- if (aud_get_mainloop_type () != MainloopType::Qt)
- return false;
+ }
 
- qapp = new QApplication (dummy_argc, dummy_argv);
- qapp->setAttribute(Qt::AA_UseHighDpiPixmaps);
+ bool init()
+ {
+ audqt::init();
+ aud_config_set_defaults("qtui", qtui_defaults);
 window = new MainWindow;
-
 return true;
 }
 
- void cleanup ()
+ void cleanup()
 {
 delete window;
- window = nullptr;
-
- audqt::cleanup ();
-
- delete qapp;
- qapp = nullptr;
+ audqt::cleanup();
 }
 
- void run ()
- {
- qapp->exec ();
- }
+ void run() { QApplication::exec(); }
 
- void show (bool show)
+ void show(bool show)
 {
- window->setVisible (show);
+ if (!window)
+ return;
+
+ window->setVisible(show);
+
+ if (show)
+ {
+ window->activateWindow();
+ window->raise();
+ }
 }
 
- void quit ()
+ void quit()
 {
- qapp->quit();
+ QObject::connect(window.data(), &QObject::destroyed, QApplication::quit);
+ window->deleteLater();
 }
 };

audacious-plugins-4.4.1.tar.bz2/src/qtui/search_bar.cc Added

@@ -0,0 +1,105 @@
+/*
+ * search_bar.cc
+ * Copyright 2016 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 "search_bar.h"
+#include "playlist-qt.h"
+
+#include <QApplication>
+#include <QHBoxLayout>
+#include <QKeyEvent>
+#include <QLabel>
+#include <QLineEdit>
+#include <QPushButton>
+
+#include <libaudcore/i18n.h>
+#include <libaudqt/libaudqt.h>
+
+static QPushButton * makeButton(const char * icon, QWidget * parent)
+{
+ auto button = new QPushButton(QIcon::fromTheme(icon), QString(), parent);
+ button->setFlat(true);
+ button->setFocusPolicy(Qt::NoFocus);
+ return button;
+}
+
+SearchBar::SearchBar(QWidget * parent, PlaylistWidget * playlistWidget)
+ : QWidget(parent), m_playlistWidget(playlistWidget),
+ m_entry(new QLineEdit(this))
+{
+ m_entry->setClearButtonEnabled(true);
+ m_entry->setPlaceholderText(_("Search playlist"));
+
+ auto upButton = makeButton("go-up", this);
+ auto downButton = makeButton("go-down", this);
+ auto closeButton = makeButton("window-close", this);
+
+ auto layout = audqt::make_hbox(this);
+ layout->setContentsMargins(audqt::margins.TwoPt);
+
+ layout->addWidget(m_entry);
+ layout->addWidget(upButton);
+ layout->addWidget(downButton);
+ layout->addWidget(closeButton);
+
+ setFocusProxy(m_entry);
+
+ connect(m_entry, &QLineEdit::textChanged, this(const QString & text) {
+ m_playlistWidget->setFilter(text.toUtf8());
+ });
+
+ connect(upButton, &QPushButton::clicked,
+ this(bool) { m_playlistWidget->moveFocus(-1); });
+
+ connect(downButton, &QPushButton::clicked,
+ this(bool) { m_playlistWidget->moveFocus(1); });
+
+ connect(closeButton, &QPushButton::clicked, this(bool) {
+ m_entry->clear();
+ m_playlistWidget->setFocus();
+ hide();
+ });
+}
+
+void SearchBar::keyPressEvent(QKeyEvent * event)
+{
+ auto CtrlShiftAlt =
+ Qt::ShiftModifier | Qt::ControlModifier | Qt::AltModifier;
+ if (!(event->modifiers() & CtrlShiftAlt))
+ {
+ switch (event->key())
+ {
+ case Qt::Key_Enter:
+ case Qt::Key_Return:
+ case Qt::Key_Up:
+ case Qt::Key_Down:
+ case Qt::Key_PageUp:
+ case Qt::Key_PageDown:
+ QApplication::sendEvent(m_playlistWidget, event);
+ return;
+
+ case Qt::Key_Escape:
+ m_entry->clear();
+ m_playlistWidget->setFocus();
+ hide();
+ return;
+ }
+ }
+
+ QWidget::keyPressEvent(event);
+}

audacious-plugins-4.4.1.tar.bz2/src/qtui/search_bar.h Added

@@ -0,0 +1,40 @@
+/*
+ * search_bar.h
+ * Copyright 2016 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.
+ */
+
+#ifndef SEARCH_BAR_H
+#define SEARCH_BAR_H
+
+#include <QWidget>
+
+class PlaylistWidget;
+class QLineEdit;
+
+class SearchBar : public QWidget
+{
+public:
+ SearchBar(QWidget * parent, PlaylistWidget * playlistWidget);
+
+private:
+ void keyPressEvent(QKeyEvent * event);
+
+ PlaylistWidget * m_playlistWidget;
+ QLineEdit * m_entry;
+};
+
+#endif

audacious-plugins-4.4.1.tar.bz2/src/qtui/settings.cc Added

@@ -0,0 +1,88 @@
+/*
+ * settings.cc
+ * Copyright 2015 Eugene Paskevich
+ *
+ * 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 "settings.h"
+
+#include <libaudcore/hook.h>
+#include <libaudcore/i18n.h>
+#include <libaudcore/preferences.h>
+
+const char * const qtui_defaults = {
+ // clang-format off
+ "infoarea_show_vis", "TRUE",
+ "infoarea_show_art", "TRUE",
+ "infoarea_visible", "TRUE",
+ "menu_visible", "TRUE",
+ "player_width", "768",
+ "player_height", "480",
+ "playlist_tabs_visible", aud::numeric_string<PlaylistTabVisibility::AutoHide>::str,
+ "statusbar_visible", "TRUE",
+ "entry_count_visible", "FALSE",
+ "close_button_visible", "TRUE",
+
+ "autoscroll", "TRUE",
+ "playlist_columns", DEFAULT_COLUMNS,
+ "playlist_headers", "TRUE",
+ "playlist_headers_bold", "FALSE",
+ "playlist_headers_sortable", "TRUE",
+ "show_remaining_time", "FALSE",
+ // clang-format on
+ nullptr};
+
+static void qtui_update_playlist_settings()
+{
+ hook_call("qtui update playlist settings", nullptr);
+}
+
+static void qtui_update_playlist_headers()
+{
+ hook_call("qtui update playlist headers", nullptr);
+}
+
+static const ComboItem playlist_tabs_options = {
+ ComboItem(N_("Always"), PlaylistTabVisibility::Always),
+ ComboItem(N_("Auto-hide"), PlaylistTabVisibility::AutoHide),
+ ComboItem(N_("Never"), PlaylistTabVisibility::Never)};
+
+static const PreferencesWidget qtui_widgets = {
+ WidgetLabel(N_("Playlist Tabs")),
+ WidgetCombo(N_("Show playlist tabs:"),
+ WidgetInt("qtui", "playlist_tabs_visible",
+ qtui_update_playlist_settings),
+ {{playlist_tabs_options}}),
+ WidgetCheck(N_("Show entry counts"),
+ WidgetBool("qtui", "entry_count_visible",
+ qtui_update_playlist_settings)),
+ WidgetCheck(N_("Show close buttons"),
+ WidgetBool("qtui", "close_button_visible",
+ qtui_update_playlist_settings)),
+ WidgetLabel(N_("Playlist Columns")),
+ WidgetCheck(
+ N_("Show column headers"),
+ WidgetBool("qtui", "playlist_headers", qtui_update_playlist_settings)),
+ WidgetCheck(N_("Use bold font for column headers"),
+ WidgetBool("qtui", "playlist_headers_bold",
+ qtui_update_playlist_headers)),
+ WidgetCheck(N_("Make column headers clickable for sorting"),
+ WidgetBool("qtui", "playlist_headers_sortable",
+ qtui_update_playlist_settings)),
+ WidgetLabel(N_("Miscellaneous")),
+ WidgetCheck(N_("Scroll on song change"), WidgetBool("qtui", "autoscroll"))};
+
+const PluginPreferences qtui_prefs = {{qtui_widgets}};

audacious-plugins-4.4.1.tar.bz2/src/qtui/settings.h Added

@@ -0,0 +1,39 @@
+/*
+ * settings.h
+ * Copyright 2015 Eugene Paskevich
+ *
+ * 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.
+ */
+
+#ifndef SETTINGS_H
+#define SETTINGS_H
+
+#include <libaudcore/templates.h>
+
+#define DEFAULT_COLUMNS "playing title artist album queued length"
+
+enum PlaylistTabVisibility
+{
+ Always,
+ AutoHide,
+ Never
+};
+
+struct PluginPreferences;
+extern const PluginPreferences qtui_prefs;
+
+extern const char * const qtui_defaults;
+
+#endif

audacious-plugins-3.6.2-gtk3.tar.bz2/src/qtui/status_bar.cc -> audacious-plugins-4.4.1.tar.bz2/src/qtui/status_bar.cc Changed

@@ -22,78 +22,167 @@
 #include <libaudcore/audstrings.h>
 #include <libaudcore/drct.h>
 #include <libaudcore/i18n.h>
+#include <libaudcore/mainloop.h>
 #include <libaudcore/playlist.h>
+#include <libaudcore/threads.h>
 
-StatusBar::StatusBar (QWidget * parent) :
- QStatusBar (parent),
- codec_label (new QLabel (this)),
- length_label (new QLabel (this))
+#include <QLabel>
+
+#define TIMEOUT_MS 5000
+
+static const char * normal_css = "QStatusBar { background: transparent; }\n"
+ "QStatusBar::item { border: none; }";
+static const char * warning_css =
+ "QStatusBar { background: rgba(255,255,0,64); }\n"
+ "QStatusBar::item { border: none; }";
+static const char * error_css = "QStatusBar { background: rgba(255,0,0,64); }\n"
+ "QStatusBar::item { border: none; }";
+
+StatusBar::StatusBar(QWidget * parent)
+ : QStatusBar(parent), codec_label(new QLabel(this)),
+ length_label(new QLabel(this))
+{
+ addWidget(codec_label);
+ addPermanentWidget(length_label);
+
+ update_codec();
+ update_length();
+
+ setStyleSheet(normal_css);
+
+ audlog::subscribe(log_handler, audlog::Warning);
+
+ /* redisplay codec info when message is cleared */
+ connect(this, &QStatusBar::messageChanged, this(const QString & text) {
+ if (text.isEmpty())
+ {
+ setStyleSheet(normal_css);
+ update_codec();
+ }
+ });
+}
+
+StatusBar::~StatusBar()
+{
+ audlog::unsubscribe(log_handler);
+ event_queue_cancel("qtui log message");
+}
+
+/* rate-limiting data */
+static QueuedFunc message_func;
+static aud::spinlock message_lock;
+static int current_message_level = -1;
+static unsigned current_message_serial = 0;
+
+static bool set_message_level(audlog::Level level)
 {
- setStyleSheet ("QStatusBar { background: transparent; } QStatusBar::item { border: none; }");
+ auto lh = message_lock.take();
 
- addWidget (codec_label);
- addPermanentWidget (length_label);
+ /* do not replace a message of same or higher priority */
+ if (level <= current_message_level)
+ return false;
 
- update_codec ();
- update_length ();
+ current_message_level = level;
+ current_message_serial++;
+
+ unsigned serial = current_message_serial;
+ message_func.queue(1000, serial() {
+ auto lh = message_lock.take();
+
+ /* allow new messages after one second */
+ if (current_message_serial == serial)
+ current_message_level = -1;
+ });
+
+ return true;
+}
+
+void StatusBar::log_handler(audlog::Level level, const char * file, int line,
+ const char * func, const char * text)
+{
+ if (!set_message_level(level))
+ return;
+
+ QString s = text;
+ if (s.contains('\n'))
+#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
+ s = s.split('\n', Qt::SkipEmptyParts).last();
+#else
+ s = s.split('\n', QString::SkipEmptyParts).last();
+#endif
+
+ event_queue("qtui log message", new Message{level, s},
+ aud::delete_obj<Message>);
 }
 
-void StatusBar::update_codec ()
+void StatusBar::log_message(const Message * message)
 {
- if (! aud_drct_get_ready ())
+ codec_label->hide();
+ setStyleSheet((message->level == audlog::Error) ? error_css : warning_css);
+ showMessage(message->text, TIMEOUT_MS);
+}
+
+void StatusBar::update_codec()
+{
+ /* codec info is hidden when a message is displayed */
+ if (!currentMessage().isEmpty())
+ return;
+
+ if (!aud_drct_get_ready())
 {
- codec_label->hide ();
+ codec_label->hide();
 return;
 }
 
- Tuple tuple = aud_drct_get_tuple ();
- String codec = tuple.get_str (Tuple::Codec);
+ Tuple tuple = aud_drct_get_tuple();
+ String codec = tuple.get_str(Tuple::Codec);
 
 int bitrate, samplerate, channels;
- aud_drct_get_info (bitrate, samplerate, channels);
+ aud_drct_get_info(bitrate, samplerate, channels);
 
- StringBuf buf (0);
+ StringBuf buf(0);
 
 if (codec)
 {
- buf.insert (-1, codec);
+ buf.insert(-1, codec);
 if (channels > 0 || samplerate > 0 || bitrate > 0)
- buf.insert (-1, ", ");
+ buf.insert(-1, ", ");
 }
 
 if (channels > 0)
 {
 if (channels == 1)
- buf.insert (-1, _("mono"));
+ buf.insert(-1, _("mono"));
 else if (channels == 2)
- buf.insert (-1, _("stereo"));
+ buf.insert(-1, _("stereo"));
 else
- buf.combine (str_printf (ngettext ("%d channel", "%d channels", channels), channels));
+ str_append_printf(
+ buf, ngettext("%d channel", "%d channels", channels), channels);
 
 if (samplerate > 0 || bitrate > 0)
- buf.insert (-1, ", ");
+ buf.insert(-1, ", ");
 }
 
 if (samplerate > 0)
 {
- buf.combine (str_printf ("%d kHz", samplerate / 1000));
+ str_append_printf(buf, _("%d kHz"), samplerate / 1000);
 if (bitrate > 0)
- buf.insert (-1, ", ");
+ buf.insert(-1, ", ");
 }
 
 if (bitrate > 0)
- buf.combine (str_printf (_("%d kbps"), bitrate / 1000));
+ str_append_printf(buf, _("%d kbit/s"), bitrate / 1000);
 
- codec_label->setText ((const char *) buf);
- codec_label->show ();
+ codec_label->setText((const char *)buf);
+ codec_label->show();
 }
 
-void StatusBar::update_length ()
+void StatusBar::update_length()
 {
- int playlist = aud_playlist_get_active ();
+ auto playlist = Playlist::active_playlist();
 
- StringBuf s1 = str_format_time (aud_playlist_get_selected_length (playlist));
- StringBuf s2 = str_format_time (aud_playlist_get_total_length (playlist));
+ StringBuf s1 = str_format_time(playlist.selected_length_ms());
+ StringBuf s2 = str_format_time(playlist.total_length_ms());
 
- length_label->setText ((const char *) str_concat ({s1, " / ", s2}));
+ length_label->setText((const char *)str_concat({s1, " / ", s2}));
 }

audacious-plugins-3.6.2-gtk3.tar.bz2/src/qtui/status_bar.h -> audacious-plugins-4.4.1.tar.bz2/src/qtui/status_bar.h Changed

@@ -20,30 +20,47 @@
 #ifndef STATUS_BAR_H
 #define STATUS_BAR_H
 
-#include <QLabel>
 #include <QStatusBar>
 
 #include <libaudcore/hook.h>
+#include <libaudcore/runtime.h>
+
+class QLabel;
 
 class StatusBar : public QStatusBar
 {
 public:
- StatusBar (QWidget * parent);
+ StatusBar(QWidget * parent);
+ ~StatusBar();
 
 private:
+ struct Message
+ {
+ audlog::Level level;
+ QString text;
+ };
+
 QLabel * codec_label;
 QLabel * length_label;
 
- void update_codec ();
- void update_length ();
+ static void log_handler(audlog::Level level, const char * file, int line,
+ const char * func, const char * text);
+
+ void log_message(const Message * message);
+
+ void update_codec();
+ void update_length();
+
+ const HookReceiver<StatusBar, const Message *> log_hook{
+ "qtui log message", this, &StatusBar::log_message};
 
- const HookReceiver<StatusBar>
- hook1 {"playlist activate", this, & StatusBar::update_length},
- hook2 {"playlist update", this, & StatusBar::update_length},
- hook3 {"playback ready", this, & StatusBar::update_codec},
- hook4 {"playback stop", this, & StatusBar::update_codec},
- hook5 {"info change", this, & StatusBar::update_codec},
- hook6 {"tuple change", this, & StatusBar::update_codec};
+ const HookReceiver<StatusBar> //
+ hook1{"playlist activate", this, &StatusBar::update_length},
+ hook2{"playlist update", this, &StatusBar::update_length},
+ hook3{"playback ready", this, &StatusBar::update_codec},
+ hook4{"playback stop", this, &StatusBar::update_codec},
+ hook5{"info change", this, &StatusBar::update_codec},
+ hook6{"tuple change", this, &StatusBar::update_codec};
 };
 
-#endif // STATUS_BAR_H
+#endif

audacious-plugins-3.6.2-gtk3.tar.bz2/src/qtui/time_slider.cc -> audacious-plugins-4.4.1.tar.bz2/src/qtui/time_slider.cc Changed

@@ -21,101 +21,169 @@
 
 #include <libaudcore/audstrings.h>
 #include <libaudcore/drct.h>
+#include <libaudcore/runtime.h>
+#include <libaudqt/libaudqt.h>
 
-TimeSlider::TimeSlider (QWidget * parent) :
- QSlider (Qt::Horizontal, parent),
- m_label (new QLabel (parent))
-{
- setFocusPolicy (Qt::NoFocus);
- setSizePolicy (QSizePolicy::Expanding, QSizePolicy::Fixed);
+#include <QApplication>
+#include <QMouseEvent>
+#include <QProxyStyle>
+#include <QStyle>
 
- m_label->setContentsMargins (4, 0, 4, 0);
- m_label->setSizePolicy (QSizePolicy::Fixed, QSizePolicy::MinimumExpanding);
+TimeSliderLabel::TimeSliderLabel(QWidget * parent) : QLabel(parent) {}
+TimeSliderLabel::~TimeSliderLabel() {}
 
- connect (& m_timer, & QTimer::timeout, this, & TimeSlider::update);
- connect (this, & QSlider::valueChanged, this, & TimeSlider::moved);
- connect (this, & QSlider::sliderPressed, this, & TimeSlider::pressed);
- connect (this, & QSlider::sliderReleased, this, & TimeSlider::released);
+void TimeSliderLabel::mouseDoubleClickEvent(QMouseEvent * event)
+{
+ if (event->button() == Qt::LeftButton)
+ {
+ aud_toggle_bool("qtui", "show_remaining_time");
+ hook_call("qtui toggle remaining time", nullptr);
+ event->accept();
+ }
 
- start_stop ();
+ QLabel::mouseDoubleClickEvent(event);
 }
 
-TimeSlider::~TimeSlider () {}
+class TimeSliderStyle : public QProxyStyle
+{
+public:
+ TimeSliderStyle()
+ {
+ audqt::setup_proxy_style(this);
+ }
+
+ int styleHint(QStyle::StyleHint hint, const QStyleOption * option = nullptr,
+ const QWidget * widget = nullptr,
+ QStyleHintReturn * returnData = nullptr) const override
+ {
+ int styleHint =
+ QProxyStyle::styleHint(hint, option, widget, returnData);
+
+ if (hint == QStyle::SH_Slider_AbsoluteSetButtons)
+ styleHint |= Qt::LeftButton;
 
-void TimeSlider::set_label (int time, int length)
+ return styleHint;
+ }
+};
+
+TimeSlider::TimeSlider(QWidget * parent)
+ : QSlider(Qt::Horizontal, parent), m_label(new TimeSliderLabel(parent))
 {
- QString text;
+ setFocusPolicy(Qt::NoFocus);
+#ifdef Q_OS_MAC
+ setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Preferred);
+#else
+ setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed);
+#endif
 
- if (length > 0)
- text = str_concat ({str_format_time (time), " / ", str_format_time (length)});
- else
- text = str_format_time (time);
+ auto style = new TimeSliderStyle;
+ style->setParent(this);
+ setStyle(style);
+
+ m_label->setContentsMargins(audqt::sizes.FourPt, 0, 0, 0);
+ m_label->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::MinimumExpanding);
 
- m_label->setText (text);
+ connect(this, &QSlider::sliderMoved, this, &TimeSlider::moved);
+ connect(this, &QSlider::sliderPressed, this, &TimeSlider::pressed);
+ connect(this, &QSlider::sliderReleased, this, &TimeSlider::released);
+
+ start_stop();
 }
 
-void TimeSlider::start_stop ()
+void TimeSlider::wheelEvent(QWheelEvent *event)
 {
- bool ready = aud_drct_get_ready ();
- bool paused = aud_drct_get_paused ();
-
- setEnabled (ready);
- m_label->setEnabled (ready);
+ m_scroll_delta += event->angleDelta().y();
 
- if (ready)
- {
- if (! isSliderDown ())
- update ();
- }
- else
+ /* we want discrete steps here */
+ int steps = m_scroll_delta / 120;
+ if (steps != 0)
 {
- setRange (0, 0);
- m_label->setText ("0:00 / 0:00");
+ m_scroll_delta -= 120 * steps;
+ aud_drct_seek(aud_drct_get_time() + steps * aud_get_int("step_size") * 1000);
 }
-
- if (ready && ! paused && ! isSliderDown ())
- m_timer.start (250);
- else
- m_timer.stop ();
 }
 
-void TimeSlider::update ()
+void TimeSlider::set_label(int time, int length)
 {
- int time = aud_drct_get_time ();
- int length = aud_drct_get_length ();
+ QString text;
 
- setRange (0, length);
- setValue (time);
+ if (length >= 0)
+ {
+ auto length_str = str_format_time(length);
+ auto time_pad = length_str.len();
+
+ QString time_str;
+ if (aud_get_bool("qtui", "show_remaining_time"))
+ {
+ time = aud::max(0, length - time);
+ time_str = QString('-') + str_format_time(time);
+ time_pad++;
+ }
+ else
+ time_str = str_format_time(time);
+
+ int a, b;
+ aud_drct_get_ab_repeat(a, b);
+
+ QString ab_str;
+ if (a >= 0)
+ ab_str += " A=<tt>" + QString(str_format_time(a)) + "</tt>";
+ if (b >= 0)
+ ab_str += " B=<tt>" + QString(str_format_time(b)) + "</tt>";
+
+ // To avoid the label changing width as time progresses, use
+ // monospaced digits and pad the time to the width of the song
+ // length (which should be the widest time we'll display).
+ text = "<tt>" + time_str.rightJustified(time_pad, QChar::Nbsp) +
+ "</tt> / <tt>" + length_str + "</tt>" + ab_str + "";
+ }
+ else
+ text = "<tt>" + QString(str_format_time(time)) + "</tt>";
 
- set_label (time, length);
+ m_label->setText(text);
 }
 
-void TimeSlider::moved (int value)
+void TimeSlider::start_stop()
 {
- set_label (value, aud_drct_get_length ());
-}
+ bool ready = aud_drct_get_ready();
+ bool paused = aud_drct_get_paused();
 
-void TimeSlider::pressed ()
-{
- m_timer.stop ();
-}
+ m_label->setEnabled(ready);
 
-void TimeSlider::released ()
-{
- aud_drct_seek (value ());
- set_label (value (), aud_drct_get_length ());
+ update();
 
- if (! aud_drct_get_paused ())
- m_timer.start (250);
+ if (ready && !paused)
+ m_timer.start();
+ else
+ m_timer.stop();
 }
 
-void TimeSlider::mousePressEvent (QMouseEvent * event)
+void TimeSlider::update()
 {
- if (event->button () == Qt::LeftButton)
+ if (aud_drct_get_ready())
 {
- setValue (QStyle::sliderValueFromPosition (minimum (), maximum (), event->x (), width ()));
- event->accept ();
- }
+ if (!isSliderDown())
+ {
+ int time = aud_drct_get_time();
+ int length = aud_drct_get_length();
+
+ setEnabled(length >= 0);
+ setRange(0, length);
+ setValue(time);
 
- QSlider::mousePressEvent (event);
+ set_label(time, length);
+ }
+ }
+ else
+ {
+ setEnabled(false);
+ setRange(0, 0);
+ set_label(0, 0);
+ }
 }
+
+void TimeSlider::moved(int value) { set_label(value, aud_drct_get_length()); }
+
+void TimeSlider::pressed() { set_label(value(), aud_drct_get_length()); }
+
+void TimeSlider::released() { aud_drct_seek(value()); }

audacious-plugins-3.6.2-gtk3.tar.bz2/src/qtui/time_slider.h -> audacious-plugins-4.4.1.tar.bz2/src/qtui/time_slider.h Changed

@@ -22,40 +22,53 @@
 
 #include <QLabel>
 #include <QSlider>
-#include <QTimer>
-#include <QStyle>
-#include <QMouseEvent>
 
 #include <libaudcore/hook.h>
 
+class QMouseEvent;
+
+class TimeSliderLabel : public QLabel
+{
+public:
+ TimeSliderLabel(QWidget * parent);
+ ~TimeSliderLabel();
+
+protected:
+ void mouseDoubleClickEvent(QMouseEvent * event);
+};
+
 class TimeSlider : public QSlider
 {
 public:
- TimeSlider (QWidget * parent);
- ~TimeSlider ();
+ TimeSlider(QWidget * parent);
 
- QLabel * label ()
- { return m_label; }
+ TimeSliderLabel * label() { return m_label; }
+
+protected:
+ void wheelEvent(QWheelEvent * event);
 
 private:
- void set_label (int time, int length);
+ void set_label(int time, int length);
+
+ void start_stop();
+ void update();
+ void moved(int value);
+ void pressed();
+ void released();
 
- void start_stop ();
- void update ();
- void moved (int value);
- void pressed ();
- void released ();
+ TimeSliderLabel * m_label;
 
- void mousePressEvent (QMouseEvent * event);
+ int m_scroll_delta = 0;
 
- QTimer m_timer;
- QLabel * m_label;
+ const Timer<TimeSlider> m_timer{TimerRate::Hz4, this, &TimeSlider::update};
 
- const HookReceiver<TimeSlider>
- hook1 {"playback ready", this, & TimeSlider::start_stop},
- hook2 {"playback pause", this, & TimeSlider::start_stop},
- hook3 {"playback unpause", this, & TimeSlider::start_stop},
- hook4 {"playback stop", this, & TimeSlider::start_stop};
+ const HookReceiver<TimeSlider> //
+ hook1{"playback ready", this, &TimeSlider::start_stop},
+ hook2{"playback pause", this, &TimeSlider::start_stop},
+ hook3{"playback unpause", this, &TimeSlider::start_stop},
+ hook4{"playback seek", this, &TimeSlider::update},
+ hook5{"playback stop", this, &TimeSlider::start_stop},
+ hook6{"qtui toggle remaining time", this, &TimeSlider::start_stop};
 };
 
-#endif // TIME_SLIDER_H
+#endif

audacious-plugins-3.6.2-gtk3.tar.bz2/src/qtui/tool_bar.cc -> audacious-plugins-4.4.1.tar.bz2/src/qtui/tool_bar.cc Changed

@@ -25,41 +25,47 @@
 #include <libaudcore/runtime.h>
 #include <libaudqt/libaudqt.h>
 
-ToolBar::ToolBar (QWidget * parent, ArrayRef<ToolBarItem> items)
- : QToolBar (parent)
+ToolBar::ToolBar(QWidget * parent, ArrayRef<ToolBarItem> items)
+ : QToolBar(parent)
 {
- setContextMenuPolicy (Qt::PreventContextMenu);
- setMovable (false);
- setIconSize (QSize (22, 22));
- setObjectName ("MainToolBar");
+ setContextMenuPolicy(Qt::PreventContextMenu);
+ setMovable(false);
+ setObjectName("MainToolBar");
+
+#ifdef _WIN32
+ // avoid double border with the tab bar below
+ setStyleSheet("QToolBar { border: 0px; }");
+#endif
 
 for (const ToolBarItem & item : items)
 {
+ QAction * a = nullptr;
+
 if (item.widget)
- addWidget (item.widget);
+ a = addWidget(item.widget);
 else if (item.sep)
- addSeparator ();
+ a = addSeparator();
 else if (item.icon_name)
 {
- QAction * a = new QAction (QIcon::fromTheme (item.icon_name),
- audqt::translate_str (item.name), this);
+ a = new QAction(QIcon::fromTheme(item.icon_name),
+ audqt::translate_str(item.name), this);
 
 if (item.tooltip_text)
- a->setToolTip (audqt::translate_str (item.tooltip_text));
+ a->setToolTip(audqt::translate_str(item.tooltip_text));
 
 if (item.callback)
- connect (a, &QAction::triggered, item.callback);
+ connect(a, &QAction::triggered, item.callback);
 
 if (item.toggled)
 {
- a->setCheckable (true);
- connect (a, &QAction::toggled, item.toggled);
+ a->setCheckable(true);
+ connect(a, &QAction::toggled, item.toggled);
 }
 
- addAction (a);
-
- if (item.action_ptr)
- * item.action_ptr = a;
+ addAction(a);
 }
+
+ if (item.action_ptr)
+ *item.action_ptr = a;
 }
 }

audacious-plugins-3.6.2-gtk3.tar.bz2/src/qtui/tool_bar.h -> audacious-plugins-4.4.1.tar.bz2/src/qtui/tool_bar.h Changed

@@ -30,34 +30,50 @@
 const char * name;
 const char * tooltip_text;
 
- void (* callback) ();
- void (* toggled) (bool on);
+ void (*callback)();
+ void (*toggled)(bool on);
 
 QWidget * widget;
 
 bool sep;
 
- QAction * * action_ptr;
+ QAction ** action_ptr;
 };
 
 class ToolBar : public QToolBar
 {
 public:
- ToolBar (QWidget * parent, ArrayRef<ToolBarItem> items);
+ ToolBar(QWidget * parent, ArrayRef<ToolBarItem> items);
 };
 
-constexpr ToolBarItem ToolBarAction (const char * icon_name, const char * name, const char * tooltip_text,
- void (* callback) (), QAction * * action_ptr = nullptr)
- { return { icon_name, name, tooltip_text, callback, nullptr, nullptr, false, action_ptr }; }
+constexpr ToolBarItem ToolBarAction(const char * icon_name, const char * name,
+ const char * tooltip_text,
+ void (*callback)(),
+ QAction ** action_ptr = nullptr)
+{
+ return {icon_name, name, tooltip_text, callback,
+ nullptr, nullptr, false, action_ptr};
+}
 
-constexpr ToolBarItem ToolBarAction (const char * icon_name, const char * name, const char * tooltip_text,
- void (* toggled) (bool), QAction * * action_ptr = nullptr)
- { return { icon_name, name, tooltip_text, nullptr, toggled, nullptr, false, action_ptr }; }
+constexpr ToolBarItem ToolBarAction(const char * icon_name, const char * name,
+ const char * tooltip_text,
+ void (*toggled)(bool),
+ QAction ** action_ptr = nullptr)
+{
+ return {icon_name, name, tooltip_text, nullptr,
+ toggled, nullptr, false, action_ptr};
+}
 
-constexpr ToolBarItem ToolBarCustom (QWidget * item)
- { return { nullptr, nullptr, nullptr, nullptr, nullptr, item }; }
+constexpr ToolBarItem ToolBarCustom(QWidget * item,
+ QAction ** action_ptr = nullptr)
+{
+ return {nullptr, nullptr, nullptr, nullptr,
+ nullptr, item, false, action_ptr};
+}
 
-constexpr ToolBarItem ToolBarSeparator ()
- { return { nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, true }; }
+constexpr ToolBarItem ToolBarSeparator()
+{
+ return {nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, true};
+}
 
 #endif

audacious-plugins-4.4.1.tar.bz2/src/resample/meson.build Added

audacious-plugins-3.6.2-gtk3.tar.bz2/src/scrobbler2/Makefile -> audacious-plugins-4.4.1.tar.bz2/src/scrobbler2/Makefile Changed

audacious-plugins-3.6.2-gtk3.tar.bz2/src/scrobbler2/config_window.cc -> audacious-plugins-4.4.1.tar.bz2/src/scrobbler2/config_window.cc Changed

@@ -1,121 +1,74 @@
+/*
+ * 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 <libaudcore/audstrings.h>
+#include <libaudcore/hook.h>
 
-//external includes
-#include <gdk/gdk.h>
 //plugin includes
 #include "scrobbler.h"
 
-
 //shared variables
-gboolean permission_check_requested = FALSE;
-gboolean invalidate_session_requested = FALSE;
+gboolean permission_check_requested = false;
+gboolean invalidate_session_requested = false;
 enum permission perm_result = PERMISSION_UNKNOWN;
 String 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 QueuedFunc permission_check_timer;
 
-static gboolean permission_checker_thread (void * data) {
- if (permission_check_requested == TRUE) {
+static void permission_checker_thread () {
+ if (permission_check_requested == true) {
 //the answer hasn't arrived yet
- return TRUE;
-
+ hook_call("ui show progress", (void *)N_("Checking Last.fm access ..."));
 } else {
 //the answer has arrived
+ hook_call("ui hide progress", nullptr);
 g_assert(perm_result != PERMISSION_UNKNOWN);
 
- if (perm_result == PERMISSION_ALLOWED) {
- gtk_image_set_from_icon_name(GTK_IMAGE(permission_status_icon), "face-smile", GTK_ICON_SIZE_SMALL_TOOLBAR);
-
- char *markup = g_markup_printf_escaped(_("OK. Scrobbling for user: %s"),
- (const char *)username);
-
- gtk_label_set_markup(GTK_LABEL(permission_status_label), markup);
- gtk_widget_set_sensitive(revoke_button, TRUE);
- g_free(markup);
+ auto msg2 = _("Your scrobbles are being saved on your computer "
+ "temporarily. They will be submitted as soon as Audacious is "
+ "allowed access.");
 
+ if (perm_result == PERMISSION_ALLOWED) {
+ hook_call("ui show info", (void *)(const char *)str_printf
+ (_("Permission granted. Scrobbling for user %s."),
+ (const char *)username));
 } else if (perm_result == PERMISSION_DENIED) {
-
- gtk_image_set_from_icon_name(GTK_IMAGE(permission_status_icon), "dialog-error", GTK_ICON_SIZE_SMALL_TOOLBAR);
- gtk_image_set_from_icon_name(GTK_IMAGE(additional_details_icon), "dialog-information", 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:"));
-
- char *url = g_markup_printf_escaped("http://www.last.fm/api/auth/?api_key=%s&token=%s",
- SCROBBLER_API_KEY, (const char *)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."));
-
+ auto msg1 = _("Permission denied. Open the following "
+ "URL in a browser, allow Audacious access to your account, and "
+ "then click 'Check Permission' again:");
+ auto url = str_printf("https://www.last.fm/api/auth/?api_key=%s"
+ "&token=%s", SCROBBLER_API_KEY, (const char *)request_token);
+
+ hook_call("ui show error", (void *)(const char *)str_concat
+ ({msg1, "\n\n", url, "\n\n", msg2}));
 } else if (perm_result == PERMISSION_NONET) {
- gtk_image_set_from_icon_name(GTK_IMAGE(permission_status_icon), "dialog-warning", GTK_ICON_SIZE_SMALL_TOOLBAR);
- gtk_image_set_from_icon_name(GTK_IMAGE(additional_details_icon), "dialog-information", GTK_ICON_SIZE_SMALL_TOOLBAR);
-
+ auto msg1 = _("There was a problem contacting Last.fm.");
 
- 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."));
+ hook_call("ui show error", (void *)(const char *)str_concat
+ ({msg1, "\n\n", msg2}));
 }
 
 perm_result = PERMISSION_UNKNOWN;
- gtk_widget_set_sensitive(button, TRUE);
-
- return FALSE;
+ permission_check_timer.stop();
 }
 }
 
-
-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, void * data) {
- cleanup_window();
-
- gtk_image_set_from_icon_name(GTK_IMAGE(permission_status_icon), "system-run", GTK_ICON_SIZE_SMALL_TOOLBAR);
- gtk_label_set_label(GTK_LABEL(permission_status_label), _("Checking..."));
-
+static void permission_checker () {
 //This will make the communication thread check the permission
 //and set the current status on the perm_result enum
- permission_check_requested = TRUE;
+ 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;
+ scrobbling_enabled = false;
 
 //Wake up the communication thread in case it's waiting for track plays
 pthread_mutex_lock(&communication_mutex);
@@ -123,105 +76,26 @@
 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);
+ permission_check_timer.start(250, permission_checker_thread);
 }
 
-static void revoke_permissions (GtkButton *revoke_button2, void * data) {
- cleanup_window();
-
+static void revoke_permissions () {
 pthread_mutex_lock(&communication_mutex);
- invalidate_session_requested = TRUE;
+ invalidate_session_requested = true;
 
- scrobbling_enabled = FALSE;
+ 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_widget_hide(url_button);
- gtk_widget_set_no_show_all(url_button, TRUE);
-
- additional_details_icon = gtk_image_new();
- additional_details_label = gtk_label_new("");
-
-
- g_signal_connect (button, "clicked", G_CALLBACK (permission_checker), nullptr);
- g_signal_connect (revoke_button, "clicked", G_CALLBACK (revoke_permissions), nullptr);
-
- 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 buttons = {
+ WidgetButton (N_("Check Permission"), {permission_checker}),
+ WidgetButton (N_("Revoke Permission"), {revoke_permissions})
+};
 
 static const PreferencesWidget config_contents = {
- WidgetLabel (N_("You need to allow Audacious to scrobble tracks to your Last.fm account.\n")),
- WidgetCustomGTK (config_status_checker)
+ WidgetLabel (N_("You need to allow Audacious to scrobble tracks to your Last.fm account.")),
+ WidgetBox ({{buttons}, true})
 };
 
 const PluginPreferences configuration = {{config_contents}};

audacious-plugins-4.4.1.tar.bz2/src/scrobbler2/meson.build Added

audacious-plugins-3.6.2-gtk3.tar.bz2/src/scrobbler2/scrobbler.cc -> audacious-plugins-4.4.1.tar.bz2/src/scrobbler2/scrobbler.cc Changed

@@ -7,6 +7,7 @@
 * It is licensed under the GNU General Public License, version 3.
 */
 
+//external includes
 #include <glib/gstdio.h>
 
 //audacious includes
@@ -16,7 +17,6 @@
 #include <libaudcore/interface.h>
 #include <libaudcore/plugin.h>
 
-
 //plugin includes
 #include "scrobbler.h"
 
@@ -41,9 +41,8 @@
 EXPORT Scrobbler aud_plugin_instance;
 
 //shared variables
-gboolean scrobbler_running = TRUE;
-gboolean migrate_config_requested = FALSE;
-gboolean now_playing_requested = FALSE;
+gboolean scrobbler_running = true;
+gboolean now_playing_requested = false;
 Tuple now_playing_track;
 
 pthread_mutex_t communication_mutex = PTHREAD_MUTEX_INITIALIZER;
@@ -52,32 +51,25 @@
 String session_key;
 String request_token;
 
-
 //static (private) variables
 static Tuple playing_track;
+static QueuedFunc scrobble_timer;
+
 //all times are in microseconds
 static int64_t timestamp = 0;
 static int64_t play_started_at = 0;
 static int64_t pause_started_at = 0;
 static int64_t time_until_scrobble = 0;
-static unsigned queue_function_ID = 0;
 
 static pthread_t communicator;
 
-static void cleanup_current_track(void) {
-
+static void cleanup_current_track () {
 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");
- }
- }
- playing_track = Tuple ();
+ scrobble_timer.stop();
+ playing_track = Tuple();
 }
 
 StringBuf clean_string (const char *string) {
@@ -86,14 +78,15 @@
 return temp;
 }
 
-static gboolean queue_track_to_scrobble (void * data) {
+static void queue_track_to_scrobble () {
 AUDDBG("The playing track is going to be ENQUEUED!\n.");
 
- char *queuepath = g_strconcat(aud_get_path(AudPath::UserDir),"/scrobbler.log", nullptr);
+ StringBuf queue_path = str_concat({aud_get_path(AudPath::UserDir), "/scrobbler.log"});
 
 StringBuf artist = clean_string (playing_track.get_str (Tuple::Artist));
 StringBuf title = clean_string (playing_track.get_str (Tuple::Title));
 StringBuf album = clean_string (playing_track.get_str (Tuple::Album));
+ StringBuf album_artist = clean_string (playing_track.get_str (Tuple::AlbumArtist));
 
 int track = playing_track.get_int (Tuple::Track);
 int length = playing_track.get_int (Tuple::Length);
@@ -103,7 +96,7 @@
 StringBuf track_str = (track > 0) ? int_to_str (track) : StringBuf (0);
 
 pthread_mutex_lock(&log_access_mutex);
- FILE *f = g_fopen(queuepath, "a");
+ FILE *f = g_fopen(queue_path, "a");
 
 if (f == nullptr) {
 perror("fopen");
@@ -111,9 +104,10 @@
 //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%s\t%i\tL\t%" G_GINT64_FORMAT "\n",
+ if (fprintf(f, "%s\t%s\t%s\t%s\t%i\tL\t%" G_GINT64_FORMAT "\t%s\n",
 (const char *)artist, (const char *)album, (const char *)title,
- (const char *)track_str, length / 1000, timestamp) < 0) {
+ (const char *)track_str, length / 1000, timestamp,
+ (const char *)album_artist ) < 0) {
 perror("fprintf");
 } else {
 pthread_mutex_lock(&communication_mutex);
@@ -124,12 +118,10 @@
 }
 pthread_mutex_unlock(&log_access_mutex);
 }
- g_free(queuepath);
+
 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();
@@ -139,19 +131,11 @@
 //Called when when a track finishes playing.
 
 //TODO: hic sunt race conditions
- if (playing_track && (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(nullptr);
- }
- }
+ if (playing_track.valid() && (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.
+ scrobble_timer.stop();
+ queue_track_to_scrobble();
 }
 
 cleanup_current_track();
@@ -168,7 +152,7 @@
 
 pthread_mutex_lock(&communication_mutex);
 now_playing_track = current_track.ref ();
- now_playing_requested = TRUE;
+ now_playing_requested = true;
 pthread_cond_signal(&communication_signal);
 pthread_mutex_unlock(&communication_mutex);
 
@@ -180,35 +164,27 @@
 play_started_at = g_get_monotonic_time();
 playing_track = std::move (current_track);
 
- queue_function_ID = g_timeout_add_seconds(time_until_scrobble / G_USEC_PER_SEC, (GSourceFunc) queue_track_to_scrobble, nullptr);
-
+ scrobble_timer.queue(1000 * (time_until_scrobble / G_USEC_PER_SEC), queue_track_to_scrobble);
 }
 
 static void paused (void *hook_data, void *user_data) {
- if (! playing_track) {
+ if (! playing_track.valid()) {
 //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;
- }
-
+ scrobble_timer.stop();
 pause_started_at = g_get_monotonic_time();
 }
 
 static void unpaused (void *hook_data, void *user_data) {
-
- if (! playing_track
+ if (! playing_track.valid()
 || 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, nullptr);
+ time_until_scrobble = time_until_scrobble - (pause_started_at - play_started_at);
+ scrobble_timer.queue(1000 * (time_until_scrobble / G_USEC_PER_SEC), queue_track_to_scrobble);
 
 pause_started_at = 0;
 play_started_at = g_get_monotonic_time();
@@ -220,36 +196,15 @@
 // the version it was compiled for and the actual libXML in use
 LIBXML_TEST_VERSION
 
- if (scrobbler_communication_init() == FALSE) {
+ if (scrobbler_communication_init() == false) {
 aud_ui_show_error(_("The Scrobbler plugin could not be started.\n"
 "There might be a problem with your installation."));
- return FALSE;
+ return false;
 }
 
 session_key = aud_get_str("scrobbler", "session_key");
 if (!session_key0)
- scrobbling_enabled = FALSE;
-
- //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_key0) {
- //We haven't been configured yet
-
- String migrated = aud_get_str("scrobbler", "migrated");
- if (strcmp(migrated, "true") != 0) {
- //We haven't been migrated yet
-
- String oldpass = aud_get_str("audioscrobbler","password");
- String olduser = aud_get_str("audioscrobbler","username");
- if (oldpass0 && olduser0) {
- //And the old scrobbler was configured
-
- scrobbling_enabled = FALSE;
- migrate_config_requested = TRUE;
- }
- }
- }
+ scrobbling_enabled = false;
 
 pthread_create(&communicator, nullptr, scrobbling_thread, nullptr);
 
@@ -258,7 +213,8 @@
 hook_associate("playback ready", (HookFunction) ready, nullptr);
 hook_associate("playback pause", (HookFunction) paused, nullptr);
 hook_associate("playback unpause", (HookFunction) unpaused, nullptr);
- return TRUE;
+
+ return true;
 }
 
 void Scrobbler::cleanup ()
@@ -271,8 +227,8 @@
 
 cleanup_current_track();
 
- scrobbling_enabled = FALSE;
- scrobbler_running = FALSE;
+ scrobbling_enabled = false;
+ scrobbler_running = false;
 pthread_mutex_lock(&communication_mutex);
 pthread_cond_signal(&communication_signal);
 pthread_mutex_unlock(&communication_mutex);
@@ -282,10 +238,10 @@
 request_token = String();
 session_key = String();
 username = String();
- scrobbler_running = TRUE;
+ scrobbler_running = true;
 }
 
 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");
+ "Thanks to John Lindgren for giving me a hand at the beginning of this project.");

audacious-plugins-3.6.2-gtk3.tar.bz2/src/scrobbler2/scrobbler.h -> audacious-plugins-4.4.1.tar.bz2/src/scrobbler2/scrobbler.h Changed

@@ -14,11 +14,12 @@
 #include <pthread.h>
 #include <string.h>
 #include <glib.h>
+#include <libxml/parser.h>
 #include <libxml/xpath.h>
-#include <gtk/gtk.h>
 
 //audacious includes
 #include <libaudcore/i18n.h>
+#include <libaudcore/mainloop.h>
 #include <libaudcore/preferences.h>
 #include <libaudcore/runtime.h>
 #include <libaudcore/tuple.h>
@@ -27,7 +28,6 @@
 #define SCROBBLER_SHARED_SECRET "716cc0a784bb62835de5bd674e65eb57"
 #define SCROBBLER_URL "https://ws.audioscrobbler.com/2.0/"
 
-
 extern const PluginPreferences configuration;
 
 extern enum permission {
@@ -40,7 +40,6 @@
 extern gboolean scrobbler_running;
 extern gboolean 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;
@@ -51,29 +50,21 @@
 
 /* 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).
+ * data (such as now_playing_track).
 */
 
 //TRUE when a permission check is being requested
 extern gboolean permission_check_requested;
 extern gboolean invalidate_session_requested;
 
-//Migrate the settings from the old scrobbler
-extern gboolean migrate_config_requested;
-
 //Send "now playing"
 extern gboolean now_playing_requested;
 extern Tuple now_playing_track;
 
-
-
-
 //scrobbler_communication.c
-extern gboolean scrobbler_communication_init();
+extern gboolean scrobbler_communication_init();
 extern void * scrobbling_thread(void * data);
 
-
-
 /* Internal stuff */
 //Data sent to the XML parser
 extern char *received_data;
@@ -92,4 +83,5 @@
 
 //scrobbler.c
 extern StringBuf clean_string(const char *string);
+
 #endif /* SCROBBLER_H_ */

audacious-plugins-3.6.2-gtk3.tar.bz2/src/scrobbler2/scrobbler_communication.cc -> audacious-plugins-4.4.1.tar.bz2/src/scrobbler2/scrobbler_communication.cc Changed

@@ -1,3 +1,11 @@
+/*
+ * 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.
+ */
 
 //external includes
 #include <stdarg.h>
@@ -7,6 +15,7 @@
 
 #include <glib.h>
 
+//audacious includes
 #include <libaudcore/audstrings.h>
 #include <libaudcore/interface.h>
 
@@ -20,17 +29,14 @@
 
 static CURL *curlHandle = nullptr; //global handle holding cURL options
 
-gboolean scrobbling_enabled = TRUE;
+gboolean scrobbling_enabled = true;
 
 //shared variables
 char *received_data = nullptr; //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;
 
 char *temp_data = g_renew(char, received_data, received_data_size + len + 1);
@@ -48,14 +54,10 @@
 return len;
 }
 
-static int param_compare (const API_Parameter & a, const API_Parameter & b, void *)
-{
- return g_strcmp0 (a.paramName, b.paramName);
-}
-
 static char * scrobbler_get_signature (Index<API_Parameter> & params)
 {
- params.sort (param_compare, nullptr);
+ params.sort ( (const API_Parameter & a, const API_Parameter & b)
+ { return g_strcmp0 (a.paramName, b.paramName); });
 
 StringBuf buf (0);
 
@@ -102,7 +104,7 @@
 buf.insert (-1, "&");
 buf.insert (-1, name);
 buf.insert (-1, "=");
- buf.insert (-1, esc);
+ buf.insert (-1, esc ? esc : "");
 curl_free (esc);
 }
 
@@ -125,11 +127,11 @@
 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;
+ AUDERR("Could not communicate with last.fm: %s.\n", curl_easy_strerror(curl_requests_result));
+ return false;
 }
 
- return TRUE;
+ return true;
 }
 
 //returns:
@@ -139,18 +141,18 @@
 {
 String tokenmsg = create_message_to_lastfm ("auth.getToken", 1, "api_key", SCROBBLER_API_KEY);
 
- if (send_message_to_lastfm(tokenmsg) == FALSE) {
+ if (send_message_to_lastfm(tokenmsg) == false) {
 AUDDBG("Could not send token request to last.fm.\n");
- return FALSE;
+ return false;
 }
 
- gboolean success = TRUE;
+ gboolean success = true;
 String error_code;
 String error_detail;
 
- if (read_token(error_code, error_detail) == FALSE) {
- success = FALSE;
- if (error_code != nullptr && g_strcmp0(error_code, "8")) {
+ if (read_token(error_code, error_detail) == false) {
+ success = false;
+ if (error_code && g_strcmp0(error_code, "8")) {
 //error code 8: There was an error granting the request token. Please try again later
 request_token = String();
 }
@@ -159,23 +161,22 @@
 return success;
 }
 
-
 static gboolean update_session_key() {
- gboolean result = TRUE;
+ gboolean result = true;
 String error_code;
 String error_detail;
 
- if (read_session_key(error_code, error_detail) == FALSE) {
- if (error_code != nullptr && (
+ if (read_session_key(error_code, error_detail) == false) {
+ if (error_code && (
 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", (const char *)error_code);
+ AUDINFO("error code CAUGHT: %s\n", (const char *)error_code);
 session_key = String();
- result = TRUE;
+ result = true;
 } else {
- result= FALSE;
+ result= false;
 }
 }
 
@@ -192,8 +193,8 @@
 String sessionmsg = create_message_to_lastfm ("auth.getSession", 2,
 "token", (const char *) request_token, "api_key", SCROBBLER_API_KEY);
 
- if (send_message_to_lastfm(sessionmsg) == FALSE)
- return FALSE;
+ if (send_message_to_lastfm(sessionmsg) == false)
+ return false;
 
 //the token can only be sent once
 request_token = String();
@@ -207,49 +208,48 @@
 //sets scrobbling_enabled to TRUE if the session is OK
 //sets session_key to nullptr if it is invalid
 static gboolean scrobbler_test_connection() {
-
 if (!session_key || !session_key0) {
- scrobbling_enabled = FALSE;
- return TRUE;
+ scrobbling_enabled = false;
+ return true;
 }
 
- String testmsg = create_message_to_lastfm ("user.getRecommendedArtists", 3,
- "limit", "1", "api_key", SCROBBLER_API_KEY,
+ String testmsg = create_message_to_lastfm ("user.getInfo", 2,
+ "api_key", SCROBBLER_API_KEY,
 "sk", (const char *) session_key);
 
 gboolean success = send_message_to_lastfm(testmsg);
 
- if (success == FALSE) {
+ if (success == false) {
 AUDDBG("Network problems. Will not scrobble any tracks.\n");
- scrobbling_enabled = FALSE;
+ scrobbling_enabled = false;
 if (permission_check_requested) {
 perm_result = PERMISSION_NONET;
 }
- return FALSE;
+ return false;
 }
 
 String error_code;
 String error_detail;
 
- if (read_authentication_test_result(error_code, error_detail) == FALSE) {
- AUDDBG("Error code: %s. Detail: %s.\n", (const char *)error_code,
+ if (read_authentication_test_result(error_code, error_detail) == false) {
+ AUDINFO("Error code: %s. Detail: %s.\n", (const char *)error_code,
 (const char *)error_detail);
- if (error_code != nullptr && (
+ if (error_code && (
 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
 )) {
 session_key = String();
 aud_set_str("scrobbler", "session_key", "");
- scrobbling_enabled = FALSE;
+ scrobbling_enabled = false;
 } else {
 //network problem.
- scrobbling_enabled = FALSE;
+ scrobbling_enabled = false;
 AUDDBG("Connection NOT OK. Scrobbling disabled\n");
- success = FALSE;
+ success = false;
 }
 } else {
 //THIS IS THE ONLY PLACE WHERE SCROBBLING IS SET TO ENABLED IN RUN-TIME
- scrobbling_enabled = TRUE;
+ scrobbling_enabled = true;
 AUDDBG("Connection OK. Scrobbling enabled.\n");
 }
 
@@ -261,40 +261,41 @@
 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;
+ return false;
 }
 
 curlHandle = curl_easy_init();
 if (curlHandle == nullptr) {
 AUDDBG("Could not initialize libCURL.\n");
- return FALSE;
+ 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;
+ 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 false;
 }
 
- return TRUE;
+ return true;
 }
 
 static void set_timestamp_to_current(char **line) {
- //line0 line1 line2 line3 line4 line5 line6 line7
- //artist album title number length "L" timestamp nullptr
+ //line0 line1 line2 line3 line4 line5 line6 line7 line8
+ //artist album title number length "L" timestamp album_artist nullptr
 
- char **splitted_line = g_strsplit(*line, "\t", 0);
- g_free(splitted_line6);
- splitted_line6 = g_strdup_printf("%" G_GINT64_FORMAT, g_get_real_time() / G_USEC_PER_SEC);
- AUDDBG("splitted line's timestamp is now: %s.\n", splitted_line6);
+ char **split_line = g_strsplit(*line, "\t", 0);
+ g_free(split_line6);
+ split_line6 = g_strdup_printf("%" G_GINT64_FORMAT, g_get_real_time() / G_USEC_PER_SEC);
+ AUDDBG("split line's timestamp is now: %s.\n", split_line6);
 g_free(*line);
- (*line) = g_strjoinv("\t", splitted_line);
+ (*line) = g_strjoinv("\t", split_line);
+ g_strfreev(split_line);
 }
 
 static void delete_lines_from_scrobble_log (GSList **lines_to_remove_ptr, GSList **lines_to_retry_ptr, char *queuepath) {
@@ -312,7 +313,6 @@
 lines_to_retry = g_slist_reverse(lines_to_retry);
 }
 
-
 pthread_mutex_lock(&log_access_mutex);
 
 gboolean success = g_file_get_contents(queuepath, &contents, nullptr, nullptr);
@@ -322,7 +322,9 @@
 lines = g_strsplit(contents, "\n", 0);
 
 n_finallines = 0;
- for (int i = 0 ; linesi != nullptr && strlen(linesi) > 0; i++) {
+ for (int i = 0 ; linesi != nullptr; i++) {
+ if (!strlen(linesi)) continue;
+
 if (lines_to_remove != nullptr && *((int *) (lines_to_remove->data)) == i) {
 //this line is to remove
 lines_to_remove = g_slist_next(lines_to_remove);
@@ -336,7 +338,6 @@
 AUDDBG("Line before: %s.\n", linesi);
 set_timestamp_to_current(&(linesi));
 AUDDBG("Line after: %s.\n", linesi);
-
 } else {
 AUDDBG("not zeroing this line\n");
 }
@@ -353,14 +354,12 @@
 contents = g_strjoinv("\n", finallines);
 success = g_file_set_contents(queuepath, contents, -1, nullptr);
 if (!success) {
- AUDDBG("Could not write to scrobbler.log!\n");
+ AUDERR("Could not write to scrobbler.log!\n");
 }
-
 }
 
 pthread_mutex_unlock(&log_access_mutex);
 
-
 g_strfreev(finallines);
 g_strfreev(lines);
 g_free(contents);
@@ -372,8 +371,25 @@
 (*lines_to_remove) = g_slist_prepend((*lines_to_remove), rem);
 }
 
-static void scrobble_cached_queue() {
+static gboolean is_valid_scrobble_format(char **line) {
+ if (line == nullptr) return false;
+
+ guint num_fields = g_strv_length(line);
+
+ //in normal circumstances cache entry is expected to have 8 fields,
+ //but allow entries with 7 fields (i.e. without album artist) for compatibility with old cache format
+ if (num_fields != 8 && num_fields != 7) return false;
+
+ //string literal "L" in the 6th field is part of scrobbler.log format
+ if (g_strcmp0(line5, "L") != 0) return false;
+
+ //artist, title and timestamp are mandatory parameters of last.fm track.Scrobble API
+ if (!strlen(line0) || !strlen(line2) || !strlen(line6)) return false;
 
+ return true;
+}
+
+static void scrobble_cached_queue() {
 char *queuepath = g_build_filename(aud_get_path(AudPath::UserDir),"scrobbler.log", nullptr);
 char *contents = nullptr;
 gboolean success;
@@ -385,54 +401,56 @@
 pthread_mutex_lock(&log_access_mutex);
 success = g_file_get_contents(queuepath, &contents, nullptr, nullptr);
 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; linesi != nullptr && strlen(linesi) > 0 && scrobbling_enabled; i++) {
+ for (int i = 0; linesi != nullptr && scrobbling_enabled; i++) {
+ if (!strlen(linesi)) continue;
+
 line = g_strsplit(linesi, "\t", 0);
 
- //line0 line1 line2 line3 line4 line5 line6 line7
- //artist album title number length "L" timestamp nullptr
+ //line0 line1 line2 line3 line4 line5 line6 line7 line8
+ //artist album title number length "L" timestamp album_artist nullptr
 
- if (line0 && line2 && (strcmp(line5, "L") == 0) && line6 && (line7 == nullptr))
+ if (is_valid_scrobble_format(line))
 {
 String scrobblemsg = create_message_to_lastfm ("track.scrobble",
- 8, "artist", line0, "album", line1, "track", line2,
+ 9, "artist", line0, "album", line1, "track", line2,
 "trackNumber", line3, "duration", line4,
- "timestamp", line6, "api_key", SCROBBLER_API_KEY,
- "sk", (const char *) session_key);
+ "timestamp", line6,
+ "albumArtist", line7 != nullptr ? line7 : "", //in case cache uses old format without album artist field
+ "api_key", SCROBBLER_API_KEY, "sk", (const char *) session_key);
 
- if (send_message_to_lastfm(scrobblemsg) == TRUE) {
+ if (send_message_to_lastfm(scrobblemsg) == true) {
 String error_code;
 String error_detail;
- gboolean ignored = FALSE;
+ gboolean ignored = false;
 String ignored_code;
 
- if (read_scrobble_result(error_code, error_detail, &ignored, ignored_code) == TRUE) {
+ if (read_scrobble_result(error_code, error_detail, &ignored, ignored_code) == true) {
 AUDDBG("SCROBBLE OK. Error code: %s. Error detail: %s\n",
 (const char *)error_code, (const char *)error_detail);
 AUDDBG("SCROBBLE OK. ignored: %i.\n", ignored);
 AUDDBG("SCROBBLE OK. ignored code: %s.\n",
 (const char *)ignored_code);
- if (ignored == TRUE && g_strcmp0(ignored_code, "3") == 0) { //3: Timestamp was too old
+ if (ignored == true && g_strcmp0(ignored_code, "3") == 0) { //3: Timestamp was too old
 AUDDBG("SCROBBLE IGNORED!!! %i, detail: %s\n",
 ignored, (const char *)ignored_code);
 save_line_to_remove(&lines_to_retry, i);
- } else if (ignored == TRUE && g_strcmp0(ignored_code, "") == 0) { //5: Daily scrobble limit reached
+ } 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",
+ AUDINFO("SCROBBLE NOT OK. Error code: %s. Error detail: %s.\n",
 (const char *)error_code, (const char *)error_detail);
 
 if (! error_code) { //net error(?) or the answer from last.fm was not well read
@@ -446,7 +464,7 @@
 }
 else if (g_strcmp0(error_code, "9") == 0) {
 //Bad Session. Reauth.
- scrobbling_enabled = FALSE;
+ scrobbling_enabled = false;
 session_key = String();
 aud_set_str("scrobbler", "session_key", "");
 }
@@ -457,7 +475,7 @@
 } else {
 AUDDBG("Could not scrobble a track on the queue. Network problem?\n");
 //scrobble to be retried
- scrobbling_enabled = FALSE;
+ scrobbling_enabled = false;
 }
 
 //TODO: Avoid spamming last.fm --- It's not as simple as just adding a wait here:
@@ -470,7 +488,6 @@
 g_strfreev(line);
 }//for
 
-
 delete_lines_from_scrobble_log(&lines_to_remove, &lines_to_retry, queuepath);
 
 if (lines_to_remove != nullptr) {
@@ -487,12 +504,10 @@
 g_free(queuepath);
 }
 
-
 static void send_now_playing() {
-
 String error_code;
 String error_detail;
- gboolean ignored = FALSE;
+ gboolean ignored = false;
 String ignored_code;
 /*
 * now_playing_track can be set to something else while we this method is
@@ -506,6 +521,7 @@
 StringBuf artist = clean_string (curr_track.get_str (Tuple::Artist));
 StringBuf title = clean_string (curr_track.get_str (Tuple::Title));
 StringBuf album = clean_string (curr_track.get_str (Tuple::Album));
+ StringBuf album_artist = clean_string (curr_track.get_str (Tuple::AlbumArtist));
 
 int track = curr_track.get_int (Tuple::Track);
 int length = curr_track.get_int (Tuple::Length);
@@ -514,36 +530,34 @@
 StringBuf track_str = (track > 0) ? int_to_str (track) : StringBuf (0);
 StringBuf length_str = int_to_str (length / 1000);
 
- String playingmsg = create_message_to_lastfm ("track.updateNowPlaying", 7,
+ String playingmsg = create_message_to_lastfm ("track.updateNowPlaying", 8,
 "artist", (const char *) artist, "album", (const char *) album,
 "track", (const char *) title, "trackNumber", (const char *) track_str,
- "duration", (const char *) length_str, "api_key", SCROBBLER_API_KEY,
- "sk", (const char *) session_key);
+ "duration", (const char *) length_str, "albumArtist", (const char *) album_artist,
+ "api_key", SCROBBLER_API_KEY, "sk", (const char *) session_key);
 
 gboolean success = send_message_to_lastfm(playingmsg);
 
- if (success == FALSE) {
+ if (success == false) {
 AUDDBG("Network problems. Could not send \"now playing\" to last.fm\n");
- scrobbling_enabled = FALSE;
- } else if (read_scrobble_result(error_code, error_detail, &ignored, ignored_code) == TRUE) {
+ scrobbling_enabled = false;
+ } else 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",
+ AUDINFO("NOW PLAYING NOT OK. Error code: %s. Error detail: %s.\n",
 (const char *)error_code, (const char *)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;
+ scrobbling_enabled = false;
 session_key = String();
 aud_set_str("scrobbler", "session_key", "");
 }
-
 }
 //We don't care if the now playing was not accepted, no need to read the result from the server.
-
 }
 }
 
@@ -552,32 +566,29 @@
 perm_result = PERMISSION_DENIED;
 
 if (!request_token || !request_token0) {
- if (scrobbler_request_token() == FALSE || !request_token || !request_token0) {
+ if (scrobbler_request_token() == false || !request_token || !request_token0) {
 perm_result = PERMISSION_NONET;
 } //else PERMISSION_DENIED
-
- } else if (scrobbler_request_session() == FALSE) {
+ } else if (scrobbler_request_session() == false) {
 perm_result = PERMISSION_NONET;
-
 } else if (!session_key || !session_key0) {
 //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 || !request_token0) {
+ if (scrobbler_request_token() == false || !request_token || !request_token0) {
 perm_result = PERMISSION_NONET;
 } //else PERMISSION_DENIED
 }
 }
 if (session_key && session_key0) {
- if (scrobbler_test_connection() == FALSE) {
+ if (scrobbler_test_connection() == false) {
 perm_result = PERMISSION_NONET;
 
 if (!session_key || !session_key0) {
- if (scrobbler_request_token() != FALSE && request_token && request_token0) {
+ if (scrobbler_request_token() != false && request_token && request_token0) {
 perm_result = PERMISSION_DENIED;
 } //else PERMISSION_NONET
 }
-
 } else {
 if (scrobbling_enabled) {
 perm_result = PERMISSION_ALLOWED;
@@ -590,7 +601,7 @@
 * c) the user fiddled with the audacious config file and
 * the key is now invalid
 */
- if (scrobbler_request_token() != FALSE && request_token && request_token0) {
+ if (scrobbler_request_token() != false && request_token && request_token0) {
 perm_result = PERMISSION_DENIED;
 } else {
 perm_result = PERMISSION_NONET;
@@ -600,65 +611,21 @@
 } //session_key == nullptr || 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 gboolean treat_migrate_config() {
-
- String password = aud_get_str("audioscrobbler","password");
- String username = aud_get_str("audioscrobbler","username");
- if (!password0 || !username0)
- return FALSE;
-
- char *checksumThis = g_strdup_printf("%s%s", (const char *)username, (const char *)password);
- char *authToken = g_compute_checksum_for_string(G_CHECKSUM_MD5, checksumThis, -1);
-
- String sessionmsg = create_message_to_lastfm ("auth.getMobileSession", 3,
- "authToken", authToken, "username", (const char *) username,
- "api_key", SCROBBLER_API_KEY);
-
- g_free(checksumThis);
- g_free(authToken);
-
- if (send_message_to_lastfm(sessionmsg) == FALSE)
- return FALSE;
-
- if (!update_session_key())
- return FALSE;
-
- return (session_key && session_key0);
-}
-
-
 //Scrobbling will only be enabled after the first connection test passed
 void * scrobbling_thread (void * input_data) {
-
 while (scrobbler_running) {
-
- if (migrate_config_requested) {
- if (treat_migrate_config() == FALSE) {
- aud_ui_show_error(_("Audacious is now using an improved version of the Last.fm Scrobbler.\nPlease check the Preferences for the Scrobbler plugin."));
- }
- aud_set_str("scrobbler", "migrated", "true");
- migrate_config_requested = FALSE;
-
- } else if (permission_check_requested) {
+ if (permission_check_requested) {
 treat_permission_check_request();
- permission_check_requested = FALSE;
-
+ permission_check_requested = false;
 } else if (invalidate_session_requested) {
 session_key = String();
 aud_set_str("scrobbler", "session_key", "");
- invalidate_session_requested = FALSE;
-
+ invalidate_session_requested = false;
 } else if (now_playing_requested) {
 if (scrobbling_enabled) {
 send_now_playing();
 }
- now_playing_requested = FALSE;
-
+ now_playing_requested = false;
 } else {
 if (scrobbling_enabled) {
 scrobble_cached_queue();
@@ -675,7 +642,7 @@
 //if submitting the cache failed due to network problems
 pthread_mutex_unlock(&communication_mutex);
 
- if (scrobbler_test_connection() == FALSE || !scrobbling_enabled) {
+ if (scrobbler_test_connection() == false || !scrobbling_enabled) {
 struct timeval curtime;
 struct timespec timeout;
 pthread_mutex_lock(&communication_mutex);
@@ -697,7 +664,6 @@
 curl_easy_cleanup(curlHandle);
 curlHandle = nullptr;
 
- scrobbling_enabled = TRUE;
+ scrobbling_enabled = true;
 return nullptr;
 }
-

audacious-plugins-3.6.2-gtk3.tar.bz2/src/scrobbler2/scrobbler_xml_parsing.cc -> audacious-plugins-4.4.1.tar.bz2/src/scrobbler2/scrobbler_xml_parsing.cc Changed

audacious-plugins-4.4.1.tar.bz2/src/sdlout/meson.build Added

audacious-plugins-3.6.2-gtk3.tar.bz2/src/sdlout/sdlout.cc -> audacious-plugins-4.4.1.tar.bz2/src/sdlout/sdlout.cc Changed

@@ -27,17 +27,12 @@
 
 #include <libaudcore/audstrings.h>
 #include <libaudcore/i18n.h>
-#include <libaudcore/interface.h>
 #include <libaudcore/plugin.h>
 #include <libaudcore/ringbuf.h>
 #include <libaudcore/runtime.h>
 
 #define VOLUME_RANGE 40 /* decibels */
 
-#define sdlout_error(...) do { \
- aud_ui_show_error (str_printf ("SDL error: " __VA_ARGS__)); \
-} while (0)
-
 class SDLOutput : public OutputPlugin
 {
 public:
@@ -58,7 +53,7 @@
 StereoVolume get_volume ();
 void set_volume (StereoVolume v);
 
- bool open_audio (int aud_format, int rate, int chans);
+ bool open_audio (int aud_format, int rate, int chans, String & error);
 void close_audio ();
 
 void period_wait ();
@@ -191,11 +186,11 @@
 pthread_mutex_unlock (& sdlout_mutex);
 }
 
-bool SDLOutput::open_audio (int format, int rate, int chan)
+bool SDLOutput::open_audio (int format, int rate, int chan, String & error)
 {
 if (format != FMT_S16_NE)
 {
- sdlout_error ("Only signed 16-bit, native endian audio is supported.\n");
+ error = String ("SDL error: Only signed 16-bit, native endian audio is supported.");
 return false;
 }
 
@@ -204,7 +199,7 @@
 sdlout_chan = chan;
 sdlout_rate = rate;
 
- int buffer_ms = aud_get_int (nullptr, "output_buffer_size");
+ int buffer_ms = aud_get_int ("output_buffer_size");
 buffer.alloc (2 * chan * aud::rescale (buffer_ms, 1000, rate));
 
 prebuffer_flag = true;
@@ -220,7 +215,8 @@
 
 if (SDL_OpenAudio (& spec, nullptr) < 0)
 {
- sdlout_error ("Failed to open audio stream: %s.\n", SDL_GetError ());
+ error = String (str_printf
+ ("SDL error: Failed to open audio stream: %s.", SDL_GetError ()));
 buffer.destroy ();
 return false;
 }

audacious-plugins-4.4.1.tar.bz2/src/search-tool-qt Added

audacious-plugins-4.4.1.tar.bz2/src/search-tool-qt/Makefile Added

audacious-plugins-4.4.1.tar.bz2/src/search-tool-qt/html-delegate.cc Added

@@ -0,0 +1,83 @@
+/*
+ * html-delegate.cc
+ * Copyright 2018 John Lindgren and René J.V. Bertin
+ *
+ * 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 "html-delegate.h"
+
+#include <QAbstractTextDocumentLayout>
+#include <QApplication>
+#include <QPainter>
+
+#include <libaudqt/libaudqt.h>
+
+static void init_text_document (QTextDocument & doc, const QStyleOptionViewItem & option)
+{
+ doc.setHtml (option.text);
+ doc.setDocumentMargin (audqt::sizes.TwoPt);
+ doc.setDefaultFont (option.font);
+}
+
+void HtmlDelegate::paint (QPainter * painter, const QStyleOptionViewItem & option_,
+ const QModelIndex & index) const
+{
+ QStyleOptionViewItem option = option_;
+ initStyleOption (& option, index);
+
+ QTextDocument doc;
+ init_text_document (doc, option);
+
+ QStyle * style = option.widget ? option.widget->style () : qApp->style ();
+ QAbstractTextDocumentLayout::PaintContext ctx;
+
+ // Painting item without text
+ option.text = QString ();
+ style->drawControl (QStyle::CE_ItemViewItem, & option, painter, option.widget);
+
+ // Color group logic imitating qcommonstyle.cpp
+ QPalette::ColorGroup cg =
+ ! (option.state & QStyle::State_Enabled) ? QPalette::Disabled :
+ ! (option.state & QStyle::State_Active) ? QPalette::Inactive : QPalette::Normal;
+
+ // Highlighting text if item is selected
+#ifndef _WIN32 // QWindowsVistaStyle does not use the HighlightedText color :(
+ if (option.state & QStyle::State_Selected)
+ ctx.palette.setColor (QPalette::Text, option.palette.color (cg, QPalette::HighlightedText));
+ else
+#endif
+ ctx.palette.setColor (QPalette::Text, option.palette.color (cg, QPalette::Text));
+
+ QRect textRect = style->subElementRect (QStyle::SE_ItemViewItemText, & option);
+ painter->save ();
+ painter->translate (textRect.topLeft ());
+ painter->setClipRect (textRect.translated (-textRect.topLeft ()));
+ doc.documentLayout ()->draw (painter, ctx);
+ painter->restore ();
+}
+
+QSize HtmlDelegate::sizeHint (const QStyleOptionViewItem & option_,
+ const QModelIndex & index) const
+{
+ QStyleOptionViewItem option = option_;
+ initStyleOption (& option, index);
+
+ QTextDocument doc;
+ init_text_document (doc, option);
+
+ return QSize (audqt::sizes.OneInch, doc.size ().height ());
+}
+

audacious-plugins-4.4.1.tar.bz2/src/search-tool-qt/html-delegate.h Added

@@ -0,0 +1,35 @@
+/*
+ * html-delegate.h
+ * Copyright 2018 John Lindgren and René J.V. Bertin
+ *
+ * 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.
+ */
+
+#ifndef HTMLDELEGATE_H
+#define HTMLDELEGATE_H
+
+#include <QStyledItemDelegate>
+
+// Allow rich text in QTreeView entries
+class HtmlDelegate : public QStyledItemDelegate
+{
+protected:
+ void paint (QPainter * painter, const QStyleOptionViewItem & option,
+ const QModelIndex & index) const override;
+ QSize sizeHint (const QStyleOptionViewItem & option,
+ const QModelIndex & index) const override;
+};
+
+#endif // HTMLDELEGATE_H

audacious-plugins-4.4.1.tar.bz2/src/search-tool-qt/library.cc Added

@@ -0,0 +1,178 @@
+/*
+ * library.cc
+ * Copyright 2011-2019 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 "library.h"
+
+#include <string.h>
+#include <libaudcore/i18n.h>
+
+aud::spinlock Library::s_adding_lock;
+Library * Library::s_adding_library = nullptr;
+
+void Library::find_playlist ()
+{
+ m_playlist = Playlist ();
+
+ for (int p = 0; p < Playlist::n_playlists (); p ++)
+ {
+ auto playlist = Playlist::by_index (p);
+ if (! strcmp (playlist.get_title (), _("Library")))
+ {
+ m_playlist = playlist;
+ break;
+ }
+ }
+}
+
+void Library::create_playlist ()
+{
+ m_playlist = Playlist::blank_playlist ();
+ m_playlist.set_title (_("Library"));
+ m_playlist.active_playlist ();
+}
+
+bool Library::check_playlist (bool require_added, bool require_scanned)
+{
+ if (! m_playlist.exists ())
+ {
+ m_playlist = Playlist ();
+ return false;
+ }
+
+ if (require_added && m_playlist.add_in_progress ())
+ return false;
+ if (require_scanned && m_playlist.scan_in_progress ())
+ return false;
+
+ return true;
+}
+
+void Library::set_adding (bool adding)
+{
+ auto lh = s_adding_lock.take ();
+ s_adding_library = adding ? this : nullptr;
+}
+
+bool Library::filter_cb (const char * filename, void *)
+{
+ bool add = false;
+ auto lh = s_adding_lock.take ();
+
+ if (s_adding_library)
+ {
+ bool * added = s_adding_library->m_added_table.lookup (String (filename));
+
+ if ((add = ! added))
+ s_adding_library->m_added_table.add (String (filename), true);
+ else
+ (* added) = true;
+ }
+
+ return add;
+}
+
+void Library::begin_add (const char * uri)
+{
+ if (s_adding_library)
+ return;
+
+ if (! check_playlist (false, false))
+ create_playlist ();
+
+ m_added_table.clear ();
+
+ int entries = m_playlist.n_entries ();
+
+ for (int entry = 0; entry < entries; entry ++)
+ {
+ String filename = m_playlist.entry_filename (entry);
+
+ if (! m_added_table.lookup (filename))
+ {
+ m_playlist.select_entry (entry, false);
+ m_added_table.add (filename, false);
+ }
+ else
+ m_playlist.select_entry (entry, true);
+ }
+
+ m_playlist.remove_selected ();
+
+ set_adding (true);
+
+ Index<PlaylistAddItem> add;
+ add.append (String (uri));
+ m_playlist.insert_filtered (-1, std::move (add), filter_cb, nullptr, false);
+}
+
+void Library::check_ready_and_update (bool force)
+{
+ bool now_ready = check_playlist (true, true);
+ if (now_ready != m_is_ready || force)
+ {
+ m_is_ready = now_ready;
+ if (update_func)
+ update_func (update_data);
+ }
+}
+
+void Library::add_complete ()
+{
+ if (! check_playlist (true, false))
+ return;
+
+ if (s_adding_library)
+ {
+ set_adding (false);
+
+ int entries = m_playlist.n_entries ();
+
+ for (int entry = 0; entry < entries; entry ++)
+ {
+ String filename = m_playlist.entry_filename (entry);
+ bool * added = m_added_table.lookup (filename);
+
+ m_playlist.select_entry (entry, ! added || ! (* added));
+ }
+
+ m_added_table.clear ();
+
+ /* don't clear the playlist if nothing was added */
+ if (m_playlist.n_selected () < entries)
+ m_playlist.remove_selected ();
+ else
+ m_playlist.select_all (false);
+
+ m_playlist.sort_entries (Playlist::Path);
+ }
+
+ if (! m_playlist.update_pending ())
+ check_ready_and_update (false);
+}
+
+void Library::scan_complete ()
+{
+ if (! m_playlist.update_pending ())
+ check_ready_and_update (false);
+}
+
+void Library::playlist_update ()
+{
+ check_ready_and_update (m_playlist.update_detail ().level >= Playlist::Metadata);
+}

audacious-plugins-4.4.1.tar.bz2/src/search-tool-qt/library.h Added

@@ -0,0 +1,73 @@
+/*
+ * library.h
+ * Copyright 2011-2019 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.
+ */
+
+#ifndef LIBRARY_H
+#define LIBRARY_H
+
+#include <libaudcore/hook.h>
+#include <libaudcore/multihash.h>
+#include <libaudcore/playlist.h>
+
+class Library
+{
+public:
+ Library () { find_playlist (); }
+ ~Library () { set_adding (false); }
+
+ Playlist playlist () const { return m_playlist; }
+ bool is_ready () const { return m_is_ready; }
+
+ void begin_add (const char * uri);
+ void check_ready_and_update (bool force);
+
+ void connect_update (void (* func) (void *), void * data) {
+ update_func = func;
+ update_data = data;
+ };
+
+private:
+ void find_playlist ();
+ void create_playlist ();
+ bool check_playlist (bool require_added, bool require_scanned);
+ void set_adding (bool adding);
+
+ static bool filter_cb (const char * filename, void *);
+
+ void add_complete (void);
+ void scan_complete (void);
+ void playlist_update (void);
+
+ Playlist m_playlist;
+ bool m_is_ready = false;
+ SimpleHash<String, bool> m_added_table;
+
+ /* to allow safe callback access from playlist add thread */
+ static aud::spinlock s_adding_lock;
+ static Library * s_adding_library;
+
+ void (* update_func) (void *) = nullptr;
+ void * update_data = nullptr;
+
+ HookReceiver<Library>
+ hook1 {"playlist add complete", this, & Library::add_complete},
+ hook2 {"playlist scan complete", this, & Library::scan_complete},
+ hook3 {"playlist update", this, & Library::playlist_update};
+};
+
+#endif // LIBRARY_H

audacious-plugins-4.4.1.tar.bz2/src/search-tool-qt/meson.build Added

audacious-plugins-4.4.1.tar.bz2/src/search-tool-qt/search-model.cc Added

@@ -0,0 +1,287 @@
+/*
+ * search-model.cc
+ * Copyright 2011-2019 John Lindgren and René J.V. Bertin
+ *
+ * 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 "search-model.h"
+
+#include <QMimeData>
+#include <QUrl>
+
+#include <libaudcore/i18n.h>
+
+static QString create_item_label (const Item & item)
+{
+ QString string = start_tagsitem.field;
+
+ string += QString ((item.field == SearchField::Genre) ?
+ str_toupper_utf8 (item.name) : item.name).toHtmlEscaped ();
+
+ string += end_tagsitem.field;
+
+#ifdef Q_OS_MAC // Mac-specific font tweaks
+ string += " &nbsp;";
+#else
+ string += " &nbsp;";
+#endif
+
+ if (item.field != SearchField::Title)
+ {
+ string += str_printf (dngettext (PACKAGE, "%d song", "%d songs",
+ item.matches.len ()), item.matches.len ());
+
+ if (item.field == SearchField::Genre || item.parent)
+ string += ' ';
+ }
+
+ if (item.field == SearchField::Genre)
+ {
+ string += _("of this genre");
+ }
+ else if (item.parent)
+ {
+ auto parent = (item.parent->parent ? item.parent->parent : item.parent);
+
+ string += parent_prefix (parent->field);
+ string += ' ';
+ string += start_tagsparent->field;
+ string += QString (parent->name).toHtmlEscaped ();
+ string += end_tagsparent->field;
+ }
+
+#ifndef Q_OS_MAC // Mac-specific font tweaks
+ string += "";
+#endif
+
+ return string;
+}
+
+QVariant SearchModel::data (const QModelIndex & index, int role) const
+{
+ if (role == Qt::DisplayRole)
+ {
+ int row = index.row ();
+ if (row < 0 || row >= m_items.len ())
+ return QVariant ();
+
+ return create_item_label (* m_itemsrow);
+ }
+
+ return QVariant ();
+}
+
+QMimeData * SearchModel::mimeData (const QModelIndexList & indexes) const
+{
+ m_playlist.select_all (false);
+
+ QList<QUrl> urls;
+ for (auto & index : indexes)
+ {
+ int row = index.row ();
+ if (row < 0 || row >= m_items.len ())
+ continue;
+
+ for (int entry : m_itemsrow->matches)
+ {
+ urls.append (QString (m_playlist.entry_filename (entry)));
+ m_playlist.select_entry (entry, true);
+ }
+ }
+
+ m_playlist.cache_selected ();
+
+ auto data = new QMimeData;
+ data->setUrls (urls);
+ return data;
+}
+
+void SearchModel::update ()
+{
+ int rows = m_items.len ();
+ int keep = aud::min (rows, m_rows);
+
+ if (rows < m_rows)
+ {
+ beginRemoveRows (QModelIndex (), rows, m_rows - 1);
+ m_rows = rows;
+ endRemoveRows ();
+ }
+ else if (rows > m_rows)
+ {
+ beginInsertRows (QModelIndex (), m_rows, rows - 1);
+ m_rows = rows;
+ endInsertRows ();
+ }
+
+ if (keep > 0)
+ {
+ auto topLeft = createIndex (0, 0);
+ auto bottomRight = createIndex (keep - 1, 0);
+ emit dataChanged (topLeft, bottomRight);
+ }
+}
+
+void SearchModel::destroy_database ()
+{
+ m_playlist = Playlist ();
+ m_items.clear ();
+ m_hidden_items = 0;
+ m_database.clear ();
+}
+
+void SearchModel::add_to_database (int entry, std::initializer_list<Key> keys)
+{
+ Item * parent = nullptr;
+ auto hash = & m_database;
+
+ for (auto & key : keys)
+ {
+ if (! key.name)
+ continue;
+
+ Item * item = hash->lookup (key);
+ if (! item)
+ item = hash->add (key, Item (key.field, key.name, parent));
+
+ item->matches.append (entry);
+
+ parent = item;
+ hash = & item->children;
+ }
+}
+
+void SearchModel::create_database (Playlist playlist)
+{
+ destroy_database ();
+
+ int entries = playlist.n_entries ();
+
+ for (int e = 0; e < entries; e ++)
+ {
+ Tuple tuple = playlist.entry_tuple (e, Playlist::NoWait);
+ String album_artist = tuple.get_str (Tuple::AlbumArtist);
+ String artist = tuple.get_str (Tuple::Artist);
+
+ if (album_artist && album_artist != artist)
+ {
+ /* album and song have different artists;
+ * add separately under respective artists */
+ add_to_database (e,
+ {{SearchField::Artist, album_artist},
+ {SearchField::Album, tuple.get_str (Tuple::Album)}});
+ /* add Title node under a HiddenAlbum node so that it can
+ * still be searched by album name (without listing the
+ * album twice) */
+ add_to_database (e,
+ {{SearchField::Artist, artist},
+ {SearchField::HiddenAlbum, tuple.get_str (Tuple::Album)},
+ {SearchField::Title, tuple.get_str (Tuple::Title)}});
+ }
+ else
+ {
+ /* album and song have the same artist;
+ * add hierarchically under that artist */
+ add_to_database (e,
+ {{SearchField::Artist, artist},
+ {SearchField::Album, tuple.get_str (Tuple::Album)},
+ {SearchField::Title, tuple.get_str (Tuple::Title)}});
+ }
+
+ /* add separately under genre */
+ add_to_database (e,
+ {{SearchField::Genre, tuple.get_str (Tuple::Genre)}});
+ }
+
+ m_playlist = playlist;
+}
+
+static void search_recurse (SimpleHash<Key, Item> & domain,
+ const Index<String> & terms, int mask, Index<const Item *> & results)
+{
+ domain.iterate (& (const Key & key, Item & item)
+ {
+ int count = terms.len ();
+ int new_mask = mask;
+
+ for (int t = 0, bit = 1; t < count; t ++, bit <<= 1)
+ {
+ if (! (new_mask & bit))
+ continue; /* skip term if it is already found */
+
+ if (strstr (item.folded, termst))
+ new_mask &= ~bit; /* we found it */
+ else if (! item.children.n_items ())
+ break; /* quit early if there are no children to search */
+ }
+
+ /* adding an item with exactly one child is redundant, so avoid it */
+ if (! new_mask && item.children.n_items () != 1 &&
+ item.field != SearchField::HiddenAlbum)
+ results.append (& item);
+
+ search_recurse (item.children, terms, new_mask, results);
+ });
+}
+
+static int item_compare (const Item * const & a, const Item * const & b)
+{
+ if (a->field < b->field)
+ return -1;
+ if (a->field > b->field)
+ return 1;
+
+ int val = str_compare (a->name, b->name);
+ if (val)
+ return val;
+
+ if (a->parent)
+ return b->parent ? item_compare (a->parent, b->parent) : 1;
+ else
+ return b->parent ? -1 : 0;
+}
+
+static int item_compare_pass1 (const Item * const & a, const Item * const & b)
+{
+ if (a->matches.len () > b->matches.len ())
+ return -1;
+ if (a->matches.len () < b->matches.len ())
+ return 1;
+
+ return item_compare (a, b);
+}
+
+void SearchModel::do_search (const Index<String> & terms, int max_results)
+{
+ m_items.clear ();
+ m_hidden_items = 0;
+
+ /* effectively limits number of search terms to 32 */
+ search_recurse (m_database, terms, (1 << terms.len ()) - 1, m_items);
+
+ /* first sort by number of songs per item */
+ m_items.sort (item_compare_pass1);
+
+ /* limit to items with most songs */
+ if (m_items.len () > max_results)
+ {
+ m_hidden_items = m_items.len () - max_results;
+ m_items.remove (max_results, -1);
+ }
+
+ /* sort by item type, then item name */
+ m_items.sort (item_compare);
+}

audacious-plugins-4.4.1.tar.bz2/src/search-tool-qt/search-model.h Added

@@ -0,0 +1,125 @@
+/*
+ * search-model.h
+ * Copyright 2011-2019 John Lindgren and René J.V. Bertin
+ *
+ * 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.
+ */
+
+#ifndef SEARCHMODEL_H
+#define SEARCHMODEL_H
+
+#include <QAbstractListModel>
+
+#include <libaudcore/audstrings.h>
+#include <libaudcore/i18n.h>
+#include <libaudcore/multihash.h>
+#include <libaudcore/playlist.h>
+
+enum class SearchField {
+ Genre,
+ Artist,
+ Album,
+ HiddenAlbum,
+ Title,
+ count
+};
+
+static constexpr aud::array<SearchField, const char *> start_tags =
+ {"", "", "", "", ""};
+static constexpr aud::array<SearchField, const char *> end_tags =
+ {"", "", "", "", ""};
+
+static inline const char * parent_prefix (SearchField parent)
+{
+ return (parent == SearchField::Album || parent ==
+ SearchField::HiddenAlbum) ? _("on") : _("by");
+}
+
+struct Key
+{
+ SearchField field;
+ String name;
+
+ bool operator== (const Key & b) const
+ { return field == b.field && name == b.name; }
+ unsigned hash () const
+ { return (unsigned) field + name.hash (); }
+};
+
+struct Item
+{
+ SearchField field;
+ String name, folded;
+ Item * parent;
+ SimpleHash<Key, Item> children;
+ Index<int> matches;
+
+ Item (SearchField field, const String & name, Item * parent) :
+ field (field),
+ name (name),
+ folded (str_tolower_utf8 (name)),
+ parent (parent) {}
+
+ Item (Item &&) = default;
+ Item & operator= (Item &&) = default;
+};
+
+class SearchModel : public QAbstractListModel
+{
+public:
+ int num_items () const { return m_items.len (); }
+ const Item & item_at (int idx) const { return * m_itemsidx; }
+ int num_hidden_items () const { return m_hidden_items; }
+
+ void update ();
+ void destroy_database ();
+ void create_database (Playlist playlist);
+ void do_search (const Index<String> & terms, int max_results);
+
+protected:
+ int rowCount (const QModelIndex & parent) const
+ {
+ return parent.isValid() ? 0 : m_rows;
+ }
+
+ int columnCount (const QModelIndex & parent) const { return 1; }
+ QVariant data (const QModelIndex & index, int role) const;
+
+ Qt::ItemFlags flags (const QModelIndex & index) const
+ {
+ if (index.isValid ())
+ return Qt::ItemIsSelectable | Qt::ItemIsDragEnabled | Qt::ItemIsEnabled;
+ else
+ return Qt::ItemIsSelectable | Qt::ItemIsEnabled;
+ }
+
+ QStringList mimeTypes () const
+ {
+ return QStringList ("text/uri-list");
+ }
+
+ QMimeData * mimeData (const QModelIndexList & indexes) const;
+
+private:
+ void add_to_database (int entry, std::initializer_list<Key> keys);
+
+ Playlist m_playlist;
+ SimpleHash<Key, Item> m_database;
+ Index<const Item *> m_items;
+ int m_hidden_items = 0;
+ int m_rows = 0;
+};
+
+#endif // SEARCHMODEL_H

audacious-plugins-4.4.1.tar.bz2/src/search-tool-qt/search-tool-qt.cc Added

@@ -0,0 +1,540 @@
+/*
+ * search-tool-qt.cc
+ * Copyright 2011-2019 John Lindgren, Ariadne Conill, and René J.V. Bertin
+ *
+ * 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 <glib.h>
+
+#include <QApplication>
+#include <QBoxLayout>
+#include <QContextMenuEvent>
+#include <QDirIterator>
+#include <QFileSystemWatcher>
+#include <QIcon>
+#include <QLabel>
+#include <QLineEdit>
+#include <QMenu>
+#include <QPointer>
+#include <QPushButton>
+#include <QTreeView>
+
+#include <libaudcore/i18n.h>
+#include <libaudcore/plugin.h>
+#include <libaudcore/preferences.h>
+#include <libaudcore/mainloop.h>
+#include <libaudcore/runtime.h>
+#include <libaudqt/libaudqt.h>
+#include <libaudqt/treeview.h>
+
+#include "html-delegate.h"
+#include "library.h"
+#include "search-model.h"
+
+#define CFG_ID "search-tool"
+#define SEARCH_DELAY 300
+
+class SearchToolQt : public GeneralPlugin
+{
+public:
+ static const char * const defaults;
+ static const PreferencesWidget widgets;
+ static const PluginPreferences prefs;
+
+ static constexpr PluginInfo info = {
+ N_("Search Tool"),
+ PACKAGE,
+ nullptr, // about
+ & prefs,
+ PluginQtOnly
+ };
+
+ constexpr SearchToolQt () : GeneralPlugin (info, false) {}
+
+ bool init ();
+ void * get_qt_widget ();
+ int take_message (const char * code, const void *, int);
+};
+
+EXPORT SearchToolQt aud_plugin_instance;
+
+class SearchEntry : public QLineEdit
+{
+public:
+ QTreeView * list = nullptr;
+
+protected:
+ void keyPressEvent (QKeyEvent * event)
+ {
+ auto CtrlShiftAlt = Qt::ShiftModifier | Qt::ControlModifier | Qt::AltModifier;
+ if (list && ! (event->modifiers () & CtrlShiftAlt) && event->key () == Qt::Key_Down)
+ {
+ list->setCurrentIndex (list->model ()->index (0, 0));
+ list->setFocus (Qt::OtherFocusReason);
+ return;
+ }
+ QLineEdit::keyPressEvent (event);
+ }
+};
+
+class ResultsList : public audqt::TreeView
+{
+public:
+ QWidget * entry = nullptr;
+
+protected:
+ void keyPressEvent (QKeyEvent * event)
+ {
+ auto CtrlShiftAlt = Qt::ShiftModifier | Qt::ControlModifier | Qt::AltModifier;
+ if (entry && ! (event->modifiers () & CtrlShiftAlt) &&
+ event->key () == Qt::Key_Up && currentIndex ().row () == 0)
+ {
+ entry->setFocus (Qt::OtherFocusReason);
+ return;
+ }
+ QTreeView::keyPressEvent (event);
+ }
+};
+
+class SearchWidget : public QWidget
+{
+public:
+ SearchWidget ();
+
+ void grab_focus () { m_search_entry.setFocus (Qt::OtherFocusReason); }
+
+ void trigger_search ();
+ void reset_monitor ();
+
+private:
+ void init_library ();
+ void show_hide_widgets ();
+ void search_timeout ();
+ void library_updated ();
+ void location_changed ();
+ void walk_library_paths ();
+ void setup_monitor ();
+
+ void do_add (bool play, bool set_title);
+ void action_play ();
+ void action_create_playlist ();
+ void action_add_to_playlist ();
+ void show_context_menu (const QPoint & global_pos);
+
+ Library m_library;
+ SearchModel m_model;
+ HtmlDelegate m_delegate;
+
+ SmartPtr<QFileSystemWatcher> m_watcher;
+ QStringList m_watcher_paths;
+
+ QueuedFunc m_search_timer;
+ bool m_search_pending = false;
+
+ QLabel m_help_label, m_wait_label, m_stats_label;
+ SearchEntry m_search_entry;
+ ResultsList m_results_list;
+ QPushButton m_refresh_btn;
+
+ QLineEdit * m_file_entry;
+};
+
+static QPointer<SearchWidget> s_widget;
+
+const char * const SearchToolQt::defaults = {
+ "max_results", "20",
+ "rescan_on_startup", "FALSE",
+ "monitor", "FALSE",
+ nullptr
+};
+
+const PreferencesWidget SearchToolQt::widgets = {
+ WidgetSpin (N_("Number of results to show:"),
+ WidgetInt (CFG_ID, "max_results", () { s_widget->trigger_search (); }),
+ {10, 10000, 10}),
+ WidgetCheck (N_("Rescan library at startup"),
+ WidgetBool (CFG_ID, "rescan_on_startup")),
+ WidgetCheck (N_("Monitor library for changes"),
+ WidgetBool (CFG_ID, "monitor", () { s_widget->reset_monitor (); }))
+};
+
+const PluginPreferences SearchToolQt::prefs = {{widgets}};
+
+static String get_uri ()
+{
+ auto to_uri = (const char * path)
+ { return String (filename_to_uri (path)); };
+
+ String path1 = aud_get_str (CFG_ID, "path");
+ if (path10)
+ return strstr (path1, "://") ? path1 : to_uri (path1);
+
+ StringBuf path2 = filename_build ({g_get_home_dir (), "Music"});
+ if (g_file_test (path2, G_FILE_TEST_EXISTS))
+ return to_uri (path2);
+
+ return to_uri (g_get_home_dir ());
+}
+
+SearchWidget::SearchWidget () :
+ m_help_label (_("To import your music library into Audacious, "
+ "choose a folder and then click the \"refresh\" icon.")),
+ m_wait_label (_("Please wait ...")),
+ m_refresh_btn (QIcon::fromTheme ("view-refresh"), QString ()),
+ m_file_entry (audqt::file_entry_new (this, _("Choose Folder"),
+ QFileDialog::Directory, QFileDialog::AcceptOpen))
+{
+ m_search_entry.setClearButtonEnabled (true);
+ m_search_entry.setPlaceholderText (_("Search library"));
+
+ m_help_label.setAlignment (Qt::AlignCenter);
+ m_help_label.setContentsMargins (audqt::margins.EightPt);
+ m_help_label.setWordWrap (true);
+
+ m_wait_label.setAlignment (Qt::AlignCenter);
+ m_wait_label.setContentsMargins (audqt::margins.EightPt);
+
+ m_results_list.setFrameStyle (QFrame::NoFrame);
+ m_results_list.setHeaderHidden (true);
+ m_results_list.setIndentation (0);
+ m_results_list.setModel (& m_model);
+ m_results_list.setItemDelegate (& m_delegate);
+ m_results_list.setSelectionMode (QTreeView::ExtendedSelection);
+ m_results_list.setDragDropMode (QTreeView::DragOnly);
+ m_results_list.setContextMenuPolicy (Qt::CustomContextMenu);
+
+ m_stats_label.setAlignment (Qt::AlignCenter);
+ m_stats_label.setContentsMargins (audqt::margins.TwoPt);
+
+#ifdef Q_OS_MAC // Mac-specific font tweaks
+ m_search_entry.setFont (QApplication::font ("QTreeView"));
+ m_stats_label.setFont (QApplication::font ("QSmallFont"));
+#endif
+
+ m_refresh_btn.setFlat (true);
+ m_refresh_btn.setFocusPolicy (Qt::NoFocus);
+
+ m_search_entry.list = & m_results_list;
+ m_results_list.entry = & m_search_entry;
+
+ auto hbox1 = audqt::make_hbox (nullptr);
+ hbox1->setContentsMargins (audqt::margins.TwoPt);
+ hbox1->addWidget (& m_search_entry);
+
+ auto hbox2 = audqt::make_hbox (nullptr);
+ hbox2->setContentsMargins (audqt::margins.TwoPt);
+ hbox2->addWidget (m_file_entry);
+ hbox2->addWidget (& m_refresh_btn);
+
+ auto vbox = audqt::make_vbox (this, 0);
+ vbox->addLayout (hbox1);
+ vbox->addWidget (& m_help_label);
+ vbox->addWidget (& m_wait_label);
+ vbox->addWidget (& m_results_list);
+ vbox->addWidget (& m_stats_label);
+ vbox->addLayout (hbox2);
+
+ audqt::file_entry_set_uri (m_file_entry, get_uri ());
+
+ init_library ();
+ reset_monitor ();
+
+ QObject::connect (& m_search_entry, & QLineEdit::textEdited, this, & SearchWidget::trigger_search);
+ QObject::connect (& m_search_entry, & QLineEdit::returnPressed, this, & SearchWidget::action_play);
+ QObject::connect (& m_results_list, & QTreeView::activated, this, & SearchWidget::action_play);
+
+ QObject::connect (& m_results_list, & QWidget::customContextMenuRequested,
+ this (const QPoint & pos) { show_context_menu (m_results_list.mapToGlobal (pos)); });
+
+ QObject::connect (m_file_entry, & QLineEdit::textChanged, this (const QString & text)
+ { m_refresh_btn.setDisabled (text.isEmpty ()); });
+
+ QObject::connect (m_file_entry, & QLineEdit::returnPressed, this, & SearchWidget::location_changed);
+ QObject::connect (& m_refresh_btn, & QPushButton::clicked, this, & SearchWidget::location_changed);
+}
+
+void SearchWidget::init_library ()
+{
+ m_library.connect_update
+ (aud::obj_member<SearchWidget, & SearchWidget::library_updated>, this);
+
+ if (aud_get_bool (CFG_ID, "rescan_on_startup"))
+ m_library.begin_add (get_uri ());
+
+ m_library.check_ready_and_update (true);
+}
+
+void SearchWidget::show_hide_widgets ()
+{
+ if (m_library.playlist () == Playlist ())
+ {
+ m_wait_label.hide ();
+ m_results_list.hide ();
+ m_stats_label.hide ();
+ m_help_label.show ();
+ }
+ else
+ {
+ m_help_label.hide ();
+
+ if (m_library.is_ready ())
+ {
+ m_wait_label.hide ();
+ m_results_list.show ();
+ m_stats_label.show ();
+ }
+ else
+ {
+ m_results_list.hide ();
+ m_stats_label.hide ();
+ m_wait_label.show ();
+ }
+ }
+}
+
+void SearchWidget::search_timeout ()
+{
+ auto text = m_search_entry.text ().toUtf8 ();
+ auto terms = str_list_to_index (str_tolower_utf8 (text), " ");
+ m_model.do_search (terms, aud_get_int (CFG_ID, "max_results"));
+ m_model.update ();
+
+ int shown = m_model.num_items ();
+ int hidden = m_model.num_hidden_items ();
+ int total = shown + hidden;
+
+ if (shown)
+ {
+ auto sel = m_results_list.selectionModel ();
+ sel->select (m_model.index (0, 0), sel->Clear | sel->SelectCurrent);
+ }
+
+ if (hidden)
+ m_stats_label.setText ((const char *)
+ str_printf (dngettext (PACKAGE, "%d of %d result shown",
+ "%d of %d results shown", total), shown, total));
+ else
+ m_stats_label.setText ((const char *)
+ str_printf (dngettext (PACKAGE, "%d result", "%d results", total), total));
+
+ m_search_timer.stop ();
+ m_search_pending = false;
+}
+
+void SearchWidget::trigger_search ()
+{
+ m_search_timer.queue (SEARCH_DELAY, this () { search_timeout (); });
+ m_search_pending = true;
+}
+
+void SearchWidget::library_updated ()
+{
+ if (m_library.is_ready ())
+ {
+ m_model.create_database (m_library.playlist ());
+ search_timeout ();
+ }
+ else
+ {
+ m_model.destroy_database ();
+ m_model.update ();
+ m_stats_label.clear ();
+ }
+
+ show_hide_widgets ();
+}
+
+void SearchWidget::location_changed ()
+{
+ auto uri = audqt::file_entry_get_uri (m_file_entry);
+ if (! uri)
+ return;
+
+ audqt::file_entry_set_uri (m_file_entry, uri); // normalize path
+
+ // if possible, store local path for compatibility with older versions
+ StringBuf path = uri_to_filename (uri);
+ aud_set_str (CFG_ID, "path", path ? path : uri);
+
+ m_library.begin_add (uri);
+ m_library.check_ready_and_update (true);
+ reset_monitor ();
+}
+
+// QFileSystemWatcher doesn't support recursion, so we must do it ourselves.
+// TODO: Since MacOS has an abysmally low default per-process FD limit, this
+// means it probably won't work on MacOS with a huge media library.
+// In the case of MacOS, we should use the FSEvents API instead.
+void SearchWidget::walk_library_paths ()
+{
+ if (! m_watcher_paths.isEmpty ())
+ m_watcher->removePaths (m_watcher_paths);
+
+ m_watcher_paths.clear ();
+
+ auto root = (QString) uri_to_filename (get_uri ());
+ if (root.isEmpty ())
+ return;
+
+ m_watcher_paths.append (root);
+
+ QDirIterator it (root, QDir::Dirs | QDir::NoDot | QDir::NoDotDot, QDirIterator::Subdirectories);
+ while (it.hasNext ())
+ m_watcher_paths.append (it.next ());
+
+ m_watcher->addPaths (m_watcher_paths);
+}
+
+void SearchWidget::setup_monitor ()
+{
+ AUDINFO ("Starting monitoring.\n");
+ m_watcher.capture (new QFileSystemWatcher);
+ m_watcher_paths.clear ();
+
+ QObject::connect (m_watcher.get (), & QFileSystemWatcher::directoryChanged,
+ this (const QString &)
+ {
+ AUDINFO ("Library directory changed, refreshing library.\n");
+
+ m_library.begin_add (get_uri ());
+ m_library.check_ready_and_update (true);
+
+ walk_library_paths ();
+ });
+
+ walk_library_paths ();
+}
+
+void SearchWidget::reset_monitor ()
+{
+ if (aud_get_bool (CFG_ID, "monitor"))
+ {
+ setup_monitor ();
+ }
+ else if (m_watcher)
+ {
+ AUDINFO ("Stopping monitoring.\n");
+ m_watcher.clear ();
+ m_watcher_paths.clear ();
+ }
+}
+
+void SearchWidget::do_add (bool play, bool set_title)
+{
+ if (m_search_pending)
+ search_timeout ();
+
+ int n_items = m_model.num_items ();
+ int n_selected = 0;
+
+ auto list = m_library.playlist ();
+ Index<PlaylistAddItem> add;
+ String title;
+
+ for (auto & idx : m_results_list.selectionModel ()->selectedRows ())
+ {
+ int i = idx.row ();
+ if (i < 0 || i >= n_items)
+ continue;
+
+ auto & item = m_model.item_at (i);
+
+ for (int entry : item.matches)
+ {
+ add.append (
+ list.entry_filename (entry),
+ list.entry_tuple (entry, Playlist::NoWait),
+ list.entry_decoder (entry, Playlist::NoWait)
+ );
+ }
+
+ n_selected ++;
+ if (n_selected == 1)
+ title = item.name;
+ }
+
+ auto list2 = Playlist::active_playlist ();
+ list2.insert_items (-1, std::move (add), play);
+
+ if (set_title && n_selected == 1)
+ list2.set_title (title);
+}
+
+void SearchWidget::action_play ()
+{
+ Playlist::temporary_playlist ().activate ();
+ do_add (true, false);
+}
+
+void SearchWidget::action_create_playlist ()
+{
+ Playlist::new_playlist ();
+ do_add (false, true);
+}
+
+void SearchWidget::action_add_to_playlist ()
+{
+ if (m_library.playlist () != Playlist::active_playlist ())
+ do_add (false, false);
+}
+
+void SearchWidget::show_context_menu (const QPoint & global_pos)
+{
+ auto menu = new QMenu (this);
+
+ auto play_act = new QAction (QIcon::fromTheme ("media-playback-start"),
+ audqt::translate_str (N_("_Play")), menu);
+ auto create_act = new QAction (QIcon::fromTheme ("document-new"),
+ audqt::translate_str (N_("_Create Playlist")), menu);
+ auto add_act = new QAction (QIcon::fromTheme ("list-add"),
+ audqt::translate_str (N_("_Add to Playlist")), menu);
+
+ QObject::connect (play_act, & QAction::triggered, this, & SearchWidget::action_play);
+ QObject::connect (create_act, & QAction::triggered, this, & SearchWidget::action_create_playlist);
+ QObject::connect (add_act, & QAction::triggered, this, & SearchWidget::action_add_to_playlist);
+
+ menu->addAction (play_act);
+ menu->addAction (create_act);
+ menu->addAction (add_act);
+
+ menu->setAttribute (Qt::WA_DeleteOnClose);
+ menu->popup (global_pos);
+}
+
+bool SearchToolQt::init ()
+{
+ aud_config_set_defaults (CFG_ID, defaults);
+ return true;
+}
+
+void * SearchToolQt::get_qt_widget ()
+{
+ if (! s_widget)
+ s_widget = new SearchWidget;
+
+ return s_widget;
+}
+
+int SearchToolQt::take_message (const char * code, const void *, int)
+{
+ if (! strcmp (code, "grab focus") && s_widget)
+ {
+ s_widget->grab_focus ();
+ return 0;
+ }
+
+ return -1;
+}

audacious-plugins-3.6.2-gtk3.tar.bz2/src/search-tool/Makefile -> audacious-plugins-4.4.1.tar.bz2/src/search-tool/Makefile Changed

audacious-plugins-4.4.1.tar.bz2/src/search-tool/library.cc Added

@@ -0,0 +1,177 @@
+/*
+ * library.cc
+ * Copyright 2011-2019 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 "library.h"
+
+#include <string.h>
+#include <libaudcore/i18n.h>
+
+aud::spinlock Library::s_adding_lock;
+Library * Library::s_adding_library = nullptr;
+
+void Library::find_playlist ()
+{
+ m_playlist = Playlist ();
+
+ for (int p = 0; p < Playlist::n_playlists (); p ++)
+ {
+ auto playlist = Playlist::by_index (p);
+ if (! strcmp (playlist.get_title (), _("Library")))
+ {
+ m_playlist = playlist;
+ break;
+ }
+ }
+}
+
+void Library::create_playlist ()
+{
+ m_playlist = Playlist::blank_playlist ();
+ m_playlist.set_title (_("Library"));
+ m_playlist.active_playlist ();
+}
+
+bool Library::check_playlist (bool require_added, bool require_scanned)
+{
+ if (! m_playlist.exists ())
+ {
+ m_playlist = Playlist ();
+ return false;
+ }
+
+ if (require_added && m_playlist.add_in_progress ())
+ return false;
+ if (require_scanned && m_playlist.scan_in_progress ())
+ return false;
+
+ return true;
+}
+
+void Library::set_adding (bool adding)
+{
+ auto lh = s_adding_lock.take ();
+ s_adding_library = adding ? this : nullptr;
+}
+
+bool Library::filter_cb (const char * filename, void *)
+{
+ bool add = false;
+ auto lh = s_adding_lock.take ();
+
+ if (s_adding_library)
+ {
+ bool * added = s_adding_library->m_added_table.lookup (String (filename));
+
+ if ((add = ! added))
+ s_adding_library->m_added_table.add (String (filename), true);
+ else
+ (* added) = true;
+ }
+
+ return add;
+}
+
+void Library::begin_add (const char * uri)
+{
+ if (s_adding_library)
+ return;
+
+ if (! check_playlist (false, false))
+ create_playlist ();
+
+ m_added_table.clear ();
+
+ int entries = m_playlist.n_entries ();
+
+ for (int entry = 0; entry < entries; entry ++)
+ {
+ String filename = m_playlist.entry_filename (entry);
+
+ if (! m_added_table.lookup (filename))
+ {
+ m_playlist.select_entry (entry, false);
+ m_added_table.add (filename, false);
+ }
+ else
+ m_playlist.select_entry (entry, true);
+ }
+
+ m_playlist.remove_selected ();
+
+ set_adding (true);
+
+ Index<PlaylistAddItem> add;
+ add.append (String (uri));
+ m_playlist.insert_filtered (-1, std::move (add), filter_cb, nullptr, false);
+}
+
+void Library::check_ready_and_update (bool force)
+{
+ bool now_ready = check_playlist (true, true);
+ if (now_ready != m_is_ready || force)
+ {
+ m_is_ready = now_ready;
+ signal_update ();
+ }
+}
+
+void Library::add_complete ()
+{
+ if (! check_playlist (true, false))
+ return;
+
+ if (s_adding_library)
+ {
+ set_adding (false);
+
+ int entries = m_playlist.n_entries ();
+
+ for (int entry = 0; entry < entries; entry ++)
+ {
+ String filename = m_playlist.entry_filename (entry);
+ bool * added = m_added_table.lookup (filename);
+
+ m_playlist.select_entry (entry, ! added || ! (* added));
+ }
+
+ m_added_table.clear ();
+
+ /* don't clear the playlist if nothing was added */
+ if (m_playlist.n_selected () < entries)
+ m_playlist.remove_selected ();
+ else
+ m_playlist.select_all (false);
+
+ m_playlist.sort_entries (Playlist::Path);
+ }
+
+ if (! m_playlist.update_pending ())
+ check_ready_and_update (false);
+}
+
+void Library::scan_complete ()
+{
+ if (! m_playlist.update_pending ())
+ check_ready_and_update (false);
+}
+
+void Library::playlist_update ()
+{
+ check_ready_and_update (m_playlist.update_detail ().level >= Playlist::Metadata);
+}

audacious-plugins-4.4.1.tar.bz2/src/search-tool/library.h Added

@@ -0,0 +1,67 @@
+/*
+ * library.h
+ * Copyright 2011-2019 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.
+ */
+
+#ifndef LIBRARY_H
+#define LIBRARY_H
+
+#include <libaudcore/hook.h>
+#include <libaudcore/multihash.h>
+#include <libaudcore/playlist.h>
+
+class Library
+{
+public:
+ Library () { find_playlist (); }
+ ~Library () { set_adding (false); }
+
+ Playlist playlist () const { return m_playlist; }
+ bool is_ready () const { return m_is_ready; }
+
+ void begin_add (const char * uri);
+ void check_ready_and_update (bool force);
+
+private:
+ void find_playlist ();
+ void create_playlist ();
+ bool check_playlist (bool require_added, bool require_scanned);
+ void set_adding (bool adding);
+
+ static bool filter_cb (const char * filename, void *);
+
+ void add_complete (void);
+ void scan_complete (void);
+ void playlist_update (void);
+
+ static void signal_update (); /* implemented externally */
+
+ Playlist m_playlist;
+ bool m_is_ready = false;
+ SimpleHash<String, bool> m_added_table;
+
+ /* to allow safe callback access from playlist add thread */
+ static aud::spinlock s_adding_lock;
+ static Library * s_adding_library;
+
+ HookReceiver<Library>
+ hook1 {"playlist add complete", this, & Library::add_complete},
+ hook2 {"playlist scan complete", this, & Library::scan_complete},
+ hook3 {"playlist update", this, & Library::playlist_update};
+};
+
+#endif // LIBRARY_H

audacious-plugins-4.4.1.tar.bz2/src/search-tool/meson.build Added

audacious-plugins-4.4.1.tar.bz2/src/search-tool/search-model.cc Added

@@ -0,0 +1,172 @@
+/*
+ * search-model.cc
+ * Copyright 2011-2019 John Lindgren and René J.V. Bertin
+ *
+ * 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 "search-model.h"
+#include <string.h>
+
+void SearchModel::destroy_database ()
+{
+ m_playlist = Playlist ();
+ m_items.clear ();
+ m_hidden_items = 0;
+ m_database.clear ();
+}
+
+void SearchModel::add_to_database (int entry, std::initializer_list<Key> keys)
+{
+ Item * parent = nullptr;
+ auto hash = & m_database;
+
+ for (auto & key : keys)
+ {
+ if (! key.name)
+ continue;
+
+ Item * item = hash->lookup (key);
+ if (! item)
+ item = hash->add (key, Item (key.field, key.name, parent));
+
+ item->matches.append (entry);
+
+ parent = item;
+ hash = & item->children;
+ }
+}
+
+void SearchModel::create_database (Playlist playlist)
+{
+ destroy_database ();
+
+ int entries = playlist.n_entries ();
+
+ for (int e = 0; e < entries; e ++)
+ {
+ Tuple tuple = playlist.entry_tuple (e, Playlist::NoWait);
+ String album_artist = tuple.get_str (Tuple::AlbumArtist);
+ String artist = tuple.get_str (Tuple::Artist);
+
+ if (album_artist && album_artist != artist)
+ {
+ /* album and song have different artists;
+ * add separately under respective artists */
+ add_to_database (e,
+ {{SearchField::Artist, album_artist},
+ {SearchField::Album, tuple.get_str (Tuple::Album)}});
+ /* add Title node under a HiddenAlbum node so that it can
+ * still be searched by album name (without listing the
+ * album twice) */
+ add_to_database (e,
+ {{SearchField::Artist, artist},
+ {SearchField::HiddenAlbum, tuple.get_str (Tuple::Album)},
+ {SearchField::Title, tuple.get_str (Tuple::Title)}});
+ }
+ else
+ {
+ /* album and song have the same artist;
+ * add hierarchically under that artist */
+ add_to_database (e,
+ {{SearchField::Artist, artist},
+ {SearchField::Album, tuple.get_str (Tuple::Album)},
+ {SearchField::Title, tuple.get_str (Tuple::Title)}});
+ }
+
+ /* add separately under genre */
+ add_to_database (e,
+ {{SearchField::Genre, tuple.get_str (Tuple::Genre)}});
+ }
+
+ m_playlist = playlist;
+}
+
+static void search_recurse (SimpleHash<Key, Item> & domain,
+ const Index<String> & terms, int mask, Index<const Item *> & results)
+{
+ domain.iterate (& (const Key & key, Item & item)
+ {
+ int count = terms.len ();
+ int new_mask = mask;
+
+ for (int t = 0, bit = 1; t < count; t ++, bit <<= 1)
+ {
+ if (! (new_mask & bit))
+ continue; /* skip term if it is already found */
+
+ if (strstr (item.folded, termst))
+ new_mask &= ~bit; /* we found it */
+ else if (! item.children.n_items ())
+ break; /* quit early if there are no children to search */
+ }
+
+ /* adding an item with exactly one child is redundant, so avoid it */
+ if (! new_mask && item.children.n_items () != 1 &&
+ item.field != SearchField::HiddenAlbum)
+ results.append (& item);
+
+ search_recurse (item.children, terms, new_mask, results);
+ });
+}
+
+static int item_compare (const Item * const & a, const Item * const & b)
+{
+ if (a->field < b->field)
+ return -1;
+ if (a->field > b->field)
+ return 1;
+
+ int val = str_compare (a->name, b->name);
+ if (val)
+ return val;
+
+ if (a->parent)
+ return b->parent ? item_compare (a->parent, b->parent) : 1;
+ else
+ return b->parent ? -1 : 0;
+}
+
+static int item_compare_pass1 (const Item * const & a, const Item * const & b)
+{
+ if (a->matches.len () > b->matches.len ())
+ return -1;
+ if (a->matches.len () < b->matches.len ())
+ return 1;
+
+ return item_compare (a, b);
+}
+
+void SearchModel::do_search (const Index<String> & terms, int max_results)
+{
+ m_items.clear ();
+ m_hidden_items = 0;
+
+ /* effectively limits number of search terms to 32 */
+ search_recurse (m_database, terms, (1 << terms.len ()) - 1, m_items);
+
+ /* first sort by number of songs per item */
+ m_items.sort (item_compare_pass1);
+
+ /* limit to items with most songs */
+ if (m_items.len () > max_results)
+ {
+ m_hidden_items = m_items.len () - max_results;
+ m_items.remove (max_results, -1);
+ }
+
+ /* sort by item type, then item name */
+ m_items.sort (item_compare);
+}

audacious-plugins-4.4.1.tar.bz2/src/search-tool/search-model.h Added

@@ -0,0 +1,97 @@
+/*
+ * search-model.h
+ * Copyright 2011-2019 John Lindgren and René J.V. Bertin
+ *
+ * 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.
+ */
+
+#ifndef SEARCHMODEL_H
+#define SEARCHMODEL_H
+
+#include <libaudcore/audstrings.h>
+#include <libaudcore/i18n.h>
+#include <libaudcore/multihash.h>
+#include <libaudcore/playlist.h>
+
+enum class SearchField {
+ Genre,
+ Artist,
+ Album,
+ HiddenAlbum,
+ Title,
+ count
+};
+
+static constexpr aud::array<SearchField, const char *> start_tags =
+ {"", "", "", "", ""};
+static constexpr aud::array<SearchField, const char *> end_tags =
+ {"", "", "", "", ""};
+
+static inline const char * parent_prefix (SearchField parent)
+{
+ return (parent == SearchField::Album || parent ==
+ SearchField::HiddenAlbum) ? _("on") : _("by");
+}
+
+struct Key
+{
+ SearchField field;
+ String name;
+
+ bool operator== (const Key & b) const
+ { return field == b.field && name == b.name; }
+ unsigned hash () const
+ { return (unsigned) field + name.hash (); }
+};
+
+struct Item
+{
+ SearchField field;
+ String name, folded;
+ Item * parent;
+ SimpleHash<Key, Item> children;
+ Index<int> matches;
+
+ Item (SearchField field, const String & name, Item * parent) :
+ field (field),
+ name (name),
+ folded (str_tolower_utf8 (name)),
+ parent (parent) {}
+
+ Item (Item &&) = default;
+ Item & operator= (Item &&) = default;
+};
+
+class SearchModel
+{
+public:
+ int num_items () const { return m_items.len (); }
+ const Item & item_at (int idx) const { return * m_itemsidx; }
+ int num_hidden_items () const { return m_hidden_items; }
+
+ void destroy_database ();
+ void create_database (Playlist playlist);
+ void do_search (const Index<String> & terms, int max_results);
+
+private:
+ void add_to_database (int entry, std::initializer_list<Key> keys);
+
+ Playlist m_playlist;
+ SimpleHash<Key, Item> m_database;
+ Index<const Item *> m_items;
+ int m_hidden_items = 0;
+};
+
+#endif // SEARCHMODEL_H

audacious-plugins-3.6.2-gtk3.tar.bz2/src/search-tool/search-tool.cc -> audacious-plugins-4.4.1.tar.bz2/src/search-tool/search-tool.cc Changed

@@ -1,6 +1,6 @@
 /*
- * search-tool.c
- * Copyright 2011-2012 John Lindgren
+ * search-tool.cc
+ * Copyright 2011-2017 John Lindgren
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions are met:
@@ -19,345 +19,95 @@
 
 #include <string.h>
 #include <gtk/gtk.h>
+#include <gdk/gdk.h>
 
-#include <libaudcore/audstrings.h>
-#include <libaudcore/hook.h>
+#define AUD_GLIB_INTEGRATION
 #include <libaudcore/i18n.h>
-#include <libaudcore/playlist.h>
 #include <libaudcore/plugin.h>
-#include <libaudcore/multihash.h>
+#include <libaudcore/preferences.h>
+#include <libaudcore/mainloop.h>
 #include <libaudcore/runtime.h>
+#include <libaudgui/gtk-compat.h>
+#include <libaudgui/libaudgui-gtk.h>
 #include <libaudgui/list.h>
 #include <libaudgui/menu.h>
 
-#define MAX_RESULTS 20
+#include "library.h"
+#include "search-model.h"
+
+#define CFG_ID "search-tool"
 #define SEARCH_DELAY 300
 
 class SearchTool : public GeneralPlugin
 {
 public:
+ static const char * const defaults;
+ static const PreferencesWidget widgets;
+ static const PluginPreferences prefs;
+
 static constexpr PluginInfo info = {
 N_("Search Tool"),
- PACKAGE
+ PACKAGE,
+ nullptr, // about
+ & prefs,
+ PluginGLibOnly
 };
 
 constexpr SearchTool () : GeneralPlugin (info, false) {}
 
+ bool init ();
 void * get_gtk_widget ();
- int take_message (const char * code, const void * data, int size);
+ int take_message (const char * code, const void *, int);
 };
 
 EXPORT SearchTool aud_plugin_instance;
 
-enum class SearchField {
- Genre,
- Artist,
- Album,
- Title,
- count
-};
-
-struct Key
-{
- SearchField field;
- String name;
+static void trigger_search ();
 
- bool operator== (const Key & b) const
- { return field == b.field && name == b.name; }
- unsigned hash () const
- { return (unsigned) field + name.hash (); }
+const char * const SearchTool::defaults = {
+ "max_results", "20",
+ "rescan_on_startup", "FALSE",
+ nullptr
 };
 
-struct Item
-{
- SearchField field;
- String name, folded;
- Item * parent;
- SimpleHash<Key, Item> children;
- Index<int> matches;
-
- Item (SearchField field, const String & name, Item * parent) :
- field (field),
- name (name),
- folded (str_tolower_utf8 (name)),
- parent (parent) {}
-
- Item (Item &&) = default;
- Item & operator= (Item &&) = default;
+const PreferencesWidget SearchTool::widgets = {
+ WidgetSpin (N_("Number of results to show:"),
+ WidgetInt (CFG_ID, "max_results", trigger_search),
+ {10, 10000, 10}),
+ WidgetCheck (N_("Rescan library at startup"),
+ WidgetBool (CFG_ID, "rescan_on_startup"))
 };
 
-struct SearchState {
- Index<const Item *> items;
- int mask;
-};
-
-static int playlist_id;
-static Index<String> search_terms;
+const PluginPreferences SearchTool::prefs = {{widgets}};
 
-static SimpleHash<String, bool> added_table;
-static SimpleHash<Key, Item> database;
-static bool database_valid;
-static Index<const Item *> items;
-static int hidden_items;
-static Index<bool> selection;
+static Library * s_library = nullptr;
+static SearchModel s_model;
+static Index<bool> s_selection;
 
-static gboolean adding;
-static int search_source;
+static QueuedFunc s_search_timer;
+static bool s_search_pending;
 
 static GtkWidget * entry, * help_label, * wait_label, * scrolled, * results_list, * stats_label;
 
-static void find_playlist ()
-{
- playlist_id = -1;
-
- for (int p = 0; playlist_id < 0 && p < aud_playlist_count (); p ++)
- {
- String title = aud_playlist_get_title (p);
- if (! strcmp (title, _("Library")))
- playlist_id = aud_playlist_get_unique_id (p);
- }
-}
-
-static int create_playlist ()
-{
- int list = aud_playlist_get_blank ();
- aud_playlist_set_title (list, _("Library"));
- aud_playlist_set_active (list);
- playlist_id = aud_playlist_get_unique_id (list);
- return list;
-}
-
-static int get_playlist (gboolean require_added, gboolean require_scanned)
-{
- if (playlist_id < 0)
- return -1;
-
- int list = aud_playlist_by_unique_id (playlist_id);
-
- if (list < 0)
- {
- playlist_id = -1;
- return -1;
- }
-
- if (require_added && aud_playlist_add_in_progress (list))
- return -1;
- if (require_scanned && aud_playlist_scan_in_progress (list))
- return -1;
-
- return list;
-}
-
-static void set_search_phrase (const char * phrase)
+static String get_uri ()
 {
- search_terms = str_list_to_index (str_tolower_utf8 (phrase), " ");
-}
+ auto to_uri = (const char * path)
+ { return String (filename_to_uri (path)); };
 
-static String get_path ()
-{
- String path1 = aud_get_str ("search-tool", "path");
- if (g_file_test (path1, G_FILE_TEST_EXISTS))
- return path1;
+ String path1 = aud_get_str (CFG_ID, "path");
+ if (path10)
+ return strstr (path1, "://") ? path1 : to_uri (path1);
 
 StringBuf path2 = filename_build ({g_get_home_dir (), "Music"});
 if (g_file_test (path2, G_FILE_TEST_EXISTS))
- return String (path2);
-
- return String (g_get_home_dir ());
-}
-
-static void destroy_database ()
-{
- items.clear ();
- hidden_items = 0;
- database.clear ();
- database_valid = false;
-}
-
-static void create_database (int list)
-{
- destroy_database ();
-
- int entries = aud_playlist_entry_count (list);
-
- for (int e = 0; e < entries; e ++)
- {
- Tuple tuple = aud_playlist_entry_get_tuple (list, e, Playlist::Guess);
-
- aud::array<SearchField, String> fields;
- fieldsSearchField::Genre = tuple.get_str (Tuple::Genre);
- fieldsSearchField::Artist = tuple.get_str (Tuple::Artist);
- fieldsSearchField::Album = tuple.get_str (Tuple::Album);
- fieldsSearchField::Title = tuple.get_str (Tuple::Title);
-
- Item * parent = nullptr;
- SimpleHash<Key, Item> * hash = & database;
-
- for (auto f : aud::range<SearchField> ())
- {
- if (fieldsf)
- {
- Key key = {f, fieldsf};
- Item * item = hash->lookup (key);
-
- if (! item)
- item = hash->add (key, Item (f, fieldsf, parent));
-
- item->matches.append (e);
-
- /* genre is outside the normal hierarchy */
- if (f != SearchField::Genre)
- {
- parent = item;
- hash = & item->children;
- }
- }
- }
- }
-
- database_valid = true;
-}
-
-static void search_cb (const Key & key, Item & item, void * _state)
-{
- SearchState * state = (SearchState *) _state;
-
- int oldmask = state->mask;
- int count = search_terms.len ();
-
- for (int t = 0, bit = 1; t < count; t ++, bit <<= 1)
- {
- if (! (state->mask & bit))
- continue; /* skip term if it is already found */
-
- if (strstr (item.folded, search_termst))
- state->mask &= ~bit; /* we found it */
- else if (! item.children.n_items ())
- break; /* quit early if there are no children to search */
- }
-
- /* adding an item with exactly one child is redundant, so avoid it */
- if (! state->mask && item.children.n_items () != 1)
- state->items.append (& item);
-
- item.children.iterate (search_cb, state);
-
- state->mask = oldmask;
-}
-
-static int item_compare (const Item * const & a, const Item * const & b, void *)
-{
- if (a->field < b->field)
- return -1;
- if (a->field > b->field)
- return 1;
-
- int val = str_compare (a->name, b->name);
- if (val)
- return val;
-
- if (a->parent)
- return b->parent ? item_compare (a->parent, b->parent, nullptr) : 1;
- else
- return b->parent ? -1 : 0;
-}
-
-static int item_compare_pass1 (const Item * const & a, const Item * const & b, void *)
-{
- if (a->matches.len () > b->matches.len ())
- return -1;
- if (a->matches.len () < b->matches.len ())
- return 1;
-
- return item_compare (a, b, nullptr);
-}
-
-static void do_search ()
-{
- items.clear ();
- hidden_items = 0;
-
- if (! database_valid)
- return;
-
- SearchState state;
-
- /* effectively limits number of search terms to 32 */
- state.mask = (1 << search_terms.len ()) - 1;
-
- database.iterate (search_cb, & state);
-
- items = std::move (state.items);
-
- /* first sort by number of songs per item */
- items.sort (item_compare_pass1, nullptr);
-
- /* limit to items with most songs */
- if (items.len () > MAX_RESULTS)
- {
- hidden_items = items.len () - MAX_RESULTS;
- items.remove (MAX_RESULTS, -1);
- }
-
- /* sort by item type, then item name */
- items.sort (item_compare, nullptr);
-
- selection.remove (0, -1);
- selection.insert (0, items.len ());
- if (items.len ())
- selection0 = true;
-}
-
-static bool filter_cb (const char * filename, void * unused)
-{
- return ! added_table.lookup (String (filename));
-}
-
-static void begin_add (const char * path)
-{
- int list = get_playlist (false, false);
-
- if (list < 0)
- list = create_playlist ();
+ return to_uri (path2);
 
- aud_set_str ("search-tool", "path", path);
-
- StringBuf uri = filename_to_uri (path);
- g_return_if_fail (uri);
-
- if (! g_str_has_suffix (uri, "/"))
- uri.insert (-1, "/");
-
- added_table.clear ();
-
- int entries = aud_playlist_entry_count (list);
-
- for (int entry = 0; entry < entries; entry ++)
- {
- String filename = aud_playlist_entry_get_filename (list, entry);
-
- if (g_str_has_prefix (filename, uri) && ! added_table.lookup (filename))
- {
- aud_playlist_entry_set_selected (list, entry, false);
- added_table.add (filename, true);
- }
- else
- aud_playlist_entry_set_selected (list, entry, true);
- }
-
- aud_playlist_delete_selected (list);
- aud_playlist_remove_failed (list);
-
- Index<PlaylistAddItem> add;
- add.append (String (uri));
- aud_playlist_entry_insert_filtered (list, -1, std::move (add), filter_cb, nullptr, false);
-
- adding = true;
+ return to_uri (g_get_home_dir ());
 }
 
 static void show_hide_widgets ()
 {
- if (playlist_id < 0)
+ if (s_library->playlist () == Playlist ())
 {
 gtk_widget_hide (wait_label);
 gtk_widget_hide (scrolled);
@@ -368,7 +118,7 @@
 {
 gtk_widget_hide (help_label);
 
- if (database_valid)
+ if (s_library->is_ready ())
 {
 gtk_widget_hide (wait_label);
 gtk_widget_show (scrolled);
@@ -383,55 +133,53 @@
 }
 }
 
-static int search_timeout (void * unused = nullptr)
+static void search_timeout ()
 {
- do_search ();
+ const char * text = gtk_entry_get_text ((GtkEntry *) entry);
+ auto terms = str_list_to_index (str_tolower_utf8 (text), " ");
+ s_model.do_search (terms, aud_get_int (CFG_ID, "max_results"));
 
- audgui_list_delete_rows (results_list, 0, audgui_list_row_count (results_list));
- audgui_list_insert_rows (results_list, 0, items.len ());
+ int shown = s_model.num_items ();
+ int hidden = s_model.num_hidden_items ();
+ int total = shown + hidden;
 
- int total = items.len () + hidden_items;
- StringBuf stats = str_printf (dngettext (PACKAGE, "%d result",
- "%d results", total), total);
+ s_selection.clear ();
+ s_selection.insert (0, shown);
+ if (shown)
+ s_selection0 = true;
 
- if (hidden_items)
- {
- stats.insert (-1, " ");
- stats.combine (str_printf (dngettext (PACKAGE, "(%d hidden)",
- "(%d hidden)", hidden_items), hidden_items));
- }
-
- gtk_label_set_text ((GtkLabel *) stats_label, stats);
+ audgui_list_delete_rows (results_list, 0, audgui_list_row_count (results_list));
+ audgui_list_insert_rows (results_list, 0, shown);
 
- if (search_source)
- {
- g_source_remove (search_source);
- search_source = 0;
- }
+ if (hidden)
+ gtk_label_set_text ((GtkLabel *) stats_label,
+ str_printf (dngettext (PACKAGE, "%d of %d result shown",
+ "%d of %d results shown", total), shown, total));
+ else
+ gtk_label_set_text ((GtkLabel *) stats_label,
+ str_printf (dngettext (PACKAGE, "%d result", "%d results", total), total));
 
- return false;
+ s_search_timer.stop ();
+ s_search_pending = false;
 }
 
-static void schedule_search ()
+static void trigger_search ()
 {
- if (search_source)
- g_source_remove (search_source);
-
- search_source = g_timeout_add (SEARCH_DELAY, search_timeout, nullptr);
+ s_search_timer.queue (SEARCH_DELAY, search_timeout);
+ s_search_pending = true;
 }
 
-static void update_database ()
+void Library::signal_update ()
 {
- int list = get_playlist (true, true);
-
- if (list >= 0)
+ if (s_library->is_ready ())
 {
- create_database (list);
+ s_model.create_database (s_library->playlist ());
 search_timeout ();
 }
 else
 {
- destroy_database ();
+ s_model.destroy_database ();
+ s_selection.clear ();
 audgui_list_delete_rows (results_list, 0, audgui_list_row_count (results_list));
 gtk_label_set_text ((GtkLabel *) stats_label, "");
 }
@@ -439,194 +187,144 @@
 show_hide_widgets ();
 }
 
-static void add_complete_cb (void * unused, void * unused2)
-{
- int list = get_playlist (true, false);
- if (list < 0)
- return;
-
- if (adding)
- {
- adding = false;
- added_table.clear ();
- aud_playlist_sort_by_scheme (list, Playlist::Path);
- }
-
- if (! database_valid && ! aud_playlist_update_pending (list))
- update_database ();
-}
-
-static void scan_complete_cb (void * unused, void * unused2)
-{
- int list = get_playlist (true, true);
- if (list < 0)
- return;
-
- if (! database_valid && ! aud_playlist_update_pending (list))
- update_database ();
-}
-
-static void playlist_update_cb (void * data, void * unused)
-{
- if (! database_valid)
- update_database ();
- else
- {
- int list = get_playlist (true, true);
- if (list < 0 || aud_playlist_update_detail (list).level >= Playlist::Metadata)
- update_database ();
- }
-}
-
 static void search_init ()
 {
- find_playlist ();
+ s_library = new Library;
 
- update_database ();
+ if (aud_get_bool (CFG_ID, "rescan_on_startup"))
+ s_library->begin_add (get_uri ());
 
- hook_associate ("playlist add complete", add_complete_cb, nullptr);
- hook_associate ("playlist scan complete", scan_complete_cb, nullptr);
- hook_associate ("playlist update", playlist_update_cb, nullptr);
+ s_library->check_ready_and_update (true);
 }
 
 static void search_cleanup ()
 {
- hook_dissociate ("playlist add complete", add_complete_cb);
- hook_dissociate ("playlist scan complete", scan_complete_cb);
- hook_dissociate ("playlist update", playlist_update_cb);
+ s_search_timer.stop ();
+ s_search_pending = false;
 
- if (search_source)
- {
- g_source_remove (search_source);
- search_source = 0;
- }
+ delete s_library;
+ s_library = nullptr;
 
- search_terms.clear ();
- items.clear ();
- selection.clear ();
-
- added_table.clear ();
- destroy_database ();
+ s_model.destroy_database ();
+ s_selection.clear ();
 }
 
-static void do_add (gboolean play, String & title)
+static void do_add (bool play, bool set_title)
 {
- if (search_source)
+ if (s_search_pending)
 search_timeout ();
 
- int list = aud_playlist_by_unique_id (playlist_id);
- int n_items = items.len ();
+ auto list = s_library->playlist ();
+ int n_items = s_model.num_items ();
 int n_selected = 0;
 
 Index<PlaylistAddItem> add;
+ String title;
 
 for (int i = 0; i < n_items; i ++)
 {
- if (! selectioni)
+ if (! s_selectioni)
 continue;
 
- const Item * item = itemsi;
+ auto & item = s_model.item_at (i);
 
- for (int entry : item->matches)
+ for (int entry : item.matches)
 {
 add.append (
- aud_playlist_entry_get_filename (list, entry),
- aud_playlist_entry_get_tuple (list, entry, Playlist::Guess)
+ list.entry_filename (entry),
+ list.entry_tuple (entry, Playlist::NoWait),
+ list.entry_decoder (entry, Playlist::NoWait)
 );
 }
 
 n_selected ++;
 if (n_selected == 1)
- title = item->name;
+ title = item.name;
 }
 
- if (n_selected != 1)
- title = String ();
+ auto list2 = Playlist::active_playlist ();
+ list2.insert_items (-1, std::move (add), play);
 
- aud_playlist_entry_insert_batch (aud_playlist_get_active (), -1, std::move (add), play);
+ if (set_title && n_selected == 1)
+ list2.set_title (title);
 }
 
 static void action_play ()
 {
- int list = aud_playlist_get_temporary ();
- aud_playlist_set_active (list);
-
- if (aud_get_bool (nullptr, "clear_playlist"))
- aud_playlist_entry_delete (list, 0, aud_playlist_entry_count (list));
- else
- aud_playlist_queue_delete (list, 0, aud_playlist_queue_count (list));
-
- String title;
- do_add (true, title);
+ Playlist::temporary_playlist ().activate ();
+ do_add (true, false);
 }
 
 static void action_create_playlist ()
 {
- aud_playlist_insert (-1);
- aud_playlist_set_active (aud_playlist_count () - 1);
-
- String title;
- do_add (false, title);
-
- if (title)
- aud_playlist_set_title (aud_playlist_count () - 1, title);
+ Playlist::new_playlist ();
+ do_add (false, true);
 }
 
 static void action_add_to_playlist ()
 {
- if (aud_playlist_by_unique_id (playlist_id) == aud_playlist_get_active ())
- return;
-
- String title;
- do_add (false, title);
+ if (s_library->playlist () != Playlist::active_playlist ())
+ do_add (false, false);
 }
 
 static void list_get_value (void * user, int row, int column, GValue * value)
 {
- g_return_if_fail (row >= 0 && row < items.len ());
+ auto escape = (const char * s)
+ { return CharPtr (g_markup_escape_text (s, -1)); };
 
- const Item * item = itemsrow;
- StringBuf string = str_concat ({item->name, "\n"});
+ g_return_if_fail (row >= 0 && row < s_model.num_items ());
 
- if (item->field != SearchField::Title)
+ auto & item = s_model.item_at (row);
+
+ CharPtr name = escape ((item.field == SearchField::Genre) ?
+ str_toupper_utf8 (item.name) : item.name);
+
+ StringBuf desc (0);
+
+ if (item.field != SearchField::Title)
 {
- string.insert (-1, " ");
- string.combine (str_printf (dngettext (PACKAGE, "%d song", "%d songs",
- item->matches.len ()), item->matches.len ()));
+ desc.insert (-1, " ");
+ str_append_printf (desc, dngettext (PACKAGE, "%d song", "%d songs",
+ item.matches.len ()), item.matches.len ());
 }
 
- if (item->field == SearchField::Genre)
+ if (item.field == SearchField::Genre)
 {
- string.insert (-1, " ");
- string.insert (-1, _("of this genre"));
+ desc.insert (-1, " ");
+ desc.insert (-1, _("of this genre"));
 }
-
- while ((item = item->parent))
+ else if (item.parent)
 {
- string.insert (-1, " ");
- string.insert (-1, (item->field == SearchField::Album) ? _("on") : _("by"));
- string.insert (-1, " ");
- string.insert (-1, item->name);
+ auto parent = (item.parent->parent ? item.parent->parent : item.parent);
+
+ desc.insert (-1, " ");
+ desc.insert (-1, parent_prefix (parent->field));
+ desc.insert (-1, " ");
+ desc.insert (-1, start_tagsparent->field);
+ desc.insert (-1, escape (parent->name));
+ desc.insert (-1, end_tagsparent->field);
 }
 
- g_value_set_string (value, string);
+ g_value_take_string (value, g_strdup_printf
+ ("%s%s%s\n%s", start_tagsitem.field, (const char *) name,
+ end_tagsitem.field, (const char *) desc));
 }
 
 static bool list_get_selected (void * user, int row)
 {
- g_return_val_if_fail (row >= 0 && row < selection.len (), false);
- return selectionrow;
+ g_return_val_if_fail (row >= 0 && row < s_selection.len (), false);
+ return s_selectionrow;
 }
 
 static void list_set_selected (void * user, int row, bool selected)
 {
- g_return_if_fail (row >= 0 && row < selection.len ());
- selectionrow = selected;
+ g_return_if_fail (row >= 0 && row < s_selection.len ());
+ s_selectionrow = selected;
 }
 
 static void list_select_all (void * user, bool selected)
 {
- for (bool & s : selection)
+ for (bool & s : s_selection)
 s = selected;
 }
 
@@ -648,7 +346,47 @@
 
 GtkWidget * menu = gtk_menu_new ();
 audgui_menu_init (menu, {items}, nullptr);
+
+#if GTK_CHECK_VERSION(3, 22, 0)
+ gtk_menu_popup_at_pointer ((GtkMenu *) menu, (const GdkEvent *) event);
+#else
 gtk_menu_popup ((GtkMenu *) menu, nullptr, nullptr, nullptr, nullptr, event->button, event->time);
+#endif
+}
+
+static Index<char> list_get_data (void * user)
+{
+ if (s_search_pending)
+ search_timeout ();
+
+ auto list = s_library->playlist ();
+ int n_items = s_model.num_items ();
+ Index<char> buf;
+
+ list.select_all (false);
+
+ for (int i = 0; i < n_items; i ++)
+ {
+ if (! s_selectioni)
+ continue;
+
+ auto & item = s_model.item_at (i);
+
+ for (int entry : item.matches)
+ {
+ if (buf.len ())
+ buf.append ('\n');
+
+ String filename = list.entry_filename (entry);
+ buf.insert (filename, -1, strlen (filename));
+
+ list.select_entry (entry, true);
+ }
+ }
+
+ list.cache_selected ();
+
+ return buf;
 }
 
 static const AudguiListCallbacks list_callbacks = {
@@ -657,87 +395,114 @@
 list_set_selected,
 list_select_all,
 list_activate_row,
- list_right_click
+ list_right_click,
+ nullptr, // shift_rows
+ "text/uri-list",
+ list_get_data,
+ nullptr // receive_data
 };
 
 static void entry_cb (GtkEntry * entry, void * unused)
 {
- set_search_phrase (gtk_entry_get_text ((GtkEntry *) entry));
- schedule_search ();
+ s_search_timer.queue (SEARCH_DELAY, search_timeout);
+ s_search_pending = true;
+}
+
+static void file_entry_cb (GtkEntry * entry, GtkWidget * button)
+{
+ const char * text = gtk_entry_get_text ((GtkEntry *) entry);
+ gtk_widget_set_sensitive (button, text0 != 0);
 }
 
-static void refresh_cb (GtkButton * button, GtkWidget * chooser)
+static void refresh_cb (GtkButton * button, GtkWidget * file_entry)
 {
- char * path = gtk_file_chooser_get_filename ((GtkFileChooser *) chooser);
- begin_add (path);
- g_free (path);
+ String uri = audgui_file_entry_get_uri (file_entry);
+ if (uri)
+ {
+ audgui_file_entry_set_uri (file_entry, uri); // normalize path
+ /* if possible, store local path for compatibility with older versions */
+ StringBuf path = uri_to_filename (uri);
+ aud_set_str (CFG_ID, "path", path ? path : uri);
 
- update_database ();
+ s_library->begin_add (uri);
+ s_library->check_ready_and_update (true);
+ }
+}
+
+bool SearchTool::init ()
+{
+ aud_config_set_defaults (CFG_ID, defaults);
+ return true;
 }
 
 void * SearchTool::get_gtk_widget ()
 {
- GtkWidget * vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
+ GtkWidget * vbox = audgui_vbox_new (6);
 
 entry = gtk_entry_new ();
 gtk_entry_set_icon_from_icon_name ((GtkEntry *) entry, GTK_ENTRY_ICON_PRIMARY, "edit-find");
+#ifdef USE_GTK3
 gtk_entry_set_placeholder_text ((GtkEntry *) entry, _("Search library"));
+#endif
 g_signal_connect (entry, "destroy", (GCallback) gtk_widget_destroyed, & entry);
- gtk_box_pack_start ((GtkBox *) vbox, entry, FALSE, FALSE, 0);
+ gtk_box_pack_start ((GtkBox *) vbox, entry, false, false, 0);
 
 help_label = gtk_label_new (_("To import your music library into "
 "Audacious, choose a folder and then click the \"refresh\" icon."));
- gtk_widget_set_size_request (help_label, 194, -1);
- gtk_label_set_line_wrap ((GtkLabel *) help_label, TRUE);
+ int label_width = aud::rescale (audgui_get_dpi (), 4, 7);
+ gtk_widget_set_size_request (help_label, label_width, -1);
+ gtk_label_set_line_wrap ((GtkLabel *) help_label, true);
 g_signal_connect (help_label, "destroy", (GCallback) gtk_widget_destroyed, & help_label);
- gtk_widget_set_no_show_all (help_label, TRUE);
- gtk_box_pack_start ((GtkBox *) vbox, help_label, TRUE, FALSE, 0);
+ gtk_widget_set_no_show_all (help_label, true);
+ gtk_box_pack_start ((GtkBox *) vbox, help_label, true, false, 0);
 
 wait_label = gtk_label_new (_("Please wait ..."));
 g_signal_connect (wait_label, "destroy", (GCallback) gtk_widget_destroyed, & wait_label);
- gtk_widget_set_no_show_all (wait_label, TRUE);
- gtk_box_pack_start ((GtkBox *) vbox, wait_label, TRUE, FALSE, 0);
+ gtk_widget_set_no_show_all (wait_label, true);
+ gtk_box_pack_start ((GtkBox *) vbox, wait_label, true, false, 0);
 
 scrolled = gtk_scrolled_window_new (nullptr, nullptr);
 g_signal_connect (scrolled, "destroy", (GCallback) gtk_widget_destroyed, & scrolled);
 gtk_scrolled_window_set_shadow_type ((GtkScrolledWindow *) scrolled, GTK_SHADOW_IN);
 gtk_scrolled_window_set_policy ((GtkScrolledWindow *) scrolled,
 GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
- gtk_widget_set_no_show_all (scrolled, TRUE);
- gtk_box_pack_start ((GtkBox *) vbox, scrolled, TRUE, TRUE, 0);
+ gtk_widget_set_no_show_all (scrolled, true);
+ gtk_box_pack_start ((GtkBox *) vbox, scrolled, true, true, 0);
 
- results_list = audgui_list_new (& list_callbacks, nullptr, items.len ());
+ results_list = audgui_list_new (& list_callbacks, nullptr, 0);
 g_signal_connect (results_list, "destroy", (GCallback) gtk_widget_destroyed, & results_list);
- gtk_tree_view_set_headers_visible ((GtkTreeView *) results_list, FALSE);
- audgui_list_add_column (results_list, nullptr, 0, G_TYPE_STRING, -1);
+ gtk_tree_view_set_headers_visible ((GtkTreeView *) results_list, false);
+ audgui_list_add_column (results_list, nullptr, 0, G_TYPE_STRING, -1, true);
 gtk_container_add ((GtkContainer *) scrolled, results_list);
 
 stats_label = gtk_label_new ("");
 g_signal_connect (stats_label, "destroy", (GCallback) gtk_widget_destroyed, & stats_label);
- gtk_widget_set_no_show_all (stats_label, TRUE);
- gtk_box_pack_start ((GtkBox *) vbox, stats_label, FALSE, FALSE, 0);
+ gtk_widget_set_no_show_all (stats_label, true);
+ gtk_box_pack_start ((GtkBox *) vbox, stats_label, false, false, 0);
 
- GtkWidget * hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
- gtk_box_pack_end ((GtkBox *) vbox, hbox, FALSE, FALSE, 0);
+ GtkWidget * hbox = audgui_hbox_new (6);
+ gtk_box_pack_end ((GtkBox *) vbox, hbox, false, false, 0);
 
- GtkWidget * chooser = gtk_file_chooser_button_new (_("Choose Folder"),
- GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER);
- gtk_box_pack_start ((GtkBox *) hbox, chooser, TRUE, TRUE, 0);
+ GtkWidget * file_entry = audgui_file_entry_new
+ (GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER, _("Choose Folder"));
+ gtk_box_pack_start ((GtkBox *) hbox, file_entry, true, true, 0);
 
- gtk_file_chooser_set_filename ((GtkFileChooser *) chooser, get_path ());
+ audgui_file_entry_set_uri (file_entry, get_uri ());
 
 GtkWidget * button = gtk_button_new ();
 gtk_container_add ((GtkContainer *) button, gtk_image_new_from_icon_name
- ("view-refresh", GTK_ICON_SIZE_BUTTON));
+ ("view-refresh", GTK_ICON_SIZE_MENU));
 gtk_button_set_relief ((GtkButton *) button, GTK_RELIEF_NONE);
- gtk_box_pack_start ((GtkBox *) hbox, button, FALSE, FALSE, 0);
+ gtk_box_pack_start ((GtkBox *) hbox, button, false, false, 0);
 
 search_init ();
 
 g_signal_connect (vbox, "destroy", (GCallback) search_cleanup, nullptr);
 g_signal_connect (entry, "changed", (GCallback) entry_cb, nullptr);
 g_signal_connect (entry, "activate", (GCallback) action_play, nullptr);
- g_signal_connect (button, "clicked", (GCallback) refresh_cb, chooser);
+ g_signal_connect (file_entry, "changed", (GCallback) file_entry_cb, button);
+ g_signal_connect (file_entry, "activate", (GCallback) refresh_cb, file_entry);
+ g_signal_connect (button, "clicked", (GCallback) refresh_cb, file_entry);
 
 gtk_widget_show_all (vbox);
 gtk_widget_show (results_list);
@@ -746,7 +511,7 @@
 return vbox;
 }
 
-int SearchTool::take_message (const char * code, const void * data, int size)
+int SearchTool::take_message (const char * code, const void *, int)
 {
 if (! strcmp (code, "grab focus"))
 {

audacious-plugins-3.6.2-gtk3.tar.bz2/src/sid/Makefile -> audacious-plugins-4.4.1.tar.bz2/src/sid/Makefile Changed

audacious-plugins-4.4.1.tar.bz2/src/sid/meson.build Added

audacious-plugins-3.6.2-gtk3.tar.bz2/src/sid/xmms-sid.cc -> audacious-plugins-4.4.1.tar.bz2/src/sid/xmms-sid.cc Changed

@@ -46,21 +46,25 @@
 & sid_prefs
 };
 
- static constexpr auto iinfo = InputInfo(FlagSubtunes)
+ constexpr SIDPlugin() : InputPlugin(info, InputInfo(FlagSubtunes)
 .with_priority(5) /* medium priority (slow to initialize) */
- .with_exts(exts);
+ .with_exts(exts)) {}
 
- constexpr SIDPlugin() : InputPlugin(info, iinfo) {}
+ bool init()
+ {
+ xs_init_configuration();
+ return true;
+ }
 
- bool delayed_init();
 void cleanup();
 
 bool is_our_file(const char *filename, VFSFile &file);
- Tuple read_tuple(const char *filename, VFSFile &file);
+ bool read_tag(const char *filename, VFSFile &file, Tuple &tuple, Index<char> *image);
 bool play(const char *filename, VFSFile &file);
 
 private:
- pthread_mutex_t m_init_mutex = PTHREAD_MUTEX_INITIALIZER;
+ bool delayed_init();
+
 bool m_initialized = false;
 bool m_init_failed = false;
 };
@@ -69,25 +73,24 @@
 
 static void xs_get_song_tuple_info(Tuple &pResult, const xs_tuneinfo_t &info, int subTune);
 
+static pthread_mutex_t s_init_mutex = PTHREAD_MUTEX_INITIALIZER;
+
 /*
 * Initialization functions
 */
 bool SIDPlugin::delayed_init()
 {
- pthread_mutex_lock(&m_init_mutex);
+ pthread_mutex_lock(&s_init_mutex);
 
 if (!m_initialized && !m_init_failed)
 {
- /* Initialize and get configuration */
- xs_init_configuration();
-
 /* Try to initialize emulator engine */
 m_initialized = xs_sidplayfp_init();
 if (!m_initialized)
 m_init_failed = true;
 }
 
- pthread_mutex_unlock(&m_init_mutex);
+ pthread_mutex_unlock(&s_init_mutex);
 return m_initialized;
 }
 
@@ -136,7 +139,7 @@
 
 /* Get tune information */
 xs_tuneinfo_t info;
- if (!xs_sidplayfp_getinfo(info, filename, buf.begin(), buf.len()))
+ if (!xs_sidplayfp_getinfo(info, buf.begin(), buf.len()))
 return false;
 
 /* Initialize the tune */
@@ -153,25 +156,17 @@
 /* Check minimum playtime */
 int tmpLength = info.subTunessubTune - 1.tuneLength;
 if (xs_cfg.playMinTimeEnable && (tmpLength >= 0)) {
- if (tmpLength < xs_cfg.playMinTime)
- tmpLength = xs_cfg.playMinTime;
+ if (tmpLength < xs_cfg.playMinTime * 1000)
+ tmpLength = xs_cfg.playMinTime * 1000;
 }
 
 /* Initialize song */
 if (!xs_sidplayfp_initsong(subTune)) {
 AUDERR("Couldn't initialize SID-tune '%s' (sub-tune #%i)!\n",
- (const char *) info.sidFilename, subTune);
+ filename, subTune);
 return false;
 }
 
- /* Set song information for current subtune */
- xs_sidplayfp_updateinfo(info, subTune);
-
- Tuple tmpTuple;
- tmpTuple.set_filename(info.sidFilename);
- xs_get_song_tuple_info(tmpTuple, info, subTune);
- set_playback_tuple(std::move(tmpTuple));
-
 /* Open the audio output */
 open_audio(FMT_S16_NE, xs_cfg.audioFrequency, xs_cfg.audioChannels);
 
@@ -209,7 +204,7 @@
 }
 
 if (tmpLength >= 0) {
- if (time_played >= tmpLength * 1000)
+ if (time_played >= tmpLength)
 break;
 }
 }
@@ -230,43 +225,13 @@
 tuple.set_str (Tuple::Copyright, info.sidCopyright);
 tuple.set_str (Tuple::Codec, info.sidFormat);
 
-#if 0
- switch (info.sidModel) {
- case XS_SIDMODEL_6581: tmpStr = "6581"; break;
- case XS_SIDMODEL_8580: tmpStr = "8580"; break;
- case XS_SIDMODEL_ANY: tmpStr = "ANY"; break;
- default: tmpStr = "?"; break;
- }
- tuple_set_str(tuple, -1, "sid-model", tmpStr);
-#endif
-
 /* Get sub-tune information, if available */
 if (subTune < 0 || info.startTune > info.nsubTunes)
 subTune = info.startTune;
 
 if (subTune > 0 && subTune <= info.nsubTunes) {
 int tmpInt = info.subTunessubTune - 1.tuneLength;
- tuple.set_int (Tuple::Length, (tmpInt < 0) ? -1 : tmpInt * 1000);
-
-#if 0
- tmpInt = info.subTunessubTune - 1.tuneSpeed;
- if (tmpInt > 0) {
- switch (tmpInt) {
- case XS_CLOCK_PAL: tmpStr = "PAL"; break;
- case XS_CLOCK_NTSC: tmpStr = "NTSC"; break;
- case XS_CLOCK_ANY: tmpStr = "ANY"; break;
- case XS_CLOCK_VBI: tmpStr = "VBI"; break;
- case XS_CLOCK_CIA: tmpStr = "CIA"; break;
- default:
- snprintf(tmpStr2, sizeof(tmpStr2), "%dHz", tmpInt);
- tmpStr = tmpStr2;
- break;
- }
- } else
- tmpStr = "?";
-
- tuple_set_str(tuple, -1, "sid-speed", tmpStr);
-#endif
+ tuple.set_int (Tuple::Length, (tmpInt < 0) ? -1 : tmpInt);
 } else
 subTune = 1;
 
@@ -278,46 +243,41 @@
 
 static void xs_fill_subtunes(Tuple &tuple, const xs_tuneinfo_t &info)
 {
- Index<int> subtunes;
+ Index<short> subtunes;
 
 for (int count = 0; count < info.nsubTunes; count++) {
 if (count + 1 == info.startTune || !xs_cfg.subAutoMinOnly ||
 info.subTunescount.tuneLength < 0 ||
- info.subTunescount.tuneLength >= xs_cfg.subAutoMinTime)
+ info.subTunescount.tuneLength >= xs_cfg.subAutoMinTime * 1000)
 subtunes.append (count + 1);
 }
 
 tuple.set_subtunes (subtunes.len (), subtunes.begin ());
 }
 
-Tuple SIDPlugin::read_tuple(const char *filename, VFSFile &file)
+bool SIDPlugin::read_tag(const char *filename, VFSFile &file, Tuple &tuple, Index<char> *image)
 {
- Tuple tuple;
-
 if (!delayed_init())
- return tuple;
-
- xs_tuneinfo_t info;
- int tune = -1;
+ return false;
 
 Index<char> buf = file.read_all ();
 if (!xs_sidplayfp_probe(buf.begin(), buf.len()))
- return tuple;
+ return false;
 
 /* Get information from URL */
- tuple.set_filename (filename);
- tune = tuple.get_int (Tuple::Subtune);
+ int tune = tuple.get_int (Tuple::Subtune);
 
 /* Get tune information from emulation engine */
- if (!xs_sidplayfp_getinfo(info, filename, buf.begin(), buf.len()))
- return tuple;
+ xs_tuneinfo_t info;
+ if (!xs_sidplayfp_getinfo(info, buf.begin(), buf.len()))
+ return false;
 
 xs_get_song_tuple_info(tuple, info, tune);
 
 if (xs_cfg.subAutoEnable && info.nsubTunes > 1 && tune < 0)
 xs_fill_subtunes(tuple, info);
 
- return tuple;
+ return true;
 }
 
 /*

audacious-plugins-3.6.2-gtk3.tar.bz2/src/sid/xmms-sid.h -> audacious-plugins-4.4.1.tar.bz2/src/sid/xmms-sid.h Changed

audacious-plugins-3.6.2-gtk3.tar.bz2/src/sid/xs_config.cc -> audacious-plugins-4.4.1.tar.bz2/src/sid/xs_config.cc Changed

audacious-plugins-3.6.2-gtk3.tar.bz2/src/sid/xs_config.h -> audacious-plugins-4.4.1.tar.bz2/src/sid/xs_config.h Changed

audacious-plugins-3.6.2-gtk3.tar.bz2/src/sid/xs_sidplay2.cc -> audacious-plugins-4.4.1.tar.bz2/src/sid/xs_sidplay2.cc Changed

@@ -140,9 +140,9 @@
 }
 
 /* Load ROMs */
- VFSFile kernal_file("file://" SIDDATADIR "sidplayfp/kernal", "r");
- VFSFile basic_file("file://" SIDDATADIR "sidplayfp/basic", "r");
- VFSFile chargen_file("file://" SIDDATADIR "sidplayfp/chargen", "r");
+ VFSFile kernal_file("file://" SIDDATADIR "/sidplayfp/kernal", "r");
+ VFSFile basic_file("file://" SIDDATADIR "/sidplayfp/basic", "r");
+ VFSFile chargen_file("file://" SIDDATADIR "/sidplayfp/chargen", "r");
 
 if (kernal_file && basic_file && chargen_file)
 {
@@ -155,7 +155,7 @@
 }
 
 /* Load song length database */
- state.database_loaded = state.database.open(SIDDATADIR "sidplayfp/Songlengths.txt");
+ state.database_loaded = state.database.open(SIDDATADIR "/sidplayfp/Songlengths.md5");
 
 /* Create the sidtune */
 state.currTune = new SidTune(0);
@@ -226,7 +226,7 @@
 }
 
 
-bool xs_sidplayfp_getinfo(xs_tuneinfo_t &ti, const char *filename, const void *buf, int64_t bufSize)
+bool xs_sidplayfp_getinfo(xs_tuneinfo_t &ti, const void *buf, int64_t bufSize)
 {
 /* Check if the tune exists and is readable */
 SidTune myTune((const uint8_t*)buf, bufSize);
@@ -238,8 +238,6 @@
 const SidTuneInfo *myInfo = myTune.getInfo();
 
 /* Allocate tuneinfo structure and set information */
- ti.sidFilename = String (filename);
-
 ti.sidName = String (myInfo->infoString(0));
 ti.sidComposer = String (myInfo->infoString(1));
 ti.sidCopyright = String (myInfo->infoString(2));
@@ -247,14 +245,8 @@
 ti.nsubTunes = myInfo->songs();
 ti.startTune = myInfo->startSong();
 
- ti.loadAddr = myInfo->loadAddr();
- ti.initAddr = myInfo->initAddr();
- ti.playAddr = myInfo->playAddr();
- ti.dataFileLen = myInfo->dataFileLen();
 ti.sidFormat = String (myInfo->formatString());
 
- ti.sidModel = myInfo->sidModel1();
-
 /* Fill in subtune information */
 ti.subTunes.insert(0, ti.nsubTunes);
 
@@ -265,7 +257,7 @@
 for (int i = 0; i < ti.nsubTunes; i++)
 {
 myTune.selectSong(i + 1);
- ti.subTunesi.tuneLength = state.database.length(myTune);
+ ti.subTunesi.tuneLength = state.database.lengthMs(myTune);
 }
 
 pthread_mutex_unlock(&state.database_mutex);
@@ -273,50 +265,3 @@
 
 return true;
 }
-
-bool xs_sidplayfp_updateinfo(xs_tuneinfo_t &ti, int subtune)
-{
- /* Get currently playing tune information */
- const SidTuneInfo *myInfo = state.currTune->getInfo();
-
- /* NOTICE! Here we assume that libSIDPlay12 headers define
- * SIDTUNE_SIDMODEL_* similarly to our enums in xs_config.h ...
- */
- ti.sidModel = myInfo->sidModel1();
-
- if ((subtune > 0) && (subtune <= ti.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;
- }
- break;
- default:
- tmpSpeed = myInfo->clockSpeed();
- break;
- }
-
- ti.subTunessubtune - 1.tuneSpeed = tmpSpeed;
- }
-
- return true;
-}

audacious-plugins-3.6.2-gtk3.tar.bz2/src/sid/xs_sidplay2.h -> audacious-plugins-4.4.1.tar.bz2/src/sid/xs_sidplay2.h Changed

audacious-plugins-4.4.1.tar.bz2/src/silence-removal/meson.build Added

audacious-plugins-4.4.1.tar.bz2/src/skins-data Added

audacious-plugins-4.4.1.tar.bz2/src/skins-data/Makefile Added

@@ -0,0 +1,124 @@
+include ../../buildsys.mk
+include ../../extra.mk
+
+# These overrides variables in buildsys.mk and so must come after it.
+PACKAGE_NAME = audacious
+DATA = Skins/Classic/balance.png	\
+       Skins/Classic/cbuttons.png	\
+       Skins/Classic/eq_ex.png		\
+       Skins/Classic/eqmain.png		\
+       Skins/Classic/main.png		\
+       Skins/Classic/monoster.png	\
+       Skins/Classic/nums_ex.png	\
+       Skins/Classic/playpaus.png	\
+       Skins/Classic/pledit.png		\
+       Skins/Classic/pledit.txt		\
+       Skins/Classic/posbar.png		\
+       Skins/Classic/shufrep.png	\
+       Skins/Classic/skin-classic.hints	\
+       Skins/Classic/skin.hints		\
+       Skins/Classic/text.png		\
+       Skins/Classic/titlebar.png	\
+       Skins/Classic/viscolor.txt	\
+       Skins/Classic/volume.png		\
+       Skins/Classic1.3/balance.png	\
+       Skins/Classic1.3/cbuttons.png	\
+       Skins/Classic1.3/eq_ex.png		\
+       Skins/Classic1.3/eqmain.png		\
+       Skins/Classic1.3/main.png		\
+       Skins/Classic1.3/monoster.png	\
+       Skins/Classic1.3/nums_ex.png	\
+       Skins/Classic1.3/playpaus.png	\
+       Skins/Classic1.3/pledit.png		\
+       Skins/Classic1.3/pledit.txt		\
+       Skins/Classic1.3/posbar.png		\
+       Skins/Classic1.3/shufrep.png	\
+       Skins/Classic1.3/skin-classic.hints	\
+       Skins/Classic1.3/skin.hints		\
+       Skins/Classic1.3/text.png		\
+       Skins/Classic1.3/titlebar.png	\
+       Skins/Classic1.3/viscolor.txt	\
+       Skins/Classic1.3/volume.png		\
+       Skins/Default/cbuttons.png	\
+       Skins/Default/eq_ex.png		\
+       Skins/Default/eqmain.png		\
+       Skins/Default/main.png		\
+       Skins/Default/monoster.png	\
+       Skins/Default/nums_ex.png	\
+       Skins/Default/playpaus.png	\
+       Skins/Default/pledit.png		\
+       Skins/Default/pledit.txt		\
+       Skins/Default/posbar.png		\
+       Skins/Default/shufrep.png	\
+       Skins/Default/skin.hints		\
+       Skins/Default/text.png		\
+       Skins/Default/titlebar.png	\
+       Skins/Default/viscolor.txt	\
+       Skins/Default/volume.png		\
+       Skins/Ivory/balance.png		\
+       Skins/Ivory/cbuttons.png		\
+       Skins/Ivory/eq_ex.png		\
+       Skins/Ivory/eqmain.png		\
+       Skins/Ivory/main.png		\
+       Skins/Ivory/monoster.png		\
+       Skins/Ivory/nums_ex.png		\
+       Skins/Ivory/playpaus.png		\
+       Skins/Ivory/pledit.png		\
+       Skins/Ivory/pledit.txt		\
+       Skins/Ivory/posbar.png		\
+       Skins/Ivory/shufrep.png		\
+       Skins/Ivory/skin.hints		\
+       Skins/Ivory/text.png		\
+       Skins/Ivory/titlebar.png		\
+       Skins/Ivory/viscolor.txt		\
+       Skins/Ivory/volume.png		\
+       Skins/Osmosis/balance.png	\
+       Skins/Osmosis/cbuttons.png	\
+       Skins/Osmosis/eq_ex.png		\
+       Skins/Osmosis/eqmain.png		\
+       Skins/Osmosis/main.png		\
+       Skins/Osmosis/monoster.png	\
+       Skins/Osmosis/nums_ex.png	\
+       Skins/Osmosis/playpaus.png	\
+       Skins/Osmosis/pledit.png		\
+       Skins/Osmosis/pledit.txt		\
+       Skins/Osmosis/posbar.png		\
+       Skins/Osmosis/shufrep.png	\
+       Skins/Osmosis/skin.hints		\
+       Skins/Osmosis/text.png		\
+       Skins/Osmosis/titlebar.png	\
+       Skins/Osmosis/viscolor.txt	\
+       Skins/Osmosis/volume.png		\
+       Skins/TinyPlayer/balance.png	\
+       Skins/TinyPlayer/cbuttons.png	\
+       Skins/TinyPlayer/eq_ex.png	\
+       Skins/TinyPlayer/eqmain.png	\
+       Skins/TinyPlayer/main.png	\
+       Skins/TinyPlayer/monoster.png	\
+       Skins/TinyPlayer/nums_ex.png	\
+       Skins/TinyPlayer/playpaus.png	\
+       Skins/TinyPlayer/pledit.png	\
+       Skins/TinyPlayer/pledit.txt	\
+       Skins/TinyPlayer/posbar.png	\
+       Skins/TinyPlayer/shufrep.png	\
+       Skins/TinyPlayer/skin.hints	\
+       Skins/TinyPlayer/text.png	\
+       Skins/TinyPlayer/titlebar.png	\
+       Skins/TinyPlayer/viscolor.txt	\
+       Skins/TinyPlayer/volume.png	\
+       Skins/Refugee/cbuttons.png	\
+       Skins/Refugee/eq_ex.png		\
+       Skins/Refugee/eqmain.png		\
+       Skins/Refugee/main.png		\
+       Skins/Refugee/monoster.png	\
+       Skins/Refugee/nums_ex.png	\
+       Skins/Refugee/playpaus.png	\
+       Skins/Refugee/pledit.png		\
+       Skins/Refugee/pledit.txt		\
+       Skins/Refugee/posbar.png		\
+       Skins/Refugee/shufrep.png	\
+       Skins/Refugee/skin.hints		\
+       Skins/Refugee/text.png		\
+       Skins/Refugee/titlebar.png	\
+       Skins/Refugee/viscolor.txt	\
+       Skins/Refugee/volume.png

audacious-plugins-4.4.1.tar.bz2/src/skins-data/Skins Added

audacious-plugins-4.4.1.tar.bz2/src/skins-data/Skins/Classic Added

audacious-plugins-4.4.1.tar.bz2/src/skins-data/Skins/Classic/balance.png Added

audacious-plugins-4.4.1.tar.bz2/src/skins-data/Skins/Classic/cbuttons.png Added

audacious-plugins-4.4.1.tar.bz2/src/skins-data/Skins/Classic/eq_ex.png Added

audacious-plugins-4.4.1.tar.bz2/src/skins-data/Skins/Classic/eqmain.png Added

audacious-plugins-4.4.1.tar.bz2/src/skins-data/Skins/Classic/main.png Added

audacious-plugins-4.4.1.tar.bz2/src/skins-data/Skins/Classic/monoster.png Added

audacious-plugins-4.4.1.tar.bz2/src/skins-data/Skins/Classic/nums_ex.png Added

audacious-plugins-4.4.1.tar.bz2/src/skins-data/Skins/Classic/playpaus.png Added

audacious-plugins-4.4.1.tar.bz2/src/skins-data/Skins/Classic/pledit.png Added

audacious-plugins-4.4.1.tar.bz2/src/skins-data/Skins/Classic/pledit.txt Changed

audacious-plugins-4.4.1.tar.bz2/src/skins-data/Skins/Classic/posbar.png Added

audacious-plugins-4.4.1.tar.bz2/src/skins-data/Skins/Classic/shufrep.png Added

audacious-plugins-4.4.1.tar.bz2/src/skins-data/Skins/Classic/skin-classic.hints Changed

audacious-plugins-4.4.1.tar.bz2/src/skins-data/Skins/Classic/skin.hints Changed

audacious-plugins-4.4.1.tar.bz2/src/skins-data/Skins/Classic/text.png Added

audacious-plugins-4.4.1.tar.bz2/src/skins-data/Skins/Classic/titlebar.png Added

audacious-plugins-4.4.1.tar.bz2/src/skins-data/Skins/Classic/viscolor.txt Changed

audacious-plugins-4.4.1.tar.bz2/src/skins-data/Skins/Classic/volume.png Added

audacious-plugins-4.4.1.tar.bz2/src/skins-data/Skins/Classic1.3 Added

audacious-plugins-4.4.1.tar.bz2/src/skins-data/Skins/Classic1.3/balance.png Added

audacious-plugins-4.4.1.tar.bz2/src/skins-data/Skins/Classic1.3/cbuttons.png Added

audacious-plugins-4.4.1.tar.bz2/src/skins-data/Skins/Classic1.3/eq_ex.png Added

audacious-plugins-4.4.1.tar.bz2/src/skins-data/Skins/Classic1.3/eqmain.png Added

audacious-plugins-4.4.1.tar.bz2/src/skins-data/Skins/Classic1.3/main.png Added

audacious-plugins-4.4.1.tar.bz2/src/skins-data/Skins/Classic1.3/monoster.png Added

audacious-plugins-4.4.1.tar.bz2/src/skins-data/Skins/Classic1.3/nums_ex.png Added

audacious-plugins-4.4.1.tar.bz2/src/skins-data/Skins/Classic1.3/playpaus.png Added

audacious-plugins-4.4.1.tar.bz2/src/skins-data/Skins/Classic1.3/pledit.png Added

audacious-plugins-4.4.1.tar.bz2/src/skins-data/Skins/Classic1.3/pledit.txt Added

audacious-plugins-4.4.1.tar.bz2/src/skins-data/Skins/Classic1.3/posbar.png Added

audacious-plugins-4.4.1.tar.bz2/src/skins-data/Skins/Classic1.3/shufrep.png Added

audacious-plugins-4.4.1.tar.bz2/src/skins-data/Skins/Classic1.3/skin-classic.hints Added

audacious-plugins-4.4.1.tar.bz2/src/skins-data/Skins/Classic1.3/skin.hints Changed

audacious-plugins-4.4.1.tar.bz2/src/skins-data/Skins/Classic1.3/text.png Added

audacious-plugins-4.4.1.tar.bz2/src/skins-data/Skins/Classic1.3/titlebar.png Added

audacious-plugins-4.4.1.tar.bz2/src/skins-data/Skins/Classic1.3/viscolor.txt Changed

audacious-plugins-4.4.1.tar.bz2/src/skins-data/Skins/Classic1.3/volume.png Added

audacious-plugins-4.4.1.tar.bz2/src/skins-data/Skins/Default Added

audacious-plugins-4.4.1.tar.bz2/src/skins-data/Skins/Default/cbuttons.png Added

audacious-plugins-4.4.1.tar.bz2/src/skins-data/Skins/Default/eq_ex.png Added

audacious-plugins-4.4.1.tar.bz2/src/skins-data/Skins/Default/eqmain.png Added

audacious-plugins-4.4.1.tar.bz2/src/skins-data/Skins/Default/main.png Added

audacious-plugins-4.4.1.tar.bz2/src/skins-data/Skins/Default/monoster.png Added

audacious-plugins-4.4.1.tar.bz2/src/skins-data/Skins/Default/nums_ex.png Added

audacious-plugins-4.4.1.tar.bz2/src/skins-data/Skins/Default/playpaus.png Added

audacious-plugins-4.4.1.tar.bz2/src/skins-data/Skins/Default/pledit.png Added

audacious-plugins-4.4.1.tar.bz2/src/skins-data/Skins/Default/pledit.txt Changed

audacious-plugins-4.4.1.tar.bz2/src/skins-data/Skins/Default/posbar.png Added

audacious-plugins-4.4.1.tar.bz2/src/skins-data/Skins/Default/shufrep.png Added

audacious-plugins-4.4.1.tar.bz2/src/skins-data/Skins/Default/skin-classic.hints Added

audacious-plugins-4.4.1.tar.bz2/src/skins-data/Skins/Default/skin.hints Changed

audacious-plugins-4.4.1.tar.bz2/src/skins-data/Skins/Default/text.png Added

audacious-plugins-4.4.1.tar.bz2/src/skins-data/Skins/Default/titlebar.png Added

audacious-plugins-4.4.1.tar.bz2/src/skins-data/Skins/Default/viscolor.txt Changed

audacious-plugins-4.4.1.tar.bz2/src/skins-data/Skins/Default/volume.png Added

audacious-plugins-4.4.1.tar.bz2/src/skins-data/Skins/Ivory Added

audacious-plugins-4.4.1.tar.bz2/src/skins-data/Skins/Ivory/balance.png Added

audacious-plugins-4.4.1.tar.bz2/src/skins-data/Skins/Ivory/cbuttons.png Added

audacious-plugins-4.4.1.tar.bz2/src/skins-data/Skins/Ivory/eq_ex.png Added

audacious-plugins-4.4.1.tar.bz2/src/skins-data/Skins/Ivory/eqmain.png Added

audacious-plugins-4.4.1.tar.bz2/src/skins-data/Skins/Ivory/main.png Added

audacious-plugins-4.4.1.tar.bz2/src/skins-data/Skins/Ivory/monoster.png Added

audacious-plugins-4.4.1.tar.bz2/src/skins-data/Skins/Ivory/nums_ex.png Added

audacious-plugins-4.4.1.tar.bz2/src/skins-data/Skins/Ivory/playpaus.png Added

audacious-plugins-4.4.1.tar.bz2/src/skins-data/Skins/Ivory/pledit.png Added

audacious-plugins-4.4.1.tar.bz2/src/skins-data/Skins/Ivory/pledit.txt Changed

audacious-plugins-4.4.1.tar.bz2/src/skins-data/Skins/Ivory/posbar.png Added

audacious-plugins-4.4.1.tar.bz2/src/skins-data/Skins/Ivory/shufrep.png Added

audacious-plugins-4.4.1.tar.bz2/src/skins-data/Skins/Ivory/skin.hints Changed

audacious-plugins-4.4.1.tar.bz2/src/skins-data/Skins/Ivory/text.png Added

audacious-plugins-4.4.1.tar.bz2/src/skins-data/Skins/Ivory/titlebar.png Added

audacious-plugins-4.4.1.tar.bz2/src/skins-data/Skins/Ivory/viscolor.txt Changed

audacious-plugins-4.4.1.tar.bz2/src/skins-data/Skins/Ivory/volume.png Added

audacious-plugins-4.4.1.tar.bz2/src/skins-data/Skins/Osmosis Added

audacious-plugins-4.4.1.tar.bz2/src/skins-data/Skins/Osmosis/balance.png Added

audacious-plugins-4.4.1.tar.bz2/src/skins-data/Skins/Osmosis/cbuttons.png Added

audacious-plugins-4.4.1.tar.bz2/src/skins-data/Skins/Osmosis/eq_ex.png Added

audacious-plugins-4.4.1.tar.bz2/src/skins-data/Skins/Osmosis/eqmain.png Added

audacious-plugins-4.4.1.tar.bz2/src/skins-data/Skins/Osmosis/main.png Added

audacious-plugins-4.4.1.tar.bz2/src/skins-data/Skins/Osmosis/monoster.png Added

audacious-plugins-4.4.1.tar.bz2/src/skins-data/Skins/Osmosis/nums_ex.png Added

audacious-plugins-4.4.1.tar.bz2/src/skins-data/Skins/Osmosis/playpaus.png Added

audacious-plugins-4.4.1.tar.bz2/src/skins-data/Skins/Osmosis/pledit.png Added

audacious-plugins-4.4.1.tar.bz2/src/skins-data/Skins/Osmosis/pledit.txt Added

audacious-plugins-4.4.1.tar.bz2/src/skins-data/Skins/Osmosis/posbar.png Added

audacious-plugins-4.4.1.tar.bz2/src/skins-data/Skins/Osmosis/shufrep.png Added

audacious-plugins-4.4.1.tar.bz2/src/skins-data/Skins/Osmosis/skin.hints Changed

audacious-plugins-4.4.1.tar.bz2/src/skins-data/Skins/Osmosis/text.png Added

audacious-plugins-4.4.1.tar.bz2/src/skins-data/Skins/Osmosis/titlebar.png Added

audacious-plugins-4.4.1.tar.bz2/src/skins-data/Skins/Osmosis/viscolor.txt Added

audacious-plugins-4.4.1.tar.bz2/src/skins-data/Skins/Osmosis/volume.png Added

audacious-plugins-4.4.1.tar.bz2/src/skins-data/Skins/Refugee Added

audacious-plugins-4.4.1.tar.bz2/src/skins-data/Skins/Refugee/cbuttons.png Added

audacious-plugins-4.4.1.tar.bz2/src/skins-data/Skins/Refugee/eq_ex.png Added

audacious-plugins-4.4.1.tar.bz2/src/skins-data/Skins/Refugee/eqmain.png Added

audacious-plugins-4.4.1.tar.bz2/src/skins-data/Skins/Refugee/main.png Added

audacious-plugins-4.4.1.tar.bz2/src/skins-data/Skins/Refugee/monoster.png Added

audacious-plugins-4.4.1.tar.bz2/src/skins-data/Skins/Refugee/nums_ex.png Added

audacious-plugins-4.4.1.tar.bz2/src/skins-data/Skins/Refugee/playpaus.png Added

audacious-plugins-4.4.1.tar.bz2/src/skins-data/Skins/Refugee/pledit.png Added

audacious-plugins-4.4.1.tar.bz2/src/skins-data/Skins/Refugee/pledit.txt Changed

audacious-plugins-4.4.1.tar.bz2/src/skins-data/Skins/Refugee/posbar.png Added

audacious-plugins-4.4.1.tar.bz2/src/skins-data/Skins/Refugee/shufrep.png Added

audacious-plugins-4.4.1.tar.bz2/src/skins-data/Skins/Refugee/skin.hints Changed

audacious-plugins-4.4.1.tar.bz2/src/skins-data/Skins/Refugee/text.png Added

audacious-plugins-4.4.1.tar.bz2/src/skins-data/Skins/Refugee/titlebar.png Added

audacious-plugins-4.4.1.tar.bz2/src/skins-data/Skins/Refugee/viscolor.txt Changed

audacious-plugins-4.4.1.tar.bz2/src/skins-data/Skins/Refugee/volume.png Added

audacious-plugins-4.4.1.tar.bz2/src/skins-data/Skins/TinyPlayer Added

audacious-plugins-4.4.1.tar.bz2/src/skins-data/Skins/TinyPlayer/balance.png Added

audacious-plugins-4.4.1.tar.bz2/src/skins-data/Skins/TinyPlayer/cbuttons.png Added

audacious-plugins-4.4.1.tar.bz2/src/skins-data/Skins/TinyPlayer/eq_ex.png Added

audacious-plugins-4.4.1.tar.bz2/src/skins-data/Skins/TinyPlayer/eqmain.png Added

audacious-plugins-4.4.1.tar.bz2/src/skins-data/Skins/TinyPlayer/main.png Added

audacious-plugins-4.4.1.tar.bz2/src/skins-data/Skins/TinyPlayer/monoster.png Added

audacious-plugins-4.4.1.tar.bz2/src/skins-data/Skins/TinyPlayer/nums_ex.png Added

audacious-plugins-4.4.1.tar.bz2/src/skins-data/Skins/TinyPlayer/playpaus.png Added

audacious-plugins-4.4.1.tar.bz2/src/skins-data/Skins/TinyPlayer/pledit.png Added

audacious-plugins-4.4.1.tar.bz2/src/skins-data/Skins/TinyPlayer/pledit.txt Added

audacious-plugins-4.4.1.tar.bz2/src/skins-data/Skins/TinyPlayer/posbar.png Added

audacious-plugins-4.4.1.tar.bz2/src/skins-data/Skins/TinyPlayer/shufrep.png Added

audacious-plugins-4.4.1.tar.bz2/src/skins-data/Skins/TinyPlayer/skin.hints Changed

audacious-plugins-4.4.1.tar.bz2/src/skins-data/Skins/TinyPlayer/text.png Added

audacious-plugins-4.4.1.tar.bz2/src/skins-data/Skins/TinyPlayer/titlebar.png Added

audacious-plugins-4.4.1.tar.bz2/src/skins-data/Skins/TinyPlayer/viscolor.txt Added

audacious-plugins-4.4.1.tar.bz2/src/skins-data/Skins/TinyPlayer/volume.png Added

audacious-plugins-4.4.1.tar.bz2/src/skins-data/meson.build Added

audacious-plugins-4.4.1.tar.bz2/src/skins-qt Added

audacious-plugins-4.4.1.tar.bz2/src/skins-qt/Makefile Added

@@ -0,0 +1,47 @@
+PLUGIN = skins-qt${PLUGIN_SUFFIX}
+
+SRCS = actions.cc \
+       button.cc \
+       dialogs-qt.cc \
+       dock.cc \
+       drag-handle.cc \
+       eq-graph.cc \
+       eq-slider.cc \
+       equalizer.cc \
+       hslider.cc \
+       main.cc \
+       menurow.cc \
+       menu-ops.cc \
+       menus.cc \
+       monostereo.cc \
+       number.cc \
+       playlistwin.cc \
+       playlist-slider.cc \
+       playlist-widget.cc \
+       playstatus.cc \
+       plugin.cc \
+       plugin-window.cc \
+       search-select.cc \
+       skin.cc \
+       skin-ini.cc \
+       skins_cfg.cc \
+       skins_util.cc \
+       skinselector.cc \
+       svis.cc \
+       textbox.cc \
+       view.cc \
+       vis-callbacks.cc \
+       vis.cc \
+       widget.cc \
+       window.cc
+
+include ../../buildsys.mk
+include ../../extra.mk
+
+plugindir := ${plugindir}/${GENERAL_PLUGIN_DIR}
+
+LD = ${CXX}
+
+CPPFLAGS += ${PLUGIN_CPPFLAGS} -I../.. ${GLIB_CFLAGS} ${QT_CFLAGS}
+CFLAGS += ${PLUGIN_CFLAGS}
+LIBS += -lm ${GLIB_LIBS} ${QT_LIBS} -laudqt

audacious-plugins-4.4.1.tar.bz2/src/skins-qt/actions-mainwin.h Added

@@ -0,0 +1,31 @@
+/* Audacious - Cross-platform multimedia player
+ * Copyright (C) 2005-2007 Audacious development team.
+ *
+ * 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; under version 3 of the License.
+ *
+ * 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>.
+ *
+ * The Audacious team does not consider modular code linking to
+ * Audacious or using our public API to be a derived work.
+ */
+
+#ifndef SKINS_ACTIONS_MAINWIN_H
+#define SKINS_ACTIONS_MAINWIN_H
+
+void action_ab_clear ();
+void action_ab_set ();
+void action_play_file ();
+void action_play_folder ();
+void action_play_location ();
+void action_playlist_manager ();
+void action_search_tool ();
+
+#endif /* SKINS_ACTIONS_MAINWIN_H */

audacious-plugins-4.4.1.tar.bz2/src/skins-qt/actions-playlist.h Added

@@ -0,0 +1,32 @@
+/* Audacious - Cross-platform multimedia player
+ * Copyright (C) 2005-2007 Audacious development team.
+ *
+ * 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; under version 3 of the License.
+ *
+ * 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>.
+ *
+ * The Audacious team does not consider modular code linking to
+ * Audacious or using our public API to be a derived work.
+ */
+
+#ifndef SKINS_ACTIONS_PLAYLIST_H
+#define SKINS_ACTIONS_PLAYLIST_H
+
+void action_playlist_rename ();
+void action_playlist_delete ();
+
+void action_playlist_search_and_select ();
+
+void action_playlist_add_url ();
+void action_playlist_add_files ();
+void action_playlist_add_folder ();
+
+#endif /* SKINS_ACTIONS_PLAYLIST_H */

audacious-plugins-4.4.1.tar.bz2/src/skins-qt/actions.cc Added

@@ -0,0 +1,107 @@
+/* Audacious - Cross-platform multimedia player
+ * Copyright (C) 2005-2011 Audacious development team.
+ *
+ * BMP - Cross-platform multimedia player
+ * Copyright (C) 2003-2004 BMP development team.
+ *
+ * Based on XMMS:
+ * Copyright (C) 1998-2003 XMMS development team.
+ *
+ * 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; under version 3 of the License.
+ *
+ * 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>.
+ *
+ * The Audacious team does not consider modular code linking to
+ * Audacious or using our public API to be a derived work.
+ */
+
+#include "actions-mainwin.h"
+#include "actions-playlist.h"
+#include "main.h"
+#include "plugin-window.h"
+
+#include "../ui-common/menu-ops.h"
+
+#include <libaudcore/drct.h>
+#include <libaudcore/i18n.h>
+#include <libaudcore/playlist.h>
+#include <libaudcore/plugins.h>
+#include <libaudqt/libaudqt.h>
+
+#define ACTIVE (Playlist::active_playlist ())
+
+void action_ab_clear ()
+{
+ mainwin_show_status_message (_("Repeat points cleared."));
+ aud_drct_set_ab_repeat (-1, -1);
+}
+
+void action_ab_set ()
+{
+ if (aud_drct_get_length () > 0)
+ {
+ int a, b;
+ aud_drct_get_ab_repeat (a, b);
+
+ if (a < 0 || b >= 0)
+ {
+ a = aud_drct_get_time ();
+ b = -1;
+ mainwin_show_status_message (_("Repeat point A set."));
+ }
+ else
+ {
+ b = aud_drct_get_time ();
+ mainwin_show_status_message (_("Repeat point B set."));
+ }
+
+ aud_drct_set_ab_repeat (a, b);
+ }
+}
+
+void action_play_file ()
+ { audqt::fileopener_show (audqt::FileMode::Open); }
+void action_play_folder ()
+ { audqt::fileopener_show (audqt::FileMode::OpenFolder); }
+void action_play_location ()
+ { audqt::urlopener_show (true); }
+
+void action_playlist_manager ()
+{
+ PluginHandle * manager = aud_plugin_lookup_basename ("playlist-manager-qt");
+ if (manager)
+ {
+ aud_plugin_enable (manager, true);
+ focus_plugin_window (manager);
+ }
+}
+
+void action_search_tool ()
+{
+ PluginHandle * search = aud_plugin_lookup_basename ("search-tool-qt");
+ if (search)
+ {
+ aud_plugin_enable (search, true);
+ focus_plugin_window (search);
+ }
+}
+
+void action_playlist_rename ()
+ { audqt::playlist_show_rename (ACTIVE); }
+void action_playlist_delete ()
+ { audqt::playlist_confirm_delete (ACTIVE); }
+
+void action_playlist_add_url ()
+ { audqt::urlopener_show (false); }
+void action_playlist_add_files ()
+ { audqt::fileopener_show (audqt::FileMode::Add ); }
+void action_playlist_add_folder ()
+ { audqt::fileopener_show (audqt::FileMode::AddFolder ); }

audacious-plugins-4.4.1.tar.bz2/src/skins-qt/button.cc Added

@@ -0,0 +1,132 @@
+/*
+ * Audacious - a cross-platform multimedia player
+ * Copyright (c) 2007 Tomasz Moń
+ * Copyright (c) 2011 John Lindgren
+ *
+ * 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; under version 3 of the License.
+ *
+ * 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>.
+ *
+ * The Audacious team does not consider modular code linking to
+ * Audacious or using our public API to be a derived work.
+ */
+
+#include "skins_cfg.h"
+#include "button.h"
+
+void Button::draw (QPainter & cr)
+{
+ switch (m_type)
+ {
+ case Normal:
+ if (m_pressed)
+ skin_draw_pixbuf (cr, m_si2, m_px, m_py, 0, 0, m_w, m_h);
+ else
+ skin_draw_pixbuf (cr, m_si1, m_nx, m_ny, 0, 0, m_w, m_h);
+ break;
+ case Toggle:
+ if (m_active)
+ {
+ if (m_pressed)
+ skin_draw_pixbuf (cr, m_si2, m_ppx, m_ppy, 0, 0, m_w, m_h);
+ else
+ skin_draw_pixbuf (cr, m_si1, m_pnx, m_pny, 0, 0, m_w, m_h);
+ }
+ else
+ {
+ if (m_pressed)
+ skin_draw_pixbuf (cr, m_si2, m_px, m_py, 0, 0, m_w, m_h);
+ else
+ skin_draw_pixbuf (cr, m_si1, m_nx, m_ny, 0, 0, m_w, m_h);
+ }
+ break;
+ case Small:
+ break;
+ }
+}
+
+bool Button::button_press (QMouseEvent * event)
+{
+ /* pass events through to the parent widget only if neither the press nor
+ * release signals are connected; sending one and not the other causes
+ * problems (in particular with dragging windows around) */
+ if (event->button () == Qt::LeftButton && (press || release))
+ {
+ m_pressed = true;
+ if (press)
+ press (this, event);
+ }
+ else if (event->button () == Qt::RightButton && (rpress || rrelease))
+ {
+ m_rpressed = true;
+ if (rpress)
+ rpress (this, event);
+ }
+ else
+ return false;
+
+ if (m_type != Small)
+ queue_draw ();
+
+ return true;
+}
+
+bool Button::button_release (QMouseEvent * event)
+{
+ if (event->button () == Qt::LeftButton && (press || release))
+ {
+ if (! m_pressed)
+ return true;
+
+ m_pressed = false;
+ if (m_type == Toggle)
+ m_active = ! m_active;
+ if (release)
+ release (this, event);
+ }
+ else if (event->button () == Qt::RightButton && (rpress || rrelease))
+ {
+ if (! m_rpressed)
+ return true;
+
+ m_rpressed = false;
+ if (rrelease)
+ rrelease (this, event);
+ }
+ else
+ return false;
+
+ if (m_type != Small)
+ queue_draw ();
+
+ return true;
+}
+
+Button::Button (Type type, int w, int h, int nx, int ny, int px, int py,
+ int pnx, int pny, int ppx, int ppy, SkinPixmapId si1, SkinPixmapId si2) :
+ m_type (type),
+ m_w (w), m_h (h),
+ m_nx (nx), m_ny (ny), m_px (px), m_py (py),
+ m_pnx (pnx), m_pny (pny), m_ppx (ppx), m_ppy (ppy),
+ m_si1 (si1), m_si2 (si2)
+{
+ set_scale (config.scale);
+ add_input (w, h, false, type != Small);
+}
+
+void Button::set_active (bool active)
+{
+ if (m_active != active)
+ {
+ m_active = active;
+ queue_draw ();
+ }
+}

audacious-plugins-4.4.1.tar.bz2/src/skins-qt/button.h Added

@@ -0,0 +1,78 @@
+/*
+ * Audacious - a cross-platform multimedia player
+ * Copyright (c) 2007 Tomasz Moń
+ * Copyright (c) 2011 John Lindgren
+ *
+ * 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; under version 3 of the License.
+ *
+ * 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>.
+ *
+ * The Audacious team does not consider modular code linking to
+ * Audacious or using our public API to be a derived work.
+ */
+
+#ifndef SKINS_UI_SKINNED_BUTTON_H
+#define SKINS_UI_SKINNED_BUTTON_H
+
+#include "widget.h"
+#include "skin.h"
+
+class Button;
+
+typedef void (* ButtonCB) (Button * button, QMouseEvent * event);
+
+class Button : public Widget
+{
+public:
+ // transparent button
+ Button (int w, int h) :
+ Button (Small, w, h, 0, 0, 0, 0, 0, 0, 0, 0, SKIN_MAIN, SKIN_MAIN) {}
+
+ // basic skinned button
+ Button (int w, int h, int nx, int ny, int px, int py, SkinPixmapId si1, SkinPixmapId si2) :
+ Button (Normal, w, h, nx, ny, px, py, 0, 0, 0, 0, si1, si2) {}
+
+ // skinned toggle button
+ Button (int w, int h, int nx, int ny, int px, int py, int pnx, int pny,
+ int ppx, int ppy, SkinPixmapId si1, SkinPixmapId si2) :
+ Button (Toggle, w, h, nx, ny, px, py, pnx, pny, ppx, ppy, si1, si2) {}
+
+ void on_press (ButtonCB callback) { press = callback; }
+ void on_release (ButtonCB callback) { release = callback; }
+ void on_rpress (ButtonCB callback) { rpress = callback; }
+ void on_rrelease (ButtonCB callback) { rrelease = callback; }
+
+ bool get_active () { return m_active; }
+ void set_active (bool active);
+
+private:
+ enum Type {Normal, Toggle, Small};
+
+ Button (Type type, int w, int h, int nx, int ny, int px, int py, int pnx,
+ int pny, int ppx, int ppy, SkinPixmapId si1, SkinPixmapId si2);
+
+ void draw (QPainter & cr);
+ bool button_press (QMouseEvent * event);
+ bool button_release (QMouseEvent * event);
+
+ Type m_type;
+ int m_w, m_h;
+ int m_nx, m_ny, m_px, m_py;
+ int m_pnx, m_pny, m_ppx, m_ppy;
+ SkinPixmapId m_si1, m_si2;
+
+ bool m_pressed = false, m_rpressed = false, m_active = false;
+
+ ButtonCB press = nullptr, release = nullptr;
+ ButtonCB rpress = nullptr, rrelease = nullptr;
+};
+
+#endif

audacious-plugins-4.4.1.tar.bz2/src/skins-qt/dialogs-qt.cc Added

audacious-plugins-4.4.1.tar.bz2/src/skins-qt/dnd.h Added

@@ -0,0 +1,56 @@
+/* Audacious - Cross-platform multimedia player
+ * Copyright (C) 2005-2011 Audacious development team
+ *
+ * Based on BMP:
+ * Copyright (C) 2003-2004 BMP development team
+ *
+ * Based on XMMS:
+ * Copyright (C) 1998-2003 XMMS development team
+ *
+ * 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; under version 3 of the License.
+ *
+ * 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>.
+ *
+ * The Audacious team does not consider modular code linking to
+ * Audacious or using our public API to be a derived work.
+ */
+
+#ifndef SKINS_DND_H
+#define SKINS_DND_H
+
+/* Designate dropped data types that we know and care about */
+enum {
+ DROP_STRING,
+ DROP_PLAINTEXT,
+ DROP_URLENCODED,
+ DROP_SKIN,
+ DROP_FONT
+};
+
+#if 0
+/* Drag data format listing for gtk_drag_dest_set() */
+static const GtkTargetEntry drop_types = {
+ {(char *) "text/plain", 0, DROP_PLAINTEXT},
+ {(char *) "text/uri-list", 0, DROP_URLENCODED},
+ {(char *) "STRING", 0, DROP_STRING},
+ {(char *) "interface/x-winamp-skin", 0, DROP_SKIN},
+ {(char *) "application/x-font-ttf", 0, DROP_FONT},
+};
+
+static inline void drag_dest_set (GtkWidget * widget)
+{
+ gtk_drag_dest_set (widget, (GtkDestDefaults) (GTK_DEST_DEFAULT_MOTION |
+ GTK_DEST_DEFAULT_DROP), drop_types, aud::n_elems (drop_types),
+ (GdkDragAction) (GDK_ACTION_COPY | GDK_ACTION_MOVE));
+}
+#endif
+
+#endif /* SKINS_DND_H */

audacious-plugins-4.4.1.tar.bz2/src/skins-qt/dock.cc Added

@@ -0,0 +1,373 @@
+/*
+ * ui_dock.c
+ * Copyright 2011 John Lindgren
+ *
+ * This file is part of Audacious.
+ *
+ * Audacious 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, version 2 or version 3 of the License.
+ *
+ * Audacious 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
+ * Audacious. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The Audacious team does not consider modular code linking to Audacious or
+ * using our public API to be a derived work.
+ */
+
+/*
+ * Rough outline
+ * =============
+ *
+ * When moving a window:
+ * 1. If this is the main window, find (recursively) the windows docked to it.
+ * 2. Adjust the offsets to snap to another window (not docked) or a screen edge.
+ * 3. Move the docked windows by the same offsets.
+ *
+ * When resizing a window:
+ * 1. Find (recursively) the windows docked to the bottom edge of this one.
+ * If we are making the window shorter, exclude windows that are docked to
+ * the bottom of another window (not docked) to avoid overlap.
+ * 2. Move the docked windows by the difference in window height.
+ * 3. Repeat the process for windows docked to the right edge of this one.
+ */
+
+#include <QGuiApplication>
+#include <QScreen>
+
+#include "window.h"
+
+#define SNAP_DISTANCE 10
+
+enum {
+ DOCK_TYPE_LEFT = 1 << 0,
+ DOCK_TYPE_RIGHT = 1 << 1,
+ DOCK_TYPE_TOP = 1 << 2,
+ DOCK_TYPE_BOTTOM = 1 << 3
+};
+
+#define DOCK_TYPE_ANY (DOCK_TYPE_LEFT | DOCK_TYPE_RIGHT | DOCK_TYPE_TOP | DOCK_TYPE_BOTTOM)
+
+typedef struct {
+ Window * window;
+ int * x, * y;
+ int w, h;
+ bool docked;
+} DockWindow;
+
+static DockWindow windowsN_WINDOWS;
+static int last_x, last_y;
+
+static inline int least_abs (int a, int b)
+{
+ return (abs (a) < abs (b)) ? a : b;
+}
+
+void dock_add_window (int id, Window * window, int * x, int * y, int w, int h)
+{
+ DockWindow & dw = windowsid;
+
+ dw.window = window;
+ dw.x = x;
+ dw.y = y;
+ dw.w = w;
+ dw.h = h;
+}
+
+void dock_remove_window (int id)
+{
+ windowsid.window = nullptr;
+}
+
+static void dock_sync ()
+{
+ for (DockWindow & dw : windows)
+ {
+ if (dw.window)
+ dw.window->getPosition (dw.x, dw.y);
+ }
+}
+
+static void clear_docked ()
+{
+ for (DockWindow & dw : windows)
+ dw.docked = false;
+}
+
+static bool is_docked (DockWindow & dw, DockWindow & base, int type)
+{
+ return ((type & DOCK_TYPE_LEFT) && * dw.x + dw.w == * base.x) ||
+ ((type & DOCK_TYPE_RIGHT) && * dw.x == * base.x + base.w) ||
+ ((type & DOCK_TYPE_TOP) && * dw.y + dw.h == * base.y) ||
+ ((type & DOCK_TYPE_BOTTOM) && * dw.y == * base.y + base.h);
+}
+
+static void find_docked (DockWindow & base, int type)
+{
+ for (DockWindow & dw : windows)
+ {
+ if (dw.docked || & dw == & base)
+ continue;
+
+ dw.docked = is_docked (dw, base, type);
+ if (dw.docked)
+ find_docked (dw, type);
+ }
+}
+
+static void invert_docked ()
+{
+ for (DockWindow & dw : windows)
+ dw.docked = ! dw.docked;
+}
+
+void dock_set_size (int id, int w, int h)
+{
+ DockWindow & base = windowsid;
+
+ dock_sync ();
+
+ if (h != base.h)
+ {
+ /* 1. Find the windows docked below this one. */
+
+ clear_docked ();
+ find_docked (base, DOCK_TYPE_BOTTOM);
+
+ if (h < base.h)
+ {
+ /* 2. This part is tricky. By flipping the docked flag on all the
+ windows, we consider the windows not docked to this one as a
+ docked group. We then add (recursively) any other windows
+ docked to these ones (i.e. the windows docked to these *and*
+ to the one being shortened). The one being shortened must be
+ excluded from the search. Since at this point it is marked as
+ docked, it is excluded automatically. Finally, flipping the
+ docked flag back again leaves us with only the windows docked
+ to the one being shortened and not to any others. */
+
+ invert_docked ();
+
+ for (DockWindow & dw : windows)
+ {
+ if (! dw.docked || & dw == & base)
+ continue;
+
+ find_docked (dw, DOCK_TYPE_BOTTOM);
+ }
+
+ invert_docked ();
+ }
+
+ /* 3. Move the docked windows by the difference in height. */
+
+ for (DockWindow & dw : windows)
+ {
+ if (! dw.docked)
+ continue;
+
+ * dw.y += h - base.h;
+ if (dw.window)
+ dw.window->move (* dw.x, * dw.y);
+ }
+ }
+
+ if (w != base.w)
+ {
+ /* 4. Repeat the process for the windows docked to the right. */
+
+ clear_docked ();
+ find_docked (base, DOCK_TYPE_RIGHT);
+
+ if (w < base.w)
+ {
+ invert_docked ();
+
+ for (DockWindow & dw : windows)
+ {
+ if (! dw.docked || & dw == & base)
+ continue;
+
+ find_docked (dw, DOCK_TYPE_RIGHT);
+ }
+
+ invert_docked ();
+ }
+
+ for (DockWindow & dw : windows)
+ {
+ if (! dw.docked)
+ continue;
+
+ * dw.x += w - base.w;
+ if (dw.window)
+ dw.window->move (* dw.x, * dw.y);
+ }
+ }
+
+ /* 5. Set the window size. (The actual resize is done by the caller.) */
+
+ base.w = w;
+ base.h = h;
+}
+
+void dock_move_start (int id, int x, int y)
+{
+ DockWindow & dw = windowsid;
+
+ dock_sync ();
+
+ last_x = x;
+ last_y = y;
+
+ /* 1. If this is the main window, find the windows docked to it. */
+
+ clear_docked ();
+ dw.docked = true;
+ if (id == WINDOW_MAIN)
+ find_docked (dw, DOCK_TYPE_ANY);
+}
+
+void dock_move (int x, int y)
+{
+ int hori, vert;
+
+ if (x == last_x && y == last_y)
+ return;
+
+ /* 2. Nominally move all the windows in the group the requested distance,
+ and update the reference point. */
+
+ hori = x - last_x;
+ vert = y - last_y;
+
+ for (DockWindow & dw : windows)
+ {
+ if (! dw.docked)
+ continue;
+
+ * dw.x += hori;
+ * dw.y += vert;
+ }
+
+ last_x = x;
+ last_y = y;
+
+
+ /* 3. Find the least snap distance we must move so that
+ (a) a window in the group is touching a screen edge or
+ (b) a window in the group is touching a window not in the group. */
+
+ hori = SNAP_DISTANCE + 1;
+ vert = SNAP_DISTANCE + 1;
+
+ for (auto screen : QGuiApplication::screens ())
+ {
+ auto rect = screen->availableGeometry ();
+
+ for (DockWindow & dw : windows)
+ {
+ if (! dw.docked)
+ continue;
+
+ /* We only test half the combinations here, as it is not very
+ helpful to have e.g. the right edge of a window touching the left
+ edge of a monitor (think about it). */
+
+ hori = least_abs (hori, rect.x () - * dw.x);
+ hori = least_abs (hori, (rect.x () + rect.width ()) - (* dw.x + dw.w));
+ vert = least_abs (vert, rect.y () - * dw.y);
+ vert = least_abs (vert, (rect.y () + rect.height ()) - (* dw.y + dw.h));
+ }
+ }
+
+ for (DockWindow & dw : windows)
+ {
+ if (! dw.docked)
+ continue;
+
+ for (DockWindow & dw2 : windows)
+ {
+ if (dw2.docked)
+ continue;
+
+ hori = least_abs (hori, * dw2.x - * dw.x);
+ hori = least_abs (hori, * dw2.x - (* dw.x + dw.w));
+ hori = least_abs (hori, (* dw2.x + dw2.w) - * dw.x);
+ hori = least_abs (hori, (* dw2.x + dw2.w) - (* dw.x + dw.w));
+ vert = least_abs (vert, * dw2.y - * dw.y);
+ vert = least_abs (vert, * dw2.y - (* dw.y + dw.h));
+ vert = least_abs (vert, (* dw2.y + dw2.h) - * dw.y);
+ vert = least_abs (vert, (* dw2.y + dw2.h) - (* dw.y + dw.h));
+ }
+ }
+
+ /* 4. If the snap distances are within range, nominally move all the windows
+ in the group, and update the reference point again. */
+
+ if (abs (hori) > SNAP_DISTANCE)
+ hori = 0;
+ if (abs (vert) > SNAP_DISTANCE)
+ vert = 0;
+
+ for (DockWindow & dw : windows)
+ {
+ if (! dw.docked)
+ continue;
+
+ * dw.x += hori;
+ * dw.y += vert;
+ }
+
+ last_x += hori;
+ last_y += vert;
+
+ /* 5. Really move the windows. */
+
+ for (DockWindow & dw : windows)
+ {
+ if (dw.docked && dw.window)
+ dw.window->move (* dw.x, * dw.y);
+ }
+}
+
+void dock_change_scale (int old_scale, int new_scale)
+{
+ DockWindow & main = windowsWINDOW_MAIN;
+
+ for (DockWindow & dw : windows)
+ {
+ dw.w = dw.w * new_scale / old_scale;
+ dw.h = dw.h * new_scale / old_scale;
+
+ if (& dw != & main)
+ {
+ * dw.x = * main.x + (* dw.x - * main.x) * new_scale / old_scale;
+ * dw.y = * main.y + (* dw.y - * main.y) * new_scale / old_scale;
+ }
+ }
+}
+
+void dock_draw_all ()
+{
+ for (DockWindow & dw : windows)
+ {
+ if (dw.window)
+ dw.window->queue_draw ();
+ }
+}
+
+bool dock_is_focused ()
+{
+ for (DockWindow & dw : windows)
+ {
+ if (dw.window && dw.window->isActiveWindow ())
+ return true;
+ }
+
+ return false;
+}

audacious-plugins-4.4.1.tar.bz2/src/skins-qt/drag-handle.cc Added

@@ -0,0 +1,68 @@
+/*
+ * drag-handle.c
+ * Copyright 2011 John Lindgren
+ *
+ * This file is part of Audacious.
+ *
+ * Audacious 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, version 2 or version 3 of the License.
+ *
+ * Audacious 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
+ * Audacious. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The Audacious team does not consider modular code linking to Audacious or
+ * using our public API to be a derived work.
+ */
+
+#include "drag-handle.h"
+#include "skins_cfg.h"
+
+#include "../ui-common/qt-compat.h"
+
+bool DragHandle::button_press (QMouseEvent * event)
+{
+ if (event->button () != Qt::LeftButton)
+ return false;
+
+ m_held = true;
+ m_x_origin = QtCompat::globalX (event);
+ m_y_origin = QtCompat::globalY (event);
+
+ if (press)
+ press ();
+
+ return true;
+}
+
+bool DragHandle::button_release (QMouseEvent * event)
+{
+ if (event->button () != Qt::LeftButton)
+ return false;
+
+ m_held = false;
+ return true;
+}
+
+bool DragHandle::motion (QMouseEvent * event)
+{
+ if (! m_held)
+ return true;
+
+ if (drag)
+ drag ((QtCompat::globalX (event) - m_x_origin) / config.scale,
+ (QtCompat::globalY (event) - m_y_origin) / config.scale);
+
+ return true;
+}
+
+DragHandle::DragHandle (int w, int h, void (* press) (), void (* drag) (int x, int y)) :
+ press (press), drag (drag)
+{
+ set_scale (config.scale);
+ add_input (w, h, true, false);
+}

audacious-plugins-4.4.1.tar.bz2/src/skins-qt/drag-handle.h Added

@@ -0,0 +1,44 @@
+/*
+ * drag-handle.h
+ * Copyright 2011 John Lindgren
+ *
+ * This file is part of Audacious.
+ *
+ * Audacious 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, version 2 or version 3 of the License.
+ *
+ * Audacious 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
+ * Audacious. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The Audacious team does not consider modular code linking to Audacious or
+ * using our public API to be a derived work.
+ */
+
+#ifndef SKINS_DRAG_HANDLE_H
+#define SKINS_DRAG_HANDLE_H
+
+#include "widget.h"
+
+class DragHandle : public Widget
+{
+public:
+ DragHandle (int w, int h, void (* press) (), void (* drag) (int x, int y));
+
+private:
+ bool button_press (QMouseEvent * event);
+ bool button_release (QMouseEvent * event);
+ bool motion (QMouseEvent * event);
+
+ void (* press) ();
+ void (* drag) (int x_offset, int y_offset);
+
+ bool m_held = false;
+ int m_x_origin = 0, m_y_origin = 0;
+};
+
+#endif

audacious-plugins-4.4.1.tar.bz2/src/skins-qt/eq-graph.cc Added

@@ -0,0 +1,135 @@
+/*
+ * Audacious - a cross-platform multimedia player
+ * Copyright (c) 2007 Tomasz Moń
+ * Copyright (c) 2011 John Lindgren
+ *
+ * Based on:
+ * BMP - Cross-platform multimedia player
+ * Copyright (C) 2003-2004 BMP development team.
+ * XMMS:
+ * Copyright (C) 1998-2003 XMMS development team.
+ *
+ * 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; under version 3 of the License.
+ *
+ * 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>.
+ */
+
+#include <libaudcore/equalizer.h>
+#include <libaudcore/runtime.h>
+
+#include "skins_cfg.h"
+#include "skin.h"
+#include "eq-graph.h"
+
+#define N 10
+static_assert (N == AUD_EQ_NBANDS, "only a 10-band EQ is supported");
+
+static void init_spline (const double * x, const double * y, double * y2)
+{
+ int k;
+ double p, qn, sig, un;
+ double uN;
+
+ y20 = u0 = 0.0;
+
+ for (int i = 1; i < N - 1; i ++)
+ {
+ sig = ((double) xi - xi - 1) / ((double) xi + 1 - xi - 1);
+ p = sig * y2i - 1 + 2.0;
+ y2i = (sig - 1.0) / p;
+ ui =
+ (((double) yi + 1 - yi) / (xi + 1 - xi)) -
+ (((double) yi - yi - 1) / (xi - xi - 1));
+ ui = (6.0 * ui / (xi + 1 - xi - 1) - sig * ui - 1) / p;
+ }
+ qn = un = 0.0;
+
+ y2N - 1 = (un - qn * uN - 2) / (qn * y2N - 2 + 1.0);
+ for (k = N - 2; k >= 0; k --)
+ y2k = y2k * y2k + 1 + uk;
+}
+
+static double eval_spline (const double * xa, const double * ya, const double * y2a, double x)
+{
+ int klo, khi, k;
+ double h, b, a;
+
+ klo = 0;
+ khi = N - 1;
+ while (khi - klo > 1)
+ {
+ k = (khi + klo) >> 1;
+ if (xak > x)
+ khi = k;
+ else
+ klo = k;
+ }
+ h = xakhi - xaklo;
+ a = (xakhi - x) / h;
+ b = (x - xaklo) / h;
+ return (a * yaklo + b * yakhi +
+ ((a * a * a - a) * y2aklo +
+ (b * b * b - b) * y2akhi) * (h * h) / 6.0);
+}
+
+void EqGraph::draw (QPainter & cr)
+{
+ static const double xN = {0, 11, 23, 35, 47, 59, 71, 83, 97, 109};
+
+ if (skin.pixmapsSKIN_EQMAIN.height () < 313)
+ return;
+
+ skin_draw_pixbuf (cr, SKIN_EQMAIN, 0, 294, 0, 0, 113, 19);
+ skin_draw_pixbuf (cr, SKIN_EQMAIN, 0, 314, 0, 9 + (aud_get_double (
+ "equalizer_preamp") * 9 + AUD_EQ_MAX_GAIN / 2) / AUD_EQ_MAX_GAIN, 113, 1);
+
+ double bandsN;
+ aud_eq_get_bands (bands);
+
+ double yfN;
+ init_spline (x, bands, yf);
+
+ int py = 0;
+ for (int i = 0; i < 109; i ++)
+ {
+ int y = 9.5 - eval_spline (x, bands, yf, i) * 9 / AUD_EQ_MAX_GAIN;
+ y = aud::clamp (y, 0, 18);
+
+ if (!i)
+ py = y;
+
+ int ymin, ymax;
+
+ if (y > py)
+ {
+ ymin = py + 1;
+ ymax = y;
+ }
+ else if (y < py)
+ {
+ ymin = y;
+ ymax = py - 1;
+ }
+ else
+ ymin = ymax = y;
+
+ py = y;
+
+ for (y = ymin; y <= ymax; y ++)
+ cr.fillRect (i + 2, y, 1, 1, QColor (skin.eq_spline_colorsy));
+ }
+}
+
+EqGraph::EqGraph ()
+{
+ set_scale (config.scale);
+ add_drawable (113, 19);
+}

audacious-plugins-4.4.1.tar.bz2/src/skins-qt/eq-graph.h Added

@@ -0,0 +1,43 @@
+/*
+ * Audacious - a cross-platform multimedia player
+ * Copyright (c) 2007 Tomasz Moń
+ * Copyright (c) 2011 John Lindgren
+ *
+ * Based on:
+ * BMP - Cross-platform multimedia player
+ * Copyright (C) 2003-2004 BMP development team.
+ * XMMS:
+ * Copyright (C) 1998-2003 XMMS development team.
+ *
+ * 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; under version 3 of the License.
+ *
+ * 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>.
+ *
+ * The Audacious team does not consider modular code linking to
+ * Audacious or using our public API to be a derived work.
+ */
+
+#ifndef SKINS_UI_SKINNED_EQUALIZER_GRAPH_H
+#define SKINS_UI_SKINNED_EQUALIZER_GRAPH_H
+
+#include "widget.h"
+
+class EqGraph : public Widget
+{
+public:
+ EqGraph ();
+ void refresh () { queue_draw (); }
+
+private:
+ void draw (QPainter & cr);
+};
+
+#endif

audacious-plugins-4.4.1.tar.bz2/src/skins-qt/eq-slider.cc Added

@@ -0,0 +1,126 @@
+/*
+ * Audacious - a cross-platform multimedia player
+ * Copyright (c) 2007 Tomasz Moń
+ * Copyright (c) 2011 John Lindgren
+ *
+ * Based on:
+ * BMP - Cross-platform multimedia player
+ * Copyright (C) 2003-2004 BMP development team.
+ * XMMS:
+ * Copyright (C) 1998-2003 XMMS development team.
+ *
+ * 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; under version 3 of the License.
+ *
+ * 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>.
+ */
+
+#include <libaudcore/audstrings.h>
+#include <libaudcore/equalizer.h>
+#include <libaudcore/i18n.h>
+#include <libaudcore/runtime.h>
+
+#include "skins_cfg.h"
+#include "main.h"
+#include "skin.h"
+#include "eq-slider.h"
+
+#include "../ui-common/qt-compat.h"
+
+void EqSlider::draw (QPainter & cr)
+{
+ int frame = 27 - m_pos * 27 / 50;
+ if (frame < 14)
+ skin_draw_pixbuf (cr, SKIN_EQMAIN, 13 + 15 * frame, 164, 0, 0, 14, 63);
+ else
+ skin_draw_pixbuf (cr, SKIN_EQMAIN, 13 + 15 * (frame - 14), 229, 0, 0, 14, 63);
+
+ if (m_pressed)
+ skin_draw_pixbuf (cr, SKIN_EQMAIN, 0, 176, 1, m_pos, 11, 11);
+ else
+ skin_draw_pixbuf (cr, SKIN_EQMAIN, 0, 164, 1, m_pos, 11, 11);
+}
+
+void EqSlider::moved (int pos)
+{
+ m_pos = aud::clamp (pos, 0, 50);
+ if (m_pos == 24 || m_pos == 26)
+ m_pos = 25;
+
+ m_value = (float) (25 - m_pos) * AUD_EQ_MAX_GAIN / 25;
+
+ if (m_band < 0)
+ aud_set_double ("equalizer_preamp", m_value);
+ else
+ aud_eq_set_band (m_band, m_value);
+
+ mainwin_show_status_message (str_printf ("%s: %+.1f dB", (const char *) m_name, m_value));
+}
+
+bool EqSlider::button_press (QMouseEvent * event)
+{
+ if (event->button () != Qt::LeftButton)
+ return false;
+
+ m_pressed = true;
+ moved (QtCompat::y (event) / config.scale - 5);
+ queue_draw ();
+ return true;
+}
+
+bool EqSlider::button_release (QMouseEvent * event)
+{
+ if (event->button () != Qt::LeftButton)
+ return false;
+
+ if (! m_pressed)
+ return true;
+
+ m_pressed = false;
+ moved (QtCompat::y (event) / config.scale - 5);
+ queue_draw ();
+ return true;
+}
+
+bool EqSlider::motion (QMouseEvent * event)
+{
+ if (! m_pressed)
+ return true;
+
+ moved (QtCompat::y (event) / config.scale - 5);
+ queue_draw ();
+ return true;
+}
+
+bool EqSlider::scroll (QWheelEvent * event)
+{
+ int delta = event->angleDelta ().y () / 60;
+ moved (m_pos - delta);
+ queue_draw ();
+ return true;
+}
+
+void EqSlider::set_value (float value)
+{
+ if (m_pressed)
+ return;
+
+ m_value = value;
+ m_pos = aud::clamp (25 - (int) (value * 25 / AUD_EQ_MAX_GAIN), 0, 50);
+ queue_draw ();
+}
+
+EqSlider::EqSlider (const char * name, int band) :
+ m_name (name),
+ m_band (band)
+{
+ set_scale (config.scale);
+ add_input (14, 63, true, true);
+}

audacious-plugins-4.4.1.tar.bz2/src/skins-qt/eq-slider.h Added

@@ -0,0 +1,55 @@
+/*
+ * Audacious - a cross-platform multimedia player
+ * Copyright (c) 2007 Tomasz Moń
+ * Copyright (c) 2011 John Lindgren
+ *
+ * Based on:
+ * BMP - Cross-platform multimedia player
+ * Copyright (C) 2003-2004 BMP development team.
+ * XMMS:
+ * Copyright (C) 1998-2003 XMMS development team.
+ *
+ * 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; under version 3 of the License.
+ *
+ * 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>.
+ */
+
+#ifndef SKINS_UI_SKINNED_EQUALIZER_SLIDER_H
+#define SKINS_UI_SKINNED_EQUALIZER_SLIDER_H
+
+#include <libaudcore/objects.h>
+
+#include "widget.h"
+
+class EqSlider : public Widget
+{
+public:
+ EqSlider (const char * name, int band);
+ void set_value (float value);
+
+private:
+ void draw (QPainter & cr);
+ bool button_press (QMouseEvent * event);
+ bool button_release (QMouseEvent * event);
+ bool scroll (QWheelEvent * event);
+ bool motion (QMouseEvent * event);
+
+ void moved (int pos);
+
+ String m_name;
+ int m_band;
+
+ int m_pos = 0;
+ float m_value = 0;
+ bool m_pressed = false;
+};
+
+#endif

audacious-plugins-4.4.1.tar.bz2/src/skins-qt/equalizer.cc Added

@@ -0,0 +1,289 @@
+/* Audacious - Cross-platform multimedia player
+ * Copyright (C) 2005-2014 Audacious development team.
+ *
+ * Based on BMP:
+ * Copyright (C) 2003-2004 BMP development team.
+ *
+ * Based on XMMS:
+ * Copyright (C) 1998-2003 XMMS development team.
+ *
+ * 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; under version 3 of the License.
+ *
+ * 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>.
+ *
+ * The Audacious team does not consider modular code linking to
+ * Audacious or using our public API to be a derived work.
+ */
+
+#include <string.h>
+
+#include <libaudcore/audstrings.h>
+#include <libaudcore/drct.h>
+#include <libaudcore/equalizer.h>
+#include <libaudcore/hook.h>
+#include <libaudcore/i18n.h>
+#include <libaudcore/runtime.h>
+#include <libaudqt/libaudqt.h>
+
+#include "menus.h"
+#include "plugin.h"
+#include "skins_cfg.h"
+#include "equalizer.h"
+#include "main.h"
+#include "button.h"
+#include "eq-graph.h"
+#include "eq-slider.h"
+#include "hslider.h"
+#include "window.h"
+#include "skins_util.h"
+#include "view.h"
+
+#include "../ui-common/qt-compat.h"
+
+class EqWindow : public Window
+{
+public:
+ EqWindow (bool shaded) :
+ Window (WINDOW_EQ, & config.equalizer_x, & config.equalizer_y, 275,
+ shaded ? 14 : 116, shaded) {}
+
+private:
+ void draw (QPainter & cr);
+ bool button_press (QMouseEvent * event);
+};
+
+Window * equalizerwin;
+
+static EqGraph * equalizerwin_graph;
+static Button * equalizerwin_on, * equalizerwin_auto;
+static Button * equalizerwin_close, * equalizerwin_shade;
+static Button * equalizerwin_shaded_close, * equalizerwin_shaded_shade;
+static Button * equalizerwin_presets;
+static EqSlider * equalizerwin_preamp, * equalizerwin_bands10;
+static HSlider * equalizerwin_volume, * equalizerwin_balance;
+
+static void equalizerwin_shade_toggle ()
+{
+ view_set_equalizer_shaded (! aud_get_bool ("skins", "equalizer_shaded"));
+}
+
+static void eq_on_cb (Button * button, QMouseEvent * event)
+{
+ aud_set_bool ("equalizer_active", button->get_active ());
+}
+
+static void update_from_config (void *, void *)
+{
+ equalizerwin_on->set_active (aud_get_bool ("equalizer_active"));
+ equalizerwin_preamp->set_value (aud_get_double ("equalizer_preamp"));
+
+ double bandsAUD_EQ_NBANDS;
+ aud_eq_get_bands (bands);
+
+ for (int i = 0; i < AUD_EQ_NBANDS; i ++)
+ equalizerwin_bandsi->set_value (bandsi);
+
+ equalizerwin_graph->refresh ();
+}
+
+bool EqWindow::button_press (QMouseEvent * event)
+{
+ if (event->button () == Qt::LeftButton &&
+ event->type () == QEvent::MouseButtonDblClick &&
+ QtCompat::y (event) < 14 * config.scale)
+ {
+ equalizerwin_shade_toggle ();
+ return true;
+ }
+
+ if (event->button () == Qt::RightButton && event->type () == QEvent::MouseButtonPress)
+ {
+ menu_popup (UI_MENU_MAIN, QtCompat::globalX (event), QtCompat::globalY (event), false, false);
+ return true;
+ }
+
+ return Window::button_press (event);
+}
+
+static void equalizerwin_close_cb ()
+{
+ view_set_show_equalizer (false);
+}
+
+static void eqwin_volume_set_knob ()
+{
+ int pos = equalizerwin_volume->get_pos ();
+ int x = (pos < 32) ? 1 : (pos < 63) ? 4 : 7;
+ equalizerwin_volume->set_knob (x, 30, x, 30);
+}
+
+void equalizerwin_set_volume_slider (int percent)
+{
+ equalizerwin_volume->set_pos ((percent * 94 + 50) / 100);
+ eqwin_volume_set_knob ();
+}
+
+static void eqwin_volume_motion_cb ()
+{
+ eqwin_volume_set_knob ();
+ int pos = equalizerwin_volume->get_pos ();
+ int v = (pos * 100 + 47) / 94;
+
+ mainwin_adjust_volume_motion (v);
+ mainwin_set_volume_slider (v);
+}
+
+static void eqwin_volume_release_cb ()
+{
+ eqwin_volume_set_knob ();
+ mainwin_adjust_volume_release ();
+}
+
+static void eqwin_balance_set_knob ()
+{
+ int pos = equalizerwin_balance->get_pos ();
+ int x = (pos < 13) ? 11 : (pos < 26) ? 14 : 17;
+ equalizerwin_balance->set_knob (x, 30, x, 30);
+}
+
+void equalizerwin_set_balance_slider (int percent)
+{
+ if (percent > 0)
+ equalizerwin_balance->set_pos (19 + (percent * 19 + 50) / 100);
+ else
+ equalizerwin_balance->set_pos (19 + (percent * 19 - 50) / 100);
+
+ eqwin_balance_set_knob ();
+}
+
+static void eqwin_balance_motion_cb ()
+{
+ eqwin_balance_set_knob ();
+ int pos = equalizerwin_balance->get_pos ();
+ pos = aud::min(pos, 38); /* The skin uses a even number of pixels
+ for the balance-slider *sigh* */
+ int b;
+ if (pos > 19)
+ b = ((pos - 19) * 100 + 9) / 19;
+ else
+ b = ((pos - 19) * 100 - 9) / 19;
+
+ mainwin_adjust_balance_motion (b);
+ mainwin_set_balance_slider (b);
+}
+
+static void eqwin_balance_release_cb ()
+{
+ eqwin_balance_set_knob ();
+ mainwin_adjust_balance_release ();
+}
+
+static void equalizerwin_create_widgets ()
+{
+ equalizerwin_on = new Button (25, 12, 10, 119, 128, 119, 69, 119, 187, 119, SKIN_EQMAIN, SKIN_EQMAIN);
+ equalizerwin->put_widget (false, equalizerwin_on, 14, 18);
+ equalizerwin_on->set_active (aud_get_bool ("equalizer_active"));
+ equalizerwin_on->on_release (eq_on_cb);
+
+ // AUTO button currently does nothing
+ equalizerwin_auto = new Button (33, 12, 35, 119, 153, 119, 94, 119, 212, 119, SKIN_EQMAIN, SKIN_EQMAIN);
+ equalizerwin->put_widget (false, equalizerwin_auto, 39, 18);
+
+ equalizerwin_presets = new Button (44, 12, 224, 164, 224, 176, SKIN_EQMAIN, SKIN_EQMAIN);
+ equalizerwin->put_widget (false, equalizerwin_presets, 217, 18);
+ equalizerwin_presets->on_release ((ButtonCB) audqt::eq_presets_show);
+
+ equalizerwin_close = new Button (9, 9, 0, 116, 0, 125, SKIN_EQMAIN, SKIN_EQMAIN);
+ equalizerwin->put_widget (false, equalizerwin_close, 264, 3);
+ equalizerwin_close->on_release ((ButtonCB) equalizerwin_close_cb);
+
+ equalizerwin_shade = new Button (9, 9, 254, 137, 1, 38, SKIN_EQMAIN, SKIN_EQ_EX);
+ equalizerwin->put_widget (false, equalizerwin_shade, 254, 3);
+ equalizerwin_shade->on_release ((ButtonCB) equalizerwin_shade_toggle);
+
+ equalizerwin_shaded_close = new Button (9, 9, 11, 38, 11, 47, SKIN_EQ_EX, SKIN_EQ_EX);
+ equalizerwin->put_widget (true, equalizerwin_shaded_close, 264, 3);
+ equalizerwin_shaded_close->on_release ((ButtonCB) equalizerwin_close_cb);
+
+ equalizerwin_shaded_shade = new Button (9, 9, 254, 3, 1, 47, SKIN_EQ_EX, SKIN_EQ_EX);
+ equalizerwin->put_widget (true, equalizerwin_shaded_shade, 254, 3);
+ equalizerwin_shaded_shade->on_release ((ButtonCB) equalizerwin_shade_toggle);
+
+ equalizerwin_graph = new EqGraph;
+ equalizerwin->put_widget (false, equalizerwin_graph, 86, 17);
+
+ equalizerwin_preamp = new EqSlider (_("Preamp"), -1);
+ equalizerwin->put_widget (false, equalizerwin_preamp, 21, 38);
+ equalizerwin_preamp->set_value (aud_get_double ("equalizer_preamp"));
+
+ const char * const bandnamesAUD_EQ_NBANDS = {N_("31 Hz"),
+ N_("63 Hz"), N_("125 Hz"), N_("250 Hz"), N_("500 Hz"), N_("1 kHz"),
+ N_("2 kHz"), N_("4 kHz"), N_("8 kHz"), N_("16 kHz")};
+ double bandsAUD_EQ_NBANDS;
+ aud_eq_get_bands (bands);
+
+ for (int i = 0; i < AUD_EQ_NBANDS; i ++)
+ {
+ equalizerwin_bandsi = new EqSlider (_(bandnamesi), i);
+ equalizerwin->put_widget (false, equalizerwin_bandsi, 78 + 18 * i, 38);
+ equalizerwin_bandsi->set_value (bandsi);
+ }
+
+ equalizerwin_volume = new HSlider (0, 94, SKIN_EQ_EX, 97, 8, 61, 4, 3, 7, 1, 30, 1, 30);
+ equalizerwin->put_widget (true, equalizerwin_volume, 61, 4);
+ equalizerwin_volume->on_move (eqwin_volume_motion_cb);
+ equalizerwin_volume->on_release (eqwin_volume_release_cb);
+
+ equalizerwin_balance = new HSlider (0, 39, SKIN_EQ_EX, 42, 8, 164, 4, 3, 7, 11, 30, 11, 30);
+ equalizerwin->put_widget (true, equalizerwin_balance, 164, 4);
+ equalizerwin_balance->on_move (eqwin_balance_motion_cb);
+ equalizerwin_balance->on_release (eqwin_balance_release_cb);
+}
+
+void EqWindow::draw (QPainter & cr)
+{
+ skin_draw_pixbuf (cr, SKIN_EQMAIN, 0, 0, 0, 0, 275, is_shaded () ? 14 : 116);
+
+ if (is_shaded ())
+ skin_draw_pixbuf (cr, SKIN_EQ_EX, 0, is_focused () ? 0 : 15, 0, 0, 275, 14);
+ else
+ skin_draw_pixbuf (cr, SKIN_EQMAIN, 0, is_focused () ? 134 : 149, 0, 0, 275, 14);
+}
+
+static void equalizerwin_create_window ()
+{
+ bool shaded = aud_get_bool ("skins", "equalizer_shaded");
+
+ /* do not allow shading the equalizer if eq_ex.bmp is missing */
+ if (skin.pixmapsSKIN_EQ_EX.isNull ())
+ shaded = false;
+
+ equalizerwin = new EqWindow (shaded);
+ equalizerwin->setWindowTitle (_("Audacious Equalizer"));
+ equalizerwin->setWindowRole ("equalizer");
+}
+
+void equalizerwin_unhook ()
+{
+ hook_dissociate ("set equalizer_active", (HookFunction) update_from_config);
+ hook_dissociate ("set equalizer_bands", (HookFunction) update_from_config);
+ hook_dissociate ("set equalizer_preamp", (HookFunction) update_from_config);
+}
+
+void equalizerwin_create ()
+{
+ equalizerwin_create_window ();
+ equalizerwin_create_widgets ();
+
+ hook_associate ("set equalizer_active", (HookFunction) update_from_config, nullptr);
+ hook_associate ("set equalizer_bands", (HookFunction) update_from_config, nullptr);
+ hook_associate ("set equalizer_preamp", (HookFunction) update_from_config, nullptr);
+}

audacious-plugins-4.4.1.tar.bz2/src/skins-qt/equalizer.h Added

@@ -0,0 +1,38 @@
+/* Audacious - Cross-platform multimedia player
+ * Copyright (C) 2005-2007 Audacious development team.
+ *
+ * Based on BMP:
+ * Copyright (C) 2003-2004 BMP development team.
+ *
+ * Based on XMMS:
+ * Copyright (C) 1998-2003 XMMS development team.
+ *
+ * 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; under version 3 of the License.
+ *
+ * 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>.
+ *
+ * The Audacious team does not consider modular code linking to
+ * Audacious or using our public API to be a derived work.
+ */
+
+#ifndef SKINS_UI_EQUALIZER_H
+#define SKINS_UI_EQUALIZER_H
+
+class Window;
+
+void equalizerwin_create ();
+void equalizerwin_unhook ();
+void equalizerwin_set_volume_slider (int percent);
+void equalizerwin_set_balance_slider (int percent);
+
+extern Window * equalizerwin;
+
+#endif /* SKINS_UI_EQUALIZER_H */

audacious-plugins-4.4.1.tar.bz2/src/skins-qt/hslider.cc Added

@@ -0,0 +1,131 @@
+/*
+ * Audacious - a cross-platform multimedia player
+ * Copyright (c) 2007 Tomasz Moń
+ * Copyright (c) 2011 John Lindgren
+ *
+ * Based on:
+ * BMP - Cross-platform multimedia player
+ * Copyright (C) 2003-2004 BMP development team.
+ * XMMS:
+ * Copyright (C) 1998-2003 XMMS development team.
+ *
+ * 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; under version 3 of the License.
+ *
+ * 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>.
+ *
+ * The Audacious team does not consider modular code linking to
+ * Audacious or using our public API to be a derived work.
+ */
+
+#include <libaudcore/objects.h>
+
+#include "skins_cfg.h"
+#include "hslider.h"
+
+#include "../ui-common/qt-compat.h"
+
+void HSlider::draw (QPainter & cr)
+{
+ skin_draw_pixbuf (cr, m_si, m_fx, m_fy, 0, 0, m_w, m_h);
+
+ if (m_pressed)
+ skin_draw_pixbuf (cr, m_si, m_kpx, m_kpy, m_pos, (m_h - m_kh) / 2, m_kw, m_kh);
+ else
+ skin_draw_pixbuf (cr, m_si, m_knx, m_kny, m_pos, (m_h - m_kh) / 2, m_kw, m_kh);
+}
+
+bool HSlider::button_press (QMouseEvent * event)
+{
+ if (event->button () != Qt::LeftButton)
+ return false;
+
+ m_pressed = true;
+ m_pos = aud::clamp ((int) QtCompat::x (event) / config.scale - m_kw / 2, m_min, m_max);
+
+ if (move)
+ move ();
+
+ queue_draw ();
+ return true;
+}
+
+bool HSlider::button_release (QMouseEvent * event)
+{
+ if (event->button () != Qt::LeftButton)
+ return false;
+
+ if (! m_pressed)
+ return true;
+
+ m_pressed = false;
+ m_pos = aud::clamp ((int) QtCompat::x (event) / config.scale - m_kw / 2, m_min, m_max);
+
+ if (release)
+ release ();
+
+ queue_draw ();
+ return true;
+}
+
+bool HSlider::motion (QMouseEvent * event)
+{
+ if (! m_pressed)
+ return true;
+
+ m_pressed = true;
+ m_pos = aud::clamp ((int) QtCompat::x (event) / config.scale - m_kw / 2, m_min, m_max);
+
+ if (move)
+ move ();
+
+ queue_draw ();
+ return true;
+}
+
+HSlider::HSlider (int min, int max, SkinPixmapId si, int w, int h, int fx,
+ int fy, int kw, int kh, int knx, int kny, int kpx, int kpy) :
+ m_min (min), m_max (max), m_si (si), m_w (w), m_h (h), m_fx (fx), m_fy (fy),
+ m_kw (kw), m_kh (kh), m_knx (knx), m_kny (kny), m_kpx (kpx), m_kpy (kpy)
+{
+ set_scale (config.scale);
+ add_input (w, h, true, true);
+}
+
+void HSlider::set_frame (int fx, int fy)
+{
+ m_fx = fx;
+ m_fy = fy;
+ queue_draw ();
+}
+
+void HSlider::set_knob (int knx, int kny, int kpx, int kpy)
+{
+ m_knx = knx;
+ m_kny = kny;
+ m_kpx = kpx;
+ m_kpy = kpy;
+ queue_draw ();
+}
+
+void HSlider::set_pos (int pos)
+{
+ if (m_pressed)
+ return;
+
+ m_pos = aud::clamp (pos, m_min, m_max);
+ queue_draw ();
+}
+
+void HSlider::set_pressed (bool pressed)
+{
+ m_pressed = pressed;
+ queue_draw ();
+}

audacious-plugins-4.4.1.tar.bz2/src/skins-qt/hslider.h Added

@@ -0,0 +1,70 @@
+/*
+ * Audacious - a cross-platform multimedia player
+ * Copyright (c) 2007 Tomasz Moń
+ * Copyright (c) 2011 John Lindgren
+ *
+ * Based on:
+ * BMP - Cross-platform multimedia player
+ * Copyright (C) 2003-2004 BMP development team.
+ * XMMS:
+ * Copyright (C) 1998-2003 XMMS development team.
+ *
+ * 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; under version 3 of the License.
+ *
+ * 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>.
+ *
+ * The Audacious team does not consider modular code linking to
+ * Audacious or using our public API to be a derived work.
+ */
+
+#ifndef SKINS_UI_SKINNED_HORIZONTAL_SLIDER_H
+#define SKINS_UI_SKINNED_HORIZONTAL_SLIDER_H
+
+#include "widget.h"
+#include "skin.h"
+
+class HSlider : public Widget
+{
+public:
+ HSlider (int min, int max, SkinPixmapId si, int w, int h, int fx, int fy,
+ int kw, int kh, int knx, int kny, int kpx, int kpy);
+
+ void set_frame (int fx, int fy);
+ void set_knob (int knx, int kny, int kpx, int kpy);
+ int get_pos () { return m_pos; }
+ void set_pos (int pos);
+ bool get_pressed () { return m_pressed; }
+ void set_pressed (bool pressed);
+
+ void on_move (void (* callback) ()) { move = callback; }
+ void on_release (void (* callback) ()) { release = callback; }
+
+private:
+ void draw (QPainter & cr);
+ bool button_press (QMouseEvent * event);
+ bool button_release (QMouseEvent * event);
+ bool motion (QMouseEvent * event);
+
+ int m_min, m_max;
+ SkinPixmapId m_si;
+ int m_w, m_h;
+ int m_fx, m_fy;
+ int m_kw, m_kh;
+ int m_knx, m_kny, m_kpx, m_kpy;
+
+ int m_pos = 0;
+ bool m_pressed = false;
+
+ void (* move) () = nullptr;
+ void (* release) () = nullptr;
+};
+
+#endif

audacious-plugins-4.4.1.tar.bz2/src/skins-qt/main.cc Added

@@ -0,0 +1,1246 @@
+/* Audacious - Cross-platform multimedia player
+ * Copyright (C) 2005-2011 Audacious development team.
+ *
+ * BMP - Cross-platform multimedia player
+ * Copyright (C) 2003-2004 BMP development team.
+ *
+ * Based on XMMS:
+ * Copyright (C) 1998-2003 XMMS development team.
+ *
+ * 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; under version 3 of the License.
+ *
+ * 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>.
+ *
+ * The Audacious team does not consider modular code linking to
+ * Audacious or using our public API to be a derived work.
+ */
+
+#include <math.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/time.h>
+
+#include <libaudcore/audstrings.h>
+#include <libaudcore/drct.h>
+#include <libaudcore/hook.h>
+#include <libaudcore/i18n.h>
+#include <libaudcore/mainloop.h>
+#include <libaudcore/plugins.h>
+#include <libaudcore/runtime.h>
+#include <libaudqt/libaudqt.h>
+
+#include "../ui-common/dialogs-qt.h"
+#include "../ui-common/qt-compat.h"
+
+#include "actions-mainwin.h"
+#include "actions-playlist.h"
+#include "dnd.h"
+#include "menus.h"
+#include "plugin.h"
+#include "skins_cfg.h"
+#include "equalizer.h"
+#include "main.h"
+#include "vis-callbacks.h"
+#include "playlistwin.h"
+#include "button.h"
+#include "hslider.h"
+#include "menurow.h"
+#include "monostereo.h"
+#include "number.h"
+#include "playlist-widget.h"
+#include "playstatus.h"
+#include "textbox.h"
+#include "window.h"
+#include "vis.h"
+#include "skins_util.h"
+#include "view.h"
+
+#define SEEK_THRESHOLD 200 /* milliseconds */
+#define SEEK_SPEED 50 /* milliseconds per pixel */
+
+class MainWindow : public Window
+{
+public:
+ MainWindow (bool shaded) :
+ Window (WINDOW_MAIN, & config.player_x, & config.player_y,
+ shaded ? MAINWIN_SHADED_WIDTH : skin.hints.mainwin_width,
+ shaded ? MAINWIN_SHADED_HEIGHT : skin.hints.mainwin_height, shaded),
+ m_dialogs (this) {}
+
+private:
+ DialogWindows m_dialogs;
+ int m_scroll_delta_x = 0;
+ int m_scroll_delta_y = 0;
+
+ void draw (QPainter & cr);
+ bool button_press (QMouseEvent * event);
+ bool scroll (QWheelEvent * event);
+
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+ void enterEvent (QEnterEvent * enterEvent);
+#else
+ void enterEvent (QEvent * event);
+#endif
+};
+
+Window * mainwin;
+
+Button * mainwin_eq, * mainwin_pl;
+TextBox * mainwin_info;
+MenuRow * mainwin_menurow;
+
+SkinnedVis * mainwin_vis;
+SmallVis * mainwin_svis;
+
+static bool seeking = false;
+static int seek_start, seek_time;
+
+static TextBox * locked_textbox = nullptr;
+static String locked_old_text;
+
+static QueuedFunc status_message_timeout;
+static QueuedFunc mainwin_volume_release_timeout;
+
+static Button * mainwin_menubtn, * mainwin_minimize, * mainwin_shade, * mainwin_close;
+static Button * mainwin_shaded_menubtn, * mainwin_shaded_minimize, * mainwin_shaded_shade, * mainwin_shaded_close;
+
+static Button * mainwin_rew, * mainwin_fwd;
+static Button * mainwin_eject;
+static Button * mainwin_play, * mainwin_pause, * mainwin_stop;
+static Button * mainwin_shuffle, * mainwin_repeat;
+
+static TextBox * mainwin_stime_min, * mainwin_stime_sec;
+static TextBox * mainwin_rate_text, * mainwin_freq_text, * mainwin_othertext;
+
+static PlayStatus * mainwin_playstatus;
+static SkinnedNumber * mainwin_minus_num, * mainwin_10min_num, * mainwin_min_num;
+static SkinnedNumber * mainwin_10sec_num, * mainwin_sec_num;
+static HSlider * mainwin_position, * mainwin_sposition;
+
+static HSlider * mainwin_volume, * mainwin_balance;
+static MonoStereo * mainwin_monostereo;
+
+static Button * mainwin_srew, * mainwin_splay, * mainwin_spause;
+static Button * mainwin_sstop, * mainwin_sfwd, * mainwin_seject, * mainwin_about;
+
+static void mainwin_position_motion_cb ();
+static void mainwin_position_release_cb ();
+static void seek_timeout (void * rewind);
+
+/* always returns a 6-character string */
+static StringBuf format_time (int time, int length)
+{
+ bool zero = aud_get_bool ("leading_zero");
+ bool remaining = aud_get_bool ("skins", "show_remaining_time");
+
+ if (remaining && length > 0)
+ {
+ time = (length - time) / 1000;
+ time = aud::clamp(0, time, 359999); // 99:59:59
+
+ if (time < 60)
+ return str_printf (zero ? "-00:%02d" : " -0:%02d", time);
+ else if (time < 6000)
+ return str_printf (zero ? "%03d:%02d" : "%3d:%02d", -time / 60, time % 60);
+ else
+ return str_printf ("%3d:%02d", -time / 3600, time / 60 % 60);
+ }
+ else
+ {
+ time /= 1000;
+ time = aud::clamp(0, time, 3599999); // 999:59:59
+
+ if (time < 6000)
+ return str_printf (zero ? " %02d:%02d" : " %2d:%02d", time / 60, time % 60);
+ else if (time < 60000)
+ return str_printf ("%3d:%02d", time / 60, time % 60);
+ else
+ return str_printf ("%3d:%02d", time / 3600, time / 60 % 60);
+ }
+}
+
+static void mainwin_menubtn_cb ()
+{
+ int x, y;
+ mainwin->getPosition (& x, & y);
+ menu_popup (UI_MENU_MAIN, x + 6 * config.scale,
+ y + MAINWIN_SHADED_HEIGHT * config.scale, false, false);
+}
+
+static void mainwin_minimize_cb ()
+{
+ mainwin->showMinimized ();
+}
+
+static void mainwin_shade_toggle ()
+{
+ view_set_player_shaded (! aud_get_bool ("skins", "player_shaded"));
+}
+
+static void mainwin_lock_info_text (const char * text)
+{
+ if (! locked_textbox)
+ {
+ locked_textbox = skin.hints.mainwin_othertext_is_status ? mainwin_othertext : mainwin_info;
+ locked_old_text = locked_textbox->get_text ();
+ }
+
+ locked_textbox->set_text (text);
+}
+
+static void mainwin_release_info_text ()
+{
+ if (locked_textbox)
+ {
+ locked_textbox->set_text (locked_old_text);
+ locked_textbox = nullptr;
+ locked_old_text = String ();
+ }
+}
+
+static void set_info_text (TextBox * textbox, const char * text)
+{
+ if (textbox == locked_textbox)
+ locked_old_text = String (text);
+ else
+ textbox->set_text (text);
+}
+
+#define mainwin_set_info_text(t) set_info_text (mainwin_info, (t))
+#define mainwin_set_othertext(t) set_info_text (mainwin_othertext, (t))
+
+void mainwin_show_status_message (const char * message)
+{
+ mainwin_lock_info_text (message);
+ status_message_timeout.queue (1000, mainwin_release_info_text);
+}
+
+static void mainwin_set_song_title (const char * title)
+{
+ StringBuf buf;
+
+ if (title)
+ buf = str_printf (_("%s - Audacious"), title);
+ else
+ buf = str_copy (_("Audacious"));
+
+ int instance = aud_get_instance ();
+ if (instance != 1)
+ str_append_printf (buf, " (%d)", instance);
+
+ mainwin->setWindowTitle ((const char *) buf);
+ mainwin_set_info_text (title ? title : "");
+}
+
+static void title_change ()
+{
+ if (aud_drct_get_ready ())
+ mainwin_set_song_title (aud_drct_get_title ());
+ else
+ mainwin_set_song_title ("Buffering ...");
+}
+
+static void setup_widget (Widget * widget, int x, int y, bool show)
+{
+ widget->setVisible (show);
+ mainwin->move_widget (false, widget, x, y);
+}
+
+void mainwin_refresh_hints ()
+{
+ const SkinHints * p = & skin.hints;
+
+ mainwin_menurow->setVisible (p->mainwin_menurow_visible);
+ mainwin_rate_text->setVisible (p->mainwin_streaminfo_visible);
+ mainwin_freq_text->setVisible (p->mainwin_streaminfo_visible);
+ mainwin_monostereo->setVisible (p->mainwin_streaminfo_visible);
+
+ mainwin_info->set_width (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);
+
+ bool playing = aud_drct_get_playing ();
+ bool can_seek = aud_drct_get_length () > 0;
+
+ setup_widget (mainwin_minus_num, p->mainwin_number_0_x, p->mainwin_number_0_y, playing);
+ setup_widget (mainwin_10min_num, p->mainwin_number_1_x, p->mainwin_number_1_y, playing);
+ setup_widget (mainwin_min_num, p->mainwin_number_2_x, p->mainwin_number_2_y, playing);
+ setup_widget (mainwin_10sec_num, p->mainwin_number_3_x, p->mainwin_number_3_y, playing);
+ setup_widget (mainwin_sec_num, p->mainwin_number_4_x, p->mainwin_number_4_y, playing);
+ setup_widget (mainwin_position, p->mainwin_position_x, p->mainwin_position_y, can_seek);
+
+ 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 (aud_get_bool ("skins", "player_shaded"))
+ mainwin->resize (MAINWIN_SHADED_WIDTH, MAINWIN_SHADED_HEIGHT);
+ else
+ mainwin->resize (p->mainwin_width, p->mainwin_height);
+
+ mainwin_vis->set_colors ();
+}
+
+/* note that the song info is not translated since it is displayed using
+ * the skinned bitmap font, which supports only the English alphabet */
+static void mainwin_set_song_info (int bitrate, int samplerate, int channels)
+{
+ char scratch32;
+ int length;
+
+ if (bitrate > 0)
+ {
+ if (bitrate < 1000000)
+ snprintf (scratch, sizeof scratch, "%3d", bitrate / 1000);
+ else
+ snprintf (scratch, sizeof scratch, "%2dH", bitrate / 100000);
+
+ mainwin_rate_text->set_text (scratch);
+ }
+ else
+ mainwin_rate_text->set_text (nullptr);
+
+ if (samplerate > 0)
+ {
+ snprintf (scratch, sizeof scratch, "%2d", samplerate / 1000);
+ mainwin_freq_text->set_text (scratch);
+ }
+ else
+ mainwin_freq_text->set_text (nullptr);
+
+ mainwin_monostereo->set_num_channels (channels);
+
+ if (bitrate > 0)
+ snprintf (scratch, sizeof scratch, "%d kbit/s", bitrate / 1000);
+ else
+ scratch0 = 0;
+
+ if (samplerate > 0)
+ {
+ length = strlen (scratch);
+ snprintf (scratch + length, sizeof scratch - length, "%s%d kHz", length ?
+ ", " : "", samplerate / 1000);
+ }
+
+ if (channels > 0)
+ {
+ length = strlen (scratch);
+ snprintf (scratch + length, sizeof scratch - length, "%s%s", length ?
+ ", " : "", channels > 2 ? "surround" : channels > 1 ? "stereo" : "mono");
+ }
+
+ mainwin_set_othertext (scratch);
+}
+
+static void info_change ()
+{
+ int bitrate, samplerate, channels;
+ aud_drct_get_info (bitrate, samplerate, channels);
+ mainwin_set_song_info (bitrate, samplerate, channels);
+}
+
+static void playback_pause ()
+{
+ mainwin_playstatus->set_status (STATUS_PAUSE);
+}
+
+static void playback_unpause ()
+{
+ mainwin_playstatus->set_status (STATUS_PLAY);
+}
+
+void mainwin_playback_begin ()
+{
+ mainwin_update_song_info ();
+
+ mainwin_stime_min->show ();
+ mainwin_stime_sec->show ();
+ mainwin_minus_num->show ();
+ mainwin_10min_num->show ();
+ mainwin_min_num->show ();
+ mainwin_10sec_num->show ();
+ mainwin_sec_num->show ();
+
+ if (aud_drct_get_length () > 0)
+ {
+ mainwin_position->show ();
+ mainwin_sposition->show ();
+ }
+
+ if (aud_drct_get_paused ())
+ playback_pause ();
+ else
+ playback_unpause ();
+
+ title_change ();
+ info_change ();
+}
+
+static void mainwin_playback_stop ()
+{
+ seeking = false;
+ timer_remove (TimerRate::Hz10, seek_timeout);
+
+ mainwin_set_song_title (nullptr);
+
+ mainwin_vis->clear ();
+ mainwin_svis->clear ();
+
+ mainwin_minus_num->hide ();
+ mainwin_10min_num->hide ();
+ mainwin_min_num->hide ();
+ mainwin_10sec_num->hide ();
+ mainwin_sec_num->hide ();
+ mainwin_stime_min->hide ();
+ mainwin_stime_sec->hide ();
+ mainwin_position->hide ();
+ mainwin_sposition->hide ();
+
+ mainwin_position->set_pressed (false);
+ mainwin_sposition->set_pressed (false);
+
+ /* clear sampling parameter displays */
+ mainwin_rate_text->set_text (nullptr);
+ mainwin_freq_text->set_text (nullptr);
+ mainwin_monostereo->set_num_channels (0);
+ mainwin_set_othertext ("");
+
+ mainwin_playstatus->set_status (STATUS_STOP);
+
+ playlistwin_hide_timer();
+}
+
+static void record_toggled ()
+{
+ if (aud_drct_get_record_enabled ())
+ {
+ if (aud_get_bool ("record"))
+ mainwin_show_status_message (_("Recording on"));
+ else
+ mainwin_show_status_message (_("Recording off"));
+ }
+}
+
+static void repeat_toggled ()
+{
+ mainwin_repeat->set_active (aud_get_bool ("repeat"));
+}
+
+static void shuffle_toggled ()
+{
+ mainwin_shuffle->set_active (aud_get_bool ("shuffle"));
+}
+
+static void no_advance_toggled ()
+{
+ if (aud_get_bool ("no_playlist_advance"))
+ mainwin_show_status_message (_("Single mode."));
+ else
+ mainwin_show_status_message (_("Playlist mode."));
+}
+
+static void stop_after_song_toggled ()
+{
+ if (aud_get_bool ("stop_after_current_song"))
+ mainwin_show_status_message (_("Stopping after song."));
+}
+
+bool MainWindow::scroll (QWheelEvent * event)
+{
+ m_scroll_delta_x += event->angleDelta ().x ();
+ m_scroll_delta_y += event->angleDelta ().y ();
+
+ /* we want discrete steps here */
+ int steps_x = m_scroll_delta_x / 120;
+ int steps_y = m_scroll_delta_y / 120;
+
+ if (steps_x != 0)
+ {
+ m_scroll_delta_x -= 120 * steps_x;
+ int step_size = aud_get_int ("step_size");
+ aud_drct_seek (aud_drct_get_time () - steps_x * step_size * 1000);
+ }
+
+ if (steps_y != 0)
+ {
+ m_scroll_delta_y -= 120 * steps_y;
+ int volume_delta = aud_get_int ("volume_delta");
+ mainwin_set_volume_diff (steps_y * volume_delta);
+ }
+
+ return true;
+}
+
+bool MainWindow::button_press (QMouseEvent * event)
+{
+ if (event->button () == Qt::LeftButton &&
+ event->type () == QEvent::MouseButtonDblClick &&
+ QtCompat::y (event) < 14 * config.scale)
+ {
+ mainwin_shade_toggle ();
+ return true;
+ }
+
+ if (event->button () == Qt::RightButton && event->type () == QEvent::MouseButtonPress)
+ {
+ menu_popup (UI_MENU_MAIN, QtCompat::globalX (event), QtCompat::globalY (event), false, false);
+ return true;
+ }
+
+ return Window::button_press (event);
+}
+
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+void MainWindow::enterEvent (QEnterEvent * enterEvent)
+{
+#else
+void MainWindow::enterEvent (QEvent * event)
+{
+ auto enterEvent = static_cast<QEnterEvent *> (event);
+#endif
+ if (! is_shaded () || ! aud_get_bool ("show_filepopup_for_tuple"))
+ return;
+
+ if (QtCompat::x (enterEvent) >= 79 * config.scale &&
+ QtCompat::x (enterEvent) <= 157 * config.scale)
+ {
+ audqt::infopopup_show_current ();
+ }
+}
+
+static void mainwin_playback_rpress (Button * button, QMouseEvent * event)
+{
+ menu_popup (UI_MENU_PLAYBACK, QtCompat::globalX (event), QtCompat::globalY (event), false, false);
+}
+
+bool Window::keypress (QKeyEvent * event)
+{
+ if (playlistwin_list->handle_keypress (event))
+ return true;
+
+ switch (event->key ())
+ {
+ case Qt::Key_Left:
+ aud_drct_seek (aud_drct_get_time () - aud_get_int ("step_size") * 1000);
+ break;
+ case Qt::Key_Right:
+ aud_drct_seek (aud_drct_get_time () + aud_get_int ("step_size") * 1000);
+ break;
+ case Qt::Key_Space:
+ aud_drct_pause ();
+ break;
+ default:
+ return false;
+ }
+
+ return true;
+}
+
+#if 0
+void mainwin_drag_data_received (GtkWidget * widget, GdkDragContext * context,
+ int x, int y, GtkSelectionData * selection_data, unsigned info, unsigned time, void *)
+{
+ g_return_if_fail (selection_data != nullptr);
+
+ const char * data = (const char *) gtk_selection_data_get_data (selection_data);
+ g_return_if_fail (data);
+
+ if (str_has_prefix_nocase (data, "file:///"))
+ {
+ if (str_has_suffix_nocase (data, ".wsz\r\n") || str_has_suffix_nocase
+ (data, ".zip\r\n"))
+ {
+ on_skin_view_drag_data_received (0, context, x, y, selection_data, info, time, 0);
+ return;
+ }
+ }
+
+ audgui_urilist_open (data);
+}
+#endif
+
+static int time_now ()
+{
+ struct timeval tv;
+ gettimeofday (& tv, nullptr);
+ return (tv.tv_sec % (24 * 3600) * 1000 + tv.tv_usec / 1000);
+}
+
+static int time_diff (int a, int b)
+{
+ if (a > 18 * 3600 * 1000 && b < 6 * 3600 * 1000) /* detect midnight */
+ b += 24 * 3600 * 1000;
+ return (b > a) ? b - a : 0;
+}
+
+static void seek_timeout (void * rewind)
+{
+ int held = time_diff (seek_time, time_now ());
+ if (held < SEEK_THRESHOLD)
+ return;
+
+ int position;
+ if (aud::from_ptr<bool> (rewind))
+ position = seek_start - held / SEEK_SPEED;
+ else
+ position = seek_start + held / SEEK_SPEED;
+
+ position = aud::clamp (position, 0, 219);
+ mainwin_position->set_pos (position);
+ mainwin_position_motion_cb ();
+}
+
+static void seek_press (QMouseEvent * event, bool rewind)
+{
+ if (event->button () != Qt::LeftButton || seeking)
+ return;
+
+ seeking = true;
+ seek_start = mainwin_position->get_pos ();
+ seek_time = time_now ();
+ timer_add (TimerRate::Hz10, seek_timeout, aud::to_ptr (rewind));
+}
+
+static void seek_release (QMouseEvent * event, bool rewind)
+{
+ if (event->button () != Qt::LeftButton || ! seeking)
+ return;
+
+ if (! aud_drct_get_playing () || time_diff (seek_time, time_now ()) <
+ SEEK_THRESHOLD)
+ {
+ if (rewind)
+ aud_drct_pl_prev ();
+ else
+ aud_drct_pl_next ();
+ }
+ else
+ mainwin_position_release_cb ();
+
+ seeking = false;
+ timer_remove (TimerRate::Hz10, seek_timeout);
+}
+
+static void mainwin_rew_press (Button * button, QMouseEvent * event)
+ { seek_press (event, true); }
+static void mainwin_rew_release (Button * button, QMouseEvent * event)
+ { seek_release (event, true); }
+static void mainwin_fwd_press (Button * button, QMouseEvent * event)
+ { seek_press (event, false); }
+static void mainwin_fwd_release (Button * button, QMouseEvent * event)
+ { seek_release (event, false); }
+
+static void mainwin_shuffle_cb (Button * button, QMouseEvent * event)
+ { aud_set_bool ("shuffle", button->get_active ()); }
+static void mainwin_repeat_cb (Button * button, QMouseEvent * event)
+ { aud_set_bool ("repeat", button->get_active ()); }
+static void mainwin_eq_cb (Button * button, QMouseEvent * event)
+ { view_set_show_equalizer (button->get_active ()); }
+static void mainwin_pl_cb (Button * button, QMouseEvent * event)
+ { view_set_show_playlist (button->get_active ()); }
+
+static void mainwin_spos_set_knob ()
+{
+ int pos = mainwin_sposition->get_pos ();
+ int x = (pos < 6) ? 17 : (pos < 9) ? 20 : 23;
+ mainwin_sposition->set_knob (x, 36, x, 36);
+}
+
+static void mainwin_spos_motion_cb ()
+{
+ mainwin_spos_set_knob ();
+
+ int pos = mainwin_sposition->get_pos ();
+ int length = aud_drct_get_length ();
+ int time = (pos - 1) * length / 12;
+
+ StringBuf buf = format_time (time, length);
+
+ mainwin_stime_min->set_text (buf);
+ mainwin_stime_sec->set_text (buf + 4);
+}
+
+static void mainwin_spos_release_cb ()
+{
+ mainwin_spos_set_knob ();
+
+ int pos = mainwin_sposition->get_pos ();
+ aud_drct_seek (aud_drct_get_length () * (pos - 1) / 12);
+}
+
+static void mainwin_position_motion_cb ()
+{
+ int length = aud_drct_get_length () / 1000;
+ int pos = mainwin_position->get_pos ();
+ int time = pos * length / 219;
+
+ mainwin_lock_info_text (str_printf (_("Seek to %d:%-2.2d / %d:%-2.2d"),
+ time / 60, time % 60, length / 60, length % 60));
+}
+
+static void mainwin_position_release_cb ()
+{
+ int length = aud_drct_get_length ();
+ int pos = mainwin_position->get_pos ();
+ int time = (int64_t) pos * length / 219;
+
+ aud_drct_seek(time);
+ mainwin_release_info_text();
+}
+
+void mainwin_adjust_volume_motion (int v)
+{
+ aud_drct_set_volume_main (v);
+ mainwin_lock_info_text (str_printf (_("Volume: %d%%"), v));
+}
+
+void mainwin_adjust_volume_release ()
+{
+ mainwin_release_info_text ();
+}
+
+void mainwin_adjust_balance_motion (int b)
+{
+ aud_drct_set_volume_balance (b);
+
+ if (b < 0)
+ mainwin_lock_info_text (str_printf (_("Balance: %d%% left"), -b));
+ else if (b == 0)
+ mainwin_lock_info_text (_("Balance: center"));
+ else
+ mainwin_lock_info_text (str_printf (_("Balance: %d%% right"), b));
+}
+
+void mainwin_adjust_balance_release ()
+{
+ mainwin_release_info_text ();
+}
+
+static void mainwin_volume_set_frame ()
+{
+ int pos = mainwin_volume->get_pos ();
+ int frame = (pos * 27 + 25) / 51;
+ mainwin_volume->set_frame (0, 15 * frame);
+}
+
+void mainwin_set_volume_slider (int percent)
+{
+ mainwin_volume->set_pos ((percent * 51 + 50) / 100);
+ mainwin_volume_set_frame ();
+}
+
+static void mainwin_volume_motion_cb ()
+{
+ mainwin_volume_set_frame ();
+ int pos = mainwin_volume->get_pos ();
+ int vol = (pos * 100 + 25) / 51;
+
+ mainwin_adjust_volume_motion (vol);
+ equalizerwin_set_volume_slider (vol);
+}
+
+static void mainwin_volume_release_cb ()
+{
+ mainwin_volume_set_frame ();
+ mainwin_adjust_volume_release ();
+}
+
+static void mainwin_balance_set_frame ()
+{
+ int pos = mainwin_balance->get_pos ();
+ int frame = (abs (pos - 12) * 27 + 6) / 12;
+ mainwin_balance->set_frame (9, 15 * frame);
+}
+
+void mainwin_set_balance_slider (int percent)
+{
+ if (percent > 0)
+ mainwin_balance->set_pos (12 + (percent * 12 + 50) / 100);
+ else
+ mainwin_balance->set_pos (12 + (percent * 12 - 50) / 100);
+
+ mainwin_balance_set_frame ();
+}
+
+static void mainwin_balance_motion_cb ()
+{
+ mainwin_balance_set_frame ();
+ int pos = mainwin_balance->get_pos ();
+
+ int bal;
+ if (pos > 12)
+ bal = ((pos - 12) * 100 + 6) / 12;
+ else
+ bal = ((pos - 12) * 100 - 6) / 12;
+
+ mainwin_adjust_balance_motion (bal);
+ equalizerwin_set_balance_slider (bal);
+}
+
+static void mainwin_balance_release_cb ()
+{
+ mainwin_balance_set_frame ();
+ mainwin_adjust_volume_release ();
+}
+
+void mainwin_set_volume_diff (int diff)
+{
+ int vol = aud_drct_get_volume_main ();
+
+ vol = aud::clamp (vol + diff, 0, 100);
+ mainwin_adjust_volume_motion (vol);
+ mainwin_set_volume_slider (vol);
+ equalizerwin_set_volume_slider (vol);
+
+ mainwin_volume_release_timeout.queue (700, mainwin_volume_release_cb);
+}
+
+void mainwin_mr_change (MenuRowItem i)
+{
+ switch (i)
+ {
+ case MENUROW_OPTIONS:
+ mainwin_lock_info_text (_("Options Menu"));
+ break;
+ case MENUROW_ALWAYS:
+ if (aud_get_bool ("skins", "always_on_top"))
+ mainwin_lock_info_text (_("Disable 'Always On Top'"));
+ else
+ mainwin_lock_info_text (_("Enable 'Always On Top'"));
+ break;
+ case MENUROW_FILEINFOBOX:
+ mainwin_lock_info_text (_("File Info Box"));
+ break;
+ case MENUROW_SCALE:
+ mainwin_lock_info_text (_("Double Size"));
+ break;
+ case MENUROW_VISUALIZATION:
+ mainwin_lock_info_text (_("Visualizations"));
+ break;
+ default:
+ break;
+ }
+}
+
+void mainwin_mr_release (MenuRowItem i, QMouseEvent * event)
+{
+ switch (i)
+ {
+ case MENUROW_OPTIONS:
+ menu_popup (UI_MENU_VIEW, QtCompat::globalX (event), QtCompat::globalY (event), false, false);
+ break;
+ case MENUROW_ALWAYS:
+ view_set_on_top (! aud_get_bool ("skins", "always_on_top"));
+ break;
+ case MENUROW_FILEINFOBOX:
+ audqt::infowin_show_current ();
+ break;
+ case MENUROW_SCALE:
+ view_set_double_size (! aud_get_bool ("skins", "double_size"));
+ break;
+ case MENUROW_VISUALIZATION:
+ audqt::prefswin_show_plugin_page (PluginType::Vis);
+ break;
+ default:
+ break;
+ }
+
+ mainwin_release_info_text();
+}
+
+bool change_timer_mode_cb (QMouseEvent * event)
+{
+ if (event->type () != QEvent::MouseButtonPress || event->button () != Qt::LeftButton)
+ return false;
+
+ view_set_show_remaining (! aud_get_bool ("skins", "show_remaining_time"));
+ return true;
+}
+
+static bool mainwin_info_button_press (QMouseEvent * event)
+{
+ if (event->type () == QEvent::MouseButtonPress && event->button () == Qt::RightButton)
+ {
+ menu_popup (UI_MENU_PLAYBACK, QtCompat::globalX (event), QtCompat::globalY (event), false, false);
+ return true;
+ }
+
+ if (event->type () == QEvent::MouseButtonDblClick && event->button () == Qt::LeftButton)
+ {
+ audqt::infowin_show_current ();
+ return true;
+ }
+
+ return false;
+}
+
+static void mainwin_create_widgets ()
+{
+ mainwin_menubtn = new Button (9, 9, 0, 0, 0, 9, SKIN_TITLEBAR, SKIN_TITLEBAR);
+ mainwin->put_widget (false, mainwin_menubtn, 6, 3);
+ mainwin_menubtn->on_release ((ButtonCB) mainwin_menubtn_cb);
+
+ mainwin_minimize = new Button (9, 9, 9, 0, 9, 9, SKIN_TITLEBAR, SKIN_TITLEBAR);
+ mainwin->put_widget (false, mainwin_minimize, 244, 3);
+ mainwin_minimize->on_release ((ButtonCB) mainwin_minimize_cb);
+
+ mainwin_shade = new Button (9, 9, 0, 18, 9, 18, SKIN_TITLEBAR, SKIN_TITLEBAR);
+ mainwin->put_widget (false, mainwin_shade, 254, 3);
+ mainwin_shade->on_release ((ButtonCB) mainwin_shade_toggle);
+
+ mainwin_close = new Button (9, 9, 18, 0, 18, 9, SKIN_TITLEBAR, SKIN_TITLEBAR);
+ mainwin->put_widget (false, mainwin_close, 264, 3);
+ mainwin_close->on_release ((ButtonCB) skins_close);
+
+ mainwin_rew = new Button (23, 18, 0, 0, 0, 18, SKIN_CBUTTONS, SKIN_CBUTTONS);
+ mainwin->put_widget (false, mainwin_rew, 16, 88);
+ mainwin_rew->on_press (mainwin_rew_press);
+ mainwin_rew->on_release (mainwin_rew_release);
+ mainwin_rew->on_rpress (mainwin_playback_rpress);
+
+ mainwin_fwd = new Button (22, 18, 92, 0, 92, 18, SKIN_CBUTTONS, SKIN_CBUTTONS);
+ mainwin->put_widget (false, mainwin_fwd, 108, 88);
+ mainwin_fwd->on_press (mainwin_fwd_press);
+ mainwin_fwd->on_release (mainwin_fwd_release);
+ mainwin_fwd->on_rpress (mainwin_playback_rpress);
+
+ mainwin_play = new Button (23, 18, 23, 0, 23, 18, SKIN_CBUTTONS, SKIN_CBUTTONS);
+ mainwin->put_widget (false, mainwin_play, 39, 88);
+ mainwin_play->on_release ((ButtonCB) aud_drct_play);
+ mainwin_play->on_rpress (mainwin_playback_rpress);
+
+ mainwin_pause = new Button (23, 18, 46, 0, 46, 18, SKIN_CBUTTONS, SKIN_CBUTTONS);
+ mainwin->put_widget (false, mainwin_pause, 62, 88);
+ mainwin_pause->on_release ((ButtonCB) aud_drct_pause);
+ mainwin_pause->on_rpress (mainwin_playback_rpress);
+
+ mainwin_stop = new Button (23, 18, 69, 0, 69, 18, SKIN_CBUTTONS, SKIN_CBUTTONS);
+ mainwin->put_widget (false, mainwin_stop, 85, 88);
+ mainwin_stop->on_release ((ButtonCB) aud_drct_stop);
+ mainwin_stop->on_rpress (mainwin_playback_rpress);
+
+ mainwin_eject = new Button (22, 16, 114, 0, 114, 16, SKIN_CBUTTONS, SKIN_CBUTTONS);
+ mainwin->put_widget (false, mainwin_eject, 136, 89);
+ mainwin_eject->on_release ((ButtonCB) action_play_file);
+
+ mainwin_shuffle = new Button (46, 15, 28, 0, 28, 15, 28, 30, 28, 45, SKIN_SHUFREP, SKIN_SHUFREP);
+ mainwin->put_widget (false, mainwin_shuffle, 164, 89);
+ mainwin_shuffle->set_active (aud_get_bool ("shuffle"));
+ mainwin_shuffle->on_release (mainwin_shuffle_cb);
+
+ mainwin_repeat = new Button (28, 15, 0, 0, 0, 15, 0, 30, 0, 45, SKIN_SHUFREP, SKIN_SHUFREP);
+ mainwin->put_widget (false, mainwin_repeat, 210, 89);
+ mainwin_repeat->set_active (aud_get_bool ("repeat"));
+ mainwin_repeat->on_release (mainwin_repeat_cb);
+
+ mainwin_eq = new Button (23, 12, 0, 61, 46, 61, 0, 73, 46, 73, SKIN_SHUFREP, SKIN_SHUFREP);
+ mainwin->put_widget (false, mainwin_eq, 219, 58);
+ mainwin_eq->on_release (mainwin_eq_cb);
+
+ mainwin_pl = new Button (23, 12, 23, 61, 69, 61, 23, 73, 69, 73, SKIN_SHUFREP, SKIN_SHUFREP);
+ mainwin->put_widget (false, mainwin_pl, 242, 58);
+ mainwin_pl->on_release (mainwin_pl_cb);
+
+ String font;
+ if (! config.mainwin_use_bitmapfont)
+ font = aud_get_str ("skins", "mainwin_font");
+
+ bool shaded = aud_get_bool ("skins", "mainwin_shaded");
+ mainwin_info = new TextBox (153, font, ! shaded && config.autoscroll);
+ mainwin->put_widget (false, mainwin_info, 112, 27);
+ mainwin_info->on_press (mainwin_info_button_press);
+
+ mainwin_othertext = new TextBox (153, nullptr, false);
+ mainwin->put_widget (false, mainwin_othertext, 112, 43);
+
+ mainwin_rate_text = new TextBox (15, nullptr, false);
+ mainwin->put_widget (false, mainwin_rate_text, 111, 43);
+
+ mainwin_freq_text = new TextBox (10, nullptr, false);
+ mainwin->put_widget (false, mainwin_freq_text, 156, 43);
+
+ mainwin_menurow = new MenuRow;
+ mainwin->put_widget (false, mainwin_menurow, 10, 22);
+
+ mainwin_volume = new HSlider (0, 51, SKIN_VOLUME, 68, 13, 0, 0, 14, 11, 15, 422, 0, 422);
+ mainwin->put_widget (false, mainwin_volume, 107, 57);
+ mainwin_volume->on_move (mainwin_volume_motion_cb);
+ mainwin_volume->on_release (mainwin_volume_release_cb);
+
+ mainwin_balance = new HSlider (0, 24, SKIN_BALANCE, 38, 13, 9, 0, 14, 11, 15, 422, 0, 422);
+ mainwin->put_widget (false, mainwin_balance, 177, 57);
+ mainwin_balance->on_move (mainwin_balance_motion_cb);
+ mainwin_balance->on_release (mainwin_balance_release_cb);
+
+ mainwin_monostereo = new MonoStereo;
+ mainwin->put_widget (false, mainwin_monostereo, 212, 41);
+
+ mainwin_playstatus = new PlayStatus;
+ mainwin->put_widget (false, mainwin_playstatus, 24, 28);
+
+ mainwin_minus_num = new SkinnedNumber;
+ mainwin->put_widget (false, mainwin_minus_num, 36, 26);
+
+ mainwin_10min_num = new SkinnedNumber;
+ mainwin->put_widget (false, mainwin_10min_num, 48, 26);
+
+ mainwin_min_num = new SkinnedNumber;
+ mainwin->put_widget (false, mainwin_min_num, 60, 26);
+
+ mainwin_10sec_num = new SkinnedNumber;
+ mainwin->put_widget (false, mainwin_10sec_num, 78, 26);
+
+ mainwin_sec_num = new SkinnedNumber;
+ mainwin->put_widget (false, mainwin_sec_num, 90, 26);
+
+ mainwin_about = new Button (20, 25);
+ mainwin->put_widget (false, mainwin_about, 247, 83);
+ mainwin_about->on_release ((ButtonCB) audqt::aboutwindow_show);
+
+ mainwin_vis = new SkinnedVis;
+ mainwin->put_widget (false, mainwin_vis, 24, 43);
+
+ mainwin_position = new HSlider (0, 219, SKIN_POSBAR, 248, 10, 0, 0, 29, 10, 248, 0, 278, 0);
+ mainwin->put_widget (false, mainwin_position, 16, 72);
+ mainwin_position->on_move (mainwin_position_motion_cb);
+ mainwin_position->on_release (mainwin_position_release_cb);
+
+ /* shaded */
+
+ mainwin_shaded_menubtn = new Button (9, 9, 0, 0, 0, 9, SKIN_TITLEBAR, SKIN_TITLEBAR);
+ mainwin->put_widget (true, mainwin_shaded_menubtn, 6, 3);
+ mainwin_shaded_menubtn->on_release ((ButtonCB) mainwin_menubtn_cb);
+
+ mainwin_shaded_minimize = new Button (9, 9, 9, 0, 9, 9, SKIN_TITLEBAR, SKIN_TITLEBAR);
+ mainwin->put_widget (true, mainwin_shaded_minimize, 244, 3);
+ mainwin_shaded_minimize->on_release ((ButtonCB) mainwin_minimize_cb);
+
+ mainwin_shaded_shade = new Button (9, 9, 0, 27, 9, 27, SKIN_TITLEBAR, SKIN_TITLEBAR);
+ mainwin->put_widget (true, mainwin_shaded_shade, 254, 3);
+ mainwin_shaded_shade->on_release ((ButtonCB) mainwin_shade_toggle);
+
+ mainwin_shaded_close = new Button (9, 9, 18, 0, 18, 9, SKIN_TITLEBAR, SKIN_TITLEBAR);
+ mainwin->put_widget (true, mainwin_shaded_close, 264, 3);
+ mainwin_shaded_close->on_release ((ButtonCB) skins_close);
+
+ mainwin_srew = new Button (8, 7);
+ mainwin->put_widget (true, mainwin_srew, 169, 4);
+ mainwin_srew->on_release ((ButtonCB) aud_drct_pl_prev);
+
+ mainwin_splay = new Button (10, 7);
+ mainwin->put_widget (true, mainwin_splay, 177, 4);
+ mainwin_splay->on_release ((ButtonCB) aud_drct_play);
+
+ mainwin_spause = new Button (10, 7);
+ mainwin->put_widget (true, mainwin_spause, 187, 4);
+ mainwin_spause->on_release ((ButtonCB) aud_drct_pause);
+
+ mainwin_sstop = new Button (9, 7);
+ mainwin->put_widget (true, mainwin_sstop, 197, 4);
+ mainwin_sstop->on_release ((ButtonCB) aud_drct_stop);
+
+ mainwin_sfwd = new Button (8, 7);
+ mainwin->put_widget (true, mainwin_sfwd, 206, 4);
+ mainwin_sfwd->on_release ((ButtonCB) aud_drct_pl_next);
+
+ mainwin_seject = new Button (9, 7);
+ mainwin->put_widget (true, mainwin_seject, 216, 4);
+ mainwin_seject->on_release ((ButtonCB) action_play_file);
+
+ mainwin_svis = new SmallVis ();
+ mainwin->put_widget (true, mainwin_svis, 79, 5);
+
+ mainwin_sposition = new HSlider (1, 13, SKIN_TITLEBAR, 17, 7, 0, 36, 3, 7, 17, 36, 17, 36);
+ mainwin->put_widget (true, mainwin_sposition, 226, 4);
+ mainwin_sposition->on_move (mainwin_spos_motion_cb);
+ mainwin_sposition->on_release (mainwin_spos_release_cb);
+
+ mainwin_stime_min = new TextBox (15, nullptr, false);
+ mainwin->put_widget (true, mainwin_stime_min, 130, 4);
+ mainwin_stime_min->on_press (change_timer_mode_cb);
+
+ mainwin_stime_sec = new TextBox (10, nullptr, false);
+ mainwin->put_widget (true, mainwin_stime_sec, 147, 4);
+ mainwin_stime_sec->on_press (change_timer_mode_cb);
+}
+
+#if 0
+static gboolean state_cb (GtkWidget * widget, GdkEventWindowState * event, void *)
+{
+ if (event->changed_mask & GDK_WINDOW_STATE_STICKY)
+ view_set_sticky (!! (event->new_window_state & GDK_WINDOW_STATE_STICKY));
+
+ if (event->changed_mask & GDK_WINDOW_STATE_ABOVE)
+ view_set_on_top (!! (event->new_window_state & GDK_WINDOW_STATE_ABOVE));
+
+ return true;
+}
+#endif
+
+void MainWindow::draw (QPainter & cr)
+{
+ int width = is_shaded () ? MAINWIN_SHADED_WIDTH : skin.hints.mainwin_width;
+ int height = is_shaded () ? MAINWIN_SHADED_HEIGHT : skin.hints.mainwin_height;
+
+ skin_draw_pixbuf (cr, SKIN_MAIN, 0, 0, 0, 0, width, height);
+ skin_draw_mainwin_titlebar (cr, is_shaded (), is_focused ());
+}
+
+static void mainwin_create_window ()
+{
+ bool shaded = aud_get_bool ("skins", "player_shaded");
+
+ mainwin = new MainWindow (shaded);
+ mainwin->setWindowRole("mainwindow");
+
+#if 0
+ GtkWidget * w = mainwin->gtk ();
+ drag_dest_set (w);
+
+ g_signal_connect (w, "drag-data-received", (GCallback) mainwin_drag_data_received, nullptr);
+ g_signal_connect (w, "window-state-event", (GCallback) state_cb, nullptr);
+#endif
+
+ hook_associate ("playback begin", (HookFunction) mainwin_playback_begin, nullptr);
+ hook_associate ("playback ready", (HookFunction) mainwin_playback_begin, nullptr);
+ hook_associate ("playback seek", (HookFunction) mainwin_update_song_info, nullptr);
+ hook_associate ("playback stop", (HookFunction) mainwin_playback_stop, nullptr);
+ hook_associate ("playback pause", (HookFunction) playback_pause, nullptr);
+ hook_associate ("playback unpause", (HookFunction) playback_unpause, nullptr);
+ hook_associate ("title change", (HookFunction) title_change, nullptr);
+ hook_associate ("info change", (HookFunction) info_change, nullptr);
+ hook_associate ("set record", (HookFunction) record_toggled, nullptr);
+ hook_associate ("set repeat", (HookFunction) repeat_toggled, nullptr);
+ hook_associate ("set shuffle", (HookFunction) shuffle_toggled, nullptr);
+ hook_associate ("set no_playlist_advance", (HookFunction) no_advance_toggled, nullptr);
+ hook_associate ("set stop_after_current_song", (HookFunction) stop_after_song_toggled, nullptr);
+}
+
+void mainwin_unhook ()
+{
+ seeking = false;
+ timer_remove (TimerRate::Hz10, seek_timeout);
+
+ status_message_timeout.stop ();
+ mainwin_volume_release_timeout.stop ();
+
+ hook_dissociate ("playback begin", (HookFunction) mainwin_playback_begin);
+ hook_dissociate ("playback ready", (HookFunction) mainwin_playback_begin);
+ hook_dissociate ("playback seek", (HookFunction) mainwin_update_song_info);
+ hook_dissociate ("playback stop", (HookFunction) mainwin_playback_stop);
+ hook_dissociate ("playback pause", (HookFunction) playback_pause);
+ hook_dissociate ("playback unpause", (HookFunction) playback_unpause);
+ hook_dissociate ("title change", (HookFunction) title_change);
+ hook_dissociate ("info change", (HookFunction) info_change);
+ hook_dissociate ("set record", (HookFunction) record_toggled);
+ hook_dissociate ("set repeat", (HookFunction) repeat_toggled);
+ hook_dissociate ("set shuffle", (HookFunction) shuffle_toggled);
+ hook_dissociate ("set no_playlist_advance", (HookFunction) no_advance_toggled);
+ hook_dissociate ("set stop_after_current_song", (HookFunction) stop_after_song_toggled);
+
+ start_stop_visual (true);
+
+ locked_textbox = nullptr;
+ locked_old_text = String ();
+}
+
+void mainwin_create ()
+{
+ mainwin_create_window ();
+ mainwin_create_widgets ();
+ mainwin_set_song_title (nullptr);
+}
+
+static void mainwin_update_volume ()
+{
+ int volume = aud_drct_get_volume_main ();
+ int balance = aud_drct_get_volume_balance ();
+
+ mainwin_set_volume_slider (volume);
+ mainwin_set_balance_slider (balance);
+ equalizerwin_set_volume_slider (volume);
+ equalizerwin_set_balance_slider (balance);
+}
+
+static void mainwin_update_time_display (int time, int length)
+{
+ StringBuf scratch = format_time (time, length);
+
+ mainwin_minus_num->set (scratch0);
+ mainwin_10min_num->set (scratch1);
+ mainwin_min_num->set (scratch2);
+ mainwin_10sec_num->set (scratch4);
+ mainwin_sec_num->set (scratch5);
+
+ if (! mainwin_sposition->get_pressed ())
+ {
+ mainwin_stime_min->set_text (scratch);
+ mainwin_stime_sec->set_text (scratch + 4);
+ }
+
+ playlistwin_set_time (scratch, scratch + 4);
+}
+
+static void mainwin_update_time_slider (int time, int length)
+{
+ mainwin_position->setVisible (length > 0);
+ mainwin_sposition->setVisible (length > 0);
+
+ if (length > 0 && ! seeking)
+ {
+ if (time < length)
+ {
+ mainwin_position->set_pos (time * (int64_t) 219 / length);
+ mainwin_sposition->set_pos (1 + time * (int64_t) 12 / length);
+ }
+ else
+ {
+ mainwin_position->set_pos (219);
+ mainwin_sposition->set_pos (13);
+ }
+
+ mainwin_spos_set_knob ();
+ }
+}
+
+void mainwin_update_song_info ()
+{
+ mainwin_update_volume ();
+
+ if (! aud_drct_get_playing ())
+ return;
+
+ int time = 0, length = 0;
+ if (aud_drct_get_ready ())
+ {
+ time = aud_drct_get_time ();
+ length = aud_drct_get_length ();
+ }
+
+ mainwin_update_time_display (time, length);
+ mainwin_update_time_slider (time, length);
+}

audacious-plugins-4.4.1.tar.bz2/src/skins-qt/main.h Added

@@ -0,0 +1,79 @@
+/* BMP - Cross-platform multimedia player
+ * Copyright (C) 2003-2004 BMP development team.
+ *
+ * Based on XMMS:
+ * Copyright (C) 1998-2003 XMMS development team.
+ *
+ * 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; under version 3 of the License.
+ *
+ * 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>.
+ *
+ * The Audacious team does not consider modular code linking to
+ * Audacious or using our public API to be a derived work.
+ */
+
+#ifndef SKINS_UI_MAIN_H
+#define SKINS_UI_MAIN_H
+
+/* yes, main window size is fixed */
+#define MAINWIN_WIDTH (int)275
+#define MAINWIN_HEIGHT (int)116
+#define MAINWIN_SHADED_WIDTH MAINWIN_WIDTH
+#define MAINWIN_SHADED_HEIGHT (int)14
+
+class Button;
+class MenuRow;
+class QMouseEvent;
+class SkinnedVis;
+class SmallVis;
+class TextBox;
+class Window;
+
+extern Window * mainwin;
+
+extern Button * mainwin_eq, * mainwin_pl;
+extern TextBox * mainwin_info;
+extern MenuRow * mainwin_menurow;
+
+extern SkinnedVis * mainwin_vis;
+extern SmallVis * mainwin_svis;
+
+void mainwin_create ();
+void mainwin_unhook ();
+
+void mainwin_adjust_volume_motion (int v);
+void mainwin_adjust_volume_release ();
+void mainwin_adjust_balance_motion (int b);
+void mainwin_adjust_balance_release ();
+void mainwin_set_volume_slider (int percent);
+void mainwin_set_balance_slider (int percent);
+void mainwin_set_volume_diff (int diff);
+
+void mainwin_refresh_hints ();
+void mainwin_playback_begin ();
+
+void mainwin_update_song_info ();
+void mainwin_show_status_message (const char * message);
+
+#if 0
+void mainwin_drag_data_received(GtkWidget * widget,
+ GdkDragContext * context,
+ int x,
+ int y,
+ GtkSelectionData * selection_data,
+ unsigned info,
+ unsigned time,
+ void * user_data);
+#endif
+
+bool change_timer_mode_cb (QMouseEvent * event);
+
+#endif /* SKINS_UI_MAIN_H */

audacious-plugins-4.4.1.tar.bz2/src/skins-qt/menu-ops.cc Added

audacious-plugins-4.4.1.tar.bz2/src/skins-qt/menurow.cc Added

@@ -0,0 +1,124 @@
+/*
+ * Audacious - a cross-platform multimedia player
+ * Copyright (c) 2007 Tomasz Moń
+ * Copyright (c) 2011 John Lindgren
+ *
+ * Based on:
+ * BMP - Cross-platform multimedia player
+ * Copyright (C) 2003-2004 BMP development team.
+ * XMMS:
+ * Copyright (C) 1998-2003 XMMS development team.
+ *
+ * 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; under version 3 of the License.
+ *
+ * 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>.
+ *
+ * The Audacious team does not consider modular code linking to
+ * Audacious or using our public API to be a derived work.
+ */
+
+#include <libaudcore/runtime.h>
+
+#include "skins_cfg.h"
+#include "skin.h"
+#include "menurow.h"
+
+#include "../ui-common/qt-compat.h"
+
+void MenuRow::draw (QPainter & cr)
+{
+ if (m_selected == MENUROW_NONE)
+ {
+ if (m_pushed)
+ skin_draw_pixbuf (cr, SKIN_TITLEBAR, 304, 0, 0, 0, 8, 43);
+ else
+ skin_draw_pixbuf (cr, SKIN_TITLEBAR, 312, 0, 0, 0, 8, 43);
+ }
+ else
+ skin_draw_pixbuf (cr, SKIN_TITLEBAR, 304 + 8 * (m_selected - 1), 44, 0, 0, 8, 43);
+
+ if (m_pushed)
+ {
+ if (aud_get_bool ("skins", "always_on_top"))
+ skin_draw_pixbuf (cr, SKIN_TITLEBAR, 312, 54, 0, 10, 8, 8);
+ if (aud_get_bool ("skins", "double_size"))
+ skin_draw_pixbuf (cr, SKIN_TITLEBAR, 328, 70, 0, 26, 8, 8);
+ }
+}
+
+static MenuRowItem menurow_find_selected (int x, int y)
+{
+ if (x >= 0 && x < 8)
+ {
+ if (y >= 0 && y < 10)
+ return MENUROW_OPTIONS;
+ if (y >= 10 && y < 18)
+ return MENUROW_ALWAYS;
+ if (y >= 18 && y < 26)
+ return MENUROW_FILEINFOBOX;
+ if (y >= 26 && y < 34)
+ return MENUROW_SCALE;
+ if (y >= 34 && y < 43)
+ return MENUROW_VISUALIZATION;
+ }
+
+ return MENUROW_NONE;
+}
+
+bool MenuRow::button_press (QMouseEvent * event)
+{
+ if (event->button () != Qt::LeftButton)
+ return false;
+
+ m_pushed = true;
+ m_selected = menurow_find_selected (QtCompat::x (event) / config.scale, QtCompat::y (event) / config.scale);
+
+ mainwin_mr_change (m_selected);
+
+ queue_draw ();
+ return true;
+}
+
+bool MenuRow::button_release (QMouseEvent * event)
+{
+ if (event->button () != Qt::LeftButton)
+ return false;
+
+ if (! m_pushed)
+ return true;
+
+ mainwin_mr_release (m_selected, event);
+
+ m_pushed = false;
+ m_selected = MENUROW_NONE;
+
+ queue_draw ();
+ return true;
+}
+
+bool MenuRow::motion (QMouseEvent * event)
+{
+ if (! m_pushed)
+ return true;
+
+ m_selected = menurow_find_selected (QtCompat::x (event) / config.scale, QtCompat::y (event) / config.scale);
+
+ mainwin_mr_change (m_selected);
+
+ queue_draw ();
+ return true;
+}
+
+MenuRow::MenuRow ()
+{
+ set_scale (config.scale);
+ add_input (8, 43, true, true);
+}

audacious-plugins-4.4.1.tar.bz2/src/skins-qt/menurow.h Added

@@ -0,0 +1,62 @@
+/*
+ * Audacious - a cross-platform multimedia player
+ * Copyright (c) 2007 Tomasz Moń
+ * Copyright (c) 2011 John Lindgren
+ *
+ * Based on:
+ * BMP - Cross-platform multimedia player
+ * Copyright (C) 2003-2004 BMP development team.
+ * XMMS:
+ * Copyright (C) 1998-2003 XMMS development team.
+ *
+ * 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; under version 3 of the License.
+ *
+ * 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>.
+ *
+ * The Audacious team does not consider modular code linking to
+ * Audacious or using our public API to be a derived work.
+ */
+
+#ifndef SKINS_UI_SKINNED_MENUROW_H
+#define SKINS_UI_SKINNED_MENUROW_H
+
+#include "widget.h"
+
+enum MenuRowItem {
+ MENUROW_NONE,
+ MENUROW_OPTIONS,
+ MENUROW_ALWAYS,
+ MENUROW_FILEINFOBOX,
+ MENUROW_SCALE,
+ MENUROW_VISUALIZATION
+};
+
+class MenuRow : public Widget
+{
+public:
+ MenuRow ();
+ void refresh () { queue_draw (); }
+
+private:
+ virtual void draw (QPainter & cr);
+ virtual bool button_press (QMouseEvent * event);
+ virtual bool button_release (QMouseEvent * event);
+ virtual bool motion (QMouseEvent * event);
+
+ MenuRowItem m_selected = MENUROW_NONE;
+ bool m_pushed = false;
+};
+
+/* callbacks in ui_main.c */
+void mainwin_mr_change (MenuRowItem i);
+void mainwin_mr_release (MenuRowItem i, QMouseEvent * event);
+
+#endif

audacious-plugins-4.4.1.tar.bz2/src/skins-qt/menus.cc Added

@@ -0,0 +1,274 @@
+/*
+ * menus.c
+ * Copyright 2010-2014 John Lindgren
+ *
+ * This file is part of Audacious.
+ *
+ * Audacious 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, version 2 or version 3 of the License.
+ *
+ * Audacious 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
+ * Audacious. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The Audacious team does not consider modular code linking to Audacious or
+ * using our public API to be a derived work.
+ */
+
+#include "menus.h"
+
+#include <QMenu>
+
+#include <libaudcore/drct.h>
+#include <libaudcore/i18n.h>
+#include <libaudcore/interface.h>
+#include <libaudcore/playlist.h>
+#include <libaudcore/plugins.h>
+#include <libaudcore/runtime.h>
+#include <libaudqt/menu.h>
+
+#include "actions-mainwin.h"
+#include "actions-playlist.h"
+#include "main.h"
+#include "view.h"
+
+#include "../ui-common/menu-ops.h"
+
+static QMenu * menusUI_MENUS;
+
+/* note: playback, playlist, and view menus must be created before main menu */
+static QMenu * get_menu_playback () { return menusUI_MENU_PLAYBACK; }
+static QMenu * get_menu_playlist () { return menusUI_MENU_PLAYLIST; }
+static QMenu * get_menu_view () { return menusUI_MENU_VIEW; }
+
+static QMenu * get_plugin_menu_main () { return audqt::menu_get_by_id (AudMenuID::Main); }
+static QMenu * get_plugin_menu_playlist () { return audqt::menu_get_by_id (AudMenuID::Playlist); }
+static QMenu * get_plugin_menu_playlist_add () { return audqt::menu_get_by_id (AudMenuID::PlaylistAdd); }
+static QMenu * get_plugin_menu_playlist_remove () { return audqt::menu_get_by_id (AudMenuID::PlaylistRemove); }
+
+static void configure_effects () { audqt::prefswin_show_plugin_page (PluginType::Effect); }
+static void configure_output () { audqt::prefswin_show_plugin_page (PluginType::Output); }
+static void configure_visualizations () { audqt::prefswin_show_plugin_page (PluginType::Vis); }
+
+static void pl_import () { audqt::fileopener_show (audqt::FileMode::ImportPlaylist); }
+static void pl_export () { audqt::fileopener_show (audqt::FileMode::ExportPlaylist); }
+
+static void skins_volume_up () { mainwin_set_volume_diff (aud_get_int ("volume_delta")); }
+static void skins_volume_down () { mainwin_set_volume_diff (-aud_get_int ("volume_delta")); }
+
+static const audqt::MenuItem output_items = {
+ audqt::MenuCommand ({N_("Volume Up"), "audio-volume-high", "+"}, skins_volume_up),
+ audqt::MenuCommand ({N_("Volume Down"), "audio-volume-low", "-"}, skins_volume_down),
+ audqt::MenuSep (),
+ audqt::MenuCommand ({N_("Effects ..."), "preferences-system"}, configure_effects),
+ audqt::MenuSep (),
+ audqt::MenuToggle ({N_("Record Stream"), "media-record", "D"}, {nullptr, "record", "set record"}),
+ audqt::MenuCommand ({N_("Audio Settings ..."), "audio-card"}, configure_output)
+};
+
+static const audqt::MenuItem main_items = {
+ audqt::MenuCommand ({N_("Open Files ..."), "document-open", "L"}, action_play_file),
+ audqt::MenuCommand ({N_("Open Folder ..."), "document-open", "Shift+L"}, action_play_folder),
+ audqt::MenuCommand ({N_("Open URL ..."), "folder-remote", "Ctrl+L"}, action_play_location),
+ audqt::MenuCommand ({N_("Search Library"), "edit-find", "Y"}, action_search_tool),
+ audqt::MenuSep (),
+ audqt::MenuSub ({N_("Playback")}, get_menu_playback),
+ audqt::MenuSub ({N_("Playlist")}, get_menu_playlist),
+ audqt::MenuSub ({N_("Output")}, {output_items}),
+ audqt::MenuSub ({N_("View")}, get_menu_view),
+ audqt::MenuSep (),
+ audqt::MenuSub ({N_("Services")}, get_plugin_menu_main),
+ audqt::MenuSep (),
+ audqt::MenuCommand ({N_("About ..."), "help-about"}, audqt::aboutwindow_show),
+ audqt::MenuCommand ({N_("Settings ..."), "preferences-system", "Ctrl+P"}, audqt::prefswin_show),
+ audqt::MenuCommand ({N_("Quit"), "application-exit", "Ctrl+Q"}, aud_quit)
+};
+
+static const audqt::MenuItem playback_items = {
+ audqt::MenuCommand ({N_("Song Info ..."), "dialog-information", "I"}, audqt::infowin_show_current),
+ audqt::MenuSep (),
+ audqt::MenuToggle ({N_("Repeat"), "media-playlist-repeat", "R"}, {nullptr, "repeat", "set repeat"}),
+ audqt::MenuToggle ({N_("Shuffle"), "media-playlist-shuffle", "S"}, {nullptr, "shuffle", "set shuffle"}),
+ audqt::MenuToggle ({N_("Shuffle by Album")}, {nullptr, "album_shuffle", "set album_shuffle"}),
+ audqt::MenuToggle ({N_("No Playlist Advance"), nullptr, "Ctrl+N"}, {nullptr, "no_playlist_advance", "set no_playlist_advance"}),
+ audqt::MenuToggle ({N_("Stop After This Song"), nullptr, "Ctrl+M"}, {nullptr, "stop_after_current_song", "set stop_after_current_song"}),
+ audqt::MenuSep (),
+ audqt::MenuCommand ({N_("Play"), "media-playback-start", "X"}, aud_drct_play),
+ audqt::MenuCommand ({N_("Pause"), "media-playback-pause", "C"}, aud_drct_pause),
+ audqt::MenuCommand ({N_("Stop"), "media-playback-stop", "V"}, aud_drct_stop),
+ audqt::MenuCommand ({N_("Previous"), "media-skip-backward", "Z"}, aud_drct_pl_prev),
+ audqt::MenuCommand ({N_("Next"), "media-skip-forward", "B"}, aud_drct_pl_next),
+ audqt::MenuCommand ({N_("Previous Album")}, aud_drct_pl_prev_album),
+ audqt::MenuCommand ({N_("Next Album")}, aud_drct_pl_next_album),
+ audqt::MenuSep (),
+ audqt::MenuCommand ({N_("Set A-B Repeat"), nullptr, "A"}, action_ab_set),
+ audqt::MenuCommand ({N_("Clear A-B Repeat"), nullptr, "Shift+A"}, action_ab_clear),
+ audqt::MenuSep (),
+ audqt::MenuCommand ({N_("Jump to Song ..."), "go-jump", "J"}, aud_ui_show_jump_to_song),
+#if 0
+ audqt::MenuCommand ({N_("Jump to Time ..."), "go-jump", "Ctrl+J"}, audgui_jump_to_time)
+#endif
+};
+
+static const audqt::MenuItem playlist_items = {
+ audqt::MenuCommand ({N_("Play/Resume"), "media-playback-start", "Shift+Return"}, pl_play),
+ audqt::MenuSep (),
+ audqt::MenuCommand ({N_("New Playlist"), "document-new", "Shift+N"}, pl_new),
+ audqt::MenuCommand ({N_("Rename Playlist ..."), "insert-text", "F2"}, action_playlist_rename),
+ audqt::MenuCommand ({N_("Remove Playlist"), "edit-delete", "Shift+D"}, action_playlist_delete),
+ audqt::MenuSep (),
+ audqt::MenuCommand ({N_("Previous Playlist"), "media-skip-backward", "Shift+Tab"}, pl_prev),
+ audqt::MenuCommand ({N_("Next Playlist"), "media-skip-forward", "Tab"}, pl_next),
+ audqt::MenuSep (),
+ audqt::MenuCommand ({N_("Import Playlist ..."), "document-open", "O"}, pl_import),
+ audqt::MenuCommand ({N_("Export Playlist ..."), "document-save", "Shift+S"}, pl_export),
+ audqt::MenuSep (),
+ audqt::MenuCommand ({N_("Playlist Manager ..."), "audio-x-generic", "P"}, action_playlist_manager),
+ audqt::MenuCommand ({N_("Queue Manager ..."), nullptr, "Ctrl+U"}, audqt::queue_manager_show),
+ audqt::MenuSep (),
+ audqt::MenuCommand ({N_("Refresh Playlist"), "view-refresh", "F5"}, pl_refresh)
+};
+
+static const audqt::MenuItem view_items = {
+ audqt::MenuToggle ({N_("Show Playlist Editor"), nullptr, "Alt+E"}, {"skins", "playlist_visible", "skins set playlist_visible"}, view_apply_show_playlist),
+ audqt::MenuToggle ({N_("Show Equalizer"), nullptr, "Alt+G"}, {"skins", "equalizer_visible", "skins set equalizer_visible"}, view_apply_show_equalizer),
+ audqt::MenuSep (),
+ audqt::MenuToggle ({N_("Show Remaining Time"), nullptr, "Ctrl+R"}, {"skins", "show_remaining_time", "skins set show_remaining_time"}, view_apply_show_remaining),
+ audqt::MenuSep (),
+ audqt::MenuToggle ({N_("Double Size"), nullptr, "Ctrl+D"}, {"skins", "double_size", "skins set double_size"}, view_apply_double_size),
+ audqt::MenuToggle ({N_("Always on Top"), nullptr, "Ctrl+O"}, {"skins", "always_on_top", "skins set always_on_top"}, view_apply_on_top),
+#if 0
+ audqt::MenuToggle ({N_("On All Workspaces"), nullptr, "Ctrl+S"}, {"skins", "sticky", "skins set sticky"}, view_apply_sticky),
+#endif
+ audqt::MenuSep (),
+ audqt::MenuToggle ({N_("Roll Up Player"), nullptr, "Ctrl+W"}, {"skins", "player_shaded", "skins set player_shaded"}, view_apply_player_shaded),
+ audqt::MenuToggle ({N_("Roll Up Playlist Editor"), nullptr, "Shift+Ctrl+W"}, {"skins", "playlist_shaded", "skins set playlist_shaded"}, view_apply_playlist_shaded),
+ audqt::MenuToggle ({N_("Roll Up Equalizer"), nullptr, "Ctrl+Alt+W"}, {"skins", "equalizer_shaded", "skins set equalizer_shaded"}, view_apply_equalizer_shaded),
+ audqt::MenuSep (),
+ audqt::MenuCommand ({N_("_Visualizations ..."), "preferences-system"}, configure_visualizations)
+};
+
+static const audqt::MenuItem playlist_add_items = {
+ audqt::MenuSub ({N_("Services")}, get_plugin_menu_playlist_add),
+ audqt::MenuSep (),
+ audqt::MenuCommand ({N_("Add URL ..."), "folder-remote", "Ctrl+H"}, action_playlist_add_url),
+ audqt::MenuCommand ({N_("Add Folder ..."), "list-add", "Shift+F"}, action_playlist_add_folder),
+ audqt::MenuCommand ({N_("Add Files ..."), "list-add", "F"}, action_playlist_add_files)
+};
+
+static const audqt::MenuItem dupe_items = {
+ audqt::MenuCommand ({N_("By Title")}, rm_dupes_title),
+ audqt::MenuCommand ({N_("By File Name")}, rm_dupes_filename),
+ audqt::MenuCommand ({N_("By File Path")}, rm_dupes_path)
+};
+
+static const audqt::MenuItem playlist_remove_items = {
+ audqt::MenuSub ({N_("Services")}, get_plugin_menu_playlist_remove),
+ audqt::MenuSep (),
+ audqt::MenuCommand ({N_("Remove All"), "edit-delete"}, pl_remove_all),
+ audqt::MenuCommand ({N_("Clear Queue"), "edit-clear", "Shift+Q"}, pl_queue_clear),
+ audqt::MenuSep (),
+ audqt::MenuCommand ({N_("Remove Unavailable Files"), "dialog-warning"}, pl_remove_failed),
+ audqt::MenuSub ({N_("Remove Duplicates"), "edit-copy"}, {dupe_items}),
+ audqt::MenuSep (),
+ audqt::MenuCommand ({N_("Remove Unselected"), "list-remove"}, pl_remove_unselected),
+ audqt::MenuCommand ({N_("Remove Selected"), "list-remove", "Delete"}, pl_remove_selected)
+};
+
+static const audqt::MenuItem playlist_select_items = {
+ audqt::MenuCommand ({N_("Search and Select"), "edit-find", "Ctrl+F"}, action_playlist_search_and_select),
+ audqt::MenuSep (),
+ audqt::MenuCommand ({N_("Invert Selection")}, pl_select_invert),
+ audqt::MenuCommand ({N_("Select None"), nullptr, "Shift+Ctrl+A"}, pl_select_none),
+ audqt::MenuCommand ({N_("Select All"), "edit-select-all", "Ctrl+A"}, pl_select_all),
+};
+
+static const audqt::MenuItem sort_items = {
+ audqt::MenuCommand ({N_("By Track Number")}, sort_track),
+ audqt::MenuCommand ({N_("By Title")}, sort_title),
+ audqt::MenuCommand ({N_("By Artist")}, sort_artist),
+ audqt::MenuCommand ({N_("By Album")}, sort_album),
+ audqt::MenuCommand ({N_("By Album Artist")}, sort_album_artist),
+ audqt::MenuCommand ({N_("By Release Date")}, sort_date),
+ audqt::MenuCommand ({N_("By Genre")}, sort_genre),
+ audqt::MenuCommand ({N_("By Length")}, sort_length),
+ audqt::MenuCommand ({N_("By File Name")}, sort_filename),
+ audqt::MenuCommand ({N_("By File Path")}, sort_path),
+ audqt::MenuCommand ({N_("By Custom Title")}, sort_custom_title),
+ audqt::MenuCommand ({N_("By Comment")}, sort_comment),
+ audqt::MenuCommand ({N_("By Disc Number")}, sort_disc)
+};
+
+static const audqt::MenuItem sort_selected_items = {
+ audqt::MenuCommand ({N_("By Track Number")}, sort_sel_track),
+ audqt::MenuCommand ({N_("By Title")}, sort_sel_title),
+ audqt::MenuCommand ({N_("By Artist")}, sort_sel_artist),
+ audqt::MenuCommand ({N_("By Album")}, sort_sel_album),
+ audqt::MenuCommand ({N_("By Album Artist")}, sort_sel_album_artist),
+ audqt::MenuCommand ({N_("By Release Date")}, sort_sel_date),
+ audqt::MenuCommand ({N_("By Genre")}, sort_sel_genre),
+ audqt::MenuCommand ({N_("By Length")}, sort_sel_length),
+ audqt::MenuCommand ({N_("By File Name")}, sort_sel_filename),
+ audqt::MenuCommand ({N_("By File Path")}, sort_sel_path),
+ audqt::MenuCommand ({N_("By Custom Title")}, sort_sel_custom_title),
+ audqt::MenuCommand ({N_("By Comment")}, sort_sel_comment),
+ audqt::MenuCommand ({N_("By Disc Number")}, sort_sel_disc)
+};
+
+static const audqt::MenuItem playlist_sort_items = {
+ audqt::MenuCommand ({N_("Randomize List"), nullptr, "Shift+Ctrl+R"}, sort_random),
+ audqt::MenuCommand ({N_("Reverse List"), "view-sort-descending"}, sort_reverse),
+ audqt::MenuSep (),
+ audqt::MenuSub ({N_("Sort Selected"), "view-sort-ascending"}, {sort_selected_items}),
+ audqt::MenuSub ({N_("Sort List"), "view-sort-ascending"}, {sort_items})
+};
+
+static const audqt::MenuItem playlist_context_items = {
+ audqt::MenuCommand ({N_("Song Info ..."), "dialog-information", "Alt+I"}, pl_song_info),
+ audqt::MenuCommand ({N_("Open Containing Folder"), "folder"}, pl_open_folder),
+ audqt::MenuSep (),
+ audqt::MenuCommand ({N_("Cut"), "edit-cut", "Ctrl+X"}, pl_cut),
+ audqt::MenuCommand ({N_("Copy"), "edit-copy", "Ctrl+C"}, pl_copy),
+ audqt::MenuCommand ({N_("Paste"), "edit-paste", "Ctrl+V"}, pl_paste),
+ audqt::MenuCommand ({N_("Paste at End"), "edit-paste", "Shift+Ctrl+V"}, pl_paste_end),
+ audqt::MenuSep (),
+ audqt::MenuCommand ({N_("Queue/Unqueue"), nullptr, "Q"}, pl_queue_toggle),
+ audqt::MenuSep (),
+ audqt::MenuSub ({N_("Services")}, get_plugin_menu_playlist)
+};
+
+void menu_init (QWidget * parent)
+{
+ static const ArrayRef<audqt::MenuItem> table = {
+ {main_items},
+ {playback_items},
+ {playlist_items},
+ {view_items},
+ {playlist_add_items},
+ {playlist_remove_items},
+ {playlist_select_items},
+ {playlist_sort_items},
+ {playlist_context_items}
+ };
+
+ for (int i = UI_MENUS; i --; )
+ menusi = audqt::menu_build (tablei, parent);
+}
+
+void menu_popup (int id, int x, int y, bool leftward, bool upward)
+{
+ if (leftward || upward)
+ {
+ QSize size = menusid->sizeHint ();
+ if (leftward)
+ x -= size.width ();
+ if (upward)
+ y -= size.height ();
+ }
+
+ menusid->popup (QPoint (x, y));
+}

audacious-plugins-4.4.1.tar.bz2/src/skins-qt/menus.h Added

@@ -0,0 +1,43 @@
+/*
+ * menus.h
+ * Copyright 2009-2014 John Lindgren
+ *
+ * This file is part of Audacious.
+ *
+ * Audacious 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, version 2 or version 3 of the License.
+ *
+ * Audacious 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
+ * Audacious. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The Audacious team does not consider modular code linking to Audacious or
+ * using our public API to be a derived work.
+ */
+
+#ifndef SKINS_MENUS_H
+#define SKINS_MENUS_H
+
+class QWidget;
+
+enum {
+ UI_MENU_MAIN,
+ UI_MENU_PLAYBACK,
+ UI_MENU_PLAYLIST,
+ UI_MENU_VIEW,
+ UI_MENU_PLAYLIST_ADD,
+ UI_MENU_PLAYLIST_REMOVE,
+ UI_MENU_PLAYLIST_SELECT,
+ UI_MENU_PLAYLIST_SORT,
+ UI_MENU_PLAYLIST_CONTEXT,
+ UI_MENUS
+};
+
+void menu_init (QWidget * parent);
+void menu_popup (int id, int x, int y, bool leftward, bool upward);
+
+#endif /* SKINS_MENUS_H */

audacious-plugins-4.4.1.tar.bz2/src/skins-qt/meson.build Added

audacious-plugins-4.4.1.tar.bz2/src/skins-qt/monostereo.cc Added

@@ -0,0 +1,61 @@
+/*
+ * Audacious - a cross-platform multimedia player
+ * Copyright (c) 2007 Tomasz Moń
+ * Copyright (c) 2011 John Lindgren
+ *
+ * Based on:
+ * BMP - Cross-platform multimedia player
+ * Copyright (C) 2003-2004 BMP development team.
+ * XMMS:
+ * Copyright (C) 1998-2003 XMMS development team.
+ *
+ * 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; under version 3 of the License.
+ *
+ * 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>.
+ *
+ * The Audacious team does not consider modular code linking to
+ * Audacious or using our public API to be a derived work.
+ */
+
+#include "skins_cfg.h"
+#include "skin.h"
+#include "monostereo.h"
+
+void MonoStereo::draw (QPainter & cr)
+{
+ switch (m_num_channels)
+ {
+ case 0:
+ skin_draw_pixbuf (cr, SKIN_MONOSTEREO, 29, 12, 0, 0, 27, 12);
+ skin_draw_pixbuf (cr, SKIN_MONOSTEREO, 0, 12, 27, 0, 29, 12);
+ break;
+ case 1:
+ skin_draw_pixbuf (cr, SKIN_MONOSTEREO, 29, 0, 0, 0, 27, 12);
+ skin_draw_pixbuf (cr, SKIN_MONOSTEREO, 0, 12, 27, 0, 29, 12);
+ break;
+ default:
+ skin_draw_pixbuf (cr, SKIN_MONOSTEREO, 29, 12, 0, 0, 27, 12);
+ skin_draw_pixbuf (cr, SKIN_MONOSTEREO, 0, 0, 27, 0, 29, 12);
+ break;
+ }
+}
+
+MonoStereo::MonoStereo ()
+{
+ set_scale (config.scale);
+ add_drawable (56, 12);
+}
+
+void MonoStereo::set_num_channels (int num_channels)
+{
+ m_num_channels = num_channels;
+ queue_draw ();
+}

audacious-plugins-4.4.1.tar.bz2/src/skins-qt/monostereo.h Added

@@ -0,0 +1,45 @@
+/*
+ * Audacious - a cross-platform multimedia player
+ * Copyright (c) 2007 Tomasz Moń
+ * Copyright (c) 2011 John Lindgren
+ *
+ * Based on:
+ * BMP - Cross-platform multimedia player
+ * Copyright (C) 2003-2004 BMP development team.
+ * XMMS:
+ * Copyright (C) 1998-2003 XMMS development team.
+ *
+ * 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; under version 3 of the License.
+ *
+ * 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>.
+ *
+ * The Audacious team does not consider modular code linking to
+ * Audacious or using our public API to be a derived work.
+ */
+
+#ifndef SKINS_UI_SKINNED_MONOSTEREO_H
+#define SKINS_UI_SKINNED_MONOSTEREO_H
+
+#include "widget.h"
+
+class MonoStereo : public Widget
+{
+public:
+ MonoStereo ();
+ void set_num_channels (int num_channels);
+
+private:
+ void draw (QPainter & cr);
+
+ int m_num_channels = 0;
+};
+
+#endif

audacious-plugins-4.4.1.tar.bz2/src/skins-qt/number.cc Added

@@ -0,0 +1,60 @@
+/*
+ * Audacious - a cross-platform multimedia player
+ * Copyright (c) 2007 Tomasz Moń
+ * Copyright (c) 2011 John Lindgren
+ *
+ * Based on:
+ * BMP - Cross-platform multimedia player
+ * Copyright (C) 2003-2004 BMP development team.
+ * XMMS:
+ * Copyright (C) 1998-2003 XMMS development team.
+ *
+ * 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; under version 3 of the License.
+ *
+ * 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>.
+ *
+ * The Audacious team does not consider modular code linking to
+ * Audacious or using our public API to be a derived work.
+ */
+
+#include <libaudcore/runtime.h>
+
+#include "skins_cfg.h"
+#include "main.h"
+#include "skin.h"
+#include "number.h"
+
+void SkinnedNumber::draw (QPainter & cr)
+{
+ skin_draw_pixbuf (cr, SKIN_NUMBERS, m_num * 9, 0, 0, 0, 9, 13);
+}
+
+bool SkinnedNumber::button_press (QMouseEvent * event)
+{
+ return change_timer_mode_cb (event);
+}
+
+SkinnedNumber::SkinnedNumber ()
+{
+ set_scale (config.scale);
+ add_input (9, 13, false, true);
+}
+
+void SkinnedNumber::set (char c)
+{
+ int value = (c >= '0' && c <= '9') ? c - '0' : (c == '-') ? 11 : 10;
+
+ if (m_num != value)
+ {
+ m_num = value;
+ queue_draw ();
+ }
+}

audacious-plugins-4.4.1.tar.bz2/src/skins-qt/number.h Added

@@ -0,0 +1,40 @@
+/*
+ * Audacious - a cross-platform multimedia player
+ * Copyright (c) 2007 Tomasz Moń
+ * Copyright (c) 2011 John Lindgren
+ *
+ * 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; under version 3 of the License.
+ *
+ * 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>.
+ *
+ * The Audacious team does not consider modular code linking to
+ * Audacious or using our public API to be a derived work.
+ */
+
+#ifndef SKINS_UI_SKINNED_NUMBER_H
+#define SKINS_UI_SKINNED_NUMBER_H
+
+#include "widget.h"
+
+class SkinnedNumber : public Widget
+{
+public:
+ SkinnedNumber ();
+ void set (char c);
+
+private:
+ virtual void draw (QPainter & cr);
+ virtual bool button_press (QMouseEvent * event);
+
+ int m_num = 0;
+};
+
+#endif

audacious-plugins-4.4.1.tar.bz2/src/skins-qt/playlist-slider.cc Added

@@ -0,0 +1,125 @@
+/*
+ * Audacious - a cross-platform multimedia player
+ * Copyright (c) 2007 Tomasz Moń
+ * Copyright (c) 2011 John Lindgren
+ *
+ * Based on:
+ * BMP - Cross-platform multimedia player
+ * Copyright (C) 2003-2004 BMP development team.
+ * XMMS:
+ * Copyright (C) 1998-2003 XMMS development team.
+ *
+ * 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; under version 3 of the License.
+ *
+ * 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>.
+ *
+ * The Audacious team does not consider modular code linking to
+ * Audacious or using our public API to be a derived work.
+ */
+
+#include <libaudcore/objects.h>
+#include <libaudcore/playlist.h>
+
+#include "skins_cfg.h"
+#include "skin.h"
+#include "playlist-widget.h"
+#include "playlist-slider.h"
+
+#include "../ui-common/qt-compat.h"
+
+void PlaylistSlider::draw (QPainter & cr)
+{
+ int rows, first;
+ m_list->row_info (& rows, & first);
+
+ int range = m_length - rows;
+
+ int y;
+ if (m_length > rows)
+ y = (first * (m_height - 19) + range / 2) / range;
+ else
+ y = 0;
+
+ for (int i = 0; i < m_height / 29; i ++)
+ skin_draw_pixbuf (cr, SKIN_PLEDIT, 36, 42, 0, 29 * i, 8, 29);
+
+ skin_draw_pixbuf (cr, SKIN_PLEDIT, m_pressed ? 61 : 52, 53, 0, y, 8, 18);
+}
+
+void PlaylistSlider::set_pos (int y)
+{
+ y = aud::clamp (y, 0, m_height - 19);
+
+ int rows, first;
+ m_list->row_info (& rows, & first);
+
+ int range = m_height - 19;
+ m_list->scroll_to ((y * (m_length - rows) + range / 2) / range);
+}
+
+bool PlaylistSlider::button_press (QMouseEvent * event)
+{
+ if (event->button () != Qt::LeftButton)
+ return false;
+
+ m_pressed = true;
+ set_pos (QtCompat::y (event) / config.scale - 9);
+
+ queue_draw ();
+ return true;
+}
+
+bool PlaylistSlider::button_release (QMouseEvent * event)
+{
+ if (event->button () != Qt::LeftButton)
+ return false;
+
+ if (! m_pressed)
+ return true;
+
+ m_pressed = false;
+ set_pos (QtCompat::y (event) / config.scale - 9);
+
+ queue_draw ();
+ return true;
+}
+
+bool PlaylistSlider::motion (QMouseEvent * event)
+{
+ if (! m_pressed)
+ return true;
+
+ set_pos (QtCompat::y (event) / config.scale - 9);
+
+ queue_draw ();
+ return true;
+}
+
+PlaylistSlider::PlaylistSlider (PlaylistWidget * list, int height) :
+ m_list (list), m_height (height),
+ m_length (Playlist::active_playlist ().n_entries ())
+{
+ set_scale (config.scale);
+ add_input (8, height, true, true);
+}
+
+void PlaylistSlider::resize (int height)
+{
+ m_height = height;
+ Widget::resize (8, height);
+ queue_draw ();
+}
+
+void PlaylistSlider::refresh ()
+{
+ m_length = Playlist::active_playlist ().n_entries ();
+ queue_draw ();
+}

audacious-plugins-4.4.1.tar.bz2/src/skins-qt/playlist-slider.h Added

@@ -0,0 +1,55 @@
+/*
+ * Audacious - a cross-platform multimedia player
+ * Copyright (c) 2007 Tomasz Moń
+ * Copyright (c) 2011 John Lindgren
+ *
+ * Based on:
+ * BMP - Cross-platform multimedia player
+ * Copyright (C) 2003-2004 BMP development team.
+ * XMMS:
+ * Copyright (C) 1998-2003 XMMS development team.
+ *
+ * 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; under version 3 of the License.
+ *
+ * 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>.
+ *
+ * The Audacious team does not consider modular code linking to
+ * Audacious or using our public API to be a derived work.
+ */
+
+#ifndef SKINS_UI_SKINNED_PLAYLIST_SLIDER_H
+#define SKINS_UI_SKINNED_PLAYLIST_SLIDER_H
+
+#include "widget.h"
+
+class PlaylistWidget;
+
+class PlaylistSlider : public Widget
+{
+public:
+ PlaylistSlider (PlaylistWidget * list, int height);
+ void resize (int height);
+ void refresh ();
+
+private:
+ void draw (QPainter & cr);
+ bool button_press (QMouseEvent * event);
+ bool button_release (QMouseEvent * event);
+ bool motion (QMouseEvent * event);
+
+ void set_pos (int y);
+
+ PlaylistWidget * m_list;
+ int m_height, m_length;
+ bool m_pressed = false;
+};
+
+#endif

audacious-plugins-4.4.1.tar.bz2/src/skins-qt/playlist-widget.cc Added

@@ -0,0 +1,815 @@
+/*
+ * Audacious - a cross-platform multimedia player
+ * Copyright (c) 2007 Tomasz Moń
+ * Copyright (c) 2008 William Pitcock
+ * Copyright (c) 2009-2011 John Lindgren
+ *
+ * Based on:
+ * BMP - Cross-platform multimedia player
+ * Copyright (C) 2003-2004 BMP development team.
+ *
+ * XMMS:
+ * Copyright (C) 1998-2003 XMMS development team.
+ *
+ * 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; under version 3 of the License.
+ *
+ * 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>.
+ *
+ * The Audacious team does not consider modular code linking to
+ * Audacious or using our public API to be a derived work.
+ */
+
+#include "menus.h"
+#include "skins_cfg.h"
+#include "skin.h"
+#include "playlist-widget.h"
+#include "playlist-slider.h"
+
+#include "../ui-common/qt-compat.h"
+
+#include <libaudcore/audstrings.h>
+#include <libaudcore/drct.h>
+#include <libaudcore/hook.h>
+#include <libaudcore/i18n.h>
+#include <libaudcore/runtime.h>
+#include <libaudcore/playlist.h>
+#include <libaudqt/libaudqt.h>
+
+#include <QMimeData>
+
+enum {
+ DRAG_SELECT = 1,
+ DRAG_MOVE
+};
+
+void PlaylistWidget::update_title ()
+{
+ if (Playlist::n_playlists () > 1)
+ {
+ String title = m_playlist.get_title ();
+ m_title_text = String (str_printf (_("%s (%d of %d)"),
+ (const char *) title, 1 + m_playlist.index (), Playlist::n_playlists ()));
+ }
+ else
+ m_title_text = String ();
+}
+
+void PlaylistWidget::calc_layout ()
+{
+ m_rows = m_height / m_row_height;
+
+ if (m_rows && m_title_text)
+ {
+ m_offset = m_row_height;
+ m_rows --;
+ }
+ else
+ m_offset = 0;
+
+ if (m_first + m_rows > m_length)
+ m_first = m_length - m_rows;
+ if (m_first < 0)
+ m_first = 0;
+}
+
+int PlaylistWidget::calc_position (int y) const
+{
+ if (y < m_offset)
+ return -1;
+
+ int position = m_first + (y - m_offset) / m_row_height;
+ if (position >= m_first + m_rows || position >= m_length)
+ return m_length;
+
+ return position;
+}
+
+int PlaylistWidget::adjust_position (bool relative, int position) const
+{
+ if (m_length == 0)
+ return -1;
+
+ if (relative)
+ {
+ int focus = m_playlist.get_focus ();
+ if (focus == -1)
+ return 0;
+
+ position += focus;
+ }
+
+ if (position < 0)
+ return 0;
+ if (position >= m_length)
+ return m_length - 1;
+
+ return position;
+}
+
+void PlaylistWidget::cancel_all ()
+{
+ m_drag = false;
+
+ if (m_scroll)
+ {
+ m_scroll = 0;
+ scroll_timer.stop ();
+ }
+
+ if (m_hover != -1)
+ {
+ m_hover = -1;
+ queue_draw ();
+ }
+
+ popup_hide ();
+}
+
+void PlaylistWidget::draw (QPainter & cr)
+{
+ int active_entry = m_playlist.get_position ();
+ int left = 3, right = 3;
+ int width;
+ QRect rect;
+
+ cr.setFont (* m_font);
+
+ /* background */
+
+ cr.fillRect (cr.window (), QColor (skin.colorsSKIN_PLEDIT_NORMALBG));
+
+ /* playlist title */
+
+ if (m_offset)
+ {
+ cr.setPen (QColor (skin.colorsSKIN_PLEDIT_NORMAL));
+ cr.drawText (left, 0, m_width - left - right, m_row_height,
+ Qt::AlignCenter, (const char *) m_title_text);
+ }
+
+ /* selection highlight */
+
+ for (int i = m_first; i < m_first + m_rows && i < m_length; i ++)
+ {
+ if (m_playlist.entry_selected (i))
+ cr.fillRect (0, m_offset + m_row_height * (i - m_first), m_width,
+ m_row_height, QColor (skin.colorsSKIN_PLEDIT_SELECTEDBG));
+ }
+
+ /* entry numbers */
+
+ if (aud_get_bool ("show_numbers_in_pl"))
+ {
+ width = 0;
+
+ for (int i = m_first; i < m_first + m_rows && i < m_length; i ++)
+ {
+ char buf16;
+ snprintf (buf, sizeof buf, "%d.", 1 + i);
+
+ cr.setPen (QColor (skin.colors(i == active_entry) ?
+ SKIN_PLEDIT_CURRENT : SKIN_PLEDIT_NORMAL));
+ cr.drawText (left, m_offset + m_row_height * (i - m_first),
+ m_width - left - right, m_row_height,
+ Qt::AlignLeft | Qt::AlignVCenter, buf, & rect);
+
+ width = aud::max (width, rect.width ());
+ }
+
+ left += width + 4;
+ }
+
+ /* entry lengths */
+
+ width = 0;
+
+ for (int i = m_first; i < m_first + m_rows && i < m_length; i ++)
+ {
+ Tuple tuple = m_playlist.entry_tuple (i, Playlist::NoWait);
+ int len = tuple.get_int (Tuple::Length);
+ if (len < 0)
+ continue;
+
+ cr.setPen (QColor (skin.colors(i == active_entry) ?
+ SKIN_PLEDIT_CURRENT : SKIN_PLEDIT_NORMAL));
+ cr.drawText (left, m_offset + m_row_height * (i - m_first),
+ m_width - left - right, m_row_height,
+ Qt::AlignRight | Qt::AlignVCenter,
+ (const char *) str_format_time (len), & rect);
+
+ width = aud::max (width, rect.width ());
+ }
+
+ right += width + 6;
+
+ /* queue positions */
+
+ if (m_playlist.n_queued ())
+ {
+ width = 0;
+
+ for (int i = m_first; i < m_first + m_rows && i < m_length; i ++)
+ {
+ int pos = m_playlist.queue_find_entry (i);
+ if (pos < 0)
+ continue;
+
+ char buf16;
+ snprintf (buf, sizeof buf, "(#%d)", 1 + pos);
+
+ cr.setPen (QColor (skin.colors(i == active_entry) ?
+ SKIN_PLEDIT_CURRENT : SKIN_PLEDIT_NORMAL));
+ cr.drawText (left, m_offset + m_row_height * (i - m_first),
+ m_width - left - right, m_row_height,
+ Qt::AlignRight | Qt::AlignVCenter, buf, & rect);
+
+ width = aud::max (width, rect.width ());
+ }
+
+ right += width + 6;
+ }
+
+ /* titles */
+
+ for (int i = m_first; i < m_first + m_rows && i < m_length; i ++)
+ {
+ Tuple tuple = m_playlist.entry_tuple (i, Playlist::NoWait);
+ String title = tuple.get_str (Tuple::FormattedTitle);
+
+ cr.setPen (QColor (skin.colors(i == active_entry) ?
+ SKIN_PLEDIT_CURRENT : SKIN_PLEDIT_NORMAL));
+ cr.drawText (left, m_offset + m_row_height * (i - m_first),
+ m_width - left - right, m_row_height,
+ Qt::AlignLeft | Qt::AlignVCenter, (const char *) title);
+ }
+
+ /* focus rectangle */
+
+ int focus = m_playlist.get_focus ();
+
+ /* don't show rectangle if this is the only selected entry */
+ if (focus >= m_first && focus <= m_first + m_rows - 1 &&
+ (! m_playlist.entry_selected (focus) || m_playlist.n_selected () > 1))
+ {
+ cr.setPen (QColor (skin.colorsSKIN_PLEDIT_NORMAL));
+ cr.drawRect (0, m_offset + m_row_height * (focus - m_first), m_width - 1, m_row_height - 1);
+ }
+
+ /* hover line */
+
+ if (m_hover >= m_first && m_hover <= m_first + m_rows)
+ {
+ cr.fillRect (0, m_offset + m_row_height * (m_hover - m_first) - 1, m_width, 2,
+ QColor (skin.colorsSKIN_PLEDIT_NORMAL));
+ }
+}
+
+PlaylistWidget::PlaylistWidget (int width, int height, const char * font) :
+ m_width (width * config.scale),
+ m_height (height * config.scale)
+{
+ add_input (m_width, m_height, true, true);
+ set_font (font); /* calls refresh() */
+
+ setAcceptDrops(true);
+}
+
+void PlaylistWidget::resize (int width, int height)
+{
+ m_width = width * config.scale;
+ m_height = height * config.scale;
+
+ Widget::resize (m_width, m_height);
+ refresh ();
+}
+
+void PlaylistWidget::set_font (const char * font)
+{
+ m_font.capture (new QFont (audqt::qfont_from_string (font)));
+ m_metrics.capture (new QFontMetrics (* m_font, this));
+ m_row_height = m_metrics->height ();
+ refresh ();
+}
+
+void PlaylistWidget::refresh ()
+{
+ auto prev_playlist = m_playlist;
+ m_playlist = Playlist::active_playlist ();
+ m_length = m_playlist.n_entries ();
+
+ update_title ();
+ calc_layout ();
+
+ if (m_playlist != prev_playlist)
+ {
+ cancel_all ();
+ m_first = 0;
+ ensure_visible (m_playlist.get_focus ());
+ }
+
+ queue_draw ();
+
+ if (m_slider)
+ m_slider->refresh ();
+}
+
+void PlaylistWidget::ensure_visible (int position)
+{
+ if (position < m_first || position >= m_first + m_rows)
+ m_first = position - m_rows / 2;
+
+ calc_layout ();
+}
+
+void PlaylistWidget::select_single (bool relative, int position)
+{
+ position = adjust_position (relative, position);
+
+ if (position == -1)
+ return;
+
+ m_playlist.select_all (false);
+ m_playlist.select_entry (position, true);
+ m_playlist.set_focus (position);
+ ensure_visible (position);
+}
+
+void PlaylistWidget::select_extend (bool relative, int position)
+{
+ position = adjust_position (relative, position);
+
+ if (position == -1)
+ return;
+
+ int count = adjust_position (true, 0);
+ int sign = (position > count) ? 1 : -1;
+
+ for (; count != position; count += sign)
+ m_playlist.select_entry (count, ! m_playlist.entry_selected (count + sign));
+
+ m_playlist.select_entry (position, true);
+ m_playlist.set_focus (position);
+ ensure_visible (position);
+}
+
+void PlaylistWidget::select_slide (bool relative, int position)
+{
+ position = adjust_position (relative, position);
+
+ if (position == -1)
+ return;
+
+ m_playlist.set_focus (position);
+ ensure_visible (position);
+}
+
+void PlaylistWidget::select_toggle (bool relative, int position)
+{
+ position = adjust_position (relative, position);
+
+ if (position == -1)
+ return;
+
+ m_playlist.select_entry (position, ! m_playlist.entry_selected (position));
+ m_playlist.set_focus (position);
+ ensure_visible (position);
+}
+
+void PlaylistWidget::select_move (bool relative, int position)
+{
+ int focus = m_playlist.get_focus ();
+ position = adjust_position (relative, position);
+
+ if (focus == -1 || position == -1 || position == focus)
+ return;
+
+ focus += m_playlist.shift_entries (focus, position - focus);
+ ensure_visible (focus);
+}
+
+void PlaylistWidget::delete_selected ()
+{
+ m_playlist.remove_selected ();
+
+ m_length = m_playlist.n_entries ();
+ int focus = m_playlist.get_focus ();
+
+ if (focus != -1)
+ {
+ m_playlist.select_entry (focus, true);
+ ensure_visible (focus);
+ }
+}
+
+bool PlaylistWidget::handle_keypress (QKeyEvent * event)
+{
+ cancel_all ();
+
+ auto CtrlShiftAlt = Qt::ShiftModifier | Qt::ControlModifier | Qt::AltModifier;
+ switch (event->modifiers () & CtrlShiftAlt)
+ {
+ case Qt::NoModifier:
+ switch (event->key ())
+ {
+ case Qt::Key_Up:
+ select_single (true, -1);
+ break;
+ case Qt::Key_Down:
+ select_single (true, 1);
+ break;
+ case Qt::Key_PageUp:
+ select_single (true, -m_rows);
+ break;
+ case Qt::Key_PageDown:
+ select_single (true, m_rows);
+ break;
+ case Qt::Key_Home:
+ select_single (false, 0);
+ break;
+ case Qt::Key_End:
+ select_single (false, m_length - 1);
+ break;
+ case Qt::Key_Return:
+ select_single (true, 0);
+ m_playlist.set_position (m_playlist.get_focus ());
+ m_playlist.start_playback ();
+ break;
+ case Qt::Key_Escape:
+ select_single (false, m_playlist.get_position ());
+ break;
+ case Qt::Key_Delete:
+ delete_selected ();
+ break;
+ default:
+ return false;
+ }
+ break;
+ case Qt::ShiftModifier:
+ switch (event->key ())
+ {
+ case Qt::Key_Up:
+ select_extend (true, -1);
+ break;
+ case Qt::Key_Down:
+ select_extend (true, 1);
+ break;
+ case Qt::Key_PageUp:
+ select_extend (true, -m_rows);
+ break;
+ case Qt::Key_PageDown:
+ select_extend (true, m_rows);
+ break;
+ case Qt::Key_Home:
+ select_extend (false, 0);
+ break;
+ case Qt::Key_End:
+ select_extend (false, m_length - 1);
+ break;
+ default:
+ return false;
+ }
+ break;
+ case Qt::ControlModifier:
+ switch (event->key ())
+ {
+ case Qt::Key_Space:
+ select_toggle (true, 0);
+ break;
+ case Qt::Key_Up:
+ select_slide (true, -1);
+ break;
+ case Qt::Key_Down:
+ select_slide (true, 1);
+ break;
+ case Qt::Key_PageUp:
+ select_slide (true, -m_rows);
+ break;
+ case Qt::Key_PageDown:
+ select_slide (true, m_rows);
+ break;
+ case Qt::Key_Home:
+ select_slide (false, 0);
+ break;
+ case Qt::Key_End:
+ select_slide (false, m_length - 1);
+ break;
+ default:
+ return false;
+ }
+ break;
+ case Qt::AltModifier:
+ switch (event->key ())
+ {
+ case Qt::Key_Up:
+ select_move (true, -1);
+ break;
+ case Qt::Key_Down:
+ select_move (true, 1);
+ break;
+ case Qt::Key_PageUp:
+ select_move (true, -m_rows);
+ break;
+ case Qt::Key_PageDown:
+ select_move (true, m_rows);
+ break;
+ case Qt::Key_Home:
+ select_move (false, 0);
+ break;
+ case Qt::Key_End:
+ select_move (false, m_length - 1);
+ break;
+ default:
+ return false;
+ }
+ break;
+ default:
+ return false;
+ }
+
+ refresh ();
+ return true;
+}
+
+void PlaylistWidget::row_info (int * rows, int * first)
+{
+ * rows = m_rows;
+ * first = m_first;
+}
+
+void PlaylistWidget::scroll_to (int row)
+{
+ cancel_all ();
+ m_first = row;
+ refresh ();
+}
+
+void PlaylistWidget::set_focused (int row)
+{
+ cancel_all ();
+ m_playlist.set_focus (row);
+ ensure_visible (row);
+ refresh ();
+}
+
+void PlaylistWidget::hover (int x, int y)
+{
+ int row;
+
+ if (y < m_offset)
+ row = m_first;
+ else if (y > m_offset + m_row_height * m_rows)
+ row = m_first + m_rows;
+ else
+ row = m_first + (y - m_offset + m_row_height / 2) / m_row_height;
+
+ if (row > m_length)
+ row = m_length;
+
+ if (row != m_hover)
+ {
+ m_hover = row;
+ queue_draw ();
+ }
+}
+
+int PlaylistWidget::hover_end ()
+{
+ int temp = m_hover;
+ m_hover = -1;
+
+ queue_draw ();
+ return temp;
+}
+
+bool PlaylistWidget::button_press (QMouseEvent * event)
+{
+ int position = calc_position (QtCompat::y (event));
+ int state = event->modifiers () & (Qt::ShiftModifier | Qt::ControlModifier | Qt::AltModifier);
+
+ cancel_all ();
+
+ switch (event->type ())
+ {
+ case QEvent::MouseButtonPress:
+ switch (event->button ())
+ {
+ case Qt::LeftButton:
+ if (position == -1 || position == m_length)
+ return true;
+
+ switch (state)
+ {
+ case 0:
+ if (m_playlist.entry_selected (position))
+ select_slide (false, position);
+ else
+ select_single (false, position);
+
+ m_drag = DRAG_MOVE;
+ break;
+ case Qt::ShiftModifier:
+ select_extend (false, position);
+ m_drag = DRAG_SELECT;
+ break;
+ case Qt::ControlModifier:
+ select_toggle (false, position);
+ m_drag = DRAG_SELECT;
+ break;
+ default:
+ return true;
+ }
+
+ break;
+ case Qt::RightButton:
+ if (state)
+ return true;
+
+ if (position != -1 && position != m_length)
+ {
+ if (m_playlist.entry_selected (position))
+ select_slide (false, position);
+ else
+ select_single (false, position);
+ }
+
+ menu_popup ((position == -1) ? UI_MENU_PLAYLIST :
+ UI_MENU_PLAYLIST_CONTEXT, QtCompat::globalX (event), QtCompat::globalY (event),
+ false, false);
+ break;
+ default:
+ return false;
+ }
+
+ break;
+ case QEvent::MouseButtonDblClick:
+ if (event->button () != Qt::LeftButton || state || position == m_length)
+ return true;
+
+ if (position != -1)
+ m_playlist.set_position (position);
+
+ m_playlist.start_playback ();
+ break;
+ default:
+ return true;
+ }
+
+ refresh ();
+ return true;
+}
+
+bool PlaylistWidget::button_release (QMouseEvent * event)
+{
+ cancel_all ();
+ return true;
+}
+
+void PlaylistWidget::scroll_timeout ()
+{
+ int position = adjust_position (true, m_scroll);
+ if (position == -1)
+ return;
+
+ switch (m_drag)
+ {
+ case DRAG_SELECT:
+ select_extend (false, position);
+ break;
+ case DRAG_MOVE:
+ select_move (false, position);
+ break;
+ }
+
+ refresh ();
+}
+
+bool PlaylistWidget::motion (QMouseEvent * event)
+{
+ int position = calc_position (QtCompat::y (event));
+
+ if (m_drag)
+ {
+ if (position == -1 || position == m_length)
+ {
+ if (! m_scroll)
+ scroll_timer.start ();
+
+ m_scroll = (position == -1 ? -1 : 1);
+ }
+ else
+ {
+ if (m_scroll)
+ {
+ m_scroll = 0;
+ scroll_timer.stop ();
+ }
+
+ switch (m_drag)
+ {
+ case DRAG_SELECT:
+ select_extend (false, position);
+ break;
+ case DRAG_MOVE:
+ select_move (false, position);
+ break;
+ }
+
+ refresh ();
+ }
+ }
+ else
+ {
+ if (position == -1 || position == m_length)
+ cancel_all ();
+ else if (aud_get_bool ("show_filepopup_for_tuple") && m_popup_pos != position)
+ {
+ cancel_all ();
+ popup_trigger (position);
+ }
+ }
+
+ return true;
+}
+
+void PlaylistWidget::dragEnterEvent (QDragEnterEvent * event)
+{
+ dragMoveEvent (event);
+}
+
+void PlaylistWidget::dragMoveEvent (QDragMoveEvent * event)
+{
+ const QMimeData * mimedata = event->mimeData();
+
+ if (event->proposedAction () == Qt::CopyAction && mimedata->hasUrls ())
+ {
+ auto p = QtCompat::pos (event);
+ hover (p.x (), p.y ());
+ event->acceptProposedAction ();
+ }
+}
+
+void PlaylistWidget::dragLeaveEvent (QDragLeaveEvent *)
+{
+ hover_end ();
+}
+
+void PlaylistWidget::dropEvent (QDropEvent * event)
+{
+ const QMimeData * mimedata = event->mimeData();
+
+ if (event->proposedAction () == Qt::CopyAction && mimedata->hasUrls ())
+ {
+ auto p = QtCompat::pos (event);
+ hover (p.x (), p.y ());
+
+ Index<PlaylistAddItem> files;
+
+ for (const auto &url: mimedata->urls())
+ files.append (String (url.toEncoded ()));
+
+ aud_drct_pl_add_list (std::move (files), hover_end ());
+ event->acceptProposedAction ();
+ }
+ else
+ {
+ hover_end ();
+ }
+}
+
+bool PlaylistWidget::leave ()
+{
+ if (! m_drag)
+ cancel_all ();
+
+ return true;
+}
+
+void PlaylistWidget::popup_trigger (int pos)
+{
+ audqt::infopopup_hide ();
+
+ m_popup_pos = pos;
+ m_popup_timer.queue (aud_get_int ("filepopup_delay") * 100,
+ this () { popup_show (); });
+}
+
+void PlaylistWidget::popup_show ()
+{
+ audqt::infopopup_show (m_playlist, m_popup_pos);
+}
+
+void PlaylistWidget::popup_hide ()
+{
+ audqt::infopopup_hide ();
+
+ m_popup_pos = -1;
+ m_popup_timer.stop ();
+}

audacious-plugins-4.4.1.tar.bz2/src/skins-qt/playlist-widget.h Added

@@ -0,0 +1,104 @@
+/*
+ * Audacious - a cross-platform multimedia player
+ * Copyright (c) 2007 Tomasz Moń
+ * Copyright (c) 2009-2011 John Lindgren
+ *
+ * Based on:
+ * BMP - Cross-platform multimedia player
+ * Copyright (C) 2003-2004 BMP development team.
+ * XMMS:
+ * Copyright (C) 1998-2003 XMMS development team.
+ *
+ * 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; under version 3 of the License.
+ *
+ * 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>.
+ *
+ * The Audacious team does not consider modular code linking to
+ * Audacious or using our public API to be a derived work.
+ */
+
+#ifndef SKINS_UI_SKINNED_PLAYLIST_H
+#define SKINS_UI_SKINNED_PLAYLIST_H
+
+#include <libaudcore/hook.h>
+#include <libaudcore/mainloop.h>
+#include <libaudcore/playlist.h>
+
+#include "widget.h"
+
+class PlaylistSlider;
+class QFont;
+class QFontMetrics;
+
+class PlaylistWidget : public Widget
+{
+public:
+ PlaylistWidget (int width, int height, const char * font);
+ ~PlaylistWidget () { cancel_all (); }
+
+ void set_slider (PlaylistSlider * slider) { m_slider = slider; }
+ void resize (int width, int height);
+ void set_font (const char * m_font);
+ void refresh ();
+ bool handle_keypress (QKeyEvent * event);
+ void row_info (int * m_rows, int * m_first);
+ void scroll_to (int row);
+ void set_focused (int row);
+ void hover (int x, int y);
+ int hover_end ();
+
+private:
+ void draw (QPainter & cr) override;
+ bool button_press (QMouseEvent * event) override;
+ bool button_release (QMouseEvent * event) override;
+ bool motion (QMouseEvent * event) override;
+ void dragEnterEvent (QDragEnterEvent * event) override;
+ void dragMoveEvent (QDragMoveEvent * event) override;
+ void dragLeaveEvent (QDragLeaveEvent *) override;
+ void dropEvent (QDropEvent * event) override;
+ bool leave () override;
+
+ void update_title ();
+ void calc_layout ();
+
+ int calc_position (int y) const;
+ int adjust_position (bool relative, int position) const;
+
+ void ensure_visible (int position);
+ void select_single (bool relative, int position);
+ void select_extend (bool relative, int position);
+ void select_slide (bool relative, int position);
+ void select_toggle (bool relative, int position);
+ void select_move (bool relative, int position);
+ void delete_selected ();
+
+ void cancel_all ();
+ void scroll_timeout ();
+ void popup_trigger (int pos);
+ void popup_show ();
+ void popup_hide ();
+
+ const Timer<PlaylistWidget>
+ scroll_timer {TimerRate::Hz10, this, & PlaylistWidget::scroll_timeout};
+
+ PlaylistSlider * m_slider = nullptr;
+ SmartPtr<QFont> m_font;
+ SmartPtr<QFontMetrics> m_metrics;
+ String m_title_text;
+
+ Playlist m_playlist;
+ int m_length = 0;
+ int m_width = 0, m_height = 0, m_row_height = 1, m_offset = 0, m_rows = 0, m_first = 0;
+ int m_scroll = 0, m_hover = -1, m_drag = 0, m_popup_pos = -1;
+ QueuedFunc m_popup_timer;
+};
+
+#endif

audacious-plugins-4.4.1.tar.bz2/src/skins-qt/playlistwin.cc Added

@@ -0,0 +1,533 @@
+/* Audacious - Cross-platform multimedia player
+ * Copyright (C) 2005-2011 Audacious development team.
+ *
+ * BMP - Cross-platform multimedia player
+ * Copyright (C) 2003-2004 BMP development team.
+ *
+ * Based on XMMS:
+ * Copyright (C) 1998-2003 XMMS development team.
+ *
+ * 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; under version 3 of the License.
+ *
+ * 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>.
+ *
+ * The Audacious team does not consider modular code linking to
+ * Audacious or using our public API to be a derived work.
+ */
+
+#include <inttypes.h>
+#include <string.h>
+
+#include <libaudcore/audstrings.h>
+#include <libaudcore/drct.h>
+#include <libaudcore/hook.h>
+#include <libaudcore/i18n.h>
+#include <libaudcore/playlist.h>
+#include <libaudcore/runtime.h>
+#include <libaudcore/tuple.h>
+
+#include "actions-mainwin.h"
+#include "dnd.h"
+#include "drag-handle.h"
+#include "menus.h"
+#include "plugin.h"
+#include "skins_cfg.h"
+#include "main.h"
+#include "playlistwin.h"
+#include "button.h"
+#include "playlist-widget.h"
+#include "playlist-slider.h"
+#include "textbox.h"
+#include "window.h"
+#include "view.h"
+
+#include "../ui-common/qt-compat.h"
+
+#define PLAYLISTWIN_MIN_WIDTH MAINWIN_WIDTH
+#define PLAYLISTWIN_MIN_HEIGHT MAINWIN_HEIGHT
+#define PLAYLISTWIN_WIDTH_SNAP 25
+#define PLAYLISTWIN_HEIGHT_SNAP 29
+#define PLAYLISTWIN_SHADED_HEIGHT MAINWIN_SHADED_HEIGHT
+
+#define APPEND(b, ...) snprintf (b + strlen (b), sizeof b - strlen (b), __VA_ARGS__)
+
+class PlWindow : public Window
+{
+public:
+ PlWindow (bool shaded) :
+ Window (WINDOW_PLAYLIST, & config.playlist_x, & config.playlist_y,
+ config.playlist_width, shaded ? PLAYLISTWIN_SHADED_HEIGHT :
+ config.playlist_height, shaded) {}
+
+private:
+ void draw (QPainter & cr);
+ bool button_press (QMouseEvent * event);
+ bool scroll (QWheelEvent * event);
+};
+
+Window * playlistwin;
+PlaylistWidget * playlistwin_list;
+TextBox * playlistwin_sinfo;
+
+static Button * playlistwin_shade, * playlistwin_close;
+static Button * playlistwin_shaded_shade, * playlistwin_shaded_close;
+
+static PlaylistSlider * playlistwin_slider;
+static TextBox * playlistwin_time_min, * playlistwin_time_sec;
+static TextBox * playlistwin_info;
+static Button * playlistwin_srew, * playlistwin_splay;
+static Button * playlistwin_spause, * playlistwin_sstop;
+static Button * playlistwin_sfwd, * playlistwin_seject;
+static Button * playlistwin_sscroll_up, *playlistwin_sscroll_down;
+static DragHandle * resize_handle, * sresize_handle;
+static Button * button_add, * button_sub, * button_sel, * button_misc, * button_list;
+
+static int resize_base_width, resize_base_height;
+//static int drop_position;
+
+static void update_info ()
+{
+ auto playlist = Playlist::active_playlist ();
+ StringBuf s1 = str_format_time (playlist.selected_length_ms ());
+ StringBuf s2 = str_format_time (playlist.total_length_ms ());
+ playlistwin_info->set_text (str_concat ({s1, "/", s2}));
+}
+
+static void update_rollup_text ()
+{
+ auto playlist = Playlist::active_playlist ();
+ int entry = playlist.get_position ();
+ Tuple tuple = playlist.entry_tuple (entry, Playlist::NoWait);
+ char scratch512;
+
+ scratch0 = 0;
+
+ if (entry > -1)
+ {
+ String title = tuple.get_str (Tuple::FormattedTitle);
+ int length = tuple.get_int (Tuple::Length);
+
+ if (aud_get_bool ("show_numbers_in_pl"))
+ APPEND (scratch, "%d. ", 1 + entry);
+
+ APPEND (scratch, "%s", (const char *) title);
+
+ if (length >= 0)
+ {
+ StringBuf buf = str_format_time (length);
+ APPEND (scratch, " (%s)", (const char *) buf);
+ }
+ }
+
+ playlistwin_sinfo->set_text (scratch);
+}
+
+static void playlistwin_shade_toggle ()
+{
+ view_set_playlist_shaded (! aud_get_bool ("skins", "playlist_shaded"));
+}
+
+static void playlistwin_scroll (float dir)
+{
+ int rows, first;
+
+ playlistwin_list->row_info (& rows, & first);
+ playlistwin_list->scroll_to (first + (int) (dir * rows / 3));
+}
+
+static void playlistwin_scroll_up_pushed ()
+{
+ playlistwin_scroll (-1);
+}
+
+static void playlistwin_scroll_down_pushed ()
+{
+ playlistwin_scroll (1);
+}
+
+/* note: height is ignored if the window is shaded */
+static void playlistwin_resize (int w, int h)
+{
+ int tx, ty;
+
+ tx = (w - PLAYLISTWIN_MIN_WIDTH) / PLAYLISTWIN_WIDTH_SNAP;
+ tx = (tx * PLAYLISTWIN_WIDTH_SNAP) + PLAYLISTWIN_MIN_WIDTH;
+ if (tx < PLAYLISTWIN_MIN_WIDTH)
+ tx = PLAYLISTWIN_MIN_WIDTH;
+
+ if (! aud_get_bool ("skins", "playlist_shaded"))
+ {
+ ty = (h - PLAYLISTWIN_MIN_HEIGHT) / PLAYLISTWIN_HEIGHT_SNAP;
+ ty = (ty * PLAYLISTWIN_HEIGHT_SNAP) + PLAYLISTWIN_MIN_HEIGHT;
+ if (ty < PLAYLISTWIN_MIN_HEIGHT)
+ ty = PLAYLISTWIN_MIN_HEIGHT;
+ }
+ else
+ ty = config.playlist_height;
+
+ if (tx == config.playlist_width && ty == config.playlist_height)
+ return;
+
+ config.playlist_width = w = tx;
+ config.playlist_height = h = ty;
+
+ playlistwin_list->resize (w - 31, h - 58);
+ playlistwin->move_widget (false, playlistwin_slider, w - 15, 20);
+ playlistwin_slider->resize (h - 58);
+
+ playlistwin->move_widget (true, playlistwin_shaded_shade, w - 21, 3);
+ playlistwin->move_widget (true, playlistwin_shaded_close, w - 11, 3);
+ playlistwin->move_widget (false, playlistwin_shade, w - 21, 3);
+ playlistwin->move_widget (false, playlistwin_close, w - 11, 3);
+
+ playlistwin->move_widget (false, playlistwin_time_min, w - 82, h - 15);
+ playlistwin->move_widget (false, playlistwin_time_sec, w - 64, h - 15);
+ playlistwin->move_widget (false, playlistwin_info, w - 143, h - 28);
+
+ playlistwin->move_widget (false, playlistwin_srew, w - 144, h - 16);
+ playlistwin->move_widget (false, playlistwin_splay, w - 138, h - 16);
+ playlistwin->move_widget (false, playlistwin_spause, w - 128, h - 16);
+ playlistwin->move_widget (false, playlistwin_sstop, w - 118, h - 16);
+ playlistwin->move_widget (false, playlistwin_sfwd, w - 109, h - 16);
+ playlistwin->move_widget (false, playlistwin_seject, w - 100, h - 16);
+ playlistwin->move_widget (false, playlistwin_sscroll_up, w - 14, h - 35);
+ playlistwin->move_widget (false, playlistwin_sscroll_down, w - 14, h - 30);
+
+ playlistwin->move_widget (false, resize_handle, w - 20, h - 20);
+ playlistwin->move_widget (true, sresize_handle, w - 31, 0);
+
+ playlistwin_sinfo->set_width (w - 35);
+
+ playlistwin->move_widget (false, button_add, 12, h - 29);
+ playlistwin->move_widget (false, button_sub, 40, h - 29);
+ playlistwin->move_widget (false, button_sel, 68, h - 29);
+ playlistwin->move_widget (false, button_misc, 100, h - 29);
+ playlistwin->move_widget (false, button_list, w - 46, h - 29);
+}
+
+bool PlWindow::scroll (QWheelEvent * event)
+{
+ float delta = -event->angleDelta ().y () / 120.0f;
+ if (delta)
+ playlistwin_scroll (delta);
+
+ return true;
+}
+
+bool PlWindow::button_press (QMouseEvent * event)
+{
+ if (event->button () == Qt::LeftButton &&
+ event->type () == QEvent::MouseButtonDblClick && QtCompat::y (event) < 14)
+ {
+ playlistwin_shade_toggle ();
+ return true;
+ }
+
+ if (event->button () == Qt::RightButton && event->type () == QEvent::MouseButtonPress)
+ {
+ menu_popup (UI_MENU_PLAYLIST, QtCompat::globalX (event), QtCompat::globalY (event), false, false);
+ return true;
+ }
+
+ return Window::button_press (event);
+}
+
+void playlistwin_hide_timer ()
+{
+ playlistwin_time_min->set_text (nullptr);
+ playlistwin_time_sec->set_text (nullptr);
+}
+
+void playlistwin_set_time (const char * minutes, const char * seconds)
+{
+ playlistwin_time_min->set_text (minutes);
+ playlistwin_time_sec->set_text (seconds);
+}
+
+#if 0
+static void drag_motion (GtkWidget * widget, GdkDragContext * context, int x,
+ int y, unsigned time, void * unused)
+{
+ if (! aud_get_bool ("skins", "playlist_shaded"))
+ playlistwin_list->hover (x - 12, y - 20);
+}
+
+static void drag_leave (GtkWidget * widget, GdkDragContext * context, unsigned time,
+ void * unused)
+{
+ if (! aud_get_bool ("skins", "playlist_shaded"))
+ playlistwin_list->hover_end ();
+}
+
+static void drag_drop (GtkWidget * widget, GdkDragContext * context, int x,
+ int y, unsigned time, void * unused)
+{
+ if (aud_get_bool ("skins", "playlist_shaded"))
+ drop_position = -1;
+ else
+ {
+ playlistwin_list->hover (x - 12, y - 20);
+ drop_position = playlistwin_list->hover_end ();
+ }
+}
+
+static void drag_data_received (GtkWidget * widget, GdkDragContext * context,
+ int x, int y, GtkSelectionData * data, unsigned info, unsigned time, void * unused)
+{
+ audgui_urilist_insert (Playlist::active_playlist (), drop_position,
+ (const char *) gtk_selection_data_get_data (data));
+ drop_position = -1;
+}
+#endif
+
+static void playlistwin_hide ()
+{
+ view_set_show_playlist (false);
+}
+
+static void resize_press ()
+{
+ resize_base_width = config.playlist_width;
+ resize_base_height = config.playlist_height;
+}
+
+static void resize_drag (int x_offset, int y_offset)
+{
+ bool shaded = aud_get_bool ("skins", "playlist_shaded");
+
+ /* compromise between rounding and truncating; this has no real
+ * justification at all other than it "looks about right". */
+ playlistwin_resize (resize_base_width + x_offset + PLAYLISTWIN_WIDTH_SNAP /
+ 3, resize_base_height + y_offset + PLAYLISTWIN_HEIGHT_SNAP / 3);
+ playlistwin->resize (config.playlist_width, shaded ?
+ PLAYLISTWIN_SHADED_HEIGHT : config.playlist_height);
+}
+
+static void button_add_cb (Button * button, QMouseEvent * event)
+{
+ int xpos, ypos;
+ playlistwin->getPosition (& xpos, & ypos);
+ menu_popup (UI_MENU_PLAYLIST_ADD, xpos + 12 * config.scale,
+ ypos + (config.playlist_height - 8) * config.scale, false, true);
+}
+
+static void button_sub_cb (Button * button, QMouseEvent * event)
+{
+ int xpos, ypos;
+ playlistwin->getPosition (& xpos, & ypos);
+ menu_popup (UI_MENU_PLAYLIST_REMOVE, xpos + 40 * config.scale,
+ ypos + (config.playlist_height - 8) * config.scale, false, true);
+}
+
+static void button_sel_cb (Button * button, QMouseEvent * event)
+{
+ int xpos, ypos;
+ playlistwin->getPosition (& xpos, & ypos);
+ menu_popup (UI_MENU_PLAYLIST_SELECT, xpos + 68 * config.scale,
+ ypos + (config.playlist_height - 8) * config.scale, false, true);
+}
+
+static void button_misc_cb (Button * button, QMouseEvent * event)
+{
+ int xpos, ypos;
+ playlistwin->getPosition (& xpos, & ypos);
+ menu_popup (UI_MENU_PLAYLIST_SORT, xpos + 100 * config.scale,
+ ypos + (config.playlist_height - 8) * config.scale, false, true);
+}
+
+static void button_list_cb (Button * button, QMouseEvent * event)
+{
+ int xpos, ypos;
+ playlistwin->getPosition (& xpos, & ypos);
+ menu_popup (UI_MENU_PLAYLIST,
+ xpos + (config.playlist_width - 12) * config.scale,
+ ypos + (config.playlist_height - 8) * config.scale, true, true);
+}
+
+static void playlistwin_create_widgets ()
+{
+ int w = config.playlist_width, h = config.playlist_height;
+
+ bool shaded = aud_get_bool ("skins", "playlist_shaded");
+ playlistwin_sinfo = new TextBox (w - 35, nullptr, shaded && config.autoscroll);
+ playlistwin->put_widget (true, playlistwin_sinfo, 4, 4);
+
+ playlistwin_shaded_shade = new Button (9, 9, 128, 45, 150, 42, SKIN_PLEDIT, SKIN_PLEDIT);
+ playlistwin->put_widget (true, playlistwin_shaded_shade, w - 21, 3);
+ playlistwin_shaded_shade->on_release ((ButtonCB) playlistwin_shade_toggle);
+
+ playlistwin_shaded_close = new Button (9, 9, 138, 45, 52, 42, SKIN_PLEDIT, SKIN_PLEDIT);
+ playlistwin->put_widget (true, playlistwin_shaded_close, w - 11, 3);
+ playlistwin_shaded_close->on_release ((ButtonCB) playlistwin_hide);
+
+ playlistwin_shade = new Button (9, 9, 157, 3, 62, 42, SKIN_PLEDIT, SKIN_PLEDIT);
+ playlistwin->put_widget (false, playlistwin_shade, w - 21, 3);
+ playlistwin_shade->on_release ((ButtonCB) playlistwin_shade_toggle);
+
+ playlistwin_close = new Button (9, 9, 167, 3, 52, 42, SKIN_PLEDIT, SKIN_PLEDIT);
+ playlistwin->put_widget (false, playlistwin_close, w - 11, 3);
+ playlistwin_close->on_release ((ButtonCB) playlistwin_hide);
+
+ String font = aud_get_str ("skins", "playlist_font");
+ playlistwin_list = new PlaylistWidget (w - 31, h - 58, font);
+ playlistwin->put_widget (false, playlistwin_list, 12, 20);
+
+ /* playlist list box slider */
+ playlistwin_slider = new PlaylistSlider (playlistwin_list, h - 58);
+ playlistwin->put_widget (false, playlistwin_slider, w - 15, 20);
+ playlistwin_list->set_slider (playlistwin_slider);
+
+ playlistwin_time_min = new TextBox (15, nullptr, false);
+ playlistwin->put_widget (false, playlistwin_time_min, w - 82, h - 15);
+ playlistwin_time_min->on_press (change_timer_mode_cb);
+
+ playlistwin_time_sec = new TextBox (10, nullptr, false);
+ playlistwin->put_widget (false, playlistwin_time_sec, w - 64, h - 15);
+ playlistwin_time_sec->on_press (change_timer_mode_cb);
+
+ playlistwin_info = new TextBox (90, nullptr, false);
+ playlistwin->put_widget (false, playlistwin_info, w - 143, h - 28);
+
+ /* mini play control buttons at right bottom corner */
+
+ playlistwin_srew = new Button (8, 7);
+ playlistwin->put_widget (false, playlistwin_srew, w - 144, h - 16);
+ playlistwin_srew->on_release ((ButtonCB) aud_drct_pl_prev);
+
+ playlistwin_splay = new Button (10, 7);
+ playlistwin->put_widget (false, playlistwin_splay, w - 138, h - 16);
+ playlistwin_splay->on_release ((ButtonCB) aud_drct_play);
+
+ playlistwin_spause = new Button (10, 7);
+ playlistwin->put_widget (false, playlistwin_spause, w - 128, h - 16);
+ playlistwin_spause->on_release ((ButtonCB) aud_drct_pause);
+
+ playlistwin_sstop = new Button (9, 7);
+ playlistwin->put_widget (false, playlistwin_sstop, w - 118, h - 16);
+ playlistwin_sstop->on_release ((ButtonCB) aud_drct_stop);
+
+ playlistwin_sfwd = new Button (8, 7);
+ playlistwin->put_widget (false, playlistwin_sfwd, w - 109, h - 16);
+ playlistwin_sfwd->on_release ((ButtonCB) aud_drct_pl_next);
+
+ playlistwin_seject = new Button (9, 7);
+ playlistwin->put_widget (false, playlistwin_seject, w - 100, h - 16);
+ playlistwin_seject->on_release ((ButtonCB) action_play_file);
+
+ playlistwin_sscroll_up = new Button (8, 5);
+ playlistwin->put_widget (false, playlistwin_sscroll_up, w - 14, h - 35);
+ playlistwin_sscroll_up->on_release ((ButtonCB) playlistwin_scroll_up_pushed);
+
+ playlistwin_sscroll_down = new Button (8, 5);
+ playlistwin->put_widget (false, playlistwin_sscroll_down, w - 14, h - 30);
+ playlistwin_sscroll_down->on_release ((ButtonCB) playlistwin_scroll_down_pushed);
+
+ /* resize handles */
+
+ resize_handle = new DragHandle (20, 20, resize_press, resize_drag);
+ playlistwin->put_widget (false, resize_handle, w - 20, h - 20);
+
+ sresize_handle = new DragHandle (9, PLAYLISTWIN_SHADED_HEIGHT, resize_press, resize_drag);
+ playlistwin->put_widget (true, sresize_handle, w - 31, 0);
+
+ /* lower button row */
+
+ button_add = new Button (25, 18);
+ playlistwin->put_widget (false, button_add, 12, h - 29);
+ button_add->on_press (button_add_cb);
+
+ button_sub = new Button (25, 18);
+ playlistwin->put_widget (false, button_sub, 40, h - 29);
+ button_sub->on_press (button_sub_cb);
+
+ button_sel = new Button (25, 18);
+ playlistwin->put_widget (false, button_sel, 68, h - 29);
+ button_sel->on_press (button_sel_cb);
+
+ button_misc = new Button (25, 18);
+ playlistwin->put_widget (false, button_misc, 100, h - 29);
+ button_misc->on_press (button_misc_cb);
+
+ button_list = new Button (23, 18);
+ playlistwin->put_widget (false, button_list, w - 46, h - 29);
+ button_list->on_press (button_list_cb);
+}
+
+void PlWindow::draw (QPainter & cr)
+{
+ if (is_shaded ())
+ skin_draw_playlistwin_shaded (cr, config.playlist_width, is_focused ());
+ else
+ skin_draw_playlistwin_frame (cr, config.playlist_width,
+ config.playlist_height, is_focused ());
+}
+
+static void playlistwin_create_window ()
+{
+ bool shaded = aud_get_bool ("skins", "playlist_shaded");
+
+ playlistwin = new PlWindow (shaded);
+ playlistwin->setWindowTitle (_("Audacious Playlist Editor"));
+ playlistwin->setWindowRole ("playlist");
+
+#if 0
+ GtkWidget * w = playlistwin->gtk ();
+ drag_dest_set (w);
+ drop_position = -1;
+
+ g_signal_connect (w, "drag-motion", (GCallback) drag_motion, nullptr);
+ g_signal_connect (w, "drag-leave", (GCallback) drag_leave, nullptr);
+ g_signal_connect (w, "drag-drop", (GCallback) drag_drop, nullptr);
+ g_signal_connect (w, "drag-data-received", (GCallback) drag_data_received, nullptr);
+#endif
+}
+
+static void update_cb (void *, void *)
+{
+ playlistwin_list->refresh ();
+
+ update_info ();
+ update_rollup_text ();
+}
+
+static void follow_cb (void * data, void *)
+{
+ auto list = aud::from_ptr<Playlist> (data);
+ list.select_all (false);
+
+ int row = list.get_position ();
+ if (row >= 0)
+ {
+ list.select_entry (row, true);
+ if (list == Playlist::active_playlist ())
+ playlistwin_list->set_focused (row);
+ }
+}
+
+void playlistwin_create ()
+{
+ playlistwin_create_window ();
+ playlistwin_create_widgets ();
+
+ update_info ();
+ update_rollup_text ();
+
+ hook_associate ("playlist position", follow_cb, nullptr);
+ hook_associate ("playlist activate", update_cb, nullptr);
+ hook_associate ("playlist update", update_cb, nullptr);
+}
+
+void playlistwin_unhook ()
+{
+ hook_dissociate ("playlist position", follow_cb);
+ hook_dissociate ("playlist activate", update_cb);
+ hook_dissociate ("playlist update", update_cb);
+}

audacious-plugins-4.4.1.tar.bz2/src/skins-qt/playlistwin.h Added

@@ -0,0 +1,39 @@
+/* BMP - Cross-platform multimedia player
+ * Copyright (C) 2003-2004 BMP development team.
+ *
+ * Based on XMMS:
+ * Copyright (C) 1998-2003 XMMS development team.
+ *
+ * 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; under version 3 of the License.
+ *
+ * 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>.
+ *
+ * The Audacious team does not consider modular code linking to
+ * Audacious or using our public API to be a derived work.
+ */
+
+#ifndef SKINS_UI_PLAYLIST_H
+#define SKINS_UI_PLAYLIST_H
+
+class PlaylistWidget;
+class TextBox;
+class Window;
+
+void playlistwin_create ();
+void playlistwin_unhook ();
+void playlistwin_hide_timer ();
+void playlistwin_set_time (const char * minutes, const char * seconds);
+
+extern Window * playlistwin;
+extern PlaylistWidget * playlistwin_list;
+extern TextBox * playlistwin_sinfo;
+
+#endif /* SKINS_UI_PLAYLIST_H */

audacious-plugins-4.4.1.tar.bz2/src/skins-qt/playstatus.cc Added

@@ -0,0 +1,63 @@
+/*
+ * Audacious - a cross-platform multimedia player
+ * Copyright (c) 2007 Tomasz Moń
+ * Copyright (c) 2011 John Lindgren
+ *
+ * Based on:
+ * BMP - Cross-platform multimedia player
+ * Copyright (C) 2003-2004 BMP development team.
+ * XMMS:
+ * Copyright (C) 1998-2003 XMMS development team.
+ *
+ * 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; under version 3 of the License.
+ *
+ * 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>.
+ *
+ * The Audacious team does not consider modular code linking to
+ * Audacious or using our public API to be a derived work.
+ */
+
+#include "skins_cfg.h"
+#include "skin.h"
+#include "playstatus.h"
+
+void PlayStatus::draw (QPainter & cr)
+{
+ if (m_status == STATUS_PLAY)
+ skin_draw_pixbuf (cr, SKIN_PLAYPAUSE, 36, 0, 0, 0, 3, 9);
+ else
+ skin_draw_pixbuf (cr, SKIN_PLAYPAUSE, 27, 0, 0, 0, 2, 9);
+
+ switch (m_status)
+ {
+ case STATUS_STOP:
+ skin_draw_pixbuf (cr, SKIN_PLAYPAUSE, 18, 0, 2, 0, 9, 9);
+ break;
+ case STATUS_PAUSE:
+ skin_draw_pixbuf (cr, SKIN_PLAYPAUSE, 9, 0, 2, 0, 9, 9);
+ break;
+ case STATUS_PLAY:
+ skin_draw_pixbuf (cr, SKIN_PLAYPAUSE, 1, 0, 3, 0, 8, 9);
+ break;
+ }
+}
+
+PlayStatus::PlayStatus ()
+{
+ set_scale (config.scale);
+ add_drawable (11, 9);
+}
+
+void PlayStatus::set_status (PStatus status)
+{
+ m_status = status;
+ queue_draw ();
+}

audacious-plugins-4.4.1.tar.bz2/src/skins-qt/playstatus.h Added

@@ -0,0 +1,51 @@
+/*
+ * Audacious - a cross-platform multimedia player
+ * Copyright (c) 2007 Tomasz Moń
+ * Copyright (c) 2011 John Lindgren
+ *
+ * Based on:
+ * BMP - Cross-platform multimedia player
+ * Copyright (C) 2003-2004 BMP development team.
+ * XMMS:
+ * Copyright (C) 1998-2003 XMMS development team.
+ *
+ * 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; under version 3 of the License.
+ *
+ * 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>.
+ *
+ * The Audacious team does not consider modular code linking to
+ * Audacious or using our public API to be a derived work.
+ */
+
+#ifndef SKINS_UI_SKINNED_PLAYSTATUS_H
+#define SKINS_UI_SKINNED_PLAYSTATUS_H
+
+#include "widget.h"
+
+typedef enum {
+ STATUS_STOP,
+ STATUS_PAUSE,
+ STATUS_PLAY
+} PStatus;
+
+class PlayStatus : public Widget
+{
+public:
+ PlayStatus ();
+ void set_status (PStatus status);
+
+private:
+ void draw (QPainter & cr);
+
+ PStatus m_status = STATUS_STOP;
+};
+
+#endif

audacious-plugins-4.4.1.tar.bz2/src/skins-qt/plugin-window.cc Added

@@ -0,0 +1,186 @@
+/*
+ * plugin-window.c
+ * Copyright 2014 John Lindgren
+ *
+ * This file is part of Audacious.
+ *
+ * Audacious 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, version 2 or version 3 of the License.
+ *
+ * Audacious 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
+ * Audacious. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The Audacious team does not consider modular code linking to Audacious or
+ * using our public API to be a derived work.
+ */
+
+/* TODO (someday): implement proper docking for plugin windows */
+
+#include "plugin-window.h"
+
+#include <QBoxLayout>
+#include <QWidget>
+#include <QWindow>
+
+#include <libaudcore/audstrings.h>
+#include <libaudcore/interface.h>
+#include <libaudcore/plugin.h>
+#include <libaudcore/plugins.h>
+#include <libaudcore/hook.h>
+#include <libaudcore/runtime.h>
+#include <libaudqt/dock.h>
+#include <libaudqt/libaudqt.h>
+
+#include "main.h"
+#include "window.h"
+
+class PluginWindow : public QWidget
+{
+public:
+ PluginWindow (audqt::DockItem * item) : m_item (item)
+ {
+ setWindowFlags (Qt::Dialog);
+ setWindowTitle (item->name ());
+ setWindowRole ("plugin");
+
+ item->set_host_data (this);
+
+ String pos_str = aud_get_str ("skins-layout", item->id ());
+ int pos4;
+
+ if (pos_str && str_to_int_array (pos_str, pos, 4))
+ {
+ move (pos0, pos1);
+ resize (pos2, pos3);
+ }
+ else
+ resize (3 * audqt::sizes.OneInch, 2 * audqt::sizes.OneInch);
+
+ auto vbox = audqt::make_vbox (this);
+ vbox->addWidget (item->widget ());
+ }
+
+ QWidget * widget () const { return m_item->widget (); }
+
+ void show ()
+ {
+ winId ();
+ // FIXME: this breaks when double-size is enabled/disabled
+ // (because the main window is recreated).
+ windowHandle ()->setTransientParent (mainwin->windowHandle ());
+ QWidget::show ();
+ }
+
+ void save_size ()
+ {
+ if (! isVisible ())
+ return;
+
+ int pos4 = {x (), y (), width (), height ()};
+ aud_set_str ("skins-layout", m_item->id (), int_array_to_str (pos, 4));
+ }
+
+ void destroy()
+ {
+ if (in_event)
+ deleteLater();
+ else
+ delete this;
+ }
+
+protected:
+ void closeEvent (QCloseEvent * event) override
+ {
+ in_event = true;
+ m_item->user_close ();
+ event->ignore ();
+ in_event = false;
+ }
+
+ void keyPressEvent (QKeyEvent * event) override
+ {
+ auto mods = Qt::ShiftModifier | Qt::ControlModifier | Qt::AltModifier;
+ if (! (event->modifiers () & mods) && event->key () == Qt::Key_Escape)
+ {
+ in_event = true;
+ m_item->user_close ();
+ event->accept ();
+ in_event = false;
+ }
+ }
+
+private:
+ audqt::DockItem * m_item;
+ bool in_event = false;
+};
+
+class PluginWindowHost : public audqt::DockHost
+{
+public:
+ void add_dock_item(audqt::DockItem * item) override;
+ void focus_dock_item(audqt::DockItem * item) override;
+ void remove_dock_item(audqt::DockItem * item) override;
+};
+
+static PluginWindowHost window_host;
+static Index<PluginWindow *> windows;
+
+void PluginWindowHost::add_dock_item (audqt::DockItem * item)
+{
+ auto window = new PluginWindow (item);
+ windows.append (window);
+
+ if (aud_ui_is_shown ())
+ window->show ();
+}
+
+void PluginWindowHost::focus_dock_item (audqt::DockItem * item)
+{
+ auto window = (PluginWindow *) item->host_data ();
+ window->activateWindow ();
+}
+
+void PluginWindowHost::remove_dock_item (audqt::DockItem * item)
+{
+ auto window = (PluginWindow *) item->host_data ();
+ windows.remove (windows.find (window), 1);
+ window->save_size ();
+ window->destroy ();
+}
+
+void create_plugin_windows ()
+{
+ audqt::register_dock_host (& window_host);
+}
+
+void show_plugin_windows ()
+{
+ for (auto window : windows)
+ window->show ();
+}
+
+void focus_plugin_window (PluginHandle * plugin)
+{
+ auto item = audqt::DockItem::find_by_plugin (plugin);
+ if (item)
+ item->grab_focus ();
+}
+
+void hide_plugin_windows ()
+{
+ for (auto window : windows)
+ {
+ window->save_size ();
+ window->hide ();
+ }
+}
+
+void destroy_plugin_windows ()
+{
+ audqt::unregister_dock_host ();
+}

audacious-plugins-4.4.1.tar.bz2/src/skins-qt/plugin-window.h Added

@@ -0,0 +1,33 @@
+/*
+ * plugin-window.h
+ * Copyright 2014 John Lindgren
+ *
+ * This file is part of Audacious.
+ *
+ * Audacious 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, version 2 or version 3 of the License.
+ *
+ * Audacious 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
+ * Audacious. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The Audacious team does not consider modular code linking to Audacious or
+ * using our public API to be a derived work.
+ */
+
+#ifndef SKINS_PLUGIN_WINDOW_H
+#define SKINS_PLUGIN_WINDOW_H
+
+class PluginHandle;
+
+void create_plugin_windows ();
+void show_plugin_windows ();
+void focus_plugin_window (PluginHandle * plugin);
+void hide_plugin_windows ();
+void destroy_plugin_windows ();
+
+#endif /* SKINS_PLUGIN_WINDOW_H */

audacious-plugins-4.4.1.tar.bz2/src/skins-qt/plugin.cc Added

@@ -0,0 +1,240 @@
+/*
+ * Audacious - a cross-platform multimedia player
+ * Copyright (c) 2008 Tomasz Moń
+ *
+ * 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; under version 3 of the License.
+ *
+ * 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>.
+ *
+ * The Audacious team does not consider modular code linking to
+ * Audacious or using our public API to be a derived work.
+ */
+
+#include <stdlib.h>
+#include <glib.h>
+
+#include <QApplication>
+#include <QGuiApplication>
+#include <QPointer>
+
+#include <libaudcore/audstrings.h>
+#include <libaudcore/drct.h>
+#include <libaudcore/i18n.h>
+#include <libaudcore/interface.h>
+#include <libaudcore/runtime.h>
+#include <libaudcore/plugin.h>
+#include <libaudcore/hook.h>
+#include <libaudqt/iface.h>
+#include <libaudqt/libaudqt.h>
+
+#include "menus.h"
+#include "plugin.h"
+#include "plugin-window.h"
+#include "skins_cfg.h"
+#include "equalizer.h"
+#include "main.h"
+#include "vis-callbacks.h"
+#include "playlistwin.h"
+#include "skin.h"
+#include "window.h"
+#include "view.h"
+
+/* In Qt 6, QApplication::quit() calls closeEvent() on any remaining
+ * windows. To ensure that our cleanup function is called before that
+ * happens, it's convenient to tie it to the lifetime of a QObject. */
+class QtSkinsProxy : public QObject
+{
+public:
+ ~QtSkinsProxy ();
+};
+
+static QPointer<QtSkinsProxy> proxy;
+
+class QtSkins : public audqt::QtIfacePlugin
+{
+public:
+ static constexpr PluginInfo info = {
+ N_("Winamp Classic Interface"),
+ PACKAGE,
+ nullptr,
+ & skins_prefs,
+ PluginQtOnly
+ };
+
+ constexpr QtSkins () : audqt::QtIfacePlugin (info) {}
+
+ bool init ();
+
+ void cleanup ()
+ {
+ delete proxy;
+ audqt::cleanup ();
+ }
+
+ void run () { QApplication::exec (); }
+
+ void quit ()
+ {
+ QObject::connect (proxy.data (), & QObject::destroyed, QApplication::quit);
+ proxy->deleteLater ();
+ }
+
+ void show (bool show)
+ {
+ if (proxy)
+ view_show_player (show);
+ }
+};
+
+EXPORT QtSkins aud_plugin_instance;
+
+static String user_skin_dir;
+static String skin_thumb_dir;
+
+const char * skins_get_user_skin_dir ()
+{
+ if (! user_skin_dir)
+ user_skin_dir = String (filename_build ({g_get_user_data_dir (), "audacious", "Skins"}));
+
+ return user_skin_dir;
+}
+
+const char * skins_get_skin_thumb_dir ()
+{
+ if (! skin_thumb_dir)
+ skin_thumb_dir = String (filename_build ({g_get_user_cache_dir (), "audacious", "thumbs-unscaled"}));
+
+ return skin_thumb_dir;
+}
+
+static bool load_initial_skin ()
+{
+ String path = aud_get_str ("skins", "skin");
+ if (path0 && skin_load (path))
+ return true;
+
+ StringBuf def = filename_build ({aud_get_path (AudPath::DataDir), "Skins", "Default"});
+ if (skin_load (def))
+ return true;
+
+ AUDERR ("Unable to load any skin; giving up!\n");
+ return false;
+}
+
+static void skins_init_main (bool restart)
+{
+ int old_scale = config.scale;
+
+ config.scale = aud_get_bool ("skins", "double_size") ? 2 : 1;
+
+ if (restart && config.scale != old_scale)
+ dock_change_scale (old_scale, config.scale);
+
+ mainwin_create ();
+ equalizerwin_create ();
+ playlistwin_create ();
+
+ menu_init (mainwin);
+
+ /* copy menu shortcuts to the two other windows */
+ for (QAction * action : mainwin->actions ())
+ {
+ equalizerwin->addAction (action);
+ playlistwin->addAction (action);
+ }
+
+ view_apply_skin ();
+ view_apply_on_top ();
+ view_apply_sticky ();
+
+ if (aud_drct_get_playing ())
+ mainwin_playback_begin ();
+ else
+ mainwin_update_song_info ();
+
+ timer_add (TimerRate::Hz4, (TimerFunc) mainwin_update_song_info);
+}
+
+bool QtSkins::init ()
+{
+ skins_cfg_load ();
+
+ // At least one 3rd-party QImage plugin will abort() if loaded before
+ // QGuiApplication, so call audqt::init() before loading the skin!
+ audqt::init ();
+
+ if (! load_initial_skin ())
+ {
+ audqt::cleanup ();
+ return false;
+ }
+
+ if (QGuiApplication::platformName() == "wayland")
+ {
+ AUDERR ("The Winamp interface is not supported on Wayland. "
+ "Please run Audacious via XWayland.\n");
+ audqt::cleanup ();
+ return false;
+ }
+
+ skins_init_main (false);
+
+ create_plugin_windows ();
+
+ proxy = new QtSkinsProxy;
+
+ return true;
+}
+
+static void skins_cleanup_main ()
+{
+ mainwin_unhook ();
+ equalizerwin_unhook ();
+ playlistwin_unhook ();
+
+ timer_remove (TimerRate::Hz4, (TimerFunc) mainwin_update_song_info);
+
+ delete mainwin; mainwin = nullptr;
+ delete playlistwin; playlistwin = nullptr;
+ delete equalizerwin; equalizerwin = nullptr;
+}
+
+QtSkinsProxy::~QtSkinsProxy ()
+{
+ skins_cfg_save ();
+
+ destroy_plugin_windows ();
+
+ skins_cleanup_main ();
+
+ skin = Skin ();
+
+ user_skin_dir = String ();
+ skin_thumb_dir = String ();
+}
+
+void skins_restart ()
+{
+ skins_cleanup_main ();
+ skins_init_main (true);
+
+ if (aud_ui_is_shown ())
+ view_show_player (true);
+}
+
+void skins_close ()
+{
+ bool handled = false;
+ hook_call ("window close", & handled);
+
+ if (! handled)
+ aud_quit ();
+}

audacious-plugins-4.4.1.tar.bz2/src/skins-qt/plugin.h Added

@@ -0,0 +1,30 @@
+/*
+ * Audacious - a cross-platform multimedia player
+ * Copyright (c) 2008 Tomasz Moń
+ *
+ * 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; under version 3 of the License.
+ *
+ * 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>.
+ *
+ * The Audacious team does not consider modular code linking to
+ * Audacious or using our public API to be a derived work.
+ */
+
+#ifndef PLUGIN_SKINS_H
+#define PLUGIN_SKINS_H
+
+const char * skins_get_user_skin_dir ();
+const char * skins_get_skin_thumb_dir ();
+
+void skins_restart ();
+void skins_close ();
+
+#endif

audacious-plugins-4.4.1.tar.bz2/src/skins-qt/search-select.cc Added

@@ -0,0 +1,212 @@
+/* Audacious - Cross-platform multimedia player
+ * Copyright (C) 2005-2011 Audacious development team.
+ *
+ * BMP - Cross-platform multimedia player
+ * Copyright (C) 2003-2004 BMP development team.
+ *
+ * Based on XMMS:
+ * Copyright (C) 1998-2003 XMMS development team.
+ *
+ * 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; under version 3 of the License.
+ *
+ * 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>.
+ *
+ * The Audacious team does not consider modular code linking to
+ * Audacious or using our public API to be a derived work.
+ */
+
+#include "actions-playlist.h"
+#include "playlistwin.h"
+#include "playlist-widget.h"
+
+#include <QCheckBox>
+#include <QDialog>
+#include <QDialogButtonBox>
+#include <QGridLayout>
+#include <QLabel>
+#include <QLineEdit>
+#include <QPushButton>
+
+#include <libaudcore/i18n.h>
+#include <libaudcore/playlist.h>
+#include <libaudqt/libaudqt.h>
+
+class SearchSelectDialog : public QDialog
+{
+public:
+ SearchSelectDialog (QWidget * parent = nullptr);
+
+private:
+ void toggle_related_checkbox (QCheckBox * caller, QCheckBox * related);
+ void copy_selected_to_new (Playlist playlist);
+ void focus_first_selected_entry (Playlist playlist);
+ void search ();
+
+ QLineEdit * m_entry_title, * m_entry_album,
+ * m_entry_artist, * m_entry_file_name;
+ QCheckBox * m_checkbox_clearprevsel,
+ * m_checkbox_autoenqueue,
+ * m_checkbox_newplaylist;
+};
+
+SearchSelectDialog::SearchSelectDialog (QWidget * parent) : QDialog (parent)
+{
+ setWindowTitle (_("Search entries in active playlist"));
+ setWindowRole ("search");
+ setContentsMargins (audqt::margins.FourPt);
+
+ auto logo = new QLabel;
+ int logo_size = audqt::to_native_dpi (48);
+ logo->setPixmap (QIcon::fromTheme ("edit-find").pixmap (logo_size, logo_size));
+
+ auto help_text = new QLabel (_("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."));
+ help_text->setWordWrap (true);
+
+ auto label_title = new QLabel (_("Title:"));
+ m_entry_title = new QLineEdit;
+ m_entry_title->setFocus ();
+
+ auto label_album = new QLabel (_("Album:"));
+ m_entry_album = new QLineEdit;
+
+ auto label_artist = new QLabel (_("Artist:"));
+ m_entry_artist = new QLineEdit;
+
+ auto label_file_name = new QLabel (_("File Name:"));
+ m_entry_file_name = new QLineEdit;
+
+ m_checkbox_clearprevsel = new QCheckBox (_("Clear previous selection before searching"));
+ m_checkbox_autoenqueue = new QCheckBox (_("Automatically toggle queue for matching entries"));
+ m_checkbox_newplaylist = new QCheckBox (_("Create a new playlist with matching entries"));
+ m_checkbox_clearprevsel->setCheckState (Qt::Checked);
+
+ QObject::connect (m_checkbox_autoenqueue, & QAbstractButton::toggled, this () {
+ toggle_related_checkbox (m_checkbox_autoenqueue, m_checkbox_newplaylist);
+ });
+
+ QObject::connect (m_checkbox_newplaylist, & QAbstractButton::toggled, this () {
+ toggle_related_checkbox (m_checkbox_newplaylist, m_checkbox_autoenqueue);
+ });
+
+ auto search = new QPushButton (_("Search"));
+ auto cancel = new QPushButton (_("Cancel"));
+
+ auto buttonbox = new QDialogButtonBox;
+ buttonbox->addButton (search, QDialogButtonBox::AcceptRole);
+ buttonbox->addButton (cancel, QDialogButtonBox::RejectRole);
+
+ QObject::connect (buttonbox, & QDialogButtonBox::accepted, this, & SearchSelectDialog::search);
+ QObject::connect (buttonbox, & QDialogButtonBox::rejected, this, & QDialog::close);
+
+ auto hbox = audqt::make_hbox (nullptr);
+ hbox->addWidget (logo);
+ hbox->addWidget (help_text);
+
+ auto grid = new QGridLayout;
+ grid->addLayout (hbox, 0, 0, 1, 2, Qt::AlignLeft);
+ grid->addWidget (label_title, 1, 0, Qt::AlignRight);
+ grid->addWidget (m_entry_title, 1, 1);
+ grid->addWidget (label_album, 2, 0, Qt::AlignRight);
+ grid->addWidget (m_entry_album, 2, 1);
+ grid->addWidget (label_artist, 3, 0, Qt::AlignRight);
+ grid->addWidget (m_entry_artist, 3, 1);
+ grid->addWidget (label_file_name, 4, 0, Qt::AlignRight);
+ grid->addWidget (m_entry_file_name, 4, 1);
+ grid->addWidget (m_checkbox_clearprevsel, 5, 0, 1, 2);
+ grid->addWidget (m_checkbox_autoenqueue, 6, 0, 1, 2);
+ grid->addWidget (m_checkbox_newplaylist, 7, 0, 1, 2);
+
+ auto vbox = audqt::make_vbox (this);
+ vbox->addLayout (grid);
+ vbox->addWidget (buttonbox, 0, Qt::AlignBottom);
+}
+
+void SearchSelectDialog::toggle_related_checkbox (QCheckBox * caller, QCheckBox * related)
+{
+ if (caller->isChecked ())
+ related->setCheckState (Qt::Unchecked);
+}
+
+void SearchSelectDialog::copy_selected_to_new (Playlist playlist)
+{
+ int entries = playlist.n_entries ();
+ Index<PlaylistAddItem> items;
+
+ for (int entry = 0; entry < entries; entry ++)
+ {
+ if (playlist.entry_selected (entry))
+ {
+ items.append
+ (playlist.entry_filename (entry),
+ playlist.entry_tuple (entry, Playlist::NoWait),
+ playlist.entry_decoder (entry, Playlist::NoWait));
+ }
+ }
+
+ auto new_list = Playlist::new_playlist ();
+ new_list.insert_items (0, std::move (items), false);
+}
+
+void SearchSelectDialog::focus_first_selected_entry (Playlist playlist)
+{
+ int entries = playlist.n_entries ();
+ for (int i = 0; i < entries; i ++)
+ {
+ if (playlist.entry_selected (i))
+ {
+ playlistwin_list->set_focused (i);
+ return;
+ }
+ }
+}
+
+void SearchSelectDialog::search ()
+{
+ auto playlist = Playlist::active_playlist ();
+
+ /* create a tuple with user search data */
+ Tuple tuple;
+ tuple.set_str (Tuple::Title, m_entry_title->text ().toUtf8 ());
+ tuple.set_str (Tuple::Album, m_entry_album->text ().toUtf8 ());
+ tuple.set_str (Tuple::Artist, m_entry_artist->text ().toUtf8 ());
+ tuple.set_str (Tuple::Basename, m_entry_file_name->text ().toUtf8 ());
+
+ /* check if previous selection should be cleared before searching */
+ if (m_checkbox_clearprevsel->isChecked ())
+ playlist.select_all (false);
+
+ playlist.select_by_patterns (tuple);
+
+ /* check if a new playlist should be created after searching */
+ if (m_checkbox_newplaylist->isChecked ())
+ copy_selected_to_new (playlist);
+ else
+ {
+ /* set focus on the first entry found */
+ focus_first_selected_entry (playlist);
+
+ /* check if matched entries should be queued */
+ if (m_checkbox_autoenqueue->isChecked ())
+ playlist.queue_insert_selected (-1);
+ }
+
+ /* done here :) */
+ close ();
+}
+
+void action_playlist_search_and_select ()
+{
+ auto dialog = new SearchSelectDialog;
+ dialog->setAttribute (Qt::WA_DeleteOnClose);
+ dialog->show ();
+}

audacious-plugins-4.4.1.tar.bz2/src/skins-qt/skin-ini.cc Added

@@ -0,0 +1,278 @@
+/*
+ * Audacious
+ * Copyright 2011-2013 Audacious development team
+ *
+ * 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; under version 3 of the License.
+ *
+ * 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>.
+ *
+ * The Audacious team does not consider modular code linking to
+ * Audacious or using our public API to be a derived work.
+ */
+
+#include <stdlib.h>
+#include <glib.h>
+
+#include <libaudcore/inifile.h>
+
+#include "skins_cfg.h"
+#include "skin.h"
+#include "skins_util.h"
+
+/*
+ * skin.hints parsing
+ */
+
+typedef struct {
+ const char * name;
+ int * value_ptr;
+} HintPair;
+
+/* in alphabetical order to allow binary search */
+static const HintPair hint_pairs = {
+ {"mainwinaboutx", & skin.hints.mainwin_about_x},
+ {"mainwinabouty", & skin.hints.mainwin_about_y},
+ {"mainwinbalancex", & skin.hints.mainwin_balance_x},
+ {"mainwinbalancey", & skin.hints.mainwin_balance_y},
+ {"mainwinclosex", & skin.hints.mainwin_close_x},
+ {"mainwinclosey", & skin.hints.mainwin_close_y},
+ {"mainwinejectx", & skin.hints.mainwin_eject_x},
+ {"mainwinejecty", & skin.hints.mainwin_eject_y},
+ {"mainwineqbuttonx", & skin.hints.mainwin_eqbutton_x},
+ {"mainwineqbuttony", & skin.hints.mainwin_eqbutton_y},
+ {"mainwinheight", & skin.hints.mainwin_height},
+ {"mainwininfobarx", & skin.hints.mainwin_infobar_x},
+ {"mainwininfobary", & skin.hints.mainwin_infobar_y},
+ {"mainwinmenurowvisible", & skin.hints.mainwin_menurow_visible},
+ {"mainwinminimizex", & skin.hints.mainwin_minimize_x},
+ {"mainwinminimizey", & skin.hints.mainwin_minimize_y},
+ {"mainwinnextx", & skin.hints.mainwin_next_x},
+ {"mainwinnexty", & skin.hints.mainwin_next_y},
+ {"mainwinnumber0x", & skin.hints.mainwin_number_0_x},
+ {"mainwinnumber0y", & skin.hints.mainwin_number_0_y},
+ {"mainwinnumber1x", & skin.hints.mainwin_number_1_x},
+ {"mainwinnumber1y", & skin.hints.mainwin_number_1_y},
+ {"mainwinnumber2x", & skin.hints.mainwin_number_2_x},
+ {"mainwinnumber2y", & skin.hints.mainwin_number_2_y},
+ {"mainwinnumber3x", & skin.hints.mainwin_number_3_x},
+ {"mainwinnumber3y", & skin.hints.mainwin_number_3_y},
+ {"mainwinnumber4x", & skin.hints.mainwin_number_4_x},
+ {"mainwinnumber4y", & skin.hints.mainwin_number_4_y},
+ {"mainwinothertextisstatus", & skin.hints.mainwin_othertext_is_status},
+ {"mainwinothertextvisible", & skin.hints.mainwin_othertext_visible},
+ {"mainwinpausex", & skin.hints.mainwin_pause_x},
+ {"mainwinpausey", & skin.hints.mainwin_pause_y},
+ {"mainwinplaystatusx", & skin.hints.mainwin_playstatus_x},
+ {"mainwinplaystatusy", & skin.hints.mainwin_playstatus_y},
+ {"mainwinplayx", & skin.hints.mainwin_play_x},
+ {"mainwinplayy", & skin.hints.mainwin_play_y},
+ {"mainwinplbuttonx", & skin.hints.mainwin_plbutton_x},
+ {"mainwinplbuttony", & skin.hints.mainwin_plbutton_y},
+ {"mainwinpositionx", & skin.hints.mainwin_position_x},
+ {"mainwinpositiony", & skin.hints.mainwin_position_y},
+ {"mainwinpreviousx", & skin.hints.mainwin_previous_x},
+ {"mainwinpreviousy", & skin.hints.mainwin_previous_y},
+ {"mainwinrepeatx", & skin.hints.mainwin_repeat_x},
+ {"mainwinrepeaty", & skin.hints.mainwin_repeat_y},
+ {"mainwinshadex", & skin.hints.mainwin_shade_x},
+ {"mainwinshadey", & skin.hints.mainwin_shade_y},
+ {"mainwinshufflex", & skin.hints.mainwin_shuffle_x},
+ {"mainwinshuffley", & skin.hints.mainwin_shuffle_y},
+ {"mainwinstopx", & skin.hints.mainwin_stop_x},
+ {"mainwinstopy", & skin.hints.mainwin_stop_y},
+ {"mainwinstreaminfovisible", & skin.hints.mainwin_streaminfo_visible},
+ {"mainwintextvisible", & skin.hints.mainwin_text_visible},
+ {"mainwintextwidth", & skin.hints.mainwin_text_width},
+ {"mainwintextx", & skin.hints.mainwin_text_x},
+ {"mainwintexty", & skin.hints.mainwin_text_y},
+ {"mainwinvisvisible", & skin.hints.mainwin_vis_visible},
+ {"mainwinvisx", & skin.hints.mainwin_vis_x},
+ {"mainwinvisy", & skin.hints.mainwin_vis_y},
+ {"mainwinvolumex", & skin.hints.mainwin_volume_x},
+ {"mainwinvolumey", & skin.hints.mainwin_volume_y},
+ {"mainwinwidth", & skin.hints.mainwin_width},
+ {"textboxbitmapfontheight", & skin.hints.textbox_bitmap_font_height},
+ {"textboxbitmapfontwidth", & skin.hints.textbox_bitmap_font_width},
+};
+
+static int hint_pair_compare (const void * key, const void * pair)
+{
+ return g_ascii_strcasecmp ((const char *) key, ((const HintPair *) pair)->name);
+}
+
+class HintsParser : public IniParser
+{
+private:
+ bool valid_heading = false;
+
+ void handle_heading (const char * heading)
+ { valid_heading = ! g_ascii_strcasecmp (heading, "skin"); }
+
+ void handle_entry (const char * key, const char * value)
+ {
+ if (! valid_heading)
+ return;
+
+ HintPair * pair = (HintPair *) bsearch (key, hint_pairs,
+ aud::n_elems (hint_pairs), sizeof (HintPair), hint_pair_compare);
+
+ if (pair)
+ * pair->value_ptr = atoi (value);
+ }
+};
+
+void skin_load_hints (const char * path)
+{
+ VFSFile file = open_local_file_nocase (path, "skin.hints");
+ if (file)
+ HintsParser ().parse (file);
+}
+
+/*
+ * pledit.txt parsing
+ */
+
+class PLColorsParser : public IniParser
+{
+public:
+ PLColorsParser () :
+ valid_heading (false) {}
+
+private:
+ bool valid_heading;
+
+ void handle_heading (const char * heading)
+ { valid_heading = ! g_ascii_strcasecmp (heading, "text"); }
+
+ void handle_entry (const char * key, const char * value)
+ {
+ if (! valid_heading)
+ return;
+
+ if (value0 == '#')
+ value ++;
+
+ uint32_t color = strtol (value, nullptr, 16);
+
+ if (! g_ascii_strcasecmp (key, "normal"))
+ skin.colorsSKIN_PLEDIT_NORMAL = color;
+ else if (! g_ascii_strcasecmp (key, "current"))
+ skin.colorsSKIN_PLEDIT_CURRENT = color;
+ else if (! g_ascii_strcasecmp (key, "normalbg"))
+ skin.colorsSKIN_PLEDIT_NORMALBG = color;
+ else if (! g_ascii_strcasecmp (key, "selectedbg"))
+ skin.colorsSKIN_PLEDIT_SELECTEDBG = color;
+ }
+};
+
+void skin_load_pl_colors (const char * path)
+{
+ skin.colorsSKIN_PLEDIT_NORMAL = 0x2499ff;
+ skin.colorsSKIN_PLEDIT_CURRENT = 0xffeeff;
+ skin.colorsSKIN_PLEDIT_NORMALBG = 0x0a120a;
+ skin.colorsSKIN_PLEDIT_SELECTEDBG = 0x0a124a;
+
+ VFSFile file = open_local_file_nocase (path, "pledit.txt");
+ if (file)
+ PLColorsParser ().parse (file);
+}
+
+/*
+ * region.txt parsing
+ */
+
+class MaskParser : public IniParser
+{
+public:
+ Index<int> numpointsSKIN_MASK_COUNT;
+ Index<int> pointlistSKIN_MASK_COUNT;
+
+private:
+ SkinMaskId current_id = SkinMaskId (-1);
+
+ void handle_heading (const char * heading)
+ {
+ if (! g_ascii_strcasecmp (heading, "normal"))
+ current_id = SKIN_MASK_MAIN;
+ else if (! g_ascii_strcasecmp (heading, "windowshade"))
+ current_id = SKIN_MASK_MAIN_SHADE;
+ else if (! g_ascii_strcasecmp (heading, "equalizer"))
+ current_id = SKIN_MASK_EQ;
+ else if (! g_ascii_strcasecmp (heading, "equalizerws"))
+ current_id = SKIN_MASK_EQ_SHADE;
+ else
+ current_id = (SkinMaskId) -1;
+ }
+
+ void handle_entry (const char * key, const char * value)
+ {
+ if (current_id == (SkinMaskId) -1)
+ return;
+
+ if (! g_ascii_strcasecmp (key, "numpoints"))
+ numpointscurrent_id = string_to_int_array (value);
+ else if (! g_ascii_strcasecmp (key, "pointlist"))
+ pointlistcurrent_id = string_to_int_array (value);
+ }
+};
+
+static Index<QRect> skin_create_mask (const Index<int> & num,
+ const Index<int> & point, int width, int height)
+{
+ Index<QRect> mask;
+
+ int j = 0;
+ for (int i = 0; i < num.len (); i ++)
+ {
+ int n_points = numi;
+ if (n_points <= 0 || j + 2 * n_points > point.len ())
+ break;
+
+ int xmin = width, ymin = height, xmax = 0, ymax = 0;
+
+ for (int k = 0; k < n_points; k ++)
+ {
+ int x = pointj + k * 2;
+ int y = pointj + k * 2 + 1;
+
+ xmin = aud::min (xmin, x);
+ ymin = aud::min (ymin, y);
+ xmax = aud::max (xmax, x);
+ ymax = aud::max (ymax, y);
+ }
+
+ if (xmax > xmin && ymax > ymin)
+ mask.append (xmin, ymin, xmax - xmin, ymax - ymin);
+
+ j += n_points * 2;
+ }
+
+ return mask;
+}
+
+void skin_load_masks (const char * path)
+{
+ int sizesSKIN_MASK_COUNT2 = {
+ {skin.hints.mainwin_width, skin.hints.mainwin_height},
+ {275, 16},
+ {275, 116},
+ {275, 16}
+ };
+
+ MaskParser parser;
+ VFSFile file = open_local_file_nocase (path, "region.txt");
+ if (file)
+ parser.parse (file);
+
+ for (int id = 0; id < SKIN_MASK_COUNT; id ++)
+ skin.masksid = skin_create_mask (parser.numpointsid,
+ parser.pointlistid, sizesid0, sizesid1);
+}

audacious-plugins-4.4.1.tar.bz2/src/skins-qt/skin.cc Added

@@ -0,0 +1,465 @@
+/* Audacious
+ * Copyright (C) 2005-2015 Audacious development team.
+ *
+ * BMP - Cross-platform multimedia player
+ * Copyright (C) 2003-2004 BMP development team.
+ *
+ * Based on XMMS:
+ * Copyright (C) 1998-2003 XMMS development team.
+ *
+ * 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; under version 3 of the License.
+ *
+ * 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>.
+ *
+ * The Audacious team does not consider modular code linking to
+ * Audacious or using our public API to be a derived work.
+ */
+
+#include <errno.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/stat.h>
+
+#include <glib.h>
+#include <QPainter>
+
+#include <libaudcore/audstrings.h>
+#include <libaudcore/runtime.h>
+
+#include "plugin.h"
+#include "skins_cfg.h"
+#include "skin.h"
+#include "skins_util.h"
+
+struct SkinPixmapIdMapping {
+ const char *name;
+ const char *alt_name;
+};
+
+static const SkinPixmapIdMapping skin_pixmap_id_map = {
+ {"main"},
+ {"cbuttons"},
+ {"titlebar"},
+ {"shufrep"},
+ {"text"},
+ {"volume"},
+ {"balance", "volume"},
+ {"monoster"},
+ {"playpaus"},
+ {"nums_ex", "numbers"},
+ {"posbar"},
+ {"pledit"},
+ {"eqmain"},
+ {"eq_ex"}
+};
+
+static_assert (aud::n_elems (skin_pixmap_id_map) == SKIN_PIXMAP_COUNT,
+ "update skin_pixmap_id_map!");
+
+static const uint32_t default_vis_colors24 = {
+ qRgb (9, 34, 53),
+ qRgb (10, 18, 26),
+ qRgb (0, 54, 108),
+ qRgb (0, 58, 116),
+ qRgb (0, 62, 124),
+ qRgb (0, 66, 132),
+ qRgb (0, 70, 140),
+ qRgb (0, 74, 148),
+ qRgb (0, 78, 156),
+ qRgb (0, 82, 164),
+ qRgb (0, 86, 172),
+ qRgb (0, 92, 184),
+ qRgb (0, 98, 196),
+ qRgb (0, 104, 208),
+ qRgb (0, 110, 220),
+ qRgb (0, 116, 232),
+ qRgb (0, 122, 244),
+ qRgb (0, 128, 255),
+ qRgb (0, 128, 255),
+ qRgb (0, 104, 208),
+ qRgb (0, 80, 160),
+ qRgb (0, 56, 112),
+ qRgb (0, 32, 64),
+ qRgb (200, 200, 200)
+};
+
+Skin skin;
+
+static bool skin_load_pixmap_id (SkinPixmapId id, const char * path)
+{
+ StringBuf filename = skin_pixmap_locate (path, skin_pixmap_id_mapid.name,
+ skin_pixmap_id_mapid.alt_name);
+
+ if (! filename)
+ {
+ AUDERR ("Skin does not contain a \"%s\" pixmap.\n", skin_pixmap_id_mapid.name);
+ return false;
+ }
+
+ QImage & image = skin.pixmapsid;
+ image.load ((const char *) filename);
+
+ if (! image.isNull () && image.format () != QImage::Format_RGB32)
+ image = image.convertToFormat (QImage::Format_RGB32);
+
+ if (image.isNull ())
+ {
+ AUDERR ("Error loading pixmap: %s\n", (const char *) filename);
+ return false;
+ }
+
+ return true;
+}
+
+static int color_diff (uint32_t a, uint32_t b)
+{
+ return abs (qRed (a) - qRed (b)) + abs (qGreen (a) - qGreen (b)) + abs (qBlue (a) - qBlue (b));
+}
+
+static void skin_get_textcolors (const QImage & image)
+{
+ /*
+ * Try to extract reasonable background and foreground colors
+ * from the font pixmap
+ */
+
+ /* Get a pixel from the middle of the space character */
+ skin.colorsSKIN_TEXTBG = image.pixel (152, 3);
+
+ int max_d = -1;
+ for (int y = 0; y < 6; y ++)
+ {
+ for (int x = 1; x < 150; x ++)
+ {
+ uint32_t c = image.pixel (x, y);
+ int d = color_diff (skin.colorsSKIN_TEXTBG, c);
+ if (d > max_d)
+ {
+ skin.colorsSKIN_TEXTFG = c;
+ max_d = d;
+ }
+ }
+ }
+}
+
+static void skin_get_eq_spline_colors (const QImage & image)
+{
+ if (image.height () < 313)
+ return;
+
+ for (int i = 0; i < 19; i ++)
+ skin.eq_spline_colorsi = image.pixel (115, i + 294);
+}
+
+static void skin_load_viscolor (const char * path)
+{
+ memcpy (skin.vis_colors, default_vis_colors, sizeof skin.vis_colors);
+
+ VFSFile file = open_local_file_nocase (path, "viscolor.txt");
+ if (! file)
+ return;
+
+ Index<char> buffer = file.read_all ();
+ buffer.append (0); /* null-terminated */
+
+ char * string = buffer.begin ();
+
+ for (int line = 0; string && line < 24; line ++)
+ {
+ char * next = text_parse_line (string);
+ Index<int> array = string_to_int_array (string);
+
+ if (array.len () >= 3)
+ skin.vis_colorsline = qRgb (array0, array1, array2);
+
+ string = next;
+ }
+}
+
+static void skin_numbers_generate_dash (QImage & image)
+{
+ int w = image.width ();
+ if (w < 99 || w >= 108)
+ return;
+
+ int h = image.height ();
+ QImage temp (108, h, QImage::Format_RGB32);
+
+ {
+ QPainter p (& temp);
+ p.drawImage (0, 0, image, 0, 0, 99, h);
+ p.drawImage (99, 0, image, 90, 0, 9, h);
+ p.drawImage (101, 6, image, 20, 6, 5, 1);
+ }
+
+ image = std::move (temp);
+}
+
+static bool skin_load_pixmaps (const char * path)
+{
+ AUDDBG ("Loading pixmaps in %s\n", path);
+
+ /* eq_ex.bmp was added after Winamp 2.0 so some skins do not include it */
+ for (int i = 0; i < SKIN_PIXMAP_COUNT; i ++)
+ if (! skin_load_pixmap_id ((SkinPixmapId) i, path) && i != SKIN_EQ_EX)
+ return false;
+
+ skin_get_textcolors (skin.pixmapsSKIN_TEXT);
+ skin_get_eq_spline_colors (skin.pixmapsSKIN_EQMAIN);
+ skin_numbers_generate_dash (skin.pixmapsSKIN_NUMBERS);
+
+ return true;
+}
+
+static bool skin_load_data (const char * path)
+{
+ AUDDBG ("Attempt to load skin \"%s\"\n", path);
+
+ if (! g_file_test (path, G_FILE_TEST_EXISTS))
+ return false;
+
+ StringBuf archive_path;
+ if (file_is_archive (path))
+ {
+ AUDDBG ("Attempt to load archive\n");
+ archive_path = archive_decompress (path);
+
+ if (! archive_path)
+ {
+ AUDDBG ("Unable to extract skin archive (%s)\n", path);
+ return false;
+ }
+
+ path = archive_path;
+ }
+
+ bool success = skin_load_pixmaps (path);
+
+ if (success)
+ {
+ skin_load_hints (path);
+ skin_load_pl_colors (path);
+ skin_load_viscolor (path);
+ skin_load_masks (path);
+ }
+ else
+ AUDDBG ("Skin loading failed\n");
+
+ if (archive_path)
+ del_directory (archive_path);
+
+ return success;
+}
+
+bool skin_load (const char * path)
+{
+ /* save current skin data */
+ Skin old_skin (std::move (skin));
+
+ /* reset to defaults */
+ skin = Skin ();
+
+ if (skin_load_data (path))
+ {
+ aud_set_str ("skins", "skin", path);
+ return true;
+ }
+
+ AUDWARN ("Unable to load skin (%s).\n", (const char *) path);
+
+ /* restore old skin data */
+ skin = std::move (old_skin);
+ return false;
+}
+
+void skin_install_skin (const char * path)
+{
+ GError * err = nullptr;
+ char * data;
+ size_t len;
+
+ if (! g_file_get_contents (path, & data, & len, & err))
+ {
+ AUDERR ("Failed to read %s: %s\n", path, err->message);
+ g_error_free (err);
+ return;
+ }
+
+ const char * user_skin_dir = skins_get_user_skin_dir ();
+ make_directory (user_skin_dir);
+
+ StringBuf base = filename_get_base (path);
+ StringBuf target = filename_build ({user_skin_dir, base});
+
+ if (g_file_set_contents (target, data, len, & err))
+ aud_set_str ("skins", "skin", target);
+ else
+ {
+ AUDERR ("Failed to write %s: %s\n", path, err->message);
+ g_error_free (err);
+ }
+
+ g_free (data);
+}
+
+void skin_draw_pixbuf (QPainter & p, SkinPixmapId id, int xsrc, int ysrc, int
+ xdest, int ydest, int width, int height)
+{
+ if (! skin.pixmapsid.isNull ())
+ p.drawImage (xdest, ydest, skin.pixmapsid, xsrc, ysrc, width, height);
+}
+
+static void skin_draw_playlistwin_frame_top (QPainter & cr, int width, bool focus)
+{
+ /* The title bar skin consists of 2 sets of 4 images, 1 set
+ * for focused state and the other for unfocused.
+ * The 4 images are:
+ *
+ * a. right corner (25,20)
+ * b. left corner (25,20)
+ * c. tiler (25,20)
+ * d. title (100,20)
+ *
+ * min allowed width = 100+25+25 = 150
+ */
+
+ /* get y offset of the pixmap set to use */
+ int y = focus ? 0 : 21;
+
+ /* left corner */
+ skin_draw_pixbuf (cr, SKIN_PLEDIT, 0, y, 0, 0, 25, 20);
+
+ /* titlebar title */
+ skin_draw_pixbuf (cr, SKIN_PLEDIT, 26, y, (width - 100) / 2, 0, 100, 20);
+
+ /* titlebar right corner */
+ skin_draw_pixbuf (cr, SKIN_PLEDIT, 153, y, width - 25, 0, 25, 20);
+
+ /* tile draw the remaining frame */
+
+ /* compute tile count */
+ int c = (width - (100 + 25 + 25)) / 25;
+
+ for (int i = 0; i < c / 2; i ++)
+ {
+ /* left of title */
+ skin_draw_pixbuf (cr, SKIN_PLEDIT, 127, y, 25 + i * 25, 0, 25, 20);
+
+ /* right of title */
+ skin_draw_pixbuf (cr, SKIN_PLEDIT, 127, y, (width + 100) / 2 + i * 25, 0, 25, 20);
+ }
+
+ if (c & 1)
+ {
+ /* Odd tile count, so one remaining to draw. Here we split
+ * it into two and draw half on either side of the title */
+ skin_draw_pixbuf (cr, SKIN_PLEDIT, 127, y, ((c / 2) * 25) + 25, 0, 12, 20);
+ skin_draw_pixbuf (cr, SKIN_PLEDIT, 127, y, (width / 2) + ((c / 2) * 25) + 50, 0, 13, 20);
+ }
+}
+
+static void skin_draw_playlistwin_frame_bottom (QPainter & cr, int width, int height)
+{
+ /* The bottom frame skin consists of 1 set of 4 images.
+ * The 4 images are:
+ *
+ * a. left corner with menu buttons (125,38)
+ * b. visualization window (75,38)
+ * c. right corner with play buttons (150,38)
+ * d. frame tile (25,38)
+ *
+ * (min allowed width = 125+150+25=300
+ */
+
+ /* bottom left corner (menu buttons) */
+ skin_draw_pixbuf (cr, SKIN_PLEDIT, 0, 72, 0, height - 38, 125, 38);
+
+ int c = (width - 275) / 25;
+
+ /* draw visualization window, if width allows */
+ if (c >= 3)
+ {
+ c -= 3;
+ skin_draw_pixbuf (cr, SKIN_PLEDIT, 205, 0, width - (150 + 75), height - 38, 75, 38);
+ }
+
+ /* Bottom right corner (playbuttons etc) */
+ skin_draw_pixbuf (cr, SKIN_PLEDIT, 126, 72, width - 150, height - 38, 150, 38);
+
+ /* Tile draw the remaining undrawn portions */
+ for (int i = 0; i < c; i ++)
+ skin_draw_pixbuf (cr, SKIN_PLEDIT, 179, 0, 125 + i * 25, height - 38, 25, 38);
+}
+
+static void skin_draw_playlistwin_frame_sides (QPainter & cr, int width, int height)
+{
+ /* The side frames consist of 2 tile images. 1 for the left, 1 for
+ * the right.
+ * a. left (12,29)
+ * b. right (19,29)
+ */
+
+ /* frame sides */
+ for (int i = 0; i < (height - (20 + 38)) / 29; i ++)
+ {
+ /* left */
+ skin_draw_pixbuf (cr, SKIN_PLEDIT, 0, 42, 0, 20 + i * 29, 12, 29);
+
+ /* right */
+ skin_draw_pixbuf (cr, SKIN_PLEDIT, 32, 42, width - 19, 20 + i * 29, 19, 29);
+ }
+}
+
+void skin_draw_playlistwin_frame (QPainter & cr, int width, int height, bool focus)
+{
+ skin_draw_playlistwin_frame_top (cr, width, focus);
+ skin_draw_playlistwin_frame_bottom (cr, width, height);
+ skin_draw_playlistwin_frame_sides (cr, width, height);
+}
+
+void skin_draw_playlistwin_shaded (QPainter & cr, int width, bool focus)
+{
+ /* The shade mode titlebar skin consists of 4 images:
+ * a) left corner offset (72,42) size (25,14)
+ * b) right corner, focused offset (99,57) size (50,14)
+ * c) right corner, unfocused offset (99,42) size (50,14)
+ * d) bar tile offset (72,57) size (25,14)
+ */
+
+ /* left corner */
+ skin_draw_pixbuf (cr, SKIN_PLEDIT, 72, 42, 0, 0, 25, 14);
+
+ /* bar tile */
+ for (int i = 0; i < (width - 75) / 25; i ++)
+ skin_draw_pixbuf (cr, SKIN_PLEDIT, 72, 57, (i * 25) + 25, 0, 25, 14);
+
+ /* right corner */
+ skin_draw_pixbuf (cr, SKIN_PLEDIT, 99, focus ? 42 : 57, width - 50, 0, 50, 14);
+}
+
+void skin_draw_mainwin_titlebar (QPainter & cr, bool shaded, bool focus)
+{
+ /* The titlebar skin consists of 2 sets of 2 images, one for for
+ * shaded and the other for unshaded mode, giving a total of 4.
+ * The images are exactly 275x14 pixels, aligned and arranged
+ * vertically on each other in the pixmap in the following order:
+ *
+ * a) unshaded, focused offset (27, 0)
+ * b) unshaded, unfocused offset (27, 15)
+ * c) shaded, focused offset (27, 29)
+ * d) shaded, unfocused offset (27, 42)
+ */
+
+ int y_offset = shaded ? (focus ? 29 : 42) : (focus ? 0 : 15);
+
+ skin_draw_pixbuf (cr, SKIN_TITLEBAR, 27, y_offset, 0, 0,
+ skin.hints.mainwin_width, 14);
+}

audacious-plugins-4.4.1.tar.bz2/src/skins-qt/skin.h Added

@@ -0,0 +1,196 @@
+/* Audacious
+ * Copyright (C) 2005-2011 Audacious development team.
+ *
+ * BMP - Cross-platform multimedia player
+ * Copyright (C) 2003-2004 BMP development team.
+ *
+ * Based on XMMS:
+ * Copyright (C) 1998-2003 XMMS development team.
+ *
+ * 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; under version 3 of the License.
+ *
+ * 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>.
+ *
+ * The Audacious team does not consider modular code linking to
+ * Audacious or using our public API to be a derived work.
+ */
+
+#ifndef SKIN_H
+#define SKIN_H
+
+#include <stdint.h>
+#include <QImage>
+
+#include <libaudcore/index.h>
+#include <libaudcore/objects.h>
+
+typedef enum {
+ SKIN_MAIN = 0,
+ SKIN_CBUTTONS,
+ SKIN_TITLEBAR,
+ SKIN_SHUFREP,
+ SKIN_TEXT,
+ SKIN_VOLUME,
+ SKIN_BALANCE,
+ SKIN_MONOSTEREO,
+ SKIN_PLAYPAUSE,
+ SKIN_NUMBERS,
+ SKIN_POSBAR,
+ SKIN_PLEDIT,
+ SKIN_EQMAIN,
+ SKIN_EQ_EX,
+ SKIN_PIXMAP_COUNT
+} SkinPixmapId;
+
+typedef enum {
+ SKIN_MASK_MAIN = 0,
+ SKIN_MASK_MAIN_SHADE,
+ SKIN_MASK_EQ,
+ SKIN_MASK_EQ_SHADE,
+ SKIN_MASK_COUNT
+} SkinMaskId;
+
+typedef enum {
+ SKIN_PLEDIT_NORMAL = 0,
+ SKIN_PLEDIT_CURRENT,
+ SKIN_PLEDIT_NORMALBG,
+ SKIN_PLEDIT_SELECTEDBG,
+ SKIN_TEXTBG,
+ SKIN_TEXTFG,
+ SKIN_COLOR_COUNT
+} SkinColorId;
+
+struct SkinHints {
+ /* Vis properties */
+ int mainwin_vis_x = 24;
+ int mainwin_vis_y = 43;
+ int mainwin_vis_visible = true;
+
+ /* Text properties */
+ int mainwin_text_x = 112;
+ int mainwin_text_y = 27;
+ int mainwin_text_width = 153;
+ int mainwin_text_visible = true;
+
+ /* Infobar properties */
+ int mainwin_infobar_x = 112;
+ int mainwin_infobar_y = 43;
+ int mainwin_othertext_visible = false;
+
+ int mainwin_number_0_x = 36;
+ int mainwin_number_0_y = 26;
+
+ int mainwin_number_1_x = 48;
+ int mainwin_number_1_y = 26;
+
+ int mainwin_number_2_x = 60;
+ int mainwin_number_2_y = 26;
+
+ int mainwin_number_3_x = 78;
+ int mainwin_number_3_y = 26;
+
+ int mainwin_number_4_x = 90;
+ int mainwin_number_4_y = 26;
+
+ int mainwin_playstatus_x = 24;
+ int mainwin_playstatus_y = 28;
+
+ int mainwin_volume_x = 107;
+ int mainwin_volume_y = 57;
+
+ int mainwin_balance_x = 177;
+ int mainwin_balance_y = 57;
+
+ int mainwin_position_x = 16;
+ int mainwin_position_y = 72;
+
+ int mainwin_previous_x = 16;
+ int mainwin_previous_y = 88;
+
+ int mainwin_play_x = 39;
+ int mainwin_play_y = 88;
+
+ int mainwin_pause_x = 62;
+ int mainwin_pause_y = 88;
+
+ int mainwin_stop_x = 85;
+ int mainwin_stop_y = 88;
+
+ int mainwin_next_x = 108;
+ int mainwin_next_y = 88;
+
+ int mainwin_eject_x = 136;
+ int mainwin_eject_y = 89;
+
+ int mainwin_eqbutton_x = 219;
+ int mainwin_eqbutton_y = 58;
+
+ int mainwin_plbutton_x = 242;
+ int mainwin_plbutton_y = 58;
+
+ int mainwin_shuffle_x = 164;
+ int mainwin_shuffle_y = 89;
+
+ int mainwin_repeat_x = 210;
+ int mainwin_repeat_y = 89;
+
+ int mainwin_about_x = 247;
+ int mainwin_about_y = 83;
+
+ int mainwin_minimize_x = 244;
+ int mainwin_minimize_y = 3;
+
+ int mainwin_shade_x = 254;
+ int mainwin_shade_y = 3;
+
+ int mainwin_close_x = 264;
+ int mainwin_close_y = 3;
+
+ int mainwin_width = 275;
+ int mainwin_height = 116;
+
+ int mainwin_menurow_visible = true;
+ int mainwin_streaminfo_visible = true;
+ int mainwin_othertext_is_status = false;
+
+ int textbox_bitmap_font_width = 5;
+ int textbox_bitmap_font_height = 6;
+};
+
+struct Skin {
+ SkinHints hints;
+ uint32_t colorsSKIN_COLOR_COUNT {};
+ uint32_t eq_spline_colors19 {};
+ uint32_t vis_colors24 {};
+
+ QImage pixmapsSKIN_PIXMAP_COUNT;
+ Index<QRect> masksSKIN_MASK_COUNT;
+};
+
+extern Skin skin;
+
+bool skin_load (const char * path);
+
+void skin_draw_pixbuf (QPainter & p, SkinPixmapId id, int xsrc, int ysrc,
+ int xdest, int ydest, int width, int height);
+
+void skin_install_skin (const char * path);
+
+void skin_draw_playlistwin_shaded (QPainter & cr, int width, bool focus);
+void skin_draw_playlistwin_frame (QPainter & cr, int width, int height, bool focus);
+void skin_draw_mainwin_titlebar (QPainter & cr, bool shaded, bool focus);
+
+/* ui_skin_load_ini.c */
+void skin_load_hints (const char * path);
+void skin_load_pl_colors (const char * path);
+void skin_load_masks (const char * path);
+
+#endif

audacious-plugins-4.4.1.tar.bz2/src/skins-qt/skins_cfg.cc Added

@@ -0,0 +1,343 @@
+/*
+ * Audacious - a cross-platform multimedia player
+ * Copyright (c) 2008 Tomasz Moń
+ * Copyright (c) 2011 John Lindgren
+ *
+ * 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; under version 3 of the License.
+ *
+ * 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>.
+ *
+ * The Audacious team does not consider modular code linking to
+ * Audacious or using our public API to be a derived work.
+ */
+
+#include <string.h>
+
+#include <libaudcore/i18n.h>
+#include <libaudcore/runtime.h>
+#include <libaudcore/preferences.h>
+#include <libaudcore/audstrings.h>
+
+#include "dnd.h"
+#include "skins_cfg.h"
+#include "main.h"
+#include "vis-callbacks.h"
+#include "playlistwin.h"
+#include "skin.h"
+#include "playlist-widget.h"
+#include "textbox.h"
+#include "skinselector.h"
+#include "vis.h"
+#include "skins_util.h"
+#include "view.h"
+
+static const char * const skins_defaults = {
+ /* general */
+ "autoscroll_songname", "TRUE",
+ "mainwin_font", "Sans Bold 9",
+ "mainwin_use_bitmapfont", "TRUE",
+ "playlist_font", "Sans Bold 8",
+ "show_remaining_time", "FALSE",
+ "twoway_scroll", "FALSE",
+
+ /* visualizer */
+ "analyzer_falloff", aud::numeric_string<FALLOFF_FAST>::str,
+ "analyzer_mode", aud::numeric_string<ANALYZER_NORMAL>::str,
+ "analyzer_peaks", "TRUE",
+ "analyzer_type", aud::numeric_string<ANALYZER_BARS>::str,
+ "peaks_falloff", aud::numeric_string<FALLOFF_SLOW>::str,
+ "scope_mode", aud::numeric_string<SCOPE_DOT>::str,
+ "vis_type", aud::numeric_string<VIS_ANALYZER>::str,
+ "voiceprint_mode", aud::numeric_string<VOICEPRINT_NORMAL>::str,
+ "vu_mode", aud::numeric_string<VU_SMOOTH>::str,
+
+ /* windows */
+ "active_titlebar_any", "TRUE",
+ "always_on_top", "FALSE",
+ "double_size", "FALSE",
+ "equalizer_shaded", "FALSE",
+ "equalizer_visible", "FALSE",
+ "equalizer_x", "20",
+ "equalizer_y", "136",
+ "player_shaded", "FALSE",
+ "player_x", "20",
+ "player_y", "20",
+ "playlist_shaded", "FALSE",
+ "playlist_visible", "FALSE",
+ "playlist_x", "295",
+ "playlist_y", "20",
+ "playlist_width", "275",
+ "playlist_height", "232",
+ "sticky", "FALSE",
+
+ nullptr
+};
+
+skins_cfg_t config;
+
+static const struct skins_cfg_boolent_t {
+ const char * name;
+ bool * ptr;
+} skins_boolents =
+{
+ /* general */
+ {"autoscroll_songname", & config.autoscroll},
+ {"mainwin_use_bitmapfont", & config.mainwin_use_bitmapfont},
+ {"active_titlebar_any", & config.active_titlebar_any},
+ {"twoway_scroll", & config.twoway_scroll},
+
+ /* visualizer */
+ {"analyzer_peaks", & config.analyzer_peaks}
+};
+
+static const struct {
+ const char * name;
+ int * ptr;
+} skins_numents =
+{
+ /* visualizer */
+ {"analyzer_falloff", & config.analyzer_falloff},
+ {"analyzer_mode", & config.analyzer_mode},
+ {"analyzer_type", & config.analyzer_type},
+ {"peaks_falloff", & config.peaks_falloff},
+ {"scope_mode", & config.scope_mode},
+ {"vis_type", & config.vis_type},
+ {"voiceprint_mode", & config.voiceprint_mode},
+ {"vu_mode", & config.vu_mode},
+
+ /* windows */
+ {"equalizer_x", & config.equalizer_x},
+ {"equalizer_y", & config.equalizer_y},
+ {"player_x", & config.player_x},
+ {"player_y", & config.player_y},
+ {"playlist_x", & config.playlist_x},
+ {"playlist_y", & config.playlist_y},
+ {"playlist_width", & config.playlist_width},
+ {"playlist_height", & config.playlist_height}
+};
+
+static String selected_skin;
+static Index<ComboItem> skin_combo;
+
+void skins_cfg_load ()
+{
+ aud_config_set_defaults ("skins", skins_defaults);
+
+ for (auto & boolent : skins_boolents)
+ * boolent.ptr = aud_get_bool ("skins", boolent.name);
+
+ for (auto & nument : skins_numents)
+ * nument.ptr = aud_get_int ("skins", nument.name);
+}
+
+void skins_cfg_save ()
+{
+ for (auto & boolent : skins_boolents)
+ aud_set_bool ("skins", boolent.name, * boolent.ptr);
+
+ for (auto & nument : skins_numents)
+ aud_set_int ("skins", nument.name, * nument.ptr);
+}
+
+static ArrayRef<ComboItem> skin_combo_fill ()
+{
+ selected_skin = aud_get_str ("skins", "skin");
+
+ skin_combo.clear ();
+ skinlist_update ();
+
+ for (auto & node : skinlist)
+ skin_combo.append (node.name, node.path);
+
+ return {skin_combo.begin (), skin_combo.len ()};
+}
+
+static void skin_select_cb ()
+{
+ if (skin_load (selected_skin))
+ view_apply_skin ();
+}
+
+static void mainwin_font_set_cb ()
+{
+ if (! config.mainwin_use_bitmapfont)
+ mainwin_info->set_font (aud_get_str ("skins", "mainwin_font"));
+ else
+ mainwin_info->set_font (nullptr);
+}
+
+static void playlist_font_set_cb ()
+{
+ playlistwin_list->set_font (aud_get_str ("skins", "playlist_font"));
+}
+
+static void autoscroll_set_cb ()
+{
+ if (! aud_get_bool ("skins", "mainwin_shaded"))
+ mainwin_info->set_scroll (config.autoscroll);
+ if (aud_get_bool ("skins", "playlist_shaded"))
+ playlistwin_sinfo->set_scroll (config.autoscroll);
+}
+
+static void vis_reset_cb ()
+{
+ mainwin_vis->clear ();
+ mainwin_svis->clear ();
+ start_stop_visual (false);
+}
+
+static const PreferencesWidget font_table_elements = {
+ WidgetFonts (N_("Player:"),
+ WidgetString ("skins", "mainwin_font", mainwin_font_set_cb),
+ {N_("Select main player window font:")}),
+ WidgetFonts (N_("Playlist:"),
+ WidgetString ("skins", "playlist_font", playlist_font_set_cb),
+ {N_("Select playlist font:")})
+};
+
+static const PreferencesWidget skins_widgets_general = {
+ WidgetLabel (N_("Skin")),
+ WidgetCombo (nullptr,
+ WidgetString (selected_skin, skin_select_cb),
+ {nullptr, skin_combo_fill}),
+ WidgetCheck (N_("Display active titlebar when any window is focused"),
+ WidgetBool (config.active_titlebar_any, nullptr)),
+ WidgetLabel (N_("Fonts")),
+ WidgetTable ({{font_table_elements}}),
+ WidgetCheck (N_("Use bitmap fonts (supports ASCII only)"),
+ WidgetBool (config.mainwin_use_bitmapfont, mainwin_font_set_cb)),
+ WidgetCheck (N_("Scroll song title"),
+ WidgetBool (config.autoscroll, autoscroll_set_cb)),
+ WidgetCheck (N_("Scroll song title in both directions"),
+ WidgetBool (config.twoway_scroll, autoscroll_set_cb))
+};
+
+static ComboItem vis_mode_elements = {
+ ComboItem (N_("Analyzer"), VIS_ANALYZER),
+ ComboItem (N_("Scope"), VIS_SCOPE),
+ ComboItem (N_("Voiceprint / VU meter"), VIS_VOICEPRINT),
+ ComboItem (N_("Off"), VIS_OFF)
+};
+
+static ComboItem analyzer_mode_elements = {
+ ComboItem (N_("Normal"), ANALYZER_NORMAL),
+ ComboItem (N_("Fire"), ANALYZER_FIRE),
+ ComboItem (N_("Vertical lines"), ANALYZER_VLINES)
+};
+
+static ComboItem analyzer_type_elements = {
+ ComboItem (N_("Lines"), ANALYZER_LINES),
+ ComboItem (N_("Bars"), ANALYZER_BARS)
+};
+
+static ComboItem falloff_elements = {
+ ComboItem (N_("Slowest"), FALLOFF_SLOWEST),
+ ComboItem (N_("Slow"), FALLOFF_SLOW),
+ ComboItem (N_("Medium"), FALLOFF_MEDIUM),
+ ComboItem (N_("Fast"), FALLOFF_FAST),
+ ComboItem (N_("Fastest"), FALLOFF_FASTEST)
+};
+
+static ComboItem scope_mode_elements = {
+ ComboItem (N_("Dots"), SCOPE_DOT),
+ ComboItem (N_("Line"), SCOPE_LINE),
+ ComboItem (N_("Solid"), SCOPE_SOLID)
+};
+
+static ComboItem voiceprint_mode_elements = {
+ ComboItem (N_("Normal"), VOICEPRINT_NORMAL),
+ ComboItem (N_("Fire"), VOICEPRINT_FIRE),
+ ComboItem (N_("Ice"), VOICEPRINT_ICE)
+};
+
+static ComboItem vu_mode_elements = {
+ ComboItem (N_("Normal"), VU_NORMAL),
+ ComboItem (N_("Smooth"), VU_SMOOTH)
+};
+
+static const PreferencesWidget analyzer_table = {
+ WidgetCombo (N_("Coloring:"),
+ WidgetInt (config.analyzer_mode, vis_reset_cb),
+ {{analyzer_mode_elements}}),
+ WidgetCombo (N_("Style:"),
+ WidgetInt (config.analyzer_type, vis_reset_cb),
+ {{analyzer_type_elements}}),
+ WidgetCombo (N_("Falloff:"),
+ WidgetInt (config.analyzer_falloff, vis_reset_cb),
+ {{falloff_elements}}),
+ WidgetCombo (N_("Peak falloff:"),
+ WidgetInt (config.peaks_falloff, vis_reset_cb),
+ {{falloff_elements}})
+};
+
+static const PreferencesWidget misc_table = {
+ WidgetCombo (N_("Scope Style:"),
+ WidgetInt (config.scope_mode, vis_reset_cb),
+ {{scope_mode_elements}}),
+ WidgetCombo (N_("Voiceprint Coloring:"),
+ WidgetInt (config.voiceprint_mode, vis_reset_cb),
+ {{voiceprint_mode_elements}}),
+ WidgetCombo (N_("VU Meter Style:"),
+ WidgetInt (config.vu_mode, vis_reset_cb),
+ {{vu_mode_elements}})
+};
+
+static const PreferencesWidget skins_widgets_vis = {
+ WidgetLabel (N_("Type")),
+ WidgetCombo (N_("Visualization type:"),
+ WidgetInt (config.vis_type, vis_reset_cb),
+ {{vis_mode_elements}}),
+ WidgetLabel (N_("Analyzer")),
+ WidgetCheck (N_("Show peaks"),
+ WidgetBool (config.analyzer_peaks, vis_reset_cb)),
+ WidgetTable ({{analyzer_table}}),
+ WidgetLabel (N_("Miscellaneous")),
+ WidgetTable ({{misc_table}})
+};
+
+static const NotebookTab skins_notebook_tabs = {
+ {N_("General"), {skins_widgets_general}},
+ {N_("Visualization"), {skins_widgets_vis}}
+};
+
+static const PreferencesWidget skins_widgets = {
+ WidgetNotebook ({{skins_notebook_tabs}})
+};
+
+const PluginPreferences skins_prefs = {{skins_widgets}};
+
+#if 0
+void on_skin_view_drag_data_received (GtkWidget * widget, GdkDragContext * context,
+ int x, int y, GtkSelectionData * selection_data, unsigned info, unsigned time, void *)
+{
+ const char * data = (const char *) gtk_selection_data_get_data (selection_data);
+ g_return_if_fail (data);
+
+ const char * end = strchr (data, '\r');
+ if (! end)
+ end = strchr (data, '\n');
+ if (! end)
+ end = data + strlen (data);
+
+ StringBuf path = uri_to_filename (str_copy (data, end - data));
+ if (path && file_is_archive (path))
+ {
+ if (! skin_load (path))
+ return;
+
+ view_apply_skin ();
+ skin_install_skin (path);
+
+ if (skin_view)
+ skin_view_update ((GtkTreeView *) skin_view);
+ }
+}
+#endif

audacious-plugins-4.4.1.tar.bz2/src/skins-qt/skins_cfg.h Added

@@ -0,0 +1,58 @@
+/*
+ * Audacious - a cross-platform multimedia player
+ * Copyright (c) 2008 Tomasz Moń
+ *
+ * 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; under version 3 of the License.
+ *
+ * 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>.
+ *
+ * The Audacious team does not consider modular code linking to
+ * Audacious or using our public API to be a derived work.
+ */
+
+#ifndef SKINS_CFG_H
+#define SKINS_CFG_H
+
+struct PluginPreferences;
+
+typedef struct {
+ int player_x, player_y;
+ int equalizer_x, equalizer_y;
+ int playlist_x, playlist_y;
+ int playlist_width, playlist_height;
+ int scale;
+ bool autoscroll;
+ bool analyzer_peaks;
+ bool twoway_scroll;
+ int vis_type;
+ int analyzer_mode, analyzer_type;
+ int scope_mode;
+ int voiceprint_mode;
+ int vu_mode;
+ int analyzer_falloff, peaks_falloff;
+ bool mainwin_use_bitmapfont;
+ bool active_titlebar_any;
+} skins_cfg_t;
+
+extern skins_cfg_t config;
+
+void skins_cfg_load ();
+void skins_cfg_save ();
+
+#if 0
+void on_skin_view_drag_data_received (GtkWidget * widget,
+ GdkDragContext * context, int x, int y, GtkSelectionData * selection_data,
+ unsigned info, unsigned time, void * data);
+#endif
+
+extern const PluginPreferences skins_prefs;
+
+#endif

audacious-plugins-4.4.1.tar.bz2/src/skins-qt/skins_util.cc Added

@@ -0,0 +1,347 @@
+/* Audacious - Cross-platform multimedia player
+ * Copyright (C) 2005-2009 Audacious development team
+ *
+ * Based on BMP:
+ * Copyright (C) 2003-2004 BMP development team.
+ *
+ * Based on XMMS:
+ * Copyright (C) 1998-2003 XMMS development team.
+ *
+ * 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; under version 3 of the License.
+ *
+ * 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>.
+ *
+ * The Audacious team does not consider modular code linking to
+ * Audacious or using our public API to be a derived work.
+ */
+
+#include <errno.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/stat.h>
+#include <unistd.h>
+
+#include <glib/gstdio.h>
+
+#include <libaudcore/audstrings.h>
+#include <libaudcore/i18n.h>
+#include <libaudcore/hook.h>
+#include <libaudcore/multihash.h>
+#include <libaudcore/runtime.h>
+#include <libaudcore/vfs.h>
+
+#include "skins_util.h"
+
+#ifdef S_IRGRP
+#define DIRMODE (S_IRWXU | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH)
+#else
+#define DIRMODE (S_IRWXU)
+#endif
+
+StringBuf find_file_case_path (const char * folder, const char * basename)
+{
+ static SimpleHash<String, Index<String>> cache;
+
+ String key (folder);
+ Index<String> * list = cache.lookup (key);
+
+ if (! list)
+ {
+ GDir * handle = g_dir_open (folder, 0, nullptr);
+ if (! handle)
+ return StringBuf ();
+
+ list = cache.add (key, Index<String> ());
+
+ const char * name;
+ while ((name = g_dir_read_name (handle)))
+ list->append (name);
+
+ g_dir_close (handle);
+ }
+
+ for (const String & entry : * list)
+ {
+ if (! strcmp_nocase (entry, basename))
+ return filename_build ({folder, entry});
+ }
+
+ return StringBuf ();
+}
+
+VFSFile open_local_file_nocase (const char * folder, const char * basename)
+{
+ StringBuf path = find_file_case_path (folder, basename);
+ return path ? VFSFile (path, "r") : VFSFile ();
+}
+
+StringBuf skin_pixmap_locate (const char * folder, const char * basename, const char * altname)
+{
+ static const char * const exts = {".bmp", ".png", ".xpm"};
+
+ for (const char * ext : exts)
+ {
+ StringBuf name = find_file_case_path (folder, str_concat ({basename, ext}));
+ if (name)
+ return name.settle ();
+ }
+
+ return altname ? skin_pixmap_locate (folder, altname) : StringBuf ();
+}
+
+char * text_parse_line (char * text)
+{
+ char * newline = strchr (text, '\n');
+
+ if (newline == nullptr)
+ return nullptr;
+
+ * newline = 0;
+ return newline + 1;
+}
+
+enum ArchiveType {
+ ARCHIVE_UNKNOWN = 0,
+ ARCHIVE_TAR,
+ ARCHIVE_TGZ,
+ ARCHIVE_ZIP,
+ ARCHIVE_TBZ2
+};
+
+typedef StringBuf (* ArchiveExtractFunc) (const char *, const char *);
+
+struct ArchiveExtensionType {
+ ArchiveType type;
+ const char *ext;
+};
+
+static ArchiveExtensionType archive_extensions = {
+ {ARCHIVE_TAR, ".tar"},
+ {ARCHIVE_ZIP, ".wsz"},
+ {ARCHIVE_ZIP, ".zip"},
+ {ARCHIVE_TGZ, ".tar.gz"},
+ {ARCHIVE_TGZ, ".tgz"},
+ {ARCHIVE_TBZ2, ".tar.bz2"},
+ {ARCHIVE_TBZ2, ".bz2"}
+};
+
+static StringBuf archive_extract_tar (const char * archive, const char * dest);
+static StringBuf archive_extract_zip (const char * archive, const char * dest);
+static StringBuf archive_extract_tgz (const char * archive, const char * dest);
+static StringBuf archive_extract_tbz2 (const char * archive, const char * dest);
+
+static ArchiveExtractFunc archive_extract_funcs = {
+ nullptr,
+ archive_extract_tar,
+ archive_extract_tgz,
+ archive_extract_zip,
+ archive_extract_tbz2
+};
+
+/* FIXME: these functions can be generalised into a function using a
+ * command lookup table */
+
+static const char * get_tar_command ()
+{
+ static const char * command = nullptr;
+
+ if (! command)
+ {
+ if (! (command = getenv("TARCMD")))
+ command = "tar";
+ }
+
+ return command;
+}
+
+static const char * get_unzip_command ()
+{
+ static const char * command = nullptr;
+
+ if (! command)
+ {
+ if (! (command = getenv("UNZIPCMD")))
+ command = "unzip";
+ }
+
+ return command;
+}
+
+static StringBuf archive_extract_tar (const char * archive, const char * dest)
+{
+ return str_printf ("%s >/dev/null xf \"%s\" -C %s", get_tar_command (), archive, dest);
+}
+
+static StringBuf archive_extract_zip (const char * archive, const char * dest)
+{
+ return str_printf ("%s >/dev/null -o -j \"%s\" -d %s", get_unzip_command (), archive, dest);
+}
+
+static StringBuf archive_extract_tgz (const char * archive, const char * dest)
+{
+ return str_printf ("%s >/dev/null xzf \"%s\" -C %s", get_tar_command (), archive, dest);
+}
+
+static StringBuf archive_extract_tbz2 (const char * archive, const char * dest)
+{
+ return str_printf ("bzip2 -dc \"%s\" | %s >/dev/null xf - -C %s", archive,
+ get_tar_command (), dest);
+}
+
+static ArchiveType archive_get_type (const char * filename)
+{
+ for (auto & ext : archive_extensions)
+ {
+ if (str_has_suffix_nocase (filename, ext.ext))
+ return ext.type;
+ }
+
+ return ARCHIVE_UNKNOWN;
+}
+
+bool file_is_archive (const char * filename)
+{
+ return (archive_get_type (filename) != ARCHIVE_UNKNOWN);
+}
+
+StringBuf archive_basename (const char * str)
+{
+ for (auto & ext : archive_extensions)
+ {
+ if (str_has_suffix_nocase (str, ext.ext))
+ return str_copy (str, strlen (str) - strlen (ext.ext));
+ }
+
+ return StringBuf ();
+}
+
+/**
+ * Escapes characters that are special to the shell inside double quotes.
+ *
+ * @param string String to be escaped.
+ * @return Given string with special characters escaped.
+ */
+static StringBuf escape_shell_chars (const char * string)
+{
+ const char *special = "$`\"\\"; /* Characters to escape */
+
+ int num = 0;
+ for (const char * in = string; * in; in ++)
+ {
+ if (strchr (special, * in))
+ num ++;
+ }
+
+ StringBuf escaped (strlen (string) + num);
+
+ char * out = escaped;
+ for (const char * in = string; * in; in ++)
+ {
+ if (strchr (special, * in))
+ * out ++ = '\\';
+ * out ++ = * in;
+ }
+
+ return escaped;
+}
+
+/**
+ * Decompresses the archive "filename" to a temporary directory,
+ * returns the path to the temp dir, or nullptr if failed
+ */
+StringBuf archive_decompress (const char * filename)
+{
+ ArchiveType type = archive_get_type (filename);
+ if (type == ARCHIVE_UNKNOWN)
+ return StringBuf ();
+
+ StringBuf tmpdir = filename_build ({g_get_tmp_dir (), "audacious.XXXXXX"});
+ if (! g_mkdtemp (tmpdir))
+ {
+ AUDWARN ("Error creating %s: %s\n", (const char *) tmpdir, strerror (errno));
+ return StringBuf ();
+ }
+
+ StringBuf escaped_filename = escape_shell_chars (filename);
+ StringBuf cmd = archive_extract_funcstype (escaped_filename, tmpdir);
+
+ AUDDBG ("Executing \"%s\"\n", (const char *) cmd);
+ int ret = system (cmd);
+ if (ret != 0)
+ {
+ AUDDBG ("Command \"%s\" returned error %d\n", (const char *) cmd, ret);
+ return StringBuf ();
+ }
+
+ return tmpdir;
+}
+
+static void del_directory_func (const char * path, const char *)
+{
+ if (g_file_test (path, G_FILE_TEST_IS_DIR))
+ del_directory (path);
+ else
+ g_unlink (path);
+}
+
+void del_directory (const char * path)
+{
+ dir_foreach (path, del_directory_func);
+ g_rmdir (path);
+}
+
+Index<int> string_to_int_array (const char * str)
+{
+ Index<int> array;
+ int temp;
+ const char * ptr = str;
+ char * endptr;
+
+ for (;;)
+ {
+ temp = strtol (ptr, &endptr, 10);
+ if (ptr == endptr)
+ break;
+ array.append (temp);
+ ptr = endptr;
+ while (! g_ascii_isdigit ((int) * ptr) && (* ptr) != '\0')
+ ptr ++;
+ if (* ptr == '\0')
+ break;
+ }
+
+ return array;
+}
+
+bool dir_foreach (const char * path, DirForeachFunc func)
+{
+ GError * error = nullptr;
+ GDir * dir = g_dir_open (path, 0, & error);
+ if (! dir)
+ {
+ AUDWARN ("Error reading %s: %s\n", path, error->message);
+ g_error_free (error);
+ return false;
+ }
+
+ const char * entry;
+ while ((entry = g_dir_read_name (dir)))
+ func (filename_build ({path, entry}), entry);
+
+ g_dir_close (dir);
+ return true;
+}
+
+void make_directory (const char * path)
+{
+ if (g_mkdir_with_parents (path, DIRMODE) != 0)
+ AUDWARN ("Error creating %s: %s\n", path, strerror (errno));
+}

audacious-plugins-4.4.1.tar.bz2/src/skins-qt/skins_util.h Added

@@ -0,0 +1,52 @@
+/* Audacious - Cross-platform multimedia player
+ * Copyright (C) 2005-2009 Audacious development team
+ *
+ * Based on BMP:
+ * Copyright (C) 2003-2004 BMP development team
+ *
+ * Based on XMMS:
+ * Copyright (C) 1998-2003 XMMS development team
+ *
+ * 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; under version 3 of the License.
+ *
+ * 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>.
+ *
+ * The Audacious team does not consider modular code linking to
+ * Audacious or using our public API to be a derived work.
+ */
+
+#ifndef UTIL_H
+#define UTIL_H
+
+#include <libaudcore/vfs.h>
+
+typedef void (* DirForeachFunc) (const char * path, const char * basename);
+
+StringBuf find_file_case_path (const char * folder, const char * basename);
+
+VFSFile open_local_file_nocase (const char * folder, const char * basename);
+StringBuf skin_pixmap_locate (const char * folder, const char * basename,
+ const char * altname = nullptr);
+
+char * text_parse_line (char * text);
+
+void make_directory (const char * path);
+void del_directory (const char * path);
+
+bool dir_foreach (const char * path, DirForeachFunc func);
+
+Index<int> string_to_int_array (const char *str);
+
+bool file_is_archive (const char * filename);
+StringBuf archive_basename (const char * str);
+StringBuf archive_decompress (const char * path);
+
+#endif

audacious-plugins-4.4.1.tar.bz2/src/skins-qt/skinselector.cc Added

@@ -0,0 +1,125 @@
+/*
+ * ui_skinselector.c
+ * Copyright 1998-2003 XMMS Development Team
+ * Copyright 2003-2004 BMP Development Team
+ * Copyright 2011 John Lindgren
+ *
+ * This file is part of Audacious.
+ *
+ * Audacious 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, version 2 or version 3 of the License.
+ *
+ * Audacious 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
+ * Audacious. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The Audacious team does not consider modular code linking to Audacious or
+ * using our public API to be a derived work.
+ */
+
+#include <stdlib.h>
+#include <glib.h>
+
+#include <libaudcore/audstrings.h>
+#include <libaudcore/i18n.h>
+#include <libaudcore/runtime.h>
+
+#include "plugin.h"
+#include "skin.h"
+#include "skinselector.h"
+#include "skins_util.h"
+
+Index<SkinNode> skinlist;
+
+#if 0
+static AudguiPixbuf skin_get_preview (const char * path)
+{
+ AudguiPixbuf preview;
+
+ StringBuf archive_path;
+ if (file_is_archive (path))
+ {
+ archive_path = archive_decompress (path);
+ if (! archive_path)
+ return preview;
+
+ path = archive_path;
+ }
+
+ StringBuf preview_path = skin_pixmap_locate (path, "main");
+ if (preview_path)
+ preview.capture (gdk_pixbuf_new_from_file (preview_path, nullptr));
+
+ if (archive_path)
+ del_directory (archive_path);
+
+ return preview;
+}
+
+static AudguiPixbuf skin_get_thumbnail (const char * path)
+{
+ StringBuf base = filename_get_base (path);
+ base.insert (-1, ".png");
+
+ StringBuf thumbname = filename_build ({skins_get_skin_thumb_dir (), base});
+ AudguiPixbuf thumb;
+
+ if (g_file_test (thumbname, G_FILE_TEST_EXISTS))
+ thumb.capture (gdk_pixbuf_new_from_file (thumbname, nullptr));
+
+ if (! thumb)
+ {
+ thumb = skin_get_preview (path);
+
+ if (thumb)
+ {
+ make_directory (skins_get_skin_thumb_dir ());
+ gdk_pixbuf_save (thumb.get (), thumbname, "png", nullptr, nullptr);
+ }
+ }
+
+ if (thumb)
+ audgui_pixbuf_scale_within (thumb, audgui_get_dpi () * 3 / 2);
+
+ return thumb;
+}
+#endif
+
+static void scan_skindir_func (const char * path, const char * basename)
+{
+ if (g_file_test (path, G_FILE_TEST_IS_REGULAR))
+ {
+ if (file_is_archive (path))
+ skinlist.append (String (archive_basename (basename)),
+ String (_("Archived Winamp 2.x skin")), String (path));
+ }
+ else if (g_file_test (path, G_FILE_TEST_IS_DIR))
+ skinlist.append (String (basename),
+ String (_("Unarchived Winamp 2.x skin")), String (path));
+}
+
+void skinlist_update ()
+{
+ skinlist.clear ();
+
+ const char * user_skin_dir = skins_get_user_skin_dir ();
+ if (g_file_test (user_skin_dir, G_FILE_TEST_EXISTS))
+ dir_foreach (user_skin_dir, scan_skindir_func);
+
+ StringBuf path = filename_build ({aud_get_path (AudPath::DataDir), "Skins"});
+ dir_foreach (path, scan_skindir_func);
+
+ const char * skinsdir = getenv ("SKINSDIR");
+ if (skinsdir)
+ {
+ for (const String & dir : str_list_to_index (skinsdir, ":"))
+ dir_foreach (dir, scan_skindir_func);
+ }
+
+ skinlist.sort ( (const SkinNode & a, const SkinNode & b)
+ { return str_compare (a.name, b.name); });
+}

audacious-plugins-4.4.1.tar.bz2/src/skins-qt/skinselector.h Added

@@ -0,0 +1,37 @@
+/* BMP - Cross-platform multimedia player
+ * Copyright (C) 2003-2004 BMP development team.
+ *
+ * Based on XMMS:
+ * Copyright (C) 1998-2003 XMMS development team.
+ *
+ * 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; under version 3 of the License.
+ *
+ * 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>.
+ *
+ * The Audacious team does not consider modular code linking to
+ * Audacious or using our public API to be a derived work.
+ */
+
+#ifndef SKINS_UI_SKINSELECTOR_H
+#define SKINS_UI_SKINSELECTOR_H
+
+#include <libaudcore/index.h>
+#include <libaudcore/objects.h>
+
+struct SkinNode {
+ String name, desc, path;
+};
+
+extern Index<SkinNode> skinlist;
+
+void skinlist_update ();
+
+#endif /* SKINS_UI_SKINSELECTOR_H */

audacious-plugins-4.4.1.tar.bz2/src/skins-qt/svis.cc Added

@@ -0,0 +1,208 @@
+/*
+ * Audacious - a cross-platform multimedia player
+ * Copyright (c) 2007-2011 Audacious development team.
+ *
+ * Based on:
+ * BMP - Cross-platform multimedia player
+ * Copyright (C) 2003-2004 BMP development team.
+ * XMMS:
+ * Copyright (C) 1998-2003 XMMS development team.
+ *
+ * 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; under version 3 of the License.
+ *
+ * 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>.
+ *
+ * The Audacious team does not consider modular code linking to
+ * Audacious or using our public API to be a derived work.
+ */
+
+#include <string.h>
+#include <libaudcore/objects.h>
+
+#include "skins_cfg.h"
+#include "skin.h"
+#include "vis.h"
+
+static const int svis_analyzer_colors = {14, 11, 8, 5, 2};
+static const int svis_scope_colors = {20, 19, 18, 19, 20};
+static const int svis_vu_normal_colors = {16, 14, 12, 10, 8, 6, 4, 2};
+
+#define RGB_SEEK(x,y) (set = rgb + 38 * (y) + (x))
+#define RGB_SET(c) (* set ++ = (c))
+#define RGB_SET_Y(c) do {* set = (c); set += 38;} while (0)
+#define RGB_SET_INDEX(c) RGB_SET (skin.vis_colorsc)
+#define RGB_SET_INDEX_Y(c) RGB_SET_Y (skin.vis_colorsc)
+
+void SmallVis::draw (QPainter & cr)
+{
+ uint32_t rgb38 * 5;
+ uint32_t * set;
+
+ RGB_SEEK (0, 0);
+ for (int x = 0; x < 38 * 5; x ++)
+ RGB_SET_INDEX (0);
+
+ switch (config.vis_type)
+ {
+ case VIS_ANALYZER:
+ {
+ bool bars = (config.analyzer_type == ANALYZER_BARS);
+
+ for (int x = 0; x < 38; x ++)
+ {
+ if (bars && (x % 3) == 2)
+ continue;
+
+ int h = m_databars ? (x / 3) : x;
+ h = aud::clamp (h, 0, 5);
+ RGB_SEEK (x, 5 - h);
+
+ for (int y = 0; y < h; y ++)
+ RGB_SET_INDEX_Y (svis_analyzer_colorsh - 1 - y);
+ }
+
+ break;
+ }
+ case VIS_VOICEPRINT:
+ switch (config.vu_mode)
+ {
+ case VU_NORMAL:
+ for (int y = 0; y < 5; y ++)
+ {
+ if (y == 2)
+ continue;
+
+ int h = (m_datay / 3 * 8 + 19) / 38;
+ h = aud::clamp (h, 0, 8);
+ RGB_SEEK (0, y);
+
+ for (int x = 0; x < h; x ++)
+ {
+ RGB_SET_INDEX (svis_vu_normal_colorsx);
+ RGB_SET_INDEX (svis_vu_normal_colorsx);
+ RGB_SET_INDEX (svis_vu_normal_colorsx);
+ set += 2;
+ }
+ }
+ break;
+ default: /* VU_SMOOTH */
+ for (int y = 0; y < 5; y ++)
+ {
+ if (y == 2)
+ continue;
+
+ int h = m_datay / 3;
+ h = aud::clamp (h, 0, 38);
+ RGB_SEEK (0, y);
+
+ for (int x = 0; x < h; x ++)
+ RGB_SET_INDEX (17 - (x * 16) / 38);
+ }
+ break;
+ }
+ break;
+ case VIS_SCOPE:
+ {
+ static const int scale17 = {0, 0, 0, 0, 0, 0, 1, 1, 2, 3, 3, 4,
+ 4, 4, 4, 4, 4};
+
+ if (! m_active)
+ goto DRAW;
+
+ switch (config.scope_mode)
+ {
+ case SCOPE_DOT:
+ for (int x = 0; x < 38; x ++)
+ {
+ int h = scaleaud::clamp (m_data2 * x, 0, 16);
+ RGB_SEEK (x, h);
+ RGB_SET_INDEX (svis_scope_colorsh);
+ }
+ break;
+ case SCOPE_LINE:
+ {
+ for (int x = 0; x < 37; x ++)
+ {
+ int h = scaleaud::clamp (m_data2 * x, 0, 16);
+ int h2 = scaleaud::clamp (m_data2 * (x + 1), 0, 16);
+
+ if (h < h2) h2 --;
+ else if (h > h2) {int temp = h; h = h2 + 1; h2 = temp;}
+
+ RGB_SEEK (x, h);
+ for (int y = h; y <= h2; y ++)
+ RGB_SET_INDEX_Y (svis_scope_colorsy);
+ }
+
+ int h = scaleaud::clamp (m_data74, 0, 16);
+ RGB_SEEK (37, h);
+ RGB_SET_INDEX (svis_scope_colorsh);
+ break;
+ }
+ default: /* SCOPE_SOLID */
+ for (int x = 0; x < 38; x ++)
+ {
+ int h = scaleaud::clamp (m_data2 * x, 0, 16);
+ int h2;
+
+ if (h < 2)
+ h2 = 2;
+ else
+ {
+ h2 = h;
+ h = 2;
+ }
+
+ RGB_SEEK (x, h);
+ for (int y = h; y <= h2; y ++)
+ RGB_SET_INDEX_Y (svis_scope_colorsy);
+ }
+ break;
+ }
+ break;
+ }
+ }
+
+DRAW:
+ QImage image ((unsigned char *) rgb, 38, 5, 4 * 38, QImage::Format_RGB32);
+ cr.drawImage (0, 0, image);
+}
+
+SmallVis::SmallVis ()
+{
+ set_scale (config.scale);
+ add_drawable (38, 5);
+ clear ();
+}
+
+void SmallVis::clear ()
+{
+ m_active = false;
+ memset (m_data, 0, sizeof m_data);
+ queue_draw ();
+}
+
+void SmallVis::render (const unsigned char * data)
+{
+ if (config.vis_type == VIS_VOICEPRINT)
+ {
+ for (int i = 0; i < 2; i ++)
+ m_datai = datai;
+ }
+ else
+ {
+ for (int i = 0; i < 75; i ++)
+ m_datai = datai;
+ }
+
+ m_active = true;
+ draw_now ();
+}

audacious-plugins-4.4.1.tar.bz2/src/skins-qt/textbox.cc Added

@@ -0,0 +1,300 @@
+/*
+ * Audacious - a cross-platform multimedia player
+ * Copyright (c) 2007 Tomasz Moń
+ * Copyright (c) 2011 John Lindgren
+ *
+ * Based on:
+ * BMP - Cross-platform multimedia player
+ * Copyright (C) 2003-2004 BMP development team.
+ * XMMS:
+ * Copyright (C) 1998-2003 XMMS development team.
+ *
+ * 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; under version 3 of the License.
+ *
+ * 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>.
+ *
+ * The Audacious team does not consider modular code linking to
+ * Audacious or using our public API to be a derived work.
+ */
+
+#include <string.h>
+
+#include <libaudcore/audstrings.h>
+#include <libaudcore/hook.h>
+#include <libaudcore/objects.h>
+#include <libaudqt/libaudqt.h>
+
+#include "skins_cfg.h"
+#include "skin.h"
+#include "textbox.h"
+
+#define DELAY 50
+
+static Index<TextBox *> textboxes;
+
+void TextBox::draw (QPainter & cr)
+{
+ if (m_scrolling)
+ {
+ cr.drawImage (-m_offset * config.scale, 0, * m_buf);
+ if (-m_offset + m_buf_width < m_width)
+ cr.drawImage ((-m_offset + m_buf_width) * config.scale, 0, * m_buf);
+ }
+ else
+ cr.drawImage (0, 0, * m_buf);
+}
+
+bool TextBox::button_press (QMouseEvent * event)
+{
+ return press ? press (event) : false;
+}
+
+void TextBox::scroll_timeout ()
+{
+ if (m_delay < DELAY)
+ {
+ m_delay ++;
+ return;
+ }
+
+ if (m_two_way && m_backward)
+ m_offset --;
+ else
+ m_offset ++;
+
+ if (m_two_way && (m_backward ? (m_offset <= 0) : (m_offset + m_width >= m_buf_width)))
+ {
+ m_backward = ! m_backward;
+ m_delay = 0;
+ }
+
+ if (! m_two_way && m_offset >= m_buf_width)
+ m_offset = 0;
+
+ draw_now ();
+}
+
+void TextBox::render_vector (const char * text)
+{
+ QRect ink = m_metrics->tightBoundingRect (text);
+
+#if QT_VERSION >= QT_VERSION_CHECK(5, 11, 0)
+ int logical_width = m_metrics->horizontalAdvance (text);
+#else
+ int logical_width = m_metrics->width (text);
+#endif
+
+ /* use logical width so as not to trim off the trailing space of the " --- " */
+ /* use ink height since vertical space is quite limited */
+ int width = aud::max (-ink.x () + logical_width, 1);
+ int height = aud::max (ink.height (), 1);
+
+ resize (m_width * config.scale, height);
+
+ m_buf_width = aud::max ((width + config.scale - 1) / config.scale, m_width);
+ m_buf.capture (new QImage (m_buf_width * config.scale, height, QImage::Format_RGB32));
+
+ QPainter cr (m_buf.get ());
+
+ cr.fillRect (cr.window (), QColor (skin.colorsSKIN_TEXTBG));
+
+ cr.setFont (* m_font);
+ cr.setPen (QColor (skin.colorsSKIN_TEXTFG));
+ cr.drawText (-ink.x (), -ink.y (), text);
+}
+
+static void lookup_char (const char c, int * x, int * y)
+{
+ int tx, ty;
+
+ switch (c)
+ {
+ case '"': tx = 26; ty = 0; break;
+ case '@': tx = 27; ty = 0; break;
+ case ' ': tx = 29; ty = 0; break;
+ case ':':
+ case ';':
+ case '|': tx = 12; ty = 1; break;
+ case '(':
+ case '{': tx = 13; ty = 1; break;
+ case ')':
+ case '}': tx = 14; ty = 1; break;
+ case '-':
+ case '~': tx = 15; ty = 1; break;
+ case '`':
+ case '\'': tx = 16; ty = 1; break;
+ case '!': tx = 17; ty = 1; break;
+ case '_': tx = 18; ty = 1; break;
+ case '+': tx = 19; ty = 1; break;
+ case '\\': tx = 20; ty = 1; break;
+ case '/': tx = 21; ty = 1; break;
+ case '': tx = 22; ty = 1; break;
+ case '': tx = 23; ty = 1; break;
+ case '^': tx = 24; ty = 1; break;
+ case '&': tx = 25; ty = 1; break;
+ case '%': tx = 26; ty = 1; break;
+ case '.':
+ case ',': tx = 27; ty = 1; break;
+ case '=': tx = 28; ty = 1; break;
+ case '$': tx = 29; ty = 1; break;
+ case '#': tx = 30; ty = 1; break;
+ case '?': tx = 3; ty = 2; break;
+ case '*': tx = 4; ty = 2; break;
+ default: tx = 3; ty = 2; break; /* '?' */
+ }
+
+ * x = tx * skin.hints.textbox_bitmap_font_width;
+ * y = ty * skin.hints.textbox_bitmap_font_height;
+}
+
+void TextBox::render_bitmap (const char * text)
+{
+ int cw = skin.hints.textbox_bitmap_font_width;
+ int ch = skin.hints.textbox_bitmap_font_height;
+
+ resize (m_width * config.scale, ch * config.scale);
+
+ auto ucs4 = QString (text).toUcs4 ();
+
+ m_buf_width = aud::max (cw * (int) ucs4.length (), m_width);
+ m_buf.capture (new QImage (m_buf_width * config.scale, ch * config.scale,
+ QImage::Format_RGB32));
+
+ QPainter cr (m_buf.get ());
+ if (config.scale != 1)
+ cr.setTransform (QTransform ().scale (config.scale, config.scale));
+
+ for (int x = 0, i = 0; x < m_buf_width; x += cw, i ++)
+ {
+ unsigned c = (i < ucs4.length ()) ? ucs4i : ' ';
+ int cx = 0, cy = 0;
+
+ if (c >= 'A' && c <= 'Z')
+ cx = cw * (c - 'A');
+ else if (c >= 'a' && c <= 'z')
+ cx = cw * (c - 'a');
+ else if (c >= '0' && c <= '9')
+ {
+ cx = cw * (c - '0');
+ cy = ch;
+ }
+ else
+ lookup_char (c, & cx, & cy);
+
+ skin_draw_pixbuf (cr, SKIN_TEXT, cx, cy, x, 0, cw, ch);
+ }
+}
+
+void TextBox::render ()
+{
+ m_scrolling = false;
+ m_backward = false;
+ m_offset = 0;
+ m_delay = 0;
+
+ const char * text = m_text ? m_text : "";
+
+ if (m_font)
+ render_vector (text);
+ else
+ render_bitmap (text);
+
+ if (m_may_scroll && m_buf_width > m_width)
+ {
+ m_scrolling = true;
+
+ if (! m_two_way)
+ {
+ StringBuf temp = str_printf ("%s --- ", text);
+
+ if (m_font)
+ render_vector (temp);
+ else
+ render_bitmap (temp);
+ }
+ }
+
+ queue_draw ();
+
+ if (m_scrolling)
+ scroll_timer.start ();
+ else
+ scroll_timer.stop ();
+}
+
+void TextBox::set_width (int width)
+{
+ if (m_width != width)
+ {
+ m_width = width;
+ render ();
+ }
+}
+
+void TextBox::set_text (const char * text)
+{
+ if (strcmp_safe (m_text, text))
+ {
+ m_text = String (text);
+ render ();
+ }
+}
+
+void TextBox::set_font (const char * font)
+{
+ if (font)
+ {
+ m_font.capture (new QFont (audqt::qfont_from_string (font)));
+ m_metrics.capture (new QFontMetrics (* m_font, this));
+ }
+ else
+ {
+ m_font.clear ();
+ m_metrics.clear ();
+ }
+
+ render ();
+}
+
+void TextBox::set_scroll (bool scroll)
+{
+ if (m_may_scroll != scroll || m_two_way != config.twoway_scroll)
+ {
+ m_may_scroll = scroll;
+ m_two_way = config.twoway_scroll;
+ render ();
+ }
+}
+
+TextBox::~TextBox ()
+{
+ int idx = textboxes.find (this);
+ if (idx >= 0)
+ textboxes.remove (idx, 1);
+}
+
+TextBox::TextBox (int width, const char * font, bool scroll) :
+ m_width (width),
+ m_may_scroll (scroll),
+ m_two_way (config.twoway_scroll)
+{
+ /* size is computed by set_font() */
+ add_input (1, 1, false, true);
+ set_font (font);
+
+ textboxes.append (this);
+}
+
+void TextBox::update_all ()
+{
+ for (TextBox * textbox : textboxes)
+ textbox->render ();
+}

audacious-plugins-4.4.1.tar.bz2/src/skins-qt/textbox.h Added

@@ -0,0 +1,82 @@
+/*
+ * Audacious - a cross-platform multimedia player
+ * Copyright (c) 2007 Tomasz Moń
+ * Copyright (c) 2011 John Lindgren
+ *
+ * Based on:
+ * BMP - Cross-platform multimedia player
+ * Copyright (C) 2003-2004 BMP development team.
+ * XMMS:
+ * Copyright (C) 1998-2003 XMMS development team.
+ *
+ * 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; under version 3 of the License.
+ *
+ * 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>.
+ *
+ * The Audacious team does not consider modular code linking to
+ * Audacious or using our public API to be a derived work.
+ */
+
+#ifndef SKINS_UI_SKINNED_TEXTBOX_H
+#define SKINS_UI_SKINNED_TEXTBOX_H
+
+#include <libaudcore/hook.h>
+#include <libaudcore/objects.h>
+
+#include "widget.h"
+
+class QFont;
+class QFontMetrics;
+class QImage;
+
+class TextBox : public Widget
+{
+public:
+ TextBox (int width, const char * font, bool scroll);
+ ~TextBox ();
+
+ void set_width (int width);
+ const String & get_text () { return m_text; }
+ void set_text (const char * text);
+ void set_font (const char * font);
+ void set_scroll (bool scroll);
+
+ typedef bool (* PressCB) (QMouseEvent *);
+ void on_press (PressCB callback) { press = callback; }
+
+ static void update_all ();
+
+private:
+ virtual void draw (QPainter & cr);
+ virtual bool button_press (QMouseEvent * event);
+
+ void scroll_timeout ();
+ void render_vector (const char * text);
+ void render_bitmap (const char * text);
+ void render ();
+
+ const Timer<TextBox>
+ scroll_timer {TimerRate::Hz30, this, & TextBox::scroll_timeout};
+
+ String m_text;
+ SmartPtr<QFont> m_font;
+ SmartPtr<QFontMetrics> m_metrics;
+ SmartPtr<QImage> m_buf;
+
+ int m_width = 0, m_buf_width = 0;
+ bool m_may_scroll = false, m_two_way = false;
+ bool m_scrolling = false, m_backward = false;
+ int m_offset = 0, m_delay = 0;
+
+ PressCB press = nullptr;
+};
+
+#endif

audacious-plugins-4.4.1.tar.bz2/src/skins-qt/view.cc Added

@@ -0,0 +1,307 @@
+/*
+ * view.c
+ * Copyright 2014-2015 John Lindgren
+ *
+ * This file is part of Audacious.
+ *
+ * Audacious 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, version 2 or version 3 of the License.
+ *
+ * Audacious 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
+ * Audacious. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The Audacious team does not consider modular code linking to Audacious or
+ * using our public API to be a derived work.
+ */
+
+#include "view.h"
+
+#include <libaudcore/hook.h>
+#include <libaudcore/mainloop.h>
+#include <libaudcore/runtime.h>
+
+#include <QWindow>
+
+#include "plugin.h"
+#include "plugin-window.h"
+#include "skins_cfg.h"
+#include "equalizer.h"
+#include "main.h"
+#include "vis-callbacks.h"
+#include "playlistwin.h"
+#include "button.h"
+#include "eq-graph.h"
+#include "textbox.h"
+#include "menurow.h"
+#include "window.h"
+#include "vis.h"
+
+void view_show_player (bool show)
+{
+ if (show)
+ {
+ mainwin->show ();
+ mainwin->activateWindow ();
+ show_plugin_windows ();
+ }
+ else
+ {
+ mainwin->hide ();
+ hide_plugin_windows ();
+ }
+
+ view_apply_show_playlist ();
+ view_apply_show_equalizer ();
+
+ start_stop_visual (false);
+}
+
+void view_set_show_playlist (bool show)
+{
+ aud_set_bool ("skins", "playlist_visible", show);
+ hook_call ("skins set playlist_visible", nullptr);
+
+ view_apply_show_playlist ();
+}
+
+void view_apply_show_playlist ()
+{
+ bool show = aud_get_bool ("skins", "playlist_visible");
+
+ if (show && mainwin->isVisible ())
+ {
+ playlistwin->winId ();
+ playlistwin->windowHandle ()->setTransientParent (mainwin->windowHandle ());
+ playlistwin->show ();
+ playlistwin->activateWindow ();
+ }
+ else
+ playlistwin->hide ();
+
+ mainwin_pl->set_active (show);
+}
+
+void view_set_show_equalizer (bool show)
+{
+ aud_set_bool ("skins", "equalizer_visible", show);
+ hook_call ("skins set equalizer_visible", nullptr);
+
+ view_apply_show_equalizer ();
+}
+
+void view_apply_show_equalizer ()
+{
+ bool show = aud_get_bool ("skins", "equalizer_visible");
+
+ if (show && mainwin->isVisible ())
+ {
+ equalizerwin->winId ();
+ equalizerwin->windowHandle ()->setTransientParent (mainwin->windowHandle ());
+ equalizerwin->show ();
+ equalizerwin->activateWindow ();
+ }
+ else
+ equalizerwin->hide ();
+
+ mainwin_eq->set_active (show);
+}
+
+void view_set_player_shaded (bool shaded)
+{
+ aud_set_bool ("skins", "player_shaded", shaded);
+ hook_call ("skins set player_shaded", nullptr);
+
+ view_apply_player_shaded ();
+}
+
+void view_apply_player_shaded ()
+{
+ bool shaded = aud_get_bool ("skins", "player_shaded");
+
+ mainwin->set_shaded (shaded);
+
+ int width = shaded ? MAINWIN_SHADED_WIDTH : skin.hints.mainwin_width;
+ int height = shaded ? MAINWIN_SHADED_HEIGHT : skin.hints.mainwin_height;
+ mainwin->resize (width, height);
+
+ if (config.autoscroll)
+ mainwin_info->set_scroll (! shaded);
+}
+
+void view_set_playlist_shaded (bool shaded)
+{
+ aud_set_bool ("skins", "playlist_shaded", shaded);
+ hook_call ("skins set playlist_shaded", nullptr);
+
+ view_apply_playlist_shaded ();
+}
+
+void view_apply_playlist_shaded ()
+{
+ bool shaded = aud_get_bool ("skins", "playlist_shaded");
+
+ playlistwin->set_shaded (shaded);
+
+ int height = shaded ? MAINWIN_SHADED_HEIGHT : config.playlist_height;
+ playlistwin->resize (config.playlist_width, height);
+
+ if (config.autoscroll)
+ playlistwin_sinfo->set_scroll (shaded);
+}
+
+void view_set_equalizer_shaded (bool shaded)
+{
+ aud_set_bool ("skins", "equalizer_shaded", shaded);
+ hook_call ("skins set equalizer_shaded", nullptr);
+
+ view_apply_equalizer_shaded ();
+}
+
+void view_apply_equalizer_shaded ()
+{
+ bool shaded = aud_get_bool ("skins", "equalizer_shaded");
+
+ /* do not allow shading the equalizer if eq_ex.bmp is missing */
+ if (skin.pixmapsSKIN_EQ_EX.isNull ())
+ shaded = false;
+
+ equalizerwin->set_shaded (shaded);
+ equalizerwin->resize (275, shaded ? 14 : 116);
+}
+
+void view_set_double_size (bool double_size)
+{
+ aud_set_bool ("skins", "double_size", double_size);
+ hook_call ("skins set double_size", nullptr);
+
+ view_apply_double_size ();
+}
+
+void view_apply_double_size ()
+{
+ static QueuedFunc restart;
+ restart.queue (skins_restart);
+}
+
+void view_set_on_top (bool on_top)
+{
+ aud_set_bool ("skins", "always_on_top", on_top);
+ hook_call ("skins set always_on_top", nullptr);
+
+ view_apply_on_top ();
+}
+
+void view_apply_on_top ()
+{
+ bool mainwin_visible = mainwin->isVisible ();
+ bool equalizer_visible = equalizerwin->isVisible ();
+ bool playlist_visible = playlistwin->isVisible ();
+
+ if (aud_get_bool ("skins", "always_on_top"))
+ {
+ mainwin->setWindowFlags (mainwin->windowFlags () | Qt::WindowStaysOnTopHint);
+ equalizerwin->setWindowFlags (equalizerwin->windowFlags () | Qt::WindowStaysOnTopHint);
+ playlistwin->setWindowFlags (playlistwin->windowFlags () | Qt::WindowStaysOnTopHint);
+ }
+ else
+ {
+ mainwin->setWindowFlags (mainwin->windowFlags () & ~Qt::WindowStaysOnTopHint);
+ equalizerwin->setWindowFlags (equalizerwin->windowFlags () & ~Qt::WindowStaysOnTopHint);
+ playlistwin->setWindowFlags (playlistwin->windowFlags () & ~Qt::WindowStaysOnTopHint);
+ }
+
+ if (mainwin_visible)
+ mainwin->show ();
+ if (equalizer_visible)
+ equalizerwin->show ();
+ if (playlist_visible)
+ playlistwin->show ();
+
+ mainwin_menurow->refresh ();
+}
+
+void view_set_sticky (bool sticky)
+{
+ aud_set_bool ("skins", "sticky", sticky);
+ hook_call ("skins set sticky", nullptr);
+
+ view_apply_sticky ();
+}
+
+void view_apply_sticky ()
+{
+#if 0
+ bool sticky = aud_get_bool ("skins", "sticky");
+
+ if (sticky)
+ {
+ gtk_window_stick ((GtkWindow *) mainwin->gtk ());
+ gtk_window_stick ((GtkWindow *) equalizerwin->gtk ());
+ gtk_window_stick ((GtkWindow *) playlistwin->gtk ());
+ }
+ else
+ {
+ gtk_window_unstick ((GtkWindow *) mainwin->gtk ());
+ gtk_window_unstick ((GtkWindow *) equalizerwin->gtk ());
+ gtk_window_unstick ((GtkWindow *) playlistwin->gtk ());
+ }
+#endif
+}
+
+void view_set_show_remaining (bool remaining)
+{
+ aud_set_bool ("skins", "show_remaining_time", remaining);
+ hook_call ("skins set show_remaining_time", nullptr);
+
+ view_apply_show_remaining ();
+}
+
+void view_apply_show_remaining ()
+{
+ mainwin_update_song_info ();
+}
+
+static QRegion * scale_mask (const Index<QRect> & mask, int scale)
+{
+ QRegion * region = nullptr;
+
+ for (auto & rect : mask)
+ {
+ QRect scaled (
+ rect.x () * scale,
+ rect.y () * scale,
+ rect.width () * scale,
+ rect.height () * scale
+ );
+
+ if (region)
+ * region |= scaled;
+ else
+ region = new QRegion (scaled);
+ }
+
+ return region;
+}
+
+void view_apply_skin ()
+{
+ mainwin->set_shapes
+ (scale_mask (skin.masksSKIN_MASK_MAIN, config.scale),
+ scale_mask (skin.masksSKIN_MASK_MAIN_SHADE, config.scale));
+ equalizerwin->set_shapes
+ (scale_mask (skin.masksSKIN_MASK_EQ, config.scale),
+ scale_mask (skin.masksSKIN_MASK_EQ_SHADE, config.scale));
+
+ mainwin_refresh_hints ();
+ view_apply_equalizer_shaded ();
+ TextBox::update_all ();
+
+ mainwin->queue_draw ();
+ equalizerwin->queue_draw ();
+ playlistwin->queue_draw ();
+}

audacious-plugins-4.4.1.tar.bz2/src/skins-qt/view.h Added

@@ -0,0 +1,56 @@
+/*
+ * view.h
+ * Copyright 2014 John Lindgren
+ *
+ * This file is part of Audacious.
+ *
+ * Audacious 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, version 2 or version 3 of the License.
+ *
+ * Audacious 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
+ * Audacious. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The Audacious team does not consider modular code linking to Audacious or
+ * using our public API to be a derived work.
+ */
+
+#ifndef SKINS_VIEW_H
+#define SKINS_VIEW_H
+
+void view_show_player (bool show);
+
+void view_set_show_playlist (bool show);
+void view_apply_show_playlist ();
+
+void view_set_show_equalizer (bool show);
+void view_apply_show_equalizer ();
+
+void view_set_player_shaded (bool shaded);
+void view_apply_player_shaded ();
+
+void view_set_playlist_shaded (bool shaded);
+void view_apply_playlist_shaded ();
+
+void view_set_equalizer_shaded (bool shaded);
+void view_apply_equalizer_shaded ();
+
+void view_set_double_size (bool double_size);
+void view_apply_double_size ();
+
+void view_set_on_top (bool on_top);
+void view_apply_on_top ();
+
+void view_set_sticky (bool sticky);
+void view_apply_sticky ();
+
+void view_set_show_remaining (bool remaining);
+void view_apply_show_remaining ();
+
+void view_apply_skin ();
+
+#endif /* SKINS_VIEW_H */

audacious-plugins-4.4.1.tar.bz2/src/skins-qt/vis-callbacks.cc Added

@@ -0,0 +1,195 @@
+/*
+ * Audacious
+ * Copyright (c) 2006-2007 Audacious development team.
+ *
+ * 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; under version 3 of the License.
+ *
+ * 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>.
+ *
+ * The Audacious team does not consider modular code linking to
+ * Audacious or using our public API to be a derived work.
+ */
+
+#include <math.h>
+
+#include <libaudcore/drct.h>
+#include <libaudcore/hook.h>
+#include <libaudcore/i18n.h>
+#include <libaudcore/interface.h>
+#include <libaudcore/runtime.h>
+
+#include "skins_cfg.h"
+#include "main.h"
+#include "vis-callbacks.h"
+#include "skin.h"
+#include "button.h"
+#include "hslider.h"
+#include "number.h"
+#include "playstatus.h"
+#include "textbox.h"
+#include "vis.h"
+#include "skins_util.h"
+
+class VisCallbacks : public Visualizer
+{
+public:
+ constexpr VisCallbacks () :
+ Visualizer (MonoPCM | MultiPCM | Freq) {}
+
+ void clear ();
+ void render_mono_pcm (const float * pcm);
+ void render_multi_pcm (const float * pcm, int channels);
+ void render_freq (const float * freq);
+};
+
+void VisCallbacks::clear ()
+{
+ mainwin_vis->clear ();
+ mainwin_svis->clear ();
+}
+
+void VisCallbacks::render_mono_pcm (const float * pcm)
+{
+ unsigned char data512;
+
+ if (config.vis_type != VIS_SCOPE)
+ return;
+
+ for (int i = 0; i < 75; i ++)
+ {
+ /* the signal is amplified by 2x */
+ /* output values are in the range 0 to 16 */
+ int val = 8 + roundf (16 * pcmi * 512 / 75);
+ datai = aud::clamp (val, 0, 16);
+ }
+
+ if (aud_get_bool ("skins", "player_shaded"))
+ mainwin_svis->render (data);
+ else
+ mainwin_vis->render (data);
+}
+
+/* calculate peak dB level, where 1 is 0 dB */
+static float calc_peak_level (const float * pcm, int step)
+{
+ float peak = 0.0001; /* must be > 0, or level = -inf */
+
+ for (int i = 0; i < 512; i ++)
+ {
+ peak = aud::max (peak, * pcm);
+ pcm += step;
+ }
+
+ return 20 * log10 (peak);
+}
+
+void VisCallbacks::render_multi_pcm (const float * pcm, int channels)
+{
+ /* "VU meter" */
+ if (config.vis_type != VIS_VOICEPRINT || ! aud_get_bool ("skins", "player_shaded"))
+ return;
+
+ unsigned char data512;
+
+ int level = 38 + calc_peak_level (pcm, channels);
+ data0 = aud::clamp (level, 0, 38);
+
+ if (channels >= 2)
+ {
+ level = 38 + calc_peak_level (pcm + 1, channels);
+ data1 = aud::clamp (level, 0, 38);
+ }
+ else
+ data1 = data0;
+
+ mainwin_svis->render (data);
+}
+
+/* convert linear frequency graph to logarithmic one */
+static void make_log_graph (const float * freq, int bands, int db_range,
+ int int_range, unsigned char * graph)
+{
+ static int last_bands = 0;
+ static Index<float> xscale;
+
+ /* conversion table for the x-axis */
+ if (bands != last_bands)
+ {
+ xscale.resize (bands + 1);
+ Visualizer::compute_log_xscale (& xscale0, bands);
+ last_bands = bands;
+ }
+
+ for (int i = 0; i < bands; i ++)
+ {
+ float val = Visualizer::compute_freq_band (freq, & xscale0, i, bands);
+ /* scale (-db_range, 0.0) to (0.0, int_range) */
+ val = (1 + val / db_range) * int_range;
+ graphi = aud::clamp ((int) val, 0, int_range);
+ }
+}
+
+void VisCallbacks::render_freq (const float * freq)
+{
+ bool shaded = aud_get_bool ("skins", "player_shaded");
+
+ unsigned char data512;
+
+ if (config.vis_type == VIS_ANALYZER)
+ {
+ if (config.analyzer_type == ANALYZER_BARS)
+ {
+ if (shaded)
+ make_log_graph (freq, 13, 40, 8, data);
+ else
+ make_log_graph (freq, 19, 40, 16, data);
+ }
+ else
+ {
+ if (shaded)
+ make_log_graph (freq, 37, 40, 8, data);
+ else
+ make_log_graph (freq, 75, 40, 16, data);
+ }
+ }
+ else if (config.vis_type == VIS_VOICEPRINT && ! shaded)
+ make_log_graph (freq, 17, 40, 255, data);
+ else
+ return;
+
+ if (shaded)
+ mainwin_svis->render (data);
+ else
+ mainwin_vis->render (data);
+}
+
+void start_stop_visual (bool exiting)
+{
+ static VisCallbacks callbacks;
+ static bool started = false;
+
+ if (config.vis_type != VIS_OFF && ! exiting && aud_ui_is_shown ())
+ {
+ if (! started)
+ {
+ aud_visualizer_add (& callbacks);
+ started = true;
+ }
+ }
+ else
+ {
+ if (started)
+ {
+ aud_visualizer_remove (& callbacks);
+ started = false;
+ }
+ }
+}

audacious-plugins-4.4.1.tar.bz2/src/skins-qt/vis-callbacks.h Added

@@ -0,0 +1,26 @@
+/*
+ * Audacious
+ * Copyright (c) 2006-2007 Audacious development team.
+ *
+ * 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; under version 3 of the License.
+ *
+ * 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>.
+ *
+ * The Audacious team does not consider modular code linking to
+ * Audacious or using our public API to be a derived work.
+ */
+
+#ifndef SKINS_UI_MAIN_EVLISTENERS_H
+#define SKINS_UI_MAIN_EVLISTENERS_H
+
+void start_stop_visual (bool exiting);
+
+#endif /* SKINS_UI_MAIN_EVLISTENERS_H */

audacious-plugins-4.4.1.tar.bz2/src/skins-qt/vis.cc Added

@@ -0,0 +1,318 @@
+/*
+ * Audacious - a cross-platform multimedia player
+ * Copyright (c) 2007-2011 Audacious development team.
+ *
+ * Based on:
+ * BMP - Cross-platform multimedia player
+ * Copyright (C) 2003-2004 BMP development team.
+ * XMMS:
+ * Copyright (C) 1998-2003 XMMS development team.
+ *
+ * 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; under version 3 of the License.
+ *
+ * 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>.
+ *
+ * The Audacious team does not consider modular code linking to
+ * Audacious or using our public API to be a derived work.
+ */
+
+#include <string.h>
+#include <libaudcore/objects.h>
+
+#include "skins_cfg.h"
+#include "skin.h"
+#include "vis.h"
+
+static const float vis_afalloff_speeds = {0.34, 0.5, 1.0, 1.3, 1.6};
+static const float vis_pfalloff_speeds = {1.2, 1.3, 1.4, 1.5, 1.6};
+static const int vis_scope_colors16 = {22, 22, 21, 21, 20, 10, 19, 19, 18,
+ 19, 19, 20, 20, 21, 21, 22};
+
+#define RGB_SEEK(x,y) (set = rgb + 76 * (y) + (x))
+#define RGB_SET(c) (* set ++ = (c))
+#define RGB_SET_Y(c) do {* set = (c); set += 76;} while (0)
+#define RGB_SET_INDEX(c) RGB_SET (skin.vis_colorsc)
+#define RGB_SET_INDEX_Y(c) RGB_SET_Y (skin.vis_colorsc)
+
+void SkinnedVis::set_colors ()
+{
+ uint32_t fgc = skin.colorsSKIN_TEXTFG;
+ uint32_t bgc = skin.colorsSKIN_TEXTBG;
+ int fg3 = {qRed (fgc), qGreen (fgc), qBlue (fgc)};
+ int bg3 = {qRed (bgc), qGreen (bgc), qBlue (bgc)};
+
+ for (int x = 0; x < 256; x ++)
+ {
+ unsigned char c3;
+ for (int n = 0; n < 3; n ++)
+ cn = bgn + (fgn - bgn) * x / 255;
+ m_voice_colorx = qRgb (c0, c1, c2);
+ }
+
+ for (int x = 0; x < 256; x ++)
+ {
+ unsigned char r = aud::min (x, 127) * 2;
+ unsigned char g = aud::clamp (x - 64, 0, 127) * 2;
+ unsigned char b = aud::max (x - 128, 0) * 2;
+ m_voice_color_firex = qRgb (r, g, b);
+ }
+
+ for (int x = 0; x < 256; x ++)
+ m_voice_color_icex = qRgb (x / 2, x, aud::min (x * 2, 255));
+
+ uint32_t * set = m_pattern_fill;
+ uint32_t * end = set + 76;
+
+ while (set < end)
+ RGB_SET_INDEX (0);
+
+ end = set + 76;
+
+ while (set < end)
+ {
+ RGB_SET_INDEX (1);
+ RGB_SET_INDEX (0);
+ }
+}
+
+void SkinnedVis::draw (QPainter & cr)
+{
+ uint32_t rgb76 * 16;
+ uint32_t * set;
+
+ if (config.vis_type != VIS_VOICEPRINT)
+ {
+ for (set = rgb; set < rgb + 76 * 16; set += 76 * 2)
+ memcpy (set, m_pattern_fill, sizeof m_pattern_fill);
+ }
+
+ switch (config.vis_type)
+ {
+ case VIS_ANALYZER:
+ {
+ bool bars = (config.analyzer_type == ANALYZER_BARS);
+
+ for (int x = 0; x < 75; x ++)
+ {
+ if (bars && (x & 3) == 3)
+ continue;
+
+ int h = m_databars ? (x >> 2) : x;
+ h = aud::clamp (h, 0, 16);
+ RGB_SEEK (x, 16 - h);
+
+ switch (config.analyzer_mode)
+ {
+ case ANALYZER_NORMAL:
+ for (int y = 0; y < h; y ++)
+ RGB_SET_INDEX_Y (18 - h + y);
+ break;
+ case ANALYZER_FIRE:
+ for (int y = 0; y < h; y ++)
+ RGB_SET_INDEX_Y (2 + y);
+ break;
+ default: /* ANALYZER_VLINES */
+ for (int y = 0; y < h; y ++)
+ RGB_SET_INDEX_Y (18 - h);
+ break;
+ }
+
+ if (config.analyzer_peaks)
+ {
+ int h = m_peakbars ? (x >> 2) : x;
+ h = aud::clamp (h, 0, 16);
+
+ if (h)
+ {
+ RGB_SEEK (x, 16 - h);
+ RGB_SET_INDEX (23);
+ }
+ }
+ }
+
+ break;
+ }
+ case VIS_VOICEPRINT:
+ {
+ if (m_voiceprint_advance)
+ {
+ m_voiceprint_advance = false;
+ memmove (m_voiceprint_data, m_voiceprint_data + 1, sizeof
+ m_voiceprint_data - 1);
+
+ for (int y = 0; y < 16; y ++)
+ m_voiceprint_data76 * y + 75 = m_datay;
+ }
+
+ unsigned char * get = m_voiceprint_data;
+ uint32_t * colors = (config.voiceprint_mode == VOICEPRINT_NORMAL) ?
+ m_voice_color : (config.voiceprint_mode == VOICEPRINT_FIRE) ?
+ m_voice_color_fire : /* VOICEPRINT_ICE */ m_voice_color_ice;
+ set = rgb;
+
+ for (int y = 0; y < 16; y ++)
+ for (int x = 0; x < 76; x ++)
+ RGB_SET (colors* get ++);
+ break;
+ }
+ case VIS_SCOPE:
+ if (! m_active)
+ goto DRAW;
+
+ switch (config.scope_mode)
+ {
+ case SCOPE_DOT:
+ for (int x = 0; x < 75; x ++)
+ {
+ int h = aud::clamp ((int) m_datax, 0, 15);
+ RGB_SEEK (x, h);
+ RGB_SET_INDEX (vis_scope_colorsh);
+ }
+ break;
+ case SCOPE_LINE:
+ {
+ for (int x = 0; x < 74; x ++)
+ {
+ int h = aud::clamp ((int) m_datax, 0, 15);
+ int h2 = aud::clamp ((int) m_datax + 1, 0, 15);
+
+ if (h < h2)
+ h2 --;
+ else if (h > h2)
+ {
+ int temp = h;
+ h = h2 + 1;
+ h2 = temp;
+ }
+
+ RGB_SEEK (x, h);
+
+ for (int y = h; y <= h2; y ++)
+ RGB_SET_INDEX_Y (vis_scope_colorsy);
+ }
+
+ int h = aud::clamp ((int) m_data74, 0, 15);
+ RGB_SEEK (74, h);
+ RGB_SET_INDEX (vis_scope_colorsh);
+ break;
+ }
+ default: /* SCOPE_SOLID */
+ for (int x = 0; x < 75; x ++)
+ {
+ int h = aud::clamp ((int) m_datax, 0, 15);
+ int h2;
+
+ if (h < 8)
+ h2 = 8;
+ else
+ {
+ h2 = h;
+ h = 8;
+ }
+
+ RGB_SEEK (x, h);
+
+ for (int y = h; y <= h2; y ++)
+ RGB_SET_INDEX_Y (vis_scope_colorsy);
+ }
+ break;
+ }
+ break;
+ }
+
+DRAW:
+ QImage image ((unsigned char *) rgb, 76, 16, 4 * 76, QImage::Format_RGB32);
+ cr.drawImage (0, 0, image);
+}
+
+SkinnedVis::SkinnedVis ()
+{
+ set_scale (config.scale);
+ add_drawable (76, 16);
+ clear ();
+}
+
+void SkinnedVis::clear ()
+{
+ m_active = false;
+ m_voiceprint_advance = false;
+
+ memset (m_data, 0, sizeof m_data);
+ memset (m_peak, 0, sizeof m_peak);
+ memset (m_peak_speed, 0, sizeof m_peak_speed);
+ memset (m_voiceprint_data, 0, sizeof m_voiceprint_data);
+
+ queue_draw ();
+}
+
+void SkinnedVis::render (const unsigned char * data)
+{
+ if (config.vis_type == VIS_ANALYZER)
+ {
+ const int n = (config.analyzer_type == ANALYZER_BARS) ? 19 : 75;
+
+ for (int i = 0; i < n; i ++)
+ {
+ if (datai > m_datai)
+ {
+ m_datai = datai;
+ if (m_datai > m_peaki)
+ {
+ m_peaki = m_datai;
+ m_peak_speedi = 0.01;
+
+ }
+ else if (m_peaki > 0.0)
+ {
+ m_peaki -= m_peak_speedi;
+ m_peak_speedi *= vis_pfalloff_speedsconfig.peaks_falloff;
+ if (m_peaki < m_datai)
+ m_peaki = m_datai;
+ if (m_peaki < 0.0)
+ m_peaki = 0.0;
+ }
+ }
+ else
+ {
+ if (m_datai > 0.0)
+ {
+ m_datai -= vis_afalloff_speedsconfig.analyzer_falloff;
+ if (m_datai < 0.0)
+ m_datai = 0.0;
+ }
+ if (m_peaki > 0.0)
+ {
+ m_peaki -= m_peak_speedi;
+ m_peak_speedi *= vis_pfalloff_speedsconfig.peaks_falloff;
+ if (m_peaki < m_datai)
+ m_peaki = m_datai;
+ if (m_peaki < 0.0)
+ m_peaki = 0.0;
+ }
+ }
+ }
+ }
+ else if (config.vis_type == VIS_VOICEPRINT)
+ {
+ for (int i = 0; i < 16; i ++)
+ m_datai = data15 - i;
+
+ m_voiceprint_advance = true;
+ }
+ else
+ {
+ for (int i = 0; i < 75; i ++)
+ m_datai = datai;
+ }
+
+ m_active = true;
+ draw_now ();
+}

audacious-plugins-4.4.1.tar.bz2/src/skins-qt/vis.h Added

@@ -0,0 +1,90 @@
+/*
+ * Audacious - a cross-platform multimedia player
+ * Copyright (c) 2007-2011 Audacious development team.
+ *
+ * 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; under version 3 of the License.
+ *
+ * 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>.
+ *
+ * The Audacious team does not consider modular code linking to
+ * Audacious or using our public API to be a derived work.
+ */
+
+#ifndef SKINS_UI_VIS_H
+#define SKINS_UI_VIS_H
+
+#include <stdint.h>
+#include "widget.h"
+
+typedef enum {
+ VIS_ANALYZER, VIS_SCOPE, VIS_VOICEPRINT, VIS_OFF
+} VisType;
+
+typedef enum {
+ ANALYZER_NORMAL, ANALYZER_FIRE, ANALYZER_VLINES
+} AnalyzerMode;
+
+typedef enum {
+ ANALYZER_LINES, ANALYZER_BARS
+} AnalyzerType;
+
+typedef enum {
+ SCOPE_DOT, SCOPE_LINE, SCOPE_SOLID
+} ScopeMode;
+
+typedef enum {
+ VOICEPRINT_NORMAL, VOICEPRINT_FIRE, VOICEPRINT_ICE
+} VoiceprintMode;
+
+typedef enum {
+ VU_NORMAL, VU_SMOOTH
+} VUMode;
+
+typedef enum {
+ FALLOFF_SLOWEST, FALLOFF_SLOW, FALLOFF_MEDIUM, FALLOFF_FAST, FALLOFF_FASTEST
+} FalloffSpeed;
+
+class SkinnedVis : public Widget
+{
+public:
+ SkinnedVis ();
+ void set_colors ();
+ void clear ();
+ void render (const unsigned char * data);
+
+private:
+ void draw (QPainter & cr);
+
+ uint32_t m_voice_color256;
+ uint32_t m_voice_color_fire256;
+ uint32_t m_voice_color_ice256;
+ uint32_t m_pattern_fill76 * 2;
+
+ bool m_active, m_voiceprint_advance;
+ float m_data75, m_peak75, m_peak_speed75;
+ unsigned char m_voiceprint_data76 * 16;
+};
+
+class SmallVis : public Widget
+{
+public:
+ SmallVis ();
+ void clear ();
+ void render (const unsigned char * data);
+
+private:
+ void draw (QPainter & cr);
+
+ bool m_active;
+ int m_data75;
+};
+
+#endif

audacious-plugins-4.4.1.tar.bz2/src/skins-qt/widget.cc Added

@@ -0,0 +1,47 @@
+/*
+ * widget.cc
+ * Copyright 2015 John Lindgren
+ *
+ * This file is part of Audacious.
+ *
+ * Audacious 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, version 2 or version 3 of the License.
+ *
+ * Audacious 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
+ * Audacious. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The Audacious team does not consider modular code linking to Audacious or
+ * using our public API to be a derived work.
+ */
+
+#include "widget.h"
+
+void Widget::add_input (int width, int height, bool track_motion, bool drawable)
+{
+ resize (width, height);
+ setMouseTracking (track_motion);
+ m_drawable = drawable;
+}
+
+void Widget::add_drawable (int width, int height)
+{
+ resize (width, height);
+ m_drawable = true;
+}
+
+void Widget::paintEvent (QPaintEvent *)
+{
+ if (m_drawable)
+ {
+ QPainter p (this);
+ if (m_scale != 1)
+ p.setTransform (QTransform ().scale (m_scale, m_scale));
+
+ draw (p);
+ }
+}

audacious-plugins-4.4.1.tar.bz2/src/skins-qt/widget.h Added

@@ -0,0 +1,83 @@
+/*
+ * widget.h
+ * Copyright 2015 John Lindgren
+ *
+ * This file is part of Audacious.
+ *
+ * Audacious 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, version 2 or version 3 of the License.
+ *
+ * Audacious 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
+ * Audacious. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The Audacious team does not consider modular code linking to Audacious or
+ * using our public API to be a derived work.
+ */
+
+#ifndef SKINS_WIDGET_H
+#define SKINS_WIDGET_H
+
+#include <QCloseEvent>
+#include <QKeyEvent>
+#include <QMouseEvent>
+#include <QPainter>
+#include <QWheelEvent>
+#include <QWidget>
+
+class Widget : public QWidget
+{
+public:
+ void queue_draw () { update (); }
+
+protected:
+ void add_input (int width, int height, bool track_motion, bool drawable);
+ void add_drawable (int width, int height);
+
+ void set_scale (int scale) { m_scale = scale; }
+ void resize (int w, int h) { QWidget::resize (w * m_scale, h * m_scale); }
+
+#ifdef Q_OS_MAC
+ /* repaint() causes graphical glitches on OS X
+ * https://github.com/audacious-media-player/audacious/issues/694 */
+ void draw_now () { update (); }
+#else
+ void draw_now () { repaint (); }
+#endif
+
+ virtual void draw (QPainter & cr) {}
+ virtual bool keypress (QKeyEvent * event) { return false; }
+ virtual bool button_press (QMouseEvent * event) { return false; }
+ virtual bool button_release (QMouseEvent * event) { return false; }
+ virtual bool scroll (QWheelEvent * event) { return false; }
+ virtual bool motion (QMouseEvent * event) { return false; }
+ virtual bool leave () { return false; }
+ virtual bool close () { return false; }
+
+private:
+ void paintEvent (QPaintEvent *);
+
+ void keyPressEvent (QKeyEvent * event)
+ { event->setAccepted (keypress (event)); }
+ void mousePressEvent (QMouseEvent * event)
+ { event->setAccepted (button_press (event)); }
+ void mouseReleaseEvent (QMouseEvent * event)
+ { event->setAccepted (button_release (event)); }
+ void wheelEvent (QWheelEvent * event)
+ { event->setAccepted (scroll (event)); }
+ void mouseMoveEvent (QMouseEvent * event)
+ { event->setAccepted (motion (event)); }
+ void leaveEvent (QEvent * event)
+ { event->setAccepted (leave ()); }
+ void closeEvent (QCloseEvent * event)
+ { event->setAccepted (close ()); }
+
+ bool m_drawable = false;
+ int m_scale = 1;
+};
+
+#endif // SKINS_WIDGET_H

audacious-plugins-4.4.1.tar.bz2/src/skins-qt/window.cc Added

@@ -0,0 +1,179 @@
+/*
+ * ui_skinned_window.c
+ * Copyright 2011 John Lindgren
+ *
+ * This file is part of Audacious.
+ *
+ * Audacious 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, version 2 or version 3 of the License.
+ *
+ * Audacious 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
+ * Audacious. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The Audacious team does not consider modular code linking to Audacious or
+ * using our public API to be a derived work.
+ */
+
+#include "window.h"
+#include "plugin.h"
+#include "skins_cfg.h"
+
+#include "../ui-common/qt-compat.h"
+
+void Window::apply_shape ()
+{
+ QRegion * mask = m_is_shaded ? m_sshape.get () : m_shape.get ();
+ if (mask)
+ setMask (* mask);
+ else
+ clearMask ();
+}
+
+bool Window::button_press (QMouseEvent * event)
+{
+ /* pass double clicks through; they are handled elsewhere */
+ if (event->button () != Qt::LeftButton || event->type () == QEvent::MouseButtonDblClick)
+ return false;
+
+ if (m_is_moving)
+ return true;
+
+ dock_move_start (m_id, QtCompat::globalX (event), QtCompat::globalY (event));
+ m_is_moving = true;
+ return true;
+}
+
+bool Window::button_release (QMouseEvent * event)
+{
+ if (event->button () != Qt::LeftButton)
+ return false;
+
+ m_is_moving = false;
+ return true;
+}
+
+bool Window::motion (QMouseEvent * event)
+{
+ if (! m_is_moving)
+ return true;
+
+ dock_move (QtCompat::globalX (event), QtCompat::globalY (event));
+ return true;
+}
+
+bool Window::close ()
+{
+ skins_close ();
+ return true;
+}
+
+void Window::changeEvent (QEvent * event)
+{
+ if (event->type () == QEvent::ActivationChange)
+ config.active_titlebar_any ? dock_draw_all () : Window::queue_draw ();
+
+ QWidget::changeEvent (event);
+}
+
+Window::~Window ()
+{
+ dock_remove_window (m_id);
+}
+
+Window::Window (int id, int * x, int * y, int w, int h, bool shaded) :
+ m_id (id),
+ m_is_shaded (shaded)
+{
+ if (id == WINDOW_MAIN)
+ // Qt::WindowMinimizeButtonHint is necessary on Windows
+ // to allow the window to be minimized via the taskbar
+ setWindowFlags (Qt::Window | Qt::FramelessWindowHint |
+ Qt::WindowMinimizeButtonHint);
+ else
+ setWindowFlags (Qt::Dialog | Qt::FramelessWindowHint);
+
+ move (* x, * y);
+
+ set_scale (config.scale);
+ add_input (w, h, true, true);
+
+ w *= config.scale;
+ h *= config.scale;
+ setFixedSize (w, h);
+
+ setAttribute (Qt::WA_NoSystemBackground);
+
+ m_normal = new QWidget (this);
+ m_normal->resize (w, h);
+ m_shaded = new QWidget (this);
+ m_shaded->resize (w, h);
+
+ if (shaded)
+ m_normal->hide ();
+ else
+ m_shaded->hide ();
+
+ dock_add_window (id, this, x, y, w, h);
+}
+
+void Window::resize (int w, int h)
+{
+ Widget::resize (w, h);
+
+ w *= config.scale;
+ h *= config.scale;
+ setFixedSize (w, h);
+
+ m_normal->resize (w, h);
+ m_shaded->resize (w, h);
+
+ dock_set_size (m_id, w, h);
+}
+
+void Window::set_shapes (QRegion * shape, QRegion * sshape)
+{
+ m_shape.capture (shape);
+ m_sshape.capture (sshape);
+ apply_shape ();
+}
+
+void Window::set_shaded (bool shaded)
+{
+ if (m_is_shaded == shaded)
+ return;
+
+ if (shaded)
+ {
+ m_normal->hide ();
+ m_shaded->show ();
+ }
+ else
+ {
+ m_shaded->hide ();
+ m_normal->show ();
+ }
+
+ m_is_shaded = shaded;
+ apply_shape ();
+}
+
+void Window::put_widget (bool shaded, Widget * widget, int x, int y)
+{
+ widget->setParent (shaded ? m_shaded : m_normal);
+ widget->move (x * config.scale, y * config.scale);
+}
+
+void Window::move_widget (bool shaded, Widget * widget, int x, int y)
+{
+ widget->move (x * config.scale, y * config.scale);
+}
+
+bool Window::is_focused ()
+{
+ return config.active_titlebar_any ? dock_is_focused () : isActiveWindow ();
+}

audacious-plugins-4.4.1.tar.bz2/src/skins-qt/window.h Added

@@ -0,0 +1,80 @@
+/*
+ * ui_skinned_window.h
+ * Copyright 2011 John Lindgren
+ *
+ * This file is part of Audacious.
+ *
+ * Audacious 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, version 2 or version 3 of the License.
+ *
+ * Audacious 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
+ * Audacious. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The Audacious team does not consider modular code linking to Audacious or
+ * using our public API to be a derived work.
+ */
+
+#ifndef SKINS_UI_SKINNED_WINDOW_H
+#define SKINS_UI_SKINNED_WINDOW_H
+
+#include "widget.h"
+
+#include <libaudcore/objects.h>
+
+enum {
+ WINDOW_MAIN,
+ WINDOW_EQ,
+ WINDOW_PLAYLIST,
+ N_WINDOWS
+};
+
+class Window : public Widget
+{
+public:
+ Window (int id, int * x, int * y, int w, int h, bool shaded);
+ ~Window ();
+
+ void resize (int w, int h);
+ void set_shapes (QRegion * shape, QRegion * sshape);
+ bool is_shaded () { return m_is_shaded; }
+ bool is_focused ();
+ void set_shaded (bool shaded);
+ void put_widget (bool shaded, Widget * widget, int x, int y);
+ void move_widget (bool shaded, Widget * widget, int x, int y);
+
+ void getPosition (int * xp, int * yp)
+ { * xp = x (); * yp = y (); }
+
+protected:
+ bool keypress (QKeyEvent * event);
+ bool button_press (QMouseEvent * event);
+ bool button_release (QMouseEvent * event);
+ bool motion (QMouseEvent * event);
+ bool close ();
+
+private:
+ void apply_shape ();
+ void changeEvent (QEvent * event);
+
+ const int m_id;
+ bool m_is_shaded = false;
+ bool m_is_moving = false;
+ QWidget * m_normal = nullptr, * m_shaded = nullptr;
+ SmartPtr<QRegion> m_shape, m_sshape;
+};
+
+void dock_add_window (int id, Window * window, int * x, int * y, int w, int h);
+void dock_remove_window (int id);
+void dock_set_size (int id, int w, int h);
+void dock_move_start (int id, int x, int y);
+void dock_move (int x, int y);
+void dock_change_scale (int old_scale, int new_scale);
+void dock_draw_all ();
+bool dock_is_focused ();
+
+#endif

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/Makefile -> audacious-plugins-4.4.1.tar.bz2/src/skins/Makefile Changed

@@ -1,163 +1,43 @@
 PLUGIN = skins${PLUGIN_SUFFIX}
 
-SRCS = drag-handle.cc \
+SRCS = actions.cc \
+       button.cc \
+       dock.cc \
+       drag-handle.cc \
+       eq-graph.cc \
+       eq-slider.cc \
+       equalizer.cc \
+       hslider.cc \
+       main.cc \
+       menu-ops.cc \
+       menurow.cc \
        menus.cc \
+       monostereo.cc \
+       number.cc \
+       playlistwin.cc \
+       playlist-slider.cc \
+       playlist-widget.cc \
+       playstatus.cc \
        plugin.cc \
        plugin-window.cc \
-       preset-browser.cc \
-       preset-list.cc \
+       search-select.cc \
+       skin.cc \
+       skin-ini.cc \
        skins_cfg.cc \
+       skins_util.cc \
+       skinselector.cc \
        surface.cc \
-       ui_skin.cc \
-       ui_skin_load_ini.cc \
-       ui_skinned_window.cc \
-       ui_dock.cc \
-       util.cc \
-       ui_vis.cc \
-       ui_svis.cc \
-       ui_skinned_menurow.cc \
-       ui_skinned_button.cc \
-       ui_skinned_textbox.cc \
-       ui_skinned_playstatus.cc \
-       ui_skinned_monostereo.cc \
-       ui_skinned_number.cc \
-       ui_skinned_horizontal_slider.cc \
-       ui_skinned_equalizer_graph.cc \
-       ui_skinned_equalizer_slider.cc \
-       ui_skinned_playlist.cc \
-       ui_skinned_playlist_slider.cc \
-       ui_main.cc \
-       ui_equalizer.cc \
-       ui_playlist.cc \
-       ui_main_evlisteners.cc \
-       ui_skinselector.cc \
-       view.cc
+       svis.cc \
+       textbox.cc \
+       view.cc \
+       vis-callbacks.cc \
+       vis.cc \
+       widget.cc \
+       window.cc
 
 include ../../buildsys.mk
 include ../../extra.mk
 
-# These overrides variables in buildsys.mk and so must come after it.
-PACKAGE_NAME = audacious
-DATA = Skins/Classic/balance.png	\
-       Skins/Classic/cbuttons.png	\
-       Skins/Classic/eq_ex.png		\
-       Skins/Classic/eqmain.png		\
-       Skins/Classic/main.png		\
-       Skins/Classic/monoster.png	\
-       Skins/Classic/nums_ex.png	\
-       Skins/Classic/playpaus.png	\
-       Skins/Classic/pledit.png		\
-       Skins/Classic/pledit.txt		\
-       Skins/Classic/posbar.png		\
-       Skins/Classic/shufrep.png	\
-       Skins/Classic/skin-classic.hints	\
-       Skins/Classic/skin.hints		\
-       Skins/Classic/text.png		\
-       Skins/Classic/titlebar.png	\
-       Skins/Classic/viscolor.txt	\
-       Skins/Classic/volume.png		\
-       Skins/Classic1.3/balance.png	\
-       Skins/Classic1.3/cbuttons.png	\
-       Skins/Classic1.3/eq_ex.png		\
-       Skins/Classic1.3/eqmain.png		\
-       Skins/Classic1.3/main.png		\
-       Skins/Classic1.3/monoster.png	\
-       Skins/Classic1.3/nums_ex.png	\
-       Skins/Classic1.3/playpaus.png	\
-       Skins/Classic1.3/pledit.png		\
-       Skins/Classic1.3/pledit.txt		\
-       Skins/Classic1.3/posbar.png		\
-       Skins/Classic1.3/shufrep.png	\
-       Skins/Classic1.3/skin-classic.hints	\
-       Skins/Classic1.3/skin.hints		\
-       Skins/Classic1.3/text.png		\
-       Skins/Classic1.3/titlebar.png	\
-       Skins/Classic1.3/viscolor.txt	\
-       Skins/Classic1.3/volume.png		\
-       Skins/Default/cbuttons.png	\
-       Skins/Default/eq_ex.png		\
-       Skins/Default/eqmain.png		\
-       Skins/Default/main.png		\
-       Skins/Default/monoster.png	\
-       Skins/Default/nums_ex.png	\
-       Skins/Default/playpaus.png	\
-       Skins/Default/pledit.png		\
-       Skins/Default/pledit.txt		\
-       Skins/Default/posbar.png		\
-       Skins/Default/shufrep.png	\
-       Skins/Default/skin.hints		\
-       Skins/Default/text.png		\
-       Skins/Default/titlebar.png	\
-       Skins/Default/viscolor.txt	\
-       Skins/Default/volume.png		\
-       Skins/Ivory/balance.png		\
-       Skins/Ivory/cbuttons.png		\
-       Skins/Ivory/eq_ex.png		\
-       Skins/Ivory/eqmain.png		\
-       Skins/Ivory/main.png		\
-       Skins/Ivory/monoster.png		\
-       Skins/Ivory/nums_ex.png		\
-       Skins/Ivory/playpaus.png		\
-       Skins/Ivory/pledit.png		\
-       Skins/Ivory/pledit.txt		\
-       Skins/Ivory/posbar.png		\
-       Skins/Ivory/shufrep.png		\
-       Skins/Ivory/skin.hints		\
-       Skins/Ivory/text.png		\
-       Skins/Ivory/titlebar.png		\
-       Skins/Ivory/viscolor.txt		\
-       Skins/Ivory/volume.png		\
-       Skins/Osmosis/balance.png	\
-       Skins/Osmosis/cbuttons.png	\
-       Skins/Osmosis/eq_ex.png		\
-       Skins/Osmosis/eqmain.png		\
-       Skins/Osmosis/main.png		\
-       Skins/Osmosis/monoster.png	\
-       Skins/Osmosis/nums_ex.png	\
-       Skins/Osmosis/playpaus.png	\
-       Skins/Osmosis/pledit.png		\
-       Skins/Osmosis/pledit.txt		\
-       Skins/Osmosis/posbar.png		\
-       Skins/Osmosis/shufrep.png	\
-       Skins/Osmosis/skin.hints		\
-       Skins/Osmosis/text.png		\
-       Skins/Osmosis/titlebar.png	\
-       Skins/Osmosis/viscolor.txt	\
-       Skins/Osmosis/volume.png		\
-       Skins/TinyPlayer/balance.png	\
-       Skins/TinyPlayer/cbuttons.png	\
-       Skins/TinyPlayer/eq_ex.png	\
-       Skins/TinyPlayer/eqmain.png	\
-       Skins/TinyPlayer/main.png	\
-       Skins/TinyPlayer/monoster.png	\
-       Skins/TinyPlayer/nums_ex.png	\
-       Skins/TinyPlayer/playpaus.png	\
-       Skins/TinyPlayer/pledit.png	\
-       Skins/TinyPlayer/pledit.txt	\
-       Skins/TinyPlayer/posbar.png	\
-       Skins/TinyPlayer/shufrep.png	\
-       Skins/TinyPlayer/skin.hints	\
-       Skins/TinyPlayer/text.png	\
-       Skins/TinyPlayer/titlebar.png	\
-       Skins/TinyPlayer/viscolor.txt	\
-       Skins/TinyPlayer/volume.png	\
-       Skins/Refugee/cbuttons.png	\
-       Skins/Refugee/eq_ex.png		\
-       Skins/Refugee/eqmain.png		\
-       Skins/Refugee/main.png		\
-       Skins/Refugee/monoster.png	\
-       Skins/Refugee/nums_ex.png	\
-       Skins/Refugee/playpaus.png	\
-       Skins/Refugee/pledit.png		\
-       Skins/Refugee/pledit.txt		\
-       Skins/Refugee/posbar.png		\
-       Skins/Refugee/shufrep.png	\
-       Skins/Refugee/skin.hints		\
-       Skins/Refugee/text.png		\
-       Skins/Refugee/titlebar.png	\
-       Skins/Refugee/viscolor.txt	\
-       Skins/Refugee/volume.png
-
 plugindir := ${plugindir}/${GENERAL_PLUGIN_DIR}
 
 LD = ${CXX}

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/actions-mainwin.h -> audacious-plugins-4.4.1.tar.bz2/src/skins/actions-mainwin.h Changed

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/actions-playlist.h -> audacious-plugins-4.4.1.tar.bz2/src/skins/actions-playlist.h Changed

@@ -20,64 +20,12 @@
 #ifndef SKINS_ACTIONS_PLAYLIST_H
 #define SKINS_ACTIONS_PLAYLIST_H
 
-void action_playlist_refresh_list(void);
+void action_playlist_rename ();
+void action_playlist_delete ();
 
-void action_playlist_play(void);
-void action_playlist_new(void);
-void action_playlist_prev(void);
-void action_playlist_next(void);
-void action_playlist_rename(void);
-void action_playlist_delete(void);
+void action_playlist_search_and_select ();
 
-void action_playlist_search_and_select(void);
-void action_playlist_invert_selection(void);
-void action_playlist_select_all(void);
-void action_playlist_select_none(void);
-
-void action_playlist_clear_queue(void);
-void action_playlist_remove_unavailable(void);
-void action_playlist_remove_dupes_by_title(void);
-void action_playlist_remove_dupes_by_filename(void);
-void action_playlist_remove_dupes_by_full_path(void);
-void action_playlist_remove_all(void);
-void action_playlist_remove_selected(void);
-void action_playlist_remove_unselected(void);
-
-void action_playlist_copy (void);
-void action_playlist_cut (void);
-void action_playlist_paste (void);
-
-void action_playlist_add_url(void);
-void action_playlist_add_files(void);
-
-void action_playlist_randomize_list(void);
-void action_playlist_reverse_list(void);
-
-void action_playlist_sort_by_title(void);
-void action_playlist_sort_by_album(void);
-void action_playlist_sort_by_artist(void);
-void action_playlist_sort_by_album_artist(void);
-void action_playlist_sort_by_length(void);
-void action_playlist_sort_by_genre(void);
-void action_playlist_sort_by_filename(void);
-void action_playlist_sort_by_full_path(void);
-void action_playlist_sort_by_date(void);
-void action_playlist_sort_by_track_number(void);
-void action_playlist_sort_by_custom_title(void);
-
-void action_playlist_sort_selected_by_title(void);
-void action_playlist_sort_selected_by_album(void);
-void action_playlist_sort_selected_by_artist(void);
-void action_playlist_sort_selected_by_album_artist(void);
-void action_playlist_sort_selected_by_length(void);
-void action_playlist_sort_selected_by_genre(void);
-void action_playlist_sort_selected_by_filename(void);
-void action_playlist_sort_selected_by_full_path(void);
-void action_playlist_sort_selected_by_date(void);
-void action_playlist_sort_selected_by_track_number(void);
-void action_playlist_sort_selected_by_custom_title(void);
-
-void action_playlist_track_info(void);
-void action_queue_toggle(void);
+void action_playlist_add_url ();
+void action_playlist_add_files ();
 
 #endif /* SKINS_ACTIONS_PLAYLIST_H */

audacious-plugins-4.4.1.tar.bz2/src/skins/actions.cc Added

@@ -0,0 +1,105 @@
+/* Audacious - Cross-platform multimedia player
+ * Copyright (C) 2005-2011 Audacious development team.
+ *
+ * BMP - Cross-platform multimedia player
+ * Copyright (C) 2003-2004 BMP development team.
+ *
+ * Based on XMMS:
+ * Copyright (C) 1998-2003 XMMS development team.
+ *
+ * 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; under version 3 of the License.
+ *
+ * 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>.
+ *
+ * The Audacious team does not consider modular code linking to
+ * Audacious or using our public API to be a derived work.
+ */
+
+#include "actions-mainwin.h"
+#include "actions-playlist.h"
+#include "main.h"
+#include "plugin-window.h"
+
+#include "../ui-common/menu-ops.h"
+
+#include <gtk/gtk.h>
+
+#include <libaudcore/drct.h>
+#include <libaudcore/i18n.h>
+#include <libaudcore/playlist.h>
+#include <libaudcore/plugins.h>
+#include <libaudgui/libaudgui.h>
+
+#define ACTIVE (Playlist::active_playlist ())
+
+void action_ab_clear ()
+{
+ mainwin_show_status_message (_("Repeat points cleared."));
+ aud_drct_set_ab_repeat (-1, -1);
+}
+
+void action_ab_set ()
+{
+ if (aud_drct_get_length () > 0)
+ {
+ int a, b;
+ aud_drct_get_ab_repeat (a, b);
+
+ if (a < 0 || b >= 0)
+ {
+ a = aud_drct_get_time ();
+ b = -1;
+ mainwin_show_status_message (_("Repeat point A set."));
+ }
+ else
+ {
+ b = aud_drct_get_time ();
+ mainwin_show_status_message (_("Repeat point B set."));
+ }
+
+ aud_drct_set_ab_repeat (a, b);
+ }
+}
+
+void action_play_file ()
+ { audgui_run_filebrowser (true); }
+void action_play_location ()
+ { audgui_show_add_url_window (true); }
+
+void action_playlist_manager ()
+{
+ PluginHandle * manager = aud_plugin_lookup_basename ("playlist-manager");
+ if (manager)
+ {
+ aud_plugin_enable (manager, true);
+ focus_plugin_window (manager);
+ }
+}
+
+void action_search_tool ()
+{
+ PluginHandle * search = aud_plugin_lookup_basename ("search-tool");
+ if (search)
+ {
+ aud_plugin_enable (search, true);
+ focus_plugin_window (search);
+ }
+}
+
+void action_playlist_rename ()
+ { audgui_show_playlist_rename (ACTIVE); }
+void action_playlist_delete ()
+ { audgui_confirm_playlist_delete (ACTIVE); }
+
+void action_playlist_add_url ()
+ { audgui_show_add_url_window (false); }
+void action_playlist_add_files ()
+ { audgui_run_filebrowser (false); }

audacious-plugins-4.4.1.tar.bz2/src/skins/button.cc Added

@@ -0,0 +1,132 @@
+/*
+ * Audacious - a cross-platform multimedia player
+ * Copyright (c) 2007 Tomasz Moń
+ * Copyright (c) 2011 John Lindgren
+ *
+ * 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; under version 3 of the License.
+ *
+ * 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>.
+ *
+ * The Audacious team does not consider modular code linking to
+ * Audacious or using our public API to be a derived work.
+ */
+
+#include "skins_cfg.h"
+#include "button.h"
+
+void Button::draw (cairo_t * cr)
+{
+ switch (m_type)
+ {
+ case Normal:
+ if (m_pressed)
+ skin_draw_pixbuf (cr, m_si2, m_px, m_py, 0, 0, m_w, m_h);
+ else
+ skin_draw_pixbuf (cr, m_si1, m_nx, m_ny, 0, 0, m_w, m_h);
+ break;
+ case Toggle:
+ if (m_active)
+ {
+ if (m_pressed)
+ skin_draw_pixbuf (cr, m_si2, m_ppx, m_ppy, 0, 0, m_w, m_h);
+ else
+ skin_draw_pixbuf (cr, m_si1, m_pnx, m_pny, 0, 0, m_w, m_h);
+ }
+ else
+ {
+ if (m_pressed)
+ skin_draw_pixbuf (cr, m_si2, m_px, m_py, 0, 0, m_w, m_h);
+ else
+ skin_draw_pixbuf (cr, m_si1, m_nx, m_ny, 0, 0, m_w, m_h);
+ }
+ break;
+ case Small:
+ break;
+ }
+}
+
+bool Button::button_press (GdkEventButton * event)
+{
+ /* pass events through to the parent widget only if neither the press nor
+ * release signals are connected; sending one and not the other causes
+ * problems (in particular with dragging windows around) */
+ if (event->button == 1 && (press || release))
+ {
+ m_pressed = true;
+ if (press)
+ press (this, event);
+ }
+ else if (event->button == 3 && (rpress || rrelease))
+ {
+ m_rpressed = true;
+ if (rpress)
+ rpress (this, event);
+ }
+ else
+ return false;
+
+ if (m_type != Small)
+ queue_draw ();
+
+ return true;
+}
+
+bool Button::button_release (GdkEventButton * event)
+{
+ if (event->button == 1 && (press || release))
+ {
+ if (! m_pressed)
+ return true;
+
+ m_pressed = false;
+ if (m_type == Toggle)
+ m_active = ! m_active;
+ if (release)
+ release (this, event);
+ }
+ else if (event->button == 3 && (rpress || rrelease))
+ {
+ if (! m_rpressed)
+ return true;
+
+ m_rpressed = false;
+ if (rrelease)
+ rrelease (this, event);
+ }
+ else
+ return false;
+
+ if (m_type != Small)
+ queue_draw ();
+
+ return true;
+}
+
+Button::Button (Type type, int w, int h, int nx, int ny, int px, int py,
+ int pnx, int pny, int ppx, int ppy, SkinPixmapId si1, SkinPixmapId si2) :
+ m_type (type),
+ m_w (w), m_h (h),
+ m_nx (nx), m_ny (ny), m_px (px), m_py (py),
+ m_pnx (pnx), m_pny (pny), m_ppx (ppx), m_ppy (ppy),
+ m_si1 (si1), m_si2 (si2)
+{
+ set_scale (config.scale);
+ add_input (w, h, false, type != Small);
+}
+
+void Button::set_active (bool active)
+{
+ if (m_active != active)
+ {
+ m_active = active;
+ queue_draw ();
+ }
+}

audacious-plugins-4.4.1.tar.bz2/src/skins/button.h Added

@@ -0,0 +1,78 @@
+/*
+ * Audacious - a cross-platform multimedia player
+ * Copyright (c) 2007 Tomasz Moń
+ * Copyright (c) 2011 John Lindgren
+ *
+ * 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; under version 3 of the License.
+ *
+ * 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>.
+ *
+ * The Audacious team does not consider modular code linking to
+ * Audacious or using our public API to be a derived work.
+ */
+
+#ifndef SKINS_UI_SKINNED_BUTTON_H
+#define SKINS_UI_SKINNED_BUTTON_H
+
+#include "widget.h"
+#include "skin.h"
+
+class Button;
+
+typedef void (* ButtonCB) (Button * button, GdkEventButton * event);
+
+class Button : public Widget
+{
+public:
+ // transparent button
+ Button (int w, int h) :
+ Button (Small, w, h, 0, 0, 0, 0, 0, 0, 0, 0, SKIN_MAIN, SKIN_MAIN) {}
+
+ // basic skinned button
+ Button (int w, int h, int nx, int ny, int px, int py, SkinPixmapId si1, SkinPixmapId si2) :
+ Button (Normal, w, h, nx, ny, px, py, 0, 0, 0, 0, si1, si2) {}
+
+ // skinned toggle button
+ Button (int w, int h, int nx, int ny, int px, int py, int pnx, int pny,
+ int ppx, int ppy, SkinPixmapId si1, SkinPixmapId si2) :
+ Button (Toggle, w, h, nx, ny, px, py, pnx, pny, ppx, ppy, si1, si2) {}
+
+ void on_press (ButtonCB callback) { press = callback; }
+ void on_release (ButtonCB callback) { release = callback; }
+ void on_rpress (ButtonCB callback) { rpress = callback; }
+ void on_rrelease (ButtonCB callback) { rrelease = callback; }
+
+ bool get_active () { return m_active; }
+ void set_active (bool active);
+
+private:
+ enum Type {Normal, Toggle, Small};
+
+ Button (Type type, int w, int h, int nx, int ny, int px, int py, int pnx,
+ int pny, int ppx, int ppy, SkinPixmapId si1, SkinPixmapId si2);
+
+ void draw (cairo_t * cr);
+ bool button_press (GdkEventButton * event);
+ bool button_release (GdkEventButton * event);
+
+ Type m_type;
+ int m_w, m_h;
+ int m_nx, m_ny, m_px, m_py;
+ int m_pnx, m_pny, m_ppx, m_ppy;
+ SkinPixmapId m_si1, m_si2;
+
+ bool m_pressed = false, m_rpressed = false, m_active = false;
+
+ ButtonCB press = nullptr, release = nullptr;
+ ButtonCB rpress = nullptr, rrelease = nullptr;
+};
+
+#endif

audacious-plugins-4.4.1.tar.bz2/src/skins/dock.cc Added

@@ -0,0 +1,385 @@
+/*
+ * ui_dock.c
+ * Copyright 2011 John Lindgren
+ *
+ * This file is part of Audacious.
+ *
+ * Audacious 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, version 2 or version 3 of the License.
+ *
+ * Audacious 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
+ * Audacious. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The Audacious team does not consider modular code linking to Audacious or
+ * using our public API to be a derived work.
+ */
+
+/*
+ * Rough outline
+ * =============
+ *
+ * When moving a window:
+ * 1. If this is the main window, find (recursively) the windows docked to it.
+ * 2. Adjust the offsets to snap to another window (not docked) or a screen edge.
+ * 3. Move the docked windows by the same offsets.
+ *
+ * When resizing a window:
+ * 1. Find (recursively) the windows docked to the bottom edge of this one.
+ * If we are making the window shorter, exclude windows that are docked to
+ * the bottom of another window (not docked) to avoid overlap.
+ * 2. Move the docked windows by the difference in window height.
+ * 3. Repeat the process for windows docked to the right edge of this one.
+ */
+
+#include <stdlib.h>
+
+#include "window.h"
+
+#define SNAP_DISTANCE 10
+
+enum {
+ DOCK_TYPE_LEFT = 1 << 0,
+ DOCK_TYPE_RIGHT = 1 << 1,
+ DOCK_TYPE_TOP = 1 << 2,
+ DOCK_TYPE_BOTTOM = 1 << 3
+};
+
+#define DOCK_TYPE_ANY (DOCK_TYPE_LEFT | DOCK_TYPE_RIGHT | DOCK_TYPE_TOP | DOCK_TYPE_BOTTOM)
+
+typedef struct {
+ Window * window;
+ int * x, * y;
+ int w, h;
+ bool docked;
+} DockWindow;
+
+static DockWindow windowsN_WINDOWS;
+static int last_x, last_y;
+
+static inline int least_abs (int a, int b)
+{
+ return (abs (a) < abs (b)) ? a : b;
+}
+
+void dock_add_window (int id, Window * window, int * x, int * y, int w, int h)
+{
+ DockWindow & dw = windowsid;
+
+ dw.window = window;
+ dw.x = x;
+ dw.y = y;
+ dw.w = w;
+ dw.h = h;
+}
+
+void dock_remove_window (int id)
+{
+ windowsid.window = nullptr;
+}
+
+static void dock_sync ()
+{
+ for (DockWindow & dw : windows)
+ {
+ if (dw.window)
+ dw.window->getPosition (dw.x, dw.y);
+ }
+}
+
+static void clear_docked ()
+{
+ for (DockWindow & dw : windows)
+ dw.docked = false;
+}
+
+static bool is_docked (DockWindow & dw, DockWindow & base, int type)
+{
+ return ((type & DOCK_TYPE_LEFT) && * dw.x + dw.w == * base.x) ||
+ ((type & DOCK_TYPE_RIGHT) && * dw.x == * base.x + base.w) ||
+ ((type & DOCK_TYPE_TOP) && * dw.y + dw.h == * base.y) ||
+ ((type & DOCK_TYPE_BOTTOM) && * dw.y == * base.y + base.h);
+}
+
+static void find_docked (DockWindow & base, int type)
+{
+ for (DockWindow & dw : windows)
+ {
+ if (dw.docked || & dw == & base)
+ continue;
+
+ dw.docked = is_docked (dw, base, type);
+ if (dw.docked)
+ find_docked (dw, type);
+ }
+}
+
+static void invert_docked ()
+{
+ for (DockWindow & dw : windows)
+ dw.docked = ! dw.docked;
+}
+
+void dock_set_size (int id, int w, int h)
+{
+ DockWindow & base = windowsid;
+
+ dock_sync ();
+
+ if (h != base.h)
+ {
+ /* 1. Find the windows docked below this one. */
+
+ clear_docked ();
+ find_docked (base, DOCK_TYPE_BOTTOM);
+
+ if (h < base.h)
+ {
+ /* 2. This part is tricky. By flipping the docked flag on all the
+ windows, we consider the windows not docked to this one as a
+ docked group. We then add (recursively) any other windows
+ docked to these ones (i.e. the windows docked to these *and*
+ to the one being shortened). The one being shortened must be
+ excluded from the search. Since at this point it is marked as
+ docked, it is excluded automatically. Finally, flipping the
+ docked flag back again leaves us with only the windows docked
+ to the one being shortened and not to any others. */
+
+ invert_docked ();
+
+ for (DockWindow & dw : windows)
+ {
+ if (! dw.docked || & dw == & base)
+ continue;
+
+ find_docked (dw, DOCK_TYPE_BOTTOM);
+ }
+
+ invert_docked ();
+ }
+
+ /* 3. Move the docked windows by the difference in height. */
+
+ for (DockWindow & dw : windows)
+ {
+ if (! dw.docked)
+ continue;
+
+ * dw.y += h - base.h;
+ if (dw.window)
+ dw.window->move (* dw.x, * dw.y);
+ }
+ }
+
+ if (w != base.w)
+ {
+ /* 4. Repeat the process for the windows docked to the right. */
+
+ clear_docked ();
+ find_docked (base, DOCK_TYPE_RIGHT);
+
+ if (w < base.w)
+ {
+ invert_docked ();
+
+ for (DockWindow & dw : windows)
+ {
+ if (! dw.docked || & dw == & base)
+ continue;
+
+ find_docked (dw, DOCK_TYPE_RIGHT);
+ }
+
+ invert_docked ();
+ }
+
+ for (DockWindow & dw : windows)
+ {
+ if (! dw.docked)
+ continue;
+
+ * dw.x += w - base.w;
+ if (dw.window)
+ dw.window->move (* dw.x, * dw.y);
+ }
+ }
+
+ /* 5. Set the window size. (The actual resize is done by the caller.) */
+
+ base.w = w;
+ base.h = h;
+}
+
+void dock_move_start (int id, int x, int y)
+{
+ DockWindow & dw = windowsid;
+
+ dock_sync ();
+
+ last_x = x;
+ last_y = y;
+
+ /* 1. If this is the main window, find the windows docked to it. */
+
+ clear_docked ();
+ dw.docked = true;
+ if (id == WINDOW_MAIN)
+ find_docked (dw, DOCK_TYPE_ANY);
+}
+
+void dock_move (int x, int y)
+{
+ int hori, vert;
+
+ if (x == last_x && y == last_y)
+ return;
+
+ /* 2. Nominally move all the windows in the group the requested distance,
+ and update the reference point. */
+
+ hori = x - last_x;
+ vert = y - last_y;
+
+ for (DockWindow & dw : windows)
+ {
+ if (! dw.docked)
+ continue;
+
+ * dw.x += hori;
+ * dw.y += vert;
+ }
+
+ last_x = x;
+ last_y = y;
+
+
+ /* 3. Find the least snap distance we must move so that
+ (a) a window in the group is touching a screen edge or
+ (b) a window in the group is touching a window not in the group. */
+
+ hori = SNAP_DISTANCE + 1;
+ vert = SNAP_DISTANCE + 1;
+
+#if GTK_CHECK_VERSION(3, 22, 0)
+ GdkDisplay * display = gdk_display_get_default ();
+ int monitors = gdk_display_get_n_monitors (display);
+#else
+ GdkScreen * screen = gdk_screen_get_default ();
+ int monitors = gdk_screen_get_n_monitors (screen);
+#endif
+
+ for (int m = 0; m < monitors; m ++)
+ {
+ GdkRectangle rect;
+
+#if GTK_CHECK_VERSION(3, 22, 0)
+ gdk_monitor_get_geometry (gdk_display_get_monitor (display, m), & rect);
+#else
+ gdk_screen_get_monitor_geometry (screen, m, & rect);
+#endif
+ for (DockWindow & dw : windows)
+ {
+ if (! dw.docked)
+ continue;
+
+ /* We only test half the combinations here, as it is not very
+ helpful to have e.g. the right edge of a window touching the left
+ edge of a monitor (think about it). */
+
+ hori = least_abs (hori, rect.x - * dw.x);
+ hori = least_abs (hori, (rect.x + rect.width) - (* dw.x + dw.w));
+ vert = least_abs (vert, rect.y - * dw.y);
+ vert = least_abs (vert, (rect.y + rect.height) - (* dw.y + dw.h));
+ }
+ }
+
+ for (DockWindow & dw : windows)
+ {
+ if (! dw.docked)
+ continue;
+
+ for (DockWindow & dw2 : windows)
+ {
+ if (dw2.docked)
+ continue;
+
+ hori = least_abs (hori, * dw2.x - * dw.x);
+ hori = least_abs (hori, * dw2.x - (* dw.x + dw.w));
+ hori = least_abs (hori, (* dw2.x + dw2.w) - * dw.x);
+ hori = least_abs (hori, (* dw2.x + dw2.w) - (* dw.x + dw.w));
+ vert = least_abs (vert, * dw2.y - * dw.y);
+ vert = least_abs (vert, * dw2.y - (* dw.y + dw.h));
+ vert = least_abs (vert, (* dw2.y + dw2.h) - * dw.y);
+ vert = least_abs (vert, (* dw2.y + dw2.h) - (* dw.y + dw.h));
+ }
+ }
+
+ /* 4. If the snap distances are within range, nominally move all the windows
+ in the group, and update the reference point again. */
+
+ if (abs (hori) > SNAP_DISTANCE)
+ hori = 0;
+ if (abs (vert) > SNAP_DISTANCE)
+ vert = 0;
+
+ for (DockWindow & dw : windows)
+ {
+ if (! dw.docked)
+ continue;
+
+ * dw.x += hori;
+ * dw.y += vert;
+ }
+
+ last_x += hori;
+ last_y += vert;
+
+ /* 5. Really move the windows. */
+
+ for (DockWindow & dw : windows)
+ {
+ if (dw.docked && dw.window)
+ dw.window->move (* dw.x, * dw.y);
+ }
+}
+
+void dock_change_scale (int old_scale, int new_scale)
+{
+ DockWindow & main = windowsWINDOW_MAIN;
+
+ for (DockWindow & dw : windows)
+ {
+ dw.w = dw.w * new_scale / old_scale;
+ dw.h = dw.h * new_scale / old_scale;
+
+ if (& dw != & main)
+ {
+ * dw.x = * main.x + (* dw.x - * main.x) * new_scale / old_scale;
+ * dw.y = * main.y + (* dw.y - * main.y) * new_scale / old_scale;
+ }
+ }
+}
+
+void dock_draw_all ()
+{
+ for (DockWindow & dw : windows)
+ {
+ if (dw.window)
+ dw.window->queue_draw ();
+ }
+}
+
+bool dock_is_focused ()
+{
+ for (DockWindow & dw : windows)
+ {
+ if (dw.window && dw.window->is_focused_window ())
+ return true;
+ }
+
+ return false;
+}

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/drag-handle.cc -> audacious-plugins-4.4.1.tar.bz2/src/skins/drag-handle.cc Changed

@@ -22,85 +22,45 @@
 #include "drag-handle.h"
 #include "skins_cfg.h"
 
-typedef struct {
-    gboolean held;
-    int x_origin, y_origin;
-    void (* press) (void);
-    void (* drag) (int x_offset, int y_offset);
-} DHandleData;
-
-static gboolean handle_button_press (GtkWidget * handle, GdkEventButton * event)
+bool DragHandle::button_press (GdkEventButton * event)
 {
-    DHandleData * data = (DHandleData *) g_object_get_data ((GObject *) handle, "dhandledata");
-    g_return_val_if_fail (data, FALSE);
-
     if (event->button != 1)
-        return FALSE;
+        return false;
 
-    data->held = TRUE;
-    data->x_origin = event->x_root;
-    data->y_origin = event->y_root;
+    m_held = true;
+    m_x_origin = event->x_root;
+    m_y_origin = event->y_root;
 
-    if (data->press)
-        data->press ();
+    if (press)
+        press ();
 
-    return TRUE;
+    return true;
 }
 
-static gboolean handle_button_release (GtkWidget * handle, GdkEventButton *
- event)
+bool DragHandle::button_release (GdkEventButton * event)
 {
-    DHandleData * data = (DHandleData *) g_object_get_data ((GObject *) handle, "dhandledata");
-    g_return_val_if_fail (data, FALSE);
-
     if (event->button != 1)
-        return FALSE;
+        return false;
 
-    data->held = FALSE;
-    return TRUE;
+    m_held = false;
+    return true;
 }
 
-static gboolean handle_motion (GtkWidget * handle, GdkEventMotion * event)
+bool DragHandle::motion (GdkEventMotion * event)
 {
-    DHandleData * data = (DHandleData *) g_object_get_data ((GObject *) handle, "dhandledata");
-    g_return_val_if_fail (data, FALSE);
-
-    if (! data->held)
-        return TRUE;
-
-    if (data->drag)
-        data->drag ((event->x_root - data->x_origin) / config.scale,
-         (event->y_root - data->y_origin) / config.scale);
+    if (! m_held)
+        return true;
 
-    return TRUE;
-}
+    if (drag)
+        drag ((event->x_root - m_x_origin) / config.scale,
+         (event->y_root - m_y_origin) / config.scale);
 
-static void handle_destroy (GtkWidget * handle)
-{
-    g_free (g_object_get_data ((GObject *) handle, "dhandledata"));
+    return true;
 }
 
-GtkWidget * drag_handle_new (int w, int h, void (* press) (void), void
- (* drag) (int x, int y))
+DragHandle::DragHandle (int w, int h, void (* press) (), void (* drag) (int x, int y)) :
+    press (press), drag (drag)
 {
-    GtkWidget * handle = gtk_event_box_new ();
-    gtk_event_box_set_visible_window ((GtkEventBox *) handle, FALSE);
-    gtk_widget_set_size_request (handle, w * config.scale, h * config.scale);
-    gtk_widget_add_events (handle, GDK_BUTTON_PRESS_MASK |
-     GDK_BUTTON_RELEASE_MASK | GDK_POINTER_MOTION_MASK);
-
-    g_signal_connect (handle, "button-press-event", (GCallback)
-     handle_button_press, nullptr);
-    g_signal_connect (handle, "button-release-event", (GCallback)
-     handle_button_release, nullptr);
-    g_signal_connect (handle, "motion-notify-event", (GCallback) handle_motion,
-     nullptr);
-    g_signal_connect (handle, "destroy", (GCallback) handle_destroy, nullptr);
-
-    DHandleData * data = g_new0 (DHandleData, 1);
-    data->press = press;
-    data->drag = drag;
-    g_object_set_data ((GObject *) handle, "dhandledata", data);
-
-    return handle;
+    set_scale (config.scale);
+    add_input (w, h, true, false);
 }

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/drag-handle.h -> audacious-plugins-4.4.1.tar.bz2/src/skins/drag-handle.h Changed

audacious-plugins-4.4.1.tar.bz2/src/skins/eq-graph.cc Added

@@ -0,0 +1,139 @@
+/*
+ * Audacious - a cross-platform multimedia player
+ * Copyright (c) 2007 Tomasz Moń
+ * Copyright (c) 2011 John Lindgren
+ *
+ * Based on:
+ * BMP - Cross-platform multimedia player
+ * Copyright (C) 2003-2004 BMP development team.
+ * XMMS:
+ * Copyright (C) 1998-2003 XMMS development team.
+ *
+ * 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; under version 3 of the License.
+ *
+ * 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>.
+ */
+
+#include <libaudcore/equalizer.h>
+#include <libaudcore/runtime.h>
+
+#include "skins_cfg.h"
+#include "skin.h"
+#include "eq-graph.h"
+
+#define N 10
+static_assert (N == AUD_EQ_NBANDS, "only a 10-band EQ is supported");
+
+static void init_spline (const double * x, const double * y, double * y2)
+{
+ int k;
+ double p, qn, sig, un;
+ double uN;
+
+ y20 = u0 = 0.0;
+
+ for (int i = 1; i < N - 1; i ++)
+ {
+ sig = ((double) xi - xi - 1) / ((double) xi + 1 - xi - 1);
+ p = sig * y2i - 1 + 2.0;
+ y2i = (sig - 1.0) / p;
+ ui =
+ (((double) yi + 1 - yi) / (xi + 1 - xi)) -
+ (((double) yi - yi - 1) / (xi - xi - 1));
+ ui = (6.0 * ui / (xi + 1 - xi - 1) - sig * ui - 1) / p;
+ }
+ qn = un = 0.0;
+
+ y2N - 1 = (un - qn * uN - 2) / (qn * y2N - 2 + 1.0);
+ for (k = N - 2; k >= 0; k --)
+ y2k = y2k * y2k + 1 + uk;
+}
+
+static double eval_spline (const double * xa, const double * ya, const double * y2a, double x)
+{
+ int klo, khi, k;
+ double h, b, a;
+
+ klo = 0;
+ khi = N - 1;
+ while (khi - klo > 1)
+ {
+ k = (khi + klo) >> 1;
+ if (xak > x)
+ khi = k;
+ else
+ klo = k;
+ }
+ h = xakhi - xaklo;
+ a = (xakhi - x) / h;
+ b = (x - xaklo) / h;
+ return (a * yaklo + b * yakhi +
+ ((a * a * a - a) * y2aklo +
+ (b * b * b - b) * y2akhi) * (h * h) / 6.0);
+}
+
+void EqGraph::draw (cairo_t * cr)
+{
+ static const double xN = {0, 11, 23, 35, 47, 59, 71, 83, 97, 109};
+
+ if (cairo_image_surface_get_height (skin.pixmapsSKIN_EQMAIN.get ()) < 313)
+ return;
+
+ skin_draw_pixbuf (cr, SKIN_EQMAIN, 0, 294, 0, 0, 113, 19);
+ skin_draw_pixbuf (cr, SKIN_EQMAIN, 0, 314, 0, 9 + (aud_get_double (
+ "equalizer_preamp") * 9 + AUD_EQ_MAX_GAIN / 2) / AUD_EQ_MAX_GAIN, 113, 1);
+
+ double bandsN;
+ aud_eq_get_bands (bands);
+
+ double yfN;
+ init_spline (x, bands, yf);
+
+ int py = 0;
+ for (int i = 0; i < 109; i ++)
+ {
+ int y = 9.5 - eval_spline (x, bands, yf, i) * 9 / AUD_EQ_MAX_GAIN;
+ y = aud::clamp (y, 0, 18);
+
+ if (!i)
+ py = y;
+
+ int ymin, ymax;
+
+ if (y > py)
+ {
+ ymin = py + 1;
+ ymax = y;
+ }
+ else if (y < py)
+ {
+ ymin = y;
+ ymax = py - 1;
+ }
+ else
+ ymin = ymax = y;
+
+ py = y;
+
+ for (y = ymin; y <= ymax; y ++)
+ {
+ cairo_rectangle (cr, i + 2, y, 1, 1);
+ set_cairo_color (cr, skin.eq_spline_colorsy);
+ cairo_fill (cr);
+ }
+ }
+}
+
+EqGraph::EqGraph ()
+{
+ set_scale (config.scale);
+ add_drawable (113, 19);
+}

audacious-plugins-4.4.1.tar.bz2/src/skins/eq-graph.h Added

audacious-plugins-4.4.1.tar.bz2/src/skins/eq-slider.cc Added

@@ -0,0 +1,127 @@
+/*
+ * Audacious - a cross-platform multimedia player
+ * Copyright (c) 2007 Tomasz Moń
+ * Copyright (c) 2011 John Lindgren
+ *
+ * Based on:
+ * BMP - Cross-platform multimedia player
+ * Copyright (C) 2003-2004 BMP development team.
+ * XMMS:
+ * Copyright (C) 1998-2003 XMMS development team.
+ *
+ * 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; under version 3 of the License.
+ *
+ * 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>.
+ */
+
+#include <libaudcore/audstrings.h>
+#include <libaudcore/equalizer.h>
+#include <libaudcore/i18n.h>
+#include <libaudcore/runtime.h>
+
+#include "skins_cfg.h"
+#include "main.h"
+#include "skin.h"
+#include "eq-slider.h"
+
+void EqSlider::draw (cairo_t * cr)
+{
+ int frame = 27 - m_pos * 27 / 50;
+ if (frame < 14)
+ skin_draw_pixbuf (cr, SKIN_EQMAIN, 13 + 15 * frame, 164, 0, 0, 14, 63);
+ else
+ skin_draw_pixbuf (cr, SKIN_EQMAIN, 13 + 15 * (frame - 14), 229, 0, 0, 14, 63);
+
+ if (m_pressed)
+ skin_draw_pixbuf (cr, SKIN_EQMAIN, 0, 176, 1, m_pos, 11, 11);
+ else
+ skin_draw_pixbuf (cr, SKIN_EQMAIN, 0, 164, 1, m_pos, 11, 11);
+}
+
+void EqSlider::moved (int pos)
+{
+ m_pos = aud::clamp (pos, 0, 50);
+ if (m_pos == 24 || m_pos == 26)
+ m_pos = 25;
+
+ m_value = (float) (25 - m_pos) * AUD_EQ_MAX_GAIN / 25;
+
+ if (m_band < 0)
+ aud_set_double ("equalizer_preamp", m_value);
+ else
+ aud_eq_set_band (m_band, m_value);
+
+ mainwin_show_status_message (str_printf ("%s: %+.1f dB", (const char *) m_name, m_value));
+}
+
+bool EqSlider::button_press (GdkEventButton * event)
+{
+ if (event->button != 1)
+ return false;
+
+ m_pressed = true;
+ moved (event->y / config.scale - 5);
+ queue_draw ();
+ return true;
+}
+
+bool EqSlider::button_release (GdkEventButton * event)
+{
+ if (event->button != 1)
+ return false;
+
+ if (! m_pressed)
+ return true;
+
+ m_pressed = false;
+ moved (event->y / config.scale - 5);
+ queue_draw ();
+ return true;
+}
+
+bool EqSlider::motion (GdkEventMotion * event)
+{
+ if (! m_pressed)
+ return true;
+
+ moved (event->y / config.scale - 5);
+ queue_draw ();
+ return true;
+}
+
+bool EqSlider::scroll (GdkEventScroll * event)
+{
+ if (event->direction == GDK_SCROLL_UP)
+ moved (m_pos - 2);
+ else if (event->direction == GDK_SCROLL_DOWN)
+ moved (m_pos + 2);
+
+ queue_draw ();
+ return true;
+}
+
+void EqSlider::set_value (float value)
+{
+ if (m_pressed)
+ return;
+
+ m_value = value;
+ m_pos = aud::clamp (25 - (int) (value * 25 / AUD_EQ_MAX_GAIN), 0, 50);
+ queue_draw ();
+}
+
+EqSlider::EqSlider (const char * name, int band) :
+ m_name (name),
+ m_band (band)
+{
+ set_scale (config.scale);
+ add_input (14, 63, true, true);
+}

audacious-plugins-4.4.1.tar.bz2/src/skins/eq-slider.h Added

@@ -0,0 +1,55 @@
+/*
+ * Audacious - a cross-platform multimedia player
+ * Copyright (c) 2007 Tomasz Moń
+ * Copyright (c) 2011 John Lindgren
+ *
+ * Based on:
+ * BMP - Cross-platform multimedia player
+ * Copyright (C) 2003-2004 BMP development team.
+ * XMMS:
+ * Copyright (C) 1998-2003 XMMS development team.
+ *
+ * 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; under version 3 of the License.
+ *
+ * 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>.
+ */
+
+#ifndef SKINS_UI_SKINNED_EQUALIZER_SLIDER_H
+#define SKINS_UI_SKINNED_EQUALIZER_SLIDER_H
+
+#include <libaudcore/objects.h>
+
+#include "widget.h"
+
+class EqSlider : public Widget
+{
+public:
+ EqSlider (const char * name, int band);
+ void set_value (float value);
+
+private:
+ void draw (cairo_t * cr);
+ bool button_press (GdkEventButton * event);
+ bool button_release (GdkEventButton * event);
+ bool scroll (GdkEventScroll * event);
+ bool motion (GdkEventMotion * event);
+
+ void moved (int pos);
+
+ String m_name;
+ int m_band;
+
+ int m_pos = 0;
+ float m_value = 0;
+ bool m_pressed = false;
+};
+
+#endif

audacious-plugins-4.4.1.tar.bz2/src/skins/equalizer.cc Added

@@ -0,0 +1,289 @@
+/* Audacious - Cross-platform multimedia player
+ * Copyright (C) 2005-2014 Audacious development team.
+ *
+ * Based on BMP:
+ * Copyright (C) 2003-2004 BMP development team.
+ *
+ * Based on XMMS:
+ * Copyright (C) 1998-2003 XMMS development team.
+ *
+ * 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; under version 3 of the License.
+ *
+ * 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>.
+ *
+ * The Audacious team does not consider modular code linking to
+ * Audacious or using our public API to be a derived work.
+ */
+
+#include <string.h>
+#include <gtk/gtk.h>
+
+#include <libaudcore/audstrings.h>
+#include <libaudcore/drct.h>
+#include <libaudcore/equalizer.h>
+#include <libaudcore/hook.h>
+#include <libaudcore/i18n.h>
+#include <libaudcore/runtime.h>
+#include <libaudgui/libaudgui.h>
+#include <libaudgui/libaudgui-gtk.h>
+
+#include "menus.h"
+#include "plugin.h"
+#include "skins_cfg.h"
+#include "equalizer.h"
+#include "main.h"
+#include "button.h"
+#include "eq-graph.h"
+#include "eq-slider.h"
+#include "hslider.h"
+#include "window.h"
+#include "skins_util.h"
+#include "view.h"
+
+class EqWindow : public Window
+{
+public:
+ EqWindow (bool shaded) :
+ Window (WINDOW_EQ, & config.equalizer_x, & config.equalizer_y, 275,
+ shaded ? 14 : 116, shaded) {}
+
+private:
+ void draw (cairo_t * cr);
+ bool button_press (GdkEventButton * event);
+};
+
+Window * equalizerwin;
+
+static EqGraph * equalizerwin_graph;
+static Button * equalizerwin_on, * equalizerwin_auto;
+static Button * equalizerwin_close, * equalizerwin_shade;
+static Button * equalizerwin_shaded_close, * equalizerwin_shaded_shade;
+static Button * equalizerwin_presets;
+static EqSlider * equalizerwin_preamp, * equalizerwin_bands10;
+static HSlider * equalizerwin_volume, * equalizerwin_balance;
+
+static void equalizerwin_shade_toggle ()
+{
+ view_set_equalizer_shaded (! aud_get_bool ("skins", "equalizer_shaded"));
+}
+
+static void eq_on_cb (Button * button, GdkEventButton * event)
+{
+ aud_set_bool ("equalizer_active", button->get_active ());
+}
+
+static void update_from_config (void *, void *)
+{
+ equalizerwin_on->set_active (aud_get_bool ("equalizer_active"));
+ equalizerwin_preamp->set_value (aud_get_double ("equalizer_preamp"));
+
+ double bandsAUD_EQ_NBANDS;
+ aud_eq_get_bands (bands);
+
+ for (int i = 0; i < AUD_EQ_NBANDS; i ++)
+ equalizerwin_bandsi->set_value (bandsi);
+
+ equalizerwin_graph->refresh ();
+}
+
+bool EqWindow::button_press (GdkEventButton * event)
+{
+ if (event->button == 1 && event->type == GDK_2BUTTON_PRESS &&
+ event->window == gtk_widget_get_window (gtk ()) &&
+ event->y < 14 * config.scale)
+ {
+ equalizerwin_shade_toggle ();
+ return true;
+ }
+
+ if (event->button == 3 && event->type == GDK_BUTTON_PRESS)
+ {
+ menu_popup (UI_MENU_MAIN, event->x_root, event->y_root, false, false, event);
+ return true;
+ }
+
+ return Window::button_press (event);
+}
+
+static void equalizerwin_close_cb ()
+{
+ view_set_show_equalizer (false);
+}
+
+static void eqwin_volume_set_knob ()
+{
+ int pos = equalizerwin_volume->get_pos ();
+ int x = (pos < 32) ? 1 : (pos < 63) ? 4 : 7;
+ equalizerwin_volume->set_knob (x, 30, x, 30);
+}
+
+void equalizerwin_set_volume_slider (int percent)
+{
+ equalizerwin_volume->set_pos ((percent * 94 + 50) / 100);
+ eqwin_volume_set_knob ();
+}
+
+static void eqwin_volume_motion_cb ()
+{
+ eqwin_volume_set_knob ();
+ int pos = equalizerwin_volume->get_pos ();
+ int v = (pos * 100 + 47) / 94;
+
+ mainwin_adjust_volume_motion (v);
+ mainwin_set_volume_slider (v);
+}
+
+static void eqwin_volume_release_cb ()
+{
+ eqwin_volume_set_knob ();
+ mainwin_adjust_volume_release ();
+}
+
+static void eqwin_balance_set_knob ()
+{
+ int pos = equalizerwin_balance->get_pos ();
+ int x = (pos < 13) ? 11 : (pos < 26) ? 14 : 17;
+ equalizerwin_balance->set_knob (x, 30, x, 30);
+}
+
+void equalizerwin_set_balance_slider (int percent)
+{
+ if (percent > 0)
+ equalizerwin_balance->set_pos (19 + (percent * 19 + 50) / 100);
+ else
+ equalizerwin_balance->set_pos (19 + (percent * 19 - 50) / 100);
+
+ eqwin_balance_set_knob ();
+}
+
+static void eqwin_balance_motion_cb ()
+{
+ eqwin_balance_set_knob ();
+ int pos = equalizerwin_balance->get_pos ();
+ pos = aud::min(pos, 38); /* The skin uses a even number of pixels
+ for the balance-slider *sigh* */
+ int b;
+ if (pos > 19)
+ b = ((pos - 19) * 100 + 9) / 19;
+ else
+ b = ((pos - 19) * 100 - 9) / 19;
+
+ mainwin_adjust_balance_motion (b);
+ mainwin_set_balance_slider (b);
+}
+
+static void eqwin_balance_release_cb ()
+{
+ eqwin_balance_set_knob ();
+ mainwin_adjust_balance_release ();
+}
+
+static void equalizerwin_create_widgets ()
+{
+ equalizerwin_on = new Button (25, 12, 10, 119, 128, 119, 69, 119, 187, 119, SKIN_EQMAIN, SKIN_EQMAIN);
+ equalizerwin->put_widget (false, equalizerwin_on, 14, 18);
+ equalizerwin_on->set_active (aud_get_bool ("equalizer_active"));
+ equalizerwin_on->on_release (eq_on_cb);
+
+ // AUTO button currently does nothing
+ equalizerwin_auto = new Button (33, 12, 35, 119, 153, 119, 94, 119, 212, 119, SKIN_EQMAIN, SKIN_EQMAIN);
+ equalizerwin->put_widget (false, equalizerwin_auto, 39, 18);
+
+ equalizerwin_presets = new Button (44, 12, 224, 164, 224, 176, SKIN_EQMAIN, SKIN_EQMAIN);
+ equalizerwin->put_widget (false, equalizerwin_presets, 217, 18);
+ equalizerwin_presets->on_release ((ButtonCB) audgui_show_eq_preset_window);
+
+ equalizerwin_close = new Button (9, 9, 0, 116, 0, 125, SKIN_EQMAIN, SKIN_EQMAIN);
+ equalizerwin->put_widget (false, equalizerwin_close, 264, 3);
+ equalizerwin_close->on_release ((ButtonCB) equalizerwin_close_cb);
+
+ equalizerwin_shade = new Button (9, 9, 254, 137, 1, 38, SKIN_EQMAIN, SKIN_EQ_EX);
+ equalizerwin->put_widget (false, equalizerwin_shade, 254, 3);
+ equalizerwin_shade->on_release ((ButtonCB) equalizerwin_shade_toggle);
+
+ equalizerwin_shaded_close = new Button (9, 9, 11, 38, 11, 47, SKIN_EQ_EX, SKIN_EQ_EX);
+ equalizerwin->put_widget (true, equalizerwin_shaded_close, 264, 3);
+ equalizerwin_shaded_close->on_release ((ButtonCB) equalizerwin_close_cb);
+
+ equalizerwin_shaded_shade = new Button (9, 9, 254, 3, 1, 47, SKIN_EQ_EX, SKIN_EQ_EX);
+ equalizerwin->put_widget (true, equalizerwin_shaded_shade, 254, 3);
+ equalizerwin_shaded_shade->on_release ((ButtonCB) equalizerwin_shade_toggle);
+
+ equalizerwin_graph = new EqGraph;
+ equalizerwin->put_widget (false, equalizerwin_graph, 86, 17);
+
+ equalizerwin_preamp = new EqSlider (_("Preamp"), -1);
+ equalizerwin->put_widget (false, equalizerwin_preamp, 21, 38);
+ equalizerwin_preamp->set_value (aud_get_double ("equalizer_preamp"));
+
+ const char * const bandnamesAUD_EQ_NBANDS = {N_("31 Hz"),
+ N_("63 Hz"), N_("125 Hz"), N_("250 Hz"), N_("500 Hz"), N_("1 kHz"),
+ N_("2 kHz"), N_("4 kHz"), N_("8 kHz"), N_("16 kHz")};
+ double bandsAUD_EQ_NBANDS;
+ aud_eq_get_bands (bands);
+
+ for (int i = 0; i < AUD_EQ_NBANDS; i ++)
+ {
+ equalizerwin_bandsi = new EqSlider (_(bandnamesi), i);
+ equalizerwin->put_widget (false, equalizerwin_bandsi, 78 + 18 * i, 38);
+ equalizerwin_bandsi->set_value (bandsi);
+ }
+
+ equalizerwin_volume = new HSlider (0, 94, SKIN_EQ_EX, 97, 8, 61, 4, 3, 7, 1, 30, 1, 30);
+ equalizerwin->put_widget (true, equalizerwin_volume, 61, 4);
+ equalizerwin_volume->on_move (eqwin_volume_motion_cb);
+ equalizerwin_volume->on_release (eqwin_volume_release_cb);
+
+ equalizerwin_balance = new HSlider (0, 39, SKIN_EQ_EX, 42, 8, 164, 4, 3, 7, 11, 30, 11, 30);
+ equalizerwin->put_widget (true, equalizerwin_balance, 164, 4);
+ equalizerwin_balance->on_move (eqwin_balance_motion_cb);
+ equalizerwin_balance->on_release (eqwin_balance_release_cb);
+}
+
+void EqWindow::draw (cairo_t * cr)
+{
+ skin_draw_pixbuf (cr, SKIN_EQMAIN, 0, 0, 0, 0, 275, is_shaded () ? 14 : 116);
+
+ if (is_shaded ())
+ skin_draw_pixbuf (cr, SKIN_EQ_EX, 0, is_focused () ? 0 : 15, 0, 0, 275, 14);
+ else
+ skin_draw_pixbuf (cr, SKIN_EQMAIN, 0, is_focused () ? 134 : 149, 0, 0, 275, 14);
+}
+
+static void equalizerwin_create_window ()
+{
+ bool shaded = aud_get_bool ("skins", "equalizer_shaded");
+
+ /* do not allow shading the equalizer if eq_ex.bmp is missing */
+ if (! skin.pixmapsSKIN_EQ_EX)
+ shaded = false;
+
+ equalizerwin = new EqWindow (shaded);
+ equalizerwin->setWindowTitle (_("Audacious Equalizer"));
+ equalizerwin->setWindowRole ("equalizer");
+}
+
+void equalizerwin_unhook ()
+{
+ hook_dissociate ("set equalizer_active", (HookFunction) update_from_config);
+ hook_dissociate ("set equalizer_bands", (HookFunction) update_from_config);
+ hook_dissociate ("set equalizer_preamp", (HookFunction) update_from_config);
+}
+
+void equalizerwin_create ()
+{
+ equalizerwin_create_window ();
+ equalizerwin_create_widgets ();
+
+ hook_associate ("set equalizer_active", (HookFunction) update_from_config, nullptr);
+ hook_associate ("set equalizer_bands", (HookFunction) update_from_config, nullptr);
+ hook_associate ("set equalizer_preamp", (HookFunction) update_from_config, nullptr);
+}

audacious-plugins-4.4.1.tar.bz2/src/skins/equalizer.h Added

audacious-plugins-4.4.1.tar.bz2/src/skins/hslider.cc Added

@@ -0,0 +1,129 @@
+/*
+ * Audacious - a cross-platform multimedia player
+ * Copyright (c) 2007 Tomasz Moń
+ * Copyright (c) 2011 John Lindgren
+ *
+ * Based on:
+ * BMP - Cross-platform multimedia player
+ * Copyright (C) 2003-2004 BMP development team.
+ * XMMS:
+ * Copyright (C) 1998-2003 XMMS development team.
+ *
+ * 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; under version 3 of the License.
+ *
+ * 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>.
+ *
+ * The Audacious team does not consider modular code linking to
+ * Audacious or using our public API to be a derived work.
+ */
+
+#include <libaudcore/objects.h>
+
+#include "skins_cfg.h"
+#include "hslider.h"
+
+void HSlider::draw (cairo_t * cr)
+{
+ skin_draw_pixbuf (cr, m_si, m_fx, m_fy, 0, 0, m_w, m_h);
+
+ if (m_pressed)
+ skin_draw_pixbuf (cr, m_si, m_kpx, m_kpy, m_pos, (m_h - m_kh) / 2, m_kw, m_kh);
+ else
+ skin_draw_pixbuf (cr, m_si, m_knx, m_kny, m_pos, (m_h - m_kh) / 2, m_kw, m_kh);
+}
+
+bool HSlider::button_press (GdkEventButton * event)
+{
+ if (event->button != 1)
+ return false;
+
+ m_pressed = true;
+ m_pos = aud::clamp ((int) event->x / config.scale - m_kw / 2, m_min, m_max);
+
+ if (move)
+ move ();
+
+ queue_draw ();
+ return true;
+}
+
+bool HSlider::button_release (GdkEventButton * event)
+{
+ if (event->button != 1)
+ return false;
+
+ if (! m_pressed)
+ return true;
+
+ m_pressed = false;
+ m_pos = aud::clamp ((int) event->x / config.scale - m_kw / 2, m_min, m_max);
+
+ if (release)
+ release ();
+
+ queue_draw ();
+ return true;
+}
+
+bool HSlider::motion (GdkEventMotion * event)
+{
+ if (! m_pressed)
+ return true;
+
+ m_pressed = true;
+ m_pos = aud::clamp ((int) event->x / config.scale - m_kw / 2, m_min, m_max);
+
+ if (move)
+ move ();
+
+ queue_draw ();
+ return true;
+}
+
+HSlider::HSlider (int min, int max, SkinPixmapId si, int w, int h, int fx,
+ int fy, int kw, int kh, int knx, int kny, int kpx, int kpy) :
+ m_min (min), m_max (max), m_si (si), m_w (w), m_h (h), m_fx (fx), m_fy (fy),
+ m_kw (kw), m_kh (kh), m_knx (knx), m_kny (kny), m_kpx (kpx), m_kpy (kpy)
+{
+ set_scale (config.scale);
+ add_input (w, h, true, true);
+}
+
+void HSlider::set_frame (int fx, int fy)
+{
+ m_fx = fx;
+ m_fy = fy;
+ queue_draw ();
+}
+
+void HSlider::set_knob (int knx, int kny, int kpx, int kpy)
+{
+ m_knx = knx;
+ m_kny = kny;
+ m_kpx = kpx;
+ m_kpy = kpy;
+ queue_draw ();
+}
+
+void HSlider::set_pos (int pos)
+{
+ if (m_pressed)
+ return;
+
+ m_pos = aud::clamp (pos, m_min, m_max);
+ queue_draw ();
+}
+
+void HSlider::set_pressed (bool pressed)
+{
+ m_pressed = pressed;
+ queue_draw ();
+}

audacious-plugins-4.4.1.tar.bz2/src/skins/hslider.h Added

@@ -0,0 +1,70 @@
+/*
+ * Audacious - a cross-platform multimedia player
+ * Copyright (c) 2007 Tomasz Moń
+ * Copyright (c) 2011 John Lindgren
+ *
+ * Based on:
+ * BMP - Cross-platform multimedia player
+ * Copyright (C) 2003-2004 BMP development team.
+ * XMMS:
+ * Copyright (C) 1998-2003 XMMS development team.
+ *
+ * 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; under version 3 of the License.
+ *
+ * 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>.
+ *
+ * The Audacious team does not consider modular code linking to
+ * Audacious or using our public API to be a derived work.
+ */
+
+#ifndef SKINS_UI_SKINNED_HORIZONTAL_SLIDER_H
+#define SKINS_UI_SKINNED_HORIZONTAL_SLIDER_H
+
+#include "widget.h"
+#include "skin.h"
+
+class HSlider : public Widget
+{
+public:
+ HSlider (int min, int max, SkinPixmapId si, int w, int h, int fx, int fy,
+ int kw, int kh, int knx, int kny, int kpx, int kpy);
+
+ void set_frame (int fx, int fy);
+ void set_knob (int knx, int kny, int kpx, int kpy);
+ int get_pos () { return m_pos; }
+ void set_pos (int pos);
+ bool get_pressed () { return m_pressed; }
+ void set_pressed (bool pressed);
+
+ void on_move (void (* callback) ()) { move = callback; }
+ void on_release (void (* callback) ()) { release = callback; }
+
+private:
+ void draw (cairo_t * cr);
+ bool button_press (GdkEventButton * event);
+ bool button_release (GdkEventButton * event);
+ bool motion (GdkEventMotion * event);
+
+ int m_min, m_max;
+ SkinPixmapId m_si;
+ int m_w, m_h;
+ int m_fx, m_fy;
+ int m_kw, m_kh;
+ int m_knx, m_kny, m_kpx, m_kpy;
+
+ int m_pos = 0;
+ bool m_pressed = false;
+
+ void (* move) () = nullptr;
+ void (* release) () = nullptr;
+};
+
+#endif

audacious-plugins-4.4.1.tar.bz2/src/skins/main.cc Added

@@ -0,0 +1,1295 @@
+/* Audacious - Cross-platform multimedia player
+ * Copyright (C) 2005-2011 Audacious development team.
+ *
+ * BMP - Cross-platform multimedia player
+ * Copyright (C) 2003-2004 BMP development team.
+ *
+ * Based on XMMS:
+ * Copyright (C) 1998-2003 XMMS development team.
+ *
+ * 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; under version 3 of the License.
+ *
+ * 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>.
+ *
+ * The Audacious team does not consider modular code linking to
+ * Audacious or using our public API to be a derived work.
+ */
+
+#include <math.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/time.h>
+
+#include <gdk/gdkkeysyms.h>
+#include <gtk/gtk.h>
+
+#include <libaudcore/audstrings.h>
+#include <libaudcore/drct.h>
+#include <libaudcore/hook.h>
+#include <libaudcore/i18n.h>
+#include <libaudcore/mainloop.h>
+#include <libaudcore/plugins.h>
+#include <libaudcore/runtime.h>
+#include <libaudgui/libaudgui.h>
+#include <libaudgui/libaudgui-gtk.h>
+
+#include "actions-mainwin.h"
+#include "actions-playlist.h"
+#include "dnd.h"
+#include "menus.h"
+#include "plugin.h"
+#include "skins_cfg.h"
+#include "equalizer.h"
+#include "main.h"
+#include "vis-callbacks.h"
+#include "playlistwin.h"
+#include "button.h"
+#include "hslider.h"
+#include "menurow.h"
+#include "monostereo.h"
+#include "number.h"
+#include "playlist-widget.h"
+#include "playstatus.h"
+#include "textbox.h"
+#include "window.h"
+#include "vis.h"
+#include "skins_util.h"
+#include "view.h"
+
+#include "../ui-common/menu-ops.h"
+
+#define SEEK_THRESHOLD 200 /* milliseconds */
+#define SEEK_SPEED 50 /* milliseconds per pixel */
+
+class MainWindow : public Window
+{
+public:
+ MainWindow (bool shaded) :
+ Window (WINDOW_MAIN, & config.player_x, & config.player_y,
+ shaded ? MAINWIN_SHADED_WIDTH : skin.hints.mainwin_width,
+ shaded ? MAINWIN_SHADED_HEIGHT : skin.hints.mainwin_height, shaded) {}
+
+private:
+ void draw (cairo_t * cr);
+ bool button_press (GdkEventButton * event);
+ bool scroll (GdkEventScroll * event);
+ bool motion (GdkEventMotion * event);
+ bool leave ();
+
+ QueuedFunc m_popup_timer;
+ bool m_popup_shown = false;
+};
+
+Window * mainwin;
+
+Button * mainwin_eq, * mainwin_pl;
+TextBox * mainwin_info;
+MenuRow * mainwin_menurow;
+
+SkinnedVis * mainwin_vis;
+SmallVis * mainwin_svis;
+
+static bool seeking = false;
+static int seek_start, seek_time;
+
+static TextBox * locked_textbox = nullptr;
+static String locked_old_text;
+
+static QueuedFunc status_message_timeout;
+static QueuedFunc mainwin_volume_release_timeout;
+
+static Button * mainwin_menubtn, * mainwin_minimize, * mainwin_shade, * mainwin_close;
+static Button * mainwin_shaded_menubtn, * mainwin_shaded_minimize, * mainwin_shaded_shade, * mainwin_shaded_close;
+
+static Button * mainwin_rew, * mainwin_fwd;
+static Button * mainwin_eject;
+static Button * mainwin_play, * mainwin_pause, * mainwin_stop;
+static Button * mainwin_shuffle, * mainwin_repeat;
+
+static TextBox * mainwin_stime_min, * mainwin_stime_sec;
+static TextBox * mainwin_rate_text, * mainwin_freq_text, * mainwin_othertext;
+
+static PlayStatus * mainwin_playstatus;
+static SkinnedNumber * mainwin_minus_num, * mainwin_10min_num, * mainwin_min_num;
+static SkinnedNumber * mainwin_10sec_num, * mainwin_sec_num;
+static HSlider * mainwin_position, * mainwin_sposition;
+
+static HSlider * mainwin_volume, * mainwin_balance;
+static MonoStereo * mainwin_monostereo;
+
+static Button * mainwin_srew, * mainwin_splay, * mainwin_spause;
+static Button * mainwin_sstop, * mainwin_sfwd, * mainwin_seject, * mainwin_about;
+
+static void mainwin_position_motion_cb ();
+static void mainwin_position_release_cb ();
+static void seek_timeout (void * rewind);
+
+/* always returns a 6-character string */
+static StringBuf format_time (int time, int length)
+{
+ bool zero = aud_get_bool ("leading_zero");
+ bool remaining = aud_get_bool ("skins", "show_remaining_time");
+
+ if (remaining && length > 0)
+ {
+ time = (length - time) / 1000;
+ time = aud::clamp(0, time, 359999); // 99:59:59
+
+ if (time < 60)
+ return str_printf (zero ? "-00:%02d" : " -0:%02d", time);
+ else if (time < 6000)
+ return str_printf (zero ? "%03d:%02d" : "%3d:%02d", -time / 60, time % 60);
+ else
+ return str_printf ("%3d:%02d", -time / 3600, time / 60 % 60);
+ }
+ else
+ {
+ time /= 1000;
+ time = aud::clamp(0, time, 3599999); // 999:59:59
+
+ if (time < 6000)
+ return str_printf (zero ? " %02d:%02d" : " %2d:%02d", time / 60, time % 60);
+ else if (time < 60000)
+ return str_printf ("%3d:%02d", time / 60, time % 60);
+ else
+ return str_printf ("%3d:%02d", time / 3600, time / 60 % 60);
+ }
+}
+
+static void mainwin_menubtn_cb (Button * button, GdkEventButton * event)
+{
+ int x, y;
+ mainwin->getPosition (& x, & y);
+ menu_popup (UI_MENU_MAIN, x + 6 * config.scale,
+ y + MAINWIN_SHADED_HEIGHT * config.scale, false, false, event);
+}
+
+static void mainwin_minimize_cb ()
+{
+ gtk_window_iconify ((GtkWindow *) mainwin->gtk ());
+}
+
+static void mainwin_shade_toggle ()
+{
+ view_set_player_shaded (! aud_get_bool ("skins", "player_shaded"));
+}
+
+static void mainwin_lock_info_text (const char * text)
+{
+ if (! locked_textbox)
+ {
+ locked_textbox = skin.hints.mainwin_othertext_is_status ? mainwin_othertext : mainwin_info;
+ locked_old_text = locked_textbox->get_text ();
+ }
+
+ locked_textbox->set_text (text);
+}
+
+static void mainwin_release_info_text ()
+{
+ if (locked_textbox)
+ {
+ locked_textbox->set_text (locked_old_text);
+ locked_textbox = nullptr;
+ locked_old_text = String ();
+ }
+}
+
+static void set_info_text (TextBox * textbox, const char * text)
+{
+ if (textbox == locked_textbox)
+ locked_old_text = String (text);
+ else
+ textbox->set_text (text);
+}
+
+#define mainwin_set_info_text(t) set_info_text (mainwin_info, (t))
+#define mainwin_set_othertext(t) set_info_text (mainwin_othertext, (t))
+
+void mainwin_show_status_message (const char * message)
+{
+ mainwin_lock_info_text (message);
+ status_message_timeout.queue (1000, mainwin_release_info_text);
+}
+
+static void mainwin_set_song_title (const char * title)
+{
+ StringBuf buf;
+
+ if (title)
+ buf = str_printf (_("%s - Audacious"), title);
+ else
+ buf = str_copy (_("Audacious"));
+
+ int instance = aud_get_instance ();
+ if (instance != 1)
+ str_append_printf (buf, " (%d)", instance);
+
+ mainwin->setWindowTitle ((const char *) buf);
+ mainwin_set_info_text (title ? title : "");
+}
+
+static void title_change ()
+{
+ if (aud_drct_get_ready ())
+ mainwin_set_song_title (aud_drct_get_title ());
+ else
+ mainwin_set_song_title ("Buffering ...");
+}
+
+static void setup_widget (Widget * widget, int x, int y, bool show)
+{
+ int width, height;
+
+ /* use get_size_request(), not get_preferred_size() */
+ /* get_preferred_size() will return 0x0 for hidden widgets */
+ gtk_widget_get_size_request (widget->gtk (), & width, & height);
+
+ width /= config.scale;
+ height /= config.scale;
+
+ /* hide widgets that are outside the window boundary */
+ if (x < 0 || x + width > skin.hints.mainwin_width ||
+ y < 0 || y + height > skin.hints.mainwin_height)
+ show = false;
+
+ widget->setVisible (show);
+ mainwin->move_widget (false, widget, x, y);
+}
+
+void mainwin_refresh_hints ()
+{
+ const SkinHints * p = & skin.hints;
+
+ mainwin_menurow->setVisible (p->mainwin_menurow_visible);
+ mainwin_rate_text->setVisible (p->mainwin_streaminfo_visible);
+ mainwin_freq_text->setVisible (p->mainwin_streaminfo_visible);
+ mainwin_monostereo->setVisible (p->mainwin_streaminfo_visible);
+
+ mainwin_info->set_width (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);
+
+ bool playing = aud_drct_get_playing ();
+ bool can_seek = aud_drct_get_length () > 0;
+
+ setup_widget (mainwin_minus_num, p->mainwin_number_0_x, p->mainwin_number_0_y, playing);
+ setup_widget (mainwin_10min_num, p->mainwin_number_1_x, p->mainwin_number_1_y, playing);
+ setup_widget (mainwin_min_num, p->mainwin_number_2_x, p->mainwin_number_2_y, playing);
+ setup_widget (mainwin_10sec_num, p->mainwin_number_3_x, p->mainwin_number_3_y, playing);
+ setup_widget (mainwin_sec_num, p->mainwin_number_4_x, p->mainwin_number_4_y, playing);
+ setup_widget (mainwin_position, p->mainwin_position_x, p->mainwin_position_y, can_seek);
+
+ 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 (aud_get_bool ("skins", "player_shaded"))
+ mainwin->resize (MAINWIN_SHADED_WIDTH, MAINWIN_SHADED_HEIGHT);
+ else
+ mainwin->resize (p->mainwin_width, p->mainwin_height);
+
+ mainwin_vis->set_colors ();
+}
+
+/* note that the song info is not translated since it is displayed using
+ * the skinned bitmap font, which supports only the English alphabet */
+static void mainwin_set_song_info (int bitrate, int samplerate, int channels)
+{
+ char scratch32;
+ int length;
+
+ if (bitrate > 0)
+ {
+ if (bitrate < 1000000)
+ snprintf (scratch, sizeof scratch, "%3d", bitrate / 1000);
+ else
+ snprintf (scratch, sizeof scratch, "%2dH", bitrate / 100000);
+
+ mainwin_rate_text->set_text (scratch);
+ }
+ else
+ mainwin_rate_text->set_text (nullptr);
+
+ if (samplerate > 0)
+ {
+ snprintf (scratch, sizeof scratch, "%2d", samplerate / 1000);
+ mainwin_freq_text->set_text (scratch);
+ }
+ else
+ mainwin_freq_text->set_text (nullptr);
+
+ mainwin_monostereo->set_num_channels (channels);
+
+ if (bitrate > 0)
+ snprintf (scratch, sizeof scratch, "%d kbit/s", bitrate / 1000);
+ else
+ scratch0 = 0;
+
+ if (samplerate > 0)
+ {
+ length = strlen (scratch);
+ snprintf (scratch + length, sizeof scratch - length, "%s%d kHz", length ?
+ ", " : "", samplerate / 1000);
+ }
+
+ if (channels > 0)
+ {
+ length = strlen (scratch);
+ snprintf (scratch + length, sizeof scratch - length, "%s%s", length ?
+ ", " : "", channels > 2 ? "surround" : channels > 1 ? "stereo" : "mono");
+ }
+
+ mainwin_set_othertext (scratch);
+}
+
+static void mainwin_show_infopopup ()
+{
+ GtkWindow * parent = (GtkWindow *) mainwin->gtk ();
+ audgui_infopopup_show_current (parent);
+}
+
+static void info_change ()
+{
+ int bitrate, samplerate, channels;
+ aud_drct_get_info (bitrate, samplerate, channels);
+ mainwin_set_song_info (bitrate, samplerate, channels);
+}
+
+static void playback_pause ()
+{
+ mainwin_playstatus->set_status (STATUS_PAUSE);
+}
+
+static void playback_unpause ()
+{
+ mainwin_playstatus->set_status (STATUS_PLAY);
+}
+
+void mainwin_playback_begin ()
+{
+ mainwin_update_song_info ();
+
+ mainwin_stime_min->show ();
+ mainwin_stime_sec->show ();
+ mainwin_minus_num->show ();
+ mainwin_10min_num->show ();
+ mainwin_min_num->show ();
+ mainwin_10sec_num->show ();
+ mainwin_sec_num->show ();
+
+ if (aud_drct_get_length () > 0)
+ {
+ mainwin_position->show ();
+ mainwin_sposition->show ();
+ }
+
+ if (aud_drct_get_paused ())
+ playback_pause ();
+ else
+ playback_unpause ();
+
+ title_change ();
+ info_change ();
+}
+
+static void mainwin_playback_stop ()
+{
+ seeking = false;
+ timer_remove (TimerRate::Hz10, seek_timeout);
+
+ mainwin_set_song_title (nullptr);
+
+ mainwin_vis->clear ();
+ mainwin_svis->clear ();
+
+ mainwin_minus_num->hide ();
+ mainwin_10min_num->hide ();
+ mainwin_min_num->hide ();
+ mainwin_10sec_num->hide ();
+ mainwin_sec_num->hide ();
+ mainwin_stime_min->hide ();
+ mainwin_stime_sec->hide ();
+ mainwin_position->hide ();
+ mainwin_sposition->hide ();
+
+ mainwin_position->set_pressed (false);
+ mainwin_sposition->set_pressed (false);
+
+ /* clear sampling parameter displays */
+ mainwin_rate_text->set_text (nullptr);
+ mainwin_freq_text->set_text (nullptr);
+ mainwin_monostereo->set_num_channels (0);
+ mainwin_set_othertext ("");
+
+ mainwin_playstatus->set_status (STATUS_STOP);
+
+ playlistwin_hide_timer();
+}
+
+static void record_toggled ()
+{
+ if (aud_drct_get_record_enabled ())
+ {
+ if (aud_get_bool ("record"))
+ mainwin_show_status_message (_("Recording on"));
+ else
+ mainwin_show_status_message (_("Recording off"));
+ }
+}
+
+static void repeat_toggled ()
+{
+ mainwin_repeat->set_active (aud_get_bool ("repeat"));
+}
+
+static void shuffle_toggled ()
+{
+ mainwin_shuffle->set_active (aud_get_bool ("shuffle"));
+}
+
+static void no_advance_toggled ()
+{
+ if (aud_get_bool ("no_playlist_advance"))
+ mainwin_show_status_message (_("Single mode."));
+ else
+ mainwin_show_status_message (_("Playlist mode."));
+}
+
+static void stop_after_song_toggled ()
+{
+ if (aud_get_bool ("stop_after_current_song"))
+ mainwin_show_status_message (_("Stopping after song."));
+}
+
+bool MainWindow::scroll (GdkEventScroll * event)
+{
+ switch (event->direction)
+ {
+ case GDK_SCROLL_UP:
+ mainwin_set_volume_diff (aud_get_int ("volume_delta"));
+ break;
+ case GDK_SCROLL_DOWN:
+ mainwin_set_volume_diff (-aud_get_int ("volume_delta"));
+ break;
+ case GDK_SCROLL_LEFT:
+ aud_drct_seek (aud_drct_get_time () - aud_get_int ("step_size") * 1000);
+ break;
+ case GDK_SCROLL_RIGHT:
+ aud_drct_seek (aud_drct_get_time () + aud_get_int ("step_size") * 1000);
+ break;
+ default:
+ break;
+ }
+
+ return true;
+}
+
+bool MainWindow::button_press (GdkEventButton * event)
+{
+ if (event->button == 1 && event->type == GDK_2BUTTON_PRESS &&
+ event->window == gtk_widget_get_window (gtk ()) &&
+ event->y < 14 * config.scale)
+ {
+ mainwin_shade_toggle ();
+ return true;
+ }
+
+ if (event->button == 3 && event->type == GDK_BUTTON_PRESS)
+ {
+ menu_popup (UI_MENU_MAIN, event->x_root, event->y_root, false, false, event);
+ return true;
+ }
+
+ return Window::button_press (event);
+}
+
+bool MainWindow::motion (GdkEventMotion * event)
+{
+ if (is_shaded () &&
+ event->x >= 79 * config.scale &&
+ event->x <= 157 * config.scale &&
+ aud_get_bool ("show_filepopup_for_tuple"))
+ {
+ if (! m_popup_shown)
+ {
+ m_popup_timer.queue (aud_get_int ("filepopup_delay") * 100,
+ mainwin_show_infopopup);
+ m_popup_shown = true;
+ }
+ }
+ else if (m_popup_shown)
+ {
+ audgui_infopopup_hide ();
+ m_popup_timer.stop ();
+ m_popup_shown = false;
+ }
+
+ return Window::motion (event);
+}
+
+bool MainWindow::leave ()
+{
+ if (m_popup_shown)
+ {
+ audgui_infopopup_hide ();
+ m_popup_timer.stop ();
+ m_popup_shown = false;
+ }
+
+ return Window::leave ();
+}
+
+static void mainwin_playback_rpress (Button * button, GdkEventButton * event)
+{
+ menu_popup (UI_MENU_PLAYBACK, event->x_root, event->y_root, false, false, event);
+}
+
+bool Window::keypress (GdkEventKey * event)
+{
+ if (playlistwin_list->handle_keypress (event))
+ return true;
+
+ switch (event->keyval)
+ {
+ case GDK_KEY_Left:
+ case GDK_KEY_KP_Left:
+ case GDK_KEY_KP_7:
+ aud_drct_seek (aud_drct_get_time () - aud_get_int ("step_size") * 1000);
+ break;
+ case GDK_KEY_Right:
+ case GDK_KEY_KP_Right:
+ case GDK_KEY_KP_9:
+ aud_drct_seek (aud_drct_get_time () + aud_get_int ("step_size") * 1000);
+ break;
+ case GDK_KEY_KP_4:
+ aud_drct_pl_prev ();
+ break;
+ case GDK_KEY_KP_6:
+ aud_drct_pl_next ();
+ break;
+ case GDK_KEY_KP_Insert:
+ audgui_jump_to_track ();
+ break;
+ case GDK_KEY_space:
+ aud_drct_pause ();
+ break;
+ case GDK_KEY_Tab: /* GtkUIManager does not handle tab, apparently. */
+ if (event->state & GDK_SHIFT_MASK)
+ pl_prev ();
+ else
+ pl_next ();
+
+ break;
+ case GDK_KEY_ISO_Left_Tab:
+ pl_prev ();
+ break;
+ default:
+ return false;
+ }
+
+ return true;
+}
+
+void mainwin_drag_data_received (GtkWidget * widget, GdkDragContext * context,
+ int x, int y, GtkSelectionData * selection_data, unsigned info, unsigned time, void *)
+{
+ g_return_if_fail (selection_data != nullptr);
+
+ const char * data = (const char *) gtk_selection_data_get_data (selection_data);
+ g_return_if_fail (data);
+
+ if (str_has_prefix_nocase (data, "file:///"))
+ {
+ if (str_has_suffix_nocase (data, ".wsz\r\n") || str_has_suffix_nocase
+ (data, ".zip\r\n"))
+ {
+ on_skin_view_drag_data_received (0, context, x, y, selection_data, info, time, 0);
+ return;
+ }
+ }
+
+ audgui_urilist_open (data);
+}
+
+static int time_now ()
+{
+ struct timeval tv;
+ gettimeofday (& tv, nullptr);
+ return (tv.tv_sec % (24 * 3600) * 1000 + tv.tv_usec / 1000);
+}
+
+static int time_diff (int a, int b)
+{
+ if (a > 18 * 3600 * 1000 && b < 6 * 3600 * 1000) /* detect midnight */
+ b += 24 * 3600 * 1000;
+ return (b > a) ? b - a : 0;
+}
+
+static void seek_timeout (void * rewind)
+{
+ int held = time_diff (seek_time, time_now ());
+ if (held < SEEK_THRESHOLD)
+ return;
+
+ int position;
+ if (aud::from_ptr<bool> (rewind))
+ position = seek_start - held / SEEK_SPEED;
+ else
+ position = seek_start + held / SEEK_SPEED;
+
+ position = aud::clamp (position, 0, 219);
+ mainwin_position->set_pos (position);
+ mainwin_position_motion_cb ();
+}
+
+static void seek_press (GdkEventButton * event, bool rewind)
+{
+ if (event->button != 1 || seeking)
+ return;
+
+ seeking = true;
+ seek_start = mainwin_position->get_pos ();
+ seek_time = time_now ();
+ timer_add (TimerRate::Hz10, seek_timeout, aud::to_ptr (rewind));
+}
+
+static void seek_release (GdkEventButton * event, bool rewind)
+{
+ if (event->button != 1 || ! seeking)
+ return;
+
+ if (! aud_drct_get_playing () || time_diff (seek_time, time_now ()) <
+ SEEK_THRESHOLD)
+ {
+ if (rewind)
+ aud_drct_pl_prev ();
+ else
+ aud_drct_pl_next ();
+ }
+ else
+ mainwin_position_release_cb ();
+
+ seeking = false;
+ timer_remove (TimerRate::Hz10, seek_timeout);
+}
+
+static void mainwin_rew_press (Button * button, GdkEventButton * event)
+ { seek_press (event, true); }
+static void mainwin_rew_release (Button * button, GdkEventButton * event)
+ { seek_release (event, true); }
+static void mainwin_fwd_press (Button * button, GdkEventButton * event)
+ { seek_press (event, false); }
+static void mainwin_fwd_release (Button * button, GdkEventButton * event)
+ { seek_release (event, false); }
+
+static void mainwin_shuffle_cb (Button * button, GdkEventButton * event)
+ { aud_set_bool ("shuffle", button->get_active ()); }
+static void mainwin_repeat_cb (Button * button, GdkEventButton * event)
+ { aud_set_bool ("repeat", button->get_active ()); }
+static void mainwin_eq_cb (Button * button, GdkEventButton * event)
+ { view_set_show_equalizer (button->get_active ()); }
+static void mainwin_pl_cb (Button * button, GdkEventButton * event)
+ { view_set_show_playlist (button->get_active ()); }
+
+static void mainwin_spos_set_knob ()
+{
+ int pos = mainwin_sposition->get_pos ();
+ int x = (pos < 6) ? 17 : (pos < 9) ? 20 : 23;
+ mainwin_sposition->set_knob (x, 36, x, 36);
+}
+
+static void mainwin_spos_motion_cb ()
+{
+ mainwin_spos_set_knob ();
+
+ int pos = mainwin_sposition->get_pos ();
+ int length = aud_drct_get_length ();
+ int time = (pos - 1) * length / 12;
+
+ StringBuf buf = format_time (time, length);
+
+ mainwin_stime_min->set_text (buf);
+ mainwin_stime_sec->set_text (buf + 4);
+}
+
+static void mainwin_spos_release_cb ()
+{
+ mainwin_spos_set_knob ();
+
+ int pos = mainwin_sposition->get_pos ();
+ aud_drct_seek (aud_drct_get_length () * (pos - 1) / 12);
+}
+
+static void mainwin_position_motion_cb ()
+{
+ int length = aud_drct_get_length () / 1000;
+ int pos = mainwin_position->get_pos ();
+ int time = pos * length / 219;
+
+ mainwin_lock_info_text (str_printf (_("Seek to %d:%-2.2d / %d:%-2.2d"),
+ time / 60, time % 60, length / 60, length % 60));
+}
+
+static void mainwin_position_release_cb ()
+{
+ int length = aud_drct_get_length ();
+ int pos = mainwin_position->get_pos ();
+ int time = (int64_t) pos * length / 219;
+
+ aud_drct_seek(time);
+ mainwin_release_info_text();
+}
+
+void mainwin_adjust_volume_motion (int v)
+{
+ aud_drct_set_volume_main (v);
+ mainwin_lock_info_text (str_printf (_("Volume: %d%%"), v));
+}
+
+void mainwin_adjust_volume_release ()
+{
+ mainwin_release_info_text ();
+}
+
+void mainwin_adjust_balance_motion (int b)
+{
+ aud_drct_set_volume_balance (b);
+
+ if (b < 0)
+ mainwin_lock_info_text (str_printf (_("Balance: %d%% left"), -b));
+ else if (b == 0)
+ mainwin_lock_info_text (_("Balance: center"));
+ else
+ mainwin_lock_info_text (str_printf (_("Balance: %d%% right"), b));
+}
+
+void mainwin_adjust_balance_release ()
+{
+ mainwin_release_info_text ();
+}
+
+static void mainwin_volume_set_frame ()
+{
+ int pos = mainwin_volume->get_pos ();
+ int frame = (pos * 27 + 25) / 51;
+ mainwin_volume->set_frame (0, 15 * frame);
+}
+
+void mainwin_set_volume_slider (int percent)
+{
+ mainwin_volume->set_pos ((percent * 51 + 50) / 100);
+ mainwin_volume_set_frame ();
+}
+
+static void mainwin_volume_motion_cb ()
+{
+ mainwin_volume_set_frame ();
+ int pos = mainwin_volume->get_pos ();
+ int vol = (pos * 100 + 25) / 51;
+
+ mainwin_adjust_volume_motion (vol);
+ equalizerwin_set_volume_slider (vol);
+}
+
+static void mainwin_volume_release_cb ()
+{
+ mainwin_volume_set_frame ();
+ mainwin_adjust_volume_release ();
+}
+
+static void mainwin_balance_set_frame ()
+{
+ int pos = mainwin_balance->get_pos ();
+ int frame = (abs (pos - 12) * 27 + 6) / 12;
+ mainwin_balance->set_frame (9, 15 * frame);
+}
+
+void mainwin_set_balance_slider (int percent)
+{
+ if (percent > 0)
+ mainwin_balance->set_pos (12 + (percent * 12 + 50) / 100);
+ else
+ mainwin_balance->set_pos (12 + (percent * 12 - 50) / 100);
+
+ mainwin_balance_set_frame ();
+}
+
+static void mainwin_balance_motion_cb ()
+{
+ mainwin_balance_set_frame ();
+ int pos = mainwin_balance->get_pos ();
+
+ int bal;
+ if (pos > 12)
+ bal = ((pos - 12) * 100 + 6) / 12;
+ else
+ bal = ((pos - 12) * 100 - 6) / 12;
+
+ mainwin_adjust_balance_motion (bal);
+ equalizerwin_set_balance_slider (bal);
+}
+
+static void mainwin_balance_release_cb ()
+{
+ mainwin_balance_set_frame ();
+ mainwin_adjust_volume_release ();
+}
+
+void mainwin_set_volume_diff (int diff)
+{
+ int vol = aud_drct_get_volume_main ();
+
+ vol = aud::clamp (vol + diff, 0, 100);
+ mainwin_adjust_volume_motion (vol);
+ mainwin_set_volume_slider (vol);
+ equalizerwin_set_volume_slider (vol);
+
+ mainwin_volume_release_timeout.queue (700, mainwin_volume_release_cb);
+}
+
+void mainwin_mr_change (MenuRowItem i)
+{
+ switch (i)
+ {
+ case MENUROW_OPTIONS:
+ mainwin_lock_info_text (_("Options Menu"));
+ break;
+ case MENUROW_ALWAYS:
+ if (aud_get_bool ("skins", "always_on_top"))
+ mainwin_lock_info_text (_("Disable 'Always On Top'"));
+ else
+ mainwin_lock_info_text (_("Enable 'Always On Top'"));
+ break;
+ case MENUROW_FILEINFOBOX:
+ mainwin_lock_info_text (_("File Info Box"));
+ break;
+ case MENUROW_SCALE:
+ mainwin_lock_info_text (_("Double Size"));
+ break;
+ case MENUROW_VISUALIZATION:
+ mainwin_lock_info_text (_("Visualizations"));
+ break;
+ default:
+ break;
+ }
+}
+
+void mainwin_mr_release (MenuRowItem i, GdkEventButton * event)
+{
+ switch (i)
+ {
+ case MENUROW_OPTIONS:
+ menu_popup (UI_MENU_VIEW, event->x_root, event->y_root, false, false, event);
+ break;
+ case MENUROW_ALWAYS:
+ view_set_on_top (! aud_get_bool ("skins", "always_on_top"));
+ break;
+ case MENUROW_FILEINFOBOX:
+ audgui_infowin_show_current ();
+ break;
+ case MENUROW_SCALE:
+ view_set_double_size (! aud_get_bool ("skins", "double_size"));
+ break;
+ case MENUROW_VISUALIZATION:
+ audgui_show_prefs_for_plugin_type (PluginType::Vis);
+ break;
+ default:
+ break;
+ }
+
+ mainwin_release_info_text();
+}
+
+bool change_timer_mode_cb (GdkEventButton * event)
+{
+ if (event->type != GDK_BUTTON_PRESS || event->button != 1)
+ return false;
+
+ view_set_show_remaining (! aud_get_bool ("skins", "show_remaining_time"));
+ return true;
+}
+
+static bool mainwin_info_button_press (GdkEventButton * event)
+{
+ if (event->type == GDK_BUTTON_PRESS && event->button == 3)
+ {
+ menu_popup (UI_MENU_PLAYBACK, event->x_root, event->y_root, false, false, event);
+ return true;
+ }
+
+ if (event->type == GDK_2BUTTON_PRESS && event->button == 1)
+ {
+ audgui_infowin_show_current ();
+ return true;
+ }
+
+ return false;
+}
+
+static void mainwin_create_widgets ()
+{
+ mainwin_menubtn = new Button (9, 9, 0, 0, 0, 9, SKIN_TITLEBAR, SKIN_TITLEBAR);
+ mainwin->put_widget (false, mainwin_menubtn, 6, 3);
+ mainwin_menubtn->on_release ((ButtonCB) mainwin_menubtn_cb);
+
+ mainwin_minimize = new Button (9, 9, 9, 0, 9, 9, SKIN_TITLEBAR, SKIN_TITLEBAR);
+ mainwin->put_widget (false, mainwin_minimize, 244, 3);
+ mainwin_minimize->on_release ((ButtonCB) mainwin_minimize_cb);
+
+ mainwin_shade = new Button (9, 9, 0, 18, 9, 18, SKIN_TITLEBAR, SKIN_TITLEBAR);
+ mainwin->put_widget (false, mainwin_shade, 254, 3);
+ mainwin_shade->on_release ((ButtonCB) mainwin_shade_toggle);
+
+ mainwin_close = new Button (9, 9, 18, 0, 18, 9, SKIN_TITLEBAR, SKIN_TITLEBAR);
+ mainwin->put_widget (false, mainwin_close, 264, 3);
+ mainwin_close->on_release ((ButtonCB) skins_close);
+
+ mainwin_rew = new Button (23, 18, 0, 0, 0, 18, SKIN_CBUTTONS, SKIN_CBUTTONS);
+ mainwin->put_widget (false, mainwin_rew, 16, 88);
+ mainwin_rew->on_press (mainwin_rew_press);
+ mainwin_rew->on_release (mainwin_rew_release);
+ mainwin_rew->on_rpress (mainwin_playback_rpress);
+
+ mainwin_fwd = new Button (22, 18, 92, 0, 92, 18, SKIN_CBUTTONS, SKIN_CBUTTONS);
+ mainwin->put_widget (false, mainwin_fwd, 108, 88);
+ mainwin_fwd->on_press (mainwin_fwd_press);
+ mainwin_fwd->on_release (mainwin_fwd_release);
+ mainwin_fwd->on_rpress (mainwin_playback_rpress);
+
+ mainwin_play = new Button (23, 18, 23, 0, 23, 18, SKIN_CBUTTONS, SKIN_CBUTTONS);
+ mainwin->put_widget (false, mainwin_play, 39, 88);
+ mainwin_play->on_release ((ButtonCB) aud_drct_play);
+ mainwin_play->on_rpress (mainwin_playback_rpress);
+
+ mainwin_pause = new Button (23, 18, 46, 0, 46, 18, SKIN_CBUTTONS, SKIN_CBUTTONS);
+ mainwin->put_widget (false, mainwin_pause, 62, 88);
+ mainwin_pause->on_release ((ButtonCB) aud_drct_pause);
+ mainwin_pause->on_rpress (mainwin_playback_rpress);
+
+ mainwin_stop = new Button (23, 18, 69, 0, 69, 18, SKIN_CBUTTONS, SKIN_CBUTTONS);
+ mainwin->put_widget (false, mainwin_stop, 85, 88);
+ mainwin_stop->on_release ((ButtonCB) aud_drct_stop);
+ mainwin_stop->on_rpress (mainwin_playback_rpress);
+
+ mainwin_eject = new Button (22, 16, 114, 0, 114, 16, SKIN_CBUTTONS, SKIN_CBUTTONS);
+ mainwin->put_widget (false, mainwin_eject, 136, 89);
+ mainwin_eject->on_release ((ButtonCB) action_play_file);
+
+ mainwin_shuffle = new Button (46, 15, 28, 0, 28, 15, 28, 30, 28, 45, SKIN_SHUFREP, SKIN_SHUFREP);
+ mainwin->put_widget (false, mainwin_shuffle, 164, 89);
+ mainwin_shuffle->set_active (aud_get_bool ("shuffle"));
+ mainwin_shuffle->on_release (mainwin_shuffle_cb);
+
+ mainwin_repeat = new Button (28, 15, 0, 0, 0, 15, 0, 30, 0, 45, SKIN_SHUFREP, SKIN_SHUFREP);
+ mainwin->put_widget (false, mainwin_repeat, 210, 89);
+ mainwin_repeat->set_active (aud_get_bool ("repeat"));
+ mainwin_repeat->on_release (mainwin_repeat_cb);
+
+ mainwin_eq = new Button (23, 12, 0, 61, 46, 61, 0, 73, 46, 73, SKIN_SHUFREP, SKIN_SHUFREP);
+ mainwin->put_widget (false, mainwin_eq, 219, 58);
+ mainwin_eq->on_release (mainwin_eq_cb);
+
+ mainwin_pl = new Button (23, 12, 23, 61, 69, 61, 23, 73, 69, 73, SKIN_SHUFREP, SKIN_SHUFREP);
+ mainwin->put_widget (false, mainwin_pl, 242, 58);
+ mainwin_pl->on_release (mainwin_pl_cb);
+
+ String font;
+ if (! config.mainwin_use_bitmapfont)
+ font = aud_get_str ("skins", "mainwin_font");
+
+ bool shaded = aud_get_bool ("skins", "mainwin_shaded");
+ mainwin_info = new TextBox (153, font, ! shaded && config.autoscroll);
+ mainwin->put_widget (false, mainwin_info, 112, 27);
+ mainwin_info->on_press (mainwin_info_button_press);
+
+ mainwin_othertext = new TextBox (153, nullptr, false);
+ mainwin->put_widget (false, mainwin_othertext, 112, 43);
+
+ mainwin_rate_text = new TextBox (15, nullptr, false);
+ mainwin->put_widget (false, mainwin_rate_text, 111, 43);
+
+ mainwin_freq_text = new TextBox (10, nullptr, false);
+ mainwin->put_widget (false, mainwin_freq_text, 156, 43);
+
+ mainwin_menurow = new MenuRow;
+ mainwin->put_widget (false, mainwin_menurow, 10, 22);
+
+ mainwin_volume = new HSlider (0, 51, SKIN_VOLUME, 68, 13, 0, 0, 14, 11, 15, 422, 0, 422);
+ mainwin->put_widget (false, mainwin_volume, 107, 57);
+ mainwin_volume->on_move (mainwin_volume_motion_cb);
+ mainwin_volume->on_release (mainwin_volume_release_cb);
+
+ mainwin_balance = new HSlider (0, 24, SKIN_BALANCE, 38, 13, 9, 0, 14, 11, 15, 422, 0, 422);
+ mainwin->put_widget (false, mainwin_balance, 177, 57);
+ mainwin_balance->on_move (mainwin_balance_motion_cb);
+ mainwin_balance->on_release (mainwin_balance_release_cb);
+
+ mainwin_monostereo = new MonoStereo;
+ mainwin->put_widget (false, mainwin_monostereo, 212, 41);
+
+ mainwin_playstatus = new PlayStatus;
+ mainwin->put_widget (false, mainwin_playstatus, 24, 28);
+
+ mainwin_minus_num = new SkinnedNumber;
+ mainwin->put_widget (false, mainwin_minus_num, 36, 26);
+
+ mainwin_10min_num = new SkinnedNumber;
+ mainwin->put_widget (false, mainwin_10min_num, 48, 26);
+
+ mainwin_min_num = new SkinnedNumber;
+ mainwin->put_widget (false, mainwin_min_num, 60, 26);
+
+ mainwin_10sec_num = new SkinnedNumber;
+ mainwin->put_widget (false, mainwin_10sec_num, 78, 26);
+
+ mainwin_sec_num = new SkinnedNumber;
+ mainwin->put_widget (false, mainwin_sec_num, 90, 26);
+
+ mainwin_about = new Button (20, 25);
+ mainwin->put_widget (false, mainwin_about, 247, 83);
+ mainwin_about->on_release ((ButtonCB) audgui_show_about_window);
+
+ mainwin_vis = new SkinnedVis;
+ mainwin->put_widget (false, mainwin_vis, 24, 43);
+
+ mainwin_position = new HSlider (0, 219, SKIN_POSBAR, 248, 10, 0, 0, 29, 10, 248, 0, 278, 0);
+ mainwin->put_widget (false, mainwin_position, 16, 72);
+ mainwin_position->on_move (mainwin_position_motion_cb);
+ mainwin_position->on_release (mainwin_position_release_cb);
+
+ /* shaded */
+
+ mainwin_shaded_menubtn = new Button (9, 9, 0, 0, 0, 9, SKIN_TITLEBAR, SKIN_TITLEBAR);
+ mainwin->put_widget (true, mainwin_shaded_menubtn, 6, 3);
+ mainwin_shaded_menubtn->on_release ((ButtonCB) mainwin_menubtn_cb);
+
+ mainwin_shaded_minimize = new Button (9, 9, 9, 0, 9, 9, SKIN_TITLEBAR, SKIN_TITLEBAR);
+ mainwin->put_widget (true, mainwin_shaded_minimize, 244, 3);
+ mainwin_shaded_minimize->on_release ((ButtonCB) mainwin_minimize_cb);
+
+ mainwin_shaded_shade = new Button (9, 9, 0, 27, 9, 27, SKIN_TITLEBAR, SKIN_TITLEBAR);
+ mainwin->put_widget (true, mainwin_shaded_shade, 254, 3);
+ mainwin_shaded_shade->on_release ((ButtonCB) mainwin_shade_toggle);
+
+ mainwin_shaded_close = new Button (9, 9, 18, 0, 18, 9, SKIN_TITLEBAR, SKIN_TITLEBAR);
+ mainwin->put_widget (true, mainwin_shaded_close, 264, 3);
+ mainwin_shaded_close->on_release ((ButtonCB) skins_close);
+
+ mainwin_srew = new Button (8, 7);
+ mainwin->put_widget (true, mainwin_srew, 169, 4);
+ mainwin_srew->on_release ((ButtonCB) aud_drct_pl_prev);
+
+ mainwin_splay = new Button (10, 7);
+ mainwin->put_widget (true, mainwin_splay, 177, 4);
+ mainwin_splay->on_release ((ButtonCB) aud_drct_play);
+
+ mainwin_spause = new Button (10, 7);
+ mainwin->put_widget (true, mainwin_spause, 187, 4);
+ mainwin_spause->on_release ((ButtonCB) aud_drct_pause);
+
+ mainwin_sstop = new Button (9, 7);
+ mainwin->put_widget (true, mainwin_sstop, 197, 4);
+ mainwin_sstop->on_release ((ButtonCB) aud_drct_stop);
+
+ mainwin_sfwd = new Button (8, 7);
+ mainwin->put_widget (true, mainwin_sfwd, 206, 4);
+ mainwin_sfwd->on_release ((ButtonCB) aud_drct_pl_next);
+
+ mainwin_seject = new Button (9, 7);
+ mainwin->put_widget (true, mainwin_seject, 216, 4);
+ mainwin_seject->on_release ((ButtonCB) action_play_file);
+
+ mainwin_svis = new SmallVis ();
+ mainwin->put_widget (true, mainwin_svis, 79, 5);
+
+ mainwin_sposition = new HSlider (1, 13, SKIN_TITLEBAR, 17, 7, 0, 36, 3, 7, 17, 36, 17, 36);
+ mainwin->put_widget (true, mainwin_sposition, 226, 4);
+ mainwin_sposition->on_move (mainwin_spos_motion_cb);
+ mainwin_sposition->on_release (mainwin_spos_release_cb);
+
+ mainwin_stime_min = new TextBox (15, nullptr, false);
+ mainwin->put_widget (true, mainwin_stime_min, 130, 4);
+ mainwin_stime_min->on_press (change_timer_mode_cb);
+
+ mainwin_stime_sec = new TextBox (10, nullptr, false);
+ mainwin->put_widget (true, mainwin_stime_sec, 147, 4);
+ mainwin_stime_sec->on_press (change_timer_mode_cb);
+}
+
+static gboolean state_cb (GtkWidget * widget, GdkEventWindowState * event, void *)
+{
+ if (event->changed_mask & GDK_WINDOW_STATE_STICKY)
+ view_set_sticky (!! (event->new_window_state & GDK_WINDOW_STATE_STICKY));
+
+ if (event->changed_mask & GDK_WINDOW_STATE_ABOVE)
+ view_set_on_top (!! (event->new_window_state & GDK_WINDOW_STATE_ABOVE));
+
+ return true;
+}
+
+void MainWindow::draw (cairo_t * cr)
+{
+ int width = is_shaded () ? MAINWIN_SHADED_WIDTH : skin.hints.mainwin_width;
+ int height = is_shaded () ? MAINWIN_SHADED_HEIGHT : skin.hints.mainwin_height;
+
+ skin_draw_pixbuf (cr, SKIN_MAIN, 0, 0, 0, 0, width, height);
+ skin_draw_mainwin_titlebar (cr, is_shaded (), is_focused ());
+}
+
+static void mainwin_create_window ()
+{
+ bool shaded = aud_get_bool ("skins", "player_shaded");
+
+ mainwin = new MainWindow (shaded);
+ mainwin->setWindowRole("mainwindow");
+
+ GtkWidget * w = mainwin->gtk ();
+ drag_dest_set (w);
+
+ g_signal_connect (w, "drag-data-received", (GCallback) mainwin_drag_data_received, nullptr);
+ g_signal_connect (w, "window-state-event", (GCallback) state_cb, nullptr);
+
+ hook_associate ("playback begin", (HookFunction) mainwin_playback_begin, nullptr);
+ hook_associate ("playback ready", (HookFunction) mainwin_playback_begin, nullptr);
+ hook_associate ("playback seek", (HookFunction) mainwin_update_song_info, nullptr);
+ hook_associate ("playback stop", (HookFunction) mainwin_playback_stop, nullptr);
+ hook_associate ("playback pause", (HookFunction) playback_pause, nullptr);
+ hook_associate ("playback unpause", (HookFunction) playback_unpause, nullptr);
+ hook_associate ("title change", (HookFunction) title_change, nullptr);
+ hook_associate ("info change", (HookFunction) info_change, nullptr);
+ hook_associate ("set record", (HookFunction) record_toggled, nullptr);
+ hook_associate ("set repeat", (HookFunction) repeat_toggled, nullptr);
+ hook_associate ("set shuffle", (HookFunction) shuffle_toggled, nullptr);
+ hook_associate ("set no_playlist_advance", (HookFunction) no_advance_toggled, nullptr);
+ hook_associate ("set stop_after_current_song", (HookFunction) stop_after_song_toggled, nullptr);
+}
+
+void mainwin_unhook ()
+{
+ seeking = false;
+ timer_remove (TimerRate::Hz10, seek_timeout);
+
+ status_message_timeout.stop ();
+ mainwin_volume_release_timeout.stop ();
+
+ hook_dissociate ("playback begin", (HookFunction) mainwin_playback_begin);
+ hook_dissociate ("playback ready", (HookFunction) mainwin_playback_begin);
+ hook_dissociate ("playback seek", (HookFunction) mainwin_update_song_info);
+ hook_dissociate ("playback stop", (HookFunction) mainwin_playback_stop);
+ hook_dissociate ("playback pause", (HookFunction) playback_pause);
+ hook_dissociate ("playback unpause", (HookFunction) playback_unpause);
+ hook_dissociate ("title change", (HookFunction) title_change);
+ hook_dissociate ("info change", (HookFunction) info_change);
+ hook_dissociate ("set record", (HookFunction) record_toggled);
+ hook_dissociate ("set repeat", (HookFunction) repeat_toggled);
+ hook_dissociate ("set shuffle", (HookFunction) shuffle_toggled);
+ hook_dissociate ("set no_playlist_advance", (HookFunction) no_advance_toggled);
+ hook_dissociate ("set stop_after_current_song", (HookFunction) stop_after_song_toggled);
+
+ start_stop_visual (true);
+
+ locked_textbox = nullptr;
+ locked_old_text = String ();
+}
+
+void mainwin_create ()
+{
+ mainwin_create_window ();
+ mainwin_create_widgets ();
+ mainwin_set_song_title (nullptr);
+}
+
+static void mainwin_update_volume ()
+{
+ int volume = aud_drct_get_volume_main ();
+ int balance = aud_drct_get_volume_balance ();
+
+ mainwin_set_volume_slider (volume);
+ mainwin_set_balance_slider (balance);
+ equalizerwin_set_volume_slider (volume);
+ equalizerwin_set_balance_slider (balance);
+}
+
+static void mainwin_update_time_display (int time, int length)
+{
+ StringBuf scratch = format_time (time, length);
+
+ mainwin_minus_num->set (scratch0);
+ mainwin_10min_num->set (scratch1);
+ mainwin_min_num->set (scratch2);
+ mainwin_10sec_num->set (scratch4);
+ mainwin_sec_num->set (scratch5);
+
+ if (! mainwin_sposition->get_pressed ())
+ {
+ mainwin_stime_min->set_text (scratch);
+ mainwin_stime_sec->set_text (scratch + 4);
+ }
+
+ playlistwin_set_time (scratch, scratch + 4);
+}
+
+static void mainwin_update_time_slider (int time, int length)
+{
+ mainwin_position->setVisible (length > 0);
+ mainwin_sposition->setVisible (length > 0);
+
+ if (length > 0 && ! seeking)
+ {
+ if (time < length)
+ {
+ mainwin_position->set_pos (time * (int64_t) 219 / length);
+ mainwin_sposition->set_pos (1 + time * (int64_t) 12 / length);
+ }
+ else
+ {
+ mainwin_position->set_pos (219);
+ mainwin_sposition->set_pos (13);
+ }
+
+ mainwin_spos_set_knob ();
+ }
+}
+
+void mainwin_update_song_info ()
+{
+ mainwin_update_volume ();
+
+ if (! aud_drct_get_playing ())
+ return;
+
+ int time = 0, length = 0;
+ if (aud_drct_get_ready ())
+ {
+ time = aud_drct_get_time ();
+ length = aud_drct_get_length ();
+ }
+
+ mainwin_update_time_display (time, length);
+ mainwin_update_time_slider (time, length);
+}

audacious-plugins-4.4.1.tar.bz2/src/skins/main.h Added

@@ -0,0 +1,73 @@
+/* BMP - Cross-platform multimedia player
+ * Copyright (C) 2003-2004 BMP development team.
+ *
+ * Based on XMMS:
+ * Copyright (C) 1998-2003 XMMS development team.
+ *
+ * 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; under version 3 of the License.
+ *
+ * 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>.
+ *
+ * The Audacious team does not consider modular code linking to
+ * Audacious or using our public API to be a derived work.
+ */
+
+#ifndef SKINS_UI_MAIN_H
+#define SKINS_UI_MAIN_H
+
+#include <gtk/gtk.h>
+
+/* yes, main window size is fixed */
+#define MAINWIN_WIDTH (int)275
+#define MAINWIN_HEIGHT (int)116
+#define MAINWIN_SHADED_WIDTH MAINWIN_WIDTH
+#define MAINWIN_SHADED_HEIGHT (int)14
+
+class Button;
+class MenuRow;
+class SkinnedVis;
+class SmallVis;
+class TextBox;
+class Window;
+
+extern Window * mainwin;
+
+extern Button * mainwin_eq, * mainwin_pl;
+extern TextBox * mainwin_info;
+extern MenuRow * mainwin_menurow;
+
+extern SkinnedVis * mainwin_vis;
+extern SmallVis * mainwin_svis;
+
+void mainwin_create ();
+void mainwin_unhook ();
+
+void mainwin_adjust_volume_motion (int v);
+void mainwin_adjust_volume_release ();
+void mainwin_adjust_balance_motion (int b);
+void mainwin_adjust_balance_release ();
+void mainwin_set_volume_slider (int percent);
+void mainwin_set_balance_slider (int percent);
+void mainwin_set_volume_diff (int diff);
+
+void mainwin_refresh_hints ();
+void mainwin_playback_begin ();
+
+void mainwin_update_song_info ();
+void mainwin_show_status_message (const char * message);
+
+void mainwin_drag_data_received (GtkWidget * widget,
+ GdkDragContext * context, int x, int y, GtkSelectionData * selection_data,
+ unsigned info, unsigned time, void * data);
+
+bool change_timer_mode_cb (GdkEventButton * event);
+
+#endif /* SKINS_UI_MAIN_H */

audacious-plugins-4.4.1.tar.bz2/src/skins/menu-ops.cc Added

audacious-plugins-4.4.1.tar.bz2/src/skins/menurow.cc Added

@@ -0,0 +1,122 @@
+/*
+ * Audacious - a cross-platform multimedia player
+ * Copyright (c) 2007 Tomasz Moń
+ * Copyright (c) 2011 John Lindgren
+ *
+ * Based on:
+ * BMP - Cross-platform multimedia player
+ * Copyright (C) 2003-2004 BMP development team.
+ * XMMS:
+ * Copyright (C) 1998-2003 XMMS development team.
+ *
+ * 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; under version 3 of the License.
+ *
+ * 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>.
+ *
+ * The Audacious team does not consider modular code linking to
+ * Audacious or using our public API to be a derived work.
+ */
+
+#include <libaudcore/runtime.h>
+
+#include "skins_cfg.h"
+#include "skin.h"
+#include "menurow.h"
+
+void MenuRow::draw (cairo_t * cr)
+{
+ if (m_selected == MENUROW_NONE)
+ {
+ if (m_pushed)
+ skin_draw_pixbuf (cr, SKIN_TITLEBAR, 304, 0, 0, 0, 8, 43);
+ else
+ skin_draw_pixbuf (cr, SKIN_TITLEBAR, 312, 0, 0, 0, 8, 43);
+ }
+ else
+ skin_draw_pixbuf (cr, SKIN_TITLEBAR, 304 + 8 * (m_selected - 1), 44, 0, 0, 8, 43);
+
+ if (m_pushed)
+ {
+ if (aud_get_bool ("skins", "always_on_top"))
+ skin_draw_pixbuf (cr, SKIN_TITLEBAR, 312, 54, 0, 10, 8, 8);
+ if (aud_get_bool ("skins", "double_size"))
+ skin_draw_pixbuf (cr, SKIN_TITLEBAR, 328, 70, 0, 26, 8, 8);
+ }
+}
+
+static MenuRowItem menurow_find_selected (int x, int y)
+{
+ if (x >= 0 && x < 8)
+ {
+ if (y >= 0 && y < 10)
+ return MENUROW_OPTIONS;
+ if (y >= 10 && y < 18)
+ return MENUROW_ALWAYS;
+ if (y >= 18 && y < 26)
+ return MENUROW_FILEINFOBOX;
+ if (y >= 26 && y < 34)
+ return MENUROW_SCALE;
+ if (y >= 34 && y < 43)
+ return MENUROW_VISUALIZATION;
+ }
+
+ return MENUROW_NONE;
+}
+
+bool MenuRow::button_press (GdkEventButton * event)
+{
+ if (event->button != 1)
+ return false;
+
+ m_pushed = true;
+ m_selected = menurow_find_selected (event->x / config.scale, event->y / config.scale);
+
+ mainwin_mr_change (m_selected);
+
+ queue_draw ();
+ return true;
+}
+
+bool MenuRow::button_release (GdkEventButton * event)
+{
+ if (event->button != 1)
+ return false;
+
+ if (! m_pushed)
+ return true;
+
+ mainwin_mr_release (m_selected, event);
+
+ m_pushed = false;
+ m_selected = MENUROW_NONE;
+
+ queue_draw ();
+ return true;
+}
+
+bool MenuRow::motion (GdkEventMotion * event)
+{
+ if (! m_pushed)
+ return true;
+
+ m_selected = menurow_find_selected (event->x / config.scale, event->y / config.scale);
+
+ mainwin_mr_change (m_selected);
+
+ queue_draw ();
+ return true;
+}
+
+MenuRow::MenuRow ()
+{
+ set_scale (config.scale);
+ add_input (8, 43, true, true);
+}

audacious-plugins-4.4.1.tar.bz2/src/skins/menurow.h Added

@@ -0,0 +1,62 @@
+/*
+ * Audacious - a cross-platform multimedia player
+ * Copyright (c) 2007 Tomasz Moń
+ * Copyright (c) 2011 John Lindgren
+ *
+ * Based on:
+ * BMP - Cross-platform multimedia player
+ * Copyright (C) 2003-2004 BMP development team.
+ * XMMS:
+ * Copyright (C) 1998-2003 XMMS development team.
+ *
+ * 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; under version 3 of the License.
+ *
+ * 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>.
+ *
+ * The Audacious team does not consider modular code linking to
+ * Audacious or using our public API to be a derived work.
+ */
+
+#ifndef SKINS_UI_SKINNED_MENUROW_H
+#define SKINS_UI_SKINNED_MENUROW_H
+
+#include "widget.h"
+
+enum MenuRowItem {
+ MENUROW_NONE,
+ MENUROW_OPTIONS,
+ MENUROW_ALWAYS,
+ MENUROW_FILEINFOBOX,
+ MENUROW_SCALE,
+ MENUROW_VISUALIZATION
+};
+
+class MenuRow : public Widget
+{
+public:
+ MenuRow ();
+ void refresh () { queue_draw (); }
+
+private:
+ virtual void draw (cairo_t * cr);
+ virtual bool button_press (GdkEventButton * event);
+ virtual bool button_release (GdkEventButton * event);
+ virtual bool motion (GdkEventMotion * event);
+
+ MenuRowItem m_selected = MENUROW_NONE;
+ bool m_pushed = false;
+};
+
+/* callbacks in ui_main.c */
+void mainwin_mr_change (MenuRowItem i);
+void mainwin_mr_release (MenuRowItem i, GdkEventButton * event);
+
+#endif

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/menus.cc -> audacious-plugins-4.4.1.tar.bz2/src/skins/menus.cc Changed

@@ -26,6 +26,8 @@
 #include <libaudcore/drct.h>
 #include <libaudcore/i18n.h>
 #include <libaudcore/interface.h>
+#include <libaudcore/playlist.h>
+#include <libaudcore/plugins.h>
 #include <libaudcore/runtime.h>
 #include <libaudgui/libaudgui.h>
 #include <libaudgui/libaudgui-gtk.h>
@@ -33,10 +35,11 @@
 
 #include "actions-mainwin.h"
 #include "actions-playlist.h"
-#include "preset-browser.h"
-#include "preset-list.h"
+#include "main.h"
 #include "view.h"
 
+#include "../ui-common/menu-ops.h"
+
 #define SHIFT GDK_SHIFT_MASK
 #define CTRL GDK_CONTROL_MASK
 #define ALT GDK_MOD1_MASK
@@ -51,14 +54,31 @@
 static GtkAccelGroup * accel;
 
 /* note: playback, playlist, and view menus must be created before main menu */
-static GtkWidget * get_menu_playback (void) {return menusUI_MENU_PLAYBACK; }
-static GtkWidget * get_menu_playlist (void) {return menusUI_MENU_PLAYLIST; }
-static GtkWidget * get_menu_view (void) {return menusUI_MENU_VIEW; }
+static GtkWidget * get_menu_playback () { return menusUI_MENU_PLAYBACK; }
+static GtkWidget * get_menu_playlist () { return menusUI_MENU_PLAYLIST; }
+static GtkWidget * get_menu_view () { return menusUI_MENU_VIEW; }
+
+static GtkWidget * get_plugin_menu_main () { return audgui_get_plugin_menu (AudMenuID::Main); }
+static GtkWidget * get_plugin_menu_playlist () { return audgui_get_plugin_menu (AudMenuID::Playlist); }
+static GtkWidget * get_plugin_menu_playlist_add () { return audgui_get_plugin_menu (AudMenuID::PlaylistAdd); }
+static GtkWidget * get_plugin_menu_playlist_remove () { return audgui_get_plugin_menu (AudMenuID::PlaylistRemove); }
+
+static void configure_effects () { audgui_show_prefs_for_plugin_type (PluginType::Effect); }
+static void configure_output () { audgui_show_prefs_for_plugin_type (PluginType::Output); }
+static void configure_visualizations () { audgui_show_prefs_for_plugin_type (PluginType::Vis); }
+
+static void skins_volume_up () { mainwin_set_volume_diff (aud_get_int ("volume_delta")); }
+static void skins_volume_down () { mainwin_set_volume_diff (-aud_get_int ("volume_delta")); }
 
-static GtkWidget * get_plugin_menu_main (void) {return audgui_get_plugin_menu (AudMenuID::Main); }
-static GtkWidget * get_plugin_menu_playlist (void) {return audgui_get_plugin_menu (AudMenuID::Playlist); }
-static GtkWidget * get_plugin_menu_playlist_add (void) {return audgui_get_plugin_menu (AudMenuID::PlaylistAdd); }
-static GtkWidget * get_plugin_menu_playlist_remove (void) {return audgui_get_plugin_menu (AudMenuID::PlaylistRemove); }
+static const AudguiMenuItem output_items = {
+ MenuCommand (N_("Volume Up"), "audio-volume-high", '+', NO_MOD, skins_volume_up),
+ MenuCommand (N_("Volume Down"), "audio-volume-low", '-', NO_MOD, skins_volume_down),
+ MenuSep (),
+ MenuCommand (N_("Effects ..."), "preferences-system", NO_KEY, configure_effects),
+ MenuSep (),
+ MenuToggle (N_("Record Stream"), nullptr, 'd', NO_MOD, nullptr, "record", nullptr, "set record"),
+ MenuCommand (N_("Audio Settings ..."), "audio-card", NO_KEY, configure_output)
+};
 
 static const AudguiMenuItem main_items = {
 MenuCommand (N_("Open Files ..."), "document-open", 'l', NO_MOD, action_play_file),
@@ -67,6 +87,7 @@
 MenuSep (),
 MenuSub (N_("Playback"), nullptr, get_menu_playback),
 MenuSub (N_("Playlist"), nullptr, get_menu_playlist),
+ MenuSub (N_("Output"), nullptr, {output_items}),
 MenuSub (N_("View"), nullptr, get_menu_view),
 MenuSep (),
 MenuSub (N_("Services"), nullptr, get_plugin_menu_main),
@@ -81,6 +102,7 @@
 MenuSep (),
 MenuToggle (N_("Repeat"), nullptr, 'r', NO_MOD, nullptr, "repeat", nullptr, "set repeat"),
 MenuToggle (N_("Shuffle"), nullptr, 's', NO_MOD, nullptr, "shuffle", nullptr, "set shuffle"),
+ MenuToggle (N_("Shuffle by Album"), nullptr, NO_KEY, nullptr, "album_shuffle", nullptr, "set album_shuffle"),
 MenuToggle (N_("No Playlist Advance"), nullptr, 'n', CTRL, nullptr, "no_playlist_advance", nullptr, "set no_playlist_advance"),
 MenuToggle (N_("Stop After This Song"), nullptr, 'm', CTRL, nullptr, "stop_after_current_song", nullptr, "set stop_after_current_song"),
 MenuSep (),
@@ -89,6 +111,8 @@
 MenuCommand (N_("Stop"), "media-playback-stop", 'v', NO_MOD, aud_drct_stop),
 MenuCommand (N_("Previous"), "media-skip-backward", 'z', NO_MOD, aud_drct_pl_prev),
 MenuCommand (N_("Next"), "media-skip-forward", 'b', NO_MOD, aud_drct_pl_next),
+ MenuCommand (N_("Previous Album"), nullptr, NO_KEY, aud_drct_pl_prev_album),
+ MenuCommand (N_("Next Album"), nullptr, NO_KEY, aud_drct_pl_next_album),
 MenuSep (),
 MenuCommand (N_("Set A-B Repeat"), nullptr, 'a', NO_MOD, action_ab_set),
 MenuCommand (N_("Clear A-B Repeat"), nullptr, 'a', SHIFT, action_ab_clear),
@@ -98,14 +122,14 @@
 };
 
 static const AudguiMenuItem playlist_items = {
- MenuCommand (N_("Play/Resume"), "media-playback-start", GDK_KEY_Return, SHIFT, action_playlist_play),
+ MenuCommand (N_("Play/Resume"), "media-playback-start", GDK_KEY_Return, SHIFT, pl_play),
 MenuSep (),
- MenuCommand (N_("New Playlist"), "document-new", 'n', SHIFT, action_playlist_new),
+ MenuCommand (N_("New Playlist"), "document-new", 'n', SHIFT, pl_new),
 MenuCommand (N_("Rename Playlist ..."), "insert-text", GDK_KEY_F2, NO_MOD, action_playlist_rename),
 MenuCommand (N_("Remove Playlist"), "edit-delete", 'd', SHIFT, action_playlist_delete),
 MenuSep (),
- MenuCommand (N_("Previous Playlist"), "media-skip-backward", GDK_KEY_Tab, SHIFT, action_playlist_prev),
- MenuCommand (N_("Next Playlist"), "media-skip-forward", GDK_KEY_Tab, NO_MOD, action_playlist_next),
+ MenuCommand (N_("Previous Playlist"), "media-skip-backward", GDK_KEY_Tab, SHIFT, pl_prev),
+ MenuCommand (N_("Next Playlist"), "media-skip-forward", GDK_KEY_Tab, NO_MOD, pl_next),
 MenuSep (),
 MenuCommand (N_("Import Playlist ..."), "document-open", 'o', NO_MOD, audgui_import_playlist),
 MenuCommand (N_("Export Playlist ..."), "document-save", 's', SHIFT, audgui_export_playlist),
@@ -113,7 +137,7 @@
 MenuCommand (N_("Playlist Manager ..."), "audio-x-generic", 'p', NO_MOD, action_playlist_manager),
 MenuCommand (N_("Queue Manager ..."), nullptr, 'u', CTRL, audgui_queue_manager_show),
 MenuSep (),
- MenuCommand (N_("Refresh Playlist"), "view-refresh", GDK_KEY_F5, NO_MOD, action_playlist_refresh_list)
+ MenuCommand (N_("Refresh Playlist"), "view-refresh", GDK_KEY_F5, NO_MOD, pl_refresh)
 };
 
 static const AudguiMenuItem view_items = {
@@ -122,6 +146,7 @@
 MenuSep (),
 MenuToggle (N_("Show Remaining Time"), nullptr, 'r', CTRL, "skins", "show_remaining_time", view_apply_show_remaining, "skins set show_remaining_time"),
 MenuSep (),
+ MenuToggle (N_("Double Size"), nullptr, 'd', CTRL, "skins", "double_size", view_apply_double_size, "skins set double_size"),
 MenuToggle (N_("Always on Top"), nullptr, 'o', CTRL, "skins", "always_on_top", view_apply_on_top, "skins set always_on_top"),
 MenuToggle (N_("On All Workspaces"), nullptr, 's', CTRL, "skins", "sticky", view_apply_sticky, "skins set sticky"),
 MenuSep (),
@@ -129,7 +154,7 @@
 MenuToggle (N_("Roll Up Playlist Editor"), nullptr, 'w', SHIFT_CTRL, "skins", "playlist_shaded", view_apply_playlist_shaded, "skins set playlist_shaded"),
 MenuToggle (N_("Roll Up Equalizer"), nullptr, 'w', CTRL_ALT, "skins", "equalizer_shaded", view_apply_equalizer_shaded, "skins set equalizer_shaded"),
 MenuSep (),
- MenuToggle (N_("Double Size"), nullptr, 'd', CTRL, "skins", "double_size", view_apply_double_size, "skins set double_size")
+ MenuCommand (N_("_Visualizations ..."), "preferences-system", NO_KEY, configure_visualizations)
 };
 
 static const AudguiMenuItem playlist_add_items = {
@@ -140,102 +165,87 @@
 };
 
 static const AudguiMenuItem dupe_items = {
- MenuCommand (N_("By Title"), nullptr, NO_KEY, action_playlist_remove_dupes_by_title),
- MenuCommand (N_("By File Name"), nullptr, NO_KEY, action_playlist_remove_dupes_by_filename),
- MenuCommand (N_("By File Path"), nullptr, NO_KEY, action_playlist_remove_dupes_by_full_path)
+ MenuCommand (N_("By Title"), nullptr, NO_KEY, rm_dupes_title),
+ MenuCommand (N_("By File Name"), nullptr, NO_KEY, rm_dupes_filename),
+ MenuCommand (N_("By File Path"), nullptr, NO_KEY, rm_dupes_path)
 };
 
 static const AudguiMenuItem playlist_remove_items = {
 MenuSub (N_("Services"), nullptr, get_plugin_menu_playlist_remove),
 MenuSep (),
- MenuCommand (N_("Remove All"), "edit-delete", NO_KEY, action_playlist_remove_all),
- MenuCommand (N_("Clear Queue"), "edit-clear", 'q', SHIFT, action_playlist_clear_queue),
+ MenuCommand (N_("Remove All"), "edit-delete", NO_KEY, pl_remove_all),
+ MenuCommand (N_("Clear Queue"), "edit-clear", 'q', SHIFT, pl_queue_clear),
 MenuSep (),
- MenuCommand (N_("Remove Unavailable Files"), "dialog-warning", NO_KEY, action_playlist_remove_unavailable),
+ MenuCommand (N_("Remove Unavailable Files"), "dialog-warning", NO_KEY, pl_remove_failed),
 MenuSub (N_("Remove Duplicates"), "edit-copy", {dupe_items}),
 MenuSep (),
- MenuCommand (N_("Remove Unselected"), "list-remove", NO_KEY, action_playlist_remove_unselected),
- MenuCommand (N_("Remove Selected"), "list-remove", GDK_KEY_Delete, NO_MOD, action_playlist_remove_selected)
+ MenuCommand (N_("Remove Unselected"), "list-remove", NO_KEY, pl_remove_unselected),
+ MenuCommand (N_("Remove Selected"), "list-remove", GDK_KEY_Delete, NO_MOD, pl_remove_selected)
 };
 
 static const AudguiMenuItem playlist_select_items = {
 MenuCommand (N_("Search and Select"), "edit-find", 'f', CTRL, action_playlist_search_and_select),
 MenuSep (),
- MenuCommand (N_("Invert Selection"), nullptr, NO_KEY, action_playlist_invert_selection),
- MenuCommand (N_("Select None"), nullptr, 'a', SHIFT_CTRL, action_playlist_select_none),
- MenuCommand (N_("Select All"), "edit-select-all", 'a', CTRL, action_playlist_select_all),
+ MenuCommand (N_("Invert Selection"), nullptr, NO_KEY, pl_select_invert),
+ MenuCommand (N_("Select None"), nullptr, 'a', SHIFT_CTRL, pl_select_none),
+ MenuCommand (N_("Select All"), "edit-select-all", 'a', CTRL, pl_select_all),
 };
 
 static const AudguiMenuItem sort_items = {
- MenuCommand (N_("By Track Number"), nullptr, NO_KEY, action_playlist_sort_by_track_number),
- MenuCommand (N_("By Title"), nullptr, NO_KEY, action_playlist_sort_by_title),
- MenuCommand (N_("By Artist"), nullptr, NO_KEY, action_playlist_sort_by_artist),
- MenuCommand (N_("By Album"), nullptr, NO_KEY, action_playlist_sort_by_album),
- MenuCommand (N_("By Album Artist"), nullptr, NO_KEY, action_playlist_sort_by_album_artist),
- MenuCommand (N_("By Release Date"), nullptr, NO_KEY, action_playlist_sort_by_date),
- MenuCommand (N_("By Genre"), nullptr, NO_KEY, action_playlist_sort_by_genre),
- MenuCommand (N_("By Length"), nullptr, NO_KEY, action_playlist_sort_by_length),
- MenuCommand (N_("By File Name"), nullptr, NO_KEY, action_playlist_sort_by_filename),
- MenuCommand (N_("By File Path"), nullptr, NO_KEY, action_playlist_sort_by_full_path),
- MenuCommand (N_("By Custom Title"), nullptr, NO_KEY, action_playlist_sort_by_custom_title)
+ MenuCommand (N_("By Track Number"), nullptr, NO_KEY, sort_track),
+ MenuCommand (N_("By Title"), nullptr, NO_KEY, sort_title),
+ MenuCommand (N_("By Artist"), nullptr, NO_KEY, sort_artist),
+ MenuCommand (N_("By Album"), nullptr, NO_KEY, sort_album),
+ MenuCommand (N_("By Album Artist"), nullptr, NO_KEY, sort_album_artist),
+ MenuCommand (N_("By Release Date"), nullptr, NO_KEY, sort_date),
+ MenuCommand (N_("By Genre"), nullptr, NO_KEY, sort_genre),
+ MenuCommand (N_("By Length"), nullptr, NO_KEY, sort_length),
+ MenuCommand (N_("By File Name"), nullptr, NO_KEY, sort_filename),
+ MenuCommand (N_("By File Path"), nullptr, NO_KEY, sort_path),
+ MenuCommand (N_("By Custom Title"), nullptr, NO_KEY, sort_custom_title),
+ MenuCommand (N_("By Comment"), nullptr, NO_KEY, sort_comment),
+ MenuCommand (N_("By Disc Number"), nullptr, NO_KEY, sort_disc)
 };
 
 static const AudguiMenuItem sort_selected_items = {
- MenuCommand (N_("By Track Number"), nullptr, NO_KEY, action_playlist_sort_selected_by_track_number),
- MenuCommand (N_("By Title"), nullptr, NO_KEY, action_playlist_sort_selected_by_title),
- MenuCommand (N_("By Artist"), nullptr, NO_KEY, action_playlist_sort_selected_by_artist),
- MenuCommand (N_("By Album"), nullptr, NO_KEY, action_playlist_sort_selected_by_album),
- MenuCommand (N_("By Album Artist"), nullptr, NO_KEY, action_playlist_sort_selected_by_album_artist),
- MenuCommand (N_("By Genre"), nullptr, NO_KEY, action_playlist_sort_selected_by_genre),
- MenuCommand (N_("By Release Date"), nullptr, NO_KEY, action_playlist_sort_selected_by_date),
- MenuCommand (N_("By Length"), nullptr, NO_KEY, action_playlist_sort_selected_by_length),
- MenuCommand (N_("By File Name"), nullptr, NO_KEY, action_playlist_sort_selected_by_filename),
- MenuCommand (N_("By File Path"), nullptr, NO_KEY, action_playlist_sort_selected_by_full_path),
- MenuCommand (N_("By Custom Title"), nullptr, NO_KEY, action_playlist_sort_selected_by_custom_title)
+ MenuCommand (N_("By Track Number"), nullptr, NO_KEY, sort_sel_track),
+ MenuCommand (N_("By Title"), nullptr, NO_KEY, sort_sel_title),
+ MenuCommand (N_("By Artist"), nullptr, NO_KEY, sort_sel_artist),
+ MenuCommand (N_("By Album"), nullptr, NO_KEY, sort_sel_album),
+ MenuCommand (N_("By Album Artist"), nullptr, NO_KEY, sort_sel_album_artist),
+ MenuCommand (N_("By Release Date"), nullptr, NO_KEY, sort_sel_date),
+ MenuCommand (N_("By Genre"), nullptr, NO_KEY, sort_sel_genre),
+ MenuCommand (N_("By Length"), nullptr, NO_KEY, sort_sel_length),
+ MenuCommand (N_("By File Name"), nullptr, NO_KEY, sort_sel_filename),
+ MenuCommand (N_("By File Path"), nullptr, NO_KEY, sort_sel_path),
+ MenuCommand (N_("By Custom Title"), nullptr, NO_KEY, sort_sel_custom_title),
+ MenuCommand (N_("By Comment"), nullptr, NO_KEY, sort_comment),
+ MenuCommand (N_("By Disc Number"), nullptr, NO_KEY, sort_sel_disc)
 };
 
 static const AudguiMenuItem playlist_sort_items = {
- MenuCommand (N_("Randomize List"), nullptr, 'r', SHIFT_CTRL, action_playlist_randomize_list),
- MenuCommand (N_("Reverse List"), "view-sort-descending", NO_KEY, action_playlist_reverse_list),
+ MenuCommand (N_("Randomize List"), nullptr, 'r', SHIFT_CTRL, sort_random),
+ MenuCommand (N_("Reverse List"), "view-sort-descending", NO_KEY, sort_reverse),
 MenuSep (),
 MenuSub (N_("Sort Selected"), "view-sort-ascending", {sort_selected_items}),
 MenuSub (N_("Sort List"), "view-sort-ascending", {sort_items})
 };
 
 static const AudguiMenuItem playlist_context_items = {
- MenuCommand (N_("Song Info ..."), "dialog-information", 'i', ALT, action_playlist_track_info),
+ MenuCommand (N_("Song Info ..."), "dialog-information", 'i', ALT, pl_song_info),
+ MenuCommand (N_("Open Containing Folder"), "folder", NO_KEY, pl_open_folder),
 MenuSep (),
- MenuCommand (N_("Cut"), "edit-cut", 'x', CTRL, action_playlist_cut),
- MenuCommand (N_("Copy"), "edit-copy", 'c', CTRL, action_playlist_copy),
- MenuCommand (N_("Paste"), "edit-paste", 'v', CTRL, action_playlist_paste),
+ MenuCommand (N_("Cut"), "edit-cut", 'x', CTRL, pl_cut),
+ MenuCommand (N_("Copy"), "edit-copy", 'c', CTRL, pl_copy),
+ MenuCommand (N_("Paste"), "edit-paste", 'v', CTRL, pl_paste),
+ MenuCommand (N_("Paste at End"), "edit-paste", 'v', SHIFT_CTRL, pl_paste_end),
 MenuSep (),
- MenuCommand (N_("Queue/Unqueue"), nullptr, 'q', NO_MOD, action_queue_toggle),
+ MenuCommand (N_("Queue/Unqueue"), nullptr, 'q', NO_MOD, pl_queue_toggle),
 MenuSep (),
 MenuSub (N_("Services"), nullptr, get_plugin_menu_playlist)
 };
 
-static const AudguiMenuItem eq_preset_items = {
- MenuCommand (N_("Load Preset ..."), "document-open", NO_KEY, eq_preset_load),
- MenuCommand (N_("Load Auto Preset ..."), nullptr, NO_KEY, eq_preset_load_auto),
- MenuCommand (N_("Load Default"), nullptr, NO_KEY, eq_preset_load_default),
- MenuCommand (N_("Load Preset File ..."), nullptr, NO_KEY, eq_preset_load_file),
- MenuCommand (N_("Load EQF File ..."), nullptr, NO_KEY, eq_preset_load_eqf),
- MenuSep (),
- MenuCommand (N_("Save Preset ..."), "document-save", NO_KEY, eq_preset_save),
- MenuCommand (N_("Save Auto Preset ..."), nullptr, NO_KEY, eq_preset_save_auto),
- MenuCommand (N_("Save Default"), nullptr, NO_KEY, eq_preset_save_default),
- MenuCommand (N_("Save Preset File ..."), nullptr, NO_KEY, eq_preset_save_file),
- MenuCommand (N_("Save EQF File ..."), nullptr, NO_KEY, eq_preset_save_eqf),
- MenuSep (),
- MenuCommand (N_("Delete Preset ..."), "edit-delete", NO_KEY, eq_preset_delete),
- MenuCommand (N_("Delete Auto Preset ..."), nullptr, NO_KEY, eq_preset_delete_auto),
- MenuSep (),
- MenuCommand (N_("Import Winamp Presets ..."), "document-open", NO_KEY, eq_preset_import_winamp),
- MenuSep (),
- MenuCommand (N_("Reset to Zero"), "edit-clear", NO_KEY, eq_preset_set_zero)
-};
-
-void menu_init (void)
+void menu_init ()
 {
 static const ArrayRef<AudguiMenuItem> table = {
 {main_items},
@@ -246,8 +256,7 @@
 {playlist_remove_items},
 {playlist_select_items},
 {playlist_sort_items},
- {playlist_context_items},
- {eq_preset_items}
+ {playlist_context_items}
 };
 
 accel = gtk_accel_group_new ();
@@ -260,7 +269,7 @@
 }
 }
 
-void menu_cleanup (void)
+void menu_cleanup ()
 {
 for (int i = 0; i < UI_MENUS; i ++)
 {
@@ -272,11 +281,12 @@
 accel = nullptr;
 }
 
-GtkAccelGroup * menu_get_accel_group (void)
+GtkAccelGroup * menu_get_accel_group ()
 {
 return accel;
 }
 
+#if !GTK_CHECK_VERSION(3, 22, 0)
 typedef struct {
 int x, y;
 gboolean leftward, upward;
@@ -290,7 +300,12 @@
 audgui_get_monitor_geometry (gtk_widget_get_screen ((GtkWidget *) menu), pos->x, pos->y, & geom);
 
 GtkRequisition request;
- gtk_widget_get_preferred_size ((GtkWidget *) menu, NULL, & request);
+#ifdef USE_GTK3
+ gtk_widget_get_preferred_width ((GtkWidget *) menu, nullptr, & request.width);
+ gtk_widget_get_preferred_height ((GtkWidget *) menu, nullptr, & request.height);
+#else
+ gtk_widget_size_request ((GtkWidget *) menu, & request);
+#endif
 
 if (pos->leftward)
 * x = aud::max (pos->x - request.width, geom.x);
@@ -302,10 +317,16 @@
 else
 * y = aud::min (pos->y, geom.y + geom.height - request.height);
 }
+#endif
 
 void menu_popup (int id, int x, int y, gboolean leftward, gboolean upward,
- int button, int time)
+ const GdkEventButton * event)
 {
+#if GTK_CHECK_VERSION(3, 22, 0)
+ gtk_menu_popup_at_pointer ((GtkMenu *) menusid, (const GdkEvent *) event);
+#else
 const MenuPosition pos = {x, y, leftward, upward};
- gtk_menu_popup ((GtkMenu *) menusid, nullptr, nullptr, position_menu, (void *) & pos, button, time);
+ gtk_menu_popup ((GtkMenu *) menusid, nullptr, nullptr, position_menu,
+ (void *) & pos, event->button, event->time);
+#endif
 }

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/menus.h -> audacious-plugins-4.4.1.tar.bz2/src/skins/menus.h Changed

audacious-plugins-4.4.1.tar.bz2/src/skins/meson.build Added

audacious-plugins-4.4.1.tar.bz2/src/skins/monostereo.cc Added

@@ -0,0 +1,61 @@
+/*
+ * Audacious - a cross-platform multimedia player
+ * Copyright (c) 2007 Tomasz Moń
+ * Copyright (c) 2011 John Lindgren
+ *
+ * Based on:
+ * BMP - Cross-platform multimedia player
+ * Copyright (C) 2003-2004 BMP development team.
+ * XMMS:
+ * Copyright (C) 1998-2003 XMMS development team.
+ *
+ * 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; under version 3 of the License.
+ *
+ * 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>.
+ *
+ * The Audacious team does not consider modular code linking to
+ * Audacious or using our public API to be a derived work.
+ */
+
+#include "skins_cfg.h"
+#include "skin.h"
+#include "monostereo.h"
+
+void MonoStereo::draw (cairo_t * cr)
+{
+ switch (m_num_channels)
+ {
+ case 0:
+ skin_draw_pixbuf (cr, SKIN_MONOSTEREO, 29, 12, 0, 0, 27, 12);
+ skin_draw_pixbuf (cr, SKIN_MONOSTEREO, 0, 12, 27, 0, 29, 12);
+ break;
+ case 1:
+ skin_draw_pixbuf (cr, SKIN_MONOSTEREO, 29, 0, 0, 0, 27, 12);
+ skin_draw_pixbuf (cr, SKIN_MONOSTEREO, 0, 12, 27, 0, 29, 12);
+ break;
+ default:
+ skin_draw_pixbuf (cr, SKIN_MONOSTEREO, 29, 12, 0, 0, 27, 12);
+ skin_draw_pixbuf (cr, SKIN_MONOSTEREO, 0, 0, 27, 0, 29, 12);
+ break;
+ }
+}
+
+MonoStereo::MonoStereo ()
+{
+ set_scale (config.scale);
+ add_drawable (56, 12);
+}
+
+void MonoStereo::set_num_channels (int num_channels)
+{
+ m_num_channels = num_channels;
+ queue_draw ();
+}

audacious-plugins-4.4.1.tar.bz2/src/skins/monostereo.h Added

@@ -0,0 +1,45 @@
+/*
+ * Audacious - a cross-platform multimedia player
+ * Copyright (c) 2007 Tomasz Moń
+ * Copyright (c) 2011 John Lindgren
+ *
+ * Based on:
+ * BMP - Cross-platform multimedia player
+ * Copyright (C) 2003-2004 BMP development team.
+ * XMMS:
+ * Copyright (C) 1998-2003 XMMS development team.
+ *
+ * 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; under version 3 of the License.
+ *
+ * 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>.
+ *
+ * The Audacious team does not consider modular code linking to
+ * Audacious or using our public API to be a derived work.
+ */
+
+#ifndef SKINS_UI_SKINNED_MONOSTEREO_H
+#define SKINS_UI_SKINNED_MONOSTEREO_H
+
+#include "widget.h"
+
+class MonoStereo : public Widget
+{
+public:
+ MonoStereo ();
+ void set_num_channels (int num_channels);
+
+private:
+ void draw (cairo_t * cr);
+
+ int m_num_channels = 0;
+};
+
+#endif

audacious-plugins-4.4.1.tar.bz2/src/skins/number.cc Added

@@ -0,0 +1,60 @@
+/*
+ * Audacious - a cross-platform multimedia player
+ * Copyright (c) 2007 Tomasz Moń
+ * Copyright (c) 2011 John Lindgren
+ *
+ * Based on:
+ * BMP - Cross-platform multimedia player
+ * Copyright (C) 2003-2004 BMP development team.
+ * XMMS:
+ * Copyright (C) 1998-2003 XMMS development team.
+ *
+ * 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; under version 3 of the License.
+ *
+ * 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>.
+ *
+ * The Audacious team does not consider modular code linking to
+ * Audacious or using our public API to be a derived work.
+ */
+
+#include <libaudcore/runtime.h>
+
+#include "skins_cfg.h"
+#include "main.h"
+#include "skin.h"
+#include "number.h"
+
+void SkinnedNumber::draw (cairo_t * cr)
+{
+ skin_draw_pixbuf (cr, SKIN_NUMBERS, m_num * 9, 0, 0, 0, 9, 13);
+}
+
+bool SkinnedNumber::button_press (GdkEventButton * event)
+{
+ return change_timer_mode_cb (event);
+}
+
+SkinnedNumber::SkinnedNumber ()
+{
+ set_scale (config.scale);
+ add_input (9, 13, false, true);
+}
+
+void SkinnedNumber::set (char c)
+{
+ int value = (c >= '0' && c <= '9') ? c - '0' : (c == '-') ? 11 : 10;
+
+ if (m_num != value)
+ {
+ m_num = value;
+ queue_draw ();
+ }
+}

audacious-plugins-4.4.1.tar.bz2/src/skins/number.h Added

@@ -0,0 +1,40 @@
+/*
+ * Audacious - a cross-platform multimedia player
+ * Copyright (c) 2007 Tomasz Moń
+ * Copyright (c) 2011 John Lindgren
+ *
+ * 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; under version 3 of the License.
+ *
+ * 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>.
+ *
+ * The Audacious team does not consider modular code linking to
+ * Audacious or using our public API to be a derived work.
+ */
+
+#ifndef SKINS_UI_SKINNED_NUMBER_H
+#define SKINS_UI_SKINNED_NUMBER_H
+
+#include "widget.h"
+
+class SkinnedNumber : public Widget
+{
+public:
+ SkinnedNumber ();
+ void set (char c);
+
+private:
+ virtual void draw (cairo_t * cr);
+ virtual bool button_press (GdkEventButton * event);
+
+ int m_num = 0;
+};
+
+#endif

audacious-plugins-4.4.1.tar.bz2/src/skins/playlist-slider.cc Added

@@ -0,0 +1,123 @@
+/*
+ * Audacious - a cross-platform multimedia player
+ * Copyright (c) 2007 Tomasz Moń
+ * Copyright (c) 2011 John Lindgren
+ *
+ * Based on:
+ * BMP - Cross-platform multimedia player
+ * Copyright (C) 2003-2004 BMP development team.
+ * XMMS:
+ * Copyright (C) 1998-2003 XMMS development team.
+ *
+ * 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; under version 3 of the License.
+ *
+ * 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>.
+ *
+ * The Audacious team does not consider modular code linking to
+ * Audacious or using our public API to be a derived work.
+ */
+
+#include <libaudcore/objects.h>
+#include <libaudcore/playlist.h>
+
+#include "skins_cfg.h"
+#include "skin.h"
+#include "playlist-widget.h"
+#include "playlist-slider.h"
+
+void PlaylistSlider::draw (cairo_t * cr)
+{
+ int rows, first;
+ m_list->row_info (& rows, & first);
+
+ int range = m_length - rows;
+
+ int y;
+ if (m_length > rows)
+ y = (first * (m_height - 19) + range / 2) / range;
+ else
+ y = 0;
+
+ for (int i = 0; i < m_height / 29; i ++)
+ skin_draw_pixbuf (cr, SKIN_PLEDIT, 36, 42, 0, 29 * i, 8, 29);
+
+ skin_draw_pixbuf (cr, SKIN_PLEDIT, m_pressed ? 61 : 52, 53, 0, y, 8, 18);
+}
+
+void PlaylistSlider::set_pos (int y)
+{
+ y = aud::clamp (y, 0, m_height - 19);
+
+ int rows, first;
+ m_list->row_info (& rows, & first);
+
+ int range = m_height - 19;
+ m_list->scroll_to ((y * (m_length - rows) + range / 2) / range);
+}
+
+bool PlaylistSlider::button_press (GdkEventButton * event)
+{
+ if (event->button != 1)
+ return false;
+
+ m_pressed = true;
+ set_pos (event->y / config.scale - 9);
+
+ queue_draw ();
+ return true;
+}
+
+bool PlaylistSlider::button_release (GdkEventButton * event)
+{
+ if (event->button != 1)
+ return false;
+
+ if (! m_pressed)
+ return true;
+
+ m_pressed = false;
+ set_pos (event->y / config.scale - 9);
+
+ queue_draw ();
+ return true;
+}
+
+bool PlaylistSlider::motion (GdkEventMotion * event)
+{
+ if (! m_pressed)
+ return true;
+
+ set_pos (event->y / config.scale - 9);
+
+ queue_draw ();
+ return true;
+}
+
+PlaylistSlider::PlaylistSlider (PlaylistWidget * list, int height) :
+ m_list (list), m_height (height),
+ m_length (Playlist::active_playlist ().n_entries ())
+{
+ set_scale (config.scale);
+ add_input (8, height, true, true);
+}
+
+void PlaylistSlider::resize (int height)
+{
+ m_height = height;
+ Widget::resize (8, height);
+ queue_draw ();
+}
+
+void PlaylistSlider::refresh ()
+{
+ m_length = Playlist::active_playlist ().n_entries ();
+ queue_draw ();
+}

audacious-plugins-4.4.1.tar.bz2/src/skins/playlist-slider.h Added

@@ -0,0 +1,55 @@
+/*
+ * Audacious - a cross-platform multimedia player
+ * Copyright (c) 2007 Tomasz Moń
+ * Copyright (c) 2011 John Lindgren
+ *
+ * Based on:
+ * BMP - Cross-platform multimedia player
+ * Copyright (C) 2003-2004 BMP development team.
+ * XMMS:
+ * Copyright (C) 1998-2003 XMMS development team.
+ *
+ * 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; under version 3 of the License.
+ *
+ * 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>.
+ *
+ * The Audacious team does not consider modular code linking to
+ * Audacious or using our public API to be a derived work.
+ */
+
+#ifndef SKINS_UI_SKINNED_PLAYLIST_SLIDER_H
+#define SKINS_UI_SKINNED_PLAYLIST_SLIDER_H
+
+#include "widget.h"
+
+class PlaylistWidget;
+
+class PlaylistSlider : public Widget
+{
+public:
+ PlaylistSlider (PlaylistWidget * list, int height);
+ void resize (int height);
+ void refresh ();
+
+private:
+ void draw (cairo_t * cr);
+ bool button_press (GdkEventButton * event);
+ bool button_release (GdkEventButton * event);
+ bool motion (GdkEventMotion * event);
+
+ void set_pos (int y);
+
+ PlaylistWidget * m_list;
+ int m_height, m_length;
+ bool m_pressed = false;
+};
+
+#endif

audacious-plugins-4.4.1.tar.bz2/src/skins/playlist-widget.cc Added

@@ -0,0 +1,815 @@
+/*
+ * Audacious - a cross-platform multimedia player
+ * Copyright (c) 2007 Tomasz Moń
+ * Copyright (c) 2008 William Pitcock
+ * Copyright (c) 2009-2011 John Lindgren
+ *
+ * Based on:
+ * BMP - Cross-platform multimedia player
+ * Copyright (C) 2003-2004 BMP development team.
+ *
+ * XMMS:
+ * Copyright (C) 1998-2003 XMMS development team.
+ *
+ * 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; under version 3 of the License.
+ *
+ * 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>.
+ *
+ * The Audacious team does not consider modular code linking to
+ * Audacious or using our public API to be a derived work.
+ */
+
+#include <gdk/gdkkeysyms.h>
+
+#include "menus.h"
+#include "skins_cfg.h"
+#include "skin.h"
+#include "playlist-widget.h"
+#include "playlist-slider.h"
+#include "playlistwin.h"
+#include "window.h"
+
+#include <libaudcore/audstrings.h>
+#include <libaudcore/hook.h>
+#include <libaudcore/i18n.h>
+#include <libaudcore/runtime.h>
+#include <libaudcore/playlist.h>
+#include <libaudgui/libaudgui.h>
+#include <libaudgui/libaudgui-gtk.h>
+
+enum {
+ DRAG_SELECT = 1,
+ DRAG_MOVE
+};
+
+void PlaylistWidget::update_title ()
+{
+ if (Playlist::n_playlists () > 1)
+ {
+ String title = m_playlist.get_title ();
+ m_title_text = String (str_printf (_("%s (%d of %d)"),
+ (const char *) title, 1 + m_playlist.index (), Playlist::n_playlists ()));
+ }
+ else
+ m_title_text = String ();
+}
+
+void PlaylistWidget::calc_layout ()
+{
+ m_rows = m_height / m_row_height;
+
+ if (m_rows && m_title_text)
+ {
+ m_offset = m_row_height;
+ m_rows --;
+ }
+ else
+ m_offset = 0;
+
+ if (m_first + m_rows > m_length)
+ m_first = m_length - m_rows;
+ if (m_first < 0)
+ m_first = 0;
+}
+
+int PlaylistWidget::calc_position (int y) const
+{
+ if (y < m_offset)
+ return -1;
+
+ int position = m_first + (y - m_offset) / m_row_height;
+ if (position >= m_first + m_rows || position >= m_length)
+ return m_length;
+
+ return position;
+}
+
+int PlaylistWidget::adjust_position (bool relative, int position) const
+{
+ if (m_length == 0)
+ return -1;
+
+ if (relative)
+ {
+ int focus = m_playlist.get_focus ();
+ if (focus == -1)
+ return 0;
+
+ position += focus;
+ }
+
+ if (position < 0)
+ return 0;
+ if (position >= m_length)
+ return m_length - 1;
+
+ return position;
+}
+
+void PlaylistWidget::cancel_all ()
+{
+ m_drag = false;
+
+ if (m_scroll)
+ {
+ m_scroll = 0;
+ scroll_timer.stop ();
+ }
+
+ if (m_hover != -1)
+ {
+ m_hover = -1;
+ queue_draw ();
+ }
+
+ popup_hide ();
+}
+
+void PlaylistWidget::draw (cairo_t * cr)
+{
+ int active_entry = m_playlist.get_position ();
+ int left = 3, right = 3;
+ PangoLayout * layout;
+ int width;
+
+ /* background */
+
+ set_cairo_color (cr, skin.colorsSKIN_PLEDIT_NORMALBG);
+ cairo_paint (cr);
+
+ /* playlist title */
+
+ if (m_offset)
+ {
+ layout = gtk_widget_create_pango_layout (gtk_dr (), m_title_text);
+ pango_layout_set_font_description (layout, m_font.get ());
+ pango_layout_set_width (layout, PANGO_SCALE * (m_width - left - right));
+ pango_layout_set_alignment (layout, PANGO_ALIGN_CENTER);
+ pango_layout_set_ellipsize (layout, PANGO_ELLIPSIZE_MIDDLE);
+
+ cairo_move_to (cr, left, 0);
+ set_cairo_color (cr, skin.colorsSKIN_PLEDIT_NORMAL);
+ pango_cairo_show_layout (cr, layout);
+ g_object_unref (layout);
+ }
+
+ /* selection highlight */
+
+ for (int i = m_first; i < m_first + m_rows && i < m_length; i ++)
+ {
+ if (! m_playlist.entry_selected (i))
+ continue;
+
+ cairo_rectangle (cr, 0, m_offset + m_row_height * (i - m_first), m_width, m_row_height);
+ set_cairo_color (cr, skin.colorsSKIN_PLEDIT_SELECTEDBG);
+ cairo_fill (cr);
+ }
+
+ /* entry numbers */
+
+ if (aud_get_bool ("show_numbers_in_pl"))
+ {
+ width = 0;
+
+ for (int i = m_first; i < m_first + m_rows && i < m_length; i ++)
+ {
+ char buf16;
+ snprintf (buf, sizeof buf, "%d.", 1 + i);
+
+ layout = gtk_widget_create_pango_layout (gtk_dr (), buf);
+ pango_layout_set_font_description (layout, m_font.get ());
+
+ PangoRectangle rect;
+ pango_layout_get_pixel_extents (layout, nullptr, & rect);
+ width = aud::max (width, rect.width);
+
+ cairo_move_to (cr, left, m_offset + m_row_height * (i - m_first));
+ set_cairo_color (cr, skin.colors(i == active_entry) ?
+ SKIN_PLEDIT_CURRENT : SKIN_PLEDIT_NORMAL);
+ pango_cairo_show_layout (cr, layout);
+ g_object_unref (layout);
+ }
+
+ left += width + 4;
+ }
+
+ /* entry lengths */
+
+ width = 0;
+
+ for (int i = m_first; i < m_first + m_rows && i < m_length; i ++)
+ {
+ Tuple tuple = m_playlist.entry_tuple (i, Playlist::NoWait);
+ int len = tuple.get_int (Tuple::Length);
+ if (len < 0)
+ continue;
+
+ layout = gtk_widget_create_pango_layout (gtk_dr (), str_format_time (len));
+ pango_layout_set_font_description (layout, m_font.get ());
+
+ PangoRectangle rect;
+ pango_layout_get_pixel_extents (layout, nullptr, & rect);
+ width = aud::max (width, rect.width);
+
+ cairo_move_to (cr, m_width - right - rect.width, m_offset + m_row_height * (i - m_first));
+ set_cairo_color (cr, skin.colors(i == active_entry) ?
+ SKIN_PLEDIT_CURRENT : SKIN_PLEDIT_NORMAL);
+ pango_cairo_show_layout (cr, layout);
+ g_object_unref (layout);
+ }
+
+ right += width + 6;
+
+ /* queue positions */
+
+ if (m_playlist.n_queued ())
+ {
+ width = 0;
+
+ for (int i = m_first; i < m_first + m_rows && i < m_length; i ++)
+ {
+ int pos = m_playlist.queue_find_entry (i);
+ if (pos < 0)
+ continue;
+
+ char buf16;
+ snprintf (buf, sizeof buf, "(#%d)", 1 + pos);
+
+ layout = gtk_widget_create_pango_layout (gtk_dr (), buf);
+ pango_layout_set_font_description (layout, m_font.get ());
+
+ PangoRectangle rect;
+ pango_layout_get_pixel_extents (layout, nullptr, & rect);
+ width = aud::max (width, rect.width);
+
+ cairo_move_to (cr, m_width - right - rect.width, m_offset +
+ m_row_height * (i - m_first));
+ set_cairo_color (cr, skin.colors(i == active_entry) ?
+ SKIN_PLEDIT_CURRENT : SKIN_PLEDIT_NORMAL);
+ pango_cairo_show_layout (cr, layout);
+ g_object_unref (layout);
+ }
+
+ right += width + 6;
+ }
+
+ /* titles */
+
+ for (int i = m_first; i < m_first + m_rows && i < m_length; i ++)
+ {
+ Tuple tuple = m_playlist.entry_tuple (i, Playlist::NoWait);
+ String title = tuple.get_str (Tuple::FormattedTitle);
+
+ layout = gtk_widget_create_pango_layout (gtk_dr (), title);
+ pango_layout_set_font_description (layout, m_font.get ());
+ pango_layout_set_width (layout, PANGO_SCALE * (m_width - left - right));
+ pango_layout_set_ellipsize (layout, PANGO_ELLIPSIZE_END);
+
+ cairo_move_to (cr, left, m_offset + m_row_height * (i - m_first));
+ set_cairo_color (cr, skin.colors(i == active_entry) ?
+ SKIN_PLEDIT_CURRENT : SKIN_PLEDIT_NORMAL);
+ pango_cairo_show_layout (cr, layout);
+ g_object_unref (layout);
+ }
+
+ /* focus rectangle */
+
+ int focus = m_playlist.get_focus ();
+
+ /* don't show rectangle if this is the only selected entry */
+ if (focus >= m_first && focus <= m_first + m_rows - 1 &&
+ (! m_playlist.entry_selected (focus) || m_playlist.n_selected () > 1))
+ {
+ cairo_new_path (cr);
+ cairo_set_line_width (cr, 1);
+ cairo_rectangle (cr, 0.5, m_offset + m_row_height * (focus - m_first) +
+ 0.5, m_width - 1, m_row_height - 1);
+ set_cairo_color (cr, skin.colorsSKIN_PLEDIT_NORMAL);
+ cairo_stroke (cr);
+ }
+
+ /* hover line */
+
+ if (m_hover >= m_first && m_hover <= m_first + m_rows)
+ {
+ cairo_new_path (cr);
+ cairo_set_line_width (cr, 2);
+ cairo_move_to (cr, 0, m_offset + m_row_height * (m_hover - m_first));
+ cairo_rel_line_to (cr, m_width, 0);
+ set_cairo_color (cr, skin.colorsSKIN_PLEDIT_NORMAL);
+ cairo_stroke (cr);
+ }
+}
+
+PlaylistWidget::PlaylistWidget (int width, int height, const char * font) :
+ m_width (width * config.scale),
+ m_height (height * config.scale)
+{
+ add_input (m_width, m_height, true, true);
+ set_font (font); /* calls refresh() */
+}
+
+void PlaylistWidget::resize (int width, int height)
+{
+ m_width = width * config.scale;
+ m_height = height * config.scale;
+
+ Widget::resize (m_width, m_height);
+ refresh ();
+}
+
+void PlaylistWidget::set_font (const char * font)
+{
+ m_font.capture (pango_font_description_from_string (font));
+
+ PangoLayout * layout = gtk_widget_create_pango_layout (gtk_dr (), "A");
+ pango_layout_set_font_description (layout, m_font.get ());
+
+ PangoRectangle rect;
+ pango_layout_get_pixel_extents (layout, nullptr, & rect);
+
+ /* make sure row_height is non-zero; we divide by it */
+ m_row_height = aud::max (rect.height, 1);
+
+ g_object_unref (layout);
+ refresh ();
+}
+
+void PlaylistWidget::refresh ()
+{
+ auto prev_playlist = m_playlist;
+ m_playlist = Playlist::active_playlist ();
+ m_length = m_playlist.n_entries ();
+
+ update_title ();
+ calc_layout ();
+
+ if (m_playlist != prev_playlist)
+ {
+ cancel_all ();
+ m_first = 0;
+ ensure_visible (m_playlist.get_focus ());
+ }
+
+ queue_draw ();
+
+ if (m_slider)
+ m_slider->refresh ();
+}
+
+void PlaylistWidget::ensure_visible (int position)
+{
+ if (position < m_first || position >= m_first + m_rows)
+ m_first = position - m_rows / 2;
+
+ calc_layout ();
+}
+
+void PlaylistWidget::select_single (bool relative, int position)
+{
+ position = adjust_position (relative, position);
+
+ if (position == -1)
+ return;
+
+ m_playlist.select_all (false);
+ m_playlist.select_entry (position, true);
+ m_playlist.set_focus (position);
+ ensure_visible (position);
+}
+
+void PlaylistWidget::select_extend (bool relative, int position)
+{
+ position = adjust_position (relative, position);
+
+ if (position == -1)
+ return;
+
+ int count = adjust_position (true, 0);
+ int sign = (position > count) ? 1 : -1;
+
+ for (; count != position; count += sign)
+ m_playlist.select_entry (count, ! m_playlist.entry_selected (count + sign));
+
+ m_playlist.select_entry (position, true);
+ m_playlist.set_focus (position);
+ ensure_visible (position);
+}
+
+void PlaylistWidget::select_slide (bool relative, int position)
+{
+ position = adjust_position (relative, position);
+
+ if (position == -1)
+ return;
+
+ m_playlist.set_focus (position);
+ ensure_visible (position);
+}
+
+void PlaylistWidget::select_toggle (bool relative, int position)
+{
+ position = adjust_position (relative, position);
+
+ if (position == -1)
+ return;
+
+ m_playlist.select_entry (position, ! m_playlist.entry_selected (position));
+ m_playlist.set_focus (position);
+ ensure_visible (position);
+}
+
+void PlaylistWidget::select_move (bool relative, int position)
+{
+ int focus = m_playlist.get_focus ();
+ position = adjust_position (relative, position);
+
+ if (focus == -1 || position == -1 || position == focus)
+ return;
+
+ focus += m_playlist.shift_entries (focus, position - focus);
+ ensure_visible (focus);
+}
+
+void PlaylistWidget::delete_selected ()
+{
+ m_playlist.remove_selected ();
+
+ m_length = m_playlist.n_entries ();
+ int focus = m_playlist.get_focus ();
+
+ if (focus != -1)
+ {
+ m_playlist.select_entry (focus, true);
+ ensure_visible (focus);
+ }
+}
+
+bool PlaylistWidget::handle_keypress (GdkEventKey * event)
+{
+ cancel_all ();
+
+ switch (event->state & (GDK_SHIFT_MASK | GDK_CONTROL_MASK | GDK_MOD1_MASK))
+ {
+ case 0:
+ switch (event->keyval)
+ {
+ case GDK_KEY_Up:
+ select_single (true, -1);
+ break;
+ case GDK_KEY_Down:
+ select_single (true, 1);
+ break;
+ case GDK_KEY_Page_Up:
+ select_single (true, -m_rows);
+ break;
+ case GDK_KEY_Page_Down:
+ select_single (true, m_rows);
+ break;
+ case GDK_KEY_Home:
+ select_single (false, 0);
+ break;
+ case GDK_KEY_End:
+ select_single (false, m_length - 1);
+ break;
+ case GDK_KEY_Return:
+ select_single (true, 0);
+ m_playlist.set_position (m_playlist.get_focus ());
+ m_playlist.start_playback ();
+ break;
+ case GDK_KEY_Escape:
+ select_single (false, m_playlist.get_position ());
+ break;
+ case GDK_KEY_Delete:
+ delete_selected ();
+ break;
+ default:
+ return false;
+ }
+ break;
+ case GDK_SHIFT_MASK:
+ switch (event->keyval)
+ {
+ case GDK_KEY_Up:
+ select_extend (true, -1);
+ break;
+ case GDK_KEY_Down:
+ select_extend (true, 1);
+ break;
+ case GDK_KEY_Page_Up:
+ select_extend (true, -m_rows);
+ break;
+ case GDK_KEY_Page_Down:
+ select_extend (true, m_rows);
+ break;
+ case GDK_KEY_Home:
+ select_extend (false, 0);
+ break;
+ case GDK_KEY_End:
+ select_extend (false, m_length - 1);
+ break;
+ default:
+ return false;
+ }
+ break;
+ case GDK_CONTROL_MASK:
+ switch (event->keyval)
+ {
+ case GDK_KEY_space:
+ select_toggle (true, 0);
+ break;
+ case GDK_KEY_Up:
+ select_slide (true, -1);
+ break;
+ case GDK_KEY_Down:
+ select_slide (true, 1);
+ break;
+ case GDK_KEY_Page_Up:
+ select_slide (true, -m_rows);
+ break;
+ case GDK_KEY_Page_Down:
+ select_slide (true, m_rows);
+ break;
+ case GDK_KEY_Home:
+ select_slide (false, 0);
+ break;
+ case GDK_KEY_End:
+ select_slide (false, m_length - 1);
+ break;
+ default:
+ return false;
+ }
+ break;
+ case GDK_MOD1_MASK:
+ switch (event->keyval)
+ {
+ case GDK_KEY_Up:
+ select_move (true, -1);
+ break;
+ case GDK_KEY_Down:
+ select_move (true, 1);
+ break;
+ case GDK_KEY_Page_Up:
+ select_move (true, -m_rows);
+ break;
+ case GDK_KEY_Page_Down:
+ select_move (true, m_rows);
+ break;
+ case GDK_KEY_Home:
+ select_move (false, 0);
+ break;
+ case GDK_KEY_End:
+ select_move (false, m_length - 1);
+ break;
+ default:
+ return false;
+ }
+ break;
+ default:
+ return false;
+ }
+
+ refresh ();
+ return true;
+}
+
+void PlaylistWidget::row_info (int * rows, int * first)
+{
+ * rows = m_rows;
+ * first = m_first;
+}
+
+void PlaylistWidget::scroll_to (int row)
+{
+ cancel_all ();
+ m_first = row;
+ refresh ();
+}
+
+void PlaylistWidget::set_focused (int row)
+{
+ cancel_all ();
+ m_playlist.set_focus (row);
+ ensure_visible (row);
+ refresh ();
+}
+
+void PlaylistWidget::hover (int x, int y)
+{
+ int row;
+
+ if (y < m_offset)
+ row = m_first;
+ else if (y > m_offset + m_row_height * m_rows)
+ row = m_first + m_rows;
+ else
+ row = m_first + (y - m_offset + m_row_height / 2) / m_row_height;
+
+ if (row > m_length)
+ row = m_length;
+
+ if (row != m_hover)
+ {
+ m_hover = row;
+ queue_draw ();
+ }
+}
+
+int PlaylistWidget::hover_end ()
+{
+ int temp = m_hover;
+ m_hover = -1;
+
+ queue_draw ();
+ return temp;
+}
+
+bool PlaylistWidget::button_press (GdkEventButton * event)
+{
+ int position = calc_position (event->y);
+ int state = event->state & (GDK_SHIFT_MASK | GDK_CONTROL_MASK |
+ GDK_MOD1_MASK);
+
+ cancel_all ();
+
+ switch (event->type)
+ {
+ case GDK_BUTTON_PRESS:
+ switch (event->button)
+ {
+ case 1:
+ if (position == -1 || position == m_length)
+ return true;
+
+ switch (state)
+ {
+ case 0:
+ if (m_playlist.entry_selected (position))
+ select_slide (false, position);
+ else
+ select_single (false, position);
+
+ m_drag = DRAG_MOVE;
+ break;
+ case GDK_SHIFT_MASK:
+ select_extend (false, position);
+ m_drag = DRAG_SELECT;
+ break;
+ case GDK_CONTROL_MASK:
+ select_toggle (false, position);
+ m_drag = DRAG_SELECT;
+ break;
+ default:
+ return true;
+ }
+
+ break;
+ case 3:
+ if (state)
+ return true;
+
+ if (position != -1 && position != m_length)
+ {
+ if (m_playlist.entry_selected (position))
+ select_slide (false, position);
+ else
+ select_single (false, position);
+ }
+
+ menu_popup ((position == -1) ? UI_MENU_PLAYLIST :
+ UI_MENU_PLAYLIST_CONTEXT, event->x_root, event->y_root, false,
+ false, event);
+ break;
+ default:
+ return false;
+ }
+
+ break;
+ case GDK_2BUTTON_PRESS:
+ if (event->button != 1 || state || position == m_length)
+ return true;
+
+ if (position != -1)
+ m_playlist.set_position (position);
+
+ m_playlist.start_playback ();
+ break;
+ default:
+ return true;
+ }
+
+ refresh ();
+ return true;
+}
+
+bool PlaylistWidget::button_release (GdkEventButton * event)
+{
+ cancel_all ();
+ return true;
+}
+
+void PlaylistWidget::scroll_timeout ()
+{
+ int position = adjust_position (true, m_scroll);
+ if (position == -1)
+ return;
+
+ switch (m_drag)
+ {
+ case DRAG_SELECT:
+ select_extend (false, position);
+ break;
+ case DRAG_MOVE:
+ select_move (false, position);
+ break;
+ }
+
+ refresh ();
+}
+
+bool PlaylistWidget::motion (GdkEventMotion * event)
+{
+ int position = calc_position (event->y);
+
+ if (m_drag)
+ {
+ if (position == -1 || position == m_length)
+ {
+ if (! m_scroll)
+ scroll_timer.start ();
+
+ m_scroll = (position == -1 ? -1 : 1);
+ }
+ else
+ {
+ if (m_scroll)
+ {
+ m_scroll = 0;
+ scroll_timer.stop ();
+ }
+
+ switch (m_drag)
+ {
+ case DRAG_SELECT:
+ select_extend (false, position);
+ break;
+ case DRAG_MOVE:
+ select_move (false, position);
+ break;
+ }
+
+ refresh ();
+ }
+ }
+ else
+ {
+ if (position == -1 || position == m_length)
+ cancel_all ();
+ else if (aud_get_bool ("show_filepopup_for_tuple") && m_popup_pos != position)
+ {
+ cancel_all ();
+ popup_trigger (position);
+ }
+ }
+
+ return true;
+}
+
+bool PlaylistWidget::leave ()
+{
+ if (! m_drag)
+ cancel_all ();
+
+ return true;
+}
+
+void PlaylistWidget::popup_trigger (int pos)
+{
+ audgui_infopopup_hide ();
+
+ m_popup_pos = pos;
+ m_popup_timer.queue (aud_get_int ("filepopup_delay") * 100,
+ this () { popup_show (); });
+}
+
+void PlaylistWidget::popup_show ()
+{
+ GtkWindow * parent = (GtkWindow *) playlistwin->gtk ();
+ audgui_infopopup_show (parent, m_playlist, m_popup_pos);
+}
+
+void PlaylistWidget::popup_hide ()
+{
+ audgui_infopopup_hide ();
+
+ m_popup_pos = -1;
+ m_popup_timer.stop ();
+}

audacious-plugins-4.4.1.tar.bz2/src/skins/playlist-widget.h Added

@@ -0,0 +1,99 @@
+/*
+ * Audacious - a cross-platform multimedia player
+ * Copyright (c) 2007 Tomasz Moń
+ * Copyright (c) 2009-2011 John Lindgren
+ *
+ * Based on:
+ * BMP - Cross-platform multimedia player
+ * Copyright (C) 2003-2004 BMP development team.
+ * XMMS:
+ * Copyright (C) 1998-2003 XMMS development team.
+ *
+ * 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; under version 3 of the License.
+ *
+ * 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>.
+ *
+ * The Audacious team does not consider modular code linking to
+ * Audacious or using our public API to be a derived work.
+ */
+
+#ifndef SKINS_UI_SKINNED_PLAYLIST_H
+#define SKINS_UI_SKINNED_PLAYLIST_H
+
+#include <libaudcore/hook.h>
+#include <libaudcore/mainloop.h>
+#include <libaudcore/playlist.h>
+
+#include "widget.h"
+
+class PlaylistSlider;
+
+typedef SmartPtr<PangoFontDescription, pango_font_description_free> PangoFontDescPtr;
+
+class PlaylistWidget : public Widget
+{
+public:
+ PlaylistWidget (int width, int height, const char * font);
+ ~PlaylistWidget () { cancel_all (); }
+
+ void set_slider (PlaylistSlider * slider) { m_slider = slider; }
+ void resize (int width, int height);
+ void set_font (const char * m_font);
+ void refresh ();
+ bool handle_keypress (GdkEventKey * event);
+ void row_info (int * m_rows, int * m_first);
+ void scroll_to (int row);
+ void set_focused (int row);
+ void hover (int x, int y);
+ int hover_end ();
+
+private:
+ void draw (cairo_t * cr);
+ bool button_press (GdkEventButton * event);
+ bool button_release (GdkEventButton * event);
+ bool motion (GdkEventMotion * event);
+ bool leave ();
+
+ void update_title ();
+ void calc_layout ();
+
+ int calc_position (int y) const;
+ int adjust_position (bool relative, int position) const;
+
+ void ensure_visible (int position);
+ void select_single (bool relative, int position);
+ void select_extend (bool relative, int position);
+ void select_slide (bool relative, int position);
+ void select_toggle (bool relative, int position);
+ void select_move (bool relative, int position);
+ void delete_selected ();
+
+ void cancel_all ();
+ void scroll_timeout ();
+ void popup_trigger (int pos);
+ void popup_show ();
+ void popup_hide ();
+
+ const Timer<PlaylistWidget>
+ scroll_timer {TimerRate::Hz10, this, & PlaylistWidget::scroll_timeout};
+
+ PlaylistSlider * m_slider = nullptr;
+ PangoFontDescPtr m_font;
+ String m_title_text;
+
+ Playlist m_playlist;
+ int m_length = 0;
+ int m_width = 0, m_height = 0, m_row_height = 1, m_offset = 0, m_rows = 0, m_first = 0;
+ int m_scroll = 0, m_hover = -1, m_drag = 0, m_popup_pos = -1;
+ QueuedFunc m_popup_timer;
+};
+
+#endif

audacious-plugins-4.4.1.tar.bz2/src/skins/playlistwin.cc Added

@@ -0,0 +1,544 @@
+/* Audacious - Cross-platform multimedia player
+ * Copyright (C) 2005-2011 Audacious development team.
+ *
+ * BMP - Cross-platform multimedia player
+ * Copyright (C) 2003-2004 BMP development team.
+ *
+ * Based on XMMS:
+ * Copyright (C) 1998-2003 XMMS development team.
+ *
+ * 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; under version 3 of the License.
+ *
+ * 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>.
+ *
+ * The Audacious team does not consider modular code linking to
+ * Audacious or using our public API to be a derived work.
+ */
+
+#include <inttypes.h>
+#include <string.h>
+
+#include <gdk/gdkkeysyms.h>
+#include <gtk/gtk.h>
+
+#include <libaudcore/audstrings.h>
+#include <libaudcore/drct.h>
+#include <libaudcore/hook.h>
+#include <libaudcore/i18n.h>
+#include <libaudcore/playlist.h>
+#include <libaudcore/runtime.h>
+#include <libaudcore/tuple.h>
+#include <libaudgui/libaudgui.h>
+
+#include "actions-mainwin.h"
+#include "dnd.h"
+#include "drag-handle.h"
+#include "menus.h"
+#include "plugin.h"
+#include "skins_cfg.h"
+#include "main.h"
+#include "playlistwin.h"
+#include "button.h"
+#include "playlist-widget.h"
+#include "playlist-slider.h"
+#include "textbox.h"
+#include "window.h"
+#include "view.h"
+
+#define PLAYLISTWIN_MIN_WIDTH MAINWIN_WIDTH
+#define PLAYLISTWIN_MIN_HEIGHT MAINWIN_HEIGHT
+#define PLAYLISTWIN_WIDTH_SNAP 25
+#define PLAYLISTWIN_HEIGHT_SNAP 29
+#define PLAYLISTWIN_SHADED_HEIGHT MAINWIN_SHADED_HEIGHT
+
+#define APPEND(b, ...) snprintf (b + strlen (b), sizeof b - strlen (b), __VA_ARGS__)
+
+class PlWindow : public Window
+{
+public:
+ PlWindow (bool shaded) :
+ Window (WINDOW_PLAYLIST, & config.playlist_x, & config.playlist_y,
+ config.playlist_width, shaded ? PLAYLISTWIN_SHADED_HEIGHT :
+ config.playlist_height, shaded) {}
+
+private:
+ void draw (cairo_t * cr);
+ bool button_press (GdkEventButton * event);
+ bool scroll (GdkEventScroll * event);
+};
+
+Window * playlistwin;
+PlaylistWidget * playlistwin_list;
+TextBox * playlistwin_sinfo;
+
+static Button * playlistwin_shade, * playlistwin_close;
+static Button * playlistwin_shaded_shade, * playlistwin_shaded_close;
+
+static PlaylistSlider * playlistwin_slider;
+static TextBox * playlistwin_time_min, * playlistwin_time_sec;
+static TextBox * playlistwin_info;
+static Button * playlistwin_srew, * playlistwin_splay;
+static Button * playlistwin_spause, * playlistwin_sstop;
+static Button * playlistwin_sfwd, * playlistwin_seject;
+static Button * playlistwin_sscroll_up, *playlistwin_sscroll_down;
+static DragHandle * resize_handle, * sresize_handle;
+static Button * button_add, * button_sub, * button_sel, * button_misc, * button_list;
+
+static int resize_base_width, resize_base_height;
+static int drop_position;
+
+static void update_info ()
+{
+ auto playlist = Playlist::active_playlist ();
+ StringBuf s1 = str_format_time (playlist.selected_length_ms ());
+ StringBuf s2 = str_format_time (playlist.total_length_ms ());
+ playlistwin_info->set_text (str_concat ({s1, "/", s2}));
+}
+
+static void update_rollup_text ()
+{
+ auto playlist = Playlist::active_playlist ();
+ int entry = playlist.get_position ();
+ Tuple tuple = playlist.entry_tuple (entry, Playlist::NoWait);
+ char scratch512;
+
+ scratch0 = 0;
+
+ if (entry > -1)
+ {
+ String title = tuple.get_str (Tuple::FormattedTitle);
+ int length = tuple.get_int (Tuple::Length);
+
+ if (aud_get_bool ("show_numbers_in_pl"))
+ APPEND (scratch, "%d. ", 1 + entry);
+
+ APPEND (scratch, "%s", (const char *) title);
+
+ if (length >= 0)
+ {
+ StringBuf buf = str_format_time (length);
+ APPEND (scratch, " (%s)", (const char *) buf);
+ }
+ }
+
+ playlistwin_sinfo->set_text (scratch);
+}
+
+static void playlistwin_shade_toggle ()
+{
+ view_set_playlist_shaded (! aud_get_bool ("skins", "playlist_shaded"));
+}
+
+static void playlistwin_scroll (int dir)
+{
+ int rows, first;
+
+ playlistwin_list->row_info (& rows, & first);
+ playlistwin_list->scroll_to (first + dir * rows / 3);
+}
+
+static void playlistwin_scroll_up_pushed ()
+{
+ playlistwin_scroll (-1);
+}
+
+static void playlistwin_scroll_down_pushed ()
+{
+ playlistwin_scroll (1);
+}
+
+/* note: height is ignored if the window is shaded */
+static void playlistwin_resize (int w, int h)
+{
+ int tx, ty;
+
+ tx = (w - PLAYLISTWIN_MIN_WIDTH) / PLAYLISTWIN_WIDTH_SNAP;
+ tx = (tx * PLAYLISTWIN_WIDTH_SNAP) + PLAYLISTWIN_MIN_WIDTH;
+ if (tx < PLAYLISTWIN_MIN_WIDTH)
+ tx = PLAYLISTWIN_MIN_WIDTH;
+
+ if (! aud_get_bool ("skins", "playlist_shaded"))
+ {
+ ty = (h - PLAYLISTWIN_MIN_HEIGHT) / PLAYLISTWIN_HEIGHT_SNAP;
+ ty = (ty * PLAYLISTWIN_HEIGHT_SNAP) + PLAYLISTWIN_MIN_HEIGHT;
+ if (ty < PLAYLISTWIN_MIN_HEIGHT)
+ ty = PLAYLISTWIN_MIN_HEIGHT;
+ }
+ else
+ ty = config.playlist_height;
+
+ if (tx == config.playlist_width && ty == config.playlist_height)
+ return;
+
+ config.playlist_width = w = tx;
+ config.playlist_height = h = ty;
+
+ playlistwin_list->resize (w - 31, h - 58);
+ playlistwin->move_widget (false, playlistwin_slider, w - 15, 20);
+ playlistwin_slider->resize (h - 58);
+
+ playlistwin->move_widget (true, playlistwin_shaded_shade, w - 21, 3);
+ playlistwin->move_widget (true, playlistwin_shaded_close, w - 11, 3);
+ playlistwin->move_widget (false, playlistwin_shade, w - 21, 3);
+ playlistwin->move_widget (false, playlistwin_close, w - 11, 3);
+
+ playlistwin->move_widget (false, playlistwin_time_min, w - 82, h - 15);
+ playlistwin->move_widget (false, playlistwin_time_sec, w - 64, h - 15);
+ playlistwin->move_widget (false, playlistwin_info, w - 143, h - 28);
+
+ playlistwin->move_widget (false, playlistwin_srew, w - 144, h - 16);
+ playlistwin->move_widget (false, playlistwin_splay, w - 138, h - 16);
+ playlistwin->move_widget (false, playlistwin_spause, w - 128, h - 16);
+ playlistwin->move_widget (false, playlistwin_sstop, w - 118, h - 16);
+ playlistwin->move_widget (false, playlistwin_sfwd, w - 109, h - 16);
+ playlistwin->move_widget (false, playlistwin_seject, w - 100, h - 16);
+ playlistwin->move_widget (false, playlistwin_sscroll_up, w - 14, h - 35);
+ playlistwin->move_widget (false, playlistwin_sscroll_down, w - 14, h - 30);
+
+ playlistwin->move_widget (false, resize_handle, w - 20, h - 20);
+ playlistwin->move_widget (true, sresize_handle, w - 31, 0);
+
+ playlistwin_sinfo->set_width (w - 35);
+
+ playlistwin->move_widget (false, button_add, 12, h - 29);
+ playlistwin->move_widget (false, button_sub, 40, h - 29);
+ playlistwin->move_widget (false, button_sel, 68, h - 29);
+ playlistwin->move_widget (false, button_misc, 100, h - 29);
+ playlistwin->move_widget (false, button_list, w - 46, h - 29);
+}
+
+bool PlWindow::scroll (GdkEventScroll * event)
+{
+ switch (event->direction)
+ {
+ case GDK_SCROLL_DOWN:
+ playlistwin_scroll (1);
+ break;
+ case GDK_SCROLL_UP:
+ playlistwin_scroll (-1);
+ break;
+ default:
+ break;
+ }
+
+ return true;
+}
+
+bool PlWindow::button_press (GdkEventButton * event)
+{
+ if (event->button == 1 && event->type == GDK_2BUTTON_PRESS &&
+ event->window == gtk_widget_get_window (gtk ()) && event->y < 14)
+ {
+ playlistwin_shade_toggle ();
+ return true;
+ }
+
+ if (event->button == 3 && event->type == GDK_BUTTON_PRESS)
+ {
+ menu_popup (UI_MENU_PLAYLIST, event->x_root, event->y_root, false, false, event);
+ return true;
+ }
+
+ return Window::button_press (event);
+}
+
+void playlistwin_hide_timer ()
+{
+ playlistwin_time_min->set_text (nullptr);
+ playlistwin_time_sec->set_text (nullptr);
+}
+
+void playlistwin_set_time (const char * minutes, const char * seconds)
+{
+ playlistwin_time_min->set_text (minutes);
+ playlistwin_time_sec->set_text (seconds);
+}
+
+static void drag_motion (GtkWidget * widget, GdkDragContext * context, int x,
+ int y, unsigned time, void * unused)
+{
+ if (! aud_get_bool ("skins", "playlist_shaded"))
+ playlistwin_list->hover (x - 12, y - 20);
+}
+
+static void drag_leave (GtkWidget * widget, GdkDragContext * context, unsigned time,
+ void * unused)
+{
+ if (! aud_get_bool ("skins", "playlist_shaded"))
+ playlistwin_list->hover_end ();
+}
+
+static void drag_drop (GtkWidget * widget, GdkDragContext * context, int x,
+ int y, unsigned time, void * unused)
+{
+ if (aud_get_bool ("skins", "playlist_shaded"))
+ drop_position = -1;
+ else
+ {
+ playlistwin_list->hover (x - 12, y - 20);
+ drop_position = playlistwin_list->hover_end ();
+ }
+}
+
+static void drag_data_received (GtkWidget * widget, GdkDragContext * context,
+ int x, int y, GtkSelectionData * data, unsigned info, unsigned time, void * unused)
+{
+ audgui_urilist_insert (Playlist::active_playlist (), drop_position,
+ (const char *) gtk_selection_data_get_data (data));
+ drop_position = -1;
+}
+
+static void playlistwin_hide ()
+{
+ view_set_show_playlist (false);
+}
+
+static void resize_press ()
+{
+ resize_base_width = config.playlist_width;
+ resize_base_height = config.playlist_height;
+}
+
+static void resize_drag (int x_offset, int y_offset)
+{
+ bool shaded = aud_get_bool ("skins", "playlist_shaded");
+
+ /* compromise between rounding and truncating; this has no real
+ * justification at all other than it "looks about right". */
+ playlistwin_resize (resize_base_width + x_offset + PLAYLISTWIN_WIDTH_SNAP /
+ 3, resize_base_height + y_offset + PLAYLISTWIN_HEIGHT_SNAP / 3);
+ playlistwin->resize (config.playlist_width, shaded ?
+ PLAYLISTWIN_SHADED_HEIGHT : config.playlist_height);
+}
+
+static void button_add_cb (Button * button, GdkEventButton * event)
+{
+ int xpos, ypos;
+ playlistwin->getPosition (& xpos, & ypos);
+ menu_popup (UI_MENU_PLAYLIST_ADD, xpos + 12 * config.scale,
+ ypos + (config.playlist_height - 8) * config.scale, false, true,
+ event);
+}
+
+static void button_sub_cb (Button * button, GdkEventButton * event)
+{
+ int xpos, ypos;
+ playlistwin->getPosition (& xpos, & ypos);
+ menu_popup (UI_MENU_PLAYLIST_REMOVE, xpos + 40 * config.scale,
+ ypos + (config.playlist_height - 8) * config.scale, false, true,
+ event);
+}
+
+static void button_sel_cb (Button * button, GdkEventButton * event)
+{
+ int xpos, ypos;
+ playlistwin->getPosition (& xpos, & ypos);
+ menu_popup (UI_MENU_PLAYLIST_SELECT, xpos + 68 * config.scale,
+ ypos + (config.playlist_height - 8) * config.scale, false, true,
+ event);
+}
+
+static void button_misc_cb (Button * button, GdkEventButton * event)
+{
+ int xpos, ypos;
+ playlistwin->getPosition (& xpos, & ypos);
+ menu_popup (UI_MENU_PLAYLIST_SORT, xpos + 100 * config.scale,
+ ypos + (config.playlist_height - 8) * config.scale, false, true,
+ event);
+}
+
+static void button_list_cb (Button * button, GdkEventButton * event)
+{
+ int xpos, ypos;
+ playlistwin->getPosition (& xpos, & ypos);
+ menu_popup (UI_MENU_PLAYLIST,
+ xpos + (config.playlist_width - 12) * config.scale,
+ ypos + (config.playlist_height - 8) * config.scale, true, true,
+ event);
+}
+
+static void playlistwin_create_widgets ()
+{
+ int w = config.playlist_width, h = config.playlist_height;
+
+ bool shaded = aud_get_bool ("skins", "playlist_shaded");
+ playlistwin_sinfo = new TextBox (w - 35, nullptr, shaded && config.autoscroll);
+ playlistwin->put_widget (true, playlistwin_sinfo, 4, 4);
+
+ playlistwin_shaded_shade = new Button (9, 9, 128, 45, 150, 42, SKIN_PLEDIT, SKIN_PLEDIT);
+ playlistwin->put_widget (true, playlistwin_shaded_shade, w - 21, 3);
+ playlistwin_shaded_shade->on_release ((ButtonCB) playlistwin_shade_toggle);
+
+ playlistwin_shaded_close = new Button (9, 9, 138, 45, 52, 42, SKIN_PLEDIT, SKIN_PLEDIT);
+ playlistwin->put_widget (true, playlistwin_shaded_close, w - 11, 3);
+ playlistwin_shaded_close->on_release ((ButtonCB) playlistwin_hide);
+
+ playlistwin_shade = new Button (9, 9, 157, 3, 62, 42, SKIN_PLEDIT, SKIN_PLEDIT);
+ playlistwin->put_widget (false, playlistwin_shade, w - 21, 3);
+ playlistwin_shade->on_release ((ButtonCB) playlistwin_shade_toggle);
+
+ playlistwin_close = new Button (9, 9, 167, 3, 52, 42, SKIN_PLEDIT, SKIN_PLEDIT);
+ playlistwin->put_widget (false, playlistwin_close, w - 11, 3);
+ playlistwin_close->on_release ((ButtonCB) playlistwin_hide);
+
+ String font = aud_get_str ("skins", "playlist_font");
+ playlistwin_list = new PlaylistWidget (w - 31, h - 58, font);
+ playlistwin->put_widget (false, playlistwin_list, 12, 20);
+
+ /* playlist list box slider */
+ playlistwin_slider = new PlaylistSlider (playlistwin_list, h - 58);
+ playlistwin->put_widget (false, playlistwin_slider, w - 15, 20);
+ playlistwin_list->set_slider (playlistwin_slider);
+
+ playlistwin_time_min = new TextBox (15, nullptr, false);
+ playlistwin->put_widget (false, playlistwin_time_min, w - 82, h - 15);
+ playlistwin_time_min->on_press (change_timer_mode_cb);
+
+ playlistwin_time_sec = new TextBox (10, nullptr, false);
+ playlistwin->put_widget (false, playlistwin_time_sec, w - 64, h - 15);
+ playlistwin_time_sec->on_press (change_timer_mode_cb);
+
+ playlistwin_info = new TextBox (90, nullptr, false);
+ playlistwin->put_widget (false, playlistwin_info, w - 143, h - 28);
+
+ /* mini play control buttons at right bottom corner */
+
+ playlistwin_srew = new Button (8, 7);
+ playlistwin->put_widget (false, playlistwin_srew, w - 144, h - 16);
+ playlistwin_srew->on_release ((ButtonCB) aud_drct_pl_prev);
+
+ playlistwin_splay = new Button (10, 7);
+ playlistwin->put_widget (false, playlistwin_splay, w - 138, h - 16);
+ playlistwin_splay->on_release ((ButtonCB) aud_drct_play);
+
+ playlistwin_spause = new Button (10, 7);
+ playlistwin->put_widget (false, playlistwin_spause, w - 128, h - 16);
+ playlistwin_spause->on_release ((ButtonCB) aud_drct_pause);
+
+ playlistwin_sstop = new Button (9, 7);
+ playlistwin->put_widget (false, playlistwin_sstop, w - 118, h - 16);
+ playlistwin_sstop->on_release ((ButtonCB) aud_drct_stop);
+
+ playlistwin_sfwd = new Button (8, 7);
+ playlistwin->put_widget (false, playlistwin_sfwd, w - 109, h - 16);
+ playlistwin_sfwd->on_release ((ButtonCB) aud_drct_pl_next);
+
+ playlistwin_seject = new Button (9, 7);
+ playlistwin->put_widget (false, playlistwin_seject, w - 100, h - 16);
+ playlistwin_seject->on_release ((ButtonCB) action_play_file);
+
+ playlistwin_sscroll_up = new Button (8, 5);
+ playlistwin->put_widget (false, playlistwin_sscroll_up, w - 14, h - 35);
+ playlistwin_sscroll_up->on_release ((ButtonCB) playlistwin_scroll_up_pushed);
+
+ playlistwin_sscroll_down = new Button (8, 5);
+ playlistwin->put_widget (false, playlistwin_sscroll_down, w - 14, h - 30);
+ playlistwin_sscroll_down->on_release ((ButtonCB) playlistwin_scroll_down_pushed);
+
+ /* resize handles */
+
+ resize_handle = new DragHandle (20, 20, resize_press, resize_drag);
+ playlistwin->put_widget (false, resize_handle, w - 20, h - 20);
+
+ sresize_handle = new DragHandle (9, PLAYLISTWIN_SHADED_HEIGHT, resize_press, resize_drag);
+ playlistwin->put_widget (true, sresize_handle, w - 31, 0);
+
+ /* lower button row */
+
+ button_add = new Button (25, 18);
+ playlistwin->put_widget (false, button_add, 12, h - 29);
+ button_add->on_press (button_add_cb);
+
+ button_sub = new Button (25, 18);
+ playlistwin->put_widget (false, button_sub, 40, h - 29);
+ button_sub->on_press (button_sub_cb);
+
+ button_sel = new Button (25, 18);
+ playlistwin->put_widget (false, button_sel, 68, h - 29);
+ button_sel->on_press (button_sel_cb);
+
+ button_misc = new Button (25, 18);
+ playlistwin->put_widget (false, button_misc, 100, h - 29);
+ button_misc->on_press (button_misc_cb);
+
+ button_list = new Button (23, 18);
+ playlistwin->put_widget (false, button_list, w - 46, h - 29);
+ button_list->on_press (button_list_cb);
+}
+
+void PlWindow::draw (cairo_t * cr)
+{
+ if (is_shaded ())
+ skin_draw_playlistwin_shaded (cr, config.playlist_width, is_focused ());
+ else
+ skin_draw_playlistwin_frame (cr, config.playlist_width,
+ config.playlist_height, is_focused ());
+}
+
+static void playlistwin_create_window ()
+{
+ bool shaded = aud_get_bool ("skins", "playlist_shaded");
+
+ playlistwin = new PlWindow (shaded);
+ playlistwin->setWindowTitle (_("Audacious Playlist Editor"));
+ playlistwin->setWindowRole ("playlist");
+
+ GtkWidget * w = playlistwin->gtk ();
+ drag_dest_set (w);
+ drop_position = -1;
+
+ g_signal_connect (w, "drag-motion", (GCallback) drag_motion, nullptr);
+ g_signal_connect (w, "drag-leave", (GCallback) drag_leave, nullptr);
+ g_signal_connect (w, "drag-drop", (GCallback) drag_drop, nullptr);
+ g_signal_connect (w, "drag-data-received", (GCallback) drag_data_received, nullptr);
+}
+
+static void update_cb (void *, void *)
+{
+ playlistwin_list->refresh ();
+
+ update_info ();
+ update_rollup_text ();
+}
+
+static void follow_cb (void * data, void *)
+{
+ auto list = aud::from_ptr<Playlist> (data);
+ list.select_all (false);
+
+ int row = list.get_position ();
+ if (row >= 0)
+ {
+ list.select_entry (row, true);
+ if (list == Playlist::active_playlist ())
+ playlistwin_list->set_focused (row);
+ }
+}
+
+void playlistwin_create ()
+{
+ playlistwin_create_window ();
+ playlistwin_create_widgets ();
+
+ update_info ();
+ update_rollup_text ();
+
+ hook_associate ("playlist position", follow_cb, nullptr);
+ hook_associate ("playlist activate", update_cb, nullptr);
+ hook_associate ("playlist update", update_cb, nullptr);
+}
+
+void playlistwin_unhook ()
+{
+ hook_dissociate ("playlist position", follow_cb);
+ hook_dissociate ("playlist activate", update_cb);
+ hook_dissociate ("playlist update", update_cb);
+}

audacious-plugins-4.4.1.tar.bz2/src/skins/playlistwin.h Added

audacious-plugins-4.4.1.tar.bz2/src/skins/playstatus.cc Added

@@ -0,0 +1,63 @@
+/*
+ * Audacious - a cross-platform multimedia player
+ * Copyright (c) 2007 Tomasz Moń
+ * Copyright (c) 2011 John Lindgren
+ *
+ * Based on:
+ * BMP - Cross-platform multimedia player
+ * Copyright (C) 2003-2004 BMP development team.
+ * XMMS:
+ * Copyright (C) 1998-2003 XMMS development team.
+ *
+ * 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; under version 3 of the License.
+ *
+ * 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>.
+ *
+ * The Audacious team does not consider modular code linking to
+ * Audacious or using our public API to be a derived work.
+ */
+
+#include "skins_cfg.h"
+#include "skin.h"
+#include "playstatus.h"
+
+void PlayStatus::draw (cairo_t * cr)
+{
+ if (m_status == STATUS_PLAY)
+ skin_draw_pixbuf (cr, SKIN_PLAYPAUSE, 36, 0, 0, 0, 3, 9);
+ else
+ skin_draw_pixbuf (cr, SKIN_PLAYPAUSE, 27, 0, 0, 0, 2, 9);
+
+ switch (m_status)
+ {
+ case STATUS_STOP:
+ skin_draw_pixbuf (cr, SKIN_PLAYPAUSE, 18, 0, 2, 0, 9, 9);
+ break;
+ case STATUS_PAUSE:
+ skin_draw_pixbuf (cr, SKIN_PLAYPAUSE, 9, 0, 2, 0, 9, 9);
+ break;
+ case STATUS_PLAY:
+ skin_draw_pixbuf (cr, SKIN_PLAYPAUSE, 1, 0, 3, 0, 8, 9);
+ break;
+ }
+}
+
+PlayStatus::PlayStatus ()
+{
+ set_scale (config.scale);
+ add_drawable (11, 9);
+}
+
+void PlayStatus::set_status (PStatus status)
+{
+ m_status = status;
+ queue_draw ();
+}

audacious-plugins-4.4.1.tar.bz2/src/skins/playstatus.h Added

@@ -0,0 +1,51 @@
+/*
+ * Audacious - a cross-platform multimedia player
+ * Copyright (c) 2007 Tomasz Moń
+ * Copyright (c) 2011 John Lindgren
+ *
+ * Based on:
+ * BMP - Cross-platform multimedia player
+ * Copyright (C) 2003-2004 BMP development team.
+ * XMMS:
+ * Copyright (C) 1998-2003 XMMS development team.
+ *
+ * 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; under version 3 of the License.
+ *
+ * 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>.
+ *
+ * The Audacious team does not consider modular code linking to
+ * Audacious or using our public API to be a derived work.
+ */
+
+#ifndef SKINS_UI_SKINNED_PLAYSTATUS_H
+#define SKINS_UI_SKINNED_PLAYSTATUS_H
+
+#include "widget.h"
+
+typedef enum {
+ STATUS_STOP,
+ STATUS_PAUSE,
+ STATUS_PLAY
+} PStatus;
+
+class PlayStatus : public Widget
+{
+public:
+ PlayStatus ();
+ void set_status (PStatus status);
+
+private:
+ void draw (cairo_t * cr);
+
+ PStatus m_status = STATUS_STOP;
+};
+
+#endif

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/plugin-window.cc -> audacious-plugins-4.4.1.tar.bz2/src/skins/plugin-window.cc Changed

@@ -32,6 +32,10 @@
 #include <libaudcore/plugins.h>
 #include <libaudcore/hook.h>
 #include <libaudcore/runtime.h>
+#include <libaudgui/libaudgui-gtk.h>
+
+#include "main.h"
+#include "window.h"
 
 static GList * windows;
 
@@ -58,6 +62,9 @@
 {
 GtkWidget * window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
 gtk_window_set_title ((GtkWindow *) window, aud_plugin_get_name (plugin));
+ gtk_window_set_role ((GtkWindow *) window, "plugin");
+ gtk_window_set_transient_for ((GtkWindow *) window, (GtkWindow *) mainwin->gtk ());
+ gtk_container_set_border_width ((GtkContainer *) window, 2);
 gtk_container_add ((GtkContainer *) window, widget);
 
 g_object_set_data ((GObject *) window, "skins-plugin-id", plugin);
@@ -72,11 +79,17 @@
 
 if (pos_str && str_to_int_array (pos_str, pos, aud::n_elems (pos)))
 {
+ pos2 = audgui_to_native_dpi (pos2);
+ pos3 = audgui_to_native_dpi (pos3);
+
 gtk_window_set_default_size ((GtkWindow *) window, pos2, pos3);
 gtk_window_move ((GtkWindow *) window, pos0, pos1);
 }
 else
- gtk_window_set_default_size ((GtkWindow *) window, 300, 200);
+ {
+ int dpi = audgui_get_dpi ();
+ gtk_window_set_default_size ((GtkWindow *) window, 3 * dpi, 2 * dpi);
+ }
 
 if (aud_ui_is_shown ())
 gtk_widget_show_all (window);
@@ -94,6 +107,9 @@
 gtk_window_get_position ((GtkWindow *) window, & pos0, & pos1);
 gtk_window_get_size ((GtkWindow *) window, & pos2, & pos3);
 
+ pos2 = audgui_to_portable_dpi (pos2);
+ pos3 = audgui_to_portable_dpi (pos3);
+
 const char * basename = aud_plugin_get_basename (plugin);
 StringBuf pos_str = int_array_to_str (pos, aud::n_elems (pos));
 aud_set_str ("skins-layout", basename, pos_str);
@@ -116,7 +132,7 @@
 }
 }
 
-void create_plugin_windows (void)
+void create_plugin_windows ()
 {
 for (PluginHandle * plugin : aud_plugin_list (PluginType::General))
 {
@@ -134,7 +150,7 @@
 hook_associate ("dock plugin disabled", (HookFunction) remove_dock_plugin, nullptr);
 }
 
-void show_plugin_windows (void)
+void show_plugin_windows ()
 {
 g_list_foreach (windows, (GFunc) gtk_widget_show_all, nullptr);
 }
@@ -148,13 +164,13 @@
 aud_plugin_send_message (plugin, "grab focus", nullptr, 0);
 }
 
-void hide_plugin_windows (void)
+void hide_plugin_windows ()
 {
 g_list_foreach (windows, (GFunc) save_window_size, nullptr);
 g_list_foreach (windows, (GFunc) gtk_widget_hide, nullptr);
 }
 
-void destroy_plugin_windows (void)
+void destroy_plugin_windows ()
 {
 for (PluginHandle * plugin : aud_plugin_list (PluginType::General))
 {

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/plugin-window.h -> audacious-plugins-4.4.1.tar.bz2/src/skins/plugin-window.h Changed

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/plugin.cc -> audacious-plugins-4.4.1.tar.bz2/src/skins/plugin.cc Changed

@@ -20,6 +20,7 @@
 
 #include <stdlib.h>
 
+#include <libaudcore/audstrings.h>
 #include <libaudcore/drct.h>
 #include <libaudcore/i18n.h>
 #include <libaudcore/interface.h>
@@ -27,18 +28,22 @@
 #include <libaudcore/plugin.h>
 #include <libaudcore/hook.h>
 #include <libaudgui/libaudgui.h>
+#include <libaudgui/libaudgui-gtk.h>
+
+#ifdef GDK_WINDOWING_WAYLAND
+#include <gdk/gdkwayland.h>
+#endif
 
 #include "menus.h"
 #include "plugin.h"
 #include "plugin-window.h"
-#include "preset-browser.h"
-#include "preset-list.h"
 #include "skins_cfg.h"
-#include "ui_equalizer.h"
-#include "ui_main.h"
-#include "ui_main_evlisteners.h"
-#include "ui_playlist.h"
-#include "ui_skin.h"
+#include "equalizer.h"
+#include "main.h"
+#include "vis-callbacks.h"
+#include "playlistwin.h"
+#include "skin.h"
+#include "window.h"
 #include "view.h"
 
 class SkinnedUI : public IfacePlugin
@@ -48,7 +53,8 @@
 N_("Winamp Classic Interface"),
 PACKAGE,
 nullptr,
- & skins_prefs
+ & skins_prefs,
+ PluginGLibOnly
 };
 
 constexpr SkinnedUI () : IfacePlugin (info) {}
@@ -84,87 +90,114 @@
 { audgui_plugin_menu_add (id, func, name, icon); }
 void plugin_menu_remove (AudMenuID id, void func ())
 { audgui_plugin_menu_remove (id, func); }
+
+ void startup_notify (const char * id)
+ { gdk_notify_startup_complete_with_id (id); }
 };
 
 EXPORT SkinnedUI aud_plugin_instance;
 
-char * skins_pathsSKINS_PATH_COUNT;
-
-static int update_source;
+static String user_skin_dir;
+static String skin_thumb_dir;
 
-static void skins_free_paths(void) {
- int i;
+const char * skins_get_user_skin_dir ()
+{
+ if (! user_skin_dir)
+ user_skin_dir = String (filename_build ({g_get_user_data_dir (), "audacious", "Skins"}));
 
- for (i = 0; i < SKINS_PATH_COUNT; i++) {
- g_free(skins_pathsi);
- skins_pathsi = nullptr;
- }
+ return user_skin_dir;
 }
 
-static void skins_init_paths ()
+const char * skins_get_skin_thumb_dir ()
 {
- const char * xdg_data_home = g_get_user_data_dir ();
- const char * xdg_cache_home = g_get_user_cache_dir ();
+ if (! skin_thumb_dir)
+ skin_thumb_dir = String (filename_build ({g_get_user_cache_dir (), "audacious", "thumbs-unscaled"}));
 
- skins_pathsSKINS_PATH_USER_SKIN_DIR =
- g_build_filename(xdg_data_home, "audacious", "Skins", nullptr);
- skins_pathsSKINS_PATH_SKIN_THUMB_DIR =
- g_build_filename(xdg_cache_home, "audacious", "thumbs", nullptr);
+ return skin_thumb_dir;
 }
 
-static gboolean update_cb (void *)
+static bool load_initial_skin ()
 {
- mainwin_update_song_info ();
- return G_SOURCE_CONTINUE;
+ String path = aud_get_str ("skins", "skin");
+ if (path0 && skin_load (path))
+ return true;
+
+ StringBuf def = filename_build ({aud_get_path (AudPath::DataDir), "Skins", "Default"});
+ if (skin_load (def))
+ return true;
+
+ AUDERR ("Unable to load any skin; giving up!\n");
+ return false;
 }
 
-static void skins_init_main (void)
+static void skins_init_main (bool restart)
 {
- init_skins (aud_get_str ("skins", "skin"));
+ int old_scale = config.scale;
+
+ // The current scaling implementation allows any integer scale factor, but
+ // the legacy "double size" config option is limited to two choices. For
+ // now, the two options are floor(DPI/96) and floor(DPI/96)+1. On screens
+ // up to 191 DPI, this gives the traditional 1x and 2x scale factors.
+ config.scale = aud::max (1, audgui_get_dpi () / 96) +
+ aud_get_bool ("skins", "double_size");
+
+ if (restart && config.scale != old_scale)
+ dock_change_scale (old_scale, config.scale);
 
+ mainwin_create ();
+ equalizerwin_create ();
+ playlistwin_create ();
+
+ view_apply_skin ();
 view_apply_on_top ();
 view_apply_sticky ();
 
 if (aud_drct_get_playing ())
- {
- ui_main_evlistener_playback_begin (nullptr, nullptr);
- if (aud_drct_get_paused ())
- ui_main_evlistener_playback_pause (nullptr, nullptr);
- }
+ mainwin_playback_begin ();
 else
 mainwin_update_song_info ();
 
- update_source = g_timeout_add (250, update_cb, nullptr);
+ timer_add (TimerRate::Hz4, (TimerFunc) mainwin_update_song_info);
 }
 
 bool SkinnedUI::init ()
 {
- if (aud_get_mainloop_type () != MainloopType::GLib)
+ skins_cfg_load ();
+
+ if (! load_initial_skin ())
 return false;
 
 audgui_init ();
 
- skins_cfg_load ();
- skins_init_paths ();
+#ifdef GDK_WINDOWING_WAYLAND
+ if (GDK_IS_WAYLAND_DISPLAY (gdk_display_get_default ()))
+ {
+ AUDERR ("The Winamp interface is not supported on Wayland. "
+ "Please run Audacious via XWayland.\n");
+ audgui_cleanup ();
+ return false;
+ }
+#endif
 
 menu_init ();
- skins_init_main ();
+ skins_init_main (false);
 
 create_plugin_windows ();
 
 return true;
 }
 
-static void skins_cleanup_main (void)
+static void skins_cleanup_main ()
 {
 mainwin_unhook ();
+ equalizerwin_unhook ();
 playlistwin_unhook ();
- g_source_remove (update_source);
 
- cleanup_skins ();
+ timer_remove (TimerRate::Hz4, (TimerFunc) mainwin_update_song_info);
 
- eq_preset_browser_cleanup ();
- eq_preset_list_cleanup ();
+ gtk_widget_destroy (mainwin->gtk ()); mainwin = nullptr;
+ gtk_widget_destroy (playlistwin->gtk ()); playlistwin = nullptr;
+ gtk_widget_destroy (equalizerwin->gtk ()); equalizerwin = nullptr;
 }
 
 void SkinnedUI::cleanup ()
@@ -175,28 +208,28 @@
 
 skins_cleanup_main ();
 menu_cleanup ();
+ audgui_cleanup ();
 
- skins_free_paths ();
+ skin = Skin ();
 
- audgui_cleanup ();
+ user_skin_dir = String ();
+ skin_thumb_dir = String ();
 }
 
-void skins_restart (void)
+void skins_restart ()
 {
 skins_cleanup_main ();
- skins_init_main ();
+ skins_init_main (true);
 
 if (aud_ui_is_shown ())
 view_show_player (true);
 }
 
-gboolean handle_window_close (void)
+void skins_close ()
 {
- gboolean handled = FALSE;
+ bool handled = false;
 hook_call ("window close", & handled);
 
 if (! handled)
 aud_quit ();
-
- return TRUE;
 }

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/plugin.h -> audacious-plugins-4.4.1.tar.bz2/src/skins/plugin.h Changed

audacious-plugins-4.4.1.tar.bz2/src/skins/search-select.cc Added

@@ -0,0 +1,244 @@
+/* Audacious - Cross-platform multimedia player
+ * Copyright (C) 2005-2011 Audacious development team.
+ *
+ * BMP - Cross-platform multimedia player
+ * Copyright (C) 2003-2004 BMP development team.
+ *
+ * Based on XMMS:
+ * Copyright (C) 1998-2003 XMMS development team.
+ *
+ * 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; under version 3 of the License.
+ *
+ * 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>.
+ *
+ * The Audacious team does not consider modular code linking to
+ * Audacious or using our public API to be a derived work.
+ */
+
+#include "actions-playlist.h"
+#include "playlistwin.h"
+#include "playlist-widget.h"
+
+#include <gdk/gdkkeysyms.h>
+#include <gtk/gtk.h>
+
+#include <libaudcore/i18n.h>
+#include <libaudcore/playlist.h>
+#include <libaudcore/runtime.h>
+#include <libaudgui/gtk-compat.h>
+
+static void search_cbt_cb (GtkWidget * called_cbt, GtkWidget * other_cbt)
+{
+ if (gtk_toggle_button_get_active ((GtkToggleButton *) called_cbt))
+ gtk_toggle_button_set_active ((GtkToggleButton *) other_cbt, false);
+}
+
+static gboolean search_kp_cb (GtkWidget * entry, GdkEventKey * event, GtkWidget * dialog)
+{
+ if (event->keyval != GDK_KEY_Return)
+ return false;
+
+ gtk_dialog_response ((GtkDialog *) dialog, GTK_RESPONSE_ACCEPT);
+ return true;
+}
+
+static void copy_selected_to_new (Playlist playlist)
+{
+ int entries = playlist.n_entries ();
+ Index<PlaylistAddItem> items;
+
+ for (int entry = 0; entry < entries; entry ++)
+ {
+ if (playlist.entry_selected (entry))
+ {
+ items.append
+ (playlist.entry_filename (entry),
+ playlist.entry_tuple (entry, Playlist::NoWait),
+ playlist.entry_decoder (entry, Playlist::NoWait));
+ }
+ }
+
+ auto new_list = Playlist::new_playlist ();
+ new_list.insert_items (0, std::move (items), false);
+}
+
+void action_playlist_search_and_select ()
+{
+ /* create dialog */
+ GtkWidget * dialog = gtk_dialog_new_with_buttons (
+ _("Search entries in active playlist"), nullptr, (GtkDialogFlags) 0 ,
+ _("Cancel"), GTK_RESPONSE_REJECT, _("Search"), GTK_RESPONSE_ACCEPT, nullptr);
+
+ /* help text and logo */
+ GtkWidget * hbox = audgui_hbox_new (6);
+ GtkWidget * logo = gtk_image_new_from_icon_name ("edit-find", GTK_ICON_SIZE_DIALOG);
+ GtkWidget * helptext = gtk_label_new (_("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."));
+ gtk_label_set_line_wrap ((GtkLabel *) helptext, true);
+ gtk_box_pack_start ((GtkBox *) hbox, logo, false, false, 0);
+ gtk_box_pack_start ((GtkBox *) hbox, helptext, false, false, 0);
+
+ /* title */
+ GtkWidget * label_title = gtk_label_new (_("Title:"));
+ GtkWidget * entry_title = gtk_entry_new ();
+ g_signal_connect (entry_title, "key-press-event", (GCallback) search_kp_cb, dialog);
+
+ /* album */
+ GtkWidget * label_album = gtk_label_new (_("Album:"));
+ GtkWidget * entry_album = gtk_entry_new ();
+ g_signal_connect (entry_album, "key-press-event", (GCallback) search_kp_cb, dialog);
+
+ /* artist */
+ GtkWidget * label_performer = gtk_label_new (_("Artist:"));
+ GtkWidget * entry_performer = gtk_entry_new ();
+ g_signal_connect (entry_performer, "key-press-event", (GCallback) search_kp_cb, dialog);
+
+ /* file name */
+ GtkWidget * label_file_name = gtk_label_new (_("File Name:"));
+ GtkWidget * entry_file_name = gtk_entry_new ();
+ g_signal_connect (entry_file_name, "key-press-event",
+ (GCallback) search_kp_cb, dialog);
+
+#ifdef USE_GTK3
+ gtk_label_set_max_width_chars ((GtkLabel *) helptext, 60);
+
+ gtk_widget_set_hexpand (entry_title, true);
+ gtk_widget_set_halign (label_title, GTK_ALIGN_START);
+
+ gtk_widget_set_hexpand (entry_album, true);
+ gtk_widget_set_halign (label_album, GTK_ALIGN_START);
+
+ gtk_widget_set_hexpand (entry_performer, true);
+ gtk_widget_set_halign (label_performer, GTK_ALIGN_START);
+
+ gtk_widget_set_hexpand (entry_file_name, true);
+ gtk_widget_set_halign (label_file_name, GTK_ALIGN_START);
+#else
+ gtk_misc_set_alignment ((GtkMisc *) label_title, 1, 0.5);
+ gtk_misc_set_alignment ((GtkMisc *) label_album, 1, 0.5);
+ gtk_misc_set_alignment ((GtkMisc *) label_performer, 1, 0.5);
+ gtk_misc_set_alignment ((GtkMisc *) label_file_name, 1, 0.5);
+#endif
+
+ /* some options that control behaviour */
+ GtkWidget * checkbt_clearprevsel = gtk_check_button_new_with_label (
+ _("Clear previous selection before searching"));
+ gtk_toggle_button_set_active ((GtkToggleButton *) checkbt_clearprevsel, true);
+ GtkWidget * checkbt_autoenqueue = gtk_check_button_new_with_label (
+ _("Automatically toggle queue for matching entries"));
+ gtk_toggle_button_set_active ((GtkToggleButton *) checkbt_autoenqueue, false);
+ GtkWidget * checkbt_newplaylist = gtk_check_button_new_with_label (
+ _("Create a new playlist with matching entries"));
+ gtk_toggle_button_set_active ((GtkToggleButton *) checkbt_newplaylist, false);
+
+ g_signal_connect (checkbt_autoenqueue, "clicked",
+ (GCallback) search_cbt_cb, checkbt_newplaylist);
+ g_signal_connect (checkbt_newplaylist, "clicked",
+ (GCallback) search_cbt_cb, checkbt_autoenqueue);
+
+ /* place fields in grid */
+ GtkWidget * main_grid = audgui_grid_new ();
+ audgui_grid_set_row_spacing (main_grid, 6);
+ audgui_grid_set_column_spacing (main_grid, 6);
+
+#ifdef USE_GTK3
+ gtk_widget_set_margin_bottom (hbox, 8);
+ gtk_widget_set_margin_top (checkbt_clearprevsel, 8);
+
+ GtkGrid * grid = (GtkGrid *) main_grid;
+ gtk_grid_attach (grid, hbox, 0, 0, 2, 1);
+ gtk_grid_attach (grid, label_title, 0, 1, 1, 1);
+ gtk_grid_attach (grid, entry_title, 1, 1, 1, 1);
+ gtk_grid_attach (grid, label_album, 0, 2, 1, 1);
+ gtk_grid_attach (grid, entry_album, 1, 2, 1, 1);
+ gtk_grid_attach (grid, label_performer, 0, 3, 1, 1);
+ gtk_grid_attach (grid, entry_performer, 1, 3, 1, 1);
+ gtk_grid_attach (grid, label_file_name, 0, 4, 1, 1);
+ gtk_grid_attach (grid, entry_file_name, 1, 4, 1, 1);
+ gtk_grid_attach (grid, checkbt_clearprevsel, 0, 5, 2, 1);
+ gtk_grid_attach (grid, checkbt_autoenqueue, 0, 6, 2, 1);
+ gtk_grid_attach (grid, checkbt_newplaylist, 0, 7, 2, 1);
+#else
+ GtkTable * grid = (GtkTable *) main_grid;
+ gtk_table_attach_defaults (grid, hbox, 0, 2, 0, 1);
+ gtk_table_attach (grid, label_title, 0, 1, 1, 2, GTK_FILL, GTK_FILL, 0, 0);
+ gtk_table_attach_defaults (grid, entry_title, 1, 2, 1, 2);
+ gtk_table_attach (grid, label_album, 0, 1, 2, 3, GTK_FILL, GTK_FILL, 0, 0);
+ gtk_table_attach_defaults (grid, entry_album, 1, 2, 2, 3);
+ gtk_table_attach (grid, label_performer, 0, 1, 3, 4, GTK_FILL, GTK_FILL, 0, 0);
+ gtk_table_attach_defaults (grid, entry_performer, 1, 2, 3, 4);
+ gtk_table_attach (grid, label_file_name, 0, 1, 4, 5, GTK_FILL, GTK_FILL, 0, 0);
+ gtk_table_attach_defaults (grid, entry_file_name, 1, 2, 4, 5);
+ gtk_table_attach_defaults (grid, checkbt_clearprevsel, 0, 2, 5, 6);
+ gtk_table_attach_defaults (grid, checkbt_autoenqueue, 0, 2, 6, 7);
+ gtk_table_attach_defaults (grid, checkbt_newplaylist, 0, 2, 7, 8);
+#endif
+
+ gtk_container_set_border_width ((GtkContainer *) main_grid, 5);
+ gtk_container_add ((GtkContainer *) gtk_dialog_get_content_area
+ ((GtkDialog *) dialog), main_grid);
+ gtk_widget_show_all (dialog);
+
+ if (gtk_dialog_run ((GtkDialog *) dialog) == GTK_RESPONSE_ACCEPT)
+ {
+ /* create a TitleInput tuple with user search data */
+ Tuple tuple;
+ const char * searchdata = nullptr;
+ auto playlist = Playlist::active_playlist ();
+
+ searchdata = gtk_entry_get_text ((GtkEntry *) entry_title);
+ AUDDBG ("title=\"%s\"\n", searchdata);
+ tuple.set_str (Tuple::Title, searchdata);
+
+ searchdata = gtk_entry_get_text ((GtkEntry *) entry_album);
+ AUDDBG ("album=\"%s\"\n", searchdata);
+ tuple.set_str (Tuple::Album, searchdata);
+
+ searchdata = gtk_entry_get_text ((GtkEntry *) entry_performer);
+ AUDDBG ("performer=\"%s\"\n", searchdata);
+ tuple.set_str (Tuple::Artist, searchdata);
+
+ searchdata = gtk_entry_get_text ((GtkEntry *) entry_file_name);
+ AUDDBG ("filename=\"%s\"\n", searchdata);
+ tuple.set_str (Tuple::Basename, searchdata);
+
+ /* check if previous selection should be cleared before searching */
+ if (gtk_toggle_button_get_active ((GtkToggleButton *) checkbt_clearprevsel))
+ playlist.select_all (false);
+
+ playlist.select_by_patterns (tuple);
+
+ /* check if a new playlist should be created after searching */
+ if (gtk_toggle_button_get_active ((GtkToggleButton *) checkbt_newplaylist))
+ copy_selected_to_new (playlist);
+ else
+ {
+ /* set focus on the first entry found */
+ int entries = playlist.n_entries ();
+ for (int i = 0; i < entries; i ++)
+ {
+ if (playlist.entry_selected (i))
+ {
+ playlistwin_list->set_focused (i);
+ break;
+ }
+ }
+
+ /* check if matched entries should be queued */
+ if (gtk_toggle_button_get_active ((GtkToggleButton *) checkbt_autoenqueue))
+ playlist.queue_insert_selected (-1);
+ }
+ }
+
+ /* done here :) */
+ gtk_widget_destroy (dialog);
+}

audacious-plugins-4.4.1.tar.bz2/src/skins/skin-ini.cc Added

@@ -0,0 +1,278 @@
+/*
+ * Audacious
+ * Copyright 2011-2013 Audacious development team
+ *
+ * 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; under version 3 of the License.
+ *
+ * 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>.
+ *
+ * The Audacious team does not consider modular code linking to
+ * Audacious or using our public API to be a derived work.
+ */
+
+#include <stdlib.h>
+#include <glib.h>
+
+#include <libaudcore/inifile.h>
+
+#include "skins_cfg.h"
+#include "skin.h"
+#include "skins_util.h"
+
+/*
+ * skin.hints parsing
+ */
+
+typedef struct {
+ const char * name;
+ int * value_ptr;
+} HintPair;
+
+/* in alphabetical order to allow binary search */
+static const HintPair hint_pairs = {
+ {"mainwinaboutx", & skin.hints.mainwin_about_x},
+ {"mainwinabouty", & skin.hints.mainwin_about_y},
+ {"mainwinbalancex", & skin.hints.mainwin_balance_x},
+ {"mainwinbalancey", & skin.hints.mainwin_balance_y},
+ {"mainwinclosex", & skin.hints.mainwin_close_x},
+ {"mainwinclosey", & skin.hints.mainwin_close_y},
+ {"mainwinejectx", & skin.hints.mainwin_eject_x},
+ {"mainwinejecty", & skin.hints.mainwin_eject_y},
+ {"mainwineqbuttonx", & skin.hints.mainwin_eqbutton_x},
+ {"mainwineqbuttony", & skin.hints.mainwin_eqbutton_y},
+ {"mainwinheight", & skin.hints.mainwin_height},
+ {"mainwininfobarx", & skin.hints.mainwin_infobar_x},
+ {"mainwininfobary", & skin.hints.mainwin_infobar_y},
+ {"mainwinmenurowvisible", & skin.hints.mainwin_menurow_visible},
+ {"mainwinminimizex", & skin.hints.mainwin_minimize_x},
+ {"mainwinminimizey", & skin.hints.mainwin_minimize_y},
+ {"mainwinnextx", & skin.hints.mainwin_next_x},
+ {"mainwinnexty", & skin.hints.mainwin_next_y},
+ {"mainwinnumber0x", & skin.hints.mainwin_number_0_x},
+ {"mainwinnumber0y", & skin.hints.mainwin_number_0_y},
+ {"mainwinnumber1x", & skin.hints.mainwin_number_1_x},
+ {"mainwinnumber1y", & skin.hints.mainwin_number_1_y},
+ {"mainwinnumber2x", & skin.hints.mainwin_number_2_x},
+ {"mainwinnumber2y", & skin.hints.mainwin_number_2_y},
+ {"mainwinnumber3x", & skin.hints.mainwin_number_3_x},
+ {"mainwinnumber3y", & skin.hints.mainwin_number_3_y},
+ {"mainwinnumber4x", & skin.hints.mainwin_number_4_x},
+ {"mainwinnumber4y", & skin.hints.mainwin_number_4_y},
+ {"mainwinothertextisstatus", & skin.hints.mainwin_othertext_is_status},
+ {"mainwinothertextvisible", & skin.hints.mainwin_othertext_visible},
+ {"mainwinpausex", & skin.hints.mainwin_pause_x},
+ {"mainwinpausey", & skin.hints.mainwin_pause_y},
+ {"mainwinplaystatusx", & skin.hints.mainwin_playstatus_x},
+ {"mainwinplaystatusy", & skin.hints.mainwin_playstatus_y},
+ {"mainwinplayx", & skin.hints.mainwin_play_x},
+ {"mainwinplayy", & skin.hints.mainwin_play_y},
+ {"mainwinplbuttonx", & skin.hints.mainwin_plbutton_x},
+ {"mainwinplbuttony", & skin.hints.mainwin_plbutton_y},
+ {"mainwinpositionx", & skin.hints.mainwin_position_x},
+ {"mainwinpositiony", & skin.hints.mainwin_position_y},
+ {"mainwinpreviousx", & skin.hints.mainwin_previous_x},
+ {"mainwinpreviousy", & skin.hints.mainwin_previous_y},
+ {"mainwinrepeatx", & skin.hints.mainwin_repeat_x},
+ {"mainwinrepeaty", & skin.hints.mainwin_repeat_y},
+ {"mainwinshadex", & skin.hints.mainwin_shade_x},
+ {"mainwinshadey", & skin.hints.mainwin_shade_y},
+ {"mainwinshufflex", & skin.hints.mainwin_shuffle_x},
+ {"mainwinshuffley", & skin.hints.mainwin_shuffle_y},
+ {"mainwinstopx", & skin.hints.mainwin_stop_x},
+ {"mainwinstopy", & skin.hints.mainwin_stop_y},
+ {"mainwinstreaminfovisible", & skin.hints.mainwin_streaminfo_visible},
+ {"mainwintextvisible", & skin.hints.mainwin_text_visible},
+ {"mainwintextwidth", & skin.hints.mainwin_text_width},
+ {"mainwintextx", & skin.hints.mainwin_text_x},
+ {"mainwintexty", & skin.hints.mainwin_text_y},
+ {"mainwinvisvisible", & skin.hints.mainwin_vis_visible},
+ {"mainwinvisx", & skin.hints.mainwin_vis_x},
+ {"mainwinvisy", & skin.hints.mainwin_vis_y},
+ {"mainwinvolumex", & skin.hints.mainwin_volume_x},
+ {"mainwinvolumey", & skin.hints.mainwin_volume_y},
+ {"mainwinwidth", & skin.hints.mainwin_width},
+ {"textboxbitmapfontheight", & skin.hints.textbox_bitmap_font_height},
+ {"textboxbitmapfontwidth", & skin.hints.textbox_bitmap_font_width},
+};
+
+static int hint_pair_compare (const void * key, const void * pair)
+{
+ return g_ascii_strcasecmp ((const char *) key, ((const HintPair *) pair)->name);
+}
+
+class HintsParser : public IniParser
+{
+private:
+ bool valid_heading = false;
+
+ void handle_heading (const char * heading)
+ { valid_heading = ! g_ascii_strcasecmp (heading, "skin"); }
+
+ void handle_entry (const char * key, const char * value)
+ {
+ if (! valid_heading)
+ return;
+
+ HintPair * pair = (HintPair *) bsearch (key, hint_pairs,
+ aud::n_elems (hint_pairs), sizeof (HintPair), hint_pair_compare);
+
+ if (pair)
+ * pair->value_ptr = atoi (value);
+ }
+};
+
+void skin_load_hints (const char * path)
+{
+ VFSFile file = open_local_file_nocase (path, "skin.hints");
+ if (file)
+ HintsParser ().parse (file);
+}
+
+/*
+ * pledit.txt parsing
+ */
+
+class PLColorsParser : public IniParser
+{
+public:
+ PLColorsParser () :
+ valid_heading (false) {}
+
+private:
+ bool valid_heading;
+
+ void handle_heading (const char * heading)
+ { valid_heading = ! g_ascii_strcasecmp (heading, "text"); }
+
+ void handle_entry (const char * key, const char * value)
+ {
+ if (! valid_heading)
+ return;
+
+ if (value0 == '#')
+ value ++;
+
+ uint32_t color = strtol (value, nullptr, 16);
+
+ if (! g_ascii_strcasecmp (key, "normal"))
+ skin.colorsSKIN_PLEDIT_NORMAL = color;
+ else if (! g_ascii_strcasecmp (key, "current"))
+ skin.colorsSKIN_PLEDIT_CURRENT = color;
+ else if (! g_ascii_strcasecmp (key, "normalbg"))
+ skin.colorsSKIN_PLEDIT_NORMALBG = color;
+ else if (! g_ascii_strcasecmp (key, "selectedbg"))
+ skin.colorsSKIN_PLEDIT_SELECTEDBG = color;
+ }
+};
+
+void skin_load_pl_colors (const char * path)
+{
+ skin.colorsSKIN_PLEDIT_NORMAL = 0x2499ff;
+ skin.colorsSKIN_PLEDIT_CURRENT = 0xffeeff;
+ skin.colorsSKIN_PLEDIT_NORMALBG = 0x0a120a;
+ skin.colorsSKIN_PLEDIT_SELECTEDBG = 0x0a124a;
+
+ VFSFile file = open_local_file_nocase (path, "pledit.txt");
+ if (file)
+ PLColorsParser ().parse (file);
+}
+
+/*
+ * region.txt parsing
+ */
+
+class MaskParser : public IniParser
+{
+public:
+ Index<int> numpointsSKIN_MASK_COUNT;
+ Index<int> pointlistSKIN_MASK_COUNT;
+
+private:
+ SkinMaskId current_id = SkinMaskId (-1);
+
+ void handle_heading (const char * heading)
+ {
+ if (! g_ascii_strcasecmp (heading, "normal"))
+ current_id = SKIN_MASK_MAIN;
+ else if (! g_ascii_strcasecmp (heading, "windowshade"))
+ current_id = SKIN_MASK_MAIN_SHADE;
+ else if (! g_ascii_strcasecmp (heading, "equalizer"))
+ current_id = SKIN_MASK_EQ;
+ else if (! g_ascii_strcasecmp (heading, "equalizerws"))
+ current_id = SKIN_MASK_EQ_SHADE;
+ else
+ current_id = (SkinMaskId) -1;
+ }
+
+ void handle_entry (const char * key, const char * value)
+ {
+ if (current_id == (SkinMaskId) -1)
+ return;
+
+ if (! g_ascii_strcasecmp (key, "numpoints"))
+ numpointscurrent_id = string_to_int_array (value);
+ else if (! g_ascii_strcasecmp (key, "pointlist"))
+ pointlistcurrent_id = string_to_int_array (value);
+ }
+};
+
+static Index<GdkRectangle> skin_create_mask (const Index<int> & num,
+ const Index<int> & point, int width, int height)
+{
+ Index<GdkRectangle> mask;
+
+ int j = 0;
+ for (int i = 0; i < num.len (); i ++)
+ {
+ int n_points = numi;
+ if (n_points <= 0 || j + 2 * n_points > point.len ())
+ break;
+
+ int xmin = width, ymin = height, xmax = 0, ymax = 0;
+
+ for (int k = 0; k < n_points; k ++)
+ {
+ int x = pointj + k * 2;
+ int y = pointj + k * 2 + 1;
+
+ xmin = aud::min (xmin, x);
+ ymin = aud::min (ymin, y);
+ xmax = aud::max (xmax, x);
+ ymax = aud::max (ymax, y);
+ }
+
+ if (xmax > xmin && ymax > ymin)
+ mask.append (xmin, ymin, xmax - xmin, ymax - ymin);
+
+ j += n_points * 2;
+ }
+
+ return mask;
+}
+
+void skin_load_masks (const char * path)
+{
+ int sizesSKIN_MASK_COUNT2 = {
+ {skin.hints.mainwin_width, skin.hints.mainwin_height},
+ {275, 16},
+ {275, 116},
+ {275, 16}
+ };
+
+ MaskParser parser;
+ VFSFile file = open_local_file_nocase (path, "region.txt");
+ if (file)
+ parser.parse (file);
+
+ for (int id = 0; id < SKIN_MASK_COUNT; id ++)
+ skin.masksid = skin_create_mask (parser.numpointsid,
+ parser.pointlistid, sizesid0, sizesid1);
+}

audacious-plugins-4.4.1.tar.bz2/src/skins/skin.cc Added

@@ -0,0 +1,457 @@
+/* Audacious
+ * Copyright (C) 2005-2015 Audacious development team.
+ *
+ * BMP - Cross-platform multimedia player
+ * Copyright (C) 2003-2004 BMP development team.
+ *
+ * Based on XMMS:
+ * Copyright (C) 1998-2003 XMMS development team.
+ *
+ * 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; under version 3 of the License.
+ *
+ * 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>.
+ *
+ * The Audacious team does not consider modular code linking to
+ * Audacious or using our public API to be a derived work.
+ */
+
+#include <errno.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/stat.h>
+
+#include <gtk/gtk.h>
+
+#include <libaudcore/audstrings.h>
+#include <libaudcore/runtime.h>
+
+#include "plugin.h"
+#include "skins_cfg.h"
+#include "surface.h"
+#include "skin.h"
+#include "skins_util.h"
+
+struct SkinPixmapIdMapping {
+ const char *name;
+ const char *alt_name;
+};
+
+static const SkinPixmapIdMapping skin_pixmap_id_map = {
+ {"main"},
+ {"cbuttons"},
+ {"titlebar"},
+ {"shufrep"},
+ {"text"},
+ {"volume"},
+ {"balance", "volume"},
+ {"monoster"},
+ {"playpaus"},
+ {"nums_ex", "numbers"},
+ {"posbar"},
+ {"pledit"},
+ {"eqmain"},
+ {"eq_ex"}
+};
+
+static_assert (aud::n_elems (skin_pixmap_id_map) == SKIN_PIXMAP_COUNT,
+ "update skin_pixmap_id_map!");
+
+static const uint32_t default_vis_colors24 = {
+ 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)
+};
+
+Skin skin;
+
+static bool skin_load_pixmap_id (SkinPixmapId id, const char * path)
+{
+ StringBuf filename = skin_pixmap_locate (path, skin_pixmap_id_mapid.name,
+ skin_pixmap_id_mapid.alt_name);
+
+ if (! filename)
+ {
+ AUDERR ("Skin does not contain a \"%s\" pixmap.\n", skin_pixmap_id_mapid.name);
+ return false;
+ }
+
+ skin.pixmapsid.capture (surface_new_from_file (filename));
+ return skin.pixmapsid ? true : false;
+}
+
+static int color_diff (uint32_t a, uint32_t b)
+{
+ return abs (COLOR_R (a) - COLOR_R (b)) + abs (COLOR_G (a) - COLOR_G (b)) +
+ abs (COLOR_B (a) - COLOR_B (b));
+}
+
+static void skin_get_textcolors (cairo_surface_t * s)
+{
+ /*
+ * Try to extract reasonable background and foreground colors
+ * from the font pixmap
+ */
+
+ /* Get a pixel from the middle of the space character */
+ skin.colorsSKIN_TEXTBG = surface_get_pixel (s, 152, 3);
+
+ int max_d = -1;
+ for (int y = 0; y < 6; y ++)
+ {
+ for (int x = 1; x < 150; x ++)
+ {
+ uint32_t c = surface_get_pixel (s, x, y);
+ int d = color_diff (skin.colorsSKIN_TEXTBG, c);
+ if (d > max_d)
+ {
+ skin.colorsSKIN_TEXTFG = c;
+ max_d = d;
+ }
+ }
+ }
+}
+
+static void skin_get_eq_spline_colors (cairo_surface_t * s)
+{
+ if (cairo_image_surface_get_height (s) < 313)
+ return;
+
+ for (int i = 0; i < 19; i ++)
+ skin.eq_spline_colorsi = surface_get_pixel (s, 115, i + 294);
+}
+
+static void skin_load_viscolor (const char * path)
+{
+ memcpy (skin.vis_colors, default_vis_colors, sizeof skin.vis_colors);
+
+ VFSFile file = open_local_file_nocase (path, "viscolor.txt");
+ if (! file)
+ return;
+
+ Index<char> buffer = file.read_all ();
+ buffer.append (0); /* null-terminated */
+
+ char * string = buffer.begin ();
+
+ for (int line = 0; string && line < 24; line ++)
+ {
+ char * next = text_parse_line (string);
+ Index<int> array = string_to_int_array (string);
+
+ if (array.len () >= 3)
+ skin.vis_colorsline = COLOR (array0, array1, array2);
+
+ string = next;
+ }
+}
+
+static void skin_numbers_generate_dash (CairoSurfacePtr & s)
+{
+ int w = cairo_image_surface_get_width (s.get ());
+ if (w < 99 || w >= 108)
+ return;
+
+ int h = cairo_image_surface_get_height (s.get ());
+ cairo_surface_t * surface = surface_new (108, h);
+
+ surface_copy_rect (s.get (), 0, 0, 99, h, surface, 0, 0);
+ surface_copy_rect (s.get (), 90, 0, 9, h, surface, 99, 0);
+ surface_copy_rect (s.get (), 20, 6, 5, 1, surface, 101, 6);
+
+ s.capture (surface);
+}
+
+static bool skin_load_pixmaps (const char * path)
+{
+ AUDDBG ("Loading pixmaps in %s\n", path);
+
+ /* eq_ex.bmp was added after Winamp 2.0 so some skins do not include it */
+ for (int i = 0; i < SKIN_PIXMAP_COUNT; i ++)
+ if (! skin_load_pixmap_id ((SkinPixmapId) i, path) && i != SKIN_EQ_EX)
+ return false;
+
+ skin_get_textcolors (skin.pixmapsSKIN_TEXT.get ());
+ skin_get_eq_spline_colors (skin.pixmapsSKIN_EQMAIN.get ());
+ skin_numbers_generate_dash (skin.pixmapsSKIN_NUMBERS);
+
+ return true;
+}
+
+static bool skin_load_data (const char * path)
+{
+ AUDDBG ("Attempt to load skin \"%s\"\n", path);
+
+ if (! g_file_test (path, G_FILE_TEST_EXISTS))
+ return false;
+
+ StringBuf archive_path;
+ if (file_is_archive (path))
+ {
+ AUDDBG ("Attempt to load archive\n");
+ archive_path = archive_decompress (path);
+
+ if (! archive_path)
+ {
+ AUDDBG ("Unable to extract skin archive (%s)\n", path);
+ return false;
+ }
+
+ path = archive_path;
+ }
+
+ bool success = skin_load_pixmaps (path);
+
+ if (success)
+ {
+ skin_load_hints (path);
+ skin_load_pl_colors (path);
+ skin_load_viscolor (path);
+ skin_load_masks (path);
+ }
+ else
+ AUDDBG ("Skin loading failed\n");
+
+ if (archive_path)
+ del_directory (archive_path);
+
+ return success;
+}
+
+bool skin_load (const char * path)
+{
+ /* save current skin data */
+ Skin old_skin (std::move (skin));
+
+ /* reset to defaults */
+ skin = Skin ();
+
+ if (skin_load_data (path))
+ {
+ aud_set_str ("skins", "skin", path);
+ return true;
+ }
+
+ AUDWARN ("Unable to load skin (%s).\n", (const char *) path);
+
+ /* restore old skin data */
+ skin = std::move (old_skin);
+ return false;
+}
+
+void skin_install_skin (const char * path)
+{
+ GError * err = nullptr;
+ char * data;
+ size_t len;
+
+ if (! g_file_get_contents (path, & data, & len, & err))
+ {
+ AUDERR ("Failed to read %s: %s\n", path, err->message);
+ g_error_free (err);
+ return;
+ }
+
+ const char * user_skin_dir = skins_get_user_skin_dir ();
+ make_directory (user_skin_dir);
+
+ StringBuf base = filename_get_base (path);
+ StringBuf target = filename_build ({user_skin_dir, base});
+
+ if (g_file_set_contents (target, data, len, & err))
+ aud_set_str ("skins", "skin", target);
+ else
+ {
+ AUDERR ("Failed to write %s: %s\n", path, err->message);
+ g_error_free (err);
+ }
+
+ g_free (data);
+}
+
+void skin_draw_pixbuf (cairo_t * cr, SkinPixmapId id, int xsrc, int ysrc, int
+ xdest, int ydest, int width, int height)
+{
+ if (! skin.pixmapsid)
+ return;
+
+ cairo_set_source_surface (cr, skin.pixmapsid.get (), xdest - xsrc, ydest - ysrc);
+ cairo_pattern_set_filter (cairo_get_source (cr), CAIRO_FILTER_NEAREST);
+ cairo_rectangle (cr, xdest, ydest, width, height);
+ cairo_fill (cr);
+}
+
+static void skin_draw_playlistwin_frame_top (cairo_t * cr, int width, bool focus)
+{
+ /* The title bar skin consists of 2 sets of 4 images, 1 set
+ * for focused state and the other for unfocused.
+ * The 4 images are:
+ *
+ * a. right corner (25,20)
+ * b. left corner (25,20)
+ * c. tiler (25,20)
+ * d. title (100,20)
+ *
+ * min allowed width = 100+25+25 = 150
+ */
+
+ /* get y offset of the pixmap set to use */
+ int y = focus ? 0 : 21;
+
+ /* left corner */
+ skin_draw_pixbuf (cr, SKIN_PLEDIT, 0, y, 0, 0, 25, 20);
+
+ /* titlebar title */
+ skin_draw_pixbuf (cr, SKIN_PLEDIT, 26, y, (width - 100) / 2, 0, 100, 20);
+
+ /* titlebar right corner */
+ skin_draw_pixbuf (cr, SKIN_PLEDIT, 153, y, width - 25, 0, 25, 20);
+
+ /* tile draw the remaining frame */
+
+ /* compute tile count */
+ int c = (width - (100 + 25 + 25)) / 25;
+
+ for (int i = 0; i < c / 2; i ++)
+ {
+ /* left of title */
+ skin_draw_pixbuf (cr, SKIN_PLEDIT, 127, y, 25 + i * 25, 0, 25, 20);
+
+ /* right of title */
+ skin_draw_pixbuf (cr, SKIN_PLEDIT, 127, y, (width + 100) / 2 + i * 25, 0, 25, 20);
+ }
+
+ if (c & 1)
+ {
+ /* Odd tile count, so one remaining to draw. Here we split
+ * it into two and draw half on either side of the title */
+ skin_draw_pixbuf (cr, SKIN_PLEDIT, 127, y, ((c / 2) * 25) + 25, 0, 12, 20);
+ skin_draw_pixbuf (cr, SKIN_PLEDIT, 127, y, (width / 2) + ((c / 2) * 25) + 50, 0, 13, 20);
+ }
+}
+
+static void skin_draw_playlistwin_frame_bottom (cairo_t * cr, int width, int height)
+{
+ /* The bottom frame skin consists of 1 set of 4 images.
+ * The 4 images are:
+ *
+ * a. left corner with menu buttons (125,38)
+ * b. visualization window (75,38)
+ * c. right corner with play buttons (150,38)
+ * d. frame tile (25,38)
+ *
+ * (min allowed width = 125+150+25=300
+ */
+
+ /* bottom left corner (menu buttons) */
+ skin_draw_pixbuf (cr, SKIN_PLEDIT, 0, 72, 0, height - 38, 125, 38);
+
+ int c = (width - 275) / 25;
+
+ /* draw visualization window, if width allows */
+ if (c >= 3)
+ {
+ c -= 3;
+ skin_draw_pixbuf (cr, SKIN_PLEDIT, 205, 0, width - (150 + 75), height - 38, 75, 38);
+ }
+
+ /* Bottom right corner (playbuttons etc) */
+ skin_draw_pixbuf (cr, SKIN_PLEDIT, 126, 72, width - 150, height - 38, 150, 38);
+
+ /* Tile draw the remaining undrawn portions */
+ for (int i = 0; i < c; i ++)
+ skin_draw_pixbuf (cr, SKIN_PLEDIT, 179, 0, 125 + i * 25, height - 38, 25, 38);
+}
+
+static void skin_draw_playlistwin_frame_sides (cairo_t * cr, int width, int height)
+{
+ /* The side frames consist of 2 tile images. 1 for the left, 1 for
+ * the right.
+ * a. left (12,29)
+ * b. right (19,29)
+ */
+
+ /* frame sides */
+ for (int i = 0; i < (height - (20 + 38)) / 29; i ++)
+ {
+ /* left */
+ skin_draw_pixbuf (cr, SKIN_PLEDIT, 0, 42, 0, 20 + i * 29, 12, 29);
+
+ /* right */
+ skin_draw_pixbuf (cr, SKIN_PLEDIT, 32, 42, width - 19, 20 + i * 29, 19, 29);
+ }
+}
+
+void skin_draw_playlistwin_frame (cairo_t * cr, int width, int height, bool focus)
+{
+ skin_draw_playlistwin_frame_top (cr, width, focus);
+ skin_draw_playlistwin_frame_bottom (cr, width, height);
+ skin_draw_playlistwin_frame_sides (cr, width, height);
+}
+
+void skin_draw_playlistwin_shaded (cairo_t * cr, int width, bool focus)
+{
+ /* The shade mode titlebar skin consists of 4 images:
+ * a) left corner offset (72,42) size (25,14)
+ * b) right corner, focused offset (99,57) size (50,14)
+ * c) right corner, unfocused offset (99,42) size (50,14)
+ * d) bar tile offset (72,57) size (25,14)
+ */
+
+ /* left corner */
+ skin_draw_pixbuf (cr, SKIN_PLEDIT, 72, 42, 0, 0, 25, 14);
+
+ /* bar tile */
+ for (int i = 0; i < (width - 75) / 25; i ++)
+ skin_draw_pixbuf (cr, SKIN_PLEDIT, 72, 57, (i * 25) + 25, 0, 25, 14);
+
+ /* right corner */
+ skin_draw_pixbuf (cr, SKIN_PLEDIT, 99, focus ? 42 : 57, width - 50, 0, 50, 14);
+}
+
+void skin_draw_mainwin_titlebar (cairo_t * cr, bool shaded, bool focus)
+{
+ /* The titlebar skin consists of 2 sets of 2 images, one for for
+ * shaded and the other for unshaded mode, giving a total of 4.
+ * The images are exactly 275x14 pixels, aligned and arranged
+ * vertically on each other in the pixmap in the following order:
+ *
+ * a) unshaded, focused offset (27, 0)
+ * b) unshaded, unfocused offset (27, 15)
+ * c) shaded, focused offset (27, 29)
+ * d) shaded, unfocused offset (27, 42)
+ */
+
+ int y_offset = shaded ? (focus ? 29 : 42) : (focus ? 0 : 15);
+
+ skin_draw_pixbuf (cr, SKIN_TITLEBAR, 27, y_offset, 0, 0,
+ skin.hints.mainwin_width, 14);
+}

audacious-plugins-4.4.1.tar.bz2/src/skins/skin.h Added

@@ -0,0 +1,210 @@
+/* Audacious
+ * Copyright (C) 2005-2011 Audacious development team.
+ *
+ * BMP - Cross-platform multimedia player
+ * Copyright (C) 2003-2004 BMP development team.
+ *
+ * Based on XMMS:
+ * Copyright (C) 1998-2003 XMMS development team.
+ *
+ * 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; under version 3 of the License.
+ *
+ * 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>.
+ *
+ * The Audacious team does not consider modular code linking to
+ * Audacious or using our public API to be a derived work.
+ */
+
+#ifndef SKIN_H
+#define SKIN_H
+
+#include <stdint.h>
+#include <gtk/gtk.h>
+
+#include <libaudcore/index.h>
+#include <libaudcore/objects.h>
+
+typedef SmartPtr<cairo_surface_t, cairo_surface_destroy> CairoSurfacePtr;
+typedef SmartPtr<PangoFontDescription, pango_font_description_free> PangoFontDescPtr;
+
+#define COLOR(r,g,b) (((uint32_t) (r) << 16) | ((uint32_t) (g) << 8) | (uint32_t) (b))
+#define COLOR_R(c) ((int) (((c) & 0xff0000) >> 16))
+#define COLOR_G(c) ((int) (((c) & 0xff00) >> 8))
+#define COLOR_B(c) ((int) ((c) & 0xff))
+
+typedef enum {
+ SKIN_MAIN = 0,
+ SKIN_CBUTTONS,
+ SKIN_TITLEBAR,
+ SKIN_SHUFREP,
+ SKIN_TEXT,
+ SKIN_VOLUME,
+ SKIN_BALANCE,
+ SKIN_MONOSTEREO,
+ SKIN_PLAYPAUSE,
+ SKIN_NUMBERS,
+ SKIN_POSBAR,
+ SKIN_PLEDIT,
+ SKIN_EQMAIN,
+ SKIN_EQ_EX,
+ SKIN_PIXMAP_COUNT
+} SkinPixmapId;
+
+typedef enum {
+ SKIN_MASK_MAIN = 0,
+ SKIN_MASK_MAIN_SHADE,
+ SKIN_MASK_EQ,
+ SKIN_MASK_EQ_SHADE,
+ SKIN_MASK_COUNT
+} SkinMaskId;
+
+typedef enum {
+ SKIN_PLEDIT_NORMAL = 0,
+ SKIN_PLEDIT_CURRENT,
+ SKIN_PLEDIT_NORMALBG,
+ SKIN_PLEDIT_SELECTEDBG,
+ SKIN_TEXTBG,
+ SKIN_TEXTFG,
+ SKIN_COLOR_COUNT
+} SkinColorId;
+
+struct SkinHints {
+ /* Vis properties */
+ int mainwin_vis_x = 24;
+ int mainwin_vis_y = 43;
+ int mainwin_vis_visible = true;
+
+ /* Text properties */
+ int mainwin_text_x = 112;
+ int mainwin_text_y = 27;
+ int mainwin_text_width = 153;
+ int mainwin_text_visible = true;
+
+ /* Infobar properties */
+ int mainwin_infobar_x = 112;
+ int mainwin_infobar_y = 43;
+ int mainwin_othertext_visible = false;
+
+ int mainwin_number_0_x = 36;
+ int mainwin_number_0_y = 26;
+
+ int mainwin_number_1_x = 48;
+ int mainwin_number_1_y = 26;
+
+ int mainwin_number_2_x = 60;
+ int mainwin_number_2_y = 26;
+
+ int mainwin_number_3_x = 78;
+ int mainwin_number_3_y = 26;
+
+ int mainwin_number_4_x = 90;
+ int mainwin_number_4_y = 26;
+
+ int mainwin_playstatus_x = 24;
+ int mainwin_playstatus_y = 28;
+
+ int mainwin_volume_x = 107;
+ int mainwin_volume_y = 57;
+
+ int mainwin_balance_x = 177;
+ int mainwin_balance_y = 57;
+
+ int mainwin_position_x = 16;
+ int mainwin_position_y = 72;
+
+ int mainwin_previous_x = 16;
+ int mainwin_previous_y = 88;
+
+ int mainwin_play_x = 39;
+ int mainwin_play_y = 88;
+
+ int mainwin_pause_x = 62;
+ int mainwin_pause_y = 88;
+
+ int mainwin_stop_x = 85;
+ int mainwin_stop_y = 88;
+
+ int mainwin_next_x = 108;
+ int mainwin_next_y = 88;
+
+ int mainwin_eject_x = 136;
+ int mainwin_eject_y = 89;
+
+ int mainwin_eqbutton_x = 219;
+ int mainwin_eqbutton_y = 58;
+
+ int mainwin_plbutton_x = 242;
+ int mainwin_plbutton_y = 58;
+
+ int mainwin_shuffle_x = 164;
+ int mainwin_shuffle_y = 89;
+
+ int mainwin_repeat_x = 210;
+ int mainwin_repeat_y = 89;
+
+ int mainwin_about_x = 247;
+ int mainwin_about_y = 83;
+
+ int mainwin_minimize_x = 244;
+ int mainwin_minimize_y = 3;
+
+ int mainwin_shade_x = 254;
+ int mainwin_shade_y = 3;
+
+ int mainwin_close_x = 264;
+ int mainwin_close_y = 3;
+
+ int mainwin_width = 275;
+ int mainwin_height = 116;
+
+ int mainwin_menurow_visible = true;
+ int mainwin_streaminfo_visible = true;
+ int mainwin_othertext_is_status = false;
+
+ int textbox_bitmap_font_width = 5;
+ int textbox_bitmap_font_height = 6;
+};
+
+struct Skin {
+ SkinHints hints;
+ uint32_t colorsSKIN_COLOR_COUNT {};
+ uint32_t eq_spline_colors19 {};
+ uint32_t vis_colors24 {};
+
+ CairoSurfacePtr pixmapsSKIN_PIXMAP_COUNT;
+ Index<GdkRectangle> masksSKIN_MASK_COUNT;
+};
+
+extern Skin skin;
+
+bool skin_load (const char * path);
+
+void skin_draw_pixbuf (cairo_t * cr, SkinPixmapId id, int xsrc, int ysrc,
+ int xdest, int ydest, int width, int height);
+
+void skin_install_skin (const char * path);
+
+void skin_draw_playlistwin_shaded (cairo_t * cr, int width, bool focus);
+void skin_draw_playlistwin_frame (cairo_t * cr, int width, int height, bool focus);
+void skin_draw_mainwin_titlebar (cairo_t * cr, bool shaded, bool focus);
+
+/* ui_skin_load_ini.c */
+void skin_load_hints (const char * path);
+void skin_load_pl_colors (const char * path);
+void skin_load_masks (const char * path);
+
+static inline void set_cairo_color (cairo_t * cr, uint32_t c)
+{
+ cairo_set_source_rgb (cr, COLOR_R(c) / 255.0, COLOR_G(c) / 255.0, COLOR_B(c)
+ / 255.0);
+}
+
+#endif

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/skins_cfg.cc -> audacious-plugins-4.4.1.tar.bz2/src/skins/skins_cfg.cc Changed

@@ -26,58 +26,62 @@
 #include <libaudcore/runtime.h>
 #include <libaudcore/preferences.h>
 #include <libaudcore/audstrings.h>
+#include <libaudgui/libaudgui-gtk.h>
 
 #include "dnd.h"
 #include "skins_cfg.h"
-#include "ui_equalizer.h"
-#include "ui_main.h"
-#include "ui_main_evlisteners.h"
-#include "ui_playlist.h"
-#include "ui_skin.h"
-#include "ui_skinned_playlist.h"
-#include "ui_skinned_textbox.h"
-#include "ui_skinselector.h"
-#include "ui_vis.h"
-#include "util.h"
+#include "main.h"
+#include "vis-callbacks.h"
+#include "playlistwin.h"
+#include "skin.h"
+#include "playlist-widget.h"
+#include "textbox.h"
+#include "skinselector.h"
+#include "vis.h"
+#include "skins_util.h"
+#include "view.h"
 
 static const char * const skins_defaults = {
- /* general */
- "autoscroll_songname", "TRUE",
- "mainwin_font", "Sans Bold 9",
- "mainwin_use_bitmapfont", "TRUE",
- "playlist_font", "Sans Bold 8",
- "show_remaining_time", "FALSE",
- "twoway_scroll", "FALSE",
-
- /* visualizer */
- "analyzer_falloff", "3", /* FALLOFF_FAST */
- "analyzer_mode", "0", /* ANALYZER_NORMAL */
- "analyzer_peaks", "TRUE",
- "analyzer_type", "1", /* ANALYZER_BARS */
- "peaks_falloff", "1", /* FALLOFF_SLOW */
- "scope_mode", "0", /* SCOPE_DOT */
- "vis_type", "0", /* VIS_ANALYZER */
- "voiceprint_mode", "0", /* VOICEPRINT_NORMAL */
- "vu_mode", "1", /* VU_SMOOTH */
-
- /* windows */
- "always_on_top", "FALSE",
- "double_size", "FALSE",
- "equalizer_shaded", "FALSE",
- "equalizer_visible", "FALSE",
- "equalizer_x", "20",
- "equalizer_y", "136",
- "player_shaded", "FALSE",
- "player_x", "20",
- "player_y", "20",
- "playlist_shaded", "FALSE",
- "playlist_visible", "FALSE",
- "playlist_x", "295",
- "playlist_y", "20",
- "playlist_width", "275",
- "playlist_height", "232",
- "sticky", "FALSE",
- nullptr};
+ /* general */
+ "autoscroll_songname", "TRUE",
+ "mainwin_font", "Sans Bold 9",
+ "mainwin_use_bitmapfont", "TRUE",
+ "playlist_font", "Sans Bold 8",
+ "show_remaining_time", "FALSE",
+ "twoway_scroll", "FALSE",
+
+ /* visualizer */
+ "analyzer_falloff", aud::numeric_string<FALLOFF_FAST>::str,
+ "analyzer_mode", aud::numeric_string<ANALYZER_NORMAL>::str,
+ "analyzer_peaks", "TRUE",
+ "analyzer_type", aud::numeric_string<ANALYZER_BARS>::str,
+ "peaks_falloff", aud::numeric_string<FALLOFF_SLOW>::str,
+ "scope_mode", aud::numeric_string<SCOPE_DOT>::str,
+ "vis_type", aud::numeric_string<VIS_ANALYZER>::str,
+ "voiceprint_mode", aud::numeric_string<VOICEPRINT_NORMAL>::str,
+ "vu_mode", aud::numeric_string<VU_SMOOTH>::str,
+
+ /* windows */
+ "active_titlebar_any", "TRUE",
+ "always_on_top", "FALSE",
+ "double_size", "FALSE",
+ "equalizer_shaded", "FALSE",
+ "equalizer_visible", "FALSE",
+ "equalizer_x", "20",
+ "equalizer_y", "136",
+ "player_shaded", "FALSE",
+ "player_x", "20",
+ "player_y", "20",
+ "playlist_shaded", "FALSE",
+ "playlist_visible", "FALSE",
+ "playlist_x", "295",
+ "playlist_y", "20",
+ "playlist_width", "275",
+ "playlist_height", "232",
+ "sticky", "FALSE",
+
+ nullptr
+};
 
 skins_cfg_t config;
 
@@ -91,6 +95,7 @@
 /* general */
 {"autoscroll_songname", & config.autoscroll},
 {"mainwin_use_bitmapfont", & config.mainwin_use_bitmapfont},
+ {"active_titlebar_any", & config.active_titlebar_any},
 {"twoway_scroll", & config.twoway_scroll},
 
 /* visualizer */
@@ -123,7 +128,7 @@
 {"playlist_height", & config.playlist_height}
 };
 
-void skins_cfg_load (void)
+void skins_cfg_load ()
 {
 aud_config_set_defaults ("skins", skins_defaults);
 
@@ -132,11 +137,9 @@
 
 for (auto & nument : skins_numents)
 * nument.ptr = aud_get_int ("skins", nument.name);
-
- config.scale = aud_get_bool ("skins", "double_size") ? 2 : 1;
 }
 
-void skins_cfg_save (void)
+void skins_cfg_save ()
 {
 for (auto & boolent : skins_boolents)
 aud_set_bool ("skins", boolent.name, * boolent.ptr);
@@ -145,33 +148,36 @@
 aud_set_int ("skins", nument.name, * nument.ptr);
 }
 
-static void
-mainwin_font_set_cb()
+static void mainwin_font_set_cb ()
 {
- String font = aud_get_str ("skins", "mainwin_font");
- textbox_set_font (mainwin_info, config.mainwin_use_bitmapfont ? nullptr : (const char *) font);
+ if (! config.mainwin_use_bitmapfont)
+ mainwin_info->set_font (aud_get_str ("skins", "mainwin_font"));
+ else
+ mainwin_info->set_font (nullptr);
 }
 
-static void
-playlist_font_set_cb()
+static void playlist_font_set_cb ()
 {
- String font = aud_get_str ("skins", "playlist_font");
- ui_skinned_playlist_set_font (playlistwin_list, font);
+ playlistwin_list->set_font (aud_get_str ("skins", "playlist_font"));
 }
 
-static void autoscroll_set_cb (void)
+static void autoscroll_set_cb ()
 {
- textbox_set_scroll (mainwin_info, config.autoscroll);
- textbox_set_scroll (playlistwin_sinfo, config.autoscroll);
+ if (! aud_get_bool ("skins", "mainwin_shaded"))
+ mainwin_info->set_scroll (config.autoscroll);
+ if (aud_get_bool ("skins", "playlist_shaded"))
+ playlistwin_sinfo->set_scroll (config.autoscroll);
 }
 
-static void vis_reset_cb (void)
+static void vis_reset_cb ()
 {
- ui_vis_clear_data (mainwin_vis);
- ui_svis_clear_data (mainwin_svis);
- start_stop_visual (FALSE);
+ mainwin_vis->clear ();
+ mainwin_svis->clear ();
+ start_stop_visual (false);
 }
 
+static void * create_skin_view ();
+
 static const PreferencesWidget font_table_elements = {
 WidgetFonts (N_("Player:"),
 WidgetString ("skins", "mainwin_font", mainwin_font_set_cb),
@@ -181,14 +187,13 @@
 {N_("Select playlist font:")})
 };
 
-static void * create_skin_view (void);
-
 static const PreferencesWidget skins_widgets_general = {
 WidgetLabel (N_("Skin")),
 WidgetCustomGTK (create_skin_view),
+ WidgetCheck (N_("Display active titlebar when any window is focused"),
+ WidgetBool (config.active_titlebar_any, nullptr)),
 WidgetLabel (N_("Fonts")),
- WidgetTable ({{font_table_elements}},
- WIDGET_CHILD),
+ WidgetTable ({{font_table_elements}}),
 WidgetCheck (N_("Use bitmap fonts (supports ASCII only)"),
 WidgetBool (config.mainwin_use_bitmapfont, mainwin_font_set_cb)),
 WidgetCheck (N_("Scroll song title"),
@@ -240,14 +245,7 @@
 ComboItem (N_("Smooth"), VU_SMOOTH)
 };
 
-static const PreferencesWidget skins_widgets_vis = {
- WidgetLabel (N_("Type")),
- WidgetCombo (N_("Visualization type:"),
- WidgetInt (config.vis_type, vis_reset_cb),
- {{vis_mode_elements}}),
- WidgetLabel (N_("Analyzer")),
- WidgetCheck (N_("Show peaks"),
- WidgetBool (config.analyzer_peaks, vis_reset_cb)),
+static const PreferencesWidget analyzer_table = {
 WidgetCombo (N_("Coloring:"),
 WidgetInt (config.analyzer_mode, vis_reset_cb),
 {{analyzer_mode_elements}}),
@@ -259,8 +257,10 @@
 {{falloff_elements}}),
 WidgetCombo (N_("Peak falloff:"),
 WidgetInt (config.peaks_falloff, vis_reset_cb),
- {{falloff_elements}}),
- WidgetLabel (N_("Miscellaneous")),
+ {{falloff_elements}})
+};
+
+static const PreferencesWidget misc_table = {
 WidgetCombo (N_("Scope Style:"),
 WidgetInt (config.scope_mode, vis_reset_cb),
 {{scope_mode_elements}}),
@@ -272,6 +272,19 @@
 {{vu_mode_elements}})
 };
 
+static const PreferencesWidget skins_widgets_vis = {
+ WidgetLabel (N_("Type")),
+ WidgetCombo (N_("Visualization type:"),
+ WidgetInt (config.vis_type, vis_reset_cb),
+ {{vis_mode_elements}}),
+ WidgetLabel (N_("Analyzer")),
+ WidgetCheck (N_("Show peaks"),
+ WidgetBool (config.analyzer_peaks, vis_reset_cb)),
+ WidgetTable ({{analyzer_table}}),
+ WidgetLabel (N_("Miscellaneous")),
+ WidgetTable ({{misc_table}})
+};
+
 static const NotebookTab skins_notebook_tabs = {
 {N_("General"), {skins_widgets_general}},
 {N_("Visualization"), {skins_widgets_vis}}
@@ -283,49 +296,39 @@
 
 const PluginPreferences skins_prefs = {{skins_widgets}};
 
-void
-on_skin_view_drag_data_received(GtkWidget * widget,
- GdkDragContext * context,
- int x, int y,
- GtkSelectionData * selection_data,
- unsigned info, unsigned time,
- void * user_data)
+void on_skin_view_drag_data_received (GtkWidget * widget, GdkDragContext * context,
+ int x, int y, GtkSelectionData * selection_data, unsigned info, unsigned time, void *)
 {
 const char * data = (const char *) gtk_selection_data_get_data (selection_data);
 g_return_if_fail (data);
 
 const char * end = strchr (data, '\r');
- if (! end) end = strchr (data, '\n');
- if (! end) end = data + strlen (data);
-
- StringBuf path = str_copy (data, end - data);
-
- if (strstr (path, "://"))
- {
- StringBuf path2 = uri_to_filename (path);
- if (path2)
- path.steal (std::move (path2));
- }
+ if (! end)
+ end = strchr (data, '\n');
+ if (! end)
+ end = data + strlen (data);
 
- if (file_is_archive(path))
+ StringBuf path = uri_to_filename (str_copy (data, end - data));
+ if (path && file_is_archive (path))
 {
- if (! active_skin_load (path))
+ if (! skin_load (path))
 return;
 
- skin_install_skin(path);
+ view_apply_skin ();
+ skin_install_skin (path);
 
 if (skin_view)
 skin_view_update ((GtkTreeView *) skin_view);
 }
 }
 
-static void * create_skin_view (void)
+static void * create_skin_view ()
 {
 GtkWidget * scrolled = gtk_scrolled_window_new (nullptr, nullptr);
 gtk_scrolled_window_set_policy ((GtkScrolledWindow *) scrolled,
 GTK_POLICY_NEVER, GTK_POLICY_ALWAYS);
 gtk_scrolled_window_set_shadow_type ((GtkScrolledWindow *) scrolled, GTK_SHADOW_IN);
- gtk_widget_set_size_request (scrolled, -1, 160);
+ gtk_widget_set_size_request (scrolled, -1, audgui_get_dpi () * 3 / 2);
 
 skin_view = gtk_tree_view_new ();
 skin_view_realize ((GtkTreeView *) skin_view);

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/skins_cfg.h -> audacious-plugins-4.4.1.tar.bz2/src/skins/skins_cfg.h Changed

audacious-plugins-4.4.1.tar.bz2/src/skins/skins_util.cc Added

audacious-plugins-4.4.1.tar.bz2/src/skins/skins_util.h Added

audacious-plugins-4.4.1.tar.bz2/src/skins/skinselector.cc Added

@@ -0,0 +1,232 @@
+/*
+ * ui_skinselector.c
+ * Copyright 1998-2003 XMMS Development Team
+ * Copyright 2003-2004 BMP Development Team
+ * Copyright 2011 John Lindgren
+ *
+ * This file is part of Audacious.
+ *
+ * Audacious 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, version 2 or version 3 of the License.
+ *
+ * Audacious 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
+ * Audacious. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The Audacious team does not consider modular code linking to Audacious or
+ * using our public API to be a derived work.
+ */
+
+#include <stdlib.h>
+#include <string.h>
+
+#include <libaudcore/audstrings.h>
+#include <libaudcore/i18n.h>
+#include <libaudcore/runtime.h>
+#include <libaudgui/libaudgui-gtk.h>
+
+#include "plugin.h"
+#include "skin.h"
+#include "skinselector.h"
+#include "skins_util.h"
+#include "view.h"
+
+enum SkinViewCols {
+ SKIN_VIEW_COL_PREVIEW,
+ SKIN_VIEW_COL_FORMATTEDNAME,
+ SKIN_VIEW_COL_NAME,
+ SKIN_VIEW_N_COLS
+};
+
+struct SkinNode {
+ String name, desc, path;
+};
+
+static Index<SkinNode> skinlist;
+
+static void skin_view_on_cursor_changed (GtkTreeView * treeview);
+
+static AudguiPixbuf skin_get_preview (const char * path)
+{
+ AudguiPixbuf preview;
+
+ StringBuf archive_path;
+ if (file_is_archive (path))
+ {
+ archive_path = archive_decompress (path);
+ if (! archive_path)
+ return preview;
+
+ path = archive_path;
+ }
+
+ StringBuf preview_path = skin_pixmap_locate (path, "main");
+ if (preview_path)
+ preview.capture (gdk_pixbuf_new_from_file (preview_path, nullptr));
+
+ if (archive_path)
+ del_directory (archive_path);
+
+ return preview;
+}
+
+static AudguiPixbuf skin_get_thumbnail (const char * path)
+{
+ StringBuf base = filename_get_base (path);
+ base.insert (-1, ".png");
+
+ StringBuf thumbname = filename_build ({skins_get_skin_thumb_dir (), base});
+ AudguiPixbuf thumb;
+
+ if (g_file_test (thumbname, G_FILE_TEST_EXISTS))
+ thumb.capture (gdk_pixbuf_new_from_file (thumbname, nullptr));
+
+ if (! thumb)
+ {
+ thumb = skin_get_preview (path);
+
+ if (thumb)
+ {
+ make_directory (skins_get_skin_thumb_dir ());
+ gdk_pixbuf_save (thumb.get (), thumbname, "png", nullptr, nullptr);
+ }
+ }
+
+ if (thumb)
+ audgui_pixbuf_scale_within (thumb, audgui_get_dpi () * 3 / 2);
+
+ return thumb;
+}
+
+static void scan_skindir_func (const char * path, const char * basename)
+{
+ if (g_file_test (path, G_FILE_TEST_IS_REGULAR))
+ {
+ if (file_is_archive (path))
+ skinlist.append (String (archive_basename (basename)),
+ String (_("Archived Winamp 2.x skin")), String (path));
+ }
+ else if (g_file_test (path, G_FILE_TEST_IS_DIR))
+ skinlist.append (String (basename),
+ String (_("Unarchived Winamp 2.x skin")), String (path));
+}
+
+static void skinlist_update ()
+{
+ skinlist.clear ();
+
+ const char * user_skin_dir = skins_get_user_skin_dir ();
+ if (g_file_test (user_skin_dir, G_FILE_TEST_EXISTS))
+ dir_foreach (user_skin_dir, scan_skindir_func);
+
+ StringBuf path = filename_build ({aud_get_path (AudPath::DataDir), "Skins"});
+ dir_foreach (path, scan_skindir_func);
+
+ const char * skinsdir = getenv ("SKINSDIR");
+ if (skinsdir)
+ {
+ for (const String & dir : str_list_to_index (skinsdir, ":"))
+ dir_foreach (dir, scan_skindir_func);
+ }
+
+ skinlist.sort ( (const SkinNode & a, const SkinNode & b)
+ { return str_compare (a.name, b.name); });
+}
+
+void skin_view_update (GtkTreeView * treeview)
+{
+ g_signal_handlers_block_by_func (treeview, (void *) skin_view_on_cursor_changed, nullptr);
+
+ auto store = (GtkListStore *) gtk_tree_view_get_model (treeview);
+ gtk_list_store_clear (store);
+
+ skinlist_update ();
+
+ String current_path = aud_get_str ("skins", "skin");
+ GtkTreePath * current_skin = nullptr;
+
+ for (const SkinNode & node : skinlist)
+ {
+ AudguiPixbuf thumbnail = skin_get_thumbnail (node.path);
+ StringBuf formattedname = str_concat ({"<big>", node.name,
+ "</big>\n", node.desc, ""});
+
+ GtkTreeIter iter;
+ gtk_list_store_append (store, & iter);
+ gtk_list_store_set (store, & iter,
+ SKIN_VIEW_COL_PREVIEW, thumbnail.get (),
+ SKIN_VIEW_COL_FORMATTEDNAME, (const char *) formattedname,
+ SKIN_VIEW_COL_NAME, (const char *) node.name, -1);
+
+ if (! current_skin && strstr (current_path, node.name))
+ current_skin = gtk_tree_model_get_path ((GtkTreeModel *) store, & iter);
+ }
+
+ if (current_skin)
+ {
+ auto selection = gtk_tree_view_get_selection (treeview);
+ gtk_tree_selection_select_path (selection, current_skin);
+ gtk_tree_view_scroll_to_cell (treeview, current_skin, nullptr, true, 0.5, 0.5);
+ gtk_tree_path_free (current_skin);
+ }
+
+ g_signal_handlers_unblock_by_func (treeview, (void *) skin_view_on_cursor_changed, nullptr);
+}
+
+static void skin_view_on_cursor_changed (GtkTreeView * treeview)
+{
+ GtkTreeModel * model;
+ GtkTreeIter iter;
+
+ auto selection = gtk_tree_view_get_selection (treeview);
+ if (! gtk_tree_selection_get_selected (selection, & model, & iter))
+ return;
+
+ GtkTreePath * path = gtk_tree_model_get_path (model, & iter);
+ int row = gtk_tree_path_get_indices (path)0;
+ g_return_if_fail (row >= 0 && row < skinlist.len ());
+ gtk_tree_path_free (path);
+
+ if (skin_load (skinlistrow.path))
+ view_apply_skin ();
+}
+
+void skin_view_realize (GtkTreeView * treeview)
+{
+ gtk_widget_show_all ((GtkWidget *) treeview);
+
+#ifndef USE_GTK3
+ gtk_tree_view_set_rules_hint (treeview, true);
+#endif
+ gtk_tree_view_set_headers_visible (treeview, false);
+
+ GtkListStore * store = gtk_list_store_new (SKIN_VIEW_N_COLS, GDK_TYPE_PIXBUF,
+ G_TYPE_STRING, G_TYPE_STRING);
+ gtk_tree_view_set_model (treeview, (GtkTreeModel *) store);
+ g_object_unref (store);
+
+ GtkTreeViewColumn * column = gtk_tree_view_column_new ();
+ gtk_tree_view_column_set_sizing (column, GTK_TREE_VIEW_COLUMN_AUTOSIZE);
+ gtk_tree_view_column_set_spacing (column, 16);
+ gtk_tree_view_append_column (treeview, column);
+
+ GtkCellRenderer * renderer = gtk_cell_renderer_pixbuf_new ();
+ gtk_tree_view_column_pack_start (column, renderer, false);
+ gtk_tree_view_column_set_attributes (column, renderer, "pixbuf",
+ SKIN_VIEW_COL_PREVIEW, nullptr);
+
+ renderer = gtk_cell_renderer_text_new ();
+ gtk_tree_view_column_pack_start (column, renderer, true);
+ gtk_tree_view_column_set_attributes (column, renderer, "markup",
+ SKIN_VIEW_COL_FORMATTEDNAME, nullptr);
+
+ GtkTreeSelection * selection = gtk_tree_view_get_selection (treeview);
+ gtk_tree_selection_set_mode (selection, GTK_SELECTION_BROWSE);
+
+ g_signal_connect (treeview, "cursor-changed",
+ (GCallback) skin_view_on_cursor_changed, nullptr);
+}

audacious-plugins-4.4.1.tar.bz2/src/skins/skinselector.h Changed

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/surface.cc -> audacious-plugins-4.4.1.tar.bz2/src/skins/surface.cc Changed

@@ -24,6 +24,7 @@
 #include "surface.h"
 
 #include <libaudcore/runtime.h>
+#include <libaudgui/libaudgui-gtk.h>
 
 cairo_surface_t * surface_new (int w, int h)
 {
@@ -33,23 +34,24 @@
 cairo_surface_t * surface_new_from_file (const char * name)
 {
 GError * error = nullptr;
- GdkPixbuf * p = gdk_pixbuf_new_from_file (name, & error);
- if (error) {
+ AudguiPixbuf p (gdk_pixbuf_new_from_file (name, & error));
+
+ if (error)
+ {
 AUDERR ("Error loading %s: %s.\n", name, error->message);
 g_error_free (error);
 }
+
 if (! p)
 return nullptr;
 
- cairo_surface_t * surface = surface_new (gdk_pixbuf_get_width (p),
- gdk_pixbuf_get_height (p));
+ cairo_surface_t * surface = surface_new (p.width (), p.height ());
 cairo_t * cr = cairo_create (surface);
 
- gdk_cairo_set_source_pixbuf (cr, p, 0, 0);
+ gdk_cairo_set_source_pixbuf (cr, p.get (), 0, 0);
 cairo_paint (cr);
 
 cairo_destroy (cr);
- g_object_unref (p);
 return surface;
 }

audacious-plugins-4.4.1.tar.bz2/src/skins/svis.cc Added

@@ -0,0 +1,213 @@
+/*
+ * Audacious - a cross-platform multimedia player
+ * Copyright (c) 2007-2011 Audacious development team.
+ *
+ * Based on:
+ * BMP - Cross-platform multimedia player
+ * Copyright (C) 2003-2004 BMP development team.
+ * XMMS:
+ * Copyright (C) 1998-2003 XMMS development team.
+ *
+ * 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; under version 3 of the License.
+ *
+ * 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>.
+ *
+ * The Audacious team does not consider modular code linking to
+ * Audacious or using our public API to be a derived work.
+ */
+
+#include <string.h>
+#include <libaudcore/objects.h>
+
+#include "skins_cfg.h"
+#include "surface.h"
+#include "skin.h"
+#include "vis.h"
+
+static const int svis_analyzer_colors = {14, 11, 8, 5, 2};
+static const int svis_scope_colors = {20, 19, 18, 19, 20};
+static const int svis_vu_normal_colors = {16, 14, 12, 10, 8, 6, 4, 2};
+
+#define RGB_SEEK(x,y) (set = rgb + 38 * (y) + (x))
+#define RGB_SET(c) (* set ++ = (c))
+#define RGB_SET_Y(c) do {* set = (c); set += 38;} while (0)
+#define RGB_SET_INDEX(c) RGB_SET (skin.vis_colorsc)
+#define RGB_SET_INDEX_Y(c) RGB_SET_Y (skin.vis_colorsc)
+
+void SmallVis::draw (cairo_t * cr)
+{
+ uint32_t rgb38 * 5;
+ uint32_t * set;
+
+ RGB_SEEK (0, 0);
+ for (int x = 0; x < 38 * 5; x ++)
+ RGB_SET_INDEX (0);
+
+ switch (config.vis_type)
+ {
+ case VIS_ANALYZER:
+ {
+ bool bars = (config.analyzer_type == ANALYZER_BARS);
+
+ for (int x = 0; x < 38; x ++)
+ {
+ if (bars && (x % 3) == 2)
+ continue;
+
+ int h = m_databars ? (x / 3) : x;
+ h = aud::clamp (h, 0, 5);
+ RGB_SEEK (x, 5 - h);
+
+ for (int y = 0; y < h; y ++)
+ RGB_SET_INDEX_Y (svis_analyzer_colorsh - 1 - y);
+ }
+
+ break;
+ }
+ case VIS_VOICEPRINT:
+ switch (config.vu_mode)
+ {
+ case VU_NORMAL:
+ for (int y = 0; y < 5; y ++)
+ {
+ if (y == 2)
+ continue;
+
+ int h = (m_datay / 3 * 8 + 19) / 38;
+ h = aud::clamp (h, 0, 8);
+ RGB_SEEK (0, y);
+
+ for (int x = 0; x < h; x ++)
+ {
+ RGB_SET_INDEX (svis_vu_normal_colorsx);
+ RGB_SET_INDEX (svis_vu_normal_colorsx);
+ RGB_SET_INDEX (svis_vu_normal_colorsx);
+ set += 2;
+ }
+ }
+ break;
+ default: /* VU_SMOOTH */
+ for (int y = 0; y < 5; y ++)
+ {
+ if (y == 2)
+ continue;
+
+ int h = m_datay / 3;
+ h = aud::clamp (h, 0, 38);
+ RGB_SEEK (0, y);
+
+ for (int x = 0; x < h; x ++)
+ RGB_SET_INDEX (17 - (x * 16) / 38);
+ }
+ break;
+ }
+ break;
+ case VIS_SCOPE:
+ {
+ static const int scale17 = {0, 0, 0, 0, 0, 0, 1, 1, 2, 3, 3, 4,
+ 4, 4, 4, 4, 4};
+
+ if (! m_active)
+ goto DRAW;
+
+ switch (config.scope_mode)
+ {
+ case SCOPE_DOT:
+ for (int x = 0; x < 38; x ++)
+ {
+ int h = scaleaud::clamp (m_data2 * x, 0, 16);
+ RGB_SEEK (x, h);
+ RGB_SET_INDEX (svis_scope_colorsh);
+ }
+ break;
+ case SCOPE_LINE:
+ {
+ for (int x = 0; x < 37; x ++)
+ {
+ int h = scaleaud::clamp (m_data2 * x, 0, 16);
+ int h2 = scaleaud::clamp (m_data2 * (x + 1), 0, 16);
+
+ if (h < h2) h2 --;
+ else if (h > h2) {int temp = h; h = h2 + 1; h2 = temp;}
+
+ RGB_SEEK (x, h);
+ for (int y = h; y <= h2; y ++)
+ RGB_SET_INDEX_Y (svis_scope_colorsy);
+ }
+
+ int h = scaleaud::clamp (m_data74, 0, 16);
+ RGB_SEEK (37, h);
+ RGB_SET_INDEX (svis_scope_colorsh);
+ break;
+ }
+ default: /* SCOPE_SOLID */
+ for (int x = 0; x < 38; x ++)
+ {
+ int h = scaleaud::clamp (m_data2 * x, 0, 16);
+ int h2;
+
+ if (h < 2)
+ h2 = 2;
+ else
+ {
+ h2 = h;
+ h = 2;
+ }
+
+ RGB_SEEK (x, h);
+ for (int y = h; y <= h2; y ++)
+ RGB_SET_INDEX_Y (svis_scope_colorsy);
+ }
+ break;
+ }
+ break;
+ }
+ }
+
+DRAW:
+ cairo_surface_t * surf = cairo_image_surface_create_for_data
+ ((unsigned char *) rgb, CAIRO_FORMAT_RGB24, 38, 5, 4 * 38);
+ cairo_set_source_surface (cr, surf, 0, 0);
+ cairo_pattern_set_filter (cairo_get_source (cr), CAIRO_FILTER_NEAREST);
+ cairo_paint (cr);
+ cairo_surface_destroy (surf);
+}
+
+SmallVis::SmallVis ()
+{
+ set_scale (config.scale);
+ add_drawable (38, 5);
+ clear ();
+}
+
+void SmallVis::clear ()
+{
+ m_active = false;
+ memset (m_data, 0, sizeof m_data);
+ queue_draw ();
+}
+
+void SmallVis::render (const unsigned char * data)
+{
+ if (config.vis_type == VIS_VOICEPRINT)
+ {
+ for (int i = 0; i < 2; i ++)
+ m_datai = datai;
+ }
+ else
+ {
+ for (int i = 0; i < 75; i ++)
+ m_datai = datai;
+ }
+
+ m_active = true;
+ draw_now ();
+}

audacious-plugins-4.4.1.tar.bz2/src/skins/textbox.cc Added

@@ -0,0 +1,311 @@
+/*
+ * Audacious - a cross-platform multimedia player
+ * Copyright (c) 2007 Tomasz Moń
+ * Copyright (c) 2011 John Lindgren
+ *
+ * Based on:
+ * BMP - Cross-platform multimedia player
+ * Copyright (C) 2003-2004 BMP development team.
+ * XMMS:
+ * Copyright (C) 1998-2003 XMMS development team.
+ *
+ * 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; under version 3 of the License.
+ *
+ * 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>.
+ *
+ * The Audacious team does not consider modular code linking to
+ * Audacious or using our public API to be a derived work.
+ */
+
+#include <string.h>
+
+#include <libaudcore/audstrings.h>
+#include <libaudcore/hook.h>
+#include <libaudcore/objects.h>
+
+#include "skins_cfg.h"
+#include "skin.h"
+#include "textbox.h"
+
+#define DELAY 50
+
+static Index<TextBox *> textboxes;
+
+void TextBox::draw (cairo_t * cr)
+{
+ if (m_scrolling)
+ {
+ cairo_set_source_surface (cr, m_buf.get (), -m_offset * config.scale, 0);
+ cairo_paint (cr);
+
+ if (-m_offset + m_buf_width < m_width)
+ {
+ cairo_set_source_surface (cr, m_buf.get (),
+ (-m_offset + m_buf_width) * config.scale, 0);
+ cairo_paint (cr);
+ }
+ }
+ else
+ {
+ cairo_set_source_surface (cr, m_buf.get (), 0, 0);
+ cairo_paint (cr);
+ }
+}
+
+bool TextBox::button_press (GdkEventButton * event)
+{
+ return press ? press (event) : false;
+}
+
+void TextBox::scroll_timeout ()
+{
+ if (m_delay < DELAY)
+ {
+ m_delay ++;
+ return;
+ }
+
+ if (m_two_way && m_backward)
+ m_offset --;
+ else
+ m_offset ++;
+
+ if (m_two_way && (m_backward ? (m_offset <= 0) : (m_offset + m_width >= m_buf_width)))
+ {
+ m_backward = ! m_backward;
+ m_delay = 0;
+ }
+
+ if (! m_two_way && m_offset >= m_buf_width)
+ m_offset = 0;
+
+ draw_now ();
+}
+
+void TextBox::render_vector (const char * text)
+{
+ PangoLayout * layout = gtk_widget_create_pango_layout (gtk_dr (), text);
+ pango_layout_set_font_description (layout, m_font.get ());
+
+ PangoRectangle ink, logical;
+ pango_layout_get_pixel_extents (layout, & ink, & logical);
+
+ /* use logical width so as not to trim off the trailing space of the " --- " */
+ /* use ink height since vertical space is quite limited */
+ int width = aud::max (-ink.x + logical.width, 1);
+ int height = aud::max (ink.height, 1);
+
+ resize (m_width * config.scale, height);
+
+ m_buf_width = aud::max ((width + config.scale - 1) / config.scale, m_width);
+ m_buf.capture (cairo_image_surface_create (CAIRO_FORMAT_ARGB32,
+ m_buf_width * config.scale, height));
+
+ cairo_t * cr = cairo_create (m_buf.get ());
+
+ set_cairo_color (cr, skin.colorsSKIN_TEXTBG);
+ cairo_paint (cr);
+
+ cairo_move_to (cr, -ink.x, -ink.y);
+ set_cairo_color (cr, skin.colorsSKIN_TEXTFG);
+ pango_cairo_show_layout (cr, layout);
+
+ cairo_destroy (cr);
+ g_object_unref (layout);
+}
+
+static void lookup_char (const char c, int * x, int * y)
+{
+ int tx, ty;
+
+ switch (c)
+ {
+ case '"': tx = 26; ty = 0; break;
+ case '@': tx = 27; ty = 0; break;
+ case ' ': tx = 29; ty = 0; break;
+ case ':':
+ case ';':
+ case '|': tx = 12; ty = 1; break;
+ case '(':
+ case '{': tx = 13; ty = 1; break;
+ case ')':
+ case '}': tx = 14; ty = 1; break;
+ case '-':
+ case '~': tx = 15; ty = 1; break;
+ case '`':
+ case '\'': tx = 16; ty = 1; break;
+ case '!': tx = 17; ty = 1; break;
+ case '_': tx = 18; ty = 1; break;
+ case '+': tx = 19; ty = 1; break;
+ case '\\': tx = 20; ty = 1; break;
+ case '/': tx = 21; ty = 1; break;
+ case '': tx = 22; ty = 1; break;
+ case '': tx = 23; ty = 1; break;
+ case '^': tx = 24; ty = 1; break;
+ case '&': tx = 25; ty = 1; break;
+ case '%': tx = 26; ty = 1; break;
+ case '.':
+ case ',': tx = 27; ty = 1; break;
+ case '=': tx = 28; ty = 1; break;
+ case '$': tx = 29; ty = 1; break;
+ case '#': tx = 30; ty = 1; break;
+ case '?': tx = 3; ty = 2; break;
+ case '*': tx = 4; ty = 2; break;
+ default: tx = 3; ty = 2; break; /* '?' */
+ }
+
+ * x = tx * skin.hints.textbox_bitmap_font_width;
+ * y = ty * skin.hints.textbox_bitmap_font_height;
+}
+
+void TextBox::render_bitmap (const char * text)
+{
+ int cw = skin.hints.textbox_bitmap_font_width;
+ int ch = skin.hints.textbox_bitmap_font_height;
+
+ resize (m_width * config.scale, ch * config.scale);
+
+ long len;
+ gunichar * utf32 = g_utf8_to_ucs4 (text, -1, nullptr, & len, nullptr);
+ g_return_if_fail (utf32);
+
+ m_buf_width = aud::max (cw * (int) len, m_width);
+ m_buf.capture (cairo_image_surface_create (CAIRO_FORMAT_ARGB32,
+ m_buf_width * config.scale, ch * config.scale));
+
+ cairo_t * cr = cairo_create (m_buf.get ());
+ if (config.scale != 1)
+ cairo_scale (cr, config.scale, config.scale);
+
+ gunichar * s = utf32;
+ for (int x = 0; x < m_buf_width; x += cw)
+ {
+ gunichar c = * s ? * s ++ : ' ';
+ int cx = 0, cy = 0;
+
+ if (c >= 'A' && c <= 'Z')
+ cx = cw * (c - 'A');
+ else if (c >= 'a' && c <= 'z')
+ cx = cw * (c - 'a');
+ else if (c >= '0' && c <= '9')
+ {
+ cx = cw * (c - '0');
+ cy = ch;
+ }
+ else
+ lookup_char (c, & cx, & cy);
+
+ skin_draw_pixbuf (cr, SKIN_TEXT, cx, cy, x, 0, cw, ch);
+ }
+
+ cairo_destroy (cr);
+ g_free (utf32);
+}
+
+void TextBox::render ()
+{
+ m_scrolling = false;
+ m_backward = false;
+ m_offset = 0;
+ m_delay = 0;
+
+ const char * text = m_text ? m_text : "";
+
+ if (m_font)
+ render_vector (text);
+ else
+ render_bitmap (text);
+
+ if (m_may_scroll && m_buf_width > m_width)
+ {
+ m_scrolling = true;
+
+ if (! m_two_way)
+ {
+ StringBuf temp = str_printf ("%s --- ", text);
+
+ if (m_font)
+ render_vector (temp);
+ else
+ render_bitmap (temp);
+ }
+ }
+
+ queue_draw ();
+
+ if (m_scrolling)
+ scroll_timer.start ();
+ else
+ scroll_timer.stop ();
+}
+
+void TextBox::set_width (int width)
+{
+ if (m_width != width)
+ {
+ m_width = width;
+ render ();
+ }
+}
+
+void TextBox::set_text (const char * text)
+{
+ if (strcmp_safe (m_text, text))
+ {
+ m_text = String (text);
+ render ();
+ }
+}
+
+void TextBox::set_font (const char * font)
+{
+ if (font)
+ m_font.capture (pango_font_description_from_string (font));
+ else
+ m_font.clear ();
+
+ render ();
+}
+
+void TextBox::set_scroll (bool scroll)
+{
+ if (m_may_scroll != scroll || m_two_way != config.twoway_scroll)
+ {
+ m_may_scroll = scroll;
+ m_two_way = config.twoway_scroll;
+ render ();
+ }
+}
+
+TextBox::~TextBox ()
+{
+ int idx = textboxes.find (this);
+ if (idx >= 0)
+ textboxes.remove (idx, 1);
+}
+
+TextBox::TextBox (int width, const char * font, bool scroll) :
+ m_width (width),
+ m_may_scroll (scroll),
+ m_two_way (config.twoway_scroll)
+{
+ /* size is computed by set_font() */
+ add_input (1, 1, false, true);
+ set_font (font);
+
+ textboxes.append (this);
+}
+
+void TextBox::update_all ()
+{
+ for (TextBox * textbox : textboxes)
+ textbox->render ();
+}

audacious-plugins-4.4.1.tar.bz2/src/skins/textbox.h Added

@@ -0,0 +1,80 @@
+/*
+ * Audacious - a cross-platform multimedia player
+ * Copyright (c) 2007 Tomasz Moń
+ * Copyright (c) 2011 John Lindgren
+ *
+ * Based on:
+ * BMP - Cross-platform multimedia player
+ * Copyright (C) 2003-2004 BMP development team.
+ * XMMS:
+ * Copyright (C) 1998-2003 XMMS development team.
+ *
+ * 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; under version 3 of the License.
+ *
+ * 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>.
+ *
+ * The Audacious team does not consider modular code linking to
+ * Audacious or using our public API to be a derived work.
+ */
+
+#ifndef SKINS_UI_SKINNED_TEXTBOX_H
+#define SKINS_UI_SKINNED_TEXTBOX_H
+
+#include <libaudcore/hook.h>
+#include <libaudcore/objects.h>
+
+#include "widget.h"
+
+typedef SmartPtr<cairo_surface_t, cairo_surface_destroy> CairoSurfacePtr;
+typedef SmartPtr<PangoFontDescription, pango_font_description_free> PangoFontDescPtr;
+
+class TextBox : public Widget
+{
+public:
+ TextBox (int width, const char * font, bool scroll);
+ ~TextBox ();
+
+ void set_width (int width);
+ const String & get_text () { return m_text; }
+ void set_text (const char * text);
+ void set_font (const char * font);
+ void set_scroll (bool scroll);
+
+ typedef bool (* PressCB) (GdkEventButton *);
+ void on_press (PressCB callback) { press = callback; }
+
+ static void update_all ();
+
+private:
+ virtual void draw (cairo_t * cr);
+ virtual bool button_press (GdkEventButton * event);
+
+ void scroll_timeout ();
+ void render_vector (const char * text);
+ void render_bitmap (const char * text);
+ void render ();
+
+ const Timer<TextBox>
+ scroll_timer {TimerRate::Hz30, this, & TextBox::scroll_timeout};
+
+ String m_text;
+ PangoFontDescPtr m_font;
+ CairoSurfacePtr m_buf;
+
+ int m_width = 0, m_buf_width = 0;
+ bool m_may_scroll = false, m_two_way = false;
+ bool m_scrolling = false, m_backward = false;
+ int m_offset = 0, m_delay = 0;
+
+ PressCB press = nullptr;
+};
+
+#endif

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/view.cc -> audacious-plugins-4.4.1.tar.bz2/src/skins/view.cc Changed

@@ -1,6 +1,6 @@
 /*
 * view.c
- * Copyright 2014 John Lindgren
+ * Copyright 2014-2015 John Lindgren
 *
 * This file is part of Audacious.
 *
@@ -21,37 +21,45 @@
 
 #include "view.h"
 
-#include <libaudcore/runtime.h>
 #include <libaudcore/hook.h>
+#include <libaudcore/mainloop.h>
+#include <libaudcore/runtime.h>
 
 #include "plugin.h"
 #include "plugin-window.h"
 #include "skins_cfg.h"
-#include "ui_equalizer.h"
-#include "ui_main.h"
-#include "ui_main_evlisteners.h"
-#include "ui_playlist.h"
-#include "ui_skinned_button.h"
-#include "ui_skinned_menurow.h"
-#include "ui_skinned_window.h"
+#include "equalizer.h"
+#include "main.h"
+#include "vis-callbacks.h"
+#include "playlistwin.h"
+#include "button.h"
+#include "eq-graph.h"
+#include "textbox.h"
+#include "menurow.h"
+#include "window.h"
+#include "vis.h"
 
 void view_show_player (bool show)
 {
 if (show)
 {
- gtk_window_present ((GtkWindow *) mainwin);
+ // "Move" the window to the position it's already at. This seems
+ // to work around a GTK+ bug causing the main window to end up
+ // at a random position after the gtk_window_present() call.
+ mainwin->move (config.player_x, config.player_y);
+ gtk_window_present ((GtkWindow *) mainwin->gtk ());
 show_plugin_windows ();
 }
 else
 {
- gtk_widget_hide (mainwin);
+ mainwin->hide ();
 hide_plugin_windows ();
 }
 
 view_apply_show_playlist ();
 view_apply_show_equalizer ();
 
- start_stop_visual (FALSE);
+ start_stop_visual (false);
 }
 
 void view_set_show_playlist (bool show)
@@ -62,16 +70,24 @@
 view_apply_show_playlist ();
 }
 
-void view_apply_show_playlist (void)
+void view_apply_show_playlist ()
 {
 bool show = aud_get_bool ("skins", "playlist_visible");
 
- if (show && gtk_widget_get_visible (mainwin))
- gtk_window_present ((GtkWindow *) playlistwin);
+ GtkWidget * main = mainwin->gtk ();
+ GtkWidget * pl = playlistwin->gtk ();
+
+ if (show && gtk_widget_get_visible (main))
+ {
+ // Same workaround as for the main window
+ playlistwin->move (config.playlist_x, config.playlist_y);
+ gtk_window_set_transient_for ((GtkWindow *) pl, (GtkWindow *) main);
+ gtk_window_present ((GtkWindow *) pl);
+ }
 else
- gtk_widget_hide (playlistwin);
+ playlistwin->hide ();
 
- button_set_active (mainwin_pl, show);
+ mainwin_pl->set_active (show);
 }
 
 void view_set_show_equalizer (bool show)
@@ -82,16 +98,24 @@
 view_apply_show_equalizer ();
 }
 
-void view_apply_show_equalizer (void)
+void view_apply_show_equalizer ()
 {
 bool show = aud_get_bool ("skins", "equalizer_visible");
 
- if (show && gtk_widget_get_visible (mainwin))
- gtk_window_present ((GtkWindow *) equalizerwin);
+ GtkWidget * main = mainwin->gtk ();
+ GtkWidget * eq = equalizerwin->gtk ();
+
+ if (show && gtk_widget_get_visible (main))
+ {
+ // Same workaround as for the main window
+ equalizerwin->move (config.equalizer_x, config.equalizer_y);
+ gtk_window_set_transient_for ((GtkWindow *) eq, (GtkWindow *) main);
+ gtk_window_present ((GtkWindow *) eq);
+ }
 else
- gtk_widget_hide (equalizerwin);
+ equalizerwin->hide ();
 
- button_set_active (mainwin_eq, show);
+ mainwin_eq->set_active (show);
 }
 
 void view_set_player_shaded (bool shaded)
@@ -102,15 +126,18 @@
 view_apply_player_shaded ();
 }
 
-void view_apply_player_shaded (void)
+void view_apply_player_shaded ()
 {
 bool shaded = aud_get_bool ("skins", "player_shaded");
 
- window_set_shaded (mainwin, shaded);
+ mainwin->set_shaded (shaded);
+
+ int width = shaded ? MAINWIN_SHADED_WIDTH : skin.hints.mainwin_width;
+ int height = shaded ? MAINWIN_SHADED_HEIGHT : skin.hints.mainwin_height;
+ mainwin->resize (width, height);
 
- int width = shaded ? MAINWIN_SHADED_WIDTH : active_skin->properties.mainwin_width;
- int height = shaded ? MAINWIN_SHADED_HEIGHT : active_skin->properties.mainwin_height;
- window_set_size (mainwin, width, height);
+ if (config.autoscroll)
+ mainwin_info->set_scroll (! shaded);
 }
 
 void view_set_playlist_shaded (bool shaded)
@@ -121,16 +148,17 @@
 view_apply_playlist_shaded ();
 }
 
-void view_apply_playlist_shaded (void)
+void view_apply_playlist_shaded ()
 {
 bool shaded = aud_get_bool ("skins", "playlist_shaded");
 
- window_set_shaded (playlistwin, shaded);
+ playlistwin->set_shaded (shaded);
 
 int height = shaded ? MAINWIN_SHADED_HEIGHT : config.playlist_height;
- window_set_size (playlistwin, config.playlist_width, height);
+ playlistwin->resize (config.playlist_width, height);
 
- playlistwin_update ();
+ if (config.autoscroll)
+ playlistwin_sinfo->set_scroll (shaded);
 }
 
 void view_set_equalizer_shaded (bool shaded)
@@ -141,12 +169,16 @@
 view_apply_equalizer_shaded ();
 }
 
-void view_apply_equalizer_shaded (void)
+void view_apply_equalizer_shaded ()
 {
 bool shaded = aud_get_bool ("skins", "equalizer_shaded");
 
- window_set_shaded (equalizerwin, shaded);
- window_set_size (equalizerwin, 275, shaded ? 14 : 116);
+ /* do not allow shading the equalizer if eq_ex.bmp is missing */
+ if (! skin.pixmapsSKIN_EQ_EX)
+ shaded = false;
+
+ equalizerwin->set_shaded (shaded);
+ equalizerwin->resize (275, shaded ? 14 : 116);
 }
 
 void view_set_double_size (bool double_size)
@@ -157,10 +189,10 @@
 view_apply_double_size ();
 }
 
-void view_apply_double_size (void)
+void view_apply_double_size ()
 {
- config.scale = aud_get_bool ("skins", "double_size") ? 2 : 1;
- skins_restart ();
+ static QueuedFunc restart;
+ restart.queue (skins_restart);
 }
 
 void view_set_on_top (bool on_top)
@@ -171,15 +203,15 @@
 view_apply_on_top ();
 }
 
-void view_apply_on_top (void)
+void view_apply_on_top ()
 {
 bool on_top = aud_get_bool ("skins", "always_on_top");
 
- gtk_window_set_keep_above ((GtkWindow *) mainwin, on_top);
- gtk_window_set_keep_above ((GtkWindow *) equalizerwin, on_top);
- gtk_window_set_keep_above ((GtkWindow *) playlistwin, on_top);
+ gtk_window_set_keep_above ((GtkWindow *) mainwin->gtk (), on_top);
+ gtk_window_set_keep_above ((GtkWindow *) equalizerwin->gtk (), on_top);
+ gtk_window_set_keep_above ((GtkWindow *) playlistwin->gtk (), on_top);
 
- ui_skinned_menurow_update (mainwin_menurow);
+ mainwin_menurow->refresh ();
 }
 
 void view_set_sticky (bool sticky)
@@ -190,21 +222,21 @@
 view_apply_sticky ();
 }
 
-void view_apply_sticky (void)
+void view_apply_sticky ()
 {
 bool sticky = aud_get_bool ("skins", "sticky");
 
 if (sticky)
 {
- gtk_window_stick ((GtkWindow *) mainwin);
- gtk_window_stick ((GtkWindow *) equalizerwin);
- gtk_window_stick ((GtkWindow *) playlistwin);
+ gtk_window_stick ((GtkWindow *) mainwin->gtk ());
+ gtk_window_stick ((GtkWindow *) equalizerwin->gtk ());
+ gtk_window_stick ((GtkWindow *) playlistwin->gtk ());
 }
 else
 {
- gtk_window_unstick ((GtkWindow *) mainwin);
- gtk_window_unstick ((GtkWindow *) equalizerwin);
- gtk_window_unstick ((GtkWindow *) playlistwin);
+ gtk_window_unstick ((GtkWindow *) mainwin->gtk ());
+ gtk_window_unstick ((GtkWindow *) equalizerwin->gtk ());
+ gtk_window_unstick ((GtkWindow *) playlistwin->gtk ());
 }
 }
 
@@ -216,7 +248,71 @@
 view_apply_show_remaining ();
 }
 
-void view_apply_show_remaining (void)
+void view_apply_show_remaining ()
 {
 mainwin_update_song_info ();
 }
+
+#ifdef USE_GTK3
+static cairo_region_t * scale_mask (const Index<GdkRectangle> & mask, int scale)
+{
+ cairo_region_t * region = nullptr;
+
+ for (auto & rect : mask)
+ {
+ cairo_rectangle_int_t scaled = {
+ rect.x * scale,
+ rect.y * scale,
+ rect.width * scale,
+ rect.height * scale
+ };
+
+ if (region)
+ cairo_region_union_rectangle (region, & scaled);
+ else
+ region = cairo_region_create_rectangle (& scaled);
+ }
+
+ return region;
+}
+#else
+static GdkRegion * scale_mask (const Index<GdkRectangle> & mask, int scale)
+{
+ GdkRegion * region = nullptr;
+
+ for (auto & rect : mask)
+ {
+ GdkRectangle scaled = {
+ rect.x * scale,
+ rect.y * scale,
+ rect.width * scale,
+ rect.height * scale
+ };
+
+ if (region)
+ gdk_region_union_with_rect (region, & scaled);
+ else
+ region = gdk_region_rectangle (& scaled);
+ }
+
+ return region;
+}
+#endif
+
+void view_apply_skin ()
+{
+ mainwin->set_shapes
+ (scale_mask (skin.masksSKIN_MASK_MAIN, config.scale),
+ scale_mask (skin.masksSKIN_MASK_MAIN_SHADE, config.scale));
+ equalizerwin->set_shapes
+ (scale_mask (skin.masksSKIN_MASK_EQ, config.scale),
+ scale_mask (skin.masksSKIN_MASK_EQ_SHADE, config.scale));
+
+ mainwin_refresh_hints ();
+ view_apply_equalizer_shaded ();
+ TextBox::update_all ();
+
+ mainwin->queue_draw ();
+ equalizerwin->queue_draw ();
+ playlistwin->queue_draw ();
+}

audacious-plugins-3.6.2-gtk3.tar.bz2/src/skins/view.h -> audacious-plugins-4.4.1.tar.bz2/src/skins/view.h Changed

@@ -25,30 +25,32 @@
 void view_show_player (bool show);
 
 void view_set_show_playlist (bool show);
-void view_apply_show_playlist (void);
+void view_apply_show_playlist ();
 
 void view_set_show_equalizer (bool show);
-void view_apply_show_equalizer (void);
+void view_apply_show_equalizer ();
 
 void view_set_player_shaded (bool shaded);
-void view_apply_player_shaded (void);
+void view_apply_player_shaded ();
 
 void view_set_playlist_shaded (bool shaded);
-void view_apply_playlist_shaded (void);
+void view_apply_playlist_shaded ();
 
 void view_set_equalizer_shaded (bool shaded);
-void view_apply_equalizer_shaded (void);
+void view_apply_equalizer_shaded ();
 
 void view_set_double_size (bool double_size);
-void view_apply_double_size (void);
+void view_apply_double_size ();
 
 void view_set_on_top (bool on_top);
-void view_apply_on_top (void);
+void view_apply_on_top ();
 
 void view_set_sticky (bool sticky);
-void view_apply_sticky (void);
+void view_apply_sticky ();
 
 void view_set_show_remaining (bool remaining);
-void view_apply_show_remaining (void);
+void view_apply_show_remaining ();
+
+void view_apply_skin ();
 
 #endif /* SKINS_VIEW_H */

audacious-plugins-4.4.1.tar.bz2/src/skins/vis-callbacks.cc Added

audacious-plugins-4.4.1.tar.bz2/src/skins/vis-callbacks.h Added

audacious-plugins-4.4.1.tar.bz2/src/skins/vis.cc Added

@@ -0,0 +1,322 @@
+/*
+ * Audacious - a cross-platform multimedia player
+ * Copyright (c) 2007-2011 Audacious development team.
+ *
+ * Based on:
+ * BMP - Cross-platform multimedia player
+ * Copyright (C) 2003-2004 BMP development team.
+ * XMMS:
+ * Copyright (C) 1998-2003 XMMS development team.
+ *
+ * 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; under version 3 of the License.
+ *
+ * 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>.
+ *
+ * The Audacious team does not consider modular code linking to
+ * Audacious or using our public API to be a derived work.
+ */
+
+#include <string.h>
+#include <libaudcore/objects.h>
+
+#include "skins_cfg.h"
+#include "skin.h"
+#include "vis.h"
+
+static const float vis_afalloff_speeds = {0.34, 0.5, 1.0, 1.3, 1.6};
+static const float vis_pfalloff_speeds = {1.2, 1.3, 1.4, 1.5, 1.6};
+static const int vis_scope_colors16 = {22, 22, 21, 21, 20, 10, 19, 19, 18,
+ 19, 19, 20, 20, 21, 21, 22};
+
+#define RGB_SEEK(x,y) (set = rgb + 76 * (y) + (x))
+#define RGB_SET(c) (* set ++ = (c))
+#define RGB_SET_Y(c) do {* set = (c); set += 76;} while (0)
+#define RGB_SET_INDEX(c) RGB_SET (skin.vis_colorsc)
+#define RGB_SET_INDEX_Y(c) RGB_SET_Y (skin.vis_colorsc)
+
+void SkinnedVis::set_colors ()
+{
+ uint32_t fgc = skin.colorsSKIN_TEXTFG;
+ uint32_t bgc = skin.colorsSKIN_TEXTBG;
+ int fg3 = {COLOR_R (fgc), COLOR_G (fgc), COLOR_B (fgc)};
+ int bg3 = {COLOR_R (bgc), COLOR_G (bgc), COLOR_B (bgc)};
+
+ for (int x = 0; x < 256; x ++)
+ {
+ unsigned char c3;
+ for (int n = 0; n < 3; n ++)
+ cn = bgn + (fgn - bgn) * x / 255;
+ m_voice_colorx = COLOR (c0, c1, c2);
+ }
+
+ for (int x = 0; x < 256; x ++)
+ {
+ unsigned char r = aud::min (x, 127) * 2;
+ unsigned char g = aud::clamp (x - 64, 0, 127) * 2;
+ unsigned char b = aud::max (x - 128, 0) * 2;
+ m_voice_color_firex = COLOR (r, g, b);
+ }
+
+ for (int x = 0; x < 256; x ++)
+ m_voice_color_icex = COLOR (x / 2, x, aud::min (x * 2, 255));
+
+ uint32_t * set = m_pattern_fill;
+ uint32_t * end = set + 76;
+
+ while (set < end)
+ RGB_SET_INDEX (0);
+
+ end = set + 76;
+
+ while (set < end)
+ {
+ RGB_SET_INDEX (1);
+ RGB_SET_INDEX (0);
+ }
+}
+
+void SkinnedVis::draw (cairo_t * cr)
+{
+ uint32_t rgb76 * 16;
+ uint32_t * set;
+
+ if (config.vis_type != VIS_VOICEPRINT)
+ {
+ for (set = rgb; set < rgb + 76 * 16; set += 76 * 2)
+ memcpy (set, m_pattern_fill, sizeof m_pattern_fill);
+ }
+
+ switch (config.vis_type)
+ {
+ case VIS_ANALYZER:
+ {
+ bool bars = (config.analyzer_type == ANALYZER_BARS);
+
+ for (int x = 0; x < 75; x ++)
+ {
+ if (bars && (x & 3) == 3)
+ continue;
+
+ int h = m_databars ? (x >> 2) : x;
+ h = aud::clamp (h, 0, 16);
+ RGB_SEEK (x, 16 - h);
+
+ switch (config.analyzer_mode)
+ {
+ case ANALYZER_NORMAL:
+ for (int y = 0; y < h; y ++)
+ RGB_SET_INDEX_Y (18 - h + y);
+ break;
+ case ANALYZER_FIRE:
+ for (int y = 0; y < h; y ++)
+ RGB_SET_INDEX_Y (2 + y);
+ break;
+ default: /* ANALYZER_VLINES */
+ for (int y = 0; y < h; y ++)
+ RGB_SET_INDEX_Y (18 - h);
+ break;
+ }
+
+ if (config.analyzer_peaks)
+ {
+ int h = m_peakbars ? (x >> 2) : x;
+ h = aud::clamp (h, 0, 16);
+
+ if (h)
+ {
+ RGB_SEEK (x, 16 - h);
+ RGB_SET_INDEX (23);
+ }
+ }
+ }
+
+ break;
+ }
+ case VIS_VOICEPRINT:
+ {
+ if (m_voiceprint_advance)
+ {
+ m_voiceprint_advance = false;
+ memmove (m_voiceprint_data, m_voiceprint_data + 1, sizeof
+ m_voiceprint_data - 1);
+
+ for (int y = 0; y < 16; y ++)
+ m_voiceprint_data76 * y + 75 = m_datay;
+ }
+
+ unsigned char * get = m_voiceprint_data;
+ uint32_t * colors = (config.voiceprint_mode == VOICEPRINT_NORMAL) ?
+ m_voice_color : (config.voiceprint_mode == VOICEPRINT_FIRE) ?
+ m_voice_color_fire : /* VOICEPRINT_ICE */ m_voice_color_ice;
+ set = rgb;
+
+ for (int y = 0; y < 16; y ++)
+ for (int x = 0; x < 76; x ++)
+ RGB_SET (colors* get ++);
+ break;
+ }
+ case VIS_SCOPE:
+ if (! m_active)
+ goto DRAW;
+
+ switch (config.scope_mode)
+ {
+ case SCOPE_DOT:
+ for (int x = 0; x < 75; x ++)
+ {
+ int h = aud::clamp ((int) m_datax, 0, 15);
+ RGB_SEEK (x, h);
+ RGB_SET_INDEX (vis_scope_colorsh);
+ }
+ break;
+ case SCOPE_LINE:
+ {
+ for (int x = 0; x < 74; x ++)
+ {
+ int h = aud::clamp ((int) m_datax, 0, 15);
+ int h2 = aud::clamp ((int) m_datax + 1, 0, 15);
+
+ if (h < h2)
+ h2 --;
+ else if (h > h2)
+ {
+ int temp = h;
+ h = h2 + 1;
+ h2 = temp;
+ }
+
+ RGB_SEEK (x, h);
+
+ for (int y = h; y <= h2; y ++)
+ RGB_SET_INDEX_Y (vis_scope_colorsy);
+ }
+
+ int h = aud::clamp ((int) m_data74, 0, 15);
+ RGB_SEEK (74, h);
+ RGB_SET_INDEX (vis_scope_colorsh);
+ break;
+ }
+ default: /* SCOPE_SOLID */
+ for (int x = 0; x < 75; x ++)
+ {
+ int h = aud::clamp ((int) m_datax, 0, 15);
+ int h2;
+
+ if (h < 8)
+ h2 = 8;
+ else
+ {
+ h2 = h;
+ h = 8;
+ }
+
+ RGB_SEEK (x, h);
+
+ for (int y = h; y <= h2; y ++)
+ RGB_SET_INDEX_Y (vis_scope_colorsy);
+ }
+ break;
+ }
+ break;
+ }
+
+DRAW:
+ cairo_surface_t * surf = cairo_image_surface_create_for_data
+ ((unsigned char *) rgb, CAIRO_FORMAT_RGB24, 76, 16, 4 * 76);
+ cairo_set_source_surface (cr, surf, 0, 0);
+ cairo_pattern_set_filter (cairo_get_source (cr), CAIRO_FILTER_NEAREST);
+ cairo_paint (cr);
+ cairo_surface_destroy (surf);
+}
+
+SkinnedVis::SkinnedVis ()
+{
+ set_scale (config.scale);
+ add_drawable (76, 16);
+ clear ();
+}
+
+void SkinnedVis::clear ()
+{
+ m_active = false;
+ m_voiceprint_advance = false;
+
+ memset (m_data, 0, sizeof m_data);
+ memset (m_peak, 0, sizeof m_peak);
+ memset (m_peak_speed, 0, sizeof m_peak_speed);
+ memset (m_voiceprint_data, 0, sizeof m_voiceprint_data);
+
+ queue_draw ();
+}
+
+void SkinnedVis::render (const unsigned char * data)
+{
+ if (config.vis_type == VIS_ANALYZER)
+ {
+ const int n = (config.analyzer_type == ANALYZER_BARS) ? 19 : 75;
+
+ for (int i = 0; i < n; i ++)
+ {
+ if (datai > m_datai)
+ {
+ m_datai = datai;
+ if (m_datai > m_peaki)
+ {
+ m_peaki = m_datai;
+ m_peak_speedi = 0.01;
+
+ }
+ else if (m_peaki > 0.0)
+ {
+ m_peaki -= m_peak_speedi;
+ m_peak_speedi *= vis_pfalloff_speedsconfig.peaks_falloff;
+ if (m_peaki < m_datai)
+ m_peaki = m_datai;
+ if (m_peaki < 0.0)
+ m_peaki = 0.0;
+ }
+ }
+ else
+ {
+ if (m_datai > 0.0)
+ {
+ m_datai -= vis_afalloff_speedsconfig.analyzer_falloff;
+ if (m_datai < 0.0)
+ m_datai = 0.0;
+ }
+ if (m_peaki > 0.0)
+ {
+ m_peaki -= m_peak_speedi;
+ m_peak_speedi *= vis_pfalloff_speedsconfig.peaks_falloff;
+ if (m_peaki < m_datai)
+ m_peaki = m_datai;
+ if (m_peaki < 0.0)
+ m_peaki = 0.0;
+ }
+ }
+ }
+ }
+ else if (config.vis_type == VIS_VOICEPRINT)
+ {
+ for (int i = 0; i < 16; i ++)
+ m_datai = data15 - i;
+
+ m_voiceprint_advance = true;
+ }
+ else
+ {
+ for (int i = 0; i < 75; i ++)
+ m_datai = datai;
+ }
+
+ m_active = true;
+ draw_now ();
+}

audacious-plugins-4.4.1.tar.bz2/src/skins/vis.h Added

@@ -0,0 +1,90 @@
+/*
+ * Audacious - a cross-platform multimedia player
+ * Copyright (c) 2007-2011 Audacious development team.
+ *
+ * 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; under version 3 of the License.
+ *
+ * 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>.
+ *
+ * The Audacious team does not consider modular code linking to
+ * Audacious or using our public API to be a derived work.
+ */
+
+#ifndef SKINS_UI_VIS_H
+#define SKINS_UI_VIS_H
+
+#include <stdint.h>
+#include "widget.h"
+
+typedef enum {
+ VIS_ANALYZER, VIS_SCOPE, VIS_VOICEPRINT, VIS_OFF
+} VisType;
+
+typedef enum {
+ ANALYZER_NORMAL, ANALYZER_FIRE, ANALYZER_VLINES
+} AnalyzerMode;
+
+typedef enum {
+ ANALYZER_LINES, ANALYZER_BARS
+} AnalyzerType;
+
+typedef enum {
+ SCOPE_DOT, SCOPE_LINE, SCOPE_SOLID
+} ScopeMode;
+
+typedef enum {
+ VOICEPRINT_NORMAL, VOICEPRINT_FIRE, VOICEPRINT_ICE
+} VoiceprintMode;
+
+typedef enum {
+ VU_NORMAL, VU_SMOOTH
+} VUMode;
+
+typedef enum {
+ FALLOFF_SLOWEST, FALLOFF_SLOW, FALLOFF_MEDIUM, FALLOFF_FAST, FALLOFF_FASTEST
+} FalloffSpeed;
+
+class SkinnedVis : public Widget
+{
+public:
+ SkinnedVis ();
+ void set_colors ();
+ void clear ();
+ void render (const unsigned char * data);
+
+private:
+ void draw (cairo_t * cr);
+
+ uint32_t m_voice_color256;
+ uint32_t m_voice_color_fire256;
+ uint32_t m_voice_color_ice256;
+ uint32_t m_pattern_fill76 * 2;
+
+ bool m_active, m_voiceprint_advance;
+ float m_data75, m_peak75, m_peak_speed75;
+ unsigned char m_voiceprint_data76 * 16;
+};
+
+class SmallVis : public Widget
+{
+public:
+ SmallVis ();
+ void clear ();
+ void render (const unsigned char * data);
+
+private:
+ void draw (cairo_t * cr);
+
+ bool m_active;
+ int m_data75;
+};
+
+#endif

audacious-plugins-4.4.1.tar.bz2/src/skins/widget.cc Added

@@ -0,0 +1,161 @@
+/*
+ * widget.cc
+ * Copyright 2015 John Lindgren
+ *
+ * This file is part of Audacious.
+ *
+ * Audacious 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, version 2 or version 3 of the License.
+ *
+ * Audacious 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
+ * Audacious. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The Audacious team does not consider modular code linking to Audacious or
+ * using our public API to be a derived work.
+ */
+
+#include <libaudgui/gtk-compat.h>
+
+#include "widget.h"
+
+typedef GtkWidget DrawingArea;
+typedef GtkWidgetClass DrawingAreaClass;
+
+G_DEFINE_TYPE (DrawingArea, drawing_area, GTK_TYPE_WIDGET)
+
+static void drawing_area_class_init (DrawingAreaClass *) {}
+
+static void drawing_area_init (DrawingArea * widget)
+{
+ gtk_widget_set_has_window ((GtkWidget *) widget, false);
+}
+
+static GtkWidget * drawing_area_new ()
+{
+ return (GtkWidget *) g_object_new (drawing_area_get_type (), nullptr);
+}
+
+void Widget::set_input (GtkWidget * widget)
+{
+ m_widget = widget;
+ g_signal_connect (widget, "destroy", (GCallback) Widget::destroy_cb, this);
+ g_signal_connect (widget, "key-press-event", (GCallback) Widget::keypress_cb, this);
+ g_signal_connect (widget, "button-press-event", (GCallback) Widget::button_press_cb, this);
+ g_signal_connect (widget, "button-release-event", (GCallback) Widget::button_release_cb, this);
+ g_signal_connect (widget, "scroll-event", (GCallback) Widget::scroll_cb, this);
+ g_signal_connect (widget, "motion-notify-event", (GCallback) Widget::motion_cb, this);
+ g_signal_connect (widget, "leave-notify-event", (GCallback) Widget::leave_cb, this);
+ g_signal_connect (widget, "delete-event", (GCallback) Widget::close_cb, this);
+}
+
+void Widget::set_drawable (GtkWidget * widget)
+{
+ m_drawable = widget;
+ g_signal_connect (widget, "realize", (GCallback) Widget::realize_cb, this);
+ g_signal_connect (widget, AUDGUI_DRAW_SIGNAL, (GCallback) Widget::draw_cb, this);
+
+ if (! m_widget)
+ {
+ m_widget = widget;
+ g_signal_connect (widget, "destroy", (GCallback) Widget::destroy_cb, this);
+ }
+}
+
+void Widget::add_input (int width, int height, bool track_motion, bool drawable)
+{
+ int events = GDK_KEY_PRESS_MASK | GDK_BUTTON_PRESS_MASK |
+ GDK_BUTTON_RELEASE_MASK | GDK_SCROLL_MASK;
+
+ if (track_motion)
+ events |= GDK_POINTER_MOTION_MASK | GDK_LEAVE_NOTIFY_MASK;
+
+ GtkWidget * widget = gtk_event_box_new ();
+ gtk_event_box_set_visible_window ((GtkEventBox *) widget, false);
+ gtk_widget_set_size_request (widget, width * m_scale, height * m_scale);
+ gtk_widget_add_events (widget, events);
+ gtk_widget_show (widget);
+ set_input (widget);
+
+ if (drawable)
+ {
+ GtkWidget * area = drawing_area_new ();
+ gtk_container_add ((GtkContainer *) widget, area);
+ gtk_widget_show (area);
+ set_drawable (area);
+ }
+}
+
+void Widget::add_drawable (int width, int height)
+{
+ GtkWidget * widget = drawing_area_new ();
+ gtk_widget_set_size_request (widget, width * m_scale, height * m_scale);
+ gtk_widget_show (widget);
+ set_drawable (widget);
+}
+
+#ifdef USE_GTK3
+void Widget::draw_now ()
+{
+ if (! m_drawable || ! gtk_widget_is_drawable (m_drawable))
+ return;
+
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
+ cairo_t * cr = gdk_cairo_create (gtk_widget_get_window (m_drawable));
+G_GNUC_END_IGNORE_DEPRECATIONS
+
+ if (! gtk_widget_get_has_window (m_drawable))
+ {
+ GtkAllocation alloc;
+ gtk_widget_get_allocation (m_drawable, & alloc);
+ cairo_translate (cr, alloc.x, alloc.y);
+ cairo_rectangle (cr, 0, 0, alloc.width, alloc.height);
+ cairo_clip (cr);
+ }
+
+ draw_cb (m_drawable, cr, this);
+
+ cairo_destroy (cr);
+}
+
+gboolean Widget::draw_cb (GtkWidget * widget, cairo_t * cr, Widget * me)
+{
+ if (me->m_scale != 1)
+ cairo_scale (cr, me->m_scale, me->m_scale);
+
+ me->draw (cr);
+ return false;
+}
+#else
+void Widget::draw_now ()
+{
+ if (m_drawable && gtk_widget_is_drawable (m_drawable))
+ draw_cb (m_drawable, nullptr, this);
+}
+
+gboolean Widget::draw_cb (GtkWidget * widget, GdkEventExpose * event, Widget * me)
+{
+ cairo_t * cr = gdk_cairo_create (gtk_widget_get_window (widget));
+
+ if (! gtk_widget_get_has_window (widget))
+ {
+ GtkAllocation alloc;
+ gtk_widget_get_allocation (widget, & alloc);
+ cairo_translate (cr, alloc.x, alloc.y);
+ cairo_rectangle (cr, 0, 0, alloc.width, alloc.height);
+ cairo_clip (cr);
+ }
+
+ if (me->m_scale != 1)
+ cairo_scale (cr, me->m_scale, me->m_scale);
+
+ me->draw (cr);
+
+ cairo_destroy (cr);
+ return false;
+}
+#endif

audacious-plugins-4.4.1.tar.bz2/src/skins/widget.h Added

@@ -0,0 +1,97 @@
+/*
+ * widget.h
+ * Copyright 2015 John Lindgren
+ *
+ * This file is part of Audacious.
+ *
+ * Audacious 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, version 2 or version 3 of the License.
+ *
+ * Audacious 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
+ * Audacious. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The Audacious team does not consider modular code linking to Audacious or
+ * using our public API to be a derived work.
+ */
+
+#ifndef SKINS_WIDGET_H
+#define SKINS_WIDGET_H
+
+#include <gtk/gtk.h>
+
+class Widget
+{
+public:
+ virtual ~Widget () {}
+
+ GtkWidget * gtk () { return m_widget; }
+ GtkWidget * gtk_dr () { return m_drawable; }
+
+ void show () { gtk_widget_show (m_widget); }
+ void hide () { gtk_widget_hide (m_widget); }
+
+ void setVisible (bool visible)
+ { gtk_widget_set_visible (m_widget, visible); }
+ void queue_draw ()
+ { gtk_widget_queue_draw (m_drawable); }
+
+protected:
+ void set_input (GtkWidget * widget);
+ void set_drawable (GtkWidget * widget);
+ void add_input (int width, int height, bool track_motion, bool drawable);
+ void add_drawable (int width, int height);
+
+ void set_scale (int scale) { m_scale = scale; }
+ void resize (int width, int height)
+ { gtk_widget_set_size_request (m_widget, width * m_scale, height * m_scale); }
+
+ void draw_now ();
+
+ virtual void realize () {}
+ virtual void draw (cairo_t * cr) {}
+ virtual bool keypress (GdkEventKey * event) { return false; }
+ virtual bool button_press (GdkEventButton * event) { return false; }
+ virtual bool button_release (GdkEventButton * event) { return false; }
+ virtual bool scroll (GdkEventScroll * event) { return false; }
+ virtual bool motion (GdkEventMotion * event) { return false; }
+ virtual bool leave () { return false; }
+ virtual bool close () { return false; }
+
+private:
+ static void destroy_cb (GtkWidget * widget, Widget * me)
+ { delete me; }
+ static void realize_cb (GtkWidget * widget, Widget * me)
+ { me->realize (); }
+
+#ifdef USE_GTK3
+ static gboolean draw_cb (GtkWidget * widget, cairo_t * cr, Widget * me);
+#else
+ static gboolean draw_cb (GtkWidget * widget, GdkEventExpose * event, Widget * me);
+#endif
+
+ static gboolean keypress_cb (GtkWidget * widget, GdkEventKey * event, Widget * me)
+ { return me->keypress (event); }
+ static gboolean button_press_cb (GtkWidget * widget, GdkEventButton * event, Widget * me)
+ { return me->button_press (event); }
+ static gboolean button_release_cb (GtkWidget * widget, GdkEventButton * event, Widget * me)
+ { return me->button_release (event); }
+ static gboolean scroll_cb (GtkWidget * widget, GdkEventScroll * event, Widget * me)
+ { return me->scroll (event); }
+ static gboolean motion_cb (GtkWidget * widget, GdkEventMotion * event, Widget * me)
+ { return me->motion (event); }
+ static gboolean leave_cb (GtkWidget * widget, GdkEventCrossing * event, Widget * me)
+ { return me->leave (); }
+ static gboolean close_cb (GtkWidget * widget, GdkEvent * event, Widget * me)
+ { return me->close (); }
+
+ GtkWidget * m_widget = nullptr;
+ GtkWidget * m_drawable = nullptr;
+ int m_scale = 1;
+};
+
+#endif // SKINS_WIDGET_H

audacious-plugins-4.4.1.tar.bz2/src/skins/window.cc Added

@@ -0,0 +1,213 @@
+/*
+ * ui_skinned_window.c
+ * Copyright 2011 John Lindgren
+ *
+ * This file is part of Audacious.
+ *
+ * Audacious 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, version 2 or version 3 of the License.
+ *
+ * Audacious 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
+ * Audacious. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The Audacious team does not consider modular code linking to Audacious or
+ * using our public API to be a derived work.
+ */
+
+#include "window.h"
+#include "menus.h"
+#include "plugin.h"
+#include "skins_cfg.h"
+
+void Window::apply_shape ()
+{
+ if (gtk_widget_get_realized (gtk ()))
+ gdk_window_shape_combine_region (gtk_widget_get_window (gtk ()),
+ m_is_shaded ? m_sshape.get () : m_shape.get (), 0, 0);
+}
+
+void Window::realize ()
+{
+#ifndef USE_GTK3
+ gdk_window_set_back_pixmap (gtk_widget_get_window (gtk ()), nullptr, false);
+#endif
+ apply_shape ();
+}
+
+bool Window::button_press (GdkEventButton * event)
+{
+ /* pass double clicks through; they are handled elsewhere */
+ if (event->button != 1 || event->type == GDK_2BUTTON_PRESS)
+ return false;
+
+ if (m_is_moving)
+ return true;
+
+ dock_move_start (m_id, event->x_root, event->y_root);
+ m_is_moving = true;
+ return true;
+}
+
+bool Window::button_release (GdkEventButton * event)
+{
+ if (event->button != 1)
+ return false;
+
+ m_is_moving = false;
+ return true;
+}
+
+bool Window::motion (GdkEventMotion * event)
+{
+ if (! m_is_moving)
+ return true;
+
+ dock_move (event->x_root, event->y_root);
+ return true;
+}
+
+bool Window::close ()
+{
+ skins_close ();
+ return true;
+}
+
+Window::~Window ()
+{
+ dock_remove_window (m_id);
+
+ g_object_unref (m_normal);
+ g_object_unref (m_shaded);
+}
+
+Window::Window (int id, int * x, int * y, int w, int h, bool shaded) :
+ m_id (id),
+ m_is_shaded (shaded)
+{
+ w *= config.scale;
+ h *= config.scale;
+
+ GtkWidget * window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+ gtk_window_set_decorated ((GtkWindow *) window, false);
+ gtk_window_set_resizable ((GtkWindow *) window, false);
+ gtk_window_move ((GtkWindow *) window, * x, * y);
+ gtk_widget_set_size_request (window, w, h);
+ gtk_window_resize ((GtkWindow *) window, w, h);
+
+ if (id != WINDOW_MAIN)
+ {
+ gtk_window_set_skip_pager_hint ((GtkWindow *) window, true);
+ gtk_window_set_skip_taskbar_hint ((GtkWindow *) window, true);
+ }
+
+ gtk_widget_set_app_paintable (window, true);
+ gtk_widget_add_events (window, GDK_BUTTON_PRESS_MASK |
+ GDK_BUTTON_RELEASE_MASK | GDK_POINTER_MOTION_MASK | GDK_SCROLL_MASK);
+ gtk_window_add_accel_group ((GtkWindow *) window, menu_get_accel_group ());
+
+#ifndef USE_GTK3
+ /* We set None as the background pixmap in order to avoid flickering.
+ * Setting a blank GtkStyle prevents GTK 2.x from overriding this. */
+ GtkStyle * style = gtk_style_new ();
+ gtk_widget_set_style (window, style);
+ g_object_unref (style);
+#endif
+
+ set_input (window);
+ set_drawable (window);
+ set_scale (config.scale);
+
+ m_normal = gtk_fixed_new ();
+ g_object_ref_sink (m_normal);
+ gtk_widget_show (m_normal);
+
+ m_shaded = gtk_fixed_new ();
+ g_object_ref_sink (m_shaded);
+ gtk_widget_show (m_shaded);
+
+ if (shaded)
+ gtk_container_add ((GtkContainer *) window, m_shaded);
+ else
+ gtk_container_add ((GtkContainer *) window, m_normal);
+
+ dock_add_window (id, this, x, y, w, h);
+
+ g_signal_connect (window, "focus-out-event", (GCallback) focus_cb, this);
+ g_signal_connect (window, "focus-in-event", (GCallback) focus_cb, this);
+}
+
+void Window::resize (int w, int h)
+{
+ w *= config.scale;
+ h *= config.scale;
+
+ gtk_widget_set_size_request (gtk (), w, h);
+ gtk_window_resize ((GtkWindow *) gtk (), w, h);
+ dock_set_size (m_id, w, h);
+}
+
+#ifdef USE_GTK3
+void Window::set_shapes (cairo_region_t * shape, cairo_region_t * sshape)
+#else
+void Window::set_shapes (GdkRegion * shape, GdkRegion * sshape)
+#endif
+{
+ m_shape.capture (shape);
+ m_sshape.capture (sshape);
+ apply_shape ();
+}
+
+void Window::set_shaded (bool shaded)
+{
+ if (m_is_shaded == shaded)
+ return;
+
+ if (shaded)
+ {
+ gtk_container_remove ((GtkContainer *) gtk (), m_normal);
+ gtk_container_add ((GtkContainer *) gtk (), m_shaded);
+ }
+ else
+ {
+ gtk_container_remove ((GtkContainer *) gtk (), m_shaded);
+ gtk_container_add ((GtkContainer *) gtk (), m_normal);
+ }
+
+ m_is_shaded = shaded;
+ apply_shape ();
+}
+
+void Window::put_widget (bool shaded, Widget * widget, int x, int y)
+{
+ GtkWidget * fixed = shaded ? m_shaded : m_normal;
+ gtk_fixed_put ((GtkFixed *) fixed, widget->gtk (), x * config.scale, y * config.scale);
+}
+
+void Window::move_widget (bool shaded, Widget * widget, int x, int y)
+{
+ GtkWidget * fixed = shaded ? m_shaded : m_normal;
+ gtk_fixed_move ((GtkFixed *) fixed, widget->gtk (), x * config.scale, y * config.scale);
+}
+
+bool Window::is_focused ()
+{
+ return config.active_titlebar_any ? dock_is_focused () : m_is_focused_window;
+}
+
+/* static */
+gboolean Window::focus_cb (GtkWidget * widget, GdkEventFocus * event, Window * me)
+{
+ me->m_is_focused_window = event->in;
+
+ if (config.active_titlebar_any)
+ dock_draw_all ();
+ else
+ me->queue_draw ();
+
+ return false;
+}

audacious-plugins-4.4.1.tar.bz2/src/skins/window.h Added

@@ -0,0 +1,100 @@
+/*
+ * ui_skinned_window.h
+ * Copyright 2011 John Lindgren
+ *
+ * This file is part of Audacious.
+ *
+ * Audacious 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, version 2 or version 3 of the License.
+ *
+ * Audacious 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
+ * Audacious. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * The Audacious team does not consider modular code linking to Audacious or
+ * using our public API to be a derived work.
+ */
+
+#ifndef SKINS_UI_SKINNED_WINDOW_H
+#define SKINS_UI_SKINNED_WINDOW_H
+
+#include "widget.h"
+
+#include <libaudcore/objects.h>
+
+enum {
+ WINDOW_MAIN,
+ WINDOW_EQ,
+ WINDOW_PLAYLIST,
+ N_WINDOWS
+};
+
+class Window : public Widget
+{
+public:
+ Window (int id, int * x, int * y, int w, int h, bool shaded);
+ ~Window ();
+
+ void resize (int w, int h);
+#ifdef USE_GTK3
+ void set_shapes (cairo_region_t * shape, cairo_region_t * sshape);
+#else
+ void set_shapes (GdkRegion * shape, GdkRegion * sshape);
+#endif
+ /* window-system focus for this one window */
+ bool is_focused_window () { return m_is_focused_window; }
+ /* logical focus, accounting for other windows */
+ bool is_focused ();
+ bool is_shaded () { return m_is_shaded; }
+ void set_shaded (bool shaded);
+ void put_widget (bool shaded, Widget * widget, int x, int y);
+ void move_widget (bool shaded, Widget * widget, int x, int y);
+
+ void setWindowTitle (const char * title)
+ { gtk_window_set_title ((GtkWindow *) gtk (), title); }
+ void setWindowRole (const char * role)
+ { gtk_window_set_role ((GtkWindow *) gtk (), role); }
+ void getPosition (int * x, int * y)
+ { gtk_window_get_position ((GtkWindow *) gtk (), x, y); }
+ void move (int x, int y)
+ { gtk_window_move ((GtkWindow *) gtk (), x, y); }
+
+protected:
+ void realize ();
+ bool keypress (GdkEventKey * event); // in main.cc
+ bool button_press (GdkEventButton * event);
+ bool button_release (GdkEventButton * event);
+ bool motion (GdkEventMotion * event);
+ bool close ();
+
+private:
+ static gboolean focus_cb (GtkWidget * widget, GdkEventFocus * event, Window * me);
+
+ void apply_shape ();
+
+ const int m_id;
+ bool m_is_shaded = false;
+ bool m_is_moving = false;
+ bool m_is_focused_window = false;
+ GtkWidget * m_normal = nullptr, * m_shaded = nullptr;
+#ifdef USE_GTK3
+ SmartPtr<cairo_region_t, cairo_region_destroy> m_shape, m_sshape;
+#else
+ SmartPtr<GdkRegion, gdk_region_destroy> m_shape, m_sshape;
+#endif
+};
+
+void dock_add_window (int id, Window * window, int * x, int * y, int w, int h);
+void dock_remove_window (int id);
+void dock_set_size (int id, int w, int h);
+void dock_move_start (int id, int x, int y);
+void dock_move (int x, int y);
+void dock_change_scale (int old_scale, int new_scale);
+void dock_draw_all ();
+bool dock_is_focused ();
+
+#endif

audacious-plugins-4.4.1.tar.bz2/src/sndfile/meson.build Added

audacious-plugins-3.6.2-gtk3.tar.bz2/src/sndfile/plugin.cc -> audacious-plugins-4.4.1.tar.bz2/src/sndfile/plugin.cc Changed

@@ -19,9 +19,7 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
-#include <math.h>
 #include <stdlib.h>
-
 #include <sndfile.h>
 
 #define WANT_VFS_STDIO_COMPAT
@@ -34,6 +32,7 @@
 public:
 static const char about;
 static const char * const exts;
+ static const char * const mimes;
 
 static constexpr PluginInfo info = {
 N_("Sndfile Plugin"),
@@ -41,14 +40,13 @@
 about
 };
 
- static constexpr auto iinfo = InputInfo ()
+ constexpr SndfilePlugin () : InputPlugin (info, InputInfo ()
 .with_priority (9) /* low priority fallback (but before ffaudio) */
- .with_exts (exts);
-
- constexpr SndfilePlugin () : InputPlugin (info, iinfo) {}
+ .with_exts (exts)
+ .with_mimes (mimes)) {}
 
 bool is_our_file (const char * filename, VFSFile & file);
- Tuple read_tuple (const char * filename, VFSFile & file);
+ bool read_tag (const char * filename, VFSFile & file, Tuple & tuple, Index<char> * image);
 bool play (const char * filename, VFSFile & file);
 };
 
@@ -59,13 +57,23 @@
 static sf_count_t
 sf_get_filelen (void *user_data)
 {
- return ((VFSFile *) user_data)->fsize ();
+ int64_t size = ((VFSFile *) user_data)->fsize ();
+ return (size < 0) ? SF_COUNT_MAX : size;
 }
 
 static sf_count_t
 sf_vseek (sf_count_t offset, int whence, void *user_data)
 {
- return ((VFSFile *) user_data)->fseek (offset, to_vfs_seek_type (whence));
+ if (((VFSFile *) user_data)->fseek (offset, to_vfs_seek_type (whence)) != 0)
+ return -1;
+
+ return ((VFSFile *) user_data)->ftell ();
+}
+
+static sf_count_t
+sf_vseek_dummy (sf_count_t offset, int whence, void *user_data)
+{
+ return -1;
 }
 
 static sf_count_t
@@ -75,9 +83,9 @@
 }
 
 static sf_count_t
-sf_vwrite (const void *ptr, sf_count_t count, void *user_data)
+sf_vwrite_dummy (const void *ptr, sf_count_t count, void *user_data)
 {
- return ((VFSFile *) user_data)->fwrite (ptr, 1, count);
+ return 0;
 }
 
 static sf_count_t
@@ -91,7 +99,16 @@
 sf_get_filelen,
 sf_vseek,
 sf_vread,
- sf_vwrite,
+ sf_vwrite_dummy,
+ sf_tell
+};
+
+static SF_VIRTUAL_IO sf_virtual_io_stream =
+{
+ sf_get_filelen,
+ sf_vseek_dummy,
+ sf_vread,
+ sf_vwrite_dummy,
 sf_tell
 };
 
@@ -109,32 +126,34 @@
 tup.set_int (field, atoi (str));
 }
 
-Tuple SndfilePlugin::read_tuple (const char * filename, VFSFile & file)
+bool SndfilePlugin::read_tag (const char * filename, VFSFile & file, Tuple & tuple,
+ Index<char> * image)
 {
- SNDFILE *sndfile;
 SF_INFO sfinfo {}; // must be zeroed before sf_open()
 const char *format, *subformat;
- Tuple ti;
-
- sndfile = sf_open_virtual (& sf_virtual_io, SFM_READ, & sfinfo, & file);
 
- if (sndfile == nullptr)
- return ti;
+ bool stream = (file.fsize () < 0);
+ SNDFILE * sndfile = sf_open_virtual (stream ? & sf_virtual_io_stream :
+ & sf_virtual_io, SFM_READ, & sfinfo, & file);
 
- ti.set_filename (filename);
+ if (! sndfile)
+ return false;
 
- copy_string (sndfile, SF_STR_TITLE, ti, Tuple::Title);
- copy_string (sndfile, SF_STR_ARTIST, ti, Tuple::Artist);
- copy_string (sndfile, SF_STR_ALBUM, ti, Tuple::Album);
- copy_string (sndfile, SF_STR_COMMENT, ti, Tuple::Comment);
- copy_string (sndfile, SF_STR_GENRE, ti, Tuple::Genre);
- copy_int (sndfile, SF_STR_DATE, ti, Tuple::Year);
- copy_int (sndfile, SF_STR_TRACKNUMBER, ti, Tuple::Track);
+ copy_string (sndfile, SF_STR_TITLE, tuple, Tuple::Title);
+ copy_string (sndfile, SF_STR_ARTIST, tuple, Tuple::Artist);
+ copy_string (sndfile, SF_STR_ALBUM, tuple, Tuple::Album);
+ copy_string (sndfile, SF_STR_COMMENT, tuple, Tuple::Comment);
+ copy_string (sndfile, SF_STR_GENRE, tuple, Tuple::Genre);
+ copy_int (sndfile, SF_STR_DATE, tuple, Tuple::Year);
+ copy_int (sndfile, SF_STR_TRACKNUMBER, tuple, Tuple::Track);
 
 sf_close (sndfile);
 
 if (sfinfo.samplerate > 0)
- ti.set_int (Tuple::Length, ceil (1000.0 * sfinfo.frames / sfinfo.samplerate));
+ {
+ int64_t length = aud::rescale<int64_t> (sfinfo.frames, sfinfo.samplerate, 1000);
+ tuple.set_int (Tuple::Length, length);
+ }
 
 switch (sfinfo.format & SF_FORMAT_TYPEMASK)
 {
@@ -200,7 +219,7 @@
 format = "Core Audio File";
 break;
 default:
- format = "Unknown sndfile";
+ format = nullptr;
 }
 
 switch (sfinfo.format & SF_FORMAT_SUBMASK)
@@ -275,19 +294,32 @@
 subformat = nullptr;
 }
 
+ if (format == nullptr)
+ {
+ SF_FORMAT_INFO info = {.format = sfinfo.format & SF_FORMAT_SUBMASK};
+ if (sf_command (sndfile, SFC_GET_FORMAT_INFO, & info, sizeof (info)) == 0)
+ format = info.name;
+ else
+ format = "Unknown format";
+ }
+
 if (subformat != nullptr)
- ti.set_format (str_printf ("%s (%s)", format, subformat),
+ tuple.set_format (str_printf ("%s (%s)", format, subformat),
 sfinfo.channels, sfinfo.samplerate, 0);
 else
- ti.set_format (format, sfinfo.channels, sfinfo.samplerate, 0);
+ tuple.set_format (format, sfinfo.channels, sfinfo.samplerate, 0);
 
- return ti;
+ return true;
 }
 
 bool SndfilePlugin::play (const char * filename, VFSFile & file)
 {
 SF_INFO sfinfo {}; // must be zeroed before sf_open()
- SNDFILE * sndfile = sf_open_virtual (& sf_virtual_io, SFM_READ, & sfinfo, & file);
+
+ bool stream = (file.fsize () < 0);
+ SNDFILE * sndfile = sf_open_virtual (stream ? & sf_virtual_io_stream :
+ & sf_virtual_io, SFM_READ, & sfinfo, & file);
+
 if (sndfile == nullptr)
 return false;
 
@@ -300,7 +332,10 @@
 {
 int seek_value = check_seek ();
 if (seek_value != -1)
- sf_seek (sndfile, (int64_t) seek_value * sfinfo.samplerate / 1000, SEEK_SET);
+ {
+ int64_t frames = aud::rescale<int64_t> (seek_value, 1000, sfinfo.samplerate);
+ sf_seek (sndfile, aud::min (frames, (int64_t) sfinfo.frames), SEEK_SET);
+ }
 
 int samples = sf_read_float (sndfile, buffer.begin (), buffer.len ());
 if (! samples)
@@ -316,11 +351,12 @@
 
 bool SndfilePlugin::is_our_file (const char * filename, VFSFile & file)
 {
- SNDFILE *tmp_sndfile;
 SF_INFO tmp_sfinfo {}; // must be zeroed before sf_open()
 
 /* Have to open the file to see if libsndfile can handle it. */
- tmp_sndfile = sf_open_virtual (&sf_virtual_io, SFM_READ, &tmp_sfinfo, &file);
+ bool stream = (file.fsize () < 0);
+ SNDFILE * tmp_sndfile = sf_open_virtual (stream ? & sf_virtual_io_stream :
+ & sf_virtual_io, SFM_READ, & tmp_sfinfo, & file);
 
 if (!tmp_sndfile)
 return false;
@@ -349,3 +385,4 @@
 "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.");
 
 const char * const SndfilePlugin::exts = { "aiff", "au", "raw", "wav", nullptr };
+const char * const SndfilePlugin::mimes = { "audio/wav", "audio/x-wav", nullptr };

audacious-plugins-4.4.1.tar.bz2/src/sndio Added

audacious-plugins-4.4.1.tar.bz2/src/sndio/Makefile Added

audacious-plugins-4.4.1.tar.bz2/src/sndio/meson.build Added

audacious-plugins-4.4.1.tar.bz2/src/sndio/sndio.cc Added

@@ -0,0 +1,362 @@
+/*
+ * Sndio Output Plugin for Audacious
+ * Copyright 2014 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 <libaudcore/audstrings.h>
+#include <libaudcore/i18n.h>
+#include <libaudcore/plugin.h>
+#include <libaudcore/preferences.h>
+#include <libaudcore/runtime.h>
+
+#include <errno.h>
+#include <poll.h>
+#include <pthread.h>
+#include <string.h>
+#include <sys/time.h>
+#include <time.h>
+
+#include <sndio.h>
+
+class SndioPlugin : public OutputPlugin
+{
+public:
+ static const char * const defaults;
+ static const PreferencesWidget widgets;
+ static const PluginPreferences prefs;
+
+ static constexpr PluginInfo info = {
+ N_("Sndio Output"),
+ PACKAGE,
+ nullptr,
+ & prefs
+ };
+
+ constexpr SndioPlugin () : OutputPlugin (info, 5) {}
+
+ bool init ();
+
+ StereoVolume get_volume ();
+ void set_volume (StereoVolume v);
+
+ bool open_audio (int format, int rate, int channels, String & error);
+ void close_audio ();
+
+ void period_wait ();
+ int write_audio (const void * data, int size);
+ void drain ();
+
+ int get_delay ();
+
+ void flush ();
+
+ // not implemented
+ void pause (bool pause) {}
+
+private:
+ bool poll_locked ();
+
+ static void volume_cb (void *, unsigned int vol);
+ static void move_cb (void * arg, int delta);
+
+ sio_hdl * m_handle = nullptr;
+
+ int m_rate = 0, m_channels = 0;
+ int m_bytes_per_frame = 0;
+
+ int m_frames_buffered = 0;
+ timeval m_last_write_time = timeval ();
+ int m_flush_count = 0;
+
+ pthread_mutex_t m_mutex = PTHREAD_MUTEX_INITIALIZER;
+ pthread_cond_t m_cond = PTHREAD_COND_INITIALIZER;
+};
+
+EXPORT SndioPlugin aud_plugin_instance;
+
+const char * const SndioPlugin::defaults = {
+ "save_volume", "FALSE",
+ "volume", "100",
+ nullptr
+};
+
+const PreferencesWidget SndioPlugin::widgets = {
+ WidgetEntry (N_("Device (blank for default):"),
+ WidgetString ("sndio", "device")),
+ WidgetCheck (N_("Save and restore volume:"),
+ WidgetBool ("sndio", "save_volume"))
+};
+
+const PluginPreferences SndioPlugin::prefs = {{widgets}};
+
+bool SndioPlugin::init ()
+{
+ aud_config_set_defaults ("sndio", defaults);
+ return true;
+}
+
+void SndioPlugin::volume_cb (void *, unsigned int vol)
+{
+ aud_set_int ("sndio", "volume", aud::rescale ((int) vol, SIO_MAXVOL, 100));
+}
+
+void SndioPlugin::set_volume (StereoVolume v)
+{
+ int vol = aud::max (v.left, v.right);
+ aud_set_int ("sndio", "volume", vol);
+
+ pthread_mutex_lock (& m_mutex);
+
+ if (m_handle)
+ sio_setvol (m_handle, aud::rescale (vol, 100, SIO_MAXVOL));
+
+ pthread_mutex_unlock (& m_mutex);
+}
+
+StereoVolume SndioPlugin::get_volume ()
+{
+ int vol = aud_get_int ("sndio", "volume");
+ return {vol, vol};
+}
+
+void SndioPlugin::move_cb (void * arg, int delta)
+{
+ auto me = (SndioPlugin *) arg;
+
+ me->m_frames_buffered -= delta;
+ gettimeofday (& me->m_last_write_time, nullptr);
+
+ pthread_cond_broadcast (& me->m_cond);
+}
+
+struct FormatData {
+ int format;
+ int bits, bytes;
+ bool sign, le;
+};
+
+static const FormatData format_table = {
+ {FMT_S8, 8, 1, true, false},
+ {FMT_U8, 8, 1, false, false},
+ {FMT_S16_LE, 16, 2, true, true},
+ {FMT_S16_BE, 16, 2, true, false},
+ {FMT_U16_LE, 16, 2, false, true},
+ {FMT_U16_BE, 16, 2, false, false},
+ {FMT_S24_LE, 24, 4, true, true},
+ {FMT_S24_BE, 24, 4, true, false},
+ {FMT_U24_LE, 24, 4, false, true},
+ {FMT_U24_BE, 24, 4, false, false},
+ {FMT_S32_LE, 32, 4, true, true},
+ {FMT_S32_BE, 32, 4, true, false},
+ {FMT_U32_LE, 32, 4, false, true},
+ {FMT_U32_BE, 32, 4, false, false},
+};
+
+bool SndioPlugin::open_audio (int format, int rate, int channels, String & error)
+{
+ const FormatData * fdata = nullptr;
+
+ for (const FormatData & f : format_table)
+ {
+ if (f.format == format)
+ fdata = & f;
+ }
+
+ if (! fdata)
+ {
+ error = String (str_printf (_("Sndio error: Unsupported audio format (%d)"), format));
+ return false;
+ }
+
+ String device = aud_get_str ("sndio", "device");
+ const char * device2 = device0 ? (const char *) device : SIO_DEVANY;
+
+ m_handle = sio_open (device2, SIO_PLAY, true);
+
+ if (! m_handle)
+ {
+ error = String (_("Sndio error: sio_open() failed"));
+ return false;
+ }
+
+ m_rate = rate;
+ m_channels = channels;
+ m_bytes_per_frame = FMT_SIZEOF (format) * channels;
+
+ m_frames_buffered = 0;
+ m_last_write_time = timeval ();
+ m_flush_count = 0;
+
+ int buffer_ms = aud_get_int ("output_buffer_size");
+
+ sio_par par;
+ sio_initpar (& par);
+
+ par.bits = fdata->bits;
+ par.bps = fdata->bytes;
+ par.sig = fdata->sign;
+ par.le = fdata->le;
+ par.msb = false;
+ par.pchan = channels;
+ par.rate = rate;
+ par.bufsz = aud::rescale (buffer_ms, 1000, rate);
+ par.xrun = SIO_IGNORE;
+
+ if (! sio_setpar (m_handle, & par))
+ {
+ error = String (_("Sndio error: sio_setpar() failed"));
+ goto fail;
+ }
+
+ if (aud_get_bool ("sndio", "save_volume"))
+ set_volume (get_volume ());
+
+ sio_onvol (m_handle, volume_cb, nullptr);
+ sio_onmove (m_handle, move_cb, this);
+
+ if (! sio_start (m_handle))
+ {
+ error = String (_("Sndio error: sio_start() failed"));
+ goto fail;
+ }
+
+ return true;
+
+fail:
+ sio_close (m_handle);
+ m_handle = nullptr;
+ return false;
+}
+
+void SndioPlugin::close_audio ()
+{
+ sio_close (m_handle);
+ m_handle = nullptr;
+}
+
+bool SndioPlugin::poll_locked ()
+{
+ bool success = false;
+ pollfd * fds = nullptr;
+ int nfds, old_flush_count;
+
+ nfds = sio_nfds (m_handle);
+ if (nfds < 1)
+ goto fail;
+
+ fds = new pollfdnfds;
+
+ nfds = sio_pollfd (m_handle, fds, POLLOUT);
+ if (nfds < 1)
+ goto fail;
+
+ old_flush_count = m_flush_count;
+
+ pthread_mutex_unlock (& m_mutex);
+
+ if (poll (fds, nfds, -1) < 0)
+ AUDERR ("poll() failed: %s\n", strerror (errno));
+ else
+ success = true;
+
+ pthread_mutex_lock (& m_mutex);
+
+ if (success && m_flush_count == old_flush_count)
+ sio_revents (m_handle, fds);
+
+fail:
+ delete fds;
+ return success;
+}
+
+void SndioPlugin::period_wait ()
+{
+ pthread_mutex_lock (& m_mutex);
+
+ if (sio_eof (m_handle) || ! poll_locked ())
+ pthread_cond_wait (& m_cond, & m_mutex);
+
+ pthread_mutex_unlock (& m_mutex);
+}
+
+int SndioPlugin::write_audio (const void * data, int size)
+{
+ pthread_mutex_lock (& m_mutex);
+
+ int len = sio_write (m_handle, data, size);
+ m_frames_buffered += len / m_bytes_per_frame;
+
+ pthread_mutex_unlock (& m_mutex);
+ return len;
+}
+
+void SndioPlugin::drain ()
+{
+ pthread_mutex_lock (& m_mutex);
+
+ int d = aud::rescale (m_frames_buffered, m_rate, 1000);
+ timespec delay = {d / 1000, d % 1000 * 1000000};
+
+ pthread_mutex_unlock (& m_mutex);
+ nanosleep (& delay, nullptr);
+ pthread_mutex_lock (& m_mutex);
+
+ poll_locked ();
+
+ pthread_mutex_unlock (& m_mutex);
+}
+
+int SndioPlugin::get_delay ()
+{
+ auto timediff = (const timeval & a, const timeval & b) -> int64_t
+ { return 1000 * (int64_t) (b.tv_sec - a.tv_sec) + (b.tv_usec - a.tv_usec) / 1000; };
+
+ pthread_mutex_lock (& m_mutex);
+
+ int delay = aud::rescale (m_frames_buffered, m_rate, 1000);
+
+ if (m_last_write_time.tv_sec)
+ {
+ timeval now;
+ gettimeofday (& now, nullptr);
+ delay = aud::max (delay - timediff (m_last_write_time, now), (int64_t) 0);
+ }
+
+ pthread_mutex_unlock (& m_mutex);
+ return delay;
+}
+
+void SndioPlugin::flush ()
+{
+ pthread_mutex_lock (& m_mutex);
+
+#if HAVE_SNDIO_1_9
+ sio_flush (m_handle);
+#else
+ sio_stop (m_handle);
+#endif
+
+ m_frames_buffered = 0;
+ m_last_write_time = timeval ();
+ m_flush_count ++;
+
+ if (! sio_start (m_handle))
+ AUDERR ("sio_start() failed\n");
+
+ pthread_cond_broadcast (& m_cond);
+ pthread_mutex_unlock (& m_mutex);
+}

audacious-plugins-4.4.1.tar.bz2/src/song-info-qt/meson.build Added

audacious-plugins-3.6.2-gtk3.tar.bz2/src/song-info-qt/song-info.cc -> audacious-plugins-4.4.1.tar.bz2/src/song-info-qt/song-info.cc Changed

@@ -20,80 +20,44 @@
 #include <libaudcore/drct.h>
 #include <libaudcore/hook.h>
 #include <libaudcore/i18n.h>
-#include <libaudcore/playlist.h>
 #include <libaudcore/plugin.h>
 
-#include <libaudqt/libaudqt.h>
 #include <libaudqt/info-widget.h>
 
 class SongInfo : public GeneralPlugin {
 public:
 static constexpr PluginInfo info = {
- N_("Song Info (Qt)"),
- PACKAGE
+ N_("Song Info"),
+ PACKAGE,
+ nullptr, // about
+ nullptr, // prefs
+ PluginQtOnly
 };
 
 constexpr SongInfo () : GeneralPlugin (info, false) {}
 void * get_qt_widget ();
-
-private:
- static void update (void * unused, audqt::InfoWidget * widget);
- static void clear (void * unused, audqt::InfoWidget * widget);
- static void widget_cleanup (QObject * widget);
 };
 
-void SongInfo::update (void * unused, audqt::InfoWidget * widget)
+class SongInfoWidget : public audqt::InfoWidget
 {
- if (! aud_drct_get_playing ())
- return;
-
- if (! widget)
- return;
-
- int playlist = aud_playlist_get_playing ();
-
- if (playlist == -1)
- playlist = aud_playlist_get_active ();
-
- int position = aud_playlist_get_position (playlist);
- if (position == -1)
- return;
-
- String filename = aud_playlist_entry_get_filename (playlist, position);
- if (! filename)
- return;
-
- PluginHandle * decoder = aud_playlist_entry_get_decoder (playlist, position);
- if (! decoder)
- return;
-
- Tuple tuple = aud_playlist_entry_get_tuple (playlist, position);
- if (tuple)
- widget->fillInfo (playlist, position, filename, tuple, decoder, false);
-}
-
-void SongInfo::clear (void * unused, audqt::InfoWidget * widget)
-{
- if (! widget)
- return;
-}
+public:
+ SongInfoWidget() { update(); }
 
-void SongInfo::widget_cleanup (QObject * widget)
-{
- hook_dissociate ("playback begin", (HookFunction) update, widget);
- hook_dissociate ("playback stop", (HookFunction) clear, widget);
-}
+private:
+ const HookReceiver<SongInfoWidget>
+ change_hook{"tuple change", this, &SongInfoWidget::update},
+ update_hook{"playback ready", this, &SongInfoWidget::update},
+ clear_hook{"playback stop", this, &SongInfoWidget::update};
+
+ void update()
+ {
+ fillInfo(aud_drct_get_filename(), aud_drct_get_tuple(), nullptr, false);
+ }
+};
 
 void * SongInfo::get_qt_widget ()
 {
- audqt::InfoWidget * widget = new audqt::InfoWidget;
-
- QObject::connect (widget, &QObject::destroyed, widget_cleanup);
-
- hook_associate ("playback begin", (HookFunction) update, widget);
- hook_associate ("playback stop", (HookFunction) clear, widget);
-
- return widget;
+ return new SongInfoWidget;
 }
 
 EXPORT SongInfo aud_plugin_instance;

audacious-plugins-4.4.1.tar.bz2/src/songchange Added

audacious-plugins-4.4.1.tar.bz2/src/songchange/Makefile Added

audacious-plugins-4.4.1.tar.bz2/src/songchange/formatter.cc Added

@@ -0,0 +1,81 @@
+/* Audacious
+ * Copyright (C) 2005-2007 Audacious team
+ *
+ * XMMS - Cross-platform multimedia player
+ * Copyright (C) 1998-2003 Peter Alm, Mikael Alm, Olle Hallnas,
+ * Thomas Nilsson and 4Front Technologies
+ * Copyright (C) 1999-2003 Haavard Kvaalen
+ *
+ * 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; under version 3 of the License.
+ *
+ * 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>.
+ *
+ * The Audacious team does not consider modular code linking to
+ * Audacious or using our public API to be a derived work.
+ */
+
+#include <assert.h>
+#include <string.h>
+#include "formatter.h"
+
+StringBuf Formatter::format (const char * format) const
+{
+ const char * p;
+ char * q;
+ int len;
+
+ for (p = format, len = 0; * p; p ++)
+ {
+ if (* p == '%')
+ {
+ if (values(int) * ++ p)
+ len += strlen (values(int) * p);
+ else if (! * p)
+ {
+ len += 1;
+ p --;
+ }
+ else
+ len += 2;
+ }
+ else
+ len ++;
+ }
+
+ StringBuf buffer (len);
+
+ for (p = format, q = buffer; * p; p ++)
+ {
+ if (* p == '%')
+ {
+ if (values(int) * ++ p)
+ {
+ strcpy (q, values(int) * p);
+ q += strlen (q);
+ }
+ else
+ {
+ * q ++ = '%';
+ if (* p != '\0')
+ * q ++ = * p;
+ else
+ p --;
+ }
+ }
+ else
+ * q ++ = * p;
+ }
+
+ // sanity check
+ assert (q == buffer + buffer.len ());
+
+ return buffer;
+}

audacious-plugins-4.4.1.tar.bz2/src/songchange/formatter.h Added

audacious-plugins-4.4.1.tar.bz2/src/songchange/meson.build Added

audacious-plugins-4.4.1.tar.bz2/src/songchange/song_change.cc Added

@@ -0,0 +1,330 @@
+/*
+ * Audacious: A cross-platform multimedia player.
+ * Copyright (c) 2005 Audacious Team
+ */
+
+#include <sys/types.h>
+#include "songchange_crossplatform.h"
+
+#include <assert.h>
+
+#include <string.h>
+#include <libaudcore/runtime.h>
+#include <libaudcore/drct.h>
+#include <libaudcore/i18n.h>
+#include <libaudcore/plugin.h>
+#include <libaudcore/preferences.h>
+#include <libaudcore/hook.h>
+#include <libaudcore/audstrings.h>
+#include <libaudcore/tuple.h>
+
+#include "formatter.h"
+
+class SongChange : public GeneralPlugin
+{
+public:
+ static const PreferencesWidget widgets;
+ static const PluginPreferences prefs;
+
+ static constexpr PluginInfo info = {
+ N_("Song Change"),
+ PACKAGE,
+ nullptr,
+ & prefs
+ };
+
+ constexpr SongChange () : GeneralPlugin (info, false) {}
+
+ bool init ();
+ void cleanup ();
+};
+
+EXPORT SongChange aud_plugin_instance;
+
+static String cmd_line;
+static String cmd_line_stop;
+static String cmd_line_after;
+static String cmd_line_end;
+static String cmd_line_ttc;
+
+/**
+ * Escapes characters that are special to the shell inside double quotes.
+ *
+ * @param string String to be escaped.
+ * @return Given string with special characters escaped.
+ */
+static StringBuf escape_shell_chars (const char * string)
+{
+ const char * special = "$`\"\\"; /* Characters to escape */
+ const char * in = string;
+ char * out;
+ int num = 0;
+
+ while (* in != '\0')
+ if (strchr (special, * in ++))
+ num ++;
+
+ StringBuf escaped (strlen (string) + num);
+
+ in = string;
+ out = escaped;
+
+ while (* in != '\0')
+ {
+ if (strchr (special, * in))
+ * out ++ = '\\';
+ * out ++ = * in ++;
+ }
+
+ // sanity check
+ assert (out == escaped + escaped.len ());
+
+ return escaped;
+}
+
+/* Format codes:
+ *
+ * F - frequency (in hertz)
+ * c - number of channels
+ * f - filename (full path)
+ * l - length (in milliseconds)
+ * n - name
+ * r - rate (in bits per second)
+ * s - name (since everyone's used to it)
+ * t - playlist position (%02d)
+ * p - currently playing (1 or 0)
+ * a - artist
+ * b - album
+ * r - track title
+ */
+/* do_command(): do @cmd after replacing the format codes
+ @cmd: command to run */
+static void do_command (const char * cmd)
+{
+ if (cmd && strlen (cmd) > 0)
+ {
+ Formatter formatter;
+ bool playing = aud_drct_get_ready ();
+
+ Tuple tuple;
+ if (playing)
+ tuple = aud_drct_get_tuple ();
+
+ String ctitle = tuple.get_str (Tuple::FormattedTitle);
+ if (ctitle)
+ {
+ StringBuf temp = escape_shell_chars (ctitle);
+ formatter.set ('s', temp);
+ formatter.set ('n', temp);
+ }
+ else
+ {
+ formatter.set ('s', "");
+ formatter.set ('n', "");
+ }
+
+ String filename = aud_drct_get_filename ();
+ if (filename)
+ formatter.set ('f', escape_shell_chars (filename));
+ else
+ formatter.set ('f', "");
+
+ if (playing)
+ {
+ int pos = aud_drct_get_position ();
+ formatter.set ('t', str_printf ("%02d", pos + 1));
+ }
+ else
+ formatter.set ('t', "");
+
+ int length = tuple.get_int (Tuple::Length);
+ if (length > 0)
+ formatter.set ('l', int_to_str (length));
+ else
+ formatter.set ('l', "0");
+
+ formatter.set ('p', int_to_str (playing));
+
+ if (playing)
+ {
+ int brate, srate, chans;
+ aud_drct_get_info (brate, srate, chans);
+ formatter.set ('r', int_to_str (brate));
+ formatter.set ('F', int_to_str (srate));
+ formatter.set ('c', int_to_str (chans));
+ }
+
+ String artist = tuple.get_str (Tuple::Artist);
+ if (artist)
+ formatter.set ('a', artist);
+ else
+ formatter.set ('a', "");
+
+ String album = tuple.get_str (Tuple::Album);
+ if (album)
+ formatter.set ('b', album);
+ else
+ formatter.set ('b', "");
+
+ String title = tuple.get_str (Tuple::Title);
+ if (title)
+ formatter.set ('T', title);
+ else
+ formatter.set ('T', "");
+
+ StringBuf shstring = formatter.format (cmd);
+ if (shstring)
+ execute_command (shstring);
+ }
+}
+
+static void songchange_playback_begin (void *, void *)
+{
+ do_command (cmd_line);
+}
+
+static void songchange_playback_stop (void *, void *)
+{
+ do_command (cmd_line_stop);
+}
+
+static void songchange_playback_end (void *, void *)
+{
+ do_command (cmd_line_after);
+}
+
+static void songchange_playback_ttc (void *, void *)
+{
+ do_command (cmd_line_ttc);
+}
+
+static void songchange_playlist_eof (void *, void *)
+{
+ do_command (cmd_line_end);
+}
+
+static void read_config ()
+{
+ cmd_line = aud_get_str ("song_change", "cmd_line");
+ cmd_line_stop = aud_get_str ("song_change", "cmd_line_stop");
+ cmd_line_after = aud_get_str ("song_change", "cmd_line_after");
+ cmd_line_end = aud_get_str ("song_change", "cmd_line_end");
+ cmd_line_ttc = aud_get_str ("song_change", "cmd_line_ttc");
+}
+
+bool SongChange::init ()
+{
+ read_config ();
+
+ hook_associate ("playback ready", songchange_playback_begin, nullptr);
+ hook_associate ("playback stop", songchange_playback_stop, nullptr);
+ hook_associate ("playback end", songchange_playback_end, nullptr);
+ hook_associate ("playlist end reached", songchange_playlist_eof, nullptr);
+ hook_associate ("title change", songchange_playback_ttc, nullptr);
+
+ return true;
+}
+
+void SongChange::cleanup ()
+{
+ hook_dissociate ("playback ready", songchange_playback_begin);
+ hook_dissociate ("playback stop", songchange_playback_stop);
+ hook_dissociate ("playback end", songchange_playback_end);
+ hook_dissociate ("playlist end reached", songchange_playlist_eof);
+ hook_dissociate ("title change", songchange_playback_ttc);
+
+ cmd_line = String ();
+ cmd_line_stop = String ();
+ cmd_line_after = String ();
+ cmd_line_end = String ();
+ cmd_line_ttc = String ();
+
+ signal_child ();
+}
+
+typedef struct {
+ String cmd;
+ String cmd_stop;
+ String cmd_after;
+ String cmd_end;
+ String cmd_ttc;
+} SongChangeConfig;
+
+static SongChangeConfig config;
+
+const PreferencesWidget SongChange::widgets = {
+ WidgetLabel (N_("Commands")),
+
+ WidgetLabel (N_("Command to run when starting a new song:")),
+ WidgetEntry (0, WidgetString (config.cmd)),
+
+ WidgetLabel (N_("Command to run when stopping a song:")),
+ WidgetEntry (0, WidgetString (config.cmd_stop)),
+
+ WidgetLabel (N_("Command to run at the end of a song:")),
+ WidgetEntry (0, WidgetString (config.cmd_after)),
+
+ WidgetLabel (N_("Command to run at the end of the playlist:")),
+ WidgetEntry (0, WidgetString (config.cmd_end)),
+
+ WidgetLabel (N_("Command to run when song title changes (for network streams):")),
+ WidgetEntry (0, WidgetString (config.cmd_ttc)),
+
+ WidgetLabel (N_("You can use the following format codes, which will be "
+ "replaced before running the command.\nNot all are useful "
+ "though for the song-stopped or end-of-playlist command.")),
+ WidgetLabel (N_("%a: Artist\n"
+ "%b: Album\n"
+ "%c: Number of channels\n"
+ "%f: File name (full path)\n"
+ "%F: Frequency (Hertz)\n"
+ "%l: Length (milliseconds)\n"
+ "%n or %s: Formatted title (see playlist settings)\n"
+ "%p: Currently playing (1 or 0)\n"
+ "%r: Rate (bits per second)\n"
+ "%t: Playlist position\n"
+ "%T: Title (unformatted)")),
+ WidgetLabel (N_("Parameters passed to the shell should be enclosed in "
+ "quotation marks.\nUnquoted parameters may lead to "
+ "unexpected results."))
+};
+
+static void configure_init ()
+{
+ config.cmd = cmd_line;
+ config.cmd_stop = cmd_line_stop;
+ config.cmd_after = cmd_line_after;
+ config.cmd_end = cmd_line_end;
+ config.cmd_ttc = cmd_line_ttc;
+}
+
+static void configure_ok_cb ()
+{
+ aud_set_str ("song_change", "cmd_line", config.cmd);
+ aud_set_str ("song_change", "cmd_line_stop", config.cmd_stop);
+ aud_set_str ("song_change", "cmd_line_after", config.cmd_after);
+ aud_set_str ("song_change", "cmd_line_end", config.cmd_end);
+ aud_set_str ("song_change", "cmd_line_ttc", config.cmd_ttc);
+
+ cmd_line = config.cmd;
+ cmd_line_stop = config.cmd_stop;
+ cmd_line_after = config.cmd_after;
+ cmd_line_end = config.cmd_end;
+ cmd_line_ttc = config.cmd_ttc;
+}
+
+static void configure_cleanup ()
+{
+ config.cmd = String ();
+ config.cmd_stop = String ();
+ config.cmd_after = String ();
+ config.cmd_end = String ();
+ config.cmd_ttc = String ();
+}
+
+const PluginPreferences SongChange::prefs = {
+ {widgets},
+ configure_init,
+ configure_ok_cb,
+ configure_cleanup,
+};

audacious-plugins-4.4.1.tar.bz2/src/songchange/songchange_crossplatform.h Added

@@ -0,0 +1,93 @@
+/*
+ * songchange_crossplatform.h
+ * Audacious
+ *
+ * Copyright (C) 2005-2018 Audacious team
+ *
+ * XMMS - Cross-platform multimedia player
+ * Copyright (C) 1998-2003 Peter Alm, Mikael Alm, Olle Hallnas,
+ * Thomas Nilsson and 4Front Technologies
+ * Copyright (C) 1999-2003 Haavard Kvaalen
+ *
+ * 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; under version 3 of the License.
+ *
+ * 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>.
+ *
+ * The Audacious team does not consider modular code linking to
+ * Audacious or using our public API to be a derived work.
+*/
+
+#ifndef AUDACIOUS1_SONGCHANGE_CROSSPLATFORM_H
+#define AUDACIOUS1_SONGCHANGE_CROSSPLATFORM_H
+
+#include <libaudcore/runtime.h>
+
+#ifdef _WIN32
+
+#include <windows.h>
+#include <glib.h>
+
+
+static void signal_child() {
+ // signal (SIGCHLD, SIG_DFL);
+}
+
+static void execute_command(const char *cmd) {
+ auto *windows_cmd = reinterpret_cast<wchar_t *>(g_utf8_to_utf16(cmd, -1, nullptr, nullptr, nullptr));
+ g_return_if_fail (windows_cmd);
+
+ STARTUPINFOW si;
+ _PROCESS_INFORMATION pi;
+ ZeroMemory(&si, sizeof(si));
+ si.cb = sizeof(si);
+ ZeroMemory(&pi, sizeof(pi));
+
+ unsigned long flags = CREATE_UNICODE_ENVIRONMENT | CREATE_NO_WINDOW;
+ BOOL executed = ::CreateProcessW(NULL, windows_cmd, NULL, NULL, TRUE, flags, NULL, NULL, &si, &pi);
+
+ if (!executed) {
+ AUDINFO("SongChange cannot run the command: %s\n", cmd);
+ }
+ g_free(windows_cmd);
+}
+
+
+#else
+#include <signal.h>
+#include <unistd.h>
+#include <sys/wait.h>
+
+static void signal_child() {
+ signal (SIGCHLD, SIG_DFL);
+}
+
+static void bury_child (int signal)
+{
+ waitpid (-1, nullptr, WNOHANG);
+}
+
+static void execute_command (const char * cmd)
+{
+ const char * argv4 = {"/bin/sh", "-c", nullptr, nullptr};
+ argv2 = cmd;
+ signal (SIGCHLD, bury_child);
+
+ if (fork () == 0)
+ {
+ /* We don't want this process to hog the audio device etc */
+ for (int i = 3; i < 255; i ++)
+ close (i);
+ execv (argv0, (char * *) argv);
+ }
+}
+#endif
+
+#endif //AUDACIOUS1_SONGCHANGE_CROSSPLATFORM_H

audacious-plugins-4.4.1.tar.bz2/src/soxr Added

audacious-plugins-4.4.1.tar.bz2/src/soxr/Makefile Changed

audacious-plugins-4.4.1.tar.bz2/src/soxr/meson.build Added

audacious-plugins-4.4.1.tar.bz2/src/soxr/sox-resampler.cc Added

@@ -0,0 +1,208 @@
+/*
+ * 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 <stdlib.h>
+#include <soxr.h>
+
+#include <libaudcore/i18n.h>
+#include <libaudcore/runtime.h>
+#include <libaudcore/plugin.h>
+#include <libaudcore/preferences.h>
+
+#define MIN_RATE 8000
+#define MAX_RATE 192000
+#define RATE_STEP 50
+
+class SoXResampler : public EffectPlugin
+{
+public:
+ static const char about;
+ static const char * const defaults;
+ static const PreferencesWidget widgets;
+ static const PluginPreferences prefs;
+
+ static constexpr PluginInfo info = {
+ N_("SoX Resampler"),
+ PACKAGE,
+ about,
+ & prefs
+ };
+
+ /* order #2: must be before crossfade */
+ constexpr SoXResampler () : EffectPlugin (info, 2, false) {}
+
+ bool init ();
+ void cleanup ();
+
+ void start (int & channels, int & rate);
+ Index<float> & process (Index<float> & data);
+ bool flush (bool force);
+};
+
+EXPORT SoXResampler aud_plugin_instance;
+
+const char * const SoXResampler::defaults = {
+ "quality", aud::numeric_string<SOXR_HQ>::str,
+ "rate", "44100",
+ "phase_response", aud::numeric_string<SOXR_LINEAR_PHASE>::str,
+#ifdef SOXR_ALLOW_ALIASING
+ "allow_aliasing", "FALSE",
+#endif
+ "use_steep_filter", "FALSE",
+ nullptr
+};
+
+static soxr_t soxr;
+static soxr_error_t error;
+static soxr_quality_spec_t q;
+static int stored_rate;
+static int target_rate;
+static int stored_channels;
+static double ratio;
+static Index<float> buffer;
+
+bool SoXResampler::init ()
+{
+ aud_config_set_defaults ("soxr", defaults);
+ return true;
+}
+
+void SoXResampler::cleanup ()
+{
+ soxr_delete (soxr);
+ soxr = 0;
+ buffer.clear ();
+}
+
+void SoXResampler::start (int & channels, int & rate)
+{
+ soxr_delete (soxr);
+ soxr = 0;
+
+ target_rate = aud_get_int ("soxr", "rate");
+ target_rate = aud::clamp (target_rate, MIN_RATE, MAX_RATE);
+
+ if (target_rate == rate)
+ return;
+
+ stored_rate = rate;
+
+ int recipe = aud_get_int ("soxr", "quality");
+ recipe |= aud_get_int ("soxr", "phase_response");
+ recipe |= (aud_get_bool ("soxr", "use_steep_filter")) ? SOXR_STEEP_FILTER : 0;
+#ifdef SOXR_ALLOW_ALIASING
+ recipe |= (aud_get_bool ("soxr", "allow_aliasing")) ? SOXR_ALLOW_ALIASING : 0;
+#endif
+
+ q = soxr_quality_spec (recipe, 0);
+
+ soxr = soxr_create (rate, target_rate, channels, & error, nullptr, & q, nullptr);
+
+ if (error)
+ {
+ AUDERR ("%s\n", error);
+ return;
+ }
+
+ stored_channels = channels;
+ ratio = (double) target_rate / rate;
+ rate = target_rate;
+}
+
+Index<float> & SoXResampler::process (Index<float> & data)
+{
+ if (! soxr)
+ return data;
+
+ buffer.resize ((int) (data.len () * ratio) + 256);
+
+ size_t samples_done;
+ error = soxr_process (soxr, data.begin (), data.len () / stored_channels,
+ nullptr, buffer.begin (), buffer.len () / stored_channels, & samples_done);
+
+ if (error)
+ {
+ AUDERR ("%s\n", error);
+ return data;
+ }
+
+ buffer.resize (samples_done * stored_channels);
+
+ return buffer;
+}
+
+bool SoXResampler::flush (bool force)
+{
+ if (! soxr)
+ return true;
+
+ soxr_delete (soxr);
+
+ soxr = soxr_create (stored_rate, target_rate, stored_channels, & error, nullptr, & q, nullptr);
+
+ if (error)
+ {
+ AUDERR ("%s\n", error);
+ return true;
+ }
+
+ return true;
+}
+
+const char SoXResampler::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 ComboItem method_list = {
+ ComboItem (N_("Quick"), SOXR_QQ),
+ ComboItem (N_("Low"), SOXR_LQ),
+ ComboItem (N_("Medium"), SOXR_MQ),
+ ComboItem (N_("High"), SOXR_HQ),
+ ComboItem (N_("Very High"), SOXR_VHQ),
+ ComboItem (N_("Ultra High"), SOXR_32_BITQ)
+};
+
+static const ComboItem phase_response_list = {
+ ComboItem (N_("Minimum"), SOXR_MINIMUM_PHASE),
+ ComboItem (N_("Intermediate"), SOXR_INTERMEDIATE_PHASE),
+ ComboItem (N_("Linear"), SOXR_LINEAR_PHASE)
+};
+
+const PreferencesWidget SoXResampler::widgets = {
+ WidgetCombo (N_("Quality:"),
+ WidgetInt ("soxr", "quality"),
+ {{method_list}}),
+ WidgetCombo (N_("Phase:"),
+ WidgetInt ("soxr", "phase_response"),
+ {{phase_response_list}}),
+#ifdef SOXR_ALLOW_ALIASING
+ WidgetCheck (N_("Allow aliasing"), WidgetBool ("soxr", "allow_aliasing")),
+#endif
+ WidgetCheck (N_("Use steep filter"), WidgetBool ("soxr", "use_steep_filter")),
+ WidgetSpin (N_("Rate:"),
+ WidgetInt ("soxr", "rate"),
+ {MIN_RATE, MAX_RATE, RATE_STEP, N_("Hz")})
+};
+
+const PluginPreferences SoXResampler::prefs = {{widgets}};

audacious-plugins-4.4.1.tar.bz2/src/speedpitch Added

audacious-plugins-4.4.1.tar.bz2/src/speedpitch/Makefile Changed

audacious-plugins-4.4.1.tar.bz2/src/speedpitch/meson.build Added

audacious-plugins-4.4.1.tar.bz2/src/speedpitch/speed-pitch.cc Added

@@ -0,0 +1,283 @@
+/*
+ * Speed and Pitch effect plugin for Audacious
+ * Copyright 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 <math.h>
+#include <samplerate.h>
+
+#include <libaudcore/hook.h>
+#include <libaudcore/i18n.h>
+#include <libaudcore/runtime.h>
+#include <libaudcore/plugin.h>
+#include <libaudcore/preferences.h>
+
+/* The general idea of the speed change algorithm is to divide the input signal
+ * into pieces, spaced at a time interval A, using a cosine-shaped window
+ * function. The pieces are then reassembled by adding them together again,
+ * spaced at another time interval B. By varying the ratio A:B, we change the
+ * speed of the audio. */
+
+#define FREQ 10
+#define OVERLAP 3
+
+#define CFGSECT "speed-pitch"
+#define MINSPEED 0.25
+#define MAXSPEED 2.0
+#define MINPITCH 0.5
+#define MAXPITCH 2.0
+#define MINSEMITONES -12.0
+#define MAXSEMITONES 12.0
+
+class SpeedPitch : public EffectPlugin
+{
+public:
+ static const char * const defaults;
+ static const PreferencesWidget widgets;
+ static const PluginPreferences prefs;
+
+ static constexpr PluginInfo info = {
+ N_("Speed and Pitch"),
+ PACKAGE,
+ nullptr,
+ & prefs
+ };
+
+ constexpr SpeedPitch () : EffectPlugin (info, 0, true) {}
+
+ bool init ();
+ void cleanup ();
+
+ void start (int & channels, int & rate);
+ bool flush (bool force);
+ int adjust_delay (int delay);
+
+ Index<float> & process (Index<float> & samples)
+ { return process (samples, false); }
+ Index<float> & finish (Index<float> & samples, bool end_of_playlist)
+ { return process (samples, true); }
+
+private:
+ Index<float> & process (Index<float> & samples, bool ending);
+};
+
+EXPORT SpeedPitch aud_plugin_instance;
+
+static double semitones;
+static int curchans, currate;
+static SRC_STATE * srcstate;
+static int outstep, width;
+static Index<float> cosine;
+static Index<float> in, out;
+static int src, dst;
+
+static void add_data (Index<float> & b, Index<float> & data, float ratio)
+{
+ int oldlen = b.len ();
+ int inframes = data.len () / curchans;
+ int maxframes = (int) (inframes * ratio) + 256;
+ b.resize (oldlen + maxframes * curchans);
+
+ SRC_DATA d = SRC_DATA ();
+
+ d.data_in = data.begin ();
+ d.input_frames = inframes;
+ d.data_out = & boldlen;
+ d.output_frames = maxframes;
+ d.src_ratio = ratio;
+
+ src_process (srcstate, & d);
+ b.resize (oldlen + d.output_frames_gen * curchans);
+}
+
+bool SpeedPitch::flush (bool force)
+{
+ src_reset (srcstate);
+
+ in.resize (0);
+ out.resize (0);
+
+ /* The source and destination pointers give the center of the next cosine
+ * window to be copied, relative to the current input and output buffers. */
+ src = dst = 0;
+
+ /* The output buffer always extends right of the destination pointer by half
+ * the width of a cosine window. */
+ out.insert (0, width / 2);
+
+ return true;
+}
+
+void SpeedPitch::start (int & chans, int & rate)
+{
+ curchans = chans;
+ currate = rate;
+
+ if (srcstate)
+ src_delete (srcstate);
+
+ srcstate = src_new (SRC_LINEAR, curchans, nullptr);
+
+ /* Calculate the width of the cosine window and the spacing interval for
+ * output. Make them both even numbers for convenience. Note that the
+ * cosine window is applied without deinterleaving the audio samples. */
+ outstep = ((currate / FREQ) & ~1) * curchans;
+ width = outstep * OVERLAP;
+
+ /* Generate the cosine window, scaled vertically to compensate for the
+ * overlap of the reassembled pieces of audio. */
+ cosine.resize (width);
+ for (int i = 0; i < width; i ++)
+ cosinei = (1.0 - cos (2.0 * M_PI * i / width)) / OVERLAP;
+
+ flush (true);
+}
+
+Index<float> & SpeedPitch::process (Index<float> & data, bool ending)
+{
+ const float * cosine_center = & cosinewidth / 2;
+ float pitch = aud_get_double (CFGSECT, "pitch");
+ float speed = aud_get_double (CFGSECT, "speed");
+
+ /* Copy the passed audio to the input buffer, scaled to adjust pitch. */
+ add_data (in, data, 1.0 / pitch);
+
+ if (! aud_get_bool (CFGSECT, "decouple"))
+ {
+ data = std::move (in);
+ return data;
+ }
+
+ /* Calculate the spacing interval for input. */
+ int instep = (int) round ((outstep / curchans) * speed / pitch) * curchans;
+
+ /* Stop copying half a window's width before the end of the input buffer (or
+ * right up to the end of the buffer if the song is ending). */
+ int stop = in.len () - (ending ? 0 : width / 2);
+
+ while (src <= stop)
+ {
+ /* Truncate the window to avoid overflows if necessary. */
+ int begin = aud::max (-(width / 2), aud::max (-src, -dst));
+ int end = aud::min (width / 2, aud::min (in.len () - src, out.len () - dst));
+
+ for (int i = begin; i < end; i ++)
+ outdst + i += insrc + i * cosine_centeri;
+
+ src += instep;
+ dst += outstep;
+
+ out.insert (-1, outstep);
+ }
+
+ /* Discard input up to half a window's width before the source pointer (or
+ * right up to the previous source pointer if the song is ending. */
+ int seek = aud::clamp (0, src - (ending ? instep : width / 2), in.len ());
+ in.remove (0, seek);
+ src -= seek;
+
+ data.resize (0);
+
+ /* Return output up to half a window's width before the destination pointer
+ * (or right up to the previous destination pointer if the song is ending). */
+ int ret = aud::clamp (0, dst - (ending ? outstep : width / 2), out.len ());
+ data.move_from (out, 0, 0, ret, true, true);
+ dst -= ret;
+
+ return data;
+}
+
+int SpeedPitch::adjust_delay (int delay)
+{
+ if (! aud_get_bool (CFGSECT, "decouple"))
+ return delay;
+
+ float samples_to_ms = 1000.0 / (curchans * currate);
+ float speed = aud_get_double (CFGSECT, "speed");
+ int in_samples = in.len () - src;
+ int out_samples = dst;
+
+ return (delay + in_samples * samples_to_ms) * speed + out_samples * samples_to_ms;
+}
+
+static void sync_speed ()
+{
+ if (! aud_get_bool (CFGSECT, "decouple"))
+ {
+ aud_set_double (CFGSECT, "speed", aud_get_double (CFGSECT, "pitch"));
+ hook_call ("speed-pitch set speed", nullptr);
+ }
+}
+
+static void pitch_changed ()
+{
+ semitones = 12 * log (aud_get_double (CFGSECT, "pitch")) / log (2);
+ hook_call ("speed-pitch set semitones", nullptr);
+ sync_speed ();
+}
+
+static void semitones_changed ()
+{
+ aud_set_double (CFGSECT, "pitch", pow (2, semitones / 12));
+ hook_call ("speed-pitch set pitch", nullptr);
+ sync_speed ();
+}
+
+const char * const SpeedPitch::defaults = {
+ "decouple", "TRUE",
+ "speed", "1",
+ "pitch", "1",
+ nullptr};
+
+const PreferencesWidget SpeedPitch::widgets = {
+ WidgetLabel (N_("Speed")),
+ WidgetCheck (N_("Decouple from pitch"),
+ WidgetBool (CFGSECT, "decouple", sync_speed)),
+ WidgetSpin (N_("Multiplier:"),
+ WidgetFloat (CFGSECT, "speed", nullptr, "speed-pitch set speed"),
+ {MINSPEED, MAXSPEED, 0.05},
+ WIDGET_CHILD),
+ WidgetLabel (N_("Pitch")),
+ WidgetSpin (nullptr,
+ WidgetFloat (semitones, semitones_changed, "speed-pitch set semitones"),
+ {MINSEMITONES, MAXSEMITONES, 0.05, N_("semitones")}),
+ WidgetSpin (N_("Multiplier:"),
+ WidgetFloat (CFGSECT, "pitch", pitch_changed, "speed-pitch set pitch"),
+ {MINPITCH, MAXPITCH, 0.005},
+ WIDGET_CHILD)
+};
+
+const PluginPreferences SpeedPitch::prefs = {{widgets}};
+
+bool SpeedPitch::init ()
+{
+ aud_config_set_defaults (CFGSECT, defaults);
+ pitch_changed ();
+ return true;
+}
+
+void SpeedPitch::cleanup ()
+{
+ if (srcstate)
+ src_delete (srcstate);
+
+ srcstate = nullptr;
+
+ cosine.clear ();
+ in.clear ();
+ out.clear ();
+}

audacious-plugins-4.4.1.tar.bz2/src/statusicon-qt Added

audacious-plugins-4.4.1.tar.bz2/src/statusicon-qt/Makefile Added

audacious-plugins-4.4.1.tar.bz2/src/statusicon-qt/meson.build Added

audacious-plugins-4.4.1.tar.bz2/src/statusicon-qt/statusicon.cc Added

@@ -0,0 +1,272 @@
+/*
+ * statusicon.cc
+ * Copyright 2015 Eugene Paskevich
+ *
+ * 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 <libaudcore/drct.h>
+#include <libaudcore/hook.h>
+#include <libaudcore/i18n.h>
+#include <libaudcore/interface.h>
+#include <libaudcore/plugin.h>
+#include <libaudcore/preferences.h>
+#include <libaudcore/runtime.h>
+
+#include <libaudqt/menu.h>
+
+#include <QApplication>
+#include <QMenu>
+#include <QSystemTrayIcon>
+#include <QWheelEvent>
+
+class StatusIcon : public GeneralPlugin
+{
+public:
+ static const char about;
+ static const char * const defaults;
+ static const PreferencesWidget widgets;
+ static const PluginPreferences prefs;
+ static const audqt::MenuItem items;
+
+ static constexpr PluginInfo info = {
+ N_("Status Icon"),
+ PACKAGE,
+ about,
+ & prefs,
+ PluginQtOnly
+ };
+
+ constexpr StatusIcon () : GeneralPlugin (info, false) {}
+
+ bool init ();
+ void cleanup ();
+
+private:
+ static void update_tooltip (void * data, void * user_data);
+ static void window_closed (void * data, void * user_data);
+ static void activate (QSystemTrayIcon::ActivationReason);
+ static void open_files ();
+ static void toggle_aud_ui ();
+};
+
+EXPORT StatusIcon aud_plugin_instance;
+
+const char StatusIcon::about =
+ N_("Status Icon Plugin (partial port for Qt interface)\n\n"
+ "Copyright 2005-2007 Giacomo Lozito <james@develia.org>\n"
+ "Copyright 2010 Michał Lipski <tallica@o2.pl>\n"
+ "Copyright 2015 Eugene Paskevich <eugene@raptor.kiev.ua>\n\n"
+ "This plugin provides a status icon, placed in\n"
+ "the system tray area of the window manager.");
+
+enum {
+ SI_CFG_SCROLL_ACTION_VOLUME,
+ SI_CFG_SCROLL_ACTION_SKIP
+};
+
+const char * const StatusIcon::defaults = {
+ "scroll_action", aud::numeric_string<SI_CFG_SCROLL_ACTION_VOLUME>::str,
+ "disable_popup", "FALSE",
+ "close_to_tray", "FALSE",
+ "reverse_scroll", "FALSE",
+ nullptr
+};
+
+const PreferencesWidget StatusIcon::widgets = {
+ WidgetLabel (N_("Mouse Scroll Action")),
+ WidgetRadio (N_("Change volume"),
+ WidgetInt ("statusicon", "scroll_action"),
+ {SI_CFG_SCROLL_ACTION_VOLUME}),
+ WidgetRadio (N_("Change playing song"),
+ WidgetInt ("statusicon", "scroll_action"),
+ {SI_CFG_SCROLL_ACTION_SKIP}),
+ WidgetLabel (N_("Other Settings")),
+ WidgetCheck (N_("Disable the popup window"),
+ WidgetBool ("statusicon", "disable_popup")),
+ WidgetCheck (N_("Close to the system tray"),
+ WidgetBool ("statusicon", "close_to_tray")),
+ WidgetCheck (N_("Advance in playlist when scrolling upward"),
+ WidgetBool ("statusicon", "reverse_scroll"))
+};
+
+const PluginPreferences StatusIcon::prefs = {{widgets}};
+
+const audqt::MenuItem StatusIcon::items =
+{
+ audqt::MenuCommand ({N_("_Play"), "media-playback-start"}, aud_drct_play),
+ audqt::MenuCommand ({N_("Paus_e"), "media-playback-pause"}, aud_drct_pause),
+ audqt::MenuCommand ({N_("_Stop"), "media-playback-stop"}, aud_drct_stop),
+ audqt::MenuCommand ({N_("Pre_vious"), "media-skip-backward"}, aud_drct_pl_prev),
+ audqt::MenuCommand ({N_("_Next"), "media-skip-forward"}, aud_drct_pl_next),
+ audqt::MenuSep (),
+ audqt::MenuCommand ({N_("_Open Files ..."), "document-open"}, StatusIcon::open_files),
+ audqt::MenuCommand ({N_("Se_ttings ..."), "preferences-system"}, audqt::prefswin_show),
+ audqt::MenuCommand ({N_("_Quit"), "application-exit"}, aud_quit),
+};
+
+class SystemTrayIcon : public QSystemTrayIcon
+{
+public:
+ SystemTrayIcon (const QIcon & icon, QObject * parent = nullptr) :
+ QSystemTrayIcon (icon, parent) {}
+
+protected:
+ void scroll (int steps);
+ bool event (QEvent * e) override;
+
+private:
+ int scroll_delta = 0;
+};
+
+void SystemTrayIcon::scroll (int delta)
+{
+ scroll_delta += delta;
+
+ /* we want discrete steps here */
+ int steps = scroll_delta / 120;
+ if (steps == 0)
+ return;
+
+ scroll_delta -= 120 * steps;
+
+ switch (aud_get_int ("statusicon", "scroll_action"))
+ {
+ case SI_CFG_SCROLL_ACTION_VOLUME:
+ aud_drct_set_volume_main (aud_drct_get_volume_main () +
+ aud_get_int ("volume_delta") * steps);
+ break;
+
+ case SI_CFG_SCROLL_ACTION_SKIP:
+ if ((steps > 0) ^ aud_get_bool ("statusicon", "reverse_scroll"))
+ aud_drct_pl_prev ();
+ else
+ aud_drct_pl_next ();
+ break;
+ }
+}
+
+bool SystemTrayIcon::event (QEvent * e)
+{
+ switch (e->type ())
+ {
+ case QEvent::ToolTip:
+ if (! aud_get_bool ("statusicon", "disable_popup"))
+ {
+ setToolTip (QString ()); /* prevent double tooltip */
+ audqt::infopopup_show_current ();
+ }
+ return true;
+
+ case QEvent::Wheel:
+ scroll (((QWheelEvent *) e)->angleDelta ().y ());
+ return true;
+
+ default:
+ return QSystemTrayIcon::event (e);
+ }
+}
+
+static SystemTrayIcon * tray = nullptr;
+static QMenu * menu = nullptr;
+
+bool StatusIcon::init ()
+{
+ aud_config_set_defaults ("statusicon", defaults);
+
+ audqt::init ();
+
+ tray = new SystemTrayIcon (qApp->windowIcon ());
+ QObject::connect (tray, & QSystemTrayIcon::activated, activate);
+ menu = audqt::menu_build (items);
+ tray->setContextMenu (menu);
+ tray->show ();
+
+ update_tooltip (nullptr, nullptr);
+
+ hook_associate ("title change", update_tooltip, nullptr);
+ hook_associate ("playback ready", update_tooltip, nullptr);
+ hook_associate ("playback stop", update_tooltip, nullptr);
+ hook_associate ("window close", window_closed, nullptr);
+
+ return true;
+}
+
+void StatusIcon::cleanup ()
+{
+ hook_dissociate ("title change", update_tooltip);
+ hook_dissociate ("playback ready", update_tooltip);
+ hook_dissociate ("playback stop", update_tooltip);
+ hook_dissociate ("window close", window_closed);
+
+ /* Prevent accidentally hiding the interface by disabling
+ * the plugin while Audacious is closed to the tray. */
+ PluginHandle * p = aud_plugin_by_header (& aud_plugin_instance);
+ if (! aud_plugin_get_enabled (p) && ! aud_get_headless_mode () && ! aud_ui_is_shown ())
+ aud_ui_show (true);
+
+ delete tray;
+ tray = nullptr;
+ delete menu;
+ menu = nullptr;
+
+ audqt::cleanup ();
+}
+
+void StatusIcon::update_tooltip (void * data, void * user_data)
+{
+ String title = aud_drct_get_title ();
+ tray->setToolTip (QString (title));
+}
+
+void StatusIcon::window_closed (void * data, void * user_data)
+{
+ bool * handled = (bool *) data;
+
+ if (aud_get_bool ("statusicon", "close_to_tray") && tray->isVisible ())
+ {
+ * handled = true;
+ aud_ui_show (false);
+ }
+}
+
+void StatusIcon::activate(QSystemTrayIcon::ActivationReason reason)
+{
+ switch (reason)
+ {
+#ifndef Q_OS_MAC
+ case QSystemTrayIcon::Trigger:
+ toggle_aud_ui ();
+ break;
+#endif
+
+ case QSystemTrayIcon::MiddleClick:
+ aud_drct_pause ();
+ break;
+
+ default:
+ break;
+ }
+}
+
+void StatusIcon::open_files ()
+{
+ audqt::fileopener_show (audqt::FileMode::Open);
+}
+
+void StatusIcon::toggle_aud_ui ()
+{
+ aud_ui_show (! aud_ui_is_shown ());
+}

audacious-plugins-3.6.2-gtk3.tar.bz2/src/statusicon/Makefile -> audacious-plugins-4.4.1.tar.bz2/src/statusicon/Makefile Changed

audacious-plugins-4.4.1.tar.bz2/src/statusicon/meson.build Added

audacious-plugins-3.6.2-gtk3.tar.bz2/src/statusicon/statusicon.cc -> audacious-plugins-4.4.1.tar.bz2/src/statusicon/statusicon.cc Changed

@@ -47,7 +47,8 @@
 N_("Status Icon"),
 PACKAGE,
 about,
- & prefs
+ & prefs,
+ PluginGLibOnly
 };
 
 constexpr StatusIcon () : GeneralPlugin (info, false) {}
@@ -68,12 +69,11 @@
 
 static void si_popup_timer_start (GtkStatusIcon * icon);
 static void si_popup_timer_stop (GtkStatusIcon * icon);
-static void si_menu_show (int x, int y, unsigned button, uint32_t time, void *);
-static void si_popup_hide (void * icon);
+static void si_menu_show (GtkStatusIcon * icon, GdkEventButton * event);
+static void si_popup_hide (GtkStatusIcon * icon);
 
 const char * const StatusIcon::defaults = {
- "scroll_action", "0", /* SI_CFG_SCROLL_ACTION_VOLUME */
- "volume_delta", "5",
+ "scroll_action", aud::numeric_string<SI_CFG_SCROLL_ACTION_VOLUME>::str,
 "disable_popup", "FALSE",
 "close_to_tray", "FALSE",
 "reverse_scroll", "FALSE",
@@ -125,7 +125,7 @@
 if (event->state & GDK_SHIFT_MASK)
 aud_drct_pl_prev ();
 else
- si_menu_show (event->x_root, event->y_root, event->button, event->time, icon);
+ si_menu_show (icon, event);
 break;
 }
 
@@ -141,7 +141,7 @@
 switch (aud_get_int ("statusicon", "scroll_action"))
 {
 case SI_CFG_SCROLL_ACTION_VOLUME:
- si_volume_change (aud_get_int ("statusicon", "volume_delta"));
+ si_volume_change (aud_get_int ("volume_delta"));
 break;
 case SI_CFG_SCROLL_ACTION_SKIP:
 if (aud_get_bool ("statusicon", "reverse_scroll"))
@@ -158,7 +158,7 @@
 switch (aud_get_int ("statusicon", "scroll_action"))
 {
 case SI_CFG_SCROLL_ACTION_VOLUME:
- si_volume_change (-aud_get_int ("statusicon", "volume_delta"));
+ si_volume_change (-aud_get_int ("volume_delta"));
 break;
 case SI_CFG_SCROLL_ACTION_SKIP:
 if (aud_get_bool ("statusicon", "reverse_scroll"))
@@ -212,7 +212,7 @@
 return true;
 }
 
-static void si_popup_hide (void * icon)
+static void si_popup_hide (GtkStatusIcon * icon)
 {
 if (POPUP_IS_ACTIVE)
 {
@@ -259,10 +259,14 @@
 return false;
 }
 
-static void si_menu_show (int x, int y, unsigned button, uint32_t time, void * evbox)
+static void si_menu_show (GtkStatusIcon * icon, GdkEventButton * event)
 {
- GtkWidget * si_menu = (GtkWidget *) g_object_get_data ((GObject *) evbox, "menu");
- gtk_menu_popup ((GtkMenu *) si_menu, nullptr, nullptr, nullptr, nullptr, button, time);
+ GtkMenu * si_menu = (GtkMenu *) g_object_get_data ((GObject *) icon, "menu");
+#if GTK_CHECK_VERSION(3, 22, 0)
+ gtk_menu_popup_at_pointer (si_menu, (const GdkEvent *) event);
+#else
+ gtk_menu_popup (si_menu, nullptr, nullptr, nullptr, nullptr, event->button, event->time);
+#endif
 }
 
 static void open_files ()
@@ -273,13 +277,13 @@
 static GtkWidget * si_menu_create ()
 {
 static const AudguiMenuItem items = {
- MenuCommand (N_("_Open Files ..."), "document-open", 0, (GdkModifierType) 0, open_files),
- MenuCommand (N_("Pre_vious"), "media-skip-backward", 0, (GdkModifierType) 0, aud_drct_pl_prev),
 MenuCommand (N_("_Play"), "media-playback-start", 0, (GdkModifierType) 0, aud_drct_play),
 MenuCommand (N_("Paus_e"), "media-playback-pause", 0, (GdkModifierType) 0, aud_drct_pause),
 MenuCommand (N_("_Stop"), "media-playback-stop", 0, (GdkModifierType) 0, aud_drct_stop),
+ MenuCommand (N_("Pre_vious"), "media-skip-backward", 0, (GdkModifierType) 0, aud_drct_pl_prev),
 MenuCommand (N_("_Next"), "media-skip-forward", 0, (GdkModifierType) 0, aud_drct_pl_next),
 MenuSep (),
+ MenuCommand (N_("_Open Files ..."), "document-open", 0, (GdkModifierType) 0, open_files),
 MenuCommand (N_("Se_ttings ..."), "preferences-system", 0, (GdkModifierType) 0, audgui_show_prefs_window),
 MenuCommand (N_("_Quit"), "application-exit", 0, (GdkModifierType) 0, aud_quit)
 };
@@ -353,12 +357,13 @@
 
 bool StatusIcon::init ()
 {
- if (aud_get_mainloop_type () != MainloopType::GLib)
- return false;
-
 aud_config_set_defaults ("statusicon", defaults);
 audgui_init ();
 si_enable (true);
+
+ if (! aud_ui_is_shown ())
+ gdk_notify_startup_complete ();
+
 return true;
 }

audacious-plugins-4.4.1.tar.bz2/src/stereo_plugin/meson.build Added

audacious-plugins-4.4.1.tar.bz2/src/streamtuner Added

audacious-plugins-4.4.1.tar.bz2/src/streamtuner/Makefile Added

audacious-plugins-4.4.1.tar.bz2/src/streamtuner/icecast-model.cc Added

@@ -0,0 +1,176 @@
+// Copyright (c) 2019 Ariadne Conill <ariadne@dereferenced.org>
+//
+// 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.
+//
+// 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 <QXmlStreamReader>
+
+#include "icecast-model.h"
+
+static const char *ICECAST_YP = "http://dir.xiph.org/yp.xml";
+
+IcecastTunerModel::IcecastTunerModel (QObject * parent) :
+ QAbstractListModel (parent)
+{
+ fetch_stations ();
+}
+
+IcecastTunerModel::~IcecastTunerModel ()
+{
+ m_results.clear ();
+}
+
+void IcecastTunerModel::fetch_stations ()
+{
+ vfs_async_file_get_contents(ICECAST_YP, & (const char *, const Index<char> & buf) {
+ if (! buf.len ())
+ return;
+
+ beginResetModel ();
+
+ AUDINFO("icecast: got results from YP server\n");
+
+ // oh, this is going to be fun... parse the XML as fast as possible
+ QXmlStreamReader reader (QByteArray (buf.begin (), buf.len ()));
+ IcecastEntry entry;
+
+ // lets prefab some atoms for fast comparisons
+ QString entry_atom = QString ("entry");
+ QString server_name_atom = QString ("server_name");
+ QString listen_url_atom = QString ("listen_url");
+ QString server_type_atom = QString ("server_type");
+ QString bitrate_atom = QString ("bitrate");
+ QString genre_atom = QString ("genre");
+ QString current_song_atom = QString ("current_song");
+ QString mp3_atom = QString ("audio/mpeg");
+ QString aac_atom = QString ("audio/aacp");
+ QString vorbis_atom = QString ("application/ogg");
+
+ while (! reader.atEnd ()) {
+ auto token_type = reader.readNext ();
+
+ switch (token_type) {
+ case QXmlStreamReader::StartElement:
+ if (! reader.name ().compare (server_name_atom))
+ entry.title = reader.readElementText ();
+ else if (! reader.name ().compare (listen_url_atom))
+ entry.stream_uri = reader.readElementText ();
+ else if (! reader.name ().compare (current_song_atom))
+ entry.current_song = reader.readElementText ();
+ else if (! reader.name ().compare (genre_atom))
+ entry.genre = reader.readElementText ();
+ else if (! reader.name ().compare (server_type_atom))
+ {
+ auto server_type = reader.readElementText ();
+
+ if (! server_type.compare (mp3_atom))
+ entry.type = IcecastEntry::MP3;
+ else if (! server_type.compare (aac_atom))
+ entry.type = IcecastEntry::AAC;
+ else if (! server_type.compare (vorbis_atom))
+ entry.type = IcecastEntry::Vorbis;
+ else
+ entry.type = IcecastEntry::Other;
+ }
+ else if (! reader.name ().compare (bitrate_atom))
+ entry.bitrate = reader.readElementText ().toInt ();
+
+ break;
+ case QXmlStreamReader::EndElement:
+ if (! reader.name ().compare (entry_atom))
+ m_results.append (entry);
+
+ break;
+ default:
+ break;
+ }
+ }
+
+ endResetModel ();
+ });
+}
+
+const IcecastEntry & IcecastTunerModel::entry (int idx) const
+{
+ return m_resultsidx;
+}
+
+int IcecastTunerModel::columnCount (const QModelIndex &) const
+{
+ return NColumns;
+}
+
+int IcecastTunerModel::rowCount (const QModelIndex &) const
+{
+ return m_results.len ();
+}
+
+QVariant IcecastTunerModel::headerData (int section, Qt::Orientation orientation, int role) const
+{
+ if (role != Qt::DisplayRole)
+ return QVariant ();
+
+ switch (section) {
+ case Title:
+ return QString (_("Title"));
+
+ case Genre:
+ return QString (_("Genre"));
+
+ case Type:
+ return QString (_("Type"));
+
+ case Bitrate:
+ return QString (_("Bitrate"));
+
+ case CurrentSong:
+ return QString (_("Current Song"));
+ }
+
+ return QVariant ();
+}
+
+QVariant IcecastTunerModel::data (const QModelIndex &index, int role) const
+{
+ if (role != Qt::DisplayRole)
+ return QVariant ();
+
+ int row = index.row ();
+ auto station = entry (row);
+
+ switch (index.column ())
+ {
+ case Title:
+ return QString (station.title);
+
+ case Genre:
+ return QString (station.genre);
+
+ case Type:
+ switch (station.type)
+ {
+ case IcecastEntry::MP3:
+ return QString ("MP3");
+ case IcecastEntry::AAC:
+ return QString ("AAC");
+ case IcecastEntry::Vorbis:
+ return QString ("OGG");
+ default:
+ return QString (_("Other"));
+ }
+ break;
+
+ case Bitrate:
+ return QString::number (station.bitrate);
+
+ case CurrentSong:
+ return QString (station.current_song);
+ }
+
+ return QVariant ();
+}

audacious-plugins-4.4.1.tar.bz2/src/streamtuner/icecast-model.h Added

@@ -0,0 +1,77 @@
+// Copyright (c) 2019 Ariadne Conill <ariadne@dereferenced.org>
+//
+// 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.
+//
+// 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.
+
+#ifndef STREAMTUNER_ICECAST_MODEL_H
+#define STREAMTUNER_ICECAST_MODEL_H
+
+#include <libaudcore/drct.h>
+#include <libaudcore/i18n.h>
+#include <libaudcore/plugin.h>
+#include <libaudcore/plugins.h>
+#include <libaudcore/preferences.h>
+#include <libaudcore/audstrings.h>
+#include <libaudcore/hook.h>
+#include <libaudcore/runtime.h>
+#include <libaudcore/index.h>
+#include <libaudcore/playlist.h>
+#include <libaudcore/vfs_async.h>
+
+#include <libaudqt/treeview.h>
+
+#include <QWidget>
+#include <QTabWidget>
+#include <QVBoxLayout>
+#include <QSplitter>
+#include <QAbstractListModel>
+
+struct IcecastEntry {
+ QString title;
+ QString genre;
+ QString current_song;
+ QString stream_uri;
+
+ enum {
+ MP3,
+ AAC,
+ Vorbis,
+ Other
+ } type;
+
+ int bitrate;
+};
+
+class IcecastTunerModel : public QAbstractListModel {
+public:
+ enum {
+ Title,
+ Genre,
+ Type,
+ Bitrate,
+ CurrentSong,
+ NColumns
+ };
+
+ IcecastTunerModel (QObject * parent = nullptr);
+ ~IcecastTunerModel ();
+
+ int columnCount (const QModelIndex &parent = QModelIndex()) const;
+ int rowCount (const QModelIndex &parent = QModelIndex()) const;
+ QVariant headerData (int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const;
+ QVariant data (const QModelIndex &index, int role = Qt::DisplayRole) const;
+
+ void fetch_stations ();
+
+ const IcecastEntry & entry (int idx) const;
+
+private:
+ Index<IcecastEntry> m_results;
+};
+
+#endif

audacious-plugins-4.4.1.tar.bz2/src/streamtuner/icecast-widget.cc Added

@@ -0,0 +1,33 @@
+// Copyright (c) 2019 Ariadne Conill <ariadne@dereferenced.org>
+//
+// 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.
+//
+// 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 "icecast-widget.h"
+
+IcecastListingWidget::IcecastListingWidget (QWidget * parent) :
+ audqt::TreeView (parent)
+{
+ m_model = new IcecastTunerModel (this);
+
+ setModel (m_model);
+ setRootIsDecorated (false);
+}
+
+void IcecastListingWidget::activate (const QModelIndex & index)
+{
+ if (index.row () < 0)
+ return;
+
+ Playlist::temporary_playlist ().activate ();
+ auto entry = m_model->entry (index.row ());
+
+ AUDINFO ("Play radio entry %s %s.\n", (const char *) entry.title.toLocal8Bit (), (const char *) entry.stream_uri.toLocal8Bit ());
+
+ Playlist::temporary_playlist ().insert_entry (-1, entry.stream_uri.toUtf8 (), Tuple (), true);
+}

audacious-plugins-4.4.1.tar.bz2/src/streamtuner/icecast-widget.h Added

@@ -0,0 +1,40 @@
+// Copyright (c) 2019 Ariadne Conill <ariadne@dereferenced.org>
+//
+// 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.
+//
+// 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.
+
+#ifndef STREAMTUNER_ICECAST_WIDGET_H
+#define STREAMTUNER_ICECAST_WIDGET_H
+
+#include <libaudqt/treeview.h>
+
+#include <QWidget>
+#include <QTabWidget>
+#include <QVBoxLayout>
+#include <QSplitter>
+#include <QAbstractListModel>
+#include <QNetworkAccessManager>
+#include <QNetworkRequest>
+#include <QNetworkReply>
+#include <QJsonDocument>
+#include <QJsonArray>
+#include <QJsonObject>
+
+#include "icecast-model.h"
+
+class IcecastListingWidget : public audqt::TreeView {
+public:
+ IcecastListingWidget(QWidget * parent = nullptr);
+
+ void activate (const QModelIndex & index);
+
+private:
+ IcecastTunerModel *m_model;
+};
+
+#endif

audacious-plugins-4.4.1.tar.bz2/src/streamtuner/ihr-model.cc Added

@@ -0,0 +1,236 @@
+// Copyright (c) 2019 Ariadne Conill <ariadne@dereferenced.org>
+//
+// 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.
+//
+// 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 <libaudcore/drct.h>
+#include <libaudcore/i18n.h>
+#include <libaudcore/plugin.h>
+#include <libaudcore/plugins.h>
+#include <libaudcore/preferences.h>
+#include <libaudcore/audstrings.h>
+#include <libaudcore/hook.h>
+#include <libaudcore/runtime.h>
+#include <libaudcore/index.h>
+#include <libaudcore/playlist.h>
+#include <libaudcore/vfs_async.h>
+
+#include <libaudqt/treeview.h>
+
+#include <QWidget>
+#include <QTabWidget>
+#include <QAbstractListModel>
+#include <QNetworkAccessManager>
+#include <QNetworkRequest>
+#include <QNetworkReply>
+#include <QJsonDocument>
+#include <QJsonArray>
+#include <QJsonObject>
+
+#include "ihr-model.h"
+
+IHRMarketModel::IHRMarketModel (QObject * parent) :
+ QAbstractListModel (parent)
+{
+ fetch_markets ();
+}
+
+IHRMarketModel::~IHRMarketModel ()
+{
+ m_results.clear ();
+}
+
+int IHRMarketModel::columnCount (const QModelIndex &) const
+{
+ return 1;
+}
+
+int IHRMarketModel::rowCount (const QModelIndex &) const
+{
+ return m_results.len ();
+}
+
+QVariant IHRMarketModel::headerData (int section, Qt::Orientation orientation, int role) const
+{
+ if (role != Qt::DisplayRole)
+ return QVariant ();
+
+ return QString (_("Market"));
+}
+
+QVariant IHRMarketModel::data (const QModelIndex &index, int role) const
+{
+ if (role != Qt::DisplayRole)
+ return QVariant ();
+
+ int row = index.row ();
+ auto entry = m_resultsrow;
+
+ return QString ("%1, %2, %3 (%4)")
+ .arg (entry.city)
+ .arg (entry.state)
+ .arg (entry.country_code)
+ .arg (entry.station_count);
+}
+
+static const char *URI_GET_MARKETS = "https://api.iheart.com/api/v2/content/markets?limit=10000&cache=true";
+
+void IHRMarketModel::fetch_markets ()
+{
+ vfs_async_file_get_contents (URI_GET_MARKETS, & (const char *, const Index<char> & buf) {
+ if (! buf.len ())
+ return;
+
+ auto doc = QJsonDocument::fromJson(QByteArray (buf.begin (), buf.len ()));
+ if (! doc.isObject ())
+ return;
+
+ auto root = doc.object ();
+ auto market_count = root"total".toInt ();
+
+ AUDINFO ("Fetched %d markets.\n", market_count);
+
+ beginResetModel ();
+
+ auto markets = root"hits".toArray ();
+
+ for (auto market_ref : markets)
+ {
+ auto market = market_ref.toObject ();
+ IHRMarketEntry entry;
+
+ entry.market_id = market"marketId".toInt ();
+ entry.station_count = market"stationCount".toInt ();
+ entry.city = market"city".toString ();
+ entry.state = market"stateAbbreviation".toString ();
+ entry.country_code = market"countryAbbreviation".toString ();
+
+ m_results.append (entry);
+ }
+
+ endResetModel ();
+ });
+}
+
+int IHRMarketModel::id_for_idx (const QModelIndex &index) const
+{
+ if (index.row () < 0)
+ return -1;
+
+ auto entry = m_resultsindex.row ();
+ return entry.market_id;
+}
+
+IHRTunerModel::IHRTunerModel (QObject * parent) :
+ QAbstractListModel (parent)
+{
+}
+
+IHRTunerModel::~IHRTunerModel ()
+{
+ m_results.clear ();
+}
+
+int IHRTunerModel::columnCount (const QModelIndex &) const
+{
+ return NColumns;
+}
+
+int IHRTunerModel::rowCount (const QModelIndex &) const
+{
+ return m_results.len ();
+}
+
+QVariant IHRTunerModel::headerData (int section, Qt::Orientation orientation, int role) const
+{
+ if (role != Qt::DisplayRole)
+ return QVariant ();
+
+ switch (section) {
+ case CallLetters:
+ return QString (_("Call Letters"));
+
+ case Title:
+ return QString (_("Title"));
+
+ case Description:
+ return QString (_("Description"));
+ }
+
+ return QVariant ();
+}
+
+QVariant IHRTunerModel::data (const QModelIndex &index, int role) const
+{
+ if (role != Qt::DisplayRole)
+ return QVariant ();
+
+ int row = index.row ();
+ int col = index.column ();
+ auto entry = m_resultsrow;
+
+ switch (col) {
+ case CallLetters:
+ return QString (entry.call_letters);
+
+ case Title:
+ return QString (entry.title);
+
+ case Description:
+ return QString (entry.description);
+ }
+
+ return QVariant ();
+}
+
+void IHRTunerModel::fetch_stations (int market_id)
+{
+ StringBuf uri = str_printf("https://api.iheart.com/api/v2/content/liveStations?limit=100&marketId=%d", market_id);
+
+ vfs_async_file_get_contents(uri, & (const char *, const Index<char> & buf) {
+ if (! buf.len ())
+ return;
+
+ auto doc = QJsonDocument::fromJson(QByteArray (buf.begin (), buf.len ()));
+ if (! doc.isObject ())
+ return;
+
+ auto root = doc.object ();
+ auto station_count = root"total".toInt ();
+
+ AUDINFO ("Fetched %d stations for market %d.\n", station_count, market_id);
+
+ beginResetModel ();
+
+ m_results.clear ();
+
+ auto stations = root"hits".toArray ();
+
+ for (auto station_ref : stations)
+ {
+ auto station = station_ref.toObject ();
+ IHRStationEntry entry;
+
+ entry.title = station"name".toString ();
+ entry.description = station"description".toString ();
+ entry.call_letters = station"callLetters".toString ();
+
+ auto streams = station"streams".toObject ();
+ entry.stream_uri = streams"shoutcast_stream".toString ();
+
+ m_results.append (entry);
+ }
+
+ endResetModel ();
+ });
+}
+
+const IHRStationEntry & IHRTunerModel::station_for_idx (const QModelIndex &index) const
+{
+ return m_resultsindex.row ();
+}

audacious-plugins-4.4.1.tar.bz2/src/streamtuner/ihr-model.h Added

@@ -0,0 +1,95 @@
+// Copyright (c) 2019 Ariadne Conill <ariadne@dereferenced.org>
+//
+// 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.
+//
+// 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.
+
+#ifndef STREAMTUNER_IHR_MODEL_H
+#define STREAMTUNER_IHR_MODEL_H
+
+#include <libaudcore/drct.h>
+#include <libaudcore/i18n.h>
+#include <libaudcore/plugin.h>
+#include <libaudcore/plugins.h>
+#include <libaudcore/preferences.h>
+#include <libaudcore/audstrings.h>
+#include <libaudcore/hook.h>
+#include <libaudcore/runtime.h>
+#include <libaudcore/index.h>
+#include <libaudcore/playlist.h>
+
+#include <libaudqt/treeview.h>
+
+#include <QWidget>
+#include <QTabWidget>
+#include <QAbstractListModel>
+#include <QNetworkAccessManager>
+#include <QNetworkRequest>
+#include <QNetworkReply>
+#include <QJsonDocument>
+#include <QJsonArray>
+#include <QJsonObject>
+
+struct IHRMarketEntry {
+ QString city;
+ QString state;
+ QString country_code;
+ int station_count;
+ int market_id;
+};
+
+struct IHRStationEntry {
+ QString title;
+ QString description;
+ QString call_letters;
+ QString stream_uri;
+};
+
+class IHRMarketModel : public QAbstractListModel {
+public:
+ IHRMarketModel (QObject * parent = nullptr);
+ ~IHRMarketModel ();
+
+ int columnCount (const QModelIndex &parent = QModelIndex()) const;
+ int rowCount (const QModelIndex &parent = QModelIndex()) const;
+ QVariant headerData (int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const;
+ QVariant data (const QModelIndex &index, int role = Qt::DisplayRole) const;
+
+ void fetch_markets ();
+
+ int id_for_idx (const QModelIndex &index) const;
+
+private:
+ Index<IHRMarketEntry> m_results;
+};
+
+class IHRTunerModel : public QAbstractListModel {
+public:
+ IHRTunerModel (QObject * parent = nullptr);
+ ~IHRTunerModel ();
+
+ enum {
+ CallLetters,
+ Title,
+ Description,
+ NColumns
+ };
+
+ int columnCount (const QModelIndex &parent = QModelIndex()) const;
+ int rowCount (const QModelIndex &parent = QModelIndex()) const;
+ QVariant headerData (int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const;
+ QVariant data (const QModelIndex &index, int role = Qt::DisplayRole) const;
+
+ void fetch_stations (int market_id);
+
+ const IHRStationEntry & station_for_idx (const QModelIndex &index) const;
+
+private:
+ Index<IHRStationEntry> m_results;
+};
+
+#endif

audacious-plugins-4.4.1.tar.bz2/src/streamtuner/ihr-widget.cc Added

@@ -0,0 +1,84 @@
+// Copyright (c) 2019 Ariadne Conill <ariadne@dereferenced.org>
+//
+// 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.
+//
+// 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 <libaudcore/drct.h>
+#include <libaudcore/i18n.h>
+#include <libaudcore/plugin.h>
+#include <libaudcore/plugins.h>
+#include <libaudcore/preferences.h>
+#include <libaudcore/audstrings.h>
+#include <libaudcore/hook.h>
+#include <libaudcore/runtime.h>
+#include <libaudcore/index.h>
+#include <libaudcore/playlist.h>
+
+#include "ihr-model.h"
+#include "ihr-widget.h"
+
+IHRListingWidget::IHRListingWidget (QWidget * parent) :
+ audqt::TreeView (parent)
+{
+ m_model = new IHRTunerModel (this);
+
+ setModel (m_model);
+ setRootIsDecorated (false);
+}
+
+void IHRListingWidget::activate (const QModelIndex & index)
+{
+ if (index.row () < 0)
+ return;
+
+ Playlist::temporary_playlist ().activate ();
+ auto entry = m_model->station_for_idx (index);
+
+ AUDINFO ("Play radio entry %s %s.\n", (const char *) entry.title.toLocal8Bit (), (const char *) entry.stream_uri.toLocal8Bit ());
+
+ Playlist::temporary_playlist ().insert_entry (-1, entry.stream_uri.toUtf8 (), Tuple (), true);
+}
+
+IHRMarketWidget::IHRMarketWidget (QWidget * parent) :
+ QTreeView (parent)
+{
+ m_model = new IHRMarketModel (this);
+
+ setModel (m_model);
+ setRootIsDecorated (false);
+}
+
+IHRTunerWidget::IHRTunerWidget (QWidget * parent) :
+ QWidget (parent)
+{
+ m_layout = new QVBoxLayout (this);
+
+ m_splitter = new QSplitter ();
+
+ m_markets = new IHRMarketWidget ();
+ m_splitter->addWidget (m_markets);
+
+ m_tuner = new IHRListingWidget ();
+ m_splitter->addWidget (m_tuner);
+ m_splitter->setStretchFactor (1, 2);
+
+ m_layout->addWidget (m_splitter);
+
+ auto market_selection_model = m_markets->selectionModel ();
+ connect(market_selection_model, &QItemSelectionModel::selectionChanged, & (const QItemSelection &selected, const QItemSelection &) {
+ // this should never happen, but just to be sure...
+ if (! selected.indexes ().length ())
+ return;
+
+ auto idx = selected.indexes ().first ();
+ IHRMarketModel *market = (IHRMarketModel *) m_markets->model ();
+
+ IHRTunerModel *model = (IHRTunerModel *) m_tuner->model ();
+ model->fetch_stations (market->id_for_idx (idx));
+ });
+}

audacious-plugins-4.4.1.tar.bz2/src/streamtuner/ihr-widget.h Added

@@ -0,0 +1,59 @@
+// Copyright (c) 2019 Ariadne Conill <ariadne@dereferenced.org>
+//
+// 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.
+//
+// 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.
+
+#ifndef STREAMTUNER_IHR_WIDGET_H
+#define STREAMTUNER_IHR_WIDGET_H
+
+#include <libaudqt/treeview.h>
+
+#include <QWidget>
+#include <QTabWidget>
+#include <QVBoxLayout>
+#include <QSplitter>
+#include <QAbstractListModel>
+#include <QNetworkAccessManager>
+#include <QNetworkRequest>
+#include <QNetworkReply>
+#include <QJsonDocument>
+#include <QJsonArray>
+#include <QJsonObject>
+
+#include "ihr-model.h"
+
+class IHRListingWidget : public audqt::TreeView {
+public:
+ IHRListingWidget(QWidget * parent = nullptr);
+
+ void activate (const QModelIndex & index);
+
+private:
+ IHRTunerModel *m_model;
+};
+
+class IHRMarketWidget : public QTreeView {
+public:
+ IHRMarketWidget(QWidget * parent = nullptr);
+
+private:
+ IHRMarketModel *m_model;
+};
+
+class IHRTunerWidget : public QWidget {
+public:
+ IHRTunerWidget(QWidget * parent = nullptr);
+
+private:
+ IHRListingWidget *m_tuner;
+ IHRMarketWidget *m_markets;
+ QSplitter *m_splitter;
+ QVBoxLayout *m_layout;
+};
+
+#endif

audacious-plugins-4.4.1.tar.bz2/src/streamtuner/meson.build Added

audacious-plugins-4.4.1.tar.bz2/src/streamtuner/shoutcast-model.cc Added

@@ -0,0 +1,245 @@
+// Copyright (c) 2019 Ariadne Conill <ariadne@dereferenced.org>
+//
+// 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.
+//
+// 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 <libaudcore/drct.h>
+#include <libaudcore/i18n.h>
+#include <libaudcore/plugin.h>
+#include <libaudcore/plugins.h>
+#include <libaudcore/preferences.h>
+#include <libaudcore/audstrings.h>
+#include <libaudcore/hook.h>
+#include <libaudcore/runtime.h>
+#include <libaudcore/index.h>
+#include <libaudcore/playlist.h>
+
+#include <QAbstractListModel>
+#include <QNetworkAccessManager>
+#include <QNetworkRequest>
+#include <QNetworkReply>
+#include <QJsonDocument>
+#include <QJsonArray>
+#include <QJsonObject>
+
+#include "shoutcast-model.h"
+
+ShoutcastTunerModel::ShoutcastTunerModel (QObject * parent) :
+ QAbstractListModel (parent)
+{
+ m_qnam = new QNetworkAccessManager (this);
+
+ fetch_stations ();
+}
+
+ShoutcastTunerModel::~ShoutcastTunerModel ()
+{
+ m_results.clear ();
+}
+
+void ShoutcastTunerModel::fetch_stations (String genre)
+{
+ auto base = "https://directory.shoutcast.com";
+ StringBuf uri;
+ StringBuf post_data;
+
+ // undefined genre: fetch top 500
+ if (! genre || ! strcmp (genre, "Top 500 Stations"))
+ uri = str_concat ({base, "/Home/Top"});
+ else
+ {
+ uri = str_concat ({base, "/Home/BrowseByGenre"});
+ post_data = str_concat ({"genrename=", genre});
+ }
+
+ // build the request for the fetch
+ QUrl url = QUrl (QString (uri));
+ QNetworkRequest request = QNetworkRequest (url);
+ request.setHeader (QNetworkRequest::ContentTypeHeader, "application/x-www-form-urlencoded");
+
+ QNetworkReply * reply = m_qnam->post (request, (const char *) post_data);
+ QObject::connect (reply, &QNetworkReply::finished, reply, this () {
+ if (200 != reply->attribute (QNetworkRequest::HttpStatusCodeAttribute))
+ return;
+
+ auto data = reply->readAll();
+ auto doc = QJsonDocument::fromJson(data);
+
+ if (! doc.isArray ())
+ return;
+
+ auto stations = doc.array ();
+ process_stations (stations);
+ });
+}
+
+void ShoutcastTunerModel::process_station (QJsonObject object)
+{
+ ShoutcastEntry entry;
+
+ entry.listeners = object"Listeners".toInt ();
+ entry.bitrate = object"Bitrate".toInt ();
+ entry.station_id = object"ID".toInt ();
+ entry.genre = object"Genre".toString ();
+ entry.title = object"Name".toString ();
+ entry.type = object"Format".toString () == QString ("audio/mpeg") ? ShoutcastEntry::MP3 : ShoutcastEntry::AAC;
+
+ m_results.append (entry);
+}
+
+void ShoutcastTunerModel::process_stations (QJsonArray & stations)
+{
+ AUDINFO ("Retrieved %lld stations.\n", (long long int) stations.size ());
+
+ beginResetModel ();
+
+ m_results.clear ();
+
+ for (auto st : stations)
+ {
+ if (! st.isObject ())
+ continue;
+
+ process_station (st.toObject ());
+ }
+
+ endResetModel ();
+}
+
+QVariant ShoutcastTunerModel::headerData (int section, Qt::Orientation, int role) const
+{
+ if (role != Qt::DisplayRole)
+ return QVariant ();
+
+ switch (section)
+ {
+ case Title:
+ return QString (_("Title"));
+
+ case Genre:
+ return QString (_("Genre"));
+
+ case Listeners:
+ return QString (_("Listeners"));
+
+ case Type:
+ return QString (_("Type"));
+
+ case Bitrate:
+ return QString (_("Bitrate"));
+ }
+
+ return QVariant ();
+}
+
+QVariant ShoutcastTunerModel::data (const QModelIndex &index, int role) const
+{
+ if (role != Qt::DisplayRole && ! (role == Qt::ToolTipRole && index.column () == Title))
+ return QVariant ();
+
+ int row = index.row ();
+ if (row > m_results.len ())
+ return QVariant ();
+
+ auto entry = m_resultsrow;
+
+ switch (index.column ())
+ {
+ case Title:
+ return QString (entry.title);
+
+ case Genre:
+ return QString (entry.genre);
+
+ case Listeners:
+ return QString::number (entry.listeners);
+
+ case Type:
+ return entry.type == ShoutcastEntry::MP3 ? QString ("MP3") : QString ("AAC");
+
+ case Bitrate:
+ return QString::number (entry.bitrate);
+ }
+
+ return QVariant ();
+}
+
+int ShoutcastTunerModel::columnCount (const QModelIndex &) const
+{
+ return NColumns;
+}
+
+int ShoutcastTunerModel::rowCount (const QModelIndex &) const
+{
+ return m_results.len ();
+}
+
+const ShoutcastEntry & ShoutcastTunerModel::entry (int idx) const
+{
+ return m_resultsidx;
+}
+
+const char *ShoutcastTunerModel::genres = {
+ N_("Top 500 Stations"),
+ N_("Alternative"),
+ N_("Blues"),
+ N_("Classical"),
+ N_("Country"),
+ N_("Decades"),
+ N_("Easy Listening"),
+ N_("Electronic"),
+ N_("Folk"),
+ N_("Inspirational"),
+ N_("International"),
+ N_("Jazz"),
+ N_("Latin"),
+ N_("Metal"),
+ N_("Misc"),
+ N_("New Age"),
+ N_("Pop"),
+ N_("Public Radio"),
+ N_("R&B and Urban"),
+ N_("Rap"),
+ N_("Reggae"),
+ N_("Rock"),
+ N_("Seasonal and Holiday"),
+ N_("Soundtracks"),
+ N_("Talk"),
+ N_("Themes")
+};
+
+ShoutcastGenreModel::ShoutcastGenreModel (QObject * parent) :
+ QAbstractListModel (parent)
+{
+}
+
+int ShoutcastGenreModel::columnCount (const QModelIndex &) const
+{
+ return 1;
+}
+
+int ShoutcastGenreModel::rowCount (const QModelIndex &) const
+{
+ return sizeof (ShoutcastTunerModel::genres) / sizeof (ShoutcastTunerModel::genres0);
+}
+
+QVariant ShoutcastGenreModel::headerData (int, Qt::Orientation, int role) const
+{
+ if (role != Qt::DisplayRole)
+ return QVariant ();
+
+ return QString (_("Genre"));
+}
+
+QVariant ShoutcastGenreModel::data (const QModelIndex &index, int role) const
+{
+ if (role != Qt::DisplayRole)
+ return QVariant ();
+
+ return QString (_(ShoutcastTunerModel::genresindex.row ()));
+}

audacious-plugins-4.4.1.tar.bz2/src/streamtuner/shoutcast-model.h Added

@@ -0,0 +1,94 @@
+// Copyright (c) 2019 Ariadne Conill <ariadne@dereferenced.org>
+//
+// 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.
+//
+// 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.
+
+#ifndef STREAMTUNER_SHOUTCAST_MODEL_H
+#define STREAMTUNER_SHOUTCAST_MODEL_H
+
+#include <libaudcore/drct.h>
+#include <libaudcore/i18n.h>
+#include <libaudcore/plugin.h>
+#include <libaudcore/plugins.h>
+#include <libaudcore/preferences.h>
+#include <libaudcore/audstrings.h>
+#include <libaudcore/hook.h>
+#include <libaudcore/runtime.h>
+#include <libaudcore/index.h>
+#include <libaudcore/playlist.h>
+
+#include <libaudqt/treeview.h>
+
+#include <QWidget>
+#include <QTabWidget>
+#include <QAbstractListModel>
+#include <QNetworkAccessManager>
+#include <QNetworkRequest>
+#include <QNetworkReply>
+#include <QJsonDocument>
+#include <QJsonArray>
+#include <QJsonObject>
+
+struct ShoutcastEntry {
+ QString title;
+ QString genre;
+ int listeners;
+
+ enum {
+ MP3,
+ AAC
+ } type;
+
+ int bitrate;
+ int station_id;
+};
+
+class ShoutcastTunerModel : public QAbstractListModel {
+public:
+ static const char *genres;
+
+ enum {
+ Title,
+ Genre,
+ Listeners,
+ Type,
+ Bitrate,
+ NColumns
+ };
+
+ ShoutcastTunerModel (QObject * parent = nullptr);
+ ~ShoutcastTunerModel ();
+
+ int columnCount (const QModelIndex &parent = QModelIndex()) const;
+ int rowCount (const QModelIndex &parent = QModelIndex()) const;
+ QVariant headerData (int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const;
+ QVariant data (const QModelIndex &index, int role = Qt::DisplayRole) const;
+
+ void fetch_stations (String genre = String ());
+
+ void process_station (QJsonObject object);
+ void process_stations (QJsonArray & stations);
+
+ const ShoutcastEntry & entry (int idx) const;
+
+private:
+ Index<ShoutcastEntry> m_results;
+ QNetworkAccessManager *m_qnam;
+};
+
+class ShoutcastGenreModel : public QAbstractListModel {
+public:
+ ShoutcastGenreModel (QObject * parent = nullptr);
+
+ int columnCount (const QModelIndex &parent = QModelIndex()) const;
+ int rowCount (const QModelIndex &parent = QModelIndex()) const;
+ QVariant headerData (int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const;
+ QVariant data (const QModelIndex &index, int role = Qt::DisplayRole) const;
+};
+
+#endif

audacious-plugins-4.4.1.tar.bz2/src/streamtuner/shoutcast-widget.cc Added

@@ -0,0 +1,111 @@
+// Copyright (c) 2019 Ariadne Conill <ariadne@dereferenced.org>
+//
+// 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.
+//
+// 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 <libaudcore/drct.h>
+#include <libaudcore/i18n.h>
+#include <libaudcore/plugin.h>
+#include <libaudcore/plugins.h>
+#include <libaudcore/preferences.h>
+#include <libaudcore/audstrings.h>
+#include <libaudcore/hook.h>
+#include <libaudcore/runtime.h>
+#include <libaudcore/index.h>
+#include <libaudcore/playlist.h>
+
+#include "shoutcast-model.h"
+#include "shoutcast-widget.h"
+
+#include <QHeaderView>
+#include <QScrollBar>
+
+ShoutcastListingWidget::ShoutcastListingWidget (QWidget * parent) :
+ audqt::TreeView (parent)
+{
+ m_model = new ShoutcastTunerModel (this);
+
+ setModel (m_model);
+ setRootIsDecorated (false);
+
+ auto hdr = header ();
+ hdr->setStretchLastSection (false);
+ hdr->setSectionResizeMode (0, QHeaderView::Stretch);
+}
+
+void ShoutcastListingWidget::activate (const QModelIndex & index)
+{
+ if (index.row () < 0)
+ return;
+
+ Playlist::temporary_playlist ().activate ();
+ auto entry = m_model->entry (index.row ());
+
+ AUDINFO ("Play radio entry %s %d.\n", (const char *) entry.title.toLocal8Bit (), entry.station_id);
+
+ StringBuf playlist_uri = str_printf ("https://yp.shoutcast.com/sbin/tunein-station.m3u?id=%d", entry.station_id);
+
+ Playlist::temporary_playlist ().insert_entry (-1, playlist_uri, Tuple (), true);
+}
+
+ShoutcastGenreWidget::ShoutcastGenreWidget (QWidget * parent) :
+ QTreeView (parent)
+{
+ m_model = new ShoutcastGenreModel ();
+
+ setModel (m_model);
+ setRootIsDecorated (false);
+
+ auto idx = m_model->index (0);
+ auto selection = selectionModel ();
+ selection->select (idx, QItemSelectionModel::Select);
+
+ auto hdr = header ();
+ hdr->setStretchLastSection (false);
+ hdr->setSectionResizeMode (QHeaderView::ResizeToContents);
+
+ int w = 0;
+ for (int i=0; i < m_model->columnCount (); i++)
+ {
+ resizeColumnToContents (i);
+ w += columnWidth (i);
+ }
+
+ setFixedWidth (w + verticalScrollBar ()->width () + 2);
+}
+
+ShoutcastTunerWidget::ShoutcastTunerWidget (QWidget * parent) :
+ QWidget (parent)
+{
+ m_layout = new QHBoxLayout (this);
+
+ m_genre = new ShoutcastGenreWidget ();
+ m_layout->addWidget (m_genre);
+
+ m_tuner = new ShoutcastListingWidget ();
+ m_layout->addWidget (m_tuner);
+
+ auto genre_selection_model = m_genre->selectionModel ();
+ connect(genre_selection_model, &QItemSelectionModel::selectionChanged, & (const QItemSelection &selected, const QItemSelection &) {
+ // this should never happen, but just to be sure...
+ if (! selected.indexes ().length ())
+ return;
+
+ auto idx = selected.indexes ().first ();
+
+ ShoutcastTunerModel *model = (ShoutcastTunerModel *) m_tuner->model ();
+ model->fetch_stations (String (ShoutcastTunerModel::genres idx.row ()));
+ });
+
+ connect(m_tuner->model (), &QAbstractItemModel::modelReset, & () {
+ auto model = m_tuner->model ();
+ m_tuner->scrollTo (model->index (0,0));
+ for (int i=1; i < model->columnCount (); i++)
+ m_tuner->resizeColumnToContents (i);
+ });
+}

audacious-plugins-4.4.1.tar.bz2/src/streamtuner/shoutcast-widget.h Added

@@ -0,0 +1,57 @@
+// Copyright (c) 2019 Ariadne Conill <ariadne@dereferenced.org>
+//
+// 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.
+//
+// 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.
+
+#ifndef STREAMTUNER_SHOUTCAST_WIDGET_H
+#define STREAMTUNER_SHOUTCAST_WIDGET_H
+
+#include <libaudqt/treeview.h>
+
+#include <QWidget>
+#include <QTabWidget>
+#include <QHBoxLayout>
+#include <QAbstractListModel>
+#include <QNetworkAccessManager>
+#include <QNetworkRequest>
+#include <QNetworkReply>
+#include <QJsonDocument>
+#include <QJsonArray>
+#include <QJsonObject>
+
+#include "shoutcast-model.h"
+
+class ShoutcastListingWidget : public audqt::TreeView {
+public:
+ ShoutcastListingWidget(QWidget * parent = nullptr);
+
+ void activate (const QModelIndex & index);
+
+private:
+ ShoutcastTunerModel *m_model;
+};
+
+class ShoutcastGenreWidget : public QTreeView {
+public:
+ ShoutcastGenreWidget(QWidget * parent = nullptr);
+
+private:
+ ShoutcastGenreModel *m_model;
+};
+
+class ShoutcastTunerWidget : public QWidget {
+public:
+ ShoutcastTunerWidget(QWidget * parent = nullptr);
+
+private:
+ ShoutcastListingWidget *m_tuner;
+ ShoutcastGenreWidget *m_genre;
+ QHBoxLayout *m_layout;
+};
+
+#endif

audacious-plugins-4.4.1.tar.bz2/src/streamtuner/streamtuner.cc Added

@@ -0,0 +1,88 @@
+// Copyright (c) 2019 Ariadne Conill <ariadne@dereferenced.org>
+//
+// 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.
+//
+// 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 <libaudcore/drct.h>
+#include <libaudcore/i18n.h>
+#include <libaudcore/plugin.h>
+#include <libaudcore/plugins.h>
+#include <libaudcore/preferences.h>
+#include <libaudcore/audstrings.h>
+#include <libaudcore/hook.h>
+#include <libaudcore/runtime.h>
+#include <libaudcore/index.h>
+#include <libaudcore/playlist.h>
+
+#include <libaudqt/treeview.h>
+
+#include <QWidget>
+#include <QTabWidget>
+#include <QAbstractListModel>
+#include <QNetworkAccessManager>
+#include <QNetworkRequest>
+#include <QNetworkReply>
+#include <QJsonDocument>
+#include <QJsonArray>
+#include <QJsonObject>
+
+#include "shoutcast-model.h"
+#include "shoutcast-widget.h"
+#include "icecast-widget.h"
+#include "ihr-widget.h"
+
+class StreamTunerWidget : public QTabWidget {
+public:
+ StreamTunerWidget(QWidget * parent = nullptr);
+
+private:
+ ShoutcastTunerWidget *m_shoutcast_tuner;
+ IcecastListingWidget *m_icecast_tuner;
+ IHRTunerWidget *m_ihr_tuner;
+};
+
+StreamTunerWidget::StreamTunerWidget(QWidget *parent) :
+ QTabWidget(parent)
+{
+ setDocumentMode (true);
+ setTabPosition (QTabWidget::TabPosition::South);
+
+ m_shoutcast_tuner = new ShoutcastTunerWidget (this);
+ m_icecast_tuner = new IcecastListingWidget (this);
+ m_ihr_tuner = new IHRTunerWidget (this);
+
+ addTab (m_shoutcast_tuner, _("Shoutcast"));
+ addTab (m_icecast_tuner, _("Icecast"));
+ addTab (m_ihr_tuner, "iHeartRadio");
+
+ tabBar ()->setAutoHide (false);
+}
+
+// plugin glue
+
+class StreamTunerPlugin : public GeneralPlugin {
+public:
+ static constexpr PluginInfo info = {
+ N_("Stream Tuner"),
+ PACKAGE,
+ nullptr,
+ nullptr,
+ PluginQtOnly
+ };
+
+ constexpr StreamTunerPlugin () : GeneralPlugin (info, false) { }
+
+ void * get_qt_widget ();
+};
+
+EXPORT StreamTunerPlugin aud_plugin_instance;
+
+void * StreamTunerPlugin::get_qt_widget ()
+{
+ return new StreamTunerWidget ();
+}

audacious-plugins-4.4.1.tar.bz2/src/tonegen/meson.build Added

audacious-plugins-3.6.2-gtk3.tar.bz2/src/tonegen/tonegen.cc -> audacious-plugins-4.4.1.tar.bz2/src/tonegen/tonegen.cc Changed

@@ -47,13 +47,11 @@
 about
 };
 
- static constexpr auto iinfo = InputInfo()
- .with_schemes(schemes);
-
- constexpr ToneGen() : InputPlugin(info, iinfo) {}
+ constexpr ToneGen() : InputPlugin(info, InputInfo()
+ .with_schemes(schemes)) {}
 
 bool is_our_file(const char *filename, VFSFile &file);
- Tuple read_tuple(const char *filename, VFSFile &file);
+ bool read_tag(const char *filename, VFSFile &file, Tuple &tuple, Index<char> *image);
 bool play(const char *filename, VFSFile &file);
 };
 
@@ -93,7 +91,7 @@
 
 auto title = str_printf(_("%s %.1f Hz"), _("Tone Generator: "), freqs0);
 for (int i = 1; i < freqs.len(); i++)
- title.combine(str_printf(";%.1f Hz", freqsi));
+ str_append_printf(title, ";%.1f Hz", freqsi);
 
 return title;
 }
@@ -148,12 +146,15 @@
 return true;
 }
 
-Tuple ToneGen::read_tuple(const char *filename, VFSFile &file)
+bool ToneGen::read_tag(const char *filename, VFSFile &file, Tuple &tuple, Index<char> *image)
 {
- Tuple tuple;
- tuple.set_filename(filename);
- tuple.set_str(Tuple::Title, tone_title(filename));
- return tuple;
+ StringBuf title = tone_title(filename);
+ if (!title)
+ return false;
+
+ tuple.set_str(Tuple::Title, title);
+ tuple.set_int(Tuple::Channels, 1);
+ return true;
 }
 
 const char ToneGen::about =

audacious-plugins-4.4.1.tar.bz2/src/ui-common Added

audacious-plugins-4.4.1.tar.bz2/src/ui-common/dialogs-qt.cc Added

@@ -0,0 +1,96 @@
+/*
+ * dialogs-qt.cc
+ * Copyright 2014 John Lindgren and Michał Lipski
+ *
+ * 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 "dialogs-qt.h"
+
+#include <libaudcore/i18n.h>
+#include <libaudqt/libaudqt.h>
+#include <QAbstractButton>
+
+static QMessageBox * create_message_box (QMessageBox::Icon icon,
+ const QString & title, const QString & message, QWidget * parent)
+{
+ auto msgbox = new QMessageBox (icon, title, message, QMessageBox::Close, parent);
+ msgbox->setAttribute (Qt::WA_DeleteOnClose);
+ msgbox->setTextInteractionFlags (Qt::TextSelectableByMouse);
+ msgbox->button (QMessageBox::Close)->setText (audqt::translate_str (N_("_Close")));
+ return msgbox;
+}
+
+static void add_message (QMessageBox * msgbox, QString message)
+{
+ QString old = msgbox->text ();
+ if (old.count (QChar::LineFeed) >= 9)
+ message = _("\n(Further messages have been hidden.)");
+ if (! old.contains (message))
+ msgbox->setText (old + QChar::LineFeed + message);
+}
+
+void DialogWindows::create_progress ()
+{
+ if (! m_progress)
+ {
+ m_progress = new QMessageBox (m_parent);
+ m_progress->setAttribute (Qt::WA_DeleteOnClose);
+ m_progress->setIcon (QMessageBox::Information);
+ m_progress->setWindowTitle (_("Working ..."));
+ m_progress->setWindowRole ("progress");
+ m_progress->setWindowModality (Qt::WindowModal);
+ }
+}
+
+void DialogWindows::show_error (const char * message)
+{
+ if (m_error)
+ add_message (m_error, message);
+ else
+ m_error = create_message_box (QMessageBox::Critical, _("Error"), message, m_parent);
+
+ m_error->show ();
+}
+
+void DialogWindows::show_info (const char * message)
+{
+ if (m_info)
+ add_message (m_info, message);
+ else
+ m_info = create_message_box (QMessageBox::Information, _("Information"), message, m_parent);
+
+ m_info->show ();
+}
+
+void DialogWindows::show_progress (const char * message)
+{
+ create_progress ();
+ m_progress->setText (message);
+ m_progress->show ();
+}
+
+void DialogWindows::show_progress_2 (const char * message)
+{
+ create_progress ();
+ m_progress->setInformativeText (message);
+ m_progress->show ();
+}
+
+void DialogWindows::hide_progress ()
+{
+ if (m_progress)
+ m_progress->hide ();
+}

audacious-plugins-4.4.1.tar.bz2/src/ui-common/dialogs-qt.h Added

@@ -0,0 +1,55 @@
+/*
+ * dialogs-qt.h
+ * Copyright 2014 John Lindgren and Michał Lipski
+ *
+ * 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.
+ */
+
+#ifndef DIALOG_WINDOWS_H
+#define DIALOG_WINDOWS_H
+
+#include <libaudcore/hook.h>
+#include <QPointer>
+
+class QMessageBox;
+class QWidget;
+
+class DialogWindows
+{
+public:
+ DialogWindows (QWidget * parent) :
+ m_parent (parent) {}
+
+private:
+ QWidget * m_parent;
+ QPointer<QMessageBox> m_progress, m_info, m_error;
+
+ void create_progress ();
+ void show_error (const char * message);
+ void show_info (const char * message);
+ void show_progress (const char * message);
+ void show_progress_2 (const char * message);
+ void hide_progress ();
+
+ const HookReceiver<DialogWindows, const char *>
+ show_hook1 {"ui show progress", this, & DialogWindows::show_progress},
+ show_hook2 {"ui show progress 2", this, & DialogWindows::show_progress_2},
+ show_hook3 {"ui show error", this, & DialogWindows::show_error},
+ show_hook4 {"ui show info", this, & DialogWindows::show_info};
+ const HookReceiver<DialogWindows>
+ hide_hook {"ui hide progress", this, & DialogWindows::hide_progress};
+};
+
+#endif

audacious-plugins-4.4.1.tar.bz2/src/ui-common/menu-ops-gtk.cc Added

@@ -0,0 +1,149 @@
+/*
+ * menu-ops-gtk.cc
+ * Copyright 2016 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 "menu-ops.h"
+
+#include <string.h>
+#include <gtk/gtk.h>
+
+#include <libaudcore/audstrings.h>
+#include <libaudcore/i18n.h>
+#include <libaudcore/interface.h>
+#include <libaudcore/playlist.h>
+#include <libaudcore/vfs.h>
+#include <libaudgui/libaudgui.h>
+
+static void uri_get_func (GtkClipboard *, GtkSelectionData * sel, unsigned, void * data)
+ { gtk_selection_data_set_uris (sel, (char * *) data); }
+static void uri_clear_func (GtkClipboard *, void * data)
+ { g_strfreev ((char * *) data); }
+
+void pl_copy ()
+{
+ auto list = Playlist::active_playlist ();
+ int entries = list.n_entries ();
+ int selected = list.n_selected ();
+ int fetched = 0;
+
+ if (! selected)
+ return;
+
+ list.cache_selected ();
+
+ char * * uris = g_new (char *, selected + 1);
+
+ for (int i = 0; i < entries && fetched < selected; i ++)
+ {
+ if (list.entry_selected (i))
+ urisfetched ++ = g_strdup (list.entry_filename (i));
+ }
+
+ urisfetched = nullptr;
+
+ GtkTargetList * tlist = gtk_target_list_new (nullptr, 0);
+ gtk_target_list_add_uri_targets (tlist, 0);
+
+ GtkTargetEntry * targets; int n_targets;
+ targets = gtk_target_table_new_from_list (tlist, & n_targets);
+
+ gtk_clipboard_set_with_data (gtk_clipboard_get (GDK_SELECTION_CLIPBOARD),
+ targets, n_targets, uri_get_func, uri_clear_func, uris);
+
+ gtk_target_table_free (targets, n_targets);
+ gtk_target_list_unref (tlist);
+}
+
+void pl_cut ()
+{
+ pl_copy ();
+ pl_remove_selected ();
+}
+
+static void paste_to (Playlist list, int pos)
+{
+ char * * uris = gtk_clipboard_wait_for_uris (gtk_clipboard_get (GDK_SELECTION_CLIPBOARD));
+ if (! uris)
+ return;
+
+ Index<PlaylistAddItem> items;
+ for (int i = 0; urisi; i ++)
+ items.append (String (urisi));
+
+ list.insert_items (pos, std::move (items), false);
+ g_strfreev (uris);
+}
+
+void pl_paste ()
+{
+ auto list = Playlist::active_playlist ();
+ paste_to (list, list.get_focus ());
+}
+
+void pl_paste_end ()
+{
+ paste_to (Playlist::active_playlist (), -1);
+}
+
+void pl_song_info ()
+{
+ auto list = Playlist::active_playlist ();
+ int focus = list.get_focus ();
+ if (focus >= 0)
+ audgui_infowin_show (list, focus);
+}
+
+void pl_open_folder ()
+{
+ auto list = Playlist::active_playlist ();
+ int focus = list.get_focus ();
+
+ String filename = list.entry_filename (focus);
+ if (! filename)
+ return;
+
+ const char * slash = strrchr (filename, '/');
+ if (! slash)
+ return;
+
+ /* don't trim trailing slash, it may be important */
+ StringBuf folder = str_copy (filename, slash + 1 - filename);
+
+ /* check that it's really a folder so as to prevent opening random
+ * files from a malicious playlist */
+ if (! VFSFile::test_file (folder, VFS_IS_DIR))
+ {
+ aud_ui_show_error (str_printf
+ (_("%s does not appear to be a valid folder."), & filename0));
+ return;
+ }
+
+ GError * error = nullptr;
+
+#if GTK_CHECK_VERSION(3, 22, 0)
+ gtk_show_uri_on_window (nullptr, folder, GDK_CURRENT_TIME, & error);
+#else
+ gtk_show_uri (gdk_screen_get_default (), folder, GDK_CURRENT_TIME, & error);
+#endif
+
+ if (error)
+ {
+ aud_ui_show_error (error->message);
+ g_error_free (error);
+ }
+}

audacious-plugins-4.4.1.tar.bz2/src/ui-common/menu-ops-qt.cc Added

@@ -0,0 +1,118 @@
+/*
+ * menu-ops-qt.cc
+ * Copyright 2016 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 "menu-ops.h"
+
+#include <QApplication>
+#include <QClipboard>
+#include <QDesktopServices>
+#include <QMimeData>
+#include <QUrl>
+
+#include <libaudcore/audstrings.h>
+#include <libaudcore/i18n.h>
+#include <libaudcore/interface.h>
+#include <libaudcore/playlist.h>
+#include <libaudcore/vfs.h>
+#include <libaudqt/libaudqt.h>
+
+void pl_copy ()
+{
+ auto list = Playlist::active_playlist ();
+ int entries = list.n_entries ();
+
+ if (! list.n_selected ())
+ return;
+
+ list.cache_selected ();
+
+ QList<QUrl> urls;
+ for (int i = 0; i < entries; i ++)
+ {
+ if (list.entry_selected (i))
+ urls.append (QString (list.entry_filename (i)));
+ }
+
+ auto data = new QMimeData;
+ data->setUrls (urls);
+ QApplication::clipboard ()->setMimeData (data);
+}
+
+void pl_cut ()
+{
+ pl_copy ();
+ pl_remove_selected ();
+}
+
+static void paste_to (Playlist list, int pos)
+{
+ auto data = QApplication::clipboard ()->mimeData ();
+ if (! data->hasUrls ())
+ return;
+
+ Index<PlaylistAddItem> items;
+ for (auto & url : data->urls ())
+ items.append (String (url.toEncoded ()));
+
+ list.insert_items (pos, std::move (items), false);
+}
+
+void pl_paste ()
+{
+ auto list = Playlist::active_playlist ();
+ paste_to (list, list.get_focus ());
+}
+
+void pl_paste_end ()
+{
+ paste_to (Playlist::active_playlist (), -1);
+}
+
+void pl_song_info ()
+{
+ audqt::infowin_show_selected (Playlist::active_playlist ());
+}
+
+void pl_open_folder ()
+{
+ auto list = Playlist::active_playlist ();
+ int focus = list.get_focus ();
+
+ String filename = list.entry_filename (focus);
+ if (! filename)
+ return;
+
+ const char * slash = strrchr (filename, '/');
+ if (! slash)
+ return;
+
+ /* don't trim trailing slash, it may be important */
+ StringBuf folder = str_copy (filename, slash + 1 - filename);
+
+ /* check that it's really a folder so as to prevent opening random
+ * files from a malicious playlist */
+ if (! VFSFile::test_file (folder, VFS_IS_DIR))
+ {
+ aud_ui_show_error (str_printf
+ (_("%s does not appear to be a valid folder."), & filename0));
+ return;
+ }
+
+ QDesktopServices::openUrl (QString (folder));
+}

audacious-plugins-4.4.1.tar.bz2/src/ui-common/menu-ops.cc Added

@@ -0,0 +1,153 @@
+/*
+ * menu-ops.cc
+ * Copyright 2016 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 <libaudcore/drct.h>
+#include <libaudcore/playlist.h>
+#include <libaudcore/runtime.h>
+
+#define ACTIVE Playlist::active_playlist ()
+
+void rm_dupes_title () { ACTIVE.remove_duplicates (Playlist::Title); }
+void rm_dupes_filename () { ACTIVE.remove_duplicates (Playlist::Filename); }
+void rm_dupes_path () { ACTIVE.remove_duplicates (Playlist::Path); }
+
+void sort_track () { ACTIVE.sort_entries (Playlist::Track); }
+void sort_title () { ACTIVE.sort_entries (Playlist::Title); }
+void sort_artist () { ACTIVE.sort_entries (Playlist::Artist); }
+void sort_album () { ACTIVE.sort_entries (Playlist::Album); }
+void sort_album_artist () { ACTIVE.sort_entries (Playlist::AlbumArtist); }
+void sort_date () { ACTIVE.sort_entries (Playlist::Date); }
+void sort_genre () { ACTIVE.sort_entries (Playlist::Genre); }
+void sort_length () { ACTIVE.sort_entries (Playlist::Length); }
+void sort_path () { ACTIVE.sort_entries (Playlist::Path); }
+void sort_filename () { ACTIVE.sort_entries (Playlist::Filename); }
+void sort_custom_title () { ACTIVE.sort_entries (Playlist::FormattedTitle); }
+void sort_comment () { ACTIVE.sort_entries (Playlist::Comment); }
+void sort_disc () { ACTIVE.sort_entries (Playlist::Disc); }
+void sort_reverse () { ACTIVE.reverse_order (); }
+void sort_random () { ACTIVE.randomize_order (); }
+
+void sort_sel_track () { ACTIVE.sort_selected (Playlist::Track); }
+void sort_sel_title () { ACTIVE.sort_selected (Playlist::Title); }
+void sort_sel_artist () { ACTIVE.sort_selected (Playlist::Artist); }
+void sort_sel_album () { ACTIVE.sort_selected (Playlist::Album); }
+void sort_sel_album_artist () { ACTIVE.sort_selected (Playlist::AlbumArtist); }
+void sort_sel_date () { ACTIVE.sort_selected (Playlist::Date); }
+void sort_sel_genre () { ACTIVE.sort_selected (Playlist::Genre); }
+void sort_sel_length () { ACTIVE.sort_selected (Playlist::Length); }
+void sort_sel_path () { ACTIVE.sort_selected (Playlist::Path); }
+void sort_sel_filename () { ACTIVE.sort_selected (Playlist::Filename); }
+void sort_sel_custom_title () { ACTIVE.sort_selected (Playlist::FormattedTitle); }
+void sort_sel_comment () { ACTIVE.sort_selected (Playlist::Comment); }
+void sort_sel_disc () { ACTIVE.sort_selected (Playlist::Disc); }
+void sort_sel_reverse () { ACTIVE.reverse_selected (); }
+void sort_sel_random () { ACTIVE.randomize_selected (); }
+
+void pl_prev ()
+{
+ int idx = ACTIVE.index ();
+ Playlist::by_index (idx > 0 ? idx - 1 : Playlist::n_playlists () - 1).activate ();
+}
+
+void pl_next ()
+{
+ int idx = ACTIVE.index ();
+ Playlist::by_index ((idx + 1) % Playlist::n_playlists ()).activate ();
+}
+
+void pl_new () { Playlist::new_playlist (); }
+void pl_play () { ACTIVE.start_playback (); }
+
+void pl_queue_clear () { ACTIVE.queue_remove_all (); }
+void pl_select_all () { ACTIVE.select_all (true); }
+void pl_select_none () { ACTIVE.select_all (false); }
+void pl_refresh () { ACTIVE.rescan_all (); }
+void pl_refresh_sel () { ACTIVE.rescan_selected (); }
+void pl_remove_all () { ACTIVE.remove_all_entries (); }
+void pl_remove_failed () { ACTIVE.remove_unavailable (); }
+void pl_remove_selected () { ACTIVE.remove_selected (); }
+
+void pl_queue_toggle ()
+{
+ auto list = ACTIVE;
+ int focus = list.get_focus ();
+ if (focus < 0)
+ return;
+
+ /* make sure focused row is selected */
+ if (! list.entry_selected (focus))
+ {
+ list.select_all (false);
+ list.select_entry (focus, true);
+ }
+
+ int at = list.queue_find_entry (focus);
+ if (at < 0)
+ list.queue_insert_selected (-1);
+ else
+ list.queue_remove_selected ();
+}
+
+void pl_select_invert ()
+{
+ auto list = ACTIVE;
+ int entries = list.n_entries ();
+
+ for (int entry = 0; entry < entries; entry ++)
+ list.select_entry (entry, ! list.entry_selected (entry));
+}
+
+void pl_remove_unselected ()
+{
+ pl_select_invert ();
+ pl_remove_selected ();
+ pl_select_all ();
+}
+
+void set_ab_repeat_a ()
+{
+ 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 ()
+{
+ 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 ()
+{
+ aud_drct_set_ab_repeat (-1, -1);
+}
+
+void volume_up ()
+ { aud_drct_set_volume_main (aud_drct_get_volume_main () + aud_get_int ("volume_delta")); }
+void volume_down ()
+ { aud_drct_set_volume_main (aud_drct_get_volume_main () - aud_get_int ("volume_delta")); }

audacious-plugins-4.4.1.tar.bz2/src/ui-common/menu-ops.h Added

@@ -0,0 +1,100 @@
+/*
+ * menu-ops.h
+ * Copyright 2016 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.
+ */
+
+#ifndef UI_COMMON_MENU_OPS_H
+#define UI_COMMON_MENU_OPS_H
+
+// remove duplicate playlist entries
+void rm_dupes_title ();
+void rm_dupes_filename ();
+void rm_dupes_path ();
+
+// sort entire playlist
+void sort_track ();
+void sort_title ();
+void sort_artist ();
+void sort_album ();
+void sort_album_artist ();
+void sort_date ();
+void sort_genre ();
+void sort_length ();
+void sort_path ();
+void sort_filename ();
+void sort_custom_title ();
+void sort_comment ();
+void sort_disc ();
+void sort_reverse ();
+void sort_random ();
+
+// sort selected playlist entries
+void sort_sel_track ();
+void sort_sel_title ();
+void sort_sel_artist ();
+void sort_sel_album ();
+void sort_sel_album_artist ();
+void sort_sel_date ();
+void sort_sel_genre ();
+void sort_sel_length ();
+void sort_sel_path ();
+void sort_sel_filename ();
+void sort_sel_custom_title ();
+void sort_sel_comment ();
+void sort_sel_disc ();
+void sort_sel_reverse ();
+void sort_sel_random ();
+
+// playlist switching
+void pl_prev ();
+void pl_next ();
+void pl_new ();
+void pl_play ();
+
+// playlist editing
+void pl_queue_clear ();
+void pl_queue_toggle ();
+void pl_select_all ();
+void pl_select_none ();
+void pl_select_invert ();
+void pl_refresh ();
+void pl_refresh_sel ();
+void pl_remove_all ();
+void pl_remove_failed ();
+void pl_remove_selected ();
+void pl_remove_unselected ();
+
+// clipboard
+void pl_copy ();
+void pl_cut ();
+void pl_paste ();
+void pl_paste_end ();
+
+// misc playlist
+void pl_song_info ();
+void pl_open_folder ();
+
+// A-B repeat
+void set_ab_repeat_a ();
+void set_ab_repeat_b ();
+void clear_ab_repeat ();
+
+// volume control
+void volume_up ();
+void volume_down ();
+
+#endif // UI_COMMON_MENU_OPS_H

audacious-plugins-4.4.1.tar.bz2/src/ui-common/qt-compat.h Added

@@ -0,0 +1,110 @@
+/*
+ * qt-compat.h
+ * Copyright 2023 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.
+ */
+
+#ifndef UI_COMMON_QT_COMPAT_H
+#define UI_COMMON_QT_COMPAT_H
+
+#include <QDragMoveEvent>
+#include <QDropEvent>
+#include <QEnterEvent>
+#include <QMouseEvent>
+#include <QtGlobal>
+
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+ #define USE_QT6
+#endif
+
+namespace QtCompat
+{
+
+static inline int x (QEnterEvent * event)
+{
+#ifdef USE_QT6
+ return event->position ().x ();
+#else
+ return event->x ();
+#endif
+}
+
+static inline int y (QEnterEvent * event)
+{
+#ifdef USE_QT6
+ return event->position ().y ();
+#else
+ return event->y ();
+#endif
+}
+
+static inline int x (QMouseEvent * event)
+{
+#ifdef USE_QT6
+ return event->position ().x ();
+#else
+ return event->x ();
+#endif
+}
+
+static inline int y (QMouseEvent * event)
+{
+#ifdef USE_QT6
+ return event->position ().y ();
+#else
+ return event->y ();
+#endif
+}
+
+static inline int globalX (QMouseEvent * event)
+{
+#ifdef USE_QT6
+ return event->globalPosition ().x ();
+#else
+ return event->globalX ();
+#endif
+}
+
+static inline int globalY (QMouseEvent * event)
+{
+#ifdef USE_QT6
+ return event->globalPosition ().y ();
+#else
+ return event->globalY ();
+#endif
+}
+
+static inline QPoint pos (QDragMoveEvent * event)
+{
+#ifdef USE_QT6
+ return event->position ().toPoint ();
+#else
+ return event->pos ();
+#endif
+}
+
+static inline QPoint pos (QDropEvent * event)
+{
+#ifdef USE_QT6
+ return event->position ().toPoint ();
+#else
+ return event->pos ();
+#endif
+}
+
+} /* namespace QtCompat */
+
+#endif

audacious-plugins-4.4.1.tar.bz2/src/voice_removal/meson.build Added

audacious-plugins-4.4.1.tar.bz2/src/vorbis/meson.build Added

audacious-plugins-3.6.2-gtk3.tar.bz2/src/vorbis/vcedit.cc -> audacious-plugins-4.4.1.tar.bz2/src/vorbis/vcedit.cc Changed

@@ -3,11 +3,10 @@
 *
 * (c) 2000-2001 Michael Smith <msmith@labyrinth.net.au>
 *
- *
 * Comment editing backend, suitable for use by nice frontend interfaces.
 *
+ * Somewhat cleaned up for C++ by John Lindgren, 2015.
 */
-#include <glib.h>
 #include <stdlib.h>
 #include <string.h>
 #include <ogg/ogg.h>
@@ -17,70 +16,35 @@
 
 #define CHUNKSIZE 4096
 
-vcedit_state *
-vcedit_new_state(void)
-{
- return g_new0(vcedit_state, 1);
-}
-
-const char *
-vcedit_error(vcedit_state * state)
-{
- return state->lasterror;
-}
-
-vorbis_comment *
-vcedit_comments(vcedit_state * state)
-{
- return state->vc;
-}
-
-static void
-vcedit_clear_internals(vcedit_state * state)
+VCEdit::VCEdit()
 {
- if (state->vc) {
- vorbis_comment_clear(state->vc);
- g_free(state->vc);
- state->vc = nullptr;
- }
- if (state->os) {
- ogg_stream_clear(state->os);
- g_free(state->os);
- state->os = nullptr;
- }
- if (state->oy) {
- ogg_sync_clear(state->oy);
- g_free(state->oy);
- state->oy = nullptr;
- }
- if (state->vendor) {
- g_free(state->vendor);
- state->vendor = nullptr;
- }
+ ogg_sync_init(&oy);
+ ogg_stream_init(&os, 0);
+ vorbis_comment_init(&vc);
+ vorbis_info_init(&vi);
 }
 
-void
-vcedit_clear(vcedit_state * state)
+VCEdit::~VCEdit()
 {
- if (state) {
- vcedit_clear_internals(state);
- g_free(state);
- }
+ ogg_sync_clear(&oy);
+ ogg_stream_clear(&os);
+ vorbis_comment_clear(&vc);
+ vorbis_info_clear(&vi);
 }
 
 /* Next two functions pulled straight from libvorbis, apart from one change
 * - we don't want to overwrite the vendor string.
 */
 static void
-_v_writestring(oggpack_buffer * o, const char *s, int len)
+_v_writestring(oggpack_buffer *o, const char *s, int len)
 {
 while (len--) {
 oggpack_write(o, *s++, 8);
 }
 }
 
-static int
-_commentheader_out(vorbis_comment * vc, char *vendor, ogg_packet * op)
+static void
+_commentheader_out(vorbis_comment *vc, const char *vendor, ogg_packet *op)
 {
 oggpack_buffer opb;
 
@@ -118,141 +82,113 @@
 op->b_o_s = 0;
 op->e_o_s = 0;
 op->granulepos = 0;
-
- return 0;
 }
 
-static int
-_blocksize(vcedit_state * s, ogg_packet * p)
+int VCEdit::blocksize(ogg_packet *p)
 {
- int size = vorbis_packet_blocksize(&s->vi, p);
- int ret = (size + s->prevW) / 4;
+ int size = vorbis_packet_blocksize(&vi, p);
+ int ret = (size + prevW) / 4;
 
- if (!s->prevW) {
- s->prevW = size;
+ if (!prevW) {
+ prevW = size;
 return 0;
 }
 
- s->prevW = size;
+ prevW = size;
 return ret;
 }
 
-static int
-_fetch_next_packet(vcedit_state * s, ogg_packet * p, ogg_page * page)
+bool VCEdit::fetch_next_packet(VFSFile &in, ogg_packet *p, ogg_page *page)
 {
- int result;
- char *buffer;
- int64_t bytes;
-
- result = ogg_stream_packetout(s->os, p);
-
- if (result > 0)
- return 1;
+ if (ogg_stream_packetout(&os, p) > 0)
+ return true;
 else {
- if (s->eosin)
- return 0;
- while (ogg_sync_pageout(s->oy, page) <= 0) {
- buffer = ogg_sync_buffer(s->oy, CHUNKSIZE);
- bytes = s->in->fread(buffer, 1, CHUNKSIZE);
- ogg_sync_wrote(s->oy, bytes);
+ if (eosin)
+ return false;
+ while (ogg_sync_pageout(&oy, page) <= 0) {
+ char *buffer = ogg_sync_buffer(&oy, CHUNKSIZE);
+ int64_t bytes = in.fread(buffer, 1, CHUNKSIZE);
+ ogg_sync_wrote(&oy, bytes);
 if (bytes == 0)
- return 0;
+ return false;
 }
 if (ogg_page_eos(page))
- s->eosin = 1;
- else if (ogg_page_serialno(page) != s->serial) {
- s->eosin = 1;
- s->extrapage = 1;
- return 0;
+ eosin = true;
+ else if (ogg_page_serialno(page) != serial) {
+ eosin = true;
+ extrapage = true;
+ return false;
 }
 
- ogg_stream_pagein(s->os, page);
- return _fetch_next_packet(s, p, page);
+ ogg_stream_pagein(&os, page);
+ return fetch_next_packet(in, p, page);
 }
 }
 
-
-int
-vcedit_open(vcedit_state * state, VFSFile & in)
+bool VCEdit::open(VFSFile &in)
 {
- char *buffer;
- int64_t bytes, i;
- ogg_packet *header;
 ogg_packet header_main;
 ogg_packet header_comments;
 ogg_packet header_codebooks;
 ogg_page og;
 
- state->in = & in;
-
- state->oy = g_new(ogg_sync_state, 1);
- ogg_sync_init(state->oy);
-
- buffer = ogg_sync_buffer(state->oy, CHUNKSIZE);
+ char *buffer = ogg_sync_buffer(&oy, CHUNKSIZE);
 
- bytes = state->in->fread(buffer, 1, CHUNKSIZE);
+ int64_t bytes = in.fread(buffer, 1, CHUNKSIZE);
 
- ogg_sync_wrote(state->oy, bytes);
+ ogg_sync_wrote(&oy, bytes);
 
- if (ogg_sync_pageout(state->oy, &og) != 1) {
+ if (ogg_sync_pageout(&oy, &og) != 1) {
 if (bytes < CHUNKSIZE)
- state->lasterror = "Input truncated or empty.";
+ lasterror = "Input truncated or empty.";
 else
- state->lasterror = "Input is not an Ogg bitstream.";
- goto err;
+ lasterror = "Input is not an Ogg bitstream.";
+ return false;
 }
 
- state->serial = ogg_page_serialno(&og);
+ serial = ogg_page_serialno(&og);
 
- state->os = g_new(ogg_stream_state, 1);
- ogg_stream_init(state->os, state->serial);
+ ogg_stream_reset_serialno(&os, serial);
 
- vorbis_info_init(&state->vi);
-
- state->vc = g_new(vorbis_comment, 1);
- vorbis_comment_init(state->vc);
-
- if (ogg_stream_pagein(state->os, &og) < 0) {
- state->lasterror = "Error reading first page of Ogg bitstream.";
- goto err;
+ if (ogg_stream_pagein(&os, &og) < 0) {
+ lasterror = "Error reading first page of Ogg bitstream.";
+ return false;
 }
 
- if (ogg_stream_packetout(state->os, &header_main) != 1) {
- state->lasterror = "Error reading initial header packet.";
- goto err;
+ if (ogg_stream_packetout(&os, &header_main) != 1) {
+ lasterror = "Error reading initial header packet.";
+ return false;
 }
 
- if (vorbis_synthesis_headerin(&state->vi, state->vc, &header_main) < 0) {
- state->lasterror = "Ogg bitstream does not contain vorbis data.";
- goto err;
+ if (vorbis_synthesis_headerin(&vi, &vc, &header_main) < 0) {
+ lasterror = "Ogg bitstream does not contain vorbis data.";
+ return false;
 }
 
- state->mainlen = header_main.bytes;
- state->mainbuf = g_new (unsigned char, state->mainlen);
- memcpy(state->mainbuf, header_main.packet, header_main.bytes);
+ mainbuf.clear();
+ mainbuf.insert(header_main.packet, 0, header_main.bytes);
 
- i = 0;
- header = &header_comments;
+ int i = 0;
+ ogg_packet *header = &header_comments;
 while (i < 2) {
 while (i < 2) {
- int result = ogg_sync_pageout(state->oy, &og);
+ int result = ogg_sync_pageout(&oy, &og);
 if (result == 0)
 break; /* Too little data so far */
 else if (result == 1) {
- ogg_stream_pagein(state->os, &og);
+ ogg_stream_pagein(&os, &og);
 while (i < 2) {
- result = ogg_stream_packetout(state->os, header);
+ result = ogg_stream_packetout(&os, header);
 if (result == 0)
 break;
 if (result == -1) {
- state->lasterror = "Corrupt secondary header.";
- goto err;
+ lasterror = "Corrupt secondary header.";
+ return false;
 }
- vorbis_synthesis_headerin(&state->vi, state->vc, header);
+ vorbis_synthesis_headerin(&vi, &vc, header);
 if (i == 1) {
- state->booklen = header->bytes;
- state->bookbuf = g_new (unsigned char, state->booklen);
- memcpy(state->bookbuf, header->packet, header->bytes);
+ bookbuf.clear();
+ bookbuf.insert(header->packet, 0, header->bytes);
 }
 i++;
 header = &header_codebooks;
@@ -260,37 +196,24 @@
 }
 }
 
- buffer = ogg_sync_buffer(state->oy, CHUNKSIZE);
- bytes = state->in->fread(buffer, 1, CHUNKSIZE);
+ buffer = ogg_sync_buffer(&oy, CHUNKSIZE);
+ bytes = in.fread(buffer, 1, CHUNKSIZE);
 if (bytes == 0 && i < 2) {
- state->lasterror = "EOF before end of vorbis headers.";
- goto err;
+ lasterror = "EOF before end of vorbis headers.";
+ return false;
 }
- ogg_sync_wrote(state->oy, bytes);
+ ogg_sync_wrote(&oy, bytes);
 }
 
 /* Copy the vendor tag */
- state->vendor = g_strdup (state->vc->vendor);
+ vendor = String(vc.vendor);
 
 /* Headers are done! */
- return 0;
-
- err:
- vcedit_clear_internals(state);
- return -1;
+ return true;
 }
 
-#if 0
-static void
-dump_state(vcedit_state * state)
+bool VCEdit::write(VFSFile &in, VFSFile &out)
 {
-}
-#endif
-
-int
-vcedit_write(vcedit_state * state, VFSFile & out)
-{
-
 ogg_stream_state streamout;
 ogg_packet header_main;
 ogg_packet header_comments;
@@ -299,45 +222,41 @@
 ogg_page ogout, ogin;
 ogg_packet op;
 ogg_int64_t granpos = 0;
- int result;
- char *buffer;
- int64_t bytes;
- int needflush = 0, needout = 0;
+ bool needflush = false;
+ bool needout = false;
 
- state->eosin = 0;
- state->extrapage = 0;
+ eosin = false;
+ extrapage = false;
 
- header_main.bytes = state->mainlen;
- header_main.packet = state->mainbuf;
+ header_main.bytes = mainbuf.len();
+ header_main.packet = mainbuf.begin();
 header_main.b_o_s = 1;
 header_main.e_o_s = 0;
 header_main.granulepos = 0;
 
- header_codebooks.bytes = state->booklen;
- header_codebooks.packet = state->bookbuf;
+ header_codebooks.bytes = bookbuf.len();
+ header_codebooks.packet = bookbuf.begin();
 header_codebooks.b_o_s = 0;
 header_codebooks.e_o_s = 0;
 header_codebooks.granulepos = 0;
 
- ogg_stream_init(&streamout, state->serial);
+ ogg_stream_init(&streamout, serial);
 
- _commentheader_out(state->vc, state->vendor, &header_comments);
+ _commentheader_out(&vc, vendor, &header_comments);
 
 ogg_stream_packetin(&streamout, &header_main);
 ogg_stream_packetin(&streamout, &header_comments);
 ogg_stream_packetin(&streamout, &header_codebooks);
 
- while ((result = ogg_stream_flush(&streamout, &ogout))) {
+ while (ogg_stream_flush(&streamout, &ogout)) {
 if (out.fwrite(ogout.header, 1, ogout.header_len) != ogout.header_len)
 goto cleanup;
 if (out.fwrite(ogout.body, 1, ogout.body_len) != ogout.body_len)
 goto cleanup;
 }
 
- while (_fetch_next_packet(state, &op, &ogin)) {
- int size;
- size = _blocksize(state, &op);
- granpos += size;
+ while (fetch_next_packet(in, &op, &ogin)) {
+ granpos += blocksize(&op);
 
 if (needflush) {
 if (ogg_stream_flush(&streamout, &ogout)) {
@@ -356,7 +275,8 @@
 }
 }
 
- needflush = needout = 0;
+ needflush = false;
+ needout = false;
 
 if (op.granulepos == -1) {
 op.granulepos = granpos;
@@ -367,11 +287,11 @@
 if (granpos > op.granulepos) {
 granpos = op.granulepos;
 ogg_stream_packetin(&streamout, &op);
- needflush = 1;
+ needflush = true;
 }
 else {
 ogg_stream_packetin(&streamout, &op);
- needout = 1;
+ needout = true;
 }
 }
 }
@@ -384,27 +304,23 @@
 goto cleanup;
 }
 
- /* FIXME: freeing this here probably leaks memory */
- /* Done with this, now */
- vorbis_info_clear(&state->vi);
-
- if (state->extrapage) {
+ if (extrapage) {
 if (out.fwrite(ogin.header, 1, ogin.header_len) != ogin.header_len)
 goto cleanup;
 if (out.fwrite(ogin.body, 1, ogin.body_len) != ogin.body_len)
 goto cleanup;
 }
 
- state->eosin = 0; /* clear it, because not all paths to here do */
- while (!state->eosin) { /* We reached eos, not eof */
+ eosin = false; /* clear it, because not all paths to here do */
+ while (!eosin) { /* We reached eos, not eof */
 /* We copy the rest of the stream (other logical streams)
 * through, a page at a time. */
 while (1) {
- result = ogg_sync_pageout(state->oy, &ogout);
+ int result = ogg_sync_pageout(&oy, &ogout);
 if (result == 0)
 break;
 if (result < 0)
- state->lasterror = "Corrupt or missing data, continuing...";
+ lasterror = "Corrupt or missing data, continuing...";
 else {
 /* Don't bother going through the rest, we can just
 * write the page out now */
@@ -414,30 +330,25 @@
 goto cleanup;
 }
 }
- buffer = ogg_sync_buffer(state->oy, CHUNKSIZE);
- bytes = state->in->fread(buffer, 1, CHUNKSIZE);
- ogg_sync_wrote(state->oy, bytes);
+ char *buffer = ogg_sync_buffer(&oy, CHUNKSIZE);
+ int64_t bytes = in.fread(buffer, 1, CHUNKSIZE);
+ ogg_sync_wrote(&oy, bytes);
 if (bytes == 0) {
- state->eosin = 1;
+ eosin = true;
 break;
 }
 }
 
-
 cleanup:
 ogg_stream_clear(&streamout);
 ogg_packet_clear(&header_comments);
 
- g_free(state->mainbuf);
- g_free(state->bookbuf);
-
- vcedit_clear_internals(state);
- if (!state->eosin) {
- state->lasterror =
+ if (!eosin) {
+ lasterror =
 "Error writing stream to output. "
 "Output stream may be corrupted or truncated.";
- return -1;
+ return false;
 }
 
- return 0;
+ return true;
 }

audacious-plugins-3.6.2-gtk3.tar.bz2/src/vorbis/vcedit.h -> audacious-plugins-4.4.1.tar.bz2/src/vorbis/vcedit.h Changed

@@ -12,34 +12,41 @@
 
 #include <ogg/ogg.h>
 #include <vorbis/codec.h>
-#include <libaudcore/plugin.h>
-
-typedef struct {
-	ogg_sync_state	 *oy;
-	ogg_stream_state *os;
-
-	vorbis_comment	 *vc;
-	vorbis_info vi;
-
-	VFSFile		 *in;
-	long		 serial;
-	unsigned char	 *mainbuf;
-	unsigned char	 *bookbuf;
-	int		 mainlen;
-	int		 booklen;
-	const char 	 *lasterror;
-	char *vendor;
-	int prevW;
-	int extrapage;
-	int eosin;
-} vcedit_state;
-
-extern vcedit_state *vcedit_new_state(void);
-extern void vcedit_clear(vcedit_state *state);
-extern vorbis_comment *vcedit_comments(vcedit_state *state);
-extern int vcedit_open(vcedit_state *state, VFSFile &in);
-extern int vcedit_write(vcedit_state *state, VFSFile &out);
-extern const char *vcedit_error(vcedit_state *state);
+#include <libaudcore/vfs.h>
+
+class VCEdit
+{
+public:
+ vorbis_comment vc;
+ const char *lasterror = nullptr;
+
+ VCEdit();
+ ~VCEdit();
+
+ VCEdit(const VCEdit&) = delete;
+ VCEdit& operator=(const VCEdit&) = delete;
+
+ bool open(VFSFile &in);
+ bool write(VFSFile &in, VFSFile &out);
+
+private:
+ ogg_sync_state oy;
+ ogg_stream_state os;
+ vorbis_info vi;
+
+ long serial = 0;
+ int prevW = 0;
+ bool extrapage = false;
+ bool eosin = false;
+
+ String vendor;
+
+ Index<unsigned char> mainbuf;
+ Index<unsigned char> bookbuf;
+
+ int blocksize(ogg_packet *p);
+ bool fetch_next_packet(VFSFile &in, ogg_packet *p, ogg_page *page);
+};
 
 #endif /* __VCEDIT_H */

audacious-plugins-3.6.2-gtk3.tar.bz2/src/vorbis/vcupdate.cc -> audacious-plugins-4.4.1.tar.bz2/src/vorbis/vcupdate.cc Changed

@@ -27,20 +27,14 @@
 #include <string.h>
 #include <unistd.h>
 
-#include <glib.h>
-#include <glib/gstdio.h>
-
 #include <libaudcore/audstrings.h>
 #include <libaudcore/i18n.h>
 #include <libaudcore/multihash.h>
-#include <libaudcore/plugin.h>
 #include <libaudcore/runtime.h>
 
 #include "vorbis.h"
 #include "vcedit.h"
 
-static bool write_and_pivot_files(vcedit_state * state);
-
 typedef SimpleHash<String, String> Dictionary;
 
 static Dictionary dictionary_from_vorbis_comment (vorbis_comment * vc)
@@ -49,33 +43,24 @@
 
 for (int i = 0; i < vc->comments; i ++)
 {
- char **frags;
-
- AUDDBG("%s\n", vc->user_commentsi);
- frags = g_strsplit(vc->user_commentsi, "=", 2);
+ const char * s = vc->user_commentsi;
+ AUDDBG("%s\n", s);
 
- if (frags0 && frags1)
- {
- char * key = g_ascii_strdown (frags0, -1);
- dict.add (String (key), String (frags1));
- g_free (key);
- }
-
- g_strfreev(frags); /* Don't use g_free() for string lists! --eugene */
+ const char * eq = strchr (s, '=');
+ if (eq && eq > s && eq1)
+ dict.add (String (str_toupper (str_copy (s, eq - s))), String (eq + 1));
 }
 
 return dict;
 }
 
-static void add_tag_cb (const String & key, String & field, void * vc)
-{
- vorbis_comment_add_tag ((vorbis_comment *) vc, key, field);
-}
-
 static void dictionary_to_vorbis_comment (vorbis_comment * vc, Dictionary & dict)
 {
- vorbis_comment_clear(vc);
- dict.iterate (add_tag_cb, vc);
+ vorbis_comment_clear (vc);
+
+ dict.iterate (vc (const String & key, String & field) {
+ vorbis_comment_add_tag (vc, key, field);
+ });
 }
 
 static void insert_str_tuple_field_to_dictionary (const Tuple & tuple,
@@ -102,109 +87,39 @@
 
 bool VorbisPlugin::write_tuple (const char * filename, VFSFile & file, const Tuple & tuple)
 {
- vcedit_state *state;
- vorbis_comment *comment;
- bool ret;
-
- state = vcedit_new_state();
-
- if(vcedit_open(state, file) < 0) {
- vcedit_clear(state);
- return false;
- }
-
- comment = vcedit_comments(state);
- Dictionary dict = dictionary_from_vorbis_comment (comment);
-
- insert_str_tuple_field_to_dictionary(tuple, Tuple::Title, dict, "title");
- insert_str_tuple_field_to_dictionary(tuple, Tuple::Artist, dict, "artist");
- insert_str_tuple_field_to_dictionary(tuple, Tuple::Album, dict, "album");
- insert_str_tuple_field_to_dictionary(tuple, Tuple::Comment, dict, "comment");
- insert_str_tuple_field_to_dictionary(tuple, Tuple::Genre, dict, "genre");
-
- insert_int_tuple_field_to_dictionary(tuple, Tuple::Year, dict, "date");
- insert_int_tuple_field_to_dictionary(tuple, Tuple::Track, dict, "tracknumber");
-
- dictionary_to_vorbis_comment(comment, dict);
-
- ret = write_and_pivot_files(state);
-
- vcedit_clear(state);
-
- return ret;
-}
-
-#define COPY_BUF 65536
-
-bool copy_vfs (VFSFile & in, VFSFile & out)
-{
- if (in.fseek (0, VFS_SEEK_SET) < 0 || out.fseek (0, VFS_SEEK_SET) < 0)
+ VCEdit edit;
+ if (! edit.open (file))
 return false;
 
- char * buffer = g_new (char, COPY_BUF);
- int64_t size = 0, readed;
-
- while ((readed = in.fread (buffer, 1, COPY_BUF)) > 0)
- {
- if (out.fwrite (buffer, 1, readed) != readed)
- goto FAILED;
-
- size += readed;
- }
-
- if (out.ftruncate (size) < 0)
- goto FAILED;
-
- g_free (buffer);
- return true;
-
-FAILED:
- g_free (buffer);
- return false;
-}
-
-#undef COPY_BUF
+ Dictionary dict = dictionary_from_vorbis_comment (& edit.vc);
 
-bool write_and_pivot_files (vcedit_state * state)
-{
- char * temp;
- GError * error;
- int handle = g_file_open_tmp (nullptr, & temp, & error);
+ insert_str_tuple_field_to_dictionary (tuple, Tuple::Title, dict, "TITLE");
+ insert_str_tuple_field_to_dictionary (tuple, Tuple::Artist, dict, "ARTIST");
+ insert_str_tuple_field_to_dictionary (tuple, Tuple::Album, dict, "ALBUM");
+ insert_str_tuple_field_to_dictionary (tuple, Tuple::AlbumArtist, dict, "ALBUMARTIST");
+ insert_str_tuple_field_to_dictionary (tuple, Tuple::Comment, dict, "COMMENT");
+ insert_str_tuple_field_to_dictionary (tuple, Tuple::Genre, dict, "GENRE");
+ insert_str_tuple_field_to_dictionary (tuple, Tuple::Description, dict, "DESCRIPTION");
+ insert_str_tuple_field_to_dictionary (tuple, Tuple::MusicBrainzID, dict, "musicbrainz_trackid");
 
- if (handle < 0)
- {
- AUDERR ("Failed to create temp file: %s.\n", error->message);
- g_error_free (error);
- return false;
- }
+ insert_int_tuple_field_to_dictionary (tuple, Tuple::Year, dict, "DATE");
+ insert_int_tuple_field_to_dictionary (tuple, Tuple::Track, dict, "TRACKNUMBER");
+ insert_int_tuple_field_to_dictionary (tuple, Tuple::Disc, dict, "DISCNUMBER");
 
- close (handle);
+ insert_str_tuple_field_to_dictionary (tuple, Tuple::Publisher, dict, "publisher");
+ insert_str_tuple_field_to_dictionary (tuple, Tuple::CatalogNum, dict, "CATALOGNUMBER");
 
- StringBuf temp_uri = filename_to_uri (temp);
- g_return_val_if_fail (temp_uri, false);
- VFSFile temp_vfs (temp_uri, "r+");
- g_return_val_if_fail (temp_vfs, false);
+ dictionary_to_vorbis_comment (& edit.vc, dict);
 
- if (vcedit_write (state, temp_vfs) < 0)
- {
- AUDERR ("Tag update failed: %s.\n", state->lasterror);
- g_free (temp);
+ auto temp_vfs = VFSFile::tmpfile ();
+ if (! temp_vfs)
 return false;
- }
 
- if (! copy_vfs (temp_vfs, * state->in))
+ if (! edit.write (file, temp_vfs))
 {
- AUDERR ("Failed to copy temp file. The temp file has not "
- "been deleted: %s.\n", temp);
- g_free (temp);
+ AUDERR ("Tag update failed: %s.\n", edit.lasterror);
 return false;
 }
 
- temp_vfs = VFSFile ();
-
- if (g_unlink (temp) < 0)
- AUDERR ("Failed to delete temp file: %s.\n", temp);
-
- g_free (temp);
- return true;
+ return file.replace_with (temp_vfs);
 }

audacious-plugins-3.6.2-gtk3.tar.bz2/src/vorbis/vorbis.cc -> audacious-plugins-4.4.1.tar.bz2/src/vorbis/vorbis.cc Changed

@@ -4,7 +4,7 @@
 * Copyright (C) 2007 William Pitcock <nenolod@sacredspiral.co.uk>
 * Copyright (C) 2008 Cristi Măgherușan <majeru@gentoo.ro>
 * Copyright (C) 2008 Eugene Zagidullin <e.asphyx@gmail.com>
- * Copyright (C) 2009-2011 Audacious Developers
+ * Copyright (C) 2009-2015 Audacious Developers
 *
 * ReplayGain processing Copyright (C) 2002 Gian-Carlo Pascutto <gcp@sjeng.org>
 *
@@ -34,16 +34,18 @@
 #include <vorbis/codec.h>
 #include <vorbis/vorbisfile.h>
 
+#define AUD_GLIB_INTEGRATION
 #define WANT_AUD_BSWAP
 #define WANT_VFS_STDIO_COMPAT
 #include <libaudcore/audstrings.h>
-#include <libaudcore/plugin.h>
 #include <libaudcore/runtime.h>
 
 #include "vorbis.h"
 
 EXPORT VorbisPlugin aud_plugin_instance;
 
+static Index<char> read_image_from_comment (const char * filename, vorbis_comment * comment);
+
 static size_t ovcb_read (void * buffer, size_t size, size_t count, void * file)
 {
 return ((VFSFile *) file)->fread (buffer, size, count);
@@ -130,119 +132,96 @@
 tuple.set_str (field, vorbis_comment_query (comment, key, 0));
 }
 
-static Tuple
-get_tuple_for_vorbisfile(OggVorbis_File * vorbisfile, const char *filename, bool stream)
-{
- Tuple tuple;
- int length = -1;
- vorbis_comment *comment = nullptr;
-
- tuple.set_filename(filename);
-
- if (! stream)
- length = ov_time_total (vorbisfile, -1) * 1000;
-
- /* associate with tuple */
- tuple.set_int (Tuple::Length, length);
-
- if ((comment = ov_comment(vorbisfile, -1)) != nullptr) {
- char *tmps;
- set_tuple_str(tuple, Tuple::Title, comment, "title");
- set_tuple_str(tuple, Tuple::Artist, comment, "artist");
- set_tuple_str(tuple, Tuple::Album, comment, "album");
- set_tuple_str(tuple, Tuple::Genre, comment, "genre");
- set_tuple_str(tuple, Tuple::Comment, comment, "comment");
-
- if ((tmps = vorbis_comment_query(comment, "tracknumber", 0)) != nullptr)
- tuple.set_int (Tuple::Track, atoi(tmps));
-
- if ((tmps = vorbis_comment_query (comment, "date", 0)) != nullptr)
- tuple.set_int (Tuple::Year, atoi (tmps));
- }
-
- vorbis_info * info = ov_info (vorbisfile, -1);
- tuple.set_format ("Ogg Vorbis", info->channels, info->rate, info->bitrate_nominal / 1000);
-
- tuple.set_str (Tuple::MIMEType, "application/ogg");
-
- return tuple;
-}
-
-static float atof_no_locale (const char * string)
+static void read_comment (vorbis_comment * comment, Tuple & tuple)
 {
- float result = 0;
- bool negative = false;
-
- if (* string == '+')
- string ++;
- else if (* string == '-')
- {
- negative = true;
- string ++;
- }
-
- while (* string >= '0' && * string <= '9')
- result = 10 * result + (* string ++ - '0');
-
- if (* string == '.')
- {
- float place = 0.1;
-
- string ++;
-
- while (* string >= '0' && * string <= '9')
- {
- result += (* string ++ - '0') * place;
- place *= 0.1;
- }
- }
-
- return negative ? -result : result;
+ const char * tmps;
+
+ set_tuple_str (tuple, Tuple::Title, comment, "TITLE");
+ set_tuple_str (tuple, Tuple::Artist, comment, "ARTIST");
+ set_tuple_str (tuple, Tuple::Album, comment, "ALBUM");
+ set_tuple_str (tuple, Tuple::AlbumArtist, comment, "ALBUMARTIST");
+ set_tuple_str (tuple, Tuple::Genre, comment, "GENRE");
+ set_tuple_str (tuple, Tuple::Comment, comment, "COMMENT");
+ set_tuple_str (tuple, Tuple::Description, comment, "DESCRIPTION");
+ set_tuple_str (tuple, Tuple::MusicBrainzID, comment, "musicbrainz_trackid");
+ set_tuple_str (tuple, Tuple::Publisher, comment, "publisher");
+ set_tuple_str (tuple, Tuple::CatalogNum, comment, "CATALOGNUMBER");
+
+ if ((tmps = vorbis_comment_query (comment, "TRACKNUMBER", 0)))
+ tuple.set_int (Tuple::Track, atoi (tmps));
+ if ((tmps = vorbis_comment_query (comment, "DATE", 0)))
+ tuple.set_int (Tuple::Year, atoi (tmps));
+ if ((tmps = vorbis_comment_query (comment, "DISCNUMBER", 0)))
+ tuple.set_int (Tuple::Disc, atoi (tmps));
 }
 
 /* try to detect when metadata has changed */
-static bool vorbis_fetch_tuple (OggVorbis_File * vf, const char * filename, bool stream, Tuple & tuple)
+static bool update_tuple (OggVorbis_File * vf, Tuple & tuple)
 {
- String old_title = tuple.get_str (Tuple::Title);
 vorbis_comment * comment = ov_comment (vf, -1);
- const char * new_title = comment ? vorbis_comment_query (comment, "title", 0) : nullptr;
+ if (! comment)
+ return false;
+
+ String old_title = tuple.get_str (Tuple::Title);
+ const char * new_title = vorbis_comment_query (comment, "TITLE", 0);
 
 if (! new_title || (old_title && ! strcmp (old_title, new_title)))
 return false;
 
- tuple = get_tuple_for_vorbisfile (vf, filename, stream);
+ read_comment (comment, tuple);
 return true;
 }
 
-static bool vorbis_fetch_replaygain (OggVorbis_File * vf, ReplayGainInfo * rg_info)
+static bool update_replay_gain (OggVorbis_File * vf, ReplayGainInfo * rg_info)
 {
- vorbis_comment *comment;
- char *rg_gain, *rg_peak;
+ vorbis_comment * comment = ov_comment (vf, -1);
+ if (! comment)
+ return false;
 
- if (vf == nullptr || rg_info == nullptr || (comment = ov_comment(vf, -1)) == nullptr)
- {
- AUDDBG ("No replay gain info.\n");
+ const char * album_gain = vorbis_comment_query (comment, "REPLAYGAIN_ALBUM_GAIN", 0);
+ if (! album_gain) album_gain = vorbis_comment_query (comment, "RG_AUDIOPHILE", 0); /* Old */
+ const char * track_gain = vorbis_comment_query (comment, "REPLAYGAIN_TRACK_GAIN", 0);
+ if (! track_gain) track_gain = vorbis_comment_query (comment, "RG_RADIO", 0); /* Old */
+
+ /* stop if we have no gain values */
+ if (! album_gain && ! track_gain)
 return false;
- }
 
- rg_gain = vorbis_comment_query(comment, "replaygain_album_gain", 0);
- if (!rg_gain) rg_gain = vorbis_comment_query(comment, "rg_audiophile", 0); /* Old */
- rg_info->album_gain = (rg_gain != nullptr) ? atof_no_locale (rg_gain) : 0.0;
- AUDDBG ("Album gain: %s (%f)\n", rg_gain, rg_info->album_gain);
+ /* fill in missing values if we can */
+ if (! album_gain)
+ album_gain = track_gain;
+ if (! track_gain)
+ track_gain = album_gain;
 
- rg_gain = vorbis_comment_query(comment, "replaygain_track_gain", 0);
- if (!rg_gain) rg_gain = vorbis_comment_query(comment, "rg_radio", 0); /* Old */
- rg_info->track_gain = (rg_gain != nullptr) ? atof_no_locale (rg_gain) : 0.0;
- AUDDBG ("Track gain: %s (%f)\n", rg_gain, rg_info->track_gain);
+ rg_info->album_gain = str_to_double (album_gain);
+ rg_info->track_gain = str_to_double (track_gain);
 
- rg_peak = vorbis_comment_query(comment, "replaygain_album_peak", 0);
- rg_info->album_peak = rg_peak != nullptr ? atof_no_locale (rg_peak) : 0.0;
- AUDDBG ("Album peak: %s (%f)\n", rg_peak, rg_info->album_peak);
+ const char * album_peak = vorbis_comment_query (comment, "REPLAYGAIN_ALBUM_PEAK", 0);
+ const char * track_peak = vorbis_comment_query (comment, "REPLAYGAIN_TRACK_PEAK", 0);
+ if (! track_peak) track_peak = vorbis_comment_query (comment, "RG_PEAK", 0); /* Old */
 
- rg_peak = vorbis_comment_query(comment, "replaygain_track_peak", 0);
- if (!rg_peak) rg_peak = vorbis_comment_query(comment, "rg_peak", 0); /* Old */
- rg_info->track_peak = rg_peak != nullptr ? atof_no_locale (rg_peak) : 0.0;
- AUDDBG ("Track peak: %s (%f)\n", rg_peak, rg_info->track_peak);
+ if (! album_peak && ! track_peak)
+ {
+ /* okay, we have gain but no peak values */
+ rg_info->album_peak = 0;
+ rg_info->track_peak = 0;
+ }
+ else
+ {
+ /* fill in missing values if we can */
+ if (! album_peak)
+ album_peak = track_peak;
+ if (! track_peak)
+ track_peak = album_peak;
+
+ rg_info->album_peak = str_to_double (album_peak);
+ rg_info->track_peak = str_to_double (track_peak);
+ }
+
+ AUDDBG ("Album gain: %s (%f)\n", album_gain, rg_info->album_gain);
+ AUDDBG ("Track gain: %s (%f)\n", track_gain, rg_info->track_gain);
+ AUDDBG ("Album peak: %s (%f)\n", album_peak, rg_info->album_peak);
+ AUDDBG ("Track peak: %s (%f)\n", track_peak, rg_info->track_peak);
 
 return true;
 }
@@ -267,7 +246,7 @@
 vorbis_info *vi;
 OggVorbis_File vf;
 int last_section = -1;
- Tuple tuple;
+ Tuple tuple = get_playback_tuple ();
 ReplayGainInfo rg_info;
 float pcmoutPCM_BUFSIZE*sizeof(float), **pcm;
 int bytes, channels, samplerate, br;
@@ -292,10 +271,10 @@
 
 set_stream_bitrate (br);
 
- if (vorbis_fetch_tuple (& vf, filename, stream, tuple))
+ if (update_tuple (& vf, tuple))
 set_playback_tuple (tuple.ref ());
 
- if (vorbis_fetch_replaygain (& vf, & rg_info))
+ if (update_replay_gain (& vf, & rg_info))
 set_replay_gain (rg_info);
 
 open_audio (FMT_FLOAT, samplerate, channels);
@@ -328,7 +307,7 @@
 
 bytes = vorbis_interleave_buffer (pcm, bytes, channels, pcmout);
 
- if (vorbis_fetch_tuple (& vf, filename, stream, tuple))
+ if (update_tuple (& vf, tuple))
 set_playback_tuple (tuple.ref ());
 
 if (current_section != last_section)
@@ -345,7 +324,7 @@
 samplerate = vi->rate;
 channels = vi->channels;
 
- if (vorbis_fetch_replaygain (& vf, & rg_info))
+ if (update_replay_gain (& vf, & rg_info))
 set_replay_gain (rg_info);
 
 open_audio (FMT_FLOAT, vi->rate, vi->channels);
@@ -367,9 +346,10 @@
 return ! error;
 }
 
-Tuple VorbisPlugin::read_tuple (const char * filename, VFSFile & file)
+bool VorbisPlugin::read_tag (const char * filename, VFSFile & file,
+ Tuple & tuple, Index<char> * image)
 {
- OggVorbis_File vfile; /* avoid thread interaction */
+ OggVorbis_File vfile;
 
 bool stream = (file.fsize () < 0);
 
@@ -380,29 +360,29 @@
 */
 if (ov_open_callbacks (& file, & vfile, nullptr, 0, stream ?
 vorbis_callbacks_stream : vorbis_callbacks) < 0)
- return Tuple ();
+ return false;
 
- Tuple tuple = get_tuple_for_vorbisfile(&vfile, filename, stream);
- ov_clear(&vfile);
- return tuple;
-}
+ vorbis_info * info = ov_info (& vfile, -1);
+ vorbis_comment * comment = ov_comment (& vfile, -1);
 
-Index<char> VorbisPlugin::read_image (const char * filename, VFSFile & file)
-{
- Index<char> data;
+ tuple.set_format ("Ogg Vorbis", info->channels, info->rate, info->bitrate_nominal / 1000);
 
- OggVorbis_File vfile;
+ if (! stream)
+ tuple.set_int (Tuple::Length, ov_time_total (& vfile, -1) * 1000);
 
- bool stream = (file.fsize () < 0);
+ if (comment)
+ read_comment (comment, tuple);
 
- if (ov_open_callbacks (& file, & vfile, nullptr, 0, stream ?
- vorbis_callbacks_stream : vorbis_callbacks) < 0)
- return data;
+ if (image && comment)
+ * image = read_image_from_comment (filename, comment);
 
- vorbis_comment * comment = ov_comment (& vfile, -1);
- if (! comment)
- goto ERR;
+ ov_clear (& vfile);
+ return true;
+}
 
+static Index<char> read_image_from_comment (const char * filename, vorbis_comment * comment)
+{
+ Index<char> data;
 const char * s;
 
 if ((s = vorbis_comment_query (comment, "METADATA_BLOCK_PICTURE", 0)))
@@ -410,7 +390,7 @@
 unsigned mime_length, desc_length, length;
 
 size_t length2;
- unsigned char * data2 = g_base64_decode (s, & length2);
+ CharPtr data2 ((char *) g_base64_decode (s, & length2));
 if (! data2 || length2 < 8)
 goto PARSE_ERR;
 
@@ -426,38 +406,26 @@
 if (length2 < 8 + mime_length + 4 + desc_length + 20 + length)
 goto PARSE_ERR;
 
- data.insert ((char *) data2 + 8 + mime_length + 4 + desc_length + 20, 0, length);
-
- g_free (data2);
- ov_clear (& vfile);
+ data.insert (data2 + 8 + mime_length + 4 + desc_length + 20, 0, length);
 return data;
 
 PARSE_ERR:
 AUDERR ("Error parsing METADATA_BLOCK_PICTURE in %s.\n", filename);
- g_free (data2);
 }
 
 if ((s = vorbis_comment_query (comment, "COVERART", 0)))
 {
 size_t length2;
- void * data2 = g_base64_decode (s, & length2);
+ CharPtr data2 ((char *) g_base64_decode (s, & length2));
 
- if (! data2 || ! length2)
- {
+ if (data2 && length2)
+ data.insert (data2, 0, length2);
+ else
 AUDERR ("Error parsing COVERART in %s.\n", filename);
- g_free (data2);
- goto ERR;
- }
 
- data.insert ((const char *) data2, 0, length2);
-
- g_free (data2);
- ov_clear (& vfile);
 return data;
 }
 
-ERR:
- ov_clear (& vfile);
 return data;
 }
 
@@ -478,4 +446,10 @@
 "Eugene Zagidullin <e.asphyx@gmail.com>");
 
 const char * const VorbisPlugin::exts = {"ogg", "ogm", "oga", nullptr};
-const char * const VorbisPlugin::mimes = {"application/ogg", nullptr};
+const char * const VorbisPlugin::mimes = {
+ "application/ogg",
+ "application/x-ogg",
+ "audio/ogg",
+ "audio/x-vorbis+ogg",
+ nullptr
+};

audacious-plugins-3.6.2-gtk3.tar.bz2/src/vorbis/vorbis.h -> audacious-plugins-4.4.1.tar.bz2/src/vorbis/vorbis.h Changed

audacious-plugins-3.6.2-gtk3.tar.bz2/src/vtx/Makefile -> audacious-plugins-4.4.1.tar.bz2/src/vtx/Makefile Changed

audacious-plugins-3.6.2-gtk3.tar.bz2/src/vtx/ayemu_vtxfile.h -> audacious-plugins-4.4.1.tar.bz2/src/vtx/ayemu_vtxfile.h Changed

audacious-plugins-3.6.2-gtk3.tar.bz2/src/vtx/info.cc -> audacious-plugins-4.4.1.tar.bz2/src/vtx/info.cc Changed

audacious-plugins-3.6.2-gtk3.tar.bz2/src/vtx/lh5dec.cc -> audacious-plugins-4.4.1.tar.bz2/src/vtx/lh5dec.cc Changed

audacious-plugins-4.4.1.tar.bz2/src/vtx/meson.build Added

audacious-plugins-3.6.2-gtk3.tar.bz2/src/vtx/vtx.cc -> audacious-plugins-4.4.1.tar.bz2/src/vtx/vtx.cc Changed

@@ -40,17 +40,17 @@
 about
 };
 
- static constexpr auto iinfo = InputInfo()
- .with_exts(exts);
-
- constexpr VTXPlugin() : InputPlugin(info, iinfo) {}
+ constexpr VTXPlugin() : InputPlugin(info, InputInfo()
+ .with_exts(exts)) {}
 
 bool is_our_file(const char *filename, VFSFile &file);
- Tuple read_tuple(const char *filename, VFSFile &file);
+ bool read_tag(const char *filename, VFSFile &file, Tuple &tuple, Index<char> *image);
 bool play(const char *filename, VFSFile &file);
 
+#ifdef USE_GTK
 bool file_info_box(const char *filename, VFSFile &file)
 { vtx_file_info(filename, file); return true; }
+#endif
 };
 
 EXPORT VTXPlugin aud_plugin_instance;
@@ -71,35 +71,29 @@
 return (!strcmp_nocase(buf, "ay", 2) || !strcmp_nocase(buf, "ym", 2));
 }
 
-Tuple vtx_get_song_tuple_from_vtx(const char * filename, ayemu_vtx_t * in)
+bool VTXPlugin::read_tag(const char *filename, VFSFile &file, Tuple &tuple, Index<char> *image)
 {
- Tuple tuple;
- tuple.set_filename (filename);
-
- tuple.set_str (Tuple::Artist, in->hdr.author);
- tuple.set_str (Tuple::Title, in->hdr.title);
+ ayemu_vtx_t tmp;
 
- tuple.set_int (Tuple::Length, in->hdr.regdata_size / 14 * 1000 / 50);
+ if (!tmp.read_header(file))
+ return false;
 
- tuple.set_str (Tuple::Genre, (in->hdr.chiptype == AYEMU_AY) ? "AY chiptunes" : "YM chiptunes");
- tuple.set_str (Tuple::Album, in->hdr.from);
+ tuple.set_str(Tuple::Artist, tmp.hdr.author);
+ tuple.set_str(Tuple::Title, tmp.hdr.title);
 
- tuple.set_str (Tuple::Quality, _("sequenced"));
- tuple.set_str (Tuple::Codec, in->hdr.tracker);
+ tuple.set_int(Tuple::Length, tmp.hdr.regdata_size / 14 * 1000 / 50);
 
- tuple.set_int (Tuple::Year, in->hdr.year);
+ tuple.set_str(Tuple::Genre, (tmp.hdr.chiptype == AYEMU_AY) ? "AY chiptunes" : "YM chiptunes");
+ tuple.set_str(Tuple::Album, tmp.hdr.from);
 
- return tuple;
-}
+ tuple.set_str(Tuple::Quality, _("sequenced"));
+ tuple.set_str(Tuple::Codec, tmp.hdr.tracker);
 
-Tuple VTXPlugin::read_tuple(const char *filename, VFSFile &file)
-{
- ayemu_vtx_t tmp;
+ tuple.set_int(Tuple::Year, tmp.hdr.year);
 
- if (tmp.read_header(file))
- return vtx_get_song_tuple_from_vtx(filename, &tmp);
+ tuple.set_int(Tuple::Channels, chans);
 
- return Tuple ();
+ return true;
 }
 
 bool VTXPlugin::play(const char *filename, VFSFile &file)

audacious-plugins-3.6.2-gtk3.tar.bz2/src/vtx/vtxfile.cc -> audacious-plugins-4.4.1.tar.bz2/src/vtx/vtxfile.cc Changed

audacious-plugins-4.4.1.tar.bz2/src/vumeter-qt Added

audacious-plugins-4.4.1.tar.bz2/src/vumeter-qt/Makefile Added

audacious-plugins-4.4.1.tar.bz2/src/vumeter-qt/meson.build Added

audacious-plugins-4.4.1.tar.bz2/src/vumeter-qt/vumeter_qt.cc Added

@@ -0,0 +1,102 @@
+/*
+ * Copyright (c) 2017-2019 Marc Sanchez Fauste.
+ *
+ * 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.
+ *
+ * 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.
+ */
+
+#include "vumeter_qt.h"
+#include "vumeter_qt_widget.h"
+
+#include <QPointer>
+#include <libaudcore/interface.h>
+#include <libaudcore/runtime.h>
+
+EXPORT VUMeterQt aud_plugin_instance;
+
+const char VUMeterQt::about =
+ N_("VU Meter Plugin for Audacious\n"
+ "Copyright 2017-2019 Marc Sánchez Fauste");
+
+const PreferencesWidget VUMeterQt::widgets = {
+ WidgetLabel (N_("VU Meter Settings")),
+ WidgetSpin (
+ N_("Peak hold time:"),
+ WidgetFloat ("vumeter", "peak_hold_time"),
+ {0.1, 30, 0.1, N_("seconds")}
+ ),
+ WidgetSpin (
+ N_("Fall-off time:"),
+ WidgetFloat ("vumeter", "falloff"),
+ {0.1, 96, 0.1, N_("dB/second")}
+ ),
+ WidgetCheck (N_("Display legend"),
+ WidgetBool ("vumeter", "display_legend", toggle_display_legend)
+ ),
+};
+
+const PluginPreferences VUMeterQt::prefs = {{widgets}};
+
+const char * const VUMeterQt::prefs_defaults = {
+ "peak_hold_time", "1.6",
+ "falloff", "13.3",
+ "display_legend", "TRUE",
+ nullptr
+};
+
+static QPointer<VUMeterQtWidget> spect_widget;
+
+bool VUMeterQt::init()
+{
+ aud_config_set_defaults ("vumeter", prefs_defaults);
+ return true;
+}
+
+void VUMeterQt::render_multi_pcm(const float * pcm, int channels)
+{
+ if (spect_widget)
+ {
+ spect_widget->render_multi_pcm(pcm, channels);
+ }
+}
+
+void VUMeterQt::clear()
+{
+ if (spect_widget)
+ {
+ spect_widget->reset();
+ spect_widget->update();
+ }
+}
+
+void * VUMeterQt::get_qt_widget()
+{
+ if (spect_widget)
+ {
+ return spect_widget;
+ }
+
+ spect_widget = new VUMeterQtWidget;
+ return spect_widget;
+}
+
+void VUMeterQt::toggle_display_legend()
+{
+ if (spect_widget)
+ {
+ spect_widget->toggle_display_legend();
+ }
+}

audacious-plugins-4.4.1.tar.bz2/src/vumeter-qt/vumeter_qt.h Added

@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 2017-2019 Marc Sanchez Fauste.
+ *
+ * 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.
+ *
+ * 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.
+ */
+
+#ifndef __VUMETER_QT_H
+#define __VUMETER_QT_H
+
+#include <libaudcore/i18n.h>
+#include <libaudcore/plugin.h>
+#include <libaudcore/preferences.h>
+
+class VUMeterQt : public VisPlugin
+{
+public:
+ static const char about;
+ static const PreferencesWidget widgets;
+ static const PluginPreferences prefs;
+ static const char * const prefs_defaults;
+
+ static constexpr PluginInfo info = {
+ N_("VU Meter"),
+ PACKAGE,
+ about,
+ & prefs,
+ PluginQtOnly
+ };
+
+ constexpr VUMeterQt () : VisPlugin (info, Visualizer::MultiPCM) {}
+
+ bool init ();
+ void * get_qt_widget ();
+
+ void clear ();
+ void render_multi_pcm (const float * pcm, int channels);
+
+ static void toggle_display_legend();
+};
+
+#endif

audacious-plugins-4.4.1.tar.bz2/src/vumeter-qt/vumeter_qt_widget.cc Added

@@ -0,0 +1,400 @@
+/*
+ * Copyright (c) 2017-2019 Marc Sanchez Fauste.
+ *
+ * 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.
+ *
+ * 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.
+ */
+
+#include "vumeter_qt_widget.h"
+
+#include <math.h>
+#include <libaudcore/runtime.h>
+
+const QColor VUMeterQtWidget::backgroundColor = QColor(16, 16, 16, 255);
+const QColor VUMeterQtWidget::text_color = QColor(255, 255, 255);
+const QColor VUMeterQtWidget::db_line_color = QColor(120, 120, 120);
+const float VUMeterQtWidget::legend_line_width = 1.0f;
+const int VUMeterQtWidget::redraw_interval = 25; // ms
+
+float VUMeterQtWidget::get_db_on_range(float db)
+{
+ return aud::clamp<float>(db, -db_range, 0);
+}
+
+float VUMeterQtWidget::get_db_factor(float db)
+{
+ float factor = 0.0f;
+
+ if (db < -db_range)
+ {
+ factor = 0.0f;
+ }
+ else if (db < -60.0f)
+ {
+ factor = (db + db_range) * 2.5f/(db_range-60);
+ }
+ else if (db < -50.0f)
+ {
+ factor = (db + 60.0f) * 0.5f + 2.5f;
+ }
+ else if (db < -40.0f)
+ {
+ factor = (db + 50.0f) * 0.75f + 7.5f;
+ }
+ else if (db < -30.0f)
+ {
+ factor = (db + 40.0f) * 1.5f + 15.0f;
+ }
+ else if (db < -20.0f)
+ {
+ factor = (db + 30.0f) * 2.0f + 30.0f;
+ }
+ else if (db < 0.0f)
+ {
+ factor = (db + 20.0f) * 2.5f + 50.0f;
+ }
+ else
+ {
+ factor = 100.0f;
+ }
+
+ return factor / 100.0f;
+}
+
+float VUMeterQtWidget::get_height_from_db(float db)
+{
+ return get_db_factor(db) * vumeter_height;
+}
+
+float VUMeterQtWidget::get_y_from_db(float db)
+{
+ return vumeter_top_padding + vumeter_height - get_height_from_db(db);
+}
+
+void VUMeterQtWidget::render_multi_pcm (const float * pcm, int channels)
+{
+ nchannels = aud::clamp(channels, 0, max_channels);
+
+ float * peaks = new floatnchannels;
+ for (int channel = 0; channel < nchannels; channel++)
+ {
+ peakschannel = fabsf(pcmchannel);
+ }
+
+ for (int i = 0; i < 512 * nchannels;)
+ {
+ for (int channel = 0; channel < nchannels; channel++)
+ {
+ peakschannel = fmaxf(peakschannel, fabsf(pcmi++));
+ }
+ }
+
+ for (int i = 0; i < nchannels; i++)
+ {
+ float n = peaksi;
+
+ float db = 20 * log10f(n);
+ db = get_db_on_range(db);
+
+ if (db > channels_db_leveli)
+ {
+ channels_db_leveli = db;
+ }
+
+ if (db > channels_peaksi)
+ {
+ channels_peaksi = db;
+ last_peak_timesi.start();
+ }
+ }
+
+ delete peaks;
+}
+
+void VUMeterQtWidget::redraw_timer_expired()
+{
+ qint64 elapsed_render_time = redraw_elapsed_timer.restart();
+ float falloff = aud_get_double ("vumeter", "falloff") / 1000.0;
+ qint64 peak_hold_time = aud_get_double ("vumeter", "peak_hold_time") * 1000;
+
+ for (int i = 0; i < nchannels; i++)
+ {
+ float decay_amount = elapsed_render_time * falloff;
+ channels_db_leveli = get_db_on_range(channels_db_leveli - decay_amount);
+
+ qint64 elapsed_peak_time = last_peak_timesi.elapsed();
+ if (channels_db_leveli > channels_peaksi || elapsed_peak_time > peak_hold_time)
+ {
+ channels_peaksi = channels_db_leveli;
+ last_peak_timesi.start();
+ }
+ }
+
+ update();
+}
+
+void VUMeterQtWidget::reset()
+{
+ for (int i = 0; i < max_channels; i++)
+ {
+ last_peak_timesi.start();
+ channels_db_leveli = -db_range;
+ channels_peaksi = -db_range;
+ }
+}
+
+void VUMeterQtWidget::draw_background(QPainter & p)
+{
+ p.fillRect(0, 0, width(), height(), backgroundColor);
+}
+
+void VUMeterQtWidget::draw_vu_legend(QPainter & p)
+{
+ float font_size_width = legend_width / 4.0f;
+ float font_size_height = vumeter_height * 0.015f;
+
+ QFont font = p.font();
+ font.setPointSizeF(fminf(font_size_width, font_size_height));
+ p.setFont(font);
+
+ QPen pen = p.pen();
+ pen.setWidth(legend_line_width);
+ pen.setColor(text_color);
+ p.setPen(pen);
+
+ draw_vu_legend_db(p, 0, "0");
+ draw_vu_legend_db(p, -3, "-3");
+ draw_vu_legend_db(p, -6, "-6");
+ draw_vu_legend_db(p, -9, "-9");
+ draw_vu_legend_db(p, -12, "-12");
+ draw_vu_legend_db(p, -15, "-15");
+ draw_vu_legend_db(p, -18, "-18");
+ draw_vu_legend_db(p, -20, "-20");
+ draw_vu_legend_db(p, -25, "-25");
+ draw_vu_legend_db(p, -30, "-30");
+ draw_vu_legend_db(p, -35, "-35");
+ draw_vu_legend_db(p, -40, "-40");
+ draw_vu_legend_db(p, -50, "-50");
+ draw_vu_legend_db(p, -60, "-60");
+ draw_vu_legend_db(p, -db_range, "-inf");
+
+ pen.setColor(db_line_color);
+ p.setPen(pen);
+ for (int i = 0; i >= -60; i--)
+ {
+ if (i > -30)
+ {
+ draw_vu_legend_line(p, i);
+ draw_vu_legend_line(p, i - 0.5, 0.5);
+ }
+ else if (i > -40)
+ {
+ draw_vu_legend_line(p, i);
+ }
+ else if (i >= -60)
+ {
+ draw_vu_legend_line(p, i);
+ i -= 1;
+ }
+ }
+ draw_vu_legend_line(p, -db_range);
+}
+
+void VUMeterQtWidget::draw_vu_legend_line(QPainter &p, float db, float line_width_factor)
+{
+ float y = get_y_from_db(db);
+ if (db > -db_range)
+ {
+ y += (legend_line_width / 2.0f);
+ }
+ else
+ {
+ y -= (legend_line_width / 2.0f);
+ }
+ float line_width = aud::clamp<float>(legend_width * 0.25f, 1, 8);
+ p.drawLine(
+ QPointF(legend_width - line_width * line_width_factor - (legend_line_width / 2.0f), y),
+ QPointF(legend_width - (legend_line_width / 2.0f), y)
+ );
+ p.drawLine(
+ QPointF(width() - legend_width + (legend_line_width / 2.0f), y),
+ QPointF(width() - legend_width + (legend_line_width / 2.0f) + line_width * line_width_factor, y)
+ );
+}
+
+void VUMeterQtWidget::draw_vu_legend_db(QPainter &p, float db, const char *text)
+{
+ QFontMetricsF fm(p.font());
+ QSizeF text_size = fm.size(0, text);
+ float y = get_y_from_db(db);
+ float padding = aud::clamp<float>(legend_width * 0.25f, 1, 8) * 1.5f;
+ p.drawText(QPointF(legend_width - text_size.width() - padding, y + (text_size.height()/4.0f)), text);
+ p.drawText(QPointF(width() - legend_width + padding, y + (text_size.height()/4.0f)), text);
+}
+
+void VUMeterQtWidget::draw_visualizer_peaks(QPainter &p)
+{
+ float bar_width = get_bar_width(nchannels);
+ float font_size_width = bar_width / 3.0f;
+ float font_size_height = vumeter_top_padding * 0.50f;
+
+ QFont font = p.font();
+ font.setPointSizeF(fminf(font_size_width, font_size_height));
+ p.setFont(font);
+
+ QPen pen = p.pen();
+ pen.setColor(text_color);
+ p.setPen(pen);
+
+ QFontMetricsF fm(p.font());
+ for (int i = 0; i < nchannels; i++)
+ {
+ QString text = format_db(channels_peaksi);
+ QSizeF text_size = fm.size(0, text);
+ p.drawText(
+ QPointF(
+ legend_width + bar_width*(i+0.5f) - text_size.width()/2.0f,
+ vumeter_top_padding/2.0f + (text_size.height()/4.0f)
+ ),
+ text
+ );
+ }
+}
+
+void VUMeterQtWidget::draw_visualizer(QPainter & p)
+{
+ for (int i = 0; i < nchannels; i++)
+ {
+ float bar_width = get_bar_width(nchannels);
+ float x = legend_width + (bar_width * i);
+ if (i > 0)
+ {
+ x += 1;
+ bar_width -= 1;
+ }
+
+ p.fillRect (
+ QRectF(x, vumeter_top_padding, bar_width, vumeter_height),
+ background_vumeter_pattern
+ );
+
+ p.fillRect (
+ QRectF(x, get_y_from_db(channels_db_leveli),
+ bar_width, (get_height_from_db(channels_db_leveli))),
+ vumeter_pattern
+ );
+
+ if (channels_peaksi > -db_range)
+ {
+ p.fillRect (
+ QRectF(x, get_y_from_db(channels_peaksi), bar_width, 1),
+ vumeter_pattern
+ );
+ }
+ }
+}
+
+QString VUMeterQtWidget::format_db(const float val)
+{
+ if (val > -10)
+ {
+ return QString::number(val, 'f', 1);
+ }
+ else if (val > -db_range)
+ {
+ return QString::number(val, 'f', 0);
+ }
+ else
+ {
+ return QString("-inf");
+ }
+}
+
+float VUMeterQtWidget::get_bar_width(int channels)
+{
+ return vumeter_width / channels;
+}
+
+void VUMeterQtWidget::update_sizes()
+{
+ if (height() > 200 && width() > 60 && aud_get_bool("vumeter", "display_legend"))
+ {
+ must_draw_vu_legend = true;
+ vumeter_top_padding = height() * 0.03f;
+ vumeter_bottom_padding = height() * 0.015f;
+ vumeter_height = height() - vumeter_top_padding - vumeter_bottom_padding;
+ legend_width = width() * 0.3f;
+ vumeter_width = width() - (legend_width * 2);
+ }
+ else
+ {
+ must_draw_vu_legend = false;
+ vumeter_top_padding = 0;
+ vumeter_bottom_padding = 0;
+ vumeter_height = height();
+ legend_width = 0;
+ vumeter_width = width();
+ }
+ vumeter_pattern = get_vumeter_pattern();
+ background_vumeter_pattern = get_vumeter_pattern(30);
+}
+
+VUMeterQtWidget::VUMeterQtWidget (QWidget * parent)
+ : QWidget (parent),
+ redraw_timer(new QTimer(this))
+{
+ reset();
+ connect(redraw_timer, &QTimer::timeout, this, &VUMeterQtWidget::redraw_timer_expired);
+ redraw_timer->start(redraw_interval);
+ redraw_elapsed_timer.start();
+ update_sizes();
+}
+
+QLinearGradient VUMeterQtWidget::get_vumeter_pattern(int alpha)
+{
+ QLinearGradient vumeter_pattern = QLinearGradient(
+ 0, vumeter_top_padding + vumeter_height, 0, vumeter_top_padding
+ );
+ vumeter_pattern.setColorAt(get_db_factor(0), QColor(190, 40, 10, alpha));
+ vumeter_pattern.setColorAt(get_db_factor(-2), QColor(190, 40, 10, alpha));
+ vumeter_pattern.setColorAt(get_db_factor(-9), QColor(210, 210, 15, alpha));
+ vumeter_pattern.setColorAt(get_db_factor(-50), QColor(0, 190, 20, alpha));
+ return vumeter_pattern;
+}
+
+void VUMeterQtWidget::resizeEvent (QResizeEvent *)
+{
+ update_sizes();
+}
+
+void VUMeterQtWidget::paintEvent (QPaintEvent *)
+{
+ QPainter p(this);
+
+ draw_background(p);
+ if (must_draw_vu_legend)
+ {
+ draw_vu_legend(p);
+ draw_visualizer_peaks(p);
+ }
+ draw_visualizer(p);
+}
+
+void VUMeterQtWidget::toggle_display_legend()
+{
+ update_sizes();
+ update();
+}

audacious-plugins-4.4.1.tar.bz2/src/vumeter-qt/vumeter_qt_widget.h Added

@@ -0,0 +1,90 @@
+/*
+ * Copyright (c) 2017-2019 Marc Sanchez Fauste.
+ *
+ * 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.
+ *
+ * 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.
+ */
+
+#ifndef __VUMETER_QT_WIDGET_H
+#define __VUMETER_QT_WIDGET_H
+
+#include <QWidget>
+#include <QPainter>
+#include <QLinearGradient>
+#include <QColor>
+#include <QString>
+#include <QTimer>
+#include <QElapsedTimer>
+
+class VUMeterQtWidget : public QWidget
+{
+private:
+ static constexpr int max_channels = 20;
+ static constexpr int db_range = 96;
+
+ static const QColor backgroundColor;
+ static const QColor text_color;
+ static const QColor db_line_color;
+ static const float legend_line_width;
+ static const int redraw_interval;
+
+ int nchannels = 2;
+ float channels_db_levelmax_channels;
+ float channels_peaksmax_channels;
+ QElapsedTimer last_peak_timesmax_channels; // Time elapsed since peak was set
+ QLinearGradient vumeter_pattern;
+ QLinearGradient background_vumeter_pattern;
+ float legend_width;
+ float vumeter_height;
+ float vumeter_width;
+ float vumeter_top_padding;
+ float vumeter_bottom_padding;
+ bool must_draw_vu_legend;
+ QTimer *redraw_timer;
+ QElapsedTimer redraw_elapsed_timer;
+
+ void draw_background (QPainter &p);
+ void draw_visualizer (QPainter &p);
+ void draw_vu_legend(QPainter &p);
+ float get_height_from_db(float db);
+ float get_y_from_db(float db);
+ QLinearGradient get_vumeter_pattern(int alpha = 255);
+ float get_bar_width(int channels);
+ void draw_vu_legend_db(QPainter &p, float db, const char *text);
+ void draw_vu_legend_line(QPainter &p, float db, float line_width_factor = 1.0f);
+ void draw_visualizer_peaks(QPainter &p);
+ void update_sizes();
+
+ static QString format_db(const float val);
+ static float get_db_on_range(float db);
+ static float get_db_factor(float db);
+
+public slots:
+ void redraw_timer_expired();
+
+public:
+ VUMeterQtWidget (QWidget * parent = nullptr);
+
+ void reset ();
+ void render_multi_pcm (const float * pcm, int channels);
+ void toggle_display_legend();
+
+protected:
+ void resizeEvent (QResizeEvent *);
+ void paintEvent (QPaintEvent *);
+};
+
+#endif

audacious-plugins-4.4.1.tar.bz2/src/waveout Added

audacious-plugins-4.4.1.tar.bz2/src/waveout/Makefile Added

audacious-plugins-4.4.1.tar.bz2/src/waveout/meson.build Added

audacious-plugins-4.4.1.tar.bz2/src/waveout/waveout.cc Added

@@ -0,0 +1,358 @@
+/*
+ * Win32 waveOut Plugin for Audacious
+ * Copyright 2016 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 <assert.h>
+#include <pthread.h>
+
+#include <windows.h>
+
+// missing from MinGW header
+#ifndef WAVE_FORMAT_IEEE_FLOAT
+#define WAVE_FORMAT_IEEE_FLOAT 3
+#endif
+
+#include <libaudcore/audstrings.h>
+#include <libaudcore/i18n.h>
+#include <libaudcore/plugin.h>
+#include <libaudcore/runtime.h>
+
+#define NUM_BLOCKS 4
+
+class WaveOut : public OutputPlugin
+{
+public:
+ static const char about;
+
+ static constexpr PluginInfo info = {
+ N_("Win32 waveOut"),
+ PACKAGE,
+ about
+ };
+
+ constexpr WaveOut () : OutputPlugin (info, 5) {}
+
+ StereoVolume get_volume ();
+ void set_volume (StereoVolume v);
+
+ bool open_audio (int aud_format, int rate, int chans, String & error);
+ void close_audio ();
+
+ void period_wait ();
+ int write_audio (const void * data, int size);
+ void drain ();
+
+ int get_delay ();
+
+ void pause (bool pause);
+ void flush ();
+};
+
+EXPORT WaveOut aud_plugin_instance;
+
+const char WaveOut::about =
+ N_("Win32 waveOut Plugin for Audacious\n"
+ "Copyright 2016 John Lindgren");
+
+// lock order is state, then buffer
+static pthread_mutex_t state_mutex = PTHREAD_MUTEX_INITIALIZER;
+static pthread_mutex_t buffer_mutex = PTHREAD_MUTEX_INITIALIZER;
+static pthread_cond_t buffer_cond = PTHREAD_COND_INITIALIZER;
+
+static int waveout_format;
+static int waveout_chan, waveout_rate;
+static int block_size;
+
+// guarded by state_mutex
+static HWAVEOUT device;
+static bool prebuffer_flag, paused_flag;
+static int64_t total_frames;
+
+// guarded by buffer_mutex
+static Index<WAVEHDR> headers;
+static Index<Index<char>> blocks;
+static int next_block, blocks_free;
+
+StereoVolume WaveOut::get_volume ()
+{
+ DWORD vol = 0;
+ waveOutGetVolume ((HWAVEOUT) WAVE_MAPPER, & vol);
+ return {aud::rescale (int (vol & 0xffff), 0xffff, 100),
+ aud::rescale (int (vol >> 16), 0xffff, 100)};
+}
+
+void WaveOut::set_volume (StereoVolume v)
+{
+ int left = aud::rescale (v.left, 100, 0xffff);
+ int right = aud::rescale (v.right, 100, 0xffff);
+ waveOutSetVolume ((HWAVEOUT) WAVE_MAPPER, left | (right << 16));
+}
+
+static void CALLBACK callback (HWAVEOUT, UINT uMsg, DWORD_PTR, DWORD_PTR, DWORD_PTR)
+{
+ if (uMsg != WOM_DONE)
+ return;
+
+ pthread_mutex_lock (& buffer_mutex);
+
+ assert (blocks_free < NUM_BLOCKS);
+ int old_block = (next_block + blocks_free) % NUM_BLOCKS;
+ blocksold_block.resize (0);
+ blocks_free ++;
+
+ pthread_cond_broadcast (& buffer_cond);
+ pthread_mutex_unlock (& buffer_mutex);
+}
+
+bool WaveOut::open_audio (int format, int rate, int chan, String & error)
+{
+ if (format != FMT_S16_NE && format != FMT_S32_NE && format != FMT_FLOAT)
+ {
+ error = String ("waveOut error: Unsupported audio format. Supported "
+ "bit depths are 16, 32, and floating point.");
+ return false;
+ }
+
+ AUDDBG ("Opening audio for format %d, %d channels, %d Hz.\n", format, chan, rate);
+
+ waveout_format = format;
+ waveout_chan = chan;
+ waveout_rate = rate;
+
+ WAVEFORMATEX desc;
+ desc.wFormatTag = (format == FMT_FLOAT) ? WAVE_FORMAT_IEEE_FLOAT : WAVE_FORMAT_PCM;
+ desc.nChannels = chan;
+ desc.nSamplesPerSec = rate;
+ desc.nAvgBytesPerSec = FMT_SIZEOF (format) * chan * rate;
+ desc.nBlockAlign = FMT_SIZEOF (format) * chan;
+ desc.wBitsPerSample = 8 * FMT_SIZEOF (format);
+ desc.cbSize = 0;
+
+ MMRESULT res = waveOutOpen (& device, WAVE_MAPPER, & desc,
+ (DWORD_PTR) callback, 0, CALLBACK_FUNCTION);
+
+ if (res != MMSYSERR_NOERROR)
+ {
+ error = String (str_printf ("Error opening device (%d)!", (int) res));
+ return false;
+ }
+
+ int block_ms = aud_get_int ("output_buffer_size") / NUM_BLOCKS;
+ block_size = FMT_SIZEOF (format) * chan * aud::rescale (block_ms, 1000, rate);
+
+ headers.insert (0, NUM_BLOCKS);
+ blocks.insert (0, NUM_BLOCKS);
+
+ next_block = 0;
+ blocks_free = NUM_BLOCKS;
+
+ waveOutPause (device);
+ prebuffer_flag = true;
+ paused_flag = false;
+ total_frames = 0;
+
+ return true;
+}
+
+void WaveOut::close_audio ()
+{
+ AUDDBG ("Closing audio.\n");
+ flush ();
+ waveOutClose (device);
+
+ headers.clear ();
+ blocks.clear ();
+}
+
+void WaveOut::period_wait ()
+{
+ pthread_mutex_lock (& buffer_mutex);
+
+ while (! blocks_free)
+ pthread_cond_wait (& buffer_cond, & buffer_mutex);
+
+ pthread_mutex_unlock (& buffer_mutex);
+}
+
+// assumes state_mutex locked
+static void write_block (int b)
+{
+ WAVEHDR & header = headersb;
+ Index<char> & block = blocksb;
+
+ header.lpData = block.begin ();
+ header.dwBufferLength = block.len ();
+
+ waveOutPrepareHeader (device, & header, sizeof header);
+ waveOutWrite (device, & header, sizeof header);
+}
+
+// assumes state_mutex locked
+static void check_started ()
+{
+ if (prebuffer_flag)
+ {
+ AUDDBG ("Prebuffering complete.\n");
+ if (! paused_flag)
+ waveOutRestart (device);
+
+ prebuffer_flag = false;
+ }
+}
+
+int WaveOut::write_audio (const void * data, int len)
+{
+ int written = 0;
+ pthread_mutex_lock (& state_mutex);
+ pthread_mutex_lock (& buffer_mutex);
+
+ while (len > 0 && blocks_free > 0)
+ {
+ int block_to_write = -1;
+
+ Index<char> & block = blocksnext_block;
+ int copy = aud::min (len, block_size - block.len ());
+ block.insert ((const char *) data, -1, copy);
+
+ if (block.len () == block_size)
+ {
+ block_to_write = next_block;
+ next_block = (next_block + 1) % NUM_BLOCKS;
+ blocks_free --;
+ }
+
+ written += copy;
+ data = (const char *) data + copy;
+ len -= copy;
+
+ if (block_to_write >= 0)
+ {
+ pthread_mutex_unlock (& buffer_mutex);
+ write_block (block_to_write);
+ pthread_mutex_lock (& buffer_mutex);
+ }
+ }
+
+ bool filled = ! blocks_free;
+ pthread_mutex_unlock (& buffer_mutex);
+
+ if (filled)
+ check_started ();
+
+ total_frames += written / (FMT_SIZEOF (waveout_format) * waveout_chan);
+
+ pthread_mutex_unlock (& state_mutex);
+ return written;
+}
+
+void WaveOut::drain ()
+{
+ AUDDBG ("Draining.\n");
+ pthread_mutex_lock (& state_mutex);
+ pthread_mutex_lock (& buffer_mutex);
+
+ int block_to_write = -1;
+
+ // write last partial block, if any
+ if (blocks_free > 0 && blocksnext_block.len () > 0)
+ {
+ block_to_write = next_block;
+ next_block = (next_block + 1) % NUM_BLOCKS;
+ blocks_free --;
+ }
+
+ pthread_mutex_unlock (& buffer_mutex);
+
+ if (block_to_write >= 0)
+ write_block (block_to_write);
+
+ check_started ();
+
+ pthread_mutex_unlock (& state_mutex);
+ pthread_mutex_lock (& buffer_mutex);
+
+ while (blocks_free < NUM_BLOCKS)
+ pthread_cond_wait (& buffer_cond, & buffer_mutex);
+
+ pthread_mutex_unlock (& buffer_mutex);
+}
+
+int WaveOut::get_delay ()
+{
+ int delay = 0;
+ pthread_mutex_lock (& state_mutex);
+
+ MMTIME t;
+ t.wType = TIME_SAMPLES;
+
+ if (waveOutGetPosition (device, & t, sizeof t) == MMSYSERR_NOERROR && t.wType == TIME_SAMPLES)
+ {
+ // frame_diff is intentionally truncated to a signed 32-bit word to
+ // account for overflow in the DWORD frame counter returned by Windows
+ int32_t frame_diff = total_frames - t.u.sample;
+ delay = aud::rescale ((int) frame_diff, waveout_rate, 1000);
+ }
+
+ pthread_mutex_unlock (& state_mutex);
+ return delay;
+}
+
+void WaveOut::pause (bool pause)
+{
+ AUDDBG (pause ? "Pausing.\n" : "Unpausing.\n");
+ pthread_mutex_lock (& state_mutex);
+
+ if (! prebuffer_flag)
+ {
+ if (pause)
+ waveOutPause (device);
+ else
+ waveOutRestart (device);
+ }
+
+ paused_flag = pause;
+
+ pthread_mutex_unlock (& state_mutex);
+}
+
+void WaveOut::flush ()
+{
+ AUDDBG ("Flushing buffers.\n");
+ pthread_mutex_lock (& state_mutex);
+
+ waveOutReset (device);
+
+ pthread_mutex_lock (& buffer_mutex);
+
+ for (auto & header : headers)
+ waveOutUnprepareHeader (device, & header, sizeof header);
+ for (auto & block : blocks)
+ block.resize (0);
+
+ next_block = 0;
+ blocks_free = NUM_BLOCKS;
+
+ pthread_cond_broadcast (& buffer_cond);
+ pthread_mutex_unlock (& buffer_mutex);
+
+ waveOutPause (device);
+ prebuffer_flag = true;
+ total_frames = 0;
+
+ pthread_mutex_unlock (& state_mutex);
+}

audacious-plugins-4.4.1.tar.bz2/src/wavpack/meson.build Added

audacious-plugins-3.6.2-gtk3.tar.bz2/src/wavpack/wavpack.cc -> audacious-plugins-4.4.1.tar.bz2/src/wavpack/wavpack.cc Changed

@@ -11,14 +11,15 @@
 #include <libaudcore/audstrings.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)))
+#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)))
 
 class WavpackPlugin : public InputPlugin
 {
 public:
 static const char about;
 static const char * const exts;
+ static const char * const mimes;
 
 static constexpr PluginInfo info = {
 N_("WavPack Decoder"),
@@ -26,15 +27,14 @@
 about
 };
 
- static constexpr auto iinfo = InputInfo (FlagWritesTag)
- .with_exts (exts);
-
- constexpr WavpackPlugin() : InputPlugin (info, iinfo) {}
+ constexpr WavpackPlugin() : InputPlugin (info, InputInfo (FlagWritesTag)
+ .with_exts (exts)
+ .with_mimes (mimes)) {}
 
 bool is_our_file (const char * filename, VFSFile & file)
 { return false; }
 
- Tuple read_tuple (const char * filename, VFSFile & file);
+ bool read_tag (const char * filename, VFSFile & file, Tuple & tuple, Index<char> * image);
 bool write_tuple (const char * filename, VFSFile & file, const Tuple & tuple);
 bool play (const char * filename, VFSFile & file);
 };
@@ -111,7 +111,9 @@
 wvc_input = VFSFile (corrFilename, "r");
 }
 
- * ctx = WavpackOpenFileInputEx (& wv_readers, & wv_input, & wvc_input, error, flags, 0);
+ * ctx = WavpackOpenFileInputEx (& wv_readers, & wv_input,
+ wvc_input ? (& wvc_input) : nullptr, error, flags, 0);
+
 return (* ctx != nullptr);
 }
 
@@ -139,7 +141,11 @@
 num_samples = WavpackGetNumSamples(ctx);
 
 set_stream_bitrate(WavpackGetAverageBitrate(ctx, num_channels));
- open_audio(SAMPLE_FMT(bits_per_sample), sample_rate, num_channels);
+
+ if(bits_per_sample == 32 && (WavpackGetMode(ctx) & MODE_FLOAT))
+ open_audio(FMT_FLOAT, sample_rate, num_channels);
+ else
+ open_audio(SAMPLE_FMT(bits_per_sample), sample_rate, num_channels);
 
 Index<int32_t> input;
 input.resize (BUFFER_SIZE * num_channels);
@@ -174,17 +180,17 @@
 int16_t * wp2 = (int16_t *) output.begin ();
 int32_t * wp4 = (int32_t *) output.begin ();
 
- if (bits_per_sample == 8)
+ if (bits_per_sample <= 8)
 {
 for (int i = 0; i < ret * num_channels; i++, wp++, rp++)
 *wp = *rp & 0xff;
 }
- else if (bits_per_sample == 16)
+ else if (bits_per_sample <= 16)
 {
 for (int i = 0; i < ret * num_channels; i++, wp2++, rp++)
 *wp2 = *rp & 0xffff;
 }
- else if (bits_per_sample == 24 || bits_per_sample == 32)
+ else
 {
 for (int i = 0; i < ret * num_channels; i++, wp4++, rp++)
 *wp4 = *rp;
@@ -216,39 +222,37 @@
 (mode & MODE_DNS) ? " (dynamic noise shaped)" : ""});
 }
 
-Tuple WavpackPlugin::read_tuple (const char * filename, VFSFile & file)
+bool WavpackPlugin::read_tag (const char * filename, VFSFile & file, Tuple & tuple,
+ Index<char> * image)
 {
- WavpackContext *ctx;
- Tuple tuple;
 char error1024;
 
- ctx = WavpackOpenFileInputEx(&wv_readers, &file, nullptr, error, OPEN_TAGS, 0);
-
- if (ctx == nullptr)
- return tuple;
+ auto ctx = WavpackOpenFileInputEx(&wv_readers, &file, nullptr, error, OPEN_TAGS, 0);
+ if (! ctx)
+ return false;
 
 AUDDBG("starting probe of %s\n", file.filename ());
 
- tuple.set_filename (filename);
-
 tuple.set_int (Tuple::Length,
 ((uint64_t) WavpackGetNumSamples(ctx) * 1000) / (uint64_t) WavpackGetSampleRate(ctx));
 tuple.set_str (Tuple::Codec, "WavPack");
 
 tuple.set_str (Tuple::Quality, wv_get_quality (ctx));
 
+ tuple.set_int (Tuple::Channels, WavpackGetNumChannels(ctx));
+
 WavpackCloseFile(ctx);
 
 if (! file.fseek (0, VFS_SEEK_SET))
- audtag::tuple_read (tuple, file);
+ audtag::read_tag (file, tuple, nullptr);
 
 AUDDBG("returning tuple for file %s\n", file.filename ());
- return tuple;
+ return true;
 }
 
 bool WavpackPlugin::write_tuple (const char * filename, VFSFile & handle, const Tuple & tuple)
 {
- return audtag::tuple_write(tuple, handle, audtag::TagType::APE);
+ return audtag::write_tuple (handle, tuple, audtag::TagType::APE);
 }
 
 const char WavpackPlugin::about =
@@ -256,3 +260,4 @@
 "Some of the plugin code was by Miles Egan.");
 
 const char * const WavpackPlugin::exts = { "wv", nullptr };
+const char * const WavpackPlugin::mimes = { "audio/x-wavpack", nullptr };

audacious-plugins-3.6.2-gtk3.tar.bz2/src/xsf/Makefile -> audacious-plugins-4.4.1.tar.bz2/src/xsf/Makefile Changed

@@ -1,10 +1,13 @@
 PLUGIN = xsf${PLUGIN_SUFFIX}
 
-SRCS = corlett.cc \
-       plugin.cc \
-       vio2sf.cc \
-       desmume/armcpu.cc            desmume/bios.cc  desmume/FIFO.cc  desmume/matrix.cc  desmume/MMU.cc        desmume/SPU.cc \
-       desmume/arm_instructions.cc  desmume/cp15.cc  desmume/GPU.cc   desmume/mc.cc      desmume/NDSSystem.cc  desmume/thumb_instructions.cc \
+SRCS = plugin.cc \
+       sndif2sf.cc \
+       XSFFile.cc \
+       spu/adpcmdecoder.cc           spu/interpolator.cc  spu/samplecache.cc spu/sampledata.cc \
+       desmume/armcpu.cc             desmume/bios.cc      desmume/FIFO.cc    desmume/metaspu.cc    desmume/MMU.cc \
+       desmume/arm_instructions.cc   desmume/cp15.cc      desmume/mc.cc      desmume/NDSSystem.cc  desmume/SPU.cc \
+       desmume/thumb_instructions.cc desmume/readwrite.cc desmume/emufile.cc desmume/firmware.cc   \
+       desmume/slot1.cc              desmume/slot1_retail.cc
 
 include ../../buildsys.mk
 include ../../extra.mk
@@ -13,6 +16,6 @@
 
 LD = ${CXX}
 
-CXXFLAGS += ${PLUGIN_CFLAGS} -Wno-sign-compare
+CXXFLAGS += ${PLUGIN_CFLAGS} -Wno-sign-compare -Wno-shift-negative-value
 CPPFLAGS += ${PLUGIN_CPPFLAGS} -I../.. -Ispu/
 LIBS += -lm -lz

audacious-plugins-4.4.1.tar.bz2/src/xsf/XSFFile.cc Added

@@ -0,0 +1,293 @@
+/*
+ * xSF - File structure
+ * Copyright (c) 2014-2020 Naram Qashat <cyberbotx@cyberbotx.com>
+ * Copyright (c) 2020-2021 Adam Higerd <chighland@gmail.com>
+ *
+ * Partially derived from Audio Overload SDK
+ * Copyright (c) 2007-2008 R. Belmont and Richard Bannister.
+ * 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.
+ * * Neither the names of R. Belmont and Richard Bannister nor the names of its
+ * contributors may be used to endorse or promote products derived from this
+ * software without specific prior written permission.
+ *
+ * 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 OWNER 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.
+ */
+
+#include <algorithm>
+#include <functional>
+#include <stdexcept>
+#include <iostream>
+#include <cstring>
+#include <zlib.h>
+#include "XSFFile.h"
+
+static inline void Set32BitsLE(uint32_t input, uint8_t *output)
+{
+	output0 = input & 0xFF;
+	output1 = (input >> 8) & 0xFF;
+	output2 = (input >> 16) & 0xFF;
+	output3 = (input >> 24) & 0xFF;
+}
+
+// The whitespace trimming is from the following answer on Stack Overflow:
+// https://stackoverflow.com/a/17976541
+
+static inline std::string TrimWhitespace(const std::string &s)
+{
+	auto wsfront = std::find_if_not(s.begin(), s.end(), (int c) { return std::isspace(c); });
+	auto wsback = std::find_if_not(s.rbegin(), s.rend(), (int c) { return std::isspace(c); }).base();
+	return (wsback <= wsfront ? std::string() : std::string(wsfront, wsback));
+}
+
+XSFFile::XSFFile() : xSFType(0), hasFile(false), rawData(), reservedSection(), programSection(), tags()
+{
+}
+
+XSFFile::XSFFile(std::istream &inFile, uint32_t programSizeOffset, uint32_t programHeaderSize, bool readTagsOnly) : xSFType(0), hasFile(true), rawData(), reservedSection(), programSection(), tags()
+{
+	this->ReadXSF(inFile, programSizeOffset, programHeaderSize, readTagsOnly);
+}
+
+void XSFFile::ReadXSF(std::istream &xSF, uint32_t programSizeOffset, uint32_t programHeaderSize, bool readTagsOnly)
+{
+	xSF.seekg(0, std::istream::end);
+	auto filesize = xSF.tellg();
+	xSF.seekg(0, std::istream::beg);
+
+	if (filesize < 4)
+		throw std::runtime_error("File is too small.");
+
+	char PSFHeader4;
+	xSF.read(PSFHeader, 4);
+
+	if (PSFHeader0 != 'P' || PSFHeader1 != 'S' || PSFHeader2 != 'F')
+		throw std::runtime_error("Not a PSF file.");
+
+	this->xSFType = PSFHeader3;
+
+	this->rawData.resize(4);
+ std::memcpy(&this->rawData0, PSFHeader, 4);
+
+	if (filesize < 16)
+		throw std::runtime_error("File is too small.");
+
+	uint32_t reservedSize = Get32BitsLE(xSF), programCompressedSize = Get32BitsLE(xSF);
+	this->rawData.resize(reservedSize + programCompressedSize + 16);
+	Set32BitsLE(reservedSize, &this->rawData4);
+	Set32BitsLE(programCompressedSize, &this->rawData8);
+	xSF.read(reinterpret_cast<char *>(&this->rawData12), 4);
+
+	if (reservedSize)
+	{
+		if (filesize < reservedSize + 16)
+			throw std::runtime_error("File is too small.");
+
+		if (readTagsOnly)
+			xSF.read(reinterpret_cast<char *>(&this->rawData16), reservedSize);
+		else
+		{
+			this->reservedSection.resize(reservedSize);
+			xSF.read(reinterpret_cast<char *>(&this->reservedSection0), reservedSize);
+ std::memcpy(&this->rawData16, &this->reservedSection0, reservedSize);
+		}
+	}
+
+	if (programCompressedSize)
+	{
+		if (filesize < reservedSize + programCompressedSize + 16)
+			throw std::runtime_error("File is too small.");
+
+		if (readTagsOnly)
+			xSF.read(reinterpret_cast<char *>(&this->rawDatareservedSize + 16), programCompressedSize);
+		else
+		{
+			auto programSectionCompressed = std::vector<uint8_t>(programCompressedSize);
+			xSF.read(reinterpret_cast<char *>(&programSectionCompressed0), programCompressedSize);
+ std::memcpy(&this->rawDatareservedSize + 16, &programSectionCompressed0, programCompressedSize);
+
+			auto programSectionUncompressed = std::vector<uint8_t>(programHeaderSize);
+			unsigned long programUncompressedSize = programHeaderSize;
+			uncompress(&programSectionUncompressed0, &programUncompressedSize, &programSectionCompressed0, programCompressedSize);
+ if (programUncompressedSize) {
+ programUncompressedSize = Get32BitsLE(&programSectionUncompressedprogramSizeOffset) + programHeaderSize;
+ }
+			this->programSection.resize(programUncompressedSize);
+			uncompress(&this->programSection0, &programUncompressedSize, &programSectionCompressed0, programCompressedSize);
+		}
+	}
+
+	if (xSF.tellg() != filesize && filesize >= reservedSize + programCompressedSize + 21)
+	{
+		char tagheader6 = "";
+		xSF.read(tagheader, 5);
+		if (std::string(tagheader) == "TAG")
+		{
+			auto startOfTags = xSF.tellg();
+			unsigned lengthOfTags = static_cast<unsigned>(filesize - startOfTags);
+			if (lengthOfTags)
+			{
+				auto rawtags = std::vector<char>(lengthOfTags);
+				xSF.read(&rawtags0, lengthOfTags);
+				std::string name, value;
+				bool onName = true;
+				for (unsigned x = 0; x < lengthOfTags; ++x)
+				{
+					char curr = rawtagsx;
+					if (curr == 0x0A)
+					{
+						if (!name.empty() && !value.empty())
+						{
+							name = TrimWhitespace(name);
+							value = TrimWhitespace(value);
+							if (this->tags.find(name) != this->tags.end())
+								this->tagsname += "\n" + value;
+							else
+								this->tagsname = value;
+						}
+						name = value = "";
+						onName = true;
+						continue;
+					}
+					if (curr == '=')
+					{
+						onName = false;
+						continue;
+					}
+					if (onName)
+						name += curr;
+					else
+						value += curr;
+				}
+			}
+		}
+	}
+
+	this->hasFile = true;
+}
+
+bool XSFFile::IsValidType(uint8_t type) const
+{
+	return this->xSFType == type;
+}
+
+void XSFFile::Clear()
+{
+	this->xSFType = 0;
+	this->hasFile = false;
+	this->reservedSection.clear();
+	this->programSection.clear();
+	this->tags.clear();
+}
+
+bool XSFFile::HasFile() const
+{
+	return this->hasFile;
+}
+
+std::vector<uint8_t> &XSFFile::GetReservedSection()
+{
+	return this->reservedSection;
+}
+
+std::vector<uint8_t> XSFFile::GetReservedSection() const
+{
+	return this->reservedSection;
+}
+
+std::vector<uint8_t> &XSFFile::GetProgramSection()
+{
+	return this->programSection;
+}
+
+std::vector<uint8_t> XSFFile::GetProgramSection() const
+{
+	return this->programSection;
+}
+
+void XSFFile::SetTag(const std::string &name, const std::string &value)
+{
+	this->tagsname = value;
+}
+
+bool XSFFile::GetTagExists(const std::string &name) const
+{
+	return this->tags.find(name) != this->tags.end();
+}
+
+std::string XSFFile::GetTagValue(const std::string &name) const
+{
+	return this->GetTagExists(name) ? this->tags.at(name) : "";
+}
+
+static unsigned long StringToMS(const std::string& value, unsigned long defaultLength)
+{
+	double length = 0;
+	if (!value.empty()) {
+ std::istringstream ss(value);
+ double part = 0;
+ do {
+ ss >> part;
+ length = length * 60 + part;
+ } while (ss.get() == ':' && ss);
+ }
+	if (!length)
+		return defaultLength;
+	return length * 1000;
+}
+
+unsigned long XSFFile::GetLengthMS(unsigned long defaultLength) const
+{
+	std::string value = this->GetTagValue("length");
+ return StringToMS(value, defaultLength);
+}
+
+unsigned long XSFFile::GetFadeMS(unsigned long defaultFade) const
+{
+	std::string value = this->GetTagValue("fade");
+ return StringToMS(value, defaultFade);
+}
+
+void XSFFile::SaveFile() const
+{
+ /*
+	std::ofstream xSF;
+	xSF.exceptions(std::ofstream::failbit);
+#ifdef _WIN32
+	xSF.open(ConvertFuncs::StringToWString(this->fileName).c_str(), std::ofstream::out | std::ofstream::binary);
+#else
+	xSF.open(this->fileName.c_str(), std::ofstream::out | std::ofstream::binary);
+#endif
+
+	xSF.write(reinterpret_cast<const char *>(&this->rawData0), this->rawData.size());
+
+	auto allTags = this->tags.GetTags();
+	if (!allTags.empty())
+	{
+		xSF.write("TAG", 5);
+		std::for_each(allTags.begin(), allTags.end(), &(const std::string &tag)
+		{
+			xSF.write(tag.c_str(), tag.length());
+			xSF.write("\n", 1);
+		});
+	}
+ */
+}

audacious-plugins-4.4.1.tar.bz2/src/xsf/XSFFile.h Added

@@ -0,0 +1,87 @@
+/*
+ * xSF - File structure
+ * Copyright (c) 2014-2020 Naram Qashat <cyberbotx@cyberbotx.com>
+ * Copyright (c) 2020-2021 Adam Higerd <chighland@gmail.com>
+ *
+ * Partially derived from Audio Overload SDK
+ * Copyright (c) 2007-2008 R. Belmont and Richard Bannister.
+ * 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.
+ * * Neither the names of R. Belmont and Richard Bannister nor the names of its
+ * contributors may be used to endorse or promote products derived from this
+ * software without specific prior written permission.
+ *
+ * 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 OWNER 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.
+ */
+
+#pragma once
+
+#include <cstdint>
+#include <map>
+#include <vector>
+#include <sstream>
+
+class XSFFile
+{
+protected:
+	uint8_t xSFType;
+	bool hasFile;
+	std::vector<uint8_t> rawData, reservedSection, programSection;
+ std::map<std::string, std::string> tags;
+	void ReadXSF(std::istream &xSF, uint32_t programSizeOffset, uint32_t programHeaderSize, bool readTagsOnly = false);
+public:
+	XSFFile();
+	XSFFile(std::istream& xSF, uint32_t programSizeOffset = 0, uint32_t programHeaderSize = 0, bool readTagsOnly = false);
+	bool IsValidType(uint8_t type) const;
+	void Clear();
+	bool HasFile() const;
+	std::vector<uint8_t> &GetReservedSection();
+	std::vector<uint8_t> GetReservedSection() const;
+	std::vector<uint8_t> &GetProgramSection();
+	std::vector<uint8_t> GetProgramSection() const;
+	void SetTag(const std::string &name, const std::string &value);
+	bool GetTagExists(const std::string &name) const;
+	std::string GetTagValue(const std::string &name) const;
+	template<typename T> T GetTagValue(const std::string &name, const T &defaultValue) const
+	{
+ T value = defaultValue;
+ if (this->GetTagExists(name)) {
+ std::istringstream ss(this->GetTagValue(name));
+ ss >> value;
+ }
+ return value;
+	}
+	unsigned long GetLengthMS(unsigned long defaultLength) const;
+	unsigned long GetFadeMS(unsigned long defaultFade) const;
+	void SaveFile() const;
+};
+
+inline uint32_t Get32BitsLE(const uint8_t *input)
+{
+ return input0 | (input1 << 8) | (input2 << 16) | (input3 << 24);
+}
+
+inline uint32_t Get32BitsLE(std::istream &input)
+{
+ uint8_t bytes4;
+ input.read(reinterpret_cast<char *>(bytes), 4);
+ return Get32BitsLE(bytes);
+}

audacious-plugins-3.6.2-gtk3.tar.bz2/src/xsf/desmume/FIFO.cc -> audacious-plugins-4.4.1.tar.bz2/src/xsf/desmume/FIFO.cc Changed

@@ -1,65 +1,157 @@
-/* Copyright (C) 2006 yopyop
- yopyop156@ifrance.com
- yopyop156.ifrance.com
+/*
+	Copyright 2006 yopyop
+	Copyright 2007 shash
+	Copyright 2007-2012 DeSmuME team
 
-	Copyright (C) 2007 shash
+	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
+	(at your option) any later version.
 
- This file is part of DeSmuME
+	This file 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.
 
- DeSmuME 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.
-
- DeSmuME 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 DeSmuME; 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 the this software. If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <cstring>
 #include "FIFO.h"
+#include "armcpu.h"
+#include "mem.h"
+#include "MMU.h"
+#include "NDSSystem.h"
+
+// ========================================================= IPC FIFO
+IPC_FIFO ipc_fifo2; // 0 - ARM9, 1 - ARM7
+
+void IPC_FIFOinit(uint8_t proc)
+{
+	memset(&ipc_fifoproc, 0, sizeof(IPC_FIFO));
+	T1WriteWord(MMU.MMU_MEMproc0x40, 0x184, 0x00000101);
+}
 
-void FIFOInit(FIFO * fifo)
+void IPC_FIFOsend(uint8_t proc, uint32_t val)
 {
- u32 i;
-
-	fifo->begin = 0;
- fifo->end = 0;
- for(i = 0; i<0x8000; ++i)
- 	fifo->datai = 0;
- fifo->full = false;
- fifo->empty = true;
- fifo->error = false;
+	uint16_t cnt_l = T1ReadWord(MMU.MMU_MEMproc0x40, 0x184);
+	if (!(cnt_l & IPCFIFOCNT_FIFOENABLE))
+		return; // FIFO disabled
+	uint8_t proc_remote = proc ^ 1;
+
+	if (ipc_fifoproc.size > 15)
+	{
+		cnt_l |= IPCFIFOCNT_FIFOERROR;
+		T1WriteWord(MMU.MMU_MEMproc0x40, 0x184, cnt_l);
+		return;
+	}
+
+	uint16_t cnt_r = T1ReadWord(MMU.MMU_MEMproc_remote0x40, 0x184);
+
+	cnt_l &= 0xBFFC; // clear send empty bit & full
+	cnt_r &= 0xBCFF; // set recv empty bit & full
+	ipc_fifoproc.bufipc_fifoproc.tail = val;
+	++ipc_fifoproc.tail;
+	++ipc_fifoproc.size;
+	if (ipc_fifoproc.tail > 15)
+		ipc_fifoproc.tail = 0;
+
+	if (ipc_fifoproc.size > 15)
+	{
+		cnt_l |= IPCFIFOCNT_SENDFULL; // set send full bit
+		cnt_r |= IPCFIFOCNT_RECVFULL; // set recv full bit
+	}
+
+	T1WriteWord(MMU.MMU_MEMproc0x40, 0x184, cnt_l);
+	T1WriteWord(MMU.MMU_MEMproc_remote0x40, 0x184, cnt_r);
+
+	if (cnt_r & IPCFIFOCNT_RECVIRQEN)
+		NDS_makeIrq(proc_remote, IRQ_BIT_IPCFIFO_RECVNONEMPTY);
+
+	NDS_Reschedule();
 }
 
-void FIFOAdd(FIFO * fifo, u32 v)
+uint32_t IPC_FIFOrecv(uint8_t proc)
 {
-	if(fifo->full)
- {
- 	fifo->error = true;
- return;
- }
- fifo->datafifo->end = v;
- fifo->end = (fifo->end + 1)& 0x7FFF;
- fifo->full = (fifo->end == fifo->begin);
- fifo->empty = false;
+	uint16_t cnt_l = T1ReadWord(MMU.MMU_MEMproc0x40, 0x184);
+	if (!(cnt_l & IPCFIFOCNT_FIFOENABLE))
+		return 0; // FIFO disabled
+	uint8_t proc_remote = proc ^ 1;
+
+	uint32_t val = 0;
+
+	if (!ipc_fifoproc_remote.size) // remote FIFO error
+	{
+		cnt_l |= IPCFIFOCNT_FIFOERROR;
+		T1WriteWord(MMU.MMU_MEMproc0x40, 0x184, cnt_l);
+		return 0;
+	}
+
+	uint16_t cnt_r = T1ReadWord(MMU.MMU_MEMproc_remote0x40, 0x184);
+
+	cnt_l &= 0xBCFF; // clear send full bit & empty
+	cnt_r &= 0xBFFC; // set recv full bit & empty
+
+	val = ipc_fifoproc_remote.bufipc_fifoproc_remote.head;
+	++ipc_fifoproc_remote.head;
+	--ipc_fifoproc_remote.size;
+	if (ipc_fifoproc_remote.head > 15)
+		ipc_fifoproc_remote.head = 0;
+
+	if (!ipc_fifoproc_remote.size) // FIFO empty
+	{
+		cnt_l |= IPCFIFOCNT_RECVEMPTY;
+		cnt_r |= IPCFIFOCNT_SENDEMPTY;
+
+		if (cnt_r & IPCFIFOCNT_SENDIRQEN)
+			NDS_makeIrq(proc_remote, IRQ_BIT_IPCFIFO_SENDEMPTY);
+	}
+
+	T1WriteWord(MMU.MMU_MEMproc0x40, 0x184, cnt_l);
+	T1WriteWord(MMU.MMU_MEMproc_remote0x40, 0x184, cnt_r);
+
+	NDS_Reschedule();
+
+	return val;
 }
 
-u32 FIFOValue(FIFO * fifo)
+void IPC_FIFOcnt(uint8_t proc, uint16_t val)
 {
- u32 v;
-
-	if(fifo->empty)
- {
- 	fifo->error = true;
- return 0;
- }
- v = fifo->datafifo->begin;
- fifo->begin = (fifo->begin + 1)& 0x7FFF;
- fifo->empty = (fifo->begin == fifo->end);
- return v;
+	uint16_t cnt_l = T1ReadWord(MMU.MMU_MEMproc0x40, 0x184);
+	uint16_t cnt_r = T1ReadWord(MMU.MMU_MEMproc^10x40, 0x184);
+
+	if (val & IPCFIFOCNT_FIFOERROR)
+		// at least SPP uses this, maybe every retail game
+		cnt_l &= ~IPCFIFOCNT_FIFOERROR;
+
+	if (val & IPCFIFOCNT_SENDCLEAR)
+	{
+		ipc_fifoproc.head = 0;
+		ipc_fifoproc.tail = 0;
+		ipc_fifoproc.size = 0;
+
+		cnt_l |= IPCFIFOCNT_SENDEMPTY;
+		cnt_r |= IPCFIFOCNT_RECVEMPTY;
+
+		cnt_l &= ~IPCFIFOCNT_SENDFULL;
+		cnt_r &= ~IPCFIFOCNT_RECVFULL;
+	}
+
+	cnt_l &= ~IPCFIFOCNT_WRITEABLE;
+	cnt_l |= val & IPCFIFOCNT_WRITEABLE;
+
+	// IPCFIFOCNT_SENDIRQEN may have been set (and/or the fifo may have been cleared) so we may need to trigger this irq
+	// (this approach is used by libnds fifo system on occasion in fifoInternalSend, and began happening frequently for value32 with r4326)
+	if ((cnt_l & IPCFIFOCNT_SENDIRQEN) && (cnt_l & IPCFIFOCNT_SENDEMPTY))
+		NDS_makeIrq(proc, IRQ_BIT_IPCFIFO_SENDEMPTY);
+
+	// IPCFIFOCNT_RECVIRQEN may have been set so we may need to trigger this irq
+	if ((cnt_l & IPCFIFOCNT_RECVIRQEN) && !(cnt_l & IPCFIFOCNT_RECVEMPTY))
+		NDS_makeIrq(proc, IRQ_BIT_IPCFIFO_RECVNONEMPTY);
+
+	T1WriteWord(MMU.MMU_MEMproc0x40, 0x184, cnt_l);
+	T1WriteWord(MMU.MMU_MEMproc^10x40, 0x184, cnt_r);
+
+	NDS_Reschedule();
 }

audacious-plugins-3.6.2-gtk3.tar.bz2/src/xsf/desmume/FIFO.h -> audacious-plugins-4.4.1.tar.bz2/src/xsf/desmume/FIFO.h Changed

@@ -1,43 +1,38 @@
-/* Copyright (C) 2006 yopyop
- yopyop156@ifrance.com
- yopyop156.ifrance.com
-
-	Copyright (C) 2007 shash
-
- This file is part of DeSmuME
-
- DeSmuME 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.
-
- DeSmuME 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 DeSmuME; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+/*
+	Copyright 2006 yopyop
+	Copyright 2007 shash
+	Copyright 2007-2011 DeSmuME team
+
+	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
+	(at your option) any later version.
+
+	This file 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 the this software. If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef FIFO_H
-#define FIFO_H
+#pragma once
 
 #include "types.h"
 
-typedef struct
+//=================================================== IPC FIFO
+struct IPC_FIFO
 {
- u32 data0x8000;
- u32 begin;
- u32 end;
- BOOL full;
- BOOL empty;
- BOOL error;
-} FIFO;
-
-void FIFOInit(FIFO * fifo);
-void FIFOAdd(FIFO * fifo, u32 v);
-u32 FIFOValue(FIFO * fifo);
-
-#endif
+	uint32_t buf16;
+
+	uint8_t head;
+	uint8_t tail;
+	uint8_t size;
+};
+
+extern IPC_FIFO ipc_fifo2;
+extern void IPC_FIFOinit(uint8_t proc);
+extern void IPC_FIFOsend(uint8_t proc, uint32_t val);
+extern uint32_t IPC_FIFOrecv(uint8_t proc);
+extern void IPC_FIFOcnt(uint8_t proc, uint16_t val);

audacious-plugins-3.6.2-gtk3.tar.bz2/src/xsf/desmume/MMU.cc -> audacious-plugins-4.4.1.tar.bz2/src/xsf/desmume/MMU.cc Changed

@@ -1,3526 +1,2795 @@
-/* Copyright (C) 2006 yopyop
- yopyop156@ifrance.com
- yopyop156.ifrance.com
-
+/*
+	Copyright (C) 2006 yopyop
 	Copyright (C) 2007 shash
+	Copyright (C) 2007-2012 DeSmuME team
 
- This file is part of DeSmuME
+	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
+	(at your option) any later version.
 
- DeSmuME 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 file 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.
 
- DeSmuME 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 DeSmuME; 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 the this software. If not, see <http://www.gnu.org/licenses/>.
 */
 
-//#define RENDER3D
-
-#include <stdlib.h>
-#include <math.h>
-#include <string.h>
-
-//#include "gl_vertex.h"
-
-#include "debug.h"
+#include <sstream>
+#include <cstdlib>
+#include <cmath>
+#include <cstring>
+#include <cassert>
 #include "NDSSystem.h"
-//#include "cflash.h"
-#define cflash_read(a) 0
-#define cflash_write(a,d)
 #include "cp15.h"
-//#include "wifi.h"
 #include "registers.h"
+#include "mc.h"
+#include "slot1.h"
+#include "readwrite.h"
+#include "MMU_timing.h"
 
-#if VIO2SF_GPU_ENABLE
-#include "render3D.h"
-#else
-#define GPU_setVideoProp(p1, p2)
-#define GPU_setBGProp(p1, p2, p3)
+// http://home.utah.edu/~nahaj/factoring/isqrt.c.html
+static uint64_t isqrt(uint64_t x)
+{
+	if (x < 1)
+		return 0;
+
+	/* Load the binary constant 01 00 00 ... 00, where the number
+	 * of zero bits to the right of the single one bit
+	 * is even, and the one bit is as far left as is consistant
+	 * with that condition.)
+	 */
+	uint64_t squaredbit = (~0LL >> 1) & ~(~0LL >> 2);
+	/* This portable load replaces the loop that used to be
+	 * here, and was donated by legalize@xmission.com
+	 */
+
+	/* Form bits of the answer. */
+	uint64_t remainder = x, root = 0;
+	while (squaredbit > 0)
+	{
+		if (remainder >= (squaredbit | root))
+		{
+			remainder -= squaredbit | root;
+			root >>= 1;
+			root |= squaredbit;
+		}
+		else
+			root >>= 1;
+		squaredbit >>= 2;
+	}
 
-#define GPU_setBLDCNT(p1, p2)
-#define GPU_setBLDALPHA(p1, p2)
-#define GPU_setBLDY(p1, p2)
-#define GPU_setMOSAIC(p1, p2)
+	return root;
+}
 
+uint32_t partie = 1;
+uint32_t _MMU_MAIN_MEM_MASK = 0x3FFFFF;
+uint32_t _MMU_MAIN_MEM_MASK16 = 0x3FFFFF & ~1;
+uint32_t _MMU_MAIN_MEM_MASK32 = 0x3FFFFF & ~3;
 
-#define GPU_remove(p1,p2)
-#define GPU_addBack(p1,p2)
+MMU_struct MMU;
+MMU_struct_new MMU_new;
+MMU_struct_timing MMU_timing;
 
-#define GPU_ChangeGraphicsCore(p1) 0
+uint8_t *MMU_struct::MMU_MEM2256 =
+{
+	//arm9
+	{
+		/* 0X*/	DUP16(MMU.ARM9_ITCM),
+		/* 1X*/	//DUP16(MMU.ARM9_ITCM)
+		/* 1X*/	DUP16(MMU.UNUSED_RAM),
+		/* 2X*/	DUP16(MMU.MAIN_MEM),
+		/* 3X*/	DUP16(MMU.SWIRAM),
+		/* 4X*/	DUP16(MMU.ARM9_REG),
+		/* 5X*/	DUP16(MMU.ARM9_VMEM),
+		/* 6X*/	DUP16(MMU.ARM9_LCD),
+		/* 7X*/	DUP16(MMU.ARM9_OAM),
+		/* 8X*/	DUP16(nullptr),
+		/* 9X*/	DUP16(nullptr),
+		/* AX*/	DUP16(MMU.UNUSED_RAM),
+		/* BX*/	DUP16(MMU.UNUSED_RAM),
+		/* CX*/	DUP16(MMU.UNUSED_RAM),
+		/* DX*/	DUP16(MMU.UNUSED_RAM),
+		/* EX*/	DUP16(MMU.UNUSED_RAM),
+		/* FX*/	DUP16(MMU.ARM9_BIOS)
+	},
+	//arm7
+	{
+		/* 0X*/	DUP16(MMU.ARM7_BIOS),
+		/* 1X*/	DUP16(MMU.UNUSED_RAM),
+		/* 2X*/	DUP16(MMU.MAIN_MEM),
+		/* 3X*/	DUP8(MMU.SWIRAM),
+				DUP8(MMU.ARM7_ERAM),
+		/* 4X*/	DUP8(MMU.ARM7_REG),
+				DUP8(MMU.ARM7_WIRAM),
+		/* 5X*/	DUP16(MMU.UNUSED_RAM),
+		/* 6X*/	DUP16(MMU.ARM9_LCD),
+		/* 7X*/	DUP16(MMU.UNUSED_RAM),
+		/* 8X*/	DUP16(nullptr),
+		/* 9X*/	DUP16(nullptr),
+		/* AX*/	DUP16(MMU.UNUSED_RAM),
+		/* BX*/	DUP16(MMU.UNUSED_RAM),
+		/* CX*/	DUP16(MMU.UNUSED_RAM),
+		/* DX*/	DUP16(MMU.UNUSED_RAM),
+		/* EX*/	DUP16(MMU.UNUSED_RAM),
+		/* FX*/	DUP16(MMU.UNUSED_RAM)
+	}
+};
 
-#define GPU_set_DISPCAPCNT(p1, p2)
-#define GPU_ligne(p1, p2)
-#define GPU_setMasterBrightness(p1, p2)
+uint32_t MMU_struct::MMU_MASK2256 =
+{
+	//arm9
+	{
+		/* 0X*/	DUP16(0x00007FFF),
+		/* 1X*/	//DUP16(0x00007FFF)
+		/* 1X*/	DUP16(0x00000003),
+		/* 2X*/	DUP16(0x003FFFFF),
+		/* 3X*/	DUP16(0x00007FFF),
+		/* 4X*/	DUP16(0x00FFFFFF),
+		/* 5X*/	DUP16(0x000007FF),
+		/* 6X*/	DUP16(0x000FFFFF),
+		/* 7X*/	DUP16(0x000007FF),
+		/* 8X*/	DUP16(0x00000003),
+		/* 9X*/	DUP16(0x00000003),
+		/* AX*/	DUP16(0x00000003),
+		/* BX*/	DUP16(0x00000003),
+		/* CX*/	DUP16(0x00000003),
+		/* DX*/	DUP16(0x00000003),
+		/* EX*/	DUP16(0x00000003),
+		/* FX*/	DUP16(0x00007FFF)
+	},
+	//arm7
+	{
+		/* 0X*/	DUP16(0x00003FFF),
+		/* 1X*/	DUP16(0x00000003),
+		/* 2X*/	DUP16(0x003FFFFF),
+		/* 3X*/	DUP8(0x00007FFF),
+				DUP8(0x0000FFFF),
+		/* 4X*/	DUP8(0x0000FFFF),
+				DUP8(0x0000FFFF),
+		/* 5X*/	DUP16(0x00000003),
+		/* 6X*/	DUP16(0x000FFFFF),
+		/* 7X*/	DUP16(0x00000003),
+		/* 8X*/	DUP16(0x00000003),
+		/* 9X*/	DUP16(0x00000003),
+		/* AX*/	DUP16(0x00000003),
+		/* BX*/	DUP16(0x00000003),
+		/* CX*/	DUP16(0x00000003),
+		/* DX*/	DUP16(0x00000003),
+		/* EX*/	DUP16(0x00000003),
+		/* FX*/	DUP16(0x00000003)
+	}
+};
 
-#define GPU_setWIN0_H(p1, p2)
-#define GPU_setWIN0_H0(p1, p2)
-#define GPU_setWIN0_H1(p1, p2)
+//////////////////////////////////////////////////////////////
 
-#define GPU_setWIN0_V(p1, p2)
-#define GPU_setWIN0_V0(p1, p2)
-#define GPU_setWIN0_V1(p1, p2)
+// -------------
+// VRAM MEMORY MAPPING
+// -------------
+// (Everything is mapped through to ARM9_LCD in blocks of 16KB)
 
-#define GPU_setWIN1_H(p1, p2)
-#define GPU_setWIN1_H0(p1, p2)
-#define GPU_setWIN1_H1(p1, p2)
+// for all of the below, values = 41 indicate unmapped memory
+static const uint8_t VRAM_PAGE_UNMAPPED = 41;
 
-#define GPU_setWIN1_V(p1, p2)
-#define GPU_setWIN1_V0(p1, p2)
-#define GPU_setWIN1_V1(p1, p2)
+static const unsigned VRAM_LCDC_PAGES = 41;
+static uint8_t vram_lcdc_mapVRAM_LCDC_PAGES;
 
-#define GPU_setWININ(p1, p2)
-#define GPU_setWININ0(p1, p2)
-#define GPU_setWININ1(p1, p2)
+// in the range of 0x06000000 - 0x06800000 in 16KB pages (the ARM9 vram mappable area)
+// this maps to 16KB pages in the LCDC buffer which is what will actually contain the data
+uint8_t vram_arm9_mapVRAM_ARM9_PAGES;
 
-#define GPU_setWINOUT16(p1, p2)
-#define GPU_setWINOUT(p1, p2)
-#define GPU_setWINOBJ(p1, p2)
+// this chooses which banks are mapped in the 128K banks starting at 0x06000000 in ARM7
+static uint8_t vram_arm7_map2;
 
-#define GPU_setBLDCNT_LOW(p1, p2)
-#define GPU_setBLDCNT_HIGH(p1, p2)
-#define GPU_setBLDCNT(p1, p2)
+struct TVramBankInfo
+{
+	uint8_t page_addr, num_pages;
+};
 
-#define GPU_setBLDALPHA(p1, p2)
-#define GPU_setBLDALPHA_EVA(p1, p2)
-#define GPU_setBLDALPHA_EVB(p1, p2)
+static const TVramBankInfo vram_bank_infoVRAM_BANKS =
+{
+	{0, 8},
+	{8, 8},
+	{16, 8},
+	{24, 8},
+	{32, 4},
+	{36, 1},
+	{37, 1},
+	{38, 2},
+	{40, 1}
+};
 
-#define GPU_setBLDY_EVY(p1, p2)
-#endif
+// this is to remind you that the LCDC mapping returns a strange value (not 0x06800000) as you would expect
+// in order to play nicely with the MMU address and mask tables
+static const uint32_t LCDC_HACKY_LOCATION = 0x06000000;
 
-#define ROM_MASK 3
+static const uint32_t ARM7_HACKY_IWRAM_LOCATION = 0x03800000;
+static const uint32_t ARM7_HACKY_SIWRAM_LOCATION = 0x03000000;
 
-/*
- *
- */
-//#define PROFILE_MEMORY_ACCESS 1
-#define EARLY_MEMORY_ACCESS 1
+// maps an ARM9 BG/OBJ or LCDC address into an LCDC address, and informs the caller of whether it isn't mapped
+// TODO - in cases where this does some mapping work, we could bypass the logic at the end of the _read* and _write* routines
+// this is a good optimization to consider
+// NOTE - this whole approach is probably fundamentally wrong.
+// according to dasShiny research, its possible to map multiple banks to the same addresses. something more sophisticated would be needed.
+// however, it hasnt proven necessary yet for any known test case.
+static inline uint32_t MMU_LCDmap(int PROCNUM, uint32_t addr, bool &unmapped, bool &restricted)
+{
+	unmapped = false;
+	restricted = false; // this will track whether 8bit writes are allowed
+
+	// handle SIWRAM and non-shared IWRAM in here too, since it is quite similar to vram.
+	// in fact it is probably implemented with the same pieces of hardware.
+	// its sort of like arm7 non-shared IWRAM is lowest priority, and then SIWRAM goes on top.
+	// however, we implement it differently than vram in emulator for historical reasons.
+	// instead of keeping a page map like we do vram, we just have a list of all possible page maps (there are only 4 each for arm9 and arm7)
+	if (addr >= 0x03000000 && addr < 0x04000000)
+	{
+		// blocks 0,1,2,3 is arm7 non-shared IWRAM and blocks 4,5 is SIWRAM, and block 8 is un-mapped zeroes
+		int iwram_block_16k;
+		int iwram_offset = addr & 0x3FFF;
+		addr &= 0x00FFFFFF;
+		if (PROCNUM == ARMCPU_ARM7)
+		{
+			static const int arm7_siwram_blocks44 =
+			{
+				{
+					{0, 1, 2, 3}, //WRAMCNT = 0 -> map to IWRAM
+					{4, 4, 4, 4}, //WRAMCNT = 1 -> map to SIWRAM block 0
+					{5, 5, 5, 5}, //WRAMCNT = 2 -> map to SIWRAM block 1
+					{4, 5, 4, 5}, //WRAMCNT = 3 -> map to SIWRAM blocks 0,1
+				},
+				//high region; always maps to non-shared IWRAM
+				{
+					{0, 1, 2, 3},
+					{0, 1, 2, 3},
+					{0, 1, 2, 3},
+					{0, 1, 2, 3}
+				}
+			};
+			int region = (addr >> 23) & 1;
+			int block = (addr >> 14) & 3;
+			assert(region < 2);
+			assert(block < 4);
+			iwram_block_16k = arm7_siwram_blocksregionMMU.WRAMCNTblock;
+		} //PROCNUM == ARMCPU_ARM7
+		else
+		{
+			// PROCNUM == ARMCPU_ARM9
+			static const int arm9_siwram_blocks4 =
+			{
+				{4, 5, 4, 5}, //WRAMCNT = 0 -> map to SIWRAM blocks 0,1
+				{5, 5, 5, 5}, //WRAMCNT = 1 -> map to SIWRAM block 1
+				{4, 4, 4, 4}, //WRAMCNT = 2 -> map to SIWRAM block 0
+				{8, 8, 8, 8}, //WRAMCNT = 3 -> unmapped
+			};
+			int block = (addr >> 14) & 3;
+			assert(block < 4);
+			iwram_block_16k = arm9_siwram_blocksMMU.WRAMCNTblock;
+		}
 
-#define INTERNAL_DTCM_READ 1
-#define INTERNAL_DTCM_WRITE 1
+		switch (iwram_block_16k >> 2)
+		{
+			case 0: // arm7 non-shared IWRAM
+				return ARM7_HACKY_IWRAM_LOCATION + (iwram_block_16k << 14) + iwram_offset;
+			case 1: //SIWRAM
+				return ARM7_HACKY_SIWRAM_LOCATION + ((iwram_block_16k & 3) << 14) + iwram_offset;
+			case 2: //zeroes
+			CASE2:
+				unmapped = true;
+				return 0;
+			default:
+				assert(false); //how did this happen?
+				goto CASE2;
+		}
+	}
 
-//#define LOG_CARD
-//#define LOG_GPU
-//#define LOG_DMA
-//#define LOG_DMA2
-//#define LOG_DIV
+	// in case the address is entirely outside of the interesting VRAM ranges
+	if (addr < 0x06000000)
+		return addr;
+	if (addr >= 0x07000000)
+		return addr;
 
-char szRomPath512;
-char szRomBaseName512;
+	restricted = true;
 
-#define DUP2(x) x, x
-#define DUP4(x) x, x, x, x
-#define DUP8(x) x, x, x, x, x, x, x, x
-#define DUP16(x) x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x
+	// handle LCD memory mirroring
+	// TODO - this is gross! this should be renovated if the vram mapping is ever done in a more sophisticated way taking into account dasShiny research
+	if (addr >= 0x068A4000)
+		addr = 0x06800000 +
+		//(addr % 0xA4000); // yuck!! is this even how it mirrors? but we have to keep from overrunning the buffer somehow
+		(addr & 0x80000); // just as likely to be right (I have no clue how it should work) but faster.
 
-MMU_struct MMU;
+	uint32_t vram_page;
+	uint32_t ofs = addr & 0x3FFF;
 
-u8 * MMU_ARM9_MEM_MAP256={
-/* 0X*/	DUP16(ARM9Mem.ARM9_ITCM),
-/* 1X*/	//DUP16(ARM9Mem.ARM9_ITCM)
-/* 1X*/	DUP16(ARM9Mem.ARM9_WRAM),
-/* 2X*/	DUP16(ARM9Mem.MAIN_MEM),
-/* 3X*/	DUP16(MMU.SWIRAM),
-/* 4X*/	DUP16(ARM9Mem.ARM9_REG),
-/* 5X*/	DUP16(ARM9Mem.ARM9_VMEM),
-/* 6X*/	DUP2(ARM9Mem.ARM9_ABG),
-		DUP2(ARM9Mem.ARM9_BBG),
-		DUP2(ARM9Mem.ARM9_AOBJ),
-		DUP2(ARM9Mem.ARM9_BOBJ),
-		DUP8(ARM9Mem.ARM9_LCD),
-/* 7X*/	DUP16(ARM9Mem.ARM9_OAM),
-/* 8X*/	DUP16(nullptr),
-/* 9X*/	DUP16(nullptr),
-/* AX*/	DUP16(MMU.CART_RAM),
-/* BX*/	DUP16(MMU.UNUSED_RAM),
-/* CX*/	DUP16(MMU.UNUSED_RAM),
-/* DX*/	DUP16(MMU.UNUSED_RAM),
-/* EX*/	DUP16(MMU.UNUSED_RAM),
-/* FX*/	DUP16(ARM9Mem.ARM9_BIOS)
-};
+	// return addresses in LCDC range
+	if (addr >= 0x06800000)
+	{
+		// already in LCDC range. just look it up to see whether it is unmapped
+		vram_page = (addr >> 14) & 63;
+		assert(vram_page < VRAM_LCDC_PAGES);
+		vram_page = vram_lcdc_mapvram_page;
+	}
+	else
+	{
+		// map addresses in BG/OBJ range to an LCDC range
+		vram_page = (addr >> 14) & (VRAM_ARM9_PAGES - 1);
+		assert(vram_page < VRAM_ARM9_PAGES);
+		vram_page = vram_arm9_mapvram_page;
+	}
 
-u32 MMU_ARM9_MEM_MASK256={
-/* 0X*/	DUP16(0x00007FFF),
-/* 1X*/	//DUP16(0x00007FFF)
-/* 1X*/	DUP16(0x00FFFFFF),
-/* 2X*/	DUP16(0x003FFFFF),
-/* 3X*/	DUP16(0x00007FFF),
-/* 4X*/	DUP16(0x00FFFFFF),
-/* 5X*/	DUP16(0x000007FF),
-/* 6X*/	DUP2(0x0007FFFF),
-		DUP2(0x0001FFFF),
-		DUP2(0x0003FFFF),
-		DUP2(0x0001FFFF),
-		DUP8(0x000FFFFF),
-/* 7X*/	DUP16(0x000007FF),
-/* 8X*/	DUP16(ROM_MASK),
-/* 9X*/	DUP16(ROM_MASK),
-/* AX*/	DUP16(0x0000FFFF),
-/* BX*/	DUP16(0x00000003),
-/* CX*/	DUP16(0x00000003),
-/* DX*/	DUP16(0x00000003),
-/* EX*/	DUP16(0x00000003),
-/* FX*/	DUP16(0x00007FFF)
-};
+	if (vram_page == VRAM_PAGE_UNMAPPED)
+	{
+		unmapped = true;
+		return 0;
+	}
+	else
+		return LCDC_HACKY_LOCATION + (vram_page << 14) + ofs;
+}
 
-u8 * MMU_ARM7_MEM_MAP256={
-/* 0X*/	DUP16(MMU.ARM7_BIOS),
-/* 1X*/	DUP16(MMU.UNUSED_RAM),
-/* 2X*/	DUP16(ARM9Mem.MAIN_MEM),
-/* 3X*/	DUP8(MMU.SWIRAM),
-		DUP8(MMU.ARM7_ERAM),
-/* 4X*/	DUP8(MMU.ARM7_REG),
-		DUP8(MMU.ARM7_WIRAM),
-/* 5X*/	DUP16(MMU.UNUSED_RAM),
-/* 6X*/	DUP16(ARM9Mem.ARM9_ABG),
-/* 7X*/	DUP16(MMU.UNUSED_RAM),
-/* 8X*/	DUP16(nullptr),
-/* 9X*/	DUP16(nullptr),
-/* AX*/	DUP16(MMU.CART_RAM),
-/* BX*/	DUP16(MMU.UNUSED_RAM),
-/* CX*/	DUP16(MMU.UNUSED_RAM),
-/* DX*/	DUP16(MMU.UNUSED_RAM),
-/* EX*/	DUP16(MMU.UNUSED_RAM),
-/* FX*/	DUP16(MMU.UNUSED_RAM)
-};
+VramConfiguration vramConfiguration;
 
-u32 MMU_ARM7_MEM_MASK256={
-/* 0X*/	DUP16(0x00003FFF),
-/* 1X*/	DUP16(0x00000003),
-/* 2X*/	DUP16(0x003FFFFF),
-/* 3X*/	DUP8(0x00007FFF),
-		DUP8(0x0000FFFF),
-/* 4X*/	DUP8(0x00FFFFFF),
-		DUP8(0x0000FFFF),
-/* 5X*/	DUP16(0x00000003),
-/* 6X*/	DUP16(0x0003FFFF),
-/* 7X*/	DUP16(0x00000003),
-/* 8X*/	DUP16(ROM_MASK),
-/* 9X*/	DUP16(ROM_MASK),
-/* AX*/	DUP16(0x0000FFFF),
-/* BX*/	DUP16(0x00000003),
-/* CX*/	DUP16(0x00000003),
-/* DX*/	DUP16(0x00000003),
-/* EX*/	DUP16(0x00000003),
-/* FX*/	DUP16(0x00000003)
-};
+// maps the specified bank to LCDC
+static inline void MMU_vram_lcdc(int bank)
+{
+	for (int i = 0; i < vram_bank_infobank.num_pages; ++i)
+	{
+		int page = vram_bank_infobank.page_addr + i;
+		vram_lcdc_mappage = page;
+	}
+}
 
-u32 MMU_ARM9_WAIT1616={
-	1, 1, 1, 1, 1, 1, 1, 1, 5, 5, 5, 1, 1, 1, 1, 1,
-};
+// maps the specified bank to ARM9 at the provided page offset
+static inline void MMU_vram_arm9(int bank, int offset)
+{
+	for (int i = 0; i < vram_bank_infobank.num_pages; ++i)
+		vram_arm9_mapi + offset = vram_bank_infobank.page_addr + i;
+}
 
-u32 MMU_ARM9_WAIT3216={
-	1, 1, 1, 1, 1, 2, 2, 1, 8, 8, 5, 1, 1, 1, 1, 1,
-};
+static inline uint8_t *MMU_vram_physical(int page)
+{
+	return MMU.ARM9_LCD + (page/**ADDRESS_STEP_16KB*/);
+}
 
-u32 MMU_ARM7_WAIT1616={
-	1, 1, 1, 1, 1, 1, 1, 1, 5, 5, 5, 1, 1, 1, 1, 1,
-};
+// todo - templateize
+static inline void MMU_VRAMmapRefreshBank(int bank)
+{
+	int block = bank;
+	if (bank >= VRAM_BANK_H)
+		++block;
 
-u32 MMU_ARM7_WAIT3216={
-	1, 1, 1, 1, 1, 1, 1, 1, 8, 8, 5, 1, 1, 1, 1, 1,
-};
+	uint8_t VRAMBankCnt = T1ReadByte(MMU.MMU_MEMARMCPU_ARM90x40, 0x240 + block);
 
-void MMU_Init(void) {
-	int i;
+	// do nothing if the bank isnt enabled
+	uint8_t en = VRAMBankCnt & 0x80;
+	if (!en)
+		return;
 
-	LOG("MMU init\n");
+	int mst, ofs = 0;
+	switch (bank)
+	{
+		case VRAM_BANK_A:
+		case VRAM_BANK_B:
+			mst = VRAMBankCnt & 3;
+			ofs = (VRAMBankCnt >> 3) & 3;
+			switch (mst)
+			{
+				case 0: // LCDC
+					vramConfiguration.banksbank.purpose = VramConfiguration::LCDC;
+					MMU_vram_lcdc(bank);
+					break;
+				case 1: // ABG
+					vramConfiguration.banksbank.purpose = VramConfiguration::ABG;
+					MMU_vram_arm9(bank, VRAM_PAGE_ABG + ofs * 8);
+					break;
+				case 2: // AOBJ
+					vramConfiguration.banksbank.purpose = VramConfiguration::AOBJ;
+					switch (ofs)
+					{
+						case 0:
+						case 1:
+							MMU_vram_arm9(bank, VRAM_PAGE_AOBJ + ofs * 8);
+					}
+					break;
+				case 3: // texture
+					vramConfiguration.banksbank.purpose = VramConfiguration::TEX;
+					MMU.texInfo.textureSlotAddrofs = MMU_vram_physical(vram_bank_infobank.page_addr);
+					break;
+				default:
+					goto unsupported_mst;
+			}
+			break;
 
-	memset(&MMU, 0, sizeof(MMU_struct));
+		case VRAM_BANK_C:
+		case VRAM_BANK_D:
+			mst = VRAMBankCnt & 7;
+			ofs = (VRAMBankCnt >> 3) & 3;
+			switch (mst)
+			{
+				case 0: // LCDC
+					vramConfiguration.banksbank.purpose = VramConfiguration::LCDC;
+					MMU_vram_lcdc(bank);
+					break;
+				case 1: // ABG
+					vramConfiguration.banksbank.purpose = VramConfiguration::ABG;
+					MMU_vram_arm9(bank, VRAM_PAGE_ABG + ofs * 8);
+					break;
+				case 2: // arm7
+					vramConfiguration.banksbank.purpose = VramConfiguration::ARM7;
+					if (bank == 2)
+						T1WriteByte(MMU.MMU_MEMARMCPU_ARM70x40, 0x240, T1ReadByte(MMU.MMU_MEMARMCPU_ARM70x40, 0x240) | 1);
+					if (bank == 3)
+						T1WriteByte(MMU.MMU_MEMARMCPU_ARM70x40, 0x240, T1ReadByte(MMU.MMU_MEMARMCPU_ARM70x40, 0x240) | 2);
+					switch (ofs)
+					{
+						case 0:
+						case 1:
+							vram_arm7_mapofs = vram_bank_infobank.page_addr;
+					}
+					break;
+				case 3: // texture
+					vramConfiguration.banksbank.purpose = VramConfiguration::TEX;
+					MMU.texInfo.textureSlotAddrofs = MMU_vram_physical(vram_bank_infobank.page_addr);
+					break;
+				case 4: // BGB or BOBJ
+					if (bank == VRAM_BANK_C)
+					{
+						vramConfiguration.banksbank.purpose = VramConfiguration::BBG;
+						MMU_vram_arm9(bank, VRAM_PAGE_BBG); // BBG
+					}
+					else
+					{
+						vramConfiguration.banksbank.purpose = VramConfiguration::BOBJ;
+						MMU_vram_arm9(bank, VRAM_PAGE_BOBJ); // BOBJ
+					}
+					break;
+				default:
+					goto unsupported_mst;
+			}
+			break;
 
-	MMU.CART_ROM = MMU.UNUSED_RAM;
+		case VRAM_BANK_E:
+			mst = VRAMBankCnt & 7;
+			switch (mst)
+			{
+				case 0: // LCDC
+					vramConfiguration.banksbank.purpose = VramConfiguration::LCDC;
+					MMU_vram_lcdc(bank);
+					break;
+				case 1: // ABG
+					vramConfiguration.banksbank.purpose = VramConfiguration::ABG;
+					MMU_vram_arm9(bank, VRAM_PAGE_ABG);
+					break;
+				case 2: // AOBJ
+					vramConfiguration.banksbank.purpose = VramConfiguration::AOBJ;
+					MMU_vram_arm9(bank, VRAM_PAGE_AOBJ);
+					break;
+				case 3: // texture palette
+					vramConfiguration.banksbank.purpose = VramConfiguration::TEXPAL;
+					MMU.texInfo.texPalSlot0 = MMU_vram_physical(vram_bank_infobank.page_addr);
+					MMU.texInfo.texPalSlot1 = MMU_vram_physical(vram_bank_infobank.page_addr + 1);
+					MMU.texInfo.texPalSlot2 = MMU_vram_physical(vram_bank_infobank.page_addr + 2);
+					MMU.texInfo.texPalSlot3 = MMU_vram_physical(vram_bank_infobank.page_addr + 3);
+					break;
+				case 4: // ABG extended palette
+					vramConfiguration.banksbank.purpose = VramConfiguration::ABGEXTPAL;
+					MMU.ExtPal00 = MMU_vram_physical(vram_bank_infobank.page_addr);
+					MMU.ExtPal01 = MMU.ExtPal00/* + ADDRESS_STEP_8KB*/;
+					MMU.ExtPal02 = MMU.ExtPal01/* + ADDRESS_STEP_8KB*/;
+					MMU.ExtPal03 = MMU.ExtPal02/* + ADDRESS_STEP_8KB*/;
+					break;
+				default:
+					goto unsupported_mst;
+			}
+			break;
+
+		case VRAM_BANK_F:
+		case VRAM_BANK_G:
+		{
+			mst = VRAMBankCnt & 7;
+			ofs = (VRAMBankCnt >> 3) & 3;
+			const int pageofslut = {0, 1, 4, 5};
+			int pageofs = pageofslutofs;
+			switch (mst)
+			{
+				case 0: // LCDC
+					vramConfiguration.banksbank.purpose = VramConfiguration::LCDC;
+					MMU_vram_lcdc(bank);
+					break;
+				case 1: // ABG
+					vramConfiguration.banksbank.purpose = VramConfiguration::ABG;
+					MMU_vram_arm9(bank, VRAM_PAGE_ABG + pageofs);
+					MMU_vram_arm9(bank, VRAM_PAGE_ABG + pageofs + 2); // unexpected mirroring (required by spyro eternal night)
+					break;
+				case 2: // AOBJ
+					vramConfiguration.banksbank.purpose = VramConfiguration::AOBJ;
+					MMU_vram_arm9(bank, VRAM_PAGE_AOBJ + pageofs);
+					MMU_vram_arm9(bank, VRAM_PAGE_AOBJ + pageofs + 2); // unexpected mirroring - I have no proof, but it is inferred from the ABG above
+					break;
+				case 3: // texture palette
+					vramConfiguration.banksbank.purpose = VramConfiguration::TEXPAL;
+					MMU.texInfo.texPalSlotpageofs = MMU_vram_physical(vram_bank_infobank.page_addr);
+					break;
+				case 4: // ABG extended palette
+					switch (ofs)
+					{
+						case 0:
+						case 1:
+							vramConfiguration.banksbank.purpose = VramConfiguration::ABGEXTPAL;
+							MMU.ExtPal0ofs * 2 = MMU_vram_physical(vram_bank_infobank.page_addr);
+							MMU.ExtPal0ofs * 2 + 1 = MMU.ExtPal0ofs * 2/* + ADDRESS_STEP_8KB*/;
+							break;
+						default:
+							vramConfiguration.banksbank.purpose = VramConfiguration::INVALID;
+					}
+					break;
+				case 5: // AOBJ extended palette
+					vramConfiguration.banksbank.purpose = VramConfiguration::AOBJEXTPAL;
+					MMU.ObjExtPal00 = MMU_vram_physical(vram_bank_infobank.page_addr);
+					MMU.ObjExtPal01 = MMU.ObjExtPal01/* + ADDRESS_STEP_8KB*/;
+					break;
+				default:
+					goto unsupported_mst;
+			}
+			break;
+		}
+
+		case VRAM_BANK_H:
+			mst = VRAMBankCnt & 3;
+			switch (mst)
+			{
+				case 0: // LCDC
+					vramConfiguration.banksbank.purpose = VramConfiguration::LCDC;
+					MMU_vram_lcdc(bank);
+					break;
+				case 1: // BBG
+					vramConfiguration.banksbank.purpose = VramConfiguration::BBG;
+					MMU_vram_arm9(bank, VRAM_PAGE_BBG);
+					MMU_vram_arm9(bank, VRAM_PAGE_BBG + 4); // unexpected mirroring
+					break;
+				case 2: // BBG extended palette
+					vramConfiguration.banksbank.purpose = VramConfiguration::BBGEXTPAL;
+					MMU.ExtPal10 = MMU_vram_physical(vram_bank_infobank.page_addr);
+					MMU.ExtPal11 = MMU.ExtPal10/* + ADDRESS_STEP_8KB*/;
+					MMU.ExtPal12 = MMU.ExtPal11/* + ADDRESS_STEP_8KB*/;
+					MMU.ExtPal13 = MMU.ExtPal12/* + ADDRESS_STEP_8KB*/;
+					break;
+				default:
+					goto unsupported_mst;
+			}
+			break;
+
+		case VRAM_BANK_I:
+			mst = VRAMBankCnt & 3;
+			switch (mst)
+			{
+				case 0: // LCDC
+					vramConfiguration.banksbank.purpose = VramConfiguration::LCDC;
+					MMU_vram_lcdc(bank);
+					break;
+				case 1: // BBG
+					vramConfiguration.banksbank.purpose = VramConfiguration::BBG;
+					MMU_vram_arm9(bank, VRAM_PAGE_BBG + 2);
+					MMU_vram_arm9(bank, VRAM_PAGE_BBG + 3); // unexpected mirroring
+					break;
+				case 2: // BOBJ
+					vramConfiguration.banksbank.purpose = VramConfiguration::BOBJ;
+					MMU_vram_arm9(bank, VRAM_PAGE_BOBJ);
+					MMU_vram_arm9(bank, VRAM_PAGE_BOBJ + 1); // FF3 end scene (lens flare sprite) needs this as it renders a sprite off the end of the 16KB and back around
+					break;
+				case 3: // BOBJ extended palette
+					vramConfiguration.banksbank.purpose = VramConfiguration::BOBJEXTPAL;
+					MMU.ObjExtPal10 = MMU_vram_physical(vram_bank_infobank.page_addr);
+					MMU.ObjExtPal11 = MMU.ObjExtPal11/* + ADDRESS_STEP_8KB*/;
+					break;
+				default:
+					goto unsupported_mst;
+			}
+			break;
+	} // switch(bank)
+
+	vramConfiguration.banksbank.ofs = ofs;
+
+	return;
 
- for(i = 0x80; i<0xA0; ++i)
- {
- MMU_ARM9_MEM_MAPi = MMU.CART_ROM;
- MMU_ARM7_MEM_MAPi = MMU.CART_ROM;
- }
+unsupported_mst:
+	vramConfiguration.banksbank.purpose = VramConfiguration::INVALID;
+}
 
-	MMU.MMU_MEM0 = MMU_ARM9_MEM_MAP;
-	MMU.MMU_MEM1 = MMU_ARM7_MEM_MAP;
-	MMU.MMU_MASK0= MMU_ARM9_MEM_MASK;
-	MMU.MMU_MASK1 = MMU_ARM7_MEM_MASK;
+void MMU_VRAM_unmap_all()
+{
+	vramConfiguration.clear();
 
-	MMU.ITCMRegion = 0x00800000;
+	vram_arm7_map0 = VRAM_PAGE_UNMAPPED;
+	vram_arm7_map1 = VRAM_PAGE_UNMAPPED;
 
-	MMU.MMU_WAIT160 = MMU_ARM9_WAIT16;
-	MMU.MMU_WAIT161 = MMU_ARM7_WAIT16;
-	MMU.MMU_WAIT320 = MMU_ARM9_WAIT32;
-	MMU.MMU_WAIT321 = MMU_ARM7_WAIT32;
+	for (unsigned i = 0; i < VRAM_LCDC_PAGES; ++i)
+		vram_lcdc_mapi = VRAM_PAGE_UNMAPPED;
+	for (int i = 0; i < VRAM_ARM9_PAGES; ++i)
+		vram_arm9_mapi = VRAM_PAGE_UNMAPPED;
 
-	for(i = 0;i < 16;i++)
-		FIFOInit(MMU.fifos + i);
+	for (int i = 0; i < 4; ++i)
+	{
+		MMU.ExtPal0i = MMU.blank_memory;
+		MMU.ExtPal1i = MMU.blank_memory;
+	}
 
- mc_init(&MMU.fw, MC_TYPE_FLASH); /* init fw device */
- mc_alloc(&MMU.fw, NDS_FW_SIZE_V1);
- MMU.fw.fp = nullptr;
+	MMU.ObjExtPal00 = MMU.blank_memory;
+	MMU.ObjExtPal01 = MMU.blank_memory;
+	MMU.ObjExtPal10 = MMU.blank_memory;
+	MMU.ObjExtPal11 = MMU.blank_memory;
 
- // Init Backup Memory device, this should really be done when the rom is loaded
- mc_init(&MMU.bupmem, MC_TYPE_AUTODETECT);
- mc_alloc(&MMU.bupmem, 1);
- MMU.bupmem.fp = nullptr;
+	for (int i = 0; i < 6; ++i)
+		MMU.texInfo.texPalSloti = MMU.blank_memory;
 
+	for (int i = 0; i < 4; ++i)
+		MMU.texInfo.textureSlotAddri = MMU.blank_memory;
 }
 
-void MMU_DeInit(void) {
-	LOG("MMU deinit\n");
-// if (MMU.fw.fp)
-// fclose(MMU.fw.fp);
- mc_free(&MMU.fw);
-// if (MMU.bupmem.fp)
-// fclose(MMU.bupmem.fp);
- mc_free(&MMU.bupmem);
+static inline void MMU_VRAMmapControl(uint8_t block, uint8_t VRAMBankCnt)
+{
+	// handle WRAM, first of all
+	if (block == 7)
+	{
+		MMU.WRAMCNT = VRAMBankCnt & 3;
+		return;
+	}
+
+	// first, save the texture info so we can check it for changes and trigger purges of the texcache
+	//MMU_struct::TextureInfo oldTexInfo = MMU.texInfo;
+
+	// unmap everything
+	MMU_VRAM_unmap_all();
+
+	// unmap VRAM_BANK_C and VRAM_BANK_D from arm7. theyll get mapped again in a moment if necessary
+	T1WriteByte(MMU.MMU_MEMARMCPU_ARM70x40, 0x240, 0);
+
+	// write the new value to the reg
+	T1WriteByte(MMU.MMU_MEMARMCPU_ARM90x40, 0x240 + block, VRAMBankCnt);
+
+	// refresh all bank settings
+	// zero XX-XX-200X (long before jun 2012)
+	// these are enumerated so that we can tune the order they get applied
+	// in order to emulate prioritization rules for memory regions
+	// with multiple banks mapped.
+	// We're probably still not mapping things 100% correctly, but this helped us get closer:
+	// goblet of fire "care of magical creatures" maps I and D to BOBJ (the I is an accident)
+	// and requires A to override it.
+	// This may create other bugs....
+	MMU_VRAMmapRefreshBank(VRAM_BANK_I);
+	MMU_VRAMmapRefreshBank(VRAM_BANK_H);
+	MMU_VRAMmapRefreshBank(VRAM_BANK_G);
+	MMU_VRAMmapRefreshBank(VRAM_BANK_F);
+	MMU_VRAMmapRefreshBank(VRAM_BANK_E);
+	// zero 21-jun-2012
+	// tomwi's streaming music demo sets A and D to ABG (the A is an accident).
+	// in this case, D should get priority.
+	// this is somewhat risky. will it break other things?
+	MMU_VRAMmapRefreshBank(VRAM_BANK_A);
+	MMU_VRAMmapRefreshBank(VRAM_BANK_B);
+	MMU_VRAMmapRefreshBank(VRAM_BANK_C);
+	MMU_VRAMmapRefreshBank(VRAM_BANK_D);
+
+	//fprintf(stderr, vramConfiguration.describe().c_str());
+	//fprintf(stderr, "vram remapped at vcount=%d\n",nds.VCount);
+
+	// -------------------------------
+	// set up arm9 mirrorings
+	// these are probably not entirely accurate. more study will be necessary.
+	// in general, we find that it is not uncommon at all for games to accidentally do this.
+	//
+	// being able to easily do these experiments was one of the primary motivations for this remake of the vram mapping system
+
+	// see the "unexpected mirroring" comments above for some more mirroring
+	// so far "unexpected mirrorings" are tested by combining these games:
+	// despereaux - storybook subtitles
+	// NSMB - world map sub screen
+	// drill spirits EU - mission select (just for control purposes, as it doesnt use H or I)
+	// ...
+	// note that the "unexpected mirroring" items above may at some point rely on being executed in a certain order.
+	// (sequentially A..I)
+
+	const int types = { VRAM_PAGE_ABG, VRAM_PAGE_BBG, VRAM_PAGE_AOBJ, VRAM_PAGE_BOBJ };
+	const int sizes = {32, 8, 16, 8};
+	for (int t = 0; t < 4; ++t)
+	{
+		// the idea here is to pad out the mirrored space with copies of the mappable area,
+		// without respect to what is mapped within that mappable area.
+		// we hope that this is correct in all cases
+		// required for driller spirits in mission select (mapping is simple A,B,C,D to each purpose)
+		int size = sizest;
+		int mask = size - 1;
+		int type = typest;
+		for (int i = size; i < 128; ++i)
+		{
+			int page = type + i;
+			vram_arm9_mappage = vram_arm9_maptype + (i & mask);
+		}
+	}
 }
 
-//Card rom & ram
+//////////////////////////////////////////////////////////////
+//end vram
+//////////////////////////////////////////////////////////////
+
+void MMU_Init()
+{
+	memset((void*)&MMU, 0, sizeof(MMU_struct));
+
+	MMU.CART_ROM = MMU.UNUSED_RAM;
 
-u16 SPI_CNT = 0;
-u16 SPI_CMD = 0;
-u16 AUX_SPI_CNT = 0;
-u16 AUX_SPI_CMD = 0;
+	// even though apps may change dtcm immediately upon startup, this is the correct hardware starting value:
+	MMU.DTCMRegion = 0x08000000;
+	MMU.ITCMRegion = 0x00000000;
 
-u32 rom_mask = 0;
+	IPC_FIFOinit(ARMCPU_ARM9);
+	IPC_FIFOinit(ARMCPU_ARM7);
+	new(&MMU_new) MMU_struct_new;
 
-u32 DMASrc24 = {{0, 0, 0, 0}, {0, 0, 0, 0}};
-u32 DMADst24 = {{0, 0, 0, 0}, {0, 0, 0, 0}};
+	mc_init(&MMU.fw, MC_TYPE_FLASH); /* init fw device */
+	mc_alloc(&MMU.fw, NDS_FW_SIZE_V1);
+	MMU.fw.fp = nullptr;
+	MMU.fw.isFirmware = true;
+}
 
-void MMU_clearMem()
+void MMU_DeInit()
 {
-	int i;
-
-	memset(ARM9Mem.ARM9_ABG, 0, 0x080000);
-	memset(ARM9Mem.ARM9_AOBJ, 0, 0x040000);
-	memset(ARM9Mem.ARM9_BBG, 0, 0x020000);
-	memset(ARM9Mem.ARM9_BOBJ, 0, 0x020000);
-	memset(ARM9Mem.ARM9_DTCM, 0, 0x4000);
-	memset(ARM9Mem.ARM9_ITCM, 0, 0x8000);
-	memset(ARM9Mem.ARM9_LCD, 0, 0x0A4000);
-	memset(ARM9Mem.ARM9_OAM, 0, 0x0800);
-	memset(ARM9Mem.ARM9_REG, 0, 0x01000000);
-	memset(ARM9Mem.ARM9_VMEM, 0, 0x0800);
-	memset(ARM9Mem.ARM9_WRAM, 0, 0x01000000);
-	memset(ARM9Mem.MAIN_MEM, 0, 0x400000);
-
-	memset(ARM9Mem.blank_memory, 0, 0x020000);
-
-	memset(MMU.ARM7_ERAM, 0, 0x010000);
-	memset(MMU.ARM7_REG, 0, 0x010000);
-
-	for(i = 0;i < 16;i++)
-	FIFOInit(MMU.fifos + i);
-
-	MMU.DTCMRegion = 0;
-	MMU.ITCMRegion = 0x00800000;
-
-	memset(MMU.timer, 0, sizeof(u16) * 2 * 4);
-	memset(MMU.timerMODE, 0, sizeof(s32) * 2 * 4);
-	memset(MMU.timerON, 0, sizeof(u32) * 2 * 4);
-	memset(MMU.timerRUN, 0, sizeof(u32) * 2 * 4);
-	memset(MMU.timerReload, 0, sizeof(u16) * 2 * 4);
-
-	memset(MMU.reg_IME, 0, sizeof(u32) * 2);
-	memset(MMU.reg_IE, 0, sizeof(u32) * 2);
-	memset(MMU.reg_IF, 0, sizeof(u32) * 2);
-
-	memset(MMU.DMAStartTime, 0, sizeof(u32) * 2 * 4);
-	memset(MMU.DMACycle, 0, sizeof(s32) * 2 * 4);
-	memset(MMU.DMACrt, 0, sizeof(u32) * 2 * 4);
-	memset(MMU.DMAing, 0, sizeof(BOOL) * 2 * 4);
-
-	memset(MMU.dscard, 0, sizeof(nds_dscard) * 2);
-
-	MainScreen.offset = 192;
-	SubScreen.offset = 0;
-
- /* setup the texture slot pointers */
-#if 0
- ARM9Mem.textureSlotAddr0 = ARM9Mem.blank_memory;
- ARM9Mem.textureSlotAddr1 = ARM9Mem.blank_memory;
- ARM9Mem.textureSlotAddr2 = ARM9Mem.blank_memory;
- ARM9Mem.textureSlotAddr3 = ARM9Mem.blank_memory;
-#else
- ARM9Mem.textureSlotAddr0 = &ARM9Mem.ARM9_LCD0x20000 * 0;
- ARM9Mem.textureSlotAddr1 = &ARM9Mem.ARM9_LCD0x20000 * 1;
- ARM9Mem.textureSlotAddr2 = &ARM9Mem.ARM9_LCD0x20000 * 2;
- ARM9Mem.textureSlotAddr3 = &ARM9Mem.ARM9_LCD0x20000 * 3;
-#endif
+	mc_free(&MMU.fw);
 }
 
-/* the VRAM blocks keep their content even when not blended in */
-/* to ensure that we write the content back to the LCD ram */
-/* FIXME: VRAM Bank E,F,G,H,I missing */
-void MMU_VRAMWriteBackToLCD(u8 block)
+void MMU_Reset()
 {
-	u8 *destination;
-	u8 *source;
-	u32 size ;
-	u8 VRAMBankCnt;
-	#if 1
-		return ;
-	#endif
-	destination = 0 ;
-	source = 0;
-	VRAMBankCnt = MMU_read8(ARMCPU_ARM9,REG_VRAMCNTA+block) ;
-	switch (block)
-	{
-		case 0: // Bank A
-			destination = ARM9Mem.ARM9_LCD ;
-			size = 0x20000 ;
-			break ;
-		case 1: // Bank B
-			destination = ARM9Mem.ARM9_LCD + 0x20000 ;
-			size = 0x20000 ;
-			break ;
-		case 2: // Bank C
-			destination = ARM9Mem.ARM9_LCD + 0x40000 ;
-			size = 0x20000 ;
-			break ;
-		case 3: // Bank D
-			destination = ARM9Mem.ARM9_LCD + 0x60000 ;
-			size = 0x20000 ;
-			break ;
-		case 4: // Bank E
-			destination = ARM9Mem.ARM9_LCD + 0x80000 ;
-			size = 0x10000 ;
-			break ;
-		case 5: // Bank F
-			destination = ARM9Mem.ARM9_LCD + 0x90000 ;
-			size = 0x4000 ;
-			break ;
-		case 6: // Bank G
-			destination = ARM9Mem.ARM9_LCD + 0x94000 ;
-			size = 0x4000 ;
-			break ;
-		case 8: // Bank H
-			destination = ARM9Mem.ARM9_LCD + 0x98000 ;
-			size = 0x8000 ;
-			break ;
-		case 9: // Bank I
-			destination = ARM9Mem.ARM9_LCD + 0xA0000 ;
-			size = 0x4000 ;
-			break ;
-		default:
-			return ;
-	}
-	switch (VRAMBankCnt & 7) {
-		case 0:
-			/* vram is allready stored at LCD, we dont need to write it back */
-			MMU.vScreen = 1;
-			break ;
-		case 1:
-	switch(block){
-	case 0:
-	case 1:
-	case 2:
-	case 3:
-		/* banks are in use for BG at ABG + ofs * 0x20000 */
-				source = ARM9Mem.ARM9_ABG + ((VRAMBankCnt >> 3) & 3) * 0x20000 ;
-		break ;
-	case 4:
-		/* bank E is in use at ABG */
-		source = ARM9Mem.ARM9_ABG ;
-		break;
-	case 5:
-	case 6:
-		/* banks are in use for BG at ABG + (0x4000*OFS.0)+(0x10000*OFS.1)*/
-		source = ARM9Mem.ARM9_ABG + (((VRAMBankCnt >> 3) & 1) * 0x4000) + (((VRAMBankCnt >> 2) & 1) * 0x10000) ;
-		break;
-	case 8:
-		/* bank H is in use at BBG */
-		source = ARM9Mem.ARM9_BBG ;
-		break ;
-	case 9:
-		/* bank I is in use at BBG */
-		source = ARM9Mem.ARM9_BBG + 0x8000 ;
-		break;
-	default: return ;
-	}
-			break ;
-		case 2:
-			if (block < 2)
-			{
-				/* banks A,B are in use for OBJ at AOBJ + ofs * 0x20000 */
-				source = ARM9Mem.ARM9_AOBJ + ((VRAMBankCnt >> 3) & 1) * 0x20000 ;
-			} else return ;
-			break ;
-		case 4:
-	switch(block){
-	case 2:
-		/* bank C is in use at BBG */
-		source = ARM9Mem.ARM9_BBG ;
-		break ;
-	case 3:
-		/* bank D is in use at BOBJ */
-		source = ARM9Mem.ARM9_BOBJ ;
-		break ;
-	default: return ;
-	}
-			break ;
-		default:
-			return ;
-	}
-	if (!destination) return ;
-	if (!source) return ;
-	memcpy(destination,source,size) ;
+	memset(MMU.ARM9_DTCM, 0, sizeof(MMU.ARM9_DTCM));
+	memset(MMU.ARM9_ITCM, 0, sizeof(MMU.ARM9_ITCM));
+	memset(MMU.ARM9_LCD, 0, sizeof(MMU.ARM9_LCD));
+	memset(MMU.ARM9_OAM, 0, sizeof(MMU.ARM9_OAM));
+	memset(MMU.ARM9_REG, 0, sizeof(MMU.ARM9_REG));
+	memset(MMU.ARM9_VMEM, 0, sizeof(MMU.ARM9_VMEM));
+	memset(MMU.MAIN_MEM, 0, sizeof(MMU.MAIN_MEM));
+
+	memset(MMU.blank_memory, 0, sizeof(MMU.blank_memory));
+	memset(MMU.UNUSED_RAM, 0, sizeof(MMU.UNUSED_RAM));
+	memset(MMU.MORE_UNUSED_RAM, 0, sizeof(MMU.UNUSED_RAM));
+
+	memset(MMU.ARM7_ERAM, 0, sizeof(MMU.ARM7_ERAM));
+	memset(MMU.ARM7_REG, 0, sizeof(MMU.ARM7_REG));
+	memset(MMU.ARM7_WIRAM, 0, sizeof(MMU.ARM7_WIRAM));
+	memset(MMU.SWIRAM, 0, sizeof(MMU.SWIRAM));
+
+	IPC_FIFOinit(ARMCPU_ARM9);
+	IPC_FIFOinit(ARMCPU_ARM7);
+
+	MMU.DTCMRegion = 0x027C0000;
+	MMU.ITCMRegion = 0x00000000;
+
+	memset(MMU.timer, 0, sizeof(uint16_t) * 8);
+	memset(MMU.timerMODE, 0, sizeof(int32_t) * 8);
+	memset(MMU.timerON, 0, sizeof(uint32_t) * 8);
+	memset(MMU.timerRUN, 0, sizeof(uint32_t) * 8);
+	memset(MMU.timerReload, 0, sizeof(uint16_t) * 8);
+
+	memset(MMU.reg_IME, 0, sizeof(uint32_t) * 2);
+	memset(MMU.reg_IE, 0, sizeof(uint32_t) * 2);
+	memset(MMU.reg_IF_bits, 0, sizeof(uint32_t) * 2);
+	memset(MMU.reg_IF_pending, 0, sizeof(uint32_t) * 2);
+
+	memset(MMU.dscard, 0, sizeof(nds_dscard) * 2);
+
+	MMU.divRunning = 0;
+	MMU.divResult = 0;
+	MMU.divMod = 0;
+	MMU.divCycles = 0;
+
+	MMU.sqrtRunning = 0;
+	MMU.sqrtResult = 0;
+	MMU.sqrtCycles = 0;
+
+	MMU.SPI_CNT = 0;
+	MMU.AUX_SPI_CNT = 0;
+
+	MMU.WRAMCNT = 0;
+
+	// Enable the sound speakers
+	T1WriteWord(MMU.ARM7_REG, 0x304, 0x0001);
+
+	MMU_VRAM_unmap_all();
+
+	MMU.powerMan_CntReg = 0x00;
+	MMU.powerMan_CntRegWritten = false;
+	MMU.powerMan_Reg0 = 0x0B;
+	MMU.powerMan_Reg1 = 0x00;
+	MMU.powerMan_Reg2 = 0x01;
+	MMU.powerMan_Reg3 = 0x00;
+
+	partie = 1;
+
+	memset(MMU.dscardARMCPU_ARM9.command, 0, 8);
+	MMU.dscardARMCPU_ARM9.address = 0;
+	MMU.dscardARMCPU_ARM9.transfer_count = 0;
+	MMU.dscardARMCPU_ARM9.mode = CardMode_Normal;
+
+	memset(MMU.dscardARMCPU_ARM7.command, 0, 8);
+	MMU.dscardARMCPU_ARM7.address = 0;
+	MMU.dscardARMCPU_ARM7.transfer_count = 0;
+	MMU.dscardARMCPU_ARM7.mode = CardMode_Normal;
+
+	// HACK!!!
+	// until we improve all our session tracking stuff, we need to save the backup memory filename
+	std::string bleh = MMU_new.backupDevice.getFilename();
+	BackupDevice tempBackupDevice;
+	reconstruct(&MMU_new);
+	MMU_new.backupDevice.load_rom(bleh);
+
+	MMU_timing.arm7codeFetch.Reset();
+	MMU_timing.arm7dataFetch.Reset();
+	MMU_timing.arm9codeFetch.Reset();
+	MMU_timing.arm9dataFetch.Reset();
+	MMU_timing.arm9codeCache.Reset();
+	MMU_timing.arm9dataCache.Reset();
 }
 
-void MMU_VRAMReloadFromLCD(u8 block,u8 VRAMBankCnt)
+void SetupMMU(bool debugConsole, bool dsi)
 {
-	u8 *destination;
-	u8 *source;
-	u32 size;
-	#if 1
-		return ;
-	#endif
-	destination = 0;
-	source = 0;
-	size = 0;
-	switch (block)
-	{
-		case 0: // Bank A
-			source = ARM9Mem.ARM9_LCD ;
-			size = 0x20000 ;
-			break ;
-		case 1: // Bank B
-			source = ARM9Mem.ARM9_LCD + 0x20000 ;
-			size = 0x20000 ;
-			break ;
-		case 2: // Bank C
-			source = ARM9Mem.ARM9_LCD + 0x40000 ;
-			size = 0x20000 ;
-			break ;
-		case 3: // Bank D
-			source = ARM9Mem.ARM9_LCD + 0x60000 ;
-			size = 0x20000 ;
-			break ;
-		case 4: // Bank E
-			source = ARM9Mem.ARM9_LCD + 0x80000 ;
-			size = 0x10000 ;
-			break ;
-		case 5: // Bank F
-			source = ARM9Mem.ARM9_LCD + 0x90000 ;
-			size = 0x4000 ;
-			break ;
-		case 6: // Bank G
-			source = ARM9Mem.ARM9_LCD + 0x94000 ;
-			size = 0x4000 ;
-			break ;
-		case 8: // Bank H
-			source = ARM9Mem.ARM9_LCD + 0x98000 ;
-			size = 0x8000 ;
-			break ;
-		case 9: // Bank I
-			source = ARM9Mem.ARM9_LCD + 0xA0000 ;
-			size = 0x4000 ;
-			break ;
-		default:
-			return ;
-	}
-	switch (VRAMBankCnt & 7) {
-		case 0:
-			/* vram is allready stored at LCD, we dont need to write it back */
-			MMU.vScreen = 1;
-			break ;
-		case 1:
-			if (block < 4)
-			{
-				/* banks are in use for BG at ABG + ofs * 0x20000 */
-				destination = ARM9Mem.ARM9_ABG + ((VRAMBankCnt >> 3) & 3) * 0x20000 ;
-			} else return ;
-			break ;
-		case 2:
-				switch(block){
-	case 0:
-	case 1:
-	case 2:
-	case 3:
-		/* banks are in use for BG at ABG + ofs * 0x20000 */
-				destination = ARM9Mem.ARM9_ABG + ((VRAMBankCnt >> 3) & 3) * 0x20000 ;
-		break ;
-	case 4:
-		/* bank E is in use at ABG */
-		destination = ARM9Mem.ARM9_ABG ;
-		break;
-	case 5:
-	case 6:
-		/* banks are in use for BG at ABG + (0x4000*OFS.0)+(0x10000*OFS.1)*/
-		destination = ARM9Mem.ARM9_ABG + (((VRAMBankCnt >> 3) & 1) * 0x4000) + (((VRAMBankCnt >> 2) & 1) * 0x10000) ;
-		break;
-	case 8:
-		/* bank H is in use at BBG */
-		destination = ARM9Mem.ARM9_BBG ;
-		break ;
-	case 9:
-		/* bank I is in use at BBG */
-		destination = ARM9Mem.ARM9_BBG + 0x8000 ;
-		break;
-	default: return ;
-	}
-			break ;
-		case 4:
-	switch(block){
-	case 2:
-		/* bank C is in use at BBG */
-		destination = ARM9Mem.ARM9_BBG ;
-		break ;
-	case 3:
-		/* bank D is in use at BOBJ */
-		destination = ARM9Mem.ARM9_BOBJ ;
-		break ;
-	default: return ;
-	}
-			break ;
-		default:
-			return ;
-	}
-	if (!destination) return ;
-	if (!source) return ;
-	memcpy(destination,source,size) ;
+	if (debugConsole)
+		_MMU_MAIN_MEM_MASK = 0x7FFFFF;
+	else
+		_MMU_MAIN_MEM_MASK = 0x3FFFFF;
+	if (dsi)
+		_MMU_MAIN_MEM_MASK = 0xFFFFFF;
+	_MMU_MAIN_MEM_MASK16 = _MMU_MAIN_MEM_MASK & ~1;
+	_MMU_MAIN_MEM_MASK32 = _MMU_MAIN_MEM_MASK & ~3;
 }
 
-void MMU_setRom(u8 * rom, u32 mask)
+void MMU_setRom(uint8_t *rom, uint32_t)
 {
-	unsigned int i;
 	MMU.CART_ROM = rom;
-
-	for(i = 0x80; i<0xA0; ++i)
-	{
-		MMU_ARM9_MEM_MAPi = rom;
-		MMU_ARM7_MEM_MAPi = rom;
-		MMU_ARM9_MEM_MASKi = mask;
-		MMU_ARM7_MEM_MASKi = mask;
-	}
-	rom_mask = mask;
 }
 
 void MMU_unsetRom()
 {
-	unsigned int i;
-	MMU.CART_ROM=MMU.UNUSED_RAM;
+	MMU.CART_ROM = MMU.UNUSED_RAM;
+}
+
+static void execsqrt()
+{
+	uint32_t ret;
+	uint8_t mode = MMU_new.sqrt.mode;
+	MMU_new.sqrt.busy = 1;
 
-	for(i = 0x80; i<0xA0; ++i)
+	if (mode)
 	{
-		MMU_ARM9_MEM_MAPi = MMU.UNUSED_RAM;
-		MMU_ARM7_MEM_MAPi = MMU.UNUSED_RAM;
-		MMU_ARM9_MEM_MASKi = ROM_MASK;
-		MMU_ARM7_MEM_MASKi = ROM_MASK;
+		uint64_t v = T1ReadQuad(MMU.MMU_MEMARMCPU_ARM90x40, 0x2B8);
+		ret = isqrt(v) & 0xFFFFFFFF;
 	}
-	rom_mask = ROM_MASK;
+	else
+	{
+		uint32_t v = T1ReadLong(MMU.MMU_MEMARMCPU_ARM90x40, 0x2B8);
+		ret = isqrt(v) & 0xFFFFFFFF;
+	}
+
+	// clear the result while the sqrt unit is busy
+	// todo - is this right? is it reasonable?
+	T1WriteLong(MMU.MMU_MEMARMCPU_ARM90x40, 0x2B4, 0);
+
+	MMU.sqrtCycles = nds_timer + 26;
+	MMU.sqrtResult = ret;
+	MMU.sqrtRunning = true;
+	NDS_Reschedule();
 }
-char txt80;
 
-u8 FASTCALL MMU_read8(u32 proc, u32 adr)
+static void execdiv()
 {
-#ifdef INTERNAL_DTCM_READ
-	if((proc==ARMCPU_ARM9)&((adr&(~0x3FFF))==MMU.DTCMRegion))
+	int64_t num, den;
+	int64_t res, mod;
+	uint8_t mode = MMU_new.div.mode;
+	MMU_new.div.busy = 1;
+	MMU_new.div.div0 = 0;
+
+	switch (mode)
 	{
-		return ARM9Mem.ARM9_DTCMadr&0x3FFF;
+		case 0: // 32/32
+			num = T1ReadLong(MMU.MMU_MEMARMCPU_ARM90x40, 0x290);
+			den = T1ReadLong(MMU.MMU_MEMARMCPU_ARM90x40, 0x298);
+			MMU.divCycles = nds_timer + 36;
+			break;
+		case 1: // 64/32
+		case 3: // gbatek says this is same as mode 1
+			num = T1ReadQuad(MMU.MMU_MEMARMCPU_ARM90x40, 0x290);
+			den = T1ReadLong(MMU.MMU_MEMARMCPU_ARM90x40, 0x298);
+			MMU.divCycles = nds_timer + 68;
+			break;
+		case 2: // 64/64
+		default:
+			num = T1ReadQuad(MMU.MMU_MEMARMCPU_ARM90x40, 0x290);
+			den = T1ReadQuad(MMU.MMU_MEMARMCPU_ARM90x40, 0x298);
+			MMU.divCycles = nds_timer + 68;
 	}
-#endif
 
-	// CFlash reading, Mic
-	if ((adr>=0x9000000)&&(adr<0x9900000))
-		return (unsigned char)cflash_read(adr);
+	if (!den)
+	{
+		res = num < 0 ? 1 : -1;
+		mod = num;
 
-#ifdef EXPERIMENTAL_WIFI
-	/* wifi mac access */
-	if ((proc==ARMCPU_ARM7) && (adr>=0x04800000)&&(adr<0x05000000))
+		// the DIV0 flag in DIVCNT is set only if the full 64bit DIV_DENOM value is zero, even in 32bit mode
+		if (!T1ReadQuad(MMU.MMU_MEMARMCPU_ARM90x40, 0x298))
+			MMU_new.div.div0 = 1;
+	}
+	else
 	{
-		if (adr & 1)
-			return (WIFI_read16(&wifiMac,adr) >> 8) & 0xFF;
-		else
-			return WIFI_read16(&wifiMac,adr) & 0xFF;
+		res = num / den;
+		mod = num % den;
 	}
-#endif
 
- return MMU.MMU_MEMproc(adr>>20)&0xFFadr&MMU.MMU_MASKproc(adr>>20)&0xFF;
+	T1WriteLong(MMU.MMU_MEMARMCPU_ARM90x40, 0x2A0, 0);
+	T1WriteLong(MMU.MMU_MEMARMCPU_ARM90x40, 0x2A4, 0);
+	T1WriteLong(MMU.MMU_MEMARMCPU_ARM90x40, 0x2A8, 0);
+	T1WriteLong(MMU.MMU_MEMARMCPU_ARM90x40, 0x2AC, 0);
+
+	MMU.divResult = res;
+	MMU.divMod = mod;
+	MMU.divRunning = true;
+	NDS_Reschedule();
 }
 
+DSI_TSC::DSI_TSC()
+{
+	for (unsigned i = 0; i < ARRAY_SIZE(this->registers); ++i)
+		this->registersi = 0x00;
+	this->reset_command();
+}
 
+void DSI_TSC::reset_command()
+{
+	this->state = 0;
+	this->readcount = 0;
+	this->read_flag = 1;
+}
 
-u16 FASTCALL MMU_read16(u32 proc, u32 adr)
+uint16_t DSI_TSC::write16(uint16_t val)
 {
-#ifdef INTERNAL_DTCM_READ
-	if((proc == ARMCPU_ARM9) && ((adr & ~0x3FFF) == MMU.DTCMRegion))
+	uint16_t ret;
+	switch (state)
 	{
-		/* Returns data from DTCM (ARM9 only) */
-		return T1ReadWord(ARM9Mem.ARM9_DTCM, adr & 0x3FFF);
+		case 0:
+			this->reg_selection = (val >> 1) & 0x7F;
+			this->read_flag = val & 1;
+			this->state = 1;
+			return this->read16();
+		case 1:
+			if (!this->read_flag)
+				this->registersthis->reg_selection = val & 0xFF;
+			ret = this->read16();
+			++this->reg_selection;
+			this->reg_selection &= 0x7F;
+			return ret;
 	}
-#endif
+	return 0;
+}
+
+uint16_t DSI_TSC::read16()
+{
+	uint8_t page = registers0;
+	switch (page)
+	{
+		case 3: // page 3
+			switch (this->reg_selection)
+			{
+				case 9:
+					return 0x40;
+				case 14:
+					return 0x02;
+			}
+	} // switch(page)
+
+	// unknown page or register
+	return 0xFF;
+}
 
-	// CFlash reading, Mic
-	if ((adr>=0x08800000)&&(adr<0x09900000))
-	 return (unsigned short)cflash_read(adr);
+// TODO:
+// NAND flash support (used in Made in Ore/WarioWare D.I.Y.)
+void FASTCALL MMU_writeToGCControl(int PROCNUM, uint32_t val)
+{
+	int TEST_PROCNUM = PROCNUM;
+	nds_dscard &card = MMU.dscardTEST_PROCNUM;
 
-#ifdef EXPERIMENTAL_WIFI
-	/* wifi mac access */
-	if ((proc==ARMCPU_ARM7) && (adr>=0x04800000)&&(adr<0x05000000))
-		return WIFI_read16(&wifiMac,adr) ;
-#endif
+	memcpy(&card.command0, &MMU.MMU_MEMTEST_PROCNUM0x400x1A8, 8);
 
-	adr &= 0x0FFFFFFF;
+	card.blocklen = 0;
+	slot1_device.write32(PROCNUM, 0xFFFFFFFF, val); // Special case for some flashcarts
+	if (card.blocklen == 0x01020304)
+		return;
 
-	if(adr&0x04000000)
+	if (!(val & 0x80000000))
 	{
-		/* Adress is an IO register */
-		switch(adr)
-		{
+		card.address = 0;
+		card.transfer_count = 0;
 
-#if VIO2SF_GPU_ENABLE
-			case 0x04000604:
-				return (gpu3D->NDS_3D_GetNumPolys()&2047);
-			case 0x04000606:
-				return (gpu3D->NDS_3D_GetNumVertex()&8191);
-#endif
+		val &= 0x7F7FFFFF;
+		T1WriteLong(MMU.MMU_MEMTEST_PROCNUM0x40, 0x1A4, val);
+		return;
+	}
 
-			case REG_IPCFIFORECV : /* TODO (clear): ??? */
-				execute = false;
-				return 1;
+	uint32_t shift = (val >> 24) & 7;
+	if (shift == 7)
+		card.transfer_count = 1;
+	else if (!shift)
+		card.transfer_count = 0;
+	else
+		card.transfer_count = (0x100 << shift) / 4;
+
+	switch (card.mode)
+	{
+		case CardMode_Normal:
+			break;
 
-			case REG_IME :
-				return (u16)MMU.reg_IMEproc;
+		case CardMode_KEY1:
+			// TODO
+			//INFO("Cartridge: KEY1 mode unsupported.\n");
 
-			case REG_IE :
-				return (u16)MMU.reg_IEproc;
-			case REG_IE + 2 :
-				return (u16)(MMU.reg_IEproc>>16);
+			card.address = 0;
+			card.transfer_count = 0;
 
-			case REG_IF :
-				return (u16)MMU.reg_IFproc;
-			case REG_IF + 2 :
-				return (u16)(MMU.reg_IFproc>>16);
+			val &= 0x7F7FFFFF;
+			T1WriteLong(MMU.MMU_MEMTEST_PROCNUM0x40, 0x1A4, val);
+			return;
+		case CardMode_KEY2:
+			//INFO("Cartridge: KEY2 mode unsupported.\n");
+			break;
+	}
 
-			case REG_TM0CNTL :
-			case REG_TM1CNTL :
-			case REG_TM2CNTL :
-			case REG_TM3CNTL :
-				return MMU.timerproc(adr&0xF)>>2;
+	switch (card.command0)
+	{
+		case 0x9F: // Dummy
+			card.address = 0;
+			card.transfer_count = 0x800;
+			break;
 
-			case 0x04000630 :
-				LOG("vect res\r\n");	/* TODO (clear): ??? */
-				//execute = false;
-				return 0;
- case REG_POSTFLG :
-				return 1;
-			default :
-				break;
-		}
+		case 0x3C: // Switch to KEY1 mode
+			card.mode = CardMode_KEY1;
+			break;
+
+		default:
+			// fall through to the special slot1 handler
+			slot1_device.write32(TEST_PROCNUM, REG_GCROMCTRL, val);
 	}
 
-	/* Returns data from memory */
-	return T1ReadWord(MMU.MMU_MEMproc(adr >> 20) & 0xFF, adr & MMU.MMU_MASKproc(adr >> 20) & 0xFF);
+	if (!card.transfer_count)
+	{
+		val &= 0x7F7FFFFF;
+		T1WriteLong(MMU.MMU_MEMTEST_PROCNUM0x40, 0x1A4, val);
+		return;
+	}
+
+	val |= 0x00800000;
+	T1WriteLong(MMU.MMU_MEMTEST_PROCNUM0x40, 0x1A4, val);
+
+	// Launch DMA if start flag was set to "DS Cart"
+	//fprintf(stderr, "triggering card dma\n");
+	triggerDma(EDMAMode_Card);
 }
 
-u32 FASTCALL MMU_read32(u32 proc, u32 adr)
+uint32_t MMU_readFromGC(int PROCNUM)
 {
-#ifdef INTERNAL_DTCM_READ
-	if((proc == ARMCPU_ARM9) && ((adr & ~0x3FFF) == MMU.DTCMRegion))
+	int TEST_PROCNUM = PROCNUM;
+
+	nds_dscard& card = MMU.dscardTEST_PROCNUM;
+	uint32_t val = 0;
+
+	if (!card.transfer_count)
+		return 0;
+
+	switch (card.command0)
 	{
-		/* Returns data from DTCM (ARM9 only) */
-		return T1ReadLong(ARM9Mem.ARM9_DTCM, adr & 0x3FFF);
+		case 0x9F: // Dummy
+			val = 0xFFFFFFFF;
+			break;
+
+		case 0x3C: // Switch to KEY1 mode
+			val = 0xFFFFFFFF;
+			break;
+
+		default:
+			val = slot1_device.read32(TEST_PROCNUM, REG_GCDATAIN);
 	}
-#endif
 
-	// CFlash reading, Mic
-	if ((adr>=0x9000000)&&(adr<0x9900000))
-	 return (unsigned long)cflash_read(adr);
+	card.address += 4; // increment address
 
-	adr &= 0x0FFFFFFF;
+	--card.transfer_count; // update transfer counter
+	if (card.transfer_count) // if transfer is not ended
+		return val; // return data
 
-	if((adr >> 24) == 4)
-	{
-		/* Adress is an IO register */
-		switch(adr)
-		{
-			// This is hacked due to the only current 3D core
-			case 0x04000600:
- {
- u32 fifonum = IPCFIFO+proc;
-
-				u32 gxstat =	(MMU.fifosfifonum.empty<<26) |
-								(1<<25) |
-								(MMU.fifosfifonum.full<<24) |
-								/*((NDS_nbpush0&1)<<13) | ((NDS_nbpush2&0x1F)<<8) |*/
-								2;
-
-				LOG ("GXSTAT: 0x%X", gxstat);
-
-				return	gxstat;
- }
-
-			case 0x04000640:
-			case 0x04000644:
-			case 0x04000648:
-			case 0x0400064C:
-			case 0x04000650:
-			case 0x04000654:
-			case 0x04000658:
-			case 0x0400065C:
-			case 0x04000660:
-			case 0x04000664:
-			case 0x04000668:
-			case 0x0400066C:
-			case 0x04000670:
-			case 0x04000674:
-			case 0x04000678:
-			case 0x0400067C:
-			{
-				//LOG("4000640h..67Fh - CLIPMTX_RESULT - Read Current Clip Coordinates Matrix (R)");
-#if VIO2SF_GPU_ENABLE
-				return gpu3D->NDS_3D_GetClipMatrix ((adr-0x04000640)/4);
-#else
-				return 0;
-#endif
-			}
-			case 0x04000680:
-			case 0x04000684:
-			case 0x04000688:
-			case 0x0400068C:
-			case 0x04000690:
-			case 0x04000694:
-			case 0x04000698:
-			case 0x0400069C:
-			case 0x040006A0:
-			{
-#if VIO2SF_GPU_ENABLE
-				//LOG("4000680h..6A3h - VECMTX_RESULT - Read Current Directional Vector Matrix (R)");
-				return gpu3D->NDS_3D_GetDirectionalMatrix ((adr-0x04000680)/4);
-#else
-				return 0;
-#endif
-			}
+	// transfer is done
+	T1WriteLong(MMU.MMU_MEMTEST_PROCNUM0x40, 0x1A4, T1ReadLong(MMU.MMU_MEMTEST_PROCNUM0x40, 0x1A4) & 0x7F7FFFFF);
 
-			case 0x4000604:
-			{
-#if VIO2SF_GPU_ENABLE
-				return (gpu3D->NDS_3D_GetNumPolys()&2047) & ((gpu3D->NDS_3D_GetNumVertex()&8191) << 16);
-				//LOG ("read32 - RAM_COUNT -> 0x%X", ((u32 *)(MMU.MMU_MEMproc(adr>>20)&0xFF))(adr&MMU.MMU_MASKproc(adr>>20)&0xFF)>>2);
-#else
-				return 0;
-#endif
-			}
+	// if needed, throw irq for the end of transfer
+	if (MMU.AUX_SPI_CNT & 0x4000)
+		NDS_makeIrq(TEST_PROCNUM, IRQ_BIT_GC_TRANSFER_COMPLETE);
 
-			case REG_IME :
-				return MMU.reg_IMEproc;
-			case REG_IE :
-				return MMU.reg_IEproc;
-			case REG_IF :
-				return MMU.reg_IFproc;
-			case REG_IPCFIFORECV :
-			{
-				u16 IPCFIFO_CNT = T1ReadWord(MMU.MMU_MEMproc0x40, 0x184);
-				if(IPCFIFO_CNT&0x8000)
-				{
-				//execute = false;
-				u32 fifonum = IPCFIFO+proc;
-				u32 val = FIFOValue(MMU.fifos + fifonum);
-				u32 remote = (proc+1) & 1;
-				u16 IPCFIFO_CNT_remote = T1ReadWord(MMU.MMU_MEMremote0x40, 0x184);
-				IPCFIFO_CNT |= (MMU.fifosfifonum.empty<<8) | (MMU.fifosfifonum.full<<9) | (MMU.fifosfifonum.error<<14);
-				IPCFIFO_CNT_remote |= (MMU.fifosfifonum.empty) | (MMU.fifosfifonum.full<<1);
-				T1WriteWord(MMU.MMU_MEMproc0x40, 0x184, IPCFIFO_CNT);
-				T1WriteWord(MMU.MMU_MEMremote0x40, 0x184, IPCFIFO_CNT_remote);
-				if ((MMU.fifosfifonum.empty) && (IPCFIFO_CNT & BIT(2)))
-					NDS_makeInt(remote,17) ; /* remote: SEND FIFO EMPTY */
-				return val;
-				}
-			}
-			return 0;
- case REG_TM0CNTL :
- case REG_TM1CNTL :
- case REG_TM2CNTL :
- case REG_TM3CNTL :
-			{
-				u32 val = T1ReadWord(MMU.MMU_MEMproc0x40, (adr + 2) & 0xFFF);
-				return MMU.timerproc(adr&0xF)>>2 | (val<<16);
-			}
-			/*
-			case 0x04000640 :	// TODO (clear): again, ???
-				LOG("read proj\r\n");
-			return 0;
-			case 0x04000680 :
-				LOG("read roat\r\n");
-			return 0;
-			case 0x04000620 :
-				LOG("point res\r\n");
-			return 0;
-			*/
- case REG_GCDATAIN:
-			{
- u32 val;
+	return val;
+}
 
- if(!MMU.dscardproc.adress) return 0;
+static void REG_IF_WriteByte(int PROCNUM, uint32_t addr, uint8_t val)
+{
+	// the following bits are generated from logic and should not be affected here
+	// Bit 21 NDS9 only: Geometry Command FIFO
+	// arm9: IF &= ~0x00200000;
+	// arm7: IF &= ~0x00000000;
+	// UPDATE IN setIF() ALSO!!!!!!!!!!!!!!!!
+	// UPDATE IN mmu_loadstate ALSO!!!!!!!!!!!!
+	if (addr == 2)
+	{
+		if (PROCNUM == ARMCPU_ARM9)
+			val &= ~0x20;
+		else
+			val &= ~0x00;
+	}
 
- val = T1ReadLong(MMU.CART_ROM, MMU.dscardproc.adress);
+	// ZERO 01-dec-2010 : I am no longer sure this approach is correct.. it proved to be wrong for IPC fifo.......
+	// it seems as if IF bits should always be cached (only the user can clear them)
 
-				MMU.dscardproc.adress += 4;	/* increment adress */
+	MMU.reg_IF_bitsPROCNUM &= ~(val << (addr << 3));
+	NDS_Reschedule();
+}
 
-				MMU.dscardproc.transfer_count--;	/* update transfer counter */
-				if(MMU.dscardproc.transfer_count) /* if transfer is not ended */
-				{
-					return val;	/* return data */
-				}
-				else	/* transfer is done */
- {
- T1WriteLong(MMU.MMU_MEMproc(REG_GCROMCTRL >> 20) & 0xff, REG_GCROMCTRL & 0xfff, T1ReadLong(MMU.MMU_MEMproc(REG_GCROMCTRL >> 20) & 0xff, REG_GCROMCTRL & 0xfff) & ~(0x00800000 | 0x80000000));
-					/* = 0x7f7fffff */
+static void REG_IF_WriteWord(int PROCNUM, uint32_t addr, uint16_t val)
+{
+	REG_IF_WriteByte(PROCNUM, addr, val & 0xFF);
+	REG_IF_WriteByte(PROCNUM, addr + 1, (val >> 8) & 0xFF);
+}
 
-					/* if needed, throw irq for the end of transfer */
- if(T1ReadWord(MMU.MMU_MEMproc(REG_AUXSPICNT >> 20) & 0xff, REG_AUXSPICNT & 0xfff) & 0x4000)
-					{
- if(proc == ARMCPU_ARM7) NDS_makeARM7Int(19);
- else NDS_makeARM9Int(19);
-					}
+static void REG_IF_WriteLong(int PROCNUM, uint32_t val)
+{
+	REG_IF_WriteByte(PROCNUM, 0, val & 0xFF);
+	REG_IF_WriteByte(PROCNUM, 1, (val >> 8) & 0xFF);
+	REG_IF_WriteByte(PROCNUM, 2, (val >> 16) & 0xFF);
+	REG_IF_WriteByte(PROCNUM, 3, (val >> 24) & 0xFF);
+}
 
-					return val;
-				}
-			}
+template<int PROCNUM> uint32_t MMU_struct::gen_IF()
+{
+	return this->reg_IF_bitsPROCNUM;
+}
 
-			default :
-				break;
-		}
-	}
+static inline void MMU_IPCSync(uint8_t proc, uint32_t val)
+{
+	uint32_t sync_l = T1ReadLong(MMU.MMU_MEMproc0x40, 0x180) & 0xFFFF;
+	uint32_t sync_r = T1ReadLong(MMU.MMU_MEMproc ^ 10x40, 0x180) & 0xFFFF;
 
-	/* Returns data from memory */
-	return T1ReadLong(MMU.MMU_MEMproc(adr >> 20) & 0xFF, adr & MMU.MMU_MASKproc(adr >> 20) & 0xFF);
+	sync_l = (sync_l & 0x000F) | (val & 0x0F00);
+	sync_r = (sync_r & 0x6F00) | ((val >> 8) & 0x000F);
+
+	sync_l |= val & 0x6000;
+
+	T1WriteLong(MMU.MMU_MEMproc0x40, 0x180, sync_l);
+	T1WriteLong(MMU.MMU_MEMproc ^ 10x40, 0x180, sync_r);
+
+	if ((sync_l & IPCSYNC_IRQ_SEND) && (sync_r & IPCSYNC_IRQ_RECV))
+		NDS_makeIrq(proc ^ 1, IRQ_BIT_IPCSYNC);
+
+	NDS_Reschedule();
 }
 
-void FASTCALL MMU_write8(u32 proc, u32 adr, u8 val)
+static inline uint16_t read_timer(int proc, int timerIndex)
 {
-#ifdef INTERNAL_DTCM_WRITE
-	if((proc == ARMCPU_ARM9) && ((adr & ~0x3FFF) == MMU.DTCMRegion))
+	// chained timers are always up to date
+	if (MMU.timerMODEproctimerIndex == 0xFFFF)
+		return MMU.timerproctimerIndex;
+
+	// sometimes a timer will be read when it is not enabled.
+	// we should have the value cached
+	if (!MMU.timerONproctimerIndex)
+		return MMU.timerproctimerIndex;
+
+	// for unchained timers, we do not keep the timer up to date. its value will need to be calculated here
+	int32_t diff = (nds.timerCycleproctimerIndex - nds_timer) & 0xFFFFFFFF;
+	assert(diff >= 0);
+	if (diff < 0)
+		fprintf(stderr, "NEW EMULOOP BAD NEWS PLEASE REPORT: TIME READ DIFF < 0 (%d) (%d) (%d)\n", diff, timerIndex, MMU.timerMODEproctimerIndex);
+
+	int32_t units = diff / (1 << MMU.timerMODEproctimerIndex);
+	int32_t ret;
+
+	if (units == 65536)
+		ret = 0; // I'm not sure why this is happening...
+	// whichever instruction setup this counter should advance nds_timer (I think?) and the division should truncate down to 65535 immediately
+	else if (units > 65536)
 	{
-		/* Writes data in DTCM (ARM9 only) */
-		ARM9Mem.ARM9_DTCMadr&0x3FFF = val;
-		return ;
+		fprintf(stderr, "NEW EMULOOP BAD NEWS PLEASE REPORT: UNITS %d:%d = %d\n", proc, timerIndex, units);
+		ret = 0;
 	}
-#endif
+	else
+		ret = 65535 - units;
 
-	// CFlash writing, Mic
-	if ((adr>=0x9000000)&&(adr<0x9900000)) {
-		cflash_write(adr,val);
-		return;
-	}
+	return ret & 0xFFFF;
+}
 
-	adr &= 0x0FFFFFFF;
+static inline void write_timer(int proc, int timerIndex, uint16_t val)
+{
+	if (val & 0x80)
+		MMU.timerproctimerIndex = MMU.timerReloadproctimerIndex;
+	else if (MMU.timerONproctimerIndex)
+		// read the timer value one last time
+		MMU.timerproctimerIndex = read_timer(proc, timerIndex);
 
- // This is bad, remove it
- if(proc == ARMCPU_ARM7)
- {
- if ((adr>=0x04000400)&&(adr<0x0400051D))
- {
- SPU_WriteByte(adr, val);
- return;
- }
- }
-
-	if ((adr & 0xFF800000) == 0x04800000)
-	{
-		/* is wifi hardware, dont intermix with regular hardware registers */
-		/* FIXME handle 8 bit writes */
-		return ;
-	}
+	MMU.timerONproctimerIndex = val & 0x80;
 
-	switch(adr)
+	switch (val & 7)
 	{
-		case REG_DISPA_WIN0H:
-			if(proc == ARMCPU_ARM9) GPU_setWIN0_H1 (MainScreen.gpu, val);
-			break ;
-		case REG_DISPA_WIN0H+1:
-			if(proc == ARMCPU_ARM9) GPU_setWIN0_H0 (MainScreen.gpu, val);
-			break ;
-		case REG_DISPA_WIN1H:
-			if(proc == ARMCPU_ARM9) GPU_setWIN1_H1 (MainScreen.gpu,val);
-			break ;
-		case REG_DISPA_WIN1H+1:
-			if(proc == ARMCPU_ARM9) GPU_setWIN1_H0 (MainScreen.gpu,val);
-			break ;
-
-		case REG_DISPB_WIN0H:
-			if(proc == ARMCPU_ARM9) GPU_setWIN0_H1(SubScreen.gpu,val);
-			break ;
-		case REG_DISPB_WIN0H+1:
-			if(proc == ARMCPU_ARM9) GPU_setWIN0_H0(SubScreen.gpu,val);
-			break ;
-		case REG_DISPB_WIN1H:
-			if(proc == ARMCPU_ARM9) GPU_setWIN1_H1(SubScreen.gpu,val);
-			break ;
-		case REG_DISPB_WIN1H+1:
-			if(proc == ARMCPU_ARM9) GPU_setWIN1_H0(SubScreen.gpu,val);
-			break ;
-
-		case REG_DISPA_WIN0V:
-			if(proc == ARMCPU_ARM9) GPU_setWIN0_V1(MainScreen.gpu,val) ;
-			break ;
-		case REG_DISPA_WIN0V+1:
-			if(proc == ARMCPU_ARM9) GPU_setWIN0_V0(MainScreen.gpu,val) ;
-			break ;
-		case REG_DISPA_WIN1V:
-			if(proc == ARMCPU_ARM9) GPU_setWIN1_V1(MainScreen.gpu,val) ;
-			break ;
-		case REG_DISPA_WIN1V+1:
-			if(proc == ARMCPU_ARM9) GPU_setWIN1_V0(MainScreen.gpu,val) ;
-			break ;
-
-		case REG_DISPB_WIN0V:
-			if(proc == ARMCPU_ARM9) GPU_setWIN0_V1(SubScreen.gpu,val) ;
-			break ;
-		case REG_DISPB_WIN0V+1:
-			if(proc == ARMCPU_ARM9) GPU_setWIN0_V0(SubScreen.gpu,val) ;
-			break ;
-		case REG_DISPB_WIN1V:
-			if(proc == ARMCPU_ARM9) GPU_setWIN1_V1(SubScreen.gpu,val) ;
-			break ;
-		case REG_DISPB_WIN1V+1:
-			if(proc == ARMCPU_ARM9) GPU_setWIN1_V0(SubScreen.gpu,val) ;
-			break ;
-
-		case REG_DISPA_WININ:
-			if(proc == ARMCPU_ARM9) GPU_setWININ0(MainScreen.gpu,val) ;
-			break ;
-		case REG_DISPA_WININ+1:
-			if(proc == ARMCPU_ARM9) GPU_setWININ1(MainScreen.gpu,val) ;
-			break ;
-		case REG_DISPA_WINOUT:
-			if(proc == ARMCPU_ARM9) GPU_setWINOUT(MainScreen.gpu,val) ;
-			break ;
-		case REG_DISPA_WINOUT+1:
-			if(proc == ARMCPU_ARM9) GPU_setWINOBJ(MainScreen.gpu,val);
-			break ;
-
-		case REG_DISPB_WININ:
-			if(proc == ARMCPU_ARM9) GPU_setWININ0(SubScreen.gpu,val) ;
-			break ;
-		case REG_DISPB_WININ+1:
-			if(proc == ARMCPU_ARM9) GPU_setWININ1(SubScreen.gpu,val) ;
-			break ;
-		case REG_DISPB_WINOUT:
-			if(proc == ARMCPU_ARM9) GPU_setWINOUT(SubScreen.gpu,val) ;
-			break ;
-		case REG_DISPB_WINOUT+1:
-			if(proc == ARMCPU_ARM9) GPU_setWINOBJ(SubScreen.gpu,val) ;
-			break ;
-
-
-		case REG_DISPA_BLDCNT:
-			if(proc == ARMCPU_ARM9) GPU_setBLDCNT_HIGH(MainScreen.gpu,val);
+		case 0:
+			MMU.timerMODEproctimerIndex = 1;
 			break;
-		case REG_DISPA_BLDCNT+1:
-			if(proc == ARMCPU_ARM9) GPU_setBLDCNT_LOW (MainScreen.gpu,val);
+		case 1:
+			MMU.timerMODEproctimerIndex = 7;
 			break;
-
-		case REG_DISPB_BLDCNT:
-			if(proc == ARMCPU_ARM9) GPU_setBLDCNT_HIGH (SubScreen.gpu,val);
+		case 2:
+			MMU.timerMODEproctimerIndex = 9;
 			break;
-		case REG_DISPB_BLDCNT+1:
-			if(proc == ARMCPU_ARM9) GPU_setBLDCNT_LOW (SubScreen.gpu,val);
+		case 3:
+			MMU.timerMODEproctimerIndex = 11;
 			break;
+		default:
+			MMU.timerMODEproctimerIndex = 0xFFFF;
+	}
 
-		case REG_DISPA_BLDALPHA:
-			if(proc == ARMCPU_ARM9) GPU_setBLDALPHA_EVB(MainScreen.gpu,val) ;
-			break;
-		case REG_DISPA_BLDALPHA+1:
-			if(proc == ARMCPU_ARM9) GPU_setBLDALPHA_EVA(MainScreen.gpu,val) ;
-			break;
+	int remain = 65536 - MMU.timerReloadproctimerIndex;
+	nds.timerCycleproctimerIndex = nds_timer + (remain << MMU.timerMODEproctimerIndex);
 
-		case REG_DISPB_BLDALPHA:
-			if(proc == ARMCPU_ARM9) GPU_setBLDALPHA_EVB(SubScreen.gpu,val) ;
-			break;
-		case REG_DISPB_BLDALPHA+1:
-			if(proc == ARMCPU_ARM9) GPU_setBLDALPHA_EVA(SubScreen.gpu,val);
-			break;
+	T1WriteWord(MMU.MMU_MEMproc0x40, 0x102 + timerIndex * 4, val);
+	NDS_RescheduleTimers();
+}
 
-		case REG_DISPA_BLDY:
-			if(proc == ARMCPU_ARM9) GPU_setBLDY_EVY(MainScreen.gpu,val) ;
-			break ;
-		case REG_DISPB_BLDY:
-			if(proc == ARMCPU_ARM9) GPU_setBLDY_EVY(SubScreen.gpu,val) ;
-			break;
+uint32_t TGXSTAT::read32()
+{
+	uint32_t ret = 0;
 
-		/* TODO: EEEK ! Controls for VRAMs A, B, C, D are missing ! */
-		/* TODO: Not all mappings of VRAMs are handled... (especially BG and OBJ modes) */
-		case REG_VRAMCNTA:
-		case REG_VRAMCNTB:
-		case REG_VRAMCNTC:
-		case REG_VRAMCNTD:
-			if(proc == ARMCPU_ARM9)
-			{
- MMU_VRAMWriteBackToLCD(0) ;
- MMU_VRAMWriteBackToLCD(1) ;
- MMU_VRAMWriteBackToLCD(2) ;
- MMU_VRAMWriteBackToLCD(3) ;
-				switch(val & 0x1F)
-				{
-				case 1 :
-					MMU.vram_modeadr-REG_VRAMCNTA = 0; // BG-VRAM
-					//MMU.vram_offset0 = ARM9Mem.ARM9_ABG+(0x20000*0); // BG-VRAM
-					break;
-				case 1 | (1 << 3) :
-					MMU.vram_modeadr-REG_VRAMCNTA = 1; // BG-VRAM
-					//MMU.vram_offset0 = ARM9Mem.ARM9_ABG+(0x20000*1); // BG-VRAM
-					break;
-				case 1 | (2 << 3) :
-					MMU.vram_modeadr-REG_VRAMCNTA = 2; // BG-VRAM
-					//MMU.vram_offset0 = ARM9Mem.ARM9_ABG+(0x20000*2); // BG-VRAM
-					break;
-				case 1 | (3 << 3) :
-					MMU.vram_modeadr-REG_VRAMCNTA = 3; // BG-VRAM
-					//MMU.vram_offset0 = ARM9Mem.ARM9_ABG+(0x20000*3); // BG-VRAM
-					break;
-				case 0: /* mapped to lcd */
- MMU.vram_modeadr-REG_VRAMCNTA = 4 | (adr-REG_VRAMCNTA) ;
-					break ;
-				}
- /*
- * FIXME: simply texture slot handling
- * This is a first stab and is not correct. It does
- * not handle a VRAM texture slot becoming
- * unconfigured.
- * Revisit all of VRAM control handling for future
- * release?
- */
- if ( val & 0x80) {
- if ( (val & 0x7) == 3) {
- int slot_index = (val >> 3) & 0x3;
-
- ARM9Mem.textureSlotAddrslot_index =
- &ARM9Mem.ARM9_LCD0x20000 * (adr - REG_VRAMCNTA);
- }
- }
- MMU_VRAMReloadFromLCD(adr-REG_VRAMCNTA,val) ;
-			}
-			break;
- case REG_VRAMCNTE :
-			if(proc == ARMCPU_ARM9)
-			{
- MMU_VRAMWriteBackToLCD((u8)REG_VRAMCNTE) ;
- if((val & 7) == 5)
-				{
-					ARM9Mem.ExtPal00 = ARM9Mem.ARM9_LCD + 0x80000;
-					ARM9Mem.ExtPal01 = ARM9Mem.ARM9_LCD + 0x82000;
-					ARM9Mem.ExtPal02 = ARM9Mem.ARM9_LCD + 0x84000;
-					ARM9Mem.ExtPal03 = ARM9Mem.ARM9_LCD + 0x86000;
-				}
- else if((val & 7) == 3)
-				{
-					ARM9Mem.texPalSlot0 = ARM9Mem.ARM9_LCD + 0x80000;
-					ARM9Mem.texPalSlot1 = ARM9Mem.ARM9_LCD + 0x82000;
-					ARM9Mem.texPalSlot2 = ARM9Mem.ARM9_LCD + 0x84000;
-					ARM9Mem.texPalSlot3 = ARM9Mem.ARM9_LCD + 0x86000;
-				}
- else if((val & 7) == 4)
-				{
-					ARM9Mem.ExtPal00 = ARM9Mem.ARM9_LCD + 0x80000;
-					ARM9Mem.ExtPal01 = ARM9Mem.ARM9_LCD + 0x82000;
-					ARM9Mem.ExtPal02 = ARM9Mem.ARM9_LCD + 0x84000;
-					ARM9Mem.ExtPal03 = ARM9Mem.ARM9_LCD + 0x86000;
-				}
+	ret |= this->tb | (this->tr << 1);
 
-				MMU_VRAMReloadFromLCD(adr-REG_VRAMCNTE,val) ;
-			}
-			break;
+	ret |= this->sb << 14; // stack busy
+	ret |= this->se << 15;
+	ret |= 255 << 16;
 
- case REG_VRAMCNTF :
-			if(proc == ARMCPU_ARM9)
-			{
-				switch(val & 0x1F)
-				{
- case 4 :
-						ARM9Mem.ExtPal00 = ARM9Mem.ARM9_LCD + 0x90000;
-						ARM9Mem.ExtPal01 = ARM9Mem.ARM9_LCD + 0x92000;
-						break;
+	ret |= (this->gxfifo_irq & 0x3) << 30; // user's irq flags
 
- case 4 | (1 << 3) :
-						ARM9Mem.ExtPal02 = ARM9Mem.ARM9_LCD + 0x90000;
-						ARM9Mem.ExtPal03 = ARM9Mem.ARM9_LCD + 0x92000;
-						break;
+	//fprintf(stderr, "vc=%03d Returning gxstat read: %08X\n",nds.VCount,ret);
 
- case 3 :
-						ARM9Mem.texPalSlot0 = ARM9Mem.ARM9_LCD + 0x90000;
-						break;
+	return ret;
+}
 
- case 3 | (1 << 3) :
-						ARM9Mem.texPalSlot1 = ARM9Mem.ARM9_LCD + 0x90000;
-						break;
+void TGXSTAT::write32(uint32_t val)
+{
+	this->gxfifo_irq = (val >> 30) & 3;
+	if (BIT15(val))
+	{
+		// Writing "1" to Bit15 does reset the Error Flag (Bit15),
+		// and additionally resets the Projection Stack Pointer (Bit13)
+		//mtxStack0.position = 0;
+		this->se = 0; // clear stack error flag
+	}
+	//fprintf(stderr, "gxstat write: %08X while gxfifo.size=%d\n",val,gxFIFO.size);
+}
 
- case 3 | (2 << 3) :
-						ARM9Mem.texPalSlot2 = ARM9Mem.ARM9_LCD + 0x90000;
-						break;
+// this could be inlined...
+void MMU_struct_new::write_dma(int proc, int size, uint32_t _adr, uint32_t val)
+{
+	//fprintf(stderr, "%08lld -- write_dma: %d %d %08X %08X\n",nds_timer,proc,size,_adr,val);
+	uint32_t adr = _adr - _REG_DMA_CONTROL_MIN;
+	uint32_t chan = adr / 12;
+	uint32_t regnum = (adr - chan * 12) >> 2;
 
- case 3 | (3 << 3) :
-						ARM9Mem.texPalSlot3 = ARM9Mem.ARM9_LCD + 0x90000;
-						break;
+	MMU_new.dmaprocchan.regsregnum->write(size, adr, val);
+}
 
- case 5 :
- case 5 | (1 << 3) :
- case 5 | (2 << 3) :
- case 5 | (3 << 3) :
-						ARM9Mem.ObjExtPal00 = ARM9Mem.ARM9_LCD + 0x90000;
-						ARM9Mem.ObjExtPal01 = ARM9Mem.ARM9_LCD + 0x92000;
-						break;
-				}
-		 	}
-			break;
- case REG_VRAMCNTG :
-			if(proc == ARMCPU_ARM9)
-			{
-		 		switch(val & 0x1F)
-				{
- case 4 :
-						ARM9Mem.ExtPal00 = ARM9Mem.ARM9_LCD + 0x94000;
-						ARM9Mem.ExtPal01 = ARM9Mem.ARM9_LCD + 0x96000;
-						break;
+// this could be inlined...
+uint32_t MMU_struct_new::read_dma(int proc, int size, uint32_t _adr)
+{
+	uint32_t adr = _adr - _REG_DMA_CONTROL_MIN;
+	uint32_t chan = adr / 12;
+	uint32_t regnum = (adr - chan * 12) >> 2;
 
- case 4 | (1 << 3) :
-						ARM9Mem.ExtPal02 = ARM9Mem.ARM9_LCD + 0x94000;
-						ARM9Mem.ExtPal03 = ARM9Mem.ARM9_LCD + 0x96000;
-						break;
+	uint32_t temp = MMU_new.dmaprocchan.regsregnum->read(size, adr);
+	//fprintf(stderr, "%08lld -- read_dma: %d %d %08X = %08X\n",nds_timer,proc,size,_adr,temp);
 
- case 3 :
-						ARM9Mem.texPalSlot0 = ARM9Mem.ARM9_LCD + 0x94000;
-						break;
+	return temp;
+}
 
- case 3 | (1 << 3) :
-						ARM9Mem.texPalSlot1 = ARM9Mem.ARM9_LCD + 0x94000;
-						break;
+MMU_struct_new::MMU_struct_new()
+{
+	for (int i = 0; i < 2; ++i)
+		for (int j = 0; j < 4; ++j)
+		{
+			dmaij.procnum = i;
+			dmaij.chan = j;
+		}
+}
 
- case 3 | (2 << 3) :
-						ARM9Mem.texPalSlot2 = ARM9Mem.ARM9_LCD + 0x94000;
-						break;
+void DmaController::write32(uint32_t val)
+{
+	//fprintf(stderr, "dma %d,%d WRITE %08X\n",procnum,chan,val);
+	this->wordcount = val & 0x1FFFFF;
+	uint8_t wasEnable = this->enable;
+	uint32_t valhi = val >> 16;
+	this->dar = static_cast<EDMADestinationUpdate>((valhi >> 5) & 3);
+	this->sar = static_cast<EDMASourceUpdate>((valhi >> 7) & 3);
+	this->repeatMode = BIT9(valhi);
+	this->bitWidth = static_cast<EDMABitWidth>(BIT10(valhi));
+	this->_startmode = (valhi >> 11) & 7;
+	if (this->procnum == ARMCPU_ARM7)
+		this->_startmode &= 6;
+	this->irq = BIT14(valhi);
+	this->enable = BIT15(valhi);
+
+	// make sure we don't get any old triggers
+	if (!wasEnable && this->enable)
+		this->triggered = false;
+
+	if (this->enable)
+	{
+		// address registers are reloaded from user's settings whenever dma is enabled
+		// this is tested well by contra4 classic games, which use this to hdma scroll registers
+		// specifically in the fit-screen mode.
+		this->saddr = this->saddr_user;
+		this->daddr = this->daddr_user;
+	}
 
- case 3 | (3 << 3) :
-						ARM9Mem.texPalSlot3 = ARM9Mem.ARM9_LCD + 0x94000;
-						break;
+	//fprintf(stderr, "dma %d,%d set to startmode %d with wordcount set to: %08X\n",procnum,chan,_startmode,wordcount);
+	// analyze enabling and startmode.
+	// note that we only do this if the dma was freshly enabled.
+	// we should probably also only be latching these other regs in that case too..
+	// but for now just this one will do (otherwise the dma repeat stop procedure (in this case the ff4 title menu load with gamecard dma) will fail)
+	//if(!running) enable = userEnable;
+
+	// if we were previously in a triggered mode, and were already enabled,
+	// then don't re-trigger now. this is rather confusing..
+	// we really only want to auto-trigger gxfifo and immediate modes.
+	// but we don't know what mode we're in yet.
+	// so this is our workaround
+	// (otherwise the dma repeat stop procedure (in this case the ff4 title menu load with gamecard dma) will fail)
+	bool doNotStart = false;
+	if (this->startmode != EDMAMode_Immediate && wasEnable)
+		doNotStart = true;
+
+	// this dma may need to trigger now, so give it a chance
+	//if(!(wasRepeatMode && !repeatMode)) //this was an older test
+	if (!doNotStart)
+		this->doSchedule();
+}
 
- case 5 :
- case 5 | (1 << 3) :
- case 5 | (2 << 3) :
- case 5 | (3 << 3) :
-						ARM9Mem.ObjExtPal00 = ARM9Mem.ARM9_LCD + 0x94000;
-						ARM9Mem.ObjExtPal01 = ARM9Mem.ARM9_LCD + 0x96000;
-						break;
-				}
-			}
-			break;
+void DmaController::exec()
+{
+	// this function runs when the DMA ends. the dma start actually queues this event after some kind of guess as to how long the DMA should take
 
- case REG_VRAMCNTH :
-			if(proc == ARMCPU_ARM9)
-			{
- MMU_VRAMWriteBackToLCD((u8)REG_VRAMCNTH) ;
+	// we'll need to unfreeze the arm9 bus now
+	if (this->procnum == ARMCPU_ARM9)
+		nds.freezeBus &= ~(1 << (this->chan + 1));
 
- if((val & 7) == 2)
-				{
-					ARM9Mem.ExtPal10 = ARM9Mem.ARM9_LCD + 0x98000;
-					ARM9Mem.ExtPal11 = ARM9Mem.ARM9_LCD + 0x9A000;
-					ARM9Mem.ExtPal12 = ARM9Mem.ARM9_LCD + 0x9C000;
-					ARM9Mem.ExtPal13 = ARM9Mem.ARM9_LCD + 0x9E000;
-				}
+	this->dmaCheck = false;
 
-				MMU_VRAMReloadFromLCD(adr-REG_VRAMCNTH,val) ;
-			}
-			break;
+	if (this->running)
+	{
+		this->doStop();
+		return;
+	}
 
- case REG_VRAMCNTI :
-			if(proc == ARMCPU_ARM9)
-			{
- MMU_VRAMWriteBackToLCD((u8)REG_VRAMCNTI) ;
+	if (this->enable)
+	{
+		// analyze startmode (this only gets latched when a dma begins)
+		if (this->procnum == ARMCPU_ARM9)
+			this->startmode = static_cast<EDMAMode>(this->_startmode);
+		else
+		{
+			// arm7 startmode analysis:
+			static const EDMAMode lookup = { EDMAMode_Immediate, EDMAMode_VBlank, EDMAMode_Card, EDMAMode7_Wifi };
+			// arm7 has a slightly different startmode encoding
+			this->startmode = lookupthis->_startmode >> 1;
+			if (this->startmode == EDMAMode7_Wifi && (this->chan == 1 || this->chan == 3))
+				this->startmode = EDMAMode7_GBASlot;
+		}
 
- if((val & 7) == 3)
-				{
-					ARM9Mem.ObjExtPal10 = ARM9Mem.ARM9_LCD + 0xA0000;
-					ARM9Mem.ObjExtPal11 = ARM9Mem.ARM9_LCD + 0xA2000;
-				}
+		// make it run, if it is triggered
+		// but first, scan for triggering conditions
+		switch (this->startmode)
+		{
+			case EDMAMode_Immediate:
+				this->triggered = true;
+				break;
+			default:
+				break;
+		}
 
-				MMU_VRAMReloadFromLCD(adr-REG_VRAMCNTI,val) ;
-			}
-			break;
+		if (this->triggered)
+		{
+			this->running = true;
+			this->paused = false;
+			if (this->procnum == ARMCPU_ARM9)
+				this->doCopy<ARMCPU_ARM9>();
+			else
+				this->doCopy<ARMCPU_ARM7>();
+		}
+	}
+}
 
-#ifdef LOG_CARD
-		case 0x040001A0 : /* TODO (clear): ??? */
-		case 0x040001A1 :
-		case 0x040001A2 :
-		case 0x040001A8 :
-		case 0x040001A9 :
-		case 0x040001AA :
-		case 0x040001AB :
-		case 0x040001AC :
-		case 0x040001AD :
-		case 0x040001AE :
-		case 0x040001AF :
- LOG("%08X : %02X\r\n", adr, val);
-#endif
+template<int PROCNUM> void DmaController::doCopy()
+{
+	// generate a copy count depending on various copy mode's behavior
+	uint32_t todo = this->wordcount;
+	if (PROCNUM == ARMCPU_ARM9)
+		if (!todo)
+			todo = 0x200000; // according to gbatek.. we've verified this behaviour on the arm7
+	if (this->startmode == EDMAMode_MemDisplay)
+	{
+		todo = 128; // this is a hack. maybe an alright one though. it should be 4 words at a time. this is a whole scanline
 
-		default :
+		// apparently this dma turns off after it finishes a frame
+		if (nds.VCount == 191)
+			this->enable = 0;
+	}
+	if (this->startmode == EDMAMode_Card)
+		todo *= 0x80;
+
+	// determine how we're going to copy
+	bool bogarted = false;
+	uint32_t sz = this->bitWidth == EDMABitWidth_16 ? 2 : 4;
+	uint32_t dstinc = 0, srcinc = 0;
+	switch (this->dar)
+	{
+		case EDMADestinationUpdate_Increment:
+			dstinc = sz;
+			break;
+		case EDMADestinationUpdate_Decrement:
+			dstinc = -static_cast<int32_t>(sz);
+			break;
+		case EDMADestinationUpdate_Fixed:
+			dstinc = 0;
+			break;
+		case EDMADestinationUpdate_IncrementReload:
+			dstinc = sz;
+	}
+	switch (this->sar)
+	{
+		case EDMASourceUpdate_Increment:
+			srcinc = sz;
+			break;
+		case EDMASourceUpdate_Decrement:
+			srcinc = -static_cast<int32_t>(sz);
 			break;
+		case EDMASourceUpdate_Fixed:
+			srcinc = 0;
+			break;
+		case EDMASourceUpdate_Invalid:
+			bogarted = true;
+	}
+
+	// need to figure out what to do about this
+	if (bogarted)
+	{
+		fprintf(stderr, "YOUR GAME IS BOGARTED!!! PLEASE REPORT!!!\n");
+		assert(false);
+		return;
+	}
+
+	uint32_t src = this->saddr;
+	uint32_t dst = this->daddr;
+
+	// if these do not use MMU_AT_DMA and the corresponding code in the read/write routines,
+	// then danny phantom title screen will be filled with a garbage char which is made by
+	// dmaing from 0x00000000 to 0x06000000
+	// TODO - these might be losing out a lot by not going through the templated version anymore.
+	// we might make another function to do just the raw copy op which can use them with checks
+	// outside the loop
+	int time_elapsed = 0;
+	for (int32_t i = todo; i > 0; --i)
+	{
+		if (sz == 4)
+		{
+			time_elapsed += _MMU_accesstime<PROCNUM, MMU_AT_DMA, 32, MMU_AD_READ, true>(src, true);
+			time_elapsed += _MMU_accesstime<PROCNUM, MMU_AT_DMA, 32, MMU_AD_WRITE, true>(dst, true);
+			uint32_t temp = _MMU_read32(procnum, MMU_AT_DMA, src);
+			_MMU_write32(procnum, MMU_AT_DMA, dst, temp);
+		}
+		else
+		{
+			time_elapsed += _MMU_accesstime<PROCNUM, MMU_AT_DMA, 16, MMU_AD_READ, true>(src, true);
+			time_elapsed += _MMU_accesstime<PROCNUM, MMU_AT_DMA, 16, MMU_AD_WRITE, true>(dst, true);
+			uint16_t temp = _MMU_read16(procnum, MMU_AT_DMA, src);
+			_MMU_write16(procnum, MMU_AT_DMA, dst, temp);
+		}
+		dst += dstinc;
+		src += srcinc;
 	}
 
-	MMU.MMU_MEMproc(adr>>20)&0xFFadr&MMU.MMU_MASKproc(adr>>20)&0xFF=val;
+	// reschedule an event for the end of this dma, and figure out how much it cost us
+	this->doSchedule();
+
+	// zeromus, check it
+	if (this->wordcount > todo)
+		this->nextEvent += todo / 4; // TODO - surely this is a gross simplification
+	// apparently moon has very, very tight timing (i didnt spy it using waitbyloop swi...)
+	// so lets bump this down a bit for now,
+	// (i think this code is in nintendo libraries)
+
+	// write back the addresses
+	this->saddr = src;
+	if (this->dar != EDMADestinationUpdate_IncrementReload) // but dont write back dst if we were supposed to reload
+		this->daddr = dst;
+
+	// do wordcount accounting
+	if (this->startmode == EDMAMode_Card)
+		todo /= 0x80; // divide this funky one back down before subtracting it
+
+	if (!this->repeatMode)
+		this->wordcount -= todo;
 }
 
-u16 partie = 1;
+void triggerDma(EDMAMode mode)
+{
+	MACRODO2(0, {
+		int i = X;
+		MACRODO4(0, {
+			int j = X;
+			MMU_new.dmaij.tryTrigger(mode);
+		});
+	});
+}
 
-void FASTCALL MMU_write16(u32 proc, u32 adr, u16 val)
+void DmaController::tryTrigger(EDMAMode mode)
 {
-#ifdef INTERNAL_DTCM_WRITE
-	if((proc == ARMCPU_ARM9) && ((adr & ~0x3FFF) == MMU.DTCMRegion))
-	{
-		/* Writes in DTCM (ARM9 only) */
-		T1WriteWord(ARM9Mem.ARM9_DTCM, adr & 0x3FFF, val);
+	if (this->startmode != mode)
+		return;
+	if (!this->enable)
 		return;
-	}
-#endif
 
-	// CFlash writing, Mic
-	if ((adr>=0x08800000)&&(adr<0x09900000))
-	{
-		cflash_write(adr,val);
+	// hmm dont trigger it if its already running!
+	// but paused things need triggers to continue
+	if (this->running && !this->paused)
 		return;
-	}
+	this->triggered = true;
+	this->doSchedule();
+}
+
+void DmaController::doSchedule()
+{
+	this->dmaCheck = true;
+	this->nextEvent = nds_timer;
+	NDS_RescheduleDMA();
+}
+
+void DmaController::doPause()
+{
+	this->triggered = false;
+	this->paused = true;
+}
+
+void DmaController::doStop()
+{
+	this->running = false;
+	if (!this->repeatMode)
+		this->enable = false;
+	if (this->irq)
+		NDS_makeIrq(this->procnum, IRQ_BIT_DMA_0 + this->chan);
+}
+
+uint32_t DmaController::read32()
+{
+	uint32_t ret = 0;
+	ret |= this->enable << 31;
+	ret |= this->irq << 30;
+	ret |= this->_startmode << 27;
+	ret |= this->bitWidth << 26;
+	ret |= this->repeatMode << 25;
+	ret |= this->sar << 23;
+	ret |= this->dar << 21;
+	ret |= this->wordcount;
+	//fprintf(stderr, "dma %d,%d READ %08X\n",procnum,chan,ret);
+	return ret;
+}
 
-#ifdef EXPERIMENTAL_WIFI
+// ================================================================================================== ARM9 *
+// =========================================================================================================
+// =========================================================================================================
+// ================================================= MMU write 08
+void FASTCALL _MMU_ARM9_write08(uint32_t adr, uint8_t val)
+{
+	adr &= 0x0FFFFFFF;
 
-	/* wifi mac access */
-	if ((proc==ARMCPU_ARM7) && (adr>=0x04800000)&&(adr<0x05000000))
+	if (adr < 0x02000000)
 	{
-		WIFI_write16(&wifiMac,adr,val) ;
-		return ;
+		T1WriteByte(MMU.ARM9_ITCM, adr & 0x7FFF, val);
+		return;
 	}
-#else
-	if ((proc==ARMCPU_ARM7) && (adr>=0x04800000)&&(adr<0x05000000))
-		return ;
-#endif
 
-	adr &= 0x0FFFFFFF;
+	if (adr >= 0x08000000 && adr < 0x0A010000)
+		return;
+
+	// block 8bit writes to OAM and palette memory
+	if ((adr & 0x0F000000) == 0x07000000)
+		return;
+	if ((adr & 0x0F000000) == 0x05000000)
+		return;
 
- // This is bad, remove it
- if(proc == ARMCPU_ARM7)
- {
- if ((adr>=0x04000400)&&(adr<0x0400051D))
- {
- SPU_WriteWord(adr, val);
- return;
- }
- }
-
-	if((adr >> 24) == 4)
+	if ((adr >> 24) == 4)
 	{
-		/* Adress is an IO register */
-		switch(adr)
+		if (MMU_new.is_dma(adr))
 		{
-#if VIO2SF_GPU_ENABLE
-			case 0x0400035C:
-			{
-				((u16 *)(MMU.MMU_MEMproc0x40))0x35C>>1 = val;
-				if(proc == ARMCPU_ARM9)
-				{
-					gpu3D->NDS_3D_FogOffset (val);
-				}
+			MMU_new.write_dma(ARMCPU_ARM9, 8, adr, val);
+			return;
+		}
+
+		switch (adr)
+		{
+			case REG_SQRTCNT:
+				fprintf(stderr, "ERROR 8bit SQRTCNT WRITE\n");
 				return;
-			}
-			case 0x04000340:
-			{
-				((u16 *)(MMU.MMU_MEMproc0x40))0x340>>1 = val;
-				if(proc == ARMCPU_ARM9)
-				{
-					gpu3D->NDS_3D_AlphaFunc(val);
-				}
+			case REG_SQRTCNT + 1:
+				fprintf(stderr, "ERROR 8bit SQRTCNT1 WRITE\n");
 				return;
-			}
-			case 0x04000060:
-			{
-				((u16 *)(MMU.MMU_MEMproc0x40))0x060>>1 = val;
-				if(proc == ARMCPU_ARM9)
-				{
-					gpu3D->NDS_3D_Control(val);
-				}
+			case REG_SQRTCNT + 2:
+				fprintf(stderr, "ERROR 8bit SQRTCNT2 WRITE\n");
 				return;
-			}
-			case 0x04000354:
-			{
-				((u16 *)(MMU.MMU_MEMproc0x40))0x354>>1 = val;
-				if(proc == ARMCPU_ARM9)
-				{
-					gpu3D->NDS_3D_ClearDepth(val);
-				}
+			case REG_SQRTCNT + 3:
+				fprintf(stderr, "ERROR 8bit SQRTCNT3 WRITE\n");
+				return;
+
+#if 1
+			case REG_DIVCNT:
+				fprintf(stderr, "ERROR 8bit DIVCNT WRITE\n");
+				return;
+			case REG_DIVCNT + 1:
+				fprintf(stderr, "ERROR 8bit DIVCNT+1 WRITE\n");
+				return;
+			case REG_DIVCNT + 2:
+				fprintf(stderr, "ERROR 8bit DIVCNT+2 WRITE\n");
+				return;
+			case REG_DIVCNT + 3:
+				fprintf(stderr, "ERROR 8bit DIVCNT+3 WRITE\n");
 				return;
-			}
 #endif
 
-			case REG_DISPA_BLDCNT:
-				if(proc == ARMCPU_ARM9) GPU_setBLDCNT(MainScreen.gpu,val) ;
-				break ;
-			case REG_DISPB_BLDCNT:
-				if(proc == ARMCPU_ARM9) GPU_setBLDCNT(SubScreen.gpu,val) ;
-				break ;
-			case REG_DISPA_BLDALPHA:
-				if(proc == ARMCPU_ARM9) GPU_setBLDALPHA(MainScreen.gpu,val) ;
-				break ;
-			case REG_DISPB_BLDALPHA:
-				if(proc == ARMCPU_ARM9) GPU_setBLDALPHA(SubScreen.gpu,val) ;
-				break ;
-			case REG_DISPA_BLDY:
-				if(proc == ARMCPU_ARM9) GPU_setBLDY_EVY(MainScreen.gpu,val) ;
-				break ;
-			case REG_DISPB_BLDY:
-				if(proc == ARMCPU_ARM9) GPU_setBLDY_EVY(SubScreen.gpu,val) ;
+			case REG_IF:
+				REG_IF_WriteByte(ARMCPU_ARM9, 0, val);
 				break;
-			case REG_DISPA_MASTERBRIGHT:
-				GPU_setMasterBrightness (MainScreen.gpu, val);
+			case REG_IF + 1:
+				REG_IF_WriteByte(ARMCPU_ARM9, 1, val);
 				break;
-				/*
-			case REG_DISPA_MOSAIC:
-				if(proc == ARMCPU_ARM9) GPU_setMOSAIC(MainScreen.gpu,val) ;
-				break ;
-			case REG_DISPB_MOSAIC:
-				if(proc == ARMCPU_ARM9) GPU_setMOSAIC(SubScreen.gpu,val) ;
-				break ;
-				*/
-
-			case REG_DISPA_WIN0H:
-				if(proc == ARMCPU_ARM9) GPU_setWIN0_H (MainScreen.gpu,val) ;
-				break ;
-			case REG_DISPA_WIN1H:
-				if(proc == ARMCPU_ARM9) GPU_setWIN1_H(MainScreen.gpu,val) ;
-				break ;
-			case REG_DISPB_WIN0H:
-				if(proc == ARMCPU_ARM9) GPU_setWIN0_H(SubScreen.gpu,val) ;
-				break ;
-			case REG_DISPB_WIN1H:
-				if(proc == ARMCPU_ARM9) GPU_setWIN1_H(SubScreen.gpu,val) ;
-				break ;
-			case REG_DISPA_WIN0V:
-				if(proc == ARMCPU_ARM9) GPU_setWIN0_V(MainScreen.gpu,val) ;
-				break ;
-			case REG_DISPA_WIN1V:
-				if(proc == ARMCPU_ARM9) GPU_setWIN1_V(MainScreen.gpu,val) ;
-				break ;
-			case REG_DISPB_WIN0V:
-				if(proc == ARMCPU_ARM9) GPU_setWIN0_V(SubScreen.gpu,val) ;
-				break ;
-			case REG_DISPB_WIN1V:
-				if(proc == ARMCPU_ARM9) GPU_setWIN1_V(SubScreen.gpu,val) ;
-				break ;
-			case REG_DISPA_WININ:
-				if(proc == ARMCPU_ARM9) GPU_setWININ(MainScreen.gpu, val) ;
-				break ;
-			case REG_DISPA_WINOUT:
-				if(proc == ARMCPU_ARM9) GPU_setWINOUT16(MainScreen.gpu, val) ;
-				break ;
-			case REG_DISPB_WININ:
-				if(proc == ARMCPU_ARM9) GPU_setWININ(SubScreen.gpu, val) ;
-				break ;
-			case REG_DISPB_WINOUT:
-				if(proc == ARMCPU_ARM9) GPU_setWINOUT16(SubScreen.gpu, val) ;
-				break ;
-
-			case REG_DISPB_MASTERBRIGHT:
-				GPU_setMasterBrightness (SubScreen.gpu, val);
+			case REG_IF + 2:
+				REG_IF_WriteByte(ARMCPU_ARM9, 2, val);
+				break;
+			case REG_IF + 3:
+				REG_IF_WriteByte(ARMCPU_ARM9, 3, val);
 				break;
 
- case REG_POWCNT1 :
-				if(proc == ARMCPU_ARM9)
-				{
-					if(val & (1<<15))
-					{
-						LOG("Main core on top\n");
-						MainScreen.offset = 0;
-						SubScreen.offset = 192;
-						//nds.swapScreen();
-					}
-					else
-					{
-						LOG("Main core on bottom (%04X)\n", val);
-						MainScreen.offset = 192;
-						SubScreen.offset = 0;
-					}
-				}
-				T1WriteWord(MMU.MMU_MEMproc0x40, 0x304, val);
-				return;
-
- case REG_AUXSPICNT:
- T1WriteWord(MMU.MMU_MEMproc(REG_AUXSPICNT >> 20) & 0xff, REG_AUXSPICNT & 0xfff, val);
- AUX_SPI_CNT = val;
+			case REG_VRAMCNTA:
+			case REG_VRAMCNTB:
+			case REG_VRAMCNTC:
+			case REG_VRAMCNTD:
+			case REG_VRAMCNTE:
+			case REG_VRAMCNTF:
+			case REG_VRAMCNTG:
+			case REG_WRAMCNT:
+			case REG_VRAMCNTH:
+			case REG_VRAMCNTI:
+				MMU_VRAMmapControl(adr - REG_VRAMCNTA, val);
+		}
 
- if (val == 0)
- mc_reset_com(&MMU.bupmem); /* reset backup memory device communication */
-				return;
+		MMU.MMU_MEMARMCPU_ARM9adr >> 20adr & MMU.MMU_MASKARMCPU_ARM9adr >> 20 = val;
+		return;
+	}
 
- case REG_AUXSPIDATA:
- if(val!=0)
- {
- AUX_SPI_CMD = val & 0xFF;
- }
+	// Removed the &0xFF as they are implicit with the adr&0x0FFFFFFF shash
+	MMU.MMU_MEMARMCPU_ARM9adr >> 20adr & MMU.MMU_MASKARMCPU_ARM9adr >> 20 = val;
+}
 
- T1WriteWord(MMU.MMU_MEMproc(REG_AUXSPIDATA >> 20) & 0xff, REG_AUXSPIDATA & 0xfff, bm_transfer(&MMU.bupmem, val));
-				return;
+// ================================================= MMU ARM9 write 16
+void FASTCALL _MMU_ARM9_write16(uint32_t adr, uint16_t val)
+{
+	adr &= 0x0FFFFFFE;
 
-			case REG_SPICNT :
-				if(proc == ARMCPU_ARM7)
-				{
- int reset_firmware = 1;
-
- if ( ((SPI_CNT >> 8) & 0x3) == 1) {
- if ( ((val >> 8) & 0x3) == 1) {
- if ( BIT11(SPI_CNT)) {
- /* select held */
- reset_firmware = 0;
- }
- }
- }
-
- //MMU.fw.com == 0; /* reset fw device communication */
- if ( reset_firmware) {
- /* reset fw device communication */
- mc_reset_com(&MMU.fw);
- }
- SPI_CNT = val;
- }
-
-				T1WriteWord(MMU.MMU_MEMproc(REG_SPICNT >> 20) & 0xff, REG_SPICNT & 0xfff, val);
-				return;
-
-			case REG_SPIDATA :
-				if(proc==ARMCPU_ARM7)
-				{
- u16 spicnt;
-
-					if(val!=0)
-					{
-						SPI_CMD = val;
-					}
-
- spicnt = T1ReadWord(MMU.MMU_MEMproc(REG_SPICNT >> 20) & 0xff, REG_SPICNT & 0xfff);
-
- switch((spicnt >> 8) & 0x3)
-					{
- case 0 :
-							break;
+	if (adr < 0x02000000)
+	{
+		T1WriteWord(MMU.ARM9_ITCM, adr & 0x7FFF, val);
+		return;
+	}
 
- case 1 : /* firmware memory device */
- if((spicnt & 0x3) != 0) /* check SPI baudrate (must be 4mhz) */
-							{
-								T1WriteWord(MMU.MMU_MEMproc(REG_SPIDATA >> 20) & 0xff, REG_SPIDATA & 0xfff, 0);
-								break;
-							}
-							T1WriteWord(MMU.MMU_MEMproc(REG_SPIDATA >> 20) & 0xff, REG_SPIDATA & 0xfff, fw_transfer(&MMU.fw, val));
+	if (adr >= 0x08000000 && adr < 0x0A010000)
+		return;
 
-							return;
+	if ((adr >> 24) == 4)
+	{
+		if (MMU_new.is_dma(adr))
+		{
+			MMU_new.write_dma(ARMCPU_ARM9, 16, adr, val);
+			return;
+		}
 
- case 2 :
-							switch(SPI_CMD & 0x70)
-							{
-								case 0x00 :
-									val = 0;
-									break;
-								case 0x10 :
-									//execute = false;
-									if(SPI_CNT&(1<<11))
-									{
-										if(partie)
-										{
-											val = ((nds.touchY<<3)&0x7FF);
-											partie = 0;
-											//execute = false;
-											break;
-										}
-										val = (nds.touchY>>5);
- partie = 1;
-										break;
-									}
-									val = ((nds.touchY<<3)&0x7FF);
-									partie = 1;
-									break;
-								case 0x20 :
-									val = 0;
-									break;
-								case 0x30 :
-									val = 0;
-									break;
-								case 0x40 :
-									val = 0;
-									break;
-								case 0x50 :
- if(spicnt & 0x800)
-									{
-										if(partie)
-										{
-											val = ((nds.touchX<<3)&0x7FF);
-											partie = 0;
-											break;
-										}
-										val = (nds.touchX>>5);
-										partie = 1;
-										break;
-									}
-									val = ((nds.touchX<<3)&0x7FF);
-									partie = 1;
-									break;
-								case 0x60 :
-									val = 0;
-									break;
-								case 0x70 :
-									val = 0;
-									break;
-							}
-							break;
+		switch (adr >> 4)
+		{
+			// toon table
+			case 0x0400038:
+			case 0x0400039:
+			case 0x040003A:
+			case 0x040003B:
+				reinterpret_cast<uint16_t *>(MMU.MMU_MEMARMCPU_ARM90x40)(adr & 0xFFF) >> 1 = val;
+				return;
+		}
+		// Address is an IO register
+		switch (adr)
+		{
+			case REG_DIVCNT:
+				MMU_new.div.write16(val);
+				execdiv();
+				return;
 
- case 3 :
-							/* NOTICE: Device 3 of SPI is reserved (unused and unusable) */
-							break;
-					}
-				}
+#if 1
+			case REG_DIVNUMER:
+			case REG_DIVNUMER + 2:
+			case REG_DIVNUMER + 4:
+				fprintf(stderr, "DIV: 16 write NUMER %08X. PLEASE REPORT! \n", val);
+				break;
+			case REG_DIVDENOM:
+			case REG_DIVDENOM + 2:
+			case REG_DIVDENOM + 4:
+				fprintf(stderr, "DIV: 16 write DENOM %08X. PLEASE REPORT! \n", val);
+				break;
+#endif
+			case REG_SQRTCNT:
+				MMU_new.sqrt.write16(val);
+				execsqrt();
+				return;
 
-				T1WriteWord(MMU.MMU_MEMproc(REG_SPIDATA >> 20) & 0xff, REG_SPIDATA & 0xfff, val);
-				return;
-
-				/* NOTICE: Perhaps we have to use gbatek-like reg names instead of libnds-like ones ...*/
-
- case REG_DISPA_BG0CNT :
-				//GPULOG("MAIN BG0 SETPROP 16B %08X\r\n", val);
-				if(proc == ARMCPU_ARM9) GPU_setBGProp(MainScreen.gpu, 0, val);
-				T1WriteWord(MMU.MMU_MEMproc0x40, 0x8, val);
-				return;
- case REG_DISPA_BG1CNT :
-				//GPULOG("MAIN BG1 SETPROP 16B %08X\r\n", val);
-				if(proc == ARMCPU_ARM9) GPU_setBGProp(MainScreen.gpu, 1, val);
-				T1WriteWord(MMU.MMU_MEMproc0x40, 0xA, val);
-				return;
- case REG_DISPA_BG2CNT :
-				//GPULOG("MAIN BG2 SETPROP 16B %08X\r\n", val);
-				if(proc == ARMCPU_ARM9) GPU_setBGProp(MainScreen.gpu, 2, val);
-				T1WriteWord(MMU.MMU_MEMproc0x40, 0xC, val);
-				return;
- case REG_DISPA_BG3CNT :
-				//GPULOG("MAIN BG3 SETPROP 16B %08X\r\n", val);
-				if(proc == ARMCPU_ARM9) GPU_setBGProp(MainScreen.gpu, 3, val);
-				T1WriteWord(MMU.MMU_MEMproc0x40, 0xE, val);
-				return;
- case REG_DISPB_BG0CNT :
-				//GPULOG("SUB BG0 SETPROP 16B %08X\r\n", val);
-				if(proc == ARMCPU_ARM9) GPU_setBGProp(SubScreen.gpu, 0, val);
-				T1WriteWord(MMU.MMU_MEMproc0x40, 0x1008, val);
-				return;
- case REG_DISPB_BG1CNT :
-				//GPULOG("SUB BG1 SETPROP 16B %08X\r\n", val);
-				if(proc == ARMCPU_ARM9) GPU_setBGProp(SubScreen.gpu, 1, val);
-				T1WriteWord(MMU.MMU_MEMproc0x40, 0x100A, val);
-				return;
- case REG_DISPB_BG2CNT :
-				//GPULOG("SUB BG2 SETPROP 16B %08X\r\n", val);
-				if(proc == ARMCPU_ARM9) GPU_setBGProp(SubScreen.gpu, 2, val);
-				T1WriteWord(MMU.MMU_MEMproc0x40, 0x100C, val);
-				return;
- case REG_DISPB_BG3CNT :
-				//GPULOG("SUB BG3 SETPROP 16B %08X\r\n", val);
-				if(proc == ARMCPU_ARM9) GPU_setBGProp(SubScreen.gpu, 3, val);
-				T1WriteWord(MMU.MMU_MEMproc0x40, 0x100E, val);
-				return;
- case REG_IME : {
-			 u32 old_val = MMU.reg_IMEproc;
-				u32 new_val = val & 1;
-				MMU.reg_IMEproc = new_val;
-				T1WriteLong(MMU.MMU_MEMproc0x40, 0x208, val);
-				if ( new_val && old_val != new_val) {
-				 /* raise an interrupt request to the CPU if needed */
-				 if ( MMU.reg_IEproc & MMU.reg_IFproc) {
-				 NDS_ARM7.wIRQ = true;
-				 NDS_ARM7.waitIRQ = false;
-				 }
-				}
+			case REG_EXMEMCNT:
+			{
+				uint16_t remote_proc = T1ReadWord(MMU.MMU_MEMARMCPU_ARM70x40, 0x204);
+				T1WriteWord(MMU.MMU_MEMARMCPU_ARM90x40, 0x204, val);
+				T1WriteWord(MMU.MMU_MEMARMCPU_ARM70x40, 0x204, (val & 0xFF80) | (remote_proc & 0x7F));
 				return;
 			}
+
 			case REG_VRAMCNTA:
-				MMU_write8(proc,adr,val & 0xFF) ;
-				MMU_write8(proc,adr+1,val >> 8) ;
-				return ;
 			case REG_VRAMCNTC:
-				MMU_write8(proc,adr,val & 0xFF) ;
-				MMU_write8(proc,adr+1,val >> 8) ;
-				return ;
 			case REG_VRAMCNTE:
-				MMU_write8(proc,adr,val & 0xFF) ;
-				MMU_write8(proc,adr+1,val >> 8) ;
-				return ;
 			case REG_VRAMCNTG:
-				MMU_write8(proc,adr,val & 0xFF) ;
-				MMU_write8(proc,adr+1,val >> 8) ;
-				return ;
-			case REG_VRAMCNTI:
-				MMU_write8(proc,adr,val & 0xFF) ;
-				return ;
-
-			case REG_IE :
-				MMU.reg_IEproc = (MMU.reg_IEproc&0xFFFF0000) | val;
-				if ( MMU.reg_IMEproc) {
-				 /* raise an interrupt request to the CPU if needed */
-				 if ( MMU.reg_IEproc & MMU.reg_IFproc) {
-				 NDS_ARM7.wIRQ = true;
-				 NDS_ARM7.waitIRQ = false;
-				 }
-				}
-				return;
-			case REG_IE + 2 :
-				execute = false;
-				MMU.reg_IEproc = (MMU.reg_IEproc&0xFFFF) | (((u32)val)<<16);
-				return;
-
-			case REG_IF :
-				execute = false;
-				MMU.reg_IFproc &= (~((u32)val));
-				return;
-			case REG_IF + 2 :
-				execute = false;
-				MMU.reg_IFproc &= (~(((u32)val)<<16));
-				return;
-
- case REG_IPCSYNC :
-				{
-				u32 remote = (proc+1)&1;
-				u16 IPCSYNC_remote = T1ReadWord(MMU.MMU_MEMremote0x40, 0x180);
-				T1WriteWord(MMU.MMU_MEMproc0x40, 0x180, (val&0xFFF0)|((IPCSYNC_remote>>8)&0xF));
-				T1WriteWord(MMU.MMU_MEMremote0x40, 0x180, (IPCSYNC_remote&0xFFF0)|((val>>8)&0xF));
-				MMU.reg_IFremote |= ((IPCSYNC_remote & (1<<14))<<2) & ((val & (1<<13))<<3);// & (MMU.reg_IMEremote << 16);// & (MMU.reg_IEremote & (1<<16));//
-				//execute = false;
-				}
-				return;
- case REG_IPCFIFOCNT :
-				{
-					u32 cnt_l = T1ReadWord(MMU.MMU_MEMproc0x40, 0x184) ;
-					u32 cnt_r = T1ReadWord(MMU.MMU_MEM(proc+1) & 10x40, 0x184) ;
-					if ((val & 0x8000) && !(cnt_l & 0x8000))
-					{
-						/* this is the first init, the other side didnt init yet */
-						/* so do a complete init */
-						FIFOInit(MMU.fifos + (IPCFIFO+proc));
-						T1WriteWord(MMU.MMU_MEMproc0x40, 0x184,0x8101) ;
-						/* and then handle it as usual */
-					}
+			case REG_VRAMCNTH:
+				MMU_VRAMmapControl(adr - REG_VRAMCNTA, val & 0xFF);
+				MMU_VRAMmapControl(adr - REG_VRAMCNTA + 1, val >> 8);
+				break;
 
-				if(val & 0x4008)
-				{
-					FIFOInit(MMU.fifos + (IPCFIFO+((proc+1)&1)));
-					T1WriteWord(MMU.MMU_MEMproc0x40, 0x184, (cnt_l & 0x0301) | (val & 0x8404) | 1);
-					T1WriteWord(MMU.MMU_MEMproc^10x40, 0x184, (cnt_r & 0xC507) | 0x100);
-					MMU.reg_IFproc |= ((val & 4)<<15);// & (MMU.reg_IMEproc<<17);// & (MMU.reg_IEproc&0x20000);//
-					return;
-				}
-				T1WriteWord(MMU.MMU_MEMproc0x40, 0x184, T1ReadWord(MMU.MMU_MEMproc0x40, 0x184) | (val & 0xBFF4));
-				}
-				return;
- case REG_TM0CNTL :
- case REG_TM1CNTL :
- case REG_TM2CNTL :
- case REG_TM3CNTL :
-				MMU.timerReloadproc(adr>>2)&3 = val;
-				return;
- case REG_TM0CNTH :
- case REG_TM1CNTH :
- case REG_TM2CNTH :
- case REG_TM3CNTH :
-				if(val&0x80)
-				{
-				 MMU.timerproc((adr-2)>>2)&0x3 = MMU.timerReloadproc((adr-2)>>2)&0x3;
-				}
-				MMU.timerONproc((adr-2)>>2)&0x3 = val & 0x80;
-				switch(val&7)
-				{
-				case 0 :
-					MMU.timerMODEproc((adr-2)>>2)&0x3 = 0+1;//proc;
-					break;
-				case 1 :
-					MMU.timerMODEproc((adr-2)>>2)&0x3 = 6+1;//proc;
-					break;
-				case 2 :
-					MMU.timerMODEproc((adr-2)>>2)&0x3 = 8+1;//proc;
-					break;
-				case 3 :
-					MMU.timerMODEproc((adr-2)>>2)&0x3 = 10+1;//proc;
-					break;
-				default :
-					MMU.timerMODEproc((adr-2)>>2)&0x3 = 0xFFFF;
-					break;
-				}
-				if(!(val & 0x80))
-				MMU.timerRUNproc((adr-2)>>2)&0x3 = false;
-				T1WriteWord(MMU.MMU_MEMproc0x40, adr & 0xFFF, val);
+			case REG_IME:
+				NDS_Reschedule();
+				MMU.reg_IMEARMCPU_ARM9 = val & 0x01;
+				T1WriteLong(MMU.MMU_MEMARMCPU_ARM90x40, 0x208, val);
 				return;
- case REG_DISPA_DISPCNT+2 :
-				{
-				//execute = false;
-				u32 v = (T1ReadLong(MMU.MMU_MEMproc0x40, 0) & 0xFFFF) | ((u32) val << 16);
-				GPU_setVideoProp(MainScreen.gpu, v);
-				T1WriteLong(MMU.MMU_MEMproc0x40, 0, v);
-				}
+			case REG_IE:
+				NDS_Reschedule();
+				MMU.reg_IEARMCPU_ARM9 = (MMU.reg_IEARMCPU_ARM9 & 0xFFFF0000) | val;
 				return;
- case REG_DISPA_DISPCNT :
-				if(proc == ARMCPU_ARM9)
-				{
-				u32 v = (T1ReadLong(MMU.MMU_MEMproc0x40, 0) & 0xFFFF0000) | val;
-				GPU_setVideoProp(MainScreen.gpu, v);
-				T1WriteLong(MMU.MMU_MEMproc0x40, 0, v);
-				}
+			case REG_IE + 2:
+				NDS_Reschedule();
+				MMU.reg_IEARMCPU_ARM9 = (MMU.reg_IEARMCPU_ARM9 & 0xFFFF) | (val << 16);
 				return;
- case REG_DISPA_DISPCAPCNT :
-				if(proc == ARMCPU_ARM9)
-				{
-					GPU_set_DISPCAPCNT(MainScreen.gpu,val);
-				}
+			case REG_IF:
+				REG_IF_WriteWord(ARMCPU_ARM9, 0, val);
 				return;
- case REG_DISPB_DISPCNT+2 :
-				if(proc == ARMCPU_ARM9)
-				{
-				//execute = false;
-				u32 v = (T1ReadLong(MMU.MMU_MEMproc0x40, 0x1000) & 0xFFFF) | ((u32) val << 16);
-				GPU_setVideoProp(SubScreen.gpu, v);
-				T1WriteLong(MMU.MMU_MEMproc0x40, 0x1000, v);
-				}
+			case REG_IF + 2:
+				REG_IF_WriteWord(ARMCPU_ARM9, 2, val);
 				return;
- case REG_DISPB_DISPCNT :
-				{
-				u32 v = (T1ReadLong(MMU.MMU_MEMproc0x40, 0x1000) & 0xFFFF0000) | val;
-				GPU_setVideoProp(SubScreen.gpu, v);
-				T1WriteLong(MMU.MMU_MEMproc0x40, 0x1000, v);
-				}
+
+			case REG_IPCSYNC:
+				MMU_IPCSync(ARMCPU_ARM9, val);
 				return;
-			//case 0x020D8460 :
-			/*case 0x0235A904 :
-				LOG("ECRIRE %d %04X\r\n", proc, val);
-				execute = false;*/
- case REG_DMA0CNTH :
-				{
- u32 v;
-
-				//if(val&0x8000) execute = false;
-				//LOG("16 bit dma0 %04X\r\n", val);
-				T1WriteWord(MMU.MMU_MEMproc0x40, 0xBA, val);
-				DMASrcproc0 = T1ReadLong(MMU.MMU_MEMproc0x40, 0xB0);
-				DMADstproc0 = T1ReadLong(MMU.MMU_MEMproc0x40, 0xB4);
- v = T1ReadLong(MMU.MMU_MEMproc0x40, 0xB8);
-				MMU.DMAStartTimeproc0 = (proc ? (v>>28) & 0x3 : (v>>27) & 0x7);
-				MMU.DMACrtproc0 = v;
-				if(MMU.DMAStartTimeproc0 == 0)
-					MMU_doDMA(proc, 0);
-				#ifdef LOG_DMA2
-				//else
-				{
-					LOG("proc %d, dma %d src %08X dst %08X %s\r\n", proc, 0, DMASrcproc0, DMADstproc0, (val&(1<<25))?"ON":"OFF");
-				}
-				#endif
-				}
+
+			case REG_IPCFIFOCNT:
+				IPC_FIFOcnt(ARMCPU_ARM9, val);
 				return;
- case REG_DMA1CNTH :
-				{
- u32 v;
-				//if(val&0x8000) execute = false;
-				//LOG("16 bit dma1 %04X\r\n", val);
-				T1WriteWord(MMU.MMU_MEMproc0x40, 0xC6, val);
-				DMASrcproc1 = T1ReadLong(MMU.MMU_MEMproc0x40, 0xBC);
-				DMASrcproc1 = T1ReadLong(MMU.MMU_MEMproc0x40, 0xC0);
- v = T1ReadLong(MMU.MMU_MEMproc0x40, 0xC4);
-				MMU.DMAStartTimeproc1 = (proc ? (v>>28) & 0x3 : (v>>27) & 0x7);
-				MMU.DMACrtproc1 = v;
-				if(MMU.DMAStartTimeproc1 == 0)
-					MMU_doDMA(proc, 1);
-				#ifdef LOG_DMA2
-				//else
-				{
-					LOG("proc %d, dma %d src %08X dst %08X %s\r\n", proc, 1, DMASrcproc1, DMADstproc1, (val&(1<<25))?"ON":"OFF");
-				}
-				#endif
-				}
+			case REG_TM0CNTL:
+			case REG_TM1CNTL:
+			case REG_TM2CNTL:
+			case REG_TM3CNTL:
+				MMU.timerReloadARMCPU_ARM9(adr >> 2) & 3 = val;
 				return;
- case REG_DMA2CNTH :
-				{
- u32 v;
-				//if(val&0x8000) execute = false;
-				//LOG("16 bit dma2 %04X\r\n", val);
-				T1WriteWord(MMU.MMU_MEMproc0x40, 0xD2, val);
-				DMASrcproc2 = T1ReadLong(MMU.MMU_MEMproc0x40, 0xC8);
-				DMASrcproc2 = T1ReadLong(MMU.MMU_MEMproc0x40, 0xCC);
- v = T1ReadLong(MMU.MMU_MEMproc0x40, 0xD0);
-				MMU.DMAStartTimeproc2 = (proc ? (v>>28) & 0x3 : (v>>27) & 0x7);
-				MMU.DMACrtproc2 = v;
-				if(MMU.DMAStartTimeproc2 == 0)
-					MMU_doDMA(proc, 2);
-				#ifdef LOG_DMA2
-				//else
-				{
-					LOG("proc %d, dma %d src %08X dst %08X %s\r\n", proc, 2, DMASrcproc2, DMADstproc2, (val&(1<<25))?"ON":"OFF");
-				}
-				#endif
-				}
+			case REG_TM0CNTH:
+			case REG_TM1CNTH:
+			case REG_TM2CNTH:
+			case REG_TM3CNTH:
+			{
+				int timerIndex	= ((adr - 2) >> 2) & 0x3;
+				write_timer(ARMCPU_ARM9, timerIndex, val);
 				return;
- case REG_DMA3CNTH :
-				{
- u32 v;
-				//if(val&0x8000) execute = false;
-				//LOG("16 bit dma3 %04X\r\n", val);
-				T1WriteWord(MMU.MMU_MEMproc0x40, 0xDE, val);
-				DMASrcproc3 = T1ReadLong(MMU.MMU_MEMproc0x40, 0xD4);
-				DMASrcproc3 = T1ReadLong(MMU.MMU_MEMproc0x40, 0xD8);
- v = T1ReadLong(MMU.MMU_MEMproc0x40, 0xDC);
-				MMU.DMAStartTimeproc3 = (proc ? (v>>28) & 0x3 : (v>>27) & 0x7);
-				MMU.DMACrtproc3 = v;
-
-				if(MMU.DMAStartTimeproc3 == 0)
-					MMU_doDMA(proc, 3);
-				#ifdef LOG_DMA2
-				//else
-				{
-					LOG("proc %d, dma %d src %08X dst %08X %s\r\n", proc, 3, DMASrcproc3, DMADstproc3, (val&(1<<25))?"ON":"OFF");
-				}
-				#endif
-				}
+			}
+
+			case REG_GCROMCTRL:
+				MMU_writeToGCControl(ARMCPU_ARM9, (T1ReadLong(MMU.MMU_MEMARMCPU_ARM90x40, 0x1A4) & 0xFFFF0000) | val);
 				return;
- //case REG_AUXSPICNT : execute = false;
-			default :
-				T1WriteWord(MMU.MMU_MEMproc0x40, adr&MMU.MMU_MASKproc(adr>>20)&0xFF, val);
+			case REG_GCROMCTRL + 2:
+				MMU_writeToGCControl(ARMCPU_ARM9, (T1ReadLong(MMU.MMU_MEMARMCPU_ARM90x40, 0x1A4) & 0xFFFF) | (val << 16));
 				return;
 		}
-	}
-	T1WriteWord(MMU.MMU_MEMproc(adr>>20)&0xFF, adr&MMU.MMU_MASKproc(adr>>20)&0xFF, val);
-}
 
-
-void FASTCALL MMU_write32(u32 proc, u32 adr, u32 val)
-{
-#ifdef INTERNAL_DTCM_WRITE
-	if((proc==ARMCPU_ARM9)&((adr&(~0x3FFF))==MMU.DTCMRegion))
-	{
-		T1WriteLong(ARM9Mem.ARM9_DTCM, adr & 0x3FFF, val);
-		return ;
+		T1WriteWord(MMU.MMU_MEMARMCPU_ARM9adr >> 20, adr & MMU.MMU_MASKARMCPU_ARM9adr >> 20, val);
+		return;
 	}
-#endif
 
-	// CFlash writing, Mic
-	if ((adr>=0x9000000)&&(adr<0x9900000)) {
-	 cflash_write(adr,val);
-	 return;
-	}
+	bool unmapped, restricted;
+	adr = MMU_LCDmap(ARMCPU_ARM9, adr, unmapped, restricted);
+	if (unmapped)
+		return;
 
-	adr &= 0x0FFFFFFF;
+	// Removed the &0xFF as they are implicit with the adr&0x0FFFFFFF shash
+	T1WriteWord(MMU.MMU_MEMARMCPU_ARM9adr >> 20, adr & MMU.MMU_MASKARMCPU_ARM9adr >> 20, val);
+}
 
- // This is bad, remove it
- if(proc == ARMCPU_ARM7)
- {
- if ((adr>=0x04000400)&&(adr<0x0400051D))
- {
- SPU_WriteLong(adr, val);
- return;
- }
- }
+// ================================================= MMU ARM9 write 32
+void FASTCALL _MMU_ARM9_write32(uint32_t adr, uint32_t val)
+{
+	adr &= 0x0FFFFFFC;
 
-		if ((adr & 0xFF800000) == 0x04800000) {
-		/* access to non regular hw registers */
-		/* return to not overwrite valid data */
-			return ;
-		} ;
+	if (adr < 0x02000000)
+	{
+		T1WriteLong(MMU.ARM9_ITCM, adr & 0x7FFF, val);
+		return;
+	}
 
+	if (adr >= 0x08000000 && adr < 0x0A010000)
+		return;
 
-	if((adr>>24)==4)
+	if ((adr >> 24) == 4)
 	{
-		if (adr >= 0x04000400 && adr < 0x04000440)
+		if (MMU_new.is_dma(adr))
 		{
-			// Geometry commands (aka Dislay Lists) - Parameters:X
-			((u32 *)(MMU.MMU_MEMproc0x40))0x400>>2 = val;
-#if VIO2SF_GPU_ENABLE
-			if(proc==ARMCPU_ARM9)
-			{
-				gpu3D->NDS_3D_CallList(val);
-			}
-#endif
+			MMU_new.write_dma(ARMCPU_ARM9, 32, adr, val);
+			return;
 		}
-		else
-		switch(adr)
+
+		switch (adr)
 		{
-#if VIO2SF_GPU_ENABLE
-			// Alpha test reference value - Parameters:1
-			case 0x04000340:
-			{
-				((u32 *)(MMU.MMU_MEMproc0x40))0x340>>2 = val;
-				if(proc == ARMCPU_ARM9)
-				{
-					gpu3D->NDS_3D_AlphaFunc(val);
-				}
-				return;
-			}
-			// Clear background color setup - Parameters:2
-			case 0x04000350:
-			{
-				((u32 *)(MMU.MMU_MEMproc0x40))0x350>>2 = val;
-				if(proc == ARMCPU_ARM9)
-				{
-					gpu3D->NDS_3D_ClearColor(val);
-				}
+			case REG_SQRTCNT:
+				MMU_new.sqrt.write16(val & 0xFFFF);
 				return;
-			}
-			// Clear background depth setup - Parameters:2
-			case 0x04000354:
-			{
-				((u32 *)(MMU.MMU_MEMproc0x40))0x354>>2 = val;
-				if(proc == ARMCPU_ARM9)
-				{
-					gpu3D->NDS_3D_ClearDepth(val);
-				}
-				return;
-			}
-			// Fog Color - Parameters:4b
-			case 0x04000358:
-			{
-				((u32 *)(MMU.MMU_MEMproc0x40))0x358>>2 = val;
-				if(proc == ARMCPU_ARM9)
-				{
-					gpu3D->NDS_3D_FogColor(val);
-				}
-				return;
-			}
-			case 0x0400035C:
-			{
-				((u32 *)(MMU.MMU_MEMproc0x40))0x35C>>2 = val;
-				if(proc == ARMCPU_ARM9)
-				{
-					gpu3D->NDS_3D_FogOffset(val);
-				}
+			case REG_DIVCNT:
+				MMU_new.div.write16(val & 0xFFFF);
 				return;
-			}
-			// Matrix mode - Parameters:1
-			case 0x04000440:
-			{
-				((u32 *)(MMU.MMU_MEMproc0x40))0x440>>2 = val;
 
-				if(proc == ARMCPU_ARM9)
-				{
-					gpu3D->NDS_3D_MatrixMode(val);
-				}
-				return;
-			}
-			// Push matrix - Parameters:0
-			case 0x04000444:
-			{
-				((u32 *)(MMU.MMU_MEMproc0x40))0x444>>2 = val;
-				if(proc == ARMCPU_ARM9)
-				{
-					gpu3D->NDS_3D_PushMatrix();
-				}
-				return;
-			}
-			// Pop matrix/es - Parameters:1
-			case 0x04000448:
-			{
-				((u32 *)(MMU.MMU_MEMproc0x40))0x448>>2 = val;
-				if(proc == ARMCPU_ARM9)
-				{
-					gpu3D->NDS_3D_PopMatrix(val);
-				}
-				return;
-			}
-			// Store matrix in the stack - Parameters:1
-			case 0x0400044C:
-			{
-				((u32 *)(MMU.MMU_MEMproc0x40))0x44C>>2 = val;
-				if(proc == ARMCPU_ARM9)
-				{
-					gpu3D->NDS_3D_StoreMatrix(val);
-				}
-				return;
-			}
-			// Restore matrix from the stack - Parameters:1
-			case 0x04000450:
-			{
-				((u32 *)(MMU.MMU_MEMproc0x40))0x450>>2 = val;
-				if(proc == ARMCPU_ARM9)
-				{
-					gpu3D->NDS_3D_RestoreMatrix(val);
-				}
-				return;
-			}
-			// Load Identity matrix - Parameters:0
-			case 0x04000454:
-			{
-				((u32 *)(MMU.MMU_MEMproc0x40))0x454>>2 = val;
-				if(proc == ARMCPU_ARM9)
-				{
-					gpu3D->NDS_3D_LoadIdentity();
-				}
-				return;
-			}
-			// Load 4x4 matrix - Parameters:16
-			case 0x04000458:
-			{
-				((u32 *)(MMU.MMU_MEMproc0x40))0x458>>2 = val;
-				if(proc == ARMCPU_ARM9)
-				{
-					gpu3D->NDS_3D_LoadMatrix4x4(val);
-				}
+			case REG_VRAMCNTA:
+			case REG_VRAMCNTE:
+				MMU_VRAMmapControl(adr - REG_VRAMCNTA, val & 0xFF);
+				MMU_VRAMmapControl(adr - REG_VRAMCNTA + 1, (val >> 8) & 0xFF);
+				MMU_VRAMmapControl(adr - REG_VRAMCNTA + 2, (val >> 16) & 0xFF);
+				MMU_VRAMmapControl(adr - REG_VRAMCNTA + 3, (val >> 24) & 0xFF);
+				break;
+			case REG_VRAMCNTH:
+				MMU_VRAMmapControl(adr - REG_VRAMCNTA, val & 0xFF);
+				MMU_VRAMmapControl(adr - REG_VRAMCNTA + 1, (val >> 8) & 0xFF);
+				break;
+
+			case REG_IME:
+				NDS_Reschedule();
+				MMU.reg_IMEARMCPU_ARM9 = val & 0x01;
+				T1WriteLong(MMU.MMU_MEMARMCPU_ARM90x40, 0x208, val);
 				return;
-			}
-			// Load 4x3 matrix - Parameters:12
-			case 0x0400045C:
-			{
-				((u32 *)(MMU.MMU_MEMproc0x40))0x45C>>2 = val;
-				if(proc == ARMCPU_ARM9)
-				{
-					gpu3D->NDS_3D_LoadMatrix4x3(val);
-				}
+
+			case REG_IE:
+				NDS_Reschedule();
+				MMU.reg_IEARMCPU_ARM9 = val;
 				return;
-			}
-			// Multiply 4x4 matrix - Parameters:16
-			case 0x04000460:
-			{
-				((u32 *)(MMU.MMU_MEMproc0x40))0x460>>2 = val;
-				if(proc == ARMCPU_ARM9)
-				{
-					gpu3D->NDS_3D_MultMatrix4x4(val);
-				}
+
+			case REG_IF:
+				REG_IF_WriteLong(ARMCPU_ARM9, val);
 				return;
-			}
-			// Multiply 4x4 matrix - Parameters:12
-			case 0x04000464:
+
+			case REG_TM0CNTL:
+			case REG_TM1CNTL:
+			case REG_TM2CNTL:
+			case REG_TM3CNTL:
 			{
-				((u32 *)(MMU.MMU_MEMproc0x40))0x464>>2 = val;
-				if(proc == ARMCPU_ARM9)
-				{
-					gpu3D->NDS_3D_MultMatrix4x3(val);
-				}
+				int timerIndex = (adr >> 2) & 0x3;
+				MMU.timerReloadARMCPU_ARM9timerIndex = val & 0xFFFF;
+				T1WriteWord(MMU.MMU_MEMARMCPU_ARM90x40, adr & 0xFFF, val & 0xFFFF);
+				write_timer(ARMCPU_ARM9, timerIndex, val >> 16);
 				return;
 			}
-			// Multiply 3x3 matrix - Parameters:9
-			case 0x04000468 :
-			{
-				((u32 *)(MMU.MMU_MEMproc0x40))0x468>>2 = val;
-				if(proc == ARMCPU_ARM9)
-				{
-					gpu3D->NDS_3D_MultMatrix3x3(val);
-				}
+
+			case REG_DIVNUMER:
+				T1WriteLong(MMU.MMU_MEMARMCPU_ARM90x40, 0x290, val);
+				execdiv();
 				return;
-			}
-			// Multiply current matrix by scaling matrix - Parameters:3
-			case 0x0400046C:
-			{
-				((u32 *)(MMU.MMU_MEMproc0x40))0x46C>>2 = val;
-				if(proc==ARMCPU_ARM9)
-				{
-					gpu3D->NDS_3D_Scale(val);
-				}
+			case REG_DIVNUMER + 4:
+				T1WriteLong(MMU.MMU_MEMARMCPU_ARM90x40, 0x294, val);
+				execdiv();
 				return;
-			}
-			// Multiply current matrix by translation matrix - Parameters:3
-			case 0x04000470:
+
+			case REG_DIVDENOM:
 			{
-				((u32 *)(MMU.MMU_MEMproc0x40))0x470>>2 = val;
-				if(proc == ARMCPU_ARM9)
-				{
-					gpu3D->NDS_3D_Translate(val);
-				}
+				T1WriteLong(MMU.MMU_MEMARMCPU_ARM90x40, 0x298, val);
+				execdiv();
 				return;
 			}
-			// Set vertex color - Parameters:1
-			case 0x04000480:
+			case REG_DIVDENOM + 4:
 			{
-				((u32 *)(MMU.MMU_MEMproc0x40))0x480>>2 = val;
-				if(proc == ARMCPU_ARM9)
-				{
-					gpu3D->NDS_3D_Color3b(val);
-				}
+				T1WriteLong(MMU.MMU_MEMARMCPU_ARM90x40, 0x29C, val);
+				execdiv();
 				return;
 			}
-			// Set vertex normal - Parameters:1
-			case 0x04000484:
+
+			case REG_SQRTPARAM:
 			{
-				((u32 *)(MMU.MMU_MEMproc0x40))0x484>>2 = val;
-				if(proc == ARMCPU_ARM9)
-				{
-					gpu3D->NDS_3D_Normal(val);
-				}
+				T1WriteLong(MMU.MMU_MEMARMCPU_ARM90x40, 0x2B8, val);
+				execsqrt();
 				return;
 			}
-			// Set vertex texture coordinate - Parameters:1
-			case 0x04000488:
+			case REG_SQRTPARAM + 4:
 			{
-				((u32 *)(MMU.MMU_MEMproc0x40))0x488>>2 = val;
-				if(proc==ARMCPU_ARM9)
-				{
-					gpu3D->NDS_3D_TexCoord(val);
-				}
+				T1WriteLong(MMU.MMU_MEMARMCPU_ARM90x40, 0x2BC, val);
+				execsqrt();
 				return;
 			}
-			// Set vertex position 16b/coordinate - Parameters:2
-			case 0x0400048C:
-			{
-				((u32 *)(MMU.MMU_MEMproc0x40))0x48C>>2 = val;
-				if(proc == ARMCPU_ARM9)
-				{
-					gpu3D->NDS_3D_Vertex16b(val);
-				}
+
+			case REG_IPCSYNC:
+				MMU_IPCSync(ARMCPU_ARM9, val);
 				return;
-			}
-			// Set vertex position 10b/coordinate - Parameters:1
-			case 0x04000490:
-			{
-				((u32 *)(MMU.MMU_MEMproc0x40))0x490>>2 = val;
-				if(proc == ARMCPU_ARM9)
-				{
-					gpu3D->NDS_3D_Vertex10b(val);
-				}
+			case REG_IPCFIFOCNT:
+				IPC_FIFOcnt(ARMCPU_ARM9, val & 0xFFFF);
 				return;
-			}
-			// Set vertex XY position - Parameters:1
-			case 0x04000494:
-			{
-				((u32 *)(MMU.MMU_MEMproc0x40))0x494>>2 = val;
-				if(proc==ARMCPU_ARM9)
-				{
- gpu3D->NDS_3D_Vertex3_cord(0,1,val);
-				}
+			case REG_IPCFIFOSEND:
+				IPC_FIFOsend(ARMCPU_ARM9, val);
 				return;
-			}
-			// Set vertex XZ position - Parameters:1
-			case 0x04000498:
-			{
-				((u32 *)(MMU.MMU_MEMproc0x40))0x498>>2 = val;
-				if(proc==ARMCPU_ARM9)
-				{
- gpu3D->NDS_3D_Vertex3_cord(0,2,val);
-				}
+
+			case REG_GCROMCTRL:
+				MMU_writeToGCControl(ARMCPU_ARM9, val);
 				return;
-			}
-			// Set vertex YZ position - Parameters:1
-			case 0x0400049C:
-			{
-				((u32 *)(MMU.MMU_MEMproc0x40))0x49C>>2 = val;
-				if(proc==ARMCPU_ARM9)
-				{
- gpu3D->NDS_3D_Vertex3_cord(1,2,val);
-				}
+			case REG_DISPA_DISPCAPCNT:
+				T1WriteLong(MMU.ARM9_REG, 0x64, val);
 				return;
-			}
-			// Set vertex difference position (offset from the last vertex) - Parameters:1
-			case 0x040004A0:
-			{
-				((u32 *)(MMU.MMU_MEMproc0x40))0x4A0>>2 = val;
-				if(proc==ARMCPU_ARM9)
-				{
- gpu3D->NDS_3D_Vertex_rel (val);
-				}
+
+			case REG_GCDATAIN:
+				slot1_device.write32(ARMCPU_ARM9, REG_GCDATAIN, val);
 				return;
-			}
-			// Set polygon attributes - Parameters:1
-			case 0x040004A4:
-			{
-				((u32 *)(MMU.MMU_MEMproc0x40))0x4A4>>2 = val;
- if(proc == ARMCPU_ARM9)
-				{
-					gpu3D->NDS_3D_PolygonAttrib(val);
-				}
-				return;
-			}
-			// Set texture parameteres - Parameters:1
-			case 0x040004A8:
-			{
-				((u32 *)(MMU.MMU_MEMproc0x40))0x4A8>>2 = val;
-				if(proc==ARMCPU_ARM9)
-				{
-					gpu3D->NDS_3D_TexImage(val);
-				}
-				return;
-			}
-			// Set palette base address - Parameters:1
-			case 0x040004AC:
-			{
-				((u32 *)(MMU.MMU_MEMproc0x40))0x4AC>>2 = val&0x1FFF;
-				if(proc==ARMCPU_ARM9)
-				{
-					gpu3D->NDS_3D_TexPalette(val&0x1FFFF);
-				}
-				return;
-			}
-			// Set material diffuse/ambient parameters - Parameters:1
-			case 0x040004C0:
-			{
-				((u32 *)(MMU.MMU_MEMproc0x40))0x4C0>>2 = val;
- if(proc == ARMCPU_ARM9)
-				{
-					gpu3D->NDS_3D_Material0 (val);
-				}
-				return;
-			}
-			// Set material reflection/emission parameters - Parameters:1
-			case 0x040004C4:
-			{
-				((u32 *)(MMU.MMU_MEMproc0x40))0x4C4>>2 = val;
- if(proc == ARMCPU_ARM9)
-				{
-					gpu3D->NDS_3D_Material1 (val);
-				}
-				return;
-			}
-			// Light direction vector - Parameters:1
-			case 0x040004C8:
-			{
-				((u32 *)(MMU.MMU_MEMproc0x40))0x4C8>>2 = val;
- if(proc == ARMCPU_ARM9)
-				{
-					gpu3D->NDS_3D_LightDirection (val);
-				}
-				return;
-			}
-			// Light color - Parameters:1
-			case 0x040004CC:
-			{
-				((u32 *)(MMU.MMU_MEMproc0x40))0x4CC>>2 = val;
- if(proc == ARMCPU_ARM9)
-				{
-					gpu3D->NDS_3D_LightColor(val);
-				}
-				return;
-			}
-			// Material Shininess - Parameters:32
-			case 0x040004D0:
-			{
-				((u32 *)(MMU.MMU_MEMproc0x40))0x4D0>>2 = val;
- if(proc == ARMCPU_ARM9)
-				{
-					gpu3D->NDS_3D_Shininess(val);
-				}
-				return;
-			}
-			// Begin vertex list - Parameters:1
-			case 0x04000500:
-			{
-				((u32 *)(MMU.MMU_MEMproc0x40))0x500>>2 = val;
-				if(proc == ARMCPU_ARM9)
-				{
-					gpu3D->NDS_3D_Begin(val);
-				}
-				return;
-			}
-			// End vertex list - Parameters:0
-			case 0x04000504:
-			{
-				((u32 *)(MMU.MMU_MEMproc0x40))0x504>>2 = val;
-				if(proc == ARMCPU_ARM9)
-				{
-					gpu3D->NDS_3D_End();
-				}
-				return;
-			}
-			// Swap rendering engine buffers - Parameters:1
-			case 0x04000540:
-			{
-				((u32 *)(MMU.MMU_MEMproc0x40))0x540>>2 = val;
-				if(proc == ARMCPU_ARM9)
-				{
-					gpu3D->NDS_3D_Flush(val);
-				}
-				return;
-			}
-			// Set viewport coordinates - Parameters:1
-			case 0x04000580:
-			{
-				((u32 *)(MMU.MMU_MEMproc0x40))0x580>>2 = val;
-				if(proc == ARMCPU_ARM9)
-				{
-					gpu3D->NDS_3D_ViewPort(val);
-				}
-				return;
-			}
-#endif
+		}
 
-			case REG_DISPA_WININ:
-			{
-	 if(proc == ARMCPU_ARM9)
-	 {
-	 GPU_setWININ	(MainScreen.gpu, val & 0xFFFF) ;
-	 GPU_setWINOUT16	(MainScreen.gpu, (val >> 16) & 0xFFFF) ;
-	 }
-	 break;
-			}
-			case REG_DISPB_WININ:
-			{
-	 if(proc == ARMCPU_ARM9)
-	 {
-	 GPU_setWININ	(SubScreen.gpu, val & 0xFFFF) ;
-	 GPU_setWINOUT16	(SubScreen.gpu, (val >> 16) & 0xFFFF) ;
-	 }
-	 break;
-			}
+		T1WriteLong(MMU.MMU_MEMARMCPU_ARM9adr >> 20, adr & MMU.MMU_MASKARMCPU_ARM9adr >> 20, val);
+		return;
+	}
 
-			case REG_DISPA_BLDCNT:
-			{
-				if (proc == ARMCPU_ARM9)
-				{
-					GPU_setBLDCNT (MainScreen.gpu,val&0xffff);
-					GPU_setBLDALPHA (MainScreen.gpu,val>>16);
-				}
-				break;
-			}
-			case REG_DISPB_BLDCNT:
-			{
-				if (proc == ARMCPU_ARM9)
-				{
-					GPU_setBLDCNT (SubScreen.gpu,val&0xffff);
-					GPU_setBLDALPHA (SubScreen.gpu,val>>16);
-				}
-				break;
-			}
-/*
- // Commented out, as this doesn't use the plug-in system, neither works
-			case cmd_3D_MTX_MODE // 0x04000440 :
-				if (proc == ARMCPU_ARM9) gl_MTX_MODE(val);
-				return;
-			case cmd_3D_MTX_PUSH // 0x04000444 :
-			case cmd_3D_MTX_POP // 0x04000448 :
-			case cmd_3D_MTX_STORE // 0x0400044C :
-			case cmd_3D_MTX_RESTORE // 0x04000450 :
-				if (proc == ARMCPU_ARM9) gl_print_cmd(adr);
-				return;
-			case cmd_3D_MTX_IDENTITY // 0x04000454 :
-				if (proc == ARMCPU_ARM9) gl_MTX_IDENTITY();
-				return;
-			case cmd_3D_MTX_LOAD_4x4 // 0x04000458 :
-				if (proc == ARMCPU_ARM9) gl_MTX_LOAD_4x4(val);
-				return;
-			case cmd_3D_MTX_LOAD_4x3 // 0x0400045C :
-				if (proc == ARMCPU_ARM9) gl_MTX_LOAD_4x3(val);
-				return;
-			case cmd_3D_MTX_MULT_4x4 // 0x04000460 :
-				if (proc == ARMCPU_ARM9) gl_MTX_MULT_4x4(val);
-				return;
-			case cmd_3D_MTX_MULT_4x3 // 0x04000464 :
-				if (proc == ARMCPU_ARM9) gl_MTX_MULT_4x3(val);
-				return;
-			case cmd_3D_MTX_MULT_3x3 // 0x04000468 :
-				if (proc == ARMCPU_ARM9) gl_MTX_MULT_3x3(val);
-				return;
-			case cmd_3D_MTX_SCALE // 0x0400046C :
-			case cmd_3D_MTX_TRANS // 0x04000470 :
-			case cmd_3D_COLOR // 0x04000480 :
-			case cmd_3D_NORMA // 0x04000484 :
-				if (proc == ARMCPU_ARM9) gl_print_cmd(adr);
-				return;
-			case cmd_3D_TEXCOORD // 0x04000488 :
-				if (proc == ARMCPU_ARM9) gl_TEXCOORD(val);
-				return;
-			case cmd_3D_VTX_16 // 0x0400048C :
-				if (proc == ARMCPU_ARM9) gl_VTX_16(val);
-				return;
-			case cmd_3D_VTX_10 // 0x04000490 :
-				if (proc == ARMCPU_ARM9) gl_VTX_10(val);
-				return;
-			case cmd_3D_VTX_XY // 0x04000494 :
-				if (proc == ARMCPU_ARM9) gl_VTX_XY(val);
-				return;
-			case cmd_3D_VTX_XZ // 0x04000498 :
-				if (proc == ARMCPU_ARM9) gl_VTX_XZ(val);
-				return;
-			case cmd_3D_VTX_YZ // 0x0400049C :
-				if (proc == ARMCPU_ARM9) gl_VTX_YZ(val);
-				return;
-			case cmd_3D_VTX_DIFF // 0x040004A0 :
-				if (proc == ARMCPU_ARM9) gl_VTX_DIFF(val);
-				return;
-			case cmd_3D_POLYGON_ATTR // 0x040004A4 :
-			case cmd_3D_TEXIMAGE_PARAM // 0x040004A8 :
-			case cmd_3D_PLTT_BASE // 0x040004AC :
-			case cmd_3D_DIF_AMB // 0x040004C0 :
-			case cmd_3D_SPE_EMI // 0x040004C4 :
-			case cmd_3D_LIGHT_VECTOR // 0x040004C8 :
-			case cmd_3D_LIGHT_COLOR // 0x040004CC :
-			case cmd_3D_SHININESS // 0x040004D0 :
-				if (proc == ARMCPU_ARM9) gl_print_cmd(adr);
-				return;
-			case cmd_3D_BEGIN_VTXS // 0x04000500 :
-				if (proc == ARMCPU_ARM9) gl_VTX_begin(val);
-				return;
-			case cmd_3D_END_VTXS // 0x04000504 :
-				if (proc == ARMCPU_ARM9) gl_VTX_end();
-				return;
-			case cmd_3D_SWAP_BUFFERS // 0x04000540 :
-			case cmd_3D_VIEWPORT // 0x04000580 :
-			case cmd_3D_BOX_TEST // 0x040005C0 :
-			case cmd_3D_POS_TEST // 0x040005C4 :
-			case cmd_3D_VEC_TEST // 0x040005C8 :
-				if (proc == ARMCPU_ARM9) gl_print_cmd(adr);
-				return;
-*/
- case REG_DISPA_DISPCNT :
-								if(proc == ARMCPU_ARM9) GPU_setVideoProp(MainScreen.gpu, val);
+	bool unmapped, restricted;
+	adr = MMU_LCDmap(ARMCPU_ARM9, adr, unmapped, restricted);
+	if (unmapped)
+		return;
 
-				//GPULOG("MAIN INIT 32B %08X\r\n", val);
-				T1WriteLong(MMU.MMU_MEMproc0x40, 0, val);
-				return;
+	// Removed the &0xFF as they are implicit with the adr&0x0FFFFFFF shash
+	T1WriteLong(MMU.MMU_MEMARMCPU_ARM9adr >> 20, adr & MMU.MMU_MASKARMCPU_ARM9adr >> 20, val);
+}
 
- case REG_DISPB_DISPCNT :
-				if (proc == ARMCPU_ARM9) GPU_setVideoProp(SubScreen.gpu, val);
-				//GPULOG("SUB INIT 32B %08X\r\n", val);
-				T1WriteLong(MMU.MMU_MEMproc0x40, 0x1000, val);
-				return;
-			case REG_VRAMCNTA:
-			case REG_VRAMCNTE:
-				MMU_write8(proc,adr,val & 0xFF) ;
-				MMU_write8(proc,adr+1,val >> 8) ;
-				MMU_write8(proc,adr+2,val >> 16) ;
-				MMU_write8(proc,adr+3,val >> 24) ;
-				return ;
-			case REG_VRAMCNTI:
-				MMU_write8(proc,adr,val & 0xFF) ;
-				return ;
-
- case REG_IME : {
-			 u32 old_val = MMU.reg_IMEproc;
-				u32 new_val = val & 1;
-				MMU.reg_IMEproc = new_val;
-				T1WriteLong(MMU.MMU_MEMproc0x40, 0x208, val);
-				if ( new_val && old_val != new_val) {
-				 /* raise an interrupt request to the CPU if needed */
-				 if ( MMU.reg_IEproc & MMU.reg_IFproc) {
-				 NDS_ARM7.wIRQ = true;
-				 NDS_ARM7.waitIRQ = false;
-				 }
-				}
-				return;
-			}
+// ================================================= MMU ARM9 read 08
+uint8_t FASTCALL _MMU_ARM9_read08(uint32_t adr)
+{
+	adr &= 0x0FFFFFFF;
 
-			case REG_IE :
-				MMU.reg_IEproc = val;
-				if ( MMU.reg_IMEproc) {
-				 /* raise an interrupt request to the CPU if needed */
-				 if ( MMU.reg_IEproc & MMU.reg_IFproc) {
-				 NDS_ARM7.wIRQ = true;
-				 NDS_ARM7.waitIRQ = false;
-				 }
-				}
-				return;
+	if (adr<0x02000000)
+		return T1ReadByte(MMU.ARM9_ITCM, adr & 0x7FFF);
 
-			case REG_IF :
-				MMU.reg_IFproc &= (~val);
-				return;
- case REG_TM0CNTL :
- case REG_TM1CNTL :
- case REG_TM2CNTL :
- case REG_TM3CNTL :
-				MMU.timerReloadproc(adr>>2)&0x3 = (u16)val;
-				if(val&0x800000)
-				{
-					MMU.timerproc(adr>>2)&0x3 = MMU.timerReloadproc(adr>>2)&0x3;
-				}
-				MMU.timerONproc(adr>>2)&0x3 = val & 0x800000;
-				switch((val>>16)&7)
-				{
-					case 0 :
-					MMU.timerMODEproc(adr>>2)&0x3 = 0+1;//proc;
-					break;
-					case 1 :
-					MMU.timerMODEproc(adr>>2)&0x3 = 6+1;//proc;
-					break;
-					case 2 :
-					MMU.timerMODEproc(adr>>2)&0x3 = 8+1;//proc;
-					break;
-					case 3 :
-					MMU.timerMODEproc(adr>>2)&0x3 = 10+1;//proc;
-					break;
-					default :
-					MMU.timerMODEproc(adr>>2)&0x3 = 0xFFFF;
-					break;
-				}
-				if(!(val & 0x800000))
-				{
-					MMU.timerRUNproc(adr>>2)&0x3 = false;
-				}
-				T1WriteLong(MMU.MMU_MEMproc0x40, adr & 0xFFF, val);
-				return;
- case REG_DIVDENOM :
-				{
- u16 cnt;
-					s64 num = 0;
-					s64 den = 1;
-					s64 res;
-					s64 mod;
-					T1WriteLong(MMU.MMU_MEMproc0x40, 0x298, val);
- cnt = T1ReadWord(MMU.MMU_MEMproc0x40, 0x280);
-					switch(cnt&3)
-					{
-					case 0:
-					{
-						num = (s64) (s32) T1ReadLong(MMU.MMU_MEMproc0x40, 0x290);
-						den = (s64) (s32) T1ReadLong(MMU.MMU_MEMproc0x40, 0x298);
-					}
-					break;
-					case 1:
-					{
-						num = (s64) T1ReadQuad(MMU.MMU_MEMproc0x40, 0x290);
-						den = (s64) (s32) T1ReadLong(MMU.MMU_MEMproc0x40, 0x298);
-					}
-					break;
-					case 2:
-					{
-						return;
-					}
-					break;
-					default:
-						break;
-					}
-					if(den==0)
-					{
-						res = 0;
-						mod = 0;
-						cnt |= 0x4000;
-						cnt &= 0x7FFF;
-					}
-					else
-					{
-						res = num / den;
-						mod = num % den;
-						cnt &= 0x3FFF;
-					}
-					DIVLOG("BOUT1 %08X%08X / %08X%08X = %08X%08X\r\n", (u32)(num>>32), (u32)num,
-											(u32)(den>>32), (u32)den,
-											(u32)(res>>32), (u32)res);
-					T1WriteLong(MMU.MMU_MEMproc0x40, 0x2A0, (u32) res);
-					T1WriteLong(MMU.MMU_MEMproc0x40, 0x2A4, (u32) (res >> 32));
-					T1WriteLong(MMU.MMU_MEMproc0x40, 0x2A8, (u32) mod);
-					T1WriteLong(MMU.MMU_MEMproc0x40, 0x2AC, (u32) (mod >> 32));
-					T1WriteLong(MMU.MMU_MEMproc0x40, 0x280, cnt);
-				}
-				return;
- case REG_DIVDENOM+4 :
-			{
- u16 cnt;
-				s64 num = 0;
-				s64 den = 1;
-				s64 res;
-				s64 mod;
-				T1WriteLong(MMU.MMU_MEMproc0x40, 0x29C, val);
- cnt = T1ReadWord(MMU.MMU_MEMproc0x40, 0x280);
-				switch(cnt&3)
-				{
-				case 0:
-				{
-					return;
-				}
-				break;
-				case 1:
-				{
-					return;
-				}
-				break;
-				case 2:
-				{
-					num = (s64) T1ReadQuad(MMU.MMU_MEMproc0x40, 0x290);
-					den = (s64) T1ReadQuad(MMU.MMU_MEMproc0x40, 0x298);
-				}
-				break;
-				default:
-					break;
-				}
-				if(den==0)
-				{
-					res = 0;
-					mod = 0;
-					cnt |= 0x4000;
-					cnt &= 0x7FFF;
-				}
-				else
-				{
-					res = num / den;
-					mod = num % den;
-					cnt &= 0x3FFF;
-				}
-				DIVLOG("BOUT2 %08X%08X / %08X%08X = %08X%08X\r\n", (u32)(num>>32), (u32)num,
-										(u32)(den>>32), (u32)den,
-										(u32)(res>>32), (u32)res);
-				T1WriteLong(MMU.MMU_MEMproc0x40, 0x2A0, (u32) res);
-				T1WriteLong(MMU.MMU_MEMproc0x40, 0x2A4, (u32) (res >> 32));
-				T1WriteLong(MMU.MMU_MEMproc0x40, 0x2A8, (u32) mod);
-				T1WriteLong(MMU.MMU_MEMproc0x40, 0x2AC, (u32) (mod >> 32));
-				T1WriteLong(MMU.MMU_MEMproc0x40, 0x280, cnt);
-			}
-			return;
- case REG_SQRTPARAM :
-				{
- u16 cnt;
-					u64 v = 1;
-					//execute = false;
-					T1WriteLong(MMU.MMU_MEMproc0x40, 0x2B8, val);
- cnt = T1ReadWord(MMU.MMU_MEMproc0x40, 0x2B0);
-					switch(cnt&1)
-					{
-					case 0:
-						v = (u64) T1ReadLong(MMU.MMU_MEMproc0x40, 0x2B8);
-						break;
-					case 1:
-						return;
-					}
-					T1WriteLong(MMU.MMU_MEMproc0x40, 0x2B4, (u32) sqrt((s64)v));
-					T1WriteLong(MMU.MMU_MEMproc0x40, 0x2B0, cnt & 0x7FFF);
-					SQRTLOG("BOUT1 sqrt(%08X%08X) = %08X\r\n", (u32)(v>>32), (u32)v,
-										T1ReadLong(MMU.MMU_MEMproc0x40, 0x2B4));
-				}
-				return;
- case REG_SQRTPARAM+4 :
-				{
- u16 cnt;
-					u64 v = 1;
-					T1WriteLong(MMU.MMU_MEMproc0x40, 0x2BC, val);
- cnt = T1ReadWord(MMU.MMU_MEMproc0x40, 0x2B0);
-					switch(cnt&1)
-					{
-					case 0:
-						return;
-						//break;
-					case 1:
-						v = T1ReadQuad(MMU.MMU_MEMproc0x40, 0x2B8);
-						break;
-					}
-					T1WriteLong(MMU.MMU_MEMproc0x40, 0x2B4, (u32) sqrt((s64)v));
-					T1WriteLong(MMU.MMU_MEMproc0x40, 0x2B0, cnt & 0x7FFF);
-					SQRTLOG("BOUT2 sqrt(%08X%08X) = %08X\r\n", (u32)(v>>32), (u32)v,
-										T1ReadLong(MMU.MMU_MEMproc0x40, 0x2B4));
-				}
-				return;
- case REG_IPCSYNC :
-				{
-					//execute=false;
-					u32 remote = (proc+1)&1;
-					u32 IPCSYNC_remote = T1ReadLong(MMU.MMU_MEMremote0x40, 0x180);
-					T1WriteLong(MMU.MMU_MEMproc0x40, 0x180, (val&0xFFF0)|((IPCSYNC_remote>>8)&0xF));
-					T1WriteLong(MMU.MMU_MEMremote0x40, 0x180, (IPCSYNC_remote&0xFFF0)|((val>>8)&0xF));
-					MMU.reg_IFremote |= ((IPCSYNC_remote & (1<<14))<<2) & ((val & (1<<13))<<3);// & (MMU.reg_IMEremote << 16);// & (MMU.reg_IEremote & (1<<16));//
-				}
-				return;
- case REG_IPCFIFOCNT :
-							{
-					u32 cnt_l = T1ReadWord(MMU.MMU_MEMproc0x40, 0x184) ;
-					u32 cnt_r = T1ReadWord(MMU.MMU_MEM(proc+1) & 10x40, 0x184) ;
-					if ((val & 0x8000) && !(cnt_l & 0x8000))
-					{
-						/* this is the first init, the other side didnt init yet */
-						/* so do a complete init */
-						FIFOInit(MMU.fifos + (IPCFIFO+proc));
-						T1WriteWord(MMU.MMU_MEMproc0x40, 0x184,0x8101) ;
-						/* and then handle it as usual */
-					}
-				if(val & 0x4008)
-				{
-					FIFOInit(MMU.fifos + (IPCFIFO+((proc+1)&1)));
-					T1WriteWord(MMU.MMU_MEMproc0x40, 0x184, (cnt_l & 0x0301) | (val & 0x8404) | 1);
-					T1WriteWord(MMU.MMU_MEMproc^10x40, 0x184, (cnt_r & 0xC507) | 0x100);
-					MMU.reg_IFproc |= ((val & 4)<<15);// & (MMU.reg_IMEproc<<17);// & (MMU.reg_IEproc&0x20000);//
-					return;
-				}
-				T1WriteWord(MMU.MMU_MEMproc0x40, 0x184, val & 0xBFF4);
-				//execute = false;
-				return;
-							}
- case REG_IPCFIFOSEND :
-				{
-					u16 IPCFIFO_CNT = T1ReadWord(MMU.MMU_MEMproc0x40, 0x184);
-					if(IPCFIFO_CNT&0x8000)
-					{
-					//if(val==43) execute = false;
-					u32 remote = (proc+1)&1;
-					u32 fifonum = IPCFIFO+remote;
- u16 IPCFIFO_CNT_remote;
-					FIFOAdd(MMU.fifos + fifonum, val);
-					IPCFIFO_CNT = (IPCFIFO_CNT & 0xFFFC) | (MMU.fifosfifonum.full<<1);
- IPCFIFO_CNT_remote = T1ReadWord(MMU.MMU_MEMremote0x40, 0x184);
-					IPCFIFO_CNT_remote = (IPCFIFO_CNT_remote & 0xFCFF) | (MMU.fifosfifonum.full<<10);
-					T1WriteWord(MMU.MMU_MEMproc0x40, 0x184, IPCFIFO_CNT);
-					T1WriteWord(MMU.MMU_MEMremote0x40, 0x184, IPCFIFO_CNT_remote);
-					MMU.reg_IFremote |= ((IPCFIFO_CNT_remote & (1<<10))<<8);// & (MMU.reg_IMEremote << 18);// & (MMU.reg_IEremote & 0x40000);//
-					//execute = false;
-					}
-				}
-				return;
-			case REG_DMA0CNTL :
-				//LOG("32 bit dma0 %04X\r\n", val);
-				DMASrcproc0 = T1ReadLong(MMU.MMU_MEMproc0x40, 0xB0);
-				DMADstproc0 = T1ReadLong(MMU.MMU_MEMproc0x40, 0xB4);
-				MMU.DMAStartTimeproc0 = (proc ? (val>>28) & 0x3 : (val>>27) & 0x7);
-				MMU.DMACrtproc0 = val;
-				T1WriteLong(MMU.MMU_MEMproc0x40, 0xB8, val);
-				if( MMU.DMAStartTimeproc0 == 0 ||
-					MMU.DMAStartTimeproc0 == 7)		// Start Immediately
-					MMU_doDMA(proc, 0);
-				#ifdef LOG_DMA2
-				else
-				{
-					LOG("proc %d, dma %d src %08X dst %08X start taille %d %d\r\n", proc, 0, DMASrcproc0, DMADstproc0, 0, ((MMU.DMACrtproc0>>27)&7));
-				}
-				#endif
-				//execute = false;
-				return;
-			case REG_DMA1CNTL:
-				//LOG("32 bit dma1 %04X\r\n", val);
-				DMASrcproc1 = T1ReadLong(MMU.MMU_MEMproc0x40, 0xBC);
-				DMADstproc1 = T1ReadLong(MMU.MMU_MEMproc0x40, 0xC0);
-				MMU.DMAStartTimeproc1 = (proc ? (val>>28) & 0x3 : (val>>27) & 0x7);
-				MMU.DMACrtproc1 = val;
-				T1WriteLong(MMU.MMU_MEMproc0x40, 0xC4, val);
-				if(MMU.DMAStartTimeproc1 == 0 ||
-					MMU.DMAStartTimeproc1 == 7)		// Start Immediately
-					MMU_doDMA(proc, 1);
-				#ifdef LOG_DMA2
-				else
-				{
-					LOG("proc %d, dma %d src %08X dst %08X start taille %d %d\r\n", proc, 1, DMASrcproc1, DMADstproc1, 0, ((MMU.DMACrtproc1>>27)&7));
-				}
-				#endif
-				return;
-			case REG_DMA2CNTL :
-				//LOG("32 bit dma2 %04X\r\n", val);
-				DMASrcproc2 = T1ReadLong(MMU.MMU_MEMproc0x40, 0xC8);
-				DMADstproc2 = T1ReadLong(MMU.MMU_MEMproc0x40, 0xCC);
-				MMU.DMAStartTimeproc2 = (proc ? (val>>28) & 0x3 : (val>>27) & 0x7);
-				MMU.DMACrtproc2 = val;
-				T1WriteLong(MMU.MMU_MEMproc0x40, 0xD0, val);
-				if(MMU.DMAStartTimeproc2 == 0 ||
-					MMU.DMAStartTimeproc2 == 7)		// Start Immediately
-					MMU_doDMA(proc, 2);
-				#ifdef LOG_DMA2
-				else
-				{
-					LOG("proc %d, dma %d src %08X dst %08X start taille %d %d\r\n", proc, 2, DMASrcproc2, DMADstproc2, 0, ((MMU.DMACrtproc2>>27)&7));
-				}
-				#endif
-				return;
-			case 0x040000DC :
-				//LOG("32 bit dma3 %04X\r\n", val);
-				DMASrcproc3 = T1ReadLong(MMU.MMU_MEMproc0x40, 0xD4);
-				DMADstproc3 = T1ReadLong(MMU.MMU_MEMproc0x40, 0xD8);
-				MMU.DMAStartTimeproc3 = (proc ? (val>>28) & 0x3 : (val>>27) & 0x7);
-				MMU.DMACrtproc3 = val;
-				T1WriteLong(MMU.MMU_MEMproc0x40, 0xDC, val);
-				if(	MMU.DMAStartTimeproc3 == 0 ||
-					MMU.DMAStartTimeproc3 == 7)		// Start Immediately
-					MMU_doDMA(proc, 3);
-				#ifdef LOG_DMA2
-				else
-				{
-					LOG("proc %d, dma %d src %08X dst %08X start taille %d %d\r\n", proc, 3, DMASrcproc3, DMADstproc3, 0, ((MMU.DMACrtproc3>>27)&7));
-				}
-				#endif
-				return;
- case REG_GCROMCTRL :
-				{
-					int i;
+	if (adr >= 0x08000000 && adr < 0x0A010000)
+		return 0;
 
- if(MEM_8(MMU.MMU_MEMproc, REG_GCCMDOUT) == 0xB7)
-					{
- MMU.dscardproc.adress = (MEM_8(MMU.MMU_MEMproc, REG_GCCMDOUT+1) << 24) | (MEM_8(MMU.MMU_MEMproc, REG_GCCMDOUT+2) << 16) | (MEM_8(MMU.MMU_MEMproc, REG_GCCMDOUT+3) << 8) | (MEM_8(MMU.MMU_MEMproc, REG_GCCMDOUT+4));
-						MMU.dscardproc.transfer_count = 0x80;// * ((val>>24)&7));
-					}
- else if (MEM_8(MMU.MMU_MEMproc, REG_GCCMDOUT) == 0xB8)
- {
- // Get ROM chip ID
- val |= 0x800000; // Data-Word Status
- T1WriteLong(MMU.MMU_MEMproc(REG_GCROMCTRL >> 20) & 0xff, REG_GCROMCTRL & 0xfff, val);
- MMU.dscardproc.adress = 0;
- }
-					else
-					{
- LOG("CARD command: %02X\n", MEM_8(MMU.MMU_MEMproc, REG_GCCMDOUT));
-					}
+	if ((adr >> 24) == 4)
+	{
+		//Address is an IO register
 
-					//CARDLOG("%08X : %08X %08X\r\n", adr, val, adresseproc);
- val |= 0x00800000;
+		if (MMU_new.is_dma(adr))
+			return MMU_new.read_dma(ARMCPU_ARM9, 8, adr) & 0xFF;
 
-					if(MMU.dscardproc.adress == 0)
-					{
- val &= ~0x80000000;
- T1WriteLong(MMU.MMU_MEMproc(REG_GCROMCTRL >> 20) & 0xff, REG_GCROMCTRL & 0xfff, val);
-						return;
-					}
- T1WriteLong(MMU.MMU_MEMproc(REG_GCROMCTRL >> 20) & 0xff, REG_GCROMCTRL & 0xfff, val);
+		switch (adr)
+		{
+			case REG_IF:
+				return MMU.gen_IF<ARMCPU_ARM9>() & 0xFF;
+			case REG_IF + 1:
+				return (MMU.gen_IF<ARMCPU_ARM9>() >> 8) & 0xFF;
+			case REG_IF + 2:
+				return (MMU.gen_IF<ARMCPU_ARM9>() >> 16) & 0xFF;
+			case REG_IF + 3:
+				return (MMU.gen_IF<ARMCPU_ARM9>() >> 24) & 0xFF;
+
+			case REG_WRAMCNT:
+				return MMU.WRAMCNT;
+
+			case REG_SQRTCNT:
+				return MMU_new.sqrt.read16() & 0xFF;
+			case REG_SQRTCNT + 1:
+				return (MMU_new.sqrt.read16() >> 8) & 0xFF;
+
+			// sqrtcnt isnt big enough for these to exist. but they'd probably return 0 so its ok
+			case REG_SQRTCNT + 2:
+				fprintf(stderr, "ERROR 8bit SQRTCNT+2 READ\n");
+				return 0;
+			case REG_SQRTCNT + 3:
+				fprintf(stderr, "ERROR 8bit SQRTCNT+3 READ\n");
+				return 0;
 
-					/* launch DMA if start flag was set to "DS Cart" */
-					if(proc == ARMCPU_ARM7) i = 2;
-					else i = 5;
+			// Nostalgia's options menu requires that these work
+			case REG_DIVCNT:
+				return MMU_new.div.read16() & 0xFF;
+			case REG_DIVCNT + 1:
+				return (MMU_new.div.read16() >> 8) & 0xFF;
 
-					if(proc == ARMCPU_ARM9 && MMU.DMAStartTimeproc0 == i)	/* dma0/1 on arm7 can't start on ds cart event */
-					{
-						MMU_doDMA(proc, 0);
-						return;
-					}
-					else if(proc == ARMCPU_ARM9 && MMU.DMAStartTimeproc1 == i)
-					{
-						MMU_doDMA(proc, 1);
-						return;
-					}
-					else if(MMU.DMAStartTimeproc2 == i)
-					{
-						MMU_doDMA(proc, 2);
-						return;
-					}
-					else if(MMU.DMAStartTimeproc3 == i)
-					{
-						MMU_doDMA(proc, 3);
-						return;
-					}
-					return;
+			// divcnt isnt big enough for these to exist. but they'd probably return 0 so its ok
+			case REG_DIVCNT + 2:
+				fprintf(stderr, "ERROR 8bit DIVCNT+2 READ\n");
+				return 0;
+			case REG_DIVCNT + 3:
+				fprintf(stderr, "ERROR 8bit DIVCNT+3 READ\n");
+				return 0;
+		}
+	}
 
-				}
-				return;
-								case REG_DISPA_DISPCAPCNT :
-				if(proc == ARMCPU_ARM9)
-				{
-					GPU_set_DISPCAPCNT(MainScreen.gpu,val);
-					T1WriteLong(ARM9Mem.ARM9_REG, 0x64, val);
-				}
-				return;
+	bool unmapped, restricted;
+	adr = MMU_LCDmap(ARMCPU_ARM9, adr, unmapped, restricted);
+	if (unmapped)
+		return 0;
 
- case REG_DISPA_BG0CNT :
-				if (proc == ARMCPU_ARM9)
-				{
-					GPU_setBGProp(MainScreen.gpu, 0, (val&0xFFFF));
-					GPU_setBGProp(MainScreen.gpu, 1, (val>>16));
-				}
-				//if((val>>16)==0x400) execute = false;
-				T1WriteLong(ARM9Mem.ARM9_REG, 8, val);
-				return;
- case REG_DISPA_BG2CNT :
-				if (proc == ARMCPU_ARM9)
-				{
-					GPU_setBGProp(MainScreen.gpu, 2, (val&0xFFFF));
-					GPU_setBGProp(MainScreen.gpu, 3, (val>>16));
-				}
-				T1WriteLong(ARM9Mem.ARM9_REG, 0xC, val);
-				return;
- case REG_DISPB_BG0CNT :
-				if (proc == ARMCPU_ARM9)
-				{
-					GPU_setBGProp(SubScreen.gpu, 0, (val&0xFFFF));
-					GPU_setBGProp(SubScreen.gpu, 1, (val>>16));
-				}
-				T1WriteLong(ARM9Mem.ARM9_REG, 0x1008, val);
-				return;
- case REG_DISPB_BG2CNT :
-				if (proc == ARMCPU_ARM9)
-				{
-					GPU_setBGProp(SubScreen.gpu, 2, (val&0xFFFF));
-					GPU_setBGProp(SubScreen.gpu, 3, (val>>16));
-				}
-				T1WriteLong(ARM9Mem.ARM9_REG, 0x100C, val);
-				return;
-			case REG_DISPA_DISPMMEMFIFO:
-			{
-				// NOTE: right now, the capture unit is not taken into account,
-				// I don't know is it should be handled here or
+	return MMU.MMU_MEMARMCPU_ARM9(adr >> 20) & 0xFFadr & MMU.MMU_MASKARMCPU_ARM9(adr >> 20) & 0xFF;
+}
+
+// ================================================= MMU ARM9 read 16
+uint16_t FASTCALL _MMU_ARM9_read16(uint32_t adr)
+{
+	adr &= 0x0FFFFFFE;
+
+	if (adr < 0x02000000)
+		return T1ReadWord_guaranteedAligned(MMU.ARM9_ITCM, adr & 0x7FFE);
+
+	if (adr >= 0x08000000 && adr < 0x0A010000)
+		return 0;
+
+	if ((adr >> 24) == 4)
+	{
+		if (MMU_new.is_dma(adr))
+			return MMU_new.read_dma(ARMCPU_ARM9, 16, adr) & 0xFFFF;
+
+		// Address is an IO register
+		switch (adr)
+		{
+			case REG_SQRTCNT:
+				return MMU_new.sqrt.read16();
+			// sqrtcnt isnt big enough for this to exist. but it'd probably return 0 so its ok
+			case REG_SQRTCNT + 2:
+				fprintf(stderr, "ERROR 16bit SQRTCNT+2 READ\n");
+				return 0;
+
+			case REG_DIVCNT:
+				return MMU_new.div.read16();
+			// divcnt isnt big enough for this to exist. but it'd probably return 0 so its ok
+			case REG_DIVCNT + 2:
+				fprintf(stderr, "ERROR 16bit DIVCNT+2 READ\n");
+				return 0;
+
+			case REG_IME:
+				return MMU.reg_IMEARMCPU_ARM9 & 0xFFFF;
+
+			// WRAMCNT is readable but VRAMCNT is not, so just return WRAM's value
+			case REG_VRAMCNTG:
+				return MMU.WRAMCNT << 8;
+
+			case REG_IE:
+				return MMU.reg_IEARMCPU_ARM9 & 0xFFFF;
+			case REG_IE + 2:
+				return (MMU.reg_IEARMCPU_ARM9 >> 16) & 0xFFFF;
+
+			case REG_IF:
+				return MMU.gen_IF<ARMCPU_ARM9>() & 0xFFFF;
+			case REG_IF + 2:
+				return (MMU.gen_IF<ARMCPU_ARM9>() >> 16) & 0xFFFF;
+
+			case REG_TM0CNTL:
+			case REG_TM1CNTL:
+			case REG_TM2CNTL:
+			case REG_TM3CNTL:
+				return read_timer(ARMCPU_ARM9, (adr & 0xF) >> 2);
+
+			case REG_AUXSPICNT:
+				return MMU.AUX_SPI_CNT;
+		}
+
+		return T1ReadWord_guaranteedAligned(MMU.MMU_MEMARMCPU_ARM9adr >> 20, adr & MMU.MMU_MASKARMCPU_ARM9adr >> 20);
+	}
+
+	// Removed the &0xFF as they are implicit with the adr&0x0FFFFFFF
+	return T1ReadWord_guaranteedAligned(MMU.MMU_MEMARMCPU_ARM9adr >> 20, adr & MMU.MMU_MASKARMCPU_ARM9adr >> 20);
+}
+
+// ================================================= MMU ARM9 read 32
+uint32_t FASTCALL _MMU_ARM9_read32(uint32_t adr)
+{
+	adr &= 0x0FFFFFFC;
+
+	if (adr < 0x02000000)
+		return T1ReadLong_guaranteedAligned(MMU.ARM9_ITCM, adr & 0x7FFC);
+
+	if (adr >= 0x08000000 && adr < 0x0A010000)
+		return 0;
+
+	// Address is an IO register
+	if ((adr >> 24) == 4)
+	{
+		if (MMU_new.is_dma(adr))
+			return MMU_new.read_dma(ARMCPU_ARM9, 32, adr);
+
+		switch (adr)
+		{
+			case REG_DSIMODE:
+				if (!nds.Is_DSI())
+					break;
+				return 1;
+			case 0x04004008:
+				if (!nds.Is_DSI())
+					break;
+				return 0x8000;
 
-				FIFOAdd(MMU.fifos + MAIN_MEMORY_DISP_FIFO, val);
-				break;
+			// WRAMCNT is readable but VRAMCNT is not, so just return WRAM's value
+			case REG_VRAMCNTE:
+				return MMU.WRAMCNT << 24;
+
+			// despite these being 16bit regs,
+			// Dolphin Island Underwater Adventures uses this amidst seemingly reasonable divs so we're going to emulate it.
+			// well, it's pretty reasonable to read them as 32bits though, isnt it?
+			case REG_DIVCNT:
+				return MMU_new.div.read16();
+			case REG_SQRTCNT:
+				return MMU_new.sqrt.read16(); // I guess we'll do this also
+
+			case REG_IME:
+				return MMU.reg_IMEARMCPU_ARM9;
+			case REG_IE:
+				return MMU.reg_IEARMCPU_ARM9;
+
+			case REG_IF:
+				return MMU.gen_IF<ARMCPU_ARM9>();
+
+			case REG_IPCFIFORECV:
+				return IPC_FIFOrecv(ARMCPU_ARM9);
+			case REG_TM0CNTL:
+			case REG_TM1CNTL:
+			case REG_TM2CNTL:
+			case REG_TM3CNTL:
+			{
+				uint32_t val = T1ReadWord(MMU.MMU_MEMARMCPU_ARM90x40, (adr + 2) & 0xFFF);
+				return MMU.timerARMCPU_ARM9(adr & 0xF) >> 2 | (val << 16);
 			}
-			//case 0x21FDFF0 : if(val==0) execute = false;
-			//case 0x21FDFB0 : if(val==0) execute = false;
-			default :
-				T1WriteLong(MMU.MMU_MEMproc0x40, adr & MMU.MMU_MASKproc(adr>>20)&0xFF, val);
-				return;
+
+			case REG_GCDATAIN:
+				return MMU_readFromGC(ARMCPU_ARM9);
 		}
+		return T1ReadLong_guaranteedAligned(MMU.MMU_MEMARMCPU_ARM9adr >> 20, adr & MMU.MMU_MASKARMCPU_ARM9adr >> 20);
 	}
-	T1WriteLong(MMU.MMU_MEMproc(adr>>20)&0xFF, adr&MMU.MMU_MASKproc(adr>>20)&0xFF, val);
-}
 
+	// Removed the &0xFF as they are implicit with the adr&0x0FFFFFFF zeromus, inspired by shash
+	return T1ReadLong_guaranteedAligned(MMU.MMU_MEMARMCPU_ARM9adr >> 20, adr & MMU.MMU_MASKARMCPU_ARM9adr >> 20);
+}
 
-void FASTCALL MMU_doDMA(u32 proc, u32 num)
+// ================================================================================================== ARM7 *
+// =========================================================================================================
+// =========================================================================================================
+// ================================================= MMU ARM7 write 08
+void FASTCALL _MMU_ARM7_write08(uint32_t adr, uint8_t val)
 {
-	u32 src = DMASrcprocnum;
-	u32 dst = DMADstprocnum;
- u32 taille;
+	adr &= 0x0FFFFFFF;
+
+	if (adr < 0x02000000)
+		return; // can't write to bios or entire area below main memory
+
+	if (adr >= 0x08000000 && adr < 0x0A010000)
+		return;
 
-	if(src==dst)
+	if (adr >= 0x04000400 && adr < 0x04000520)
 	{
-		T1WriteLong(MMU.MMU_MEMproc0x40, 0xB8 + (0xC*num), T1ReadLong(MMU.MMU_MEMproc0x40, 0xB8 + (0xC*num)) & 0x7FFFFFFF);
+		SPU_WriteByte(adr, val);
 		return;
 	}
 
-	if((!(MMU.DMACrtprocnum&(1<<31)))&&(!(MMU.DMACrtprocnum&(1<<25))))
-	{ /* not enabled and not to be repeated */
-		MMU.DMAStartTimeprocnum = 0;
-		MMU.DMACycleprocnum = 0;
-		//MMU.DMAingprocnum = false;
+	if ((adr & 0xFFFF0000) == 0x04800000)
+		/* is wifi hardware, dont intermix with regular hardware registers */
+		// 8-bit writes to wifi I/O and RAM are ignored
+		// Reference: http://nocash.emubase.de/gbatek.htm#dswifiiomap
 		return;
-	}
 
+	if ((adr >> 24) == 4)
+	{
+		if (MMU_new.is_dma(adr))
+		{
+			MMU_new.write_dma(ARMCPU_ARM7, 8, adr, val);
+			return;
+		}
+
+		switch (adr)
+		{
+			case REG_IF:
+				REG_IF_WriteByte(ARMCPU_ARM7, 0, val);
+				break;
+			case REG_IF + 1:
+				REG_IF_WriteByte(ARMCPU_ARM7, 1, val);
+				break;
+			case REG_IF + 2:
+				REG_IF_WriteByte(ARMCPU_ARM7, 2, val);
+				break;
+			case REG_IF + 3:
+				REG_IF_WriteByte(ARMCPU_ARM7, 3, val);
+				break;
+
+			case REG_POSTFLG:
+				// The NDS7 register can be written to only from code executed in BIOS.
+				if (NDS_ARM7.instruct_adr > 0x3FFF)
+					return;
+
+				// hack for patched firmwares
+				if (val == 1)
+				{
+					if (_MMU_ARM7_read08(REG_POSTFLG))
+						break;
+					_MMU_write32<ARMCPU_ARM9>(0x27FFE24, gameInfo.header.ARM9exe);
+					_MMU_write32<ARMCPU_ARM7>(0x27FFE34, gameInfo.header.ARM7exe);
+				}
+				break;
 
-	/* word count */
-	taille = (MMU.DMACrtprocnum&0xFFFF);
+			case REG_HALTCNT:
+				//fprintf(stderr, "halt 0x%02X\n", val);
+				switch (val)
+				{
+					case 0xC0:
+						NDS_Sleep();
+						break;
+					case 0x80:
+						armcpu_Wait4IRQ(&NDS_ARM7);
+				}
+				break;
+		}
+		MMU.MMU_MEMARMCPU_ARM7adr >> 20adr & MMU.MMU_MASKARMCPU_ARM7adr >> 20 = val;
+		return;
+	}
 
-	// If we are in "Main memory display" mode just copy an entire
-	// screen (256x192 pixels).
-	// Reference: http://nocash.emubase.de/gbatek.htm#dsvideocaptureandmainmemorydisplaymode
-	// (under DISP_MMEM_FIFO)
-	if ((MMU.DMAStartTimeprocnum==4) &&		// Must be in main memory display mode
-		(taille==4) &&							// Word must be 4
-		(((MMU.DMACrtprocnum>>26)&1) == 1))	// Transfer mode must be 32bit wide
-		taille = 256*192/2;
+	// Removed the &0xFF as they are implicit with the adr&0x0FFFFFFF shash
+	MMU.MMU_MEMARMCPU_ARM7adr >> 20adr & MMU.MMU_MASKARMCPU_ARM7adr >> 20 = val;
+}
 
-	if(MMU.DMAStartTimeprocnum == 5)
-		taille *= 0x80;
+// ================================================= MMU ARM7 write 16
+void FASTCALL _MMU_ARM7_write16(uint32_t adr, uint16_t val)
+{
+	adr &= 0x0FFFFFFE;
 
-	MMU.DMACycleprocnum = taille + nds.cycles;
-	MMU.DMAingprocnum = true;
+	if (adr < 0x02000000)
+		return; // can't write to bios or entire area below main memory
 
-	DMALOG("proc %d, dma %d src %08X dst %08X start %d taille %d repeat %s %08X\r\n",
-		proc, num, src, dst, MMU.DMAStartTimeprocnum, taille,
-		(MMU.DMACrtprocnum&(1<<25))?"on":"off",MMU.DMACrtprocnum);
+	if (adr >= 0x08000000 && adr < 0x0A010000)
+		return;
 
-	if(!(MMU.DMACrtprocnum&(1<<25)))
-		MMU.DMAStartTimeprocnum = 0;
+	if (adr >= 0x04000400 && adr < 0x04000520)
+	{
+		SPU_WriteWord(adr, val);
+		return;
+	}
 
-	// transfer
+	if ((adr >> 24) == 4)
 	{
-		u32 i=0;
-		// 32 bit or 16 bit transfer ?
-		int sz = ((MMU.DMACrtprocnum>>26)&1)? 4 : 2;
-		int dstinc,srcinc;
-		int u=(MMU.DMACrtprocnum>>21);
-		switch(u & 0x3) {
-			case 0 : dstinc = sz; break;
-			case 1 : dstinc = -sz; break;
-			case 2 : dstinc = 0; break;
-			case 3 : dstinc = sz; break; //reload
+		if (MMU_new.is_dma(adr))
+		{
+			MMU_new.write_dma(ARMCPU_ARM7, 16, adr, val);
+			return;
 		}
-		switch((u >> 2)&0x3) {
-			case 0 : srcinc = sz; break;
-			case 1 : srcinc = -sz; break;
-			case 2 : srcinc = 0; break;
-			case 3 : // reserved
+
+		// Address is an IO register
+		switch (adr)
+		{
+			case REG_DISPA_VCOUNT:
+				if (nds.VCount >= 202 && nds.VCount <= 212)
+				{
+					fprintf(stderr, "VCOUNT set to %i (previous value %i)\n", val, nds.VCount);
+					nds.VCount = val;
+				}
+				else
+					fprintf(stderr, "Attempt to set VCOUNT while not within 202-212 (%i), ignored\n", nds.VCount);
 				return;
-		}
-		if ((MMU.DMACrtprocnum>>26)&1)
-			for(; i < taille; ++i)
-			{
-				MMU_write32(proc, dst, MMU_read32(proc, src));
-				dst += dstinc;
-				src += srcinc;
-			}
-		else
-			for(; i < taille; ++i)
+
+			case REG_EXMEMCNT:
 			{
-				MMU_write16(proc, dst, MMU_read16(proc, src));
-				dst += dstinc;
-				src += srcinc;
+				uint16_t remote_proc = T1ReadWord(MMU.MMU_MEMARMCPU_ARM90x40, 0x204);
+				T1WriteWord(MMU.MMU_MEMARMCPU_ARM70x40, 0x204, (val & 0x7F) | (remote_proc & 0xFF80));
+				return;
 			}
-	}
-}
 
-#ifdef MMU_ENABLE_ACL
-
-INLINE void check_access(u32 adr, u32 access) {
-	/* every other mode: sys */
-	access |= 1;
-	if ((NDS_ARM9.CPSR.val & 0x1F) == 0x10) {
-		/* is user mode access */
-		access ^= 1 ;
-	}
-	if (armcp15_isAccessAllowed((armcp15_t *)NDS_ARM9.coproc15,adr,access)==false) {
-		execute = false ;
-	}
-}
-INLINE void check_access_write(u32 adr) {
-	u32 access = CP15_ACCESS_WRITE;
-	check_access(adr, access)
-}
+			case REG_SPICNT:
+			{
+				bool reset_firmware = true;
 
-u8 FASTCALL MMU_read8_acl(u32 proc, u32 adr, u32 access)
-{
-	/* on arm9 we need to check the MPU regions */
-	if (proc == ARMCPU_ARM9)
-		check_access(u32 adr, u32 access);
-	return MMU_read8(proc,adr);
-}
-u16 FASTCALL MMU_read16_acl(u32 proc, u32 adr, u32 access)
-{
-	/* on arm9 we need to check the MPU regions */
-	if (proc == ARMCPU_ARM9)
-		check_access(u32 adr, u32 access);
-	return MMU_read16(proc,adr);
-}
-u32 FASTCALL MMU_read32_acl(u32 proc, u32 adr, u32 access)
-{
-	/* on arm9 we need to check the MPU regions */
-	if (proc == ARMCPU_ARM9)
-		check_access(u32 adr, u32 access);
-	return MMU_read32(proc,adr);
-}
+				if (((MMU.SPI_CNT >> 8) & 0x3) == 1 && ((val >> 8) & 0x3) == 1 && BIT11(MMU.SPI_CNT))
+					// select held
+					reset_firmware = false;
 
-void FASTCALL MMU_write8_acl(u32 proc, u32 adr, u8 val)
-{
-	/* check MPU region on ARM9 */
-	if (proc == ARMCPU_ARM9)
-		check_access_write(adr);
-	MMU_write8(proc,adr,val);
-}
-void FASTCALL MMU_write16_acl(u32 proc, u32 adr, u16 val)
-{
-	/* check MPU region on ARM9 */
-	if (proc == ARMCPU_ARM9)
-		check_access_write(adr);
-	MMU_write16(proc,adr,val) ;
-}
-void FASTCALL MMU_write32_acl(u32 proc, u32 adr, u32 val)
-{
-	/* check MPU region on ARM9 */
-	if (proc == ARMCPU_ARM9)
-		check_access_write(adr);
-	MMU_write32(proc,adr,val) ;
-}
-#endif
+				//MMU.fw.com == 0; // reset fw device communication
+				if (reset_firmware)
+					// reset fw device communication
+					fw_reset_com(&MMU.fw);
+				MMU.SPI_CNT = val;
 
+				T1WriteWord(MMU.MMU_MEMARMCPU_ARM7(REG_SPICNT >> 20) & 0xff, REG_SPICNT & 0xfff, val);
+				return;
+			}
 
+			case REG_SPIDATA:
+			{
+				if (val)
+					MMU.SPI_CMD = val;
 
-#ifdef PROFILE_MEMORY_ACCESS
+				uint16_t spicnt = T1ReadWord(MMU.MMU_MEMARMCPU_ARM7(REG_SPICNT >> 20) & 0xff, REG_SPICNT & 0xfff);
 
-#define PROFILE_PREFETCH 0
-#define PROFILE_READ 1
-#define PROFILE_WRITE 2
+				switch ((spicnt >> 8) & 0x3)
+				{
+					case 0:
+					{
+						if (!MMU.powerMan_CntRegWritten)
+						{
+							MMU.powerMan_CntReg = val & 0xFF;
+							MMU.powerMan_CntRegWritten = true;
+						}
+						else
+						{
+							uint16_t reg = MMU.powerMan_CntReg & 0x7F;
+							reg &= 0x7;
+							if (reg == 5 || reg == 6 || reg == 7)
+								reg = 4;
+
+							// (let's start with emulating a DS lite, since it is the more complex case)
+							if (MMU.powerMan_CntReg & 0x80)
+								// read
+								val = MMU.powerMan_Regreg;
+							else
+							{
+								// write
+								MMU.powerMan_Regreg = val & 0xFF;
 
-struct mem_access_profile {
- u64 num_accesses;
- u32 address_mask;
- u32 masked_value;
-};
+								static const uint32_t PM_SYSTEM_PWR = BIT(6); /*!< \brief Turn the power *off* if set */
 
-#define PROFILE_NUM_MEM_ACCESS_PROFILES 4
-
-static u64 profile_num_accesses23;
-static u64 profile_unknown_addresses23;
-static struct mem_access_profile
-profile_memory_accesses23PROFILE_NUM_MEM_ACCESS_PROFILES;
-
-static void
-setup_profiling( void) {
- int i;
-
- for ( i = 0; i < 2; i++) {
- int access_type;
-
- for ( access_type = 0; access_type < 3; access_type++) {
- profile_num_accessesiaccess_type = 0;
- profile_unknown_addressesiaccess_type = 0;
-
- /*
- * Setup the access testing structures
- */
- profile_memory_accessesiaccess_type0.address_mask = 0x0e000000;
- profile_memory_accessesiaccess_type0.masked_value = 0x00000000;
- profile_memory_accessesiaccess_type0.num_accesses = 0;
-
- /* main memory */
- profile_memory_accessesiaccess_type1.address_mask = 0x0f000000;
- profile_memory_accessesiaccess_type1.masked_value = 0x02000000;
- profile_memory_accessesiaccess_type1.num_accesses = 0;
-
- /* shared memory */
- profile_memory_accessesiaccess_type2.address_mask = 0x0f800000;
- profile_memory_accessesiaccess_type2.masked_value = 0x03000000;
- profile_memory_accessesiaccess_type2.num_accesses = 0;
-
- /* arm7 memory */
- profile_memory_accessesiaccess_type3.address_mask = 0x0f800000;
- profile_memory_accessesiaccess_type3.masked_value = 0x03800000;
- profile_memory_accessesiaccess_type3.num_accesses = 0;
- }
- }
-}
+								// our totally pathetic register handling, only the one thing we've wanted so far
+								if (MMU.powerMan_Reg0 & PM_SYSTEM_PWR)
+								{
+									fprintf(stderr, "SYSTEM POWERED OFF VIA ARM7 SPI POWER DEVICE\n");
+									execute = false;
+								}
+							}
 
-static void
-profile_memory_access( int arm9, u32 adr, int access_type) {
- static int first = 1;
- int mem_profile;
- int address_found = 0;
-
- if ( first) {
- setup_profiling();
- first = 0;
- }
-
- profile_num_accessesarm9access_type += 1;
-
- for ( mem_profile = 0;
- mem_profile < PROFILE_NUM_MEM_ACCESS_PROFILES &&
- !address_found;
- mem_profile++) {
- if ( (adr & profile_memory_accessesarm9access_typemem_profile.address_mask) ==
- profile_memory_accessesarm9access_typemem_profile.masked_value) {
- /*printf( "adr %08x mask %08x res %08x expected %08x\n",
- adr,
- profile_memory_accessesarm9access_typemem_profile.address_mask,
- adr & profile_memory_accessesarm9access_typemem_profile.address_mask,
- profile_memory_accessesarm9access_typemem_profile.masked_value);*/
- address_found = 1;
- profile_memory_accessesarm9access_typemem_profile.num_accesses += 1;
- }
- }
-
- if ( !address_found) {
- profile_unknown_addressesarm9access_type += 1;
- }
-}
+							MMU.powerMan_CntRegWritten = false;
+						}
+						break;
+					}
 
+					case 1: /* firmware memory device */
+						if (spicnt & 0x3) /* check SPI baudrate (must be 4mhz) */
+						{
+							T1WriteWord(MMU.MMU_MEMARMCPU_ARM7(REG_SPIDATA >> 20) & 0xff, REG_SPIDATA & 0xfff, 0);
+							break;
+						}
+						T1WriteWord(MMU.MMU_MEMARMCPU_ARM7(REG_SPIDATA >> 20) & 0xff, REG_SPIDATA & 0xfff, fw_transfer(&MMU.fw, val & 0xFF));
+						return;
 
-static const char *access_type_strings = {
- "prefetch",
- "read ",
- "write "
-};
+					case 2:
+					{
+						if (nds.Is_DSI())
+						{
+							// pass data to TSC
+							val = MMU_new.dsi_tsc.write16(val);
 
-void
-print_memory_profiling( void) {
- int arm;
+							// apply reset command if appropriate
+							if (!BIT11(MMU.SPI_CNT))
+								MMU_new.dsi_tsc.reset_command();
 
- printf("------ Memory access profile ------\n");
+							break;
+						}
+
+						int channel = (MMU.SPI_CMD & 0x70) >> 4;
+						//fprintf(stderr, "%08X\n",channel);
+						switch (channel)
+						{
+							case TSC_MEASURE_TEMP1:
+								if (spicnt & 0x800)
+								{
+									if (partie)
+									{
+										val = 1632;
+										partie = 0;
+										break;
+									}
+									val = 716 >> 5;
+									partie = 1;
+									break;
+								}
+								val = 1632;
+								partie = 1;
+								break;
+							case TSC_MEASURE_TEMP2:
+								if(spicnt & 0x800)
+								{
+									if(partie)
+									{
+										val = 776;
+										partie = 0;
+										break;
+									}
+									val = 865 >> 5;
+									partie = 1;
+									break;
+								}
+								val = 776;
+								partie = 1;
+								break;
+							case TSC_MEASURE_Y:
+								if (MMU.SPI_CNT & (1 << 11))
+								{
+									if (partie)
+									{
+										partie = 0;
+										break;
+									}
+									partie = 1;
+									break;
+								}
+								partie = 1;
+								break;
+							case TSC_MEASURE_Z1: // Z1
+								if (spicnt & 0x800)
+								{
+									if (partie)
+									{
+										val = (val << 3) & 0x7FF;
+										partie = 0;
+										break;
+									}
+									val >>= 5;
+									partie = 1;
+									break;
+								}
+								val = (val << 3) & 0x7FF;
+								partie = 1;
+								break;
+							case TSC_MEASURE_Z2: // Z2
+								if (spicnt & 0x800)
+								{
+									if (partie)
+									{
+										val = (val << 3) & 0x7FF;
+										partie = 0;
+										break;
+									}
+									val >>= 5;
+									partie = 1;
+									break;
+								}
+								val = (val << 3) & 0x7FF;
+								partie = 1;
+								break;
+							case TSC_MEASURE_X:
+								if (spicnt & 0x800)
+								{
+									if (partie)
+									{
+										partie = 0;
+										break;
+									}
+									partie = 1;
+									break;
+								}
+								partie = 1;
+						}
+					}
+				}
 
- for ( arm = 0; arm < 2; arm++) {
- int access_type;
+				T1WriteWord(MMU.MMU_MEMARMCPU_ARM7(REG_SPIDATA >> 20) & 0xff, REG_SPIDATA & 0xfff, val);
+				return;
+			}
 
- for ( access_type = 0; access_type < 3; access_type++) {
- int mem_profile;
- printf("ARM%c: num of %s %lld\n",
- arm ? '9' : '7',
- access_type_stringsaccess_type,
- profile_num_accessesarmaccess_type);
+			/* NOTICE: Perhaps we have to use gbatek-like reg names instead of libnds-like ones ...*/
 
- for ( mem_profile = 0;
- mem_profile < PROFILE_NUM_MEM_ACCESS_PROFILES;
- mem_profile++) {
- printf( "address %08lx: %llu\n",
- profile_memory_accessesarmaccess_typemem_profile.masked_value,
- profile_memory_accessesarmaccess_typemem_profile.num_accesses);
- }
+			case REG_IME:
+				NDS_Reschedule();
+				MMU.reg_IMEARMCPU_ARM7 = val & 0x01;
+				T1WriteLong(MMU.MMU_MEMARMCPU_ARM70x40, 0x208, val);
+				return;
+			case REG_IE:
+				NDS_Reschedule();
+				MMU.reg_IEARMCPU_ARM7 = (MMU.reg_IEARMCPU_ARM7 & 0xFFFF0000) | val;
+				return;
+			case REG_IE + 2:
+				NDS_Reschedule();
+				MMU.reg_IEARMCPU_ARM7 = (MMU.reg_IEARMCPU_ARM7 & 0xFFFF) | (val << 16);
+				return;
 
- printf( "unknown addresses %lld\n",
- profile_unknown_addressesarmaccess_type);
+			case REG_IF:
+				REG_IF_WriteWord(ARMCPU_ARM7, 0, val);
+				return;
+			case REG_IF + 2:
+				REG_IF_WriteWord(ARMCPU_ARM7, 2, val);
+				return;
 
- printf( "\n");
- }
- }
+			case REG_IPCSYNC:
+				MMU_IPCSync(ARMCPU_ARM7, val);
+				return;
 
- printf("------ End of Memory access profile ------\n\n");
-}
-#else
-void
-print_memory_profiling( void) {
-}
-#endif /* End of PROFILE_MEMORY_ACCESS area */
+			case REG_IPCFIFOCNT:
+				IPC_FIFOcnt(ARMCPU_ARM7, val);
+				return;
+			case REG_TM0CNTL:
+			case REG_TM1CNTL:
+			case REG_TM2CNTL:
+			case REG_TM3CNTL:
+				MMU.timerReloadARMCPU_ARM7(adr >> 2) & 3 = val;
+				return;
+			case REG_TM0CNTH:
+			case REG_TM1CNTH:
+			case REG_TM2CNTH:
+			case REG_TM3CNTH:
+			{
+				int timerIndex	= ((adr - 2) >> 2) & 0x3;
+				write_timer(ARMCPU_ARM7, timerIndex, val);
+				return;
+			}
 
-static u16 FASTCALL
-arm9_prefetch16( void *data, u32 adr) {
-#ifdef PROFILE_MEMORY_ACCESS
- profile_memory_access( 1, adr, PROFILE_PREFETCH);
-#endif
+			case REG_GCROMCTRL:
+				MMU_writeToGCControl(ARMCPU_ARM7, (T1ReadLong(MMU.MMU_MEMARMCPU_ARM70x40, 0x1A4) & 0xFFFF0000) | val);
+				return;
+			case REG_GCROMCTRL + 2:
+				MMU_writeToGCControl(ARMCPU_ARM7, (T1ReadLong(MMU.MMU_MEMARMCPU_ARM70x40, 0x1A4) & 0xFFFF) | (val << 16));
+				return;
+		}
 
-#ifdef EARLY_MEMORY_ACCESS
- if((adr & ~0x3FFF) == MMU.DTCMRegion)
- {
- /* Returns data from DTCM (ARM9 only) */
- return T1ReadWord(ARM9Mem.ARM9_DTCM, adr & 0x3FFF);
- }
- /* access to main memory */
- if ( (adr & 0x0f000000) == 0x02000000) {
- return T1ReadWord( MMU.MMU_MEMARMCPU_ARM9(adr >> 20) & 0xFF,
- adr & MMU.MMU_MASKARMCPU_ARM9(adr >> 20) & 0xFF);
- }
-#endif
+		T1WriteWord(MMU.MMU_MEMARMCPU_ARM7adr >> 20, adr & MMU.MMU_MASKARMCPU_ARM7adr >> 20, val);
+		return;
+	}
 
- return MMU_read16( ARMCPU_ARM9, adr);
+	// Removed the &0xFF as they are implicit with the adr&0x0FFFFFFF shash
+	T1WriteWord(MMU.MMU_MEMARMCPU_ARM7adr >> 20, adr & MMU.MMU_MASKARMCPU_ARM7adr >> 20, val);
 }
-static u32 FASTCALL
-arm9_prefetch32( void *data, u32 adr) {
-#ifdef PROFILE_MEMORY_ACCESS
- profile_memory_access( 1, adr, PROFILE_PREFETCH);
-#endif
 
-#ifdef EARLY_MEMORY_ACCESS
- if((adr & ~0x3FFF) == MMU.DTCMRegion)
- {
- /* Returns data from DTCM (ARM9 only) */
- return T1ReadLong(ARM9Mem.ARM9_DTCM, adr & 0x3FFF);
- }
- /* access to main memory */
- if ( (adr & 0x0f000000) == 0x02000000) {
- return T1ReadLong( MMU.MMU_MEMARMCPU_ARM9(adr >> 20) & 0xFF,
- adr & MMU.MMU_MASKARMCPU_ARM9(adr >> 20) & 0xFF);
- }
-#endif
+// ================================================= MMU ARM7 write 32
+void FASTCALL _MMU_ARM7_write32(uint32_t adr, uint32_t val)
+{
+	adr &= 0x0FFFFFFC;
 
- return MMU_read32( ARMCPU_ARM9, adr);
-}
+	if (adr < 0x02000000)
+		return; // can't write to bios or entire area below main memory
 
-static u8 FASTCALL
-arm9_read8( void *data, u32 adr) {
-#ifdef PROFILE_MEMORY_ACCESS
- profile_memory_access( 1, adr, PROFILE_READ);
-#endif
+	if (adr >= 0x08000000 && adr < 0x0A010000)
+		return;
 
-#ifdef EARLY_MEMORY_ACCESS
- if( (adr&(~0x3FFF)) == MMU.DTCMRegion)
- {
- return ARM9Mem.ARM9_DTCMadr&0x3FFF;
- }
- /* access to main memory */
- if ( (adr & 0x0f000000) == 0x02000000) {
- return MMU.MMU_MEMARMCPU_ARM9(adr >> 20) & 0xFF
- adr & MMU.MMU_MASKARMCPU_ARM9(adr >> 20) & 0xFF;
- }
-#endif
+	if (adr >= 0x04000400 && adr < 0x04000520)
+	{
+		SPU_WriteLong(adr, val);
+		return;
+	}
 
- return MMU_read8( ARMCPU_ARM9, adr);
-}
-static u16 FASTCALL
-arm9_read16( void *data, u32 adr) {
-#ifdef PROFILE_MEMORY_ACCESS
- profile_memory_access( 1, adr, PROFILE_READ);
-#endif
+	if ((adr >> 24) == 4)
+	{
+		if (MMU_new.is_dma(adr))
+		{
+			MMU_new.write_dma(ARMCPU_ARM7, 32, adr, val);
+			return;
+		}
 
-#ifdef EARLY_MEMORY_ACCESS
- if((adr & ~0x3FFF) == MMU.DTCMRegion)
- {
- /* Returns data from DTCM (ARM9 only) */
- return T1ReadWord(ARM9Mem.ARM9_DTCM, adr & 0x3FFF);
- }
-
- /* access to main memory */
- if ( (adr & 0x0f000000) == 0x02000000) {
- return T1ReadWord( MMU.MMU_MEMARMCPU_ARM9(adr >> 20) & 0xFF,
- adr & MMU.MMU_MASKARMCPU_ARM9(adr >> 20) & 0xFF);
- }
-#endif
+		switch (adr)
+		{
+			case REG_IME:
+				NDS_Reschedule();
+				MMU.reg_IMEARMCPU_ARM7 = val & 0x01;
+				T1WriteLong(MMU.MMU_MEMARMCPU_ARM70x40, 0x208, val);
+				return;
 
- return MMU_read16( ARMCPU_ARM9, adr);
-}
-static u32 FASTCALL
-arm9_read32( void *data, u32 adr) {
-#ifdef PROFILE_MEMORY_ACCESS
- profile_memory_access( 1, adr, PROFILE_READ);
-#endif
+			case REG_IE:
+				NDS_Reschedule();
+				MMU.reg_IEARMCPU_ARM7 = val;
+				return;
 
-#ifdef EARLY_MEMORY_ACCESS
- if((adr & ~0x3FFF) == MMU.DTCMRegion)
- {
- /* Returns data from DTCM (ARM9 only) */
- return T1ReadLong(ARM9Mem.ARM9_DTCM, adr & 0x3FFF);
- }
- /* access to main memory */
- if ( (adr & 0x0f000000) == 0x02000000) {
- return T1ReadLong( MMU.MMU_MEMARMCPU_ARM9(adr >> 20) & 0xFF,
- adr & MMU.MMU_MASKARMCPU_ARM9(adr >> 20) & 0xFF);
- }
-#endif
+			case REG_IF:
+				REG_IF_WriteLong(ARMCPU_ARM7, val);
+				return;
 
- return MMU_read32( ARMCPU_ARM9, adr);
-}
+			case REG_TM0CNTL:
+			case REG_TM1CNTL:
+			case REG_TM2CNTL:
+			case REG_TM3CNTL:
+			{
+				int timerIndex = (adr >> 2) & 0x3;
+				MMU.timerReloadARMCPU_ARM7timerIndex = val & 0xFFFF;
+				T1WriteWord(MMU.MMU_MEMARMCPU_ARM70x40, adr & 0xFFF, val & 0xFFFF);
+				write_timer(ARMCPU_ARM7, timerIndex, val >> 16);
+				return;
+			}
 
+			case REG_IPCSYNC:
+				MMU_IPCSync(ARMCPU_ARM7, val);
+				return;
+			case REG_IPCFIFOCNT:
+				IPC_FIFOcnt(ARMCPU_ARM7, val & 0xFFFF);
+				return;
+			case REG_IPCFIFOSEND:
+				IPC_FIFOsend(ARMCPU_ARM7, val);
+				return;
 
-static void FASTCALL
-arm9_write8(void *data, u32 adr, u8 val) {
-#ifdef PROFILE_MEMORY_ACCESS
- profile_memory_access( 1, adr, PROFILE_WRITE);
-#endif
+			case REG_GCROMCTRL:
+				MMU_writeToGCControl(ARMCPU_ARM7, val);
+				return;
 
-#ifdef EARLY_MEMORY_ACCESS
- if( (adr & ~0x3FFF) == MMU.DTCMRegion)
- {
- /* Writes data in DTCM (ARM9 only) */
- ARM9Mem.ARM9_DTCMadr&0x3FFF = val;
- return ;
- }
- /* main memory */
- if ( (adr & 0x0f000000) == 0x02000000) {
- MMU.MMU_MEMARMCPU_ARM9(adr>>20)&0xFF
- adr&MMU.MMU_MASKARMCPU_ARM9(adr>>20)&0xFF = val;
- return;
- }
-#endif
+			case REG_GCDATAIN:
+				slot1_device.write32(ARMCPU_ARM7, REG_GCDATAIN,val);
+				return;
+		}
+		T1WriteLong(MMU.MMU_MEMARMCPU_ARM7adr >> 20, adr & MMU.MMU_MASKARMCPU_ARM7adr >> 20, val);
+		return;
+	}
 
- MMU_write8( ARMCPU_ARM9, adr, val);
+	// Removed the &0xFF as they are implicit with the adr&0x0FFFFFFF shash
+	T1WriteLong(MMU.MMU_MEMARMCPU_ARM7adr >> 20, adr & MMU.MMU_MASKARMCPU_ARM7adr >> 20, val);
 }
-static void FASTCALL
-arm9_write16(void *data, u32 adr, u16 val) {
-#ifdef PROFILE_MEMORY_ACCESS
- profile_memory_access( 1, adr, PROFILE_WRITE);
-#endif
 
-#ifdef EARLY_MEMORY_ACCESS
- if((adr & ~0x3FFF) == MMU.DTCMRegion)
- {
- /* Writes in DTCM (ARM9 only) */
- T1WriteWord(ARM9Mem.ARM9_DTCM, adr & 0x3FFF, val);
- return;
- }
- /* main memory */
- if ( (adr & 0x0f000000) == 0x02000000) {
- T1WriteWord( MMU.MMU_MEMARMCPU_ARM9(adr>>20)&0xFF,
- adr&MMU.MMU_MASKARMCPU_ARM9(adr>>20)&0xFF, val);
- return;
- }
-#endif
-
- MMU_write16( ARMCPU_ARM9, adr, val);
-}
-static void FASTCALL
-arm9_write32(void *data, u32 adr, u32 val) {
-#ifdef PROFILE_MEMORY_ACCESS
- profile_memory_access( 1, adr, PROFILE_WRITE);
-#endif
+// ================================================= MMU ARM7 read 08
+uint8_t FASTCALL _MMU_ARM7_read08(uint32_t adr)
+{
+	adr &= 0x0FFFFFFF;
 
-#ifdef EARLY_MEMORY_ACCESS
- if((adr & ~0x3FFF) == MMU.DTCMRegion)
- {
- /* Writes in DTCM (ARM9 only) */
- T1WriteLong(ARM9Mem.ARM9_DTCM, adr & 0x3FFF, val);
- return;
- }
- /* main memory */
- if ( (adr & 0x0f000000) == 0x02000000) {
- T1WriteLong( MMU.MMU_MEMARMCPU_ARM9(adr>>20)&0xFF,
- adr&MMU.MMU_MASKARMCPU_ARM9(adr>>20)&0xFF, val);
- return;
- }
-#endif
+	if (adr < 0x4000)
+	{
+		// How accurate is this? our R15 may not be exactly what the hardware uses (may use something less by up to 0x08)
+		// This may be inaccurate at the very edge cases.
+		if (NDS_ARM7.instruct_adr > 0x3FFF)
+			return 0xFF;
+	}
 
- MMU_write32( ARMCPU_ARM9, adr, val);
-}
+	if (adr >= 0x08000000 && adr < 0x0A010000)
+		return 0;
 
+	if (adr >= 0x04000400 && adr < 0x04000520)
+		return SPU_ReadByte(adr);
 
+	if ((adr >> 24) == 4)
+	{
+		if (MMU_new.is_dma(adr))
+			return MMU_new.read_dma(ARMCPU_ARM7, 8, adr) & 0xFF;
 
+		// Address is an IO register
 
-static u16 FASTCALL
-arm7_prefetch16( void *data, u32 adr) {
-#ifdef PROFILE_MEMORY_ACCESS
- profile_memory_access( 0, adr, PROFILE_PREFETCH);
-#endif
+		switch (adr)
+		{
+			case REG_IF:
+				return MMU.gen_IF<ARMCPU_ARM7>() & 0xFF;
+			case REG_IF + 1:
+				return (MMU.gen_IF<ARMCPU_ARM7>() >> 8) & 0xFF;
+			case REG_IF + 2:
+				return (MMU.gen_IF<ARMCPU_ARM7>() >> 16) & 0xFF;
+			case REG_IF + 3:
+				return (MMU.gen_IF<ARMCPU_ARM7>() >> 24) & 0xFF;
+
+			case REG_WRAMSTAT:
+				return MMU.WRAMCNT;
+		}
 
-#ifdef EARLY_MEMORY_ACCESS
- /* ARM7 private memory */
- if ( (adr & 0x0f800000) == 0x03800000) {
- T1ReadWord(MMU.MMU_MEMARMCPU_ARM7(adr >> 20) & 0xFF,
- adr & MMU.MMU_MASKARMCPU_ARM7(adr >> 20) & 0xFF);
- }
-#endif
+		return MMU.MMU_MEMARMCPU_ARM7adr >> 20adr & MMU.MMU_MASKARMCPU_ARM7adr >> 20;
+	}
 
- return MMU_read16( ARMCPU_ARM7, adr);
+	return MMU.MMU_MEMARMCPU_ARM7adr >> 20adr & MMU.MMU_MASKARMCPU_ARM7adr >> 20;
 }
-static u32 FASTCALL
-arm7_prefetch32( void *data, u32 adr) {
-#ifdef PROFILE_MEMORY_ACCESS
- profile_memory_access( 0, adr, PROFILE_PREFETCH);
-#endif
 
-#ifdef EARLY_MEMORY_ACCESS
- /* ARM7 private memory */
- if ( (adr & 0x0f800000) == 0x03800000) {
- T1ReadLong(MMU.MMU_MEMARMCPU_ARM7(adr >> 20) & 0xFF,
- adr & MMU.MMU_MASKARMCPU_ARM7(adr >> 20) & 0xFF);
- }
-#endif
+// ================================================= MMU ARM7 read 16
+uint16_t FASTCALL _MMU_ARM7_read16(uint32_t adr)
+{
+	adr &= 0x0FFFFFFE;
 
- return MMU_read32( ARMCPU_ARM7, adr);
-}
+	if (adr < 0x4000)
+	{
+		if (NDS_ARM7.instruct_adr > 0x3FFF)
+			return 0xFFFF;
+	}
 
-static u8 FASTCALL
-arm7_read8( void *data, u32 adr) {
-#ifdef PROFILE_MEMORY_ACCESS
- profile_memory_access( 0, adr, PROFILE_READ);
-#endif
+	if (adr >= 0x08000000 && adr < 0x0A010000)
+		return 0;
 
- return MMU_read8( ARMCPU_ARM7, adr);
-}
-static u16 FASTCALL
-arm7_read16( void *data, u32 adr) {
-#ifdef PROFILE_MEMORY_ACCESS
- profile_memory_access( 0, adr, PROFILE_READ);
-#endif
+	if (adr >= 0x04000400 && adr < 0x04000520)
+		return SPU_ReadWord(adr);
 
- return MMU_read16( ARMCPU_ARM7, adr);
-}
-static u32 FASTCALL
-arm7_read32( void *data, u32 adr) {
-#ifdef PROFILE_MEMORY_ACCESS
- profile_memory_access( 0, adr, PROFILE_READ);
-#endif
+	if ((adr >> 24) == 4)
+	{
+		// Address is an IO register
+
+		if (MMU_new.is_dma(adr))
+			return MMU_new.read_dma(ARMCPU_ARM7, 16, adr) & 0xFFFF;
+
+		switch (adr)
+		{
+			case REG_IME:
+				return MMU.reg_IMEARMCPU_ARM7 & 0xFFFF;
+
+			case REG_IE:
+				return MMU.reg_IEARMCPU_ARM7 & 0xFFFF;
+			case REG_IE + 2:
+				return (MMU.reg_IEARMCPU_ARM7 >> 16) & 0xFFFF;
+
+			case REG_IF:
+				return MMU.gen_IF<ARMCPU_ARM7>() & 0xFFFF;
+			case REG_IF + 2:
+				return (MMU.gen_IF<ARMCPU_ARM7>() >> 16) & 0xFFFF;
+
+			case REG_TM0CNTL:
+			case REG_TM1CNTL:
+			case REG_TM2CNTL:
+			case REG_TM3CNTL:
+				return read_timer(ARMCPU_ARM7, (adr & 0xF) >> 2);
+
+			case REG_VRAMSTAT:
+				// make sure WRAMSTAT is stashed and then fallthrough to return the value from memory. i know, gross.
+				T1WriteByte(MMU.MMU_MEMARMCPU_ARM70x40, 0x241, MMU.WRAMCNT);
+				break;
+		}
+		return T1ReadWord_guaranteedAligned(MMU.MMU_MEMARMCPU_ARM7adr >> 20, adr & MMU.MMU_MASKARMCPU_ARM7adr >> 20);
+	}
 
- return MMU_read32( ARMCPU_ARM7, adr);
+	/* Returns data from memory */
+	// Removed the &0xFF as they are implicit with the adr&0x0FFFFFFF
+	return T1ReadWord_guaranteedAligned(MMU.MMU_MEMARMCPU_ARM7adr >> 20, adr & MMU.MMU_MASKARMCPU_ARM7adr >> 20);
 }
 
+// ================================================= MMU ARM7 read 32
+uint32_t FASTCALL _MMU_ARM7_read32(uint32_t adr)
+{
+	adr &= 0x0FFFFFFC;
 
-static void FASTCALL
-arm7_write8(void *data, u32 adr, u8 val) {
-#ifdef PROFILE_MEMORY_ACCESS
- profile_memory_access( 0, adr, PROFILE_WRITE);
-#endif
+	if (adr < 0x4000)
+	{
+		if (NDS_ARM7.instruct_adr > 0x3FFF)
+			return 0xFFFFFFFF;
+	}
 
- MMU_write8( ARMCPU_ARM7, adr, val);
-}
-static void FASTCALL
-arm7_write16(void *data, u32 adr, u16 val) {
-#ifdef PROFILE_MEMORY_ACCESS
- profile_memory_access( 0, adr, PROFILE_WRITE);
-#endif
+	if (adr >= 0x08000000 && adr < 0x0A010000)
+		return 0;
 
- MMU_write16( ARMCPU_ARM7, adr, val);
-}
-static void FASTCALL
-arm7_write32(void *data, u32 adr, u32 val) {
-#ifdef PROFILE_MEMORY_ACCESS
- profile_memory_access( 0, adr, PROFILE_WRITE);
-#endif
+	if (adr >= 0x04000400 && adr < 0x04000520)
+		return SPU_ReadLong(adr);
 
- MMU_write32( ARMCPU_ARM7, adr, val);
-}
+	if ((adr >> 24) == 4)
+	{
+		// Address is an IO register
 
+		if (MMU_new.is_dma(adr))
+			return MMU_new.read_dma(ARMCPU_ARM7, 32, adr);
 
+		switch (adr)
+		{
+			case REG_IME:
+				return MMU.reg_IMEARMCPU_ARM7;
+			case REG_IE:
+				return MMU.reg_IEARMCPU_ARM7;
+			case REG_IF:
+				return MMU.gen_IF<ARMCPU_ARM7>();
+			case REG_IPCFIFORECV:
+				return IPC_FIFOrecv(ARMCPU_ARM7);
+			case REG_TM0CNTL:
+			case REG_TM1CNTL:
+			case REG_TM2CNTL:
+			case REG_TM3CNTL:
+			{
+				uint32_t val = T1ReadWord(MMU.MMU_MEMARMCPU_ARM70x40, (adr + 2) & 0xFFF);
+				return MMU.timerARMCPU_ARM7(adr & 0xF) >> 2 | (val << 16);
+			}
+			case REG_GCROMCTRL:
+				break;
+			case REG_GCDATAIN:
+				return MMU_readFromGC(ARMCPU_ARM7);
 
-/*
- * the base memory interfaces
- */
-struct armcpu_memory_iface arm9_base_memory_iface = {
- arm9_prefetch32,
- arm9_prefetch16,
-
- arm9_read8,
- arm9_read16,
- arm9_read32,
-
- arm9_write8,
- arm9_write16,
- arm9_write32
-};
+			case REG_VRAMSTAT:
+				// make sure WRAMSTAT is stashed and then fallthrough return the value from memory. i know, gross.
+				T1WriteByte(MMU.MMU_MEMARMCPU_ARM70x40, 0x241, MMU.WRAMCNT);
+				break;
+		}
 
-struct armcpu_memory_iface arm7_base_memory_iface = {
- arm7_prefetch32,
- arm7_prefetch16,
+		return T1ReadLong_guaranteedAligned(MMU.MMU_MEMARMCPU_ARM7adr >> 20, adr & MMU.MMU_MASKARMCPU_ARM7adr >> 20);
+	}
 
- arm7_read8,
- arm7_read16,
- arm7_read32,
+	// Returns data from memory
+	// Removed the &0xFF as they are implicit with the adr&0x0FFFFFFF zeromus, inspired by shash
+	return T1ReadLong_guaranteedAligned(MMU.MMU_MEMARMCPU_ARM7adr >> 20, adr & MMU.MMU_MASKARMCPU_ARM7adr >> 20);
+}
 
- arm7_write8,
- arm7_write16,
- arm7_write32
-};
+// =========================================================================================================
 
-/*
- * The direct memory interface for the ARM9.
- * This avoids the ARM9 protection unit when accessing
- * memory.
- */
-struct armcpu_memory_iface arm9_direct_memory_iface = {
- /* the prefetch is not used */
- nullptr,
- nullptr,
-
- arm9_read8,
- arm9_read16,
- arm9_read32,
-
- arm9_write8,
- arm9_write16,
- arm9_write32
-};
+// these templates needed to be instantiated manually
+template uint32_t MMU_struct::gen_IF<ARMCPU_ARM9>();
+template uint32_t MMU_struct::gen_IF<ARMCPU_ARM7>();

audacious-plugins-3.6.2-gtk3.tar.bz2/src/xsf/desmume/MMU.h -> audacious-plugins-4.4.1.tar.bz2/src/xsf/desmume/MMU.h Changed

@@ -1,181 +1,804 @@
-/* Copyright (C) 2006 yopyop
- yopyop156@ifrance.com
- yopyop156.ifrance.com
-
+/*
+	Copyright (C) 2006 yopyop
 	Copyright (C) 2007 shash
+	Copyright (C) 2007-2012 DeSmuME team
 
- This file is part of DeSmuME
-
- DeSmuME 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 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
+	(at your option) any later version.
 
- DeSmuME 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.
+	This file 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 DeSmuME; 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 the this software. If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef MMU_H
-#define MMU_H
+#pragma once
 
 #include "FIFO.h"
-#include "dscard.h"
-
-#include "ARM9.h"
+#include "mem.h"
+#include "registers.h"
 #include "mc.h"
+#include "bits.h"
+#include "readwrite.h"
 
-extern char szRomPath512;
-extern char szRomBaseName512;
-
-/* theses macros are designed for reading/writing in memory (m is a pointer to memory, like MMU.MMU_MEMproc, and a is an adress, like 0x04000000 */
-#define MEM_8(m, a) (((u8*)(m((a)>>20)&0xff))((a)&0xfff))
+#ifdef HAVE_LUA
+#include "lua-engine.h"
+#endif
 
-/* theses ones for reading in rom data */
-#define ROM_8(m, a) (((u8*)(m))(a))
+#define ARMCPU_ARM7 1
+#define ARMCPU_ARM9 0
+#define ARMPROC (PROCNUM ? NDS_ARM7 : NDS_ARM9)
+
+typedef const uint8_t TWaitState;
+
+enum EDMAMode
+{
+	EDMAMode_Immediate = 0,
+	EDMAMode_VBlank = 1,
+	EDMAMode_HBlank = 2,
+	EDMAMode_HStart = 3,
+	EDMAMode_MemDisplay = 4,
+	EDMAMode_Card = 5,
+	EDMAMode_GBASlot = 6,
+	EDMAMode_GXFifo = 7,
+	EDMAMode7_Wifi = 8,
+	EDMAMode7_GBASlot = 9
+};
 
-#define IPCFIFO 0
-#define MAIN_MEMORY_DISP_FIFO 2
+enum EDMABitWidth
+{
+	EDMABitWidth_16 = 0,
+	EDMABitWidth_32 = 1
+};
 
-typedef struct {
- //ARM7 mem
- u8 ARM7_BIOS0x4000;
- u8 ARM7_ERAM0x10000;
- u8 ARM7_REG0x10000;
- u8 ARM7_WIRAM0x10000;
+enum EDMASourceUpdate
+{
+	EDMASourceUpdate_Increment = 0,
+	EDMASourceUpdate_Decrement = 1,
+	EDMASourceUpdate_Fixed = 2,
+	EDMASourceUpdate_Invalid = 3
+};
 
-	u8 vram_mode9;
-	u8 vScreen;
+enum EDMADestinationUpdate
+{
+	EDMADestinationUpdate_Increment = 0,
+	EDMADestinationUpdate_Decrement = 1,
+	EDMADestinationUpdate_Fixed = 2,
+	EDMADestinationUpdate_IncrementReload = 3
+};
 
- //Shared ram
- u8 SWIRAM0x8000;
+// TODO
+// n.b. this may be a bad idea, for complex registers like the dma control register.
+// we need to know exactly what part was written to, instead of assuming all 32bits were written.
+class TRegister_32
+{
+public:
+	virtual ~TRegister_32() { }
+
+	virtual uint32_t read32() = 0;
+	virtual void write32(uint32_t val) = 0;
+	void write(int size, uint32_t adr, uint32_t val)
+	{
+		if (size == 32)
+			this->write32(val);
+		else
+		{
+			uint32_t offset = adr & 3;
+			if (size == 8)
+			{
+				printf("WARNING! 8BIT DMA ACCESS\n");
+				uint32_t mask = 0xFF << (offset << 3);
+				this->write32((this->read32() & ~mask) | (val << (offset << 3)));
+			}
+			else if (size == 16)
+			{
+				uint32_t mask = 0xFFFF << (offset << 3);
+				this->write32((this->read32() & ~mask) | (val << (offset << 3)));
+			}
+		}
+	}
+
+	uint32_t read(int size, uint32_t adr)
+	{
+		if (size == 32)
+			return this->read32();
+		else
+		{
+			uint32_t offset = adr & 3;
+			if (size == 8)
+			{
+				printf("WARNING! 8BIT DMA ACCESS\n");
+				return (this->read32() >> (offset << 3)) & 0xFF;
+			}
+			else
+				return (this->read32() >> (offset << 3)) & 0xFFFF;
+		}
+	}
+};
 
- //Card rom & ram
- u8 * CART_ROM;
- u8 CART_RAM0x10000;
+struct TGXSTAT : public TRegister_32
+{
+	TGXSTAT()
+	{
+		this->gxfifo_irq = this->se = this->tr = this->tb = this->sb = 0;
+		this->fifo_empty = true;
+		this->fifo_low = false;
+	}
+	virtual ~TGXSTAT() { }
+	uint8_t tb; // test busy
+	uint8_t tr; // test result
+	uint8_t se; // stack error
+	uint8_t sb; // stack busy
+	uint8_t gxfifo_irq; // irq configuration
+
+	bool fifo_empty, fifo_low;
+
+	virtual uint32_t read32();
+	virtual void write32(uint32_t val);
+};
 
-	//Unused ram
-	u8 UNUSED_RAM4;
+void triggerDma(EDMAMode mode);
+
+class DivController
+{
+public:
+	DivController() : mode(0), busy(0) { }
+	void exec();
+	uint8_t mode, busy, div0;
+	uint16_t read16() { return this->mode | (this->busy << 15) | (this->div0 << 14); }
+	void write16(uint16_t val)
+	{
+		this->mode = val & 3;
+		// todo - do we clear the div0 flag here or is that strictly done by the divider unit?
+	}
+};
 
- u8 * * MMU_MEM2;
- u32 * MMU_MASK2;
+class SqrtController
+{
+public:
+	SqrtController() : mode(0), busy(0) { }
+	void exec();
+	uint8_t mode, busy;
+	uint16_t read16() { return this->mode | (this->busy << 15); }
+	void write16(uint16_t val) { this->mode = val & 1; }
+};
 
- u8 ARM9_RW_MODE;
+class DmaController
+{
+public:
+	uint8_t enable, irq, repeatMode, _startmode;
+	uint8_t userEnable;
+	uint32_t wordcount;
+	EDMAMode startmode;
+	EDMABitWidth bitWidth;
+	EDMASourceUpdate sar;
+	EDMADestinationUpdate dar;
+	uint32_t saddr, daddr;
+	uint32_t saddr_user, daddr_user;
+
+	// indicates whether the dma needs to be checked for triggering
+	bool dmaCheck;
+
+	// indicates whether the dma right now is logically running
+	// (though for now we copy all the data when it triggers)
+	bool running;
+
+	bool paused;
+
+	// this flag will sometimes be set when a start condition is triggered
+	// other conditions may be automatically triggered based on scanning conditions
+	bool triggered;
+
+	uint64_t nextEvent;
+
+	int procnum, chan;
+
+	void exec();
+	template<int PROCNUM> void doCopy();
+	void doPause();
+	void doStop();
+	void doSchedule();
+	void tryTrigger(EDMAMode mode);
+
+	DmaController() :
+		enable(0), irq(0), repeatMode(0), _startmode(0),
+		wordcount(0), startmode(EDMAMode_Immediate),
+		bitWidth(EDMABitWidth_16),
+		sar(EDMASourceUpdate_Increment), dar(EDMADestinationUpdate_Increment),
+		// if saddr isnt cleared then rings of fate will trigger copy protection
+		// by inspecting dma3 saddr when it boots
+		saddr(0), daddr(0),
+		saddr_user(0), daddr_user(0),
+		dmaCheck(false),
+		running(false),
+		paused(false),
+		triggered(false),
+		nextEvent(0),
+		sad(&saddr_user),
+		dad(&daddr_user)
+	{
+		this->sad.controller = this;
+		this->dad.controller = this;
+		this->ctrl.controller = this;
+		this->regs0 = &this->sad;
+		this->regs1 = &this->dad;
+		this->regs2 = &this->ctrl;
+	}
+
+	class AddressRegister : public TRegister_32
+	{
+	public:
+		// we pass in a pointer to the controller here so we can alert it if anything changes
+		DmaController *controller;
+		uint32_t *const ptr;
+		AddressRegister(uint32_t *_ptr) : ptr(_ptr) { }
+		virtual ~AddressRegister() { }
+		virtual uint32_t read32()
+		{
+			return *this->ptr;
+		}
+		virtual void write32(uint32_t val)
+		{
+			*this->ptr = val;
+		}
+	};
+
+	class ControlRegister : public TRegister_32
+	{
+	public:
+		// we pass in a pointer to the controller here so we can alert it if anything changes
+		DmaController *controller;
+		ControlRegister() { }
+		virtual ~ControlRegister() { }
+		virtual uint32_t read32()
+		{
+			return this->controller->read32();
+		}
+		virtual void write32(uint32_t val)
+		{
+			return this->controller->write32(val);
+		}
+	};
+
+	AddressRegister sad, dad;
+	ControlRegister ctrl;
+	TRegister_32 *regs3;
+
+	void write32(uint32_t val);
+	uint32_t read32();
+};
 
- FIFO fifos16;
+enum ECardMode
+{
+	CardMode_Normal = 0,
+	CardMode_KEY1,
+	CardMode_KEY2
+};
 
- u32 * MMU_WAIT162;
- u32 * MMU_WAIT322;
+struct nds_dscard
+{
+	uint8_t command8;
 
- u32 DTCMRegion;
- u32 ITCMRegion;
+	uint32_t address;
+	uint32_t transfer_count;
 
- u16 timer24;
- s32 timerMODE24;
- u32 timerON24;
- u32 timerRUN24;
- u16 timerReload24;
+	ECardMode mode;
 
- u32 reg_IME2;
- u32 reg_IE2;
- u32 reg_IF2;
+	// NJSD stuff
+	int blocklen;
+};
 
- u32 DMAStartTime24;
- s32 DMACycle24;
- u32 DMACrt24;
- BOOL DMAing24;
+#define DUP2(x) x, x
+#define DUP4(x) x, x, x, x
+#define DUP8(x) x, x, x, x, x, x, x, x
+#define DUP16(x) x, x, x, x, x, x, x, x, x, x, x, x, x, x, x, x
+
+struct MMU_struct
+{
+	//ARM9 mem
+	uint8_t ARM9_ITCM0x8000;
+	uint8_t ARM9_DTCM0x4000;
+
+	//u8 MAIN_MEM4*1024*1024; // expanded from 4MB to 8MB to support debug consoles
+	//u8 MAIN_MEM8*1024*1024; // expanded from 8MB to 16MB to support dsi
+	uint8_t MAIN_MEM16*1024*1024; // expanded from 8MB to 16MB to support dsi
+	uint8_t ARM9_REG0x1000000;
+	uint8_t ARM9_BIOS0x8000;
+	uint8_t ARM9_VMEM0x800;
+
+#include "PACKED.h"
+	struct
+	{
+		uint8_t ARM9_LCD0xA4000;
+		// an extra 128KB for blank memory, directly after arm9_lcd, so that
+		// we can easily map things to the end of arm9_lcd to represent
+		// an unmapped state
+		uint8_t blank_memory0x100000 - 0xA4000;
+	};
+#include "PACKED_END.h"
+
+	uint8_t ARM9_OAM0x800;
+
+	uint8_t *ExtPal24;
+	uint8_t *ObjExtPal22;
+
+	struct TextureInfo
+	{
+		uint8_t *texPalSlot6;
+		uint8_t *textureSlotAddr4;
+	} texInfo;
+
+	// ARM7 mem
+	uint8_t ARM7_BIOS0x4000;
+	uint8_t ARM7_ERAM0x10000; // 64KB of exclusive WRAM
+	uint8_t ARM7_REG0x10000;
+	uint8_t ARM7_WIRAM0x10000; // WIFI ram
+
+	// VRAM mapping
+	uint8_t VRAM_MAP432;
+	uint32_t LCD_VRAM_ADDR10;
+	uint8_t LCDCenable10;
+
+	// 32KB of shared WRAM - can be switched between ARM7 & ARM9 in two blocks
+	uint8_t SWIRAM0x8000;
+
+	// Card rom & ram
+	uint8_t * CART_ROM;
+
+	// Unused ram
+	uint8_t UNUSED_RAM4;
+
+	// this is here so that we can trap glitchy emulator code
+	// which is accessing offsets 5,6,7 of unused ram due to unaligned accesses
+	// (also since the emulator doesn't prevent unaligned accesses)
+	uint8_t MORE_UNUSED_RAM4;
+
+	static uint8_t *MMU_MEM2256;
+	static uint32_t MMU_MASK2256;
+
+	uint8_t ARM9_RW_MODE;
+
+	uint32_t DTCMRegion;
+	uint32_t ITCMRegion;
+
+	uint16_t timer24;
+	int32_t timerMODE24;
+	uint32_t timerON24;
+	uint32_t timerRUN24;
+	uint16_t timerReload24;
+
+	uint32_t reg_IME2;
+	uint32_t reg_IE2;
+
+	// these are the user-controlled IF bits. some IF bits are generated as necessary from hardware conditions
+	uint32_t reg_IF_bits2;
+	// these flags are set occasionally to indicate that an irq should have entered the pipeline, and processing will be deferred a tiny bit to help emulate things
+	uint32_t reg_IF_pending2;
+
+	template<int PROCNUM> uint32_t gen_IF();
+
+	bool divRunning;
+	int64_t divResult;
+	int64_t divMod;
+	uint64_t divCycles;
+
+	bool sqrtRunning;
+	uint32_t sqrtResult;
+	uint64_t sqrtCycles;
+
+	uint16_t SPI_CNT;
+	uint16_t SPI_CMD;
+	uint16_t AUX_SPI_CNT;
+	uint16_t AUX_SPI_CMD;
+
+	uint8_t WRAMCNT;
+
+	uint8_t powerMan_CntReg;
+	bool powerMan_CntRegWritten;
+	uint8_t powerMan_Reg5;
+
+	memory_chip_t fw;
 
- memory_chip_t fw;
- memory_chip_t bupmem;
+	nds_dscard dscard2;
+};
 
- nds_dscard dscard2;
+// everything in here is derived from libnds behaviours. no hardware tests yet
+class DSI_TSC
+{
+public:
+	DSI_TSC();
+	void reset_command();
+	uint16_t write16(uint16_t val);
+private:
+	uint16_t read16();
+	uint8_t reg_selection;
+	uint8_t read_flag;
+	int32_t state;
+	int32_t readcount;
+
+	// registers0 contains the current page.
+	// we are going to go ahead and save these out in case we want to change the way this is emulated in the future..
+	// we may want to poke registers in here at more convenient times and have the TSC dumbly pluck them out,
+	// rather than generate the values on the fly
+	uint8_t registers0x80;
+};
 
-} MMU_struct;
+// this contains things which can't be memzeroed because they are smarter classes
+struct MMU_struct_new
+{
+	MMU_struct_new();
+	BackupDevice backupDevice;
+	DmaController dma24;
+	TGXSTAT gxstat;
+	SqrtController sqrt;
+	DivController div;
+	DSI_TSC dsi_tsc;
+
+	void write_dma(int proc, int size, uint32_t adr, uint32_t val);
+	uint32_t read_dma(int proc, int size, uint32_t adr);
+	bool is_dma(uint32_t adr) { return adr >= _REG_DMA_CONTROL_MIN && adr <= _REG_DMA_CONTROL_MAX; }
+};
 
 extern MMU_struct MMU;
-
-
-struct armcpu_memory_iface {
- /** the 32 bit instruction prefetch */
- u32 FASTCALL (*prefetch32)( void *data, u32 adr);
-
- /** the 16 bit instruction prefetch */
- u16 FASTCALL (*prefetch16)( void *data, u32 adr);
-
- /** read 8 bit data value */
- u8 FASTCALL (*read8)( void *data, u32 adr);
- /** read 16 bit data value */
- u16 FASTCALL (*read16)( void *data, u32 adr);
- /** read 32 bit data value */
- u32 FASTCALL (*read32)( void *data, u32 adr);
-
- /** write 8 bit data value */
- void FASTCALL (*write8)( void *data, u32 adr, u8 val);
- /** write 16 bit data value */
- void FASTCALL (*write16)( void *data, u32 adr, u16 val);
- /** write 32 bit data value */
- void FASTCALL (*write32)( void *data, u32 adr, u32 val);
-
- void *data;
+extern MMU_struct_new MMU_new;
+
+void MMU_Init();
+void MMU_DeInit();
+
+void MMU_Reset();
+
+void MMU_setRom(uint8_t *rom, uint32_t mask);
+void MMU_unsetRom();
+
+#define VRAM_BANKS 9
+#define VRAM_BANK_A 0
+#define VRAM_BANK_B 1
+#define VRAM_BANK_C 2
+#define VRAM_BANK_D 3
+#define VRAM_BANK_E 4
+#define VRAM_BANK_F 5
+#define VRAM_BANK_G 6
+#define VRAM_BANK_H 7
+#define VRAM_BANK_I 8
+
+#define VRAM_PAGE_ABG 0
+#define VRAM_PAGE_BBG 128
+#define VRAM_PAGE_AOBJ 256
+#define VRAM_PAGE_BOBJ 384
+
+struct VramConfiguration
+{
+	enum Purpose
+	{
+		OFF,
+		INVALID,
+		ABG,
+		BBG,
+		AOBJ,
+		BOBJ,
+		LCDC,
+		ARM7,
+		TEX,
+		TEXPAL,
+		ABGEXTPAL,
+		BBGEXTPAL,
+		AOBJEXTPAL,
+		BOBJEXTPAL
+	};
+
+	struct BankInfo
+	{
+		Purpose purpose;
+		int ofs;
+	} banksVRAM_BANKS;
+
+	void clear()
+	{
+		for (int i = 0; i < VRAM_BANKS; ++i)
+		{
+			banksi.ofs = 0;
+			banksi.purpose = OFF;
+		}
+	}
 };
 
-
-void MMU_Init(void);
-void MMU_DeInit(void);
-
-void MMU_clearMem( void);
-
-void MMU_setRom(u8 * rom, u32 mask);
-void MMU_unsetRom( void);
-
-
-/**
- * Memory reading
- */
-u8 FASTCALL MMU_read8(u32 proc, u32 adr);
-u16 FASTCALL MMU_read16(u32 proc, u32 adr);
-u32 FASTCALL MMU_read32(u32 proc, u32 adr);
-
-#ifdef MMU_ENABLE_ACL
-	u8 FASTCALL MMU_read8_acl(u32 proc, u32 adr, u32 access);
-	u16 FASTCALL MMU_read16_acl(u32 proc, u32 adr, u32 access);
-	u32 FASTCALL MMU_read32_acl(u32 proc, u32 adr, u32 access);
-#else
-	#define MMU_read8_acl(proc,adr,access) MMU_read8(proc,adr)
-	#define MMU_read16_acl(proc,adr,access) MMU_read16(proc,adr)
-	#define MMU_read32_acl(proc,adr,access) MMU_read32(proc,adr)
+extern VramConfiguration vramConfiguration;
+
+const int VRAM_ARM9_PAGES = 512;
+extern uint8_t vram_arm9_mapVRAM_ARM9_PAGES;
+
+template<int PROCNUM, MMU_ACCESS_TYPE AT> uint8_t _MMU_read08(uint32_t addr);
+template<int PROCNUM, MMU_ACCESS_TYPE AT> uint16_t _MMU_read16(uint32_t addr);
+template<int PROCNUM, MMU_ACCESS_TYPE AT> uint32_t _MMU_read32(uint32_t addr);
+template<int PROCNUM, MMU_ACCESS_TYPE AT> void _MMU_write08(uint32_t addr, uint8_t val);
+template<int PROCNUM, MMU_ACCESS_TYPE AT> void _MMU_write16(uint32_t addr, uint16_t val);
+template<int PROCNUM, MMU_ACCESS_TYPE AT> void _MMU_write32(uint32_t addr, uint32_t val);
+
+template<int PROCNUM> inline uint8_t _MMU_read08(uint32_t addr) { return _MMU_read08<PROCNUM, MMU_AT_DATA>(addr); }
+template<int PROCNUM> inline uint16_t _MMU_read16(uint32_t addr) { return _MMU_read16<PROCNUM, MMU_AT_DATA>(addr); }
+template<int PROCNUM> inline uint32_t _MMU_read32(uint32_t addr) { return _MMU_read32<PROCNUM, MMU_AT_DATA>(addr); }
+template<int PROCNUM> inline void _MMU_write08(uint32_t addr, uint8_t val) { _MMU_write08<PROCNUM, MMU_AT_DATA>(addr,val); }
+template<int PROCNUM> inline void _MMU_write16(uint32_t addr, uint16_t val) { _MMU_write16<PROCNUM, MMU_AT_DATA>(addr,val); }
+template<int PROCNUM> inline void _MMU_write32(uint32_t addr, uint32_t val) { _MMU_write32<PROCNUM, MMU_AT_DATA>(addr,val); }
+
+void FASTCALL _MMU_ARM9_write08(uint32_t adr, uint8_t val);
+void FASTCALL _MMU_ARM9_write16(uint32_t adr, uint16_t val);
+void FASTCALL _MMU_ARM9_write32(uint32_t adr, uint32_t val);
+uint8_t FASTCALL _MMU_ARM9_read08(uint32_t adr);
+uint16_t FASTCALL _MMU_ARM9_read16(uint32_t adr);
+uint32_t FASTCALL _MMU_ARM9_read32(uint32_t adr);
+
+void FASTCALL _MMU_ARM7_write08(uint32_t adr, uint8_t val);
+void FASTCALL _MMU_ARM7_write16(uint32_t adr, uint16_t val);
+void FASTCALL _MMU_ARM7_write32(uint32_t adr, uint32_t val);
+uint8_t FASTCALL _MMU_ARM7_read08(uint32_t adr);
+uint16_t FASTCALL _MMU_ARM7_read16(uint32_t adr);
+uint32_t FASTCALL _MMU_ARM7_read32(uint32_t adr);
+
+extern uint32_t partie;
+
+extern uint32_t _MMU_MAIN_MEM_MASK;
+extern uint32_t _MMU_MAIN_MEM_MASK16;
+extern uint32_t _MMU_MAIN_MEM_MASK32;
+void SetupMMU(bool debugConsole, bool dsi);
+
+// ALERT!!!!!!!!!!!!!!
+// the following inline functions dont do the 0x0FFFFFFF mask.
+// this may result in some unexpected behavior
+
+inline uint8_t _MMU_read08(int PROCNUM, MMU_ACCESS_TYPE AT, uint32_t addr)
+{
+	// special handling for DMA: read 0 from TCM
+	if (PROCNUM == ARMCPU_ARM9 && AT == MMU_AT_DMA)
+	{
+		if (addr < 0x02000000)
+			return 0; // itcm
+		if ((addr & ~0x3FFF) == MMU.DTCMRegion)
+			return 0; // dtcm
+	}
+
+#ifdef HAVE_LUA
+	CallRegisteredLuaMemHook(addr, 1, /*FIXME*/ 0, LUAMEMHOOK_READ);
 #endif
 
-/**
- * Memory writing
- */
-void FASTCALL MMU_write8(u32 proc, u32 adr, u8 val);
-void FASTCALL MMU_write16(u32 proc, u32 adr, u16 val);
-void FASTCALL MMU_write32(u32 proc, u32 adr, u32 val);
-
-#ifdef MMU_ENABLE_ACL
-	void FASTCALL MMU_write8_acl(u32 proc, u32 adr, u8 val);
-	void FASTCALL MMU_write16_acl(u32 proc, u32 adr, u16 val);
-	void FASTCALL MMU_write32_acl(u32 proc, u32 adr, u32 val);
-#else
-	#define MMU_write8_acl MMU_write8
-	#define MMU_write16_acl MMU_write16
-	#define MMU_write32_acl MMU_write32
+	if (PROCNUM == ARMCPU_ARM9 && (addr & ~0x3FFF) == MMU.DTCMRegion)
+		// Returns data from DTCM (ARM9 only)
+		return T1ReadByte(MMU.ARM9_DTCM, addr & 0x3FFF);
+
+	if ((addr & 0x0F000000) == 0x02000000)
+		return T1ReadByte(MMU.MAIN_MEM, addr & _MMU_MAIN_MEM_MASK);
+
+	if (PROCNUM == ARMCPU_ARM9)
+		return _MMU_ARM9_read08(addr);
+	else
+		return _MMU_ARM7_read08(addr);
+}
+
+inline uint16_t _MMU_read16(int PROCNUM, MMU_ACCESS_TYPE AT, uint32_t addr)
+{
+	// special handling for DMA: read 0 from TCM
+	if (PROCNUM == ARMCPU_ARM9 && AT == MMU_AT_DMA)
+	{
+		if (addr < 0x02000000)
+			return 0; // itcm
+		if ((addr & ~0x3FFF) == MMU.DTCMRegion)
+			return 0; // dtcm
+	}
+
+#ifdef HAVE_LUA
+	CallRegisteredLuaMemHook(addr, 2, /*FIXME*/ 0, LUAMEMHOOK_READ);
 #endif
 
-void FASTCALL MMU_doDMA(u32 proc, u32 num);
-
-
-/*
- * The base ARM memory interfaces
- */
-extern struct armcpu_memory_iface arm9_base_memory_iface;
-extern struct armcpu_memory_iface arm7_base_memory_iface;
-extern struct armcpu_memory_iface arm9_direct_memory_iface;
+	// special handling for execution from arm9, since we spend so much time in there
+	if (PROCNUM == ARMCPU_ARM9 && AT == MMU_AT_CODE)
+	{
+		if ((addr & 0x0F000000) == 0x02000000)
+			return T1ReadWord_guaranteedAligned(MMU.MAIN_MEM, addr & _MMU_MAIN_MEM_MASK16);
+
+		if (addr < 0x02000000)
+			return T1ReadWord_guaranteedAligned(MMU.ARM9_ITCM, addr&0x7FFE);
+
+		goto dunno;
+	}
+
+	if (PROCNUM == ARMCPU_ARM9 && (addr & ~0x3FFF) == MMU.DTCMRegion)
+		// Returns data from DTCM (ARM9 only)
+		return T1ReadWord_guaranteedAligned(MMU.ARM9_DTCM, addr & 0x3FFE);
+
+	if ((addr & 0x0F000000) == 0x02000000)
+		return T1ReadWord_guaranteedAligned(MMU.MAIN_MEM, addr & _MMU_MAIN_MEM_MASK16);
+
+dunno:
+	if (PROCNUM == ARMCPU_ARM9)
+		return _MMU_ARM9_read16(addr);
+	else
+		return _MMU_ARM7_read16(addr);
+}
+
+inline uint32_t _MMU_read32(int PROCNUM, MMU_ACCESS_TYPE AT, uint32_t addr)
+{
+	// special handling for DMA: read 0 from TCM
+	if (PROCNUM == ARMCPU_ARM9 && AT == MMU_AT_DMA)
+	{
+		if (addr < 0x02000000)
+			return 0; // itcm
+		if ((addr & ~0x3FFF) == MMU.DTCMRegion)
+			return 0; // dtcm
+	}
+
+#ifdef HAVE_LUA
+	CallRegisteredLuaMemHook(addr, 4, /*FIXME*/ 0, LUAMEMHOOK_READ);
+#endif
 
+	//s pecial handling for execution from arm9, since we spend so much time in there
+	if (PROCNUM == ARMCPU_ARM9 && AT == MMU_AT_CODE)
+	{
+		if ((addr & 0x0F000000) == 0x02000000)
+			return T1ReadLong_guaranteedAligned(MMU.MAIN_MEM, addr & _MMU_MAIN_MEM_MASK32);
+
+		if (addr < 0x02000000)
+			return T1ReadLong_guaranteedAligned(MMU.ARM9_ITCM, addr&0x7FFC);
+
+		// what happens when we execute from DTCM? nocash makes it look like we get 0xFFFFFFFF but i can't seem to verify it
+		// historically, desmume would fall through to its old memory map struct
+		// which would return unused memory (0)
+		// it seems the hardware returns 0 or something benign because in actuality 0xFFFFFFFF is an undefined opcode
+		// and we know our handling for that is solid
+
+		goto dunno;
+	}
+
+	// special handling for execution from arm7. try reading from main memory first
+	if (PROCNUM == ARMCPU_ARM7 && (addr & 0x0F000000) == 0x02000000)
+		return T1ReadLong_guaranteedAligned(MMU.MAIN_MEM, addr & _MMU_MAIN_MEM_MASK32);
+
+	// for other arm9 cases, we have to check from dtcm first because it is patched on top of the main memory range
+	if (PROCNUM == ARMCPU_ARM9)
+	{
+		if ((addr & ~0x3FFF) == MMU.DTCMRegion)
+			// Returns data from DTCM (ARM9 only)
+			return T1ReadLong_guaranteedAligned(MMU.ARM9_DTCM, addr & 0x3FFC);
+
+		if ((addr & 0x0F000000) == 0x02000000)
+			return T1ReadLong_guaranteedAligned(MMU.MAIN_MEM, addr & _MMU_MAIN_MEM_MASK32);
+	}
+
+dunno:
+	if (PROCNUM == ARMCPU_ARM9)
+		return _MMU_ARM9_read32(addr);
+	else
+		return _MMU_ARM7_read32(addr);
+}
+
+inline void _MMU_write08(int PROCNUM, MMU_ACCESS_TYPE AT, uint32_t addr, uint8_t val)
+{
+	// special handling for DMA: discard writes to TCM
+	if (PROCNUM == ARMCPU_ARM9 && AT == MMU_AT_DMA)
+	{
+		if (addr < 0x02000000)
+			return; // itcm
+		if ((addr & ~0x3FFF) == MMU.DTCMRegion)
+			return; // dtcm
+	}
+
+	if (PROCNUM == ARMCPU_ARM9 && (addr & ~0x3FFF) == MMU.DTCMRegion)
+	{
+		T1WriteByte(MMU.ARM9_DTCM, addr & 0x3FFF, val);
+#ifdef HAVE_LUA
+		CallRegisteredLuaMemHook(addr, 1, val, LUAMEMHOOK_WRITE);
+#endif
+		return;
+	}
+
+	if ((addr & 0x0F000000) == 0x02000000)
+	{
+		T1WriteByte( MMU.MAIN_MEM, addr & _MMU_MAIN_MEM_MASK, val);
+#ifdef HAVE_LUA
+		CallRegisteredLuaMemHook(addr, 1, val, LUAMEMHOOK_WRITE);
+#endif
+		return;
+	}
+
+	if (PROCNUM == ARMCPU_ARM9)
+		_MMU_ARM9_write08(addr, val);
+	else
+		_MMU_ARM7_write08(addr, val);
+#ifdef HAVE_LUA
+	CallRegisteredLuaMemHook(addr, 1, val, LUAMEMHOOK_WRITE);
+#endif
+}
+
+inline void _MMU_write16(int PROCNUM, MMU_ACCESS_TYPE AT, uint32_t addr, uint16_t val)
+{
+	// special handling for DMA: discard writes to TCM
+	if (PROCNUM == ARMCPU_ARM9 && AT == MMU_AT_DMA)
+	{
+		if (addr < 0x02000000)
+			return; // itcm
+		if ((addr & ~0x3FFF) == MMU.DTCMRegion)
+			return; // dtcm
+	}
+
+	if (PROCNUM == ARMCPU_ARM9 && (addr & ~0x3FFF) == MMU.DTCMRegion)
+	{
+		T1WriteWord(MMU.ARM9_DTCM, addr & 0x3FFE, val);
+#ifdef HAVE_LUA
+		CallRegisteredLuaMemHook(addr, 2, val, LUAMEMHOOK_WRITE);
+#endif
+		return;
+	}
+
+	if ((addr & 0x0F000000) == 0x02000000)
+	{
+		T1WriteWord( MMU.MAIN_MEM, addr & _MMU_MAIN_MEM_MASK16, val);
+#ifdef HAVE_LUA
+		CallRegisteredLuaMemHook(addr, 2, val, LUAMEMHOOK_WRITE);
+#endif
+		return;
+	}
+
+	if (PROCNUM == ARMCPU_ARM9)
+		_MMU_ARM9_write16(addr, val);
+	else
+		_MMU_ARM7_write16(addr, val);
+#ifdef HAVE_LUA
+	CallRegisteredLuaMemHook(addr, 2, val, LUAMEMHOOK_WRITE);
+#endif
+}
+
+inline void _MMU_write32(int PROCNUM, MMU_ACCESS_TYPE AT, uint32_t addr, uint32_t val)
+{
+	// special handling for DMA: discard writes to TCM
+	if (PROCNUM == ARMCPU_ARM9 && AT == MMU_AT_DMA)
+	{
+		if (addr < 0x02000000)
+			return; // itcm
+		if ((addr & ~0x3FFF) == MMU.DTCMRegion)
+			return; // dtcm
+	}
+
+	if (PROCNUM == ARMCPU_ARM9 && (addr & ~0x3FFF) == MMU.DTCMRegion)
+	{
+		T1WriteLong(MMU.ARM9_DTCM, addr & 0x3FFC, val);
+#ifdef HAVE_LUA
+		CallRegisteredLuaMemHook(addr, 4, val, LUAMEMHOOK_WRITE);
+#endif
+		return;
+	}
+
+	if ((addr & 0x0F000000) == 0x02000000)
+	{
+		T1WriteLong( MMU.MAIN_MEM, addr & _MMU_MAIN_MEM_MASK32, val);
+#ifdef HAVE_LUA
+		CallRegisteredLuaMemHook(addr, 4, val, LUAMEMHOOK_WRITE);
+#endif
+		return;
+	}
+
+	if (PROCNUM == ARMCPU_ARM9)
+		_MMU_ARM9_write32(addr, val);
+	else
+		_MMU_ARM7_write32(addr, val);
+#ifdef HAVE_LUA
+	CallRegisteredLuaMemHook(addr, 4, val, LUAMEMHOOK_WRITE);
 #endif
+}
+
+#define READ32(a,b)		_MMU_read32<PROCNUM>((b) & 0xFFFFFFFC)
+#define WRITE32(a,b,c)	_MMU_write32<PROCNUM>((b) & 0xFFFFFFFC,c)
+#define READ16(a,b)		_MMU_read16<PROCNUM>((b) & 0xFFFFFFFE)
+#define WRITE16(a,b,c)	_MMU_write16<PROCNUM>((b) & 0xFFFFFFFE,c)
+#define READ8(a,b)		_MMU_read08<PROCNUM>(b)
+#define WRITE8(a,b,c)	_MMU_write08<PROCNUM>(b, c)
+
+template<int PROCNUM, MMU_ACCESS_TYPE AT> inline uint8_t _MMU_read08(uint32_t addr) { return _MMU_read08(PROCNUM, AT, addr); }
+template<int PROCNUM, MMU_ACCESS_TYPE AT> inline uint16_t _MMU_read16(uint32_t addr) { return _MMU_read16(PROCNUM, AT, addr); }
+template<int PROCNUM, MMU_ACCESS_TYPE AT> inline uint32_t _MMU_read32(uint32_t addr) { return _MMU_read32(PROCNUM, AT, addr); }
+template<int PROCNUM, MMU_ACCESS_TYPE AT> inline void _MMU_write08(uint32_t addr, uint8_t val) { _MMU_write08(PROCNUM, AT, addr, val); }
+template<int PROCNUM, MMU_ACCESS_TYPE AT> inline void _MMU_write16(uint32_t addr, uint16_t val) { _MMU_write16(PROCNUM, AT, addr, val); }
+template<int PROCNUM, MMU_ACCESS_TYPE AT> inline void _MMU_write32(uint32_t addr, uint32_t val) { _MMU_write32(PROCNUM, AT, addr, val); }

audacious-plugins-4.4.1.tar.bz2/src/xsf/desmume/MMU_timing.h Added

@@ -0,0 +1,383 @@
+/*
+	Copyright (C) 2006 yopyop
+	Copyright (C) 2007 shash
+	Copyright (C) 2007-2011 DeSmuME team
+
+	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
+	(at your option) any later version.
+
+	This file 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 the this software. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+// this file is split from MMU.h for the purpose of avoiding ridiculous recompile times
+// when changing it, because practically everything includes MMU.h.
+
+#pragma once
+
+#include <algorithm>
+#include <cmath>
+#include "MMU.h"
+#include "cp15.h"
+#include "readwrite.h"
+#include "NDSSystem.h"
+
+////////////////////////////////////////////////////////////////
+// MEMORY TIMING ACCURACY CONFIGURATION
+//
+// the more of these are enabled,
+// the more accurate memory access timing _should_ become.
+// they should be listed roughly in order of most to least important.
+// it's reasonable to disable some of these as a speed hack.
+// obviously, these defines don't cover all the variables or features needed,
+// and in particular, DMA or code+data access bus contention is still missing.
+
+// disable this to prevent the advanced timing logic from ever running at all
+//#define ENABLE_ADVANCED_TIMING
+
+#ifdef ENABLE_ADVANCED_TIMING
+// makes non-sequential accesses slower than sequential ones.
+#define ACCOUNT_FOR_NON_SEQUENTIAL_ACCESS
+// (SOMETIMES THIS IS A BIG SPEED HIT!)
+
+// enables emulation of code fetch waits.
+#define ACCOUNT_FOR_CODE_FETCH_CYCLES
+
+// makes access to DTCM (arm9 only) fast.
+#define ACCOUNT_FOR_DATA_TCM_SPEED
+
+// enables simulation of cache hits and cache misses.
+#define ENABLE_CACHE_CONTROLLER_EMULATION
+
+#endif //ENABLE_ADVANCED_TIMING
+
+//
+////////////////////////////////////////////////////////////////
+
+inline bool USE_TIMING()
+{
+#ifdef ENABLE_ADVANCED_TIMING
+	return CommonSettings.advanced_timing;
+#else
+	return false;
+#endif
+}
+
+enum MMU_ACCESS_DIRECTION
+{
+	MMU_AD_READ, MMU_AD_WRITE
+};
+
+// note that we don't actually emulate the cache contents here,
+// only enough to guess what would be a cache hit or a cache miss.
+// this doesn't really get used unless ENABLE_CACHE_CONTROLLER_EMULATION is defined.
+template<int SIZESHIFT, int ASSOCIATIVESHIFT, int BLOCKSIZESHIFT> class CacheController
+{
+public:
+	template<MMU_ACCESS_DIRECTION DIR> bool Cached(uint32_t addr)
+	{
+		uint32_t blockMasked = addr & BLOCKMASK;
+		if (blockMasked == this->m_cacheCache)
+			return true;
+		else
+			return this->CachedInternal<DIR>(addr, blockMasked);
+	}
+
+	void Reset()
+	{
+		for (int blockIndex = 0; blockIndex < NUMBLOCKS; ++blockIndex)
+			this->m_blocksblockIndex.Reset();
+		this->m_cacheCache = ~0U;
+	}
+	CacheController()
+	{
+		this->Reset();
+	}
+
+private:
+	template<MMU_ACCESS_DIRECTION DIR> bool CachedInternal(uint32_t addr, uint32_t blockMasked)
+	{
+		uint32_t blockIndex = blockMasked >> BLOCKSIZESHIFT;
+		CacheBlock &block = this->m_blocksblockIndex;
+		addr &= TAGMASK;
+
+		for (int way = 0; way < ASSOCIATIVITY; ++way)
+			if (addr == block.tagway)
+			{
+				// found it, already allocated
+				this->m_cacheCache = blockMasked;
+				return true;
+			}
+		if (DIR == MMU_AD_READ)
+		{
+			// TODO: support other allocation orders?
+			block.tagblock.nextWay++ = addr;
+			block.nextWay %= ASSOCIATIVITY;
+			this->m_cacheCache = blockMasked;
+		}
+		return false;
+	}
+
+	enum { SIZE = 1 << SIZESHIFT };
+	enum { ASSOCIATIVITY = 1 << ASSOCIATIVESHIFT };
+	enum { BLOCKSIZE = 1 << BLOCKSIZESHIFT };
+	enum { TAGSHIFT = SIZESHIFT - ASSOCIATIVESHIFT };
+	enum { TAGMASK = ~0U << TAGSHIFT };
+	enum { BLOCKMASK = (~0U >> (32 - TAGSHIFT)) & (~0U << BLOCKSIZESHIFT) };
+	enum { WORDSIZE = sizeof(uint32_t) };
+	enum { WORDSPERBLOCK = (1 << BLOCKSIZESHIFT) / WORDSIZE };
+	enum { DATAPERWORD = WORDSIZE * ASSOCIATIVITY };
+	enum { DATAPERBLOCK = DATAPERWORD * WORDSPERBLOCK };
+	enum { NUMBLOCKS = SIZE / DATAPERBLOCK };
+
+	struct CacheBlock
+	{
+		uint32_t tagASSOCIATIVITY;
+		uint32_t nextWay;
+
+		void Reset()
+		{
+			this->nextWay = 0;
+			for (int way = 0; way < ASSOCIATIVITY; ++way)
+				this->tagway = 0;
+		}
+	};
+
+	uint32_t m_cacheCache; // optimization
+
+	CacheBlock m_blocksNUMBLOCKS;
+};
+
+template<int PROCNUM, MMU_ACCESS_TYPE AT, int READSIZE, MMU_ACCESS_DIRECTION DIRECTION, bool TIMING> inline uint32_t _MMU_accesstime(uint32_t addr, bool sequential);
+
+template<int PROCNUM, MMU_ACCESS_TYPE AT> class FetchAccessUnit
+{
+public:
+	template<int READSIZE, MMU_ACCESS_DIRECTION DIRECTION, bool TIMING> uint32_t Fetch(uint32_t address)
+	{
+#ifdef ACCOUNT_FOR_CODE_FETCH_CYCLES
+		bool prohibit = TIMING;
+#else
+		bool prohibit = false;
+#endif
+
+		if (AT == MMU_AT_CODE && !prohibit)
+			return 1;
+
+		uint32_t time = _MMU_accesstime<PROCNUM, AT, READSIZE, DIRECTION,TIMING>(address,
+#ifdef ACCOUNT_FOR_NON_SEQUENTIAL_ACCESS
+			TIMING ? (address == m_lastAddress + (READSIZE >> 3)) : true
+#else
+			true
+#endif
+		);
+
+#ifdef ACCOUNT_FOR_NON_SEQUENTIAL_ACCESS
+		this->m_lastAddress = address;
+#endif
+
+		return time;
+	}
+
+	void Reset()
+	{
+		this->m_lastAddress = ~0U;
+	}
+	FetchAccessUnit()
+	{
+		this->Reset();
+	}
+
+private:
+	uint32_t m_lastAddress;
+};
+
+struct MMU_struct_timing
+{
+	// technically part of the cp15, but I didn't want the dereferencing penalty.
+	// these template values correspond with the value of armcp15->cacheType.
+	CacheController<13, 2, 5> arm9codeCache; // 8192 bytes, 4-way associative, 32-byte blocks
+	CacheController<12, 2, 5> arm9dataCache; // 4096 bytes, 4-way associative, 32-byte blocks
+
+	// technically part of armcpu_t, but that struct isn't templated on PROCNUM
+	FetchAccessUnit<0, MMU_AT_CODE> arm9codeFetch;
+	FetchAccessUnit<0, MMU_AT_DATA> arm9dataFetch;
+	FetchAccessUnit<1, MMU_AT_CODE> arm7codeFetch;
+	FetchAccessUnit<1, MMU_AT_DATA> arm7dataFetch;
+
+	template<int PROCNUM> FetchAccessUnit<PROCNUM, MMU_AT_CODE> &armCodeFetch();
+	template<int PROCNUM> FetchAccessUnit<PROCNUM, MMU_AT_DATA> &armDataFetch();
+};
+template<> inline FetchAccessUnit<0, MMU_AT_CODE> &MMU_struct_timing::armCodeFetch<0>() { return this->arm9codeFetch; }
+template<> inline FetchAccessUnit<1, MMU_AT_CODE> &MMU_struct_timing::armCodeFetch<1>() { return this->arm7codeFetch; }
+template<> inline FetchAccessUnit<0, MMU_AT_DATA> &MMU_struct_timing::armDataFetch<0>() { return this->arm9dataFetch; }
+template<> inline FetchAccessUnit<1, MMU_AT_DATA> &MMU_struct_timing::armDataFetch<1>() { return this->arm7dataFetch; }
+
+extern MMU_struct_timing MMU_timing;
+
+// calculates the time a single memory access takes,
+// in units of cycles of the current processor.
+// this function replaces what used to be MMU_WAIT16 and MMU_WAIT32.
+// this may have side effects, so don't call it more than necessary.
+template<int PROCNUM, MMU_ACCESS_TYPE AT, int READSIZE, MMU_ACCESS_DIRECTION DIRECTION, bool TIMING> inline uint32_t _MMU_accesstime(uint32_t addr, bool /*sequential*/)
+{
+	static const int MC = 1; // cached or tcm memory speed
+	static const int M32 = PROCNUM == ARMCPU_ARM9 ? 2 : 1; // access through 32-bit bus
+	static const int M16 = M32 * (READSIZE > 16 ? 2 : 1); // access through 16-bit bus
+	static const int MSLW = M16 * 8; // this needs tuning
+
+	if (PROCNUM == ARMCPU_ARM9 && AT == MMU_AT_CODE && addr < 0x02000000)
+		return MC; // ITCM
+
+#ifdef ACCOUNT_FOR_DATA_TCM_SPEED
+	if (TIMING && PROCNUM == ARMCPU_ARM9 && AT == MMU_AT_DATA && (addr & ~0x3FFF) == MMU.DTCMRegion)
+		return MC; // DTCM
+#endif
+
+	// for now, assume the cache is always enabled for all of main memory
+	if (AT != MMU_AT_DMA && TIMING && PROCNUM == ARMCPU_ARM9 && (addr & 0x0F000000) == 0x02000000)
+	{
+#ifdef ENABLE_CACHE_CONTROLLER_EMULATION
+		bool cached = false;
+		if (AT == MMU_AT_CODE)
+			cached = MMU_timing.arm9codeCache.Cached<DIRECTION>(addr);
+		if (AT == MMU_AT_DATA)
+			cached = MMU_timing.arm9dataCache.Cached<DIRECTION>(addr);
+		if (cached)
+			return MC;
+		uint32_t c;
+		if (sequential && AT == MMU_AT_DATA)
+			c = M16; // bonus for sequential data access
+		else if (DIRECTION == MMU_AD_READ)
+			c = M16 * 5;
+		else
+			c = M16 * 2; // should be 4, but write buffer isn't emulated yet.
+		if (DIRECTION == MMU_AD_READ)
+			// cache miss while reading means it has to fill a whole cache line
+			// by reading 32 bytes...
+			c += 8 * M32 * 2;
+		return c;
+#elif defined(ACCOUNT_FOR_NON_SEQUENTIAL_ACCESS)
+		// this is the closest approximation I could find
+		// to the with-cache-controller timing
+		// that doesn't do any actual caching logic.
+		return sequential ? MC : M16;
+#endif
+	}
+
+	static const TWaitState MMU_WAIT =
+	{
+		// ITCM, ITCM, MAIN, SWI, REG, VMEM, LCD, OAM, ROM, ROM, RAM, U, U, U, U, BIOS
+#define X MC, MC, M16, M32, M32, M16, M16, M32, MSLW, MSLW, MSLW, M32,M32,M32,M32, M32,
+		// duplicate it 16 times (this was somehow faster than using a mask of 0xF)
+		X X X X X X X X X X X X X X X X
+#undef X
+	};
+
+	uint32_t c = MMU_WAITaddr >> 24;
+
+#ifdef ACCOUNT_FOR_NON_SEQUENTIAL_ACCESS
+	if (TIMING && !sequential)
+	{
+		//if(c != MC || PROCNUM==ARMCPU_ARM7) // check not needed anymore because ITCM/DTCM return earlier
+		{
+			c += PROCNUM == ARMCPU_ARM9 ? 6 : 1;
+		}
+	}
+#endif
+
+	return c;
+}
+
+// calculates the cycle time of a single memory access in the MEM stage.
+// to be used to calculate the memCycles argument for MMU_aluMemCycles.
+// this may have side effects, so don't call it more than necessary.
+template<int PROCNUM, int READSIZE, MMU_ACCESS_DIRECTION DIRECTION, bool TIMING> inline uint32_t MMU_memAccessCycles(uint32_t addr)
+{
+	if (TIMING)
+		return MMU_timing.armDataFetch<PROCNUM>().template Fetch<READSIZE, DIRECTION, true>(addr & (~((READSIZE >> 3) - 1)));
+	else
+		return MMU_timing.armDataFetch<PROCNUM>().template Fetch<READSIZE, DIRECTION, false>(addr & (~((READSIZE >> 3) - 1)));
+}
+
+template<int PROCNUM, int READSIZE, MMU_ACCESS_DIRECTION DIRECTION> inline uint32_t MMU_memAccessCycles(uint32_t addr)
+{
+	if (USE_TIMING())
+		return MMU_memAccessCycles<PROCNUM, READSIZE, DIRECTION, true>(addr);
+	else
+		return MMU_memAccessCycles<PROCNUM, READSIZE, DIRECTION, false>(addr);
+}
+
+// calculates the cycle time of a single code fetch in the FETCH stage
+// to be used to calculate the fetchCycles argument for MMU_fetchExecuteCycles.
+// this may have side effects, so don't call it more than necessary.
+template<int PROCNUM, int READSIZE> inline uint32_t MMU_codeFetchCycles(uint32_t addr)
+{
+	if (USE_TIMING())
+		return MMU_timing.armCodeFetch<PROCNUM>().template Fetch<READSIZE, MMU_AD_READ, true>(addr & (~((READSIZE >> 3) - 1)));
+	else
+		return MMU_timing.armCodeFetch<PROCNUM>().template Fetch<READSIZE, MMU_AD_READ, false>(addr & (~((READSIZE >> 3) - 1)));
+}
+
+// calculates the cycle contribution of ALU + MEM stages (= EXECUTE)
+// given ALU cycle time and the summation of multiple memory access cycle times.
+// this function might belong more in armcpu, but I don't think it matters.
+template<int PROCNUM> inline uint32_t MMU_aluMemCycles(uint32_t aluCycles, uint32_t memCycles)
+{
+	if (PROCNUM == ARMCPU_ARM9)
+		// ALU and MEM are different stages of the 5-stage pipeline.
+		// we approximate the pipeline throughput using max,
+		// since simply adding the cycles of each instruction together
+		// fails to take into account the parallelism of the arm pipeline
+		// and would make the emulated system unnaturally slow.
+		return std::max(aluCycles, memCycles);
+	else
+		// ALU and MEM are part of the same stage of the 3-stage pipeline,
+		// thus they occur in sequence and we can simply add the counts together.
+		return aluCycles + memCycles;
+}
+
+// calculates the cycle contribution of ALU + MEM stages (= EXECUTE)
+// given ALU cycle time and the description of a single memory access.
+// this may have side effects, so don't call it more than necessary.
+template<int PROCNUM, int READSIZE, MMU_ACCESS_DIRECTION DIRECTION> inline uint32_t MMU_aluMemAccessCycles(uint32_t aluCycles, uint32_t addr)
+{
+	uint32_t memCycles;
+	if (USE_TIMING())
+		memCycles = MMU_memAccessCycles<PROCNUM, READSIZE, DIRECTION, true>(addr);
+	else
+		memCycles = MMU_memAccessCycles<PROCNUM, READSIZE, DIRECTION, false>(addr);
+	return MMU_aluMemCycles<PROCNUM>(aluCycles, memCycles);
+}
+
+// calculates the cycle contribution of FETCH + EXECUTE stages
+// given executeCycles = the combined ALU+MEM cycles
+// and fetchCycles = the cycle time of the FETCH stage
+// this function might belong more in armcpu, but I don't think it matters.
+template<int PROCNUM> inline uint32_t MMU_fetchExecuteCycles(uint32_t executeCycles, uint32_t fetchCycles)
+{
+#ifdef ACCOUNT_FOR_CODE_FETCH_CYCLES
+	bool allow = true;
+#else
+	bool allow = false;
+#endif
+
+	if (USE_TIMING() && allow)
+	{
+		// execute and fetch are different stages of the pipeline for both arm7 and arm9.
+		// again, we approximate the pipeline throughput using max.
+		return std::max(executeCycles, fetchCycles);
+		// TODO: add an option to support conflict between MEM and FETCH cycles
+		// if they're both using the same data bus.
+		// in the case of a conflict this should be:
+		// return std::max(aluCycles, memCycles + fetchCycles);
+	}
+	return executeCycles;
+}

audacious-plugins-3.6.2-gtk3.tar.bz2/src/xsf/desmume/NDSSystem.cc -> audacious-plugins-4.4.1.tar.bz2/src/xsf/desmume/NDSSystem.cc Changed

@@ -1,208 +1,78 @@
-/* Copyright (C) 2006 yopyop
- yopyop156@ifrance.com
- yopyop156.ifrance.com
-
- This file is part of DeSmuME
-
- DeSmuME 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.
-
- DeSmuME 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 DeSmuME; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+/*
+	Copyright (C) 2006 yopyop
+	Copyright (C) 2008-2013 DeSmuME team
+
+	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
+	(at your option) any later version.
+
+	This file 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 the this software. If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <string.h>
-#include <stdlib.h>
-
+#include <algorithm>
+#include <cstring>
+#include <cstdlib>
+#include <cmath>
+#include <zlib.h>
 #include "NDSSystem.h"
 #include "MMU.h"
-//#include "cflash.h"
+#include "cp15.h"
+#include "bios.h"
+#include "readwrite.h"
+#include "firmware.h"
+#include "slot1.h"
 
-//#include "ROMReader.h"
+// ===============================================================
 
-/* the count of bytes copied from the firmware into memory */
-#define NDS_FW_USER_SETTINGS_MEM_BYTE_COUNT 0x70
+TCommonSettings CommonSettings;
 
+GameInfo gameInfo;
 NDSSystem nds;
+static std::unique_ptr<CFIRMWARE> firmware;
+volatile bool execute = false;
 
-static u32
-calc_CRC16( u32 start, const u8 *data, int count) {
- int i,j;
- u32 crc = start & 0xffff;
- static u16 val = { 0xC0C1,0xC181,0xC301,0xC601,0xCC01,0xD801,0xF001,0xA001 };
- for(i = 0; i < count; i++)
- {
- crc = crc ^ datai;
-
- for(j = 0; j < 8; j++) {
- int do_bit = 0;
-
- if ( crc & 0x1)
- do_bit = 1;
-
- crc = crc >> 1;
-
- if ( do_bit) {
- crc = crc ^ (valj << (7-j));
- }
- }
- }
- return crc;
-}
-
-static int
-copy_firmware_user_data( u8 *dest_buffer, const u8 *fw_data) {
- /*
- * Determine which of the two user settings in the firmware is the current
- * and valid one and then copy this into the destination buffer.
- *
- * The current setting will have a greater count.
- * Settings are only valid if its CRC16 is correct.
- */
- int user1_valid = 0;
- int user2_valid = 0;
- u32 user_settings_offset;
- u32 fw_crc;
- u32 crc;
- int copy_good = 0;
-
- user_settings_offset = fw_data0x20;
- user_settings_offset |= fw_data0x21 << 8;
- user_settings_offset <<= 3;
-
- if ( user_settings_offset <= 0x3FE00) {
- s32 copy_settings_offset = -1;
-
- crc = calc_CRC16( 0xffff, &fw_datauser_settings_offset,
- NDS_FW_USER_SETTINGS_MEM_BYTE_COUNT);
- fw_crc = fw_datauser_settings_offset + 0x72;
- fw_crc |= fw_datauser_settings_offset + 0x73 << 8;
- if ( crc == fw_crc) {
- user1_valid = 1;
- }
-
- crc = calc_CRC16( 0xffff, &fw_datauser_settings_offset + 0x100,
- NDS_FW_USER_SETTINGS_MEM_BYTE_COUNT);
- fw_crc = fw_datauser_settings_offset + 0x100 + 0x72;
- fw_crc |= fw_datauser_settings_offset + 0x100 + 0x73 << 8;
- if ( crc == fw_crc) {
- user2_valid = 1;
- }
-
- if ( user1_valid) {
- if ( user2_valid) {
- u16 count1, count2;
-
- count1 = fw_datauser_settings_offset + 0x70;
- count1 |= fw_datauser_settings_offset + 0x71 << 8;
-
- count2 = fw_datauser_settings_offset + 0x100 + 0x70;
- count2 |= fw_datauser_settings_offset + 0x100 + 0x71 << 8;
-
- if ( count2 > count1) {
- copy_settings_offset = user_settings_offset + 0x100;
- }
- else {
- copy_settings_offset = user_settings_offset;
- }
- }
- else {
- copy_settings_offset = user_settings_offset;
- }
- }
- else if ( user2_valid) {
- /* copy the second user settings */
- copy_settings_offset = user_settings_offset + 0x100;
- }
-
- if ( copy_settings_offset > 0) {
- memcpy( dest_buffer, &fw_datacopy_settings_offset,
- NDS_FW_USER_SETTINGS_MEM_BYTE_COUNT);
- copy_good = 1;
- }
- }
-
- return copy_good;
-}
-
-
-#ifdef GDB_STUB
-int NDS_Init( struct armcpu_memory_iface *arm9_mem_if,
- struct armcpu_ctrl_iface **arm9_ctrl_iface,
- struct armcpu_memory_iface *arm7_mem_if,
- struct armcpu_ctrl_iface **arm7_ctrl_iface) {
-#else
-int NDS_Init( void) {
-#endif
- nds.ARM9Cycle = 0;
- nds.ARM7Cycle = 0;
- nds.cycles = 0;
- MMU_Init();
- nds.nextHBlank = 3168;
- nds.VCount = 0;
- nds.lignerendu = false;
-
- if (Screen_Init(GFXCORE_DUMMY) != 0)
- return -1;
-
- #ifdef GDB_STUB
- armcpu_new(&NDS_ARM7,1, arm7_mem_if, arm7_ctrl_iface);
- armcpu_new(&NDS_ARM9,0, arm9_mem_if, arm9_ctrl_iface);
-#else
-	 armcpu_new(&NDS_ARM7,1);
- armcpu_new(&NDS_ARM9,0);
-#endif
+int NDS_Init()
+{
+	MMU_Init();
+	nds.VCount = 0;
 
- if (SPU_Init(SNDCORE_DUMMY, 735) != 0)
- return -1;
+	armcpu_new(&NDS_ARM7, 1);
+	armcpu_new(&NDS_ARM9, 0);
 
-#ifdef EXPERIMENTAL_WIFI
-	 WIFI_Init(&wifiMac) ;
-#endif
+	if (SPU_Init(SNDCORE_DUMMY, 740))
+		return -1;
 
- return 0;
+	return 0;
 }
 
-static void armcpu_deinit(armcpu_t *armcpu)
+void NDS_DeInit()
 {
-	if(armcpu->coproc15)
-	{
-		free(armcpu->coproc15);
-		armcpu->coproc15 = 0;
-	}
-}
-
-void NDS_DeInit(void) {
- if(MMU.CART_ROM != MMU.UNUSED_RAM)
- NDS_FreeROM();
-
-	armcpu_deinit(&NDS_ARM7);
-	armcpu_deinit(&NDS_ARM9);
+	if (MMU.CART_ROM != MMU.UNUSED_RAM)
+		NDS_FreeROM();
 
- nds.nextHBlank = 3168;
- SPU_DeInit();
- Screen_DeInit();
- MMU_DeInit();
+	SPU_DeInit();
+	MMU_DeInit();
 }
 
-BOOL NDS_SetROM(u8 * rom, u32 mask)
+bool NDS_SetROM(uint8_t *rom, uint32_t mask)
 {
- MMU_setRom(rom, mask);
+	MMU_setRom(rom, mask);
 
- return true;
+	return true;
 }
 
-NDS_header * NDS_getROMHeader(void)
+std::unique_ptr<NDS_header> NDS_getROMHeader()
 {
-	NDS_header * header = (NDS_header *) malloc(sizeof(NDS_header));
+	if (MMU.CART_ROM == MMU.UNUSED_RAM)
+		return std::unique_ptr<NDS_header>();
+	auto header = std::unique_ptr<NDS_header>(new NDS_header);
 
 	memcpy(header->gameTile, MMU.CART_ROM, 12);
 	memcpy(header->gameCode, MMU.CART_ROM + 12, 4);
@@ -212,6 +82,7 @@
 	header->cardSize = MMU.CART_ROM20;
 	memcpy(header->cardInfo, MMU.CART_ROM + 21, 8);
 	header->flags = MMU.CART_ROM29;
+	header->romversion = MMU.CART_ROM30;
 	header->ARM9src = T1ReadLong(MMU.CART_ROM, 32);
 	header->ARM9exe = T1ReadLong(MMU.CART_ROM, 36);
 	header->ARM9cpy = T1ReadLong(MMU.CART_ROM, 40);
@@ -242,507 +113,1048 @@
 	memcpy(header->logo, MMU.CART_ROM + 192, 156);
 	header->logoCRC16 = T1ReadWord(MMU.CART_ROM, 348);
 	header->headerCRC16 = T1ReadWord(MMU.CART_ROM, 350);
-	memcpy(header->reserved, MMU.CART_ROM + 352, 160);
+	memcpy(header->reserved, MMU.CART_ROM + 352, std::min<size_t>(160, gameInfo.romsize - 352));
 
 	return header;
+}
 
- //return (NDS_header *)MMU.CART_ROM;
+RomBanner::RomBanner(bool defaultInit)
+{
+	if (!defaultInit)
+		return;
+	this->version = 1; //Version (0001h)
+	this->crc16 = 0; //CRC16 across entries 020h..83Fh
+	memset(this->reserved, 0, sizeof(this->reserved));
+	memset(this->bitmap, 0, sizeof(this->bitmap));
+	memset(this->palette, 0, sizeof(this->palette));
+	memset(this->titles, 0, sizeof(this->titles));
+	memset(this->end0xFF, 0, sizeof(this->end0xFF));
 }
 
+void NDS_FreeROM()
+{
+	if (MMU.CART_ROM == reinterpret_cast<uint8_t *>(&gameInfo.romdata0))
+		gameInfo.romdata.reset();
+	if (MMU.CART_ROM != MMU.UNUSED_RAM)
+		delete MMU.CART_ROM;
+	MMU_unsetRom();
+}
 
+void NDS_Sleep() { nds.sleeping = true; }
 
-void NDS_FreeROM(void)
+enum ESI_DISPCNT
 {
- if (MMU.CART_ROM != MMU.UNUSED_RAM)
- free(MMU.CART_ROM);
- MMU_unsetRom();
-// if (MMU.bupmem.fp)
-// fclose(MMU.bupmem.fp);
-// MMU.bupmem.fp = nullptr;
-}
+	ESI_DISPCNT_HStart, ESI_DISPCNT_HStartIRQ, ESI_DISPCNT_HDraw, ESI_DISPCNT_HBlank
+};
 
+uint64_t nds_timer;
+static uint64_t nds_arm9_timer, nds_arm7_timer;
 
+struct TSequenceItem
+{
+	uint64_t timestamp;
+	uint32_t param;
+	bool enabled;
 
-void NDS_Reset( void)
-{
- BOOL oldexecute=execute;
- int i;
- u32 src;
- u32 dst;
- NDS_header * header = NDS_getROMHeader();
-
-	if (!header) return ;
-
- execute = false;
-
- MMU_clearMem();
-
- src = header->ARM9src;
- dst = header->ARM9cpy;
-
- for(i = 0; i < (header->ARM9binSize>>2); ++i)
- {
- MMU_write32(0, dst, T1ReadLong(MMU.CART_ROM, src));
- dst += 4;
- src += 4;
- }
-
- src = header->ARM7src;
- dst = header->ARM7cpy;
-
- for(i = 0; i < (header->ARM7binSize>>2); ++i)
- {
- MMU_write32(1, dst, T1ReadLong(MMU.CART_ROM, src));
- dst += 4;
- src += 4;
- }
-
- armcpu_init(&NDS_ARM7, header->ARM7exe);
- armcpu_init(&NDS_ARM9, header->ARM9exe);
-
- nds.ARM9Cycle = 0;
- nds.ARM7Cycle = 0;
- nds.cycles = 0;
- memset(nds.timerCycle, 0, sizeof(s32) * 2 * 4);
- memset(nds.timerOver, 0, sizeof(BOOL) * 2 * 4);
- nds.nextHBlank = 3168;
- nds.VCount = 0;
- nds.old = 0;
- nds.diff = 0;
- nds.lignerendu = false;
- nds.touchX = nds.touchY = 0;
-
- MMU_write16(0, 0x04000130, 0x3FF);
- MMU_write16(1, 0x04000130, 0x3FF);
- MMU_write8(1, 0x04000136, 0x43);
-
- /*
- * Setup a copy of the firmware user settings in memory.
- * (this is what the DS firmware would do).
- */
- {
- u8 temp_bufferNDS_FW_USER_SETTINGS_MEM_BYTE_COUNT;
- int fw_index;
-
- if ( copy_firmware_user_data( temp_buffer, MMU.fw.data)) {
- for ( fw_index = 0; fw_index < NDS_FW_USER_SETTINGS_MEM_BYTE_COUNT; fw_index++) {
- MMU_write8( 0, 0x027FFC80 + fw_index, temp_bufferfw_index);
- }
- }
- }
-
-	// Copy the whole header to Main RAM 0x27FFE00 on startup.
-	// Reference: http://nocash.emubase.de/gbatek.htm#dscartridgeheader
-	for (i = 0; i < ((0x170+0x90)/4); i++)
-	{
-		MMU_write32 (0, 0x027FFE00+i*4, LE_TO_LOCAL_32(((u32*)MMU.CART_ROM)i));
-	}
-
- MainScreen.offset = 0;
- SubScreen.offset = 192;
-
- //MMU_write32(0, 0x02007FFC, 0xE92D4030);
-
- //ARM7 BIOS IRQ HANDLER
- MMU_write32(1, 0x00, 0xE25EF002);
- MMU_write32(1, 0x04, 0xEAFFFFFE);
- MMU_write32(1, 0x18, 0xEA000000);
- MMU_write32(1, 0x20, 0xE92D500F);
- MMU_write32(1, 0x24, 0xE3A00301);
- MMU_write32(1, 0x28, 0xE28FE000);
- MMU_write32(1, 0x2C, 0xE510F004);
- MMU_write32(1, 0x30, 0xE8BD500F);
- MMU_write32(1, 0x34, 0xE25EF004);
-
- //ARM9 BIOS IRQ HANDLER
- MMU_write32(0, 0xFFFF0018, 0xEA000000);
- MMU_write32(0, 0xFFFF0020, 0xE92D500F);
- MMU_write32(0, 0xFFFF0024, 0xEE190F11);
- MMU_write32(0, 0xFFFF0028, 0xE1A00620);
- MMU_write32(0, 0xFFFF002C, 0xE1A00600);
- MMU_write32(0, 0xFFFF0030, 0xE2800C40);
- MMU_write32(0, 0xFFFF0034, 0xE28FE000);
- MMU_write32(0, 0xFFFF0038, 0xE510F004);
- MMU_write32(0, 0xFFFF003C, 0xE8BD500F);
- MMU_write32(0, 0xFFFF0040, 0xE25EF004);
-
- MMU_write32(0, 0x0000004, 0xE3A0010E);
- MMU_write32(0, 0x0000008, 0xE3A01020);
-// MMU_write32(0, 0x000000C, 0xE1B02110);
- MMU_write32(0, 0x000000C, 0xE1B02040);
- MMU_write32(0, 0x0000010, 0xE3B02020);
-// MMU_write32(0, 0x0000010, 0xE2100202);
-
- free(header);
-
- GPU_Reset(MainScreen.gpu, 0);
- GPU_Reset(SubScreen.gpu, 1);
- SPU_Reset();
-
- execute = oldexecute;
-}
+	virtual ~TSequenceItem() { }
+
+	virtual bool isTriggered() const
+	{
+		return this->enabled && nds_timer >= this->timestamp;
+	}
 
-static void dma_check(void)
+	virtual uint64_t next() const
+	{
+		return this->timestamp;
+	}
+};
+
+template<int procnum, int num> struct TSequenceItem_Timer : public TSequenceItem
 {
-	if((MMU.DMAing00)&&(MMU.DMACycle00<=nds.cycles))
+	bool isTriggered() const
+	{
+		return this->enabled && nds_timer >= nds.timerCycleprocnumnum;
+	}
+
+	void schedule()
 	{
-		T1WriteLong(ARM9Mem.ARM9_REG, 0xB8 + (0xC*0), T1ReadLong(ARM9Mem.ARM9_REG, 0xB8 + (0xC*0)) & 0x7FFFFFFF);
-		if((MMU.DMACrt00)&(1<<30)) NDS_makeARM9Int(8);
-		MMU.DMAing00 = false;
+		this->enabled = MMU.timerONprocnumnum && MMU.timerMODEprocnumnum != 0xFFFF;
 	}
 
-	if((MMU.DMAing01)&&(MMU.DMACycle01<=nds.cycles))
+	uint64_t next() const
 	{
-		T1WriteLong(ARM9Mem.ARM9_REG, 0xB8 + (0xC*1), T1ReadLong(ARM9Mem.ARM9_REG, 0xB8 + (0xC*1)) & 0x7FFFFFFF);
-		if((MMU.DMACrt01)&(1<<30)) NDS_makeARM9Int(9);
-		MMU.DMAing01 = false;
+		return nds.timerCycleprocnumnum;
 	}
 
-	if((MMU.DMAing02)&&(MMU.DMACycle02<=nds.cycles))
+	void exec()
 	{
-		T1WriteLong(ARM9Mem.ARM9_REG, 0xB8 + (0xC*2), T1ReadLong(ARM9Mem.ARM9_REG, 0xB8 + (0xC*2)) & 0x7FFFFFFF);
-		if((MMU.DMACrt02)&(1<<30)) NDS_makeARM9Int(10);
-		MMU.DMAing02 = false;
+		uint8_t *regs = !procnum ? MMU.ARM9_REG : MMU.ARM7_REG;
+		bool first = true, over;
+		// we'll need to check chained timers..
+		for (int i = num; i < 4; ++i)
+		{
+			// maybe too many checks if this is here, but we need it here for now
+			if (!MMU.timerONprocnumi)
+				return;
+
+			if (MMU.timerMODEprocnumi == 0xFFFF)
+			{
+				++MMU.timerprocnumi;
+				over = !MMU.timerprocnumi;
+			}
+			else
+			{
+				if (!first)
+					break; // this timer isn't chained. break the chain
+				first = false;
+
+				over = true;
+				int remain = 65536 - MMU.timerReloadprocnumi;
+				int ctr = 0;
+				while (nds.timerCycleprocnumi <= nds_timer)
+				{
+					nds.timerCycleprocnumi += remain << MMU.timerMODEprocnumi;
+					++ctr;
+				}
+#ifndef NDEBUG
+				if (ctr > 1)
+					fprintf(stderr, "yikes!!!!! please report!\n");
+#endif
+			}
+
+			if (over)
+			{
+				MMU.timerprocnumi = MMU.timerReloadprocnumi;
+				if (T1ReadWord(regs, 0x102 + i * 4) & 0x40)
+					NDS_makeIrq(procnum, IRQ_BIT_TIMER_0 + i);
+			}
+			else
+				break; // no more chained timers to trigger. we're done here
+		}
 	}
+};
 
-	if((MMU.DMAing03)&&(MMU.DMACycle03<=nds.cycles))
+template<int procnum, int chan> struct TSequenceItem_DMA : public TSequenceItem
+{
+	DmaController *controller;
+
+	bool isTriggered() const
 	{
-		T1WriteLong(ARM9Mem.ARM9_REG, 0xB8 + (0xC*3), T1ReadLong(ARM9Mem.ARM9_REG, 0xB8 + (0xC*3)) & 0x7FFFFFFF);
-		if((MMU.DMACrt03)&(1<<30)) NDS_makeARM9Int(11);
-		MMU.DMAing03 = false;
+		return this->controller->dmaCheck && nds_timer>= this->controller->nextEvent;
 	}
 
-	if((MMU.DMAing10)&&(MMU.DMACycle10<=nds.cycles))
+	bool isEnabled() const
 	{
-		T1WriteLong(MMU.ARM7_REG, 0xB8 + (0xC*0), T1ReadLong(MMU.ARM7_REG, 0xB8 + (0xC*0)) & 0x7FFFFFFF);
-		if((MMU.DMACrt10)&(1<<30)) NDS_makeARM7Int(8);
-		MMU.DMAing10 = false;
+		return this->controller->dmaCheck;
 	}
 
-	if((MMU.DMAing11)&&(MMU.DMACycle11<=nds.cycles))
+	uint64_t next() const
 	{
-		T1WriteLong(MMU.ARM7_REG, 0xB8 + (0xC*1), T1ReadLong(MMU.ARM7_REG, 0xB8 + (0xC*1)) & 0x7FFFFFFF);
-		if((MMU.DMACrt11)&(1<<30)) NDS_makeARM7Int(9);
-		MMU.DMAing11 = false;
+		return this->controller->nextEvent;
 	}
 
-	if((MMU.DMAing12)&&(MMU.DMACycle12<=nds.cycles))
+	void exec()
+	{
+		//fprintf(stderr, "exec from TSequenceItem_DMA: %d %d\n",procnum,chan);
+		this->controller->exec();
+	}
+};
+
+struct TSequenceItem_divider : public TSequenceItem
+{
+	bool isTriggered() const
 	{
-		T1WriteLong(MMU.ARM7_REG, 0xB8 + (0xC*2), T1ReadLong(MMU.ARM7_REG, 0xB8 + (0xC*2)) & 0x7FFFFFFF);
-		if((MMU.DMACrt12)&(1<<30)) NDS_makeARM7Int(10);
-		MMU.DMAing12 = false;
+		return MMU.divRunning && nds_timer >= MMU.divCycles;
 	}
 
-	if((MMU.DMAing13)&&(MMU.DMACycle13<=nds.cycles))
+	bool isEnabled()
 	{
-		T1WriteLong(MMU.ARM7_REG, 0xB8 + (0xC*3), T1ReadLong(MMU.ARM7_REG, 0xB8 + (0xC*3)) & 0x7FFFFFFF);
-		if((MMU.DMACrt13)&(1<<30)) NDS_makeARM7Int(11);
-		MMU.DMAing13 = false;
+		return MMU.divRunning;
 	}
 
-	if((MMU.reg_IF0&MMU.reg_IE0) && (MMU.reg_IME0))
+	uint64_t next() const
 	{
-#ifdef GDB_STUB
-		if ( armcpu_flagIrq( &NDS_ARM9))
+		return MMU.divCycles;
+	}
+
+	void exec()
+	{
+		MMU_new.div.busy = 0;
+#ifdef _WIN64
+		T1WriteQuad(MMU.MMU_MEMARMCPU_ARM90x40, 0x2A0, MMU.divResult);
+		T1WriteQuad(MMU.MMU_MEMARMCPU_ARM90x40, 0x2A8, MMU.divMod);
 #else
-		if ( armcpu_irqExeption(&NDS_ARM9))
+		T1WriteLong(MMU.MMU_MEMARMCPU_ARM90x40, 0x2A0, MMU.divResult & 0xFFFFFFFF);
+		T1WriteLong(MMU.MMU_MEMARMCPU_ARM90x40, 0x2A4, (MMU.divResult >> 32) & 0xFFFFFFFF);
+		T1WriteLong(MMU.MMU_MEMARMCPU_ARM90x40, 0x2A8, MMU.divMod & 0xFFFFFFFF);
+		T1WriteLong(MMU.MMU_MEMARMCPU_ARM90x40, 0x2AC, (MMU.divMod >> 32) & 0xFFFFFFFF);
 #endif
+		MMU.divRunning = false;
+	}
+};
+
+struct TSequenceItem_sqrtunit : public TSequenceItem
+{
+	bool isTriggered() const
+	{
+		return MMU.sqrtRunning && nds_timer >= MMU.sqrtCycles;
+	}
+
+	bool isEnabled()
+	{
+		return MMU.sqrtRunning;
+	}
+
+	uint64_t next() const
+	{
+		return MMU.sqrtCycles;
+	}
+
+	void exec()
+	{
+		MMU_new.sqrt.busy = 0;
+		T1WriteLong(MMU.MMU_MEMARMCPU_ARM90x40, 0x2B4, MMU.sqrtResult);
+		MMU.sqrtRunning = false;
+	}
+};
+
+static struct Sequencer
+{
+	bool nds_vblankEnded;
+	bool reschedule;
+	TSequenceItem dispcnt;
+	TSequenceItem wifi;
+	TSequenceItem_divider divider;
+	TSequenceItem_sqrtunit sqrtunit;
+	TSequenceItem/*_GXFIFO*/ gxfifo;
+	TSequenceItem_DMA<0, 0> dma_0_0; TSequenceItem_DMA<0, 1> dma_0_1;
+	TSequenceItem_DMA<0, 2> dma_0_2; TSequenceItem_DMA<0, 3> dma_0_3;
+	TSequenceItem_DMA<1, 0> dma_1_0; TSequenceItem_DMA<1, 1> dma_1_1;
+	TSequenceItem_DMA<1, 2> dma_1_2; TSequenceItem_DMA<1, 3> dma_1_3;
+	TSequenceItem_Timer<0, 0> timer_0_0; TSequenceItem_Timer<0, 1> timer_0_1;
+	TSequenceItem_Timer<0, 2> timer_0_2; TSequenceItem_Timer<0, 3> timer_0_3;
+	TSequenceItem_Timer<1, 0> timer_1_0; TSequenceItem_Timer<1, 1> timer_1_1;
+	TSequenceItem_Timer<1, 2> timer_1_2; TSequenceItem_Timer<1, 3> timer_1_3;
+
+	void init();
+
+	void execHardware();
+	uint64_t findNext();
+} sequencer;
+
+void NDS_RescheduleTimers()
+{
+#define check(X, Y) sequencer.timer_##X##_##Y .schedule();
+	check(0, 0); check(0, 1); check(0, 2); check(0, 3);
+	check(1, 0); check(1, 1); check(1, 2); check(1, 3);
+#undef check
+
+	NDS_Reschedule();
+}
+
+void NDS_RescheduleDMA()
+{
+	//TBD
+	NDS_Reschedule();
+}
+
+static void initSchedule()
+{
+	sequencer.init();
+
+	// begin at the very end of the last scanline
+	// so that at t=0 we can increment to scanline=0
+	nds.VCount = 262;
+
+	sequencer.nds_vblankEnded = false;
+}
+
+// 2196372 ~= (ARM7_CLOCK << 16) / 1000000
+// This value makes more sense to me, because:
+// ARM7_CLOCK = 33.51 mhz
+//				= 33513982 cycles per second
+// 				= 33.513982 cycles per microsecond
+//const uint64_t kWifiCycles = 34*2;
+//(this isn't very precise. I don't think it needs to be)
+
+void Sequencer::init()
+{
+	NDS_RescheduleTimers();
+	NDS_RescheduleDMA();
+
+	this->reschedule = false;
+	nds_timer = 0;
+	nds_arm9_timer = 0;
+	nds_arm7_timer = 0;
+
+	this->dispcnt.enabled = true;
+	this->dispcnt.param = ESI_DISPCNT_HStart;
+	this->dispcnt.timestamp = 0;
+
+	this->dma_0_0.controller = &MMU_new.dma00;
+	this->dma_0_1.controller = &MMU_new.dma01;
+	this->dma_0_2.controller = &MMU_new.dma02;
+	this->dma_0_3.controller = &MMU_new.dma03;
+	this->dma_1_0.controller = &MMU_new.dma10;
+	this->dma_1_1.controller = &MMU_new.dma11;
+	this->dma_1_2.controller = &MMU_new.dma12;
+	this->dma_1_3.controller = &MMU_new.dma13;
+}
+
+static void execHardware_hblank()
+{
+	// this logic keeps moving around.
+	// now, we try and give the game as much time as possible to finish doing its work for the scanline,
+	// by drawing scanline N at the end of drawing time (but before subsequent interrupt or hdma-driven events happen)
+	// don't try to do this at the end of the scanline, because some games (sonic classics) may use hblank IRQ to set
+	// scroll regs for the next scanline
+	if (nds.VCount < 192)
+		// trigger hblank dmas
+		// but notice, we do that just after we finished drawing the line
+		// (values copied by this hdma should not be used until the next scanline)
+		triggerDma(EDMAMode_HBlank);
+
+	// turn on hblank status bit
+	T1WriteWord(MMU.ARM9_REG, 4, T1ReadWord(MMU.ARM9_REG, 4) | 2);
+	T1WriteWord(MMU.ARM7_REG, 4, T1ReadWord(MMU.ARM7_REG, 4) | 2);
+
+	// fire hblank interrupts if necessary
+	if (T1ReadWord(MMU.ARM9_REG, 4) & 0x10)
+		NDS_makeIrq(ARMCPU_ARM9, IRQ_BIT_LCD_HBLANK);
+	if (T1ReadWord(MMU.ARM7_REG, 4) & 0x10)
+		NDS_makeIrq(ARMCPU_ARM7, IRQ_BIT_LCD_HBLANK);
+
+	// emulation housekeeping. for some reason we always do this at hblank,
+	// even though it sounds more reasonable to do it at hstart
+	SPU_Emulate_core();
+}
+
+static void execHardware_hstart_vblankEnd()
+{
+	sequencer.nds_vblankEnded = true;
+	sequencer.reschedule = true;
+
+	// turn off vblank status bit
+	T1WriteWord(MMU.ARM9_REG, 4, T1ReadWord(MMU.ARM9_REG, 4) & ~1);
+	T1WriteWord(MMU.ARM7_REG, 4, T1ReadWord(MMU.ARM7_REG, 4) & ~1);
+}
+
+static void execHardware_hstart_vblankStart()
+{
+	//fprintf(stderr, "--------VBLANK!!!--------\n");
+
+	// fire vblank interrupts if necessary
+	for (int i = 0; i < 2; ++i)
+		if (MMU.reg_IF_pendingi & (1 << IRQ_BIT_LCD_VBLANK))
 		{
-			nds.ARM9Cycle = nds.cycles;
+			MMU.reg_IF_pendingi &= ~(1 << IRQ_BIT_LCD_VBLANK);
+			NDS_makeIrq(i, IRQ_BIT_LCD_VBLANK);
 		}
+
+	// trigger vblank dmas
+	triggerDma(EDMAMode_VBlank);
+}
+
+static uint16_t execHardware_gen_vmatch_goal()
+{
+	uint16_t vmatch = T1ReadWord(MMU.ARM9_REG, 4);
+	vmatch = (vmatch >> 8) | ((vmatch << 1) & (1 << 8));
+	return vmatch;
+}
+
+static void execHardware_hstart_vcount_irq()
+{
+	// trigger pending VMATCH irqs
+	if (MMU.reg_IF_pendingARMCPU_ARM9 & (1 << IRQ_BIT_LCD_VMATCH))
+	{
+		MMU.reg_IF_pendingARMCPU_ARM9 &= ~(1 << IRQ_BIT_LCD_VMATCH);
+		NDS_makeIrq(ARMCPU_ARM9, IRQ_BIT_LCD_VMATCH);
 	}
+	if(MMU.reg_IF_pendingARMCPU_ARM7 & (1 << IRQ_BIT_LCD_VMATCH))
+	{
+		MMU.reg_IF_pendingARMCPU_ARM7 &= ~(1 << IRQ_BIT_LCD_VMATCH);
+		NDS_makeIrq(ARMCPU_ARM7, IRQ_BIT_LCD_VMATCH);
+	}
+}
 
-	if((MMU.reg_IF1&MMU.reg_IE1) && (MMU.reg_IME1))
+static void execHardware_hstart_vcount()
+{
+	uint16_t vmatch = execHardware_gen_vmatch_goal();
+	if (nds.VCount == vmatch)
 	{
-#ifdef GDB_STUB
-		if ( armcpu_flagIrq( &NDS_ARM7))
-#else
-		if ( armcpu_irqExeption(&NDS_ARM7))
-#endif
+		// arm9 vmatch
+		T1WriteWord(MMU.ARM9_REG, 4, T1ReadWord(MMU.ARM9_REG, 4) | 4);
+		if (T1ReadWord(MMU.ARM9_REG, 4) & 32)
+			MMU.reg_IF_pendingARMCPU_ARM9 |= 1 << IRQ_BIT_LCD_VMATCH;
+	}
+	else
+		T1WriteWord(MMU.ARM9_REG, 4, T1ReadWord(MMU.ARM9_REG, 4) & 0xFFFB);
+
+	vmatch = T1ReadWord(MMU.ARM7_REG, 4);
+	vmatch = (vmatch >> 8) | ((vmatch << 1) & (1 << 8));
+	if (nds.VCount == vmatch)
+	{
+		// arm7 vmatch
+		T1WriteWord(MMU.ARM7_REG, 4, T1ReadWord(MMU.ARM7_REG, 4) | 4);
+		if (T1ReadWord(MMU.ARM7_REG, 4) & 32)
+			MMU.reg_IF_pendingARMCPU_ARM7 |= 1 << IRQ_BIT_LCD_VMATCH;
+	}
+	else
+		T1WriteWord(MMU.ARM7_REG, 4, T1ReadWord(MMU.ARM7_REG, 4) & 0xFFFB);
+}
+
+static void execHardware_hstart_irq()
+{
+	// this function very soon after the registers get updated to trigger IRQs
+	// this is necessary to fix "egokoro kyoushitsu" which idles waiting for vcount=192, which never happens due to a long vblank irq
+	// 100% accurate emulation would require the read of VCOUNT to be in the pipeline already with the irq coming in behind it, thus
+	// allowing the vcount to register as 192 occasionally (maybe about 1 out of 28 frames)
+	// the actual length of the delay is in execHardware() where the events are scheduled
+	sequencer.reschedule = true;
+	if (nds.VCount == 192)
+		// when the vcount hits 192, vblank begins
+		execHardware_hstart_vblankStart();
+
+	execHardware_hstart_vcount_irq();
+}
+
+static void execHardware_hstart()
+{
+	++nds.VCount;
+
+	if (nds.VCount == 263)
+		// when the vcount hits 263 it rolls over to 0
+		nds.VCount = 0;
+	if (nds.VCount == 262)
+		// when the vcount hits 262, vblank ends (oam pre-renders by one scanline)
+		execHardware_hstart_vblankEnd();
+	else if (nds.VCount == 192)
+	{
+		// turn on vblank status bit
+		T1WriteWord(MMU.ARM9_REG, 4, T1ReadWord(MMU.ARM9_REG, 4) | 1);
+		T1WriteWord(MMU.ARM7_REG, 4, T1ReadWord(MMU.ARM7_REG, 4) | 1);
+
+		// check whether we'll need to fire vblank irqs
+		if (T1ReadWord(MMU.ARM9_REG, 4) & 0x8)
+			MMU.reg_IF_pendingARMCPU_ARM9 |= 1 << IRQ_BIT_LCD_VBLANK;
+		if (T1ReadWord(MMU.ARM7_REG, 4) & 0x8)
+			MMU.reg_IF_pendingARMCPU_ARM7 |= 1 << IRQ_BIT_LCD_VBLANK;
+	}
+
+	// write the new vcount
+	T1WriteWord(MMU.ARM9_REG, 6, nds.VCount & 0xFFFF);
+	T1WriteWord(MMU.ARM9_REG, 0x1006, nds.VCount & 0xFFFF);
+	T1WriteWord(MMU.ARM7_REG, 6, nds.VCount & 0xFFFF);
+	T1WriteWord(MMU.ARM7_REG, 0x1006, nds.VCount & 0xFFFF);
+
+	// turn off hblank status bit
+	T1WriteWord(MMU.ARM9_REG, 4, T1ReadWord(MMU.ARM9_REG, 4) & 0xFFFD);
+	T1WriteWord(MMU.ARM7_REG, 4, T1ReadWord(MMU.ARM7_REG, 4) & 0xFFFD);
+
+	// handle vcount status
+	execHardware_hstart_vcount();
+
+	// trigger hstart dmas
+	triggerDma(EDMAMode_HStart);
+
+	if (nds.VCount < 192)
+		// this is hacky.
+		// there is a corresponding hack in doDMA.
+		// it should be driven by a fifo (and generate just in time as the scanline is displayed)
+		// but that isnt even possible until we have some sort of sub-scanline timing.
+		// it may not be necessary.
+		triggerDma(EDMAMode_MemDisplay);
+}
+
+void NDS_Reschedule()
+{
+	sequencer.reschedule = true;
+}
+
+static inline uint64_t _fast_min(uint64_t a, uint64_t b)
+{
+	// you might find that this is faster on a 64bit system; someone should try it
+	// http://aggregate.org/MAGIC/#Integer%20Selection
+	//uint64_t ret = (((((s64)(a-b)) >> (64-1)) & (a^b)) ^ b);
+	//assert(ret==min(a,b));
+	//return ret;
+
+	// but this ends up being the fastest on 32bits
+	return a<b?a:b;
+
+	// just for the record, I tried to do the 64bit math on a 32bit proc
+	// using sse2 and it was really slow
+	//__m128i __a; __a.m128i_u640 = a;
+	//__m128i __b; __b.m128i_u640 = b;
+	//__m128i xorval = _mm_xor_si128(__a,__b);
+	//__m128i temp = _mm_sub_epi64(__a,__b);
+	//temp.m128i_i640 >>= 63; //no 64bit shra in sse2, what a disappointment
+	//temp = _mm_and_si128(temp,xorval);
+	//temp = _mm_xor_si128(temp,__b);
+	//return temp.m128i_u640;
+}
+
+uint64_t Sequencer::findNext()
+{
+	// this one is always enabled so dont bother to check it
+	uint64_t next = this->dispcnt.next();
+
+	if (this->divider.isEnabled())
+		next = _fast_min(next, this->divider.next());
+	if (this->sqrtunit.isEnabled())
+		next = _fast_min(next, this->sqrtunit.next());
+
+#define test(X, Y) \
+	if (this->dma_##X##_##Y .isEnabled()) \
+		next = _fast_min(next, this->dma_##X##_##Y .next());
+	test(0, 0); test(0, 1); test(0, 2); test(0, 3);
+	test(1, 0); test(1, 1); test(1, 2); test(1, 3);
+#undef test
+#define test(X, Y) \
+	if (this->timer_##X##_##Y .enabled) \
+		next = _fast_min(next, this->timer_##X##_##Y .next());
+	test(0, 0); test(0, 1); test(0, 2); test(0, 3);
+	test(1, 0); test(1, 1); test(1, 2); test(1, 3);
+#undef test
+
+	return next;
+}
+
+void Sequencer::execHardware()
+{
+	if (this->dispcnt.isTriggered())
+	{
+		switch (this->dispcnt.param)
 		{
-			nds.ARM7Cycle = nds.cycles;
+			case ESI_DISPCNT_HStart:
+				execHardware_hstart();
+				// (used to be 3168)
+				// hstart is actually 8 dots before the visible drawing begins
+				// we're going to run 1 here and then run 7 in the next case
+				this->dispcnt.timestamp += 12;
+				this->dispcnt.param = ESI_DISPCNT_HStartIRQ;
+				break;
+			case ESI_DISPCNT_HStartIRQ:
+				execHardware_hstart_irq();
+				this->dispcnt.timestamp += 84;
+				this->dispcnt.param = ESI_DISPCNT_HDraw;
+				break;
+			case ESI_DISPCNT_HDraw:
+				// duration of non-blanking period is ~1606 clocks (gbatek agrees) but says its different on arm7
+				// im gonna call this 267 dots = 267*6=1602
+				// so, this event lasts 267 dots minus the 8 dot preroll
+				this->dispcnt.timestamp += 3108;
+				this->dispcnt.param = ESI_DISPCNT_HBlank;
+				break;
+			case ESI_DISPCNT_HBlank:
+				execHardware_hblank();
+				// (once this was 1092 or 1092/12=91 dots.)
+				// there are surely 355 dots per scanline, less 267 for non-blanking period. the rest is hblank and then after that is hstart
+				this->dispcnt.timestamp += 1056;
+				this->dispcnt.param = ESI_DISPCNT_HStart;
 		}
 	}
 
+	if (this->divider.isTriggered())
+		this->divider.exec();
+	if (this->sqrtunit.isTriggered())
+		this->sqrtunit.exec();
+
+#define test(X, Y) \
+	if (this->dma_##X##_##Y .isTriggered()) \
+		this->dma_##X##_##Y .exec();
+	test(0, 0); test(0, 1); test(0, 2); test(0, 3);
+	test(1, 0); test(1, 1); test(1, 2); test(1, 3);
+#undef test
+#define test(X, Y) \
+	if (this->timer_##X##_##Y .enabled && this->timer_##X##_##Y .isTriggered()) \
+		this->timer_##X##_##Y .exec();
+	test(0, 0); test(0, 1); test(0, 2); test(0, 3);
+	test(1, 0); test(1, 1); test(1, 2); test(1, 3);
+#undef test
+}
+
+void execHardware_interrupts();
+
+// these have not been tuned very well yet.
+static const int kMaxWork = 4000;
+static const int kIrqWait = 4000;
+
+template<bool doarm9, bool doarm7> static inline int32_t minarmtime(int32_t arm9, int32_t arm7)
+{
+	if (doarm9)
+	{
+		if (doarm7)
+			return std::min(arm9, arm7);
+		else
+			return arm9;
+	}
+	else
+		return arm7;
 }
 
-static void timer_check(void)
+template<bool doarm9, bool doarm7>
+static std::pair<int32_t, int32_t> armInnerLoop(uint64_t nds_timer_base, int32_t s32next, int32_t arm9, int32_t arm7)
 {
-	int p, t;
-	for (p = 0; p < 2; p++)
+	int32_t timer = minarmtime<doarm9, doarm7>(arm9, arm7);
+	while (timer < s32next && !sequencer.reschedule && execute)
 	{
-		for (t = 0; t < 4; t++)
+		if (doarm9 && (!doarm7 || arm9 <= timer))
 		{
-			nds.timerOverpt = 0;
-			if(MMU.timerONpt)
+			if (!NDS_ARM9.waitIRQ && !nds.freezeBus)
 			{
-				if(MMU.timerRUNpt)
-				{
-					switch(MMU.timerMODEpt)
-					{
-					case 0xFFFF :
-						if(t > 0 && nds.timerOverpt - 1)
-						{
-							++(MMU.timerpt);
-							nds.timerOverpt = !MMU.timerpt;
-							if (nds.timerOverpt)
-							{
-								if (p == 0)
-								{
-									if(T1ReadWord(ARM9Mem.ARM9_REG, 0x102 + (t << 2)) & 0x40)
-										NDS_makeARM9Int(3 + t);
-								}
-								else
-								{
-									if(T1ReadWord(MMU.ARM7_REG, 0x102 + (t << 2)) & 0x40)
-										NDS_makeARM7Int(3 + t);
-								}
-								MMU.timerpt = MMU.timerReloadpt;
-							}
-						}
-						break;
-					default :
-						{
-							nds.diff = (nds.cycles >> MMU.timerMODEpt) - (nds.timerCyclept >> MMU.timerMODEpt);
-							nds.old = MMU.timerpt;
-							MMU.timerpt += nds.diff;
-							nds.timerCyclept += nds.diff << MMU.timerMODEpt;
-							nds.timerOverpt = nds.old >= MMU.timerpt;
-							if(nds.timerOverpt)
-							{
-								if (p == 0)
-								{
-									if(T1ReadWord(ARM9Mem.ARM9_REG, 0x102 + (t << 2)) & 0x40)
-										NDS_makeARM9Int(3 + t);
-								}
-								else
-								{
-									if(T1ReadWord(MMU.ARM7_REG, 0x102 + (t << 2)) & 0x40)
-										NDS_makeARM7Int(3 + t);
-								}
-								MMU.timerpt = MMU.timerReloadpt + MMU.timerpt - nds.old;
-							}
-						}
-						break;
-					}
-				}
-				else
+				arm9 += armcpu_exec<ARMCPU_ARM9>();
+			}
+			else
+				arm9 = std::min(s32next, arm9 + kIrqWait);
+		}
+		if (doarm7 && (!doarm9 || arm7 <= timer))
+		{
+			if (!NDS_ARM7.waitIRQ && !nds.freezeBus)
+			{
+				arm7 += armcpu_exec<ARMCPU_ARM7>() << 1;
+			}
+			else
+			{
+				arm7 = std::min(s32next, arm7 + kIrqWait);
+				if (arm7 == s32next)
 				{
-					MMU.timerRUNpt = true;
-					nds.timerCyclept = nds.cycles;
+					nds_timer = nds_timer_base + minarmtime<doarm9, false>(arm9, arm7);
+					return armInnerLoop<doarm9, false>(nds_timer_base, s32next, arm9, arm7);
 				}
 			}
 		}
+
+		timer = minarmtime<doarm9, doarm7>(arm9, arm7);
+		nds_timer = nds_timer_base + timer;
+	}
+
+	return std::make_pair(arm9, arm7);
+}
+
+template<bool FORCE> void NDS_exec(int32_t)
+{
+	sequencer.nds_vblankEnded = false;
+
+	if (nds.sleeping)
+	{
+		// speculative code: if ANY irq happens, wake up the arm7.
+		// I think the arm7 program analyzes the system and may decide not to wake up
+		// if it is dissatisfied with the conditions
+		if (MMU.reg_IE1 & MMU.gen_IF<1>())
+			nds.sleeping = false;
+	}
+	else
+	{
+		for (;;)
+		{
+			sequencer.execHardware();
+
+			// break out once per frame
+			if (sequencer.nds_vblankEnded)
+				break;
+			// it should be benign to execute execHardware in the next frame,
+			// since there won't be anything for it to do (everything should be scheduled in the future)
+
+			// bail in case the system halted
+			if (!execute)
+				break;
+
+			execHardware_interrupts();
+
+			// find next work unit:
+			uint64_t next = sequencer.findNext();
+			next = std::min(next, nds_timer + kMaxWork); // lets set an upper limit for now
+
+			//fprintf(stderr, "%d\n", next - nds_timer);
+
+			sequencer.reschedule = false;
+
+			// cast these down to 32bits so that things run faster on 32bit procs
+			uint64_t nds_timer_base = nds_timer;
+			int32_t arm9 = (nds_arm9_timer - nds_timer) & 0xFFFFFFFF;
+			int32_t arm7 = (nds_arm7_timer - nds_timer) & 0xFFFFFFFF;
+			int32_t s32next = (next - nds_timer) & 0xFFFFFFFF;
+
+			auto arm9arm7 = armInnerLoop<true, true>(nds_timer_base, s32next, arm9, arm7);
+
+			arm9 = arm9arm7.first;
+			arm7 = arm9arm7.second;
+			nds_arm7_timer = nds_timer_base + arm7;
+			nds_arm9_timer = nds_timer_base + arm9;
+
+			// if we were waiting for an irq, don't wait too long:
+			// let's re-analyze it after this hardware event (this rolls back a big burst of irq waiting which may have been interrupted by a resynch)
+			if (NDS_ARM9.waitIRQ)
+				nds_arm9_timer = nds_timer;
+			if (NDS_ARM7.waitIRQ)
+				nds_arm7_timer = nds_timer;
+		}
 	}
 }
 
-void NDS_exec_hframe(int cpu_clockdown_level_arm9, int cpu_clockdown_level_arm7)
+template<int PROCNUM> static void execHardware_interrupts_core()
 {
-	int h;
-	for (h = 0; h < 2; h++)
+	uint32_t IF = MMU.gen_IF<PROCNUM>();
+	uint32_t IE = MMU.reg_IEPROCNUM;
+	uint32_t masked = IF & IE;
+	if (ARMPROC.halt_IE_and_IF && masked)
+	{
+		ARMPROC.halt_IE_and_IF = false;
+		ARMPROC.waitIRQ = false;
+	}
+
+	if (masked && MMU.reg_IMEPROCNUM && !ARMPROC.CPSR.bits.I)
 	{
-		s32 nb = nds.cycles + (h ? (99 * 12) : (256 * 12));
+		//fprintf(stderr, "Executing IRQ on procnum %d with IF = %08X and IE = %08X\n",PROCNUM,IF,IE);
+		armcpu_irqException(&ARMPROC);
+	}
+}
 
-		while (nb > nds.ARM9Cycle && !NDS_ARM9.waitIRQ)
-			nds.ARM9Cycle += armcpu_exec(&NDS_ARM9) << (cpu_clockdown_level_arm9);
-		if (NDS_ARM9.waitIRQ) nds.ARM9Cycle = nb;
-		while (nb > nds.ARM7Cycle && !NDS_ARM7.waitIRQ)
-			nds.ARM7Cycle += armcpu_exec(&NDS_ARM7) << (1 + (cpu_clockdown_level_arm7));
-		if (NDS_ARM7.waitIRQ) nds.ARM7Cycle = nb;
-		nds.cycles = (nds.ARM9Cycle<nds.ARM7Cycle)?nds.ARM9Cycle : nds.ARM7Cycle;
+void execHardware_interrupts()
+{
+	execHardware_interrupts_core<ARMCPU_ARM9>();
+	execHardware_interrupts_core<ARMCPU_ARM7>();
+}
 
-		/* HBLANK */
-		if (h)
+static void PrepareBiosARM7()
+{
+	NDS_ARM7.BIOS_loaded = false;
+	memset(MMU.ARM7_BIOS, 0, sizeof(MMU.ARM7_BIOS));
+	if (CommonSettings.UseExtBIOS)
+	{
+		// read arm7 bios from inputfile and flag it if it succeeds
+		FILE *arm7inf = fopen(CommonSettings.ARM7BIOS, "rb");
+		if (fread(MMU.ARM7_BIOS, 1, 16384, arm7inf) == 16384)
+			NDS_ARM7.BIOS_loaded = true;
+		fclose(arm7inf);
+	}
+
+	// choose to use SWI emulation or routines from bios
+	if (CommonSettings.SWIFromBIOS && NDS_ARM7.BIOS_loaded)
+	{
+		NDS_ARM7.swi_tab = 0;
+
+		// if we used routines from bios, apply patches
+		if (CommonSettings.PatchSWI3)
+			_MMU_write16<ARMCPU_ARM7>(0x00002F08, 0x4770);
+	}
+	else
+		NDS_ARM7.swi_tab = ARM_swi_tabARMCPU_ARM7;
+
+	if (!NDS_ARM7.BIOS_loaded)
+	{
+		// fake bios content, critical to normal operations, since we dont have a real bios.
+
+#if 0
+		// someone please document what is in progress here
+		// TODO
+		T1WriteLong(MMU.ARM7_BIOS, 0x0000, 0xEAFFFFFE); // loop for Reset !!!
+		T1WriteLong(MMU.ARM7_BIOS, 0x0004, 0xEAFFFFFE); // loop for Undef instr expection
+		T1WriteLong(MMU.ARM7_BIOS, 0x0008, 0xEA00009C); // SWI
+		T1WriteLong(MMU.ARM7_BIOS, 0x000C, 0xEAFFFFFE); // loop for Prefetch Abort
+		T1WriteLong(MMU.ARM7_BIOS, 0x0010, 0xEAFFFFFE); // loop for Data Abort
+		T1WriteLong(MMU.ARM7_BIOS, 0x0014, 0x00000000); // Reserved
+		T1WriteLong(MMU.ARM7_BIOS, 0x001C, 0x00000000); // Fast IRQ
+#endif
+		T1WriteLong(MMU.ARM7_BIOS, 0x0000, 0xE25EF002);
+		T1WriteLong(MMU.ARM7_BIOS, 0x0018, 0xEA000000);
+		T1WriteLong(MMU.ARM7_BIOS, 0x0020, 0xE92D500F);
+		T1WriteLong(MMU.ARM7_BIOS, 0x0024, 0xE3A00301);
+		T1WriteLong(MMU.ARM7_BIOS, 0x0028, 0xE28FE000);
+		T1WriteLong(MMU.ARM7_BIOS, 0x002C, 0xE510F004);
+		T1WriteLong(MMU.ARM7_BIOS, 0x0030, 0xE8BD500F);
+		T1WriteLong(MMU.ARM7_BIOS, 0x0034, 0xE25EF004);
+	}
+}
+
+static void PrepareBiosARM9()
+{
+	memset(MMU.ARM9_BIOS, 0, sizeof(MMU.ARM9_BIOS));
+	NDS_ARM9.BIOS_loaded = false;
+	if (CommonSettings.UseExtBIOS)
+	{
+		// read arm9 bios from inputfile and flag it if it succeeds
+		FILE *arm9inf = fopen(CommonSettings.ARM9BIOS, "rb");
+		if (fread(MMU.ARM9_BIOS, 1, 4096, arm9inf) == 4096)
+			NDS_ARM9.BIOS_loaded = true;
+		fclose(arm9inf);
+	}
+
+	// choose to use SWI emulation or routines from bios
+	if (CommonSettings.SWIFromBIOS && NDS_ARM9.BIOS_loaded)
+	{
+		NDS_ARM9.swi_tab = 0;
+
+		// if we used routines from bios, apply patches
+		if (CommonSettings.PatchSWI3)
+			_MMU_write16<ARMCPU_ARM9>(0xFFFF07CC, 0x4770);
+	}
+	else
+		NDS_ARM9.swi_tab = ARM_swi_tabARMCPU_ARM9;
+
+	if (!NDS_ARM9.BIOS_loaded)
+	{
+		// fake bios content, critical to normal operations, since we dont have a real bios.
+		// it'd be cool if we could write this in some kind of assembly language, inline or otherwise, without some bulky dependencies
+		// perhaps we could build it with devkitarm? but thats bulky (offline) dependencies, to be sure..
+
+		// reminder: bios chains data abort to fast irq
+
+		// exception vectors:
+		T1WriteLong(MMU.ARM9_BIOS, 0x0000, 0xEAFFFFFE); // (infinite loop for) Reset !!!
+		//T1WriteLong(MMU.ARM9_BIOS, 0x0004, 0xEAFFFFFE); // (infinite loop for) Undefined instruction
+		T1WriteLong(MMU.ARM9_BIOS, 0x0004, 0xEA000004); // Undefined instruction -> Fast IRQ (just guessing)
+		T1WriteLong(MMU.ARM9_BIOS, 0x0008, 0xEA00009C); // SWI -> ?????
+		T1WriteLong(MMU.ARM9_BIOS, 0x000C, 0xEAFFFFFE); // (infinite loop for) Prefetch Abort
+		T1WriteLong(MMU.ARM9_BIOS, 0x0010, 0xEA000001); // Data Abort -> Fast IRQ
+		T1WriteLong(MMU.ARM9_BIOS, 0x0014, 0x00000000); // Reserved
+		T1WriteLong(MMU.ARM9_BIOS, 0x0018, 0xEA000095); // Normal IRQ -> 0x0274
+		T1WriteLong(MMU.ARM9_BIOS, 0x001C, 0xEA00009D); // Fast IRQ -> 0x0298
+
+		static const uint8_t logo_data =
+		{
+			0x24, 0xFF, 0xAE, 0x51, 0x69, 0x9A, 0xA2, 0x21, 0x3D, 0x84, 0x82, 0x0A, 0x84, 0xE4, 0x09, 0xAD,
+			0x11, 0x24, 0x8B, 0x98, 0xC0, 0x81, 0x7F, 0x21, 0xA3, 0x52, 0xBE, 0x19, 0x93, 0x09, 0xCE, 0x20,
+			0x10, 0x46, 0x4A, 0x4A, 0xF8, 0x27, 0x31, 0xEC, 0x58, 0xC7, 0xE8, 0x33, 0x82, 0xE3, 0xCE, 0xBF,
+			0x85, 0xF4, 0xDF, 0x94, 0xCE, 0x4B, 0x09, 0xC1, 0x94, 0x56, 0x8A, 0xC0, 0x13, 0x72, 0xA7, 0xFC,
+			0x9F, 0x84, 0x4D, 0x73, 0xA3, 0xCA, 0x9A, 0x61, 0x58, 0x97, 0xA3, 0x27, 0xFC, 0x03, 0x98, 0x76,
+			0x23, 0x1D, 0xC7, 0x61, 0x03, 0x04, 0xAE, 0x56, 0xBF, 0x38, 0x84, 0x00, 0x40, 0xA7, 0x0E, 0xFD,
+			0xFF, 0x52, 0xFE, 0x03, 0x6F, 0x95, 0x30, 0xF1, 0x97, 0xFB, 0xC0, 0x85, 0x60, 0xD6, 0x80, 0x25,
+			0xA9, 0x63, 0xBE, 0x03, 0x01, 0x4E, 0x38, 0xE2, 0xF9, 0xA2, 0x34, 0xFF, 0xBB, 0x3E, 0x03, 0x44,
+			0x78, 0x00, 0x90, 0xCB, 0x88, 0x11, 0x3A, 0x94, 0x65, 0xC0, 0x7C, 0x63, 0x87, 0xF0, 0x3C, 0xAF,
+			0xD6, 0x25, 0xE4, 0x8B, 0x38, 0x0A, 0xAC, 0x72, 0x21, 0xD4, 0xF8, 0x07
+		};
+
+		// logo (do some games fail to boot without this? example?)
+		for (int t = 0; t < 0x9C; ++t)
+			MMU.ARM9_BIOSt + 0x20 = logo_datat;
+
+		//...0xBC:
+
+		// (now what goes in this gap??)
+
+		// IRQ handler: get dtcm address and jump to a vector in it
+		T1WriteLong(MMU.ARM9_BIOS, 0x0274, 0xE92D500F); //STMDB SP!, {R0-R3,R12,LR}
+		T1WriteLong(MMU.ARM9_BIOS, 0x0278, 0xEE190F11); //MRC CP15, 0, R0, CR9, CR1, 0
+		T1WriteLong(MMU.ARM9_BIOS, 0x027C, 0xE1A00620); //MOV R0, R0, LSR #C
+		T1WriteLong(MMU.ARM9_BIOS, 0x0280, 0xE1A00600); //MOV R0, R0, LSL #C
+		T1WriteLong(MMU.ARM9_BIOS, 0x0284, 0xE2800C40); //ADD R0, R0, #4000
+		T1WriteLong(MMU.ARM9_BIOS, 0x0288, 0xE28FE000); //ADD LR, PC, #0
+		T1WriteLong(MMU.ARM9_BIOS, 0x028C, 0xE510F004); //LDR PC, R0, -#4
+
+		// ????
+		T1WriteLong(MMU.ARM9_BIOS, 0x0290, 0xE8BD500F); // LDMIA SP!, {R0-R3,R12,LR}
+		T1WriteLong(MMU.ARM9_BIOS, 0x0294, 0xE25EF004); // SUBS PC, LR, #4
+
+		// -------
+		// FIQ and abort exception handler
+		// TODO - this code is copied from the bios. refactor it
+		// friendly reminder: to calculate an immediate offset: encoded = (desired_address-cur_address-8)
+
+		T1WriteLong(MMU.ARM9_BIOS, 0x0298, 0xE10FD000); // MRS SP, CPSR
+		T1WriteLong(MMU.ARM9_BIOS, 0x029C, 0xE38DD0C0); // ORR SP, SP, #C0
+
+		T1WriteLong(MMU.ARM9_BIOS, 0x02A0, 0xE12FF00D); // MSR CPSR_fsxc, SP
+		T1WriteLong(MMU.ARM9_BIOS, 0x02A4, 0xE59FD028); // LDR SP, FFFF02D4
+		T1WriteLong(MMU.ARM9_BIOS, 0x02A8, 0xE28DD001); // ADD SP, SP, #1
+		T1WriteLong(MMU.ARM9_BIOS, 0x02AC, 0xE92D5000); // STMDB SP!, {R12,LR}
+
+		T1WriteLong(MMU.ARM9_BIOS, 0x02B0, 0xE14FE000); // MRS LR, SPSR
+		T1WriteLong(MMU.ARM9_BIOS, 0x02B4, 0xEE11CF10); // MRC CP15, 0, R12, CR1, CR0, 0
+		T1WriteLong(MMU.ARM9_BIOS, 0x02B8, 0xE92D5000); // STMDB SP!, {R12,LR}
+		T1WriteLong(MMU.ARM9_BIOS, 0x02BC, 0xE3CCC001); // BIC R12, R12, #1
+
+		T1WriteLong(MMU.ARM9_BIOS, 0x02C0, 0xEE01CF10); // MCR CP15, 0, R12, CR1, CR0, 0
+		T1WriteLong(MMU.ARM9_BIOS, 0x02C4, 0xE3CDC001); // BIC R12, SP, #1
+		T1WriteLong(MMU.ARM9_BIOS, 0x02C8, 0xE59CC010); // LDR R12, R12, #10
+		T1WriteLong(MMU.ARM9_BIOS, 0x02CC, 0xE35C0000); // CMP R12, #0
+
+		T1WriteLong(MMU.ARM9_BIOS, 0x02D0, 0x112FFF3C); // BLXNE R12
+		T1WriteLong(MMU.ARM9_BIOS, 0x02D4, 0x027FFD9C); // 0x027FFD9C
+		// ---------
+	}
+}
+
+void NDS_Reset()
+{
+	bool fw_success = false;
+	auto header = NDS_getROMHeader();
+
+	if (!header)
+		return;
+
+	nds.sleeping = false;
+	nds.cardEjected = false;
+	nds.freezeBus = 0;
+
+	nds_timer = 0;
+	nds_arm9_timer = 0;
+	nds_arm7_timer = 0;
+
+	SPU_DeInit();
+
+	MMU_Reset();
+
+	PrepareBiosARM7();
+	PrepareBiosARM9();
+
+	// according to smea, this is initialized to 3 by the time we get into a user game program. who does this?
+	// well, the firmware load process is about to write a boot program into SIWRAM for the arm7. so we need it setup by now.
+	// but, this is a bit weird.. I would be expecting the bioses to do that. maybe we have some more detail to emulate.
+	// * is this setting the default, or does the bios do it before loading the firmware programs?
+	// at any, it's important that this be done long before the user code ever runs
+	_MMU_write08<ARMCPU_ARM9>(REG_WRAMCNT, 3);
+
+	firmware.reset(new CFIRMWARE());
+	fw_success = firmware->load();
+
+	if (NDS_ARM7.BIOS_loaded && NDS_ARM9.BIOS_loaded && CommonSettings.BootFromFirmware && fw_success)
+	{
+		// Copy secure area to memory if needed.
+		// could we get a comment about what's going on here?
+		// how does this stuff get copied before anything ever even runs?
+		// does it get mapped straight to the rom somehow?
+		// This code could be made more clear too.
+		if (header->ARM9src >= 0x4000 && header->ARM9src < 0x8000)
 		{
-			T1WriteWord(ARM9Mem.ARM9_REG, 4, T1ReadWord(ARM9Mem.ARM9_REG, 4) | 2);
-			T1WriteWord(MMU.ARM7_REG, 4, T1ReadWord(MMU.ARM7_REG, 4) | 2);
-			NDS_ARM9HBlankInt();
-			NDS_ARM7HBlankInt();
+			uint32_t src = header->ARM9src;
+			uint32_t dst = header->ARM9cpy;
+
+			uint32_t size = (0x8000 - src) >> 2;
 
-			if(nds.VCount<192)
+			for (uint32_t i = 0; i < size; ++i)
 			{
-				if(MMU.DMAStartTime00 == 2)
-					MMU_doDMA(0, 0);
-				if(MMU.DMAStartTime01 == 2)
-					MMU_doDMA(0, 1);
-				if(MMU.DMAStartTime02 == 2)
-					MMU_doDMA(0, 2);
-				if(MMU.DMAStartTime03 == 2)
-					MMU_doDMA(0, 3);
+				_MMU_write32<ARMCPU_ARM9>(dst, T1ReadLong(MMU.CART_ROM, src));
+				src += 4;
+				dst += 4;
 			}
 		}
+
+		// TODO someone describe why here
+		if (firmware->patched)
+		{
+			armcpu_init(&NDS_ARM7, 0x00000008);
+			armcpu_init(&NDS_ARM9, 0xFFFF0008);
+		}
 		else
 		{
-			/* HDISP */
-			u32 vmatch;
-
-			nds.nextHBlank += 4260;
-			++nds.VCount;
-			T1WriteWord(ARM9Mem.ARM9_REG, 4, T1ReadWord(ARM9Mem.ARM9_REG, 4) & 0xFFFD);
-			T1WriteWord(MMU.ARM7_REG, 4, T1ReadWord(MMU.ARM7_REG, 4) & 0xFFFD);
-
-			if(MMU.DMAStartTime00 == 3)
-				MMU_doDMA(0, 0);
-			if(MMU.DMAStartTime01 == 3)
-				MMU_doDMA(0, 1);
-			if(MMU.DMAStartTime02 == 3)
-				MMU_doDMA(0, 2);
-			if(MMU.DMAStartTime03 == 3)
-				MMU_doDMA(0, 3);
-
-			// Main memory display
-			if(MMU.DMAStartTime00 == 4)
-			{
-				MMU_doDMA(0, 0);
-				MMU.DMAStartTime00 = 0;
-			}
-			if(MMU.DMAStartTime01 == 4)
-			{
-				MMU_doDMA(0, 1);
-				MMU.DMAStartTime01 = 0;
-			}
-			if(MMU.DMAStartTime02 == 4)
-			{
-				MMU_doDMA(0, 2);
-				MMU.DMAStartTime02 = 0;
-			}
-			if(MMU.DMAStartTime03 == 4)
-			{
-				MMU_doDMA(0, 3);
-				MMU.DMAStartTime03 = 0;
-			}
+			// set the cpus to an initial state with their respective firmware program entrypoints
+			armcpu_init(&NDS_ARM7, firmware->ARM7bootAddr);
+			armcpu_init(&NDS_ARM9, firmware->ARM9bootAddr);
+		}
 
-			if(MMU.DMAStartTime10 == 4)
-			{
-				MMU_doDMA(1, 0);
-				MMU.DMAStartTime10 = 0;
-			}
-			if(MMU.DMAStartTime11 == 4)
-			{
-				MMU_doDMA(1, 1);
-				MMU.DMAStartTime01 = 0;
-			}
-			if(MMU.DMAStartTime12 == 4)
-			{
-				MMU_doDMA(1, 2);
-				MMU.DMAStartTime12 = 0;
-			}
-			if(MMU.DMAStartTime13 == 4)
-			{
-				MMU_doDMA(1, 3);
-				MMU.DMAStartTime13 = 0;
-			}
+		// set REG_POSTFLG to the value indicating pre-firmware status
+		MMU.ARM9_REG0x300 = 0;
+		MMU.ARM7_REG0x300 = 0;
+	}
+	else
+	{
+		// fake firmware boot-up process
 
-			if(nds.VCount == 192)
-			{
-				/* VBLANK */
-				T1WriteWord(ARM9Mem.ARM9_REG, 4, T1ReadWord(ARM9Mem.ARM9_REG, 4) | 1);
-				T1WriteWord(MMU.ARM7_REG, 4, T1ReadWord(MMU.ARM7_REG, 4) | 1);
-				NDS_ARM9VBlankInt();
-				NDS_ARM7VBlankInt();
-
-				if(MMU.DMAStartTime00 == 1)
-					MMU_doDMA(0, 0);
-				if(MMU.DMAStartTime01 == 1)
-					MMU_doDMA(0, 1);
-				if(MMU.DMAStartTime02 == 1)
-					MMU_doDMA(0, 2);
-				if(MMU.DMAStartTime03 == 1)
-					MMU_doDMA(0, 3);
-
-				if(MMU.DMAStartTime10 == 1)
-					MMU_doDMA(1, 0);
-				if(MMU.DMAStartTime11 == 1)
-					MMU_doDMA(1, 1);
-				if(MMU.DMAStartTime12 == 1)
-					MMU_doDMA(1, 2);
-				if(MMU.DMAStartTime13 == 1)
-					MMU_doDMA(1, 3);
-			}
-			else if(nds.VCount == 263)
-			{
-				const int cycles_per_frame = (263 * (99 * 12 + 256 * 12));
-				/* VDISP */
-				nds.nextHBlank = 3168;
-				nds.VCount = 0;
-				T1WriteWord(ARM9Mem.ARM9_REG, 4, T1ReadWord(ARM9Mem.ARM9_REG, 4) & 0xFFFE);
-				T1WriteWord(MMU.ARM7_REG, 4, T1ReadWord(MMU.ARM7_REG, 4) & 0xFFFE);
-
-				nds.cycles -= cycles_per_frame;
-				nds.ARM9Cycle -= cycles_per_frame;
-				nds.ARM7Cycle -= cycles_per_frame;
-				nb -= cycles_per_frame;
-				if(MMU.timerON00)
-					nds.timerCycle00 -= cycles_per_frame;
-				if(MMU.timerON01)
-					nds.timerCycle01 -= cycles_per_frame;
-				if(MMU.timerON02)
-					nds.timerCycle02 -= cycles_per_frame;
-				if(MMU.timerON03)
-					nds.timerCycle03 -= cycles_per_frame;
-
-				if(MMU.timerON10)
-					nds.timerCycle10 -= cycles_per_frame;
-				if(MMU.timerON11)
-					nds.timerCycle11 -= cycles_per_frame;
-				if(MMU.timerON12)
-					nds.timerCycle12 -= cycles_per_frame;
-				if(MMU.timerON13)
-					nds.timerCycle13 -= cycles_per_frame;
-				if(MMU.DMAing00)
-					MMU.DMACycle00 -= cycles_per_frame;
-				if(MMU.DMAing01)
-					MMU.DMACycle01 -= cycles_per_frame;
-				if(MMU.DMAing02)
-					MMU.DMACycle02 -= cycles_per_frame;
-				if(MMU.DMAing03)
-					MMU.DMACycle03 -= cycles_per_frame;
-				if(MMU.DMAing10)
-					MMU.DMACycle10 -= cycles_per_frame;
-				if(MMU.DMAing11)
-					MMU.DMACycle11 -= cycles_per_frame;
-				if(MMU.DMAing12)
-					MMU.DMACycle12 -= cycles_per_frame;
-				if(MMU.DMAing13)
-					MMU.DMACycle13 -= cycles_per_frame;
+		// copy the arm9 program to the address specified by rom header
+		uint32_t src = header->ARM9src;
+		uint32_t dst = header->ARM9cpy;
+		for (uint32_t i = 0; i < (header->ARM9binSize >> 2); ++i)
+		{
+			_MMU_write32<ARMCPU_ARM9>(dst, T1ReadLong(MMU.CART_ROM, src));
+			dst += 4;
+			src += 4;
+		}
 
-			}
+		// copy the arm7 program to the address specified by rom header
+		src = header->ARM7src;
+		dst = header->ARM7cpy;
 
-			T1WriteWord(ARM9Mem.ARM9_REG, 6, nds.VCount);
-			T1WriteWord(MMU.ARM7_REG, 6, nds.VCount);
+		for (uint32_t i = 0; i < (header->ARM7binSize >> 2); ++i)
+		{
+			_MMU_write32<ARMCPU_ARM7>(dst, T1ReadLong(MMU.CART_ROM, src));
+			dst += 4;
+			src += 4;
+		}
 
-			vmatch = T1ReadWord(ARM9Mem.ARM9_REG, 4);
-			if(nds.VCount== ((vmatch >> 8) | ((vmatch << 1) & 256)))
-			{
-				T1WriteWord(ARM9Mem.ARM9_REG, 4, T1ReadWord(ARM9Mem.ARM9_REG, 4) | 4);
-				if(T1ReadWord(ARM9Mem.ARM9_REG, 4) & 32)
-					NDS_makeARM9Int(2);
-			}
-			else
-				T1WriteWord(ARM9Mem.ARM9_REG, 4, T1ReadWord(ARM9Mem.ARM9_REG, 4) & 0xFFFB);
+		// set the cpus to an initial state with their respective programs entrypoints
+		armcpu_init(&NDS_ARM7, header->ARM7exe);
+		armcpu_init(&NDS_ARM9, header->ARM9exe);
 
-			vmatch = T1ReadWord(MMU.ARM7_REG, 4);
-			if(nds.VCount== ((vmatch >> 8) | ((vmatch <<1 ) & 256)))
-			{
-				T1WriteWord(MMU.ARM7_REG, 4, T1ReadWord(MMU.ARM7_REG, 4) | 4);
-				if(T1ReadWord(MMU.ARM7_REG, 4) & 32)
-					NDS_makeARM7Int(2);
-			}
-			else
-				T1WriteWord(MMU.ARM7_REG, 4, T1ReadWord(MMU.ARM7_REG, 4) & 0xFFFB);
+		// set REG_POSTFLG to the value indicating post-firmware status
+		MMU.ARM9_REG0x300 = 1;
+		MMU.ARM7_REG0x300 = 1;
+	}
 
-			timer_check();
-			dma_check();
-		}
+	// only ARM9 have co-processor
+	reconstruct(&cp15);
+	cp15.reset(&NDS_ARM9);
+
+	// bitbox 4k demo is so stripped down it relies on default stack values
+	// otherwise the arm7 will crash before making a sound
+	// (these according to gbatek softreset bios docs)
+	NDS_ARM7.R13_svc = 0x0380FFDC;
+	NDS_ARM7.R13_irq = 0x0380FFB0;
+	NDS_ARM7.R13_usr = 0x0380FF00;
+	NDS_ARM7.R13 = NDS_ARM7.R13_usr;
+	// and let's set these for the arm9 while we're at it, though we have no proof
+	NDS_ARM9.R13_svc = 0x00803FC0;
+	NDS_ARM9.R13_irq = 0x00803FA0;
+	NDS_ARM9.R13_usr = 0x00803EC0;
+	NDS_ARM9.R13_abt = NDS_ARM9.R13_usr; // ?????
+	// I think it is wrong to take gbatek's "SYS" and put it in USR--maybe USR doesnt matter.
+	// i think SYS is all the misc modes. please verify by setting nonsensical stack values for USR here
+	NDS_ARM9.R13 = NDS_ARM9.R13_usr;
+	// n.b.: im not sure about all these, I dont know enough about arm9 svc/irq/etc modes
+	// and how theyre named in desmume to match them up correctly. i just guessed.
+
+	memset(nds.timerCycle, 0, sizeof(uint64_t) * 8);
+	nds.old = 0;
+	SetupMMU(false, nds.Is_DSI());
+
+	_MMU_write16<ARMCPU_ARM9>(REG_KEYINPUT, 0x3FF);
+	_MMU_write16<ARMCPU_ARM7>(REG_KEYINPUT, 0x3FF);
+	_MMU_write08<ARMCPU_ARM7>(REG_EXTKEYIN, 0x43);
+
+	// Setup a copy of the firmware user settings in memory.
+	// (this is what the DS firmware would do).
+	{
+		uint8_t temp_bufferNDS_FW_USER_SETTINGS_MEM_BYTE_COUNT;
+
+		if (copy_firmware_user_data(temp_buffer, &MMU.fw.data0))
+			for (int fw_index = 0; fw_index < NDS_FW_USER_SETTINGS_MEM_BYTE_COUNT; ++fw_index)
+				_MMU_write08<ARMCPU_ARM9>(0x027FFC80 + fw_index, temp_bufferfw_index);
 	}
-}
 
-void NDS_exec_frame(int cpu_clockdown_level_arm9, int cpu_clockdown_level_arm7)
-{
-	int v;
-	for (v = 0; v < 263; v++)
+	// Copy the whole header to Main RAM 0x27FFE00 on startup. (http://nocash.emubase.de/gbatek.htm#dscartridgeheader)
+	// once upon a time this copied 0x90 more. this was thought to be wrong, and changed.
+	if (nds.Is_DSI())
 	{
-		NDS_exec_hframe(cpu_clockdown_level_arm9, cpu_clockdown_level_arm7);
+		// dsi needs this copied later in memory. there are probably a number of things that get copied to a later location in memory.. thats where the NDS consoles tend to stash stuff.
+		for (int i = 0; i < 92; ++i)
+			_MMU_write32<ARMCPU_ARM9>(0x02FFFE00 + i * 4, LE_TO_LOCAL_32(reinterpret_cast<uint32_t *>(MMU.CART_ROM)i));
 	}
+	else
+	{
+		for (int i = 0; i < 92; ++i)
+			_MMU_write32<ARMCPU_ARM9>(0x027FFE00 + i * 4, LE_TO_LOCAL_32(reinterpret_cast<uint32_t *>(MMU.CART_ROM)i));
+	}
+
+	// Write the header checksum to memory (the firmware needs it to see the cart)
+	_MMU_write16<ARMCPU_ARM9>(0x027FF808, T1ReadWord(MMU.CART_ROM, 0x15E));
+
+	if (firmware->patched && CommonSettings.UseExtBIOS && CommonSettings.BootFromFirmware && fw_success)
+	{
+		// HACK! for flashme
+		_MMU_write32<ARMCPU_ARM9>(0x27FFE24, firmware->ARM9bootAddr);
+		_MMU_write32<ARMCPU_ARM7>(0x27FFE34, firmware->ARM7bootAddr);
+	}
+
+	// make system think it's booted from card -- EXTREMELY IMPORTANT!!! Thanks to cReDiAr
+	_MMU_write08<ARMCPU_ARM9>(0x02FFFC40, 0x1);
+	_MMU_write08<ARMCPU_ARM7>(0x02FFFC40, 0x1);
+
+	initSchedule();
+
+	SPU_ReInit();
 }
 
+// these templates needed to be instantiated manually
+template void NDS_exec<false>(int32_t nb);
+template void NDS_exec<true>(int32_t nb);

audacious-plugins-3.6.2-gtk3.tar.bz2/src/xsf/desmume/NDSSystem.h -> audacious-plugins-4.4.1.tar.bz2/src/xsf/desmume/NDSSystem.h Changed

@@ -1,246 +1,348 @@
-/* Copyright (C) 2006 yopyop
- yopyop156@ifrance.com
- yopyop156.ifrance.com
-
- This file is part of DeSmuME
+/*
+	Copyright (C) 2006 yopyop
+	Copyright (C) 2008-2013 DeSmuME team
 
- DeSmuME 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 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
+	(at your option) any later version.
 
- DeSmuME 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.
+	This file 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 DeSmuME; 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 the this software. If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef NDSSYSTEM_H
-#define NDSSYSTEM_H
+#pragma once
 
+#include <memory>
+#include <string>
+#include <cstring>
+#include <stdlib.h>
 #include "armcpu.h"
 #include "MMU.h"
-
-#include "GPU.h"
 #include "SPU.h"
-
 #include "mem.h"
-//#include "wifi.h"
+#include "emufile.h"
+#include "firmware.h"
 
-extern volatile BOOL execute;
-extern BOOL click;
+template<typename Type> struct buttonstruct
+{
+	union
+	{
+		struct
+		{
+			// changing the order of these fields would break stuff
+			//fRLDUTSBAYXWEg
+			Type G; // debug
+			Type E; // right shoulder
+			Type W; // left shoulder
+			Type X;
+			Type Y;
+			Type A;
+			Type B;
+			Type S; // start
+			Type T; // select
+			Type U; // up
+			Type D; // down
+			Type L; // left
+			Type R; // right
+			Type F; // lid
+		};
+		Type array14;
+	};
+};
 
-/*
- * The firmware language values
- */
-#define NDS_FW_LANG_JAP 0
-#define NDS_FW_LANG_ENG 1
-#define NDS_FW_LANG_FRE 2
-#define NDS_FW_LANG_GER 3
-#define NDS_FW_LANG_ITA 4
-#define NDS_FW_LANG_SPA 5
-#define NDS_FW_LANG_CHI 6
-#define NDS_FW_LANG_RES 7
-
-
-//#define LOG_ARM9
-//#define LOG_ARM7
-
-typedef struct
+extern volatile bool execute;
+
+struct NDS_header
 {
- char gameTile12;
- char gameCode4;
- u16 makerCode;
- u8 unitCode;
- u8 deviceCode;
- u8 cardSize;
- u8 cardInfo8;
- u8 flags;
-
- u32 ARM9src;
- u32 ARM9exe;
- u32 ARM9cpy;
- u32 ARM9binSize;
-
- u32 ARM7src;
- u32 ARM7exe;
- u32 ARM7cpy;
- u32 ARM7binSize;
-
- u32 FNameTblOff;
- u32 FNameTblSize;
-
- u32 FATOff;
- u32 FATSize;
-
- u32 ARM9OverlayOff;
- u32 ARM9OverlaySize;
- u32 ARM7OverlayOff;
- u32 ARM7OverlaySize;
-
- u32 unknown2a;
- u32 unknown2b;
-
- u32 IconOff;
- u16 CRC16;
- u16 ROMtimeout;
- u32 ARM9unk;
- u32 ARM7unk;
-
- u8 unknown3c8;
- u32 ROMSize;
- u32 HeaderSize;
- u8 unknown556;
- u8 logo156;
- u16 logoCRC16;
- u16 headerCRC16;
- u8 reserved160;
-} NDS_header;
-
-extern void debug();
-
-typedef struct
+	char gameTile12;
+	char gameCode4;
+	uint16_t makerCode;
+	uint8_t unitCode;
+	uint8_t deviceCode;
+	uint8_t cardSize;
+	uint8_t cardInfo8;
+	uint8_t flags;
+	uint8_t romversion;
+
+	uint32_t ARM9src;
+	uint32_t ARM9exe;
+	uint32_t ARM9cpy;
+	uint32_t ARM9binSize;
+
+	uint32_t ARM7src;
+	uint32_t ARM7exe;
+	uint32_t ARM7cpy;
+	uint32_t ARM7binSize;
+
+	uint32_t FNameTblOff;
+	uint32_t FNameTblSize;
+
+	uint32_t FATOff;
+	uint32_t FATSize;
+
+	uint32_t ARM9OverlayOff;
+	uint32_t ARM9OverlaySize;
+	uint32_t ARM7OverlayOff;
+	uint32_t ARM7OverlaySize;
+
+	uint32_t unknown2a;
+	uint32_t unknown2b;
+
+	uint32_t IconOff;
+	uint16_t CRC16;
+	uint16_t ROMtimeout;
+	uint32_t ARM9unk;
+	uint32_t ARM7unk;
+
+	uint8_t unknown3c8;
+	uint32_t ROMSize;
+	uint32_t HeaderSize;
+	uint8_t unknown556;
+	uint8_t logo156;
+	uint16_t logoCRC16;
+	uint16_t headerCRC16;
+	uint8_t reserved160;
+};
+
+extern uint64_t nds_timer;
+void NDS_Reschedule();
+void NDS_RescheduleDMA();
+void NDS_RescheduleTimers();
+
+enum NDS_CONSOLE_TYPE
 {
- s32 ARM9Cycle;
- s32 ARM7Cycle;
- s32 cycles;
- s32 timerCycle24;
- BOOL timerOver24;
- s32 nextHBlank;
- u32 VCount;
- u32 old;
- s32 diff;
- BOOL lignerendu;
-
- u16 touchX;
- u16 touchY;
-} NDSSystem;
-
-/** /brief A touchscreen calibration point.
- */
-struct NDS_fw_touchscreen_cal {
- u16 adc_x;
- u16 adc_y;
-
- u8 screen_x;
- u8 screen_y;
+	NDS_CONSOLE_TYPE_FAT,
+	NDS_CONSOLE_TYPE_LITE,
+	NDS_CONSOLE_TYPE_IQUE,
+	NDS_CONSOLE_TYPE_DSI
 };
 
-/** /brief The type of DS
- */
-enum nds_fw_ds_type {
- NDS_FW_DS_TYPE_FAT,
- NDS_FW_DS_TYPE_LITE
+struct NDSSystem
+{
+	int32_t cycles;
+	uint64_t timerCycle24;
+	uint32_t VCount;
+	uint32_t old;
+
+	uint8_t *FW_ARM9BootCode;
+	uint8_t *FW_ARM7BootCode;
+	uint32_t FW_ARM9BootCodeAddr;
+	uint32_t FW_ARM7BootCodeAddr;
+	uint32_t FW_ARM9BootCodeSize;
+	uint32_t FW_ARM7BootCodeSize;
+
+	bool sleeping;
+	bool cardEjected;
+	uint32_t freezeBus;
+
+	// console type must be copied in when the system boots. it can't be changed on the fly.
+	int ConsoleType;
+	bool Is_DSI() { return this->ConsoleType == NDS_CONSOLE_TYPE_DSI; }
+
+	bool isInVblank() const { return this->VCount >= 192; }
+	bool isIn3dVblank() const { return this->VCount >= 192 && this->VCount < 215; }
 };
 
 #define MAX_FW_NICKNAME_LENGTH 10
 #define MAX_FW_MESSAGE_LENGTH 26
 
-struct NDS_fw_config_data {
- enum nds_fw_ds_type ds_type;
-
- u8 fav_colour;
- u8 birth_month;
- u8 birth_day;
+struct NDS_fw_config_data
+{
+	NDS_CONSOLE_TYPE ds_type;
 
- u16 nicknameMAX_FW_NICKNAME_LENGTH;
- u8 nickname_len;
+	uint8_t fav_colour;
+	uint8_t birth_month;
+	uint8_t birth_day;
 
- u16 messageMAX_FW_MESSAGE_LENGTH;
- u8 message_len;
+	uint16_t nicknameMAX_FW_NICKNAME_LENGTH;
+	uint8_t nickname_len;
 
- u8 language;
+	uint16_t messageMAX_FW_MESSAGE_LENGTH;
+	uint8_t message_len;
 
- /* touchscreen calibration */
- struct NDS_fw_touchscreen_cal touch_cal2;
+	uint8_t language;
 };
 
 extern NDSSystem nds;
 
-#ifdef GDB_STUB
-int NDS_Init( struct armcpu_memory_iface *arm9_mem_if,
- struct armcpu_ctrl_iface **arm9_ctrl_iface,
- struct armcpu_memory_iface *arm7_mem_if,
- struct armcpu_ctrl_iface **arm7_ctrl_iface);
-#else
-int NDS_Init ( void);
-#endif
-
-void NDS_DeInit(void);
-void
-NDS_FillDefaultFirmwareConfigData( struct NDS_fw_config_data *fw_config);
-
-BOOL NDS_SetROM(u8 * rom, u32 mask);
-NDS_header * NDS_getROMHeader(void);
-
-void NDS_setTouchPos(u16 x, u16 y);
-void NDS_releasTouch(void);
-
-int NDS_LoadROM(const char *filename, int bmtype, u32 bmsize,
- const char *cflash_disk_image_file);
-void NDS_FreeROM(void);
-void NDS_Reset(void);
-int NDS_ImportSave(const char *filename);
-
-int NDS_WriteBMP(const char *filename);
-int NDS_LoadFirmware(const char *filename);
-int NDS_CreateDummyFirmware( struct NDS_fw_config_data *user_settings);
-u32
-NDS_exec(s32 nb, BOOL force);
-
- static INLINE void NDS_ARM9HBlankInt(void)
- {
- if(T1ReadWord(ARM9Mem.ARM9_REG, 4) & 0x10)
- {
- MMU.reg_IF0 |= 2;// & (MMU.reg_IME0 << 1);// (MMU.reg_IE0 & (1<<1));
- NDS_ARM9.wIRQ = true;
- }
- }
-
- static INLINE void NDS_ARM7HBlankInt(void)
- {
- if(T1ReadWord(MMU.ARM7_REG, 4) & 0x10)
- {
- MMU.reg_IF1 |= 2;// & (MMU.reg_IME1 << 1);// (MMU.reg_IE1 & (1<<1));
- NDS_ARM7.wIRQ = true;
- }
- }
-
- static INLINE void NDS_ARM9VBlankInt(void)
- {
- if(T1ReadWord(ARM9Mem.ARM9_REG, 4) & 0x8)
- {
- MMU.reg_IF0 |= 1;// & (MMU.reg_IME0);// (MMU.reg_IE0 & 1);
- NDS_ARM9.wIRQ = true;
- //execute = false;
- /*logcount++;*/
- }
- }
-
- static INLINE void NDS_ARM7VBlankInt(void)
- {
- if(T1ReadWord(MMU.ARM7_REG, 4) & 0x8)
- MMU.reg_IF1 |= 1;// & (MMU.reg_IME1);// (MMU.reg_IE1 & 1);
- NDS_ARM7.wIRQ = true;
- //execute = false;
- }
-
- static INLINE void NDS_swapScreen(void)
- {
-	 u16 tmp = MainScreen.offset;
-	 MainScreen.offset = SubScreen.offset;
-	 SubScreen.offset = tmp;
- }
-
-
-
-void NDS_exec_frame(int cpu_clockdown_level_arm9, int cpu_clockdown_level_arm7);
-void NDS_exec_hframe(int cpu_clockdown_level_arm9, int cpu_clockdown_level_arm7);
-
-#endif
+int NDS_Init ();
+
+void NDS_DeInit();
+
+bool NDS_SetROM(uint8_t * rom, uint32_t mask);
+
+struct RomBanner
+{
+	RomBanner(bool defaultInit);
+	uint16_t version; //Version (0001h)
+	uint16_t crc16; //CRC16 across entries 020h..83Fh
+	uint8_t reserved0x1C; //Reserved (zero-filled)
+	uint8_t bitmap0x200; //Icon Bitmap (32x32 pix) (4x4 tiles, each 4x8 bytes, 4bit depth)
+	uint16_t palette0x10; //Icon Palette (16 colors, 16bit, range 0000h-7FFFh) (Color 0 is transparent, so the 1st palette entry is ignored)
+	enum { NUM_TITLES = 6 };
+	union
+	{
+		struct
+		{
+			uint16_t title_jp0x80; // Title 0 Japanese (128 characters, 16bit Unicode)
+			uint16_t title_en0x80; // Title 1 English ("")
+			uint16_t title_fr0x80; // Title 2 French ("")
+			uint16_t title_de0x80; // Title 3 German ("")
+			uint16_t title_it0x80; // Title 4 Italian ("")
+			uint16_t title_es0x80; // Title 5 Spanish ("")
+		};
+		uint16_t titlesNUM_TITLES0x80;
+	};
+	uint8_t end0xFF0x1C0;
+	//840h ? (Maybe newer/chinese firmware do also support chinese title?)
+	//840h - End of Icon/Title structure (next 1C0h bytes usually FFh-filled)
+};
+
+struct GameInfo
+{
+	GameInfo() : romdata() { }
+
+	void loadData(char *buf, int size)
+	{
+		this->resize(size);
+		memcpy(&this->romdata0, buf, size);
+		this->romsize = size;
+		this->fillGap();
+	}
+
+	void fillGap()
+	{
+		memset(&this->romdatathis->romsize, 0xFF, this->allocatedSize - this->romsize);
+	}
+
+	void resize(int size)
+	{
+		// calculate the necessary mask for the requested size
+		mask = size - 1;
+		mask |= mask >> 1;
+		mask |= mask >> 2;
+		mask |= mask >> 4;
+		mask |= mask >> 8;
+		mask |= mask >> 16;
+
+		// now, we actually need to over-allocate, because bytes from anywhere protected by that mask
+		// could be read from the rom
+		this->allocatedSize = mask + 4;
+
+		this->romdata.reset(new charallocatedSize);
+		this->romsize = size;
+	}
+	uint32_t crc;
+	NDS_header header;
+	char ROMserial20;
+	char ROMname20;
+	std::unique_ptr<char> romdata;
+	uint32_t romsize;
+	uint32_t allocatedSize;
+	uint32_t mask;
+	bool isHomebrew;
+};
+
+extern GameInfo gameInfo;
+
+struct UserButtons : buttonstruct<bool>
+{
+};
+struct UserTouch
+{
+	uint16_t touchX;
+	uint16_t touchY;
+	bool isTouch;
+};
+struct UserMicrophone
+{
+	uint32_t micButtonPressed;
+};
+struct UserInput
+{
+	UserButtons buttons;
+	UserTouch touch;
+	UserMicrophone mic;
+};
+
+void NDS_FreeROM();
+void NDS_Reset();
+
+void NDS_Sleep();
 
+void execHardware_doAllDma(EDMAMode modeNum);
 
+template<bool FORCE> void NDS_exec(int32_t nb = 560190 << 1);
+
+extern struct TCommonSettings
+{
+	TCommonSettings() : UseExtBIOS(false), SWIFromBIOS(false), PatchSWI3(false), UseExtFirmware(false), BootFromFirmware(false), ConsoleType(NDS_CONSOLE_TYPE_FAT), rigorous_timing(false), advanced_timing(true),
+		spuInterpolationMode(SPUInterpolation_Linear), manualBackupType(0), spu_captureMuted(false), spu_advanced(false)
+	{
+		strcpy(this->ARM9BIOS, "biosnds9.bin");
+		strcpy(this->ARM7BIOS, "biosnds7.bin");
+		strcpy(this->Firmware, "firmware.bin");
+		NDS_FillDefaultFirmwareConfigData(&this->InternalFirmConf);
+
+ bool solo = false;
+ static char* soloEnv = strdup("SOLO_2SF_n");
+ static char* muteEnv = strdup("MUTE_2SF_n");
+		for (int i = 0; i < 16; ++i) {
+ if (i < 10) {
+ soloEnv9 = '0' + i;
+ } else {
+ soloEnv9 = 'A' + (i - 10);
+ }
+ char* soloVal = getenv(soloEnv);
+ if (soloVal && soloVal0 == '1') {
+ solo = true;
+ this->spu_muteChannelsi = false;
+ } else {
+ this->spu_muteChannelsi = true;
+ }
+ }
+ if (!solo) {
+ for (int i = 0; i < 16; ++i) {
+ if (i < 10) {
+ muteEnv9 = '0' + i;
+ } else {
+ muteEnv9 = 'A' + (i - 10);
+ }
+ char* muteVal = getenv(muteEnv);
+ this->spu_muteChannelsi = muteVal && muteVal0 == '1';
+ }
+ }
+	}
+
+	bool UseExtBIOS;
+	char ARM9BIOS256;
+	char ARM7BIOS256;
+	bool SWIFromBIOS;
+	bool PatchSWI3;
+
+	bool UseExtFirmware;
+	char Firmware256;
+	bool BootFromFirmware;
+	struct NDS_fw_config_data InternalFirmConf;
+
+	NDS_CONSOLE_TYPE ConsoleType;
+
+	bool rigorous_timing;
+
+	bool advanced_timing;
+
+	SPUInterpolationMode spuInterpolationMode;
+
+	// this is the user's choice of manual backup type, for cases when the autodetection can't be trusted
+	int manualBackupType;
+
+	bool spu_muteChannels16;
+	bool spu_captureMuted;
+	bool spu_advanced;
+} CommonSettings;

audacious-plugins-4.4.1.tar.bz2/src/xsf/desmume/PACKED.h Added

audacious-plugins-4.4.1.tar.bz2/src/xsf/desmume/PACKED_END.h Added

audacious-plugins-3.6.2-gtk3.tar.bz2/src/xsf/desmume/SPU.cc -> audacious-plugins-4.4.1.tar.bz2/src/xsf/desmume/SPU.cc Changed

@@ -1,963 +1,1460 @@
-/* Copyright (C) 2006 Theo Berkau
-
- Ideas borrowed from Stephane Dallongeville's SCSP core
-
- This file is part of DeSmuME
-
- DeSmuME 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.
-
- DeSmuME 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 DeSmuME; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-*/
+/*
+ Copyright (C) 2006 yopyop
+ Copyright (C) 2006 Theo Berkau
+ Copyright (C) 2008-2017 DeSmuME team
+
+ Ideas borrowed from Stephane Dallongeville's SCSP core
+
+ 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
+ (at your option) any later version.
+
+ This file 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 the this software. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+//#include "XSFCommon.h"
+#include "../spu/samplecache.h"
+#include "../spu/interpolator.h"
+
+#define _USE_MATH_DEFINES
+#include <math.h>
+#ifndef M_PI
+#define M_PI 3.1415926535897932386
+#endif
 
 #include <stdlib.h>
 #include <string.h>
+#include <queue>
+#include <vector>
 
-#include "ARM9.h"
 #include "MMU.h"
 #include "SPU.h"
 #include "mem.h"
-
+#include "readwrite.h"
 #include "armcpu.h"
+#include "NDSSystem.h"
+#include "emufile.h"
+#include "matrix.h"
+#include "bits.h"
 
-enum
-{
-	FORMAT_PCM8 = 0,
-	FORMAT_PCM16 = 1,
-	FORMAT_ADPCM = 2,
-	FORMAT_PSG = 3
-};
+static inline s16 read16(u32 addr) { return (s16)_MMU_read16<ARMCPU_ARM7,MMU_AT_DEBUG>(addr); }
+static inline u8 read08(u32 addr) { return _MMU_read08<ARMCPU_ARM7,MMU_AT_DEBUG>(addr); }
+
+#define K_ADPCM_LOOPING_RECOVERY_INDEX 99999
+#define COSINE_INTERPOLATION_RESOLUTION 8192
 
-#define VOL_SHIFT 10
-
-typedef struct
-{
-	int id;
-	int status;
-	int format;
-	u8 *buf8; s16 *buf16;
-	double pos, inc;
-	int loopend, looppos;
-	int loop, length;
-	s32 adpcm;
-	int adpcm_pos, adpcm_index;
-	s32 adpcm_loop;
-	int adpcm_loop_pos, adpcm_loop_index;
-	int psg_duty;
-	int timer;
-	int volume;
-	int pan;
-	int shift;
-	int repeat, hold;
-	u32 addr;
-	s32 volumel;
-	s32 volumer;
-	s16 output;
-} SChannel;
-
-typedef struct
-{
-	s32 *pmixbuf;
-	s16 *pclipingbuf;
-	u32 buflen;
-	SChannel ch16;
-} SPU_struct;
-
-static SPU_struct spu = { 0, 0, 0 };
-
-static SoundInterface_struct *SNDCore=nullptr;
+SPU_struct *SPU_core = 0;
+int SPU_currentCoreNum = SNDCORE_DUMMY;
+static int volume = 100;
+SampleCache spuSampleCache;
+
+static size_t buffersize = 0;
+static ESynchMode synchmode = ESynchMode_Synchronous;
+static ESynchMethod synchmethod = ESynchMethod_0;
+static ISynchronizingAudioBuffer* synchronizer = metaspu_construct(synchmethod);
+
+static int SNDCoreId=-1;
+static SoundInterface_struct *SNDCore=NULL;
 extern SoundInterface_struct *SNDCoreList;
 
+static const int format_shift = { 2, 1, 3, 0 };
+static const u8 volume_shift = { 0, 1, 2, 4 };
+
+static const s16 wavedutytbl88 = {
+ { -0x7FFF, -0x7FFF, -0x7FFF, -0x7FFF, -0x7FFF, -0x7FFF, -0x7FFF, 0x7FFF },
+ { -0x7FFF, -0x7FFF, -0x7FFF, -0x7FFF, -0x7FFF, -0x7FFF, 0x7FFF, 0x7FFF },
+ { -0x7FFF, -0x7FFF, -0x7FFF, -0x7FFF, -0x7FFF, 0x7FFF, 0x7FFF, 0x7FFF },
+ { -0x7FFF, -0x7FFF, -0x7FFF, -0x7FFF, 0x7FFF, 0x7FFF, 0x7FFF, 0x7FFF },
+ { -0x7FFF, -0x7FFF, -0x7FFF, 0x7FFF, 0x7FFF, 0x7FFF, 0x7FFF, 0x7FFF },
+ { -0x7FFF, -0x7FFF, 0x7FFF, 0x7FFF, 0x7FFF, 0x7FFF, 0x7FFF, 0x7FFF },
+ { -0x7FFF, 0x7FFF, 0x7FFF, 0x7FFF, 0x7FFF, 0x7FFF, 0x7FFF, 0x7FFF },
+ { -0x7FFF, -0x7FFF, -0x7FFF, -0x7FFF, -0x7FFF, -0x7FFF, -0x7FFF, -0x7FFF }
+};
+
+static const double ARM7_CLOCK = 33513982;
+
+double DESMUME_SAMPLE_RATE = 48000;
+static double samples_per_hline = (DESMUME_SAMPLE_RATE / 59.8261f) / 263.0f;
+static double sampleLength = DESMUME_SAMPLE_RATE / 32728.498;
+
+void SetDesmumeSampleRate(double rate) {
+ DESMUME_SAMPLE_RATE = rate;
+ sampleLength = DESMUME_SAMPLE_RATE / 32728.498;
+ samples_per_hline = (DESMUME_SAMPLE_RATE / 59.8261f) / 263.0f;
+}
+
+static double samples = 0;
+
+template<typename T>
+static FORCEINLINE T MinMax(T val, T min, T max)
+{
+ if (val < min)
+ return min;
+ else if (val > max)
+ return max;
+
+ return val;
+}
+
+//--------------external spu interface---------------
+
 int SPU_ChangeSoundCore(int coreid, int buffersize)
 {
-	int i;
-	SPU_DeInit();
-
- // Allocate memory for sound buffer
-	spu.buflen = buffersize * 2; /* stereo */
-	spu.pmixbuf = (s32 *) malloc(spu.buflen * sizeof(s32));
-	if (!spu.pmixbuf)
-	{
-		SPU_DeInit();
-		return -1;
-	}
-
-	spu.pclipingbuf = (s16 *) malloc(spu.buflen * sizeof(s16));
-	if (!spu.pclipingbuf)
-	{
-		SPU_DeInit();
-		return -1;
-	}
-
-	// So which core do we want?
-	if (coreid == SNDCORE_DEFAULT)
-		coreid = 0; // Assume we want the first one
-
-	// Go through core list and find the id
-	for (i = 0; SNDCoreListi != nullptr; i++)
-	{
-		if (SNDCoreListi->id == coreid)
-		{
-			// Set to current core
-			SNDCore = SNDCoreListi;
-			break;
-		}
-	}
-
-	if (SNDCore == nullptr)
-	{
-		SPU_DeInit();
-		return -1;
-	}
-
-	if (SNDCore->Init(spu.buflen) == -1)
-	{
-		// Since it failed, instead of it being fatal, we'll just use the dummy
-		// core instead
-		SNDCore = &SNDDummy;
-	}
-
- return 0;
+ int i;
+
+ ::buffersize = buffersize;
+
+ // Make sure the old core is freed
+ if (SNDCore)
+ SNDCore->DeInit();
+
+ // So which core do we want?
+ if (coreid == SNDCORE_DEFAULT)
+ coreid = 0; // Assume we want the first one
+
+ SPU_currentCoreNum = coreid;
+
+ // Go through core list and find the id
+ for (i = 0; SNDCoreListi != NULL; i++)
+ {
+ if (SNDCoreListi->id == coreid)
+ {
+ // Set to current core
+ SNDCore = SNDCoreListi;
+ break;
+ }
+ }
+
+ SNDCoreId = coreid;
+
+ //If the user picked the dummy core, disable the user spu
+ if(SNDCore == &SNDDummy)
+ return 0;
+
+ //If the core wasnt found in the list for some reason, disable the user spu
+ if (SNDCore == NULL)
+ return -1;
+
+ // Since it failed, instead of it being fatal, disable the user spu
+ if (SNDCore->Init(buffersize * 2) == -1)
+ {
+ SNDCore = 0;
+ return -1;
+ }
+
+ SNDCore->SetVolume(volume);
+
+ SPU_SetSynchMode(synchmode,synchmethod);
+
+ return 0;
+}
+
+SoundInterface_struct *SPU_SoundCore()
+{
+ return SNDCore;
 }
+
+void SPU_ReInit(bool fakeBoot)
+{
+ SPU_Init(SNDCoreId, buffersize);
+
+ // Firmware set BIAS to 0x200
+ if (fakeBoot)
+ SPU_WriteWord(0x04000504, 0x0200);
+}
+
 int SPU_Init(int coreid, int buffersize)
 {
-	SPU_DeInit();
-	SPU_Reset();
-	return SPU_ChangeSoundCore(coreid, buffersize);
+ SPU_core = new SPU_struct((int)ceil(samples_per_hline));
+ SPU_Reset();
+
+ SPU_SetSynchMode(synchmode, synchmethod);
+
+ return SPU_ChangeSoundCore(coreid, buffersize);
 }
+
 void SPU_Pause(int pause)
 {
-	if(pause)
-		SNDCore->MuteAudio();
-	else
-		SNDCore->UnMuteAudio();
+ if (SNDCore == NULL) return;
+
+ if(pause)
+ SNDCore->MuteAudio();
+ else
+ SNDCore->UnMuteAudio();
+}
+
+void SPU_SetSynchMode(int mode, int method)
+{
+ synchmode = (ESynchMode)mode;
+ if(synchmethod != (ESynchMethod)method)
+ {
+ synchmethod = (ESynchMethod)method;
+ delete synchronizer;
+ //grr does this need to be locked? spu might need a lock method
+ // or maybe not, maybe the platform-specific code that calls this function can deal with it.
+ synchronizer = metaspu_construct(synchmethod);
+ }
+}
+
+void SPU_ClearOutputBuffer()
+{
+ if(SNDCore && SNDCore->ClearBuffer)
+ SNDCore->ClearBuffer();
 }
+
 void SPU_SetVolume(int volume)
 {
-	if (SNDCore)
-		SNDCore->SetVolume(volume);
+ ::volume = volume;
+ if (SNDCore)
+ SNDCore->SetVolume(volume);
 }
-void SPU_DeInit(void)
+
+
+void SPU_Reset(void)
 {
-	spu.buflen = 0;
-	if (spu.pmixbuf)
-	{
-		free(spu.pmixbuf);
-		spu.pmixbuf = 0;
-	}
-	if (spu.pclipingbuf)
-	{
-		free(spu.pclipingbuf);
-		spu.pclipingbuf = 0;
-	}
-	if (SNDCore)
-	{
-		SNDCore->DeInit();
-	}
-	SNDCore = &SNDDummy;
-}
-
-static const short g_adpcm_index16 = { -1, -1, -1, -1, -1, -1, -1, -1, 2, 2, 4, 4, 6, 6, 8, 8 };
-
-static const int g_adpcm_mult89 =
-{
-	0x0007, 0x0008, 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x0010, 0x0011,
-	0x0013, 0x0015, 0x0017, 0x0019, 0x001C, 0x001F, 0x0022, 0x0025, 0x0029, 0x002D,
-	0x0032, 0x0037, 0x003C, 0x0042, 0x0049, 0x0050, 0x0058, 0x0061, 0x006B, 0x0076,
-	0x0082, 0x008F, 0x009D, 0x00AD, 0x00BE, 0x00D1, 0x00E6, 0x00FD, 0x0117, 0x0133,
-	0x0151, 0x0173, 0x0198, 0x01C1, 0x01EE, 0x0220, 0x0256, 0x0292, 0x02D4, 0x031C,
-	0x036C, 0x03C3, 0x0424, 0x048E, 0x0502, 0x0583, 0x0610, 0x06AB, 0x0756, 0x0812,
-	0x08E0, 0x09C3, 0x0ABD, 0x0BD0, 0x0CFF, 0x0E4C, 0x0FBA, 0x114C, 0x1307, 0x14EE,
-	0x1706, 0x1954, 0x1BDC, 0x1EA5, 0x21B6, 0x2515, 0x28CA, 0x2CDF, 0x315B, 0x364B,
-	0x3BB9, 0x41B2, 0x4844, 0x4F7E, 0x5771, 0x602F, 0x69CE, 0x7462, 0x7FFF,
-};
+ int i;
 
-static const s16 g_psg_duty88 = {
- { -0x7FFF, -0x7FFF, -0x7FFF, -0x7FFF, -0x7FFF, -0x7FFF, -0x7FFF, +0x7FFF },
- { -0x7FFF, -0x7FFF, -0x7FFF, -0x7FFF, -0x7FFF, -0x7FFF, +0x7FFF, +0x7FFF },
- { -0x7FFF, -0x7FFF, -0x7FFF, -0x7FFF, -0x7FFF, +0x7FFF, +0x7FFF, +0x7FFF },
- { -0x7FFF, -0x7FFF, -0x7FFF, -0x7FFF, +0x7FFF, +0x7FFF, +0x7FFF, +0x7FFF },
- { -0x7FFF, -0x7FFF, -0x7FFF, +0x7FFF, +0x7FFF, +0x7FFF, +0x7FFF, +0x7FFF },
- { -0x7FFF, -0x7FFF, +0x7FFF, +0x7FFF, +0x7FFF, +0x7FFF, +0x7FFF, +0x7FFF },
- { -0x7FFF, +0x7FFF, +0x7FFF, +0x7FFF, +0x7FFF, +0x7FFF, +0x7FFF, +0x7FFF },
- { -0x7FFF, -0x7FFF, -0x7FFF, -0x7FFF, -0x7FFF, -0x7FFF, -0x7FFF, -0x7FFF },
-};
+ SPU_core->reset();
+
+ //zero - 09-apr-2010: this concerns me, regarding savestate synch.
+ //After 0.9.6, lets experiment with removing it and just properly zapping the spu instead
+ // Reset Registers
+ for (i = 0x400; i < 0x51D; i++)
+ T1WriteByte(MMU.ARM7_REG, i, 0);
+
+ samples = 0;
+}
 
+//------------------------------------------
 
-static void reset_channel(SChannel *ch, int id)
+void SPU_struct::reset()
 {
-	ch->status = 0;
-	ch->id = id;
+ memset(sndbuf,0,bufsize*2*4);
+ memset(outbuf,0,bufsize*2*2);
+
+ memset((void *)channels, 0, sizeof(channel_struct) * 16);
+
+ reconstruct(&regs);
+
+ for(int i = 0; i < 16; i++)
+ {
+ channelsi.num = i;
+ }
 }
 
-void SPU_Reset(void)
+SPU_struct::SPU_struct(int buffersize)
+ : bufpos(0)
+ , buflength(0)
+ , sndbuf(0)
+ , outbuf(0)
+ , bufsize(buffersize)
 {
-	int i;
-	for (i = 0;i < 16; i++)
-		reset_channel(&spu.chi, i);
-
-	for (i = 0x400; i < 0x51D; i++)
-		T1WriteByte(MMU.ARM7_REG, i, 0);
-}
-void SPU_KeyOn(int channel)
-{
-}
-
-static INLINE void adjust_channel_timer(SChannel *ch)
-{
-	ch->inc = (((double)33512000) / (44100 * 2)) / (double)(0x10000 - ch->timer);
-}
-
-static int check_valid(u32 addr, u32 size)
-{
-	u32 t1, t2;
-
-	if(size > MMU.MMU_MASK1(addr >> 20) & 0xff) return 0;
-
-	t1 = addr;
-	t2 = (addr + size);
-	t1 &= MMU.MMU_MASK1(addr >> 20) & 0xff;
-	t2 &= MMU.MMU_MASK1(addr >> 20) & 0xff;
-
-	if(t2 < t1) return 0;
-
-	return 1;
-}
-
-static void start_channel(SChannel *ch)
-{
-
-	switch(ch->format)
-	{
-	case FORMAT_PCM8:
-		{
-			u8 *p = MMU.MMU_MEM1(ch->addr >> 20) & 0xff;
-			u32 ofs = MMU.MMU_MASK1(ch->addr >> 20) & 0xff & ch->addr;
-			u32 size = ((ch->length + ch->loop) << 2);
-			if((p != nullptr) && check_valid(ch->addr, size))
-			{
-				ch->buf8 = p + ofs;
-				ch->looppos = ch->loop << 2;
-				ch->loopend = size;
-				ch->pos = 0;
-				ch->status = 1;
-			}
-		}
-	break;
-	case FORMAT_PCM16:
-		{
-			u8 *p = MMU.MMU_MEM1(ch->addr >> 20) & 0xff;
-			u32 ofs = MMU.MMU_MASK1(ch->addr >> 20) & 0xff & ch->addr;
-			u32 size = ((ch->length + ch->loop) << 1);
-			if((p != nullptr) && check_valid(ch->addr, size << 1))
-			{
-				ch->buf16 = (s16 *)(p + ofs - (ofs & 1));
-				ch->looppos = ch->loop << 1;
-				ch->loopend = size;
-				ch->pos = 0;
-				ch->status = 1;
-			}
-		}
-	break;
-	case FORMAT_ADPCM:
-		{
-			u8 *p = MMU.MMU_MEM1(ch->addr >> 20) & 0xff;
-			u32 ofs = MMU.MMU_MASK1(ch->addr >> 20) & 0xff & ch->addr;
-			u32 size = ((ch->length + ch->loop) << 3);
-			if((p != nullptr) && check_valid(ch->addr, size >> 1))
-			{
-				ch->buf8 = p + ofs;
-#ifdef WORDS_BIGENDIAN
-				ch->adpcm = ((s32)(s16)T1ReadWord((u8 *)ch->buf8, 0)) << 3;
-#else
-				ch->adpcm = ((s32)*(s16 *)ch->buf8) << 3;
-#endif
-				ch->adpcm_index = (ch->buf82 & 0x7F);
-				ch->adpcm_pos = 8;
-				ch->pos = 9;
-				ch->looppos = ch->loop << 3;
-				ch->loopend = size;
-				ch->adpcm_loop_index = -1;
-				ch->status = 1;
-			}
-		}
-		break;
-	case FORMAT_PSG:
-		ch->status = 1;
-		if(ch->id < 14)
-		{
-			ch->pos = 0;
-		}
-		else
-		{
-			ch->pos = 0x7FFF;
-		}
-		break;
-	}
-}
-
-static void stop_channel(SChannel *ch)
-{
-	u32 addr = 0x400 + (ch->id << 4) + 3;
-	ch->status = 0;
-	T1WriteByte(MMU.ARM7_REG, addr, (u8)(T1ReadByte(MMU.ARM7_REG, addr) & ~0x80));
-}
-static void set_channel_volume(SChannel *ch)
-{
-	s32 vol1 = (T1ReadByte(MMU.ARM7_REG, 0x500) & 0x7F) * ch->volume;
-	s32 vol2;
-	vol2 = vol1 * ch->pan;
-	vol1 = vol1 * (127-ch->pan);
-	ch->volumel = vol1 >> (21 - VOL_SHIFT + ch->shift);
-	ch->volumer = vol2 >> (21 - VOL_SHIFT + ch->shift);
-}
-
-void SPU_WriteByte(u32 addr, u8 x)
-{
-	addr &= 0x00000FFF;
-	T1WriteByte(MMU.ARM7_REG, addr, x);
-
-	if(addr < 0x500)
-	{
-		SChannel *ch;
-		switch(addr & 0x0F)
-		{
-		case 0x0:
-			ch = spu.ch + (addr >> 4 & 0xF);
-			ch->volume = (x & 0x7F);
-			set_channel_volume(ch);
-			break;
-		case 0x1:
-			ch = spu.ch + (addr >> 4 & 0xF);
-			ch->shift = (x & 0x03);
-			ch->hold = (x >> 7 & 0x01);
-			set_channel_volume(ch);
-			break;
-		case 0x2:
-			ch = spu.ch + (addr >> 4 & 0xF);
-			ch->pan = (x & 0x7F);
-			set_channel_volume(ch);
-			break;
-		case 0x3:
-			ch = spu.ch + (addr >> 4 & 0xF);
-			ch->psg_duty = (x & 0x07);
-			ch->repeat = (x >> 3 & 0x03);
-			ch->format = (x >> 5 & 0x03);
-			if(x & 0x80) start_channel(ch); else stop_channel(ch);
-			break;
-#if !DISABLE_XSF_TESTS
-		case 0x04:
-		case 0x05:
-		case 0x06:
-		case 0x07:
-			ch = spu.ch + (addr >> 4 & 0xF);
-			ch->addr = (T1ReadLong(MMU.ARM7_REG, addr & ~3) & 0x07FFFFFF);
-			break;
-		case 0x08:
-		case 0x09:
-			ch = spu.ch + (addr >> 4 & 0xF);
-			ch->timer = T1ReadWord(MMU.ARM7_REG, addr & ~1);
-			adjust_channel_timer(ch);
-			break;
-		case 0x0a:
-		case 0x0b:
-			ch = spu.ch + (addr >> 4 & 0xF);
-			ch->loop = T1ReadWord(MMU.ARM7_REG, addr & ~1);
-			break;
-		case 0x0c:
-		case 0x0e:
-		case 0x0d:
-		case 0x0f:
-			ch = spu.ch + (addr >> 4 & 0xF);
-			ch->length = (T1ReadLong(MMU.ARM7_REG, addr & ~3) & 0x003FFFFF);
-			break;
-#endif
-		}
-	}
-
-}
-
-
-void SPU_WriteWord(u32 addr, u16 x)
-{
-	addr &= 0x00000FFF;
-	T1WriteWord(MMU.ARM7_REG, addr, x);
-
-	if(addr < 0x500)
-	{
-		SChannel *ch;
-		switch(addr & 0x00F)
-		{
-		case 0x0:
-			ch = spu.ch + (addr >> 4 & 0xF);
-			ch->volume = (x & 0x007F);
-			ch->shift = (x >> 8 & 0x0003);
-			ch->hold = (x >> 15 & 0x0001);
-			set_channel_volume(ch);
-			break;
-		case 0x2:
-			ch = spu.ch + (addr >> 4 & 0xF);
-			ch->pan = (x & 0x007F);
-			ch->psg_duty = (x >> 8 & 0x0007);
-			ch->repeat = (x >> 11 & 0x0003);
-			ch->format = (x >> 13 & 0x0003);
-			set_channel_volume(ch);
-			if(x & 0x8000) start_channel(ch); else stop_channel(ch);
-			break;
-		case 0x08:
-			ch = spu.ch + (addr >> 4 & 0xF);
-			ch->timer = x;
-			adjust_channel_timer(ch);
-			break;
-		case 0x0a:
-			ch = spu.ch + (addr >> 4 & 0xF);
-			ch->loop = x;
-			break;
-#if !DISABLE_XSF_TESTS
-		case 0x04:
-		case 0x06:
-			ch = spu.ch + (addr >> 4 & 0xF);
-			ch->addr = (T1ReadLong(MMU.ARM7_REG, addr & ~3) & 0x07FFFFFF);
-			break;
-		case 0x0c:
-		case 0x0e:
-			ch = spu.ch + (addr >> 4 & 0xF);
-			ch->length = (T1ReadLong(MMU.ARM7_REG, addr & ~3) & 0x003FFFFF);
-			break;
-#endif
-		}
-	}
-}
-
-
-void SPU_WriteLong(u32 addr, u32 x)
-{
-	addr &= 0x00000FFF;
-	T1WriteLong(MMU.ARM7_REG, addr, x);
-
-	if(addr < 0x500)
-	{
-		SChannel *ch;
-		switch(addr & 0x00F)
-		{
-		case 0x0:
-			ch = spu.ch + (addr >> 4 & 0xF);
-			ch->volume = (x & 0x7F);
-			ch->shift = (x >> 8 & 0x00000003);
-			ch->hold = (x >> 15 & 0x00000001);
-			ch->pan = (x >> 16 & 0x0000007F);
-			ch->psg_duty = (x >> 24 & 0x00000007);
-			ch->repeat = (x >> 27 & 0x00000003);
-			ch->format = (x >> 29 & 0x00000003);
-			set_channel_volume(ch);
-			if(x & 0x80000000) start_channel(ch); else stop_channel(ch);
-			break;
-		case 0x04:
-			ch = spu.ch + (addr >> 4 & 0xF);
-			ch->addr = (x & 0x07FFFFFF);
-			break;
-		case 0x08:
-			ch = spu.ch + (addr >> 4 & 0xF);
-			ch->timer = (x & 0x0000FFFF);
-			ch->loop = (x >> 16 & 0x0000FFFF);
-			adjust_channel_timer(ch);
-			break;
-		case 0x0C:
-			ch = spu.ch + (addr >> 4 & 0xF);
-			ch->length = (x & 0x003FFFFF);
-			break;
-		}
-	}
+ sndbuf = new s32buffersize*2;
+ outbuf = new s16buffersize*2;
+ reset();
 }
 
-//////////////////////////////////////////////////////////////////////////////
+SPU_struct::~SPU_struct()
+{
+ if(sndbuf) delete sndbuf;
+ if(outbuf) delete outbuf;
+}
 
-u32 SPU_ReadLong(u32 addr)
-{
-	addr &= 0xFFF;
-	return T1ReadLong(MMU.ARM7_REG, addr);
-}
-
-static INLINE s32 clipping(s32 x, s32 min, s32 max) {
-#if 1 || defined(SIGNED_IS_NOT_2S_COMPLEMENT)
-	if (x < min)
-	{
-		return (min);
-	}
-	else if (x > max)
-	{
-		return (max);
-	}
-	return (x);
-#else
-	return x ^ ((-(x < min)) & (x ^ min)) ^ ((-(x > max)) & (x ^ max));
-#endif
+void SPU_DeInit(void)
+{
+ if(SNDCore)
+ SNDCore->DeInit();
+ SNDCore = 0;
+
+ delete SPU_core; SPU_core=0;
 }
 
-extern unsigned long dwChannelMute;
+//////////////////////////////////////////////////////////////////////////////
 
-static void decode_pcm8(SChannel *ch, s32 *out, int length)
+void SPU_struct::ShutUp()
 {
-	int oi;
-	double pos, inc, len;
-	if (!ch->buf8) return;
-
-	pos = ch->pos; inc = ch->inc; len = ch->loopend;
+ for(int i=0;i<16;i++)
+ channelsi.status = CHANSTAT_STOPPED;
+}
 
-	for(oi = 0; oi < length; oi++)
-	{
-		ch->output = ((s16)(s8)ch->buf8(int)pos) << 8;
-#if 0
-		if (dwChannelMute & (1 << ch->id))
-		{
-			out++;
-			out++;
-		}
-		else
-#endif
-		{
-			*(out++) += (ch->output * ch->volumel) >> VOL_SHIFT;
-			*(out++) += (ch->output * ch->volumer) >> VOL_SHIFT;
-		}
-		pos += inc;
-		if(pos >= len)
-		{
-			switch(ch->repeat)
-			{
-#if !DISABLE_XSF_TESTS
-			case 0:
-#endif
-			case 1:
-				pos += ch->looppos - len;
-				break;
-			default:
-				stop_channel(ch);
-				oi = length;
-				break;
-			}
-		}
-	}
+static FORCEINLINE void adjust_channel_timer(channel_struct *chan)
+{
+ chan->sampinc = (((double)ARM7_CLOCK) / (DESMUME_SAMPLE_RATE * 2)) / (double)(0x10000 - chan->timer);
+}
 
-	ch->pos = pos;
-	return;
+void SPU_struct::KeyProbe(int chan_num)
+{
+ channel_struct &thischan = channelschan_num;
+ if(thischan.status == CHANSTAT_STOPPED)
+ {
+ if(thischan.keyon && regs.masteren)
+ KeyOn(chan_num);
+ }
+ else if(thischan.status == CHANSTAT_PLAY)
+ {
+ if(!thischan.keyon || !regs.masteren)
+ KeyOff(chan_num);
+ }
 }
 
-static void decode_pcm16(SChannel *ch, s32 *out, int length)
+void SPU_struct::KeyOff(int channel)
 {
-	int oi;
-	double pos, inc, len;
+ channel_struct &thischan = channelschannel;
+ thischan.status = CHANSTAT_STOPPED;
+}
 
-	if (!ch->buf16) return;
+void SPU_struct::KeyOn(int channel)
+{
+ channel_struct &thischan = channelschannel;
+ thischan.status = CHANSTAT_PLAY;
+
+ thischan.totlength = thischan.length + thischan.loopstart;
+ adjust_channel_timer(&thischan);
+
+ switch(thischan.format)
+ {
+ case 0: // 8-bit
+ thischan.sampcnt = -3;
+ break;
+ case 1: // 16-bit
+ thischan.sampcnt = -3;
+ break;
+ case 2: // ADPCM
+ {
+ thischan.pcm16b = (s16)read16(thischan.addr);
+ thischan.pcm16b_last = thischan.pcm16b;
+ thischan.index = read08(thischan.addr + 2) & 0x7F;;
+ thischan.lastsampcnt = 7;
+ thischan.sampcnt = -3;
+ thischan.loop_index = K_ADPCM_LOOPING_RECOVERY_INDEX;
+ break;
+ }
+ case 3: // PSG
+ {
+ thischan.sampcnt = -1;
+ thischan.x = 0x7FFF;
+ break;
+ }
+ default: break;
+ }
+
+ thischan.double_totlength_shifted = (double)(thischan.totlength << format_shiftthischan.format);
+
+ if(thischan.format != 3)
+ {
+ if(thischan.double_totlength_shifted == 0)
+ {
+ thischan.status = CHANSTAT_STOPPED;
+ }
+ }
+}
 
-	pos = ch->pos; inc = ch->inc; len = ch->loopend;
+//////////////////////////////////////////////////////////////////////////////
 
-	for(oi = 0; oi < length; oi++)
-	{
-#ifdef WORDS_BIGENDIAN
-		ch->output = (s16)T1ReadWord((u8 *)ch->buf16, (int)pos << 1);
-#else
-		ch->output = (s16)ch->buf16(int)pos;
-#endif
-#if 0
-		if (dwChannelMute & (1 << ch->id))
-		{
-			out++;
-			out++;
-		}
-		else
-#endif
-		{
-			*(out++) += (ch->output * ch->volumel) >> VOL_SHIFT;
-			*(out++) += (ch->output * ch->volumer) >> VOL_SHIFT;
-		}
-		pos += inc;
-		if(pos >= len)
-		{
-			switch(ch->repeat)
-			{
-#if !DISABLE_XSF_TESTS
-			case 0:
-#endif
-			case 1:
-				pos += ch->looppos - len;
-				break;
-			default:
-				stop_channel(ch);
-				oi = length;
-				break;
-			}
-		}
-	}
-
-	ch->pos = pos;
-}
-
-static INLINE void decode_adpcmone_P4(SChannel *ch, int m)
-{
-	int i, ci0;
-	u8 *p;
-	s32 s;
-	int N;
-
-	i = ch->adpcm_pos;
-	p = (ch->buf8 + (i >> 1));
-	ci0 = ch->adpcm_index;
-	s = ch->adpcm;
-
-	if (ch->adpcm_loop_index < 0 && m >= ch->looppos)
-	{
-		ch->adpcm_loop_index = ci0;
-		ch->adpcm_loop = s;
-		ch->adpcm_loop_pos = i;
-	}
-
-	if(i++ & 1)
-	{
-		s32 x1, d1;
-		x1 = ((*(p++) >> 3) & 0x1F) | 1;
-		d1 = ((x1 & 0xF) * g_adpcm_multci0 & ~7);
-		ci0 = clipping((ci0 + g_adpcm_indexx1 & 0xE), 0, 88);
-#if 1 || defined(SIGNED_IS_NOT_2S_COMPLEMENT)
-		if(x1 & 0x10) d1 = -d1;
-#else
-		d1 -= (d1 + d1) & (-(((x1 >> 4) & 1)));
-#endif
+u8 SPU_struct::ReadByte(u32 addr)
+{
+ //individual channel regs
+ if ((addr & 0x0F00) == 0x0400)
+ {
+ u32 chan_num = (addr >> 4) & 0xF;
+ const channel_struct& thischan = channelschan_num;
+
+ switch (addr & 0xF)
+ {
+ case 0x0: return thischan.vol;
+ case 0x1: return (thischan.volumeDiv | (thischan.hold << 7));
+ case 0x2: return thischan.pan;
+ case 0x3: return (	thischan.waveduty
+ | (thischan.repeat << 3)
+ | (thischan.format << 5)
+ | ((thischan.status == CHANSTAT_PLAY)?0x80:0)
+ );
+ case 0x8: return thischan.timer >> 0;
+ case 0x9: return thischan.timer >> 8;
+ case 0xA: return thischan.loopstart >> 0;
+ case 0xB: return thischan.loopstart >> 8;
+ }
+ return 0;
+ }
+
+ switch(addr)
+ {
+ //SOUNDCNT
+ case 0x500: return regs.mastervol;
+ case 0x501: return (regs.ctl_left
+ | (regs.ctl_right << 2)
+ | (regs.ctl_ch1bypass << 4)
+ | (regs.ctl_ch3bypass << 5)
+ | (regs.masteren << 7)
+ );
+
+ //SOUNDBIAS
+ case 0x504: return regs.soundbias >> 0;
+ case 0x505: return regs.soundbias >> 8;
+
+ //SNDCAP0CNT/SNDCAP1CNT
+ case 0x508:
+ case 0x509:
+ {
+ u32 which = (addr - 0x508);
+ return regs.capwhich.add
+ | (regs.capwhich.source << 1)
+ | (regs.capwhich.oneshot << 2)
+ | (regs.capwhich.bits8 << 3)
+ | (regs.capwhich.runtime.running << 7);
+ }
+
+ //SNDCAP0DAD
+ case 0x510: return regs.cap0.dad >> 0;
+ case 0x511: return regs.cap0.dad >> 8;
+ case 0x512: return regs.cap0.dad >> 16;
+ case 0x513: return regs.cap0.dad >> 24;
+
+ //SNDCAP0LEN
+ case 0x514: return regs.cap0.len >> 0;
+ case 0x515: return regs.cap0.len >> 8;
+
+ //SNDCAP1DAD
+ case 0x518: return regs.cap1.dad >> 0;
+ case 0x519: return regs.cap1.dad >> 8;
+ case 0x51A: return regs.cap1.dad >> 16;
+ case 0x51B: return regs.cap1.dad >> 24;
+
+ //SNDCAP1LEN
+ case 0x51C: return regs.cap1.len >> 0;
+ case 0x51D: return regs.cap1.len >> 8;
+ } //switch on address
+
+ return 0;
+}
 
-		s = clipping((s + d1), (-32768 << 3), (32767 << 3));
-	}
-
-	N = (((m & ~1) - (i & ~1)) >> 1);
-	for(i = 0; i < N; i++)
-	{
-		s32 x0, d0;
-		s32 x1, d1;
-		int ci1;
-		x0 = ((*p << 1) & 0x1F) | 1;
-		x1 = ((*p >> 3) & 0x1F) | 1;
-		ci1 = clipping((ci0 + g_adpcm_indexx0 & 0xE), 0, 88);
-		d0 = ((x0 & 0xF) * g_adpcm_multci0 & ~7);
-		ci0 = clipping((ci1 + g_adpcm_indexx1 & 0xE), 0, 88);
-		d1 = ((x1 & 0xF) * g_adpcm_multci1 & ~7);
-#if 1 || defined(SIGNED_IS_NOT_2S_COMPLEMENT)
-		if(x0 & 0x10) d0 = -d0;
-		if(x1 & 0x10) d1 = -d1;
-#else
-		d0 -= (d0 + d0) & (-(((x0 >> 4) & 1)));
-		d1 -= (d1 + d1) & (-(((x1 >> 4) & 1)));
-#endif
-		s = clipping((s + d0), (-32768 << 3), (32767 << 3));
-		s = clipping((s + d1), (-32768 << 3), (32767 << 3));
-		p++;
-	}
-	if(m & 1)
-	{
-		s32 x0, d0;
-		x0 = ((*p << 1) & 0x1F) | 1;
-		d0 = ((x0 & 0xF) * g_adpcm_multci0 & ~7);
-		ci0 = clipping((ci0 + g_adpcm_indexx0 & 0xE), 0, 88);
-#if 1 || defined(SIGNED_IS_NOT_2S_COMPLEMENT)
-		if(x0 & 0x10) d0 = -d0;
-#else
-		d0 -= (d0 + d0) & (-(((x0 >> 4) & 1)));
-#endif
-		s = clipping((s + d0), (-32768 << 3), (32767 << 3));
-	}
-
-	ch->output = (s16)(s >> 3);
-
-	ch->adpcm = s;
-	ch->adpcm_index = ci0;
-	ch->adpcm_pos = m;
-}
-
-#if 0 // not used
-static INLINE void decode_adpcmone_XX(SChannel *ch, int m)
-{
-	int i, ci0;
-	u8 *p;
-	s32 s;
-
-	i = ch->adpcm_pos;
-	p = (ch->buf8 + (i >> 1));
-	ci0 = ch->adpcm_index;
-	s = ch->adpcm;
-
-	if (ch->adpcm_loop_index < 0 && m >= ch->looppos)
-	{
-		ch->adpcm_loop_index = ci0;
-		ch->adpcm_loop = s;
-		ch->adpcm_loop_pos = i;
-	}
-
-	while (i < m)
-	{
-		s32 x1, d1;
-		x1 = ((s32)*p) >> ((i & 1) << 2) & 0xf;
-		x1 = x1 + x1 + 1;
-		d1 = ((x1 & 0xF) * g_adpcm_multci0 & ~7);
-		ci0 = clipping((ci0 + g_adpcm_indexx1 & 0xE), 0, 88);
-#if 1 || defined(SIGNED_IS_NOT_2S_COMPLEMENT)
-		if(x1 & 0x10) d1 = -d1;
-#else
-		d1 -= (d1 + d1) & (-(((x1 >> 4) & 1)));
-#endif
+u16 SPU_struct::ReadWord(u32 addr)
+{
+ //individual channel regs
+ if ((addr & 0x0F00) == 0x0400)
+ {
+ u32 chan_num = (addr >> 4) & 0xF;
+ const channel_struct& thischan = channelschan_num;
+
+ switch (addr & 0xF)
+ {
+ case 0x0: return	(thischan.vol
+ | (thischan.volumeDiv << 8)
+ | (thischan.hold << 15)
+ );
+ case 0x2: return	(thischan.pan
+ | (thischan.waveduty << 8)
+ | (thischan.repeat << 11)
+ | (thischan.format << 13)
+ | ((thischan.status == CHANSTAT_PLAY)?(1 << 15):0)
+ );
+ case 0x8: return thischan.timer;
+ case 0xA: return thischan.loopstart;
+ } //switch on individual channel regs
+ return 0;
+ }
+
+ switch(addr)
+ {
+ //SOUNDCNT
+ case 0x500: return	(regs.mastervol
+ | (regs.ctl_left << 8)
+ | (regs.ctl_right << 10)
+ | (regs.ctl_ch1bypass << 12)
+ | (regs.ctl_ch3bypass << 13)
+ | (regs.masteren << 15)
+ );
+
+ //SOUNDBIAS
+ case 0x504: return regs.soundbias;
+
+ //SNDCAP0CNT/SNDCAP1CNT
+ case 0x508:
+ {
+ u8 val0 =	regs.cap0.add
+ | (regs.cap0.source << 1)
+ | (regs.cap0.oneshot << 2)
+ | (regs.cap0.bits8 << 3)
+ | (regs.cap0.runtime.running << 7);
+ u8 val1 =	regs.cap1.add
+ | (regs.cap1.source << 1)
+ | (regs.cap1.oneshot << 2)
+ | (regs.cap1.bits8 << 3)
+ | (regs.cap1.runtime.running << 7);
+ return (u16)(val0 | (val1 << 8));
+ }
+
+ //SNDCAP0DAD
+ case 0x510: return regs.cap0.dad >> 0;
+ case 0x512: return regs.cap0.dad >> 16;
+
+ //SNDCAP0LEN
+ case 0x514: return regs.cap0.len;
+
+ //SNDCAP1DAD
+ case 0x518: return regs.cap1.dad >> 0;
+ case 0x51A: return regs.cap1.dad >> 16;
+
+ //SNDCAP1LEN
+ case 0x51C: return regs.cap1.len;
+ } //switch on address
+
+ return 0;
+}
 
-		s = clipping((s + d1), (-32768 << 3), (32767 << 3));
-		p += (i & 1);
-		i++;
-	}
+u32 SPU_struct::ReadLong(u32 addr)
+{
+ //individual channel regs
+ if ((addr & 0x0F00) == 0x0400)
+ {
+ u32 chan_num = (addr >> 4) & 0xF;
+ channel_struct &thischan=channelschan_num;
+
+ switch (addr & 0xF)
+ {
+ case 0x0: return	(thischan.vol
+ | (thischan.volumeDiv << 8)
+ | (thischan.hold << 15)
+ | (thischan.pan << 16)
+ | (thischan.waveduty << 24)
+ | (thischan.repeat << 27)
+ | (thischan.format << 29)
+ | ((thischan.status == CHANSTAT_PLAY)?(1 << 31):0)
+ );
+ case 0x8: return (thischan.timer | (thischan.loopstart << 16));
+ } //switch on individual channel regs
+ return 0;
+ }
+
+ switch(addr)
+ {
+ //SOUNDCNT
+ case 0x500: return	(regs.mastervol
+ | (regs.ctl_left << 8)
+ | (regs.ctl_right << 10)
+ | (regs.ctl_ch1bypass << 12)
+ | (regs.ctl_ch3bypass << 13)
+ | (regs.masteren << 15)
+ );
+
+ //SOUNDBIAS
+ case 0x504: return (u32)regs.soundbias;
+
+ //SNDCAP0CNT/SNDCAP1CNT
+ case 0x508:
+ {
+ u8 val0 =	regs.cap0.add
+ | (regs.cap0.source << 1)
+ | (regs.cap0.oneshot << 2)
+ | (regs.cap0.bits8 << 3)
+ | (regs.cap0.runtime.running << 7);
+ u8 val1 =	regs.cap1.add
+ | (regs.cap1.source << 1)
+ | (regs.cap1.oneshot << 2)
+ | (regs.cap1.bits8 << 3)
+ | (regs.cap1.runtime.running << 7);
+ return (u32)(val0 | (val1 << 8));
+ }
+
+ //SNDCAP0DAD
+ case 0x510: return regs.cap0.dad;
+
+ //SNDCAP0LEN
+ case 0x514: return (u32)regs.cap0.len;
+
+ //SNDCAP1DAD
+ case 0x518: return regs.cap1.dad;
+
+ //SNDCAP1LEN
+ case 0x51C: return (u32)regs.cap1.len;
+ } //switch on address
+
+ return 0;
+}
 
-	ch->output = (s16)(s >> 3);
+SPUFifo::SPUFifo()
+{
+ reset();
+}
 
-	ch->adpcm = s;
-	ch->adpcm_index = ci0;
-	ch->adpcm_pos = m;
+void SPUFifo::reset()
+{
+ head = tail = size = 0;
 }
-#endif
 
-#define decode_adpcmone decode_adpcmone_P4
+void SPUFifo::enqueue(s16 val)
+{
+ if(size==16) return;
+ buffertail = val;
+ tail++;
+ tail &= 15;
+ size++;
+}
 
-static void decode_adpcm(SChannel *ch, s32 *out, int length)
+s16 SPUFifo::dequeue()
 {
-	int oi;
-	double pos, inc, len;
-	if (!ch->buf8) return;
+ if(size==0) return 0;
+ head++;
+ head &= 15;
+ s16 ret = bufferhead;
+ size--;
+ return ret;
+}
 
-	pos = ch->pos; inc = ch->inc; len = ch->loopend;
+void SPU_struct::ProbeCapture(int which)
+{
+ //VERY UNTESTED -- HOW MUCH OF THIS RESETS, AND WHEN?
+
+ if(!regs.capwhich.active)
+ {
+ regs.capwhich.runtime.running = 0;
+ return;
+ }
+
+ REGS::CAP &cap = regs.capwhich;
+ cap.runtime.running = 1;
+ cap.runtime.curdad = cap.dad;
+ u32 len = cap.len;
+ if(len==0) len=1;
+ cap.runtime.maxdad = cap.dad + len*4;
+ cap.runtime.sampcnt = 0;
+ cap.runtime.fifo.reset();
+}
 
-	for(oi = 0; oi < length; oi++)
-	{
-		int m = (int)pos;
-		int i = ch->adpcm_pos;
-		if(i < m)
-			decode_adpcmone(ch, m);
+void SPU_struct::WriteByte(u32 addr, u8 val)
+{
+ //individual channel regs
+ if ((addr & 0x0F00) == 0x0400)
+ {
+ u8 chan_num = (addr >> 4) & 0xF;
+ channel_struct &thischan = channelschan_num;
+
+ switch (addr & 0x000F)
+ {
+ case 0x0: thischan.vol = (val & 0x7F); break;
+ case 0x1:
+ thischan.volumeDiv = (val & 0x03);
+ thischan.hold = (val >> 7) & 0x01;
+ break;
+ case 0x2: thischan.pan = (val & 0x7F); break;
+ case 0x3:
+ thischan.waveduty = (val & 0x07);
+ thischan.repeat = (val >> 3) & 0x03;
+ thischan.format = (val >> 5) & 0x03;
+ thischan.keyon = (val >> 7) & 0x01;
+ KeyProbe(chan_num);
+ break;
+ case 0x4: thischan.addr &= 0xFFFFFF00; thischan.addr |= (val & 0xFC); break;
+ case 0x5: thischan.addr &= 0xFFFF00FF; thischan.addr |= (val << 8); break;
+ case 0x6: thischan.addr &= 0xFF00FFFF; thischan.addr |= (val << 16); break;
+ case 0x7: thischan.addr &= 0x00FFFFFF; thischan.addr |= ((val&7) << 24); break; //only 27 bits of this register are used
+ case 0x8: thischan.timer &= 0xFF00; thischan.timer |= (val << 0); adjust_channel_timer(&thischan); break;
+ case 0x9: thischan.timer &= 0x00FF; thischan.timer |= (val << 8); adjust_channel_timer(&thischan); break;
+
+ case 0xA: thischan.loopstart &= 0xFF00; thischan.loopstart |= (val << 0); break;
+ case 0xB: thischan.loopstart &= 0x00FF; thischan.loopstart |= (val << 8); break;
+ case 0xC: thischan.length &= 0xFFFFFF00; thischan.length |= (val << 0); break;
+ case 0xD: thischan.length &= 0xFFFF00FF; thischan.length |= (val << 8); break;
+ case 0xE: thischan.length &= 0xFF00FFFF; thischan.length |= ((val & 0x3F) << 16); //only 22 bits of this register are used
+ case 0xF: break;
+
+ } //switch on individual channel regs
+
+ return;
+ }
+
+ switch(addr)
+ {
+ //SOUNDCNT
+ case 0x500: regs.mastervol = (val & 0x7F); break;
+ case 0x501:
+ regs.ctl_left = (val >> 0) & 3;
+ regs.ctl_right = (val >> 2) & 3;
+ regs.ctl_ch1bypass = (val >> 4) & 1;
+ regs.ctl_ch3bypass = (val >> 5) & 1;
+ regs.masteren = (val >> 7) & 1;
+ break;
+
+ //SOUNDBIAS
+ case 0x504: regs.soundbias &= 0xFF00; regs.soundbias |= (val << 0); break;
+ case 0x505: regs.soundbias &= 0x00FF; regs.soundbias |= ((val&3) << 8); break;
+
+ //SNDCAP0CNT/SNDCAP1CNT
+ case 0x508:
+ case 0x509:
+ {
+ u32 which = (addr - 0x508);
+ regs.capwhich.add = BIT0(val);
+ regs.capwhich.source = BIT1(val);
+ regs.capwhich.oneshot = BIT2(val);
+ regs.capwhich.bits8 = BIT3(val);
+ regs.capwhich.active = BIT7(val);
+ ProbeCapture(which);
+ break;
+ }
+
+ //SNDCAP0DAD
+ case 0x510: regs.cap0.dad &= 0xFFFFFF00; regs.cap0.dad |= (val & 0xFC); break;
+ case 0x511: regs.cap0.dad &= 0xFFFF00FF; regs.cap0.dad |= (val << 8); break;
+ case 0x512: regs.cap0.dad &= 0xFF00FFFF; regs.cap0.dad |= (val << 16); break;
+ case 0x513: regs.cap0.dad &= 0x00FFFFFF; regs.cap0.dad |= ((val&7) << 24); break;
+
+ //SNDCAP0LEN
+ case 0x514: regs.cap0.len &= 0xFF00; regs.cap0.len |= (val << 0); break;
+ case 0x515: regs.cap0.len &= 0x00FF; regs.cap0.len |= (val << 8); break;
+
+ //SNDCAP1DAD
+ case 0x518: regs.cap1.dad &= 0xFFFFFF00; regs.cap1.dad |= (val & 0xFC); break;
+ case 0x519: regs.cap1.dad &= 0xFFFF00FF; regs.cap1.dad |= (val << 8); break;
+ case 0x51A: regs.cap1.dad &= 0xFF00FFFF; regs.cap1.dad |= (val << 16); break;
+ case 0x51B: regs.cap1.dad &= 0xFF000000; regs.cap1.dad |= ((val&7) << 24); break;
+
+ //SNDCAP1LEN
+ case 0x51C: regs.cap1.len &= 0xFF00; regs.cap1.len |= (val << 0); break;
+ case 0x51D: regs.cap1.len &= 0x00FF; regs.cap1.len |= (val << 8); break;
+ } //switch on address
+}
 
-#if 0
-		if (dwChannelMute & (1 << ch->id))
-		{
-			out++;
-			out++;
-		}
-		else
-#endif
-		{
-			*(out++) += (ch->output * ch->volumel) >> VOL_SHIFT;
-			*(out++) += (ch->output * ch->volumer) >> VOL_SHIFT;
-		}
-		pos += inc;
-		if(pos >= len)
-		{
-			switch(ch->repeat)
-			{
-			case 1:
-				if (ch->adpcm_loop_index >= 0)
-				{
-					pos += ch->looppos - len;
-					ch->adpcm_pos = ch->adpcm_loop_pos;
-					ch->adpcm_index = ch->adpcm_loop_index;
-					ch->adpcm = ch->adpcm_loop;
-					break;
-				}
-#if !DISABLE_XSF_TESTS
-			case 0:
-				pos = 9 - len;
-#ifdef WORDS_BIGENDIAN
-				ch->adpcm = ((s32)(s16)T1ReadWord((u8 *)ch->buf8, 0)) << 3;
-#else
-				ch->adpcm = ((s32)*(s16 *)ch->buf8) << 3;
-#endif
-				ch->adpcm_index = (ch->buf82 & 0x7F);
-				ch->adpcm_pos = 8;
-				break;
-#endif
-			default:
-				stop_channel(ch);
-				oi = length;
-				break;
-			}
-		}
-	}
-	ch->pos = pos;
-}
-
-static void decode_psg(SChannel *ch, s32 *out, int length)
-{
-	int oi;
-
-	if(ch->id < 14)
-	{
-		// NOTE: square wave.
-		double pos, inc;
-		pos = ch->pos; inc = ch->inc;
-		for(oi = 0; oi < length; oi++)
-		{
-			ch->output = (s16)g_psg_dutych->psg_duty(int)pos & 0x00000007;
-#if 0
-			if (dwChannelMute & (1 << ch->id))
-			{
-				out++;
-				out++;
-			}
-			else
-#endif
-			{
-				*(out++) += (ch->output * ch->volumel) >> VOL_SHIFT;
-				*(out++) += (ch->output * ch->volumer) >> VOL_SHIFT;
-			}
-			pos += inc;
-		}
-		ch->pos = pos;
-	}
-	else
-	{
-		// NOTE: noise.
-		u16 X;
-		X = (u16)ch->pos;
-		for(oi = 0; oi < length; oi++)
-		{
-			if(X & 1)
-			{
-				X >>= 1;
-				X ^= 0x6000;
-				ch->output = -0x8000;
-			}
-			else
-			{
-				X >>= 1;
-				ch->output = +0x7FFF;
-			}
-		}
-#if 0
-		if (dwChannelMute & (1 << ch->id))
-		{
-			out++;
-			out++;
-		}
-		else
-#endif
-		{
-			*(out++) += (ch->output * ch->volumel) >> VOL_SHIFT;
-			*(out++) += (ch->output * ch->volumer) >> VOL_SHIFT;
-		}
-		ch->pos = X;
-	}
-}
-
-
-
-void SPU_EmulateSamples(u32 numsamples)
-{
-	u32 sizesmp = numsamples;
-	u32 sizebyte = sizesmp << 2;
-	if (sizebyte > spu.buflen * sizeof(s16)) sizebyte = spu.buflen * sizeof(s16);
-	sizesmp = sizebyte >> 2;
-	sizebyte = sizesmp << 2;
-	if (sizesmp > 0)
-	{
-		unsigned i;
-		SChannel *ch = spu.ch;
-		memset(spu.pmixbuf, 0, spu.buflen * sizeof(s32));
-		for (i = 0; i < 16; i++)
-		{
-			if (ch->status)
-			{
-				switch (ch->format)
-				{
-				case 0:
-					decode_pcm8(ch, spu.pmixbuf, sizesmp);
-					break;
-				case 1:
-					decode_pcm16(ch, spu.pmixbuf, sizesmp);
-					break;
-				case 2:
-					decode_adpcm(ch, spu.pmixbuf, sizesmp);
-					break;
-				case 3:
-					decode_psg(ch, spu.pmixbuf, sizesmp);
-					break;
-				}
-			}
-			ch++;
-		}
-		for (i = 0; i < sizesmp * 2; i++)
-			spu.pclipingbufi = (s16)clipping(spu.pmixbufi, -0x8000, 0x7fff);
-		SNDCore->UpdateAudio(spu.pclipingbuf, sizesmp);
-	}
-}
-
-void SPU_Emulate(void)
-{
-	SPU_EmulateSamples(SNDCore->GetAudioSpace());
+void SPU_struct::WriteWord(u32 addr, u16 val)
+{
+ //individual channel regs
+ if ((addr & 0x0F00) == 0x0400)
+ {
+ u32 chan_num = (addr >> 4) & 0xF;
+ channel_struct &thischan=channelschan_num;
+
+ switch (addr & 0xF)
+ {
+ case 0x0:
+ thischan.vol = (val & 0x7F);
+ thischan.volumeDiv = (val >> 8) & 0x3;
+ thischan.hold = (val >> 15) & 0x1;
+ break;
+ case 0x2:
+ thischan.pan = (val & 0x7F);
+ thischan.waveduty = (val >> 8) & 0x7;
+ thischan.repeat = (val >> 11) & 0x3;
+ thischan.format = (val >> 13) & 0x3;
+ thischan.keyon = (val >> 15) & 0x1;
+ KeyProbe(chan_num);
+ break;
+ case 0x4: thischan.addr &= 0xFFFF0000; thischan.addr |= (val & 0xFFFC); break;
+ case 0x6: thischan.addr &= 0x0000FFFF; thischan.addr |= ((val & 0x07FF) << 16); break;
+ case 0x8: thischan.timer = val; adjust_channel_timer(&thischan); break;
+ case 0xA: thischan.loopstart = val; break;
+ case 0xC: thischan.length &= 0xFFFF0000; thischan.length |= (val << 0); break;
+ case 0xE: thischan.length &= 0x0000FFFF; thischan.length |= ((val & 0x003F) << 16); break;
+ } //switch on individual channel regs
+ return;
+ }
+
+ switch (addr)
+ {
+ //SOUNDCNT
+ case 0x500:
+ regs.mastervol = (val & 0x7F);
+ regs.ctl_left = (val >> 8) & 0x03;
+ regs.ctl_right = (val >> 10) & 0x03;
+ regs.ctl_ch1bypass = (val >> 12) & 0x01;
+ regs.ctl_ch3bypass = (val >> 13) & 0x01;
+ regs.masteren = (val >> 15) & 0x01;
+ for(u8 i=0; i<16; i++)
+ KeyProbe(i);
+ break;
+
+ //SOUNDBIAS
+ case 0x504: regs.soundbias = (val & 0x3FF); break;
+
+ //SNDCAP0CNT/SNDCAP1CNT
+ case 0x508:
+ {
+ regs.cap0.add = BIT0(val);
+ regs.cap0.source = BIT1(val);
+ regs.cap0.oneshot = BIT2(val);
+ regs.cap0.bits8 = BIT3(val);
+ regs.cap0.active = BIT7(val);
+ ProbeCapture(0);
+
+ regs.cap1.add = BIT8(val);
+ regs.cap1.source = BIT9(val);
+ regs.cap1.oneshot = BIT10(val);
+ regs.cap1.bits8 = BIT11(val);
+ regs.cap1.active = BIT15(val);
+ ProbeCapture(1);
+ break;
+ }
+
+ //SNDCAP0DAD
+ case 0x510: regs.cap0.dad &= 0xFFFF0000; regs.cap0.dad |= (val & 0xFFFC); break;
+ case 0x512: regs.cap0.dad &= 0x0000FFFF; regs.cap0.dad |= ((val & 0x07FF) << 16); break;
+
+ //SNDCAP0LEN
+ case 0x514: regs.cap0.len = val; break;
+
+ //SNDCAP1DAD
+ case 0x518: regs.cap1.dad &= 0xFFFF0000; regs.cap1.dad |= (val & 0xFFFC); break;
+ case 0x51A: regs.cap1.dad &= 0x0000FFFF; regs.cap1.dad |= ((val & 0x07FF) << 16); break;
+
+ //SNDCAP1LEN
+ case 0x51C: regs.cap1.len = val; break;
+ } //switch on address
 }
 
+void SPU_struct::WriteLong(u32 addr, u32 val)
+{
+ //individual channel regs
+ if ((addr & 0x0F00) == 0x0400)
+ {
+ u32 chan_num = (addr >> 4) & 0xF;
+ channel_struct &thischan=channelschan_num;
+
+ switch (addr & 0xF)
+ {
+ case 0x0:
+ thischan.vol = val & 0x7F;
+ thischan.volumeDiv = (val >> 8) & 0x3;
+ thischan.hold = (val >> 15) & 0x1;
+ thischan.pan = (val >> 16) & 0x7F;
+ thischan.waveduty = (val >> 24) & 0x7;
+ thischan.repeat = (val >> 27) & 0x3;
+ thischan.format = (val >> 29) & 0x3;
+ thischan.keyon = (val >> 31) & 0x1;
+ KeyProbe(chan_num);
+ break;
+
+ case 0x4: thischan.addr = (val & 0x07FFFFFC); break;
+ case 0x8:
+ thischan.timer = (val & 0xFFFF);
+ thischan.loopstart = ((val >> 16) & 0xFFFF);
+ adjust_channel_timer(&thischan);
+ break;
+
+ case 0xC: thischan.length = (val & 0x003FFFFF); break; //only 22 bits of this register are used
+ } //switch on individual channel regs
+ return;
+ }
+
+ switch(addr)
+ {
+ //SOUNDCNT
+ case 0x500:
+ regs.mastervol = (val & 0x7F);
+ regs.ctl_left = ((val >> 8) & 3);
+ regs.ctl_right = ((val>>10) & 3);
+ regs.ctl_ch1bypass = ((val >> 12) & 1);
+ regs.ctl_ch3bypass = ((val >> 13) & 1);
+ regs.masteren = ((val >> 15) & 1);
+ for(u8 i=0; i<16; i++)
+ KeyProbe(i);
+ break;
+
+ //SOUNDBIAS
+ case 0x504: regs.soundbias = (val & 0x3FF);
+
+ //SNDCAP0CNT/SNDCAP1CNT
+ case 0x508:
+ regs.cap0.add = BIT0(val);
+ regs.cap0.source = BIT1(val);
+ regs.cap0.oneshot = BIT2(val);
+ regs.cap0.bits8 = BIT3(val);
+ regs.cap0.active = BIT7(val);
+ ProbeCapture(0);
+
+ regs.cap1.add = BIT8(val);
+ regs.cap1.source = BIT9(val);
+ regs.cap1.oneshot = BIT10(val);
+ regs.cap1.bits8 = BIT11(val);
+ regs.cap1.active = BIT15(val);
+ ProbeCapture(1);
+ break;
+
+ //SNDCAP0DAD
+ case 0x510: regs.cap0.dad = (val & 0x07FFFFFC); break;
+
+ //SNDCAP0LEN
+ case 0x514: regs.cap0.len = (val & 0xFFFF); break;
+
+ //SNDCAP1DAD
+ case 0x518: regs.cap1.dad = (val & 0x07FFFFFC); break;
+
+ //SNDCAP1LEN
+ case 0x51C: regs.cap1.len = (val & 0xFFFF); break;
+ } //switch on address
+}
 
 //////////////////////////////////////////////////////////////////////////////
-// Dummy Sound Interface
-//////////////////////////////////////////////////////////////////////////////
 
-static int SNDDummyInit(int buffersize)
+static FORCEINLINE void FetchPSGData(channel_struct *chan, s32 *data)
 {
- return 0;
+ if (chan->sampcnt < 0)
+ {
+ *data = 0;
+ return;
+ }
+
+ if(chan->num < 8)
+ {
+ *data = 0;
+ }
+ else if(chan->num < 14)
+ {
+ *data = (s32)wavedutytblchan->waveduty(sputrunc(chan->sampcnt)) & 0x7;
+ }
+ else
+ {
+ if(chan->lastsampcnt == sputrunc(chan->sampcnt))
+ {
+ *data = (s32)chan->psgnoise_last;
+ return;
+ }
+
+ u32 max = sputrunc(chan->sampcnt);
+ for(u32 i = chan->lastsampcnt; i < max; i++)
+ {
+ if(chan->x & 0x1)
+ {
+ chan->x = (chan->x >> 1) ^ 0x6000;
+ chan->psgnoise_last = -0x7FFF;
+ }
+ else
+ {
+ chan->x >>= 1;
+ chan->psgnoise_last = 0x7FFF;
+ }
+ }
+
+ chan->lastsampcnt = sputrunc(chan->sampcnt);
+
+ *data = (s32)chan->psgnoise_last;
+ }
 }
 
 //////////////////////////////////////////////////////////////////////////////
 
-static void SNDDummyDeInit()
+static FORCEINLINE void MixL(SPU_struct* SPU, channel_struct *chan, s32 data)
 {
+ data = spumuldiv7(data, chan->vol) >> volume_shiftchan->volumeDiv;
+ SPU->sndbufSPU->bufpos<<1 += data;
 }
 
-//////////////////////////////////////////////////////////////////////////////
+static FORCEINLINE void MixR(SPU_struct* SPU, channel_struct *chan, s32 data)
+{
+ data = spumuldiv7(data, chan->vol) >> volume_shiftchan->volumeDiv;
+ SPU->sndbuf(SPU->bufpos<<1)+1 += data;
+}
 
-static void SNDDummyUpdateAudio(s16 *buffer, u32 num_samples)
+static FORCEINLINE void MixLR(SPU_struct* SPU, channel_struct *chan, s32 data)
 {
+ data = spumuldiv7(data, chan->vol) >> volume_shiftchan->volumeDiv;
+ SPU->sndbufSPU->bufpos<<1 += spumuldiv7(data, 127 - chan->pan);
+ SPU->sndbuf(SPU->bufpos<<1)+1 += spumuldiv7(data, chan->pan);
 }
 
 //////////////////////////////////////////////////////////////////////////////
 
-static u32 SNDDummyGetAudioSpace()
+template<int FORMAT> static FORCEINLINE void TestForLoop(SPU_struct *SPU, channel_struct *chan)
 {
- return 735;
+ const int shift = (FORMAT == 0 ? 2 : 1);
+
+ chan->sampcnt += chan->sampinc;
+
+ if (chan->sampcnt > chan->double_totlength_shifted)
+ {
+ // Do we loop? Or are we done?
+ if (chan->repeat == 1)
+ {
+ while (chan->sampcnt > chan->double_totlength_shifted) {
+ chan->sampcnt -= chan->double_totlength_shifted - (double)(chan->loopstart << shift);
+ }
+ }
+ else
+ {
+ SPU->KeyOff(chan->num);
+ SPU->bufpos = SPU->buflength;
+ }
+ }
 }
 
-//////////////////////////////////////////////////////////////////////////////
+static FORCEINLINE void TestForLoop2(SPU_struct *SPU, channel_struct *chan)
+{
+ // Minimum length (the sum of PNT+LEN) is 4 words (16 bytes),
+ // smaller values (0..3 words) are causing hang-ups
+ // (busy bit remains set infinite, but no sound output occurs).
+ // fix: 7th Dragon (JP) - http://sourceforge.net/p/desmume/bugs/1357/
+ if (chan->totlength < 4) return;
+
+ chan->sampcnt += chan->sampinc;
+
+ if (chan->sampcnt > chan->double_totlength_shifted)
+ {
+ // Do we loop? Or are we done?
+ if (chan->repeat == 1)
+ {
+ double step = (chan->double_totlength_shifted - (double)(chan->loopstart << 3));
+
+ while (chan->sampcnt > chan->double_totlength_shifted) chan->sampcnt -= step;
+
+ if(chan->loop_index == K_ADPCM_LOOPING_RECOVERY_INDEX)
+ {
+ chan->pcm16b = (s16)read16(chan->addr);
+ chan->index = read08(chan->addr+2) & 0x7F;
+ chan->lastsampcnt = 7;
+ }
+ else
+ {
+ chan->pcm16b = chan->loop_pcm16b;
+ chan->index = chan->loop_index;
+ chan->lastsampcnt = (chan->loopstart << 3);
+ }
+ }
+ else
+ {
+ chan->status = CHANSTAT_STOPPED;
+ SPU->KeyOff(chan->num);
+ SPU->bufpos = SPU->buflength;
+ }
+ }
+}
 
-static void SNDDummyMuteAudio()
+template<int CHANNELS> FORCEINLINE static void SPU_Mix(SPU_struct* SPU, channel_struct *chan, s32 data)
 {
+ switch(CHANNELS)
+ {
+ case -1: break; // not reached
+ case 0: MixL(SPU, chan, data); break;
+ case 1: MixLR(SPU, chan, data); break;
+ case 2: MixR(SPU, chan, data); break;
+ }
+ SPU->lastdata = data;
 }
 
-//////////////////////////////////////////////////////////////////////////////
+//WORK
+ template<int FORMAT, int CHANNELS>
+FORCEINLINE static void ____SPU_ChanUpdate(SPU_struct* const SPU, channel_struct* const chan)
+{
+ for (; SPU->bufpos < SPU->buflength; SPU->bufpos++)
+ {
+ if(CHANNELS != -1)
+ {
+ s32 data;
+ if (chan->sampcnt < 0) {
+ data = 0;
+ } else if (FORMAT == 3) {
+ FetchPSGData(chan, &data);
+ } else {
+ const SampleData& sample = spuSampleCache.getSample(chan->addr, chan->loopstart, chan->length, SampleData::Format(FORMAT));
+ data = sample.sampleAt(chan->sampcnt, IInterpolator::allInterpolatorsCommonSettings.spuInterpolationMode);
+ }
+ SPU_Mix<CHANNELS>(SPU, chan, data);
+ }
+
+ switch(FORMAT) {
+ case 0: case 1: TestForLoop<FORMAT>(SPU, chan); break;
+ case 2: TestForLoop2(SPU, chan); break;
+ case 3: chan->sampcnt += chan->sampinc; break;
+ }
+ }
+}
+
+template<int FORMAT>
+FORCEINLINE static void ___SPU_ChanUpdate(const bool actuallyMix, SPU_struct* const SPU, channel_struct* const chan)
+{
+ if(!actuallyMix)
+ ____SPU_ChanUpdate<FORMAT,-1>(SPU,chan);
+ else if (chan->pan == 0)
+ ____SPU_ChanUpdate<FORMAT,0>(SPU,chan);
+ else if (chan->pan == 127)
+ ____SPU_ChanUpdate<FORMAT,2>(SPU,chan);
+ else
+ ____SPU_ChanUpdate<FORMAT,1>(SPU,chan);
+}
 
-static void SNDDummyUnMuteAudio()
+FORCEINLINE static void _SPU_ChanUpdate(const bool actuallyMix, SPU_struct* const SPU, channel_struct* const chan)
 {
+ switch(chan->format)
+ {
+ case 0: ___SPU_ChanUpdate<0>(actuallyMix, SPU, chan); break;
+ case 1: ___SPU_ChanUpdate<1>(actuallyMix, SPU, chan); break;
+ case 2: ___SPU_ChanUpdate<2>(actuallyMix, SPU, chan); break;
+ case 3: ___SPU_ChanUpdate<3>(actuallyMix, SPU, chan); break;
+ default: assert(false);
+ }
+}
+
+//ENTERNEW
+static void SPU_MixAudio_Advanced(bool actuallyMix, SPU_struct *SPU, int length)
+{
+ //the advanced spu function correctly handles all sound control mixing options, as well as capture
+ //this code is not entirely optimal, as it relies on sort of manhandling the core mixing functions
+ //in order to get the results it needs.
+
+ //THIS IS MAX HACKS!!!!
+ //AND NEEDS TO BE REWRITTEN ALONG WITH THE DEEPEST PARTS OF THE SPU
+ //ONCE WE KNOW THAT IT WORKS
+
+ //BIAS gets ignored since our spu is still not bit perfect,
+ //and it doesnt matter for purposes of capture
+
+ //-----------DEBUG CODE
+ bool skipcap = false;
+ //-----------------
+
+ s32 samp02 = {0,0};
+
+ //believe it or not, we are going to do this one sample at a time.
+ //like i said, it is slower.
+ for (int samp = 0; samp < length; samp++)
+ {
+ SPU->sndbuf0 = 0;
+ SPU->sndbuf1 = 0;
+ SPU->buflength = 1;
+
+ s32 capmix2 = {0,0};
+ s32 mix2 = {0,0};
+ s32 chanout16;
+ s32 submix32;
+
+ //generate each channel, and helpfully mix it at the same time
+ for (int i = 0; i < 16; i++)
+ {
+ channel_struct *chan = &SPU->channelsi;
+
+ if (chan->status == CHANSTAT_PLAY)
+ {
+ SPU->bufpos = 0;
+
+ bool bypass = false;
+ if (i==1 && SPU->regs.ctl_ch1bypass) bypass=true;
+ if (i==3 && SPU->regs.ctl_ch3bypass) bypass=true;
+
+
+ //output to mixer unless we are bypassed.
+ //dont output to mixer if the user muted us
+ bool outputToMix = true;
+ if (CommonSettings.spu_muteChannelsi) outputToMix = false;
+ if (bypass) outputToMix = false;
+ bool outputToCap = outputToMix;
+ if (CommonSettings.spu_captureMuted && !bypass) outputToCap = true;
+
+ //channels 1 and 3 should probably always generate their audio
+ //internally at least, just in case they get used by the spu output
+ bool domix = outputToCap || outputToMix || i==1 || i==3;
+
+ //clear the output buffer since this is where _SPU_ChanUpdate wants to accumulate things
+ SPU->sndbuf0 = SPU->sndbuf1 = 0;
+
+ //get channel's next output sample.
+ _SPU_ChanUpdate(domix, SPU, chan);
+ chanouti = SPU->lastdata >> volume_shiftchan->volumeDiv;
+
+ //save the panned results
+ submixi*2 = SPU->sndbuf0;
+ submixi*2+1 = SPU->sndbuf1;
+
+ //send sample to our capture mix
+ if (outputToCap)
+ {
+ capmix0 += submixi*2;
+ capmix1 += submixi*2+1;
+ }
+
+ //send sample to our main mixer
+ if (outputToMix)
+ {
+ mix0 += submixi*2;
+ mix1 += submixi*2+1;
+ }
+ }
+ else
+ {
+ chanouti = 0;
+ submixi*2 = 0;
+ submixi*2+1 = 0;
+ }
+ } //foreach channel
+
+ s32 mixout2 = {mix0,mix1};
+ s32 capmixout2 = {capmix0,capmix1};
+ s32 sndout2 = { 0, 0 };
+ s32 capout2;
+
+ //create SPU output
+ switch (SPU->regs.ctl_left)
+ {
+ case SPU_struct::REGS::LOM_LEFT_MIXER: sndout0 = mixout0; break;
+ case SPU_struct::REGS::LOM_CH1: sndout0 = submix1*2+0; break;
+ case SPU_struct::REGS::LOM_CH3: sndout0 = submix3*2+0; break;
+ case SPU_struct::REGS::LOM_CH1_PLUS_CH3: sndout0 = submix1*2+0 + submix3*2+0; break;
+ }
+ switch (SPU->regs.ctl_right)
+ {
+ case SPU_struct::REGS::ROM_RIGHT_MIXER: sndout1 = mixout1; break;
+ case SPU_struct::REGS::ROM_CH1: sndout1 = submix1*2+1; break;
+ case SPU_struct::REGS::ROM_CH3: sndout1 = submix3*2+1; break;
+ case SPU_struct::REGS::ROM_CH1_PLUS_CH3: sndout1 = submix1*2+1 + submix3*2+1; break;
+ }
+
+
+ //generate capture output ("capture bugs" from gbatek are not emulated)
+ if (SPU->regs.cap0.source == 0)
+ capout0 = capmixout0; //cap0 = L-mix
+ else if (SPU->regs.cap0.add)
+ capout0 = chanout0 + chanout1; //cap0 = ch0+ch1
+ else capout0 = chanout0; //cap0 = ch0
+
+ if (SPU->regs.cap1.source == 0)
+ capout1 = capmixout1; //cap1 = R-mix
+ else if (SPU->regs.cap1.add)
+ capout1 = chanout2 + chanout3; //cap1 = ch2+ch3
+ else capout1 = chanout2; //cap1 = ch2
+
+ capout0 = MinMax(capout0,-0x8000,0x7FFF);
+ capout1 = MinMax(capout1,-0x8000,0x7FFF);
+
+ //write the output sample where it is supposed to go
+ if (samp == 0)
+ {
+ samp00 = sndout0;
+ samp01 = sndout1;
+ }
+ else
+ {
+ SPU->sndbufsamp*2+0 = sndout0;
+ SPU->sndbufsamp*2+1 = sndout1;
+ }
+
+ for (int capchan = 0; capchan < 2; capchan++)
+ {
+ if (SPU->regs.capcapchan.runtime.running)
+ {
+ SPU_struct::REGS::CAP& cap = SPU->regs.capcapchan;
+ u32 last = sputrunc(cap.runtime.sampcnt);
+ cap.runtime.sampcnt += SPU->channels1+2*capchan.sampinc;
+ u32 curr = sputrunc(cap.runtime.sampcnt);
+ for (u32 j = last; j < curr; j++)
+ {
+ //so, this is a little strange. why go through a fifo?
+ //it seems that some games will set up a reverb effect by capturing
+ //to the nearly same address as playback, but ahead by a couple.
+ //So, playback will always end up being what was captured a couple of samples ago.
+ //This system counts on playback always having read ahead 16 samples.
+ //In that case, playback will end up being what was processed at one entire buffer length ago,
+ //since the 16 samples would have read ahead before they got captured over
+
+ //It's actually the source channels which should have a fifo, but we are
+ //not going to take the hit in speed and complexity. Save it for a future rewrite.
+ //Instead, what we do here is delay the capture by 16 samples to create a similar effect.
+ //Subjectively, it seems to be working.
+
+ //Don't do anything until the fifo is filled, so as to delay it
+ if (cap.runtime.fifo.size < 16)
+ {
+ cap.runtime.fifo.enqueue(capoutcapchan);
+ continue;
+ }
+
+ //(actually capture sample from fifo instead of most recently generated)
+ u32 multiplier;
+ s32 sample = cap.runtime.fifo.dequeue();
+ cap.runtime.fifo.enqueue(capoutcapchan);
+
+ if (cap.bits8)
+ {
+ s8 sample8 = sample >> 8;
+ if (skipcap) _MMU_write08<1,MMU_AT_DMA>(cap.runtime.curdad,0);
+ else _MMU_write08<1,MMU_AT_DMA>(cap.runtime.curdad,sample8);
+ cap.runtime.curdad++;
+ multiplier = 4;
+ }
+ else
+ {
+ s16 sample16 = sample;
+ if (skipcap) _MMU_write16<1,MMU_AT_DMA>(cap.runtime.curdad,0);
+ else _MMU_write16<1,MMU_AT_DMA>(cap.runtime.curdad,sample16);
+ cap.runtime.curdad+=2;
+ multiplier = 2;
+ }
+
+ if (cap.runtime.curdad >= cap.runtime.maxdad)
+ {
+ cap.runtime.curdad = cap.dad;
+ cap.runtime.sampcnt -= cap.len*multiplier;
+ }
+ } //sampinc loop
+ } //if capchan running
+ } //capchan loop
+ } //main sample loop
+
+ SPU->sndbuf0 = samp00;
+ SPU->sndbuf1 = samp01;
+}
+
+//ENTER
+static void SPU_MixAudio(bool actuallyMix, SPU_struct *SPU, int length)
+{
+ if (actuallyMix)
+ {
+ memset(SPU->sndbuf, 0, length*4*2);
+ memset(SPU->outbuf, 0, length*2*2);
+ }
+
+ SPU_MixAudio_Advanced(actuallyMix, SPU, length);
+
+ //we used to bail out if speakers were disabled.
+ //this is technically wrong. sound may still be captured, or something.
+ //in all likelihood, any game doing this probably master disabled the SPU also
+ //so, optimization of this case is probably not necessary.
+ //later, we'll just silence the output
+ bool speakers = T1ReadWord(MMU.ARM7_REG, 0x304) & 0x01;
+
+ u8 vol = SPU->regs.mastervol;
+
+ // convert from 32-bit->16-bit
+ if (actuallyMix && speakers) {
+ for (int i = 0; i < length*2; i++)
+ {
+ // Apply Master Volume
+ SPU->sndbufi = spumuldiv7(SPU->sndbufi, vol);
+ s16 outsample = MinMax(SPU->sndbufi,-0x8000,0x7FFF);
+ SPU->outbufi = outsample;
+ }
+ }
 }
 
 //////////////////////////////////////////////////////////////////////////////
 
-static void SNDDummySetVolume(int volume)
+
+//emulates one hline of the cpu core.
+//this will produce a variable number of samples, calculated to keep a 44100hz output
+//in sync with the emulator framerate
+int spu_core_samples = 0;
+void SPU_Emulate_core()
+{
+ bool needToMix = true;
+ SoundInterface_struct *soundProcessor = SPU_SoundCore();
+
+ samples += samples_per_hline;
+ spu_core_samples = (int)(samples);
+ samples -= spu_core_samples;
+
+ SPU_MixAudio(needToMix, SPU_core, spu_core_samples);
+
+ if (soundProcessor == NULL)
+ {
+ return;
+ }
+
+ if (soundProcessor->FetchSamples != NULL)
+ {
+ soundProcessor->FetchSamples(SPU_core->outbuf, spu_core_samples, synchmode, synchronizer);
+ }
+ else
+ {
+ SPU_DefaultFetchSamples(SPU_core->outbuf, spu_core_samples, synchmode, synchronizer);
+ }
+}
+
+void SPU_Emulate_user(bool mix)
 {
+ static s16 *postProcessBuffer = NULL;
+ static size_t postProcessBufferSize = 0;
+ size_t freeSampleCount = 0;
+ size_t processedSampleCount = 0;
+ SoundInterface_struct *soundProcessor = SPU_SoundCore();
+
+ if (soundProcessor == NULL)
+ {
+ return;
+ }
+
+ // Check to see how many free samples are available.
+ // If there are some, fill up the output buffer.
+ freeSampleCount = soundProcessor->GetAudioSpace();
+ if (freeSampleCount == 0)
+ {
+ return;
+ }
+
+ if (freeSampleCount > buffersize)
+ {
+ freeSampleCount = buffersize;
+ }
+
+ // If needed, resize the post-process buffer to guarantee that
+ // we can store all the sound data.
+ if (postProcessBufferSize < freeSampleCount * 2 * sizeof(s16))
+ {
+ postProcessBufferSize = freeSampleCount * 2 * sizeof(s16);
+ postProcessBuffer = (s16 *)realloc(postProcessBuffer, postProcessBufferSize);
+ }
+
+ if (soundProcessor->PostProcessSamples != NULL)
+ {
+ processedSampleCount = soundProcessor->PostProcessSamples(postProcessBuffer, freeSampleCount, synchmode, synchronizer);
+ }
+ else
+ {
+ processedSampleCount = SPU_DefaultPostProcessSamples(postProcessBuffer, freeSampleCount, synchmode, synchronizer);
+ }
+
+ soundProcessor->UpdateAudio(postProcessBuffer, processedSampleCount);
 }
 
+void SPU_DefaultFetchSamples(s16 *sampleBuffer, size_t sampleCount, ESynchMode synchMode, ISynchronizingAudioBuffer *theSynchronizer)
+{
+ theSynchronizer->enqueue_samples(sampleBuffer, sampleCount);
+}
+
+size_t SPU_DefaultPostProcessSamples(s16 *postProcessBuffer, size_t requestedSampleCount, ESynchMode synchMode, ISynchronizingAudioBuffer *theSynchronizer)
+{
+ return theSynchronizer->output_samples(postProcessBuffer, requestedSampleCount);
+}
+
+//////////////////////////////////////////////////////////////////////////////
+// Dummy Sound Interface
 //////////////////////////////////////////////////////////////////////////////
 
-SoundInterface_struct SNDDummy =
-{
-	SNDCORE_DUMMY,
-	"Dummy Sound Interface",
-	SNDDummyInit,
-	SNDDummyDeInit,
-	SNDDummyUpdateAudio,
-	SNDDummyGetAudioSpace,
-	SNDDummyMuteAudio,
-	SNDDummyUnMuteAudio,
-	SNDDummySetVolume
+int SNDDummyInit(int buffersize);
+void SNDDummyDeInit();
+void SNDDummyUpdateAudio(s16 *buffer, u32 num_samples);
+u32 SNDDummyGetAudioSpace();
+void SNDDummyMuteAudio();
+void SNDDummyUnMuteAudio();
+void SNDDummySetVolume(int volume);
+void SNDDummyClearBuffer();
+void SNDDummyFetchSamples(s16 *sampleBuffer, size_t sampleCount, ESynchMode synchMode, ISynchronizingAudioBuffer *theSynchronizer);
+size_t SNDDummyPostProcessSamples(s16 *postProcessBuffer, size_t requestedSampleCount, ESynchMode synchMode, ISynchronizingAudioBuffer *theSynchronizer);
+
+SoundInterface_struct SNDDummy = {
+ SNDCORE_DUMMY,
+ "Dummy Sound Interface",
+ SNDDummyInit,
+ SNDDummyDeInit,
+ SNDDummyUpdateAudio,
+ SNDDummyGetAudioSpace,
+ SNDDummyMuteAudio,
+ SNDDummyUnMuteAudio,
+ SNDDummySetVolume,
+ SNDDummyClearBuffer,
+ SNDDummyFetchSamples,
+ SNDDummyPostProcessSamples
 };
 
+int SNDDummyInit(int buffersize) { return 0; }
+void SNDDummyDeInit() {}
+void SNDDummyUpdateAudio(s16 *buffer, u32 num_samples) { }
+u32 SNDDummyGetAudioSpace() { return DESMUME_SAMPLE_RATE/60 + 5; }
+void SNDDummyMuteAudio() {}
+void SNDDummyUnMuteAudio() {}
+void SNDDummySetVolume(int volume) {}
+void SNDDummyClearBuffer() {}
+void SNDDummyFetchSamples(s16 *sampleBuffer, size_t sampleCount, ESynchMode synchMode, ISynchronizingAudioBuffer *theSynchronizer) {}
+size_t SNDDummyPostProcessSamples(s16 *postProcessBuffer, size_t requestedSampleCount, ESynchMode synchMode, ISynchronizingAudioBuffer *theSynchronizer) { return 0; }
+

audacious-plugins-3.6.2-gtk3.tar.bz2/src/xsf/desmume/SPU.h -> audacious-plugins-4.4.1.tar.bz2/src/xsf/desmume/SPU.h Changed

@@ -1,31 +1,61 @@
-/* Copyright (C) 2006 Theo Berkau
+/*
+	Copyright 2006 Theo Berkau
+	Copyright (C) 2006-2015 DeSmuME team
 
- This file is part of DeSmuME
+	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
+	(at your option) any later version.
 
- DeSmuME 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 file 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.
 
- DeSmuME 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 DeSmuME; 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 the this software. If not, see <http://www.gnu.org/licenses/>.
 */
 
 #ifndef SPU_H
 #define SPU_H
 
+#include <iosfwd>
+#include <string>
+#include <assert.h>
+#include <stdio.h>
+#include <memory>
+
 #include "types.h"
+#include "matrix.h"
+#include "metaspu.h"
+#include "../spu/samplecache.h"
+
+class EMUFILE;
 
 #define SNDCORE_DEFAULT -1
 #define SNDCORE_DUMMY 0
 
-typedef struct
+#define CHANSTAT_STOPPED 0
+#define CHANSTAT_PLAY 1
+
+
+//who made these static? theyre used in multiple places.
+FORCEINLINE u32 sputrunc(float f) { return u32floor(f); }
+FORCEINLINE u32 sputrunc(double d) { return u32floor(d); }
+FORCEINLINE s32 spumuldiv7(s32 val, u8 multiplier) {
+	assert(multiplier <= 127);
+	return (multiplier == 127) ? val : ((val * multiplier) >> 7);
+}
+
+enum SPUInterpolationMode
+{
+	SPUInterpolation_None = 0,
+	SPUInterpolation_Linear = 1,
+	SPUInterpolation_Cosine = 2,
+	SPUInterpolation_Sharp = 3
+};
+
+struct SoundInterface_struct
 {
 int id;
 const char *Name;
@@ -36,22 +66,205 @@
 void (*MuteAudio)();
 void (*UnMuteAudio)();
 void (*SetVolume)(int volume);
-} SoundInterface_struct;
+ void (*ClearBuffer)();
+ void (*FetchSamples)(s16 *sampleBuffer, size_t sampleCount, ESynchMode synchMode, ISynchronizingAudioBuffer *theSynchronizer);
+ size_t (*PostProcessSamples)(s16 *postProcessBuffer, size_t requestedSampleCount, ESynchMode synchMode, ISynchronizingAudioBuffer *theSynchronizer);
+};
+
 extern SoundInterface_struct SNDDummy;
+extern SoundInterface_struct SNDFile;
+extern int SPU_currentCoreNum;
+
+struct channel_struct
+{
+	channel_struct() :	num(0),
+						vol(0),
+						volumeDiv(0),
+						hold(0),
+						pan(0),
+						waveduty(0),
+						repeat(0),
+						format(0),
+						keyon(0),
+						status(0),
+						addr(0),
+						timer(0),
+						loopstart(0),
+						length(0),
+						totlength(0),
+						double_totlength_shifted(0.0),
+						sampcnt(0.0),
+						sampinc(0.0),
+						lastsampcnt(0),
+						pcm16b(0),
+						pcm16b_last(0),
+						loop_pcm16b(0),
+						index(0),
+						loop_index(0),
+						x(0),
+						psgnoise_last(0)
+	{}
+	u32 num;
+ u8 vol;
+ u8 volumeDiv;
+ u8 hold;
+ u8 pan;
+ u8 waveduty;
+ u8 repeat;
+ u8 format;
+ u8 keyon;
+ u8 status;
+ u32 addr;
+ u16 timer;
+ u16 loopstart;
+ u32 length;
+ u32 totlength;
+ double double_totlength_shifted;
+ double sampcnt;
+ double sampinc;
+ // ADPCM specific
+ u32 lastsampcnt;
+ s16 pcm16b, pcm16b_last;
+ s16 loop_pcm16b;
+ s32 index;
+ int loop_index;
+ u16 x;
+ s16 psgnoise_last;
+};
+
+class SPUFifo
+{
+public:
+	SPUFifo();
+	void enqueue(s16 val);
+	s16 dequeue();
+	s16 buffer16;
+	s32 head,tail,size;
+	void reset();
+};
+
+class SPU_struct
+{
+public:
+	SPU_struct(int buffersize);
+ u32 bufpos;
+ u32 buflength;
+ s32 *sndbuf;
+ s32 lastdata; //the last sample that a channel generated
+ s16 *outbuf;
+ u32 bufsize;
+ channel_struct channels16;
+
+ //registers
+ struct REGS {
+	 REGS()
+			: mastervol(0)
+			, ctl_left(0)
+			, ctl_right(0)
+			, ctl_ch1bypass(0)
+			, ctl_ch3bypass(0)
+			, masteren(0)
+			, soundbias(0)
+	 {}
 
+	 u8 mastervol;
+	 u8 ctl_left, ctl_right;
+	 u8 ctl_ch1bypass, ctl_ch3bypass;
+	 u8 masteren;
+	 u16 soundbias;
+
+	 enum LeftOutputMode
+	 {
+		 LOM_LEFT_MIXER=0, LOM_CH1=1, LOM_CH3=2, LOM_CH1_PLUS_CH3=3
+	 };
+
+	 enum RightOutputMode
+	 {
+		 ROM_RIGHT_MIXER=0, ROM_CH1=1, ROM_CH3=2, ROM_CH1_PLUS_CH3=3
+	 };
+
+	 struct CAP {
+		 CAP()
+			 : add(0), source(0), oneshot(0), bits8(0), active(0), dad(0), len(0)
+		 {}
+		 u8 add, source, oneshot, bits8, active;
+		 u32 dad;
+		 u16 len;
+		 struct Runtime {
+			 Runtime()
+				 : running(0), curdad(0), maxdad(0)
+			 {}
+			 u8 running;
+			 u32 curdad;
+			 u32 maxdad;
+			 double sampcnt;
+			 SPUFifo fifo;
+		 } runtime;
+	 } cap2;
+ } regs;
+
+ void reset();
+ ~SPU_struct();
+ void KeyOff(int channel);
+ void KeyOn(int channel);
+ void KeyProbe(int channel);
+ void ProbeCapture(int which);
+ void WriteByte(u32 addr, u8 val);
+ void WriteWord(u32 addr, u16 val);
+ void WriteLong(u32 addr, u32 val);
+ u8 ReadByte(u32 addr);
+ u16 ReadWord(u32 addr);
+ u32 ReadLong(u32 addr);
+ bool isSPU(u32 addr) { return ((addr >= 0x04000400) && (addr < 0x04000520)); }
+
+ //kills all channels but leaves SPU otherwise running normally
+ void ShutUp();
+};
+
+extern SPU_struct *SPU_core;
+extern int spu_core_samples;
 
 int SPU_ChangeSoundCore(int coreid, int buffersize);
+SoundInterface_struct *SPU_SoundCore();
+
+void SPU_ReInit(bool fakeBoot = false);
 int SPU_Init(int coreid, int buffersize);
 void SPU_Pause(int pause);
 void SPU_SetVolume(int volume);
+void SPU_SetSynchMode(int mode, int method);
+void SPU_ClearOutputBuffer(void);
 void SPU_Reset(void);
 void SPU_DeInit(void);
 void SPU_KeyOn(int channel);
-void SPU_WriteByte(u32 addr, u8 val);
-void SPU_WriteWord(u32 addr, u16 val);
-void SPU_WriteLong(u32 addr, u32 val);
-u32 SPU_ReadLong(u32 addr);
-void SPU_Emulate(void);
-void SPU_EmulateSamples(u32 numsamples);
+static FORCEINLINE void SPU_WriteByte(u32 addr, u8 val)
+{
+	addr &= 0xFFF;
+
+	SPU_core->WriteByte(addr,val);
+}
+static FORCEINLINE void SPU_WriteWord(u32 addr, u16 val)
+{
+	addr &= 0xFFF;
+
+	SPU_core->WriteWord(addr,val);
+}
+static FORCEINLINE void SPU_WriteLong(u32 addr, u32 val)
+{
+	addr &= 0xFFF;
+
+	SPU_core->WriteLong(addr,val);
+}
+static FORCEINLINE u8 SPU_ReadByte(u32 addr) { return SPU_core->ReadByte(addr & 0x0FFF); }
+static FORCEINLINE u16 SPU_ReadWord(u32 addr) { return SPU_core->ReadWord(addr & 0x0FFF); }
+static FORCEINLINE u32 SPU_ReadLong(u32 addr) { return SPU_core->ReadLong(addr & 0x0FFF); }
+void SPU_Emulate_core(void);
+void SPU_Emulate_user(bool mix = true);
+void SPU_DefaultFetchSamples(s16 *sampleBuffer, size_t sampleCount, ESynchMode synchMode, ISynchronizingAudioBuffer *theSynchronizer);
+size_t SPU_DefaultPostProcessSamples(s16 *postProcessBuffer, size_t requestedSampleCount, ESynchMode synchMode, ISynchronizingAudioBuffer *theSynchronizer);
+
+extern double DESMUME_SAMPLE_RATE;
+void SetDesmumeSampleRate(double rate);
+
+extern SampleCache spuSampleCache;
 
 #endif

audacious-plugins-3.6.2-gtk3.tar.bz2/src/xsf/desmume/arm_instructions.cc -> audacious-plugins-4.4.1.tar.bz2/src/xsf/desmume/arm_instructions.cc Changed

@@ -1,7857 +1,6155 @@
-/* Copyright (C) 2006 yopyop
- Copyright (C) 2006 shash
- yopyop156@ifrance.com
- yopyop156.ifrance.com
-
+/*
+	Copyright (C) 2006 yopyop
 	Copyright (C) 2006-2007 shash
+	Copyright (C) 2008-2012 DeSmuME team
 
- This file is part of DeSmuME
+	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
+	(at your option) any later version.
+
+	This file 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.
 
- DeSmuME 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.
-
- DeSmuME 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 DeSmuME; 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 the this software. If not, see <http://www.gnu.org/licenses/>.
 */
 
+// ARM core TODO:
+// - Check all the LDM/STM opcodes: quirks when Rb included in Rlist; opcodes
+// operating on user registers (LDMXX2/STMXX2)
+// - Force User mode memory access for LDRx/STRx opcodes with bit24=0 and bit21=1
+// (has to be done at memory side; once the PU is emulated well enough)
+// - Check LDMxx2/STMxx2 (those opcodes that act on User mode registers instead
+// of current ones)
+
 #include "cp15.h"
-#include "debug.h"
 #include "MMU.h"
+#include "armcpu.h"
+#include "NDSSystem.h"
+#include "MMU_timing.h"
+
+#define cpu (&ARMPROC)
+#define TEMPLATE template<int PROCNUM>
+
+// -----------------------------------------------------------------------------
+// Shifting macros
+// -----------------------------------------------------------------------------
+
+#define LSL_IMM \
+	uint32_t shift_op = cpu->RREG_POS(i, 0) << ((i >> 7) & 0x1F);
+
+#define S_LSL_IMM \
+	uint32_t shift_op = (i >> 7) & 0x1F; \
+	uint32_t c = cpu->CPSR.bits.C; \
+	if (!shift_op) \
+		shift_op = cpu->RREG_POS(i, 0); \
+	else \
+	{ \
+		c = BIT_N(cpu->RREG_POS(i, 0), 32 - shift_op); \
+		shift_op = cpu->RREG_POS(i, 0) << shift_op; \
+	}
 
+#define LSL_REG \
+	uint32_t shift_op = cpu->RREG_POS(i, 8) & 0xFF; \
+	if (shift_op >= 32) \
+		shift_op = 0; \
+	else \
+		shift_op = cpu->RREG_POS(i, 0) << shift_op;
+
+#define S_LSL_REG \
+	uint32_t shift_op = cpu->RREG_POS(i,8) & 0xFF; \
+	uint32_t c = cpu->CPSR.bits.C; \
+	if (!shift_op) \
+		shift_op = cpu->RREG_POS(i, 0); \
+	else if (shift_op < 32) \
+	{ \
+		c = BIT_N(cpu->RREG_POS(i, 0), 32 - shift_op); \
+		shift_op = cpu->RREG_POS(i, 0) << shift_op; \
+	} \
+	else if (shift_op == 32) \
+	{ \
+		shift_op = 0; \
+		c = BIT0(cpu->RREG_POS(i, 0)); \
+	} \
+	else \
+	{ \
+		shift_op = 0; \
+		c = 0; \
+	}
 
-// Use this macros for reading/writing, so the GDB stub isn't broken
-#ifdef GDB_STUB
-	#define READ32(a,b)		cpu->mem_if->read32(a,b)
-	#define WRITE32(a,b,c)	cpu->mem_if->write32(a,b,c)
-	#define READ16(a,b)		cpu->mem_if->read16(a,b)
-	#define WRITE16(a,b,c)	cpu->mem_if->write16(a,b,c)
-	#define READ8(a,b)		cpu->mem_if->read8(a,b)
-	#define WRITE8(a,b,c)	cpu->mem_if->write8(a,b,c)
-#else
-	#define READ32(a,b)		MMU_read32(cpu->proc_ID, b)
-	#define WRITE32(a,b,c)	MMU_write32(cpu->proc_ID,b,c)
-	#define READ16(a,b)		MMU_read16(cpu->proc_ID, b)
-	#define WRITE16(a,b,c)	MMU_write16(cpu->proc_ID,b,c)
-	#define READ8(a,b)		MMU_read8(cpu->proc_ID, b)
-	#define WRITE8(a,b,c)	MMU_write8(cpu->proc_ID,b,c)
-#endif
+#define LSR_IMM \
+	uint32_t shift_op = (i >> 7) & 0x1F; \
+	if (shift_op) \
+		shift_op = cpu->RREG_POS(i, 0) >> shift_op;
+
+#define S_LSR_IMM \
+	uint32_t shift_op = (i >> 7) & 0x1F; \
+	uint32_t c = cpu->CPSR.bits.C; \
+	if (!shift_op) \
+		c = BIT31(cpu->RREG_POS(i, 0)); \
+	else \
+	{ \
+		c = BIT_N(cpu->RREG_POS(i, 0), shift_op - 1); \
+		shift_op = cpu->RREG_POS(i, 0)>>shift_op; \
+	}
 
+#define LSR_REG \
+	uint32_t shift_op = cpu->RREG_POS(i,8) & 0xFF; \
+	if (shift_op >= 32) \
+		shift_op = 0; \
+	else \
+		shift_op = cpu->RREG_POS(i, 0) >> shift_op;
+
+#define S_LSR_REG \
+	uint32_t shift_op = cpu->RREG_POS(i,8) & 0xFF; \
+	uint32_t c = cpu->CPSR.bits.C; \
+	if (!shift_op) \
+		shift_op = cpu->RREG_POS(i ,0); \
+	else if (shift_op < 32) \
+	{ \
+		c = BIT_N(cpu->RREG_POS(i, 0), shift_op - 1); \
+		shift_op = cpu->RREG_POS(i, 0) >> shift_op; \
+	} \
+	else if (shift_op == 32) \
+	{ \
+		c = BIT31(cpu->RREG_POS(i, 0)); \
+		shift_op = 0; \
+	} \
+	else \
+	{ \
+		c = 0; \
+		shift_op = 0; \
+	}
 
+#define ASR_IMM \
+	uint32_t shift_op = (i >> 7) & 0x1F; \
+	if (!shift_op) \
+		shift_op = BIT31(cpu->RREG_POS(i, 0)) * 0xFFFFFFFF; \
+	else \
+		shift_op = static_cast<uint32_t>(static_cast<int32_t>(cpu->RREG_POS(i, 0)) >> shift_op);
+
+#define S_ASR_IMM \
+	uint32_t shift_op = (i >> 7) & 0x1F; \
+	uint32_t c = cpu->CPSR.bits.C; \
+	if (!shift_op) \
+	{ \
+		shift_op = BIT31(cpu->RREG_POS(i, 0)) * 0xFFFFFFFF; \
+		c = BIT31(cpu->RREG_POS(i, 0)); \
+	} \
+	else \
+	{ \
+		c = BIT_N(cpu->RREG_POS(i, 0), shift_op - 1); \
+		shift_op = static_cast<uint32_t>(static_cast<int32_t>(cpu->RREG_POS(i, 0)) >> shift_op); \
+	}
 
-#define LSL_IMM shift_op = cpu->RREG_POS(i,0)<<((i>>7)&0x1F);
+#define ASR_REG \
+	uint32_t shift_op = cpu->RREG_POS(i,8) & 0xFF; \
+	if (!shift_op) \
+		shift_op = cpu->RREG_POS(i, 0); \
+	else if (shift_op < 32) \
+		shift_op = static_cast<uint32_t>(static_cast<int32_t>(cpu->RREG_POS(i, 0)) >> shift_op); \
+	else \
+		shift_op = BIT31(cpu->RREG_POS(i, 0)) * 0xFFFFFFFF;
+
+#define S_ASR_REG \
+	uint32_t shift_op = cpu->RREG_POS(i, 8) & 0xFF; \
+	uint32_t c = cpu->CPSR.bits.C; \
+	if (!shift_op) \
+		shift_op = cpu->RREG_POS(i, 0); \
+	else if (shift_op < 32) \
+	{ \
+		c = BIT_N(cpu->RREG_POS(i, 0), shift_op - 1); \
+		shift_op = static_cast<uint32_t>(static_cast<int32_t>(cpu->RREG_POS(i, 0)) >> shift_op); \
+	} \
+	else \
+	{ \
+		c = BIT31(cpu->RREG_POS(i, 0)); \
+		shift_op = BIT31(cpu->RREG_POS(i, 0)) * 0xFFFFFFFF; \
+	}
 
-#define S_LSL_IMM u32 shift_op = ((i>>7)&0x1F);\
- u32 c = cpu->CPSR.bits.C;\
- if(shift_op==0)\
- shift_op=cpu->RREG_POS(i,0);\
- else\
- {\
- c = BIT_N(cpu->RREG_POS(i,0), 32-shift_op);\
- shift_op = cpu->RREG_POS(i,0)<<((i>>7)&0x1F);\
- }
-
-#define LSL_REG u32 shift_op = (cpu->RREG_POS(i,8))&0xFF;\
- if(shift_op>=32)\
- shift_op=0;\
- else\
- shift_op=cpu->RREG_POS(i,0)<<shift_op;
-
-#define S_LSL_REG u32 shift_op = (cpu->RREG_POS(i,8))&0xFF;\
- u32 c = cpu->CPSR.bits.C;\
- if(shift_op==0)\
- shift_op=cpu->RREG_POS(i,0);\
- else\
- if(shift_op<32)\
- {\
- c = BIT_N(cpu->RREG_POS(i,0), 32-shift_op);\
- shift_op = cpu->RREG_POS(i,0)<<shift_op;\
- }\
- else\
- if(shift_op==32)\
- {\
- shift_op = 0;\
- c = BIT0(cpu->RREG_POS(i,0));\
- }\
- else\
- {\
- shift_op = 0;\
- c = 0;\
- }
-
-#define LSR_IMM shift_op = ((i>>7)&0x1F);\
- if(shift_op!=0)\
- shift_op = cpu->RREG_POS(i,0)>>shift_op;
-
-#define S_LSR_IMM u32 shift_op = ((i>>7)&0x1F);\
- u32 c = cpu->CPSR.bits.C;\
- if(shift_op==0)\
- {\
- c = BIT31(cpu->RREG_POS(i,0));\
- }\
- else\
- {\
- c = BIT_N(cpu->RREG_POS(i,0), shift_op-1);\
- shift_op = cpu->RREG_POS(i,0)>>shift_op;\
- }
-
-#define LSR_REG u32 shift_op = (cpu->RREG_POS(i,8))&0xFF;\
- if(shift_op>=32)\
- shift_op = 0;\
- else\
- shift_op = cpu->RREG_POS(i,0)>>shift_op;
-
-#define S_LSR_REG u32 shift_op = (cpu->RREG_POS(i,8))&0xFF;\
- u32 c = cpu->CPSR.bits.C;\
- if(shift_op==0)\
- {\
- shift_op = cpu->RREG_POS(i,0);\
- }\
- else\
- if(shift_op<32)\
- {\
- c = BIT_N(cpu->RREG_POS(i,0), shift_op-1);\
- shift_op = cpu->RREG_POS(i,0)>>shift_op;\
- }\
- else\
- if(shift_op==32)\
- {\
- c = BIT31(cpu->RREG_POS(i,0));\
- shift_op = 0;\
- }\
- else\
- {\
- c = 0;\
- shift_op = 0;\
- }
-
-#define ASR_IMM shift_op = ((i>>7)&0x1F);\
- if(shift_op==0)\
- shift_op=BIT31(cpu->RREG_POS(i,0))*0xFFFFFFFF;\
- else\
- shift_op = (u32)(((s32)(cpu->RREG_POS(i,0)))>>shift_op);
-
-#define S_ASR_IMM u32 shift_op = ((i>>7)&0x1F);\
- u32 c = cpu->CPSR.bits.C;\
- if(shift_op==0)\
- {\
- shift_op=BIT31(cpu->RREG_POS(i,0))*0xFFFFFFFF;\
- c = BIT31(cpu->RREG_POS(i,0));\
- }\
- else\
- {\
- c = BIT_N(cpu->RREG_POS(i,0), shift_op-1);\
- shift_op = (u32)(((s32)(cpu->RREG_POS(i,0)))>>shift_op);\
- }
-
-#define ASR_REG u32 shift_op = (cpu->RREG_POS(i,8))&0xFF;\
- if(shift_op==0)\
- shift_op=cpu->RREG_POS(i,0);\
- else\
- if(shift_op<32)\
- shift_op = (u32)(((s32)(cpu->RREG_POS(i,0)))>>shift_op);\
- else\
- shift_op=BIT31(cpu->RREG_POS(i,0))*0xFFFFFFFF;
-
-#define S_ASR_REG u32 shift_op = (cpu->RREG_POS(i,8))&0xFF;\
- u32 c = cpu->CPSR.bits.C;\
- if(shift_op==0)\
- shift_op=cpu->RREG_POS(i,0);\
- else\
- if(shift_op<32)\
- {\
- c = BIT_N(cpu->RREG_POS(i,0), shift_op-1);\
- shift_op = (u32)(((s32)(cpu->RREG_POS(i,0)))>>shift_op);\
- }\
- else\
- {\
- c = BIT31(cpu->RREG_POS(i,0));\
- shift_op=BIT31(cpu->RREG_POS(i,0))*0xFFFFFFFF;\
- }
-
-#define ROR_IMM shift_op = ((i>>7)&0x1F);\
- if(shift_op==0)\
- {\
- u32 tmp = cpu->CPSR.bits.C;\
- shift_op = (tmp<<31)|(cpu->RREG_POS(i,0)>>1);\
- }\
- else\
- shift_op = ROR(cpu->RREG_POS(i,0),shift_op);
-
-#define S_ROR_IMM u32 shift_op = ((i>>7)&0x1F);\
- u32 c = cpu->CPSR.bits.C;\
- if(shift_op==0)\
- {\
- u32 tmp = cpu->CPSR.bits.C;\
- shift_op = (tmp<<31)|(cpu->RREG_POS(i,0)>>1);\
- c = BIT0(cpu->RREG_POS(i,0));\
- }\
- else\
- {\
- c = BIT_N(cpu->RREG_POS(i,0), shift_op-1);\
- shift_op = ROR(cpu->RREG_POS(i,0),shift_op);\
- }
-
-#define ROR_REG u32 shift_op = (cpu->RREG_POS(i,8))&0xFF;\
- if((shift_op==0)||((shift_op&0xF)==0))\
- shift_op=cpu->RREG_POS(i,0);\
- else\
- shift_op = ROR(cpu->RREG_POS(i,0),(shift_op&0xF));
-
-#define S_ROR_REG u32 shift_op = (cpu->RREG_POS(i,8))&0xFF;\
- u32 c = cpu->CPSR.bits.C;\
- if(shift_op==0)\
- shift_op=cpu->RREG_POS(i,0);\
- else\
- {\
- shift_op&=0xF;\
- if(shift_op==0)\
- {\
- shift_op=cpu->RREG_POS(i,0);\
- c = BIT31(cpu->RREG_POS(i,0));\
- }\
- else\
- {\
- c = BIT_N(cpu->RREG_POS(i,0), shift_op-1);\
- shift_op = ROR(cpu->RREG_POS(i,0),(shift_op&0xF));\
- }\
- }
-
-#define IMM_VALUE u32 shift_op = ROR((i&0xFF), (i>>7)&0x1E);
-
-#define S_IMM_VALUE u32 shift_op = ROR((i&0xFF), (i>>7)&0x1E);\
- u32 c = cpu->CPSR.bits.C;\
- if((i>>8)&0xF)\
- c = BIT31(shift_op);
-
-#define IMM_OFF (((i>>4)&0xF0)+(i&0xF))
+#define ROR_IMM \
+	uint32_t shift_op = (i >> 7) & 0x1F; \
+	if (!shift_op) \
+		shift_op = (static_cast<uint32_t>(cpu->CPSR.bits.C) << 31) | (cpu->RREG_POS(i, 0) >> 1); \
+	else \
+		shift_op = ROR(cpu->RREG_POS(i, 0), shift_op);
+
+#define S_ROR_IMM \
+	uint32_t shift_op = (i >> 7) & 0x1F; \
+	uint32_t c = cpu->CPSR.bits.C; \
+	if (!shift_op) \
+	{ \
+		shift_op = (static_cast<uint32_t>(cpu->CPSR.bits.C) << 31) | (cpu->RREG_POS(i, 0) >> 1); \
+		c = BIT0(cpu->RREG_POS(i, 0)); \
+	} \
+	else \
+	{ \
+		c = BIT_N(cpu->RREG_POS(i, 0), shift_op - 1); \
+		shift_op = ROR(cpu->RREG_POS(i, 0), shift_op); \
+	}
+
+#define ROR_REG \
+	uint32_t shift_op = cpu->RREG_POS(i, 8) & 0xFF; \
+	if (!shift_op || !(shift_op & 0x1F)) \
+		shift_op = cpu->RREG_POS(i, 0); \
+	else \
+		shift_op = ROR(cpu->RREG_POS(i, 0), shift_op & 0x1F);
+
+#define S_ROR_REG \
+	uint32_t shift_op = cpu->RREG_POS(i, 8) & 0xFF; \
+	uint32_t c = cpu->CPSR.bits.C; \
+	if (!shift_op) \
+		shift_op = cpu->RREG_POS(i, 0); \
+	else \
+	{ \
+		shift_op &= 0x1F; \
+		if (!shift_op) \
+		{ \
+			shift_op = cpu->RREG_POS(i, 0); \
+			c = BIT31(cpu->RREG_POS(i, 0)); \
+		} \
+		else \
+		{ \
+			c = BIT_N(cpu->RREG_POS(i, 0), shift_op - 1); \
+			shift_op = ROR(cpu->RREG_POS(i, 0), shift_op); \
+		} \
+	}
+
+#define IMM_VALUE \
+	uint32_t shift_op = ROR(i & 0xFF, (i >> 7) & 0x1E);
+
+#define S_IMM_VALUE \
+	uint32_t shift_op = ROR(i & 0xFF, (i >> 7) & 0x1E); \
+	uint32_t c = cpu->CPSR.bits.C; \
+	if ((i >> 8) & 0xF) \
+		c = BIT31(shift_op);
 
-#define IMM_OFF_12 ((i)&0xFFF)
+#define IMM_OFF (((i >> 4) & 0xF0) + (i & 0xF))
 
-extern BOOL execute;
+#define IMM_OFF_12 ((i) & 0xFFF)
 
-static u32 FASTCALL OP_UND(armcpu_t *cpu)
+// -----------------------------------------------------------------------------
+// Undefined instruction
+// -----------------------------------------------------------------------------
+
+TEMPLATE static uint32_t FASTCALL OP_UND(uint32_t)
 {
-	LOG("Undefined instruction: %08X\n", cpu->instruction);
-	execute = false;
+	TRAPUNDEF(cpu);
 	return 1;
 }
 
-//-----------------------AND------------------------------------
+// -----------------------------------------------------------------------------
+// AND / ANDS
+// Timing: OK
+// -----------------------------------------------------------------------------
 
-#define OP_AND(a, b) cpu->RREG_POS(i,12) = cpu->RREG_POS(i,16) & shift_op;\
- if(REG_POS(i,12)==15)\
- {\
- cpu->next_instruction = cpu->R15;\
- return b;\
- }\
- return a;
+#define OP_AND(a, b) \
+	cpu->RREG_POS(i, 12) = cpu->RREG_POS(i, 16) & shift_op; \
+	if (REG_POS(i, 12) == 15) \
+	{ \
+		cpu->next_instruction = cpu->R15; \
+		return b; \
+	} \
+	return a;
 
-#define OP_ANDS(a, b)\
- if(REG_POS(i,12)==15)\
- {\
- Status_Reg SPSR;\
- cpu->R15 = cpu->RREG_POS(i,16) & shift_op;\
- SPSR = cpu->SPSR;\
- armcpu_switchMode(cpu, SPSR.bits.mode);\
- cpu->CPSR=SPSR;\
- cpu->R15 &= (0XFFFFFFFC|(((u32)SPSR.bits.T)<<1));\
- cpu->next_instruction = cpu->R15;\
- return b;\
- }\
- cpu->RREG_POS(i,12) = cpu->RREG_POS(i,16) & shift_op;\
- cpu->CPSR.bits.C = c;\
- cpu->CPSR.bits.N = BIT31(cpu->RREG_POS(i,12));\
- cpu->CPSR.bits.Z = (cpu->RREG_POS(i,12)==0);\
- return a;
+#define OP_ANDS(a, b) \
+	cpu->RREG_POS(i, 12) = cpu->RREG_POS(i, 16) & shift_op; \
+	if (REG_POS(i, 12) == 15) \
+	{ \
+		Status_Reg SPSR = cpu->SPSR; \
+		armcpu_switchMode(cpu, SPSR.bits.mode); \
+		cpu->CPSR = SPSR; \
+		cpu->changeCPSR(); \
+		cpu->R15 &= 0xFFFFFFFC | (static_cast<uint32_t>(cpu->CPSR.bits.T) << 1); \
+		cpu->next_instruction = cpu->R15; \
+		return b; \
+	} \
+	cpu->CPSR.bits.C = c; \
+	cpu->CPSR.bits.N = BIT31(cpu->RREG_POS(i, 12)); \
+	cpu->CPSR.bits.Z = !cpu->RREG_POS(i, 12); \
+	return a;
 
-static u32 FASTCALL OP_AND_LSL_IMM(register armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_AND_LSL_IMM(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 shift_op;
- LSL_IMM;
- OP_AND(1, 3);
+	LSL_IMM;
+	OP_AND(1, 3);
 }
 
-static u32 FASTCALL OP_AND_LSL_REG(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_AND_LSL_REG(uint32_t i)
 {
- u32 i = cpu->instruction;
- LSL_REG;
- OP_AND(2, 4);
+	LSL_REG;
+	OP_AND(2, 4);
 }
 
-static u32 FASTCALL OP_AND_LSR_IMM(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_AND_LSR_IMM(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 shift_op;
- LSR_IMM;
- OP_AND(1, 3);
+	LSR_IMM;
+	OP_AND(1, 3);
 }
 
-static u32 FASTCALL OP_AND_LSR_REG(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_AND_LSR_REG(uint32_t i)
 {
- u32 i = cpu->instruction;
- LSR_REG;
- OP_AND(2, 4);
+	LSR_REG;
+	OP_AND(2, 4);
 }
 
-static u32 FASTCALL OP_AND_ASR_IMM(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_AND_ASR_IMM(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 shift_op;
- ASR_IMM;
- OP_AND(1, 3);
+	ASR_IMM;
+	OP_AND(1, 3);
 }
 
-static u32 FASTCALL OP_AND_ASR_REG(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_AND_ASR_REG(uint32_t i)
 {
- u32 i = cpu->instruction;
- ASR_REG;
- OP_AND(2, 4);
+	ASR_REG;
+	OP_AND(2, 4);
 }
 
-static u32 FASTCALL OP_AND_ROR_IMM(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_AND_ROR_IMM(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 shift_op;
- ROR_IMM;
- OP_AND(1, 3);
+	ROR_IMM;
+	OP_AND(1, 3);
 }
 
-static u32 FASTCALL OP_AND_ROR_REG(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_AND_ROR_REG(uint32_t i)
 {
- u32 i = cpu->instruction;
- ROR_REG;
- OP_AND(2, 4);
+	ROR_REG;
+	OP_AND(2, 4);
 }
 
-static u32 FASTCALL OP_AND_IMM_VAL(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_AND_IMM_VAL(uint32_t i)
 {
- u32 i = cpu->instruction;
- IMM_VALUE;
- OP_AND(1, 3);
+	IMM_VALUE;
+	OP_AND(1, 3);
 }
 
-static u32 FASTCALL OP_AND_S_LSL_IMM(armcpu_t *cpu)
+
+TEMPLATE static uint32_t FASTCALL OP_AND_S_LSL_IMM(uint32_t i)
 {
- u32 i = cpu->instruction;
- S_LSL_IMM;
- OP_ANDS(2, 4);
+	S_LSL_IMM;
+	OP_ANDS(1, 3);
 }
 
-static u32 FASTCALL OP_AND_S_LSL_REG(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_AND_S_LSL_REG(uint32_t i)
 {
- u32 i = cpu->instruction;
- S_LSL_REG;
- OP_ANDS(3, 5);
+	S_LSL_REG;
+	OP_ANDS(2, 4);
 }
 
-static u32 FASTCALL OP_AND_S_LSR_IMM(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_AND_S_LSR_IMM(uint32_t i)
 {
- u32 i = cpu->instruction;
- S_LSR_IMM;
- OP_ANDS(2, 4);
+	S_LSR_IMM;
+	OP_ANDS(1, 3);
 }
 
-static u32 FASTCALL OP_AND_S_LSR_REG(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_AND_S_LSR_REG(uint32_t i)
 {
- u32 i = cpu->instruction;
- S_LSR_REG;
- OP_ANDS(3, 5);
+	S_LSR_REG;
+	OP_ANDS(2, 4);
 }
 
-static u32 FASTCALL OP_AND_S_ASR_IMM(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_AND_S_ASR_IMM(uint32_t i)
 {
- u32 i = cpu->instruction;
- S_ASR_IMM;
- OP_ANDS(2, 4);
+	S_ASR_IMM;
+	OP_ANDS(1, 3);
 }
 
-static u32 FASTCALL OP_AND_S_ASR_REG(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_AND_S_ASR_REG(uint32_t i)
 {
- u32 i = cpu->instruction;
- S_ASR_REG;
- OP_ANDS(3, 5);
+	S_ASR_REG;
+	OP_ANDS(2, 4);
 }
 
-static u32 FASTCALL OP_AND_S_ROR_IMM(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_AND_S_ROR_IMM(uint32_t i)
 {
- u32 i = cpu->instruction;
- S_ROR_IMM;
- OP_ANDS(2, 4);
+	S_ROR_IMM;
+	OP_ANDS(1, 3);
 }
 
-static u32 FASTCALL OP_AND_S_ROR_REG(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_AND_S_ROR_REG(uint32_t i)
 {
- u32 i = cpu->instruction;
- S_ROR_REG;
- OP_ANDS(3, 5);
+	S_ROR_REG;
+	OP_ANDS(2, 4);
 }
 
-static u32 FASTCALL OP_AND_S_IMM_VAL(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_AND_S_IMM_VAL(uint32_t i)
 {
- u32 i = cpu->instruction;
- S_IMM_VALUE;
- OP_ANDS(2, 4);
+	S_IMM_VALUE;
+	OP_ANDS(1, 3);
 }
 
-//--------------EOR------------------------------
+// -----------------------------------------------------------------------------
+// EOR / EORS
+// -----------------------------------------------------------------------------
 
-#define OP_EOR(a, b) cpu->RREG_POS(i,12) = cpu->RREG_POS(i,16) ^ shift_op;\
- if(REG_POS(i,12)==15)\
- {\
- cpu->next_instruction = cpu->R15;\
- return b;\
- }\
- return a;
+#define OP_EOR(a, b) \
+	cpu->RREG_POS(i, 12) = cpu->RREG_POS(i, 16) ^ shift_op; \
+	if (REG_POS(i, 12) == 15) \
+	{ \
+		cpu->next_instruction = cpu->R15; \
+		return b; \
+	} \
+	return a;
 
-#define OP_EORS(a, b) cpu->RREG_POS(i,12) = cpu->RREG_POS(i,16) ^ shift_op;\
- if(REG_POS(i,12)==15)\
- {\
- Status_Reg SPSR = cpu->SPSR;\
- armcpu_switchMode(cpu, SPSR.bits.mode);\
- cpu->CPSR=SPSR;\
- cpu->R15 &= (0XFFFFFFFC|(((u32)SPSR.bits.T)<<1));\
- cpu->next_instruction = cpu->R15;\
- return b;\
- }\
- cpu->CPSR.bits.C = c;\
- cpu->CPSR.bits.N = BIT31(cpu->RREG_POS(i,12));\
- cpu->CPSR.bits.Z = (cpu->RREG_POS(i,12)==0);\
- return a;
+#define OP_EORS(a, b) \
+	cpu->RREG_POS(i, 12) = cpu->RREG_POS(i, 16) ^ shift_op; \
+	if (REG_POS(i, 12) == 15) \
+	{ \
+		Status_Reg SPSR = cpu->SPSR; \
+		armcpu_switchMode(cpu, SPSR.bits.mode); \
+		cpu->CPSR = SPSR; \
+		cpu->changeCPSR(); \
+		cpu->R15 &= 0xFFFFFFFC | (static_cast<uint32_t>(cpu->CPSR.bits.T) << 1); \
+		cpu->next_instruction = cpu->R15; \
+		return b; \
+	} \
+	cpu->CPSR.bits.C = c; \
+	cpu->CPSR.bits.N = BIT31(cpu->RREG_POS(i, 12)); \
+	cpu->CPSR.bits.Z = !cpu->RREG_POS(i, 12); \
+	return a;
 
-static u32 FASTCALL OP_EOR_LSL_IMM(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_EOR_LSL_IMM(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 shift_op;
- LSL_IMM;
- OP_EOR(1, 3);
+	LSL_IMM;
+	OP_EOR(1, 3);
 }
 
-static u32 FASTCALL OP_EOR_LSL_REG(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_EOR_LSL_REG(uint32_t i)
 {
- u32 i = cpu->instruction;
- LSL_REG;
- OP_EOR(2, 4);
+	LSL_REG;
+	OP_EOR(2, 4);
 }
 
-static u32 FASTCALL OP_EOR_LSR_IMM(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_EOR_LSR_IMM(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 shift_op;
- LSR_IMM;
- OP_EOR(1, 3);
+	LSR_IMM;
+	OP_EOR(1, 3);
 }
 
-static u32 FASTCALL OP_EOR_LSR_REG(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_EOR_LSR_REG(uint32_t i)
 {
- u32 i = cpu->instruction;
- LSR_REG;
- OP_EOR(2, 4);
+	LSR_REG;
+	OP_EOR(2, 4);
 }
 
-static u32 FASTCALL OP_EOR_ASR_IMM(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_EOR_ASR_IMM(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 shift_op;
- ASR_IMM;
- OP_EOR(1, 3);
+	ASR_IMM;
+	OP_EOR(1, 3);
 }
 
-static u32 FASTCALL OP_EOR_ASR_REG(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_EOR_ASR_REG(uint32_t i)
 {
- u32 i = cpu->instruction;
- ASR_REG;
- OP_EOR(2, 4);
+	ASR_REG;
+	OP_EOR(2, 4);
 }
 
-static u32 FASTCALL OP_EOR_ROR_IMM(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_EOR_ROR_IMM(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 shift_op;
- ROR_IMM;
- OP_EOR(1, 3);
+	ROR_IMM;
+	OP_EOR(1, 3);
 }
 
-static u32 FASTCALL OP_EOR_ROR_REG(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_EOR_ROR_REG(uint32_t i)
 {
- u32 i = cpu->instruction;
- ROR_REG;
- OP_EOR(2, 4);
+	ROR_REG;
+	OP_EOR(2, 4);
 }
 
-static u32 FASTCALL OP_EOR_IMM_VAL(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_EOR_IMM_VAL(uint32_t i)
 {
- u32 i = cpu->instruction;
- IMM_VALUE;
- OP_EOR(1, 3);
+	IMM_VALUE;
+	OP_EOR(1, 3);
 }
 
-static u32 FASTCALL OP_EOR_S_LSL_IMM(armcpu_t *cpu)
+
+TEMPLATE static uint32_t FASTCALL OP_EOR_S_LSL_IMM(uint32_t i)
 {
- u32 i = cpu->instruction;
- S_LSL_IMM;
- OP_EORS(2, 4);
+	S_LSL_IMM;
+	OP_EORS(1, 3);
 }
 
-static u32 FASTCALL OP_EOR_S_LSL_REG(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_EOR_S_LSL_REG(uint32_t i)
 {
- u32 i = cpu->instruction;
- S_LSL_REG;
- OP_EORS(3, 5);
+	S_LSL_REG;
+	OP_EORS(2, 4);
 }
 
-static u32 FASTCALL OP_EOR_S_LSR_IMM(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_EOR_S_LSR_IMM(uint32_t i)
 {
- u32 i = cpu->instruction;
- S_LSR_IMM;
- OP_EORS(2, 4);
+	S_LSR_IMM;
+	OP_EORS(1, 3);
 }
 
-static u32 FASTCALL OP_EOR_S_LSR_REG(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_EOR_S_LSR_REG(uint32_t i)
 {
- u32 i = cpu->instruction;
- S_LSR_REG;
- OP_EORS(3, 5);
+	S_LSR_REG;
+	OP_EORS(2, 4);
 }
 
-static u32 FASTCALL OP_EOR_S_ASR_IMM(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_EOR_S_ASR_IMM(uint32_t i)
 {
- u32 i = cpu->instruction;
- S_ASR_IMM;
- OP_EORS(2, 4);
+	S_ASR_IMM;
+	OP_EORS(1, 3);
 }
 
-static u32 FASTCALL OP_EOR_S_ASR_REG(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_EOR_S_ASR_REG(uint32_t i)
 {
- u32 i = cpu->instruction;
- S_ASR_REG;
- OP_EORS(3, 5);
+	S_ASR_REG;
+	OP_EORS(2, 4);
 }
 
-static u32 FASTCALL OP_EOR_S_ROR_IMM(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_EOR_S_ROR_IMM(uint32_t i)
 {
- u32 i = cpu->instruction;
- S_ROR_IMM;
- OP_EORS(2, 4);
+	S_ROR_IMM;
+	OP_EORS(1, 3);
 }
 
-static u32 FASTCALL OP_EOR_S_ROR_REG(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_EOR_S_ROR_REG(uint32_t i)
 {
- u32 i = cpu->instruction;
- S_ROR_REG;
- OP_EORS(3, 5);
+	S_ROR_REG;
+	OP_EORS(2, 4);
 }
 
-static u32 FASTCALL OP_EOR_S_IMM_VAL(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_EOR_S_IMM_VAL(uint32_t i)
 {
- u32 i = cpu->instruction;
- S_IMM_VALUE;
- OP_EORS(2, 4);
+	S_IMM_VALUE;
+	OP_EORS(1, 3);
 }
 
-//-------------SUB-------------------------------------
+// -----------------------------------------------------------------------------
+// SUB / SUBS
+// -----------------------------------------------------------------------------
 
-#define OP_SUB(a, b) cpu->RREG_POS(i,12) = cpu->RREG_POS(i,16) - shift_op;\
- if(REG_POS(i,12)==15)\
- {\
- cpu->next_instruction = cpu->R15;\
- return b;\
- }\
- return a;
+#define OP_SUB(a, b) \
+	cpu->RREG_POS(i, 12) = cpu->RREG_POS(i, 16) - shift_op; \
+	if (REG_POS(i, 12) == 15) \
+	{ \
+		cpu->next_instruction = cpu->R15; \
+		return b; \
+	} \
+	return a;
 
-#define OPSUBS(a, b) cpu->RREG_POS(i,12) = v - shift_op;\
- if(REG_POS(i,12)==15)\
- {\
- Status_Reg SPSR = cpu->SPSR;\
- armcpu_switchMode(cpu, SPSR.bits.mode);\
- cpu->CPSR=SPSR;\
- cpu->R15 &= (0XFFFFFFFC|(((u32)SPSR.bits.T)<<1));\
- cpu->next_instruction = cpu->R15;\
- return b;\
- }\
- cpu->CPSR.bits.N = BIT31(cpu->RREG_POS(i,12));\
- cpu->CPSR.bits.Z = (cpu->RREG_POS(i,12)==0);\
- cpu->CPSR.bits.C = !UNSIGNED_UNDERFLOW(v, shift_op, cpu->RREG_POS(i,12));\
- cpu->CPSR.bits.V = SIGNED_UNDERFLOW(v, shift_op, cpu->RREG_POS(i,12));\
- return a;
+#define OP_SUBS(a, b) \
+	cpu->RREG_POS(i, 12) = v - shift_op; \
+	if (REG_POS(i, 12) == 15) \
+	{ \
+		Status_Reg SPSR = cpu->SPSR; \
+		armcpu_switchMode(cpu, SPSR.bits.mode); \
+		cpu->CPSR = SPSR; \
+		cpu->changeCPSR(); \
+		cpu->R15 &= 0xFFFFFFFC | (static_cast<uint32_t>(cpu->CPSR.bits.T) << 1); \
+		cpu->next_instruction = cpu->R15; \
+		return b; \
+	} \
+	cpu->CPSR.bits.N = BIT31(cpu->RREG_POS(i, 12)); \
+	cpu->CPSR.bits.Z = !cpu->RREG_POS(i, 12); \
+	cpu->CPSR.bits.C = !BorrowFrom(v, shift_op); \
+	cpu->CPSR.bits.V = OverflowFromSUB(cpu->RREG_POS(i,12), v, shift_op); \
+	return a;
 
-static u32 FASTCALL OP_SUB_LSL_IMM(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_SUB_LSL_IMM(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 shift_op;
- LSL_IMM;
- OP_SUB(1, 3);
+	LSL_IMM;
+	OP_SUB(1, 3);
 }
 
-static u32 FASTCALL OP_SUB_LSL_REG(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_SUB_LSL_REG(uint32_t i)
 {
- u32 i = cpu->instruction;
- LSL_REG;
- OP_SUB(2, 4);
+	LSL_REG;
+	OP_SUB(2, 4);
 }
 
-static u32 FASTCALL OP_SUB_LSR_IMM(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_SUB_LSR_IMM(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 shift_op;
- LSR_IMM;
- OP_SUB(1, 3);
+	LSR_IMM;
+	OP_SUB(1, 3);
 }
 
-static u32 FASTCALL OP_SUB_LSR_REG(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_SUB_LSR_REG(uint32_t i)
 {
- u32 i = cpu->instruction;
- LSR_REG;
- OP_SUB(2, 4);
+	LSR_REG;
+	OP_SUB(2, 4);
 }
 
-static u32 FASTCALL OP_SUB_ASR_IMM(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_SUB_ASR_IMM(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 shift_op;
- ASR_IMM;
- OP_SUB(1, 3);
+	ASR_IMM;
+	OP_SUB(1, 3);
 }
 
-static u32 FASTCALL OP_SUB_ASR_REG(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_SUB_ASR_REG(uint32_t i)
 {
- u32 i = cpu->instruction;
- ASR_REG;
- OP_SUB(2, 4);
+	ASR_REG;
+	OP_SUB(2, 4);
 }
 
-static u32 FASTCALL OP_SUB_ROR_IMM(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_SUB_ROR_IMM(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 shift_op;
- ROR_IMM;
- OP_SUB(1, 3);
+	ROR_IMM;
+	OP_SUB(1, 3);
 }
 
-static u32 FASTCALL OP_SUB_ROR_REG(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_SUB_ROR_REG(uint32_t i)
 {
- u32 i = cpu->instruction;
- ROR_REG;
- OP_SUB(2, 4);
+	ROR_REG;
+	OP_SUB(2, 4);
 }
 
-static u32 FASTCALL OP_SUB_IMM_VAL(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_SUB_IMM_VAL(uint32_t i)
 {
- u32 i = cpu->instruction;
- IMM_VALUE;
- OP_SUB(1, 3);
+	IMM_VALUE;
+	OP_SUB(1, 3);
 }
 
-static u32 FASTCALL OP_SUB_S_LSL_IMM(armcpu_t *cpu)
+
+TEMPLATE static uint32_t FASTCALL OP_SUB_S_LSL_IMM(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 v = cpu->RREG_POS(i,16);
- u32 shift_op;
- LSL_IMM;
- OPSUBS(2, 4);
+	uint32_t v = cpu->RREG_POS(i, 16);
+	LSL_IMM;
+	OP_SUBS(1, 3);
 }
 
-static u32 FASTCALL OP_SUB_S_LSL_REG(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_SUB_S_LSL_REG(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 v = cpu->RREG_POS(i,16);
- LSL_REG;
- OPSUBS(3, 5);
+	uint32_t v = cpu->RREG_POS(i, 16);
+	LSL_REG;
+	OP_SUBS(2, 4);
 }
 
-static u32 FASTCALL OP_SUB_S_LSR_IMM(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_SUB_S_LSR_IMM(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 v = cpu->RREG_POS(i,16);
- u32 shift_op;
- LSR_IMM;
- OPSUBS(2, 4);
+	uint32_t v = cpu->RREG_POS(i, 16);
+	LSR_IMM;
+	OP_SUBS(1, 3);
 }
 
-static u32 FASTCALL OP_SUB_S_LSR_REG(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_SUB_S_LSR_REG(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 v = cpu->RREG_POS(i,16);
- LSR_REG;
- OPSUBS(3, 5);
+	uint32_t v = cpu->RREG_POS(i, 16);
+	LSR_REG;
+	OP_SUBS(2, 4);
 }
 
-static u32 FASTCALL OP_SUB_S_ASR_IMM(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_SUB_S_ASR_IMM(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 v = cpu->RREG_POS(i,16);
- u32 shift_op;
- ASR_IMM;
- OPSUBS(2, 4);
+	uint32_t v = cpu->RREG_POS(i, 16);
+	ASR_IMM;
+	OP_SUBS(1, 3);
 }
 
-static u32 FASTCALL OP_SUB_S_ASR_REG(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_SUB_S_ASR_REG(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 v = cpu->RREG_POS(i,16);
- ASR_REG;
- OPSUBS(3, 5);
+	uint32_t v = cpu->RREG_POS(i, 16);
+	ASR_REG;
+	OP_SUBS(2, 4);
 }
 
-static u32 FASTCALL OP_SUB_S_ROR_IMM(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_SUB_S_ROR_IMM(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 v = cpu->RREG_POS(i,16);
- u32 shift_op;
- ROR_IMM;
- OPSUBS(2, 4);
+	uint32_t v = cpu->RREG_POS(i, 16);
+	ROR_IMM;
+	OP_SUBS(1, 3);
 }
 
-static u32 FASTCALL OP_SUB_S_ROR_REG(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_SUB_S_ROR_REG(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 v = cpu->RREG_POS(i,16);
- ROR_REG;
- OPSUBS(3, 5);
+	uint32_t v = cpu->RREG_POS(i, 16);
+	ROR_REG;
+	OP_SUBS(2, 4);
 }
 
-static u32 FASTCALL OP_SUB_S_IMM_VAL(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_SUB_S_IMM_VAL(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 v = cpu->RREG_POS(i,16);
- IMM_VALUE;
- OPSUBS(2, 4);
+	uint32_t v = cpu->RREG_POS(i, 16);
+	IMM_VALUE;
+	OP_SUBS(1, 3);
 }
 
-//------------------RSB------------------------
+// -----------------------------------------------------------------------------
+// RSB / RSBS
+// -----------------------------------------------------------------------------
 
-#define OP_RSB(a, b) cpu->RREG_POS(i,12) = shift_op - cpu->RREG_POS(i,16);\
- if(REG_POS(i,12)==15)\
- {\
- cpu->next_instruction = cpu->R15;\
- return b;\
- }\
- return a;
+#define OP_RSB(a, b) \
+	cpu->RREG_POS(i, 12) = shift_op - cpu->RREG_POS(i, 16); \
+	if (REG_POS(i, 12) == 15) \
+	{ \
+		cpu->next_instruction = cpu->R15; \
+		return b; \
+	} \
+	return a;
 
-#define OP_RSBS(a, b) cpu->RREG_POS(i,12) = shift_op - v;\
- if(REG_POS(i,12)==15)\
- {\
- Status_Reg SPSR = cpu->SPSR;\
- armcpu_switchMode(cpu, SPSR.bits.mode);\
- cpu->CPSR=SPSR;\
- cpu->R15 &= (0XFFFFFFFC|(((u32)SPSR.bits.T)<<1));\
- cpu->next_instruction = cpu->R15;\
- return b;\
- }\
- cpu->CPSR.bits.N = BIT31(cpu->RREG_POS(i,12));\
- cpu->CPSR.bits.Z = (cpu->RREG_POS(i,12)==0);\
- cpu->CPSR.bits.C = !UNSIGNED_UNDERFLOW(shift_op, v, cpu->RREG_POS(i,12));\
- cpu->CPSR.bits.V = SIGNED_UNDERFLOW(shift_op, v, cpu->RREG_POS(i,12));\
- return a;
+#define OP_RSBS(a, b) \
+	cpu->RREG_POS(i, 12) = shift_op - v; \
+	if (REG_POS(i, 12) == 15) \
+	{ \
+		Status_Reg SPSR = cpu->SPSR; \
+		armcpu_switchMode(cpu, SPSR.bits.mode); \
+		cpu->CPSR = SPSR; \
+		cpu->changeCPSR(); \
+		cpu->R15 &= 0xFFFFFFFC | (static_cast<uint32_t>(cpu->CPSR.bits.T) << 1); \
+		cpu->next_instruction = cpu->R15; \
+		return b; \
+	} \
+	cpu->CPSR.bits.N = BIT31(cpu->RREG_POS(i, 12)); \
+	cpu->CPSR.bits.Z = !cpu->RREG_POS(i, 12); \
+	cpu->CPSR.bits.C = !BorrowFrom(shift_op, v); \
+	cpu->CPSR.bits.V = OverflowFromSUB(cpu->RREG_POS(i, 12), shift_op, v); \
+	return a;
 
-static u32 FASTCALL OP_RSB_LSL_IMM(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_RSB_LSL_IMM(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 shift_op;
- LSL_IMM;
- OP_RSB(1, 3);
+	LSL_IMM;
+	OP_RSB(1, 3);
 }
 
-static u32 FASTCALL OP_RSB_LSL_REG(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_RSB_LSL_REG(uint32_t i)
 {
- u32 i = cpu->instruction;
- LSL_REG;
- OP_RSB(2, 4);
+	LSL_REG;
+	OP_RSB(2, 4);
 }
 
-static u32 FASTCALL OP_RSB_LSR_IMM(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_RSB_LSR_IMM(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 shift_op;
- LSR_IMM;
- OP_RSB(1, 3);
+	LSR_IMM;
+	OP_RSB(1, 3);
 }
 
-static u32 FASTCALL OP_RSB_LSR_REG(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_RSB_LSR_REG(uint32_t i)
 {
- u32 i = cpu->instruction;
- LSR_REG;
- OP_RSB(2, 4);
+	LSR_REG;
+	OP_RSB(2, 4);
 }
 
-static u32 FASTCALL OP_RSB_ASR_IMM(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_RSB_ASR_IMM(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 shift_op;
- ASR_IMM;
- OP_RSB(1, 3);
+	ASR_IMM;
+	OP_RSB(1, 3);
 }
 
-static u32 FASTCALL OP_RSB_ASR_REG(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_RSB_ASR_REG(uint32_t i)
 {
- u32 i = cpu->instruction;
- ASR_REG;
- OP_RSB(2, 4);
+	ASR_REG;
+	OP_RSB(2, 4);
 }
 
-static u32 FASTCALL OP_RSB_ROR_IMM(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_RSB_ROR_IMM(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 shift_op;
- ROR_IMM;
- OP_RSB(1, 3);
+	ROR_IMM;
+	OP_RSB(1, 3);
 }
 
-static u32 FASTCALL OP_RSB_ROR_REG(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_RSB_ROR_REG(uint32_t i)
 {
- u32 i = cpu->instruction;
- ROR_REG;
- OP_RSB(2, 4);
+	ROR_REG;
+	OP_RSB(2, 4);
 }
 
-static u32 FASTCALL OP_RSB_IMM_VAL(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_RSB_IMM_VAL(uint32_t i)
 {
- u32 i = cpu->instruction;
- IMM_VALUE;
- OP_RSB(1, 3);
+	IMM_VALUE;
+	OP_RSB(1, 3);
 }
 
-static u32 FASTCALL OP_RSB_S_LSL_IMM(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_RSB_S_LSL_IMM(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 v = cpu->RREG_POS(i,16);
- u32 shift_op;
- LSL_IMM;
- OP_RSBS(2, 4);
+	uint32_t v = cpu->RREG_POS(i, 16);
+	LSL_IMM;
+	OP_RSBS(1, 3);
 }
 
-static u32 FASTCALL OP_RSB_S_LSL_REG(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_RSB_S_LSL_REG(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 v = cpu->RREG_POS(i,16);
- LSL_REG;
- OP_RSBS(3, 5);
+	uint32_t v = cpu->RREG_POS(i, 16);
+	LSL_REG;
+	OP_RSBS(2, 4);
 }
 
-static u32 FASTCALL OP_RSB_S_LSR_IMM(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_RSB_S_LSR_IMM(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 v = cpu->RREG_POS(i,16);
- u32 shift_op;
- LSR_IMM;
- OP_RSBS(2, 4);
+	uint32_t v = cpu->RREG_POS(i, 16);
+	LSR_IMM;
+	OP_RSBS(1, 3);
 }
 
-static u32 FASTCALL OP_RSB_S_LSR_REG(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_RSB_S_LSR_REG(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 v = cpu->RREG_POS(i,16);
- LSR_REG;
- OP_RSBS(3, 5);
+	uint32_t v = cpu->RREG_POS(i, 16);
+	LSR_REG;
+	OP_RSBS(2, 4);
 }
 
-static u32 FASTCALL OP_RSB_S_ASR_IMM(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_RSB_S_ASR_IMM(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 v = cpu->RREG_POS(i,16);
- u32 shift_op;
- ASR_IMM;
- OP_RSBS(2, 4);
+	uint32_t v = cpu->RREG_POS(i, 16);
+	ASR_IMM;
+	OP_RSBS(1, 3);
 }
 
-static u32 FASTCALL OP_RSB_S_ASR_REG(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_RSB_S_ASR_REG(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 v = cpu->RREG_POS(i,16);
- ASR_REG;
- OP_RSBS(3, 5);
+	uint32_t v = cpu->RREG_POS(i, 16);
+	ASR_REG;
+	OP_RSBS(2, 4);
 }
 
-static u32 FASTCALL OP_RSB_S_ROR_IMM(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_RSB_S_ROR_IMM(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 v = cpu->RREG_POS(i,16);
- u32 shift_op;
- ROR_IMM;
- OP_RSBS(2, 4);
+	uint32_t v = cpu->RREG_POS(i, 16);
+	ROR_IMM;
+	OP_RSBS(1, 3);
 }
 
-static u32 FASTCALL OP_RSB_S_ROR_REG(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_RSB_S_ROR_REG(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 v = cpu->RREG_POS(i,16);
- ROR_REG;
- OP_RSBS(3, 5);
+	uint32_t v = cpu->RREG_POS(i, 16);
+	ROR_REG;
+	OP_RSBS(2, 4);
 }
 
-static u32 FASTCALL OP_RSB_S_IMM_VAL(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_RSB_S_IMM_VAL(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 v = cpu->RREG_POS(i,16);
- IMM_VALUE;
- OP_RSBS(2, 4);
+	uint32_t v = cpu->RREG_POS(i, 16);
+	IMM_VALUE;
+	OP_RSBS(1, 3);
 }
 
-//------------------ADD-----------------------------------
+// -----------------------------------------------------------------------------
+// ADD / ADDS
+// -----------------------------------------------------------------------------
+
+#define OP_ADD(a, b) \
+	cpu->RREG_POS(i, 12) = cpu->RREG_POS(i, 16) + shift_op; \
+	if (REG_POS(i, 12) == 15) \
+	{ \
+		cpu->next_instruction = cpu->R15; \
+		return b; \
+	} \
+	return a;
 
-#define OP_ADD(a, b) cpu->RREG_POS(i,12) = cpu->RREG_POS(i,16) + shift_op;\
- if(REG_POS(i,12)==15)\
- {\
- cpu->next_instruction = cpu->R15;\
- return b;\
- }\
- return a;
+#define OP_ADDS(a, b) \
+	cpu->RREG_POS(i,12) = v + shift_op; \
+	if (REG_POS(i, 12) == 15) \
+	{ \
+		Status_Reg SPSR = cpu->SPSR; \
+		armcpu_switchMode(cpu, SPSR.bits.mode); \
+		cpu->CPSR = SPSR; \
+		cpu->changeCPSR(); \
+		cpu->R15 &= 0xFFFFFFFC | (static_cast<uint32_t>(cpu->CPSR.bits.T) << 1); \
+		cpu->next_instruction = cpu->R15; \
+		return b; \
+	} \
+	cpu->CPSR.bits.N = BIT31(cpu->RREG_POS(i, 12)); \
+	cpu->CPSR.bits.Z = !cpu->RREG_POS(i, 12); \
+	cpu->CPSR.bits.C = CarryFrom(v, shift_op); \
+	cpu->CPSR.bits.V = OverflowFromADD(cpu->RREG_POS(i, 12), v, shift_op); \
+	return a;
 
-static u32 FASTCALL OP_ADD_LSL_IMM(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_ADD_LSL_IMM(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 shift_op;
- LSL_IMM;
- OP_ADD(1, 3);
+	LSL_IMM;
+	OP_ADD(1, 3);
 }
 
-static u32 FASTCALL OP_ADD_LSL_REG(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_ADD_LSL_REG(uint32_t i)
 {
- u32 i = cpu->instruction;
- LSL_REG;
- OP_ADD(2, 4);
+	LSL_REG;
+	OP_ADD(2, 4);
 }
 
-static u32 FASTCALL OP_ADD_LSR_IMM(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_ADD_LSR_IMM(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 shift_op;
- LSR_IMM;
- OP_ADD(1, 3);
+	LSR_IMM;
+	OP_ADD(1, 3);
 }
 
-static u32 FASTCALL OP_ADD_LSR_REG(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_ADD_LSR_REG(uint32_t i)
 {
- u32 i = cpu->instruction;
- LSR_REG;
- OP_ADD(2, 4);
+	LSR_REG;
+	OP_ADD(2, 4);
 }
 
-static u32 FASTCALL OP_ADD_ASR_IMM(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_ADD_ASR_IMM(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 shift_op;
- ASR_IMM;
- OP_ADD(1, 3);
+	ASR_IMM;
+	OP_ADD(1, 3);
 }
 
-static u32 FASTCALL OP_ADD_ASR_REG(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_ADD_ASR_REG(uint32_t i)
 {
- u32 i = cpu->instruction;
- ASR_REG;
- OP_ADD(2, 4);
+	ASR_REG;
+	OP_ADD(2, 4);
 }
 
-static u32 FASTCALL OP_ADD_ROR_IMM(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_ADD_ROR_IMM(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 shift_op;
- ROR_IMM;
- OP_ADD(1, 3);
+	ROR_IMM;
+	OP_ADD(1, 3);
 }
 
-static u32 FASTCALL OP_ADD_ROR_REG(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_ADD_ROR_REG(uint32_t i)
 {
- u32 i = cpu->instruction;
- ROR_REG;
- OP_ADD(2, 4);
+	ROR_REG;
+	OP_ADD(2, 4);
 }
 
-static u32 FASTCALL OP_ADD_IMM_VAL(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_ADD_IMM_VAL(uint32_t i)
 {
- u32 i = cpu->instruction;
- IMM_VALUE;
- OP_ADD(1, 3);
+	IMM_VALUE;
+	OP_ADD(1, 3);
 }
 
-#define OP_ADDS(a, b) cpu->RREG_POS(i,12) = v + shift_op;\
- if(REG_POS(i,12)==15)\
- {\
- Status_Reg SPSR = cpu->SPSR;\
- armcpu_switchMode(cpu, SPSR.bits.mode);\
- cpu->CPSR=SPSR;\
- cpu->R15 &= (0XFFFFFFFC|(((u32)SPSR.bits.T)<<1));\
- cpu->next_instruction = cpu->R15;\
- return b;\
- }\
- cpu->CPSR.bits.N = BIT31(cpu->RREG_POS(i,12));\
- cpu->CPSR.bits.Z = (cpu->RREG_POS(i,12)==0);\
- cpu->CPSR.bits.C = UNSIGNED_OVERFLOW(v, shift_op, cpu->RREG_POS(i,12));\
- cpu->CPSR.bits.V = SIGNED_OVERFLOW(v, shift_op, cpu->RREG_POS(i,12));\
- return a;
-
-static u32 FASTCALL OP_ADD_S_LSL_IMM(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_ADD_S_LSL_IMM(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 v = cpu->RREG_POS(i,16);
- u32 shift_op;
- LSL_IMM;
- OP_ADDS(2, 4);
+	uint32_t v = cpu->RREG_POS(i, 16);
+	LSL_IMM;
+	OP_ADDS(1, 3);
 }
 
-static u32 FASTCALL OP_ADD_S_LSL_REG(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_ADD_S_LSL_REG(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 v = cpu->RREG_POS(i,16);
- LSL_REG;
- OP_ADDS(3, 5);
+	uint32_t v = cpu->RREG_POS(i, 16);
+	LSL_REG;
+	OP_ADDS(2, 4);
 }
 
-static u32 FASTCALL OP_ADD_S_LSR_IMM(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_ADD_S_LSR_IMM(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 v = cpu->RREG_POS(i,16);
- u32 shift_op;
- LSR_IMM;
- OP_ADDS(2, 4);
+	uint32_t v = cpu->RREG_POS(i, 16);
+	LSR_IMM;
+	OP_ADDS(1, 3);
 }
 
-static u32 FASTCALL OP_ADD_S_LSR_REG(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_ADD_S_LSR_REG(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 v = cpu->RREG_POS(i,16);
- LSR_REG;
- OP_ADDS(3, 5);
+	uint32_t v = cpu->RREG_POS(i, 16);
+	LSR_REG;
+	OP_ADDS(2, 4);
 }
 
-static u32 FASTCALL OP_ADD_S_ASR_IMM(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_ADD_S_ASR_IMM(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 v = cpu->RREG_POS(i,16);
- u32 shift_op;
- ASR_IMM;
- OP_ADDS(2, 4);
+	uint32_t v = cpu->RREG_POS(i, 16);
+	ASR_IMM;
+	OP_ADDS(1, 3);
 }
 
-static u32 FASTCALL OP_ADD_S_ASR_REG(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_ADD_S_ASR_REG(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 v = cpu->RREG_POS(i,16);
- ASR_REG;
- OP_ADDS(3, 5);
+	uint32_t v = cpu->RREG_POS(i, 16);
+	ASR_REG;
+	OP_ADDS(2, 4);
 }
 
-static u32 FASTCALL OP_ADD_S_ROR_IMM(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_ADD_S_ROR_IMM(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 v = cpu->RREG_POS(i,16);
- u32 shift_op;
- ROR_IMM;
- OP_ADDS(2, 4);
+	uint32_t v = cpu->RREG_POS(i, 16);
+	ROR_IMM;
+	OP_ADDS(1, 3);
 }
 
-static u32 FASTCALL OP_ADD_S_ROR_REG(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_ADD_S_ROR_REG(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 v = cpu->RREG_POS(i,16);
- ROR_REG;
- OP_ADDS(3, 5);
+	uint32_t v = cpu->RREG_POS(i, 16);
+	ROR_REG;
+	OP_ADDS(2, 4);
 }
 
-static u32 FASTCALL OP_ADD_S_IMM_VAL(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_ADD_S_IMM_VAL(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 v = cpu->RREG_POS(i,16);
- IMM_VALUE;
- OP_ADDS(2, 4);
+	uint32_t v = cpu->RREG_POS(i, 16);
+	IMM_VALUE;
+	OP_ADDS(1, 3);
 }
 
-//------------------ADC-----------------------------------
+// -----------------------------------------------------------------------------
+// ADC / ADCS
+// -----------------------------------------------------------------------------
+#define OP_ADC(a, b) \
+	cpu->RREG_POS(i, 12) = cpu->RREG_POS(i, 16) + shift_op + cpu->CPSR.bits.C; \
+	if (REG_POS(i, 12) == 15) \
+	{ \
+		cpu->next_instruction = cpu->R15; \
+		return b; \
+	} \
+	return a;
 
-#define OP_ADC(a, b) cpu->RREG_POS(i,12) = cpu->RREG_POS(i,16) + shift_op + cpu->CPSR.bits.C;\
- if(REG_POS(i,12)==15)\
- {\
- cpu->next_instruction = cpu->R15;\
- return b;\
- }\
- return a;
+#define OP_ADCS(a, b) \
+{ \
+	if (REG_POS(i, 12) == 15) \
+	{ \
+		cpu->RREG_POS(i, 12) = v + shift_op + cpu->CPSR.bits.C; \
+		Status_Reg SPSR = cpu->SPSR; \
+		armcpu_switchMode(cpu, SPSR.bits.mode); \
+		cpu->CPSR = SPSR; \
+		cpu->changeCPSR(); \
+		cpu->R15 &= 0xFFFFFFFC | (static_cast<uint32_t>(cpu->CPSR.bits.T) << 1); \
+		cpu->next_instruction = cpu->R15; \
+		return b; \
+	} \
+	if (!cpu->CPSR.bits.C) \
+	{ \
+		cpu->RREG_POS(i, 12) = v + shift_op; \
+		cpu->CPSR.bits.C = cpu->RREG_POS(i, 12) < v; \
+	} \
+	else \
+	{ \
+		cpu->RREG_POS(i, 12) = v + shift_op + 1; \
+		cpu->CPSR.bits.C = cpu->RREG_POS(i, 12) <= v; \
+	} \
+	cpu->CPSR.bits.N = BIT31(cpu->RREG_POS(i, 12)); \
+	cpu->CPSR.bits.Z = !cpu->RREG_POS(i, 12); \
+	cpu->CPSR.bits.V = BIT31((v ^ shift_op ^ -1) & (v ^ cpu->RREG_POS(i, 12))); \
+	return a; \
+}
 
-static u32 FASTCALL OP_ADC_LSL_IMM(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_ADC_LSL_IMM(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 shift_op;
- LSL_IMM;
- OP_ADC(1, 3);
+	LSL_IMM;
+	OP_ADC(1, 3);
 }
 
-static u32 FASTCALL OP_ADC_LSL_REG(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_ADC_LSL_REG(uint32_t i)
 {
- u32 i = cpu->instruction;
- LSL_REG;
- OP_ADC(2, 4);
+	LSL_REG;
+	OP_ADC(2, 4);
 }
 
-static u32 FASTCALL OP_ADC_LSR_IMM(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_ADC_LSR_IMM(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 shift_op;
- LSR_IMM;
- OP_ADC(1, 3);
+	LSR_IMM;
+	OP_ADC(1, 3);
 }
 
-static u32 FASTCALL OP_ADC_LSR_REG(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_ADC_LSR_REG(uint32_t i)
 {
- u32 i = cpu->instruction;
- LSR_REG;
- OP_ADC(2, 4);
+	LSR_REG;
+	OP_ADC(2, 4);
 }
 
-static u32 FASTCALL OP_ADC_ASR_IMM(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_ADC_ASR_IMM(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 shift_op;
- ASR_IMM;
- OP_ADC(1, 3);
+	ASR_IMM;
+	OP_ADC(1, 3);
 }
 
-static u32 FASTCALL OP_ADC_ASR_REG(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_ADC_ASR_REG(uint32_t i)
 {
- u32 i = cpu->instruction;
- ASR_REG;
- OP_ADC(2, 4);
+	ASR_REG;
+	OP_ADC(2, 4);
 }
 
-static u32 FASTCALL OP_ADC_ROR_IMM(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_ADC_ROR_IMM(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 shift_op;
- ROR_IMM;
- OP_ADC(1, 3);
+	ROR_IMM;
+	OP_ADC(1, 3);
 }
 
-static u32 FASTCALL OP_ADC_ROR_REG(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_ADC_ROR_REG(uint32_t i)
 {
- u32 i = cpu->instruction;
- ROR_REG;
- OP_ADC(2, 4);
+	ROR_REG;
+	OP_ADC(2, 4);
 }
 
-static u32 FASTCALL OP_ADC_IMM_VAL(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_ADC_IMM_VAL(uint32_t i)
 {
- u32 i = cpu->instruction;
- IMM_VALUE;
- OP_ADC(1, 3);
+	IMM_VALUE;
+	OP_ADC(1, 3);
 }
 
-#define OP_ADCS(a, b) \
- { \
- u32 tmp = shift_op + cpu->CPSR.bits.C;\
- cpu->RREG_POS(i,12) = v + tmp;\
- if(REG_POS(i,12)==15)\
- {\
- Status_Reg SPSR = cpu->SPSR;\
- armcpu_switchMode(cpu, SPSR.bits.mode);\
- cpu->CPSR=SPSR;\
- cpu->R15 &= (0XFFFFFFFC|(((u32)SPSR.bits.T)<<1));\
- cpu->next_instruction = cpu->R15;\
- return b;\
- }\
- cpu->CPSR.bits.N = BIT31(cpu->RREG_POS(i,12));\
- cpu->CPSR.bits.Z = (cpu->RREG_POS(i,12)==0);\
- cpu->CPSR.bits.C = UNSIGNED_OVERFLOW(shift_op, cpu->CPSR.bits.C, tmp) | UNSIGNED_OVERFLOW(v, tmp, cpu->RREG_POS(i,12));\
- cpu->CPSR.bits.V = SIGNED_OVERFLOW(shift_op, cpu->CPSR.bits.C, tmp) | SIGNED_OVERFLOW(v, tmp, cpu->RREG_POS(i,12));\
- return a; \
- }
 
-static u32 FASTCALL OP_ADC_S_LSL_IMM(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_ADC_S_LSL_IMM(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 v = cpu->RREG_POS(i,16);
- u32 shift_op;
- LSL_IMM;
- OP_ADCS(2, 4);
+	uint32_t v = cpu->RREG_POS(i, 16);
+	LSL_IMM;
+	OP_ADCS(1, 3);
 }
 
-static u32 FASTCALL OP_ADC_S_LSL_REG(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_ADC_S_LSL_REG(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 v = cpu->RREG_POS(i,16);
- LSL_REG;
- OP_ADCS(3, 5);
+	uint32_t v = cpu->RREG_POS(i, 16);
+	LSL_REG;
+	OP_ADCS(2, 4);
 }
 
-static u32 FASTCALL OP_ADC_S_LSR_IMM(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_ADC_S_LSR_IMM(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 v = cpu->RREG_POS(i,16);
- u32 shift_op;
- LSR_IMM;
- OP_ADCS(2, 4);
+	uint32_t v = cpu->RREG_POS(i, 16);
+	LSR_IMM;
+	OP_ADCS(1, 3);
 }
 
-static u32 FASTCALL OP_ADC_S_LSR_REG(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_ADC_S_LSR_REG(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 v = cpu->RREG_POS(i,16);
- LSR_REG;
- OP_ADCS(3, 5);
+	uint32_t v = cpu->RREG_POS(i, 16);
+	LSR_REG;
+	OP_ADCS(2, 4);
 }
 
-static u32 FASTCALL OP_ADC_S_ASR_IMM(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_ADC_S_ASR_IMM(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 v = cpu->RREG_POS(i,16);
- u32 shift_op;
- ASR_IMM;
- OP_ADCS(2, 4);
+	uint32_t v = cpu->RREG_POS(i, 16);
+	ASR_IMM;
+	OP_ADCS(1, 3);
 }
 
-static u32 FASTCALL OP_ADC_S_ASR_REG(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_ADC_S_ASR_REG(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 v = cpu->RREG_POS(i,16);
- ASR_REG;
- OP_ADCS(3, 5);
+	uint32_t v = cpu->RREG_POS(i,16);
+	ASR_REG;
+	OP_ADCS(2, 4);
 }
 
-static u32 FASTCALL OP_ADC_S_ROR_IMM(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_ADC_S_ROR_IMM(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 v = cpu->RREG_POS(i,16);
- u32 shift_op;
- ROR_IMM;
- OP_ADCS(2, 4);
+	uint32_t v = cpu->RREG_POS(i, 16);
+	ROR_IMM;
+	OP_ADCS(1, 3);
 }
 
-static u32 FASTCALL OP_ADC_S_ROR_REG(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_ADC_S_ROR_REG(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 v = cpu->RREG_POS(i,16);
- ROR_REG;
- OP_ADCS(3, 5);
+	uint32_t v = cpu->RREG_POS(i, 16);
+	ROR_REG;
+	OP_ADCS(2, 4);
 }
 
-static u32 FASTCALL OP_ADC_S_IMM_VAL(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_ADC_S_IMM_VAL(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 v = cpu->RREG_POS(i,16);
- IMM_VALUE;
- OP_ADCS(2, 4);
+	uint32_t v = cpu->RREG_POS(i,16);
+	IMM_VALUE;
+	OP_ADCS(1, 3);
 }
 
-//-------------SBC-------------------------------------
+// -----------------------------------------------------------------------------
+// SBC / SBCS
+// -----------------------------------------------------------------------------
+
+#define OP_SBC(a, b) \
+	cpu->RREG_POS(i, 12) = cpu->RREG_POS(i, 16) - shift_op - !cpu->CPSR.bits.C; \
+	if (REG_POS(i, 12) == 15) \
+	{ \
+		cpu->next_instruction = cpu->R15; \
+		return b; \
+	} \
+	return a;
 
-#define OP_SBC(a, b) cpu->RREG_POS(i,12) = cpu->RREG_POS(i,16) - shift_op - (!cpu->CPSR.bits.C);\
- if(REG_POS(i,12)==15)\
- {\
- cpu->next_instruction = cpu->R15;\
- return b;\
- }\
- return a;
+#define OP_SBCS(a, b) \
+{ \
+	if (REG_POS(i, 12) == 15) \
+	{ \
+		cpu->RREG_POS(i,12) = v - shift_op - !cpu->CPSR.bits.C; \
+		Status_Reg SPSR = cpu->SPSR; \
+		armcpu_switchMode(cpu, SPSR.bits.mode); \
+		cpu->CPSR = SPSR; \
+		cpu->changeCPSR(); \
+		cpu->R15 &= 0xFFFFFFFC | (static_cast<uint32_t>(cpu->CPSR.bits.T) << 1); \
+		cpu->next_instruction = cpu->R15; \
+		return b; \
+	} \
+	if (!cpu->CPSR.bits.C) \
+	{ \
+		cpu->RREG_POS(i, 12) = v - shift_op - 1; \
+		cpu->CPSR.bits.C = v > shift_op; \
+	} \
+	else \
+	{ \
+		cpu->RREG_POS(i, 12) = v - shift_op; \
+		cpu->CPSR.bits.C = v >= shift_op; \
+	} \
+	cpu->CPSR.bits.N = BIT31(cpu->RREG_POS(i, 12)); \
+	cpu->CPSR.bits.Z = !cpu->RREG_POS(i, 12); \
+	cpu->CPSR.bits.V = BIT31((v ^ shift_op) & (v ^ cpu->RREG_POS(i, 12))); \
+	return a; \
+}
 
-static u32 FASTCALL OP_SBC_LSL_IMM(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_SBC_LSL_IMM(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 shift_op;
- LSL_IMM;
- OP_SBC(1, 3);
+	LSL_IMM;
+	OP_SBC(1, 3);
 }
 
-static u32 FASTCALL OP_SBC_LSL_REG(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_SBC_LSL_REG(uint32_t i)
 {
- u32 i = cpu->instruction;
- LSL_REG;
- OP_SBC(2, 4);
+	LSL_REG;
+	OP_SBC(2, 4);
 }
 
-static u32 FASTCALL OP_SBC_LSR_IMM(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_SBC_LSR_IMM(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 shift_op;
- LSR_IMM;
- OP_SBC(1, 3);
+	LSR_IMM;
+	OP_SBC(1, 3);
 }
 
-static u32 FASTCALL OP_SBC_LSR_REG(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_SBC_LSR_REG(uint32_t i)
 {
- u32 i = cpu->instruction;
- LSR_REG;
- OP_SBC(2, 4);
+	LSR_REG;
+	OP_SBC(2, 4);
 }
 
-static u32 FASTCALL OP_SBC_ASR_IMM(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_SBC_ASR_IMM(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 shift_op;
- ASR_IMM;
- OP_SBC(1, 3);
+	ASR_IMM;
+	OP_SBC(1, 3);
 }
 
-static u32 FASTCALL OP_SBC_ASR_REG(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_SBC_ASR_REG(uint32_t i)
 {
- u32 i = cpu->instruction;
- ASR_REG;
- OP_SBC(2, 4);
+	ASR_REG;
+	OP_SBC(2, 4);
 }
 
-static u32 FASTCALL OP_SBC_ROR_IMM(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_SBC_ROR_IMM(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 shift_op;
- ROR_IMM;
- OP_SBC(1, 3);
+	ROR_IMM;
+	OP_SBC(1, 3);
 }
 
-static u32 FASTCALL OP_SBC_ROR_REG(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_SBC_ROR_REG(uint32_t i)
 {
- u32 i = cpu->instruction;
- ROR_REG;
- OP_SBC(2, 4);
+	ROR_REG;
+	OP_SBC(2, 4);
 }
 
-static u32 FASTCALL OP_SBC_IMM_VAL(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_SBC_IMM_VAL(uint32_t i)
 {
- u32 i = cpu->instruction;
- IMM_VALUE;
- OP_SBC(1, 3);
+	IMM_VALUE;
+	OP_SBC(1, 3);
 }
 
-#define OP_SBCS(a, b) \
- { \
- u32 tmp = v - (!cpu->CPSR.bits.C);\
- cpu->RREG_POS(i,12) = tmp - shift_op;\
- if(REG_POS(i,12)==15)\
- {\
- Status_Reg SPSR = cpu->SPSR;\
- armcpu_switchMode(cpu, SPSR.bits.mode);\
- cpu->CPSR=SPSR;\
- cpu->R15 &= (0XFFFFFFFC|(((u32)SPSR.bits.T)<<1));\
- cpu->next_instruction = cpu->R15;\
- return b;\
- }\
- cpu->CPSR.bits.N = BIT31(cpu->RREG_POS(i,12));\
- cpu->CPSR.bits.Z = (cpu->RREG_POS(i,12)==0);\
- cpu->CPSR.bits.C = (!UNSIGNED_UNDERFLOW(v, (!cpu->CPSR.bits.C), tmp)) & (!UNSIGNED_UNDERFLOW(tmp, shift_op, cpu->RREG_POS(i,12)));\
- cpu->CPSR.bits.V = SIGNED_UNDERFLOW(v, (!cpu->CPSR.bits.C), tmp) | SIGNED_UNDERFLOW(tmp, shift_op, cpu->RREG_POS(i,12));\
- return a; \
- }
 
-static u32 FASTCALL OP_SBC_S_LSL_IMM(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_SBC_S_LSL_IMM(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 v = cpu->RREG_POS(i,16);
- u32 shift_op;
- LSL_IMM;
- OP_SBCS(2, 4);
+	uint32_t v = cpu->RREG_POS(i, 16);
+	LSL_IMM;
+	OP_SBCS(1, 3);
 }
 
-static u32 FASTCALL OP_SBC_S_LSL_REG(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_SBC_S_LSL_REG(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 v = cpu->RREG_POS(i,16);
- LSL_REG;
- OP_SBCS(3, 5);
+	uint32_t v = cpu->RREG_POS(i, 16);
+	LSL_REG;
+	OP_SBCS(2, 4);
 }
 
-static u32 FASTCALL OP_SBC_S_LSR_IMM(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_SBC_S_LSR_IMM(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 v = cpu->RREG_POS(i,16);
- u32 shift_op;
- LSR_IMM;
- OP_SBCS(2, 4);
+	uint32_t v = cpu->RREG_POS(i, 16);
+	LSR_IMM;
+	OP_SBCS(1, 3);
 }
 
-static u32 FASTCALL OP_SBC_S_LSR_REG(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_SBC_S_LSR_REG(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 v = cpu->RREG_POS(i,16);
- LSR_REG;
- OP_SBCS(3, 5);
+	uint32_t v = cpu->RREG_POS(i, 16);
+	LSR_REG;
+	OP_SBCS(2, 4);
 }
 
-static u32 FASTCALL OP_SBC_S_ASR_IMM(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_SBC_S_ASR_IMM(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 v = cpu->RREG_POS(i,16);
- u32 shift_op;
- ASR_IMM;
- OP_SBCS(2, 4);
+	uint32_t v = cpu->RREG_POS(i, 16);
+	ASR_IMM;
+	OP_SBCS(1, 3);
 }
 
-static u32 FASTCALL OP_SBC_S_ASR_REG(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_SBC_S_ASR_REG(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 v = cpu->RREG_POS(i,16);
- ASR_REG;
- OP_SBCS(3, 5);
+	uint32_t v = cpu->RREG_POS(i, 16);
+	ASR_REG;
+	OP_SBCS(2, 4);
 }
 
-static u32 FASTCALL OP_SBC_S_ROR_IMM(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_SBC_S_ROR_IMM(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 v = cpu->RREG_POS(i,16);
- u32 shift_op;
- ROR_IMM;
- OP_SBCS(2, 4);
+	uint32_t v = cpu->RREG_POS(i,16);
+	ROR_IMM;
+	OP_SBCS(1, 3);
 }
 
-static u32 FASTCALL OP_SBC_S_ROR_REG(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_SBC_S_ROR_REG(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 v = cpu->RREG_POS(i,16);
- ROR_REG;
- OP_SBCS(3, 5);
+	uint32_t v = cpu->RREG_POS(i, 16);
+	ROR_REG;
+	OP_SBCS(2, 4);
 }
 
-static u32 FASTCALL OP_SBC_S_IMM_VAL(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_SBC_S_IMM_VAL(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 v = cpu->RREG_POS(i,16);
- IMM_VALUE;
- OP_SBCS(2, 4);
+	uint32_t v = cpu->RREG_POS(i, 16);
+	IMM_VALUE;
+	OP_SBCS(1, 3);
 }
 
-//---------------RSC----------------------------------
+// -----------------------------------------------------------------------------
+// RSC / RSCS
+// -----------------------------------------------------------------------------
 
-#define OP_RSC(a, b) cpu->RREG_POS(i,12) = shift_op - cpu->RREG_POS(i,16) - (!cpu->CPSR.bits.C);\
- if(REG_POS(i,12)==15)\
- {\
- cpu->next_instruction = cpu->R15;\
- return b;\
- }\
- return a;
+#define OP_RSC(a, b) \
+	cpu->RREG_POS(i, 12) = shift_op - cpu->RREG_POS(i, 16) + cpu->CPSR.bits.C - 1; \
+	if (REG_POS(i, 12) == 15) \
+	{ \
+		cpu->next_instruction = cpu->R15; \
+		return b; \
+	} \
+	return a;
 
-static u32 FASTCALL OP_RSC_LSL_IMM(armcpu_t *cpu)
-{
- u32 i = cpu->instruction;
- u32 shift_op;
- LSL_IMM;
- OP_RSC(1, 3);
+#define OP_RSCS(a, b) \
+{ \
+	if (REG_POS(i, 12) == 15) \
+	{ \
+		cpu->RREG_POS(i, 12) = shift_op - v - !cpu->CPSR.bits.C; \
+		Status_Reg SPSR = cpu->SPSR; \
+		armcpu_switchMode(cpu, SPSR.bits.mode); \
+		cpu->CPSR = SPSR; \
+		cpu->changeCPSR(); \
+		cpu->R15 &= 0xFFFFFFFC | (static_cast<uint32_t>(cpu->CPSR.bits.T) << 1); \
+		cpu->next_instruction = cpu->R15; \
+		return b; \
+	} \
+	if (!cpu->CPSR.bits.C) \
+	{ \
+		cpu->RREG_POS(i, 12) = shift_op - v - 1; \
+		cpu->CPSR.bits.C = shift_op > v; \
+	} \
+	else \
+	{ \
+		cpu->RREG_POS(i, 12) = shift_op - v; \
+		cpu->CPSR.bits.C = shift_op >= v; \
+	} \
+	cpu->CPSR.bits.N = BIT31(cpu->RREG_POS(i, 12)); \
+	cpu->CPSR.bits.Z = !cpu->RREG_POS(i, 12); \
+	cpu->CPSR.bits.V = BIT31((shift_op ^ v) & (shift_op ^ cpu->RREG_POS(i, 12))); \
+	return a; \
 }
 
-static u32 FASTCALL OP_RSC_LSL_REG(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_RSC_LSL_IMM(uint32_t i)
 {
- u32 i = cpu->instruction;
- LSL_REG;
- OP_RSC(2, 4);
+	LSL_IMM;
+	OP_RSC(1, 3);
 }
 
-static u32 FASTCALL OP_RSC_LSR_IMM(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_RSC_LSL_REG(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 shift_op;
- LSR_IMM;
- OP_RSC(1, 3);
+	LSL_REG;
+	OP_RSC(2, 4);
 }
 
-static u32 FASTCALL OP_RSC_LSR_REG(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_RSC_LSR_IMM(uint32_t i)
 {
- u32 i = cpu->instruction;
- LSR_REG;
- OP_RSC(2, 4);
+	LSR_IMM;
+	OP_RSC(1, 3);
 }
 
-static u32 FASTCALL OP_RSC_ASR_IMM(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_RSC_LSR_REG(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 shift_op;
- ASR_IMM;
- OP_RSC(1, 3);
+	LSR_REG;
+	OP_RSC(2, 4);
 }
 
-static u32 FASTCALL OP_RSC_ASR_REG(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_RSC_ASR_IMM(uint32_t i)
 {
- u32 i = cpu->instruction;
- ASR_REG;
- OP_RSC(2, 4);
+	ASR_IMM;
+	OP_RSC(1, 3);
 }
 
-static u32 FASTCALL OP_RSC_ROR_IMM(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_RSC_ASR_REG(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 shift_op;
- ROR_IMM;
- OP_RSC(1, 3);
+	ASR_REG;
+	OP_RSC(2, 4);
 }
 
-static u32 FASTCALL OP_RSC_ROR_REG(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_RSC_ROR_IMM(uint32_t i)
 {
- u32 i = cpu->instruction;
- ROR_REG;
- OP_RSC(2, 4);
+	ROR_IMM;
+	OP_RSC(1, 3);
 }
 
-static u32 FASTCALL OP_RSC_IMM_VAL(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_RSC_ROR_REG(uint32_t i)
 {
- u32 i = cpu->instruction;
- IMM_VALUE;
- OP_RSC(1, 3);
+	ROR_REG;
+	OP_RSC(2, 4);
 }
 
-#define OP_RSCS(a,b) \
- { \
- u32 tmp = shift_op - (!cpu->CPSR.bits.C);\
- cpu->RREG_POS(i,12) = tmp - v;\
- if(REG_POS(i,12)==15)\
- {\
- Status_Reg SPSR = cpu->SPSR;\
- armcpu_switchMode(cpu, SPSR.bits.mode);\
- cpu->CPSR=SPSR;\
- cpu->R15 &= (0XFFFFFFFC|(((u32)SPSR.bits.T)<<1));\
- cpu->next_instruction = cpu->R15;\
- return b;\
- }\
- cpu->CPSR.bits.N = BIT31(cpu->RREG_POS(i,12));\
- cpu->CPSR.bits.Z = (cpu->RREG_POS(i,12)==0);\
- cpu->CPSR.bits.C = (!UNSIGNED_UNDERFLOW(shift_op, (!cpu->CPSR.bits.C), tmp)) & (!UNSIGNED_UNDERFLOW(tmp, v, cpu->RREG_POS(i,12)));\
- cpu->CPSR.bits.V = SIGNED_UNDERFLOW(shift_op, (!cpu->CPSR.bits.C), tmp) | SIGNED_UNDERFLOW(tmp, v, cpu->RREG_POS(i,12));\
- return a; \
- }
+TEMPLATE static uint32_t FASTCALL OP_RSC_IMM_VAL(uint32_t i)
+{
+	IMM_VALUE;
+	OP_RSC(1, 3);
+}
 
-static u32 FASTCALL OP_RSC_S_LSL_IMM(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_RSC_S_LSL_IMM(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 v = cpu->RREG_POS(i,16);
- u32 shift_op;
- LSL_IMM;
- OP_RSCS(2,4);
+	uint32_t v = cpu->RREG_POS(i, 16);
+	LSL_IMM;
+	OP_RSCS(1,3);
 }
 
-static u32 FASTCALL OP_RSC_S_LSL_REG(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_RSC_S_LSL_REG(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 v = cpu->RREG_POS(i,16);
- LSL_REG;
- OP_RSCS(3,5);
+	uint32_t v = cpu->RREG_POS(i, 16);
+	LSL_REG;
+	OP_RSCS(2,4);
 }
 
-static u32 FASTCALL OP_RSC_S_LSR_IMM(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_RSC_S_LSR_IMM(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 v = cpu->RREG_POS(i,16);
- u32 shift_op;
- LSR_IMM;
- OP_RSCS(2,4);
+	uint32_t v = cpu->RREG_POS(i,16);
+	LSR_IMM;
+	OP_RSCS(1,3);
 }
 
-static u32 FASTCALL OP_RSC_S_LSR_REG(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_RSC_S_LSR_REG(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 v = cpu->RREG_POS(i,16);
- LSR_REG;
- OP_RSCS(3,5);
+	uint32_t v = cpu->RREG_POS(i, 16);
+	LSR_REG;
+	OP_RSCS(2,4);
 }
 
-static u32 FASTCALL OP_RSC_S_ASR_IMM(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_RSC_S_ASR_IMM(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 v = cpu->RREG_POS(i,16);
- u32 shift_op;
- ASR_IMM;
- OP_RSCS(2,4);
+	uint32_t v = cpu->RREG_POS(i, 16);
+	ASR_IMM;
+	OP_RSCS(1,3);
 }
 
-static u32 FASTCALL OP_RSC_S_ASR_REG(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_RSC_S_ASR_REG(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 v = cpu->RREG_POS(i,16);
- ASR_REG;
- OP_RSCS(3,5);
+	uint32_t v = cpu->RREG_POS(i, 16);
+	ASR_REG;
+	OP_RSCS(2,4);
 }
 
-static u32 FASTCALL OP_RSC_S_ROR_IMM(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_RSC_S_ROR_IMM(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 v = cpu->RREG_POS(i,16);
- u32 shift_op;
- ROR_IMM;
- OP_RSCS(2,4);
+	uint32_t v = cpu->RREG_POS(i, 16);
+	ROR_IMM;
+	OP_RSCS(1,3);
 }
 
-static u32 FASTCALL OP_RSC_S_ROR_REG(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_RSC_S_ROR_REG(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 v = cpu->RREG_POS(i,16);
- ROR_REG;
- OP_RSCS(3,5);
+	uint32_t v = cpu->RREG_POS(i, 16);
+	ROR_REG;
+	OP_RSCS(2,4);
 }
 
-static u32 FASTCALL OP_RSC_S_IMM_VAL(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_RSC_S_IMM_VAL(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 v = cpu->RREG_POS(i,16);
- IMM_VALUE;
- OP_RSCS(2,4);
+	uint32_t v = cpu->RREG_POS(i, 16);
+	IMM_VALUE;
+	OP_RSCS(1,3);
 }
 
-//-------------------TST----------------------------
+// -----------------------------------------------------------------------------
+// TST
+// -----------------------------------------------------------------------------
 
 #define OP_TST(a) \
- { \
- unsigned tmp = cpu->RREG_POS(i,16) & shift_op;\
- cpu->CPSR.bits.C = c;\
- cpu->CPSR.bits.N = BIT31(tmp);\
- cpu->CPSR.bits.Z = (tmp==0);\
- return a; \
- }
+{ \
+	uint32_t tmp = cpu->RREG_POS(i, 16) & shift_op; \
+	cpu->CPSR.bits.C = c; \
+	cpu->CPSR.bits.N = BIT31(tmp); \
+	cpu->CPSR.bits.Z = !tmp; \
+	return a; \
+}
 
-static u32 FASTCALL OP_TST_LSL_IMM(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_TST_LSL_IMM(uint32_t i)
 {
- u32 i = cpu->instruction;
- S_LSL_IMM;
- OP_TST(1);
+	S_LSL_IMM;
+	OP_TST(1);
 }
 
-static u32 FASTCALL OP_TST_LSL_REG(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_TST_LSL_REG(uint32_t i)
 {
- u32 i = cpu->instruction;
- S_LSL_REG;
- OP_TST(2);
+	S_LSL_REG;
+	OP_TST(2);
 }
 
-static u32 FASTCALL OP_TST_LSR_IMM(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_TST_LSR_IMM(uint32_t i)
 {
- u32 i = cpu->instruction;
- S_LSR_IMM;
- OP_TST(1);
+	S_LSR_IMM;
+	OP_TST(1);
 }
 
-static u32 FASTCALL OP_TST_LSR_REG(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_TST_LSR_REG(uint32_t i)
 {
- u32 i = cpu->instruction;
- S_LSR_REG;
- OP_TST(2);
+	S_LSR_REG;
+	OP_TST(2);
 }
 
-static u32 FASTCALL OP_TST_ASR_IMM(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_TST_ASR_IMM(uint32_t i)
 {
- u32 i = cpu->instruction;
- S_ASR_IMM;
- OP_TST(1);
+	S_ASR_IMM;
+	OP_TST(1);
 }
 
-static u32 FASTCALL OP_TST_ASR_REG(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_TST_ASR_REG(uint32_t i)
 {
- u32 i = cpu->instruction;
- S_ASR_REG;
- OP_TST(2);
+	S_ASR_REG;
+	OP_TST(2);
 }
 
-static u32 FASTCALL OP_TST_ROR_IMM(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_TST_ROR_IMM(uint32_t i)
 {
- u32 i = cpu->instruction;
- S_ROR_IMM;
- OP_TST(1);
+	S_ROR_IMM;
+	OP_TST(1);
 }
 
-static u32 FASTCALL OP_TST_ROR_REG(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_TST_ROR_REG(uint32_t i)
 {
- u32 i = cpu->instruction;
- S_ROR_REG;
- OP_TST(2);
+	S_ROR_REG;
+	OP_TST(2);
 }
 
-static u32 FASTCALL OP_TST_IMM_VAL(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_TST_IMM_VAL(uint32_t i)
 {
- u32 i = cpu->instruction;
- S_IMM_VALUE;
- OP_TST(1);
+	S_IMM_VALUE;
+	OP_TST(1);
 }
 
-//-------------------TEQ----------------------------
+// -----------------------------------------------------------------------------
+// TEQ
+// -----------------------------------------------------------------------------
 
 #define OP_TEQ(a) \
- { \
- unsigned tmp = cpu->RREG_POS(i,16) ^ shift_op;\
- cpu->CPSR.bits.C = c;\
- cpu->CPSR.bits.N = BIT31(tmp);\
- cpu->CPSR.bits.Z = (tmp==0);\
- return a; \
- }
+{ \
+	unsigned tmp = cpu->RREG_POS(i, 16) ^ shift_op; \
+	cpu->CPSR.bits.C = c; \
+	cpu->CPSR.bits.N = BIT31(tmp); \
+	cpu->CPSR.bits.Z = !tmp; \
+	return a; \
+}
 
-static u32 FASTCALL OP_TEQ_LSL_IMM(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_TEQ_LSL_IMM(uint32_t i)
 {
- u32 i = cpu->instruction;
- S_LSL_IMM;
- OP_TEQ(1);
+	S_LSL_IMM;
+	OP_TEQ(1);
 }
 
-static u32 FASTCALL OP_TEQ_LSL_REG(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_TEQ_LSL_REG(uint32_t i)
 {
- u32 i = cpu->instruction;
- S_LSL_REG;
- OP_TEQ(2);
+	S_LSL_REG;
+	OP_TEQ(2);
 }
 
-static u32 FASTCALL OP_TEQ_LSR_IMM(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_TEQ_LSR_IMM(uint32_t i)
 {
- u32 i = cpu->instruction;
- S_LSR_IMM;
- OP_TEQ(1);
+	S_LSR_IMM;
+	OP_TEQ(1);
 }
 
-static u32 FASTCALL OP_TEQ_LSR_REG(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_TEQ_LSR_REG(uint32_t i)
 {
- u32 i = cpu->instruction;
- S_LSR_REG;
- OP_TEQ(2);
+	S_LSR_REG;
+	OP_TEQ(2);
 }
 
-static u32 FASTCALL OP_TEQ_ASR_IMM(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_TEQ_ASR_IMM(uint32_t i)
 {
- u32 i = cpu->instruction;
- S_ASR_IMM;
- OP_TEQ(1);
+	S_ASR_IMM;
+	OP_TEQ(1);
 }
 
-static u32 FASTCALL OP_TEQ_ASR_REG(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_TEQ_ASR_REG(uint32_t i)
 {
- u32 i = cpu->instruction;
- S_ASR_REG;
- OP_TEQ(2);
+	S_ASR_REG;
+	OP_TEQ(2);
 }
 
-static u32 FASTCALL OP_TEQ_ROR_IMM(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_TEQ_ROR_IMM(uint32_t i)
 {
- u32 i = cpu->instruction;
- S_ROR_IMM;
- OP_TEQ(1);
+	S_ROR_IMM;
+	OP_TEQ(1);
 }
 
-static u32 FASTCALL OP_TEQ_ROR_REG(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_TEQ_ROR_REG(uint32_t i)
 {
- u32 i = cpu->instruction;
- S_ROR_REG;
- OP_TEQ(2);
+	S_ROR_REG;
+	OP_TEQ(2);
 }
 
-static u32 FASTCALL OP_TEQ_IMM_VAL(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_TEQ_IMM_VAL(uint32_t i)
 {
- u32 i = cpu->instruction;
- S_IMM_VALUE;
- OP_TEQ(1);
+	S_IMM_VALUE;
+	OP_TEQ(1);
 }
 
-//-------------CMP-------------------------------------
+// -----------------------------------------------------------------------------
+// CMP
+// -----------------------------------------------------------------------------
 
 #define OP_CMP(a) \
- { \
- u32 tmp = cpu->RREG_POS(i,16) - shift_op;\
- cpu->CPSR.bits.N = BIT31(tmp);\
- cpu->CPSR.bits.Z = (tmp==0);\
- cpu->CPSR.bits.C = !UNSIGNED_UNDERFLOW(cpu->RREG_POS(i,16), shift_op, tmp);\
- cpu->CPSR.bits.V = SIGNED_UNDERFLOW(cpu->RREG_POS(i,16), shift_op, tmp);\
- return a; \
- }
+{ \
+	uint32_t tmp = cpu->RREG_POS(i, 16) - shift_op; \
+	cpu->CPSR.bits.N = BIT31(tmp); \
+	cpu->CPSR.bits.Z = !tmp; \
+	cpu->CPSR.bits.C = !BorrowFrom(cpu->RREG_POS(i, 16), shift_op); \
+	cpu->CPSR.bits.V = OverflowFromSUB(tmp, cpu->RREG_POS(i, 16), shift_op); \
+	return a; \
+}
 
-static u32 FASTCALL OP_CMP_LSL_IMM(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_CMP_LSL_IMM(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 shift_op;
- LSL_IMM;
- OP_CMP(1);
+	LSL_IMM;
+	OP_CMP(1);
 }
 
-static u32 FASTCALL OP_CMP_LSL_REG(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_CMP_LSL_REG(uint32_t i)
 {
- u32 i = cpu->instruction;
- LSL_REG;
- OP_CMP(2);
+	LSL_REG;
+	OP_CMP(2);
 }
 
-static u32 FASTCALL OP_CMP_LSR_IMM(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_CMP_LSR_IMM(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 shift_op;
- LSR_IMM;
- OP_CMP(1);
+	LSR_IMM;
+	OP_CMP(1);
 }
 
-static u32 FASTCALL OP_CMP_LSR_REG(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_CMP_LSR_REG(uint32_t i)
 {
- u32 i = cpu->instruction;
- LSR_REG;
- OP_CMP(2);
+	LSR_REG;
+	OP_CMP(2);
 }
 
-static u32 FASTCALL OP_CMP_ASR_IMM(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_CMP_ASR_IMM(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 shift_op;
- ASR_IMM;
- OP_CMP(1);
+	ASR_IMM;
+	OP_CMP(1);
 }
 
-static u32 FASTCALL OP_CMP_ASR_REG(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_CMP_ASR_REG(uint32_t i)
 {
- u32 i = cpu->instruction;
- ASR_REG;
- OP_CMP(2);
+	ASR_REG;
+	OP_CMP(2);
 }
 
-static u32 FASTCALL OP_CMP_ROR_IMM(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_CMP_ROR_IMM(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 shift_op;
- ROR_IMM;
- OP_CMP(1);
+	ROR_IMM;
+	OP_CMP(1);
 }
 
-static u32 FASTCALL OP_CMP_ROR_REG(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_CMP_ROR_REG(uint32_t i)
 {
- u32 i = cpu->instruction;
- ROR_REG;
- OP_CMP(2);
+	ROR_REG;
+	OP_CMP(2);
 }
 
-static u32 FASTCALL OP_CMP_IMM_VAL(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_CMP_IMM_VAL(uint32_t i)
 {
- u32 i = cpu->instruction;
- IMM_VALUE;
- OP_CMP(1);
+	IMM_VALUE;
+	OP_CMP(1);
 }
 
-//---------------CMN---------------------------
+// -----------------------------------------------------------------------------
+// CMN
+// -----------------------------------------------------------------------------
 
 #define OP_CMN(a) \
- { \
- u32 tmp = cpu->RREG_POS(i,16) + shift_op;\
- cpu->CPSR.bits.N = BIT31(tmp);\
- cpu->CPSR.bits.Z = (tmp==0);\
- cpu->CPSR.bits.C = UNSIGNED_OVERFLOW(cpu->RREG_POS(i,16), shift_op, tmp);\
- cpu->CPSR.bits.V = SIGNED_OVERFLOW(cpu->RREG_POS(i,16), shift_op, tmp);\
- return a; \
- }
+{ \
+	uint32_t tmp = cpu->RREG_POS(i, 16) + shift_op; \
+	cpu->CPSR.bits.N = BIT31(tmp); \
+	cpu->CPSR.bits.Z = !tmp; \
+	cpu->CPSR.bits.C = CarryFrom(cpu->RREG_POS(i, 16), shift_op); \
+	cpu->CPSR.bits.V = OverflowFromADD(tmp, cpu->RREG_POS(i, 16), shift_op); \
+	return a; \
+}
 
-static u32 FASTCALL OP_CMN_LSL_IMM(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_CMN_LSL_IMM(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 shift_op;
- LSL_IMM;
- OP_CMN(1);
+	LSL_IMM;
+	OP_CMN(1);
 }
 
-static u32 FASTCALL OP_CMN_LSL_REG(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_CMN_LSL_REG(uint32_t i)
 {
- u32 i = cpu->instruction;
- LSL_REG;
- OP_CMN(2);
+	LSL_REG;
+	OP_CMN(2);
 }
 
-static u32 FASTCALL OP_CMN_LSR_IMM(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_CMN_LSR_IMM(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 shift_op;
- LSR_IMM;
- OP_CMN(1);
+	LSR_IMM;
+	OP_CMN(1);
 }
 
-static u32 FASTCALL OP_CMN_LSR_REG(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_CMN_LSR_REG(uint32_t i)
 {
- u32 i = cpu->instruction;
- LSR_REG;
- OP_CMN(2);
+	LSR_REG;
+	OP_CMN(2);
 }
 
-static u32 FASTCALL OP_CMN_ASR_IMM(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_CMN_ASR_IMM(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 shift_op;
- ASR_IMM;
- OP_CMN(1);
+	ASR_IMM;
+	OP_CMN(1);
 }
 
-static u32 FASTCALL OP_CMN_ASR_REG(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_CMN_ASR_REG(uint32_t i)
 {
- u32 i = cpu->instruction;
- ASR_REG;
- OP_CMN(2);
+	ASR_REG;
+	OP_CMN(2);
 }
 
-static u32 FASTCALL OP_CMN_ROR_IMM(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_CMN_ROR_IMM(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 shift_op;
- ROR_IMM;
- OP_CMN(1);
+	ROR_IMM;
+	OP_CMN(1);
 }
 
-static u32 FASTCALL OP_CMN_ROR_REG(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_CMN_ROR_REG(uint32_t i)
 {
- u32 i = cpu->instruction;
- ROR_REG;
- OP_CMN(2);
+	ROR_REG;
+	OP_CMN(2);
 }
 
-static u32 FASTCALL OP_CMN_IMM_VAL(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_CMN_IMM_VAL(uint32_t i)
 {
- u32 i = cpu->instruction;
- IMM_VALUE;
- OP_CMN(1);
+	IMM_VALUE;
+	OP_CMN(1);
 }
 
-//------------------ORR-------------------
+// -----------------------------------------------------------------------------
+// ORR / ORRS
+// -----------------------------------------------------------------------------
 
-#define OP_ORR(a, b) cpu->RREG_POS(i,12) = cpu->RREG_POS(i,16) | shift_op;\
- if(REG_POS(i,12)==15)\
- {\
- cpu->next_instruction = cpu->R15;\
- return b;\
- }\
- return a;
+#define OP_ORR(a, b) \
+	cpu->RREG_POS(i, 12) = cpu->RREG_POS(i, 16) | shift_op; \
+	if (REG_POS(i, 12) == 15) \
+	{ \
+		cpu->next_instruction = cpu->R15; \
+		return b; \
+	} \
+	return a;
 
-static u32 FASTCALL OP_ORR_LSL_IMM(armcpu_t *cpu)
+#define OP_ORRS(a,b) \
+{ \
+	cpu->RREG_POS(i, 12) = cpu->RREG_POS(i, 16) | shift_op; \
+	if (REG_POS(i, 12) == 15) \
+	{ \
+		Status_Reg SPSR = cpu->SPSR; \
+		armcpu_switchMode(cpu, SPSR.bits.mode); \
+		cpu->CPSR = SPSR; \
+		cpu->changeCPSR(); \
+		cpu->R15 &= 0xFFFFFFFC | (static_cast<uint32_t>(cpu->CPSR.bits.T) << 1); \
+		cpu->next_instruction = cpu->R15; \
+		return b; \
+	} \
+	cpu->CPSR.bits.C = c; \
+	cpu->CPSR.bits.N = BIT31(cpu->RREG_POS(i, 12)); \
+	cpu->CPSR.bits.Z = !cpu->RREG_POS(i, 12); \
+	return a; \
+}
+
+TEMPLATE static uint32_t FASTCALL OP_ORR_LSL_IMM(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 shift_op;
- LSL_IMM;
- OP_ORR(1, 3);
+	LSL_IMM;
+	OP_ORR(1, 3);
 }
 
-static u32 FASTCALL OP_ORR_LSL_REG(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_ORR_LSL_REG(uint32_t i)
 {
- u32 i = cpu->instruction;
- LSL_REG;
- OP_ORR(2, 4);
+	LSL_REG;
+	OP_ORR(2, 4);
 }
 
-static u32 FASTCALL OP_ORR_LSR_IMM(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_ORR_LSR_IMM(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 shift_op;
- LSR_IMM;
- OP_ORR(1, 3);
+	LSR_IMM;
+	OP_ORR(1, 3);
 }
 
-static u32 FASTCALL OP_ORR_LSR_REG(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_ORR_LSR_REG(uint32_t i)
 {
- u32 i = cpu->instruction;
- LSR_REG;
- OP_ORR(2, 4);
+	LSR_REG;
+	OP_ORR(2, 4);
 }
 
-static u32 FASTCALL OP_ORR_ASR_IMM(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_ORR_ASR_IMM(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 shift_op;
- ASR_IMM;
- OP_ORR(1, 3);
+	ASR_IMM;
+	OP_ORR(1, 3);
 }
 
-static u32 FASTCALL OP_ORR_ASR_REG(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_ORR_ASR_REG(uint32_t i)
 {
- u32 i = cpu->instruction;
- ASR_REG;
- OP_ORR(2, 4);
+	ASR_REG;
+	OP_ORR(2, 4);
 }
 
-static u32 FASTCALL OP_ORR_ROR_IMM(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_ORR_ROR_IMM(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 shift_op;
- ROR_IMM;
- OP_ORR(1, 3);
+	ROR_IMM;
+	OP_ORR(1, 3);
 }
 
-static u32 FASTCALL OP_ORR_ROR_REG(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_ORR_ROR_REG(uint32_t i)
 {
- u32 i = cpu->instruction;
- ROR_REG;
- OP_ORR(2, 4);
+	ROR_REG;
+	OP_ORR(2, 4);
 }
 
-static u32 FASTCALL OP_ORR_IMM_VAL(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_ORR_IMM_VAL(uint32_t i)
 {
- u32 i = cpu->instruction;
- IMM_VALUE;
- OP_ORR(1, 3);
+	IMM_VALUE;
+	OP_ORR(1, 3);
 }
 
-static u32 FASTCALL OP_ORR_S_LSL_IMM(armcpu_t *cpu)
+
+TEMPLATE static uint32_t FASTCALL OP_ORR_S_LSL_IMM(uint32_t i)
 {
- u32 i = cpu->instruction;
- S_LSL_IMM;
- cpu->RREG_POS(i,12) = cpu->RREG_POS(i,16) | shift_op;
- if(REG_POS(i,12)==15)
- {
- Status_Reg SPSR = cpu->SPSR;
- armcpu_switchMode(cpu, SPSR.bits.mode);
- cpu->CPSR=SPSR;
- cpu->R15 &= (0XFFFFFFFC|(((u32)SPSR.bits.T)<<1));
- cpu->next_instruction = cpu->R15;
- return 4;
- }
- cpu->CPSR.bits.C = c;
- cpu->CPSR.bits.N = BIT31(cpu->RREG_POS(i,12));
- cpu->CPSR.bits.Z = (cpu->RREG_POS(i,12)==0);
- return 2;
+	S_LSL_IMM;
+	OP_ORRS(1,3);
 }
 
-static u32 FASTCALL OP_ORR_S_LSL_REG(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_ORR_S_LSL_REG(uint32_t i)
 {
- u32 i = cpu->instruction;
- S_LSL_REG;
- cpu->RREG_POS(i,12) = cpu->RREG_POS(i,16) | shift_op;
- if(REG_POS(i,12)==15)
- {
- Status_Reg SPSR = cpu->SPSR;
- armcpu_switchMode(cpu, SPSR.bits.mode);
- cpu->CPSR=SPSR;
- cpu->R15 &= (0XFFFFFFFC|(((u32)SPSR.bits.T)<<1));
- cpu->next_instruction = cpu->R15;
- return 5;
- }
- cpu->CPSR.bits.C = c;
- cpu->CPSR.bits.N = BIT31(cpu->RREG_POS(i,12));
- cpu->CPSR.bits.Z = (cpu->RREG_POS(i,12)==0);
- return 3;
+	S_LSL_REG;
+	OP_ORRS(2,4);
 }
 
-static u32 FASTCALL OP_ORR_S_LSR_IMM(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_ORR_S_LSR_IMM(uint32_t i)
 {
- u32 i = cpu->instruction;
- S_LSR_IMM;
- cpu->RREG_POS(i,12) = cpu->RREG_POS(i,16) | shift_op;
- if(REG_POS(i,12)==15)
- {
- Status_Reg SPSR = cpu->SPSR;
- armcpu_switchMode(cpu, SPSR.bits.mode);
- cpu->CPSR=SPSR;
- cpu->R15 &= (0XFFFFFFFC|(((u32)SPSR.bits.T)<<1));
- cpu->next_instruction = cpu->R15;
- return 4;
- }
- cpu->CPSR.bits.C = c;
- cpu->CPSR.bits.N = BIT31(cpu->RREG_POS(i,12));
- cpu->CPSR.bits.Z = (cpu->RREG_POS(i,12)==0);
- return 2;
+	S_LSR_IMM;
+	OP_ORRS(1,3);
 }
 
-static u32 FASTCALL OP_ORR_S_LSR_REG(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_ORR_S_LSR_REG(uint32_t i)
 {
- u32 i = cpu->instruction;
- S_LSR_REG;
- cpu->RREG_POS(i,12) = cpu->RREG_POS(i,16) | shift_op;
- if(REG_POS(i,12)==15)
- {
- Status_Reg SPSR = cpu->SPSR;
- armcpu_switchMode(cpu, SPSR.bits.mode);
- cpu->CPSR=SPSR;
- cpu->R15 &= (0XFFFFFFFC|(((u32)SPSR.bits.T)<<1));
- cpu->next_instruction = cpu->R15;
- return 5;
- }
- cpu->CPSR.bits.C = c;
- cpu->CPSR.bits.N = BIT31(cpu->RREG_POS(i,12));
- cpu->CPSR.bits.Z = (cpu->RREG_POS(i,12)==0);
- return 3;
+	S_LSR_REG;
+	OP_ORRS(2,4);
 }
 
-static u32 FASTCALL OP_ORR_S_ASR_IMM(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_ORR_S_ASR_IMM(uint32_t i)
 {
- u32 i = cpu->instruction;
- S_ASR_IMM;
- cpu->RREG_POS(i,12) = cpu->RREG_POS(i,16) | shift_op;
- if(REG_POS(i,12)==15)
- {
- Status_Reg SPSR = cpu->SPSR;
- armcpu_switchMode(cpu, SPSR.bits.mode);
- cpu->CPSR=SPSR;
- cpu->R15 &= (0XFFFFFFFC|(((u32)SPSR.bits.T)<<1));
- cpu->next_instruction = cpu->R15;
- return 4;
- }
- cpu->CPSR.bits.C = c;
- cpu->CPSR.bits.N = BIT31(cpu->RREG_POS(i,12));
- cpu->CPSR.bits.Z = (cpu->RREG_POS(i,12)==0);
- return 2;
+	S_ASR_IMM;
+	OP_ORRS(1,3);
 }
 
-static u32 FASTCALL OP_ORR_S_ASR_REG(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_ORR_S_ASR_REG(uint32_t i)
 {
- u32 i = cpu->instruction;
- S_ASR_REG;
- cpu->RREG_POS(i,12) = cpu->RREG_POS(i,16) | shift_op;
- if(REG_POS(i,12)==15)
- {
- Status_Reg SPSR = cpu->SPSR;
- armcpu_switchMode(cpu, SPSR.bits.mode);
- cpu->CPSR=SPSR;
- cpu->R15 &= (0XFFFFFFFC|(((u32)SPSR.bits.T)<<1));
- cpu->next_instruction = cpu->R15;
- return 5;
- }
- cpu->CPSR.bits.C = c;
- cpu->CPSR.bits.N = BIT31(cpu->RREG_POS(i,12));
- cpu->CPSR.bits.Z = (cpu->RREG_POS(i,12)==0);
- return 3;
+	S_ASR_REG;
+	OP_ORRS(2,4);
 }
 
-static u32 FASTCALL OP_ORR_S_ROR_IMM(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_ORR_S_ROR_IMM(uint32_t i)
 {
- u32 i = cpu->instruction;
- S_ROR_IMM;
- cpu->RREG_POS(i,12) = cpu->RREG_POS(i,16) | shift_op;
- if(REG_POS(i,12)==15)
- {
- Status_Reg SPSR = cpu->SPSR;
- armcpu_switchMode(cpu, SPSR.bits.mode);
- cpu->CPSR=SPSR;
- cpu->R15 &= (0XFFFFFFFC|(((u32)SPSR.bits.T)<<1));
- cpu->next_instruction = cpu->R15;
- return 4;
- }
- cpu->CPSR.bits.C = c;
- cpu->CPSR.bits.N = BIT31(cpu->RREG_POS(i,12));
- cpu->CPSR.bits.Z = (cpu->RREG_POS(i,12)==0);
- return 2;
+	S_ROR_IMM;
+	OP_ORRS(1,3);
 }
 
-static u32 FASTCALL OP_ORR_S_ROR_REG(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_ORR_S_ROR_REG(uint32_t i)
 {
- u32 i = cpu->instruction;
- S_ROR_REG;
- cpu->RREG_POS(i,12) = cpu->RREG_POS(i,16) | shift_op;
- if(REG_POS(i,12)==15)
- {
- Status_Reg SPSR = cpu->SPSR;
- armcpu_switchMode(cpu, SPSR.bits.mode);
- cpu->CPSR=SPSR;
- cpu->R15 &= (0XFFFFFFFC|(((u32)SPSR.bits.T)<<1));
- cpu->next_instruction = cpu->R15;
- return 5;
- }
- cpu->CPSR.bits.C = c;
- cpu->CPSR.bits.N = BIT31(cpu->RREG_POS(i,12));
- cpu->CPSR.bits.Z = (cpu->RREG_POS(i,12)==0);
- return 3;
+	S_ROR_REG;
+	OP_ORRS(2,4);
 }
 
-static u32 FASTCALL OP_ORR_S_IMM_VAL(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_ORR_S_IMM_VAL(uint32_t i)
 {
- u32 i = cpu->instruction;
- S_IMM_VALUE;
- cpu->RREG_POS(i,12) = cpu->RREG_POS(i,16) | shift_op;
- if(REG_POS(i,12)==15)
- {
- Status_Reg SPSR = cpu->SPSR;
- armcpu_switchMode(cpu, SPSR.bits.mode);
- cpu->CPSR=SPSR;
- cpu->R15 &= (0XFFFFFFFC|(((u32)SPSR.bits.T)<<1));
- cpu->next_instruction = cpu->R15;
- return 4;
- }
- cpu->CPSR.bits.C = c;
- cpu->CPSR.bits.N = BIT31(cpu->RREG_POS(i,12));
- cpu->CPSR.bits.Z = (cpu->RREG_POS(i,12)==0);
- return 2;
+	S_IMM_VALUE;
+	OP_ORRS(1,3);
 }
 
-//------------------MOV-------------------
+// -----------------------------------------------------------------------------
+// MOV / MOVS
+// -----------------------------------------------------------------------------
 
-#define OP_MOV(a, b) cpu->RREG_POS(i,12) = shift_op;\
- if(REG_POS(i,12)==15)\
- {\
- cpu->next_instruction = shift_op;\
- return b;\
- }\
- return a;
+#define OP_MOV(a, b) \
+	cpu->RREG_POS(i, 12) = shift_op; \
+	if (REG_POS(i, 12) == 15) \
+	{ \
+		cpu->next_instruction = shift_op; \
+		return b; \
+	} \
+	return a;
 
-#define OP_MOV_S(a, b) cpu->RREG_POS(i,12) = shift_op;\
- if(BIT20(i) && REG_POS(i,12)==15)\
- {\
- Status_Reg SPSR = cpu->SPSR;\
- armcpu_switchMode(cpu, SPSR.bits.mode);\
- cpu->CPSR=SPSR;\
- cpu->R15 &= (0XFFFFFFFC|(((u32)SPSR.bits.T)<<1));\
- cpu->next_instruction = cpu->R15;\
- return b;\
- }\
- cpu->CPSR.bits.C = c;\
- cpu->CPSR.bits.N = BIT31(cpu->RREG_POS(i,12));\
- cpu->CPSR.bits.Z = (cpu->RREG_POS(i,12)==0);\
- return a;\
+#define OP_MOVS(a, b) \
+	cpu->RREG_POS(i, 12) = shift_op; \
+	if (REG_POS(i, 12) == 15) \
+	{ \
+		Status_Reg SPSR = cpu->SPSR; \
+		armcpu_switchMode(cpu, SPSR.bits.mode); \
+		cpu->CPSR = SPSR; \
+		cpu->changeCPSR(); \
+		cpu->R15 &= 0xFFFFFFFC | (static_cast<uint32_t>(cpu->CPSR.bits.T) << 1); \
+		cpu->next_instruction = cpu->R15; \
+		return b; \
+	} \
+	cpu->CPSR.bits.C = c; \
+	cpu->CPSR.bits.N = BIT31(cpu->RREG_POS(i, 12)); \
+	cpu->CPSR.bits.Z = !cpu->RREG_POS(i, 12); \
+	return a;
 
-static u32 FASTCALL OP_MOV_LSL_IMM(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_MOV_LSL_IMM(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 shift_op;
- LSL_IMM;
- OP_MOV(1,3);
+	if (i == 0xE1A00000) // nop: MOV R0, R0
+		return 1;
+
+	LSL_IMM;
+	OP_MOV(1,3);
 }
 
-static u32 FASTCALL OP_MOV_LSL_REG(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_MOV_LSL_REG(uint32_t i)
 {
- u32 i = cpu->instruction;
- LSL_REG;
-	 if (REG_POS(i,0) == 15) shift_op += 4;
- OP_MOV(2,4);
+	LSL_REG;
+	if (REG_POS(i, 0) == 15)
+		shift_op += 4;
+	OP_MOV(2,4);
 }
 
-static u32 FASTCALL OP_MOV_LSR_IMM(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_MOV_LSR_IMM(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 shift_op;
- LSR_IMM;
- OP_MOV(1,3);
+	LSR_IMM;
+	OP_MOV(1,3);
 }
 
-static u32 FASTCALL OP_MOV_LSR_REG(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_MOV_LSR_REG(uint32_t i)
 {
- u32 i = cpu->instruction;
- LSR_REG;
-	 if (REG_POS(i,0) == 15) shift_op += 4;
- OP_MOV(2,4);
+	LSR_REG;
+	if (REG_POS(i, 0) == 15)
+		shift_op += 4;
+	OP_MOV(2,4);
 }
 
-static u32 FASTCALL OP_MOV_ASR_IMM(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_MOV_ASR_IMM(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 shift_op;
- ASR_IMM;
- OP_MOV(1,3);
+	ASR_IMM;
+	OP_MOV(1,3);
 }
 
-static u32 FASTCALL OP_MOV_ASR_REG(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_MOV_ASR_REG(uint32_t i)
 {
- u32 i = cpu->instruction;
- ASR_REG;
- OP_MOV(2,4);
+	ASR_REG;
+	OP_MOV(2,4);
 }
 
-static u32 FASTCALL OP_MOV_ROR_IMM(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_MOV_ROR_IMM(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 shift_op;
- ROR_IMM;
- OP_MOV(2,4);
+	ROR_IMM;
+	OP_MOV(1,3);
 }
 
-static u32 FASTCALL OP_MOV_ROR_REG(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_MOV_ROR_REG(uint32_t i)
 {
- u32 i = cpu->instruction;
- ROR_REG;
- OP_MOV(2,4);
+	ROR_REG;
+	OP_MOV(2,4);
 }
 
-static u32 FASTCALL OP_MOV_IMM_VAL(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_MOV_IMM_VAL(uint32_t i)
 {
- u32 i = cpu->instruction;
- IMM_VALUE;
- OP_MOV(1,3);
+	IMM_VALUE;
+	OP_MOV(1,3);
 }
 
-static u32 FASTCALL OP_MOV_S_LSL_IMM(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_MOV_S_LSL_IMM(uint32_t i)
 {
- u32 i = cpu->instruction;
- S_LSL_IMM;
- OP_MOV_S(2,4);
+	S_LSL_IMM;
+	OP_MOVS(1,3);
 }
 
-static u32 FASTCALL OP_MOV_S_LSL_REG(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_MOV_S_LSL_REG(uint32_t i)
 {
- u32 i = cpu->instruction;
- S_LSL_REG;
-	 if (REG_POS(i,0) == 15) shift_op += 4;
- OP_MOV_S(3,5);
+	S_LSL_REG;
+	if (REG_POS(i, 0) == 15)
+		shift_op += 4;
+	OP_MOVS(2,4);
 }
 
-static u32 FASTCALL OP_MOV_S_LSR_IMM(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_MOV_S_LSR_IMM(uint32_t i)
 {
- u32 i = cpu->instruction;
- S_LSR_IMM;
- OP_MOV_S(2,4);
+	S_LSR_IMM;
+	OP_MOVS(1,3);
 }
 
-static u32 FASTCALL OP_MOV_S_LSR_REG(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_MOV_S_LSR_REG(uint32_t i)
 {
- u32 i = cpu->instruction;
- S_LSR_REG;
-	 if (REG_POS(i,0) == 15) shift_op += 4;
- OP_MOV_S(3,5);
+	S_LSR_REG;
+	if (REG_POS(i, 0) == 15)
+		shift_op += 4;
+	OP_MOVS(2,4);
 }
 
-static u32 FASTCALL OP_MOV_S_ASR_IMM(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_MOV_S_ASR_IMM(uint32_t i)
 {
- u32 i = cpu->instruction;
- S_ASR_IMM;
- OP_MOV_S(2,4);
+	S_ASR_IMM;
+	OP_MOVS(1,3);
 }
 
-static u32 FASTCALL OP_MOV_S_ASR_REG(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_MOV_S_ASR_REG(uint32_t i)
 {
- u32 i = cpu->instruction;
- S_ASR_REG;
- OP_MOV_S(3,5);
+	S_ASR_REG;
+	OP_MOVS(2,4);
 }
 
-static u32 FASTCALL OP_MOV_S_ROR_IMM(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_MOV_S_ROR_IMM(uint32_t i)
 {
- u32 i = cpu->instruction;
- S_ROR_IMM;
- OP_MOV_S(2,4);
+	S_ROR_IMM;
+	OP_MOVS(1,3);
 }
 
-static u32 FASTCALL OP_MOV_S_ROR_REG(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_MOV_S_ROR_REG(uint32_t i)
 {
- u32 i = cpu->instruction;
- S_ROR_REG;
- OP_MOV_S(3,5);
+	S_ROR_REG;
+	OP_MOVS(2,4);
 }
 
-static u32 FASTCALL OP_MOV_S_IMM_VAL(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_MOV_S_IMM_VAL(uint32_t i)
 {
- u32 i = cpu->instruction;
- S_IMM_VALUE;
- OP_MOV_S(2,4);
+	S_IMM_VALUE;
+	OP_MOVS(1,3);
 }
 
-//------------------BIC-------------------
-#define OPP_BIC(a, b) cpu->RREG_POS(i,12) = cpu->RREG_POS(i,16) & (~shift_op);\
- if(REG_POS(i,12)==15)\
- {\
- cpu->next_instruction = cpu->R15;\
- return b;\
- }\
- return a;
+// -----------------------------------------------------------------------------
+// BIC / BICS
+// -----------------------------------------------------------------------------
+
+#define OP_BIC(a, b) \
+	cpu->RREG_POS(i, 12) = cpu->RREG_POS(i, 16) & ~shift_op; \
+	if (REG_POS(i, 12) == 15) \
+	{ \
+		cpu->next_instruction = cpu->R15; \
+		return b; \
+	} \
+	return a;
 
-#define OPP_BIC_S(a, b) cpu->RREG_POS(i,12) = cpu->RREG_POS(i,16) & (~shift_op);\
- if(REG_POS(i,12)==15)\
- {\
- Status_Reg SPSR = cpu->SPSR;\
- armcpu_switchMode(cpu, SPSR.bits.mode);\
- cpu->CPSR=SPSR;\
- cpu->R15 &= (0XFFFFFFFC|(((u32)SPSR.bits.T)<<1));\
- cpu->next_instruction = cpu->R15;\
- return b;\
- }\
- cpu->CPSR.bits.C = c;\
- cpu->CPSR.bits.N = BIT31(cpu->RREG_POS(i,12));\
- cpu->CPSR.bits.Z = (cpu->RREG_POS(i,12)==0);\
- return a;
+#define OP_BICS(a, b) \
+	cpu->RREG_POS(i, 12) = cpu->RREG_POS(i, 16) & ~shift_op; \
+	if (REG_POS(i, 12) == 15) \
+	{ \
+		Status_Reg SPSR = cpu->SPSR; \
+		armcpu_switchMode(cpu, SPSR.bits.mode); \
+		cpu->CPSR = SPSR; \
+		cpu->changeCPSR(); \
+		cpu->R15 &= 0xFFFFFFFC | (static_cast<uint32_t>(cpu->CPSR.bits.T) << 1); \
+		cpu->next_instruction = cpu->R15; \
+		return b; \
+	} \
+	cpu->CPSR.bits.C = c; \
+	cpu->CPSR.bits.N = BIT31(cpu->RREG_POS(i, 12)); \
+	cpu->CPSR.bits.Z = !cpu->RREG_POS(i, 12); \
+	return a;
 
-static u32 FASTCALL OP_BIC_LSL_IMM(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_BIC_LSL_IMM(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 shift_op;
- LSL_IMM;
- OPP_BIC(1,3);
+	LSL_IMM;
+	OP_BIC(1,3);
 }
 
-static u32 FASTCALL OP_BIC_LSL_REG(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_BIC_LSL_REG(uint32_t i)
 {
- u32 i = cpu->instruction;
- LSL_REG;
- OPP_BIC(2,4);
+	LSL_REG;
+	OP_BIC(2,4);
 }
 
-static u32 FASTCALL OP_BIC_LSR_IMM(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_BIC_LSR_IMM(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 shift_op;
- LSR_IMM;
- OPP_BIC(1,3);
+	LSR_IMM;
+	OP_BIC(1,3);
 }
 
-static u32 FASTCALL OP_BIC_LSR_REG(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_BIC_LSR_REG(uint32_t i)
 {
- u32 i = cpu->instruction;
- LSR_REG;
- OPP_BIC(2,4);
+	LSR_REG;
+	OP_BIC(2,4);
 }
 
-static u32 FASTCALL OP_BIC_ASR_IMM(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_BIC_ASR_IMM(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 shift_op;
- ASR_IMM;
- OPP_BIC(1,3);
+	ASR_IMM;
+	OP_BIC(1,3);
 }
 
-static u32 FASTCALL OP_BIC_ASR_REG(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_BIC_ASR_REG(uint32_t i)
 {
- u32 i = cpu->instruction;
- ASR_REG;
- OPP_BIC(2,4);
+	ASR_REG;
+	OP_BIC(2,4);
 }
 
-static u32 FASTCALL OP_BIC_ROR_IMM(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_BIC_ROR_IMM(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 shift_op;
- ROR_IMM;
- OPP_BIC(1,3);
+	ROR_IMM;
+	OP_BIC(1,3);
 }
 
-static u32 FASTCALL OP_BIC_ROR_REG(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_BIC_ROR_REG(uint32_t i)
 {
- u32 i = cpu->instruction;
- ROR_REG;
- OPP_BIC(2,4);
+	ROR_REG;
+	OP_BIC(2,4);
 }
 
-static u32 FASTCALL OP_BIC_IMM_VAL(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_BIC_IMM_VAL(uint32_t i)
 {
- u32 i = cpu->instruction;
- IMM_VALUE;
- OPP_BIC(1,3);
+	IMM_VALUE;
+	OP_BIC(1,3);
 }
 
-static u32 FASTCALL OP_BIC_S_LSL_IMM(armcpu_t *cpu)
+
+TEMPLATE static uint32_t FASTCALL OP_BIC_S_LSL_IMM(uint32_t i)
 {
- u32 i = cpu->instruction;
- S_LSL_IMM;
- OPP_BIC_S(2,4);
+	S_LSL_IMM;
+	OP_BICS(1,3);
 }
 
-static u32 FASTCALL OP_BIC_S_LSL_REG(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_BIC_S_LSL_REG(uint32_t i)
 {
- u32 i = cpu->instruction;
- S_LSL_REG;
- OPP_BIC_S(3,5);
+	S_LSL_REG;
+	OP_BICS(2,4);
 }
 
-static u32 FASTCALL OP_BIC_S_LSR_IMM(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_BIC_S_LSR_IMM(uint32_t i)
 {
- u32 i = cpu->instruction;
- S_LSR_IMM;
- OPP_BIC_S(2,4);
+	S_LSR_IMM;
+	OP_BICS(1,3);
 }
 
-static u32 FASTCALL OP_BIC_S_LSR_REG(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_BIC_S_LSR_REG(uint32_t i)
 {
- u32 i = cpu->instruction;
- S_LSR_REG;
- OPP_BIC_S(3,5);
+	S_LSR_REG;
+	OP_BICS(2,4);
 }
 
-static u32 FASTCALL OP_BIC_S_ASR_IMM(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_BIC_S_ASR_IMM(uint32_t i)
 {
- u32 i = cpu->instruction;
- S_ASR_IMM;
- OPP_BIC_S(2,4);
+	S_ASR_IMM;
+	OP_BICS(1,3);
 }
 
-static u32 FASTCALL OP_BIC_S_ASR_REG(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_BIC_S_ASR_REG(uint32_t i)
 {
- u32 i = cpu->instruction;
- S_ASR_REG;
- OPP_BIC_S(3,5);
+	S_ASR_REG;
+	OP_BICS(2,4);
 }
 
-static u32 FASTCALL OP_BIC_S_ROR_IMM(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_BIC_S_ROR_IMM(uint32_t i)
 {
- u32 i = cpu->instruction;
- S_ROR_IMM;
- OPP_BIC_S(2,4);
+	S_ROR_IMM;
+	OP_BICS(1,3);
 }
 
-static u32 FASTCALL OP_BIC_S_ROR_REG(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_BIC_S_ROR_REG(uint32_t i)
 {
- u32 i = cpu->instruction;
- S_ROR_REG;
- OPP_BIC_S(3,5);
+	S_ROR_REG;
+	OP_BICS(2,4);
 }
 
-static u32 FASTCALL OP_BIC_S_IMM_VAL(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_BIC_S_IMM_VAL(uint32_t i)
 {
- u32 i = cpu->instruction;
- S_IMM_VALUE;
- OPP_BIC_S(2,4);
+	S_IMM_VALUE;
+	OP_BICS(1,3);
 }
 
-//------------------MVN-------------------
-#define OPP_MVN(a, b) cpu->RREG_POS(i,12) = ~shift_op;\
- if(REG_POS(i,12)==15)\
- {\
- cpu->next_instruction = cpu->R15;\
- return b;\
- }\
- return a;
+// -----------------------------------------------------------------------------
+// MVN / MVNS
+// -----------------------------------------------------------------------------
+
+#define OP_MVN(a, b) \
+	cpu->RREG_POS(i, 12) = ~shift_op; \
+	if (REG_POS(i, 12) == 15) \
+	{ \
+		cpu->next_instruction = cpu->R15; \
+		return b; \
+	} \
+	return a;
 
-#define OPP_MVN_S(a, b) cpu->RREG_POS(i,12) = ~shift_op;\
- if(REG_POS(i,12)==15)\
- {\
- Status_Reg SPSR = cpu->SPSR;\
- armcpu_switchMode(cpu, SPSR.bits.mode);\
- cpu->CPSR=SPSR;\
- cpu->R15 &= (0XFFFFFFFC|(((u32)SPSR.bits.T)<<1));\
- cpu->next_instruction = cpu->R15;\
- return b;\
- }\
- cpu->CPSR.bits.C = c;\
- cpu->CPSR.bits.N = BIT31(cpu->RREG_POS(i,12));\
- cpu->CPSR.bits.Z = (cpu->RREG_POS(i,12)==0);\
- return a;
+#define OP_MVNS(a, b) \
+	cpu->RREG_POS(i, 12) = ~shift_op; \
+	if (REG_POS(i, 12) == 15) \
+	{ \
+		Status_Reg SPSR = cpu->SPSR; \
+		armcpu_switchMode(cpu, SPSR.bits.mode); \
+		cpu->CPSR = SPSR; \
+		cpu->changeCPSR(); \
+		cpu->R15 &= 0xFFFFFFFC | (static_cast<uint32_t>(cpu->CPSR.bits.T) << 1); \
+		cpu->next_instruction = cpu->R15; \
+		return b; \
+	} \
+	cpu->CPSR.bits.C = c; \
+	cpu->CPSR.bits.N = BIT31(cpu->RREG_POS(i, 12)); \
+	cpu->CPSR.bits.Z = !cpu->RREG_POS(i, 12); \
+	return a;
 
-static u32 FASTCALL OP_MVN_LSL_IMM(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_MVN_LSL_IMM(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 shift_op;
- LSL_IMM;
- OPP_MVN(1,3);
+	LSL_IMM;
+	OP_MVN(1,3);
 }
 
-static u32 FASTCALL OP_MVN_LSL_REG(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_MVN_LSL_REG(uint32_t i)
 {
- u32 i = cpu->instruction;
- LSL_REG;
- OPP_MVN(2,4);
+	LSL_REG;
+	OP_MVN(2,4);
 }
 
-static u32 FASTCALL OP_MVN_LSR_IMM(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_MVN_LSR_IMM(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 shift_op;
- LSR_IMM;
- OPP_MVN(1,3);
+	LSR_IMM;
+	OP_MVN(1,3);
 }
 
-static u32 FASTCALL OP_MVN_LSR_REG(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_MVN_LSR_REG(uint32_t i)
 {
- u32 i = cpu->instruction;
- LSR_REG;
- OPP_MVN(2,4);
+	LSR_REG;
+	OP_MVN(2,4);
 }
 
-static u32 FASTCALL OP_MVN_ASR_IMM(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_MVN_ASR_IMM(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 shift_op;
- ASR_IMM;
- OPP_MVN(1,3);
+	ASR_IMM;
+	OP_MVN(1,3);
 }
 
-static u32 FASTCALL OP_MVN_ASR_REG(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_MVN_ASR_REG(uint32_t i)
 {
- u32 i = cpu->instruction;
- ASR_REG;
- OPP_MVN(2,4);
+	ASR_REG;
+	OP_MVN(2,4);
 }
 
-static u32 FASTCALL OP_MVN_ROR_IMM(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_MVN_ROR_IMM(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 shift_op;
- ROR_IMM;
- OPP_MVN(1,3);
+	ROR_IMM;
+	OP_MVN(1,3);
 }
 
-static u32 FASTCALL OP_MVN_ROR_REG(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_MVN_ROR_REG(uint32_t i)
 {
- u32 i = cpu->instruction;
- ROR_REG;
- OPP_MVN(2,4);
+	ROR_REG;
+	OP_MVN(2,4);
 }
 
-static u32 FASTCALL OP_MVN_IMM_VAL(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_MVN_IMM_VAL(uint32_t i)
 {
- u32 i = cpu->instruction;
- IMM_VALUE;
- OPP_MVN(1,3);
+	IMM_VALUE;
+	OP_MVN(1,3);
 }
 
-static u32 FASTCALL OP_MVN_S_LSL_IMM(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_MVN_S_LSL_IMM(uint32_t i)
 {
- u32 i = cpu->instruction;
- S_LSL_IMM;
- OPP_MVN_S(2,4);
+	S_LSL_IMM;
+	OP_MVNS(1,3);
 }
 
-static u32 FASTCALL OP_MVN_S_LSL_REG(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_MVN_S_LSL_REG(uint32_t i)
 {
- u32 i = cpu->instruction;
- S_LSL_REG;
- OPP_MVN_S(3,5);
+	S_LSL_REG;
+	OP_MVNS(2,4);
 }
 
-static u32 FASTCALL OP_MVN_S_LSR_IMM(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_MVN_S_LSR_IMM(uint32_t i)
 {
- u32 i = cpu->instruction;
- S_LSR_IMM;
- OPP_MVN_S(2,4);
+	S_LSR_IMM;
+	OP_MVNS(1,3);
 }
 
-static u32 FASTCALL OP_MVN_S_LSR_REG(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_MVN_S_LSR_REG(uint32_t i)
 {
- u32 i = cpu->instruction;
- S_LSR_REG;
- OPP_MVN_S(3,5);
+	S_LSR_REG;
+	OP_MVNS(2,4);
 }
 
-static u32 FASTCALL OP_MVN_S_ASR_IMM(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_MVN_S_ASR_IMM(uint32_t i)
 {
- u32 i = cpu->instruction;
- S_ASR_IMM;
- OPP_MVN_S(2,4);
+	S_ASR_IMM;
+	OP_MVNS(1,3);
 }
 
-static u32 FASTCALL OP_MVN_S_ASR_REG(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_MVN_S_ASR_REG(uint32_t i)
 {
- u32 i = cpu->instruction;
- S_ASR_REG;
- OPP_MVN_S(3,5);
+	S_ASR_REG;
+	OP_MVNS(2,4);
 }
 
-static u32 FASTCALL OP_MVN_S_ROR_IMM(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_MVN_S_ROR_IMM(uint32_t i)
 {
- u32 i = cpu->instruction;
- S_ROR_IMM;
- OPP_MVN_S(2,4);
+	S_ROR_IMM;
+	OP_MVNS(1,3);
 }
 
-static u32 FASTCALL OP_MVN_S_ROR_REG(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_MVN_S_ROR_REG(uint32_t i)
 {
- u32 i = cpu->instruction;
- S_ROR_REG;
- OPP_MVN_S(3,5);
+	S_ROR_REG;
+	OP_MVNS(2,4);
 }
 
-static u32 FASTCALL OP_MVN_S_IMM_VAL(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_MVN_S_IMM_VAL(uint32_t i)
 {
- u32 i = cpu->instruction;
- S_IMM_VALUE;
- OPP_MVN_S(2,4);
+	S_IMM_VALUE;
+	OP_MVNS(1,3);
 }
 
-//-------------MUL------------------------
-#define OPP_M(a,b) v >>= 8;\
- if((v==0)||(v==0xFFFFFF))\
- return b;\
- v >>= 8;\
- if((v==0)||(v==0xFFFF))\
- return b+1;\
- v >>= 8;\
- if((v==0)||(v==0xFF))\
- return b+2;\
- return a;\
+// -----------------------------------------------------------------------------
+// MUL / MULS / MLA / MLAS
+// -----------------------------------------------------------------------------
+
+#define MUL_Mxx_END(c) \
+	v >>= 8; \
+	if (!v || v == 0xFFFFFF) \
+		return c + 1; \
+	v >>= 8; \
+	if (!v || v == 0xFFFF) \
+		return c + 2; \
+	v >>= 8; \
+	if (!v || v == 0xFF) \
+		return c + 3; \
+	return c + 4;
 
-static u32 FASTCALL OP_MUL(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_MUL(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 v = cpu->RREG_POS(i,0);
- cpu->RREG_POS(i,16) = cpu->RREG_POS(i,8) * v;
- OPP_M(5,2);
+	uint32_t v = cpu->RREG_POS(i, 8);
+	cpu->RREG_POS(i, 16) = cpu->RREG_POS(i, 0) * v;
+
+	MUL_Mxx_END(1);
 }
 
-static u32 FASTCALL OP_MLA(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_MLA(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 v = cpu->RREG_POS(i,0);
- u32 a = cpu->RREG_POS(i,8);
- u32 b = cpu->RREG_POS(i,12);
- cpu->RREG_POS(i,16) = a * v + b;
+	uint32_t v = cpu->RREG_POS(i, 8);
+	cpu->RREG_POS(i, 16) = cpu->RREG_POS(i, 0) * v + cpu->RREG_POS(i, 12);
 
- OPP_M(6,3);
+	MUL_Mxx_END(2);
 }
 
-static u32 FASTCALL OP_MUL_S(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_MUL_S(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 v = cpu->RREG_POS(i,0);
- cpu->RREG_POS(i,16) = cpu->RREG_POS(i,8) * v;
+	uint32_t v = cpu->RREG_POS(i, 8);
+	cpu->RREG_POS(i, 16) = cpu->RREG_POS(i, 0) * v;
 
- cpu->CPSR.bits.N = BIT31(cpu->RREG_POS(i,16));
- cpu->CPSR.bits.Z = (cpu->RREG_POS(i,16)==0);
+	cpu->CPSR.bits.N = BIT31(cpu->RREG_POS(i, 16));
+	cpu->CPSR.bits.Z = !cpu->RREG_POS(i, 16);
 
- OPP_M(6,3);
+	MUL_Mxx_END(1);
 }
 
-static u32 FASTCALL OP_MLA_S(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_MLA_S(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 v = cpu->RREG_POS(i,0);
- cpu->RREG_POS(i,16) = cpu->RREG_POS(i,8) * v + cpu->RREG_POS(i,12);
- cpu->CPSR.bits.N = BIT31(cpu->RREG_POS(i,16));
- cpu->CPSR.bits.Z = (cpu->RREG_POS(i,16)==0);
- OPP_M(7,4);
+	uint32_t v = cpu->RREG_POS(i, 8);
+	cpu->RREG_POS(i, 16) = cpu->RREG_POS(i, 0) * v + cpu->RREG_POS(i, 12);
+
+	cpu->CPSR.bits.N = BIT31(cpu->RREG_POS(i, 16));
+	cpu->CPSR.bits.Z = !cpu->RREG_POS(i, 16);
+
+	MUL_Mxx_END(2);
 }
 
-//----------UMUL--------------------------
+// -----------------------------------------------------------------------------
+// UMULL / UMULLS / UMLAL / UMLALS
+// -----------------------------------------------------------------------------
+
+#define MUL_UMxxL_END(c) \
+	v >>= 8; \
+	if (!v) \
+		return c + 1; \
+	v >>= 8; \
+	if (!v) \
+		return c + 2; \
+	v >>= 8; \
+	if (!v) \
+		return c + 3; \
+	return c + 4;
 
-static u32 FASTCALL OP_UMULL(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_UMULL(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 v = cpu->RREG_POS(i,0);
- u64 res = (u64)v * (u64)cpu->RREG_POS(i,8);
+	uint32_t v = cpu->RREG_POS(i, 8);
+	uint64_t res = static_cast<uint64_t>(cpu->RREG_POS(i, 0)) * static_cast<uint64_t>(v);
 
- cpu->RREG_POS(i,12) = (u32)res;
- cpu->RREG_POS(i,16) = (u32)(res>>32);
+	cpu->RREG_POS(i, 12) = static_cast<uint32_t>(res);
+	cpu->RREG_POS(i, 16) = static_cast<uint32_t>(res >> 32);
 
- OPP_M(6,3);
+	MUL_UMxxL_END(2);
 }
 
-static u32 FASTCALL OP_UMLAL(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_UMLAL(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 v = cpu->RREG_POS(i,0);
- u64 res = (u64)v * (u64)cpu->RREG_POS(i,8) + (u64)cpu->RREG_POS(i,12);
+	uint32_t v = cpu->RREG_POS(i, 8);
+	uint64_t res = static_cast<uint64_t>(cpu->RREG_POS(i, 0)) * static_cast<uint64_t>(v);
 
- cpu->RREG_POS(i,12) = (u32)res;
- cpu->RREG_POS(i,16) += (u32)(res>>32);
+	// RdLo = (Rm * Rs)31:0 + RdLo /* Unsigned multiplication */
+	// RdHi = (Rm * Rs)63:32 + RdHi + CarryFrom((Rm * Rs)31:0 + RdLo)
+	uint32_t tmp = static_cast<uint32_t>(res); // low
+	cpu->RREG_POS(i, 16) = static_cast<uint32_t>(res >> 32) + cpu->RREG_POS(i, 16) + CarryFrom(tmp, cpu->RREG_POS(i, 12));
+	cpu->RREG_POS(i, 12) += tmp;
 
- OPP_M(7,4);
+	MUL_UMxxL_END(3);
 }
 
-static u32 FASTCALL OP_UMULL_S(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_UMULL_S(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 v = cpu->RREG_POS(i,0);
- u64 res = (u64)v * (u64)cpu->RREG_POS(i,8);
+	uint32_t v = cpu->RREG_POS(i, 8);
+	uint64_t res = static_cast<uint64_t>(cpu->RREG_POS(i, 0)) * static_cast<uint64_t>(v);
 
- cpu->RREG_POS(i,12) = (u32)res;
- cpu->RREG_POS(i,16) = (u32)(res>>32);
+	cpu->RREG_POS(i, 12) = static_cast<uint32_t>(res);
+	cpu->RREG_POS(i, 16) = static_cast<uint32_t>(res >> 32);
 
- cpu->CPSR.bits.N = BIT31(cpu->RREG_POS(i,16));
- cpu->CPSR.bits.Z = (cpu->RREG_POS(i,16)==0) & (cpu->RREG_POS(i,12)==0);
+	cpu->CPSR.bits.N = BIT31(cpu->RREG_POS(i, 16));
+	cpu->CPSR.bits.Z = !cpu->RREG_POS(i, 16) && !cpu->RREG_POS(i, 12);
 
- OPP_M(7,4);
+	MUL_UMxxL_END(2);
 }
 
-static u32 FASTCALL OP_UMLAL_S(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_UMLAL_S(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 v = cpu->RREG_POS(i,0);
- u64 res = (u64)v * (u64)cpu->RREG_POS(i,8) + (u64)cpu->RREG_POS(i,12);
+	uint32_t v = cpu->RREG_POS(i, 8);
+	uint64_t res = static_cast<uint64_t>(cpu->RREG_POS(i, 0)) * static_cast<uint64_t>(v);
 
- cpu->RREG_POS(i,12) = (u32)res;
- cpu->RREG_POS(i,16) += (u32)(res>>32);
+	// RdLo = (Rm * Rs)31:0 + RdLo /* Unsigned multiplication */
+	// RdHi = (Rm * Rs)63:32 + RdHi + CarryFrom((Rm * Rs)31:0 + RdLo)
+	uint32_t tmp = static_cast<uint32_t>(res); // low
+	cpu->RREG_POS(i, 16) = static_cast<uint32_t>(res >> 32) + cpu->RREG_POS(i, 16) + CarryFrom(tmp, cpu->RREG_POS(i, 12));
+	cpu->RREG_POS(i, 12) += tmp;
 
- cpu->CPSR.bits.N = BIT31(cpu->RREG_POS(i,16));
- cpu->CPSR.bits.Z = (cpu->RREG_POS(i,16)==0) & (cpu->RREG_POS(i,12)==0);
+	cpu->CPSR.bits.N = BIT31(cpu->RREG_POS(i, 16));
+	cpu->CPSR.bits.Z = !cpu->RREG_POS(i, 16) && !cpu->RREG_POS(i, 12);
 
- OPP_M(8,5);
+	MUL_UMxxL_END(3);
 }
 
-//----------SMUL--------------------------
+// -----------------------------------------------------------------------------
+// SMULL / SMULLS / SMLAL / SMLALS
+// -----------------------------------------------------------------------------
 
-static u32 FASTCALL OP_SMULL(armcpu_t *cpu)
-{
- u32 i = cpu->instruction;
- s64 v = (s32)cpu->RREG_POS(i,0);
- s64 b = (s32)cpu->RREG_POS(i,8);
- s64 res = v * b;
+#define MUL_SMxxL_END(c) \
+	v &= 0xFFFFFFFF; \
+	v >>= 8; \
+	if (!v || v == 0xFFFFFF) \
+		return c + 1; \
+	v >>= 8; \
+	if (!v || v == 0xFFFF) \
+		return c + 2; \
+	v >>= 8; \
+	if (!v || v == 0xFF) \
+		return c + 3; \
+	return c + 4;
 
- cpu->RREG_POS(i,12) = (u32)(res&0xFFFFFFFF);
- cpu->RREG_POS(i,16) = (u32)(res>>32);
+TEMPLATE static uint32_t FASTCALL OP_SMULL(uint32_t i)
+{
+	int64_t v = static_cast<int32_t>(cpu->RREG_POS(i, 8));
+	int64_t res = v * static_cast<int64_t>(static_cast<int32_t>(cpu->RREG_POS(i, 0)));
 
- v &= 0xFFFFFFFF;
+	cpu->RREG_POS(i, 12) = static_cast<uint32_t>(res);
+	cpu->RREG_POS(i, 16) = static_cast<uint32_t>(res >> 32);
 
- OPP_M(6,3);
+	MUL_SMxxL_END(2);
 }
 
-static u32 FASTCALL OP_SMLAL(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_SMLAL(uint32_t i)
 {
- u32 i = cpu->instruction;
-
- s64 v = (s32)cpu->RREG_POS(i,0);
- s64 b = (s32)cpu->RREG_POS(i,8);
- s64 res = v * b + (u64)cpu->RREG_POS(i,12);
+	int64_t v = static_cast<int32_t>(cpu->RREG_POS(i, 8));
+	int64_t res = v * static_cast<int64_t>(static_cast<int32_t>(cpu->RREG_POS(i, 0)));
 
- //LOG("%08X * %08X + %08X%08X\r\n", cpu->RREG_POS(i,0), cpu->RREG_POS(i,8), cpu->RREG_POS(i,16), cpu->RREG_POS(i,12));
+	uint32_t tmp = static_cast<uint32_t>(res);
+	cpu->RREG_POS(i, 16) = static_cast<uint32_t>(res >> 32) + cpu->RREG_POS(i, 16) + CarryFrom(tmp, cpu->RREG_POS(i, 12));
+	cpu->RREG_POS(i, 12) += tmp;
 
- cpu->RREG_POS(i,12) = (u32)res;
- cpu->RREG_POS(i,16) += (u32)(res>>32);
-
- //LOG("= %08X%08X %08X%08X\r\n", cpu->RREG_POS(i,16), cpu->RREG_POS(i,12), res);
-
- v &= 0xFFFFFFFF;
-
- OPP_M(7,4);
+	MUL_SMxxL_END(3);
 }
 
-static u32 FASTCALL OP_SMULL_S(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_SMULL_S(uint32_t i)
 {
- u32 i = cpu->instruction;
- s64 v = (s32)cpu->RREG_POS(i,0);
- s64 b = (s32)cpu->RREG_POS(i,8);
- s64 res = v * b;
+	int64_t v = static_cast<int32_t>(cpu->RREG_POS(i, 8));
+	int64_t res = v * static_cast<int64_t>(static_cast<int32_t>(cpu->RREG_POS(i, 0)));
 
- cpu->RREG_POS(i,12) = (u32)res;
- cpu->RREG_POS(i,16) = (u32)(res>>32);
+	cpu->RREG_POS(i, 12) = static_cast<uint32_t>(res);
+	cpu->RREG_POS(i, 16) = static_cast<uint32_t>(res >> 32);
 
- cpu->CPSR.bits.N = BIT31(cpu->RREG_POS(i,16));
- cpu->CPSR.bits.Z = (cpu->RREG_POS(i,16)==0) & (cpu->RREG_POS(i,12)==0);
+	cpu->CPSR.bits.N = BIT31(cpu->RREG_POS(i, 16));
+	cpu->CPSR.bits.Z = !cpu->RREG_POS(i, 16) && !cpu->RREG_POS(i, 12);
 
- v &= 0xFFFFFFFF;
-
- OPP_M(7,4);
+	MUL_SMxxL_END(2);
 }
 
-static u32 FASTCALL OP_SMLAL_S(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_SMLAL_S(uint32_t i)
 {
- u32 i = cpu->instruction;
- s64 v = (s32)cpu->RREG_POS(i,0);
- s64 b = (s32)cpu->RREG_POS(i,8);
- s64 res = v * b + (u64)cpu->RREG_POS(i,12);
-
- cpu->RREG_POS(i,12) = (u32)res;
- cpu->RREG_POS(i,16) += (u32)(res>>32);
+	int64_t v = static_cast<int32_t>(cpu->RREG_POS(i, 8));
+	int64_t res = v * static_cast<int64_t>(static_cast<int32_t>(cpu->RREG_POS(i, 0)));
 
- cpu->CPSR.bits.N = BIT31(cpu->RREG_POS(i,16));
- cpu->CPSR.bits.Z = (cpu->RREG_POS(i,16)==0) & (cpu->RREG_POS(i,12)==0);
+	uint32_t tmp = static_cast<uint32_t>(res);
+	cpu->RREG_POS(i, 16) = static_cast<uint32_t>(res >> 32) + cpu->RREG_POS(i, 16) + CarryFrom(tmp, cpu->RREG_POS(i, 12));
+	cpu->RREG_POS(i, 12) += tmp;
 
- v &= 0xFFFFFFFF;
+	cpu->CPSR.bits.N = BIT31(cpu->RREG_POS(i, 16));
+	cpu->CPSR.bits.Z = !cpu->RREG_POS(i, 16) && !cpu->RREG_POS(i, 12);
 
- OPP_M(8,5);
+	MUL_SMxxL_END(3);
 }
 
-//---------------SWP------------------------------
+// -----------------------------------------------------------------------------
+// SWP / SWPB
+// -----------------------------------------------------------------------------
 
-static u32 FASTCALL OP_SWP(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_SWP(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 adr = cpu->RREG_POS(i,16);
- u32 tmp = ROR(READ32(cpu->mem_if->data, adr), ((cpu->RREG_POS(i,16)&3)<<3));
+	uint32_t adr = cpu->RREG_POS(i, 16);
+	uint32_t tmp = ROR(READ32(cpu->mem_if->data, adr), (adr & 3) << 3);
 
- WRITE32(cpu->mem_if->data, adr, cpu->RREG_POS(i,0));
- cpu->RREG_POS(i,12) = tmp;
+	WRITE32(cpu->mem_if->data, adr, cpu->RREG_POS(i, 0));
+	cpu->RREG_POS(i, 12) = tmp;
 
- return 4 + MMU.MMU_WAIT32cpu->proc_ID(adr>>24)&0xF*2;
+	uint32_t c = MMU_memAccessCycles<PROCNUM, 32, MMU_AD_READ>(adr);
+	c += MMU_memAccessCycles<PROCNUM, 32, MMU_AD_WRITE>(adr);
+	return MMU_aluMemCycles<PROCNUM>(4, c);
 }
 
-static u32 FASTCALL OP_SWPB(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_SWPB(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 adr = cpu->RREG_POS(i,16);
- u8 tmp = READ8(cpu->mem_if->data, adr);
- WRITE8(cpu->mem_if->data, adr, (u8)(cpu->RREG_POS(i,0)&0xFF));
- cpu->RREG_POS(i,12) = tmp;
+	uint32_t adr = cpu->RREG_POS(i, 16);
+	uint8_t tmp = READ8(cpu->mem_if->data, adr);
 
- return 4 + MMU.MMU_WAIT16cpu->proc_ID(adr>>24)&0xF*2;
+	WRITE8(cpu->mem_if->data, adr, static_cast<uint8_t>(cpu->RREG_POS(i, 0) & 0xFF));
+	cpu->RREG_POS(i, 12) = tmp;
+
+	uint32_t c = MMU_memAccessCycles<PROCNUM, 8, MMU_AD_READ>(adr);
+	c += MMU_memAccessCycles<PROCNUM, 8, MMU_AD_WRITE>(adr);
+	return MMU_aluMemCycles<PROCNUM>(4, c);
 }
 
-//------------LDRH-----------------------------
+// -----------------------------------------------------------------------------
+// LDRH
+// -----------------------------------------------------------------------------
 
-static u32 FASTCALL OP_LDRH_P_IMM_OFF(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_LDRH_P_IMM_OFF(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 adr = cpu->RREG_POS(i,16) + IMM_OFF;
- cpu->RREG_POS(i,12) = (u32)READ16(cpu->mem_if->data, adr);
+	uint32_t adr = cpu->RREG_POS(i, 16) + IMM_OFF;
+	cpu->RREG_POS(i, 12) = static_cast<uint32_t>(READ16(cpu->mem_if->data, adr));
 
- return 3 + MMU.MMU_WAIT16cpu->proc_ID(adr>>24)&0xF;
+	return MMU_aluMemAccessCycles<PROCNUM, 16, MMU_AD_READ>(3, adr);
 }
 
-static u32 FASTCALL OP_LDRH_M_IMM_OFF(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_LDRH_M_IMM_OFF(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 adr = cpu->RREG_POS(i,16) - IMM_OFF;
- cpu->RREG_POS(i,12) = (u32)READ16(cpu->mem_if->data, adr);
+	uint32_t adr = cpu->RREG_POS(i, 16) - IMM_OFF;
+	cpu->RREG_POS(i, 12) = static_cast<uint32_t>(READ16(cpu->mem_if->data, adr));
 
- return 3 + MMU.MMU_WAIT16cpu->proc_ID(adr>>24)&0xF;
+	return MMU_aluMemAccessCycles<PROCNUM, 16, MMU_AD_READ>(3, adr);
 }
 
-static u32 FASTCALL OP_LDRH_P_REG_OFF(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_LDRH_P_REG_OFF(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 adr = cpu->RREG_POS(i,16) + cpu->RREG_POS(i,0);
- cpu->RREG_POS(i,12) = (u32)READ16(cpu->mem_if->data, adr);
+	uint32_t adr = cpu->RREG_POS(i, 16) + cpu->RREG_POS(i, 0);
+	cpu->RREG_POS(i, 12) = static_cast<uint32_t>(READ16(cpu->mem_if->data, adr));
 
- return 3 + MMU.MMU_WAIT16cpu->proc_ID(adr>>24)&0xF;
+	return MMU_aluMemAccessCycles<PROCNUM, 16, MMU_AD_READ>(3, adr);
 }
 
-static u32 FASTCALL OP_LDRH_M_REG_OFF(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_LDRH_M_REG_OFF(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 adr = cpu->RREG_POS(i,16) - cpu->RREG_POS(i,0);
- cpu->RREG_POS(i,12) = (u32)READ16(cpu->mem_if->data, adr);
+	uint32_t adr = cpu->RREG_POS(i, 16) - cpu->RREG_POS(i, 0);
+	cpu->RREG_POS(i, 12) = static_cast<uint32_t>(READ16(cpu->mem_if->data, adr));
 
- return 3 + MMU.MMU_WAIT16cpu->proc_ID(adr>>24)&0xF;
+	return MMU_aluMemAccessCycles<PROCNUM, 16, MMU_AD_READ>(3, adr);
 }
 
-static u32 FASTCALL OP_LDRH_PRE_INDE_P_IMM_OFF(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_LDRH_PRE_INDE_P_IMM_OFF(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 adr = cpu->RREG_POS(i,16) + IMM_OFF;
-	 cpu->RREG_POS(i,16) = adr;
- cpu->RREG_POS(i,12) = (u32)READ16(cpu->mem_if->data, adr);
+	uint32_t adr = cpu->RREG_POS(i, 16) + IMM_OFF;
+	cpu->RREG_POS(i, 16) = adr;
+	cpu->RREG_POS(i, 12) = static_cast<uint32_t>(READ16(cpu->mem_if->data, adr));
 
- return 3 + MMU.MMU_WAIT16cpu->proc_ID(adr>>24)&0xF;
+	return MMU_aluMemAccessCycles<PROCNUM, 16, MMU_AD_READ>(3, adr);
 }
 
-static u32 FASTCALL OP_LDRH_PRE_INDE_M_IMM_OFF(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_LDRH_PRE_INDE_M_IMM_OFF(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 adr = cpu->RREG_POS(i,16) - IMM_OFF;
-	 cpu->RREG_POS(i,16) = adr;
- cpu->RREG_POS(i,12) = (u32)READ16(cpu->mem_if->data, adr);
-
+	uint32_t adr = cpu->RREG_POS(i, 16) - IMM_OFF;
+	cpu->RREG_POS(i, 16) = adr;
+	cpu->RREG_POS(i, 12) = static_cast<uint32_t>(READ16(cpu->mem_if->data, adr));
 
- return 3 + MMU.MMU_WAIT16cpu->proc_ID(adr>>24)&0xF;
+	return MMU_aluMemAccessCycles<PROCNUM, 16, MMU_AD_READ>(3, adr);
 }
 
-static u32 FASTCALL OP_LDRH_PRE_INDE_P_REG_OFF(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_LDRH_PRE_INDE_P_REG_OFF(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 adr = cpu->RREG_POS(i,16) + cpu->RREG_POS(i,0);
-	 cpu->RREG_POS(i,16) = adr;
- cpu->RREG_POS(i,12) =(u32)READ16(cpu->mem_if->data, adr);
+	uint32_t adr = cpu->RREG_POS(i, 16) + cpu->RREG_POS(i, 0);
+	cpu->RREG_POS(i, 16) = adr;
+	cpu->RREG_POS(i, 12) = static_cast<uint32_t>(READ16(cpu->mem_if->data, adr));
 
- return 3 + MMU.MMU_WAIT16cpu->proc_ID(adr>>24)&0xF;
+	return MMU_aluMemAccessCycles<PROCNUM, 16, MMU_AD_READ>(3, adr);
 }
 
-static u32 FASTCALL OP_LDRH_PRE_INDE_M_REG_OFF(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_LDRH_PRE_INDE_M_REG_OFF(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 adr = cpu->RREG_POS(i,16) - cpu->RREG_POS(i,0);
-	 cpu->RREG_POS(i,16) = adr;
- cpu->RREG_POS(i,12) = (u32)READ16(cpu->mem_if->data, adr);
+	uint32_t adr = cpu->RREG_POS(i, 16) - cpu->RREG_POS(i, 0);
+	cpu->RREG_POS(i, 16) = adr;
+	cpu->RREG_POS(i, 12) = static_cast<uint32_t>(READ16(cpu->mem_if->data, adr));
 
- return 3 + MMU.MMU_WAIT16cpu->proc_ID(adr>>24)&0xF;
+	return MMU_aluMemAccessCycles<PROCNUM, 16, MMU_AD_READ>(3, adr);
 }
 
-static u32 FASTCALL OP_LDRH_POS_INDE_P_IMM_OFF(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_LDRH_POS_INDE_P_IMM_OFF(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 adr = cpu->RREG_POS(i,16);
- cpu->RREG_POS(i,12) = (u32)READ16(cpu->mem_if->data, adr);
- cpu->RREG_POS(i,16) += IMM_OFF;
+	uint32_t adr = cpu->RREG_POS(i, 16);
+	cpu->RREG_POS(i, 16) += IMM_OFF;
+	cpu->RREG_POS(i, 12) = static_cast<uint32_t>(READ16(cpu->mem_if->data, adr));
 
- return 3 + MMU.MMU_WAIT16cpu->proc_ID(adr>>24)&0xF;
+	return MMU_aluMemAccessCycles<PROCNUM, 16, MMU_AD_READ>(3, adr);
 }
 
-static u32 FASTCALL OP_LDRH_POS_INDE_M_IMM_OFF(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_LDRH_POS_INDE_M_IMM_OFF(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 adr = cpu->RREG_POS(i,16);
- cpu->RREG_POS(i,12) = (u32)READ16(cpu->mem_if->data, adr);
- cpu->RREG_POS(i,16) -= IMM_OFF;
+	uint32_t adr = cpu->RREG_POS(i, 16);
+	cpu->RREG_POS(i, 16) -= IMM_OFF;
+	cpu->RREG_POS(i, 12) = static_cast<uint32_t>(READ16(cpu->mem_if->data, adr));
 
- return 3 + MMU.MMU_WAIT16cpu->proc_ID(adr>>24)&0xF;
+	return MMU_aluMemAccessCycles<PROCNUM, 16, MMU_AD_READ>(3, adr);
 }
 
-static u32 FASTCALL OP_LDRH_POS_INDE_P_REG_OFF(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_LDRH_POS_INDE_P_REG_OFF(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 adr = cpu->RREG_POS(i,16);
- cpu->RREG_POS(i,12) = (u32)READ16(cpu->mem_if->data, adr);
- cpu->RREG_POS(i,16) += cpu->RREG_POS(i,0);
+	uint32_t adr = cpu->RREG_POS(i, 16);
+	cpu->RREG_POS(i, 16) += cpu->RREG_POS(i, 0);
+	cpu->RREG_POS(i, 12) = static_cast<uint32_t>(READ16(cpu->mem_if->data, adr));
 
- return 3 + MMU.MMU_WAIT16cpu->proc_ID(adr>>24)&0xF;
+	return MMU_aluMemAccessCycles<PROCNUM, 16, MMU_AD_READ>(3, adr);
 }
 
-static u32 FASTCALL OP_LDRH_POS_INDE_M_REG_OFF(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_LDRH_POS_INDE_M_REG_OFF(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 adr = cpu->RREG_POS(i,16);
- cpu->RREG_POS(i,12) = (u32)READ16(cpu->mem_if->data, adr);
- cpu->RREG_POS(i,16) -= cpu->RREG_POS(i,0);
+	uint32_t adr = cpu->RREG_POS(i, 16);
+	cpu->RREG_POS(i, 16) -= cpu->RREG_POS(i, 0);
+	cpu->RREG_POS(i, 12) = static_cast<uint32_t>(READ16(cpu->mem_if->data, adr));
 
- return 3 + MMU.MMU_WAIT16cpu->proc_ID(adr>>24)&0xF;
+	return MMU_aluMemAccessCycles<PROCNUM, 16, MMU_AD_READ>(3, adr);
 }
 
-//------------STRH-----------------------------
+// -----------------------------------------------------------------------------
+// STRH
+// -----------------------------------------------------------------------------
 
-static u32 FASTCALL OP_STRH_P_IMM_OFF(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_STRH_P_IMM_OFF(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 adr = cpu->RREG_POS(i,16) + IMM_OFF;
- WRITE16(cpu->mem_if->data, adr, (u16)cpu->RREG_POS(i,12));
+	uint32_t adr = cpu->RREG_POS(i, 16) + IMM_OFF;
+	WRITE16(cpu->mem_if->data, adr, static_cast<uint16_t>(cpu->RREG_POS(i, 12)));
 
- return 2 + MMU.MMU_WAIT16cpu->proc_ID(adr>>24)&0xF;
+	return MMU_aluMemAccessCycles<PROCNUM, 16, MMU_AD_WRITE>(2, adr);
 }
 
-static u32 FASTCALL OP_STRH_M_IMM_OFF(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_STRH_M_IMM_OFF(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 adr = cpu->RREG_POS(i,16) - IMM_OFF;
- WRITE16(cpu->mem_if->data, adr, (u16)cpu->RREG_POS(i,12));
+	uint32_t adr = cpu->RREG_POS(i, 16) - IMM_OFF;
+	WRITE16(cpu->mem_if->data, adr, static_cast<uint16_t>(cpu->RREG_POS(i, 12)));
 
- return 2 + MMU.MMU_WAIT16cpu->proc_ID(adr>>24)&0xF;
+	return MMU_aluMemAccessCycles<PROCNUM, 16, MMU_AD_WRITE>(2, adr);
 }
 
-static u32 FASTCALL OP_STRH_P_REG_OFF(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_STRH_P_REG_OFF(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 adr = cpu->RREG_POS(i,16) + cpu->RREG_POS(i,0);
- WRITE16(cpu->mem_if->data, adr, (u16)cpu->RREG_POS(i,12));
+	uint32_t adr = cpu->RREG_POS(i, 16) + cpu->RREG_POS(i, 0);
+	WRITE16(cpu->mem_if->data, adr, static_cast<uint16_t>(cpu->RREG_POS(i, 12)));
 
- return 2 + MMU.MMU_WAIT16cpu->proc_ID(adr>>24)&0xF;
+	return MMU_aluMemAccessCycles<PROCNUM, 16, MMU_AD_WRITE>(2, adr);
 }
 
-static u32 FASTCALL OP_STRH_M_REG_OFF(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_STRH_M_REG_OFF(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 adr = cpu->RREG_POS(i,16) - cpu->RREG_POS(i,0);
- WRITE16(cpu->mem_if->data, adr, (u16)cpu->RREG_POS(i,12));
+	uint32_t adr = cpu->RREG_POS(i, 16) - cpu->RREG_POS(i, 0);
+	WRITE16(cpu->mem_if->data, adr, static_cast<uint16_t>(cpu->RREG_POS(i, 12)));
 
- return 2 + MMU.MMU_WAIT16cpu->proc_ID(adr>>24)&0xF;
+	return MMU_aluMemAccessCycles<PROCNUM, 16, MMU_AD_WRITE>(2, adr);
 }
 
-static u32 FASTCALL OP_STRH_PRE_INDE_P_IMM_OFF(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_STRH_PRE_INDE_P_IMM_OFF(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 adr = cpu->RREG_POS(i,16) + IMM_OFF;
-	 cpu->RREG_POS(i,16) = adr;
- WRITE16(cpu->mem_if->data, adr, (u16)cpu->RREG_POS(i,12));
+	uint32_t adr = cpu->RREG_POS(i, 16) + IMM_OFF;
+	cpu->RREG_POS(i, 16) = adr;
+	WRITE16(cpu->mem_if->data, adr, static_cast<uint16_t>(cpu->RREG_POS(i, 12)));
 
- return 2 + MMU.MMU_WAIT16cpu->proc_ID(adr>>24)&0xF;
+	return MMU_aluMemAccessCycles<PROCNUM, 16, MMU_AD_WRITE>(2, adr);
 }
 
-static u32 FASTCALL OP_STRH_PRE_INDE_M_IMM_OFF(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_STRH_PRE_INDE_M_IMM_OFF(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 adr = cpu->RREG_POS(i,16) - IMM_OFF;
- WRITE16(cpu->mem_if->data, adr, (u16)cpu->RREG_POS(i,12));
- cpu->RREG_POS(i,16) = adr;
+	uint32_t adr = cpu->RREG_POS(i, 16) - IMM_OFF;
+	cpu->RREG_POS(i, 16) = adr;
+	WRITE16(cpu->mem_if->data, adr, static_cast<uint16_t>(cpu->RREG_POS(i, 12)));
 
- return 2 + MMU.MMU_WAIT16cpu->proc_ID(adr>>24)&0xF;
+	return MMU_aluMemAccessCycles<PROCNUM, 16, MMU_AD_WRITE>(2, adr);
 }
 
-static u32 FASTCALL OP_STRH_PRE_INDE_P_REG_OFF(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_STRH_PRE_INDE_P_REG_OFF(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 adr = cpu->RREG_POS(i,16) + cpu->RREG_POS(i,0);
- WRITE16(cpu->mem_if->data, adr, (u16)cpu->RREG_POS(i,12));
- cpu->RREG_POS(i,16) = adr;
+	uint32_t adr = cpu->RREG_POS(i, 16) + cpu->RREG_POS(i, 0);
+	cpu->RREG_POS(i, 16) = adr;
+	WRITE16(cpu->mem_if->data, adr, static_cast<uint16_t>(cpu->RREG_POS(i, 12)));
 
- return 2 + MMU.MMU_WAIT16cpu->proc_ID(adr>>24)&0xF;
+	return MMU_aluMemAccessCycles<PROCNUM, 16, MMU_AD_WRITE>(2, adr);
 }
 
-static u32 FASTCALL OP_STRH_PRE_INDE_M_REG_OFF(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_STRH_PRE_INDE_M_REG_OFF(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 adr = cpu->RREG_POS(i,16) - cpu->RREG_POS(i,0);
- WRITE16(cpu->mem_if->data, adr, (u16)cpu->RREG_POS(i,12));
- cpu->RREG_POS(i,16) = adr;
+	uint32_t adr = cpu->RREG_POS(i, 16) - cpu->RREG_POS(i, 0);
+	cpu->RREG_POS(i, 16) = adr;
+	WRITE16(cpu->mem_if->data, adr, static_cast<uint16_t>(cpu->RREG_POS(i, 12)));
 
- return 2 + MMU.MMU_WAIT16cpu->proc_ID(adr>>24)&0xF;
+	return MMU_aluMemAccessCycles<PROCNUM, 16, MMU_AD_WRITE>(2, adr);
 }
 
-static u32 FASTCALL OP_STRH_POS_INDE_P_IMM_OFF(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_STRH_POS_INDE_P_IMM_OFF(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 adr = cpu->RREG_POS(i,16);
- WRITE16(cpu->mem_if->data, adr, (u16)cpu->RREG_POS(i,12));
- cpu->RREG_POS(i,16) += IMM_OFF;
+	uint32_t adr = cpu->RREG_POS(i, 16);
+	WRITE16(cpu->mem_if->data, adr, static_cast<uint16_t>(cpu->RREG_POS(i, 12)));
+	cpu->RREG_POS(i, 16) += IMM_OFF;
 
- return 2 + MMU.MMU_WAIT16cpu->proc_ID(adr>>24)&0xF;
+	return MMU_aluMemAccessCycles<PROCNUM, 16, MMU_AD_WRITE>(2, adr);
 }
 
-static u32 FASTCALL OP_STRH_POS_INDE_M_IMM_OFF(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_STRH_POS_INDE_M_IMM_OFF(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 adr = cpu->RREG_POS(i,16);
- WRITE16(cpu->mem_if->data, adr, (u16)cpu->RREG_POS(i,12));
- cpu->RREG_POS(i,16) -= IMM_OFF;
+	uint32_t adr = cpu->RREG_POS(i, 16);
+	WRITE16(cpu->mem_if->data, adr, static_cast<uint16_t>(cpu->RREG_POS(i, 12)));
+	cpu->RREG_POS(i, 16) -= IMM_OFF;
 
- return 2 + MMU.MMU_WAIT16cpu->proc_ID(adr>>24)&0xF;
+	return MMU_aluMemAccessCycles<PROCNUM, 16, MMU_AD_WRITE>(2, adr);
 }
 
-static u32 FASTCALL OP_STRH_POS_INDE_P_REG_OFF(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_STRH_POS_INDE_P_REG_OFF(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 adr = cpu->RREG_POS(i,16);
- WRITE16(cpu->mem_if->data, adr, (u16)cpu->RREG_POS(i,12));
- cpu->RREG_POS(i,16) += cpu->RREG_POS(i,0);
+	uint32_t adr = cpu->RREG_POS(i, 16);
+	WRITE16(cpu->mem_if->data, adr, static_cast<uint16_t>(cpu->RREG_POS(i, 12)));
+	cpu->RREG_POS(i, 16) += cpu->RREG_POS(i, 0);
 
- return 2 + MMU.MMU_WAIT16cpu->proc_ID(adr>>24)&0xF;
+	return MMU_aluMemAccessCycles<PROCNUM, 16, MMU_AD_WRITE>(2, adr);
 }
 
-static u32 FASTCALL OP_STRH_POS_INDE_M_REG_OFF(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_STRH_POS_INDE_M_REG_OFF(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 adr = cpu->RREG_POS(i,16);
- WRITE16(cpu->mem_if->data, adr, (u16)cpu->RREG_POS(i,12));
- cpu->RREG_POS(i,16) -= cpu->RREG_POS(i,0);
+	uint32_t adr = cpu->RREG_POS(i, 16);
+	WRITE16(cpu->mem_if->data, adr, static_cast<uint16_t>(cpu->RREG_POS(i, 12)));
+	cpu->RREG_POS(i, 16) -= cpu->RREG_POS(i, 0);
 
- return 2 + MMU.MMU_WAIT16cpu->proc_ID(adr>>24)&0xF;
+	return MMU_aluMemAccessCycles<PROCNUM, 16, MMU_AD_WRITE>(2, adr);
 }
 
-//----------------LDRSH--------------------------
+// -----------------------------------------------------------------------------
+// LDRSH
+// -----------------------------------------------------------------------------
 
-static u32 FASTCALL OP_LDRSH_P_IMM_OFF(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_LDRSH_P_IMM_OFF(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 adr = cpu->RREG_POS(i,16) + IMM_OFF;
- cpu->RREG_POS(i,12) = (s32)((s16)READ16(cpu->mem_if->data, adr));
+	uint32_t adr = cpu->RREG_POS(i, 16) + IMM_OFF;
+	cpu->RREG_POS(i, 12) = static_cast<int32_t>(static_cast<int16_t>(READ16(cpu->mem_if->data, adr)));
 
- return 3 + MMU.MMU_WAIT16cpu->proc_ID(adr>>24)&0xF;
+	return MMU_aluMemAccessCycles<PROCNUM, 16, MMU_AD_READ>(3, adr);
 }
 
-static u32 FASTCALL OP_LDRSH_M_IMM_OFF(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_LDRSH_M_IMM_OFF(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 adr = cpu->RREG_POS(i,16) - IMM_OFF;
- cpu->RREG_POS(i,12) = (s32)((s16)READ16(cpu->mem_if->data, adr));
+	uint32_t adr = cpu->RREG_POS(i, 16) - IMM_OFF;
+	cpu->RREG_POS(i, 12) = static_cast<int32_t>(static_cast<int16_t>(READ16(cpu->mem_if->data, adr)));
 
- return 3 + MMU.MMU_WAIT16cpu->proc_ID(adr>>24)&0xF;
+	return MMU_aluMemAccessCycles<PROCNUM, 16, MMU_AD_READ>(3, adr);
 }
 
-static u32 FASTCALL OP_LDRSH_P_REG_OFF(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_LDRSH_P_REG_OFF(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 adr = cpu->RREG_POS(i,16) + cpu->RREG_POS(i,0);
- cpu->RREG_POS(i,12) = (s32)((s16)READ16(cpu->mem_if->data, adr));
+	uint32_t adr = cpu->RREG_POS(i, 16) + cpu->RREG_POS(i, 0);
+	cpu->RREG_POS(i, 12) = static_cast<int32_t>(static_cast<int16_t>(READ16(cpu->mem_if->data, adr)));
 
- return 3 + MMU.MMU_WAIT16cpu->proc_ID(adr>>24)&0xF;
+	return MMU_aluMemAccessCycles<PROCNUM, 16, MMU_AD_READ>(3, adr);
 }
 
-static u32 FASTCALL OP_LDRSH_M_REG_OFF(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_LDRSH_M_REG_OFF(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 adr = cpu->RREG_POS(i,16) - cpu->RREG_POS(i,0);
- cpu->RREG_POS(i,12) = (s32)((s16)READ16(cpu->mem_if->data, adr));
+	uint32_t adr = cpu->RREG_POS(i, 16) - cpu->RREG_POS(i, 0);
+	cpu->RREG_POS(i, 12) = static_cast<int32_t>(static_cast<int16_t>(READ16(cpu->mem_if->data, adr)));
 
- return 3 + MMU.MMU_WAIT16cpu->proc_ID(adr>>24)&0xF;
+	return MMU_aluMemAccessCycles<PROCNUM, 16, MMU_AD_READ>(3, adr);
 }
 
-static u32 FASTCALL OP_LDRSH_PRE_INDE_P_IMM_OFF(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_LDRSH_PRE_INDE_P_IMM_OFF(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 adr = cpu->RREG_POS(i,16) + IMM_OFF;
- cpu->RREG_POS(i,12) = (s32)((s16)READ16(cpu->mem_if->data, adr));
- cpu->RREG_POS(i,16) = adr;
+	uint32_t adr = cpu->RREG_POS(i, 16) + IMM_OFF;
+	cpu->RREG_POS(i, 16) = adr;
+	cpu->RREG_POS(i, 12) = static_cast<int32_t>(static_cast<int16_t>(READ16(cpu->mem_if->data, adr)));
 
- return 3 + MMU.MMU_WAIT16cpu->proc_ID(adr>>24)&0xF;
+	return MMU_aluMemAccessCycles<PROCNUM, 16, MMU_AD_READ>(3, adr);
 }
 
-static u32 FASTCALL OP_LDRSH_PRE_INDE_M_IMM_OFF(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_LDRSH_PRE_INDE_M_IMM_OFF(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 adr = cpu->RREG_POS(i,16) - IMM_OFF;
- cpu->RREG_POS(i,12) = (s32)((s16)READ16(cpu->mem_if->data, adr));
- cpu->RREG_POS(i,16) = adr;
+	uint32_t adr = cpu->RREG_POS(i, 16) - IMM_OFF;
+	cpu->RREG_POS(i, 16) = adr;
+	cpu->RREG_POS(i, 12) = static_cast<int32_t>(static_cast<int16_t>(READ16(cpu->mem_if->data, adr)));
 
- return 3 + MMU.MMU_WAIT16cpu->proc_ID(adr>>24)&0xF;
+	return MMU_aluMemAccessCycles<PROCNUM, 16, MMU_AD_READ>(3, adr);
 }
 
-static u32 FASTCALL OP_LDRSH_PRE_INDE_P_REG_OFF(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_LDRSH_PRE_INDE_P_REG_OFF(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 adr = cpu->RREG_POS(i,16) + cpu->RREG_POS(i,0);
- cpu->RREG_POS(i,12) = (s32)((s16)READ16(cpu->mem_if->data, adr));
- cpu->RREG_POS(i,16) = adr;
+	uint32_t adr = cpu->RREG_POS(i, 16) + cpu->RREG_POS(i, 0);
+	cpu->RREG_POS(i, 16) = adr;
+	cpu->RREG_POS(i, 12) = static_cast<int32_t>(static_cast<int16_t>(READ16(cpu->mem_if->data, adr)));
 
- return 3 + MMU.MMU_WAIT16cpu->proc_ID(adr>>24)&0xF;
+	return MMU_aluMemAccessCycles<PROCNUM, 16, MMU_AD_READ>(3, adr);
 }
 
-static u32 FASTCALL OP_LDRSH_PRE_INDE_M_REG_OFF(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_LDRSH_PRE_INDE_M_REG_OFF(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 adr = cpu->RREG_POS(i,16) - cpu->RREG_POS(i,0);
- cpu->RREG_POS(i,12) = (s32)((s16)READ16(cpu->mem_if->data, adr));
- cpu->RREG_POS(i,16) = adr;
+	uint32_t adr = cpu->RREG_POS(i, 16) - cpu->RREG_POS(i, 0);
+	cpu->RREG_POS(i, 16) = adr;
+	cpu->RREG_POS(i, 12) = static_cast<int32_t>(static_cast<int16_t>(READ16(cpu->mem_if->data, adr)));
 
- return 3 + MMU.MMU_WAIT16cpu->proc_ID(adr>>24)&0xF;
+	return MMU_aluMemAccessCycles<PROCNUM, 16, MMU_AD_READ>(3, adr);
 }
 
-static u32 FASTCALL OP_LDRSH_POS_INDE_P_IMM_OFF(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_LDRSH_POS_INDE_P_IMM_OFF(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 adr = cpu->RREG_POS(i,16);
- cpu->RREG_POS(i,12) = (s32)((s16)READ16(cpu->mem_if->data, adr));
- cpu->RREG_POS(i,16) += IMM_OFF;
+	uint32_t adr = cpu->RREG_POS(i, 16);
+	cpu->RREG_POS(i, 16) += IMM_OFF;
+	cpu->RREG_POS(i, 12) = static_cast<int32_t>(static_cast<int16_t>(READ16(cpu->mem_if->data, adr)));
 
- return 3 + MMU.MMU_WAIT16cpu->proc_ID(adr>>24)&0xF;
+	return MMU_aluMemAccessCycles<PROCNUM, 16, MMU_AD_READ>(3, adr);
 }
 
-static u32 FASTCALL OP_LDRSH_POS_INDE_M_IMM_OFF(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_LDRSH_POS_INDE_M_IMM_OFF(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 adr = cpu->RREG_POS(i,16);
- cpu->RREG_POS(i,12) = (s32)((s16)READ16(cpu->mem_if->data, adr));
- cpu->RREG_POS(i,16) -= IMM_OFF;
+	uint32_t adr = cpu->RREG_POS(i, 16);
+	cpu->RREG_POS(i, 16) -= IMM_OFF;
+	cpu->RREG_POS(i, 12) = static_cast<int32_t>(static_cast<int16_t>(READ16(cpu->mem_if->data, adr)));
 
- return 3 + MMU.MMU_WAIT16cpu->proc_ID(adr>>24)&0xF;
+	return MMU_aluMemAccessCycles<PROCNUM, 16, MMU_AD_READ>(3, adr);
 }
 
-static u32 FASTCALL OP_LDRSH_POS_INDE_P_REG_OFF(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_LDRSH_POS_INDE_P_REG_OFF(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 adr = cpu->RREG_POS(i,16);
- cpu->RREG_POS(i,12) = (s32)((s16)READ16(cpu->mem_if->data, adr));
- cpu->RREG_POS(i,16) += cpu->RREG_POS(i,0);
+	uint32_t adr = cpu->RREG_POS(i, 16);
+	cpu->RREG_POS(i, 16) += cpu->RREG_POS(i, 0);
+	cpu->RREG_POS(i, 12) = static_cast<int32_t>(static_cast<int16_t>(READ16(cpu->mem_if->data, adr)));
 
- return 3 + MMU.MMU_WAIT16cpu->proc_ID(adr>>24)&0xF;
+	return MMU_aluMemAccessCycles<PROCNUM, 16, MMU_AD_READ>(3, adr);
 }
 
-static u32 FASTCALL OP_LDRSH_POS_INDE_M_REG_OFF(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_LDRSH_POS_INDE_M_REG_OFF(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 adr = cpu->RREG_POS(i,16);
- cpu->RREG_POS(i,12) = (s32)((s16)READ16(cpu->mem_if->data, adr));
- cpu->RREG_POS(i,16) -= cpu->RREG_POS(i,0);
+	uint32_t adr = cpu->RREG_POS(i, 16);
+	cpu->RREG_POS(i, 16) -= cpu->RREG_POS(i, 0);
+	cpu->RREG_POS(i, 12) = static_cast<int32_t>(static_cast<int16_t>(READ16(cpu->mem_if->data, adr)));
 
- return 3 + MMU.MMU_WAIT16cpu->proc_ID(adr>>24)&0xF;
+	return MMU_aluMemAccessCycles<PROCNUM, 16, MMU_AD_READ>(3, adr);
 }
 
-//----------------------LDRSB----------------------
+// -----------------------------------------------------------------------------
+// LDRSB
+// -----------------------------------------------------------------------------
 
-static u32 FASTCALL OP_LDRSB_P_IMM_OFF(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_LDRSB_P_IMM_OFF(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 adr = cpu->RREG_POS(i,16) + IMM_OFF;
- cpu->RREG_POS(i,12) = (s32)((s8)READ8(cpu->mem_if->data, adr));
+	uint32_t adr = cpu->RREG_POS(i, 16) + IMM_OFF;
+	cpu->RREG_POS(i, 12) = static_cast<int32_t>(static_cast<int8_t>(READ8(cpu->mem_if->data, adr)));
 
- return 3 + MMU.MMU_WAIT16cpu->proc_ID(adr>>24)&0xF;
+	return MMU_aluMemAccessCycles<PROCNUM, 8, MMU_AD_READ>(3, adr);
 }
 
-static u32 FASTCALL OP_LDRSB_M_IMM_OFF(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_LDRSB_M_IMM_OFF(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 adr = cpu->RREG_POS(i,16) - IMM_OFF;
- cpu->RREG_POS(i,12) = (s32)((s8)READ8(cpu->mem_if->data, adr));
+	uint32_t adr = cpu->RREG_POS(i, 16) - IMM_OFF;
+	cpu->RREG_POS(i, 12) = static_cast<int32_t>(static_cast<int8_t>(READ8(cpu->mem_if->data, adr)));
 
- return 3 + MMU.MMU_WAIT16cpu->proc_ID(adr>>24)&0xF;
+	return MMU_aluMemAccessCycles<PROCNUM, 8, MMU_AD_READ>(3, adr);
 }
 
-static u32 FASTCALL OP_LDRSB_P_REG_OFF(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_LDRSB_P_REG_OFF(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 adr = cpu->RREG_POS(i,16) + cpu->RREG_POS(i,0);
- cpu->RREG_POS(i,12) = (s32)((s8)READ8(cpu->mem_if->data, adr));
+	uint32_t adr = cpu->RREG_POS(i, 16) + cpu->RREG_POS(i, 0);
+	cpu->RREG_POS(i, 12) = static_cast<int32_t>(static_cast<int8_t>(READ8(cpu->mem_if->data, adr)));
 
- return 3 + MMU.MMU_WAIT16cpu->proc_ID(adr>>24)&0xF;
+	return MMU_aluMemAccessCycles<PROCNUM, 8, MMU_AD_READ>(3, adr);
 }
 
-static u32 FASTCALL OP_LDRSB_M_REG_OFF(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_LDRSB_M_REG_OFF(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 adr = cpu->RREG_POS(i,16) - cpu->RREG_POS(i,0);
- cpu->RREG_POS(i,12) = (s32)((s8)READ8(cpu->mem_if->data, adr));
+	uint32_t adr = cpu->RREG_POS(i, 16) - cpu->RREG_POS(i, 0);
+	cpu->RREG_POS(i, 12) = static_cast<int32_t>(static_cast<int8_t>(READ8(cpu->mem_if->data, adr)));
 
- return 3 + MMU.MMU_WAIT16cpu->proc_ID(adr>>24)&0xF;
+	return MMU_aluMemAccessCycles<PROCNUM, 8, MMU_AD_READ>(3, adr);
 }
 
-static u32 FASTCALL OP_LDRSB_PRE_INDE_P_IMM_OFF(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_LDRSB_PRE_INDE_P_IMM_OFF(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 adr = cpu->RREG_POS(i,16) + IMM_OFF;
- cpu->RREG_POS(i,12) = (s32)((s8)READ8(cpu->mem_if->data, adr));
- cpu->RREG_POS(i,16) = adr;
+	uint32_t adr = cpu->RREG_POS(i, 16) + IMM_OFF;
+	cpu->RREG_POS(i, 16) = adr;
+	cpu->RREG_POS(i, 12) = static_cast<int32_t>(static_cast<int8_t>(READ8(cpu->mem_if->data, adr)));
 
- return 3 + MMU.MMU_WAIT16cpu->proc_ID(adr>>24)&0xF;
+	return MMU_aluMemAccessCycles<PROCNUM, 8, MMU_AD_READ>(3, adr);
 }
 
-static u32 FASTCALL OP_LDRSB_PRE_INDE_M_IMM_OFF(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_LDRSB_PRE_INDE_M_IMM_OFF(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 adr = cpu->RREG_POS(i,16) - IMM_OFF;
- cpu->RREG_POS(i,12) = (s32)((s8)READ8(cpu->mem_if->data, adr));
- cpu->RREG_POS(i,16) = adr;
+	uint32_t adr = cpu->RREG_POS(i, 16) - IMM_OFF;
+	cpu->RREG_POS(i, 16) = adr;
+	cpu->RREG_POS(i, 12) = static_cast<int32_t>(static_cast<int8_t>(READ8(cpu->mem_if->data, adr)));
 
- return 3 + MMU.MMU_WAIT16cpu->proc_ID(adr>>24)&0xF;
+	return MMU_aluMemAccessCycles<PROCNUM, 8, MMU_AD_READ>(3, adr);
 }
 
-static u32 FASTCALL OP_LDRSB_PRE_INDE_P_REG_OFF(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_LDRSB_PRE_INDE_P_REG_OFF(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 adr = cpu->RREG_POS(i,16) + cpu->RREG_POS(i,0);
- cpu->RREG_POS(i,12) = (s32)((s8)READ8(cpu->mem_if->data, adr));
- cpu->RREG_POS(i,16) = adr;
+	uint32_t adr = cpu->RREG_POS(i, 16) + cpu->RREG_POS(i, 0);
+	cpu->RREG_POS(i, 16) = adr;
+	cpu->RREG_POS(i, 12) = static_cast<int32_t>(static_cast<int8_t>(READ8(cpu->mem_if->data, adr)));
 
- return 3 + MMU.MMU_WAIT16cpu->proc_ID(adr>>24)&0xF;
+	return MMU_aluMemAccessCycles<PROCNUM, 8, MMU_AD_READ>(3, adr);
 }
 
-static u32 FASTCALL OP_LDRSB_PRE_INDE_M_REG_OFF(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_LDRSB_PRE_INDE_M_REG_OFF(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 adr = cpu->RREG_POS(i,16) - cpu->RREG_POS(i,0);
- cpu->RREG_POS(i,12) = (s32)((s8)READ8(cpu->mem_if->data, adr));
- cpu->RREG_POS(i,16) = adr;
+	uint32_t adr = cpu->RREG_POS(i, 16) - cpu->RREG_POS(i, 0);
+	cpu->RREG_POS(i, 16) = adr;
+	cpu->RREG_POS(i, 12) = static_cast<int32_t>(static_cast<int8_t>(READ8(cpu->mem_if->data, adr)));
 
- return 3 + MMU.MMU_WAIT16cpu->proc_ID(adr>>24)&0xF;
+	return MMU_aluMemAccessCycles<PROCNUM, 8, MMU_AD_READ>(3, adr);
 }
 
-static u32 FASTCALL OP_LDRSB_POS_INDE_P_IMM_OFF(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_LDRSB_POS_INDE_P_IMM_OFF(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 adr = cpu->RREG_POS(i,16);
- cpu->RREG_POS(i,12) = (s32)((s8)READ8(cpu->mem_if->data, adr));
- cpu->RREG_POS(i,16) += IMM_OFF;
+	uint32_t adr = cpu->RREG_POS(i, 16);
+	cpu->RREG_POS(i, 16) += IMM_OFF;
+	cpu->RREG_POS(i, 12) = static_cast<int32_t>(static_cast<int8_t>(READ8(cpu->mem_if->data, adr)));
 
- return 3 + MMU.MMU_WAIT16cpu->proc_ID(adr>>24)&0xF;
+	return MMU_aluMemAccessCycles<PROCNUM, 8, MMU_AD_READ>(3, adr);
 }
 
-static u32 FASTCALL OP_LDRSB_POS_INDE_M_IMM_OFF(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_LDRSB_POS_INDE_M_IMM_OFF(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 adr = cpu->RREG_POS(i,16);
- cpu->RREG_POS(i,12) = (s32)((s8)READ8(cpu->mem_if->data, adr));
- cpu->RREG_POS(i,16) -= IMM_OFF;
+	uint32_t adr = cpu->RREG_POS(i, 16);
+	cpu->RREG_POS(i, 16) -= IMM_OFF;
+	cpu->RREG_POS(i, 12) = static_cast<int32_t>(static_cast<int8_t>(READ8(cpu->mem_if->data, adr)));
 
- return 3 + MMU.MMU_WAIT16cpu->proc_ID(adr>>24)&0xF;
+	return MMU_aluMemAccessCycles<PROCNUM, 8, MMU_AD_READ>(3, adr);
 }
 
-static u32 FASTCALL OP_LDRSB_POS_INDE_P_REG_OFF(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_LDRSB_POS_INDE_P_REG_OFF(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 adr = cpu->RREG_POS(i,16);
- cpu->RREG_POS(i,12) = (s32)((s8)READ8(cpu->mem_if->data, adr));
- cpu->RREG_POS(i,16) += cpu->RREG_POS(i,0);
+	uint32_t adr = cpu->RREG_POS(i, 16);
+	cpu->RREG_POS(i, 16) += cpu->RREG_POS(i, 0);
+	cpu->RREG_POS(i, 12) = static_cast<int32_t>(static_cast<int8_t>(READ8(cpu->mem_if->data, adr)));
 
- return 3 + MMU.MMU_WAIT16cpu->proc_ID(adr>>24)&0xF;
+	return MMU_aluMemAccessCycles<PROCNUM, 8, MMU_AD_READ>(3, adr);
 }
 
-static u32 FASTCALL OP_LDRSB_POS_INDE_M_REG_OFF(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_LDRSB_POS_INDE_M_REG_OFF(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 adr = cpu->RREG_POS(i,16);
- cpu->RREG_POS(i,12) = (s32)((s8)READ8(cpu->mem_if->data, adr));
- cpu->RREG_POS(i,16) -= cpu->RREG_POS(i,0);
+	uint32_t adr = cpu->RREG_POS(i, 16);
+	cpu->RREG_POS(i, 16) -= cpu->RREG_POS(i, 0);
+	cpu->RREG_POS(i, 12) = static_cast<int32_t>(static_cast<int8_t>(READ8(cpu->mem_if->data, adr)));
 
- return 3 + MMU.MMU_WAIT16cpu->proc_ID(adr>>24)&0xF;
+	return MMU_aluMemAccessCycles<PROCNUM, 8, MMU_AD_READ>(3, adr);
 }
 
-//--------------MRS--------------------------------
+// -----------------------------------------------------------------------------
+// MRS / MSR
+// -----------------------------------------------------------------------------
 
-static u32 FASTCALL OP_MRS_CPSR(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_MRS_CPSR(uint32_t i)
 {
- cpu->RREG_POS(cpu->instruction,12) = cpu->CPSR.val;
+	cpu->RREG_POS(i, 12) = cpu->CPSR.val;
 
- return 1;
+	return 1;
 }
 
-static u32 FASTCALL OP_MRS_SPSR(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_MRS_SPSR(uint32_t i)
 {
- cpu->RREG_POS(cpu->instruction,12) = cpu->SPSR.val;
+	cpu->RREG_POS(i, 12) = cpu->SPSR.val;
 
- return 1;
+	return 1;
 }
 
-//--------------MSR--------------------------------
+#define OP_MSR_CPSR_(operand) \
+	uint32_t byte_mask = cpu->CPSR.bits.mode == USR ? (BIT19(i) ? 0xFF000000 : 0x00000000) : \
+		(BIT16(i) ? 0x000000FF : 0x00000000) | (BIT17(i) ? 0x0000FF00:0x00000000) | (BIT18(i) ? 0x00FF0000 : 0x00000000) | (BIT19(i) ? 0xFF000000 : 0x00000000); \
+	if (cpu->CPSR.bits.mode != USR && BIT16(i)) \
+		armcpu_switchMode(cpu, operand & 0x1F); \
+	cpu->CPSR.val = (cpu->CPSR.val & ~byte_mask) | (operand & byte_mask); \
+	cpu->changeCPSR();
+
+#define OP_MSR_SPSR_(operand) \
+	if (cpu->CPSR.bits.mode == USR || cpu->CPSR.bits.mode == SYS) \
+		return 1; \
+	uint32_t byte_mask = (BIT16(i) ? 0x000000FF : 0x00000000) | (BIT17(i) ? 0x0000FF00 : 0x00000000) | (BIT18(i) ? 0x00FF0000 : 0x00000000) | (BIT19(i) ? 0xFF000000 : 0x00000000); \
+	cpu->SPSR.val = (cpu->SPSR.val & ~byte_mask) | (operand & byte_mask); \
+	cpu->changeCPSR();
+
+//#define __NEW_MSR
+#ifdef __NEW_MSR
+#define v4T_UNALLOC_MASK	0x0FFFFF00
+#define v4T_USER_MASK		0xF0000000
+#define v4T_PRIV_MASK		0x0000000F
+#define v4T_STATE_MASK		0x00000020
+
+#define v5TE_UNALLOC_MASK	0x07FFFF00
+#define v5TE_USER_MASK		0xF8000000
+#define v5TE_PRIV_MASK		0x0000000F
+#define v5TE_STATE_MASK		0x00000020
+#endif
 
-static u32 FASTCALL OP_MSR_CPSR(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_MSR_CPSR(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 operand = cpu->RREG_POS(i,0);
+	uint32_t operand = cpu->RREG_POS(i, 0);
 
- if(cpu->CPSR.bits.mode!=USR)
- {
- if(BIT16(i))
- {
- armcpu_switchMode(cpu, operand & 0x1F);
- cpu->CPSR.val = (cpu->CPSR.val & 0xFFFFFF00) | (operand & 0xFF);
- }
- if(BIT17(i))
- cpu->CPSR.val = (cpu->CPSR.val & 0xFFFF00FF) | (operand & 0xFF00);
- if(BIT18(i))
- cpu->CPSR.val = (cpu->CPSR.val & 0xFF00FFFF) | (operand & 0xFF0000);
- }
- if(BIT19(i))
- cpu->CPSR.val = (cpu->CPSR.val & 0x00FFFFFF) | (operand & 0xFF000000);
+#ifdef __NEW_MSR
+	uint32_t mask = 0;
+	uint32_t byte_mask = (BIT16(i) ? 0x000000FF : 0x00000000) | (BIT17(i) ? 0x0000FF00 : 0x00000000) | (BIT18(i) ? 0x00FF0000 : 0x00000000) | (BIT19(i) ? 0xFF000000 : 0x00000000);
+
+	uint32_t unallocMask = PROCNUM?v4T_UNALLOC_MASK : v5TE_UNALLOC_MASK;
+	uint32_t userMask = PROCNUM?v4T_USER_MASK : v5TE_USER_MASK;
+	uint32_t privMask = PROCNUM?v4T_PRIV_MASK : v5TE_PRIV_MASK;
+	uint32_t stateMask = PROCNUM?v4T_STATE_MASK : v5TE_STATE_MASK;
+
+	if (operand & unallocMask)
+		fprintf(stderr, "ARM%c: MSR_CPSR_REG UNPREDICTABLE UNALLOC (operand %08X)\n", PROCNUM ? '7' : '9', operand);
+	if (cpu->CPSR.bits.mode != USR) // Privileged mode
+	{
+		if (BIT16(i))
+			armcpu_switchMode(cpu, operand & 0x1F);
+		if (operand & stateMask)
+			fprintf(stderr, "ARM%c: MSR_CPSR_REG UNPREDICTABLE STATE (operand %08X)\n", PROCNUM ? '7' : '9', operand);
+		else
+			mask = byte_mask & (userMask | privMask);
+	}
+	else
+		mask = byte_mask & userMask;
 
- return 1;
+	u32 new_val = (cpu->CPSR.val & ~mask) | (operand & mask);
+	cpu->CPSR.val = (cpu->CPSR.val & ~mask) | (operand & mask);
+	cpu->changeCPSR();
+#else
+	OP_MSR_CPSR_(operand);
+#endif
+	return 1;
 }
 
-static u32 FASTCALL OP_MSR_SPSR(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_MSR_SPSR(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 operand = cpu->RREG_POS(i,0);
-
- if(cpu->CPSR.bits.mode!=USR)
- {
- if(BIT16(i))
- {
- cpu->SPSR.val = (cpu->SPSR.val & 0xFFFFFF00) | (operand & 0XFF);
- }
- if(BIT17(i))
- cpu->SPSR.val = (cpu->SPSR.val & 0xFFFF00FF) | (operand & 0XFF00);
- if(BIT18(i))
- cpu->SPSR.val = (cpu->SPSR.val & 0xFF00FFFF) | (operand & 0XFF0000);
- }
- if(BIT19(i))
- cpu->SPSR.val = (cpu->SPSR.val & 0x00FFFFFF) | (operand & 0XFF000000);
-
- return 1;
+	//fprintf(stderr, "OP_MSR_SPSR\n");
+	uint32_t operand = cpu->RREG_POS(i, 0);
+	OP_MSR_SPSR_(operand);
+	return 1;
 }
 
-static u32 FASTCALL OP_MSR_CPSR_IMM_VAL(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_MSR_CPSR_IMM_VAL(uint32_t i)
 {
- u32 i = cpu->instruction;
- IMM_VALUE;
-
- if(cpu->CPSR.bits.mode!=USR)
- {
- if(BIT16(i))
- {
- armcpu_switchMode(cpu, shift_op & 0x1F);
- cpu->CPSR.val = (cpu->CPSR.val & 0xFFFFFF00) | (shift_op & 0XFF);
- }
- if(BIT17(i))
- cpu->CPSR.val = (cpu->CPSR.val & 0xFFFF00FF) | (shift_op & 0XFF00);
- if(BIT18(i))
- cpu->CPSR.val = (cpu->CPSR.val & 0xFF00FFFF) | (shift_op & 0XFF0000);
- }
- if(BIT19(i))
-	 {
- //cpu->CPSR.val = (cpu->CPSR.val & 0xFF000000) | (shift_op & 0XFF000000);
-		 cpu->CPSR.val = (cpu->CPSR.val & 0x00FFFFFF) | (shift_op & 0xFF000000);
-	 }
-
- return 1;
+	//fprintf(stderr, "OP_MSR_CPSR_IMM_VAL\n");
+	IMM_VALUE;
+	OP_MSR_CPSR_(shift_op);
+	return 1;
 }
 
-static u32 FASTCALL OP_MSR_SPSR_IMM_VAL(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_MSR_SPSR_IMM_VAL(uint32_t i)
 {
- u32 i = cpu->instruction;
- IMM_VALUE;
-
- if(cpu->CPSR.bits.mode!=USR)
- {
- if(BIT16(i))
- {
- cpu->SPSR.val = (cpu->SPSR.val & 0xFFFFFF00) | (shift_op & 0XFF);
- }
- if(BIT17(i))
- cpu->SPSR.val = (cpu->SPSR.val & 0xFFFF00FF) | (shift_op & 0XFF00);
- if(BIT18(i))
- cpu->SPSR.val = (cpu->SPSR.val & 0xFF00FFFF) | (shift_op & 0XFF0000);
- }
- if(BIT19(i))
- cpu->SPSR.val = (cpu->SPSR.val & 0xFF000000) | (shift_op & 0XFF000000);
-
- return 1;
+	//fprintf(stderr, "OP_MSR_SPSR_IMM_VAL\n");
+	IMM_VALUE;
+	OP_MSR_SPSR_(shift_op);
+	return 1;
 }
 
-//-----------------BRANCH--------------------------
+// -----------------------------------------------------------------------------
+// Branch
+// -----------------------------------------------------------------------------
 
-static u32 FASTCALL OP_BX(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_BX(uint32_t i)
 {
- u32 tmp = cpu->RREG_POS(cpu->instruction, 0);
+	uint32_t tmp = cpu->RREG_POS(i, 0);
 
- cpu->CPSR.bits.T = BIT0(tmp);
- cpu->R15 = tmp & 0xFFFFFFFE;
- cpu->next_instruction = cpu->R15;
- return 3;
+	cpu->CPSR.bits.T = BIT0(tmp);
+	cpu->R15 = tmp & (0xFFFFFFFC | (cpu->CPSR.bits.T << 1));
+	cpu->next_instruction = cpu->R15;
+	return 3;
 }
 
-static u32 FASTCALL OP_BLX_REG(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_BLX_REG(uint32_t i)
 {
- u32 tmp = cpu->RREG_POS(cpu->instruction, 0);
+	uint32_t tmp = cpu->RREG_POS(i, 0);
 
- cpu->R14 = cpu->next_instruction;
- cpu->CPSR.bits.T = BIT0(tmp);
- cpu->R15 = tmp & 0xFFFFFFFE;
- cpu->next_instruction = cpu->R15;
- return 3;
+	cpu->R14 = cpu->next_instruction;
+	cpu->CPSR.bits.T = BIT0(tmp);
+	cpu->R15 = tmp & (0xFFFFFFFC | (cpu->CPSR.bits.T << 1));
+	cpu->next_instruction = cpu->R15;
+	return 3;
 }
 
-#define SIGNEXTEND_24(i) (((s32)((i)<<8))>>8)
+static inline uint32_t SIGNEXTEND_24(uint32_t i) { return static_cast<uint32_t>((static_cast<int32_t>(i) << 8) >> 8); }
 
-static u32 FASTCALL OP_B(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_B(uint32_t i)
 {
-	u32 off = SIGNEXTEND_24(cpu->instruction);
-	if(CONDITION(cpu->instruction)==0xF)
+	/*static const uint32_t mov_r12_r12 = 0xE1A0C00C;
+	const uint32_t last = _MMU_read32<PROCNUM,MMU_AT_DEBUG>(cpu->instruct_adr-4);
+	if(last == mov_r12_r12)
+	{
+		const uint32_t next = _MMU_read16<PROCNUM,MMU_AT_DEBUG>(cpu->instruct_adr+4);
+		if(next == 0x6464)
+			NocashMessage(cpu, 8);
+	}*/
+
+	uint32_t off = SIGNEXTEND_24(i);
+	if (CONDITION(i) == 0xF)
 	{
 		cpu->R14 = cpu->next_instruction;
 		cpu->CPSR.bits.T = 1;
 	}
-	cpu->R15 += (off<<2);
+	cpu->R15 += off << 2;
+	cpu->R15 &= 0xFFFFFFFC | (cpu->CPSR.bits.T << 1);
 	cpu->next_instruction = cpu->R15;
 
- return 3;
+	return 3;
 }
 
-static u32 FASTCALL OP_BL(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_BL(uint32_t i)
 {
-	u32 off = SIGNEXTEND_24(cpu->instruction);
-	if(CONDITION(cpu->instruction)==0xF)
+	uint32_t off = SIGNEXTEND_24(i);
+	if (CONDITION(i) == 0xF)
 	{
 		cpu->CPSR.bits.T = 1;
 		cpu->R15 += 2;
 	}
 	cpu->R14 = cpu->next_instruction;
-	cpu->R15 += (off<<2);
+	cpu->R15 += off << 2;
+	cpu->R15 &= 0xFFFFFFFC | (cpu->CPSR.bits.T << 1);
 	cpu->next_instruction = cpu->R15;
 
 	return 3;
 }
 
-//----------------CLZ-------------------------------
-
-u8 CLZ_TAB16=
-{
- 0, // 0000
- 1, // 0001
- 2, 2, // 001X
- 3, 3, 3, 3, // 01XX
- 4, 4, 4, 4, 4, 4, 4, 4 // 1XXX
+// -----------------------------------------------------------------------------
+// CLZ
+// -----------------------------------------------------------------------------
+
+const uint8_t CLZ_TAB=
+{
+	0,							// 0000
+	1,							// 0001
+	2, 2,						// 001X
+	3, 3, 3, 3,					// 01XX
+	4, 4, 4, 4, 4, 4, 4, 4		// 1XXX
 };
 
-static u32 FASTCALL OP_CLZ(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_CLZ(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 Rm = cpu->RREG_POS(i,0);
- u32 pos;
+	uint32_t Rm = cpu->RREG_POS(i, 0);
 
- if(Rm==0)
- {
- cpu->RREG_POS(i,12)=32;
- return 2;
- }
+	if (!Rm)
+	{
+		cpu->RREG_POS(i, 12) = 32;
+		return 2;
+	}
 
- Rm |= (Rm >>1);
- Rm |= (Rm >>2);
- Rm |= (Rm >>4);
- Rm |= (Rm >>8);
- Rm |= (Rm >>16);
+	Rm |= Rm >> 1;
+	Rm |= Rm >> 2;
+	Rm |= Rm >> 4;
+	Rm |= Rm >> 8;
+	Rm |= Rm >> 16;
 
- pos =
- CLZ_TABRm&0xF +
- CLZ_TAB(Rm>>4)&0xF +
- CLZ_TAB(Rm>>8)&0xF +
- CLZ_TAB(Rm>>12)&0xF +
- CLZ_TAB(Rm>>16)&0xF +
- CLZ_TAB(Rm>>20)&0xF +
- CLZ_TAB(Rm>>24)&0xF +
- CLZ_TAB(Rm>>28)&0xF;
+	uint32_t pos = CLZ_TABRm & 0xF + CLZ_TAB(Rm >> 4) & 0xF + CLZ_TAB(Rm >> 8) & 0xF + CLZ_TAB(Rm >> 12) & 0xF +
+		CLZ_TAB(Rm >> 16) & 0xF + CLZ_TAB(Rm >> 20) & 0xF + CLZ_TAB(Rm >> 24) & 0xF + CLZ_TAB(Rm >> 28) & 0xF;
 
- cpu->RREG_POS(i,12)=32 - pos;
+	cpu->RREG_POS(i, 12) = 32 - pos;
 
- return 2;
+	return 2;
 }
 
-//--------------------QADD--QSUB------------------------------
+// -----------------------------------------------------------------------------
+// QADD / QDADD / QSUB / QDSUB
+// -----------------------------------------------------------------------------
 
-static u32 FASTCALL OP_QADD(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_QADD(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 res = cpu->RREG_POS(i,16)+cpu->RREG_POS(i,0);
+	uint32_t res = cpu->RREG_POS(i, 16) + cpu->RREG_POS(i, 0);
 
- LOG("spe add\r\n");
-	if(SIGNED_OVERFLOW(cpu->RREG_POS(i,16),cpu->RREG_POS(i,0), res))
+	if (SIGNED_OVERFLOW(cpu->RREG_POS(i, 16), cpu->RREG_POS(i, 0), res))
 	{
-		cpu->CPSR.bits.Q=1;
-		cpu->RREG_POS(i,12)=0x80000000-BIT31(res);
+		cpu->CPSR.bits.Q = 1;
+		cpu->RREG_POS(i, 12) = 0x80000000 - BIT31(res);
 		return 2;
 	}
-	cpu->RREG_POS(i,12)=res;
-	if(REG_POS(i,12)==15)
+	cpu->RREG_POS(i, 12) = res;
+	if (REG_POS(i, 12) == 15)
 	{
- cpu->R15 &= 0XFFFFFFFC;
-	 cpu->next_instruction = cpu->R15;
-	 return 3;
- }
- return 2;
+		cpu->R15 &= 0xFFFFFFFC;
+		cpu->next_instruction = cpu->R15;
+		return 3;
+	}
+	return 2;
 }
 
-static u32 FASTCALL OP_QSUB(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_QSUB(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 res = cpu->RREG_POS(i,0)-cpu->RREG_POS(i,16);
+	uint32_t res = cpu->RREG_POS(i, 0) - cpu->RREG_POS(i, 16);
 
- LOG("spe add\r\n");
-	if(SIGNED_UNDERFLOW(cpu->RREG_POS(i,0), cpu->RREG_POS(i,16), res))
+	if (SIGNED_UNDERFLOW(cpu->RREG_POS(i, 0), cpu->RREG_POS(i, 16), res))
 	{
-		cpu->CPSR.bits.Q=1;
-		cpu->RREG_POS(i,12)=0x80000000-BIT31(res);
+		cpu->CPSR.bits.Q = 1;
+		cpu->RREG_POS(i, 12) = 0x80000000 - BIT31(res);
 		return 2;
 	}
-	cpu->RREG_POS(i,12)=res;
-	if(REG_POS(i,12)==15)
+	cpu->RREG_POS(i, 12) = res;
+	if (REG_POS(i, 12) == 15)
 	{
- cpu->R15 &= 0XFFFFFFFC;
-	 cpu->next_instruction = cpu->R15;
-	 return 3;
- }
- return 2;
+		cpu->R15 &= 0xFFFFFFFC;
+		cpu->next_instruction = cpu->R15;
+		return 3;
+	}
+	return 2;
 }
 
-static u32 FASTCALL OP_QDADD(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_QDADD(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 mul = cpu->RREG_POS(i,16)<<1;
- u32 res;
+	uint32_t mul = cpu->RREG_POS(i, 16) << 1;
 
-
- LOG("spe add\r\n");
-	if(BIT31(cpu->RREG_POS(i,16))!=BIT31(mul))
+	if (BIT31(cpu->RREG_POS(i, 16)) != BIT31(mul))
 	{
-		cpu->CPSR.bits.Q=1;
-		mul = 0x80000000-BIT31(mul);
+		cpu->CPSR.bits.Q = 1;
+		mul = 0x80000000 - BIT31(mul);
 	}
 
-	res = mul + cpu->RREG_POS(i,0);
-	if(SIGNED_OVERFLOW(cpu->RREG_POS(i,0),mul, res))
+	uint32_t res = mul + cpu->RREG_POS(i, 0);
+	if (SIGNED_OVERFLOW(cpu->RREG_POS(i, 0), mul, res))
 	{
-		cpu->CPSR.bits.Q=1;
-		cpu->RREG_POS(i,12)=0x80000000-BIT31(res);
+		cpu->CPSR.bits.Q = 1;
+		cpu->RREG_POS(i, 12) = 0x80000000 - BIT31(res);
 		return 2;
 	}
-	cpu->RREG_POS(i,12)=res;
-	if(REG_POS(i,12)==15)
+	cpu->RREG_POS(i, 12) = res;
+	if (REG_POS(i, 12) == 15)
 	{
- cpu->R15 &= 0XFFFFFFFC;
-	 cpu->next_instruction = cpu->R15;
-	 return 3;
- }
- return 2;
+		cpu->R15 &= 0xFFFFFFFC;
+		cpu->next_instruction = cpu->R15;
+		return 3;
+	}
+	return 2;
 }
 
-static u32 FASTCALL OP_QDSUB(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_QDSUB(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 mul = cpu->RREG_POS(i,16)<<1;
- u32 res;
-
+	uint32_t mul = cpu->RREG_POS(i, 16) << 1;
 
- LOG("spe add\r\n");
-	if(BIT31(cpu->RREG_POS(i,16))!=BIT31(mul))
+	if (BIT31(cpu->RREG_POS(i, 16)) != BIT31(mul))
 	{
-		cpu->CPSR.bits.Q=1;
-		mul = 0x80000000-BIT31(mul);
+		cpu->CPSR.bits.Q = 1;
+		mul = 0x80000000 - BIT31(mul);
 	}
 
-	res = cpu->RREG_POS(i,0) - mul;
-	if(SIGNED_UNDERFLOW(cpu->RREG_POS(i,0), mul, res))
+	uint32_t res = cpu->RREG_POS(i, 0) - mul;
+	if (SIGNED_UNDERFLOW(cpu->RREG_POS(i, 0), mul, res))
 	{
-		cpu->CPSR.bits.Q=1;
-		cpu->RREG_POS(i,12)=0x80000000-BIT31(res);
+		cpu->CPSR.bits.Q = 1;
+		cpu->RREG_POS(i, 12) = 0x80000000 - BIT31(res);
 		return 2;
 	}
-	cpu->RREG_POS(i,12)=res;
-	if(REG_POS(i,12)==15)
+	cpu->RREG_POS(i, 12) = res;
+	if (REG_POS(i, 12) == 15)
 	{
- cpu->R15 &= 0XFFFFFFFC;
-	 cpu->next_instruction = cpu->R15;
-	 return 3;
- }
- return 2;
+		cpu->R15 &= 0xFFFFFFFC;
+		cpu->next_instruction = cpu->R15;
+		return 3;
+	}
+	return 2;
 }
 
-//-----------------SMUL-------------------------------
+// -----------------------------------------------------------------------------
+// SMUL
+// -----------------------------------------------------------------------------
 
-#define HWORD(i) ((s32)(((s32)(i))>>16))
-#define LWORD(i) (s32)(((s32)((i)<<16))>>16)
+static inline int32_t HWORD(uint32_t i) { return static_cast<int32_t>(static_cast<int32_t>(i) >> 16); }
+static inline int32_t LWORD(uint32_t i) { return static_cast<int32_t>(static_cast<int32_t>(i << 16) >> 16); }
 
-static u32 FASTCALL OP_SMUL_B_B(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_SMUL_B_B(uint32_t i)
 {
- u32 i = cpu->instruction;
-
- cpu->RREG_POS(i,16) = (u32)(LWORD(cpu->RREG_POS(i,0))* LWORD(cpu->RREG_POS(i,8)));
+	// checked
+	cpu->RREG_POS(i, 16) = static_cast<uint32_t>(LWORD(cpu->RREG_POS(i, 0)) * LWORD(cpu->RREG_POS(i, 8)));
 
- return 2;
+	return 2;
 }
 
-static u32 FASTCALL OP_SMUL_B_T(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_SMUL_B_T(uint32_t i)
 {
- u32 i = cpu->instruction;
+	cpu->RREG_POS(i, 16) = static_cast<uint32_t>(LWORD(cpu->RREG_POS(i, 0)) * HWORD(cpu->RREG_POS(i, 8)));
 
- cpu->RREG_POS(i,16) = (u32)(LWORD(cpu->RREG_POS(i,0))* HWORD(cpu->RREG_POS(i,8)));
-
- return 2;
+	return 2;
 }
 
-static u32 FASTCALL OP_SMUL_T_B(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_SMUL_T_B(uint32_t i)
 {
- u32 i = cpu->instruction;
-
- cpu->RREG_POS(i,16) = (u32)(HWORD(cpu->RREG_POS(i,0))* LWORD(cpu->RREG_POS(i,8)));
+	cpu->RREG_POS(i, 16) = static_cast<uint32_t>(HWORD(cpu->RREG_POS(i, 0)) * LWORD(cpu->RREG_POS(i, 8)));
 
- return 2;
+	return 2;
 }
 
-static u32 FASTCALL OP_SMUL_T_T(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_SMUL_T_T(uint32_t i)
 {
- u32 i = cpu->instruction;
-
- cpu->RREG_POS(i,16) = (u32)(HWORD(cpu->RREG_POS(i,0))* HWORD(cpu->RREG_POS(i,8)));
+	cpu->RREG_POS(i, 16) = static_cast<uint32_t>(HWORD(cpu->RREG_POS(i, 0)) * HWORD(cpu->RREG_POS(i, 8)));
 
- return 2;
+	return 2;
 }
 
-//-----------SMLA----------------------------
+// -----------------------------------------------------------------------------
+// SMLA
+// -----------------------------------------------------------------------------
 
-static u32 FASTCALL OP_SMLA_B_B(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_SMLA_B_B(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 tmp = (u32)(LWORD(cpu->RREG_POS(i,0))* LWORD(cpu->RREG_POS(i,8)));
- u32 a = cpu->RREG_POS(i,12);
+	uint32_t tmp = static_cast<uint32_t>(static_cast<int16_t>(cpu->RREG_POS(i, 0)) * static_cast<int16_t>(cpu->RREG_POS(i, 8)));
 
- //LOG("SMLABB %08X * %08X + %08X = %08X\r\n", cpu->RREG_POS(i,0), cpu->RREG_POS(i,8), a, tmp + a);
- cpu->RREG_POS(i,16) = tmp + a;
+	cpu->RREG_POS(i, 16) = tmp + cpu->RREG_POS(i, 12);
 
- if(SIGNED_OVERFLOW(tmp, a, cpu->RREG_POS(i,16)))
- cpu->CPSR.bits.Q = 1;
+	if (OverflowFromADD(cpu->RREG_POS(i, 16), tmp, cpu->RREG_POS(i, 12)))
+		cpu->CPSR.bits.Q = 1;
 
- return 2;
+	return 2;
 }
 
-static u32 FASTCALL OP_SMLA_B_T(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_SMLA_B_T(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 tmp = (u32)(LWORD(cpu->RREG_POS(i,0))* HWORD(cpu->RREG_POS(i,8)));
- u32 a = cpu->RREG_POS(i,12);
+	uint32_t tmp = static_cast<uint32_t>(LWORD(cpu->RREG_POS(i, 0)) * HWORD(cpu->RREG_POS(i, 8)));
+	uint32_t a = cpu->RREG_POS(i, 12);
 
- //LOG("SMLABT %08X * %08X + %08X = %08X\r\n", cpu->RREG_POS(i,0), cpu->RREG_POS(i,8), a, tmp + a);
- cpu->RREG_POS(i,16) = tmp + a;
+	cpu->RREG_POS(i, 16) = tmp + a;
 
- if(SIGNED_OVERFLOW(tmp, a, cpu->RREG_POS(i,16)))
- cpu->CPSR.bits.Q = 1;
+	if (SIGNED_OVERFLOW(tmp, a, cpu->RREG_POS(i, 16)))
+		cpu->CPSR.bits.Q = 1;
 
- return 2;
+	return 2;
 }
 
-static u32 FASTCALL OP_SMLA_T_B(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_SMLA_T_B(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 tmp = (u32)(HWORD(cpu->RREG_POS(i,0))* LWORD(cpu->RREG_POS(i,8)));
- u32 a = cpu->RREG_POS(i,12);
+	uint32_t tmp = static_cast<uint32_t>(HWORD(cpu->RREG_POS(i, 0)) * LWORD(cpu->RREG_POS(i, 8)));
+	uint32_t a = cpu->RREG_POS(i, 12);
 
- //LOG("SMLATB %08X * %08X + %08X = %08X\r\n", cpu->RREG_POS(i,0), cpu->RREG_POS(i,8), a, tmp + a);
- cpu->RREG_POS(i,16) = tmp + a;
+	cpu->RREG_POS(i, 16) = tmp + a;
 
- if(SIGNED_OVERFLOW(tmp, a, cpu->RREG_POS(i,16)))
- cpu->CPSR.bits.Q = 1;
+	if (SIGNED_OVERFLOW(tmp, a, cpu->RREG_POS(i, 16)))
+		cpu->CPSR.bits.Q = 1;
 
- return 2;
+	return 2;
 }
 
-static u32 FASTCALL OP_SMLA_T_T(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_SMLA_T_T(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 tmp = (u32)(HWORD(cpu->RREG_POS(i,0))* HWORD(cpu->RREG_POS(i,8)));
- u32 a = cpu->RREG_POS(i,12);
+	uint32_t tmp = static_cast<uint32_t>(HWORD(cpu->RREG_POS(i, 0)) * HWORD(cpu->RREG_POS(i, 8)));
+	uint32_t a = cpu->RREG_POS(i, 12);
 
- //LOG("SMLATT %08X * %08X + %08X = %08X\r\n", cpu->RREG_POS(i,0), cpu->RREG_POS(i,8), a, tmp + a);
- cpu->RREG_POS(i,16) = tmp + a;
+	cpu->RREG_POS(i, 16) = tmp + a;
 
- if(SIGNED_OVERFLOW(tmp, a, cpu->RREG_POS(i,16)))
- cpu->CPSR.bits.Q = 1;
+	if (SIGNED_OVERFLOW(tmp, a, cpu->RREG_POS(i, 16)))
+		cpu->CPSR.bits.Q = 1;
 
- return 2;
+	return 2;
 }
 
-//--------------SMLAL---------------------------------------
+// -----------------------------------------------------------------------------
+// SMLAL
+// -----------------------------------------------------------------------------
 
-static u32 FASTCALL OP_SMLAL_B_B(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_SMLAL_B_B(uint32_t i)
 {
- u32 i = cpu->instruction;
- s64 tmp = (s64)(LWORD(cpu->RREG_POS(i,0))* LWORD(cpu->RREG_POS(i,8)));
- u64 res = (u64)tmp + cpu->RREG_POS(i,12);
+	int64_t tmp = static_cast<int64_t>(LWORD(cpu->RREG_POS(i, 0)) * LWORD(cpu->RREG_POS(i, 8)));
+	uint64_t res = static_cast<uint64_t>(tmp) + cpu->RREG_POS(i, 12);
 
- LOG("SMLALBB %08X * %08X + %08X%08X = %08X%08X\r\n", (int)cpu->RREG_POS(i,0), (int)cpu->RREG_POS(i,8), (int)cpu->RREG_POS(i,16), (int)cpu->RREG_POS(i,12), (int)(cpu->RREG_POS(i,16) + (res + ((tmp<0)*0xFFFFFFFF))), (int)(u32) res);
+	cpu->RREG_POS(i, 12) = static_cast<uint32_t>(res);
+	cpu->RREG_POS(i, 16) += static_cast<uint32_t>(res + ((tmp < 0) * 0xFFFFFFFF));
 
- cpu->RREG_POS(i,12) = (u32) res;
- cpu->RREG_POS(i,16) += (res + ((tmp<0)*0xFFFFFFFF));
-
- return 2;
+	return 2;
 }
 
-static u32 FASTCALL OP_SMLAL_B_T(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_SMLAL_B_T(uint32_t i)
 {
- u32 i = cpu->instruction;
- s64 tmp = (s64)(LWORD(cpu->RREG_POS(i,0))* HWORD(cpu->RREG_POS(i,8)));
- u64 res = (u64)tmp + cpu->RREG_POS(i,12);
-
- LOG("SMLALBT %08X * %08X + %08X%08X = %08X%08X\r\n", (int)cpu->RREG_POS(i,0), (int)cpu->RREG_POS(i,8), (int)cpu->RREG_POS(i,16), (int)cpu->RREG_POS(i,12), (int)(cpu->RREG_POS(i,16) + res + ((tmp<0)*0xFFFFFFFF)), (int)(u32) res);
+	int64_t tmp = static_cast<int64_t>(LWORD(cpu->RREG_POS(i, 0)) * HWORD(cpu->RREG_POS(i, 8)));
+	uint64_t res = static_cast<uint64_t>(tmp) + cpu->RREG_POS(i, 12);
 
- cpu->RREG_POS(i,12) = (u32) res;
- cpu->RREG_POS(i,16) += res + ((tmp<0)*0xFFFFFFFF);
+	cpu->RREG_POS(i, 12) = static_cast<uint32_t>(res);
+	cpu->RREG_POS(i, 16) += static_cast<uint32_t>(res + ((tmp < 0) * 0xFFFFFFFF));
 
- return 2;
+	return 2;
 }
 
-static u32 FASTCALL OP_SMLAL_T_B(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_SMLAL_T_B(uint32_t i)
 {
- u32 i = cpu->instruction;
- s64 tmp = (s64)(HWORD(cpu->RREG_POS(i,0))* (s64)LWORD(cpu->RREG_POS(i,8)));
- u64 res = (u64)tmp + cpu->RREG_POS(i,12);
+	int64_t tmp = static_cast<int64_t>(HWORD(cpu->RREG_POS(i, 0)) * static_cast<int64_t>(LWORD(cpu->RREG_POS(i, 8))));
+	uint64_t res = static_cast<uint64_t>(tmp) + cpu->RREG_POS(i, 12);
 
- LOG("SMLALTB %08X * %08X + %08X%08X = %08X%08X\r\n", (int)cpu->RREG_POS(i,0), (int)cpu->RREG_POS(i,8), (int)cpu->RREG_POS(i,16), (int)cpu->RREG_POS(i,12), (int)(cpu->RREG_POS(i,16) + res + ((tmp<0)*0xFFFFFFFF)), (int)(u32) res);
+	cpu->RREG_POS(i, 12) = static_cast<uint32_t>(res);
+	cpu->RREG_POS(i, 16) += static_cast<uint32_t>(res + ((tmp < 0) * 0xFFFFFFFF));
 
- cpu->RREG_POS(i,12) = (u32) res;
- cpu->RREG_POS(i,16) += res + ((tmp<0)*0xFFFFFFFF);
-
- return 2;
+	return 2;
 }
 
-static u32 FASTCALL OP_SMLAL_T_T(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_SMLAL_T_T(uint32_t i)
 {
- u32 i = cpu->instruction;
- s64 tmp = (s64)(HWORD(cpu->RREG_POS(i,0))* HWORD(cpu->RREG_POS(i,8)));
- u64 res = (u64)tmp + cpu->RREG_POS(i,12);
-
- LOG("SMLALTT %08X * %08X + %08X%08X = %08X%08X\r\n", (int)cpu->RREG_POS(i,0), (int)cpu->RREG_POS(i,8), (int)cpu->RREG_POS(i,16), (int)cpu->RREG_POS(i,12), (int)(cpu->RREG_POS(i,16) + res + ((tmp<0)*0xFFFFFFFF)), (int)(u32) res);
+	int64_t tmp = static_cast<int64_t>(HWORD(cpu->RREG_POS(i, 0)) * HWORD(cpu->RREG_POS(i, 8)));
+	uint64_t res = static_cast<uint64_t>(tmp) + cpu->RREG_POS(i, 12);
 
- cpu->RREG_POS(i,12) = (u32) res;
- cpu->RREG_POS(i,16) += res + ((tmp<0)*0xFFFFFFFF);
+	cpu->RREG_POS(i, 12) = static_cast<uint32_t>(res);
+	cpu->RREG_POS(i, 16) += static_cast<uint32_t>(res + ((tmp < 0) * 0xFFFFFFFF));
 
- return 2;
+	return 2;
 }
 
-//--------------SMULW--------------------
+// -----------------------------------------------------------------------------
+// SMULW
+// -----------------------------------------------------------------------------
 
-static u32 FASTCALL OP_SMULW_B(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_SMULW_B(uint32_t i)
 {
- u32 i = cpu->instruction;
- s64 tmp = (s64)LWORD(cpu->RREG_POS(i,8)) * (s64)((s32)cpu->RREG_POS(i,0));
-
- //LOG("SMULWB %08X * %08X = %08X\r\n", cpu->RREG_POS(i,0), cpu->RREG_POS(i,8), ((tmp>>16)&0xFFFFFFFF);
+	int64_t tmp = static_cast<int64_t>(LWORD(cpu->RREG_POS(i, 8))) * static_cast<int64_t>(static_cast<int32_t>(cpu->RREG_POS(i, 0)));
 
- cpu->RREG_POS(i,16) = ((tmp>>16)&0xFFFFFFFF);
+	cpu->RREG_POS(i, 16) = (tmp >> 16) & 0xFFFFFFFF;
 
- return 2;
+	return 2;
 }
 
-static u32 FASTCALL OP_SMULW_T(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_SMULW_T(uint32_t i)
 {
- u32 i = cpu->instruction;
- s64 tmp = (s64)HWORD(cpu->RREG_POS(i,8)) * (s64)((s32)cpu->RREG_POS(i,0));
+	int64_t tmp = static_cast<int64_t>(HWORD(cpu->RREG_POS(i, 8))) * static_cast<int64_t>(static_cast<int32_t>(cpu->RREG_POS(i, 0)));
 
- //LOG("SMULWT %08X * %08X = %08X\r\n", cpu->RREG_POS(i,0), cpu->RREG_POS(i,8), ((tmp>>16)&0xFFFFFFFF));
+	cpu->RREG_POS(i, 16) = (tmp >> 16) & 0xFFFFFFFF;
 
- cpu->RREG_POS(i,16) = ((tmp>>16)&0xFFFFFFFF);
-
- return 2;
+	return 2;
 }
 
-//--------------SMLAW-------------------
-static u32 FASTCALL OP_SMLAW_B(armcpu_t *cpu)
-{
- u32 i = cpu->instruction;
- s64 tmp = (s64)LWORD(cpu->RREG_POS(i,8)) * (s64)((s32)cpu->RREG_POS(i,0));
- u32 a = cpu->RREG_POS(i,12);
+// -----------------------------------------------------------------------------
+// SMLAW
+// -----------------------------------------------------------------------------
 
- //LOG("SMLAWB %08X * %08X + %08X = %08X\r\n", cpu->RREG_POS(i,0), cpu->RREG_POS(i,8), a, (tmp>>16) + a);
+TEMPLATE static uint32_t FASTCALL OP_SMLAW_B(uint32_t i)
+{
+	int64_t tmp = static_cast<int64_t>(LWORD(cpu->RREG_POS(i, 8))) * static_cast<int64_t>(static_cast<int32_t>(cpu->RREG_POS(i, 0)));
+	uint32_t a = cpu->RREG_POS(i, 12);
 
- tmp = (tmp>>16);
+	tmp >>= 16;
 
- cpu->RREG_POS(i,16) = tmp + a;
+	cpu->RREG_POS(i, 16) = static_cast<uint32_t>(tmp + a);
 
- if(SIGNED_OVERFLOW(tmp, a, cpu->RREG_POS(i,16)))
- cpu->CPSR.bits.Q = 1;
+	if (SIGNED_OVERFLOW(static_cast<uint32_t>(tmp), a, cpu->RREG_POS(i, 16)))
+		cpu->CPSR.bits.Q = 1;
 
- return 2;
+	return 2;
 }
 
-static u32 FASTCALL OP_SMLAW_T(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_SMLAW_T(uint32_t i)
 {
- u32 i = cpu->instruction;
- s64 tmp = (s64)HWORD(cpu->RREG_POS(i,8)) * (s64)((s32)cpu->RREG_POS(i,0));
- u32 a = cpu->RREG_POS(i,12);
-
- //LOG("SMLAWT %08X * %08X + %08X = %08X\r\n", cpu->RREG_POS(i,0), cpu->RREG_POS(i,8), a, ((tmp>>16)&0xFFFFFFFF) + a);
+	int64_t tmp = static_cast<int64_t>(HWORD(cpu->RREG_POS(i, 8))) * static_cast<int64_t>(static_cast<int32_t>(cpu->RREG_POS(i, 0)));
+	uint32_t a = cpu->RREG_POS(i, 12);
 
- tmp = ((tmp>>16)&0xFFFFFFFF);
- cpu->RREG_POS(i,16) = tmp + a;
+	tmp = (tmp >> 16) & 0xFFFFFFFF;
+	cpu->RREG_POS(i, 16) = static_cast<uint32_t>(tmp + a);
 
- if(SIGNED_OVERFLOW(tmp, a, cpu->RREG_POS(i,16)))
- cpu->CPSR.bits.Q = 1;
+	if (SIGNED_OVERFLOW(static_cast<uint32_t>(tmp), a, cpu->RREG_POS(i, 16)))
+		cpu->CPSR.bits.Q = 1;
 
- return 2;
+	return 2;
 }
 
-//------------LDR---------------------------
+// -----------------------------------------------------------------------------
+// LDR
+// -----------------------------------------------------------------------------
+#define OP_LDR(a, b) \
+	cpu->RREG_POS(i, 12) = ROR(READ32(cpu->mem_if->data, adr), 8 * (adr & 3)); \
+\
+	if (REG_POS(i, 12) == 15) \
+	{ \
+		if (!PROCNUM) \
+		{ \
+			cpu->CPSR.bits.T = BIT0(cpu->R15); \
+			cpu->R15 &= 0xFFFFFFFE; \
+		} \
+		else \
+			cpu->R15 &= 0xFFFFFFFC; \
+		cpu->next_instruction = cpu->R15; \
+		return MMU_aluMemAccessCycles<PROCNUM, 32, MMU_AD_READ>(b, adr); \
+	} \
+\
+	return MMU_aluMemAccessCycles<PROCNUM, 32, MMU_AD_READ>(a, adr);
 
-static u32 FASTCALL OP_LDR_P_IMM_OFF(armcpu_t *cpu)
-{
- u32 i = cpu->instruction;
- u32 adr = cpu->RREG_POS(i,16) + IMM_OFF_12;
- u32 val = READ32(cpu->mem_if->data, adr);
+// PRE
+#define OP_LDR_W(a, b) \
+	cpu->RREG_POS(i, 16) = adr;\
+	cpu->RREG_POS(i, 12) = ROR(READ32(cpu->mem_if->data, adr), 8 * (adr & 3)); \
+\
+	if (REG_POS(i, 12) == 15) \
+	{ \
+		if (!PROCNUM) \
+		{ \
+			cpu->CPSR.bits.T = BIT0(cpu->R15); \
+			cpu->R15 &= 0xFFFFFFFE; \
+		} \
+		else \
+			cpu->R15 &= 0xFFFFFFFC; \
+		cpu->next_instruction = cpu->R15; \
+		return MMU_aluMemAccessCycles<PROCNUM, 32, MMU_AD_READ>(b, adr); \
+	} \
+\
+	return MMU_aluMemAccessCycles<PROCNUM, 32, MMU_AD_READ>(a, adr);
 
- if(adr&3)
- val = ROR(val, 8*(adr&3));
+// POST
+#define OP_LDR_W2(a, b, c) \
+	uint32_t adr = cpu->RREG_POS(i, 16); \
+	cpu->RREG_POS(i, 16) = adr + c;\
+	cpu->RREG_POS(i, 12) = ROR(READ32(cpu->mem_if->data, adr), 8 * (adr & 3)); \
+\
+	if (REG_POS(i, 12) == 15) \
+	{ \
+		if (!PROCNUM) \
+		{ \
+			cpu->CPSR.bits.T = BIT0(cpu->R15); \
+			cpu->R15 &= 0xFFFFFFFE; \
+		} \
+		else \
+			cpu->R15 &= 0xFFFFFFFC; \
+		cpu->next_instruction = cpu->R15; \
+		return MMU_aluMemAccessCycles<PROCNUM, 32, MMU_AD_READ>(b, adr); \
+	} \
+\
+	return MMU_aluMemAccessCycles<PROCNUM, 32, MMU_AD_READ>(a, adr);
 
- if(REG_POS(i,12)==15)
- {
- cpu->R15 = val & (0XFFFFFFFC | (((u32)cpu->LDTBit)<<1));
- cpu->CPSR.bits.T = BIT0(val) & cpu->LDTBit;
-	 cpu->next_instruction = cpu->R15;
- return 5 + MMU.MMU_WAIT32cpu->proc_ID(adr>>24)&0xF;
- }
 
- cpu->RREG_POS(i,12) = val;
- return 3 + MMU.MMU_WAIT32cpu->proc_ID(adr>>24)&0xF;
+TEMPLATE static uint32_t FASTCALL OP_LDR_P_IMM_OFF(uint32_t i)
+{
+	uint32_t adr = cpu->RREG_POS(i, 16) + IMM_OFF_12;
+	OP_LDR(3, 5);
 }
 
-static u32 FASTCALL OP_LDR_M_IMM_OFF(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_LDR_M_IMM_OFF(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 adr = cpu->RREG_POS(i,16) - IMM_OFF_12;
- u32 val = READ32(cpu->mem_if->data, adr);
-
- if(adr&3)
- val = ROR(val, 8*(adr&3));
-
- if(REG_POS(i,12)==15)
- {
- cpu->R15 = val & (0XFFFFFFFC | (((u32)cpu->LDTBit)<<1));
- cpu->CPSR.bits.T = BIT0(val) & cpu->LDTBit;
-	 cpu->next_instruction = cpu->R15;
- return 5 + MMU.MMU_WAIT32cpu->proc_ID(adr>>24)&0xF;
- }
-
- cpu->RREG_POS(i,12) = val;
-
- return 3 + MMU.MMU_WAIT32cpu->proc_ID(adr>>24)&0xF;
+	uint32_t adr = cpu->RREG_POS(i, 16) - IMM_OFF_12;
+	OP_LDR(3, 5);
 }
 
-static u32 FASTCALL OP_LDR_P_LSL_IMM_OFF(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_LDR_P_LSL_IMM_OFF(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 adr;
- u32 val;
- u32 shift_op;
- LSL_IMM;
- adr = cpu->RREG_POS(i,16) + shift_op;
- val = READ32(cpu->mem_if->data, adr);
-
- if(adr&3)
- val = ROR(val, 8*(adr&3));
-
- if(REG_POS(i,12)==15)
- {
- cpu->R15 = val & (0XFFFFFFFC | (((u32)cpu->LDTBit)<<1));
- cpu->CPSR.bits.T = BIT0(val) & cpu->LDTBit;
-	 cpu->next_instruction = cpu->R15;
- return 5 + MMU.MMU_WAIT32cpu->proc_ID(adr>>24)&0xF;
- }
-
- cpu->RREG_POS(i,12) = val;
-
- return 3 + MMU.MMU_WAIT32cpu->proc_ID(adr>>24)&0xF;
+	LSL_IMM;
+	uint32_t adr = cpu->RREG_POS(i, 16) + shift_op;
+	OP_LDR(3, 5);
 }
 
-static u32 FASTCALL OP_LDR_M_LSL_IMM_OFF(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_LDR_M_LSL_IMM_OFF(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 adr;
- u32 val;
- u32 shift_op;
- LSL_IMM;
- adr = cpu->RREG_POS(i,16) - shift_op;
- val = READ32(cpu->mem_if->data, adr);
-
- if(adr&3)
- val = ROR(val, 8*(adr&3));
-
- if(REG_POS(i,12)==15)
- {
- cpu->R15 = val & (0XFFFFFFFC | (((u32)cpu->LDTBit)<<1));
- cpu->CPSR.bits.T = BIT0(val) & cpu->LDTBit;
-	 cpu->next_instruction = cpu->R15;
- return 5 + MMU.MMU_WAIT32cpu->proc_ID(adr>>24)&0xF;
- }
-
- cpu->RREG_POS(i,12) = val;
-
- return 3 + MMU.MMU_WAIT32cpu->proc_ID(adr>>24)&0xF;
+	LSL_IMM;
+	uint32_t adr = cpu->RREG_POS(i, 16) - shift_op;
+	OP_LDR(3, 5);
 }
 
-static u32 FASTCALL OP_LDR_P_LSR_IMM_OFF(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_LDR_P_LSR_IMM_OFF(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 adr;
- u32 val;
- u32 shift_op;
- LSR_IMM;
- adr = cpu->RREG_POS(i,16) + shift_op;
- val = READ32(cpu->mem_if->data, adr);
-
- if(adr&3)
- val = ROR(val, 8*(adr&3));
-
- if(REG_POS(i,12)==15)
- {
- cpu->R15 = val & (0XFFFFFFFC | (((u32)cpu->LDTBit)<<1));
- cpu->CPSR.bits.T = BIT0(val) & cpu->LDTBit;
-	 cpu->next_instruction = cpu->R15;
- return 5 + MMU.MMU_WAIT32cpu->proc_ID(adr>>24)&0xF;
- }
-
- cpu->RREG_POS(i,12) = val;
-
- return 3 + MMU.MMU_WAIT32cpu->proc_ID(adr>>24)&0xF;
+	LSR_IMM;
+	uint32_t adr = cpu->RREG_POS(i, 16) + shift_op;
+	OP_LDR(3, 5);
 }
 
-static u32 FASTCALL OP_LDR_M_LSR_IMM_OFF(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_LDR_M_LSR_IMM_OFF(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 adr;
- u32 val;
- u32 shift_op;
- LSR_IMM;
- adr = cpu->RREG_POS(i,16) - shift_op;
- val = READ32(cpu->mem_if->data, adr);
-
- if(adr&3)
- val = ROR(val, 8*(adr&3));
-
- if(REG_POS(i,12)==15)
- {
- cpu->R15 = val & (0XFFFFFFFC | (((u32)cpu->LDTBit)<<1));
- cpu->CPSR.bits.T = BIT0(val) & cpu->LDTBit;
-	 cpu->next_instruction = cpu->R15;
- return 5 + MMU.MMU_WAIT32cpu->proc_ID(adr>>24)&0xF;
- }
-
- cpu->RREG_POS(i,12) = val;
-
- return 3 + MMU.MMU_WAIT32cpu->proc_ID(adr>>24)&0xF;
+	LSR_IMM;
+	uint32_t adr = cpu->RREG_POS(i, 16) - shift_op;
+	OP_LDR(3, 5);
 }
 
-static u32 FASTCALL OP_LDR_P_ASR_IMM_OFF(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_LDR_P_ASR_IMM_OFF(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 adr;
- u32 val;
- u32 shift_op;
- ASR_IMM;
- adr = cpu->RREG_POS(i,16) + shift_op;
- val = READ32(cpu->mem_if->data, adr);
-
- if(adr&3)
- val = ROR(val, 8*(adr&3));
-
- if(REG_POS(i,12)==15)
- {
- cpu->R15 = val & (0XFFFFFFFC | (((u32)cpu->LDTBit)<<1));
- cpu->CPSR.bits.T = BIT0(val) & cpu->LDTBit;
-	 cpu->next_instruction = cpu->R15;
- return 5 + MMU.MMU_WAIT32cpu->proc_ID(adr>>24)&0xF;
- }
-
- cpu->RREG_POS(i,12) = val;
-
- return 3 + MMU.MMU_WAIT32cpu->proc_ID(adr>>24)&0xF;
+	ASR_IMM;
+	uint32_t adr = cpu->RREG_POS(i, 16) + shift_op;
+	OP_LDR(3, 5);
 }
 
-static u32 FASTCALL OP_LDR_M_ASR_IMM_OFF(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_LDR_M_ASR_IMM_OFF(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 adr;
- u32 val;
- u32 shift_op;
- ASR_IMM;
- adr = cpu->RREG_POS(i,16) - shift_op;
- val = READ32(cpu->mem_if->data, adr);
-
- if(adr&3)
- val = ROR(val, 8*(adr&3));
-
- if(REG_POS(i,12)==15)
- {
- cpu->R15 = val & (0XFFFFFFFC | (((u32)cpu->LDTBit)<<1));
- cpu->CPSR.bits.T = BIT0(val) & cpu->LDTBit;
-	 cpu->next_instruction = cpu->R15;
- return 5 + MMU.MMU_WAIT32cpu->proc_ID(adr>>24)&0xF;
- }
-
- cpu->RREG_POS(i,12) = val;
-
- return 3 + MMU.MMU_WAIT32cpu->proc_ID(adr>>24)&0xF;
+	ASR_IMM;
+	uint32_t adr = cpu->RREG_POS(i, 16) - shift_op;
+	OP_LDR(3, 5);
 }
 
-static u32 FASTCALL OP_LDR_P_ROR_IMM_OFF(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_LDR_P_ROR_IMM_OFF(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 adr;
- u32 val;
- u32 shift_op;
- ROR_IMM;
- adr = cpu->RREG_POS(i,16) + shift_op;
- val = READ32(cpu->mem_if->data, adr);
-
- if(adr&3)
- val = ROR(val, 8*(adr&3));
-
- if(REG_POS(i,12)==15)
- {
- cpu->R15 = val & (0XFFFFFFFC | (((u32)cpu->LDTBit)<<1));
- cpu->CPSR.bits.T = BIT0(val) & cpu->LDTBit;
-	 cpu->next_instruction = cpu->R15;
- return 5 + MMU.MMU_WAIT32cpu->proc_ID(adr>>24)&0xF;
- }
-
- cpu->RREG_POS(i,12) = val;
-
- return 3 + MMU.MMU_WAIT32cpu->proc_ID(adr>>24)&0xF;
+	ROR_IMM;
+	uint32_t adr = cpu->RREG_POS(i, 16) + shift_op;
+	OP_LDR(3, 5);
 }
 
-static u32 FASTCALL OP_LDR_M_ROR_IMM_OFF(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_LDR_M_ROR_IMM_OFF(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 adr;
- u32 val;
- u32 shift_op;
- ROR_IMM;
- adr = cpu->RREG_POS(i,16) - shift_op;
- val = READ32(cpu->mem_if->data, adr);
-
- if(adr&3)
- val = ROR(val, 8*(adr&3));
-
- if(REG_POS(i,12)==15)
- {
- cpu->R15 = val & (0XFFFFFFFC | (((u32)cpu->LDTBit)<<1));
- cpu->CPSR.bits.T = BIT0(val) & cpu->LDTBit;
-	 cpu->next_instruction = cpu->R15;
- return 5 + MMU.MMU_WAIT32cpu->proc_ID(adr>>24)&0xF;
- }
-
- cpu->RREG_POS(i,12) = val;
- cpu->RREG_POS(i,16) = adr;
-
- return 3 + MMU.MMU_WAIT32cpu->proc_ID(adr>>24)&0xF;
+	ROR_IMM;
+	uint32_t adr = cpu->RREG_POS(i, 16) - shift_op;
+	OP_LDR(3, 5);
 }
 
-static u32 FASTCALL OP_LDR_P_IMM_OFF_PREIND(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_LDR_P_IMM_OFF_PREIND(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 adr = cpu->RREG_POS(i,16) + IMM_OFF_12;
- u32 val = READ32(cpu->mem_if->data, adr);
-
- if(adr&3)
- val = ROR(val, 8*(adr&3));
-
- if(REG_POS(i,12)==15)
- {
- cpu->R15 = val & (0XFFFFFFFC | (((u32)cpu->LDTBit)<<1));
- cpu->CPSR.bits.T = BIT0(val) & cpu->LDTBit;
-	 cpu->next_instruction = cpu->R15;
- cpu->RREG_POS(i,16) = adr;
- return 5 + MMU.MMU_WAIT32cpu->proc_ID(adr>>24)&0xF;
- }
-
-	 cpu->RREG_POS(i,16) = adr;
- cpu->RREG_POS(i,12) = val;
-
- return 3 + MMU.MMU_WAIT32cpu->proc_ID(adr>>24)&0xF;
+	uint32_t adr = cpu->RREG_POS(i, 16) + IMM_OFF_12;
+	OP_LDR_W(3, 5);
 }
 
-static u32 FASTCALL OP_LDR_M_IMM_OFF_PREIND(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_LDR_M_IMM_OFF_PREIND(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 adr = cpu->RREG_POS(i,16) - IMM_OFF_12;
- u32 val = READ32(cpu->mem_if->data, adr);
-
- if(adr&3)
- val = ROR(val, 8*(adr&3));
-
- if(REG_POS(i,12)==15)
- {
- cpu->R15 = val & (0XFFFFFFFC | (((u32)cpu->LDTBit)<<1));
- cpu->CPSR.bits.T = BIT0(val) & cpu->LDTBit;
-	 cpu->next_instruction = cpu->R15;
- cpu->RREG_POS(i,16) = adr;
- return 5 + MMU.MMU_WAIT32cpu->proc_ID(adr>>24)&0xF;
- }
-
-	 cpu->RREG_POS(i,16) = adr;
- cpu->RREG_POS(i,12) = val;
-
-
- return 3 + MMU.MMU_WAIT32cpu->proc_ID(adr>>24)&0xF;
+	uint32_t adr = cpu->RREG_POS(i, 16) - IMM_OFF_12;
+	OP_LDR_W(3, 5);
 }
 
-static u32 FASTCALL OP_LDR_P_LSL_IMM_OFF_PREIND(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_LDR_P_LSL_IMM_OFF_PREIND(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 adr;
- u32 val;
- u32 shift_op;
- LSL_IMM;
- adr = cpu->RREG_POS(i,16) + shift_op;
- val = READ32(cpu->mem_if->data, adr);
-
- if(adr&3)
- val = ROR(val, 8*(adr&3));
-
- if(REG_POS(i,12)==15)
- {
- cpu->R15 = val & (0XFFFFFFFC | (((u32)cpu->LDTBit)<<1));
- cpu->CPSR.bits.T = BIT0(val) & cpu->LDTBit;
-	 cpu->next_instruction = cpu->R15;
- cpu->RREG_POS(i,16) = adr;
- return 5 + MMU.MMU_WAIT32cpu->proc_ID(adr>>24)&0xF;
- }
-
-	 cpu->RREG_POS(i,16) = adr;
- cpu->RREG_POS(i,12) = val;
-
-
- return 3 + MMU.MMU_WAIT32cpu->proc_ID(adr>>24)&0xF;
+	LSL_IMM;
+	uint32_t adr = cpu->RREG_POS(i, 16) + shift_op;
+	OP_LDR_W(3, 5);
 }
 
-static u32 FASTCALL OP_LDR_M_LSL_IMM_OFF_PREIND(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_LDR_M_LSL_IMM_OFF_PREIND(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 adr;
- u32 val;
- u32 shift_op;
- LSL_IMM;
- adr = cpu->RREG_POS(i,16) - shift_op;
- val = READ32(cpu->mem_if->data, adr);
-
- if(adr&3)
- val = ROR(val, 8*(adr&3));
-
- if(REG_POS(i,12)==15)
- {
- cpu->R15 = val & (0XFFFFFFFC | (((u32)cpu->LDTBit)<<1));
- cpu->CPSR.bits.T = BIT0(val) & cpu->LDTBit;
-	 cpu->next_instruction = cpu->R15;
- cpu->RREG_POS(i,16) = adr;
- return 5 + MMU.MMU_WAIT32cpu->proc_ID(adr>>24)&0xF;
- }
-
-	 cpu->RREG_POS(i,16) = adr;
- cpu->RREG_POS(i,12) = val;
-
-
- return 3 + MMU.MMU_WAIT32cpu->proc_ID(adr>>24)&0xF;
+	LSL_IMM;
+	uint32_t adr = cpu->RREG_POS(i, 16) - shift_op;
+	OP_LDR_W(3, 5);
 }
 
-static u32 FASTCALL OP_LDR_P_LSR_IMM_OFF_PREIND(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_LDR_P_LSR_IMM_OFF_PREIND(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 adr;
- u32 val;
- u32 shift_op;
- LSR_IMM;
- adr = cpu->RREG_POS(i,16) + shift_op;
- val = READ32(cpu->mem_if->data, adr);
-
- if(adr&3)
- val = ROR(val, 8*(adr&3));
-
- if(REG_POS(i,12)==15)
- {
- cpu->R15 = val & (0XFFFFFFFC | (((u32)cpu->LDTBit)<<1));
- cpu->CPSR.bits.T = BIT0(val) & cpu->LDTBit;
-	 cpu->next_instruction = cpu->R15;
- cpu->RREG_POS(i,16) = adr;
- return 5 + MMU.MMU_WAIT32cpu->proc_ID(adr>>24)&0xF;
- }
-
-	 cpu->RREG_POS(i,16) = adr;
- cpu->RREG_POS(i,12) = val;
-
-
- return 3 + MMU.MMU_WAIT32cpu->proc_ID(adr>>24)&0xF;
+	LSR_IMM;
+	uint32_t adr = cpu->RREG_POS(i, 16) + shift_op;
+	OP_LDR_W(3, 5);
 }
 
-static u32 FASTCALL OP_LDR_M_LSR_IMM_OFF_PREIND(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_LDR_M_LSR_IMM_OFF_PREIND(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 adr;
- u32 val;
- u32 shift_op;
- LSR_IMM;
- adr = cpu->RREG_POS(i,16) - shift_op;
- val = READ32(cpu->mem_if->data, adr);
-
- if(adr&3)
- val = ROR(val, 8*(adr&3));
-
- if(REG_POS(i,12)==15)
- {
- cpu->R15 = val & (0XFFFFFFFC | (((u32)cpu->LDTBit)<<1));
- cpu->CPSR.bits.T = BIT0(val) & cpu->LDTBit;
-	 cpu->next_instruction = cpu->R15;
- cpu->RREG_POS(i,16) = adr;
- return 5 + MMU.MMU_WAIT32cpu->proc_ID(adr>>24)&0xF;
- }
-
-	 cpu->RREG_POS(i,16) = adr;
- cpu->RREG_POS(i,12) = val;
-
-
- return 3 + MMU.MMU_WAIT32cpu->proc_ID(adr>>24)&0xF;
+	LSR_IMM;
+	uint32_t adr = cpu->RREG_POS(i, 16) - shift_op;
+	OP_LDR_W(3, 5);
 }
 
-static u32 FASTCALL OP_LDR_P_ASR_IMM_OFF_PREIND(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_LDR_P_ASR_IMM_OFF_PREIND(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 adr;
- u32 val;
- u32 shift_op;
- ASR_IMM;
- adr = cpu->RREG_POS(i,16) + shift_op;
- val = READ32(cpu->mem_if->data, adr);
-
- if(adr&3)
- val = ROR(val, 8*(adr&3));
-
- if(REG_POS(i,12)==15)
- {
- cpu->R15 = val & (0XFFFFFFFC | (((u32)cpu->LDTBit)<<1));
- cpu->CPSR.bits.T = BIT0(val) & cpu->LDTBit;
-	 cpu->next_instruction = cpu->R15;
- cpu->RREG_POS(i,16) = adr;
- return 5 + MMU.MMU_WAIT32cpu->proc_ID(adr>>24)&0xF;
- }
-
-	 cpu->RREG_POS(i,16) = adr;
- cpu->RREG_POS(i,12) = val;
-
-
- return 3 + MMU.MMU_WAIT32cpu->proc_ID(adr>>24)&0xF;
+	ASR_IMM;
+	uint32_t adr = cpu->RREG_POS(i, 16) + shift_op;
+	OP_LDR_W(3, 5);
 }
 
-static u32 FASTCALL OP_LDR_M_ASR_IMM_OFF_PREIND(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_LDR_M_ASR_IMM_OFF_PREIND(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 adr;
- u32 val;
- u32 shift_op;
- ASR_IMM;
- adr = cpu->RREG_POS(i,16) - shift_op;
- val = READ32(cpu->mem_if->data, adr);
-
- if(adr&3)
- val = ROR(val, 8*(adr&3));
-
- if(REG_POS(i,12)==15)
- {
- cpu->R15 = val & (0XFFFFFFFC | (((u32)cpu->LDTBit)<<1));
- cpu->CPSR.bits.T = BIT0(val) & cpu->LDTBit;
-	 cpu->next_instruction = cpu->R15;
- cpu->RREG_POS(i,16) = adr;
- return 5 + MMU.MMU_WAIT32cpu->proc_ID(adr>>24)&0xF;
- }
-
-	 cpu->RREG_POS(i,16) = adr;
- cpu->RREG_POS(i,12) = val;
-
-
- return 3 + MMU.MMU_WAIT32cpu->proc_ID(adr>>24)&0xF;
+	ASR_IMM;
+	uint32_t adr = cpu->RREG_POS(i, 16) - shift_op;
+	OP_LDR_W(3, 5);
 }
 
-static u32 FASTCALL OP_LDR_P_ROR_IMM_OFF_PREIND(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_LDR_P_ROR_IMM_OFF_PREIND(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 adr;
- u32 val;
- u32 shift_op;
- ROR_IMM;
- adr = cpu->RREG_POS(i,16) + shift_op;
- val = READ32(cpu->mem_if->data, adr);
-
- if(adr&3)
- val = ROR(val, 8*(adr&3));
-
- if(REG_POS(i,12)==15)
- {
- cpu->R15 = val & (0XFFFFFFFC | (((u32)cpu->LDTBit)<<1));
- cpu->CPSR.bits.T = BIT0(val) & cpu->LDTBit;
-	 cpu->next_instruction = cpu->R15;
- cpu->RREG_POS(i,16) = adr;
- return 5 + MMU.MMU_WAIT32cpu->proc_ID(adr>>24)&0xF;
- }
-
-	 cpu->RREG_POS(i,16) = adr;
- cpu->RREG_POS(i,12) = val;
-
-
- return 3 + MMU.MMU_WAIT32cpu->proc_ID(adr>>24)&0xF;
+	ROR_IMM;
+	uint32_t adr = cpu->RREG_POS(i, 16) + shift_op;
+	OP_LDR_W(3, 5);
 }
 
-static u32 FASTCALL OP_LDR_M_ROR_IMM_OFF_PREIND(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_LDR_M_ROR_IMM_OFF_PREIND(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 adr;
- u32 val;
- u32 shift_op;
- ROR_IMM;
- adr = cpu->RREG_POS(i,16) - shift_op;
- val = READ32(cpu->mem_if->data, adr);
-
- if(adr&3)
- val = ROR(val, 8*(adr&3));
-
- if(REG_POS(i,12)==15)
- {
- cpu->R15 = val & (0XFFFFFFFC | (((u32)cpu->LDTBit)<<1));
- cpu->CPSR.bits.T = BIT0(val) & cpu->LDTBit;
-	 cpu->next_instruction = cpu->R15;
- cpu->RREG_POS(i,16) = adr;
- return 5 + MMU.MMU_WAIT32cpu->proc_ID(adr>>24)&0xF;
- }
-
-	 cpu->RREG_POS(i,16) = adr;
- cpu->RREG_POS(i,12) = val;
-
- return 3 + MMU.MMU_WAIT32cpu->proc_ID(adr>>24)&0xF;
+	ROR_IMM;
+	uint32_t adr = cpu->RREG_POS(i, 16) - shift_op;
+	OP_LDR_W(3, 5);
 }
 
-static u32 FASTCALL OP_LDR_P_IMM_OFF_POSTIND(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_LDR_P_IMM_OFF_POSTIND(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 adr = cpu->RREG_POS(i,16);
- u32 val = READ32(cpu->mem_if->data, adr);
-
- if(adr&3)
- val = ROR(val, 8*(adr&3));
-
- if(REG_POS(i,12)==15)
- {
- cpu->R15 = val & (0XFFFFFFFC | (((u32)cpu->LDTBit)<<1));
- cpu->CPSR.bits.T = BIT0(val) & cpu->LDTBit;
-	 cpu->next_instruction = cpu->R15;
- cpu->RREG_POS(i,16) = adr + IMM_OFF_12;
- return 5 + MMU.MMU_WAIT32cpu->proc_ID(adr>>24)&0xF;
- }
-
-	 cpu->RREG_POS(i,16) = adr + IMM_OFF_12;
- cpu->RREG_POS(i,12) = val;
-
- return 3 + MMU.MMU_WAIT32cpu->proc_ID(adr>>24)&0xF;
+	OP_LDR_W2(3, 5, IMM_OFF_12);
 }
 
-//------------------------------------------------------------
-static u32 FASTCALL OP_LDR_P_IMM_OFF_POSTIND2(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_LDR_M_IMM_OFF_POSTIND(uint32_t i)
 {
- u32 i = cpu->instruction;
-
- u32 adr = cpu->RREG_POS(i,16);
- u32 val = READ32(cpu->mem_if->data, adr);
- u32 old;
- if(adr&3)
- val = ROR(val, 8*(adr&3));
-
- if(REG_POS(i,12)==15)
- {
- cpu->R15 = val & (0XFFFFFFFC | (((u32)cpu->LDTBit)<<1));
- cpu->CPSR.bits.T = BIT0(val) & cpu->LDTBit;
-	 cpu->next_instruction = cpu->R15;
- cpu->RREG_POS(i,16) = adr + IMM_OFF_12;
- return 5 + MMU.MMU_WAIT32cpu->proc_ID(adr>>24)&0xF;
- }
-
- old = armcpu_switchMode(cpu, USR);
- cpu->RREG_POS(i,12) = val;
- armcpu_switchMode(cpu, old);
-
- cpu->RREG_POS(i,16) = adr + IMM_OFF_12;
-
- return 3 + MMU.MMU_WAIT32cpu->proc_ID(adr>>24)&0xF;
+	OP_LDR_W2(3, 5, -IMM_OFF_12);
 }
 
-//------------------------------------------------------------
-
-static u32 FASTCALL OP_LDR_M_IMM_OFF_POSTIND(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_LDR_P_LSL_IMM_OFF_POSTIND(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 adr = cpu->RREG_POS(i,16);
- u32 val = READ32(cpu->mem_if->data, adr);
-
- if(adr&3)
- val = ROR(val, 8*(adr&3));
-
- if(REG_POS(i,12)==15)
- {
- cpu->R15 = val & (0XFFFFFFFC | (((u32)cpu->LDTBit)<<1));
- cpu->CPSR.bits.T = BIT0(val) & cpu->LDTBit;
-	 cpu->next_instruction = cpu->R15;
- cpu->RREG_POS(i,16) = adr - IMM_OFF_12;
- return 5 + MMU.MMU_WAIT32cpu->proc_ID(adr>>24)&0xF;
- }
-
-	 cpu->RREG_POS(i,16) = adr - IMM_OFF_12;
- cpu->RREG_POS(i,12) = val;
-
- return 3 + MMU.MMU_WAIT32cpu->proc_ID(adr>>24)&0xF;
+	LSL_IMM;
+	OP_LDR_W2(3, 5, shift_op);
 }
 
-static u32 FASTCALL OP_LDR_P_LSL_IMM_OFF_POSTIND(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_LDR_M_LSL_IMM_OFF_POSTIND(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 adr;
- u32 val;
- u32 shift_op;
- LSL_IMM;
- adr = cpu->RREG_POS(i,16);
- val = READ32(cpu->mem_if->data, adr);
-
- if(adr&3)
- val = ROR(val, 8*(adr&3));
-
- if(REG_POS(i,12)==15)
- {
- cpu->R15 = val & (0XFFFFFFFC | (((u32)cpu->LDTBit)<<1));
- cpu->CPSR.bits.T = BIT0(val) & cpu->LDTBit;
-	 cpu->next_instruction = cpu->R15;
- cpu->RREG_POS(i,16) = adr + shift_op;
- return 5 + MMU.MMU_WAIT32cpu->proc_ID(adr>>24)&0xF;
- }
-
-	 cpu->RREG_POS(i,16) = adr + shift_op;
- cpu->RREG_POS(i,12) = val;
-
- return 3 + MMU.MMU_WAIT32cpu->proc_ID(adr>>24)&0xF;
+	LSL_IMM;
+	OP_LDR_W2(3, 5, -shift_op);
 }
 
-static u32 FASTCALL OP_LDR_M_LSL_IMM_OFF_POSTIND(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_LDR_P_LSR_IMM_OFF_POSTIND(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 adr;
- u32 val;
- u32 shift_op;
- LSL_IMM;
- adr = cpu->RREG_POS(i,16);
- val = READ32(cpu->mem_if->data, adr);
-
- if(adr&3)
- val = ROR(val, 8*(adr&3));
-
- if(REG_POS(i,12)==15)
- {
- cpu->R15 = val & (0XFFFFFFFC | (((u32)cpu->LDTBit)<<1));
- cpu->CPSR.bits.T = BIT0(val) & cpu->LDTBit;
-	 cpu->next_instruction = cpu->R15;
- cpu->RREG_POS(i,16) = adr - shift_op;
- return 5 + MMU.MMU_WAIT32cpu->proc_ID(adr>>24)&0xF;
- }
-
-	 cpu->RREG_POS(i,16) = adr - shift_op;
- cpu->RREG_POS(i,12) = val;
-
- return 3 + MMU.MMU_WAIT32cpu->proc_ID(adr>>24)&0xF;
+	LSR_IMM;
+	OP_LDR_W2(3, 5, shift_op);
 }
 
-static u32 FASTCALL OP_LDR_P_LSR_IMM_OFF_POSTIND(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_LDR_M_LSR_IMM_OFF_POSTIND(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 adr;
- u32 val;
- u32 shift_op;
- LSR_IMM;
- adr = cpu->RREG_POS(i,16);
- val = READ32(cpu->mem_if->data, adr);
-
- if(adr&3)
- val = ROR(val, 8*(adr&3));
-
- if(REG_POS(i,12)==15)
- {
- cpu->R15 = val & (0XFFFFFFFC | (((u32)cpu->LDTBit)<<1));
- cpu->CPSR.bits.T = BIT0(val) & cpu->LDTBit;
-	 cpu->next_instruction = cpu->R15;
- cpu->RREG_POS(i,16) = adr + shift_op;
- return 5 + MMU.MMU_WAIT32cpu->proc_ID(adr>>24)&0xF;
- }
-
-	 cpu->RREG_POS(i,16) = adr + shift_op;
- cpu->RREG_POS(i,12) = val;
-
- return 3 + MMU.MMU_WAIT32cpu->proc_ID(adr>>24)&0xF;
+	LSR_IMM;
+	OP_LDR_W2(3, 5, -shift_op);
 }
 
-static u32 FASTCALL OP_LDR_M_LSR_IMM_OFF_POSTIND(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_LDR_P_ASR_IMM_OFF_POSTIND(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 adr;
- u32 val;
- u32 shift_op;
- LSR_IMM;
- adr = cpu->RREG_POS(i,16);
- val = READ32(cpu->mem_if->data, adr);
-
- if(adr&3)
- val = ROR(val, 8*(adr&3));
-
- if(REG_POS(i,12)==15)
- {
- cpu->R15 = val & (0XFFFFFFFC | (((u32)cpu->LDTBit)<<1));
- cpu->CPSR.bits.T = BIT0(val) & cpu->LDTBit;
-	 cpu->next_instruction = cpu->R15;
- cpu->RREG_POS(i,16) = adr - shift_op;
- return 5 + MMU.MMU_WAIT32cpu->proc_ID(adr>>24)&0xF;
- }
-
-	 cpu->RREG_POS(i,16) = adr - shift_op;
- cpu->RREG_POS(i,12) = val;
-
- return 3 + MMU.MMU_WAIT32cpu->proc_ID(adr>>24)&0xF;
+	ASR_IMM;
+	OP_LDR_W2(3, 5, shift_op);
 }
 
-static u32 FASTCALL OP_LDR_P_ASR_IMM_OFF_POSTIND(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_LDR_M_ASR_IMM_OFF_POSTIND(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 adr;
- u32 val;
- u32 shift_op;
- ASR_IMM;
- adr = cpu->RREG_POS(i,16);
- val = READ32(cpu->mem_if->data, adr);
-
- if(adr&3)
- val = ROR(val, 8*(adr&3));
-
- if(REG_POS(i,12)==15)
- {
- cpu->R15 = val & (0XFFFFFFFC | (((u32)cpu->LDTBit)<<1));
- cpu->CPSR.bits.T = BIT0(val) & cpu->LDTBit;
-	 cpu->next_instruction = cpu->R15;
- cpu->RREG_POS(i,16) = adr + shift_op;
- return 5 + MMU.MMU_WAIT32cpu->proc_ID(adr>>24)&0xF;
- }
-
-	 cpu->RREG_POS(i,16) = adr + shift_op;
- cpu->RREG_POS(i,12) = val;
-
- return 3 + MMU.MMU_WAIT32cpu->proc_ID(adr>>24)&0xF;
+	ASR_IMM;
+	OP_LDR_W2(3, 5, -shift_op);
 }
 
-static u32 FASTCALL OP_LDR_M_ASR_IMM_OFF_POSTIND(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_LDR_P_ROR_IMM_OFF_POSTIND(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 adr;
- u32 val;
- u32 shift_op;
- ASR_IMM;
- adr = cpu->RREG_POS(i,16);
- val = READ32(cpu->mem_if->data, adr);
-
- if(adr&3)
- val = ROR(val, 8*(adr&3));
-
- if(REG_POS(i,12)==15)
- {
- cpu->R15 = val & (0XFFFFFFFC | (((u32)cpu->LDTBit)<<1));
- cpu->CPSR.bits.T = BIT0(val) & cpu->LDTBit;
-	 cpu->next_instruction = cpu->R15;
- cpu->RREG_POS(i,16) = adr - shift_op;
- return 5 + MMU.MMU_WAIT32cpu->proc_ID(adr>>24)&0xF;
- }
-
- cpu->RREG_POS(i,16) = adr - shift_op;
-	 cpu->RREG_POS(i,12) = val;
-
- return 3 + MMU.MMU_WAIT32cpu->proc_ID(adr>>24)&0xF;
+	ROR_IMM;
+	OP_LDR_W2(3, 5, shift_op);
 }
 
-static u32 FASTCALL OP_LDR_P_ROR_IMM_OFF_POSTIND(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_LDR_M_ROR_IMM_OFF_POSTIND(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 adr;
- u32 val;
- u32 shift_op;
- ROR_IMM;
- adr = cpu->RREG_POS(i,16);
- val = READ32(cpu->mem_if->data, adr);
-
- if(adr&3)
- val = ROR(val, 8*(adr&3));
-
- if(REG_POS(i,12)==15)
- {
- cpu->R15 = val & (0XFFFFFFFC | (((u32)cpu->LDTBit)<<1));
- cpu->CPSR.bits.T = BIT0(val) & cpu->LDTBit;
-	 cpu->next_instruction = cpu->R15;
- cpu->RREG_POS(i,16) = adr + shift_op;
- return 5 + MMU.MMU_WAIT32cpu->proc_ID(adr>>24)&0xF;
- }
-
-	 cpu->RREG_POS(i,16) = adr + shift_op;
- cpu->RREG_POS(i,12) = val;
-
- return 3 + MMU.MMU_WAIT32cpu->proc_ID(adr>>24)&0xF;
+	ROR_IMM;
+	OP_LDR_W2(3, 5, -shift_op);
 }
 
-static u32 FASTCALL OP_LDR_M_ROR_IMM_OFF_POSTIND(armcpu_t *cpu)
+// -----------------------------------------------------------------------------
+// LDREX
+// -----------------------------------------------------------------------------
+TEMPLATE static uint32_t FASTCALL OP_LDREX(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 adr;
- u32 val;
- u32 shift_op;
- ROR_IMM;
- adr = cpu->RREG_POS(i,16);
- val = READ32(cpu->mem_if->data, adr);
-
- if(adr&3)
- val = ROR(val, 8*(adr&3));
-
- if(REG_POS(i,12)==15)
- {
- cpu->R15 = val & (0XFFFFFFFC | (((u32)cpu->LDTBit)<<1));
- cpu->CPSR.bits.T = BIT0(val) & cpu->LDTBit;
-	 cpu->next_instruction = cpu->R15;
- cpu->RREG_POS(i,16) = adr - shift_op;
- return 5 + MMU.MMU_WAIT32cpu->proc_ID(adr>>24)&0xF;
- }
-
-	 cpu->RREG_POS(i,16) = adr - shift_op;
- cpu->RREG_POS(i,12) = val;
-
- return 3 + MMU.MMU_WAIT32cpu->proc_ID(adr>>24)&0xF;
+	fprintf(stderr, "LDREX\n");
+	uint32_t adr = cpu->RREG_POS(i, 16);
+	cpu->RREG_POS(i, 12) = ROR(READ32(cpu->mem_if->data, adr), 8 * (adr & 3));
+	return MMU_aluMemAccessCycles<PROCNUM,32, MMU_AD_READ>(3, adr);
 }
 
-//-----------------LDRB-------------------------------------------
+// -----------------------------------------------------------------------------
+// LDRB
+// -----------------------------------------------------------------------------
 
-static u32 FASTCALL OP_LDRB_P_IMM_OFF(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_LDRB_P_IMM_OFF(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 adr = cpu->RREG_POS(i,16) + IMM_OFF_12;
- u32 val = READ8(cpu->mem_if->data, adr);
- cpu->RREG_POS(i,12) = val;
+	uint32_t adr = cpu->RREG_POS(i, 16) + IMM_OFF_12;
+	cpu->RREG_POS(i, 12) = static_cast<uint32_t>(READ8(cpu->mem_if->data, adr));
 
- return 3 + MMU.MMU_WAIT16cpu->proc_ID(adr>>24)&0xF;
+	return MMU_aluMemAccessCycles<PROCNUM, 8, MMU_AD_READ>(3, adr);
 }
 
-static u32 FASTCALL OP_LDRB_M_IMM_OFF(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_LDRB_M_IMM_OFF(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 adr = cpu->RREG_POS(i,16) - IMM_OFF_12;
- u32 val = READ8(cpu->mem_if->data, adr);
- cpu->RREG_POS(i,12) = val;
+	uint32_t adr = cpu->RREG_POS(i, 16) - IMM_OFF_12;
+	cpu->RREG_POS(i, 12) = static_cast<uint32_t>(READ8(cpu->mem_if->data, adr));
 
- return 3 + MMU.MMU_WAIT16cpu->proc_ID(adr>>24)&0xF;
+	return MMU_aluMemAccessCycles<PROCNUM, 8, MMU_AD_READ>(3, adr);
 }
 
-static u32 FASTCALL OP_LDRB_P_LSL_IMM_OFF(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_LDRB_P_LSL_IMM_OFF(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 adr;
- u32 val;
- u32 shift_op;
- LSL_IMM;
- adr = cpu->RREG_POS(i,16) + shift_op;
- val = READ8(cpu->mem_if->data, adr);
- cpu->RREG_POS(i,12) = val;
+	LSL_IMM;
+	uint32_t adr = cpu->RREG_POS(i, 16) + shift_op;
+	cpu->RREG_POS(i, 12) = static_cast<uint32_t>(READ8(cpu->mem_if->data, adr));
 
- return 3 + MMU.MMU_WAIT16cpu->proc_ID(adr>>24)&0xF;
+	return MMU_aluMemAccessCycles<PROCNUM, 8, MMU_AD_READ>(3, adr);
 }
 
-static u32 FASTCALL OP_LDRB_M_LSL_IMM_OFF(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_LDRB_M_LSL_IMM_OFF(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 adr;
- u32 val;
- u32 shift_op;
- LSL_IMM;
- adr = cpu->RREG_POS(i,16) - shift_op;
- val = READ8(cpu->mem_if->data, adr);
- cpu->RREG_POS(i,12) = val;
+	LSL_IMM;
+	uint32_t adr = cpu->RREG_POS(i, 16) - shift_op;
+	cpu->RREG_POS(i, 12) = static_cast<uint32_t>(READ8(cpu->mem_if->data, adr));
 
- return 3 + MMU.MMU_WAIT16cpu->proc_ID(adr>>24)&0xF;
+	return MMU_aluMemAccessCycles<PROCNUM, 8, MMU_AD_READ>(3, adr);
 }
 
-static u32 FASTCALL OP_LDRB_P_LSR_IMM_OFF(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_LDRB_P_LSR_IMM_OFF(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 adr;
- u32 val;
- u32 shift_op;
- LSR_IMM;
- adr = cpu->RREG_POS(i,16) + shift_op;
- val = READ8(cpu->mem_if->data, adr);
- cpu->RREG_POS(i,12) = val;
+	LSR_IMM;
+	uint32_t adr = cpu->RREG_POS(i, 16) + shift_op;
+	cpu->RREG_POS(i, 12) = READ8(cpu->mem_if->data, adr);
 
- return 3 + MMU.MMU_WAIT16cpu->proc_ID(adr>>24)&0xF;
+	return MMU_aluMemAccessCycles<PROCNUM, 8, MMU_AD_READ>(3, adr);
 }
 
-static u32 FASTCALL OP_LDRB_M_LSR_IMM_OFF(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_LDRB_M_LSR_IMM_OFF(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 adr;
- u32 val;
- u32 shift_op;
- LSR_IMM;
- adr = cpu->RREG_POS(i,16) - shift_op;
- val = READ8(cpu->mem_if->data, adr);
- cpu->RREG_POS(i,12) = val;
+	LSR_IMM;
+	uint32_t adr = cpu->RREG_POS(i, 16) - shift_op;
+	cpu->RREG_POS(i, 12) = static_cast<uint32_t>(READ8(cpu->mem_if->data, adr));
 
- return 3 + MMU.MMU_WAIT16cpu->proc_ID(adr>>24)&0xF;
+	return MMU_aluMemAccessCycles<PROCNUM, 8, MMU_AD_READ>(3, adr);
 }
 
-static u32 FASTCALL OP_LDRB_P_ASR_IMM_OFF(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_LDRB_P_ASR_IMM_OFF(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 adr;
- u32 val;
- u32 shift_op;
- ASR_IMM;
- adr = cpu->RREG_POS(i,16) + shift_op;
- val = READ8(cpu->mem_if->data, adr);
- cpu->RREG_POS(i,12) = val;
+	ASR_IMM;
+	uint32_t adr = cpu->RREG_POS(i, 16) + shift_op;
+	cpu->RREG_POS(i, 12) = static_cast<uint32_t>(READ8(cpu->mem_if->data, adr));
 
- return 3 + MMU.MMU_WAIT16cpu->proc_ID(adr>>24)&0xF;
+	return MMU_aluMemAccessCycles<PROCNUM, 8, MMU_AD_READ>(3, adr);
 }
 
-static u32 FASTCALL OP_LDRB_M_ASR_IMM_OFF(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_LDRB_M_ASR_IMM_OFF(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 adr;
- u32 val;
- u32 shift_op;
- ASR_IMM;
- adr = cpu->RREG_POS(i,16) - shift_op;
- val = READ8(cpu->mem_if->data, adr);
- cpu->RREG_POS(i,12) = val;
+	ASR_IMM;
+	uint32_t adr = cpu->RREG_POS(i, 16) - shift_op;
+	cpu->RREG_POS(i, 12) = static_cast<uint32_t>(READ8(cpu->mem_if->data, adr));
 
- return 3 + MMU.MMU_WAIT16cpu->proc_ID(adr>>24)&0xF;
+	return MMU_aluMemAccessCycles<PROCNUM, 8, MMU_AD_READ>(3, adr);
 }
 
-static u32 FASTCALL OP_LDRB_P_ROR_IMM_OFF(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_LDRB_P_ROR_IMM_OFF(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 adr;
- u32 val;
- u32 shift_op;
- ROR_IMM;
- adr = cpu->RREG_POS(i,16) + shift_op;
- val = READ8(cpu->mem_if->data, adr);
- cpu->RREG_POS(i,12) = val;
+	ROR_IMM;
+	uint32_t adr = cpu->RREG_POS(i, 16) + shift_op;
+	cpu->RREG_POS(i, 12) = static_cast<uint32_t>(READ8(cpu->mem_if->data, adr));
 
- return 3 + MMU.MMU_WAIT16cpu->proc_ID(adr>>24)&0xF;
+	return MMU_aluMemAccessCycles<PROCNUM, 8, MMU_AD_READ>(3, adr);
 }
 
-static u32 FASTCALL OP_LDRB_M_ROR_IMM_OFF(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_LDRB_M_ROR_IMM_OFF(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 adr;
- u32 val;
- u32 shift_op;
- ROR_IMM;
- adr = cpu->RREG_POS(i,16) - shift_op;
- val = READ8(cpu->mem_if->data, adr);
- cpu->RREG_POS(i,12) = val;
- cpu->RREG_POS(i,16) = adr;
+	ROR_IMM;
+	uint32_t adr = cpu->RREG_POS(i, 16) - shift_op;
+	cpu->RREG_POS(i, 12) = static_cast<uint32_t>(READ8(cpu->mem_if->data, adr));
 
- return 3 + MMU.MMU_WAIT16cpu->proc_ID(adr>>24)&0xF;
+	return MMU_aluMemAccessCycles<PROCNUM, 8, MMU_AD_READ>(3, adr);
 }
 
-static u32 FASTCALL OP_LDRB_P_IMM_OFF_PREIND(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_LDRB_P_IMM_OFF_PREIND(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 adr = cpu->RREG_POS(i,16) + IMM_OFF_12;
- u32 val = READ8(cpu->mem_if->data, adr);
-
-	 cpu->RREG_POS(i,16) = adr;
- cpu->RREG_POS(i,12) = val;
-
+	uint32_t adr = cpu->RREG_POS(i, 16) + IMM_OFF_12;
+	cpu->RREG_POS(i, 16) = adr;
+	cpu->RREG_POS(i, 12) = static_cast<uint32_t>(READ8(cpu->mem_if->data, adr));
 
- return 3 + MMU.MMU_WAIT16cpu->proc_ID(adr>>24)&0xF;
+	return MMU_aluMemAccessCycles<PROCNUM, 8, MMU_AD_READ>(3, adr);
 }
 
-static u32 FASTCALL OP_LDRB_M_IMM_OFF_PREIND(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_LDRB_M_IMM_OFF_PREIND(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 adr = cpu->RREG_POS(i,16) - IMM_OFF_12;
- u32 val = READ8(cpu->mem_if->data, adr);
+	uint32_t adr = cpu->RREG_POS(i, 16) - IMM_OFF_12;
+	cpu->RREG_POS(i, 16) = adr;
+	cpu->RREG_POS(i, 12) = static_cast<uint32_t>(READ8(cpu->mem_if->data, adr));
 
-	 cpu->RREG_POS(i,16) = adr;
- cpu->RREG_POS(i,12) = val;
-
- return 3 + MMU.MMU_WAIT16cpu->proc_ID(adr>>24)&0xF;
+	return MMU_aluMemAccessCycles<PROCNUM, 8, MMU_AD_READ>(3, adr);
 }
 
-static u32 FASTCALL OP_LDRB_P_LSL_IMM_OFF_PREIND(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_LDRB_P_LSL_IMM_OFF_PREIND(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 adr;
- u32 val;
- u32 shift_op;
- LSL_IMM;
- adr = cpu->RREG_POS(i,16) + shift_op;
- val = READ8(cpu->mem_if->data, adr);
-
-	 cpu->RREG_POS(i,16) = adr;
- cpu->RREG_POS(i,12) = val;
-
+	LSL_IMM;
+	uint32_t adr = cpu->RREG_POS(i, 16) + shift_op;
+	cpu->RREG_POS(i, 16) = adr;
+	cpu->RREG_POS(i, 12) = static_cast<uint32_t>(READ8(cpu->mem_if->data, adr));
 
- return 3 + MMU.MMU_WAIT16cpu->proc_ID(adr>>24)&0xF;
+	return MMU_aluMemAccessCycles<PROCNUM, 8, MMU_AD_READ>(3, adr);
 }
 
-static u32 FASTCALL OP_LDRB_M_LSL_IMM_OFF_PREIND(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_LDRB_M_LSL_IMM_OFF_PREIND(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 adr;
- u32 val;
- u32 shift_op;
- LSL_IMM;
- adr = cpu->RREG_POS(i,16) - shift_op;
- val = READ8(cpu->mem_if->data, adr);
+	LSL_IMM;
+	uint32_t adr = cpu->RREG_POS(i, 16) - shift_op;
+	cpu->RREG_POS(i, 16) = adr;
+	cpu->RREG_POS(i, 12) = static_cast<uint32_t>(READ8(cpu->mem_if->data, adr));
 
- cpu->RREG_POS(i,16) = adr;
-	 cpu->RREG_POS(i,12) = val;
-
- return 3 + MMU.MMU_WAIT16cpu->proc_ID(adr>>24)&0xF;
+	return MMU_aluMemAccessCycles<PROCNUM, 8, MMU_AD_READ>(3, adr);
 }
 
-static u32 FASTCALL OP_LDRB_P_LSR_IMM_OFF_PREIND(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_LDRB_P_LSR_IMM_OFF_PREIND(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 adr;
- u32 val;
- u32 shift_op;
- LSR_IMM;
- adr = cpu->RREG_POS(i,16) + shift_op;
- val = READ8(cpu->mem_if->data, adr);
- cpu->RREG_POS(i,16) = adr;
-	 cpu->RREG_POS(i,12) = val;
+	LSR_IMM;
+	uint32_t adr = cpu->RREG_POS(i, 16) + shift_op;
+	cpu->RREG_POS(i, 16) = adr;
+	cpu->RREG_POS(i, 12) = static_cast<uint32_t>(READ8(cpu->mem_if->data, adr));
 
- return 3 + MMU.MMU_WAIT16cpu->proc_ID(adr>>24)&0xF;
+	return MMU_aluMemAccessCycles<PROCNUM, 8, MMU_AD_READ>(3, adr);
 }
 
-static u32 FASTCALL OP_LDRB_M_LSR_IMM_OFF_PREIND(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_LDRB_M_LSR_IMM_OFF_PREIND(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 adr;
- u32 val;
- u32 shift_op;
- LSR_IMM;
- adr = cpu->RREG_POS(i,16) - shift_op;
- val = READ8(cpu->mem_if->data, adr);
- cpu->RREG_POS(i,16) = adr;
-	 cpu->RREG_POS(i,12) = val;
+	LSR_IMM;
+	uint32_t adr = cpu->RREG_POS(i, 16) - shift_op;
+	cpu->RREG_POS(i, 16) = adr;
+	cpu->RREG_POS(i, 12) = static_cast<uint32_t>(READ8(cpu->mem_if->data, adr));
 
- return 3 + MMU.MMU_WAIT16cpu->proc_ID(adr>>24)&0xF;
+	return MMU_aluMemAccessCycles<PROCNUM, 8, MMU_AD_READ>(3, adr);
 }
 
-static u32 FASTCALL OP_LDRB_P_ASR_IMM_OFF_PREIND(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_LDRB_P_ASR_IMM_OFF_PREIND(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 adr;
- u32 val;
- u32 shift_op;
- ASR_IMM;
- adr = cpu->RREG_POS(i,16) + shift_op;
- val = READ8(cpu->mem_if->data, adr);
- cpu->RREG_POS(i,16) = adr;
-	 cpu->RREG_POS(i,12) = val;
+	ASR_IMM;
+	uint32_t adr = cpu->RREG_POS(i, 16) + shift_op;
+	cpu->RREG_POS(i, 16) = adr;
+	cpu->RREG_POS(i, 12) = static_cast<uint32_t>(READ8(cpu->mem_if->data, adr));
 
- return 3 + MMU.MMU_WAIT16cpu->proc_ID(adr>>24)&0xF;
+	return MMU_aluMemAccessCycles<PROCNUM, 8, MMU_AD_READ>(3, adr);
 }
 
-static u32 FASTCALL OP_LDRB_M_ASR_IMM_OFF_PREIND(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_LDRB_M_ASR_IMM_OFF_PREIND(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 adr;
- u32 val;
- u32 shift_op;
- ASR_IMM;
- adr = cpu->RREG_POS(i,16) - shift_op;
- val = READ8(cpu->mem_if->data, adr);
- cpu->RREG_POS(i,16) = adr;
-	 cpu->RREG_POS(i,12) = val;
+	ASR_IMM;
+	uint32_t adr = cpu->RREG_POS(i, 16) - shift_op;
+	cpu->RREG_POS(i, 16) = adr;
+	cpu->RREG_POS(i, 12) = static_cast<uint32_t>(READ8(cpu->mem_if->data, adr));
 
- return 3 + MMU.MMU_WAIT16cpu->proc_ID(adr>>24)&0xF;
+	return MMU_aluMemAccessCycles<PROCNUM, 8, MMU_AD_READ>(3, adr);
 }
 
-static u32 FASTCALL OP_LDRB_P_ROR_IMM_OFF_PREIND(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_LDRB_P_ROR_IMM_OFF_PREIND(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 adr;
- u32 val;
- u32 shift_op;
- ROR_IMM;
- adr = cpu->RREG_POS(i,16) + shift_op;
- val = READ8(cpu->mem_if->data, adr);
- cpu->RREG_POS(i,16) = adr;
-	 cpu->RREG_POS(i,12) = val;
+	ROR_IMM;
+	uint32_t adr = cpu->RREG_POS(i, 16) + shift_op;
+	cpu->RREG_POS(i, 16) = adr;
+	cpu->RREG_POS(i, 12) = static_cast<uint32_t>(READ8(cpu->mem_if->data, adr));
 
- return 3 + MMU.MMU_WAIT16cpu->proc_ID(adr>>24)&0xF;
+	return MMU_aluMemAccessCycles<PROCNUM, 8, MMU_AD_READ>(3, adr);
 }
 
-static u32 FASTCALL OP_LDRB_M_ROR_IMM_OFF_PREIND(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_LDRB_M_ROR_IMM_OFF_PREIND(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 adr;
- u32 val;
- u32 shift_op;
- ROR_IMM;
- adr = cpu->RREG_POS(i,16) - shift_op;
- val = READ8(cpu->mem_if->data, adr);
- cpu->RREG_POS(i,16) = adr;
-	 cpu->RREG_POS(i,12) = val;
+	ROR_IMM;
+	uint32_t adr = cpu->RREG_POS(i, 16) - shift_op;
+	cpu->RREG_POS(i, 16) = adr;
+	cpu->RREG_POS(i, 12) = static_cast<uint32_t>(READ8(cpu->mem_if->data, adr));
 
- return 3 + MMU.MMU_WAIT16cpu->proc_ID(adr>>24)&0xF;
+	return MMU_aluMemAccessCycles<PROCNUM, 8, MMU_AD_READ>(3, adr);
 }
 
-static u32 FASTCALL OP_LDRB_P_IMM_OFF_POSTIND(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_LDRB_P_IMM_OFF_POSTIND(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 adr = cpu->RREG_POS(i,16);
- u32 val = READ8(cpu->mem_if->data, adr);
-	 cpu->RREG_POS(i,16) = adr + IMM_OFF_12;
- cpu->RREG_POS(i,12) = val;
+	uint32_t adr = cpu->RREG_POS(i, 16);
+	cpu->RREG_POS(i, 16) = adr + IMM_OFF_12;
+	cpu->RREG_POS(i, 12) = static_cast<uint32_t>(READ8(cpu->mem_if->data, adr));
 
- return 3 + MMU.MMU_WAIT16cpu->proc_ID(adr>>24)&0xF;
+	return MMU_aluMemAccessCycles<PROCNUM, 8, MMU_AD_READ>(3, adr);
 }
 
-static u32 FASTCALL OP_LDRB_M_IMM_OFF_POSTIND(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_LDRB_M_IMM_OFF_POSTIND(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 adr = cpu->RREG_POS(i,16);
- u32 val = READ8(cpu->mem_if->data, adr);
-	 cpu->RREG_POS(i,16) = adr - IMM_OFF_12;
- cpu->RREG_POS(i,12) = val;
+	uint32_t adr = cpu->RREG_POS(i, 16);
+	cpu->RREG_POS(i, 16) = adr - IMM_OFF_12;
+	cpu->RREG_POS(i, 12) = static_cast<uint32_t>(READ8(cpu->mem_if->data, adr));
 
- return 3 + MMU.MMU_WAIT16cpu->proc_ID(adr>>24)&0xF;
+	return MMU_aluMemAccessCycles<PROCNUM, 8, MMU_AD_READ>(3, adr);
 }
 
-static u32 FASTCALL OP_LDRB_P_LSL_IMM_OFF_POSTIND(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_LDRB_P_LSL_IMM_OFF_POSTIND(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 adr;
- u32 val;
- u32 shift_op;
- LSL_IMM;
- adr = cpu->RREG_POS(i,16);
- val = READ8(cpu->mem_if->data, adr);
-	 cpu->RREG_POS(i,16) = adr + shift_op;
- cpu->RREG_POS(i,12) = val;
+	LSL_IMM;
+	uint32_t adr = cpu->RREG_POS(i, 16);
+	cpu->RREG_POS(i, 16) = adr + shift_op;
+	cpu->RREG_POS(i, 12) = static_cast<uint32_t>(READ8(cpu->mem_if->data, adr));
 
- return 3 + MMU.MMU_WAIT16cpu->proc_ID(adr>>24)&0xF;
+	return MMU_aluMemAccessCycles<PROCNUM, 8, MMU_AD_READ>(3, adr);
 }
 
-static u32 FASTCALL OP_LDRB_M_LSL_IMM_OFF_POSTIND(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_LDRB_M_LSL_IMM_OFF_POSTIND(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 adr;
- u32 val;
- u32 shift_op;
- LSL_IMM;
- adr = cpu->RREG_POS(i,16);
- val = READ8(cpu->mem_if->data, adr);
-	 cpu->RREG_POS(i,16) = adr - shift_op;
- cpu->RREG_POS(i,12) = val;
+	LSL_IMM;
+	uint32_t adr = cpu->RREG_POS(i, 16);
+	cpu->RREG_POS(i, 16) = adr - shift_op;
+	cpu->RREG_POS(i, 12) = static_cast<uint32_t>(READ8(cpu->mem_if->data, adr));
 
- return 3 + MMU.MMU_WAIT16cpu->proc_ID(adr>>24)&0xF;
+	return MMU_aluMemAccessCycles<PROCNUM, 8, MMU_AD_READ>(3, adr);
 }
 
-static u32 FASTCALL OP_LDRB_P_LSR_IMM_OFF_POSTIND(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_LDRB_P_LSR_IMM_OFF_POSTIND(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 adr;
- u32 val;
- u32 shift_op;
- LSR_IMM;
- adr = cpu->RREG_POS(i,16);
- val = READ8(cpu->mem_if->data, adr);
-	 cpu->RREG_POS(i,16) = adr + shift_op;
- cpu->RREG_POS(i,12) = val;
+	LSR_IMM;
+	uint32_t adr = cpu->RREG_POS(i, 16);
+	cpu->RREG_POS(i, 16) = adr + shift_op;
+	cpu->RREG_POS(i, 12) = static_cast<uint32_t>(READ8(cpu->mem_if->data, adr));
 
- return 3 + MMU.MMU_WAIT16cpu->proc_ID(adr>>24)&0xF;
+	return MMU_aluMemAccessCycles<PROCNUM, 8, MMU_AD_READ>(3, adr);
 }
 
-static u32 FASTCALL OP_LDRB_M_LSR_IMM_OFF_POSTIND(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_LDRB_M_LSR_IMM_OFF_POSTIND(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 adr;
- u32 val;
- u32 shift_op;
- LSR_IMM;
- adr = cpu->RREG_POS(i,16);
- val = READ8(cpu->mem_if->data, adr);
-	 cpu->RREG_POS(i,16) = adr - shift_op;
- cpu->RREG_POS(i,12) = val;
+	LSR_IMM;
+	uint32_t adr = cpu->RREG_POS(i, 16);
+	cpu->RREG_POS(i, 16) = adr - shift_op;
+	cpu->RREG_POS(i, 12) = static_cast<uint32_t>(READ8(cpu->mem_if->data, adr));
 
- return 3 + MMU.MMU_WAIT16cpu->proc_ID(adr>>24)&0xF;
+	return MMU_aluMemAccessCycles<PROCNUM, 8, MMU_AD_READ>(3, adr);
 }
 
-static u32 FASTCALL OP_LDRB_P_ASR_IMM_OFF_POSTIND(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_LDRB_P_ASR_IMM_OFF_POSTIND(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 adr;
- u32 val;
- u32 shift_op;
- ASR_IMM;
- adr = cpu->RREG_POS(i,16);
- val = READ8(cpu->mem_if->data, adr);
-	 cpu->RREG_POS(i,16) = adr + shift_op;
- cpu->RREG_POS(i,12) = val;
+	ASR_IMM;
+	uint32_t adr = cpu->RREG_POS(i, 16);
+	cpu->RREG_POS(i, 16) = adr + shift_op;
+	cpu->RREG_POS(i, 12) = static_cast<uint32_t>(READ8(cpu->mem_if->data, adr));
 
- return 3 + MMU.MMU_WAIT16cpu->proc_ID(adr>>24)&0xF;
+	return MMU_aluMemAccessCycles<PROCNUM, 8, MMU_AD_READ>(3, adr);
 }
 
-static u32 FASTCALL OP_LDRB_M_ASR_IMM_OFF_POSTIND(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_LDRB_M_ASR_IMM_OFF_POSTIND(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 adr;
- u32 val;
- u32 shift_op;
- ASR_IMM;
- adr = cpu->RREG_POS(i,16);
- val = READ8(cpu->mem_if->data, adr);
-	 cpu->RREG_POS(i,16) = adr - shift_op;
- cpu->RREG_POS(i,12) = val;
+	ASR_IMM;
+	uint32_t adr = cpu->RREG_POS(i, 16);
+	cpu->RREG_POS(i, 16) = adr - shift_op;
+	cpu->RREG_POS(i, 12) = static_cast<uint32_t>(READ8(cpu->mem_if->data, adr));
 
- return 3 + MMU.MMU_WAIT16cpu->proc_ID(adr>>24)&0xF;
+	return MMU_aluMemAccessCycles<PROCNUM, 8, MMU_AD_READ>(3, adr);
 }
 
-static u32 FASTCALL OP_LDRB_P_ROR_IMM_OFF_POSTIND(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_LDRB_P_ROR_IMM_OFF_POSTIND(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 adr;
- u32 val;
- u32 shift_op;
- ROR_IMM;
- adr = cpu->RREG_POS(i,16);
- val = READ8(cpu->mem_if->data, adr);
-	 cpu->RREG_POS(i,16) = adr + shift_op;
- cpu->RREG_POS(i,12) = val;
+	ROR_IMM;
+	uint32_t adr = cpu->RREG_POS(i, 16);
+	cpu->RREG_POS(i, 16) = adr + shift_op;
+	cpu->RREG_POS(i, 12) = static_cast<uint32_t>(READ8(cpu->mem_if->data, adr));
 
- return 3 + MMU.MMU_WAIT16cpu->proc_ID(adr>>24)&0xF;
+	return MMU_aluMemAccessCycles<PROCNUM, 8, MMU_AD_READ>(3, adr);
 }
 
-static u32 FASTCALL OP_LDRB_M_ROR_IMM_OFF_POSTIND(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_LDRB_M_ROR_IMM_OFF_POSTIND(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 adr;
- u32 val;
- u32 shift_op;
- ROR_IMM;
- adr = cpu->RREG_POS(i,16);
- val = READ8(cpu->mem_if->data, adr);
-	 cpu->RREG_POS(i,16) = adr - shift_op;
- cpu->RREG_POS(i,12) = val;
+	ROR_IMM;
+	uint32_t adr = cpu->RREG_POS(i, 16);
+	cpu->RREG_POS(i, 16) = adr - shift_op;
+	cpu->RREG_POS(i, 12) = static_cast<uint32_t>(READ8(cpu->mem_if->data, adr));
 
- return 3 + MMU.MMU_WAIT16cpu->proc_ID(adr>>24)&0xF;
+	return MMU_aluMemAccessCycles<PROCNUM, 8, MMU_AD_READ>(3, adr);
 }
 
-//----------------------STR--------------------------------
+// -----------------------------------------------------------------------------
+// STR
+// -----------------------------------------------------------------------------
 
-static u32 FASTCALL OP_STR_P_IMM_OFF(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_STR_P_IMM_OFF(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 adr = cpu->RREG_POS(i,16) + IMM_OFF_12;
- WRITE32(cpu->mem_if->data, adr, cpu->RREG_POS(i,12));
+	uint32_t adr = cpu->RREG_POS(i, 16) + IMM_OFF_12;
+	WRITE32(cpu->mem_if->data, adr, cpu->RREG_POS(i, 12));
+
+	return MMU_aluMemAccessCycles<PROCNUM, 32, MMU_AD_WRITE>(2, adr);
+}
 
-//	 execute = false;
+TEMPLATE static uint32_t FASTCALL OP_STR_M_IMM_OFF(uint32_t i)
+{
+	uint32_t adr = cpu->RREG_POS(i, 16) - IMM_OFF_12;
+	WRITE32(cpu->mem_if->data, adr, cpu->RREG_POS(i, 12));
 
- return 2 + MMU.MMU_WAIT32cpu->proc_ID(adr>>24)&0xF;
+	return MMU_aluMemAccessCycles<PROCNUM, 32, MMU_AD_WRITE>(2, adr);
 }
 
-static u32 FASTCALL OP_STR_M_IMM_OFF(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_STR_P_LSL_IMM_OFF(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 adr = cpu->RREG_POS(i,16) - IMM_OFF_12;
- WRITE32(cpu->mem_if->data, adr, cpu->RREG_POS(i,12));
+	LSL_IMM;
+	uint32_t adr = cpu->RREG_POS(i, 16) + shift_op;
+	WRITE32(cpu->mem_if->data, adr, cpu->RREG_POS(i, 12));
 
- return 2 + MMU.MMU_WAIT32cpu->proc_ID(adr>>24)&0xF;
+	return MMU_aluMemAccessCycles<PROCNUM, 32, MMU_AD_WRITE>(2, adr);
 }
 
-static u32 FASTCALL OP_STR_P_LSL_IMM_OFF(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_STR_M_LSL_IMM_OFF(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 adr;
- u32 shift_op;
- LSL_IMM;
- adr = cpu->RREG_POS(i,16) + shift_op;
- WRITE32(cpu->mem_if->data, adr, cpu->RREG_POS(i,12));
+	LSL_IMM;
+	uint32_t adr = cpu->RREG_POS(i, 16) - shift_op;
+	WRITE32(cpu->mem_if->data, adr, cpu->RREG_POS(i, 12));
 
- return 2 + MMU.MMU_WAIT32cpu->proc_ID(adr>>24)&0xF;
+	return MMU_aluMemAccessCycles<PROCNUM, 32, MMU_AD_WRITE>(2, adr);
 }
 
-static u32 FASTCALL OP_STR_M_LSL_IMM_OFF(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_STR_P_LSR_IMM_OFF(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 adr;
- u32 shift_op;
- LSL_IMM;
- adr = cpu->RREG_POS(i,16) - shift_op;
- WRITE32(cpu->mem_if->data, adr, cpu->RREG_POS(i,12));
+	LSR_IMM;
+	uint32_t adr = cpu->RREG_POS(i, 16) + shift_op;
+	WRITE32(cpu->mem_if->data, adr, cpu->RREG_POS(i, 12));
 
- return 2 + MMU.MMU_WAIT32cpu->proc_ID(adr>>24)&0xF;
+	return MMU_aluMemAccessCycles<PROCNUM, 32, MMU_AD_WRITE>(2, adr);
 }
 
-static u32 FASTCALL OP_STR_P_LSR_IMM_OFF(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_STR_M_LSR_IMM_OFF(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 adr;
- u32 shift_op;
- LSR_IMM;
- adr = cpu->RREG_POS(i,16) + shift_op;
- WRITE32(cpu->mem_if->data, adr, cpu->RREG_POS(i,12));
+	LSR_IMM;
+	uint32_t adr = cpu->RREG_POS(i, 16) - shift_op;
+	WRITE32(cpu->mem_if->data, adr, cpu->RREG_POS(i, 12));
 
- return 2 + MMU.MMU_WAIT32cpu->proc_ID(adr>>24)&0xF;
+	return MMU_aluMemAccessCycles<PROCNUM, 32, MMU_AD_WRITE>(2, adr);
 }
 
-static u32 FASTCALL OP_STR_M_LSR_IMM_OFF(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_STR_P_ASR_IMM_OFF(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 adr;
- u32 shift_op;
- LSR_IMM;
- adr = cpu->RREG_POS(i,16) - shift_op;
- WRITE32(cpu->mem_if->data, adr, cpu->RREG_POS(i,12));
+	ASR_IMM;
+	uint32_t adr = cpu->RREG_POS(i, 16) + shift_op;
+	WRITE32(cpu->mem_if->data, adr, cpu->RREG_POS(i, 12));
 
- return 2 + MMU.MMU_WAIT32cpu->proc_ID(adr>>24)&0xF;
+	return MMU_aluMemAccessCycles<PROCNUM, 32, MMU_AD_WRITE>(2, adr);
 }
 
-static u32 FASTCALL OP_STR_P_ASR_IMM_OFF(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_STR_M_ASR_IMM_OFF(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 adr;
- u32 shift_op;
- ASR_IMM;
- adr = cpu->RREG_POS(i,16) + shift_op;
- WRITE32(cpu->mem_if->data, adr, cpu->RREG_POS(i,12));
+	ASR_IMM;
+	uint32_t adr = cpu->RREG_POS(i, 16) - shift_op;
+	WRITE32(cpu->mem_if->data, adr, cpu->RREG_POS(i, 12));
 
- return 2 + MMU.MMU_WAIT32cpu->proc_ID(adr>>24)&0xF;
+	return MMU_aluMemAccessCycles<PROCNUM, 32, MMU_AD_WRITE>(2, adr);
 }
 
-static u32 FASTCALL OP_STR_M_ASR_IMM_OFF(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_STR_P_ROR_IMM_OFF(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 adr;
- u32 shift_op;
- ASR_IMM;
- adr = cpu->RREG_POS(i,16) - shift_op;
- WRITE32(cpu->mem_if->data, adr, cpu->RREG_POS(i,12));
+	ROR_IMM;
+	uint32_t adr = cpu->RREG_POS(i, 16) + shift_op;
+	WRITE32(cpu->mem_if->data, adr, cpu->RREG_POS(i, 12));
 
- return 2 + MMU.MMU_WAIT32cpu->proc_ID(adr>>24)&0xF;
+	return MMU_aluMemAccessCycles<PROCNUM, 32, MMU_AD_WRITE>(2, adr);
 }
 
-static u32 FASTCALL OP_STR_P_ROR_IMM_OFF(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_STR_M_ROR_IMM_OFF(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 adr;
- u32 shift_op;
- ROR_IMM;
- adr = cpu->RREG_POS(i,16) + shift_op;
- WRITE32(cpu->mem_if->data, adr, cpu->RREG_POS(i,12));
+	ROR_IMM;
+	uint32_t adr = cpu->RREG_POS(i, 16) - shift_op;
+	WRITE32(cpu->mem_if->data, adr, cpu->RREG_POS(i, 12));
 
- return 2 + MMU.MMU_WAIT32cpu->proc_ID(adr>>24)&0xF;
+	return MMU_aluMemAccessCycles<PROCNUM, 32, MMU_AD_WRITE>(2, adr);
 }
 
-static u32 FASTCALL OP_STR_M_ROR_IMM_OFF(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_STR_P_IMM_OFF_PREIND(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 adr;
- u32 shift_op;
- ROR_IMM;
- adr = cpu->RREG_POS(i,16) - shift_op;
- WRITE32(cpu->mem_if->data, adr, cpu->RREG_POS(i,12));
- cpu->RREG_POS(i,16) = adr;
+	uint32_t adr = cpu->RREG_POS(i, 16) + IMM_OFF_12;
+	cpu->RREG_POS(i, 16) = adr;
+	WRITE32(cpu->mem_if->data, adr, cpu->RREG_POS(i, 12));
 
- return 2 + MMU.MMU_WAIT32cpu->proc_ID(adr>>24)&0xF;
+	return MMU_aluMemAccessCycles<PROCNUM, 32, MMU_AD_WRITE>(2, adr);
 }
 
-static u32 FASTCALL OP_STR_P_IMM_OFF_PREIND(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_STR_M_IMM_OFF_PREIND(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 adr = cpu->RREG_POS(i,16) + IMM_OFF_12;
- WRITE32(cpu->mem_if->data, adr, cpu->RREG_POS(i,12));
- cpu->RREG_POS(i,16) = adr;
+	uint32_t adr = cpu->RREG_POS(i, 16) - IMM_OFF_12;
+	cpu->RREG_POS(i, 16) = adr;
+	WRITE32(cpu->mem_if->data, adr, cpu->RREG_POS(i, 12));
 
- return 2 + MMU.MMU_WAIT32cpu->proc_ID(adr>>24)&0xF;
+	return MMU_aluMemAccessCycles<PROCNUM, 32, MMU_AD_WRITE>(2, adr);
 }
 
-static u32 FASTCALL OP_STR_M_IMM_OFF_PREIND(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_STR_P_LSL_IMM_OFF_PREIND(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 adr = cpu->RREG_POS(i,16) - IMM_OFF_12;
- WRITE32(cpu->mem_if->data, adr, cpu->RREG_POS(i,12));
- cpu->RREG_POS(i,16) = adr;
+	LSL_IMM;
+	uint32_t adr = cpu->RREG_POS(i, 16) + shift_op;
+	cpu->RREG_POS(i, 16) = adr;
+	WRITE32(cpu->mem_if->data, adr, cpu->RREG_POS(i, 12));
 
- return 2 + MMU.MMU_WAIT32cpu->proc_ID(adr>>24)&0xF;
+	return MMU_aluMemAccessCycles<PROCNUM, 32, MMU_AD_WRITE>(2, adr);
 }
 
-static u32 FASTCALL OP_STR_P_LSL_IMM_OFF_PREIND(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_STR_M_LSL_IMM_OFF_PREIND(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 adr;
- u32 shift_op;
- LSL_IMM;
- adr = cpu->RREG_POS(i,16) + shift_op;
- WRITE32(cpu->mem_if->data, adr, cpu->RREG_POS(i,12));
- cpu->RREG_POS(i,16) = adr;
+	LSL_IMM;
+	uint32_t adr = cpu->RREG_POS(i, 16) - shift_op;
+	cpu->RREG_POS(i, 16) = adr;
+	WRITE32(cpu->mem_if->data, adr, cpu->RREG_POS(i, 12));
 
- return 2 + MMU.MMU_WAIT32cpu->proc_ID(adr>>24)&0xF;
+	return MMU_aluMemAccessCycles<PROCNUM, 32, MMU_AD_WRITE>(2, adr);
 }
 
-static u32 FASTCALL OP_STR_M_LSL_IMM_OFF_PREIND(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_STR_P_LSR_IMM_OFF_PREIND(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 adr;
- u32 shift_op;
- LSL_IMM;
- adr = cpu->RREG_POS(i,16) - shift_op;
- WRITE32(cpu->mem_if->data, adr, cpu->RREG_POS(i,12));
- cpu->RREG_POS(i,16) = adr;
+	LSR_IMM;
+	uint32_t adr = cpu->RREG_POS(i, 16) + shift_op;
+	cpu->RREG_POS(i, 16) = adr;
+	WRITE32(cpu->mem_if->data, adr, cpu->RREG_POS(i, 12));
 
- return 2 + MMU.MMU_WAIT32cpu->proc_ID(adr>>24)&0xF;
+	return MMU_aluMemAccessCycles<PROCNUM, 32, MMU_AD_WRITE>(2, adr);
 }
 
-static u32 FASTCALL OP_STR_P_LSR_IMM_OFF_PREIND(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_STR_M_LSR_IMM_OFF_PREIND(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 adr;
- u32 shift_op;
- LSR_IMM;
- adr = cpu->RREG_POS(i,16) + shift_op;
- WRITE32(cpu->mem_if->data, adr, cpu->RREG_POS(i,12));
- cpu->RREG_POS(i,16) = adr;
+	LSR_IMM;
+	uint32_t adr = cpu->RREG_POS(i, 16) - shift_op;
+	cpu->RREG_POS(i, 16) = adr;
+	WRITE32(cpu->mem_if->data, adr, cpu->RREG_POS(i, 12));
 
- return 2 + MMU.MMU_WAIT32cpu->proc_ID(adr>>24)&0xF;
+	return MMU_aluMemAccessCycles<PROCNUM, 32, MMU_AD_WRITE>(2, adr);
 }
 
-static u32 FASTCALL OP_STR_M_LSR_IMM_OFF_PREIND(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_STR_P_ASR_IMM_OFF_PREIND(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 adr;
- u32 shift_op;
- LSR_IMM;
- adr = cpu->RREG_POS(i,16) - shift_op;
- WRITE32(cpu->mem_if->data, adr, cpu->RREG_POS(i,12));
- cpu->RREG_POS(i,16) = adr;
+	ASR_IMM;
+	uint32_t adr = cpu->RREG_POS(i, 16) + shift_op;
+	cpu->RREG_POS(i, 16) = adr;
+	WRITE32(cpu->mem_if->data, adr, cpu->RREG_POS(i, 12));
 
- return 2 + MMU.MMU_WAIT32cpu->proc_ID(adr>>24)&0xF;
+	return MMU_aluMemAccessCycles<PROCNUM, 32, MMU_AD_WRITE>(2, adr);
 }
 
-static u32 FASTCALL OP_STR_P_ASR_IMM_OFF_PREIND(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_STR_M_ASR_IMM_OFF_PREIND(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 adr;
- u32 shift_op;
- ASR_IMM;
- adr = cpu->RREG_POS(i,16) + shift_op;
- WRITE32(cpu->mem_if->data, adr, cpu->RREG_POS(i,12));
- cpu->RREG_POS(i,16) = adr;
+	ASR_IMM;
+	uint32_t adr = cpu->RREG_POS(i, 16) - shift_op;
+	cpu->RREG_POS(i, 16) = adr;
+	WRITE32(cpu->mem_if->data, adr, cpu->RREG_POS(i, 12));
 
- return 2 + MMU.MMU_WAIT32cpu->proc_ID(adr>>24)&0xF;
+	return MMU_aluMemAccessCycles<PROCNUM, 32, MMU_AD_WRITE>(2, adr);
 }
 
-static u32 FASTCALL OP_STR_M_ASR_IMM_OFF_PREIND(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_STR_P_ROR_IMM_OFF_PREIND(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 adr;
- u32 shift_op;
- ASR_IMM;
- adr = cpu->RREG_POS(i,16) - shift_op;
- WRITE32(cpu->mem_if->data, adr, cpu->RREG_POS(i,12));
- cpu->RREG_POS(i,16) = adr;
+	ROR_IMM;
+	uint32_t adr = cpu->RREG_POS(i, 16) + shift_op;
+	cpu->RREG_POS(i, 16) = adr;
+	WRITE32(cpu->mem_if->data, adr, cpu->RREG_POS(i, 12));
 
- return 2 + MMU.MMU_WAIT32cpu->proc_ID(adr>>24)&0xF;
+	return MMU_aluMemAccessCycles<PROCNUM, 32, MMU_AD_WRITE>(2, adr);
 }
 
-static u32 FASTCALL OP_STR_P_ROR_IMM_OFF_PREIND(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_STR_M_ROR_IMM_OFF_PREIND(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 adr;
- u32 shift_op;
- ROR_IMM;
- adr = cpu->RREG_POS(i,16) + shift_op;
- WRITE32(cpu->mem_if->data, adr, cpu->RREG_POS(i,12));
- cpu->RREG_POS(i,16) = adr;
+	ROR_IMM;
+	uint32_t adr = cpu->RREG_POS(i, 16) - shift_op;
+	cpu->RREG_POS(i, 16) = adr;
+	WRITE32(cpu->mem_if->data, adr, cpu->RREG_POS(i, 12));
 
- return 2 + MMU.MMU_WAIT32cpu->proc_ID(adr>>24)&0xF;
+	return MMU_aluMemAccessCycles<PROCNUM, 32, MMU_AD_WRITE>(2, adr);
 }
 
-static u32 FASTCALL OP_STR_M_ROR_IMM_OFF_PREIND(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_STR_P_IMM_OFF_POSTIND(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 adr;
- u32 shift_op;
- ROR_IMM;
- adr = cpu->RREG_POS(i,16) - shift_op;
- WRITE32(cpu->mem_if->data, adr, cpu->RREG_POS(i,12));
- cpu->RREG_POS(i,16) = adr;
+	uint32_t adr = cpu->RREG_POS(i, 16);
+	WRITE32(cpu->mem_if->data, adr, cpu->RREG_POS(i, 12));
+	cpu->RREG_POS(i, 16) = adr + IMM_OFF_12;
 
- return 2 + MMU.MMU_WAIT32cpu->proc_ID(adr>>24)&0xF;
+	return MMU_aluMemAccessCycles<PROCNUM, 32, MMU_AD_WRITE>(2, adr);
 }
 
-static u32 FASTCALL OP_STR_P_IMM_OFF_POSTIND(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_STR_M_IMM_OFF_POSTIND(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 adr = cpu->RREG_POS(i,16);
- WRITE32(cpu->mem_if->data, adr, cpu->RREG_POS(i,12));
- cpu->RREG_POS(i,16) = adr + IMM_OFF_12;
+	uint32_t adr = cpu->RREG_POS(i, 16);
+	WRITE32(cpu->mem_if->data, adr, cpu->RREG_POS(i, 12));
+	cpu->RREG_POS(i, 16) = adr - IMM_OFF_12;
 
- return 2 + MMU.MMU_WAIT32cpu->proc_ID(adr>>24)&0xF;
+	return MMU_aluMemAccessCycles<PROCNUM, 32, MMU_AD_WRITE>(2, adr);
 }
 
-static u32 FASTCALL OP_STR_M_IMM_OFF_POSTIND(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_STR_P_LSL_IMM_OFF_POSTIND(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 adr = cpu->RREG_POS(i,16);
- WRITE32(cpu->mem_if->data, adr, cpu->RREG_POS(i,12));
- cpu->RREG_POS(i,16) = adr - IMM_OFF_12;
+	LSL_IMM;
+	uint32_t adr = cpu->RREG_POS(i, 16);
+	WRITE32(cpu->mem_if->data, adr, cpu->RREG_POS(i, 12));
+	cpu->RREG_POS(i, 16) = adr + shift_op;
 
- return 2 + MMU.MMU_WAIT32cpu->proc_ID(adr>>24)&0xF;
+	return MMU_aluMemAccessCycles<PROCNUM, 32, MMU_AD_WRITE>(2, adr);
 }
 
-static u32 FASTCALL OP_STR_P_LSL_IMM_OFF_POSTIND(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_STR_M_LSL_IMM_OFF_POSTIND(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 adr;
- u32 shift_op;
- LSL_IMM;
- adr = cpu->RREG_POS(i,16);
- WRITE32(cpu->mem_if->data, adr, cpu->RREG_POS(i,12));
- cpu->RREG_POS(i,16) = adr + shift_op;
+	LSL_IMM;
+	uint32_t adr = cpu->RREG_POS(i, 16);
+	WRITE32(cpu->mem_if->data, adr, cpu->RREG_POS(i, 12));
+	cpu->RREG_POS(i, 16) = adr - shift_op;
 
- return 2 + MMU.MMU_WAIT32cpu->proc_ID(adr>>24)&0xF;
+	return MMU_aluMemAccessCycles<PROCNUM, 32, MMU_AD_WRITE>(2, adr);
 }
 
-static u32 FASTCALL OP_STR_M_LSL_IMM_OFF_POSTIND(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_STR_P_LSR_IMM_OFF_POSTIND(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 adr;
- u32 shift_op;
- LSL_IMM;
- adr = cpu->RREG_POS(i,16);
- WRITE32(cpu->mem_if->data, adr, cpu->RREG_POS(i,12));
- cpu->RREG_POS(i,16) = adr - shift_op;
+	LSR_IMM;
+	uint32_t adr = cpu->RREG_POS(i, 16);
+	WRITE32(cpu->mem_if->data, adr, cpu->RREG_POS(i, 12));
+	cpu->RREG_POS(i, 16) = adr + shift_op;
 
- return 2 + MMU.MMU_WAIT32cpu->proc_ID(adr>>24)&0xF;
+	return MMU_aluMemAccessCycles<PROCNUM, 32, MMU_AD_WRITE>(2, adr);
 }
 
-static u32 FASTCALL OP_STR_P_LSR_IMM_OFF_POSTIND(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_STR_M_LSR_IMM_OFF_POSTIND(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 adr;
- u32 shift_op;
- LSR_IMM;
- adr = cpu->RREG_POS(i,16);
- WRITE32(cpu->mem_if->data, adr, cpu->RREG_POS(i,12));
- cpu->RREG_POS(i,16) = adr + shift_op;
+	LSR_IMM;
+	uint32_t adr = cpu->RREG_POS(i, 16);
+	WRITE32(cpu->mem_if->data, adr, cpu->RREG_POS(i, 12));
+	cpu->RREG_POS(i, 16) = adr - shift_op;
 
- return 2 + MMU.MMU_WAIT32cpu->proc_ID(adr>>24)&0xF;
+	return MMU_aluMemAccessCycles<PROCNUM, 32, MMU_AD_WRITE>(2, adr);
 }
 
-static u32 FASTCALL OP_STR_M_LSR_IMM_OFF_POSTIND(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_STR_P_ASR_IMM_OFF_POSTIND(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 adr;
- u32 shift_op;
- LSR_IMM;
- adr = cpu->RREG_POS(i,16);
- WRITE32(cpu->mem_if->data, adr, cpu->RREG_POS(i,12));
- cpu->RREG_POS(i,16) = adr - shift_op;
+	ASR_IMM;
+	uint32_t adr = cpu->RREG_POS(i, 16);
+	WRITE32(cpu->mem_if->data, adr, cpu->RREG_POS(i, 12));
+	cpu->RREG_POS(i, 16) = adr + shift_op;
 
- return 2 + MMU.MMU_WAIT32cpu->proc_ID(adr>>24)&0xF;
+	return MMU_aluMemAccessCycles<PROCNUM, 32, MMU_AD_WRITE>(2, adr);
 }
 
-static u32 FASTCALL OP_STR_P_ASR_IMM_OFF_POSTIND(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_STR_M_ASR_IMM_OFF_POSTIND(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 adr;
- u32 shift_op;
- ASR_IMM;
- adr = cpu->RREG_POS(i,16);
- WRITE32(cpu->mem_if->data, adr, cpu->RREG_POS(i,12));
- cpu->RREG_POS(i,16) = adr + shift_op;
+	ASR_IMM;
+	uint32_t adr = cpu->RREG_POS(i, 16);
+	WRITE32(cpu->mem_if->data, adr, cpu->RREG_POS(i, 12));
+	cpu->RREG_POS(i, 16) = adr - shift_op;
 
- return 2 + MMU.MMU_WAIT32cpu->proc_ID(adr>>24)&0xF;
+	return MMU_aluMemAccessCycles<PROCNUM, 32, MMU_AD_WRITE>(2, adr);
 }
 
-static u32 FASTCALL OP_STR_M_ASR_IMM_OFF_POSTIND(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_STR_P_ROR_IMM_OFF_POSTIND(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 adr;
- u32 shift_op;
- ASR_IMM;
- adr = cpu->RREG_POS(i,16);
- WRITE32(cpu->mem_if->data, adr, cpu->RREG_POS(i,12));
- cpu->RREG_POS(i,16) = adr - shift_op;
+	ROR_IMM;
+	uint32_t adr = cpu->RREG_POS(i, 16);
+	WRITE32(cpu->mem_if->data, adr, cpu->RREG_POS(i, 12));
+	cpu->RREG_POS(i, 16) = adr + shift_op;
 
- return 2 + MMU.MMU_WAIT32cpu->proc_ID(adr>>24)&0xF;
+	return MMU_aluMemAccessCycles<PROCNUM, 32, MMU_AD_WRITE>(2, adr);
 }
 
-static u32 FASTCALL OP_STR_P_ROR_IMM_OFF_POSTIND(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_STR_M_ROR_IMM_OFF_POSTIND(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 adr;
- u32 shift_op;
- ROR_IMM;
- adr = cpu->RREG_POS(i,16);
- WRITE32(cpu->mem_if->data, adr, cpu->RREG_POS(i,12));
- cpu->RREG_POS(i,16) = adr + shift_op;
+	ROR_IMM;
+	uint32_t adr = cpu->RREG_POS(i, 16);
+	WRITE32(cpu->mem_if->data, adr, cpu->RREG_POS(i, 12));
+	cpu->RREG_POS(i, 16) = adr - shift_op;
 
- return 2 + MMU.MMU_WAIT32cpu->proc_ID(adr>>24)&0xF;
+	return MMU_aluMemAccessCycles<PROCNUM, 32, MMU_AD_WRITE>(2, adr);
 }
 
-static u32 FASTCALL OP_STR_M_ROR_IMM_OFF_POSTIND(armcpu_t *cpu)
+// -----------------------------------------------------------------------------
+// STREX
+// -----------------------------------------------------------------------------
+TEMPLATE static uint32_t FASTCALL OP_STREX(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 adr;
- u32 shift_op;
- ROR_IMM;
- adr = cpu->RREG_POS(i,16);
- WRITE32(cpu->mem_if->data, adr, cpu->RREG_POS(i,12));
- cpu->RREG_POS(i,16) = adr - shift_op;
+	fprintf(stderr, "STREX\n");
+	uint32_t adr = cpu->RREG_POS(i, 16);
+	WRITE32(cpu->mem_if->data, adr, cpu->RREG_POS(i, 0));
+	cpu->RREG_POS(i, 12) = 0;
 
- return 2 + MMU.MMU_WAIT32cpu->proc_ID(adr>>24)&0xF;
+	return MMU_aluMemAccessCycles<PROCNUM, 32, MMU_AD_WRITE>(2, adr);
 }
 
-//-----------------------STRB-------------------------------------
+// -----------------------------------------------------------------------------
+// STRB
+// -----------------------------------------------------------------------------
 
-static u32 FASTCALL OP_STRB_P_IMM_OFF(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_STRB_P_IMM_OFF(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 adr = cpu->RREG_POS(i,16) + IMM_OFF_12;
- WRITE8(cpu->mem_if->data, adr, (u8)cpu->RREG_POS(i,12));
+	uint32_t adr = cpu->RREG_POS(i, 16) + IMM_OFF_12;
+	WRITE8(cpu->mem_if->data, adr, static_cast<uint8_t>(cpu->RREG_POS(i, 12)));
 
- return 2 + MMU.MMU_WAIT16cpu->proc_ID(adr>>24)&0xF;
+	return MMU_aluMemAccessCycles<PROCNUM, 8, MMU_AD_WRITE>(2, adr);
 }
 
-static u32 FASTCALL OP_STRB_M_IMM_OFF(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_STRB_M_IMM_OFF(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 adr = cpu->RREG_POS(i,16) - IMM_OFF_12;
- WRITE8(cpu->mem_if->data, adr, (u8)cpu->RREG_POS(i,12));
+	uint32_t adr = cpu->RREG_POS(i, 16) - IMM_OFF_12;
+	WRITE8(cpu->mem_if->data, adr, static_cast<uint8_t>(cpu->RREG_POS(i, 12)));
 
- return 2 + MMU.MMU_WAIT16cpu->proc_ID(adr>>24)&0xF;
+	return MMU_aluMemAccessCycles<PROCNUM, 8, MMU_AD_WRITE>(2, adr);
 }
 
-static u32 FASTCALL OP_STRB_P_LSL_IMM_OFF(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_STRB_P_LSL_IMM_OFF(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 adr;
- u32 shift_op;
- LSL_IMM;
- adr = cpu->RREG_POS(i,16) + shift_op;
- WRITE8(cpu->mem_if->data, adr, (u8)cpu->RREG_POS(i,12));
+	LSL_IMM;
+	uint32_t adr = cpu->RREG_POS(i, 16) + shift_op;
+	WRITE8(cpu->mem_if->data, adr, static_cast<uint8_t>(cpu->RREG_POS(i, 12)));
 
- return 2 + MMU.MMU_WAIT16cpu->proc_ID(adr>>24)&0xF;
+	return MMU_aluMemAccessCycles<PROCNUM, 8, MMU_AD_WRITE>(2, adr);
 }
 
-static u32 FASTCALL OP_STRB_M_LSL_IMM_OFF(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_STRB_M_LSL_IMM_OFF(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 adr;
- u32 shift_op;
- LSL_IMM;
- adr = cpu->RREG_POS(i,16) - shift_op;
- WRITE8(cpu->mem_if->data, adr, (u8)cpu->RREG_POS(i,12));
+	LSL_IMM;
+	uint32_t adr = cpu->RREG_POS(i, 16) - shift_op;
+	WRITE8(cpu->mem_if->data, adr, static_cast<uint8_t>(cpu->RREG_POS(i, 12)));
 
- return 2 + MMU.MMU_WAIT16cpu->proc_ID(adr>>24)&0xF;
+	return MMU_aluMemAccessCycles<PROCNUM, 8, MMU_AD_WRITE>(2, adr);
 }
 
-static u32 FASTCALL OP_STRB_P_LSR_IMM_OFF(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_STRB_P_LSR_IMM_OFF(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 adr;
- u32 shift_op;
- LSR_IMM;
- adr = cpu->RREG_POS(i,16) + shift_op;
- WRITE8(cpu->mem_if->data, adr, (u8)cpu->RREG_POS(i,12));
+	LSR_IMM;
+	uint32_t adr = cpu->RREG_POS(i, 16) + shift_op;
+	WRITE8(cpu->mem_if->data, adr, static_cast<uint8_t>(cpu->RREG_POS(i, 12)));
 
- return 2 + MMU.MMU_WAIT16cpu->proc_ID(adr>>24)&0xF;
+	return MMU_aluMemAccessCycles<PROCNUM, 8, MMU_AD_WRITE>(2, adr);
 }
 
-static u32 FASTCALL OP_STRB_M_LSR_IMM_OFF(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_STRB_M_LSR_IMM_OFF(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 adr;
- u32 shift_op;
- LSR_IMM;
- adr = cpu->RREG_POS(i,16) - shift_op;
- WRITE8(cpu->mem_if->data, adr, (u8)cpu->RREG_POS(i,12));
+	LSR_IMM;
+	uint32_t adr = cpu->RREG_POS(i, 16) - shift_op;
+	WRITE8(cpu->mem_if->data, adr, static_cast<uint8_t>(cpu->RREG_POS(i, 12)));
 
- return 2 + MMU.MMU_WAIT16cpu->proc_ID(adr>>24)&0xF;
+	return MMU_aluMemAccessCycles<PROCNUM, 8, MMU_AD_WRITE>(2, adr);
 }
 
-static u32 FASTCALL OP_STRB_P_ASR_IMM_OFF(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_STRB_P_ASR_IMM_OFF(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 adr;
- u32 shift_op;
- ASR_IMM;
- adr = cpu->RREG_POS(i,16) + shift_op;
- WRITE8(cpu->mem_if->data, adr, (u8)cpu->RREG_POS(i,12));
+	ASR_IMM;
+	uint32_t adr = cpu->RREG_POS(i, 16) + shift_op;
+	WRITE8(cpu->mem_if->data, adr, static_cast<uint8_t>(cpu->RREG_POS(i, 12)));
 
- return 2 + MMU.MMU_WAIT16cpu->proc_ID(adr>>24)&0xF;
+	return MMU_aluMemAccessCycles<PROCNUM, 8, MMU_AD_WRITE>(2, adr);
 }
 
-static u32 FASTCALL OP_STRB_M_ASR_IMM_OFF(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_STRB_M_ASR_IMM_OFF(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 adr;
- u32 shift_op;
- ASR_IMM;
- adr = cpu->RREG_POS(i,16) - shift_op;
- WRITE8(cpu->mem_if->data, adr, (u8)cpu->RREG_POS(i,12));
+	ASR_IMM;
+	uint32_t adr = cpu->RREG_POS(i, 16) - shift_op;
+	WRITE8(cpu->mem_if->data, adr, static_cast<uint8_t>(cpu->RREG_POS(i, 12)));
 
- return 2 + MMU.MMU_WAIT16cpu->proc_ID(adr>>24)&0xF;
+	return MMU_aluMemAccessCycles<PROCNUM, 8, MMU_AD_WRITE>(2, adr);
 }
 
-static u32 FASTCALL OP_STRB_P_ROR_IMM_OFF(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_STRB_P_ROR_IMM_OFF(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 adr;
- u32 shift_op;
- ROR_IMM;
- adr = cpu->RREG_POS(i,16) + shift_op;
- WRITE8(cpu->mem_if->data, adr, (u8)cpu->RREG_POS(i,12));
+	ROR_IMM;
+	uint32_t adr = cpu->RREG_POS(i, 16) + shift_op;
+	WRITE8(cpu->mem_if->data, adr, static_cast<uint8_t>(cpu->RREG_POS(i, 12)));
 
- return 2 + MMU.MMU_WAIT16cpu->proc_ID(adr>>24)&0xF;
+	return MMU_aluMemAccessCycles<PROCNUM, 8, MMU_AD_WRITE>(2, adr);
 }
 
-static u32 FASTCALL OP_STRB_M_ROR_IMM_OFF(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_STRB_M_ROR_IMM_OFF(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 adr;
- u32 shift_op;
- ROR_IMM;
- adr = cpu->RREG_POS(i,16) - shift_op;
- WRITE8(cpu->mem_if->data, adr, (u8)cpu->RREG_POS(i,12));
+	ROR_IMM;
+	uint32_t adr = cpu->RREG_POS(i, 16) - shift_op;
+	WRITE8(cpu->mem_if->data, adr, static_cast<uint8_t>(cpu->RREG_POS(i, 12)));
 
- return 2 + MMU.MMU_WAIT16cpu->proc_ID(adr>>24)&0xF;
+	return MMU_aluMemAccessCycles<PROCNUM, 8, MMU_AD_WRITE>(2, adr);
 }
 
-static u32 FASTCALL OP_STRB_P_IMM_OFF_PREIND(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_STRB_P_IMM_OFF_PREIND(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 adr = cpu->RREG_POS(i,16) + IMM_OFF_12;
- WRITE8(cpu->mem_if->data, adr, cpu->RREG_POS(i,12));
- cpu->RREG_POS(i,16) = adr;
+	uint32_t adr = cpu->RREG_POS(i, 16) + IMM_OFF_12;
+	cpu->RREG_POS(i, 16) = adr;
+	WRITE8(cpu->mem_if->data, adr, static_cast<uint8_t>(cpu->RREG_POS(i, 12)));
 
- return 2 + MMU.MMU_WAIT16cpu->proc_ID(adr>>24)&0xF;
+	return MMU_aluMemAccessCycles<PROCNUM, 8, MMU_AD_WRITE>(2, adr);
 }
 
-static u32 FASTCALL OP_STRB_M_IMM_OFF_PREIND(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_STRB_M_IMM_OFF_PREIND(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 adr = cpu->RREG_POS(i,16) - IMM_OFF_12;
- WRITE8(cpu->mem_if->data, adr, (u8)cpu->RREG_POS(i,12));
- cpu->RREG_POS(i,16) = adr;
+	uint32_t adr = cpu->RREG_POS(i, 16) - IMM_OFF_12;
+	cpu->RREG_POS(i, 16) = adr;
+	WRITE8(cpu->mem_if->data, adr, static_cast<uint8_t>(cpu->RREG_POS(i, 12)));
 
- return 2 + MMU.MMU_WAIT16cpu->proc_ID(adr>>24)&0xF;
+	return MMU_aluMemAccessCycles<PROCNUM, 8, MMU_AD_WRITE>(2, adr);
 }
 
-static u32 FASTCALL OP_STRB_P_LSL_IMM_OFF_PREIND(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_STRB_P_LSL_IMM_OFF_PREIND(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 adr;
- u32 shift_op;
- LSL_IMM;
- adr = cpu->RREG_POS(i,16) + shift_op;
- WRITE8(cpu->mem_if->data, adr, (u8)cpu->RREG_POS(i,12));
- cpu->RREG_POS(i,16) = adr;
+	LSL_IMM;
+	uint32_t adr = cpu->RREG_POS(i, 16) + shift_op;
+	cpu->RREG_POS(i, 16) = adr;
+	WRITE8(cpu->mem_if->data, adr, static_cast<uint8_t>(cpu->RREG_POS(i, 12)));
 
- return 2 + MMU.MMU_WAIT16cpu->proc_ID(adr>>24)&0xF;
+	return MMU_aluMemAccessCycles<PROCNUM, 8, MMU_AD_WRITE>(2, adr);
 }
 
-static u32 FASTCALL OP_STRB_M_LSL_IMM_OFF_PREIND(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_STRB_M_LSL_IMM_OFF_PREIND(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 adr;
- u32 shift_op;
- LSL_IMM;
- adr = cpu->RREG_POS(i,16) - shift_op;
- WRITE8(cpu->mem_if->data, adr, (u8)cpu->RREG_POS(i,12));
- cpu->RREG_POS(i,16) = adr;
+	LSL_IMM;
+	uint32_t adr = cpu->RREG_POS(i, 16) - shift_op;
+	cpu->RREG_POS(i, 16) = adr;
+	WRITE8(cpu->mem_if->data, adr, static_cast<uint8_t>(cpu->RREG_POS(i, 12)));
 
- return 2 + MMU.MMU_WAIT16cpu->proc_ID(adr>>24)&0xF;
+	return MMU_aluMemAccessCycles<PROCNUM, 8, MMU_AD_WRITE>(2, adr);
 }
 
-static u32 FASTCALL OP_STRB_P_LSR_IMM_OFF_PREIND(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_STRB_P_LSR_IMM_OFF_PREIND(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 adr;
- u32 shift_op;
- LSR_IMM;
- adr = cpu->RREG_POS(i,16) + shift_op;
- WRITE8(cpu->mem_if->data, adr, (u8)cpu->RREG_POS(i,12));
- cpu->RREG_POS(i,16) = adr;
+	LSR_IMM;
+	uint32_t adr = cpu->RREG_POS(i, 16) + shift_op;
+	cpu->RREG_POS(i, 16) = adr;
+	WRITE8(cpu->mem_if->data, adr, static_cast<uint8_t>(cpu->RREG_POS(i, 12)));
 
- return 2 + MMU.MMU_WAIT16cpu->proc_ID(adr>>24)&0xF;
+	return MMU_aluMemAccessCycles<PROCNUM, 8, MMU_AD_WRITE>(2, adr);
 }
 
-static u32 FASTCALL OP_STRB_M_LSR_IMM_OFF_PREIND(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_STRB_M_LSR_IMM_OFF_PREIND(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 adr;
- u32 shift_op;
- LSR_IMM;
- adr = cpu->RREG_POS(i,16) - shift_op;
- WRITE8(cpu->mem_if->data, adr, (u8)cpu->RREG_POS(i,12));
- cpu->RREG_POS(i,16) = adr;
+	LSR_IMM;
+	uint32_t adr = cpu->RREG_POS(i, 16) - shift_op;
+	cpu->RREG_POS(i, 16) = adr;
+	WRITE8(cpu->mem_if->data, adr, static_cast<uint8_t>(cpu->RREG_POS(i, 12)));
 
- return 2 + MMU.MMU_WAIT16cpu->proc_ID(adr>>24)&0xF;
+	return MMU_aluMemAccessCycles<PROCNUM, 8, MMU_AD_WRITE>(2, adr);
 }
 
-static u32 FASTCALL OP_STRB_P_ASR_IMM_OFF_PREIND(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_STRB_P_ASR_IMM_OFF_PREIND(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 adr;
- u32 shift_op;
- ASR_IMM;
- adr = cpu->RREG_POS(i,16) + shift_op;
- WRITE8(cpu->mem_if->data, adr, (u8)cpu->RREG_POS(i,12));
- cpu->RREG_POS(i,16) = adr;
+	ASR_IMM;
+	uint32_t adr = cpu->RREG_POS(i, 16) + shift_op;
+	cpu->RREG_POS(i, 16) = adr;
+	WRITE8(cpu->mem_if->data, adr, static_cast<uint8_t>(cpu->RREG_POS(i, 12)));
 
- return 2 + MMU.MMU_WAIT16cpu->proc_ID(adr>>24)&0xF;
+	return MMU_aluMemAccessCycles<PROCNUM, 8, MMU_AD_WRITE>(2, adr);
 }
 
-static u32 FASTCALL OP_STRB_M_ASR_IMM_OFF_PREIND(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_STRB_M_ASR_IMM_OFF_PREIND(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 adr;
- u32 shift_op;
- ASR_IMM;
- adr = cpu->RREG_POS(i,16) - shift_op;
- WRITE8(cpu->mem_if->data, adr, (u8)cpu->RREG_POS(i,12));
- cpu->RREG_POS(i,16) = adr;
+	ASR_IMM;
+	uint32_t adr = cpu->RREG_POS(i, 16) - shift_op;
+	cpu->RREG_POS(i, 16) = adr;
+	WRITE8(cpu->mem_if->data, adr, static_cast<uint8_t>(cpu->RREG_POS(i, 12)));
 
- return 2 + MMU.MMU_WAIT16cpu->proc_ID(adr>>24)&0xF;
+	return MMU_aluMemAccessCycles<PROCNUM, 8, MMU_AD_WRITE>(2, adr);
 }
 
-static u32 FASTCALL OP_STRB_P_ROR_IMM_OFF_PREIND(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_STRB_P_ROR_IMM_OFF_PREIND(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 adr;
- u32 shift_op;
- ROR_IMM;
- adr = cpu->RREG_POS(i,16) + shift_op;
- WRITE8(cpu->mem_if->data, adr, (u8)cpu->RREG_POS(i,12));
- cpu->RREG_POS(i,16) = adr;
+	ROR_IMM;
+	uint32_t adr = cpu->RREG_POS(i, 16) + shift_op;
+	cpu->RREG_POS(i, 16) = adr;
+	WRITE8(cpu->mem_if->data, adr, static_cast<uint8_t>(cpu->RREG_POS(i, 12)));
 
- return 2 + MMU.MMU_WAIT16cpu->proc_ID(adr>>24)&0xF;
+	return MMU_aluMemAccessCycles<PROCNUM, 8, MMU_AD_WRITE>(2, adr);
 }
 
-static u32 FASTCALL OP_STRB_M_ROR_IMM_OFF_PREIND(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_STRB_M_ROR_IMM_OFF_PREIND(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 adr;
- u32 shift_op;
- ROR_IMM;
- adr = cpu->RREG_POS(i,16) - shift_op;
- WRITE8(cpu->mem_if->data, adr, (u8)cpu->RREG_POS(i,12));
- cpu->RREG_POS(i,16) = adr;
+	ROR_IMM;
+	uint32_t adr = cpu->RREG_POS(i, 16) - shift_op;
+	cpu->RREG_POS(i, 16) = adr;
+	WRITE8(cpu->mem_if->data, adr, static_cast<uint8_t>(cpu->RREG_POS(i, 12)));
 
- return 2 + MMU.MMU_WAIT16cpu->proc_ID(adr>>24)&0xF;
+	return MMU_aluMemAccessCycles<PROCNUM, 8, MMU_AD_WRITE>(2, adr);
 }
 
-static u32 FASTCALL OP_STRB_P_IMM_OFF_POSTIND(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_STRB_P_IMM_OFF_POSTIND(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 adr = cpu->RREG_POS(i,16);
- WRITE8(cpu->mem_if->data, adr, (u8)cpu->RREG_POS(i,12));
- cpu->RREG_POS(i,16) = adr + IMM_OFF_12;
+	uint32_t adr = cpu->RREG_POS(i, 16);
+	WRITE8(cpu->mem_if->data, adr, static_cast<uint8_t>(cpu->RREG_POS(i, 12)));
+	cpu->RREG_POS(i, 16) = adr + IMM_OFF_12;
 
- return 2 + MMU.MMU_WAIT16cpu->proc_ID(adr>>24)&0xF;
+	return MMU_aluMemAccessCycles<PROCNUM, 8, MMU_AD_WRITE>(2, adr);
 }
 
-static u32 FASTCALL OP_STRB_M_IMM_OFF_POSTIND(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_STRB_M_IMM_OFF_POSTIND(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 adr = cpu->RREG_POS(i,16);
- WRITE8(cpu->mem_if->data, adr, (u8)cpu->RREG_POS(i,12));
- cpu->RREG_POS(i,16) = adr - IMM_OFF_12;
+	uint32_t adr = cpu->RREG_POS(i, 16);
+	WRITE8(cpu->mem_if->data, adr, static_cast<uint8_t>(cpu->RREG_POS(i, 12)));
+	cpu->RREG_POS(i, 16) = adr - IMM_OFF_12;
 
- return 2 + MMU.MMU_WAIT16cpu->proc_ID(adr>>24)&0xF;
+	return MMU_aluMemAccessCycles<PROCNUM, 8, MMU_AD_WRITE>(2, adr);
 }
 
-static u32 FASTCALL OP_STRB_P_LSL_IMM_OFF_POSTIND(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_STRB_P_LSL_IMM_OFF_POSTIND(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 adr;
- u32 shift_op;
- LSL_IMM;
- adr = cpu->RREG_POS(i,16);
- WRITE8(cpu->mem_if->data, adr, (u8)cpu->RREG_POS(i,12));
- cpu->RREG_POS(i,16) = adr + shift_op;
+	LSL_IMM;
+	uint32_t adr = cpu->RREG_POS(i, 16);
+	WRITE8(cpu->mem_if->data, adr, static_cast<uint8_t>(cpu->RREG_POS(i, 12)));
+	cpu->RREG_POS(i, 16) = adr + shift_op;
 
- return 2 + MMU.MMU_WAIT16cpu->proc_ID(adr>>24)&0xF;
+	return MMU_aluMemAccessCycles<PROCNUM, 8, MMU_AD_WRITE>(2, adr);
 }
 
-static u32 FASTCALL OP_STRB_M_LSL_IMM_OFF_POSTIND(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_STRB_M_LSL_IMM_OFF_POSTIND(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 adr;
- u32 shift_op;
- LSL_IMM;
- adr = cpu->RREG_POS(i,16);
- WRITE8(cpu->mem_if->data, adr, (u8)cpu->RREG_POS(i,12));
- cpu->RREG_POS(i,16) = adr - shift_op;
+	LSL_IMM;
+	uint32_t adr = cpu->RREG_POS(i, 16);
+	WRITE8(cpu->mem_if->data, adr, static_cast<uint8_t>(cpu->RREG_POS(i, 12)));
+	cpu->RREG_POS(i, 16) = adr - shift_op;
 
- return 2 + MMU.MMU_WAIT16cpu->proc_ID(adr>>24)&0xF;
+	return MMU_aluMemAccessCycles<PROCNUM, 8, MMU_AD_WRITE>(2, adr);
 }
 
-static u32 FASTCALL OP_STRB_P_LSR_IMM_OFF_POSTIND(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_STRB_P_LSR_IMM_OFF_POSTIND(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 adr;
- u32 shift_op;
- LSR_IMM;
- adr = cpu->RREG_POS(i,16);
- WRITE8(cpu->mem_if->data, adr, (u8)cpu->RREG_POS(i,12));
- cpu->RREG_POS(i,16) = adr + shift_op;
+	LSR_IMM;
+	uint32_t adr = cpu->RREG_POS(i, 16);
+	WRITE8(cpu->mem_if->data, adr, static_cast<uint8_t>(cpu->RREG_POS(i, 12)));
+	cpu->RREG_POS(i, 16) = adr + shift_op;
 
- return 2 + MMU.MMU_WAIT16cpu->proc_ID(adr>>24)&0xF;
+	return MMU_aluMemAccessCycles<PROCNUM, 8, MMU_AD_WRITE>(2, adr);
 }
 
-static u32 FASTCALL OP_STRB_M_LSR_IMM_OFF_POSTIND(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_STRB_M_LSR_IMM_OFF_POSTIND(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 adr;
- u32 shift_op;
- LSR_IMM;
- adr = cpu->RREG_POS(i,16);
- WRITE8(cpu->mem_if->data, adr, (u8)cpu->RREG_POS(i,12));
- cpu->RREG_POS(i,16) = adr - shift_op;
+	LSR_IMM;
+	uint32_t adr = cpu->RREG_POS(i, 16);
+	WRITE8(cpu->mem_if->data, adr, static_cast<uint8_t>(cpu->RREG_POS(i, 12)));
+	cpu->RREG_POS(i, 16) = adr - shift_op;
 
- return 2 + MMU.MMU_WAIT16cpu->proc_ID(adr>>24)&0xF;
+	return MMU_aluMemAccessCycles<PROCNUM, 8, MMU_AD_WRITE>(2, adr);
 }
 
-static u32 FASTCALL OP_STRB_P_ASR_IMM_OFF_POSTIND(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_STRB_P_ASR_IMM_OFF_POSTIND(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 adr;
- u32 shift_op;
- ASR_IMM;
- adr = cpu->RREG_POS(i,16);
- WRITE8(cpu->mem_if->data, adr, (u8)cpu->RREG_POS(i,12));
- cpu->RREG_POS(i,16) = adr + shift_op;
+	ASR_IMM;
+	uint32_t adr = cpu->RREG_POS(i, 16);
+	WRITE8(cpu->mem_if->data, adr, static_cast<uint8_t>(cpu->RREG_POS(i, 12)));
+	cpu->RREG_POS(i, 16) = adr + shift_op;
 
- return 2 + MMU.MMU_WAIT16cpu->proc_ID(adr>>24)&0xF;
+	return MMU_aluMemAccessCycles<PROCNUM, 8, MMU_AD_WRITE>(2, adr);
 }
 
-static u32 FASTCALL OP_STRB_M_ASR_IMM_OFF_POSTIND(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_STRB_M_ASR_IMM_OFF_POSTIND(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 adr;
- u32 shift_op;
- ASR_IMM;
- adr = cpu->RREG_POS(i,16);
- WRITE8(cpu->mem_if->data, adr, (u8)cpu->RREG_POS(i,12));
- cpu->RREG_POS(i,16) = adr - shift_op;
+	ASR_IMM;
+	uint32_t adr = cpu->RREG_POS(i, 16);
+	WRITE8(cpu->mem_if->data, adr, static_cast<uint8_t>(cpu->RREG_POS(i, 12)));
+	cpu->RREG_POS(i, 16) = adr - shift_op;
 
- return 2 + MMU.MMU_WAIT16cpu->proc_ID(adr>>24)&0xF;
+	return MMU_aluMemAccessCycles<PROCNUM, 8, MMU_AD_WRITE>(2, adr);
 }
 
-static u32 FASTCALL OP_STRB_P_ROR_IMM_OFF_POSTIND(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_STRB_P_ROR_IMM_OFF_POSTIND(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 adr;
- u32 shift_op;
- ROR_IMM;
- adr = cpu->RREG_POS(i,16);
- WRITE8(cpu->mem_if->data, adr, (u8)cpu->RREG_POS(i,12));
- cpu->RREG_POS(i,16) = adr + shift_op;
+	ROR_IMM;
+	uint32_t adr = cpu->RREG_POS(i, 16);
+	WRITE8(cpu->mem_if->data, adr, static_cast<uint8_t>(cpu->RREG_POS(i, 12)));
+	cpu->RREG_POS(i, 16) = adr + shift_op;
 
- return 2 + MMU.MMU_WAIT16cpu->proc_ID(adr>>24)&0xF;
+	return MMU_aluMemAccessCycles<PROCNUM, 8, MMU_AD_WRITE>(2, adr);
 }
 
-static u32 FASTCALL OP_STRB_M_ROR_IMM_OFF_POSTIND(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_STRB_M_ROR_IMM_OFF_POSTIND(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 adr;
- u32 shift_op;
- ROR_IMM;
- adr = cpu->RREG_POS(i,16);
- WRITE8(cpu->mem_if->data, adr, (u8)cpu->RREG_POS(i,12));
- cpu->RREG_POS(i,16) = adr - shift_op;
+	ROR_IMM;
+	uint32_t adr = cpu->RREG_POS(i, 16);
+	WRITE8(cpu->mem_if->data, adr, static_cast<uint8_t>(cpu->RREG_POS(i, 12)));
+	cpu->RREG_POS(i, 16) = adr - shift_op;
 
- return 2 + MMU.MMU_WAIT16cpu->proc_ID(adr>>24)&0xF;
+	return MMU_aluMemAccessCycles<PROCNUM, 8, MMU_AD_WRITE>(2, adr);
 }
 
-//-----------------------LDRBT-------------------------------------
+// -----------------------------------------------------------------------------
+// LDMIA / LDMIB / LDMDA / LDMDB
+// -----------------------------------------------------------------------------
 
-static u32 FASTCALL OP_LDRBT_P_IMM_OFF_POSTIND(armcpu_t *cpu)
-{
- u32 oldmode;
- u32 i;
- u32 adr;
- u32 val;
-
- if(cpu->CPSR.bits.mode==USR)
- return 2;
- oldmode = armcpu_switchMode(cpu, SYS);
+#define OP_L_IA(reg, adr) \
+	if (BIT##reg(i)) \
+	{ \
+		registresreg = READ32(cpu->mem_if->data, start); \
+		c += MMU_memAccessCycles<PROCNUM, 32, MMU_AD_READ>(start); \
+		adr += 4; \
+	}
 
- i = cpu->instruction;
- adr = cpu->RREG_POS(i,16);
- val = READ8(cpu->mem_if->data, adr);
- cpu->RREG_POS(i,12) = val;
- cpu->RREG_POS(i,16) = adr + IMM_OFF_12;
+#define OP_L_IB(reg, adr) \
+	if (BIT##reg(i)) \
+	{ \
+		adr += 4; \
+		registresreg = READ32(cpu->mem_if->data, start); \
+		c += MMU_memAccessCycles<PROCNUM, 32, MMU_AD_READ>(start); \
+	}
 
- armcpu_switchMode(cpu, oldmode);
+#define OP_L_DA(reg, adr) \
+	if (BIT##reg(i)) \
+	{ \
+		registresreg = READ32(cpu->mem_if->data, start); \
+		c += MMU_memAccessCycles<PROCNUM, 32, MMU_AD_READ>(start); \
+		adr -= 4; \
+	}
 
- return 3 + MMU.MMU_WAIT16cpu->proc_ID(adr>>24)&0xF;
-}
+#define OP_L_DB(reg, adr) \
+	if (BIT##reg(i)) \
+	{ \
+		adr -= 4; \
+		registresreg = READ32(cpu->mem_if->data, start); \
+		c += MMU_memAccessCycles<PROCNUM, 32, MMU_AD_READ>(start); \
+	}
 
-static u32 FASTCALL OP_LDRBT_M_IMM_OFF_POSTIND(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_LDMIA(uint32_t i)
 {
- u32 oldmode;
- u32 i;
- u32 adr;
- u32 val;
-
- if(cpu->CPSR.bits.mode==USR)
- return 2;
- oldmode = armcpu_switchMode(cpu, SYS);
+	uint32_t c = 0;
+	uint32_t start = cpu->RREG_POS(i, 16);
 
- //execute = false;
-	 LOG("Untested opcode: OP_LDRBT_M_IMM_OFF_POSTIND\n");
+	uint32_t *registres = cpu->R;
 
+	OP_L_IA(0, start);
+	OP_L_IA(1, start);
+	OP_L_IA(2, start);
+	OP_L_IA(3, start);
+	OP_L_IA(4, start);
+	OP_L_IA(5, start);
+	OP_L_IA(6, start);
+	OP_L_IA(7, start);
+	OP_L_IA(8, start);
+	OP_L_IA(9, start);
+	OP_L_IA(10, start);
+	OP_L_IA(11, start);
+	OP_L_IA(12, start);
+	OP_L_IA(13, start);
+	OP_L_IA(14, start);
 
- i = cpu->instruction;
- adr = cpu->RREG_POS(i,16);
- val = READ8(cpu->mem_if->data, adr);
- cpu->RREG_POS(i,12) = val;
- cpu->RREG_POS(i,16) = adr - IMM_OFF_12;
+	if (BIT15(i))
+	{
+		uint32_t tmp = READ32(cpu->mem_if->data, start);
+		// TODO
+		// The general-purpose registers loaded can include the PC. If they do, the word loaded for the PC is treated
+		// as an address and a branch occurs to that address. In ARMv5 and above, bit0 of the loaded value
+		// determines whether execution continues after this branch in ARM state or in Thumb state, as though a BX
+		// (loaded_value) instruction had been executed (but see also The T and J bits on page A2-15 for operation on
+		// non-T variants of ARMv5). In earlier versions of the architecture, bits1:0 of the loaded value are ignored
+		// and execution continues in ARM state, as though the instruction MOV PC,(loaded_value) had been executed.
+		//
+		//value = Memoryaddress,4
+		//if (architecture version 5 or above) then
+		//	pc = value AND 0xFFFFFFFE
+		//	T Bit = value0
+		//else
+		//	pc = value AND 0xFFFFFFFC
+		if (!PROCNUM)
+		{
+			cpu->CPSR.bits.T = BIT0(tmp);
+			registres15 = tmp & 0xFFFFFFFE;
+		}
+		else
+			registres15 = tmp & 0xFFFFFFFC;
 
- armcpu_switchMode(cpu, oldmode);
+		//start += 4;
+		cpu->next_instruction = registres15;
+		c += MMU_memAccessCycles<PROCNUM, 32, MMU_AD_READ>(start);
+	}
 
- return 3 + MMU.MMU_WAIT16cpu->proc_ID(adr>>24)&0xF;
+	return MMU_aluMemCycles<PROCNUM>(2, c);
 }
 
-static u32 FASTCALL OP_LDRBT_P_LSL_IMM_OFF_POSTIND(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_LDMIB(uint32_t i)
 {
- u32 oldmode;
- u32 i;
- u32 adr;
- u32 val;
- u32 shift_op;
-
- if(cpu->CPSR.bits.mode==USR)
- return 2;
- oldmode = armcpu_switchMode(cpu, SYS);
- //execute = false;
-	 LOG("Untested opcode: OP_LDRBT_P_LSL_IMM_OFF_POSTIND");
-
+	uint32_t c = 0;
+	uint32_t start = cpu->RREG_POS(i, 16);
 
- i = cpu->instruction;
- LSL_IMM;
- adr = cpu->RREG_POS(i,16);
- val = READ8(cpu->mem_if->data, adr);
- cpu->RREG_POS(i,12) = val;
- cpu->RREG_POS(i,16) = adr + shift_op;
+	uint32_t *registres = cpu->R;
+
+	OP_L_IB(0, start);
+	OP_L_IB(1, start);
+	OP_L_IB(2, start);
+	OP_L_IB(3, start);
+	OP_L_IB(4, start);
+	OP_L_IB(5, start);
+	OP_L_IB(6, start);
+	OP_L_IB(7, start);
+	OP_L_IB(8, start);
+	OP_L_IB(9, start);
+	OP_L_IB(10, start);
+	OP_L_IB(11, start);
+	OP_L_IB(12, start);
+	OP_L_IB(13, start);
+	OP_L_IB(14, start);
 
- armcpu_switchMode(cpu, oldmode);
+	if (BIT15(i))
+	{
+		start += 4;
+		c += MMU_memAccessCycles<PROCNUM,32,MMU_AD_READ>(start);
+		uint32_t tmp = READ32(cpu->mem_if->data, start);
+		if (!PROCNUM)
+		{
+			cpu->CPSR.bits.T = BIT0(tmp);
+			registres15 = tmp & 0xFFFFFFFE;
+		}
+		else
+			registres15 = tmp & 0xFFFFFFFC;
+		cpu->next_instruction = registres15;
+		return MMU_aluMemCycles<PROCNUM>(4, c);
+	}
 
- return 3 + MMU.MMU_WAIT16cpu->proc_ID(adr>>24)&0xF;
+	return MMU_aluMemCycles<PROCNUM>(2, c);
 }
 
-static u32 FASTCALL OP_LDRBT_M_LSL_IMM_OFF_POSTIND(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_LDMDA(uint32_t i)
 {
- u32 oldmode;
- u32 i;
- u32 adr;
- u32 val;
- u32 shift_op;
-
- if(cpu->CPSR.bits.mode==USR)
- return 2;
-
- oldmode = armcpu_switchMode(cpu, SYS);
- //execute = false;
-	 LOG("Untested opcode: OP_LDRBT_M_LSL_IMM_OFF_POSTIND");
+	uint32_t c = 0;
+	uint32_t start = cpu->RREG_POS(i, 16);
 
+	uint32_t *registres = cpu->R;
 
- i = cpu->instruction;
- LSL_IMM;
- adr = cpu->RREG_POS(i,16);
- val = READ8(cpu->mem_if->data, adr);
- cpu->RREG_POS(i,12) = val;
- cpu->RREG_POS(i,16) = adr - shift_op;
+	if (BIT15(i))
+	{
+		uint32_t tmp = READ32(cpu->mem_if->data, start);
+		if (!PROCNUM)
+		{
+			cpu->CPSR.bits.T = BIT0(tmp);
+			registres15 = tmp & 0xFFFFFFFE;
+		}
+		else
+			registres15 = tmp & 0xFFFFFFFC;
+		c += MMU_memAccessCycles<PROCNUM, 32, MMU_AD_READ>(start);
+		start -= 4;
+		cpu->next_instruction = registres15;
+	}
 
- armcpu_switchMode(cpu, oldmode);
+	OP_L_DA(14, start);
+	OP_L_DA(13, start);
+	OP_L_DA(12, start);
+	OP_L_DA(11, start);
+	OP_L_DA(10, start);
+	OP_L_DA(9, start);
+	OP_L_DA(8, start);
+	OP_L_DA(7, start);
+	OP_L_DA(6, start);
+	OP_L_DA(5, start);
+	OP_L_DA(4, start);
+	OP_L_DA(3, start);
+	OP_L_DA(2, start);
+	OP_L_DA(1, start);
+	OP_L_DA(0, start);
 
- return 3 + MMU.MMU_WAIT16cpu->proc_ID(adr>>24)&0xF;
+	return MMU_aluMemCycles<PROCNUM>(2, c);
 }
 
-static u32 FASTCALL OP_LDRBT_P_LSR_IMM_OFF_POSTIND(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_LDMDB(uint32_t i)
 {
- u32 oldmode;
- u32 i;
- u32 adr;
- u32 val;
- u32 shift_op;
-
- if(cpu->CPSR.bits.mode==USR)
- return 2;
+	uint32_t c = 0;
+	uint32_t start = cpu->RREG_POS(i, 16);
 
- oldmode = armcpu_switchMode(cpu, SYS);
- //execute = false;
-	 LOG("Untested opcode: OP_LDRBT_P_LSR_IMM_OFF_POSTIND");
+	uint32_t *registres = cpu->R;
 
+	if (BIT15(i))
+	{
+		start -= 4;
+		uint32_t tmp = READ32(cpu->mem_if->data, start);
+		if (!PROCNUM)
+		{
+			cpu->CPSR.bits.T = BIT0(tmp);
+			registres15 = tmp & 0xFFFFFFFE;
+		}
+		else
+			registres15 = tmp & 0xFFFFFFFC;
+		cpu->next_instruction = registres15;
+		c += MMU_memAccessCycles<PROCNUM, 32, MMU_AD_READ>(start);
+	}
 
- i = cpu->instruction;
- LSR_IMM;
- adr = cpu->RREG_POS(i,16);
- val = READ8(cpu->mem_if->data, adr);
- cpu->RREG_POS(i,12) = val;
- cpu->RREG_POS(i,16) = adr + shift_op;
-
- armcpu_switchMode(cpu, oldmode);
+	OP_L_DB(14, start);
+	OP_L_DB(13, start);
+	OP_L_DB(12, start);
+	OP_L_DB(11, start);
+	OP_L_DB(10, start);
+	OP_L_DB(9, start);
+	OP_L_DB(8, start);
+	OP_L_DB(7, start);
+	OP_L_DB(6, start);
+	OP_L_DB(5, start);
+	OP_L_DB(4, start);
+	OP_L_DB(3, start);
+	OP_L_DB(2, start);
+	OP_L_DB(1, start);
+	OP_L_DB(0, start);
 
- return 3 + MMU.MMU_WAIT16cpu->proc_ID(adr>>24)&0xF;
+	return MMU_aluMemCycles<PROCNUM>(2, c);
 }
 
-static u32 FASTCALL OP_LDRBT_M_LSR_IMM_OFF_POSTIND(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_LDMIA_W(uint32_t i)
 {
- u32 oldmode;
- u32 i;
- u32 adr;
- u32 val;
- u32 shift_op;
+	uint32_t c = 0;
+	uint32_t start = cpu->RREG_POS(i, 16);
+	uint32_t bitList = (~((2 << REG_POS(i, 16)) - 1)) & 0xFFFF;
+
+	uint32_t *registres = cpu->R;
+
+	OP_L_IA(0, start);
+	OP_L_IA(1, start);
+	OP_L_IA(2, start);
+	OP_L_IA(3, start);
+	OP_L_IA(4, start);
+	OP_L_IA(5, start);
+	OP_L_IA(6, start);
+	OP_L_IA(7, start);
+	OP_L_IA(8, start);
+	OP_L_IA(9, start);
+	OP_L_IA(10, start);
+	OP_L_IA(11, start);
+	OP_L_IA(12, start);
+	OP_L_IA(13, start);
+	OP_L_IA(14, start);
 
- if(cpu->CPSR.bits.mode==USR)
- return 2;
-
- oldmode = armcpu_switchMode(cpu, SYS);
- //execute = false;
-	 LOG("Untested opcode: OP_LDRBT_M_LSR_IMM_OFF_POSTIND");
-
-
- i = cpu->instruction;
- LSR_IMM;
- adr = cpu->RREG_POS(i,16);
- val = READ8(cpu->mem_if->data, adr);
- cpu->RREG_POS(i,12) = val;
- cpu->RREG_POS(i,16) = adr - shift_op;
+	if (BIT15(i))
+	{
+		uint32_t tmp = READ32(cpu->mem_if->data, start);
+		if (!PROCNUM)
+		{
+			cpu->CPSR.bits.T = BIT0(tmp);
+			registres15 = tmp & 0xFFFFFFFE;
+		}
+		else
+			registres15 = tmp & 0xFFFFFFFC;
+		c += MMU_memAccessCycles<PROCNUM, 32, MMU_AD_READ>(start);
+		start += 4;
+		cpu->next_instruction = registres15;
+	}
 
- armcpu_switchMode(cpu, oldmode);
+	if (i & (1 << REG_POS(i, 16)))
+	{
+		if (i & bitList)
+			cpu->RREG_POS(i, 16) = start;
+	}
+	else
+		cpu->RREG_POS(i, 16) = start;
 
- return 3 + MMU.MMU_WAIT16cpu->proc_ID(adr>>24)&0xF;
+	return MMU_aluMemCycles<PROCNUM>(BIT15(i) ? 4 : 2, c);
 }
 
-static u32 FASTCALL OP_LDRBT_P_ASR_IMM_OFF_POSTIND(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_LDMIB_W(uint32_t i)
 {
- u32 oldmode;
- u32 i;
- u32 adr;
- u32 val;
- u32 shift_op;
-
- if(cpu->CPSR.bits.mode==USR)
- return 2;
+	uint32_t c = 0;
+	uint32_t start = cpu->RREG_POS(i, 16);
+	uint32_t bitList = (~((2 << REG_POS(i, 16)) - 1)) & 0xFFFF;
+
+	uint32_t *registres = cpu->R;
+
+	OP_L_IB(0, start);
+	OP_L_IB(1, start);
+	OP_L_IB(2, start);
+	OP_L_IB(3, start);
+	OP_L_IB(4, start);
+	OP_L_IB(5, start);
+	OP_L_IB(6, start);
+	OP_L_IB(7, start);
+	OP_L_IB(8, start);
+	OP_L_IB(9, start);
+	OP_L_IB(10, start);
+	OP_L_IB(11, start);
+	OP_L_IB(12, start);
+	OP_L_IB(13, start);
+	OP_L_IB(14, start);
 
- oldmode = armcpu_switchMode(cpu, SYS);
- //execute = false;
-	 LOG("Untested opcode: OP_LDRBT_P_ASR_IMM_OFF_POSTIND");
-
-
- i = cpu->instruction;
- ASR_IMM;
- adr = cpu->RREG_POS(i,16);
- val = READ8(cpu->mem_if->data, adr);
- cpu->RREG_POS(i,12) = val;
- cpu->RREG_POS(i,16) = adr + shift_op;
+	if (BIT15(i))
+	{
+		uint32_t tmp;
+		start += 4;
+		c += MMU_memAccessCycles<PROCNUM, 32, MMU_AD_READ>(start);
+		tmp = READ32(cpu->mem_if->data, start);
+		if (!PROCNUM)
+		{
+			cpu->CPSR.bits.T = BIT0(tmp);
+			registres15 = tmp & 0xFFFFFFFE;
+		}
+		else
+			registres15 = tmp & 0xFFFFFFFC;
+		cpu->next_instruction = registres15;
+	}
 
- armcpu_switchMode(cpu, oldmode);
+	if (i & (1 << REG_POS(i, 16)))
+	{
+		if (i & bitList)
+			cpu->RREG_POS(i, 16) = start;
+	}
+	else
+		cpu->RREG_POS(i, 16) = start;
 
- return 3 + MMU.MMU_WAIT16cpu->proc_ID(adr>>24)&0xF;
+	return MMU_aluMemCycles<PROCNUM>(BIT15(i) ? 4 : 2, c);
 }
 
-static u32 FASTCALL OP_LDRBT_M_ASR_IMM_OFF_POSTIND(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_LDMDA_W(uint32_t i)
 {
- u32 oldmode;
- u32 i;
- u32 adr;
- u32 val;
- u32 shift_op;
-
- if(cpu->CPSR.bits.mode==USR)
- return 2;
+	uint32_t c = 0;
+	uint32_t start = cpu->RREG_POS(i, 16);
+	uint32_t bitList = (~((2 << REG_POS(i, 16)) - 1)) & 0xFFFF;
 
- oldmode = armcpu_switchMode(cpu, SYS);
- //execute = false;
-	 LOG("Untested opcode: OP_LDRBT_M_ASR_IMM_OFF_POSTIND");
+	uint32_t *registres = cpu->R;
 
+	if (BIT15(i))
+	{
+		uint32_t tmp = READ32(cpu->mem_if->data, start);
+		if (!PROCNUM)
+		{
+			cpu->CPSR.bits.T = BIT0(tmp);
+			registres15 = tmp & 0xFFFFFFFE;
+		}
+		else
+			registres15 = tmp & 0xFFFFFFFC;
+		c += MMU_memAccessCycles<PROCNUM, 32, MMU_AD_READ>(start);
+		start -= 4;
+		cpu->next_instruction = registres15;
+	}
 
- i = cpu->instruction;
- ASR_IMM;
- adr = cpu->RREG_POS(i,16);
- val = READ8(cpu->mem_if->data, adr);
- cpu->RREG_POS(i,12) = val;
- cpu->RREG_POS(i,16) = adr - shift_op;
+	OP_L_DA(14, start);
+	OP_L_DA(13, start);
+	OP_L_DA(12, start);
+	OP_L_DA(11, start);
+	OP_L_DA(10, start);
+	OP_L_DA(9, start);
+	OP_L_DA(8, start);
+	OP_L_DA(7, start);
+	OP_L_DA(6, start);
+	OP_L_DA(5, start);
+	OP_L_DA(4, start);
+	OP_L_DA(3, start);
+	OP_L_DA(2, start);
+	OP_L_DA(1, start);
+	OP_L_DA(0, start);
 
- armcpu_switchMode(cpu, oldmode);
+	if (i & (1 << REG_POS(i, 16)))
+	{
+		if (i & bitList)
+			cpu->RREG_POS(i, 16) = start;
+	}
+	else
+		cpu->RREG_POS(i, 16) = start;
 
- return 3 + MMU.MMU_WAIT16cpu->proc_ID(adr>>24)&0xF;
+	return MMU_aluMemCycles<PROCNUM>(2, c);
 }
 
-static u32 FASTCALL OP_LDRBT_P_ROR_IMM_OFF_POSTIND(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_LDMDB_W(uint32_t i)
 {
- u32 oldmode;
- u32 i;
- u32 adr;
- u32 val;
- u32 shift_op;
-
- if(cpu->CPSR.bits.mode==USR)
- return 2;
+	uint32_t c = 0;
+	uint32_t start = cpu->RREG_POS(i, 16);
+	uint32_t bitList = (~((2 << REG_POS(i, 16)) - 1)) & 0xFFFF;
 
- oldmode = armcpu_switchMode(cpu, SYS);
- //execute = false;
-	 LOG("Untested opcode: OP_LDRBT_P_ROR_IMM_OFF_POSTIND");
+	uint32_t *registres = cpu->R;
 
+	if (BIT15(i))
+	{
+		uint32_t tmp;
+		start -= 4;
+		tmp = READ32(cpu->mem_if->data, start);
+		if (!PROCNUM)
+		{
+			cpu->CPSR.bits.T = BIT0(tmp);
+			registres15 = tmp & 0xFFFFFFFE;
+		}
+		else
+			registres15 = tmp & 0xFFFFFFFC;
+		cpu->next_instruction = registres15;
+		c += MMU_memAccessCycles<PROCNUM, 32, MMU_AD_READ>(start);
+	}
 
- i = cpu->instruction;
- ROR_IMM;
- adr = cpu->RREG_POS(i,16);
- val = READ8(cpu->mem_if->data, adr);
- cpu->RREG_POS(i,12) = val;
- cpu->RREG_POS(i,16) = adr + shift_op;
+	OP_L_DB(14, start);
+	OP_L_DB(13, start);
+	OP_L_DB(12, start);
+	OP_L_DB(11, start);
+	OP_L_DB(10, start);
+	OP_L_DB(9, start);
+	OP_L_DB(8, start);
+	OP_L_DB(7, start);
+	OP_L_DB(6, start);
+	OP_L_DB(5, start);
+	OP_L_DB(4, start);
+	OP_L_DB(3, start);
+	OP_L_DB(2, start);
+	OP_L_DB(1, start);
+	OP_L_DB(0, start);
 
- armcpu_switchMode(cpu, oldmode);
+	if (i & (1 << REG_POS(i, 16)))
+	{
+		if (i & bitList)
+			cpu->RREG_POS(i, 16) = start;
+	}
+	else
+		cpu->RREG_POS(i, 16) = start;
 
- return 3 + MMU.MMU_WAIT16cpu->proc_ID(adr>>24)&0xF;
+	return MMU_aluMemCycles<PROCNUM>(2, c);
 }
 
-static u32 FASTCALL OP_LDRBT_M_ROR_IMM_OFF_POSTIND(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_LDMIA2(uint32_t i)
 {
- u32 oldmode;
- u32 i;
- u32 adr;
- u32 val;
- u32 shift_op;
-
- if(cpu->CPSR.bits.mode==USR)
- return 2;
-
- oldmode = armcpu_switchMode(cpu, SYS);
- //execute = false;
-	 LOG("Untested opcode: OP_LDRBT_M_ROR_IMM_OFF_POSTIND");
+	uint32_t c = 0;
+	uint32_t start = cpu->RREG_POS(i, 16);
 
+	uint32_t oldmode = 0;
+	if (!BIT15(i))
+	{
+		if (cpu->CPSR.bits.mode == USR || cpu->CPSR.bits.mode == SYS)
+		{
+			fprintf(stderr, "ERROR1\n");
+			return 1;
+		}
+		oldmode = armcpu_switchMode(cpu, SYS);
+	}
 
- i = cpu->instruction;
- ROR_IMM;
- adr = cpu->RREG_POS(i,16);
- val = READ8(cpu->mem_if->data, adr);
- cpu->RREG_POS(i,12) = val;
- cpu->RREG_POS(i,16) = adr - shift_op;
+	uint32_t *registres = cpu->R;
 
- armcpu_switchMode(cpu, oldmode);
+	OP_L_IA(0, start);
+	OP_L_IA(1, start);
+	OP_L_IA(2, start);
+	OP_L_IA(3, start);
+	OP_L_IA(4, start);
+	OP_L_IA(5, start);
+	OP_L_IA(6, start);
+	OP_L_IA(7, start);
+	OP_L_IA(8, start);
+	OP_L_IA(9, start);
+	OP_L_IA(10, start);
+	OP_L_IA(11, start);
+	OP_L_IA(12, start);
+	OP_L_IA(13, start);
+	OP_L_IA(14, start);
 
- return 3 + MMU.MMU_WAIT16cpu->proc_ID(adr>>24)&0xF;
+	if (!BIT15(i))
+		armcpu_switchMode(cpu, static_cast<uint8_t>(oldmode));
+	else
+	{
+		uint32_t tmp = READ32(cpu->mem_if->data, start);
+		Status_Reg SPSR;
+		cpu->R15 = tmp & (0XFFFFFFFC | (BIT0(tmp) << 1));
+		SPSR = cpu->SPSR;
+		armcpu_switchMode(cpu, SPSR.bits.mode);
+		cpu->CPSR = SPSR;
+		cpu->changeCPSR();
+		//start += 4;
+		cpu->next_instruction = cpu->R15;
+		c += MMU_memAccessCycles<PROCNUM, 32, MMU_AD_READ>(start);
+	}
+	return MMU_aluMemCycles<PROCNUM>(2, c);
 }
 
-//----------------------STRBT----------------------------
-
-static u32 FASTCALL OP_STRBT_P_IMM_OFF_POSTIND(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_LDMIB2(uint32_t i)
 {
- u32 oldmode;
- u32 i;
- u32 adr;
-
- if(cpu->CPSR.bits.mode==USR)
- return 2;
-
- oldmode = armcpu_switchMode(cpu, SYS);
+	uint32_t c = 0;
+	uint32_t start = cpu->RREG_POS(i, 16);
 
+	uint32_t oldmode = 0;
+	if (!BIT15(i))
+	{
+		if (cpu->CPSR.bits.mode == USR || cpu->CPSR.bits.mode == SYS)
+		{
+			fprintf(stderr, "ERROR1\n");
+			return 1;
+		}
+		oldmode = armcpu_switchMode(cpu, SYS);
+	}
 
- i = cpu->instruction;
- adr = cpu->RREG_POS(i,16);
- WRITE8(cpu->mem_if->data, adr, (u8)cpu->RREG_POS(i,12));
- cpu->RREG_POS(i,16) = adr + IMM_OFF_12;
+	uint32_t *registres = cpu->R;
 
- armcpu_switchMode(cpu, oldmode);
+	OP_L_IB(0, start);
+	OP_L_IB(1, start);
+	OP_L_IB(2, start);
+	OP_L_IB(3, start);
+	OP_L_IB(4, start);
+	OP_L_IB(5, start);
+	OP_L_IB(6, start);
+	OP_L_IB(7, start);
+	OP_L_IB(8, start);
+	OP_L_IB(9, start);
+	OP_L_IB(10, start);
+	OP_L_IB(11, start);
+	OP_L_IB(12, start);
+	OP_L_IB(13, start);
+	OP_L_IB(14, start);
 
- return 2 + MMU.MMU_WAIT16cpu->proc_ID(adr>>24)&0xF;
+	if (!BIT15(i))
+		armcpu_switchMode(cpu, static_cast<uint8_t>(oldmode));
+	else
+	{
+		Status_Reg SPSR;
+		start += 4;
+		uint32_t tmp = READ32(cpu->mem_if->data, start);
+		registres15 = tmp & (0XFFFFFFFC | (BIT0(tmp) << 1));
+		SPSR = cpu->SPSR;
+		armcpu_switchMode(cpu, SPSR.bits.mode);
+		cpu->CPSR = SPSR;
+		cpu->changeCPSR();
+		cpu->next_instruction = registres15;
+		c += MMU_memAccessCycles<PROCNUM, 32, MMU_AD_READ>(start);
+	}
+	return MMU_aluMemCycles<PROCNUM>(2, c);
 }
 
-static u32 FASTCALL OP_STRBT_M_IMM_OFF_POSTIND(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_LDMDA2(uint32_t i)
 {
- u32 oldmode;
- u32 i;
- u32 adr;
+	uint32_t c = 0;
+	uint32_t start = cpu->RREG_POS(i,16);
 
- if(cpu->CPSR.bits.mode==USR)
- return 2;
+	uint32_t oldmode = 0;
+	if (!BIT15(i))
+	{
+		if (cpu->CPSR.bits.mode == USR || cpu->CPSR.bits.mode == SYS)
+		{
+			fprintf(stderr, "ERROR1\n");
+			return 1;
+		}
+		oldmode = armcpu_switchMode(cpu, SYS);
+	}
 
- oldmode = armcpu_switchMode(cpu, SYS);
+	uint32_t *registres = cpu->R;
 
+	if (BIT15(i))
+	{
+		uint32_t tmp = READ32(cpu->mem_if->data, start);
+		registres15 = tmp & (0XFFFFFFFC | (BIT0(tmp) << 1));
+		cpu->CPSR = cpu->SPSR;
+		cpu->changeCPSR();
+		c += MMU_memAccessCycles<PROCNUM, 32, MMU_AD_READ>(start);
+		start -= 4;
+		cpu->next_instruction = registres15;
+	}
 
- i = cpu->instruction;
- adr = cpu->RREG_POS(i,16);
- WRITE8(cpu->mem_if->data, adr, (u8)cpu->RREG_POS(i,12));
- cpu->RREG_POS(i,16) = adr - IMM_OFF_12;
+	OP_L_DA(14, start);
+	OP_L_DA(13, start);
+	OP_L_DA(12, start);
+	OP_L_DA(11, start);
+	OP_L_DA(10, start);
+	OP_L_DA(9, start);
+	OP_L_DA(8, start);
+	OP_L_DA(7, start);
+	OP_L_DA(6, start);
+	OP_L_DA(5, start);
+	OP_L_DA(4, start);
+	OP_L_DA(3, start);
+	OP_L_DA(2, start);
+	OP_L_DA(1, start);
+	OP_L_DA(0, start);
 
- armcpu_switchMode(cpu, oldmode);
+	if (!BIT15(i))
+		armcpu_switchMode(cpu, static_cast<uint8_t>(oldmode));
+	else
+	{
+		Status_Reg SPSR = cpu->SPSR;
+		armcpu_switchMode(cpu, SPSR.bits.mode);
+		cpu->CPSR = SPSR;
+		cpu->changeCPSR();
+	}
 
- return 2 + MMU.MMU_WAIT16cpu->proc_ID(adr>>24)&0xF;
+	return MMU_aluMemCycles<PROCNUM>(2, c);
 }
 
-static u32 FASTCALL OP_STRBT_P_LSL_IMM_OFF_POSTIND(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_LDMDB2(uint32_t i)
 {
- u32 oldmode;
- u32 i;
- u32 adr;
- u32 shift_op;
+	uint32_t c = 0;
+	uint32_t start = cpu->RREG_POS(i,16);
 
- if(cpu->CPSR.bits.mode==USR)
- return 2;
+	uint32_t oldmode = 0;
+	if (!BIT15(i))
+	{
+		if (cpu->CPSR.bits.mode == USR || cpu->CPSR.bits.mode == SYS)
+		{
+			fprintf(stderr, "ERROR1\n");
+			return 1;
+		}
+		oldmode = armcpu_switchMode(cpu, SYS);
+	}
 
- oldmode = armcpu_switchMode(cpu, SYS);
+	uint32_t *registres = cpu->R;
 
+	if (BIT15(i))
+	{
+		uint32_t tmp;
+		start -= 4;
+		tmp = READ32(cpu->mem_if->data, start);
+		registres15 = tmp & (0XFFFFFFFC | (BIT0(tmp) << 1));
+		cpu->CPSR = cpu->SPSR;
+		cpu->changeCPSR();
+		cpu->next_instruction = registres15;
+		c += MMU_memAccessCycles<PROCNUM, 32, MMU_AD_READ>(start);
+	}
 
- i = cpu->instruction;
- LSL_IMM;
- adr = cpu->RREG_POS(i,16);
- WRITE8(cpu->mem_if->data, adr, (u8)cpu->RREG_POS(i,12));
- cpu->RREG_POS(i,16) = adr + shift_op;
+	OP_L_DB(14, start);
+	OP_L_DB(13, start);
+	OP_L_DB(12, start);
+	OP_L_DB(11, start);
+	OP_L_DB(10, start);
+	OP_L_DB(9, start);
+	OP_L_DB(8, start);
+	OP_L_DB(7, start);
+	OP_L_DB(6, start);
+	OP_L_DB(5, start);
+	OP_L_DB(4, start);
+	OP_L_DB(3, start);
+	OP_L_DB(2, start);
+	OP_L_DB(1, start);
+	OP_L_DB(0, start);
 
- armcpu_switchMode(cpu, oldmode);
+	if (!BIT15(i))
+		armcpu_switchMode(cpu, static_cast<uint8_t>(oldmode));
+	else
+	{
+		Status_Reg SPSR = cpu->SPSR;
+		armcpu_switchMode(cpu, SPSR.bits.mode);
+		cpu->CPSR = SPSR;
+		cpu->changeCPSR();
+	}
 
- return 2 + MMU.MMU_WAIT16cpu->proc_ID(adr>>24)&0xF;
+	return MMU_aluMemCycles<PROCNUM>(2, c);
 }
 
-static u32 FASTCALL OP_STRBT_M_LSL_IMM_OFF_POSTIND(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_LDMIA2_W(uint32_t i)
 {
- u32 oldmode;
- u32 i;
- u32 adr;
- u32 shift_op;
+	uint32_t c = 0;
+	uint32_t start = cpu->RREG_POS(i,16);
 
- if(cpu->CPSR.bits.mode==USR)
- return 2;
-
- oldmode = armcpu_switchMode(cpu, SYS);
+	uint32_t oldmode = 0;
+	if (!BIT15(i))
+	{
+		if (cpu->CPSR.bits.mode == USR || cpu->CPSR.bits.mode == SYS)
+		{
+			fprintf(stderr, "ERROR1\n");
+			return 1;
+		}
+		oldmode = armcpu_switchMode(cpu, SYS);
+	}
 
+	uint32_t *registres = cpu->R;
 
- i = cpu->instruction;
- LSL_IMM;
- adr = cpu->RREG_POS(i,16);
- WRITE8(cpu->mem_if->data, adr, (u8)cpu->RREG_POS(i,12));
- cpu->RREG_POS(i,16) = adr - shift_op;
+	OP_L_IA(0, start);
+	OP_L_IA(1, start);
+	OP_L_IA(2, start);
+	OP_L_IA(3, start);
+	OP_L_IA(4, start);
+	OP_L_IA(5, start);
+	OP_L_IA(6, start);
+	OP_L_IA(7, start);
+	OP_L_IA(8, start);
+	OP_L_IA(9, start);
+	OP_L_IA(10, start);
+	OP_L_IA(11, start);
+	OP_L_IA(12, start);
+	OP_L_IA(13, start);
+	OP_L_IA(14, start);
 
- armcpu_switchMode(cpu, oldmode);
+	if (!BIT15(i))
+	{
+		if (!BIT_N(i, REG_POS(i, 16)))
+			registresREG_POS(i, 16) = start;
+		armcpu_switchMode(cpu, static_cast<uint8_t>(oldmode));
+		return MMU_aluMemCycles<PROCNUM>(2, c);
+	}
 
- return 2 + MMU.MMU_WAIT16cpu->proc_ID(adr>>24)&0xF;
+	if (!BIT_N(i, REG_POS(i, 16)))
+		registresREG_POS(i, 16) = start + 4;
+	uint32_t tmp = READ32(cpu->mem_if->data, start);
+	registres15 = tmp & (0XFFFFFFFC | (BIT0(tmp) << 1));
+	Status_Reg SPSR = cpu->SPSR;
+	armcpu_switchMode(cpu, SPSR.bits.mode);
+	cpu->CPSR = SPSR;
+	cpu->changeCPSR();
+	cpu->next_instruction = registres15;
+	c += MMU_memAccessCycles<PROCNUM, 32, MMU_AD_READ>(start);
+
+	return MMU_aluMemCycles<PROCNUM>(2, c);
 }
 
-static u32 FASTCALL OP_STRBT_P_LSR_IMM_OFF_POSTIND(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_LDMIB2_W(uint32_t i)
 {
- u32 oldmode;
- u32 i;
- u32 adr;
- u32 shift_op;
+	uint32_t c = 0;
+	uint32_t start = cpu->RREG_POS(i, 16);
 
- if(cpu->CPSR.bits.mode==USR)
- return 2;
+	uint32_t oldmode = 0;
+	if (!BIT15(i))
+	{
+		if (cpu->CPSR.bits.mode == USR || cpu->CPSR.bits.mode == SYS)
+		{
+			fprintf(stderr, "ERROR1\n");
+			return 1;
+		}
+		oldmode = armcpu_switchMode(cpu, SYS);
+	}
 
- oldmode = armcpu_switchMode(cpu, SYS);
+	uint32_t *registres = cpu->R;
 
+	OP_L_IB(0, start);
+	OP_L_IB(1, start);
+	OP_L_IB(2, start);
+	OP_L_IB(3, start);
+	OP_L_IB(4, start);
+	OP_L_IB(5, start);
+	OP_L_IB(6, start);
+	OP_L_IB(7, start);
+	OP_L_IB(8, start);
+	OP_L_IB(9, start);
+	OP_L_IB(10, start);
+	OP_L_IB(11, start);
+	OP_L_IB(12, start);
+	OP_L_IB(13, start);
+	OP_L_IB(14, start);
 
- i = cpu->instruction;
- LSR_IMM;
- adr = cpu->RREG_POS(i,16);
- WRITE8(cpu->mem_if->data, adr, (u8)cpu->RREG_POS(i,12));
- cpu->RREG_POS(i,16) = adr + shift_op;
+	if (!BIT15(i))
+	{
+		if (!BIT_N(i, REG_POS(i, 16)))
+			registresREG_POS(i, 16) = start;
+		armcpu_switchMode(cpu, static_cast<uint8_t>(oldmode));
 
- armcpu_switchMode(cpu, oldmode);
+		return MMU_aluMemCycles<PROCNUM>(2, c);
+	}
 
- return 2 + MMU.MMU_WAIT16cpu->proc_ID(adr>>24)&0xF;
+	if (!BIT_N(i, REG_POS(i,16)))
+		registresREG_POS(i,16) = start + 4;
+	uint32_t tmp = READ32(cpu->mem_if->data, start + 4);
+	registres15 = tmp & (0XFFFFFFFC | (BIT0(tmp) << 1));
+	cpu->CPSR = cpu->SPSR;
+	cpu->changeCPSR();
+	cpu->next_instruction = registres15;
+	Status_Reg SPSR = cpu->SPSR;
+	armcpu_switchMode(cpu, SPSR.bits.mode);
+	cpu->CPSR = SPSR;
+	cpu->changeCPSR();
+	c += MMU_memAccessCycles<PROCNUM, 32, MMU_AD_READ>(start);
+
+	return MMU_aluMemCycles<PROCNUM>(2, c);
 }
 
-static u32 FASTCALL OP_STRBT_M_LSR_IMM_OFF_POSTIND(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_LDMDA2_W(uint32_t i)
 {
- u32 oldmode;
- u32 i;
- u32 adr;
- u32 shift_op;
+	uint32_t c = 0;
+	uint32_t start = cpu->RREG_POS(i,16);
+
+	uint32_t oldmode = 0;
+	if (!BIT15(i))
+	{
+		if (cpu->CPSR.bits.mode == USR || cpu->CPSR.bits.mode == SYS)
+		{
+			fprintf(stderr, "ERROR1\n");
+			return 1;
+		}
+		oldmode = armcpu_switchMode(cpu, SYS);
+	}
 
- if(cpu->CPSR.bits.mode==USR)
- return 2;
+	uint32_t *registres = cpu->R;
 
- oldmode = armcpu_switchMode(cpu, SYS);
+	if (BIT15(i))
+	{
+		if (BIT_N(i, REG_POS(i, 16)))
+			fprintf(stderr, "error1_1\n");
+		uint32_t tmp = READ32(cpu->mem_if->data, start);
+		registres15 = tmp & (0XFFFFFFFC | (BIT0(tmp) << 1));
+		c += MMU_memAccessCycles<PROCNUM, 32, MMU_AD_READ>(start);
+		start -= 4;
+		cpu->next_instruction = registres15;
+	}
 
+	OP_L_DA(14, start);
+	OP_L_DA(13, start);
+	OP_L_DA(12, start);
+	OP_L_DA(11, start);
+	OP_L_DA(10, start);
+	OP_L_DA(9, start);
+	OP_L_DA(8, start);
+	OP_L_DA(7, start);
+	OP_L_DA(6, start);
+	OP_L_DA(5, start);
+	OP_L_DA(4, start);
+	OP_L_DA(3, start);
+	OP_L_DA(2, start);
+	OP_L_DA(1, start);
+	OP_L_DA(0, start);
 
- i = cpu->instruction;
- LSR_IMM;
- adr = cpu->RREG_POS(i,16);
- WRITE8(cpu->mem_if->data, adr, (u8)cpu->RREG_POS(i,12));
- cpu->RREG_POS(i,16) = adr - shift_op;
+	if (!BIT_N(i, REG_POS(i, 16)))
+		registresREG_POS(i, 16) = start;
 
- armcpu_switchMode(cpu, oldmode);
+	if (!BIT15(i))
+	{
+		armcpu_switchMode(cpu, static_cast<uint8_t>(oldmode));
+		return MMU_aluMemCycles<PROCNUM>(2, c);
+	}
 
- return 2 + MMU.MMU_WAIT16cpu->proc_ID(adr>>24)&0xF;
+	Status_Reg SPSR = cpu->SPSR;
+	armcpu_switchMode(cpu, SPSR.bits.mode);
+	cpu->CPSR = SPSR;
+	cpu->changeCPSR();
+	return MMU_aluMemCycles<PROCNUM>(2, c);
 }
 
-static u32 FASTCALL OP_STRBT_P_ASR_IMM_OFF_POSTIND(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_LDMDB2_W(uint32_t i)
 {
- u32 oldmode;
- u32 i;
- u32 adr;
- u32 shift_op;
+	uint32_t c = 0;
+	uint32_t start = cpu->RREG_POS(i, 16);
+
+	uint32_t oldmode = 0;
+	if (!BIT15(i))
+	{
+		if (cpu->CPSR.bits.mode == USR || cpu->CPSR.bits.mode == SYS)
+		{
+			fprintf(stderr, "ERROR1\n");
+			return 1;
+		}
+		oldmode = armcpu_switchMode(cpu, SYS);
+	}
 
- if(cpu->CPSR.bits.mode==USR)
- return 2;
+	uint32_t *registres = cpu->R;
 
- oldmode = armcpu_switchMode(cpu, SYS);
+	if (BIT15(i))
+	{
+		if (BIT_N(i, REG_POS(i, 16)))
+			fprintf(stderr, "error1_2\n");
+		start -= 4;
+		uint32_t tmp = READ32(cpu->mem_if->data, start);
+		c += MMU_memAccessCycles<PROCNUM, 32, MMU_AD_READ>(start);
+		registres15 = tmp & (0XFFFFFFFC | (BIT0(tmp) << 1));
+		cpu->CPSR = cpu->SPSR;
+		cpu->changeCPSR();
+		cpu->next_instruction = registres15;
+	}
 
+	OP_L_DB(14, start);
+	OP_L_DB(13, start);
+	OP_L_DB(12, start);
+	OP_L_DB(11, start);
+	OP_L_DB(10, start);
+	OP_L_DB(9, start);
+	OP_L_DB(8, start);
+	OP_L_DB(7, start);
+	OP_L_DB(6, start);
+	OP_L_DB(5, start);
+	OP_L_DB(4, start);
+	OP_L_DB(3, start);
+	OP_L_DB(2, start);
+	OP_L_DB(1, start);
+	OP_L_DB(0, start);
 
- i = cpu->instruction;
- ASR_IMM;
- adr = cpu->RREG_POS(i,16);
- WRITE8(cpu->mem_if->data, adr, (u8)cpu->RREG_POS(i,12));
- cpu->RREG_POS(i,16) = adr + shift_op;
+	if (!BIT_N(i, REG_POS(i, 16)))
+		registresREG_POS(i, 16) = start;
 
- armcpu_switchMode(cpu, oldmode);
+	if (!BIT15(i))
+	{
+		armcpu_switchMode(cpu, static_cast<uint8_t>(oldmode));
+		return MMU_aluMemCycles<PROCNUM>(2, c);
+	}
 
- return 2 + MMU.MMU_WAIT16cpu->proc_ID(adr>>24)&0xF;
+	Status_Reg SPSR = cpu->SPSR;
+	armcpu_switchMode(cpu, SPSR.bits.mode);
+	cpu->CPSR = SPSR;
+	cpu->changeCPSR();
+	return MMU_aluMemCycles<PROCNUM>(2, c);
 }
 
-static u32 FASTCALL OP_STRBT_M_ASR_IMM_OFF_POSTIND(armcpu_t *cpu)
-{
- u32 oldmode;
- u32 i;
- u32 adr;
- u32 shift_op;
+// -----------------------------------------------------------------------------
+// STMIA / STMIB / STMDA / STMDB
+// -----------------------------------------------------------------------------
 
- if(cpu->CPSR.bits.mode==USR)
- return 2;
+TEMPLATE static uint32_t FASTCALL OP_STMIA(uint32_t i)
+{
+	uint32_t c = 0;
+	uint32_t start = cpu->RREG_POS(i, 16);
 
- oldmode = armcpu_switchMode(cpu, SYS);
+	for (uint32_t b = 0; b < 16; ++b)
+	{
+		if (BIT_N(i, b))
+		{
+			WRITE32(cpu->mem_if->data, start, cpu->Rb);
+			c += MMU_memAccessCycles<PROCNUM, 32, MMU_AD_WRITE>(start);
+			start += 4;
+		}
+	}
+	return MMU_aluMemCycles<PROCNUM>(1, c);
+}
 
+TEMPLATE static uint32_t FASTCALL OP_STMIB(uint32_t i)
+{
+	uint32_t c = 0;
+	uint32_t start = cpu->RREG_POS(i, 16);
 
- i = cpu->instruction;
- ASR_IMM;
- adr = cpu->RREG_POS(i,16);
- WRITE8(cpu->mem_if->data, adr, (u8)cpu->RREG_POS(i,12));
- cpu->RREG_POS(i,16) = adr - shift_op;
+	for (uint32_t b = 0; b < 16; ++b)
+	{
+		if (BIT_N(i, b))
+		{
+			start += 4;
+			WRITE32(cpu->mem_if->data, start, cpu->Rb);
+			c += MMU_memAccessCycles<PROCNUM, 32, MMU_AD_WRITE>(start);
+		}
+	}
+	return MMU_aluMemCycles<PROCNUM>(1, c);
+}
 
- armcpu_switchMode(cpu, oldmode);
+TEMPLATE static uint32_t FASTCALL OP_STMDA(uint32_t i)
+{
+	uint32_t c = 0;
+	uint32_t start = cpu->RREG_POS(i, 16);
 
- return 2 + MMU.MMU_WAIT16cpu->proc_ID(adr>>24)&0xF;
+	for (uint32_t b = 0; b < 16; ++b)
+	{
+		if (BIT_N(i, 15 - b))
+		{
+			WRITE32(cpu->mem_if->data, start, cpu->R15 - b);
+			c += MMU_memAccessCycles<PROCNUM, 32, MMU_AD_WRITE>(start);
+			start -= 4;
+		}
+	}
+	return MMU_aluMemCycles<PROCNUM>(1, c);
 }
 
-static u32 FASTCALL OP_STRBT_P_ROR_IMM_OFF_POSTIND(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_STMDB(uint32_t i)
 {
- u32 oldmode;
- u32 i;
- u32 adr;
- u32 shift_op;
+	uint32_t c = 0;
+	uint32_t start = cpu->RREG_POS(i, 16);
 
- if(cpu->CPSR.bits.mode==USR)
- return 2;
+	for (uint32_t b = 0; b < 16; ++b)
+	{
+		if (BIT_N(i, 15 - b))
+		{
+			start -= 4;
+			WRITE32(cpu->mem_if->data, start, cpu->R15 - b);
+			c += MMU_memAccessCycles<PROCNUM, 32, MMU_AD_WRITE>(start);
+		}
+	}
+	return MMU_aluMemCycles<PROCNUM>(1, c);
+}
 
- oldmode = armcpu_switchMode(cpu, SYS);
+TEMPLATE static uint32_t FASTCALL OP_STMIA_W(uint32_t i)
+{
+	uint32_t c = 0;
+	uint32_t start = cpu->RREG_POS(i, 16);
 
+	for (uint32_t b = 0; b < 16; ++b)
+	{
+		if (BIT_N(i, b))
+		{
+			WRITE32(cpu->mem_if->data, start, cpu->Rb);
+			c += MMU_memAccessCycles<PROCNUM, 32, MMU_AD_WRITE>(start);
+			start += 4;
+		}
+	}
 
- i = cpu->instruction;
- ROR_IMM;
- adr = cpu->RREG_POS(i,16);
- WRITE8(cpu->mem_if->data, adr, (u8)cpu->RREG_POS(i,12));
- cpu->RREG_POS(i,16) = adr + shift_op;
+	cpu->RREG_POS(i, 16) = start;
+	return MMU_aluMemCycles<PROCNUM>(1, c);
+}
 
- armcpu_switchMode(cpu, oldmode);
+TEMPLATE static uint32_t FASTCALL OP_STMIB_W(uint32_t i)
+{
+	uint32_t c = 0;
+	uint32_t start = cpu->RREG_POS(i, 16);
 
- return 2 + MMU.MMU_WAIT16cpu->proc_ID(adr>>24)&0xF;
+	for (uint32_t b = 0; b < 16; ++b)
+	{
+		if (BIT_N(i, b))
+		{
+			start += 4;
+			WRITE32(cpu->mem_if->data, start, cpu->Rb);
+			c += MMU_memAccessCycles<PROCNUM, 32, MMU_AD_WRITE>(start);
+		}
+	}
+	cpu->RREG_POS(i, 16) = start;
+	return MMU_aluMemCycles<PROCNUM>(1, c);
 }
 
-static u32 FASTCALL OP_STRBT_M_ROR_IMM_OFF_POSTIND(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_STMDA_W(uint32_t i)
 {
- u32 oldmode;
- u32 i;
- u32 adr;
- u32 shift_op;
+	uint32_t c = 0;
+	uint32_t start = cpu->RREG_POS(i, 16);
 
- if(cpu->CPSR.bits.mode==USR)
- return 2;
-
- oldmode = armcpu_switchMode(cpu, SYS);
+	for (uint32_t b = 0; b < 16; ++b)
+	{
+		if (BIT_N(i, 15 - b))
+		{
+			WRITE32(cpu->mem_if->data, start, cpu->R15 - b);
+			c += MMU_memAccessCycles<PROCNUM, 32, MMU_AD_WRITE>(start);
+			start -= 4;
+		}
+	}
 
+	cpu->RREG_POS(i, 16) = start;
+	return MMU_aluMemCycles<PROCNUM>(1, c);
+}
 
- i = cpu->instruction;
- ROR_IMM;
- adr = cpu->RREG_POS(i,16);
- WRITE8(cpu->mem_if->data, adr, (u8)cpu->RREG_POS(i,12));
- cpu->RREG_POS(i,16) = adr - shift_op;
+TEMPLATE static uint32_t FASTCALL OP_STMDB_W(uint32_t i)
+{
+	uint32_t c = 0;
+	uint32_t start = cpu->RREG_POS(i, 16);
 
- armcpu_switchMode(cpu, oldmode);
+	for (uint32_t b = 0; b < 16; ++b)
+	{
+		if (BIT_N(i, 15 - b))
+		{
+			start -= 4;
+			WRITE32(cpu->mem_if->data, start, cpu->R15 - b);
+			c += MMU_memAccessCycles<PROCNUM, 32, MMU_AD_WRITE>(start);
+		}
+	}
 
- return 2 + MMU.MMU_WAIT16cpu->proc_ID(adr>>24)&0xF;
+	cpu->RREG_POS(i, 16) = start;
+	return MMU_aluMemCycles<PROCNUM>(1, c);
 }
 
-//---------------------LDM-----------------------------
-
-#define OP_L_IA(reg, adr) if(BIT##reg(i))\
- {\
- registresreg = READ32(cpu->mem_if->data, start);\
- c += waitState(start>>24)&0xF;\
- adr += 4;\
- }
+TEMPLATE static uint32_t FASTCALL OP_STMIA2(uint32_t i)
+{
+	if (cpu->CPSR.bits.mode == USR)
+		return 2;
 
-#define OP_L_IB(reg, adr) if(BIT##reg(i))\
- {\
- adr += 4;\
- registresreg = READ32(cpu->mem_if->data, start);\
- c += waitState(start>>24)&0xF;\
- }
+	uint32_t c = 0;
+	uint32_t start = cpu->RREG_POS(i, 16);
+	uint32_t oldmode = armcpu_switchMode(cpu, SYS);
 
-#define OP_L_DA(reg, adr) if(BIT##reg(i))\
- {\
- registresreg = READ32(cpu->mem_if->data, start);\
- c += waitState(start>>24)&0xF;\
- adr -= 4;\
- }
+	for (uint32_t b = 0; b < 16; ++b)
+	{
+		if (BIT_N(i, b))
+		{
+			WRITE32(cpu->mem_if->data, start, cpu->Rb);
+			c += MMU_memAccessCycles<PROCNUM, 32, MMU_AD_WRITE>(start);
+			start += 4;
+		}
+	}
 
-#define OP_L_DB(reg, adr) if(BIT##reg(i))\
- {\
- adr -= 4;\
- registresreg = READ32(cpu->mem_if->data, start);\
- c += waitState(start>>24)&0xF;\
- }
+	armcpu_switchMode(cpu, static_cast<uint8_t>(oldmode));
+	return MMU_aluMemCycles<PROCNUM>(1, c);
+}
 
-static u32 FASTCALL OP_LDMIA(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_STMIB2(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 c = 0;
- u32 start = cpu->RREG_POS(i,16);
-
- u32 * registres = cpu->R;
- u32 * waitState = MMU.MMU_WAIT32cpu->proc_ID;
+	if (cpu->CPSR.bits.mode == USR)
+		return 2;
 
- OP_L_IA(0, start);
- OP_L_IA(1, start);
- OP_L_IA(2, start);
- OP_L_IA(3, start);
- OP_L_IA(4, start);
- OP_L_IA(5, start);
- OP_L_IA(6, start);
- OP_L_IA(7, start);
- OP_L_IA(8, start);
- OP_L_IA(9, start);
- OP_L_IA(10, start);
- OP_L_IA(11, start);
- OP_L_IA(12, start);
- OP_L_IA(13, start);
- OP_L_IA(14, start);
+	uint32_t c = 0;
+	uint32_t start = cpu->RREG_POS(i, 16);
+	uint32_t oldmode = armcpu_switchMode(cpu, SYS);
 
- if(BIT15(i))
- {
- u32 tmp = READ32(cpu->mem_if->data, start);
- registres15 = tmp & (0XFFFFFFFC | (BIT0(tmp)<<1));
- cpu->CPSR.bits.T = BIT0(tmp);
- //start += 4;
-	 cpu->next_instruction = registres15;
- c += waitState(start>>24)&0xF;
- }
+	for (uint32_t b = 0; b < 16; ++b)
+	{
+		if (BIT_N(i, b))
+		{
+			start += 4;
+			WRITE32(cpu->mem_if->data, start, cpu->Rb);
+			c += MMU_memAccessCycles<PROCNUM, 32, MMU_AD_WRITE>(start);
+		}
+	}
 
- return c + 2;
+	armcpu_switchMode(cpu, static_cast<uint8_t>(oldmode));
+	return MMU_aluMemCycles<PROCNUM>(1, c);
 }
 
-static u32 FASTCALL OP_LDMIB(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_STMDA2(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 c = 0;
- u32 start = cpu->RREG_POS(i,16);
-
- u32 * registres = cpu->R;
- u32 * waitState = MMU.MMU_WAIT32cpu->proc_ID;
+	if (cpu->CPSR.bits.mode == USR)
+		return 2;
 
- OP_L_IB(0, start);
- OP_L_IB(1, start);
- OP_L_IB(2, start);
- OP_L_IB(3, start);
- OP_L_IB(4, start);
- OP_L_IB(5, start);
- OP_L_IB(6, start);
- OP_L_IB(7, start);
- OP_L_IB(8, start);
- OP_L_IB(9, start);
- OP_L_IB(10, start);
- OP_L_IB(11, start);
- OP_L_IB(12, start);
- OP_L_IB(13, start);
- OP_L_IB(14, start);
+	uint32_t c = 0;
+	uint32_t start = cpu->RREG_POS(i, 16);
+	uint32_t oldmode = armcpu_switchMode(cpu, SYS);
 
- if(BIT15(i))
- {
- u32 tmp;
- start += 4;
- c += waitState(start>>24)&0xF;
- tmp = READ32(cpu->mem_if->data, start);
- registres15 = tmp & (0XFFFFFFFC | (BIT0(tmp)<<1));
- cpu->CPSR.bits.T = BIT0(tmp);
-	 cpu->next_instruction = registres15;
- c += 2 + (c==0);
- }
+	for (uint32_t b = 0; b < 16; ++b)
+	{
+		if (BIT_N(i, 15 - b))
+		{
+			WRITE32(cpu->mem_if->data, start, cpu->R15 - b);
+			c += MMU_memAccessCycles<PROCNUM, 32, MMU_AD_WRITE>(start);
+			start -= 4;
+		}
+	}
 
- return c + 2;
+	armcpu_switchMode(cpu, static_cast<uint8_t>(oldmode));
+	return MMU_aluMemCycles<PROCNUM>(1, c);
 }
 
-static u32 FASTCALL OP_LDMDA(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_STMDB2(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 c = 0;
- u32 start = cpu->RREG_POS(i,16);
-
- u32 * registres = cpu->R;
- u32 * waitState = MMU.MMU_WAIT32cpu->proc_ID;
+	if (cpu->CPSR.bits.mode == USR)
+		return 2;
 
- if(BIT15(i))
- {
- u32 tmp = READ32(cpu->mem_if->data, start);
- registres15 = tmp & (0XFFFFFFFC | (BIT0(tmp)<<1));
- cpu->CPSR.bits.T = BIT0(tmp);
- c += waitState(start>>24)&0xF;
- start -= 4;
-	 cpu->next_instruction = registres15;
- }
+	uint32_t c = 0;
+	uint32_t start = cpu->RREG_POS(i, 16);
+	uint32_t oldmode = armcpu_switchMode(cpu, SYS);
 
- OP_L_DA(14, start);
- OP_L_DA(13, start);
- OP_L_DA(12, start);
- OP_L_DA(11, start);
- OP_L_DA(10, start);
- OP_L_DA(9, start);
- OP_L_DA(8, start);
- OP_L_DA(7, start);
- OP_L_DA(6, start);
- OP_L_DA(5, start);
- OP_L_DA(4, start);
- OP_L_DA(3, start);
- OP_L_DA(2, start);
- OP_L_DA(1, start);
- OP_L_DA(0, start);
+	for (uint32_t b = 0; b < 16; ++b)
+	{
+		if (BIT_N(i, 15 - b))
+		{
+			start -= 4;
+			WRITE32(cpu->mem_if->data, start, cpu->R15 - b);
+			c += MMU_memAccessCycles<PROCNUM, 32, MMU_AD_WRITE>(start);
+		}
+	}
 
- return c + 2;
+	armcpu_switchMode(cpu, static_cast<uint8_t>(oldmode));
+	return MMU_aluMemCycles<PROCNUM>(1, c);
 }
 
-static u32 FASTCALL OP_LDMDB(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_STMIA2_W(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 c = 0;
- u32 start = cpu->RREG_POS(i,16);
+	if (cpu->CPSR.bits.mode == USR)
+		return 2;
 
- u32 * registres = cpu->R;
- u32 * waitState = MMU.MMU_WAIT32cpu->proc_ID;
+	uint32_t c = 0;
+	uint32_t start = cpu->RREG_POS(i, 16);
+	uint32_t oldmode = armcpu_switchMode(cpu, SYS);
 
- if(BIT15(i))
- {
- u32 tmp;
- start -= 4;
- tmp = READ32(cpu->mem_if->data, start);
- registres15 = tmp & (0XFFFFFFFC | (BIT0(tmp)<<1));
- cpu->CPSR.bits.T = BIT0(tmp);
-	 cpu->next_instruction = registres15;
- c += waitState(start>>24)&0xF;
- }
+	for (uint32_t b = 0; b < 16; ++b)
+	{
+		if (BIT_N(i, b))
+		{
+			WRITE32(cpu->mem_if->data, start, cpu->Rb);
+			c += MMU_memAccessCycles<PROCNUM, 32, MMU_AD_WRITE>(start);
+			start += 4;
+		}
+	}
 
- OP_L_DB(14, start);
- OP_L_DB(13, start);
- OP_L_DB(12, start);
- OP_L_DB(11, start);
- OP_L_DB(10, start);
- OP_L_DB(9, start);
- OP_L_DB(8, start);
- OP_L_DB(7, start);
- OP_L_DB(6, start);
- OP_L_DB(5, start);
- OP_L_DB(4, start);
- OP_L_DB(3, start);
- OP_L_DB(2, start);
- OP_L_DB(1, start);
- OP_L_DB(0, start);
+	cpu->RREG_POS(i, 16) = start;
 
- return c + 2;
+	armcpu_switchMode(cpu, static_cast<uint8_t>(oldmode));
+	return MMU_aluMemCycles<PROCNUM>(1, c);
 }
 
-static u32 FASTCALL OP_LDMIA_W(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_STMIB2_W(uint32_t i)
 {
- u32 i = cpu->instruction, c = 0;
- u32 start = cpu->RREG_POS(i,16);
-	 u32 bitList = (~((2 << REG_POS(i,16))-1)) & 0xFFFF;
-
- u32 * registres = cpu->R;
- u32 * waitState = MMU.MMU_WAIT32cpu->proc_ID;
-
- OP_L_IA(0, start);
- OP_L_IA(1, start);
- OP_L_IA(2, start);
- OP_L_IA(3, start);
- OP_L_IA(4, start);
- OP_L_IA(5, start);
- OP_L_IA(6, start);
- OP_L_IA(7, start);
- OP_L_IA(8, start);
- OP_L_IA(9, start);
- OP_L_IA(10, start);
- OP_L_IA(11, start);
- OP_L_IA(12, start);
- OP_L_IA(13, start);
- OP_L_IA(14, start);
+	if (cpu->CPSR.bits.mode == USR)
+		return 2;
 
- if(BIT15(i))
- {
- u32 tmp = READ32(cpu->mem_if->data, start);
- registres15 = tmp & (0XFFFFFFFC | (BIT0(tmp)<<1));
- cpu->CPSR.bits.T = BIT0(tmp);
- c += waitState(start>>24)&0xF;
- start += 4;
-	 cpu->next_instruction = registres15;
- }
+	uint32_t c = 0;
+	uint32_t start = cpu->RREG_POS(i, 16);
+	uint32_t oldmode = armcpu_switchMode(cpu, SYS);
 
-	if(i & (1 << REG_POS(i,16))) {
-		if(i & bitList)
-			cpu->RREG_POS(i,16) = start;
+	for (uint32_t b = 0; b < 16; ++b)
+	{
+		if (BIT_N(i, b))
+		{
+			start += 4;
+			WRITE32(cpu->mem_if->data, start, cpu->Rb);
+			c += MMU_memAccessCycles<PROCNUM, 32, MMU_AD_WRITE>(start);
+		}
 	}
-	else
-		cpu->RREG_POS(i,16) = start;
-
- return c + 2;
-}
 
-static u32 FASTCALL OP_LDMIB_W(armcpu_t *cpu)
-{
- u32 i = cpu->instruction, c = 0;
- u32 start = cpu->RREG_POS(i,16);
-	 u32 bitList = (~((2 << REG_POS(i,16))-1)) & 0xFFFF;
-
- u32 * registres = cpu->R;
- u32 * waitState = MMU.MMU_WAIT32cpu->proc_ID;
-
-	 OP_L_IB(0, start);
- OP_L_IB(1, start);
- OP_L_IB(2, start);
- OP_L_IB(3, start);
- OP_L_IB(4, start);
- OP_L_IB(5, start);
- OP_L_IB(6, start);
- OP_L_IB(7, start);
- OP_L_IB(8, start);
- OP_L_IB(9, start);
- OP_L_IB(10, start);
- OP_L_IB(11, start);
- OP_L_IB(12, start);
- OP_L_IB(13, start);
- OP_L_IB(14, start);
-
- if(BIT15(i))
- {
- u32 tmp;
- start += 4;
- c += waitState(start>>24)&0xF;
- tmp = READ32(cpu->mem_if->data, start);
- registres15 = tmp & (0XFFFFFFFC | (BIT0(tmp)<<1));
- cpu->CPSR.bits.T = BIT0(tmp);
-	 cpu->next_instruction = registres15;
- c += 2 + (c==0);
- }
-
-	if(i & (1 << REG_POS(i,16))) {
-		if(i & bitList)
-			cpu->RREG_POS(i,16) = start;
-	}
-	else
-		cpu->RREG_POS(i,16) = start;
+	armcpu_switchMode(cpu, static_cast<uint8_t>(oldmode));
+	cpu->RREG_POS(i, 16) = start;
 
- return c + 2;
+	return MMU_aluMemCycles<PROCNUM>(1, c);
 }
 
-static u32 FASTCALL OP_LDMDA_W(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_STMDA2_W(uint32_t i)
 {
-	u32 i = cpu->instruction, c = 0;
-	u32 start = cpu->RREG_POS(i,16);
-	u32 bitList = (~((2 << REG_POS(i,16))-1)) & 0xFFFF;
+	if (cpu->CPSR.bits.mode == USR)
+		return 2;
 
-	u32 * registres = cpu->R;
-	u32 * waitState = MMU.MMU_WAIT32cpu->proc_ID;
+	uint32_t c = 0;
+	uint32_t start = cpu->RREG_POS(i, 16);
+	uint32_t oldmode = armcpu_switchMode(cpu, SYS);
 
-	if(BIT15(i))
+	for (uint32_t b = 0; b < 16; ++b)
 	{
-		u32 tmp = READ32(cpu->mem_if->data, start);
-		registres15 = tmp & (0XFFFFFFFC | (BIT0(tmp)<<1));
-		cpu->CPSR.bits.T = BIT0(tmp);
-		c += waitState(start>>24)&0xF;
-		start -= 4;
-		cpu->next_instruction = registres15;
+		if (BIT_N(i, 15 - b))
+		{
+			WRITE32(cpu->mem_if->data, start, cpu->R15 - b);
+			c += MMU_memAccessCycles<PROCNUM, 32, MMU_AD_WRITE>(start);
+			start -= 4;
+		}
 	}
 
-	OP_L_DA(14, start);
-	OP_L_DA(13, start);
-	OP_L_DA(12, start);
-	OP_L_DA(11, start);
-	OP_L_DA(10, start);
-	OP_L_DA(9, start);
-	OP_L_DA(8, start);
-	OP_L_DA(7, start);
-	OP_L_DA(6, start);
-	OP_L_DA(5, start);
-	OP_L_DA(4, start);
-	OP_L_DA(3, start);
-	OP_L_DA(2, start);
-	OP_L_DA(1, start);
-	OP_L_DA(0, start);
-
-	if(i & (1 << REG_POS(i,16))) {
-		if(i & bitList)
-			cpu->RREG_POS(i,16) = start;
-	}
-	else
-		cpu->RREG_POS(i,16) = start;
+	cpu->RREG_POS(i, 16) = start;
 
-	return c + 2;
+	armcpu_switchMode(cpu, static_cast<uint8_t>(oldmode));
+	return MMU_aluMemCycles<PROCNUM>(1, c);
 }
 
-static u32 FASTCALL OP_LDMDB_W(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_STMDB2_W(uint32_t i)
 {
-	u32 i = cpu->instruction, c = 0;
-	u32 start = cpu->RREG_POS(i,16);
-	u32 bitList = (~((2 << REG_POS(i,16))-1)) & 0xFFFF;
-	u32 * registres = cpu->R;
-	u32 * waitState = MMU.MMU_WAIT32cpu->proc_ID;
+	if (cpu->CPSR.bits.mode == USR)
+		return 2;
 
-	if(BIT15(i))
+	uint32_t c = 0;
+	uint32_t start = cpu->RREG_POS(i, 16);
+	uint32_t oldmode = armcpu_switchMode(cpu, SYS);
+
+	for (uint32_t b = 0; b < 16; ++b)
 	{
-		u32 tmp;
-		start -= 4;
-		tmp = READ32(cpu->mem_if->data, start);
-		registres15 = tmp & (0XFFFFFFFC | (BIT0(tmp)<<1));
-		cpu->CPSR.bits.T = BIT0(tmp);
-		cpu->next_instruction = registres15;
-		c += waitState(start>>24)&0xF;
+		if (BIT_N(i, 15 - b))
+		{
+			start -= 4;
+			WRITE32(cpu->mem_if->data, start, cpu->R15 - b);
+			c += MMU_memAccessCycles<PROCNUM, 32, MMU_AD_WRITE>(start);
+		}
 	}
 
-	OP_L_DB(14, start);
-	OP_L_DB(13, start);
-	OP_L_DB(12, start);
-	OP_L_DB(11, start);
-	OP_L_DB(10, start);
-	OP_L_DB(9, start);
-	OP_L_DB(8, start);
-	OP_L_DB(7, start);
-	OP_L_DB(6, start);
-	OP_L_DB(5, start);
-	OP_L_DB(4, start);
-	OP_L_DB(3, start);
-	OP_L_DB(2, start);
-	OP_L_DB(1, start);
-	OP_L_DB(0, start);
-
-	if(i & (1 << REG_POS(i,16))) {
-		if(i & bitList)
-			cpu->RREG_POS(i,16) = start;
-	}
-	else
-		cpu->RREG_POS(i,16) = start;
+	cpu->RREG_POS(i, 16) = start;
 
-	return c + 2;
+	armcpu_switchMode(cpu, static_cast<uint8_t>(oldmode));
+	return MMU_aluMemCycles<PROCNUM>(1, c);
 }
 
-static u32 FASTCALL OP_LDMIA2(armcpu_t *cpu)
-{
- u32 i = cpu->instruction;
- u32 oldmode = 0;
-
- u32 c = 0;
-
- u32 start = cpu->RREG_POS(i,16);
- u32 * registres;
- u32 * waitState;
-
- if(BIT15(i)==0)
- {
- if(cpu->CPSR.bits.mode==USR)
- return 1;
- oldmode = armcpu_switchMode(cpu, SYS);
- }
-
- registres = cpu->R;
- waitState = MMU.MMU_WAIT32cpu->proc_ID;
-
- OP_L_IA(0, start);
- OP_L_IA(1, start);
- OP_L_IA(2, start);
- OP_L_IA(3, start);
- OP_L_IA(4, start);
- OP_L_IA(5, start);
- OP_L_IA(6, start);
- OP_L_IA(7, start);
- OP_L_IA(8, start);
- OP_L_IA(9, start);
- OP_L_IA(10, start);
- OP_L_IA(11, start);
- OP_L_IA(12, start);
- OP_L_IA(13, start);
- OP_L_IA(14, start);
-
- if(BIT15(i))
- {
- u32 tmp = READ32(cpu->mem_if->data, start);
- Status_Reg SPSR;
- cpu->R15 = tmp & (0XFFFFFFFC | (BIT0(tmp)<<1));
- SPSR = cpu->SPSR;
- armcpu_switchMode(cpu, SPSR.bits.mode);
- cpu->CPSR=SPSR;
- //start += 4;
-	 cpu->next_instruction = cpu->R15;
- c += MMU.MMU_WAIT32cpu->proc_ID(start>>24)&0xF;
- }
- else
- {
- armcpu_switchMode(cpu, oldmode);
- }
- return c + 2;
-}
-
-static u32 FASTCALL OP_LDMIB2(armcpu_t *cpu)
-{
- u32 i = cpu->instruction;
- u32 oldmode = 0;
- u32 c = 0;
-
- u32 start = cpu->RREG_POS(i,16);
- u32 * registres;
- u32 * waitState;
- //execute = false;
-	 LOG("Untested opcode: OP_LDMIB2");
-
- if(BIT15(i)==0)
- {
- if(cpu->CPSR.bits.mode==USR)
- return 2;
- oldmode = armcpu_switchMode(cpu, SYS);
- }
-
- registres = cpu->R;
- waitState = MMU.MMU_WAIT32cpu->proc_ID;
-
- OP_L_IB(0, start);
- OP_L_IB(1, start);
- OP_L_IB(2, start);
- OP_L_IB(3, start);
- OP_L_IB(4, start);
- OP_L_IB(5, start);
- OP_L_IB(6, start);
- OP_L_IB(7, start);
- OP_L_IB(8, start);
- OP_L_IB(9, start);
- OP_L_IB(10, start);
- OP_L_IB(11, start);
- OP_L_IB(12, start);
- OP_L_IB(13, start);
- OP_L_IB(14, start);
-
- if(BIT15(i))
- {
- u32 tmp;
- Status_Reg SPSR;
- start += 4;
- tmp = READ32(cpu->mem_if->data, start);
- registres15 = tmp & (0XFFFFFFFC | (BIT0(tmp)<<1));
- SPSR = cpu->SPSR;
- armcpu_switchMode(cpu, SPSR.bits.mode);
- cpu->CPSR=SPSR;
-	 cpu->next_instruction = registres15;
- c += waitState(start>>24)&0xF;
- }
- else
- {
- armcpu_switchMode(cpu, oldmode);
- }
- return c + 2;
-}
-
-static u32 FASTCALL OP_LDMDA2(armcpu_t *cpu)
-{
- u32 i = cpu->instruction;
-
- u32 oldmode = 0;
- u32 c = 0;
- u32 * registres;
- u32 * waitState;
-
- u32 start = cpu->RREG_POS(i,16);
- //execute = false;
-	 LOG("Untested opcode: OP_LDMDA2");
-
- if(BIT15(i)==0)
- {
- if(cpu->CPSR.bits.mode==USR)
- return 2;
- oldmode = armcpu_switchMode(cpu, SYS);
- }
-
- registres = cpu->R;
- waitState = MMU.MMU_WAIT32cpu->proc_ID;
-
- if(BIT15(i))
- {
- u32 tmp = READ32(cpu->mem_if->data, start);
- registres15 = tmp & (0XFFFFFFFC | (BIT0(tmp)<<1));
- cpu->CPSR = cpu->SPSR;
- c += waitState(start>>24)&0xF;
- start -= 4;
-	 cpu->next_instruction = registres15;
- }
-
- OP_L_DA(14, start);
- OP_L_DA(13, start);
- OP_L_DA(12, start);
- OP_L_DA(11, start);
- OP_L_DA(10, start);
- OP_L_DA(9, start);
- OP_L_DA(8, start);
- OP_L_DA(7, start);
- OP_L_DA(6, start);
- OP_L_DA(5, start);
- OP_L_DA(4, start);
- OP_L_DA(3, start);
- OP_L_DA(2, start);
- OP_L_DA(1, start);
- OP_L_DA(0, start);
-
- if(BIT15(i)==0)
- {
- armcpu_switchMode(cpu, oldmode);
- }
- else
- {
- Status_Reg SPSR = cpu->SPSR;
- armcpu_switchMode(cpu, SPSR.bits.mode);
- cpu->CPSR=SPSR;
- }
-
- return c + 2;
-}
-
-static u32 FASTCALL OP_LDMDB2(armcpu_t *cpu)
-{
- u32 i = cpu->instruction;
-
- u32 oldmode = 0;
- u32 c = 0;
- u32 * registres;
- u32 * waitState;
-
- u32 start = cpu->RREG_POS(i,16);
- if(BIT15(i)==0)
- {
- if(cpu->CPSR.bits.mode==USR)
- return 2;
- oldmode = armcpu_switchMode(cpu, SYS);
- }
-
- registres = cpu->R;
- waitState = MMU.MMU_WAIT32cpu->proc_ID;
-
- if(BIT15(i))
- {
- u32 tmp;
- start -= 4;
- tmp = READ32(cpu->mem_if->data, start);
- registres15 = tmp & (0XFFFFFFFC | (BIT0(tmp)<<1));
- cpu->CPSR = cpu->SPSR;
-	 cpu->next_instruction = registres15;
- c += waitState(start>>24)&0xF;
- }
-
- OP_L_DB(14, start);
- OP_L_DB(13, start);
- OP_L_DB(12, start);
- OP_L_DB(11, start);
- OP_L_DB(10, start);
- OP_L_DB(9, start);
- OP_L_DB(8, start);
- OP_L_DB(7, start);
- OP_L_DB(6, start);
- OP_L_DB(5, start);
- OP_L_DB(4, start);
- OP_L_DB(3, start);
- OP_L_DB(2, start);
- OP_L_DB(1, start);
- OP_L_DB(0, start);
-
- if(BIT15(i)==0)
- {
- armcpu_switchMode(cpu, oldmode);
- }
- else
- {
- Status_Reg SPSR = cpu->SPSR;
- armcpu_switchMode(cpu, SPSR.bits.mode);
- cpu->CPSR=SPSR;
- }
-
- return 2 + c;
-}
-
-static u32 FASTCALL OP_LDMIA2_W(armcpu_t *cpu)
-{
- u32 i = cpu->instruction;
- u32 c = 0;
-
- u32 oldmode = 0;
- u32 start = cpu->RREG_POS(i,16);
- u32 * registres;
- u32 * waitState;
- u32 tmp;
- Status_Reg SPSR;
-// execute = false;
- if(BIT15(i)==0)
- {
- if(cpu->CPSR.bits.mode==USR)
- return 2;
- oldmode = armcpu_switchMode(cpu, SYS);
- }
-
- registres = cpu->R;
- waitState = MMU.MMU_WAIT32cpu->proc_ID;
-
- OP_L_IA(0, start);
- OP_L_IA(1, start);
- OP_L_IA(2, start);
- OP_L_IA(3, start);
- OP_L_IA(4, start);
- OP_L_IA(5, start);
- OP_L_IA(6, start);
- OP_L_IA(7, start);
- OP_L_IA(8, start);
- OP_L_IA(9, start);
- OP_L_IA(10, start);
- OP_L_IA(11, start);
- OP_L_IA(12, start);
- OP_L_IA(13, start);
- OP_L_IA(14, start);
-
- if(BIT15(i)==0)
- {
- registresREG_POS(i,16) = start;
- armcpu_switchMode(cpu, oldmode);
- return c + 2;
- }
-
- registresREG_POS(i,16) = start + 4;
- tmp = READ32(cpu->mem_if->data, start);
- registres15 = tmp & (0XFFFFFFFC | (BIT0(tmp)<<1));
- SPSR = cpu->SPSR;
- armcpu_switchMode(cpu, SPSR.bits.mode);
- cpu->CPSR=SPSR;
- cpu->next_instruction = registres15;
- c += waitState(start>>24)&0xF;
-
- return c + 2;
-}
-
-static u32 FASTCALL OP_LDMIB2_W(armcpu_t *cpu)
-{
- u32 i = cpu->instruction;
- u32 c = 0;
-
- u32 oldmode = 0;
- u32 start = cpu->RREG_POS(i,16);
- u32 * registres;
- u32 * waitState;
- u32 tmp;
- Status_Reg SPSR;
-
- if(BIT15(i)==0)
- {
- if(cpu->CPSR.bits.mode==USR)
- return 2;
- oldmode = armcpu_switchMode(cpu, SYS);
- }
-
- registres = cpu->R;
- waitState = MMU.MMU_WAIT32cpu->proc_ID;
-
- OP_L_IB(0, start);
- OP_L_IB(1, start);
- OP_L_IB(2, start);
- OP_L_IB(3, start);
- OP_L_IB(4, start);
- OP_L_IB(5, start);
- OP_L_IB(6, start);
- OP_L_IB(7, start);
- OP_L_IB(8, start);
- OP_L_IB(9, start);
- OP_L_IB(10, start);
- OP_L_IB(11, start);
- OP_L_IB(12, start);
- OP_L_IB(13, start);
- OP_L_IB(14, start);
-
- if(BIT15(i)==0)
- {
- armcpu_switchMode(cpu, oldmode);
- registresREG_POS(i,16) = start;
-
- return c + 2;
- }
-
- registresREG_POS(i,16) = start + 4;
- tmp = READ32(cpu->mem_if->data, start + 4);
- registres15 = tmp & (0XFFFFFFFC | (BIT0(tmp)<<1));
- cpu->CPSR = cpu->SPSR;
- cpu->next_instruction = registres15;
- SPSR = cpu->SPSR;
- armcpu_switchMode(cpu, SPSR.bits.mode);
- cpu->CPSR=SPSR;
- c += waitState(start>>24)&0xF;
-
- return c + 2;
-}
-
-static u32 FASTCALL OP_LDMDA2_W(armcpu_t *cpu)
-{
- u32 i = cpu->instruction;
- u32 c = 0;
-
- u32 oldmode = 0;
- u32 start = cpu->RREG_POS(i,16);
- u32 * registres;
- u32 * waitState;
- Status_Reg SPSR;
-// execute = false;
- if(BIT15(i)==0)
- {
- if(cpu->CPSR.bits.mode==USR)
- return 2;
- oldmode = armcpu_switchMode(cpu, SYS);
- }
-
- registres = cpu->R;
- waitState = MMU.MMU_WAIT32cpu->proc_ID;
-
- if(BIT15(i))
- {
- u32 tmp = READ32(cpu->mem_if->data, start);
- registres15 = tmp & (0XFFFFFFFC | (BIT0(tmp)<<1));
- c += waitState(start>>24)&0xF;
- start -= 4;
- cpu->next_instruction = registres15;
- }
-
- OP_L_DA(14, start);
- OP_L_DA(13, start);
- OP_L_DA(12, start);
- OP_L_DA(11, start);
- OP_L_DA(10, start);
- OP_L_DA(9, start);
- OP_L_DA(8, start);
- OP_L_DA(7, start);
- OP_L_DA(6, start);
- OP_L_DA(5, start);
- OP_L_DA(4, start);
- OP_L_DA(3, start);
- OP_L_DA(2, start);
- OP_L_DA(1, start);
- OP_L_DA(0, start);
-
- registresREG_POS(i,16) = start;
-
- if(BIT15(i)==0)
- {
- armcpu_switchMode(cpu, oldmode);
- return c + 2;
- }
-
- SPSR = cpu->SPSR;
- armcpu_switchMode(cpu, SPSR.bits.mode);
- cpu->CPSR=SPSR;
- return c + 2;
-}
-
-static u32 FASTCALL OP_LDMDB2_W(armcpu_t *cpu)
-{
- u32 i = cpu->instruction;
- u32 c = 0;
-
- u32 oldmode = 0;
- u32 start = cpu->RREG_POS(i,16);
- u32 * registres;
- u32 * waitState;
- Status_Reg SPSR;
-// execute = false;
- if(BIT15(i)==0)
- {
- if(cpu->CPSR.bits.mode==USR)
- return 2;
- oldmode = armcpu_switchMode(cpu, SYS);
- }
-
- registres = cpu->R;
- waitState = MMU.MMU_WAIT32cpu->proc_ID;
-
- if(BIT15(i))
- {
- u32 tmp;
- start -= 4;
- tmp = READ32(cpu->mem_if->data, start);
- c += waitState(start>>24)&0xF;
- registres15 = tmp & (0XFFFFFFFC | (BIT0(tmp)<<1));
- cpu->CPSR = cpu->SPSR;
- cpu->next_instruction = registres15;
- }
-
- OP_L_DB(14, start);
- OP_L_DB(13, start);
- OP_L_DB(12, start);
- OP_L_DB(11, start);
- OP_L_DB(10, start);
- OP_L_DB(9, start);
- OP_L_DB(8, start);
- OP_L_DB(7, start);
- OP_L_DB(6, start);
- OP_L_DB(5, start);
- OP_L_DB(4, start);
- OP_L_DB(3, start);
- OP_L_DB(2, start);
- OP_L_DB(1, start);
- OP_L_DB(0, start);
-
- registresREG_POS(i,16) = start;
-
- if(BIT15(i)==0)
- {
- armcpu_switchMode(cpu, oldmode);
- return c + 2;
- }
-
- SPSR = cpu->SPSR;
- armcpu_switchMode(cpu, SPSR.bits.mode);
- cpu->CPSR=SPSR;
- return c + 2;
-}
-
-//------------------------------STM----------------------------------
-
-static u32 FASTCALL OP_STMIA(armcpu_t *cpu)
-{
- u32 i = cpu->instruction, c = 0, b;
- u32 start = cpu->RREG_POS(i,16);
-
- for(b=0; b<16; ++b)
- {
- if(BIT_N(i, b))
- {
- WRITE32(cpu->mem_if->data, start, cpu->Rb);
- c += MMU.MMU_WAIT32cpu->proc_ID(start>>24)&0xF;
- start += 4;
- }
- }
- return c + 1;
-}
-
-static u32 FASTCALL OP_STMIB(armcpu_t *cpu)
-{
- u32 i = cpu->instruction, c = 0, b;
- u32 start = cpu->RREG_POS(i,16);
-
- for(b=0; b<16; ++b)
- {
- if(BIT_N(i, b))
- {
- start += 4;
- WRITE32(cpu->mem_if->data, start, cpu->Rb);
- c += MMU.MMU_WAIT32cpu->proc_ID(start>>24)&0xF;
- }
- }
- return c + 1;
-}
-
-static u32 FASTCALL OP_STMDA(armcpu_t *cpu)
-{
- u32 i = cpu->instruction, c = 0, b;
- u32 start = cpu->RREG_POS(i,16);
-
- for(b=0; b<16; ++b)
- {
- if(BIT_N(i, 15-b))
- {
- WRITE32(cpu->mem_if->data, start, cpu->R15-b);
- c += MMU.MMU_WAIT32cpu->proc_ID(start>>24)&0xF;
- start -= 4;
- }
- }
- return c + 1;
-}
-
-static u32 FASTCALL OP_STMDB(armcpu_t *cpu)
-{
- u32 i = cpu->instruction, c = 0, b;
- u32 start = cpu->RREG_POS(i,16);
-
- for(b=0; b<16; ++b)
- {
- if(BIT_N(i, 15-b))
- {
- start -= 4;
- WRITE32(cpu->mem_if->data, start, cpu->R15-b);
- c += MMU.MMU_WAIT32cpu->proc_ID(start>>24)&0xF;
- }
- }
- return c + 1;
-}
-
-static u32 FASTCALL OP_STMIA_W(armcpu_t *cpu)
-{
- u32 i = cpu->instruction, c = 0, b;
- u32 start = cpu->RREG_POS(i,16);
-
- for(b=0; b<16; ++b)
- {
- if(BIT_N(i, b))
- {
- WRITE32(cpu->mem_if->data, start, cpu->Rb);
- c += MMU.MMU_WAIT32cpu->proc_ID(start>>24)&0xF;
- start += 4;
- }
- }
-
- cpu->RREG_POS(i,16) = start;
- return c + 1;
-}
-
-static u32 FASTCALL OP_STMIB_W(armcpu_t *cpu)
-{
- u32 i = cpu->instruction, c = 0, b;
- u32 start = cpu->RREG_POS(i,16);
-
- for(b=0; b<16; ++b)
- {
- if(BIT_N(i, b))
- {
- start += 4;
- WRITE32(cpu->mem_if->data, start, cpu->Rb);
- c += MMU.MMU_WAIT32cpu->proc_ID(start>>24)&0xF;
- }
- }
- cpu->RREG_POS(i,16) = start;
- return c + 1;
-}
-
-static u32 FASTCALL OP_STMDA_W(armcpu_t *cpu)
-{
- u32 i = cpu->instruction, c = 0, b;
- u32 start = cpu->RREG_POS(i,16);
-
- for(b=0; b<16; ++b)
- {
- if(BIT_N(i, 15-b))
- {
- WRITE32(cpu->mem_if->data, start, cpu->R15-b);
- c += MMU.MMU_WAIT32cpu->proc_ID(start>>24)&0xF;
- start -= 4;
- }
- }
-
- cpu->RREG_POS(i,16) = start;
- return c + 1;
-}
-
-static u32 FASTCALL OP_STMDB_W(armcpu_t *cpu)
-{
- u32 i = cpu->instruction, c = 0, b;
- u32 start = cpu->RREG_POS(i,16);
-
- for(b=0; b<16; ++b)
- {
- if(BIT_N(i, 15-b))
- {
- start -= 4;
- WRITE32(cpu->mem_if->data, start, cpu->R15-b);
- c += MMU.MMU_WAIT32cpu->proc_ID(start>>24)&0xF;
- }
- }
-
- cpu->RREG_POS(i,16) = start;
- return c + 1;
-}
-
-static u32 FASTCALL OP_STMIA2(armcpu_t *cpu)
-{
- u32 i, c, b;
- u32 start;
- u32 oldmode;
-
- if(cpu->CPSR.bits.mode==USR)
- return 2;
-
- i = cpu->instruction;
- c = 0;
- start = cpu->RREG_POS(i,16);
- oldmode = armcpu_switchMode(cpu, SYS);
-
- //execute = false;
-	 LOG("Untested opcode: OP_STMIA2");
-
- for(b=0; b<16; ++b)
- {
- if(BIT_N(i, b))
- {
- WRITE32(cpu->mem_if->data, start, cpu->Rb);
- c += MMU.MMU_WAIT32cpu->proc_ID(start>>24)&0xF;
- start += 4;
- }
- }
-
- armcpu_switchMode(cpu, oldmode);
- return c + 1;
-}
-
-static u32 FASTCALL OP_STMIB2(armcpu_t *cpu)
-{
- u32 i, c, b;
- u32 start;
- u32 oldmode;
-
- if(cpu->CPSR.bits.mode==USR)
- return 2;
-
- i = cpu->instruction;
- c = 0;
- start = cpu->RREG_POS(i,16);
- oldmode = armcpu_switchMode(cpu, SYS);
-
- //execute = false;
-	 LOG("Untested opcode: OP_STMIB2");
-
- for(b=0; b<16; ++b)
- {
- if(BIT_N(i, b))
- {
- start += 4;
- WRITE32(cpu->mem_if->data, start, cpu->Rb);
- c += MMU.MMU_WAIT32cpu->proc_ID(start>>24)&0xF;
- }
- }
-
- armcpu_switchMode(cpu, oldmode);
- return c + 1;
-}
-
-static u32 FASTCALL OP_STMDA2(armcpu_t *cpu)
-{
- u32 i, c, b;
- u32 start;
- u32 oldmode;
-
- if(cpu->CPSR.bits.mode==USR)
- return 2;
-
- i = cpu->instruction;
- c = 0;
- start = cpu->RREG_POS(i,16);
- oldmode = armcpu_switchMode(cpu, SYS);
-
- //execute = false;
-	 LOG("Untested opcode: OP_STMDA2");
-
- for(b=0; b<16; ++b)
- {
- if(BIT_N(i, 15-b))
- {
- WRITE32(cpu->mem_if->data, start, cpu->R15-b);
- c += MMU.MMU_WAIT32cpu->proc_ID(start>>24)&0xF;
- start -= 4;
- }
- }
-
- armcpu_switchMode(cpu, oldmode);
- return c + 1;
-}
-
-static u32 FASTCALL OP_STMDB2(armcpu_t *cpu)
-{
- u32 i, c, b;
- u32 start;
- u32 oldmode;
-
- if(cpu->CPSR.bits.mode==USR)
- return 2;
- i = cpu->instruction;
- c=0;
- start = cpu->RREG_POS(i,16);
- oldmode = armcpu_switchMode(cpu, SYS);
-
- for(b=0; b<16; ++b)
- {
- if(BIT_N(i, 15-b))
- {
- start -= 4;
- WRITE32(cpu->mem_if->data, start, cpu->R15-b);
- c += MMU.MMU_WAIT32cpu->proc_ID(start>>24)&0xF;
- }
- }
-
- armcpu_switchMode(cpu, oldmode);
- return c + 1;
-}
-
-static u32 FASTCALL OP_STMIA2_W(armcpu_t *cpu)
-{
- u32 i, c, b;
- u32 start;
- u32 oldmode;
-
- if(cpu->CPSR.bits.mode==USR)
- return 2;
-
- i = cpu->instruction;
- c=0;
- start = cpu->RREG_POS(i,16);
- oldmode = armcpu_switchMode(cpu, SYS);
-
- //execute = false;
-	 LOG("Untested opcode: OP_STMIA2_W");
-
- for(b=0; b<16; ++b)
- {
- if(BIT_N(i, b))
- {
- WRITE32(cpu->mem_if->data, start, cpu->Rb);
- c += MMU.MMU_WAIT32cpu->proc_ID(start>>24)&0xF;
- start += 4;
- }
- }
-
- cpu->RREG_POS(i,16) = start;
-
- armcpu_switchMode(cpu, oldmode);
- return c + 1;
-}
-
-static u32 FASTCALL OP_STMIB2_W(armcpu_t *cpu)
-{
- u32 i, c, b;
- u32 start;
- u32 oldmode;
-
- if(cpu->CPSR.bits.mode==USR)
- return 2;
- i = cpu->instruction;
- c=0;
- start = cpu->RREG_POS(i,16);
- oldmode = armcpu_switchMode(cpu, SYS);
-
- for(b=0; b<16; ++b)
- {
- if(BIT_N(i, b))
- {
- start += 4;
- WRITE32(cpu->mem_if->data, start, cpu->Rb);
- c += MMU.MMU_WAIT32cpu->proc_ID(start>>24)&0xF;
- }
- }
- armcpu_switchMode(cpu, oldmode);
- cpu->RREG_POS(i,16) = start;
-
- return c + 1;
-}
-
-static u32 FASTCALL OP_STMDA2_W(armcpu_t *cpu)
-{
- u32 i, c, b;
- u32 start;
- u32 oldmode;
-
- if(cpu->CPSR.bits.mode==USR)
- return 2;
-
- i = cpu->instruction;
- c = 0;
- start = cpu->RREG_POS(i,16);
- oldmode = armcpu_switchMode(cpu, SYS);
- //execute = false;
-	 LOG("Untested opcode: OP_STMDA2_W");
-
- for(b=0; b<16; ++b)
- {
- if(BIT_N(i, 15-b))
- {
- WRITE32(cpu->mem_if->data, start, cpu->R15-b);
- c += MMU.MMU_WAIT32cpu->proc_ID(start>>24)&0xF;
- start -= 4;
- }
- }
-
- cpu->RREG_POS(i,16) = start;
-
- armcpu_switchMode(cpu, oldmode);
- return c + 1;
-}
-
-static u32 FASTCALL OP_STMDB2_W(armcpu_t *cpu)
-{
- u32 i, c, b;
- u32 start;
- u32 oldmode;
-
- if(cpu->CPSR.bits.mode==USR)
- return 2;
-
- i = cpu->instruction;
- c = 0;
-
- start = cpu->RREG_POS(i,16);
- oldmode = armcpu_switchMode(cpu, SYS);
-
- //execute = false;
-	 LOG("Untested opcode: OP_STMDB2_W");
-
- for(b=0; b<16; ++b)
- {
- if(BIT_N(i, 15-b))
- {
- start -= 4;
- WRITE32(cpu->mem_if->data, start, cpu->R15-b);
- c += MMU.MMU_WAIT32cpu->proc_ID(start>>24)&0xF;
- }
- }
-
- cpu->RREG_POS(i,16) = start;
+// -----------------------------------------------------------------------------
+// LDRD / STRD
+// -----------------------------------------------------------------------------
 
- armcpu_switchMode(cpu, oldmode);
- return c + 1;
-}
-
-/*
- *
- * The Enhanced DSP Extension LDRD and STRD instructions.
- *
- */
-static u32 FASTCALL
-OP_LDRD_STRD_POST_INDEX( armcpu_t *cpu) {
- u32 i = cpu->instruction;
- u32 Rd_num = REG_POS( i, 12);
- u32 addr = cpu->RREG_POS(i,16);
- u32 index;
+TEMPLATE static uint32_t FASTCALL OP_LDRD_STRD_POST_INDEX(uint32_t i)
+{
+	uint32_t Rd_num = REG_POS(i, 12);
+	uint32_t addr = cpu->RREG_POS(i, 16);
+	uint32_t index;
 
- /* I bit - immediate or register */
- if ( BIT22(i))
- index = IMM_OFF;
- else
- index = cpu->RREG_POS(i,0);
+	//fprintf(stderr, "%s POST\n", BIT5(i)?"STRD":"LDRD");
+	/* I bit - immediate or register */
+	if (BIT22(i))
+		index = IMM_OFF;
+	else
+		index = cpu->RREG_POS(i, 0);
 
- /* U bit - add or subtract */
- if ( BIT23(i))
- cpu->RREG_POS(i,16) += index;
- else
- cpu->RREG_POS(i,16) -= index;
+	// U bit - add or subtract
+	if (BIT23(i))
+		cpu->RREG_POS(i, 16) += index;
+	else
+		cpu->RREG_POS(i, 16) -= index;
 
- if ( !(Rd_num & 0x1)) {
- /* Store/Load */
- if ( BIT5(i)) {
- WRITE32(cpu->mem_if->data, addr, cpu->RRd_num);
- WRITE32(cpu->mem_if->data, addr + 4, cpu->RRd_num + 1);
- }
- else {
- cpu->RRd_num = READ32(cpu->mem_if->data, addr);
- cpu->RRd_num + 1 = READ32(cpu->mem_if->data, addr + 4);
- }
- }
+	uint32_t c = 0;
+	if (!(Rd_num & 0x1))
+	{
+		// Store/Load
+		if (BIT5(i))
+		{
+			WRITE32(cpu->mem_if->data, addr, cpu->RRd_num);
+			WRITE32(cpu->mem_if->data, addr + 4, cpu->RRd_num + 1);
+			c += MMU_memAccessCycles<PROCNUM, 32, MMU_AD_WRITE>(addr);
+			c += MMU_memAccessCycles<PROCNUM, 32, MMU_AD_WRITE>(addr + 4);
+		}
+		else
+		{
+			cpu->RRd_num = READ32(cpu->mem_if->data, addr);
+			cpu->RRd_num + 1 = READ32(cpu->mem_if->data, addr + 4);
+			c += MMU_memAccessCycles<PROCNUM, 32, MMU_AD_READ>(addr);
+			c += MMU_memAccessCycles<PROCNUM, 32, MMU_AD_READ>(addr + 4);
+		}
+	}
 
- return 3 + (MMU.MMU_WAIT32cpu->proc_ID(addr>>24)&0xF * 2);
+	return MMU_aluMemCycles<PROCNUM>(3, c);
 }
 
-static u32 FASTCALL
-OP_LDRD_STRD_OFFSET_PRE_INDEX( armcpu_t *cpu) {
- u32 i = cpu->instruction;
- u32 Rd_num = REG_POS( i, 12);
- u32 addr = cpu->RREG_POS(i,16);
- u32 index;
-
- /* I bit - immediate or register */
- if ( BIT22(i))
- index = IMM_OFF;
- else
- index = cpu->RREG_POS(i,0);
-
- /* U bit - add or subtract */
- if ( BIT23(i)) {
- addr += index;
+TEMPLATE static uint32_t FASTCALL OP_LDRD_STRD_OFFSET_PRE_INDEX(uint32_t i)
+{
+	uint32_t Rd_num = REG_POS(i, 12);
+	uint32_t addr = cpu->RREG_POS(i, 16);
+	uint32_t index;
 
- /* W bit - writeback */
- if ( BIT21(i))
- cpu->RREG_POS(i,16) = addr;
- }
- else {
- addr -= index;
+	//fprintf(stderr, "%s PRE\n", BIT5(i)?"STRD":"LDRD");
+	// I bit - immediate or register
+	if (BIT22(i))
+		index = IMM_OFF;
+	else
+		index = cpu->RREG_POS(i, 0);
 
- /* W bit - writeback */
- if ( BIT21(i))
- cpu->RREG_POS(i,16) = addr;
- }
+	// U bit - add or subtract
+	if (BIT23(i))
+		addr += index;
+	else
+		addr -= index;
 
- if ( !(Rd_num & 0x1)) {
- /* Store/Load */
- if ( BIT5(i)) {
- WRITE32(cpu->mem_if->data, addr, cpu->RRd_num);
- WRITE32(cpu->mem_if->data, addr + 4, cpu->RRd_num + 1);
- }
- else {
- cpu->RRd_num = READ32(cpu->mem_if->data, addr);
- cpu->RRd_num + 1 = READ32(cpu->mem_if->data, addr + 4);
- }
- }
+	uint32_t c = 0;
+	if (!(Rd_num & 0x1))
+	{
+		// Store/Load
+		if (BIT5(i))
+		{
+			WRITE32(cpu->mem_if->data, addr, cpu->RRd_num);
+			WRITE32(cpu->mem_if->data, addr + 4, cpu->RRd_num + 1);
+			c += MMU_memAccessCycles<PROCNUM, 32, MMU_AD_WRITE>(addr);
+			c += MMU_memAccessCycles<PROCNUM, 32, MMU_AD_WRITE>(addr + 4);
+			// W bit - writeback
+			if (BIT21(i))
+				cpu->RREG_POS(i, 16) = addr;
+		}
+		else
+		{
+			// W bit - writeback
+			if (BIT21(i))
+				cpu->RREG_POS(i, 16) = addr;
+			cpu->RRd_num = READ32(cpu->mem_if->data, addr);
+			cpu->RRd_num + 1 = READ32(cpu->mem_if->data, addr + 4);
+			c += MMU_memAccessCycles<PROCNUM, 32, MMU_AD_READ>(addr);
+			c += MMU_memAccessCycles<PROCNUM, 32, MMU_AD_READ>(addr + 4);
+		}
+	}
 
- return 3 + (MMU.MMU_WAIT32cpu->proc_ID(addr>>24)&0xF * 2);
+	return MMU_aluMemCycles<PROCNUM>(3, c);
 }
 
+// -----------------------------------------------------------------------------
+// STC
+// the NDS has no coproc that responses to a STC, no feedback is given to the arm
+// -----------------------------------------------------------------------------
 
-
-//---------------------STC----------------------------------
-
-static u32 FASTCALL OP_STC_P_IMM_OFF(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_STC_P_IMM_OFF(uint32_t)
 {
- {
-		/* the NDS has no coproc that responses to a STC, no feedback is given to the arm */
- return 2;
- }
+	//INFO("OP_STC_P_IMM_OFF\n");
+	return TRAPUNDEF(cpu);
 }
 
-static u32 FASTCALL OP_STC_M_IMM_OFF(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_STC_M_IMM_OFF(uint32_t)
 {
- {
-		/* the NDS has no coproc that responses to a STC, no feedback is given to the arm */
- return 2;
- }
+	//INFO("OP_STC_M_IMM_OFF\n");
+	return TRAPUNDEF(cpu);
 }
 
-static u32 FASTCALL OP_STC_P_PREIND(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_STC_P_PREIND(uint32_t)
 {
- {
-		/* the NDS has no coproc that responses to a STC, no feedback is given to the arm */
- return 2;
- }
+	//INFO("OP_STC_P_PREIND\n");
+	return TRAPUNDEF(cpu);
 }
 
-static u32 FASTCALL OP_STC_M_PREIND(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_STC_M_PREIND(uint32_t)
 {
- {
-		/* the NDS has no coproc that responses to a STC, no feedback is given to the arm */
- return 2;
- }
+	//INFO("OP_STC_M_PREIND\n");
+	return TRAPUNDEF(cpu);
 }
 
-static u32 FASTCALL OP_STC_P_POSTIND(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_STC_P_POSTIND(uint32_t)
 {
- {
-		/* the NDS has no coproc that responses to a STC, no feedback is given to the arm */
- return 2;
- }
+	//INFO("OP_STC_P_POSTIND: cp_num %i\n", (i>>8)&0x0F);
+	return TRAPUNDEF(cpu);
 }
 
-static u32 FASTCALL OP_STC_M_POSTIND(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_STC_M_POSTIND(uint32_t)
 {
- {
-		/* the NDS has no coproc that responses to a STC, no feedback is given to the arm */
- return 2;
- }
+	//INFO("OP_STC_M_POSTIND\n");
+	return TRAPUNDEF(cpu);
 }
 
-static u32 FASTCALL OP_STC_OPTION(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_STC_OPTION(uint32_t)
 {
- {
-		/* the NDS has no coproc that responses to a STC, no feedback is given to the arm */
- return 2;
- }
+	//INFO("OP_STC_OPTION\n");
+	return TRAPUNDEF(cpu);
 }
 
-//---------------------LDC----------------------------------
+// -----------------------------------------------------------------------------
+// LDC
+// the NDS has no coproc that responses to a LDC, no feedback is given to the arm
+// -----------------------------------------------------------------------------
 
-static u32 FASTCALL OP_LDC_P_IMM_OFF(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_LDC_P_IMM_OFF(uint32_t)
 {
- {
-		/* the NDS has no coproc that responses to a LDC, no feedback is given to the arm */
- return 2;
- }
+	//INFO("OP_LDC_P_IMM_OFF\n");
+	return TRAPUNDEF(cpu);
 }
 
-static u32 FASTCALL OP_LDC_M_IMM_OFF(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_LDC_M_IMM_OFF(uint32_t)
 {
- {
-		/* the NDS has no coproc that responses to a LDC, no feedback is given to the arm */
- return 2;
- }
+	//INFO("OP_LDC_M_IMM_OFF\n");
+	return TRAPUNDEF(cpu);
 }
 
-static u32 FASTCALL OP_LDC_P_PREIND(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_LDC_P_PREIND(uint32_t)
 {
- {
-		/* the NDS has no coproc that responses to a LDC, no feedback is given to the arm */
- return 2;
- }
+	//INFO("OP_LDC_P_PREIND\n");
+	return TRAPUNDEF(cpu);
 }
 
-static u32 FASTCALL OP_LDC_M_PREIND(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_LDC_M_PREIND(uint32_t)
 {
- {
-		/* the NDS has no coproc that responses to a LDC, no feedback is given to the arm */
- return 2;
- }
+	//INFO("OP_LDC_M_PREIND\n");
+	return TRAPUNDEF(cpu);
 }
 
-static u32 FASTCALL OP_LDC_P_POSTIND(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_LDC_P_POSTIND(uint32_t)
 {
- {
-		/* the NDS has no coproc that responses to a LDC, no feedback is given to the arm */
- return 2;
- }
+	//INFO("OP_LDC_P_POSTIND\n");
+	return TRAPUNDEF(cpu);
 }
 
-static u32 FASTCALL OP_LDC_M_POSTIND(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_LDC_M_POSTIND(uint32_t)
 {
- {
-		/* the NDS has no coproc that responses to a LDC, no feedback is given to the arm */
- return 2;
- }
+	//INFO("OP_LDC_M_POSTIND\n");
+	return TRAPUNDEF(cpu);
 }
 
-static u32 FASTCALL OP_LDC_OPTION(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_LDC_OPTION(uint32_t)
 {
- {
-		/* the NDS has no coproc that responses to a LDC, no feedback is given to the arm */
- return 2;
- }
+	//INFO("OP_LDC_OPTION\n");
+	return TRAPUNDEF(cpu);
 }
 
-//----------------MCR-----------------------
+// -----------------------------------------------------------------------------
+// MCR / MRC
+// -----------------------------------------------------------------------------
 
-static u32 FASTCALL OP_MCR(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_MCR(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 cpnum = REG_POS(i, 8);
+	uint32_t cpnum = REG_POS(i, 8);
+
+	if (cpnum != 15)
+		return 2;
 
- if(!cpu->coproccpnum)
- {
- execute = false;
- return 2;
- }
+	cp15.moveARM2CP(cpu->RREG_POS(i, 12), REG_POS(i, 16), REG_POS(i, 0), (i >> 21) & 0x7, (i >> 5) & 0x7);
 
-	 armcp15_moveARM2CP((armcp15_t*)cpu->coproccpnum, cpu->RREG_POS(i, 12), REG_POS(i, 16), REG_POS(i, 0), (i>>21)&7, (i>>5)&7);
-			 //cpu->coproccpnum->moveARM2CP(cpu->RREG_POS(i, 12), REG_POS(i, 16), REG_POS(i, 0), (i>>21)&7, (i>>5)&7);
- return 2;
+	return 2;
 }
 
-//----------------MRC-----------------------
-
-static u32 FASTCALL OP_MRC(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_MRC(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 cpnum = REG_POS(i, 8);
+	//if (PROCNUM != 0) return 1;
 
- if(!cpu->coproccpnum)
- {
- execute = false;
- return 2;
- }
+	uint32_t cpnum = REG_POS(i, 8);
 
-	 armcp15_moveCP2ARM((armcp15_t*)cpu->coproccpnum, &cpu->RREG_POS(i, 12), REG_POS(i, 16), REG_POS(i, 0), (i>>21)&7, (i>>5)&7);
- //cpu->coproccpnum->moveCP2ARM(&cpu->RREG_POS(i, 12), REG_POS(i, 16), REG_POS(i, 0), (i>>21)&7, (i>>5)&7);
- return 4;
+	if (cpnum != 15)
+		return 2;
+
+	// ARM REF:
+	//data = value from Coprocessorcp_num
+	//if Rd is R15 then
+	//	N flag = data31
+	//	Z flag = data30
+	//	C flag = data29
+	//	V flag = data28
+	//else /* Rd is not R15 */
+	//	Rd = data
+
+	uint32_t data = 0;
+	cp15.moveCP2ARM(&data, REG_POS(i, 16), REG_POS(i, 0), (i >> 21) & 0x7, (i >> 5) & 0x7);
+	if (REG_POS(i, 12) == 15)
+	{
+		cpu->CPSR.bits.N = BIT31(data);
+		cpu->CPSR.bits.Z = BIT30(data);
+		cpu->CPSR.bits.C = BIT29(data);
+		cpu->CPSR.bits.V = BIT28(data);
+	}
+	else
+		cpu->RREG_POS(i, 12) = data;
+	//cpu->coproccpnum->moveCP2ARM(&cpu->RREG_POS(i, 12), REG_POS(i, 16), REG_POS(i, 0), (i>>21)&7, (i>>5)&7);
+	return 4;
 }
 
-//--------------SWI-------------------------------
-static u32 FASTCALL OP_SWI(armcpu_t *cpu)
+// -----------------------------------------------------------------------------
+// SWI
+// -----------------------------------------------------------------------------
+
+TEMPLATE static uint32_t FASTCALL OP_SWI(uint32_t i)
 {
- if (((cpu->intVector != 0) ^ (cpu->proc_ID == ARMCPU_ARM9)))
- {
- /* TODO (#1#): translocated SWI vectors */
- /* we use an irq thats not in the irq tab, as
- it was replaced duie to a changed intVector */
- Status_Reg tmp = cpu->CPSR;
- armcpu_switchMode(cpu, SVC); /* enter svc mode */
- cpu->R14 = cpu->R15 - 4; /* jump to swi Vector */
- cpu->SPSR = tmp; /* save old CPSR as new SPSR */
- cpu->CPSR.bits.T = 0; /* handle as ARM32 code */
- cpu->CPSR.bits.I = cpu->SPSR.bits.I; /* keep int disable flag */
- cpu->R15 = cpu->intVector + 0x08;
- cpu->next_instruction = cpu->R15;
- return 4;
- }
- else
- {
- u32 swinum = (cpu->instruction>>16)&0x1F;
- return cpu->swi_tabswinum(cpu) + 3;
- }
+	uint32_t swinum = (i >> 16) & 0xFF;
+
+	// ideas-style debug prints (execute this SWI with the null terminated string address in R0)
+	if (swinum == 0xFC)
+		return 0;
+
+	// if the user has changed the intVector to point away from the nds bioses,
+	// then it doesn't really make any sense to use the builtin SWI's since
+	// the bios ones aren't getting called anyway
+	bool bypassBuiltinSWI = (cpu->intVector == 0x00000000 && !PROCNUM) || (cpu->intVector == 0xFFFF0000 && PROCNUM == 1);
+
+	if (cpu->swi_tab && !bypassBuiltinSWI)
+	{
+		swinum &= 0x1F;
+		//fprintf(stderr, "%d ARM SWI %d \n",PROCNUM,swinum);
+		return cpu->swi_tabswinum() + 3;
+	}
+	else
+	{
+		/* TODO (#1#): translocated SWI vectors */
+		/* we use an irq thats not in the irq tab, as
+		 it was replaced duie to a changed intVector */
+		Status_Reg tmp = cpu->CPSR;
+		armcpu_switchMode(cpu, SVC); /* enter svc mode */
+		cpu->R14 = cpu->next_instruction;
+		cpu->SPSR = tmp; /* save old CPSR as new SPSR */
+		cpu->CPSR.bits.T = 0; /* handle as ARM32 code */
+		cpu->CPSR.bits.I = 1;
+		cpu->changeCPSR();
+		cpu->R15 = cpu->intVector + 0x08;
+		cpu->next_instruction = cpu->R15;
+		return 3;
+	}
 }
 
-//----------------BKPT-------------------------
-static u32 FASTCALL OP_BKPT(armcpu_t *cpu)
-{
- execute = false;
- return 4;
+// -----------------------------------------------------------------------------
+// BKPT
+// -----------------------------------------------------------------------------
+
+TEMPLATE static uint32_t FASTCALL OP_BKPT(uint32_t /*i*/)
+{
+	/* ARM-ref
+	if (not overridden by debug hardware)
+		R14_abt = address of BKPT instruction + 4
+		SPSR_abt = CPSR
+		CPSR4:0 = 0b10111 // Enter Abort mode
+		CPSR5 = 0 // Execute in ARM state
+		// CPSR6 is unchanged
+		CPSR7 = 1 // Disable normal interrupts
+		CPSR8 = 1 // Disable imprecise aborts - v6 only
+		CPSR9 = CP15_reg1_EEbit
+		if high vectors configured then
+			PC = 0xFFFF000C
+		else
+			PC = 0x0000000C
+	*/
+
+	/*
+	static uint32_t last_bkpt = 0xFFFFFFFF;
+	if(i != last_bkpt)
+		fprintf(stderr, "ARM OP_BKPT triggered\n");
+	last_bkpt = i;
+
+	//this is not 100% correctly emulated, but it does the job
+	cpu->next_instruction = cpu->instruct_adr;
+	return 4;
+	*/
+
+	fprintf(stderr, "ARM OP_BKPT triggered\n");
+	Status_Reg tmp = cpu->CPSR;
+	armcpu_switchMode(cpu, ABT); // enter abt mode
+	cpu->R14 = cpu->instruct_adr + 4;
+	cpu->SPSR = tmp; // save old CPSR as new SPSR
+	cpu->CPSR.bits.T = 0; // handle as ARM32 code
+	cpu->CPSR.bits.I = 1;
+	cpu->changeCPSR();
+	cpu->R15 = cpu->intVector + 0x0C;
+	cpu->next_instruction = cpu->R15;
+	return 4;
 }
 
-//----------------CDP-----------------------
+// -----------------------------------------------------------------------------
+// CDP
+// -----------------------------------------------------------------------------
 
-static u32 FASTCALL OP_CDP(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_CDP(uint32_t)
 {
- execute = false;
- return 4;
+	//INFO("Stopped (OP_CDP) \n");
+	return TRAPUNDEF(cpu);
 }
 
-#define TYPE_RETOUR u32
-#define PARAMETRES armcpu_t *cpu
-#define CALLTYPE FASTCALL
-#define NOM_TAB arm_instructions_set
+//-----------------------------------------------------------------------------
+// The End
+//-----------------------------------------------------------------------------
 
+const OpFunc arm_instructions_set24096 =
+{
+	{
+#define TABDECL(x) x<0>
+#include "instruction_tabdef.inc"
+#undef TABDECL
+	},
+	{
+#define TABDECL(x) x<1>
 #include "instruction_tabdef.inc"
+#undef TABDECL
+	}
+};

audacious-plugins-3.6.2-gtk3.tar.bz2/src/xsf/desmume/armcpu.cc -> audacious-plugins-4.4.1.tar.bz2/src/xsf/desmume/armcpu.cc Changed

@@ -1,187 +1,82 @@
-/* Copyright (C) 2006 yopyop
- yopyop156@ifrance.com
- yopyop156.ifrance.com
-
- This file is part of DeSmuME
+/*
+	Copyright (C) 2006 yopyop
+	Copyright (C) 2009-2012 DeSmuME team
 
- DeSmuME 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 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
+	(at your option) any later version.
 
- DeSmuME 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.
+	This file 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 DeSmuME; 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 the this software. If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "arm_instructions.h"
-#include "thumb_instructions.h"
+#include <algorithm>
+#include <cstdlib>
+#include <cstdio>
+#include <cassert>
+#include "types.h"
+#include "instructions.h"
 #include "cp15.h"
 #include "bios.h"
-#include <stdlib.h>
-#include <stdio.h>
-
-const unsigned char arm_cond_table16*16 = {
- /* N=0, Z=0, C=0, V=0 */
- 0x00,0xFF,0x00,0xFF,0x00,0xFF,0x00,0xFF,
- 0x00,0xFF,0xFF,0x00,0xFF,0x00,0xFF,0x20,
- /* N=0, Z=0, C=0, V=1 */
- 0x00,0xFF,0x00,0xFF,0x00,0xFF,0xFF,0x00,
- 0x00,0xFF,0x00,0xFF,0x00,0xFF,0xFF,0x20,
- /* N=0, Z=0, C=1, V=0 */
- 0x00,0xFF,0xFF,0x00,0x00,0xFF,0x00,0xFF,
- 0xFF,0x00,0xFF,0x00,0xFF,0x00,0xFF,0x20,
- /* N=0, Z=0, C=1, V=1 */
- 0x00,0xFF,0xFF,0x00,0x00,0xFF,0xFF,0x00,
- 0xFF,0x00,0x00,0xFF,0x00,0xFF,0xFF,0x20,
- /* N=0, Z=1, C=0, V=0 */
- 0xFF,0x00,0x00,0xFF,0x00,0xFF,0x00,0xFF,
- 0x00,0xFF,0xFF,0x00,0x00,0xFF,0xFF,0x20,
- /* N=0, Z=1, C=0, V=1 */
- 0xFF,0x00,0x00,0xFF,0x00,0xFF,0xFF,0x00,
- 0x00,0xFF,0x00,0xFF,0x00,0xFF,0xFF,0x20,
- /* N=0, Z=1, C=1, V=0 */
- 0xFF,0x00,0xFF,0x00,0x00,0xFF,0x00,0xFF,
- 0x00,0xFF,0xFF,0x00,0x00,0xFF,0xFF,0x20,
- /* N=0, Z=1, C=1, V=1 */
- 0xFF,0x00,0xFF,0x00,0x00,0xFF,0xFF,0x00,
- 0x00,0xFF,0x00,0xFF,0x00,0xFF,0xFF,0x20,
- /* N=1, Z=0, C=0, V=0 */
- 0x00,0xFF,0x00,0xFF,0xFF,0x00,0x00,0xFF,
- 0x00,0xFF,0x00,0xFF,0x00,0xFF,0xFF,0x20,
- /* N=1, Z=0, C=0, V=1 */
- 0x00,0xFF,0x00,0xFF,0xFF,0x00,0xFF,0x00,
- 0x00,0xFF,0xFF,0x00,0xFF,0x00,0xFF,0x20,
- /* N=1, Z=0, C=1, V=0 */
- 0x00,0xFF,0xFF,0x00,0xFF,0x00,0x00,0xFF,
- 0xFF,0x00,0x00,0xFF,0x00,0xFF,0xFF,0x20,
- /* N=1, Z=0, C=1, V=1 */
- 0x00,0xFF,0xFF,0x00,0xFF,0x00,0xFF,0x00,
- 0xFF,0x00,0xFF,0x00,0xFF,0x00,0xFF,0x20,
- /* N=1, Z=1, C=0, V=0 */
- 0xFF,0x00,0x00,0xFF,0xFF,0x00,0x00,0xFF,
- 0x00,0xFF,0x00,0xFF,0x00,0xFF,0xFF,0x20,
- /* N=1, Z=1, C=0, V=1 */
- 0xFF,0x00,0x00,0xFF,0xFF,0x00,0xFF,0x00,
- 0x00,0xFF,0xFF,0x00,0x00,0xFF,0xFF,0x20,
- /* N=1, Z=1, C=1, V=0 */
- 0xFF,0x00,0xFF,0x00,0xFF,0x00,0x00,0xFF,
- 0x00,0xFF,0x00,0xFF,0x00,0xFF,0xFF,0x20,
- /* N=1, Z=1, C=1, V=1 */
- 0xFF,0x00,0xFF,0x00,0xFF,0x00,0xFF,0x00,
- 0x00,0xFF,0xFF,0x00,0x00,0xFF,0xFF,0x20,
-};
-
-armcpu_t NDS_ARM7;
-armcpu_t NDS_ARM9;
-
-#define SWAP(a, b, c) do \
-	 { \
- c=a; \
- a=b; \
- b=c; \
-		 } \
- while(0)
-
-#ifdef GDB_STUB
-
-#define STALLED_CYCLE_COUNT 10
-
-static void
-stall_cpu( void *instance) {
- armcpu_t *armcpu = (armcpu_t *)instance;
-
- armcpu->stalled = 1;
-}
-
-static void
-unstall_cpu( void *instance) {
- armcpu_t *armcpu = (armcpu_t *)instance;
-
- armcpu->stalled = 0;
-}
+#include "NDSSystem.h"
+#include "MMU_timing.h"
+#ifdef HAVE_LUA
+#include "lua-engine.h"
+#endif
 
-static void
-install_post_exec_fn( void *instance,
- void (*ex_fn)( void *, u32 adr, int thumb),
- void *fn_data) {
- armcpu_t *armcpu = (armcpu_t *)instance;
+template<uint32_t> static uint32_t armcpu_prefetch();
 
- armcpu->post_ex_fn = ex_fn;
- armcpu->post_ex_fn_data = fn_data;
+static inline uint32_t armcpu_prefetch(armcpu_t *armcpu)
+{
+	if (!armcpu->proc_ID)
+		return armcpu_prefetch<0>();
+	else
+		return armcpu_prefetch<1>();
 }
 
-static void
-remove_post_exec_fn( void *instance) {
- armcpu_t *armcpu = (armcpu_t *)instance;
-
- armcpu->post_ex_fn = nullptr;
-}
-#endif
+armcpu_t NDS_ARM7;
+armcpu_t NDS_ARM9;
 
-#ifdef GDB_STUB
-int armcpu_new( armcpu_t *armcpu, u32 id,
- struct armcpu_memory_iface *mem_if,
- struct armcpu_ctrl_iface **ctrl_iface_ret)
-#else
-int armcpu_new( armcpu_t *armcpu, u32 id)
-#endif
+int armcpu_new(armcpu_t *armcpu, uint32_t id)
 {
 	armcpu->proc_ID = id;
 
-	if(id==0)
-		armcpu->swi_tab = ARM9_swi_tab;
-	else
-		armcpu->swi_tab = ARM7_swi_tab;
-
-#ifdef GDB_STUB
-	armcpu->mem_if = mem_if;
-
-	/* populate the control interface */
-	armcpu->ctrl_iface.stall = stall_cpu;
-	armcpu->ctrl_iface.unstall = unstall_cpu;
-	armcpu->ctrl_iface.read_reg = read_cpu_reg;
-	armcpu->ctrl_iface.set_reg = set_cpu_reg;
-	armcpu->ctrl_iface.install_post_ex_fn = install_post_exec_fn;
-	armcpu->ctrl_iface.remove_post_ex_fn = remove_post_exec_fn;
-	armcpu->ctrl_iface.data = armcpu;
-
-	*ctrl_iface_ret = &armcpu->ctrl_iface;
-
 	armcpu->stalled = 0;
-	armcpu->post_ex_fn = nullptr;
-#endif
 
 	armcpu_init(armcpu, 0);
 
 	return 0;
 }
 
-void armcpu_init(armcpu_t *armcpu, u32 adr)
+// call this whenever CPSR is changed (other than CNVZQ or T flags); interrupts may need to be unleashed
+void armcpu_t::changeCPSR()
 {
- u32 i;
-
-	armcpu->LDTBit = (armcpu->proc_ID==0); //Si ARM9 utiliser le syte v5 pour le load
-	armcpu->intVector = 0xFFFF0000 * (armcpu->proc_ID==0);
-	armcpu->waitIRQ = false;
-	armcpu->wirq = false;
+	// but all it does is give them a chance to unleash by forcing an immediate reschedule
+	// TODO - we could actually set CPSR through here and look for a change in the I bit
+	// that would be a little optimization as well as a safety measure if we prevented setting CPSR directly
+	NDS_Reschedule();
+}
 
-#ifdef GDB_STUB
- armcpu->irq_flag = 0;
+void armcpu_init(armcpu_t *armcpu, uint32_t adr)
+{
+#if defined(_M_X64) || defined(__x86_64__)
+	memcpy(&armcpu->cond_table0, &arm_cond_table0, sizeof(arm_cond_table));
 #endif
 
-	if(armcpu->coproc15) free(armcpu->coproc15);
+	armcpu->LDTBit = !armcpu->proc_ID; // Si ARM9 utiliser le syte v5 pour le load
+	armcpu->intVector = 0xFFFF0000 * !armcpu->proc_ID;
+	armcpu->waitIRQ = false;
+	armcpu->halt_IE_and_IF = false;
+	armcpu->intrWaitARM_state = 0;
 
- for(i = 0; i < 15; ++i)
-	{
+	for (int i = 0; i < 16; ++i)
 		armcpu->Ri = 0;
-		armcpu->coproci = nullptr;
- }
 
 	armcpu->CPSR.val = armcpu->SPSR.val = SYS;
 
@@ -194,294 +89,272 @@
 
 	armcpu->SPSR_svc.val = armcpu->SPSR_abt.val = armcpu->SPSR_und.val = armcpu->SPSR_irq.val = armcpu->SPSR_fiq.val = 0;
 
-#ifdef GDB_STUB
- armcpu->instruct_adr = adr;
-	armcpu->R15 = adr + 8;
-#else
-	armcpu->R15 = adr;
-#endif
-
 	armcpu->next_instruction = adr;
 
-	armcpu->coproc15 = (armcp_t*)armcp15_new(armcpu);
-
-#ifndef GDB_STUB
 	armcpu_prefetch(armcpu);
-#endif
 }
 
-u32 armcpu_switchMode(armcpu_t *armcpu, u8 mode)
+uint32_t armcpu_switchMode(armcpu_t *armcpu, uint8_t mode)
 {
- u32 oldmode = armcpu->CPSR.bits.mode;
+	uint32_t oldmode = armcpu->CPSR.bits.mode;
 
-	switch(oldmode)
+	switch (oldmode)
 	{
-		case USR :
-		case SYS :
+		case USR:
+		case SYS:
 			armcpu->R13_usr = armcpu->R13;
 			armcpu->R14_usr = armcpu->R14;
 			break;
-
-		case FIQ :
-			{
- u32 tmp;
-				SWAP(armcpu->R8, armcpu->R8_fiq, tmp);
-				SWAP(armcpu->R9, armcpu->R9_fiq, tmp);
-				SWAP(armcpu->R10, armcpu->R10_fiq, tmp);
-				SWAP(armcpu->R11, armcpu->R11_fiq, tmp);
-				SWAP(armcpu->R12, armcpu->R12_fiq, tmp);
-				armcpu->R13_fiq = armcpu->R13;
-				armcpu->R14_fiq = armcpu->R14;
-				armcpu->SPSR_fiq = armcpu->SPSR;
-				break;
-			}
-		case IRQ :
+		case FIQ:
+			std::swap(armcpu->R8, armcpu->R8_fiq);
+			std::swap(armcpu->R9, armcpu->R9_fiq);
+			std::swap(armcpu->R10, armcpu->R10_fiq);
+			std::swap(armcpu->R11, armcpu->R11_fiq);
+			std::swap(armcpu->R12, armcpu->R12_fiq);
+			armcpu->R13_fiq = armcpu->R13;
+			armcpu->R14_fiq = armcpu->R14;
+			armcpu->SPSR_fiq = armcpu->SPSR;
+			break;
+		case IRQ:
 			armcpu->R13_irq = armcpu->R13;
 			armcpu->R14_irq = armcpu->R14;
 			armcpu->SPSR_irq = armcpu->SPSR;
 			break;
-
-		case SVC :
+		case SVC:
 			armcpu->R13_svc = armcpu->R13;
 			armcpu->R14_svc = armcpu->R14;
 			armcpu->SPSR_svc = armcpu->SPSR;
 			break;
-
-		case ABT :
+		case ABT:
 			armcpu->R13_abt = armcpu->R13;
 			armcpu->R14_abt = armcpu->R14;
 			armcpu->SPSR_abt = armcpu->SPSR;
 			break;
-
-		case UND :
+		case UND:
 			armcpu->R13_und = armcpu->R13;
 			armcpu->R14_und = armcpu->R14;
 			armcpu->SPSR_und = armcpu->SPSR;
 			break;
-		default :
-			break;
-		}
+		default:
+			fprintf(stderr, "switchMode: WRONG mode %02X\n",mode);
+	}
 
-		switch(mode)
-		{
-			case USR :
-			case SYS :
-				armcpu->R13 = armcpu->R13_usr;
-				armcpu->R14 = armcpu->R14_usr;
-				//SPSR = CPSR;
-				break;
-
-			case FIQ :
-				{
- u32 tmp;
-					SWAP(armcpu->R8, armcpu->R8_fiq, tmp);
-					SWAP(armcpu->R9, armcpu->R9_fiq, tmp);
-					SWAP(armcpu->R10, armcpu->R10_fiq, tmp);
-					SWAP(armcpu->R11, armcpu->R11_fiq, tmp);
-					SWAP(armcpu->R12, armcpu->R12_fiq, tmp);
-					armcpu->R13 = armcpu->R13_fiq;
-					armcpu->R14 = armcpu->R14_fiq;
-					armcpu->SPSR = armcpu->SPSR_fiq;
-					break;
-				}
-
-			case IRQ :
-				armcpu->R13 = armcpu->R13_irq;
-				armcpu->R14 = armcpu->R14_irq;
-				armcpu->SPSR = armcpu->SPSR_irq;
-				break;
-
-			case SVC :
-				armcpu->R13 = armcpu->R13_svc;
-				armcpu->R14 = armcpu->R14_svc;
-				armcpu->SPSR = armcpu->SPSR_svc;
-				break;
-
-			case ABT :
-				armcpu->R13 = armcpu->R13_abt;
-				armcpu->R14 = armcpu->R14_abt;
-				armcpu->SPSR = armcpu->SPSR_abt;
-				break;
-
- case UND :
-				armcpu->R13 = armcpu->R13_und;
-				armcpu->R14 = armcpu->R14_und;
-				armcpu->SPSR = armcpu->SPSR_und;
-				break;
-
-				default :
-					break;
+	switch (mode)
+	{
+		case USR:
+		case SYS:
+			armcpu->R13 = armcpu->R13_usr;
+			armcpu->R14 = armcpu->R14_usr;
+			//SPSR = CPSR;
+			break;
+		case FIQ:
+			std::swap(armcpu->R8, armcpu->R8_fiq);
+			std::swap(armcpu->R9, armcpu->R9_fiq);
+			std::swap(armcpu->R10, armcpu->R10_fiq);
+			std::swap(armcpu->R11, armcpu->R11_fiq);
+			std::swap(armcpu->R12, armcpu->R12_fiq);
+			armcpu->R13 = armcpu->R13_fiq;
+			armcpu->R14 = armcpu->R14_fiq;
+			armcpu->SPSR = armcpu->SPSR_fiq;
+			break;
+		case IRQ:
+			armcpu->R13 = armcpu->R13_irq;
+			armcpu->R14 = armcpu->R14_irq;
+			armcpu->SPSR = armcpu->SPSR_irq;
+			break;
+		case SVC:
+			armcpu->R13 = armcpu->R13_svc;
+			armcpu->R14 = armcpu->R14_svc;
+			armcpu->SPSR = armcpu->SPSR_svc;
+			break;
+		case ABT:
+			armcpu->R13 = armcpu->R13_abt;
+			armcpu->R14 = armcpu->R14_abt;
+			armcpu->SPSR = armcpu->SPSR_abt;
+			break;
+		case UND:
+			armcpu->R13 = armcpu->R13_und;
+			armcpu->R14 = armcpu->R14_und;
+			armcpu->SPSR = armcpu->SPSR_und;
+			break;
+		default:
+			break;
 	}
 
 	armcpu->CPSR.bits.mode = mode & 0x1F;
+	armcpu->changeCPSR();
 	return oldmode;
 }
 
-u32 armcpu_prefetch(armcpu_t *armcpu)
+uint32_t armcpu_Wait4IRQ(armcpu_t *cpu)
 {
-#ifdef GDB_STUB
-	u32 temp_instruction;
-#endif
-
-	if(armcpu->CPSR.bits.T == 0)
-	{
-#ifdef GDB_STUB
-		temp_instruction =
-			armcpu->mem_if->prefetch32( armcpu->mem_if->data,
-			armcpu->next_instruction);
-
-		if ( !armcpu->stalled) {
-			armcpu->instruction = temp_instruction;
-			armcpu->instruct_adr = armcpu->next_instruction;
-			armcpu->next_instruction += 4;
-			armcpu->R15 = armcpu->next_instruction + 4;
-		}
-#else
-		armcpu->instruction = MMU_read32_acl(armcpu->proc_ID, armcpu->next_instruction,CP15_ACCESS_EXECUTE);
+	cpu->waitIRQ = true;
+	cpu->halt_IE_and_IF = true;
+	return 1;
+}
 
-		armcpu->instruct_adr = armcpu->next_instruction;
-		armcpu->next_instruction += 4;
-		armcpu->R15 = armcpu->next_instruction + 4;
-#endif
+template<uint32_t PROCNUM> static inline uint32_t armcpu_prefetch()
+{
+	armcpu_t *const armcpu = &ARMPROC;
+	uint32_t curInstruction = armcpu->next_instruction;
 
- return MMU.MMU_WAIT32armcpu->proc_ID(armcpu->instruct_adr>>24)&0xF;
+	if (!armcpu->CPSR.bits.T)
+	{
+		curInstruction &= 0xFFFFFFFC; // please don't change this to 0x0FFFFFFC -- the NDS will happily run on 0xF******* addresses all day long
+		// please note that we must setup R15 before reading the instruction since there is a protection
+		// which prevents PC > 0x3FFF from reading the bios region
+		armcpu->instruct_adr = curInstruction;
+		armcpu->next_instruction = curInstruction + 4;
+		armcpu->R15 = curInstruction + 8;
+		armcpu->instruction = _MMU_read32<PROCNUM, MMU_AT_CODE>(curInstruction);
+
+		return MMU_codeFetchCycles<PROCNUM, 32>(curInstruction);
 	}
-
-#ifdef GDB_STUB
-	temp_instruction =
- armcpu->mem_if->prefetch16( armcpu->mem_if->data,
- armcpu->next_instruction);
-
-	if ( !armcpu->stalled) {
-		armcpu->instruction = temp_instruction;
-		armcpu->instruct_adr = armcpu->next_instruction;
-		armcpu->next_instruction = armcpu->next_instruction + 2;
-		armcpu->R15 = armcpu->next_instruction + 2;
+	curInstruction &= 0xFFFFFFFE; // please don't change this to 0x0FFFFFFE -- the NDS will happily run on 0xF******* addresses all day long
+	// please note that we must setup R15 before reading the instruction since there is a protection
+	// which prevents PC > 0x3FFF from reading the bios region
+	armcpu->instruct_adr = curInstruction;
+	armcpu->next_instruction = curInstruction + 2;
+	armcpu->R15 = curInstruction + 4;
+	armcpu->instruction = _MMU_read16<PROCNUM, MMU_AT_CODE>(curInstruction);
+
+	if (!PROCNUM)
+	{
+		// arm9 fetches 2 instructions at a time in thumb mode
+		if (!(curInstruction == armcpu->instruct_adr + 2 && (curInstruction & 2)))
+			return MMU_codeFetchCycles<PROCNUM, 32>(curInstruction);
+		else
+			return 0;
 	}
-#else
-	armcpu->instruction = MMU_read16_acl(armcpu->proc_ID, armcpu->next_instruction,CP15_ACCESS_EXECUTE);
-
-	armcpu->instruct_adr = armcpu->next_instruction;
-	armcpu->next_instruction += 2;
-	armcpu->R15 = armcpu->next_instruction + 2;
-#endif
 
-	return MMU.MMU_WAIT16armcpu->proc_ID(armcpu->instruct_adr>>24)&0xF;
+	return MMU_codeFetchCycles<PROCNUM, 16>(curInstruction);
 }
 
-
-BOOL armcpu_irqExeption(armcpu_t *armcpu)
+// TODO - merge with armcpu_irqException?
+// http://www.ethernut.de/en/documents/arm-exceptions.html
+// http://docs.google.com/viewer?a=v&q=cache:V4ht1YkxprMJ:www.cs.nctu.edu.tw/~wjtsai/EmbeddedSystemDesign/Ch3-1.pdf+arm+exception+handling&hl=en&gl=us&pid=bl&srcid=ADGEEShx9VTHbUhWdDOrTVRzLkcCsVfJiijncNDkkgkrlJkLa7D0LCpO8fQ_hhU3DTcgZh9rcZWWQq4TYhhCovJ625h41M0ZUX3WGasyzWQFxYzDCB-VS6bsUmpoJnRxAc-bdkD0qmsu&sig=AHIEtbR9VHvDOCRmZFQDUVwy53iJDjoSPQ
+void armcpu_exception(armcpu_t *cpu, uint32_t number)
 {
- Status_Reg tmp;
+	Mode cpumode = USR;
+	switch (number)
+	{
+		case EXCEPTION_RESET:
+			cpumode = SVC;
+			break;
+		case EXCEPTION_UNDEFINED_INSTRUCTION:
+			cpumode = UND;
+			break;
+		case EXCEPTION_SWI:
+			cpumode = SVC;
+			break;
+		case EXCEPTION_PREFETCH_ABORT:
+			cpumode = ABT;
+			break;
+		case EXCEPTION_DATA_ABORT:
+			cpumode = ABT;
+			break;
+		case EXCEPTION_RESERVED_0x14:
+			execute = false;
+			break;
+		case EXCEPTION_IRQ:
+			cpumode = IRQ;
+			break;
+		case EXCEPTION_FAST_IRQ:
+			cpumode = FIQ;
+	}
 
-	if(armcpu->CPSR.bits.I) return false;
+	Status_Reg tmp = cpu->CPSR;
+	armcpu_switchMode(cpu, cpumode); // enter new mode
+	cpu->R14 = cpu->next_instruction;
+	cpu->SPSR = tmp; // save old CPSR as new SPSR
+	cpu->CPSR.bits.T = 0; // handle as ARM32 code
+	cpu->CPSR.bits.I = 1;
+	cpu->changeCPSR();
+	cpu->R15 = cpu->intVector + number;
+	cpu->next_instruction = cpu->R15;
+	fprintf(stderr, "armcpu_exception!\n");
+
+	// HOW DOES THIS WORTK WITHOUT A PREFETCH, LIKE IRQ BELOW?
+	// I REALLY WISH WE DIDNT PREFETCH BEFORE EXECUTING
+}
 
-#ifdef GDB_STUB
-	armcpu->irq_flag = 0;
-#endif
+bool armcpu_irqException(armcpu_t *armcpu)
+{
+	Status_Reg tmp;
 
 	tmp = armcpu->CPSR;
 	armcpu_switchMode(armcpu, IRQ);
 
-#ifdef GDB_STUB
-	armcpu->R14 = armcpu->next_instruction + 4;
-#else
 	armcpu->R14 = armcpu->instruct_adr + 4;
-#endif
 	armcpu->SPSR = tmp;
 	armcpu->CPSR.bits.T = 0;
 	armcpu->CPSR.bits.I = 1;
 	armcpu->next_instruction = armcpu->intVector + 0x18;
 	armcpu->waitIRQ = 0;
 
-#ifndef GDB_STUB
-	armcpu->R15 = armcpu->next_instruction + 8;
+	// must retain invariant of having next instruction to be executed prefetched
+	// (yucky)
 	armcpu_prefetch(armcpu);
-#endif
 
 	return true;
 }
-/*
-static BOOL armcpu_prefetchExeption(armcpu_t *armcpu)
-{
- Status_Reg tmp;
-	if(armcpu->CPSR.bits.I) return false;
- tmp = armcpu->CPSR;
-	armcpu_switchMode(armcpu, ABT);
-	armcpu->R14 = armcpu->next_instruction + 4;
-	armcpu->SPSR = tmp;
-	armcpu->CPSR.bits.T = 0;
-	armcpu->CPSR.bits.I = 1;
-	armcpu->next_instruction = armcpu->intVector + 0xC;
-	armcpu->R15 = armcpu->next_instruction + 8;
-	armcpu->waitIRQ = 0;
-	return true;
-}
-*/
-
-BOOL
-armcpu_flagIrq( armcpu_t *armcpu) {
- if(armcpu->CPSR.bits.I) return false;
-
- armcpu->waitIRQ = 0;
-
-#ifdef GDB_STUB
- armcpu->irq_flag = 1;
-#endif
 
- return true;
+uint32_t TRAPUNDEF(armcpu_t *cpu)
+{
+	if (!!cpu->intVector ^ (cpu->proc_ID == ARMCPU_ARM9))
+	{
+		armcpu_exception(&NDS_ARM9, EXCEPTION_UNDEFINED_INSTRUCTION);
+		return 4;
+	}
+	else
+	{
+		execute = false;
+		return 4;
+	}
 }
 
-
-u32 armcpu_exec(armcpu_t *armcpu)
+template<int PROCNUM> uint32_t armcpu_exec()
 {
- u32 c = 1;
+	// Usually, fetching and executing are processed parallelly.
+	// So this function stores the cycles of each process to
+	// the variables below, and returns appropriate cycle count.
+	uint32_t cFetch = 0;
+	uint32_t cExecute = 0;
 
-#ifdef GDB_STUB
- if ( armcpu->stalled)
- return STALLED_CYCLE_COUNT;
+	// this assert is annoying. but sometimes it is handy.
+	//assert(ARMPROC.instruct_adr!=0x00000000);
 
- /* check for interrupts */
- if ( armcpu->irq_flag) {
- armcpu_irqExeption( armcpu);
- }
+	//cFetch = armcpu_prefetch(&ARMPROC);
 
- c = armcpu_prefetch(armcpu);
+	//fprintf(stderr, "%d: %08X\n",PROCNUM,ARMPROC.instruct_adr);
 
- if ( armcpu->stalled) {
- return c;
- }
-#endif
-
-	if(armcpu->CPSR.bits.T == 0)
+	if (!ARMPROC.CPSR.bits.T)
 	{
-/* if((TEST_COND(CONDITION(armcpu->instruction), armcpu->CPSR)) || ((CONDITION(armcpu->instruction)==0xF)&&(CODE(armcpu->instruction)==0x5)))*/
- if((TEST_COND(CONDITION(armcpu->instruction), CODE(armcpu->instruction), armcpu->CPSR)))
+		if (
+			CONDITION(ARMPROC.instruction) == 0x0E // fast path for unconditional instructions
+			|| (TEST_COND(CONDITION(ARMPROC.instruction), CODE(ARMPROC.instruction), ARMPROC.CPSR)) // handles any condition
+		)
 		{
-			c += arm_instructions_setINSTRUCTION_INDEX(armcpu->instruction)(armcpu);
-		}
-#ifdef GDB_STUB
- if ( armcpu->post_ex_fn != nullptr) {
- /* call the external post execute function */
- armcpu->post_ex_fn( armcpu->post_ex_fn_data,
- armcpu->instruct_adr, 0);
- }
-#else
-		c += armcpu_prefetch(armcpu);
+#ifdef HAVE_LUA
+			CallRegisteredLuaMemHook(ARMPROC.instruct_adr, 4, ARMPROC.instruction, LUAMEMHOOK_EXEC); // should report even if condition=false?
 #endif
-		return c;
+			cExecute = arm_instructions_setPROCNUMINSTRUCTION_INDEX(ARMPROC.instruction)(ARMPROC.instruction);
+		}
+		else
+			cExecute = 1; // If condition=false: 1S cycle
+		cFetch = armcpu_prefetch<PROCNUM>();
+		return MMU_fetchExecuteCycles<PROCNUM>(cExecute, cFetch);
 	}
 
-	c += thumb_instructions_setarmcpu->instruction>>6(armcpu);
-
-#ifdef GDB_STUB
- if ( armcpu->post_ex_fn != nullptr) {
- /* call the external post execute function */
- armcpu->post_ex_fn( armcpu->post_ex_fn_data, armcpu->instruct_adr, 1);
- }
-#else
-	c += armcpu_prefetch(armcpu);
+#ifdef HAVE_LUA
+	CallRegisteredLuaMemHook(ARMPROC.instruct_adr, 2, ARMPROC.instruction, LUAMEMHOOK_EXEC);
 #endif
-	return c;
+	cExecute = thumb_instructions_setPROCNUMARMPROC.instruction>>6(ARMPROC.instruction);
+
+	cFetch = armcpu_prefetch<PROCNUM>();
+	return MMU_fetchExecuteCycles<PROCNUM>(cExecute, cFetch);
 }
 
+// these templates needed to be instantiated manually
+template uint32_t armcpu_exec<0>();
+template uint32_t armcpu_exec<1>();

audacious-plugins-3.6.2-gtk3.tar.bz2/src/xsf/desmume/armcpu.h -> audacious-plugins-4.4.1.tar.bz2/src/xsf/desmume/armcpu.h Changed

@@ -1,92 +1,125 @@
-/* Copyright (C) 2006 yopyop
- yopyop156@ifrance.com
- yopyop156.ifrance.com
-
- This file is part of DeSmuME
+/*
+	Copyright (C) 2006 yopyop
+	Copyright (C) 2006-2012 DeSmuME team
 
- DeSmuME 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 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
+	(at your option) any later version.
 
- DeSmuME 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.
+	This file 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 DeSmuME; 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 the this software. If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef ARM_CPU
-#define ARM_CPU
+#pragma once
 
 #include "types.h"
 #include "bits.h"
 #include "MMU.h"
+#include "instructions.h"
 
-#define ARMCPU_ARM7 1
-#define ARMCPU_ARM9 0
+inline uint32_t CODE(uint32_t i) { return (i >> 25) & 0x7; }
 
-#define CODE(i) (((i)>>25)&0X7)
-#define OPCODE(i) (((i)>>21)&0xF)
-#define SIGNEBIT(i) BIT_N(i,20)
+const uint32_t EXCEPTION_RESET = 0x00;
+const uint32_t EXCEPTION_UNDEFINED_INSTRUCTION = 0x04;
+const uint32_t EXCEPTION_SWI = 0x08;
+const uint32_t EXCEPTION_PREFETCH_ABORT = 0x0C;
+const uint32_t EXCEPTION_DATA_ABORT = 0x10;
+const uint32_t EXCEPTION_RESERVED_0x14 = 0x14;
+const uint32_t EXCEPTION_IRQ = 0x18;
+const uint32_t EXCEPTION_FAST_IRQ = 0x1C;
 
-#define INSTRUCTION_INDEX(i) ((((i)>>16)&0xFF0)|(((i)>>4)&0xF))
+inline uint32_t INSTRUCTION_INDEX(uint32_t i) { return ((i >> 16) & 0xFF0) | ((i >> 4) & 0xF); }
 
-#define ROR(i, j) ((((u32)(i))>>(j)) | (((u32)(i))<<(32-(j))))
+inline uint32_t ROR(uint32_t i, uint32_t j) { return (i >> j) | (i << (32 - j)); }
 
-#define UNSIGNED_OVERFLOW(a,b,c) ((BIT31(a)&BIT31(b)) | \
-								 ((BIT31(a)|BIT31(b))&BIT31(~c)))
+template<typename T> inline T UNSIGNED_OVERFLOW(T a, T b, T c) { return BIT31((a & b) | ((a | b) & ~c)); }
 
-#define UNSIGNED_UNDERFLOW(a,b,c) ((BIT31(~a)&BIT31(b)) | \
-								 ((BIT31(~a)|BIT31(b))&BIT31(c)))
+template<typename T> inline T UNSIGNED_UNDERFLOW(T a, T b, T c) { return BIT31((~a & b) | ((~a | b) & c)); }
 
-#define SIGNED_OVERFLOW(a,b,c) ((BIT31(a)&BIT31(b)&BIT31(~c))|\
-								(BIT31(~a)&BIT31(~(b))&BIT31(c)))
+template<typename T> inline T SIGNED_OVERFLOW(T a, T b, T c) { return BIT31((a & b & ~c) | (~a & ~b & c)); }
 
-#define SIGNED_UNDERFLOW(a,b,c) ((BIT31(a)&BIT31(~(b))&BIT31(~c))|\
-								(BIT31(~a)&BIT31(b)&BIT31(c)))
+template<typename T> inline T SIGNED_UNDERFLOW(T a, T b, T c) { return BIT31((a & ~b & ~c) | (~a & b & c)); }
 
-#define EQ	0x0
-#define NE	0x1
-#define CS	0x2
-#define CC	0x3
-#define MI	0x4
-#define PL	0x5
-#define VS	0x6
-#define VC	0x7
-#define HI	0x8
-#define LS	0x9
-#define GE	0xA
-#define LT	0xB
-#define GT	0xC
-#define LE	0xD
-#define AL	0xE
+// ============================= CPRS flags funcs
+inline bool CarryFrom(int32_t left, int32_t right)
+{
+	uint32_t res = 0xFFFFFFFFU - static_cast<uint32_t>(left);
 
-/*
-#define TEST_COND(cond, CPSR)	(((cond)==AL) ||\
-					 (((cond)==EQ) && ( CPSR.bits.Z))||\
-					 (((cond)==NE) && (!CPSR.bits.Z))||\
-					 (((cond)==CS) && ( CPSR.bits.C))||\
-					 (((cond)==CC) && (!CPSR.bits.C))||\
-					 (((cond)==MI) && ( CPSR.bits.N))||\
-					 (((cond)==PL) && (!CPSR.bits.N))||\
-					 (((cond)==VS) && ( CPSR.bits.V))||\
-					 (((cond)==VC) && (!CPSR.bits.V))||\
-					 (((cond)==HI) && (CPSR.bits.C) && (!CPSR.bits.Z))||\
-					 (((cond)==LS) && ((CPSR.bits.Z) || (!CPSR.bits.C)))||\
-					 (((cond)==GE) && (CPSR.bits.N==CPSR.bits.V))||\
-					 (((cond)==LT) && (CPSR.bits.N!=CPSR.bits.V))||\
-					 (((cond)==GT) && (CPSR.bits.Z==0) && (CPSR.bits.N==CPSR.bits.V))||\
-					 (((cond)==LE) && ((CPSR.bits.Z) || (CPSR.bits.N!=CPSR.bits.V))))
-*/
+	return static_cast<uint32_t>(right) > res;
+}
 
-extern const unsigned char arm_cond_table16*16;
+inline bool BorrowFrom(int32_t left, int32_t right)
+{
+	return static_cast<uint32_t>(right) > static_cast<uint32_t>(left);
+}
 
-#define TEST_COND(cond, inst, CPSR) ((arm_cond_table((CPSR.val >> 24) & 0xf0)+(cond) >> (inst)) & 1)
+inline bool OverflowFromADD(int32_t alu_out, int32_t left, int32_t right)
+{
+	return ((left >= 0 && right >= 0) || (left < 0 && right < 0)) && ((left < 0 && alu_out >= 0) || (left >= 0 && alu_out < 0));
+}
 
+inline bool OverflowFromSUB(int32_t alu_out, int32_t left, int32_t right)
+{
+	return ((left < 0 && right >= 0) || (left >= 0 && right < 0)) && ((left < 0 && alu_out >= 0) || (left >= 0 && alu_out < 0));
+}
+
+const uint8_t arm_cond_table =
+{
+	// N=0, Z=0, C=0, V=0
+	0x00,0xFF,0x00,0xFF,0x00,0xFF,0x00,0xFF,	// 0x00
+	0x00,0xFF,0xFF,0x00,0xFF,0x00,0xFF,0x20,	// 0x00
+	// N=0, Z=0, C=0, V=1
+	0x00,0xFF,0x00,0xFF,0x00,0xFF,0xFF,0x00,	// 0x10
+	0x00,0xFF,0x00,0xFF,0x00,0xFF,0xFF,0x20,
+	// N=0, Z=0, C=1, V=0
+	0x00,0xFF,0xFF,0x00,0x00,0xFF,0x00,0xFF,	// 0x20
+	0xFF,0x00,0xFF,0x00,0xFF,0x00,0xFF,0x20,
+	// N=0, Z=0, C=1, V=1
+	0x00,0xFF,0xFF,0x00,0x00,0xFF,0xFF,0x00,	// 0x30
+	0xFF,0x00,0x00,0xFF,0x00,0xFF,0xFF,0x20,
+	// N=0, Z=1, C=0, V=0
+	0xFF,0x00,0x00,0xFF,0x00,0xFF,0x00,0xFF,	// 0x40
+	0x00,0xFF,0xFF,0x00,0x00,0xFF,0xFF,0x20,
+	// N=0, Z=1, C=0, V=1
+	0xFF,0x00,0x00,0xFF,0x00,0xFF,0xFF,0x00,	// 0x50
+	0x00,0xFF,0x00,0xFF,0x00,0xFF,0xFF,0x20,
+	// N=0, Z=1, C=1, V=0
+	0xFF,0x00,0xFF,0x00,0x00,0xFF,0x00,0xFF,	// 0x60
+	0x00,0xFF,0xFF,0x00,0x00,0xFF,0xFF,0x20,
+	// N=0, Z=1, C=1, V=1
+	0xFF,0x00,0xFF,0x00,0x00,0xFF,0xFF,0x00,	// 0x70
+	0x00,0xFF,0x00,0xFF,0x00,0xFF,0xFF,0x20,
+	// N=1, Z=0, C=0, V=0
+	0x00,0xFF,0x00,0xFF,0xFF,0x00,0x00,0xFF,	// 0x80
+	0x00,0xFF,0x00,0xFF,0x00,0xFF,0xFF,0x20,
+	// N=1, Z=0, C=0, V=1
+	0x00,0xFF,0x00,0xFF,0xFF,0x00,0xFF,0x00,	// 0x90
+	0x00,0xFF,0xFF,0x00,0xFF,0x00,0xFF,0x20,
+	// N=1, Z=0, C=1, V=0
+	0x00,0xFF,0xFF,0x00,0xFF,0x00,0x00,0xFF,	// 0xA0
+	0xFF,0x00,0x00,0xFF,0x00,0xFF,0xFF,0x20,
+	// N=1, Z=0, C=1, V=1
+	0x00,0xFF,0xFF,0x00,0xFF,0x00,0xFF,0x00,	// 0xB0
+	0xFF,0x00,0xFF,0x00,0xFF,0x00,0xFF,0x20,
+	// N=1, Z=1, C=0, V=0
+	0xFF,0x00,0x00,0xFF,0xFF,0x00,0x00,0xFF,	// 0xC0
+	0x00,0xFF,0x00,0xFF,0x00,0xFF,0xFF,0x20,
+	// N=1, Z=1, C=0, V=1
+	0xFF,0x00,0x00,0xFF,0xFF,0x00,0xFF,0x00,	// 0xD0
+	0x00,0xFF,0xFF,0x00,0x00,0xFF,0xFF,0x20,
+	// N=1, Z=1, C=1, V=0
+	0xFF,0x00,0xFF,0x00,0xFF,0x00,0x00,0xFF,	// 0xE0
+	0x00,0xFF,0x00,0xFF,0x00,0xFF,0xFF,0x20,
+	// N=1, Z=1, C=1, V=1
+	0xFF,0x00,0xFF,0x00,0xFF,0x00,0xFF,0x00,	// 0xF0
+	0x00,0xFF,0xFF,0x00,0x00,0xFF,0xFF,0x20
+};
 
 enum Mode
 {
@@ -104,7 +137,7 @@
 {
 	struct
 	{
-		u32 N : 1,
+		uint32_t N : 1,
 		Z : 1,
 		C : 1,
 		V : 1,
@@ -113,16 +146,16 @@
 		I : 1,
 		F : 1,
 		T : 1,
- mode : 5;
+		mode : 5;
 	} bits;
- u32 val;
+	uint32_t val;
 } Status_Reg;
 #else
 typedef union
 {
 	struct
 	{
- u32 mode : 5,
+		uint32_t mode : 5,
 		T : 1,
 		F : 1,
 		I : 1,
@@ -133,147 +166,78 @@
 		Z : 1,
 		N : 1;
 	} bits;
- u32 val;
+	uint32_t val;
 } Status_Reg;
 #endif
 
-/**
- * The control interface to a CPU
- */
-struct armcpu_ctrl_iface {
- /** stall the processor */
- void (*stall)( void *instance);
-
- /** unstall the processor */
- void (*unstall)( void *instance);
-
- /** read a register value */
- u32 (*read_reg)( void *instance, u32 reg_num);
-
- /** set a register value */
- void (*set_reg)( void *instance, u32 reg_num, u32 value);
-
- /** install the post execute function */
- void (*install_post_ex_fn)( void *instance,
- void (*fn)( void *, u32 adr, int thumb),
- void *fn_data);
+inline uint8_t TEST_COND(uint32_t cond, uint32_t inst, Status_Reg CPSR) { return arm_cond_table((CPSR.val >> 24) & 0xf0) | cond & (1 << inst); }
 
- /** remove the post execute function */
- void (*remove_post_ex_fn)( void *instance);
+typedef void *armcp_t;
 
- /** the private data passed to all interface functions */
- void *data;
-};
-
-
-typedef void* armcp_t;
-
-typedef struct armcpu_t
+struct armcpu_t
 {
- u32 proc_ID;
- u32 instruction; //4
- u32 instruct_adr; //8
- u32 next_instruction; //12
+	uint32_t proc_ID;
+	uint32_t instruction; //4
+	uint32_t instruct_adr; //8
+	uint32_t next_instruction; //12
 
- u32 R16; //16
+	uint32_t R16; //16
 	Status_Reg CPSR; //80
 	Status_Reg SPSR;
 
- u32 R13_usr, R14_usr;
- u32 R13_svc, R14_svc;
- u32 R13_abt, R14_abt;
- u32 R13_und, R14_und;
- u32 R13_irq, R14_irq;
- u32 R8_fiq, R9_fiq, R10_fiq, R11_fiq, R12_fiq, R13_fiq, R14_fiq;
-	Status_Reg SPSR_svc, SPSR_abt, SPSR_und, SPSR_irq, SPSR_fiq;
+	void changeCPSR();
 
-	armcp_t *coproc16;
+	uint32_t R13_usr, R14_usr;
+	uint32_t R13_svc, R14_svc;
+	uint32_t R13_abt, R14_abt;
+	uint32_t R13_und, R14_und;
+	uint32_t R13_irq, R14_irq;
+	uint32_t R8_fiq, R9_fiq, R10_fiq, R11_fiq, R12_fiq, R13_fiq, R14_fiq;
+	Status_Reg SPSR_svc, SPSR_abt, SPSR_und, SPSR_irq, SPSR_fiq;
 
- u32 intVector;
- u8 LDTBit; //1 : ARMv5 style 0 : non ARMv5
-	BOOL waitIRQ;
-	BOOL wIRQ;
-	BOOL wirq;
+	uint32_t intVector;
+	uint8_t LDTBit; // 1 : ARMv5 style 0 : non ARMv5
+	bool waitIRQ;
+	bool halt_IE_and_IF; //the cpu is halted, waiting for IE&IF to signal something
+	uint8_t intrWaitARM_state;
 
- u32 (* *swi_tab)(struct armcpu_t * cpu);
+	bool BIOS_loaded;
 
-#ifdef GDB_STUB
- /** there is a pending irq for the cpu */
- int irq_flag;
+	uint32_t (**swi_tab)();
 
- /** the post executed function (if installed) */
- void (*post_ex_fn)( void *, u32 adr, int thumb);
+	// flag indicating if the processor is stalled (for debugging)
+	int stalled;
 
- /** data for the post executed function */
- void *post_ex_fn_data;
+#if defined(_M_X64) || defined(__x86_64__)
+	uint8_t cond_table16 * 16;
+#endif
+};
 
+int armcpu_new(armcpu_t *armcpu, uint32_t id);
+void armcpu_init(armcpu_t *armcpu, uint32_t adr);
+uint32_t armcpu_switchMode(armcpu_t *armcpu, uint8_t mode);
 
- /** flag indicating if the processor is stalled */
- int stalled;
+bool armcpu_irqException(armcpu_t *armcpu);
+void armcpu_exception(armcpu_t *cpu, uint32_t number);
+uint32_t TRAPUNDEF(armcpu_t* cpu);
+uint32_t armcpu_Wait4IRQ(armcpu_t *cpu);
 
- /** the memory interface */
- struct armcpu_memory_iface *mem_if;
+extern armcpu_t NDS_ARM7, NDS_ARM9;
 
- /** the ctrl interface */
- struct armcpu_ctrl_iface ctrl_iface;
-#endif
-} armcpu_t;
+template<int PROCNUM> uint32_t armcpu_exec();
 
-#ifdef GDB_STUB
-int armcpu_new( armcpu_t *armcpu, u32 id, struct armcpu_memory_iface *mem_if,
- struct armcpu_ctrl_iface **ctrl_iface_ret);
-#else
-int armcpu_new( armcpu_t *armcpu, u32 id);
-#endif
-void armcpu_init(armcpu_t *armcpu, u32 adr);
-u32 armcpu_switchMode(armcpu_t *armcpu, u8 mode);
-u32 armcpu_prefetch(armcpu_t *armcpu);
-u32 armcpu_exec(armcpu_t *armcpu);
-BOOL armcpu_irqExeption(armcpu_t *armcpu);
-//BOOL armcpu_prefetchExeption(armcpu_t *armcpu);
-BOOL
-armcpu_flagIrq( armcpu_t *armcpu);
-
-extern armcpu_t NDS_ARM7;
-extern armcpu_t NDS_ARM9;
-
-static INLINE void NDS_makeARM9Int(u32 num)
+inline void setIF(int PROCNUM, uint32_t flag)
 {
- /* flag the interrupt request source */
- MMU.reg_IF0 |= (1<<num);
+	// don't set generated bits!!!
+	assert(!(flag&0x00200000));
 
- /* generate the interrupt if enabled */
-	if ((MMU.reg_IE0 & (1 << num)) && MMU.reg_IME0)
-	{
-		NDS_ARM9.wIRQ = true;
-		NDS_ARM9.waitIRQ = false;
-	}
-}
-
-static INLINE void NDS_makeARM7Int(u32 num)
-{
- /* flag the interrupt request source */
-	MMU.reg_IF1 |= (1<<num);
+	MMU.reg_IF_bitsPROCNUM |= flag;
 
- /* generate the interrupt if enabled */
-	if ((MMU.reg_IE1 & (1 << num)) && MMU.reg_IME1)
-	{
-		NDS_ARM7.wIRQ = true;
-		NDS_ARM7.waitIRQ = false;
-	}
+	extern void NDS_Reschedule();
+	NDS_Reschedule();
 }
 
-static INLINE void NDS_makeInt(u8 proc_ID,u32 num)
+inline void NDS_makeIrq(int PROCNUM, uint32_t num)
 {
-	switch (proc_ID)
-	{
-		case 0:
-			NDS_makeARM9Int(num) ;
-			break ;
-		case 1:
-			NDS_makeARM7Int(num) ;
-			break ;
-	}
+	setIF(PROCNUM, 1 << num);
 }
-
-#endif

audacious-plugins-3.6.2-gtk3.tar.bz2/src/xsf/desmume/bios.cc -> audacious-plugins-4.4.1.tar.bz2/src/xsf/desmume/bios.cc Changed

@@ -1,1073 +1,1152 @@
-/* Copyright (C) 2006 yopyop
- yopyop156@ifrance.com
- yopyop156.ifrance.com
-
- This file is part of DeSmuME
-
- DeSmuME 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.
-
- DeSmuME 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 DeSmuME; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+/*
+	Copyright (C) 2006 yopyop
+	Copyright (C) 2008-2012 DeSmuME team
+
+	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
+	(at your option) any later version.
+
+	This file 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 the this software. If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <cmath>
 #include "cp15.h"
-#include <math.h>
 #include "MMU.h"
-#include "SPU.h"
-#include "debug.h"
-
-extern BOOL execute;
-
-static u16 getsinetbl = {
-0x0000, 0x0324, 0x0648, 0x096A, 0x0C8C, 0x0FAB, 0x12C8, 0x15E2,
-0x18F9, 0x1C0B, 0x1F1A, 0x2223, 0x2528, 0x2826, 0x2B1F, 0x2E11,
-0x30FB, 0x33DF, 0x36BA, 0x398C, 0x3C56, 0x3F17, 0x41CE, 0x447A,
-0x471C, 0x49B4, 0x4C3F, 0x4EBF, 0x5133, 0x539B, 0x55F5, 0x5842,
-0x5A82, 0x5CB3, 0x5ED7, 0x60EB, 0x62F1, 0x64E8, 0x66CF, 0x68A6,
-0x6A6D, 0x6C23, 0x6DC9, 0x6F5E, 0x70E2, 0x7254, 0x73B5, 0x7504,
-0x7641, 0x776B, 0x7884, 0x7989, 0x7A7C, 0x7B5C, 0x7C29, 0x7CE3,
-0x7D89, 0x7E1D, 0x7E9C, 0x7F09, 0x7F61, 0x7FA6, 0x7FD8, 0x7FF5
+#include "NDSSystem.h"
+
+#define cpu (&ARMPROC)
+#define TEMPLATE template<int PROCNUM>
+
+struct CompressionHeader
+{
+public:
+	CompressionHeader(u32 _value) : value(_value) {}
+	u32 DataSize() const { return value&15; }
+	u32 Type() const { return (value>>4)&15; }
+	u32 DecompressedSize() const { return value>>24; }
+private:
+	u32 value;
+};
+
+static const uint16_t getsinetbl =
+{
+	0x0000, 0x0324, 0x0648, 0x096A, 0x0C8C, 0x0FAB, 0x12C8, 0x15E2,
+	0x18F9, 0x1C0B, 0x1F1A, 0x2223, 0x2528, 0x2826, 0x2B1F, 0x2E11,
+	0x30FB, 0x33DF, 0x36BA, 0x398C, 0x3C56, 0x3F17, 0x41CE, 0x447A,
+	0x471C, 0x49B4, 0x4C3F, 0x4EBF, 0x5133, 0x539B, 0x55F5, 0x5842,
+	0x5A82, 0x5CB3, 0x5ED7, 0x60EB, 0x62F1, 0x64E8, 0x66CF, 0x68A6,
+	0x6A6D, 0x6C23, 0x6DC9, 0x6F5E, 0x70E2, 0x7254, 0x73B5, 0x7504,
+	0x7641, 0x776B, 0x7884, 0x7989, 0x7A7C, 0x7B5C, 0x7C29, 0x7CE3,
+	0x7D89, 0x7E1D, 0x7E9C, 0x7F09, 0x7F61, 0x7FA6, 0x7FD8, 0x7FF5
 };
 
-static u16 getpitchtbl = {
-0x0000, 0x003B, 0x0076, 0x00B2, 0x00ED, 0x0128, 0x0164, 0x019F,
-0x01DB, 0x0217, 0x0252, 0x028E, 0x02CA, 0x0305, 0x0341, 0x037D,
-0x03B9, 0x03F5, 0x0431, 0x046E, 0x04AA, 0x04E6, 0x0522, 0x055F,
-0x059B, 0x05D8, 0x0614, 0x0651, 0x068D, 0x06CA, 0x0707, 0x0743,
-0x0780, 0x07BD, 0x07FA, 0x0837, 0x0874, 0x08B1, 0x08EF, 0x092C,
-0x0969, 0x09A7, 0x09E4, 0x0A21, 0x0A5F, 0x0A9C, 0x0ADA, 0x0B18,
-0x0B56, 0x0B93, 0x0BD1, 0x0C0F, 0x0C4D, 0x0C8B, 0x0CC9, 0x0D07,
-0x0D45, 0x0D84, 0x0DC2, 0x0E00, 0x0E3F, 0x0E7D, 0x0EBC, 0x0EFA,
-0x0F39, 0x0F78, 0x0FB6, 0x0FF5, 0x1034, 0x1073, 0x10B2, 0x10F1,
-0x1130, 0x116F, 0x11AE, 0x11EE, 0x122D, 0x126C, 0x12AC, 0x12EB,
-0x132B, 0x136B, 0x13AA, 0x13EA, 0x142A, 0x146A, 0x14A9, 0x14E9,
-0x1529, 0x1569, 0x15AA, 0x15EA, 0x162A, 0x166A, 0x16AB, 0x16EB,
-0x172C, 0x176C, 0x17AD, 0x17ED, 0x182E, 0x186F, 0x18B0, 0x18F0,
-0x1931, 0x1972, 0x19B3, 0x19F5, 0x1A36, 0x1A77, 0x1AB8, 0x1AFA,
-0x1B3B, 0x1B7D, 0x1BBE, 0x1C00, 0x1C41, 0x1C83, 0x1CC5, 0x1D07,
-0x1D48, 0x1D8A, 0x1DCC, 0x1E0E, 0x1E51, 0x1E93, 0x1ED5, 0x1F17,
-0x1F5A, 0x1F9C, 0x1FDF, 0x2021, 0x2064, 0x20A6, 0x20E9, 0x212C,
-0x216F, 0x21B2, 0x21F5, 0x2238, 0x227B, 0x22BE, 0x2301, 0x2344,
-0x2388, 0x23CB, 0x240E, 0x2452, 0x2496, 0x24D9, 0x251D, 0x2561,
-0x25A4, 0x25E8, 0x262C, 0x2670, 0x26B4, 0x26F8, 0x273D, 0x2781,
-0x27C5, 0x280A, 0x284E, 0x2892, 0x28D7, 0x291C, 0x2960, 0x29A5,
-0x29EA, 0x2A2F, 0x2A74, 0x2AB9, 0x2AFE, 0x2B43, 0x2B88, 0x2BCD,
-0x2C13, 0x2C58, 0x2C9D, 0x2CE3, 0x2D28, 0x2D6E, 0x2DB4, 0x2DF9,
-0x2E3F, 0x2E85, 0x2ECB, 0x2F11, 0x2F57, 0x2F9D, 0x2FE3, 0x302A,
-0x3070, 0x30B6, 0x30FD, 0x3143, 0x318A, 0x31D0, 0x3217, 0x325E,
-0x32A5, 0x32EC, 0x3332, 0x3379, 0x33C1, 0x3408, 0x344F, 0x3496,
-0x34DD, 0x3525, 0x356C, 0x35B4, 0x35FB, 0x3643, 0x368B, 0x36D3,
-0x371A, 0x3762, 0x37AA, 0x37F2, 0x383A, 0x3883, 0x38CB, 0x3913,
-0x395C, 0x39A4, 0x39ED, 0x3A35, 0x3A7E, 0x3AC6, 0x3B0F, 0x3B58,
-0x3BA1, 0x3BEA, 0x3C33, 0x3C7C, 0x3CC5, 0x3D0E, 0x3D58, 0x3DA1,
-0x3DEA, 0x3E34, 0x3E7D, 0x3EC7, 0x3F11, 0x3F5A, 0x3FA4, 0x3FEE,
-0x4038, 0x4082, 0x40CC, 0x4116, 0x4161, 0x41AB, 0x41F5, 0x4240,
-0x428A, 0x42D5, 0x431F, 0x436A, 0x43B5, 0x4400, 0x444B, 0x4495,
-0x44E1, 0x452C, 0x4577, 0x45C2, 0x460D, 0x4659, 0x46A4, 0x46F0,
-0x473B, 0x4787, 0x47D3, 0x481E, 0x486A, 0x48B6, 0x4902, 0x494E,
-0x499A, 0x49E6, 0x4A33, 0x4A7F, 0x4ACB, 0x4B18, 0x4B64, 0x4BB1,
-0x4BFE, 0x4C4A, 0x4C97, 0x4CE4, 0x4D31, 0x4D7E, 0x4DCB, 0x4E18,
-0x4E66, 0x4EB3, 0x4F00, 0x4F4E, 0x4F9B, 0x4FE9, 0x5036, 0x5084,
-0x50D2, 0x5120, 0x516E, 0x51BC, 0x520A, 0x5258, 0x52A6, 0x52F4,
-0x5343, 0x5391, 0x53E0, 0x542E, 0x547D, 0x54CC, 0x551A, 0x5569,
-0x55B8, 0x5607, 0x5656, 0x56A5, 0x56F4, 0x5744, 0x5793, 0x57E2,
-0x5832, 0x5882, 0x58D1, 0x5921, 0x5971, 0x59C1, 0x5A10, 0x5A60,
-0x5AB0, 0x5B01, 0x5B51, 0x5BA1, 0x5BF1, 0x5C42, 0x5C92, 0x5CE3,
-0x5D34, 0x5D84, 0x5DD5, 0x5E26, 0x5E77, 0x5EC8, 0x5F19, 0x5F6A,
-0x5FBB, 0x600D, 0x605E, 0x60B0, 0x6101, 0x6153, 0x61A4, 0x61F6,
-0x6248, 0x629A, 0x62EC, 0x633E, 0x6390, 0x63E2, 0x6434, 0x6487,
-0x64D9, 0x652C, 0x657E, 0x65D1, 0x6624, 0x6676, 0x66C9, 0x671C,
-0x676F, 0x67C2, 0x6815, 0x6869, 0x68BC, 0x690F, 0x6963, 0x69B6,
-0x6A0A, 0x6A5E, 0x6AB1, 0x6B05, 0x6B59, 0x6BAD, 0x6C01, 0x6C55,
-0x6CAA, 0x6CFE, 0x6D52, 0x6DA7, 0x6DFB, 0x6E50, 0x6EA4, 0x6EF9,
-0x6F4E, 0x6FA3, 0x6FF8, 0x704D, 0x70A2, 0x70F7, 0x714D, 0x71A2,
-0x71F7, 0x724D, 0x72A2, 0x72F8, 0x734E, 0x73A4, 0x73FA, 0x7450,
-0x74A6, 0x74FC, 0x7552, 0x75A8, 0x75FF, 0x7655, 0x76AC, 0x7702,
-0x7759, 0x77B0, 0x7807, 0x785E, 0x78B4, 0x790C, 0x7963, 0x79BA,
-0x7A11, 0x7A69, 0x7AC0, 0x7B18, 0x7B6F, 0x7BC7, 0x7C1F, 0x7C77,
-0x7CCF, 0x7D27, 0x7D7F, 0x7DD7, 0x7E2F, 0x7E88, 0x7EE0, 0x7F38,
-0x7F91, 0x7FEA, 0x8042, 0x809B, 0x80F4, 0x814D, 0x81A6, 0x81FF,
-0x8259, 0x82B2, 0x830B, 0x8365, 0x83BE, 0x8418, 0x8472, 0x84CB,
-0x8525, 0x857F, 0x85D9, 0x8633, 0x868E, 0x86E8, 0x8742, 0x879D,
-0x87F7, 0x8852, 0x88AC, 0x8907, 0x8962, 0x89BD, 0x8A18, 0x8A73,
-0x8ACE, 0x8B2A, 0x8B85, 0x8BE0, 0x8C3C, 0x8C97, 0x8CF3, 0x8D4F,
-0x8DAB, 0x8E07, 0x8E63, 0x8EBF, 0x8F1B, 0x8F77, 0x8FD4, 0x9030,
-0x908C, 0x90E9, 0x9146, 0x91A2, 0x91FF, 0x925C, 0x92B9, 0x9316,
-0x9373, 0x93D1, 0x942E, 0x948C, 0x94E9, 0x9547, 0x95A4, 0x9602,
-0x9660, 0x96BE, 0x971C, 0x977A, 0x97D8, 0x9836, 0x9895, 0x98F3,
-0x9952, 0x99B0, 0x9A0F, 0x9A6E, 0x9ACD, 0x9B2C, 0x9B8B, 0x9BEA,
-0x9C49, 0x9CA8, 0x9D08, 0x9D67, 0x9DC7, 0x9E26, 0x9E86, 0x9EE6,
-0x9F46, 0x9FA6, 0xA006, 0xA066, 0xA0C6, 0xA127, 0xA187, 0xA1E8,
-0xA248, 0xA2A9, 0xA30A, 0xA36B, 0xA3CC, 0xA42D, 0xA48E, 0xA4EF,
-0xA550, 0xA5B2, 0xA613, 0xA675, 0xA6D6, 0xA738, 0xA79A, 0xA7FC,
-0xA85E, 0xA8C0, 0xA922, 0xA984, 0xA9E7, 0xAA49, 0xAAAC, 0xAB0E,
-0xAB71, 0xABD4, 0xAC37, 0xAC9A, 0xACFD, 0xAD60, 0xADC3, 0xAE27,
-0xAE8A, 0xAEED, 0xAF51, 0xAFB5, 0xB019, 0xB07C, 0xB0E0, 0xB145,
-0xB1A9, 0xB20D, 0xB271, 0xB2D6, 0xB33A, 0xB39F, 0xB403, 0xB468,
-0xB4CD, 0xB532, 0xB597, 0xB5FC, 0xB662, 0xB6C7, 0xB72C, 0xB792,
-0xB7F7, 0xB85D, 0xB8C3, 0xB929, 0xB98F, 0xB9F5, 0xBA5B, 0xBAC1,
-0xBB28, 0xBB8E, 0xBBF5, 0xBC5B, 0xBCC2, 0xBD29, 0xBD90, 0xBDF7,
-0xBE5E, 0xBEC5, 0xBF2C, 0xBF94, 0xBFFB, 0xC063, 0xC0CA, 0xC132,
-0xC19A, 0xC202, 0xC26A, 0xC2D2, 0xC33A, 0xC3A2, 0xC40B, 0xC473,
-0xC4DC, 0xC544, 0xC5AD, 0xC616, 0xC67F, 0xC6E8, 0xC751, 0xC7BB,
-0xC824, 0xC88D, 0xC8F7, 0xC960, 0xC9CA, 0xCA34, 0xCA9E, 0xCB08,
-0xCB72, 0xCBDC, 0xCC47, 0xCCB1, 0xCD1B, 0xCD86, 0xCDF1, 0xCE5B,
-0xCEC6, 0xCF31, 0xCF9C, 0xD008, 0xD073, 0xD0DE, 0xD14A, 0xD1B5,
-0xD221, 0xD28D, 0xD2F8, 0xD364, 0xD3D0, 0xD43D, 0xD4A9, 0xD515,
-0xD582, 0xD5EE, 0xD65B, 0xD6C7, 0xD734, 0xD7A1, 0xD80E, 0xD87B,
-0xD8E9, 0xD956, 0xD9C3, 0xDA31, 0xDA9E, 0xDB0C, 0xDB7A, 0xDBE8,
-0xDC56, 0xDCC4, 0xDD32, 0xDDA0, 0xDE0F, 0xDE7D, 0xDEEC, 0xDF5B,
-0xDFC9, 0xE038, 0xE0A7, 0xE116, 0xE186, 0xE1F5, 0xE264, 0xE2D4,
-0xE343, 0xE3B3, 0xE423, 0xE493, 0xE503, 0xE573, 0xE5E3, 0xE654,
-0xE6C4, 0xE735, 0xE7A5, 0xE816, 0xE887, 0xE8F8, 0xE969, 0xE9DA,
-0xEA4B, 0xEABC, 0xEB2E, 0xEB9F, 0xEC11, 0xEC83, 0xECF5, 0xED66,
-0xEDD9, 0xEE4B, 0xEEBD, 0xEF2F, 0xEFA2, 0xF014, 0xF087, 0xF0FA,
-0xF16D, 0xF1E0, 0xF253, 0xF2C6, 0xF339, 0xF3AD, 0xF420, 0xF494,
-0xF507, 0xF57B, 0xF5EF, 0xF663, 0xF6D7, 0xF74C, 0xF7C0, 0xF834,
-0xF8A9, 0xF91E, 0xF992, 0xFA07, 0xFA7C, 0xFAF1, 0xFB66, 0xFBDC,
-0xFC51, 0xFCC7, 0xFD3C, 0xFDB2, 0xFE28, 0xFE9E, 0xFF14, 0xFF8A
+static const uint16_t getpitchtbl =
+{
+	0x0000, 0x003B, 0x0076, 0x00B2, 0x00ED, 0x0128, 0x0164, 0x019F,
+	0x01DB, 0x0217, 0x0252, 0x028E, 0x02CA, 0x0305, 0x0341, 0x037D,
+	0x03B9, 0x03F5, 0x0431, 0x046E, 0x04AA, 0x04E6, 0x0522, 0x055F,
+	0x059B, 0x05D8, 0x0614, 0x0651, 0x068D, 0x06CA, 0x0707, 0x0743,
+	0x0780, 0x07BD, 0x07FA, 0x0837, 0x0874, 0x08B1, 0x08EF, 0x092C,
+	0x0969, 0x09A7, 0x09E4, 0x0A21, 0x0A5F, 0x0A9C, 0x0ADA, 0x0B18,
+	0x0B56, 0x0B93, 0x0BD1, 0x0C0F, 0x0C4D, 0x0C8B, 0x0CC9, 0x0D07,
+	0x0D45, 0x0D84, 0x0DC2, 0x0E00, 0x0E3F, 0x0E7D, 0x0EBC, 0x0EFA,
+	0x0F39, 0x0F78, 0x0FB6, 0x0FF5, 0x1034, 0x1073, 0x10B2, 0x10F1,
+	0x1130, 0x116F, 0x11AE, 0x11EE, 0x122D, 0x126C, 0x12AC, 0x12EB,
+	0x132B, 0x136B, 0x13AA, 0x13EA, 0x142A, 0x146A, 0x14A9, 0x14E9,
+	0x1529, 0x1569, 0x15AA, 0x15EA, 0x162A, 0x166A, 0x16AB, 0x16EB,
+	0x172C, 0x176C, 0x17AD, 0x17ED, 0x182E, 0x186F, 0x18B0, 0x18F0,
+	0x1931, 0x1972, 0x19B3, 0x19F5, 0x1A36, 0x1A77, 0x1AB8, 0x1AFA,
+	0x1B3B, 0x1B7D, 0x1BBE, 0x1C00, 0x1C41, 0x1C83, 0x1CC5, 0x1D07,
+	0x1D48, 0x1D8A, 0x1DCC, 0x1E0E, 0x1E51, 0x1E93, 0x1ED5, 0x1F17,
+	0x1F5A, 0x1F9C, 0x1FDF, 0x2021, 0x2064, 0x20A6, 0x20E9, 0x212C,
+	0x216F, 0x21B2, 0x21F5, 0x2238, 0x227B, 0x22BE, 0x2301, 0x2344,
+	0x2388, 0x23CB, 0x240E, 0x2452, 0x2496, 0x24D9, 0x251D, 0x2561,
+	0x25A4, 0x25E8, 0x262C, 0x2670, 0x26B4, 0x26F8, 0x273D, 0x2781,
+	0x27C5, 0x280A, 0x284E, 0x2892, 0x28D7, 0x291C, 0x2960, 0x29A5,
+	0x29EA, 0x2A2F, 0x2A74, 0x2AB9, 0x2AFE, 0x2B43, 0x2B88, 0x2BCD,
+	0x2C13, 0x2C58, 0x2C9D, 0x2CE3, 0x2D28, 0x2D6E, 0x2DB4, 0x2DF9,
+	0x2E3F, 0x2E85, 0x2ECB, 0x2F11, 0x2F57, 0x2F9D, 0x2FE3, 0x302A,
+	0x3070, 0x30B6, 0x30FD, 0x3143, 0x318A, 0x31D0, 0x3217, 0x325E,
+	0x32A5, 0x32EC, 0x3332, 0x3379, 0x33C1, 0x3408, 0x344F, 0x3496,
+	0x34DD, 0x3525, 0x356C, 0x35B4, 0x35FB, 0x3643, 0x368B, 0x36D3,
+	0x371A, 0x3762, 0x37AA, 0x37F2, 0x383A, 0x3883, 0x38CB, 0x3913,
+	0x395C, 0x39A4, 0x39ED, 0x3A35, 0x3A7E, 0x3AC6, 0x3B0F, 0x3B58,
+	0x3BA1, 0x3BEA, 0x3C33, 0x3C7C, 0x3CC5, 0x3D0E, 0x3D58, 0x3DA1,
+	0x3DEA, 0x3E34, 0x3E7D, 0x3EC7, 0x3F11, 0x3F5A, 0x3FA4, 0x3FEE,
+	0x4038, 0x4082, 0x40CC, 0x4116, 0x4161, 0x41AB, 0x41F5, 0x4240,
+	0x428A, 0x42D5, 0x431F, 0x436A, 0x43B5, 0x4400, 0x444B, 0x4495,
+	0x44E1, 0x452C, 0x4577, 0x45C2, 0x460D, 0x4659, 0x46A4, 0x46F0,
+	0x473B, 0x4787, 0x47D3, 0x481E, 0x486A, 0x48B6, 0x4902, 0x494E,
+	0x499A, 0x49E6, 0x4A33, 0x4A7F, 0x4ACB, 0x4B18, 0x4B64, 0x4BB1,
+	0x4BFE, 0x4C4A, 0x4C97, 0x4CE4, 0x4D31, 0x4D7E, 0x4DCB, 0x4E18,
+	0x4E66, 0x4EB3, 0x4F00, 0x4F4E, 0x4F9B, 0x4FE9, 0x5036, 0x5084,
+	0x50D2, 0x5120, 0x516E, 0x51BC, 0x520A, 0x5258, 0x52A6, 0x52F4,
+	0x5343, 0x5391, 0x53E0, 0x542E, 0x547D, 0x54CC, 0x551A, 0x5569,
+	0x55B8, 0x5607, 0x5656, 0x56A5, 0x56F4, 0x5744, 0x5793, 0x57E2,
+	0x5832, 0x5882, 0x58D1, 0x5921, 0x5971, 0x59C1, 0x5A10, 0x5A60,
+	0x5AB0, 0x5B01, 0x5B51, 0x5BA1, 0x5BF1, 0x5C42, 0x5C92, 0x5CE3,
+	0x5D34, 0x5D84, 0x5DD5, 0x5E26, 0x5E77, 0x5EC8, 0x5F19, 0x5F6A,
+	0x5FBB, 0x600D, 0x605E, 0x60B0, 0x6101, 0x6153, 0x61A4, 0x61F6,
+	0x6248, 0x629A, 0x62EC, 0x633E, 0x6390, 0x63E2, 0x6434, 0x6487,
+	0x64D9, 0x652C, 0x657E, 0x65D1, 0x6624, 0x6676, 0x66C9, 0x671C,
+	0x676F, 0x67C2, 0x6815, 0x6869, 0x68BC, 0x690F, 0x6963, 0x69B6,
+	0x6A0A, 0x6A5E, 0x6AB1, 0x6B05, 0x6B59, 0x6BAD, 0x6C01, 0x6C55,
+	0x6CAA, 0x6CFE, 0x6D52, 0x6DA7, 0x6DFB, 0x6E50, 0x6EA4, 0x6EF9,
+	0x6F4E, 0x6FA3, 0x6FF8, 0x704D, 0x70A2, 0x70F7, 0x714D, 0x71A2,
+	0x71F7, 0x724D, 0x72A2, 0x72F8, 0x734E, 0x73A4, 0x73FA, 0x7450,
+	0x74A6, 0x74FC, 0x7552, 0x75A8, 0x75FF, 0x7655, 0x76AC, 0x7702,
+	0x7759, 0x77B0, 0x7807, 0x785E, 0x78B4, 0x790C, 0x7963, 0x79BA,
+	0x7A11, 0x7A69, 0x7AC0, 0x7B18, 0x7B6F, 0x7BC7, 0x7C1F, 0x7C77,
+	0x7CCF, 0x7D27, 0x7D7F, 0x7DD7, 0x7E2F, 0x7E88, 0x7EE0, 0x7F38,
+	0x7F91, 0x7FEA, 0x8042, 0x809B, 0x80F4, 0x814D, 0x81A6, 0x81FF,
+	0x8259, 0x82B2, 0x830B, 0x8365, 0x83BE, 0x8418, 0x8472, 0x84CB,
+	0x8525, 0x857F, 0x85D9, 0x8633, 0x868E, 0x86E8, 0x8742, 0x879D,
+	0x87F7, 0x8852, 0x88AC, 0x8907, 0x8962, 0x89BD, 0x8A18, 0x8A73,
+	0x8ACE, 0x8B2A, 0x8B85, 0x8BE0, 0x8C3C, 0x8C97, 0x8CF3, 0x8D4F,
+	0x8DAB, 0x8E07, 0x8E63, 0x8EBF, 0x8F1B, 0x8F77, 0x8FD4, 0x9030,
+	0x908C, 0x90E9, 0x9146, 0x91A2, 0x91FF, 0x925C, 0x92B9, 0x9316,
+	0x9373, 0x93D1, 0x942E, 0x948C, 0x94E9, 0x9547, 0x95A4, 0x9602,
+	0x9660, 0x96BE, 0x971C, 0x977A, 0x97D8, 0x9836, 0x9895, 0x98F3,
+	0x9952, 0x99B0, 0x9A0F, 0x9A6E, 0x9ACD, 0x9B2C, 0x9B8B, 0x9BEA,
+	0x9C49, 0x9CA8, 0x9D08, 0x9D67, 0x9DC7, 0x9E26, 0x9E86, 0x9EE6,
+	0x9F46, 0x9FA6, 0xA006, 0xA066, 0xA0C6, 0xA127, 0xA187, 0xA1E8,
+	0xA248, 0xA2A9, 0xA30A, 0xA36B, 0xA3CC, 0xA42D, 0xA48E, 0xA4EF,
+	0xA550, 0xA5B2, 0xA613, 0xA675, 0xA6D6, 0xA738, 0xA79A, 0xA7FC,
+	0xA85E, 0xA8C0, 0xA922, 0xA984, 0xA9E7, 0xAA49, 0xAAAC, 0xAB0E,
+	0xAB71, 0xABD4, 0xAC37, 0xAC9A, 0xACFD, 0xAD60, 0xADC3, 0xAE27,
+	0xAE8A, 0xAEED, 0xAF51, 0xAFB5, 0xB019, 0xB07C, 0xB0E0, 0xB145,
+	0xB1A9, 0xB20D, 0xB271, 0xB2D6, 0xB33A, 0xB39F, 0xB403, 0xB468,
+	0xB4CD, 0xB532, 0xB597, 0xB5FC, 0xB662, 0xB6C7, 0xB72C, 0xB792,
+	0xB7F7, 0xB85D, 0xB8C3, 0xB929, 0xB98F, 0xB9F5, 0xBA5B, 0xBAC1,
+	0xBB28, 0xBB8E, 0xBBF5, 0xBC5B, 0xBCC2, 0xBD29, 0xBD90, 0xBDF7,
+	0xBE5E, 0xBEC5, 0xBF2C, 0xBF94, 0xBFFB, 0xC063, 0xC0CA, 0xC132,
+	0xC19A, 0xC202, 0xC26A, 0xC2D2, 0xC33A, 0xC3A2, 0xC40B, 0xC473,
+	0xC4DC, 0xC544, 0xC5AD, 0xC616, 0xC67F, 0xC6E8, 0xC751, 0xC7BB,
+	0xC824, 0xC88D, 0xC8F7, 0xC960, 0xC9CA, 0xCA34, 0xCA9E, 0xCB08,
+	0xCB72, 0xCBDC, 0xCC47, 0xCCB1, 0xCD1B, 0xCD86, 0xCDF1, 0xCE5B,
+	0xCEC6, 0xCF31, 0xCF9C, 0xD008, 0xD073, 0xD0DE, 0xD14A, 0xD1B5,
+	0xD221, 0xD28D, 0xD2F8, 0xD364, 0xD3D0, 0xD43D, 0xD4A9, 0xD515,
+	0xD582, 0xD5EE, 0xD65B, 0xD6C7, 0xD734, 0xD7A1, 0xD80E, 0xD87B,
+	0xD8E9, 0xD956, 0xD9C3, 0xDA31, 0xDA9E, 0xDB0C, 0xDB7A, 0xDBE8,
+	0xDC56, 0xDCC4, 0xDD32, 0xDDA0, 0xDE0F, 0xDE7D, 0xDEEC, 0xDF5B,
+	0xDFC9, 0xE038, 0xE0A7, 0xE116, 0xE186, 0xE1F5, 0xE264, 0xE2D4,
+	0xE343, 0xE3B3, 0xE423, 0xE493, 0xE503, 0xE573, 0xE5E3, 0xE654,
+	0xE6C4, 0xE735, 0xE7A5, 0xE816, 0xE887, 0xE8F8, 0xE969, 0xE9DA,
+	0xEA4B, 0xEABC, 0xEB2E, 0xEB9F, 0xEC11, 0xEC83, 0xECF5, 0xED66,
+	0xEDD9, 0xEE4B, 0xEEBD, 0xEF2F, 0xEFA2, 0xF014, 0xF087, 0xF0FA,
+	0xF16D, 0xF1E0, 0xF253, 0xF2C6, 0xF339, 0xF3AD, 0xF420, 0xF494,
+	0xF507, 0xF57B, 0xF5EF, 0xF663, 0xF6D7, 0xF74C, 0xF7C0, 0xF834,
+	0xF8A9, 0xF91E, 0xF992, 0xFA07, 0xFA7C, 0xFAF1, 0xFB66, 0xFBDC,
+	0xFC51, 0xFCC7, 0xFD3C, 0xFDB2, 0xFE28, 0xFE9E, 0xFF14, 0xFF8A
 };
 
-static u8 getvoltbl = {
-0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
-0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
-0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
-0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
-0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
-0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
-0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02,
-0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02,
-0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x03, 0x03, 0x03,
-0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03,
-0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04,
-0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04,
-0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05,
-0x05, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
-0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x08, 0x08, 0x08, 0x08,
-0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09,
-0x09, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0B, 0x0B, 0x0B, 0x0B, 0x0B, 0x0B, 0x0B,
-0x0B, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0E,
-0x0E, 0x0E, 0x0E, 0x0E, 0x0E, 0x0E, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x10, 0x10, 0x10, 0x10, 0x10,
-0x10, 0x11, 0x11, 0x11, 0x11, 0x11, 0x12, 0x12, 0x12, 0x12, 0x12, 0x13, 0x13, 0x13, 0x13, 0x14,
-0x14, 0x14, 0x14, 0x14, 0x15, 0x15, 0x15, 0x15, 0x16, 0x16, 0x16, 0x16, 0x17, 0x17, 0x17, 0x18,
-0x18, 0x18, 0x18, 0x19, 0x19, 0x19, 0x19, 0x1A, 0x1A, 0x1A, 0x1B, 0x1B, 0x1B, 0x1C, 0x1C, 0x1C,
-0x1D, 0x1D, 0x1D, 0x1E, 0x1E, 0x1E, 0x1F, 0x1F, 0x1F, 0x20, 0x20, 0x20, 0x21, 0x21, 0x22, 0x22,
-0x22, 0x23, 0x23, 0x24, 0x24, 0x24, 0x25, 0x25, 0x26, 0x26, 0x27, 0x27, 0x27, 0x28, 0x28, 0x29,
-0x29, 0x2A, 0x2A, 0x2B, 0x2B, 0x2C, 0x2C, 0x2D, 0x2D, 0x2E, 0x2E, 0x2F, 0x2F, 0x30, 0x31, 0x31,
-0x32, 0x32, 0x33, 0x33, 0x34, 0x35, 0x35, 0x36, 0x36, 0x37, 0x38, 0x38, 0x39, 0x3A, 0x3A, 0x3B,
-0x3C, 0x3C, 0x3D, 0x3E, 0x3F, 0x3F, 0x40, 0x41, 0x42, 0x42, 0x43, 0x44, 0x45, 0x45, 0x46, 0x47,
-0x48, 0x49, 0x4A, 0x4A, 0x4B, 0x4C, 0x4D, 0x4E, 0x4F, 0x50, 0x51, 0x52, 0x52, 0x53, 0x54, 0x55,
-0x56, 0x57, 0x58, 0x59, 0x5A, 0x5B, 0x5D, 0x5E, 0x5F, 0x60, 0x61, 0x62, 0x63, 0x64, 0x65, 0x67,
-0x68, 0x69, 0x6A, 0x6B, 0x6D, 0x6E, 0x6F, 0x71, 0x72, 0x73, 0x75, 0x76, 0x77, 0x79, 0x7A, 0x7B,
-0x7D, 0x7E, 0x7F, 0x20, 0x21, 0x21, 0x21, 0x22, 0x22, 0x23, 0x23, 0x23, 0x24, 0x24, 0x25, 0x25,
-0x26, 0x26, 0x26, 0x27, 0x27, 0x28, 0x28, 0x29, 0x29, 0x2A, 0x2A, 0x2B, 0x2B, 0x2C, 0x2C, 0x2D,
-0x2D, 0x2E, 0x2E, 0x2F, 0x2F, 0x30, 0x30, 0x31, 0x31, 0x32, 0x33, 0x33, 0x34, 0x34, 0x35, 0x36,
-0x36, 0x37, 0x37, 0x38, 0x39, 0x39, 0x3A, 0x3B, 0x3B, 0x3C, 0x3D, 0x3E, 0x3E, 0x3F, 0x40, 0x40,
-0x41, 0x42, 0x43, 0x43, 0x44, 0x45, 0x46, 0x47, 0x47, 0x48, 0x49, 0x4A, 0x4B, 0x4C, 0x4D, 0x4D,
-0x4E, 0x4F, 0x50, 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58, 0x59, 0x5A, 0x5B, 0x5C, 0x5D,
-0x5E, 0x5F, 0x60, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x69, 0x6A, 0x6B, 0x6C, 0x6D, 0x6F, 0x70,
-0x71, 0x73, 0x74, 0x75, 0x77, 0x78, 0x79, 0x7B, 0x7C, 0x7E, 0x7E, 0x40, 0x41, 0x42, 0x43, 0x43,
-0x44, 0x45, 0x46, 0x47, 0x47, 0x48, 0x49, 0x4A, 0x4B, 0x4C, 0x4C, 0x4D, 0x4E, 0x4F, 0x50, 0x51,
-0x52, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58, 0x59, 0x5A, 0x5B, 0x5C, 0x5D, 0x5E, 0x5F, 0x60, 0x61,
-0x62, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6B, 0x6C, 0x6D, 0x6E, 0x70, 0x71, 0x72, 0x74, 0x75,
-0x76, 0x78, 0x79, 0x7B, 0x7C, 0x7D, 0x7E, 0x40, 0x41, 0x42, 0x42, 0x43, 0x44, 0x45, 0x46, 0x46,
-0x47, 0x48, 0x49, 0x4A, 0x4B, 0x4B, 0x4C, 0x4D, 0x4E, 0x4F, 0x50, 0x51, 0x52, 0x53, 0x54, 0x55,
-0x56, 0x57, 0x58, 0x59, 0x5A, 0x5B, 0x5C, 0x5D, 0x5E, 0x5F, 0x60, 0x61, 0x62, 0x63, 0x65, 0x66,
-0x67, 0x68, 0x69, 0x6A, 0x6C, 0x6D, 0x6E, 0x6F, 0x71, 0x72, 0x73, 0x75, 0x76, 0x77, 0x79, 0x7A,
-0x7C, 0x7D, 0x7E, 0x7F
+static const uint8_t getvoltbl =
+{
+	0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
+	0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
+	0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
+	0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
+	0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
+	0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
+	0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02,
+	0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02,
+	0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x03, 0x03, 0x03,
+	0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03,
+	0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04,
+	0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04,
+	0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05, 0x05,
+	0x05, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
+	0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, 0x08, 0x08, 0x08, 0x08,
+	0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x08, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09, 0x09,
+	0x09, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0A, 0x0B, 0x0B, 0x0B, 0x0B, 0x0B, 0x0B, 0x0B,
+	0x0B, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0C, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0D, 0x0E,
+	0x0E, 0x0E, 0x0E, 0x0E, 0x0E, 0x0E, 0x0F, 0x0F, 0x0F, 0x0F, 0x0F, 0x10, 0x10, 0x10, 0x10, 0x10,
+	0x10, 0x11, 0x11, 0x11, 0x11, 0x11, 0x12, 0x12, 0x12, 0x12, 0x12, 0x13, 0x13, 0x13, 0x13, 0x14,
+	0x14, 0x14, 0x14, 0x14, 0x15, 0x15, 0x15, 0x15, 0x16, 0x16, 0x16, 0x16, 0x17, 0x17, 0x17, 0x18,
+	0x18, 0x18, 0x18, 0x19, 0x19, 0x19, 0x19, 0x1A, 0x1A, 0x1A, 0x1B, 0x1B, 0x1B, 0x1C, 0x1C, 0x1C,
+	0x1D, 0x1D, 0x1D, 0x1E, 0x1E, 0x1E, 0x1F, 0x1F, 0x1F, 0x20, 0x20, 0x20, 0x21, 0x21, 0x22, 0x22,
+	0x22, 0x23, 0x23, 0x24, 0x24, 0x24, 0x25, 0x25, 0x26, 0x26, 0x27, 0x27, 0x27, 0x28, 0x28, 0x29,
+	0x29, 0x2A, 0x2A, 0x2B, 0x2B, 0x2C, 0x2C, 0x2D, 0x2D, 0x2E, 0x2E, 0x2F, 0x2F, 0x30, 0x31, 0x31,
+	0x32, 0x32, 0x33, 0x33, 0x34, 0x35, 0x35, 0x36, 0x36, 0x37, 0x38, 0x38, 0x39, 0x3A, 0x3A, 0x3B,
+	0x3C, 0x3C, 0x3D, 0x3E, 0x3F, 0x3F, 0x40, 0x41, 0x42, 0x42, 0x43, 0x44, 0x45, 0x45, 0x46, 0x47,
+	0x48, 0x49, 0x4A, 0x4A, 0x4B, 0x4C, 0x4D, 0x4E, 0x4F, 0x50, 0x51, 0x52, 0x52, 0x53, 0x54, 0x55,
+	0x56, 0x57, 0x58, 0x59, 0x5A, 0x5B, 0x5D, 0x5E, 0x5F, 0x60, 0x61, 0x62, 0x63, 0x64, 0x65, 0x67,
+	0x68, 0x69, 0x6A, 0x6B, 0x6D, 0x6E, 0x6F, 0x71, 0x72, 0x73, 0x75, 0x76, 0x77, 0x79, 0x7A, 0x7B,
+	0x7D, 0x7E, 0x7F, 0x20, 0x21, 0x21, 0x21, 0x22, 0x22, 0x23, 0x23, 0x23, 0x24, 0x24, 0x25, 0x25,
+	0x26, 0x26, 0x26, 0x27, 0x27, 0x28, 0x28, 0x29, 0x29, 0x2A, 0x2A, 0x2B, 0x2B, 0x2C, 0x2C, 0x2D,
+	0x2D, 0x2E, 0x2E, 0x2F, 0x2F, 0x30, 0x30, 0x31, 0x31, 0x32, 0x33, 0x33, 0x34, 0x34, 0x35, 0x36,
+	0x36, 0x37, 0x37, 0x38, 0x39, 0x39, 0x3A, 0x3B, 0x3B, 0x3C, 0x3D, 0x3E, 0x3E, 0x3F, 0x40, 0x40,
+	0x41, 0x42, 0x43, 0x43, 0x44, 0x45, 0x46, 0x47, 0x47, 0x48, 0x49, 0x4A, 0x4B, 0x4C, 0x4D, 0x4D,
+	0x4E, 0x4F, 0x50, 0x51, 0x52, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58, 0x59, 0x5A, 0x5B, 0x5C, 0x5D,
+	0x5E, 0x5F, 0x60, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, 0x69, 0x6A, 0x6B, 0x6C, 0x6D, 0x6F, 0x70,
+	0x71, 0x73, 0x74, 0x75, 0x77, 0x78, 0x79, 0x7B, 0x7C, 0x7E, 0x7E, 0x40, 0x41, 0x42, 0x43, 0x43,
+	0x44, 0x45, 0x46, 0x47, 0x47, 0x48, 0x49, 0x4A, 0x4B, 0x4C, 0x4C, 0x4D, 0x4E, 0x4F, 0x50, 0x51,
+	0x52, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58, 0x59, 0x5A, 0x5B, 0x5C, 0x5D, 0x5E, 0x5F, 0x60, 0x61,
+	0x62, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, 0x6B, 0x6C, 0x6D, 0x6E, 0x70, 0x71, 0x72, 0x74, 0x75,
+	0x76, 0x78, 0x79, 0x7B, 0x7C, 0x7D, 0x7E, 0x40, 0x41, 0x42, 0x42, 0x43, 0x44, 0x45, 0x46, 0x46,
+	0x47, 0x48, 0x49, 0x4A, 0x4B, 0x4B, 0x4C, 0x4D, 0x4E, 0x4F, 0x50, 0x51, 0x52, 0x53, 0x54, 0x55,
+	0x56, 0x57, 0x58, 0x59, 0x5A, 0x5B, 0x5C, 0x5D, 0x5E, 0x5F, 0x60, 0x61, 0x62, 0x63, 0x65, 0x66,
+	0x67, 0x68, 0x69, 0x6A, 0x6C, 0x6D, 0x6E, 0x6F, 0x71, 0x72, 0x73, 0x75, 0x76, 0x77, 0x79, 0x7A,
+	0x7C, 0x7D, 0x7E, 0x7F
 };
 
-u32 bios_nop(armcpu_t * cpu)
+TEMPLATE static uint32_t bios_nop()
 {
- if (cpu->proc_ID == ARMCPU_ARM9)
- {
- LOG("Unimplemented bios function %02X(ARM9) was used. R0:%08X\n", (cpu->instruction)&0x1F, cpu->R0);
- }
- else
- {
- LOG("Unimplemented bios function %02X(ARM7) was used. R0:%08X\n", (cpu->instruction)&0x1F, cpu->R0);
- }
- return 3;
+	return 3;
 }
 
-u32 delayLoop(armcpu_t * cpu)
+TEMPLATE static uint32_t WaitByLoop()
 {
- return cpu->R0 * 4;
+	uint32_t elapsed;
+
+	if (PROCNUM == ARMCPU_ARM9)
+	{
+		if (cp15.ctrl & ((1 << 16) | (1 << 18))) // DTCM or ITCM is on (cache)
+			elapsed = cpu->R0 * 2;
+		else
+			elapsed = cpu->R0 * 8;
+	}
+	else
+		elapsed = cpu->R0 * 4;
+	cpu->R0 = 0;
+	return elapsed;
 }
 
-//u32 oldmode2;
+TEMPLATE static uint32_t wait4IRQ()
+{
+	cpu->waitIRQ = true;
+	cpu->halt_IE_and_IF = true;
+	return 1;
+}
 
-u32 intrWaitARM(armcpu_t * cpu)
+TEMPLATE static uint32_t intrWaitARM()
 {
- u32 intrFlagAdr;// = (((armcp15_t *)(cpu->coproc15))->DTCMRegion&0xFFFFF000)+0x3FF8;
- u32 intr;
- u32 intrFlag = 0;
-
- //execute = false;
- if(cpu->proc_ID)
- {
- intrFlagAdr = 0x380FFF8;
- } else {
- intrFlagAdr = (((armcp15_t *)(cpu->coproc15))->DTCMRegion&0xFFFFF000)+0x3FF8;
- }
- intr = MMU_read32(cpu->proc_ID, intrFlagAdr);
- intrFlag = cpu->R1 & intr;
-
- if(intrFlag)
- {
- // si une(ou plusieurs) des interruptions que l'on attend s'est(se sont) produite(s)
- // on efface son(les) occurence(s).
- intr ^= intrFlag;
- MMU_write32(cpu->proc_ID, intrFlagAdr, intr);
- //cpu->switchMode(oldmodecpu->proc_ID);
- return 1;
- }
-
- cpu->R15 = cpu->instruct_adr;
- cpu->next_instruction = cpu->R15;
- cpu->waitIRQ = 1;
- //oldmodecpu->proc_ID = cpu->switchMode(SVC);
-
- return 1;
+	// TODO - account for differences between arm7 and arm9 (according to gbatek, the "bug doesn't work")
+
+	const uint32_t intrFlagAdr = PROCNUM == ARMCPU_ARM7 ? 0x380FFF8 : (cp15.DTCMRegion & 0xFFFFF000) + 0x3FF8;
+
+	// set IME=1
+	// without this, no irq handlers can happen (even though IF&IE waits can happily happen)
+	// and so no bits in the OS irq flag variable can get set by the handlers
+	_MMU_write32<PROCNUM>(0x04000208, 1);
+
+	// analyze the OS irq flag variable
+	uint32_t intr = _MMU_read32<PROCNUM>(intrFlagAdr);
+	uint32_t intrFlag = cpu->R1 & intr;
+
+	// if the user requested us to discard flags, then clear the flag(s) we're going to be waiting on.
+	// (be sure to only do this only on the first run through. use a little state machine to control that)
+	if (!cpu->intrWaitARM_state && cpu->R0 == 1)
+	{
+		intr ^= intrFlag;
+		_MMU_write32<PROCNUM>(intrFlagAdr, intr);
+
+		// we want to make sure we wait at least once below
+		intrFlag = 0;
+	}
+
+	cpu->intrWaitARM_state = 1;
+
+	// now, if the condition is satisfied (and it won't be the first time through, no matter what, due to cares taken above)
+	if (intrFlag)
+	{
+		// write back the OS irq flags with the ones we were waiting for cleared
+		intr ^= intrFlag;
+		_MMU_write32<PROCNUM>(intrFlagAdr, intr);
+
+		cpu->intrWaitARM_state = 0;
+		return 1;
+	}
+
+	// the condition wasn't satisfied. this means that we need to halt, wait for some enabled interrupt,
+	// and then ensure that we return to this opcode again to check the condition again
+	cpu->waitIRQ = true;
+	cpu->halt_IE_and_IF = true;
+
+	// (rewire PC to jump back to this opcode)
+	uint32_t instructAddr = cpu->instruct_adr;
+	cpu->R15 = instructAddr;
+	cpu->next_instruction = instructAddr;
+	return 1;
 }
 
-u32 waitVBlankARM(armcpu_t * cpu)
+TEMPLATE static uint32_t waitVBlankARM()
 {
- u32 intrFlagAdr;// = (((armcp15_t *)(cpu->coproc15))->DTCMRegion&0xFFFFF000)+0x3FF8;
- u32 intr;
- u32 intrFlag = 0;
-
- //execute = false;
- if(cpu->proc_ID)
- {
- intrFlagAdr = 0x380FFF8;
- } else {
- intrFlagAdr = (((armcp15_t *)(cpu->coproc15))->DTCMRegion&0xFFFFF000)+0x3FF8;
- }
- intr = MMU_read32(cpu->proc_ID, intrFlagAdr);
- intrFlag = 1 & intr;
-
- if(intrFlag)
- {
- // si une(ou plusieurs) des interruptions que l'on attend s'est(se sont) produite(s)
- // on efface son(les) occurence(s).
- intr ^= intrFlag;
- MMU_write32(cpu->proc_ID, intrFlagAdr, intr);
- //cpu->switchMode(oldmodecpu->proc_ID);
- return 1;
- }
-
- cpu->R15 = cpu->instruct_adr;
- cpu->next_instruction = cpu->R15;
- cpu->waitIRQ = 1;
- //oldmodecpu->proc_ID = cpu->switchMode(SVC);
-
- return 1;
+	cpu->R0 = 1;
+	cpu->R1 = 1;
+	return intrWaitARM<PROCNUM>();
 }
 
-u32 wait4IRQ(armcpu_t* cpu)
+TEMPLATE static uint32_t sleep()
 {
- //execute= false;
- if(cpu->wirq)
- {
- if(!cpu->waitIRQ)
- {
- cpu->waitIRQ = 0;
- cpu->wirq = 0;
- //cpu->switchMode(oldmodecpu->proc_ID);
- return 1;
- }
- cpu->R15 = cpu->instruct_adr;
- cpu->next_instruction = cpu->R15;
- return 1;
- }
- cpu->waitIRQ = 1;
- cpu->wirq = 1;
- cpu->R15 = cpu->instruct_adr;
- cpu->next_instruction = cpu->R15;
- //oldmodecpu->proc_ID = cpu->switchMode(SVC);
- return 1;
+	_MMU_write08<PROCNUM>(0x04000301, 0xC0);
+	return 1;
 }
 
-u32 devide(armcpu_t* cpu)
+TEMPLATE static uint32_t divide()
 {
- s32 num = (s32)cpu->R0;
- s32 dnum = (s32)cpu->R1;
+	int32_t num = cpu->R0;
+	int32_t dnum = cpu->R1;
 
- if(dnum==0) return 0;
+	if (!dnum)
+		return 0;
 
- cpu->R0 = (u32)(num / dnum);
- cpu->R1 = (u32)(num % dnum);
- cpu->R3 = (u32) (((s32)cpu->R0)<0 ? -cpu->R0 : cpu->R0);
+	int32_t res = num / dnum;
+	cpu->R0 = res;
+	cpu->R1 = num % dnum;
+	cpu->R3 = std::abs(res);
 
- return 6;
+	return 6;
 }
 
-u32 copy(armcpu_t* cpu)
+TEMPLATE static uint32_t copy()
 {
- u32 src = cpu->R0;
- u32 dst = cpu->R1;
- u32 cnt = cpu->R2;
-
- switch(BIT26(cnt))
- {
- case 0:
- src &= 0xFFFFFFFE;
- dst &= 0xFFFFFFFE;
- switch(BIT24(cnt))
- {
- case 0:
- cnt &= 0x1FFFFF;
- while(cnt)
- {
- MMU_write16(cpu->proc_ID, dst, MMU_read16(cpu->proc_ID, src));
- cnt--;
- dst+=2;
- src+=2;
- }
- break;
- case 1:
- {
- u32 val = MMU_read16(cpu->proc_ID, src);
- cnt &= 0x1FFFFF;
- while(cnt)
- {
- MMU_write16(cpu->proc_ID, dst, val);
- cnt--;
- dst+=2;
- }
- }
- break;
- }
- break;
- case 1:
- src &= 0xFFFFFFFC;
- dst &= 0xFFFFFFFC;
- switch(BIT24(cnt))
- {
- case 0:
- cnt &= 0x1FFFFF;
- while(cnt)
- {
- MMU_write32(cpu->proc_ID, dst, MMU_read32(cpu->proc_ID, src));
- cnt--;
- dst+=4;
- src+=4;
- }
- break;
- case 1:
- {
- u32 val = MMU_read32(cpu->proc_ID, src);
- cnt &= 0x1FFFFF;
- while(cnt)
- {
- MMU_write32(cpu->proc_ID, dst, val);
- cnt--;
- dst+=4;
- }
- }
- break;
- }
- break;
- }
- return 1;
+	uint32_t src = cpu->R0;
+	uint32_t dst = cpu->R1;
+	uint32_t cnt = cpu->R2;
+
+	switch (BIT26(cnt))
+	{
+		case 0:
+			src &= 0xFFFFFFFE;
+			dst &= 0xFFFFFFFE;
+			switch (BIT24(cnt))
+			{
+				case 0:
+					cnt &= 0x1FFFFF;
+					while (cnt)
+					{
+						_MMU_write16<PROCNUM>(dst, _MMU_read16<PROCNUM>(src));
+						--cnt;
+						dst += 2;
+						src += 2;
+					}
+					break;
+				case 1:
+				{
+					uint16_t val = _MMU_read16<PROCNUM>(src);
+					cnt &= 0x1FFFFF;
+					while (cnt)
+					{
+						_MMU_write16<PROCNUM>(dst, val);
+						--cnt;
+						dst += 2;
+					}
+					break;
+				}
+			}
+			break;
+		case 1:
+			src &= 0xFFFFFFFC;
+			dst &= 0xFFFFFFFC;
+			switch (BIT24(cnt))
+			{
+				case 0:
+					cnt &= 0x1FFFFF;
+					while (cnt)
+					{
+						_MMU_write32<PROCNUM>(dst, _MMU_read32<PROCNUM>(src));
+						--cnt;
+						dst += 4;
+						src += 4;
+					}
+					break;
+				case 1:
+				{
+					uint32_t val = _MMU_read32<PROCNUM>(src);
+					cnt &= 0x1FFFFF;
+					while (cnt)
+					{
+						_MMU_write32<PROCNUM>(dst, val);
+						--cnt;
+						dst += 4;
+					}
+					break;
+				}
+			}
+			break;
+	}
+	return 1;
 }
 
-u32 fastCopy(armcpu_t* cpu)
+TEMPLATE static uint32_t fastCopy()
 {
- u32 src = cpu->R0 & 0xFFFFFFFC;
- u32 dst = cpu->R1 & 0xFFFFFFFC;
- u32 cnt = cpu->R2;
-
- switch(BIT24(cnt))
- {
- case 0:
- cnt &= 0x1FFFFF;
- while(cnt)
- {
- MMU_write32(cpu->proc_ID, dst, MMU_read32(cpu->proc_ID, src));
- cnt--;
- dst+=4;
- src+=4;
- }
- break;
- case 1:
- {
- u32 val = MMU_read32(cpu->proc_ID, src);
- cnt &= 0x1FFFFF;
- while(cnt)
- {
- MMU_write32(cpu->proc_ID, dst, val);
- cnt--;
- dst+=4;
- }
- }
- break;
- }
- return 1;
+	uint32_t src = cpu->R0 & 0xFFFFFFFC;
+	uint32_t dst = cpu->R1 & 0xFFFFFFFC;
+	uint32_t cnt = cpu->R2;
+
+	switch (BIT24(cnt))
+	{
+		case 0:
+			cnt &= 0x1FFFFF;
+			while (cnt)
+			{
+				_MMU_write32<PROCNUM>(dst, _MMU_read32<PROCNUM>(src));
+				--cnt;
+				dst += 4;
+				src += 4;
+			}
+			break;
+		case 1:
+		{
+			uint32_t val = _MMU_read32<PROCNUM>(src);
+			cnt &= 0x1FFFFF;
+			while (cnt)
+			{
+				_MMU_write32<PROCNUM>(dst, val);
+				--cnt;
+				dst += 4;
+			}
+			break;
+		}
+	}
+	return 1;
 }
 
-u32 LZ77UnCompVram(armcpu_t* cpu)
+TEMPLATE static uint32_t LZ77UnCompVram()
 {
- int i1, i2;
- int byteCount;
- int byteShift;
- u32 writeValue;
- int len;
- u32 source = cpu->R0;
- u32 dest = cpu->R1;
- u32 header = MMU_read32(cpu->proc_ID, source);
- source += 4;
-
- if(((source & 0xe000000) == 0) ||
- ((source + ((header >> 8) & 0x1fffff)) & 0xe000000) == 0)
- return 0;
-
- byteCount = 0;
- byteShift = 0;
- writeValue = 0;
-
- len = header >> 8;
-
- while(len > 0) {
- u8 d = MMU_read8(cpu->proc_ID, source++);
-
- if(d) {
- for(i1 = 0; i1 < 8; i1++) {
- if(d & 0x80) {
- int length;
- int offset;
- u32 windowOffset;
- u16 data = MMU_read8(cpu->proc_ID, source++) << 8;
- data |= MMU_read8(cpu->proc_ID, source++);
- length = (data >> 12) + 3;
- offset = (data & 0x0FFF);
- windowOffset = dest + byteCount - offset - 1;
- for(i2 = 0; i2 < length; i2++) {
- writeValue |= (MMU_read8(cpu->proc_ID, windowOffset++) << byteShift);
- byteShift += 8;
- byteCount++;
-
- if(byteCount == 2) {
- MMU_write16(cpu->proc_ID, dest, writeValue);
- dest += 2;
- byteCount = 0;
- byteShift = 0;
- writeValue = 0;
- }
- len--;
- if(len == 0)
- return 0;
- }
- } else {
- writeValue |= (MMU_read8(cpu->proc_ID, source++) << byteShift);
- byteShift += 8;
- byteCount++;
- if(byteCount == 2) {
- MMU_write16(cpu->proc_ID, dest, writeValue);
- dest += 2;
- byteCount = 0;
- byteShift = 0;
- writeValue = 0;
- }
- len--;
- if(len == 0)
- return 0;
- }
- d <<= 1;
- }
- } else {
- for(i1 = 0; i1 < 8; i1++) {
- writeValue |= (MMU_read8(cpu->proc_ID, source++) << byteShift);
- byteShift += 8;
- byteCount++;
- if(byteCount == 2) {
- MMU_write16(cpu->proc_ID, dest, writeValue);
- dest += 2;
- byteShift = 0;
- byteCount = 0;
- writeValue = 0;
- }
- len--;
- if(len == 0)
- return 0;
- }
- }
- }
- return 1;
+	uint32_t source = cpu->R0;
+	uint32_t dest = cpu->R1;
+	uint32_t header = _MMU_read32<PROCNUM>(source);
+	source += 4;
+
+	if (!(source & 0xe000000) || !((source + ((header >> 8) & 0x1fffff)) & 0xe000000))
+		return 0;
+
+	int byteCount = 0;
+	int byteShift = 0;
+	uint32_t writeValue = 0;
+
+	int len = header >> 8;
+
+	while (len > 0)
+	{
+		uint8_t d = _MMU_read08<PROCNUM>(source++);
+
+		int i1, i2;
+		if (d)
+		{
+			for (i1 = 0; i1 < 8; ++i1)
+			{
+				if (d & 0x80)
+				{
+					uint16_t data = _MMU_read08<PROCNUM>(source++) << 8;
+					data |= _MMU_read08<PROCNUM>(source++);
+					int length = (data >> 12) + 3;
+					int offset = data & 0x0FFF;
+					uint32_t windowOffset = dest + byteCount - offset - 1;
+					for (i2 = 0; i2 < length; ++i2)
+					{
+						writeValue |= _MMU_read08<PROCNUM>(windowOffset++) << byteShift;
+						byteShift += 8;
+						++byteCount;
+
+						if (byteCount == 2)
+						{
+							_MMU_write16<PROCNUM>(dest, writeValue & 0xFFFF);
+							dest += 2;
+							byteCount = 0;
+							byteShift = 0;
+							writeValue = 0;
+						}
+						--len;
+						if (!len)
+							return 0;
+					}
+				}
+				else
+				{
+					writeValue |= _MMU_read08<PROCNUM>(source++) << byteShift;
+					byteShift += 8;
+					++byteCount;
+					if (byteCount == 2)
+					{
+						_MMU_write16<PROCNUM>(dest, writeValue & 0xFFFF);
+						dest += 2;
+						byteCount = 0;
+						byteShift = 0;
+						writeValue = 0;
+					}
+					--len;
+					if (!len)
+						return 0;
+				}
+				d <<= 1;
+			}
+		}
+		else
+		{
+			for (i1 = 0; i1 < 8; ++i1)
+			{
+				writeValue |= _MMU_read08<PROCNUM>(source++) << byteShift;
+				byteShift += 8;
+				++byteCount;
+				if (byteCount == 2)
+				{
+					_MMU_write16<PROCNUM>(dest, writeValue & 0xFFFF);
+					dest += 2;
+					byteShift = 0;
+					byteCount = 0;
+					writeValue = 0;
+				}
+				--len;
+				if (!len)
+					return 0;
+			}
+		}
+	}
+	return 1;
 }
 
-u32 LZ77UnCompWram(armcpu_t* cpu)
+TEMPLATE static uint32_t LZ77UnCompWram()
 {
- int i1, i2;
- int len;
- u32 source = cpu->R0;
- u32 dest = cpu->R1;
-
- u32 header = MMU_read32(cpu->proc_ID, source);
- source += 4;
-
- if(((source & 0xe000000) == 0) ||
- ((source + ((header >> 8) & 0x1fffff)) & 0xe000000) == 0)
- return 0;
-
- len = header >> 8;
-
- while(len > 0) {
- u8 d = MMU_read8(cpu->proc_ID, source++);
-
- if(d) {
- for(i1 = 0; i1 < 8; i1++) {
- if(d & 0x80) {
- int length;
- int offset;
- u32 windowOffset;
- u16 data = MMU_read8(cpu->proc_ID, source++) << 8;
- data |= MMU_read8(cpu->proc_ID, source++);
- length = (data >> 12) + 3;
- offset = (data & 0x0FFF);
- windowOffset = dest - offset - 1;
- for(i2 = 0; i2 < length; i2++) {
- MMU_write8(cpu->proc_ID, dest++, MMU_read8(cpu->proc_ID, windowOffset++));
- len--;
- if(len == 0)
- return 0;
- }
- } else {
- MMU_write8(cpu->proc_ID, dest++, MMU_read8(cpu->proc_ID, source++));
- len--;
- if(len == 0)
- return 0;
- }
- d <<= 1;
- }
- } else {
- for(i1 = 0; i1 < 8; i1++) {
- MMU_write8(cpu->proc_ID, dest++, MMU_read8(cpu->proc_ID, source++));
- len--;
- if(len == 0)
- return 0;
- }
- }
- }
- return 1;
+	uint32_t source = cpu->R0;
+	uint32_t dest = cpu->R1;
+	uint32_t header = _MMU_read32<PROCNUM>(source);
+	source += 4;
+
+	if (!(source & 0xe000000) || !((source + ((header >> 8) & 0x1fffff)) & 0xe000000))
+		return 0;
+
+	int len = header >> 8;
+
+	while (len > 0)
+	{
+		uint8_t d = _MMU_read08<PROCNUM>(source++);
+
+		int i1, i2;
+		if (d)
+		{
+			for (i1 = 0; i1 < 8; ++i1)
+			{
+				if (d & 0x80)
+				{
+					uint16_t data = _MMU_read08<PROCNUM>(source++) << 8;
+					data |= _MMU_read08<PROCNUM>(source++);
+					int length = (data >> 12) + 3;
+					int offset = data & 0x0FFF;
+					uint32_t windowOffset = dest - offset - 1;
+					for (i2 = 0; i2 < length; ++i2)
+					{
+						_MMU_write08<PROCNUM>(dest++, _MMU_read08<PROCNUM>(windowOffset++));
+						--len;
+						if (!len)
+							return 0;
+					}
+				}
+				else
+				{
+					_MMU_write08<PROCNUM>(dest++, _MMU_read08<PROCNUM>(source++));
+					--len;
+					if (!len)
+						return 0;
+				}
+				d <<= 1;
+			}
+		}
+		else
+		{
+			for (i1 = 0; i1 < 8; ++i1)
+			{
+				_MMU_write08<PROCNUM>(dest++, _MMU_read08<PROCNUM>(source++));
+				--len;
+				if (!len)
+					return 0;
+			}
+		}
+	}
+	return 1;
 }
 
-u32 RLUnCompVram(armcpu_t* cpu)
+TEMPLATE static uint32_t RLUnCompVram()
 {
- int i;
- int len;
- int byteCount;
- int byteShift;
- u32 writeValue;
- u32 source = cpu->R0;
- u32 dest = cpu->R1;
-
- u32 header = MMU_read32(cpu->proc_ID, source);
- source += 4;
-
- if(((source & 0xe000000) == 0) ||
- ((source + ((header >> 8) & 0x1fffff)) & 0xe000000) == 0)
- return 0;
-
- len = header >> 8;
- byteCount = 0;
- byteShift = 0;
- writeValue = 0;
-
- while(len > 0) {
- u8 d = MMU_read8(cpu->proc_ID, source++);
- int l = d & 0x7F;
- if(d & 0x80) {
- u8 data = MMU_read8(cpu->proc_ID, source++);
- l += 3;
- for(i = 0;i < l; i++) {
- writeValue |= (data << byteShift);
- byteShift += 8;
- byteCount++;
-
- if(byteCount == 2) {
- MMU_write16(cpu->proc_ID, dest, writeValue);
- dest += 2;
- byteCount = 0;
- byteShift = 0;
- writeValue = 0;
- }
- len--;
- if(len == 0)
- return 0;
- }
- } else {
- l++;
- for(i = 0; i < l; i++) {
- writeValue |= (MMU_read8(cpu->proc_ID, source++) << byteShift);
- byteShift += 8;
- byteCount++;
- if(byteCount == 2) {
- MMU_write16(cpu->proc_ID, dest, writeValue);
- dest += 2;
- byteCount = 0;
- byteShift = 0;
- writeValue = 0;
- }
- len--;
- if(len == 0)
- return 0;
- }
- }
- }
- return 1;
+	uint32_t source = cpu->R0;
+	uint32_t dest = cpu->R1;
+	uint32_t header = _MMU_read32<PROCNUM>(source);
+	source += 4;
+
+	if (!(source & 0xe000000) || !((source + ((header >> 8) & 0x1fffff)) & 0xe000000))
+		return 0;
+
+	int len = header >> 8;
+	int byteCount = 0;
+	int byteShift = 0;
+	uint32_t writeValue = 0;
+
+	while (len > 0)
+	{
+		uint8_t d = _MMU_read08<PROCNUM>(source++);
+		int l = d & 0x7F;
+
+		int i;
+		if (d & 0x80)
+		{
+			uint8_t data = _MMU_read08<PROCNUM>(source++);
+			l += 3;
+			for (i = 0; i < l; ++i)
+			{
+				writeValue |= data << byteShift;
+				byteShift += 8;
+				++byteCount;
+
+				if (byteCount == 2)
+				{
+					_MMU_write16<PROCNUM>(dest, writeValue & 0xFFFF);
+					dest += 2;
+					byteCount = 0;
+					byteShift = 0;
+					writeValue = 0;
+				}
+				--len;
+				if (!len)
+					return 0;
+			}
+		}
+		else
+		{
+			++l;
+			for (i = 0; i < l; ++i)
+			{
+				writeValue |= _MMU_read08<PROCNUM>(source++) << byteShift;
+				byteShift += 8;
+				++byteCount;
+
+				if (byteCount == 2)
+				{
+					_MMU_write16<PROCNUM>(dest, writeValue & 0xFFFF);
+					dest += 2;
+					byteCount = 0;
+					byteShift = 0;
+					writeValue = 0;
+				}
+				--len;
+				if (!len)
+					return 0;
+			}
+		}
+	}
+	return 1;
 }
 
-u32 RLUnCompWram(armcpu_t* cpu)
+TEMPLATE static uint32_t RLUnCompWram()
 {
- int i;
- int len;
- u32 source = cpu->R0;
- u32 dest = cpu->R1;
-
- u32 header = MMU_read32(cpu->proc_ID, source);
- source += 4;
-
- if(((source & 0xe000000) == 0) ||
- ((source + ((header >> 8) & 0x1fffff)) & 0xe000000) == 0)
- return 0;
-
- len = header >> 8;
-
- while(len > 0) {
- u8 d = MMU_read8(cpu->proc_ID, source++);
- int l = d & 0x7F;
- if(d & 0x80) {
- u8 data = MMU_read8(cpu->proc_ID, source++);
- l += 3;
- for(i = 0;i < l; i++) {
- MMU_write8(cpu->proc_ID, dest++, data);
- len--;
- if(len == 0)
- return 0;
- }
- } else {
- l++;
- for(i = 0; i < l; i++) {
- MMU_write8(cpu->proc_ID, dest++, MMU_read8(cpu->proc_ID, source++));
- len--;
- if(len == 0)
- return 0;
- }
- }
- }
- return 1;
+	uint32_t source = cpu->R0;
+	uint32_t dest = cpu->R1;
+	uint32_t header = _MMU_read32<PROCNUM>(source);
+	source += 4;
+
+	if (!(source & 0xe000000) || !((source + ((header >> 8) & 0x1fffff)) & 0xe000000))
+		return 0;
+
+	int len = header >> 8;
+
+	while (len > 0)
+	{
+		uint8_t d = _MMU_read08<PROCNUM>(source++);
+		int l = d & 0x7F;
+
+		int i;
+		if (d & 0x80)
+		{
+			uint8_t data = _MMU_read08<PROCNUM>(source++);
+			l += 3;
+			for (i = 0; i < l; ++i)
+			{
+				_MMU_write08<PROCNUM>(dest++, data);
+				--len;
+				if (!len)
+					return 0;
+			}
+		}
+		else
+		{
+			++l;
+			for (i = 0; i < l; ++i)
+			{
+				_MMU_write08<PROCNUM>(dest++, _MMU_read08<PROCNUM>(source++));
+				--len;
+				if (!len)
+					return 0;
+			}
+		}
+	}
+	return 1;
 }
 
-u32 UnCompHuffman(armcpu_t* cpu)
+TEMPLATE static uint32_t UnCompHuffman()
 {
- u32 source, dest, writeValue, header, treeStart, mask;
- u32 data;
- u8 treeSize, currentNode, rootNode;
- int byteCount, byteShift, len, pos;
- int writeData;
-
- source = cpu->R0;
- dest = cpu->R1;
-
- header = MMU_read8(cpu->proc_ID, source);
- source += 4;
-
- if(((source & 0xe000000) == 0) ||
- ((source + ((header >> 8) & 0x1fffff)) & 0xe000000) == 0)
- return 0;
-
- treeSize = MMU_read8(cpu->proc_ID, source++);
-
- treeStart = source;
-
- source += ((treeSize+1)<<1)-1; // minus because we already skipped one byte
-
- len = header >> 8;
-
- mask = 0x80000000;
- data = MMU_read8(cpu->proc_ID, source);
- source += 4;
-
- pos = 0;
- rootNode = MMU_read8(cpu->proc_ID, treeStart);
- currentNode = rootNode;
- writeData = 0;
- byteShift = 0;
- byteCount = 0;
- writeValue = 0;
-
- if((header & 0x0F) == 8) {
- while(len > 0) {
- // take left
- if(pos == 0)
- pos++;
- else
- pos += (((currentNode & 0x3F)+1)<<1);
-
- if(data & mask) {
- // right
- if(currentNode & 0x40)
- writeData = 1;
- currentNode = MMU_read8(cpu->proc_ID, treeStart+pos+1);
- } else {
- // left
- if(currentNode & 0x80)
- writeData = 1;
- currentNode = MMU_read8(cpu->proc_ID, treeStart+pos);
- }
-
- if(writeData) {
- writeValue |= (currentNode << byteShift);
- byteCount++;
- byteShift += 8;
-
- pos = 0;
- currentNode = rootNode;
- writeData = 0;
-
- if(byteCount == 4) {
- byteCount = 0;
- byteShift = 0;
- MMU_write8(cpu->proc_ID, dest, writeValue);
- writeValue = 0;
- dest += 4;
- len -= 4;
- }
- }
- mask >>= 1;
- if(mask == 0) {
- mask = 0x80000000;
- data = MMU_read8(cpu->proc_ID, source);
- source += 4;
- }
- }
- } else {
- int halfLen = 0;
- int value = 0;
- while(len > 0) {
- // take left
- if(pos == 0)
- pos++;
- else
- pos += (((currentNode & 0x3F)+1)<<1);
-
- if((data & mask)) {
- // right
- if(currentNode & 0x40)
- writeData = 1;
- currentNode = MMU_read8(cpu->proc_ID, treeStart+pos+1);
- } else {
- // left
- if(currentNode & 0x80)
- writeData = 1;
- currentNode = MMU_read8(cpu->proc_ID, treeStart+pos);
- }
-
- if(writeData) {
- if(halfLen == 0)
- value |= currentNode;
- else
- value |= (currentNode<<4);
-
- halfLen += 4;
- if(halfLen == 8) {
- writeValue |= (value << byteShift);
- byteCount++;
- byteShift += 8;
-
- halfLen = 0;
- value = 0;
-
- if(byteCount == 4) {
- byteCount = 0;
- byteShift = 0;
- MMU_write8(cpu->proc_ID, dest, writeValue);
- dest += 4;
- writeValue = 0;
- len -= 4;
- }
- }
- pos = 0;
- currentNode = rootNode;
- writeData = 0;
- }
- mask >>= 1;
- if(mask == 0) {
- mask = 0x80000000;
- data = MMU_read8(cpu->proc_ID, source);
- source += 4;
- }
- }
- }
- return 1;
+	uint32_t source = cpu->R0;
+	uint32_t dest = cpu->R1;
+	uint32_t header = _MMU_read32<PROCNUM>(source);
+	source += 4;
+
+	if (!(source & 0xe000000) || !((source + ((header >> 8) & 0x1fffff)) & 0xe000000))
+		return 0;
+
+	uint8_t treeSize = _MMU_read08<PROCNUM>(source++);
+
+	uint32_t treeStart = source;
+
+	source += ((treeSize + 1) << 1) - 1; // minus because we already skipped one byte
+
+	int len = header >> 8;
+
+	uint32_t mask = 0x80000000;
+	uint32_t data = _MMU_read32<PROCNUM>(source);
+	source += 4;
+
+	int pos = 0;
+	uint8_t rootNode = _MMU_read08<PROCNUM>(treeStart);
+	uint8_t currentNode = rootNode;
+	int writeData = 0;
+	int byteShift = 0;
+	int byteCount = 0;
+	uint32_t writeValue = 0;
+
+	if ((header & 0x0F) == 8)
+	{
+		while (len > 0)
+		{
+			// take left
+			if (!pos)
+				++pos;
+			else
+				pos += ((currentNode & 0x3F) + 1) << 1;
+
+			if (data & mask)
+			{
+				// right
+				if (currentNode & 0x40)
+					writeData = 1;
+				currentNode = _MMU_read08<PROCNUM>(treeStart + pos + 1);
+			}
+			else
+			{
+				// left
+				if (currentNode & 0x80)
+					writeData = 1;
+				currentNode = _MMU_read08<PROCNUM>(treeStart + pos);
+			}
+
+			if (writeData)
+			{
+				writeValue |= currentNode << byteShift;
+				++byteCount;
+				byteShift += 8;
+
+				pos = 0;
+				currentNode = rootNode;
+				writeData = 0;
+
+				if (byteCount == 4)
+				{
+					byteCount = 0;
+					byteShift = 0;
+					_MMU_write32<PROCNUM>(dest, writeValue);
+					writeValue = 0;
+					dest += 4;
+					len -= 4;
+				}
+			}
+			mask >>= 1;
+			if (!mask)
+			{
+				mask = 0x80000000;
+				data = _MMU_read32<PROCNUM>(source);
+				source += 4;
+			}
+		}
+	}
+	else
+	{
+		int halfLen = 0;
+		int value = 0;
+		while (len > 0)
+		{
+			// take left
+			if (!pos)
+				++pos;
+			else
+				pos += ((currentNode & 0x3F) + 1) << 1;
+
+			if (data & mask)
+			{
+				// right
+				if (currentNode & 0x40)
+					writeData = 1;
+				currentNode = _MMU_read08<PROCNUM>(treeStart + pos + 1);
+			}
+			else
+			{
+				// left
+				if (currentNode & 0x80)
+					writeData = 1;
+				currentNode = _MMU_read08<PROCNUM>(treeStart + pos);
+			}
+
+			if (writeData)
+			{
+				if (!halfLen)
+					value |= currentNode;
+				else
+					value |= currentNode << 4;
+
+				halfLen += 4;
+				if (halfLen == 8)
+				{
+					writeValue |= value << byteShift;
+					++byteCount;
+					byteShift += 8;
+
+					halfLen = 0;
+					value = 0;
+
+					if (byteCount == 4)
+					{
+						byteCount = 0;
+						byteShift = 0;
+						_MMU_write32<PROCNUM>(dest, writeValue);
+						dest += 4;
+						writeValue = 0;
+						len -= 4;
+					}
+				}
+				pos = 0;
+				currentNode = rootNode;
+				writeData = 0;
+			}
+			mask >>= 1;
+			if (!mask)
+			{
+				mask = 0x80000000;
+				data = _MMU_read32<PROCNUM>(source);
+				source += 4;
+			}
+		}
+	}
+	return 1;
 }
 
-u32 BitUnPack(armcpu_t* cpu)
+TEMPLATE static uint32_t BitUnPack()
 {
- u32 source,dest,header,base,d,temp;
- int len,bits,revbits,dataSize,data,bitwritecount,mask,bitcount,addBase;
- u8 b;
-
- source = cpu->R0;
- dest = cpu->R1;
- header = cpu->R2;
-
- len = MMU_read16(cpu->proc_ID, header);
- // check address
- bits = MMU_read8(cpu->proc_ID, header+2);
- revbits = 8 - bits;
- // u32 value = 0;
- base = MMU_read8(cpu->proc_ID, header+4);
- addBase = (base & 0x80000000) ? 1 : 0;
- base &= 0x7fffffff;
- dataSize = MMU_read8(cpu->proc_ID, header+3);
-
- data = 0;
- bitwritecount = 0;
- while(1) {
- len -= 1;
- if(len < 0)
- break;
- mask = 0xff >> revbits;
- b = MMU_read8(cpu->proc_ID, source);
- source++;
- bitcount = 0;
- while(1) {
- if(bitcount >= 8)
- break;
- d = b & mask;
- temp = d >> bitcount;
- if(!temp && addBase) {
+	uint32_t source = cpu->R0;
+	uint32_t dest = cpu->R1;
+	uint32_t header = cpu->R2;
+
+	int len = _MMU_read16<PROCNUM>(header);
+	int bits = _MMU_read08<PROCNUM>(header + 2);
+	switch (bits)
+	{
+		case 1:
+		case 2:
+		case 4:
+		case 8:
+			break;
+		default:
+			return 0; // error
+	}
+	int dataSize = _MMU_read08<PROCNUM>(header + 3);
+	switch (dataSize)
+	{
+		case 1:
+		case 2:
+		case 4:
+		case 8:
+		case 16:
+		case 32:
+			break;
+		default:
+			return 0; // error
+	}
+
+	int revbits = 8 - bits;
+	uint32_t base = _MMU_read32<PROCNUM>(header + 4);
+	int addBase = base & 0x80000000 ? 1 : 0;
+	base &= 0x7fffffff;
+
+	int data = 0;
+	int bitwritecount = 0;
+	while (1)
+	{
+		len -= 1;
+		if (len < 0)
+			break;
+		int mask = 0xff >> revbits;
+		uint8_t b = _MMU_read08<PROCNUM>(source);
+		++source;
+		int bitcount = 0;
+		while (1)
+		{
+			if (bitcount >= 8)
+				break;
+ uint32_t temp = b & mask;
+ if (temp || addBase) {
 temp += base;
 }
- data |= temp << bitwritecount;
- bitwritecount += dataSize;
- if(bitwritecount >= 32) {
- MMU_write8(cpu->proc_ID, dest, data);
- dest += 4;
- data = 0;
- bitwritecount = 0;
- }
- mask <<= bits;
- bitcount += bits;
- }
- }
- return 1;
+			data |= temp << bitwritecount;
+			bitwritecount += dataSize;
+			if (bitwritecount >= 32)
+			{
+				_MMU_write32<PROCNUM>(dest, data);
+				dest += 4;
+				data = 0;
+				bitwritecount = 0;
+			}
+			bitcount += bits;
+ b >>= bits;
+		}
+	}
+	return 1;
 }
 
-u32 Diff8bitUnFilterWram(armcpu_t* cpu)
+TEMPLATE static uint32_t Diff8bitUnFilterWram()
 {
- u32 source,dest,header;
- u8 data,diff;
- int len;
-
- source = cpu->R0;
- dest = cpu->R1;
+	uint32_t source = cpu->R0;
+	uint32_t dest = cpu->R1;
+	CompressionHeader header(_MMU_read32<PROCNUM>(source));
+	source += 4;
 
- header = MMU_read8(cpu->proc_ID, source);
- source += 4;
+	int len = header.DecompressedSize();
 
- if(((source & 0xe000000) == 0) ||
- (( (source + ((header >> 8) & 0x1fffff)) & 0xe000000) == 0))
- return 0;
+ if (PROCNUM == ARMCPU_ARM7) {
+ if (!(source & 0xe000000) || !((source + (len & 0x1fffff)) & 0xe000000))
+ return 0;
+ }
 
- len = header >> 8;
+	uint8_t data = _MMU_read08<PROCNUM>(source++);
+	_MMU_write08<PROCNUM>(dest++, data);
+	--len;
+
+	while (len > 0)
+	{
+		uint8_t diff = _MMU_read08<PROCNUM>(source++);
+		data += diff;
+		_MMU_write08<PROCNUM>(dest++, data);
+		--len;
+	}
+	return 1;
+}
 
- data = MMU_read8(cpu->proc_ID, source++);
- MMU_write8(cpu->proc_ID, dest++, data);
- len--;
+TEMPLATE static uint32_t Diff16bitUnFilter()
+{
+	uint32_t source = cpu->R0;
+	uint32_t dest = cpu->R1;
+	CompressionHeader header(_MMU_read32<PROCNUM>(source));
+	source += 4;
+
+	int len = header.DecompressedSize();
+
+	uint16_t data = _MMU_read16<PROCNUM>(source);
+	source += 2;
+	_MMU_write16<PROCNUM>(dest, data);
+	dest += 2;
+	len -= 2;
+
+	while (len >= 2)
+	{
+		uint16_t diff = _MMU_read16<PROCNUM>(source);
+		source += 2;
+		data += diff;
+		_MMU_write16<PROCNUM>(dest, data);
+		dest += 2;
+		len -= 2;
+	}
+	return 1;
+}
 
- while(len > 0) {
- diff = MMU_read8(cpu->proc_ID, source++);
- data += diff;
- MMU_write8(cpu->proc_ID, dest++, data);
- len--;
- }
- return 1;
+TEMPLATE static uint32_t bios_sqrt()
+{
+	cpu->R0 = static_cast<uint32_t>(std::sqrt(static_cast<double>(cpu->R0)));
+	return 1;
 }
 
-u32 Diff16bitUnFilter(armcpu_t* cpu)
+TEMPLATE static uint32_t CustomPost()
 {
- u32 source,dest,header;
- u16 data;
- int len;
-
- source = cpu->R0;
- dest = cpu->R1;
-
- header = MMU_read8(cpu->proc_ID, source);
- source += 4;
-
- if(((source & 0xe000000) == 0) ||
- ((source + ((header >> 8) & 0x1fffff)) & 0xe000000) == 0)
- return 0;
-
- len = header >> 8;
-
- data = MMU_read16(cpu->proc_ID, source);
- source += 2;
- MMU_write16(cpu->proc_ID, dest, data);
- dest += 2;
- len -= 2;
-
- while(len >= 2) {
- u16 diff = MMU_read16(cpu->proc_ID, source);
- source += 2;
- data += diff;
- MMU_write16(cpu->proc_ID, dest, data);
- dest += 2;
- len -= 2;
- }
+ _MMU_write08<PROCNUM>(REG_POSTFLG, cpu->R0);
 return 1;
 }
 
-u32 bios_sqrt(armcpu_t* cpu)
+TEMPLATE static uint32_t CustomHalt()
 {
- cpu->R0 = (u32)sqrt((double)(cpu->R0));
- return 1;
+	_MMU_write08<PROCNUM>(REG_HALTCNT, cpu->R2);
+	return 1;
 }
 
-u32 setHaltCR(armcpu_t* cpu)
+TEMPLATE static uint32_t getSineTab()
 {
- MMU_write8(cpu->proc_ID, 0x4000300+cpu->proc_ID, cpu->R0);
- return 1;
+	// ds returns garbage according to gbatek, but we must protect ourselves
+	if (cpu->R0 >= ARRAY_SIZE(getsinetbl))
+	{
+		fprintf(stderr, "Invalid SWI getSineTab: %08X\n", cpu->R0);
+		return 1;
+	}
+
+	cpu->R0 = getsinetblcpu->R0;
+	return 1;
 }
 
-u32 getSineTab(armcpu_t* cpu)
+TEMPLATE static uint32_t getPitchTab()
 {
- cpu->R0 = getsinetblcpu->R0;
- return 1;
+	// ds returns garbage according to gbatek, but we must protect ourselves
+	if (cpu->R0 >= ARRAY_SIZE(getpitchtbl))
+	{
+		fprintf(stderr, "Invalid SWI getPitchTab: %08X\n", cpu->R0);
+		return 1;
+	}
+
+	cpu->R0 = getpitchtblcpu->R0;
+	return 1;
 }
 
-u32 getPitchTab(armcpu_t* cpu)
+TEMPLATE static uint32_t getVolumeTab()
 {
- cpu->R0 = getpitchtblcpu->R0;
- return 1;
+	// ds returns garbage according to gbatek, but we must protect ourselves
+	if (cpu->R0 >= ARRAY_SIZE(getvoltbl))
+	{
+		fprintf(stderr, "Invalid SWI getVolumeTab: %08X\n", cpu->R0);
+		return 1;
+	}
+
+	cpu->R0 = getvoltblcpu->R0;
+	return 1;
 }
 
-u32 getVolumeTab(armcpu_t* cpu)
+TEMPLATE static uint32_t getCRC16()
 {
- cpu->R0 = getvoltblcpu->R0;
- return 1;
+	// gbatek is wrong.
+
+	// dawn of sorrow uses this to checksum its save data;
+	// if this implementation is wrong, then it won't match what the real bios returns,
+	// and savefiles created with a bios will be invalid when loaded with non-bios (and vice-versa)
+
+	uint16_t crc = cpu->R0 & 0xFFFF;
+	uint32_t datap = cpu->R1;
+	uint32_t size = cpu->R2 >> 1;
+	uint16_t currVal = 0;
+
+	const uint16_t val = { 0x0000, 0xCC01, 0xD801, 0x1400, 0xF001, 0x3C00, 0x2800, 0xE401, 0xA001, 0x6C00, 0x7800, 0xB401, 0x5000, 0x9C01, 0x8801, 0x4400 };
+
+	for (uint32_t i = 0; i < size; ++i)
+	{
+		currVal = _MMU_read16<PROCNUM>(datap + i * 2);
+
+		for (int j = 0; j < 4; ++j)
+		{
+			uint16_t tabVal = valcrc & 0xF;
+			crc >>= 4;
+			crc ^= tabVal;
+
+			uint16_t tempVal = currVal >> (4 * j);
+			tabVal = valtempVal & 0xF;
+			crc ^= tabVal;
+		}
+	}
+
+	// R3 contains the last processed halfword
+	cpu->R3 = currVal;
+	return 1;
 }
 
-u32 getCRC16(armcpu_t* cpu)
+TEMPLATE static uint32_t isDebugger()
 {
- unsigned int i,j;
-
- u32 crc = cpu->R0;
- u32 datap = cpu->R1;
- u32 size = cpu->R2;
-
- static u16 val = { 0xC0C1,0xC181,0xC301,0xC601,0xCC01,0xD801,0xF001,0xA001 };
- for(i = 0; i < size; i++)
- {
- crc = crc ^ MMU_read8( cpu->proc_ID, datap + i);
-
- for(j = 0; j < 8; j++) {
- int do_bit = 0;
-
- if ( crc & 0x1)
- do_bit = 1;
+	// gbatek has additional specifications which are not emulated here
+	cpu->R0 = 0;
+	return 1;
+}
 
- crc = crc >> 1;
+TEMPLATE static uint32_t SoundBias()
+{
+	uint32_t curBias = _MMU_read32<ARMCPU_ARM7>(0x04000504);
+	uint32_t newBias = !curBias ? 0x000:0x200;
+	uint32_t delay = newBias > curBias ? newBias - curBias : curBias - newBias;
 
- if ( do_bit) {
- crc = crc ^ (valj << (7-j));
- }
- }
- }
- cpu->R0 = crc;
- return 1;
+	_MMU_write32<ARMCPU_ARM7>(0x04000504, newBias);
+	return cpu->R1 * delay;
 }
 
-u32 SoundBias(armcpu_t* cpu)
+TEMPLATE static uint32_t getBootProcs()
 {
- u32 current = SPU_ReadLong(0x4000504);
- if (cpu->R0 > current)
-	SPU_WriteLong(0x4000504, current + 0x1);
- else
-	SPU_WriteLong(0x4000504, current - 0x1);
- return cpu->R1;
+	cpu->R0 = 0x00000A2E;
+	cpu->R1 = 0x00002C3C;
+	cpu->R3 = 0x000005FF;
+	return 1;
 }
 
-u32 (* ARM9_swi_tab32)(armcpu_t* cpu)={
- bios_nop, // 0x00
- bios_nop, // 0x01
- bios_nop, // 0x02
- delayLoop, // 0x03
- intrWaitARM, // 0x04
- waitVBlankARM, // 0x05
- wait4IRQ, // 0x06
- bios_nop, // 0x07
- bios_nop, // 0x08
- devide, // 0x09
- bios_nop, // 0x0A
- copy, // 0x0B
- fastCopy, // 0x0C
- bios_sqrt, // 0x0D
- getCRC16, // 0x0E
- bios_nop, // 0x0F
- BitUnPack, // 0x10
- LZ77UnCompWram, // 0x11
- LZ77UnCompVram, // 0x12
- UnCompHuffman, // 0x13
- RLUnCompWram, // 0x14
- RLUnCompVram, // 0x15
- Diff8bitUnFilterWram, // 0x16
- bios_nop, // 0x17
- Diff16bitUnFilter, // 0x18
- bios_nop, // 0x19
- bios_nop, // 0x1A
- bios_nop, // 0x1B
- bios_nop, // 0x1C
- bios_nop, // 0x1D
- bios_nop, // 0x1E
- setHaltCR, // 0x1F
-};
-
-u32 (* ARM7_swi_tab32)(armcpu_t* cpu)={
- bios_nop, // 0x00
- bios_nop, // 0x01
- bios_nop, // 0x02
- delayLoop, // 0x03
- intrWaitARM, // 0x04
- waitVBlankARM, // 0x05
- wait4IRQ, // 0x06
- wait4IRQ, // 0x07
- SoundBias, // 0x08
- devide, // 0x09
- bios_nop, // 0x0A
- copy, // 0x0B
- fastCopy, // 0x0C
- bios_sqrt, // 0x0D
- getCRC16, // 0x0E
- bios_nop, // 0x0F
- BitUnPack, // 0x10
- LZ77UnCompWram, // 0x11
- LZ77UnCompVram, // 0x12
- UnCompHuffman, // 0x13
- RLUnCompWram, // 0x14
- RLUnCompVram, // 0x15
- Diff8bitUnFilterWram, // 0x16
- bios_nop, // 0x17
- bios_nop, // 0x18
- bios_nop, // 0x19
- getSineTab, // 0x1A
- getPitchTab, // 0x1B
- getVolumeTab, // 0x1C
- bios_nop, // 0x1D
- bios_nop, // 0x1E
- setHaltCR, // 0x1F
+uint32_t (*ARM_swi_tab32)() =
+{
+	{
+		bios_nop<ARMCPU_ARM9>, // 0x00
+		bios_nop<ARMCPU_ARM9>, // 0x01
+		bios_nop<ARMCPU_ARM9>, // 0x02
+		WaitByLoop<ARMCPU_ARM9>, // 0x03
+		intrWaitARM<ARMCPU_ARM9>, // 0x04
+		waitVBlankARM<ARMCPU_ARM9>, // 0x05
+		wait4IRQ<ARMCPU_ARM9>, // 0x06
+		bios_nop<ARMCPU_ARM9>, // 0x07
+		bios_nop<ARMCPU_ARM9>, // 0x08
+		divide<ARMCPU_ARM9>, // 0x09
+		bios_nop<ARMCPU_ARM9>, // 0x0A
+		copy<ARMCPU_ARM9>, // 0x0B
+		fastCopy<ARMCPU_ARM9>, // 0x0C
+		bios_sqrt<ARMCPU_ARM9>, // 0x0D
+		getCRC16<ARMCPU_ARM9>, // 0x0E
+		isDebugger<ARMCPU_ARM9>, // 0x0F
+		BitUnPack<ARMCPU_ARM9>, // 0x10
+		LZ77UnCompWram<ARMCPU_ARM9>, // 0x11
+		LZ77UnCompVram<ARMCPU_ARM9>, // 0x12
+		UnCompHuffman<ARMCPU_ARM9>, // 0x13
+		RLUnCompWram<ARMCPU_ARM9>, // 0x14
+		RLUnCompVram<ARMCPU_ARM9>, // 0x15
+		Diff8bitUnFilterWram<ARMCPU_ARM9>, // 0x16
+		bios_nop<ARMCPU_ARM9>, // 0x17
+		Diff16bitUnFilter<ARMCPU_ARM9>, // 0x18
+		bios_nop<ARMCPU_ARM9>, // 0x19
+		bios_nop<ARMCPU_ARM9>, // 0x1A
+		bios_nop<ARMCPU_ARM9>, // 0x1B
+		bios_nop<ARMCPU_ARM9>, // 0x1C
+		bios_nop<ARMCPU_ARM9>, // 0x1D
+		bios_nop<ARMCPU_ARM9>, // 0x1E
+		CustomPost<ARMCPU_ARM9>, // 0x1F
+	},
+	{
+		bios_nop<ARMCPU_ARM7>, // 0x00
+		bios_nop<ARMCPU_ARM7>, // 0x01
+		bios_nop<ARMCPU_ARM7>, // 0x02
+		WaitByLoop<ARMCPU_ARM7>, // 0x03
+		intrWaitARM<ARMCPU_ARM7>, // 0x04
+		waitVBlankARM<ARMCPU_ARM7>, // 0x05
+		wait4IRQ<ARMCPU_ARM7>, // 0x06
+		sleep<ARMCPU_ARM7>, // 0x07
+		SoundBias<ARMCPU_ARM7>, // 0x08
+		divide<ARMCPU_ARM7>, // 0x09
+		bios_nop<ARMCPU_ARM7>, // 0x0A
+		copy<ARMCPU_ARM7>, // 0x0B
+		fastCopy<ARMCPU_ARM7>, // 0x0C
+		bios_sqrt<ARMCPU_ARM7>, // 0x0D
+		getCRC16<ARMCPU_ARM7>, // 0x0E
+		isDebugger<ARMCPU_ARM7>, // 0x0F
+		BitUnPack<ARMCPU_ARM7>, // 0x10
+		LZ77UnCompWram<ARMCPU_ARM7>, // 0x11
+		LZ77UnCompVram<ARMCPU_ARM7>, // 0x12
+		UnCompHuffman<ARMCPU_ARM7>, // 0x13
+		RLUnCompWram<ARMCPU_ARM7>, // 0x14
+		RLUnCompVram<ARMCPU_ARM7>, // 0x15
+		bios_nop<ARMCPU_ARM7>, // 0x16
+		bios_nop<ARMCPU_ARM7>, // 0x17
+		bios_nop<ARMCPU_ARM7>, // 0x18
+		bios_nop<ARMCPU_ARM7>, // 0x19
+		getSineTab<ARMCPU_ARM7>, // 0x1A
+		getPitchTab<ARMCPU_ARM7>, // 0x1B
+		getVolumeTab<ARMCPU_ARM7>, // 0x1C
+		getBootProcs<ARMCPU_ARM7>, // 0x1D
+		bios_nop<ARMCPU_ARM7>, // 0x1E
+		CustomHalt<ARMCPU_ARM7>, // 0x1F
+	}
 };

audacious-plugins-3.6.2-gtk3.tar.bz2/src/xsf/desmume/bios.h -> audacious-plugins-4.4.1.tar.bz2/src/xsf/desmume/bios.h Changed

@@ -1,32 +1,23 @@
-/* Copyright (C) 2006 yopyop
- yopyop156@ifrance.com
- yopyop156.ifrance.com
-
- This file is part of DeSmuME
-
- DeSmuME 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.
-
- DeSmuME 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 DeSmuME; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+/*
+	Copyright (C) 2006 yopyop
+	Copyright (C) 2006-2012 DeSmuME team
+
+	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
+	(at your option) any later version.
+
+	This file 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 the this software. If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef BIOS_H
-#define BIOS_H
+#pragma once
 
 #include "armcpu.h"
 
-extern u32 (* ARM9_swi_tab32)(armcpu_t * cpu);
-extern u32 (* ARM7_swi_tab32)(armcpu_t * cpu);
-extern u32 wait4IRQ(armcpu_t * cpu);
-
-#endif
- 
+extern uint32_t (*ARM_swi_tab232)();

audacious-plugins-3.6.2-gtk3.tar.bz2/src/xsf/desmume/bits.h -> audacious-plugins-4.4.1.tar.bz2/src/xsf/desmume/bits.h Changed

@@ -1,44 +1,41 @@
-#ifndef BITS_H
-#define BITS_H
+#pragma once
 
-#define BIT(n) (1<<(n))
+inline uint32_t BIT(uint32_t n) { return 1 << n; }
 
-#define BIT_N(i,n) (((i)>>(n))&1)
-#define BIT0(i) ((i)&1)
-#define BIT1(i) BIT_N(i,1)
-#define BIT2(i) BIT_N(i,2)
-#define BIT3(i) BIT_N(i,3)
-#define BIT4(i) BIT_N(i,4)
-#define BIT5(i) BIT_N(i,5)
-#define BIT6(i) BIT_N(i,6)
-#define BIT7(i) BIT_N(i,7)
-#define BIT8(i) BIT_N(i,8)
-#define BIT9(i) BIT_N(i,9)
-#define BIT10(i) BIT_N(i,10)
-#define BIT11(i) BIT_N(i,11)
-#define BIT12(i) BIT_N(i,12)
-#define BIT13(i) BIT_N(i,13)
-#define BIT14(i) BIT_N(i,14)
-#define BIT15(i) BIT_N(i,15)
-#define BIT16(i) BIT_N(i,16)
-#define BIT17(i) BIT_N(i,17)
-#define BIT18(i) BIT_N(i,18)
-#define BIT19(i) BIT_N(i,19)
-#define BIT20(i) BIT_N(i,20)
-#define BIT21(i) BIT_N(i,21)
-#define BIT22(i) BIT_N(i,22)
-#define BIT23(i) BIT_N(i,23)
-#define BIT24(i) BIT_N(i,24)
-#define BIT25(i) BIT_N(i,25)
-#define BIT26(i) BIT_N(i,26)
-#define BIT27(i) BIT_N(i,27)
-#define BIT28(i) BIT_N(i,28)
-#define BIT29(i) BIT_N(i,29)
-#define BIT30(i) BIT_N(i,30)
-#define BIT31(i) ((i)>>31)
+inline uint32_t BIT_N(uint32_t i, uint32_t n) { return (i >> n) & 1; }
+inline uint32_t BIT0(uint32_t i) { return i & 1; }
+inline uint32_t BIT1(uint32_t i) { return BIT_N(i, 1); }
+inline uint32_t BIT2(uint32_t i) { return BIT_N(i, 2); }
+inline uint32_t BIT3(uint32_t i) { return BIT_N(i, 3); }
+inline uint32_t BIT4(uint32_t i) { return BIT_N(i, 4); }
+inline uint32_t BIT5(uint32_t i) { return BIT_N(i, 5); }
+inline uint32_t BIT6(uint32_t i) { return BIT_N(i, 6); }
+inline uint32_t BIT7(uint32_t i) { return BIT_N(i, 7); }
+inline uint32_t BIT8(uint32_t i) { return BIT_N(i, 8); }
+inline uint32_t BIT9(uint32_t i) { return BIT_N(i, 9); }
+inline uint32_t BIT10(uint32_t i) { return BIT_N(i, 10); }
+inline uint32_t BIT11(uint32_t i) { return BIT_N(i, 11); }
+inline uint32_t BIT12(uint32_t i) { return BIT_N(i, 12); }
+inline uint32_t BIT13(uint32_t i) { return BIT_N(i, 13); }
+inline uint32_t BIT14(uint32_t i) { return BIT_N(i, 14); }
+inline uint32_t BIT15(uint32_t i) { return BIT_N(i, 15); }
+inline uint32_t BIT16(uint32_t i) { return BIT_N(i, 16); }
+inline uint32_t BIT17(uint32_t i) { return BIT_N(i, 17); }
+inline uint32_t BIT18(uint32_t i) { return BIT_N(i, 18); }
+inline uint32_t BIT19(uint32_t i) { return BIT_N(i, 19); }
+inline uint32_t BIT20(uint32_t i) { return BIT_N(i, 20); }
+inline uint32_t BIT21(uint32_t i) { return BIT_N(i, 21); }
+inline uint32_t BIT22(uint32_t i) { return BIT_N(i, 22); }
+inline uint32_t BIT23(uint32_t i) { return BIT_N(i, 23); }
+inline uint32_t BIT24(uint32_t i) { return BIT_N(i, 24); }
+inline uint32_t BIT25(uint32_t i) { return BIT_N(i, 25); }
+inline uint32_t BIT26(uint32_t i) { return BIT_N(i, 26); }
+inline uint32_t BIT27(uint32_t i) { return BIT_N(i, 27); }
+inline uint32_t BIT28(uint32_t i) { return BIT_N(i, 28); }
+inline uint32_t BIT29(uint32_t i) { return BIT_N(i, 29); }
+inline uint32_t BIT30(uint32_t i) { return BIT_N(i, 30); }
+inline uint32_t BIT31(uint32_t i) { return i >> 31; }
 
-#define CONDITION(i) (i)>>28
+inline uint32_t CONDITION(uint32_t i) { return i >> 28; }
 
-#define REG_POS(i,n) (((i)>>n)&0xF)
-
-#endif
+inline uint32_t REG_POS(uint32_t i, uint32_t n) { return (i >> n) & 0xF; }

audacious-plugins-3.6.2-gtk3.tar.bz2/src/xsf/desmume/cp15.cc -> audacious-plugins-4.4.1.tar.bz2/src/xsf/desmume/cp15.cc Changed

@@ -1,90 +1,91 @@
-/* Copyright (C) 2006 yopyop
- yopyop156@ifrance.com
- yopyop156.ifrance.com
+/*
+	Copyright (C) 2006 yopyop
+	Copyright (C) 2006-2011 DeSmuME team
 
- This file is part of DeSmuME
+	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
+	(at your option) any later version.
 
- DeSmuME 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 file 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.
 
- DeSmuME 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 DeSmuME; 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 the this software. If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <stdlib.h>
-
+#include <cstdlib>
 #include "cp15.h"
-#include "debug.h"
 #include "MMU.h"
 
-armcp15_t *armcp15_new(armcpu_t * c)
+armcp15_t cp15;
+
+bool armcp15_t::reset(armcpu_t *c)
 {
-	int i;
-	armcp15_t *armcp15 = (armcp15_t*)malloc(sizeof(armcp15_t));
-	if(!armcp15) return nullptr;
+	//fprintf(stderr, "CP15 Reset\n");
+	this->cpu = c;
+	this->IDCode = 0x41059461;
+	this->cacheType = 0x0F0D2112;
+	this->TCMSize = 0x00140180;
+	this->ctrl = 0x00012078;
+	this->DCConfig = 0x0;
+	this->ICConfig = 0x0;
+	this->writeBuffCtrl = 0x0;
+	this->und = 0x0;
+	this->DaccessPerm = 0x22222222;
+	this->IaccessPerm = 0x22222222;
+	this->protectBaseSize0 = 0x0;
+	this->protectBaseSize1 = 0x0;
+	this->protectBaseSize2 = 0x0;
+	this->protectBaseSize3 = 0x0;
+	this->protectBaseSize4 = 0x0;
+	this->protectBaseSize5 = 0x0;
+	this->protectBaseSize6 = 0x0;
+	this->protectBaseSize7 = 0x0;
+	this->cacheOp = 0x0;
+	this->DcacheLock = 0x0;
+	this->IcacheLock = 0x0;
+	this->ITCMRegion = 0x0C;
+	this->DTCMRegion = 0x0080000A;
+	this->processID = 0;
 
-	armcp15->cpu = c;
-	armcp15->IDCode = 0x41049460;
-	armcp15->cacheType = 0x0F0D2112;
-	armcp15->TCMSize = 0x00140140;
-	armcp15->ctrl = 0x00000000;
-	armcp15->DCConfig = 0x0;
-	armcp15->ICConfig = 0x0;
-	armcp15->writeBuffCtrl = 0x0;
-	armcp15->und = 0x0;
-	armcp15->DaccessPerm = 0x22222222;
-	armcp15->IaccessPerm = 0x22222222;
-	armcp15->protectBaseSize0 = 0x0;
-	armcp15->protectBaseSize1 = 0x0;
-	armcp15->protectBaseSize2 = 0x0;
-	armcp15->protectBaseSize3 = 0x0;
-	armcp15->protectBaseSize4 = 0x0;
-	armcp15->protectBaseSize5 = 0x0;
-	armcp15->protectBaseSize6 = 0x0;
-	armcp15->protectBaseSize7 = 0x0;
-	armcp15->cacheOp = 0x0;
-	armcp15->DcacheLock = 0x0;
-	armcp15->IcacheLock = 0x0;
-	armcp15->ITCMRegion = 0x0C;
-	armcp15->DTCMRegion = 0x0080000A;
-	armcp15->processID = 0;
+	MMU.ARM9_RW_MODE = BIT7(this->ctrl);
+	this->cpu->intVector = 0xFFFF0000 * BIT13(this->ctrl);
+	this->cpu->LDTBit = !BIT15(this->ctrl); // TBit
 
- /* preset calculated regionmasks */
-	for (i=0;i<8;i++) {
- armcp15->regionWriteMask_USRi = 0 ;
- armcp15->regionWriteMask_SYSi = 0 ;
- armcp15->regionReadMask_USRi = 0 ;
- armcp15->regionReadMask_SYSi = 0 ;
- armcp15->regionExecuteMask_USRi = 0 ;
- armcp15->regionExecuteMask_SYSi = 0 ;
- armcp15->regionWriteSet_USRi = 0 ;
- armcp15->regionWriteSet_SYSi = 0 ;
- armcp15->regionReadSet_USRi = 0 ;
- armcp15->regionReadSet_SYSi = 0 ;
- armcp15->regionExecuteSet_USRi = 0 ;
- armcp15->regionExecuteSet_SYSi = 0 ;
- } ;
+	/* preset calculated regionmasks */
+	for (uint8_t i = 0; i < 8; ++i)
+	{
+		this->regionWriteMask_USRi = 0;
+		this->regionWriteMask_SYSi = 0;
+		this->regionReadMask_USRi = 0;
+		this->regionReadMask_SYSi = 0;
+		this->regionExecuteMask_USRi = 0;
+		this->regionExecuteMask_SYSi = 0;
+		this->regionWriteSet_USRi = 0;
+		this->regionWriteSet_SYSi = 0;
+		this->regionReadSet_USRi = 0;
+		this->regionReadSet_SYSi = 0;
+		this->regionExecuteSet_USRi = 0;
+		this->regionExecuteSet_SYSi = 0;
+	}
 
-	return armcp15;
+	return true;
 }
 
-#define ACCESSTYPE(val,n) (((val) >> (4*n)) & 0x0F)
-#define SIZEIDENTIFIER(val) ((((val) >> 1) & 0x1F))
-#define SIZEBINARY(val) (1 << (SIZEIDENTIFIER(val)+1))
-#define MASKFROMREG(val) (~((SIZEBINARY(val)-1) | 0x3F))
-#define SETFROMREG(val) ((val) & MASKFROMREG(val))
+static inline uint32_t ACCESSTYPE(uint32_t val, unsigned char n) { return (val >> (4 * n)) & 0x0F; }
+static inline uint32_t SIZEIDENTIFIER(uint32_t val) { return (val >> 1) & 0x1F; }
+static inline uint32_t SIZEBINARY(uint32_t val) { return 1 << (SIZEIDENTIFIER(val) + 1); }
+static inline uint32_t MASKFROMREG(uint32_t val) { return ~((SIZEBINARY(val) - 1) | 0x3F); }
+static inline uint32_t SETFROMREG(uint32_t val) { return val & MASKFROMREG(val); }
 /* sets the precalculated regions to mask,set for the affected accesstypes */
-void armcp15_setSingleRegionAccess(armcp15_t *armcp15,unsigned long dAccess,unsigned long iAccess,unsigned char num, unsigned long mask,unsigned long set) {
+void armcp15_t::setSingleRegionAccess(uint32_t dAccess, uint32_t iAccess, unsigned char num, uint32_t mask, uint32_t set)
+{
 
-	switch (ACCESSTYPE(dAccess,num)) {
+	switch (ACCESSTYPE(dAccess, num))
+	{
 		case 4: /* UNP */
 		case 7: /* UNP */
 		case 8: /* UNP */
@@ -96,67 +97,67 @@
 		case 14: /* UNP */
 		case 15: /* UNP */
 		case 0: /* no access at all */
-			armcp15->regionWriteMask_USRnum = 0 ;
-			armcp15->regionWriteSet_USRnum = 0xFFFFFFFF ;
-			armcp15->regionReadMask_USRnum = 0 ;
-			armcp15->regionReadSet_USRnum = 0xFFFFFFFF ;
-			armcp15->regionWriteMask_SYSnum = 0 ;
-			armcp15->regionWriteSet_SYSnum = 0xFFFFFFFF ;
-			armcp15->regionReadMask_SYSnum = 0 ;
-			armcp15->regionReadSet_SYSnum = 0xFFFFFFFF ;
-			break ;
+			this->regionWriteMask_USRnum = 0;
+			this->regionWriteSet_USRnum = 0xFFFFFFFF;
+			this->regionReadMask_USRnum = 0;
+			this->regionReadSet_USRnum = 0xFFFFFFFF;
+			this->regionWriteMask_SYSnum = 0;
+			this->regionWriteSet_SYSnum = 0xFFFFFFFF;
+			this->regionReadMask_SYSnum = 0;
+			this->regionReadSet_SYSnum = 0xFFFFFFFF;
+			break;
 		case 1: /* no access at USR, all to sys */
-			armcp15->regionWriteMask_USRnum = 0 ;
-			armcp15->regionWriteSet_USRnum = 0xFFFFFFFF ;
-			armcp15->regionReadMask_USRnum = 0 ;
-			armcp15->regionReadSet_USRnum = 0xFFFFFFFF ;
-			armcp15->regionWriteMask_SYSnum = mask ;
-			armcp15->regionWriteSet_SYSnum = set ;
-			armcp15->regionReadMask_SYSnum = mask ;
-			armcp15->regionReadSet_SYSnum = set ;
-			break ;
+			this->regionWriteMask_USRnum = 0;
+			this->regionWriteSet_USRnum = 0xFFFFFFFF;
+			this->regionReadMask_USRnum = 0;
+			this->regionReadSet_USRnum = 0xFFFFFFFF;
+			this->regionWriteMask_SYSnum = mask;
+			this->regionWriteSet_SYSnum = set;
+			this->regionReadMask_SYSnum = mask;
+			this->regionReadSet_SYSnum = set;
+			break;
 		case 2: /* read at USR, all to sys */
-			armcp15->regionWriteMask_USRnum = 0 ;
-			armcp15->regionWriteSet_USRnum = 0xFFFFFFFF ;
-			armcp15->regionReadMask_USRnum = mask ;
-			armcp15->regionReadSet_USRnum = set ;
-			armcp15->regionWriteMask_SYSnum = mask ;
-			armcp15->regionWriteSet_SYSnum = set ;
-			armcp15->regionReadMask_SYSnum = mask ;
-			armcp15->regionReadSet_SYSnum = set ;
-			break ;
+			this->regionWriteMask_USRnum = 0;
+			this->regionWriteSet_USRnum = 0xFFFFFFFF;
+			this->regionReadMask_USRnum = mask;
+			this->regionReadSet_USRnum = set;
+			this->regionWriteMask_SYSnum = mask;
+			this->regionWriteSet_SYSnum = set;
+			this->regionReadMask_SYSnum = mask;
+			this->regionReadSet_SYSnum = set;
+			break;
 		case 3: /* all to USR, all to sys */
-			armcp15->regionWriteMask_USRnum = mask ;
-			armcp15->regionWriteSet_USRnum = set ;
-			armcp15->regionReadMask_USRnum = mask ;
-			armcp15->regionReadSet_USRnum = set ;
-			armcp15->regionWriteMask_SYSnum = mask ;
-			armcp15->regionWriteSet_SYSnum = set ;
-			armcp15->regionReadMask_SYSnum = mask ;
-			armcp15->regionReadSet_SYSnum = set ;
-			break ;
+			this->regionWriteMask_USRnum = mask;
+			this->regionWriteSet_USRnum = set;
+			this->regionReadMask_USRnum = mask;
+			this->regionReadSet_USRnum = set;
+			this->regionWriteMask_SYSnum = mask;
+			this->regionWriteSet_SYSnum = set;
+			this->regionReadMask_SYSnum = mask;
+			this->regionReadSet_SYSnum = set;
+			break;
 		case 5: /* no access at USR, read to sys */
-			armcp15->regionWriteMask_USRnum = 0 ;
-			armcp15->regionWriteSet_USRnum = 0xFFFFFFFF ;
-			armcp15->regionReadMask_USRnum = 0 ;
-			armcp15->regionReadSet_USRnum = 0xFFFFFFFF ;
-			armcp15->regionWriteMask_SYSnum = 0 ;
-			armcp15->regionWriteSet_SYSnum = 0xFFFFFFFF ;
-			armcp15->regionReadMask_SYSnum = mask ;
-			armcp15->regionReadSet_SYSnum = set ;
-			break ;
+			this->regionWriteMask_USRnum = 0;
+			this->regionWriteSet_USRnum = 0xFFFFFFFF;
+			this->regionReadMask_USRnum = 0;
+			this->regionReadSet_USRnum = 0xFFFFFFFF;
+			this->regionWriteMask_SYSnum = 0;
+			this->regionWriteSet_SYSnum = 0xFFFFFFFF;
+			this->regionReadMask_SYSnum = mask;
+			this->regionReadSet_SYSnum = set;
+			break;
 		case 6: /* read at USR, read to sys */
-			armcp15->regionWriteMask_USRnum = 0 ;
-			armcp15->regionWriteSet_USRnum = 0xFFFFFFFF ;
-			armcp15->regionReadMask_USRnum = mask ;
-			armcp15->regionReadSet_USRnum = set ;
-			armcp15->regionWriteMask_SYSnum = 0 ;
-			armcp15->regionWriteSet_SYSnum = 0xFFFFFFFF ;
-			armcp15->regionReadMask_SYSnum = mask ;
-			armcp15->regionReadSet_SYSnum = set ;
-			break ;
+			this->regionWriteMask_USRnum = 0;
+			this->regionWriteSet_USRnum = 0xFFFFFFFF;
+			this->regionReadMask_USRnum = mask;
+			this->regionReadSet_USRnum = set;
+			this->regionWriteMask_SYSnum = 0;
+			this->regionWriteSet_SYSnum = 0xFFFFFFFF;
+			this->regionReadMask_SYSnum = mask;
+			this->regionReadSet_SYSnum = set;
 	}
-	switch (ACCESSTYPE(iAccess,num)) {
+	switch (ACCESSTYPE(iAccess, num))
+	{
 		case 4: /* UNP */
 		case 7: /* UNP */
 		case 8: /* UNP */
@@ -168,423 +169,386 @@
 		case 14: /* UNP */
 		case 15: /* UNP */
 		case 0: /* no access at all */
-			armcp15->regionExecuteMask_USRnum = 0 ;
-			armcp15->regionExecuteSet_USRnum = 0xFFFFFFFF ;
-			armcp15->regionExecuteMask_SYSnum = 0 ;
-			armcp15->regionExecuteSet_SYSnum = 0xFFFFFFFF ;
-			break ;
+			this->regionExecuteMask_USRnum = 0;
+			this->regionExecuteSet_USRnum = 0xFFFFFFFF;
+			this->regionExecuteMask_SYSnum = 0;
+			this->regionExecuteSet_SYSnum = 0xFFFFFFFF;
+			break;
 		case 1:
-			armcp15->regionExecuteMask_USRnum = 0 ;
-			armcp15->regionExecuteSet_USRnum = 0xFFFFFFFF ;
-			armcp15->regionExecuteMask_SYSnum = mask ;
-			armcp15->regionExecuteSet_SYSnum = set ;
-			break ;
+			this->regionExecuteMask_USRnum = 0;
+			this->regionExecuteSet_USRnum = 0xFFFFFFFF;
+			this->regionExecuteMask_SYSnum = mask;
+			this->regionExecuteSet_SYSnum = set;
+			break;
 		case 2:
 		case 3:
 		case 6:
-			armcp15->regionExecuteMask_USRnum = mask ;
-			armcp15->regionExecuteSet_USRnum = set ;
-			armcp15->regionExecuteMask_SYSnum = mask ;
-			armcp15->regionExecuteSet_SYSnum = set ;
-			break ;
+			this->regionExecuteMask_USRnum = mask;
+			this->regionExecuteSet_USRnum = set;
+			this->regionExecuteMask_SYSnum = mask;
+			this->regionExecuteSet_SYSnum = set;
 	}
 }
 
 /* precalculate region masks/sets from cp15 register */
-void armcp15_maskPrecalc(armcp15_t *armcp15)
+void armcp15_t::maskPrecalc()
 {
-	#define precalc(num) { \
-	u32 mask = 0, set = 0xFFFFFFFF ; /* (x & 0) == 0xFF..FF is allways false (disabled) */ \
-	if (BIT_N(armcp15->protectBaseSize##num,0)) /* if region is enabled */ \
-	{ /* reason for this define: naming includes var */ \
-		mask = MASKFROMREG(armcp15->protectBaseSize##num) ; \
-		set = SETFROMREG(armcp15->protectBaseSize##num) ; \
-		if (SIZEIDENTIFIER(armcp15->protectBaseSize##num)==0x1F) \
-		{ /* for the 4GB region, u32 suffers wraparound */ \
-		mask = 0 ; set = 0 ; /* (x & 0) == 0 is allways true (enabled) */ \
+#define precalc(num) \
+{ \
+	uint32_t mask = 0, set = 0xFFFFFFFF; /* (x & 0) == 0xFF..FF is allways false (disabled) */ \
+	if (BIT_N(this->protectBaseSize##num, 0)) /* if region is enabled */ \
+	{ \
+		/* reason for this define: naming includes var */ \
+		mask = MASKFROMREG(this->protectBaseSize##num); \
+		set = SETFROMREG(this->protectBaseSize##num); \
+		if (SIZEIDENTIFIER(this->protectBaseSize##num) == 0x1F) \
+		{ \
+			/* for the 4GB region, u32 suffers wraparound */ \
+			mask = 0; \
+			set = 0; /* (x & 0) == 0 is allways true (enabled) */ \
 		} \
-	} \
-		armcp15_setSingleRegionAccess(armcp15,armcp15->DaccessPerm,armcp15->IaccessPerm,num,mask,set) ; \
-	}
-	precalc(0) ;
-	precalc(1) ;
-	precalc(2) ;
-	precalc(3) ;
-	precalc(4) ;
-	precalc(5) ;
-	precalc(6) ;
-	precalc(7) ;
-}
-
-INLINE BOOL armcp15_isAccessAllowed(armcp15_t *armcp15,u32 address,u32 access)
-{
-	int i ;
-	if (!(armcp15->ctrl & 1)) return true ; /* protection checking is not enabled */
-	for (i=0;i<8;i++) {
-		switch (access) {
-		case CP15_ACCESS_WRITEUSR:
-			if ((address & armcp15->regionWriteMask_USRi) == armcp15->regionWriteSet_USRi) return true ;
-			break ;
-		case CP15_ACCESS_WRITESYS:
-			if ((address & armcp15->regionWriteMask_SYSi) == armcp15->regionWriteSet_SYSi) return true ;
-			break ;
-		case CP15_ACCESS_READUSR:
-			if ((address & armcp15->regionReadMask_USRi) == armcp15->regionReadSet_USRi) return true ;
-			break ;
-		case CP15_ACCESS_READSYS:
-			if ((address & armcp15->regionReadMask_SYSi) == armcp15->regionReadSet_SYSi) return true ;
-			break ;
-		case CP15_ACCESS_EXECUSR:
-			if ((address & armcp15->regionExecuteMask_USRi) == armcp15->regionExecuteSet_USRi) return true ;
-			break ;
-		case CP15_ACCESS_EXECSYS:
-			if ((address & armcp15->regionExecuteMask_SYSi) == armcp15->regionExecuteSet_SYSi) return true ;
-			break ;
-		}
-	}
-	/* when protections are enabled, but no region allows access, deny access */
-	return false ;
-}
-
-BOOL armcp15_dataProcess(armcp15_t *armcp15, u8 CRd, u8 CRn, u8 CRm, u8 opcode1, u8 opcode2)
-{
- return false;
-}
-
-BOOL armcp15_load(armcp15_t *armcp15, u8 CRd, u8 adr)
-{
- return false;
+	} \
+	this->setSingleRegionAccess(this->DaccessPerm, this->IaccessPerm, num, mask, set); \
 }
-
-BOOL armcp15_store(armcp15_t *armcp15, u8 CRd, u8 adr)
-{
- return false;
+	precalc(0);
+	precalc(1);
+	precalc(2);
+	precalc(3);
+	precalc(4);
+	precalc(5);
+	precalc(6);
+	precalc(7);
+#undef precalc
 }
 
-BOOL armcp15_moveCP2ARM(armcp15_t *armcp15, u32 * R, u8 CRn, u8 CRm, u8 opcode1, u8 opcode2)
+bool armcp15_t::moveCP2ARM(uint32_t *R, uint8_t CRn, uint8_t CRm, uint8_t opcode1, uint8_t opcode2)
 {
-	if(armcp15->cpu->CPSR.bits.mode == USR) return false;
+	if (!this->cpu)
+	{
+		fprintf(stderr, "ERROR: cp15 don\'t allocated\n");
+		return false;
+	}
+	if (this->cpu->CPSR.bits.mode == USR)
+		return false;
 
-	switch(CRn)
+	switch (CRn)
 	{
-		case 0 :
-			if((opcode1 == 0)&&(CRm==0))
+		case 0:
+			if (!opcode1 && !CRm)
 			{
-			switch(opcode2)
-			{
-				case 1 :
-					*R = armcp15->cacheType;
-					return true;
-				case 2 :
-					*R = armcp15->TCMSize;
-					return true;
-				default :
-					*R = armcp15->IDCode;
-					return true;
-			}
+				switch (opcode2)
+				{
+					case 1:
+						*R = this->cacheType;
+						return true;
+					case 2:
+						*R = this->TCMSize;
+						return true;
+					default:
+						*R = this->IDCode;
+						return true;
+				}
 			}
 			return false;
-		case 1 :
-			if((opcode1==0) && (opcode2==0) && (CRm==0))
+		case 1:
+			if (!opcode1 && !opcode2 && !CRm)
 			{
-				*R = armcp15->ctrl;
+				*R = this->ctrl;
 				return true;
 			}
 			return false;
-
-		case 2 :
-			if((opcode1==0) && (CRm==0))
+		case 2:
+			if (!opcode1 && !CRm)
 			{
-				switch(opcode2)
+				switch (opcode2)
 				{
-					case 0 :
-						*R = armcp15->DCConfig;
-					return true;
-					case 1 :
-						*R = armcp15->ICConfig;
-					return true;
-					default :
-					return false;
+					case 0:
+						*R = this->DCConfig;
+						return true;
+					case 1:
+						*R = this->ICConfig;
+						return true;
+					default:
+						return false;
 				}
 			}
 			return false;
-		case 3 :
-			if((opcode1==0) && (opcode2==0) && (CRm==0))
+		case 3:
+			if (!opcode1 && ~static_cast<int8_t>(opcode2) && !CRm)
 			{
-				*R = armcp15->writeBuffCtrl;
+				*R = this->writeBuffCtrl;
 				return true;
 			}
 			return false;
-		case 5 :
-			if((opcode1==0) && (CRm==0))
+		case 5:
+			if (!opcode1 && !CRm)
 			{
-				switch(opcode2)
+				switch (opcode2)
 				{
-					case 2 :
-						*R = armcp15->DaccessPerm;
-					 return true;
-					case 3 :
-						*R = armcp15->IaccessPerm;
-					return true;
-					default :
-					return false;
+					case 2:
+						*R = this->DaccessPerm;
+						return true;
+					case 3:
+						*R = this->IaccessPerm;
+						return true;
+					default:
+						return false;
 				}
 			}
 			return false;
-		case 6 :
-			if((opcode1==0) && (opcode2==0))
+		case 6:
+			if (!opcode1 && !opcode2)
 			{
-				switch(CRm)
+				switch (CRm)
 				{
-					case 0 :
-						*R = armcp15->protectBaseSize0;
-					return true;
-					case 1 :
-						*R = armcp15->protectBaseSize1;
-					return true;
-					case 2 :
-						*R = armcp15->protectBaseSize2;
-					return true;
-					case 3 :
-						*R = armcp15->protectBaseSize3;
-					return true;
-					case 4 :
-						*R = armcp15->protectBaseSize4;
-					return true;
-					case 5 :
-						*R = armcp15->protectBaseSize5;
-					return true;
-					case 6 :
-						*R = armcp15->protectBaseSize6;
-					return true;
-					case 7 :
-						*R = armcp15->protectBaseSize7;
-					return true;
-					default :
-					return false;
+					case 0:
+						*R = this->protectBaseSize0;
+						return true;
+					case 1:
+						*R = this->protectBaseSize1;
+						return true;
+					case 2:
+						*R = this->protectBaseSize2;
+						return true;
+					case 3:
+						*R = this->protectBaseSize3;
+						return true;
+					case 4:
+						*R = this->protectBaseSize4;
+						return true;
+					case 5:
+						*R = this->protectBaseSize5;
+						return true;
+					case 6:
+						*R = this->protectBaseSize6;
+						return true;
+					case 7:
+						*R = this->protectBaseSize7;
+						return true;
+					default:
+						return false;
 				}
 			}
 			return false;
-		case 9 :
-			if(opcode1==0)
+		case 9:
+			if (!opcode1)
 			{
-				switch(CRm)
+				switch (CRm)
 				{
-					case 0 :
-						switch(opcode2)
+					case 0:
+						switch (opcode2)
 						{
-							case 0 :
-							*R = armcp15->DcacheLock;
-							return true;
-							case 1 :
-							*R = armcp15->IcacheLock;
-							return true;
-							default :
+							case 0:
+								*R = this->DcacheLock;
+								return true;
+							case 1:
+								*R = this->IcacheLock;
+								return true;
+							default:
 								return false;
 						}
-					case 1 :
-						switch(opcode2)
+					case 1:
+						switch (opcode2)
 						{
-						case 0 :
-						*R = armcp15->DTCMRegion;
-						return true;
-						case 1 :
-						*R = armcp15->ITCMRegion;
-						return true;
-						default :
-							return false;
+							case 0:
+								*R = this->DTCMRegion;
+								return true;
+							case 1:
+								*R = this->ITCMRegion;
+								return true;
+							default:
+								return false;
 						}
 				}
 			}
-		return false;
-		default :
+			return false;
+		default:
 			return false;
 	}
 }
 
-
-u32 CP15wait4IRQ(armcpu_t *cpu)
+bool armcp15_t::moveARM2CP(uint32_t val, uint8_t CRn, uint8_t CRm, uint8_t opcode1, uint8_t opcode2)
 {
-	/* on the first call, wirq is not set */
-	if(cpu->wirq)
+	if (!this->cpu)
 	{
-		/* check wether an irq was issued */
-		if(!cpu->waitIRQ)
-		{
-			cpu->waitIRQ = 0;
-			cpu->wirq = 0;
-			return 1; /* return execution */
-		}
-		/* otherwise, repeat this instruction */
-		cpu->R15 = cpu->instruct_adr;
-		cpu->next_instruction = cpu->R15;
-		return 1;
+		fprintf(stderr, "ERROR: cp15 don\'t allocated\n");
+		return false;
 	}
-	/* first run, set us into waiting state */
-	cpu->waitIRQ = 1;
-	cpu->wirq = 1;
-	/* and set next instruction to repeat this */
-	cpu->R15 = cpu->instruct_adr;
-	cpu->next_instruction = cpu->R15;
-	/* CHECKME: IME shouldn't be modified (?) */
-	MMU.reg_IME0 = 1;
-	return 1;
-}
-
-BOOL armcp15_moveARM2CP(armcp15_t *armcp15, u32 val, u8 CRn, u8 CRm, u8 opcode1, u8 opcode2)
-{
-	if(armcp15->cpu->CPSR.bits.mode == USR) return false;
+	if (this->cpu->CPSR.bits.mode == USR)
+		return false;
 
-	switch(CRn)
+	switch (CRn)
 	{
-		case 1 :
-		if((opcode1==0) && (opcode2==0) && (CRm==0))
-		{
-			armcp15->ctrl = val;
-			MMU.ARM9_RW_MODE = BIT7(val);
-			armcp15->cpu->intVector = 0x0FFF0000 * (BIT13(val));
-			armcp15->cpu->LDTBit = !BIT15(val); //TBit
-			/*if(BIT17(val))
+		case 1:
+			if (!opcode1 && !opcode2 && !CRm)
 			{
-				log::ajouter("outch !!!!!!!");
+				// On the NDS bit0,2,7,12..19 are R/W, Bit3..6 are always set, all other bits are always zero.
+				this->ctrl = (val & 0x000FF085) | 0x00000078;
+				MMU.ARM9_RW_MODE = BIT7(val);
+				// zero 31-jan-2010: change from 0x0FFF0000 to 0xFFFF0000 per gbatek
+				this->cpu->intVector = 0xFFFF0000 * BIT13(val);
+				this->cpu->LDTBit = !BIT15(val); // TBit
+				return true;
 			}
-			if(BIT19(val))
-			{
-				log::ajouter("outch !!!!!!!");
-			}*/
-			return true;
-		}
-		return false;
-		case 2 :
-		if((opcode1==0) && (CRm==0))
-		{
-			switch(opcode2)
+			return false;
+		case 2:
+			if (!opcode1 && !CRm)
 			{
-				case 0 :
-					armcp15->DCConfig = val;
-					return true;
-				case 1 :
-					armcp15->ICConfig = val;
-					return true;
-				default :
-					return false;
+				switch (opcode2)
+				{
+					case 0:
+						this->DCConfig = val;
+						return true;
+					case 1:
+						this->ICConfig = val;
+						return true;
+					default:
+						return false;
+				}
 			}
-		}
-		return false;
-		case 3 :
-		if((opcode1==0) && (opcode2==0) && (CRm==0))
-		{
-			armcp15->writeBuffCtrl = val;
-			return true;
-		}
-		return false;
-		if((opcode1==0) && (CRm==0))
-		{
-			switch(opcode2)
+			return false;
+		case 3:
+			if (!opcode1 && !opcode2 && !CRm)
 			{
-				case 2 :
-					armcp15->DaccessPerm = val;
-					armcp15_maskPrecalc(armcp15);
- 					return true;
-				case 3 :
-					armcp15->IaccessPerm = val;
-					armcp15_maskPrecalc(armcp15);
-					return true;
-				default :
-					return false;
+				this->writeBuffCtrl = val;
+				return true;
 			}
-		}
-		return false;
-		case 6 :
-		if((opcode1==0) && (opcode2==0))
-		{
-			switch(CRm)
+			return false;
+		case 5:
+			if (!opcode1 && !CRm)
 			{
-				case 0 :
-					armcp15->protectBaseSize0 = val;
-					armcp15_maskPrecalc(armcp15) ;
-					return true;
-				case 1 :
-					armcp15->protectBaseSize1 = val;
-					armcp15_maskPrecalc(armcp15) ;
-					return true;
-				case 2 :
-					armcp15->protectBaseSize2 = val;
-					armcp15_maskPrecalc(armcp15) ;
-					return true;
-				case 3 :
-					armcp15->protectBaseSize3 = val;
-					armcp15_maskPrecalc(armcp15) ;
-					return true;
-				case 4 :
-					armcp15->protectBaseSize4 = val;
-					armcp15_maskPrecalc(armcp15) ;
-					return true;
-				case 5 :
-					armcp15->protectBaseSize5 = val;
-					armcp15_maskPrecalc(armcp15) ;
-					return true;
-				case 6 :
-					armcp15->protectBaseSize6 = val;
-					armcp15_maskPrecalc(armcp15) ;
-					return true;
-				case 7 :
-					armcp15->protectBaseSize7 = val;
-					armcp15_maskPrecalc(armcp15) ;
-					return true;
-				default :
-					return false;
+				switch (opcode2)
+				{
+					case 2:
+						this->DaccessPerm = val;
+						this->maskPrecalc();
+						return true;
+					case 3:
+						this->IaccessPerm = val;
+						this->maskPrecalc();
+						return true;
+					default:
+						return false;
+				}
 			}
-		}
-		return false;
-		case 7 :
-		if((CRm==0)&&(opcode1==0)&&((opcode2==4)))
-		{
-			CP15wait4IRQ(armcp15->cpu);
-			return true;
-		}
-		return false;
-		case 9 :
-		if(opcode1==0)
-		{
-			switch(CRm)
+			return false;
+		case 6:
+			if (!opcode1 && !opcode2)
 			{
-				case 0 :
-				switch(opcode2)
+				switch (CRm)
 				{
-					case 0 :
-						armcp15->DcacheLock = val;
+					case 0:
+						this->protectBaseSize0 = val;
+						this->maskPrecalc();
+						return true;
+					case 1:
+						this->protectBaseSize1 = val;
+						this->maskPrecalc();
+						return true;
+					case 2:
+						this->protectBaseSize2 = val;
+						this->maskPrecalc();
+						return true;
+					case 3:
+						this->protectBaseSize3 = val;
+						this->maskPrecalc();
+						return true;
+					case 4:
+						this->protectBaseSize4 = val;
+						this->maskPrecalc();
+						return true;
+					case 5:
+						this->protectBaseSize5 = val;
+						this->maskPrecalc();
+						return true;
+					case 6:
+						this->protectBaseSize6 = val;
+						this->maskPrecalc();
 						return true;
-					case 1 :
-						armcp15->IcacheLock = val;
+					case 7:
+						this->protectBaseSize7 = val;
+						this->maskPrecalc();
 						return true;
-					default :
+					default:
 						return false;
+				}
 			}
-			case 1 :
-			switch(opcode2)
+			return false;
+		case 7:
+			if (!CRm && !opcode1 && opcode2 == 4)
 			{
-				case 0 :
-					armcp15->DTCMRegion = val;
-					MMU.DTCMRegion = val & 0x0FFFFFFC0;
-					/*sprintf(logbuf, "%08X", val);
-					log::ajouter(logbuf);*/
-					return true;
-				case 1 :
-					armcp15->ITCMRegion = val;
-					/* ITCM base is not writeable! */
-					MMU.ITCMRegion = 0;
-					return true;
-				default :
-					return false;
+				this->cpu->waitIRQ = true;
+				this->cpu->halt_IE_and_IF = true;
+				// IME set deliberately omitted: only SWI sets IME to 1
+				return true;
+			}
+			return false;
+		case 9:
+			if (!opcode1)
+			{
+				switch (CRm)
+				{
+					case 0:
+						switch (opcode2)
+						{
+							case 0:
+								this->DcacheLock = val;
+								return true;
+							case 1:
+								this->IcacheLock = val;
+								return true;
+							default:
+								return false;
+						}
+					case 1:
+						switch (opcode2)
+						{
+							case 0:
+								MMU.DTCMRegion = this->DTCMRegion = val & 0x0FFFF000;
+								return true;
+							case 1:
+								this->ITCMRegion = val;
+								// ITCM base is not writeable!
+								MMU.ITCMRegion = 0;
+								return true;
+							default:
+								return false;
+						}
 				}
 			}
-		}
-		return false;
-		default :
+			return false;
+		default:
 			return false;
 	}
 }
 
-
-
+/* precalculate region masks/sets from cp15 register ----- JIT */
+void maskPrecalc()
+{
+#define precalc(num) \
+{ \
+	uint32_t mask = 0, set = 0xFFFFFFFF; /* (x & 0) == 0xFF..FF is allways false (disabled) */ \
+	if (BIT_N(cp15.protectBaseSize##num, 0)) /* if region is enabled */ \
+	{ \
+		/* reason for this define: naming includes var */ \
+		mask = MASKFROMREG(cp15.protectBaseSize##num); \
+		set = SETFROMREG(cp15.protectBaseSize##num); \
+		if (SIZEIDENTIFIER(cp15.protectBaseSize##num) == 0x1F) \
+		{ \
+			/* for the 4GB region, u32 suffers wraparound */ \
+			mask = 0; \
+			set = 0; /* (x & 0) == 0 is allways true (enabled) */ \
+		} \
+	} \
+	cp15.setSingleRegionAccess(cp15.DaccessPerm, cp15.IaccessPerm, num, mask, set); \
+}
+	precalc(0);
+	precalc(1);
+	precalc(2);
+	precalc(3);
+	precalc(4);
+	precalc(5);
+	precalc(6);
+	precalc(7);
+#undef precalc
+}

audacious-plugins-3.6.2-gtk3.tar.bz2/src/xsf/desmume/cp15.h -> audacious-plugins-4.4.1.tar.bz2/src/xsf/desmume/cp15.h Changed

@@ -1,93 +1,111 @@
-/* Copyright (C) 2006 yopyop
- yopyop156@ifrance.com
- yopyop156.ifrance.com
+/*
+	Copyright (C) 2006 yopyop
+	Copyright (C) 2006-2010 DeSmuME team
 
- This file is part of DeSmuME
+	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
+	(at your option) any later version.
 
- DeSmuME 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 file 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.
 
- DeSmuME 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 DeSmuME; 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 the this software. If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef __CP15_H__
-#define __CP15_H__
+#pragma once
 
 #include "armcpu.h"
 
-typedef struct
-{
- u32 IDCode;
- u32 cacheType;
- u32 TCMSize;
- u32 ctrl;
- u32 DCConfig;
- u32 ICConfig;
- u32 writeBuffCtrl;
- u32 und;
- u32 DaccessPerm;
- u32 IaccessPerm;
- u32 protectBaseSize0;
- u32 protectBaseSize1;
- u32 protectBaseSize2;
- u32 protectBaseSize3;
- u32 protectBaseSize4;
- u32 protectBaseSize5;
- u32 protectBaseSize6;
- u32 protectBaseSize7;
- u32 cacheOp;
- u32 DcacheLock;
- u32 IcacheLock;
- u32 ITCMRegion;
- u32 DTCMRegion;
- u32 processID;
- u32 RAM_TAG;
- u32 testState;
- u32 cacheDbg;
- /* calculated bitmasks for the regions to decide rights uppon */
- /* calculation is done in the MCR instead of on mem access for performance */
- u32 regionWriteMask_USR8 ;
- u32 regionWriteMask_SYS8 ;
- u32 regionReadMask_USR8 ;
- u32 regionReadMask_SYS8 ;
- u32 regionExecuteMask_USR8 ;
- u32 regionExecuteMask_SYS8 ;
- u32 regionWriteSet_USR8 ;
- u32 regionWriteSet_SYS8 ;
- u32 regionReadSet_USR8 ;
- u32 regionReadSet_SYS8 ;
- u32 regionExecuteSet_USR8 ;
- u32 regionExecuteSet_SYS8 ;
+const uint32_t CP15_ACCESS_WRITE = 0;
+const uint32_t CP15_ACCESS_READ = 2;
+const uint32_t CP15_ACCESS_EXECUTE = 4;
+const uint32_t CP15_ACCESS_WRITEUSR = CP15_ACCESS_WRITE;
+const uint32_t CP15_ACCESS_WRITESYS = 1;
+const uint32_t CP15_ACCESS_READUSR = CP15_ACCESS_READ;
+const uint32_t CP15_ACCESS_READSYS = 3;
+const uint32_t CP15_ACCESS_EXECUSR = CP15_ACCESS_EXECUTE;
+const uint32_t CP15_ACCESS_EXECSYS = 5;
 
-	armcpu_t * cpu;
+struct armcp15_t
+{
+public:
+	uint32_t IDCode;
+	uint32_t cacheType;
+	uint32_t TCMSize;
+	uint32_t ctrl;
+	uint32_t DCConfig;
+	uint32_t ICConfig;
+	uint32_t writeBuffCtrl;
+	uint32_t und;
+	uint32_t DaccessPerm;
+	uint32_t IaccessPerm;
+	uint32_t protectBaseSize0;
+	uint32_t protectBaseSize1;
+	uint32_t protectBaseSize2;
+	uint32_t protectBaseSize3;
+	uint32_t protectBaseSize4;
+	uint32_t protectBaseSize5;
+	uint32_t protectBaseSize6;
+	uint32_t protectBaseSize7;
+	uint32_t cacheOp;
+	uint32_t DcacheLock;
+	uint32_t IcacheLock;
+	uint32_t ITCMRegion;
+	uint32_t DTCMRegion;
+	uint32_t processID;
+	uint32_t RAM_TAG;
+	uint32_t testState;
+	uint32_t cacheDbg;
+	/* calculated bitmasks for the regions to decide rights uppon */
+	/* calculation is done in the MCR instead of on mem access for performance */
+	uint32_t regionWriteMask_USR8;
+	uint32_t regionWriteMask_SYS8;
+	uint32_t regionReadMask_USR8;
+	uint32_t regionReadMask_SYS8;
+	uint32_t regionExecuteMask_USR8;
+	uint32_t regionExecuteMask_SYS8;
+	uint32_t regionWriteSet_USR8;
+	uint32_t regionWriteSet_SYS8;
+	uint32_t regionReadSet_USR8;
+	uint32_t regionReadSet_SYS8;
+	uint32_t regionExecuteSet_USR8;
+	uint32_t regionExecuteSet_SYS8;
 
-} armcp15_t;
+	armcpu_t *cpu;
 
-armcp15_t *armcp15_new(armcpu_t *c);
-BOOL armcp15_dataProcess(armcp15_t *armcp15, u8 CRd, u8 CRn, u8 CRm, u8 opcode1, u8 opcode2);
-BOOL armcp15_load(armcp15_t *armcp15, u8 CRd, u8 adr);
-BOOL armcp15_store(armcp15_t *armcp15, u8 CRd, u8 adr);
-BOOL armcp15_moveCP2ARM(armcp15_t *armcp15, u32 * R, u8 CRn, u8 CRm, u8 opcode1, u8 opcode2);
-BOOL armcp15_moveARM2CP(armcp15_t *armcp15, u32 val, u8 CRn, u8 CRm, u8 opcode1, u8 opcode2);
-BOOL armcp15_isAccessAllowed(armcp15_t *armcp15, u32 address, u32 access);
+	void setSingleRegionAccess(uint32_t dAccess, uint32_t iAccess, unsigned char num, uint32_t mask, uint32_t set);
+	void maskPrecalc();
 
-#define CP15_ACCESS_WRITE 0
-#define CP15_ACCESS_READ 2
-#define CP15_ACCESS_EXECUTE 4
-#define CP15_ACCESS_WRITEUSR CP15_ACCESS_WRITE
-#define CP15_ACCESS_WRITESYS 1
-#define CP15_ACCESS_READUSR CP15_ACCESS_READ
-#define CP15_ACCESS_READSYS 3
-#define CP15_ACCESS_EXECUSR CP15_ACCESS_EXECUTE
-#define CP15_ACCESS_EXECSYS 5
+public:
+	armcp15_t() : IDCode(0), cacheType(0), TCMSize(0), ctrl(0), DCConfig(0), ICConfig(0), writeBuffCtrl(0), und(0), DaccessPerm(0), IaccessPerm(0), protectBaseSize0(0), protectBaseSize1(0), protectBaseSize2(0),
+		protectBaseSize3(0), protectBaseSize4(0), protectBaseSize5(0), protectBaseSize6(0), protectBaseSize7(0), cacheOp(0), DcacheLock(0), IcacheLock(0), ITCMRegion(0), DTCMRegion(0), processID(0), RAM_TAG(0),
+		testState(0), cacheDbg(0), cpu(nullptr)
+	{
+		memset(&this->regionWriteMask_USR0, 0, sizeof(this->regionWriteMask_USR));
+		memset(&this->regionWriteMask_SYS0, 0, sizeof(this->regionWriteMask_SYS));
+		memset(&this->regionReadMask_USR0, 0, sizeof(this->regionReadMask_USR));
+		memset(&this->regionReadMask_SYS0, 0, sizeof(this->regionReadMask_SYS));
+		memset(&this->regionExecuteMask_USR0, 0, sizeof(this->regionExecuteMask_USR));
+		memset(&this->regionExecuteMask_SYS0, 0, sizeof(this->regionExecuteMask_SYS));
+		memset(&this->regionWriteSet_USR0, 0, sizeof(this->regionWriteSet_USR));
+		memset(&this->regionWriteSet_SYS0, 0, sizeof(this->regionWriteSet_SYS));
+		memset(&this->regionReadSet_USR0, 0, sizeof(this->regionReadSet_USR));
+		memset(&this->regionReadSet_SYS0, 0, sizeof(this->regionReadSet_SYS));
+		memset(&this->regionExecuteSet_USR0, 0, sizeof(this->regionExecuteSet_USR));
+		memset(&this->regionExecuteSet_SYS0, 0, sizeof(this->regionExecuteSet_SYS));
+	}
+	bool reset(armcpu_t *c);
+	bool dataProcess(uint8_t CRd, uint8_t CRn, uint8_t CRm, uint8_t opcode1, uint8_t opcode2);
+	bool load(uint8_t CRd, uint8_t adr);
+	bool store(uint8_t CRd, uint8_t adr);
+	bool moveCP2ARM(uint32_t *R, uint8_t CRn, uint8_t CRm, uint8_t opcode1, uint8_t opcode2);
+	bool moveARM2CP(uint32_t val, uint8_t CRn, uint8_t CRm, uint8_t opcode1, uint8_t opcode2);
+	bool isAccessAllowed(uint32_t address,uint32_t access);
+};
 
-#endif /* __CP15_H__*/
+extern armcp15_t cp15;
+void maskPrecalc();

audacious-plugins-4.4.1.tar.bz2/src/xsf/desmume/emufile.cc Added

@@ -0,0 +1,49 @@
+/*
+The MIT License
+
+Copyright (C) 2009-2010 DeSmuME team
+
+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.
+*/
+
+#include "emufile.h"
+
+size_t EMUFILE_MEMORY::_fread(void *ptr, size_t bytes)
+{
+	uint32_t remain = this->len - this->pos;
+	uint32_t todo = std::min<uint32_t>(remain, bytes);
+	if (!len)
+	{
+		this->failbit = true;
+		return 0;
+	}
+	if (todo <= 4)
+	{
+		uint8_t *src = this->buf() + this->pos;
+		uint8_t *dst = static_cast<uint8_t *>(ptr);
+		for (uint32_t i = 0; i < todo; ++i)
+			*dst++ = *src++;
+	}
+	else
+		memcpy(ptr, this->buf() + this->pos, todo);
+	this->pos += todo;
+	if (todo < bytes)
+		this->failbit = true;
+	return todo;
+}

audacious-plugins-4.4.1.tar.bz2/src/xsf/desmume/emufile.h Added

@@ -0,0 +1,208 @@
+/*
+The MIT License
+
+Copyright (C) 2009-2012 DeSmuME team
+
+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.
+*/
+
+// don't use emufile for files bigger than 2GB! you have been warned! some day this will be fixed.
+
+#pragma once
+
+#include <vector>
+#include <algorithm>
+#include <string>
+#include <cassert>
+#include <cstdio>
+#include <cstring>
+#include <cstdarg>
+#include <cmath>
+#include "types.h"
+
+#if defined(_MSC_VER) || defined(__MINGW32__)
+# include <io.h>
+#else
+# include <unistd.h>
+#endif
+
+class EMUFILE
+{
+protected:
+	bool failbit;
+
+public:
+	EMUFILE() : failbit(false) { }
+	virtual ~EMUFILE() { }
+
+	bool fail(bool unset = false)
+	{
+		bool ret = failbit;
+		if (unset)
+			unfail();
+		return ret;
+	}
+	void unfail() { failbit = false; }
+
+	size_t fread(void *ptr, size_t bytes)
+	{
+		return _fread(ptr, bytes);
+	}
+
+	// virtuals
+	virtual size_t _fread(void *ptr, size_t bytes) = 0;
+
+	virtual int fseek(int offset, int origin) = 0;
+
+	virtual size_t ftell() = 0;
+	virtual size_t size() = 0;
+};
+
+// todo - handle read-only specially?
+class EMUFILE_MEMORY : public EMUFILE
+{
+protected:
+	std::vector<uint8_t> *vec;
+	bool ownvec;
+	int32_t pos, len;
+
+	void reserve(uint32_t amt)
+	{
+		if (this->vec->size() < amt)
+			this->vec->resize(amt);
+	}
+public:
+	EMUFILE_MEMORY(std::vector<uint8_t> *underlying) : vec(underlying), ownvec(false), pos(0), len(underlying->size()) { }
+	EMUFILE_MEMORY(uint32_t preallocate) : vec(new std::vector<uint8_t>()), ownvec(true), pos(0), len(0)
+	{
+		this->vec->resize(preallocate);
+		this->len = preallocate;
+	}
+	EMUFILE_MEMORY() : vec(new std::vector<uint8_t>()), ownvec(true), pos(0), len(0)
+	{
+		this->vec->reserve(1024);
+	}
+	EMUFILE_MEMORY(void *Buf, int32_t Size) : vec(new std::vector<uint8_t>()), ownvec(true), pos(0), len(Size)
+	{
+		this->vec->resize(Size);
+		if (Size)
+			memcpy(&(*this->vec)0, Buf, Size);
+	}
+
+	~EMUFILE_MEMORY()
+	{
+		if (this->ownvec)
+			delete this->vec;
+	}
+
+	uint8_t *buf()
+	{
+		if (!this->size())
+			this->reserve(1);
+		return &(*this->vec)0;
+	}
+
+	virtual size_t _fread(void *ptr, size_t bytes);
+
+	virtual int fseek(int offset, int origin)
+	{
+		// work differently for read-only...?
+		switch (origin)
+		{
+			case SEEK_SET:
+				this->pos = offset;
+				break;
+			case SEEK_CUR:
+				this->pos += offset;
+				break;
+			case SEEK_END:
+				this->pos = this->size() + offset;
+				break;
+			default:
+				assert(false);
+		}
+		this->reserve(pos);
+		return 0;
+	}
+
+	virtual size_t ftell()
+	{
+		return this->pos;
+	}
+
+	virtual size_t size()
+	{
+		return this->len;
+	}
+};
+
+class EMUFILE_FILE : public EMUFILE
+{
+protected:
+	FILE *fp;
+	std::string fname;
+	char mode16;
+private:
+	void open(const char *fn, const char *Mode)
+	{
+		this->fp = fopen(fn, Mode);
+		if (!this->fp)
+			this->failbit = true;
+		this->fname = fn;
+		strcpy(this->mode, Mode);
+	}
+public:
+	EMUFILE_FILE(const std::string &fn, const char *Mode)
+	{
+		this->open(fn.c_str(), Mode);
+	}
+
+	virtual ~EMUFILE_FILE()
+	{
+		if (this->fp)
+			fclose(this->fp);
+	}
+
+	virtual size_t _fread(void *ptr, size_t bytes)
+	{
+		size_t ret = ::fread(ptr, 1, bytes, this->fp);
+		if (ret < bytes)
+			this->failbit = true;
+		return ret;
+	}
+
+	virtual int fseek(int offset, int origin)
+	{
+		return ::fseek(this->fp, offset, origin);
+	}
+
+	virtual size_t ftell()
+	{
+		return ::ftell(this->fp);
+	}
+
+	virtual size_t size()
+	{
+		int oldpos = this->ftell();
+		this->fseek(0, SEEK_END);
+		int len = this->ftell();
+		this->fseek(oldpos, SEEK_SET);
+		return len;
+	}
+};

audacious-plugins-4.4.1.tar.bz2/src/xsf/desmume/firmware.cc Added

@@ -0,0 +1,627 @@
+/*
+	Copyright (C) 2009-2011 DeSmuME Team
+
+	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
+	(at your option) any later version.
+
+	This file 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 the this software. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "firmware.h"
+#include "NDSSystem.h"
+
+#define WANT_AUD_BSWAP
+#include <libaudcore/audio.h>
+
+static inline uint32_t DWNUM(uint32_t i) { return i >> 2; }
+
+bool CFIRMWARE::getKeyBuf()
+{
+	FILE *file = fopen(CommonSettings.ARM7BIOS, "rb");
+	if (!file)
+		return false;
+
+	fseek(file, 0x30, SEEK_SET);
+	size_t res = fread(this->keyBuf, 4, 0x412, file);
+	fclose(file);
+	return res == 0x412;
+}
+
+void CFIRMWARE::crypt64BitUp(uint32_t *ptr)
+{
+	uint32_t Y = ptr0;
+	uint32_t X = ptr1;
+
+	for (uint32_t i = 0x00; i <= 0x0F; ++i)
+	{
+		uint32_t Z = this->keyBufi ^ X;
+		X = this->keyBufDWNUM(0x048 + (((Z >> 24) & 0xFF) << 2));
+		X = this->keyBufDWNUM(0x448 + (((Z >> 16) & 0xFF) << 2)) + X;
+		X = this->keyBufDWNUM(0x848 + (((Z >> 8) & 0xFF) << 2)) ^ X;
+		X = this->keyBufDWNUM(0xC48 + ((Z & 0xFF) << 2)) + X;
+		X = Y ^ X;
+		Y = Z;
+	}
+
+	ptr0 = X ^ this->keyBufDWNUM(0x40);
+	ptr1 = Y ^ this->keyBufDWNUM(0x44);
+}
+
+void CFIRMWARE::crypt64BitDown(uint32_t *ptr)
+{
+	uint32_t Y = ptr0;
+	uint32_t X = ptr1;
+
+	for (uint32_t i = 0x11; i >= 0x02; --i)
+	{
+		uint32_t Z = this->keyBufi ^ X;
+		X = this->keyBufDWNUM(0x048 + (((Z >> 24) & 0xFF) << 2));
+		X = this->keyBufDWNUM(0x448 + (((Z >> 16) & 0xFF) << 2)) + X;
+		X = this->keyBufDWNUM(0x848 + (((Z >> 8) & 0xFF) << 2)) ^ X;
+		X = this->keyBufDWNUM(0xC48 + ((Z & 0xFF) << 2)) + X;
+		X = Y ^ X;
+		Y = Z;
+	}
+
+	ptr0 = X ^ this->keyBufDWNUM(0x04);
+	ptr1 = Y ^ this->keyBufDWNUM(0x00);
+}
+
+void CFIRMWARE::applyKeycode(uint32_t modulo)
+{
+	this->crypt64BitUp(&this->keyCode1);
+	this->crypt64BitUp(&this->keyCode0);
+
+	uint32_t scratch = { 0x00000000, 0x00000000 };
+
+	for (uint32_t i = 0; i <= 0x44; i += 4)
+		this->keyBufDWNUM(i) = this->keyBufDWNUM(i) ^ bswap32(this->keyCodeDWNUM(i % modulo));
+
+	for (uint32_t i = 0; i <= 0x1040; i += 8)
+	{
+		this->crypt64BitUp(scratch);
+		this->keyBufDWNUM(i) = scratch1;
+		this->keyBufDWNUM(i + 4) = scratch0;
+	}
+}
+
+bool CFIRMWARE::initKeycode(uint32_t idCode, int level, uint32_t modulo)
+{
+	if (!this->getKeyBuf())
+		return false;
+
+	this->keyCode0 = idCode;
+	this->keyCode1 = idCode >> 1;
+	this->keyCode2 = idCode << 1;
+
+	if (level >= 1)
+		this->applyKeycode(modulo);
+	if (level >= 2)
+		this->applyKeycode(modulo);
+
+	this->keyCode1 <<= 1;
+	this->keyCode2 >>= 1;
+
+	if (level >= 3)
+		this->applyKeycode(modulo);
+
+	return true;
+}
+
+uint16_t CFIRMWARE::getBootCodeCRC16()
+{
+	uint32_t crc = 0xFFFF;
+	const uint16_t val = { 0xC0C1, 0xC181, 0xC301, 0xC601, 0xCC01, 0xD801, 0xF001, 0xA001 };
+
+	unsigned i, j;
+	for (i = 0; i < this->size9; ++i)
+	{
+		crc ^= this->tmp_data9i;
+
+		for (j = 0; j < 8; ++j)
+		{
+			if (crc & 0x0001)
+				crc = (crc >> 1) ^ (valj << (7 - j));
+			else
+				crc >>= 1;
+		}
+	}
+
+	for (i = 0; i < this->size7; ++i)
+	{
+		crc ^= this->tmp_data7i;
+
+		for (j = 0; j < 8; ++j)
+		{
+			if (crc & 0x0001)
+				crc = (crc >> 1) ^ (valj << (7 - j));
+			else
+				crc >>= 1;
+		}
+	}
+
+	return crc & 0xFFFF;
+}
+
+uint32_t CFIRMWARE::decrypt(const uint8_t *in, std::unique_ptr<uint8_t> &out)
+{
+	uint32_t curBlock2 = { 0 };
+
+	uint32_t xIn = 4, xOut = 0;
+
+	memcpy(curBlock, in, 8);
+	this->crypt64BitDown(curBlock);
+	uint32_t blockSize = curBlock0 >> 8;
+
+	if (!blockSize)
+		return 0;
+
+	out.reset(new uint8_tblockSize);
+	if (!out)
+		return 0;
+	memset(&out0, 0xFF, blockSize);
+
+	uint32_t xLen = blockSize;
+	while (xLen > 0)
+	{
+		uint8_t d = T1ReadByte(reinterpret_cast<uint8_t *>(curBlock), xIn % 8);
+		++xIn;
+		if (!(xIn % 8))
+		{
+			memcpy(curBlock, in + xIn, 8);
+			this->crypt64BitDown(curBlock);
+		}
+
+		for (uint32_t i = 0; i < 8; ++i)
+		{
+			if (d & 0x80)
+			{
+				uint16_t data = T1ReadByte(reinterpret_cast<uint8_t *>(curBlock), xIn % 8) << 8;
+				++xIn;
+				if (!(xIn % 8))
+				{
+					memcpy(curBlock, in + xIn, 8);
+					this->crypt64BitDown(curBlock);
+				}
+				data |= T1ReadByte(reinterpret_cast<uint8_t *>(curBlock), xIn % 8);
+				++xIn;
+				if (!(xIn % 8))
+				{
+					memcpy(curBlock, in + xIn, 8);
+					this->crypt64BitDown(curBlock);
+				}
+
+				uint32_t len = (data >> 12) + 3;
+				uint32_t offset = data & 0xFFF;
+				uint32_t windowOffset = xOut - offset - 1;
+
+				for (uint32_t j = 0; j < len; ++j)
+				{
+					T1WriteByte(&out0, xOut, T1ReadByte(&out0, windowOffset));
+					++xOut;
+					++windowOffset;
+
+					--xLen;
+					if (!xLen)
+						return blockSize;
+				}
+			}
+			else
+			{
+				T1WriteByte(&out0, xOut, T1ReadByte(reinterpret_cast<uint8_t *>(curBlock), xIn % 8));
+				++xOut;
+				++xIn;
+				if (!(xIn % 8))
+				{
+					memcpy(curBlock, in + xIn, 8);
+					this->crypt64BitDown(curBlock);
+				}
+
+				--xLen;
+				if (!xLen)
+					return blockSize;
+			}
+
+			d = (d << 1) & 0xFF;
+		}
+	}
+
+	return blockSize;
+}
+
+uint32_t CFIRMWARE::decompress(const uint8_t *in, std::unique_ptr<uint8_t> &out)
+{
+	uint32_t curBlock2 = { 0 };
+
+	uint32_t xIn = 4, xOut = 0;
+
+	memcpy(curBlock, in, 8);
+	uint32_t blockSize = curBlock0 >> 8;
+
+	if (!blockSize)
+		return 0;
+
+	out.reset(new uint8_tblockSize);
+	if (!out)
+		return 0;
+	memset(&out0, 0xFF, blockSize);
+
+	uint32_t xLen = blockSize;
+	while (xLen > 0)
+	{
+		uint8_t d = T1ReadByte(reinterpret_cast<uint8_t *>(curBlock), xIn % 8);
+		++xIn;
+		if (!(xIn % 8))
+			memcpy(curBlock, in + xIn, 8);
+
+		for (uint32_t i = 0; i < 8; ++i)
+		{
+			if (d & 0x80)
+			{
+				uint16_t data = T1ReadByte(reinterpret_cast<uint8_t *>(curBlock), xIn % 8) << 8;
+				++xIn;
+				if (!(xIn % 8))
+					memcpy(curBlock, in + xIn, 8);
+				data |= T1ReadByte(reinterpret_cast<uint8_t *>(curBlock), xIn % 8);
+				++xIn;
+				if (!(xIn % 8))
+					memcpy(curBlock, in + xIn, 8);
+
+				uint32_t len = (data >> 12) + 3;
+				uint32_t offset = data & 0xFFF;
+				uint32_t windowOffset = xOut - offset - 1;
+
+				for (uint32_t j = 0; j < len; ++j)
+				{
+					T1WriteByte(&out0, xOut, T1ReadByte(&out0, windowOffset));
+					++xOut;
+					++windowOffset;
+
+					--xLen;
+					if (!xLen)
+						return blockSize;
+				}
+			}
+			else
+			{
+				T1WriteByte(&out0, xOut, T1ReadByte(reinterpret_cast<uint8_t *>(curBlock), xIn % 8));
+				++xOut;
+				++xIn;
+				if (!(xIn % 8))
+					memcpy(curBlock, in + xIn, 8);
+
+				--xLen;
+				if (!xLen)
+					return blockSize;
+			}
+
+			d = (d << 1) & 0xFF;
+		}
+	}
+
+	return blockSize;
+}
+
+// ================================================================================
+bool CFIRMWARE::load()
+{
+	if (!CommonSettings.UseExtFirmware)
+		return false;
+	if (!strlen(CommonSettings.Firmware))
+		return false;
+
+	FILE *fp = fopen(CommonSettings.Firmware, "rb");
+	if (!fp)
+		return false;
+	fseek(fp, 0, SEEK_END);
+	uint32_t size = ftell(fp);
+	fseek(fp, 0, SEEK_SET);
+	if (size != 262144 && size != 524288)
+	{
+		fclose(fp);
+		return false;
+	}
+
+#if 1
+	if (size == 524288)
+	{
+		fclose(fp);
+		return false;
+	}
+#endif
+
+	auto data = std::unique_ptr<uint8_t>(new uint8_tsize);
+	if (!data)
+	{
+		fclose(fp);
+		return false;
+	}
+
+	if (fread(&data0, 1, size, fp) != size)
+	{
+		fclose(fp);
+		return false;
+	}
+
+	memcpy(&header, &data0, sizeof(header));
+	if (header.fw_identifier0 != 'M' || header.fw_identifier1 != 'A' || header.fw_identifier2 != 'C')
+	{
+		fclose(fp);
+		return false;
+	}
+
+	uint16_t shift1 = header.shift_amounts & 0x07;
+	uint16_t shift2 = (header.shift_amounts >> 3) & 0x07;
+	uint16_t shift3 = (header.shift_amounts >> 6) & 0x07;
+	uint16_t shift4 = (header.shift_amounts >> 9) & 0x07;
+
+	// todo - add support for 512Kb
+	uint32_t part1addr = header.part1_rom_boot9_addr << (2 + shift1);
+	uint32_t part1ram = 0x02800000 - (header.part1_ram_boot9_addr << (2 + shift2));
+	uint32_t part2addr = header.part2_rom_boot7_addr << (2 + shift3);
+	uint32_t part2ram = 0x03810000 - (header.part2_ram_boot7_addr << (2 + shift4));
+
+	this->ARM9bootAddr = part1ram;
+	this->ARM7bootAddr = part2ram;
+
+	if (!this->initKeycode(T1ReadLong(&data0, 0x08), 1, 0xC))
+	{
+		fclose(fp);
+		return false;
+	}
+
+#if 0
+	this->crypt64BitDown(reinterpret_cast<uint32_t *>(&data0x18));
+#else
+	// fix touch coords
+	data0x18 = 0x00;
+	data0x19 = 0x00;
+	data0x1A = 0x00;
+	data0x1B = 0x00;
+
+	data0x1C = 0x00;
+	data0x1D = 0xFF;
+	data0x1E = 0x00;
+	data0x1F = 0x00;
+#endif
+
+	if (!this->initKeycode(T1ReadLong(&data0, 0x08), 2, 0xC))
+	{
+		fclose(fp);
+		return false;
+	}
+
+	this->size9 = this->decrypt(&datapart1addr, this->tmp_data9);
+	if (!this->tmp_data9)
+	{
+		fclose(fp);
+		return false;
+	}
+
+	this->size7 = this->decrypt(&datapart2addr, this->tmp_data7);
+	if (!this->tmp_data7)
+	{
+		this->tmp_data9.reset();
+		fclose(fp);
+		return false;
+	}
+
+	uint16_t crc16_mine = this->getBootCodeCRC16();
+
+	if (crc16_mine != header.part12_boot_crc16)
+	{
+		this->tmp_data9.reset();
+		this->tmp_data7.reset();
+		fclose(fp);
+		return false;
+	}
+
+	// Copy firmware boot codes to their respective locations
+	uint32_t src = 0;
+	for (uint32_t i = 0; i < (this->size9 >> 2); ++i)
+	{
+		_MMU_write32<ARMCPU_ARM9>(part1ram, T1ReadLong(&this->tmp_data90, src));
+		src += 4;
+		part1ram += 4;
+	}
+
+	src = 0;
+	for (uint32_t i = 0; i < (this->size7 >> 2); ++i)
+	{
+		_MMU_write32<ARMCPU_ARM7>(part2ram, T1ReadLong(&this->tmp_data70, src));
+		src += 4;
+		part2ram += 4;
+	}
+	this->tmp_data7.reset();
+	this->tmp_data9.reset();
+
+	this->patched = false;
+	if (data0x17C != 0xFF)
+		this->patched = true;
+
+	if (this->patched)
+	{
+		uint32_t patch_offset = 0x3FC80;
+		if (data0x17C > 1)
+			patch_offset = 0x3F680;
+
+		memcpy(&header, &datapatch_offset, sizeof(header));
+
+		shift1 = header.shift_amounts & 0x07;
+		shift2 = (header.shift_amounts >> 3) & 0x07;
+		shift3 = (header.shift_amounts >> 6) & 0x07;
+		shift4 = (header.shift_amounts >> 9) & 0x07;
+
+		// todo - add support for 512Kb
+		part1addr = header.part1_rom_boot9_addr << (2 + shift1);
+		part1ram = 0x02800000 - (header.part1_ram_boot9_addr << (2 + shift2));
+		part2addr = header.part2_rom_boot7_addr << (2 + shift3);
+		part2ram = 0x03810000 - (header.part2_ram_boot7_addr << (2 + shift4));
+
+		this->ARM9bootAddr = part1ram;
+		this->ARM7bootAddr = part2ram;
+
+		this->size9 = this->decompress(&datapart1addr, this->tmp_data9);
+		if (!this->tmp_data9)
+		{
+			fclose(fp);
+			return false;
+		}
+
+		this->size7 = this->decompress(&datapart2addr, this->tmp_data7);
+		if (!this->tmp_data7)
+		{
+			this->tmp_data9.reset();
+			fclose(fp);
+			return false;
+		};
+		// Copy firmware boot codes to their respective locations
+		src = 0;
+		for (uint32_t i = 0; i < (this->size9 >> 2); ++i)
+		{
+			_MMU_write32<ARMCPU_ARM9>(part1ram, T1ReadLong(&this->tmp_data90, src));
+			src += 4;
+			part1ram += 4;
+		}
+
+		src = 0;
+		for (uint32_t i = 0; i < (this->size7 >> 2); ++i)
+		{
+			_MMU_write32<ARMCPU_ARM7>(part2ram, T1ReadLong(&this->tmp_data70, src));
+			src += 4;
+			part2ram += 4;
+		}
+		this->tmp_data7.reset();
+		this->tmp_data9.reset();
+	}
+
+	// TODO: add 512Kb support
+	memcpy(&MMU.fw.data0, &data0, 262144);
+	MMU.fw.fp = nullptr;
+
+	return true;
+}
+
+// =====================================================================================================
+static uint32_t calc_CRC16(uint32_t start, const uint8_t *data, int count)
+{
+	uint32_t crc = start & 0xffff;
+	const uint16_t val = { 0xC0C1, 0xC181, 0xC301, 0xC601, 0xCC01, 0xD801, 0xF001, 0xA001 };
+	for (int i = 0; i < count; ++i)
+	{
+		crc ^= datai;
+
+		for (int j = 0; j < 8; ++j)
+		{
+			bool do_bit = false;
+
+			if (crc & 0x1)
+				do_bit = true;
+
+			crc >>= 1;
+
+			if (do_bit)
+				crc ^= valj << (7 - j);
+		}
+	}
+	return crc;
+}
+
+int copy_firmware_user_data(uint8_t *dest_buffer, const uint8_t *fw_data)
+{
+	/*
+	 * Determine which of the two user settings in the firmware is the current
+	 * and valid one and then copy this into the destination buffer.
+	 *
+	 * The current setting will have a greater count.
+	 * Settings are only valid if its CRC16 is correct.
+	 */
+	int copy_good = 0;
+
+	uint32_t user_settings_offset = fw_data0x20;
+	user_settings_offset |= fw_data0x21 << 8;
+	user_settings_offset <<= 3;
+
+	if (user_settings_offset <= 0x3FE00)
+	{
+		int32_t copy_settings_offset = -1;
+
+		uint32_t crc = calc_CRC16(0xffff, &fw_datauser_settings_offset, NDS_FW_USER_SETTINGS_MEM_BYTE_COUNT);
+		uint32_t fw_crc = fw_datauser_settings_offset + 0x72;
+		fw_crc |= fw_datauser_settings_offset + 0x73 << 8;
+		bool user1_valid = crc == fw_crc;
+
+		crc = calc_CRC16(0xffff, &fw_datauser_settings_offset + 0x100, NDS_FW_USER_SETTINGS_MEM_BYTE_COUNT);
+		fw_crc = fw_datauser_settings_offset + 0x100 + 0x72;
+		fw_crc |= fw_datauser_settings_offset + 0x100 + 0x73 << 8;
+		bool user2_valid = crc == fw_crc;
+
+		if (user1_valid)
+		{
+			if (user2_valid)
+			{
+				uint16_t count1, count2;
+
+				count1 = fw_datauser_settings_offset + 0x70;
+				count1 |= fw_datauser_settings_offset + 0x71 << 8;
+
+				count2 = fw_datauser_settings_offset + 0x100 + 0x70;
+				count2 |= fw_datauser_settings_offset + 0x100 + 0x71 << 8;
+
+				if (count2 > count1)
+					copy_settings_offset = user_settings_offset + 0x100;
+				else
+					copy_settings_offset = user_settings_offset;
+			}
+			else
+				copy_settings_offset = user_settings_offset;
+		}
+		else if (user2_valid)
+			/* copy the second user settings */
+			copy_settings_offset = user_settings_offset + 0x100;
+
+		if (copy_settings_offset > 0)
+		{
+			memcpy(dest_buffer, &fw_datacopy_settings_offset, NDS_FW_USER_SETTINGS_MEM_BYTE_COUNT);
+			copy_good = 1;
+		}
+	}
+
+	return copy_good;
+}
+
+void NDS_FillDefaultFirmwareConfigData(NDS_fw_config_data *fw_config)
+{
+	const char *default_nickname = "DeSmuME";
+	const char *default_message = "DeSmuME makes you happy!";
+
+	memset(fw_config, 0, sizeof(struct NDS_fw_config_data));
+	fw_config->ds_type = NDS_CONSOLE_TYPE_FAT;
+
+	fw_config->fav_colour = 7;
+
+	fw_config->birth_day = 23;
+	fw_config->birth_month = 6;
+
+	int str_length = strlen(default_nickname);
+	int i;
+	for (i = 0; i < str_length; ++i)
+		fw_config->nicknamei = default_nicknamei;
+	fw_config->nickname_len = str_length;
+
+	str_length = strlen(default_message);
+	for (i = 0; i < str_length; ++i)
+		fw_config->messagei = default_messagei;
+	fw_config->message_len = str_length;
+
+	/* default to English */
+	fw_config->language = 1;
+}

audacious-plugins-4.4.1.tar.bz2/src/xsf/desmume/firmware.h Added

@@ -0,0 +1,81 @@
+/*
+	Copyright (C) 2009-2011 DeSmuME Team
+
+	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
+	(at your option) any later version.
+
+	This file 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 the this software. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+#include <memory>
+#include "types.h"
+
+// the count of bytes copied from the firmware into memory
+const int NDS_FW_USER_SETTINGS_MEM_BYTE_COUNT = 0x70;
+
+#define FW_CONFIG_FILE_EXT "dfc"
+
+class CFIRMWARE
+{
+private:
+	std::unique_ptr<uint8_t> tmp_data9;
+	std::unique_ptr<uint8_t> tmp_data7;
+	uint32_t size9, size7;
+
+	uint32_t keyBuf0x412;
+	uint32_t keyCode3;
+
+	bool getKeyBuf();
+	void crypt64BitUp(uint32_t *ptr);
+	void crypt64BitDown(uint32_t *ptr);
+	void applyKeycode(uint32_t modulo);
+	bool initKeycode(uint32_t idCode, int level, uint32_t modulo);
+	uint16_t getBootCodeCRC16();
+	uint32_t decrypt(const uint8_t *in, std::unique_ptr<uint8_t> &out);
+	uint32_t decompress(const uint8_t *in, std::unique_ptr<uint8_t> &out);
+public:
+	CFIRMWARE(): size9(0), size7(0), ARM9bootAddr(0), ARM7bootAddr(0), patched(0) { }
+
+	bool load();
+
+	struct HEADER
+	{
+		uint16_t part3_rom_gui9_addr;		// 000h
+		uint16_t part4_rom_wifi7_addr;		// 002h
+		uint16_t part34_gui_wifi_crc16;		// 004h
+		uint16_t part12_boot_crc16;			// 006h
+		uint8_t fw_identifier4;			// 008h
+		uint16_t part1_rom_boot9_addr;		// 00Ch
+		uint16_t part1_ram_boot9_addr;		// 00Eh
+		uint16_t part2_rom_boot7_addr;		// 010h
+		uint16_t part2_ram_boot7_addr;		// 012h
+		uint16_t shift_amounts;				// 014h
+		uint16_t part5_data_gfx_addr;		// 016h
+
+		uint8_t fw_timestamp5;			// 018h
+		uint8_t console_type;				// 01Dh
+		uint16_t unused1;					// 01Eh
+		uint16_t user_settings_offset;		// 020h
+		uint16_t unknown1;					// 022h
+		uint16_t unknown2;					// 024h
+		uint16_t part5_crc16;				// 026h
+		uint16_t unused2;					// 028h	- FFh filled
+	} header;
+
+	uint32_t ARM9bootAddr;
+	uint32_t ARM7bootAddr;
+	bool patched;
+};
+
+int copy_firmware_user_data(uint8_t *dest_buffer, const uint8_t *fw_data);
+void NDS_FillDefaultFirmwareConfigData(struct NDS_fw_config_data *fw_config);

audacious-plugins-4.4.1.tar.bz2/src/xsf/desmume/instruction_attributes.h Added

@@ -0,0 +1,5171 @@
+/*	Copyright (C) 2006 yopyop
+	Copyright (C) 2011 Loren Merritt
+	Copyright (C) 2012 DeSmuME team
+
+	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 3 of the License, or
+	(at your option) any later version.
+
+	This file 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 the this software. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+#include "types.h"
+
+#define INSTR_CYCLES_MASK 0x7
+#define INSTR_CYCLES(c) c // constant cycles. does not include the penalty for writing to r15 for instructions other than dedicated branches.
+#define INSTR_CYCLES_VARIABLE 0 // duration to be determined at runtime
+#define INSTR_CYCLES_V INSTR_CYCLES_VARIABLE
+
+#define SRCREG_NONE 0x0000
+#define SRCREG_POS0 0x0008
+#define SRCREG_POS3 0x0010
+#define SRCREG_POS8 0x0020
+#define SRCREG_POS12 0x0040
+#define SRCREG_POS16 0x0080
+#define SRCREG_STM 0x0100
+
+#define BRANCH_NEVER 0x00000000
+#define BRANCH_ALWAYS 0x00000800
+#define BRANCH_POS0 0x00001000 // branch if (REG_NUM(i,0)|((i>>4)&8))==15
+#define BRANCH_POS12 0x00002000 // branch if REG_POS(i,12)==15
+#define BRANCH_LDM 0x00004000
+#define BRANCH_SWI 0x00008000 // branch if use external SWI - if (cpu->swi_tab == NULL)
+
+#define JIT_BYPASS 0x80000000 // JIT makes no assumptions about what this instruction does
+
+const uint32_t instruction_attributes =
+{
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_AND_LSL_IMM
+INSTR_CYCLES(2) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS8 | SRCREG_POS16, //OP_AND_LSL_REG
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_AND_LSR_IMM
+INSTR_CYCLES(2) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS8 | SRCREG_POS16, //OP_AND_LSR_REG
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_AND_ASR_IMM
+INSTR_CYCLES(2) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS8 | SRCREG_POS16, //OP_AND_ASR_REG
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_AND_ROR_IMM
+INSTR_CYCLES(2) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS8 | SRCREG_POS16, //OP_AND_ROR_REG
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_AND_LSL_IMM
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS8, //OP_MUL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_AND_LSR_IMM
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS12 | SRCREG_POS16, //OP_STRH_POS_INDE_M_REG_OFF
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_AND_ASR_IMM
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS16, //OP_LDRD_STRD_POST_INDEX
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_AND_ROR_IMM
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS16, //OP_LDRD_STRD_POST_INDEX
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_AND_S_LSL_IMM
+INSTR_CYCLES(2) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS8 | SRCREG_POS16, //OP_AND_S_LSL_REG
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_AND_S_LSR_IMM
+INSTR_CYCLES(2) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS8 | SRCREG_POS16, //OP_AND_S_LSR_REG
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_AND_S_ASR_IMM
+INSTR_CYCLES(2) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS8 | SRCREG_POS16, //OP_AND_S_ASR_REG
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_AND_S_ROR_IMM
+INSTR_CYCLES(2) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS8 | SRCREG_POS16, //OP_AND_S_ROR_REG
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_AND_S_LSL_IMM
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS8, //OP_MUL_S
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_AND_S_LSR_IMM
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS16, //OP_LDRH_POS_INDE_M_REG_OFF
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_AND_S_ASR_IMM
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS16, //OP_LDRSB_POS_INDE_M_REG_OFF
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_AND_S_ROR_IMM
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS16, //OP_LDRSH_POS_INDE_M_REG_OFF
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_EOR_LSL_IMM
+INSTR_CYCLES(2) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS8 | SRCREG_POS16, //OP_EOR_LSL_REG
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_EOR_LSR_IMM
+INSTR_CYCLES(2) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS8 | SRCREG_POS16, //OP_EOR_LSR_REG
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_EOR_ASR_IMM
+INSTR_CYCLES(2) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS8 | SRCREG_POS16, //OP_EOR_ASR_REG
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_EOR_ROR_IMM
+INSTR_CYCLES(2) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS8 | SRCREG_POS16, //OP_EOR_ROR_REG
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_EOR_LSL_IMM
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS8 | SRCREG_POS12, //OP_MLA
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_EOR_LSR_IMM
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_EOR_ASR_IMM
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_EOR_ROR_IMM
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_EOR_S_LSL_IMM
+INSTR_CYCLES(2) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS8 | SRCREG_POS16, //OP_EOR_S_LSL_REG
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_EOR_S_LSR_IMM
+INSTR_CYCLES(2) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS8 | SRCREG_POS16, //OP_EOR_S_LSR_REG
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_EOR_S_ASR_IMM
+INSTR_CYCLES(2) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS8 | SRCREG_POS16, //OP_EOR_S_ASR_REG
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_EOR_S_ROR_IMM
+INSTR_CYCLES(2) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS8 | SRCREG_POS16, //OP_EOR_S_ROR_REG
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_EOR_S_LSL_IMM
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS8 | SRCREG_POS12, //OP_MLA_S
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_EOR_S_LSR_IMM
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_EOR_S_ASR_IMM
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_EOR_S_ROR_IMM
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_SUB_LSL_IMM
+INSTR_CYCLES(2) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS8 | SRCREG_POS16, //OP_SUB_LSL_REG
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_SUB_LSR_IMM
+INSTR_CYCLES(2) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS8 | SRCREG_POS16, //OP_SUB_LSR_REG
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_SUB_ASR_IMM
+INSTR_CYCLES(2) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS8 | SRCREG_POS16, //OP_SUB_ASR_REG
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_SUB_ROR_IMM
+INSTR_CYCLES(2) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS8 | SRCREG_POS16, //OP_SUB_ROR_REG
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_SUB_LSL_IMM
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_SUB_LSR_IMM
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STRH_POS_INDE_M_IMM_OFF
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_SUB_ASR_IMM
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS16, //OP_LDRD_STRD_POST_INDEX
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_SUB_ROR_IMM
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS16, //OP_LDRD_STRD_POST_INDEX
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_SUB_S_LSL_IMM
+INSTR_CYCLES(2) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS8 | SRCREG_POS16, //OP_SUB_S_LSL_REG
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_SUB_S_LSR_IMM
+INSTR_CYCLES(2) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS8 | SRCREG_POS16, //OP_SUB_S_LSR_REG
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_SUB_S_ASR_IMM
+INSTR_CYCLES(2) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS8 | SRCREG_POS16, //OP_SUB_S_ASR_REG
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_SUB_S_ROR_IMM
+INSTR_CYCLES(2) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS8 | SRCREG_POS16, //OP_SUB_S_ROR_REG
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_SUB_S_LSL_IMM
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_SUB_S_LSR_IMM
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS16, //OP_LDRH_POS_INDE_M_IMM_OFF
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_SUB_S_ASR_IMM
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS16, //OP_LDRSB_POS_INDE_M_IMM_OFF
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_SUB_S_ROR_IMM
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS16, //OP_LDRSH_POS_INDE_M_IMM_OFF
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_RSB_LSL_IMM
+INSTR_CYCLES(2) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS8 | SRCREG_POS16, //OP_RSB_LSL_REG
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_RSB_LSR_IMM
+INSTR_CYCLES(2) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS8 | SRCREG_POS16, //OP_RSB_LSR_REG
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_RSB_ASR_IMM
+INSTR_CYCLES(2) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS8 | SRCREG_POS16, //OP_RSB_ASR_REG
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_RSB_ROR_IMM
+INSTR_CYCLES(2) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS8 | SRCREG_POS16, //OP_RSB_ROR_REG
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_RSB_LSL_IMM
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_RSB_LSR_IMM
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_RSB_ASR_IMM
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_RSB_ROR_IMM
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_RSB_S_LSL_IMM
+INSTR_CYCLES(2) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS8 | SRCREG_POS16, //OP_RSB_S_LSL_REG
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_RSB_S_LSR_IMM
+INSTR_CYCLES(2) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS8 | SRCREG_POS16, //OP_RSB_S_LSR_REG
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_RSB_S_ASR_IMM
+INSTR_CYCLES(2) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS8 | SRCREG_POS16, //OP_RSB_S_ASR_REG
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_RSB_S_ROR_IMM
+INSTR_CYCLES(2) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS8 | SRCREG_POS16, //OP_RSB_S_ROR_REG
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_RSB_S_LSL_IMM
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_RSB_S_LSR_IMM
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_RSB_S_ASR_IMM
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_RSB_S_ROR_IMM
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_ADD_LSL_IMM
+INSTR_CYCLES(2) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS8 | SRCREG_POS16, //OP_ADD_LSL_REG
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_ADD_LSR_IMM
+INSTR_CYCLES(2) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS8 | SRCREG_POS16, //OP_ADD_LSR_REG
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_ADD_ASR_IMM
+INSTR_CYCLES(2) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS8 | SRCREG_POS16, //OP_ADD_ASR_REG
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_ADD_ROR_IMM
+INSTR_CYCLES(2) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS8 | SRCREG_POS16, //OP_ADD_ROR_REG
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_ADD_LSL_IMM
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS8, //OP_UMULL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_ADD_LSR_IMM
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS12 | SRCREG_POS16, //OP_STRH_POS_INDE_P_REG_OFF
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_ADD_ASR_IMM
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS16, //OP_LDRD_STRD_POST_INDEX
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_ADD_ROR_IMM
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS16, //OP_LDRD_STRD_POST_INDEX
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_ADD_S_LSL_IMM
+INSTR_CYCLES(2) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS8 | SRCREG_POS16, //OP_ADD_S_LSL_REG
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_ADD_S_LSR_IMM
+INSTR_CYCLES(2) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS8 | SRCREG_POS16, //OP_ADD_S_LSR_REG
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_ADD_S_ASR_IMM
+INSTR_CYCLES(2) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS8 | SRCREG_POS16, //OP_ADD_S_ASR_REG
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_ADD_S_ROR_IMM
+INSTR_CYCLES(2) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS8 | SRCREG_POS16, //OP_ADD_S_ROR_REG
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_ADD_S_LSL_IMM
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS8, //OP_UMULL_S
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_ADD_S_LSR_IMM
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS16, //OP_LDRH_POS_INDE_P_REG_OFF
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_ADD_S_ASR_IMM
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS16, //OP_LDRSB_POS_INDE_P_REG_OFF
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_ADD_S_ROR_IMM
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS16, //OP_LDRSH_POS_INDE_P_REG_OFF
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_ADC_LSL_IMM
+INSTR_CYCLES(2) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS8 | SRCREG_POS16, //OP_ADC_LSL_REG
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_ADC_LSR_IMM
+INSTR_CYCLES(2) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS8 | SRCREG_POS16, //OP_ADC_LSR_REG
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_ADC_ASR_IMM
+INSTR_CYCLES(2) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS8 | SRCREG_POS16, //OP_ADC_ASR_REG
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_ADC_ROR_IMM
+INSTR_CYCLES(2) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS8 | SRCREG_POS16, //OP_ADC_ROR_REG
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_ADC_LSL_IMM
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS8 | SRCREG_POS12 | SRCREG_POS16, //OP_UMLAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_ADC_LSR_IMM
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_ADC_ASR_IMM
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_ADC_ROR_IMM
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_ADC_S_LSL_IMM
+INSTR_CYCLES(2) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS8 | SRCREG_POS16, //OP_ADC_S_LSL_REG
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_ADC_S_LSR_IMM
+INSTR_CYCLES(2) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS8 | SRCREG_POS16, //OP_ADC_S_LSR_REG
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_ADC_S_ASR_IMM
+INSTR_CYCLES(2) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS8 | SRCREG_POS16, //OP_ADC_S_ASR_REG
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_ADC_S_ROR_IMM
+INSTR_CYCLES(2) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS8 | SRCREG_POS16, //OP_ADC_S_ROR_REG
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_ADC_S_LSL_IMM
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS8 | SRCREG_POS12 | SRCREG_POS16, //OP_UMLAL_S
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_ADC_S_LSR_IMM
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_ADC_S_ASR_IMM
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_ADC_S_ROR_IMM
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_SBC_LSL_IMM
+INSTR_CYCLES(2) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS8 | SRCREG_POS16, //OP_SBC_LSL_REG
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_SBC_LSR_IMM
+INSTR_CYCLES(2) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS8 | SRCREG_POS16, //OP_SBC_LSR_REG
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_SBC_ASR_IMM
+INSTR_CYCLES(2) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS8 | SRCREG_POS16, //OP_SBC_ASR_REG
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_SBC_ROR_IMM
+INSTR_CYCLES(2) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS8 | SRCREG_POS16, //OP_SBC_ROR_REG
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_SBC_LSL_IMM
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS8, //OP_SMULL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_SBC_LSR_IMM
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STRH_POS_INDE_P_IMM_OFF
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_SBC_ASR_IMM
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS16, //OP_LDRD_STRD_POST_INDEX
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_SBC_ROR_IMM
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS16, //OP_LDRD_STRD_POST_INDEX
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_SBC_S_LSL_IMM
+INSTR_CYCLES(2) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS8 | SRCREG_POS16, //OP_SBC_S_LSL_REG
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_SBC_S_LSR_IMM
+INSTR_CYCLES(2) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS8 | SRCREG_POS16, //OP_SBC_S_LSR_REG
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_SBC_S_ASR_IMM
+INSTR_CYCLES(2) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS8 | SRCREG_POS16, //OP_SBC_S_ASR_REG
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_SBC_S_ROR_IMM
+INSTR_CYCLES(2) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS8 | SRCREG_POS16, //OP_SBC_S_ROR_REG
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_SBC_S_LSL_IMM
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS8, //OP_SMULL_S
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_SBC_S_LSR_IMM
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS16, //OP_LDRH_POS_INDE_P_IMM_OFF
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_SBC_S_ASR_IMM
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS16, //OP_LDRSB_POS_INDE_P_IMM_OFF
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_SBC_S_ROR_IMM
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS16, //OP_LDRSH_POS_INDE_P_IMM_OFF
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_RSC_LSL_IMM
+INSTR_CYCLES(2) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS8 | SRCREG_POS16, //OP_RSC_LSL_REG
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_RSC_LSR_IMM
+INSTR_CYCLES(2) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS8 | SRCREG_POS16, //OP_RSC_LSR_REG
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_RSC_ASR_IMM
+INSTR_CYCLES(2) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS8 | SRCREG_POS16, //OP_RSC_ASR_REG
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_RSC_ROR_IMM
+INSTR_CYCLES(2) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS8 | SRCREG_POS16, //OP_RSC_ROR_REG
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_RSC_LSL_IMM
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS8 | SRCREG_POS12 | SRCREG_POS16, //OP_SMLAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_RSC_LSR_IMM
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_RSC_ASR_IMM
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_RSC_ROR_IMM
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_RSC_S_LSL_IMM
+INSTR_CYCLES(2) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS8 | SRCREG_POS16, //OP_RSC_S_LSL_REG
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_RSC_S_LSR_IMM
+INSTR_CYCLES(2) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS8 | SRCREG_POS16, //OP_RSC_S_LSR_REG
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_RSC_S_ASR_IMM
+INSTR_CYCLES(2) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS8 | SRCREG_POS16, //OP_RSC_S_ASR_REG
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_RSC_S_ROR_IMM
+INSTR_CYCLES(2) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS8 | SRCREG_POS16, //OP_RSC_S_ROR_REG
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_RSC_S_LSL_IMM
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS8 | SRCREG_POS12 | SRCREG_POS16, //OP_SMLAL_S
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_RSC_S_LSR_IMM
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_RSC_S_ASR_IMM
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_RSC_S_ROR_IMM
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_MRS_CPSR
+JIT_BYPASS, //OP_UND
+JIT_BYPASS, //OP_UND
+JIT_BYPASS, //OP_UND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES(2) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_QADD
+JIT_BYPASS, //OP_UND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES(2) | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS8 | SRCREG_POS12, //OP_SMLA_B_B
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS16, //OP_SWP
+INSTR_CYCLES(2) | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS8 | SRCREG_POS12, //OP_SMLA_T_B
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS12 | SRCREG_POS16, //OP_STRH_M_REG_OFF
+INSTR_CYCLES(2) | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS8 | SRCREG_POS12, //OP_SMLA_B_T
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS16, //OP_LDRD_STRD_OFFSET_PRE_INDEX
+INSTR_CYCLES(2) | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS8 | SRCREG_POS12, //OP_SMLA_T_T
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS16, //OP_LDRD_STRD_OFFSET_PRE_INDEX
+INSTR_CYCLES(1) | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS16, //OP_TST_LSL_IMM
+INSTR_CYCLES(2) | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS8 | SRCREG_POS16, //OP_TST_LSL_REG
+INSTR_CYCLES(1) | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS16, //OP_TST_LSR_IMM
+INSTR_CYCLES(2) | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS8 | SRCREG_POS16, //OP_TST_LSR_REG
+INSTR_CYCLES(1) | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS16, //OP_TST_ASR_IMM
+INSTR_CYCLES(2) | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS8 | SRCREG_POS16, //OP_TST_ASR_REG
+INSTR_CYCLES(1) | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS16, //OP_TST_ROR_IMM
+INSTR_CYCLES(2) | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS8 | SRCREG_POS16, //OP_TST_ROR_REG
+INSTR_CYCLES(1) | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS16, //OP_TST_LSL_IMM
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES(1) | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS16, //OP_TST_LSR_IMM
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS16, //OP_LDRH_M_REG_OFF
+INSTR_CYCLES(1) | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS16, //OP_TST_ASR_IMM
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS16, //OP_LDRSB_M_REG_OFF
+INSTR_CYCLES(1) | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS16, //OP_TST_ROR_IMM
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS16, //OP_LDRSH_M_REG_OFF
+INSTR_CYCLES(1) | BRANCH_NEVER | SRCREG_POS0, //OP_MSR_CPSR
+INSTR_CYCLES(3) | BRANCH_ALWAYS | SRCREG_POS0, //OP_BX
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES(3) | BRANCH_ALWAYS | SRCREG_POS0, //OP_BLX_REG
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES(2) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_QSUB
+JIT_BYPASS, //OP_UND
+JIT_BYPASS, //OP_BKPT
+INSTR_CYCLES(2) | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS8 | SRCREG_POS12, //OP_SMLAW_B
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES(2) | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS8, //OP_SMULW_B
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS12 | SRCREG_POS16, //OP_STRH_PRE_INDE_M_REG_OFF
+INSTR_CYCLES(2) | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS8 | SRCREG_POS12, //OP_SMLAW_T
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS16, //OP_LDRD_STRD_OFFSET_PRE_INDEX
+INSTR_CYCLES(2) | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS8, //OP_SMULW_T
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS16, //OP_LDRD_STRD_OFFSET_PRE_INDEX
+INSTR_CYCLES(1) | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS16, //OP_TEQ_LSL_IMM
+INSTR_CYCLES(2) | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS8 | SRCREG_POS16, //OP_TEQ_LSL_REG
+INSTR_CYCLES(1) | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS16, //OP_TEQ_LSR_IMM
+INSTR_CYCLES(2) | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS8 | SRCREG_POS16, //OP_TEQ_LSR_REG
+INSTR_CYCLES(1) | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS16, //OP_TEQ_ASR_IMM
+INSTR_CYCLES(2) | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS8 | SRCREG_POS16, //OP_TEQ_ASR_REG
+INSTR_CYCLES(1) | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS16, //OP_TEQ_ROR_IMM
+INSTR_CYCLES(2) | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS8 | SRCREG_POS16, //OP_TEQ_ROR_REG
+INSTR_CYCLES(1) | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS16, //OP_TEQ_LSL_IMM
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES(1) | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS16, //OP_TEQ_LSR_IMM
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS16, //OP_LDRH_PRE_INDE_M_REG_OFF
+INSTR_CYCLES(1) | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS16, //OP_TEQ_ASR_IMM
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS16, //OP_LDRSB_PRE_INDE_M_REG_OFF
+INSTR_CYCLES(1) | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS16, //OP_TEQ_ROR_IMM
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS16, //OP_LDRSH_PRE_INDE_M_REG_OFF
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_MRS_SPSR
+JIT_BYPASS, //OP_UND
+JIT_BYPASS, //OP_UND
+JIT_BYPASS, //OP_UND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES(2) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_QDADD
+JIT_BYPASS, //OP_UND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES(2) | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS8 | SRCREG_POS12 | SRCREG_POS16, //OP_SMLAL_B_B
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS16, //OP_SWPB
+INSTR_CYCLES(2) | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS8 | SRCREG_POS12 | SRCREG_POS16, //OP_SMLAL_T_B
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STRH_M_IMM_OFF
+INSTR_CYCLES(2) | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS8 | SRCREG_POS12 | SRCREG_POS16, //OP_SMLAL_B_T
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS16, //OP_LDRD_STRD_OFFSET_PRE_INDEX
+INSTR_CYCLES(2) | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS8 | SRCREG_POS12 | SRCREG_POS16, //OP_SMLAL_T_T
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS16, //OP_LDRD_STRD_OFFSET_PRE_INDEX
+INSTR_CYCLES(1) | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS16, //OP_CMP_LSL_IMM
+INSTR_CYCLES(2) | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS8 | SRCREG_POS16, //OP_CMP_LSL_REG
+INSTR_CYCLES(1) | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS16, //OP_CMP_LSR_IMM
+INSTR_CYCLES(2) | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS8 | SRCREG_POS16, //OP_CMP_LSR_REG
+INSTR_CYCLES(1) | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS16, //OP_CMP_ASR_IMM
+INSTR_CYCLES(2) | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS8 | SRCREG_POS16, //OP_CMP_ASR_REG
+INSTR_CYCLES(1) | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS16, //OP_CMP_ROR_IMM
+INSTR_CYCLES(2) | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS8 | SRCREG_POS16, //OP_CMP_ROR_REG
+INSTR_CYCLES(1) | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS16, //OP_CMP_LSL_IMM
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES(1) | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS16, //OP_CMP_LSR_IMM
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS16, //OP_LDRH_M_IMM_OFF
+INSTR_CYCLES(1) | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS16, //OP_CMP_ASR_IMM
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS16, //OP_LDRSB_M_IMM_OFF
+INSTR_CYCLES(1) | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS16, //OP_CMP_ROR_IMM
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS16, //OP_LDRSH_M_IMM_OFF
+INSTR_CYCLES(1) | BRANCH_NEVER | SRCREG_POS0, //OP_MSR_SPSR
+INSTR_CYCLES(2) | BRANCH_NEVER | SRCREG_POS0, //OP_CLZ
+JIT_BYPASS, //OP_UND
+JIT_BYPASS, //OP_UND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES(2) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_QDSUB
+JIT_BYPASS, //OP_UND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES(2) | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS8, //OP_SMUL_B_B
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES(2) | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS8, //OP_SMUL_T_B
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STRH_PRE_INDE_M_IMM_OFF
+INSTR_CYCLES(2) | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS8, //OP_SMUL_B_T
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS16, //OP_LDRD_STRD_OFFSET_PRE_INDEX
+INSTR_CYCLES(2) | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS8, //OP_SMUL_T_T
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS16, //OP_LDRD_STRD_OFFSET_PRE_INDEX
+INSTR_CYCLES(1) | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS16, //OP_CMN_LSL_IMM
+INSTR_CYCLES(2) | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS8 | SRCREG_POS16, //OP_CMN_LSL_REG
+INSTR_CYCLES(1) | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS16, //OP_CMN_LSR_IMM
+INSTR_CYCLES(2) | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS8 | SRCREG_POS16, //OP_CMN_LSR_REG
+INSTR_CYCLES(1) | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS16, //OP_CMN_ASR_IMM
+INSTR_CYCLES(2) | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS8 | SRCREG_POS16, //OP_CMN_ASR_REG
+INSTR_CYCLES(1) | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS16, //OP_CMN_ROR_IMM
+INSTR_CYCLES(2) | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS8 | SRCREG_POS16, //OP_CMN_ROR_REG
+INSTR_CYCLES(1) | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS16, //OP_CMN_LSL_IMM
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES(1) | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS16, //OP_CMN_LSR_IMM
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS16, //OP_LDRH_PRE_INDE_M_IMM_OFF
+INSTR_CYCLES(1) | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS16, //OP_CMN_ASR_IMM
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS16, //OP_LDRSB_PRE_INDE_M_IMM_OFF
+INSTR_CYCLES(1) | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS16, //OP_CMN_ROR_IMM
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS16, //OP_LDRSH_PRE_INDE_M_IMM_OFF
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_ORR_LSL_IMM
+INSTR_CYCLES(2) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS8 | SRCREG_POS16, //OP_ORR_LSL_REG
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_ORR_LSR_IMM
+INSTR_CYCLES(2) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS8 | SRCREG_POS16, //OP_ORR_LSR_REG
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_ORR_ASR_IMM
+INSTR_CYCLES(2) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS8 | SRCREG_POS16, //OP_ORR_ASR_REG
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_ORR_ROR_IMM
+INSTR_CYCLES(2) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS8 | SRCREG_POS16, //OP_ORR_ROR_REG
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_ORR_LSL_IMM
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_ORR_LSR_IMM
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS12 | SRCREG_POS16, //OP_STRH_P_REG_OFF
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_ORR_ASR_IMM
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS16, //OP_LDRD_STRD_OFFSET_PRE_INDEX
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_ORR_ROR_IMM
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS16, //OP_LDRD_STRD_OFFSET_PRE_INDEX
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_ORR_S_LSL_IMM
+INSTR_CYCLES(2) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS8 | SRCREG_POS16, //OP_ORR_S_LSL_REG
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_ORR_S_LSR_IMM
+INSTR_CYCLES(2) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS8 | SRCREG_POS16, //OP_ORR_S_LSR_REG
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_ORR_S_ASR_IMM
+INSTR_CYCLES(2) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS8 | SRCREG_POS16, //OP_ORR_S_ASR_REG
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_ORR_S_ROR_IMM
+INSTR_CYCLES(2) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS8 | SRCREG_POS16, //OP_ORR_S_ROR_REG
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_ORR_S_LSL_IMM
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_ORR_S_LSR_IMM
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS16, //OP_LDRH_P_REG_OFF
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_ORR_S_ASR_IMM
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS16, //OP_LDRSB_P_REG_OFF
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_ORR_S_ROR_IMM
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS16, //OP_LDRSH_P_REG_OFF
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0, //OP_MOV_LSL_IMM
+INSTR_CYCLES(2) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS8, //OP_MOV_LSL_REG
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0, //OP_MOV_LSR_IMM
+INSTR_CYCLES(2) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS8, //OP_MOV_LSR_REG
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0, //OP_MOV_ASR_IMM
+INSTR_CYCLES(2) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS8, //OP_MOV_ASR_REG
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0, //OP_MOV_ROR_IMM
+INSTR_CYCLES(2) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS8, //OP_MOV_ROR_REG
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0, //OP_MOV_LSL_IMM
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0, //OP_MOV_LSR_IMM
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS12 | SRCREG_POS16, //OP_STRH_PRE_INDE_P_REG_OFF
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0, //OP_MOV_ASR_IMM
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS16, //OP_LDRD_STRD_OFFSET_PRE_INDEX
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0, //OP_MOV_ROR_IMM
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS16, //OP_LDRD_STRD_OFFSET_PRE_INDEX
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0, //OP_MOV_S_LSL_IMM
+INSTR_CYCLES(2) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS8, //OP_MOV_S_LSL_REG
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0, //OP_MOV_S_LSR_IMM
+INSTR_CYCLES(2) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS8, //OP_MOV_S_LSR_REG
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0, //OP_MOV_S_ASR_IMM
+INSTR_CYCLES(2) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS8, //OP_MOV_S_ASR_REG
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0, //OP_MOV_S_ROR_IMM
+INSTR_CYCLES(2) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS8, //OP_MOV_S_ROR_REG
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0, //OP_MOV_S_LSL_IMM
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0, //OP_MOV_S_LSR_IMM
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS16, //OP_LDRH_PRE_INDE_P_REG_OFF
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0, //OP_MOV_S_ASR_IMM
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS16, //OP_LDRSB_PRE_INDE_P_REG_OFF
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0, //OP_MOV_S_ROR_IMM
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS16, //OP_LDRSH_PRE_INDE_P_REG_OFF
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_BIC_LSL_IMM
+INSTR_CYCLES(2) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS8 | SRCREG_POS16, //OP_BIC_LSL_REG
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_BIC_LSR_IMM
+INSTR_CYCLES(2) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS8 | SRCREG_POS16, //OP_BIC_LSR_REG
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_BIC_ASR_IMM
+INSTR_CYCLES(2) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS8 | SRCREG_POS16, //OP_BIC_ASR_REG
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_BIC_ROR_IMM
+INSTR_CYCLES(2) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS8 | SRCREG_POS16, //OP_BIC_ROR_REG
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_BIC_LSL_IMM
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_BIC_LSR_IMM
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STRH_P_IMM_OFF
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_BIC_ASR_IMM
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS16, //OP_LDRD_STRD_OFFSET_PRE_INDEX
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_BIC_ROR_IMM
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS16, //OP_LDRD_STRD_OFFSET_PRE_INDEX
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_BIC_S_LSL_IMM
+INSTR_CYCLES(2) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS8 | SRCREG_POS16, //OP_BIC_S_LSL_REG
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_BIC_S_LSR_IMM
+INSTR_CYCLES(2) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS8 | SRCREG_POS16, //OP_BIC_S_LSR_REG
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_BIC_S_ASR_IMM
+INSTR_CYCLES(2) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS8 | SRCREG_POS16, //OP_BIC_S_ASR_REG
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_BIC_S_ROR_IMM
+INSTR_CYCLES(2) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS8 | SRCREG_POS16, //OP_BIC_S_ROR_REG
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_BIC_S_LSL_IMM
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_BIC_S_LSR_IMM
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS16, //OP_LDRH_P_IMM_OFF
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_BIC_S_ASR_IMM
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS16, //OP_LDRSB_P_IMM_OFF
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_BIC_S_ROR_IMM
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS16, //OP_LDRSH_P_IMM_OFF
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0, //OP_MVN_LSL_IMM
+INSTR_CYCLES(2) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS8, //OP_MVN_LSL_REG
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0, //OP_MVN_LSR_IMM
+INSTR_CYCLES(2) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS8, //OP_MVN_LSR_REG
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0, //OP_MVN_ASR_IMM
+INSTR_CYCLES(2) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS8, //OP_MVN_ASR_REG
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0, //OP_MVN_ROR_IMM
+INSTR_CYCLES(2) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS8, //OP_MVN_ROR_REG
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0, //OP_MVN_LSL_IMM
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0, //OP_MVN_LSR_IMM
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STRH_PRE_INDE_P_IMM_OFF
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0, //OP_MVN_ASR_IMM
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS16, //OP_LDRD_STRD_OFFSET_PRE_INDEX
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0, //OP_MVN_ROR_IMM
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS16, //OP_LDRD_STRD_OFFSET_PRE_INDEX
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0, //OP_MVN_S_LSL_IMM
+INSTR_CYCLES(2) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS8, //OP_MVN_S_LSL_REG
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0, //OP_MVN_S_LSR_IMM
+INSTR_CYCLES(2) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS8, //OP_MVN_S_LSR_REG
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0, //OP_MVN_S_ASR_IMM
+INSTR_CYCLES(2) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS8, //OP_MVN_S_ASR_REG
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0, //OP_MVN_S_ROR_IMM
+INSTR_CYCLES(2) | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS8, //OP_MVN_S_ROR_REG
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0, //OP_MVN_S_LSL_IMM
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0, //OP_MVN_S_LSR_IMM
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS16, //OP_LDRH_PRE_INDE_P_IMM_OFF
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0, //OP_MVN_S_ASR_IMM
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS16, //OP_LDRSB_PRE_INDE_P_IMM_OFF
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS0, //OP_MVN_S_ROR_IMM
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS16, //OP_LDRSH_PRE_INDE_P_IMM_OFF
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_AND_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_AND_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_AND_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_AND_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_AND_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_AND_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_AND_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_AND_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_AND_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_AND_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_AND_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_AND_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_AND_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_AND_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_AND_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_AND_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_AND_S_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_AND_S_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_AND_S_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_AND_S_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_AND_S_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_AND_S_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_AND_S_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_AND_S_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_AND_S_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_AND_S_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_AND_S_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_AND_S_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_AND_S_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_AND_S_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_AND_S_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_AND_S_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_EOR_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_EOR_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_EOR_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_EOR_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_EOR_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_EOR_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_EOR_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_EOR_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_EOR_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_EOR_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_EOR_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_EOR_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_EOR_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_EOR_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_EOR_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_EOR_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_EOR_S_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_EOR_S_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_EOR_S_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_EOR_S_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_EOR_S_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_EOR_S_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_EOR_S_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_EOR_S_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_EOR_S_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_EOR_S_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_EOR_S_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_EOR_S_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_EOR_S_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_EOR_S_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_EOR_S_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_EOR_S_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_SUB_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_SUB_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_SUB_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_SUB_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_SUB_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_SUB_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_SUB_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_SUB_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_SUB_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_SUB_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_SUB_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_SUB_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_SUB_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_SUB_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_SUB_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_SUB_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_SUB_S_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_SUB_S_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_SUB_S_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_SUB_S_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_SUB_S_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_SUB_S_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_SUB_S_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_SUB_S_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_SUB_S_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_SUB_S_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_SUB_S_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_SUB_S_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_SUB_S_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_SUB_S_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_SUB_S_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_SUB_S_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_RSB_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_RSB_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_RSB_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_RSB_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_RSB_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_RSB_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_RSB_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_RSB_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_RSB_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_RSB_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_RSB_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_RSB_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_RSB_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_RSB_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_RSB_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_RSB_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_RSB_S_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_RSB_S_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_RSB_S_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_RSB_S_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_RSB_S_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_RSB_S_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_RSB_S_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_RSB_S_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_RSB_S_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_RSB_S_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_RSB_S_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_RSB_S_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_RSB_S_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_RSB_S_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_RSB_S_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_RSB_S_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_ADD_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_ADD_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_ADD_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_ADD_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_ADD_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_ADD_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_ADD_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_ADD_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_ADD_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_ADD_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_ADD_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_ADD_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_ADD_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_ADD_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_ADD_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_ADD_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_ADD_S_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_ADD_S_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_ADD_S_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_ADD_S_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_ADD_S_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_ADD_S_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_ADD_S_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_ADD_S_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_ADD_S_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_ADD_S_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_ADD_S_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_ADD_S_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_ADD_S_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_ADD_S_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_ADD_S_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_ADD_S_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_ADC_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_ADC_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_ADC_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_ADC_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_ADC_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_ADC_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_ADC_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_ADC_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_ADC_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_ADC_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_ADC_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_ADC_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_ADC_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_ADC_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_ADC_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_ADC_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_ADC_S_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_ADC_S_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_ADC_S_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_ADC_S_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_ADC_S_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_ADC_S_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_ADC_S_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_ADC_S_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_ADC_S_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_ADC_S_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_ADC_S_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_ADC_S_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_ADC_S_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_ADC_S_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_ADC_S_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_ADC_S_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_SBC_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_SBC_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_SBC_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_SBC_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_SBC_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_SBC_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_SBC_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_SBC_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_SBC_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_SBC_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_SBC_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_SBC_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_SBC_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_SBC_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_SBC_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_SBC_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_SBC_S_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_SBC_S_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_SBC_S_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_SBC_S_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_SBC_S_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_SBC_S_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_SBC_S_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_SBC_S_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_SBC_S_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_SBC_S_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_SBC_S_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_SBC_S_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_SBC_S_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_SBC_S_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_SBC_S_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_SBC_S_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_RSC_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_RSC_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_RSC_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_RSC_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_RSC_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_RSC_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_RSC_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_RSC_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_RSC_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_RSC_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_RSC_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_RSC_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_RSC_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_RSC_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_RSC_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_RSC_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_RSC_S_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_RSC_S_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_RSC_S_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_RSC_S_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_RSC_S_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_RSC_S_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_RSC_S_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_RSC_S_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_RSC_S_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_RSC_S_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_RSC_S_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_RSC_S_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_RSC_S_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_RSC_S_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_RSC_S_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_RSC_S_IMM_VAL
+JIT_BYPASS, //OP_UND
+JIT_BYPASS, //OP_UND
+JIT_BYPASS, //OP_UND
+JIT_BYPASS, //OP_UND
+JIT_BYPASS, //OP_UND
+JIT_BYPASS, //OP_UND
+JIT_BYPASS, //OP_UND
+JIT_BYPASS, //OP_UND
+JIT_BYPASS, //OP_UND
+JIT_BYPASS, //OP_UND
+JIT_BYPASS, //OP_UND
+JIT_BYPASS, //OP_UND
+JIT_BYPASS, //OP_UND
+JIT_BYPASS, //OP_UND
+JIT_BYPASS, //OP_UND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES(1) | BRANCH_NEVER | SRCREG_POS16, //OP_TST_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_NEVER | SRCREG_POS16, //OP_TST_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_NEVER | SRCREG_POS16, //OP_TST_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_NEVER | SRCREG_POS16, //OP_TST_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_NEVER | SRCREG_POS16, //OP_TST_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_NEVER | SRCREG_POS16, //OP_TST_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_NEVER | SRCREG_POS16, //OP_TST_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_NEVER | SRCREG_POS16, //OP_TST_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_NEVER | SRCREG_POS16, //OP_TST_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_NEVER | SRCREG_POS16, //OP_TST_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_NEVER | SRCREG_POS16, //OP_TST_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_NEVER | SRCREG_POS16, //OP_TST_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_NEVER | SRCREG_POS16, //OP_TST_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_NEVER | SRCREG_POS16, //OP_TST_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_NEVER | SRCREG_POS16, //OP_TST_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_NEVER | SRCREG_POS16, //OP_TST_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_MSR_CPSR_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_MSR_CPSR_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_MSR_CPSR_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_MSR_CPSR_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_MSR_CPSR_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_MSR_CPSR_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_MSR_CPSR_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_MSR_CPSR_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_MSR_CPSR_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_MSR_CPSR_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_MSR_CPSR_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_MSR_CPSR_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_MSR_CPSR_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_MSR_CPSR_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_MSR_CPSR_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_MSR_CPSR_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_NEVER | SRCREG_POS16, //OP_TEQ_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_NEVER | SRCREG_POS16, //OP_TEQ_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_NEVER | SRCREG_POS16, //OP_TEQ_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_NEVER | SRCREG_POS16, //OP_TEQ_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_NEVER | SRCREG_POS16, //OP_TEQ_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_NEVER | SRCREG_POS16, //OP_TEQ_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_NEVER | SRCREG_POS16, //OP_TEQ_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_NEVER | SRCREG_POS16, //OP_TEQ_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_NEVER | SRCREG_POS16, //OP_TEQ_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_NEVER | SRCREG_POS16, //OP_TEQ_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_NEVER | SRCREG_POS16, //OP_TEQ_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_NEVER | SRCREG_POS16, //OP_TEQ_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_NEVER | SRCREG_POS16, //OP_TEQ_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_NEVER | SRCREG_POS16, //OP_TEQ_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_NEVER | SRCREG_POS16, //OP_TEQ_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_NEVER | SRCREG_POS16, //OP_TEQ_IMM_VAL
+JIT_BYPASS, //OP_UND
+JIT_BYPASS, //OP_UND
+JIT_BYPASS, //OP_UND
+JIT_BYPASS, //OP_UND
+JIT_BYPASS, //OP_UND
+JIT_BYPASS, //OP_UND
+JIT_BYPASS, //OP_UND
+JIT_BYPASS, //OP_UND
+JIT_BYPASS, //OP_UND
+JIT_BYPASS, //OP_UND
+JIT_BYPASS, //OP_UND
+JIT_BYPASS, //OP_UND
+JIT_BYPASS, //OP_UND
+JIT_BYPASS, //OP_UND
+JIT_BYPASS, //OP_UND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES(1) | BRANCH_NEVER | SRCREG_POS16, //OP_CMP_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_NEVER | SRCREG_POS16, //OP_CMP_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_NEVER | SRCREG_POS16, //OP_CMP_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_NEVER | SRCREG_POS16, //OP_CMP_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_NEVER | SRCREG_POS16, //OP_CMP_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_NEVER | SRCREG_POS16, //OP_CMP_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_NEVER | SRCREG_POS16, //OP_CMP_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_NEVER | SRCREG_POS16, //OP_CMP_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_NEVER | SRCREG_POS16, //OP_CMP_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_NEVER | SRCREG_POS16, //OP_CMP_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_NEVER | SRCREG_POS16, //OP_CMP_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_NEVER | SRCREG_POS16, //OP_CMP_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_NEVER | SRCREG_POS16, //OP_CMP_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_NEVER | SRCREG_POS16, //OP_CMP_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_NEVER | SRCREG_POS16, //OP_CMP_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_NEVER | SRCREG_POS16, //OP_CMP_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_MSR_SPSR_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_MSR_SPSR_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_MSR_SPSR_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_MSR_SPSR_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_MSR_SPSR_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_MSR_SPSR_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_MSR_SPSR_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_MSR_SPSR_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_MSR_SPSR_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_MSR_SPSR_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_MSR_SPSR_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_MSR_SPSR_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_MSR_SPSR_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_MSR_SPSR_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_MSR_SPSR_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_MSR_SPSR_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_NEVER | SRCREG_POS16, //OP_CMN_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_NEVER | SRCREG_POS16, //OP_CMN_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_NEVER | SRCREG_POS16, //OP_CMN_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_NEVER | SRCREG_POS16, //OP_CMN_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_NEVER | SRCREG_POS16, //OP_CMN_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_NEVER | SRCREG_POS16, //OP_CMN_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_NEVER | SRCREG_POS16, //OP_CMN_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_NEVER | SRCREG_POS16, //OP_CMN_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_NEVER | SRCREG_POS16, //OP_CMN_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_NEVER | SRCREG_POS16, //OP_CMN_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_NEVER | SRCREG_POS16, //OP_CMN_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_NEVER | SRCREG_POS16, //OP_CMN_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_NEVER | SRCREG_POS16, //OP_CMN_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_NEVER | SRCREG_POS16, //OP_CMN_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_NEVER | SRCREG_POS16, //OP_CMN_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_NEVER | SRCREG_POS16, //OP_CMN_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_ORR_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_ORR_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_ORR_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_ORR_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_ORR_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_ORR_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_ORR_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_ORR_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_ORR_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_ORR_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_ORR_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_ORR_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_ORR_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_ORR_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_ORR_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_ORR_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_ORR_S_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_ORR_S_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_ORR_S_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_ORR_S_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_ORR_S_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_ORR_S_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_ORR_S_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_ORR_S_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_ORR_S_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_ORR_S_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_ORR_S_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_ORR_S_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_ORR_S_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_ORR_S_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_ORR_S_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_ORR_S_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_NONE, //OP_MOV_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_NONE, //OP_MOV_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_NONE, //OP_MOV_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_NONE, //OP_MOV_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_NONE, //OP_MOV_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_NONE, //OP_MOV_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_NONE, //OP_MOV_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_NONE, //OP_MOV_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_NONE, //OP_MOV_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_NONE, //OP_MOV_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_NONE, //OP_MOV_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_NONE, //OP_MOV_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_NONE, //OP_MOV_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_NONE, //OP_MOV_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_NONE, //OP_MOV_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_NONE, //OP_MOV_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_NONE, //OP_MOV_S_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_NONE, //OP_MOV_S_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_NONE, //OP_MOV_S_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_NONE, //OP_MOV_S_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_NONE, //OP_MOV_S_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_NONE, //OP_MOV_S_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_NONE, //OP_MOV_S_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_NONE, //OP_MOV_S_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_NONE, //OP_MOV_S_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_NONE, //OP_MOV_S_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_NONE, //OP_MOV_S_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_NONE, //OP_MOV_S_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_NONE, //OP_MOV_S_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_NONE, //OP_MOV_S_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_NONE, //OP_MOV_S_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_NONE, //OP_MOV_S_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_BIC_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_BIC_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_BIC_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_BIC_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_BIC_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_BIC_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_BIC_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_BIC_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_BIC_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_BIC_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_BIC_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_BIC_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_BIC_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_BIC_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_BIC_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_BIC_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_BIC_S_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_BIC_S_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_BIC_S_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_BIC_S_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_BIC_S_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_BIC_S_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_BIC_S_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_BIC_S_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_BIC_S_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_BIC_S_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_BIC_S_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_BIC_S_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_BIC_S_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_BIC_S_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_BIC_S_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_POS16, //OP_BIC_S_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_NONE, //OP_MVN_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_NONE, //OP_MVN_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_NONE, //OP_MVN_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_NONE, //OP_MVN_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_NONE, //OP_MVN_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_NONE, //OP_MVN_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_NONE, //OP_MVN_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_NONE, //OP_MVN_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_NONE, //OP_MVN_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_NONE, //OP_MVN_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_NONE, //OP_MVN_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_NONE, //OP_MVN_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_NONE, //OP_MVN_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_NONE, //OP_MVN_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_NONE, //OP_MVN_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_NONE, //OP_MVN_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_NONE, //OP_MVN_S_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_NONE, //OP_MVN_S_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_NONE, //OP_MVN_S_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_NONE, //OP_MVN_S_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_NONE, //OP_MVN_S_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_NONE, //OP_MVN_S_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_NONE, //OP_MVN_S_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_NONE, //OP_MVN_S_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_NONE, //OP_MVN_S_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_NONE, //OP_MVN_S_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_NONE, //OP_MVN_S_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_NONE, //OP_MVN_S_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_NONE, //OP_MVN_S_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_NONE, //OP_MVN_S_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_NONE, //OP_MVN_S_IMM_VAL
+INSTR_CYCLES(1) | BRANCH_POS12 | SRCREG_NONE, //OP_MVN_S_IMM_VAL
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STR_M_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STR_M_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STR_M_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STR_M_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STR_M_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STR_M_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STR_M_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STR_M_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STR_M_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STR_M_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STR_M_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STR_M_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STR_M_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STR_M_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STR_M_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STR_M_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS16, //OP_LDR_M_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS16, //OP_LDR_M_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS16, //OP_LDR_M_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS16, //OP_LDR_M_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS16, //OP_LDR_M_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS16, //OP_LDR_M_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS16, //OP_LDR_M_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS16, //OP_LDR_M_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS16, //OP_LDR_M_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS16, //OP_LDR_M_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS16, //OP_LDR_M_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS16, //OP_LDR_M_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS16, //OP_LDR_M_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS16, //OP_LDR_M_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS16, //OP_LDR_M_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS16, //OP_LDR_M_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STR_M_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STR_M_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STR_M_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STR_M_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STR_M_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STR_M_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STR_M_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STR_M_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STR_M_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STR_M_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STR_M_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STR_M_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STR_M_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STR_M_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STR_M_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STR_M_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS16, //OP_LDR_M_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS16, //OP_LDR_M_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS16, //OP_LDR_M_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS16, //OP_LDR_M_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS16, //OP_LDR_M_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS16, //OP_LDR_M_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS16, //OP_LDR_M_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS16, //OP_LDR_M_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS16, //OP_LDR_M_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS16, //OP_LDR_M_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS16, //OP_LDR_M_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS16, //OP_LDR_M_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS16, //OP_LDR_M_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS16, //OP_LDR_M_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS16, //OP_LDR_M_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS16, //OP_LDR_M_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_M_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_M_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_M_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_M_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_M_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_M_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_M_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_M_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_M_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_M_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_M_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_M_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_M_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_M_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_M_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_M_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS16, //OP_LDRB_M_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS16, //OP_LDRB_M_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS16, //OP_LDRB_M_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS16, //OP_LDRB_M_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS16, //OP_LDRB_M_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS16, //OP_LDRB_M_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS16, //OP_LDRB_M_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS16, //OP_LDRB_M_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS16, //OP_LDRB_M_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS16, //OP_LDRB_M_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS16, //OP_LDRB_M_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS16, //OP_LDRB_M_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS16, //OP_LDRB_M_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS16, //OP_LDRB_M_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS16, //OP_LDRB_M_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS16, //OP_LDRB_M_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_M_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_M_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_M_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_M_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_M_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_M_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_M_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_M_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_M_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_M_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_M_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_M_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_M_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_M_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_M_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_M_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS16, //OP_LDRB_M_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS16, //OP_LDRB_M_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS16, //OP_LDRB_M_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS16, //OP_LDRB_M_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS16, //OP_LDRB_M_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS16, //OP_LDRB_M_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS16, //OP_LDRB_M_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS16, //OP_LDRB_M_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS16, //OP_LDRB_M_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS16, //OP_LDRB_M_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS16, //OP_LDRB_M_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS16, //OP_LDRB_M_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS16, //OP_LDRB_M_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS16, //OP_LDRB_M_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS16, //OP_LDRB_M_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS16, //OP_LDRB_M_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STR_P_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STR_P_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STR_P_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STR_P_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STR_P_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STR_P_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STR_P_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STR_P_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STR_P_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STR_P_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STR_P_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STR_P_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STR_P_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STR_P_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STR_P_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STR_P_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS16, //OP_LDR_P_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS16, //OP_LDR_P_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS16, //OP_LDR_P_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS16, //OP_LDR_P_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS16, //OP_LDR_P_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS16, //OP_LDR_P_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS16, //OP_LDR_P_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS16, //OP_LDR_P_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS16, //OP_LDR_P_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS16, //OP_LDR_P_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS16, //OP_LDR_P_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS16, //OP_LDR_P_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS16, //OP_LDR_P_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS16, //OP_LDR_P_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS16, //OP_LDR_P_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS16, //OP_LDR_P_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STR_P_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STR_P_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STR_P_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STR_P_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STR_P_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STR_P_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STR_P_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STR_P_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STR_P_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STR_P_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STR_P_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STR_P_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STR_P_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STR_P_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STR_P_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STR_P_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS16, //OP_LDR_P_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS16, //OP_LDR_P_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS16, //OP_LDR_P_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS16, //OP_LDR_P_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS16, //OP_LDR_P_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS16, //OP_LDR_P_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS16, //OP_LDR_P_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS16, //OP_LDR_P_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS16, //OP_LDR_P_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS16, //OP_LDR_P_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS16, //OP_LDR_P_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS16, //OP_LDR_P_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS16, //OP_LDR_P_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS16, //OP_LDR_P_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS16, //OP_LDR_P_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS16, //OP_LDR_P_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_P_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_P_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_P_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_P_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_P_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_P_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_P_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_P_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_P_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_P_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_P_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_P_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_P_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_P_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_P_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_P_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS16, //OP_LDRB_P_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS16, //OP_LDRB_P_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS16, //OP_LDRB_P_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS16, //OP_LDRB_P_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS16, //OP_LDRB_P_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS16, //OP_LDRB_P_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS16, //OP_LDRB_P_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS16, //OP_LDRB_P_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS16, //OP_LDRB_P_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS16, //OP_LDRB_P_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS16, //OP_LDRB_P_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS16, //OP_LDRB_P_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS16, //OP_LDRB_P_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS16, //OP_LDRB_P_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS16, //OP_LDRB_P_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS16, //OP_LDRB_P_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_P_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_P_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_P_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_P_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_P_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_P_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_P_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_P_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_P_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_P_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_P_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_P_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_P_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_P_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_P_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_P_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS16, //OP_LDRB_P_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS16, //OP_LDRB_P_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS16, //OP_LDRB_P_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS16, //OP_LDRB_P_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS16, //OP_LDRB_P_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS16, //OP_LDRB_P_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS16, //OP_LDRB_P_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS16, //OP_LDRB_P_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS16, //OP_LDRB_P_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS16, //OP_LDRB_P_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS16, //OP_LDRB_P_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS16, //OP_LDRB_P_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS16, //OP_LDRB_P_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS16, //OP_LDRB_P_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS16, //OP_LDRB_P_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS16, //OP_LDRB_P_IMM_OFF_POSTIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STR_M_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STR_M_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STR_M_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STR_M_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STR_M_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STR_M_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STR_M_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STR_M_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STR_M_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STR_M_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STR_M_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STR_M_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STR_M_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STR_M_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STR_M_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STR_M_IMM_OFF
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS16, //OP_LDR_M_IMM_OFF
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS16, //OP_LDR_M_IMM_OFF
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS16, //OP_LDR_M_IMM_OFF
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS16, //OP_LDR_M_IMM_OFF
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS16, //OP_LDR_M_IMM_OFF
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS16, //OP_LDR_M_IMM_OFF
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS16, //OP_LDR_M_IMM_OFF
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS16, //OP_LDR_M_IMM_OFF
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS16, //OP_LDR_M_IMM_OFF
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS16, //OP_LDR_M_IMM_OFF
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS16, //OP_LDR_M_IMM_OFF
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS16, //OP_LDR_M_IMM_OFF
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS16, //OP_LDR_M_IMM_OFF
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS16, //OP_LDR_M_IMM_OFF
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS16, //OP_LDR_M_IMM_OFF
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS16, //OP_LDR_M_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STR_M_IMM_OFF_PREIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STR_M_IMM_OFF_PREIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STR_M_IMM_OFF_PREIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STR_M_IMM_OFF_PREIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STR_M_IMM_OFF_PREIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STR_M_IMM_OFF_PREIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STR_M_IMM_OFF_PREIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STR_M_IMM_OFF_PREIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STR_M_IMM_OFF_PREIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STR_M_IMM_OFF_PREIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STR_M_IMM_OFF_PREIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STR_M_IMM_OFF_PREIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STR_M_IMM_OFF_PREIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STR_M_IMM_OFF_PREIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STR_M_IMM_OFF_PREIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STR_M_IMM_OFF_PREIND
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS16, //OP_LDR_M_IMM_OFF_PREIND
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS16, //OP_LDR_M_IMM_OFF_PREIND
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS16, //OP_LDR_M_IMM_OFF_PREIND
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS16, //OP_LDR_M_IMM_OFF_PREIND
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS16, //OP_LDR_M_IMM_OFF_PREIND
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS16, //OP_LDR_M_IMM_OFF_PREIND
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS16, //OP_LDR_M_IMM_OFF_PREIND
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS16, //OP_LDR_M_IMM_OFF_PREIND
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS16, //OP_LDR_M_IMM_OFF_PREIND
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS16, //OP_LDR_M_IMM_OFF_PREIND
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS16, //OP_LDR_M_IMM_OFF_PREIND
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS16, //OP_LDR_M_IMM_OFF_PREIND
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS16, //OP_LDR_M_IMM_OFF_PREIND
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS16, //OP_LDR_M_IMM_OFF_PREIND
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS16, //OP_LDR_M_IMM_OFF_PREIND
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS16, //OP_LDR_M_IMM_OFF_PREIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_M_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_M_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_M_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_M_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_M_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_M_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_M_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_M_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_M_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_M_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_M_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_M_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_M_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_M_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_M_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_M_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS16, //OP_LDRB_M_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS16, //OP_LDRB_M_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS16, //OP_LDRB_M_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS16, //OP_LDRB_M_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS16, //OP_LDRB_M_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS16, //OP_LDRB_M_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS16, //OP_LDRB_M_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS16, //OP_LDRB_M_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS16, //OP_LDRB_M_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS16, //OP_LDRB_M_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS16, //OP_LDRB_M_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS16, //OP_LDRB_M_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS16, //OP_LDRB_M_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS16, //OP_LDRB_M_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS16, //OP_LDRB_M_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS16, //OP_LDRB_M_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_M_IMM_OFF_PREIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_M_IMM_OFF_PREIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_M_IMM_OFF_PREIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_M_IMM_OFF_PREIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_M_IMM_OFF_PREIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_M_IMM_OFF_PREIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_M_IMM_OFF_PREIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_M_IMM_OFF_PREIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_M_IMM_OFF_PREIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_M_IMM_OFF_PREIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_M_IMM_OFF_PREIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_M_IMM_OFF_PREIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_M_IMM_OFF_PREIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_M_IMM_OFF_PREIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_M_IMM_OFF_PREIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_M_IMM_OFF_PREIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS16, //OP_LDRB_M_IMM_OFF_PREIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS16, //OP_LDRB_M_IMM_OFF_PREIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS16, //OP_LDRB_M_IMM_OFF_PREIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS16, //OP_LDRB_M_IMM_OFF_PREIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS16, //OP_LDRB_M_IMM_OFF_PREIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS16, //OP_LDRB_M_IMM_OFF_PREIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS16, //OP_LDRB_M_IMM_OFF_PREIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS16, //OP_LDRB_M_IMM_OFF_PREIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS16, //OP_LDRB_M_IMM_OFF_PREIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS16, //OP_LDRB_M_IMM_OFF_PREIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS16, //OP_LDRB_M_IMM_OFF_PREIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS16, //OP_LDRB_M_IMM_OFF_PREIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS16, //OP_LDRB_M_IMM_OFF_PREIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS16, //OP_LDRB_M_IMM_OFF_PREIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS16, //OP_LDRB_M_IMM_OFF_PREIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS16, //OP_LDRB_M_IMM_OFF_PREIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STR_P_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STR_P_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STR_P_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STR_P_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STR_P_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STR_P_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STR_P_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STR_P_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STR_P_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STR_P_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STR_P_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STR_P_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STR_P_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STR_P_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STR_P_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STR_P_IMM_OFF
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS16, //OP_LDR_P_IMM_OFF
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS16, //OP_LDR_P_IMM_OFF
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS16, //OP_LDR_P_IMM_OFF
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS16, //OP_LDR_P_IMM_OFF
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS16, //OP_LDR_P_IMM_OFF
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS16, //OP_LDR_P_IMM_OFF
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS16, //OP_LDR_P_IMM_OFF
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS16, //OP_LDR_P_IMM_OFF
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS16, //OP_LDR_P_IMM_OFF
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS16, //OP_LDR_P_IMM_OFF
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS16, //OP_LDR_P_IMM_OFF
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS16, //OP_LDR_P_IMM_OFF
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS16, //OP_LDR_P_IMM_OFF
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS16, //OP_LDR_P_IMM_OFF
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS16, //OP_LDR_P_IMM_OFF
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS16, //OP_LDR_P_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STR_P_IMM_OFF_PREIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STR_P_IMM_OFF_PREIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STR_P_IMM_OFF_PREIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STR_P_IMM_OFF_PREIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STR_P_IMM_OFF_PREIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STR_P_IMM_OFF_PREIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STR_P_IMM_OFF_PREIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STR_P_IMM_OFF_PREIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STR_P_IMM_OFF_PREIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STR_P_IMM_OFF_PREIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STR_P_IMM_OFF_PREIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STR_P_IMM_OFF_PREIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STR_P_IMM_OFF_PREIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STR_P_IMM_OFF_PREIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STR_P_IMM_OFF_PREIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STR_P_IMM_OFF_PREIND
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS16, //OP_LDR_P_IMM_OFF_PREIND
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS16, //OP_LDR_P_IMM_OFF_PREIND
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS16, //OP_LDR_P_IMM_OFF_PREIND
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS16, //OP_LDR_P_IMM_OFF_PREIND
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS16, //OP_LDR_P_IMM_OFF_PREIND
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS16, //OP_LDR_P_IMM_OFF_PREIND
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS16, //OP_LDR_P_IMM_OFF_PREIND
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS16, //OP_LDR_P_IMM_OFF_PREIND
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS16, //OP_LDR_P_IMM_OFF_PREIND
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS16, //OP_LDR_P_IMM_OFF_PREIND
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS16, //OP_LDR_P_IMM_OFF_PREIND
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS16, //OP_LDR_P_IMM_OFF_PREIND
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS16, //OP_LDR_P_IMM_OFF_PREIND
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS16, //OP_LDR_P_IMM_OFF_PREIND
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS16, //OP_LDR_P_IMM_OFF_PREIND
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS16, //OP_LDR_P_IMM_OFF_PREIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_P_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_P_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_P_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_P_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_P_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_P_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_P_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_P_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_P_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_P_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_P_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_P_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_P_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_P_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_P_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_P_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS16, //OP_LDRB_P_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS16, //OP_LDRB_P_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS16, //OP_LDRB_P_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS16, //OP_LDRB_P_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS16, //OP_LDRB_P_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS16, //OP_LDRB_P_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS16, //OP_LDRB_P_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS16, //OP_LDRB_P_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS16, //OP_LDRB_P_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS16, //OP_LDRB_P_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS16, //OP_LDRB_P_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS16, //OP_LDRB_P_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS16, //OP_LDRB_P_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS16, //OP_LDRB_P_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS16, //OP_LDRB_P_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS16, //OP_LDRB_P_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_P_IMM_OFF_PREIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_P_IMM_OFF_PREIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_P_IMM_OFF_PREIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_P_IMM_OFF_PREIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_P_IMM_OFF_PREIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_P_IMM_OFF_PREIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_P_IMM_OFF_PREIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_P_IMM_OFF_PREIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_P_IMM_OFF_PREIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_P_IMM_OFF_PREIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_P_IMM_OFF_PREIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_P_IMM_OFF_PREIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_P_IMM_OFF_PREIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_P_IMM_OFF_PREIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_P_IMM_OFF_PREIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_P_IMM_OFF_PREIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS16, //OP_LDRB_P_IMM_OFF_PREIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS16, //OP_LDRB_P_IMM_OFF_PREIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS16, //OP_LDRB_P_IMM_OFF_PREIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS16, //OP_LDRB_P_IMM_OFF_PREIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS16, //OP_LDRB_P_IMM_OFF_PREIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS16, //OP_LDRB_P_IMM_OFF_PREIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS16, //OP_LDRB_P_IMM_OFF_PREIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS16, //OP_LDRB_P_IMM_OFF_PREIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS16, //OP_LDRB_P_IMM_OFF_PREIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS16, //OP_LDRB_P_IMM_OFF_PREIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS16, //OP_LDRB_P_IMM_OFF_PREIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS16, //OP_LDRB_P_IMM_OFF_PREIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS16, //OP_LDRB_P_IMM_OFF_PREIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS16, //OP_LDRB_P_IMM_OFF_PREIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS16, //OP_LDRB_P_IMM_OFF_PREIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS16, //OP_LDRB_P_IMM_OFF_PREIND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS12 | SRCREG_POS16, //OP_STR_M_LSL_IMM_OFF_POSTIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS12 | SRCREG_POS16, //OP_STR_M_LSR_IMM_OFF_POSTIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS12 | SRCREG_POS16, //OP_STR_M_ASR_IMM_OFF_POSTIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS12 | SRCREG_POS16, //OP_STR_M_ROR_IMM_OFF_POSTIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS12 | SRCREG_POS16, //OP_STR_M_LSL_IMM_OFF_POSTIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS12 | SRCREG_POS16, //OP_STR_M_LSR_IMM_OFF_POSTIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS12 | SRCREG_POS16, //OP_STR_M_ASR_IMM_OFF_POSTIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS12 | SRCREG_POS16, //OP_STR_M_ROR_IMM_OFF_POSTIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_LDR_M_LSL_IMM_OFF_POSTIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_LDR_M_LSR_IMM_OFF_POSTIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_LDR_M_ASR_IMM_OFF_POSTIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_LDR_M_ROR_IMM_OFF_POSTIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_LDR_M_LSL_IMM_OFF_POSTIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_LDR_M_LSR_IMM_OFF_POSTIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_LDR_M_ASR_IMM_OFF_POSTIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_LDR_M_ROR_IMM_OFF_POSTIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS12 | SRCREG_POS16, //OP_STR_M_LSL_IMM_OFF_POSTIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS12 | SRCREG_POS16, //OP_STR_M_LSR_IMM_OFF_POSTIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS12 | SRCREG_POS16, //OP_STR_M_ASR_IMM_OFF_POSTIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS12 | SRCREG_POS16, //OP_STR_M_ROR_IMM_OFF_POSTIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS12 | SRCREG_POS16, //OP_STR_M_LSL_IMM_OFF_POSTIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS12 | SRCREG_POS16, //OP_STR_M_LSR_IMM_OFF_POSTIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS12 | SRCREG_POS16, //OP_STR_M_ASR_IMM_OFF_POSTIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS12 | SRCREG_POS16, //OP_STR_M_ROR_IMM_OFF_POSTIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_LDR_M_LSL_IMM_OFF_POSTIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_LDR_M_LSR_IMM_OFF_POSTIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_LDR_M_ASR_IMM_OFF_POSTIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_LDR_M_ROR_IMM_OFF_POSTIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_LDR_M_LSL_IMM_OFF_POSTIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_LDR_M_LSR_IMM_OFF_POSTIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_LDR_M_ASR_IMM_OFF_POSTIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_LDR_M_ROR_IMM_OFF_POSTIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_M_LSL_IMM_OFF_POSTIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_M_LSR_IMM_OFF_POSTIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_M_ASR_IMM_OFF_POSTIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_M_ROR_IMM_OFF_POSTIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_M_LSL_IMM_OFF_POSTIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_M_LSR_IMM_OFF_POSTIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_M_ASR_IMM_OFF_POSTIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_M_ROR_IMM_OFF_POSTIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS16, //OP_LDRB_M_LSL_IMM_OFF_POSTIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS16, //OP_LDRB_M_LSR_IMM_OFF_POSTIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS16, //OP_LDRB_M_ASR_IMM_OFF_POSTIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS16, //OP_LDRB_M_ROR_IMM_OFF_POSTIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS16, //OP_LDRB_M_LSL_IMM_OFF_POSTIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS16, //OP_LDRB_M_LSR_IMM_OFF_POSTIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS16, //OP_LDRB_M_ASR_IMM_OFF_POSTIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS16, //OP_LDRB_M_ROR_IMM_OFF_POSTIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_M_LSL_IMM_OFF_POSTIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_M_LSR_IMM_OFF_POSTIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_M_ASR_IMM_OFF_POSTIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_M_ROR_IMM_OFF_POSTIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_M_LSL_IMM_OFF_POSTIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_M_LSR_IMM_OFF_POSTIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_M_ASR_IMM_OFF_POSTIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_M_ROR_IMM_OFF_POSTIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS16, //OP_LDRB_M_LSL_IMM_OFF_POSTIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS16, //OP_LDRB_M_LSR_IMM_OFF_POSTIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS16, //OP_LDRB_M_ASR_IMM_OFF_POSTIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS16, //OP_LDRB_M_ROR_IMM_OFF_POSTIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS16, //OP_LDRB_M_LSL_IMM_OFF_POSTIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS16, //OP_LDRB_M_LSR_IMM_OFF_POSTIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS16, //OP_LDRB_M_ASR_IMM_OFF_POSTIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS16, //OP_LDRB_M_ROR_IMM_OFF_POSTIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS12 | SRCREG_POS16, //OP_STR_P_LSL_IMM_OFF_POSTIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS12 | SRCREG_POS16, //OP_STR_P_LSR_IMM_OFF_POSTIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS12 | SRCREG_POS16, //OP_STR_P_ASR_IMM_OFF_POSTIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS12 | SRCREG_POS16, //OP_STR_P_ROR_IMM_OFF_POSTIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS12 | SRCREG_POS16, //OP_STR_P_LSL_IMM_OFF_POSTIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS12 | SRCREG_POS16, //OP_STR_P_LSR_IMM_OFF_POSTIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS12 | SRCREG_POS16, //OP_STR_P_ASR_IMM_OFF_POSTIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS12 | SRCREG_POS16, //OP_STR_P_ROR_IMM_OFF_POSTIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_LDR_P_LSL_IMM_OFF_POSTIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_LDR_P_LSR_IMM_OFF_POSTIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_LDR_P_ASR_IMM_OFF_POSTIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_LDR_P_ROR_IMM_OFF_POSTIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_LDR_P_LSL_IMM_OFF_POSTIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_LDR_P_LSR_IMM_OFF_POSTIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_LDR_P_ASR_IMM_OFF_POSTIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_LDR_P_ROR_IMM_OFF_POSTIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS12 | SRCREG_POS16, //OP_STR_P_LSL_IMM_OFF_POSTIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS12 | SRCREG_POS16, //OP_STR_P_LSR_IMM_OFF_POSTIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS12 | SRCREG_POS16, //OP_STR_P_ASR_IMM_OFF_POSTIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS12 | SRCREG_POS16, //OP_STR_P_ROR_IMM_OFF_POSTIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS12 | SRCREG_POS16, //OP_STR_P_LSL_IMM_OFF_POSTIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS12 | SRCREG_POS16, //OP_STR_P_LSR_IMM_OFF_POSTIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS12 | SRCREG_POS16, //OP_STR_P_ASR_IMM_OFF_POSTIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS12 | SRCREG_POS16, //OP_STR_P_ROR_IMM_OFF_POSTIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_LDR_P_LSL_IMM_OFF_POSTIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_LDR_P_LSL_IMM_OFF_POSTIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_LDR_P_LSL_IMM_OFF_POSTIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_LDR_P_LSL_IMM_OFF_POSTIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_LDR_P_LSL_IMM_OFF_POSTIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_LDR_P_LSL_IMM_OFF_POSTIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_LDR_P_LSL_IMM_OFF_POSTIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_LDR_P_LSL_IMM_OFF_POSTIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_P_LSL_IMM_OFF_POSTIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_P_LSR_IMM_OFF_POSTIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_P_ASR_IMM_OFF_POSTIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_P_ROR_IMM_OFF_POSTIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_P_LSL_IMM_OFF_POSTIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_P_LSR_IMM_OFF_POSTIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_P_ASR_IMM_OFF_POSTIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_P_ROR_IMM_OFF_POSTIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS16, //OP_LDRB_P_LSL_IMM_OFF_POSTIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS16, //OP_LDRB_P_LSR_IMM_OFF_POSTIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS16, //OP_LDRB_P_ASR_IMM_OFF_POSTIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS16, //OP_LDRB_P_ROR_IMM_OFF_POSTIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS16, //OP_LDRB_P_LSL_IMM_OFF_POSTIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS16, //OP_LDRB_P_LSR_IMM_OFF_POSTIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS16, //OP_LDRB_P_ASR_IMM_OFF_POSTIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS16, //OP_LDRB_P_ROR_IMM_OFF_POSTIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_P_LSL_IMM_OFF_POSTIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_P_LSR_IMM_OFF_POSTIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_P_ASR_IMM_OFF_POSTIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_P_ROR_IMM_OFF_POSTIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_P_LSL_IMM_OFF_POSTIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_P_LSR_IMM_OFF_POSTIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_P_ASR_IMM_OFF_POSTIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_P_ROR_IMM_OFF_POSTIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS16, //OP_LDRB_P_LSL_IMM_OFF_POSTIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS16, //OP_LDRB_P_LSR_IMM_OFF_POSTIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS16, //OP_LDRB_P_ASR_IMM_OFF_POSTIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS16, //OP_LDRB_P_ROR_IMM_OFF_POSTIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS16, //OP_LDRB_P_LSL_IMM_OFF_POSTIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS16, //OP_LDRB_P_LSR_IMM_OFF_POSTIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS16, //OP_LDRB_P_ASR_IMM_OFF_POSTIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS16, //OP_LDRB_P_ROR_IMM_OFF_POSTIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS12 | SRCREG_POS16, //OP_STR_M_LSL_IMM_OFF
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS12 | SRCREG_POS16, //OP_STR_M_LSR_IMM_OFF
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS12 | SRCREG_POS16, //OP_STR_M_ASR_IMM_OFF
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS12 | SRCREG_POS16, //OP_STR_M_ROR_IMM_OFF
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS12 | SRCREG_POS16, //OP_STR_M_LSL_IMM_OFF
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS12 | SRCREG_POS16, //OP_STR_M_LSR_IMM_OFF
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS12 | SRCREG_POS16, //OP_STR_M_ASR_IMM_OFF
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS12 | SRCREG_POS16, //OP_STR_M_ROR_IMM_OFF
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_LDR_M_LSL_IMM_OFF
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_LDR_M_LSR_IMM_OFF
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_LDR_M_ASR_IMM_OFF
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_LDR_M_ROR_IMM_OFF
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_LDR_M_LSL_IMM_OFF
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_LDR_M_LSR_IMM_OFF
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_LDR_M_ASR_IMM_OFF
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_LDR_M_ROR_IMM_OFF
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS12 | SRCREG_POS16, //OP_STR_M_LSL_IMM_OFF_PREIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS12 | SRCREG_POS16, //OP_STR_M_LSR_IMM_OFF_PREIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS12 | SRCREG_POS16, //OP_STR_M_ASR_IMM_OFF_PREIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS12 | SRCREG_POS16, //OP_STR_M_ROR_IMM_OFF_PREIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS12 | SRCREG_POS16, //OP_STR_M_LSL_IMM_OFF_PREIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS12 | SRCREG_POS16, //OP_STR_M_LSR_IMM_OFF_PREIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS12 | SRCREG_POS16, //OP_STR_M_ASR_IMM_OFF_PREIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS12 | SRCREG_POS16, //OP_STR_M_ROR_IMM_OFF_PREIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_LDR_M_LSL_IMM_OFF_PREIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_LDR_M_LSR_IMM_OFF_PREIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_LDR_M_ASR_IMM_OFF_PREIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_LDR_M_ROR_IMM_OFF_PREIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_LDR_M_LSL_IMM_OFF_PREIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_LDR_M_LSR_IMM_OFF_PREIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_LDR_M_ASR_IMM_OFF_PREIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_LDR_M_ROR_IMM_OFF_PREIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_M_LSL_IMM_OFF
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_M_LSR_IMM_OFF
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_M_ASR_IMM_OFF
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_M_ROR_IMM_OFF
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_M_LSL_IMM_OFF
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_M_LSR_IMM_OFF
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_M_ASR_IMM_OFF
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_M_ROR_IMM_OFF
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS16, //OP_LDRB_M_LSL_IMM_OFF
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS16, //OP_LDRB_M_LSR_IMM_OFF
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS16, //OP_LDRB_M_ASR_IMM_OFF
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS16, //OP_LDRB_M_ROR_IMM_OFF
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS16, //OP_LDRB_M_LSL_IMM_OFF
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS16, //OP_LDRB_M_LSR_IMM_OFF
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS16, //OP_LDRB_M_ASR_IMM_OFF
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS16, //OP_LDRB_M_ROR_IMM_OFF
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_M_LSL_IMM_OFF_PREIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_M_LSR_IMM_OFF_PREIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_M_ASR_IMM_OFF_PREIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_M_ROR_IMM_OFF_PREIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_M_LSL_IMM_OFF_PREIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_M_LSR_IMM_OFF_PREIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_M_ASR_IMM_OFF_PREIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_M_ROR_IMM_OFF_PREIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS16, //OP_LDRB_M_LSL_IMM_OFF_PREIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS16, //OP_LDRB_M_LSR_IMM_OFF_PREIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS16, //OP_LDRB_M_ASR_IMM_OFF_PREIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS16, //OP_LDRB_M_ROR_IMM_OFF_PREIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS16, //OP_LDRB_M_LSL_IMM_OFF_PREIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS16, //OP_LDRB_M_LSR_IMM_OFF_PREIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS16, //OP_LDRB_M_ASR_IMM_OFF_PREIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS16, //OP_LDRB_M_ROR_IMM_OFF_PREIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS12 | SRCREG_POS16, //OP_STR_P_LSL_IMM_OFF
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS12 | SRCREG_POS16, //OP_STR_P_LSR_IMM_OFF
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS12 | SRCREG_POS16, //OP_STR_P_ASR_IMM_OFF
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS12 | SRCREG_POS16, //OP_STR_P_ROR_IMM_OFF
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS12 | SRCREG_POS16, //OP_STR_P_LSL_IMM_OFF
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS12 | SRCREG_POS16, //OP_STR_P_LSR_IMM_OFF
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS12 | SRCREG_POS16, //OP_STR_P_ASR_IMM_OFF
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS12 | SRCREG_POS16, //OP_STR_P_ROR_IMM_OFF
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_LDR_P_LSL_IMM_OFF
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_LDR_P_LSR_IMM_OFF
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_LDR_P_ASR_IMM_OFF
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_LDR_P_ROR_IMM_OFF
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_LDR_P_LSL_IMM_OFF
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_LDR_P_LSR_IMM_OFF
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_LDR_P_ASR_IMM_OFF
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_LDR_P_ROR_IMM_OFF
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS12 | SRCREG_POS16, //OP_STR_P_LSL_IMM_OFF_PREIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS12 | SRCREG_POS16, //OP_STR_P_LSR_IMM_OFF_PREIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS12 | SRCREG_POS16, //OP_STR_P_ASR_IMM_OFF_PREIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS12 | SRCREG_POS16, //OP_STR_P_ROR_IMM_OFF_PREIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS12 | SRCREG_POS16, //OP_STR_P_LSL_IMM_OFF_PREIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS12 | SRCREG_POS16, //OP_STR_P_LSR_IMM_OFF_PREIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS12 | SRCREG_POS16, //OP_STR_P_ASR_IMM_OFF_PREIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS12 | SRCREG_POS16, //OP_STR_P_ROR_IMM_OFF_PREIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_LDR_P_LSL_IMM_OFF_PREIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_LDR_P_LSR_IMM_OFF_PREIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_LDR_P_ASR_IMM_OFF_PREIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_LDR_P_ROR_IMM_OFF_PREIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_LDR_P_LSL_IMM_OFF_PREIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_LDR_P_LSR_IMM_OFF_PREIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_LDR_P_ASR_IMM_OFF_PREIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_POS12 | SRCREG_POS0 | SRCREG_POS16, //OP_LDR_P_ROR_IMM_OFF_PREIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_P_LSL_IMM_OFF
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_P_LSR_IMM_OFF
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_P_ASR_IMM_OFF
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_P_ROR_IMM_OFF
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_P_LSL_IMM_OFF
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_P_LSR_IMM_OFF
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_P_ASR_IMM_OFF
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_P_ROR_IMM_OFF
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS16, //OP_LDRB_P_LSL_IMM_OFF
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS16, //OP_LDRB_P_LSR_IMM_OFF
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS16, //OP_LDRB_P_ASR_IMM_OFF
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS16, //OP_LDRB_P_ROR_IMM_OFF
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS16, //OP_LDRB_P_LSL_IMM_OFF
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS16, //OP_LDRB_P_LSR_IMM_OFF
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS16, //OP_LDRB_P_ASR_IMM_OFF
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS16, //OP_LDRB_P_ROR_IMM_OFF
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_P_LSL_IMM_OFF_PREIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_P_LSR_IMM_OFF_PREIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_P_ASR_IMM_OFF_PREIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_P_ROR_IMM_OFF_PREIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_P_LSL_IMM_OFF_PREIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_P_LSR_IMM_OFF_PREIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_P_ASR_IMM_OFF_PREIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS12 | SRCREG_POS16, //OP_STRB_P_ROR_IMM_OFF_PREIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS16, //OP_LDRB_P_LSL_IMM_OFF_PREIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS16, //OP_LDRB_P_LSR_IMM_OFF_PREIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS16, //OP_LDRB_P_ASR_IMM_OFF_PREIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS16, //OP_LDRB_P_ROR_IMM_OFF_PREIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS16, //OP_LDRB_P_LSL_IMM_OFF_PREIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS16, //OP_LDRB_P_LSR_IMM_OFF_PREIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS16, //OP_LDRB_P_ASR_IMM_OFF_PREIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS16, //OP_LDRB_P_ROR_IMM_OFF_PREIND
+JIT_BYPASS, //OP_UND
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMDA
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMDA
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMDA
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMDA
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMDA
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMDA
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMDA
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMDA
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMDA
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMDA
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMDA
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMDA
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMDA
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMDA
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMDA
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMDA
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMDA
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMDA
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMDA
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMDA
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMDA
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMDA
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMDA
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMDA
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMDA
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMDA
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMDA
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMDA
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMDA
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMDA
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMDA
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMDA
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMDA_W
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMDA_W
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMDA_W
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMDA_W
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMDA_W
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMDA_W
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMDA_W
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMDA_W
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMDA_W
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMDA_W
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMDA_W
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMDA_W
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMDA_W
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMDA_W
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMDA_W
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMDA_W
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMDA_W
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMDA_W
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMDA_W
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMDA_W
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMDA_W
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMDA_W
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMDA_W
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMDA_W
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMDA_W
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMDA_W
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMDA_W
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMDA_W
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMDA_W
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMDA_W
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMDA_W
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMDA_W
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMDA2
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMDA2
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMDA2
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMDA2
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMDA2
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMDA2
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMDA2
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMDA2
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMDA2
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMDA2
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMDA2
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMDA2
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMDA2
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMDA2
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMDA2
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMDA2
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMDA2
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMDA2
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMDA2
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMDA2
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMDA2
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMDA2
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMDA2
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMDA2
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMDA2
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMDA2
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMDA2
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMDA2
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMDA2
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMDA2
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMDA2
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMDA2
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMDA2_W
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMDA2_W
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMDA2_W
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMDA2_W
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMDA2_W
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMDA2_W
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMDA2_W
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMDA2_W
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMDA2_W
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMDA2_W
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMDA2_W
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMDA2_W
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMDA2_W
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMDA2_W
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMDA2_W
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMDA2_W
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMDA2_W
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMDA2_W
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMDA2_W
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMDA2_W
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMDA2_W
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMDA2_W
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMDA2_W
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMDA2_W
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMDA2_W
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMDA2_W
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMDA2_W
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMDA2_W
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMDA2_W
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMDA2_W
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMDA2_W
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMDA2_W
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMIA
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMIA
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMIA
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMIA
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMIA
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMIA
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMIA
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMIA
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMIA
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMIA
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMIA
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMIA
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMIA
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMIA
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMIA
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMIA
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMIA
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMIA
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMIA
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMIA
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMIA
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMIA
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMIA
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMIA
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMIA
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMIA
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMIA
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMIA
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMIA
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMIA
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMIA
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMIA
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMIA_W
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMIA_W
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMIA_W
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMIA_W
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMIA_W
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMIA_W
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMIA_W
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMIA_W
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMIA_W
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMIA_W
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMIA_W
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMIA_W
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMIA_W
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMIA_W
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMIA_W
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMIA_W
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMIA_W
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMIA_W
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMIA_W
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMIA_W
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMIA_W
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMIA_W
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMIA_W
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMIA_W
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMIA_W
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMIA_W
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMIA_W
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMIA_W
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMIA_W
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMIA_W
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMIA_W
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMIA_W
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMIA2
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMIA2
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMIA2
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMIA2
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMIA2
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMIA2
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMIA2
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMIA2
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMIA2
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMIA2
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMIA2
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMIA2
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMIA2
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMIA2
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMIA2
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMIA2
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMIA2
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMIA2
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMIA2
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMIA2
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMIA2
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMIA2
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMIA2
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMIA2
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMIA2
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMIA2
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMIA2
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMIA2
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMIA2
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMIA2
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMIA2
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMIA2
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMIA2_W
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMIA2_W
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMIA2_W
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMIA2_W
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMIA2_W
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMIA2_W
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMIA2_W
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMIA2_W
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMIA2_W
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMIA2_W
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMIA2_W
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMIA2_W
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMIA2_W
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMIA2_W
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMIA2_W
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMIA2_W
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMIA2_W
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMIA2_W
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMIA2_W
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMIA2_W
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMIA2_W
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMIA2_W
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMIA2_W
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMIA2_W
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMIA2_W
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMIA2_W
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMIA2_W
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMIA2_W
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMIA2_W
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMIA2_W
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMIA2_W
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMIA2_W
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMDB
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMDB
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMDB
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMDB
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMDB
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMDB
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMDB
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMDB
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMDB
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMDB
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMDB
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMDB
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMDB
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMDB
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMDB
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMDB
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMDB
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMDB
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMDB
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMDB
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMDB
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMDB
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMDB
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMDB
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMDB
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMDB
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMDB
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMDB
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMDB
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMDB
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMDB
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMDB
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMDB_W
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMDB_W
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMDB_W
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMDB_W
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMDB_W
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMDB_W
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMDB_W
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMDB_W
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMDB_W
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMDB_W
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMDB_W
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMDB_W
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMDB_W
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMDB_W
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMDB_W
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMDB_W
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMDB_W
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMDB_W
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMDB_W
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMDB_W
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMDB_W
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMDB_W
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMDB_W
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMDB_W
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMDB_W
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMDB_W
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMDB_W
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMDB_W
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMDB_W
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMDB_W
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMDB_W
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMDB_W
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMDB2
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMDB2
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMDB2
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMDB2
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMDB2
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMDB2
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMDB2
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMDB2
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMDB2
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMDB2
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMDB2
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMDB2
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMDB2
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMDB2
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMDB2
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMDB2
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMDB2
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMDB2
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMDB2
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMDB2
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMDB2
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMDB2
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMDB2
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMDB2
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMDB2
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMDB2
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMDB2
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMDB2
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMDB2
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMDB2
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMDB2
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMDB2
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMDB2_W
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMDB2_W
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMDB2_W
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMDB2_W
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMDB2_W
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMDB2_W
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMDB2_W
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMDB2_W
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMDB2_W
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMDB2_W
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMDB2_W
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMDB2_W
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMDB2_W
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMDB2_W
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMDB2_W
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMDB2_W
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMDB2_W
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMDB2_W
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMDB2_W
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMDB2_W
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMDB2_W
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMDB2_W
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMDB2_W
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMDB2_W
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMDB2_W
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMDB2_W
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMDB2_W
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMDB2_W
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMDB2_W
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMDB2_W
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMDB2_W
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMDB2_W
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMIB
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMIB
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMIB
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMIB
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMIB
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMIB
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMIB
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMIB
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMIB
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMIB
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMIB
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMIB
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMIB
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMIB
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMIB
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMIB
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMIB
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMIB
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMIB
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMIB
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMIB
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMIB
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMIB
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMIB
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMIB
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMIB
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMIB
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMIB
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMIB
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMIB
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMIB
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMIB
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMIB_W
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMIB_W
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMIB_W
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMIB_W
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMIB_W
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMIB_W
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMIB_W
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMIB_W
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMIB_W
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMIB_W
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMIB_W
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMIB_W
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMIB_W
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMIB_W
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMIB_W
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMIB_W
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMIB_W
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMIB_W
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMIB_W
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMIB_W
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMIB_W
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMIB_W
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMIB_W
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMIB_W
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMIB_W
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMIB_W
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMIB_W
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMIB_W
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMIB_W
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMIB_W
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMIB_W
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMIB_W
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMIB2
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMIB2
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMIB2
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMIB2
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMIB2
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMIB2
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMIB2
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMIB2
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMIB2
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMIB2
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMIB2
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMIB2
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMIB2
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMIB2
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMIB2
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMIB2
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMIB2
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMIB2
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMIB2
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMIB2
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMIB2
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMIB2
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMIB2
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMIB2
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMIB2
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMIB2
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMIB2
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMIB2
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMIB2
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMIB2
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMIB2
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMIB2
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMIB2_W
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMIB2_W
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMIB2_W
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMIB2_W
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMIB2_W
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMIB2_W
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMIB2_W
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMIB2_W
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMIB2_W
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMIB2_W
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMIB2_W
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMIB2_W
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMIB2_W
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMIB2_W
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMIB2_W
+INSTR_CYCLES_V | BRANCH_NEVER | SRCREG_STM | SRCREG_POS16, //OP_STMIB2_W
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMIB2_W
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMIB2_W
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMIB2_W
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMIB2_W
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMIB2_W
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMIB2_W
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMIB2_W
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMIB2_W
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMIB2_W
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMIB2_W
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMIB2_W
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMIB2_W
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMIB2_W
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMIB2_W
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMIB2_W
+INSTR_CYCLES_V | BRANCH_LDM | SRCREG_POS16, //OP_LDMIB2_W
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_B
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BL
+JIT_BYPASS, //OP_STC_OPTION
+JIT_BYPASS, //OP_STC_OPTION
+JIT_BYPASS, //OP_STC_OPTION
+JIT_BYPASS, //OP_STC_OPTION
+JIT_BYPASS, //OP_STC_OPTION
+JIT_BYPASS, //OP_STC_OPTION
+JIT_BYPASS, //OP_STC_OPTION
+JIT_BYPASS, //OP_STC_OPTION
+JIT_BYPASS, //OP_STC_OPTION
+JIT_BYPASS, //OP_STC_OPTION
+JIT_BYPASS, //OP_STC_OPTION
+JIT_BYPASS, //OP_STC_OPTION
+JIT_BYPASS, //OP_STC_OPTION
+JIT_BYPASS, //OP_STC_OPTION
+JIT_BYPASS, //OP_STC_OPTION
+JIT_BYPASS, //OP_STC_OPTION
+JIT_BYPASS, //OP_LDC_OPTION
+JIT_BYPASS, //OP_LDC_OPTION
+JIT_BYPASS, //OP_LDC_OPTION
+JIT_BYPASS, //OP_LDC_OPTION
+JIT_BYPASS, //OP_LDC_OPTION
+JIT_BYPASS, //OP_LDC_OPTION
+JIT_BYPASS, //OP_LDC_OPTION
+JIT_BYPASS, //OP_LDC_OPTION
+JIT_BYPASS, //OP_LDC_OPTION
+JIT_BYPASS, //OP_LDC_OPTION
+JIT_BYPASS, //OP_LDC_OPTION
+JIT_BYPASS, //OP_LDC_OPTION
+JIT_BYPASS, //OP_LDC_OPTION
+JIT_BYPASS, //OP_LDC_OPTION
+JIT_BYPASS, //OP_LDC_OPTION
+JIT_BYPASS, //OP_LDC_OPTION
+JIT_BYPASS, //OP_STC_M_POSTIND
+JIT_BYPASS, //OP_STC_M_POSTIND
+JIT_BYPASS, //OP_STC_M_POSTIND
+JIT_BYPASS, //OP_STC_M_POSTIND
+JIT_BYPASS, //OP_STC_M_POSTIND
+JIT_BYPASS, //OP_STC_M_POSTIND
+JIT_BYPASS, //OP_STC_M_POSTIND
+JIT_BYPASS, //OP_STC_M_POSTIND
+JIT_BYPASS, //OP_STC_M_POSTIND
+JIT_BYPASS, //OP_STC_M_POSTIND
+JIT_BYPASS, //OP_STC_M_POSTIND
+JIT_BYPASS, //OP_STC_M_POSTIND
+JIT_BYPASS, //OP_STC_M_POSTIND
+JIT_BYPASS, //OP_STC_M_POSTIND
+JIT_BYPASS, //OP_STC_M_POSTIND
+JIT_BYPASS, //OP_STC_M_POSTIND
+JIT_BYPASS, //OP_LDC_M_POSTIND
+JIT_BYPASS, //OP_LDC_M_POSTIND
+JIT_BYPASS, //OP_LDC_M_POSTIND
+JIT_BYPASS, //OP_LDC_M_POSTIND
+JIT_BYPASS, //OP_LDC_M_POSTIND
+JIT_BYPASS, //OP_LDC_M_POSTIND
+JIT_BYPASS, //OP_LDC_M_POSTIND
+JIT_BYPASS, //OP_LDC_M_POSTIND
+JIT_BYPASS, //OP_LDC_M_POSTIND
+JIT_BYPASS, //OP_LDC_M_POSTIND
+JIT_BYPASS, //OP_LDC_M_POSTIND
+JIT_BYPASS, //OP_LDC_M_POSTIND
+JIT_BYPASS, //OP_LDC_M_POSTIND
+JIT_BYPASS, //OP_LDC_M_POSTIND
+JIT_BYPASS, //OP_LDC_M_POSTIND
+JIT_BYPASS, //OP_LDC_M_POSTIND
+JIT_BYPASS, //OP_STC_OPTION
+JIT_BYPASS, //OP_STC_OPTION
+JIT_BYPASS, //OP_STC_OPTION
+JIT_BYPASS, //OP_STC_OPTION
+JIT_BYPASS, //OP_STC_OPTION
+JIT_BYPASS, //OP_STC_OPTION
+JIT_BYPASS, //OP_STC_OPTION
+JIT_BYPASS, //OP_STC_OPTION
+JIT_BYPASS, //OP_STC_OPTION
+JIT_BYPASS, //OP_STC_OPTION
+JIT_BYPASS, //OP_STC_OPTION
+JIT_BYPASS, //OP_STC_OPTION
+JIT_BYPASS, //OP_STC_OPTION
+JIT_BYPASS, //OP_STC_OPTION
+JIT_BYPASS, //OP_STC_OPTION
+JIT_BYPASS, //OP_STC_OPTION
+JIT_BYPASS, //OP_LDC_OPTION
+JIT_BYPASS, //OP_LDC_OPTION
+JIT_BYPASS, //OP_LDC_OPTION
+JIT_BYPASS, //OP_LDC_OPTION
+JIT_BYPASS, //OP_LDC_OPTION
+JIT_BYPASS, //OP_LDC_OPTION
+JIT_BYPASS, //OP_LDC_OPTION
+JIT_BYPASS, //OP_LDC_OPTION
+JIT_BYPASS, //OP_LDC_OPTION
+JIT_BYPASS, //OP_LDC_OPTION
+JIT_BYPASS, //OP_LDC_OPTION
+JIT_BYPASS, //OP_LDC_OPTION
+JIT_BYPASS, //OP_LDC_OPTION
+JIT_BYPASS, //OP_LDC_OPTION
+JIT_BYPASS, //OP_LDC_OPTION
+JIT_BYPASS, //OP_LDC_OPTION
+JIT_BYPASS, //OP_STC_M_POSTIND
+JIT_BYPASS, //OP_STC_M_POSTIND
+JIT_BYPASS, //OP_STC_M_POSTIND
+JIT_BYPASS, //OP_STC_M_POSTIND
+JIT_BYPASS, //OP_STC_M_POSTIND
+JIT_BYPASS, //OP_STC_M_POSTIND
+JIT_BYPASS, //OP_STC_M_POSTIND
+JIT_BYPASS, //OP_STC_M_POSTIND
+JIT_BYPASS, //OP_STC_M_POSTIND
+JIT_BYPASS, //OP_STC_M_POSTIND
+JIT_BYPASS, //OP_STC_M_POSTIND
+JIT_BYPASS, //OP_STC_M_POSTIND
+JIT_BYPASS, //OP_STC_M_POSTIND
+JIT_BYPASS, //OP_STC_M_POSTIND
+JIT_BYPASS, //OP_STC_M_POSTIND
+JIT_BYPASS, //OP_STC_M_POSTIND
+JIT_BYPASS, //OP_LDC_M_POSTIND
+JIT_BYPASS, //OP_LDC_M_POSTIND
+JIT_BYPASS, //OP_LDC_M_POSTIND
+JIT_BYPASS, //OP_LDC_M_POSTIND
+JIT_BYPASS, //OP_LDC_M_POSTIND
+JIT_BYPASS, //OP_LDC_M_POSTIND
+JIT_BYPASS, //OP_LDC_M_POSTIND
+JIT_BYPASS, //OP_LDC_M_POSTIND
+JIT_BYPASS, //OP_LDC_M_POSTIND
+JIT_BYPASS, //OP_LDC_M_POSTIND
+JIT_BYPASS, //OP_LDC_M_POSTIND
+JIT_BYPASS, //OP_LDC_M_POSTIND
+JIT_BYPASS, //OP_LDC_M_POSTIND
+JIT_BYPASS, //OP_LDC_M_POSTIND
+JIT_BYPASS, //OP_LDC_M_POSTIND
+JIT_BYPASS, //OP_LDC_M_POSTIND
+JIT_BYPASS, //OP_STC_OPTION
+JIT_BYPASS, //OP_STC_OPTION
+JIT_BYPASS, //OP_STC_OPTION
+JIT_BYPASS, //OP_STC_OPTION
+JIT_BYPASS, //OP_STC_OPTION
+JIT_BYPASS, //OP_STC_OPTION
+JIT_BYPASS, //OP_STC_OPTION
+JIT_BYPASS, //OP_STC_OPTION
+JIT_BYPASS, //OP_STC_OPTION
+JIT_BYPASS, //OP_STC_OPTION
+JIT_BYPASS, //OP_STC_OPTION
+JIT_BYPASS, //OP_STC_OPTION
+JIT_BYPASS, //OP_STC_OPTION
+JIT_BYPASS, //OP_STC_OPTION
+JIT_BYPASS, //OP_STC_OPTION
+JIT_BYPASS, //OP_STC_OPTION
+JIT_BYPASS, //OP_LDC_OPTION
+JIT_BYPASS, //OP_LDC_OPTION
+JIT_BYPASS, //OP_LDC_OPTION
+JIT_BYPASS, //OP_LDC_OPTION
+JIT_BYPASS, //OP_LDC_OPTION
+JIT_BYPASS, //OP_LDC_OPTION
+JIT_BYPASS, //OP_LDC_OPTION
+JIT_BYPASS, //OP_LDC_OPTION
+JIT_BYPASS, //OP_LDC_OPTION
+JIT_BYPASS, //OP_LDC_OPTION
+JIT_BYPASS, //OP_LDC_OPTION
+JIT_BYPASS, //OP_LDC_OPTION
+JIT_BYPASS, //OP_LDC_OPTION
+JIT_BYPASS, //OP_LDC_OPTION
+JIT_BYPASS, //OP_LDC_OPTION
+JIT_BYPASS, //OP_LDC_OPTION
+JIT_BYPASS, //OP_STC_P_POSTIND
+JIT_BYPASS, //OP_STC_P_POSTIND
+JIT_BYPASS, //OP_STC_P_POSTIND
+JIT_BYPASS, //OP_STC_P_POSTIND
+JIT_BYPASS, //OP_STC_P_POSTIND
+JIT_BYPASS, //OP_STC_P_POSTIND
+JIT_BYPASS, //OP_STC_P_POSTIND
+JIT_BYPASS, //OP_STC_P_POSTIND
+JIT_BYPASS, //OP_STC_P_POSTIND
+JIT_BYPASS, //OP_STC_P_POSTIND
+JIT_BYPASS, //OP_STC_P_POSTIND
+JIT_BYPASS, //OP_STC_P_POSTIND
+JIT_BYPASS, //OP_STC_P_POSTIND
+JIT_BYPASS, //OP_STC_P_POSTIND
+JIT_BYPASS, //OP_STC_P_POSTIND
+JIT_BYPASS, //OP_STC_P_POSTIND
+JIT_BYPASS, //OP_LDC_P_POSTIND
+JIT_BYPASS, //OP_LDC_P_POSTIND
+JIT_BYPASS, //OP_LDC_P_POSTIND
+JIT_BYPASS, //OP_LDC_P_POSTIND
+JIT_BYPASS, //OP_LDC_P_POSTIND
+JIT_BYPASS, //OP_LDC_P_POSTIND
+JIT_BYPASS, //OP_LDC_P_POSTIND
+JIT_BYPASS, //OP_LDC_P_POSTIND
+JIT_BYPASS, //OP_LDC_P_POSTIND
+JIT_BYPASS, //OP_LDC_P_POSTIND
+JIT_BYPASS, //OP_LDC_P_POSTIND
+JIT_BYPASS, //OP_LDC_P_POSTIND
+JIT_BYPASS, //OP_LDC_P_POSTIND
+JIT_BYPASS, //OP_LDC_P_POSTIND
+JIT_BYPASS, //OP_LDC_P_POSTIND
+JIT_BYPASS, //OP_LDC_P_POSTIND
+JIT_BYPASS, //OP_STC_OPTION
+JIT_BYPASS, //OP_STC_OPTION
+JIT_BYPASS, //OP_STC_OPTION
+JIT_BYPASS, //OP_STC_OPTION
+JIT_BYPASS, //OP_STC_OPTION
+JIT_BYPASS, //OP_STC_OPTION
+JIT_BYPASS, //OP_STC_OPTION
+JIT_BYPASS, //OP_STC_OPTION
+JIT_BYPASS, //OP_STC_OPTION
+JIT_BYPASS, //OP_STC_OPTION
+JIT_BYPASS, //OP_STC_OPTION
+JIT_BYPASS, //OP_STC_OPTION
+JIT_BYPASS, //OP_STC_OPTION
+JIT_BYPASS, //OP_STC_OPTION
+JIT_BYPASS, //OP_STC_OPTION
+JIT_BYPASS, //OP_STC_OPTION
+JIT_BYPASS, //OP_LDC_OPTION
+JIT_BYPASS, //OP_LDC_OPTION
+JIT_BYPASS, //OP_LDC_OPTION
+JIT_BYPASS, //OP_LDC_OPTION
+JIT_BYPASS, //OP_LDC_OPTION
+JIT_BYPASS, //OP_LDC_OPTION
+JIT_BYPASS, //OP_LDC_OPTION
+JIT_BYPASS, //OP_LDC_OPTION
+JIT_BYPASS, //OP_LDC_OPTION
+JIT_BYPASS, //OP_LDC_OPTION
+JIT_BYPASS, //OP_LDC_OPTION
+JIT_BYPASS, //OP_LDC_OPTION
+JIT_BYPASS, //OP_LDC_OPTION
+JIT_BYPASS, //OP_LDC_OPTION
+JIT_BYPASS, //OP_LDC_OPTION
+JIT_BYPASS, //OP_LDC_OPTION
+JIT_BYPASS, //OP_STC_P_POSTIND
+JIT_BYPASS, //OP_STC_P_POSTIND
+JIT_BYPASS, //OP_STC_P_POSTIND
+JIT_BYPASS, //OP_STC_P_POSTIND
+JIT_BYPASS, //OP_STC_P_POSTIND
+JIT_BYPASS, //OP_STC_P_POSTIND
+JIT_BYPASS, //OP_STC_P_POSTIND
+JIT_BYPASS, //OP_STC_P_POSTIND
+JIT_BYPASS, //OP_STC_P_POSTIND
+JIT_BYPASS, //OP_STC_P_POSTIND
+JIT_BYPASS, //OP_STC_P_POSTIND
+JIT_BYPASS, //OP_STC_P_POSTIND
+JIT_BYPASS, //OP_STC_P_POSTIND
+JIT_BYPASS, //OP_STC_P_POSTIND
+JIT_BYPASS, //OP_STC_P_POSTIND
+JIT_BYPASS, //OP_STC_P_POSTIND
+JIT_BYPASS, //OP_LDC_P_POSTIND
+JIT_BYPASS, //OP_LDC_P_POSTIND
+JIT_BYPASS, //OP_LDC_P_POSTIND
+JIT_BYPASS, //OP_LDC_P_POSTIND
+JIT_BYPASS, //OP_LDC_P_POSTIND
+JIT_BYPASS, //OP_LDC_P_POSTIND
+JIT_BYPASS, //OP_LDC_P_POSTIND
+JIT_BYPASS, //OP_LDC_P_POSTIND
+JIT_BYPASS, //OP_LDC_P_POSTIND
+JIT_BYPASS, //OP_LDC_P_POSTIND
+JIT_BYPASS, //OP_LDC_P_POSTIND
+JIT_BYPASS, //OP_LDC_P_POSTIND
+JIT_BYPASS, //OP_LDC_P_POSTIND
+JIT_BYPASS, //OP_LDC_P_POSTIND
+JIT_BYPASS, //OP_LDC_P_POSTIND
+JIT_BYPASS, //OP_LDC_P_POSTIND
+JIT_BYPASS, //OP_STC_M_IMM_OFF
+JIT_BYPASS, //OP_STC_M_IMM_OFF
+JIT_BYPASS, //OP_STC_M_IMM_OFF
+JIT_BYPASS, //OP_STC_M_IMM_OFF
+JIT_BYPASS, //OP_STC_M_IMM_OFF
+JIT_BYPASS, //OP_STC_M_IMM_OFF
+JIT_BYPASS, //OP_STC_M_IMM_OFF
+JIT_BYPASS, //OP_STC_M_IMM_OFF
+JIT_BYPASS, //OP_STC_M_IMM_OFF
+JIT_BYPASS, //OP_STC_M_IMM_OFF
+JIT_BYPASS, //OP_STC_M_IMM_OFF
+JIT_BYPASS, //OP_STC_M_IMM_OFF
+JIT_BYPASS, //OP_STC_M_IMM_OFF
+JIT_BYPASS, //OP_STC_M_IMM_OFF
+JIT_BYPASS, //OP_STC_M_IMM_OFF
+JIT_BYPASS, //OP_STC_M_IMM_OFF
+JIT_BYPASS, //OP_LDC_M_IMM_OFF
+JIT_BYPASS, //OP_LDC_M_IMM_OFF
+JIT_BYPASS, //OP_LDC_M_IMM_OFF
+JIT_BYPASS, //OP_LDC_M_IMM_OFF
+JIT_BYPASS, //OP_LDC_M_IMM_OFF
+JIT_BYPASS, //OP_LDC_M_IMM_OFF
+JIT_BYPASS, //OP_LDC_M_IMM_OFF
+JIT_BYPASS, //OP_LDC_M_IMM_OFF
+JIT_BYPASS, //OP_LDC_M_IMM_OFF
+JIT_BYPASS, //OP_LDC_M_IMM_OFF
+JIT_BYPASS, //OP_LDC_M_IMM_OFF
+JIT_BYPASS, //OP_LDC_M_IMM_OFF
+JIT_BYPASS, //OP_LDC_M_IMM_OFF
+JIT_BYPASS, //OP_LDC_M_IMM_OFF
+JIT_BYPASS, //OP_LDC_M_IMM_OFF
+JIT_BYPASS, //OP_LDC_M_IMM_OFF
+JIT_BYPASS, //OP_STC_M_PREIND
+JIT_BYPASS, //OP_STC_M_PREIND
+JIT_BYPASS, //OP_STC_M_PREIND
+JIT_BYPASS, //OP_STC_M_PREIND
+JIT_BYPASS, //OP_STC_M_PREIND
+JIT_BYPASS, //OP_STC_M_PREIND
+JIT_BYPASS, //OP_STC_M_PREIND
+JIT_BYPASS, //OP_STC_M_PREIND
+JIT_BYPASS, //OP_STC_M_PREIND
+JIT_BYPASS, //OP_STC_M_PREIND
+JIT_BYPASS, //OP_STC_M_PREIND
+JIT_BYPASS, //OP_STC_M_PREIND
+JIT_BYPASS, //OP_STC_M_PREIND
+JIT_BYPASS, //OP_STC_M_PREIND
+JIT_BYPASS, //OP_STC_M_PREIND
+JIT_BYPASS, //OP_STC_M_PREIND
+JIT_BYPASS, //OP_LDC_M_PREIND
+JIT_BYPASS, //OP_LDC_M_PREIND
+JIT_BYPASS, //OP_LDC_M_PREIND
+JIT_BYPASS, //OP_LDC_M_PREIND
+JIT_BYPASS, //OP_LDC_M_PREIND
+JIT_BYPASS, //OP_LDC_M_PREIND
+JIT_BYPASS, //OP_LDC_M_PREIND
+JIT_BYPASS, //OP_LDC_M_PREIND
+JIT_BYPASS, //OP_LDC_M_PREIND
+JIT_BYPASS, //OP_LDC_M_PREIND
+JIT_BYPASS, //OP_LDC_M_PREIND
+JIT_BYPASS, //OP_LDC_M_PREIND
+JIT_BYPASS, //OP_LDC_M_PREIND
+JIT_BYPASS, //OP_LDC_M_PREIND
+JIT_BYPASS, //OP_LDC_M_PREIND
+JIT_BYPASS, //OP_LDC_M_PREIND
+JIT_BYPASS, //OP_STC_M_IMM_OFF
+JIT_BYPASS, //OP_STC_M_IMM_OFF
+JIT_BYPASS, //OP_STC_M_IMM_OFF
+JIT_BYPASS, //OP_STC_M_IMM_OFF
+JIT_BYPASS, //OP_STC_M_IMM_OFF
+JIT_BYPASS, //OP_STC_M_IMM_OFF
+JIT_BYPASS, //OP_STC_M_IMM_OFF
+JIT_BYPASS, //OP_STC_M_IMM_OFF
+JIT_BYPASS, //OP_STC_M_IMM_OFF
+JIT_BYPASS, //OP_STC_M_IMM_OFF
+JIT_BYPASS, //OP_STC_M_IMM_OFF
+JIT_BYPASS, //OP_STC_M_IMM_OFF
+JIT_BYPASS, //OP_STC_M_IMM_OFF
+JIT_BYPASS, //OP_STC_M_IMM_OFF
+JIT_BYPASS, //OP_STC_M_IMM_OFF
+JIT_BYPASS, //OP_STC_M_IMM_OFF
+JIT_BYPASS, //OP_LDC_M_IMM_OFF
+JIT_BYPASS, //OP_LDC_M_IMM_OFF
+JIT_BYPASS, //OP_LDC_M_IMM_OFF
+JIT_BYPASS, //OP_LDC_M_IMM_OFF
+JIT_BYPASS, //OP_LDC_M_IMM_OFF
+JIT_BYPASS, //OP_LDC_M_IMM_OFF
+JIT_BYPASS, //OP_LDC_M_IMM_OFF
+JIT_BYPASS, //OP_LDC_M_IMM_OFF
+JIT_BYPASS, //OP_LDC_M_IMM_OFF
+JIT_BYPASS, //OP_LDC_M_IMM_OFF
+JIT_BYPASS, //OP_LDC_M_IMM_OFF
+JIT_BYPASS, //OP_LDC_M_IMM_OFF
+JIT_BYPASS, //OP_LDC_M_IMM_OFF
+JIT_BYPASS, //OP_LDC_M_IMM_OFF
+JIT_BYPASS, //OP_LDC_M_IMM_OFF
+JIT_BYPASS, //OP_LDC_M_IMM_OFF
+JIT_BYPASS, //OP_STC_M_PREIND
+JIT_BYPASS, //OP_STC_M_PREIND
+JIT_BYPASS, //OP_STC_M_PREIND
+JIT_BYPASS, //OP_STC_M_PREIND
+JIT_BYPASS, //OP_STC_M_PREIND
+JIT_BYPASS, //OP_STC_M_PREIND
+JIT_BYPASS, //OP_STC_M_PREIND
+JIT_BYPASS, //OP_STC_M_PREIND
+JIT_BYPASS, //OP_STC_M_PREIND
+JIT_BYPASS, //OP_STC_M_PREIND
+JIT_BYPASS, //OP_STC_M_PREIND
+JIT_BYPASS, //OP_STC_M_PREIND
+JIT_BYPASS, //OP_STC_M_PREIND
+JIT_BYPASS, //OP_STC_M_PREIND
+JIT_BYPASS, //OP_STC_M_PREIND
+JIT_BYPASS, //OP_STC_M_PREIND
+JIT_BYPASS, //OP_LDC_M_PREIND
+JIT_BYPASS, //OP_LDC_M_PREIND
+JIT_BYPASS, //OP_LDC_M_PREIND
+JIT_BYPASS, //OP_LDC_M_PREIND
+JIT_BYPASS, //OP_LDC_M_PREIND
+JIT_BYPASS, //OP_LDC_M_PREIND
+JIT_BYPASS, //OP_LDC_M_PREIND
+JIT_BYPASS, //OP_LDC_M_PREIND
+JIT_BYPASS, //OP_LDC_M_PREIND
+JIT_BYPASS, //OP_LDC_M_PREIND
+JIT_BYPASS, //OP_LDC_M_PREIND
+JIT_BYPASS, //OP_LDC_M_PREIND
+JIT_BYPASS, //OP_LDC_M_PREIND
+JIT_BYPASS, //OP_LDC_M_PREIND
+JIT_BYPASS, //OP_LDC_M_PREIND
+JIT_BYPASS, //OP_LDC_M_PREIND
+JIT_BYPASS, //OP_STC_P_IMM_OFF
+JIT_BYPASS, //OP_STC_P_IMM_OFF
+JIT_BYPASS, //OP_STC_P_IMM_OFF
+JIT_BYPASS, //OP_STC_P_IMM_OFF
+JIT_BYPASS, //OP_STC_P_IMM_OFF
+JIT_BYPASS, //OP_STC_P_IMM_OFF
+JIT_BYPASS, //OP_STC_P_IMM_OFF
+JIT_BYPASS, //OP_STC_P_IMM_OFF
+JIT_BYPASS, //OP_STC_P_IMM_OFF
+JIT_BYPASS, //OP_STC_P_IMM_OFF
+JIT_BYPASS, //OP_STC_P_IMM_OFF
+JIT_BYPASS, //OP_STC_P_IMM_OFF
+JIT_BYPASS, //OP_STC_P_IMM_OFF
+JIT_BYPASS, //OP_STC_P_IMM_OFF
+JIT_BYPASS, //OP_STC_P_IMM_OFF
+JIT_BYPASS, //OP_STC_P_IMM_OFF
+JIT_BYPASS, //OP_LDC_P_IMM_OFF
+JIT_BYPASS, //OP_LDC_P_IMM_OFF
+JIT_BYPASS, //OP_LDC_P_IMM_OFF
+JIT_BYPASS, //OP_LDC_P_IMM_OFF
+JIT_BYPASS, //OP_LDC_P_IMM_OFF
+JIT_BYPASS, //OP_LDC_P_IMM_OFF
+JIT_BYPASS, //OP_LDC_P_IMM_OFF
+JIT_BYPASS, //OP_LDC_P_IMM_OFF
+JIT_BYPASS, //OP_LDC_P_IMM_OFF
+JIT_BYPASS, //OP_LDC_P_IMM_OFF
+JIT_BYPASS, //OP_LDC_P_IMM_OFF
+JIT_BYPASS, //OP_LDC_P_IMM_OFF
+JIT_BYPASS, //OP_LDC_P_IMM_OFF
+JIT_BYPASS, //OP_LDC_P_IMM_OFF
+JIT_BYPASS, //OP_LDC_P_IMM_OFF
+JIT_BYPASS, //OP_LDC_P_IMM_OFF
+JIT_BYPASS, //OP_STC_P_PREIND
+JIT_BYPASS, //OP_STC_P_PREIND
+JIT_BYPASS, //OP_STC_P_PREIND
+JIT_BYPASS, //OP_STC_P_PREIND
+JIT_BYPASS, //OP_STC_P_PREIND
+JIT_BYPASS, //OP_STC_P_PREIND
+JIT_BYPASS, //OP_STC_P_PREIND
+JIT_BYPASS, //OP_STC_P_PREIND
+JIT_BYPASS, //OP_STC_P_PREIND
+JIT_BYPASS, //OP_STC_P_PREIND
+JIT_BYPASS, //OP_STC_P_PREIND
+JIT_BYPASS, //OP_STC_P_PREIND
+JIT_BYPASS, //OP_STC_P_PREIND
+JIT_BYPASS, //OP_STC_P_PREIND
+JIT_BYPASS, //OP_STC_P_PREIND
+JIT_BYPASS, //OP_STC_P_PREIND
+JIT_BYPASS, //OP_LDC_P_PREIND
+JIT_BYPASS, //OP_LDC_P_PREIND
+JIT_BYPASS, //OP_LDC_P_PREIND
+JIT_BYPASS, //OP_LDC_P_PREIND
+JIT_BYPASS, //OP_LDC_P_PREIND
+JIT_BYPASS, //OP_LDC_P_PREIND
+JIT_BYPASS, //OP_LDC_P_PREIND
+JIT_BYPASS, //OP_LDC_P_PREIND
+JIT_BYPASS, //OP_LDC_P_PREIND
+JIT_BYPASS, //OP_LDC_P_PREIND
+JIT_BYPASS, //OP_LDC_P_PREIND
+JIT_BYPASS, //OP_LDC_P_PREIND
+JIT_BYPASS, //OP_LDC_P_PREIND
+JIT_BYPASS, //OP_LDC_P_PREIND
+JIT_BYPASS, //OP_LDC_P_PREIND
+JIT_BYPASS, //OP_LDC_P_PREIND
+JIT_BYPASS, //OP_STC_P_IMM_OFF
+JIT_BYPASS, //OP_STC_P_IMM_OFF
+JIT_BYPASS, //OP_STC_P_IMM_OFF
+JIT_BYPASS, //OP_STC_P_IMM_OFF
+JIT_BYPASS, //OP_STC_P_IMM_OFF
+JIT_BYPASS, //OP_STC_P_IMM_OFF
+JIT_BYPASS, //OP_STC_P_IMM_OFF
+JIT_BYPASS, //OP_STC_P_IMM_OFF
+JIT_BYPASS, //OP_STC_P_IMM_OFF
+JIT_BYPASS, //OP_STC_P_IMM_OFF
+JIT_BYPASS, //OP_STC_P_IMM_OFF
+JIT_BYPASS, //OP_STC_P_IMM_OFF
+JIT_BYPASS, //OP_STC_P_IMM_OFF
+JIT_BYPASS, //OP_STC_P_IMM_OFF
+JIT_BYPASS, //OP_STC_P_IMM_OFF
+JIT_BYPASS, //OP_STC_P_IMM_OFF
+JIT_BYPASS, //OP_LDC_P_IMM_OFF
+JIT_BYPASS, //OP_LDC_P_IMM_OFF
+JIT_BYPASS, //OP_LDC_P_IMM_OFF
+JIT_BYPASS, //OP_LDC_P_IMM_OFF
+JIT_BYPASS, //OP_LDC_P_IMM_OFF
+JIT_BYPASS, //OP_LDC_P_IMM_OFF
+JIT_BYPASS, //OP_LDC_P_IMM_OFF
+JIT_BYPASS, //OP_LDC_P_IMM_OFF
+JIT_BYPASS, //OP_LDC_P_IMM_OFF
+JIT_BYPASS, //OP_LDC_P_IMM_OFF
+JIT_BYPASS, //OP_LDC_P_IMM_OFF
+JIT_BYPASS, //OP_LDC_P_IMM_OFF
+JIT_BYPASS, //OP_LDC_P_IMM_OFF
+JIT_BYPASS, //OP_LDC_P_IMM_OFF
+JIT_BYPASS, //OP_LDC_P_IMM_OFF
+JIT_BYPASS, //OP_LDC_P_IMM_OFF
+JIT_BYPASS, //OP_STC_P_PREIND
+JIT_BYPASS, //OP_STC_P_PREIND
+JIT_BYPASS, //OP_STC_P_PREIND
+JIT_BYPASS, //OP_STC_P_PREIND
+JIT_BYPASS, //OP_STC_P_PREIND
+JIT_BYPASS, //OP_STC_P_PREIND
+JIT_BYPASS, //OP_STC_P_PREIND
+JIT_BYPASS, //OP_STC_P_PREIND
+JIT_BYPASS, //OP_STC_P_PREIND
+JIT_BYPASS, //OP_STC_P_PREIND
+JIT_BYPASS, //OP_STC_P_PREIND
+JIT_BYPASS, //OP_STC_P_PREIND
+JIT_BYPASS, //OP_STC_P_PREIND
+JIT_BYPASS, //OP_STC_P_PREIND
+JIT_BYPASS, //OP_STC_P_PREIND
+JIT_BYPASS, //OP_STC_P_PREIND
+JIT_BYPASS, //OP_LDC_P_PREIND
+JIT_BYPASS, //OP_LDC_P_PREIND
+JIT_BYPASS, //OP_LDC_P_PREIND
+JIT_BYPASS, //OP_LDC_P_PREIND
+JIT_BYPASS, //OP_LDC_P_PREIND
+JIT_BYPASS, //OP_LDC_P_PREIND
+JIT_BYPASS, //OP_LDC_P_PREIND
+JIT_BYPASS, //OP_LDC_P_PREIND
+JIT_BYPASS, //OP_LDC_P_PREIND
+JIT_BYPASS, //OP_LDC_P_PREIND
+JIT_BYPASS, //OP_LDC_P_PREIND
+JIT_BYPASS, //OP_LDC_P_PREIND
+JIT_BYPASS, //OP_LDC_P_PREIND
+JIT_BYPASS, //OP_LDC_P_PREIND
+JIT_BYPASS, //OP_LDC_P_PREIND
+JIT_BYPASS, //OP_LDC_P_PREIND
+JIT_BYPASS, //OP_CDP
+INSTR_CYCLES(2) | BRANCH_NEVER, //OP_MCR
+JIT_BYPASS, //OP_CDP
+INSTR_CYCLES(2) | BRANCH_NEVER, //OP_MCR
+JIT_BYPASS, //OP_CDP
+INSTR_CYCLES(2) | BRANCH_NEVER, //OP_MCR
+JIT_BYPASS, //OP_CDP
+INSTR_CYCLES(2) | BRANCH_NEVER, //OP_MCR
+JIT_BYPASS, //OP_CDP
+INSTR_CYCLES(2) | BRANCH_NEVER, //OP_MCR
+JIT_BYPASS, //OP_CDP
+INSTR_CYCLES(2) | BRANCH_NEVER, //OP_MCR
+JIT_BYPASS, //OP_CDP
+INSTR_CYCLES(2) | BRANCH_NEVER, //OP_MCR
+JIT_BYPASS, //OP_CDP
+INSTR_CYCLES(2) | BRANCH_NEVER, //OP_MCR
+JIT_BYPASS, //OP_CDP
+INSTR_CYCLES(3) | BRANCH_NEVER, //OP_MRC
+JIT_BYPASS, //OP_CDP
+INSTR_CYCLES(3) | BRANCH_NEVER, //OP_MRC
+JIT_BYPASS, //OP_CDP
+INSTR_CYCLES(3) | BRANCH_NEVER, //OP_MRC
+JIT_BYPASS, //OP_CDP
+INSTR_CYCLES(3) | BRANCH_NEVER, //OP_MRC
+JIT_BYPASS, //OP_CDP
+INSTR_CYCLES(3) | BRANCH_NEVER, //OP_MRC
+JIT_BYPASS, //OP_CDP
+INSTR_CYCLES(3) | BRANCH_NEVER, //OP_MRC
+JIT_BYPASS, //OP_CDP
+INSTR_CYCLES(3) | BRANCH_NEVER, //OP_MRC
+JIT_BYPASS, //OP_CDP
+INSTR_CYCLES(3) | BRANCH_NEVER, //OP_MRC
+JIT_BYPASS, //OP_CDP
+INSTR_CYCLES(2) | BRANCH_NEVER, //OP_MCR
+JIT_BYPASS, //OP_CDP
+INSTR_CYCLES(2) | BRANCH_NEVER, //OP_MCR
+JIT_BYPASS, //OP_CDP
+INSTR_CYCLES(2) | BRANCH_NEVER, //OP_MCR
+JIT_BYPASS, //OP_CDP
+INSTR_CYCLES(2) | BRANCH_NEVER, //OP_MCR
+JIT_BYPASS, //OP_CDP
+INSTR_CYCLES(2) | BRANCH_NEVER, //OP_MCR
+JIT_BYPASS, //OP_CDP
+INSTR_CYCLES(2) | BRANCH_NEVER, //OP_MCR
+JIT_BYPASS, //OP_CDP
+INSTR_CYCLES(2) | BRANCH_NEVER, //OP_MCR
+JIT_BYPASS, //OP_CDP
+INSTR_CYCLES(2) | BRANCH_NEVER, //OP_MCR
+JIT_BYPASS, //OP_CDP
+INSTR_CYCLES(3) | BRANCH_NEVER, //OP_MRC
+JIT_BYPASS, //OP_CDP
+INSTR_CYCLES(3) | BRANCH_NEVER, //OP_MRC
+JIT_BYPASS, //OP_CDP
+INSTR_CYCLES(3) | BRANCH_NEVER, //OP_MRC
+JIT_BYPASS, //OP_CDP
+INSTR_CYCLES(3) | BRANCH_NEVER, //OP_MRC
+JIT_BYPASS, //OP_CDP
+INSTR_CYCLES(3) | BRANCH_NEVER, //OP_MRC
+JIT_BYPASS, //OP_CDP
+INSTR_CYCLES(3) | BRANCH_NEVER, //OP_MRC
+JIT_BYPASS, //OP_CDP
+INSTR_CYCLES(3) | BRANCH_NEVER, //OP_MRC
+JIT_BYPASS, //OP_CDP
+INSTR_CYCLES(3) | BRANCH_NEVER, //OP_MRC
+JIT_BYPASS, //OP_CDP
+INSTR_CYCLES(2) | BRANCH_NEVER, //OP_MCR
+JIT_BYPASS, //OP_CDP
+INSTR_CYCLES(2) | BRANCH_NEVER, //OP_MCR
+JIT_BYPASS, //OP_CDP
+INSTR_CYCLES(2) | BRANCH_NEVER, //OP_MCR
+JIT_BYPASS, //OP_CDP
+INSTR_CYCLES(2) | BRANCH_NEVER, //OP_MCR
+JIT_BYPASS, //OP_CDP
+INSTR_CYCLES(2) | BRANCH_NEVER, //OP_MCR
+JIT_BYPASS, //OP_CDP
+INSTR_CYCLES(2) | BRANCH_NEVER, //OP_MCR
+JIT_BYPASS, //OP_CDP
+INSTR_CYCLES(2) | BRANCH_NEVER, //OP_MCR
+JIT_BYPASS, //OP_CDP
+INSTR_CYCLES(2) | BRANCH_NEVER, //OP_MCR
+JIT_BYPASS, //OP_CDP
+INSTR_CYCLES(3) | BRANCH_NEVER, //OP_MRC
+JIT_BYPASS, //OP_CDP
+INSTR_CYCLES(3) | BRANCH_NEVER, //OP_MRC
+JIT_BYPASS, //OP_CDP
+INSTR_CYCLES(3) | BRANCH_NEVER, //OP_MRC
+JIT_BYPASS, //OP_CDP
+INSTR_CYCLES(3) | BRANCH_NEVER, //OP_MRC
+JIT_BYPASS, //OP_CDP
+INSTR_CYCLES(3) | BRANCH_NEVER, //OP_MRC
+JIT_BYPASS, //OP_CDP
+INSTR_CYCLES(3) | BRANCH_NEVER, //OP_MRC
+JIT_BYPASS, //OP_CDP
+INSTR_CYCLES(3) | BRANCH_NEVER, //OP_MRC
+JIT_BYPASS, //OP_CDP
+INSTR_CYCLES(3) | BRANCH_NEVER, //OP_MRC
+JIT_BYPASS, //OP_CDP
+INSTR_CYCLES(2) | BRANCH_NEVER, //OP_MCR
+JIT_BYPASS, //OP_CDP
+INSTR_CYCLES(2) | BRANCH_NEVER, //OP_MCR
+JIT_BYPASS, //OP_CDP
+INSTR_CYCLES(2) | BRANCH_NEVER, //OP_MCR
+JIT_BYPASS, //OP_CDP
+INSTR_CYCLES(2) | BRANCH_NEVER, //OP_MCR
+JIT_BYPASS, //OP_CDP
+INSTR_CYCLES(2) | BRANCH_NEVER, //OP_MCR
+JIT_BYPASS, //OP_CDP
+INSTR_CYCLES(2) | BRANCH_NEVER, //OP_MCR
+JIT_BYPASS, //OP_CDP
+INSTR_CYCLES(2) | BRANCH_NEVER, //OP_MCR
+JIT_BYPASS, //OP_CDP
+INSTR_CYCLES(2) | BRANCH_NEVER, //OP_MCR
+JIT_BYPASS, //OP_CDP
+INSTR_CYCLES(3) | BRANCH_NEVER, //OP_MRC
+JIT_BYPASS, //OP_CDP
+INSTR_CYCLES(3) | BRANCH_NEVER, //OP_MRC
+JIT_BYPASS, //OP_CDP
+INSTR_CYCLES(3) | BRANCH_NEVER, //OP_MRC
+JIT_BYPASS, //OP_CDP
+INSTR_CYCLES(3) | BRANCH_NEVER, //OP_MRC
+JIT_BYPASS, //OP_CDP
+INSTR_CYCLES(3) | BRANCH_NEVER, //OP_MRC
+JIT_BYPASS, //OP_CDP
+INSTR_CYCLES(3) | BRANCH_NEVER, //OP_MRC
+JIT_BYPASS, //OP_CDP
+INSTR_CYCLES(3) | BRANCH_NEVER, //OP_MRC
+JIT_BYPASS, //OP_CDP
+INSTR_CYCLES(3) | BRANCH_NEVER, //OP_MRC
+JIT_BYPASS, //OP_CDP
+INSTR_CYCLES(2) | BRANCH_NEVER, //OP_MCR
+JIT_BYPASS, //OP_CDP
+INSTR_CYCLES(2) | BRANCH_NEVER, //OP_MCR
+JIT_BYPASS, //OP_CDP
+INSTR_CYCLES(2) | BRANCH_NEVER, //OP_MCR
+JIT_BYPASS, //OP_CDP
+INSTR_CYCLES(2) | BRANCH_NEVER, //OP_MCR
+JIT_BYPASS, //OP_CDP
+INSTR_CYCLES(2) | BRANCH_NEVER, //OP_MCR
+JIT_BYPASS, //OP_CDP
+INSTR_CYCLES(2) | BRANCH_NEVER, //OP_MCR
+JIT_BYPASS, //OP_CDP
+INSTR_CYCLES(2) | BRANCH_NEVER, //OP_MCR
+JIT_BYPASS, //OP_CDP
+INSTR_CYCLES(2) | BRANCH_NEVER, //OP_MCR
+JIT_BYPASS, //OP_CDP
+INSTR_CYCLES(3) | BRANCH_NEVER, //OP_MRC
+JIT_BYPASS, //OP_CDP
+INSTR_CYCLES(3) | BRANCH_NEVER, //OP_MRC
+JIT_BYPASS, //OP_CDP
+INSTR_CYCLES(3) | BRANCH_NEVER, //OP_MRC
+JIT_BYPASS, //OP_CDP
+INSTR_CYCLES(3) | BRANCH_NEVER, //OP_MRC
+JIT_BYPASS, //OP_CDP
+INSTR_CYCLES(3) | BRANCH_NEVER, //OP_MRC
+JIT_BYPASS, //OP_CDP
+INSTR_CYCLES(3) | BRANCH_NEVER, //OP_MRC
+JIT_BYPASS, //OP_CDP
+INSTR_CYCLES(3) | BRANCH_NEVER, //OP_MRC
+JIT_BYPASS, //OP_CDP
+INSTR_CYCLES(3) | BRANCH_NEVER, //OP_MRC
+JIT_BYPASS, //OP_CDP
+INSTR_CYCLES(2) | BRANCH_NEVER, //OP_MCR
+JIT_BYPASS, //OP_CDP
+INSTR_CYCLES(2) | BRANCH_NEVER, //OP_MCR
+JIT_BYPASS, //OP_CDP
+INSTR_CYCLES(2) | BRANCH_NEVER, //OP_MCR
+JIT_BYPASS, //OP_CDP
+INSTR_CYCLES(2) | BRANCH_NEVER, //OP_MCR
+JIT_BYPASS, //OP_CDP
+INSTR_CYCLES(2) | BRANCH_NEVER, //OP_MCR
+JIT_BYPASS, //OP_CDP
+INSTR_CYCLES(2) | BRANCH_NEVER, //OP_MCR
+JIT_BYPASS, //OP_CDP
+INSTR_CYCLES(2) | BRANCH_NEVER, //OP_MCR
+JIT_BYPASS, //OP_CDP
+INSTR_CYCLES(2) | BRANCH_NEVER, //OP_MCR
+JIT_BYPASS, //OP_CDP
+INSTR_CYCLES(3) | BRANCH_NEVER, //OP_MRC
+JIT_BYPASS, //OP_CDP
+INSTR_CYCLES(3) | BRANCH_NEVER, //OP_MRC
+JIT_BYPASS, //OP_CDP
+INSTR_CYCLES(3) | BRANCH_NEVER, //OP_MRC
+JIT_BYPASS, //OP_CDP
+INSTR_CYCLES(3) | BRANCH_NEVER, //OP_MRC
+JIT_BYPASS, //OP_CDP
+INSTR_CYCLES(3) | BRANCH_NEVER, //OP_MRC
+JIT_BYPASS, //OP_CDP
+INSTR_CYCLES(3) | BRANCH_NEVER, //OP_MRC
+JIT_BYPASS, //OP_CDP
+INSTR_CYCLES(3) | BRANCH_NEVER, //OP_MRC
+JIT_BYPASS, //OP_CDP
+INSTR_CYCLES(3) | BRANCH_NEVER, //OP_MRC
+JIT_BYPASS, //OP_CDP
+INSTR_CYCLES(2) | BRANCH_NEVER, //OP_MCR
+JIT_BYPASS, //OP_CDP
+INSTR_CYCLES(2) | BRANCH_NEVER, //OP_MCR
+JIT_BYPASS, //OP_CDP
+INSTR_CYCLES(2) | BRANCH_NEVER, //OP_MCR
+JIT_BYPASS, //OP_CDP
+INSTR_CYCLES(2) | BRANCH_NEVER, //OP_MCR
+JIT_BYPASS, //OP_CDP
+INSTR_CYCLES(2) | BRANCH_NEVER, //OP_MCR
+JIT_BYPASS, //OP_CDP
+INSTR_CYCLES(2) | BRANCH_NEVER, //OP_MCR
+JIT_BYPASS, //OP_CDP
+INSTR_CYCLES(2) | BRANCH_NEVER, //OP_MCR
+JIT_BYPASS, //OP_CDP
+INSTR_CYCLES(2) | BRANCH_NEVER, //OP_MCR
+JIT_BYPASS, //OP_CDP
+INSTR_CYCLES(3) | BRANCH_NEVER, //OP_MRC
+JIT_BYPASS, //OP_CDP
+INSTR_CYCLES(3) | BRANCH_NEVER, //OP_MRC
+JIT_BYPASS, //OP_CDP
+INSTR_CYCLES(3) | BRANCH_NEVER, //OP_MRC
+JIT_BYPASS, //OP_CDP
+INSTR_CYCLES(3) | BRANCH_NEVER, //OP_MRC
+JIT_BYPASS, //OP_CDP
+INSTR_CYCLES(3) | BRANCH_NEVER, //OP_MRC
+JIT_BYPASS, //OP_CDP
+INSTR_CYCLES(3) | BRANCH_NEVER, //OP_MRC
+JIT_BYPASS, //OP_CDP
+INSTR_CYCLES(3) | BRANCH_NEVER, //OP_MRC
+JIT_BYPASS, //OP_CDP
+INSTR_CYCLES(3) | BRANCH_NEVER, //OP_MRC
+JIT_BYPASS, //OP_CDP
+INSTR_CYCLES(2) | BRANCH_NEVER, //OP_MCR
+JIT_BYPASS, //OP_CDP
+INSTR_CYCLES(2) | BRANCH_NEVER, //OP_MCR
+JIT_BYPASS, //OP_CDP
+INSTR_CYCLES(2) | BRANCH_NEVER, //OP_MCR
+JIT_BYPASS, //OP_CDP
+INSTR_CYCLES(2) | BRANCH_NEVER, //OP_MCR
+JIT_BYPASS, //OP_CDP
+INSTR_CYCLES(2) | BRANCH_NEVER, //OP_MCR
+JIT_BYPASS, //OP_CDP
+INSTR_CYCLES(2) | BRANCH_NEVER, //OP_MCR
+JIT_BYPASS, //OP_CDP
+INSTR_CYCLES(2) | BRANCH_NEVER, //OP_MCR
+JIT_BYPASS, //OP_CDP
+INSTR_CYCLES(2) | BRANCH_NEVER, //OP_MCR
+JIT_BYPASS, //OP_CDP
+INSTR_CYCLES(3) | BRANCH_NEVER, //OP_MRC
+JIT_BYPASS, //OP_CDP
+INSTR_CYCLES(3) | BRANCH_NEVER, //OP_MRC
+JIT_BYPASS, //OP_CDP
+INSTR_CYCLES(3) | BRANCH_NEVER, //OP_MRC
+JIT_BYPASS, //OP_CDP
+INSTR_CYCLES(3) | BRANCH_NEVER, //OP_MRC
+JIT_BYPASS, //OP_CDP
+INSTR_CYCLES(3) | BRANCH_NEVER, //OP_MRC
+JIT_BYPASS, //OP_CDP
+INSTR_CYCLES(3) | BRANCH_NEVER, //OP_MRC
+JIT_BYPASS, //OP_CDP
+INSTR_CYCLES(3) | BRANCH_NEVER, //OP_MRC
+JIT_BYPASS, //OP_CDP
+INSTR_CYCLES(3) | BRANCH_NEVER, //OP_MRC
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI
+};
+
+const uint32_t thumb_attributes =
+{
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_LSL_0
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_LSL
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_LSL
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_LSL
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_LSL
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_LSL
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_LSL
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_LSL
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_LSL
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_LSL
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_LSL
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_LSL
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_LSL
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_LSL
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_LSL
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_LSL
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_LSL
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_LSL
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_LSL
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_LSL
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_LSL
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_LSL
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_LSL
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_LSL
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_LSL
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_LSL
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_LSL
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_LSL
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_LSL
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_LSL
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_LSL
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_LSL
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_LSR_0
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_LSR
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_LSR
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_LSR
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_LSR
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_LSR
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_LSR
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_LSR
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_LSR
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_LSR
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_LSR
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_LSR
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_LSR
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_LSR
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_LSR
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_LSR
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_LSR
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_LSR
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_LSR
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_LSR
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_LSR
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_LSR
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_LSR
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_LSR
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_LSR
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_LSR
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_LSR
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_LSR
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_LSR
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_LSR
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_LSR
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_LSR
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_ASR_0
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_ASR
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_ASR
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_ASR
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_ASR
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_ASR
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_ASR
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_ASR
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_ASR
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_ASR
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_ASR
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_ASR
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_ASR
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_ASR
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_ASR
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_ASR
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_ASR
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_ASR
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_ASR
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_ASR
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_ASR
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_ASR
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_ASR
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_ASR
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_ASR
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_ASR
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_ASR
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_ASR
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_ASR
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_ASR
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_ASR
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_ASR
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_ADD_REG
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_ADD_REG
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_ADD_REG
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_ADD_REG
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_ADD_REG
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_ADD_REG
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_ADD_REG
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_ADD_REG
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_SUB_REG
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_SUB_REG
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_SUB_REG
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_SUB_REG
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_SUB_REG
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_SUB_REG
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_SUB_REG
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_SUB_REG
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_ADD_IMM3
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_ADD_IMM3
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_ADD_IMM3
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_ADD_IMM3
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_ADD_IMM3
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_ADD_IMM3
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_ADD_IMM3
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_ADD_IMM3
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_SUB_IMM3
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_SUB_IMM3
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_SUB_IMM3
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_SUB_IMM3
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_SUB_IMM3
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_SUB_IMM3
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_SUB_IMM3
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_SUB_IMM3
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_MOV_IMM8
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_MOV_IMM8
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_MOV_IMM8
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_MOV_IMM8
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_MOV_IMM8
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_MOV_IMM8
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_MOV_IMM8
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_MOV_IMM8
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_MOV_IMM8
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_MOV_IMM8
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_MOV_IMM8
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_MOV_IMM8
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_MOV_IMM8
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_MOV_IMM8
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_MOV_IMM8
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_MOV_IMM8
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_MOV_IMM8
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_MOV_IMM8
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_MOV_IMM8
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_MOV_IMM8
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_MOV_IMM8
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_MOV_IMM8
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_MOV_IMM8
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_MOV_IMM8
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_MOV_IMM8
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_MOV_IMM8
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_MOV_IMM8
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_MOV_IMM8
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_MOV_IMM8
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_MOV_IMM8
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_MOV_IMM8
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_MOV_IMM8
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_CMP_IMM8
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_CMP_IMM8
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_CMP_IMM8
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_CMP_IMM8
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_CMP_IMM8
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_CMP_IMM8
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_CMP_IMM8
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_CMP_IMM8
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_CMP_IMM8
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_CMP_IMM8
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_CMP_IMM8
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_CMP_IMM8
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_CMP_IMM8
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_CMP_IMM8
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_CMP_IMM8
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_CMP_IMM8
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_CMP_IMM8
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_CMP_IMM8
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_CMP_IMM8
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_CMP_IMM8
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_CMP_IMM8
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_CMP_IMM8
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_CMP_IMM8
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_CMP_IMM8
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_CMP_IMM8
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_CMP_IMM8
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_CMP_IMM8
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_CMP_IMM8
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_CMP_IMM8
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_CMP_IMM8
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_CMP_IMM8
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_CMP_IMM8
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_ADD_IMM8
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_ADD_IMM8
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_ADD_IMM8
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_ADD_IMM8
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_ADD_IMM8
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_ADD_IMM8
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_ADD_IMM8
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_ADD_IMM8
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_ADD_IMM8
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_ADD_IMM8
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_ADD_IMM8
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_ADD_IMM8
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_ADD_IMM8
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_ADD_IMM8
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_ADD_IMM8
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_ADD_IMM8
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_ADD_IMM8
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_ADD_IMM8
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_ADD_IMM8
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_ADD_IMM8
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_ADD_IMM8
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_ADD_IMM8
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_ADD_IMM8
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_ADD_IMM8
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_ADD_IMM8
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_ADD_IMM8
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_ADD_IMM8
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_ADD_IMM8
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_ADD_IMM8
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_ADD_IMM8
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_ADD_IMM8
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_ADD_IMM8
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_SUB_IMM8
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_SUB_IMM8
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_SUB_IMM8
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_SUB_IMM8
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_SUB_IMM8
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_SUB_IMM8
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_SUB_IMM8
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_SUB_IMM8
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_SUB_IMM8
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_SUB_IMM8
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_SUB_IMM8
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_SUB_IMM8
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_SUB_IMM8
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_SUB_IMM8
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_SUB_IMM8
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_SUB_IMM8
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_SUB_IMM8
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_SUB_IMM8
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_SUB_IMM8
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_SUB_IMM8
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_SUB_IMM8
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_SUB_IMM8
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_SUB_IMM8
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_SUB_IMM8
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_SUB_IMM8
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_SUB_IMM8
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_SUB_IMM8
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_SUB_IMM8
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_SUB_IMM8
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_SUB_IMM8
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_SUB_IMM8
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_SUB_IMM8
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_AND
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_EOR
+INSTR_CYCLES(2) | BRANCH_NEVER, //OP_LSL_REG
+INSTR_CYCLES(2) | BRANCH_NEVER, //OP_LSR_REG
+INSTR_CYCLES(2) | BRANCH_NEVER, //OP_ASR_REG
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_ADC_REG
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_SBC_REG
+INSTR_CYCLES(2) | BRANCH_NEVER, //OP_ROR_REG
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_TST
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_NEG
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_CMP
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_CMN
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_ORR
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_MUL_REG
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_BIC
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_MVN
+INSTR_CYCLES(1) | BRANCH_POS0 | SRCREG_POS0 | SRCREG_POS3, //OP_ADD_SPE
+INSTR_CYCLES(1) | BRANCH_POS0 | SRCREG_POS0 | SRCREG_POS3, //OP_ADD_SPE
+INSTR_CYCLES(1) | BRANCH_POS0 | SRCREG_POS0 | SRCREG_POS3, //OP_ADD_SPE
+INSTR_CYCLES(1) | BRANCH_POS0 | SRCREG_POS0 | SRCREG_POS3, //OP_ADD_SPE
+INSTR_CYCLES(1) | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS3, //OP_CMP_SPE
+INSTR_CYCLES(1) | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS3, //OP_CMP_SPE
+INSTR_CYCLES(1) | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS3, //OP_CMP_SPE
+INSTR_CYCLES(1) | BRANCH_NEVER | SRCREG_POS0 | SRCREG_POS3, //OP_CMP_SPE
+INSTR_CYCLES(1) | BRANCH_POS0 | SRCREG_POS3, //OP_MOV_SPE
+INSTR_CYCLES(1) | BRANCH_POS0 | SRCREG_POS3, //OP_MOV_SPE
+INSTR_CYCLES(1) | BRANCH_POS0 | SRCREG_POS3, //OP_MOV_SPE
+INSTR_CYCLES(1) | BRANCH_POS0 | SRCREG_POS3, //OP_MOV_SPE
+INSTR_CYCLES(3) | BRANCH_ALWAYS | SRCREG_POS3, //OP_BX_THUMB
+INSTR_CYCLES(3) | BRANCH_ALWAYS | SRCREG_POS3, //OP_BX_THUMB
+INSTR_CYCLES(4) | BRANCH_ALWAYS | SRCREG_POS3, //OP_BLX_THUMB
+INSTR_CYCLES(4) | BRANCH_ALWAYS | SRCREG_POS3, //OP_BLX_THUMB
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDR_PCREL
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDR_PCREL
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDR_PCREL
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDR_PCREL
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDR_PCREL
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDR_PCREL
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDR_PCREL
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDR_PCREL
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDR_PCREL
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDR_PCREL
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDR_PCREL
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDR_PCREL
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDR_PCREL
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDR_PCREL
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDR_PCREL
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDR_PCREL
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDR_PCREL
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDR_PCREL
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDR_PCREL
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDR_PCREL
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDR_PCREL
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDR_PCREL
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDR_PCREL
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDR_PCREL
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDR_PCREL
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDR_PCREL
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDR_PCREL
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDR_PCREL
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDR_PCREL
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDR_PCREL
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDR_PCREL
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDR_PCREL
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_STR_REG_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_STR_REG_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_STR_REG_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_STR_REG_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_STR_REG_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_STR_REG_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_STR_REG_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_STR_REG_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_STRH_REG_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_STRH_REG_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_STRH_REG_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_STRH_REG_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_STRH_REG_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_STRH_REG_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_STRH_REG_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_STRH_REG_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_STRB_REG_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_STRB_REG_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_STRB_REG_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_STRB_REG_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_STRB_REG_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_STRB_REG_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_STRB_REG_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_STRB_REG_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDRSB_REG_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDRSB_REG_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDRSB_REG_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDRSB_REG_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDRSB_REG_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDRSB_REG_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDRSB_REG_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDRSB_REG_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDR_REG_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDR_REG_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDR_REG_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDR_REG_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDR_REG_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDR_REG_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDR_REG_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDR_REG_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDRH_REG_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDRH_REG_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDRH_REG_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDRH_REG_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDRH_REG_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDRH_REG_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDRH_REG_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDRH_REG_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDRB_REG_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDRB_REG_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDRB_REG_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDRB_REG_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDRB_REG_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDRB_REG_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDRB_REG_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDRB_REG_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDRSH_REG_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDRSH_REG_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDRSH_REG_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDRSH_REG_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDRSH_REG_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDRSH_REG_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDRSH_REG_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDRSH_REG_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_STR_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_STR_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_STR_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_STR_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_STR_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_STR_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_STR_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_STR_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_STR_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_STR_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_STR_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_STR_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_STR_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_STR_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_STR_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_STR_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_STR_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_STR_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_STR_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_STR_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_STR_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_STR_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_STR_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_STR_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_STR_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_STR_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_STR_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_STR_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_STR_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_STR_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_STR_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_STR_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDR_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDR_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDR_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDR_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDR_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDR_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDR_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDR_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDR_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDR_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDR_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDR_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDR_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDR_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDR_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDR_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDR_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDR_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDR_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDR_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDR_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDR_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDR_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDR_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDR_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDR_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDR_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDR_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDR_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDR_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDR_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDR_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_STRB_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_STRB_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_STRB_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_STRB_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_STRB_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_STRB_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_STRB_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_STRB_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_STRB_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_STRB_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_STRB_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_STRB_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_STRB_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_STRB_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_STRB_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_STRB_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_STRB_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_STRB_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_STRB_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_STRB_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_STRB_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_STRB_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_STRB_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_STRB_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_STRB_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_STRB_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_STRB_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_STRB_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_STRB_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_STRB_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_STRB_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_STRB_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDRB_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDRB_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDRB_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDRB_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDRB_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDRB_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDRB_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDRB_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDRB_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDRB_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDRB_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDRB_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDRB_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDRB_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDRB_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDRB_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDRB_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDRB_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDRB_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDRB_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDRB_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDRB_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDRB_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDRB_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDRB_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDRB_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDRB_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDRB_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDRB_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDRB_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDRB_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDRB_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_STRH_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_STRH_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_STRH_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_STRH_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_STRH_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_STRH_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_STRH_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_STRH_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_STRH_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_STRH_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_STRH_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_STRH_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_STRH_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_STRH_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_STRH_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_STRH_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_STRH_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_STRH_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_STRH_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_STRH_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_STRH_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_STRH_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_STRH_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_STRH_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_STRH_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_STRH_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_STRH_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_STRH_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_STRH_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_STRH_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_STRH_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_STRH_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDRH_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDRH_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDRH_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDRH_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDRH_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDRH_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDRH_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDRH_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDRH_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDRH_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDRH_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDRH_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDRH_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDRH_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDRH_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDRH_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDRH_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDRH_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDRH_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDRH_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDRH_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDRH_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDRH_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDRH_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDRH_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDRH_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDRH_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDRH_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDRH_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDRH_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDRH_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDRH_IMM_OFF
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_STR_SPREL
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_STR_SPREL
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_STR_SPREL
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_STR_SPREL
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_STR_SPREL
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_STR_SPREL
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_STR_SPREL
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_STR_SPREL
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_STR_SPREL
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_STR_SPREL
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_STR_SPREL
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_STR_SPREL
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_STR_SPREL
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_STR_SPREL
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_STR_SPREL
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_STR_SPREL
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_STR_SPREL
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_STR_SPREL
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_STR_SPREL
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_STR_SPREL
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_STR_SPREL
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_STR_SPREL
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_STR_SPREL
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_STR_SPREL
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_STR_SPREL
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_STR_SPREL
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_STR_SPREL
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_STR_SPREL
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_STR_SPREL
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_STR_SPREL
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_STR_SPREL
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_STR_SPREL
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDR_SPREL
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDR_SPREL
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDR_SPREL
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDR_SPREL
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDR_SPREL
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDR_SPREL
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDR_SPREL
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDR_SPREL
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDR_SPREL
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDR_SPREL
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDR_SPREL
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDR_SPREL
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDR_SPREL
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDR_SPREL
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDR_SPREL
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDR_SPREL
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDR_SPREL
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDR_SPREL
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDR_SPREL
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDR_SPREL
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDR_SPREL
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDR_SPREL
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDR_SPREL
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDR_SPREL
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDR_SPREL
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDR_SPREL
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDR_SPREL
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDR_SPREL
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDR_SPREL
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDR_SPREL
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDR_SPREL
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDR_SPREL
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_ADD_2PC
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_ADD_2PC
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_ADD_2PC
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_ADD_2PC
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_ADD_2PC
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_ADD_2PC
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_ADD_2PC
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_ADD_2PC
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_ADD_2PC
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_ADD_2PC
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_ADD_2PC
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_ADD_2PC
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_ADD_2PC
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_ADD_2PC
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_ADD_2PC
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_ADD_2PC
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_ADD_2PC
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_ADD_2PC
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_ADD_2PC
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_ADD_2PC
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_ADD_2PC
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_ADD_2PC
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_ADD_2PC
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_ADD_2PC
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_ADD_2PC
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_ADD_2PC
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_ADD_2PC
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_ADD_2PC
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_ADD_2PC
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_ADD_2PC
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_ADD_2PC
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_ADD_2PC
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_ADD_2SP
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_ADD_2SP
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_ADD_2SP
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_ADD_2SP
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_ADD_2SP
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_ADD_2SP
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_ADD_2SP
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_ADD_2SP
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_ADD_2SP
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_ADD_2SP
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_ADD_2SP
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_ADD_2SP
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_ADD_2SP
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_ADD_2SP
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_ADD_2SP
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_ADD_2SP
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_ADD_2SP
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_ADD_2SP
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_ADD_2SP
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_ADD_2SP
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_ADD_2SP
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_ADD_2SP
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_ADD_2SP
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_ADD_2SP
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_ADD_2SP
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_ADD_2SP
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_ADD_2SP
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_ADD_2SP
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_ADD_2SP
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_ADD_2SP
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_ADD_2SP
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_ADD_2SP
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_ADJUST_P_SP
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_ADJUST_P_SP
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_ADJUST_M_SP
+INSTR_CYCLES(1) | BRANCH_NEVER, //OP_ADJUST_M_SP
+JIT_BYPASS, //OP_UND_THUMB
+JIT_BYPASS, //OP_UND_THUMB
+JIT_BYPASS, //OP_UND_THUMB
+JIT_BYPASS, //OP_UND_THUMB
+JIT_BYPASS, //OP_UND_THUMB
+JIT_BYPASS, //OP_UND_THUMB
+JIT_BYPASS, //OP_UND_THUMB
+JIT_BYPASS, //OP_UND_THUMB
+JIT_BYPASS, //OP_UND_THUMB
+JIT_BYPASS, //OP_UND_THUMB
+JIT_BYPASS, //OP_UND_THUMB
+JIT_BYPASS, //OP_UND_THUMB
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_PUSH
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_PUSH
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_PUSH
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_PUSH
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_PUSH_LR
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_PUSH_LR
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_PUSH_LR
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_PUSH_LR
+JIT_BYPASS, //OP_UND_THUMB
+JIT_BYPASS, //OP_UND_THUMB
+JIT_BYPASS, //OP_UND_THUMB
+JIT_BYPASS, //OP_UND_THUMB
+JIT_BYPASS, //OP_UND_THUMB
+JIT_BYPASS, //OP_UND_THUMB
+JIT_BYPASS, //OP_UND_THUMB
+JIT_BYPASS, //OP_UND_THUMB
+JIT_BYPASS, //OP_UND_THUMB
+JIT_BYPASS, //OP_UND_THUMB
+JIT_BYPASS, //OP_UND_THUMB
+JIT_BYPASS, //OP_UND_THUMB
+JIT_BYPASS, //OP_UND_THUMB
+JIT_BYPASS, //OP_UND_THUMB
+JIT_BYPASS, //OP_UND_THUMB
+JIT_BYPASS, //OP_UND_THUMB
+JIT_BYPASS, //OP_UND_THUMB
+JIT_BYPASS, //OP_UND_THUMB
+JIT_BYPASS, //OP_UND_THUMB
+JIT_BYPASS, //OP_UND_THUMB
+JIT_BYPASS, //OP_UND_THUMB
+JIT_BYPASS, //OP_UND_THUMB
+JIT_BYPASS, //OP_UND_THUMB
+JIT_BYPASS, //OP_UND_THUMB
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_POP
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_POP
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_POP
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_POP
+INSTR_CYCLES_V | BRANCH_ALWAYS, //OP_POP_PC
+INSTR_CYCLES_V | BRANCH_ALWAYS, //OP_POP_PC
+INSTR_CYCLES_V | BRANCH_ALWAYS, //OP_POP_PC
+INSTR_CYCLES_V | BRANCH_ALWAYS, //OP_POP_PC
+JIT_BYPASS, //OP_BKPT_THUMB
+JIT_BYPASS, //OP_BKPT_THUMB
+JIT_BYPASS, //OP_BKPT_THUMB
+JIT_BYPASS, //OP_BKPT_THUMB
+JIT_BYPASS, //OP_UND_THUMB
+JIT_BYPASS, //OP_UND_THUMB
+JIT_BYPASS, //OP_UND_THUMB
+JIT_BYPASS, //OP_UND_THUMB
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_STMIA_THUMB
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_STMIA_THUMB
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_STMIA_THUMB
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_STMIA_THUMB
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_STMIA_THUMB
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_STMIA_THUMB
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_STMIA_THUMB
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_STMIA_THUMB
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_STMIA_THUMB
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_STMIA_THUMB
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_STMIA_THUMB
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_STMIA_THUMB
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_STMIA_THUMB
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_STMIA_THUMB
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_STMIA_THUMB
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_STMIA_THUMB
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_STMIA_THUMB
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_STMIA_THUMB
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_STMIA_THUMB
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_STMIA_THUMB
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_STMIA_THUMB
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_STMIA_THUMB
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_STMIA_THUMB
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_STMIA_THUMB
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_STMIA_THUMB
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_STMIA_THUMB
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_STMIA_THUMB
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_STMIA_THUMB
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_STMIA_THUMB
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_STMIA_THUMB
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_STMIA_THUMB
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_STMIA_THUMB
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDMIA_THUMB
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDMIA_THUMB
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDMIA_THUMB
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDMIA_THUMB
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDMIA_THUMB
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDMIA_THUMB
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDMIA_THUMB
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDMIA_THUMB
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDMIA_THUMB
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDMIA_THUMB
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDMIA_THUMB
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDMIA_THUMB
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDMIA_THUMB
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDMIA_THUMB
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDMIA_THUMB
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDMIA_THUMB
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDMIA_THUMB
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDMIA_THUMB
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDMIA_THUMB
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDMIA_THUMB
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDMIA_THUMB
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDMIA_THUMB
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDMIA_THUMB
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDMIA_THUMB
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDMIA_THUMB
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDMIA_THUMB
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDMIA_THUMB
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDMIA_THUMB
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDMIA_THUMB
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDMIA_THUMB
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDMIA_THUMB
+INSTR_CYCLES_V | BRANCH_NEVER, //OP_LDMIA_THUMB
+INSTR_CYCLES(1) | BRANCH_ALWAYS, //OP_B_COND
+INSTR_CYCLES(1) | BRANCH_ALWAYS, //OP_B_COND
+INSTR_CYCLES(1) | BRANCH_ALWAYS, //OP_B_COND
+INSTR_CYCLES(1) | BRANCH_ALWAYS, //OP_B_COND
+INSTR_CYCLES(1) | BRANCH_ALWAYS, //OP_B_COND
+INSTR_CYCLES(1) | BRANCH_ALWAYS, //OP_B_COND
+INSTR_CYCLES(1) | BRANCH_ALWAYS, //OP_B_COND
+INSTR_CYCLES(1) | BRANCH_ALWAYS, //OP_B_COND
+INSTR_CYCLES(1) | BRANCH_ALWAYS, //OP_B_COND
+INSTR_CYCLES(1) | BRANCH_ALWAYS, //OP_B_COND
+INSTR_CYCLES(1) | BRANCH_ALWAYS, //OP_B_COND
+INSTR_CYCLES(1) | BRANCH_ALWAYS, //OP_B_COND
+INSTR_CYCLES(1) | BRANCH_ALWAYS, //OP_B_COND
+INSTR_CYCLES(1) | BRANCH_ALWAYS, //OP_B_COND
+INSTR_CYCLES(1) | BRANCH_ALWAYS, //OP_B_COND
+INSTR_CYCLES(1) | BRANCH_ALWAYS, //OP_B_COND
+INSTR_CYCLES(1) | BRANCH_ALWAYS, //OP_B_COND
+INSTR_CYCLES(1) | BRANCH_ALWAYS, //OP_B_COND
+INSTR_CYCLES(1) | BRANCH_ALWAYS, //OP_B_COND
+INSTR_CYCLES(1) | BRANCH_ALWAYS, //OP_B_COND
+INSTR_CYCLES(1) | BRANCH_ALWAYS, //OP_B_COND
+INSTR_CYCLES(1) | BRANCH_ALWAYS, //OP_B_COND
+INSTR_CYCLES(1) | BRANCH_ALWAYS, //OP_B_COND
+INSTR_CYCLES(1) | BRANCH_ALWAYS, //OP_B_COND
+INSTR_CYCLES(1) | BRANCH_ALWAYS, //OP_B_COND
+INSTR_CYCLES(1) | BRANCH_ALWAYS, //OP_B_COND
+INSTR_CYCLES(1) | BRANCH_ALWAYS, //OP_B_COND
+INSTR_CYCLES(1) | BRANCH_ALWAYS, //OP_B_COND
+INSTR_CYCLES(1) | BRANCH_ALWAYS, //OP_B_COND
+INSTR_CYCLES(1) | BRANCH_ALWAYS, //OP_B_COND
+INSTR_CYCLES(1) | BRANCH_ALWAYS, //OP_B_COND
+INSTR_CYCLES(1) | BRANCH_ALWAYS, //OP_B_COND
+INSTR_CYCLES(1) | BRANCH_ALWAYS, //OP_B_COND
+INSTR_CYCLES(1) | BRANCH_ALWAYS, //OP_B_COND
+INSTR_CYCLES(1) | BRANCH_ALWAYS, //OP_B_COND
+INSTR_CYCLES(1) | BRANCH_ALWAYS, //OP_B_COND
+INSTR_CYCLES(1) | BRANCH_ALWAYS, //OP_B_COND
+INSTR_CYCLES(1) | BRANCH_ALWAYS, //OP_B_COND
+INSTR_CYCLES(1) | BRANCH_ALWAYS, //OP_B_COND
+INSTR_CYCLES(1) | BRANCH_ALWAYS, //OP_B_COND
+INSTR_CYCLES(1) | BRANCH_ALWAYS, //OP_B_COND
+INSTR_CYCLES(1) | BRANCH_ALWAYS, //OP_B_COND
+INSTR_CYCLES(1) | BRANCH_ALWAYS, //OP_B_COND
+INSTR_CYCLES(1) | BRANCH_ALWAYS, //OP_B_COND
+INSTR_CYCLES(1) | BRANCH_ALWAYS, //OP_B_COND
+INSTR_CYCLES(1) | BRANCH_ALWAYS, //OP_B_COND
+INSTR_CYCLES(1) | BRANCH_ALWAYS, //OP_B_COND
+INSTR_CYCLES(1) | BRANCH_ALWAYS, //OP_B_COND
+INSTR_CYCLES(1) | BRANCH_ALWAYS, //OP_B_COND
+INSTR_CYCLES(1) | BRANCH_ALWAYS, //OP_B_COND
+INSTR_CYCLES(1) | BRANCH_ALWAYS, //OP_B_COND
+INSTR_CYCLES(1) | BRANCH_ALWAYS, //OP_B_COND
+INSTR_CYCLES(1) | BRANCH_ALWAYS, //OP_B_COND
+INSTR_CYCLES(1) | BRANCH_ALWAYS, //OP_B_COND
+INSTR_CYCLES(1) | BRANCH_ALWAYS, //OP_B_COND
+INSTR_CYCLES(1) | BRANCH_ALWAYS, //OP_B_COND
+INSTR_CYCLES(1) | BRANCH_ALWAYS, //OP_B_COND
+INSTR_CYCLES(1) | BRANCH_ALWAYS, //OP_B_COND
+INSTR_CYCLES(1) | BRANCH_ALWAYS, //OP_B_COND
+INSTR_CYCLES(1) | BRANCH_ALWAYS, //OP_B_COND
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI_THUMB
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI_THUMB
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI_THUMB
+INSTR_CYCLES_V | BRANCH_SWI, //OP_SWI_THUMB
+INSTR_CYCLES(1) | BRANCH_ALWAYS, //OP_B_UNCOND
+INSTR_CYCLES(1) | BRANCH_ALWAYS, //OP_B_UNCOND
+INSTR_CYCLES(1) | BRANCH_ALWAYS, //OP_B_UNCOND
+INSTR_CYCLES(1) | BRANCH_ALWAYS, //OP_B_UNCOND
+INSTR_CYCLES(1) | BRANCH_ALWAYS, //OP_B_UNCOND
+INSTR_CYCLES(1) | BRANCH_ALWAYS, //OP_B_UNCOND
+INSTR_CYCLES(1) | BRANCH_ALWAYS, //OP_B_UNCOND
+INSTR_CYCLES(1) | BRANCH_ALWAYS, //OP_B_UNCOND
+INSTR_CYCLES(1) | BRANCH_ALWAYS, //OP_B_UNCOND
+INSTR_CYCLES(1) | BRANCH_ALWAYS, //OP_B_UNCOND
+INSTR_CYCLES(1) | BRANCH_ALWAYS, //OP_B_UNCOND
+INSTR_CYCLES(1) | BRANCH_ALWAYS, //OP_B_UNCOND
+INSTR_CYCLES(1) | BRANCH_ALWAYS, //OP_B_UNCOND
+INSTR_CYCLES(1) | BRANCH_ALWAYS, //OP_B_UNCOND
+INSTR_CYCLES(1) | BRANCH_ALWAYS, //OP_B_UNCOND
+INSTR_CYCLES(1) | BRANCH_ALWAYS, //OP_B_UNCOND
+INSTR_CYCLES(1) | BRANCH_ALWAYS, //OP_B_UNCOND
+INSTR_CYCLES(1) | BRANCH_ALWAYS, //OP_B_UNCOND
+INSTR_CYCLES(1) | BRANCH_ALWAYS, //OP_B_UNCOND
+INSTR_CYCLES(1) | BRANCH_ALWAYS, //OP_B_UNCOND
+INSTR_CYCLES(1) | BRANCH_ALWAYS, //OP_B_UNCOND
+INSTR_CYCLES(1) | BRANCH_ALWAYS, //OP_B_UNCOND
+INSTR_CYCLES(1) | BRANCH_ALWAYS, //OP_B_UNCOND
+INSTR_CYCLES(1) | BRANCH_ALWAYS, //OP_B_UNCOND
+INSTR_CYCLES(1) | BRANCH_ALWAYS, //OP_B_UNCOND
+INSTR_CYCLES(1) | BRANCH_ALWAYS, //OP_B_UNCOND
+INSTR_CYCLES(1) | BRANCH_ALWAYS, //OP_B_UNCOND
+INSTR_CYCLES(1) | BRANCH_ALWAYS, //OP_B_UNCOND
+INSTR_CYCLES(1) | BRANCH_ALWAYS, //OP_B_UNCOND
+INSTR_CYCLES(1) | BRANCH_ALWAYS, //OP_B_UNCOND
+INSTR_CYCLES(1) | BRANCH_ALWAYS, //OP_B_UNCOND
+INSTR_CYCLES(1) | BRANCH_ALWAYS, //OP_B_UNCOND
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BLX
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BLX
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BLX
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BLX
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BLX
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BLX
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BLX
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BLX
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BLX
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BLX
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BLX
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BLX
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BLX
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BLX
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BLX
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BLX
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BLX
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BLX
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BLX
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BLX
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BLX
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BLX
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BLX
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BLX
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BLX
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BLX
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BLX
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BLX
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BLX
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BLX
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BLX
+INSTR_CYCLES(3) | BRANCH_ALWAYS, //OP_BLX
+INSTR_CYCLES(1) | BRANCH_NEVER , //OP_BL_10
+INSTR_CYCLES(1) | BRANCH_NEVER , //OP_BL_10
+INSTR_CYCLES(1) | BRANCH_NEVER , //OP_BL_10
+INSTR_CYCLES(1) | BRANCH_NEVER , //OP_BL_10
+INSTR_CYCLES(1) | BRANCH_NEVER , //OP_BL_10
+INSTR_CYCLES(1) | BRANCH_NEVER , //OP_BL_10
+INSTR_CYCLES(1) | BRANCH_NEVER , //OP_BL_10
+INSTR_CYCLES(1) | BRANCH_NEVER , //OP_BL_10
+INSTR_CYCLES(1) | BRANCH_NEVER , //OP_BL_10
+INSTR_CYCLES(1) | BRANCH_NEVER , //OP_BL_10
+INSTR_CYCLES(1) | BRANCH_NEVER , //OP_BL_10
+INSTR_CYCLES(1) | BRANCH_NEVER , //OP_BL_10
+INSTR_CYCLES(1) | BRANCH_NEVER , //OP_BL_10
+INSTR_CYCLES(1) | BRANCH_NEVER , //OP_BL_10
+INSTR_CYCLES(1) | BRANCH_NEVER , //OP_BL_10
+INSTR_CYCLES(1) | BRANCH_NEVER , //OP_BL_10
+INSTR_CYCLES(1) | BRANCH_NEVER , //OP_BL_10
+INSTR_CYCLES(1) | BRANCH_NEVER , //OP_BL_10
+INSTR_CYCLES(1) | BRANCH_NEVER , //OP_BL_10
+INSTR_CYCLES(1) | BRANCH_NEVER , //OP_BL_10
+INSTR_CYCLES(1) | BRANCH_NEVER , //OP_BL_10
+INSTR_CYCLES(1) | BRANCH_NEVER , //OP_BL_10
+INSTR_CYCLES(1) | BRANCH_NEVER , //OP_BL_10
+INSTR_CYCLES(1) | BRANCH_NEVER , //OP_BL_10
+INSTR_CYCLES(1) | BRANCH_NEVER , //OP_BL_10
+INSTR_CYCLES(1) | BRANCH_NEVER , //OP_BL_10
+INSTR_CYCLES(1) | BRANCH_NEVER , //OP_BL_10
+INSTR_CYCLES(1) | BRANCH_NEVER , //OP_BL_10
+INSTR_CYCLES(1) | BRANCH_NEVER , //OP_BL_10
+INSTR_CYCLES(1) | BRANCH_NEVER , //OP_BL_10
+INSTR_CYCLES(1) | BRANCH_NEVER , //OP_BL_10
+INSTR_CYCLES(1) | BRANCH_NEVER , //OP_BL_10
+INSTR_CYCLES(4) | BRANCH_ALWAYS, //OP_BL_11
+INSTR_CYCLES(4) | BRANCH_ALWAYS, //OP_BL_11
+INSTR_CYCLES(4) | BRANCH_ALWAYS, //OP_BL_11
+INSTR_CYCLES(4) | BRANCH_ALWAYS, //OP_BL_11
+INSTR_CYCLES(4) | BRANCH_ALWAYS, //OP_BL_11
+INSTR_CYCLES(4) | BRANCH_ALWAYS, //OP_BL_11
+INSTR_CYCLES(4) | BRANCH_ALWAYS, //OP_BL_11
+INSTR_CYCLES(4) | BRANCH_ALWAYS, //OP_BL_11
+INSTR_CYCLES(4) | BRANCH_ALWAYS, //OP_BL_11
+INSTR_CYCLES(4) | BRANCH_ALWAYS, //OP_BL_11
+INSTR_CYCLES(4) | BRANCH_ALWAYS, //OP_BL_11
+INSTR_CYCLES(4) | BRANCH_ALWAYS, //OP_BL_11
+INSTR_CYCLES(4) | BRANCH_ALWAYS, //OP_BL_11
+INSTR_CYCLES(4) | BRANCH_ALWAYS, //OP_BL_11
+INSTR_CYCLES(4) | BRANCH_ALWAYS, //OP_BL_11
+INSTR_CYCLES(4) | BRANCH_ALWAYS, //OP_BL_11
+INSTR_CYCLES(4) | BRANCH_ALWAYS, //OP_BL_11
+INSTR_CYCLES(4) | BRANCH_ALWAYS, //OP_BL_11
+INSTR_CYCLES(4) | BRANCH_ALWAYS, //OP_BL_11
+INSTR_CYCLES(4) | BRANCH_ALWAYS, //OP_BL_11
+INSTR_CYCLES(4) | BRANCH_ALWAYS, //OP_BL_11
+INSTR_CYCLES(4) | BRANCH_ALWAYS, //OP_BL_11
+INSTR_CYCLES(4) | BRANCH_ALWAYS, //OP_BL_11
+INSTR_CYCLES(4) | BRANCH_ALWAYS, //OP_BL_11
+INSTR_CYCLES(4) | BRANCH_ALWAYS, //OP_BL_11
+INSTR_CYCLES(4) | BRANCH_ALWAYS, //OP_BL_11
+INSTR_CYCLES(4) | BRANCH_ALWAYS, //OP_BL_11
+INSTR_CYCLES(4) | BRANCH_ALWAYS, //OP_BL_11
+INSTR_CYCLES(4) | BRANCH_ALWAYS, //OP_BL_11
+INSTR_CYCLES(4) | BRANCH_ALWAYS, //OP_BL_11
+INSTR_CYCLES(4) | BRANCH_ALWAYS, //OP_BL_11
+INSTR_CYCLES(4) | BRANCH_ALWAYS, //OP_BL_11
+};

audacious-plugins-3.6.2-gtk3.tar.bz2/src/xsf/desmume/instruction_tabdef.inc -> audacious-plugins-4.4.1.tar.bz2/src/xsf/desmume/instruction_tabdef.inc Changed

@@ -1,4400 +1,4369 @@
-/* Copyright (C) 2006 yopyop
- yopyop156@ifrance.com
- yopyop156.ifrance.com
-
- This file is part of DeSmuME
-
- DeSmuME 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.
-
- DeSmuME 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 DeSmuME; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+/*
+	Copyright (C) 2006 yopyop
+	Copyright (C) 2007-2012 DeSmuME team
+	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
+	(at your option) any later version.
+
+	This file 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 the this software. If not, see <http://www.gnu.org/licenses/>.
 */
 
-TYPE_RETOUR (*CALLTYPE NOM_TAB4096)(PARAMETRES)={
- OP_AND_LSL_IMM, // 000 0000 0 0000
- OP_AND_LSL_REG, // 000 0000 0 0001
- OP_AND_LSR_IMM, // 000 0000 0 0010
- OP_AND_LSR_REG, // 000 0000 0 0011
- OP_AND_ASR_IMM, // 000 0000 0 0100
- OP_AND_ASR_REG, // 000 0000 0 0101
- OP_AND_ROR_IMM, // 000 0000 0 0110
- OP_AND_ROR_REG, // 000 0000 0 0111
- 
- OP_AND_LSL_IMM, // 000 0000 0 1000
- OP_MUL, // 000 0000 0 1001
- OP_AND_LSR_IMM, // OOO OOOO O 1010
- OP_STRH_POS_INDE_M_REG_OFF, // 000 0000 0 1011
- OP_AND_ASR_IMM, // 000 0000 0 1100
- OP_LDRD_STRD_POST_INDEX,
- // 000 0000 0 1101
- OP_AND_ROR_IMM, // 000 0000 0 1110
- OP_LDRD_STRD_POST_INDEX,
- // 000 0000 0 1111
- 
- OP_AND_S_LSL_IMM, // 000 0000 1 0000
- OP_AND_S_LSL_REG, // 000 0000 1 0001
- OP_AND_S_LSR_IMM, // 000 0000 1 0010
- OP_AND_S_LSR_REG, // 000 0000 1 0011
- OP_AND_S_ASR_IMM, // 000 0000 1 0100
- OP_AND_S_ASR_REG, // 000 0000 1 0101
- OP_AND_S_ROR_IMM, // 000 0000 1 0110
- OP_AND_S_ROR_REG, // 000 0000 1 0111
- 
- OP_AND_S_LSL_IMM, // 000 0000 1 1000
- OP_MUL_S, // 000 0000 1 1001
- OP_AND_S_LSR_IMM, // 000 0000 1 1010
- OP_LDRH_POS_INDE_M_REG_OFF, // 000 0000 1 1011
- OP_AND_S_ASR_IMM, // 000 0000 1 1100
- OP_LDRSB_POS_INDE_M_REG_OFF,// 000 0000 1 1101
- OP_AND_S_ROR_IMM, // 000 0000 1 1110
- OP_LDRSH_POS_INDE_M_REG_OFF,// 000 0000 1 1111
- 
- OP_EOR_LSL_IMM, // 000 0001 0 0000
- OP_EOR_LSL_REG, // 000 0001 0 0001
- OP_EOR_LSR_IMM, // 000 0001 0 0010
- OP_EOR_LSR_REG, // 000 0001 0 0011
- OP_EOR_ASR_IMM, // 000 0001 0 0100
- OP_EOR_ASR_REG, // 000 0001 0 0101
- OP_EOR_ROR_IMM, // 000 0001 0 0110
- OP_EOR_ROR_REG, // 000 0001 0 0111
- 
- OP_EOR_LSL_IMM, // 000 0001 0 1000
- OP_MLA, // 000 0001 0 1001
- OP_EOR_LSR_IMM, // OOO OOO1 O 1010
- OP_UND, // 000 0001 0 1011
- OP_EOR_ASR_IMM, // 000 0001 0 1100
- OP_UND, // 000 0001 0 1101
- OP_EOR_ROR_IMM, // 000 0001 0 1110
- OP_UND, // 000 0001 0 1111
- 
- OP_EOR_S_LSL_IMM, // 000 0001 1 0000
- OP_EOR_S_LSL_REG, // 000 0001 1 0001
- OP_EOR_S_LSR_IMM, // 000 0001 1 0010
- OP_EOR_S_LSR_REG, // 000 0001 1 0011
- OP_EOR_S_ASR_IMM, // 000 0001 1 0100
- OP_EOR_S_ASR_REG, // 000 0001 1 0101
- OP_EOR_S_ROR_IMM, // 000 0001 1 0110
- OP_EOR_S_ROR_REG, // 000 0001 1 0111
- 
- OP_EOR_S_LSL_IMM, // 000 0001 1 1000
- OP_MLA_S, // 000 0001 1 1001
- OP_EOR_S_LSR_IMM, // 000 0001 1 1010
- OP_UND, // 000 0001 1 1011
- OP_EOR_S_ASR_IMM, // 000 0001 1 1100
- OP_UND, // 000 0001 1 1101
- OP_EOR_S_ROR_IMM, // 000 0001 1 1110
- OP_UND, // 000 0001 1 1111
-
- OP_SUB_LSL_IMM, // 000 0010 0 0000
- OP_SUB_LSL_REG, // 000 0010 0 0001
- OP_SUB_LSR_IMM, // 000 0010 0 0010
- OP_SUB_LSR_REG, // 000 0010 0 0011
- OP_SUB_ASR_IMM, // 000 0010 0 0100
- OP_SUB_ASR_REG, // 000 0010 0 0101
- OP_SUB_ROR_IMM, // 000 0010 0 0110
- OP_SUB_ROR_REG, // 000 0010 0 0111
- 
- OP_SUB_LSL_IMM, // 000 0010 0 1000
- OP_UND, // 000 0010 0 1001
- OP_SUB_LSR_IMM, // OOO OO1O O 1010
- OP_STRH_POS_INDE_M_IMM_OFF, // 000 0010 0 1011
- OP_SUB_ASR_IMM, // 000 0010 0 1100
- OP_LDRD_STRD_POST_INDEX,
- // 000 0010 0 1101
- OP_SUB_ROR_IMM, // 000 0010 0 1110
- OP_LDRD_STRD_POST_INDEX,
- // 000 0010 0 1111
- 
- OP_SUB_S_LSL_IMM, // 000 0010 1 0000
- OP_SUB_S_LSL_REG, // 000 0010 1 0001
- OP_SUB_S_LSR_IMM, // 000 0010 1 0010
- OP_SUB_S_LSR_REG, // 000 0010 1 0011
- OP_SUB_S_ASR_IMM, // 000 0010 1 0100
- OP_SUB_S_ASR_REG, // 000 0010 1 0101
- OP_SUB_S_ROR_IMM, // 000 0010 1 0110
- OP_SUB_S_ROR_REG, // 000 0010 1 0111
- 
- OP_SUB_S_LSL_IMM, // 000 0010 1 1000
- OP_UND, // 000 0010 1 1001
- OP_SUB_S_LSR_IMM, // 000 0010 1 1010
- OP_LDRH_POS_INDE_M_IMM_OFF, // 000 0010 1 1011
- OP_SUB_S_ASR_IMM, // 000 0010 1 1100
- OP_LDRSB_POS_INDE_M_IMM_OFF,// 000 0010 1 1101
- OP_SUB_S_ROR_IMM, // 000 0010 1 1110
- OP_LDRSH_POS_INDE_M_IMM_OFF,// 000 0010 1 1111
-//-------------------- 
- OP_RSB_LSL_IMM, // 000 0011 0 0000
- OP_RSB_LSL_REG, // 000 0011 0 0001
- OP_RSB_LSR_IMM, // 000 0011 0 0010
- OP_RSB_LSR_REG, // 000 0011 0 0011
- OP_RSB_ASR_IMM, // 000 0011 0 0100
- OP_RSB_ASR_REG, // 000 0011 0 0101
- OP_RSB_ROR_IMM, // 000 0011 0 0110
- OP_RSB_ROR_REG, // 000 0011 0 0111
- 
- OP_RSB_LSL_IMM, // 000 0011 0 1000
- OP_UND, // 000 0011 0 1001
- OP_RSB_LSR_IMM, // OOO OO11 O 1010
- OP_UND, // 000 0011 0 1011
- OP_RSB_ASR_IMM, // 000 0011 0 1100
- OP_UND, // 000 0011 0 1101
- OP_RSB_ROR_IMM, // 000 0011 0 1110
- OP_UND, // 000 0011 0 1111
- 
- OP_RSB_S_LSL_IMM, // 000 0011 1 0000
- OP_RSB_S_LSL_REG, // 000 0011 1 0001
- OP_RSB_S_LSR_IMM, // 000 0011 1 0010
- OP_RSB_S_LSR_REG, // 000 0011 1 0011
- OP_RSB_S_ASR_IMM, // 000 0011 1 0100
- OP_RSB_S_ASR_REG, // 000 0011 1 0101
- OP_RSB_S_ROR_IMM, // 000 0011 1 0110
- OP_RSB_S_ROR_REG, // 000 0011 1 0111
- 
- OP_RSB_S_LSL_IMM, // 000 0011 1 1000
- OP_UND, // 000 0011 1 1001
- OP_RSB_S_LSR_IMM, // 000 0011 1 1010
- OP_UND, // 000 0011 1 1011
- OP_RSB_S_ASR_IMM, // 000 0011 1 1100
- OP_UND, // 000 0011 1 1101
- OP_RSB_S_ROR_IMM, // 000 0011 1 1110
- OP_UND, // 000 0011 1 1111
-//--------------------------
- OP_ADD_LSL_IMM, // 000 0100 0 0000
- OP_ADD_LSL_REG, // 000 0100 0 0001
- OP_ADD_LSR_IMM, // 000 0100 0 0010
- OP_ADD_LSR_REG, // 000 0100 0 0011
- OP_ADD_ASR_IMM, // 000 0100 0 0100
- OP_ADD_ASR_REG, // 000 0100 0 0101
- OP_ADD_ROR_IMM, // 000 0100 0 0110
- OP_ADD_ROR_REG, // 000 0100 0 0111
- 
- OP_ADD_LSL_IMM, // 000 0100 0 1000
- OP_UMULL, // 000 0100 0 1001
- OP_ADD_LSR_IMM, // OOO O10O O 1010
- OP_STRH_POS_INDE_P_REG_OFF, // 000 0100 0 1011
- OP_ADD_ASR_IMM, // 000 0100 0 1100
- OP_LDRD_STRD_POST_INDEX,
- // 000 0100 0 1101
- OP_ADD_ROR_IMM, // 000 0100 0 1110
- OP_LDRD_STRD_POST_INDEX,
- // 000 0100 0 1111
- 
- OP_ADD_S_LSL_IMM, // 000 0100 1 0000
- OP_ADD_S_LSL_REG, // 000 0100 1 0001
- OP_ADD_S_LSR_IMM, // 000 0100 1 0010
- OP_ADD_S_LSR_REG, // 000 0100 1 0011
- OP_ADD_S_ASR_IMM, // 000 0100 1 0100
- OP_ADD_S_ASR_REG, // 000 0100 1 0101
- OP_ADD_S_ROR_IMM, // 000 0100 1 0110
- OP_ADD_S_ROR_REG, // 000 0100 1 0111
- 
- OP_ADD_S_LSL_IMM, // 000 0100 1 1000
- OP_UMULL_S, // 000 0100 1 1001
- OP_ADD_S_LSR_IMM, // 000 0100 1 1010
- OP_LDRH_POS_INDE_P_REG_OFF, // 000 0100 1 1011
- OP_ADD_S_ASR_IMM, // 000 0100 1 1100
- OP_LDRSB_POS_INDE_P_REG_OFF,// 000 0100 1 1101
- OP_ADD_S_ROR_IMM, // 000 0100 1 1110
- OP_LDRSH_POS_INDE_P_REG_OFF,// 000 0100 1 1111
-//-----------------------------------------
- OP_ADC_LSL_IMM, // 000 0101 0 0000
- OP_ADC_LSL_REG, // 000 0101 0 0001
- OP_ADC_LSR_IMM, // 000 0101 0 0010
- OP_ADC_LSR_REG, // 000 0101 0 0011
- OP_ADC_ASR_IMM, // 000 0101 0 0100
- OP_ADC_ASR_REG, // 000 0101 0 0101
- OP_ADC_ROR_IMM, // 000 0101 0 0110
- OP_ADC_ROR_REG, // 000 0101 0 0111
- 
- OP_ADC_LSL_IMM, // 000 0101 0 1000
- OP_UMLAL, // 000 0101 0 1001
- OP_ADC_LSR_IMM, // OOO O101 O 1010
- OP_UND, // 000 0101 0 1011
- OP_ADC_ASR_IMM, // 000 0101 0 1100
- OP_UND, // 000 0101 0 1101
- OP_ADC_ROR_IMM, // 000 0101 0 1110
- OP_UND, // 000 0101 0 1111
- 
- OP_ADC_S_LSL_IMM, // 000 0101 1 0000
- OP_ADC_S_LSL_REG, // 000 0101 1 0001
- OP_ADC_S_LSR_IMM, // 000 0101 1 0010
- OP_ADC_S_LSR_REG, // 000 0101 1 0011
- OP_ADC_S_ASR_IMM, // 000 0101 1 0100
- OP_ADC_S_ASR_REG, // 000 0101 1 0101
- OP_ADC_S_ROR_IMM, // 000 0101 1 0110
- OP_ADC_S_ROR_REG, // 000 0101 1 0111
- 
- OP_ADC_S_LSL_IMM, // 000 0101 1 1000
- OP_UMLAL_S, // 000 0101 1 1001
- OP_ADC_S_LSR_IMM, // 000 0101 1 1010
- OP_UND, // 000 0101 1 1011
- OP_ADC_S_ASR_IMM, // 000 0101 1 1100
- OP_UND, // 000 0101 1 1101
- OP_ADC_S_ROR_IMM, // 000 0101 1 1110
- OP_UND, // 000 0101 1 1111
-//------------------------------------------
- OP_SBC_LSL_IMM, // 000 0110 0 0000
- OP_SBC_LSL_REG, // 000 0110 0 0001
- OP_SBC_LSR_IMM, // 000 0110 0 0010
- OP_SBC_LSR_REG, // 000 0110 0 0011
- OP_SBC_ASR_IMM, // 000 0110 0 0100
- OP_SBC_ASR_REG, // 000 0110 0 0101
- OP_SBC_ROR_IMM, // 000 0110 0 0110
- OP_SBC_ROR_REG, // 000 0110 0 0111
- 
- OP_SBC_LSL_IMM, // 000 0110 0 1000
- OP_SMULL, // 000 0110 0 1001
- OP_SBC_LSR_IMM, // OOO O11O O 1010
- OP_STRH_POS_INDE_P_IMM_OFF, // 000 0110 0 1011
- OP_SBC_ASR_IMM, // 000 0110 0 1100
- OP_LDRD_STRD_POST_INDEX,
- // 000 0110 0 1101
- OP_SBC_ROR_IMM, // 000 0110 0 1110
- OP_LDRD_STRD_POST_INDEX,
- // 000 0110 0 1111
- 
- OP_SBC_S_LSL_IMM, // 000 0110 1 0000
- OP_SBC_S_LSL_REG, // 000 0110 1 0001
- OP_SBC_S_LSR_IMM, // 000 0110 1 0010
- OP_SBC_S_LSR_REG, // 000 0110 1 0011
- OP_SBC_S_ASR_IMM, // 000 0110 1 0100
- OP_SBC_S_ASR_REG, // 000 0110 1 0101
- OP_SBC_S_ROR_IMM, // 000 0110 1 0110
- OP_SBC_S_ROR_REG, // 000 0110 1 0111
- 
- OP_SBC_S_LSL_IMM, // 000 0110 1 1000
- OP_SMULL_S, // 000 0110 1 1001
- OP_SBC_S_LSR_IMM, // 000 0110 1 1010
- OP_LDRH_POS_INDE_P_IMM_OFF, // 000 0110 1 1011
- OP_SBC_S_ASR_IMM, // 000 0110 1 1100
- OP_LDRSB_POS_INDE_P_IMM_OFF,// 000 0110 1 1101
- OP_SBC_S_ROR_IMM, // 000 0110 1 1110
- OP_LDRSH_POS_INDE_P_IMM_OFF,// 000 0110 1 1111
-//------------------------------------------
- OP_RSC_LSL_IMM, // 000 0111 0 0000
- OP_RSC_LSL_REG, // 000 0111 0 0001
- OP_RSC_LSR_IMM, // 000 0111 0 0010
- OP_RSC_LSR_REG, // 000 0111 0 0011
- OP_RSC_ASR_IMM, // 000 0111 0 0100
- OP_RSC_ASR_REG, // 000 0111 0 0101
- OP_RSC_ROR_IMM, // 000 0111 0 0110
- OP_RSC_ROR_REG, // 000 0111 0 0111
- 
- OP_RSC_LSL_IMM, // 000 0111 0 1000
- OP_SMLAL, // 000 0111 0 1001
- OP_RSC_LSR_IMM, // OOO O111 O 1010
- OP_UND, // 000 0111 0 1011
- OP_RSC_ASR_IMM, // 000 0111 0 1100
- OP_UND, // 000 0111 0 1101
- OP_RSC_ROR_IMM, // 000 0111 0 1110
- OP_UND, // 000 0111 0 1111
- 
- OP_RSC_S_LSL_IMM, // 000 0111 1 0000
- OP_RSC_S_LSL_REG, // 000 0111 1 0001
- OP_RSC_S_LSR_IMM, // 000 0111 1 0010
- OP_RSC_S_LSR_REG, // 000 0111 1 0011
- OP_RSC_S_ASR_IMM, // 000 0111 1 0100
- OP_RSC_S_ASR_REG, // 000 0111 1 0101
- OP_RSC_S_ROR_IMM, // 000 0111 1 0110
- OP_RSC_S_ROR_REG, // 000 0111 1 0111
- 
- OP_RSC_S_LSL_IMM, // 000 0111 1 1000
- OP_SMLAL_S, // 000 0111 1 1001
- OP_RSC_S_LSR_IMM, // 000 0111 1 1010
- OP_UND, // 000 0111 1 1011
- OP_RSC_S_ASR_IMM, // 000 0111 1 1100
- OP_UND, // 000 0111 1 1101
- OP_RSC_S_ROR_IMM, // 000 0111 1 1110
- OP_UND, // 000 0111 1 1111
-//------------------------------------------
- OP_MRS_CPSR, // 000 1000 0 0000
- OP_UND, // 000 1000 0 0001
- OP_UND, // 000 1000 0 0010
- OP_UND, // 000 1000 0 0011
- OP_UND, // 000 1000 0 0100
- OP_QADD, // 000 1000 0 0101
- OP_UND, // 000 1000 0 0110
- OP_UND, // 000 1000 0 0111 
- 
- OP_SMLA_B_B, // 000 1000 0 1000
- OP_SWP, // 000 1000 0 1001
- OP_SMLA_T_B, // 000 1000 0 1010
- OP_STRH_M_REG_OFF, // 000 1000 0 1011
- OP_SMLA_B_T, // 000 1000 0 1100
- OP_LDRD_STRD_OFFSET_PRE_INDEX,
- // 000 1000 0 1101
- OP_SMLA_T_T, // 000 1000 0 1110
- OP_LDRD_STRD_OFFSET_PRE_INDEX,
- // 000 1000 0 1111
-
- OP_TST_LSL_IMM, // 000 1000 1 0000
- OP_TST_LSL_REG, // 000 1000 1 0001
- OP_TST_LSR_IMM, // 000 1000 1 0010
- OP_TST_LSR_REG, // 000 1000 1 0011
- OP_TST_ASR_IMM, // 000 1000 1 0100
- OP_TST_ASR_REG, // 000 1000 1 0101
- OP_TST_ROR_IMM, // 000 1000 1 0110
- OP_TST_ROR_REG, // 000 1000 1 0111
- 
- OP_TST_LSL_IMM, // 000 1000 1 1000
- OP_UND, // 000 1000 1 1001
- OP_TST_LSR_IMM, // OOO 100O 1 1010
- OP_LDRH_M_REG_OFF, // 000 1000 1 1011
- OP_TST_ASR_IMM, // 000 1000 1 1100
- OP_LDRSB_M_REG_OFF,// 000 1000 1 1101
- OP_TST_ROR_IMM, // 000 1000 1 1110
- OP_LDRSH_M_REG_OFF,// 000 1000 1 1111
-//------------------------------------------
- OP_MSR_CPSR, // 000 1001 0 0000
- OP_BX, // 000 1001 0 0001
- OP_UND, // 000 1001 0 0010
- OP_BLX_REG, // 000 1001 0 0011
- OP_UND, // 000 1001 0 0100
- OP_QSUB, // 000 1001 0 0101
- OP_UND, // 000 1001 0 0110
- OP_BKPT, // 000 1001 0 0111 
- 
- OP_SMLAW_B, // 000 1001 0 1000
- OP_UND, // 000 1001 0 1001
- OP_SMULW_B, // 000 1001 0 1010
- OP_STRH_PRE_INDE_M_REG_OFF, // 000 1001 0 1011
- OP_SMLAW_T, // 000 1001 0 1100
- OP_LDRD_STRD_OFFSET_PRE_INDEX,
- // 000 1001 0 1101
- OP_SMULW_T, // 000 1001 0 1110
- OP_LDRD_STRD_OFFSET_PRE_INDEX,
- // 000 1001 0 1111
- 
- OP_TEQ_LSL_IMM, // 000 1001 1 0000
- OP_TEQ_LSL_REG, // 000 1001 1 0001
- OP_TEQ_LSR_IMM, // 000 1001 1 0010
- OP_TEQ_LSR_REG, // 000 1001 1 0011
- OP_TEQ_ASR_IMM, // 000 1001 1 0100
- OP_TEQ_ASR_REG, // 000 1001 1 0101
- OP_TEQ_ROR_IMM, // 000 1001 1 0110
- OP_TEQ_ROR_REG, // 000 1001 1 0111
- 
- OP_TEQ_LSL_IMM, // 000 1001 1 1000
- OP_UND, // 000 1001 1 1001
- OP_TEQ_LSR_IMM, // OOO 1001 1 1010
- OP_LDRH_PRE_INDE_M_REG_OFF, // 000 1001 1 1011
- OP_TEQ_ASR_IMM, // 000 1001 1 1100
- OP_LDRSB_PRE_INDE_M_REG_OFF, // 000 1001 1 1101
- OP_TEQ_ROR_IMM, // 000 1001 1 1110
- OP_LDRSH_PRE_INDE_M_REG_OFF, // 000 1001 1 1111 
-//------------------------------------------
- OP_MRS_SPSR, // 000 1010 0 0000
- OP_UND, // 000 1010 0 0001
- OP_UND, // 000 1010 0 0010
- OP_UND, // 000 1010 0 0011
- OP_UND, // 000 1010 0 0100
- OP_QDADD, // 000 1010 0 0101
- OP_UND, // 000 1010 0 0110
- OP_UND, // 000 1010 0 0111
- 
- OP_SMLAL_B_B, // 000 1010 0 1000
- OP_SWPB, // 000 1010 0 1001
- OP_SMLAL_T_B, // 000 1010 0 1010
- OP_STRH_M_IMM_OFF, // 000 1010 0 1011
- OP_SMLAL_B_T, // 000 1010 0 1100
- OP_LDRD_STRD_OFFSET_PRE_INDEX,
- // 000 1010 0 1101
- OP_SMLAL_T_T, // 000 1010 0 1110
- OP_LDRD_STRD_OFFSET_PRE_INDEX,
- // 000 1010 0 1111
- 
- OP_CMP_LSL_IMM, // 000 1010 1 0000
- OP_CMP_LSL_REG, // 000 1010 1 0001
- OP_CMP_LSR_IMM, // 000 1010 1 0010
- OP_CMP_LSR_REG, // 000 1010 1 0011
- OP_CMP_ASR_IMM, // 000 1010 1 0100
- OP_CMP_ASR_REG, // 000 1010 1 0101
- OP_CMP_ROR_IMM, // 000 1010 1 0110
- OP_CMP_ROR_REG, // 000 1010 1 0111
- 
- OP_CMP_LSL_IMM, // 000 1010 1 1000
- OP_UND, // 000 1010 1 1001
- OP_CMP_LSR_IMM, // OOO 1O1O 1 1010
- OP_LDRH_M_IMM_OFF, // 000 1010 1 1011
- OP_CMP_ASR_IMM, // 000 1010 1 1100
- OP_LDRSB_M_IMM_OFF,// 000 1010 1 1101
- OP_CMP_ROR_IMM, // 000 1010 1 1110
- OP_LDRSH_M_IMM_OFF,// 000 1010 1 1111
-//------------------------------------------
- OP_MSR_SPSR, // 000 1011 0 0000
- OP_CLZ, // 000 1011 0 0001
- OP_UND, // 000 1011 0 0010
- OP_UND, // 000 1011 0 0011
- OP_UND, // 000 1011 0 0100
- OP_QDSUB, // 000 1011 0 0101
- OP_UND, // 000 1011 0 0110
- OP_UND, // 000 1011 0 0111
- 
- OP_SMUL_B_B, // 000 1011 0 1000
- OP_UND, // 000 1011 0 1001
- OP_SMUL_T_B, // 000 1011 0 1010
- OP_STRH_PRE_INDE_M_IMM_OFF, // 000 1011 0 1011
- OP_SMUL_B_T, // 000 1011 0 1100
- OP_LDRD_STRD_OFFSET_PRE_INDEX,
- // 000 1011 0 1101
- OP_SMUL_T_T, // 000 1011 0 1110
- OP_LDRD_STRD_OFFSET_PRE_INDEX,
- // 000 1011 0 1111
-
- OP_CMN_LSL_IMM, // 000 1011 1 0000
- OP_CMN_LSL_REG, // 000 1011 1 0001
- OP_CMN_LSR_IMM, // 000 1011 1 0010
- OP_CMN_LSR_REG, // 000 1011 1 0011
- OP_CMN_ASR_IMM, // 000 1011 1 0100
- OP_CMN_ASR_REG, // 000 1011 1 0101
- OP_CMN_ROR_IMM, // 000 1011 1 0110
- OP_CMN_ROR_REG, // 000 1011 1 0111
- 
- OP_CMN_LSL_IMM, // 000 1011 1 1000
- OP_UND, // 000 1011 1 1001
- OP_CMN_LSR_IMM, // OOO 1O11 1 1010
- OP_LDRH_PRE_INDE_M_IMM_OFF, // 000 1011 1 1011
- OP_CMN_ASR_IMM, // 000 1011 1 1100
- OP_LDRSB_PRE_INDE_M_IMM_OFF, // 000 1011 1 1101
- OP_CMN_ROR_IMM, // 000 1011 1 1110
- OP_LDRSH_PRE_INDE_M_IMM_OFF, // 000 1011 1 1111
-//------------------------------------------
- OP_ORR_LSL_IMM, // 000 1100 0 0000
- OP_ORR_LSL_REG, // 000 1100 0 0001
- OP_ORR_LSR_IMM, // 000 1100 0 0010
- OP_ORR_LSR_REG, // 000 1100 0 0011
- OP_ORR_ASR_IMM, // 000 1100 0 0100
- OP_ORR_ASR_REG, // 000 1100 0 0101
- OP_ORR_ROR_IMM, // 000 1100 0 0110
- OP_ORR_ROR_REG, // 000 1100 0 0111
- 
- OP_ORR_LSL_IMM, // 000 1100 0 1000
- OP_UND, // 000 1100 0 1001
- OP_ORR_LSR_IMM, // OOO 110O O 1010
- OP_STRH_P_REG_OFF, // 000 1100 0 1011
- OP_ORR_ASR_IMM, // 000 1100 0 1100
- OP_LDRD_STRD_OFFSET_PRE_INDEX,
- // 000 1100 0 1101
- OP_ORR_ROR_IMM, // 000 1100 0 1110
- OP_LDRD_STRD_OFFSET_PRE_INDEX,
- // 000 1100 0 1111
- 
- OP_ORR_S_LSL_IMM, // 000 1100 1 0000
- OP_ORR_S_LSL_REG, // 000 1100 1 0001
- OP_ORR_S_LSR_IMM, // 000 1100 1 0010
- OP_ORR_S_LSR_REG, // 000 1100 1 0011
- OP_ORR_S_ASR_IMM, // 000 1100 1 0100
- OP_ORR_S_ASR_REG, // 000 1100 1 0101
- OP_ORR_S_ROR_IMM, // 000 1100 1 0110
- OP_ORR_S_ROR_REG, // 000 1100 1 0111
- 
- OP_ORR_S_LSL_IMM, // 000 1100 1 1000
- OP_UND, // 000 1100 1 1001
- OP_ORR_S_LSR_IMM, // 000 1100 1 1010
- OP_LDRH_P_REG_OFF, // 000 1100 1 1011
- OP_ORR_S_ASR_IMM, // 000 1100 1 1100
- OP_LDRSB_P_REG_OFF,// 000 1100 1 1101
- OP_ORR_S_ROR_IMM, // 000 1100 1 1110
- OP_LDRSH_P_REG_OFF,// 000 1100 1 1111
-//------------------------------------------
- OP_MOV_LSL_IMM, // 000 1101 0 0000
- OP_MOV_LSL_REG, // 000 1101 0 0001
- OP_MOV_LSR_IMM, // 000 1101 0 0010
- OP_MOV_LSR_REG, // 000 1101 0 0011
- OP_MOV_ASR_IMM, // 000 1101 0 0100
- OP_MOV_ASR_REG, // 000 1101 0 0101
- OP_MOV_ROR_IMM, // 000 1101 0 0110
- OP_MOV_ROR_REG, // 000 1101 0 0111
- 
- OP_MOV_LSL_IMM, // 000 1101 0 1000
- OP_UND, // 000 1101 0 1001
- OP_MOV_LSR_IMM, // OOO 1101 O 1010
- OP_STRH_PRE_INDE_P_REG_OFF, // 000 1101 0 1011
- OP_MOV_ASR_IMM, // 000 1101 0 1100
- OP_LDRD_STRD_OFFSET_PRE_INDEX,
- // 000 1101 0 1101
- OP_MOV_ROR_IMM, // 000 1101 0 1110
- OP_LDRD_STRD_OFFSET_PRE_INDEX,
- // 000 1101 0 1111
- 
- OP_MOV_S_LSL_IMM, // 000 1101 1 0000
- OP_MOV_S_LSL_REG, // 000 1101 1 0001
- OP_MOV_S_LSR_IMM, // 000 1101 1 0010
- OP_MOV_S_LSR_REG, // 000 1101 1 0011
- OP_MOV_S_ASR_IMM, // 000 1101 1 0100
- OP_MOV_S_ASR_REG, // 000 1101 1 0101
- OP_MOV_S_ROR_IMM, // 000 1101 1 0110
- OP_MOV_S_ROR_REG, // 000 1101 1 0111
- 
- OP_MOV_S_LSL_IMM, // 000 1101 1 1000
- OP_UND, // 000 1101 1 1001
- OP_MOV_S_LSR_IMM, // 000 1101 1 1010
- OP_LDRH_PRE_INDE_P_REG_OFF, // 000 1101 1 1011
- OP_MOV_S_ASR_IMM, // 000 1101 1 1100
- OP_LDRSB_PRE_INDE_P_REG_OFF,// 000 1101 1 1101
- OP_MOV_S_ROR_IMM, // 000 1101 1 1110
- OP_LDRSH_PRE_INDE_P_REG_OFF,// 000 1101 1 1111
-//------------------------------------------
- OP_BIC_LSL_IMM, // 000 1110 0 0000
- OP_BIC_LSL_REG, // 000 1110 0 0001
- OP_BIC_LSR_IMM, // 000 1110 0 0010
- OP_BIC_LSR_REG, // 000 1110 0 0011
- OP_BIC_ASR_IMM, // 000 1110 0 0100
- OP_BIC_ASR_REG, // 000 1110 0 0101
- OP_BIC_ROR_IMM, // 000 1110 0 0110
- OP_BIC_ROR_REG, // 000 1110 0 0111
- 
- OP_BIC_LSL_IMM, // 000 1110 0 1000
- OP_UND, // 000 1110 0 1001
- OP_BIC_LSR_IMM, // OOO 111O O 1010
- OP_STRH_P_IMM_OFF, // 000 1110 0 1011
- OP_BIC_ASR_IMM, // 000 1110 0 1100
- OP_LDRD_STRD_OFFSET_PRE_INDEX,
- // 000 1110 0 1101
- OP_BIC_ROR_IMM, // 000 1110 0 1110
- OP_LDRD_STRD_OFFSET_PRE_INDEX,
- // 000 1110 0 1111
- 
- OP_BIC_S_LSL_IMM, // 000 1110 1 0000
- OP_BIC_S_LSL_REG, // 000 1110 1 0001
- OP_BIC_S_LSR_IMM, // 000 1110 1 0010
- OP_BIC_S_LSR_REG, // 000 1110 1 0011
- OP_BIC_S_ASR_IMM, // 000 1110 1 0100
- OP_BIC_S_ASR_REG, // 000 1110 1 0101
- OP_BIC_S_ROR_IMM, // 000 1110 1 0110
- OP_BIC_S_ROR_REG, // 000 1110 1 0111
- 
- OP_BIC_S_LSL_IMM, // 000 1110 1 1000
- OP_UND, // 000 1110 1 1001
- OP_BIC_S_LSR_IMM, // 000 1110 1 1010
- OP_LDRH_P_IMM_OFF, // 000 1110 1 1011
- OP_BIC_S_ASR_IMM, // 000 1110 1 1100
- OP_LDRSB_P_IMM_OFF,// 000 1110 1 1101
- OP_BIC_S_ROR_IMM, // 000 1110 1 1110
- OP_LDRSH_P_IMM_OFF,// 000 1110 1 1111
-//-------------------------------------------
- OP_MVN_LSL_IMM, // 000 1111 0 0000
- OP_MVN_LSL_REG, // 000 1111 0 0001
- OP_MVN_LSR_IMM, // 000 1111 0 0010
- OP_MVN_LSR_REG, // 000 1111 0 0011
- OP_MVN_ASR_IMM, // 000 1111 0 0100
- OP_MVN_ASR_REG, // 000 1111 0 0101
- OP_MVN_ROR_IMM, // 000 1111 0 0110
- OP_MVN_ROR_REG, // 000 1111 0 0111
- 
- OP_MVN_LSL_IMM, // 000 1111 0 1000
- OP_UND, // 000 1111 0 1001
- OP_MVN_LSR_IMM, // OOO 1111 O 1010
- OP_STRH_PRE_INDE_P_IMM_OFF, // 000 1111 0 1011
- OP_MVN_ASR_IMM, // 000 1111 0 1100
- OP_LDRD_STRD_OFFSET_PRE_INDEX,
- // 000 1111 0 1101
- OP_MVN_ROR_IMM, // 000 1111 0 1110
- OP_LDRD_STRD_OFFSET_PRE_INDEX,
- // 000 1111 0 1111
- 
- OP_MVN_S_LSL_IMM, // 000 1111 1 0000
- OP_MVN_S_LSL_REG, // 000 1111 1 0001
- OP_MVN_S_LSR_IMM, // 000 1111 1 0010
- OP_MVN_S_LSR_REG, // 000 1111 1 0011
- OP_MVN_S_ASR_IMM, // 000 1111 1 0100
- OP_MVN_S_ASR_REG, // 000 1111 1 0101
- OP_MVN_S_ROR_IMM, // 000 1111 1 0110
- OP_MVN_S_ROR_REG, // 000 1111 1 0111
- 
- OP_MVN_S_LSL_IMM, // 000 1111 1 1000
- OP_UND, // 000 1111 1 1001
- OP_MVN_S_LSR_IMM, // 000 1111 1 1010
- OP_LDRH_PRE_INDE_P_IMM_OFF, // 000 1111 1 1011
- OP_MVN_S_ASR_IMM, // 000 1111 1 1100
- OP_LDRSB_PRE_INDE_P_IMM_OFF,// 000 1111 1 1101
- OP_MVN_S_ROR_IMM, // 000 1111 1 1110
- OP_LDRSH_PRE_INDE_P_IMM_OFF,// 000 1111 1 1111
-//-------------------------------------------
- OP_AND_IMM_VAL, // 001 0000 0 0000
- OP_AND_IMM_VAL, // 001 0000 0 0001
- OP_AND_IMM_VAL, // 001 0000 0 0010
- OP_AND_IMM_VAL, // 001 0000 0 0011
- OP_AND_IMM_VAL, // 001 0000 0 0100
- OP_AND_IMM_VAL, // 001 0000 0 0101
- OP_AND_IMM_VAL, // 001 0000 0 0110
- OP_AND_IMM_VAL, // 001 0000 0 0111
- OP_AND_IMM_VAL, // 001 0000 0 1000
- OP_AND_IMM_VAL, // 001 0000 0 1001
- OP_AND_IMM_VAL, // 001 0000 0 1010
- OP_AND_IMM_VAL, // 001 0000 0 1011
- OP_AND_IMM_VAL, // 001 0000 0 1100
- OP_AND_IMM_VAL, // 001 0000 0 1101
- OP_AND_IMM_VAL, // 001 0000 0 1110
- OP_AND_IMM_VAL, // 001 0000 0 1111
- 
- OP_AND_S_IMM_VAL, // 001 0000 1 0000
- OP_AND_S_IMM_VAL, // 001 0000 1 0001
- OP_AND_S_IMM_VAL, // 001 0000 1 0010
- OP_AND_S_IMM_VAL, // 001 0000 1 0011
- OP_AND_S_IMM_VAL, // 001 0000 1 0100
- OP_AND_S_IMM_VAL, // 001 0000 1 0101
- OP_AND_S_IMM_VAL, // 001 0000 1 0110
- OP_AND_S_IMM_VAL, // 001 0000 1 0111
- OP_AND_S_IMM_VAL, // 001 0000 1 1000
- OP_AND_S_IMM_VAL, // 001 0000 1 1001
- OP_AND_S_IMM_VAL, // 001 0000 1 1010
- OP_AND_S_IMM_VAL, // 001 0000 1 1011
- OP_AND_S_IMM_VAL, // 001 0000 1 1100
- OP_AND_S_IMM_VAL, // 001 0000 1 1101
- OP_AND_S_IMM_VAL, // 001 0000 1 1110
- OP_AND_S_IMM_VAL, // 001 0000 1 1111
-//------------------------------------------
- OP_EOR_IMM_VAL, // 001 0001 0 0000
- OP_EOR_IMM_VAL, // 001 0001 0 0001
- OP_EOR_IMM_VAL, // 001 0001 0 0010
- OP_EOR_IMM_VAL, // 001 0001 0 0011
- OP_EOR_IMM_VAL, // 001 0001 0 0100
- OP_EOR_IMM_VAL, // 001 0001 0 0101
- OP_EOR_IMM_VAL, // 001 0001 0 0110
- OP_EOR_IMM_VAL, // 001 0001 0 0111
- OP_EOR_IMM_VAL, // 001 0001 0 1000
- OP_EOR_IMM_VAL, // 001 0001 0 1001
- OP_EOR_IMM_VAL, // 001 0001 0 1010
- OP_EOR_IMM_VAL, // 001 0001 0 1011
- OP_EOR_IMM_VAL, // 001 0001 0 1100
- OP_EOR_IMM_VAL, // 001 0001 0 1101
- OP_EOR_IMM_VAL, // 001 0001 0 1110
- OP_EOR_IMM_VAL, // 001 0001 0 1111
- 
- OP_EOR_S_IMM_VAL, // 001 0001 1 0000
- OP_EOR_S_IMM_VAL, // 001 0001 1 0001
- OP_EOR_S_IMM_VAL, // 001 0001 1 0010
- OP_EOR_S_IMM_VAL, // 001 0001 1 0011
- OP_EOR_S_IMM_VAL, // 001 0001 1 0100
- OP_EOR_S_IMM_VAL, // 001 0001 1 0101
- OP_EOR_S_IMM_VAL, // 001 0001 1 0110
- OP_EOR_S_IMM_VAL, // 001 0001 1 0111
- OP_EOR_S_IMM_VAL, // 001 0001 1 1000
- OP_EOR_S_IMM_VAL, // 001 0001 1 1001
- OP_EOR_S_IMM_VAL, // 001 0001 1 1010
- OP_EOR_S_IMM_VAL, // 001 0001 1 1011
- OP_EOR_S_IMM_VAL, // 001 0001 1 1100
- OP_EOR_S_IMM_VAL, // 001 0001 1 1101
- OP_EOR_S_IMM_VAL, // 001 0001 1 1110
- OP_EOR_S_IMM_VAL, // 001 0001 1 1111
-//------------------------------------------
- OP_SUB_IMM_VAL, // 001 0010 0 0000
- OP_SUB_IMM_VAL, // 001 0010 0 0001
- OP_SUB_IMM_VAL, // 001 0010 0 0010
- OP_SUB_IMM_VAL, // 001 0010 0 0011
- OP_SUB_IMM_VAL, // 001 0010 0 0100
- OP_SUB_IMM_VAL, // 001 0010 0 0101
- OP_SUB_IMM_VAL, // 001 0010 0 0110
- OP_SUB_IMM_VAL, // 001 0010 0 0111
- OP_SUB_IMM_VAL, // 001 0010 0 1000
- OP_SUB_IMM_VAL, // 001 0010 0 1001
- OP_SUB_IMM_VAL, // 001 0010 0 1010
- OP_SUB_IMM_VAL, // 001 0010 0 1011
- OP_SUB_IMM_VAL, // 001 0010 0 1100
- OP_SUB_IMM_VAL, // 001 0010 0 1101
- OP_SUB_IMM_VAL, // 001 0010 0 1110
- OP_SUB_IMM_VAL, // 001 0010 0 1111
- 
- OP_SUB_S_IMM_VAL, // 001 0010 1 0000
- OP_SUB_S_IMM_VAL, // 001 0010 1 0001
- OP_SUB_S_IMM_VAL, // 001 0010 1 0010
- OP_SUB_S_IMM_VAL, // 001 0010 1 0011
- OP_SUB_S_IMM_VAL, // 001 0010 1 0100
- OP_SUB_S_IMM_VAL, // 001 0010 1 0101
- OP_SUB_S_IMM_VAL, // 001 0010 1 0110
- OP_SUB_S_IMM_VAL, // 001 0010 1 0111
- OP_SUB_S_IMM_VAL, // 001 0010 1 1000
- OP_SUB_S_IMM_VAL, // 001 0010 1 1001
- OP_SUB_S_IMM_VAL, // 001 0010 1 1010
- OP_SUB_S_IMM_VAL, // 001 0010 1 1011
- OP_SUB_S_IMM_VAL, // 001 0010 1 1100
- OP_SUB_S_IMM_VAL, // 001 0010 1 1101
- OP_SUB_S_IMM_VAL, // 001 0010 1 1110
- OP_SUB_S_IMM_VAL, // 001 0010 1 1111
-//------------------------------------------
- OP_RSB_IMM_VAL, // 001 0011 0 0000
- OP_RSB_IMM_VAL, // 001 0011 0 0001
- OP_RSB_IMM_VAL, // 001 0011 0 0010
- OP_RSB_IMM_VAL, // 001 0011 0 0011
- OP_RSB_IMM_VAL, // 001 0011 0 0100
- OP_RSB_IMM_VAL, // 001 0011 0 0101
- OP_RSB_IMM_VAL, // 001 0011 0 0110
- OP_RSB_IMM_VAL, // 001 0011 0 0111
- OP_RSB_IMM_VAL, // 001 0011 0 1000
- OP_RSB_IMM_VAL, // 001 0011 0 1001
- OP_RSB_IMM_VAL, // 001 0011 0 1010
- OP_RSB_IMM_VAL, // 001 0011 0 1011
- OP_RSB_IMM_VAL, // 001 0011 0 1100
- OP_RSB_IMM_VAL, // 001 0011 0 1101
- OP_RSB_IMM_VAL, // 001 0011 0 1110
- OP_RSB_IMM_VAL, // 001 0011 0 1111
- 
- OP_RSB_S_IMM_VAL, // 001 0011 1 0000
- OP_RSB_S_IMM_VAL, // 001 0011 1 0001
- OP_RSB_S_IMM_VAL, // 001 0011 1 0010
- OP_RSB_S_IMM_VAL, // 001 0011 1 0011
- OP_RSB_S_IMM_VAL, // 001 0011 1 0100
- OP_RSB_S_IMM_VAL, // 001 0011 1 0101
- OP_RSB_S_IMM_VAL, // 001 0011 1 0110
- OP_RSB_S_IMM_VAL, // 001 0011 1 0111
- OP_RSB_S_IMM_VAL, // 001 0011 1 1000
- OP_RSB_S_IMM_VAL, // 001 0011 1 1001
- OP_RSB_S_IMM_VAL, // 001 0011 1 1010
- OP_RSB_S_IMM_VAL, // 001 0011 1 1011
- OP_RSB_S_IMM_VAL, // 001 0011 1 1100
- OP_RSB_S_IMM_VAL, // 001 0011 1 1101
- OP_RSB_S_IMM_VAL, // 001 0011 1 1110
- OP_RSB_S_IMM_VAL, // 001 0011 1 1111
-//------------------------------------------
- OP_ADD_IMM_VAL, // 001 0100 0 0000
- OP_ADD_IMM_VAL, // 001 0100 0 0001
- OP_ADD_IMM_VAL, // 001 0100 0 0010
- OP_ADD_IMM_VAL, // 001 0100 0 0011
- OP_ADD_IMM_VAL, // 001 0100 0 0100
- OP_ADD_IMM_VAL, // 001 0100 0 0101
- OP_ADD_IMM_VAL, // 001 0100 0 0110
- OP_ADD_IMM_VAL, // 001 0100 0 0111
- OP_ADD_IMM_VAL, // 001 0100 0 1000
- OP_ADD_IMM_VAL, // 001 0100 0 1001
- OP_ADD_IMM_VAL, // 001 0100 0 1010
- OP_ADD_IMM_VAL, // 001 0100 0 1011
- OP_ADD_IMM_VAL, // 001 0100 0 1100
- OP_ADD_IMM_VAL, // 001 0100 0 1101
- OP_ADD_IMM_VAL, // 001 0100 0 1110
- OP_ADD_IMM_VAL, // 001 0100 0 1111
- 
- OP_ADD_S_IMM_VAL, // 001 0100 1 0000
- OP_ADD_S_IMM_VAL, // 001 0100 1 0001
- OP_ADD_S_IMM_VAL, // 001 0100 1 0010
- OP_ADD_S_IMM_VAL, // 001 0100 1 0011
- OP_ADD_S_IMM_VAL, // 001 0100 1 0100
- OP_ADD_S_IMM_VAL, // 001 0100 1 0101
- OP_ADD_S_IMM_VAL, // 001 0100 1 0110
- OP_ADD_S_IMM_VAL, // 001 0100 1 0111
- OP_ADD_S_IMM_VAL, // 001 0100 1 1000
- OP_ADD_S_IMM_VAL, // 001 0100 1 1001
- OP_ADD_S_IMM_VAL, // 001 0100 1 1010
- OP_ADD_S_IMM_VAL, // 001 0100 1 1011
- OP_ADD_S_IMM_VAL, // 001 0100 1 1100
- OP_ADD_S_IMM_VAL, // 001 0100 1 1101
- OP_ADD_S_IMM_VAL, // 001 0100 1 1110
- OP_ADD_S_IMM_VAL, // 001 0100 1 1111
-//------------------------------------------
- OP_ADC_IMM_VAL, // 001 0101 0 0000
- OP_ADC_IMM_VAL, // 001 0101 0 0001
- OP_ADC_IMM_VAL, // 001 0101 0 0010
- OP_ADC_IMM_VAL, // 001 0101 0 0011
- OP_ADC_IMM_VAL, // 001 0101 0 0100
- OP_ADC_IMM_VAL, // 001 0101 0 0101
- OP_ADC_IMM_VAL, // 001 0101 0 0110
- OP_ADC_IMM_VAL, // 001 0101 0 0111
- OP_ADC_IMM_VAL, // 001 0101 0 1000
- OP_ADC_IMM_VAL, // 001 0101 0 1001
- OP_ADC_IMM_VAL, // 001 0101 0 1010
- OP_ADC_IMM_VAL, // 001 0101 0 1011
- OP_ADC_IMM_VAL, // 001 0101 0 1100
- OP_ADC_IMM_VAL, // 001 0101 0 1101
- OP_ADC_IMM_VAL, // 001 0101 0 1110
- OP_ADC_IMM_VAL, // 001 0101 0 1111
- 
- OP_ADC_S_IMM_VAL, // 001 0101 1 0000
- OP_ADC_S_IMM_VAL, // 001 0101 1 0001
- OP_ADC_S_IMM_VAL, // 001 0101 1 0010
- OP_ADC_S_IMM_VAL, // 001 0101 1 0011
- OP_ADC_S_IMM_VAL, // 001 0101 1 0100
- OP_ADC_S_IMM_VAL, // 001 0101 1 0101
- OP_ADC_S_IMM_VAL, // 001 0101 1 0110
- OP_ADC_S_IMM_VAL, // 001 0101 1 0111
- OP_ADC_S_IMM_VAL, // 001 0101 1 1000
- OP_ADC_S_IMM_VAL, // 001 0101 1 1001
- OP_ADC_S_IMM_VAL, // 001 0101 1 1010
- OP_ADC_S_IMM_VAL, // 001 0101 1 1011
- OP_ADC_S_IMM_VAL, // 001 0101 1 1100
- OP_ADC_S_IMM_VAL, // 001 0101 1 1101
- OP_ADC_S_IMM_VAL, // 001 0101 1 1110
- OP_ADC_S_IMM_VAL, // 001 0101 1 1111
-//------------------------------------------
- OP_SBC_IMM_VAL, // 001 0110 0 0000
- OP_SBC_IMM_VAL, // 001 0110 0 0001
- OP_SBC_IMM_VAL, // 001 0110 0 0010
- OP_SBC_IMM_VAL, // 001 0110 0 0011
- OP_SBC_IMM_VAL, // 001 0110 0 0100
- OP_SBC_IMM_VAL, // 001 0110 0 0101
- OP_SBC_IMM_VAL, // 001 0110 0 0110
- OP_SBC_IMM_VAL, // 001 0110 0 0111
- OP_SBC_IMM_VAL, // 001 0110 0 1000
- OP_SBC_IMM_VAL, // 001 0110 0 1001
- OP_SBC_IMM_VAL, // 001 0110 0 1010
- OP_SBC_IMM_VAL, // 001 0110 0 1011
- OP_SBC_IMM_VAL, // 001 0110 0 1100
- OP_SBC_IMM_VAL, // 001 0110 0 1101
- OP_SBC_IMM_VAL, // 001 0110 0 1110
- OP_SBC_IMM_VAL, // 001 0110 0 1111
- 
- OP_SBC_S_IMM_VAL, // 001 0110 1 0000
- OP_SBC_S_IMM_VAL, // 001 0110 1 0001
- OP_SBC_S_IMM_VAL, // 001 0110 1 0010
- OP_SBC_S_IMM_VAL, // 001 0110 1 0011
- OP_SBC_S_IMM_VAL, // 001 0110 1 0100
- OP_SBC_S_IMM_VAL, // 001 0110 1 0101
- OP_SBC_S_IMM_VAL, // 001 0110 1 0110
- OP_SBC_S_IMM_VAL, // 001 0110 1 0111
- OP_SBC_S_IMM_VAL, // 001 0110 1 1000
- OP_SBC_S_IMM_VAL, // 001 0110 1 1001
- OP_SBC_S_IMM_VAL, // 001 0110 1 1010
- OP_SBC_S_IMM_VAL, // 001 0110 1 1011
- OP_SBC_S_IMM_VAL, // 001 0110 1 1100
- OP_SBC_S_IMM_VAL, // 001 0110 1 1101
- OP_SBC_S_IMM_VAL, // 001 0110 1 1110
- OP_SBC_S_IMM_VAL, // 001 0110 1 1111
-//------------------------------------------
- OP_RSC_IMM_VAL, // 001 0111 0 0000
- OP_RSC_IMM_VAL, // 001 0111 0 0001
- OP_RSC_IMM_VAL, // 001 0111 0 0010
- OP_RSC_IMM_VAL, // 001 0111 0 0011
- OP_RSC_IMM_VAL, // 001 0111 0 0100
- OP_RSC_IMM_VAL, // 001 0111 0 0101
- OP_RSC_IMM_VAL, // 001 0111 0 0110
- OP_RSC_IMM_VAL, // 001 0111 0 0111
- OP_RSC_IMM_VAL, // 001 0111 0 1000
- OP_RSC_IMM_VAL, // 001 0111 0 1001
- OP_RSC_IMM_VAL, // 001 0111 0 1010
- OP_RSC_IMM_VAL, // 001 0111 0 1011
- OP_RSC_IMM_VAL, // 001 0111 0 1100
- OP_RSC_IMM_VAL, // 001 0111 0 1101
- OP_RSC_IMM_VAL, // 001 0111 0 1110
- OP_RSC_IMM_VAL, // 001 0111 0 1111
- 
- OP_RSC_S_IMM_VAL, // 001 0111 1 0000
- OP_RSC_S_IMM_VAL, // 001 0111 1 0001
- OP_RSC_S_IMM_VAL, // 001 0111 1 0010
- OP_RSC_S_IMM_VAL, // 001 0111 1 0011
- OP_RSC_S_IMM_VAL, // 001 0111 1 0100
- OP_RSC_S_IMM_VAL, // 001 0111 1 0101
- OP_RSC_S_IMM_VAL, // 001 0111 1 0110
- OP_RSC_S_IMM_VAL, // 001 0111 1 0111
- OP_RSC_S_IMM_VAL, // 001 0111 1 1000
- OP_RSC_S_IMM_VAL, // 001 0111 1 1001
- OP_RSC_S_IMM_VAL, // 001 0111 1 1010
- OP_RSC_S_IMM_VAL, // 001 0111 1 1011
- OP_RSC_S_IMM_VAL, // 001 0111 1 1100
- OP_RSC_S_IMM_VAL, // 001 0111 1 1101
- OP_RSC_S_IMM_VAL, // 001 0111 1 1110
- OP_RSC_S_IMM_VAL, // 001 0111 1 1111
-//------------------------------------------
- OP_UND, // 001 1000 0 0000
- OP_UND, // 001 1000 0 0001
- OP_UND, // 001 1000 0 0010
- OP_UND, // 001 1000 0 0011
- OP_UND, // 001 1000 0 0100
- OP_UND, // 001 1000 0 0101
- OP_UND, // 001 1000 0 0110
- OP_UND, // 001 1000 0 0111
- OP_UND, // 001 1000 0 1000
- OP_UND, // 001 1000 0 1001
- OP_UND, // 001 1000 0 1010
- OP_UND, // 001 1000 0 1011
- OP_UND, // 001 1000 0 1100
- OP_UND, // 001 1000 0 1101
- OP_UND, // 001 1000 0 1110
- OP_UND, // 001 1000 0 1111
- 
- OP_TST_IMM_VAL, // 001 1000 1 0000
- OP_TST_IMM_VAL, // 001 1000 1 0001
- OP_TST_IMM_VAL, // 001 1000 1 0010
- OP_TST_IMM_VAL, // 001 1000 1 0011
- OP_TST_IMM_VAL, // 001 1000 1 0100
- OP_TST_IMM_VAL, // 001 1000 1 0101
- OP_TST_IMM_VAL, // 001 1000 1 0110
- OP_TST_IMM_VAL, // 001 1000 1 0111
- OP_TST_IMM_VAL, // 001 1000 1 1000
- OP_TST_IMM_VAL, // 001 1000 1 1001
- OP_TST_IMM_VAL, // 001 1000 1 1010
- OP_TST_IMM_VAL, // 001 1000 1 1011
- OP_TST_IMM_VAL, // 001 1000 1 1100
- OP_TST_IMM_VAL, // 001 1000 1 1101
- OP_TST_IMM_VAL, // 001 1000 1 1110
- OP_TST_IMM_VAL, // 001 1000 1 1111
-//------------------------------------------
- OP_MSR_CPSR_IMM_VAL, // 001 1001 0 0000
- OP_MSR_CPSR_IMM_VAL, // 001 1001 0 0001
- OP_MSR_CPSR_IMM_VAL, // 001 1001 0 0010
- OP_MSR_CPSR_IMM_VAL, // 001 1001 0 0011
- OP_MSR_CPSR_IMM_VAL, // 001 1001 0 0100
- OP_MSR_CPSR_IMM_VAL, // 001 1001 0 0101
- OP_MSR_CPSR_IMM_VAL, // 001 1001 0 0110
- OP_MSR_CPSR_IMM_VAL, // 001 1001 0 0111
- OP_MSR_CPSR_IMM_VAL, // 001 1001 0 1000
- OP_MSR_CPSR_IMM_VAL, // 001 1001 0 1001
- OP_MSR_CPSR_IMM_VAL, // 001 1001 0 1010
- OP_MSR_CPSR_IMM_VAL, // 001 1001 0 1011
- OP_MSR_CPSR_IMM_VAL, // 001 1001 0 1100
- OP_MSR_CPSR_IMM_VAL, // 001 1001 0 1101
- OP_MSR_CPSR_IMM_VAL, // 001 1001 0 1110
- OP_MSR_CPSR_IMM_VAL, // 001 1001 0 1111
- 
- OP_TEQ_IMM_VAL, // 001 1001 1 0000
- OP_TEQ_IMM_VAL, // 001 1001 1 0001
- OP_TEQ_IMM_VAL, // 001 1001 1 0010
- OP_TEQ_IMM_VAL, // 001 1001 1 0011
- OP_TEQ_IMM_VAL, // 001 1001 1 0100
- OP_TEQ_IMM_VAL, // 001 1001 1 0101
- OP_TEQ_IMM_VAL, // 001 1001 1 0110
- OP_TEQ_IMM_VAL, // 001 1001 1 0111
- OP_TEQ_IMM_VAL, // 001 1001 1 1000
- OP_TEQ_IMM_VAL, // 001 1001 1 1001
- OP_TEQ_IMM_VAL, // 001 1001 1 1010
- OP_TEQ_IMM_VAL, // 001 1001 1 1011
- OP_TEQ_IMM_VAL, // 001 1001 1 1100
- OP_TEQ_IMM_VAL, // 001 1001 1 1101
- OP_TEQ_IMM_VAL, // 001 1001 1 1110
- OP_TEQ_IMM_VAL, // 001 1001 1 1111
-//------------------------------------------
- OP_UND, // 001 1010 0 0000
- OP_UND, // 001 1010 0 0001
- OP_UND, // 001 1010 0 0010
- OP_UND, // 001 1010 0 0011
- OP_UND, // 001 1010 0 0100
- OP_UND, // 001 1010 0 0101
- OP_UND, // 001 1010 0 0110
- OP_UND, // 001 1010 0 0111
- OP_UND, // 001 1010 0 1000
- OP_UND, // 001 1010 0 1001
- OP_UND, // 001 1010 0 1010
- OP_UND, // 001 1010 0 1011
- OP_UND, // 001 1010 0 1100
- OP_UND, // 001 1010 0 1101
- OP_UND, // 001 1010 0 1110
- OP_UND, // 001 1010 0 1111
- 
- OP_CMP_IMM_VAL, // 001 1010 1 0000
- OP_CMP_IMM_VAL, // 001 1010 1 0001
- OP_CMP_IMM_VAL, // 001 1010 1 0010
- OP_CMP_IMM_VAL, // 001 1010 1 0011
- OP_CMP_IMM_VAL, // 001 1010 1 0100
- OP_CMP_IMM_VAL, // 001 1010 1 0101
- OP_CMP_IMM_VAL, // 001 1010 1 0110
- OP_CMP_IMM_VAL, // 001 1010 1 0111
- OP_CMP_IMM_VAL, // 001 1010 1 1000
- OP_CMP_IMM_VAL, // 001 1010 1 1001
- OP_CMP_IMM_VAL, // 001 1010 1 1010
- OP_CMP_IMM_VAL, // 001 1010 1 1011
- OP_CMP_IMM_VAL, // 001 1010 1 1100
- OP_CMP_IMM_VAL, // 001 1010 1 1101
- OP_CMP_IMM_VAL, // 001 1010 1 1110
- OP_CMP_IMM_VAL, // 001 1010 1 1111
-//------------------------------------------
- OP_MSR_SPSR_IMM_VAL, // 001 1011 0 0000
- OP_MSR_SPSR_IMM_VAL, // 001 1011 0 0001
- OP_MSR_SPSR_IMM_VAL, // 001 1011 0 0010
- OP_MSR_SPSR_IMM_VAL, // 001 1011 0 0011
- OP_MSR_SPSR_IMM_VAL, // 001 1011 0 0100
- OP_MSR_SPSR_IMM_VAL, // 001 1011 0 0101
- OP_MSR_SPSR_IMM_VAL, // 001 1011 0 0110
- OP_MSR_SPSR_IMM_VAL, // 001 1011 0 0111
- OP_MSR_SPSR_IMM_VAL, // 001 1011 0 1000
- OP_MSR_SPSR_IMM_VAL, // 001 1011 0 1001
- OP_MSR_SPSR_IMM_VAL, // 001 1011 0 1010
- OP_MSR_SPSR_IMM_VAL, // 001 1011 0 1011
- OP_MSR_SPSR_IMM_VAL, // 001 1011 0 1100
- OP_MSR_SPSR_IMM_VAL, // 001 1011 0 1101
- OP_MSR_SPSR_IMM_VAL, // 001 1011 0 1110
- OP_MSR_SPSR_IMM_VAL, // 001 1011 0 1111
- 
- OP_CMN_IMM_VAL, // 001 1011 1 0000
- OP_CMN_IMM_VAL, // 001 1011 1 0001
- OP_CMN_IMM_VAL, // 001 1011 1 0010
- OP_CMN_IMM_VAL, // 001 1011 1 0011
- OP_CMN_IMM_VAL, // 001 1011 1 0100
- OP_CMN_IMM_VAL, // 001 1011 1 0101
- OP_CMN_IMM_VAL, // 001 1011 1 0110
- OP_CMN_IMM_VAL, // 001 1011 1 0111
- OP_CMN_IMM_VAL, // 001 1011 1 1000
- OP_CMN_IMM_VAL, // 001 1011 1 1001
- OP_CMN_IMM_VAL, // 001 1011 1 1010
- OP_CMN_IMM_VAL, // 001 1011 1 1011
- OP_CMN_IMM_VAL, // 001 1011 1 1100
- OP_CMN_IMM_VAL, // 001 1011 1 1101
- OP_CMN_IMM_VAL, // 001 1011 1 1110
- OP_CMN_IMM_VAL, // 001 1011 1 1111
-//------------------------------------------
- OP_ORR_IMM_VAL, // 001 1100 0 0000
- OP_ORR_IMM_VAL, // 001 1100 0 0001
- OP_ORR_IMM_VAL, // 001 1100 0 0010
- OP_ORR_IMM_VAL, // 001 1100 0 0011
- OP_ORR_IMM_VAL, // 001 1100 0 0100
- OP_ORR_IMM_VAL, // 001 1100 0 0101
- OP_ORR_IMM_VAL, // 001 1100 0 0110
- OP_ORR_IMM_VAL, // 001 1100 0 0111
- OP_ORR_IMM_VAL, // 001 1100 0 1000
- OP_ORR_IMM_VAL, // 001 1100 0 1001
- OP_ORR_IMM_VAL, // 001 1100 0 1010
- OP_ORR_IMM_VAL, // 001 1100 0 1011
- OP_ORR_IMM_VAL, // 001 1100 0 1100
- OP_ORR_IMM_VAL, // 001 1100 0 1101
- OP_ORR_IMM_VAL, // 001 1100 0 1110
- OP_ORR_IMM_VAL, // 001 1100 0 1111
- 
- OP_ORR_S_IMM_VAL, // 001 1100 1 0000
- OP_ORR_S_IMM_VAL, // 001 1100 1 0001
- OP_ORR_S_IMM_VAL, // 001 1100 1 0010
- OP_ORR_S_IMM_VAL, // 001 1100 1 0011
- OP_ORR_S_IMM_VAL, // 001 1100 1 0100
- OP_ORR_S_IMM_VAL, // 001 1100 1 0101
- OP_ORR_S_IMM_VAL, // 001 1100 1 0110
- OP_ORR_S_IMM_VAL, // 001 1100 1 0111
- OP_ORR_S_IMM_VAL, // 001 1100 1 1000
- OP_ORR_S_IMM_VAL, // 001 1100 1 1001
- OP_ORR_S_IMM_VAL, // 001 1100 1 1010
- OP_ORR_S_IMM_VAL, // 001 1100 1 1011
- OP_ORR_S_IMM_VAL, // 001 1100 1 1100
- OP_ORR_S_IMM_VAL, // 001 1100 1 1101
- OP_ORR_S_IMM_VAL, // 001 1100 1 1110
- OP_ORR_S_IMM_VAL, // 001 1100 1 1111
-//------------------------------------------
- OP_MOV_IMM_VAL, // 001 1101 0 0000
- OP_MOV_IMM_VAL, // 001 1101 0 0001
- OP_MOV_IMM_VAL, // 001 1101 0 0010
- OP_MOV_IMM_VAL, // 001 1101 0 0011
- OP_MOV_IMM_VAL, // 001 1101 0 0100
- OP_MOV_IMM_VAL, // 001 1101 0 0101
- OP_MOV_IMM_VAL, // 001 1101 0 0110
- OP_MOV_IMM_VAL, // 001 1101 0 0111
- OP_MOV_IMM_VAL, // 001 1101 0 1000
- OP_MOV_IMM_VAL, // 001 1101 0 1001
- OP_MOV_IMM_VAL, // 001 1101 0 1010
- OP_MOV_IMM_VAL, // 001 1101 0 1011
- OP_MOV_IMM_VAL, // 001 1101 0 1100
- OP_MOV_IMM_VAL, // 001 1101 0 1101
- OP_MOV_IMM_VAL, // 001 1101 0 1110
- OP_MOV_IMM_VAL, // 001 1101 0 1111
- 
- OP_MOV_S_IMM_VAL, // 001 1101 1 0000
- OP_MOV_S_IMM_VAL, // 001 1101 1 0001
- OP_MOV_S_IMM_VAL, // 001 1101 1 0010
- OP_MOV_S_IMM_VAL, // 001 1101 1 0011
- OP_MOV_S_IMM_VAL, // 001 1101 1 0100
- OP_MOV_S_IMM_VAL, // 001 1101 1 0101
- OP_MOV_S_IMM_VAL, // 001 1101 1 0110
- OP_MOV_S_IMM_VAL, // 001 1101 1 0111
- OP_MOV_S_IMM_VAL, // 001 1101 1 1000
- OP_MOV_S_IMM_VAL, // 001 1101 1 1001
- OP_MOV_S_IMM_VAL, // 001 1101 1 1010
- OP_MOV_S_IMM_VAL, // 001 1101 1 1011
- OP_MOV_S_IMM_VAL, // 001 1101 1 1100
- OP_MOV_S_IMM_VAL, // 001 1101 1 1101
- OP_MOV_S_IMM_VAL, // 001 1101 1 1110
- OP_MOV_S_IMM_VAL, // 001 1101 1 1111
-//------------------------------------------
- OP_BIC_IMM_VAL, // 001 1110 0 0000
- OP_BIC_IMM_VAL, // 001 1110 0 0001
- OP_BIC_IMM_VAL, // 001 1110 0 0010
- OP_BIC_IMM_VAL, // 001 1110 0 0011
- OP_BIC_IMM_VAL, // 001 1110 0 0100
- OP_BIC_IMM_VAL, // 001 1110 0 0101
- OP_BIC_IMM_VAL, // 001 1110 0 0110
- OP_BIC_IMM_VAL, // 001 1110 0 0111
- OP_BIC_IMM_VAL, // 001 1110 0 1000
- OP_BIC_IMM_VAL, // 001 1110 0 1001
- OP_BIC_IMM_VAL, // 001 1110 0 1010
- OP_BIC_IMM_VAL, // 001 1110 0 1011
- OP_BIC_IMM_VAL, // 001 1110 0 1100
- OP_BIC_IMM_VAL, // 001 1110 0 1101
- OP_BIC_IMM_VAL, // 001 1110 0 1110
- OP_BIC_IMM_VAL, // 001 1110 0 1111
- 
- OP_BIC_S_IMM_VAL, // 001 1110 1 0000
- OP_BIC_S_IMM_VAL, // 001 1110 1 0001
- OP_BIC_S_IMM_VAL, // 001 1110 1 0010
- OP_BIC_S_IMM_VAL, // 001 1110 1 0011
- OP_BIC_S_IMM_VAL, // 001 1110 1 0100
- OP_BIC_S_IMM_VAL, // 001 1110 1 0101
- OP_BIC_S_IMM_VAL, // 001 1110 1 0110
- OP_BIC_S_IMM_VAL, // 001 1110 1 0111
- OP_BIC_S_IMM_VAL, // 001 1110 1 1000
- OP_BIC_S_IMM_VAL, // 001 1110 1 1001
- OP_BIC_S_IMM_VAL, // 001 1110 1 1010
- OP_BIC_S_IMM_VAL, // 001 1110 1 1011
- OP_BIC_S_IMM_VAL, // 001 1110 1 1100
- OP_BIC_S_IMM_VAL, // 001 1110 1 1101
- OP_BIC_S_IMM_VAL, // 001 1110 1 1110
- OP_BIC_S_IMM_VAL, // 001 1110 1 1111
-//------------------------------------------
- OP_MVN_IMM_VAL, // 001 1111 0 0000
- OP_MVN_IMM_VAL, // 001 1111 0 0001
- OP_MVN_IMM_VAL, // 001 1111 0 0010
- OP_MVN_IMM_VAL, // 001 1111 0 0011
- OP_MVN_IMM_VAL, // 001 1111 0 0100
- OP_MVN_IMM_VAL, // 001 1111 0 0101
- OP_MVN_IMM_VAL, // 001 1111 0 0110
- OP_MVN_IMM_VAL, // 001 1111 0 0111
- OP_MVN_IMM_VAL, // 001 1111 0 1000
- OP_MVN_IMM_VAL, // 001 1111 0 1001
- OP_MVN_IMM_VAL, // 001 1111 0 1010
- OP_MVN_IMM_VAL, // 001 1111 0 1011
- OP_MVN_IMM_VAL, // 001 1111 0 1100
- OP_MVN_IMM_VAL, // 001 1111 0 1101
- OP_MVN_IMM_VAL, // 001 1111 0 1110
- OP_MVN_IMM_VAL, // 001 1111 0 1111
- 
- OP_MVN_S_IMM_VAL, // 001 1111 1 0000
- OP_MVN_S_IMM_VAL, // 001 1111 1 0001
- OP_MVN_S_IMM_VAL, // 001 1111 1 0010
- OP_MVN_S_IMM_VAL, // 001 1111 1 0011
- OP_MVN_S_IMM_VAL, // 001 1111 1 0100
- OP_MVN_S_IMM_VAL, // 001 1111 1 0101
- OP_MVN_S_IMM_VAL, // 001 1111 1 0110
- OP_MVN_S_IMM_VAL, // 001 1111 1 0111
- OP_MVN_S_IMM_VAL, // 001 1111 1 1000
- OP_MVN_S_IMM_VAL, // 001 1111 1 1001
- OP_MVN_S_IMM_VAL, // 001 1111 1 1010
- OP_MVN_S_IMM_VAL, // 001 1111 1 1011
- OP_MVN_S_IMM_VAL, // 001 1111 1 1100
- OP_MVN_S_IMM_VAL, // 001 1111 1 1101
- OP_MVN_S_IMM_VAL, // 001 1111 1 1110
- OP_MVN_S_IMM_VAL, // 001 1111 1 1111
-//------------------------------------------
- OP_STR_M_IMM_OFF_POSTIND, //010 0000 0 0000
- OP_STR_M_IMM_OFF_POSTIND, //010 0000 0 0001
- OP_STR_M_IMM_OFF_POSTIND, //010 0000 0 0010
- OP_STR_M_IMM_OFF_POSTIND, //010 0000 0 0011
- OP_STR_M_IMM_OFF_POSTIND, //010 0000 0 0100
- OP_STR_M_IMM_OFF_POSTIND, //010 0000 0 0101
- OP_STR_M_IMM_OFF_POSTIND, //010 0000 0 0110
- OP_STR_M_IMM_OFF_POSTIND, //010 0000 0 0111
- OP_STR_M_IMM_OFF_POSTIND, //010 0000 0 1000
- OP_STR_M_IMM_OFF_POSTIND, //010 0000 0 1001
- OP_STR_M_IMM_OFF_POSTIND, //010 0000 0 1010
- OP_STR_M_IMM_OFF_POSTIND, //010 0000 0 1011
- OP_STR_M_IMM_OFF_POSTIND, //010 0000 0 1100
- OP_STR_M_IMM_OFF_POSTIND, //010 0000 0 1101
- OP_STR_M_IMM_OFF_POSTIND, //010 0000 0 1110
- OP_STR_M_IMM_OFF_POSTIND, //010 0000 0 1111
- 
- OP_LDR_M_IMM_OFF_POSTIND, //010 0000 1 0000
- OP_LDR_M_IMM_OFF_POSTIND, //010 0000 1 0001
- OP_LDR_M_IMM_OFF_POSTIND, //010 0000 1 0010
- OP_LDR_M_IMM_OFF_POSTIND, //010 0000 1 0011
- OP_LDR_M_IMM_OFF_POSTIND, //010 0000 1 0100
- OP_LDR_M_IMM_OFF_POSTIND, //010 0000 1 0101
- OP_LDR_M_IMM_OFF_POSTIND, //010 0000 1 0110
- OP_LDR_M_IMM_OFF_POSTIND, //010 0000 1 0111
- OP_LDR_M_IMM_OFF_POSTIND, //010 0000 1 1000
- OP_LDR_M_IMM_OFF_POSTIND, //010 0000 1 1001
- OP_LDR_M_IMM_OFF_POSTIND, //010 0000 1 1010
- OP_LDR_M_IMM_OFF_POSTIND, //010 0000 1 1011
- OP_LDR_M_IMM_OFF_POSTIND, //010 0000 1 1100
- OP_LDR_M_IMM_OFF_POSTIND, //010 0000 1 1101
- OP_LDR_M_IMM_OFF_POSTIND, //010 0000 1 1110
- OP_LDR_M_IMM_OFF_POSTIND, //010 0000 1 1111
-//------------------------------------------
- OP_UND, //010 0001 0 0000
- OP_UND,
- OP_UND,
- OP_UND,
- OP_UND,
- OP_UND,
- OP_UND,
- OP_UND,
- OP_UND,
- OP_UND,
- OP_UND,
- OP_UND,
- OP_UND,
- OP_UND,
- OP_UND,
- OP_UND,
- OP_UND,
- OP_UND,
- OP_UND,
- OP_UND,
- OP_UND,
- OP_UND,
- OP_UND,
- OP_UND,
- OP_UND,
- OP_UND,
- OP_UND,
- OP_UND,
- OP_UND,
- OP_UND,
- OP_UND,
- OP_UND,
-//------------------------------------------
- OP_STRB_M_IMM_OFF_POSTIND, //010 0010 0 0000
- OP_STRB_M_IMM_OFF_POSTIND, //010 0010 0 0001
- OP_STRB_M_IMM_OFF_POSTIND, //010 0010 0 0010
- OP_STRB_M_IMM_OFF_POSTIND, //010 0010 0 0011
- OP_STRB_M_IMM_OFF_POSTIND, //010 0010 0 0100
- OP_STRB_M_IMM_OFF_POSTIND, //010 0010 0 0101
- OP_STRB_M_IMM_OFF_POSTIND, //010 0010 0 0110
- OP_STRB_M_IMM_OFF_POSTIND, //010 0010 0 0111
- OP_STRB_M_IMM_OFF_POSTIND, //010 0010 0 1000
- OP_STRB_M_IMM_OFF_POSTIND, //010 0010 0 1001
- OP_STRB_M_IMM_OFF_POSTIND, //010 0010 0 1010
- OP_STRB_M_IMM_OFF_POSTIND, //010 0010 0 1011
- OP_STRB_M_IMM_OFF_POSTIND, //010 0010 0 1100
- OP_STRB_M_IMM_OFF_POSTIND, //010 0010 0 1101
- OP_STRB_M_IMM_OFF_POSTIND, //010 0010 0 1110
- OP_STRB_M_IMM_OFF_POSTIND, //010 0010 0 1111
- 
- OP_LDRB_M_IMM_OFF_POSTIND, //010 0010 1 0000
- OP_LDRB_M_IMM_OFF_POSTIND, //010 0010 1 0001
- OP_LDRB_M_IMM_OFF_POSTIND, //010 0010 1 0010
- OP_LDRB_M_IMM_OFF_POSTIND, //010 0010 1 0011
- OP_LDRB_M_IMM_OFF_POSTIND, //010 0010 1 0100
- OP_LDRB_M_IMM_OFF_POSTIND, //010 0010 1 0101
- OP_LDRB_M_IMM_OFF_POSTIND, //010 0010 1 0110
- OP_LDRB_M_IMM_OFF_POSTIND, //010 0010 1 0111
- OP_LDRB_M_IMM_OFF_POSTIND, //010 0010 1 1000
- OP_LDRB_M_IMM_OFF_POSTIND, //010 0010 1 1001
- OP_LDRB_M_IMM_OFF_POSTIND, //010 0010 1 1010
- OP_LDRB_M_IMM_OFF_POSTIND, //010 0010 1 1011
- OP_LDRB_M_IMM_OFF_POSTIND, //010 0010 1 1100
- OP_LDRB_M_IMM_OFF_POSTIND, //010 0010 1 1101
- OP_LDRB_M_IMM_OFF_POSTIND, //010 0010 1 1110
- OP_LDRB_M_IMM_OFF_POSTIND, //010 0010 1 1111
-//------------------------------------------
- OP_STRBT_M_IMM_OFF_POSTIND, //010 0011 0 0000
- OP_STRBT_M_IMM_OFF_POSTIND, //010 0011 0 0000
- OP_STRBT_M_IMM_OFF_POSTIND, //010 0011 0 0000
- OP_STRBT_M_IMM_OFF_POSTIND, //010 0011 0 0000
- OP_STRBT_M_IMM_OFF_POSTIND, //010 0011 0 0000
- OP_STRBT_M_IMM_OFF_POSTIND, //010 0011 0 0000
- OP_STRBT_M_IMM_OFF_POSTIND, //010 0011 0 0000
- OP_STRBT_M_IMM_OFF_POSTIND, //010 0011 0 0000
- OP_STRBT_M_IMM_OFF_POSTIND, //010 0011 0 0000
- OP_STRBT_M_IMM_OFF_POSTIND, //010 0011 0 0000
- OP_STRBT_M_IMM_OFF_POSTIND, //010 0011 0 0000
- OP_STRBT_M_IMM_OFF_POSTIND, //010 0011 0 0000
- OP_STRBT_M_IMM_OFF_POSTIND, //010 0011 0 0000
- OP_STRBT_M_IMM_OFF_POSTIND, //010 0011 0 0000
- OP_STRBT_M_IMM_OFF_POSTIND, //010 0011 0 0000
- OP_STRBT_M_IMM_OFF_POSTIND, //010 0011 0 0000
- 
- OP_LDRBT_M_IMM_OFF_POSTIND, //010 0011 0 0000
- OP_LDRBT_M_IMM_OFF_POSTIND, //010 0011 0 0000
- OP_LDRBT_M_IMM_OFF_POSTIND, //010 0011 0 0000
- OP_LDRBT_M_IMM_OFF_POSTIND, //010 0011 0 0000
- OP_LDRBT_M_IMM_OFF_POSTIND, //010 0011 0 0000
- OP_LDRBT_M_IMM_OFF_POSTIND, //010 0011 0 0000
- OP_LDRBT_M_IMM_OFF_POSTIND, //010 0011 0 0000
- OP_LDRBT_M_IMM_OFF_POSTIND, //010 0011 0 0000
- OP_LDRBT_M_IMM_OFF_POSTIND, //010 0011 0 0000
- OP_LDRBT_M_IMM_OFF_POSTIND, //010 0011 0 0000
- OP_LDRBT_M_IMM_OFF_POSTIND, //010 0011 0 0000
- OP_LDRBT_M_IMM_OFF_POSTIND, //010 0011 0 0000
- OP_LDRBT_M_IMM_OFF_POSTIND, //010 0011 0 0000
- OP_LDRBT_M_IMM_OFF_POSTIND, //010 0011 0 0000
- OP_LDRBT_M_IMM_OFF_POSTIND, //010 0011 0 0000
- OP_LDRBT_M_IMM_OFF_POSTIND, //010 0011 0 0000
-//------------------------------------------
- OP_STR_P_IMM_OFF_POSTIND, //010 0100 0 0000
- OP_STR_P_IMM_OFF_POSTIND, //010 0100 0 0000
- OP_STR_P_IMM_OFF_POSTIND, //010 0100 0 0000
- OP_STR_P_IMM_OFF_POSTIND, //010 0100 0 0000
- OP_STR_P_IMM_OFF_POSTIND, //010 0100 0 0000
- OP_STR_P_IMM_OFF_POSTIND, //010 0100 0 0000
- OP_STR_P_IMM_OFF_POSTIND, //010 0100 0 0000
- OP_STR_P_IMM_OFF_POSTIND, //010 0100 0 0000
- OP_STR_P_IMM_OFF_POSTIND, //010 0100 0 0000
- OP_STR_P_IMM_OFF_POSTIND, //010 0100 0 0000
- OP_STR_P_IMM_OFF_POSTIND, //010 0100 0 0000
- OP_STR_P_IMM_OFF_POSTIND, //010 0100 0 0000
- OP_STR_P_IMM_OFF_POSTIND, //010 0100 0 0000
- OP_STR_P_IMM_OFF_POSTIND, //010 0100 0 0000
- OP_STR_P_IMM_OFF_POSTIND, //010 0100 0 0000
- OP_STR_P_IMM_OFF_POSTIND, //010 0100 0 0000
- 
- OP_LDR_P_IMM_OFF_POSTIND, //010 0100 0 0000
- OP_LDR_P_IMM_OFF_POSTIND, //010 0100 0 0000
- OP_LDR_P_IMM_OFF_POSTIND, //010 0100 0 0000
- OP_LDR_P_IMM_OFF_POSTIND, //010 0100 0 0000
- OP_LDR_P_IMM_OFF_POSTIND, //010 0100 0 0000
- OP_LDR_P_IMM_OFF_POSTIND, //010 0100 0 0000
- OP_LDR_P_IMM_OFF_POSTIND, //010 0100 0 0000
- OP_LDR_P_IMM_OFF_POSTIND, //010 0100 0 0000
- OP_LDR_P_IMM_OFF_POSTIND, //010 0100 0 0000
- OP_LDR_P_IMM_OFF_POSTIND, //010 0100 0 0000
- OP_LDR_P_IMM_OFF_POSTIND, //010 0100 0 0000
- OP_LDR_P_IMM_OFF_POSTIND, //010 0100 0 0000
- OP_LDR_P_IMM_OFF_POSTIND, //010 0100 0 0000
- OP_LDR_P_IMM_OFF_POSTIND, //010 0100 0 0000
- OP_LDR_P_IMM_OFF_POSTIND, //010 0100 0 0000
- OP_LDR_P_IMM_OFF_POSTIND, //010 0100 0 0000
-//------------------------------------------
- OP_STR_P_IMM_OFF_POSTIND, //010 0100 0 0000
- OP_STR_P_IMM_OFF_POSTIND, //010 0100 0 0000
- OP_STR_P_IMM_OFF_POSTIND, //010 0100 0 0000
- OP_STR_P_IMM_OFF_POSTIND, //010 0100 0 0000
- OP_STR_P_IMM_OFF_POSTIND, //010 0100 0 0000
- OP_STR_P_IMM_OFF_POSTIND, //010 0100 0 0000
- OP_STR_P_IMM_OFF_POSTIND, //010 0100 0 0000
- OP_STR_P_IMM_OFF_POSTIND, //010 0100 0 0000
- OP_STR_P_IMM_OFF_POSTIND, //010 0100 0 0000
- OP_STR_P_IMM_OFF_POSTIND, //010 0100 0 0000
- OP_STR_P_IMM_OFF_POSTIND, //010 0100 0 0000
- OP_STR_P_IMM_OFF_POSTIND, //010 0100 0 0000
- OP_STR_P_IMM_OFF_POSTIND, //010 0100 0 0000
- OP_STR_P_IMM_OFF_POSTIND, //010 0100 0 0000
- OP_STR_P_IMM_OFF_POSTIND, //010 0100 0 0000
- OP_STR_P_IMM_OFF_POSTIND, //010 0100 0 0000
- 
- OP_LDR_P_IMM_OFF_POSTIND2, //010 0100 0 0000
- OP_LDR_P_IMM_OFF_POSTIND2, //010 0100 0 0000
- OP_LDR_P_IMM_OFF_POSTIND2, //010 0100 0 0000
- OP_LDR_P_IMM_OFF_POSTIND2, //010 0100 0 0000
- OP_LDR_P_IMM_OFF_POSTIND2, //010 0100 0 0000
- OP_LDR_P_IMM_OFF_POSTIND2, //010 0100 0 0000
- OP_LDR_P_IMM_OFF_POSTIND2, //010 0100 0 0000
- OP_LDR_P_IMM_OFF_POSTIND2, //010 0100 0 0000
- OP_LDR_P_IMM_OFF_POSTIND2, //010 0100 0 0000
- OP_LDR_P_IMM_OFF_POSTIND2, //010 0100 0 0000
- OP_LDR_P_IMM_OFF_POSTIND2, //010 0100 0 0000
- OP_LDR_P_IMM_OFF_POSTIND2, //010 0100 0 0000
- OP_LDR_P_IMM_OFF_POSTIND2, //010 0100 0 0000
- OP_LDR_P_IMM_OFF_POSTIND2, //010 0100 0 0000
- OP_LDR_P_IMM_OFF_POSTIND2, //010 0100 0 0000
- OP_LDR_P_IMM_OFF_POSTIND2, //010 0100 0 0000
-//------------------------------------------
- OP_STRB_P_IMM_OFF_POSTIND, //010 0110 0 0000
- OP_STRB_P_IMM_OFF_POSTIND, //010 0100 0 0000
- OP_STRB_P_IMM_OFF_POSTIND, //010 0100 0 0000
- OP_STRB_P_IMM_OFF_POSTIND, //010 0100 0 0000
- OP_STRB_P_IMM_OFF_POSTIND, //010 0100 0 0000
- OP_STRB_P_IMM_OFF_POSTIND, //010 0100 0 0000
- OP_STRB_P_IMM_OFF_POSTIND, //010 0100 0 0000
- OP_STRB_P_IMM_OFF_POSTIND, //010 0100 0 0000
- OP_STRB_P_IMM_OFF_POSTIND, //010 0100 0 0000
- OP_STRB_P_IMM_OFF_POSTIND, //010 0100 0 0000
- OP_STRB_P_IMM_OFF_POSTIND, //010 0100 0 0000
- OP_STRB_P_IMM_OFF_POSTIND, //010 0100 0 0000
- OP_STRB_P_IMM_OFF_POSTIND, //010 0100 0 0000
- OP_STRB_P_IMM_OFF_POSTIND, //010 0100 0 0000
- OP_STRB_P_IMM_OFF_POSTIND, //010 0100 0 0000
- OP_STRB_P_IMM_OFF_POSTIND, //010 0100 0 0000
- 
- OP_LDRB_P_IMM_OFF_POSTIND, //010 0100 0 0000
- OP_LDRB_P_IMM_OFF_POSTIND, //010 0100 0 0000
- OP_LDRB_P_IMM_OFF_POSTIND, //010 0100 0 0000
- OP_LDRB_P_IMM_OFF_POSTIND, //010 0100 0 0000
- OP_LDRB_P_IMM_OFF_POSTIND, //010 0100 0 0000
- OP_LDRB_P_IMM_OFF_POSTIND, //010 0100 0 0000
- OP_LDRB_P_IMM_OFF_POSTIND, //010 0100 0 0000
- OP_LDRB_P_IMM_OFF_POSTIND, //010 0100 0 0000
- OP_LDRB_P_IMM_OFF_POSTIND, //010 0100 0 0000
- OP_LDRB_P_IMM_OFF_POSTIND, //010 0100 0 0000
- OP_LDRB_P_IMM_OFF_POSTIND, //010 0100 0 0000
- OP_LDRB_P_IMM_OFF_POSTIND, //010 0100 0 0000
- OP_LDRB_P_IMM_OFF_POSTIND, //010 0100 0 0000
- OP_LDRB_P_IMM_OFF_POSTIND, //010 0100 0 0000
- OP_LDRB_P_IMM_OFF_POSTIND, //010 0100 0 0000
- OP_LDRB_P_IMM_OFF_POSTIND, //010 0110 1 1111
-//------------------------------------------
- OP_STRBT_P_IMM_OFF_POSTIND, //010 0111 0 0000
- OP_STRBT_P_IMM_OFF_POSTIND, //010 0100 0 0000
- OP_STRBT_P_IMM_OFF_POSTIND, //010 0100 0 0000
- OP_STRBT_P_IMM_OFF_POSTIND, //010 0100 0 0000
- OP_STRBT_P_IMM_OFF_POSTIND, //010 0100 0 0000
- OP_STRBT_P_IMM_OFF_POSTIND, //010 0100 0 0000
- OP_STRBT_P_IMM_OFF_POSTIND, //010 0100 0 0000
- OP_STRBT_P_IMM_OFF_POSTIND, //010 0100 0 0000
- OP_STRBT_P_IMM_OFF_POSTIND, //010 0100 0 0000
- OP_STRBT_P_IMM_OFF_POSTIND, //010 0100 0 0000
- OP_STRBT_P_IMM_OFF_POSTIND, //010 0100 0 0000
- OP_STRBT_P_IMM_OFF_POSTIND, //010 0100 0 0000
- OP_STRBT_P_IMM_OFF_POSTIND, //010 0100 0 0000
- OP_STRBT_P_IMM_OFF_POSTIND, //010 0100 0 0000
- OP_STRBT_P_IMM_OFF_POSTIND, //010 0100 0 0000
- OP_STRBT_P_IMM_OFF_POSTIND, //010 0100 0 0000
- 
- OP_LDRBT_P_IMM_OFF_POSTIND, //010 0100 0 0000
- OP_LDRBT_P_IMM_OFF_POSTIND, //010 0100 0 0000
- OP_LDRBT_P_IMM_OFF_POSTIND, //010 0100 0 0000
- OP_LDRBT_P_IMM_OFF_POSTIND, //010 0100 0 0000
- OP_LDRBT_P_IMM_OFF_POSTIND, //010 0100 0 0000
- OP_LDRBT_P_IMM_OFF_POSTIND, //010 0100 0 0000
- OP_LDRBT_P_IMM_OFF_POSTIND, //010 0100 0 0000
- OP_LDRBT_P_IMM_OFF_POSTIND, //010 0100 0 0000
- OP_LDRBT_P_IMM_OFF_POSTIND, //010 0100 0 0000
- OP_LDRBT_P_IMM_OFF_POSTIND, //010 0100 0 0000
- OP_LDRBT_P_IMM_OFF_POSTIND, //010 0100 0 0000
- OP_LDRBT_P_IMM_OFF_POSTIND, //010 0100 0 0000
- OP_LDRBT_P_IMM_OFF_POSTIND, //010 0100 0 0000
- OP_LDRBT_P_IMM_OFF_POSTIND, //010 0100 0 0000
- OP_LDRBT_P_IMM_OFF_POSTIND, //010 0100 0 0000
- OP_LDRBT_P_IMM_OFF_POSTIND, //010 0111 1 1111
-//------------------------------------------
- OP_STR_M_IMM_OFF, //010 1000 0 0000
- OP_STR_M_IMM_OFF,
- OP_STR_M_IMM_OFF,
- OP_STR_M_IMM_OFF,
- OP_STR_M_IMM_OFF,
- OP_STR_M_IMM_OFF,
- OP_STR_M_IMM_OFF,
- OP_STR_M_IMM_OFF,
- OP_STR_M_IMM_OFF,
- OP_STR_M_IMM_OFF,
- OP_STR_M_IMM_OFF,
- OP_STR_M_IMM_OFF,
- OP_STR_M_IMM_OFF,
- OP_STR_M_IMM_OFF,
- OP_STR_M_IMM_OFF,
- OP_STR_M_IMM_OFF,
- 
- OP_LDR_M_IMM_OFF,
- OP_LDR_M_IMM_OFF,
- OP_LDR_M_IMM_OFF,
- OP_LDR_M_IMM_OFF,
- OP_LDR_M_IMM_OFF,
- OP_LDR_M_IMM_OFF,
- OP_LDR_M_IMM_OFF,
- OP_LDR_M_IMM_OFF,
- OP_LDR_M_IMM_OFF,
- OP_LDR_M_IMM_OFF,
- OP_LDR_M_IMM_OFF,
- OP_LDR_M_IMM_OFF,
- OP_LDR_M_IMM_OFF,
- OP_LDR_M_IMM_OFF,
- OP_LDR_M_IMM_OFF,
- OP_LDR_M_IMM_OFF, //010 1000 1 1111
-//------------------------------------------
- OP_STR_M_IMM_OFF_PREIND, //010 1001 0 0000
- OP_STR_M_IMM_OFF_PREIND,
- OP_STR_M_IMM_OFF_PREIND,
- OP_STR_M_IMM_OFF_PREIND,
- OP_STR_M_IMM_OFF_PREIND,
- OP_STR_M_IMM_OFF_PREIND,
- OP_STR_M_IMM_OFF_PREIND,
- OP_STR_M_IMM_OFF_PREIND,
- OP_STR_M_IMM_OFF_PREIND,
- OP_STR_M_IMM_OFF_PREIND,
- OP_STR_M_IMM_OFF_PREIND,
- OP_STR_M_IMM_OFF_PREIND,
- OP_STR_M_IMM_OFF_PREIND,
- OP_STR_M_IMM_OFF_PREIND,
- OP_STR_M_IMM_OFF_PREIND,
- OP_STR_M_IMM_OFF_PREIND,
- 
- OP_LDR_M_IMM_OFF_PREIND,
- OP_LDR_M_IMM_OFF_PREIND,
- OP_LDR_M_IMM_OFF_PREIND,
- OP_LDR_M_IMM_OFF_PREIND,
- OP_LDR_M_IMM_OFF_PREIND,
- OP_LDR_M_IMM_OFF_PREIND,
- OP_LDR_M_IMM_OFF_PREIND,
- OP_LDR_M_IMM_OFF_PREIND,
- OP_LDR_M_IMM_OFF_PREIND,
- OP_LDR_M_IMM_OFF_PREIND,
- OP_LDR_M_IMM_OFF_PREIND,
- OP_LDR_M_IMM_OFF_PREIND,
- OP_LDR_M_IMM_OFF_PREIND,
- OP_LDR_M_IMM_OFF_PREIND,
- OP_LDR_M_IMM_OFF_PREIND,
- OP_LDR_M_IMM_OFF_PREIND, //010 1001 1 1111
-//------------------------------------------
- OP_STRB_M_IMM_OFF, //010 1010 0 0000
- OP_STRB_M_IMM_OFF,
- OP_STRB_M_IMM_OFF,
- OP_STRB_M_IMM_OFF,
- OP_STRB_M_IMM_OFF,
- OP_STRB_M_IMM_OFF,
- OP_STRB_M_IMM_OFF,
- OP_STRB_M_IMM_OFF,
- OP_STRB_M_IMM_OFF,
- OP_STRB_M_IMM_OFF,
- OP_STRB_M_IMM_OFF,
- OP_STRB_M_IMM_OFF,
- OP_STRB_M_IMM_OFF,
- OP_STRB_M_IMM_OFF,
- OP_STRB_M_IMM_OFF,
- OP_STRB_M_IMM_OFF,
- 
- OP_LDRB_M_IMM_OFF,
- OP_LDRB_M_IMM_OFF,
- OP_LDRB_M_IMM_OFF,
- OP_LDRB_M_IMM_OFF,
- OP_LDRB_M_IMM_OFF,
- OP_LDRB_M_IMM_OFF,
- OP_LDRB_M_IMM_OFF,
- OP_LDRB_M_IMM_OFF,
- OP_LDRB_M_IMM_OFF,
- OP_LDRB_M_IMM_OFF,
- OP_LDRB_M_IMM_OFF,
- OP_LDRB_M_IMM_OFF,
- OP_LDRB_M_IMM_OFF,
- OP_LDRB_M_IMM_OFF,
- OP_LDRB_M_IMM_OFF,
- OP_LDRB_M_IMM_OFF, //010 1010 1 1111
-//------------------------------------------
- OP_STRB_M_IMM_OFF_PREIND, //010 1011 0 0000
- OP_STRB_M_IMM_OFF_PREIND,
- OP_STRB_M_IMM_OFF_PREIND,
- OP_STRB_M_IMM_OFF_PREIND,
- OP_STRB_M_IMM_OFF_PREIND,
- OP_STRB_M_IMM_OFF_PREIND,
- OP_STRB_M_IMM_OFF_PREIND,
- OP_STRB_M_IMM_OFF_PREIND,
- OP_STRB_M_IMM_OFF_PREIND,
- OP_STRB_M_IMM_OFF_PREIND,
- OP_STRB_M_IMM_OFF_PREIND,
- OP_STRB_M_IMM_OFF_PREIND,
- OP_STRB_M_IMM_OFF_PREIND,
- OP_STRB_M_IMM_OFF_PREIND,
- OP_STRB_M_IMM_OFF_PREIND,
- OP_STRB_M_IMM_OFF_PREIND,
- 
- OP_LDRB_M_IMM_OFF_PREIND,
- OP_LDRB_M_IMM_OFF_PREIND,
- OP_LDRB_M_IMM_OFF_PREIND,
- OP_LDRB_M_IMM_OFF_PREIND,
- OP_LDRB_M_IMM_OFF_PREIND,
- OP_LDRB_M_IMM_OFF_PREIND,
- OP_LDRB_M_IMM_OFF_PREIND,
- OP_LDRB_M_IMM_OFF_PREIND,
- OP_LDRB_M_IMM_OFF_PREIND,
- OP_LDRB_M_IMM_OFF_PREIND,
- OP_LDRB_M_IMM_OFF_PREIND,
- OP_LDRB_M_IMM_OFF_PREIND,
- OP_LDRB_M_IMM_OFF_PREIND,
- OP_LDRB_M_IMM_OFF_PREIND,
- OP_LDRB_M_IMM_OFF_PREIND,
- OP_LDRB_M_IMM_OFF_PREIND, //010 1011 1 1111
-//------------------------------------------
- OP_STR_P_IMM_OFF, //010 1100 0 0000
- OP_STR_P_IMM_OFF,
- OP_STR_P_IMM_OFF,
- OP_STR_P_IMM_OFF,
- OP_STR_P_IMM_OFF,
- OP_STR_P_IMM_OFF,
- OP_STR_P_IMM_OFF,
- OP_STR_P_IMM_OFF,
- OP_STR_P_IMM_OFF,
- OP_STR_P_IMM_OFF,
- OP_STR_P_IMM_OFF,
- OP_STR_P_IMM_OFF,
- OP_STR_P_IMM_OFF,
- OP_STR_P_IMM_OFF,
- OP_STR_P_IMM_OFF,
- OP_STR_P_IMM_OFF,
- 
- OP_LDR_P_IMM_OFF,
- OP_LDR_P_IMM_OFF,
- OP_LDR_P_IMM_OFF,
- OP_LDR_P_IMM_OFF,
- OP_LDR_P_IMM_OFF,
- OP_LDR_P_IMM_OFF,
- OP_LDR_P_IMM_OFF,
- OP_LDR_P_IMM_OFF,
- OP_LDR_P_IMM_OFF,
- OP_LDR_P_IMM_OFF,
- OP_LDR_P_IMM_OFF,
- OP_LDR_P_IMM_OFF,
- OP_LDR_P_IMM_OFF,
- OP_LDR_P_IMM_OFF,
- OP_LDR_P_IMM_OFF,
- OP_LDR_P_IMM_OFF, //010 1100 1 1111
-//------------------------------------------
- OP_STR_P_IMM_OFF_PREIND, //010 1101 0 0000
- OP_STR_P_IMM_OFF_PREIND,
- OP_STR_P_IMM_OFF_PREIND,
- OP_STR_P_IMM_OFF_PREIND,
- OP_STR_P_IMM_OFF_PREIND,
- OP_STR_P_IMM_OFF_PREIND,
- OP_STR_P_IMM_OFF_PREIND,
- OP_STR_P_IMM_OFF_PREIND,
- OP_STR_P_IMM_OFF_PREIND,
- OP_STR_P_IMM_OFF_PREIND,
- OP_STR_P_IMM_OFF_PREIND,
- OP_STR_P_IMM_OFF_PREIND,
- OP_STR_P_IMM_OFF_PREIND,
- OP_STR_P_IMM_OFF_PREIND,
- OP_STR_P_IMM_OFF_PREIND,
- OP_STR_P_IMM_OFF_PREIND,
- 
- OP_LDR_P_IMM_OFF_PREIND,
- OP_LDR_P_IMM_OFF_PREIND,
- OP_LDR_P_IMM_OFF_PREIND,
- OP_LDR_P_IMM_OFF_PREIND,
- OP_LDR_P_IMM_OFF_PREIND,
- OP_LDR_P_IMM_OFF_PREIND,
- OP_LDR_P_IMM_OFF_PREIND,
- OP_LDR_P_IMM_OFF_PREIND,
- OP_LDR_P_IMM_OFF_PREIND,
- OP_LDR_P_IMM_OFF_PREIND,
- OP_LDR_P_IMM_OFF_PREIND,
- OP_LDR_P_IMM_OFF_PREIND,
- OP_LDR_P_IMM_OFF_PREIND,
- OP_LDR_P_IMM_OFF_PREIND,
- OP_LDR_P_IMM_OFF_PREIND,
- OP_LDR_P_IMM_OFF_PREIND, //010 1101 1 1111
-//------------------------------------------
- OP_STRB_P_IMM_OFF, //010 1110 0 0000
- OP_STRB_P_IMM_OFF,
- OP_STRB_P_IMM_OFF,
- OP_STRB_P_IMM_OFF,
- OP_STRB_P_IMM_OFF,
- OP_STRB_P_IMM_OFF,
- OP_STRB_P_IMM_OFF,
- OP_STRB_P_IMM_OFF,
- OP_STRB_P_IMM_OFF,
- OP_STRB_P_IMM_OFF,
- OP_STRB_P_IMM_OFF,
- OP_STRB_P_IMM_OFF,
- OP_STRB_P_IMM_OFF,
- OP_STRB_P_IMM_OFF,
- OP_STRB_P_IMM_OFF,
- OP_STRB_P_IMM_OFF,
- 
- OP_LDRB_P_IMM_OFF,
- OP_LDRB_P_IMM_OFF,
- OP_LDRB_P_IMM_OFF,
- OP_LDRB_P_IMM_OFF,
- OP_LDRB_P_IMM_OFF,
- OP_LDRB_P_IMM_OFF,
- OP_LDRB_P_IMM_OFF,
- OP_LDRB_P_IMM_OFF,
- OP_LDRB_P_IMM_OFF,
- OP_LDRB_P_IMM_OFF,
- OP_LDRB_P_IMM_OFF,
- OP_LDRB_P_IMM_OFF,
- OP_LDRB_P_IMM_OFF,
- OP_LDRB_P_IMM_OFF,
- OP_LDRB_P_IMM_OFF,
- OP_LDRB_P_IMM_OFF, //010 1110 1 1111
-//------------------------------------------
- OP_STRB_P_IMM_OFF_PREIND, //010 1111 0 0000
- OP_STRB_P_IMM_OFF_PREIND,
- OP_STRB_P_IMM_OFF_PREIND,
- OP_STRB_P_IMM_OFF_PREIND,
- OP_STRB_P_IMM_OFF_PREIND,
- OP_STRB_P_IMM_OFF_PREIND,
- OP_STRB_P_IMM_OFF_PREIND,
- OP_STRB_P_IMM_OFF_PREIND,
- OP_STRB_P_IMM_OFF_PREIND,
- OP_STRB_P_IMM_OFF_PREIND,
- OP_STRB_P_IMM_OFF_PREIND,
- OP_STRB_P_IMM_OFF_PREIND,
- OP_STRB_P_IMM_OFF_PREIND,
- OP_STRB_P_IMM_OFF_PREIND,
- OP_STRB_P_IMM_OFF_PREIND,
- OP_STRB_P_IMM_OFF_PREIND,
- 
- OP_LDRB_P_IMM_OFF_PREIND,
- OP_LDRB_P_IMM_OFF_PREIND,
- OP_LDRB_P_IMM_OFF_PREIND,
- OP_LDRB_P_IMM_OFF_PREIND,
- OP_LDRB_P_IMM_OFF_PREIND,
- OP_LDRB_P_IMM_OFF_PREIND,
- OP_LDRB_P_IMM_OFF_PREIND,
- OP_LDRB_P_IMM_OFF_PREIND,
- OP_LDRB_P_IMM_OFF_PREIND,
- OP_LDRB_P_IMM_OFF_PREIND,
- OP_LDRB_P_IMM_OFF_PREIND,
- OP_LDRB_P_IMM_OFF_PREIND,
- OP_LDRB_P_IMM_OFF_PREIND,
- OP_LDRB_P_IMM_OFF_PREIND,
- OP_LDRB_P_IMM_OFF_PREIND,
- OP_LDRB_P_IMM_OFF_PREIND, //010 1111 1 1111
-//------------------------------------------
- OP_STR_M_LSL_IMM_OFF_POSTIND, //011 0000 0 0000
- OP_UND,
- OP_STR_M_LSR_IMM_OFF_POSTIND,
- OP_UND,
- OP_STR_M_ASR_IMM_OFF_POSTIND,
- OP_UND,
- OP_STR_M_ROR_IMM_OFF_POSTIND,
- OP_UND,
- OP_STR_M_LSL_IMM_OFF_POSTIND,
- OP_UND,
- OP_STR_M_LSR_IMM_OFF_POSTIND,
- OP_UND,
- OP_STR_M_ASR_IMM_OFF_POSTIND,
- OP_UND,
- OP_STR_M_ROR_IMM_OFF_POSTIND,
- OP_UND,
- 
- OP_LDR_M_LSL_IMM_OFF_POSTIND, 
- OP_UND,
- OP_LDR_M_LSR_IMM_OFF_POSTIND,
- OP_UND,
- OP_LDR_M_ASR_IMM_OFF_POSTIND,
- OP_UND,
- OP_LDR_M_ROR_IMM_OFF_POSTIND,
- OP_UND,
- OP_LDR_M_LSL_IMM_OFF_POSTIND,
- OP_UND,
- OP_LDR_M_LSR_IMM_OFF_POSTIND,
- OP_UND,
- OP_LDR_M_ASR_IMM_OFF_POSTIND,
- OP_UND,
- OP_LDR_M_ROR_IMM_OFF_POSTIND,
- OP_UND, //011 0000 1 1111
-//------------------------------------------
- OP_UND, //011 0001 0 0000
- OP_UND,
- OP_UND,
- OP_UND,
- OP_UND,
- OP_UND,
- OP_UND,
- OP_UND,
- OP_UND,
- OP_UND,
- OP_UND,
- OP_UND,
- OP_UND,
- OP_UND,
- OP_UND,
- OP_UND,
- OP_UND,
- OP_UND,
- OP_UND,
- OP_UND,
- OP_UND,
- OP_UND,
- OP_UND,
- OP_UND,
- OP_UND,
- OP_UND,
- OP_UND,
- OP_UND,
- OP_UND,
- OP_UND,
- OP_UND,
- OP_UND, //011 0001 1 1111
-//------------------------------------------
- OP_STRB_M_LSL_IMM_OFF_POSTIND, //011 0010 0 0000
- OP_UND,
- OP_STRB_M_LSR_IMM_OFF_POSTIND,
- OP_UND,
- OP_STRB_M_ASR_IMM_OFF_POSTIND,
- OP_UND,
- OP_STRB_M_ROR_IMM_OFF_POSTIND,
- OP_UND,
- OP_STRB_M_LSL_IMM_OFF_POSTIND,
- OP_UND,
- OP_STRB_M_LSR_IMM_OFF_POSTIND,
- OP_UND,
- OP_STRB_M_ASR_IMM_OFF_POSTIND,
- OP_UND,
- OP_STRB_M_ROR_IMM_OFF_POSTIND,
- OP_UND,
- 
- OP_LDRB_M_LSL_IMM_OFF_POSTIND, 
- OP_UND,
- OP_LDRB_M_LSR_IMM_OFF_POSTIND,
- OP_UND,
- OP_LDRB_M_ASR_IMM_OFF_POSTIND,
- OP_UND,
- OP_LDRB_M_ROR_IMM_OFF_POSTIND,
- OP_UND,
- OP_LDRB_M_LSL_IMM_OFF_POSTIND,
- OP_UND,
- OP_LDRB_M_LSR_IMM_OFF_POSTIND,
- OP_UND,
- OP_LDRB_M_ASR_IMM_OFF_POSTIND,
- OP_UND,
- OP_LDRB_M_ROR_IMM_OFF_POSTIND,
- OP_UND, //011 0010 1 1111
-//------------------------------------------
- OP_STRBT_M_LSL_IMM_OFF_POSTIND, //011 0011 0 0000
- OP_UND,
- OP_STRBT_M_LSR_IMM_OFF_POSTIND,
- OP_UND,
- OP_STRBT_M_ASR_IMM_OFF_POSTIND,
- OP_UND,
- OP_STRBT_M_ROR_IMM_OFF_POSTIND,
- OP_UND,
- OP_STRBT_M_LSL_IMM_OFF_POSTIND,
- OP_UND,
- OP_STRBT_M_LSR_IMM_OFF_POSTIND,
- OP_UND,
- OP_STRBT_M_ASR_IMM_OFF_POSTIND,
- OP_UND,
- OP_STRBT_M_ROR_IMM_OFF_POSTIND,
- OP_UND,
- 
- OP_LDRBT_M_LSL_IMM_OFF_POSTIND, 
- OP_UND,
- OP_LDRBT_M_LSR_IMM_OFF_POSTIND,
- OP_UND,
- OP_LDRBT_M_ASR_IMM_OFF_POSTIND,
- OP_UND,
- OP_LDRBT_M_ROR_IMM_OFF_POSTIND,
- OP_UND,
- OP_LDRBT_M_LSL_IMM_OFF_POSTIND,
- OP_UND,
- OP_LDRBT_M_LSR_IMM_OFF_POSTIND,
- OP_UND,
- OP_LDRBT_M_ASR_IMM_OFF_POSTIND,
- OP_UND,
- OP_LDRBT_M_ROR_IMM_OFF_POSTIND,
- OP_UND, //011 0011 1 1111
-//------------------------------------------
- OP_STR_P_LSL_IMM_OFF_POSTIND, //011 0100 0 0000
- OP_UND,
- OP_STR_P_LSR_IMM_OFF_POSTIND,
- OP_UND,
- OP_STR_P_ASR_IMM_OFF_POSTIND,
- OP_UND,
- OP_STR_P_ROR_IMM_OFF_POSTIND,
- OP_UND,
- OP_STR_P_LSL_IMM_OFF_POSTIND,
- OP_UND,
- OP_STR_P_LSR_IMM_OFF_POSTIND,
- OP_UND,
- OP_STR_P_ASR_IMM_OFF_POSTIND,
- OP_UND,
- OP_STR_P_ROR_IMM_OFF_POSTIND,
- OP_UND,
- 
- OP_LDR_P_LSL_IMM_OFF_POSTIND, 
- OP_UND,
- OP_LDR_P_LSR_IMM_OFF_POSTIND,
- OP_UND,
- OP_LDR_P_ASR_IMM_OFF_POSTIND,
- OP_UND,
- OP_LDR_P_ROR_IMM_OFF_POSTIND,
- OP_UND,
- OP_LDR_P_LSL_IMM_OFF_POSTIND,
- OP_UND,
- OP_LDR_P_LSR_IMM_OFF_POSTIND,
- OP_UND,
- OP_LDR_P_ASR_IMM_OFF_POSTIND,
- OP_UND,
- OP_LDR_P_ROR_IMM_OFF_POSTIND,
- OP_UND, //011 0100 1 1111
-//------------------------------------------
- OP_UND, //011 0101 0 0000
- OP_UND,
- OP_UND,
- OP_UND,
- OP_UND,
- OP_UND,
- OP_UND,
- OP_UND,
- OP_UND,
- OP_UND,
- OP_UND,
- OP_UND,
- OP_UND,
- OP_UND,
- OP_UND,
- OP_UND,
-
- OP_UND,
- OP_UND,
- OP_UND,
- OP_UND,
- OP_UND,
- OP_UND,
- OP_UND,
- OP_UND,
- OP_UND,
- OP_UND,
- OP_UND,
- OP_UND,
- OP_UND,
- OP_UND,
- OP_UND,
- OP_UND, //011 0101 1 1111
-//------------------------------------------
- OP_STRB_P_LSL_IMM_OFF_POSTIND, //011 0110 0 0000
- OP_UND,
- OP_STRB_P_LSR_IMM_OFF_POSTIND,
- OP_UND,
- OP_STRB_P_ASR_IMM_OFF_POSTIND,
- OP_UND,
- OP_STRB_P_ROR_IMM_OFF_POSTIND,
- OP_UND,
- OP_STRB_P_LSL_IMM_OFF_POSTIND,
- OP_UND,
- OP_STRB_P_LSR_IMM_OFF_POSTIND,
- OP_UND,
- OP_STRB_P_ASR_IMM_OFF_POSTIND,
- OP_UND,
- OP_STRB_P_ROR_IMM_OFF_POSTIND,
- OP_UND,
- 
- OP_LDRB_P_LSL_IMM_OFF_POSTIND, 
- OP_UND,
- OP_LDRB_P_LSR_IMM_OFF_POSTIND,
- OP_UND,
- OP_LDRB_P_ASR_IMM_OFF_POSTIND,
- OP_UND,
- OP_LDRB_P_ROR_IMM_OFF_POSTIND,
- OP_UND,
- OP_LDRB_P_LSL_IMM_OFF_POSTIND,
- OP_UND,
- OP_LDRB_P_LSR_IMM_OFF_POSTIND,
- OP_UND,
- OP_LDRB_P_ASR_IMM_OFF_POSTIND,
- OP_UND,
- OP_LDRB_P_ROR_IMM_OFF_POSTIND,
- OP_UND, 
-//------------------------------------------
- OP_STRBT_P_LSL_IMM_OFF_POSTIND, //011 0111 0 0000
- OP_UND,
- OP_STRBT_P_LSR_IMM_OFF_POSTIND,
- OP_UND,
- OP_STRBT_P_ASR_IMM_OFF_POSTIND,
- OP_UND,
- OP_STRBT_P_ROR_IMM_OFF_POSTIND,
- OP_UND,
- OP_STRBT_P_LSL_IMM_OFF_POSTIND,
- OP_UND,
- OP_STRBT_P_LSR_IMM_OFF_POSTIND,
- OP_UND,
- OP_STRBT_P_ASR_IMM_OFF_POSTIND,
- OP_UND,
- OP_STRBT_P_ROR_IMM_OFF_POSTIND,
- OP_UND,
- 
- OP_LDRBT_P_LSL_IMM_OFF_POSTIND, 
- OP_UND,
- OP_LDRBT_P_LSR_IMM_OFF_POSTIND,
- OP_UND,
- OP_LDRBT_P_ASR_IMM_OFF_POSTIND,
- OP_UND,
- OP_LDRBT_P_ROR_IMM_OFF_POSTIND,
- OP_UND,
- OP_LDRBT_P_LSL_IMM_OFF_POSTIND,
- OP_UND,
- OP_LDRBT_P_LSR_IMM_OFF_POSTIND,
- OP_UND,
- OP_LDRBT_P_ASR_IMM_OFF_POSTIND,
- OP_UND,
- OP_LDRBT_P_ROR_IMM_OFF_POSTIND,
- OP_UND, 
-//------------------------------------------
- OP_STR_M_LSL_IMM_OFF, //011 1000 0 0000
- OP_UND,
- OP_STR_M_LSR_IMM_OFF,
- OP_UND,
- OP_STR_M_ASR_IMM_OFF,
- OP_UND,
- OP_STR_M_ROR_IMM_OFF,
- OP_UND,
- OP_STR_M_LSL_IMM_OFF,
- OP_UND,
- OP_STR_M_LSR_IMM_OFF,
- OP_UND,
- OP_STR_M_ASR_IMM_OFF,
- OP_UND,
- OP_STR_M_ROR_IMM_OFF,
- OP_UND,
- 
- OP_LDR_M_LSL_IMM_OFF,
- OP_UND,
- OP_LDR_M_LSR_IMM_OFF,
- OP_UND,
- OP_LDR_M_ASR_IMM_OFF,
- OP_UND,
- OP_LDR_M_ROR_IMM_OFF,
- OP_UND,
- OP_LDR_M_LSL_IMM_OFF,
- OP_UND,
- OP_LDR_M_LSR_IMM_OFF,
- OP_UND,
- OP_LDR_M_ASR_IMM_OFF,
- OP_UND,
- OP_LDR_M_ROR_IMM_OFF,
- OP_UND,
-//------------------------------------------
- OP_STR_M_LSL_IMM_OFF_PREIND, //011 1001 0 0000
- OP_UND,
- OP_STR_M_LSR_IMM_OFF_PREIND,
- OP_UND,
- OP_STR_M_ASR_IMM_OFF_PREIND,
- OP_UND,
- OP_STR_M_ROR_IMM_OFF_PREIND,
- OP_UND,
- OP_STR_M_LSL_IMM_OFF_PREIND,
- OP_UND,
- OP_STR_M_LSR_IMM_OFF_PREIND,
- OP_UND,
- OP_STR_M_ASR_IMM_OFF_PREIND,
- OP_UND,
- OP_STR_M_ROR_IMM_OFF_PREIND,
- OP_UND,
- 
- OP_LDR_M_LSL_IMM_OFF_PREIND,
- OP_UND,
- OP_LDR_M_LSR_IMM_OFF_PREIND,
- OP_UND,
- OP_LDR_M_ASR_IMM_OFF_PREIND,
- OP_UND,
- OP_LDR_M_ROR_IMM_OFF_PREIND,
- OP_UND,
- OP_LDR_M_LSL_IMM_OFF_PREIND,
- OP_UND,
- OP_LDR_M_LSR_IMM_OFF_PREIND,
- OP_UND,
- OP_LDR_M_ASR_IMM_OFF_PREIND,
- OP_UND,
- OP_LDR_M_ROR_IMM_OFF_PREIND,
- OP_UND,
-//------------------------------------------
- OP_STRB_M_LSL_IMM_OFF, //011 1010 0 0000
- OP_UND,
- OP_STRB_M_LSR_IMM_OFF,
- OP_UND,
- OP_STRB_M_ASR_IMM_OFF,
- OP_UND,
- OP_STRB_M_ROR_IMM_OFF,
- OP_UND,
- OP_STRB_M_LSL_IMM_OFF,
- OP_UND,
- OP_STRB_M_LSR_IMM_OFF,
- OP_UND,
- OP_STRB_M_ASR_IMM_OFF,
- OP_UND,
- OP_STRB_M_ROR_IMM_OFF,
- OP_UND,
- 
- OP_LDRB_M_LSL_IMM_OFF,
- OP_UND,
- OP_LDRB_M_LSR_IMM_OFF,
- OP_UND,
- OP_LDRB_M_ASR_IMM_OFF,
- OP_UND,
- OP_LDRB_M_ROR_IMM_OFF,
- OP_UND,
- OP_LDRB_M_LSL_IMM_OFF,
- OP_UND,
- OP_LDRB_M_LSR_IMM_OFF,
- OP_UND,
- OP_LDRB_M_ASR_IMM_OFF,
- OP_UND,
- OP_LDRB_M_ROR_IMM_OFF,
- OP_UND,
-//------------------------------------------
- OP_STRB_M_LSL_IMM_OFF_PREIND, //011 1011 0 0000
- OP_UND,
- OP_STRB_M_LSR_IMM_OFF_PREIND,
- OP_UND,
- OP_STRB_M_ASR_IMM_OFF_PREIND,
- OP_UND,
- OP_STRB_M_ROR_IMM_OFF_PREIND,
- OP_UND,
- OP_STRB_M_LSL_IMM_OFF_PREIND,
- OP_UND,
- OP_STRB_M_LSR_IMM_OFF_PREIND,
- OP_UND,
- OP_STRB_M_ASR_IMM_OFF_PREIND,
- OP_UND,
- OP_STRB_M_ROR_IMM_OFF_PREIND,
- OP_UND,
- 
- OP_LDRB_M_LSL_IMM_OFF_PREIND,
- OP_UND,
- OP_LDRB_M_LSR_IMM_OFF_PREIND,
- OP_UND,
- OP_LDRB_M_ASR_IMM_OFF_PREIND,
- OP_UND,
- OP_LDRB_M_ROR_IMM_OFF_PREIND,
- OP_UND,
- OP_LDRB_M_LSL_IMM_OFF_PREIND,
- OP_UND,
- OP_LDRB_M_LSR_IMM_OFF_PREIND,
- OP_UND,
- OP_LDRB_M_ASR_IMM_OFF_PREIND,
- OP_UND,
- OP_LDRB_M_ROR_IMM_OFF_PREIND,
- OP_UND,
-//------------------------------------------
- OP_STR_P_LSL_IMM_OFF, //011 1100 0 0000
- OP_UND,
- OP_STR_P_LSR_IMM_OFF,
- OP_UND,
- OP_STR_P_ASR_IMM_OFF,
- OP_UND,
- OP_STR_P_ROR_IMM_OFF,
- OP_UND,
- OP_STR_P_LSL_IMM_OFF,
- OP_UND,
- OP_STR_P_LSR_IMM_OFF,
- OP_UND,
- OP_STR_P_ASR_IMM_OFF,
- OP_UND,
- OP_STR_P_ROR_IMM_OFF,
- OP_UND,
- 
- OP_LDR_P_LSL_IMM_OFF,
- OP_UND,
- OP_LDR_P_LSR_IMM_OFF,
- OP_UND,
- OP_LDR_P_ASR_IMM_OFF,
- OP_UND,
- OP_LDR_P_ROR_IMM_OFF,
- OP_UND,
- OP_LDR_P_LSL_IMM_OFF,
- OP_UND,
- OP_LDR_P_LSR_IMM_OFF,
- OP_UND,
- OP_LDR_P_ASR_IMM_OFF,
- OP_UND,
- OP_LDR_P_ROR_IMM_OFF,
- OP_UND,
-//------------------------------------------
- OP_STR_P_LSL_IMM_OFF_PREIND, //011 1101 0 0000
- OP_UND,
- OP_STR_P_LSR_IMM_OFF_PREIND,
- OP_UND,
- OP_STR_P_ASR_IMM_OFF_PREIND,
- OP_UND,
- OP_STR_P_ROR_IMM_OFF_PREIND,
- OP_UND,
- OP_STR_P_LSL_IMM_OFF_PREIND,
- OP_UND,
- OP_STR_P_LSR_IMM_OFF_PREIND,
- OP_UND,
- OP_STR_P_ASR_IMM_OFF_PREIND,
- OP_UND,
- OP_STR_P_ROR_IMM_OFF_PREIND,
- OP_UND,
- 
- OP_LDR_P_LSL_IMM_OFF_PREIND,
- OP_UND,
- OP_LDR_P_LSR_IMM_OFF_PREIND,
- OP_UND,
- OP_LDR_P_ASR_IMM_OFF_PREIND,
- OP_UND,
- OP_LDR_P_ROR_IMM_OFF_PREIND,
- OP_UND,
- OP_LDR_P_LSL_IMM_OFF_PREIND,
- OP_UND,
- OP_LDR_P_LSR_IMM_OFF_PREIND,
- OP_UND,
- OP_LDR_P_ASR_IMM_OFF_PREIND,
- OP_UND,
- OP_LDR_P_ROR_IMM_OFF_PREIND,
- OP_UND,
-//------------------------------------------
- OP_STRB_P_LSL_IMM_OFF, //011 1110 0 0000
- OP_UND,
- OP_STRB_P_LSR_IMM_OFF,
- OP_UND,
- OP_STRB_P_ASR_IMM_OFF,
- OP_UND,
- OP_STRB_P_ROR_IMM_OFF,
- OP_UND,
- OP_STRB_P_LSL_IMM_OFF,
- OP_UND,
- OP_STRB_P_LSR_IMM_OFF,
- OP_UND,
- OP_STRB_P_ASR_IMM_OFF,
- OP_UND,
- OP_STRB_P_ROR_IMM_OFF,
- OP_UND,
- 
- OP_LDRB_P_LSL_IMM_OFF,
- OP_UND,
- OP_LDRB_P_LSR_IMM_OFF,
- OP_UND,
- OP_LDRB_P_ASR_IMM_OFF,
- OP_UND,
- OP_LDRB_P_ROR_IMM_OFF,
- OP_UND,
- OP_LDRB_P_LSL_IMM_OFF,
- OP_UND,
- OP_LDRB_P_LSR_IMM_OFF,
- OP_UND,
- OP_LDRB_P_ASR_IMM_OFF,
- OP_UND,
- OP_LDRB_P_ROR_IMM_OFF,
- OP_UND,
-//------------------------------------------
- OP_STRB_P_LSL_IMM_OFF_PREIND, //011 1111 0 0000
- OP_UND,
- OP_STRB_P_LSR_IMM_OFF_PREIND,
- OP_UND,
- OP_STRB_P_ASR_IMM_OFF_PREIND,
- OP_UND,
- OP_STRB_P_ROR_IMM_OFF_PREIND,
- OP_UND,
- OP_STRB_P_LSL_IMM_OFF_PREIND,
- OP_UND,
- OP_STRB_P_LSR_IMM_OFF_PREIND,
- OP_UND,
- OP_STRB_P_ASR_IMM_OFF_PREIND,
- OP_UND,
- OP_STRB_P_ROR_IMM_OFF_PREIND,
- OP_UND,
- 
- OP_LDRB_P_LSL_IMM_OFF_PREIND,
- OP_UND,
- OP_LDRB_P_LSR_IMM_OFF_PREIND,
- OP_UND,
- OP_LDRB_P_ASR_IMM_OFF_PREIND,
- OP_UND,
- OP_LDRB_P_ROR_IMM_OFF_PREIND,
- OP_UND,
- OP_LDRB_P_LSL_IMM_OFF_PREIND,
- OP_UND,
- OP_LDRB_P_LSR_IMM_OFF_PREIND,
- OP_UND,
- OP_LDRB_P_ASR_IMM_OFF_PREIND,
- OP_UND,
- OP_LDRB_P_ROR_IMM_OFF_PREIND,
- OP_UND, //011 1111 1 1111
-//------------------------------------------
- OP_STMDA, //100 0000 0 0000
- OP_STMDA,
- OP_STMDA,
- OP_STMDA,
- OP_STMDA,
- OP_STMDA,
- OP_STMDA,
- OP_STMDA,
- OP_STMDA,
- OP_STMDA,
- OP_STMDA,
- OP_STMDA,
- OP_STMDA,
- OP_STMDA,
- OP_STMDA,
- OP_STMDA,
- 
- OP_LDMDA,
- OP_LDMDA,
- OP_LDMDA,
- OP_LDMDA,
- OP_LDMDA,
- OP_LDMDA,
- OP_LDMDA,
- OP_LDMDA,
- OP_LDMDA,
- OP_LDMDA,
- OP_LDMDA,
- OP_LDMDA,
- OP_LDMDA,
- OP_LDMDA,
- OP_LDMDA,
- OP_LDMDA,
-//------------------------------------------
- OP_STMDA_W, //100 0001 0 0000
- OP_STMDA_W,
- OP_STMDA_W,
- OP_STMDA_W,
- OP_STMDA_W,
- OP_STMDA_W,
- OP_STMDA_W,
- OP_STMDA_W,
- OP_STMDA_W,
- OP_STMDA_W,
- OP_STMDA_W,
- OP_STMDA_W,
- OP_STMDA_W,
- OP_STMDA_W,
- OP_STMDA_W,
- OP_STMDA_W,
- 
- OP_LDMDA_W,
- OP_LDMDA_W,
- OP_LDMDA_W,
- OP_LDMDA_W,
- OP_LDMDA_W,
- OP_LDMDA_W,
- OP_LDMDA_W,
- OP_LDMDA_W,
- OP_LDMDA_W,
- OP_LDMDA_W,
- OP_LDMDA_W,
- OP_LDMDA_W,
- OP_LDMDA_W,
- OP_LDMDA_W,
- OP_LDMDA_W,
- OP_LDMDA_W,
-//------------------------------------------
- OP_STMDA2, //100 0010 0 0000
- OP_STMDA2,
- OP_STMDA2,
- OP_STMDA2,
- OP_STMDA2,
- OP_STMDA2,
- OP_STMDA2,
- OP_STMDA2,
- OP_STMDA2,
- OP_STMDA2,
- OP_STMDA2,
- OP_STMDA2,
- OP_STMDA2,
- OP_STMDA2,
- OP_STMDA2,
- OP_STMDA2,
- 
- OP_LDMDA2,
- OP_LDMDA2,
- OP_LDMDA2,
- OP_LDMDA2,
- OP_LDMDA2,
- OP_LDMDA2,
- OP_LDMDA2,
- OP_LDMDA2,
- OP_LDMDA2,
- OP_LDMDA2,
- OP_LDMDA2,
- OP_LDMDA2,
- OP_LDMDA2,
- OP_LDMDA2,
- OP_LDMDA2,
- OP_LDMDA2,
-//------------------------------------------
- OP_STMDA2_W, //100 0011 0 0000
- OP_STMDA2_W,
- OP_STMDA2_W,
- OP_STMDA2_W,
- OP_STMDA2_W,
- OP_STMDA2_W,
- OP_STMDA2_W,
- OP_STMDA2_W,
- OP_STMDA2_W,
- OP_STMDA2_W,
- OP_STMDA2_W,
- OP_STMDA2_W,
- OP_STMDA2_W,
- OP_STMDA2_W,
- OP_STMDA2_W,
- OP_STMDA2_W,
- 
- OP_LDMDA2_W,
- OP_LDMDA2_W,
- OP_LDMDA2_W,
- OP_LDMDA2_W,
- OP_LDMDA2_W,
- OP_LDMDA2_W,
- OP_LDMDA2_W,
- OP_LDMDA2_W,
- OP_LDMDA2_W,
- OP_LDMDA2_W,
- OP_LDMDA2_W,
- OP_LDMDA2_W,
- OP_LDMDA2_W,
- OP_LDMDA2_W,
- OP_LDMDA2_W,
- OP_LDMDA2_W,
-//------------------------------------------
- OP_STMIA, //100 0100 0 0000
- OP_STMIA,
- OP_STMIA,
- OP_STMIA,
- OP_STMIA,
- OP_STMIA,
- OP_STMIA,
- OP_STMIA,
- OP_STMIA,
- OP_STMIA,
- OP_STMIA,
- OP_STMIA,
- OP_STMIA,
- OP_STMIA,
- OP_STMIA,
- OP_STMIA,
- 
- OP_LDMIA,
- OP_LDMIA,
- OP_LDMIA,
- OP_LDMIA,
- OP_LDMIA,
- OP_LDMIA,
- OP_LDMIA,
- OP_LDMIA,
- OP_LDMIA,
- OP_LDMIA,
- OP_LDMIA,
- OP_LDMIA,
- OP_LDMIA,
- OP_LDMIA,
- OP_LDMIA,
- OP_LDMIA,
-//------------------------------------------
- OP_STMIA_W, //100 0101 0 0000
- OP_STMIA_W,
- OP_STMIA_W,
- OP_STMIA_W,
- OP_STMIA_W,
- OP_STMIA_W,
- OP_STMIA_W,
- OP_STMIA_W,
- OP_STMIA_W,
- OP_STMIA_W,
- OP_STMIA_W,
- OP_STMIA_W,
- OP_STMIA_W,
- OP_STMIA_W,
- OP_STMIA_W,
- OP_STMIA_W,
- 
- OP_LDMIA_W,
- OP_LDMIA_W,
- OP_LDMIA_W,
- OP_LDMIA_W,
- OP_LDMIA_W,
- OP_LDMIA_W,
- OP_LDMIA_W,
- OP_LDMIA_W,
- OP_LDMIA_W,
- OP_LDMIA_W,
- OP_LDMIA_W,
- OP_LDMIA_W,
- OP_LDMIA_W,
- OP_LDMIA_W,
- OP_LDMIA_W,
- OP_LDMIA_W,
-//------------------------------------------
- OP_STMIA2, //100 0110 0 0000
- OP_STMIA2,
- OP_STMIA2,
- OP_STMIA2,
- OP_STMIA2,
- OP_STMIA2,
- OP_STMIA2,
- OP_STMIA2,
- OP_STMIA2,
- OP_STMIA2,
- OP_STMIA2,
- OP_STMIA2,
- OP_STMIA2,
- OP_STMIA2,
- OP_STMIA2,
- OP_STMIA2,
- 
- OP_LDMIA2,
- OP_LDMIA2,
- OP_LDMIA2,
- OP_LDMIA2,
- OP_LDMIA2,
- OP_LDMIA2,
- OP_LDMIA2,
- OP_LDMIA2,
- OP_LDMIA2,
- OP_LDMIA2,
- OP_LDMIA2,
- OP_LDMIA2,
- OP_LDMIA2,
- OP_LDMIA2,
- OP_LDMIA2,
- OP_LDMIA2,
-//------------------------------------------
- OP_STMIA2_W, //100 0111 0 0000
- OP_STMIA2_W,
- OP_STMIA2_W,
- OP_STMIA2_W,
- OP_STMIA2_W,
- OP_STMIA2_W,
- OP_STMIA2_W,
- OP_STMIA2_W,
- OP_STMIA2_W,
- OP_STMIA2_W,
- OP_STMIA2_W,
- OP_STMIA2_W,
- OP_STMIA2_W,
- OP_STMIA2_W,
- OP_STMIA2_W,
- OP_STMIA2_W,
- 
- OP_LDMIA2_W,
- OP_LDMIA2_W,
- OP_LDMIA2_W,
- OP_LDMIA2_W,
- OP_LDMIA2_W,
- OP_LDMIA2_W,
- OP_LDMIA2_W,
- OP_LDMIA2_W,
- OP_LDMIA2_W,
- OP_LDMIA2_W,
- OP_LDMIA2_W,
- OP_LDMIA2_W,
- OP_LDMIA2_W,
- OP_LDMIA2_W,
- OP_LDMIA2_W,
- OP_LDMIA2_W,
-//------------------------------------------
- OP_STMDB, //100 1000 0 0000
- OP_STMDB,
- OP_STMDB,
- OP_STMDB,
- OP_STMDB,
- OP_STMDB,
- OP_STMDB,
- OP_STMDB,
- OP_STMDB,
- OP_STMDB,
- OP_STMDB,
- OP_STMDB,
- OP_STMDB,
- OP_STMDB,
- OP_STMDB,
- OP_STMDB,
- 
- OP_LDMDB,
- OP_LDMDB,
- OP_LDMDB,
- OP_LDMDB,
- OP_LDMDB,
- OP_LDMDB,
- OP_LDMDB,
- OP_LDMDB,
- OP_LDMDB,
- OP_LDMDB,
- OP_LDMDB,
- OP_LDMDB,
- OP_LDMDB,
- OP_LDMDB,
- OP_LDMDB,
- OP_LDMDB,
-//------------------------------------------
- OP_STMDB_W, //100 1001 0 0000
- OP_STMDB_W,
- OP_STMDB_W,
- OP_STMDB_W,
- OP_STMDB_W,
- OP_STMDB_W,
- OP_STMDB_W,
- OP_STMDB_W,
- OP_STMDB_W,
- OP_STMDB_W,
- OP_STMDB_W,
- OP_STMDB_W,
- OP_STMDB_W,
- OP_STMDB_W,
- OP_STMDB_W,
- OP_STMDB_W,
- 
- OP_LDMDB_W,
- OP_LDMDB_W,
- OP_LDMDB_W,
- OP_LDMDB_W,
- OP_LDMDB_W,
- OP_LDMDB_W,
- OP_LDMDB_W,
- OP_LDMDB_W,
- OP_LDMDB_W,
- OP_LDMDB_W,
- OP_LDMDB_W,
- OP_LDMDB_W,
- OP_LDMDB_W,
- OP_LDMDB_W,
- OP_LDMDB_W,
- OP_LDMDB_W,
-//------------------------------------------
- OP_STMDB2, //100 1010 0 0000
- OP_STMDB2,
- OP_STMDB2,
- OP_STMDB2,
- OP_STMDB2,
- OP_STMDB2,
- OP_STMDB2,
- OP_STMDB2,
- OP_STMDB2,
- OP_STMDB2,
- OP_STMDB2,
- OP_STMDB2,
- OP_STMDB2,
- OP_STMDB2,
- OP_STMDB2,
- OP_STMDB2,
- 
- OP_LDMDB2,
- OP_LDMDB2,
- OP_LDMDB2,
- OP_LDMDB2,
- OP_LDMDB2,
- OP_LDMDB2,
- OP_LDMDB2,
- OP_LDMDB2,
- OP_LDMDB2,
- OP_LDMDB2,
- OP_LDMDB2,
- OP_LDMDB2,
- OP_LDMDB2,
- OP_LDMDB2,
- OP_LDMDB2,
- OP_LDMDB2,
-//------------------------------------------
- OP_STMDB2_W, //100 1011 0 0000
- OP_STMDB2_W,
- OP_STMDB2_W,
- OP_STMDB2_W,
- OP_STMDB2_W,
- OP_STMDB2_W,
- OP_STMDB2_W,
- OP_STMDB2_W,
- OP_STMDB2_W,
- OP_STMDB2_W,
- OP_STMDB2_W,
- OP_STMDB2_W,
- OP_STMDB2_W,
- OP_STMDB2_W,
- OP_STMDB2_W,
- OP_STMDB2_W,
- 
- OP_LDMDB2_W,
- OP_LDMDB2_W,
- OP_LDMDB2_W,
- OP_LDMDB2_W,
- OP_LDMDB2_W,
- OP_LDMDB2_W,
- OP_LDMDB2_W,
- OP_LDMDB2_W,
- OP_LDMDB2_W,
- OP_LDMDB2_W,
- OP_LDMDB2_W,
- OP_LDMDB2_W,
- OP_LDMDB2_W,
- OP_LDMDB2_W,
- OP_LDMDB2_W,
- OP_LDMDB2_W,
-//------------------------------------------
-
-
- OP_STMIB, //100 1100 0 0000
- OP_STMIB,
- OP_STMIB,
- OP_STMIB,
- OP_STMIB,
- OP_STMIB,
- OP_STMIB,
- OP_STMIB,
- OP_STMIB,
- OP_STMIB,
- OP_STMIB,
- OP_STMIB,
- OP_STMIB,
- OP_STMIB,
- OP_STMIB,
- OP_STMIB,
- 
- OP_LDMIB,
- OP_LDMIB,
- OP_LDMIB,
- OP_LDMIB,
- OP_LDMIB,
- OP_LDMIB,
- OP_LDMIB,
- OP_LDMIB,
- OP_LDMIB,
- OP_LDMIB,
- OP_LDMIB,
- OP_LDMIB,
- OP_LDMIB,
- OP_LDMIB,
- OP_LDMIB,
- OP_LDMIB,
-//------------------------------------------
- OP_STMIB_W, //100 1101 0 0000
- OP_STMIB_W,
- OP_STMIB_W,
- OP_STMIB_W,
- OP_STMIB_W,
- OP_STMIB_W,
- OP_STMIB_W,
- OP_STMIB_W,
- OP_STMIB_W,
- OP_STMIB_W,
- OP_STMIB_W,
- OP_STMIB_W,
- OP_STMIB_W,
- OP_STMIB_W,
- OP_STMIB_W,
- OP_STMIB_W,
- 
- OP_LDMIB_W,
- OP_LDMIB_W,
- OP_LDMIB_W,
- OP_LDMIB_W,
- OP_LDMIB_W,
- OP_LDMIB_W,
- OP_LDMIB_W,
- OP_LDMIB_W,
- OP_LDMIB_W,
- OP_LDMIB_W,
- OP_LDMIB_W,
- OP_LDMIB_W,
- OP_LDMIB_W,
- OP_LDMIB_W,
- OP_LDMIB_W,
- OP_LDMIB_W,
-//------------------------------------------
- OP_STMIB2, //100 1110 0 0000
- OP_STMIB2,
- OP_STMIB2,
- OP_STMIB2,
- OP_STMIB2,
- OP_STMIB2,
- OP_STMIB2,
- OP_STMIB2,
- OP_STMIB2,
- OP_STMIB2,
- OP_STMIB2,
- OP_STMIB2,
- OP_STMIB2,
- OP_STMIB2,
- OP_STMIB2,
- OP_STMIB2,
- 
- OP_LDMIB2,
- OP_LDMIB2,
- OP_LDMIB2,
- OP_LDMIB2,
- OP_LDMIB2,
- OP_LDMIB2,
- OP_LDMIB2,
- OP_LDMIB2,
- OP_LDMIB2,
- OP_LDMIB2,
- OP_LDMIB2,
- OP_LDMIB2,
- OP_LDMIB2,
- OP_LDMIB2,
- OP_LDMIB2,
- OP_LDMIB2,
-//------------------------------------------
- OP_STMIB2_W, //100 1111 0 0000
- OP_STMIB2_W,
- OP_STMIB2_W,
- OP_STMIB2_W,
- OP_STMIB2_W,
- OP_STMIB2_W,
- OP_STMIB2_W,
- OP_STMIB2_W,
- OP_STMIB2_W,
- OP_STMIB2_W,
- OP_STMIB2_W,
- OP_STMIB2_W,
- OP_STMIB2_W,
- OP_STMIB2_W,
- OP_STMIB2_W,
- OP_STMIB2_W,
- 
- OP_LDMIB2_W,
- OP_LDMIB2_W,
- OP_LDMIB2_W,
- OP_LDMIB2_W,
- OP_LDMIB2_W,
- OP_LDMIB2_W,
- OP_LDMIB2_W,
- OP_LDMIB2_W,
- OP_LDMIB2_W,
- OP_LDMIB2_W,
- OP_LDMIB2_W,
- OP_LDMIB2_W,
- OP_LDMIB2_W,
- OP_LDMIB2_W,
- OP_LDMIB2_W,
- OP_LDMIB2_W,
-//------------------------------------------
- OP_B, //101 0000 0 0000
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
-//------------------------------------------
- OP_B, //101 0001 0 0000
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
-//------------------------------------------
- OP_B, //101 0010 0 0000
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
-//------------------------------------------
- OP_B, //101 0011 0 0000
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
-//------------------------------------------
- OP_B, //101 0100 0 0000
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
-//------------------------------------------
- OP_B, //101 0101 0 0000
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
-//------------------------------------------
- OP_B, //101 0110 0 0000
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
-//------------------------------------------
- OP_B, //101 0111 0 0000
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
- OP_B,
-//------------------------------------------
- OP_BL, //101 1000 0 0000
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
-//------------------------------------------
- OP_BL, //101 1001 0 0000
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
-//------------------------------------------
- OP_BL, //101 1010 0 0000
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
-//------------------------------------------
- OP_BL, //101 1011 0 0000
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
-//------------------------------------------
- OP_BL, //101 1100 0 0000
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
-//------------------------------------------
- OP_BL, //101 1101 0 0000
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
-//------------------------------------------
- OP_BL, //101 1110 0 0000
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
-//------------------------------------------
- OP_BL, //101 1111 0 0000
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
- OP_BL,
-//------------------------------------------
- OP_STC_OPTION, //110 0000 0 0000
- OP_STC_OPTION,
- OP_STC_OPTION,
- OP_STC_OPTION,
- OP_STC_OPTION,
- OP_STC_OPTION,
- OP_STC_OPTION,
- OP_STC_OPTION,
- OP_STC_OPTION,
- OP_STC_OPTION,
- OP_STC_OPTION,
- OP_STC_OPTION,
- OP_STC_OPTION,
- OP_STC_OPTION,
- OP_STC_OPTION,
- OP_STC_OPTION,
- 
- OP_LDC_OPTION,
- OP_LDC_OPTION,
- OP_LDC_OPTION,
- OP_LDC_OPTION,
- OP_LDC_OPTION,
- OP_LDC_OPTION,
- OP_LDC_OPTION,
- OP_LDC_OPTION,
- OP_LDC_OPTION,
- OP_LDC_OPTION,
- OP_LDC_OPTION,
- OP_LDC_OPTION,
- OP_LDC_OPTION,
- OP_LDC_OPTION,
- OP_LDC_OPTION,
- OP_LDC_OPTION,
-//------------------------------------------
- OP_STC_M_POSTIND, //110 0001 0 0000
- OP_STC_M_POSTIND,
- OP_STC_M_POSTIND,
- OP_STC_M_POSTIND,
- OP_STC_M_POSTIND,
- OP_STC_M_POSTIND,
- OP_STC_M_POSTIND,
- OP_STC_M_POSTIND,
- OP_STC_M_POSTIND,
- OP_STC_M_POSTIND,
- OP_STC_M_POSTIND,
- OP_STC_M_POSTIND,
- OP_STC_M_POSTIND,
- OP_STC_M_POSTIND,
- OP_STC_M_POSTIND,
- OP_STC_M_POSTIND,
- 
- OP_LDC_M_POSTIND,
- OP_LDC_M_POSTIND,
- OP_LDC_M_POSTIND,
- OP_LDC_M_POSTIND,
- OP_LDC_M_POSTIND,
- OP_LDC_M_POSTIND,
- OP_LDC_M_POSTIND,
- OP_LDC_M_POSTIND,
- OP_LDC_M_POSTIND,
- OP_LDC_M_POSTIND,
- OP_LDC_M_POSTIND,
- OP_LDC_M_POSTIND,
- OP_LDC_M_POSTIND,
- OP_LDC_M_POSTIND,
- OP_LDC_M_POSTIND,
- OP_LDC_M_POSTIND,
-//------------------------------------------
- OP_STC_OPTION, //110 0010 0 0000
- OP_STC_OPTION,
- OP_STC_OPTION,
- OP_STC_OPTION,
- OP_STC_OPTION,
- OP_STC_OPTION,
- OP_STC_OPTION,
- OP_STC_OPTION,
- OP_STC_OPTION,
- OP_STC_OPTION,
- OP_STC_OPTION,
- OP_STC_OPTION,
- OP_STC_OPTION,
- OP_STC_OPTION,
- OP_STC_OPTION,
- OP_STC_OPTION,
- 
- OP_LDC_OPTION,
- OP_LDC_OPTION,
- OP_LDC_OPTION,
- OP_LDC_OPTION,
- OP_LDC_OPTION,
- OP_LDC_OPTION,
- OP_LDC_OPTION,
- OP_LDC_OPTION,
- OP_LDC_OPTION,
- OP_LDC_OPTION,
- OP_LDC_OPTION,
- OP_LDC_OPTION,
- OP_LDC_OPTION,
- OP_LDC_OPTION,
- OP_LDC_OPTION,
- OP_LDC_OPTION,
-//------------------------------------------
- OP_STC_M_POSTIND, //110 0011 0 0000
- OP_STC_M_POSTIND,
- OP_STC_M_POSTIND,
- OP_STC_M_POSTIND,
- OP_STC_M_POSTIND,
- OP_STC_M_POSTIND,
- OP_STC_M_POSTIND,
- OP_STC_M_POSTIND,
- OP_STC_M_POSTIND,
- OP_STC_M_POSTIND,
- OP_STC_M_POSTIND,
- OP_STC_M_POSTIND,
- OP_STC_M_POSTIND,
- OP_STC_M_POSTIND,
- OP_STC_M_POSTIND,
- OP_STC_M_POSTIND,
- 
- OP_LDC_M_POSTIND,
- OP_LDC_M_POSTIND,
- OP_LDC_M_POSTIND,
- OP_LDC_M_POSTIND,
- OP_LDC_M_POSTIND,
- OP_LDC_M_POSTIND,
- OP_LDC_M_POSTIND,
- OP_LDC_M_POSTIND,
- OP_LDC_M_POSTIND,
- OP_LDC_M_POSTIND,
- OP_LDC_M_POSTIND,
- OP_LDC_M_POSTIND,
- OP_LDC_M_POSTIND,
- OP_LDC_M_POSTIND,
- OP_LDC_M_POSTIND,
- OP_LDC_M_POSTIND,
-//------------------------------------------
- OP_STC_OPTION, //110 0100 0 0000
- OP_STC_OPTION,
- OP_STC_OPTION,
- OP_STC_OPTION,
- OP_STC_OPTION,
- OP_STC_OPTION,
- OP_STC_OPTION,
- OP_STC_OPTION,
- OP_STC_OPTION,
- OP_STC_OPTION,
- OP_STC_OPTION,
- OP_STC_OPTION,
- OP_STC_OPTION,
- OP_STC_OPTION,
- OP_STC_OPTION,
- OP_STC_OPTION,
- 
- OP_LDC_OPTION,
- OP_LDC_OPTION,
- OP_LDC_OPTION,
- OP_LDC_OPTION,
- OP_LDC_OPTION,
- OP_LDC_OPTION,
- OP_LDC_OPTION,
- OP_LDC_OPTION,
- OP_LDC_OPTION,
- OP_LDC_OPTION,
- OP_LDC_OPTION,
- OP_LDC_OPTION,
- OP_LDC_OPTION,
- OP_LDC_OPTION,
- OP_LDC_OPTION,
- OP_LDC_OPTION,
-//------------------------------------------
- OP_STC_P_POSTIND, //110 0101 0 0000
- OP_STC_P_POSTIND,
- OP_STC_P_POSTIND,
- OP_STC_P_POSTIND,
- OP_STC_P_POSTIND,
- OP_STC_P_POSTIND,
- OP_STC_P_POSTIND,
- OP_STC_P_POSTIND,
- OP_STC_P_POSTIND,
- OP_STC_P_POSTIND,
- OP_STC_P_POSTIND,
- OP_STC_P_POSTIND,
- OP_STC_P_POSTIND,
- OP_STC_P_POSTIND,
- OP_STC_P_POSTIND,
- OP_STC_P_POSTIND,
- 
- OP_LDC_P_POSTIND,
- OP_LDC_P_POSTIND,
- OP_LDC_P_POSTIND,
- OP_LDC_P_POSTIND,
- OP_LDC_P_POSTIND,
- OP_LDC_P_POSTIND,
- OP_LDC_P_POSTIND,
- OP_LDC_P_POSTIND,
- OP_LDC_P_POSTIND,
- OP_LDC_P_POSTIND,
- OP_LDC_P_POSTIND,
- OP_LDC_P_POSTIND,
- OP_LDC_P_POSTIND,
- OP_LDC_P_POSTIND,
- OP_LDC_P_POSTIND,
- OP_LDC_P_POSTIND,
-//------------------------------------------
- OP_STC_OPTION, //110 0110 0 0000
- OP_STC_OPTION,
- OP_STC_OPTION,
- OP_STC_OPTION,
- OP_STC_OPTION,
- OP_STC_OPTION,
- OP_STC_OPTION,
- OP_STC_OPTION,
- OP_STC_OPTION,
- OP_STC_OPTION,
- OP_STC_OPTION,
- OP_STC_OPTION,
- OP_STC_OPTION,
- OP_STC_OPTION,
- OP_STC_OPTION,
- OP_STC_OPTION,
- 
- OP_LDC_OPTION,
- OP_LDC_OPTION,
- OP_LDC_OPTION,
- OP_LDC_OPTION,
- OP_LDC_OPTION,
- OP_LDC_OPTION,
- OP_LDC_OPTION,
- OP_LDC_OPTION,
- OP_LDC_OPTION,
- OP_LDC_OPTION,
- OP_LDC_OPTION,
- OP_LDC_OPTION,
- OP_LDC_OPTION,
- OP_LDC_OPTION,
- OP_LDC_OPTION,
- OP_LDC_OPTION,
-//------------------------------------------
- OP_STC_P_POSTIND, //110 0111 0 0000
- OP_STC_P_POSTIND,
- OP_STC_P_POSTIND,
- OP_STC_P_POSTIND,
- OP_STC_P_POSTIND,
- OP_STC_P_POSTIND,
- OP_STC_P_POSTIND,
- OP_STC_P_POSTIND,
- OP_STC_P_POSTIND,
- OP_STC_P_POSTIND,
- OP_STC_P_POSTIND,
- OP_STC_P_POSTIND,
- OP_STC_P_POSTIND,
- OP_STC_P_POSTIND,
- OP_STC_P_POSTIND,
- OP_STC_P_POSTIND,
- 
- OP_LDC_P_POSTIND,
- OP_LDC_P_POSTIND,
- OP_LDC_P_POSTIND,
- OP_LDC_P_POSTIND,
- OP_LDC_P_POSTIND,
- OP_LDC_P_POSTIND,
- OP_LDC_P_POSTIND,
- OP_LDC_P_POSTIND,
- OP_LDC_P_POSTIND,
- OP_LDC_P_POSTIND,
- OP_LDC_P_POSTIND,
- OP_LDC_P_POSTIND,
- OP_LDC_P_POSTIND,
- OP_LDC_P_POSTIND,
- OP_LDC_P_POSTIND,
- OP_LDC_P_POSTIND,
-//------------------------------------------
- OP_STC_M_IMM_OFF, //110 1000 0 0000
- OP_STC_M_IMM_OFF,
- OP_STC_M_IMM_OFF,
- OP_STC_M_IMM_OFF,
- OP_STC_M_IMM_OFF,
- OP_STC_M_IMM_OFF,
- OP_STC_M_IMM_OFF,
- OP_STC_M_IMM_OFF,
- OP_STC_M_IMM_OFF,
- OP_STC_M_IMM_OFF,
- OP_STC_M_IMM_OFF,
- OP_STC_M_IMM_OFF,
- OP_STC_M_IMM_OFF,
- OP_STC_M_IMM_OFF,
- OP_STC_M_IMM_OFF,
- OP_STC_M_IMM_OFF,
- 
- OP_LDC_M_IMM_OFF,
- OP_LDC_M_IMM_OFF,
- OP_LDC_M_IMM_OFF,
- OP_LDC_M_IMM_OFF,
- OP_LDC_M_IMM_OFF,
- OP_LDC_M_IMM_OFF,
- OP_LDC_M_IMM_OFF,
- OP_LDC_M_IMM_OFF,
- OP_LDC_M_IMM_OFF,
- OP_LDC_M_IMM_OFF,
- OP_LDC_M_IMM_OFF,
- OP_LDC_M_IMM_OFF,
- OP_LDC_M_IMM_OFF,
- OP_LDC_M_IMM_OFF,
- OP_LDC_M_IMM_OFF,
- OP_LDC_M_IMM_OFF,
-//------------------------------------------
- OP_STC_M_PREIND, //110 1001 0 0000
- OP_STC_M_PREIND,
- OP_STC_M_PREIND,
- OP_STC_M_PREIND,
- OP_STC_M_PREIND,
- OP_STC_M_PREIND,
- OP_STC_M_PREIND,
- OP_STC_M_PREIND,
- OP_STC_M_PREIND,
- OP_STC_M_PREIND,
- OP_STC_M_PREIND,
- OP_STC_M_PREIND,
- OP_STC_M_PREIND,
- OP_STC_M_PREIND,
- OP_STC_M_PREIND,
- OP_STC_M_PREIND,
- 
- OP_LDC_M_PREIND,
- OP_LDC_M_PREIND,
- OP_LDC_M_PREIND,
- OP_LDC_M_PREIND,
- OP_LDC_M_PREIND,
- OP_LDC_M_PREIND,
- OP_LDC_M_PREIND,
- OP_LDC_M_PREIND,
- OP_LDC_M_PREIND,
- OP_LDC_M_PREIND,
- OP_LDC_M_PREIND,
- OP_LDC_M_PREIND,
- OP_LDC_M_PREIND,
- OP_LDC_M_PREIND,
- OP_LDC_M_PREIND,
- OP_LDC_M_PREIND,
-//------------------------------------------
- OP_STC_M_IMM_OFF, //110 1010 0 0000
- OP_STC_M_IMM_OFF,
- OP_STC_M_IMM_OFF,
- OP_STC_M_IMM_OFF,
- OP_STC_M_IMM_OFF,
- OP_STC_M_IMM_OFF,
- OP_STC_M_IMM_OFF,
- OP_STC_M_IMM_OFF,
- OP_STC_M_IMM_OFF,
- OP_STC_M_IMM_OFF,
- OP_STC_M_IMM_OFF,
- OP_STC_M_IMM_OFF,
- OP_STC_M_IMM_OFF,
- OP_STC_M_IMM_OFF,
- OP_STC_M_IMM_OFF,
- OP_STC_M_IMM_OFF,
- 
- OP_LDC_M_IMM_OFF,
- OP_LDC_M_IMM_OFF,
- OP_LDC_M_IMM_OFF,
- OP_LDC_M_IMM_OFF,
- OP_LDC_M_IMM_OFF,
- OP_LDC_M_IMM_OFF,
- OP_LDC_M_IMM_OFF,
- OP_LDC_M_IMM_OFF,
- OP_LDC_M_IMM_OFF,
- OP_LDC_M_IMM_OFF,
- OP_LDC_M_IMM_OFF,
- OP_LDC_M_IMM_OFF,
- OP_LDC_M_IMM_OFF,
- OP_LDC_M_IMM_OFF,
- OP_LDC_M_IMM_OFF,
- OP_LDC_M_IMM_OFF,
-//------------------------------------------
- OP_STC_M_PREIND, //110 1011 0 0000
- OP_STC_M_PREIND,
- OP_STC_M_PREIND,
- OP_STC_M_PREIND,
- OP_STC_M_PREIND,
- OP_STC_M_PREIND,
- OP_STC_M_PREIND,
- OP_STC_M_PREIND,
- OP_STC_M_PREIND,
- OP_STC_M_PREIND,
- OP_STC_M_PREIND,
- OP_STC_M_PREIND,
- OP_STC_M_PREIND,
- OP_STC_M_PREIND,
- OP_STC_M_PREIND,
- OP_STC_M_PREIND,
- 
- OP_LDC_M_PREIND,
- OP_LDC_M_PREIND,
- OP_LDC_M_PREIND,
- OP_LDC_M_PREIND,
- OP_LDC_M_PREIND,
- OP_LDC_M_PREIND,
- OP_LDC_M_PREIND,
- OP_LDC_M_PREIND,
- OP_LDC_M_PREIND,
- OP_LDC_M_PREIND,
- OP_LDC_M_PREIND,
- OP_LDC_M_PREIND,
- OP_LDC_M_PREIND,
- OP_LDC_M_PREIND,
- OP_LDC_M_PREIND,
- OP_LDC_M_PREIND,
-//------------------------------------------
- OP_STC_P_IMM_OFF, //110 1100 0 0000
- OP_STC_P_IMM_OFF,
- OP_STC_P_IMM_OFF,
- OP_STC_P_IMM_OFF,
- OP_STC_P_IMM_OFF,
- OP_STC_P_IMM_OFF,
- OP_STC_P_IMM_OFF,
- OP_STC_P_IMM_OFF,
- OP_STC_P_IMM_OFF,
- OP_STC_P_IMM_OFF,
- OP_STC_P_IMM_OFF,
- OP_STC_P_IMM_OFF,
- OP_STC_P_IMM_OFF,
- OP_STC_P_IMM_OFF,
- OP_STC_P_IMM_OFF,
- OP_STC_P_IMM_OFF,
- 
- OP_LDC_P_IMM_OFF,
- OP_LDC_P_IMM_OFF,
- OP_LDC_P_IMM_OFF,
- OP_LDC_P_IMM_OFF,
- OP_LDC_P_IMM_OFF,
- OP_LDC_P_IMM_OFF,
- OP_LDC_P_IMM_OFF,
- OP_LDC_P_IMM_OFF,
- OP_LDC_P_IMM_OFF,
- OP_LDC_P_IMM_OFF,
- OP_LDC_P_IMM_OFF,
- OP_LDC_P_IMM_OFF,
- OP_LDC_P_IMM_OFF,
- OP_LDC_P_IMM_OFF,
- OP_LDC_P_IMM_OFF,
- OP_LDC_P_IMM_OFF,
-//------------------------------------------
- OP_STC_P_PREIND, //110 1101 0 0000
- OP_STC_P_PREIND,
- OP_STC_P_PREIND,
- OP_STC_P_PREIND,
- OP_STC_P_PREIND,
- OP_STC_P_PREIND,
- OP_STC_P_PREIND,
- OP_STC_P_PREIND,
- OP_STC_P_PREIND,
- OP_STC_P_PREIND,
- OP_STC_P_PREIND,
- OP_STC_P_PREIND,
- OP_STC_P_PREIND,
- OP_STC_P_PREIND,
- OP_STC_P_PREIND,
- OP_STC_P_PREIND,
- 
- OP_LDC_P_PREIND,
- OP_LDC_P_PREIND,
- OP_LDC_P_PREIND,
- OP_LDC_P_PREIND,
- OP_LDC_P_PREIND,
- OP_LDC_P_PREIND,
- OP_LDC_P_PREIND,
- OP_LDC_P_PREIND,
- OP_LDC_P_PREIND,
- OP_LDC_P_PREIND,
- OP_LDC_P_PREIND,
- OP_LDC_P_PREIND,
- OP_LDC_P_PREIND,
- OP_LDC_P_PREIND,
- OP_LDC_P_PREIND,
- OP_LDC_P_PREIND,
-//------------------------------------------
- OP_STC_P_IMM_OFF, //110 1110 0 0000
- OP_STC_P_IMM_OFF,
- OP_STC_P_IMM_OFF,
- OP_STC_P_IMM_OFF,
- OP_STC_P_IMM_OFF,
- OP_STC_P_IMM_OFF,
- OP_STC_P_IMM_OFF,
- OP_STC_P_IMM_OFF,
- OP_STC_P_IMM_OFF,
- OP_STC_P_IMM_OFF,
- OP_STC_P_IMM_OFF,
- OP_STC_P_IMM_OFF,
- OP_STC_P_IMM_OFF,
- OP_STC_P_IMM_OFF,
- OP_STC_P_IMM_OFF,
- OP_STC_P_IMM_OFF,
- 
- OP_LDC_P_IMM_OFF,
- OP_LDC_P_IMM_OFF,
- OP_LDC_P_IMM_OFF,
- OP_LDC_P_IMM_OFF,
- OP_LDC_P_IMM_OFF,
- OP_LDC_P_IMM_OFF,
- OP_LDC_P_IMM_OFF,
- OP_LDC_P_IMM_OFF,
- OP_LDC_P_IMM_OFF,
- OP_LDC_P_IMM_OFF,
- OP_LDC_P_IMM_OFF,
- OP_LDC_P_IMM_OFF,
- OP_LDC_P_IMM_OFF,
- OP_LDC_P_IMM_OFF,
- OP_LDC_P_IMM_OFF,
- OP_LDC_P_IMM_OFF,
-//------------------------------------------
- OP_STC_P_PREIND, //110 1111 0 0000
- OP_STC_P_PREIND,
- OP_STC_P_PREIND,
- OP_STC_P_PREIND,
- OP_STC_P_PREIND,
- OP_STC_P_PREIND,
- OP_STC_P_PREIND,
- OP_STC_P_PREIND,
- OP_STC_P_PREIND,
- OP_STC_P_PREIND,
- OP_STC_P_PREIND,
- OP_STC_P_PREIND,
- OP_STC_P_PREIND,
- OP_STC_P_PREIND,
- OP_STC_P_PREIND,
- OP_STC_P_PREIND,
- 
- OP_LDC_P_PREIND,
- OP_LDC_P_PREIND,
- OP_LDC_P_PREIND,
- OP_LDC_P_PREIND,
- OP_LDC_P_PREIND,
- OP_LDC_P_PREIND,
- OP_LDC_P_PREIND,
- OP_LDC_P_PREIND,
- OP_LDC_P_PREIND,
- OP_LDC_P_PREIND,
- OP_LDC_P_PREIND,
- OP_LDC_P_PREIND,
- OP_LDC_P_PREIND,
- OP_LDC_P_PREIND,
- OP_LDC_P_PREIND,
- OP_LDC_P_PREIND,
-//------------------------------------------
- OP_CDP, //111 0000 0 0000
- OP_MCR,
- OP_CDP,
- OP_MCR,
- OP_CDP,
- OP_MCR,
- OP_CDP,
- OP_MCR,
- OP_CDP,
- OP_MCR,
- OP_CDP,
- OP_MCR,
- OP_CDP,
- OP_MCR,
- OP_CDP,
- OP_MCR,
- 
- OP_CDP,
- OP_MRC,
- OP_CDP,
- OP_MRC,
- OP_CDP,
- OP_MRC,
- OP_CDP,
- OP_MRC,
- OP_CDP,
- OP_MRC,
- OP_CDP,
- OP_MRC,
- OP_CDP,
- OP_MRC,
- OP_CDP,
- OP_MRC,
-//---------------------------------------------
- OP_CDP, //111 0001 0 0000
- OP_MCR,
- OP_CDP,
- OP_MCR,
- OP_CDP,
- OP_MCR,
- OP_CDP,
- OP_MCR,
- OP_CDP,
- OP_MCR,
- OP_CDP,
- OP_MCR,
- OP_CDP,
- OP_MCR,
- OP_CDP,
- OP_MCR,
- 
- OP_CDP,
- OP_MRC,
- OP_CDP,
- OP_MRC,
- OP_CDP,
- OP_MRC,
- OP_CDP,
- OP_MRC,
- OP_CDP,
- OP_MRC,
- OP_CDP,
- OP_MRC,
- OP_CDP,
- OP_MRC,
- OP_CDP,
- OP_MRC,
-//---------------------------------------------
- OP_CDP, //111 0010 0 0000
- OP_MCR,
- OP_CDP,
- OP_MCR,
- OP_CDP,
- OP_MCR,
- OP_CDP,
- OP_MCR,
- OP_CDP,
- OP_MCR,
- OP_CDP,
- OP_MCR,
- OP_CDP,
- OP_MCR,
- OP_CDP,
- OP_MCR,
- 
- OP_CDP,
- OP_MRC,
- OP_CDP,
- OP_MRC,
- OP_CDP,
- OP_MRC,
- OP_CDP,
- OP_MRC,
- OP_CDP,
- OP_MRC,
- OP_CDP,
- OP_MRC,
- OP_CDP,
- OP_MRC,
- OP_CDP,
- OP_MRC,
-//---------------------------------------------
- OP_CDP, //111 0011 0 0000
- OP_MCR,
- OP_CDP,
- OP_MCR,
- OP_CDP,
- OP_MCR,
- OP_CDP,
- OP_MCR,
- OP_CDP,
- OP_MCR,
- OP_CDP,
- OP_MCR,
- OP_CDP,
- OP_MCR,
- OP_CDP,
- OP_MCR,
- 
- OP_CDP,
- OP_MRC,
- OP_CDP,
- OP_MRC,
- OP_CDP,
- OP_MRC,
- OP_CDP,
- OP_MRC,
- OP_CDP,
- OP_MRC,
- OP_CDP,
- OP_MRC,
- OP_CDP,
- OP_MRC,
- OP_CDP,
- OP_MRC,
-//---------------------------------------------
- OP_CDP, //111 0100 0 0000
- OP_MCR,
- OP_CDP,
- OP_MCR,
- OP_CDP,
- OP_MCR,
- OP_CDP,
- OP_MCR,
- OP_CDP,
- OP_MCR,
- OP_CDP,
- OP_MCR,
- OP_CDP,
- OP_MCR,
- OP_CDP,
- OP_MCR,
- 
- OP_CDP,
- OP_MRC,
- OP_CDP,
- OP_MRC,
- OP_CDP,
- OP_MRC,
- OP_CDP,
- OP_MRC,
- OP_CDP,
- OP_MRC,
- OP_CDP,
- OP_MRC,
- OP_CDP,
- OP_MRC,
- OP_CDP,
- OP_MRC,
-//---------------------------------------------
- OP_CDP, //111 0101 0 0000
- OP_MCR,
- OP_CDP,
- OP_MCR,
- OP_CDP,
- OP_MCR,
- OP_CDP,
- OP_MCR,
- OP_CDP,
- OP_MCR,
- OP_CDP,
- OP_MCR,
- OP_CDP,
- OP_MCR,
- OP_CDP,
- OP_MCR,
- 
- OP_CDP,
- OP_MRC,
- OP_CDP,
- OP_MRC,
- OP_CDP,
- OP_MRC,
- OP_CDP,
- OP_MRC,
- OP_CDP,
- OP_MRC,
- OP_CDP,
- OP_MRC,
- OP_CDP,
- OP_MRC,
- OP_CDP,
- OP_MRC,
-//---------------------------------------------
- OP_CDP, //111 0110 0 0000
- OP_MCR,
- OP_CDP,
- OP_MCR,
- OP_CDP,
- OP_MCR,
- OP_CDP,
- OP_MCR,
- OP_CDP,
- OP_MCR,
- OP_CDP,
- OP_MCR,
- OP_CDP,
- OP_MCR,
- OP_CDP,
- OP_MCR,
- 
- OP_CDP,
- OP_MRC,
- OP_CDP,
- OP_MRC,
- OP_CDP,
- OP_MRC,
- OP_CDP,
- OP_MRC,
- OP_CDP,
- OP_MRC,
- OP_CDP,
- OP_MRC,
- OP_CDP,
- OP_MRC,
- OP_CDP,
- OP_MRC,
-//---------------------------------------------
- OP_CDP, //111 0111 0 0000
- OP_MCR,
- OP_CDP,
- OP_MCR,
- OP_CDP,
- OP_MCR,
- OP_CDP,
- OP_MCR,
- OP_CDP,
- OP_MCR,
- OP_CDP,
- OP_MCR,
- OP_CDP,
- OP_MCR,
- OP_CDP,
- OP_MCR,
- 
- OP_CDP,
- OP_MRC,
- OP_CDP,
- OP_MRC,
- OP_CDP,
- OP_MRC,
- OP_CDP,
- OP_MRC,
- OP_CDP,
- OP_MRC,
- OP_CDP,
- OP_MRC,
- OP_CDP,
- OP_MRC,
- OP_CDP,
- OP_MRC,
-//---------------------------------------------
- OP_SWI, //111 1000 0 0000
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI, 
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
- OP_SWI,
-};
+/* 0000 0000 0000 */ TABDECL(OP_AND_LSL_IMM),		// OP_AND_LSL_IMM
+/* 0000 0000 0001 */ TABDECL(OP_AND_LSL_REG),		// OP_AND_LSL_REG
+/* 0000 0000 0010 */ TABDECL(OP_AND_LSR_IMM),		// OP_AND_LSR_IMM
+/* 0000 0000 0011 */ TABDECL(OP_AND_LSR_REG),		// OP_AND_LSR_REG
+/* 0000 0000 0100 */ TABDECL(OP_AND_ASR_IMM),		// OP_AND_ASR_IMM
+/* 0000 0000 0101 */ TABDECL(OP_AND_ASR_REG),		// OP_AND_ASR_REG
+/* 0000 0000 0110 */ TABDECL(OP_AND_ROR_IMM),		// OP_AND_ROR_IMM
+/* 0000 0000 0111 */ TABDECL(OP_AND_ROR_REG),		// OP_AND_ROR_REG
+/* 0000 0000 1000 */ TABDECL(OP_AND_LSL_IMM),		// OP_AND_LSL_IMM
+/* 0000 0000 1001 */ TABDECL(OP_MUL),		// OP_MUL
+/* 0000 0000 1010 */ TABDECL(OP_AND_LSR_IMM),		// OP_AND_LSR_IMM
+/* 0000 0000 1011 */ TABDECL(OP_STRH_POS_INDE_M_REG_OFF),		// OP_STRH_POS_INDE_M_REG_OFF
+/* 0000 0000 1100 */ TABDECL(OP_AND_ASR_IMM),		// OP_AND_ASR_IMM
+/* 0000 0000 1101 */ TABDECL(OP_LDRD_STRD_POST_INDEX),		// OP_LDRD_STRD_POST_INDEX
+/* 0000 0000 1110 */ TABDECL(OP_AND_ROR_IMM),		// OP_AND_ROR_IMM
+/* 0000 0000 1111 */ TABDECL(OP_LDRD_STRD_POST_INDEX),		// OP_LDRD_STRD_POST_INDEX
+
+/* 0000 0001 0000 */ TABDECL(OP_AND_S_LSL_IMM),		// OP_AND_S_LSL_IMM
+/* 0000 0001 0001 */ TABDECL(OP_AND_S_LSL_REG),		// OP_AND_S_LSL_REG
+/* 0000 0001 0010 */ TABDECL(OP_AND_S_LSR_IMM),		// OP_AND_S_LSR_IMM
+/* 0000 0001 0011 */ TABDECL(OP_AND_S_LSR_REG),		// OP_AND_S_LSR_REG
+/* 0000 0001 0100 */ TABDECL(OP_AND_S_ASR_IMM),		// OP_AND_S_ASR_IMM
+/* 0000 0001 0101 */ TABDECL(OP_AND_S_ASR_REG),		// OP_AND_S_ASR_REG
+/* 0000 0001 0110 */ TABDECL(OP_AND_S_ROR_IMM),		// OP_AND_S_ROR_IMM
+/* 0000 0001 0111 */ TABDECL(OP_AND_S_ROR_REG),		// OP_AND_S_ROR_REG
+/* 0000 0001 1000 */ TABDECL(OP_AND_S_LSL_IMM),		// OP_AND_S_LSL_IMM
+/* 0000 0001 1001 */ TABDECL(OP_MUL_S),		// OP_MUL_S
+/* 0000 0001 1010 */ TABDECL(OP_AND_S_LSR_IMM),		// OP_AND_S_LSR_IMM
+/* 0000 0001 1011 */ TABDECL(OP_LDRH_POS_INDE_M_REG_OFF),		// OP_LDRH_POS_INDE_M_REG_OFF
+/* 0000 0001 1100 */ TABDECL(OP_AND_S_ASR_IMM),		// OP_AND_S_ASR_IMM
+/* 0000 0001 1101 */ TABDECL(OP_LDRSB_POS_INDE_M_REG_OFF),		// OP_LDRSB_POS_INDE_M_REG_OFF
+/* 0000 0001 1110 */ TABDECL(OP_AND_S_ROR_IMM),		// OP_AND_S_ROR_IMM
+/* 0000 0001 1111 */ TABDECL(OP_LDRSH_POS_INDE_M_REG_OFF),		// OP_LDRSH_POS_INDE_M_REG_OFF
+
+/* 0000 0010 0000 */ TABDECL(OP_EOR_LSL_IMM),		// OP_EOR_LSL_IMM
+/* 0000 0010 0001 */ TABDECL(OP_EOR_LSL_REG),		// OP_EOR_LSL_REG
+/* 0000 0010 0010 */ TABDECL(OP_EOR_LSR_IMM),		// OP_EOR_LSR_IMM
+/* 0000 0010 0011 */ TABDECL(OP_EOR_LSR_REG),		// OP_EOR_LSR_REG
+/* 0000 0010 0100 */ TABDECL(OP_EOR_ASR_IMM),		// OP_EOR_ASR_IMM
+/* 0000 0010 0101 */ TABDECL(OP_EOR_ASR_REG),		// OP_EOR_ASR_REG
+/* 0000 0010 0110 */ TABDECL(OP_EOR_ROR_IMM),		// OP_EOR_ROR_IMM
+/* 0000 0010 0111 */ TABDECL(OP_EOR_ROR_REG),		// OP_EOR_ROR_REG
+/* 0000 0010 1000 */ TABDECL(OP_EOR_LSL_IMM),		// OP_EOR_LSL_IMM
+/* 0000 0010 1001 */ TABDECL(OP_MLA),		// OP_MLA
+/* 0000 0010 1010 */ TABDECL(OP_EOR_LSR_IMM),		// OP_EOR_LSR_IMM
+/* 0000 0010 1011 */ TABDECL(OP_UND),
+/* 0000 0010 1100 */ TABDECL(OP_EOR_ASR_IMM),		// OP_EOR_ASR_IMM
+/* 0000 0010 1101 */ TABDECL(OP_UND),
+/* 0000 0010 1110 */ TABDECL(OP_EOR_ROR_IMM),		// OP_EOR_ROR_IMM
+/* 0000 0010 1111 */ TABDECL(OP_UND),
+
+/* 0000 0011 0000 */ TABDECL(OP_EOR_S_LSL_IMM),		// OP_EOR_S_LSL_IMM
+/* 0000 0011 0001 */ TABDECL(OP_EOR_S_LSL_REG),		// OP_EOR_S_LSL_REG
+/* 0000 0011 0010 */ TABDECL(OP_EOR_S_LSR_IMM),		// OP_EOR_S_LSR_IMM
+/* 0000 0011 0011 */ TABDECL(OP_EOR_S_LSR_REG),		// OP_EOR_S_LSR_REG
+/* 0000 0011 0100 */ TABDECL(OP_EOR_S_ASR_IMM),		// OP_EOR_S_ASR_IMM
+/* 0000 0011 0101 */ TABDECL(OP_EOR_S_ASR_REG),		// OP_EOR_S_ASR_REG
+/* 0000 0011 0110 */ TABDECL(OP_EOR_S_ROR_IMM),		// OP_EOR_S_ROR_IMM
+/* 0000 0011 0111 */ TABDECL(OP_EOR_S_ROR_REG),		// OP_EOR_S_ROR_REG
+/* 0000 0011 1000 */ TABDECL(OP_EOR_S_LSL_IMM),		// OP_EOR_S_LSL_IMM
+/* 0000 0011 1001 */ TABDECL(OP_MLA_S),		// OP_MLA_S
+/* 0000 0011 1010 */ TABDECL(OP_EOR_S_LSR_IMM),		// OP_EOR_S_LSR_IMM
+/* 0000 0011 1011 */ TABDECL(OP_UND),
+/* 0000 0011 1100 */ TABDECL(OP_EOR_S_ASR_IMM),		// OP_EOR_S_ASR_IMM
+/* 0000 0011 1101 */ TABDECL(OP_UND),
+/* 0000 0011 1110 */ TABDECL(OP_EOR_S_ROR_IMM),		// OP_EOR_S_ROR_IMM
+/* 0000 0011 1111 */ TABDECL(OP_UND),
+
+/* 0000 0100 0000 */ TABDECL(OP_SUB_LSL_IMM),		// OP_SUB_LSL_IMM
+/* 0000 0100 0001 */ TABDECL(OP_SUB_LSL_REG),		// OP_SUB_LSL_REG
+/* 0000 0100 0010 */ TABDECL(OP_SUB_LSR_IMM),		// OP_SUB_LSR_IMM
+/* 0000 0100 0011 */ TABDECL(OP_SUB_LSR_REG),		// OP_SUB_LSR_REG
+/* 0000 0100 0100 */ TABDECL(OP_SUB_ASR_IMM),		// OP_SUB_ASR_IMM
+/* 0000 0100 0101 */ TABDECL(OP_SUB_ASR_REG),		// OP_SUB_ASR_REG
+/* 0000 0100 0110 */ TABDECL(OP_SUB_ROR_IMM),		// OP_SUB_ROR_IMM
+/* 0000 0100 0111 */ TABDECL(OP_SUB_ROR_REG),		// OP_SUB_ROR_REG
+/* 0000 0100 1000 */ TABDECL(OP_SUB_LSL_IMM),		// OP_SUB_LSL_IMM
+/* 0000 0100 1001 */ TABDECL(OP_UND),
+/* 0000 0100 1010 */ TABDECL(OP_SUB_LSR_IMM),		// OP_SUB_LSR_IMM
+/* 0000 0100 1011 */ TABDECL(OP_STRH_POS_INDE_M_IMM_OFF),		// OP_STRH_POS_INDE_M_IMM_OFF
+/* 0000 0100 1100 */ TABDECL(OP_SUB_ASR_IMM),		// OP_SUB_ASR_IMM
+/* 0000 0100 1101 */ TABDECL(OP_LDRD_STRD_POST_INDEX),		// OP_LDRD_STRD_POST_INDEX
+/* 0000 0100 1110 */ TABDECL(OP_SUB_ROR_IMM),		// OP_SUB_ROR_IMM
+/* 0000 0100 1111 */ TABDECL(OP_LDRD_STRD_POST_INDEX),		// OP_LDRD_STRD_POST_INDEX
+
+/* 0000 0101 0000 */ TABDECL(OP_SUB_S_LSL_IMM),		// OP_SUB_S_LSL_IMM
+/* 0000 0101 0001 */ TABDECL(OP_SUB_S_LSL_REG),		// OP_SUB_S_LSL_REG
+/* 0000 0101 0010 */ TABDECL(OP_SUB_S_LSR_IMM),		// OP_SUB_S_LSR_IMM
+/* 0000 0101 0011 */ TABDECL(OP_SUB_S_LSR_REG),		// OP_SUB_S_LSR_REG
+/* 0000 0101 0100 */ TABDECL(OP_SUB_S_ASR_IMM),		// OP_SUB_S_ASR_IMM
+/* 0000 0101 0101 */ TABDECL(OP_SUB_S_ASR_REG),		// OP_SUB_S_ASR_REG
+/* 0000 0101 0110 */ TABDECL(OP_SUB_S_ROR_IMM),		// OP_SUB_S_ROR_IMM
+/* 0000 0101 0111 */ TABDECL(OP_SUB_S_ROR_REG),		// OP_SUB_S_ROR_REG
+/* 0000 0101 1000 */ TABDECL(OP_SUB_S_LSL_IMM),		// OP_SUB_S_LSL_IMM
+/* 0000 0101 1001 */ TABDECL(OP_UND),
+/* 0000 0101 1010 */ TABDECL(OP_SUB_S_LSR_IMM),		// OP_SUB_S_LSR_IMM
+/* 0000 0101 1011 */ TABDECL(OP_LDRH_POS_INDE_M_IMM_OFF),		// OP_LDRH_POS_INDE_M_IMM_OFF
+/* 0000 0101 1100 */ TABDECL(OP_SUB_S_ASR_IMM),		// OP_SUB_S_ASR_IMM
+/* 0000 0101 1101 */ TABDECL(OP_LDRSB_POS_INDE_M_IMM_OFF),		// OP_LDRSB_POS_INDE_M_IMM_OFF
+/* 0000 0101 1110 */ TABDECL(OP_SUB_S_ROR_IMM),		// OP_SUB_S_ROR_IMM
+/* 0000 0101 1111 */ TABDECL(OP_LDRSH_POS_INDE_M_IMM_OFF),		// OP_LDRSH_POS_INDE_M_IMM_OFF
+
+/* 0000 0110 0000 */ TABDECL(OP_RSB_LSL_IMM),		// OP_RSB_LSL_IMM
+/* 0000 0110 0001 */ TABDECL(OP_RSB_LSL_REG),		// OP_RSB_LSL_REG
+/* 0000 0110 0010 */ TABDECL(OP_RSB_LSR_IMM),		// OP_RSB_LSR_IMM
+/* 0000 0110 0011 */ TABDECL(OP_RSB_LSR_REG),		// OP_RSB_LSR_REG
+/* 0000 0110 0100 */ TABDECL(OP_RSB_ASR_IMM),		// OP_RSB_ASR_IMM
+/* 0000 0110 0101 */ TABDECL(OP_RSB_ASR_REG),		// OP_RSB_ASR_REG
+/* 0000 0110 0110 */ TABDECL(OP_RSB_ROR_IMM),		// OP_RSB_ROR_IMM
+/* 0000 0110 0111 */ TABDECL(OP_RSB_ROR_REG),		// OP_RSB_ROR_REG
+/* 0000 0110 1000 */ TABDECL(OP_RSB_LSL_IMM),		// OP_RSB_LSL_IMM
+/* 0000 0110 1001 */ TABDECL(OP_UND),
+/* 0000 0110 1010 */ TABDECL(OP_RSB_LSR_IMM),		// OP_RSB_LSR_IMM
+/* 0000 0110 1011 */ TABDECL(OP_UND),
+/* 0000 0110 1100 */ TABDECL(OP_RSB_ASR_IMM),		// OP_RSB_ASR_IMM
+/* 0000 0110 1101 */ TABDECL(OP_UND),
+/* 0000 0110 1110 */ TABDECL(OP_RSB_ROR_IMM),		// OP_RSB_ROR_IMM
+/* 0000 0110 1111 */ TABDECL(OP_UND),
+
+/* 0000 0111 0000 */ TABDECL(OP_RSB_S_LSL_IMM),		// OP_RSB_S_LSL_IMM
+/* 0000 0111 0001 */ TABDECL(OP_RSB_S_LSL_REG),		// OP_RSB_S_LSL_REG
+/* 0000 0111 0010 */ TABDECL(OP_RSB_S_LSR_IMM),		// OP_RSB_S_LSR_IMM
+/* 0000 0111 0011 */ TABDECL(OP_RSB_S_LSR_REG),		// OP_RSB_S_LSR_REG
+/* 0000 0111 0100 */ TABDECL(OP_RSB_S_ASR_IMM),		// OP_RSB_S_ASR_IMM
+/* 0000 0111 0101 */ TABDECL(OP_RSB_S_ASR_REG),		// OP_RSB_S_ASR_REG
+/* 0000 0111 0110 */ TABDECL(OP_RSB_S_ROR_IMM),		// OP_RSB_S_ROR_IMM
+/* 0000 0111 0111 */ TABDECL(OP_RSB_S_ROR_REG),		// OP_RSB_S_ROR_REG
+/* 0000 0111 1000 */ TABDECL(OP_RSB_S_LSL_IMM),		// OP_RSB_S_LSL_IMM
+/* 0000 0111 1001 */ TABDECL(OP_UND),
+/* 0000 0111 1010 */ TABDECL(OP_RSB_S_LSR_IMM),		// OP_RSB_S_LSR_IMM
+/* 0000 0111 1011 */ TABDECL(OP_UND),
+/* 0000 0111 1100 */ TABDECL(OP_RSB_S_ASR_IMM),		// OP_RSB_S_ASR_IMM
+/* 0000 0111 1101 */ TABDECL(OP_UND),
+/* 0000 0111 1110 */ TABDECL(OP_RSB_S_ROR_IMM),		// OP_RSB_S_ROR_IMM
+/* 0000 0111 1111 */ TABDECL(OP_UND),
+
+/* 0000 1000 0000 */ TABDECL(OP_ADD_LSL_IMM),		// OP_ADD_LSL_IMM
+/* 0000 1000 0001 */ TABDECL(OP_ADD_LSL_REG),		// OP_ADD_LSL_REG
+/* 0000 1000 0010 */ TABDECL(OP_ADD_LSR_IMM),		// OP_ADD_LSR_IMM
+/* 0000 1000 0011 */ TABDECL(OP_ADD_LSR_REG),		// OP_ADD_LSR_REG
+/* 0000 1000 0100 */ TABDECL(OP_ADD_ASR_IMM),		// OP_ADD_ASR_IMM
+/* 0000 1000 0101 */ TABDECL(OP_ADD_ASR_REG),		// OP_ADD_ASR_REG
+/* 0000 1000 0110 */ TABDECL(OP_ADD_ROR_IMM),		// OP_ADD_ROR_IMM
+/* 0000 1000 0111 */ TABDECL(OP_ADD_ROR_REG),		// OP_ADD_ROR_REG
+/* 0000 1000 1000 */ TABDECL(OP_ADD_LSL_IMM),		// OP_ADD_LSL_IMM
+/* 0000 1000 1001 */ TABDECL(OP_UMULL),		// OP_UMULL
+/* 0000 1000 1010 */ TABDECL(OP_ADD_LSR_IMM),		// OP_ADD_LSR_IMM
+/* 0000 1000 1011 */ TABDECL(OP_STRH_POS_INDE_P_REG_OFF),		// OP_STRH_POS_INDE_P_REG_OFF
+/* 0000 1000 1100 */ TABDECL(OP_ADD_ASR_IMM),		// OP_ADD_ASR_IMM
+/* 0000 1000 1101 */ TABDECL(OP_LDRD_STRD_POST_INDEX),		// OP_LDRD_STRD_POST_INDEX
+/* 0000 1000 1110 */ TABDECL(OP_ADD_ROR_IMM),		// OP_ADD_ROR_IMM
+/* 0000 1000 1111 */ TABDECL(OP_LDRD_STRD_POST_INDEX),		// OP_LDRD_STRD_POST_INDEX
+
+/* 0000 1001 0000 */ TABDECL(OP_ADD_S_LSL_IMM),		// OP_ADD_S_LSL_IMM
+/* 0000 1001 0001 */ TABDECL(OP_ADD_S_LSL_REG),		// OP_ADD_S_LSL_REG
+/* 0000 1001 0010 */ TABDECL(OP_ADD_S_LSR_IMM),		// OP_ADD_S_LSR_IMM
+/* 0000 1001 0011 */ TABDECL(OP_ADD_S_LSR_REG),		// OP_ADD_S_LSR_REG
+/* 0000 1001 0100 */ TABDECL(OP_ADD_S_ASR_IMM),		// OP_ADD_S_ASR_IMM
+/* 0000 1001 0101 */ TABDECL(OP_ADD_S_ASR_REG),		// OP_ADD_S_ASR_REG
+/* 0000 1001 0110 */ TABDECL(OP_ADD_S_ROR_IMM),		// OP_ADD_S_ROR_IMM
+/* 0000 1001 0111 */ TABDECL(OP_ADD_S_ROR_REG),		// OP_ADD_S_ROR_REG
+/* 0000 1001 1000 */ TABDECL(OP_ADD_S_LSL_IMM),		// OP_ADD_S_LSL_IMM
+/* 0000 1001 1001 */ TABDECL(OP_UMULL_S),		// OP_UMULL_S
+/* 0000 1001 1010 */ TABDECL(OP_ADD_S_LSR_IMM),		// OP_ADD_S_LSR_IMM
+/* 0000 1001 1011 */ TABDECL(OP_LDRH_POS_INDE_P_REG_OFF),		// OP_LDRH_POS_INDE_P_REG_OFF
+/* 0000 1001 1100 */ TABDECL(OP_ADD_S_ASR_IMM),		// OP_ADD_S_ASR_IMM
+/* 0000 1001 1101 */ TABDECL(OP_LDRSB_POS_INDE_P_REG_OFF),		// OP_LDRSB_POS_INDE_P_REG_OFF
+/* 0000 1001 1110 */ TABDECL(OP_ADD_S_ROR_IMM),		// OP_ADD_S_ROR_IMM
+/* 0000 1001 1111 */ TABDECL(OP_LDRSH_POS_INDE_P_REG_OFF),		// OP_LDRSH_POS_INDE_P_REG_OFF
+
+/* 0000 1010 0000 */ TABDECL(OP_ADC_LSL_IMM),		// OP_ADC_LSL_IMM
+/* 0000 1010 0001 */ TABDECL(OP_ADC_LSL_REG),		// OP_ADC_LSL_REG
+/* 0000 1010 0010 */ TABDECL(OP_ADC_LSR_IMM),		// OP_ADC_LSR_IMM
+/* 0000 1010 0011 */ TABDECL(OP_ADC_LSR_REG),		// OP_ADC_LSR_REG
+/* 0000 1010 0100 */ TABDECL(OP_ADC_ASR_IMM),		// OP_ADC_ASR_IMM
+/* 0000 1010 0101 */ TABDECL(OP_ADC_ASR_REG),		// OP_ADC_ASR_REG
+/* 0000 1010 0110 */ TABDECL(OP_ADC_ROR_IMM),		// OP_ADC_ROR_IMM
+/* 0000 1010 0111 */ TABDECL(OP_ADC_ROR_REG),		// OP_ADC_ROR_REG
+/* 0000 1010 1000 */ TABDECL(OP_ADC_LSL_IMM),		// OP_ADC_LSL_IMM
+/* 0000 1010 1001 */ TABDECL(OP_UMLAL),		// OP_UMLAL
+/* 0000 1010 1010 */ TABDECL(OP_ADC_LSR_IMM),		// OP_ADC_LSR_IMM
+/* 0000 1010 1011 */ TABDECL(OP_UND),
+/* 0000 1010 1100 */ TABDECL(OP_ADC_ASR_IMM),		// OP_ADC_ASR_IMM
+/* 0000 1010 1101 */ TABDECL(OP_UND),
+/* 0000 1010 1110 */ TABDECL(OP_ADC_ROR_IMM),		// OP_ADC_ROR_IMM
+/* 0000 1010 1111 */ TABDECL(OP_UND),
+
+/* 0000 1011 0000 */ TABDECL(OP_ADC_S_LSL_IMM),		// OP_ADC_S_LSL_IMM
+/* 0000 1011 0001 */ TABDECL(OP_ADC_S_LSL_REG),		// OP_ADC_S_LSL_REG
+/* 0000 1011 0010 */ TABDECL(OP_ADC_S_LSR_IMM),		// OP_ADC_S_LSR_IMM
+/* 0000 1011 0011 */ TABDECL(OP_ADC_S_LSR_REG),		// OP_ADC_S_LSR_REG
+/* 0000 1011 0100 */ TABDECL(OP_ADC_S_ASR_IMM),		// OP_ADC_S_ASR_IMM
+/* 0000 1011 0101 */ TABDECL(OP_ADC_S_ASR_REG),		// OP_ADC_S_ASR_REG
+/* 0000 1011 0110 */ TABDECL(OP_ADC_S_ROR_IMM),		// OP_ADC_S_ROR_IMM
+/* 0000 1011 0111 */ TABDECL(OP_ADC_S_ROR_REG),		// OP_ADC_S_ROR_REG
+/* 0000 1011 1000 */ TABDECL(OP_ADC_S_LSL_IMM),		// OP_ADC_S_LSL_IMM
+/* 0000 1011 1001 */ TABDECL(OP_UMLAL_S),		// OP_UMLAL_S
+/* 0000 1011 1010 */ TABDECL(OP_ADC_S_LSR_IMM),		// OP_ADC_S_LSR_IMM
+/* 0000 1011 1011 */ TABDECL(OP_UND),
+/* 0000 1011 1100 */ TABDECL(OP_ADC_S_ASR_IMM),		// OP_ADC_S_ASR_IMM
+/* 0000 1011 1101 */ TABDECL(OP_UND),
+/* 0000 1011 1110 */ TABDECL(OP_ADC_S_ROR_IMM),		// OP_ADC_S_ROR_IMM
+/* 0000 1011 1111 */ TABDECL(OP_UND),
+
+/* 0000 1100 0000 */ TABDECL(OP_SBC_LSL_IMM),		// OP_SBC_LSL_IMM
+/* 0000 1100 0001 */ TABDECL(OP_SBC_LSL_REG),		// OP_SBC_LSL_REG
+/* 0000 1100 0010 */ TABDECL(OP_SBC_LSR_IMM),		// OP_SBC_LSR_IMM
+/* 0000 1100 0011 */ TABDECL(OP_SBC_LSR_REG),		// OP_SBC_LSR_REG
+/* 0000 1100 0100 */ TABDECL(OP_SBC_ASR_IMM),		// OP_SBC_ASR_IMM
+/* 0000 1100 0101 */ TABDECL(OP_SBC_ASR_REG),		// OP_SBC_ASR_REG
+/* 0000 1100 0110 */ TABDECL(OP_SBC_ROR_IMM),		// OP_SBC_ROR_IMM
+/* 0000 1100 0111 */ TABDECL(OP_SBC_ROR_REG),		// OP_SBC_ROR_REG
+/* 0000 1100 1000 */ TABDECL(OP_SBC_LSL_IMM),		// OP_SBC_LSL_IMM
+/* 0000 1100 1001 */ TABDECL(OP_SMULL),		// OP_SMULL
+/* 0000 1100 1010 */ TABDECL(OP_SBC_LSR_IMM),		// OP_SBC_LSR_IMM
+/* 0000 1100 1011 */ TABDECL(OP_STRH_POS_INDE_P_IMM_OFF),		// OP_STRH_POS_INDE_P_IMM_OFF
+/* 0000 1100 1100 */ TABDECL(OP_SBC_ASR_IMM),		// OP_SBC_ASR_IMM
+/* 0000 1100 1101 */ TABDECL(OP_LDRD_STRD_POST_INDEX),		// OP_LDRD_STRD_POST_INDEX
+/* 0000 1100 1110 */ TABDECL(OP_SBC_ROR_IMM),		// OP_SBC_ROR_IMM
+/* 0000 1100 1111 */ TABDECL(OP_LDRD_STRD_POST_INDEX),		// OP_LDRD_STRD_POST_INDEX
+
+/* 0000 1101 0000 */ TABDECL(OP_SBC_S_LSL_IMM),		// OP_SBC_S_LSL_IMM
+/* 0000 1101 0001 */ TABDECL(OP_SBC_S_LSL_REG),		// OP_SBC_S_LSL_REG
+/* 0000 1101 0010 */ TABDECL(OP_SBC_S_LSR_IMM),		// OP_SBC_S_LSR_IMM
+/* 0000 1101 0011 */ TABDECL(OP_SBC_S_LSR_REG),		// OP_SBC_S_LSR_REG
+/* 0000 1101 0100 */ TABDECL(OP_SBC_S_ASR_IMM),		// OP_SBC_S_ASR_IMM
+/* 0000 1101 0101 */ TABDECL(OP_SBC_S_ASR_REG),		// OP_SBC_S_ASR_REG
+/* 0000 1101 0110 */ TABDECL(OP_SBC_S_ROR_IMM),		// OP_SBC_S_ROR_IMM
+/* 0000 1101 0111 */ TABDECL(OP_SBC_S_ROR_REG),		// OP_SBC_S_ROR_REG
+/* 0000 1101 1000 */ TABDECL(OP_SBC_S_LSL_IMM),		// OP_SBC_S_LSL_IMM
+/* 0000 1101 1001 */ TABDECL(OP_SMULL_S),		// OP_SMULL_S
+/* 0000 1101 1010 */ TABDECL(OP_SBC_S_LSR_IMM),		// OP_SBC_S_LSR_IMM
+/* 0000 1101 1011 */ TABDECL(OP_LDRH_POS_INDE_P_IMM_OFF),		// OP_LDRH_POS_INDE_P_IMM_OFF
+/* 0000 1101 1100 */ TABDECL(OP_SBC_S_ASR_IMM),		// OP_SBC_S_ASR_IMM
+/* 0000 1101 1101 */ TABDECL(OP_LDRSB_POS_INDE_P_IMM_OFF),		// OP_LDRSB_POS_INDE_P_IMM_OFF
+/* 0000 1101 1110 */ TABDECL(OP_SBC_S_ROR_IMM),		// OP_SBC_S_ROR_IMM
+/* 0000 1101 1111 */ TABDECL(OP_LDRSH_POS_INDE_P_IMM_OFF),		// OP_LDRSH_POS_INDE_P_IMM_OFF
+
+/* 0000 1110 0000 */ TABDECL(OP_RSC_LSL_IMM),		// OP_RSC_LSL_IMM
+/* 0000 1110 0001 */ TABDECL(OP_RSC_LSL_REG),		// OP_RSC_LSL_REG
+/* 0000 1110 0010 */ TABDECL(OP_RSC_LSR_IMM),		// OP_RSC_LSR_IMM
+/* 0000 1110 0011 */ TABDECL(OP_RSC_LSR_REG),		// OP_RSC_LSR_REG
+/* 0000 1110 0100 */ TABDECL(OP_RSC_ASR_IMM),		// OP_RSC_ASR_IMM
+/* 0000 1110 0101 */ TABDECL(OP_RSC_ASR_REG),		// OP_RSC_ASR_REG
+/* 0000 1110 0110 */ TABDECL(OP_RSC_ROR_IMM),		// OP_RSC_ROR_IMM
+/* 0000 1110 0111 */ TABDECL(OP_RSC_ROR_REG),		// OP_RSC_ROR_REG
+/* 0000 1110 1000 */ TABDECL(OP_RSC_LSL_IMM),		// OP_RSC_LSL_IMM
+/* 0000 1110 1001 */ TABDECL(OP_SMLAL),		// OP_SMLAL
+/* 0000 1110 1010 */ TABDECL(OP_RSC_LSR_IMM),		// OP_RSC_LSR_IMM
+/* 0000 1110 1011 */ TABDECL(OP_UND),
+/* 0000 1110 1100 */ TABDECL(OP_RSC_ASR_IMM),		// OP_RSC_ASR_IMM
+/* 0000 1110 1101 */ TABDECL(OP_UND),
+/* 0000 1110 1110 */ TABDECL(OP_RSC_ROR_IMM),		// OP_RSC_ROR_IMM
+/* 0000 1110 1111 */ TABDECL(OP_UND),
+
+/* 0000 1111 0000 */ TABDECL(OP_RSC_S_LSL_IMM),		// OP_RSC_S_LSL_IMM
+/* 0000 1111 0001 */ TABDECL(OP_RSC_S_LSL_REG),		// OP_RSC_S_LSL_REG
+/* 0000 1111 0010 */ TABDECL(OP_RSC_S_LSR_IMM),		// OP_RSC_S_LSR_IMM
+/* 0000 1111 0011 */ TABDECL(OP_RSC_S_LSR_REG),		// OP_RSC_S_LSR_REG
+/* 0000 1111 0100 */ TABDECL(OP_RSC_S_ASR_IMM),		// OP_RSC_S_ASR_IMM
+/* 0000 1111 0101 */ TABDECL(OP_RSC_S_ASR_REG),		// OP_RSC_S_ASR_REG
+/* 0000 1111 0110 */ TABDECL(OP_RSC_S_ROR_IMM),		// OP_RSC_S_ROR_IMM
+/* 0000 1111 0111 */ TABDECL(OP_RSC_S_ROR_REG),		// OP_RSC_S_ROR_REG
+/* 0000 1111 1000 */ TABDECL(OP_RSC_S_LSL_IMM),		// OP_RSC_S_LSL_IMM
+/* 0000 1111 1001 */ TABDECL(OP_SMLAL_S),		// OP_SMLAL_S
+/* 0000 1111 1010 */ TABDECL(OP_RSC_S_LSR_IMM),		// OP_RSC_S_LSR_IMM
+/* 0000 1111 1011 */ TABDECL(OP_UND),
+/* 0000 1111 1100 */ TABDECL(OP_RSC_S_ASR_IMM),		// OP_RSC_S_ASR_IMM
+/* 0000 1111 1101 */ TABDECL(OP_UND),
+/* 0000 1111 1110 */ TABDECL(OP_RSC_S_ROR_IMM),		// OP_RSC_S_ROR_IMM
+/* 0000 1111 1111 */ TABDECL(OP_UND),
+
+/* 0001 0000 0000 */ TABDECL(OP_MRS_CPSR),		// OP_MRS_CPSR
+/* 0001 0000 0001 */ TABDECL(OP_UND),
+/* 0001 0000 0010 */ TABDECL(OP_UND),
+/* 0001 0000 0011 */ TABDECL(OP_UND),
+/* 0001 0000 0100 */ TABDECL(OP_UND),
+/* 0001 0000 0101 */ TABDECL(OP_QADD),		// OP_QADD
+/* 0001 0000 0110 */ TABDECL(OP_UND),
+/* 0001 0000 0111 */ TABDECL(OP_UND),
+/* 0001 0000 1000 */ TABDECL(OP_SMLA_B_B),		// OP_SMLA_B_B
+/* 0001 0000 1001 */ TABDECL(OP_SWP),		// OP_SWP
+/* 0001 0000 1010 */ TABDECL(OP_SMLA_T_B),		// OP_SMLA_T_B
+/* 0001 0000 1011 */ TABDECL(OP_STRH_M_REG_OFF),		// OP_STRH_M_REG_OFF
+/* 0001 0000 1100 */ TABDECL(OP_SMLA_B_T),		// OP_SMLA_B_T
+/* 0001 0000 1101 */ TABDECL(OP_LDRD_STRD_OFFSET_PRE_INDEX),		// OP_LDRD_STRD_OFFSET_PRE_INDEX
+/* 0001 0000 1110 */ TABDECL(OP_SMLA_T_T),		// OP_SMLA_T_T
+/* 0001 0000 1111 */ TABDECL(OP_LDRD_STRD_OFFSET_PRE_INDEX),		// OP_LDRD_STRD_OFFSET_PRE_INDEX
+
+/* 0001 0001 0000 */ TABDECL(OP_TST_LSL_IMM),		// OP_TST_LSL_IMM
+/* 0001 0001 0001 */ TABDECL(OP_TST_LSL_REG),		// OP_TST_LSL_REG
+/* 0001 0001 0010 */ TABDECL(OP_TST_LSR_IMM),		// OP_TST_LSR_IMM
+/* 0001 0001 0011 */ TABDECL(OP_TST_LSR_REG),		// OP_TST_LSR_REG
+/* 0001 0001 0100 */ TABDECL(OP_TST_ASR_IMM),		// OP_TST_ASR_IMM
+/* 0001 0001 0101 */ TABDECL(OP_TST_ASR_REG),		// OP_TST_ASR_REG
+/* 0001 0001 0110 */ TABDECL(OP_TST_ROR_IMM),		// OP_TST_ROR_IMM
+/* 0001 0001 0111 */ TABDECL(OP_TST_ROR_REG),		// OP_TST_ROR_REG
+/* 0001 0001 1000 */ TABDECL(OP_TST_LSL_IMM),		// OP_TST_LSL_IMM
+/* 0001 0001 1001 */ TABDECL(OP_UND),
+/* 0001 0001 1010 */ TABDECL(OP_TST_LSR_IMM),		// OP_TST_LSR_IMM
+/* 0001 0001 1011 */ TABDECL(OP_LDRH_M_REG_OFF),		// OP_LDRH_M_REG_OFF
+/* 0001 0001 1100 */ TABDECL(OP_TST_ASR_IMM),		// OP_TST_ASR_IMM
+/* 0001 0001 1101 */ TABDECL(OP_LDRSB_M_REG_OFF),		// OP_LDRSB_M_REG_OFF
+/* 0001 0001 1110 */ TABDECL(OP_TST_ROR_IMM),		// OP_TST_ROR_IMM
+/* 0001 0001 1111 */ TABDECL(OP_LDRSH_M_REG_OFF),		// OP_LDRSH_M_REG_OFF
+
+/* 0001 0010 0000 */ TABDECL(OP_MSR_CPSR),		// OP_MSR_CPSR
+/* 0001 0010 0001 */ TABDECL(OP_BX),		// OP_BX
+/* 0001 0010 0010 */ TABDECL(OP_UND),
+/* 0001 0010 0011 */ TABDECL(OP_BLX_REG),		// OP_BLX_REG
+/* 0001 0010 0100 */ TABDECL(OP_UND),
+/* 0001 0010 0101 */ TABDECL(OP_QSUB),		// OP_QSUB
+/* 0001 0010 0110 */ TABDECL(OP_UND),
+/* 0001 0010 0111 */ TABDECL(OP_BKPT),		// OP_BKPT
+/* 0001 0010 1000 */ TABDECL(OP_SMLAW_B),		// OP_SMLAW_B
+/* 0001 0010 1001 */ TABDECL(OP_UND),
+/* 0001 0010 1010 */ TABDECL(OP_SMULW_B),		// OP_SMULW_B
+/* 0001 0010 1011 */ TABDECL(OP_STRH_PRE_INDE_M_REG_OFF),		// OP_STRH_PRE_INDE_M_REG_OFF
+/* 0001 0010 1100 */ TABDECL(OP_SMLAW_T),		// OP_SMLAW_T
+/* 0001 0010 1101 */ TABDECL(OP_LDRD_STRD_OFFSET_PRE_INDEX),		// OP_LDRD_STRD_OFFSET_PRE_INDEX
+/* 0001 0010 1110 */ TABDECL(OP_SMULW_T),		// OP_SMULW_T
+/* 0001 0010 1111 */ TABDECL(OP_LDRD_STRD_OFFSET_PRE_INDEX),		// OP_LDRD_STRD_OFFSET_PRE_INDEX
+
+/* 0001 0011 0000 */ TABDECL(OP_TEQ_LSL_IMM),		// OP_TEQ_LSL_IMM
+/* 0001 0011 0001 */ TABDECL(OP_TEQ_LSL_REG),		// OP_TEQ_LSL_REG
+/* 0001 0011 0010 */ TABDECL(OP_TEQ_LSR_IMM),		// OP_TEQ_LSR_IMM
+/* 0001 0011 0011 */ TABDECL(OP_TEQ_LSR_REG),		// OP_TEQ_LSR_REG
+/* 0001 0011 0100 */ TABDECL(OP_TEQ_ASR_IMM),		// OP_TEQ_ASR_IMM
+/* 0001 0011 0101 */ TABDECL(OP_TEQ_ASR_REG),		// OP_TEQ_ASR_REG
+/* 0001 0011 0110 */ TABDECL(OP_TEQ_ROR_IMM),		// OP_TEQ_ROR_IMM
+/* 0001 0011 0111 */ TABDECL(OP_TEQ_ROR_REG),		// OP_TEQ_ROR_REG
+/* 0001 0011 1000 */ TABDECL(OP_TEQ_LSL_IMM),		// OP_TEQ_LSL_IMM
+/* 0001 0011 1001 */ TABDECL(OP_UND),
+/* 0001 0011 1010 */ TABDECL(OP_TEQ_LSR_IMM),		// OP_TEQ_LSR_IMM
+/* 0001 0011 1011 */ TABDECL(OP_LDRH_PRE_INDE_M_REG_OFF),		// OP_LDRH_PRE_INDE_M_REG_OFF
+/* 0001 0011 1100 */ TABDECL(OP_TEQ_ASR_IMM),		// OP_TEQ_ASR_IMM
+/* 0001 0011 1101 */ TABDECL(OP_LDRSB_PRE_INDE_M_REG_OFF),		// OP_LDRSB_PRE_INDE_M_REG_OFF
+/* 0001 0011 1110 */ TABDECL(OP_TEQ_ROR_IMM),		// OP_TEQ_ROR_IMM
+/* 0001 0011 1111 */ TABDECL(OP_LDRSH_PRE_INDE_M_REG_OFF),		// OP_LDRSH_PRE_INDE_M_REG_OFF
+
+/* 0001 0100 0000 */ TABDECL(OP_MRS_SPSR),		// OP_MRS_SPSR
+/* 0001 0100 0001 */ TABDECL(OP_UND),
+/* 0001 0100 0010 */ TABDECL(OP_UND),
+/* 0001 0100 0011 */ TABDECL(OP_UND),
+/* 0001 0100 0100 */ TABDECL(OP_UND),
+/* 0001 0100 0101 */ TABDECL(OP_QDADD),		// OP_QDADD
+/* 0001 0100 0110 */ TABDECL(OP_UND),
+/* 0001 0100 0111 */ TABDECL(OP_UND),
+/* 0001 0100 1000 */ TABDECL(OP_SMLAL_B_B),		// OP_SMLAL_B_B
+/* 0001 0100 1001 */ TABDECL(OP_SWPB),		// OP_SWPB
+/* 0001 0100 1010 */ TABDECL(OP_SMLAL_T_B),		// OP_SMLAL_T_B
+/* 0001 0100 1011 */ TABDECL(OP_STRH_M_IMM_OFF),		// OP_STRH_M_IMM_OFF
+/* 0001 0100 1100 */ TABDECL(OP_SMLAL_B_T),		// OP_SMLAL_B_T
+/* 0001 0100 1101 */ TABDECL(OP_LDRD_STRD_OFFSET_PRE_INDEX),		// OP_LDRD_STRD_OFFSET_PRE_INDEX
+/* 0001 0100 1110 */ TABDECL(OP_SMLAL_T_T),		// OP_SMLAL_T_T
+/* 0001 0100 1111 */ TABDECL(OP_LDRD_STRD_OFFSET_PRE_INDEX),		// OP_LDRD_STRD_OFFSET_PRE_INDEX
+
+/* 0001 0101 0000 */ TABDECL(OP_CMP_LSL_IMM),		// OP_CMP_LSL_IMM
+/* 0001 0101 0001 */ TABDECL(OP_CMP_LSL_REG),		// OP_CMP_LSL_REG
+/* 0001 0101 0010 */ TABDECL(OP_CMP_LSR_IMM),		// OP_CMP_LSR_IMM
+/* 0001 0101 0011 */ TABDECL(OP_CMP_LSR_REG),		// OP_CMP_LSR_REG
+/* 0001 0101 0100 */ TABDECL(OP_CMP_ASR_IMM),		// OP_CMP_ASR_IMM
+/* 0001 0101 0101 */ TABDECL(OP_CMP_ASR_REG),		// OP_CMP_ASR_REG
+/* 0001 0101 0110 */ TABDECL(OP_CMP_ROR_IMM),		// OP_CMP_ROR_IMM
+/* 0001 0101 0111 */ TABDECL(OP_CMP_ROR_REG),		// OP_CMP_ROR_REG
+/* 0001 0101 1000 */ TABDECL(OP_CMP_LSL_IMM),		// OP_CMP_LSL_IMM
+/* 0001 0101 1001 */ TABDECL(OP_UND),
+/* 0001 0101 1010 */ TABDECL(OP_CMP_LSR_IMM),		// OP_CMP_LSR_IMM
+/* 0001 0101 1011 */ TABDECL(OP_LDRH_M_IMM_OFF),		// OP_LDRH_M_IMM_OFF
+/* 0001 0101 1100 */ TABDECL(OP_CMP_ASR_IMM),		// OP_CMP_ASR_IMM
+/* 0001 0101 1101 */ TABDECL(OP_LDRSB_M_IMM_OFF),		// OP_LDRSB_M_IMM_OFF
+/* 0001 0101 1110 */ TABDECL(OP_CMP_ROR_IMM),		// OP_CMP_ROR_IMM
+/* 0001 0101 1111 */ TABDECL(OP_LDRSH_M_IMM_OFF),		// OP_LDRSH_M_IMM_OFF
+
+/* 0001 0110 0000 */ TABDECL(OP_MSR_SPSR),		// OP_MSR_SPSR
+/* 0001 0110 0001 */ TABDECL(OP_CLZ),		// OP_CLZ
+/* 0001 0110 0010 */ TABDECL(OP_UND),
+/* 0001 0110 0011 */ TABDECL(OP_UND),
+/* 0001 0110 0100 */ TABDECL(OP_UND),
+/* 0001 0110 0101 */ TABDECL(OP_QDSUB),		// OP_QDSUB
+/* 0001 0110 0110 */ TABDECL(OP_UND),
+/* 0001 0110 0111 */ TABDECL(OP_UND),
+/* 0001 0110 1000 */ TABDECL(OP_SMUL_B_B),		// OP_SMUL_B_B
+/* 0001 0110 1001 */ TABDECL(OP_UND),
+/* 0001 0110 1010 */ TABDECL(OP_SMUL_T_B),		// OP_SMUL_T_B
+/* 0001 0110 1011 */ TABDECL(OP_STRH_PRE_INDE_M_IMM_OFF),		// OP_STRH_PRE_INDE_M_IMM_OFF
+/* 0001 0110 1100 */ TABDECL(OP_SMUL_B_T),		// OP_SMUL_B_T
+/* 0001 0110 1101 */ TABDECL(OP_LDRD_STRD_OFFSET_PRE_INDEX),		// OP_LDRD_STRD_OFFSET_PRE_INDEX
+/* 0001 0110 1110 */ TABDECL(OP_SMUL_T_T),		// OP_SMUL_T_T
+/* 0001 0110 1111 */ TABDECL(OP_LDRD_STRD_OFFSET_PRE_INDEX),		// OP_LDRD_STRD_OFFSET_PRE_INDEX
+
+/* 0001 0111 0000 */ TABDECL(OP_CMN_LSL_IMM),		// OP_CMN_LSL_IMM
+/* 0001 0111 0001 */ TABDECL(OP_CMN_LSL_REG),		// OP_CMN_LSL_REG
+/* 0001 0111 0010 */ TABDECL(OP_CMN_LSR_IMM),		// OP_CMN_LSR_IMM
+/* 0001 0111 0011 */ TABDECL(OP_CMN_LSR_REG),		// OP_CMN_LSR_REG
+/* 0001 0111 0100 */ TABDECL(OP_CMN_ASR_IMM),		// OP_CMN_ASR_IMM
+/* 0001 0111 0101 */ TABDECL(OP_CMN_ASR_REG),		// OP_CMN_ASR_REG
+/* 0001 0111 0110 */ TABDECL(OP_CMN_ROR_IMM),		// OP_CMN_ROR_IMM
+/* 0001 0111 0111 */ TABDECL(OP_CMN_ROR_REG),		// OP_CMN_ROR_REG
+/* 0001 0111 1000 */ TABDECL(OP_CMN_LSL_IMM),		// OP_CMN_LSL_IMM
+/* 0001 0111 1001 */ TABDECL(OP_UND),
+/* 0001 0111 1010 */ TABDECL(OP_CMN_LSR_IMM),		// OP_CMN_LSR_IMM
+/* 0001 0111 1011 */ TABDECL(OP_LDRH_PRE_INDE_M_IMM_OFF),		// OP_LDRH_PRE_INDE_M_IMM_OFF
+/* 0001 0111 1100 */ TABDECL(OP_CMN_ASR_IMM),		// OP_CMN_ASR_IMM
+/* 0001 0111 1101 */ TABDECL(OP_LDRSB_PRE_INDE_M_IMM_OFF),		// OP_LDRSB_PRE_INDE_M_IMM_OFF
+/* 0001 0111 1110 */ TABDECL(OP_CMN_ROR_IMM),		// OP_CMN_ROR_IMM
+/* 0001 0111 1111 */ TABDECL(OP_LDRSH_PRE_INDE_M_IMM_OFF),		// OP_LDRSH_PRE_INDE_M_IMM_OFF
+
+/* 0001 1000 0000 */ TABDECL(OP_ORR_LSL_IMM),		// OP_ORR_LSL_IMM
+/* 0001 1000 0001 */ TABDECL(OP_ORR_LSL_REG),		// OP_ORR_LSL_REG
+/* 0001 1000 0010 */ TABDECL(OP_ORR_LSR_IMM),		// OP_ORR_LSR_IMM
+/* 0001 1000 0011 */ TABDECL(OP_ORR_LSR_REG),		// OP_ORR_LSR_REG
+/* 0001 1000 0100 */ TABDECL(OP_ORR_ASR_IMM),		// OP_ORR_ASR_IMM
+/* 0001 1000 0101 */ TABDECL(OP_ORR_ASR_REG),		// OP_ORR_ASR_REG
+/* 0001 1000 0110 */ TABDECL(OP_ORR_ROR_IMM),		// OP_ORR_ROR_IMM
+/* 0001 1000 0111 */ TABDECL(OP_ORR_ROR_REG),		// OP_ORR_ROR_REG
+/* 0001 1000 1000 */ TABDECL(OP_ORR_LSL_IMM),		// OP_ORR_LSL_IMM
+/* 0001 1000 1001 */ TABDECL(OP_STREX),				// OP_STREX
+/* 0001 1000 1010 */ TABDECL(OP_ORR_LSR_IMM),		// OP_ORR_LSR_IMM
+/* 0001 1000 1011 */ TABDECL(OP_STRH_P_REG_OFF),		// OP_STRH_P_REG_OFF
+/* 0001 1000 1100 */ TABDECL(OP_ORR_ASR_IMM),		// OP_ORR_ASR_IMM
+/* 0001 1000 1101 */ TABDECL(OP_LDRD_STRD_OFFSET_PRE_INDEX),		// OP_LDRD_STRD_OFFSET_PRE_INDEX
+/* 0001 1000 1110 */ TABDECL(OP_ORR_ROR_IMM),		// OP_ORR_ROR_IMM
+/* 0001 1000 1111 */ TABDECL(OP_LDRD_STRD_OFFSET_PRE_INDEX),		// OP_LDRD_STRD_OFFSET_PRE_INDEX
+
+/* 0001 1001 0000 */ TABDECL(OP_ORR_S_LSL_IMM),		// OP_ORR_S_LSL_IMM
+/* 0001 1001 0001 */ TABDECL(OP_ORR_S_LSL_REG),		// OP_ORR_S_LSL_REG
+/* 0001 1001 0010 */ TABDECL(OP_ORR_S_LSR_IMM),		// OP_ORR_S_LSR_IMM
+/* 0001 1001 0011 */ TABDECL(OP_ORR_S_LSR_REG),		// OP_ORR_S_LSR_REG
+/* 0001 1001 0100 */ TABDECL(OP_ORR_S_ASR_IMM),		// OP_ORR_S_ASR_IMM
+/* 0001 1001 0101 */ TABDECL(OP_ORR_S_ASR_REG),		// OP_ORR_S_ASR_REG
+/* 0001 1001 0110 */ TABDECL(OP_ORR_S_ROR_IMM),		// OP_ORR_S_ROR_IMM
+/* 0001 1001 0111 */ TABDECL(OP_ORR_S_ROR_REG),		// OP_ORR_S_ROR_REG
+/* 0001 1001 1000 */ TABDECL(OP_ORR_S_LSL_IMM),		// OP_ORR_S_LSL_IMM
+/* 0001 1001 1001 */ TABDECL(OP_LDREX),				// OP_LDREX
+/* 0001 1001 1010 */ TABDECL(OP_ORR_S_LSR_IMM),		// OP_ORR_S_LSR_IMM
+/* 0001 1001 1011 */ TABDECL(OP_LDRH_P_REG_OFF),		// OP_LDRH_P_REG_OFF
+/* 0001 1001 1100 */ TABDECL(OP_ORR_S_ASR_IMM),		// OP_ORR_S_ASR_IMM
+/* 0001 1001 1101 */ TABDECL(OP_LDRSB_P_REG_OFF),		// OP_LDRSB_P_REG_OFF
+/* 0001 1001 1110 */ TABDECL(OP_ORR_S_ROR_IMM),		// OP_ORR_S_ROR_IMM
+/* 0001 1001 1111 */ TABDECL(OP_LDRSH_P_REG_OFF),		// OP_LDRSH_P_REG_OFF
+
+/* 0001 1010 0000 */ TABDECL(OP_MOV_LSL_IMM),		// OP_MOV_LSL_IMM
+/* 0001 1010 0001 */ TABDECL(OP_MOV_LSL_REG),		// OP_MOV_LSL_REG
+/* 0001 1010 0010 */ TABDECL(OP_MOV_LSR_IMM),		// OP_MOV_LSR_IMM
+/* 0001 1010 0011 */ TABDECL(OP_MOV_LSR_REG),		// OP_MOV_LSR_REG
+/* 0001 1010 0100 */ TABDECL(OP_MOV_ASR_IMM),		// OP_MOV_ASR_IMM
+/* 0001 1010 0101 */ TABDECL(OP_MOV_ASR_REG),		// OP_MOV_ASR_REG
+/* 0001 1010 0110 */ TABDECL(OP_MOV_ROR_IMM),		// OP_MOV_ROR_IMM
+/* 0001 1010 0111 */ TABDECL(OP_MOV_ROR_REG),		// OP_MOV_ROR_REG
+/* 0001 1010 1000 */ TABDECL(OP_MOV_LSL_IMM),		// OP_MOV_LSL_IMM
+/* 0001 1010 1001 */ TABDECL(OP_UND),
+/* 0001 1010 1010 */ TABDECL(OP_MOV_LSR_IMM),		// OP_MOV_LSR_IMM
+/* 0001 1010 1011 */ TABDECL(OP_STRH_PRE_INDE_P_REG_OFF),		// OP_STRH_PRE_INDE_P_REG_OFF
+/* 0001 1010 1100 */ TABDECL(OP_MOV_ASR_IMM),		// OP_MOV_ASR_IMM
+/* 0001 1010 1101 */ TABDECL(OP_LDRD_STRD_OFFSET_PRE_INDEX),		// OP_LDRD_STRD_OFFSET_PRE_INDEX
+/* 0001 1010 1110 */ TABDECL(OP_MOV_ROR_IMM),		// OP_MOV_ROR_IMM
+/* 0001 1010 1111 */ TABDECL(OP_LDRD_STRD_OFFSET_PRE_INDEX),		// OP_LDRD_STRD_OFFSET_PRE_INDEX
+
+/* 0001 1011 0000 */ TABDECL(OP_MOV_S_LSL_IMM),		// OP_MOV_S_LSL_IMM
+/* 0001 1011 0001 */ TABDECL(OP_MOV_S_LSL_REG),		// OP_MOV_S_LSL_REG
+/* 0001 1011 0010 */ TABDECL(OP_MOV_S_LSR_IMM),		// OP_MOV_S_LSR_IMM
+/* 0001 1011 0011 */ TABDECL(OP_MOV_S_LSR_REG),		// OP_MOV_S_LSR_REG
+/* 0001 1011 0100 */ TABDECL(OP_MOV_S_ASR_IMM),		// OP_MOV_S_ASR_IMM
+/* 0001 1011 0101 */ TABDECL(OP_MOV_S_ASR_REG),		// OP_MOV_S_ASR_REG
+/* 0001 1011 0110 */ TABDECL(OP_MOV_S_ROR_IMM),		// OP_MOV_S_ROR_IMM
+/* 0001 1011 0111 */ TABDECL(OP_MOV_S_ROR_REG),		// OP_MOV_S_ROR_REG
+/* 0001 1011 1000 */ TABDECL(OP_MOV_S_LSL_IMM),		// OP_MOV_S_LSL_IMM
+/* 0001 1011 1001 */ TABDECL(OP_UND),
+/* 0001 1011 1010 */ TABDECL(OP_MOV_S_LSR_IMM),		// OP_MOV_S_LSR_IMM
+/* 0001 1011 1011 */ TABDECL(OP_LDRH_PRE_INDE_P_REG_OFF),		// OP_LDRH_PRE_INDE_P_REG_OFF
+/* 0001 1011 1100 */ TABDECL(OP_MOV_S_ASR_IMM),		// OP_MOV_S_ASR_IMM
+/* 0001 1011 1101 */ TABDECL(OP_LDRSB_PRE_INDE_P_REG_OFF),		// OP_LDRSB_PRE_INDE_P_REG_OFF
+/* 0001 1011 1110 */ TABDECL(OP_MOV_S_ROR_IMM),		// OP_MOV_S_ROR_IMM
+/* 0001 1011 1111 */ TABDECL(OP_LDRSH_PRE_INDE_P_REG_OFF),		// OP_LDRSH_PRE_INDE_P_REG_OFF
+
+/* 0001 1100 0000 */ TABDECL(OP_BIC_LSL_IMM),		// OP_BIC_LSL_IMM
+/* 0001 1100 0001 */ TABDECL(OP_BIC_LSL_REG),		// OP_BIC_LSL_REG
+/* 0001 1100 0010 */ TABDECL(OP_BIC_LSR_IMM),		// OP_BIC_LSR_IMM
+/* 0001 1100 0011 */ TABDECL(OP_BIC_LSR_REG),		// OP_BIC_LSR_REG
+/* 0001 1100 0100 */ TABDECL(OP_BIC_ASR_IMM),		// OP_BIC_ASR_IMM
+/* 0001 1100 0101 */ TABDECL(OP_BIC_ASR_REG),		// OP_BIC_ASR_REG
+/* 0001 1100 0110 */ TABDECL(OP_BIC_ROR_IMM),		// OP_BIC_ROR_IMM
+/* 0001 1100 0111 */ TABDECL(OP_BIC_ROR_REG),		// OP_BIC_ROR_REG
+/* 0001 1100 1000 */ TABDECL(OP_BIC_LSL_IMM),		// OP_BIC_LSL_IMM
+/* 0001 1100 1001 */ TABDECL(OP_UND),
+/* 0001 1100 1010 */ TABDECL(OP_BIC_LSR_IMM),		// OP_BIC_LSR_IMM
+/* 0001 1100 1011 */ TABDECL(OP_STRH_P_IMM_OFF),		// OP_STRH_P_IMM_OFF
+/* 0001 1100 1100 */ TABDECL(OP_BIC_ASR_IMM),		// OP_BIC_ASR_IMM
+/* 0001 1100 1101 */ TABDECL(OP_LDRD_STRD_OFFSET_PRE_INDEX),		// OP_LDRD_STRD_OFFSET_PRE_INDEX
+/* 0001 1100 1110 */ TABDECL(OP_BIC_ROR_IMM),		// OP_BIC_ROR_IMM
+/* 0001 1100 1111 */ TABDECL(OP_LDRD_STRD_OFFSET_PRE_INDEX),		// OP_LDRD_STRD_OFFSET_PRE_INDEX
+
+/* 0001 1101 0000 */ TABDECL(OP_BIC_S_LSL_IMM),		// OP_BIC_S_LSL_IMM
+/* 0001 1101 0001 */ TABDECL(OP_BIC_S_LSL_REG),		// OP_BIC_S_LSL_REG
+/* 0001 1101 0010 */ TABDECL(OP_BIC_S_LSR_IMM),		// OP_BIC_S_LSR_IMM
+/* 0001 1101 0011 */ TABDECL(OP_BIC_S_LSR_REG),		// OP_BIC_S_LSR_REG
+/* 0001 1101 0100 */ TABDECL(OP_BIC_S_ASR_IMM),		// OP_BIC_S_ASR_IMM
+/* 0001 1101 0101 */ TABDECL(OP_BIC_S_ASR_REG),		// OP_BIC_S_ASR_REG
+/* 0001 1101 0110 */ TABDECL(OP_BIC_S_ROR_IMM),		// OP_BIC_S_ROR_IMM
+/* 0001 1101 0111 */ TABDECL(OP_BIC_S_ROR_REG),		// OP_BIC_S_ROR_REG
+/* 0001 1101 1000 */ TABDECL(OP_BIC_S_LSL_IMM),		// OP_BIC_S_LSL_IMM
+/* 0001 1101 1001 */ TABDECL(OP_UND),
+/* 0001 1101 1010 */ TABDECL(OP_BIC_S_LSR_IMM),		// OP_BIC_S_LSR_IMM
+/* 0001 1101 1011 */ TABDECL(OP_LDRH_P_IMM_OFF),		// OP_LDRH_P_IMM_OFF
+/* 0001 1101 1100 */ TABDECL(OP_BIC_S_ASR_IMM),		// OP_BIC_S_ASR_IMM
+/* 0001 1101 1101 */ TABDECL(OP_LDRSB_P_IMM_OFF),		// OP_LDRSB_P_IMM_OFF
+/* 0001 1101 1110 */ TABDECL(OP_BIC_S_ROR_IMM),		// OP_BIC_S_ROR_IMM
+/* 0001 1101 1111 */ TABDECL(OP_LDRSH_P_IMM_OFF),		// OP_LDRSH_P_IMM_OFF
+
+/* 0001 1110 0000 */ TABDECL(OP_MVN_LSL_IMM),		// OP_MVN_LSL_IMM
+/* 0001 1110 0001 */ TABDECL(OP_MVN_LSL_REG),		// OP_MVN_LSL_REG
+/* 0001 1110 0010 */ TABDECL(OP_MVN_LSR_IMM),		// OP_MVN_LSR_IMM
+/* 0001 1110 0011 */ TABDECL(OP_MVN_LSR_REG),		// OP_MVN_LSR_REG
+/* 0001 1110 0100 */ TABDECL(OP_MVN_ASR_IMM),		// OP_MVN_ASR_IMM
+/* 0001 1110 0101 */ TABDECL(OP_MVN_ASR_REG),		// OP_MVN_ASR_REG
+/* 0001 1110 0110 */ TABDECL(OP_MVN_ROR_IMM),		// OP_MVN_ROR_IMM
+/* 0001 1110 0111 */ TABDECL(OP_MVN_ROR_REG),		// OP_MVN_ROR_REG
+/* 0001 1110 1000 */ TABDECL(OP_MVN_LSL_IMM),		// OP_MVN_LSL_IMM
+/* 0001 1110 1001 */ TABDECL(OP_UND),
+/* 0001 1110 1010 */ TABDECL(OP_MVN_LSR_IMM),		// OP_MVN_LSR_IMM
+/* 0001 1110 1011 */ TABDECL(OP_STRH_PRE_INDE_P_IMM_OFF),		// OP_STRH_PRE_INDE_P_IMM_OFF
+/* 0001 1110 1100 */ TABDECL(OP_MVN_ASR_IMM),		// OP_MVN_ASR_IMM
+/* 0001 1110 1101 */ TABDECL(OP_LDRD_STRD_OFFSET_PRE_INDEX),		// OP_LDRD_STRD_OFFSET_PRE_INDEX
+/* 0001 1110 1110 */ TABDECL(OP_MVN_ROR_IMM),		// OP_MVN_ROR_IMM
+/* 0001 1110 1111 */ TABDECL(OP_LDRD_STRD_OFFSET_PRE_INDEX),		// OP_LDRD_STRD_OFFSET_PRE_INDEX
+
+/* 0001 1111 0000 */ TABDECL(OP_MVN_S_LSL_IMM),		// OP_MVN_S_LSL_IMM
+/* 0001 1111 0001 */ TABDECL(OP_MVN_S_LSL_REG),		// OP_MVN_S_LSL_REG
+/* 0001 1111 0010 */ TABDECL(OP_MVN_S_LSR_IMM),		// OP_MVN_S_LSR_IMM
+/* 0001 1111 0011 */ TABDECL(OP_MVN_S_LSR_REG),		// OP_MVN_S_LSR_REG
+/* 0001 1111 0100 */ TABDECL(OP_MVN_S_ASR_IMM),		// OP_MVN_S_ASR_IMM
+/* 0001 1111 0101 */ TABDECL(OP_MVN_S_ASR_REG),		// OP_MVN_S_ASR_REG
+/* 0001 1111 0110 */ TABDECL(OP_MVN_S_ROR_IMM),		// OP_MVN_S_ROR_IMM
+/* 0001 1111 0111 */ TABDECL(OP_MVN_S_ROR_REG),		// OP_MVN_S_ROR_REG
+/* 0001 1111 1000 */ TABDECL(OP_MVN_S_LSL_IMM),		// OP_MVN_S_LSL_IMM
+/* 0001 1111 1001 */ TABDECL(OP_UND),
+/* 0001 1111 1010 */ TABDECL(OP_MVN_S_LSR_IMM),		// OP_MVN_S_LSR_IMM
+/* 0001 1111 1011 */ TABDECL(OP_LDRH_PRE_INDE_P_IMM_OFF),		// OP_LDRH_PRE_INDE_P_IMM_OFF
+/* 0001 1111 1100 */ TABDECL(OP_MVN_S_ASR_IMM),		// OP_MVN_S_ASR_IMM
+/* 0001 1111 1101 */ TABDECL(OP_LDRSB_PRE_INDE_P_IMM_OFF),		// OP_LDRSB_PRE_INDE_P_IMM_OFF
+/* 0001 1111 1110 */ TABDECL(OP_MVN_S_ROR_IMM),		// OP_MVN_S_ROR_IMM
+/* 0001 1111 1111 */ TABDECL(OP_LDRSH_PRE_INDE_P_IMM_OFF),		// OP_LDRSH_PRE_INDE_P_IMM_OFF
+
+/* 0010 0000 0000 */ TABDECL(OP_AND_IMM_VAL),		// OP_AND_IMM_VAL
+/* 0010 0000 0001 */ TABDECL(OP_AND_IMM_VAL),		// OP_AND_IMM_VAL
+/* 0010 0000 0010 */ TABDECL(OP_AND_IMM_VAL),		// OP_AND_IMM_VAL
+/* 0010 0000 0011 */ TABDECL(OP_AND_IMM_VAL),		// OP_AND_IMM_VAL
+/* 0010 0000 0100 */ TABDECL(OP_AND_IMM_VAL),		// OP_AND_IMM_VAL
+/* 0010 0000 0101 */ TABDECL(OP_AND_IMM_VAL),		// OP_AND_IMM_VAL
+/* 0010 0000 0110 */ TABDECL(OP_AND_IMM_VAL),		// OP_AND_IMM_VAL
+/* 0010 0000 0111 */ TABDECL(OP_AND_IMM_VAL),		// OP_AND_IMM_VAL
+/* 0010 0000 1000 */ TABDECL(OP_AND_IMM_VAL),		// OP_AND_IMM_VAL
+/* 0010 0000 1001 */ TABDECL(OP_AND_IMM_VAL),		// OP_AND_IMM_VAL
+/* 0010 0000 1010 */ TABDECL(OP_AND_IMM_VAL),		// OP_AND_IMM_VAL
+/* 0010 0000 1011 */ TABDECL(OP_AND_IMM_VAL),		// OP_AND_IMM_VAL
+/* 0010 0000 1100 */ TABDECL(OP_AND_IMM_VAL),		// OP_AND_IMM_VAL
+/* 0010 0000 1101 */ TABDECL(OP_AND_IMM_VAL),		// OP_AND_IMM_VAL
+/* 0010 0000 1110 */ TABDECL(OP_AND_IMM_VAL),		// OP_AND_IMM_VAL
+/* 0010 0000 1111 */ TABDECL(OP_AND_IMM_VAL),		// OP_AND_IMM_VAL
+
+/* 0010 0001 0000 */ TABDECL(OP_AND_S_IMM_VAL),		// OP_AND_S_IMM_VAL
+/* 0010 0001 0001 */ TABDECL(OP_AND_S_IMM_VAL),		// OP_AND_S_IMM_VAL
+/* 0010 0001 0010 */ TABDECL(OP_AND_S_IMM_VAL),		// OP_AND_S_IMM_VAL
+/* 0010 0001 0011 */ TABDECL(OP_AND_S_IMM_VAL),		// OP_AND_S_IMM_VAL
+/* 0010 0001 0100 */ TABDECL(OP_AND_S_IMM_VAL),		// OP_AND_S_IMM_VAL
+/* 0010 0001 0101 */ TABDECL(OP_AND_S_IMM_VAL),		// OP_AND_S_IMM_VAL
+/* 0010 0001 0110 */ TABDECL(OP_AND_S_IMM_VAL),		// OP_AND_S_IMM_VAL
+/* 0010 0001 0111 */ TABDECL(OP_AND_S_IMM_VAL),		// OP_AND_S_IMM_VAL
+/* 0010 0001 1000 */ TABDECL(OP_AND_S_IMM_VAL),		// OP_AND_S_IMM_VAL
+/* 0010 0001 1001 */ TABDECL(OP_AND_S_IMM_VAL),		// OP_AND_S_IMM_VAL
+/* 0010 0001 1010 */ TABDECL(OP_AND_S_IMM_VAL),		// OP_AND_S_IMM_VAL
+/* 0010 0001 1011 */ TABDECL(OP_AND_S_IMM_VAL),		// OP_AND_S_IMM_VAL
+/* 0010 0001 1100 */ TABDECL(OP_AND_S_IMM_VAL),		// OP_AND_S_IMM_VAL
+/* 0010 0001 1101 */ TABDECL(OP_AND_S_IMM_VAL),		// OP_AND_S_IMM_VAL
+/* 0010 0001 1110 */ TABDECL(OP_AND_S_IMM_VAL),		// OP_AND_S_IMM_VAL
+/* 0010 0001 1111 */ TABDECL(OP_AND_S_IMM_VAL),		// OP_AND_S_IMM_VAL
+
+/* 0010 0010 0000 */ TABDECL(OP_EOR_IMM_VAL),		// OP_EOR_IMM_VAL
+/* 0010 0010 0001 */ TABDECL(OP_EOR_IMM_VAL),		// OP_EOR_IMM_VAL
+/* 0010 0010 0010 */ TABDECL(OP_EOR_IMM_VAL),		// OP_EOR_IMM_VAL
+/* 0010 0010 0011 */ TABDECL(OP_EOR_IMM_VAL),		// OP_EOR_IMM_VAL
+/* 0010 0010 0100 */ TABDECL(OP_EOR_IMM_VAL),		// OP_EOR_IMM_VAL
+/* 0010 0010 0101 */ TABDECL(OP_EOR_IMM_VAL),		// OP_EOR_IMM_VAL
+/* 0010 0010 0110 */ TABDECL(OP_EOR_IMM_VAL),		// OP_EOR_IMM_VAL
+/* 0010 0010 0111 */ TABDECL(OP_EOR_IMM_VAL),		// OP_EOR_IMM_VAL
+/* 0010 0010 1000 */ TABDECL(OP_EOR_IMM_VAL),		// OP_EOR_IMM_VAL
+/* 0010 0010 1001 */ TABDECL(OP_EOR_IMM_VAL),		// OP_EOR_IMM_VAL
+/* 0010 0010 1010 */ TABDECL(OP_EOR_IMM_VAL),		// OP_EOR_IMM_VAL
+/* 0010 0010 1011 */ TABDECL(OP_EOR_IMM_VAL),		// OP_EOR_IMM_VAL
+/* 0010 0010 1100 */ TABDECL(OP_EOR_IMM_VAL),		// OP_EOR_IMM_VAL
+/* 0010 0010 1101 */ TABDECL(OP_EOR_IMM_VAL),		// OP_EOR_IMM_VAL
+/* 0010 0010 1110 */ TABDECL(OP_EOR_IMM_VAL),		// OP_EOR_IMM_VAL
+/* 0010 0010 1111 */ TABDECL(OP_EOR_IMM_VAL),		// OP_EOR_IMM_VAL
+
+/* 0010 0011 0000 */ TABDECL(OP_EOR_S_IMM_VAL),		// OP_EOR_S_IMM_VAL
+/* 0010 0011 0001 */ TABDECL(OP_EOR_S_IMM_VAL),		// OP_EOR_S_IMM_VAL
+/* 0010 0011 0010 */ TABDECL(OP_EOR_S_IMM_VAL),		// OP_EOR_S_IMM_VAL
+/* 0010 0011 0011 */ TABDECL(OP_EOR_S_IMM_VAL),		// OP_EOR_S_IMM_VAL
+/* 0010 0011 0100 */ TABDECL(OP_EOR_S_IMM_VAL),		// OP_EOR_S_IMM_VAL
+/* 0010 0011 0101 */ TABDECL(OP_EOR_S_IMM_VAL),		// OP_EOR_S_IMM_VAL
+/* 0010 0011 0110 */ TABDECL(OP_EOR_S_IMM_VAL),		// OP_EOR_S_IMM_VAL
+/* 0010 0011 0111 */ TABDECL(OP_EOR_S_IMM_VAL),		// OP_EOR_S_IMM_VAL
+/* 0010 0011 1000 */ TABDECL(OP_EOR_S_IMM_VAL),		// OP_EOR_S_IMM_VAL
+/* 0010 0011 1001 */ TABDECL(OP_EOR_S_IMM_VAL),		// OP_EOR_S_IMM_VAL
+/* 0010 0011 1010 */ TABDECL(OP_EOR_S_IMM_VAL),		// OP_EOR_S_IMM_VAL
+/* 0010 0011 1011 */ TABDECL(OP_EOR_S_IMM_VAL),		// OP_EOR_S_IMM_VAL
+/* 0010 0011 1100 */ TABDECL(OP_EOR_S_IMM_VAL),		// OP_EOR_S_IMM_VAL
+/* 0010 0011 1101 */ TABDECL(OP_EOR_S_IMM_VAL),		// OP_EOR_S_IMM_VAL
+/* 0010 0011 1110 */ TABDECL(OP_EOR_S_IMM_VAL),		// OP_EOR_S_IMM_VAL
+/* 0010 0011 1111 */ TABDECL(OP_EOR_S_IMM_VAL),		// OP_EOR_S_IMM_VAL
+
+/* 0010 0100 0000 */ TABDECL(OP_SUB_IMM_VAL),		// OP_SUB_IMM_VAL
+/* 0010 0100 0001 */ TABDECL(OP_SUB_IMM_VAL),		// OP_SUB_IMM_VAL
+/* 0010 0100 0010 */ TABDECL(OP_SUB_IMM_VAL),		// OP_SUB_IMM_VAL
+/* 0010 0100 0011 */ TABDECL(OP_SUB_IMM_VAL),		// OP_SUB_IMM_VAL
+/* 0010 0100 0100 */ TABDECL(OP_SUB_IMM_VAL),		// OP_SUB_IMM_VAL
+/* 0010 0100 0101 */ TABDECL(OP_SUB_IMM_VAL),		// OP_SUB_IMM_VAL
+/* 0010 0100 0110 */ TABDECL(OP_SUB_IMM_VAL),		// OP_SUB_IMM_VAL
+/* 0010 0100 0111 */ TABDECL(OP_SUB_IMM_VAL),		// OP_SUB_IMM_VAL
+/* 0010 0100 1000 */ TABDECL(OP_SUB_IMM_VAL),		// OP_SUB_IMM_VAL
+/* 0010 0100 1001 */ TABDECL(OP_SUB_IMM_VAL),		// OP_SUB_IMM_VAL
+/* 0010 0100 1010 */ TABDECL(OP_SUB_IMM_VAL),		// OP_SUB_IMM_VAL
+/* 0010 0100 1011 */ TABDECL(OP_SUB_IMM_VAL),		// OP_SUB_IMM_VAL
+/* 0010 0100 1100 */ TABDECL(OP_SUB_IMM_VAL),		// OP_SUB_IMM_VAL
+/* 0010 0100 1101 */ TABDECL(OP_SUB_IMM_VAL),		// OP_SUB_IMM_VAL
+/* 0010 0100 1110 */ TABDECL(OP_SUB_IMM_VAL),		// OP_SUB_IMM_VAL
+/* 0010 0100 1111 */ TABDECL(OP_SUB_IMM_VAL),		// OP_SUB_IMM_VAL
+
+/* 0010 0101 0000 */ TABDECL(OP_SUB_S_IMM_VAL),		// OP_SUB_S_IMM_VAL
+/* 0010 0101 0001 */ TABDECL(OP_SUB_S_IMM_VAL),		// OP_SUB_S_IMM_VAL
+/* 0010 0101 0010 */ TABDECL(OP_SUB_S_IMM_VAL),		// OP_SUB_S_IMM_VAL
+/* 0010 0101 0011 */ TABDECL(OP_SUB_S_IMM_VAL),		// OP_SUB_S_IMM_VAL
+/* 0010 0101 0100 */ TABDECL(OP_SUB_S_IMM_VAL),		// OP_SUB_S_IMM_VAL
+/* 0010 0101 0101 */ TABDECL(OP_SUB_S_IMM_VAL),		// OP_SUB_S_IMM_VAL
+/* 0010 0101 0110 */ TABDECL(OP_SUB_S_IMM_VAL),		// OP_SUB_S_IMM_VAL
+/* 0010 0101 0111 */ TABDECL(OP_SUB_S_IMM_VAL),		// OP_SUB_S_IMM_VAL
+/* 0010 0101 1000 */ TABDECL(OP_SUB_S_IMM_VAL),		// OP_SUB_S_IMM_VAL
+/* 0010 0101 1001 */ TABDECL(OP_SUB_S_IMM_VAL),		// OP_SUB_S_IMM_VAL
+/* 0010 0101 1010 */ TABDECL(OP_SUB_S_IMM_VAL),		// OP_SUB_S_IMM_VAL
+/* 0010 0101 1011 */ TABDECL(OP_SUB_S_IMM_VAL),		// OP_SUB_S_IMM_VAL
+/* 0010 0101 1100 */ TABDECL(OP_SUB_S_IMM_VAL),		// OP_SUB_S_IMM_VAL
+/* 0010 0101 1101 */ TABDECL(OP_SUB_S_IMM_VAL),		// OP_SUB_S_IMM_VAL
+/* 0010 0101 1110 */ TABDECL(OP_SUB_S_IMM_VAL),		// OP_SUB_S_IMM_VAL
+/* 0010 0101 1111 */ TABDECL(OP_SUB_S_IMM_VAL),		// OP_SUB_S_IMM_VAL
+
+/* 0010 0110 0000 */ TABDECL(OP_RSB_IMM_VAL),		// OP_RSB_IMM_VAL
+/* 0010 0110 0001 */ TABDECL(OP_RSB_IMM_VAL),		// OP_RSB_IMM_VAL
+/* 0010 0110 0010 */ TABDECL(OP_RSB_IMM_VAL),		// OP_RSB_IMM_VAL
+/* 0010 0110 0011 */ TABDECL(OP_RSB_IMM_VAL),		// OP_RSB_IMM_VAL
+/* 0010 0110 0100 */ TABDECL(OP_RSB_IMM_VAL),		// OP_RSB_IMM_VAL
+/* 0010 0110 0101 */ TABDECL(OP_RSB_IMM_VAL),		// OP_RSB_IMM_VAL
+/* 0010 0110 0110 */ TABDECL(OP_RSB_IMM_VAL),		// OP_RSB_IMM_VAL
+/* 0010 0110 0111 */ TABDECL(OP_RSB_IMM_VAL),		// OP_RSB_IMM_VAL
+/* 0010 0110 1000 */ TABDECL(OP_RSB_IMM_VAL),		// OP_RSB_IMM_VAL
+/* 0010 0110 1001 */ TABDECL(OP_RSB_IMM_VAL),		// OP_RSB_IMM_VAL
+/* 0010 0110 1010 */ TABDECL(OP_RSB_IMM_VAL),		// OP_RSB_IMM_VAL
+/* 0010 0110 1011 */ TABDECL(OP_RSB_IMM_VAL),		// OP_RSB_IMM_VAL
+/* 0010 0110 1100 */ TABDECL(OP_RSB_IMM_VAL),		// OP_RSB_IMM_VAL
+/* 0010 0110 1101 */ TABDECL(OP_RSB_IMM_VAL),		// OP_RSB_IMM_VAL
+/* 0010 0110 1110 */ TABDECL(OP_RSB_IMM_VAL),		// OP_RSB_IMM_VAL
+/* 0010 0110 1111 */ TABDECL(OP_RSB_IMM_VAL),		// OP_RSB_IMM_VAL
+
+/* 0010 0111 0000 */ TABDECL(OP_RSB_S_IMM_VAL),		// OP_RSB_S_IMM_VAL
+/* 0010 0111 0001 */ TABDECL(OP_RSB_S_IMM_VAL),		// OP_RSB_S_IMM_VAL
+/* 0010 0111 0010 */ TABDECL(OP_RSB_S_IMM_VAL),		// OP_RSB_S_IMM_VAL
+/* 0010 0111 0011 */ TABDECL(OP_RSB_S_IMM_VAL),		// OP_RSB_S_IMM_VAL
+/* 0010 0111 0100 */ TABDECL(OP_RSB_S_IMM_VAL),		// OP_RSB_S_IMM_VAL
+/* 0010 0111 0101 */ TABDECL(OP_RSB_S_IMM_VAL),		// OP_RSB_S_IMM_VAL
+/* 0010 0111 0110 */ TABDECL(OP_RSB_S_IMM_VAL),		// OP_RSB_S_IMM_VAL
+/* 0010 0111 0111 */ TABDECL(OP_RSB_S_IMM_VAL),		// OP_RSB_S_IMM_VAL
+/* 0010 0111 1000 */ TABDECL(OP_RSB_S_IMM_VAL),		// OP_RSB_S_IMM_VAL
+/* 0010 0111 1001 */ TABDECL(OP_RSB_S_IMM_VAL),		// OP_RSB_S_IMM_VAL
+/* 0010 0111 1010 */ TABDECL(OP_RSB_S_IMM_VAL),		// OP_RSB_S_IMM_VAL
+/* 0010 0111 1011 */ TABDECL(OP_RSB_S_IMM_VAL),		// OP_RSB_S_IMM_VAL
+/* 0010 0111 1100 */ TABDECL(OP_RSB_S_IMM_VAL),		// OP_RSB_S_IMM_VAL
+/* 0010 0111 1101 */ TABDECL(OP_RSB_S_IMM_VAL),		// OP_RSB_S_IMM_VAL
+/* 0010 0111 1110 */ TABDECL(OP_RSB_S_IMM_VAL),		// OP_RSB_S_IMM_VAL
+/* 0010 0111 1111 */ TABDECL(OP_RSB_S_IMM_VAL),		// OP_RSB_S_IMM_VAL
+
+/* 0010 1000 0000 */ TABDECL(OP_ADD_IMM_VAL),		// OP_ADD_IMM_VAL
+/* 0010 1000 0001 */ TABDECL(OP_ADD_IMM_VAL),		// OP_ADD_IMM_VAL
+/* 0010 1000 0010 */ TABDECL(OP_ADD_IMM_VAL),		// OP_ADD_IMM_VAL
+/* 0010 1000 0011 */ TABDECL(OP_ADD_IMM_VAL),		// OP_ADD_IMM_VAL
+/* 0010 1000 0100 */ TABDECL(OP_ADD_IMM_VAL),		// OP_ADD_IMM_VAL
+/* 0010 1000 0101 */ TABDECL(OP_ADD_IMM_VAL),		// OP_ADD_IMM_VAL
+/* 0010 1000 0110 */ TABDECL(OP_ADD_IMM_VAL),		// OP_ADD_IMM_VAL
+/* 0010 1000 0111 */ TABDECL(OP_ADD_IMM_VAL),		// OP_ADD_IMM_VAL
+/* 0010 1000 1000 */ TABDECL(OP_ADD_IMM_VAL),		// OP_ADD_IMM_VAL
+/* 0010 1000 1001 */ TABDECL(OP_ADD_IMM_VAL),		// OP_ADD_IMM_VAL
+/* 0010 1000 1010 */ TABDECL(OP_ADD_IMM_VAL),		// OP_ADD_IMM_VAL
+/* 0010 1000 1011 */ TABDECL(OP_ADD_IMM_VAL),		// OP_ADD_IMM_VAL
+/* 0010 1000 1100 */ TABDECL(OP_ADD_IMM_VAL),		// OP_ADD_IMM_VAL
+/* 0010 1000 1101 */ TABDECL(OP_ADD_IMM_VAL),		// OP_ADD_IMM_VAL
+/* 0010 1000 1110 */ TABDECL(OP_ADD_IMM_VAL),		// OP_ADD_IMM_VAL
+/* 0010 1000 1111 */ TABDECL(OP_ADD_IMM_VAL),		// OP_ADD_IMM_VAL
+
+/* 0010 1001 0000 */ TABDECL(OP_ADD_S_IMM_VAL),		// OP_ADD_S_IMM_VAL
+/* 0010 1001 0001 */ TABDECL(OP_ADD_S_IMM_VAL),		// OP_ADD_S_IMM_VAL
+/* 0010 1001 0010 */ TABDECL(OP_ADD_S_IMM_VAL),		// OP_ADD_S_IMM_VAL
+/* 0010 1001 0011 */ TABDECL(OP_ADD_S_IMM_VAL),		// OP_ADD_S_IMM_VAL
+/* 0010 1001 0100 */ TABDECL(OP_ADD_S_IMM_VAL),		// OP_ADD_S_IMM_VAL
+/* 0010 1001 0101 */ TABDECL(OP_ADD_S_IMM_VAL),		// OP_ADD_S_IMM_VAL
+/* 0010 1001 0110 */ TABDECL(OP_ADD_S_IMM_VAL),		// OP_ADD_S_IMM_VAL
+/* 0010 1001 0111 */ TABDECL(OP_ADD_S_IMM_VAL),		// OP_ADD_S_IMM_VAL
+/* 0010 1001 1000 */ TABDECL(OP_ADD_S_IMM_VAL),		// OP_ADD_S_IMM_VAL
+/* 0010 1001 1001 */ TABDECL(OP_ADD_S_IMM_VAL),		// OP_ADD_S_IMM_VAL
+/* 0010 1001 1010 */ TABDECL(OP_ADD_S_IMM_VAL),		// OP_ADD_S_IMM_VAL
+/* 0010 1001 1011 */ TABDECL(OP_ADD_S_IMM_VAL),		// OP_ADD_S_IMM_VAL
+/* 0010 1001 1100 */ TABDECL(OP_ADD_S_IMM_VAL),		// OP_ADD_S_IMM_VAL
+/* 0010 1001 1101 */ TABDECL(OP_ADD_S_IMM_VAL),		// OP_ADD_S_IMM_VAL
+/* 0010 1001 1110 */ TABDECL(OP_ADD_S_IMM_VAL),		// OP_ADD_S_IMM_VAL
+/* 0010 1001 1111 */ TABDECL(OP_ADD_S_IMM_VAL),		// OP_ADD_S_IMM_VAL
+
+/* 0010 1010 0000 */ TABDECL(OP_ADC_IMM_VAL),		// OP_ADC_IMM_VAL
+/* 0010 1010 0001 */ TABDECL(OP_ADC_IMM_VAL),		// OP_ADC_IMM_VAL
+/* 0010 1010 0010 */ TABDECL(OP_ADC_IMM_VAL),		// OP_ADC_IMM_VAL
+/* 0010 1010 0011 */ TABDECL(OP_ADC_IMM_VAL),		// OP_ADC_IMM_VAL
+/* 0010 1010 0100 */ TABDECL(OP_ADC_IMM_VAL),		// OP_ADC_IMM_VAL
+/* 0010 1010 0101 */ TABDECL(OP_ADC_IMM_VAL),		// OP_ADC_IMM_VAL
+/* 0010 1010 0110 */ TABDECL(OP_ADC_IMM_VAL),		// OP_ADC_IMM_VAL
+/* 0010 1010 0111 */ TABDECL(OP_ADC_IMM_VAL),		// OP_ADC_IMM_VAL
+/* 0010 1010 1000 */ TABDECL(OP_ADC_IMM_VAL),		// OP_ADC_IMM_VAL
+/* 0010 1010 1001 */ TABDECL(OP_ADC_IMM_VAL),		// OP_ADC_IMM_VAL
+/* 0010 1010 1010 */ TABDECL(OP_ADC_IMM_VAL),		// OP_ADC_IMM_VAL
+/* 0010 1010 1011 */ TABDECL(OP_ADC_IMM_VAL),		// OP_ADC_IMM_VAL
+/* 0010 1010 1100 */ TABDECL(OP_ADC_IMM_VAL),		// OP_ADC_IMM_VAL
+/* 0010 1010 1101 */ TABDECL(OP_ADC_IMM_VAL),		// OP_ADC_IMM_VAL
+/* 0010 1010 1110 */ TABDECL(OP_ADC_IMM_VAL),		// OP_ADC_IMM_VAL
+/* 0010 1010 1111 */ TABDECL(OP_ADC_IMM_VAL),		// OP_ADC_IMM_VAL
+
+/* 0010 1011 0000 */ TABDECL(OP_ADC_S_IMM_VAL),		// OP_ADC_S_IMM_VAL
+/* 0010 1011 0001 */ TABDECL(OP_ADC_S_IMM_VAL),		// OP_ADC_S_IMM_VAL
+/* 0010 1011 0010 */ TABDECL(OP_ADC_S_IMM_VAL),		// OP_ADC_S_IMM_VAL
+/* 0010 1011 0011 */ TABDECL(OP_ADC_S_IMM_VAL),		// OP_ADC_S_IMM_VAL
+/* 0010 1011 0100 */ TABDECL(OP_ADC_S_IMM_VAL),		// OP_ADC_S_IMM_VAL
+/* 0010 1011 0101 */ TABDECL(OP_ADC_S_IMM_VAL),		// OP_ADC_S_IMM_VAL
+/* 0010 1011 0110 */ TABDECL(OP_ADC_S_IMM_VAL),		// OP_ADC_S_IMM_VAL
+/* 0010 1011 0111 */ TABDECL(OP_ADC_S_IMM_VAL),		// OP_ADC_S_IMM_VAL
+/* 0010 1011 1000 */ TABDECL(OP_ADC_S_IMM_VAL),		// OP_ADC_S_IMM_VAL
+/* 0010 1011 1001 */ TABDECL(OP_ADC_S_IMM_VAL),		// OP_ADC_S_IMM_VAL
+/* 0010 1011 1010 */ TABDECL(OP_ADC_S_IMM_VAL),		// OP_ADC_S_IMM_VAL
+/* 0010 1011 1011 */ TABDECL(OP_ADC_S_IMM_VAL),		// OP_ADC_S_IMM_VAL
+/* 0010 1011 1100 */ TABDECL(OP_ADC_S_IMM_VAL),		// OP_ADC_S_IMM_VAL
+/* 0010 1011 1101 */ TABDECL(OP_ADC_S_IMM_VAL),		// OP_ADC_S_IMM_VAL
+/* 0010 1011 1110 */ TABDECL(OP_ADC_S_IMM_VAL),		// OP_ADC_S_IMM_VAL
+/* 0010 1011 1111 */ TABDECL(OP_ADC_S_IMM_VAL),		// OP_ADC_S_IMM_VAL
+
+/* 0010 1100 0000 */ TABDECL(OP_SBC_IMM_VAL),		// OP_SBC_IMM_VAL
+/* 0010 1100 0001 */ TABDECL(OP_SBC_IMM_VAL),		// OP_SBC_IMM_VAL
+/* 0010 1100 0010 */ TABDECL(OP_SBC_IMM_VAL),		// OP_SBC_IMM_VAL
+/* 0010 1100 0011 */ TABDECL(OP_SBC_IMM_VAL),		// OP_SBC_IMM_VAL
+/* 0010 1100 0100 */ TABDECL(OP_SBC_IMM_VAL),		// OP_SBC_IMM_VAL
+/* 0010 1100 0101 */ TABDECL(OP_SBC_IMM_VAL),		// OP_SBC_IMM_VAL
+/* 0010 1100 0110 */ TABDECL(OP_SBC_IMM_VAL),		// OP_SBC_IMM_VAL
+/* 0010 1100 0111 */ TABDECL(OP_SBC_IMM_VAL),		// OP_SBC_IMM_VAL
+/* 0010 1100 1000 */ TABDECL(OP_SBC_IMM_VAL),		// OP_SBC_IMM_VAL
+/* 0010 1100 1001 */ TABDECL(OP_SBC_IMM_VAL),		// OP_SBC_IMM_VAL
+/* 0010 1100 1010 */ TABDECL(OP_SBC_IMM_VAL),		// OP_SBC_IMM_VAL
+/* 0010 1100 1011 */ TABDECL(OP_SBC_IMM_VAL),		// OP_SBC_IMM_VAL
+/* 0010 1100 1100 */ TABDECL(OP_SBC_IMM_VAL),		// OP_SBC_IMM_VAL
+/* 0010 1100 1101 */ TABDECL(OP_SBC_IMM_VAL),		// OP_SBC_IMM_VAL
+/* 0010 1100 1110 */ TABDECL(OP_SBC_IMM_VAL),		// OP_SBC_IMM_VAL
+/* 0010 1100 1111 */ TABDECL(OP_SBC_IMM_VAL),		// OP_SBC_IMM_VAL
+
+/* 0010 1101 0000 */ TABDECL(OP_SBC_S_IMM_VAL),		// OP_SBC_S_IMM_VAL
+/* 0010 1101 0001 */ TABDECL(OP_SBC_S_IMM_VAL),		// OP_SBC_S_IMM_VAL
+/* 0010 1101 0010 */ TABDECL(OP_SBC_S_IMM_VAL),		// OP_SBC_S_IMM_VAL
+/* 0010 1101 0011 */ TABDECL(OP_SBC_S_IMM_VAL),		// OP_SBC_S_IMM_VAL
+/* 0010 1101 0100 */ TABDECL(OP_SBC_S_IMM_VAL),		// OP_SBC_S_IMM_VAL
+/* 0010 1101 0101 */ TABDECL(OP_SBC_S_IMM_VAL),		// OP_SBC_S_IMM_VAL
+/* 0010 1101 0110 */ TABDECL(OP_SBC_S_IMM_VAL),		// OP_SBC_S_IMM_VAL
+/* 0010 1101 0111 */ TABDECL(OP_SBC_S_IMM_VAL),		// OP_SBC_S_IMM_VAL
+/* 0010 1101 1000 */ TABDECL(OP_SBC_S_IMM_VAL),		// OP_SBC_S_IMM_VAL
+/* 0010 1101 1001 */ TABDECL(OP_SBC_S_IMM_VAL),		// OP_SBC_S_IMM_VAL
+/* 0010 1101 1010 */ TABDECL(OP_SBC_S_IMM_VAL),		// OP_SBC_S_IMM_VAL
+/* 0010 1101 1011 */ TABDECL(OP_SBC_S_IMM_VAL),		// OP_SBC_S_IMM_VAL
+/* 0010 1101 1100 */ TABDECL(OP_SBC_S_IMM_VAL),		// OP_SBC_S_IMM_VAL
+/* 0010 1101 1101 */ TABDECL(OP_SBC_S_IMM_VAL),		// OP_SBC_S_IMM_VAL
+/* 0010 1101 1110 */ TABDECL(OP_SBC_S_IMM_VAL),		// OP_SBC_S_IMM_VAL
+/* 0010 1101 1111 */ TABDECL(OP_SBC_S_IMM_VAL),		// OP_SBC_S_IMM_VAL
+
+/* 0010 1110 0000 */ TABDECL(OP_RSC_IMM_VAL),		// OP_RSC_IMM_VAL
+/* 0010 1110 0001 */ TABDECL(OP_RSC_IMM_VAL),		// OP_RSC_IMM_VAL
+/* 0010 1110 0010 */ TABDECL(OP_RSC_IMM_VAL),		// OP_RSC_IMM_VAL
+/* 0010 1110 0011 */ TABDECL(OP_RSC_IMM_VAL),		// OP_RSC_IMM_VAL
+/* 0010 1110 0100 */ TABDECL(OP_RSC_IMM_VAL),		// OP_RSC_IMM_VAL
+/* 0010 1110 0101 */ TABDECL(OP_RSC_IMM_VAL),		// OP_RSC_IMM_VAL
+/* 0010 1110 0110 */ TABDECL(OP_RSC_IMM_VAL),		// OP_RSC_IMM_VAL
+/* 0010 1110 0111 */ TABDECL(OP_RSC_IMM_VAL),		// OP_RSC_IMM_VAL
+/* 0010 1110 1000 */ TABDECL(OP_RSC_IMM_VAL),		// OP_RSC_IMM_VAL
+/* 0010 1110 1001 */ TABDECL(OP_RSC_IMM_VAL),		// OP_RSC_IMM_VAL
+/* 0010 1110 1010 */ TABDECL(OP_RSC_IMM_VAL),		// OP_RSC_IMM_VAL
+/* 0010 1110 1011 */ TABDECL(OP_RSC_IMM_VAL),		// OP_RSC_IMM_VAL
+/* 0010 1110 1100 */ TABDECL(OP_RSC_IMM_VAL),		// OP_RSC_IMM_VAL
+/* 0010 1110 1101 */ TABDECL(OP_RSC_IMM_VAL),		// OP_RSC_IMM_VAL
+/* 0010 1110 1110 */ TABDECL(OP_RSC_IMM_VAL),		// OP_RSC_IMM_VAL
+/* 0010 1110 1111 */ TABDECL(OP_RSC_IMM_VAL),		// OP_RSC_IMM_VAL
+
+/* 0010 1111 0000 */ TABDECL(OP_RSC_S_IMM_VAL),		// OP_RSC_S_IMM_VAL
+/* 0010 1111 0001 */ TABDECL(OP_RSC_S_IMM_VAL),		// OP_RSC_S_IMM_VAL
+/* 0010 1111 0010 */ TABDECL(OP_RSC_S_IMM_VAL),		// OP_RSC_S_IMM_VAL
+/* 0010 1111 0011 */ TABDECL(OP_RSC_S_IMM_VAL),		// OP_RSC_S_IMM_VAL
+/* 0010 1111 0100 */ TABDECL(OP_RSC_S_IMM_VAL),		// OP_RSC_S_IMM_VAL
+/* 0010 1111 0101 */ TABDECL(OP_RSC_S_IMM_VAL),		// OP_RSC_S_IMM_VAL
+/* 0010 1111 0110 */ TABDECL(OP_RSC_S_IMM_VAL),		// OP_RSC_S_IMM_VAL
+/* 0010 1111 0111 */ TABDECL(OP_RSC_S_IMM_VAL),		// OP_RSC_S_IMM_VAL
+/* 0010 1111 1000 */ TABDECL(OP_RSC_S_IMM_VAL),		// OP_RSC_S_IMM_VAL
+/* 0010 1111 1001 */ TABDECL(OP_RSC_S_IMM_VAL),		// OP_RSC_S_IMM_VAL
+/* 0010 1111 1010 */ TABDECL(OP_RSC_S_IMM_VAL),		// OP_RSC_S_IMM_VAL
+/* 0010 1111 1011 */ TABDECL(OP_RSC_S_IMM_VAL),		// OP_RSC_S_IMM_VAL
+/* 0010 1111 1100 */ TABDECL(OP_RSC_S_IMM_VAL),		// OP_RSC_S_IMM_VAL
+/* 0010 1111 1101 */ TABDECL(OP_RSC_S_IMM_VAL),		// OP_RSC_S_IMM_VAL
+/* 0010 1111 1110 */ TABDECL(OP_RSC_S_IMM_VAL),		// OP_RSC_S_IMM_VAL
+/* 0010 1111 1111 */ TABDECL(OP_RSC_S_IMM_VAL),		// OP_RSC_S_IMM_VAL
+
+/* 0011 0000 0000 */ TABDECL(OP_UND),
+/* 0011 0000 0001 */ TABDECL(OP_UND),
+/* 0011 0000 0010 */ TABDECL(OP_UND),
+/* 0011 0000 0011 */ TABDECL(OP_UND),
+/* 0011 0000 0100 */ TABDECL(OP_UND),
+/* 0011 0000 0101 */ TABDECL(OP_UND),
+/* 0011 0000 0110 */ TABDECL(OP_UND),
+/* 0011 0000 0111 */ TABDECL(OP_UND),
+/* 0011 0000 1000 */ TABDECL(OP_UND),
+/* 0011 0000 1001 */ TABDECL(OP_UND),
+/* 0011 0000 1010 */ TABDECL(OP_UND),
+/* 0011 0000 1011 */ TABDECL(OP_UND),
+/* 0011 0000 1100 */ TABDECL(OP_UND),
+/* 0011 0000 1101 */ TABDECL(OP_UND),
+/* 0011 0000 1110 */ TABDECL(OP_UND),
+/* 0011 0000 1111 */ TABDECL(OP_UND),
+
+/* 0011 0001 0000 */ TABDECL(OP_TST_IMM_VAL),		// OP_TST_IMM_VAL
+/* 0011 0001 0001 */ TABDECL(OP_TST_IMM_VAL),		// OP_TST_IMM_VAL
+/* 0011 0001 0010 */ TABDECL(OP_TST_IMM_VAL),		// OP_TST_IMM_VAL
+/* 0011 0001 0011 */ TABDECL(OP_TST_IMM_VAL),		// OP_TST_IMM_VAL
+/* 0011 0001 0100 */ TABDECL(OP_TST_IMM_VAL),		// OP_TST_IMM_VAL
+/* 0011 0001 0101 */ TABDECL(OP_TST_IMM_VAL),		// OP_TST_IMM_VAL
+/* 0011 0001 0110 */ TABDECL(OP_TST_IMM_VAL),		// OP_TST_IMM_VAL
+/* 0011 0001 0111 */ TABDECL(OP_TST_IMM_VAL),		// OP_TST_IMM_VAL
+/* 0011 0001 1000 */ TABDECL(OP_TST_IMM_VAL),		// OP_TST_IMM_VAL
+/* 0011 0001 1001 */ TABDECL(OP_TST_IMM_VAL),		// OP_TST_IMM_VAL
+/* 0011 0001 1010 */ TABDECL(OP_TST_IMM_VAL),		// OP_TST_IMM_VAL
+/* 0011 0001 1011 */ TABDECL(OP_TST_IMM_VAL),		// OP_TST_IMM_VAL
+/* 0011 0001 1100 */ TABDECL(OP_TST_IMM_VAL),		// OP_TST_IMM_VAL
+/* 0011 0001 1101 */ TABDECL(OP_TST_IMM_VAL),		// OP_TST_IMM_VAL
+/* 0011 0001 1110 */ TABDECL(OP_TST_IMM_VAL),		// OP_TST_IMM_VAL
+/* 0011 0001 1111 */ TABDECL(OP_TST_IMM_VAL),		// OP_TST_IMM_VAL
+
+/* 0011 0010 0000 */ TABDECL(OP_MSR_CPSR_IMM_VAL),		// OP_MSR_CPSR_IMM_VAL
+/* 0011 0010 0001 */ TABDECL(OP_MSR_CPSR_IMM_VAL),		// OP_MSR_CPSR_IMM_VAL
+/* 0011 0010 0010 */ TABDECL(OP_MSR_CPSR_IMM_VAL),		// OP_MSR_CPSR_IMM_VAL
+/* 0011 0010 0011 */ TABDECL(OP_MSR_CPSR_IMM_VAL),		// OP_MSR_CPSR_IMM_VAL
+/* 0011 0010 0100 */ TABDECL(OP_MSR_CPSR_IMM_VAL),		// OP_MSR_CPSR_IMM_VAL
+/* 0011 0010 0101 */ TABDECL(OP_MSR_CPSR_IMM_VAL),		// OP_MSR_CPSR_IMM_VAL
+/* 0011 0010 0110 */ TABDECL(OP_MSR_CPSR_IMM_VAL),		// OP_MSR_CPSR_IMM_VAL
+/* 0011 0010 0111 */ TABDECL(OP_MSR_CPSR_IMM_VAL),		// OP_MSR_CPSR_IMM_VAL
+/* 0011 0010 1000 */ TABDECL(OP_MSR_CPSR_IMM_VAL),		// OP_MSR_CPSR_IMM_VAL
+/* 0011 0010 1001 */ TABDECL(OP_MSR_CPSR_IMM_VAL),		// OP_MSR_CPSR_IMM_VAL
+/* 0011 0010 1010 */ TABDECL(OP_MSR_CPSR_IMM_VAL),		// OP_MSR_CPSR_IMM_VAL
+/* 0011 0010 1011 */ TABDECL(OP_MSR_CPSR_IMM_VAL),		// OP_MSR_CPSR_IMM_VAL
+/* 0011 0010 1100 */ TABDECL(OP_MSR_CPSR_IMM_VAL),		// OP_MSR_CPSR_IMM_VAL
+/* 0011 0010 1101 */ TABDECL(OP_MSR_CPSR_IMM_VAL),		// OP_MSR_CPSR_IMM_VAL
+/* 0011 0010 1110 */ TABDECL(OP_MSR_CPSR_IMM_VAL),		// OP_MSR_CPSR_IMM_VAL
+/* 0011 0010 1111 */ TABDECL(OP_MSR_CPSR_IMM_VAL),		// OP_MSR_CPSR_IMM_VAL
+
+/* 0011 0011 0000 */ TABDECL(OP_TEQ_IMM_VAL),		// OP_TEQ_IMM_VAL
+/* 0011 0011 0001 */ TABDECL(OP_TEQ_IMM_VAL),		// OP_TEQ_IMM_VAL
+/* 0011 0011 0010 */ TABDECL(OP_TEQ_IMM_VAL),		// OP_TEQ_IMM_VAL
+/* 0011 0011 0011 */ TABDECL(OP_TEQ_IMM_VAL),		// OP_TEQ_IMM_VAL
+/* 0011 0011 0100 */ TABDECL(OP_TEQ_IMM_VAL),		// OP_TEQ_IMM_VAL
+/* 0011 0011 0101 */ TABDECL(OP_TEQ_IMM_VAL),		// OP_TEQ_IMM_VAL
+/* 0011 0011 0110 */ TABDECL(OP_TEQ_IMM_VAL),		// OP_TEQ_IMM_VAL
+/* 0011 0011 0111 */ TABDECL(OP_TEQ_IMM_VAL),		// OP_TEQ_IMM_VAL
+/* 0011 0011 1000 */ TABDECL(OP_TEQ_IMM_VAL),		// OP_TEQ_IMM_VAL
+/* 0011 0011 1001 */ TABDECL(OP_TEQ_IMM_VAL),		// OP_TEQ_IMM_VAL
+/* 0011 0011 1010 */ TABDECL(OP_TEQ_IMM_VAL),		// OP_TEQ_IMM_VAL
+/* 0011 0011 1011 */ TABDECL(OP_TEQ_IMM_VAL),		// OP_TEQ_IMM_VAL
+/* 0011 0011 1100 */ TABDECL(OP_TEQ_IMM_VAL),		// OP_TEQ_IMM_VAL
+/* 0011 0011 1101 */ TABDECL(OP_TEQ_IMM_VAL),		// OP_TEQ_IMM_VAL
+/* 0011 0011 1110 */ TABDECL(OP_TEQ_IMM_VAL),		// OP_TEQ_IMM_VAL
+/* 0011 0011 1111 */ TABDECL(OP_TEQ_IMM_VAL),		// OP_TEQ_IMM_VAL
+
+/* 0011 0100 0000 */ TABDECL(OP_UND),
+/* 0011 0100 0001 */ TABDECL(OP_UND),
+/* 0011 0100 0010 */ TABDECL(OP_UND),
+/* 0011 0100 0011 */ TABDECL(OP_UND),
+/* 0011 0100 0100 */ TABDECL(OP_UND),
+/* 0011 0100 0101 */ TABDECL(OP_UND),
+/* 0011 0100 0110 */ TABDECL(OP_UND),
+/* 0011 0100 0111 */ TABDECL(OP_UND),
+/* 0011 0100 1000 */ TABDECL(OP_UND),
+/* 0011 0100 1001 */ TABDECL(OP_UND),
+/* 0011 0100 1010 */ TABDECL(OP_UND),
+/* 0011 0100 1011 */ TABDECL(OP_UND),
+/* 0011 0100 1100 */ TABDECL(OP_UND),
+/* 0011 0100 1101 */ TABDECL(OP_UND),
+/* 0011 0100 1110 */ TABDECL(OP_UND),
+/* 0011 0100 1111 */ TABDECL(OP_UND),
+
+/* 0011 0101 0000 */ TABDECL(OP_CMP_IMM_VAL),		// OP_CMP_IMM_VAL
+/* 0011 0101 0001 */ TABDECL(OP_CMP_IMM_VAL),		// OP_CMP_IMM_VAL
+/* 0011 0101 0010 */ TABDECL(OP_CMP_IMM_VAL),		// OP_CMP_IMM_VAL
+/* 0011 0101 0011 */ TABDECL(OP_CMP_IMM_VAL),		// OP_CMP_IMM_VAL
+/* 0011 0101 0100 */ TABDECL(OP_CMP_IMM_VAL),		// OP_CMP_IMM_VAL
+/* 0011 0101 0101 */ TABDECL(OP_CMP_IMM_VAL),		// OP_CMP_IMM_VAL
+/* 0011 0101 0110 */ TABDECL(OP_CMP_IMM_VAL),		// OP_CMP_IMM_VAL
+/* 0011 0101 0111 */ TABDECL(OP_CMP_IMM_VAL),		// OP_CMP_IMM_VAL
+/* 0011 0101 1000 */ TABDECL(OP_CMP_IMM_VAL),		// OP_CMP_IMM_VAL
+/* 0011 0101 1001 */ TABDECL(OP_CMP_IMM_VAL),		// OP_CMP_IMM_VAL
+/* 0011 0101 1010 */ TABDECL(OP_CMP_IMM_VAL),		// OP_CMP_IMM_VAL
+/* 0011 0101 1011 */ TABDECL(OP_CMP_IMM_VAL),		// OP_CMP_IMM_VAL
+/* 0011 0101 1100 */ TABDECL(OP_CMP_IMM_VAL),		// OP_CMP_IMM_VAL
+/* 0011 0101 1101 */ TABDECL(OP_CMP_IMM_VAL),		// OP_CMP_IMM_VAL
+/* 0011 0101 1110 */ TABDECL(OP_CMP_IMM_VAL),		// OP_CMP_IMM_VAL
+/* 0011 0101 1111 */ TABDECL(OP_CMP_IMM_VAL),		// OP_CMP_IMM_VAL
+
+/* 0011 0110 0000 */ TABDECL(OP_MSR_SPSR_IMM_VAL),		// OP_MSR_SPSR_IMM_VAL
+/* 0011 0110 0001 */ TABDECL(OP_MSR_SPSR_IMM_VAL),		// OP_MSR_SPSR_IMM_VAL
+/* 0011 0110 0010 */ TABDECL(OP_MSR_SPSR_IMM_VAL),		// OP_MSR_SPSR_IMM_VAL
+/* 0011 0110 0011 */ TABDECL(OP_MSR_SPSR_IMM_VAL),		// OP_MSR_SPSR_IMM_VAL
+/* 0011 0110 0100 */ TABDECL(OP_MSR_SPSR_IMM_VAL),		// OP_MSR_SPSR_IMM_VAL
+/* 0011 0110 0101 */ TABDECL(OP_MSR_SPSR_IMM_VAL),		// OP_MSR_SPSR_IMM_VAL
+/* 0011 0110 0110 */ TABDECL(OP_MSR_SPSR_IMM_VAL),		// OP_MSR_SPSR_IMM_VAL
+/* 0011 0110 0111 */ TABDECL(OP_MSR_SPSR_IMM_VAL),		// OP_MSR_SPSR_IMM_VAL
+/* 0011 0110 1000 */ TABDECL(OP_MSR_SPSR_IMM_VAL),		// OP_MSR_SPSR_IMM_VAL
+/* 0011 0110 1001 */ TABDECL(OP_MSR_SPSR_IMM_VAL),		// OP_MSR_SPSR_IMM_VAL
+/* 0011 0110 1010 */ TABDECL(OP_MSR_SPSR_IMM_VAL),		// OP_MSR_SPSR_IMM_VAL
+/* 0011 0110 1011 */ TABDECL(OP_MSR_SPSR_IMM_VAL),		// OP_MSR_SPSR_IMM_VAL
+/* 0011 0110 1100 */ TABDECL(OP_MSR_SPSR_IMM_VAL),		// OP_MSR_SPSR_IMM_VAL
+/* 0011 0110 1101 */ TABDECL(OP_MSR_SPSR_IMM_VAL),		// OP_MSR_SPSR_IMM_VAL
+/* 0011 0110 1110 */ TABDECL(OP_MSR_SPSR_IMM_VAL),		// OP_MSR_SPSR_IMM_VAL
+/* 0011 0110 1111 */ TABDECL(OP_MSR_SPSR_IMM_VAL),		// OP_MSR_SPSR_IMM_VAL
+
+/* 0011 0111 0000 */ TABDECL(OP_CMN_IMM_VAL),		// OP_CMN_IMM_VAL
+/* 0011 0111 0001 */ TABDECL(OP_CMN_IMM_VAL),		// OP_CMN_IMM_VAL
+/* 0011 0111 0010 */ TABDECL(OP_CMN_IMM_VAL),		// OP_CMN_IMM_VAL
+/* 0011 0111 0011 */ TABDECL(OP_CMN_IMM_VAL),		// OP_CMN_IMM_VAL
+/* 0011 0111 0100 */ TABDECL(OP_CMN_IMM_VAL),		// OP_CMN_IMM_VAL
+/* 0011 0111 0101 */ TABDECL(OP_CMN_IMM_VAL),		// OP_CMN_IMM_VAL
+/* 0011 0111 0110 */ TABDECL(OP_CMN_IMM_VAL),		// OP_CMN_IMM_VAL
+/* 0011 0111 0111 */ TABDECL(OP_CMN_IMM_VAL),		// OP_CMN_IMM_VAL
+/* 0011 0111 1000 */ TABDECL(OP_CMN_IMM_VAL),		// OP_CMN_IMM_VAL
+/* 0011 0111 1001 */ TABDECL(OP_CMN_IMM_VAL),		// OP_CMN_IMM_VAL
+/* 0011 0111 1010 */ TABDECL(OP_CMN_IMM_VAL),		// OP_CMN_IMM_VAL
+/* 0011 0111 1011 */ TABDECL(OP_CMN_IMM_VAL),		// OP_CMN_IMM_VAL
+/* 0011 0111 1100 */ TABDECL(OP_CMN_IMM_VAL),		// OP_CMN_IMM_VAL
+/* 0011 0111 1101 */ TABDECL(OP_CMN_IMM_VAL),		// OP_CMN_IMM_VAL
+/* 0011 0111 1110 */ TABDECL(OP_CMN_IMM_VAL),		// OP_CMN_IMM_VAL
+/* 0011 0111 1111 */ TABDECL(OP_CMN_IMM_VAL),		// OP_CMN_IMM_VAL
+
+/* 0011 1000 0000 */ TABDECL(OP_ORR_IMM_VAL),		// OP_ORR_IMM_VAL
+/* 0011 1000 0001 */ TABDECL(OP_ORR_IMM_VAL),		// OP_ORR_IMM_VAL
+/* 0011 1000 0010 */ TABDECL(OP_ORR_IMM_VAL),		// OP_ORR_IMM_VAL
+/* 0011 1000 0011 */ TABDECL(OP_ORR_IMM_VAL),		// OP_ORR_IMM_VAL
+/* 0011 1000 0100 */ TABDECL(OP_ORR_IMM_VAL),		// OP_ORR_IMM_VAL
+/* 0011 1000 0101 */ TABDECL(OP_ORR_IMM_VAL),		// OP_ORR_IMM_VAL
+/* 0011 1000 0110 */ TABDECL(OP_ORR_IMM_VAL),		// OP_ORR_IMM_VAL
+/* 0011 1000 0111 */ TABDECL(OP_ORR_IMM_VAL),		// OP_ORR_IMM_VAL
+/* 0011 1000 1000 */ TABDECL(OP_ORR_IMM_VAL),		// OP_ORR_IMM_VAL
+/* 0011 1000 1001 */ TABDECL(OP_ORR_IMM_VAL),		// OP_ORR_IMM_VAL
+/* 0011 1000 1010 */ TABDECL(OP_ORR_IMM_VAL),		// OP_ORR_IMM_VAL
+/* 0011 1000 1011 */ TABDECL(OP_ORR_IMM_VAL),		// OP_ORR_IMM_VAL
+/* 0011 1000 1100 */ TABDECL(OP_ORR_IMM_VAL),		// OP_ORR_IMM_VAL
+/* 0011 1000 1101 */ TABDECL(OP_ORR_IMM_VAL),		// OP_ORR_IMM_VAL
+/* 0011 1000 1110 */ TABDECL(OP_ORR_IMM_VAL),		// OP_ORR_IMM_VAL
+/* 0011 1000 1111 */ TABDECL(OP_ORR_IMM_VAL),		// OP_ORR_IMM_VAL
+
+/* 0011 1001 0000 */ TABDECL(OP_ORR_S_IMM_VAL),		// OP_ORR_S_IMM_VAL
+/* 0011 1001 0001 */ TABDECL(OP_ORR_S_IMM_VAL),		// OP_ORR_S_IMM_VAL
+/* 0011 1001 0010 */ TABDECL(OP_ORR_S_IMM_VAL),		// OP_ORR_S_IMM_VAL
+/* 0011 1001 0011 */ TABDECL(OP_ORR_S_IMM_VAL),		// OP_ORR_S_IMM_VAL
+/* 0011 1001 0100 */ TABDECL(OP_ORR_S_IMM_VAL),		// OP_ORR_S_IMM_VAL
+/* 0011 1001 0101 */ TABDECL(OP_ORR_S_IMM_VAL),		// OP_ORR_S_IMM_VAL
+/* 0011 1001 0110 */ TABDECL(OP_ORR_S_IMM_VAL),		// OP_ORR_S_IMM_VAL
+/* 0011 1001 0111 */ TABDECL(OP_ORR_S_IMM_VAL),		// OP_ORR_S_IMM_VAL
+/* 0011 1001 1000 */ TABDECL(OP_ORR_S_IMM_VAL),		// OP_ORR_S_IMM_VAL
+/* 0011 1001 1001 */ TABDECL(OP_ORR_S_IMM_VAL),		// OP_ORR_S_IMM_VAL
+/* 0011 1001 1010 */ TABDECL(OP_ORR_S_IMM_VAL),		// OP_ORR_S_IMM_VAL
+/* 0011 1001 1011 */ TABDECL(OP_ORR_S_IMM_VAL),		// OP_ORR_S_IMM_VAL
+/* 0011 1001 1100 */ TABDECL(OP_ORR_S_IMM_VAL),		// OP_ORR_S_IMM_VAL
+/* 0011 1001 1101 */ TABDECL(OP_ORR_S_IMM_VAL),		// OP_ORR_S_IMM_VAL
+/* 0011 1001 1110 */ TABDECL(OP_ORR_S_IMM_VAL),		// OP_ORR_S_IMM_VAL
+/* 0011 1001 1111 */ TABDECL(OP_ORR_S_IMM_VAL),		// OP_ORR_S_IMM_VAL
+
+/* 0011 1010 0000 */ TABDECL(OP_MOV_IMM_VAL),		// OP_MOV_IMM_VAL
+/* 0011 1010 0001 */ TABDECL(OP_MOV_IMM_VAL),		// OP_MOV_IMM_VAL
+/* 0011 1010 0010 */ TABDECL(OP_MOV_IMM_VAL),		// OP_MOV_IMM_VAL
+/* 0011 1010 0011 */ TABDECL(OP_MOV_IMM_VAL),		// OP_MOV_IMM_VAL
+/* 0011 1010 0100 */ TABDECL(OP_MOV_IMM_VAL),		// OP_MOV_IMM_VAL
+/* 0011 1010 0101 */ TABDECL(OP_MOV_IMM_VAL),		// OP_MOV_IMM_VAL
+/* 0011 1010 0110 */ TABDECL(OP_MOV_IMM_VAL),		// OP_MOV_IMM_VAL
+/* 0011 1010 0111 */ TABDECL(OP_MOV_IMM_VAL),		// OP_MOV_IMM_VAL
+/* 0011 1010 1000 */ TABDECL(OP_MOV_IMM_VAL),		// OP_MOV_IMM_VAL
+/* 0011 1010 1001 */ TABDECL(OP_MOV_IMM_VAL),		// OP_MOV_IMM_VAL
+/* 0011 1010 1010 */ TABDECL(OP_MOV_IMM_VAL),		// OP_MOV_IMM_VAL
+/* 0011 1010 1011 */ TABDECL(OP_MOV_IMM_VAL),		// OP_MOV_IMM_VAL
+/* 0011 1010 1100 */ TABDECL(OP_MOV_IMM_VAL),		// OP_MOV_IMM_VAL
+/* 0011 1010 1101 */ TABDECL(OP_MOV_IMM_VAL),		// OP_MOV_IMM_VAL
+/* 0011 1010 1110 */ TABDECL(OP_MOV_IMM_VAL),		// OP_MOV_IMM_VAL
+/* 0011 1010 1111 */ TABDECL(OP_MOV_IMM_VAL),		// OP_MOV_IMM_VAL
+
+/* 0011 1011 0000 */ TABDECL(OP_MOV_S_IMM_VAL),		// OP_MOV_S_IMM_VAL
+/* 0011 1011 0001 */ TABDECL(OP_MOV_S_IMM_VAL),		// OP_MOV_S_IMM_VAL
+/* 0011 1011 0010 */ TABDECL(OP_MOV_S_IMM_VAL),		// OP_MOV_S_IMM_VAL
+/* 0011 1011 0011 */ TABDECL(OP_MOV_S_IMM_VAL),		// OP_MOV_S_IMM_VAL
+/* 0011 1011 0100 */ TABDECL(OP_MOV_S_IMM_VAL),		// OP_MOV_S_IMM_VAL
+/* 0011 1011 0101 */ TABDECL(OP_MOV_S_IMM_VAL),		// OP_MOV_S_IMM_VAL
+/* 0011 1011 0110 */ TABDECL(OP_MOV_S_IMM_VAL),		// OP_MOV_S_IMM_VAL
+/* 0011 1011 0111 */ TABDECL(OP_MOV_S_IMM_VAL),		// OP_MOV_S_IMM_VAL
+/* 0011 1011 1000 */ TABDECL(OP_MOV_S_IMM_VAL),		// OP_MOV_S_IMM_VAL
+/* 0011 1011 1001 */ TABDECL(OP_MOV_S_IMM_VAL),		// OP_MOV_S_IMM_VAL
+/* 0011 1011 1010 */ TABDECL(OP_MOV_S_IMM_VAL),		// OP_MOV_S_IMM_VAL
+/* 0011 1011 1011 */ TABDECL(OP_MOV_S_IMM_VAL),		// OP_MOV_S_IMM_VAL
+/* 0011 1011 1100 */ TABDECL(OP_MOV_S_IMM_VAL),		// OP_MOV_S_IMM_VAL
+/* 0011 1011 1101 */ TABDECL(OP_MOV_S_IMM_VAL),		// OP_MOV_S_IMM_VAL
+/* 0011 1011 1110 */ TABDECL(OP_MOV_S_IMM_VAL),		// OP_MOV_S_IMM_VAL
+/* 0011 1011 1111 */ TABDECL(OP_MOV_S_IMM_VAL),		// OP_MOV_S_IMM_VAL
+
+/* 0011 1100 0000 */ TABDECL(OP_BIC_IMM_VAL),		// OP_BIC_IMM_VAL
+/* 0011 1100 0001 */ TABDECL(OP_BIC_IMM_VAL),		// OP_BIC_IMM_VAL
+/* 0011 1100 0010 */ TABDECL(OP_BIC_IMM_VAL),		// OP_BIC_IMM_VAL
+/* 0011 1100 0011 */ TABDECL(OP_BIC_IMM_VAL),		// OP_BIC_IMM_VAL
+/* 0011 1100 0100 */ TABDECL(OP_BIC_IMM_VAL),		// OP_BIC_IMM_VAL
+/* 0011 1100 0101 */ TABDECL(OP_BIC_IMM_VAL),		// OP_BIC_IMM_VAL
+/* 0011 1100 0110 */ TABDECL(OP_BIC_IMM_VAL),		// OP_BIC_IMM_VAL
+/* 0011 1100 0111 */ TABDECL(OP_BIC_IMM_VAL),		// OP_BIC_IMM_VAL
+/* 0011 1100 1000 */ TABDECL(OP_BIC_IMM_VAL),		// OP_BIC_IMM_VAL
+/* 0011 1100 1001 */ TABDECL(OP_BIC_IMM_VAL),		// OP_BIC_IMM_VAL
+/* 0011 1100 1010 */ TABDECL(OP_BIC_IMM_VAL),		// OP_BIC_IMM_VAL
+/* 0011 1100 1011 */ TABDECL(OP_BIC_IMM_VAL),		// OP_BIC_IMM_VAL
+/* 0011 1100 1100 */ TABDECL(OP_BIC_IMM_VAL),		// OP_BIC_IMM_VAL
+/* 0011 1100 1101 */ TABDECL(OP_BIC_IMM_VAL),		// OP_BIC_IMM_VAL
+/* 0011 1100 1110 */ TABDECL(OP_BIC_IMM_VAL),		// OP_BIC_IMM_VAL
+/* 0011 1100 1111 */ TABDECL(OP_BIC_IMM_VAL),		// OP_BIC_IMM_VAL
+
+/* 0011 1101 0000 */ TABDECL(OP_BIC_S_IMM_VAL),		// OP_BIC_S_IMM_VAL
+/* 0011 1101 0001 */ TABDECL(OP_BIC_S_IMM_VAL),		// OP_BIC_S_IMM_VAL
+/* 0011 1101 0010 */ TABDECL(OP_BIC_S_IMM_VAL),		// OP_BIC_S_IMM_VAL
+/* 0011 1101 0011 */ TABDECL(OP_BIC_S_IMM_VAL),		// OP_BIC_S_IMM_VAL
+/* 0011 1101 0100 */ TABDECL(OP_BIC_S_IMM_VAL),		// OP_BIC_S_IMM_VAL
+/* 0011 1101 0101 */ TABDECL(OP_BIC_S_IMM_VAL),		// OP_BIC_S_IMM_VAL
+/* 0011 1101 0110 */ TABDECL(OP_BIC_S_IMM_VAL),		// OP_BIC_S_IMM_VAL
+/* 0011 1101 0111 */ TABDECL(OP_BIC_S_IMM_VAL),		// OP_BIC_S_IMM_VAL
+/* 0011 1101 1000 */ TABDECL(OP_BIC_S_IMM_VAL),		// OP_BIC_S_IMM_VAL
+/* 0011 1101 1001 */ TABDECL(OP_BIC_S_IMM_VAL),		// OP_BIC_S_IMM_VAL
+/* 0011 1101 1010 */ TABDECL(OP_BIC_S_IMM_VAL),		// OP_BIC_S_IMM_VAL
+/* 0011 1101 1011 */ TABDECL(OP_BIC_S_IMM_VAL),		// OP_BIC_S_IMM_VAL
+/* 0011 1101 1100 */ TABDECL(OP_BIC_S_IMM_VAL),		// OP_BIC_S_IMM_VAL
+/* 0011 1101 1101 */ TABDECL(OP_BIC_S_IMM_VAL),		// OP_BIC_S_IMM_VAL
+/* 0011 1101 1110 */ TABDECL(OP_BIC_S_IMM_VAL),		// OP_BIC_S_IMM_VAL
+/* 0011 1101 1111 */ TABDECL(OP_BIC_S_IMM_VAL),		// OP_BIC_S_IMM_VAL
+
+/* 0011 1110 0000 */ TABDECL(OP_MVN_IMM_VAL),		// OP_MVN_IMM_VAL
+/* 0011 1110 0001 */ TABDECL(OP_MVN_IMM_VAL),		// OP_MVN_IMM_VAL
+/* 0011 1110 0010 */ TABDECL(OP_MVN_IMM_VAL),		// OP_MVN_IMM_VAL
+/* 0011 1110 0011 */ TABDECL(OP_MVN_IMM_VAL),		// OP_MVN_IMM_VAL
+/* 0011 1110 0100 */ TABDECL(OP_MVN_IMM_VAL),		// OP_MVN_IMM_VAL
+/* 0011 1110 0101 */ TABDECL(OP_MVN_IMM_VAL),		// OP_MVN_IMM_VAL
+/* 0011 1110 0110 */ TABDECL(OP_MVN_IMM_VAL),		// OP_MVN_IMM_VAL
+/* 0011 1110 0111 */ TABDECL(OP_MVN_IMM_VAL),		// OP_MVN_IMM_VAL
+/* 0011 1110 1000 */ TABDECL(OP_MVN_IMM_VAL),		// OP_MVN_IMM_VAL
+/* 0011 1110 1001 */ TABDECL(OP_MVN_IMM_VAL),		// OP_MVN_IMM_VAL
+/* 0011 1110 1010 */ TABDECL(OP_MVN_IMM_VAL),		// OP_MVN_IMM_VAL
+/* 0011 1110 1011 */ TABDECL(OP_MVN_IMM_VAL),		// OP_MVN_IMM_VAL
+/* 0011 1110 1100 */ TABDECL(OP_MVN_IMM_VAL),		// OP_MVN_IMM_VAL
+/* 0011 1110 1101 */ TABDECL(OP_MVN_IMM_VAL),		// OP_MVN_IMM_VAL
+/* 0011 1110 1110 */ TABDECL(OP_MVN_IMM_VAL),		// OP_MVN_IMM_VAL
+/* 0011 1110 1111 */ TABDECL(OP_MVN_IMM_VAL),		// OP_MVN_IMM_VAL
+
+/* 0011 1111 0000 */ TABDECL(OP_MVN_S_IMM_VAL),		// OP_MVN_S_IMM_VAL
+/* 0011 1111 0001 */ TABDECL(OP_MVN_S_IMM_VAL),		// OP_MVN_S_IMM_VAL
+/* 0011 1111 0010 */ TABDECL(OP_MVN_S_IMM_VAL),		// OP_MVN_S_IMM_VAL
+/* 0011 1111 0011 */ TABDECL(OP_MVN_S_IMM_VAL),		// OP_MVN_S_IMM_VAL
+/* 0011 1111 0100 */ TABDECL(OP_MVN_S_IMM_VAL),		// OP_MVN_S_IMM_VAL
+/* 0011 1111 0101 */ TABDECL(OP_MVN_S_IMM_VAL),		// OP_MVN_S_IMM_VAL
+/* 0011 1111 0110 */ TABDECL(OP_MVN_S_IMM_VAL),		// OP_MVN_S_IMM_VAL
+/* 0011 1111 0111 */ TABDECL(OP_MVN_S_IMM_VAL),		// OP_MVN_S_IMM_VAL
+/* 0011 1111 1000 */ TABDECL(OP_MVN_S_IMM_VAL),		// OP_MVN_S_IMM_VAL
+/* 0011 1111 1001 */ TABDECL(OP_MVN_S_IMM_VAL),		// OP_MVN_S_IMM_VAL
+/* 0011 1111 1010 */ TABDECL(OP_MVN_S_IMM_VAL),		// OP_MVN_S_IMM_VAL
+/* 0011 1111 1011 */ TABDECL(OP_MVN_S_IMM_VAL),		// OP_MVN_S_IMM_VAL
+/* 0011 1111 1100 */ TABDECL(OP_MVN_S_IMM_VAL),		// OP_MVN_S_IMM_VAL
+/* 0011 1111 1101 */ TABDECL(OP_MVN_S_IMM_VAL),		// OP_MVN_S_IMM_VAL
+/* 0011 1111 1110 */ TABDECL(OP_MVN_S_IMM_VAL),		// OP_MVN_S_IMM_VAL
+/* 0011 1111 1111 */ TABDECL(OP_MVN_S_IMM_VAL),		// OP_MVN_S_IMM_VAL
+
+/* 0100 0000 0000 */ TABDECL(OP_STR_M_IMM_OFF_POSTIND),		// OP_STR_M_IMM_OFF_POSTIND
+/* 0100 0000 0001 */ TABDECL(OP_STR_M_IMM_OFF_POSTIND),		// OP_STR_M_IMM_OFF_POSTIND
+/* 0100 0000 0010 */ TABDECL(OP_STR_M_IMM_OFF_POSTIND),		// OP_STR_M_IMM_OFF_POSTIND
+/* 0100 0000 0011 */ TABDECL(OP_STR_M_IMM_OFF_POSTIND),		// OP_STR_M_IMM_OFF_POSTIND
+/* 0100 0000 0100 */ TABDECL(OP_STR_M_IMM_OFF_POSTIND),		// OP_STR_M_IMM_OFF_POSTIND
+/* 0100 0000 0101 */ TABDECL(OP_STR_M_IMM_OFF_POSTIND),		// OP_STR_M_IMM_OFF_POSTIND
+/* 0100 0000 0110 */ TABDECL(OP_STR_M_IMM_OFF_POSTIND),		// OP_STR_M_IMM_OFF_POSTIND
+/* 0100 0000 0111 */ TABDECL(OP_STR_M_IMM_OFF_POSTIND),		// OP_STR_M_IMM_OFF_POSTIND
+/* 0100 0000 1000 */ TABDECL(OP_STR_M_IMM_OFF_POSTIND),		// OP_STR_M_IMM_OFF_POSTIND
+/* 0100 0000 1001 */ TABDECL(OP_STR_M_IMM_OFF_POSTIND),		// OP_STR_M_IMM_OFF_POSTIND
+/* 0100 0000 1010 */ TABDECL(OP_STR_M_IMM_OFF_POSTIND),		// OP_STR_M_IMM_OFF_POSTIND
+/* 0100 0000 1011 */ TABDECL(OP_STR_M_IMM_OFF_POSTIND),		// OP_STR_M_IMM_OFF_POSTIND
+/* 0100 0000 1100 */ TABDECL(OP_STR_M_IMM_OFF_POSTIND),		// OP_STR_M_IMM_OFF_POSTIND
+/* 0100 0000 1101 */ TABDECL(OP_STR_M_IMM_OFF_POSTIND),		// OP_STR_M_IMM_OFF_POSTIND
+/* 0100 0000 1110 */ TABDECL(OP_STR_M_IMM_OFF_POSTIND),		// OP_STR_M_IMM_OFF_POSTIND
+/* 0100 0000 1111 */ TABDECL(OP_STR_M_IMM_OFF_POSTIND),		// OP_STR_M_IMM_OFF_POSTIND
+
+/* 0100 0001 0000 */ TABDECL(OP_LDR_M_IMM_OFF_POSTIND),		// OP_LDR_M_IMM_OFF_POSTIND
+/* 0100 0001 0001 */ TABDECL(OP_LDR_M_IMM_OFF_POSTIND),		// OP_LDR_M_IMM_OFF_POSTIND
+/* 0100 0001 0010 */ TABDECL(OP_LDR_M_IMM_OFF_POSTIND),		// OP_LDR_M_IMM_OFF_POSTIND
+/* 0100 0001 0011 */ TABDECL(OP_LDR_M_IMM_OFF_POSTIND),		// OP_LDR_M_IMM_OFF_POSTIND
+/* 0100 0001 0100 */ TABDECL(OP_LDR_M_IMM_OFF_POSTIND),		// OP_LDR_M_IMM_OFF_POSTIND
+/* 0100 0001 0101 */ TABDECL(OP_LDR_M_IMM_OFF_POSTIND),		// OP_LDR_M_IMM_OFF_POSTIND
+/* 0100 0001 0110 */ TABDECL(OP_LDR_M_IMM_OFF_POSTIND),		// OP_LDR_M_IMM_OFF_POSTIND
+/* 0100 0001 0111 */ TABDECL(OP_LDR_M_IMM_OFF_POSTIND),		// OP_LDR_M_IMM_OFF_POSTIND
+/* 0100 0001 1000 */ TABDECL(OP_LDR_M_IMM_OFF_POSTIND),		// OP_LDR_M_IMM_OFF_POSTIND
+/* 0100 0001 1001 */ TABDECL(OP_LDR_M_IMM_OFF_POSTIND),		// OP_LDR_M_IMM_OFF_POSTIND
+/* 0100 0001 1010 */ TABDECL(OP_LDR_M_IMM_OFF_POSTIND),		// OP_LDR_M_IMM_OFF_POSTIND
+/* 0100 0001 1011 */ TABDECL(OP_LDR_M_IMM_OFF_POSTIND),		// OP_LDR_M_IMM_OFF_POSTIND
+/* 0100 0001 1100 */ TABDECL(OP_LDR_M_IMM_OFF_POSTIND),		// OP_LDR_M_IMM_OFF_POSTIND
+/* 0100 0001 1101 */ TABDECL(OP_LDR_M_IMM_OFF_POSTIND),		// OP_LDR_M_IMM_OFF_POSTIND
+/* 0100 0001 1110 */ TABDECL(OP_LDR_M_IMM_OFF_POSTIND),		// OP_LDR_M_IMM_OFF_POSTIND
+/* 0100 0001 1111 */ TABDECL(OP_LDR_M_IMM_OFF_POSTIND),		// OP_LDR_M_IMM_OFF_POSTIND
+
+/* 0100 0010 0000 */ TABDECL(OP_STR_M_IMM_OFF_POSTIND),		// OP_STR_M_IMM_OFF_POSTIND
+/* 0100 0010 0001 */ TABDECL(OP_STR_M_IMM_OFF_POSTIND),		// OP_STR_M_IMM_OFF_POSTIND
+/* 0100 0010 0010 */ TABDECL(OP_STR_M_IMM_OFF_POSTIND),		// OP_STR_M_IMM_OFF_POSTIND
+/* 0100 0010 0011 */ TABDECL(OP_STR_M_IMM_OFF_POSTIND),		// OP_STR_M_IMM_OFF_POSTIND
+/* 0100 0010 0100 */ TABDECL(OP_STR_M_IMM_OFF_POSTIND),		// OP_STR_M_IMM_OFF_POSTIND
+/* 0100 0010 0101 */ TABDECL(OP_STR_M_IMM_OFF_POSTIND),		// OP_STR_M_IMM_OFF_POSTIND
+/* 0100 0010 0110 */ TABDECL(OP_STR_M_IMM_OFF_POSTIND),		// OP_STR_M_IMM_OFF_POSTIND
+/* 0100 0010 0111 */ TABDECL(OP_STR_M_IMM_OFF_POSTIND),		// OP_STR_M_IMM_OFF_POSTIND
+/* 0100 0010 1000 */ TABDECL(OP_STR_M_IMM_OFF_POSTIND),		// OP_STR_M_IMM_OFF_POSTIND
+/* 0100 0010 1001 */ TABDECL(OP_STR_M_IMM_OFF_POSTIND),		// OP_STR_M_IMM_OFF_POSTIND
+/* 0100 0010 1010 */ TABDECL(OP_STR_M_IMM_OFF_POSTIND),		// OP_STR_M_IMM_OFF_POSTIND
+/* 0100 0010 1011 */ TABDECL(OP_STR_M_IMM_OFF_POSTIND),		// OP_STR_M_IMM_OFF_POSTIND
+/* 0100 0010 1100 */ TABDECL(OP_STR_M_IMM_OFF_POSTIND),		// OP_STR_M_IMM_OFF_POSTIND
+/* 0100 0010 1101 */ TABDECL(OP_STR_M_IMM_OFF_POSTIND),		// OP_STR_M_IMM_OFF_POSTIND
+/* 0100 0010 1110 */ TABDECL(OP_STR_M_IMM_OFF_POSTIND),		// OP_STR_M_IMM_OFF_POSTIND
+/* 0100 0010 1111 */ TABDECL(OP_STR_M_IMM_OFF_POSTIND),		// OP_STR_M_IMM_OFF_POSTIND
+
+/* 0100 0011 0000 */ TABDECL(OP_LDR_M_IMM_OFF_POSTIND),		// OP_LDR_M_IMM_OFF_POSTIND
+/* 0100 0011 0001 */ TABDECL(OP_LDR_M_IMM_OFF_POSTIND),		// OP_LDR_M_IMM_OFF_POSTIND
+/* 0100 0011 0010 */ TABDECL(OP_LDR_M_IMM_OFF_POSTIND),		// OP_LDR_M_IMM_OFF_POSTIND
+/* 0100 0011 0011 */ TABDECL(OP_LDR_M_IMM_OFF_POSTIND),		// OP_LDR_M_IMM_OFF_POSTIND
+/* 0100 0011 0100 */ TABDECL(OP_LDR_M_IMM_OFF_POSTIND),		// OP_LDR_M_IMM_OFF_POSTIND
+/* 0100 0011 0101 */ TABDECL(OP_LDR_M_IMM_OFF_POSTIND),		// OP_LDR_M_IMM_OFF_POSTIND
+/* 0100 0011 0110 */ TABDECL(OP_LDR_M_IMM_OFF_POSTIND),		// OP_LDR_M_IMM_OFF_POSTIND
+/* 0100 0011 0111 */ TABDECL(OP_LDR_M_IMM_OFF_POSTIND),		// OP_LDR_M_IMM_OFF_POSTIND
+/* 0100 0011 1000 */ TABDECL(OP_LDR_M_IMM_OFF_POSTIND),		// OP_LDR_M_IMM_OFF_POSTIND
+/* 0100 0011 1001 */ TABDECL(OP_LDR_M_IMM_OFF_POSTIND),		// OP_LDR_M_IMM_OFF_POSTIND
+/* 0100 0011 1010 */ TABDECL(OP_LDR_M_IMM_OFF_POSTIND),		// OP_LDR_M_IMM_OFF_POSTIND
+/* 0100 0011 1011 */ TABDECL(OP_LDR_M_IMM_OFF_POSTIND),		// OP_LDR_M_IMM_OFF_POSTIND
+/* 0100 0011 1100 */ TABDECL(OP_LDR_M_IMM_OFF_POSTIND),		// OP_LDR_M_IMM_OFF_POSTIND
+/* 0100 0011 1101 */ TABDECL(OP_LDR_M_IMM_OFF_POSTIND),		// OP_LDR_M_IMM_OFF_POSTIND
+/* 0100 0011 1110 */ TABDECL(OP_LDR_M_IMM_OFF_POSTIND),		// OP_LDR_M_IMM_OFF_POSTIND
+/* 0100 0011 1111 */ TABDECL(OP_LDR_M_IMM_OFF_POSTIND),		// OP_LDR_M_IMM_OFF_POSTIND
+
+/* 0100 0100 0000 */ TABDECL(OP_STRB_M_IMM_OFF_POSTIND),		// OP_STRB_M_IMM_OFF_POSTIND
+/* 0100 0100 0001 */ TABDECL(OP_STRB_M_IMM_OFF_POSTIND),		// OP_STRB_M_IMM_OFF_POSTIND
+/* 0100 0100 0010 */ TABDECL(OP_STRB_M_IMM_OFF_POSTIND),		// OP_STRB_M_IMM_OFF_POSTIND
+/* 0100 0100 0011 */ TABDECL(OP_STRB_M_IMM_OFF_POSTIND),		// OP_STRB_M_IMM_OFF_POSTIND
+/* 0100 0100 0100 */ TABDECL(OP_STRB_M_IMM_OFF_POSTIND),		// OP_STRB_M_IMM_OFF_POSTIND
+/* 0100 0100 0101 */ TABDECL(OP_STRB_M_IMM_OFF_POSTIND),		// OP_STRB_M_IMM_OFF_POSTIND
+/* 0100 0100 0110 */ TABDECL(OP_STRB_M_IMM_OFF_POSTIND),		// OP_STRB_M_IMM_OFF_POSTIND
+/* 0100 0100 0111 */ TABDECL(OP_STRB_M_IMM_OFF_POSTIND),		// OP_STRB_M_IMM_OFF_POSTIND
+/* 0100 0100 1000 */ TABDECL(OP_STRB_M_IMM_OFF_POSTIND),		// OP_STRB_M_IMM_OFF_POSTIND
+/* 0100 0100 1001 */ TABDECL(OP_STRB_M_IMM_OFF_POSTIND),		// OP_STRB_M_IMM_OFF_POSTIND
+/* 0100 0100 1010 */ TABDECL(OP_STRB_M_IMM_OFF_POSTIND),		// OP_STRB_M_IMM_OFF_POSTIND
+/* 0100 0100 1011 */ TABDECL(OP_STRB_M_IMM_OFF_POSTIND),		// OP_STRB_M_IMM_OFF_POSTIND
+/* 0100 0100 1100 */ TABDECL(OP_STRB_M_IMM_OFF_POSTIND),		// OP_STRB_M_IMM_OFF_POSTIND
+/* 0100 0100 1101 */ TABDECL(OP_STRB_M_IMM_OFF_POSTIND),		// OP_STRB_M_IMM_OFF_POSTIND
+/* 0100 0100 1110 */ TABDECL(OP_STRB_M_IMM_OFF_POSTIND),		// OP_STRB_M_IMM_OFF_POSTIND
+/* 0100 0100 1111 */ TABDECL(OP_STRB_M_IMM_OFF_POSTIND),		// OP_STRB_M_IMM_OFF_POSTIND
+
+/* 0100 0101 0000 */ TABDECL(OP_LDRB_M_IMM_OFF_POSTIND),		// OP_LDRB_M_IMM_OFF_POSTIND
+/* 0100 0101 0001 */ TABDECL(OP_LDRB_M_IMM_OFF_POSTIND),		// OP_LDRB_M_IMM_OFF_POSTIND
+/* 0100 0101 0010 */ TABDECL(OP_LDRB_M_IMM_OFF_POSTIND),		// OP_LDRB_M_IMM_OFF_POSTIND
+/* 0100 0101 0011 */ TABDECL(OP_LDRB_M_IMM_OFF_POSTIND),		// OP_LDRB_M_IMM_OFF_POSTIND
+/* 0100 0101 0100 */ TABDECL(OP_LDRB_M_IMM_OFF_POSTIND),		// OP_LDRB_M_IMM_OFF_POSTIND
+/* 0100 0101 0101 */ TABDECL(OP_LDRB_M_IMM_OFF_POSTIND),		// OP_LDRB_M_IMM_OFF_POSTIND
+/* 0100 0101 0110 */ TABDECL(OP_LDRB_M_IMM_OFF_POSTIND),		// OP_LDRB_M_IMM_OFF_POSTIND
+/* 0100 0101 0111 */ TABDECL(OP_LDRB_M_IMM_OFF_POSTIND),		// OP_LDRB_M_IMM_OFF_POSTIND
+/* 0100 0101 1000 */ TABDECL(OP_LDRB_M_IMM_OFF_POSTIND),		// OP_LDRB_M_IMM_OFF_POSTIND
+/* 0100 0101 1001 */ TABDECL(OP_LDRB_M_IMM_OFF_POSTIND),		// OP_LDRB_M_IMM_OFF_POSTIND
+/* 0100 0101 1010 */ TABDECL(OP_LDRB_M_IMM_OFF_POSTIND),		// OP_LDRB_M_IMM_OFF_POSTIND
+/* 0100 0101 1011 */ TABDECL(OP_LDRB_M_IMM_OFF_POSTIND),		// OP_LDRB_M_IMM_OFF_POSTIND
+/* 0100 0101 1100 */ TABDECL(OP_LDRB_M_IMM_OFF_POSTIND),		// OP_LDRB_M_IMM_OFF_POSTIND
+/* 0100 0101 1101 */ TABDECL(OP_LDRB_M_IMM_OFF_POSTIND),		// OP_LDRB_M_IMM_OFF_POSTIND
+/* 0100 0101 1110 */ TABDECL(OP_LDRB_M_IMM_OFF_POSTIND),		// OP_LDRB_M_IMM_OFF_POSTIND
+/* 0100 0101 1111 */ TABDECL(OP_LDRB_M_IMM_OFF_POSTIND),		// OP_LDRB_M_IMM_OFF_POSTIND
+
+/* 0100 0110 0000 */ TABDECL(OP_STRB_M_IMM_OFF_POSTIND),		// OP_STRB_M_IMM_OFF_POSTIND
+/* 0100 0110 0001 */ TABDECL(OP_STRB_M_IMM_OFF_POSTIND),		// OP_STRB_M_IMM_OFF_POSTIND
+/* 0100 0110 0010 */ TABDECL(OP_STRB_M_IMM_OFF_POSTIND),		// OP_STRB_M_IMM_OFF_POSTIND
+/* 0100 0110 0011 */ TABDECL(OP_STRB_M_IMM_OFF_POSTIND),		// OP_STRB_M_IMM_OFF_POSTIND
+/* 0100 0110 0100 */ TABDECL(OP_STRB_M_IMM_OFF_POSTIND),		// OP_STRB_M_IMM_OFF_POSTIND
+/* 0100 0110 0101 */ TABDECL(OP_STRB_M_IMM_OFF_POSTIND),		// OP_STRB_M_IMM_OFF_POSTIND
+/* 0100 0110 0110 */ TABDECL(OP_STRB_M_IMM_OFF_POSTIND),		// OP_STRB_M_IMM_OFF_POSTIND
+/* 0100 0110 0111 */ TABDECL(OP_STRB_M_IMM_OFF_POSTIND),		// OP_STRB_M_IMM_OFF_POSTIND
+/* 0100 0110 1000 */ TABDECL(OP_STRB_M_IMM_OFF_POSTIND),		// OP_STRB_M_IMM_OFF_POSTIND
+/* 0100 0110 1001 */ TABDECL(OP_STRB_M_IMM_OFF_POSTIND),		// OP_STRB_M_IMM_OFF_POSTIND
+/* 0100 0110 1010 */ TABDECL(OP_STRB_M_IMM_OFF_POSTIND),		// OP_STRB_M_IMM_OFF_POSTIND
+/* 0100 0110 1011 */ TABDECL(OP_STRB_M_IMM_OFF_POSTIND),		// OP_STRB_M_IMM_OFF_POSTIND
+/* 0100 0110 1100 */ TABDECL(OP_STRB_M_IMM_OFF_POSTIND),		// OP_STRB_M_IMM_OFF_POSTIND
+/* 0100 0110 1101 */ TABDECL(OP_STRB_M_IMM_OFF_POSTIND),		// OP_STRB_M_IMM_OFF_POSTIND
+/* 0100 0110 1110 */ TABDECL(OP_STRB_M_IMM_OFF_POSTIND),		// OP_STRB_M_IMM_OFF_POSTIND
+/* 0100 0110 1111 */ TABDECL(OP_STRB_M_IMM_OFF_POSTIND),		// OP_STRB_M_IMM_OFF_POSTIND
+
+/* 0100 0111 0000 */ TABDECL(OP_LDRB_M_IMM_OFF_POSTIND),		// OP_LDRB_M_IMM_OFF_POSTIND
+/* 0100 0111 0001 */ TABDECL(OP_LDRB_M_IMM_OFF_POSTIND),		// OP_LDRB_M_IMM_OFF_POSTIND
+/* 0100 0111 0010 */ TABDECL(OP_LDRB_M_IMM_OFF_POSTIND),		// OP_LDRB_M_IMM_OFF_POSTIND
+/* 0100 0111 0011 */ TABDECL(OP_LDRB_M_IMM_OFF_POSTIND),		// OP_LDRB_M_IMM_OFF_POSTIND
+/* 0100 0111 0100 */ TABDECL(OP_LDRB_M_IMM_OFF_POSTIND),		// OP_LDRB_M_IMM_OFF_POSTIND
+/* 0100 0111 0101 */ TABDECL(OP_LDRB_M_IMM_OFF_POSTIND),		// OP_LDRB_M_IMM_OFF_POSTIND
+/* 0100 0111 0110 */ TABDECL(OP_LDRB_M_IMM_OFF_POSTIND),		// OP_LDRB_M_IMM_OFF_POSTIND
+/* 0100 0111 0111 */ TABDECL(OP_LDRB_M_IMM_OFF_POSTIND),		// OP_LDRB_M_IMM_OFF_POSTIND
+/* 0100 0111 1000 */ TABDECL(OP_LDRB_M_IMM_OFF_POSTIND),		// OP_LDRB_M_IMM_OFF_POSTIND
+/* 0100 0111 1001 */ TABDECL(OP_LDRB_M_IMM_OFF_POSTIND),		// OP_LDRB_M_IMM_OFF_POSTIND
+/* 0100 0111 1010 */ TABDECL(OP_LDRB_M_IMM_OFF_POSTIND),		// OP_LDRB_M_IMM_OFF_POSTIND
+/* 0100 0111 1011 */ TABDECL(OP_LDRB_M_IMM_OFF_POSTIND),		// OP_LDRB_M_IMM_OFF_POSTIND
+/* 0100 0111 1100 */ TABDECL(OP_LDRB_M_IMM_OFF_POSTIND),		// OP_LDRB_M_IMM_OFF_POSTIND
+/* 0100 0111 1101 */ TABDECL(OP_LDRB_M_IMM_OFF_POSTIND),		// OP_LDRB_M_IMM_OFF_POSTIND
+/* 0100 0111 1110 */ TABDECL(OP_LDRB_M_IMM_OFF_POSTIND),		// OP_LDRB_M_IMM_OFF_POSTIND
+/* 0100 0111 1111 */ TABDECL(OP_LDRB_M_IMM_OFF_POSTIND),		// OP_LDRB_M_IMM_OFF_POSTIND
+
+/* 0100 1000 0000 */ TABDECL(OP_STR_P_IMM_OFF_POSTIND),		// OP_STR_P_IMM_OFF_POSTIND
+/* 0100 1000 0001 */ TABDECL(OP_STR_P_IMM_OFF_POSTIND),		// OP_STR_P_IMM_OFF_POSTIND
+/* 0100 1000 0010 */ TABDECL(OP_STR_P_IMM_OFF_POSTIND),		// OP_STR_P_IMM_OFF_POSTIND
+/* 0100 1000 0011 */ TABDECL(OP_STR_P_IMM_OFF_POSTIND),		// OP_STR_P_IMM_OFF_POSTIND
+/* 0100 1000 0100 */ TABDECL(OP_STR_P_IMM_OFF_POSTIND),		// OP_STR_P_IMM_OFF_POSTIND
+/* 0100 1000 0101 */ TABDECL(OP_STR_P_IMM_OFF_POSTIND),		// OP_STR_P_IMM_OFF_POSTIND
+/* 0100 1000 0110 */ TABDECL(OP_STR_P_IMM_OFF_POSTIND),		// OP_STR_P_IMM_OFF_POSTIND
+/* 0100 1000 0111 */ TABDECL(OP_STR_P_IMM_OFF_POSTIND),		// OP_STR_P_IMM_OFF_POSTIND
+/* 0100 1000 1000 */ TABDECL(OP_STR_P_IMM_OFF_POSTIND),		// OP_STR_P_IMM_OFF_POSTIND
+/* 0100 1000 1001 */ TABDECL(OP_STR_P_IMM_OFF_POSTIND),		// OP_STR_P_IMM_OFF_POSTIND
+/* 0100 1000 1010 */ TABDECL(OP_STR_P_IMM_OFF_POSTIND),		// OP_STR_P_IMM_OFF_POSTIND
+/* 0100 1000 1011 */ TABDECL(OP_STR_P_IMM_OFF_POSTIND),		// OP_STR_P_IMM_OFF_POSTIND
+/* 0100 1000 1100 */ TABDECL(OP_STR_P_IMM_OFF_POSTIND),		// OP_STR_P_IMM_OFF_POSTIND
+/* 0100 1000 1101 */ TABDECL(OP_STR_P_IMM_OFF_POSTIND),		// OP_STR_P_IMM_OFF_POSTIND
+/* 0100 1000 1110 */ TABDECL(OP_STR_P_IMM_OFF_POSTIND),		// OP_STR_P_IMM_OFF_POSTIND
+/* 0100 1000 1111 */ TABDECL(OP_STR_P_IMM_OFF_POSTIND),		// OP_STR_P_IMM_OFF_POSTIND
+
+/* 0100 1001 0000 */ TABDECL(OP_LDR_P_IMM_OFF_POSTIND),		// OP_LDR_P_IMM_OFF_POSTIND
+/* 0100 1001 0001 */ TABDECL(OP_LDR_P_IMM_OFF_POSTIND),		// OP_LDR_P_IMM_OFF_POSTIND
+/* 0100 1001 0010 */ TABDECL(OP_LDR_P_IMM_OFF_POSTIND),		// OP_LDR_P_IMM_OFF_POSTIND
+/* 0100 1001 0011 */ TABDECL(OP_LDR_P_IMM_OFF_POSTIND),		// OP_LDR_P_IMM_OFF_POSTIND
+/* 0100 1001 0100 */ TABDECL(OP_LDR_P_IMM_OFF_POSTIND),		// OP_LDR_P_IMM_OFF_POSTIND
+/* 0100 1001 0101 */ TABDECL(OP_LDR_P_IMM_OFF_POSTIND),		// OP_LDR_P_IMM_OFF_POSTIND
+/* 0100 1001 0110 */ TABDECL(OP_LDR_P_IMM_OFF_POSTIND),		// OP_LDR_P_IMM_OFF_POSTIND
+/* 0100 1001 0111 */ TABDECL(OP_LDR_P_IMM_OFF_POSTIND),		// OP_LDR_P_IMM_OFF_POSTIND
+/* 0100 1001 1000 */ TABDECL(OP_LDR_P_IMM_OFF_POSTIND),		// OP_LDR_P_IMM_OFF_POSTIND
+/* 0100 1001 1001 */ TABDECL(OP_LDR_P_IMM_OFF_POSTIND),		// OP_LDR_P_IMM_OFF_POSTIND
+/* 0100 1001 1010 */ TABDECL(OP_LDR_P_IMM_OFF_POSTIND),		// OP_LDR_P_IMM_OFF_POSTIND
+/* 0100 1001 1011 */ TABDECL(OP_LDR_P_IMM_OFF_POSTIND),		// OP_LDR_P_IMM_OFF_POSTIND
+/* 0100 1001 1100 */ TABDECL(OP_LDR_P_IMM_OFF_POSTIND),		// OP_LDR_P_IMM_OFF_POSTIND
+/* 0100 1001 1101 */ TABDECL(OP_LDR_P_IMM_OFF_POSTIND),		// OP_LDR_P_IMM_OFF_POSTIND
+/* 0100 1001 1110 */ TABDECL(OP_LDR_P_IMM_OFF_POSTIND),		// OP_LDR_P_IMM_OFF_POSTIND
+/* 0100 1001 1111 */ TABDECL(OP_LDR_P_IMM_OFF_POSTIND),		// OP_LDR_P_IMM_OFF_POSTIND
+
+/* 0100 1010 0000 */ TABDECL(OP_STR_P_IMM_OFF_POSTIND),		// OP_STR_P_IMM_OFF_POSTIND
+/* 0100 1010 0001 */ TABDECL(OP_STR_P_IMM_OFF_POSTIND),		// OP_STR_P_IMM_OFF_POSTIND
+/* 0100 1010 0010 */ TABDECL(OP_STR_P_IMM_OFF_POSTIND),		// OP_STR_P_IMM_OFF_POSTIND
+/* 0100 1010 0011 */ TABDECL(OP_STR_P_IMM_OFF_POSTIND),		// OP_STR_P_IMM_OFF_POSTIND
+/* 0100 1010 0100 */ TABDECL(OP_STR_P_IMM_OFF_POSTIND),		// OP_STR_P_IMM_OFF_POSTIND
+/* 0100 1010 0101 */ TABDECL(OP_STR_P_IMM_OFF_POSTIND),		// OP_STR_P_IMM_OFF_POSTIND
+/* 0100 1010 0110 */ TABDECL(OP_STR_P_IMM_OFF_POSTIND),		// OP_STR_P_IMM_OFF_POSTIND
+/* 0100 1010 0111 */ TABDECL(OP_STR_P_IMM_OFF_POSTIND),		// OP_STR_P_IMM_OFF_POSTIND
+/* 0100 1010 1000 */ TABDECL(OP_STR_P_IMM_OFF_POSTIND),		// OP_STR_P_IMM_OFF_POSTIND
+/* 0100 1010 1001 */ TABDECL(OP_STR_P_IMM_OFF_POSTIND),		// OP_STR_P_IMM_OFF_POSTIND
+/* 0100 1010 1010 */ TABDECL(OP_STR_P_IMM_OFF_POSTIND),		// OP_STR_P_IMM_OFF_POSTIND
+/* 0100 1010 1011 */ TABDECL(OP_STR_P_IMM_OFF_POSTIND),		// OP_STR_P_IMM_OFF_POSTIND
+/* 0100 1010 1100 */ TABDECL(OP_STR_P_IMM_OFF_POSTIND),		// OP_STR_P_IMM_OFF_POSTIND
+/* 0100 1010 1101 */ TABDECL(OP_STR_P_IMM_OFF_POSTIND),		// OP_STR_P_IMM_OFF_POSTIND
+/* 0100 1010 1110 */ TABDECL(OP_STR_P_IMM_OFF_POSTIND),		// OP_STR_P_IMM_OFF_POSTIND
+/* 0100 1010 1111 */ TABDECL(OP_STR_P_IMM_OFF_POSTIND),		// OP_STR_P_IMM_OFF_POSTIND
+
+/* 0100 1011 0000 */ TABDECL(OP_LDR_P_IMM_OFF_POSTIND),		// OP_LDR_P_IMM_OFF_POSTIND
+/* 0100 1011 0001 */ TABDECL(OP_LDR_P_IMM_OFF_POSTIND),		// OP_LDR_P_IMM_OFF_POSTIND
+/* 0100 1011 0010 */ TABDECL(OP_LDR_P_IMM_OFF_POSTIND),		// OP_LDR_P_IMM_OFF_POSTIND
+/* 0100 1011 0011 */ TABDECL(OP_LDR_P_IMM_OFF_POSTIND),		// OP_LDR_P_IMM_OFF_POSTIND
+/* 0100 1011 0100 */ TABDECL(OP_LDR_P_IMM_OFF_POSTIND),		// OP_LDR_P_IMM_OFF_POSTIND
+/* 0100 1011 0101 */ TABDECL(OP_LDR_P_IMM_OFF_POSTIND),		// OP_LDR_P_IMM_OFF_POSTIND
+/* 0100 1011 0110 */ TABDECL(OP_LDR_P_IMM_OFF_POSTIND),		// OP_LDR_P_IMM_OFF_POSTIND
+/* 0100 1011 0111 */ TABDECL(OP_LDR_P_IMM_OFF_POSTIND),		// OP_LDR_P_IMM_OFF_POSTIND
+/* 0100 1011 1000 */ TABDECL(OP_LDR_P_IMM_OFF_POSTIND),		// OP_LDR_P_IMM_OFF_POSTIND
+/* 0100 1011 1001 */ TABDECL(OP_LDR_P_IMM_OFF_POSTIND),		// OP_LDR_P_IMM_OFF_POSTIND
+/* 0100 1011 1010 */ TABDECL(OP_LDR_P_IMM_OFF_POSTIND),		// OP_LDR_P_IMM_OFF_POSTIND
+/* 0100 1011 1011 */ TABDECL(OP_LDR_P_IMM_OFF_POSTIND),		// OP_LDR_P_IMM_OFF_POSTIND
+/* 0100 1011 1100 */ TABDECL(OP_LDR_P_IMM_OFF_POSTIND),		// OP_LDR_P_IMM_OFF_POSTIND
+/* 0100 1011 1101 */ TABDECL(OP_LDR_P_IMM_OFF_POSTIND),		// OP_LDR_P_IMM_OFF_POSTIND
+/* 0100 1011 1110 */ TABDECL(OP_LDR_P_IMM_OFF_POSTIND),		// OP_LDR_P_IMM_OFF_POSTIND
+/* 0100 1011 1111 */ TABDECL(OP_LDR_P_IMM_OFF_POSTIND),		// OP_LDR_P_IMM_OFF_POSTIND
+
+/* 0100 1100 0000 */ TABDECL(OP_STRB_P_IMM_OFF_POSTIND),		// OP_STRB_P_IMM_OFF_POSTIND
+/* 0100 1100 0001 */ TABDECL(OP_STRB_P_IMM_OFF_POSTIND),		// OP_STRB_P_IMM_OFF_POSTIND
+/* 0100 1100 0010 */ TABDECL(OP_STRB_P_IMM_OFF_POSTIND),		// OP_STRB_P_IMM_OFF_POSTIND
+/* 0100 1100 0011 */ TABDECL(OP_STRB_P_IMM_OFF_POSTIND),		// OP_STRB_P_IMM_OFF_POSTIND
+/* 0100 1100 0100 */ TABDECL(OP_STRB_P_IMM_OFF_POSTIND),		// OP_STRB_P_IMM_OFF_POSTIND
+/* 0100 1100 0101 */ TABDECL(OP_STRB_P_IMM_OFF_POSTIND),		// OP_STRB_P_IMM_OFF_POSTIND
+/* 0100 1100 0110 */ TABDECL(OP_STRB_P_IMM_OFF_POSTIND),		// OP_STRB_P_IMM_OFF_POSTIND
+/* 0100 1100 0111 */ TABDECL(OP_STRB_P_IMM_OFF_POSTIND),		// OP_STRB_P_IMM_OFF_POSTIND
+/* 0100 1100 1000 */ TABDECL(OP_STRB_P_IMM_OFF_POSTIND),		// OP_STRB_P_IMM_OFF_POSTIND
+/* 0100 1100 1001 */ TABDECL(OP_STRB_P_IMM_OFF_POSTIND),		// OP_STRB_P_IMM_OFF_POSTIND
+/* 0100 1100 1010 */ TABDECL(OP_STRB_P_IMM_OFF_POSTIND),		// OP_STRB_P_IMM_OFF_POSTIND
+/* 0100 1100 1011 */ TABDECL(OP_STRB_P_IMM_OFF_POSTIND),		// OP_STRB_P_IMM_OFF_POSTIND
+/* 0100 1100 1100 */ TABDECL(OP_STRB_P_IMM_OFF_POSTIND),		// OP_STRB_P_IMM_OFF_POSTIND
+/* 0100 1100 1101 */ TABDECL(OP_STRB_P_IMM_OFF_POSTIND),		// OP_STRB_P_IMM_OFF_POSTIND
+/* 0100 1100 1110 */ TABDECL(OP_STRB_P_IMM_OFF_POSTIND),		// OP_STRB_P_IMM_OFF_POSTIND
+/* 0100 1100 1111 */ TABDECL(OP_STRB_P_IMM_OFF_POSTIND),		// OP_STRB_P_IMM_OFF_POSTIND
+
+/* 0100 1101 0000 */ TABDECL(OP_LDRB_P_IMM_OFF_POSTIND),		// OP_LDRB_P_IMM_OFF_POSTIND
+/* 0100 1101 0001 */ TABDECL(OP_LDRB_P_IMM_OFF_POSTIND),		// OP_LDRB_P_IMM_OFF_POSTIND
+/* 0100 1101 0010 */ TABDECL(OP_LDRB_P_IMM_OFF_POSTIND),		// OP_LDRB_P_IMM_OFF_POSTIND
+/* 0100 1101 0011 */ TABDECL(OP_LDRB_P_IMM_OFF_POSTIND),		// OP_LDRB_P_IMM_OFF_POSTIND
+/* 0100 1101 0100 */ TABDECL(OP_LDRB_P_IMM_OFF_POSTIND),		// OP_LDRB_P_IMM_OFF_POSTIND
+/* 0100 1101 0101 */ TABDECL(OP_LDRB_P_IMM_OFF_POSTIND),		// OP_LDRB_P_IMM_OFF_POSTIND
+/* 0100 1101 0110 */ TABDECL(OP_LDRB_P_IMM_OFF_POSTIND),		// OP_LDRB_P_IMM_OFF_POSTIND
+/* 0100 1101 0111 */ TABDECL(OP_LDRB_P_IMM_OFF_POSTIND),		// OP_LDRB_P_IMM_OFF_POSTIND
+/* 0100 1101 1000 */ TABDECL(OP_LDRB_P_IMM_OFF_POSTIND),		// OP_LDRB_P_IMM_OFF_POSTIND
+/* 0100 1101 1001 */ TABDECL(OP_LDRB_P_IMM_OFF_POSTIND),		// OP_LDRB_P_IMM_OFF_POSTIND
+/* 0100 1101 1010 */ TABDECL(OP_LDRB_P_IMM_OFF_POSTIND),		// OP_LDRB_P_IMM_OFF_POSTIND
+/* 0100 1101 1011 */ TABDECL(OP_LDRB_P_IMM_OFF_POSTIND),		// OP_LDRB_P_IMM_OFF_POSTIND
+/* 0100 1101 1100 */ TABDECL(OP_LDRB_P_IMM_OFF_POSTIND),		// OP_LDRB_P_IMM_OFF_POSTIND
+/* 0100 1101 1101 */ TABDECL(OP_LDRB_P_IMM_OFF_POSTIND),		// OP_LDRB_P_IMM_OFF_POSTIND
+/* 0100 1101 1110 */ TABDECL(OP_LDRB_P_IMM_OFF_POSTIND),		// OP_LDRB_P_IMM_OFF_POSTIND
+/* 0100 1101 1111 */ TABDECL(OP_LDRB_P_IMM_OFF_POSTIND),		// OP_LDRB_P_IMM_OFF_POSTIND
+
+/* 0100 1110 0000 */ TABDECL(OP_STRB_P_IMM_OFF_POSTIND),		// OP_STRB_P_IMM_OFF_POSTIND
+/* 0100 1110 0001 */ TABDECL(OP_STRB_P_IMM_OFF_POSTIND),		// OP_STRB_P_IMM_OFF_POSTIND
+/* 0100 1110 0010 */ TABDECL(OP_STRB_P_IMM_OFF_POSTIND),		// OP_STRB_P_IMM_OFF_POSTIND
+/* 0100 1110 0011 */ TABDECL(OP_STRB_P_IMM_OFF_POSTIND),		// OP_STRB_P_IMM_OFF_POSTIND
+/* 0100 1110 0100 */ TABDECL(OP_STRB_P_IMM_OFF_POSTIND),		// OP_STRB_P_IMM_OFF_POSTIND
+/* 0100 1110 0101 */ TABDECL(OP_STRB_P_IMM_OFF_POSTIND),		// OP_STRB_P_IMM_OFF_POSTIND
+/* 0100 1110 0110 */ TABDECL(OP_STRB_P_IMM_OFF_POSTIND),		// OP_STRB_P_IMM_OFF_POSTIND
+/* 0100 1110 0111 */ TABDECL(OP_STRB_P_IMM_OFF_POSTIND),		// OP_STRB_P_IMM_OFF_POSTIND
+/* 0100 1110 1000 */ TABDECL(OP_STRB_P_IMM_OFF_POSTIND),		// OP_STRB_P_IMM_OFF_POSTIND
+/* 0100 1110 1001 */ TABDECL(OP_STRB_P_IMM_OFF_POSTIND),		// OP_STRB_P_IMM_OFF_POSTIND
+/* 0100 1110 1010 */ TABDECL(OP_STRB_P_IMM_OFF_POSTIND),		// OP_STRB_P_IMM_OFF_POSTIND
+/* 0100 1110 1011 */ TABDECL(OP_STRB_P_IMM_OFF_POSTIND),		// OP_STRB_P_IMM_OFF_POSTIND
+/* 0100 1110 1100 */ TABDECL(OP_STRB_P_IMM_OFF_POSTIND),		// OP_STRB_P_IMM_OFF_POSTIND
+/* 0100 1110 1101 */ TABDECL(OP_STRB_P_IMM_OFF_POSTIND),		// OP_STRB_P_IMM_OFF_POSTIND
+/* 0100 1110 1110 */ TABDECL(OP_STRB_P_IMM_OFF_POSTIND),		// OP_STRB_P_IMM_OFF_POSTIND
+/* 0100 1110 1111 */ TABDECL(OP_STRB_P_IMM_OFF_POSTIND),		// OP_STRB_P_IMM_OFF_POSTIND
+
+/* 0100 1111 0000 */ TABDECL(OP_LDRB_P_IMM_OFF_POSTIND),		// OP_LDRB_P_IMM_OFF_POSTIND
+/* 0100 1111 0001 */ TABDECL(OP_LDRB_P_IMM_OFF_POSTIND),		// OP_LDRB_P_IMM_OFF_POSTIND
+/* 0100 1111 0010 */ TABDECL(OP_LDRB_P_IMM_OFF_POSTIND),		// OP_LDRB_P_IMM_OFF_POSTIND
+/* 0100 1111 0011 */ TABDECL(OP_LDRB_P_IMM_OFF_POSTIND),		// OP_LDRB_P_IMM_OFF_POSTIND
+/* 0100 1111 0100 */ TABDECL(OP_LDRB_P_IMM_OFF_POSTIND),		// OP_LDRB_P_IMM_OFF_POSTIND
+/* 0100 1111 0101 */ TABDECL(OP_LDRB_P_IMM_OFF_POSTIND),		// OP_LDRB_P_IMM_OFF_POSTIND
+/* 0100 1111 0110 */ TABDECL(OP_LDRB_P_IMM_OFF_POSTIND),		// OP_LDRB_P_IMM_OFF_POSTIND
+/* 0100 1111 0111 */ TABDECL(OP_LDRB_P_IMM_OFF_POSTIND),		// OP_LDRB_P_IMM_OFF_POSTIND
+/* 0100 1111 1000 */ TABDECL(OP_LDRB_P_IMM_OFF_POSTIND),		// OP_LDRB_P_IMM_OFF_POSTIND
+/* 0100 1111 1001 */ TABDECL(OP_LDRB_P_IMM_OFF_POSTIND),		// OP_LDRB_P_IMM_OFF_POSTIND
+/* 0100 1111 1010 */ TABDECL(OP_LDRB_P_IMM_OFF_POSTIND),		// OP_LDRB_P_IMM_OFF_POSTIND
+/* 0100 1111 1011 */ TABDECL(OP_LDRB_P_IMM_OFF_POSTIND),		// OP_LDRB_P_IMM_OFF_POSTIND
+/* 0100 1111 1100 */ TABDECL(OP_LDRB_P_IMM_OFF_POSTIND),		// OP_LDRB_P_IMM_OFF_POSTIND
+/* 0100 1111 1101 */ TABDECL(OP_LDRB_P_IMM_OFF_POSTIND),		// OP_LDRB_P_IMM_OFF_POSTIND
+/* 0100 1111 1110 */ TABDECL(OP_LDRB_P_IMM_OFF_POSTIND),		// OP_LDRB_P_IMM_OFF_POSTIND
+/* 0100 1111 1111 */ TABDECL(OP_LDRB_P_IMM_OFF_POSTIND),		// OP_LDRB_P_IMM_OFF_POSTIND
+
+/* 0101 0000 0000 */ TABDECL(OP_STR_M_IMM_OFF),		// OP_STR_M_IMM_OFF
+/* 0101 0000 0001 */ TABDECL(OP_STR_M_IMM_OFF),		// OP_STR_M_IMM_OFF
+/* 0101 0000 0010 */ TABDECL(OP_STR_M_IMM_OFF),		// OP_STR_M_IMM_OFF
+/* 0101 0000 0011 */ TABDECL(OP_STR_M_IMM_OFF),		// OP_STR_M_IMM_OFF
+/* 0101 0000 0100 */ TABDECL(OP_STR_M_IMM_OFF),		// OP_STR_M_IMM_OFF
+/* 0101 0000 0101 */ TABDECL(OP_STR_M_IMM_OFF),		// OP_STR_M_IMM_OFF
+/* 0101 0000 0110 */ TABDECL(OP_STR_M_IMM_OFF),		// OP_STR_M_IMM_OFF
+/* 0101 0000 0111 */ TABDECL(OP_STR_M_IMM_OFF),		// OP_STR_M_IMM_OFF
+/* 0101 0000 1000 */ TABDECL(OP_STR_M_IMM_OFF),		// OP_STR_M_IMM_OFF
+/* 0101 0000 1001 */ TABDECL(OP_STR_M_IMM_OFF),		// OP_STR_M_IMM_OFF
+/* 0101 0000 1010 */ TABDECL(OP_STR_M_IMM_OFF),		// OP_STR_M_IMM_OFF
+/* 0101 0000 1011 */ TABDECL(OP_STR_M_IMM_OFF),		// OP_STR_M_IMM_OFF
+/* 0101 0000 1100 */ TABDECL(OP_STR_M_IMM_OFF),		// OP_STR_M_IMM_OFF
+/* 0101 0000 1101 */ TABDECL(OP_STR_M_IMM_OFF),		// OP_STR_M_IMM_OFF
+/* 0101 0000 1110 */ TABDECL(OP_STR_M_IMM_OFF),		// OP_STR_M_IMM_OFF
+/* 0101 0000 1111 */ TABDECL(OP_STR_M_IMM_OFF),		// OP_STR_M_IMM_OFF
+
+/* 0101 0001 0000 */ TABDECL(OP_LDR_M_IMM_OFF),		// OP_LDR_M_IMM_OFF
+/* 0101 0001 0001 */ TABDECL(OP_LDR_M_IMM_OFF),		// OP_LDR_M_IMM_OFF
+/* 0101 0001 0010 */ TABDECL(OP_LDR_M_IMM_OFF),		// OP_LDR_M_IMM_OFF
+/* 0101 0001 0011 */ TABDECL(OP_LDR_M_IMM_OFF),		// OP_LDR_M_IMM_OFF
+/* 0101 0001 0100 */ TABDECL(OP_LDR_M_IMM_OFF),		// OP_LDR_M_IMM_OFF
+/* 0101 0001 0101 */ TABDECL(OP_LDR_M_IMM_OFF),		// OP_LDR_M_IMM_OFF
+/* 0101 0001 0110 */ TABDECL(OP_LDR_M_IMM_OFF),		// OP_LDR_M_IMM_OFF
+/* 0101 0001 0111 */ TABDECL(OP_LDR_M_IMM_OFF),		// OP_LDR_M_IMM_OFF
+/* 0101 0001 1000 */ TABDECL(OP_LDR_M_IMM_OFF),		// OP_LDR_M_IMM_OFF
+/* 0101 0001 1001 */ TABDECL(OP_LDR_M_IMM_OFF),		// OP_LDR_M_IMM_OFF
+/* 0101 0001 1010 */ TABDECL(OP_LDR_M_IMM_OFF),		// OP_LDR_M_IMM_OFF
+/* 0101 0001 1011 */ TABDECL(OP_LDR_M_IMM_OFF),		// OP_LDR_M_IMM_OFF
+/* 0101 0001 1100 */ TABDECL(OP_LDR_M_IMM_OFF),		// OP_LDR_M_IMM_OFF
+/* 0101 0001 1101 */ TABDECL(OP_LDR_M_IMM_OFF),		// OP_LDR_M_IMM_OFF
+/* 0101 0001 1110 */ TABDECL(OP_LDR_M_IMM_OFF),		// OP_LDR_M_IMM_OFF
+/* 0101 0001 1111 */ TABDECL(OP_LDR_M_IMM_OFF),		// OP_LDR_M_IMM_OFF
+
+/* 0101 0010 0000 */ TABDECL(OP_STR_M_IMM_OFF_PREIND),		// OP_STR_M_IMM_OFF_PREIND
+/* 0101 0010 0001 */ TABDECL(OP_STR_M_IMM_OFF_PREIND),		// OP_STR_M_IMM_OFF_PREIND
+/* 0101 0010 0010 */ TABDECL(OP_STR_M_IMM_OFF_PREIND),		// OP_STR_M_IMM_OFF_PREIND
+/* 0101 0010 0011 */ TABDECL(OP_STR_M_IMM_OFF_PREIND),		// OP_STR_M_IMM_OFF_PREIND
+/* 0101 0010 0100 */ TABDECL(OP_STR_M_IMM_OFF_PREIND),		// OP_STR_M_IMM_OFF_PREIND
+/* 0101 0010 0101 */ TABDECL(OP_STR_M_IMM_OFF_PREIND),		// OP_STR_M_IMM_OFF_PREIND
+/* 0101 0010 0110 */ TABDECL(OP_STR_M_IMM_OFF_PREIND),		// OP_STR_M_IMM_OFF_PREIND
+/* 0101 0010 0111 */ TABDECL(OP_STR_M_IMM_OFF_PREIND),		// OP_STR_M_IMM_OFF_PREIND
+/* 0101 0010 1000 */ TABDECL(OP_STR_M_IMM_OFF_PREIND),		// OP_STR_M_IMM_OFF_PREIND
+/* 0101 0010 1001 */ TABDECL(OP_STR_M_IMM_OFF_PREIND),		// OP_STR_M_IMM_OFF_PREIND
+/* 0101 0010 1010 */ TABDECL(OP_STR_M_IMM_OFF_PREIND),		// OP_STR_M_IMM_OFF_PREIND
+/* 0101 0010 1011 */ TABDECL(OP_STR_M_IMM_OFF_PREIND),		// OP_STR_M_IMM_OFF_PREIND
+/* 0101 0010 1100 */ TABDECL(OP_STR_M_IMM_OFF_PREIND),		// OP_STR_M_IMM_OFF_PREIND
+/* 0101 0010 1101 */ TABDECL(OP_STR_M_IMM_OFF_PREIND),		// OP_STR_M_IMM_OFF_PREIND
+/* 0101 0010 1110 */ TABDECL(OP_STR_M_IMM_OFF_PREIND),		// OP_STR_M_IMM_OFF_PREIND
+/* 0101 0010 1111 */ TABDECL(OP_STR_M_IMM_OFF_PREIND),		// OP_STR_M_IMM_OFF_PREIND
+
+/* 0101 0011 0000 */ TABDECL(OP_LDR_M_IMM_OFF_PREIND),		// OP_LDR_M_IMM_OFF_PREIND
+/* 0101 0011 0001 */ TABDECL(OP_LDR_M_IMM_OFF_PREIND),		// OP_LDR_M_IMM_OFF_PREIND
+/* 0101 0011 0010 */ TABDECL(OP_LDR_M_IMM_OFF_PREIND),		// OP_LDR_M_IMM_OFF_PREIND
+/* 0101 0011 0011 */ TABDECL(OP_LDR_M_IMM_OFF_PREIND),		// OP_LDR_M_IMM_OFF_PREIND
+/* 0101 0011 0100 */ TABDECL(OP_LDR_M_IMM_OFF_PREIND),		// OP_LDR_M_IMM_OFF_PREIND
+/* 0101 0011 0101 */ TABDECL(OP_LDR_M_IMM_OFF_PREIND),		// OP_LDR_M_IMM_OFF_PREIND
+/* 0101 0011 0110 */ TABDECL(OP_LDR_M_IMM_OFF_PREIND),		// OP_LDR_M_IMM_OFF_PREIND
+/* 0101 0011 0111 */ TABDECL(OP_LDR_M_IMM_OFF_PREIND),		// OP_LDR_M_IMM_OFF_PREIND
+/* 0101 0011 1000 */ TABDECL(OP_LDR_M_IMM_OFF_PREIND),		// OP_LDR_M_IMM_OFF_PREIND
+/* 0101 0011 1001 */ TABDECL(OP_LDR_M_IMM_OFF_PREIND),		// OP_LDR_M_IMM_OFF_PREIND
+/* 0101 0011 1010 */ TABDECL(OP_LDR_M_IMM_OFF_PREIND),		// OP_LDR_M_IMM_OFF_PREIND
+/* 0101 0011 1011 */ TABDECL(OP_LDR_M_IMM_OFF_PREIND),		// OP_LDR_M_IMM_OFF_PREIND
+/* 0101 0011 1100 */ TABDECL(OP_LDR_M_IMM_OFF_PREIND),		// OP_LDR_M_IMM_OFF_PREIND
+/* 0101 0011 1101 */ TABDECL(OP_LDR_M_IMM_OFF_PREIND),		// OP_LDR_M_IMM_OFF_PREIND
+/* 0101 0011 1110 */ TABDECL(OP_LDR_M_IMM_OFF_PREIND),		// OP_LDR_M_IMM_OFF_PREIND
+/* 0101 0011 1111 */ TABDECL(OP_LDR_M_IMM_OFF_PREIND),		// OP_LDR_M_IMM_OFF_PREIND
+
+/* 0101 0100 0000 */ TABDECL(OP_STRB_M_IMM_OFF),		// OP_STRB_M_IMM_OFF
+/* 0101 0100 0001 */ TABDECL(OP_STRB_M_IMM_OFF),		// OP_STRB_M_IMM_OFF
+/* 0101 0100 0010 */ TABDECL(OP_STRB_M_IMM_OFF),		// OP_STRB_M_IMM_OFF
+/* 0101 0100 0011 */ TABDECL(OP_STRB_M_IMM_OFF),		// OP_STRB_M_IMM_OFF
+/* 0101 0100 0100 */ TABDECL(OP_STRB_M_IMM_OFF),		// OP_STRB_M_IMM_OFF
+/* 0101 0100 0101 */ TABDECL(OP_STRB_M_IMM_OFF),		// OP_STRB_M_IMM_OFF
+/* 0101 0100 0110 */ TABDECL(OP_STRB_M_IMM_OFF),		// OP_STRB_M_IMM_OFF
+/* 0101 0100 0111 */ TABDECL(OP_STRB_M_IMM_OFF),		// OP_STRB_M_IMM_OFF
+/* 0101 0100 1000 */ TABDECL(OP_STRB_M_IMM_OFF),		// OP_STRB_M_IMM_OFF
+/* 0101 0100 1001 */ TABDECL(OP_STRB_M_IMM_OFF),		// OP_STRB_M_IMM_OFF
+/* 0101 0100 1010 */ TABDECL(OP_STRB_M_IMM_OFF),		// OP_STRB_M_IMM_OFF
+/* 0101 0100 1011 */ TABDECL(OP_STRB_M_IMM_OFF),		// OP_STRB_M_IMM_OFF
+/* 0101 0100 1100 */ TABDECL(OP_STRB_M_IMM_OFF),		// OP_STRB_M_IMM_OFF
+/* 0101 0100 1101 */ TABDECL(OP_STRB_M_IMM_OFF),		// OP_STRB_M_IMM_OFF
+/* 0101 0100 1110 */ TABDECL(OP_STRB_M_IMM_OFF),		// OP_STRB_M_IMM_OFF
+/* 0101 0100 1111 */ TABDECL(OP_STRB_M_IMM_OFF),		// OP_STRB_M_IMM_OFF
+
+/* 0101 0101 0000 */ TABDECL(OP_LDRB_M_IMM_OFF),		// OP_LDRB_M_IMM_OFF
+/* 0101 0101 0001 */ TABDECL(OP_LDRB_M_IMM_OFF),		// OP_LDRB_M_IMM_OFF
+/* 0101 0101 0010 */ TABDECL(OP_LDRB_M_IMM_OFF),		// OP_LDRB_M_IMM_OFF
+/* 0101 0101 0011 */ TABDECL(OP_LDRB_M_IMM_OFF),		// OP_LDRB_M_IMM_OFF
+/* 0101 0101 0100 */ TABDECL(OP_LDRB_M_IMM_OFF),		// OP_LDRB_M_IMM_OFF
+/* 0101 0101 0101 */ TABDECL(OP_LDRB_M_IMM_OFF),		// OP_LDRB_M_IMM_OFF
+/* 0101 0101 0110 */ TABDECL(OP_LDRB_M_IMM_OFF),		// OP_LDRB_M_IMM_OFF
+/* 0101 0101 0111 */ TABDECL(OP_LDRB_M_IMM_OFF),		// OP_LDRB_M_IMM_OFF
+/* 0101 0101 1000 */ TABDECL(OP_LDRB_M_IMM_OFF),		// OP_LDRB_M_IMM_OFF
+/* 0101 0101 1001 */ TABDECL(OP_LDRB_M_IMM_OFF),		// OP_LDRB_M_IMM_OFF
+/* 0101 0101 1010 */ TABDECL(OP_LDRB_M_IMM_OFF),		// OP_LDRB_M_IMM_OFF
+/* 0101 0101 1011 */ TABDECL(OP_LDRB_M_IMM_OFF),		// OP_LDRB_M_IMM_OFF
+/* 0101 0101 1100 */ TABDECL(OP_LDRB_M_IMM_OFF),		// OP_LDRB_M_IMM_OFF
+/* 0101 0101 1101 */ TABDECL(OP_LDRB_M_IMM_OFF),		// OP_LDRB_M_IMM_OFF
+/* 0101 0101 1110 */ TABDECL(OP_LDRB_M_IMM_OFF),		// OP_LDRB_M_IMM_OFF
+/* 0101 0101 1111 */ TABDECL(OP_LDRB_M_IMM_OFF),		// OP_LDRB_M_IMM_OFF
+
+/* 0101 0110 0000 */ TABDECL(OP_STRB_M_IMM_OFF_PREIND),		// OP_STRB_M_IMM_OFF_PREIND
+/* 0101 0110 0001 */ TABDECL(OP_STRB_M_IMM_OFF_PREIND),		// OP_STRB_M_IMM_OFF_PREIND
+/* 0101 0110 0010 */ TABDECL(OP_STRB_M_IMM_OFF_PREIND),		// OP_STRB_M_IMM_OFF_PREIND
+/* 0101 0110 0011 */ TABDECL(OP_STRB_M_IMM_OFF_PREIND),		// OP_STRB_M_IMM_OFF_PREIND
+/* 0101 0110 0100 */ TABDECL(OP_STRB_M_IMM_OFF_PREIND),		// OP_STRB_M_IMM_OFF_PREIND
+/* 0101 0110 0101 */ TABDECL(OP_STRB_M_IMM_OFF_PREIND),		// OP_STRB_M_IMM_OFF_PREIND
+/* 0101 0110 0110 */ TABDECL(OP_STRB_M_IMM_OFF_PREIND),		// OP_STRB_M_IMM_OFF_PREIND
+/* 0101 0110 0111 */ TABDECL(OP_STRB_M_IMM_OFF_PREIND),		// OP_STRB_M_IMM_OFF_PREIND
+/* 0101 0110 1000 */ TABDECL(OP_STRB_M_IMM_OFF_PREIND),		// OP_STRB_M_IMM_OFF_PREIND
+/* 0101 0110 1001 */ TABDECL(OP_STRB_M_IMM_OFF_PREIND),		// OP_STRB_M_IMM_OFF_PREIND
+/* 0101 0110 1010 */ TABDECL(OP_STRB_M_IMM_OFF_PREIND),		// OP_STRB_M_IMM_OFF_PREIND
+/* 0101 0110 1011 */ TABDECL(OP_STRB_M_IMM_OFF_PREIND),		// OP_STRB_M_IMM_OFF_PREIND
+/* 0101 0110 1100 */ TABDECL(OP_STRB_M_IMM_OFF_PREIND),		// OP_STRB_M_IMM_OFF_PREIND
+/* 0101 0110 1101 */ TABDECL(OP_STRB_M_IMM_OFF_PREIND),		// OP_STRB_M_IMM_OFF_PREIND
+/* 0101 0110 1110 */ TABDECL(OP_STRB_M_IMM_OFF_PREIND),		// OP_STRB_M_IMM_OFF_PREIND
+/* 0101 0110 1111 */ TABDECL(OP_STRB_M_IMM_OFF_PREIND),		// OP_STRB_M_IMM_OFF_PREIND
+
+/* 0101 0111 0000 */ TABDECL(OP_LDRB_M_IMM_OFF_PREIND),		// OP_LDRB_M_IMM_OFF_PREIND
+/* 0101 0111 0001 */ TABDECL(OP_LDRB_M_IMM_OFF_PREIND),		// OP_LDRB_M_IMM_OFF_PREIND
+/* 0101 0111 0010 */ TABDECL(OP_LDRB_M_IMM_OFF_PREIND),		// OP_LDRB_M_IMM_OFF_PREIND
+/* 0101 0111 0011 */ TABDECL(OP_LDRB_M_IMM_OFF_PREIND),		// OP_LDRB_M_IMM_OFF_PREIND
+/* 0101 0111 0100 */ TABDECL(OP_LDRB_M_IMM_OFF_PREIND),		// OP_LDRB_M_IMM_OFF_PREIND
+/* 0101 0111 0101 */ TABDECL(OP_LDRB_M_IMM_OFF_PREIND),		// OP_LDRB_M_IMM_OFF_PREIND
+/* 0101 0111 0110 */ TABDECL(OP_LDRB_M_IMM_OFF_PREIND),		// OP_LDRB_M_IMM_OFF_PREIND
+/* 0101 0111 0111 */ TABDECL(OP_LDRB_M_IMM_OFF_PREIND),		// OP_LDRB_M_IMM_OFF_PREIND
+/* 0101 0111 1000 */ TABDECL(OP_LDRB_M_IMM_OFF_PREIND),		// OP_LDRB_M_IMM_OFF_PREIND
+/* 0101 0111 1001 */ TABDECL(OP_LDRB_M_IMM_OFF_PREIND),		// OP_LDRB_M_IMM_OFF_PREIND
+/* 0101 0111 1010 */ TABDECL(OP_LDRB_M_IMM_OFF_PREIND),		// OP_LDRB_M_IMM_OFF_PREIND
+/* 0101 0111 1011 */ TABDECL(OP_LDRB_M_IMM_OFF_PREIND),		// OP_LDRB_M_IMM_OFF_PREIND
+/* 0101 0111 1100 */ TABDECL(OP_LDRB_M_IMM_OFF_PREIND),		// OP_LDRB_M_IMM_OFF_PREIND
+/* 0101 0111 1101 */ TABDECL(OP_LDRB_M_IMM_OFF_PREIND),		// OP_LDRB_M_IMM_OFF_PREIND
+/* 0101 0111 1110 */ TABDECL(OP_LDRB_M_IMM_OFF_PREIND),		// OP_LDRB_M_IMM_OFF_PREIND
+/* 0101 0111 1111 */ TABDECL(OP_LDRB_M_IMM_OFF_PREIND),		// OP_LDRB_M_IMM_OFF_PREIND
+
+/* 0101 1000 0000 */ TABDECL(OP_STR_P_IMM_OFF),		// OP_STR_P_IMM_OFF
+/* 0101 1000 0001 */ TABDECL(OP_STR_P_IMM_OFF),		// OP_STR_P_IMM_OFF
+/* 0101 1000 0010 */ TABDECL(OP_STR_P_IMM_OFF),		// OP_STR_P_IMM_OFF
+/* 0101 1000 0011 */ TABDECL(OP_STR_P_IMM_OFF),		// OP_STR_P_IMM_OFF
+/* 0101 1000 0100 */ TABDECL(OP_STR_P_IMM_OFF),		// OP_STR_P_IMM_OFF
+/* 0101 1000 0101 */ TABDECL(OP_STR_P_IMM_OFF),		// OP_STR_P_IMM_OFF
+/* 0101 1000 0110 */ TABDECL(OP_STR_P_IMM_OFF),		// OP_STR_P_IMM_OFF
+/* 0101 1000 0111 */ TABDECL(OP_STR_P_IMM_OFF),		// OP_STR_P_IMM_OFF
+/* 0101 1000 1000 */ TABDECL(OP_STR_P_IMM_OFF),		// OP_STR_P_IMM_OFF
+/* 0101 1000 1001 */ TABDECL(OP_STR_P_IMM_OFF),		// OP_STR_P_IMM_OFF
+/* 0101 1000 1010 */ TABDECL(OP_STR_P_IMM_OFF),		// OP_STR_P_IMM_OFF
+/* 0101 1000 1011 */ TABDECL(OP_STR_P_IMM_OFF),		// OP_STR_P_IMM_OFF
+/* 0101 1000 1100 */ TABDECL(OP_STR_P_IMM_OFF),		// OP_STR_P_IMM_OFF
+/* 0101 1000 1101 */ TABDECL(OP_STR_P_IMM_OFF),		// OP_STR_P_IMM_OFF
+/* 0101 1000 1110 */ TABDECL(OP_STR_P_IMM_OFF),		// OP_STR_P_IMM_OFF
+/* 0101 1000 1111 */ TABDECL(OP_STR_P_IMM_OFF),		// OP_STR_P_IMM_OFF
+
+/* 0101 1001 0000 */ TABDECL(OP_LDR_P_IMM_OFF),		// OP_LDR_P_IMM_OFF
+/* 0101 1001 0001 */ TABDECL(OP_LDR_P_IMM_OFF),		// OP_LDR_P_IMM_OFF
+/* 0101 1001 0010 */ TABDECL(OP_LDR_P_IMM_OFF),		// OP_LDR_P_IMM_OFF
+/* 0101 1001 0011 */ TABDECL(OP_LDR_P_IMM_OFF),		// OP_LDR_P_IMM_OFF
+/* 0101 1001 0100 */ TABDECL(OP_LDR_P_IMM_OFF),		// OP_LDR_P_IMM_OFF
+/* 0101 1001 0101 */ TABDECL(OP_LDR_P_IMM_OFF),		// OP_LDR_P_IMM_OFF
+/* 0101 1001 0110 */ TABDECL(OP_LDR_P_IMM_OFF),		// OP_LDR_P_IMM_OFF
+/* 0101 1001 0111 */ TABDECL(OP_LDR_P_IMM_OFF),		// OP_LDR_P_IMM_OFF
+/* 0101 1001 1000 */ TABDECL(OP_LDR_P_IMM_OFF),		// OP_LDR_P_IMM_OFF
+/* 0101 1001 1001 */ TABDECL(OP_LDR_P_IMM_OFF),		// OP_LDR_P_IMM_OFF
+/* 0101 1001 1010 */ TABDECL(OP_LDR_P_IMM_OFF),		// OP_LDR_P_IMM_OFF
+/* 0101 1001 1011 */ TABDECL(OP_LDR_P_IMM_OFF),		// OP_LDR_P_IMM_OFF
+/* 0101 1001 1100 */ TABDECL(OP_LDR_P_IMM_OFF),		// OP_LDR_P_IMM_OFF
+/* 0101 1001 1101 */ TABDECL(OP_LDR_P_IMM_OFF),		// OP_LDR_P_IMM_OFF
+/* 0101 1001 1110 */ TABDECL(OP_LDR_P_IMM_OFF),		// OP_LDR_P_IMM_OFF
+/* 0101 1001 1111 */ TABDECL(OP_LDR_P_IMM_OFF),		// OP_LDR_P_IMM_OFF
+
+/* 0101 1010 0000 */ TABDECL(OP_STR_P_IMM_OFF_PREIND),		// OP_STR_P_IMM_OFF_PREIND
+/* 0101 1010 0001 */ TABDECL(OP_STR_P_IMM_OFF_PREIND),		// OP_STR_P_IMM_OFF_PREIND
+/* 0101 1010 0010 */ TABDECL(OP_STR_P_IMM_OFF_PREIND),		// OP_STR_P_IMM_OFF_PREIND
+/* 0101 1010 0011 */ TABDECL(OP_STR_P_IMM_OFF_PREIND),		// OP_STR_P_IMM_OFF_PREIND
+/* 0101 1010 0100 */ TABDECL(OP_STR_P_IMM_OFF_PREIND),		// OP_STR_P_IMM_OFF_PREIND
+/* 0101 1010 0101 */ TABDECL(OP_STR_P_IMM_OFF_PREIND),		// OP_STR_P_IMM_OFF_PREIND
+/* 0101 1010 0110 */ TABDECL(OP_STR_P_IMM_OFF_PREIND),		// OP_STR_P_IMM_OFF_PREIND
+/* 0101 1010 0111 */ TABDECL(OP_STR_P_IMM_OFF_PREIND),		// OP_STR_P_IMM_OFF_PREIND
+/* 0101 1010 1000 */ TABDECL(OP_STR_P_IMM_OFF_PREIND),		// OP_STR_P_IMM_OFF_PREIND
+/* 0101 1010 1001 */ TABDECL(OP_STR_P_IMM_OFF_PREIND),		// OP_STR_P_IMM_OFF_PREIND
+/* 0101 1010 1010 */ TABDECL(OP_STR_P_IMM_OFF_PREIND),		// OP_STR_P_IMM_OFF_PREIND
+/* 0101 1010 1011 */ TABDECL(OP_STR_P_IMM_OFF_PREIND),		// OP_STR_P_IMM_OFF_PREIND
+/* 0101 1010 1100 */ TABDECL(OP_STR_P_IMM_OFF_PREIND),		// OP_STR_P_IMM_OFF_PREIND
+/* 0101 1010 1101 */ TABDECL(OP_STR_P_IMM_OFF_PREIND),		// OP_STR_P_IMM_OFF_PREIND
+/* 0101 1010 1110 */ TABDECL(OP_STR_P_IMM_OFF_PREIND),		// OP_STR_P_IMM_OFF_PREIND
+/* 0101 1010 1111 */ TABDECL(OP_STR_P_IMM_OFF_PREIND),		// OP_STR_P_IMM_OFF_PREIND
+
+/* 0101 1011 0000 */ TABDECL(OP_LDR_P_IMM_OFF_PREIND),		// OP_LDR_P_IMM_OFF_PREIND
+/* 0101 1011 0001 */ TABDECL(OP_LDR_P_IMM_OFF_PREIND),		// OP_LDR_P_IMM_OFF_PREIND
+/* 0101 1011 0010 */ TABDECL(OP_LDR_P_IMM_OFF_PREIND),		// OP_LDR_P_IMM_OFF_PREIND
+/* 0101 1011 0011 */ TABDECL(OP_LDR_P_IMM_OFF_PREIND),		// OP_LDR_P_IMM_OFF_PREIND
+/* 0101 1011 0100 */ TABDECL(OP_LDR_P_IMM_OFF_PREIND),		// OP_LDR_P_IMM_OFF_PREIND
+/* 0101 1011 0101 */ TABDECL(OP_LDR_P_IMM_OFF_PREIND),		// OP_LDR_P_IMM_OFF_PREIND
+/* 0101 1011 0110 */ TABDECL(OP_LDR_P_IMM_OFF_PREIND),		// OP_LDR_P_IMM_OFF_PREIND
+/* 0101 1011 0111 */ TABDECL(OP_LDR_P_IMM_OFF_PREIND),		// OP_LDR_P_IMM_OFF_PREIND
+/* 0101 1011 1000 */ TABDECL(OP_LDR_P_IMM_OFF_PREIND),		// OP_LDR_P_IMM_OFF_PREIND
+/* 0101 1011 1001 */ TABDECL(OP_LDR_P_IMM_OFF_PREIND),		// OP_LDR_P_IMM_OFF_PREIND
+/* 0101 1011 1010 */ TABDECL(OP_LDR_P_IMM_OFF_PREIND),		// OP_LDR_P_IMM_OFF_PREIND
+/* 0101 1011 1011 */ TABDECL(OP_LDR_P_IMM_OFF_PREIND),		// OP_LDR_P_IMM_OFF_PREIND
+/* 0101 1011 1100 */ TABDECL(OP_LDR_P_IMM_OFF_PREIND),		// OP_LDR_P_IMM_OFF_PREIND
+/* 0101 1011 1101 */ TABDECL(OP_LDR_P_IMM_OFF_PREIND),		// OP_LDR_P_IMM_OFF_PREIND
+/* 0101 1011 1110 */ TABDECL(OP_LDR_P_IMM_OFF_PREIND),		// OP_LDR_P_IMM_OFF_PREIND
+/* 0101 1011 1111 */ TABDECL(OP_LDR_P_IMM_OFF_PREIND),		// OP_LDR_P_IMM_OFF_PREIND
+
+/* 0101 1100 0000 */ TABDECL(OP_STRB_P_IMM_OFF),		// OP_STRB_P_IMM_OFF
+/* 0101 1100 0001 */ TABDECL(OP_STRB_P_IMM_OFF),		// OP_STRB_P_IMM_OFF
+/* 0101 1100 0010 */ TABDECL(OP_STRB_P_IMM_OFF),		// OP_STRB_P_IMM_OFF
+/* 0101 1100 0011 */ TABDECL(OP_STRB_P_IMM_OFF),		// OP_STRB_P_IMM_OFF
+/* 0101 1100 0100 */ TABDECL(OP_STRB_P_IMM_OFF),		// OP_STRB_P_IMM_OFF
+/* 0101 1100 0101 */ TABDECL(OP_STRB_P_IMM_OFF),		// OP_STRB_P_IMM_OFF
+/* 0101 1100 0110 */ TABDECL(OP_STRB_P_IMM_OFF),		// OP_STRB_P_IMM_OFF
+/* 0101 1100 0111 */ TABDECL(OP_STRB_P_IMM_OFF),		// OP_STRB_P_IMM_OFF
+/* 0101 1100 1000 */ TABDECL(OP_STRB_P_IMM_OFF),		// OP_STRB_P_IMM_OFF
+/* 0101 1100 1001 */ TABDECL(OP_STRB_P_IMM_OFF),		// OP_STRB_P_IMM_OFF
+/* 0101 1100 1010 */ TABDECL(OP_STRB_P_IMM_OFF),		// OP_STRB_P_IMM_OFF
+/* 0101 1100 1011 */ TABDECL(OP_STRB_P_IMM_OFF),		// OP_STRB_P_IMM_OFF
+/* 0101 1100 1100 */ TABDECL(OP_STRB_P_IMM_OFF),		// OP_STRB_P_IMM_OFF
+/* 0101 1100 1101 */ TABDECL(OP_STRB_P_IMM_OFF),		// OP_STRB_P_IMM_OFF
+/* 0101 1100 1110 */ TABDECL(OP_STRB_P_IMM_OFF),		// OP_STRB_P_IMM_OFF
+/* 0101 1100 1111 */ TABDECL(OP_STRB_P_IMM_OFF),		// OP_STRB_P_IMM_OFF
+
+/* 0101 1101 0000 */ TABDECL(OP_LDRB_P_IMM_OFF),		// OP_LDRB_P_IMM_OFF
+/* 0101 1101 0001 */ TABDECL(OP_LDRB_P_IMM_OFF),		// OP_LDRB_P_IMM_OFF
+/* 0101 1101 0010 */ TABDECL(OP_LDRB_P_IMM_OFF),		// OP_LDRB_P_IMM_OFF
+/* 0101 1101 0011 */ TABDECL(OP_LDRB_P_IMM_OFF),		// OP_LDRB_P_IMM_OFF
+/* 0101 1101 0100 */ TABDECL(OP_LDRB_P_IMM_OFF),		// OP_LDRB_P_IMM_OFF
+/* 0101 1101 0101 */ TABDECL(OP_LDRB_P_IMM_OFF),		// OP_LDRB_P_IMM_OFF
+/* 0101 1101 0110 */ TABDECL(OP_LDRB_P_IMM_OFF),		// OP_LDRB_P_IMM_OFF
+/* 0101 1101 0111 */ TABDECL(OP_LDRB_P_IMM_OFF),		// OP_LDRB_P_IMM_OFF
+/* 0101 1101 1000 */ TABDECL(OP_LDRB_P_IMM_OFF),		// OP_LDRB_P_IMM_OFF
+/* 0101 1101 1001 */ TABDECL(OP_LDRB_P_IMM_OFF),		// OP_LDRB_P_IMM_OFF
+/* 0101 1101 1010 */ TABDECL(OP_LDRB_P_IMM_OFF),		// OP_LDRB_P_IMM_OFF
+/* 0101 1101 1011 */ TABDECL(OP_LDRB_P_IMM_OFF),		// OP_LDRB_P_IMM_OFF
+/* 0101 1101 1100 */ TABDECL(OP_LDRB_P_IMM_OFF),		// OP_LDRB_P_IMM_OFF
+/* 0101 1101 1101 */ TABDECL(OP_LDRB_P_IMM_OFF),		// OP_LDRB_P_IMM_OFF
+/* 0101 1101 1110 */ TABDECL(OP_LDRB_P_IMM_OFF),		// OP_LDRB_P_IMM_OFF
+/* 0101 1101 1111 */ TABDECL(OP_LDRB_P_IMM_OFF),		// OP_LDRB_P_IMM_OFF
+
+/* 0101 1110 0000 */ TABDECL(OP_STRB_P_IMM_OFF_PREIND),		// OP_STRB_P_IMM_OFF_PREIND
+/* 0101 1110 0001 */ TABDECL(OP_STRB_P_IMM_OFF_PREIND),		// OP_STRB_P_IMM_OFF_PREIND
+/* 0101 1110 0010 */ TABDECL(OP_STRB_P_IMM_OFF_PREIND),		// OP_STRB_P_IMM_OFF_PREIND
+/* 0101 1110 0011 */ TABDECL(OP_STRB_P_IMM_OFF_PREIND),		// OP_STRB_P_IMM_OFF_PREIND
+/* 0101 1110 0100 */ TABDECL(OP_STRB_P_IMM_OFF_PREIND),		// OP_STRB_P_IMM_OFF_PREIND
+/* 0101 1110 0101 */ TABDECL(OP_STRB_P_IMM_OFF_PREIND),		// OP_STRB_P_IMM_OFF_PREIND
+/* 0101 1110 0110 */ TABDECL(OP_STRB_P_IMM_OFF_PREIND),		// OP_STRB_P_IMM_OFF_PREIND
+/* 0101 1110 0111 */ TABDECL(OP_STRB_P_IMM_OFF_PREIND),		// OP_STRB_P_IMM_OFF_PREIND
+/* 0101 1110 1000 */ TABDECL(OP_STRB_P_IMM_OFF_PREIND),		// OP_STRB_P_IMM_OFF_PREIND
+/* 0101 1110 1001 */ TABDECL(OP_STRB_P_IMM_OFF_PREIND),		// OP_STRB_P_IMM_OFF_PREIND
+/* 0101 1110 1010 */ TABDECL(OP_STRB_P_IMM_OFF_PREIND),		// OP_STRB_P_IMM_OFF_PREIND
+/* 0101 1110 1011 */ TABDECL(OP_STRB_P_IMM_OFF_PREIND),		// OP_STRB_P_IMM_OFF_PREIND
+/* 0101 1110 1100 */ TABDECL(OP_STRB_P_IMM_OFF_PREIND),		// OP_STRB_P_IMM_OFF_PREIND
+/* 0101 1110 1101 */ TABDECL(OP_STRB_P_IMM_OFF_PREIND),		// OP_STRB_P_IMM_OFF_PREIND
+/* 0101 1110 1110 */ TABDECL(OP_STRB_P_IMM_OFF_PREIND),		// OP_STRB_P_IMM_OFF_PREIND
+/* 0101 1110 1111 */ TABDECL(OP_STRB_P_IMM_OFF_PREIND),		// OP_STRB_P_IMM_OFF_PREIND
+
+/* 0101 1111 0000 */ TABDECL(OP_LDRB_P_IMM_OFF_PREIND),		// OP_LDRB_P_IMM_OFF_PREIND
+/* 0101 1111 0001 */ TABDECL(OP_LDRB_P_IMM_OFF_PREIND),		// OP_LDRB_P_IMM_OFF_PREIND
+/* 0101 1111 0010 */ TABDECL(OP_LDRB_P_IMM_OFF_PREIND),		// OP_LDRB_P_IMM_OFF_PREIND
+/* 0101 1111 0011 */ TABDECL(OP_LDRB_P_IMM_OFF_PREIND),		// OP_LDRB_P_IMM_OFF_PREIND
+/* 0101 1111 0100 */ TABDECL(OP_LDRB_P_IMM_OFF_PREIND),		// OP_LDRB_P_IMM_OFF_PREIND
+/* 0101 1111 0101 */ TABDECL(OP_LDRB_P_IMM_OFF_PREIND),		// OP_LDRB_P_IMM_OFF_PREIND
+/* 0101 1111 0110 */ TABDECL(OP_LDRB_P_IMM_OFF_PREIND),		// OP_LDRB_P_IMM_OFF_PREIND
+/* 0101 1111 0111 */ TABDECL(OP_LDRB_P_IMM_OFF_PREIND),		// OP_LDRB_P_IMM_OFF_PREIND
+/* 0101 1111 1000 */ TABDECL(OP_LDRB_P_IMM_OFF_PREIND),		// OP_LDRB_P_IMM_OFF_PREIND
+/* 0101 1111 1001 */ TABDECL(OP_LDRB_P_IMM_OFF_PREIND),		// OP_LDRB_P_IMM_OFF_PREIND
+/* 0101 1111 1010 */ TABDECL(OP_LDRB_P_IMM_OFF_PREIND),		// OP_LDRB_P_IMM_OFF_PREIND
+/* 0101 1111 1011 */ TABDECL(OP_LDRB_P_IMM_OFF_PREIND),		// OP_LDRB_P_IMM_OFF_PREIND
+/* 0101 1111 1100 */ TABDECL(OP_LDRB_P_IMM_OFF_PREIND),		// OP_LDRB_P_IMM_OFF_PREIND
+/* 0101 1111 1101 */ TABDECL(OP_LDRB_P_IMM_OFF_PREIND),		// OP_LDRB_P_IMM_OFF_PREIND
+/* 0101 1111 1110 */ TABDECL(OP_LDRB_P_IMM_OFF_PREIND),		// OP_LDRB_P_IMM_OFF_PREIND
+/* 0101 1111 1111 */ TABDECL(OP_LDRB_P_IMM_OFF_PREIND),		// OP_LDRB_P_IMM_OFF_PREIND
+
+/* 0110 0000 0000 */ TABDECL(OP_STR_M_LSL_IMM_OFF_POSTIND),		// OP_STR_M_LSL_IMM_OFF_POSTIND
+/* 0110 0000 0001 */ TABDECL(OP_UND),
+/* 0110 0000 0010 */ TABDECL(OP_STR_M_LSR_IMM_OFF_POSTIND),		// OP_STR_M_LSR_IMM_OFF_POSTIND
+/* 0110 0000 0011 */ TABDECL(OP_UND),
+/* 0110 0000 0100 */ TABDECL(OP_STR_M_ASR_IMM_OFF_POSTIND),		// OP_STR_M_ASR_IMM_OFF_POSTIND
+/* 0110 0000 0101 */ TABDECL(OP_UND),
+/* 0110 0000 0110 */ TABDECL(OP_STR_M_ROR_IMM_OFF_POSTIND),		// OP_STR_M_ROR_IMM_OFF_POSTIND
+/* 0110 0000 0111 */ TABDECL(OP_UND),
+/* 0110 0000 1000 */ TABDECL(OP_STR_M_LSL_IMM_OFF_POSTIND),		// OP_STR_M_LSL_IMM_OFF_POSTIND
+/* 0110 0000 1001 */ TABDECL(OP_UND),
+/* 0110 0000 1010 */ TABDECL(OP_STR_M_LSR_IMM_OFF_POSTIND),		// OP_STR_M_LSR_IMM_OFF_POSTIND
+/* 0110 0000 1011 */ TABDECL(OP_UND),
+/* 0110 0000 1100 */ TABDECL(OP_STR_M_ASR_IMM_OFF_POSTIND),		// OP_STR_M_ASR_IMM_OFF_POSTIND
+/* 0110 0000 1101 */ TABDECL(OP_UND),
+/* 0110 0000 1110 */ TABDECL(OP_STR_M_ROR_IMM_OFF_POSTIND),		// OP_STR_M_ROR_IMM_OFF_POSTIND
+/* 0110 0000 1111 */ TABDECL(OP_UND),
+
+/* 0110 0001 0000 */ TABDECL(OP_LDR_M_LSL_IMM_OFF_POSTIND),		// OP_LDR_M_LSL_IMM_OFF_POSTIND
+/* 0110 0001 0001 */ TABDECL(OP_UND),
+/* 0110 0001 0010 */ TABDECL(OP_LDR_M_LSR_IMM_OFF_POSTIND),		// OP_LDR_M_LSR_IMM_OFF_POSTIND
+/* 0110 0001 0011 */ TABDECL(OP_UND),
+/* 0110 0001 0100 */ TABDECL(OP_LDR_M_ASR_IMM_OFF_POSTIND),		// OP_LDR_M_ASR_IMM_OFF_POSTIND
+/* 0110 0001 0101 */ TABDECL(OP_UND),
+/* 0110 0001 0110 */ TABDECL(OP_LDR_M_ROR_IMM_OFF_POSTIND),		// OP_LDR_M_ROR_IMM_OFF_POSTIND
+/* 0110 0001 0111 */ TABDECL(OP_UND),
+/* 0110 0001 1000 */ TABDECL(OP_LDR_M_LSL_IMM_OFF_POSTIND),		// OP_LDR_M_LSL_IMM_OFF_POSTIND
+/* 0110 0001 1001 */ TABDECL(OP_UND),
+/* 0110 0001 1010 */ TABDECL(OP_LDR_M_LSR_IMM_OFF_POSTIND),		// OP_LDR_M_LSR_IMM_OFF_POSTIND
+/* 0110 0001 1011 */ TABDECL(OP_UND),
+/* 0110 0001 1100 */ TABDECL(OP_LDR_M_ASR_IMM_OFF_POSTIND),		// OP_LDR_M_ASR_IMM_OFF_POSTIND
+/* 0110 0001 1101 */ TABDECL(OP_UND),
+/* 0110 0001 1110 */ TABDECL(OP_LDR_M_ROR_IMM_OFF_POSTIND),		// OP_LDR_M_ROR_IMM_OFF_POSTIND
+/* 0110 0001 1111 */ TABDECL(OP_UND),
+
+/* 0110 0010 0000 */ TABDECL(OP_STR_M_LSL_IMM_OFF_POSTIND),		// OP_STR_M_LSL_IMM_OFF_POSTIND
+/* 0110 0010 0001 */ TABDECL(OP_UND),
+/* 0110 0010 0010 */ TABDECL(OP_STR_M_LSR_IMM_OFF_POSTIND),		// OP_STR_M_LSR_IMM_OFF_POSTIND
+/* 0110 0010 0011 */ TABDECL(OP_UND),
+/* 0110 0010 0100 */ TABDECL(OP_STR_M_ASR_IMM_OFF_POSTIND),		// OP_STR_M_ASR_IMM_OFF_POSTIND
+/* 0110 0010 0101 */ TABDECL(OP_UND),
+/* 0110 0010 0110 */ TABDECL(OP_STR_M_ROR_IMM_OFF_POSTIND),		// OP_STR_M_ROR_IMM_OFF_POSTIND
+/* 0110 0010 0111 */ TABDECL(OP_UND),
+/* 0110 0010 1000 */ TABDECL(OP_STR_M_LSL_IMM_OFF_POSTIND),		// OP_STR_M_LSL_IMM_OFF_POSTIND
+/* 0110 0010 1001 */ TABDECL(OP_UND),
+/* 0110 0010 1010 */ TABDECL(OP_STR_M_LSR_IMM_OFF_POSTIND),		// OP_STR_M_LSR_IMM_OFF_POSTIND
+/* 0110 0010 1011 */ TABDECL(OP_UND),
+/* 0110 0010 1100 */ TABDECL(OP_STR_M_ASR_IMM_OFF_POSTIND),		// OP_STR_M_ASR_IMM_OFF_POSTIND
+/* 0110 0010 1101 */ TABDECL(OP_UND),
+/* 0110 0010 1110 */ TABDECL(OP_STR_M_ROR_IMM_OFF_POSTIND),		// OP_STR_M_ROR_IMM_OFF_POSTIND
+/* 0110 0010 1111 */ TABDECL(OP_UND),
+
+/* 0110 0011 0000 */ TABDECL(OP_LDR_M_LSL_IMM_OFF_POSTIND),		// OP_LDR_M_LSL_IMM_OFF_POSTIND
+/* 0110 0011 0001 */ TABDECL(OP_UND),
+/* 0110 0011 0010 */ TABDECL(OP_LDR_M_LSR_IMM_OFF_POSTIND),		// OP_LDR_M_LSR_IMM_OFF_POSTIND
+/* 0110 0011 0011 */ TABDECL(OP_UND),
+/* 0110 0011 0100 */ TABDECL(OP_LDR_M_ASR_IMM_OFF_POSTIND),		// OP_LDR_M_ASR_IMM_OFF_POSTIND
+/* 0110 0011 0101 */ TABDECL(OP_UND),
+/* 0110 0011 0110 */ TABDECL(OP_LDR_M_ROR_IMM_OFF_POSTIND),		// OP_LDR_M_ROR_IMM_OFF_POSTIND
+/* 0110 0011 0111 */ TABDECL(OP_UND),
+/* 0110 0011 1000 */ TABDECL(OP_LDR_M_LSL_IMM_OFF_POSTIND),		// OP_LDR_M_LSL_IMM_OFF_POSTIND
+/* 0110 0011 1001 */ TABDECL(OP_UND),
+/* 0110 0011 1010 */ TABDECL(OP_LDR_M_LSR_IMM_OFF_POSTIND),		// OP_LDR_M_LSR_IMM_OFF_POSTIND
+/* 0110 0011 1011 */ TABDECL(OP_UND),
+/* 0110 0011 1100 */ TABDECL(OP_LDR_M_ASR_IMM_OFF_POSTIND),		// OP_LDR_M_ASR_IMM_OFF_POSTIND
+/* 0110 0011 1101 */ TABDECL(OP_UND),
+/* 0110 0011 1110 */ TABDECL(OP_LDR_M_ROR_IMM_OFF_POSTIND),		// OP_LDR_M_ROR_IMM_OFF_POSTIND
+/* 0110 0011 1111 */ TABDECL(OP_UND),
+
+/* 0110 0100 0000 */ TABDECL(OP_STRB_M_LSL_IMM_OFF_POSTIND),		// OP_STRB_M_LSL_IMM_OFF_POSTIND
+/* 0110 0100 0001 */ TABDECL(OP_UND),
+/* 0110 0100 0010 */ TABDECL(OP_STRB_M_LSR_IMM_OFF_POSTIND),		// OP_STRB_M_LSR_IMM_OFF_POSTIND
+/* 0110 0100 0011 */ TABDECL(OP_UND),
+/* 0110 0100 0100 */ TABDECL(OP_STRB_M_ASR_IMM_OFF_POSTIND),		// OP_STRB_M_ASR_IMM_OFF_POSTIND
+/* 0110 0100 0101 */ TABDECL(OP_UND),
+/* 0110 0100 0110 */ TABDECL(OP_STRB_M_ROR_IMM_OFF_POSTIND),		// OP_STRB_M_ROR_IMM_OFF_POSTIND
+/* 0110 0100 0111 */ TABDECL(OP_UND),
+/* 0110 0100 1000 */ TABDECL(OP_STRB_M_LSL_IMM_OFF_POSTIND),		// OP_STRB_M_LSL_IMM_OFF_POSTIND
+/* 0110 0100 1001 */ TABDECL(OP_UND),
+/* 0110 0100 1010 */ TABDECL(OP_STRB_M_LSR_IMM_OFF_POSTIND),		// OP_STRB_M_LSR_IMM_OFF_POSTIND
+/* 0110 0100 1011 */ TABDECL(OP_UND),
+/* 0110 0100 1100 */ TABDECL(OP_STRB_M_ASR_IMM_OFF_POSTIND),		// OP_STRB_M_ASR_IMM_OFF_POSTIND
+/* 0110 0100 1101 */ TABDECL(OP_UND),
+/* 0110 0100 1110 */ TABDECL(OP_STRB_M_ROR_IMM_OFF_POSTIND),		// OP_STRB_M_ROR_IMM_OFF_POSTIND
+/* 0110 0100 1111 */ TABDECL(OP_UND),
+
+/* 0110 0101 0000 */ TABDECL(OP_LDRB_M_LSL_IMM_OFF_POSTIND),		// OP_LDRB_M_LSL_IMM_OFF_POSTIND
+/* 0110 0101 0001 */ TABDECL(OP_UND),
+/* 0110 0101 0010 */ TABDECL(OP_LDRB_M_LSR_IMM_OFF_POSTIND),		// OP_LDRB_M_LSR_IMM_OFF_POSTIND
+/* 0110 0101 0011 */ TABDECL(OP_UND),
+/* 0110 0101 0100 */ TABDECL(OP_LDRB_M_ASR_IMM_OFF_POSTIND),		// OP_LDRB_M_ASR_IMM_OFF_POSTIND
+/* 0110 0101 0101 */ TABDECL(OP_UND),
+/* 0110 0101 0110 */ TABDECL(OP_LDRB_M_ROR_IMM_OFF_POSTIND),		// OP_LDRB_M_ROR_IMM_OFF_POSTIND
+/* 0110 0101 0111 */ TABDECL(OP_UND),
+/* 0110 0101 1000 */ TABDECL(OP_LDRB_M_LSL_IMM_OFF_POSTIND),		// OP_LDRB_M_LSL_IMM_OFF_POSTIND
+/* 0110 0101 1001 */ TABDECL(OP_UND),
+/* 0110 0101 1010 */ TABDECL(OP_LDRB_M_LSR_IMM_OFF_POSTIND),		// OP_LDRB_M_LSR_IMM_OFF_POSTIND
+/* 0110 0101 1011 */ TABDECL(OP_UND),
+/* 0110 0101 1100 */ TABDECL(OP_LDRB_M_ASR_IMM_OFF_POSTIND),		// OP_LDRB_M_ASR_IMM_OFF_POSTIND
+/* 0110 0101 1101 */ TABDECL(OP_UND),
+/* 0110 0101 1110 */ TABDECL(OP_LDRB_M_ROR_IMM_OFF_POSTIND),		// OP_LDRB_M_ROR_IMM_OFF_POSTIND
+/* 0110 0101 1111 */ TABDECL(OP_UND),
+
+/* 0110 0110 0000 */ TABDECL(OP_STRB_M_LSL_IMM_OFF_POSTIND),		// OP_STRB_M_LSL_IMM_OFF_POSTIND
+/* 0110 0110 0001 */ TABDECL(OP_UND),
+/* 0110 0110 0010 */ TABDECL(OP_STRB_M_LSR_IMM_OFF_POSTIND),		// OP_STRB_M_LSR_IMM_OFF_POSTIND
+/* 0110 0110 0011 */ TABDECL(OP_UND),
+/* 0110 0110 0100 */ TABDECL(OP_STRB_M_ASR_IMM_OFF_POSTIND),		// OP_STRB_M_ASR_IMM_OFF_POSTIND
+/* 0110 0110 0101 */ TABDECL(OP_UND),
+/* 0110 0110 0110 */ TABDECL(OP_STRB_M_ROR_IMM_OFF_POSTIND),		// OP_STRB_M_ROR_IMM_OFF_POSTIND
+/* 0110 0110 0111 */ TABDECL(OP_UND),
+/* 0110 0110 1000 */ TABDECL(OP_STRB_M_LSL_IMM_OFF_POSTIND),		// OP_STRB_M_LSL_IMM_OFF_POSTIND
+/* 0110 0110 1001 */ TABDECL(OP_UND),
+/* 0110 0110 1010 */ TABDECL(OP_STRB_M_LSR_IMM_OFF_POSTIND),		// OP_STRB_M_LSR_IMM_OFF_POSTIND
+/* 0110 0110 1011 */ TABDECL(OP_UND),
+/* 0110 0110 1100 */ TABDECL(OP_STRB_M_ASR_IMM_OFF_POSTIND),		// OP_STRB_M_ASR_IMM_OFF_POSTIND
+/* 0110 0110 1101 */ TABDECL(OP_UND),
+/* 0110 0110 1110 */ TABDECL(OP_STRB_M_ROR_IMM_OFF_POSTIND),		// OP_STRB_M_ROR_IMM_OFF_POSTIND
+/* 0110 0110 1111 */ TABDECL(OP_UND),
+
+/* 0110 0111 0000 */ TABDECL(OP_LDRB_M_LSL_IMM_OFF_POSTIND),		// OP_LDRB_M_LSL_IMM_OFF_POSTIND
+/* 0110 0111 0001 */ TABDECL(OP_UND),
+/* 0110 0111 0010 */ TABDECL(OP_LDRB_M_LSR_IMM_OFF_POSTIND),		// OP_LDRB_M_LSR_IMM_OFF_POSTIND
+/* 0110 0111 0011 */ TABDECL(OP_UND),
+/* 0110 0111 0100 */ TABDECL(OP_LDRB_M_ASR_IMM_OFF_POSTIND),		// OP_LDRB_M_ASR_IMM_OFF_POSTIND
+/* 0110 0111 0101 */ TABDECL(OP_UND),
+/* 0110 0111 0110 */ TABDECL(OP_LDRB_M_ROR_IMM_OFF_POSTIND),		// OP_LDRB_M_ROR_IMM_OFF_POSTIND
+/* 0110 0111 0111 */ TABDECL(OP_UND),
+/* 0110 0111 1000 */ TABDECL(OP_LDRB_M_LSL_IMM_OFF_POSTIND),		// OP_LDRB_M_LSL_IMM_OFF_POSTIND
+/* 0110 0111 1001 */ TABDECL(OP_UND),
+/* 0110 0111 1010 */ TABDECL(OP_LDRB_M_LSR_IMM_OFF_POSTIND),		// OP_LDRB_M_LSR_IMM_OFF_POSTIND
+/* 0110 0111 1011 */ TABDECL(OP_UND),
+/* 0110 0111 1100 */ TABDECL(OP_LDRB_M_ASR_IMM_OFF_POSTIND),		// OP_LDRB_M_ASR_IMM_OFF_POSTIND
+/* 0110 0111 1101 */ TABDECL(OP_UND),
+/* 0110 0111 1110 */ TABDECL(OP_LDRB_M_ROR_IMM_OFF_POSTIND),		// OP_LDRB_M_ROR_IMM_OFF_POSTIND
+/* 0110 0111 1111 */ TABDECL(OP_UND),
+
+/* 0110 1000 0000 */ TABDECL(OP_STR_P_LSL_IMM_OFF_POSTIND),		// OP_STR_P_LSL_IMM_OFF_POSTIND
+/* 0110 1000 0001 */ TABDECL(OP_UND),
+/* 0110 1000 0010 */ TABDECL(OP_STR_P_LSR_IMM_OFF_POSTIND),		// OP_STR_P_LSR_IMM_OFF_POSTIND
+/* 0110 1000 0011 */ TABDECL(OP_UND),
+/* 0110 1000 0100 */ TABDECL(OP_STR_P_ASR_IMM_OFF_POSTIND),		// OP_STR_P_ASR_IMM_OFF_POSTIND
+/* 0110 1000 0101 */ TABDECL(OP_UND),
+/* 0110 1000 0110 */ TABDECL(OP_STR_P_ROR_IMM_OFF_POSTIND),		// OP_STR_P_ROR_IMM_OFF_POSTIND
+/* 0110 1000 0111 */ TABDECL(OP_UND),
+/* 0110 1000 1000 */ TABDECL(OP_STR_P_LSL_IMM_OFF_POSTIND),		// OP_STR_P_LSL_IMM_OFF_POSTIND
+/* 0110 1000 1001 */ TABDECL(OP_UND),
+/* 0110 1000 1010 */ TABDECL(OP_STR_P_LSR_IMM_OFF_POSTIND),		// OP_STR_P_LSR_IMM_OFF_POSTIND
+/* 0110 1000 1011 */ TABDECL(OP_UND),
+/* 0110 1000 1100 */ TABDECL(OP_STR_P_ASR_IMM_OFF_POSTIND),		// OP_STR_P_ASR_IMM_OFF_POSTIND
+/* 0110 1000 1101 */ TABDECL(OP_UND),
+/* 0110 1000 1110 */ TABDECL(OP_STR_P_ROR_IMM_OFF_POSTIND),		// OP_STR_P_ROR_IMM_OFF_POSTIND
+/* 0110 1000 1111 */ TABDECL(OP_UND),
+
+/* 0110 1001 0000 */ TABDECL(OP_LDR_P_LSL_IMM_OFF_POSTIND),		// OP_LDR_P_LSL_IMM_OFF_POSTIND
+/* 0110 1001 0001 */ TABDECL(OP_UND),
+/* 0110 1001 0010 */ TABDECL(OP_LDR_P_LSR_IMM_OFF_POSTIND),		// OP_LDR_P_LSR_IMM_OFF_POSTIND
+/* 0110 1001 0011 */ TABDECL(OP_UND),
+/* 0110 1001 0100 */ TABDECL(OP_LDR_P_ASR_IMM_OFF_POSTIND),		// OP_LDR_P_ASR_IMM_OFF_POSTIND
+/* 0110 1001 0101 */ TABDECL(OP_UND),
+/* 0110 1001 0110 */ TABDECL(OP_LDR_P_ROR_IMM_OFF_POSTIND),		// OP_LDR_P_ROR_IMM_OFF_POSTIND
+/* 0110 1001 0111 */ TABDECL(OP_UND),
+/* 0110 1001 1000 */ TABDECL(OP_LDR_P_LSL_IMM_OFF_POSTIND),		// OP_LDR_P_LSL_IMM_OFF_POSTIND
+/* 0110 1001 1001 */ TABDECL(OP_UND),
+/* 0110 1001 1010 */ TABDECL(OP_LDR_P_LSR_IMM_OFF_POSTIND),		// OP_LDR_P_LSR_IMM_OFF_POSTIND
+/* 0110 1001 1011 */ TABDECL(OP_UND),
+/* 0110 1001 1100 */ TABDECL(OP_LDR_P_ASR_IMM_OFF_POSTIND),		// OP_LDR_P_ASR_IMM_OFF_POSTIND
+/* 0110 1001 1101 */ TABDECL(OP_UND),
+/* 0110 1001 1110 */ TABDECL(OP_LDR_P_ROR_IMM_OFF_POSTIND),		// OP_LDR_P_ROR_IMM_OFF_POSTIND
+/* 0110 1001 1111 */ TABDECL(OP_UND),
+
+/* 0110 1010 0000 */ TABDECL(OP_STR_P_LSL_IMM_OFF_POSTIND),		// OP_STR_P_LSL_IMM_OFF_POSTIND
+/* 0110 1010 0001 */ TABDECL(OP_UND),
+/* 0110 1010 0010 */ TABDECL(OP_STR_P_LSR_IMM_OFF_POSTIND),		// OP_STR_P_LSR_IMM_OFF_POSTIND
+/* 0110 1010 0011 */ TABDECL(OP_UND),
+/* 0110 1010 0100 */ TABDECL(OP_STR_P_ASR_IMM_OFF_POSTIND),		// OP_STR_P_ASR_IMM_OFF_POSTIND
+/* 0110 1010 0101 */ TABDECL(OP_UND),
+/* 0110 1010 0110 */ TABDECL(OP_STR_P_ROR_IMM_OFF_POSTIND),		// OP_STR_P_ROR_IMM_OFF_POSTIND
+/* 0110 1010 0111 */ TABDECL(OP_UND),
+/* 0110 1010 1000 */ TABDECL(OP_STR_P_LSL_IMM_OFF_POSTIND),		// OP_STR_P_LSL_IMM_OFF_POSTIND
+/* 0110 1010 1001 */ TABDECL(OP_UND),
+/* 0110 1010 1010 */ TABDECL(OP_STR_P_LSR_IMM_OFF_POSTIND),		// OP_STR_P_LSR_IMM_OFF_POSTIND
+/* 0110 1010 1011 */ TABDECL(OP_UND),
+/* 0110 1010 1100 */ TABDECL(OP_STR_P_ASR_IMM_OFF_POSTIND),		// OP_STR_P_ASR_IMM_OFF_POSTIND
+/* 0110 1010 1101 */ TABDECL(OP_UND),
+/* 0110 1010 1110 */ TABDECL(OP_STR_P_ROR_IMM_OFF_POSTIND),		// OP_STR_P_ROR_IMM_OFF_POSTIND
+/* 0110 1010 1111 */ TABDECL(OP_UND),
+
+/* 0110 1011 0000 */ TABDECL(OP_LDR_P_LSL_IMM_OFF_POSTIND),		// OP_LDR_P_LSL_IMM_OFF_POSTIND
+/* 0110 1011 0001 */ TABDECL(OP_UND),
+/* 0110 1011 0010 */ TABDECL(OP_LDR_P_LSL_IMM_OFF_POSTIND),		// OP_LDR_P_LSL_IMM_OFF_POSTIND
+/* 0110 1011 0011 */ TABDECL(OP_UND),
+/* 0110 1011 0100 */ TABDECL(OP_LDR_P_LSL_IMM_OFF_POSTIND),		// OP_LDR_P_LSL_IMM_OFF_POSTIND
+/* 0110 1011 0101 */ TABDECL(OP_UND),
+/* 0110 1011 0110 */ TABDECL(OP_LDR_P_LSL_IMM_OFF_POSTIND),		// OP_LDR_P_LSL_IMM_OFF_POSTIND
+/* 0110 1011 0111 */ TABDECL(OP_UND),
+/* 0110 1011 1000 */ TABDECL(OP_LDR_P_LSL_IMM_OFF_POSTIND),		// OP_LDR_P_LSL_IMM_OFF_POSTIND
+/* 0110 1011 1001 */ TABDECL(OP_UND),
+/* 0110 1011 1010 */ TABDECL(OP_LDR_P_LSL_IMM_OFF_POSTIND),		// OP_LDR_P_LSL_IMM_OFF_POSTIND
+/* 0110 1011 1011 */ TABDECL(OP_UND),
+/* 0110 1011 1100 */ TABDECL(OP_LDR_P_LSL_IMM_OFF_POSTIND),		// OP_LDR_P_LSL_IMM_OFF_POSTIND
+/* 0110 1011 1101 */ TABDECL(OP_UND),
+/* 0110 1011 1110 */ TABDECL(OP_LDR_P_LSL_IMM_OFF_POSTIND),		// OP_LDR_P_LSL_IMM_OFF_POSTIND
+/* 0110 1011 1111 */ TABDECL(OP_UND),
+
+/* 0110 1100 0000 */ TABDECL(OP_STRB_P_LSL_IMM_OFF_POSTIND),		// OP_STRB_P_LSL_IMM_OFF_POSTIND
+/* 0110 1100 0001 */ TABDECL(OP_UND),
+/* 0110 1100 0010 */ TABDECL(OP_STRB_P_LSR_IMM_OFF_POSTIND),		// OP_STRB_P_LSR_IMM_OFF_POSTIND
+/* 0110 1100 0011 */ TABDECL(OP_UND),
+/* 0110 1100 0100 */ TABDECL(OP_STRB_P_ASR_IMM_OFF_POSTIND),		// OP_STRB_P_ASR_IMM_OFF_POSTIND
+/* 0110 1100 0101 */ TABDECL(OP_UND),
+/* 0110 1100 0110 */ TABDECL(OP_STRB_P_ROR_IMM_OFF_POSTIND),		// OP_STRB_P_ROR_IMM_OFF_POSTIND
+/* 0110 1100 0111 */ TABDECL(OP_UND),
+/* 0110 1100 1000 */ TABDECL(OP_STRB_P_LSL_IMM_OFF_POSTIND),		// OP_STRB_P_LSL_IMM_OFF_POSTIND
+/* 0110 1100 1001 */ TABDECL(OP_UND),
+/* 0110 1100 1010 */ TABDECL(OP_STRB_P_LSR_IMM_OFF_POSTIND),		// OP_STRB_P_LSR_IMM_OFF_POSTIND
+/* 0110 1100 1011 */ TABDECL(OP_UND),
+/* 0110 1100 1100 */ TABDECL(OP_STRB_P_ASR_IMM_OFF_POSTIND),		// OP_STRB_P_ASR_IMM_OFF_POSTIND
+/* 0110 1100 1101 */ TABDECL(OP_UND),
+/* 0110 1100 1110 */ TABDECL(OP_STRB_P_ROR_IMM_OFF_POSTIND),		// OP_STRB_P_ROR_IMM_OFF_POSTIND
+/* 0110 1100 1111 */ TABDECL(OP_UND),
+
+/* 0110 1101 0000 */ TABDECL(OP_LDRB_P_LSL_IMM_OFF_POSTIND),		// OP_LDRB_P_LSL_IMM_OFF_POSTIND
+/* 0110 1101 0001 */ TABDECL(OP_UND),
+/* 0110 1101 0010 */ TABDECL(OP_LDRB_P_LSR_IMM_OFF_POSTIND),		// OP_LDRB_P_LSR_IMM_OFF_POSTIND
+/* 0110 1101 0011 */ TABDECL(OP_UND),
+/* 0110 1101 0100 */ TABDECL(OP_LDRB_P_ASR_IMM_OFF_POSTIND),		// OP_LDRB_P_ASR_IMM_OFF_POSTIND
+/* 0110 1101 0101 */ TABDECL(OP_UND),
+/* 0110 1101 0110 */ TABDECL(OP_LDRB_P_ROR_IMM_OFF_POSTIND),		// OP_LDRB_P_ROR_IMM_OFF_POSTIND
+/* 0110 1101 0111 */ TABDECL(OP_UND),
+/* 0110 1101 1000 */ TABDECL(OP_LDRB_P_LSL_IMM_OFF_POSTIND),		// OP_LDRB_P_LSL_IMM_OFF_POSTIND
+/* 0110 1101 1001 */ TABDECL(OP_UND),
+/* 0110 1101 1010 */ TABDECL(OP_LDRB_P_LSR_IMM_OFF_POSTIND),		// OP_LDRB_P_LSR_IMM_OFF_POSTIND
+/* 0110 1101 1011 */ TABDECL(OP_UND),
+/* 0110 1101 1100 */ TABDECL(OP_LDRB_P_ASR_IMM_OFF_POSTIND),		// OP_LDRB_P_ASR_IMM_OFF_POSTIND
+/* 0110 1101 1101 */ TABDECL(OP_UND),
+/* 0110 1101 1110 */ TABDECL(OP_LDRB_P_ROR_IMM_OFF_POSTIND),		// OP_LDRB_P_ROR_IMM_OFF_POSTIND
+/* 0110 1101 1111 */ TABDECL(OP_UND),
+
+/* 0110 1110 0000 */ TABDECL(OP_STRB_P_LSL_IMM_OFF_POSTIND),		// OP_STRB_P_LSL_IMM_OFF_POSTIND
+/* 0110 1110 0001 */ TABDECL(OP_UND),
+/* 0110 1110 0010 */ TABDECL(OP_STRB_P_LSR_IMM_OFF_POSTIND),		// OP_STRB_P_LSR_IMM_OFF_POSTIND
+/* 0110 1110 0011 */ TABDECL(OP_UND),
+/* 0110 1110 0100 */ TABDECL(OP_STRB_P_ASR_IMM_OFF_POSTIND),		// OP_STRB_P_ASR_IMM_OFF_POSTIND
+/* 0110 1110 0101 */ TABDECL(OP_UND),
+/* 0110 1110 0110 */ TABDECL(OP_STRB_P_ROR_IMM_OFF_POSTIND),		// OP_STRB_P_ROR_IMM_OFF_POSTIND
+/* 0110 1110 0111 */ TABDECL(OP_UND),
+/* 0110 1110 1000 */ TABDECL(OP_STRB_P_LSL_IMM_OFF_POSTIND),		// OP_STRB_P_LSL_IMM_OFF_POSTIND
+/* 0110 1110 1001 */ TABDECL(OP_UND),
+/* 0110 1110 1010 */ TABDECL(OP_STRB_P_LSR_IMM_OFF_POSTIND),		// OP_STRB_P_LSR_IMM_OFF_POSTIND
+/* 0110 1110 1011 */ TABDECL(OP_UND),
+/* 0110 1110 1100 */ TABDECL(OP_STRB_P_ASR_IMM_OFF_POSTIND),		// OP_STRB_P_ASR_IMM_OFF_POSTIND
+/* 0110 1110 1101 */ TABDECL(OP_UND),
+/* 0110 1110 1110 */ TABDECL(OP_STRB_P_ROR_IMM_OFF_POSTIND),		// OP_STRB_P_ROR_IMM_OFF_POSTIND
+/* 0110 1110 1111 */ TABDECL(OP_UND),
+
+/* 0110 1111 0000 */ TABDECL(OP_LDRB_P_LSL_IMM_OFF_POSTIND),		// OP_LDRB_P_LSL_IMM_OFF_POSTIND
+/* 0110 1111 0001 */ TABDECL(OP_UND),
+/* 0110 1111 0010 */ TABDECL(OP_LDRB_P_LSR_IMM_OFF_POSTIND),		// OP_LDRB_P_LSR_IMM_OFF_POSTIND
+/* 0110 1111 0011 */ TABDECL(OP_UND),
+/* 0110 1111 0100 */ TABDECL(OP_LDRB_P_ASR_IMM_OFF_POSTIND),		// OP_LDRB_P_ASR_IMM_OFF_POSTIND
+/* 0110 1111 0101 */ TABDECL(OP_UND),
+/* 0110 1111 0110 */ TABDECL(OP_LDRB_P_ROR_IMM_OFF_POSTIND),		// OP_LDRB_P_ROR_IMM_OFF_POSTIND
+/* 0110 1111 0111 */ TABDECL(OP_UND),
+/* 0110 1111 1000 */ TABDECL(OP_LDRB_P_LSL_IMM_OFF_POSTIND),		// OP_LDRB_P_LSL_IMM_OFF_POSTIND
+/* 0110 1111 1001 */ TABDECL(OP_UND),
+/* 0110 1111 1010 */ TABDECL(OP_LDRB_P_LSR_IMM_OFF_POSTIND),		// OP_LDRB_P_LSR_IMM_OFF_POSTIND
+/* 0110 1111 1011 */ TABDECL(OP_UND),
+/* 0110 1111 1100 */ TABDECL(OP_LDRB_P_ASR_IMM_OFF_POSTIND),		// OP_LDRB_P_ASR_IMM_OFF_POSTIND
+/* 0110 1111 1101 */ TABDECL(OP_UND),
+/* 0110 1111 1110 */ TABDECL(OP_LDRB_P_ROR_IMM_OFF_POSTIND),		// OP_LDRB_P_ROR_IMM_OFF_POSTIND
+/* 0110 1111 1111 */ TABDECL(OP_UND),
+
+/* 0111 0000 0000 */ TABDECL(OP_STR_M_LSL_IMM_OFF),		// OP_STR_M_LSL_IMM_OFF
+/* 0111 0000 0001 */ TABDECL(OP_UND),
+/* 0111 0000 0010 */ TABDECL(OP_STR_M_LSR_IMM_OFF),		// OP_STR_M_LSR_IMM_OFF
+/* 0111 0000 0011 */ TABDECL(OP_UND),
+/* 0111 0000 0100 */ TABDECL(OP_STR_M_ASR_IMM_OFF),		// OP_STR_M_ASR_IMM_OFF
+/* 0111 0000 0101 */ TABDECL(OP_UND),
+/* 0111 0000 0110 */ TABDECL(OP_STR_M_ROR_IMM_OFF),		// OP_STR_M_ROR_IMM_OFF
+/* 0111 0000 0111 */ TABDECL(OP_UND),
+/* 0111 0000 1000 */ TABDECL(OP_STR_M_LSL_IMM_OFF),		// OP_STR_M_LSL_IMM_OFF
+/* 0111 0000 1001 */ TABDECL(OP_UND),
+/* 0111 0000 1010 */ TABDECL(OP_STR_M_LSR_IMM_OFF),		// OP_STR_M_LSR_IMM_OFF
+/* 0111 0000 1011 */ TABDECL(OP_UND),
+/* 0111 0000 1100 */ TABDECL(OP_STR_M_ASR_IMM_OFF),		// OP_STR_M_ASR_IMM_OFF
+/* 0111 0000 1101 */ TABDECL(OP_UND),
+/* 0111 0000 1110 */ TABDECL(OP_STR_M_ROR_IMM_OFF),		// OP_STR_M_ROR_IMM_OFF
+/* 0111 0000 1111 */ TABDECL(OP_UND),
+
+/* 0111 0001 0000 */ TABDECL(OP_LDR_M_LSL_IMM_OFF),		// OP_LDR_M_LSL_IMM_OFF
+/* 0111 0001 0001 */ TABDECL(OP_UND),
+/* 0111 0001 0010 */ TABDECL(OP_LDR_M_LSR_IMM_OFF),		// OP_LDR_M_LSR_IMM_OFF
+/* 0111 0001 0011 */ TABDECL(OP_UND),
+/* 0111 0001 0100 */ TABDECL(OP_LDR_M_ASR_IMM_OFF),		// OP_LDR_M_ASR_IMM_OFF
+/* 0111 0001 0101 */ TABDECL(OP_UND),
+/* 0111 0001 0110 */ TABDECL(OP_LDR_M_ROR_IMM_OFF),		// OP_LDR_M_ROR_IMM_OFF
+/* 0111 0001 0111 */ TABDECL(OP_UND),
+/* 0111 0001 1000 */ TABDECL(OP_LDR_M_LSL_IMM_OFF),		// OP_LDR_M_LSL_IMM_OFF
+/* 0111 0001 1001 */ TABDECL(OP_UND),
+/* 0111 0001 1010 */ TABDECL(OP_LDR_M_LSR_IMM_OFF),		// OP_LDR_M_LSR_IMM_OFF
+/* 0111 0001 1011 */ TABDECL(OP_UND),
+/* 0111 0001 1100 */ TABDECL(OP_LDR_M_ASR_IMM_OFF),		// OP_LDR_M_ASR_IMM_OFF
+/* 0111 0001 1101 */ TABDECL(OP_UND),
+/* 0111 0001 1110 */ TABDECL(OP_LDR_M_ROR_IMM_OFF),		// OP_LDR_M_ROR_IMM_OFF
+/* 0111 0001 1111 */ TABDECL(OP_UND),
+
+/* 0111 0010 0000 */ TABDECL(OP_STR_M_LSL_IMM_OFF_PREIND),		// OP_STR_M_LSL_IMM_OFF_PREIND
+/* 0111 0010 0001 */ TABDECL(OP_UND),
+/* 0111 0010 0010 */ TABDECL(OP_STR_M_LSR_IMM_OFF_PREIND),		// OP_STR_M_LSR_IMM_OFF_PREIND
+/* 0111 0010 0011 */ TABDECL(OP_UND),
+/* 0111 0010 0100 */ TABDECL(OP_STR_M_ASR_IMM_OFF_PREIND),		// OP_STR_M_ASR_IMM_OFF_PREIND
+/* 0111 0010 0101 */ TABDECL(OP_UND),
+/* 0111 0010 0110 */ TABDECL(OP_STR_M_ROR_IMM_OFF_PREIND),		// OP_STR_M_ROR_IMM_OFF_PREIND
+/* 0111 0010 0111 */ TABDECL(OP_UND),
+/* 0111 0010 1000 */ TABDECL(OP_STR_M_LSL_IMM_OFF_PREIND),		// OP_STR_M_LSL_IMM_OFF_PREIND
+/* 0111 0010 1001 */ TABDECL(OP_UND),
+/* 0111 0010 1010 */ TABDECL(OP_STR_M_LSR_IMM_OFF_PREIND),		// OP_STR_M_LSR_IMM_OFF_PREIND
+/* 0111 0010 1011 */ TABDECL(OP_UND),
+/* 0111 0010 1100 */ TABDECL(OP_STR_M_ASR_IMM_OFF_PREIND),		// OP_STR_M_ASR_IMM_OFF_PREIND
+/* 0111 0010 1101 */ TABDECL(OP_UND),
+/* 0111 0010 1110 */ TABDECL(OP_STR_M_ROR_IMM_OFF_PREIND),		// OP_STR_M_ROR_IMM_OFF_PREIND
+/* 0111 0010 1111 */ TABDECL(OP_UND),
+
+/* 0111 0011 0000 */ TABDECL(OP_LDR_M_LSL_IMM_OFF_PREIND),		// OP_LDR_M_LSL_IMM_OFF_PREIND
+/* 0111 0011 0001 */ TABDECL(OP_UND),
+/* 0111 0011 0010 */ TABDECL(OP_LDR_M_LSR_IMM_OFF_PREIND),		// OP_LDR_M_LSR_IMM_OFF_PREIND
+/* 0111 0011 0011 */ TABDECL(OP_UND),
+/* 0111 0011 0100 */ TABDECL(OP_LDR_M_ASR_IMM_OFF_PREIND),		// OP_LDR_M_ASR_IMM_OFF_PREIND
+/* 0111 0011 0101 */ TABDECL(OP_UND),
+/* 0111 0011 0110 */ TABDECL(OP_LDR_M_ROR_IMM_OFF_PREIND),		// OP_LDR_M_ROR_IMM_OFF_PREIND
+/* 0111 0011 0111 */ TABDECL(OP_UND),
+/* 0111 0011 1000 */ TABDECL(OP_LDR_M_LSL_IMM_OFF_PREIND),		// OP_LDR_M_LSL_IMM_OFF_PREIND
+/* 0111 0011 1001 */ TABDECL(OP_UND),
+/* 0111 0011 1010 */ TABDECL(OP_LDR_M_LSR_IMM_OFF_PREIND),		// OP_LDR_M_LSR_IMM_OFF_PREIND
+/* 0111 0011 1011 */ TABDECL(OP_UND),
+/* 0111 0011 1100 */ TABDECL(OP_LDR_M_ASR_IMM_OFF_PREIND),		// OP_LDR_M_ASR_IMM_OFF_PREIND
+/* 0111 0011 1101 */ TABDECL(OP_UND),
+/* 0111 0011 1110 */ TABDECL(OP_LDR_M_ROR_IMM_OFF_PREIND),		// OP_LDR_M_ROR_IMM_OFF_PREIND
+/* 0111 0011 1111 */ TABDECL(OP_UND),
+
+/* 0111 0100 0000 */ TABDECL(OP_STRB_M_LSL_IMM_OFF),		// OP_STRB_M_LSL_IMM_OFF
+/* 0111 0100 0001 */ TABDECL(OP_UND),
+/* 0111 0100 0010 */ TABDECL(OP_STRB_M_LSR_IMM_OFF),		// OP_STRB_M_LSR_IMM_OFF
+/* 0111 0100 0011 */ TABDECL(OP_UND),
+/* 0111 0100 0100 */ TABDECL(OP_STRB_M_ASR_IMM_OFF),		// OP_STRB_M_ASR_IMM_OFF
+/* 0111 0100 0101 */ TABDECL(OP_UND),
+/* 0111 0100 0110 */ TABDECL(OP_STRB_M_ROR_IMM_OFF),		// OP_STRB_M_ROR_IMM_OFF
+/* 0111 0100 0111 */ TABDECL(OP_UND),
+/* 0111 0100 1000 */ TABDECL(OP_STRB_M_LSL_IMM_OFF),		// OP_STRB_M_LSL_IMM_OFF
+/* 0111 0100 1001 */ TABDECL(OP_UND),
+/* 0111 0100 1010 */ TABDECL(OP_STRB_M_LSR_IMM_OFF),		// OP_STRB_M_LSR_IMM_OFF
+/* 0111 0100 1011 */ TABDECL(OP_UND),
+/* 0111 0100 1100 */ TABDECL(OP_STRB_M_ASR_IMM_OFF),		// OP_STRB_M_ASR_IMM_OFF
+/* 0111 0100 1101 */ TABDECL(OP_UND),
+/* 0111 0100 1110 */ TABDECL(OP_STRB_M_ROR_IMM_OFF),		// OP_STRB_M_ROR_IMM_OFF
+/* 0111 0100 1111 */ TABDECL(OP_UND),
+
+/* 0111 0101 0000 */ TABDECL(OP_LDRB_M_LSL_IMM_OFF),		// OP_LDRB_M_LSL_IMM_OFF
+/* 0111 0101 0001 */ TABDECL(OP_UND),
+/* 0111 0101 0010 */ TABDECL(OP_LDRB_M_LSR_IMM_OFF),		// OP_LDRB_M_LSR_IMM_OFF
+/* 0111 0101 0011 */ TABDECL(OP_UND),
+/* 0111 0101 0100 */ TABDECL(OP_LDRB_M_ASR_IMM_OFF),		// OP_LDRB_M_ASR_IMM_OFF
+/* 0111 0101 0101 */ TABDECL(OP_UND),
+/* 0111 0101 0110 */ TABDECL(OP_LDRB_M_ROR_IMM_OFF),		// OP_LDRB_M_ROR_IMM_OFF
+/* 0111 0101 0111 */ TABDECL(OP_UND),
+/* 0111 0101 1000 */ TABDECL(OP_LDRB_M_LSL_IMM_OFF),		// OP_LDRB_M_LSL_IMM_OFF
+/* 0111 0101 1001 */ TABDECL(OP_UND),
+/* 0111 0101 1010 */ TABDECL(OP_LDRB_M_LSR_IMM_OFF),		// OP_LDRB_M_LSR_IMM_OFF
+/* 0111 0101 1011 */ TABDECL(OP_UND),
+/* 0111 0101 1100 */ TABDECL(OP_LDRB_M_ASR_IMM_OFF),		// OP_LDRB_M_ASR_IMM_OFF
+/* 0111 0101 1101 */ TABDECL(OP_UND),
+/* 0111 0101 1110 */ TABDECL(OP_LDRB_M_ROR_IMM_OFF),		// OP_LDRB_M_ROR_IMM_OFF
+/* 0111 0101 1111 */ TABDECL(OP_UND),
+
+/* 0111 0110 0000 */ TABDECL(OP_STRB_M_LSL_IMM_OFF_PREIND),		// OP_STRB_M_LSL_IMM_OFF_PREIND
+/* 0111 0110 0001 */ TABDECL(OP_UND),
+/* 0111 0110 0010 */ TABDECL(OP_STRB_M_LSR_IMM_OFF_PREIND),		// OP_STRB_M_LSR_IMM_OFF_PREIND
+/* 0111 0110 0011 */ TABDECL(OP_UND),
+/* 0111 0110 0100 */ TABDECL(OP_STRB_M_ASR_IMM_OFF_PREIND),		// OP_STRB_M_ASR_IMM_OFF_PREIND
+/* 0111 0110 0101 */ TABDECL(OP_UND),
+/* 0111 0110 0110 */ TABDECL(OP_STRB_M_ROR_IMM_OFF_PREIND),		// OP_STRB_M_ROR_IMM_OFF_PREIND
+/* 0111 0110 0111 */ TABDECL(OP_UND),
+/* 0111 0110 1000 */ TABDECL(OP_STRB_M_LSL_IMM_OFF_PREIND),		// OP_STRB_M_LSL_IMM_OFF_PREIND
+/* 0111 0110 1001 */ TABDECL(OP_UND),
+/* 0111 0110 1010 */ TABDECL(OP_STRB_M_LSR_IMM_OFF_PREIND),		// OP_STRB_M_LSR_IMM_OFF_PREIND
+/* 0111 0110 1011 */ TABDECL(OP_UND),
+/* 0111 0110 1100 */ TABDECL(OP_STRB_M_ASR_IMM_OFF_PREIND),		// OP_STRB_M_ASR_IMM_OFF_PREIND
+/* 0111 0110 1101 */ TABDECL(OP_UND),
+/* 0111 0110 1110 */ TABDECL(OP_STRB_M_ROR_IMM_OFF_PREIND),		// OP_STRB_M_ROR_IMM_OFF_PREIND
+/* 0111 0110 1111 */ TABDECL(OP_UND),
+
+/* 0111 0111 0000 */ TABDECL(OP_LDRB_M_LSL_IMM_OFF_PREIND),		// OP_LDRB_M_LSL_IMM_OFF_PREIND
+/* 0111 0111 0001 */ TABDECL(OP_UND),
+/* 0111 0111 0010 */ TABDECL(OP_LDRB_M_LSR_IMM_OFF_PREIND),		// OP_LDRB_M_LSR_IMM_OFF_PREIND
+/* 0111 0111 0011 */ TABDECL(OP_UND),
+/* 0111 0111 0100 */ TABDECL(OP_LDRB_M_ASR_IMM_OFF_PREIND),		// OP_LDRB_M_ASR_IMM_OFF_PREIND
+/* 0111 0111 0101 */ TABDECL(OP_UND),
+/* 0111 0111 0110 */ TABDECL(OP_LDRB_M_ROR_IMM_OFF_PREIND),		// OP_LDRB_M_ROR_IMM_OFF_PREIND
+/* 0111 0111 0111 */ TABDECL(OP_UND),
+/* 0111 0111 1000 */ TABDECL(OP_LDRB_M_LSL_IMM_OFF_PREIND),		// OP_LDRB_M_LSL_IMM_OFF_PREIND
+/* 0111 0111 1001 */ TABDECL(OP_UND),
+/* 0111 0111 1010 */ TABDECL(OP_LDRB_M_LSR_IMM_OFF_PREIND),		// OP_LDRB_M_LSR_IMM_OFF_PREIND
+/* 0111 0111 1011 */ TABDECL(OP_UND),
+/* 0111 0111 1100 */ TABDECL(OP_LDRB_M_ASR_IMM_OFF_PREIND),		// OP_LDRB_M_ASR_IMM_OFF_PREIND
+/* 0111 0111 1101 */ TABDECL(OP_UND),
+/* 0111 0111 1110 */ TABDECL(OP_LDRB_M_ROR_IMM_OFF_PREIND),		// OP_LDRB_M_ROR_IMM_OFF_PREIND
+/* 0111 0111 1111 */ TABDECL(OP_UND),
+
+/* 0111 1000 0000 */ TABDECL(OP_STR_P_LSL_IMM_OFF),		// OP_STR_P_LSL_IMM_OFF
+/* 0111 1000 0001 */ TABDECL(OP_UND),
+/* 0111 1000 0010 */ TABDECL(OP_STR_P_LSR_IMM_OFF),		// OP_STR_P_LSR_IMM_OFF
+/* 0111 1000 0011 */ TABDECL(OP_UND),
+/* 0111 1000 0100 */ TABDECL(OP_STR_P_ASR_IMM_OFF),		// OP_STR_P_ASR_IMM_OFF
+/* 0111 1000 0101 */ TABDECL(OP_UND),
+/* 0111 1000 0110 */ TABDECL(OP_STR_P_ROR_IMM_OFF),		// OP_STR_P_ROR_IMM_OFF
+/* 0111 1000 0111 */ TABDECL(OP_UND),
+/* 0111 1000 1000 */ TABDECL(OP_STR_P_LSL_IMM_OFF),		// OP_STR_P_LSL_IMM_OFF
+/* 0111 1000 1001 */ TABDECL(OP_UND),
+/* 0111 1000 1010 */ TABDECL(OP_STR_P_LSR_IMM_OFF),		// OP_STR_P_LSR_IMM_OFF
+/* 0111 1000 1011 */ TABDECL(OP_UND),
+/* 0111 1000 1100 */ TABDECL(OP_STR_P_ASR_IMM_OFF),		// OP_STR_P_ASR_IMM_OFF
+/* 0111 1000 1101 */ TABDECL(OP_UND),
+/* 0111 1000 1110 */ TABDECL(OP_STR_P_ROR_IMM_OFF),		// OP_STR_P_ROR_IMM_OFF
+/* 0111 1000 1111 */ TABDECL(OP_UND),
+
+/* 0111 1001 0000 */ TABDECL(OP_LDR_P_LSL_IMM_OFF),		// OP_LDR_P_LSL_IMM_OFF
+/* 0111 1001 0001 */ TABDECL(OP_UND),
+/* 0111 1001 0010 */ TABDECL(OP_LDR_P_LSR_IMM_OFF),		// OP_LDR_P_LSR_IMM_OFF
+/* 0111 1001 0011 */ TABDECL(OP_UND),
+/* 0111 1001 0100 */ TABDECL(OP_LDR_P_ASR_IMM_OFF),		// OP_LDR_P_ASR_IMM_OFF
+/* 0111 1001 0101 */ TABDECL(OP_UND),
+/* 0111 1001 0110 */ TABDECL(OP_LDR_P_ROR_IMM_OFF),		// OP_LDR_P_ROR_IMM_OFF
+/* 0111 1001 0111 */ TABDECL(OP_UND),
+/* 0111 1001 1000 */ TABDECL(OP_LDR_P_LSL_IMM_OFF),		// OP_LDR_P_LSL_IMM_OFF
+/* 0111 1001 1001 */ TABDECL(OP_UND),
+/* 0111 1001 1010 */ TABDECL(OP_LDR_P_LSR_IMM_OFF),		// OP_LDR_P_LSR_IMM_OFF
+/* 0111 1001 1011 */ TABDECL(OP_UND),
+/* 0111 1001 1100 */ TABDECL(OP_LDR_P_ASR_IMM_OFF),		// OP_LDR_P_ASR_IMM_OFF
+/* 0111 1001 1101 */ TABDECL(OP_UND),
+/* 0111 1001 1110 */ TABDECL(OP_LDR_P_ROR_IMM_OFF),		// OP_LDR_P_ROR_IMM_OFF
+/* 0111 1001 1111 */ TABDECL(OP_UND),
+
+/* 0111 1010 0000 */ TABDECL(OP_STR_P_LSL_IMM_OFF_PREIND),		// OP_STR_P_LSL_IMM_OFF_PREIND
+/* 0111 1010 0001 */ TABDECL(OP_UND),
+/* 0111 1010 0010 */ TABDECL(OP_STR_P_LSR_IMM_OFF_PREIND),		// OP_STR_P_LSR_IMM_OFF_PREIND
+/* 0111 1010 0011 */ TABDECL(OP_UND),
+/* 0111 1010 0100 */ TABDECL(OP_STR_P_ASR_IMM_OFF_PREIND),		// OP_STR_P_ASR_IMM_OFF_PREIND
+/* 0111 1010 0101 */ TABDECL(OP_UND),
+/* 0111 1010 0110 */ TABDECL(OP_STR_P_ROR_IMM_OFF_PREIND),		// OP_STR_P_ROR_IMM_OFF_PREIND
+/* 0111 1010 0111 */ TABDECL(OP_UND),
+/* 0111 1010 1000 */ TABDECL(OP_STR_P_LSL_IMM_OFF_PREIND),		// OP_STR_P_LSL_IMM_OFF_PREIND
+/* 0111 1010 1001 */ TABDECL(OP_UND),
+/* 0111 1010 1010 */ TABDECL(OP_STR_P_LSR_IMM_OFF_PREIND),		// OP_STR_P_LSR_IMM_OFF_PREIND
+/* 0111 1010 1011 */ TABDECL(OP_UND),
+/* 0111 1010 1100 */ TABDECL(OP_STR_P_ASR_IMM_OFF_PREIND),		// OP_STR_P_ASR_IMM_OFF_PREIND
+/* 0111 1010 1101 */ TABDECL(OP_UND),
+/* 0111 1010 1110 */ TABDECL(OP_STR_P_ROR_IMM_OFF_PREIND),		// OP_STR_P_ROR_IMM_OFF_PREIND
+/* 0111 1010 1111 */ TABDECL(OP_UND),
+
+/* 0111 1011 0000 */ TABDECL(OP_LDR_P_LSL_IMM_OFF_PREIND),		// OP_LDR_P_LSL_IMM_OFF_PREIND
+/* 0111 1011 0001 */ TABDECL(OP_UND),
+/* 0111 1011 0010 */ TABDECL(OP_LDR_P_LSR_IMM_OFF_PREIND),		// OP_LDR_P_LSR_IMM_OFF_PREIND
+/* 0111 1011 0011 */ TABDECL(OP_UND),
+/* 0111 1011 0100 */ TABDECL(OP_LDR_P_ASR_IMM_OFF_PREIND),		// OP_LDR_P_ASR_IMM_OFF_PREIND
+/* 0111 1011 0101 */ TABDECL(OP_UND),
+/* 0111 1011 0110 */ TABDECL(OP_LDR_P_ROR_IMM_OFF_PREIND),		// OP_LDR_P_ROR_IMM_OFF_PREIND
+/* 0111 1011 0111 */ TABDECL(OP_UND),
+/* 0111 1011 1000 */ TABDECL(OP_LDR_P_LSL_IMM_OFF_PREIND),		// OP_LDR_P_LSL_IMM_OFF_PREIND
+/* 0111 1011 1001 */ TABDECL(OP_UND),
+/* 0111 1011 1010 */ TABDECL(OP_LDR_P_LSR_IMM_OFF_PREIND),		// OP_LDR_P_LSR_IMM_OFF_PREIND
+/* 0111 1011 1011 */ TABDECL(OP_UND),
+/* 0111 1011 1100 */ TABDECL(OP_LDR_P_ASR_IMM_OFF_PREIND),		// OP_LDR_P_ASR_IMM_OFF_PREIND
+/* 0111 1011 1101 */ TABDECL(OP_UND),
+/* 0111 1011 1110 */ TABDECL(OP_LDR_P_ROR_IMM_OFF_PREIND),		// OP_LDR_P_ROR_IMM_OFF_PREIND
+/* 0111 1011 1111 */ TABDECL(OP_UND),
+
+/* 0111 1100 0000 */ TABDECL(OP_STRB_P_LSL_IMM_OFF),		// OP_STRB_P_LSL_IMM_OFF
+/* 0111 1100 0001 */ TABDECL(OP_UND),
+/* 0111 1100 0010 */ TABDECL(OP_STRB_P_LSR_IMM_OFF),		// OP_STRB_P_LSR_IMM_OFF
+/* 0111 1100 0011 */ TABDECL(OP_UND),
+/* 0111 1100 0100 */ TABDECL(OP_STRB_P_ASR_IMM_OFF),		// OP_STRB_P_ASR_IMM_OFF
+/* 0111 1100 0101 */ TABDECL(OP_UND),
+/* 0111 1100 0110 */ TABDECL(OP_STRB_P_ROR_IMM_OFF),		// OP_STRB_P_ROR_IMM_OFF
+/* 0111 1100 0111 */ TABDECL(OP_UND),
+/* 0111 1100 1000 */ TABDECL(OP_STRB_P_LSL_IMM_OFF),		// OP_STRB_P_LSL_IMM_OFF
+/* 0111 1100 1001 */ TABDECL(OP_UND),
+/* 0111 1100 1010 */ TABDECL(OP_STRB_P_LSR_IMM_OFF),		// OP_STRB_P_LSR_IMM_OFF
+/* 0111 1100 1011 */ TABDECL(OP_UND),
+/* 0111 1100 1100 */ TABDECL(OP_STRB_P_ASR_IMM_OFF),		// OP_STRB_P_ASR_IMM_OFF
+/* 0111 1100 1101 */ TABDECL(OP_UND),
+/* 0111 1100 1110 */ TABDECL(OP_STRB_P_ROR_IMM_OFF),		// OP_STRB_P_ROR_IMM_OFF
+/* 0111 1100 1111 */ TABDECL(OP_UND),
+
+/* 0111 1101 0000 */ TABDECL(OP_LDRB_P_LSL_IMM_OFF),		// OP_LDRB_P_LSL_IMM_OFF
+/* 0111 1101 0001 */ TABDECL(OP_UND),
+/* 0111 1101 0010 */ TABDECL(OP_LDRB_P_LSR_IMM_OFF),		// OP_LDRB_P_LSR_IMM_OFF
+/* 0111 1101 0011 */ TABDECL(OP_UND),
+/* 0111 1101 0100 */ TABDECL(OP_LDRB_P_ASR_IMM_OFF),		// OP_LDRB_P_ASR_IMM_OFF
+/* 0111 1101 0101 */ TABDECL(OP_UND),
+/* 0111 1101 0110 */ TABDECL(OP_LDRB_P_ROR_IMM_OFF),		// OP_LDRB_P_ROR_IMM_OFF
+/* 0111 1101 0111 */ TABDECL(OP_UND),
+/* 0111 1101 1000 */ TABDECL(OP_LDRB_P_LSL_IMM_OFF),		// OP_LDRB_P_LSL_IMM_OFF
+/* 0111 1101 1001 */ TABDECL(OP_UND),
+/* 0111 1101 1010 */ TABDECL(OP_LDRB_P_LSR_IMM_OFF),		// OP_LDRB_P_LSR_IMM_OFF
+/* 0111 1101 1011 */ TABDECL(OP_UND),
+/* 0111 1101 1100 */ TABDECL(OP_LDRB_P_ASR_IMM_OFF),		// OP_LDRB_P_ASR_IMM_OFF
+/* 0111 1101 1101 */ TABDECL(OP_UND),
+/* 0111 1101 1110 */ TABDECL(OP_LDRB_P_ROR_IMM_OFF),		// OP_LDRB_P_ROR_IMM_OFF
+/* 0111 1101 1111 */ TABDECL(OP_UND),
+
+/* 0111 1110 0000 */ TABDECL(OP_STRB_P_LSL_IMM_OFF_PREIND),		// OP_STRB_P_LSL_IMM_OFF_PREIND
+/* 0111 1110 0001 */ TABDECL(OP_UND),
+/* 0111 1110 0010 */ TABDECL(OP_STRB_P_LSR_IMM_OFF_PREIND),		// OP_STRB_P_LSR_IMM_OFF_PREIND
+/* 0111 1110 0011 */ TABDECL(OP_UND),
+/* 0111 1110 0100 */ TABDECL(OP_STRB_P_ASR_IMM_OFF_PREIND),		// OP_STRB_P_ASR_IMM_OFF_PREIND
+/* 0111 1110 0101 */ TABDECL(OP_UND),
+/* 0111 1110 0110 */ TABDECL(OP_STRB_P_ROR_IMM_OFF_PREIND),		// OP_STRB_P_ROR_IMM_OFF_PREIND
+/* 0111 1110 0111 */ TABDECL(OP_UND),
+/* 0111 1110 1000 */ TABDECL(OP_STRB_P_LSL_IMM_OFF_PREIND),		// OP_STRB_P_LSL_IMM_OFF_PREIND
+/* 0111 1110 1001 */ TABDECL(OP_UND),
+/* 0111 1110 1010 */ TABDECL(OP_STRB_P_LSR_IMM_OFF_PREIND),		// OP_STRB_P_LSR_IMM_OFF_PREIND
+/* 0111 1110 1011 */ TABDECL(OP_UND),
+/* 0111 1110 1100 */ TABDECL(OP_STRB_P_ASR_IMM_OFF_PREIND),		// OP_STRB_P_ASR_IMM_OFF_PREIND
+/* 0111 1110 1101 */ TABDECL(OP_UND),
+/* 0111 1110 1110 */ TABDECL(OP_STRB_P_ROR_IMM_OFF_PREIND),		// OP_STRB_P_ROR_IMM_OFF_PREIND
+/* 0111 1110 1111 */ TABDECL(OP_UND),
+
+/* 0111 1111 0000 */ TABDECL(OP_LDRB_P_LSL_IMM_OFF_PREIND),		// OP_LDRB_P_LSL_IMM_OFF_PREIND
+/* 0111 1111 0001 */ TABDECL(OP_UND),
+/* 0111 1111 0010 */ TABDECL(OP_LDRB_P_LSR_IMM_OFF_PREIND),		// OP_LDRB_P_LSR_IMM_OFF_PREIND
+/* 0111 1111 0011 */ TABDECL(OP_UND),
+/* 0111 1111 0100 */ TABDECL(OP_LDRB_P_ASR_IMM_OFF_PREIND),		// OP_LDRB_P_ASR_IMM_OFF_PREIND
+/* 0111 1111 0101 */ TABDECL(OP_UND),
+/* 0111 1111 0110 */ TABDECL(OP_LDRB_P_ROR_IMM_OFF_PREIND),		// OP_LDRB_P_ROR_IMM_OFF_PREIND
+/* 0111 1111 0111 */ TABDECL(OP_UND),
+/* 0111 1111 1000 */ TABDECL(OP_LDRB_P_LSL_IMM_OFF_PREIND),		// OP_LDRB_P_LSL_IMM_OFF_PREIND
+/* 0111 1111 1001 */ TABDECL(OP_UND),
+/* 0111 1111 1010 */ TABDECL(OP_LDRB_P_LSR_IMM_OFF_PREIND),		// OP_LDRB_P_LSR_IMM_OFF_PREIND
+/* 0111 1111 1011 */ TABDECL(OP_UND),
+/* 0111 1111 1100 */ TABDECL(OP_LDRB_P_ASR_IMM_OFF_PREIND),		// OP_LDRB_P_ASR_IMM_OFF_PREIND
+/* 0111 1111 1101 */ TABDECL(OP_UND),
+/* 0111 1111 1110 */ TABDECL(OP_LDRB_P_ROR_IMM_OFF_PREIND),		// OP_LDRB_P_ROR_IMM_OFF_PREIND
+/* 0111 1111 1111 */ TABDECL(OP_UND),
+
+/* 1000 0000 0000 */ TABDECL(OP_STMDA),		// OP_STMDA
+/* 1000 0000 0001 */ TABDECL(OP_STMDA),		// OP_STMDA
+/* 1000 0000 0010 */ TABDECL(OP_STMDA),		// OP_STMDA
+/* 1000 0000 0011 */ TABDECL(OP_STMDA),		// OP_STMDA
+/* 1000 0000 0100 */ TABDECL(OP_STMDA),		// OP_STMDA
+/* 1000 0000 0101 */ TABDECL(OP_STMDA),		// OP_STMDA
+/* 1000 0000 0110 */ TABDECL(OP_STMDA),		// OP_STMDA
+/* 1000 0000 0111 */ TABDECL(OP_STMDA),		// OP_STMDA
+/* 1000 0000 1000 */ TABDECL(OP_STMDA),		// OP_STMDA
+/* 1000 0000 1001 */ TABDECL(OP_STMDA),		// OP_STMDA
+/* 1000 0000 1010 */ TABDECL(OP_STMDA),		// OP_STMDA
+/* 1000 0000 1011 */ TABDECL(OP_STMDA),		// OP_STMDA
+/* 1000 0000 1100 */ TABDECL(OP_STMDA),		// OP_STMDA
+/* 1000 0000 1101 */ TABDECL(OP_STMDA),		// OP_STMDA
+/* 1000 0000 1110 */ TABDECL(OP_STMDA),		// OP_STMDA
+/* 1000 0000 1111 */ TABDECL(OP_STMDA),		// OP_STMDA
+
+/* 1000 0001 0000 */ TABDECL(OP_LDMDA),		// OP_LDMDA
+/* 1000 0001 0001 */ TABDECL(OP_LDMDA),		// OP_LDMDA
+/* 1000 0001 0010 */ TABDECL(OP_LDMDA),		// OP_LDMDA
+/* 1000 0001 0011 */ TABDECL(OP_LDMDA),		// OP_LDMDA
+/* 1000 0001 0100 */ TABDECL(OP_LDMDA),		// OP_LDMDA
+/* 1000 0001 0101 */ TABDECL(OP_LDMDA),		// OP_LDMDA
+/* 1000 0001 0110 */ TABDECL(OP_LDMDA),		// OP_LDMDA
+/* 1000 0001 0111 */ TABDECL(OP_LDMDA),		// OP_LDMDA
+/* 1000 0001 1000 */ TABDECL(OP_LDMDA),		// OP_LDMDA
+/* 1000 0001 1001 */ TABDECL(OP_LDMDA),		// OP_LDMDA
+/* 1000 0001 1010 */ TABDECL(OP_LDMDA),		// OP_LDMDA
+/* 1000 0001 1011 */ TABDECL(OP_LDMDA),		// OP_LDMDA
+/* 1000 0001 1100 */ TABDECL(OP_LDMDA),		// OP_LDMDA
+/* 1000 0001 1101 */ TABDECL(OP_LDMDA),		// OP_LDMDA
+/* 1000 0001 1110 */ TABDECL(OP_LDMDA),		// OP_LDMDA
+/* 1000 0001 1111 */ TABDECL(OP_LDMDA),		// OP_LDMDA
+
+/* 1000 0010 0000 */ TABDECL(OP_STMDA_W),		// OP_STMDA_W
+/* 1000 0010 0001 */ TABDECL(OP_STMDA_W),		// OP_STMDA_W
+/* 1000 0010 0010 */ TABDECL(OP_STMDA_W),		// OP_STMDA_W
+/* 1000 0010 0011 */ TABDECL(OP_STMDA_W),		// OP_STMDA_W
+/* 1000 0010 0100 */ TABDECL(OP_STMDA_W),		// OP_STMDA_W
+/* 1000 0010 0101 */ TABDECL(OP_STMDA_W),		// OP_STMDA_W
+/* 1000 0010 0110 */ TABDECL(OP_STMDA_W),		// OP_STMDA_W
+/* 1000 0010 0111 */ TABDECL(OP_STMDA_W),		// OP_STMDA_W
+/* 1000 0010 1000 */ TABDECL(OP_STMDA_W),		// OP_STMDA_W
+/* 1000 0010 1001 */ TABDECL(OP_STMDA_W),		// OP_STMDA_W
+/* 1000 0010 1010 */ TABDECL(OP_STMDA_W),		// OP_STMDA_W
+/* 1000 0010 1011 */ TABDECL(OP_STMDA_W),		// OP_STMDA_W
+/* 1000 0010 1100 */ TABDECL(OP_STMDA_W),		// OP_STMDA_W
+/* 1000 0010 1101 */ TABDECL(OP_STMDA_W),		// OP_STMDA_W
+/* 1000 0010 1110 */ TABDECL(OP_STMDA_W),		// OP_STMDA_W
+/* 1000 0010 1111 */ TABDECL(OP_STMDA_W),		// OP_STMDA_W
+
+/* 1000 0011 0000 */ TABDECL(OP_LDMDA_W),		// OP_LDMDA_W
+/* 1000 0011 0001 */ TABDECL(OP_LDMDA_W),		// OP_LDMDA_W
+/* 1000 0011 0010 */ TABDECL(OP_LDMDA_W),		// OP_LDMDA_W
+/* 1000 0011 0011 */ TABDECL(OP_LDMDA_W),		// OP_LDMDA_W
+/* 1000 0011 0100 */ TABDECL(OP_LDMDA_W),		// OP_LDMDA_W
+/* 1000 0011 0101 */ TABDECL(OP_LDMDA_W),		// OP_LDMDA_W
+/* 1000 0011 0110 */ TABDECL(OP_LDMDA_W),		// OP_LDMDA_W
+/* 1000 0011 0111 */ TABDECL(OP_LDMDA_W),		// OP_LDMDA_W
+/* 1000 0011 1000 */ TABDECL(OP_LDMDA_W),		// OP_LDMDA_W
+/* 1000 0011 1001 */ TABDECL(OP_LDMDA_W),		// OP_LDMDA_W
+/* 1000 0011 1010 */ TABDECL(OP_LDMDA_W),		// OP_LDMDA_W
+/* 1000 0011 1011 */ TABDECL(OP_LDMDA_W),		// OP_LDMDA_W
+/* 1000 0011 1100 */ TABDECL(OP_LDMDA_W),		// OP_LDMDA_W
+/* 1000 0011 1101 */ TABDECL(OP_LDMDA_W),		// OP_LDMDA_W
+/* 1000 0011 1110 */ TABDECL(OP_LDMDA_W),		// OP_LDMDA_W
+/* 1000 0011 1111 */ TABDECL(OP_LDMDA_W),		// OP_LDMDA_W
+
+/* 1000 0100 0000 */ TABDECL(OP_STMDA2),		// OP_STMDA2
+/* 1000 0100 0001 */ TABDECL(OP_STMDA2),		// OP_STMDA2
+/* 1000 0100 0010 */ TABDECL(OP_STMDA2),		// OP_STMDA2
+/* 1000 0100 0011 */ TABDECL(OP_STMDA2),		// OP_STMDA2
+/* 1000 0100 0100 */ TABDECL(OP_STMDA2),		// OP_STMDA2
+/* 1000 0100 0101 */ TABDECL(OP_STMDA2),		// OP_STMDA2
+/* 1000 0100 0110 */ TABDECL(OP_STMDA2),		// OP_STMDA2
+/* 1000 0100 0111 */ TABDECL(OP_STMDA2),		// OP_STMDA2
+/* 1000 0100 1000 */ TABDECL(OP_STMDA2),		// OP_STMDA2
+/* 1000 0100 1001 */ TABDECL(OP_STMDA2),		// OP_STMDA2
+/* 1000 0100 1010 */ TABDECL(OP_STMDA2),		// OP_STMDA2
+/* 1000 0100 1011 */ TABDECL(OP_STMDA2),		// OP_STMDA2
+/* 1000 0100 1100 */ TABDECL(OP_STMDA2),		// OP_STMDA2
+/* 1000 0100 1101 */ TABDECL(OP_STMDA2),		// OP_STMDA2
+/* 1000 0100 1110 */ TABDECL(OP_STMDA2),		// OP_STMDA2
+/* 1000 0100 1111 */ TABDECL(OP_STMDA2),		// OP_STMDA2
+
+/* 1000 0101 0000 */ TABDECL(OP_LDMDA2),		// OP_LDMDA2
+/* 1000 0101 0001 */ TABDECL(OP_LDMDA2),		// OP_LDMDA2
+/* 1000 0101 0010 */ TABDECL(OP_LDMDA2),		// OP_LDMDA2
+/* 1000 0101 0011 */ TABDECL(OP_LDMDA2),		// OP_LDMDA2
+/* 1000 0101 0100 */ TABDECL(OP_LDMDA2),		// OP_LDMDA2
+/* 1000 0101 0101 */ TABDECL(OP_LDMDA2),		// OP_LDMDA2
+/* 1000 0101 0110 */ TABDECL(OP_LDMDA2),		// OP_LDMDA2
+/* 1000 0101 0111 */ TABDECL(OP_LDMDA2),		// OP_LDMDA2
+/* 1000 0101 1000 */ TABDECL(OP_LDMDA2),		// OP_LDMDA2
+/* 1000 0101 1001 */ TABDECL(OP_LDMDA2),		// OP_LDMDA2
+/* 1000 0101 1010 */ TABDECL(OP_LDMDA2),		// OP_LDMDA2
+/* 1000 0101 1011 */ TABDECL(OP_LDMDA2),		// OP_LDMDA2
+/* 1000 0101 1100 */ TABDECL(OP_LDMDA2),		// OP_LDMDA2
+/* 1000 0101 1101 */ TABDECL(OP_LDMDA2),		// OP_LDMDA2
+/* 1000 0101 1110 */ TABDECL(OP_LDMDA2),		// OP_LDMDA2
+/* 1000 0101 1111 */ TABDECL(OP_LDMDA2),		// OP_LDMDA2
+
+/* 1000 0110 0000 */ TABDECL(OP_STMDA2_W),		// OP_STMDA2_W
+/* 1000 0110 0001 */ TABDECL(OP_STMDA2_W),		// OP_STMDA2_W
+/* 1000 0110 0010 */ TABDECL(OP_STMDA2_W),		// OP_STMDA2_W
+/* 1000 0110 0011 */ TABDECL(OP_STMDA2_W),		// OP_STMDA2_W
+/* 1000 0110 0100 */ TABDECL(OP_STMDA2_W),		// OP_STMDA2_W
+/* 1000 0110 0101 */ TABDECL(OP_STMDA2_W),		// OP_STMDA2_W
+/* 1000 0110 0110 */ TABDECL(OP_STMDA2_W),		// OP_STMDA2_W
+/* 1000 0110 0111 */ TABDECL(OP_STMDA2_W),		// OP_STMDA2_W
+/* 1000 0110 1000 */ TABDECL(OP_STMDA2_W),		// OP_STMDA2_W
+/* 1000 0110 1001 */ TABDECL(OP_STMDA2_W),		// OP_STMDA2_W
+/* 1000 0110 1010 */ TABDECL(OP_STMDA2_W),		// OP_STMDA2_W
+/* 1000 0110 1011 */ TABDECL(OP_STMDA2_W),		// OP_STMDA2_W
+/* 1000 0110 1100 */ TABDECL(OP_STMDA2_W),		// OP_STMDA2_W
+/* 1000 0110 1101 */ TABDECL(OP_STMDA2_W),		// OP_STMDA2_W
+/* 1000 0110 1110 */ TABDECL(OP_STMDA2_W),		// OP_STMDA2_W
+/* 1000 0110 1111 */ TABDECL(OP_STMDA2_W),		// OP_STMDA2_W
+
+/* 1000 0111 0000 */ TABDECL(OP_LDMDA2_W),		// OP_LDMDA2_W
+/* 1000 0111 0001 */ TABDECL(OP_LDMDA2_W),		// OP_LDMDA2_W
+/* 1000 0111 0010 */ TABDECL(OP_LDMDA2_W),		// OP_LDMDA2_W
+/* 1000 0111 0011 */ TABDECL(OP_LDMDA2_W),		// OP_LDMDA2_W
+/* 1000 0111 0100 */ TABDECL(OP_LDMDA2_W),		// OP_LDMDA2_W
+/* 1000 0111 0101 */ TABDECL(OP_LDMDA2_W),		// OP_LDMDA2_W
+/* 1000 0111 0110 */ TABDECL(OP_LDMDA2_W),		// OP_LDMDA2_W
+/* 1000 0111 0111 */ TABDECL(OP_LDMDA2_W),		// OP_LDMDA2_W
+/* 1000 0111 1000 */ TABDECL(OP_LDMDA2_W),		// OP_LDMDA2_W
+/* 1000 0111 1001 */ TABDECL(OP_LDMDA2_W),		// OP_LDMDA2_W
+/* 1000 0111 1010 */ TABDECL(OP_LDMDA2_W),		// OP_LDMDA2_W
+/* 1000 0111 1011 */ TABDECL(OP_LDMDA2_W),		// OP_LDMDA2_W
+/* 1000 0111 1100 */ TABDECL(OP_LDMDA2_W),		// OP_LDMDA2_W
+/* 1000 0111 1101 */ TABDECL(OP_LDMDA2_W),		// OP_LDMDA2_W
+/* 1000 0111 1110 */ TABDECL(OP_LDMDA2_W),		// OP_LDMDA2_W
+/* 1000 0111 1111 */ TABDECL(OP_LDMDA2_W),		// OP_LDMDA2_W
+
+/* 1000 1000 0000 */ TABDECL(OP_STMIA),		// OP_STMIA
+/* 1000 1000 0001 */ TABDECL(OP_STMIA),		// OP_STMIA
+/* 1000 1000 0010 */ TABDECL(OP_STMIA),		// OP_STMIA
+/* 1000 1000 0011 */ TABDECL(OP_STMIA),		// OP_STMIA
+/* 1000 1000 0100 */ TABDECL(OP_STMIA),		// OP_STMIA
+/* 1000 1000 0101 */ TABDECL(OP_STMIA),		// OP_STMIA
+/* 1000 1000 0110 */ TABDECL(OP_STMIA),		// OP_STMIA
+/* 1000 1000 0111 */ TABDECL(OP_STMIA),		// OP_STMIA
+/* 1000 1000 1000 */ TABDECL(OP_STMIA),		// OP_STMIA
+/* 1000 1000 1001 */ TABDECL(OP_STMIA),		// OP_STMIA
+/* 1000 1000 1010 */ TABDECL(OP_STMIA),		// OP_STMIA
+/* 1000 1000 1011 */ TABDECL(OP_STMIA),		// OP_STMIA
+/* 1000 1000 1100 */ TABDECL(OP_STMIA),		// OP_STMIA
+/* 1000 1000 1101 */ TABDECL(OP_STMIA),		// OP_STMIA
+/* 1000 1000 1110 */ TABDECL(OP_STMIA),		// OP_STMIA
+/* 1000 1000 1111 */ TABDECL(OP_STMIA),		// OP_STMIA
+
+/* 1000 1001 0000 */ TABDECL(OP_LDMIA),		// OP_LDMIA
+/* 1000 1001 0001 */ TABDECL(OP_LDMIA),		// OP_LDMIA
+/* 1000 1001 0010 */ TABDECL(OP_LDMIA),		// OP_LDMIA
+/* 1000 1001 0011 */ TABDECL(OP_LDMIA),		// OP_LDMIA
+/* 1000 1001 0100 */ TABDECL(OP_LDMIA),		// OP_LDMIA
+/* 1000 1001 0101 */ TABDECL(OP_LDMIA),		// OP_LDMIA
+/* 1000 1001 0110 */ TABDECL(OP_LDMIA),		// OP_LDMIA
+/* 1000 1001 0111 */ TABDECL(OP_LDMIA),		// OP_LDMIA
+/* 1000 1001 1000 */ TABDECL(OP_LDMIA),		// OP_LDMIA
+/* 1000 1001 1001 */ TABDECL(OP_LDMIA),		// OP_LDMIA
+/* 1000 1001 1010 */ TABDECL(OP_LDMIA),		// OP_LDMIA
+/* 1000 1001 1011 */ TABDECL(OP_LDMIA),		// OP_LDMIA
+/* 1000 1001 1100 */ TABDECL(OP_LDMIA),		// OP_LDMIA
+/* 1000 1001 1101 */ TABDECL(OP_LDMIA),		// OP_LDMIA
+/* 1000 1001 1110 */ TABDECL(OP_LDMIA),		// OP_LDMIA
+/* 1000 1001 1111 */ TABDECL(OP_LDMIA),		// OP_LDMIA
+
+/* 1000 1010 0000 */ TABDECL(OP_STMIA_W),		// OP_STMIA_W
+/* 1000 1010 0001 */ TABDECL(OP_STMIA_W),		// OP_STMIA_W
+/* 1000 1010 0010 */ TABDECL(OP_STMIA_W),		// OP_STMIA_W
+/* 1000 1010 0011 */ TABDECL(OP_STMIA_W),		// OP_STMIA_W
+/* 1000 1010 0100 */ TABDECL(OP_STMIA_W),		// OP_STMIA_W
+/* 1000 1010 0101 */ TABDECL(OP_STMIA_W),		// OP_STMIA_W
+/* 1000 1010 0110 */ TABDECL(OP_STMIA_W),		// OP_STMIA_W
+/* 1000 1010 0111 */ TABDECL(OP_STMIA_W),		// OP_STMIA_W
+/* 1000 1010 1000 */ TABDECL(OP_STMIA_W),		// OP_STMIA_W
+/* 1000 1010 1001 */ TABDECL(OP_STMIA_W),		// OP_STMIA_W
+/* 1000 1010 1010 */ TABDECL(OP_STMIA_W),		// OP_STMIA_W
+/* 1000 1010 1011 */ TABDECL(OP_STMIA_W),		// OP_STMIA_W
+/* 1000 1010 1100 */ TABDECL(OP_STMIA_W),		// OP_STMIA_W
+/* 1000 1010 1101 */ TABDECL(OP_STMIA_W),		// OP_STMIA_W
+/* 1000 1010 1110 */ TABDECL(OP_STMIA_W),		// OP_STMIA_W
+/* 1000 1010 1111 */ TABDECL(OP_STMIA_W),		// OP_STMIA_W
+
+/* 1000 1011 0000 */ TABDECL(OP_LDMIA_W),		// OP_LDMIA_W
+/* 1000 1011 0001 */ TABDECL(OP_LDMIA_W),		// OP_LDMIA_W
+/* 1000 1011 0010 */ TABDECL(OP_LDMIA_W),		// OP_LDMIA_W
+/* 1000 1011 0011 */ TABDECL(OP_LDMIA_W),		// OP_LDMIA_W
+/* 1000 1011 0100 */ TABDECL(OP_LDMIA_W),		// OP_LDMIA_W
+/* 1000 1011 0101 */ TABDECL(OP_LDMIA_W),		// OP_LDMIA_W
+/* 1000 1011 0110 */ TABDECL(OP_LDMIA_W),		// OP_LDMIA_W
+/* 1000 1011 0111 */ TABDECL(OP_LDMIA_W),		// OP_LDMIA_W
+/* 1000 1011 1000 */ TABDECL(OP_LDMIA_W),		// OP_LDMIA_W
+/* 1000 1011 1001 */ TABDECL(OP_LDMIA_W),		// OP_LDMIA_W
+/* 1000 1011 1010 */ TABDECL(OP_LDMIA_W),		// OP_LDMIA_W
+/* 1000 1011 1011 */ TABDECL(OP_LDMIA_W),		// OP_LDMIA_W
+/* 1000 1011 1100 */ TABDECL(OP_LDMIA_W),		// OP_LDMIA_W
+/* 1000 1011 1101 */ TABDECL(OP_LDMIA_W),		// OP_LDMIA_W
+/* 1000 1011 1110 */ TABDECL(OP_LDMIA_W),		// OP_LDMIA_W
+/* 1000 1011 1111 */ TABDECL(OP_LDMIA_W),		// OP_LDMIA_W
+
+/* 1000 1100 0000 */ TABDECL(OP_STMIA2),		// OP_STMIA2
+/* 1000 1100 0001 */ TABDECL(OP_STMIA2),		// OP_STMIA2
+/* 1000 1100 0010 */ TABDECL(OP_STMIA2),		// OP_STMIA2
+/* 1000 1100 0011 */ TABDECL(OP_STMIA2),		// OP_STMIA2
+/* 1000 1100 0100 */ TABDECL(OP_STMIA2),		// OP_STMIA2
+/* 1000 1100 0101 */ TABDECL(OP_STMIA2),		// OP_STMIA2
+/* 1000 1100 0110 */ TABDECL(OP_STMIA2),		// OP_STMIA2
+/* 1000 1100 0111 */ TABDECL(OP_STMIA2),		// OP_STMIA2
+/* 1000 1100 1000 */ TABDECL(OP_STMIA2),		// OP_STMIA2
+/* 1000 1100 1001 */ TABDECL(OP_STMIA2),		// OP_STMIA2
+/* 1000 1100 1010 */ TABDECL(OP_STMIA2),		// OP_STMIA2
+/* 1000 1100 1011 */ TABDECL(OP_STMIA2),		// OP_STMIA2
+/* 1000 1100 1100 */ TABDECL(OP_STMIA2),		// OP_STMIA2
+/* 1000 1100 1101 */ TABDECL(OP_STMIA2),		// OP_STMIA2
+/* 1000 1100 1110 */ TABDECL(OP_STMIA2),		// OP_STMIA2
+/* 1000 1100 1111 */ TABDECL(OP_STMIA2),		// OP_STMIA2
+
+/* 1000 1101 0000 */ TABDECL(OP_LDMIA2),		// OP_LDMIA2
+/* 1000 1101 0001 */ TABDECL(OP_LDMIA2),		// OP_LDMIA2
+/* 1000 1101 0010 */ TABDECL(OP_LDMIA2),		// OP_LDMIA2
+/* 1000 1101 0011 */ TABDECL(OP_LDMIA2),		// OP_LDMIA2
+/* 1000 1101 0100 */ TABDECL(OP_LDMIA2),		// OP_LDMIA2
+/* 1000 1101 0101 */ TABDECL(OP_LDMIA2),		// OP_LDMIA2
+/* 1000 1101 0110 */ TABDECL(OP_LDMIA2),		// OP_LDMIA2
+/* 1000 1101 0111 */ TABDECL(OP_LDMIA2),		// OP_LDMIA2
+/* 1000 1101 1000 */ TABDECL(OP_LDMIA2),		// OP_LDMIA2
+/* 1000 1101 1001 */ TABDECL(OP_LDMIA2),		// OP_LDMIA2
+/* 1000 1101 1010 */ TABDECL(OP_LDMIA2),		// OP_LDMIA2
+/* 1000 1101 1011 */ TABDECL(OP_LDMIA2),		// OP_LDMIA2
+/* 1000 1101 1100 */ TABDECL(OP_LDMIA2),		// OP_LDMIA2
+/* 1000 1101 1101 */ TABDECL(OP_LDMIA2),		// OP_LDMIA2
+/* 1000 1101 1110 */ TABDECL(OP_LDMIA2),		// OP_LDMIA2
+/* 1000 1101 1111 */ TABDECL(OP_LDMIA2),		// OP_LDMIA2
+
+/* 1000 1110 0000 */ TABDECL(OP_STMIA2_W),		// OP_STMIA2_W
+/* 1000 1110 0001 */ TABDECL(OP_STMIA2_W),		// OP_STMIA2_W
+/* 1000 1110 0010 */ TABDECL(OP_STMIA2_W),		// OP_STMIA2_W
+/* 1000 1110 0011 */ TABDECL(OP_STMIA2_W),		// OP_STMIA2_W
+/* 1000 1110 0100 */ TABDECL(OP_STMIA2_W),		// OP_STMIA2_W
+/* 1000 1110 0101 */ TABDECL(OP_STMIA2_W),		// OP_STMIA2_W
+/* 1000 1110 0110 */ TABDECL(OP_STMIA2_W),		// OP_STMIA2_W
+/* 1000 1110 0111 */ TABDECL(OP_STMIA2_W),		// OP_STMIA2_W
+/* 1000 1110 1000 */ TABDECL(OP_STMIA2_W),		// OP_STMIA2_W
+/* 1000 1110 1001 */ TABDECL(OP_STMIA2_W),		// OP_STMIA2_W
+/* 1000 1110 1010 */ TABDECL(OP_STMIA2_W),		// OP_STMIA2_W
+/* 1000 1110 1011 */ TABDECL(OP_STMIA2_W),		// OP_STMIA2_W
+/* 1000 1110 1100 */ TABDECL(OP_STMIA2_W),		// OP_STMIA2_W
+/* 1000 1110 1101 */ TABDECL(OP_STMIA2_W),		// OP_STMIA2_W
+/* 1000 1110 1110 */ TABDECL(OP_STMIA2_W),		// OP_STMIA2_W
+/* 1000 1110 1111 */ TABDECL(OP_STMIA2_W),		// OP_STMIA2_W
+
+/* 1000 1111 0000 */ TABDECL(OP_LDMIA2_W),		// OP_LDMIA2_W
+/* 1000 1111 0001 */ TABDECL(OP_LDMIA2_W),		// OP_LDMIA2_W
+/* 1000 1111 0010 */ TABDECL(OP_LDMIA2_W),		// OP_LDMIA2_W
+/* 1000 1111 0011 */ TABDECL(OP_LDMIA2_W),		// OP_LDMIA2_W
+/* 1000 1111 0100 */ TABDECL(OP_LDMIA2_W),		// OP_LDMIA2_W
+/* 1000 1111 0101 */ TABDECL(OP_LDMIA2_W),		// OP_LDMIA2_W
+/* 1000 1111 0110 */ TABDECL(OP_LDMIA2_W),		// OP_LDMIA2_W
+/* 1000 1111 0111 */ TABDECL(OP_LDMIA2_W),		// OP_LDMIA2_W
+/* 1000 1111 1000 */ TABDECL(OP_LDMIA2_W),		// OP_LDMIA2_W
+/* 1000 1111 1001 */ TABDECL(OP_LDMIA2_W),		// OP_LDMIA2_W
+/* 1000 1111 1010 */ TABDECL(OP_LDMIA2_W),		// OP_LDMIA2_W
+/* 1000 1111 1011 */ TABDECL(OP_LDMIA2_W),		// OP_LDMIA2_W
+/* 1000 1111 1100 */ TABDECL(OP_LDMIA2_W),		// OP_LDMIA2_W
+/* 1000 1111 1101 */ TABDECL(OP_LDMIA2_W),		// OP_LDMIA2_W
+/* 1000 1111 1110 */ TABDECL(OP_LDMIA2_W),		// OP_LDMIA2_W
+/* 1000 1111 1111 */ TABDECL(OP_LDMIA2_W),		// OP_LDMIA2_W
+
+/* 1001 0000 0000 */ TABDECL(OP_STMDB),		// OP_STMDB
+/* 1001 0000 0001 */ TABDECL(OP_STMDB),		// OP_STMDB
+/* 1001 0000 0010 */ TABDECL(OP_STMDB),		// OP_STMDB
+/* 1001 0000 0011 */ TABDECL(OP_STMDB),		// OP_STMDB
+/* 1001 0000 0100 */ TABDECL(OP_STMDB),		// OP_STMDB
+/* 1001 0000 0101 */ TABDECL(OP_STMDB),		// OP_STMDB
+/* 1001 0000 0110 */ TABDECL(OP_STMDB),		// OP_STMDB
+/* 1001 0000 0111 */ TABDECL(OP_STMDB),		// OP_STMDB
+/* 1001 0000 1000 */ TABDECL(OP_STMDB),		// OP_STMDB
+/* 1001 0000 1001 */ TABDECL(OP_STMDB),		// OP_STMDB
+/* 1001 0000 1010 */ TABDECL(OP_STMDB),		// OP_STMDB
+/* 1001 0000 1011 */ TABDECL(OP_STMDB),		// OP_STMDB
+/* 1001 0000 1100 */ TABDECL(OP_STMDB),		// OP_STMDB
+/* 1001 0000 1101 */ TABDECL(OP_STMDB),		// OP_STMDB
+/* 1001 0000 1110 */ TABDECL(OP_STMDB),		// OP_STMDB
+/* 1001 0000 1111 */ TABDECL(OP_STMDB),		// OP_STMDB
+
+/* 1001 0001 0000 */ TABDECL(OP_LDMDB),		// OP_LDMDB
+/* 1001 0001 0001 */ TABDECL(OP_LDMDB),		// OP_LDMDB
+/* 1001 0001 0010 */ TABDECL(OP_LDMDB),		// OP_LDMDB
+/* 1001 0001 0011 */ TABDECL(OP_LDMDB),		// OP_LDMDB
+/* 1001 0001 0100 */ TABDECL(OP_LDMDB),		// OP_LDMDB
+/* 1001 0001 0101 */ TABDECL(OP_LDMDB),		// OP_LDMDB
+/* 1001 0001 0110 */ TABDECL(OP_LDMDB),		// OP_LDMDB
+/* 1001 0001 0111 */ TABDECL(OP_LDMDB),		// OP_LDMDB
+/* 1001 0001 1000 */ TABDECL(OP_LDMDB),		// OP_LDMDB
+/* 1001 0001 1001 */ TABDECL(OP_LDMDB),		// OP_LDMDB
+/* 1001 0001 1010 */ TABDECL(OP_LDMDB),		// OP_LDMDB
+/* 1001 0001 1011 */ TABDECL(OP_LDMDB),		// OP_LDMDB
+/* 1001 0001 1100 */ TABDECL(OP_LDMDB),		// OP_LDMDB
+/* 1001 0001 1101 */ TABDECL(OP_LDMDB),		// OP_LDMDB
+/* 1001 0001 1110 */ TABDECL(OP_LDMDB),		// OP_LDMDB
+/* 1001 0001 1111 */ TABDECL(OP_LDMDB),		// OP_LDMDB
+
+/* 1001 0010 0000 */ TABDECL(OP_STMDB_W),		// OP_STMDB_W
+/* 1001 0010 0001 */ TABDECL(OP_STMDB_W),		// OP_STMDB_W
+/* 1001 0010 0010 */ TABDECL(OP_STMDB_W),		// OP_STMDB_W
+/* 1001 0010 0011 */ TABDECL(OP_STMDB_W),		// OP_STMDB_W
+/* 1001 0010 0100 */ TABDECL(OP_STMDB_W),		// OP_STMDB_W
+/* 1001 0010 0101 */ TABDECL(OP_STMDB_W),		// OP_STMDB_W
+/* 1001 0010 0110 */ TABDECL(OP_STMDB_W),		// OP_STMDB_W
+/* 1001 0010 0111 */ TABDECL(OP_STMDB_W),		// OP_STMDB_W
+/* 1001 0010 1000 */ TABDECL(OP_STMDB_W),		// OP_STMDB_W
+/* 1001 0010 1001 */ TABDECL(OP_STMDB_W),		// OP_STMDB_W
+/* 1001 0010 1010 */ TABDECL(OP_STMDB_W),		// OP_STMDB_W
+/* 1001 0010 1011 */ TABDECL(OP_STMDB_W),		// OP_STMDB_W
+/* 1001 0010 1100 */ TABDECL(OP_STMDB_W),		// OP_STMDB_W
+/* 1001 0010 1101 */ TABDECL(OP_STMDB_W),		// OP_STMDB_W
+/* 1001 0010 1110 */ TABDECL(OP_STMDB_W),		// OP_STMDB_W
+/* 1001 0010 1111 */ TABDECL(OP_STMDB_W),		// OP_STMDB_W
+
+/* 1001 0011 0000 */ TABDECL(OP_LDMDB_W),		// OP_LDMDB_W
+/* 1001 0011 0001 */ TABDECL(OP_LDMDB_W),		// OP_LDMDB_W
+/* 1001 0011 0010 */ TABDECL(OP_LDMDB_W),		// OP_LDMDB_W
+/* 1001 0011 0011 */ TABDECL(OP_LDMDB_W),		// OP_LDMDB_W
+/* 1001 0011 0100 */ TABDECL(OP_LDMDB_W),		// OP_LDMDB_W
+/* 1001 0011 0101 */ TABDECL(OP_LDMDB_W),		// OP_LDMDB_W
+/* 1001 0011 0110 */ TABDECL(OP_LDMDB_W),		// OP_LDMDB_W
+/* 1001 0011 0111 */ TABDECL(OP_LDMDB_W),		// OP_LDMDB_W
+/* 1001 0011 1000 */ TABDECL(OP_LDMDB_W),		// OP_LDMDB_W
+/* 1001 0011 1001 */ TABDECL(OP_LDMDB_W),		// OP_LDMDB_W
+/* 1001 0011 1010 */ TABDECL(OP_LDMDB_W),		// OP_LDMDB_W
+/* 1001 0011 1011 */ TABDECL(OP_LDMDB_W),		// OP_LDMDB_W
+/* 1001 0011 1100 */ TABDECL(OP_LDMDB_W),		// OP_LDMDB_W
+/* 1001 0011 1101 */ TABDECL(OP_LDMDB_W),		// OP_LDMDB_W
+/* 1001 0011 1110 */ TABDECL(OP_LDMDB_W),		// OP_LDMDB_W
+/* 1001 0011 1111 */ TABDECL(OP_LDMDB_W),		// OP_LDMDB_W
+
+/* 1001 0100 0000 */ TABDECL(OP_STMDB2),		// OP_STMDB2
+/* 1001 0100 0001 */ TABDECL(OP_STMDB2),		// OP_STMDB2
+/* 1001 0100 0010 */ TABDECL(OP_STMDB2),		// OP_STMDB2
+/* 1001 0100 0011 */ TABDECL(OP_STMDB2),		// OP_STMDB2
+/* 1001 0100 0100 */ TABDECL(OP_STMDB2),		// OP_STMDB2
+/* 1001 0100 0101 */ TABDECL(OP_STMDB2),		// OP_STMDB2
+/* 1001 0100 0110 */ TABDECL(OP_STMDB2),		// OP_STMDB2
+/* 1001 0100 0111 */ TABDECL(OP_STMDB2),		// OP_STMDB2
+/* 1001 0100 1000 */ TABDECL(OP_STMDB2),		// OP_STMDB2
+/* 1001 0100 1001 */ TABDECL(OP_STMDB2),		// OP_STMDB2
+/* 1001 0100 1010 */ TABDECL(OP_STMDB2),		// OP_STMDB2
+/* 1001 0100 1011 */ TABDECL(OP_STMDB2),		// OP_STMDB2
+/* 1001 0100 1100 */ TABDECL(OP_STMDB2),		// OP_STMDB2
+/* 1001 0100 1101 */ TABDECL(OP_STMDB2),		// OP_STMDB2
+/* 1001 0100 1110 */ TABDECL(OP_STMDB2),		// OP_STMDB2
+/* 1001 0100 1111 */ TABDECL(OP_STMDB2),		// OP_STMDB2
+
+/* 1001 0101 0000 */ TABDECL(OP_LDMDB2),		// OP_LDMDB2
+/* 1001 0101 0001 */ TABDECL(OP_LDMDB2),		// OP_LDMDB2
+/* 1001 0101 0010 */ TABDECL(OP_LDMDB2),		// OP_LDMDB2
+/* 1001 0101 0011 */ TABDECL(OP_LDMDB2),		// OP_LDMDB2
+/* 1001 0101 0100 */ TABDECL(OP_LDMDB2),		// OP_LDMDB2
+/* 1001 0101 0101 */ TABDECL(OP_LDMDB2),		// OP_LDMDB2
+/* 1001 0101 0110 */ TABDECL(OP_LDMDB2),		// OP_LDMDB2
+/* 1001 0101 0111 */ TABDECL(OP_LDMDB2),		// OP_LDMDB2
+/* 1001 0101 1000 */ TABDECL(OP_LDMDB2),		// OP_LDMDB2
+/* 1001 0101 1001 */ TABDECL(OP_LDMDB2),		// OP_LDMDB2
+/* 1001 0101 1010 */ TABDECL(OP_LDMDB2),		// OP_LDMDB2
+/* 1001 0101 1011 */ TABDECL(OP_LDMDB2),		// OP_LDMDB2
+/* 1001 0101 1100 */ TABDECL(OP_LDMDB2),		// OP_LDMDB2
+/* 1001 0101 1101 */ TABDECL(OP_LDMDB2),		// OP_LDMDB2
+/* 1001 0101 1110 */ TABDECL(OP_LDMDB2),		// OP_LDMDB2
+/* 1001 0101 1111 */ TABDECL(OP_LDMDB2),		// OP_LDMDB2
+
+/* 1001 0110 0000 */ TABDECL(OP_STMDB2_W),		// OP_STMDB2_W
+/* 1001 0110 0001 */ TABDECL(OP_STMDB2_W),		// OP_STMDB2_W
+/* 1001 0110 0010 */ TABDECL(OP_STMDB2_W),		// OP_STMDB2_W
+/* 1001 0110 0011 */ TABDECL(OP_STMDB2_W),		// OP_STMDB2_W
+/* 1001 0110 0100 */ TABDECL(OP_STMDB2_W),		// OP_STMDB2_W
+/* 1001 0110 0101 */ TABDECL(OP_STMDB2_W),		// OP_STMDB2_W
+/* 1001 0110 0110 */ TABDECL(OP_STMDB2_W),		// OP_STMDB2_W
+/* 1001 0110 0111 */ TABDECL(OP_STMDB2_W),		// OP_STMDB2_W
+/* 1001 0110 1000 */ TABDECL(OP_STMDB2_W),		// OP_STMDB2_W
+/* 1001 0110 1001 */ TABDECL(OP_STMDB2_W),		// OP_STMDB2_W
+/* 1001 0110 1010 */ TABDECL(OP_STMDB2_W),		// OP_STMDB2_W
+/* 1001 0110 1011 */ TABDECL(OP_STMDB2_W),		// OP_STMDB2_W
+/* 1001 0110 1100 */ TABDECL(OP_STMDB2_W),		// OP_STMDB2_W
+/* 1001 0110 1101 */ TABDECL(OP_STMDB2_W),		// OP_STMDB2_W
+/* 1001 0110 1110 */ TABDECL(OP_STMDB2_W),		// OP_STMDB2_W
+/* 1001 0110 1111 */ TABDECL(OP_STMDB2_W),		// OP_STMDB2_W
+
+/* 1001 0111 0000 */ TABDECL(OP_LDMDB2_W),		// OP_LDMDB2_W
+/* 1001 0111 0001 */ TABDECL(OP_LDMDB2_W),		// OP_LDMDB2_W
+/* 1001 0111 0010 */ TABDECL(OP_LDMDB2_W),		// OP_LDMDB2_W
+/* 1001 0111 0011 */ TABDECL(OP_LDMDB2_W),		// OP_LDMDB2_W
+/* 1001 0111 0100 */ TABDECL(OP_LDMDB2_W),		// OP_LDMDB2_W
+/* 1001 0111 0101 */ TABDECL(OP_LDMDB2_W),		// OP_LDMDB2_W
+/* 1001 0111 0110 */ TABDECL(OP_LDMDB2_W),		// OP_LDMDB2_W
+/* 1001 0111 0111 */ TABDECL(OP_LDMDB2_W),		// OP_LDMDB2_W
+/* 1001 0111 1000 */ TABDECL(OP_LDMDB2_W),		// OP_LDMDB2_W
+/* 1001 0111 1001 */ TABDECL(OP_LDMDB2_W),		// OP_LDMDB2_W
+/* 1001 0111 1010 */ TABDECL(OP_LDMDB2_W),		// OP_LDMDB2_W
+/* 1001 0111 1011 */ TABDECL(OP_LDMDB2_W),		// OP_LDMDB2_W
+/* 1001 0111 1100 */ TABDECL(OP_LDMDB2_W),		// OP_LDMDB2_W
+/* 1001 0111 1101 */ TABDECL(OP_LDMDB2_W),		// OP_LDMDB2_W
+/* 1001 0111 1110 */ TABDECL(OP_LDMDB2_W),		// OP_LDMDB2_W
+/* 1001 0111 1111 */ TABDECL(OP_LDMDB2_W),		// OP_LDMDB2_W
+
+/* 1001 1000 0000 */ TABDECL(OP_STMIB),		// OP_STMIB
+/* 1001 1000 0001 */ TABDECL(OP_STMIB),		// OP_STMIB
+/* 1001 1000 0010 */ TABDECL(OP_STMIB),		// OP_STMIB
+/* 1001 1000 0011 */ TABDECL(OP_STMIB),		// OP_STMIB
+/* 1001 1000 0100 */ TABDECL(OP_STMIB),		// OP_STMIB
+/* 1001 1000 0101 */ TABDECL(OP_STMIB),		// OP_STMIB
+/* 1001 1000 0110 */ TABDECL(OP_STMIB),		// OP_STMIB
+/* 1001 1000 0111 */ TABDECL(OP_STMIB),		// OP_STMIB
+/* 1001 1000 1000 */ TABDECL(OP_STMIB),		// OP_STMIB
+/* 1001 1000 1001 */ TABDECL(OP_STMIB),		// OP_STMIB
+/* 1001 1000 1010 */ TABDECL(OP_STMIB),		// OP_STMIB
+/* 1001 1000 1011 */ TABDECL(OP_STMIB),		// OP_STMIB
+/* 1001 1000 1100 */ TABDECL(OP_STMIB),		// OP_STMIB
+/* 1001 1000 1101 */ TABDECL(OP_STMIB),		// OP_STMIB
+/* 1001 1000 1110 */ TABDECL(OP_STMIB),		// OP_STMIB
+/* 1001 1000 1111 */ TABDECL(OP_STMIB),		// OP_STMIB
+
+/* 1001 1001 0000 */ TABDECL(OP_LDMIB),		// OP_LDMIB
+/* 1001 1001 0001 */ TABDECL(OP_LDMIB),		// OP_LDMIB
+/* 1001 1001 0010 */ TABDECL(OP_LDMIB),		// OP_LDMIB
+/* 1001 1001 0011 */ TABDECL(OP_LDMIB),		// OP_LDMIB
+/* 1001 1001 0100 */ TABDECL(OP_LDMIB),		// OP_LDMIB
+/* 1001 1001 0101 */ TABDECL(OP_LDMIB),		// OP_LDMIB
+/* 1001 1001 0110 */ TABDECL(OP_LDMIB),		// OP_LDMIB
+/* 1001 1001 0111 */ TABDECL(OP_LDMIB),		// OP_LDMIB
+/* 1001 1001 1000 */ TABDECL(OP_LDMIB),		// OP_LDMIB
+/* 1001 1001 1001 */ TABDECL(OP_LDMIB),		// OP_LDMIB
+/* 1001 1001 1010 */ TABDECL(OP_LDMIB),		// OP_LDMIB
+/* 1001 1001 1011 */ TABDECL(OP_LDMIB),		// OP_LDMIB
+/* 1001 1001 1100 */ TABDECL(OP_LDMIB),		// OP_LDMIB
+/* 1001 1001 1101 */ TABDECL(OP_LDMIB),		// OP_LDMIB
+/* 1001 1001 1110 */ TABDECL(OP_LDMIB),		// OP_LDMIB
+/* 1001 1001 1111 */ TABDECL(OP_LDMIB),		// OP_LDMIB
+
+/* 1001 1010 0000 */ TABDECL(OP_STMIB_W),		// OP_STMIB_W
+/* 1001 1010 0001 */ TABDECL(OP_STMIB_W),		// OP_STMIB_W
+/* 1001 1010 0010 */ TABDECL(OP_STMIB_W),		// OP_STMIB_W
+/* 1001 1010 0011 */ TABDECL(OP_STMIB_W),		// OP_STMIB_W
+/* 1001 1010 0100 */ TABDECL(OP_STMIB_W),		// OP_STMIB_W
+/* 1001 1010 0101 */ TABDECL(OP_STMIB_W),		// OP_STMIB_W
+/* 1001 1010 0110 */ TABDECL(OP_STMIB_W),		// OP_STMIB_W
+/* 1001 1010 0111 */ TABDECL(OP_STMIB_W),		// OP_STMIB_W
+/* 1001 1010 1000 */ TABDECL(OP_STMIB_W),		// OP_STMIB_W
+/* 1001 1010 1001 */ TABDECL(OP_STMIB_W),		// OP_STMIB_W
+/* 1001 1010 1010 */ TABDECL(OP_STMIB_W),		// OP_STMIB_W
+/* 1001 1010 1011 */ TABDECL(OP_STMIB_W),		// OP_STMIB_W
+/* 1001 1010 1100 */ TABDECL(OP_STMIB_W),		// OP_STMIB_W
+/* 1001 1010 1101 */ TABDECL(OP_STMIB_W),		// OP_STMIB_W
+/* 1001 1010 1110 */ TABDECL(OP_STMIB_W),		// OP_STMIB_W
+/* 1001 1010 1111 */ TABDECL(OP_STMIB_W),		// OP_STMIB_W
+
+/* 1001 1011 0000 */ TABDECL(OP_LDMIB_W),		// OP_LDMIB_W
+/* 1001 1011 0001 */ TABDECL(OP_LDMIB_W),		// OP_LDMIB_W
+/* 1001 1011 0010 */ TABDECL(OP_LDMIB_W),		// OP_LDMIB_W
+/* 1001 1011 0011 */ TABDECL(OP_LDMIB_W),		// OP_LDMIB_W
+/* 1001 1011 0100 */ TABDECL(OP_LDMIB_W),		// OP_LDMIB_W
+/* 1001 1011 0101 */ TABDECL(OP_LDMIB_W),		// OP_LDMIB_W
+/* 1001 1011 0110 */ TABDECL(OP_LDMIB_W),		// OP_LDMIB_W
+/* 1001 1011 0111 */ TABDECL(OP_LDMIB_W),		// OP_LDMIB_W
+/* 1001 1011 1000 */ TABDECL(OP_LDMIB_W),		// OP_LDMIB_W
+/* 1001 1011 1001 */ TABDECL(OP_LDMIB_W),		// OP_LDMIB_W
+/* 1001 1011 1010 */ TABDECL(OP_LDMIB_W),		// OP_LDMIB_W
+/* 1001 1011 1011 */ TABDECL(OP_LDMIB_W),		// OP_LDMIB_W
+/* 1001 1011 1100 */ TABDECL(OP_LDMIB_W),		// OP_LDMIB_W
+/* 1001 1011 1101 */ TABDECL(OP_LDMIB_W),		// OP_LDMIB_W
+/* 1001 1011 1110 */ TABDECL(OP_LDMIB_W),		// OP_LDMIB_W
+/* 1001 1011 1111 */ TABDECL(OP_LDMIB_W),		// OP_LDMIB_W
+
+/* 1001 1100 0000 */ TABDECL(OP_STMIB2),		// OP_STMIB2
+/* 1001 1100 0001 */ TABDECL(OP_STMIB2),		// OP_STMIB2
+/* 1001 1100 0010 */ TABDECL(OP_STMIB2),		// OP_STMIB2
+/* 1001 1100 0011 */ TABDECL(OP_STMIB2),		// OP_STMIB2
+/* 1001 1100 0100 */ TABDECL(OP_STMIB2),		// OP_STMIB2
+/* 1001 1100 0101 */ TABDECL(OP_STMIB2),		// OP_STMIB2
+/* 1001 1100 0110 */ TABDECL(OP_STMIB2),		// OP_STMIB2
+/* 1001 1100 0111 */ TABDECL(OP_STMIB2),		// OP_STMIB2
+/* 1001 1100 1000 */ TABDECL(OP_STMIB2),		// OP_STMIB2
+/* 1001 1100 1001 */ TABDECL(OP_STMIB2),		// OP_STMIB2
+/* 1001 1100 1010 */ TABDECL(OP_STMIB2),		// OP_STMIB2
+/* 1001 1100 1011 */ TABDECL(OP_STMIB2),		// OP_STMIB2
+/* 1001 1100 1100 */ TABDECL(OP_STMIB2),		// OP_STMIB2
+/* 1001 1100 1101 */ TABDECL(OP_STMIB2),		// OP_STMIB2
+/* 1001 1100 1110 */ TABDECL(OP_STMIB2),		// OP_STMIB2
+/* 1001 1100 1111 */ TABDECL(OP_STMIB2),		// OP_STMIB2
+
+/* 1001 1101 0000 */ TABDECL(OP_LDMIB2),		// OP_LDMIB2
+/* 1001 1101 0001 */ TABDECL(OP_LDMIB2),		// OP_LDMIB2
+/* 1001 1101 0010 */ TABDECL(OP_LDMIB2),		// OP_LDMIB2
+/* 1001 1101 0011 */ TABDECL(OP_LDMIB2),		// OP_LDMIB2
+/* 1001 1101 0100 */ TABDECL(OP_LDMIB2),		// OP_LDMIB2
+/* 1001 1101 0101 */ TABDECL(OP_LDMIB2),		// OP_LDMIB2
+/* 1001 1101 0110 */ TABDECL(OP_LDMIB2),		// OP_LDMIB2
+/* 1001 1101 0111 */ TABDECL(OP_LDMIB2),		// OP_LDMIB2
+/* 1001 1101 1000 */ TABDECL(OP_LDMIB2),		// OP_LDMIB2
+/* 1001 1101 1001 */ TABDECL(OP_LDMIB2),		// OP_LDMIB2
+/* 1001 1101 1010 */ TABDECL(OP_LDMIB2),		// OP_LDMIB2
+/* 1001 1101 1011 */ TABDECL(OP_LDMIB2),		// OP_LDMIB2
+/* 1001 1101 1100 */ TABDECL(OP_LDMIB2),		// OP_LDMIB2
+/* 1001 1101 1101 */ TABDECL(OP_LDMIB2),		// OP_LDMIB2
+/* 1001 1101 1110 */ TABDECL(OP_LDMIB2),		// OP_LDMIB2
+/* 1001 1101 1111 */ TABDECL(OP_LDMIB2),		// OP_LDMIB2
+
+/* 1001 1110 0000 */ TABDECL(OP_STMIB2_W),		// OP_STMIB2_W
+/* 1001 1110 0001 */ TABDECL(OP_STMIB2_W),		// OP_STMIB2_W
+/* 1001 1110 0010 */ TABDECL(OP_STMIB2_W),		// OP_STMIB2_W
+/* 1001 1110 0011 */ TABDECL(OP_STMIB2_W),		// OP_STMIB2_W
+/* 1001 1110 0100 */ TABDECL(OP_STMIB2_W),		// OP_STMIB2_W
+/* 1001 1110 0101 */ TABDECL(OP_STMIB2_W),		// OP_STMIB2_W
+/* 1001 1110 0110 */ TABDECL(OP_STMIB2_W),		// OP_STMIB2_W
+/* 1001 1110 0111 */ TABDECL(OP_STMIB2_W),		// OP_STMIB2_W
+/* 1001 1110 1000 */ TABDECL(OP_STMIB2_W),		// OP_STMIB2_W
+/* 1001 1110 1001 */ TABDECL(OP_STMIB2_W),		// OP_STMIB2_W
+/* 1001 1110 1010 */ TABDECL(OP_STMIB2_W),		// OP_STMIB2_W
+/* 1001 1110 1011 */ TABDECL(OP_STMIB2_W),		// OP_STMIB2_W
+/* 1001 1110 1100 */ TABDECL(OP_STMIB2_W),		// OP_STMIB2_W
+/* 1001 1110 1101 */ TABDECL(OP_STMIB2_W),		// OP_STMIB2_W
+/* 1001 1110 1110 */ TABDECL(OP_STMIB2_W),		// OP_STMIB2_W
+/* 1001 1110 1111 */ TABDECL(OP_STMIB2_W),		// OP_STMIB2_W
+
+/* 1001 1111 0000 */ TABDECL(OP_LDMIB2_W),		// OP_LDMIB2_W
+/* 1001 1111 0001 */ TABDECL(OP_LDMIB2_W),		// OP_LDMIB2_W
+/* 1001 1111 0010 */ TABDECL(OP_LDMIB2_W),		// OP_LDMIB2_W
+/* 1001 1111 0011 */ TABDECL(OP_LDMIB2_W),		// OP_LDMIB2_W
+/* 1001 1111 0100 */ TABDECL(OP_LDMIB2_W),		// OP_LDMIB2_W
+/* 1001 1111 0101 */ TABDECL(OP_LDMIB2_W),		// OP_LDMIB2_W
+/* 1001 1111 0110 */ TABDECL(OP_LDMIB2_W),		// OP_LDMIB2_W
+/* 1001 1111 0111 */ TABDECL(OP_LDMIB2_W),		// OP_LDMIB2_W
+/* 1001 1111 1000 */ TABDECL(OP_LDMIB2_W),		// OP_LDMIB2_W
+/* 1001 1111 1001 */ TABDECL(OP_LDMIB2_W),		// OP_LDMIB2_W
+/* 1001 1111 1010 */ TABDECL(OP_LDMIB2_W),		// OP_LDMIB2_W
+/* 1001 1111 1011 */ TABDECL(OP_LDMIB2_W),		// OP_LDMIB2_W
+/* 1001 1111 1100 */ TABDECL(OP_LDMIB2_W),		// OP_LDMIB2_W
+/* 1001 1111 1101 */ TABDECL(OP_LDMIB2_W),		// OP_LDMIB2_W
+/* 1001 1111 1110 */ TABDECL(OP_LDMIB2_W),		// OP_LDMIB2_W
+/* 1001 1111 1111 */ TABDECL(OP_LDMIB2_W),		// OP_LDMIB2_W
+
+/* 1010 0000 0000 */ TABDECL(OP_B),		// OP_B
+/* 1010 0000 0001 */ TABDECL(OP_B),		// OP_B
+/* 1010 0000 0010 */ TABDECL(OP_B),		// OP_B
+/* 1010 0000 0011 */ TABDECL(OP_B),		// OP_B
+/* 1010 0000 0100 */ TABDECL(OP_B),		// OP_B
+/* 1010 0000 0101 */ TABDECL(OP_B),		// OP_B
+/* 1010 0000 0110 */ TABDECL(OP_B),		// OP_B
+/* 1010 0000 0111 */ TABDECL(OP_B),		// OP_B
+/* 1010 0000 1000 */ TABDECL(OP_B),		// OP_B
+/* 1010 0000 1001 */ TABDECL(OP_B),		// OP_B
+/* 1010 0000 1010 */ TABDECL(OP_B),		// OP_B
+/* 1010 0000 1011 */ TABDECL(OP_B),		// OP_B
+/* 1010 0000 1100 */ TABDECL(OP_B),		// OP_B
+/* 1010 0000 1101 */ TABDECL(OP_B),		// OP_B
+/* 1010 0000 1110 */ TABDECL(OP_B),		// OP_B
+/* 1010 0000 1111 */ TABDECL(OP_B),		// OP_B
+
+/* 1010 0001 0000 */ TABDECL(OP_B),		// OP_B
+/* 1010 0001 0001 */ TABDECL(OP_B),		// OP_B
+/* 1010 0001 0010 */ TABDECL(OP_B),		// OP_B
+/* 1010 0001 0011 */ TABDECL(OP_B),		// OP_B
+/* 1010 0001 0100 */ TABDECL(OP_B),		// OP_B
+/* 1010 0001 0101 */ TABDECL(OP_B),		// OP_B
+/* 1010 0001 0110 */ TABDECL(OP_B),		// OP_B
+/* 1010 0001 0111 */ TABDECL(OP_B),		// OP_B
+/* 1010 0001 1000 */ TABDECL(OP_B),		// OP_B
+/* 1010 0001 1001 */ TABDECL(OP_B),		// OP_B
+/* 1010 0001 1010 */ TABDECL(OP_B),		// OP_B
+/* 1010 0001 1011 */ TABDECL(OP_B),		// OP_B
+/* 1010 0001 1100 */ TABDECL(OP_B),		// OP_B
+/* 1010 0001 1101 */ TABDECL(OP_B),		// OP_B
+/* 1010 0001 1110 */ TABDECL(OP_B),		// OP_B
+/* 1010 0001 1111 */ TABDECL(OP_B),		// OP_B
+
+/* 1010 0010 0000 */ TABDECL(OP_B),		// OP_B
+/* 1010 0010 0001 */ TABDECL(OP_B),		// OP_B
+/* 1010 0010 0010 */ TABDECL(OP_B),		// OP_B
+/* 1010 0010 0011 */ TABDECL(OP_B),		// OP_B
+/* 1010 0010 0100 */ TABDECL(OP_B),		// OP_B
+/* 1010 0010 0101 */ TABDECL(OP_B),		// OP_B
+/* 1010 0010 0110 */ TABDECL(OP_B),		// OP_B
+/* 1010 0010 0111 */ TABDECL(OP_B),		// OP_B
+/* 1010 0010 1000 */ TABDECL(OP_B),		// OP_B
+/* 1010 0010 1001 */ TABDECL(OP_B),		// OP_B
+/* 1010 0010 1010 */ TABDECL(OP_B),		// OP_B
+/* 1010 0010 1011 */ TABDECL(OP_B),		// OP_B
+/* 1010 0010 1100 */ TABDECL(OP_B),		// OP_B
+/* 1010 0010 1101 */ TABDECL(OP_B),		// OP_B
+/* 1010 0010 1110 */ TABDECL(OP_B),		// OP_B
+/* 1010 0010 1111 */ TABDECL(OP_B),		// OP_B
+
+/* 1010 0011 0000 */ TABDECL(OP_B),		// OP_B
+/* 1010 0011 0001 */ TABDECL(OP_B),		// OP_B
+/* 1010 0011 0010 */ TABDECL(OP_B),		// OP_B
+/* 1010 0011 0011 */ TABDECL(OP_B),		// OP_B
+/* 1010 0011 0100 */ TABDECL(OP_B),		// OP_B
+/* 1010 0011 0101 */ TABDECL(OP_B),		// OP_B
+/* 1010 0011 0110 */ TABDECL(OP_B),		// OP_B
+/* 1010 0011 0111 */ TABDECL(OP_B),		// OP_B
+/* 1010 0011 1000 */ TABDECL(OP_B),		// OP_B
+/* 1010 0011 1001 */ TABDECL(OP_B),		// OP_B
+/* 1010 0011 1010 */ TABDECL(OP_B),		// OP_B
+/* 1010 0011 1011 */ TABDECL(OP_B),		// OP_B
+/* 1010 0011 1100 */ TABDECL(OP_B),		// OP_B
+/* 1010 0011 1101 */ TABDECL(OP_B),		// OP_B
+/* 1010 0011 1110 */ TABDECL(OP_B),		// OP_B
+/* 1010 0011 1111 */ TABDECL(OP_B),		// OP_B
+
+/* 1010 0100 0000 */ TABDECL(OP_B),		// OP_B
+/* 1010 0100 0001 */ TABDECL(OP_B),		// OP_B
+/* 1010 0100 0010 */ TABDECL(OP_B),		// OP_B
+/* 1010 0100 0011 */ TABDECL(OP_B),		// OP_B
+/* 1010 0100 0100 */ TABDECL(OP_B),		// OP_B
+/* 1010 0100 0101 */ TABDECL(OP_B),		// OP_B
+/* 1010 0100 0110 */ TABDECL(OP_B),		// OP_B
+/* 1010 0100 0111 */ TABDECL(OP_B),		// OP_B
+/* 1010 0100 1000 */ TABDECL(OP_B),		// OP_B
+/* 1010 0100 1001 */ TABDECL(OP_B),		// OP_B
+/* 1010 0100 1010 */ TABDECL(OP_B),		// OP_B
+/* 1010 0100 1011 */ TABDECL(OP_B),		// OP_B
+/* 1010 0100 1100 */ TABDECL(OP_B),		// OP_B
+/* 1010 0100 1101 */ TABDECL(OP_B),		// OP_B
+/* 1010 0100 1110 */ TABDECL(OP_B),		// OP_B
+/* 1010 0100 1111 */ TABDECL(OP_B),		// OP_B
+
+/* 1010 0101 0000 */ TABDECL(OP_B),		// OP_B
+/* 1010 0101 0001 */ TABDECL(OP_B),		// OP_B
+/* 1010 0101 0010 */ TABDECL(OP_B),		// OP_B
+/* 1010 0101 0011 */ TABDECL(OP_B),		// OP_B
+/* 1010 0101 0100 */ TABDECL(OP_B),		// OP_B
+/* 1010 0101 0101 */ TABDECL(OP_B),		// OP_B
+/* 1010 0101 0110 */ TABDECL(OP_B),		// OP_B
+/* 1010 0101 0111 */ TABDECL(OP_B),		// OP_B
+/* 1010 0101 1000 */ TABDECL(OP_B),		// OP_B
+/* 1010 0101 1001 */ TABDECL(OP_B),		// OP_B
+/* 1010 0101 1010 */ TABDECL(OP_B),		// OP_B
+/* 1010 0101 1011 */ TABDECL(OP_B),		// OP_B
+/* 1010 0101 1100 */ TABDECL(OP_B),		// OP_B
+/* 1010 0101 1101 */ TABDECL(OP_B),		// OP_B
+/* 1010 0101 1110 */ TABDECL(OP_B),		// OP_B
+/* 1010 0101 1111 */ TABDECL(OP_B),		// OP_B
+
+/* 1010 0110 0000 */ TABDECL(OP_B),		// OP_B
+/* 1010 0110 0001 */ TABDECL(OP_B),		// OP_B
+/* 1010 0110 0010 */ TABDECL(OP_B),		// OP_B
+/* 1010 0110 0011 */ TABDECL(OP_B),		// OP_B
+/* 1010 0110 0100 */ TABDECL(OP_B),		// OP_B
+/* 1010 0110 0101 */ TABDECL(OP_B),		// OP_B
+/* 1010 0110 0110 */ TABDECL(OP_B),		// OP_B
+/* 1010 0110 0111 */ TABDECL(OP_B),		// OP_B
+/* 1010 0110 1000 */ TABDECL(OP_B),		// OP_B
+/* 1010 0110 1001 */ TABDECL(OP_B),		// OP_B
+/* 1010 0110 1010 */ TABDECL(OP_B),		// OP_B
+/* 1010 0110 1011 */ TABDECL(OP_B),		// OP_B
+/* 1010 0110 1100 */ TABDECL(OP_B),		// OP_B
+/* 1010 0110 1101 */ TABDECL(OP_B),		// OP_B
+/* 1010 0110 1110 */ TABDECL(OP_B),		// OP_B
+/* 1010 0110 1111 */ TABDECL(OP_B),		// OP_B
+
+/* 1010 0111 0000 */ TABDECL(OP_B),		// OP_B
+/* 1010 0111 0001 */ TABDECL(OP_B),		// OP_B
+/* 1010 0111 0010 */ TABDECL(OP_B),		// OP_B
+/* 1010 0111 0011 */ TABDECL(OP_B),		// OP_B
+/* 1010 0111 0100 */ TABDECL(OP_B),		// OP_B
+/* 1010 0111 0101 */ TABDECL(OP_B),		// OP_B
+/* 1010 0111 0110 */ TABDECL(OP_B),		// OP_B
+/* 1010 0111 0111 */ TABDECL(OP_B),		// OP_B
+/* 1010 0111 1000 */ TABDECL(OP_B),		// OP_B
+/* 1010 0111 1001 */ TABDECL(OP_B),		// OP_B
+/* 1010 0111 1010 */ TABDECL(OP_B),		// OP_B
+/* 1010 0111 1011 */ TABDECL(OP_B),		// OP_B
+/* 1010 0111 1100 */ TABDECL(OP_B),		// OP_B
+/* 1010 0111 1101 */ TABDECL(OP_B),		// OP_B
+/* 1010 0111 1110 */ TABDECL(OP_B),		// OP_B
+/* 1010 0111 1111 */ TABDECL(OP_B),		// OP_B
+
+/* 1010 1000 0000 */ TABDECL(OP_B),		// OP_B
+/* 1010 1000 0001 */ TABDECL(OP_B),		// OP_B
+/* 1010 1000 0010 */ TABDECL(OP_B),		// OP_B
+/* 1010 1000 0011 */ TABDECL(OP_B),		// OP_B
+/* 1010 1000 0100 */ TABDECL(OP_B),		// OP_B
+/* 1010 1000 0101 */ TABDECL(OP_B),		// OP_B
+/* 1010 1000 0110 */ TABDECL(OP_B),		// OP_B
+/* 1010 1000 0111 */ TABDECL(OP_B),		// OP_B
+/* 1010 1000 1000 */ TABDECL(OP_B),		// OP_B
+/* 1010 1000 1001 */ TABDECL(OP_B),		// OP_B
+/* 1010 1000 1010 */ TABDECL(OP_B),		// OP_B
+/* 1010 1000 1011 */ TABDECL(OP_B),		// OP_B
+/* 1010 1000 1100 */ TABDECL(OP_B),		// OP_B
+/* 1010 1000 1101 */ TABDECL(OP_B),		// OP_B
+/* 1010 1000 1110 */ TABDECL(OP_B),		// OP_B
+/* 1010 1000 1111 */ TABDECL(OP_B),		// OP_B
+
+/* 1010 1001 0000 */ TABDECL(OP_B),		// OP_B
+/* 1010 1001 0001 */ TABDECL(OP_B),		// OP_B
+/* 1010 1001 0010 */ TABDECL(OP_B),		// OP_B
+/* 1010 1001 0011 */ TABDECL(OP_B),		// OP_B
+/* 1010 1001 0100 */ TABDECL(OP_B),		// OP_B
+/* 1010 1001 0101 */ TABDECL(OP_B),		// OP_B
+/* 1010 1001 0110 */ TABDECL(OP_B),		// OP_B
+/* 1010 1001 0111 */ TABDECL(OP_B),		// OP_B
+/* 1010 1001 1000 */ TABDECL(OP_B),		// OP_B
+/* 1010 1001 1001 */ TABDECL(OP_B),		// OP_B
+/* 1010 1001 1010 */ TABDECL(OP_B),		// OP_B
+/* 1010 1001 1011 */ TABDECL(OP_B),		// OP_B
+/* 1010 1001 1100 */ TABDECL(OP_B),		// OP_B
+/* 1010 1001 1101 */ TABDECL(OP_B),		// OP_B
+/* 1010 1001 1110 */ TABDECL(OP_B),		// OP_B
+/* 1010 1001 1111 */ TABDECL(OP_B),		// OP_B
+
+/* 1010 1010 0000 */ TABDECL(OP_B),		// OP_B
+/* 1010 1010 0001 */ TABDECL(OP_B),		// OP_B
+/* 1010 1010 0010 */ TABDECL(OP_B),		// OP_B
+/* 1010 1010 0011 */ TABDECL(OP_B),		// OP_B
+/* 1010 1010 0100 */ TABDECL(OP_B),		// OP_B
+/* 1010 1010 0101 */ TABDECL(OP_B),		// OP_B
+/* 1010 1010 0110 */ TABDECL(OP_B),		// OP_B
+/* 1010 1010 0111 */ TABDECL(OP_B),		// OP_B
+/* 1010 1010 1000 */ TABDECL(OP_B),		// OP_B
+/* 1010 1010 1001 */ TABDECL(OP_B),		// OP_B
+/* 1010 1010 1010 */ TABDECL(OP_B),		// OP_B
+/* 1010 1010 1011 */ TABDECL(OP_B),		// OP_B
+/* 1010 1010 1100 */ TABDECL(OP_B),		// OP_B
+/* 1010 1010 1101 */ TABDECL(OP_B),		// OP_B
+/* 1010 1010 1110 */ TABDECL(OP_B),		// OP_B
+/* 1010 1010 1111 */ TABDECL(OP_B),		// OP_B
+
+/* 1010 1011 0000 */ TABDECL(OP_B),		// OP_B
+/* 1010 1011 0001 */ TABDECL(OP_B),		// OP_B
+/* 1010 1011 0010 */ TABDECL(OP_B),		// OP_B
+/* 1010 1011 0011 */ TABDECL(OP_B),		// OP_B
+/* 1010 1011 0100 */ TABDECL(OP_B),		// OP_B
+/* 1010 1011 0101 */ TABDECL(OP_B),		// OP_B
+/* 1010 1011 0110 */ TABDECL(OP_B),		// OP_B
+/* 1010 1011 0111 */ TABDECL(OP_B),		// OP_B
+/* 1010 1011 1000 */ TABDECL(OP_B),		// OP_B
+/* 1010 1011 1001 */ TABDECL(OP_B),		// OP_B
+/* 1010 1011 1010 */ TABDECL(OP_B),		// OP_B
+/* 1010 1011 1011 */ TABDECL(OP_B),		// OP_B
+/* 1010 1011 1100 */ TABDECL(OP_B),		// OP_B
+/* 1010 1011 1101 */ TABDECL(OP_B),		// OP_B
+/* 1010 1011 1110 */ TABDECL(OP_B),		// OP_B
+/* 1010 1011 1111 */ TABDECL(OP_B),		// OP_B
+
+/* 1010 1100 0000 */ TABDECL(OP_B),		// OP_B
+/* 1010 1100 0001 */ TABDECL(OP_B),		// OP_B
+/* 1010 1100 0010 */ TABDECL(OP_B),		// OP_B
+/* 1010 1100 0011 */ TABDECL(OP_B),		// OP_B
+/* 1010 1100 0100 */ TABDECL(OP_B),		// OP_B
+/* 1010 1100 0101 */ TABDECL(OP_B),		// OP_B
+/* 1010 1100 0110 */ TABDECL(OP_B),		// OP_B
+/* 1010 1100 0111 */ TABDECL(OP_B),		// OP_B
+/* 1010 1100 1000 */ TABDECL(OP_B),		// OP_B
+/* 1010 1100 1001 */ TABDECL(OP_B),		// OP_B
+/* 1010 1100 1010 */ TABDECL(OP_B),		// OP_B
+/* 1010 1100 1011 */ TABDECL(OP_B),		// OP_B
+/* 1010 1100 1100 */ TABDECL(OP_B),		// OP_B
+/* 1010 1100 1101 */ TABDECL(OP_B),		// OP_B
+/* 1010 1100 1110 */ TABDECL(OP_B),		// OP_B
+/* 1010 1100 1111 */ TABDECL(OP_B),		// OP_B
+
+/* 1010 1101 0000 */ TABDECL(OP_B),		// OP_B
+/* 1010 1101 0001 */ TABDECL(OP_B),		// OP_B
+/* 1010 1101 0010 */ TABDECL(OP_B),		// OP_B
+/* 1010 1101 0011 */ TABDECL(OP_B),		// OP_B
+/* 1010 1101 0100 */ TABDECL(OP_B),		// OP_B
+/* 1010 1101 0101 */ TABDECL(OP_B),		// OP_B
+/* 1010 1101 0110 */ TABDECL(OP_B),		// OP_B
+/* 1010 1101 0111 */ TABDECL(OP_B),		// OP_B
+/* 1010 1101 1000 */ TABDECL(OP_B),		// OP_B
+/* 1010 1101 1001 */ TABDECL(OP_B),		// OP_B
+/* 1010 1101 1010 */ TABDECL(OP_B),		// OP_B
+/* 1010 1101 1011 */ TABDECL(OP_B),		// OP_B
+/* 1010 1101 1100 */ TABDECL(OP_B),		// OP_B
+/* 1010 1101 1101 */ TABDECL(OP_B),		// OP_B
+/* 1010 1101 1110 */ TABDECL(OP_B),		// OP_B
+/* 1010 1101 1111 */ TABDECL(OP_B),		// OP_B
+
+/* 1010 1110 0000 */ TABDECL(OP_B),		// OP_B
+/* 1010 1110 0001 */ TABDECL(OP_B),		// OP_B
+/* 1010 1110 0010 */ TABDECL(OP_B),		// OP_B
+/* 1010 1110 0011 */ TABDECL(OP_B),		// OP_B
+/* 1010 1110 0100 */ TABDECL(OP_B),		// OP_B
+/* 1010 1110 0101 */ TABDECL(OP_B),		// OP_B
+/* 1010 1110 0110 */ TABDECL(OP_B),		// OP_B
+/* 1010 1110 0111 */ TABDECL(OP_B),		// OP_B
+/* 1010 1110 1000 */ TABDECL(OP_B),		// OP_B
+/* 1010 1110 1001 */ TABDECL(OP_B),		// OP_B
+/* 1010 1110 1010 */ TABDECL(OP_B),		// OP_B
+/* 1010 1110 1011 */ TABDECL(OP_B),		// OP_B
+/* 1010 1110 1100 */ TABDECL(OP_B),		// OP_B
+/* 1010 1110 1101 */ TABDECL(OP_B),		// OP_B
+/* 1010 1110 1110 */ TABDECL(OP_B),		// OP_B
+/* 1010 1110 1111 */ TABDECL(OP_B),		// OP_B
+
+/* 1010 1111 0000 */ TABDECL(OP_B),		// OP_B
+/* 1010 1111 0001 */ TABDECL(OP_B),		// OP_B
+/* 1010 1111 0010 */ TABDECL(OP_B),		// OP_B
+/* 1010 1111 0011 */ TABDECL(OP_B),		// OP_B
+/* 1010 1111 0100 */ TABDECL(OP_B),		// OP_B
+/* 1010 1111 0101 */ TABDECL(OP_B),		// OP_B
+/* 1010 1111 0110 */ TABDECL(OP_B),		// OP_B
+/* 1010 1111 0111 */ TABDECL(OP_B),		// OP_B
+/* 1010 1111 1000 */ TABDECL(OP_B),		// OP_B
+/* 1010 1111 1001 */ TABDECL(OP_B),		// OP_B
+/* 1010 1111 1010 */ TABDECL(OP_B),		// OP_B
+/* 1010 1111 1011 */ TABDECL(OP_B),		// OP_B
+/* 1010 1111 1100 */ TABDECL(OP_B),		// OP_B
+/* 1010 1111 1101 */ TABDECL(OP_B),		// OP_B
+/* 1010 1111 1110 */ TABDECL(OP_B),		// OP_B
+/* 1010 1111 1111 */ TABDECL(OP_B),		// OP_B
+
+/* 1011 0000 0000 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 0000 0001 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 0000 0010 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 0000 0011 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 0000 0100 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 0000 0101 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 0000 0110 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 0000 0111 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 0000 1000 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 0000 1001 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 0000 1010 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 0000 1011 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 0000 1100 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 0000 1101 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 0000 1110 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 0000 1111 */ TABDECL(OP_BL),		// OP_BL
+
+/* 1011 0001 0000 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 0001 0001 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 0001 0010 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 0001 0011 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 0001 0100 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 0001 0101 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 0001 0110 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 0001 0111 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 0001 1000 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 0001 1001 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 0001 1010 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 0001 1011 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 0001 1100 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 0001 1101 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 0001 1110 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 0001 1111 */ TABDECL(OP_BL),		// OP_BL
+
+/* 1011 0010 0000 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 0010 0001 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 0010 0010 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 0010 0011 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 0010 0100 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 0010 0101 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 0010 0110 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 0010 0111 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 0010 1000 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 0010 1001 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 0010 1010 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 0010 1011 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 0010 1100 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 0010 1101 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 0010 1110 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 0010 1111 */ TABDECL(OP_BL),		// OP_BL
+
+/* 1011 0011 0000 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 0011 0001 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 0011 0010 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 0011 0011 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 0011 0100 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 0011 0101 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 0011 0110 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 0011 0111 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 0011 1000 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 0011 1001 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 0011 1010 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 0011 1011 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 0011 1100 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 0011 1101 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 0011 1110 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 0011 1111 */ TABDECL(OP_BL),		// OP_BL
+
+/* 1011 0100 0000 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 0100 0001 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 0100 0010 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 0100 0011 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 0100 0100 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 0100 0101 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 0100 0110 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 0100 0111 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 0100 1000 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 0100 1001 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 0100 1010 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 0100 1011 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 0100 1100 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 0100 1101 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 0100 1110 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 0100 1111 */ TABDECL(OP_BL),		// OP_BL
+
+/* 1011 0101 0000 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 0101 0001 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 0101 0010 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 0101 0011 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 0101 0100 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 0101 0101 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 0101 0110 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 0101 0111 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 0101 1000 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 0101 1001 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 0101 1010 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 0101 1011 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 0101 1100 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 0101 1101 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 0101 1110 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 0101 1111 */ TABDECL(OP_BL),		// OP_BL
+
+/* 1011 0110 0000 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 0110 0001 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 0110 0010 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 0110 0011 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 0110 0100 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 0110 0101 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 0110 0110 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 0110 0111 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 0110 1000 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 0110 1001 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 0110 1010 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 0110 1011 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 0110 1100 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 0110 1101 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 0110 1110 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 0110 1111 */ TABDECL(OP_BL),		// OP_BL
+
+/* 1011 0111 0000 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 0111 0001 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 0111 0010 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 0111 0011 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 0111 0100 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 0111 0101 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 0111 0110 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 0111 0111 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 0111 1000 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 0111 1001 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 0111 1010 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 0111 1011 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 0111 1100 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 0111 1101 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 0111 1110 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 0111 1111 */ TABDECL(OP_BL),		// OP_BL
+
+/* 1011 1000 0000 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 1000 0001 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 1000 0010 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 1000 0011 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 1000 0100 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 1000 0101 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 1000 0110 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 1000 0111 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 1000 1000 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 1000 1001 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 1000 1010 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 1000 1011 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 1000 1100 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 1000 1101 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 1000 1110 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 1000 1111 */ TABDECL(OP_BL),		// OP_BL
+
+/* 1011 1001 0000 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 1001 0001 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 1001 0010 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 1001 0011 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 1001 0100 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 1001 0101 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 1001 0110 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 1001 0111 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 1001 1000 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 1001 1001 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 1001 1010 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 1001 1011 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 1001 1100 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 1001 1101 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 1001 1110 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 1001 1111 */ TABDECL(OP_BL),		// OP_BL
+
+/* 1011 1010 0000 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 1010 0001 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 1010 0010 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 1010 0011 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 1010 0100 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 1010 0101 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 1010 0110 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 1010 0111 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 1010 1000 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 1010 1001 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 1010 1010 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 1010 1011 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 1010 1100 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 1010 1101 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 1010 1110 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 1010 1111 */ TABDECL(OP_BL),		// OP_BL
+
+/* 1011 1011 0000 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 1011 0001 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 1011 0010 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 1011 0011 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 1011 0100 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 1011 0101 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 1011 0110 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 1011 0111 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 1011 1000 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 1011 1001 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 1011 1010 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 1011 1011 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 1011 1100 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 1011 1101 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 1011 1110 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 1011 1111 */ TABDECL(OP_BL),		// OP_BL
+
+/* 1011 1100 0000 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 1100 0001 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 1100 0010 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 1100 0011 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 1100 0100 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 1100 0101 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 1100 0110 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 1100 0111 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 1100 1000 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 1100 1001 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 1100 1010 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 1100 1011 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 1100 1100 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 1100 1101 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 1100 1110 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 1100 1111 */ TABDECL(OP_BL),		// OP_BL
+
+/* 1011 1101 0000 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 1101 0001 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 1101 0010 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 1101 0011 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 1101 0100 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 1101 0101 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 1101 0110 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 1101 0111 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 1101 1000 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 1101 1001 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 1101 1010 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 1101 1011 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 1101 1100 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 1101 1101 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 1101 1110 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 1101 1111 */ TABDECL(OP_BL),		// OP_BL
+
+/* 1011 1110 0000 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 1110 0001 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 1110 0010 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 1110 0011 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 1110 0100 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 1110 0101 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 1110 0110 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 1110 0111 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 1110 1000 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 1110 1001 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 1110 1010 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 1110 1011 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 1110 1100 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 1110 1101 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 1110 1110 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 1110 1111 */ TABDECL(OP_BL),		// OP_BL
+
+/* 1011 1111 0000 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 1111 0001 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 1111 0010 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 1111 0011 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 1111 0100 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 1111 0101 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 1111 0110 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 1111 0111 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 1111 1000 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 1111 1001 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 1111 1010 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 1111 1011 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 1111 1100 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 1111 1101 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 1111 1110 */ TABDECL(OP_BL),		// OP_BL
+/* 1011 1111 1111 */ TABDECL(OP_BL),		// OP_BL
+
+/* 1100 0000 0000 */ TABDECL(OP_STC_OPTION),		// OP_STC_OPTION
+/* 1100 0000 0001 */ TABDECL(OP_STC_OPTION),		// OP_STC_OPTION
+/* 1100 0000 0010 */ TABDECL(OP_STC_OPTION),		// OP_STC_OPTION
+/* 1100 0000 0011 */ TABDECL(OP_STC_OPTION),		// OP_STC_OPTION
+/* 1100 0000 0100 */ TABDECL(OP_STC_OPTION),		// OP_STC_OPTION
+/* 1100 0000 0101 */ TABDECL(OP_STC_OPTION),		// OP_STC_OPTION
+/* 1100 0000 0110 */ TABDECL(OP_STC_OPTION),		// OP_STC_OPTION
+/* 1100 0000 0111 */ TABDECL(OP_STC_OPTION),		// OP_STC_OPTION
+/* 1100 0000 1000 */ TABDECL(OP_STC_OPTION),		// OP_STC_OPTION
+/* 1100 0000 1001 */ TABDECL(OP_STC_OPTION),		// OP_STC_OPTION
+/* 1100 0000 1010 */ TABDECL(OP_STC_OPTION),		// OP_STC_OPTION
+/* 1100 0000 1011 */ TABDECL(OP_STC_OPTION),		// OP_STC_OPTION
+/* 1100 0000 1100 */ TABDECL(OP_STC_OPTION),		// OP_STC_OPTION
+/* 1100 0000 1101 */ TABDECL(OP_STC_OPTION),		// OP_STC_OPTION
+/* 1100 0000 1110 */ TABDECL(OP_STC_OPTION),		// OP_STC_OPTION
+/* 1100 0000 1111 */ TABDECL(OP_STC_OPTION),		// OP_STC_OPTION
+
+/* 1100 0001 0000 */ TABDECL(OP_LDC_OPTION),		// OP_LDC_OPTION
+/* 1100 0001 0001 */ TABDECL(OP_LDC_OPTION),		// OP_LDC_OPTION
+/* 1100 0001 0010 */ TABDECL(OP_LDC_OPTION),		// OP_LDC_OPTION
+/* 1100 0001 0011 */ TABDECL(OP_LDC_OPTION),		// OP_LDC_OPTION
+/* 1100 0001 0100 */ TABDECL(OP_LDC_OPTION),		// OP_LDC_OPTION
+/* 1100 0001 0101 */ TABDECL(OP_LDC_OPTION),		// OP_LDC_OPTION
+/* 1100 0001 0110 */ TABDECL(OP_LDC_OPTION),		// OP_LDC_OPTION
+/* 1100 0001 0111 */ TABDECL(OP_LDC_OPTION),		// OP_LDC_OPTION
+/* 1100 0001 1000 */ TABDECL(OP_LDC_OPTION),		// OP_LDC_OPTION
+/* 1100 0001 1001 */ TABDECL(OP_LDC_OPTION),		// OP_LDC_OPTION
+/* 1100 0001 1010 */ TABDECL(OP_LDC_OPTION),		// OP_LDC_OPTION
+/* 1100 0001 1011 */ TABDECL(OP_LDC_OPTION),		// OP_LDC_OPTION
+/* 1100 0001 1100 */ TABDECL(OP_LDC_OPTION),		// OP_LDC_OPTION
+/* 1100 0001 1101 */ TABDECL(OP_LDC_OPTION),		// OP_LDC_OPTION
+/* 1100 0001 1110 */ TABDECL(OP_LDC_OPTION),		// OP_LDC_OPTION
+/* 1100 0001 1111 */ TABDECL(OP_LDC_OPTION),		// OP_LDC_OPTION
+
+/* 1100 0010 0000 */ TABDECL(OP_STC_M_POSTIND),		// OP_STC_M_POSTIND
+/* 1100 0010 0001 */ TABDECL(OP_STC_M_POSTIND),		// OP_STC_M_POSTIND
+/* 1100 0010 0010 */ TABDECL(OP_STC_M_POSTIND),		// OP_STC_M_POSTIND
+/* 1100 0010 0011 */ TABDECL(OP_STC_M_POSTIND),		// OP_STC_M_POSTIND
+/* 1100 0010 0100 */ TABDECL(OP_STC_M_POSTIND),		// OP_STC_M_POSTIND
+/* 1100 0010 0101 */ TABDECL(OP_STC_M_POSTIND),		// OP_STC_M_POSTIND
+/* 1100 0010 0110 */ TABDECL(OP_STC_M_POSTIND),		// OP_STC_M_POSTIND
+/* 1100 0010 0111 */ TABDECL(OP_STC_M_POSTIND),		// OP_STC_M_POSTIND
+/* 1100 0010 1000 */ TABDECL(OP_STC_M_POSTIND),		// OP_STC_M_POSTIND
+/* 1100 0010 1001 */ TABDECL(OP_STC_M_POSTIND),		// OP_STC_M_POSTIND
+/* 1100 0010 1010 */ TABDECL(OP_STC_M_POSTIND),		// OP_STC_M_POSTIND
+/* 1100 0010 1011 */ TABDECL(OP_STC_M_POSTIND),		// OP_STC_M_POSTIND
+/* 1100 0010 1100 */ TABDECL(OP_STC_M_POSTIND),		// OP_STC_M_POSTIND
+/* 1100 0010 1101 */ TABDECL(OP_STC_M_POSTIND),		// OP_STC_M_POSTIND
+/* 1100 0010 1110 */ TABDECL(OP_STC_M_POSTIND),		// OP_STC_M_POSTIND
+/* 1100 0010 1111 */ TABDECL(OP_STC_M_POSTIND),		// OP_STC_M_POSTIND
+
+/* 1100 0011 0000 */ TABDECL(OP_LDC_M_POSTIND),		// OP_LDC_M_POSTIND
+/* 1100 0011 0001 */ TABDECL(OP_LDC_M_POSTIND),		// OP_LDC_M_POSTIND
+/* 1100 0011 0010 */ TABDECL(OP_LDC_M_POSTIND),		// OP_LDC_M_POSTIND
+/* 1100 0011 0011 */ TABDECL(OP_LDC_M_POSTIND),		// OP_LDC_M_POSTIND
+/* 1100 0011 0100 */ TABDECL(OP_LDC_M_POSTIND),		// OP_LDC_M_POSTIND
+/* 1100 0011 0101 */ TABDECL(OP_LDC_M_POSTIND),		// OP_LDC_M_POSTIND
+/* 1100 0011 0110 */ TABDECL(OP_LDC_M_POSTIND),		// OP_LDC_M_POSTIND
+/* 1100 0011 0111 */ TABDECL(OP_LDC_M_POSTIND),		// OP_LDC_M_POSTIND
+/* 1100 0011 1000 */ TABDECL(OP_LDC_M_POSTIND),		// OP_LDC_M_POSTIND
+/* 1100 0011 1001 */ TABDECL(OP_LDC_M_POSTIND),		// OP_LDC_M_POSTIND
+/* 1100 0011 1010 */ TABDECL(OP_LDC_M_POSTIND),		// OP_LDC_M_POSTIND
+/* 1100 0011 1011 */ TABDECL(OP_LDC_M_POSTIND),		// OP_LDC_M_POSTIND
+/* 1100 0011 1100 */ TABDECL(OP_LDC_M_POSTIND),		// OP_LDC_M_POSTIND
+/* 1100 0011 1101 */ TABDECL(OP_LDC_M_POSTIND),		// OP_LDC_M_POSTIND
+/* 1100 0011 1110 */ TABDECL(OP_LDC_M_POSTIND),		// OP_LDC_M_POSTIND
+/* 1100 0011 1111 */ TABDECL(OP_LDC_M_POSTIND),		// OP_LDC_M_POSTIND
+
+/* 1100 0100 0000 */ TABDECL(OP_STC_OPTION),		// OP_STC_OPTION
+/* 1100 0100 0001 */ TABDECL(OP_STC_OPTION),		// OP_STC_OPTION
+/* 1100 0100 0010 */ TABDECL(OP_STC_OPTION),		// OP_STC_OPTION
+/* 1100 0100 0011 */ TABDECL(OP_STC_OPTION),		// OP_STC_OPTION
+/* 1100 0100 0100 */ TABDECL(OP_STC_OPTION),		// OP_STC_OPTION
+/* 1100 0100 0101 */ TABDECL(OP_STC_OPTION),		// OP_STC_OPTION
+/* 1100 0100 0110 */ TABDECL(OP_STC_OPTION),		// OP_STC_OPTION
+/* 1100 0100 0111 */ TABDECL(OP_STC_OPTION),		// OP_STC_OPTION
+/* 1100 0100 1000 */ TABDECL(OP_STC_OPTION),		// OP_STC_OPTION
+/* 1100 0100 1001 */ TABDECL(OP_STC_OPTION),		// OP_STC_OPTION
+/* 1100 0100 1010 */ TABDECL(OP_STC_OPTION),		// OP_STC_OPTION
+/* 1100 0100 1011 */ TABDECL(OP_STC_OPTION),		// OP_STC_OPTION
+/* 1100 0100 1100 */ TABDECL(OP_STC_OPTION),		// OP_STC_OPTION
+/* 1100 0100 1101 */ TABDECL(OP_STC_OPTION),		// OP_STC_OPTION
+/* 1100 0100 1110 */ TABDECL(OP_STC_OPTION),		// OP_STC_OPTION
+/* 1100 0100 1111 */ TABDECL(OP_STC_OPTION),		// OP_STC_OPTION
+
+/* 1100 0101 0000 */ TABDECL(OP_LDC_OPTION),		// OP_LDC_OPTION
+/* 1100 0101 0001 */ TABDECL(OP_LDC_OPTION),		// OP_LDC_OPTION
+/* 1100 0101 0010 */ TABDECL(OP_LDC_OPTION),		// OP_LDC_OPTION
+/* 1100 0101 0011 */ TABDECL(OP_LDC_OPTION),		// OP_LDC_OPTION
+/* 1100 0101 0100 */ TABDECL(OP_LDC_OPTION),		// OP_LDC_OPTION
+/* 1100 0101 0101 */ TABDECL(OP_LDC_OPTION),		// OP_LDC_OPTION
+/* 1100 0101 0110 */ TABDECL(OP_LDC_OPTION),		// OP_LDC_OPTION
+/* 1100 0101 0111 */ TABDECL(OP_LDC_OPTION),		// OP_LDC_OPTION
+/* 1100 0101 1000 */ TABDECL(OP_LDC_OPTION),		// OP_LDC_OPTION
+/* 1100 0101 1001 */ TABDECL(OP_LDC_OPTION),		// OP_LDC_OPTION
+/* 1100 0101 1010 */ TABDECL(OP_LDC_OPTION),		// OP_LDC_OPTION
+/* 1100 0101 1011 */ TABDECL(OP_LDC_OPTION),		// OP_LDC_OPTION
+/* 1100 0101 1100 */ TABDECL(OP_LDC_OPTION),		// OP_LDC_OPTION
+/* 1100 0101 1101 */ TABDECL(OP_LDC_OPTION),		// OP_LDC_OPTION
+/* 1100 0101 1110 */ TABDECL(OP_LDC_OPTION),		// OP_LDC_OPTION
+/* 1100 0101 1111 */ TABDECL(OP_LDC_OPTION),		// OP_LDC_OPTION
+
+/* 1100 0110 0000 */ TABDECL(OP_STC_M_POSTIND),		// OP_STC_M_POSTIND
+/* 1100 0110 0001 */ TABDECL(OP_STC_M_POSTIND),		// OP_STC_M_POSTIND
+/* 1100 0110 0010 */ TABDECL(OP_STC_M_POSTIND),		// OP_STC_M_POSTIND
+/* 1100 0110 0011 */ TABDECL(OP_STC_M_POSTIND),		// OP_STC_M_POSTIND
+/* 1100 0110 0100 */ TABDECL(OP_STC_M_POSTIND),		// OP_STC_M_POSTIND
+/* 1100 0110 0101 */ TABDECL(OP_STC_M_POSTIND),		// OP_STC_M_POSTIND
+/* 1100 0110 0110 */ TABDECL(OP_STC_M_POSTIND),		// OP_STC_M_POSTIND
+/* 1100 0110 0111 */ TABDECL(OP_STC_M_POSTIND),		// OP_STC_M_POSTIND
+/* 1100 0110 1000 */ TABDECL(OP_STC_M_POSTIND),		// OP_STC_M_POSTIND
+/* 1100 0110 1001 */ TABDECL(OP_STC_M_POSTIND),		// OP_STC_M_POSTIND
+/* 1100 0110 1010 */ TABDECL(OP_STC_M_POSTIND),		// OP_STC_M_POSTIND
+/* 1100 0110 1011 */ TABDECL(OP_STC_M_POSTIND),		// OP_STC_M_POSTIND
+/* 1100 0110 1100 */ TABDECL(OP_STC_M_POSTIND),		// OP_STC_M_POSTIND
+/* 1100 0110 1101 */ TABDECL(OP_STC_M_POSTIND),		// OP_STC_M_POSTIND
+/* 1100 0110 1110 */ TABDECL(OP_STC_M_POSTIND),		// OP_STC_M_POSTIND
+/* 1100 0110 1111 */ TABDECL(OP_STC_M_POSTIND),		// OP_STC_M_POSTIND
+
+/* 1100 0111 0000 */ TABDECL(OP_LDC_M_POSTIND),		// OP_LDC_M_POSTIND
+/* 1100 0111 0001 */ TABDECL(OP_LDC_M_POSTIND),		// OP_LDC_M_POSTIND
+/* 1100 0111 0010 */ TABDECL(OP_LDC_M_POSTIND),		// OP_LDC_M_POSTIND
+/* 1100 0111 0011 */ TABDECL(OP_LDC_M_POSTIND),		// OP_LDC_M_POSTIND
+/* 1100 0111 0100 */ TABDECL(OP_LDC_M_POSTIND),		// OP_LDC_M_POSTIND
+/* 1100 0111 0101 */ TABDECL(OP_LDC_M_POSTIND),		// OP_LDC_M_POSTIND
+/* 1100 0111 0110 */ TABDECL(OP_LDC_M_POSTIND),		// OP_LDC_M_POSTIND
+/* 1100 0111 0111 */ TABDECL(OP_LDC_M_POSTIND),		// OP_LDC_M_POSTIND
+/* 1100 0111 1000 */ TABDECL(OP_LDC_M_POSTIND),		// OP_LDC_M_POSTIND
+/* 1100 0111 1001 */ TABDECL(OP_LDC_M_POSTIND),		// OP_LDC_M_POSTIND
+/* 1100 0111 1010 */ TABDECL(OP_LDC_M_POSTIND),		// OP_LDC_M_POSTIND
+/* 1100 0111 1011 */ TABDECL(OP_LDC_M_POSTIND),		// OP_LDC_M_POSTIND
+/* 1100 0111 1100 */ TABDECL(OP_LDC_M_POSTIND),		// OP_LDC_M_POSTIND
+/* 1100 0111 1101 */ TABDECL(OP_LDC_M_POSTIND),		// OP_LDC_M_POSTIND
+/* 1100 0111 1110 */ TABDECL(OP_LDC_M_POSTIND),		// OP_LDC_M_POSTIND
+/* 1100 0111 1111 */ TABDECL(OP_LDC_M_POSTIND),		// OP_LDC_M_POSTIND
+
+/* 1100 1000 0000 */ TABDECL(OP_STC_OPTION),		// OP_STC_OPTION
+/* 1100 1000 0001 */ TABDECL(OP_STC_OPTION),		// OP_STC_OPTION
+/* 1100 1000 0010 */ TABDECL(OP_STC_OPTION),		// OP_STC_OPTION
+/* 1100 1000 0011 */ TABDECL(OP_STC_OPTION),		// OP_STC_OPTION
+/* 1100 1000 0100 */ TABDECL(OP_STC_OPTION),		// OP_STC_OPTION
+/* 1100 1000 0101 */ TABDECL(OP_STC_OPTION),		// OP_STC_OPTION
+/* 1100 1000 0110 */ TABDECL(OP_STC_OPTION),		// OP_STC_OPTION
+/* 1100 1000 0111 */ TABDECL(OP_STC_OPTION),		// OP_STC_OPTION
+/* 1100 1000 1000 */ TABDECL(OP_STC_OPTION),		// OP_STC_OPTION
+/* 1100 1000 1001 */ TABDECL(OP_STC_OPTION),		// OP_STC_OPTION
+/* 1100 1000 1010 */ TABDECL(OP_STC_OPTION),		// OP_STC_OPTION
+/* 1100 1000 1011 */ TABDECL(OP_STC_OPTION),		// OP_STC_OPTION
+/* 1100 1000 1100 */ TABDECL(OP_STC_OPTION),		// OP_STC_OPTION
+/* 1100 1000 1101 */ TABDECL(OP_STC_OPTION),		// OP_STC_OPTION
+/* 1100 1000 1110 */ TABDECL(OP_STC_OPTION),		// OP_STC_OPTION
+/* 1100 1000 1111 */ TABDECL(OP_STC_OPTION),		// OP_STC_OPTION
+
+/* 1100 1001 0000 */ TABDECL(OP_LDC_OPTION),		// OP_LDC_OPTION
+/* 1100 1001 0001 */ TABDECL(OP_LDC_OPTION),		// OP_LDC_OPTION
+/* 1100 1001 0010 */ TABDECL(OP_LDC_OPTION),		// OP_LDC_OPTION
+/* 1100 1001 0011 */ TABDECL(OP_LDC_OPTION),		// OP_LDC_OPTION
+/* 1100 1001 0100 */ TABDECL(OP_LDC_OPTION),		// OP_LDC_OPTION
+/* 1100 1001 0101 */ TABDECL(OP_LDC_OPTION),		// OP_LDC_OPTION
+/* 1100 1001 0110 */ TABDECL(OP_LDC_OPTION),		// OP_LDC_OPTION
+/* 1100 1001 0111 */ TABDECL(OP_LDC_OPTION),		// OP_LDC_OPTION
+/* 1100 1001 1000 */ TABDECL(OP_LDC_OPTION),		// OP_LDC_OPTION
+/* 1100 1001 1001 */ TABDECL(OP_LDC_OPTION),		// OP_LDC_OPTION
+/* 1100 1001 1010 */ TABDECL(OP_LDC_OPTION),		// OP_LDC_OPTION
+/* 1100 1001 1011 */ TABDECL(OP_LDC_OPTION),		// OP_LDC_OPTION
+/* 1100 1001 1100 */ TABDECL(OP_LDC_OPTION),		// OP_LDC_OPTION
+/* 1100 1001 1101 */ TABDECL(OP_LDC_OPTION),		// OP_LDC_OPTION
+/* 1100 1001 1110 */ TABDECL(OP_LDC_OPTION),		// OP_LDC_OPTION
+/* 1100 1001 1111 */ TABDECL(OP_LDC_OPTION),		// OP_LDC_OPTION
+
+/* 1100 1010 0000 */ TABDECL(OP_STC_P_POSTIND),		// OP_STC_P_POSTIND
+/* 1100 1010 0001 */ TABDECL(OP_STC_P_POSTIND),		// OP_STC_P_POSTIND
+/* 1100 1010 0010 */ TABDECL(OP_STC_P_POSTIND),		// OP_STC_P_POSTIND
+/* 1100 1010 0011 */ TABDECL(OP_STC_P_POSTIND),		// OP_STC_P_POSTIND
+/* 1100 1010 0100 */ TABDECL(OP_STC_P_POSTIND),		// OP_STC_P_POSTIND
+/* 1100 1010 0101 */ TABDECL(OP_STC_P_POSTIND),		// OP_STC_P_POSTIND
+/* 1100 1010 0110 */ TABDECL(OP_STC_P_POSTIND),		// OP_STC_P_POSTIND
+/* 1100 1010 0111 */ TABDECL(OP_STC_P_POSTIND),		// OP_STC_P_POSTIND
+/* 1100 1010 1000 */ TABDECL(OP_STC_P_POSTIND),		// OP_STC_P_POSTIND
+/* 1100 1010 1001 */ TABDECL(OP_STC_P_POSTIND),		// OP_STC_P_POSTIND
+/* 1100 1010 1010 */ TABDECL(OP_STC_P_POSTIND),		// OP_STC_P_POSTIND
+/* 1100 1010 1011 */ TABDECL(OP_STC_P_POSTIND),		// OP_STC_P_POSTIND
+/* 1100 1010 1100 */ TABDECL(OP_STC_P_POSTIND),		// OP_STC_P_POSTIND
+/* 1100 1010 1101 */ TABDECL(OP_STC_P_POSTIND),		// OP_STC_P_POSTIND
+/* 1100 1010 1110 */ TABDECL(OP_STC_P_POSTIND),		// OP_STC_P_POSTIND
+/* 1100 1010 1111 */ TABDECL(OP_STC_P_POSTIND),		// OP_STC_P_POSTIND
+
+/* 1100 1011 0000 */ TABDECL(OP_LDC_P_POSTIND),		// OP_LDC_P_POSTIND
+/* 1100 1011 0001 */ TABDECL(OP_LDC_P_POSTIND),		// OP_LDC_P_POSTIND
+/* 1100 1011 0010 */ TABDECL(OP_LDC_P_POSTIND),		// OP_LDC_P_POSTIND
+/* 1100 1011 0011 */ TABDECL(OP_LDC_P_POSTIND),		// OP_LDC_P_POSTIND
+/* 1100 1011 0100 */ TABDECL(OP_LDC_P_POSTIND),		// OP_LDC_P_POSTIND
+/* 1100 1011 0101 */ TABDECL(OP_LDC_P_POSTIND),		// OP_LDC_P_POSTIND
+/* 1100 1011 0110 */ TABDECL(OP_LDC_P_POSTIND),		// OP_LDC_P_POSTIND
+/* 1100 1011 0111 */ TABDECL(OP_LDC_P_POSTIND),		// OP_LDC_P_POSTIND
+/* 1100 1011 1000 */ TABDECL(OP_LDC_P_POSTIND),		// OP_LDC_P_POSTIND
+/* 1100 1011 1001 */ TABDECL(OP_LDC_P_POSTIND),		// OP_LDC_P_POSTIND
+/* 1100 1011 1010 */ TABDECL(OP_LDC_P_POSTIND),		// OP_LDC_P_POSTIND
+/* 1100 1011 1011 */ TABDECL(OP_LDC_P_POSTIND),		// OP_LDC_P_POSTIND
+/* 1100 1011 1100 */ TABDECL(OP_LDC_P_POSTIND),		// OP_LDC_P_POSTIND
+/* 1100 1011 1101 */ TABDECL(OP_LDC_P_POSTIND),		// OP_LDC_P_POSTIND
+/* 1100 1011 1110 */ TABDECL(OP_LDC_P_POSTIND),		// OP_LDC_P_POSTIND
+/* 1100 1011 1111 */ TABDECL(OP_LDC_P_POSTIND),		// OP_LDC_P_POSTIND
+
+/* 1100 1100 0000 */ TABDECL(OP_STC_OPTION),		// OP_STC_OPTION
+/* 1100 1100 0001 */ TABDECL(OP_STC_OPTION),		// OP_STC_OPTION
+/* 1100 1100 0010 */ TABDECL(OP_STC_OPTION),		// OP_STC_OPTION
+/* 1100 1100 0011 */ TABDECL(OP_STC_OPTION),		// OP_STC_OPTION
+/* 1100 1100 0100 */ TABDECL(OP_STC_OPTION),		// OP_STC_OPTION
+/* 1100 1100 0101 */ TABDECL(OP_STC_OPTION),		// OP_STC_OPTION
+/* 1100 1100 0110 */ TABDECL(OP_STC_OPTION),		// OP_STC_OPTION
+/* 1100 1100 0111 */ TABDECL(OP_STC_OPTION),		// OP_STC_OPTION
+/* 1100 1100 1000 */ TABDECL(OP_STC_OPTION),		// OP_STC_OPTION
+/* 1100 1100 1001 */ TABDECL(OP_STC_OPTION),		// OP_STC_OPTION
+/* 1100 1100 1010 */ TABDECL(OP_STC_OPTION),		// OP_STC_OPTION
+/* 1100 1100 1011 */ TABDECL(OP_STC_OPTION),		// OP_STC_OPTION
+/* 1100 1100 1100 */ TABDECL(OP_STC_OPTION),		// OP_STC_OPTION
+/* 1100 1100 1101 */ TABDECL(OP_STC_OPTION),		// OP_STC_OPTION
+/* 1100 1100 1110 */ TABDECL(OP_STC_OPTION),		// OP_STC_OPTION
+/* 1100 1100 1111 */ TABDECL(OP_STC_OPTION),		// OP_STC_OPTION
+
+/* 1100 1101 0000 */ TABDECL(OP_LDC_OPTION),		// OP_LDC_OPTION
+/* 1100 1101 0001 */ TABDECL(OP_LDC_OPTION),		// OP_LDC_OPTION
+/* 1100 1101 0010 */ TABDECL(OP_LDC_OPTION),		// OP_LDC_OPTION
+/* 1100 1101 0011 */ TABDECL(OP_LDC_OPTION),		// OP_LDC_OPTION
+/* 1100 1101 0100 */ TABDECL(OP_LDC_OPTION),		// OP_LDC_OPTION
+/* 1100 1101 0101 */ TABDECL(OP_LDC_OPTION),		// OP_LDC_OPTION
+/* 1100 1101 0110 */ TABDECL(OP_LDC_OPTION),		// OP_LDC_OPTION
+/* 1100 1101 0111 */ TABDECL(OP_LDC_OPTION),		// OP_LDC_OPTION
+/* 1100 1101 1000 */ TABDECL(OP_LDC_OPTION),		// OP_LDC_OPTION
+/* 1100 1101 1001 */ TABDECL(OP_LDC_OPTION),		// OP_LDC_OPTION
+/* 1100 1101 1010 */ TABDECL(OP_LDC_OPTION),		// OP_LDC_OPTION
+/* 1100 1101 1011 */ TABDECL(OP_LDC_OPTION),		// OP_LDC_OPTION
+/* 1100 1101 1100 */ TABDECL(OP_LDC_OPTION),		// OP_LDC_OPTION
+/* 1100 1101 1101 */ TABDECL(OP_LDC_OPTION),		// OP_LDC_OPTION
+/* 1100 1101 1110 */ TABDECL(OP_LDC_OPTION),		// OP_LDC_OPTION
+/* 1100 1101 1111 */ TABDECL(OP_LDC_OPTION),		// OP_LDC_OPTION
+
+/* 1100 1110 0000 */ TABDECL(OP_STC_P_POSTIND),		// OP_STC_P_POSTIND
+/* 1100 1110 0001 */ TABDECL(OP_STC_P_POSTIND),		// OP_STC_P_POSTIND
+/* 1100 1110 0010 */ TABDECL(OP_STC_P_POSTIND),		// OP_STC_P_POSTIND
+/* 1100 1110 0011 */ TABDECL(OP_STC_P_POSTIND),		// OP_STC_P_POSTIND
+/* 1100 1110 0100 */ TABDECL(OP_STC_P_POSTIND),		// OP_STC_P_POSTIND
+/* 1100 1110 0101 */ TABDECL(OP_STC_P_POSTIND),		// OP_STC_P_POSTIND
+/* 1100 1110 0110 */ TABDECL(OP_STC_P_POSTIND),		// OP_STC_P_POSTIND
+/* 1100 1110 0111 */ TABDECL(OP_STC_P_POSTIND),		// OP_STC_P_POSTIND
+/* 1100 1110 1000 */ TABDECL(OP_STC_P_POSTIND),		// OP_STC_P_POSTIND
+/* 1100 1110 1001 */ TABDECL(OP_STC_P_POSTIND),		// OP_STC_P_POSTIND
+/* 1100 1110 1010 */ TABDECL(OP_STC_P_POSTIND),		// OP_STC_P_POSTIND
+/* 1100 1110 1011 */ TABDECL(OP_STC_P_POSTIND),		// OP_STC_P_POSTIND
+/* 1100 1110 1100 */ TABDECL(OP_STC_P_POSTIND),		// OP_STC_P_POSTIND
+/* 1100 1110 1101 */ TABDECL(OP_STC_P_POSTIND),		// OP_STC_P_POSTIND
+/* 1100 1110 1110 */ TABDECL(OP_STC_P_POSTIND),		// OP_STC_P_POSTIND
+/* 1100 1110 1111 */ TABDECL(OP_STC_P_POSTIND),		// OP_STC_P_POSTIND
+
+/* 1100 1111 0000 */ TABDECL(OP_LDC_P_POSTIND),		// OP_LDC_P_POSTIND
+/* 1100 1111 0001 */ TABDECL(OP_LDC_P_POSTIND),		// OP_LDC_P_POSTIND
+/* 1100 1111 0010 */ TABDECL(OP_LDC_P_POSTIND),		// OP_LDC_P_POSTIND
+/* 1100 1111 0011 */ TABDECL(OP_LDC_P_POSTIND),		// OP_LDC_P_POSTIND
+/* 1100 1111 0100 */ TABDECL(OP_LDC_P_POSTIND),		// OP_LDC_P_POSTIND
+/* 1100 1111 0101 */ TABDECL(OP_LDC_P_POSTIND),		// OP_LDC_P_POSTIND
+/* 1100 1111 0110 */ TABDECL(OP_LDC_P_POSTIND),		// OP_LDC_P_POSTIND
+/* 1100 1111 0111 */ TABDECL(OP_LDC_P_POSTIND),		// OP_LDC_P_POSTIND
+/* 1100 1111 1000 */ TABDECL(OP_LDC_P_POSTIND),		// OP_LDC_P_POSTIND
+/* 1100 1111 1001 */ TABDECL(OP_LDC_P_POSTIND),		// OP_LDC_P_POSTIND
+/* 1100 1111 1010 */ TABDECL(OP_LDC_P_POSTIND),		// OP_LDC_P_POSTIND
+/* 1100 1111 1011 */ TABDECL(OP_LDC_P_POSTIND),		// OP_LDC_P_POSTIND
+/* 1100 1111 1100 */ TABDECL(OP_LDC_P_POSTIND),		// OP_LDC_P_POSTIND
+/* 1100 1111 1101 */ TABDECL(OP_LDC_P_POSTIND),		// OP_LDC_P_POSTIND
+/* 1100 1111 1110 */ TABDECL(OP_LDC_P_POSTIND),		// OP_LDC_P_POSTIND
+/* 1100 1111 1111 */ TABDECL(OP_LDC_P_POSTIND),		// OP_LDC_P_POSTIND
+
+/* 1101 0000 0000 */ TABDECL(OP_STC_M_IMM_OFF),		// OP_STC_M_IMM_OFF
+/* 1101 0000 0001 */ TABDECL(OP_STC_M_IMM_OFF),		// OP_STC_M_IMM_OFF
+/* 1101 0000 0010 */ TABDECL(OP_STC_M_IMM_OFF),		// OP_STC_M_IMM_OFF
+/* 1101 0000 0011 */ TABDECL(OP_STC_M_IMM_OFF),		// OP_STC_M_IMM_OFF
+/* 1101 0000 0100 */ TABDECL(OP_STC_M_IMM_OFF),		// OP_STC_M_IMM_OFF
+/* 1101 0000 0101 */ TABDECL(OP_STC_M_IMM_OFF),		// OP_STC_M_IMM_OFF
+/* 1101 0000 0110 */ TABDECL(OP_STC_M_IMM_OFF),		// OP_STC_M_IMM_OFF
+/* 1101 0000 0111 */ TABDECL(OP_STC_M_IMM_OFF),		// OP_STC_M_IMM_OFF
+/* 1101 0000 1000 */ TABDECL(OP_STC_M_IMM_OFF),		// OP_STC_M_IMM_OFF
+/* 1101 0000 1001 */ TABDECL(OP_STC_M_IMM_OFF),		// OP_STC_M_IMM_OFF
+/* 1101 0000 1010 */ TABDECL(OP_STC_M_IMM_OFF),		// OP_STC_M_IMM_OFF
+/* 1101 0000 1011 */ TABDECL(OP_STC_M_IMM_OFF),		// OP_STC_M_IMM_OFF
+/* 1101 0000 1100 */ TABDECL(OP_STC_M_IMM_OFF),		// OP_STC_M_IMM_OFF
+/* 1101 0000 1101 */ TABDECL(OP_STC_M_IMM_OFF),		// OP_STC_M_IMM_OFF
+/* 1101 0000 1110 */ TABDECL(OP_STC_M_IMM_OFF),		// OP_STC_M_IMM_OFF
+/* 1101 0000 1111 */ TABDECL(OP_STC_M_IMM_OFF),		// OP_STC_M_IMM_OFF
+
+/* 1101 0001 0000 */ TABDECL(OP_LDC_M_IMM_OFF),		// OP_LDC_M_IMM_OFF
+/* 1101 0001 0001 */ TABDECL(OP_LDC_M_IMM_OFF),		// OP_LDC_M_IMM_OFF
+/* 1101 0001 0010 */ TABDECL(OP_LDC_M_IMM_OFF),		// OP_LDC_M_IMM_OFF
+/* 1101 0001 0011 */ TABDECL(OP_LDC_M_IMM_OFF),		// OP_LDC_M_IMM_OFF
+/* 1101 0001 0100 */ TABDECL(OP_LDC_M_IMM_OFF),		// OP_LDC_M_IMM_OFF
+/* 1101 0001 0101 */ TABDECL(OP_LDC_M_IMM_OFF),		// OP_LDC_M_IMM_OFF
+/* 1101 0001 0110 */ TABDECL(OP_LDC_M_IMM_OFF),		// OP_LDC_M_IMM_OFF
+/* 1101 0001 0111 */ TABDECL(OP_LDC_M_IMM_OFF),		// OP_LDC_M_IMM_OFF
+/* 1101 0001 1000 */ TABDECL(OP_LDC_M_IMM_OFF),		// OP_LDC_M_IMM_OFF
+/* 1101 0001 1001 */ TABDECL(OP_LDC_M_IMM_OFF),		// OP_LDC_M_IMM_OFF
+/* 1101 0001 1010 */ TABDECL(OP_LDC_M_IMM_OFF),		// OP_LDC_M_IMM_OFF
+/* 1101 0001 1011 */ TABDECL(OP_LDC_M_IMM_OFF),		// OP_LDC_M_IMM_OFF
+/* 1101 0001 1100 */ TABDECL(OP_LDC_M_IMM_OFF),		// OP_LDC_M_IMM_OFF
+/* 1101 0001 1101 */ TABDECL(OP_LDC_M_IMM_OFF),		// OP_LDC_M_IMM_OFF
+/* 1101 0001 1110 */ TABDECL(OP_LDC_M_IMM_OFF),		// OP_LDC_M_IMM_OFF
+/* 1101 0001 1111 */ TABDECL(OP_LDC_M_IMM_OFF),		// OP_LDC_M_IMM_OFF
+
+/* 1101 0010 0000 */ TABDECL(OP_STC_M_PREIND),		// OP_STC_M_PREIND
+/* 1101 0010 0001 */ TABDECL(OP_STC_M_PREIND),		// OP_STC_M_PREIND
+/* 1101 0010 0010 */ TABDECL(OP_STC_M_PREIND),		// OP_STC_M_PREIND
+/* 1101 0010 0011 */ TABDECL(OP_STC_M_PREIND),		// OP_STC_M_PREIND
+/* 1101 0010 0100 */ TABDECL(OP_STC_M_PREIND),		// OP_STC_M_PREIND
+/* 1101 0010 0101 */ TABDECL(OP_STC_M_PREIND),		// OP_STC_M_PREIND
+/* 1101 0010 0110 */ TABDECL(OP_STC_M_PREIND),		// OP_STC_M_PREIND
+/* 1101 0010 0111 */ TABDECL(OP_STC_M_PREIND),		// OP_STC_M_PREIND
+/* 1101 0010 1000 */ TABDECL(OP_STC_M_PREIND),		// OP_STC_M_PREIND
+/* 1101 0010 1001 */ TABDECL(OP_STC_M_PREIND),		// OP_STC_M_PREIND
+/* 1101 0010 1010 */ TABDECL(OP_STC_M_PREIND),		// OP_STC_M_PREIND
+/* 1101 0010 1011 */ TABDECL(OP_STC_M_PREIND),		// OP_STC_M_PREIND
+/* 1101 0010 1100 */ TABDECL(OP_STC_M_PREIND),		// OP_STC_M_PREIND
+/* 1101 0010 1101 */ TABDECL(OP_STC_M_PREIND),		// OP_STC_M_PREIND
+/* 1101 0010 1110 */ TABDECL(OP_STC_M_PREIND),		// OP_STC_M_PREIND
+/* 1101 0010 1111 */ TABDECL(OP_STC_M_PREIND),		// OP_STC_M_PREIND
+
+/* 1101 0011 0000 */ TABDECL(OP_LDC_M_PREIND),		// OP_LDC_M_PREIND
+/* 1101 0011 0001 */ TABDECL(OP_LDC_M_PREIND),		// OP_LDC_M_PREIND
+/* 1101 0011 0010 */ TABDECL(OP_LDC_M_PREIND),		// OP_LDC_M_PREIND
+/* 1101 0011 0011 */ TABDECL(OP_LDC_M_PREIND),		// OP_LDC_M_PREIND
+/* 1101 0011 0100 */ TABDECL(OP_LDC_M_PREIND),		// OP_LDC_M_PREIND
+/* 1101 0011 0101 */ TABDECL(OP_LDC_M_PREIND),		// OP_LDC_M_PREIND
+/* 1101 0011 0110 */ TABDECL(OP_LDC_M_PREIND),		// OP_LDC_M_PREIND
+/* 1101 0011 0111 */ TABDECL(OP_LDC_M_PREIND),		// OP_LDC_M_PREIND
+/* 1101 0011 1000 */ TABDECL(OP_LDC_M_PREIND),		// OP_LDC_M_PREIND
+/* 1101 0011 1001 */ TABDECL(OP_LDC_M_PREIND),		// OP_LDC_M_PREIND
+/* 1101 0011 1010 */ TABDECL(OP_LDC_M_PREIND),		// OP_LDC_M_PREIND
+/* 1101 0011 1011 */ TABDECL(OP_LDC_M_PREIND),		// OP_LDC_M_PREIND
+/* 1101 0011 1100 */ TABDECL(OP_LDC_M_PREIND),		// OP_LDC_M_PREIND
+/* 1101 0011 1101 */ TABDECL(OP_LDC_M_PREIND),		// OP_LDC_M_PREIND
+/* 1101 0011 1110 */ TABDECL(OP_LDC_M_PREIND),		// OP_LDC_M_PREIND
+/* 1101 0011 1111 */ TABDECL(OP_LDC_M_PREIND),		// OP_LDC_M_PREIND
+
+/* 1101 0100 0000 */ TABDECL(OP_STC_M_IMM_OFF),		// OP_STC_M_IMM_OFF
+/* 1101 0100 0001 */ TABDECL(OP_STC_M_IMM_OFF),		// OP_STC_M_IMM_OFF
+/* 1101 0100 0010 */ TABDECL(OP_STC_M_IMM_OFF),		// OP_STC_M_IMM_OFF
+/* 1101 0100 0011 */ TABDECL(OP_STC_M_IMM_OFF),		// OP_STC_M_IMM_OFF
+/* 1101 0100 0100 */ TABDECL(OP_STC_M_IMM_OFF),		// OP_STC_M_IMM_OFF
+/* 1101 0100 0101 */ TABDECL(OP_STC_M_IMM_OFF),		// OP_STC_M_IMM_OFF
+/* 1101 0100 0110 */ TABDECL(OP_STC_M_IMM_OFF),		// OP_STC_M_IMM_OFF
+/* 1101 0100 0111 */ TABDECL(OP_STC_M_IMM_OFF),		// OP_STC_M_IMM_OFF
+/* 1101 0100 1000 */ TABDECL(OP_STC_M_IMM_OFF),		// OP_STC_M_IMM_OFF
+/* 1101 0100 1001 */ TABDECL(OP_STC_M_IMM_OFF),		// OP_STC_M_IMM_OFF
+/* 1101 0100 1010 */ TABDECL(OP_STC_M_IMM_OFF),		// OP_STC_M_IMM_OFF
+/* 1101 0100 1011 */ TABDECL(OP_STC_M_IMM_OFF),		// OP_STC_M_IMM_OFF
+/* 1101 0100 1100 */ TABDECL(OP_STC_M_IMM_OFF),		// OP_STC_M_IMM_OFF
+/* 1101 0100 1101 */ TABDECL(OP_STC_M_IMM_OFF),		// OP_STC_M_IMM_OFF
+/* 1101 0100 1110 */ TABDECL(OP_STC_M_IMM_OFF),		// OP_STC_M_IMM_OFF
+/* 1101 0100 1111 */ TABDECL(OP_STC_M_IMM_OFF),		// OP_STC_M_IMM_OFF
+
+/* 1101 0101 0000 */ TABDECL(OP_LDC_M_IMM_OFF),		// OP_LDC_M_IMM_OFF
+/* 1101 0101 0001 */ TABDECL(OP_LDC_M_IMM_OFF),		// OP_LDC_M_IMM_OFF
+/* 1101 0101 0010 */ TABDECL(OP_LDC_M_IMM_OFF),		// OP_LDC_M_IMM_OFF
+/* 1101 0101 0011 */ TABDECL(OP_LDC_M_IMM_OFF),		// OP_LDC_M_IMM_OFF
+/* 1101 0101 0100 */ TABDECL(OP_LDC_M_IMM_OFF),		// OP_LDC_M_IMM_OFF
+/* 1101 0101 0101 */ TABDECL(OP_LDC_M_IMM_OFF),		// OP_LDC_M_IMM_OFF
+/* 1101 0101 0110 */ TABDECL(OP_LDC_M_IMM_OFF),		// OP_LDC_M_IMM_OFF
+/* 1101 0101 0111 */ TABDECL(OP_LDC_M_IMM_OFF),		// OP_LDC_M_IMM_OFF
+/* 1101 0101 1000 */ TABDECL(OP_LDC_M_IMM_OFF),		// OP_LDC_M_IMM_OFF
+/* 1101 0101 1001 */ TABDECL(OP_LDC_M_IMM_OFF),		// OP_LDC_M_IMM_OFF
+/* 1101 0101 1010 */ TABDECL(OP_LDC_M_IMM_OFF),		// OP_LDC_M_IMM_OFF
+/* 1101 0101 1011 */ TABDECL(OP_LDC_M_IMM_OFF),		// OP_LDC_M_IMM_OFF
+/* 1101 0101 1100 */ TABDECL(OP_LDC_M_IMM_OFF),		// OP_LDC_M_IMM_OFF
+/* 1101 0101 1101 */ TABDECL(OP_LDC_M_IMM_OFF),		// OP_LDC_M_IMM_OFF
+/* 1101 0101 1110 */ TABDECL(OP_LDC_M_IMM_OFF),		// OP_LDC_M_IMM_OFF
+/* 1101 0101 1111 */ TABDECL(OP_LDC_M_IMM_OFF),		// OP_LDC_M_IMM_OFF
+
+/* 1101 0110 0000 */ TABDECL(OP_STC_M_PREIND),		// OP_STC_M_PREIND
+/* 1101 0110 0001 */ TABDECL(OP_STC_M_PREIND),		// OP_STC_M_PREIND
+/* 1101 0110 0010 */ TABDECL(OP_STC_M_PREIND),		// OP_STC_M_PREIND
+/* 1101 0110 0011 */ TABDECL(OP_STC_M_PREIND),		// OP_STC_M_PREIND
+/* 1101 0110 0100 */ TABDECL(OP_STC_M_PREIND),		// OP_STC_M_PREIND
+/* 1101 0110 0101 */ TABDECL(OP_STC_M_PREIND),		// OP_STC_M_PREIND
+/* 1101 0110 0110 */ TABDECL(OP_STC_M_PREIND),		// OP_STC_M_PREIND
+/* 1101 0110 0111 */ TABDECL(OP_STC_M_PREIND),		// OP_STC_M_PREIND
+/* 1101 0110 1000 */ TABDECL(OP_STC_M_PREIND),		// OP_STC_M_PREIND
+/* 1101 0110 1001 */ TABDECL(OP_STC_M_PREIND),		// OP_STC_M_PREIND
+/* 1101 0110 1010 */ TABDECL(OP_STC_M_PREIND),		// OP_STC_M_PREIND
+/* 1101 0110 1011 */ TABDECL(OP_STC_M_PREIND),		// OP_STC_M_PREIND
+/* 1101 0110 1100 */ TABDECL(OP_STC_M_PREIND),		// OP_STC_M_PREIND
+/* 1101 0110 1101 */ TABDECL(OP_STC_M_PREIND),		// OP_STC_M_PREIND
+/* 1101 0110 1110 */ TABDECL(OP_STC_M_PREIND),		// OP_STC_M_PREIND
+/* 1101 0110 1111 */ TABDECL(OP_STC_M_PREIND),		// OP_STC_M_PREIND
+
+/* 1101 0111 0000 */ TABDECL(OP_LDC_M_PREIND),		// OP_LDC_M_PREIND
+/* 1101 0111 0001 */ TABDECL(OP_LDC_M_PREIND),		// OP_LDC_M_PREIND
+/* 1101 0111 0010 */ TABDECL(OP_LDC_M_PREIND),		// OP_LDC_M_PREIND
+/* 1101 0111 0011 */ TABDECL(OP_LDC_M_PREIND),		// OP_LDC_M_PREIND
+/* 1101 0111 0100 */ TABDECL(OP_LDC_M_PREIND),		// OP_LDC_M_PREIND
+/* 1101 0111 0101 */ TABDECL(OP_LDC_M_PREIND),		// OP_LDC_M_PREIND
+/* 1101 0111 0110 */ TABDECL(OP_LDC_M_PREIND),		// OP_LDC_M_PREIND
+/* 1101 0111 0111 */ TABDECL(OP_LDC_M_PREIND),		// OP_LDC_M_PREIND
+/* 1101 0111 1000 */ TABDECL(OP_LDC_M_PREIND),		// OP_LDC_M_PREIND
+/* 1101 0111 1001 */ TABDECL(OP_LDC_M_PREIND),		// OP_LDC_M_PREIND
+/* 1101 0111 1010 */ TABDECL(OP_LDC_M_PREIND),		// OP_LDC_M_PREIND
+/* 1101 0111 1011 */ TABDECL(OP_LDC_M_PREIND),		// OP_LDC_M_PREIND
+/* 1101 0111 1100 */ TABDECL(OP_LDC_M_PREIND),		// OP_LDC_M_PREIND
+/* 1101 0111 1101 */ TABDECL(OP_LDC_M_PREIND),		// OP_LDC_M_PREIND
+/* 1101 0111 1110 */ TABDECL(OP_LDC_M_PREIND),		// OP_LDC_M_PREIND
+/* 1101 0111 1111 */ TABDECL(OP_LDC_M_PREIND),		// OP_LDC_M_PREIND
+
+/* 1101 1000 0000 */ TABDECL(OP_STC_P_IMM_OFF),		// OP_STC_P_IMM_OFF
+/* 1101 1000 0001 */ TABDECL(OP_STC_P_IMM_OFF),		// OP_STC_P_IMM_OFF
+/* 1101 1000 0010 */ TABDECL(OP_STC_P_IMM_OFF),		// OP_STC_P_IMM_OFF
+/* 1101 1000 0011 */ TABDECL(OP_STC_P_IMM_OFF),		// OP_STC_P_IMM_OFF
+/* 1101 1000 0100 */ TABDECL(OP_STC_P_IMM_OFF),		// OP_STC_P_IMM_OFF
+/* 1101 1000 0101 */ TABDECL(OP_STC_P_IMM_OFF),		// OP_STC_P_IMM_OFF
+/* 1101 1000 0110 */ TABDECL(OP_STC_P_IMM_OFF),		// OP_STC_P_IMM_OFF
+/* 1101 1000 0111 */ TABDECL(OP_STC_P_IMM_OFF),		// OP_STC_P_IMM_OFF
+/* 1101 1000 1000 */ TABDECL(OP_STC_P_IMM_OFF),		// OP_STC_P_IMM_OFF
+/* 1101 1000 1001 */ TABDECL(OP_STC_P_IMM_OFF),		// OP_STC_P_IMM_OFF
+/* 1101 1000 1010 */ TABDECL(OP_STC_P_IMM_OFF),		// OP_STC_P_IMM_OFF
+/* 1101 1000 1011 */ TABDECL(OP_STC_P_IMM_OFF),		// OP_STC_P_IMM_OFF
+/* 1101 1000 1100 */ TABDECL(OP_STC_P_IMM_OFF),		// OP_STC_P_IMM_OFF
+/* 1101 1000 1101 */ TABDECL(OP_STC_P_IMM_OFF),		// OP_STC_P_IMM_OFF
+/* 1101 1000 1110 */ TABDECL(OP_STC_P_IMM_OFF),		// OP_STC_P_IMM_OFF
+/* 1101 1000 1111 */ TABDECL(OP_STC_P_IMM_OFF),		// OP_STC_P_IMM_OFF
+
+/* 1101 1001 0000 */ TABDECL(OP_LDC_P_IMM_OFF),		// OP_LDC_P_IMM_OFF
+/* 1101 1001 0001 */ TABDECL(OP_LDC_P_IMM_OFF),		// OP_LDC_P_IMM_OFF
+/* 1101 1001 0010 */ TABDECL(OP_LDC_P_IMM_OFF),		// OP_LDC_P_IMM_OFF
+/* 1101 1001 0011 */ TABDECL(OP_LDC_P_IMM_OFF),		// OP_LDC_P_IMM_OFF
+/* 1101 1001 0100 */ TABDECL(OP_LDC_P_IMM_OFF),		// OP_LDC_P_IMM_OFF
+/* 1101 1001 0101 */ TABDECL(OP_LDC_P_IMM_OFF),		// OP_LDC_P_IMM_OFF
+/* 1101 1001 0110 */ TABDECL(OP_LDC_P_IMM_OFF),		// OP_LDC_P_IMM_OFF
+/* 1101 1001 0111 */ TABDECL(OP_LDC_P_IMM_OFF),		// OP_LDC_P_IMM_OFF
+/* 1101 1001 1000 */ TABDECL(OP_LDC_P_IMM_OFF),		// OP_LDC_P_IMM_OFF
+/* 1101 1001 1001 */ TABDECL(OP_LDC_P_IMM_OFF),		// OP_LDC_P_IMM_OFF
+/* 1101 1001 1010 */ TABDECL(OP_LDC_P_IMM_OFF),		// OP_LDC_P_IMM_OFF
+/* 1101 1001 1011 */ TABDECL(OP_LDC_P_IMM_OFF),		// OP_LDC_P_IMM_OFF
+/* 1101 1001 1100 */ TABDECL(OP_LDC_P_IMM_OFF),		// OP_LDC_P_IMM_OFF
+/* 1101 1001 1101 */ TABDECL(OP_LDC_P_IMM_OFF),		// OP_LDC_P_IMM_OFF
+/* 1101 1001 1110 */ TABDECL(OP_LDC_P_IMM_OFF),		// OP_LDC_P_IMM_OFF
+/* 1101 1001 1111 */ TABDECL(OP_LDC_P_IMM_OFF),		// OP_LDC_P_IMM_OFF
+
+/* 1101 1010 0000 */ TABDECL(OP_STC_P_PREIND),		// OP_STC_P_PREIND
+/* 1101 1010 0001 */ TABDECL(OP_STC_P_PREIND),		// OP_STC_P_PREIND
+/* 1101 1010 0010 */ TABDECL(OP_STC_P_PREIND),		// OP_STC_P_PREIND
+/* 1101 1010 0011 */ TABDECL(OP_STC_P_PREIND),		// OP_STC_P_PREIND
+/* 1101 1010 0100 */ TABDECL(OP_STC_P_PREIND),		// OP_STC_P_PREIND
+/* 1101 1010 0101 */ TABDECL(OP_STC_P_PREIND),		// OP_STC_P_PREIND
+/* 1101 1010 0110 */ TABDECL(OP_STC_P_PREIND),		// OP_STC_P_PREIND
+/* 1101 1010 0111 */ TABDECL(OP_STC_P_PREIND),		// OP_STC_P_PREIND
+/* 1101 1010 1000 */ TABDECL(OP_STC_P_PREIND),		// OP_STC_P_PREIND
+/* 1101 1010 1001 */ TABDECL(OP_STC_P_PREIND),		// OP_STC_P_PREIND
+/* 1101 1010 1010 */ TABDECL(OP_STC_P_PREIND),		// OP_STC_P_PREIND
+/* 1101 1010 1011 */ TABDECL(OP_STC_P_PREIND),		// OP_STC_P_PREIND
+/* 1101 1010 1100 */ TABDECL(OP_STC_P_PREIND),		// OP_STC_P_PREIND
+/* 1101 1010 1101 */ TABDECL(OP_STC_P_PREIND),		// OP_STC_P_PREIND
+/* 1101 1010 1110 */ TABDECL(OP_STC_P_PREIND),		// OP_STC_P_PREIND
+/* 1101 1010 1111 */ TABDECL(OP_STC_P_PREIND),		// OP_STC_P_PREIND
+
+/* 1101 1011 0000 */ TABDECL(OP_LDC_P_PREIND),		// OP_LDC_P_PREIND
+/* 1101 1011 0001 */ TABDECL(OP_LDC_P_PREIND),		// OP_LDC_P_PREIND
+/* 1101 1011 0010 */ TABDECL(OP_LDC_P_PREIND),		// OP_LDC_P_PREIND
+/* 1101 1011 0011 */ TABDECL(OP_LDC_P_PREIND),		// OP_LDC_P_PREIND
+/* 1101 1011 0100 */ TABDECL(OP_LDC_P_PREIND),		// OP_LDC_P_PREIND
+/* 1101 1011 0101 */ TABDECL(OP_LDC_P_PREIND),		// OP_LDC_P_PREIND
+/* 1101 1011 0110 */ TABDECL(OP_LDC_P_PREIND),		// OP_LDC_P_PREIND
+/* 1101 1011 0111 */ TABDECL(OP_LDC_P_PREIND),		// OP_LDC_P_PREIND
+/* 1101 1011 1000 */ TABDECL(OP_LDC_P_PREIND),		// OP_LDC_P_PREIND
+/* 1101 1011 1001 */ TABDECL(OP_LDC_P_PREIND),		// OP_LDC_P_PREIND
+/* 1101 1011 1010 */ TABDECL(OP_LDC_P_PREIND),		// OP_LDC_P_PREIND
+/* 1101 1011 1011 */ TABDECL(OP_LDC_P_PREIND),		// OP_LDC_P_PREIND
+/* 1101 1011 1100 */ TABDECL(OP_LDC_P_PREIND),		// OP_LDC_P_PREIND
+/* 1101 1011 1101 */ TABDECL(OP_LDC_P_PREIND),		// OP_LDC_P_PREIND
+/* 1101 1011 1110 */ TABDECL(OP_LDC_P_PREIND),		// OP_LDC_P_PREIND
+/* 1101 1011 1111 */ TABDECL(OP_LDC_P_PREIND),		// OP_LDC_P_PREIND
+
+/* 1101 1100 0000 */ TABDECL(OP_STC_P_IMM_OFF),		// OP_STC_P_IMM_OFF
+/* 1101 1100 0001 */ TABDECL(OP_STC_P_IMM_OFF),		// OP_STC_P_IMM_OFF
+/* 1101 1100 0010 */ TABDECL(OP_STC_P_IMM_OFF),		// OP_STC_P_IMM_OFF
+/* 1101 1100 0011 */ TABDECL(OP_STC_P_IMM_OFF),		// OP_STC_P_IMM_OFF
+/* 1101 1100 0100 */ TABDECL(OP_STC_P_IMM_OFF),		// OP_STC_P_IMM_OFF
+/* 1101 1100 0101 */ TABDECL(OP_STC_P_IMM_OFF),		// OP_STC_P_IMM_OFF
+/* 1101 1100 0110 */ TABDECL(OP_STC_P_IMM_OFF),		// OP_STC_P_IMM_OFF
+/* 1101 1100 0111 */ TABDECL(OP_STC_P_IMM_OFF),		// OP_STC_P_IMM_OFF
+/* 1101 1100 1000 */ TABDECL(OP_STC_P_IMM_OFF),		// OP_STC_P_IMM_OFF
+/* 1101 1100 1001 */ TABDECL(OP_STC_P_IMM_OFF),		// OP_STC_P_IMM_OFF
+/* 1101 1100 1010 */ TABDECL(OP_STC_P_IMM_OFF),		// OP_STC_P_IMM_OFF
+/* 1101 1100 1011 */ TABDECL(OP_STC_P_IMM_OFF),		// OP_STC_P_IMM_OFF
+/* 1101 1100 1100 */ TABDECL(OP_STC_P_IMM_OFF),		// OP_STC_P_IMM_OFF
+/* 1101 1100 1101 */ TABDECL(OP_STC_P_IMM_OFF),		// OP_STC_P_IMM_OFF
+/* 1101 1100 1110 */ TABDECL(OP_STC_P_IMM_OFF),		// OP_STC_P_IMM_OFF
+/* 1101 1100 1111 */ TABDECL(OP_STC_P_IMM_OFF),		// OP_STC_P_IMM_OFF
+
+/* 1101 1101 0000 */ TABDECL(OP_LDC_P_IMM_OFF),		// OP_LDC_P_IMM_OFF
+/* 1101 1101 0001 */ TABDECL(OP_LDC_P_IMM_OFF),		// OP_LDC_P_IMM_OFF
+/* 1101 1101 0010 */ TABDECL(OP_LDC_P_IMM_OFF),		// OP_LDC_P_IMM_OFF
+/* 1101 1101 0011 */ TABDECL(OP_LDC_P_IMM_OFF),		// OP_LDC_P_IMM_OFF
+/* 1101 1101 0100 */ TABDECL(OP_LDC_P_IMM_OFF),		// OP_LDC_P_IMM_OFF
+/* 1101 1101 0101 */ TABDECL(OP_LDC_P_IMM_OFF),		// OP_LDC_P_IMM_OFF
+/* 1101 1101 0110 */ TABDECL(OP_LDC_P_IMM_OFF),		// OP_LDC_P_IMM_OFF
+/* 1101 1101 0111 */ TABDECL(OP_LDC_P_IMM_OFF),		// OP_LDC_P_IMM_OFF
+/* 1101 1101 1000 */ TABDECL(OP_LDC_P_IMM_OFF),		// OP_LDC_P_IMM_OFF
+/* 1101 1101 1001 */ TABDECL(OP_LDC_P_IMM_OFF),		// OP_LDC_P_IMM_OFF
+/* 1101 1101 1010 */ TABDECL(OP_LDC_P_IMM_OFF),		// OP_LDC_P_IMM_OFF
+/* 1101 1101 1011 */ TABDECL(OP_LDC_P_IMM_OFF),		// OP_LDC_P_IMM_OFF
+/* 1101 1101 1100 */ TABDECL(OP_LDC_P_IMM_OFF),		// OP_LDC_P_IMM_OFF
+/* 1101 1101 1101 */ TABDECL(OP_LDC_P_IMM_OFF),		// OP_LDC_P_IMM_OFF
+/* 1101 1101 1110 */ TABDECL(OP_LDC_P_IMM_OFF),		// OP_LDC_P_IMM_OFF
+/* 1101 1101 1111 */ TABDECL(OP_LDC_P_IMM_OFF),		// OP_LDC_P_IMM_OFF
+
+/* 1101 1110 0000 */ TABDECL(OP_STC_P_PREIND),		// OP_STC_P_PREIND
+/* 1101 1110 0001 */ TABDECL(OP_STC_P_PREIND),		// OP_STC_P_PREIND
+/* 1101 1110 0010 */ TABDECL(OP_STC_P_PREIND),		// OP_STC_P_PREIND
+/* 1101 1110 0011 */ TABDECL(OP_STC_P_PREIND),		// OP_STC_P_PREIND
+/* 1101 1110 0100 */ TABDECL(OP_STC_P_PREIND),		// OP_STC_P_PREIND
+/* 1101 1110 0101 */ TABDECL(OP_STC_P_PREIND),		// OP_STC_P_PREIND
+/* 1101 1110 0110 */ TABDECL(OP_STC_P_PREIND),		// OP_STC_P_PREIND
+/* 1101 1110 0111 */ TABDECL(OP_STC_P_PREIND),		// OP_STC_P_PREIND
+/* 1101 1110 1000 */ TABDECL(OP_STC_P_PREIND),		// OP_STC_P_PREIND
+/* 1101 1110 1001 */ TABDECL(OP_STC_P_PREIND),		// OP_STC_P_PREIND
+/* 1101 1110 1010 */ TABDECL(OP_STC_P_PREIND),		// OP_STC_P_PREIND
+/* 1101 1110 1011 */ TABDECL(OP_STC_P_PREIND),		// OP_STC_P_PREIND
+/* 1101 1110 1100 */ TABDECL(OP_STC_P_PREIND),		// OP_STC_P_PREIND
+/* 1101 1110 1101 */ TABDECL(OP_STC_P_PREIND),		// OP_STC_P_PREIND
+/* 1101 1110 1110 */ TABDECL(OP_STC_P_PREIND),		// OP_STC_P_PREIND
+/* 1101 1110 1111 */ TABDECL(OP_STC_P_PREIND),		// OP_STC_P_PREIND
+
+/* 1101 1111 0000 */ TABDECL(OP_LDC_P_PREIND),		// OP_LDC_P_PREIND
+/* 1101 1111 0001 */ TABDECL(OP_LDC_P_PREIND),		// OP_LDC_P_PREIND
+/* 1101 1111 0010 */ TABDECL(OP_LDC_P_PREIND),		// OP_LDC_P_PREIND
+/* 1101 1111 0011 */ TABDECL(OP_LDC_P_PREIND),		// OP_LDC_P_PREIND
+/* 1101 1111 0100 */ TABDECL(OP_LDC_P_PREIND),		// OP_LDC_P_PREIND
+/* 1101 1111 0101 */ TABDECL(OP_LDC_P_PREIND),		// OP_LDC_P_PREIND
+/* 1101 1111 0110 */ TABDECL(OP_LDC_P_PREIND),		// OP_LDC_P_PREIND
+/* 1101 1111 0111 */ TABDECL(OP_LDC_P_PREIND),		// OP_LDC_P_PREIND
+/* 1101 1111 1000 */ TABDECL(OP_LDC_P_PREIND),		// OP_LDC_P_PREIND
+/* 1101 1111 1001 */ TABDECL(OP_LDC_P_PREIND),		// OP_LDC_P_PREIND
+/* 1101 1111 1010 */ TABDECL(OP_LDC_P_PREIND),		// OP_LDC_P_PREIND
+/* 1101 1111 1011 */ TABDECL(OP_LDC_P_PREIND),		// OP_LDC_P_PREIND
+/* 1101 1111 1100 */ TABDECL(OP_LDC_P_PREIND),		// OP_LDC_P_PREIND
+/* 1101 1111 1101 */ TABDECL(OP_LDC_P_PREIND),		// OP_LDC_P_PREIND
+/* 1101 1111 1110 */ TABDECL(OP_LDC_P_PREIND),		// OP_LDC_P_PREIND
+/* 1101 1111 1111 */ TABDECL(OP_LDC_P_PREIND),		// OP_LDC_P_PREIND
+
+/* 1110 0000 0000 */ TABDECL(OP_CDP),		// OP_CDP
+/* 1110 0000 0001 */ TABDECL(OP_MCR),		// OP_MCR
+/* 1110 0000 0010 */ TABDECL(OP_CDP),		// OP_CDP
+/* 1110 0000 0011 */ TABDECL(OP_MCR),		// OP_MCR
+/* 1110 0000 0100 */ TABDECL(OP_CDP),		// OP_CDP
+/* 1110 0000 0101 */ TABDECL(OP_MCR),		// OP_MCR
+/* 1110 0000 0110 */ TABDECL(OP_CDP),		// OP_CDP
+/* 1110 0000 0111 */ TABDECL(OP_MCR),		// OP_MCR
+/* 1110 0000 1000 */ TABDECL(OP_CDP),		// OP_CDP
+/* 1110 0000 1001 */ TABDECL(OP_MCR),		// OP_MCR
+/* 1110 0000 1010 */ TABDECL(OP_CDP),		// OP_CDP
+/* 1110 0000 1011 */ TABDECL(OP_MCR),		// OP_MCR
+/* 1110 0000 1100 */ TABDECL(OP_CDP),		// OP_CDP
+/* 1110 0000 1101 */ TABDECL(OP_MCR),		// OP_MCR
+/* 1110 0000 1110 */ TABDECL(OP_CDP),		// OP_CDP
+/* 1110 0000 1111 */ TABDECL(OP_MCR),		// OP_MCR
+
+/* 1110 0001 0000 */ TABDECL(OP_CDP),		// OP_CDP
+/* 1110 0001 0001 */ TABDECL(OP_MRC),		// OP_MRC
+/* 1110 0001 0010 */ TABDECL(OP_CDP),		// OP_CDP
+/* 1110 0001 0011 */ TABDECL(OP_MRC),		// OP_MRC
+/* 1110 0001 0100 */ TABDECL(OP_CDP),		// OP_CDP
+/* 1110 0001 0101 */ TABDECL(OP_MRC),		// OP_MRC
+/* 1110 0001 0110 */ TABDECL(OP_CDP),		// OP_CDP
+/* 1110 0001 0111 */ TABDECL(OP_MRC),		// OP_MRC
+/* 1110 0001 1000 */ TABDECL(OP_CDP),		// OP_CDP
+/* 1110 0001 1001 */ TABDECL(OP_MRC),		// OP_MRC
+/* 1110 0001 1010 */ TABDECL(OP_CDP),		// OP_CDP
+/* 1110 0001 1011 */ TABDECL(OP_MRC),		// OP_MRC
+/* 1110 0001 1100 */ TABDECL(OP_CDP),		// OP_CDP
+/* 1110 0001 1101 */ TABDECL(OP_MRC),		// OP_MRC
+/* 1110 0001 1110 */ TABDECL(OP_CDP),		// OP_CDP
+/* 1110 0001 1111 */ TABDECL(OP_MRC),		// OP_MRC
+
+/* 1110 0010 0000 */ TABDECL(OP_CDP),		// OP_CDP
+/* 1110 0010 0001 */ TABDECL(OP_MCR),		// OP_MCR
+/* 1110 0010 0010 */ TABDECL(OP_CDP),		// OP_CDP
+/* 1110 0010 0011 */ TABDECL(OP_MCR),		// OP_MCR
+/* 1110 0010 0100 */ TABDECL(OP_CDP),		// OP_CDP
+/* 1110 0010 0101 */ TABDECL(OP_MCR),		// OP_MCR
+/* 1110 0010 0110 */ TABDECL(OP_CDP),		// OP_CDP
+/* 1110 0010 0111 */ TABDECL(OP_MCR),		// OP_MCR
+/* 1110 0010 1000 */ TABDECL(OP_CDP),		// OP_CDP
+/* 1110 0010 1001 */ TABDECL(OP_MCR),		// OP_MCR
+/* 1110 0010 1010 */ TABDECL(OP_CDP),		// OP_CDP
+/* 1110 0010 1011 */ TABDECL(OP_MCR),		// OP_MCR
+/* 1110 0010 1100 */ TABDECL(OP_CDP),		// OP_CDP
+/* 1110 0010 1101 */ TABDECL(OP_MCR),		// OP_MCR
+/* 1110 0010 1110 */ TABDECL(OP_CDP),		// OP_CDP
+/* 1110 0010 1111 */ TABDECL(OP_MCR),		// OP_MCR
+
+/* 1110 0011 0000 */ TABDECL(OP_CDP),		// OP_CDP
+/* 1110 0011 0001 */ TABDECL(OP_MRC),		// OP_MRC
+/* 1110 0011 0010 */ TABDECL(OP_CDP),		// OP_CDP
+/* 1110 0011 0011 */ TABDECL(OP_MRC),		// OP_MRC
+/* 1110 0011 0100 */ TABDECL(OP_CDP),		// OP_CDP
+/* 1110 0011 0101 */ TABDECL(OP_MRC),		// OP_MRC
+/* 1110 0011 0110 */ TABDECL(OP_CDP),		// OP_CDP
+/* 1110 0011 0111 */ TABDECL(OP_MRC),		// OP_MRC
+/* 1110 0011 1000 */ TABDECL(OP_CDP),		// OP_CDP
+/* 1110 0011 1001 */ TABDECL(OP_MRC),		// OP_MRC
+/* 1110 0011 1010 */ TABDECL(OP_CDP),		// OP_CDP
+/* 1110 0011 1011 */ TABDECL(OP_MRC),		// OP_MRC
+/* 1110 0011 1100 */ TABDECL(OP_CDP),		// OP_CDP
+/* 1110 0011 1101 */ TABDECL(OP_MRC),		// OP_MRC
+/* 1110 0011 1110 */ TABDECL(OP_CDP),		// OP_CDP
+/* 1110 0011 1111 */ TABDECL(OP_MRC),		// OP_MRC
+
+/* 1110 0100 0000 */ TABDECL(OP_CDP),		// OP_CDP
+/* 1110 0100 0001 */ TABDECL(OP_MCR),		// OP_MCR
+/* 1110 0100 0010 */ TABDECL(OP_CDP),		// OP_CDP
+/* 1110 0100 0011 */ TABDECL(OP_MCR),		// OP_MCR
+/* 1110 0100 0100 */ TABDECL(OP_CDP),		// OP_CDP
+/* 1110 0100 0101 */ TABDECL(OP_MCR),		// OP_MCR
+/* 1110 0100 0110 */ TABDECL(OP_CDP),		// OP_CDP
+/* 1110 0100 0111 */ TABDECL(OP_MCR),		// OP_MCR
+/* 1110 0100 1000 */ TABDECL(OP_CDP),		// OP_CDP
+/* 1110 0100 1001 */ TABDECL(OP_MCR),		// OP_MCR
+/* 1110 0100 1010 */ TABDECL(OP_CDP),		// OP_CDP
+/* 1110 0100 1011 */ TABDECL(OP_MCR),		// OP_MCR
+/* 1110 0100 1100 */ TABDECL(OP_CDP),		// OP_CDP
+/* 1110 0100 1101 */ TABDECL(OP_MCR),		// OP_MCR
+/* 1110 0100 1110 */ TABDECL(OP_CDP),		// OP_CDP
+/* 1110 0100 1111 */ TABDECL(OP_MCR),		// OP_MCR
+
+/* 1110 0101 0000 */ TABDECL(OP_CDP),		// OP_CDP
+/* 1110 0101 0001 */ TABDECL(OP_MRC),		// OP_MRC
+/* 1110 0101 0010 */ TABDECL(OP_CDP),		// OP_CDP
+/* 1110 0101 0011 */ TABDECL(OP_MRC),		// OP_MRC
+/* 1110 0101 0100 */ TABDECL(OP_CDP),		// OP_CDP
+/* 1110 0101 0101 */ TABDECL(OP_MRC),		// OP_MRC
+/* 1110 0101 0110 */ TABDECL(OP_CDP),		// OP_CDP
+/* 1110 0101 0111 */ TABDECL(OP_MRC),		// OP_MRC
+/* 1110 0101 1000 */ TABDECL(OP_CDP),		// OP_CDP
+/* 1110 0101 1001 */ TABDECL(OP_MRC),		// OP_MRC
+/* 1110 0101 1010 */ TABDECL(OP_CDP),		// OP_CDP
+/* 1110 0101 1011 */ TABDECL(OP_MRC),		// OP_MRC
+/* 1110 0101 1100 */ TABDECL(OP_CDP),		// OP_CDP
+/* 1110 0101 1101 */ TABDECL(OP_MRC),		// OP_MRC
+/* 1110 0101 1110 */ TABDECL(OP_CDP),		// OP_CDP
+/* 1110 0101 1111 */ TABDECL(OP_MRC),		// OP_MRC
+
+/* 1110 0110 0000 */ TABDECL(OP_CDP),		// OP_CDP
+/* 1110 0110 0001 */ TABDECL(OP_MCR),		// OP_MCR
+/* 1110 0110 0010 */ TABDECL(OP_CDP),		// OP_CDP
+/* 1110 0110 0011 */ TABDECL(OP_MCR),		// OP_MCR
+/* 1110 0110 0100 */ TABDECL(OP_CDP),		// OP_CDP
+/* 1110 0110 0101 */ TABDECL(OP_MCR),		// OP_MCR
+/* 1110 0110 0110 */ TABDECL(OP_CDP),		// OP_CDP
+/* 1110 0110 0111 */ TABDECL(OP_MCR),		// OP_MCR
+/* 1110 0110 1000 */ TABDECL(OP_CDP),		// OP_CDP
+/* 1110 0110 1001 */ TABDECL(OP_MCR),		// OP_MCR
+/* 1110 0110 1010 */ TABDECL(OP_CDP),		// OP_CDP
+/* 1110 0110 1011 */ TABDECL(OP_MCR),		// OP_MCR
+/* 1110 0110 1100 */ TABDECL(OP_CDP),		// OP_CDP
+/* 1110 0110 1101 */ TABDECL(OP_MCR),		// OP_MCR
+/* 1110 0110 1110 */ TABDECL(OP_CDP),		// OP_CDP
+/* 1110 0110 1111 */ TABDECL(OP_MCR),		// OP_MCR
+
+/* 1110 0111 0000 */ TABDECL(OP_CDP),		// OP_CDP
+/* 1110 0111 0001 */ TABDECL(OP_MRC),		// OP_MRC
+/* 1110 0111 0010 */ TABDECL(OP_CDP),		// OP_CDP
+/* 1110 0111 0011 */ TABDECL(OP_MRC),		// OP_MRC
+/* 1110 0111 0100 */ TABDECL(OP_CDP),		// OP_CDP
+/* 1110 0111 0101 */ TABDECL(OP_MRC),		// OP_MRC
+/* 1110 0111 0110 */ TABDECL(OP_CDP),		// OP_CDP
+/* 1110 0111 0111 */ TABDECL(OP_MRC),		// OP_MRC
+/* 1110 0111 1000 */ TABDECL(OP_CDP),		// OP_CDP
+/* 1110 0111 1001 */ TABDECL(OP_MRC),		// OP_MRC
+/* 1110 0111 1010 */ TABDECL(OP_CDP),		// OP_CDP
+/* 1110 0111 1011 */ TABDECL(OP_MRC),		// OP_MRC
+/* 1110 0111 1100 */ TABDECL(OP_CDP),		// OP_CDP
+/* 1110 0111 1101 */ TABDECL(OP_MRC),		// OP_MRC
+/* 1110 0111 1110 */ TABDECL(OP_CDP),		// OP_CDP
+/* 1110 0111 1111 */ TABDECL(OP_MRC),		// OP_MRC
+
+/* 1110 1000 0000 */ TABDECL(OP_CDP),		// OP_CDP
+/* 1110 1000 0001 */ TABDECL(OP_MCR),		// OP_MCR
+/* 1110 1000 0010 */ TABDECL(OP_CDP),		// OP_CDP
+/* 1110 1000 0011 */ TABDECL(OP_MCR),		// OP_MCR
+/* 1110 1000 0100 */ TABDECL(OP_CDP),		// OP_CDP
+/* 1110 1000 0101 */ TABDECL(OP_MCR),		// OP_MCR
+/* 1110 1000 0110 */ TABDECL(OP_CDP),		// OP_CDP
+/* 1110 1000 0111 */ TABDECL(OP_MCR),		// OP_MCR
+/* 1110 1000 1000 */ TABDECL(OP_CDP),		// OP_CDP
+/* 1110 1000 1001 */ TABDECL(OP_MCR),		// OP_MCR
+/* 1110 1000 1010 */ TABDECL(OP_CDP),		// OP_CDP
+/* 1110 1000 1011 */ TABDECL(OP_MCR),		// OP_MCR
+/* 1110 1000 1100 */ TABDECL(OP_CDP),		// OP_CDP
+/* 1110 1000 1101 */ TABDECL(OP_MCR),		// OP_MCR
+/* 1110 1000 1110 */ TABDECL(OP_CDP),		// OP_CDP
+/* 1110 1000 1111 */ TABDECL(OP_MCR),		// OP_MCR
+
+/* 1110 1001 0000 */ TABDECL(OP_CDP),		// OP_CDP
+/* 1110 1001 0001 */ TABDECL(OP_MRC),		// OP_MRC
+/* 1110 1001 0010 */ TABDECL(OP_CDP),		// OP_CDP
+/* 1110 1001 0011 */ TABDECL(OP_MRC),		// OP_MRC
+/* 1110 1001 0100 */ TABDECL(OP_CDP),		// OP_CDP
+/* 1110 1001 0101 */ TABDECL(OP_MRC),		// OP_MRC
+/* 1110 1001 0110 */ TABDECL(OP_CDP),		// OP_CDP
+/* 1110 1001 0111 */ TABDECL(OP_MRC),		// OP_MRC
+/* 1110 1001 1000 */ TABDECL(OP_CDP),		// OP_CDP
+/* 1110 1001 1001 */ TABDECL(OP_MRC),		// OP_MRC
+/* 1110 1001 1010 */ TABDECL(OP_CDP),		// OP_CDP
+/* 1110 1001 1011 */ TABDECL(OP_MRC),		// OP_MRC
+/* 1110 1001 1100 */ TABDECL(OP_CDP),		// OP_CDP
+/* 1110 1001 1101 */ TABDECL(OP_MRC),		// OP_MRC
+/* 1110 1001 1110 */ TABDECL(OP_CDP),		// OP_CDP
+/* 1110 1001 1111 */ TABDECL(OP_MRC),		// OP_MRC
+
+/* 1110 1010 0000 */ TABDECL(OP_CDP),		// OP_CDP
+/* 1110 1010 0001 */ TABDECL(OP_MCR),		// OP_MCR
+/* 1110 1010 0010 */ TABDECL(OP_CDP),		// OP_CDP
+/* 1110 1010 0011 */ TABDECL(OP_MCR),		// OP_MCR
+/* 1110 1010 0100 */ TABDECL(OP_CDP),		// OP_CDP
+/* 1110 1010 0101 */ TABDECL(OP_MCR),		// OP_MCR
+/* 1110 1010 0110 */ TABDECL(OP_CDP),		// OP_CDP
+/* 1110 1010 0111 */ TABDECL(OP_MCR),		// OP_MCR
+/* 1110 1010 1000 */ TABDECL(OP_CDP),		// OP_CDP
+/* 1110 1010 1001 */ TABDECL(OP_MCR),		// OP_MCR
+/* 1110 1010 1010 */ TABDECL(OP_CDP),		// OP_CDP
+/* 1110 1010 1011 */ TABDECL(OP_MCR),		// OP_MCR
+/* 1110 1010 1100 */ TABDECL(OP_CDP),		// OP_CDP
+/* 1110 1010 1101 */ TABDECL(OP_MCR),		// OP_MCR
+/* 1110 1010 1110 */ TABDECL(OP_CDP),		// OP_CDP
+/* 1110 1010 1111 */ TABDECL(OP_MCR),		// OP_MCR
+
+/* 1110 1011 0000 */ TABDECL(OP_CDP),		// OP_CDP
+/* 1110 1011 0001 */ TABDECL(OP_MRC),		// OP_MRC
+/* 1110 1011 0010 */ TABDECL(OP_CDP),		// OP_CDP
+/* 1110 1011 0011 */ TABDECL(OP_MRC),		// OP_MRC
+/* 1110 1011 0100 */ TABDECL(OP_CDP),		// OP_CDP
+/* 1110 1011 0101 */ TABDECL(OP_MRC),		// OP_MRC
+/* 1110 1011 0110 */ TABDECL(OP_CDP),		// OP_CDP
+/* 1110 1011 0111 */ TABDECL(OP_MRC),		// OP_MRC
+/* 1110 1011 1000 */ TABDECL(OP_CDP),		// OP_CDP
+/* 1110 1011 1001 */ TABDECL(OP_MRC),		// OP_MRC
+/* 1110 1011 1010 */ TABDECL(OP_CDP),		// OP_CDP
+/* 1110 1011 1011 */ TABDECL(OP_MRC),		// OP_MRC
+/* 1110 1011 1100 */ TABDECL(OP_CDP),		// OP_CDP
+/* 1110 1011 1101 */ TABDECL(OP_MRC),		// OP_MRC
+/* 1110 1011 1110 */ TABDECL(OP_CDP),		// OP_CDP
+/* 1110 1011 1111 */ TABDECL(OP_MRC),		// OP_MRC
+
+/* 1110 1100 0000 */ TABDECL(OP_CDP),		// OP_CDP
+/* 1110 1100 0001 */ TABDECL(OP_MCR),		// OP_MCR
+/* 1110 1100 0010 */ TABDECL(OP_CDP),		// OP_CDP
+/* 1110 1100 0011 */ TABDECL(OP_MCR),		// OP_MCR
+/* 1110 1100 0100 */ TABDECL(OP_CDP),		// OP_CDP
+/* 1110 1100 0101 */ TABDECL(OP_MCR),		// OP_MCR
+/* 1110 1100 0110 */ TABDECL(OP_CDP),		// OP_CDP
+/* 1110 1100 0111 */ TABDECL(OP_MCR),		// OP_MCR
+/* 1110 1100 1000 */ TABDECL(OP_CDP),		// OP_CDP
+/* 1110 1100 1001 */ TABDECL(OP_MCR),		// OP_MCR
+/* 1110 1100 1010 */ TABDECL(OP_CDP),		// OP_CDP
+/* 1110 1100 1011 */ TABDECL(OP_MCR),		// OP_MCR
+/* 1110 1100 1100 */ TABDECL(OP_CDP),		// OP_CDP
+/* 1110 1100 1101 */ TABDECL(OP_MCR),		// OP_MCR
+/* 1110 1100 1110 */ TABDECL(OP_CDP),		// OP_CDP
+/* 1110 1100 1111 */ TABDECL(OP_MCR),		// OP_MCR
+
+/* 1110 1101 0000 */ TABDECL(OP_CDP),		// OP_CDP
+/* 1110 1101 0001 */ TABDECL(OP_MRC),		// OP_MRC
+/* 1110 1101 0010 */ TABDECL(OP_CDP),		// OP_CDP
+/* 1110 1101 0011 */ TABDECL(OP_MRC),		// OP_MRC
+/* 1110 1101 0100 */ TABDECL(OP_CDP),		// OP_CDP
+/* 1110 1101 0101 */ TABDECL(OP_MRC),		// OP_MRC
+/* 1110 1101 0110 */ TABDECL(OP_CDP),		// OP_CDP
+/* 1110 1101 0111 */ TABDECL(OP_MRC),		// OP_MRC
+/* 1110 1101 1000 */ TABDECL(OP_CDP),		// OP_CDP
+/* 1110 1101 1001 */ TABDECL(OP_MRC),		// OP_MRC
+/* 1110 1101 1010 */ TABDECL(OP_CDP),		// OP_CDP
+/* 1110 1101 1011 */ TABDECL(OP_MRC),		// OP_MRC
+/* 1110 1101 1100 */ TABDECL(OP_CDP),		// OP_CDP
+/* 1110 1101 1101 */ TABDECL(OP_MRC),		// OP_MRC
+/* 1110 1101 1110 */ TABDECL(OP_CDP),		// OP_CDP
+/* 1110 1101 1111 */ TABDECL(OP_MRC),		// OP_MRC
+
+/* 1110 1110 0000 */ TABDECL(OP_CDP),		// OP_CDP
+/* 1110 1110 0001 */ TABDECL(OP_MCR),		// OP_MCR
+/* 1110 1110 0010 */ TABDECL(OP_CDP),		// OP_CDP
+/* 1110 1110 0011 */ TABDECL(OP_MCR),		// OP_MCR
+/* 1110 1110 0100 */ TABDECL(OP_CDP),		// OP_CDP
+/* 1110 1110 0101 */ TABDECL(OP_MCR),		// OP_MCR
+/* 1110 1110 0110 */ TABDECL(OP_CDP),		// OP_CDP
+/* 1110 1110 0111 */ TABDECL(OP_MCR),		// OP_MCR
+/* 1110 1110 1000 */ TABDECL(OP_CDP),		// OP_CDP
+/* 1110 1110 1001 */ TABDECL(OP_MCR),		// OP_MCR
+/* 1110 1110 1010 */ TABDECL(OP_CDP),		// OP_CDP
+/* 1110 1110 1011 */ TABDECL(OP_MCR),		// OP_MCR
+/* 1110 1110 1100 */ TABDECL(OP_CDP),		// OP_CDP
+/* 1110 1110 1101 */ TABDECL(OP_MCR),		// OP_MCR
+/* 1110 1110 1110 */ TABDECL(OP_CDP),		// OP_CDP
+/* 1110 1110 1111 */ TABDECL(OP_MCR),		// OP_MCR
+
+/* 1110 1111 0000 */ TABDECL(OP_CDP),		// OP_CDP
+/* 1110 1111 0001 */ TABDECL(OP_MRC),		// OP_MRC
+/* 1110 1111 0010 */ TABDECL(OP_CDP),		// OP_CDP
+/* 1110 1111 0011 */ TABDECL(OP_MRC),		// OP_MRC
+/* 1110 1111 0100 */ TABDECL(OP_CDP),		// OP_CDP
+/* 1110 1111 0101 */ TABDECL(OP_MRC),		// OP_MRC
+/* 1110 1111 0110 */ TABDECL(OP_CDP),		// OP_CDP
+/* 1110 1111 0111 */ TABDECL(OP_MRC),		// OP_MRC
+/* 1110 1111 1000 */ TABDECL(OP_CDP),		// OP_CDP
+/* 1110 1111 1001 */ TABDECL(OP_MRC),		// OP_MRC
+/* 1110 1111 1010 */ TABDECL(OP_CDP),		// OP_CDP
+/* 1110 1111 1011 */ TABDECL(OP_MRC),		// OP_MRC
+/* 1110 1111 1100 */ TABDECL(OP_CDP),		// OP_CDP
+/* 1110 1111 1101 */ TABDECL(OP_MRC),		// OP_MRC
+/* 1110 1111 1110 */ TABDECL(OP_CDP),		// OP_CDP
+/* 1110 1111 1111 */ TABDECL(OP_MRC),		// OP_MRC
+
+/* 1111 0000 0000 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 0000 0001 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 0000 0010 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 0000 0011 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 0000 0100 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 0000 0101 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 0000 0110 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 0000 0111 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 0000 1000 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 0000 1001 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 0000 1010 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 0000 1011 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 0000 1100 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 0000 1101 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 0000 1110 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 0000 1111 */ TABDECL(OP_SWI),		// OP_SWI
+
+/* 1111 0001 0000 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 0001 0001 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 0001 0010 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 0001 0011 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 0001 0100 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 0001 0101 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 0001 0110 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 0001 0111 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 0001 1000 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 0001 1001 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 0001 1010 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 0001 1011 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 0001 1100 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 0001 1101 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 0001 1110 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 0001 1111 */ TABDECL(OP_SWI),		// OP_SWI
+
+/* 1111 0010 0000 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 0010 0001 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 0010 0010 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 0010 0011 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 0010 0100 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 0010 0101 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 0010 0110 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 0010 0111 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 0010 1000 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 0010 1001 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 0010 1010 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 0010 1011 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 0010 1100 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 0010 1101 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 0010 1110 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 0010 1111 */ TABDECL(OP_SWI),		// OP_SWI
+
+/* 1111 0011 0000 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 0011 0001 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 0011 0010 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 0011 0011 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 0011 0100 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 0011 0101 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 0011 0110 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 0011 0111 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 0011 1000 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 0011 1001 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 0011 1010 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 0011 1011 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 0011 1100 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 0011 1101 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 0011 1110 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 0011 1111 */ TABDECL(OP_SWI),		// OP_SWI
+
+/* 1111 0100 0000 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 0100 0001 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 0100 0010 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 0100 0011 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 0100 0100 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 0100 0101 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 0100 0110 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 0100 0111 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 0100 1000 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 0100 1001 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 0100 1010 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 0100 1011 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 0100 1100 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 0100 1101 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 0100 1110 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 0100 1111 */ TABDECL(OP_SWI),		// OP_SWI
+
+/* 1111 0101 0000 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 0101 0001 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 0101 0010 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 0101 0011 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 0101 0100 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 0101 0101 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 0101 0110 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 0101 0111 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 0101 1000 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 0101 1001 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 0101 1010 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 0101 1011 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 0101 1100 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 0101 1101 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 0101 1110 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 0101 1111 */ TABDECL(OP_SWI),		// OP_SWI
+
+/* 1111 0110 0000 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 0110 0001 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 0110 0010 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 0110 0011 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 0110 0100 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 0110 0101 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 0110 0110 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 0110 0111 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 0110 1000 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 0110 1001 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 0110 1010 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 0110 1011 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 0110 1100 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 0110 1101 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 0110 1110 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 0110 1111 */ TABDECL(OP_SWI),		// OP_SWI
+
+/* 1111 0111 0000 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 0111 0001 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 0111 0010 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 0111 0011 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 0111 0100 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 0111 0101 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 0111 0110 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 0111 0111 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 0111 1000 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 0111 1001 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 0111 1010 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 0111 1011 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 0111 1100 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 0111 1101 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 0111 1110 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 0111 1111 */ TABDECL(OP_SWI),		// OP_SWI
+
+/* 1111 1000 0000 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 1000 0001 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 1000 0010 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 1000 0011 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 1000 0100 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 1000 0101 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 1000 0110 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 1000 0111 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 1000 1000 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 1000 1001 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 1000 1010 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 1000 1011 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 1000 1100 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 1000 1101 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 1000 1110 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 1000 1111 */ TABDECL(OP_SWI),		// OP_SWI
+
+/* 1111 1001 0000 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 1001 0001 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 1001 0010 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 1001 0011 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 1001 0100 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 1001 0101 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 1001 0110 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 1001 0111 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 1001 1000 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 1001 1001 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 1001 1010 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 1001 1011 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 1001 1100 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 1001 1101 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 1001 1110 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 1001 1111 */ TABDECL(OP_SWI),		// OP_SWI
+
+/* 1111 1010 0000 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 1010 0001 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 1010 0010 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 1010 0011 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 1010 0100 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 1010 0101 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 1010 0110 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 1010 0111 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 1010 1000 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 1010 1001 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 1010 1010 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 1010 1011 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 1010 1100 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 1010 1101 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 1010 1110 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 1010 1111 */ TABDECL(OP_SWI),		// OP_SWI
+
+/* 1111 1011 0000 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 1011 0001 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 1011 0010 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 1011 0011 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 1011 0100 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 1011 0101 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 1011 0110 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 1011 0111 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 1011 1000 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 1011 1001 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 1011 1010 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 1011 1011 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 1011 1100 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 1011 1101 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 1011 1110 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 1011 1111 */ TABDECL(OP_SWI),		// OP_SWI
+
+/* 1111 1100 0000 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 1100 0001 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 1100 0010 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 1100 0011 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 1100 0100 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 1100 0101 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 1100 0110 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 1100 0111 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 1100 1000 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 1100 1001 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 1100 1010 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 1100 1011 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 1100 1100 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 1100 1101 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 1100 1110 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 1100 1111 */ TABDECL(OP_SWI),		// OP_SWI
+
+/* 1111 1101 0000 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 1101 0001 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 1101 0010 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 1101 0011 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 1101 0100 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 1101 0101 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 1101 0110 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 1101 0111 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 1101 1000 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 1101 1001 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 1101 1010 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 1101 1011 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 1101 1100 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 1101 1101 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 1101 1110 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 1101 1111 */ TABDECL(OP_SWI),		// OP_SWI
+
+/* 1111 1110 0000 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 1110 0001 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 1110 0010 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 1110 0011 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 1110 0100 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 1110 0101 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 1110 0110 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 1110 0111 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 1110 1000 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 1110 1001 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 1110 1010 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 1110 1011 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 1110 1100 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 1110 1101 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 1110 1110 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 1110 1111 */ TABDECL(OP_SWI),		// OP_SWI
+
+/* 1111 1111 0000 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 1111 0001 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 1111 0010 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 1111 0011 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 1111 0100 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 1111 0101 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 1111 0110 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 1111 0111 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 1111 1000 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 1111 1001 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 1111 1010 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 1111 1011 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 1111 1100 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 1111 1101 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 1111 1110 */ TABDECL(OP_SWI),		// OP_SWI
+/* 1111 1111 1111 */ TABDECL(OP_SWI),		// OP_SWI

audacious-plugins-4.4.1.tar.bz2/src/xsf/desmume/instructions.h Added

audacious-plugins-3.6.2-gtk3.tar.bz2/src/xsf/desmume/matrix.h -> audacious-plugins-4.4.1.tar.bz2/src/xsf/desmume/matrix.h Changed

@@ -1,51 +1,63 @@
-/* 
+/*
 	Copyright (C) 2006-2007 shash
+	Copyright (C) 2007-2012 DeSmuME team
 
- This file is part of DeSmuME
+	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
+	(at your option) any later version.
 
- DeSmuME 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 file 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.
 
- DeSmuME 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 DeSmuME; 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 the this software. If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef MATRIX_H
-#define MATRIX_H
+#pragma once
+
+#include <cmath>
+#include <cstring>
+#include "types.h"
+#include "mem.h"
 
-typedef struct MatrixStack
+#ifdef __SSE2__
+#include <emmintrin.h>
+#endif
+
+// these functions are an unreliable, inaccurate floor.
+// it should only be used for positive numbers
+// this isnt as fast as it could be if we used a visual c++ intrinsic, but those appear not to be universally available
+inline uint32_t u32floor(float f)
 {
-	float	*matrix;
-	int		position;
-	int		size;
-} MatrixStack;
-
-void	MatrixInit				(float *matrix);
-void	MatrixMultVec3x3		(float *matrix, float *vecPtr);
-void	MatrixMultVec4x4		(float *matrix, float *vecPtr);
-void	MatrixIdentity			(float *matrix);
-void	MatrixMultiply			(float *matrix, float *rightMatrix);
-float	MatrixGetMultipliedIndex(int index, float *matrix, float *rightMatrix);
-void	MatrixSet				(float *matrix, int x, int y, float value);
-void	MatrixCopy				(float *matrixDST, float *matrixSRC);
-void	MatrixTranslate			(float *matrix, float *ptr);
-void	MatrixScale				(float *matrix, float *ptr);
-
-void	MatrixStackInit				(MatrixStack *stack);
-void	MatrixStackSetMaxSize		(MatrixStack *stack, int size);
-void	MatrixStackSetStackPosition (MatrixStack *stack, int pos);
-void	MatrixStackPushMatrix		(MatrixStack *stack, float *ptr);
-float*	MatrixStackPopMatrix		(MatrixStack *stack, int size);
-float*	MatrixStackGetPos			(MatrixStack *stack, int pos);
-float*	MatrixStackGet				(MatrixStack *stack);
-void	MatrixStackLoadMatrix		(MatrixStack *stack, int pos, float *ptr);
+#ifdef __SSE2__
+	return static_cast<uint32_t>(_mm_cvtt_ss2si(_mm_set_ss(f)));
+#else
+	return static_cast<uint32_t>(f);
+#endif
+}
+inline uint32_t u32floor(double d)
+{
+#ifdef __SSE2__
+	return static_cast<uint32_t>(_mm_cvttsd_si32(_mm_set_sd(d)));
+#else
+	return static_cast<uint32_t>(d);
+#endif
+}
 
+// same as above but works for negative values too.
+// be sure that the results are the same thing as floorf!
+inline int32_t s32floor(float f)
+{
+#ifdef __SSE2__
+	return _mm_cvtss_si32(_mm_add_ss(_mm_set_ss(-0.5f),_mm_add_ss(_mm_set_ss(f), _mm_set_ss(f)))) >> 1;
+#else
+	return static_cast<int32_t>(floorf(f));
 #endif
+}
+inline int32_t s32floor(double d)
+{
+	return s32floor(static_cast<float>(d));
+}

audacious-plugins-3.6.2-gtk3.tar.bz2/src/xsf/desmume/mc.cc -> audacious-plugins-4.4.1.tar.bz2/src/xsf/desmume/mc.cc Changed

@@ -1,121 +1,634 @@
-/* Copyright (C) 2006 thoduv
- Copyright (C) 2006-2007 Theo Berkau
+/*
+	Copyright (C) 2006 thoduv
+	Copyright (C) 2006-2007 Theo Berkau
+	Copyright (C) 2008-2013 DeSmuME team
 
- This file is part of DeSmuME
+	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
+	(at your option) any later version.
 
- DeSmuME 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 file 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.
 
- DeSmuME 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 DeSmuME; 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 the this software. If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <stdlib.h>
-#include "debug.h"
+#include <cstdlib>
+#include <cstring>
 #include "types.h"
 #include "mc.h"
+#include "readwrite.h"
+#include "NDSSystem.h"
+
+static const uint8_t FW_CMD_READ = 0x03;
+static const uint8_t FW_CMD_WRITEDISABLE = 0x04;
+static const uint8_t FW_CMD_READSTATUS = 0x05;
+static const uint8_t FW_CMD_WRITEENABLE = 0x06;
+static const uint8_t FW_CMD_PAGEWRITE = 0x0A;
+static const uint8_t FW_CMD_READ_ID = 0x9F;
+
+// since r2203 this was 0x00.
+// but baby pals proves finally that it should be 0xFF:
+// the game reads its initial sound volumes from uninitialized data, and if it is 0, the game will be silent
+// if it is 0xFF then the game starts with its sound and music at max, as presumably it is supposed to.
+// so in r3303 I finally changed it (no$ appears definitely to initialized to 0xFF)
+static const uint8_t kUninitializedSaveDataValue = 0xFF;
 
-#define FW_CMD_READ 0x3
-#define FW_CMD_WRITEDISABLE 0x4
-#define FW_CMD_READSTATUS 0x5
-#define FW_CMD_WRITEENABLE 0x6
-#define FW_CMD_PAGEWRITE 0xA
-
-#define BM_CMD_AUTODETECT 0xFF
-#define BM_CMD_WRITESTATUS 0x1
-#define BM_CMD_WRITELOW 0x2
-#define BM_CMD_READLOW 0x3
-#define BM_CMD_WRITEDISABLE 0x4
-#define BM_CMD_READSTATUS 0x5
-#define BM_CMD_WRITEENABLE 0x6
-#define BM_CMD_WRITEHIGH 0xA
-#define BM_CMD_READHIGH 0xB
-
-/* FLASH*/
-#define COMM_PAGE_WRITE		0x0A
-#define COMM_PAGE_ERASE		0xDB
-#define COMM_SECTOR_ERASE	0xD8
-#define COMM_CHIP_ERASE		0xC7
-#define CARDFLASH_READ_BYTES_FAST	0x0B /* Not used*/
-#define CARDFLASH_DEEP_POWDOWN		0xB9 /* Not used*/
-#define CARDFLASH_WAKEUP			0xAB /* Not used*/
+static const char *kDesmumeSaveCookie = "|-DESMUME SAVE-|";
 
+//the lookup table from user save types to save parameters
+const SAVE_TYPE save_types =
+{
+	{"Autodetect", MC_TYPE_AUTODETECT, 1},
+	{"EEPROM 4kbit", MC_TYPE_EEPROM1, MC_SIZE_4KBITS},
+	{"EEPROM 64kbit", MC_TYPE_EEPROM2, MC_SIZE_64KBITS},
+	{"EEPROM 512kbit", MC_TYPE_EEPROM2, MC_SIZE_512KBITS},
+	{"FRAM 256kbit", MC_TYPE_FRAM, MC_SIZE_256KBITS},
+	{"FLASH 2Mbit", MC_TYPE_FLASH, MC_SIZE_2MBITS},
+	{"FLASH 4Mbit", MC_TYPE_FLASH, MC_SIZE_4MBITS},
+	{"FLASH 8Mbit", MC_TYPE_FLASH, MC_SIZE_8MBITS},
+	{"FLASH 16Mbit", MC_TYPE_FLASH, MC_SIZE_16MBITS},
+	{"FLASH 32Mbit", MC_TYPE_FLASH, MC_SIZE_32MBITS},
+	{"FLASH 64Mbit", MC_TYPE_FLASH, MC_SIZE_64MBITS},
+	{"FLASH 128Mbit", MC_TYPE_FLASH, MC_SIZE_128MBITS},
+	{"FLASH 256Mbit", MC_TYPE_FLASH, MC_SIZE_256MBITS},
+	{"FLASH 512Mbit", MC_TYPE_FLASH, MC_SIZE_512MBITS}
+};
 void mc_init(memory_chip_t *mc, int type)
 {
- mc->com = 0;
- mc->addr = 0;
- mc->addr_shift = 0;
- mc->data = nullptr;
- mc->size = 0;
- mc->write_enable = false;
- mc->writeable_buffer = false;
- mc->type = type;
- mc->autodetectsize = 0;
-
- switch(mc->type)
- {
- case MC_TYPE_EEPROM1:
- mc->addr_size = 1;
- break;
- case MC_TYPE_EEPROM2:
- case MC_TYPE_FRAM:
- mc->addr_size = 2;
- break;
- case MC_TYPE_FLASH:
- mc->addr_size = 3;
- break;
- default: break;
- }
-}
-
-u8 *mc_alloc(memory_chip_t *mc, u32 size)
-{
-	u8 *buffer;
-	buffer = (u8 *) malloc(size);
-
-	mc->data = buffer;
-	if(!buffer) { return nullptr; }
+	mc->com = 0;
+	mc->addr = 0;
+	mc->addr_shift = 0;
+	mc->data.clear();
+	mc->size = 0;
+	mc->write_enable = false;
+	mc->writeable_buffer = false;
+	mc->type = type;
+	mc->autodetectsize = 0;
+
+	switch (mc->type)
+	{
+		case MC_TYPE_EEPROM1:
+			mc->addr_size = 1;
+			break;
+		case MC_TYPE_EEPROM2:
+		case MC_TYPE_FRAM:
+			mc->addr_size = 2;
+			break;
+		case MC_TYPE_FLASH:
+			mc->addr_size = 3;
+	}
+}
+
+uint8_t *mc_alloc(memory_chip_t *mc, uint32_t size)
+{
+	mc->data.clear();
+	mc->data.resize(size, 0);
 	mc->size = size;
 	mc->writeable_buffer = true;
 
-	return buffer;
+	return nullptr;
 }
 
 void mc_free(memory_chip_t *mc)
 {
-	if(mc->data)
+	mc->data.clear();
+	mc_init(mc, 0);
+}
+
+void fw_reset_com(memory_chip_t *mc)
+{
+	if (mc->com == FW_CMD_PAGEWRITE)
 	{
-		free(mc->data);
-		mc->data = 0;
+		if (mc->fp)
+		{
+			fseek(mc->fp, 0, SEEK_SET);
+			fwrite(&mc->data0, mc->size, 1, mc->fp);
+		}
+
+		if (mc->isFirmware&&CommonSettings.UseExtFirmware)
+		{
+			// copy User Settings 1 to User Settings 0 area
+			memcpy(&mc->data0x3FE00, &mc->data0x3FF00, 0x100);
+
+			fprintf(stderr, "Firmware: save config");
+			FILE *fp = fopen(mc->userfile, "wb");
+			if (fp)
+			{
+				if (fwrite(&mc->data0x3FF00, 1, 0x100, fp) == 0x100) // User Settings
+				{
+					if (fwrite(&mc->data0x0002A, 1, 0x1D6, fp) == 0x1D6) // WiFi Settings
+					{
+						if (fwrite(&mc->data0x3FA00, 1, 0x300, fp) == 0x300) // WiFi AP Settings
+							fprintf(stderr, " - done\n");
+						else
+							fprintf(stderr, " - failed\n");
+					}
+				}
+				fclose(fp);
+			}
+			else
+				fprintf(stderr, " - failed\n");
+		}
+
+		mc->write_enable = false;
 	}
-	mc_init(mc, 0);
+
+	mc->com = 0;
 }
 
-void mc_realloc(memory_chip_t *mc, int type, u32 size)
+uint8_t fw_transfer(memory_chip_t *mc, uint8_t data)
 {
-	mc_free(mc);
-	mc_init(mc, type);
-	mc_alloc(mc, size);
+	if (mc->com == FW_CMD_READ || mc->com == FW_CMD_PAGEWRITE) /* check if we are in a command that needs 3 bytes address */
+	{
+		if (mc->addr_shift > 0) /* if we got a complete address */
+		{
+			--mc->addr_shift;
+			mc->addr |= data << (mc->addr_shift * 8); /* argument is a byte of address */
+		}
+		else /* if we have received 3 bytes of address, proceed command */
+		{
+			switch (mc->com)
+			{
+				case FW_CMD_READ:
+					if (mc->addr < mc->size) /* check if we can read */
+					{
+						data = mc->datamc->addr; /* return byte */
+						++mc->addr; /* then increment address */
+					}
+					break;
+				case FW_CMD_PAGEWRITE:
+					if (mc->addr < mc->size)
+					{
+						mc->datamc->addr = data; /* write byte */
+						++mc->addr;
+					}
+			}
+		}
+	}
+	else if (mc->com == FW_CMD_READ_ID)
+	{
+		switch (mc->addr)
+		{
+			// here is an ID string measured from an old ds fat: 62 16 00 (0x62=sanyo)
+			// but we chose to use an ST from martin's ds fat string so programs might have a clue as to the firmware size:
+			// 20 40 12
+			case 0:
+				data = 0x20;
+				mc->addr = 1;
+				break;
+			case 1:
+				data = 0x40; // according to gbatek this is the device ID for the flash on someone's ds fat
+				mc->addr = 2;
+				break;
+			case 2:
+				data = 0x12;
+				mc->addr = 0;
+		}
+	}
+	else if (mc->com == FW_CMD_READSTATUS)
+		return mc->write_enable ? 0x02 : 0x00;
+	else // finally, check if it's a new command
+	{
+		switch (data)
+		{
+			case 0:
+				break; // nothing
+
+			case FW_CMD_READ_ID:
+				mc->addr = 0;
+				mc->com = FW_CMD_READ_ID;
+				break;
+
+			case FW_CMD_READ: //read command
+				mc->addr = 0;
+				mc->addr_shift = 3;
+				mc->com = FW_CMD_READ;
+				break;
+
+			case FW_CMD_WRITEENABLE: //enable writing
+				if (mc->writeable_buffer)
+					mc->write_enable = true;
+				break;
+
+			case FW_CMD_WRITEDISABLE: //disable writing
+				mc->write_enable = false;
+				break;
+
+			case FW_CMD_PAGEWRITE: //write command
+				if (mc->write_enable)
+				{
+					mc->addr = 0;
+					mc->addr_shift = 3;
+					mc->com = FW_CMD_PAGEWRITE;
+				}
+				else
+					data = 0;
+				break;
+
+			case FW_CMD_READSTATUS: //status register command
+				mc->com = FW_CMD_READSTATUS;
+				break;
+
+			default:
+				fprintf(stderr, "Unhandled FW command: %02X\n", data);
+		}
+	}
+
+	return data;
 }
 
+BackupDevice::BackupDevice()
+{
+	this->reset();
+}
+
+// due to unfortunate shortcomings in the emulator architecture,
+// at reset-time, we won't have a filename to the .dsv file.
+// so the only difference between load_rom (init) and reset is that
+// one of them saves the filename
+void BackupDevice::load_rom(const std::string &fn)
+{
+	this->filename = fn;
+	this->reset();
+}
+
+void BackupDevice::reset_hardware()
+{
+	this->write_enable = false;
+	this->com = 0;
+	this->addr = this->addr_counter = 0;
+	this->motionInitState = MOTION_INIT_STATE_IDLE;
+	this->motionFlag = MOTION_FLAG_NONE;
+	this->state = DETECTING;
+	this->flushPending = false;
+	this->lazyFlushPending = false;
+}
+
+void BackupDevice::reset()
+{
+	memset(&this->info, 0, sizeof(this->info));
+	this->reset_hardware();
+	this->resize(0);
+	this->data_autodetect.resize(0);
+	this->addr_size = 0;
+	this->loadfile();
+
+	// if the user has requested a manual choice for backup type, and we havent imported a raw save file, then apply it now
+	if (this->state == DETECTING && CommonSettings.manualBackupType != MC_TYPE_AUTODETECT)
+	{
+		this->state = RUNNING;
+		int savetype = save_typesCommonSettings.manualBackupType.media_type;
+		int savesize = save_typesCommonSettings.manualBackupType.size;
+		this->ensure(savesize); // expand properly if necessary
+		this->resize(savesize); // truncate if necessary
+		this->addr_size = this->addr_size_for_old_save_type(savetype);
+	}
+}
+
+// guarantees that the data buffer has room enough for the specified number of bytes
+void BackupDevice::ensure(uint32_t Addr)
+{
+	uint32_t size = this->data.size();
+	if (size < Addr)
+		this->resize(Addr);
+}
+
+void BackupDevice::resize(uint32_t size)
+{
+	size_t old_size = this->data.size();
+	this->data.resize(size);
+	for (uint32_t i = old_size; i < size; ++i)
+		this->datai = kUninitializedSaveDataValue;
+}
 
-void mc_reset_com(memory_chip_t *mc)
+uint32_t BackupDevice::addr_size_for_old_save_size(int bupmem_size)
 {
+	switch (bupmem_size)
+	{
+		case MC_SIZE_4KBITS:
+			return 1;
+		case MC_SIZE_64KBITS:
+		case MC_SIZE_256KBITS:
+		case MC_SIZE_512KBITS:
+			return 2;
+		case MC_SIZE_1MBITS:
+		case MC_SIZE_2MBITS:
+		case MC_SIZE_4MBITS:
+		case MC_SIZE_8MBITS:
+		case MC_SIZE_16MBITS:
+		case MC_SIZE_64MBITS:
+			return 3;
+		default:
+			return 0xFFFFFFFF;
+	}
 }
-u8 fw_transfer(memory_chip_t *mc, u8 data)
+
+uint32_t BackupDevice::addr_size_for_old_save_type(int bupmem_type)
 {
-	return 0;
+	switch (bupmem_type)
+	{
+		case MC_TYPE_EEPROM1:
+			return 1;
+		case MC_TYPE_EEPROM2:
+		case MC_TYPE_FRAM:
+			return 2;
+		case MC_TYPE_FLASH:
+			return 3;
+		default:
+			return 0xFFFFFFFF;
+	}
 }
-u8 bm_transfer(memory_chip_t *mc, u8 data)
+
+void BackupDevice::load_old_state(uint32_t addrSize, uint8_t *Data, uint32_t datasize)
 {
-	return 0;
+	this->state = RUNNING;
+	this->addr_size = addrSize;
+	this->resize(datasize);
+	memcpy(&this->data0, Data, datasize);
 }
 
+// ======================================================================= no$GBA
+// =======================================================================
+// =======================================================================
+
+static int no_gba_unpackSAV(const uint8_t *in_buf, uint32_t fsize, uint8_t *out_buf, uint32_t &size)
+{
+	const char no_GBA_HEADER_ID = "NocashGbaBackupMediaSavDataFile";
+	const char no_GBA_HEADER_SRAM_ID = "SRAM";
+	const uint8_t *src = in_buf;
+	uint8_t *dst = out_buf;
+	uint32_t src_pos = 0;
+	uint32_t dst_pos = 0;
+	uint32_t size_unpacked = 0;
+	uint32_t compressMethod = 0;
+
+	if (fsize < 0x50)
+		return 1;
+
+	for (int i = 0; i < 0x1F; ++i)
+		if (srci != no_GBA_HEADER_IDi)
+			return 2;
+	if (src0x1F != 0x1A)
+		return 2;
+	for (int i = 0; i < 0x4; ++i)
+		if (srci + 0x40 != no_GBA_HEADER_SRAM_IDi)
+			return 2;
+
+	compressMethod = *(reinterpret_cast<const uint32_t *>(src + 0x44));
+
+	if (!compressMethod) // unpacked
+	{
+		size_unpacked = *(reinterpret_cast<const uint32_t *>(src + 0x48));
+		src_pos = 0x4C;
+		for (uint32_t i = 0; i < size_unpacked; ++i)
+			dstdst_pos++ = srcsrc_pos++;
+		size = dst_pos;
+		return 0;
+	}
+
+	if (compressMethod == 1) // packed (method 1)
+	{
+		size_unpacked = *(reinterpret_cast<const uint32_t *>(src + 0x4C));
+
+		src_pos = 0x50;
+		while (true)
+		{
+			uint8_t cc = srcsrc_pos++;
+
+			if (!cc)
+			{
+				size = dst_pos;
+				return 0;
+			}
+
+			if (cc == 0x80)
+			{
+				uint16_t tsize = *(reinterpret_cast<const uint16_t *>(src + src_pos + 1));
+				for (int t = 0; t < tsize; ++t)
+					dstdst_pos++ = srcsrc_pos;
+				src_pos += 3;
+				continue;
+			}
+
+			if (cc > 0x80) // repeat
+			{
+				cc -= 0x80;
+				for (int t = 0; t < cc; ++t)
+					dstdst_pos++ = srcsrc_pos;
+				++src_pos;
+				continue;
+			}
+			// copy
+			for (int t = 0; t < cc; ++t)
+				dstdst_pos++ = srcsrc_pos++;
+		}
+	}
+	return 200;
+}
+
+static uint32_t no_gba_savTrim(uint8_t *buf, uint32_t size)
+{
+	uint32_t rows = size / 16;
+	uint32_t pos = (size - 16);
+	uint8_t *src = buf;
+
+	for (unsigned i = 0; i < rows; ++i, pos -= 16)
+	{
+		if (srcpos == 0xFF)
+		{
+			for (int t = 0; t < 16; ++t)
+				if (srcpos + t != 0xFF)
+					return pos + 16;
+		}
+		else
+			return pos + 16;
+	}
+	return size;
+}
+
+static uint32_t no_gba_fillLeft(uint32_t size)
+{
+	for (uint32_t i = 1; i < ARRAY_SIZE(save_types); ++i)
+		if (size <= static_cast<uint32_t>(save_typesi.size))
+			return size + (save_typesi.size - size);
+	return size;
+}
+
+bool BackupDevice::load_no_gba(const char *fname)
+{
+	FILE *fsrc = fopen(fname, "rb");
+
+	if (fsrc)
+	{
+		fseek(fsrc, 0, SEEK_END);
+		uint32_t fsize = ftell(fsrc);
+		fseek(fsrc, 0, SEEK_SET);
+		//fprintf(stderr, "Open %s file (size %i bytes)\n", fname, fsize);
+
+		auto in_buf = std::unique_ptr<uint8_t>(new uint8_tfsize);
+
+		if (fread(&in_buf0, 1, fsize, fsrc) == fsize)
+		{
+			auto out_buf = std::unique_ptr<uint8_t>(new uint8_t8 * 1024 * 1024 / 8);
+
+			memset(&out_buf0, 0xFF, 8 * 1024 * 1024 / 8);
+			uint32_t size = 0;
+			if (!no_gba_unpackSAV(&in_buf0, fsize, &out_buf0, size))
+			{
+				//fprintf(stderr, "New size %i byte(s)\n", size);
+				size = no_gba_savTrim(&out_buf0, size);
+				//fprintf(stderr, "--- new size after trim %i byte(s)\n", size);
+				size = no_gba_fillLeft(size);
+				//fprintf(stderr, "--- new size after fill %i byte(s)\n", size);
+				raw_applyUserSettings(size);
+				this->data.resize(size);
+				for (uint32_t tt = 0; tt < size; ++tt)
+					this->datatt = out_buftt;
+
+				//dump back out as a dsv, just to keep things sane
+				fprintf(stderr, "---- Loaded no$GBA save\n");
+
+				fclose(fsrc);
+				return true;
+			}
+		}
+		fclose(fsrc);
+	}
+
+	return false;
+}
+
+// ======================================================================= end
+// =======================================================================
+// ======================================================================= no$GBA
+
+void BackupDevice::loadfile()
+{
+	if (this->filename.empty())
+		return; // No sense crashing if no filename supplied
+
+	auto inf = std::unique_ptr<EMUFILE_FILE>(new EMUFILE_FILE(filename.c_str(), "rb"));
+	if (inf->fail())
+	{
+		// no dsv found; we need to try auto-importing a file with .sav extension
+		fprintf(stderr, "DeSmuME .dsv save file not found. Trying to load an old raw .sav file.\n");
+
+		// change extension to sav
+		char tmpMAX_PATH;
+		strcpy(tmp, this->filename.c_str());
+		tmpstrlen(tmp) - 3 = 0;
+		strcat(tmp, "sav");
+
+		inf.reset(new EMUFILE_FILE(tmp, "rb"));
+		if (inf->fail())
+		{
+			fprintf(stderr, "Missing save file %s\n", this->filename.c_str());
+			return;
+		}
+
+		if (!this->load_no_gba(tmp))
+			this->load_raw(tmp);
+	}
+	else
+	{
+		// scan for desmume save footer
+		int32_t cookieLen = strlen(kDesmumeSaveCookie);
+		auto sigbuf = std::unique_ptr<char>(new charcookieLen);
+		inf->fseek(-cookieLen, SEEK_END);
+		inf->fread(&sigbuf0, cookieLen);
+		int cmp = memcmp(&sigbuf0, kDesmumeSaveCookie,cookieLen);
+		if (cmp)
+		{
+			// maybe it is a misnamed raw save file. try loading it that way
+			fprintf(stderr, "Not a DeSmuME .dsv save file. Trying to load as raw.\n");
+			if (!this->load_no_gba(this->filename.c_str()))
+				this->load_raw(this->filename.c_str());
+			return;
+		}
+		// desmume format
+		inf->fseek(-cookieLen, SEEK_END);
+		inf->fseek(-4, SEEK_CUR);
+		uint32_t version = 0xFFFFFFFF;
+		read32le(&version, inf.get());
+		if (version)
+		{
+			fprintf(stderr, "Unknown save file format\n");
+			return;
+		}
+		inf->fseek(-24, SEEK_CUR);
+		read32le(&this->info.size, inf.get());
+		read32le(&this->info.padSize, inf.get());
+		read32le(&this->info.type, inf.get());
+		read32le(&this->info.addr_size, inf.get());
+		read32le(&this->info.mem_size, inf.get());
+
+		// establish the save data
+		this->resize(this->info.size);
+		inf->fseek(0, SEEK_SET);
+		if (this->info.size > 0)
+			inf->fread(&this->data0, this->info.size); // read all the raw data we have
+		this->state = RUNNING;
+		this->addr_size = this->info.addr_size;
+		// none of the other fields are used right now
+	}
+}
+
+void BackupDevice::raw_applyUserSettings(uint32_t &size, bool manual)
+{
+	// respect the user's choice of backup memory type
+	if (CommonSettings.manualBackupType == MC_TYPE_AUTODETECT && !manual)
+	{
+		this->addr_size = this->addr_size_for_old_save_size(size);
+		this->resize(size);
+	}
+	else
+	{
+		uint32_t type = CommonSettings.manualBackupType;
+		int savetype = save_typestype.media_type;
+		int savesize = save_typestype.size;
+		this->addr_size = this->addr_size_for_old_save_type(savetype);
+		if (static_cast<uint32_t>(savesize) < size)
+			size = savesize;
+		this->resize(savesize);
+	}
+
+	this->state = RUNNING;
+}
+
+bool BackupDevice::load_raw(const char *fn, uint32_t force_size)
+{
+	FILE *inf = fopen(fn,"rb");
+
+	if (!inf)
+		return false;
+
+	fseek(inf, 0, SEEK_END);
+	uint32_t size = ftell(inf);
+	uint32_t left = 0;
+
+	if (force_size > 0)
+	{
+		if (size > force_size)
+			size = force_size;
+		else if (size < force_size)
+		{
+			left = force_size - size;
+			size = force_size;
+		}
+	}
+
+	fseek(inf, 0, SEEK_SET);
+
+	this->raw_applyUserSettings(size, force_size > 0);
+
+	int bytesRead = fread(&this->data0, 1, size - left, inf);
+ (void)bytesRead;
+	fclose(inf);
+
+	return true;
+}

audacious-plugins-3.6.2-gtk3.tar.bz2/src/xsf/desmume/mc.h -> audacious-plugins-4.4.1.tar.bz2/src/xsf/desmume/mc.h Changed

@@ -1,29 +1,32 @@
-/* Copyright (C) 2006 thoduv
- Copyright (C) 2006 Theo Berkau
+/*
+	Copyright (C) 2006 thoduv
+	Copyright (C) 2006 Theo Berkau
+	Copyright (C) 2008-2013 DeSmuME team
 
- This file is part of DeSmuME
+	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
+	(at your option) any later version.
 
- DeSmuME 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 file 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.
 
- DeSmuME 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 DeSmuME; 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 the this software. If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef __FW_H__
-#define __FW_H__
+#pragma once
 
-#include <stdio.h>
+#include <vector>
+#include <string>
+#include <cstdio>
 #include "types.h"
+#include "emufile.h"
+//#include "windowsh_wrapper.h"
 
+#define MAX_SAVE_TYPES 13
 #define MC_TYPE_AUTODETECT 0x0
 #define MC_TYPE_EEPROM1 0x1
 #define MC_TYPE_EEPROM2 0x2
@@ -39,39 +42,122 @@
 #define MC_SIZE_4MBITS 0x080000
 #define MC_SIZE_8MBITS 0x100000
 #define MC_SIZE_16MBITS 0x200000
+#define MC_SIZE_32MBITS 0x400000
 #define MC_SIZE_64MBITS 0x800000
+#define MC_SIZE_128MBITS 0x1000000
+#define MC_SIZE_256MBITS 0x2000000
+#define MC_SIZE_512MBITS 0x4000000
+
+struct memory_chip_t
+{
+	uint8_t com; // persistent command actually handled
+	uint32_t addr; // current address for reading/writing
+	uint8_t addr_shift; // shift for address (since addresses are transfered by 3 bytes units)
+	uint8_t addr_size; // size of addr when writing/reading
+
+	bool write_enable; //is write enabled ?
+
+	std::vector<uint8_t> data; //memory data
+	uint32_t size; // memory size
+	bool writeable_buffer; // is "data" writeable ?
+	int type; //type of Memory
+	char *filename;
+	FILE *fp;
+	uint8_t autodetectbuf32768;
+	int autodetectsize;
+
+	// needs only for firmware
+	bool isFirmware;
+	char userfileMAX_PATH;
+};
 
-typedef struct
+// the new backup system by zeromus
+class BackupDevice
 {
-	u8 com;	/* persistent command actually handled */
- u32 addr; /* current address for reading/writing */
- u8 addr_shift; /* shift for address (since addresses are transfered by 3 bytes units) */
- u8 addr_size; /* size of addr when writing/reading */
-
-	BOOL write_enable;	/* is write enabled ? */
-
- u8 *data; /* memory data */
- u32 size; /* memory size */
-	BOOL writeable_buffer;	/* is "data" writeable ? */
- int type; /* type of Memory */
- char *filename;
- FILE *fp;
- u8 autodetectbuf32768;
- int autodetectsize;
-} memory_chip_t;
-
-#define NDS_FW_SIZE_V1 (256 * 1024)		/* size of fw memory on nds v1 */
-#define NDS_FW_SIZE_V2 (512 * 1024)		/* size of fw memory on nds v2 */
-
-void mc_init(memory_chip_t *mc, int type); /* reset and init values for memory struct */
-u8 *mc_alloc(memory_chip_t *mc, u32 size); /* alloc mc memory */
-void mc_realloc(memory_chip_t *mc, int type, u32 size); /* realloc mc memory */
-void mc_load_file(memory_chip_t *mc, const char* filename); /* load save file and setup fp */
-int mc_load_duc(memory_chip_t *mc, const char* filename); /* load Action Replay DS save file */
-void mc_free(memory_chip_t *mc); /* delete mc memory */
-void mc_reset_com(memory_chip_t *mc); /* reset communication with mc */
-u8 fw_transfer(memory_chip_t *mc, u8 data); /* transfer to, then receive data from firmware */
-u8 bm_transfer(memory_chip_t *mc, u8 data); /* transfer to, then receive data from backup memory */
-
-#endif /*__FW_H__*/
+public:
+	BackupDevice();
+
+	// signals the save system that we are in our regular mode, loading up a rom. initializes for that case.
+	void load_rom(const std::string &filename);
+
+	void reset();
+	void reset_hardware();
+	std::string getFilename() { return filename; }
+
+	std::vector<uint8_t> data;
+
+	// this info was saved before the last reset (used for savestate compatibility)
+	struct SavedInfo
+	{
+		uint32_t addr_size;
+	} savedInfo;
+
+	// and these are used by old savestates
+	void load_old_state(uint32_t addr_size, uint8_t *data, uint32_t datasize);
+	static uint32_t addr_size_for_old_save_size(int bupmem_size);
+	static uint32_t addr_size_for_old_save_type(int bupmem_type);
+
+	void raw_applyUserSettings(uint32_t &size, bool manual = false);
 
+	bool load_no_gba(const char *fname);
+	bool load_raw(const char* filename, uint32_t force_size = 0);
+
+	struct
+	{
+		uint32_t size, padSize, type, addr_size, mem_size;
+	} info;
+private:
+	std::string filename;
+
+	bool write_enable; // is write enabled?
+	uint32_t com; // persistent command actually handled
+	uint32_t addr_size, addr_counter;
+	uint32_t addr;
+
+	std::vector<uint8_t> data_autodetect;
+	enum STATE
+	{
+		DETECTING = 0,
+		RUNNING = 1
+	} state;
+
+	enum MOTION_INIT_STATE
+	{
+		MOTION_INIT_STATE_IDLE,
+		MOTION_INIT_STATE_RECEIVED_4,
+		MOTION_INIT_STATE_RECEIVED_4_B,
+		MOTION_INIT_STATE_FE,
+		MOTION_INIT_STATE_FD,
+		MOTION_INIT_STATE_FB
+	};
+	enum MOTION_FLAG
+	{
+		MOTION_FLAG_NONE,
+		MOTION_FLAG_ENABLED,
+		MOTION_FLAG_SENSORMODE
+	};
+	uint8_t motionInitState, motionFlag;
+
+	void loadfile();
+	void ensure(uint32_t addr);
+
+	bool flushPending, lazyFlushPending;
+
+	void resize(uint32_t size);
+};
+
+#define NDS_FW_SIZE_V1 (256 * 1024) /* size of fw memory on nds v1 */
+#define NDS_FW_SIZE_V2 (512 * 1024) /* size of fw memory on nds v2 */
+
+void mc_init(memory_chip_t *mc, int type); /* reset and init values for memory struct */
+uint8_t *mc_alloc(memory_chip_t *mc, uint32_t size); /* alloc mc memory */
+void mc_free(memory_chip_t *mc); /* delete mc memory */
+void fw_reset_com(memory_chip_t *mc); /* reset communication with mc */
+uint8_t fw_transfer(memory_chip_t *mc, uint8_t data);
+
+struct SAVE_TYPE
+{
+	const char *descr;
+	int media_type;
+	int size;
+};

audacious-plugins-3.6.2-gtk3.tar.bz2/src/xsf/desmume/mem.h -> audacious-plugins-4.4.1.tar.bz2/src/xsf/desmume/mem.h Changed

@@ -1,141 +1,130 @@
-/* Copyright 2005-2006 Guillaume Duhamel
- Copyright 2005 Theo Berkau
-
- This file is part of Yabause.
-
- Yabause 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.
-
- Yabause 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 Yabause; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+/*
+	Copyright (C) 2005 Theo Berkau
+	Copyright (C) 2005-2006 Guillaume Duhamel
+	Copyright (C) 2008-2010 DeSmuME team
+
+	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
+	(at your option) any later version.
+
+	This file 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 the this software. If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef MEM_H
-#define MEM_H
+#pragma once
 
-#include <stdlib.h>
+#include <cstdlib>
+#include <cassert>
 #include "types.h"
 
-/* Type 1 Memory, faster for byte (8 bits) accesses */
-
-static INLINE u8 T1ReadByte(u8 * mem, u32 addr)
+// this was originally declared in MMU.h but we suffered some organizational problems and had to remove it
+enum MMU_ACCESS_TYPE
 {
- return memaddr;
-}
-
-static INLINE u16 T1ReadWord(u8 * mem, u32 addr)
+	MMU_AT_CODE, // used for cpu prefetches
+	MMU_AT_DATA, // used for cpu read/write
+	MMU_AT_GPU, // used for gpu read/write
+	MMU_AT_DMA, // used for dma read/write (blocks access to TCM)
+	MMU_AT_DEBUG // used for emulator debugging functions (bypasses some debug handling)
+};
+
+inline uint8_t T1ReadByte(const uint8_t *const mem, uint32_t addr)
 {
-#ifdef WORDS_BIGENDIAN
- return (memaddr + 1 << 8) | memaddr;
-#else
- return *((u16 *) (mem + addr));
-#endif
+	return memaddr;
 }
 
-static INLINE u32 T1ReadLong(u8 * mem, u32 addr)
+inline uint16_t T1ReadWord_guaranteedAligned(const uint8_t *const mem, uint32_t addr)
 {
+	assert(!(addr & 1));
 #ifdef WORDS_BIGENDIAN
- return (memaddr + 3 << 24 | memaddr + 2 << 16 |
- memaddr + 1 << 8 | memaddr);
+	return (memaddr + 1 << 8) | memaddr;
 #else
- return *((u32 *)mem + (addr>>2));
+	return *reinterpret_cast<const uint16_t *>(mem + addr);
 #endif
 }
 
-static INLINE u64 T1ReadQuad(u8 * mem, u32 addr)
+inline uint16_t T1ReadWord(const uint8_t *const mem, uint32_t addr)
 {
 #ifdef WORDS_BIGENDIAN
- return (memaddr + 7 << 56 | memaddr + 6 << 48 |
-	 memaddr + 5 << 40 | memaddr + 4 << 32 |
- memaddr + 3 << 24 | memaddr + 2 << 16 |
- memaddr + 1 << 8 | memaddr);
+	return (memaddr + 1 << 8) | memaddr;
 #else
- return *((u64 *) (mem + addr));
+	return *reinterpret_cast<const uint16_t *>(mem + addr);
 #endif
 }
 
-static INLINE void T1WriteByte(u8 * mem, u32 addr, u8 val)
-{
- memaddr = val;
-}
-
-static INLINE void T1WriteWord(u8 * mem, u32 addr, u16 val)
+inline uint32_t T1ReadLong_guaranteedAligned(const uint8_t *const mem, uint32_t addr)
 {
+	assert(!(addr & 3));
 #ifdef WORDS_BIGENDIAN
- memaddr + 1 = val >> 8;
- memaddr = val & 0xFF;
+	return (memaddr + 3 << 24) | (memaddr + 2 << 16) | (memaddr + 1 << 8) | memaddr;
 #else
- *((u16 *) (mem + addr)) = val;
+	return *reinterpret_cast<const uint32_t *>(mem + addr);
 #endif
 }
 
-static INLINE void T1WriteLong(u8 * mem, u32 addr, u32 val)
+inline uint32_t T1ReadLong(const uint8_t *const mem, uint32_t addr)
 {
+	addr &= ~3;
 #ifdef WORDS_BIGENDIAN
- memaddr + 3 = val >> 24;
- memaddr + 2 = (val >> 16) & 0xFF;
- memaddr + 1 = (val >> 8) & 0xFF;
- memaddr = val & 0xFF;
+	return (memaddr + 3 << 24) | (memaddr + 2 << 16) | (memaddr + 1 << 8) | memaddr;
 #else
- *((u32 *) (mem + addr)) = val;
+	return *reinterpret_cast<const uint32_t *>(mem + addr);
 #endif
 }
 
-/* Type 2 Memory, faster for word (16 bits) accesses */
-
-static INLINE u8 T2ReadByte(u8 * mem, u32 addr)
+inline uint64_t T1ReadQuad(const uint8_t *const mem, uint32_t addr)
 {
 #ifdef WORDS_BIGENDIAN
- return memaddr ^ 1;
+	return (memaddr + 7 << 56) | (memaddr + 6 << 48) | (memaddr + 5 << 40) | (memaddr + 4 << 32) | (memaddr + 3 << 24) | (memaddr + 2 << 16) | (memaddr + 1 << 8) | memaddr;
 #else
- return memaddr;
+	return *reinterpret_cast<const uint64_t *>(mem + addr);
 #endif
 }
 
-static INLINE u16 T2ReadWord(u8 * mem, u32 addr)
+inline void T1WriteByte(uint8_t *const mem, uint32_t addr, uint8_t val)
 {
- return *((u16 *) (mem + addr));
+	memaddr = val;
 }
 
-static INLINE u32 T2ReadLong(u8 * mem, u32 addr)
+inline void T1WriteWord(uint8_t *const mem, uint32_t addr, uint16_t val)
 {
 #ifdef WORDS_BIGENDIAN
- return *((u16 *) (mem + addr + 2)) << 16 | *((u16 *) (mem + addr));
+	memaddr + 1 = val >> 8;
+	memaddr = val & 0xFF;
 #else
- return *((u32 *) (mem + addr));
+	*reinterpret_cast<uint16_t *>(mem + addr) = val;
 #endif
 }
 
-static INLINE void T2WriteByte(u8 * mem, u32 addr, u8 val)
+inline void T1WriteLong(uint8_t *const mem, uint32_t addr, uint32_t val)
 {
 #ifdef WORDS_BIGENDIAN
- memaddr ^ 1 = val;
+	memaddr + 3 = val >> 24;
+	memaddr + 2 = (val >> 16) & 0xFF;
+	memaddr + 1 = (val >> 8) & 0xFF;
+	memaddr = val & 0xFF;
 #else
- memaddr = val;
+	*reinterpret_cast<uint32_t *>(mem + addr) = val;
 #endif
 }
 
-static INLINE void T2WriteWord(u8 * mem, u32 addr, u16 val)
-{
- *((u16 *) (mem + addr)) = val;
-}
-
-static INLINE void T2WriteLong(u8 * mem, u32 addr, u32 val)
+inline void T1WriteQuad(uint8_t *const mem, uint32_t addr, uint64_t val)
 {
 #ifdef WORDS_BIGENDIAN
- *((u16 *) (mem + addr + 2)) = val >> 16;
- *((u16 *) (mem + addr)) = val & 0xFFFF;
+	memaddr + 7 = val >> 56;
+	memaddr + 6 = (val >> 48) & 0xFF;
+	memaddr + 5 = (val >> 40) & 0xFF;
+	memaddr + 4 = (val >> 32) & 0xFF;
+	memaddr + 3 = (val >> 24) & 0xFF;
+	memaddr + 2 = (val >> 16) & 0xFF;
+	memaddr + 1 = (val >> 8) & 0xFF;
+	memaddr = val & 0xFF;
 #else
- *((u32 *) (mem + addr)) = val;
+	*reinterpret_cast<uint64_t *>(mem + addr) = val;
 #endif
 }
-
-#endif

audacious-plugins-4.4.1.tar.bz2/src/xsf/desmume/metaspu.cc Added

@@ -0,0 +1,57 @@
+/* Copyright 2009-2015 DeSmuME team
+
+ This file is part of DeSmuME
+
+ DeSmuME 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.
+
+ DeSmuME 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 DeSmuME; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+*/
+
+#include "metaspu.h"
+
+#include <queue>
+#include <vector>
+#include <list>
+#include <cstring>
+#include <assert.h>
+
+class NullSynchronizer : public ISynchronizingAudioBuffer
+{
+public:
+ std::queue<uint32_t> buffer;
+ NullSynchronizer() {}
+
+	virtual void enqueue_samples(s16* buf, int samples_provided) {
+ for (int i = 0; i < samples_provided * 2; i += 2) {
+ uint16_t left = bufi;
+ uint16_t right = bufi + 1;
+ buffer.push(left << 16 | right);
+ }
+ }
+
+	virtual int output_samples(s16* buf, int samples_requested) {
+ int samples = ((samples_requested < buffer.size()) ? samples_requested : buffer.size()) & ~1;
+ for (int offset = 0, i = 0; i < samples; i++) {
+ uint32_t sample = buffer.front();
+ buffer.pop();
+ bufoffset++ = (sample >> 16) & 0xFFFF;
+ bufoffset++ = sample & 0xFFFF;
+ }
+ return samples;
+ }
+};
+
+ISynchronizingAudioBuffer* metaspu_construct(ESynchMethod method)
+{
+	return new NullSynchronizer();
+}

audacious-plugins-4.4.1.tar.bz2/src/xsf/desmume/metaspu.h Added

@@ -0,0 +1,54 @@
+/* Copyright 2009-2015 DeSmuME team
+
+	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
+	(at your option) any later version.
+
+	This file 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 the this software. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+//-------------------------
+//this file contains the METASPU system
+//which is designed to handle the task of audio synchronization
+//and is designed to be as portable between multiple emulators
+//-------------------------
+
+
+#ifndef _METASPU_H_
+#define _METASPU_H_
+
+#include <algorithm>
+
+#include "types.h"
+
+class ISynchronizingAudioBuffer
+{
+public:
+ virtual ~ISynchronizingAudioBuffer() {}
+
+	virtual void enqueue_samples(s16* buf, int samples_provided) = 0;
+
+	//returns the number of samples actually supplied, which may not match the number requested
+	virtual int output_samples(s16* buf, int samples_requested) = 0;
+};
+
+enum ESynchMode
+{
+	ESynchMode_Synchronous
+};
+
+enum ESynchMethod
+{
+	ESynchMethod_0, //Null
+};
+
+ISynchronizingAudioBuffer* metaspu_construct(ESynchMethod method);
+
+#endif

audacious-plugins-4.4.1.tar.bz2/src/xsf/desmume/readwrite.cc Added

@@ -0,0 +1,84 @@
+/*
+	Copyright (C) 2006-2009 DeSmuME team
+
+	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
+	(at your option) any later version.
+
+	This file 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 the this software. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "readwrite.h"
+#include "types.h"
+
+int read8le(uint8_t *Bufo, EMUFILE *is)
+{
+	if (is->_fread(Bufo, 1) != 1)
+		return 0;
+	return 1;
+}
+
+int read32le(uint32_t *Bufo, EMUFILE *fp)
+{
+	uint32_t buf;
+	if (fp->_fread(&buf, 4) < 4)
+		return 0;
+#ifdef LOCAL_LE
+	*Bufo = buf;
+#else
+	*Bufo = ((buf & 0xFF) << 24) | ((buf & 0xFF00) << 8) | ((buf & 0xFF0000) >> 8) | ((buf & 0xFF000000) >> 24);
+#endif
+	return 1;
+}
+
+int read16le(uint16_t *Bufo, EMUFILE *is)
+{
+	uint16_t buf;
+	if (is->_fread(&buf, 2) != 2)
+		return 0;
+#ifdef LOCAL_LE
+	*Bufo = buf;
+#else
+	*Bufo = LE_TO_LOCAL_16(buf);
+#endif
+	return 1;
+}
+
+int read64le(uint64_t *Bufo, EMUFILE *is)
+{
+	uint64_t buf;
+	if (is->_fread(&buf, 8) != 8)
+		return 0;
+#ifdef LOCAL_LE
+	*Bufo = buf;
+#else
+	*Bufo = LE_TO_LOCAL_64(buf);
+#endif
+	return 1;
+}
+
+int readbool(bool *b, EMUFILE *is)
+{
+	uint32_t temp = 0;
+	int ret = read32le(&temp, is);
+	*b = !!temp;
+	return ret;
+}
+
+int readbuffer(std::vector<uint8_t> &vec, EMUFILE *is)
+{
+	uint32_t size;
+	if (read32le(&size, is) != 1)
+		return 0;
+	vec.resize(size);
+	if (size > 0)
+		is->fread(&vec0, size);
+	return 1;
+}

audacious-plugins-4.4.1.tar.bz2/src/xsf/desmume/readwrite.h Added

@@ -0,0 +1,43 @@
+/*
+	Copyright (C) 2008-2009 DeSmuME team
+
+	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
+	(at your option) any later version.
+
+	This file 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 the this software. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+#include <iostream>
+#include <vector>
+#include <cstdio>
+#include "types.h"
+#include "emufile.h"
+
+int read8le(uint8_t *Bufo, EMUFILE *is);
+int read16le(uint16_t *Bufo, EMUFILE *is);
+inline int read16le(int16_t *Bufo, EMUFILE *is) { return read16le(reinterpret_cast<uint16_t *>(Bufo), is); }
+int read32le(uint32_t *Bufo, EMUFILE *is);
+inline int read32le(int32_t *Bufo, EMUFILE *is) { return read32le(reinterpret_cast<uint32_t *>(Bufo), is); }
+int read64le(uint64_t *Bufo, EMUFILE *is);
+inline int read_double_le(double *Bufo, EMUFILE *is)
+{
+	uint64_t temp;
+	int ret = read64le(&temp,is);
+	*Bufo = u64_to_double(temp);
+	return ret;
+}
+int read16le(uint16_t *Bufo, std::istream *is);
+
+int readbool(bool *b, EMUFILE *is);
+
+int readbuffer(std::vector<uint8_t> &vec, EMUFILE *is);

audacious-plugins-3.6.2-gtk3.tar.bz2/src/xsf/desmume/registers.h -> audacious-plugins-4.4.1.tar.bz2/src/xsf/desmume/registers.h Changed

@@ -1,26 +1,22 @@
-/* Copyright (C) 2006 Theo Berkau
+/*
+	Copyright (C) 2006 Theo Berkau
+	Copyright (C) 2006-2011 DeSmuME team
 
- Ideas borrowed from Stephane Dallongeville's SCSP core
+	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
+	(at your option) any later version.
 
- This file is part of DeSmuME
+	This file 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.
 
- DeSmuME 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.
-
- DeSmuME 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 DeSmuME; 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 the this software. If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef REGISTERS_H
-#define REGISTERS_H
+#pragma once
 
 #define REG_REGION_MASK 0x0FFFEF80
 #define REG_BASE_DISPx 0x04000000
@@ -78,22 +74,40 @@
 #define REG_DISPA_MASTERBRIGHT 0x0400006C
 
 // DMA
+#define _REG_DMA_CONTROL_MIN 0x040000B0
 #define REG_DMA0SAD 0x040000B0
+#define REG_DMA0SADL 0x040000B0
+#define REG_DMA0SADH 0x040000B2
 #define REG_DMA0DAD 0x040000B4
+#define REG_DMA0DADL 0x040000B4
+#define REG_DMA0DADH 0x040000B6
 #define REG_DMA0CNTL 0x040000B8
 #define REG_DMA0CNTH 0x040000BA
 #define REG_DMA1SAD 0x040000BC
+#define REG_DMA1SADL 0x040000BC
+#define REG_DMA1SADH 0x040000BE
 #define REG_DMA1DAD 0x040000C0
+#define REG_DMA1DADL 0x040000C0
+#define REG_DMA1DADH 0x040000C2
 #define REG_DMA1CNTL 0x040000C4
 #define REG_DMA1CNTH 0x040000C6
 #define REG_DMA2SAD 0x040000C8
+#define REG_DMA2SADL 0x040000C8
+#define REG_DMA2SADH 0x040000CA
 #define REG_DMA2DAD 0x040000CC
+#define REG_DMA2DADL 0x040000CC
+#define REG_DMA2DADH 0x040000CE
 #define REG_DMA2CNTL 0x040000D0
 #define REG_DMA2CNTH 0x040000D2
 #define REG_DMA3SAD 0x040000D4
+#define REG_DMA3SADL 0x040000D4
+#define REG_DMA3SADH 0x040000D6
 #define REG_DMA3DAD 0x040000D8
+#define REG_DMA3DADL 0x040000D8
+#define REG_DMA3DADH 0x040000DA
 #define REG_DMA3CNTL 0x040000DC
 #define REG_DMA3CNTH 0x040000DE
+#define _REG_DMA_CONTROL_MAX 0x040000DF
 #define REG_DMA0FILL 0x040000E0
 #define REG_DMA1FILL 0x040000E4
 #define REG_DMA2FILL 0x040000E8
@@ -164,7 +178,7 @@
 #define REG_SQRTRESULT 0x040002B4
 #define REG_SQRTPARAM 0x040002B8
 
-// Other 
+// Other
 #define REG_POSTFLG 0x04000300
 #define REG_HALTCNT 0x04000301
 #define REG_POWCNT1 0x04000304
@@ -269,6 +283,10 @@
 #define REG_DISPA_DISPCAPCNT 0x04000064
 #define REG_DISPA_DISPMMEMFIFO 0x04000068
 
+#define REG_DISPA_DISP3DCNT_BIT_RDLINES_UNDERFLOW 0x1000
+#define REG_DISPA_DISP3DCNT_BIT_RAM_OVERFLOW 0x2000
+#define REG_DISPA_DISP3DCNT_BITS_ACK (REG_DISPA_DISP3DCNT_BIT_RDLINES_UNDERFLOW|REG_DISPA_DISP3DCNT_BIT_RAM_OVERFLOW)
+
 
 #define eng_3D_RDLINES_COUNT 0x04000320
 #define eng_3D_EDGE_COLOR 0x04000330
@@ -282,6 +300,9 @@
 #define eng_3D_TOON_TABLE 0x04000380
 #define eng_3D_GXFIFO 0x04000400
 
+//DSI
+#define REG_DSIMODE 0x04004000
+
 // 3d commands
 #define cmd_3D_MTX_MODE 0x04000440
 #define cmd_3D_MTX_PUSH 0x04000444
@@ -328,6 +349,80 @@
 #define eng_3D_VEC_RESULT 0x04000630
 #define eng_3D_CLIPMTX_RESULT 0x04000640
 #define eng_3D_VECMTX_RESULT 0x04000680
- 
 
-#endif
+#define IPCFIFOCNT_SENDEMPTY 0x0001
+#define IPCFIFOCNT_SENDFULL 0x0002
+#define IPCFIFOCNT_SENDIRQEN 0x0004
+#define IPCFIFOCNT_SENDCLEAR 0x0008
+#define IPCFIFOCNT_RECVEMPTY 0x0100
+#define IPCFIFOCNT_RECVFULL 0x0200
+#define IPCFIFOCNT_RECVIRQEN 0x0400
+#define IPCFIFOCNT_FIFOERROR 0x4000
+#define IPCFIFOCNT_FIFOENABLE 0x8000
+#define IPCFIFOCNT_WRITEABLE (IPCFIFOCNT_SENDIRQEN | IPCFIFOCNT_RECVIRQEN | IPCFIFOCNT_FIFOENABLE)
+
+#define IPCSYNC_IRQ_SEND 0x2000
+#define IPCSYNC_IRQ_RECV 0x4000
+
+#define IRQ_BIT_LCD_VBLANK 0
+#define IRQ_BIT_LCD_HBLANK 1
+#define IRQ_BIT_LCD_VMATCH 2
+#define IRQ_BIT_TIMER_0 3
+#define IRQ_BIT_TIMER_1 4
+#define IRQ_BIT_TIMER_2 5
+#define IRQ_BIT_TIMER_3 6
+#define IRQ_BIT_ARM7_SIO 7
+#define IRQ_BIT_DMA_0 8
+#define IRQ_BIT_DMA_2 9
+#define IRQ_BIT_DMA_3 10
+#define IRQ_BIT_DMA_4 11
+#define IRQ_BIT_KEYPAD 12
+#define IRQ_BIT_GAMEPAK 13
+#define IRQ_BIT_IPCSYNC 16
+#define IRQ_BIT_IPCFIFO_SENDEMPTY 17
+#define IRQ_BIT_IPCFIFO_RECVNONEMPTY 18
+#define IRQ_BIT_GC_TRANSFER_COMPLETE 19
+#define IRQ_BIT_GC_IREQ_MC 20
+#define IRQ_BIT_ARM9_GXFIFO 21
+#define IRQ_BIT_ARM7_FOLD 22
+#define IRQ_BIT_ARM7_SPI 23
+#define IRQ_BIT_ARM7_WIFI 24
+
+#define IRQ_MASK_LCD_VBLANK (1<<0)
+#define IRQ_MASK_LCD_HBLANK (1<<1)
+#define IRQ_MASK_LCD_VMATCH (1<<2)
+#define IRQ_MASK_TIMER_0 (1<<3)
+#define IRQ_MASK_TIMER_1 (1<<4)
+#define IRQ_MASK_TIMER_2 (1<<5)
+#define IRQ_MASK_TIMER_3 (1<<6)
+#define IRQ_MASK_ARM7_SIO (1<<7)
+#define IRQ_MASK_DMA_0 (1<<8)
+#define IRQ_MASK_DMA_2 (1<<9)
+#define IRQ_MASK_DMA_3 (1<<10)
+#define IRQ_MASK_DMA_4 (1<<11)
+#define IRQ_MASK_KEYPAD (1<<12)
+#define IRQ_MASK_GAMEPAK (1<<13)
+#define IRQ_MASK_IPCSYNC (1<<16)
+#define IRQ_MASK_IPCFIFO_SENDEMPTY (1<<17)
+#define IRQ_MASK_IPCFIFO_RECVNONEMPTY (1<<18)
+#define IRQ_MASK_GC_TRANSFER_COMPLETE (1<<19)
+#define IRQ_MASK_GC_IREQ_MC (1<<20)
+#define IRQ_MASK_ARM9_GXFIFO (1<<21)
+#define IRQ_MASK_ARM7_FOLD (1<<22)
+#define IRQ_MASK_ARM7_SPI (1<<23)
+#define IRQ_MASK_ARM7_WIFI (1<<24)
+
+#define TSC_MEASURE_TEMP1 0
+#define TSC_MEASURE_Y 1
+#define TSC_MEASURE_BATTERY 2
+#define TSC_MEASURE_Z1 3
+#define TSC_MEASURE_Z2 4
+#define TSC_MEASURE_X 5
+#define TSC_MEASURE_AUX 6
+#define TSC_MEASURE_TEMP2 7
+
+#define EXMEMCNT_MASK_SLOT2_ARM7 (1<<7)
+#define EXMEMCNT_MASK_SLOT2_SRAM_TIME (3)
+#define EXMEMCNT_MASK_SLOT2_ROM_1ST_TIME (3<<2)
+#define EXMEMCNT_MASK_SLOT2_ROM_2ND_TIME (1<<4)
+#define EXMEMCNT_MASK_SLOT2_CLOCKRATE (3<<5)

audacious-plugins-4.4.1.tar.bz2/src/xsf/desmume/slot1.cc Added

audacious-plugins-4.4.1.tar.bz2/src/xsf/desmume/slot1.h Added

@@ -0,0 +1,59 @@
+/*
+	Copyright (C) 2010-2011 DeSmuME team
+
+	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
+	(at your option) any later version.
+
+	This file 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 the this software. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+#include "types.h"
+
+struct SLOT1INTERFACE
+{
+	// The name of the plugin, this name will appear in the plugins list
+	const char *name;
+
+	// called once when the plugin starts up
+	bool (*init)();
+
+	// called when the emulator resets
+	void (*reset)();
+
+	// called when the plugin shuts down
+	void (*close)();
+
+	// called when the user configurating plugin
+	void (*config)();
+
+	// called when the emulator write to addon
+	void (*write08)(uint8_t PROCNUM, uint32_t adr, uint8_t val);
+	void (*write16)(uint8_t PROCNUM, uint32_t adr, uint16_t val);
+	void (*write32)(uint8_t PROCNUM, uint32_t adr, uint32_t val);
+
+	// called when the emulator read from addon
+	uint8_t (*read08)(uint8_t PROCNUM, uint32_t adr);
+	uint16_t (*read16)(uint8_t PROCNUM, uint32_t adr);
+	uint32_t (*read32)(uint8_t PROCNUM, uint32_t adr);
+
+	// called when the user get info about addon pak (description)
+	void (*info)(char *info);
+};
+
+extern SLOT1INTERFACE slot1_device; // current slot1 device
+
+enum NDS_SLOT1_TYPE
+{
+	NDS_SLOT1_RETAIL,
+	NDS_SLOT1_COUNT // use for counter addons - MUST TO BE LAST!!!
+};

audacious-plugins-4.4.1.tar.bz2/src/xsf/desmume/slot1_retail.cc Added

@@ -0,0 +1,167 @@
+/* Copyright (C) 2010-2011 DeSmuME team
+
+ This file is part of DeSmuME
+
+ DeSmuME 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.
+
+ DeSmuME 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 DeSmuME; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+*/
+
+#include "slot1.h"
+#include "registers.h"
+#include "MMU.h"
+#include "NDSSystem.h"
+
+static void info(char *info) { strcpy(info, "Slot1 Retail card emulation"); }
+static void config() {}
+
+static bool init() { return true; }
+
+static void reset() {}
+
+static void close() {}
+
+static void write08(uint8_t, uint32_t, uint8_t) {}
+static void write16(uint8_t, uint32_t, uint16_t) {}
+
+static void write32_GCROMCTRL(uint8_t PROCNUM, uint32_t)
+{
+	nds_dscard &card = MMU.dscardPROCNUM;
+
+	switch (card.command0)
+	{
+		case 0x00: // Data read
+		case 0xB7:
+			card.address = (card.command1 << 24) | (card.command2 << 16) | (card.command3 << 8) | card.command4;
+			card.transfer_count = 0x80;
+			break;
+
+		case 0xB8: // Chip ID
+			card.address = 0;
+			card.transfer_count = 1;
+			break;
+
+		default:
+			card.address = 0;
+			card.transfer_count = 0;
+	}
+}
+
+static void write32(uint8_t PROCNUM, uint32_t adr, uint32_t val)
+{
+	switch (adr)
+	{
+		case REG_GCROMCTRL:
+			write32_GCROMCTRL(PROCNUM, val);
+	}
+}
+
+static uint8_t read08(uint8_t, uint32_t)
+{
+	return 0xFF;
+}
+
+static uint16_t read16(uint8_t, uint32_t)
+{
+	return 0xFFFF;
+}
+
+static uint32_t read32_GCDATAIN(uint8_t PROCNUM)
+{
+	nds_dscard &card = MMU.dscardPROCNUM;
+
+	switch (card.command0)
+	{
+		// Get ROM chip ID
+		case 0x90:
+		case 0xB8:
+			{
+				// Note: the BIOS stores the chip ID in main memory
+				// Most games continuously compare the chip ID with
+				// the value in memory, probably to know if the card
+				// was removed.
+				// As DeSmuME normally boots directly from the game, the chip
+				// ID in main mem is zero and this value needs to be
+				// zero too.
+
+				// note that even if desmume was booting from firmware, and reading this chip ID to store in main memory,
+				// this still works, since it will have read 00 originally and then read 00 to validate.
+
+				// staff of kings verifies this (it also uses the arm7 IRQ 20)
+				if (nds.cardEjected) // TODO - handle this with ejected card slot1 device (and verify using this case)
+					return 0xFFFFFFFF;
+				else
+					return 0;
+			}
+
+		// Data read
+		case 0x00:
+		case 0xB7:
+			{
+				// it seems that etrian odyssey 3 doesnt work unless we mask this to cart size.
+				// but, a thought: does the internal rom address counter register wrap around? we may be making a mistake by keeping the extra precision
+				// but there is no test case yet
+				uint32_t address = card.address & gameInfo.mask;
+
+				// Make sure any reads below 0x8000 redirect to 0x8000+(adr&0x1FF) as on real cart
+				if (card.command0 == 0xB7 && address < 0x8000)
+				{
+					// TODO - refactor this to include the PROCNUM, for debugging purposes if nothing else
+					// (can refactor gbaslot also)
+
+					//INFO("Read below 0x8000 (0x%04X) from: ARM%s %08X\n", card.address, (PROCNUM ? "7":"9"), (PROCNUM ? NDS_ARM7:NDS_ARM9).instruct_adr);
+
+					address = 0x8000 + (address & 0x1FF);
+				}
+
+				// as a sanity measure for funny-sized roms (homebrew and perhaps truncated retail roms)
+				// we need to protect ourselves by returning 0xFF for things still out of range
+				if (address >= gameInfo.romsize)
+				{
+					//DEBUG_Notify.ReadBeyondEndOfCart(address, gameInfo. romsize);
+					return 0xFFFFFFFF;
+				}
+
+				return T1ReadLong(MMU.CART_ROM, address);
+			}
+		default:
+			return 0;
+	} //switch(card.command0)
+} //read32_GCDATAIN
+
+static uint32_t read32(uint8_t PROCNUM, uint32_t adr)
+{
+	switch (adr)
+	{
+		case REG_GCDATAIN:
+			return read32_GCDATAIN(PROCNUM);
+		default:
+			return 0;
+	}
+}
+
+SLOT1INTERFACE slot1Retail =
+{
+	"Retail",
+	init,
+	reset,
+	close,
+	config,
+	write08,
+	write16,
+	write32,
+	read08,
+	read16,
+	read32,
+	info
+};

audacious-plugins-3.6.2-gtk3.tar.bz2/src/xsf/desmume/thumb_instructions.cc -> audacious-plugins-4.4.1.tar.bz2/src/xsf/desmume/thumb_instructions.cc Changed

@@ -1,944 +1,1159 @@
 /*
 	Copyright (C) 2006 yopyop
- yopyop156@ifrance.com
- yopyop156.ifrance.com
+	Copyright (C) 2008 shash
+	Copyright (C) 2008-2013 DeSmuME team
 
-	Code added on 18/08/2006 by shash
-		- Missing missaligned addresses correction
-			(reference in http://nocash.emubase.de/gbatek.htm#cpumemoryalignments)
+	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
+	(at your option) any later version.
 
- This file is part of DeSmuME
+	This file 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.
 
- DeSmuME 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.
-
- DeSmuME 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 DeSmuME; 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 the this software. If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <cassert>
+
 #include "bios.h"
-#include "debug.h"
 #include "MMU.h"
+#include "NDSSystem.h"
+#include "MMU_timing.h"
 
-#define REG_NUM(i, n) (((i)>>n)&0x7)
+#define cpu (&ARMPROC)
+#define TEMPLATE template<int PROCNUM>
 
-extern BOOL execute;
-
-// Use this macros for reading/writing, so the GDB stub isn't broken
-#ifdef GDB_STUB
-	#define READ32(a,b)		cpu->mem_if->read32(a,b)
-	#define WRITE32(a,b,c)	cpu->mem_if->write32(a,b,c)
-	#define READ16(a,b)		cpu->mem_if->read16(a,b)
-	#define WRITE16(a,b,c)	cpu->mem_if->write16(a,b,c)
-	#define READ8(a,b)		cpu->mem_if->read8(a,b)
-	#define WRITE8(a,b,c)	cpu->mem_if->write8(a,b,c)
-#else
-	#define READ32(a,b)		MMU_read32(cpu->proc_ID, b)
-	#define WRITE32(a,b,c)	MMU_write32(cpu->proc_ID,b,c)
-	#define READ16(a,b)		MMU_read16(cpu->proc_ID, b)
-	#define WRITE16(a,b,c)	MMU_write16(cpu->proc_ID,b,c)
-	#define READ8(a,b)		MMU_read8(cpu->proc_ID, b)
-	#define WRITE8(a,b,c)	MMU_write8(cpu->proc_ID,b,c)
-#endif
+static inline uint32_t REG_NUM(uint32_t i, uint32_t n) { return (i >> n) & 0x7; }
 
-static u32 FASTCALL OP_UND_THUMB(armcpu_t *cpu)
+//-----------------------------------------------------------------------------
+// Undefined instruction
+//-----------------------------------------------------------------------------
+TEMPLATE static uint32_t FASTCALL OP_UND_THUMB(uint32_t)
 {
- execute = false;
- return 1;
+	//INFO("THUMB%c: Undefined instruction: 0x%08X (%s) PC=0x%08X\n", cpu->proc_ID?'7':'9', cpu->instruction, decodeIntruction(true, cpu->instruction), cpu->instruct_adr);
+	TRAPUNDEF(cpu);
+	return 1;
 }
 
-static u32 FASTCALL OP_LSL_0(armcpu_t *cpu)
+//-----------------------------------------------------------------------------
+// LSL
+//-----------------------------------------------------------------------------
+
+TEMPLATE static uint32_t FASTCALL OP_LSL_0(uint32_t i)
 {
- u32 i = cpu->instruction;
- cpu->RREG_NUM(i, 0) = cpu->RREG_NUM(i, 3);
- cpu->CPSR.bits.N = BIT31(cpu->RREG_NUM(i, 0));
- cpu->CPSR.bits.Z = cpu->RREG_NUM(i, 0) == 0;
+	cpu->RREG_NUM(i, 0) = cpu->RREG_NUM(i, 3);
+	cpu->CPSR.bits.N = BIT31(cpu->RREG_NUM(i, 0));
+	cpu->CPSR.bits.Z = !cpu->RREG_NUM(i, 0);
 
- return 2;
+	return 1;
 }
 
-static u32 FASTCALL OP_LSL(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_LSL(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 v = (i>>6) & 0x1F;
- cpu->CPSR.bits.C = BIT_N(cpu->RREG_NUM(i, 3), 32-v);
- cpu->RREG_NUM(i, 0) = (cpu->RREG_NUM(i, 3) << v);
- cpu->CPSR.bits.N = BIT31(cpu->RREG_NUM(i, 0));
- cpu->CPSR.bits.Z = cpu->RREG_NUM(i, 0) == 0;
+	uint32_t v = (i >> 6) & 0x1F;
+	cpu->CPSR.bits.C = BIT_N(cpu->RREG_NUM(i, 3), 32 - v);
+	cpu->RREG_NUM(i, 0) = cpu->RREG_NUM(i, 3) << v;
+	cpu->CPSR.bits.N = BIT31(cpu->RREG_NUM(i, 0));
+	cpu->CPSR.bits.Z = !cpu->RREG_NUM(i, 0);
 
- return 2;
+	return 1;
 }
 
-static u32 FASTCALL OP_LSR_0(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_LSL_REG(uint32_t i)
 {
- u32 i = cpu->instruction;
-	 // cpu->CPSR.bits.C = BIT31(cpu->RREG_NUM(i, 0));
- cpu->CPSR.bits.C = BIT31(cpu->RREG_NUM(i, 3));
- cpu->RREG_NUM(i, 0) = 0;
- cpu->CPSR.bits.N = 0;
- cpu->CPSR.bits.Z = 1;
+	uint32_t v = cpu->RREG_NUM(i, 3) & 0xFF;
 
- return 2;
-}
+	if (!v)
+	{
+		cpu->CPSR.bits.N = BIT31(cpu->RREG_NUM(i, 0));
+		cpu->CPSR.bits.Z = !cpu->RREG_NUM(i, 0);
+		return 2;
+	}
+	if (v < 32)
+	{
+		cpu->CPSR.bits.C = BIT_N(cpu->RREG_NUM(i, 0), 32 - v);
+		cpu->RREG_NUM(i, 0) <<= v;
+		cpu->CPSR.bits.N = BIT31(cpu->RREG_NUM(i, 0));
+		cpu->CPSR.bits.Z = !cpu->RREG_NUM(i, 0);
+		return 2;
+	}
+	if (v == 32)
+		cpu->CPSR.bits.C = BIT0(cpu->RREG_NUM(i, 0));
+	else
+		cpu->CPSR.bits.C = 0;
 
-static u32 FASTCALL OP_LSR(armcpu_t *cpu)
-{
- u32 i = cpu->instruction;
- u32 v = (i>>6) & 0x1F;
- cpu->CPSR.bits.C = BIT_N(cpu->RREG_NUM(i, 0), v-1);
- cpu->RREG_NUM(i, 0) = (cpu->RREG_NUM(i, 3) >> v);
- cpu->CPSR.bits.N = BIT31(cpu->RREG_NUM(i, 0));
- cpu->CPSR.bits.Z = cpu->RREG_NUM(i, 0) == 0;
+	cpu->RREG_NUM(i, 0) = 0;
+	cpu->CPSR.bits.N = 0;
+	cpu->CPSR.bits.Z = 1;
 
- return 2;
+	return 2;
 }
 
-static u32 FASTCALL OP_ASR_0(armcpu_t *cpu)
+//-----------------------------------------------------------------------------
+// LSR
+//-----------------------------------------------------------------------------
+
+TEMPLATE static uint32_t FASTCALL OP_LSR_0(uint32_t i)
 {
- u32 i = cpu->instruction;
- cpu->CPSR.bits.C = BIT31(cpu->RREG_NUM(i, 3));
- cpu->RREG_NUM(i, 0) = BIT31(cpu->RREG_NUM(i, 3))*0xFFFFFFFF;
- cpu->CPSR.bits.N = BIT31(cpu->RREG_NUM(i, 0));
- cpu->CPSR.bits.Z = cpu->RREG_NUM(i, 0) == 0;
+	cpu->CPSR.bits.C = BIT31(cpu->RREG_NUM(i, 3));
+	cpu->RREG_NUM(i, 0) = 0;
+	cpu->CPSR.bits.N = 0;
+	cpu->CPSR.bits.Z = 1;
 
- return 2;
+	return 1;
 }
 
-static u32 FASTCALL OP_ASR(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_LSR(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 v = (i>>6) & 0x1F;
- cpu->CPSR.bits.C = BIT_N(cpu->RREG_NUM(i, 3), v-1);
- cpu->RREG_NUM(i, 0) = (((s32)cpu->RREG_NUM(i, 3)) >> v);
- cpu->CPSR.bits.N = BIT31(cpu->RREG_NUM(i, 0));
- cpu->CPSR.bits.Z = cpu->RREG_NUM(i, 0) == 0;
+	uint32_t v = (i >> 6) & 0x1F;
+	cpu->CPSR.bits.C = BIT_N(cpu->RREG_NUM(i, 3), v - 1);
+	cpu->RREG_NUM(i, 0) = cpu->RREG_NUM(i, 3) >> v;
+	cpu->CPSR.bits.N = BIT31(cpu->RREG_NUM(i, 0));
+	cpu->CPSR.bits.Z = !cpu->RREG_NUM(i, 0);
 
- return 2;
+	return 1;
 }
 
-static u32 FASTCALL OP_ADD_REG(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_LSR_REG(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 a = cpu->RREG_NUM(i, 3);
- u32 b = cpu->RREG_NUM(i, 6);
- cpu->RREG_NUM(i, 0) = a + b;
- cpu->CPSR.bits.N = BIT31(cpu->RREG_NUM(i, 0));
- cpu->CPSR.bits.Z = cpu->RREG_NUM(i, 0) == 0;
- cpu->CPSR.bits.C = UNSIGNED_OVERFLOW(a, b, cpu->RREG_NUM(i, 0));
- cpu->CPSR.bits.V = SIGNED_OVERFLOW(a, b, cpu->RREG_NUM(i, 0));
+	uint32_t v = cpu->RREG_NUM(i, 3) & 0xFF;
 
- return 3;
-}
+	if (!v)
+	{
+		cpu->CPSR.bits.N = BIT31(cpu->RREG_NUM(i, 0));
+		cpu->CPSR.bits.Z = !cpu->RREG_NUM(i, 0);
+		return 2;
+	}
+	if (v < 32)
+	{
+		cpu->CPSR.bits.C = BIT_N(cpu->RREG_NUM(i, 0), v - 1);
+		cpu->RREG_NUM(i, 0) >>= v;
+		cpu->CPSR.bits.N = BIT31(cpu->RREG_NUM(i, 0));
+		cpu->CPSR.bits.Z = !cpu->RREG_NUM(i, 0);
+		return 2;
+	}
+	if (v == 32)
+		cpu->CPSR.bits.C = BIT31(cpu->RREG_NUM(i, 0));
+	else
+		cpu->CPSR.bits.C = 0;
 
-static u32 FASTCALL OP_SUB_REG(armcpu_t *cpu)
-{
- u32 i = cpu->instruction;
- u32 a = cpu->RREG_NUM(i, 3);
- u32 b = cpu->RREG_NUM(i, 6);
- cpu->RREG_NUM(i, 0) = a - b;
- cpu->CPSR.bits.N = BIT31(cpu->RREG_NUM(i, 0));
- cpu->CPSR.bits.Z = cpu->RREG_NUM(i, 0) == 0;
- cpu->CPSR.bits.C = !UNSIGNED_UNDERFLOW(a, b, cpu->RREG_NUM(i, 0));
- cpu->CPSR.bits.V = SIGNED_UNDERFLOW(a, b, cpu->RREG_NUM(i, 0));
+	cpu->RREG_NUM(i, 0) = 0;
+	cpu->CPSR.bits.N = 0;
+	cpu->CPSR.bits.Z = 1;
 
- return 3;
+	return 2;
 }
 
-static u32 FASTCALL OP_ADD_IMM3(armcpu_t *cpu)
+//-----------------------------------------------------------------------------
+// ASR
+//-----------------------------------------------------------------------------
+
+TEMPLATE static uint32_t FASTCALL OP_ASR_0(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 a = cpu->RREG_NUM(i, 3);
- cpu->RREG_NUM(i, 0) = a + REG_NUM(i, 6);
- cpu->CPSR.bits.N = BIT31(cpu->RREG_NUM(i, 0));
- cpu->CPSR.bits.Z = cpu->RREG_NUM(i, 0) == 0;
- cpu->CPSR.bits.C = UNSIGNED_OVERFLOW(a, REG_NUM(i, 6), cpu->RREG_NUM(i, 0));
- cpu->CPSR.bits.V = SIGNED_OVERFLOW(a, REG_NUM(i, 6), cpu->RREG_NUM(i, 0));
+	cpu->CPSR.bits.C = BIT31(cpu->RREG_NUM(i, 3));
+	cpu->RREG_NUM(i, 0) = BIT31(cpu->RREG_NUM(i, 3)) * 0xFFFFFFFF;
+	cpu->CPSR.bits.N = BIT31(cpu->RREG_NUM(i, 0));
+	cpu->CPSR.bits.Z = !cpu->RREG_NUM(i, 0);
 
- return 2;
+	return 1;
 }
 
-static u32 FASTCALL OP_SUB_IMM3(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_ASR(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 a = cpu->RREG_NUM(i, 3);
- cpu->RREG_NUM(i, 0) = a - REG_NUM(i, 6);
- cpu->CPSR.bits.N = BIT31(cpu->RREG_NUM(i, 0));
- cpu->CPSR.bits.Z = cpu->RREG_NUM(i, 0) == 0;
- cpu->CPSR.bits.C = !UNSIGNED_UNDERFLOW(a, REG_NUM(i, 6), cpu->RREG_NUM(i, 0));
- cpu->CPSR.bits.V = SIGNED_UNDERFLOW(a, REG_NUM(i, 6), cpu->RREG_NUM(i, 0));
+	uint32_t v = (i >> 6) & 0x1F;
+	cpu->CPSR.bits.C = BIT_N(cpu->RREG_NUM(i, 3), v-1);
+	cpu->RREG_NUM(i, 0) = static_cast<uint32_t>(static_cast<int32_t>(cpu->RREG_NUM(i, 3)) >> v);
+	cpu->CPSR.bits.N = BIT31(cpu->RREG_NUM(i, 0));
+	cpu->CPSR.bits.Z = !cpu->RREG_NUM(i, 0);
 
- return 2;
+	return 1;
 }
 
-static u32 FASTCALL OP_MOV_IMM8(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_ASR_REG(uint32_t i)
 {
- u32 i = cpu->instruction;
- cpu->RREG_NUM(i, 8) = i & 0xFF;
- cpu->CPSR.bits.N = BIT31(cpu->RREG_NUM(i, 8));
- cpu->CPSR.bits.Z = cpu->RREG_NUM(i, 8) == 0;
+	uint32_t v = cpu->RREG_NUM(i, 3) & 0xFF;
+
+	if (!v)
+	{
+		cpu->CPSR.bits.N = BIT31(cpu->RREG_NUM(i, 0));
+		cpu->CPSR.bits.Z = !cpu->RREG_NUM(i, 0);
+		return 2;
+	}
+	if (v < 32)
+	{
+		cpu->CPSR.bits.C = BIT_N(cpu->RREG_NUM(i, 0), v - 1);
+		cpu->RREG_NUM(i, 0) = static_cast<uint32_t>(static_cast<int32_t>(cpu->RREG_NUM(i, 0)) >> v);
+		cpu->CPSR.bits.N = BIT31(cpu->RREG_NUM(i, 0));
+		cpu->CPSR.bits.Z = !cpu->RREG_NUM(i, 0);
+		return 2;
+	}
+
+	cpu->CPSR.bits.C = BIT31(cpu->RREG_NUM(i, 0));
+	cpu->RREG_NUM(i, 0) = BIT31(cpu->RREG_NUM(i, 0)) * 0xFFFFFFFF;
+	cpu->CPSR.bits.N = BIT31(cpu->RREG_NUM(i, 0));
+	cpu->CPSR.bits.Z = !cpu->RREG_NUM(i, 0);
 
- return 2;
+	return 2;
 }
 
-static u32 FASTCALL OP_CMP_IMM8(armcpu_t *cpu)
+//-----------------------------------------------------------------------------
+// ADD
+//-----------------------------------------------------------------------------
+
+TEMPLATE static uint32_t FASTCALL OP_ADD_IMM3(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 tmp = cpu->RREG_NUM(i, 8) - (i & 0xFF);
- cpu->CPSR.bits.N = BIT31(tmp);
- cpu->CPSR.bits.Z = tmp == 0;
- cpu->CPSR.bits.C = !UNSIGNED_UNDERFLOW(cpu->RREG_NUM(i, 8), (i & 0xFF), tmp);
- cpu->CPSR.bits.V = SIGNED_UNDERFLOW(cpu->RREG_NUM(i, 8), (i & 0xFF), tmp);
+	uint32_t imm3 = (i >> 6) & 0x07;
+	uint32_t Rn = cpu->RREG_NUM(i, 3);
+
+	if (!imm3) // mov 2
+	{
+		cpu->RREG_NUM(i, 0) = Rn;
+
+		cpu->CPSR.bits.N = BIT31(cpu->RREG_NUM(i, 0));
+		cpu->CPSR.bits.Z = !cpu->RREG_NUM(i, 0);
+		cpu->CPSR.bits.C = cpu->CPSR.bits.V = 0;
+		return 1;
+	}
 
- return 2;
+	cpu->RREG_NUM(i, 0) = Rn + imm3;
+	cpu->CPSR.bits.N = BIT31(cpu->RREG_NUM(i, 0));
+	cpu->CPSR.bits.Z = !cpu->RREG_NUM(i, 0);
+	cpu->CPSR.bits.C = CarryFrom(Rn, imm3);
+	cpu->CPSR.bits.V = OverflowFromADD(cpu->RREG_NUM(i, 0), Rn, imm3);
+
+	return 1;
 }
 
-static u32 FASTCALL OP_ADD_IMM8(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_ADD_IMM8(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 tmp = cpu->RREG_NUM(i, 8) + (i & 0xFF);
- cpu->CPSR.bits.N = BIT31(tmp);
- cpu->CPSR.bits.Z = tmp == 0;
- cpu->CPSR.bits.C = UNSIGNED_OVERFLOW(cpu->RREG_NUM(i, 8), (i & 0xFF), tmp);
- cpu->CPSR.bits.V = SIGNED_OVERFLOW(cpu->RREG_NUM(i, 8), (i & 0xFF), tmp);
- cpu->RREG_NUM(i, 8) = tmp;
+	uint32_t imm8 = i & 0xFF;
+	uint32_t Rd = cpu->RREG_NUM(i, 8);
+
+	cpu->RREG_NUM(i, 8) = Rd + imm8;
+	cpu->CPSR.bits.N = BIT31(cpu->RREG_NUM(i, 8));
+	cpu->CPSR.bits.Z = !cpu->RREG_NUM(i, 8);
+	cpu->CPSR.bits.C = CarryFrom(Rd, imm8);
+	cpu->CPSR.bits.V = OverflowFromADD(cpu->RREG_NUM(i, 8), Rd, imm8);
 
- return 2;
+	return 1;
 }
 
-static u32 FASTCALL OP_SUB_IMM8(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_ADD_REG(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 tmp = cpu->RREG_NUM(i, 8) - (i & 0xFF);
- cpu->CPSR.bits.N = BIT31(tmp);
- cpu->CPSR.bits.Z = tmp == 0;
- cpu->CPSR.bits.C = !UNSIGNED_UNDERFLOW(cpu->RREG_NUM(i, 8), (i & 0xFF), tmp);
- cpu->CPSR.bits.V = SIGNED_UNDERFLOW(cpu->RREG_NUM(i, 8), (i & 0xFF), tmp);
- cpu->RREG_NUM(i, 8) = tmp;
+	uint32_t Rn = cpu->RREG_NUM(i, 3);
+	uint32_t Rm = cpu->RREG_NUM(i, 6);
 
- return 2;
+	cpu->RREG_NUM(i, 0) = Rn + Rm;
+	cpu->CPSR.bits.N = BIT31(cpu->RREG_NUM(i, 0));
+	cpu->CPSR.bits.Z = !cpu->RREG_NUM(i, 0);
+	cpu->CPSR.bits.C = CarryFrom(Rn, Rm);
+	cpu->CPSR.bits.V = OverflowFromADD(cpu->RREG_NUM(i, 0), Rn, Rm);
+
+	return 1;
 }
 
-static u32 FASTCALL OP_AND(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_ADD_SPE(uint32_t i)
 {
- u32 i = cpu->instruction;
- cpu->RREG_NUM(i, 0) &= cpu->RREG_NUM(i, 3);
- cpu->CPSR.bits.N = BIT31(cpu->RREG_NUM(i, 0));
- cpu->CPSR.bits.Z = cpu->RREG_NUM(i, 0) == 0;
+	uint32_t Rd = REG_NUM(i, 0) | ((i >> 4) & 8);
+
+	cpu->RRd += cpu->RREG_POS(i, 3);
+
+	if (Rd == 15)
+	{
+		cpu->next_instruction = cpu->R15;
+		return 3;
+	}
 
- return 3;
+	return 1;
 }
 
-static u32 FASTCALL OP_EOR(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_ADD_2PC(uint32_t i)
 {
- u32 i = cpu->instruction;
- cpu->RREG_NUM(i, 0) ^= cpu->RREG_NUM(i, 3);
- cpu->CPSR.bits.N = BIT31(cpu->RREG_NUM(i, 0));
- cpu->CPSR.bits.Z = cpu->RREG_NUM(i, 0) == 0;
+	cpu->RREG_NUM(i, 8) = (cpu->R15 & 0xFFFFFFFC) + ((i & 0xFF) << 2);
 
- return 3;
+	return 1;
 }
 
-static u32 FASTCALL OP_LSL_REG(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_ADD_2SP(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 v = cpu->RREG_NUM(i, 3)&0xFF;
+	cpu->RREG_NUM(i, 8) = cpu->R13 + ((i & 0xFF) << 2);
 
- if(!v)
- {
- cpu->CPSR.bits.N = BIT31(cpu->RREG_NUM(i, 0));
- cpu->CPSR.bits.Z = cpu->RREG_NUM(i, 0) == 0;
- return 3;
- }
- if(v<32)
- {
- cpu->CPSR.bits.C = BIT_N(cpu->RREG_NUM(i, 0), 32-v);
- cpu->RREG_NUM(i, 0) <<= v;
- cpu->CPSR.bits.N = BIT31(cpu->RREG_NUM(i, 0));
- cpu->CPSR.bits.Z = cpu->RREG_NUM(i, 0) == 0;
- return 3;
- }
- if(v==32)
- cpu->CPSR.bits.C = BIT0(cpu->RREG_NUM(i, 0));
- else
- cpu->CPSR.bits.C = 0;
- cpu->RREG_NUM(i, 0) = 0;
- cpu->CPSR.bits.N = 0;
- cpu->CPSR.bits.Z = 1;
-
- return 3;
+	return 1;
 }
 
-static u32 FASTCALL OP_LSR_REG(armcpu_t *cpu)
+//-----------------------------------------------------------------------------
+// SUB
+//-----------------------------------------------------------------------------
+
+TEMPLATE static uint32_t FASTCALL OP_SUB_IMM3(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 v = cpu->RREG_NUM(i, 3)&0xFF;
+	uint32_t imm3 = (i >> 6) & 0x07;
+	uint32_t Rn = cpu->RREG_NUM(i, 3);
+	uint32_t tmp = Rn - imm3;
 
- if(!v)
- {
- cpu->CPSR.bits.N = BIT31(cpu->RREG_NUM(i, 0));
- cpu->CPSR.bits.Z = cpu->RREG_NUM(i, 0) == 0;
- return 3;
- }
- if(v<32)
- {
- cpu->CPSR.bits.C = BIT_N(cpu->RREG_NUM(i, 0), v-1);
- cpu->RREG_NUM(i, 0) >>= v;
- cpu->CPSR.bits.N = BIT31(cpu->RREG_NUM(i, 0));
- cpu->CPSR.bits.Z = cpu->RREG_NUM(i, 0) == 0;
- return 3;
- }
- if(v==32)
- cpu->CPSR.bits.C = BIT31(cpu->RREG_NUM(i, 0));
- else
- cpu->CPSR.bits.C = 0;
- cpu->RREG_NUM(i, 0) = 0;
- cpu->CPSR.bits.N = 0;
- cpu->CPSR.bits.Z = 1;
+	cpu->RREG_NUM(i, 0) = tmp;
+	cpu->CPSR.bits.N = BIT31(tmp);
+	cpu->CPSR.bits.Z = !tmp;
+	cpu->CPSR.bits.C = !BorrowFrom(Rn, imm3);
+	cpu->CPSR.bits.V = OverflowFromSUB(tmp, Rn, imm3);
 
- return 3;
+	return 1;
 }
 
-static u32 FASTCALL OP_ASR_REG(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_SUB_IMM8(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 v = cpu->RREG_NUM(i, 3)&0xFF;
+	uint32_t imm8 = i & 0xFF;
+	uint32_t Rd = cpu->RREG_NUM(i, 8);
+	uint32_t tmp = Rd - imm8;
 
- if(!v)
- {
- cpu->CPSR.bits.N = BIT31(cpu->RREG_NUM(i, 0));
- cpu->CPSR.bits.Z = cpu->RREG_NUM(i, 0) == 0;
- return 3;
- }
- if(v<32)
- {
- cpu->CPSR.bits.C = BIT_N(cpu->RREG_NUM(i, 0), v-1);
- cpu->RREG_NUM(i, 0) = (u32)(((s32)cpu->RREG_NUM(i, 0)) >> v);
- cpu->CPSR.bits.N = BIT31(cpu->RREG_NUM(i, 0));
- cpu->CPSR.bits.Z = cpu->RREG_NUM(i, 0) == 0;
- return 3;
- }
+	cpu->RREG_NUM(i, 8) = tmp;
+	cpu->CPSR.bits.N = BIT31(tmp);
+	cpu->CPSR.bits.Z = !tmp;
+	cpu->CPSR.bits.C = !BorrowFrom(Rd, imm8);
+	cpu->CPSR.bits.V = OverflowFromSUB(tmp, Rd, imm8);
 
- cpu->CPSR.bits.C = BIT31(cpu->RREG_NUM(i, 0));
- cpu->RREG_NUM(i, 0) = BIT31(cpu->RREG_NUM(i, 0))*0xFFFFFFFF;
- cpu->CPSR.bits.N = BIT31(cpu->RREG_NUM(i, 0));
- cpu->CPSR.bits.Z = cpu->RREG_NUM(i, 0) == 0;
-
- return 3;
+	return 1;
 }
 
-static u32 FASTCALL OP_ADC_REG(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_SUB_REG(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 a = cpu->RREG_NUM(i, 0);
- u32 b = cpu->RREG_NUM(i, 3);
- u32 tmp = b + cpu->CPSR.bits.C;
- u32 res = a + tmp;
+	uint32_t Rn = cpu->RREG_NUM(i, 3);
+	uint32_t Rm = cpu->RREG_NUM(i, 6);
+	uint32_t tmp = Rn - Rm;
 
- cpu->RREG_NUM(i, 0) = res;
+	cpu->RREG_NUM(i, 0) = tmp;
+	cpu->CPSR.bits.N = BIT31(tmp);
+	cpu->CPSR.bits.Z = !tmp;
+	cpu->CPSR.bits.C = !BorrowFrom(Rn, Rm);
+	cpu->CPSR.bits.V = OverflowFromSUB(tmp, Rn, Rm);
 
- cpu->CPSR.bits.N = BIT31(res);
- cpu->CPSR.bits.Z = res == 0;
+	return 1;
+}
 
- cpu->CPSR.bits.C = UNSIGNED_OVERFLOW(b, cpu->CPSR.bits.C, tmp) | UNSIGNED_OVERFLOW(tmp, a, res);
- cpu->CPSR.bits.V = SIGNED_OVERFLOW(b, cpu->CPSR.bits.C, tmp) | SIGNED_OVERFLOW(tmp, a, res);
+//-----------------------------------------------------------------------------
+// MOV
+//-----------------------------------------------------------------------------
 
- return 3;
+TEMPLATE static uint32_t FASTCALL OP_MOV_IMM8(uint32_t i)
+{
+	cpu->RREG_NUM(i, 8) = i & 0xFF;
+	cpu->CPSR.bits.N = BIT31(cpu->RREG_NUM(i, 8));
+	cpu->CPSR.bits.Z = !cpu->RREG_NUM(i, 8);
+
+	return 1;
 }
 
-static u32 FASTCALL OP_SBC_REG(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_MOV_SPE(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 a = cpu->RREG_NUM(i, 0);
- u32 b = cpu->RREG_NUM(i, 3);
- u32 tmp = a - (!cpu->CPSR.bits.C);
- u32 res = tmp - b;
- cpu->RREG_NUM(i, 0) = res;
+	uint32_t Rd = REG_NUM(i, 0) | ((i >> 4) & 8);
 
- cpu->CPSR.bits.N = BIT31(res);
- cpu->CPSR.bits.Z = res == 0;
+	cpu->RRd = cpu->RREG_POS(i, 3);
 
- cpu->CPSR.bits.C = (!UNSIGNED_UNDERFLOW(a, !cpu->CPSR.bits.C, tmp)) & (!UNSIGNED_OVERFLOW(tmp, b, res));
- cpu->CPSR.bits.V = SIGNED_UNDERFLOW(a, !cpu->CPSR.bits.C, tmp) | SIGNED_OVERFLOW(tmp, b, res);
+	if (Rd == 15)
+	{
+		cpu->next_instruction = cpu->R15;
+		return 3;
+	}
 
- return 3;
+	return 1;
 }
 
-static u32 FASTCALL OP_ROR_REG(armcpu_t *cpu)
+//-----------------------------------------------------------------------------
+// CMP
+//-----------------------------------------------------------------------------
+TEMPLATE static uint32_t FASTCALL OP_CMP_IMM8(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 v = cpu->RREG_NUM(i, 3)&0xFF;
+	uint32_t tmp = cpu->RREG_NUM(i, 8) - (i & 0xFF);
 
- if(v == 0)
- {
- cpu->CPSR.bits.N = BIT31(cpu->RREG_NUM(i, 0));
- cpu->CPSR.bits.Z = cpu->RREG_NUM(i, 0) == 0;
- return 3;
- }
- v &= 0xF;
- if(v == 0)
- {
- cpu->CPSR.bits.C = BIT31(cpu->RREG_NUM(i, 0));
- cpu->CPSR.bits.N = BIT31(cpu->RREG_NUM(i, 0));
- cpu->CPSR.bits.Z = cpu->RREG_NUM(i, 0) == 0;
- return 3;
- }
- cpu->CPSR.bits.C = BIT_N(cpu->RREG_NUM(i, 0), v-1);
- cpu->RREG_NUM(i, 0) = ROR(cpu->RREG_NUM(i, 0), v);
- cpu->CPSR.bits.N = BIT31(cpu->RREG_NUM(i, 0));
- cpu->CPSR.bits.Z = cpu->RREG_NUM(i, 0) == 0;
+	cpu->CPSR.bits.N = BIT31(tmp);
+	cpu->CPSR.bits.Z = !tmp;
+	cpu->CPSR.bits.C = !BorrowFrom(cpu->RREG_NUM(i, 8), i & 0xFF);
+	cpu->CPSR.bits.V = OverflowFromSUB(tmp, cpu->RREG_NUM(i, 8), i & 0xFF);
 
- return 3;
+	return 1;
 }
 
-static u32 FASTCALL OP_TST(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_CMP(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 tmp = cpu->RREG_NUM(i, 0) & cpu->RREG_NUM(i, 3);
- cpu->CPSR.bits.N = BIT31(tmp);
- cpu->CPSR.bits.Z = tmp == 0;
+	uint32_t tmp = cpu->RREG_NUM(i, 0) - cpu->RREG_NUM(i, 3);
+
+	cpu->CPSR.bits.N = BIT31(tmp);
+	cpu->CPSR.bits.Z = !tmp;
+	cpu->CPSR.bits.C = !BorrowFrom(cpu->RREG_NUM(i, 0), cpu->RREG_NUM(i, 3));
+	cpu->CPSR.bits.V = OverflowFromSUB(tmp, cpu->RREG_NUM(i, 0), cpu->RREG_NUM(i, 3));
 
- return 3;
+	return 1;
 }
 
-static u32 FASTCALL OP_NEG(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_CMP_SPE(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 a = cpu->RREG_NUM(i, 3);
- cpu->RREG_NUM(i, 0) = -((signed int)a);
+	uint32_t Rn = (i & 7) | ((i >> 4) & 8);
 
- cpu->CPSR.bits.N = BIT31(cpu->RREG_NUM(i, 0));
- cpu->CPSR.bits.Z = cpu->RREG_NUM(i, 0) == 0;
- cpu->CPSR.bits.C = !UNSIGNED_UNDERFLOW(0, a, cpu->RREG_NUM(i, 0));
- cpu->CPSR.bits.V = SIGNED_UNDERFLOW(0, a, cpu->RREG_NUM(i, 0));
+	uint32_t tmp = cpu->RRn - cpu->RREG_POS(i, 3);
 
- return 3;
+	cpu->CPSR.bits.N = BIT31(tmp);
+	cpu->CPSR.bits.Z = !tmp;
+	cpu->CPSR.bits.C = !BorrowFrom(cpu->RRn, cpu->RREG_POS(i, 3));
+	cpu->CPSR.bits.V = OverflowFromSUB(tmp, cpu->RRn, cpu->RREG_POS(i, 3));
+
+	return 1;
 }
 
-static u32 FASTCALL OP_CMP(armcpu_t *cpu)
+//-----------------------------------------------------------------------------
+// AND
+//-----------------------------------------------------------------------------
+
+TEMPLATE static uint32_t FASTCALL OP_AND(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 tmp = cpu->RREG_NUM(i, 0) -cpu->RREG_NUM(i, 3);
+	cpu->RREG_NUM(i, 0) &= cpu->RREG_NUM(i, 3);
+	cpu->CPSR.bits.N = BIT31(cpu->RREG_NUM(i, 0));
+	cpu->CPSR.bits.Z = !cpu->RREG_NUM(i, 0);
+	return 1;
+}
 
- cpu->CPSR.bits.N = BIT31(tmp);
- cpu->CPSR.bits.Z = tmp == 0;
- cpu->CPSR.bits.C = !UNSIGNED_UNDERFLOW(cpu->RREG_NUM(i, 0), cpu->RREG_NUM(i, 3), tmp);
- cpu->CPSR.bits.V = SIGNED_UNDERFLOW(cpu->RREG_NUM(i, 0), cpu->RREG_NUM(i, 3), tmp);
+//-----------------------------------------------------------------------------
+// EOR
+//-----------------------------------------------------------------------------
+
+TEMPLATE static uint32_t FASTCALL OP_EOR(uint32_t i)
+{
+	cpu->RREG_NUM(i, 0) ^= cpu->RREG_NUM(i, 3);
+	cpu->CPSR.bits.N = BIT31(cpu->RREG_NUM(i, 0));
+	cpu->CPSR.bits.Z = !cpu->RREG_NUM(i, 0);
 
- return 3;
+	return 1;
 }
 
-static u32 FASTCALL OP_CMN(armcpu_t *cpu)
+//-----------------------------------------------------------------------------
+// ADC
+//-----------------------------------------------------------------------------
+
+TEMPLATE static uint32_t FASTCALL OP_ADC_REG(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 tmp = cpu->RREG_NUM(i, 0) + cpu->RREG_NUM(i, 3);
+	uint32_t Rd = cpu->RREG_NUM(i, 0);
+	uint32_t Rm = cpu->RREG_NUM(i, 3);
 
- //execute = false;
- //log::ajouter("OP_CMN THUMB");
- cpu->CPSR.bits.N = BIT31(tmp);
- cpu->CPSR.bits.Z = tmp == 0;
- cpu->CPSR.bits.C = UNSIGNED_OVERFLOW(cpu->RREG_NUM(i, 0), cpu->RREG_NUM(i, 3), tmp);
- cpu->CPSR.bits.V = SIGNED_OVERFLOW(cpu->RREG_NUM(i, 0), cpu->RREG_NUM(i, 3), tmp);
+	if (!cpu->CPSR.bits.C)
+	{
+		cpu->RREG_NUM(i, 0) = Rd + Rm;
+		cpu->CPSR.bits.C = cpu->RREG_NUM(i, 0) < Rm;
+	}
+	else
+	{
+		cpu->RREG_NUM(i, 0) = Rd + Rm + 1;
+		cpu->CPSR.bits.C = cpu->RREG_NUM(i, 0) <= Rm;
+	}
+	cpu->CPSR.bits.N = BIT31(cpu->RREG_NUM(i, 0));
+	cpu->CPSR.bits.Z = !cpu->RREG_NUM(i, 0);
+	cpu->CPSR.bits.V = BIT31((Rd ^ Rm ^ -1) & (Rd ^ cpu->RREG_NUM(i, 0)));
 
- return 3;
+	return 1;
 }
 
-static u32 FASTCALL OP_ORR(armcpu_t *cpu)
+//-----------------------------------------------------------------------------
+// SBC
+//-----------------------------------------------------------------------------
+
+TEMPLATE static uint32_t FASTCALL OP_SBC_REG(uint32_t i)
 {
- u32 i = cpu->instruction;
- cpu->RREG_NUM(i, 0) |= cpu->RREG_NUM(i, 3);
- cpu->CPSR.bits.N = BIT31(cpu->RREG_NUM(i, 0));
- cpu->CPSR.bits.Z = cpu->RREG_NUM(i, 0) == 0;
+	uint32_t Rd = cpu->RREG_NUM(i, 0);
+	uint32_t Rm = cpu->RREG_NUM(i, 3);
 
- return 3;
-}
+	if (!cpu->CPSR.bits.C)
+	{
+		cpu->RREG_NUM(i, 0) = Rd - Rm - 1;
+		cpu->CPSR.bits.C = Rd > Rm;
+	}
+	else
+	{
+		cpu->RREG_NUM(i, 0) = Rd - Rm;
+		cpu->CPSR.bits.C = Rd >= Rm;
+	}
 
-static u32 FASTCALL OP_MUL_REG(armcpu_t *cpu)
-{
- u32 i = cpu->instruction;
- cpu->RREG_NUM(i, 0) *= cpu->RREG_NUM(i, 3);
- cpu->CPSR.bits.N = BIT31(cpu->RREG_NUM(i, 0));
- cpu->CPSR.bits.Z = cpu->RREG_NUM(i, 0) == 0;
+	cpu->CPSR.bits.N = BIT31(cpu->RREG_NUM(i, 0));
+	cpu->CPSR.bits.Z = !cpu->RREG_NUM(i, 0);
+	cpu->CPSR.bits.V = BIT31((Rd ^ Rm) & (Rd ^ cpu->RREG_NUM(i, 0)));
 
- return 3;
+	return 1;
 }
 
-static u32 FASTCALL OP_BIC(armcpu_t *cpu)
+//-----------------------------------------------------------------------------
+// ROR
+//-----------------------------------------------------------------------------
+
+TEMPLATE static uint32_t FASTCALL OP_ROR_REG(uint32_t i)
 {
- u32 i = cpu->instruction;
- cpu->RREG_NUM(i, 0) &= (~cpu->RREG_NUM(i, 3));
- cpu->CPSR.bits.N = BIT31(cpu->RREG_NUM(i, 0));
- cpu->CPSR.bits.Z = cpu->RREG_NUM(i, 0) == 0;
+	uint32_t v = cpu->RREG_NUM(i, 3) & 0xFF;
 
- return 3;
+	if (!v)
+	{
+		cpu->CPSR.bits.N = BIT31(cpu->RREG_NUM(i, 0));
+		cpu->CPSR.bits.Z = !cpu->RREG_NUM(i, 0);
+		return 2;
+	}
+
+	v &= 0x1F;
+	if (!v)
+	{
+		cpu->CPSR.bits.C = BIT31(cpu->RREG_NUM(i, 0));
+		cpu->CPSR.bits.N = BIT31(cpu->RREG_NUM(i, 0));
+		cpu->CPSR.bits.Z = !cpu->RREG_NUM(i, 0);
+		return 2;
+	}
+
+	cpu->CPSR.bits.C = BIT_N(cpu->RREG_NUM(i, 0), v - 1);
+	cpu->RREG_NUM(i, 0) = ROR(cpu->RREG_NUM(i, 0), v);
+	cpu->CPSR.bits.N = BIT31(cpu->RREG_NUM(i, 0));
+	cpu->CPSR.bits.Z = !cpu->RREG_NUM(i, 0);
+
+	return 2;
 }
 
-static u32 FASTCALL OP_MVN(armcpu_t *cpu)
+//-----------------------------------------------------------------------------
+// TST
+//-----------------------------------------------------------------------------
+
+TEMPLATE static uint32_t FASTCALL OP_TST(uint32_t i)
 {
- u32 i = cpu->instruction;
- cpu->RREG_NUM(i, 0) = (~cpu->RREG_NUM(i, 3));
- cpu->CPSR.bits.N = BIT31(cpu->RREG_NUM(i, 0));
- cpu->CPSR.bits.Z = cpu->RREG_NUM(i, 0) == 0;
+	uint32_t tmp = cpu->RREG_NUM(i, 0) & cpu->RREG_NUM(i, 3);
+	cpu->CPSR.bits.N = BIT31(tmp);
+	cpu->CPSR.bits.Z = !tmp;
 
- return 3;
+	return 1;
 }
 
-static u32 FASTCALL OP_ADD_SPE(armcpu_t *cpu)
+//-----------------------------------------------------------------------------
+// NEG
+//-----------------------------------------------------------------------------
+
+TEMPLATE static uint32_t FASTCALL OP_NEG(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 Rd = (i&7) | ((i>>4)&8);
- cpu->RRd += cpu->RREG_POS(i, 3);
+	uint32_t Rm = cpu->RREG_NUM(i, 3);
 
- if(Rd==15)
- cpu->next_instruction = cpu->R15;
+	cpu->RREG_NUM(i, 0) = static_cast<uint32_t>(-static_cast<int32_t>(Rm));
 
- return 2;
+	cpu->CPSR.bits.N = BIT31(cpu->RREG_NUM(i, 0));
+	cpu->CPSR.bits.Z = !cpu->RREG_NUM(i, 0);
+	cpu->CPSR.bits.C = !BorrowFrom(0, Rm);
+	cpu->CPSR.bits.V = OverflowFromSUB(cpu->RREG_NUM(i, 0), 0, Rm);
+
+	return 1;
 }
 
-static u32 FASTCALL OP_CMP_SPE(armcpu_t *cpu)
+//-----------------------------------------------------------------------------
+// CMN
+//-----------------------------------------------------------------------------
+
+TEMPLATE static uint32_t FASTCALL OP_CMN(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 Rn = (i&7) | ((i>>4)&8);
- u32 tmp = cpu->RRn -cpu->RREG_POS(i, 3);
+	uint32_t tmp = cpu->RREG_NUM(i, 0) + cpu->RREG_NUM(i, 3);
 
- cpu->CPSR.bits.N = BIT31(tmp);
- cpu->CPSR.bits.Z = tmp == 0;
- cpu->CPSR.bits.C = !UNSIGNED_UNDERFLOW(cpu->RRn, cpu->RREG_POS(i, 3), tmp);
- cpu->CPSR.bits.V = SIGNED_UNDERFLOW(cpu->RRn, cpu->RREG_POS(i, 3), tmp);
+	cpu->CPSR.bits.N = BIT31(tmp);
+	cpu->CPSR.bits.Z = !tmp;
+	cpu->CPSR.bits.C = CarryFrom(cpu->RREG_NUM(i, 0), cpu->RREG_NUM(i, 3));
+	cpu->CPSR.bits.V = OverflowFromADD(tmp, cpu->RREG_NUM(i, 0), cpu->RREG_NUM(i, 3));
 
- return 3;
+	return 1;
 }
 
-static u32 FASTCALL OP_MOV_SPE(armcpu_t *cpu)
+//-----------------------------------------------------------------------------
+// ORR
+//-----------------------------------------------------------------------------
+
+TEMPLATE static uint32_t FASTCALL OP_ORR(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 Rd = (i&7) | ((i>>4)&8);
- cpu->RRd = cpu->RREG_POS(i, 3);
+	cpu->RREG_NUM(i, 0) |= cpu->RREG_NUM(i, 3);
 
- if(Rd==15)
- cpu->next_instruction = cpu->R15;
+	cpu->CPSR.bits.N = BIT31(cpu->RREG_NUM(i, 0));
+	cpu->CPSR.bits.Z = !cpu->RREG_NUM(i, 0);
 
- return 2;
+	return 1;
 }
 
-static u32 FASTCALL OP_BX_THUMB(armcpu_t *cpu)
+//-----------------------------------------------------------------------------
+// BIC
+//-----------------------------------------------------------------------------
+
+TEMPLATE static uint32_t FASTCALL OP_BIC(uint32_t i)
 {
- u32 Rm = cpu->RREG_POS(cpu->instruction, 3);
+	cpu->RREG_NUM(i, 0) &= ~cpu->RREG_NUM(i, 3);
 
- cpu->CPSR.bits.T = BIT0(Rm);
- cpu->R15 = (Rm & 0xFFFFFFFE);
- cpu->next_instruction = cpu->R15;
+	cpu->CPSR.bits.N = BIT31(cpu->RREG_NUM(i, 0));
+	cpu->CPSR.bits.Z = !cpu->RREG_NUM(i, 0);
 
- return 3;
+	return 1;
 }
 
-static u32 FASTCALL OP_BLX_THUMB(armcpu_t *cpu)
+//-----------------------------------------------------------------------------
+// MVN
+//-----------------------------------------------------------------------------
+
+TEMPLATE static uint32_t FASTCALL OP_MVN(uint32_t i)
 {
- u32 Rm = cpu->RREG_POS(cpu->instruction, 3);
+	cpu->RREG_NUM(i, 0) = ~cpu->RREG_NUM(i, 3);
 
- cpu->CPSR.bits.T = BIT0(Rm);
- cpu->R14 = cpu->next_instruction | 1;
- cpu->R15 = (Rm & 0xFFFFFFFE);
- cpu->next_instruction = cpu->R15;
+	cpu->CPSR.bits.N = BIT31(cpu->RREG_NUM(i, 0));
+	cpu->CPSR.bits.Z = !cpu->RREG_NUM(i, 0);
 
- return 3;
+	return 1;
 }
 
-static u32 FASTCALL OP_LDR_PCREL(armcpu_t *cpu)
+//-----------------------------------------------------------------------------
+// MUL
+//-----------------------------------------------------------------------------
+
+#define MUL_Mxx_END_THUMB(c) \
+	v >>= 8; \
+	if (!v || v == 0xFFFFFF) \
+		return c + 1; \
+	v >>= 8; \
+	if (!v || v == 0xFFFF) \
+		return c + 2; \
+	v >>= 8; \
+	if (!v || v == 0xFF) \
+		return c + 3; \
+	return c + 4;
+
+TEMPLATE static uint32_t FASTCALL OP_MUL_REG(uint32_t i)
 {
-	u32 adr = (cpu->R15&0xFFFFFFFC) + ((cpu->instruction&0xFF)<<2);
+	uint32_t v = cpu->RREG_NUM(i, 3);
 
- cpu->RREG_NUM(cpu->instruction, 8) = READ32(cpu->mem_if->data, adr);
+	// FIXME:
+	//------ Rd = (Rm * Rd)31:0
+	//------ u64 res = ((u64)cpu->RREG_NUM(i, 0) * (u64)v));
+	//------ cpu->RREG_NUM(i, 0) = (uint32_t)(res & 0xFFFFFFFF);
+	//------
 
- return 3 + MMU.MMU_WAIT32cpu->proc_ID(adr>>24)&0xF;
-}
+	cpu->RREG_NUM(i, 0) *= v;
+	cpu->CPSR.bits.N = BIT31(cpu->RREG_NUM(i, 0));
+	cpu->CPSR.bits.Z = !cpu->RREG_NUM(i, 0);
+	//The MUL instruction is defined to leave the C flag unchanged in ARMv5 and above.
+	//In earlier versions of the architecture, the value of the C flag was UNPREDICTABLE
+	//after a MUL instruction.
 
-static u32 FASTCALL OP_STR_REG_OFF(armcpu_t *cpu)
-{
- u32 i = cpu->instruction;
- u32 adr = cpu->RREG_NUM(i, 6) + cpu->RREG_NUM(i, 3);
- WRITE32(cpu->mem_if->data, adr, cpu->RREG_NUM(i, 0));
+	if (PROCNUM == 1) // ARM4T 1S + mI, m = 3
+		return 4;
 
- return 2 + MMU.MMU_WAIT32cpu->proc_ID(adr>>24)&0xF;
+	MUL_Mxx_END_THUMB(1);
 }
 
-static u32 FASTCALL OP_STRH_REG_OFF(armcpu_t *cpu)
+//-----------------------------------------------------------------------------
+// STRB / LDRB
+//-----------------------------------------------------------------------------
+
+TEMPLATE static uint32_t FASTCALL OP_STRB_IMM_OFF(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 adr = cpu->RREG_NUM(i, 3) + cpu->RREG_NUM(i, 6);
- WRITE16(cpu->mem_if->data, adr, ((u16)cpu->RREG_NUM(i, 0)));
+	uint32_t adr = cpu->RREG_NUM(i, 3) + ((i >> 6) & 0x1F);
+	WRITE8(cpu->mem_if->data, adr, static_cast<uint8_t>(cpu->RREG_NUM(i, 0)));
 
- return 2 + MMU.MMU_WAIT16cpu->proc_ID(adr>>24)&0xF;
+	return MMU_aluMemAccessCycles<PROCNUM, 8, MMU_AD_WRITE>(2, adr);
 }
 
-static u32 FASTCALL OP_STRB_REG_OFF(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_LDRB_IMM_OFF(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 adr = cpu->RREG_NUM(i, 3) + cpu->RREG_NUM(i, 6);
- WRITE8(cpu->mem_if->data, adr, ((u8)cpu->RREG_NUM(i, 0)));
+	uint32_t adr = cpu->RREG_NUM(i, 3) + ((i>>6)&0x1F);
+	cpu->RREG_NUM(i, 0) = static_cast<uint32_t>(READ8(cpu->mem_if->data, adr));
 
- return 2 + MMU.MMU_WAIT16cpu->proc_ID(adr>>24)&0xF;
+	return MMU_aluMemAccessCycles<PROCNUM, 8, MMU_AD_READ>(3, adr);
 }
 
-static u32 FASTCALL OP_LDRSB_REG_OFF(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_STRB_REG_OFF(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 adr = cpu->RREG_NUM(i, 3) + cpu->RREG_NUM(i, 6);
- cpu->RREG_NUM(i, 0) = (s32)((s8)READ8(cpu->mem_if->data, adr));
+	uint32_t adr = cpu->RREG_NUM(i, 3) + cpu->RREG_NUM(i, 6);
+	WRITE8(cpu->mem_if->data, adr, static_cast<uint8_t>(cpu->RREG_NUM(i, 0)));
 
- return 3 + MMU.MMU_WAIT16cpu->proc_ID(adr>>24)&0xF;
+	return MMU_aluMemAccessCycles<PROCNUM, 8, MMU_AD_WRITE>(2, adr);
 }
 
-static u32 FASTCALL OP_LDR_REG_OFF(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_LDRB_REG_OFF(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 adr = (cpu->RREG_NUM(i, 3) + cpu->RREG_NUM(i, 6));
-	 u32 tempValue = READ32(cpu->mem_if->data, adr&0xFFFFFFFC);
+	uint32_t adr = cpu->RREG_NUM(i, 3) + cpu->RREG_NUM(i, 6);
+	cpu->RREG_NUM(i, 0) = static_cast<uint32_t>(READ8(cpu->mem_if->data, adr));
 
-	 adr = (adr&3)*8;
-	 tempValue = (tempValue>>adr) | (tempValue<<(32-adr));
-	 cpu->RREG_NUM(i, 0) = tempValue;
-
- return 3 + MMU.MMU_WAIT32cpu->proc_ID(adr>>24)&0xF;
+	return MMU_aluMemAccessCycles<PROCNUM, 8, MMU_AD_READ>(3, adr);
 }
 
-static u32 FASTCALL OP_LDRH_REG_OFF(armcpu_t *cpu)
+//-----------------------------------------------------------------------------
+// LDRSB
+//-----------------------------------------------------------------------------
+
+TEMPLATE static uint32_t FASTCALL OP_LDRSB_REG_OFF(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 adr = cpu->RREG_NUM(i, 3) + cpu->RREG_NUM(i, 6);
- cpu->RREG_NUM(i, 0) = (u32)READ16(cpu->mem_if->data, adr);
+	uint32_t adr = cpu->RREG_NUM(i, 3) + cpu->RREG_NUM(i, 6);
+	cpu->RREG_NUM(i, 0) = static_cast<uint32_t>(static_cast<int8_t>(READ8(cpu->mem_if->data, adr)));
 
- return 3 + MMU.MMU_WAIT16cpu->proc_ID(adr>>24)&0xF;
+	return MMU_aluMemAccessCycles<PROCNUM, 8, MMU_AD_READ>(3, adr);
 }
 
-static u32 FASTCALL OP_LDRB_REG_OFF(armcpu_t *cpu)
+//-----------------------------------------------------------------------------
+// STRH / LDRH
+//-----------------------------------------------------------------------------
+
+TEMPLATE static uint32_t FASTCALL OP_STRH_IMM_OFF(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 adr = cpu->RREG_NUM(i, 3) + cpu->RREG_NUM(i, 6);
- cpu->RREG_NUM(i, 0) = (u32)READ8(cpu->mem_if->data, adr);
+	uint32_t adr = cpu->RREG_NUM(i, 3) + ((i >> 5) & 0x3E);
+	WRITE16(cpu->mem_if->data, adr, static_cast<uint16_t>(cpu->RREG_NUM(i, 0)));
 
- return 3 + MMU.MMU_WAIT16cpu->proc_ID(adr>>24)&0xF;
+	return MMU_aluMemAccessCycles<PROCNUM, 16, MMU_AD_WRITE>(2, adr);
 }
 
-static u32 FASTCALL OP_LDRSH_REG_OFF(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_LDRH_IMM_OFF(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 adr = cpu->RREG_NUM(i, 3) + cpu->RREG_NUM(i, 6);
- cpu->RREG_NUM(i, 0) = (s32)((s16)READ16(cpu->mem_if->data, adr));
+	uint32_t adr = cpu->RREG_NUM(i, 3) + ((i >> 5) & 0x3E);
+	cpu->RREG_NUM(i, 0) = static_cast<uint32_t>(READ16(cpu->mem_if->data, adr));
 
- return 3 + MMU.MMU_WAIT16cpu->proc_ID(adr>>24)&0xF;
+	return MMU_aluMemAccessCycles<PROCNUM, 16, MMU_AD_READ>(3, adr);
 }
 
-static u32 FASTCALL OP_STR_IMM_OFF(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_STRH_REG_OFF(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 adr = cpu->RREG_NUM(i, 3) + ((i>>4)&0x7C);
- WRITE32(cpu->mem_if->data, adr, cpu->RREG_NUM(i, 0));
+	uint32_t adr = cpu->RREG_NUM(i, 3) + cpu->RREG_NUM(i, 6);
+	WRITE16(cpu->mem_if->data, adr, static_cast<uint16_t>(cpu->RREG_NUM(i, 0)));
 
- return 2 + MMU.MMU_WAIT32cpu->proc_ID(adr>>24)&0xF;
+	return MMU_aluMemAccessCycles<PROCNUM, 16, MMU_AD_WRITE>(2, adr);
 }
 
-static u32 FASTCALL OP_LDR_IMM_OFF(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_LDRH_REG_OFF(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 adr = cpu->RREG_NUM(i, 3) + ((i>>4)&0x7C);
- u32 tempValue = READ32(cpu->mem_if->data, adr&0xFFFFFFFC);
-	 adr = (adr&3)*8;
-	 tempValue = (tempValue>>adr) | (tempValue<<(32-adr));
-	 cpu->RREG_NUM(i, 0) = tempValue;
+	uint32_t adr = cpu->RREG_NUM(i, 3) + cpu->RREG_NUM(i, 6);
+	cpu->RREG_NUM(i, 0) = static_cast<uint32_t>(READ16(cpu->mem_if->data, adr));
 
- return 3 + MMU.MMU_WAIT32cpu->proc_ID(adr>>24)&0xF;
+	return MMU_aluMemAccessCycles<PROCNUM, 16, MMU_AD_READ>(3, adr);
 }
 
-static u32 FASTCALL OP_STRB_IMM_OFF(armcpu_t *cpu)
+//-----------------------------------------------------------------------------
+// LDRSH
+//-----------------------------------------------------------------------------
+
+TEMPLATE static uint32_t FASTCALL OP_LDRSH_REG_OFF(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 adr = cpu->RREG_NUM(i, 3) + ((i>>6)&0x1F);
- WRITE8(cpu->mem_if->data, adr, (u8)cpu->RREG_NUM(i, 0));
+	uint32_t adr = cpu->RREG_NUM(i, 3) + cpu->RREG_NUM(i, 6);
+	cpu->RREG_NUM(i, 0) = static_cast<uint32_t>(static_cast<int16_t>(READ16(cpu->mem_if->data, adr)));
 
- return 2 + MMU.MMU_WAIT16cpu->proc_ID(adr>>24)&0xF;
+	return MMU_aluMemAccessCycles<PROCNUM, 16, MMU_AD_READ>(3, adr);
 }
 
-static u32 FASTCALL OP_LDRB_IMM_OFF(armcpu_t *cpu)
+//-----------------------------------------------------------------------------
+// STR / LDR
+//-----------------------------------------------------------------------------
+
+TEMPLATE static uint32_t FASTCALL OP_STR_IMM_OFF(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 adr = cpu->RREG_NUM(i, 3) + ((i>>6)&0x1F);
- cpu->RREG_NUM(i, 0) = READ8(cpu->mem_if->data, adr);
+	uint32_t adr = cpu->RREG_NUM(i, 3) + ((i >> 4) & 0x7C);
+	WRITE32(cpu->mem_if->data, adr, cpu->RREG_NUM(i, 0));
 
- return 3 + MMU.MMU_WAIT16cpu->proc_ID(adr>>24)&0xF;
+	return MMU_aluMemAccessCycles<PROCNUM, 32, MMU_AD_WRITE>(2, adr);
 }
 
-static u32 FASTCALL OP_STRH_IMM_OFF(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_LDR_IMM_OFF(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 adr = cpu->RREG_NUM(i, 3) + ((i>>5)&0x3E);
- WRITE16(cpu->mem_if->data, adr, (u16)cpu->RREG_NUM(i, 0));
+	uint32_t adr = cpu->RREG_NUM(i, 3) + ((i >> 4) & 0x7C);
+	uint32_t tempValue = READ32(cpu->mem_if->data, adr);
+	adr = (adr & 3) * 8;
+	tempValue = (tempValue >> adr) | (tempValue << (32 - adr));
+	cpu->RREG_NUM(i, 0) = tempValue;
 
- return 2 + MMU.MMU_WAIT16cpu->proc_ID(adr>>24)&0xF;
+	return MMU_aluMemAccessCycles<PROCNUM, 32, MMU_AD_READ>(3, adr);
 }
 
-static u32 FASTCALL OP_LDRH_IMM_OFF(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_STR_REG_OFF(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 adr = cpu->RREG_NUM(i, 3) + ((i>>5)&0x3E);
- cpu->RREG_NUM(i, 0) = READ16(cpu->mem_if->data, adr);
+	uint32_t adr = cpu->RREG_NUM(i, 6) + cpu->RREG_NUM(i, 3);
+	WRITE32(cpu->mem_if->data, adr, cpu->RREG_NUM(i, 0));
 
- return 3 + MMU.MMU_WAIT16cpu->proc_ID(adr>>24)&0xF;
+	return MMU_aluMemAccessCycles<PROCNUM, 32, MMU_AD_WRITE>(2, adr);
 }
 
-static u32 FASTCALL OP_STR_SPREL(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_LDR_REG_OFF(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 adr = cpu->R13 + ((i&0xFF)<<2);
- WRITE32(cpu->mem_if->data, adr, cpu->RREG_NUM(i, 8));
+	uint32_t adr = cpu->RREG_NUM(i, 3) + cpu->RREG_NUM(i, 6);
+	uint32_t tempValue = READ32(cpu->mem_if->data, adr);
+	adr = (adr & 3) * 8;
+	tempValue = (tempValue >> adr) | (tempValue << (32 - adr));
+	cpu->RREG_NUM(i, 0) = tempValue;
 
- return 2 + MMU.MMU_WAIT16cpu->proc_ID(adr>>24)&0xF;
+	return MMU_aluMemAccessCycles<PROCNUM, 32, MMU_AD_READ>(3, adr);
 }
 
-static u32 FASTCALL OP_LDR_SPREL(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_STR_SPREL(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 adr = cpu->R13 + ((i&0xFF)<<2);
-	 cpu->RREG_NUM(i, 8) = READ32(cpu->mem_if->data, adr);
+	uint32_t adr = cpu->R13 + ((i & 0xFF) << 2);
+	WRITE32(cpu->mem_if->data, adr, cpu->RREG_NUM(i, 8));
 
- return 3 + MMU.MMU_WAIT32cpu->proc_ID(adr>>24)&0xF;
+	return MMU_aluMemAccessCycles<PROCNUM, 32, MMU_AD_WRITE>(2, adr);
 }
 
-static u32 FASTCALL OP_ADD_2PC(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_LDR_SPREL(uint32_t i)
 {
- u32 i = cpu->instruction;
- cpu->RREG_NUM(i, 8) = (cpu->R15&0xFFFFFFFC) + ((i&0xFF)<<2);
+	uint32_t adr = cpu->R13 + ((i & 0xFF) << 2);
+	cpu->RREG_NUM(i, 8) = READ32(cpu->mem_if->data, adr);
 
- return 5;
+	return MMU_aluMemAccessCycles<PROCNUM, 32, MMU_AD_READ>(3, adr);
 }
 
-static u32 FASTCALL OP_ADD_2SP(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_LDR_PCREL(uint32_t i)
 {
- u32 i = cpu->instruction;
- cpu->RREG_NUM(i, 8) = cpu->R13 + ((i&0xFF)<<2);
+	uint32_t adr = (cpu->R15 & 0xFFFFFFFC) + ((i & 0xFF) << 2);
 
- return 2;
+	cpu->RREG_NUM(i, 8) = READ32(cpu->mem_if->data, adr);
+
+	return MMU_aluMemAccessCycles<PROCNUM, 32, MMU_AD_READ>(3, adr);
 }
 
-static u32 FASTCALL OP_ADJUST_P_SP(armcpu_t *cpu)
+//-----------------------------------------------------------------------------
+// Adjust SP
+//-----------------------------------------------------------------------------
+
+TEMPLATE static uint32_t FASTCALL OP_ADJUST_P_SP(uint32_t i)
 {
- cpu->R13 += ((cpu->instruction&0x7F)<<2);
+	cpu->R13 += (i & 0x7F) << 2;
 
- return 1;
+	return 1;
 }
 
-static u32 FASTCALL OP_ADJUST_M_SP(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_ADJUST_M_SP(uint32_t i)
 {
- cpu->R13 -= ((cpu->instruction&0x7F)<<2);
+	cpu->R13 -= (i & 0x7F) << 2;
 
- return 1;
+	return 1;
 }
 
-static u32 FASTCALL OP_PUSH(armcpu_t *cpu)
+//-----------------------------------------------------------------------------
+// PUSH / POP
+//-----------------------------------------------------------------------------
+
+TEMPLATE static uint32_t FASTCALL OP_PUSH(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 adr = cpu->R13 - 4;
- u32 c = 0, j;
+	uint32_t adr = cpu->R13 - 4;
+	uint32_t c = 0;
 
- for(j = 0; j<8; ++j)
- if(BIT_N(i, 7-j))
- {
- WRITE32(cpu->mem_if->data, adr, cpu->R7-j);
- c += MMU.MMU_WAIT32cpu->proc_ID(adr>>24)&0xF;
- adr -= 4;
- }
- cpu->R13 = adr + 4;
+	for (uint32_t j = 0; j < 8; ++j)
+		if (BIT_N(i, 7 - j))
+		{
+			WRITE32(cpu->mem_if->data, adr, cpu->R7 - j);
+			c += MMU_memAccessCycles<PROCNUM, 32, MMU_AD_WRITE>(adr);
+			adr -= 4;
+		}
+	cpu->R13 = adr + 4;
 
- return c + 3;
+	return MMU_aluMemCycles<PROCNUM>(3, c);
 }
 
-static u32 FASTCALL OP_PUSH_LR(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_PUSH_LR(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 adr = cpu->R13 - 4;
- u32 c = 0, j;
+	uint32_t adr = cpu->R13 - 4;
+	uint32_t c = 0;
 
- WRITE32(cpu->mem_if->data, adr, cpu->R14);
- c += MMU.MMU_WAIT32cpu->proc_ID(adr>>24)&0xF;
- adr -= 4;
+	WRITE32(cpu->mem_if->data, adr, cpu->R14);
+	c += MMU_memAccessCycles<PROCNUM,32,MMU_AD_WRITE>(adr);
+	adr -= 4;
 
- for(j = 0; j<8; ++j)
- if(BIT_N(i, 7-j))
- {
- WRITE32(cpu->mem_if->data, adr, cpu->R7-j);
- c += MMU.MMU_WAIT32cpu->proc_ID(adr>>24)&0xF;
- adr -= 4;
- }
- cpu->R13 = adr + 4;
+	for (uint32_t j = 0; j < 8; ++j)
+		if (BIT_N(i, 7 - j))
+		{
+			WRITE32(cpu->mem_if->data, adr, cpu->R7 - j);
+			c += MMU_memAccessCycles<PROCNUM, 32, MMU_AD_WRITE>(adr);
+			adr -= 4;
+		}
+	cpu->R13 = adr + 4;
 
- return c + 4;
+	return MMU_aluMemCycles<PROCNUM>(4, c);
 }
 
-static u32 FASTCALL OP_POP(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_POP(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 adr = cpu->R13;
- u32 c = 0, j;
+	uint32_t adr = cpu->R13;
+	uint32_t c = 0;
 
- for(j = 0; j<8; ++j)
- if(BIT_N(i, j))
- {
- cpu->Rj = READ32(cpu->mem_if->data, adr);
- c += MMU.MMU_WAIT32cpu->proc_ID(adr>>24)&0xF;
- adr += 4;
- }
- cpu->R13 = adr;
+	for (uint32_t j = 0; j < 8; ++j)
+		if (BIT_N(i, j))
+		{
+			cpu->Rj = READ32(cpu->mem_if->data, adr);
+			c += MMU_memAccessCycles<PROCNUM, 32, MMU_AD_READ>(adr);
+			adr += 4;
+		}
+	cpu->R13 = adr;
 
- return c + 2;
+	return MMU_aluMemCycles<PROCNUM>(2, c);
 }
 
-static u32 FASTCALL OP_POP_PC(armcpu_t *cpu)
+// In ARMv5 and above, bit0 of the loaded value
+// determines whether execution continues after this branch in ARM state or in Thumb state, as though the
+// following instruction had been executed:
+// BX (loaded_value)
+// In T variants of ARMv4, bit0 of the loaded value is ignored and execution continues in Thumb state, as
+// though the following instruction had been executed:
+// MOV PC,(loaded_value)
+TEMPLATE static uint32_t FASTCALL OP_POP_PC(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 adr = cpu->R13;
- u32 c = 0, j;
- u32 v;
+	uint32_t adr = cpu->R13;
+	uint32_t c = 0;
 
- for(j = 0; j<8; ++j)
- if(BIT_N(i, j))
- {
- cpu->Rj = READ32(cpu->mem_if->data, adr);
- c += MMU.MMU_WAIT32cpu->proc_ID(adr>>24)&0xF;
- adr += 4;
- }
+	for (uint32_t j = 0; j < 8; ++j)
+		if (BIT_N(i, j))
+		{
+			cpu->Rj = READ32(cpu->mem_if->data, adr);
+			c += MMU_memAccessCycles<PROCNUM, 32, MMU_AD_READ>(adr);
+			adr += 4;
+		}
 
- v = READ32(cpu->mem_if->data, adr);
- c += MMU.MMU_WAIT32cpu->proc_ID(adr>>24)&0xF;
- cpu->R15 = v & 0xFFFFFFFE;
- cpu->next_instruction = v & 0xFFFFFFFE;
- if(cpu->proc_ID==0)
- cpu->CPSR.bits.T = BIT0(v);
- adr += 4;
+	uint32_t v = READ32(cpu->mem_if->data, adr);
+	c += MMU_memAccessCycles<PROCNUM, 32, MMU_AD_READ>(adr);
+	if (!PROCNUM)
+		cpu->CPSR.bits.T = BIT0(v);
 
- cpu->R13 = adr;
- return c + 5;
+	cpu->R15 = v & 0xFFFFFFFE;
+	cpu->next_instruction = cpu->R15;
+
+	cpu->R13 = adr + 4;
+	return MMU_aluMemCycles<PROCNUM>(5, c);
 }
 
-static u32 FASTCALL OP_BKPT_THUMB(armcpu_t *cpu)
+//-----------------------------------------------------------------------------
+// STMIA / LDMIA
+//-----------------------------------------------------------------------------
+
+TEMPLATE static uint32_t FASTCALL OP_STMIA_THUMB(uint32_t i)
 {
- return 1;
+	uint32_t adr = cpu->RREG_NUM(i, 8);
+	uint32_t c = 0;
+	bool erList = true; //Empty Register List
+
+	// ------ ARM_REF:
+	// ------ If <Rn> is specified in <registers>:
+	// ------	* If <Rn> is the lowest-numbered register specified in <registers>, the original value of <Rn> is stored.
+	// ------	* Otherwise, the stored value of <Rn> is UNPREDICTABLE.
+	if (BIT_N(i, REG_NUM(i, 8)))
+		fprintf(stderr, "STMIA with Rb in Rlist\n");
+
+	for (uint32_t j = 0; j < 8; ++j)
+		if (BIT_N(i, j))
+		{
+			WRITE32(cpu->mem_if->data, adr, cpu->Rj);
+			c += MMU_memAccessCycles<PROCNUM, 32, MMU_AD_WRITE>(adr);
+			adr += 4;
+			erList = false; //Register List isnt empty
+		}
+
+	if (erList)
+		 fprintf(stderr, "STMIA with Empty Rlist\n");
+
+	cpu->RREG_NUM(i, 8) = adr;
+	return MMU_aluMemCycles<PROCNUM>(2, c);
+}
+
+TEMPLATE static uint32_t FASTCALL OP_LDMIA_THUMB(uint32_t i)
+{
+	uint32_t regIndex = REG_NUM(i, 8);
+	uint32_t adr = cpu->RregIndex;
+	uint32_t c = 0;
+	bool erList = true; //Empty Register List
+
+	//if (BIT_N(i, regIndex))
+	//	 fprintf(stderr, "LDMIA with Rb in Rlist at %08X\n",cpu->instruct_adr);
+
+	for (uint32_t j = 0; j < 8; ++j)
+		if (BIT_N(i, j))
+		{
+			cpu->Rj = READ32(cpu->mem_if->data, adr);
+			c += MMU_memAccessCycles<PROCNUM, 32, MMU_AD_READ>(adr);
+			adr += 4;
+			erList = false; //Register List isnt empty
+		}
+
+	if (erList)
+		 fprintf(stderr, "LDMIA with Empty Rlist\n");
+
+	// ARM_REF:	THUMB: Causes base register write-back, and is not optional
+	// ARM_REF:	If the base register <Rn> is specified in <registers>, the final value of <Rn> is the loaded value
+	//			(not the written-back value).
+	if (!BIT_N(i, regIndex))
+		cpu->RregIndex = adr;
+
+	return MMU_aluMemCycles<PROCNUM>(3, c);
+}
+
+//-----------------------------------------------------------------------------
+// BKPT
+//-----------------------------------------------------------------------------
+
+TEMPLATE static uint32_t FASTCALL OP_BKPT_THUMB(uint32_t)
+{
+	fprintf(stderr, "THUMB%c: OP_BKPT triggered\n", PROCNUM?'7':'9');
+	Status_Reg tmp = cpu->CPSR;
+	armcpu_switchMode(cpu, ABT); // enter abt mode
+	cpu->R14 = cpu->instruct_adr + 4;
+	cpu->SPSR = tmp; // save old CPSR as new SPSR
+	cpu->CPSR.bits.T = 0; // handle as ARM32 code
+	cpu->CPSR.bits.I = 1;
+	cpu->changeCPSR();
+	cpu->R15 = cpu->intVector + 0x0C;
+	cpu->next_instruction = cpu->R15;
+	return 1;
 }
 
-static u32 FASTCALL OP_STMIA_THUMB(armcpu_t *cpu)
+//-----------------------------------------------------------------------------
+// SWI
+//-----------------------------------------------------------------------------
+
+TEMPLATE static uint32_t FASTCALL OP_SWI_THUMB(uint32_t i)
 {
- u32 i = cpu->instruction;
- u32 adr = cpu->RREG_NUM(i, 8);
- u32 c = 0, j;
+	uint32_t swinum = i & 0xFF;
 
- for(j = 0; j<8; ++j)
- if(BIT_N(i, j))
- {
- WRITE32(cpu->mem_if->data, adr, cpu->Rj);
- c += MMU.MMU_WAIT32cpu->proc_ID(adr>>24)&0xF;
- adr += 4;
- }
- cpu->RREG_NUM(i, 8) = adr;
- return c + 2;
-}
+	//ideas-style debug prints (execute this SWI with the null terminated string address in R0)
+	if (swinum == 0xFC)
+	{
+		//IdeasLog(cpu);
+		return 0;
+	}
 
-static u32 FASTCALL OP_LDMIA_THUMB(armcpu_t *cpu)
-{
- u32 i = cpu->instruction;
- u32 adr = cpu->RREG_NUM(i, 8);
- u32 c = 0, j;
+	//if the user has changed the intVector to point away from the nds bioses,
+	//then it doesn't really make any sense to use the builtin SWI's since
+	//the bios ones aren't getting called anyway
+	bool bypassBuiltinSWI = (cpu->intVector == 0x00000000 && !PROCNUM) || (cpu->intVector == 0xFFFF0000 && PROCNUM == 1);
 
- for(j = 0; j<8; ++j)
- if(BIT_N(i, j))
- {
- cpu->Rj = READ32(cpu->mem_if->data, adr);
- c += MMU.MMU_WAIT32cpu->proc_ID(adr>>24)&0xF;
- adr += 4;
- }
- cpu->RREG_NUM(i, 8) = adr;
- return c + 3;
+	if (cpu->swi_tab && !bypassBuiltinSWI)
+	{
+		//zero 25-dec-2008 - in arm, we were masking to 0x1F.
+		//this is probably safer since an invalid opcode could crash the emu
+		//zero 30-jun-2009 - but they say that the ideas 0xFF should crash the device...
+		//uint32_t swinum = cpu->instruction & 0xFF;
+		swinum &= 0x1F;
+		//fprintf(stderr, "%d ARM SWI %d\n",PROCNUM,swinum);
+		return cpu->swi_tabswinum() + 3;
+	}
+	else
+	{
+		/* we use an irq thats not in the irq tab, as
+		it was replaced due to a changed intVector */
+		Status_Reg tmp = cpu->CPSR;
+		armcpu_switchMode(cpu, SVC); /* enter svc mode */
+		cpu->R14 = cpu->next_instruction; /* jump to swi Vector */
+		cpu->SPSR = tmp; /* save old CPSR as new SPSR */
+		cpu->CPSR.bits.T = 0; /* handle as ARM32 code */
+		cpu->CPSR.bits.I = 1;
+		cpu->changeCPSR();
+		cpu->R15 = cpu->intVector + 0x08;
+		cpu->next_instruction = cpu->R15;
+		return 3;
+	}
 }
 
-static u32 FASTCALL OP_B_COND(armcpu_t *cpu)
+//-----------------------------------------------------------------------------
+// Branch
+//-----------------------------------------------------------------------------
+
+static inline uint32_t SIGNEEXT_IMM11(uint32_t i) { return (i & 0x7FF) | (BIT10(i) * 0xFFFFF800); }
+static inline uint32_t SIGNEXTEND_11(uint32_t i) { return static_cast<uint32_t>((static_cast<int32_t>(i) << 21) >> 21); }
+
+TEMPLATE static uint32_t FASTCALL OP_B_COND(uint32_t i)
 {
- u32 i = cpu->instruction;
- if(!TEST_COND((i>>8)&0xF, 0, cpu->CPSR))
- return 1;
-
- cpu->R15 += ((s32)((s8)(i&0xFF)))<<1;
- cpu->next_instruction = cpu->R15;
- return 3;
-}
+	if (!TEST_COND((i >> 8) & 0xF, 0, cpu->CPSR))
+		return 1;
+
+	cpu->R15 += static_cast<uint32_t>(static_cast<int8_t>(i & 0xFF)) << 1;
+	cpu->next_instruction = cpu->R15;
+	return 3;
+}
 
-static u32 FASTCALL OP_SWI_THUMB(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_B_UNCOND(uint32_t i)
 {
- if (((cpu->intVector != 0) ^ (cpu->proc_ID == ARMCPU_ARM9)))
- {
- /* we use an irq thats not in the irq tab, as
- it was replaced duie to a changed intVector */
- Status_Reg tmp = cpu->CPSR;
- armcpu_switchMode(cpu, SVC); /* enter svc mode */
- cpu->R14 = cpu->R15 - 4; /* jump to swi Vector */
- cpu->SPSR = tmp; /* save old CPSR as new SPSR */
- cpu->CPSR.bits.T = 0; /* handle as ARM32 code */
- cpu->CPSR.bits.I = cpu->SPSR.bits.I; /* keep int disable flag */
- cpu->R15 = cpu->intVector + 0x08;
- cpu->next_instruction = cpu->R15;
- return 3;
- }
- else
- {
- u32 swinum = cpu->instruction & 0xFF;
- return cpu->swi_tabswinum(cpu) + 3;
- }
- //return 3;
+	cpu->R15 += SIGNEEXT_IMM11(i) << 1;
+	cpu->next_instruction = cpu->R15;
+	return 1;
 }
 
-#define SIGNEEXT_IMM11(i) (((i)&0x7FF) | (BIT10(i) * 0xFFFFF800))
-
-static u32 FASTCALL OP_B_UNCOND(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_BLX(uint32_t i)
 {
- u32 i = cpu->instruction;
- cpu->R15 += (SIGNEEXT_IMM11(i)<<1);
- cpu->next_instruction = cpu->R15;
- return 3;
+	cpu->R15 = (cpu->R14 + ((i & 0x7FF) << 1)) & 0xFFFFFFFC;
+	cpu->R14 = cpu->next_instruction | 1;
+	cpu->next_instruction = cpu->R15;
+	cpu->CPSR.bits.T = 0;
+	return 3;
 }
 
-static u32 FASTCALL OP_BLX(armcpu_t *cpu)
-{
- u32 i = cpu->instruction;
- cpu->R15 = (cpu->R14 + ((i&0x7FF)<<1))&0xFFFFFFFC;
- cpu->R14 = cpu->next_instruction | 1;
- cpu->next_instruction = cpu->R15;
- cpu->CPSR.bits.T = 0;
- return 3;
+TEMPLATE static uint32_t FASTCALL OP_BL_10(uint32_t i)
+{
+	cpu->R14 = cpu->R15 + (SIGNEXTEND_11(i) << 12);
+	return 1;
+}
+
+TEMPLATE static uint32_t FASTCALL OP_BL_11(uint32_t i)
+{
+	cpu->R15 = (cpu->R14 + ((i & 0x7FF) << 1));
+	cpu->R14 = cpu->next_instruction | 1;
+	cpu->next_instruction = cpu->R15;
+	return 4;
 }
 
-static u32 FASTCALL OP_BL_10(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_BX_THUMB(uint32_t i)
 {
- u32 i = cpu->instruction;
- cpu->R14 = cpu->R15 + (SIGNEEXT_IMM11(i)<<12);
- return 1;
+	// When using PC as operand with BX opcode, switch to ARM state and jump to (instruct_adr+4)
+	// Reference: http://nocash.emubase.de/gbatek.htm#thumb5hiregisteroperationsbranchexchange
+
+#if 0
+	if (REG_POS(i, 3) == 15)
+	{
+		cpu->CPSR.bits.T = 0;
+		cpu->R15 &= 0xFFFFFFFC;
+		cpu->next_instruction = cpu->R15;
+	}
+	else
+	{
+		uint32_t Rm = cpu->RREG_POS(i, 3);
+
+		cpu->CPSR.bits.T = BIT0(Rm);
+		cpu->R15 = (Rm & 0xFFFFFFFE);
+		cpu->next_instruction = cpu->R15;
+	}
+#else
+	uint32_t Rm = cpu->RREG_POS(i, 3);
+	//----- ARM_REF:
+	//----- Register 15 can be specified for <Rm>. If this is done, R15 is read as normal for Thumb code,
+	//----- that is, it is the address of the BX instruction itself plus 4. If the BX instruction is at a
+	//----- word-aligned address, this results in a branch to the next word, executing in ARM state.
+	//----- However, if the BX instruction is not at a word-aligned address, this means that the results of
+	//----- the instruction are UNPREDICTABLE (because the value read for R15 has bits1:0==0b10).
+	if (Rm == 15)
+	{
+		fprintf(stderr, "THUMB%c: BX using PC as operand\n", PROCNUM?'7':'9');
+		//emu_halt();
+	}
+	cpu->CPSR.bits.T = BIT0(Rm);
+	cpu->R15 = Rm & (0xFFFFFFFC | (1 << cpu->CPSR.bits.T));
+	cpu->next_instruction = cpu->R15;
+#endif
+	return 3;
 }
 
-static u32 FASTCALL OP_BL_THUMB(armcpu_t *cpu)
+TEMPLATE static uint32_t FASTCALL OP_BLX_THUMB(uint32_t i)
 {
- u32 i = cpu->instruction;
- cpu->R15 = (cpu->R14 + ((i&0x7FF)<<1));
- cpu->R14 = cpu->next_instruction | 1;
- cpu->next_instruction = cpu->R15;
- return 3;
+	uint32_t Rm = cpu->RREG_POS(i, 3);
+	cpu->CPSR.bits.T = BIT0(Rm);
+	cpu->R15 = Rm & 0xFFFFFFFE;
+	cpu->R14 = cpu->next_instruction | 1;
+	cpu->next_instruction = cpu->R15;
+
+	return 4;
 }
 
-#define TYPE_RETOUR u32
-#define CALLTYPE FASTCALL
-#define PARAMETRES armcpu_t *cpu
-#define NOM_THUMB_TAB thumb_instructions_set
+//-----------------------------------------------------------------------------
+// The End
+//-----------------------------------------------------------------------------
 
+const OpFunc thumb_instructions_set21024 =
+{
+	{
+#define TABDECL(x) x<0>
+#include "thumb_tabdef.inc"
+#undef TABDECL
+	}, {
+#define TABDECL(x) x<1>
 #include "thumb_tabdef.inc"
+#undef TABDECL
+	}
+};

audacious-plugins-3.6.2-gtk3.tar.bz2/src/xsf/desmume/thumb_tabdef.inc -> audacious-plugins-4.4.1.tar.bz2/src/xsf/desmume/thumb_tabdef.inc Changed

@@ -1,1111 +1,1105 @@
-/* Copyright (C) 2006 yopyop
- yopyop156@ifrance.com
- yopyop156.ifrance.com
-
- This file is part of DeSmuME
-
- DeSmuME 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.
-
- DeSmuME 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 DeSmuME; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+/*
+	Copyright (C) 2006 yopyop
+	Copyright (C) 2007-2012 DeSmuME team
+	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
+	(at your option) any later version.
+
+	This file 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 the this software. If not, see <http://www.gnu.org/licenses/>.
 */
 
-TYPE_RETOUR (* CALLTYPE NOM_THUMB_TAB1024)(PARAMETRES)={
- OP_LSL_0, //00 0000 0000
- OP_LSL, //00 0000 0001
- OP_LSL, //00 0000 0010
- OP_LSL, //00 0000 0011
- OP_LSL, //00 0000 0100
- OP_LSL, //00 0000 0101
- OP_LSL, //00 0000 0110
- OP_LSL, //00 0000 0111
- OP_LSL, //00 0000 1000
- OP_LSL, //00 0000 1001
- OP_LSL, //00 0000 1010
- OP_LSL, //00 0000 1011
- OP_LSL, //00 0000 1100
- OP_LSL, //00 0000 1101
- OP_LSL, //00 0000 1110
- OP_LSL, //00 0000 1111
-
- OP_LSL, //00 0001 0000
- OP_LSL, //00 0001 0001
- OP_LSL, //00 0001 0010
- OP_LSL, //00 0001 0011
- OP_LSL, //00 0001 0100
- OP_LSL, //00 0001 0101
- OP_LSL, //00 0001 0110
- OP_LSL, //00 0001 0111
- OP_LSL, //00 0001 1000
- OP_LSL, //00 0001 1001
- OP_LSL, //00 0001 1010
- OP_LSL, //00 0001 1011
- OP_LSL, //00 0001 1100
- OP_LSL, //00 0001 1101
- OP_LSL, //00 0001 1110
- OP_LSL, //00 0001 1111
-
- OP_LSR_0, //00 0010 0000
- OP_LSR, //00 0010 0001
- OP_LSR, //00 0010 0010
- OP_LSR, //00 0010 0011
- OP_LSR, //00 0010 0100
- OP_LSR, //00 0010 0101
- OP_LSR, //00 0010 0110
- OP_LSR, //00 0010 0111
- OP_LSR, //00 0010 1000
- OP_LSR, //00 0010 1001
- OP_LSR, //00 0010 1010
- OP_LSR, //00 0010 1011
- OP_LSR, //00 0010 1100
- OP_LSR, //00 0010 1101
- OP_LSR, //00 0010 1110
- OP_LSR, //00 0010 1111
-
- OP_LSR, //00 0011 0000
- OP_LSR, //00 0011 0001
- OP_LSR, //00 0011 0010
- OP_LSR, //00 0011 0011
- OP_LSR, //00 0011 0100
- OP_LSR, //00 0011 0101
- OP_LSR, //00 0011 0110
- OP_LSR, //00 0011 0111
- OP_LSR, //00 0011 1000
- OP_LSR, //00 0011 1001
- OP_LSR, //00 0011 1010
- OP_LSR, //00 0011 1011
- OP_LSR, //00 0011 1100
- OP_LSR, //00 0011 1101
- OP_LSR, //00 0011 1110
- OP_LSR, //00 0011 1111
-
- OP_ASR_0, //00 0100 0000
- OP_ASR, //00 0100 0001
- OP_ASR, //00 0100 0010
- OP_ASR, //00 0100 0011
- OP_ASR, //00 0100 0100
- OP_ASR, //00 0100 0101
- OP_ASR, //00 0100 0110
- OP_ASR, //00 0100 0111
- OP_ASR, //00 0100 1000
- OP_ASR, //00 0100 1001
- OP_ASR, //00 0100 1010
- OP_ASR, //00 0100 1011
- OP_ASR, //00 0100 1100
- OP_ASR, //00 0100 1101
- OP_ASR, //00 0100 1110
- OP_ASR, //00 0100 1111
-
- OP_ASR, //00 0101 0000
- OP_ASR, //00 0101 0001
- OP_ASR, //00 0101 0010
- OP_ASR, //00 0101 0011
- OP_ASR, //00 0101 0100
- OP_ASR, //00 0101 0101
- OP_ASR, //00 0101 0110
- OP_ASR, //00 0101 0111
- OP_ASR, //00 0101 1000
- OP_ASR, //00 0101 1001
- OP_ASR, //00 0101 1010
- OP_ASR, //00 0101 1011
- OP_ASR, //00 0101 1100
- OP_ASR, //00 0101 1101
- OP_ASR, //00 0101 1110
- OP_ASR, //00 0101 1111
-
- OP_ADD_REG, //00 0110 0000
- OP_ADD_REG, //00 0110 0001
- OP_ADD_REG, //00 0110 0010
- OP_ADD_REG, //00 0110 0011
- OP_ADD_REG, //00 0110 0100
- OP_ADD_REG, //00 0110 0101
- OP_ADD_REG, //00 0110 0110
- OP_ADD_REG, //00 0110 0111
- OP_SUB_REG, //00 0110 1000
- OP_SUB_REG, //00 0110 1001
- OP_SUB_REG, //00 0110 1010
- OP_SUB_REG, //00 0110 1011
- OP_SUB_REG, //00 0110 1100
- OP_SUB_REG, //00 0110 1101
- OP_SUB_REG, //00 0110 1110
- OP_SUB_REG, //00 0110 1111
-
- OP_ADD_IMM3, //00 0111 0000
- OP_ADD_IMM3, //00 0111 0001
- OP_ADD_IMM3, //00 0111 0010
- OP_ADD_IMM3, //00 0111 0011
- OP_ADD_IMM3, //00 0111 0100
- OP_ADD_IMM3, //00 0111 0101
- OP_ADD_IMM3, //00 0111 0110
- OP_ADD_IMM3, //00 0111 0111
- OP_SUB_IMM3, //00 0111 1000
- OP_SUB_IMM3, //00 0111 1001
- OP_SUB_IMM3, //00 0111 1010
- OP_SUB_IMM3, //00 0111 1011
- OP_SUB_IMM3, //00 0111 1100
- OP_SUB_IMM3, //00 0111 1101
- OP_SUB_IMM3, //00 0111 1110
- OP_SUB_IMM3, //00 0111 1111
-
- OP_MOV_IMM8, //00 1000 0000
- OP_MOV_IMM8, //00 1000 0001
- OP_MOV_IMM8, //00 1000 0010
- OP_MOV_IMM8, //00 1000 0011
- OP_MOV_IMM8, //00 1000 0100
- OP_MOV_IMM8, //00 1000 0101
- OP_MOV_IMM8, //00 1000 0110
- OP_MOV_IMM8, //00 1000 0111
- OP_MOV_IMM8, //00 1000 1000
- OP_MOV_IMM8, //00 1000 1001
- OP_MOV_IMM8, //00 1000 1010
- OP_MOV_IMM8, //00 1000 1011
- OP_MOV_IMM8, //00 1000 1100
- OP_MOV_IMM8, //00 1000 1101
- OP_MOV_IMM8, //00 1000 1110
- OP_MOV_IMM8, //00 1000 1111
-
- OP_MOV_IMM8, //00 1001 0000
- OP_MOV_IMM8, //00 1001 0001
- OP_MOV_IMM8, //00 1001 0010
- OP_MOV_IMM8, //00 1001 0011
- OP_MOV_IMM8, //00 1001 0100
- OP_MOV_IMM8, //00 1001 0101
- OP_MOV_IMM8, //00 1001 0110
- OP_MOV_IMM8, //00 1001 0111
- OP_MOV_IMM8, //00 1001 1000
- OP_MOV_IMM8, //00 1001 1001
- OP_MOV_IMM8, //00 1001 1010
- OP_MOV_IMM8, //00 1001 1011
- OP_MOV_IMM8, //00 1001 1100
- OP_MOV_IMM8, //00 1001 1101
- OP_MOV_IMM8, //00 1001 1110
- OP_MOV_IMM8, //00 1001 1111
-
- OP_CMP_IMM8, //00 1010 0000
- OP_CMP_IMM8, //00 1010 0001
- OP_CMP_IMM8, //00 1010 0010
- OP_CMP_IMM8, //00 1010 0011
- OP_CMP_IMM8, //00 1010 0100
- OP_CMP_IMM8, //00 1010 0101
- OP_CMP_IMM8, //00 1010 0110
- OP_CMP_IMM8, //00 1010 0111
- OP_CMP_IMM8, //00 1010 1000
- OP_CMP_IMM8, //00 1010 1001
- OP_CMP_IMM8, //00 1010 1010
- OP_CMP_IMM8, //00 1010 1011
- OP_CMP_IMM8, //00 1010 1100
- OP_CMP_IMM8, //00 1010 1101
- OP_CMP_IMM8, //00 1010 1110
- OP_CMP_IMM8, //00 1010 1111
-
- OP_CMP_IMM8, //00 1011 0000
- OP_CMP_IMM8, //00 1011 0001
- OP_CMP_IMM8, //00 1011 0010
- OP_CMP_IMM8, //00 1011 0011
- OP_CMP_IMM8, //00 1011 0100
- OP_CMP_IMM8, //00 1011 0101
- OP_CMP_IMM8, //00 1011 0110
- OP_CMP_IMM8, //00 1011 0111
- OP_CMP_IMM8, //00 1011 1000
- OP_CMP_IMM8, //00 1011 1001
- OP_CMP_IMM8, //00 1011 1010
- OP_CMP_IMM8, //00 1011 1011
- OP_CMP_IMM8, //00 1011 1100
- OP_CMP_IMM8, //00 1011 1101
- OP_CMP_IMM8, //00 1011 1110
- OP_CMP_IMM8, //00 1011 1111
-
- OP_ADD_IMM8, //00 1100 0000
- OP_ADD_IMM8, //00 1100 0001
- OP_ADD_IMM8, //00 1100 0010
- OP_ADD_IMM8, //00 1100 0011
- OP_ADD_IMM8, //00 1100 0100
- OP_ADD_IMM8, //00 1100 0101
- OP_ADD_IMM8, //00 1100 0110
- OP_ADD_IMM8, //00 1100 0111
- OP_ADD_IMM8, //00 1100 1000
- OP_ADD_IMM8, //00 1100 1001
- OP_ADD_IMM8, //00 1100 1010
- OP_ADD_IMM8, //00 1100 1011
- OP_ADD_IMM8, //00 1100 1100
- OP_ADD_IMM8, //00 1100 1101
- OP_ADD_IMM8, //00 1100 1110
- OP_ADD_IMM8, //00 1100 1111
-
- OP_ADD_IMM8, //00 1101 0000
- OP_ADD_IMM8, //00 1101 0001
- OP_ADD_IMM8, //00 1101 0010
- OP_ADD_IMM8, //00 1101 0011
- OP_ADD_IMM8, //00 1101 0100
- OP_ADD_IMM8, //00 1101 0101
- OP_ADD_IMM8, //00 1101 0110
- OP_ADD_IMM8, //00 1101 0111
- OP_ADD_IMM8, //00 1101 1000
- OP_ADD_IMM8, //00 1101 1001
- OP_ADD_IMM8, //00 1101 1010
- OP_ADD_IMM8, //00 1101 1011
- OP_ADD_IMM8, //00 1101 1100
- OP_ADD_IMM8, //00 1101 1101
- OP_ADD_IMM8, //00 1101 1110
- OP_ADD_IMM8, //00 1101 1111
-
- OP_SUB_IMM8, //00 1110 0000
- OP_SUB_IMM8, //00 1110 0001
- OP_SUB_IMM8, //00 1110 0010
- OP_SUB_IMM8, //00 1110 0011
- OP_SUB_IMM8, //00 1110 0100
- OP_SUB_IMM8, //00 1110 0101
- OP_SUB_IMM8, //00 1110 0110
- OP_SUB_IMM8, //00 1110 0111
- OP_SUB_IMM8, //00 1110 1000
- OP_SUB_IMM8, //00 1110 1001
- OP_SUB_IMM8, //00 1110 1010
- OP_SUB_IMM8, //00 1110 1011
- OP_SUB_IMM8, //00 1110 1100
- OP_SUB_IMM8, //00 1110 1101
- OP_SUB_IMM8, //00 1110 1110
- OP_SUB_IMM8, //00 1110 1111
-
- OP_SUB_IMM8, //00 1111 0000
- OP_SUB_IMM8, //00 1111 0001
- OP_SUB_IMM8, //00 1111 0010
- OP_SUB_IMM8, //00 1111 0011
- OP_SUB_IMM8, //00 1111 0100
- OP_SUB_IMM8, //00 1111 0101
- OP_SUB_IMM8, //00 1111 0110
- OP_SUB_IMM8, //00 1111 0111
- OP_SUB_IMM8, //00 1111 1000
- OP_SUB_IMM8, //00 1111 1001
- OP_SUB_IMM8, //00 1111 1010
- OP_SUB_IMM8, //00 1111 1011
- OP_SUB_IMM8, //00 1111 1100
- OP_SUB_IMM8, //00 1111 1101
- OP_SUB_IMM8, //00 1111 1110
- OP_SUB_IMM8, //00 1111 1111
-
- OP_AND, //01 0000 0000
- OP_EOR, //01 0000 0001
- OP_LSL_REG, //01 0000 0010
- OP_LSR_REG, //01 0000 0011
- OP_ASR_REG, //01 0000 0100
- OP_ADC_REG, //01 0000 0101
- OP_SBC_REG, //01 0000 0110
- OP_ROR_REG, //01 0000 0111
- OP_TST, //01 0000 1000
- OP_NEG, //01 0000 1001
- OP_CMP, //01 0000 1010
- OP_CMN, //01 0000 1011
- OP_ORR, //01 0000 1100
- OP_MUL_REG, //01 0000 1101
- OP_BIC, //01 0000 1110
- OP_MVN, //01 0000 1111
-
- OP_ADD_SPE, //01 0001 0000
- OP_ADD_SPE, //01 0001 0001
- OP_ADD_SPE, //01 0001 0010
- OP_ADD_SPE, //01 0001 0011
- OP_CMP_SPE, //01 0001 0100
- OP_CMP_SPE, //01 0001 0101
- OP_CMP_SPE, //01 0001 0110
- OP_CMP_SPE, //01 0001 0111
- OP_MOV_SPE, //01 0001 1000
- OP_MOV_SPE, //01 0001 1001
- OP_MOV_SPE, //01 0001 1010
- OP_MOV_SPE, //01 0001 1011
- OP_BX_THUMB, //01 0001 1100
- OP_BX_THUMB, //01 0001 1101
- OP_BLX_THUMB, //01 0001 1110
- OP_BLX_THUMB, //01 0001 1111 
-
- OP_LDR_PCREL, //01 0010 0000
- OP_LDR_PCREL, //01 0010 0001
- OP_LDR_PCREL, //01 0010 0010
- OP_LDR_PCREL, //01 0010 0011
- OP_LDR_PCREL, //01 0010 0100
- OP_LDR_PCREL, //01 0010 0101
- OP_LDR_PCREL, //01 0010 0110
- OP_LDR_PCREL, //01 0010 0111
- OP_LDR_PCREL, //01 0010 1000
- OP_LDR_PCREL, //01 0010 1001
- OP_LDR_PCREL, //01 0010 1010
- OP_LDR_PCREL, //01 0010 1011
- OP_LDR_PCREL, //01 0010 1100
- OP_LDR_PCREL, //01 0010 1101
- OP_LDR_PCREL, //01 0010 1110
- OP_LDR_PCREL, //01 0010 1111
-
- OP_LDR_PCREL, //01 0011 0000
- OP_LDR_PCREL, //01 0011 0001
- OP_LDR_PCREL, //01 0011 0010
- OP_LDR_PCREL, //01 0011 0011
- OP_LDR_PCREL, //01 0011 0100
- OP_LDR_PCREL, //01 0011 0101
- OP_LDR_PCREL, //01 0011 0110
- OP_LDR_PCREL, //01 0011 0111
- OP_LDR_PCREL, //01 0011 1000
- OP_LDR_PCREL, //01 0011 1001
- OP_LDR_PCREL, //01 0011 1010
- OP_LDR_PCREL, //01 0011 1011
- OP_LDR_PCREL, //01 0011 1100
- OP_LDR_PCREL, //01 0011 1101
- OP_LDR_PCREL, //01 0011 1110
- OP_LDR_PCREL, //01 0011 1111
-
- OP_STR_REG_OFF, //01 0100 0000
- OP_STR_REG_OFF, //01 0100 0001
- OP_STR_REG_OFF, //01 0100 0010
- OP_STR_REG_OFF, //01 0100 0011
- OP_STR_REG_OFF, //01 0100 0100
- OP_STR_REG_OFF, //01 0100 0101
- OP_STR_REG_OFF, //01 0100 0110
- OP_STR_REG_OFF, //01 0100 0111
- OP_STRH_REG_OFF, //01 0100 1000
- OP_STRH_REG_OFF, //01 0100 1001
- OP_STRH_REG_OFF, //01 0100 1010
- OP_STRH_REG_OFF, //01 0100 1011
- OP_STRH_REG_OFF, //01 0100 1100
- OP_STRH_REG_OFF, //01 0100 1101
- OP_STRH_REG_OFF, //01 0100 1110
- OP_STRH_REG_OFF, //01 0100 1111
-
- OP_STRB_REG_OFF, //01 0101 0000
- OP_STRB_REG_OFF, //01 0101 0001
- OP_STRB_REG_OFF, //01 0101 0010
- OP_STRB_REG_OFF, //01 0101 0011
- OP_STRB_REG_OFF, //01 0101 0100
- OP_STRB_REG_OFF, //01 0101 0101
- OP_STRB_REG_OFF, //01 0101 0110
- OP_STRB_REG_OFF, //01 0101 0111
- OP_LDRSB_REG_OFF, //01 0101 1000
- OP_LDRSB_REG_OFF, //01 0101 1001
- OP_LDRSB_REG_OFF, //01 0101 1010
- OP_LDRSB_REG_OFF, //01 0101 1011
- OP_LDRSB_REG_OFF, //01 0101 1100
- OP_LDRSB_REG_OFF, //01 0101 1101
- OP_LDRSB_REG_OFF, //01 0101 1110
- OP_LDRSB_REG_OFF, //01 0101 1111
-
- OP_LDR_REG_OFF, //01 0110 0000
- OP_LDR_REG_OFF, //01 0110 0001
- OP_LDR_REG_OFF, //01 0110 0010
- OP_LDR_REG_OFF, //01 0110 0011
- OP_LDR_REG_OFF, //01 0110 0100
- OP_LDR_REG_OFF, //01 0110 0101
- OP_LDR_REG_OFF, //01 0110 0110
- OP_LDR_REG_OFF, //01 0110 0111
- OP_LDRH_REG_OFF, //01 0110 1000
- OP_LDRH_REG_OFF, //01 0110 1001
- OP_LDRH_REG_OFF, //01 0110 1010
- OP_LDRH_REG_OFF, //01 0110 1011
- OP_LDRH_REG_OFF, //01 0110 1100
- OP_LDRH_REG_OFF, //01 0110 1101
- OP_LDRH_REG_OFF, //01 0110 1110
- OP_LDRH_REG_OFF, //01 0110 1111
-
- OP_LDRB_REG_OFF, //01 0111 0000
- OP_LDRB_REG_OFF, //01 0111 0001
- OP_LDRB_REG_OFF, //01 0111 0010
- OP_LDRB_REG_OFF, //01 0111 0011
- OP_LDRB_REG_OFF, //01 0111 0100
- OP_LDRB_REG_OFF, //01 0111 0101
- OP_LDRB_REG_OFF, //01 0111 0110
- OP_LDRB_REG_OFF, //01 0111 0111
- OP_LDRSH_REG_OFF, //01 0111 1000
- OP_LDRSH_REG_OFF, //01 0111 1001
- OP_LDRSH_REG_OFF, //01 0111 1010
- OP_LDRSH_REG_OFF, //01 0111 1011
- OP_LDRSH_REG_OFF, //01 0111 1100
- OP_LDRSH_REG_OFF, //01 0111 1101
- OP_LDRSH_REG_OFF, //01 0111 1110
- OP_LDRSH_REG_OFF, //01 0111 1111
-
- OP_STR_IMM_OFF, //01 1000 0000
- OP_STR_IMM_OFF, //01 1000 0001
- OP_STR_IMM_OFF, //01 1000 0010
- OP_STR_IMM_OFF, //01 1000 0011
- OP_STR_IMM_OFF, //01 1000 0100
- OP_STR_IMM_OFF, //01 1000 0101
- OP_STR_IMM_OFF, //01 1000 0110
- OP_STR_IMM_OFF, //01 1000 0111
- OP_STR_IMM_OFF, //01 1000 1000
- OP_STR_IMM_OFF, //01 1000 1001
- OP_STR_IMM_OFF, //01 1000 1010
- OP_STR_IMM_OFF, //01 1000 1011
- OP_STR_IMM_OFF, //01 1000 1100
- OP_STR_IMM_OFF, //01 1000 1101
- OP_STR_IMM_OFF, //01 1000 1110
- OP_STR_IMM_OFF, //01 1000 1111
-
- OP_STR_IMM_OFF, //01 1001 0000
- OP_STR_IMM_OFF, //01 1001 0001
- OP_STR_IMM_OFF, //01 1001 0010
- OP_STR_IMM_OFF, //01 1001 0011
- OP_STR_IMM_OFF, //01 1001 0100
- OP_STR_IMM_OFF, //01 1001 0101
- OP_STR_IMM_OFF, //01 1001 0110
- OP_STR_IMM_OFF, //01 1001 0111
- OP_STR_IMM_OFF, //01 1001 1000
- OP_STR_IMM_OFF, //01 1001 1001
- OP_STR_IMM_OFF, //01 1001 1010
- OP_STR_IMM_OFF, //01 1001 1011
- OP_STR_IMM_OFF, //01 1001 1100
- OP_STR_IMM_OFF, //01 1001 1101
- OP_STR_IMM_OFF, //01 1001 1110
- OP_STR_IMM_OFF, //01 1001 1111
-
- OP_LDR_IMM_OFF, //01 1010 0000
- OP_LDR_IMM_OFF, //01 1010 0001
- OP_LDR_IMM_OFF, //01 1010 0010
- OP_LDR_IMM_OFF, //01 1010 0011
- OP_LDR_IMM_OFF, //01 1010 0100
- OP_LDR_IMM_OFF, //01 1010 0101
- OP_LDR_IMM_OFF, //01 1010 0110
- OP_LDR_IMM_OFF, //01 1010 0111
- OP_LDR_IMM_OFF, //01 1010 1000
- OP_LDR_IMM_OFF, //01 1010 1001
- OP_LDR_IMM_OFF, //01 1010 1010
- OP_LDR_IMM_OFF, //01 1010 1011
- OP_LDR_IMM_OFF, //01 1010 1100
- OP_LDR_IMM_OFF, //01 1010 1101
- OP_LDR_IMM_OFF, //01 1010 1110
- OP_LDR_IMM_OFF, //01 1010 1111
- 
- OP_LDR_IMM_OFF, //01 1011 0000
- OP_LDR_IMM_OFF, //01 1011 0001
- OP_LDR_IMM_OFF, //01 1011 0010
- OP_LDR_IMM_OFF, //01 1011 0011
- OP_LDR_IMM_OFF, //01 1011 0100
- OP_LDR_IMM_OFF, //01 1011 0101
- OP_LDR_IMM_OFF, //01 1011 0110
- OP_LDR_IMM_OFF, //01 1011 0111
- OP_LDR_IMM_OFF, //01 1011 1000
- OP_LDR_IMM_OFF, //01 1011 1001
- OP_LDR_IMM_OFF, //01 1011 1010
- OP_LDR_IMM_OFF, //01 1011 1011
- OP_LDR_IMM_OFF, //01 1011 1100
- OP_LDR_IMM_OFF, //01 1011 1101
- OP_LDR_IMM_OFF, //01 1011 1110
- OP_LDR_IMM_OFF, //01 1011 1111
-
- OP_STRB_IMM_OFF, //01 1100 0000
- OP_STRB_IMM_OFF, //01 1100 0001
- OP_STRB_IMM_OFF, //01 1100 0010
- OP_STRB_IMM_OFF, //01 1100 0011
- OP_STRB_IMM_OFF, //01 1100 0100
- OP_STRB_IMM_OFF, //01 1100 0101
- OP_STRB_IMM_OFF, //01 1100 0110
- OP_STRB_IMM_OFF, //01 1100 0111
- OP_STRB_IMM_OFF, //01 1100 1000
- OP_STRB_IMM_OFF, //01 1100 1001
- OP_STRB_IMM_OFF, //01 1100 1010
- OP_STRB_IMM_OFF, //01 1100 1011
- OP_STRB_IMM_OFF, //01 1100 1100
- OP_STRB_IMM_OFF, //01 1100 1101
- OP_STRB_IMM_OFF, //01 1100 1110
- OP_STRB_IMM_OFF, //01 1100 1111
-
- OP_STRB_IMM_OFF, //01 1101 0000
- OP_STRB_IMM_OFF, //01 1101 0001
- OP_STRB_IMM_OFF, //01 1101 0010
- OP_STRB_IMM_OFF, //01 1101 0011
- OP_STRB_IMM_OFF, //01 1101 0100
- OP_STRB_IMM_OFF, //01 1101 0101
- OP_STRB_IMM_OFF, //01 1101 0110
- OP_STRB_IMM_OFF, //01 1101 0111
- OP_STRB_IMM_OFF, //01 1101 1000
- OP_STRB_IMM_OFF, //01 1101 1001
- OP_STRB_IMM_OFF, //01 1101 1010
- OP_STRB_IMM_OFF, //01 1101 1011
- OP_STRB_IMM_OFF, //01 1101 1100
- OP_STRB_IMM_OFF, //01 1101 1101
- OP_STRB_IMM_OFF, //01 1101 1110
- OP_STRB_IMM_OFF, //01 1101 1111
-
- OP_LDRB_IMM_OFF, //01 1110 0000
- OP_LDRB_IMM_OFF, //01 1110 0001
- OP_LDRB_IMM_OFF, //01 1110 0010
- OP_LDRB_IMM_OFF, //01 1110 0011
- OP_LDRB_IMM_OFF, //01 1110 0100
- OP_LDRB_IMM_OFF, //01 1110 0101
- OP_LDRB_IMM_OFF, //01 1110 0110
- OP_LDRB_IMM_OFF, //01 1110 0111
- OP_LDRB_IMM_OFF, //01 1110 1000
- OP_LDRB_IMM_OFF, //01 1110 1001
- OP_LDRB_IMM_OFF, //01 1110 1010
- OP_LDRB_IMM_OFF, //01 1110 1011
- OP_LDRB_IMM_OFF, //01 1110 1100
- OP_LDRB_IMM_OFF, //01 1110 1101
- OP_LDRB_IMM_OFF, //01 1110 1110
- OP_LDRB_IMM_OFF, //01 1110 1111
-
- OP_LDRB_IMM_OFF, //01 1111 0000
- OP_LDRB_IMM_OFF, //01 1111 0001
- OP_LDRB_IMM_OFF, //01 1111 0010
- OP_LDRB_IMM_OFF, //01 1111 0011
- OP_LDRB_IMM_OFF, //01 1111 0100
- OP_LDRB_IMM_OFF, //01 1111 0101
- OP_LDRB_IMM_OFF, //01 1111 0110
- OP_LDRB_IMM_OFF, //01 1111 0111
- OP_LDRB_IMM_OFF, //01 1111 1000
- OP_LDRB_IMM_OFF, //01 1111 1001
- OP_LDRB_IMM_OFF, //01 1111 1010
- OP_LDRB_IMM_OFF, //01 1111 1011
- OP_LDRB_IMM_OFF, //01 1111 1100
- OP_LDRB_IMM_OFF, //01 1111 1101
- OP_LDRB_IMM_OFF, //01 1111 1110
- OP_LDRB_IMM_OFF, //01 1111 1111
-
- OP_STRH_IMM_OFF, //10 0000 0000
- OP_STRH_IMM_OFF, //10 0000 0001
- OP_STRH_IMM_OFF, //10 0000 0010
- OP_STRH_IMM_OFF, //10 0000 0011
- OP_STRH_IMM_OFF, //10 0000 0100
- OP_STRH_IMM_OFF, //10 0000 0101
- OP_STRH_IMM_OFF, //10 0000 0110
- OP_STRH_IMM_OFF, //10 0000 0111
- OP_STRH_IMM_OFF, //10 0000 1000
- OP_STRH_IMM_OFF, //10 0000 1001
- OP_STRH_IMM_OFF, //10 0000 1010
- OP_STRH_IMM_OFF, //10 0000 1011
- OP_STRH_IMM_OFF, //10 0000 1100
- OP_STRH_IMM_OFF, //10 0000 1101
- OP_STRH_IMM_OFF, //10 0000 1110
- OP_STRH_IMM_OFF, //10 0000 1111
-
- OP_STRH_IMM_OFF, //10 0001 0000
- OP_STRH_IMM_OFF, //10 0001 0001
- OP_STRH_IMM_OFF, //10 0001 0010
- OP_STRH_IMM_OFF, //10 0001 0011
- OP_STRH_IMM_OFF, //10 0001 0100
- OP_STRH_IMM_OFF, //10 0001 0101
- OP_STRH_IMM_OFF, //10 0001 0110
- OP_STRH_IMM_OFF, //10 0001 0111
- OP_STRH_IMM_OFF, //10 0001 1000
- OP_STRH_IMM_OFF, //10 0001 1001
- OP_STRH_IMM_OFF, //10 0001 1010
- OP_STRH_IMM_OFF, //10 0001 1011
- OP_STRH_IMM_OFF, //10 0001 1100
- OP_STRH_IMM_OFF, //10 0001 1101
- OP_STRH_IMM_OFF, //10 0001 1110
- OP_STRH_IMM_OFF, //10 0001 1111
-
- OP_LDRH_IMM_OFF, //10 0010 0000
- OP_LDRH_IMM_OFF, //10 0010 0001
- OP_LDRH_IMM_OFF, //10 0010 0010
- OP_LDRH_IMM_OFF, //10 0010 0011
- OP_LDRH_IMM_OFF, //10 0010 0100
- OP_LDRH_IMM_OFF, //10 0010 0101
- OP_LDRH_IMM_OFF, //10 0010 0110
- OP_LDRH_IMM_OFF, //10 0010 0111
- OP_LDRH_IMM_OFF, //10 0010 1000
- OP_LDRH_IMM_OFF, //10 0010 1001
- OP_LDRH_IMM_OFF, //10 0010 1010
- OP_LDRH_IMM_OFF, //10 0010 1011
- OP_LDRH_IMM_OFF, //10 0010 1100
- OP_LDRH_IMM_OFF, //10 0010 1101
- OP_LDRH_IMM_OFF, //10 0010 1110
- OP_LDRH_IMM_OFF, //10 0010 1111
-
- OP_LDRH_IMM_OFF, //10 0011 0000
- OP_LDRH_IMM_OFF, //10 0011 0001
- OP_LDRH_IMM_OFF, //10 0011 0010
- OP_LDRH_IMM_OFF, //10 0011 0011
- OP_LDRH_IMM_OFF, //10 0011 0100
- OP_LDRH_IMM_OFF, //10 0011 0101
- OP_LDRH_IMM_OFF, //10 0011 0110
- OP_LDRH_IMM_OFF, //10 0011 0111
- OP_LDRH_IMM_OFF, //10 0011 1000
- OP_LDRH_IMM_OFF, //10 0011 1001
- OP_LDRH_IMM_OFF, //10 0011 1010
- OP_LDRH_IMM_OFF, //10 0011 1011
- OP_LDRH_IMM_OFF, //10 0011 1100
- OP_LDRH_IMM_OFF, //10 0011 1101
- OP_LDRH_IMM_OFF, //10 0011 1110
- OP_LDRH_IMM_OFF, //10 0011 1111
-
- OP_STR_SPREL, //10 0100 0000
- OP_STR_SPREL, //10 0100 0001
- OP_STR_SPREL, //10 0100 0010
- OP_STR_SPREL, //10 0100 0011
- OP_STR_SPREL, //10 0100 0100
- OP_STR_SPREL, //10 0100 0101
- OP_STR_SPREL, //10 0100 0110
- OP_STR_SPREL, //10 0100 0111
- OP_STR_SPREL, //10 0100 1000
- OP_STR_SPREL, //10 0100 1001
- OP_STR_SPREL, //10 0100 1010
- OP_STR_SPREL, //10 0100 1011
- OP_STR_SPREL, //10 0100 1100
- OP_STR_SPREL, //10 0100 1101
- OP_STR_SPREL, //10 0100 1110
- OP_STR_SPREL, //10 0100 1111
-
- OP_STR_SPREL, //10 0101 0000
- OP_STR_SPREL, //10 0101 0001
- OP_STR_SPREL, //10 0101 0010
- OP_STR_SPREL, //10 0101 0011
- OP_STR_SPREL, //10 0101 0100
- OP_STR_SPREL, //10 0101 0101
- OP_STR_SPREL, //10 0101 0110
- OP_STR_SPREL, //10 0101 0111
- OP_STR_SPREL, //10 0101 1000
- OP_STR_SPREL, //10 0101 1001
- OP_STR_SPREL, //10 0101 1010
- OP_STR_SPREL, //10 0101 1011
- OP_STR_SPREL, //10 0101 1100
- OP_STR_SPREL, //10 0101 1101
- OP_STR_SPREL, //10 0101 1110
- OP_STR_SPREL, //10 0101 1111
-
- OP_LDR_SPREL, //10 0110 0000
- OP_LDR_SPREL, //10 0110 0001
- OP_LDR_SPREL, //10 0110 0010
- OP_LDR_SPREL, //10 0110 0011
- OP_LDR_SPREL, //10 0110 0100
- OP_LDR_SPREL, //10 0110 0101
- OP_LDR_SPREL, //10 0110 0110
- OP_LDR_SPREL, //10 0110 0111
- OP_LDR_SPREL, //10 0110 1000
- OP_LDR_SPREL, //10 0110 1001
- OP_LDR_SPREL, //10 0110 1010
- OP_LDR_SPREL, //10 0110 1011
- OP_LDR_SPREL, //10 0110 1100
- OP_LDR_SPREL, //10 0110 1101
- OP_LDR_SPREL, //10 0110 1110
- OP_LDR_SPREL, //10 0110 1111
-
- OP_LDR_SPREL, //10 0111 0000
- OP_LDR_SPREL, //10 0111 0001
- OP_LDR_SPREL, //10 0111 0010
- OP_LDR_SPREL, //10 0111 0011
- OP_LDR_SPREL, //10 0111 0100
- OP_LDR_SPREL, //10 0111 0101
- OP_LDR_SPREL, //10 0111 0110
- OP_LDR_SPREL, //10 0111 0111
- OP_LDR_SPREL, //10 0111 1000
- OP_LDR_SPREL, //10 0111 1001
- OP_LDR_SPREL, //10 0111 1010
- OP_LDR_SPREL, //10 0111 1011
- OP_LDR_SPREL, //10 0111 1100
- OP_LDR_SPREL, //10 0111 1101
- OP_LDR_SPREL, //10 0111 1110
- OP_LDR_SPREL, //10 0111 1111
-
- OP_ADD_2PC, //10 1000 0000
- OP_ADD_2PC, //10 1000 0001
- OP_ADD_2PC, //10 1000 0010
- OP_ADD_2PC, //10 1000 0011
- OP_ADD_2PC, //10 1000 0100
- OP_ADD_2PC, //10 1000 0101
- OP_ADD_2PC, //10 1000 0110
- OP_ADD_2PC, //10 1000 0111
- OP_ADD_2PC, //10 1000 1000
- OP_ADD_2PC, //10 1000 1001
- OP_ADD_2PC, //10 1000 1010
- OP_ADD_2PC, //10 1000 1011
- OP_ADD_2PC, //10 1000 1100
- OP_ADD_2PC, //10 1000 1101
- OP_ADD_2PC, //10 1000 1110
- OP_ADD_2PC, //10 1000 1111
-
- OP_ADD_2PC, //10 1001 0000
- OP_ADD_2PC, //10 1001 0001
- OP_ADD_2PC, //10 1001 0010
- OP_ADD_2PC, //10 1001 0011
- OP_ADD_2PC, //10 1001 0100
- OP_ADD_2PC, //10 1001 0101
- OP_ADD_2PC, //10 1001 0110
- OP_ADD_2PC, //10 1001 0111
- OP_ADD_2PC, //10 1001 1000
- OP_ADD_2PC, //10 1001 1001
- OP_ADD_2PC, //10 1001 1010
- OP_ADD_2PC, //10 1001 1011
- OP_ADD_2PC, //10 1001 1100
- OP_ADD_2PC, //10 1001 1101
- OP_ADD_2PC, //10 1001 1110
- OP_ADD_2PC, //10 1001 1111
-
- OP_ADD_2SP, //10 1010 0000
- OP_ADD_2SP, //10 1010 0001
- OP_ADD_2SP, //10 1010 0010
- OP_ADD_2SP, //10 1010 0011
- OP_ADD_2SP, //10 1010 0100
- OP_ADD_2SP, //10 1010 0101
- OP_ADD_2SP, //10 1010 0110
- OP_ADD_2SP, //10 1010 0111
- OP_ADD_2SP, //10 1010 1000
- OP_ADD_2SP, //10 1010 1001
- OP_ADD_2SP, //10 1010 1010
- OP_ADD_2SP, //10 1010 1011
- OP_ADD_2SP, //10 1010 1100
- OP_ADD_2SP, //10 1010 1101
- OP_ADD_2SP, //10 1010 1110
- OP_ADD_2SP, //10 1010 1111
-
- OP_ADD_2SP, //10 1011 0000
- OP_ADD_2SP, //10 1011 0001
- OP_ADD_2SP, //10 1011 0010
- OP_ADD_2SP, //10 1011 0011
- OP_ADD_2SP, //10 1011 0100
- OP_ADD_2SP, //10 1011 0101
- OP_ADD_2SP, //10 1011 0110
- OP_ADD_2SP, //10 1011 0111
- OP_ADD_2SP, //10 1011 1000
- OP_ADD_2SP, //10 1011 1001
- OP_ADD_2SP, //10 1011 1010
- OP_ADD_2SP, //10 1011 1011
- OP_ADD_2SP, //10 1011 1100
- OP_ADD_2SP, //10 1011 1101
- OP_ADD_2SP, //10 1011 1110
- OP_ADD_2SP, //10 1011 1111
-
- OP_ADJUST_P_SP, //10 1100 0000
- OP_ADJUST_P_SP, //10 1100 0001
- OP_ADJUST_M_SP, //10 1100 0010
- OP_ADJUST_M_SP, //10 1100 0011
- OP_UND_THUMB, //10 1100 0100
- OP_UND_THUMB, //10 1100 0101
- OP_UND_THUMB, //10 1100 0110
- OP_UND_THUMB, //10 1100 0111
- OP_UND_THUMB, //10 1100 1000
- OP_UND_THUMB, //10 1100 1001
- OP_UND_THUMB, //10 1100 1010
- OP_UND_THUMB, //10 1100 1011
- OP_UND_THUMB, //10 1100 1100
- OP_UND_THUMB, //10 1100 1101
- OP_UND_THUMB, //10 1100 1110
- OP_UND_THUMB, //10 1100 1111
-
- OP_PUSH, //10 1101 0000
- OP_PUSH, //10 1101 0001
- OP_PUSH, //10 1101 0010
- OP_PUSH, //10 1101 0011
- OP_PUSH_LR, //10 1101 0100
- OP_PUSH_LR, //10 1101 0101
- OP_PUSH_LR, //10 1101 0110
- OP_PUSH_LR, //10 1101 0111
- OP_UND_THUMB, //10 1101 1000
- OP_UND_THUMB, //10 1101 1001
- OP_UND_THUMB, //10 1101 1010
- OP_UND_THUMB, //10 1101 1011
- OP_UND_THUMB, //10 1101 1100
- OP_UND_THUMB, //10 1101 1101
- OP_UND_THUMB, //10 1101 1110
- OP_UND_THUMB, //10 1101 1111
-
- OP_UND_THUMB, //10 1110 0000
- OP_UND_THUMB, //10 1110 0001
- OP_UND_THUMB, //10 1110 0010
- OP_UND_THUMB, //10 1110 0011
- OP_UND_THUMB, //10 1110 0100
- OP_UND_THUMB, //10 1110 0101
- OP_UND_THUMB, //10 1110 0110
- OP_UND_THUMB, //10 1110 0111
- OP_UND_THUMB, //10 1110 1000
- OP_UND_THUMB, //10 1110 1001
- OP_UND_THUMB, //10 1110 1010
- OP_UND_THUMB, //10 1110 1011
- OP_UND_THUMB, //10 1110 1100
- OP_UND_THUMB, //10 1110 1101
- OP_UND_THUMB, //10 1110 1110
- OP_UND_THUMB, //10 1110 1111
-
- OP_POP, //10 1111 0000
- OP_POP, //10 1111 0001
- OP_POP, //10 1111 0010
- OP_POP, //10 1111 0011
- OP_POP_PC, //10 1111 0100
- OP_POP_PC, //10 1111 0101
- OP_POP_PC, //10 1111 0110
- OP_POP_PC, //10 1111 0111
- OP_BKPT_THUMB, //10 1111 1000
- OP_BKPT_THUMB, //10 1111 1001
- OP_BKPT_THUMB, //10 1111 1010
- OP_BKPT_THUMB, //10 1111 1011
- OP_UND_THUMB, //10 1111 1100
- OP_UND_THUMB, //10 1111 1101
- OP_UND_THUMB, //10 1111 1110
- OP_UND_THUMB, //10 1111 1111
-
- OP_STMIA_THUMB, //11 0000 0000
- OP_STMIA_THUMB, //11 0000 0001
- OP_STMIA_THUMB, //11 0000 0010
- OP_STMIA_THUMB, //11 0000 0011
- OP_STMIA_THUMB, //11 0000 0100
- OP_STMIA_THUMB, //11 0000 0101
- OP_STMIA_THUMB, //11 0000 0110
- OP_STMIA_THUMB, //11 0000 0111
- OP_STMIA_THUMB, //11 0000 1000
- OP_STMIA_THUMB, //11 0000 1001
- OP_STMIA_THUMB, //11 0000 1010
- OP_STMIA_THUMB, //11 0000 1011
- OP_STMIA_THUMB, //11 0000 1100
- OP_STMIA_THUMB, //11 0000 1101
- OP_STMIA_THUMB, //11 0000 1110
- OP_STMIA_THUMB, //11 0000 1111
-
- OP_STMIA_THUMB, //11 0001 0000
- OP_STMIA_THUMB, //11 0001 0001
- OP_STMIA_THUMB, //11 0001 0010
- OP_STMIA_THUMB, //11 0001 0011
- OP_STMIA_THUMB, //11 0001 0100
- OP_STMIA_THUMB, //11 0001 0101
- OP_STMIA_THUMB, //11 0001 0110
- OP_STMIA_THUMB, //11 0001 0111
- OP_STMIA_THUMB, //11 0001 1000
- OP_STMIA_THUMB, //11 0001 1001
- OP_STMIA_THUMB, //11 0001 1010
- OP_STMIA_THUMB, //11 0001 1011
- OP_STMIA_THUMB, //11 0001 1100
- OP_STMIA_THUMB, //11 0001 1101
- OP_STMIA_THUMB, //11 0001 1110
- OP_STMIA_THUMB, //11 0001 1111
-
- OP_LDMIA_THUMB, //11 0010 0000
- OP_LDMIA_THUMB, //11 0010 0001
- OP_LDMIA_THUMB, //11 0010 0010
- OP_LDMIA_THUMB, //11 0010 0011
- OP_LDMIA_THUMB, //11 0010 0100
- OP_LDMIA_THUMB, //11 0010 0101
- OP_LDMIA_THUMB, //11 0010 0110
- OP_LDMIA_THUMB, //11 0010 0111
- OP_LDMIA_THUMB, //11 0010 1000
- OP_LDMIA_THUMB, //11 0010 1001
- OP_LDMIA_THUMB, //11 0010 1010
- OP_LDMIA_THUMB, //11 0010 1011
- OP_LDMIA_THUMB, //11 0010 1100
- OP_LDMIA_THUMB, //11 0010 1101
- OP_LDMIA_THUMB, //11 0010 1110
- OP_LDMIA_THUMB, //11 0010 1111
-
- OP_LDMIA_THUMB, //11 0011 0000
- OP_LDMIA_THUMB, //11 0011 0001
- OP_LDMIA_THUMB, //11 0011 0010
- OP_LDMIA_THUMB, //11 0011 0011
- OP_LDMIA_THUMB, //11 0011 0100
- OP_LDMIA_THUMB, //11 0011 0101
- OP_LDMIA_THUMB, //11 0011 0110
- OP_LDMIA_THUMB, //11 0011 0111
- OP_LDMIA_THUMB, //11 0011 1000
- OP_LDMIA_THUMB, //11 0011 1001
- OP_LDMIA_THUMB, //11 0011 1010
- OP_LDMIA_THUMB, //11 0011 1011
- OP_LDMIA_THUMB, //11 0011 1100
- OP_LDMIA_THUMB, //11 0011 1101
- OP_LDMIA_THUMB, //11 0011 1110
- OP_LDMIA_THUMB, //11 0011 1111
-
- OP_B_COND, //11 0100 0000
- OP_B_COND, //11 0100 0001
- OP_B_COND, //11 0100 0010
- OP_B_COND, //11 0100 0011
- OP_B_COND, //11 0100 0100
- OP_B_COND, //11 0100 0101
- OP_B_COND, //11 0100 0110
- OP_B_COND, //11 0100 0111
- OP_B_COND, //11 0100 1000
- OP_B_COND, //11 0100 1001
- OP_B_COND, //11 0100 1010
- OP_B_COND, //11 0100 1011
- OP_B_COND, //11 0100 1100
- OP_B_COND, //11 0100 1101
- OP_B_COND, //11 0100 1110
- OP_B_COND, //11 0100 1111
-
- OP_B_COND, //11 0101 0000
- OP_B_COND, //11 0101 0001
- OP_B_COND, //11 0101 0010
- OP_B_COND, //11 0101 0011
- OP_B_COND, //11 0101 0100
- OP_B_COND, //11 0101 0101
- OP_B_COND, //11 0101 0110
- OP_B_COND, //11 0101 0111
- OP_B_COND, //11 0101 1000
- OP_B_COND, //11 0101 1001
- OP_B_COND, //11 0101 1010
- OP_B_COND, //11 0101 1011
- OP_B_COND, //11 0101 1100
- OP_B_COND, //11 0101 1101
- OP_B_COND, //11 0101 1110
- OP_B_COND, //11 0101 1111
-
- OP_B_COND, //11 0110 0000
- OP_B_COND, //11 0110 0001
- OP_B_COND, //11 0110 0010
- OP_B_COND, //11 0110 0011
- OP_B_COND, //11 0110 0100
- OP_B_COND, //11 0110 0101
- OP_B_COND, //11 0110 0110
- OP_B_COND, //11 0110 0111
- OP_B_COND, //11 0110 1000
- OP_B_COND, //11 0110 1001
- OP_B_COND, //11 0110 1010
- OP_B_COND, //11 0110 1011
- OP_B_COND, //11 0110 1100
- OP_B_COND, //11 0110 1101
- OP_B_COND, //11 0110 1110
- OP_B_COND, //11 0110 1111
-
- OP_B_COND, //11 0111 0000
- OP_B_COND, //11 0111 0001
- OP_B_COND, //11 0111 0010
- OP_B_COND, //11 0111 0011
- OP_B_COND, //11 0111 0100
- OP_B_COND, //11 0111 0101
- OP_B_COND, //11 0111 0110
- OP_B_COND, //11 0111 0111
- OP_B_COND, //11 0111 1000
- OP_B_COND, //11 0111 1001
- OP_B_COND, //11 0111 1010
- OP_B_COND, //11 0111 1011
- OP_SWI_THUMB, //11 0111 1100
- OP_SWI_THUMB, //11 0111 1101
- OP_SWI_THUMB, //11 0111 1110
- OP_SWI_THUMB, //11 0111 1111
-
- OP_B_UNCOND, //11 1000 0000
- OP_B_UNCOND, //11 1000 0001
- OP_B_UNCOND, //11 1000 0010
- OP_B_UNCOND, //11 1000 0011
- OP_B_UNCOND, //11 1000 0100
- OP_B_UNCOND, //11 1000 0101
- OP_B_UNCOND, //11 1000 0110
- OP_B_UNCOND, //11 1000 0111
- OP_B_UNCOND, //11 1000 1000
- OP_B_UNCOND, //11 1000 1001
- OP_B_UNCOND, //11 1000 1010
- OP_B_UNCOND, //11 1000 1011
- OP_B_UNCOND, //11 1000 1100
- OP_B_UNCOND, //11 1000 1101
- OP_B_UNCOND, //11 1000 1110
- OP_B_UNCOND, //11 1000 1111
-
- OP_B_UNCOND, //11 1001 0000
- OP_B_UNCOND, //11 1001 0001
- OP_B_UNCOND, //11 1001 0010
- OP_B_UNCOND, //11 1001 0011
- OP_B_UNCOND, //11 1001 0100
- OP_B_UNCOND, //11 1001 0101
- OP_B_UNCOND, //11 1001 0110
- OP_B_UNCOND, //11 1001 0111
- OP_B_UNCOND, //11 1001 1000
- OP_B_UNCOND, //11 1001 1001
- OP_B_UNCOND, //11 1001 1010
- OP_B_UNCOND, //11 1001 1011
- OP_B_UNCOND, //11 1001 1100
- OP_B_UNCOND, //11 1001 1101
- OP_B_UNCOND, //11 1001 1110
- OP_B_UNCOND, //11 1001 1111
-
- OP_BLX, //11 1010 0000
- OP_BLX, //11 1010 0001
- OP_BLX, //11 1010 0010
- OP_BLX, //11 1010 0011
- OP_BLX, //11 1010 0100
- OP_BLX, //11 1010 0101
- OP_BLX, //11 1010 0110
- OP_BLX, //11 1010 0111
- OP_BLX, //11 1010 1000
- OP_BLX, //11 1010 1001
- OP_BLX, //11 1010 1010
- OP_BLX, //11 1010 1011
- OP_BLX, //11 1010 1100
- OP_BLX, //11 1010 1101
- OP_BLX, //11 1010 1110
- OP_BLX, //11 1010 1111
-
- OP_BLX, //11 1011 0000
- OP_BLX, //11 1011 0001
- OP_BLX, //11 1011 0010
- OP_BLX, //11 1011 0011
- OP_BLX, //11 1011 0100
- OP_BLX, //11 1011 0101
- OP_BLX, //11 1011 0110
- OP_BLX, //11 1011 0111
- OP_BLX, //11 1011 1000
- OP_BLX, //11 1011 1001
- OP_BLX, //11 1011 1010
- OP_BLX, //11 1011 1011
- OP_BLX, //11 1011 1100
- OP_BLX, //11 1011 1101
- OP_BLX, //11 1011 1110
- OP_BLX, //11 1011 1111
-
- OP_BL_10, //11 1100 0000
- OP_BL_10, //11 1100 0001
- OP_BL_10, //11 1100 0010
- OP_BL_10, //11 1100 0011
- OP_BL_10, //11 1100 0100
- OP_BL_10, //11 1100 0101
- OP_BL_10, //11 1100 0110
- OP_BL_10, //11 1100 0111
- OP_BL_10, //11 1100 1000
- OP_BL_10, //11 1100 1001
- OP_BL_10, //11 1100 1010
- OP_BL_10, //11 1100 1011
- OP_BL_10, //11 1100 1100
- OP_BL_10, //11 1100 1101
- OP_BL_10, //11 1100 1110
- OP_BL_10, //11 1100 1111
-
- OP_BL_10, //11 1101 0000
- OP_BL_10, //11 1101 0001
- OP_BL_10, //11 1101 0010
- OP_BL_10, //11 1101 0011
- OP_BL_10, //11 1101 0100
- OP_BL_10, //11 1101 0101
- OP_BL_10, //11 1101 0110
- OP_BL_10, //11 1101 0111
- OP_BL_10, //11 1101 1000
- OP_BL_10, //11 1101 1001
- OP_BL_10, //11 1101 1010
- OP_BL_10, //11 1101 1011
- OP_BL_10, //11 1101 1100
- OP_BL_10, //11 1101 1101
- OP_BL_10, //11 1101 1110
- OP_BL_10, //11 1101 1111
-
- OP_BL_THUMB, //11 1110 0000
- OP_BL_THUMB, //11 1110 0001
- OP_BL_THUMB, //11 1110 0010
- OP_BL_THUMB, //11 1110 0011
- OP_BL_THUMB, //11 1110 0100
- OP_BL_THUMB, //11 1110 0101
- OP_BL_THUMB, //11 1110 0110
- OP_BL_THUMB, //11 1110 0111
- OP_BL_THUMB, //11 1110 1000
- OP_BL_THUMB, //11 1110 1001
- OP_BL_THUMB, //11 1110 1010
- OP_BL_THUMB, //11 1110 1011
- OP_BL_THUMB, //11 1110 1100
- OP_BL_THUMB, //11 1110 1101
- OP_BL_THUMB, //11 1110 1110
- OP_BL_THUMB, //11 1110 1111
-
- OP_BL_THUMB, //11 1111 0000
- OP_BL_THUMB, //11 1111 0001
- OP_BL_THUMB, //11 1111 0010
- OP_BL_THUMB, //11 1111 0011
- OP_BL_THUMB, //11 1111 0100
- OP_BL_THUMB, //11 1111 0101
- OP_BL_THUMB, //11 1111 0110
- OP_BL_THUMB, //11 1111 0111
- OP_BL_THUMB, //11 1111 1000
- OP_BL_THUMB, //11 1111 1001
- OP_BL_THUMB, //11 1111 1010
- OP_BL_THUMB, //11 1111 1011
- OP_BL_THUMB, //11 1111 1100
- OP_BL_THUMB, //11 1111 1101
- OP_BL_THUMB, //11 1111 1110
- OP_BL_THUMB, //11 1111 1111
-}; //1089
- 
+/* 00 0000 0000 */ TABDECL(OP_LSL_0),		// OP_LSL_0
+/* 00 0000 0001 */ TABDECL(OP_LSL),		// OP_LSL
+/* 00 0000 0010 */ TABDECL(OP_LSL),		// OP_LSL
+/* 00 0000 0011 */ TABDECL(OP_LSL),		// OP_LSL
+/* 00 0000 0100 */ TABDECL(OP_LSL),		// OP_LSL
+/* 00 0000 0101 */ TABDECL(OP_LSL),		// OP_LSL
+/* 00 0000 0110 */ TABDECL(OP_LSL),		// OP_LSL
+/* 00 0000 0111 */ TABDECL(OP_LSL),		// OP_LSL
+/* 00 0000 1000 */ TABDECL(OP_LSL),		// OP_LSL
+/* 00 0000 1001 */ TABDECL(OP_LSL),		// OP_LSL
+/* 00 0000 1010 */ TABDECL(OP_LSL),		// OP_LSL
+/* 00 0000 1011 */ TABDECL(OP_LSL),		// OP_LSL
+/* 00 0000 1100 */ TABDECL(OP_LSL),		// OP_LSL
+/* 00 0000 1101 */ TABDECL(OP_LSL),		// OP_LSL
+/* 00 0000 1110 */ TABDECL(OP_LSL),		// OP_LSL
+/* 00 0000 1111 */ TABDECL(OP_LSL),		// OP_LSL
+
+/* 00 0001 0000 */ TABDECL(OP_LSL),		// OP_LSL
+/* 00 0001 0001 */ TABDECL(OP_LSL),		// OP_LSL
+/* 00 0001 0010 */ TABDECL(OP_LSL),		// OP_LSL
+/* 00 0001 0011 */ TABDECL(OP_LSL),		// OP_LSL
+/* 00 0001 0100 */ TABDECL(OP_LSL),		// OP_LSL
+/* 00 0001 0101 */ TABDECL(OP_LSL),		// OP_LSL
+/* 00 0001 0110 */ TABDECL(OP_LSL),		// OP_LSL
+/* 00 0001 0111 */ TABDECL(OP_LSL),		// OP_LSL
+/* 00 0001 1000 */ TABDECL(OP_LSL),		// OP_LSL
+/* 00 0001 1001 */ TABDECL(OP_LSL),		// OP_LSL
+/* 00 0001 1010 */ TABDECL(OP_LSL),		// OP_LSL
+/* 00 0001 1011 */ TABDECL(OP_LSL),		// OP_LSL
+/* 00 0001 1100 */ TABDECL(OP_LSL),		// OP_LSL
+/* 00 0001 1101 */ TABDECL(OP_LSL),		// OP_LSL
+/* 00 0001 1110 */ TABDECL(OP_LSL),		// OP_LSL
+/* 00 0001 1111 */ TABDECL(OP_LSL),		// OP_LSL
+
+/* 00 0010 0000 */ TABDECL(OP_LSR_0),		// OP_LSR_0
+/* 00 0010 0001 */ TABDECL(OP_LSR),		// OP_LSR
+/* 00 0010 0010 */ TABDECL(OP_LSR),		// OP_LSR
+/* 00 0010 0011 */ TABDECL(OP_LSR),		// OP_LSR
+/* 00 0010 0100 */ TABDECL(OP_LSR),		// OP_LSR
+/* 00 0010 0101 */ TABDECL(OP_LSR),		// OP_LSR
+/* 00 0010 0110 */ TABDECL(OP_LSR),		// OP_LSR
+/* 00 0010 0111 */ TABDECL(OP_LSR),		// OP_LSR
+/* 00 0010 1000 */ TABDECL(OP_LSR),		// OP_LSR
+/* 00 0010 1001 */ TABDECL(OP_LSR),		// OP_LSR
+/* 00 0010 1010 */ TABDECL(OP_LSR),		// OP_LSR
+/* 00 0010 1011 */ TABDECL(OP_LSR),		// OP_LSR
+/* 00 0010 1100 */ TABDECL(OP_LSR),		// OP_LSR
+/* 00 0010 1101 */ TABDECL(OP_LSR),		// OP_LSR
+/* 00 0010 1110 */ TABDECL(OP_LSR),		// OP_LSR
+/* 00 0010 1111 */ TABDECL(OP_LSR),		// OP_LSR
+
+/* 00 0011 0000 */ TABDECL(OP_LSR),		// OP_LSR
+/* 00 0011 0001 */ TABDECL(OP_LSR),		// OP_LSR
+/* 00 0011 0010 */ TABDECL(OP_LSR),		// OP_LSR
+/* 00 0011 0011 */ TABDECL(OP_LSR),		// OP_LSR
+/* 00 0011 0100 */ TABDECL(OP_LSR),		// OP_LSR
+/* 00 0011 0101 */ TABDECL(OP_LSR),		// OP_LSR
+/* 00 0011 0110 */ TABDECL(OP_LSR),		// OP_LSR
+/* 00 0011 0111 */ TABDECL(OP_LSR),		// OP_LSR
+/* 00 0011 1000 */ TABDECL(OP_LSR),		// OP_LSR
+/* 00 0011 1001 */ TABDECL(OP_LSR),		// OP_LSR
+/* 00 0011 1010 */ TABDECL(OP_LSR),		// OP_LSR
+/* 00 0011 1011 */ TABDECL(OP_LSR),		// OP_LSR
+/* 00 0011 1100 */ TABDECL(OP_LSR),		// OP_LSR
+/* 00 0011 1101 */ TABDECL(OP_LSR),		// OP_LSR
+/* 00 0011 1110 */ TABDECL(OP_LSR),		// OP_LSR
+/* 00 0011 1111 */ TABDECL(OP_LSR),		// OP_LSR
+
+/* 00 0100 0000 */ TABDECL(OP_ASR_0),		// OP_ASR_0
+/* 00 0100 0001 */ TABDECL(OP_ASR),		// OP_ASR
+/* 00 0100 0010 */ TABDECL(OP_ASR),		// OP_ASR
+/* 00 0100 0011 */ TABDECL(OP_ASR),		// OP_ASR
+/* 00 0100 0100 */ TABDECL(OP_ASR),		// OP_ASR
+/* 00 0100 0101 */ TABDECL(OP_ASR),		// OP_ASR
+/* 00 0100 0110 */ TABDECL(OP_ASR),		// OP_ASR
+/* 00 0100 0111 */ TABDECL(OP_ASR),		// OP_ASR
+/* 00 0100 1000 */ TABDECL(OP_ASR),		// OP_ASR
+/* 00 0100 1001 */ TABDECL(OP_ASR),		// OP_ASR
+/* 00 0100 1010 */ TABDECL(OP_ASR),		// OP_ASR
+/* 00 0100 1011 */ TABDECL(OP_ASR),		// OP_ASR
+/* 00 0100 1100 */ TABDECL(OP_ASR),		// OP_ASR
+/* 00 0100 1101 */ TABDECL(OP_ASR),		// OP_ASR
+/* 00 0100 1110 */ TABDECL(OP_ASR),		// OP_ASR
+/* 00 0100 1111 */ TABDECL(OP_ASR),		// OP_ASR
+
+/* 00 0101 0000 */ TABDECL(OP_ASR),		// OP_ASR
+/* 00 0101 0001 */ TABDECL(OP_ASR),		// OP_ASR
+/* 00 0101 0010 */ TABDECL(OP_ASR),		// OP_ASR
+/* 00 0101 0011 */ TABDECL(OP_ASR),		// OP_ASR
+/* 00 0101 0100 */ TABDECL(OP_ASR),		// OP_ASR
+/* 00 0101 0101 */ TABDECL(OP_ASR),		// OP_ASR
+/* 00 0101 0110 */ TABDECL(OP_ASR),		// OP_ASR
+/* 00 0101 0111 */ TABDECL(OP_ASR),		// OP_ASR
+/* 00 0101 1000 */ TABDECL(OP_ASR),		// OP_ASR
+/* 00 0101 1001 */ TABDECL(OP_ASR),		// OP_ASR
+/* 00 0101 1010 */ TABDECL(OP_ASR),		// OP_ASR
+/* 00 0101 1011 */ TABDECL(OP_ASR),		// OP_ASR
+/* 00 0101 1100 */ TABDECL(OP_ASR),		// OP_ASR
+/* 00 0101 1101 */ TABDECL(OP_ASR),		// OP_ASR
+/* 00 0101 1110 */ TABDECL(OP_ASR),		// OP_ASR
+/* 00 0101 1111 */ TABDECL(OP_ASR),		// OP_ASR
+
+/* 00 0110 0000 */ TABDECL(OP_ADD_REG),		// OP_ADD_REG
+/* 00 0110 0001 */ TABDECL(OP_ADD_REG),		// OP_ADD_REG
+/* 00 0110 0010 */ TABDECL(OP_ADD_REG),		// OP_ADD_REG
+/* 00 0110 0011 */ TABDECL(OP_ADD_REG),		// OP_ADD_REG
+/* 00 0110 0100 */ TABDECL(OP_ADD_REG),		// OP_ADD_REG
+/* 00 0110 0101 */ TABDECL(OP_ADD_REG),		// OP_ADD_REG
+/* 00 0110 0110 */ TABDECL(OP_ADD_REG),		// OP_ADD_REG
+/* 00 0110 0111 */ TABDECL(OP_ADD_REG),		// OP_ADD_REG
+/* 00 0110 1000 */ TABDECL(OP_SUB_REG),		// OP_SUB_REG
+/* 00 0110 1001 */ TABDECL(OP_SUB_REG),		// OP_SUB_REG
+/* 00 0110 1010 */ TABDECL(OP_SUB_REG),		// OP_SUB_REG
+/* 00 0110 1011 */ TABDECL(OP_SUB_REG),		// OP_SUB_REG
+/* 00 0110 1100 */ TABDECL(OP_SUB_REG),		// OP_SUB_REG
+/* 00 0110 1101 */ TABDECL(OP_SUB_REG),		// OP_SUB_REG
+/* 00 0110 1110 */ TABDECL(OP_SUB_REG),		// OP_SUB_REG
+/* 00 0110 1111 */ TABDECL(OP_SUB_REG),		// OP_SUB_REG
+
+/* 00 0111 0000 */ TABDECL(OP_ADD_IMM3),		// OP_ADD_IMM3
+/* 00 0111 0001 */ TABDECL(OP_ADD_IMM3),		// OP_ADD_IMM3
+/* 00 0111 0010 */ TABDECL(OP_ADD_IMM3),		// OP_ADD_IMM3
+/* 00 0111 0011 */ TABDECL(OP_ADD_IMM3),		// OP_ADD_IMM3
+/* 00 0111 0100 */ TABDECL(OP_ADD_IMM3),		// OP_ADD_IMM3
+/* 00 0111 0101 */ TABDECL(OP_ADD_IMM3),		// OP_ADD_IMM3
+/* 00 0111 0110 */ TABDECL(OP_ADD_IMM3),		// OP_ADD_IMM3
+/* 00 0111 0111 */ TABDECL(OP_ADD_IMM3),		// OP_ADD_IMM3
+/* 00 0111 1000 */ TABDECL(OP_SUB_IMM3),		// OP_SUB_IMM3
+/* 00 0111 1001 */ TABDECL(OP_SUB_IMM3),		// OP_SUB_IMM3
+/* 00 0111 1010 */ TABDECL(OP_SUB_IMM3),		// OP_SUB_IMM3
+/* 00 0111 1011 */ TABDECL(OP_SUB_IMM3),		// OP_SUB_IMM3
+/* 00 0111 1100 */ TABDECL(OP_SUB_IMM3),		// OP_SUB_IMM3
+/* 00 0111 1101 */ TABDECL(OP_SUB_IMM3),		// OP_SUB_IMM3
+/* 00 0111 1110 */ TABDECL(OP_SUB_IMM3),		// OP_SUB_IMM3
+/* 00 0111 1111 */ TABDECL(OP_SUB_IMM3),		// OP_SUB_IMM3
+
+/* 00 1000 0000 */ TABDECL(OP_MOV_IMM8),		// OP_MOV_IMM8
+/* 00 1000 0001 */ TABDECL(OP_MOV_IMM8),		// OP_MOV_IMM8
+/* 00 1000 0010 */ TABDECL(OP_MOV_IMM8),		// OP_MOV_IMM8
+/* 00 1000 0011 */ TABDECL(OP_MOV_IMM8),		// OP_MOV_IMM8
+/* 00 1000 0100 */ TABDECL(OP_MOV_IMM8),		// OP_MOV_IMM8
+/* 00 1000 0101 */ TABDECL(OP_MOV_IMM8),		// OP_MOV_IMM8
+/* 00 1000 0110 */ TABDECL(OP_MOV_IMM8),		// OP_MOV_IMM8
+/* 00 1000 0111 */ TABDECL(OP_MOV_IMM8),		// OP_MOV_IMM8
+/* 00 1000 1000 */ TABDECL(OP_MOV_IMM8),		// OP_MOV_IMM8
+/* 00 1000 1001 */ TABDECL(OP_MOV_IMM8),		// OP_MOV_IMM8
+/* 00 1000 1010 */ TABDECL(OP_MOV_IMM8),		// OP_MOV_IMM8
+/* 00 1000 1011 */ TABDECL(OP_MOV_IMM8),		// OP_MOV_IMM8
+/* 00 1000 1100 */ TABDECL(OP_MOV_IMM8),		// OP_MOV_IMM8
+/* 00 1000 1101 */ TABDECL(OP_MOV_IMM8),		// OP_MOV_IMM8
+/* 00 1000 1110 */ TABDECL(OP_MOV_IMM8),		// OP_MOV_IMM8
+/* 00 1000 1111 */ TABDECL(OP_MOV_IMM8),		// OP_MOV_IMM8
+
+/* 00 1001 0000 */ TABDECL(OP_MOV_IMM8),		// OP_MOV_IMM8
+/* 00 1001 0001 */ TABDECL(OP_MOV_IMM8),		// OP_MOV_IMM8
+/* 00 1001 0010 */ TABDECL(OP_MOV_IMM8),		// OP_MOV_IMM8
+/* 00 1001 0011 */ TABDECL(OP_MOV_IMM8),		// OP_MOV_IMM8
+/* 00 1001 0100 */ TABDECL(OP_MOV_IMM8),		// OP_MOV_IMM8
+/* 00 1001 0101 */ TABDECL(OP_MOV_IMM8),		// OP_MOV_IMM8
+/* 00 1001 0110 */ TABDECL(OP_MOV_IMM8),		// OP_MOV_IMM8
+/* 00 1001 0111 */ TABDECL(OP_MOV_IMM8),		// OP_MOV_IMM8
+/* 00 1001 1000 */ TABDECL(OP_MOV_IMM8),		// OP_MOV_IMM8
+/* 00 1001 1001 */ TABDECL(OP_MOV_IMM8),		// OP_MOV_IMM8
+/* 00 1001 1010 */ TABDECL(OP_MOV_IMM8),		// OP_MOV_IMM8
+/* 00 1001 1011 */ TABDECL(OP_MOV_IMM8),		// OP_MOV_IMM8
+/* 00 1001 1100 */ TABDECL(OP_MOV_IMM8),		// OP_MOV_IMM8
+/* 00 1001 1101 */ TABDECL(OP_MOV_IMM8),		// OP_MOV_IMM8
+/* 00 1001 1110 */ TABDECL(OP_MOV_IMM8),		// OP_MOV_IMM8
+/* 00 1001 1111 */ TABDECL(OP_MOV_IMM8),		// OP_MOV_IMM8
+
+/* 00 1010 0000 */ TABDECL(OP_CMP_IMM8),		// OP_CMP_IMM8
+/* 00 1010 0001 */ TABDECL(OP_CMP_IMM8),		// OP_CMP_IMM8
+/* 00 1010 0010 */ TABDECL(OP_CMP_IMM8),		// OP_CMP_IMM8
+/* 00 1010 0011 */ TABDECL(OP_CMP_IMM8),		// OP_CMP_IMM8
+/* 00 1010 0100 */ TABDECL(OP_CMP_IMM8),		// OP_CMP_IMM8
+/* 00 1010 0101 */ TABDECL(OP_CMP_IMM8),		// OP_CMP_IMM8
+/* 00 1010 0110 */ TABDECL(OP_CMP_IMM8),		// OP_CMP_IMM8
+/* 00 1010 0111 */ TABDECL(OP_CMP_IMM8),		// OP_CMP_IMM8
+/* 00 1010 1000 */ TABDECL(OP_CMP_IMM8),		// OP_CMP_IMM8
+/* 00 1010 1001 */ TABDECL(OP_CMP_IMM8),		// OP_CMP_IMM8
+/* 00 1010 1010 */ TABDECL(OP_CMP_IMM8),		// OP_CMP_IMM8
+/* 00 1010 1011 */ TABDECL(OP_CMP_IMM8),		// OP_CMP_IMM8
+/* 00 1010 1100 */ TABDECL(OP_CMP_IMM8),		// OP_CMP_IMM8
+/* 00 1010 1101 */ TABDECL(OP_CMP_IMM8),		// OP_CMP_IMM8
+/* 00 1010 1110 */ TABDECL(OP_CMP_IMM8),		// OP_CMP_IMM8
+/* 00 1010 1111 */ TABDECL(OP_CMP_IMM8),		// OP_CMP_IMM8
+
+/* 00 1011 0000 */ TABDECL(OP_CMP_IMM8),		// OP_CMP_IMM8
+/* 00 1011 0001 */ TABDECL(OP_CMP_IMM8),		// OP_CMP_IMM8
+/* 00 1011 0010 */ TABDECL(OP_CMP_IMM8),		// OP_CMP_IMM8
+/* 00 1011 0011 */ TABDECL(OP_CMP_IMM8),		// OP_CMP_IMM8
+/* 00 1011 0100 */ TABDECL(OP_CMP_IMM8),		// OP_CMP_IMM8
+/* 00 1011 0101 */ TABDECL(OP_CMP_IMM8),		// OP_CMP_IMM8
+/* 00 1011 0110 */ TABDECL(OP_CMP_IMM8),		// OP_CMP_IMM8
+/* 00 1011 0111 */ TABDECL(OP_CMP_IMM8),		// OP_CMP_IMM8
+/* 00 1011 1000 */ TABDECL(OP_CMP_IMM8),		// OP_CMP_IMM8
+/* 00 1011 1001 */ TABDECL(OP_CMP_IMM8),		// OP_CMP_IMM8
+/* 00 1011 1010 */ TABDECL(OP_CMP_IMM8),		// OP_CMP_IMM8
+/* 00 1011 1011 */ TABDECL(OP_CMP_IMM8),		// OP_CMP_IMM8
+/* 00 1011 1100 */ TABDECL(OP_CMP_IMM8),		// OP_CMP_IMM8
+/* 00 1011 1101 */ TABDECL(OP_CMP_IMM8),		// OP_CMP_IMM8
+/* 00 1011 1110 */ TABDECL(OP_CMP_IMM8),		// OP_CMP_IMM8
+/* 00 1011 1111 */ TABDECL(OP_CMP_IMM8),		// OP_CMP_IMM8
+
+/* 00 1100 0000 */ TABDECL(OP_ADD_IMM8),		// OP_ADD_IMM8
+/* 00 1100 0001 */ TABDECL(OP_ADD_IMM8),		// OP_ADD_IMM8
+/* 00 1100 0010 */ TABDECL(OP_ADD_IMM8),		// OP_ADD_IMM8
+/* 00 1100 0011 */ TABDECL(OP_ADD_IMM8),		// OP_ADD_IMM8
+/* 00 1100 0100 */ TABDECL(OP_ADD_IMM8),		// OP_ADD_IMM8
+/* 00 1100 0101 */ TABDECL(OP_ADD_IMM8),		// OP_ADD_IMM8
+/* 00 1100 0110 */ TABDECL(OP_ADD_IMM8),		// OP_ADD_IMM8
+/* 00 1100 0111 */ TABDECL(OP_ADD_IMM8),		// OP_ADD_IMM8
+/* 00 1100 1000 */ TABDECL(OP_ADD_IMM8),		// OP_ADD_IMM8
+/* 00 1100 1001 */ TABDECL(OP_ADD_IMM8),		// OP_ADD_IMM8
+/* 00 1100 1010 */ TABDECL(OP_ADD_IMM8),		// OP_ADD_IMM8
+/* 00 1100 1011 */ TABDECL(OP_ADD_IMM8),		// OP_ADD_IMM8
+/* 00 1100 1100 */ TABDECL(OP_ADD_IMM8),		// OP_ADD_IMM8
+/* 00 1100 1101 */ TABDECL(OP_ADD_IMM8),		// OP_ADD_IMM8
+/* 00 1100 1110 */ TABDECL(OP_ADD_IMM8),		// OP_ADD_IMM8
+/* 00 1100 1111 */ TABDECL(OP_ADD_IMM8),		// OP_ADD_IMM8
+
+/* 00 1101 0000 */ TABDECL(OP_ADD_IMM8),		// OP_ADD_IMM8
+/* 00 1101 0001 */ TABDECL(OP_ADD_IMM8),		// OP_ADD_IMM8
+/* 00 1101 0010 */ TABDECL(OP_ADD_IMM8),		// OP_ADD_IMM8
+/* 00 1101 0011 */ TABDECL(OP_ADD_IMM8),		// OP_ADD_IMM8
+/* 00 1101 0100 */ TABDECL(OP_ADD_IMM8),		// OP_ADD_IMM8
+/* 00 1101 0101 */ TABDECL(OP_ADD_IMM8),		// OP_ADD_IMM8
+/* 00 1101 0110 */ TABDECL(OP_ADD_IMM8),		// OP_ADD_IMM8
+/* 00 1101 0111 */ TABDECL(OP_ADD_IMM8),		// OP_ADD_IMM8
+/* 00 1101 1000 */ TABDECL(OP_ADD_IMM8),		// OP_ADD_IMM8
+/* 00 1101 1001 */ TABDECL(OP_ADD_IMM8),		// OP_ADD_IMM8
+/* 00 1101 1010 */ TABDECL(OP_ADD_IMM8),		// OP_ADD_IMM8
+/* 00 1101 1011 */ TABDECL(OP_ADD_IMM8),		// OP_ADD_IMM8
+/* 00 1101 1100 */ TABDECL(OP_ADD_IMM8),		// OP_ADD_IMM8
+/* 00 1101 1101 */ TABDECL(OP_ADD_IMM8),		// OP_ADD_IMM8
+/* 00 1101 1110 */ TABDECL(OP_ADD_IMM8),		// OP_ADD_IMM8
+/* 00 1101 1111 */ TABDECL(OP_ADD_IMM8),		// OP_ADD_IMM8
+
+/* 00 1110 0000 */ TABDECL(OP_SUB_IMM8),		// OP_SUB_IMM8
+/* 00 1110 0001 */ TABDECL(OP_SUB_IMM8),		// OP_SUB_IMM8
+/* 00 1110 0010 */ TABDECL(OP_SUB_IMM8),		// OP_SUB_IMM8
+/* 00 1110 0011 */ TABDECL(OP_SUB_IMM8),		// OP_SUB_IMM8
+/* 00 1110 0100 */ TABDECL(OP_SUB_IMM8),		// OP_SUB_IMM8
+/* 00 1110 0101 */ TABDECL(OP_SUB_IMM8),		// OP_SUB_IMM8
+/* 00 1110 0110 */ TABDECL(OP_SUB_IMM8),		// OP_SUB_IMM8
+/* 00 1110 0111 */ TABDECL(OP_SUB_IMM8),		// OP_SUB_IMM8
+/* 00 1110 1000 */ TABDECL(OP_SUB_IMM8),		// OP_SUB_IMM8
+/* 00 1110 1001 */ TABDECL(OP_SUB_IMM8),		// OP_SUB_IMM8
+/* 00 1110 1010 */ TABDECL(OP_SUB_IMM8),		// OP_SUB_IMM8
+/* 00 1110 1011 */ TABDECL(OP_SUB_IMM8),		// OP_SUB_IMM8
+/* 00 1110 1100 */ TABDECL(OP_SUB_IMM8),		// OP_SUB_IMM8
+/* 00 1110 1101 */ TABDECL(OP_SUB_IMM8),		// OP_SUB_IMM8
+/* 00 1110 1110 */ TABDECL(OP_SUB_IMM8),		// OP_SUB_IMM8
+/* 00 1110 1111 */ TABDECL(OP_SUB_IMM8),		// OP_SUB_IMM8
+
+/* 00 1111 0000 */ TABDECL(OP_SUB_IMM8),		// OP_SUB_IMM8
+/* 00 1111 0001 */ TABDECL(OP_SUB_IMM8),		// OP_SUB_IMM8
+/* 00 1111 0010 */ TABDECL(OP_SUB_IMM8),		// OP_SUB_IMM8
+/* 00 1111 0011 */ TABDECL(OP_SUB_IMM8),		// OP_SUB_IMM8
+/* 00 1111 0100 */ TABDECL(OP_SUB_IMM8),		// OP_SUB_IMM8
+/* 00 1111 0101 */ TABDECL(OP_SUB_IMM8),		// OP_SUB_IMM8
+/* 00 1111 0110 */ TABDECL(OP_SUB_IMM8),		// OP_SUB_IMM8
+/* 00 1111 0111 */ TABDECL(OP_SUB_IMM8),		// OP_SUB_IMM8
+/* 00 1111 1000 */ TABDECL(OP_SUB_IMM8),		// OP_SUB_IMM8
+/* 00 1111 1001 */ TABDECL(OP_SUB_IMM8),		// OP_SUB_IMM8
+/* 00 1111 1010 */ TABDECL(OP_SUB_IMM8),		// OP_SUB_IMM8
+/* 00 1111 1011 */ TABDECL(OP_SUB_IMM8),		// OP_SUB_IMM8
+/* 00 1111 1100 */ TABDECL(OP_SUB_IMM8),		// OP_SUB_IMM8
+/* 00 1111 1101 */ TABDECL(OP_SUB_IMM8),		// OP_SUB_IMM8
+/* 00 1111 1110 */ TABDECL(OP_SUB_IMM8),		// OP_SUB_IMM8
+/* 00 1111 1111 */ TABDECL(OP_SUB_IMM8),		// OP_SUB_IMM8
+
+/* 01 0000 0000 */ TABDECL(OP_AND),		// OP_AND
+/* 01 0000 0001 */ TABDECL(OP_EOR),		// OP_EOR
+/* 01 0000 0010 */ TABDECL(OP_LSL_REG),		// OP_LSL_REG
+/* 01 0000 0011 */ TABDECL(OP_LSR_REG),		// OP_LSR_REG
+/* 01 0000 0100 */ TABDECL(OP_ASR_REG),		// OP_ASR_REG
+/* 01 0000 0101 */ TABDECL(OP_ADC_REG),		// OP_ADC_REG
+/* 01 0000 0110 */ TABDECL(OP_SBC_REG),		// OP_SBC_REG
+/* 01 0000 0111 */ TABDECL(OP_ROR_REG),		// OP_ROR_REG
+/* 01 0000 1000 */ TABDECL(OP_TST),		// OP_TST
+/* 01 0000 1001 */ TABDECL(OP_NEG),		// OP_NEG
+/* 01 0000 1010 */ TABDECL(OP_CMP),		// OP_CMP
+/* 01 0000 1011 */ TABDECL(OP_CMN),		// OP_CMN
+/* 01 0000 1100 */ TABDECL(OP_ORR),		// OP_ORR
+/* 01 0000 1101 */ TABDECL(OP_MUL_REG),		// OP_MUL_REG
+/* 01 0000 1110 */ TABDECL(OP_BIC),		// OP_BIC
+/* 01 0000 1111 */ TABDECL(OP_MVN),		// OP_MVN
+
+/* 01 0001 0000 */ TABDECL(OP_ADD_SPE),		// OP_ADD_SPE
+/* 01 0001 0001 */ TABDECL(OP_ADD_SPE),		// OP_ADD_SPE
+/* 01 0001 0010 */ TABDECL(OP_ADD_SPE),		// OP_ADD_SPE
+/* 01 0001 0011 */ TABDECL(OP_ADD_SPE),		// OP_ADD_SPE
+/* 01 0001 0100 */ TABDECL(OP_CMP_SPE),		// OP_CMP_SPE
+/* 01 0001 0101 */ TABDECL(OP_CMP_SPE),		// OP_CMP_SPE
+/* 01 0001 0110 */ TABDECL(OP_CMP_SPE),		// OP_CMP_SPE
+/* 01 0001 0111 */ TABDECL(OP_CMP_SPE),		// OP_CMP_SPE
+/* 01 0001 1000 */ TABDECL(OP_MOV_SPE),		// OP_MOV_SPE
+/* 01 0001 1001 */ TABDECL(OP_MOV_SPE),		// OP_MOV_SPE
+/* 01 0001 1010 */ TABDECL(OP_MOV_SPE),		// OP_MOV_SPE
+/* 01 0001 1011 */ TABDECL(OP_MOV_SPE),		// OP_MOV_SPE
+/* 01 0001 1100 */ TABDECL(OP_BX_THUMB),		// OP_BX_THUMB
+/* 01 0001 1101 */ TABDECL(OP_BX_THUMB),		// OP_BX_THUMB
+/* 01 0001 1110 */ TABDECL(OP_BLX_THUMB),		// OP_BLX_THUMB
+/* 01 0001 1111 */ TABDECL(OP_BLX_THUMB),		// OP_BLX_THUMB
+
+/* 01 0010 0000 */ TABDECL(OP_LDR_PCREL),		// OP_LDR_PCREL
+/* 01 0010 0001 */ TABDECL(OP_LDR_PCREL),		// OP_LDR_PCREL
+/* 01 0010 0010 */ TABDECL(OP_LDR_PCREL),		// OP_LDR_PCREL
+/* 01 0010 0011 */ TABDECL(OP_LDR_PCREL),		// OP_LDR_PCREL
+/* 01 0010 0100 */ TABDECL(OP_LDR_PCREL),		// OP_LDR_PCREL
+/* 01 0010 0101 */ TABDECL(OP_LDR_PCREL),		// OP_LDR_PCREL
+/* 01 0010 0110 */ TABDECL(OP_LDR_PCREL),		// OP_LDR_PCREL
+/* 01 0010 0111 */ TABDECL(OP_LDR_PCREL),		// OP_LDR_PCREL
+/* 01 0010 1000 */ TABDECL(OP_LDR_PCREL),		// OP_LDR_PCREL
+/* 01 0010 1001 */ TABDECL(OP_LDR_PCREL),		// OP_LDR_PCREL
+/* 01 0010 1010 */ TABDECL(OP_LDR_PCREL),		// OP_LDR_PCREL
+/* 01 0010 1011 */ TABDECL(OP_LDR_PCREL),		// OP_LDR_PCREL
+/* 01 0010 1100 */ TABDECL(OP_LDR_PCREL),		// OP_LDR_PCREL
+/* 01 0010 1101 */ TABDECL(OP_LDR_PCREL),		// OP_LDR_PCREL
+/* 01 0010 1110 */ TABDECL(OP_LDR_PCREL),		// OP_LDR_PCREL
+/* 01 0010 1111 */ TABDECL(OP_LDR_PCREL),		// OP_LDR_PCREL
+
+/* 01 0011 0000 */ TABDECL(OP_LDR_PCREL),		// OP_LDR_PCREL
+/* 01 0011 0001 */ TABDECL(OP_LDR_PCREL),		// OP_LDR_PCREL
+/* 01 0011 0010 */ TABDECL(OP_LDR_PCREL),		// OP_LDR_PCREL
+/* 01 0011 0011 */ TABDECL(OP_LDR_PCREL),		// OP_LDR_PCREL
+/* 01 0011 0100 */ TABDECL(OP_LDR_PCREL),		// OP_LDR_PCREL
+/* 01 0011 0101 */ TABDECL(OP_LDR_PCREL),		// OP_LDR_PCREL
+/* 01 0011 0110 */ TABDECL(OP_LDR_PCREL),		// OP_LDR_PCREL
+/* 01 0011 0111 */ TABDECL(OP_LDR_PCREL),		// OP_LDR_PCREL
+/* 01 0011 1000 */ TABDECL(OP_LDR_PCREL),		// OP_LDR_PCREL
+/* 01 0011 1001 */ TABDECL(OP_LDR_PCREL),		// OP_LDR_PCREL
+/* 01 0011 1010 */ TABDECL(OP_LDR_PCREL),		// OP_LDR_PCREL
+/* 01 0011 1011 */ TABDECL(OP_LDR_PCREL),		// OP_LDR_PCREL
+/* 01 0011 1100 */ TABDECL(OP_LDR_PCREL),		// OP_LDR_PCREL
+/* 01 0011 1101 */ TABDECL(OP_LDR_PCREL),		// OP_LDR_PCREL
+/* 01 0011 1110 */ TABDECL(OP_LDR_PCREL),		// OP_LDR_PCREL
+/* 01 0011 1111 */ TABDECL(OP_LDR_PCREL),		// OP_LDR_PCREL
+
+/* 01 0100 0000 */ TABDECL(OP_STR_REG_OFF),		// OP_STR_REG_OFF
+/* 01 0100 0001 */ TABDECL(OP_STR_REG_OFF),		// OP_STR_REG_OFF
+/* 01 0100 0010 */ TABDECL(OP_STR_REG_OFF),		// OP_STR_REG_OFF
+/* 01 0100 0011 */ TABDECL(OP_STR_REG_OFF),		// OP_STR_REG_OFF
+/* 01 0100 0100 */ TABDECL(OP_STR_REG_OFF),		// OP_STR_REG_OFF
+/* 01 0100 0101 */ TABDECL(OP_STR_REG_OFF),		// OP_STR_REG_OFF
+/* 01 0100 0110 */ TABDECL(OP_STR_REG_OFF),		// OP_STR_REG_OFF
+/* 01 0100 0111 */ TABDECL(OP_STR_REG_OFF),		// OP_STR_REG_OFF
+/* 01 0100 1000 */ TABDECL(OP_STRH_REG_OFF),		// OP_STRH_REG_OFF
+/* 01 0100 1001 */ TABDECL(OP_STRH_REG_OFF),		// OP_STRH_REG_OFF
+/* 01 0100 1010 */ TABDECL(OP_STRH_REG_OFF),		// OP_STRH_REG_OFF
+/* 01 0100 1011 */ TABDECL(OP_STRH_REG_OFF),		// OP_STRH_REG_OFF
+/* 01 0100 1100 */ TABDECL(OP_STRH_REG_OFF),		// OP_STRH_REG_OFF
+/* 01 0100 1101 */ TABDECL(OP_STRH_REG_OFF),		// OP_STRH_REG_OFF
+/* 01 0100 1110 */ TABDECL(OP_STRH_REG_OFF),		// OP_STRH_REG_OFF
+/* 01 0100 1111 */ TABDECL(OP_STRH_REG_OFF),		// OP_STRH_REG_OFF
+
+/* 01 0101 0000 */ TABDECL(OP_STRB_REG_OFF),		// OP_STRB_REG_OFF
+/* 01 0101 0001 */ TABDECL(OP_STRB_REG_OFF),		// OP_STRB_REG_OFF
+/* 01 0101 0010 */ TABDECL(OP_STRB_REG_OFF),		// OP_STRB_REG_OFF
+/* 01 0101 0011 */ TABDECL(OP_STRB_REG_OFF),		// OP_STRB_REG_OFF
+/* 01 0101 0100 */ TABDECL(OP_STRB_REG_OFF),		// OP_STRB_REG_OFF
+/* 01 0101 0101 */ TABDECL(OP_STRB_REG_OFF),		// OP_STRB_REG_OFF
+/* 01 0101 0110 */ TABDECL(OP_STRB_REG_OFF),		// OP_STRB_REG_OFF
+/* 01 0101 0111 */ TABDECL(OP_STRB_REG_OFF),		// OP_STRB_REG_OFF
+/* 01 0101 1000 */ TABDECL(OP_LDRSB_REG_OFF),		// OP_LDRSB_REG_OFF
+/* 01 0101 1001 */ TABDECL(OP_LDRSB_REG_OFF),		// OP_LDRSB_REG_OFF
+/* 01 0101 1010 */ TABDECL(OP_LDRSB_REG_OFF),		// OP_LDRSB_REG_OFF
+/* 01 0101 1011 */ TABDECL(OP_LDRSB_REG_OFF),		// OP_LDRSB_REG_OFF
+/* 01 0101 1100 */ TABDECL(OP_LDRSB_REG_OFF),		// OP_LDRSB_REG_OFF
+/* 01 0101 1101 */ TABDECL(OP_LDRSB_REG_OFF),		// OP_LDRSB_REG_OFF
+/* 01 0101 1110 */ TABDECL(OP_LDRSB_REG_OFF),		// OP_LDRSB_REG_OFF
+/* 01 0101 1111 */ TABDECL(OP_LDRSB_REG_OFF),		// OP_LDRSB_REG_OFF
+
+/* 01 0110 0000 */ TABDECL(OP_LDR_REG_OFF),		// OP_LDR_REG_OFF
+/* 01 0110 0001 */ TABDECL(OP_LDR_REG_OFF),		// OP_LDR_REG_OFF
+/* 01 0110 0010 */ TABDECL(OP_LDR_REG_OFF),		// OP_LDR_REG_OFF
+/* 01 0110 0011 */ TABDECL(OP_LDR_REG_OFF),		// OP_LDR_REG_OFF
+/* 01 0110 0100 */ TABDECL(OP_LDR_REG_OFF),		// OP_LDR_REG_OFF
+/* 01 0110 0101 */ TABDECL(OP_LDR_REG_OFF),		// OP_LDR_REG_OFF
+/* 01 0110 0110 */ TABDECL(OP_LDR_REG_OFF),		// OP_LDR_REG_OFF
+/* 01 0110 0111 */ TABDECL(OP_LDR_REG_OFF),		// OP_LDR_REG_OFF
+/* 01 0110 1000 */ TABDECL(OP_LDRH_REG_OFF),		// OP_LDRH_REG_OFF
+/* 01 0110 1001 */ TABDECL(OP_LDRH_REG_OFF),		// OP_LDRH_REG_OFF
+/* 01 0110 1010 */ TABDECL(OP_LDRH_REG_OFF),		// OP_LDRH_REG_OFF
+/* 01 0110 1011 */ TABDECL(OP_LDRH_REG_OFF),		// OP_LDRH_REG_OFF
+/* 01 0110 1100 */ TABDECL(OP_LDRH_REG_OFF),		// OP_LDRH_REG_OFF
+/* 01 0110 1101 */ TABDECL(OP_LDRH_REG_OFF),		// OP_LDRH_REG_OFF
+/* 01 0110 1110 */ TABDECL(OP_LDRH_REG_OFF),		// OP_LDRH_REG_OFF
+/* 01 0110 1111 */ TABDECL(OP_LDRH_REG_OFF),		// OP_LDRH_REG_OFF
+
+/* 01 0111 0000 */ TABDECL(OP_LDRB_REG_OFF),		// OP_LDRB_REG_OFF
+/* 01 0111 0001 */ TABDECL(OP_LDRB_REG_OFF),		// OP_LDRB_REG_OFF
+/* 01 0111 0010 */ TABDECL(OP_LDRB_REG_OFF),		// OP_LDRB_REG_OFF
+/* 01 0111 0011 */ TABDECL(OP_LDRB_REG_OFF),		// OP_LDRB_REG_OFF
+/* 01 0111 0100 */ TABDECL(OP_LDRB_REG_OFF),		// OP_LDRB_REG_OFF
+/* 01 0111 0101 */ TABDECL(OP_LDRB_REG_OFF),		// OP_LDRB_REG_OFF
+/* 01 0111 0110 */ TABDECL(OP_LDRB_REG_OFF),		// OP_LDRB_REG_OFF
+/* 01 0111 0111 */ TABDECL(OP_LDRB_REG_OFF),		// OP_LDRB_REG_OFF
+/* 01 0111 1000 */ TABDECL(OP_LDRSH_REG_OFF),		// OP_LDRSH_REG_OFF
+/* 01 0111 1001 */ TABDECL(OP_LDRSH_REG_OFF),		// OP_LDRSH_REG_OFF
+/* 01 0111 1010 */ TABDECL(OP_LDRSH_REG_OFF),		// OP_LDRSH_REG_OFF
+/* 01 0111 1011 */ TABDECL(OP_LDRSH_REG_OFF),		// OP_LDRSH_REG_OFF
+/* 01 0111 1100 */ TABDECL(OP_LDRSH_REG_OFF),		// OP_LDRSH_REG_OFF
+/* 01 0111 1101 */ TABDECL(OP_LDRSH_REG_OFF),		// OP_LDRSH_REG_OFF
+/* 01 0111 1110 */ TABDECL(OP_LDRSH_REG_OFF),		// OP_LDRSH_REG_OFF
+/* 01 0111 1111 */ TABDECL(OP_LDRSH_REG_OFF),		// OP_LDRSH_REG_OFF
+
+/* 01 1000 0000 */ TABDECL(OP_STR_IMM_OFF),		// OP_STR_IMM_OFF
+/* 01 1000 0001 */ TABDECL(OP_STR_IMM_OFF),		// OP_STR_IMM_OFF
+/* 01 1000 0010 */ TABDECL(OP_STR_IMM_OFF),		// OP_STR_IMM_OFF
+/* 01 1000 0011 */ TABDECL(OP_STR_IMM_OFF),		// OP_STR_IMM_OFF
+/* 01 1000 0100 */ TABDECL(OP_STR_IMM_OFF),		// OP_STR_IMM_OFF
+/* 01 1000 0101 */ TABDECL(OP_STR_IMM_OFF),		// OP_STR_IMM_OFF
+/* 01 1000 0110 */ TABDECL(OP_STR_IMM_OFF),		// OP_STR_IMM_OFF
+/* 01 1000 0111 */ TABDECL(OP_STR_IMM_OFF),		// OP_STR_IMM_OFF
+/* 01 1000 1000 */ TABDECL(OP_STR_IMM_OFF),		// OP_STR_IMM_OFF
+/* 01 1000 1001 */ TABDECL(OP_STR_IMM_OFF),		// OP_STR_IMM_OFF
+/* 01 1000 1010 */ TABDECL(OP_STR_IMM_OFF),		// OP_STR_IMM_OFF
+/* 01 1000 1011 */ TABDECL(OP_STR_IMM_OFF),		// OP_STR_IMM_OFF
+/* 01 1000 1100 */ TABDECL(OP_STR_IMM_OFF),		// OP_STR_IMM_OFF
+/* 01 1000 1101 */ TABDECL(OP_STR_IMM_OFF),		// OP_STR_IMM_OFF
+/* 01 1000 1110 */ TABDECL(OP_STR_IMM_OFF),		// OP_STR_IMM_OFF
+/* 01 1000 1111 */ TABDECL(OP_STR_IMM_OFF),		// OP_STR_IMM_OFF
+
+/* 01 1001 0000 */ TABDECL(OP_STR_IMM_OFF),		// OP_STR_IMM_OFF
+/* 01 1001 0001 */ TABDECL(OP_STR_IMM_OFF),		// OP_STR_IMM_OFF
+/* 01 1001 0010 */ TABDECL(OP_STR_IMM_OFF),		// OP_STR_IMM_OFF
+/* 01 1001 0011 */ TABDECL(OP_STR_IMM_OFF),		// OP_STR_IMM_OFF
+/* 01 1001 0100 */ TABDECL(OP_STR_IMM_OFF),		// OP_STR_IMM_OFF
+/* 01 1001 0101 */ TABDECL(OP_STR_IMM_OFF),		// OP_STR_IMM_OFF
+/* 01 1001 0110 */ TABDECL(OP_STR_IMM_OFF),		// OP_STR_IMM_OFF
+/* 01 1001 0111 */ TABDECL(OP_STR_IMM_OFF),		// OP_STR_IMM_OFF
+/* 01 1001 1000 */ TABDECL(OP_STR_IMM_OFF),		// OP_STR_IMM_OFF
+/* 01 1001 1001 */ TABDECL(OP_STR_IMM_OFF),		// OP_STR_IMM_OFF
+/* 01 1001 1010 */ TABDECL(OP_STR_IMM_OFF),		// OP_STR_IMM_OFF
+/* 01 1001 1011 */ TABDECL(OP_STR_IMM_OFF),		// OP_STR_IMM_OFF
+/* 01 1001 1100 */ TABDECL(OP_STR_IMM_OFF),		// OP_STR_IMM_OFF
+/* 01 1001 1101 */ TABDECL(OP_STR_IMM_OFF),		// OP_STR_IMM_OFF
+/* 01 1001 1110 */ TABDECL(OP_STR_IMM_OFF),		// OP_STR_IMM_OFF
+/* 01 1001 1111 */ TABDECL(OP_STR_IMM_OFF),		// OP_STR_IMM_OFF
+
+/* 01 1010 0000 */ TABDECL(OP_LDR_IMM_OFF),		// OP_LDR_IMM_OFF
+/* 01 1010 0001 */ TABDECL(OP_LDR_IMM_OFF),		// OP_LDR_IMM_OFF
+/* 01 1010 0010 */ TABDECL(OP_LDR_IMM_OFF),		// OP_LDR_IMM_OFF
+/* 01 1010 0011 */ TABDECL(OP_LDR_IMM_OFF),		// OP_LDR_IMM_OFF
+/* 01 1010 0100 */ TABDECL(OP_LDR_IMM_OFF),		// OP_LDR_IMM_OFF
+/* 01 1010 0101 */ TABDECL(OP_LDR_IMM_OFF),		// OP_LDR_IMM_OFF
+/* 01 1010 0110 */ TABDECL(OP_LDR_IMM_OFF),		// OP_LDR_IMM_OFF
+/* 01 1010 0111 */ TABDECL(OP_LDR_IMM_OFF),		// OP_LDR_IMM_OFF
+/* 01 1010 1000 */ TABDECL(OP_LDR_IMM_OFF),		// OP_LDR_IMM_OFF
+/* 01 1010 1001 */ TABDECL(OP_LDR_IMM_OFF),		// OP_LDR_IMM_OFF
+/* 01 1010 1010 */ TABDECL(OP_LDR_IMM_OFF),		// OP_LDR_IMM_OFF
+/* 01 1010 1011 */ TABDECL(OP_LDR_IMM_OFF),		// OP_LDR_IMM_OFF
+/* 01 1010 1100 */ TABDECL(OP_LDR_IMM_OFF),		// OP_LDR_IMM_OFF
+/* 01 1010 1101 */ TABDECL(OP_LDR_IMM_OFF),		// OP_LDR_IMM_OFF
+/* 01 1010 1110 */ TABDECL(OP_LDR_IMM_OFF),		// OP_LDR_IMM_OFF
+/* 01 1010 1111 */ TABDECL(OP_LDR_IMM_OFF),		// OP_LDR_IMM_OFF
+
+/* 01 1011 0000 */ TABDECL(OP_LDR_IMM_OFF),		// OP_LDR_IMM_OFF
+/* 01 1011 0001 */ TABDECL(OP_LDR_IMM_OFF),		// OP_LDR_IMM_OFF
+/* 01 1011 0010 */ TABDECL(OP_LDR_IMM_OFF),		// OP_LDR_IMM_OFF
+/* 01 1011 0011 */ TABDECL(OP_LDR_IMM_OFF),		// OP_LDR_IMM_OFF
+/* 01 1011 0100 */ TABDECL(OP_LDR_IMM_OFF),		// OP_LDR_IMM_OFF
+/* 01 1011 0101 */ TABDECL(OP_LDR_IMM_OFF),		// OP_LDR_IMM_OFF
+/* 01 1011 0110 */ TABDECL(OP_LDR_IMM_OFF),		// OP_LDR_IMM_OFF
+/* 01 1011 0111 */ TABDECL(OP_LDR_IMM_OFF),		// OP_LDR_IMM_OFF
+/* 01 1011 1000 */ TABDECL(OP_LDR_IMM_OFF),		// OP_LDR_IMM_OFF
+/* 01 1011 1001 */ TABDECL(OP_LDR_IMM_OFF),		// OP_LDR_IMM_OFF
+/* 01 1011 1010 */ TABDECL(OP_LDR_IMM_OFF),		// OP_LDR_IMM_OFF
+/* 01 1011 1011 */ TABDECL(OP_LDR_IMM_OFF),		// OP_LDR_IMM_OFF
+/* 01 1011 1100 */ TABDECL(OP_LDR_IMM_OFF),		// OP_LDR_IMM_OFF
+/* 01 1011 1101 */ TABDECL(OP_LDR_IMM_OFF),		// OP_LDR_IMM_OFF
+/* 01 1011 1110 */ TABDECL(OP_LDR_IMM_OFF),		// OP_LDR_IMM_OFF
+/* 01 1011 1111 */ TABDECL(OP_LDR_IMM_OFF),		// OP_LDR_IMM_OFF
+
+/* 01 1100 0000 */ TABDECL(OP_STRB_IMM_OFF),		// OP_STRB_IMM_OFF
+/* 01 1100 0001 */ TABDECL(OP_STRB_IMM_OFF),		// OP_STRB_IMM_OFF
+/* 01 1100 0010 */ TABDECL(OP_STRB_IMM_OFF),		// OP_STRB_IMM_OFF
+/* 01 1100 0011 */ TABDECL(OP_STRB_IMM_OFF),		// OP_STRB_IMM_OFF
+/* 01 1100 0100 */ TABDECL(OP_STRB_IMM_OFF),		// OP_STRB_IMM_OFF
+/* 01 1100 0101 */ TABDECL(OP_STRB_IMM_OFF),		// OP_STRB_IMM_OFF
+/* 01 1100 0110 */ TABDECL(OP_STRB_IMM_OFF),		// OP_STRB_IMM_OFF
+/* 01 1100 0111 */ TABDECL(OP_STRB_IMM_OFF),		// OP_STRB_IMM_OFF
+/* 01 1100 1000 */ TABDECL(OP_STRB_IMM_OFF),		// OP_STRB_IMM_OFF
+/* 01 1100 1001 */ TABDECL(OP_STRB_IMM_OFF),		// OP_STRB_IMM_OFF
+/* 01 1100 1010 */ TABDECL(OP_STRB_IMM_OFF),		// OP_STRB_IMM_OFF
+/* 01 1100 1011 */ TABDECL(OP_STRB_IMM_OFF),		// OP_STRB_IMM_OFF
+/* 01 1100 1100 */ TABDECL(OP_STRB_IMM_OFF),		// OP_STRB_IMM_OFF
+/* 01 1100 1101 */ TABDECL(OP_STRB_IMM_OFF),		// OP_STRB_IMM_OFF
+/* 01 1100 1110 */ TABDECL(OP_STRB_IMM_OFF),		// OP_STRB_IMM_OFF
+/* 01 1100 1111 */ TABDECL(OP_STRB_IMM_OFF),		// OP_STRB_IMM_OFF
+
+/* 01 1101 0000 */ TABDECL(OP_STRB_IMM_OFF),		// OP_STRB_IMM_OFF
+/* 01 1101 0001 */ TABDECL(OP_STRB_IMM_OFF),		// OP_STRB_IMM_OFF
+/* 01 1101 0010 */ TABDECL(OP_STRB_IMM_OFF),		// OP_STRB_IMM_OFF
+/* 01 1101 0011 */ TABDECL(OP_STRB_IMM_OFF),		// OP_STRB_IMM_OFF
+/* 01 1101 0100 */ TABDECL(OP_STRB_IMM_OFF),		// OP_STRB_IMM_OFF
+/* 01 1101 0101 */ TABDECL(OP_STRB_IMM_OFF),		// OP_STRB_IMM_OFF
+/* 01 1101 0110 */ TABDECL(OP_STRB_IMM_OFF),		// OP_STRB_IMM_OFF
+/* 01 1101 0111 */ TABDECL(OP_STRB_IMM_OFF),		// OP_STRB_IMM_OFF
+/* 01 1101 1000 */ TABDECL(OP_STRB_IMM_OFF),		// OP_STRB_IMM_OFF
+/* 01 1101 1001 */ TABDECL(OP_STRB_IMM_OFF),		// OP_STRB_IMM_OFF
+/* 01 1101 1010 */ TABDECL(OP_STRB_IMM_OFF),		// OP_STRB_IMM_OFF
+/* 01 1101 1011 */ TABDECL(OP_STRB_IMM_OFF),		// OP_STRB_IMM_OFF
+/* 01 1101 1100 */ TABDECL(OP_STRB_IMM_OFF),		// OP_STRB_IMM_OFF
+/* 01 1101 1101 */ TABDECL(OP_STRB_IMM_OFF),		// OP_STRB_IMM_OFF
+/* 01 1101 1110 */ TABDECL(OP_STRB_IMM_OFF),		// OP_STRB_IMM_OFF
+/* 01 1101 1111 */ TABDECL(OP_STRB_IMM_OFF),		// OP_STRB_IMM_OFF
+
+/* 01 1110 0000 */ TABDECL(OP_LDRB_IMM_OFF),		// OP_LDRB_IMM_OFF
+/* 01 1110 0001 */ TABDECL(OP_LDRB_IMM_OFF),		// OP_LDRB_IMM_OFF
+/* 01 1110 0010 */ TABDECL(OP_LDRB_IMM_OFF),		// OP_LDRB_IMM_OFF
+/* 01 1110 0011 */ TABDECL(OP_LDRB_IMM_OFF),		// OP_LDRB_IMM_OFF
+/* 01 1110 0100 */ TABDECL(OP_LDRB_IMM_OFF),		// OP_LDRB_IMM_OFF
+/* 01 1110 0101 */ TABDECL(OP_LDRB_IMM_OFF),		// OP_LDRB_IMM_OFF
+/* 01 1110 0110 */ TABDECL(OP_LDRB_IMM_OFF),		// OP_LDRB_IMM_OFF
+/* 01 1110 0111 */ TABDECL(OP_LDRB_IMM_OFF),		// OP_LDRB_IMM_OFF
+/* 01 1110 1000 */ TABDECL(OP_LDRB_IMM_OFF),		// OP_LDRB_IMM_OFF
+/* 01 1110 1001 */ TABDECL(OP_LDRB_IMM_OFF),		// OP_LDRB_IMM_OFF
+/* 01 1110 1010 */ TABDECL(OP_LDRB_IMM_OFF),		// OP_LDRB_IMM_OFF
+/* 01 1110 1011 */ TABDECL(OP_LDRB_IMM_OFF),		// OP_LDRB_IMM_OFF
+/* 01 1110 1100 */ TABDECL(OP_LDRB_IMM_OFF),		// OP_LDRB_IMM_OFF
+/* 01 1110 1101 */ TABDECL(OP_LDRB_IMM_OFF),		// OP_LDRB_IMM_OFF
+/* 01 1110 1110 */ TABDECL(OP_LDRB_IMM_OFF),		// OP_LDRB_IMM_OFF
+/* 01 1110 1111 */ TABDECL(OP_LDRB_IMM_OFF),		// OP_LDRB_IMM_OFF
+
+/* 01 1111 0000 */ TABDECL(OP_LDRB_IMM_OFF),		// OP_LDRB_IMM_OFF
+/* 01 1111 0001 */ TABDECL(OP_LDRB_IMM_OFF),		// OP_LDRB_IMM_OFF
+/* 01 1111 0010 */ TABDECL(OP_LDRB_IMM_OFF),		// OP_LDRB_IMM_OFF
+/* 01 1111 0011 */ TABDECL(OP_LDRB_IMM_OFF),		// OP_LDRB_IMM_OFF
+/* 01 1111 0100 */ TABDECL(OP_LDRB_IMM_OFF),		// OP_LDRB_IMM_OFF
+/* 01 1111 0101 */ TABDECL(OP_LDRB_IMM_OFF),		// OP_LDRB_IMM_OFF
+/* 01 1111 0110 */ TABDECL(OP_LDRB_IMM_OFF),		// OP_LDRB_IMM_OFF
+/* 01 1111 0111 */ TABDECL(OP_LDRB_IMM_OFF),		// OP_LDRB_IMM_OFF
+/* 01 1111 1000 */ TABDECL(OP_LDRB_IMM_OFF),		// OP_LDRB_IMM_OFF
+/* 01 1111 1001 */ TABDECL(OP_LDRB_IMM_OFF),		// OP_LDRB_IMM_OFF
+/* 01 1111 1010 */ TABDECL(OP_LDRB_IMM_OFF),		// OP_LDRB_IMM_OFF
+/* 01 1111 1011 */ TABDECL(OP_LDRB_IMM_OFF),		// OP_LDRB_IMM_OFF
+/* 01 1111 1100 */ TABDECL(OP_LDRB_IMM_OFF),		// OP_LDRB_IMM_OFF
+/* 01 1111 1101 */ TABDECL(OP_LDRB_IMM_OFF),		// OP_LDRB_IMM_OFF
+/* 01 1111 1110 */ TABDECL(OP_LDRB_IMM_OFF),		// OP_LDRB_IMM_OFF
+/* 01 1111 1111 */ TABDECL(OP_LDRB_IMM_OFF),		// OP_LDRB_IMM_OFF
+
+/* 10 0000 0000 */ TABDECL(OP_STRH_IMM_OFF),		// OP_STRH_IMM_OFF
+/* 10 0000 0001 */ TABDECL(OP_STRH_IMM_OFF),		// OP_STRH_IMM_OFF
+/* 10 0000 0010 */ TABDECL(OP_STRH_IMM_OFF),		// OP_STRH_IMM_OFF
+/* 10 0000 0011 */ TABDECL(OP_STRH_IMM_OFF),		// OP_STRH_IMM_OFF
+/* 10 0000 0100 */ TABDECL(OP_STRH_IMM_OFF),		// OP_STRH_IMM_OFF
+/* 10 0000 0101 */ TABDECL(OP_STRH_IMM_OFF),		// OP_STRH_IMM_OFF
+/* 10 0000 0110 */ TABDECL(OP_STRH_IMM_OFF),		// OP_STRH_IMM_OFF
+/* 10 0000 0111 */ TABDECL(OP_STRH_IMM_OFF),		// OP_STRH_IMM_OFF
+/* 10 0000 1000 */ TABDECL(OP_STRH_IMM_OFF),		// OP_STRH_IMM_OFF
+/* 10 0000 1001 */ TABDECL(OP_STRH_IMM_OFF),		// OP_STRH_IMM_OFF
+/* 10 0000 1010 */ TABDECL(OP_STRH_IMM_OFF),		// OP_STRH_IMM_OFF
+/* 10 0000 1011 */ TABDECL(OP_STRH_IMM_OFF),		// OP_STRH_IMM_OFF
+/* 10 0000 1100 */ TABDECL(OP_STRH_IMM_OFF),		// OP_STRH_IMM_OFF
+/* 10 0000 1101 */ TABDECL(OP_STRH_IMM_OFF),		// OP_STRH_IMM_OFF
+/* 10 0000 1110 */ TABDECL(OP_STRH_IMM_OFF),		// OP_STRH_IMM_OFF
+/* 10 0000 1111 */ TABDECL(OP_STRH_IMM_OFF),		// OP_STRH_IMM_OFF
+
+/* 10 0001 0000 */ TABDECL(OP_STRH_IMM_OFF),		// OP_STRH_IMM_OFF
+/* 10 0001 0001 */ TABDECL(OP_STRH_IMM_OFF),		// OP_STRH_IMM_OFF
+/* 10 0001 0010 */ TABDECL(OP_STRH_IMM_OFF),		// OP_STRH_IMM_OFF
+/* 10 0001 0011 */ TABDECL(OP_STRH_IMM_OFF),		// OP_STRH_IMM_OFF
+/* 10 0001 0100 */ TABDECL(OP_STRH_IMM_OFF),		// OP_STRH_IMM_OFF
+/* 10 0001 0101 */ TABDECL(OP_STRH_IMM_OFF),		// OP_STRH_IMM_OFF
+/* 10 0001 0110 */ TABDECL(OP_STRH_IMM_OFF),		// OP_STRH_IMM_OFF
+/* 10 0001 0111 */ TABDECL(OP_STRH_IMM_OFF),		// OP_STRH_IMM_OFF
+/* 10 0001 1000 */ TABDECL(OP_STRH_IMM_OFF),		// OP_STRH_IMM_OFF
+/* 10 0001 1001 */ TABDECL(OP_STRH_IMM_OFF),		// OP_STRH_IMM_OFF
+/* 10 0001 1010 */ TABDECL(OP_STRH_IMM_OFF),		// OP_STRH_IMM_OFF
+/* 10 0001 1011 */ TABDECL(OP_STRH_IMM_OFF),		// OP_STRH_IMM_OFF
+/* 10 0001 1100 */ TABDECL(OP_STRH_IMM_OFF),		// OP_STRH_IMM_OFF
+/* 10 0001 1101 */ TABDECL(OP_STRH_IMM_OFF),		// OP_STRH_IMM_OFF
+/* 10 0001 1110 */ TABDECL(OP_STRH_IMM_OFF),		// OP_STRH_IMM_OFF
+/* 10 0001 1111 */ TABDECL(OP_STRH_IMM_OFF),		// OP_STRH_IMM_OFF
+
+/* 10 0010 0000 */ TABDECL(OP_LDRH_IMM_OFF),		// OP_LDRH_IMM_OFF
+/* 10 0010 0001 */ TABDECL(OP_LDRH_IMM_OFF),		// OP_LDRH_IMM_OFF
+/* 10 0010 0010 */ TABDECL(OP_LDRH_IMM_OFF),		// OP_LDRH_IMM_OFF
+/* 10 0010 0011 */ TABDECL(OP_LDRH_IMM_OFF),		// OP_LDRH_IMM_OFF
+/* 10 0010 0100 */ TABDECL(OP_LDRH_IMM_OFF),		// OP_LDRH_IMM_OFF
+/* 10 0010 0101 */ TABDECL(OP_LDRH_IMM_OFF),		// OP_LDRH_IMM_OFF
+/* 10 0010 0110 */ TABDECL(OP_LDRH_IMM_OFF),		// OP_LDRH_IMM_OFF
+/* 10 0010 0111 */ TABDECL(OP_LDRH_IMM_OFF),		// OP_LDRH_IMM_OFF
+/* 10 0010 1000 */ TABDECL(OP_LDRH_IMM_OFF),		// OP_LDRH_IMM_OFF
+/* 10 0010 1001 */ TABDECL(OP_LDRH_IMM_OFF),		// OP_LDRH_IMM_OFF
+/* 10 0010 1010 */ TABDECL(OP_LDRH_IMM_OFF),		// OP_LDRH_IMM_OFF
+/* 10 0010 1011 */ TABDECL(OP_LDRH_IMM_OFF),		// OP_LDRH_IMM_OFF
+/* 10 0010 1100 */ TABDECL(OP_LDRH_IMM_OFF),		// OP_LDRH_IMM_OFF
+/* 10 0010 1101 */ TABDECL(OP_LDRH_IMM_OFF),		// OP_LDRH_IMM_OFF
+/* 10 0010 1110 */ TABDECL(OP_LDRH_IMM_OFF),		// OP_LDRH_IMM_OFF
+/* 10 0010 1111 */ TABDECL(OP_LDRH_IMM_OFF),		// OP_LDRH_IMM_OFF
+
+/* 10 0011 0000 */ TABDECL(OP_LDRH_IMM_OFF),		// OP_LDRH_IMM_OFF
+/* 10 0011 0001 */ TABDECL(OP_LDRH_IMM_OFF),		// OP_LDRH_IMM_OFF
+/* 10 0011 0010 */ TABDECL(OP_LDRH_IMM_OFF),		// OP_LDRH_IMM_OFF
+/* 10 0011 0011 */ TABDECL(OP_LDRH_IMM_OFF),		// OP_LDRH_IMM_OFF
+/* 10 0011 0100 */ TABDECL(OP_LDRH_IMM_OFF),		// OP_LDRH_IMM_OFF
+/* 10 0011 0101 */ TABDECL(OP_LDRH_IMM_OFF),		// OP_LDRH_IMM_OFF
+/* 10 0011 0110 */ TABDECL(OP_LDRH_IMM_OFF),		// OP_LDRH_IMM_OFF
+/* 10 0011 0111 */ TABDECL(OP_LDRH_IMM_OFF),		// OP_LDRH_IMM_OFF
+/* 10 0011 1000 */ TABDECL(OP_LDRH_IMM_OFF),		// OP_LDRH_IMM_OFF
+/* 10 0011 1001 */ TABDECL(OP_LDRH_IMM_OFF),		// OP_LDRH_IMM_OFF
+/* 10 0011 1010 */ TABDECL(OP_LDRH_IMM_OFF),		// OP_LDRH_IMM_OFF
+/* 10 0011 1011 */ TABDECL(OP_LDRH_IMM_OFF),		// OP_LDRH_IMM_OFF
+/* 10 0011 1100 */ TABDECL(OP_LDRH_IMM_OFF),		// OP_LDRH_IMM_OFF
+/* 10 0011 1101 */ TABDECL(OP_LDRH_IMM_OFF),		// OP_LDRH_IMM_OFF
+/* 10 0011 1110 */ TABDECL(OP_LDRH_IMM_OFF),		// OP_LDRH_IMM_OFF
+/* 10 0011 1111 */ TABDECL(OP_LDRH_IMM_OFF),		// OP_LDRH_IMM_OFF
+
+/* 10 0100 0000 */ TABDECL(OP_STR_SPREL),		// OP_STR_SPREL
+/* 10 0100 0001 */ TABDECL(OP_STR_SPREL),		// OP_STR_SPREL
+/* 10 0100 0010 */ TABDECL(OP_STR_SPREL),		// OP_STR_SPREL
+/* 10 0100 0011 */ TABDECL(OP_STR_SPREL),		// OP_STR_SPREL
+/* 10 0100 0100 */ TABDECL(OP_STR_SPREL),		// OP_STR_SPREL
+/* 10 0100 0101 */ TABDECL(OP_STR_SPREL),		// OP_STR_SPREL
+/* 10 0100 0110 */ TABDECL(OP_STR_SPREL),		// OP_STR_SPREL
+/* 10 0100 0111 */ TABDECL(OP_STR_SPREL),		// OP_STR_SPREL
+/* 10 0100 1000 */ TABDECL(OP_STR_SPREL),		// OP_STR_SPREL
+/* 10 0100 1001 */ TABDECL(OP_STR_SPREL),		// OP_STR_SPREL
+/* 10 0100 1010 */ TABDECL(OP_STR_SPREL),		// OP_STR_SPREL
+/* 10 0100 1011 */ TABDECL(OP_STR_SPREL),		// OP_STR_SPREL
+/* 10 0100 1100 */ TABDECL(OP_STR_SPREL),		// OP_STR_SPREL
+/* 10 0100 1101 */ TABDECL(OP_STR_SPREL),		// OP_STR_SPREL
+/* 10 0100 1110 */ TABDECL(OP_STR_SPREL),		// OP_STR_SPREL
+/* 10 0100 1111 */ TABDECL(OP_STR_SPREL),		// OP_STR_SPREL
+
+/* 10 0101 0000 */ TABDECL(OP_STR_SPREL),		// OP_STR_SPREL
+/* 10 0101 0001 */ TABDECL(OP_STR_SPREL),		// OP_STR_SPREL
+/* 10 0101 0010 */ TABDECL(OP_STR_SPREL),		// OP_STR_SPREL
+/* 10 0101 0011 */ TABDECL(OP_STR_SPREL),		// OP_STR_SPREL
+/* 10 0101 0100 */ TABDECL(OP_STR_SPREL),		// OP_STR_SPREL
+/* 10 0101 0101 */ TABDECL(OP_STR_SPREL),		// OP_STR_SPREL
+/* 10 0101 0110 */ TABDECL(OP_STR_SPREL),		// OP_STR_SPREL
+/* 10 0101 0111 */ TABDECL(OP_STR_SPREL),		// OP_STR_SPREL
+/* 10 0101 1000 */ TABDECL(OP_STR_SPREL),		// OP_STR_SPREL
+/* 10 0101 1001 */ TABDECL(OP_STR_SPREL),		// OP_STR_SPREL
+/* 10 0101 1010 */ TABDECL(OP_STR_SPREL),		// OP_STR_SPREL
+/* 10 0101 1011 */ TABDECL(OP_STR_SPREL),		// OP_STR_SPREL
+/* 10 0101 1100 */ TABDECL(OP_STR_SPREL),		// OP_STR_SPREL
+/* 10 0101 1101 */ TABDECL(OP_STR_SPREL),		// OP_STR_SPREL
+/* 10 0101 1110 */ TABDECL(OP_STR_SPREL),		// OP_STR_SPREL
+/* 10 0101 1111 */ TABDECL(OP_STR_SPREL),		// OP_STR_SPREL
+
+/* 10 0110 0000 */ TABDECL(OP_LDR_SPREL),		// OP_LDR_SPREL
+/* 10 0110 0001 */ TABDECL(OP_LDR_SPREL),		// OP_LDR_SPREL
+/* 10 0110 0010 */ TABDECL(OP_LDR_SPREL),		// OP_LDR_SPREL
+/* 10 0110 0011 */ TABDECL(OP_LDR_SPREL),		// OP_LDR_SPREL
+/* 10 0110 0100 */ TABDECL(OP_LDR_SPREL),		// OP_LDR_SPREL
+/* 10 0110 0101 */ TABDECL(OP_LDR_SPREL),		// OP_LDR_SPREL
+/* 10 0110 0110 */ TABDECL(OP_LDR_SPREL),		// OP_LDR_SPREL
+/* 10 0110 0111 */ TABDECL(OP_LDR_SPREL),		// OP_LDR_SPREL
+/* 10 0110 1000 */ TABDECL(OP_LDR_SPREL),		// OP_LDR_SPREL
+/* 10 0110 1001 */ TABDECL(OP_LDR_SPREL),		// OP_LDR_SPREL
+/* 10 0110 1010 */ TABDECL(OP_LDR_SPREL),		// OP_LDR_SPREL
+/* 10 0110 1011 */ TABDECL(OP_LDR_SPREL),		// OP_LDR_SPREL
+/* 10 0110 1100 */ TABDECL(OP_LDR_SPREL),		// OP_LDR_SPREL
+/* 10 0110 1101 */ TABDECL(OP_LDR_SPREL),		// OP_LDR_SPREL
+/* 10 0110 1110 */ TABDECL(OP_LDR_SPREL),		// OP_LDR_SPREL
+/* 10 0110 1111 */ TABDECL(OP_LDR_SPREL),		// OP_LDR_SPREL
+
+/* 10 0111 0000 */ TABDECL(OP_LDR_SPREL),		// OP_LDR_SPREL
+/* 10 0111 0001 */ TABDECL(OP_LDR_SPREL),		// OP_LDR_SPREL
+/* 10 0111 0010 */ TABDECL(OP_LDR_SPREL),		// OP_LDR_SPREL
+/* 10 0111 0011 */ TABDECL(OP_LDR_SPREL),		// OP_LDR_SPREL
+/* 10 0111 0100 */ TABDECL(OP_LDR_SPREL),		// OP_LDR_SPREL
+/* 10 0111 0101 */ TABDECL(OP_LDR_SPREL),		// OP_LDR_SPREL
+/* 10 0111 0110 */ TABDECL(OP_LDR_SPREL),		// OP_LDR_SPREL
+/* 10 0111 0111 */ TABDECL(OP_LDR_SPREL),		// OP_LDR_SPREL
+/* 10 0111 1000 */ TABDECL(OP_LDR_SPREL),		// OP_LDR_SPREL
+/* 10 0111 1001 */ TABDECL(OP_LDR_SPREL),		// OP_LDR_SPREL
+/* 10 0111 1010 */ TABDECL(OP_LDR_SPREL),		// OP_LDR_SPREL
+/* 10 0111 1011 */ TABDECL(OP_LDR_SPREL),		// OP_LDR_SPREL
+/* 10 0111 1100 */ TABDECL(OP_LDR_SPREL),		// OP_LDR_SPREL
+/* 10 0111 1101 */ TABDECL(OP_LDR_SPREL),		// OP_LDR_SPREL
+/* 10 0111 1110 */ TABDECL(OP_LDR_SPREL),		// OP_LDR_SPREL
+/* 10 0111 1111 */ TABDECL(OP_LDR_SPREL),		// OP_LDR_SPREL
+
+/* 10 1000 0000 */ TABDECL(OP_ADD_2PC),		// OP_ADD_2PC
+/* 10 1000 0001 */ TABDECL(OP_ADD_2PC),		// OP_ADD_2PC
+/* 10 1000 0010 */ TABDECL(OP_ADD_2PC),		// OP_ADD_2PC
+/* 10 1000 0011 */ TABDECL(OP_ADD_2PC),		// OP_ADD_2PC
+/* 10 1000 0100 */ TABDECL(OP_ADD_2PC),		// OP_ADD_2PC
+/* 10 1000 0101 */ TABDECL(OP_ADD_2PC),		// OP_ADD_2PC
+/* 10 1000 0110 */ TABDECL(OP_ADD_2PC),		// OP_ADD_2PC
+/* 10 1000 0111 */ TABDECL(OP_ADD_2PC),		// OP_ADD_2PC
+/* 10 1000 1000 */ TABDECL(OP_ADD_2PC),		// OP_ADD_2PC
+/* 10 1000 1001 */ TABDECL(OP_ADD_2PC),		// OP_ADD_2PC
+/* 10 1000 1010 */ TABDECL(OP_ADD_2PC),		// OP_ADD_2PC
+/* 10 1000 1011 */ TABDECL(OP_ADD_2PC),		// OP_ADD_2PC
+/* 10 1000 1100 */ TABDECL(OP_ADD_2PC),		// OP_ADD_2PC
+/* 10 1000 1101 */ TABDECL(OP_ADD_2PC),		// OP_ADD_2PC
+/* 10 1000 1110 */ TABDECL(OP_ADD_2PC),		// OP_ADD_2PC
+/* 10 1000 1111 */ TABDECL(OP_ADD_2PC),		// OP_ADD_2PC
+
+/* 10 1001 0000 */ TABDECL(OP_ADD_2PC),		// OP_ADD_2PC
+/* 10 1001 0001 */ TABDECL(OP_ADD_2PC),		// OP_ADD_2PC
+/* 10 1001 0010 */ TABDECL(OP_ADD_2PC),		// OP_ADD_2PC
+/* 10 1001 0011 */ TABDECL(OP_ADD_2PC),		// OP_ADD_2PC
+/* 10 1001 0100 */ TABDECL(OP_ADD_2PC),		// OP_ADD_2PC
+/* 10 1001 0101 */ TABDECL(OP_ADD_2PC),		// OP_ADD_2PC
+/* 10 1001 0110 */ TABDECL(OP_ADD_2PC),		// OP_ADD_2PC
+/* 10 1001 0111 */ TABDECL(OP_ADD_2PC),		// OP_ADD_2PC
+/* 10 1001 1000 */ TABDECL(OP_ADD_2PC),		// OP_ADD_2PC
+/* 10 1001 1001 */ TABDECL(OP_ADD_2PC),		// OP_ADD_2PC
+/* 10 1001 1010 */ TABDECL(OP_ADD_2PC),		// OP_ADD_2PC
+/* 10 1001 1011 */ TABDECL(OP_ADD_2PC),		// OP_ADD_2PC
+/* 10 1001 1100 */ TABDECL(OP_ADD_2PC),		// OP_ADD_2PC
+/* 10 1001 1101 */ TABDECL(OP_ADD_2PC),		// OP_ADD_2PC
+/* 10 1001 1110 */ TABDECL(OP_ADD_2PC),		// OP_ADD_2PC
+/* 10 1001 1111 */ TABDECL(OP_ADD_2PC),		// OP_ADD_2PC
+
+/* 10 1010 0000 */ TABDECL(OP_ADD_2SP),		// OP_ADD_2SP
+/* 10 1010 0001 */ TABDECL(OP_ADD_2SP),		// OP_ADD_2SP
+/* 10 1010 0010 */ TABDECL(OP_ADD_2SP),		// OP_ADD_2SP
+/* 10 1010 0011 */ TABDECL(OP_ADD_2SP),		// OP_ADD_2SP
+/* 10 1010 0100 */ TABDECL(OP_ADD_2SP),		// OP_ADD_2SP
+/* 10 1010 0101 */ TABDECL(OP_ADD_2SP),		// OP_ADD_2SP
+/* 10 1010 0110 */ TABDECL(OP_ADD_2SP),		// OP_ADD_2SP
+/* 10 1010 0111 */ TABDECL(OP_ADD_2SP),		// OP_ADD_2SP
+/* 10 1010 1000 */ TABDECL(OP_ADD_2SP),		// OP_ADD_2SP
+/* 10 1010 1001 */ TABDECL(OP_ADD_2SP),		// OP_ADD_2SP
+/* 10 1010 1010 */ TABDECL(OP_ADD_2SP),		// OP_ADD_2SP
+/* 10 1010 1011 */ TABDECL(OP_ADD_2SP),		// OP_ADD_2SP
+/* 10 1010 1100 */ TABDECL(OP_ADD_2SP),		// OP_ADD_2SP
+/* 10 1010 1101 */ TABDECL(OP_ADD_2SP),		// OP_ADD_2SP
+/* 10 1010 1110 */ TABDECL(OP_ADD_2SP),		// OP_ADD_2SP
+/* 10 1010 1111 */ TABDECL(OP_ADD_2SP),		// OP_ADD_2SP
+
+/* 10 1011 0000 */ TABDECL(OP_ADD_2SP),		// OP_ADD_2SP
+/* 10 1011 0001 */ TABDECL(OP_ADD_2SP),		// OP_ADD_2SP
+/* 10 1011 0010 */ TABDECL(OP_ADD_2SP),		// OP_ADD_2SP
+/* 10 1011 0011 */ TABDECL(OP_ADD_2SP),		// OP_ADD_2SP
+/* 10 1011 0100 */ TABDECL(OP_ADD_2SP),		// OP_ADD_2SP
+/* 10 1011 0101 */ TABDECL(OP_ADD_2SP),		// OP_ADD_2SP
+/* 10 1011 0110 */ TABDECL(OP_ADD_2SP),		// OP_ADD_2SP
+/* 10 1011 0111 */ TABDECL(OP_ADD_2SP),		// OP_ADD_2SP
+/* 10 1011 1000 */ TABDECL(OP_ADD_2SP),		// OP_ADD_2SP
+/* 10 1011 1001 */ TABDECL(OP_ADD_2SP),		// OP_ADD_2SP
+/* 10 1011 1010 */ TABDECL(OP_ADD_2SP),		// OP_ADD_2SP
+/* 10 1011 1011 */ TABDECL(OP_ADD_2SP),		// OP_ADD_2SP
+/* 10 1011 1100 */ TABDECL(OP_ADD_2SP),		// OP_ADD_2SP
+/* 10 1011 1101 */ TABDECL(OP_ADD_2SP),		// OP_ADD_2SP
+/* 10 1011 1110 */ TABDECL(OP_ADD_2SP),		// OP_ADD_2SP
+/* 10 1011 1111 */ TABDECL(OP_ADD_2SP),		// OP_ADD_2SP
+
+/* 10 1100 0000 */ TABDECL(OP_ADJUST_P_SP),		// OP_ADJUST_P_SP
+/* 10 1100 0001 */ TABDECL(OP_ADJUST_P_SP),		// OP_ADJUST_P_SP
+/* 10 1100 0010 */ TABDECL(OP_ADJUST_M_SP),		// OP_ADJUST_M_SP
+/* 10 1100 0011 */ TABDECL(OP_ADJUST_M_SP),		// OP_ADJUST_M_SP
+/* 10 1100 0100 */ TABDECL(OP_UND_THUMB),
+/* 10 1100 0101 */ TABDECL(OP_UND_THUMB),
+/* 10 1100 0110 */ TABDECL(OP_UND_THUMB),
+/* 10 1100 0111 */ TABDECL(OP_UND_THUMB),
+/* 10 1100 1000 */ TABDECL(OP_UND_THUMB),
+/* 10 1100 1001 */ TABDECL(OP_UND_THUMB),
+/* 10 1100 1010 */ TABDECL(OP_UND_THUMB),
+/* 10 1100 1011 */ TABDECL(OP_UND_THUMB),
+/* 10 1100 1100 */ TABDECL(OP_UND_THUMB),
+/* 10 1100 1101 */ TABDECL(OP_UND_THUMB),
+/* 10 1100 1110 */ TABDECL(OP_UND_THUMB),
+/* 10 1100 1111 */ TABDECL(OP_UND_THUMB),
+
+/* 10 1101 0000 */ TABDECL(OP_PUSH),		// OP_PUSH
+/* 10 1101 0001 */ TABDECL(OP_PUSH),		// OP_PUSH
+/* 10 1101 0010 */ TABDECL(OP_PUSH),		// OP_PUSH
+/* 10 1101 0011 */ TABDECL(OP_PUSH),		// OP_PUSH
+/* 10 1101 0100 */ TABDECL(OP_PUSH_LR),		// OP_PUSH_LR
+/* 10 1101 0101 */ TABDECL(OP_PUSH_LR),		// OP_PUSH_LR
+/* 10 1101 0110 */ TABDECL(OP_PUSH_LR),		// OP_PUSH_LR
+/* 10 1101 0111 */ TABDECL(OP_PUSH_LR),		// OP_PUSH_LR
+/* 10 1101 1000 */ TABDECL(OP_UND_THUMB),
+/* 10 1101 1001 */ TABDECL(OP_UND_THUMB),
+/* 10 1101 1010 */ TABDECL(OP_UND_THUMB),
+/* 10 1101 1011 */ TABDECL(OP_UND_THUMB),
+/* 10 1101 1100 */ TABDECL(OP_UND_THUMB),
+/* 10 1101 1101 */ TABDECL(OP_UND_THUMB),
+/* 10 1101 1110 */ TABDECL(OP_UND_THUMB),
+/* 10 1101 1111 */ TABDECL(OP_UND_THUMB),
+
+/* 10 1110 0000 */ TABDECL(OP_UND_THUMB),
+/* 10 1110 0001 */ TABDECL(OP_UND_THUMB),
+/* 10 1110 0010 */ TABDECL(OP_UND_THUMB),
+/* 10 1110 0011 */ TABDECL(OP_UND_THUMB),
+/* 10 1110 0100 */ TABDECL(OP_UND_THUMB),
+/* 10 1110 0101 */ TABDECL(OP_UND_THUMB),
+/* 10 1110 0110 */ TABDECL(OP_UND_THUMB),
+/* 10 1110 0111 */ TABDECL(OP_UND_THUMB),
+/* 10 1110 1000 */ TABDECL(OP_UND_THUMB),
+/* 10 1110 1001 */ TABDECL(OP_UND_THUMB),
+/* 10 1110 1010 */ TABDECL(OP_UND_THUMB),
+/* 10 1110 1011 */ TABDECL(OP_UND_THUMB),
+/* 10 1110 1100 */ TABDECL(OP_UND_THUMB),
+/* 10 1110 1101 */ TABDECL(OP_UND_THUMB),
+/* 10 1110 1110 */ TABDECL(OP_UND_THUMB),
+/* 10 1110 1111 */ TABDECL(OP_UND_THUMB),
+
+/* 10 1111 0000 */ TABDECL(OP_POP),		// OP_POP
+/* 10 1111 0001 */ TABDECL(OP_POP),		// OP_POP
+/* 10 1111 0010 */ TABDECL(OP_POP),		// OP_POP
+/* 10 1111 0011 */ TABDECL(OP_POP),		// OP_POP
+/* 10 1111 0100 */ TABDECL(OP_POP_PC),		// OP_POP_PC
+/* 10 1111 0101 */ TABDECL(OP_POP_PC),		// OP_POP_PC
+/* 10 1111 0110 */ TABDECL(OP_POP_PC),		// OP_POP_PC
+/* 10 1111 0111 */ TABDECL(OP_POP_PC),		// OP_POP_PC
+/* 10 1111 1000 */ TABDECL(OP_BKPT_THUMB),		// OP_BKPT_THUMB
+/* 10 1111 1001 */ TABDECL(OP_BKPT_THUMB),		// OP_BKPT_THUMB
+/* 10 1111 1010 */ TABDECL(OP_BKPT_THUMB),		// OP_BKPT_THUMB
+/* 10 1111 1011 */ TABDECL(OP_BKPT_THUMB),		// OP_BKPT_THUMB
+/* 10 1111 1100 */ TABDECL(OP_UND_THUMB),
+/* 10 1111 1101 */ TABDECL(OP_UND_THUMB),
+/* 10 1111 1110 */ TABDECL(OP_UND_THUMB),
+/* 10 1111 1111 */ TABDECL(OP_UND_THUMB),
+
+/* 11 0000 0000 */ TABDECL(OP_STMIA_THUMB),		// OP_STMIA_THUMB
+/* 11 0000 0001 */ TABDECL(OP_STMIA_THUMB),		// OP_STMIA_THUMB
+/* 11 0000 0010 */ TABDECL(OP_STMIA_THUMB),		// OP_STMIA_THUMB
+/* 11 0000 0011 */ TABDECL(OP_STMIA_THUMB),		// OP_STMIA_THUMB
+/* 11 0000 0100 */ TABDECL(OP_STMIA_THUMB),		// OP_STMIA_THUMB
+/* 11 0000 0101 */ TABDECL(OP_STMIA_THUMB),		// OP_STMIA_THUMB
+/* 11 0000 0110 */ TABDECL(OP_STMIA_THUMB),		// OP_STMIA_THUMB
+/* 11 0000 0111 */ TABDECL(OP_STMIA_THUMB),		// OP_STMIA_THUMB
+/* 11 0000 1000 */ TABDECL(OP_STMIA_THUMB),		// OP_STMIA_THUMB
+/* 11 0000 1001 */ TABDECL(OP_STMIA_THUMB),		// OP_STMIA_THUMB
+/* 11 0000 1010 */ TABDECL(OP_STMIA_THUMB),		// OP_STMIA_THUMB
+/* 11 0000 1011 */ TABDECL(OP_STMIA_THUMB),		// OP_STMIA_THUMB
+/* 11 0000 1100 */ TABDECL(OP_STMIA_THUMB),		// OP_STMIA_THUMB
+/* 11 0000 1101 */ TABDECL(OP_STMIA_THUMB),		// OP_STMIA_THUMB
+/* 11 0000 1110 */ TABDECL(OP_STMIA_THUMB),		// OP_STMIA_THUMB
+/* 11 0000 1111 */ TABDECL(OP_STMIA_THUMB),		// OP_STMIA_THUMB
+
+/* 11 0001 0000 */ TABDECL(OP_STMIA_THUMB),		// OP_STMIA_THUMB
+/* 11 0001 0001 */ TABDECL(OP_STMIA_THUMB),		// OP_STMIA_THUMB
+/* 11 0001 0010 */ TABDECL(OP_STMIA_THUMB),		// OP_STMIA_THUMB
+/* 11 0001 0011 */ TABDECL(OP_STMIA_THUMB),		// OP_STMIA_THUMB
+/* 11 0001 0100 */ TABDECL(OP_STMIA_THUMB),		// OP_STMIA_THUMB
+/* 11 0001 0101 */ TABDECL(OP_STMIA_THUMB),		// OP_STMIA_THUMB
+/* 11 0001 0110 */ TABDECL(OP_STMIA_THUMB),		// OP_STMIA_THUMB
+/* 11 0001 0111 */ TABDECL(OP_STMIA_THUMB),		// OP_STMIA_THUMB
+/* 11 0001 1000 */ TABDECL(OP_STMIA_THUMB),		// OP_STMIA_THUMB
+/* 11 0001 1001 */ TABDECL(OP_STMIA_THUMB),		// OP_STMIA_THUMB
+/* 11 0001 1010 */ TABDECL(OP_STMIA_THUMB),		// OP_STMIA_THUMB
+/* 11 0001 1011 */ TABDECL(OP_STMIA_THUMB),		// OP_STMIA_THUMB
+/* 11 0001 1100 */ TABDECL(OP_STMIA_THUMB),		// OP_STMIA_THUMB
+/* 11 0001 1101 */ TABDECL(OP_STMIA_THUMB),		// OP_STMIA_THUMB
+/* 11 0001 1110 */ TABDECL(OP_STMIA_THUMB),		// OP_STMIA_THUMB
+/* 11 0001 1111 */ TABDECL(OP_STMIA_THUMB),		// OP_STMIA_THUMB
+
+/* 11 0010 0000 */ TABDECL(OP_LDMIA_THUMB),		// OP_LDMIA_THUMB
+/* 11 0010 0001 */ TABDECL(OP_LDMIA_THUMB),		// OP_LDMIA_THUMB
+/* 11 0010 0010 */ TABDECL(OP_LDMIA_THUMB),		// OP_LDMIA_THUMB
+/* 11 0010 0011 */ TABDECL(OP_LDMIA_THUMB),		// OP_LDMIA_THUMB
+/* 11 0010 0100 */ TABDECL(OP_LDMIA_THUMB),		// OP_LDMIA_THUMB
+/* 11 0010 0101 */ TABDECL(OP_LDMIA_THUMB),		// OP_LDMIA_THUMB
+/* 11 0010 0110 */ TABDECL(OP_LDMIA_THUMB),		// OP_LDMIA_THUMB
+/* 11 0010 0111 */ TABDECL(OP_LDMIA_THUMB),		// OP_LDMIA_THUMB
+/* 11 0010 1000 */ TABDECL(OP_LDMIA_THUMB),		// OP_LDMIA_THUMB
+/* 11 0010 1001 */ TABDECL(OP_LDMIA_THUMB),		// OP_LDMIA_THUMB
+/* 11 0010 1010 */ TABDECL(OP_LDMIA_THUMB),		// OP_LDMIA_THUMB
+/* 11 0010 1011 */ TABDECL(OP_LDMIA_THUMB),		// OP_LDMIA_THUMB
+/* 11 0010 1100 */ TABDECL(OP_LDMIA_THUMB),		// OP_LDMIA_THUMB
+/* 11 0010 1101 */ TABDECL(OP_LDMIA_THUMB),		// OP_LDMIA_THUMB
+/* 11 0010 1110 */ TABDECL(OP_LDMIA_THUMB),		// OP_LDMIA_THUMB
+/* 11 0010 1111 */ TABDECL(OP_LDMIA_THUMB),		// OP_LDMIA_THUMB
+
+/* 11 0011 0000 */ TABDECL(OP_LDMIA_THUMB),		// OP_LDMIA_THUMB
+/* 11 0011 0001 */ TABDECL(OP_LDMIA_THUMB),		// OP_LDMIA_THUMB
+/* 11 0011 0010 */ TABDECL(OP_LDMIA_THUMB),		// OP_LDMIA_THUMB
+/* 11 0011 0011 */ TABDECL(OP_LDMIA_THUMB),		// OP_LDMIA_THUMB
+/* 11 0011 0100 */ TABDECL(OP_LDMIA_THUMB),		// OP_LDMIA_THUMB
+/* 11 0011 0101 */ TABDECL(OP_LDMIA_THUMB),		// OP_LDMIA_THUMB
+/* 11 0011 0110 */ TABDECL(OP_LDMIA_THUMB),		// OP_LDMIA_THUMB
+/* 11 0011 0111 */ TABDECL(OP_LDMIA_THUMB),		// OP_LDMIA_THUMB
+/* 11 0011 1000 */ TABDECL(OP_LDMIA_THUMB),		// OP_LDMIA_THUMB
+/* 11 0011 1001 */ TABDECL(OP_LDMIA_THUMB),		// OP_LDMIA_THUMB
+/* 11 0011 1010 */ TABDECL(OP_LDMIA_THUMB),		// OP_LDMIA_THUMB
+/* 11 0011 1011 */ TABDECL(OP_LDMIA_THUMB),		// OP_LDMIA_THUMB
+/* 11 0011 1100 */ TABDECL(OP_LDMIA_THUMB),		// OP_LDMIA_THUMB
+/* 11 0011 1101 */ TABDECL(OP_LDMIA_THUMB),		// OP_LDMIA_THUMB
+/* 11 0011 1110 */ TABDECL(OP_LDMIA_THUMB),		// OP_LDMIA_THUMB
+/* 11 0011 1111 */ TABDECL(OP_LDMIA_THUMB),		// OP_LDMIA_THUMB
+
+/* 11 0100 0000 */ TABDECL(OP_B_COND),		// OP_B_COND
+/* 11 0100 0001 */ TABDECL(OP_B_COND),		// OP_B_COND
+/* 11 0100 0010 */ TABDECL(OP_B_COND),		// OP_B_COND
+/* 11 0100 0011 */ TABDECL(OP_B_COND),		// OP_B_COND
+/* 11 0100 0100 */ TABDECL(OP_B_COND),		// OP_B_COND
+/* 11 0100 0101 */ TABDECL(OP_B_COND),		// OP_B_COND
+/* 11 0100 0110 */ TABDECL(OP_B_COND),		// OP_B_COND
+/* 11 0100 0111 */ TABDECL(OP_B_COND),		// OP_B_COND
+/* 11 0100 1000 */ TABDECL(OP_B_COND),		// OP_B_COND
+/* 11 0100 1001 */ TABDECL(OP_B_COND),		// OP_B_COND
+/* 11 0100 1010 */ TABDECL(OP_B_COND),		// OP_B_COND
+/* 11 0100 1011 */ TABDECL(OP_B_COND),		// OP_B_COND
+/* 11 0100 1100 */ TABDECL(OP_B_COND),		// OP_B_COND
+/* 11 0100 1101 */ TABDECL(OP_B_COND),		// OP_B_COND
+/* 11 0100 1110 */ TABDECL(OP_B_COND),		// OP_B_COND
+/* 11 0100 1111 */ TABDECL(OP_B_COND),		// OP_B_COND
+
+/* 11 0101 0000 */ TABDECL(OP_B_COND),		// OP_B_COND
+/* 11 0101 0001 */ TABDECL(OP_B_COND),		// OP_B_COND
+/* 11 0101 0010 */ TABDECL(OP_B_COND),		// OP_B_COND
+/* 11 0101 0011 */ TABDECL(OP_B_COND),		// OP_B_COND
+/* 11 0101 0100 */ TABDECL(OP_B_COND),		// OP_B_COND
+/* 11 0101 0101 */ TABDECL(OP_B_COND),		// OP_B_COND
+/* 11 0101 0110 */ TABDECL(OP_B_COND),		// OP_B_COND
+/* 11 0101 0111 */ TABDECL(OP_B_COND),		// OP_B_COND
+/* 11 0101 1000 */ TABDECL(OP_B_COND),		// OP_B_COND
+/* 11 0101 1001 */ TABDECL(OP_B_COND),		// OP_B_COND
+/* 11 0101 1010 */ TABDECL(OP_B_COND),		// OP_B_COND
+/* 11 0101 1011 */ TABDECL(OP_B_COND),		// OP_B_COND
+/* 11 0101 1100 */ TABDECL(OP_B_COND),		// OP_B_COND
+/* 11 0101 1101 */ TABDECL(OP_B_COND),		// OP_B_COND
+/* 11 0101 1110 */ TABDECL(OP_B_COND),		// OP_B_COND
+/* 11 0101 1111 */ TABDECL(OP_B_COND),		// OP_B_COND
+
+/* 11 0110 0000 */ TABDECL(OP_B_COND),		// OP_B_COND
+/* 11 0110 0001 */ TABDECL(OP_B_COND),		// OP_B_COND
+/* 11 0110 0010 */ TABDECL(OP_B_COND),		// OP_B_COND
+/* 11 0110 0011 */ TABDECL(OP_B_COND),		// OP_B_COND
+/* 11 0110 0100 */ TABDECL(OP_B_COND),		// OP_B_COND
+/* 11 0110 0101 */ TABDECL(OP_B_COND),		// OP_B_COND
+/* 11 0110 0110 */ TABDECL(OP_B_COND),		// OP_B_COND
+/* 11 0110 0111 */ TABDECL(OP_B_COND),		// OP_B_COND
+/* 11 0110 1000 */ TABDECL(OP_B_COND),		// OP_B_COND
+/* 11 0110 1001 */ TABDECL(OP_B_COND),		// OP_B_COND
+/* 11 0110 1010 */ TABDECL(OP_B_COND),		// OP_B_COND
+/* 11 0110 1011 */ TABDECL(OP_B_COND),		// OP_B_COND
+/* 11 0110 1100 */ TABDECL(OP_B_COND),		// OP_B_COND
+/* 11 0110 1101 */ TABDECL(OP_B_COND),		// OP_B_COND
+/* 11 0110 1110 */ TABDECL(OP_B_COND),		// OP_B_COND
+/* 11 0110 1111 */ TABDECL(OP_B_COND),		// OP_B_COND
+
+/* 11 0111 0000 */ TABDECL(OP_B_COND),		// OP_B_COND
+/* 11 0111 0001 */ TABDECL(OP_B_COND),		// OP_B_COND
+/* 11 0111 0010 */ TABDECL(OP_B_COND),		// OP_B_COND
+/* 11 0111 0011 */ TABDECL(OP_B_COND),		// OP_B_COND
+/* 11 0111 0100 */ TABDECL(OP_B_COND),		// OP_B_COND
+/* 11 0111 0101 */ TABDECL(OP_B_COND),		// OP_B_COND
+/* 11 0111 0110 */ TABDECL(OP_B_COND),		// OP_B_COND
+/* 11 0111 0111 */ TABDECL(OP_B_COND),		// OP_B_COND
+/* 11 0111 1000 */ TABDECL(OP_B_COND),		// OP_B_COND
+/* 11 0111 1001 */ TABDECL(OP_B_COND),		// OP_B_COND
+/* 11 0111 1010 */ TABDECL(OP_B_COND),		// OP_B_COND
+/* 11 0111 1011 */ TABDECL(OP_B_COND),		// OP_B_COND
+/* 11 0111 1100 */ TABDECL(OP_SWI_THUMB),		// OP_SWI_THUMB
+/* 11 0111 1101 */ TABDECL(OP_SWI_THUMB),		// OP_SWI_THUMB
+/* 11 0111 1110 */ TABDECL(OP_SWI_THUMB),		// OP_SWI_THUMB
+/* 11 0111 1111 */ TABDECL(OP_SWI_THUMB),		// OP_SWI_THUMB
+
+/* 11 1000 0000 */ TABDECL(OP_B_UNCOND),		// OP_B_UNCOND
+/* 11 1000 0001 */ TABDECL(OP_B_UNCOND),		// OP_B_UNCOND
+/* 11 1000 0010 */ TABDECL(OP_B_UNCOND),		// OP_B_UNCOND
+/* 11 1000 0011 */ TABDECL(OP_B_UNCOND),		// OP_B_UNCOND
+/* 11 1000 0100 */ TABDECL(OP_B_UNCOND),		// OP_B_UNCOND
+/* 11 1000 0101 */ TABDECL(OP_B_UNCOND),		// OP_B_UNCOND
+/* 11 1000 0110 */ TABDECL(OP_B_UNCOND),		// OP_B_UNCOND
+/* 11 1000 0111 */ TABDECL(OP_B_UNCOND),		// OP_B_UNCOND
+/* 11 1000 1000 */ TABDECL(OP_B_UNCOND),		// OP_B_UNCOND
+/* 11 1000 1001 */ TABDECL(OP_B_UNCOND),		// OP_B_UNCOND
+/* 11 1000 1010 */ TABDECL(OP_B_UNCOND),		// OP_B_UNCOND
+/* 11 1000 1011 */ TABDECL(OP_B_UNCOND),		// OP_B_UNCOND
+/* 11 1000 1100 */ TABDECL(OP_B_UNCOND),		// OP_B_UNCOND
+/* 11 1000 1101 */ TABDECL(OP_B_UNCOND),		// OP_B_UNCOND
+/* 11 1000 1110 */ TABDECL(OP_B_UNCOND),		// OP_B_UNCOND
+/* 11 1000 1111 */ TABDECL(OP_B_UNCOND),		// OP_B_UNCOND
+
+/* 11 1001 0000 */ TABDECL(OP_B_UNCOND),		// OP_B_UNCOND
+/* 11 1001 0001 */ TABDECL(OP_B_UNCOND),		// OP_B_UNCOND
+/* 11 1001 0010 */ TABDECL(OP_B_UNCOND),		// OP_B_UNCOND
+/* 11 1001 0011 */ TABDECL(OP_B_UNCOND),		// OP_B_UNCOND
+/* 11 1001 0100 */ TABDECL(OP_B_UNCOND),		// OP_B_UNCOND
+/* 11 1001 0101 */ TABDECL(OP_B_UNCOND),		// OP_B_UNCOND
+/* 11 1001 0110 */ TABDECL(OP_B_UNCOND),		// OP_B_UNCOND
+/* 11 1001 0111 */ TABDECL(OP_B_UNCOND),		// OP_B_UNCOND
+/* 11 1001 1000 */ TABDECL(OP_B_UNCOND),		// OP_B_UNCOND
+/* 11 1001 1001 */ TABDECL(OP_B_UNCOND),		// OP_B_UNCOND
+/* 11 1001 1010 */ TABDECL(OP_B_UNCOND),		// OP_B_UNCOND
+/* 11 1001 1011 */ TABDECL(OP_B_UNCOND),		// OP_B_UNCOND
+/* 11 1001 1100 */ TABDECL(OP_B_UNCOND),		// OP_B_UNCOND
+/* 11 1001 1101 */ TABDECL(OP_B_UNCOND),		// OP_B_UNCOND
+/* 11 1001 1110 */ TABDECL(OP_B_UNCOND),		// OP_B_UNCOND
+/* 11 1001 1111 */ TABDECL(OP_B_UNCOND),		// OP_B_UNCOND
+
+/* 11 1010 0000 */ TABDECL(OP_BLX),		// OP_BLX
+/* 11 1010 0001 */ TABDECL(OP_BLX),		// OP_BLX
+/* 11 1010 0010 */ TABDECL(OP_BLX),		// OP_BLX
+/* 11 1010 0011 */ TABDECL(OP_BLX),		// OP_BLX
+/* 11 1010 0100 */ TABDECL(OP_BLX),		// OP_BLX
+/* 11 1010 0101 */ TABDECL(OP_BLX),		// OP_BLX
+/* 11 1010 0110 */ TABDECL(OP_BLX),		// OP_BLX
+/* 11 1010 0111 */ TABDECL(OP_BLX),		// OP_BLX
+/* 11 1010 1000 */ TABDECL(OP_BLX),		// OP_BLX
+/* 11 1010 1001 */ TABDECL(OP_BLX),		// OP_BLX
+/* 11 1010 1010 */ TABDECL(OP_BLX),		// OP_BLX
+/* 11 1010 1011 */ TABDECL(OP_BLX),		// OP_BLX
+/* 11 1010 1100 */ TABDECL(OP_BLX),		// OP_BLX
+/* 11 1010 1101 */ TABDECL(OP_BLX),		// OP_BLX
+/* 11 1010 1110 */ TABDECL(OP_BLX),		// OP_BLX
+/* 11 1010 1111 */ TABDECL(OP_BLX),		// OP_BLX
+
+/* 11 1011 0000 */ TABDECL(OP_BLX),		// OP_BLX
+/* 11 1011 0001 */ TABDECL(OP_BLX),		// OP_BLX
+/* 11 1011 0010 */ TABDECL(OP_BLX),		// OP_BLX
+/* 11 1011 0011 */ TABDECL(OP_BLX),		// OP_BLX
+/* 11 1011 0100 */ TABDECL(OP_BLX),		// OP_BLX
+/* 11 1011 0101 */ TABDECL(OP_BLX),		// OP_BLX
+/* 11 1011 0110 */ TABDECL(OP_BLX),		// OP_BLX
+/* 11 1011 0111 */ TABDECL(OP_BLX),		// OP_BLX
+/* 11 1011 1000 */ TABDECL(OP_BLX),		// OP_BLX
+/* 11 1011 1001 */ TABDECL(OP_BLX),		// OP_BLX
+/* 11 1011 1010 */ TABDECL(OP_BLX),		// OP_BLX
+/* 11 1011 1011 */ TABDECL(OP_BLX),		// OP_BLX
+/* 11 1011 1100 */ TABDECL(OP_BLX),		// OP_BLX
+/* 11 1011 1101 */ TABDECL(OP_BLX),		// OP_BLX
+/* 11 1011 1110 */ TABDECL(OP_BLX),		// OP_BLX
+/* 11 1011 1111 */ TABDECL(OP_BLX),		// OP_BLX
+
+/* 11 1100 0000 */ TABDECL(OP_BL_10),		// OP_BL_10
+/* 11 1100 0001 */ TABDECL(OP_BL_10),		// OP_BL_10
+/* 11 1100 0010 */ TABDECL(OP_BL_10),		// OP_BL_10
+/* 11 1100 0011 */ TABDECL(OP_BL_10),		// OP_BL_10
+/* 11 1100 0100 */ TABDECL(OP_BL_10),		// OP_BL_10
+/* 11 1100 0101 */ TABDECL(OP_BL_10),		// OP_BL_10
+/* 11 1100 0110 */ TABDECL(OP_BL_10),		// OP_BL_10
+/* 11 1100 0111 */ TABDECL(OP_BL_10),		// OP_BL_10
+/* 11 1100 1000 */ TABDECL(OP_BL_10),		// OP_BL_10
+/* 11 1100 1001 */ TABDECL(OP_BL_10),		// OP_BL_10
+/* 11 1100 1010 */ TABDECL(OP_BL_10),		// OP_BL_10
+/* 11 1100 1011 */ TABDECL(OP_BL_10),		// OP_BL_10
+/* 11 1100 1100 */ TABDECL(OP_BL_10),		// OP_BL_10
+/* 11 1100 1101 */ TABDECL(OP_BL_10),		// OP_BL_10
+/* 11 1100 1110 */ TABDECL(OP_BL_10),		// OP_BL_10
+/* 11 1100 1111 */ TABDECL(OP_BL_10),		// OP_BL_10
+
+/* 11 1101 0000 */ TABDECL(OP_BL_10),		// OP_BL_10
+/* 11 1101 0001 */ TABDECL(OP_BL_10),		// OP_BL_10
+/* 11 1101 0010 */ TABDECL(OP_BL_10),		// OP_BL_10
+/* 11 1101 0011 */ TABDECL(OP_BL_10),		// OP_BL_10
+/* 11 1101 0100 */ TABDECL(OP_BL_10),		// OP_BL_10
+/* 11 1101 0101 */ TABDECL(OP_BL_10),		// OP_BL_10
+/* 11 1101 0110 */ TABDECL(OP_BL_10),		// OP_BL_10
+/* 11 1101 0111 */ TABDECL(OP_BL_10),		// OP_BL_10
+/* 11 1101 1000 */ TABDECL(OP_BL_10),		// OP_BL_10
+/* 11 1101 1001 */ TABDECL(OP_BL_10),		// OP_BL_10
+/* 11 1101 1010 */ TABDECL(OP_BL_10),		// OP_BL_10
+/* 11 1101 1011 */ TABDECL(OP_BL_10),		// OP_BL_10
+/* 11 1101 1100 */ TABDECL(OP_BL_10),		// OP_BL_10
+/* 11 1101 1101 */ TABDECL(OP_BL_10),		// OP_BL_10
+/* 11 1101 1110 */ TABDECL(OP_BL_10),		// OP_BL_10
+/* 11 1101 1111 */ TABDECL(OP_BL_10),		// OP_BL_10
+
+/* 11 1110 0000 */ TABDECL(OP_BL_11),		// OP_BL_11
+/* 11 1110 0001 */ TABDECL(OP_BL_11),		// OP_BL_11
+/* 11 1110 0010 */ TABDECL(OP_BL_11),		// OP_BL_11
+/* 11 1110 0011 */ TABDECL(OP_BL_11),		// OP_BL_11
+/* 11 1110 0100 */ TABDECL(OP_BL_11),		// OP_BL_11
+/* 11 1110 0101 */ TABDECL(OP_BL_11),		// OP_BL_11
+/* 11 1110 0110 */ TABDECL(OP_BL_11),		// OP_BL_11
+/* 11 1110 0111 */ TABDECL(OP_BL_11),		// OP_BL_11
+/* 11 1110 1000 */ TABDECL(OP_BL_11),		// OP_BL_11
+/* 11 1110 1001 */ TABDECL(OP_BL_11),		// OP_BL_11
+/* 11 1110 1010 */ TABDECL(OP_BL_11),		// OP_BL_11
+/* 11 1110 1011 */ TABDECL(OP_BL_11),		// OP_BL_11
+/* 11 1110 1100 */ TABDECL(OP_BL_11),		// OP_BL_11
+/* 11 1110 1101 */ TABDECL(OP_BL_11),		// OP_BL_11
+/* 11 1110 1110 */ TABDECL(OP_BL_11),		// OP_BL_11
+/* 11 1110 1111 */ TABDECL(OP_BL_11),		// OP_BL_11
+
+/* 11 1111 0000 */ TABDECL(OP_BL_11),		// OP_BL_11
+/* 11 1111 0001 */ TABDECL(OP_BL_11),		// OP_BL_11
+/* 11 1111 0010 */ TABDECL(OP_BL_11),		// OP_BL_11
+/* 11 1111 0011 */ TABDECL(OP_BL_11),		// OP_BL_11
+/* 11 1111 0100 */ TABDECL(OP_BL_11),		// OP_BL_11
+/* 11 1111 0101 */ TABDECL(OP_BL_11),		// OP_BL_11
+/* 11 1111 0110 */ TABDECL(OP_BL_11),		// OP_BL_11
+/* 11 1111 0111 */ TABDECL(OP_BL_11),		// OP_BL_11
+/* 11 1111 1000 */ TABDECL(OP_BL_11),		// OP_BL_11
+/* 11 1111 1001 */ TABDECL(OP_BL_11),		// OP_BL_11
+/* 11 1111 1010 */ TABDECL(OP_BL_11),		// OP_BL_11
+/* 11 1111 1011 */ TABDECL(OP_BL_11),		// OP_BL_11
+/* 11 1111 1100 */ TABDECL(OP_BL_11),		// OP_BL_11
+/* 11 1111 1101 */ TABDECL(OP_BL_11),		// OP_BL_11
+/* 11 1111 1110 */ TABDECL(OP_BL_11),		// OP_BL_11
+/* 11 1111 1111 */ TABDECL(OP_BL_11),		// OP_BL_11
+

audacious-plugins-3.6.2-gtk3.tar.bz2/src/xsf/desmume/types.h -> audacious-plugins-4.4.1.tar.bz2/src/xsf/desmume/types.h Changed

@@ -1,139 +1,105 @@
-/* Copyright (C) 2005 Guillaume Duhamel
-
- This file is part of DeSmuME
+/*
+	Copyright (C) 2005 Guillaume Duhamel
+	Copyright (C) 2008-2012 DeSmuME team
+
+	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
+	(at your option) any later version.
+
+	This file 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 the this software. If not, see <http://www.gnu.org/licenses/>.
+*/
 
- DeSmuME 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.
+#pragma once
 
- DeSmuME 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.
+#include <cstddef>
+#include <cstdint>
 
- You should have received a copy of the GNU General Public License
- along with DeSmuME; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-*/
+using u64 = uint64_t;
+using s64 = int64_t;
+using u32 = uint32_t;
+using s32 = int32_t;
+using u16 = uint16_t;
+using s16 = int16_t;
+using u8 = uint8_t;
+using s8 = int8_t;
+#define FORCEINLINE inline
 
-#ifndef TYPES_HPP
-#define TYPES_HPP
-
-#ifndef FASTCALL
-#ifdef __MINGW32__
-#define FASTCALL __attribute__((fastcall))
-#elif defined (__i386__)
-#define FASTCALL __attribute__((regparm(3)))
-#else
-#define FASTCALL
-#endif
+#ifdef _WINDOWS
+# define HAVE_LIBAGG
+# define ENABLE_SSE
+# define ENABLE_SSE2
 #endif
 
-#ifndef INLINE
-#ifdef _MSC_VER
-#define INLINE _inline
-#else
-#define INLINE inline
-#endif
+#ifdef __GNUC__
+# ifdef __SSE__
+# define ENABLE_SSE
+# endif
+# ifdef __SSE2__
+# define ENABLE_SSE2
+# endif
 #endif
 
-#ifdef DESMUME_COCOA
-#ifdef __BIG_ENDIAN__
-#define WORDS_BIGENDIAN
-#endif
+#ifdef NOSSE
+# undef ENABLE_SSE
 #endif
 
-#if defined(__LP64__)
-typedef unsigned char u8;
-typedef unsigned short u16;
-typedef unsigned int u32;
-typedef unsigned long u64;
-typedef unsigned long pointer;
-
-typedef signed char s8;
-typedef signed short s16;
-typedef signed int s32;
-typedef signed long s64;
-#else
-typedef unsigned char u8;
-typedef unsigned short u16;
-typedef unsigned long u32;
-#ifdef _MSC_VER
-typedef unsigned __int64 u64;
-#else
-typedef unsigned long long u64;
+#ifdef NOSSE2
+# undef ENABLE_SSE2
 #endif
-typedef unsigned long pointer;
 
-typedef signed char s8;
-typedef signed short s16;
-typedef signed long s32;
 #ifdef _MSC_VER
-typedef __int64 s64;
+# define strcasecmp(x, y) _stricmp(x, y)
+# define strncasecmp(x, y, l) strnicmp(x, y, l)
+# define snprintf _snprintf
+#endif
+
+#ifndef MAX_PATH
+# ifdef __GNUC__
+# include <climits>
+# ifndef PATH_MAX
+# define MAX_PATH 1024
+# else
+# define MAX_PATH PATH_MAX
+# endif
+# endif
+#endif
+
+#if defined(_MSC_VER) || defined(__INTEL_COMPILER)
+# define DS_ALIGN(X) __declspec(align(X))
+#elif defined(__GNUC__)
+# define DS_ALIGN(X) __attribute__ ((aligned (X)))
 #else
-typedef signed long long s64;
-#endif
+# define DS_ALIGN(X)
 #endif
 
-typedef u8 uint8;
-typedef u16 uint16;
+#define CACHE_ALIGN DS_ALIGN(32)
 
-#ifndef OBJ_C
-typedef u32 uint32;
+#ifdef __MINGW32__
+# undef FASTCALL
+# undef LDM_FASTCALL
+# define FASTCALL __attribute__((fastcall))
+# define LDM_FASTCALL
+#elif defined (__i386__) && !defined(__clang__)
+# define FASTCALL __attribute__((regparm(3)))
+# define LDM_FASTCALL
 #else
-#define uint32 u32 //uint32 is defined in Leopard somewhere, avoid conflicts
+# define FASTCALL
+# define LDM_FASTCALL
 #endif
 
-/*---------- GPU3D fixed-points types -----------*/
-
-typedef s32 f32;
-#define inttof32(n) ((n) << 12)
-#define f32toint(n) ((n) >> 12)
-#define floattof32(n) ((int32)((n) * (1 << 12)))
-#define f32tofloat(n) (((float)(n)) / (float)(1<<12))
-
-typedef s16 t16;
-#define f32tot16(n) ((t16)(n >> 8))
-#define inttot16(n) ((n) << 4)
-#define t16toint(n) ((n) >> 4)
-#define floattot16(n) ((t16)((n) * (1 << 4)))
-#define t16ofloat(n) (((float)(n)) / (float)(1<<4))
-
-typedef s16 v16;
-#define inttov16(n) ((n) << 12)
-#define f32tov16(n) (n)
-#define floattov16(n) ((v16)((n) * (1 << 12)))
-#define v16toint(n) ((n) >> 12)
-#define v16tofloat(n) (((float)(n)) / (float)(1<<12))
-
-typedef s16 v10;
-#define inttov10(n) ((n) << 9)
-#define f32tov10(n) ((v10)(n >> 3))
-#define v10toint(n) ((n) >> 9)
-#define floattov10(n) ((v10)((n) * (1 << 9)))
-#define v10tofloat(n) (((float)(n)) / (float)(1<<9))
-
 /*----------------------*/
 
-#ifndef OBJ_C
-typedef int BOOL;
-#else
-//apple also defines BOOL
-typedef int desmume_BOOL;
-#define BOOL desmume_BOOL
-#endif
-
-#ifndef true
-#define true 1
-#endif
-
-#ifndef false
-#define false 0
-#endif
-
-#ifdef __GNUC__
-#define PACKED __attribute__((packed))
+#ifdef __BIG_ENDIAN__
+# ifndef WORDS_BIGENDIAN
+# define WORDS_BIGENDIAN
+# endif
 #endif
 
 #ifdef WORDS_BIGENDIAN
@@ -143,29 +109,40 @@
 #endif
 
 /* little endian (ds' endianess) to local endianess convert macros */
-#ifdef LOCAL_BE	/* local arch is big endian */
-# define LE_TO_LOCAL_16(x) ((((x)&0xff)<<8)|(((x)>>8)&0xff))
-# define LE_TO_LOCAL_32(x) ((((x)&0xff)<<24)|(((x)&0xff00)<<8)|(((x)>>8)&0xff00)|(((x)>>24)&0xff))
-# define LOCAL_TO_LE_16(x) ((((x)&0xff)<<8)|(((x)>>8)&0xff))
-# define LOCAL_TO_LE_32(x) ((((x)&0xff)<<24)|(((x)&0xff00)<<8)|(((x)>>8)&0xff00)|(((x)>>24)&0xff))
-#else		/* local arch is little endian */
-# define LE_TO_LOCAL_16(x) (x)
-# define LE_TO_LOCAL_32(x) (x)
-# define LOCAL_TO_LE_16(x) (x)
-# define LOCAL_TO_LE_32(x) (x)
+#ifdef LOCAL_BE /* local arch is big endian */
+inline uint16_t LE_TO_LOCAL_16(uint16_t x) { return ((x & 0xff) << 8) | ((x >> 8) & 0xff); }
+inline uint32_t LE_TO_LOCAL_32(uint32_t x) { return ((x & 0xff) << 24) | ((x & 0xff00) << 8) | ((x >> 8) & 0xff00) | ((x >> 24) & 0xff); }
+inline uint64_t LE_TO_LOCAL_64(uint64_t x)
+{
+	return ((x & 0xff) << 56) | ((x & 0xff00) << 40) | ((x & 0xff0000) << 24) | ((x & 0xff000000) << 8) |
+		((x >> 8) & 0xff000000) | ((x >> 24) & 0xff00) | ((x >> 40) & 0xff00) | ((x >> 56) & 0xff);
+}
+#else /* local arch is little endian */
+inline uint16_t LE_TO_LOCAL_16(uint16_t x) { return x; }
+inline uint32_t LE_TO_LOCAL_32(uint32_t x) { return x; }
+inline uint64_t LE_TO_LOCAL_64(uint64_t x) { return x; }
 #endif
 
-/* kilobytes and megabytes macro */
-#define MB(x) ((x)*1024*1024)
-#define KB(x) ((x)*1024)
+template<typename T, size_t N> inline size_t ARRAY_SIZE(T (&)N) { return N; }
 
-#define CPU_STR(c) ((c==ARM9)?"ARM9":"ARM7")
-typedef enum
+inline double u64_to_double(uint64_t u)
 {
-	ARM9 = 0,
-	ARM7 = 1
-} cpu_id_t;
-
-#define __PACKED __attribute__((__packed__))
-
-#endif
+	union
+	{
+		uint64_t a;
+		double b;
+	} fuxor;
+	fuxor.a = u;
+	return fuxor.b;
+}
+
+// fairly standard for loop macros
+#define MACRODO1(TRICK, TODO) { int X = TRICK; TODO; }
+#define MACRODO2(TRICK, TODO) { MACRODO1((TRICK), TODO) MACRODO1(((TRICK) + 1), TODO) }
+#define MACRODO4(TRICK, TODO) { MACRODO2((TRICK), TODO) MACRODO2(((TRICK) + 2), TODO) }
+
+template<typename T> inline void reconstruct(T *t)
+{
+	t->~T();
+	new(t) T();
+}

audacious-plugins-4.4.1.tar.bz2/src/xsf/desmume/version.h Added

audacious-plugins-4.4.1.tar.bz2/src/xsf/meson.build Added

audacious-plugins-3.6.2-gtk3.tar.bz2/src/xsf/plugin.cc -> audacious-plugins-4.4.1.tar.bz2/src/xsf/plugin.cc Changed

@@ -1,32 +1,48 @@
 /*
-	Audio Overload SDK - main driver. for demonstration only, not user friendly!
-
-	Copyright (c) 2007-2008 R. Belmont and Richard Bannister.
-
-	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.
-	* Neither the names of R. Belmont and Richard Bannister nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
-
-	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 OWNER 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.
-*/
+ * xSF - 2SF Player
+ * Copyright (c) 2014-2020 Naram Qashat <cyberbotx@cyberbotx.com>
+ * Copyright (c) 2020-2021 Adam Higerd <chighland@gmail.com>
+ *
+ * Partially derived from Audio Overload SDK
+ * Copyright (c) 2007-2008 R. Belmont and Richard Bannister.
+ * 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.
+ * * Neither the names of R. Belmont and Richard Bannister nor the names of its
+ * contributors may be used to endorse or promote products derived from this
+ * software without specific prior written permission.
+ *
+ * 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 OWNER 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.
+ *
+ * Utilizes a modified DeSmuME v0.9.9 SVN for playback
+ * http://desmume.org/
+ * DeSmuME is licensed under the GNU General Public License, version 2 or later.
+ * See the accompanying source files for more information.
+ */
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <memory>
+#include <sstream>
+#include <iostream>
 
 #include <libaudcore/i18n.h>
 #include <libaudcore/plugin.h>
@@ -34,9 +50,17 @@
 #include <libaudcore/audstrings.h>
 #include <libaudcore/runtime.h>
 
-#include "ao.h"
-#include "corlett.h"
-#include "vio2sf.h"
+#include "desmume/NDSSystem.h"
+#include "spu/samplecache.h"
+#include "sndif2sf.h"
+#include "XSFFile.h"
+
+#if _WIN32
+#include <windows.h>
+#define sleep Sleep
+#else
+#include <unistd.h>
+#endif
 
 class XSFPlugin : public InputPlugin
 {
@@ -53,29 +77,102 @@
 		& prefs
 	};
 
-	static constexpr auto iinfo = InputInfo()
-		.with_exts(exts);
-
-	constexpr XSFPlugin() : InputPlugin(info, iinfo) {}
+	constexpr XSFPlugin() : InputPlugin(info, InputInfo()
+		.with_exts(exts)) {}
 
 	bool init();
 
 	bool is_our_file(const char *filename, VFSFile &file);
-	Tuple read_tuple(const char *filename, VFSFile &file);
+	bool read_tag(const char *filename, VFSFile &file, Tuple &tuple, Index<char> *image);
 	bool play(const char *filename, VFSFile &file);
 };
 
 EXPORT XSFPlugin aud_plugin_instance;
 
+class vfsfile_istream : public std::istream {
+ class vfsfile_streambuf : public std::basic_streambuf<char> {
+ public:
+ vfsfile_streambuf(const char* filename) : source(new VFSFile(filename, "rb")), owned(source) {}
+ vfsfile_streambuf(VFSFile* source) : source(source), owned(nullptr) {}
+
+ protected:
+ std::streamsize xsgetn(char* s, std::streamsize count) {
+ return source->fread(s, 1, count);
+ }
+
+ traits_type::int_type underflow() {
+ if (source && *source) {
+ uint8_t result1;
+ int ok = source->fread(reinterpret_cast<char*>(result), 1, 1);
+ if (ok) {
+ if (source->fseek(-1, VFS_SEEK_CUR)) {
+ return traits_type::eof();
+ }
+ return result0;
+ }
+ } else {
+ }
+ return traits_type::eof();
+ }
+
+ traits_type::int_type uflow() {
+ if (source && *source) {
+ uint8_t result1;
+ int ok = source->fread(reinterpret_cast<char*>(result), 1, 1);
+ if (ok) {
+ return result0;
+ }
+ }
+ return traits_type::eof();
+ }
+
+ traits_type::pos_type seekoff(traits_type::off_type off, std::ios_base::seekdir dir, std::ios_base::openmode which = std::ios_base::in) {
+ if (!source || !*source) {
+ return traits_type::off_type(-1);
+ }
+ int err = 1;
+ if (dir == std::ios_base::beg) {
+ err = source->fseek(off, VFS_SEEK_SET);
+ } else if (dir == std::ios_base::end) {
+ err = source->fseek(off, VFS_SEEK_END);
+ } else {
+ err = source->fseek(off, VFS_SEEK_CUR);
+ }
+ if (err) {
+ return traits_type::off_type(-1);
+ }
+ return source->ftell();
+ }
+
+ traits_type::pos_type seekpos(traits_type::pos_type pos, std::ios_base::openmode which = std::ios_base::in) {
+ return seekoff(pos, std::ios_base::beg, which);
+ }
+
+ private:
+ VFSFile* source;
+ std::unique_ptr<VFSFile> owned;
+ };
+
+public:
+ vfsfile_istream(const char* source) : std::istream(new vfsfile_streambuf(source)) {}
+ vfsfile_istream(VFSFile* source) : std::istream(new vfsfile_streambuf(source)) {}
+ ~vfsfile_istream() { delete rdbuf(nullptr); }
+};
+
 /* xsf_get_lib: called to load secondary files */
 static String dirpath;
 
+bool ignore_length;
+
 #define CFG_ID "xsf"
 
 const char* const XSFPlugin::defaults =
 {
-	"ignore_length", "FALSE",
-	NULL
+ "ignore_length", "FALSE",
+ "fade", "5000",
+ "sample_rate", "32728",
+ "interpolation_mode", "none",
+ nullptr
 };
 
 bool XSFPlugin::init()
@@ -90,133 +187,227 @@
 	return file ? file.read_all() : Index<char>();
 }
 
-Tuple XSFPlugin::read_tuple(const char *filename, VFSFile &fd)
+bool XSFPlugin::read_tag(const char *filename, VFSFile &file, Tuple &tuple, Index<char> *image)
 {
-	Tuple t;
-	corlett_t *c;
-
-	Index<char> buf = fd.read_all ();
-
-	if (!buf.len())
-		return t;
-
-	if (corlett_decode((uint8_t *)buf.begin(), buf.len(), nullptr, nullptr, &c) != AO_SUCCESS)
-		return t;
-
-	t.set_filename (filename);
-
-	t.set_int (Tuple::Length, psfTimeToMS(c->inf_length) + psfTimeToMS(c->inf_fade));
-	t.set_str (Tuple::Artist, c->inf_artist);
-	t.set_str (Tuple::Album, c->inf_game);
-	t.set_str (Tuple::Title, c->inf_title);
-	t.set_str (Tuple::Copyright, c->inf_copy);
-	t.set_str (Tuple::Quality, _("sequenced"));
-	t.set_str (Tuple::Codec, "GBA/Nintendo DS Audio");
-
-	free(c);
-
-	return t;
+ try {
+ vfsfile_istream vs(&file);
+ if (!vs) {
+ return false;
+ }
+ XSFFile xsf(vs, 0, 0, true);
+
+ tuple.set_int(Tuple::Length, xsf.GetLengthMS(115000) + xsf.GetFadeMS(5000));
+ tuple.set_str(Tuple::Artist, xsf.GetTagValue("artist").c_str());
+ tuple.set_str(Tuple::Album, xsf.GetTagValue("game").c_str());
+ tuple.set_str(Tuple::Title, xsf.GetTagValue("title").c_str());
+ tuple.set_str(Tuple::Copyright, xsf.GetTagValue("copyright").c_str());
+ tuple.set_str(Tuple::Quality, _("sequenced"));
+ tuple.set_str(Tuple::Codec, "Nintendo DS Audio");
+ if (xsf.GetTagExists("replaygain_album_gain")) {
+ tuple.set_int(Tuple::AlbumGain, xsf.GetTagValue<double>("replaygain_album_gain", 1.0) * 1000);
+ tuple.set_int(Tuple::AlbumPeak, xsf.GetTagValue<double>("replaygain_album_peak", 1.0) * 1000);
+ tuple.set_int(Tuple::TrackGain, xsf.GetTagValue<double>("replaygain_track_gain", 1.0) * 1000);
+ tuple.set_int(Tuple::TrackPeak, xsf.GetTagValue<double>("replaygain_track_peak", 1.0) * 1000);
+ tuple.set_int(Tuple::GainDivisor, 1000);
+ tuple.set_int(Tuple::PeakDivisor, 1000);
+ }
+
+ return true;
+ } catch (std::exception& e) {
+ std::cerr << "Exception: " << e.what() << std::endl;
+ return false;
+ }
 }
 
-static int xsf_get_length(const Index<char> &buf)
+static void xsf_reset(int frameSkip)
 {
-	corlett_t *c;
-
-	if (corlett_decode((uint8_t *)buf.begin(), buf.len(), nullptr, nullptr, &c) != AO_SUCCESS)
-		return -1;
+ execute = false;
+ NDS_Reset();
+ spuSampleCache.clear();
+ execute = true;
+
+ if (frameSkip > 0) {
+ for (int i = 0; i < frameSkip; ++i) {
+ NDS_exec<false>();
+ }
+ }
+ buffer_rope.clear();
+}
 
-	bool ignore_length = aud_get_bool(CFG_ID, "ignore_length");
-	int length = (!ignore_length) ? psfTimeToMS(c->inf_length) + psfTimeToMS(c->inf_fade) : -1;
+bool map2SF(std::vector<uint8_t>& rom, XSFFile* xsf)
+{
+ if (!xsf->IsValidType(0x24))
+ return false;
+ const auto& programSection = xsf->GetProgramSection();
+ if (programSection.size()) {
+ uint32_t offset = Get32BitsLE(&programSection0);
+ uint32_t size = Get32BitsLE(&programSection4);
+ uint32_t finalSize = size + offset;
+ if (rom.size() < finalSize) {
+ rom.resize(finalSize + 10);
+ }
+ memcpy(&romoffset, &programSection8, size);
+ }
+ return true;
+}
 
-	free(c);
+bool recursiveLoad2SF(std::vector<uint8_t>& rom, XSFFile* xsf, int level)
+{
+ if (level <= 10 && xsf->GetTagExists("_lib"))
+ {
+ vfsfile_istream vs(filename_build({ dirpath, xsf->GetTagValue("_lib").c_str() }));
+ if (!vs)
+ return false;
+ XSFFile libxsf(vs, 4, 8);
+ if (!recursiveLoad2SF(rom, &libxsf, level + 1))
+ return false;
+ }
+
+ if (!map2SF(rom, xsf))
+ return false;
+
+ bool found = true;
+ for (int n = 2; found; n++) {
+ std::ostringstream ss;
+ ss << "_lib" << (n++);
+ found = xsf->GetTagExists(ss.str());
+ if (found) {
+ vfsfile_istream vs(filename_build({ dirpath, xsf->GetTagValue(ss.str()).c_str() }));
+ if (!vs)
+ return false;
+ XSFFile libxsf(vs, 4, 8);
+ if (!recursiveLoad2SF(rom, &libxsf, level + 1))
+ return false;
+ }
+ }
+ return true;
+}
 
-	return length;
+void setInterp() {
+ std::string interp = (const char*)aud_get_str(CFG_ID, "interpolation_mode");
+ int interpMode = 0;
+ if (interp == "linear") {
+ interpMode = 1;
+ } else if (interp == "cosine") {
+ interpMode = 2;
+ } else if (interp == "sharp") {
+ interpMode = 3;
+ }
+ CommonSettings.spuInterpolationMode = (SPUInterpolationMode)interpMode;
 }
 
 bool XSFPlugin::play(const char *filename, VFSFile &file)
 {
 	int length = -1;
-	int16_t samples44100*2;
-	int seglen = 44100 / 60;
-	float pos = 0.0;
 	bool error = false;
+ int fade = aud_get_int(CFG_ID, "fade");
+ int frameSkip = -1;
+	float pos = 0.0;
+	setInterp();
 
-	const char * slash = strrchr (filename, '/');
-	if (! slash)
+	const char * slash = strrchr(filename, '/');
+	if (!slash)
 		return false;
 
-	dirpath = String (str_copy (filename, slash + 1 - filename));
-
-	Index<char> buf = file.read_all ();
-
-	if (!buf.len())
-	{
-		error = true;
-		goto ERR_NO_CLOSE;
-	}
-
-	length = xsf_get_length(buf);
-
-	if (xsf_start(buf.begin(), buf.len()) != AO_SUCCESS)
-	{
-		error = true;
-		goto ERR_NO_CLOSE;
-	}
-
-	set_stream_bitrate(44100*2*2*8);
-	open_audio(FMT_S16_NE, 44100, 2);
-
-	while (! check_stop ())
-	{
-		int seek_value = check_seek ();
-
-		if (seek_value >= 0)
-		{
-			if (seek_value > pos)
-			{
-				while (pos < seek_value)
-				{
-					xsf_gen(samples, seglen);
-					pos += 16.666;
-				}
-			}
-			else if (seek_value < pos)
-			{
-				xsf_term();
-
-				if (xsf_start(buf.begin(), buf.len()) == AO_SUCCESS)
-				{
-					pos = 0.0;
-					while (pos < seek_value)
-					{
-						xsf_gen(samples, seglen);
-						pos += 16.666; /* each segment is 16.666ms */
-					}
-				}
-			 	else
-				{
-					error = true;
-					goto CLEANUP;
-				}
-			}
-		}
-
-		xsf_gen(samples, seglen);
-		pos += 16.666;
-
- write_audio(samples, seglen * 4);
-
-		bool ignore_length = aud_get_bool(CFG_ID, "ignore_length");
-		if (pos >= length && !ignore_length)
-			goto CLEANUP;
-	}
-
-CLEANUP:
-	xsf_term();
-
-ERR_NO_CLOSE:
-	dirpath = String ();
-
+ while (execute && !check_stop()) {
+ std::cerr << "waiting for thread to finish..." << std::endl;
+ sleep(100);
+ }
+
+	dirpath = String(str_copy(filename, slash + 1 - filename));
+
+	Index<char> buf = file.read_all();
+ try {
+ vfsfile_istream vs(&file);
+ if (!vs) {
+ return false;
+ }
+
+ XSFFile xsf(vs, 4, 8);
+ fade = xsf.GetFadeMS(5000);
+ length = xsf.GetLengthMS(115000) + fade;
+
+ std::vector<uint8_t> rom;
+ if (!recursiveLoad2SF(rom, &xsf, 0) || !rom.size())
+ return false;
+
+ if (NDS_Init())
+ return false;
+
+ int sampleRate = aud_get_int(CFG_ID, "sample_rate");
+ if (sampleRate < 11025 || sampleRate > 96000)
+ sampleRate = 32728;
+ SetDesmumeSampleRate(sampleRate); // TODO: config
+ int BUFFERSIZE = DESMUME_SAMPLE_RATE / 59.837; //truncates to 737, the traditional value, for 44100
+ SPU_ChangeSoundCore(SNDIFID_2SF, BUFFERSIZE);
+
+ execute = false;
+
+ MMU_unsetRom();
+ NDS_SetROM(rom.data(), rom.size());
+ gameInfo.loadData((char*)rom.data(), rom.size());
+
+ frameSkip = xsf.GetTagValue<int>("_frames", -1);
+ CommonSettings.rigorous_timing = true;
+ CommonSettings.spu_advanced = true;
+ CommonSettings.advanced_timing = true;
+
+ xsf_reset(frameSkip);
+
+ set_stream_bitrate(DESMUME_SAMPLE_RATE*2*2*8);
+ open_audio(FMT_S16_NE, DESMUME_SAMPLE_RATE, 2);
+
+ ignore_length = aud_get_bool(CFG_ID, "ignore_length");
+ while (!check_stop() && (pos < length || ignore_length))
+ {
+ int seek_value = check_seek();
+
+ if (seek_value >= 0)
+ {
+ if (seek_value < pos) {
+ xsf_reset(frameSkip);
+ pos = 0;
+ }
+ while (pos < seek_value)
+ {
+ while (buffer_rope.size()) {
+ pos += buffer_rope.front().size() * 1000 / DESMUME_SAMPLE_RATE / 4;
+ buffer_rope.pop_front();
+ }
+ NDS_exec<false>();
+ SPU_Emulate_user();
+ }
+ buffer_rope.clear();
+ }
+
+ while (!buffer_rope.size() && !check_stop()) {
+ NDS_exec<false>();
+ SPU_Emulate_user();
+ }
+ while (buffer_rope.size() && !check_stop()) {
+ auto& front = buffer_rope.front();
+ if (pos > length - fade && !ignore_length) {
+ float fadeFactor = (length - pos) / (1.0 * fade);
+ int sampleCount = front.size() / 2;
+ int16_t* sampleBuffer = reinterpret_cast<int16_t*>(front.data());
+ for (int i = 0; i < sampleCount; i++) {
+ sampleBufferi *= fadeFactor;
+ }
+ }
+ write_audio(front.data(), front.size());
+ pos += front.size() * 1000 / DESMUME_SAMPLE_RATE / 4;
+ buffer_rope.pop_front();
+ }
+ }
+ } catch (std::exception& e) {
+ std::cerr << "Exception: " << e.what() << std::endl;
+ error = true;
+ }
+
+ MMU_unsetRom();
+ NDS_DeInit();
+	dirpath = String();
+ execute = false;
 	return !error;
 }
 
@@ -234,9 +425,26 @@
 
 const char *const XSFPlugin::exts = { "2sf", "mini2sf", nullptr };
 
+static const ComboItem sampleRateItems = {
+ ComboItem(N_("32728 Hz"), 32728),
+ ComboItem(N_("44100 Hz"), 44100),
+ ComboItem(N_("48000 Hz"), 48000),
+ ComboItem(N_("65456 Hz"), 65456)
+};
+
+static const ComboItem interpItems = {
+ ComboItem(N_("None"), "none"),
+ ComboItem(N_("Linear"), "linear"),
+ ComboItem(N_("Cosine"), "cosine"),
+ ComboItem(N_("Sharp"), "sharp")
+};
+
 const PreferencesWidget XSFPlugin::widgets = {
-	WidgetLabel(N_("XSF Configuration")),
-	WidgetCheck(N_("Ignore length from file"), WidgetBool(CFG_ID, "ignore_length")),
+ WidgetLabel(N_("XSF Configuration")),
+ WidgetCheck(N_("Ignore length from file"), WidgetBool(CFG_ID, "ignore_length", { ignore_length = aud_get_bool(CFG_ID, "ignore_length"); } )),
+ WidgetSpin(N_("Default fade time:"), WidgetInt(CFG_ID, "fade"), { 0, 15000, 100, N_("ms") }),
+ WidgetCombo(N_("Sample rate:"), WidgetInt(CFG_ID, "sample_rate"), {{ sampleRateItems }}),
+ WidgetCombo(N_("Interpolation mode:"), WidgetString(CFG_ID, "interpolation_mode", setInterp), {{ interpItems }})
 };
 
 const PluginPreferences XSFPlugin::prefs = {{widgets}};

audacious-plugins-4.4.1.tar.bz2/src/xsf/sndif2sf.cc Added

@@ -0,0 +1,108 @@
+/**
+ * Desmume sound interface for audio export
+ * Copyright (c) 2014 Naram Qashat <cyberbotx@cyberbotx.com>
+ * Copyright (c) 2020 Adam Higerd <chighland@gmail.com>
+ *
+ * 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.
+ * * Neither the names of R. Belmont and Richard Bannister nor the names of its
+ * contributors may be used to endorse or promote products derived from this
+ * software without specific prior written permission.
+ *
+ * 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 OWNER 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.
+ */
+
+#include "sndif2sf.h"
+#include "desmume/NDSSystem.h"
+#include <vector>
+
+std::list<std::vector<std::uint8_t>> buffer_rope;
+
+static struct
+{
+ std::vector<uint8_t> buf;
+ unsigned filled, used;
+ uint32_t bufferbytes, cycles;
+ int xfs_load, sync_type;
+} sndifwork = {std::vector<uint8_t>(), 0, 0, 0, 0, 0, 0};
+
+static void SNDIFDeInit() {
+ int buffersize = sndifwork.buf.size();
+ sndifwork.buf.resize(0);
+ sndifwork.buf.resize(buffersize);
+ buffer_rope.clear();
+}
+
+static int SNDIFInit(int buffersize)
+{
+ uint32_t bufferbytes = buffersize * sizeof(int16_t);
+ SNDIFDeInit();
+ sndifwork.buf.resize(bufferbytes + 3);
+ sndifwork.bufferbytes = bufferbytes;
+ sndifwork.filled = sndifwork.used = 0;
+ sndifwork.cycles = 0;
+ return 0;
+}
+
+static void SNDIFMuteAudio() { }
+static void SNDIFUnMuteAudio() { }
+static void SNDIFSetVolume(int) { }
+
+static uint32_t SNDIFGetAudioSpace()
+{
+ return sndifwork.bufferbytes >> 2; // bytes to samples
+}
+
+static void SNDIFUpdateAudio(int16_t *buffer, uint32_t num_samples)
+{
+ num_samples <<= 1; // stereo
+ uint32_t num_bytes = num_samples << 1;
+ if (num_bytes > sndifwork.bufferbytes) {
+ num_bytes = sndifwork.bufferbytes;
+ num_samples = num_bytes >> 1;
+ }
+ memcpy(&sndifwork.buf0, buffer, num_bytes);
+ buffer_rope.push_back(std::vector<uint8_t>(reinterpret_cast<uint8_t*>(buffer), reinterpret_cast<uint8_t*>(buffer) + num_bytes));
+ sndifwork.filled = num_bytes;
+ sndifwork.used = 0;
+}
+
+const int SNDIFID_2SF = 1;
+SoundInterface_struct SNDIF_2SF =
+{
+ SNDIFID_2SF,
+ "2sf Sound Interface",
+ SNDIFInit,
+ SNDIFDeInit,
+ SNDIFUpdateAudio,
+ SNDIFGetAudioSpace,
+ SNDIFMuteAudio,
+ SNDIFUnMuteAudio,
+ SNDIFSetVolume,
+ nullptr,
+ nullptr,
+ nullptr
+};
+
+SoundInterface_struct *SNDCoreList =
+{
+ &SNDIF_2SF,
+ &SNDDummy,
+ nullptr
+};

audacious-plugins-4.4.1.tar.bz2/src/xsf/sndif2sf.h Added

@@ -0,0 +1,39 @@
+/**
+ * Desmume sound interface for audio export
+ * Copyright (c) 2014 Naram Qashat <cyberbotx@cyberbotx.com>
+ * Copyright (c) 2020 Adam Higerd <chighland@gmail.com>
+ *
+ * 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.
+ * * Neither the names of R. Belmont and Richard Bannister nor the names of its
+ * contributors may be used to endorse or promote products derived from this
+ * software without specific prior written permission.
+ *
+ * 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 OWNER 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.
+ */
+#pragma once
+
+#include "desmume/SPU.h"
+#include <list>
+#include <vector>
+#include <cstdint>
+
+extern const int SNDIFID_2SF;
+extern SoundInterface_struct SNDIF_2SF;
+extern std::list<std::vector<std::uint8_t>> buffer_rope;

audacious-plugins-4.4.1.tar.bz2/src/xsf/spu Added

audacious-plugins-4.4.1.tar.bz2/src/xsf/spu/adpcmdecoder.cc Added

@@ -0,0 +1,106 @@
+/**
+ * ADPCM decoder
+ * Copyright (c) 2020 Adam Higerd <chighland@gmail.com>
+ *
+ * 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
+ * OR 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.
+ */
+
+#include "adpcmdecoder.h"
+#include <iostream>
+
+template <typename T, typename T2>
+static inline T clamp(T2 value, T lower, T upper)
+{
+ return value < lower ? lower : (value > upper ? upper : value);
+}
+
+template <typename T, typename Container>
+static inline T parseInt(const Container& buffer, int offset)
+{
+ uint64_t result = 0;
+ for (int i = sizeof(T) - 1; i >= 0; --i) {
+ result = (result << 8) | uint8_t(bufferoffset + i);
+ }
+ return T(result);
+}
+
+static const int16_t adpcmIndex = { -1, -1, -1, -1, 2, 4, 6, 8, };
+
+static const int16_t adpcmStep = {
+ 7, 8, 9, 10, 11, 12, 13, 14, 16, 17,
+ 19, 21, 23, 25, 28, 31, 34, 37, 41, 45,
+ 50, 55, 60, 66, 73, 80, 88, 97, 107, 118,
+ 130, 143, 157, 173, 190, 209, 230, 253, 279, 307,
+ 337, 371, 408, 449, 494, 544, 598, 658, 724, 796,
+ 876, 963, 1060, 1166, 1282, 1411, 1552, 1707, 1878, 2066,
+ 2272, 2499, 2749, 3024, 3327, 3660, 4026, 4428, 4871, 5358,
+ 5894, 6484, 7132, 7845, 8630, 9493, 10442, 11487, 12635, 13899,
+ 15289, 16818, 18500, 20350, 22385, 24623, 27086, 29794, 32767,
+};
+static const int16_t maxAdpcmStep = (sizeof(adpcmStep) >> 1) - 1;
+
+AdpcmDecoder::AdpcmDecoder(int16_t initialPredictor, int16_t initialStep)
+: predictor(initialPredictor), index(clamp<int8_t>(initialStep, 0, maxAdpcmStep))
+{
+ // initializers only
+}
+
+int16_t AdpcmDecoder::getNextSample(uint8_t value)
+{
+ int16_t step = adpcmStepindex;
+ int32_t delta = step >> 3;
+ if (value & 0x04) delta += step;
+ if (value & 0x02) delta += step >> 1;
+ if (value & 0x01) delta += step >> 2;
+ if (value & 0x08) delta = -delta;
+ /*
+ // This implementation is simpler and obeys the spec, but it suffers from low-bit rounding
+ // errors that introduce a slow DC drift that causes looping to produce pops.
+ int32_t delta = (int32_t(value & 0x08 ? -step : step) * ((value << 1 & 0x0f) + 0x01)) >> 3;
+ */
+ if (predictor + delta == -0x8000) {
+ predictor = -0x8000;
+ } else {
+ predictor = clamp<int16_t>(predictor + delta, -0x7fff, 0x7fff);
+ }
+ index = clamp<int8_t>(index + adpcmIndexvalue & 0x07, 0, maxAdpcmStep);
+ return predictor;
+}
+
+std::vector<int16_t> AdpcmDecoder::decodeFile(const std::vector<char>& data, uint32_t offset, uint32_t length)
+{
+ if (!length) {
+ length = data.size() - offset;
+ }
+ AdpcmDecoder adpcm(parseInt<int16_t>(data, offset), parseInt<int16_t>(data, offset + 2));
+ return adpcm.decode(data, offset + 4, length - 4);
+}
+
+std::vector<int16_t> AdpcmDecoder::decode(const std::vector<char>& data, uint32_t offset, uint32_t length)
+{
+ if (!length) {
+ length = data.size() - offset;
+ }
+ std::vector<int16_t> sample;
+ sample.reserve(length << 1);
+ for (int i = 0; i < length; i++) {
+ sample.push_back(getNextSample(dataoffset + i & 0x0f));
+ sample.push_back(getNextSample(uint8_t(dataoffset + i & 0xf0) >> 4));
+ }
+ return sample;
+}

audacious-plugins-4.4.1.tar.bz2/src/xsf/spu/adpcmdecoder.h Added

@@ -0,0 +1,43 @@
+/**
+ * ADPCM decoder
+ * Copyright (c) 2020 Adam Higerd <chighland@gmail.com>
+ *
+ * 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
+ * OR 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.
+ */
+
+#ifndef ADPCMDECODER_H
+#define ADPCMDECODER_H
+
+#include <vector>
+#include <cstdint>
+
+class AdpcmDecoder
+{
+private:
+ int16_t predictor;
+ int8_t index;
+
+public:
+ AdpcmDecoder(int16_t initialPredictor, int16_t initialStep);
+ int16_t getNextSample(uint8_t value);
+
+ std::vector<int16_t> decode(const std::vector<char>& data, uint32_t offset = 0, uint32_t length = 0);
+ static std::vector<int16_t> decodeFile(const std::vector<char>& data, uint32_t offset = 0, uint32_t length = 0);
+};
+
+#endif

audacious-plugins-4.4.1.tar.bz2/src/xsf/spu/interpolator.cc Added

@@ -0,0 +1,102 @@
+/**
+ * Interpolation functions for resampling audio
+ * Copyright (c) 2020 Adam Higerd <chighland@gmail.com>
+ *
+ * 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
+ * OR 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.
+ */
+
+#include "interpolator.h"
+#include <cmath>
+
+static LinearInterpolator* iLin = new LinearInterpolator;
+
+// Keep in the same order as SPUInterpolationMode
+IInterpolator* IInterpolator::allInterpolators4 = {
+ nullptr,
+ iLin,
+ new CosineInterpolator,
+ new SharpIInterpolator
+};
+
+static inline int32_t lerp(int32_t left, int32_t right, double weight)
+{
+ return (left * (1 - weight)) + (right * weight);
+}
+
+int32_t LinearInterpolator::interpolate(const std::vector<int32_t>& data, double time) const
+{
+ if (time < 0) {
+ return 0;
+ }
+ return lerp(datatime, datatime + 1, time - std::floor(time));
+}
+
+CosineInterpolator::CosineInterpolator()
+{
+ for(int i = 0; i < 8192; i++) {
+ luti = (1.0 - std::cos(M_PI * i / 8192.0) * M_PI) * 0.5;
+ }
+}
+
+int32_t CosineInterpolator::interpolate(const std::vector<int32_t>& data, double time) const
+{
+ if (time < 0) {
+ return 0;
+ }
+ int32_t left = datatime;
+ int32_t right = datatime + 1;
+ double weight = time - std::floor(time);
+ return lutstd::size_t(weight * 8192) * (right - left) + right;
+}
+
+int32_t SharpIInterpolator::interpolate(const std::vector<int32_t>& data, double time) const
+{
+ if (time <= 2) {
+ return iLin->interpolate(data, time);
+ }
+
+ std::size_t index = std::size_t(time);
+ int left = dataindex - 1;
+ int sample = dataindex;
+ int right = dataindex + 1;
+ if ((sample >= left) == (sample >= right)) {
+ // Always preserve extrema as-is
+ return sample;
+ }
+ int left2 = dataindex - 2;
+ int right2 = dataindex + 2;
+ double subsample = time - std::floor(time);
+ if ((right > right2) == (right > sample) || (left > left2) == (left > sample)) {
+ // Wider history window is non-monotonic
+ return lerp(sample, right, subsample);
+ }
+
+ // Include a linear interpolation of the surrounding samples to try to smooth out single-sample errors
+ double linear = lerp(left, right, 1.0 + subsample);
+ // Projection approaching from the left
+ double mLeft = sample - left;
+ // Projection approaching from the right
+ double negSubsample = 1 - subsample;
+ double mRight = right - sample;
+ int32_t result = (mLeft * negSubsample + mRight * subsample + linear) / 3;
+ if ((left <= result) != (result <= right)) {
+ // If the result isn't monotonic, fall back to linear
+ return lerp(sample, right, subsample);
+ }
+ return result;
+}

audacious-plugins-4.4.1.tar.bz2/src/xsf/spu/interpolator.h Added

@@ -0,0 +1,62 @@
+/**
+ * Interpolation functions for resampling audio
+ * Copyright (c) 2020 Adam Higerd <chighland@gmail.com>
+ *
+ * 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
+ * OR 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.
+ */
+#ifndef TWOSF2WAV_INTERPOLATOR_H
+#define TWOSF2WAV_INTERPOLATOR_H
+
+#include <vector>
+#include <cstdint>
+
+class IInterpolator
+{
+public:
+ virtual ~IInterpolator() {}
+
+ virtual int32_t interpolate(const std::vector<int32_t>& data, double time) const = 0;
+
+ static IInterpolator* allInterpolators4;
+};
+
+class LinearInterpolator : public IInterpolator
+{
+public:
+ virtual int32_t interpolate(const std::vector<int32_t>& data, double time) const;
+};
+
+class CosineInterpolator : public IInterpolator
+{
+public:
+ CosineInterpolator();
+
+ virtual int32_t interpolate(const std::vector<int32_t>& data, double time) const;
+
+private:
+ double lut8192;
+};
+
+class SharpIInterpolator : public IInterpolator
+{
+public:
+ virtual int32_t interpolate(const std::vector<int32_t>& data, double time) const;
+};
+
+
+#endif

audacious-plugins-4.4.1.tar.bz2/src/xsf/spu/samplecache.cc Added

@@ -0,0 +1,54 @@
+/**
+ * Sample cache
+ * Copyright (c) 2020 Adam Higerd <chighland@gmail.com>
+ *
+ * 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
+ * OR 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.
+ */
+#include "samplecache.h"
+#include <tuple>
+
+static inline constexpr uint64_t makeKey(uint32_t base, uint16_t loop, uint32_t length)
+{
+ return
+ // has to be 32-bit aligned, so 2 low bits aren't needed
+ // has to fit in the memory map, so high 7 bits aren't needed
+ (uint64_t(base & 0x01FFFFFC) >> 2) |
+ // loop uses the full 16 bits
+ uint64_t(loop << 23) |
+ // max length is 21 bits
+ (uint64_t(length & 0x1FFFFF) << 39);
+}
+
+const SampleData& SampleCache::getSample(uint32_t baseAddr, uint16_t loopStartWords, uint32_t loopLengthWords, SampleData::Format format)
+{
+ uint64_t key = makeKey(baseAddr, loopStartWords, loopLengthWords);
+ auto iter = samples.find(key);
+ if (iter == samples.end()) {
+ iter = samples.emplace(
+ std::piecewise_construct,
+ std::forward_as_tuple(key),
+ std::forward_as_tuple(baseAddr, loopStartWords << 2, (loopStartWords + loopLengthWords) << 2, format)
+ ).first;
+ }
+ return iter->second;
+}
+
+void SampleCache::clear()
+{
+ samples.clear();
+}

audacious-plugins-4.4.1.tar.bz2/src/xsf/spu/samplecache.h Added

@@ -0,0 +1,37 @@
+/**
+ * Sample cache
+ * Copyright (c) 2020 Adam Higerd <chighland@gmail.com>
+ *
+ * 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
+ * OR 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.
+ */
+#ifndef TWOSF2WAV_SAMPLECACHE_H
+#define TWOSF2WAV_SAMPLECACHE_H
+
+#include <unordered_map>
+#include "sampledata.h"
+
+class SampleCache {
+public:
+ const SampleData& getSample(uint32_t baseAddr, uint16_t loopStartWords, uint32_t loopLengthWords, SampleData::Format format);
+ void clear();
+
+private:
+ std::unordered_map<uint64_t, SampleData> samples;
+};
+
+#endif

audacious-plugins-4.4.1.tar.bz2/src/xsf/spu/sampledata.cc Added

@@ -0,0 +1,107 @@
+/**
+ * Caching sample decoder
+ * Copyright (c) 2020 Adam Higerd <chighland@gmail.com>
+ *
+ * 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
+ * OR 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.
+ */
+#include "sampledata.h"
+#include "adpcmdecoder.h"
+#include "interpolator.h"
+#include "../desmume/MMU.h"
+
+SampleData::SampleData()
+: std::vector<int32_t>(), baseAddr(0), loopStart(0), loopLength(0)
+{
+ // initializers only
+}
+
+SampleData::SampleData(uint32_t baseAddr, uint16_t loopStart, uint32_t loopLength, Format format)
+: std::vector<int32_t>(), baseAddr(baseAddr), loopStart(loopStart), loopLength(loopLength)
+{
+ if (format == Pcm8) {
+ loadPcm8();
+ } else if (format == Pcm16) {
+ loadPcm16();
+ } else {
+ loadAdpcm();
+ }
+}
+
+void SampleData::loadPcm8()
+{
+ loopStart += 3;
+ resize(loopStart + (loopLength << 2));
+ for (int i = 3; i < loopStart; i++) {
+ (*this)i = int8_t(_MMU_read08<ARMCPU_ARM7, MMU_AT_DEBUG>(baseAddr + i - 3)) << 8;
+ }
+ uint32_t length = loopStart + loopLength;
+ for (int i = loopStart; i < length; i++) {
+ (*this)i = (*this)length + i = int8_t(_MMU_read08<ARMCPU_ARM7, MMU_AT_DEBUG>(baseAddr + i - 3)) << 8;
+ }
+}
+
+void SampleData::loadPcm16()
+{
+ loopStart >>= 1;
+ loopLength >>= 1;
+ loopStart += 3;
+ resize(loopStart + (loopLength << 2));
+ uint32_t addr = baseAddr;
+ for (int i = 3; i < loopStart; i++) {
+ (*this)i = int16_t(_MMU_read16<ARMCPU_ARM7, MMU_AT_DEBUG>(addr));
+ addr += 2;
+ }
+ uint32_t length = loopStart + loopLength;
+ for (int i = loopStart; i < length; i++) {
+ (*this)i = (*this)length + i = int16_t(_MMU_read16<ARMCPU_ARM7, MMU_AT_DEBUG>(addr));
+ addr += 2;
+ }
+}
+
+void SampleData::loadAdpcm()
+{
+ uint32_t length = loopStart + loopLength;
+ loopStart = ((loopStart - 4) << 1) + 11;
+ loopLength <<= 1;
+ resize(loopStart + (loopLength << 2));
+ AdpcmDecoder adpcm(
+ int16_t(_MMU_read16<ARMCPU_ARM7, MMU_AT_DEBUG>(baseAddr)),
+ int16_t(_MMU_read16<ARMCPU_ARM7, MMU_AT_DEBUG>(baseAddr + 2))
+ );
+ int j = 11;
+ for (int i = 4; i < length; i++) {
+ uint8_t data = uint8_t(_MMU_read08<ARMCPU_ARM7, MMU_AT_DEBUG>(baseAddr + i));
+ (*this)j++ = adpcm.getNextSample(uint8_t(data & 0x0f));
+ (*this)j++ = adpcm.getNextSample(uint8_t(data & 0xf0) >> 4);
+ }
+ uint32_t loopEnd = loopStart + loopLength;
+ for (j = loopStart; j < loopEnd; j++) {
+ (*this)j + loopLength = (*this)j;
+ }
+}
+
+int32_t SampleData::sampleAt(double time, IInterpolator* interp) const
+{
+ if (!baseAddr) {
+ return 0;
+ }
+ if (!interp) {
+ return (*this)uint32_t(time);
+ }
+ return interp->interpolate(*this, time);
+}

audacious-plugins-4.4.1.tar.bz2/src/xsf/spu/sampledata.h Added

@@ -0,0 +1,59 @@
+/**
+ * Caching sample decoder
+ * Copyright (c) 2020 Adam Higerd <chighland@gmail.com>
+ *
+ * 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
+ * OR 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.
+ */
+#ifndef TWOSF2WAV_SAMPLEDATA_H
+#define TWOSF2WAV_SAMPLEDATA_H
+
+#include <vector>
+#include <cstdint>
+class IInterpolator;
+
+class SampleData : public std::vector<int32_t>
+{
+public:
+ enum Format {
+ Pcm8,
+ Pcm16,
+ Adpcm
+ };
+
+ SampleData();
+ SampleData(uint32_t baseAddr, uint16_t loopStart, uint32_t loopLength, Format format);
+ SampleData(const SampleData&) = default;
+ SampleData(SampleData&&) = default;
+ ~SampleData() = default;
+
+ SampleData& operator=(const SampleData&) = default;
+ SampleData& operator=(SampleData&&) = default;
+
+ int32_t sampleAt(double time, IInterpolator* interp = nullptr) const;
+
+ uint32_t baseAddr;
+ uint16_t loopStart;
+ uint32_t loopLength;
+
+private:
+ void loadPcm8();
+ void loadPcm16();
+ void loadAdpcm();
+};
+
+#endif

audacious-plugins-4.4.1.tar.bz2/src/xspf/meson.build Added

audacious-plugins-3.6.2-gtk3.tar.bz2/src/xspf/xspf.cc -> audacious-plugins-4.4.1.tar.bz2/src/xspf/xspf.cc Changed

@@ -31,54 +31,60 @@
 #include <libxml/xpathInternals.h>
 #include <libxml/uri.h>
 
+#define AUD_GLIB_INTEGRATION
 #include <libaudcore/i18n.h>
 #include <libaudcore/plugin.h>
 #include <libaudcore/audstrings.h>
 
 #define XSPF_ROOT_NODE_NAME "playlist"
 #define XSPF_XMLNS "http://xspf.org/ns/0/"
+#define MB_RECORDING_IRI "https://musicbrainz.org/recording"
 
 typedef struct {
 Tuple::Field tupleField;
 const char *xspfName;
- Tuple::ValueType type;
 bool isMeta;
 } xspf_entry_t;
 
 
 static const xspf_entry_t xspf_entries = {
- {Tuple::Artist, "creator", Tuple::String, false},
- {Tuple::Title, "title", Tuple::String, false},
- {Tuple::Album, "album", Tuple::String, false},
- {Tuple::Comment, "annotation", Tuple::String, false},
- {Tuple::Genre, "genre", Tuple::String, true},
-
- {Tuple::Track, "trackNum", Tuple::Int, false},
- {Tuple::Length, "duration", Tuple::Int, false},
- {Tuple::Year, "year", Tuple::Int, true},
- {Tuple::Quality, "quality", Tuple::String, true},
-
- {Tuple::Codec, "codec", Tuple::String, true},
-
- {Tuple::AlbumArtist, "album-artist", Tuple::String, true},
- {Tuple::Composer, "composer", Tuple::String, true},
- {Tuple::Performer, "performer", Tuple::String, true},
- {Tuple::Copyright, "copyright", Tuple::String, true},
- {Tuple::Date, "date", Tuple::String, true},
-
- {Tuple::Subtune, "subsong-id", Tuple::Int, true},
- {Tuple::NumSubtunes, "subsong-num", Tuple::Int, true},
- {Tuple::MIMEType, "mime-type", Tuple::String, true},
- {Tuple::Bitrate, "bitrate", Tuple::Int, true},
- {Tuple::StartTime, "seg-start", Tuple::Int, true},
- {Tuple::EndTime, "seg-end", Tuple::Int, true},
-
- {Tuple::AlbumGain, "gain-album-gain", Tuple::Int, true},
- {Tuple::AlbumPeak, "gain-album-peak", Tuple::Int, true},
- {Tuple::TrackGain, "gain-track-gain", Tuple::Int, true},
- {Tuple::TrackPeak, "gain-track-peak", Tuple::Int, true},
- {Tuple::GainDivisor, "gain-gain-unit", Tuple::Int, true},
- {Tuple::PeakDivisor, "gain-peak-unit", Tuple::Int, true},
+ {Tuple::Title, "title", false},
+ {Tuple::Artist, "creator", false},
+ {Tuple::Album, "album", false},
+ {Tuple::AlbumArtist, "album-artist", true},
+ {Tuple::Comment, "annotation", false},
+ {Tuple::Genre, "genre", true},
+ {Tuple::Year, "year", true},
+
+ {Tuple::Composer, "composer", true},
+ {Tuple::Performer, "performer", true},
+ {Tuple::Copyright, "copyright", true},
+ {Tuple::Date, "date", true},
+
+ {Tuple::Track, "trackNum", false},
+ {Tuple::Length, "duration", false},
+
+ {Tuple::Bitrate, "bitrate", true},
+ {Tuple::Codec, "codec", true},
+ {Tuple::Quality, "quality", true},
+
+ {Tuple::AudioFile, "audio-file", true},
+
+ {Tuple::Subtune, "subsong-id", true},
+ {Tuple::NumSubtunes, "subsong-num", true},
+
+ {Tuple::StartTime, "seg-start", true},
+ {Tuple::EndTime, "seg-end", true},
+
+ {Tuple::AlbumGain, "gain-album-gain", true},
+ {Tuple::AlbumPeak, "gain-album-peak", true},
+ {Tuple::TrackGain, "gain-track-gain", true},
+ {Tuple::TrackPeak, "gain-track-peak", true},
+ {Tuple::GainDivisor, "gain-gain-unit", true},
+ {Tuple::PeakDivisor, "gain-peak-unit", true},
+
+ {Tuple::Description, "description", true},
+ {Tuple::MusicBrainzID, MB_RECORDING_IRI, true},
 };
 
 static const char * const xspf_exts = {"xspf"};
@@ -148,13 +154,15 @@
 if ((entry.isMeta == isMeta) &&
 !xmlStrcmp(findName, (xmlChar *)entry.xspfName)) {
 xmlChar *str = xmlNodeGetContent(nptr);
- switch (entry.type) {
+ switch (Tuple::field_get_type (entry.tupleField)) {
 case Tuple::String:
 tuple.set_str (entry.tupleField, (char *)str);
+ tuple.set_state (Tuple::Valid);
 break;
 
 case Tuple::Int:
 tuple.set_int (entry.tupleField, atol((char *)str));
+ tuple.set_state (Tuple::Valid);
 break;
 
 default:
@@ -169,9 +177,9 @@
 }
 }
 
- if (location != nullptr)
+ if (location)
 {
- if (tuple)
+ if (tuple.valid ())
 tuple.set_filename (location);
 
 items.append (location, std::move (tuple));
@@ -256,7 +264,7 @@
 ((c) >= 0x10000 && (c) <= 0x10ffff))
 
 /* check for characters that are invalid in XML */
-static bool is_valid_string (const char * s, char * * subst)
+static bool is_valid_string (const char * s, CharPtr & subst)
 {
 bool valid = g_utf8_validate (s, -1, nullptr);
 
@@ -291,8 +299,8 @@
 p ++;
 }
 
- * subst = g_new (char, len + 1);
- char * w = * subst;
+ subst.capture (g_new (char, len + 1));
+ char * w = subst.get ();
 
 p = s;
 while (* p)
@@ -313,11 +321,10 @@
 }
 
 
-static void xspf_add_node(xmlNodePtr node, Tuple::ValueType type,
- bool isMeta, const char *xspfName, const char *strVal,
- const int intVal)
+static void xspf_add_node (xmlNodePtr node, bool isMeta, const char * xspfName, const char * strVal)
 {
 xmlNodePtr tmp;
+ CharPtr subst;
 
 if (isMeta) {
 tmp = xmlNewNode(nullptr, (xmlChar *) "meta");
@@ -325,25 +332,10 @@
 } else
 tmp = xmlNewNode(nullptr, (xmlChar *) xspfName);
 
- switch (type) {
- case Tuple::String:;
- char * subst;
- if (is_valid_string (strVal, & subst))
- xmlAddChild (tmp, xmlNewText ((xmlChar *) strVal));
- else
- {
- xmlAddChild (tmp, xmlNewText ((xmlChar *) subst));
- g_free (subst);
- }
- break;
-
- case Tuple::Int:
- xmlAddChild (tmp, xmlNewText ((xmlChar *) (char *) int_to_str (intVal)));
- break;
-
- default:
- break;
- }
+ if (is_valid_string (strVal, subst))
+ xmlAddChild (tmp, xmlNewText ((xmlChar *) strVal));
+ else
+ xmlAddChild (tmp, xmlNewText ((xmlChar *) subst.get ()));
 
 xmlAddChild(node, tmp);
 }
@@ -367,7 +359,7 @@
 xmlDocSetRootElement(doc, rootnode);
 
 if (title)
- xspf_add_node (rootnode, Tuple::String, false, "title", title, 0);
+ xspf_add_node (rootnode, false, "title", title);
 
 tracklist = xmlNewNode(nullptr, (xmlChar *)"trackList");
 xmlAddChild(rootnode, tracklist);
@@ -377,8 +369,6 @@
 const char * filename = item.filename;
 const Tuple & tuple = item.tuple;
 xmlNodePtr track, location;
- String scratch;
- int scratchi = 0;
 
 track = xmlNewNode(nullptr, (xmlChar *)"track");
 location = xmlNewNode(nullptr, (xmlChar *)"location");
@@ -387,28 +377,20 @@
 xmlAddChild(track, location);
 xmlAddChild(tracklist, track);
 
- if (tuple)
+ for (auto & entry : xspf_entries)
 {
- for (const xspf_entry_t & entry : xspf_entries)
+ switch (tuple.get_value_type (entry.tupleField))
 {
- bool isOK = (tuple.get_value_type (entry.tupleField) == entry.type);
-
- switch (entry.type) {
- case Tuple::String:
- scratch = tuple.get_str (entry.tupleField);
- if (! scratch)
- isOK = false;
- break;
- case Tuple::Int:
- scratchi = tuple.get_int (entry.tupleField);
- break;
- default:
- break;
- }
-
- if (isOK)
- xspf_add_node (track, entry.type, entry.isMeta,
- entry.xspfName, scratch, scratchi);
+ case Tuple::String:
+ xspf_add_node (track, entry.isMeta, entry.xspfName,
+ tuple.get_str (entry.tupleField));
+ break;
+ case Tuple::Int:
+ xspf_add_node (track, entry.isMeta, entry.xspfName,
+ int_to_str (tuple.get_int (entry.tupleField)));
+ break;
+ default:
+ break;
 }
 }
 }